diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000000..e7df5c4479
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,6 @@
+[run]
+branch = True
+[report]
+exclude_lines =
+    pragma: no cover
+    raise NotImplementedError.*
diff --git a/.flake8 b/.flake8
new file mode 100644
index 0000000000..f4ae26a85e
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,4 @@
+[flake8]
+max-line-length = 120
+ignore = E126
+exclude = samcli/local/init/templates
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..82b6163fd5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,36 @@
+<!--
+
+Before reporting a new issue, make sure we don't have any duplicates already open or closed by
+searching the issues list. If there is a duplicate, re-open or add a comment to the
+existing issue instead of creating a new one. If you are reporting a bug,
+make sure to include relevant information asked below to help with debugging.
+
+## GENERAL HELP QUESTIONS ##
+Github Issues is for bug reports and feature requests. If you have general support
+questions, the following locations are a good place:
+
+- Slack channel (#samdev): https://awssamopensource.splashthat.com/
+- Post a question in StackOverflow  with "aws-sam-cli" tag
+
+-->
+
+**Description:**
+
+<!-- Briefly describe the problem you are facing -->
+
+**Steps to reproduce the issue:**
+1.
+2.
+3.
+
+**Observed result:**
+
+**Expected result:**
+
+**Additional environment details (Ex: Windows, Mac, Amazon Linux etc)**
+
+**Output of `sam --version`**:
+
+**Optional Debug logs**:
+
+`Add --debug flag to command you are running`
diff --git a/.gitignore b/.gitignore
index 9e9a7e00ce..5dbf0258cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,383 @@
+
+# Created by https://www.gitignore.io/api/osx,node,macos,linux,python,windows,pycharm,intellij,sublimetext,visualstudiocode
+
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+.idea
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Ruby plugin and RubyMine
+/.rakeTasks
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### Intellij Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+*.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+
+### OSX ###
+
+# Icon must end with two \r
+
+# Thumbnails
+
+# Files that might appear in the root of a volume
+
+# Directories potentially created on remote AFP share
+
+### PyCharm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+
+# Sensitive or high-churn files:
+
+# Gradle:
+
+# CMake
+
+# Mongo Explorer plugin:
+
+## File-based project format:
+
+## Plugin-specific files:
+
+# IntelliJ
+
+# mpeltonen/sbt-idea plugin
+
+# JIRA plugin
+
+# Cursive Clojure plugin
+
+# Ruby plugin and RubyMine
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+
+### PyCharm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
 dist/
-.idea/
-.vscode/
-.cache/
-./aws-sam-local
-debug
+downloads/
+eggs/
+.eggs/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+.pytest_cache/
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule.*
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+### SublimeText ###
+# cache files for sublime text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+
+# workspace files are user-specific
+*.sublime-workspace
+
+# project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using SublimeText
+# *.sublime-project
+
+# sftp configuration file
+sftp-config.json
+
+# Package control specific files
+Package Control.last-run
+Package Control.ca-list
+Package Control.ca-bundle
+Package Control.system-ca-bundle
+Package Control.cache/
+Package Control.ca-certs/
+Package Control.merged-ca-bundle
+Package Control.user-ca-bundle
+oscrypto-ca-bundle.crt
+bh_unicode_properties.cache
+
+# Sublime-github package stores a github token in this file
+# https://packagecontrol.io/packages/sublime-github
+GitHub.sublime-settings
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+
+# End of https://www.gitignore.io/api/osx,node,macos,linux,python,windows,pycharm,intellij,sublimetext,visualstudiocode
diff --git a/.goreleaser.yml b/.goreleaser.yml
deleted file mode 100644
index 4f833f71aa..0000000000
--- a/.goreleaser.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Build customization
-project_name: sam
-builds:
-  - 
-    binary: sam
-    goos:
-      - windows
-      - darwin
-      - linux
-    goarch:
-      - amd64
-      - 386
-
-    #hooks:
-    #  post: ./distribution/npm/npm-release.sh
- 
-archive:
-  format: tar.gz
-  files:
-    - LICENSE
-    - NOTICE
-
-# Publish to Github Releases 
-release:
-    github:
-        owner: awslabs
-        name: aws-sam-local
- 
-    # Don't auto-publish the release. Admin has to manually publish at right time
-    # Setting to true will also prevent brew from being published
-    draft: false
- 
-# homebrew release
-#brew:
-# 
-#    # repository to push the tap to.
-#    folder: Formula
-#    github:
-#        owner: awslabs
-#        name: homebrew-tap
-# 
-#    homepage: "https://github.com/awslabs/aws-sam-local"
-#    description: "Develop and test your serverless applications locally without uploading to AWS Lambda"
-#    test: |
-#        output = shell_output(bin/"sam --version")
-#        assert_match "sam version #{version}", output
-# 
-#    install: |
-#        bin.install "aws-sam-local"
-
-fpm: 
-  vendor: Amazon Web Services
-  homepage: https://github.com/awslabs/aws-sam-local
-  maintainer: aws-sam-cli@amazon.com
-  description: AWS SAM Local is a CLI tool for developing, testing and deploying Serverless applications.
-  license: Apache 2.0
-  formats:
-    - deb
-    - rpm
diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 0000000000..c0987c591e
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,363 @@
+[MASTER]
+
+# Specify a configuration file.
+#rcfile=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=compat.py
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+# Use multiple processes to speed up Pylint.
+jobs=1
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code
+extension-pkg-whitelist=
+
+# Allow optimization of some AST trees. This will activate a peephole AST
+# optimizer, which will apply various small optimizations. For instance, it can
+# be used to obtain the result of joining multiple strings with the addition
+# operator. Joining a lot of strings can lead to a maximum recursion error in
+# Pylint and this flag can prevent that. It has one side effect, the resulting
+# AST will be different than the one from reality.
+optimize-ast=no
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
+confidence=
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time. See also the "--disable" option for examples.
+#enable=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once).You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use"--disable=all --enable=classes
+# --disable=W"
+disable=R0201,W0613,I0021,I0020,W1618,W1619,R0902,R0903,W0231,W0611,R0913,W0703,C0330,R0204,I0011,R0904,C0301
+
+
+[REPORTS]
+
+# Set the output format. Available formats are text, parseable, colorized, msvs
+# (visual studio) and html. You can also give a reporter class, eg
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
+# Tells whether to display a full report or only the messages
+reports=no
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details
+#msg-template=
+
+
+[BASIC]
+
+# List of builtins function names that should not be used, separated by a comma
+bad-functions=apply,reduce
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=e,i,j,k,n,ex,Run,_
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Include a hint for the correct naming format with invalid-name
+include-naming-hint=yes
+
+# Regular expression matching correct function names
+function-rgx=[a-z_][a-z0-9_]{2,50}$
+
+# Naming hint for function names
+function-name-hint=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression matching correct variable names
+variable-rgx=[a-z_][a-z0-9_]{0,50}$
+
+# Naming hint for variable names
+variable-name-hint=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression matching correct constant names
+const-rgx=(([a-zA-Z_][a-zA-Z0-9_]*)|(__.*__))$
+
+# Naming hint for constant names
+const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Regular expression matching correct attribute names
+attr-rgx=[a-z_][a-z0-9_]{1,50}$
+
+# Naming hint for attribute names
+attr-name-hint=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression matching correct argument names
+argument-rgx=[a-z_][a-z0-9_]{0,50}$
+
+# Naming hint for argument names
+argument-name-hint=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression matching correct class attribute names
+class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
+# Naming hint for class attribute names
+class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
+# Regular expression matching correct inline iteration names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Naming hint for inline iteration names
+inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
+
+# Regular expression matching correct class names
+class-rgx=[A-Z_][a-zA-Z0-9]+$
+
+# Naming hint for class names
+class-name-hint=[A-Z_][a-zA-Z0-9]+$
+
+# Regular expression matching correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Naming hint for module names
+module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression matching correct method names
+method-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Naming hint for method names
+method-name-hint=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=.*
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=120
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+# List of optional constructs for which whitespace checking is disabled
+no-space-check=trailing-comma,dict-separator
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+# Number of spaces of indent required inside a hanging or continued line.
+indent-after-paren=4
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=
+
+
+[LOGGING]
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format
+logging-modules=logging
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX
+
+
+[SIMILARITIES]
+
+# Minimum lines number of a similarity.
+min-similarity-lines=6
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=yes
+
+
+[SPELLING]
+
+# Spelling dictionary name. Available dictionaries: none. To make it working
+# install python-enchant package.
+spelling-dict=
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to indicated private dictionary in
+# --spelling-private-dict-file option instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[TYPECHECK]
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis
+ignored-modules=six.moves
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamically set).
+ignored-classes=SQLObject
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E0201 when accessed. Python regular
+# expressions are accepted.
+generated-members=REQUEST,acl_users,aq_parent,objects,DoesNotExist,md5,sha1,sha224,sha256,sha384,sha512
+
+
+[VARIABLES]
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# A regular expression matching the name of dummy variables (i.e. expectedly
+# not used).
+dummy-variables-rgx=_|dummy|ignore
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,_cb
+
+
+[CLASSES]
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,_fields,_replace,_source,_make
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=5
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of branch for function / method body
+max-branches=12
+
+# Maximum number of statements in function / method body
+max-statements=30
+
+# Maximum number of parents for a class (see R0901).
+max-parents=6
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=0
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+
+[IMPORTS]
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=regsub,string,TERMIOS,Bastion,rexec,UserDict
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception"
+overgeneral-exceptions=Exception
diff --git a/.travis.yml b/.travis.yml
index 7a87b85a8e..15d4952614 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,13 @@
-language: go
+# Enable container based builds
+sudo: false
+language: python
 
-go:
-  - 1.8
\ No newline at end of file
+install:
+# Install the code requirements
+- make init
+
+# Install Docs requirements
+
+script:
+# Runs unit tests
+- make pr
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 537fc8fbc8..1de4002ab0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,32 +1,65 @@
-# Contributing to AWS SAM Local
+# Contributing Guidelines
 
-Contributions to AWS SAM Local should be made via GitHub [pull
-requests](https://github.com/awslabs/aws-sam-local/pulls) and discussed using
-GitHub [issues](https://github.com/awslabs/aws-sam-local/issues).
+Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional 
+documentation, we greatly value feedback and contributions from our community.
 
-### Before you start
+Please read through this document before submitting any issues or pull requests to ensure we have all the necessary 
+information to effectively respond to your bug report or contribution.
 
-If you would like to make a significant change, it's a good idea to first open
-an issue to discuss it.
+## Development Guide
 
-### Making the request
+Refer to the [Development Guide](DEVELOPMENT_GUIDE.rst) for help with environment setup, running tests, submitting a PR, or anything that will make you more productive.
 
-1. Create a fork of the AWS SAM Local repository [(quick link)](https://github.com/awslabs/aws-sam-local#fork-destination-box)
-2. Commit your changes to your fork
-3. Create a new pull request [(quick link)](https://github.com/awslabs/aws-sam-local/compare)  
 
-### Testing
+## Reporting Bugs/Feature Requests
 
-Any contributions should pass all tests, including those not run by our
-current CI system.
+We welcome you to use the GitHub issue tracker to report bugs or suggest features.
+
+When filing an issue, please check [existing open](https://github.com/awslabs/aws-sam-cli/issues), or [recently closed](https://github.com/awslabs/aws-sam-cli/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already 
+reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
+
+* A reproducible test case or series of steps
+* The version of our code being used
+* Any modifications you've made relevant to the bug
+* Anything unusual about your environment or deployment
+
+
+## Contributing via Pull Requests
+Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
+
+1. You are working against the latest source on the *develop* branch.
+2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
+3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
+
+To send us a pull request, please:
+
+1. Fork the repository.
+2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
+3. Ensure local tests pass.
+4. Commit to your fork using clear commit messages.
+5. Send us a pull request, answering any default questions in the pull request interface.
+6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
+
+GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and 
+[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
+
+
+## Finding contributions to work on
+Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/awslabs/aws-sam-cli/labels/help%20wanted) issues is a great place to start. 
+
+
+## Code of Conduct
+This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). 
+For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact 
+opensource-codeofconduct@amazon.com with any additional questions or comments.
+
+
+## Security issue notifications
+If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
 
-You may run all tests by running `go test` (requires `go` to be installed).
 
 ## Licensing
 
-The AWS SAM Local is released under an [Apache
-2.0](http://aws.amazon.com/apache-2-0/) license. Any code you submit will be
-released under that license.
+See the [LICENSE](https://github.com/awslabs/aws-sam-cli/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
-For significant changes, we may ask you to sign a [Contributor License
-Agreement](http://en.wikipedia.org/wiki/Contributor_License_Agreement).
+We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
diff --git a/DESIGN.rst b/DESIGN.rst
new file mode 100644
index 0000000000..5e0bad079d
--- /dev/null
+++ b/DESIGN.rst
@@ -0,0 +1,55 @@
+DESIGN DOCUMENT
+===============
+
+    "..with proper design, the features come cheaply " - Dennis Ritchie
+
+
+This document is intended to capture key decisions in the design of this CLI. This is especially useful for new
+contributors to understand the codebase and keep the changes aligned with design decisions. We will update
+this document when new components are added or the CLI design changes significantly.
+
+Tenets
+======
+These are some key guiding principles for the design:
+
+- Extensibility is by design. It is not an after thought.
+- Each component must be self-contained and testable in isolation.
+- Command line interface must be one of many supported input mechanisms.
+- SAM is one of many supported input formats.
+
+
+CLI Framework
+=============
+This component implements generic CLI functionality that makes it easy to write individual CLI commands. It performs:
+
+- CLI argument parsing
+- Generating help text and man pages from RST docs of the command.
+- Fetching configuration information from environment
+- Consistent exit code generation
+- [Future] HTTP Mode: Ability to call the CLI commands with same parameters through a HTTP Endpoint. This is useful for
+IDEs and other tools to integrate with this CLI.
+
+Each command, along with any subcommands, is implemented using Click annotations. They are not directly wired with
+the core of the CLI. Instead, commands are dynamically loaded into the CLI at run time by importing the Python
+package implementing the command. For example, assuming two commands are implemented at Python packages
+"foo.cli.cmd1" and "foo.cli.cmd2", then the CLI framework will dynamically import these two packages and connect them
+to parent Click instance. The CLI framework expects the command's Click object to be exposed through an attribute
+called ``cli``.
+
+For example: if "foo.bar.hello" is the package where "hello" command is implemented, then
+"/foo/bar/hello/__init__.py" file is expected to contain a Click object called ``cli``.
+
+By convention, the name of last module in the package's name is the command's name. ie. A package of "foo.bar.baz"
+will produce a command name "baz".
+
+Commands that make up of the core functionality (like local, validate, generate-event etc) are also implemented
+this way. They are baked into the CLI, but in the future, we will provide options to completely remove a command.
+
+By convention, each command is implemented as a separate Python package where the ``__init__.py`` file
+exposes the ``cli`` attribute. This allows new commands to be built and distributed as Python packages
+through PIP, opening the architecture to support plugins in future. This structure also forces commands implementations
+to be modular, reusable, and highly customizable. When RC files are implemented, new commands can be added or existing
+commands can be removed, with simple a configuration in the RC file.
+
+
+.. _`click`: https://github.com/pallets/click
diff --git a/DEVELOPMENT_GUIDE.rst b/DEVELOPMENT_GUIDE.rst
new file mode 100644
index 0000000000..5c5ecd1816
--- /dev/null
+++ b/DEVELOPMENT_GUIDE.rst
@@ -0,0 +1,107 @@
+DEVELOPMENT GUIDE
+=================
+
+**Welcome hacker!**
+
+This document will make your life easier by helping you setup a development environment, IDEs, tests, coding practices,
+or anything that will help you be more productive. If you found something is missing or inaccurate, update this guide
+and send a Pull Request.
+
+Environment Setup
+-----------------
+
+1. Install Python Versions
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Even though Python 2.7 is our officially supported version, we have a goal to support both Python 2.7 and 3.6 versions.
+Follow the idioms from this `excellent cheatsheet`_ to make sure your code is compatible with both Python versions.
+Our CI/CD pipeline is setup to run unit tests against both Python versions. So make sure you test it with both
+versions before sending a Pull Request. `pyenv`_ is a great tool to easily setup multiple Python versions.
+
+#. Install PyEnv - ``curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash``
+#. ``pyenv install 2.7.14``
+#. ``pyenv install 3.6.4``
+#. Make both Python versions available in the project: ``pyenv local 3.6.4 2.7.14``
+
+
+2. Activate Virtualenv
+~~~~~~~~~~~~~~~~~~~~~~
+Virtualenv allows you to install required libraries outside of the Python installation. A good practice is to setup
+a different virtualenv for each project. `pyenv`_ comes with a handy plugin that can create virtualenv.
+
+#. Create new virtualenv if it does not exist: ``pyenv virtualenv 2.7.14 samcli27``
+#. ``pyenv activate samcli27``
+
+
+3. Install dev version of SAM CLI
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+We will install a development version of SAM CLI from source into the virtualenv for you to try out the CLI as you
+make changes. We will install in a command called ``samdev`` to keep it separate from a global SAM CLI installation,
+if any.
+
+#. Activate Virtualenv: ``pyenv activate samcli27``
+#. Install dev CLI: ``make init``
+#. Make sure installation succeeded: ``which samdev``
+
+
+Running Tests
+-------------
+
+Unit testing with multiple Python versions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`tox`_ is used to run tests against all supported Python versions. Follow these instructions to setup multiple Python
+versions using `pyenv`_ before running tox:
+
+#. Deactivate virtualenvs, if any: ``pyenv deactivate``
+#. ``pip install tox``
+#. Run tests against all supported Python versions: ``tox``
+
+Integration Test
+~~~~~~~~~~~~~~~~
+
+``make integ-test`` - To run integration test against global SAM CLI installation. It looks for a command named ``sam``
+in your shell.
+
+``SAM_CLI_DEV=1 make integ-test`` - To run integration tests against development version of SAM CLI. This is useful if
+you are making changes to the CLI and want to verify that it works. It is a good practice to run integration tests
+before submitting a pull request.
+
+Code Conventions
+----------------
+
+Please follow these code conventions when making your changes. This will align your code to the same conventions used
+in rest of the package and make it easier for others to read/understand your code. Some of these conventions are
+best practices that we have learnt over time.
+
+- Use `numpy docstring`_ format for docstrings. Some parts of the code still use an older, unsupported format. If you
+  happened to be modifying these methods, please change the docstring format as well.
+
+- Don't write any code in ``__init__.py`` file
+
+- Module-level logger variable must be named as ``LOG``
+
+- If your method wants to report a failure, it *must* raise a custom exception. Built-in Python exceptions like
+  ``TypeError``, ``KeyError`` are raised by Python interpreter and usually signify a bug in your code. Your method must
+  not explicitly raise these exceptions because the caller has no way of knowing whether it came from a bug or not.
+  Custom exceptions convey are must better at conveying the intent and can be handled appropriately by the caller.
+  In HTTP lingo, custom exceptions are equivalent to 4xx (user's fault) and built-in exceptions are equivalent
+  to 5xx (Service Fault)
+
+- CLI commands must always raise a subclass of ``click.ClickException`` to signify an error. Error code and message
+  must be set as a part of this exception and not explicitly returned by the CLI command.
+
+- Don't use ``*args`` or ``**kwargs`` unless there is a really strong reason to do so. You must explain the reason
+  in great detail in docstrings if you were to use them.
+
+- Library classes, ie. the ones under ``lib`` folder, must **not** use Click.  Usage of Click must be restricted to
+  the ``commands`` package. In the library package, your classes must expose interfaces that are independent
+  of the user interface, be it a CLI thru Click, or CLI thru argparse, or HTTP API, or a GUI.
+
+- Do not catch the broader ``Exception``, unless you have a really strong reason to do. You must explain the reason
+  in great detail in comments.
+
+
+.. _excellent cheatsheet: http://python-future.org/compatible_idioms.html
+.. _pyenv: https://github.com/pyenv/pyenv
+.. _tox: http://tox.readthedocs.io/en/latest/
+.. _numpy docstring: https://numpydoc.readthedocs.io/en/latest/format.html
diff --git a/HOWTO.md b/HOWTO.md
deleted file mode 100644
index 73ce85014e..0000000000
--- a/HOWTO.md
+++ /dev/null
@@ -1,204 +0,0 @@
-
-Let's imagine we want to build a simple RESTful API to list, create, read, update and delete products. We'll start by laying out our project directory like so:
-
-```bash
-├── products.js
-└── template.yaml
-```
-
-The `template.yaml` file is the AWS SAM template. Let's start by describing a single Lambda function to handle all of our API requests to `/products`.
-
-```yaml
-AWSTemplateFormatVersion : '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: My first serverless application.
-
-Resources:
-            
-  Products:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: products.handler
-      Runtime: nodejs6.10
-      Events:
-        ListProducts:
-          Type: Api
-          Properties:
-            Path: /products
-            Method: get
-        CreateProduct:
-          Type: Api
-          Properties:
-            Path: /products
-            Method: post
-        Product:
-          Type: Api
-          Properties:
-            Path: /products/{product}
-            Method: any
-
-```
-
-In the above example, we're configuring the following RESTful API endpoints:
-
-* Create new product with a `PUT` request to `/products`.
-* List all products with a `GET` request to `/products`.
-* Read, update or delete a product with `GET`, `PUT` or `DELETE` request to `/products/{product}`. 
-
-In order to service these, let's create a Lambda function in `products.js` like so:
-
-```javascript
-'use strict';
-
-exports.handler = (event, context, callback) => {
-
-    let id = event.pathParameters ? event.pathParameters.product : null;
-    switch(event.httpMethod){
-        
-        case "GET":
-            
-            if(id) {
-                callback(null, { 
-                   statusCode: 200,
-                   body: "This is a READ operation on product ID " + id
-                });
-                return;  
-            } 
-            
-            callback(null, { 
-               statusCode: 200,
-               body: "This is a LIST operation, return all products"
-            });
-            break;
-            
-        case "POST":
-            callback(null, { 
-               statusCode: 200,
-               body: "This is a CREATE operation"
-            });
-            break;
-
-        case "PUT": 
-            callback(null, { 
-               statusCode: 200,
-               body: "This is a UPDATE operation on product ID " + id
-            });
-            break;
-             
-        case "DELETE": 
-            callback(null, { 
-               statusCode: 200,
-               body: "This is a DELETE operation on product ID " + id
-            });
-            break;
-
-        default:
-            // Send HTTP 501: Not Implemented
-            console.log("Error: unsupported HTTP method (" + event.httpMethod + ")");
-            callback(null, { statusCode: 501 })
-            
-    }
-
-}
-```
-
-We can quickly run this locally with SAM CLI, to help us iterate quickly on development:
-
-```bash
-$ sam local start-api
-
-2017/05/18 14:03:01 Successfully parsed template.yaml (AWS::Serverless-2016-10-31)
-2017/05/18 14:03:01 Found 1 AWS::Serverless::Function
-2017/05/18 14:03:01 Mounting products.handler (nodejs6.10) at /products [POST]
-2017/05/18 14:03:01 Mounting products.handler (nodejs6.10) at /products/{product} [OPTIONS GET HEAD POST PUT DELETE TRACE CONNECT]
-2017/05/18 14:03:01 Mounting products.handler (nodejs6.10) at /products [GET]
-2017/05/18 14:03:01 Listening on http://localhost:3000
-
-You can now browse to the above endpoints to invoke your functions.
-You do not need to restart/reload while working on your functions,
-changes will be reflected instantly/automatically. You only need to restart
-if you update your AWS SAM template.
-```
-
-Now we can test our API endpoint locally either with a browser, or the CLI:
-
-```bash
-$ curl http://localhost:3000/products 
-"This is a LIST operation, return all products"
-
-$ curl -XDELETE http://localhost:3000/products/1
-"This is a DELETE operation on product ID 1"
-```
-
-Any logging output (e.g. `console.log()`) as well as the AWS Lambda runtime logs are displayed by the SAM CLI. For example, in our code above we are logging an error message if an unsupported HTTP method is called. 
-
-Let's test this by calling our API with an unsupported HTTP method:
-
-```bash
-$ curl -XOPTIONS http://localhost:3000/products/1
-*   Trying ::1...
-* TCP_NODELAY set
-* Connected to localhost (::1) port 3000 (#0)
-> OPTIONS /products/1 HTTP/1.1
-> Host: localhost:3000
-> User-Agent: curl/7.51.0
-> Accept: */*
->
-< HTTP/1.1 501 Not Implemented
-< Content-Type: application/json
-< Date: Thu, 18 May 2017 13:18:57 GMT
-< Content-Length: 0
-<
-```
-
-If we look back at the AWS SAM output, we can see our log entry:
-
-```java
-START RequestId: 2137da9a-c79c-1d43-5716-406b4e6b5c0a Version: $LATEST
-2017-05-18T13:18:57.852Z        2137da9a-c79c-1d43-5716-406b4e6b5c0a    Error: unsupported HTTP method (OPTIONS)
-END RequestId: 2137da9a-c79c-1d43-5716-406b4e6b5c0a
-REPORT RequestId: 2137da9a-c79c-1d43-5716-406b4e6b5c0a  Duration: 12.78 ms      Billed Duration: 100 ms Memory Size: 0 MB       Max Memory Used: 29 MB
-```
-
-When you are developing, any changes to your AWS Lambda function code are reflected instantly - no need to restart `sam local start-api`.
-
-When you're ready to deploy your Serverless application to AWS, it's easy to package and deploy via the AWS CLI using `aws cloudformation package` and `aws cloudformation deploy`. You can read more 
-
-Or, you can easily setup a full CI/CD pipeline with AWS CodePipeline to automate your software delivery process using [AWS CodeStar][CodeStar].
-
-## Developing other (non-API) Serverless Applications
-
-SAM CLI supports generation of mock Serverless events, allowing you to develop and test locally on functions that respond to asynchronous events such as those from S3, Kinesis, or DynamoDB.
-
-You can use the `sam local generate-event` command to create these events:
-
-```bash
-$ sam local generate-event
-NAME:
-   sam local generate-event - Generates Lambda events (e.g. for S3/Kinesis etc) that can be piped to 'sam local invoke'
-
-USAGE:
-   sam local generate-event command [command options] [arguments...]
-
-COMMANDS:
-     s3        Generates a sample Amazon S3 event
-     sns       Generates a sample Amazon SNS event
-     kinesis   Generates a sample Amazon Kinesis event
-     dynamodb  Generates a sample Amazon DynamoDB event
-     api       Generates a sample Amazon API Gateway event
-     schedule  Generates a sample scheduled event
-
-OPTIONS:
-   --help, -h  show help
-``` 
-
-For example, to locally test a function that recieves an S3 event, you could run:
-
-```
-$ sam local generate-event s3 --bucket <bucket> --key <key> | sam local invoke <function name>
-```
-
-
-<!-- Links -->
-[SAM]: https://github.com/awslabs/serverless-application-model
-[CodeStar]: https://aws.amazon.com/codestar
diff --git a/LICENSE b/LICENSE
index 8dada3edaf..d645695673 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -178,7 +179,7 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
@@ -186,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000000..beb7271dce
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,6 @@
+include LICENSE
+include requirements/base.txt
+include requirements/dev.txt
+recursive-include samcli/local/init/templates *
+recursive-include samcli/lib *.json
+prune tests
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..7aacdd5611
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,30 @@
+init:
+	SAM_CLI_DEV=1 pip install -e '.[dev]'
+
+test:
+	# Run unit tests
+	# Fail if coverage falls below 95%
+	pytest --cov samcli --cov-report term-missing --cov-fail-under 95 tests/unit
+
+integ-test:
+	# Integration tests don't need code coverage
+	SAM_CLI_DEV=1 pytest tests/integration
+
+func-test:
+	# Verify function test coverage only for `samcli.local` package
+	pytest --cov samcli.local --cov samcli.commands.local --cov-report term-missing tests/functional
+
+flake:
+	# Make sure code conforms to PEP8 standards
+	flake8 samcli
+	flake8 tests/unit tests/integration
+
+lint:
+	# Liner performs static analysis to catch latent bugs
+	pylint --rcfile .pylintrc samcli
+
+# Command to run everytime you make changes to verify everything works
+dev: flake lint test
+
+# Verifications to run before sending a pull request
+pr: init dev
diff --git a/NOTICE b/NOTICE
index 6ddb949a6b..3b13d76fd6 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,2 +1,2 @@
-aws-sam-local
-Copyright 2011-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. 
+AWS SAM CLI
+Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/README.md b/README.md
deleted file mode 100644
index 2635677aca..0000000000
--- a/README.md
+++ /dev/null
@@ -1,522 +0,0 @@
-<p align="center">
-  <a href="https://github.com/awslabs/aws-sam-local" align="center">
-    <img src="media/sam-local-banner.png" alt="SAM Local" title="SAM" align="center" />
-  </a>
-</p>
-
-# SAM Local (Beta)
-
-[![Build Status](https://travis-ci.org/awslabs/aws-sam-local.svg?branch=develop)](https://travis-ci.org/awslabs/aws-sam-local) ![Apache-2.0](https://img.shields.io/npm/l/aws-sam-local.svg?maxAge=2592000) ![Contributers](https://img.shields.io/github/contributors/awslabs/aws-sam-local.svg?maxAge=2592000) ![GitHub-release](https://img.shields.io/github/release/awslabs/aws-sam-local.svg?maxAge=2592000) ![npm-release](https://img.shields.io/npm/v/aws-sam-local.svg?maxAge=2592000) [![Join the chat at https://gitter.im/awslabs/aws-sam-local](https://badges.gitter.im/awslabs/aws-sam-local.svg)](https://gitter.im/awslabs/aws-sam-local?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
- **`sam`** is the AWS CLI tool for managing Serverless applications written with [AWS Serverless Application Model (SAM)](https://github.com/awslabs/serverless-application-model). SAM Local can be used to test functions locally, start a local API Gateway from a SAM template, validate a SAM template, and generate sample payloads for various event sources.
-
-- [SAM Local (Beta)](#sam-local-beta)
-    - [Main features](#main-features)
-    - [Installation](#installation)
-        - [Prerequisites](#prerequisites)
-        - [Windows, Linux, macOS with NPM [Recommended]](#windows-linux-macos-with-npm-recommended)
-        - [Binary release](#binary-release)
-        - [Build From Source](#build-from-source)
-    - [Usage](#usage)
-        - [Invoke functions locally](#invoke-functions-locally)
-        - [Generate sample event source payloads](#generate-sample-event-source-payloads)
-        - [Run API Gateway locally](#run-api-gateway-locally)
-        - [Debugging Applications](#debugging-applications)
-            - [Debugging Python functions](#debugging-python-functions)
-        - [Validate SAM templates](#validate-sam-templates)
-        - [Package and Deploy to Lambda](#package-and-deploy-to-lambda)
-    - [Getting started](#getting-started)
-    - [Advanced](#advanced)
-        - [Compiled Languages (Java)](#compiled-languages-java)
-        - [IAM Credentials](#iam-credentials)
-        - [Lambda Environment Variables](#lambda-environment-variables)
-            - [Environment Variable file](#environment-variable-file)
-            - [Shell environment](#shell-environment)
-            - [Combination of Shell and Environment Variable file](#combination-of-shell-and-environment-variable-file)
-        - [Identifying local execution from Lambda function code](#identifying-local-execution-from-lambda-function-code)
-        - [Static Assets](#static-assets)
-        - [Local Logging](#local-logging)
-        - [Remote Docker](#remote-docker)
-    - [Project Status](#project-status)
-    - [Contributing](#contributing)
-    - [A special thank you](#a-special-thank-you)
-    - [Examples](#examples)
-  
-## Main features
-
-* Develop and test your Lambda functions locally with `sam local` and Docker
-* Invoke functions from known event sources such as Amazon S3, Amazon DynamoDB, Amazon Kinesis, etc.
-* Start local API Gateway from a SAM template, and quickly iterate over your functions with hot-reloading
-* Validate SAM templates
-
-## Installation
-
-### Prerequisites
-
-Running Serverless projects and functions locally with SAM Local requires Docker to be installed and running. SAM Local will use the `DOCKER_HOST` environment variable to contact the docker daemon.
-
- - macOS: [Docker for Mac](https://store.docker.com/editions/community/docker-ce-desktop-mac)
- - Windows: [Docker Toolbox](https://download.docker.com/win/stable/DockerToolbox.exe)
- - Linux: Check your distro’s package manager (e.g. yum install docker)
-
-For macOS and Windows users: SAM local requires that the project directory (or any parent directory) is listed in Docker file sharing options.
-
-Verify that docker is working, and that you can run docker commands from the CLI (e.g. ‘docker ps’). You do not need to install/fetch/pull any containers – SAM Local will do it automatically as required.
-
-
-### Windows, Linux, macOS with NPM [Recommended]
-
-The easiest way to install **`sam`** is to use [NPM](https://www.npmjs.com).
-
-```bash
-npm install -g aws-sam-local
-```
-
-Verify the installation worked:
-```bash
-sam --version
-```
-
-If you get a permission error when using npm (such as `EACCES: permission denied`), please see the instructions on this page of the NPM documentation: [https://docs.npmjs.com/getting-started/fixing-npm-permissions](https://docs.npmjs.com/getting-started/fixing-npm-permissions).
-
-#### Upgrading via npm
-
-To update **`sam`** once installed via npm:
-
-```bash
-npm update -g aws-sam-local
-```
-
-### Binary release
-
-We also release the CLI as binaries that you can download and instantly use. You can find them under [Releases] in this repo. In case you cannot find the version or architecture you're looking for you can refer to [Build From Source](#build-from-source) section for build details.
-
-### Build From Source
-
-First, install Go (v1.8+) on your machine: [https://golang.org/doc/install](https://golang.org/doc/install), then run the following:
-
-```bash
-$ go get github.com/awslabs/aws-sam-local 
-```
-
-This will install **`sam`** to your `$GOPATH/bin` folder. Make sure this directory is in your `$PATH` (or %%PATH%% on Windows) and you should then be able to use the SAM Local. Please note that due to the package name, the binary will be installed as `aws-sam-local` rather than `sam`.
-
-```bash
-aws-sam-local --help
-```
-
-## Usage
-
-**`sam`** requires a SAM template in order to know how to invoke your function locally, and it's also true for spawning API Gateway locally - If no template is specified `template.yaml` will be used instead.
-
-You can find sample SAM templates either under **`samples`** located in this repo or by visiting [SAM] official repository.
-
-### Invoke functions locally
-
-![SAM Local Invoke Sample](media/sam-invoke.gif)
-
-You can invoke your function locally by passing its **SAM logical ID** and an event file. Alternatively, `sam local invoke` accepts stdin as an event too.
-
-```yaml
-Resources: 
-  Ratings:  # <-- Logical ID
-    Type: 'AWS::Serverless::Function'
-  ...
-```
-
-**Syntax**
-
-```bash
-# Invoking function with event file
-$ sam local invoke "Ratings" -e event.json
-
-# Invoking function with event via stdin
-$ echo '{"message": "Hey, are you there?" }' | sam local invoke "Ratings"
-
-# For more options
-$ sam local invoke --help
-```
-
-### Generate sample event source payloads
-
-To make local development and testing of Lambda functions easier, you can generate mock/sample event payloads for the following services:
-
-* S3
-* Kinesis
-* DynamoDB
-* Cloudwatch Scheduled Event
-* Cloudtrail
-* API Gateway
-
-**Syntax**
-
-```bash
-sam local generate-event <service>
-```
-
-Also, you can invoke an individual lambda function locally from a sample event payload - Here's an example using S3:
-
-```bash
-sam local generate-event s3 --bucket <bucket> --key <key> | sam local invoke <function logical id>
-```
-
-For more options, see `sam local generate-event --help`.
-
-### Run API Gateway locally
-
-`sam local start-api` spawns a local API Gateway to test HTTP request/response functionality. Features hot-reloading to allow you to quickly develop, and iterate over your functions.
-
-![SAM Local Start API](media/sam-start-api.gif)
-
-**Syntax**
-
-```bash
-sam local start-api
-```
-
-**`sam`** will automatically find any functions within your SAM template that have `Api` event sources defined, and mount them at the defined HTTP paths.
-
-In the example below, the `Ratings` function would mount `ratings.py:handler()` at `/ratings` for `GET` requests.
-
-```yaml
-Ratings:
-  Type: AWS::Serverless::Function
-  Properties:
-    Handler: ratings.handler
-    Runtime: python3.6
-    Events:
-      Api:
-        Type: Api
-        Properties:
-          Path: /ratings
-          Method: get
-```
-
-By default, SAM uses [Proxy Integration](http://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-create-api-as-simple-proxy-for-lambda.html) and expects the response from your Lambda function to include one or more of the following: `statusCode`, `headers` and/or `body`.
-
-For example:
-
-```javascript
-// Example of a Proxy Integration response
-exports.handler = (event, context, callback) => {
-    callback(null, {
-        statusCode: 200,
-        headers: { "x-custom-header" : "my custom header value" },
-        body: "hello world"
-    });
-}
-```
-
-For examples in other AWS Lambda languages, see [this page](http://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-create-api-as-simple-proxy-for-lambda.html).
-
-If your function does not return a valid [Proxy Integration](http://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-create-api-as-simple-proxy-for-lambda.html) response then you will get a HTTP 500 (Internal Server Error) when accessing your function. SAM Local will also print the following error log message to help you diagnose the problem:
-
-```
-ERROR: Function ExampleFunction returned an invalid response (must include one of: body, headers or statusCode in the response object)
-```
-
-### Debugging Applications
-
-Both `sam local invoke` and `sam local start-api` support local debugging of your functions.
-
-To run SAM Local with debugging support enabled, just specify `--debug-port` or `-d` on the command line. 
-
-```bash
-# Invoke a function locally in debug mode on port 5858 
-$ sam local invoke -d 5858 <function logical id> 
-
-# Start local API Gateway in debug mode on port 5858
-$ sam local start-api -d 5858
-```
-
-Note: If using `sam local start-api`, the local API Gateway will expose all of your Lambda functions but, since you can specify a single debug port, you can only debug one function at a time. You will need to hit your API before SAM Local binds to the port allowing the debugger to connect.
-
-Here is an example showing how to debug a NodeJS function with Microsoft Visual Studio Code:
-
-![SAM Local debugging example](media/sam-debug.gif)
-
-In order to setup Visual Studio Code for debugging with AWS SAM Local, use the following launch configuration:
-
-```
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Attach to SAM Local",
-            "type": "node",
-            "request": "attach",
-            "address": "localhost",
-            "port": 5858,
-            "localRoot": "${workspaceRoot}",
-            "remoteRoot": "/var/task",
-            "protocol": "legacy"
-        }
-    ]
-}
-``` 
-
-Note: Node.js versions **below** 7 (e.g. Node.js 4.3 and Node.js 6.10) use the `legacy` protocol, while Node.js versions including and above 7 (e.g. Node.js 8.10) use the `inspector` protocol. Be sure to specify the corresponding protocol in the `protocol` entry of your launch configuration.
-
-#### Debugging Python functions
-
-Unlike Node.JS and Java, Python requires you to enable remote debugging in your Lambda function code. If you enable debugging with `--debug-port` or `-d` for a function that uses one of the Python runtimes, SAM Local will just map through that port from your host machine through to the Lambda runtime container. You will need to enable remote debugging in your function code. To do this, use a python package such as [remote-pdb](https://pypi.python.org/pypi/remote-pdb). When configuring the host the debugger listens on in your code, make sure to use `0.0.0.0` not `127.0.0.1` to allow Docker to map through the port to your host machine.
-
-> Please note, due to a [open bug](https://github.com/Microsoft/vscode-python/issues/71) with Visual Studio Code, you may get a `Debug adapter process has terminated unexpectedly` error when attempting to debug Python applications with this IDE. Please track the [GitHub issue](https://github.com/Microsoft/vscode-python/issues/71) for updates.
-
-#### Passing Additional Runtime Debug Arguments
-
-To pass additional runtime arguments when debugging your function, use the environment variable `DEBUGGER_ARGUMENTS`. This will pass a string of arguments directly into the run command SAM Local uses to start your function.
-
-For example, if you want to load a debugger like iKPdb at runtime of your Python function, you could pass the following as `DEBUGGER_ARGUMENTS`: `-m ikpdb --ikpdb-port=5858 --ikpdb-working-directory=/var/task/ --ikpdb-client-working-directory=/myApp --ikpdb-address=0.0.0.0`. This would load iKPdb at runtime with the other arguments you've specified. In this case, your full SAM local command would be:
-
-```bash
-$ DEBUGGER_ARGUMENTS="-m ikpdb --ikpdb-port=5858 --ikpdb-working-directory=/var/task/ --ikpdb-client-working-directory=/myApp --ikpdb-address=0.0.0.0" echo {} | sam local invoke -d 5858 myFunction
-```
-
-You may pass debugger arguments to functions of all runtimes.
-
-### Connecting to docker network
-Both `sam local invoke` and `sam local start-api` support connecting the create lambda docker containers to an existing docker network.
-
-To connect the containers to an existing docker network, you can use the `--docker-network` command-line argument or the `SAM_DOCKER_NETWORK` environment variable along with the name or id of the docker network you wish to connect to.
-
-```bash
-# Invoke a function locally and connect to a docker network
-$ sam local invoke --docker-network my-custom-network <function logical id>
-
-# Start local API Gateway and connect all containers to a docker network
-$ sam local start-api --docker-network b91847306671 -d 5858
-```
-
-### Validate SAM templates
-
-Validate your templates with `$ sam validate`.
-Currently this command will validate that the template provided is valid JSON / YAML.
-As with most SAM Local commands, it will look for a `template.yaml` file in your current working directory by default. You can specify a different template file/location with the `-t` or `--template` option.
-
-**Syntax**
-
-```bash
-$ sam validate
-Valid!
-```
-
-Note: More in-depth functionality is currently disabled. An alternative validation route is to validate your JSON against schema for [the whole CloudFormation and SAM specification.](https://github.com/awslabs/goformation/blob/master/schema/sam.schema.json)
-
-### Package and Deploy to Lambda
-Once you have developed and tested your Serverless application locally, you can deploy to Lambda using `sam package` and `sam deploy` command. `package` command will zip your code artifacts, upload to S3 and produce a SAM file that is ready to be deployed to Lambda using AWS CloudFormation. `deploy` command will deploy the packaged SAM template to CloudFormation. Both `sam package` and `sam deploy` are identical to their AWS CLI equivalents commands [`aws cloudformation package`](http://docs.aws.amazon.com/cli/latest/reference/cloudformation/package.html) and [`aws cloudformation deploy`](http://docs.aws.amazon.com/cli/latest/reference/cloudformation/deploy/index.html) respectively. Please consult the AWS CLI command documentation for usage.
-
-Example:
-
-```bash
-# Package SAM template
-$ sam package --template-file sam.yaml --s3-bucket mybucket --output-template-file packaged.yaml
-
-# Deploy packaged SAM template
-$ sam deploy --template-file ./packaged.yaml --stack-name mystack --capabilities CAPABILITY_IAM
-```
-
-
-## Getting started
-
-* Check out [HOWTO Guide](HOWTO.md) section for more details
-
-## Advanced
-
-### Compiled Languages (Java)
-
-To use SAM Local with compiled languages, such as Java that require a packaged artifact (e.g. a JAR, or ZIP), you can specify the location of the artifact with the `AWS::Serverless::Function` `CodeUri` property in your SAM template.
-
-For example:
-
-```
-AWSTemplateFormatVersion: 2010-09-09
-Transform: AWS::Serverless-2016-10-31
-
-Resources:
-  ExampleJavaFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: com.example.HelloWorldHandler
-      CodeUri: ./target/HelloWorld-1.0.jar
-      Runtime: java8
-```
-
-You should then build your JAR file using your normal build process. Please note that JAR files used with AWS Lambda should be a shaded JAR file (or uber jar) containing all of the function dependencies.
-
-```
-// Build the JAR file
-$ mvn package shade:shade
-
-// Invoke with SAM Local
-$ echo '{ "some": "input" }' | sam local invoke
-
-// Or start local API Gateway simulator
-$ sam local start-api
-```
-
-You can find a full Java example in the [samples/java](samples/java) folder
-
-### IAM Credentials
-
-SAM Local will invoke functions with your locally configured IAM credentials.
-
-As with the AWS CLI and SDKs, SAM Local will look for credentials in the following order:
-
-1. Environment Variables (`AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`).
-2. The AWS credentials file (located at `~/.aws/credentials` on Linux, macOS, or Unix, or at `C:\Users\USERNAME \.aws\credentials` on Windows).
-3. Instance profile credentials (if running on Amazon EC2 with an assigned instance role).
-
-In order to test API Gateway with a non-default profile from your AWS credentials file append `--profile <profile name>` to the `start-api` command:
-
-```
-// Test API Gateway locally with a credential profile.
-$ sam local start-api --profile some_profile
-```
-
-See this [Configuring the AWS CLI](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#config-settings-and-precedence) for more details.
-
-### Lambda Environment Variables
-If your Lambda function uses environment variables, you can provide values for them will passed to the Docker container. Here is how you would do it:
-
-For example, consider the SAM template snippet:
-
-```yaml
-
-Resources:
-  MyFunction1:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.handler
-      Runtime: nodejs4.3
-      Environment:
-        Variables:
-          TABLE_NAME: prodtable
-          BUCKET_NAME: prodbucket
-
-  MyFunction2:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: app.handler
-      Runtime: nodejs4.3
-      Environment:
-        Variables:
-          STAGE: prod
-          TABLE_NAME: prodtable
-
-
-
-```
-
-#### Environment Variable file
-Use `--env-vars` argument of `invoke` or `start-api` commands to provide a JSON file that contains values for environment variables defined in your function. The file should be structured as follows:
-
-```json
-{
-  "MyFunction1": {
-    "TABLE_NAME": "localtable",
-    "BUCKET_NAME": "testBucket"
-  },
-  "MyFunction2": {
-    "TABLE_NAME": "localtable",
-    "STAGE": "dev"
-  },
-}
-
-```
-
-```bash
-$ sam local start-api --env-vars env.json
-```
-
-in alternative you can pass a cloudformation configuration.json containing a parameters key:
-
-```json
-{
-  "Parameters": {
-    "TABLE_NAME": "localtable",
-    "BUCKET_NAME": "testBucket"
-  }
-}
-```
-
-#### Shell environment 
-Variables defined in your Shell's environment will be passed to the Docker container, if they map to a Variable in your Lambda function. Shell variables are globally applicable to functions ie. If two functions have a variable called `TABLE_NAME`, then the value for `TABLE_NAME` provided through Shell's environment will be availabe to both functions. 
-
-Following command will make value of `mytable` available to both `MyFunction1` and `MyFunction2`
-
-```bash
-$ TABLE_NAME=mytable sam local start-api
-```
-
-#### Combination of Shell and Environment Variable file
-For greater control, you can use a combination shell variables and external environment variable file. If a variable is defined in both places, the one from the file will override the shell. Here is the order of priority, highest to lowest. Higher priority ones will override the lower.
-
-1. Environment Variable file
-1. Shell's environment
-1. Hard-coded values from the template
-
-### Identifying local execution from Lambda function code
-When your Lambda function is invoked using SAM Local, it sets an environment variable `AWS_SAM_LOCAL=true` in the Docker container. Your Lambda function can use this property to enable or disable functionality that would not make sense in local development. For example: Disable emitting metrics to CloudWatch (or) Enable verbose logging etc.
-
-### Static Assets
-Often, it's useful to serve up static assets (e.g CSS/HTML/Javascript etc) when developing a Serverless application. On AWS, this would normally be done with CloudFront/S3. SAM Local by default looks for a `./public/` directory in your SAM project directory and will serve up all files from it at the root of the HTTP server when using `sam local start-api`. You can override the default static asset directory by using the `-s` or `--static-dir` command line flag. You can also disable this behaviour completely by setting `--static-dir ""`. 
-
-### Local Logging
-Both `invoke` and `start-api` command allow you to pipe logs from the function's invocation into a file. This will be useful if you are running automated tests against SAM Local and want to capture logs for analysis. 
-
-Example:
-```bash
-$ sam local invoke --log-file ./output.log
-```
-
-
-### Remote Docker
-Sam Local loads function code by mounting filesystem to a Docker Volume. As a result, The project directory must be pre-mounted on the remote host where the Docker is running.
-
-If mounted, you can use the remote docker normally using `--docker-volume-basedir` or environment variable `SAM_DOCKER_VOLUME_BASEDIR`.
-
-Example - Docker Toolbox (Windows):
-
-When you install and run Docker Toolbox, the Linux VM with Docker is automatically installed in the virtual box.
-
-The /c/ path for this Linux VM is automatically shared with C:\ on the host machine.
-```powershell
-sam local invoke --docker-volume-basedir /c/Users/shlee322/projects/test "Ratings"
-```
-
-
-## Project Status
-  
-* [ ] Supported AWS Lambda Runtimes
-  - [x] `nodejs`
-  - [x] `nodejs4.3`
-  - [x] `nodejs6.10`
-  - [x] `nodejs8.10`
-  - [x] `java8`
-  - [x] `python2.7`
-  - [x] `python3.6`
-  - [ ] `dotnetcore1.0`
-  - [x] `dotnetcore2.0`
-* [x] AWS credential support 
-* [x] Debugging support
-* [x] Inline Swagger support within SAM templates
-
-## Contributing
-
-Contributions and feedback are welcome! Proposals and pull requests will be considered and responded to. For more information, see the [CONTRIBUTING](CONTRIBUTING.md) file.
-
-## A special thank you
-
-SAM Local uses the open source [docker-lambda](https://github.com/lambci/docker-lambda) Docker images created by [@mhart](https://github.com/mhart). 
-
-## Examples
-
-You can find sample functions code and a SAM template used in this README under the [samples] folder within this repo.
-
-<!-- Links -->
-[SAM]: https://github.com/awslabs/serverless-application-model
-[HOWTO]: HOWTO.md
-[Releases]: https://github.com/awslabs/aws-sam-local/releases
-[Samples]: https://github.com/awslabs/aws-sam-local/tree/master/samples
-
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000000..65c4561250
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,838 @@
+.. raw:: html
+
+   <p align="center">
+
+.. raw:: html
+
+   </p>
+
+SAM CLI (Beta)
+==============
+
+|Build Status| |Apache-2.0| |Contributers| |GitHub-release| |PyPI version|
+
+`Join the SAM developers channel (#samdev) on
+Slack <https://awssamopensource.splashthat.com/>`__ to collaborate with
+fellow community members and the AWS SAM team.
+
+**``sam``** is the AWS CLI tool for managing Serverless applications
+written with `AWS Serverless Application Model
+(SAM) <https://github.com/awslabs/serverless-application-model>`__. SAM
+CLI can be used to test functions locally, start a local API Gateway
+from a SAM template, validate a SAM template, generate sample payloads
+for various event sources, and generate a SAM project in your favorite
+Lambda Runtime.
+
+-  `SAM CLI (Beta) <#sam-cli-beta>`__
+
+   -  `Main features <#main-features>`__
+   -  `Installation <#installation>`__
+
+      -  `Prerequisites <#prerequisites>`__
+      -  `Upgrade from 0.2.11 or Below <#upgrade-from-version-0-2-11-or-below>`__
+      -  `Windows, Linux, macOS with PIP
+         [Recommended] <#windows-linux-macos-with-pip-recommended>`__
+      -  `Build From Source <#build-from-source>`__
+      -  `Install with PyEnv <#install-with-pyenv>`__
+      -  `Troubleshooting <#troubleshooting>`__
+
+         -  `Mac <#mac-issues>`__
+
+   -  `Usage <#usage>`__
+
+      -  `Invoke functions locally <#invoke-functions-locally>`__
+      -  `Generate sample event source
+         payloads <#generate-sample-event-source-payloads>`__
+      -  `Run API Gateway locally <#run-api-gateway-locally>`__
+      -  `Debugging Applications <#debugging-applications>`__
+
+         -  `Debugging Python functions <#debugging-python-functions>`__
+
+      -  `Validate SAM templates <#validate-sam-templates>`__
+      -  `Package and Deploy to
+         Lambda <#package-and-deploy-to-lambda>`__
+
+   -  `Getting started <#getting-started>`__
+   -  `Advanced <#advanced>`__
+
+      -  `Compiled Languages (Java) <#compiled-languages-java>`__
+      -  `IAM Credentials <#iam-credentials>`__
+      -  `Lambda Environment
+         Variables <#lambda-environment-variables>`__
+
+         -  `Environment Variable file <#environment-variable-file>`__
+         -  `Shell environment <#shell-environment>`__
+         -  `Combination of Shell and Environment Variable
+            file <#combination-of-shell-and-environment-variable-file>`__
+
+      -  `Identifying local execution from Lambda function
+         code <#identifying-local-execution-from-lambda-function-code>`__
+      -  `Static Assets <#static-assets>`__
+      -  `Local Logging <#local-logging>`__
+      -  `Remote Docker <#remote-docker>`__
+
+   -  `Project Status <#project-status>`__
+   -  `Contributing <#contributing>`__
+   -  `A special thank you <#a-special-thank-you>`__
+   -  `Examples <#examples>`__
+
+Main features
+-------------
+
+-  Develop and test your Lambda functions locally with ``sam local`` and
+   Docker
+-  Invoke functions from known event sources such as Amazon S3, Amazon
+   DynamoDB, Amazon Kinesis, etc.
+-  Start local API Gateway from a SAM template, and quickly iterate over
+   your functions with hot-reloading
+-  Validate SAM templates
+-  Get started with boilerplate Serverless Service in your chosen Lambda
+   Runtime ``sam init``
+
+Installation
+------------
+
+Prerequisites
+~~~~~~~~~~~~~
+
+Running Serverless projects and functions locally with SAM CLI requires
+Docker to be installed and running. SAM CLI will use the ``DOCKER_HOST``
+environment variable to contact the docker daemon.
+
+-  macOS: `Docker for
+   Mac <https://store.docker.com/editions/community/docker-ce-desktop-mac>`__
+-  Windows: `Docker
+   Toolbox <https://download.docker.com/win/stable/DockerToolbox.exe>`__
+-  Linux: Check your distro’s package manager (e.g. yum install docker)
+
+For macOS and Windows users: SAM CLI requires that the project directory
+(or any parent directory) is listed in Docker file sharing options.
+
+Verify that docker is working, and that you can run docker commands from
+the CLI (e.g. ‘docker ps’). You do not need to install/fetch/pull any
+containers – SAM CLI will do it automatically as required.
+
+Upgrade from Version 0.2.11 or Below
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Uninstall previous CLI Version
+
+.. code:: bash
+
+    npm uninstall -g aws-sam-local
+
+To upgrade to Version 0.3.0 or above, follow instructions below:
+
+Windows, Linux, macOS with PIP [Recommended]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Verify Python Version is 2.7.
+
+.. code:: bash
+    python --version
+
+The easiest way to install **``sam``** is to use
+`PIP <https://pypi.org/>`__.
+
+.. code:: bash
+
+   pip install --user aws-sam-cli
+
+Verify the installation worked:
+
+.. code:: bash
+
+   sam --version
+
+Upgrading via pip
+^^^^^^^^^^^^^^^^^
+
+To update **``sam``** once installed via pip:
+
+.. code:: bash
+
+   pip install --user --upgrade aws-sam-cli
+
+Build From Source
+~~~~~~~~~~~~~~~~~
+
+First, install Python(2.7) on your machine, then run the following:
+
+.. code:: bash
+
+   # Clone the repository
+   $ git clone git@github.com:awslabs/aws-sam-cli.git
+
+   # cd into the git
+   $ cd aws-sam-cli
+
+   # pip install the repository
+   $ pip install --user -e .
+
+Install with PyEnv
+~~~~~~~~~~~~~~~~~~
+.. code:: bash
+
+    # Install PyEnv (https://github.com/pyenv/pyenv#installation)
+    $ brew update
+    $ brew install pyenv
+
+    # Initialize pyenv using bash_profile
+    $ echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n  eval "$(pyenv init -)"\nfi\nexport PATH="~/.pyenv/bin:$PATH"' >> ~/.bash_profile
+    # or using zshrc
+    $ echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n  eval "$(pyenv init -)"\nfi\nexport PATH="~/.pyenv/bin:$PATH"' >> ~/.zshrc
+
+    # restart the shell
+    $ exec "$SHELL"
+
+    # Install Python 2.7
+    $ pyenv install 2.7.14
+    $ pyenv local 2.7.14
+
+    # Install the CLI
+    $ pip install --user aws-sam-cli
+
+    # Verify your installation worked
+    $ sam –version
+
+Troubleshooting
+~~~~~~~~~~~~~~~
+
+Mac Issues
+^^^^^^^^^^
+
+1. **[Errno 13] Permission denied** If you had installed Python using
+   Homebrew, you might need to use ``sudo`` to install SAM CLI:
+
+.. code:: bash
+
+   sudo pip install aws-sam-cli
+
+1. **TLSV1_ALERT_PROTOCOL_VERSION**:
+
+If you get an error something similar to:
+
+::
+
+   Could not fetch URL https://pypi.python.org/simple/click/: There was a problem confirming the ssl certificate: [SSL: TLSV1_ALERT_PROTOCOL_VERSION] tlsv1 alert protocol version (_ssl.c:590) - skipping
+
+then you are probably using the default version of Python that came with
+your Mac. This is outdated. So make sure you install Python again using
+homebrew and try again:
+
+.. code:: bash
+
+   brew install python@2
+
+Followed by:
+
+.. code:: bash
+
+   pip install --user aws-sam-cli
+
+Usage
+-----
+
+**``sam``** requires a SAM template in order to know how to invoke your
+function locally, and it’s also true for spawning API Gateway locally -
+If no template is specified ``template.yaml`` will be used instead.
+
+You can find sample SAM templates either under **``samples``** located
+in this repo or by visiting
+`SAM <https://github.com/awslabs/serverless-application-model>`__
+official repository.
+
+Invoke functions locally
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. figure:: media/sam-invoke.gif
+   :alt: SAM CLI Invoke Sample
+
+   SAM CLI Invoke Sample
+
+You can invoke your function locally by passing its **SAM logical ID**
+and an event file. Alternatively, ``sam local invoke`` accepts stdin as
+an event too.
+
+.. code:: yaml
+
+   Resources:
+     Ratings:  # <-- Logical ID
+       Type: 'AWS::Serverless::Function'
+     ...
+
+**Syntax**
+
+.. code:: bash
+
+   # Invoking function with event file
+   $ sam local invoke "Ratings" -e event.json
+
+   # Invoking function with event via stdin
+   $ echo '{"message": "Hey, are you there?" }' | sam local invoke "Ratings"
+
+   # For more options
+   $ sam local invoke --help
+
+Generate sample event source payloads
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To make local development and testing of Lambda functions easier, you
+can generate mock/sample event payloads for the following services:
+
+-  S3
+-  Kinesis
+-  DynamoDB
+-  Cloudwatch Scheduled Event
+-  Cloudtrail
+-  API Gateway
+
+**Syntax**
+
+.. code:: bash
+
+   sam local generate-event <service>
+
+Also, you can invoke an individual lambda function locally from a sample
+event payload - Here’s an example using S3:
+
+.. code:: bash
+
+   sam local generate-event s3 --bucket <bucket> --key <key> | sam local invoke <function logical id>
+
+For more options, see ``sam local generate-event --help``.
+
+Run API Gateway locally
+~~~~~~~~~~~~~~~~~~~~~~~
+
+``sam local start-api`` spawns a local API Gateway to test HTTP
+request/response functionality. Features hot-reloading to allow you to
+quickly develop, and iterate over your functions.
+
+.. figure:: media/sam-start-api.gif
+   :alt: SAM CLI Start API
+
+   SAM CLI Start API
+
+**Syntax**
+
+.. code:: bash
+
+   sam local start-api
+
+**``sam``** will automatically find any functions within your SAM
+template that have ``Api`` event sources defined, and mount them at the
+defined HTTP paths.
+
+In the example below, the ``Ratings`` function would mount
+``ratings.py:handler()`` at ``/ratings`` for ``GET`` requests.
+
+.. code:: yaml
+
+   Ratings:
+     Type: AWS::Serverless::Function
+     Properties:
+       Handler: ratings.handler
+       Runtime: python3.6
+       Events:
+         Api:
+           Type: Api
+           Properties:
+             Path: /ratings
+             Method: get
+
+By default, SAM uses `Proxy
+Integration <http://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-create-api-as-simple-proxy-for-lambda.html>`__
+and expects the response from your Lambda function to include one or
+more of the following: ``statusCode``, ``headers`` and/or ``body``.
+
+For example:
+
+.. code:: javascript
+
+   // Example of a Proxy Integration response
+   exports.handler = (event, context, callback) => {
+       callback(null, {
+           statusCode: 200,
+           headers: { "x-custom-header" : "my custom header value" },
+           body: "hello world"
+       });
+   }
+
+For examples in other AWS Lambda languages, see `this
+page <http://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-create-api-as-simple-proxy-for-lambda.html>`__.
+
+If your function does not return a valid `Proxy
+Integration <http://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-create-api-as-simple-proxy-for-lambda.html>`__
+response then you will get a HTTP 500 (Internal Server Error) when
+accessing your function. SAM CLI will also print the following error log
+message to help you diagnose the problem:
+
+::
+
+   ERROR: Function ExampleFunction returned an invalid response (must include one of: body, headers or statusCode in the response object)
+
+Debugging Applications
+~~~~~~~~~~~~~~~~~~~~~~
+
+Both ``sam local invoke`` and ``sam local start-api`` support local
+debugging of your functions.
+
+To run SAM Local with debugging support enabled, just specify
+``--debug-port`` or ``-d`` on the command line.
+
+.. code:: bash
+
+   # Invoke a function locally in debug mode on port 5858
+   $ sam local invoke -d 5858 <function logical id>
+
+   # Start local API Gateway in debug mode on port 5858
+   $ sam local start-api -d 5858
+
+Note: If using ``sam local start-api``, the local API Gateway will
+expose all of your Lambda functions but, since you can specify a single
+debug port, you can only debug one function at a time. You will need to
+hit your API before SAM CLI binds to the port allowing the debugger to
+connect.
+
+Here is an example showing how to debug a NodeJS function with Microsoft
+Visual Studio Code:
+
+.. figure:: media/sam-debug.gif
+   :alt: SAM Local debugging example
+
+   SAM Local debugging example
+
+In order to setup Visual Studio Code for debugging with AWS SAM CLI, use
+the following launch configuration:
+
+::
+
+   {
+       "version": "0.2.0",
+       "configurations": [
+           {
+               "name": "Attach to SAM Local",
+               "type": "node",
+               "request": "attach",
+               "address": "localhost",
+               "port": 5858,
+               "localRoot": "${workspaceRoot}",
+               "remoteRoot": "/var/task",
+               "protocol": "legacy"
+           }
+       ]
+   }
+
+Note: Node.js versions **below** 7 (e.g. Node.js 4.3 and Node.js 6.10)
+use the ``legacy`` protocol, while Node.js versions including and above
+7 (e.g. Node.js 8.10) use the ``inspector`` protocol. Be sure to specify
+the corresponding protocol in the ``protocol`` entry of your launch
+configuration.
+
+Debugging Python functions
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Unlike Node.JS and Java, Python requires you to enable remote debugging
+in your Lambda function code. If you enable debugging with
+``--debug-port`` or ``-d`` for a function that uses one of the Python
+runtimes, SAM CLI will just map through that port from your host machine
+through to the Lambda runtime container. You will need to enable remote
+debugging in your function code. To do this, use a python package such
+as `remote-pdb <https://pypi.python.org/pypi/remote-pdb>`__. When
+configuring the host the debugger listens on in your code, make sure to
+use ``0.0.0.0`` not ``127.0.0.1`` to allow Docker to map through the
+port to your host machine.
+
+   Please note, due to a `open
+   bug <https://github.com/Microsoft/vscode-python/issues/71>`__ with
+   Visual Studio Code, you may get a
+   ``Debug adapter process has terminated unexpectedly`` error when
+   attempting to debug Python applications with this IDE. Please track
+   the `GitHub
+   issue <https://github.com/Microsoft/vscode-python/issues/71>`__ for
+   updates.
+
+Passing Additional Runtime Debug Arguments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To pass additional runtime arguments when debugging your function, use
+the environment variable ``DEBUGGER_ARGUMENTS``. This will pass a string
+of arguments directly into the run command SAM CLI uses to start your
+function.
+
+For example, if you want to load a debugger like iKPdb at runtime of
+your Python function, you could pass the following as
+``DEBUGGER_ARGUMENTS``:
+``-m ikpdb --ikpdb-port=5858 --ikpdb-working-directory=/var/task/ --ikpdb-client-working-directory=/myApp --ikpdb-address=0.0.0.0``.
+This would load iKPdb at runtime with the other arguments you’ve
+specified. In this case, your full SAM CLI command would be:
+
+.. code:: bash
+
+   $ DEBUGGER_ARGUMENTS="-m ikpdb --ikpdb-port=5858 --ikpdb-working-directory=/var/task/ --ikpdb-client-working-directory=/myApp --ikpdb-address=0.0.0.0" echo {} | sam local invoke -d 5858 myFunction
+
+You may pass debugger arguments to functions of all runtimes.
+
+Connecting to docker network
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Both ``sam local invoke`` and ``sam local start-api`` support connecting
+the create lambda docker containers to an existing docker network.
+
+To connect the containers to an existing docker network, you can use the
+``--docker-network`` command-line argument or the ``SAM_DOCKER_NETWORK``
+environment variable along with the name or id of the docker network you
+wish to connect to.
+
+.. code:: bash
+
+   # Invoke a function locally and connect to a docker network
+   $ sam local invoke --docker-network my-custom-network <function logical id>
+
+   # Start local API Gateway and connect all containers to a docker network
+   $ sam local start-api --docker-network b91847306671 -d 5858
+
+Validate SAM templates
+~~~~~~~~~~~~~~~~~~~~~~
+
+Validate your templates with ``$ sam validate``. Currently this command
+will validate that the template provided is valid JSON / YAML. As with
+most SAM CLI commands, it will look for a ``template.[yaml|yml]`` file
+in your current working directory by default. You can specify a
+different template file/location with the ``-t`` or ``--template``
+option.
+
+**Syntax**
+
+.. code:: bash
+
+   $ sam validate
+   <path-to-file>/template.yml is a valid SAM Template
+
+Note: The validate command requires AWS credentials to be configured. See IAMCreds_.
+
+Package and Deploy to Lambda
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Once you have developed and tested your Serverless application locally,
+you can deploy to Lambda using ``sam package`` and ``sam deploy``
+command. ``package`` command will zip your code artifacts, upload to S3
+and produce a SAM file that is ready to be deployed to Lambda using AWS
+CloudFormation. ``deploy`` command will deploy the packaged SAM template
+to CloudFormation. Both ``sam package`` and ``sam deploy`` are identical
+to their AWS CLI equivalents commands
+```aws cloudformation package`` <http://docs.aws.amazon.com/cli/latest/reference/cloudformation/package.html>`__
+and
+```aws cloudformation deploy`` <http://docs.aws.amazon.com/cli/latest/reference/cloudformation/deploy/index.html>`__
+respectively. Please consult the AWS CLI command documentation for
+usage.
+
+Example:
+
+.. code:: bash
+
+   # Package SAM template
+   $ sam package --template-file sam.yaml --s3-bucket mybucket --output-template-file packaged.yaml
+
+   # Deploy packaged SAM template
+   $ sam deploy --template-file ./packaged.yaml --stack-name mystack --capabilities CAPABILITY_IAM
+
+Getting started
+---------------
+
+-  Check out `HOWTO Guide <HOWTO.md>`__ section for more details
+
+Advanced
+--------
+
+Compiled Languages (Java)
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To use SAM CLI with compiled languages, such as Java that require a
+packaged artifact (e.g. a JAR, or ZIP), you can specify the location of
+the artifact with the ``AWS::Serverless::Function`` ``CodeUri`` property
+in your SAM template.
+
+For example:
+
+::
+
+   AWSTemplateFormatVersion: 2010-09-09
+   Transform: AWS::Serverless-2016-10-31
+
+   Resources:
+     ExampleJavaFunction:
+       Type: AWS::Serverless::Function
+       Properties:
+         Handler: com.example.HelloWorldHandler
+         CodeUri: ./target/HelloWorld-1.0.jar
+         Runtime: java8
+
+You should then build your JAR file using your normal build process.
+Please note that JAR files used with AWS Lambda should be a shaded JAR
+file (or uber jar) containing all of the function dependencies.
+
+::
+
+   // Build the JAR file
+   $ mvn package shade:shade
+
+   // Invoke with SAM Local
+   $ echo '{ "some": "input" }' | sam local invoke
+
+   // Or start local API Gateway simulator
+   $ sam local start-api
+
+You can find a full Java example in the `samples/java <samples/java>`__
+folder
+
+.. _IAMCreds
+
+IAM Credentials
+~~~~~~~~~~~~~~~
+
+SAM CLI will invoke functions with your locally configured IAM
+credentials.
+
+As with the AWS CLI and SDKs, SAM CLI will look for credentials in the
+following order:
+
+1. Environment Variables (``AWS_ACCESS_KEY_ID``,
+   ``AWS_SECRET_ACCESS_KEY``).
+2. The AWS credentials file (located at ``~/.aws/credentials`` on Linux,
+   macOS, or Unix, or at ``C:\Users\USERNAME \.aws\credentials`` on
+   Windows).
+3. Instance profile credentials (if running on Amazon EC2 with an
+   assigned instance role).
+
+In order to test API Gateway with a non-default profile from your AWS
+credentials file append ``--profile <profile name>`` to the
+``start-api`` command:
+
+::
+
+   // Test API Gateway locally with a credential profile.
+   $ sam local start-api --profile some_profile
+
+See this `Configuring the AWS
+CLI <http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#config-settings-and-precedence>`__
+for more details.
+
+Lambda Environment Variables
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If your Lambda function uses environment variables, you can provide
+values for them will passed to the Docker container. Here is how you
+would do it:
+
+For example, consider the SAM template snippet:
+
+.. code:: yaml
+
+
+   Resources:
+     MyFunction1:
+       Type: AWS::Serverless::Function
+       Properties:
+         Handler: index.handler
+         Runtime: nodejs4.3
+         Environment:
+           Variables:
+             TABLE_NAME: prodtable
+             BUCKET_NAME: prodbucket
+
+     MyFunction2:
+       Type: AWS::Serverless::Function
+       Properties:
+         Handler: app.handler
+         Runtime: nodejs4.3
+         Environment:
+           Variables:
+             STAGE: prod
+             TABLE_NAME: prodtable
+
+
+Environment Variable file
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Use ``--env-vars`` argument of ``invoke`` or ``start-api`` commands to
+provide a JSON file that contains values for environment variables
+defined in your function. The file should be structured as follows:
+
+.. code:: json
+
+   {
+     "MyFunction1": {
+       "TABLE_NAME": "localtable",
+       "BUCKET_NAME": "testBucket"
+     },
+     "MyFunction2": {
+       "TABLE_NAME": "localtable",
+       "STAGE": "dev"
+     },
+   }
+
+.. code:: bash
+
+   $ sam local start-api --env-vars env.json
+
+
+Shell environment
+^^^^^^^^^^^^^^^^^
+
+Variables defined in your Shell’s environment will be passed to the
+Docker container, if they map to a Variable in your Lambda function.
+Shell variables are globally applicable to functions ie. If two
+functions have a variable called ``TABLE_NAME``, then the value for
+``TABLE_NAME`` provided through Shell’s environment will be availabe to
+both functions.
+
+Following command will make value of ``mytable`` available to both
+``MyFunction1`` and ``MyFunction2``
+
+.. code:: bash
+
+   $ TABLE_NAME=mytable sam local start-api
+
+Combination of Shell and Environment Variable file
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+For greater control, you can use a combination shell variables and
+external environment variable file. If a variable is defined in both
+places, the one from the file will override the shell. Here is the order
+of priority, highest to lowest. Higher priority ones will override the
+lower.
+
+1. Environment Variable file
+2. Shell’s environment
+3. Hard-coded values from the template
+
+Identifying local execution from Lambda function code
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When your Lambda function is invoked using SAM CLI, it sets an
+environment variable ``AWS_SAM_LOCAL=true`` in the Docker container.
+Your Lambda function can use this property to enable or disable
+functionality that would not make sense in local development. For
+example: Disable emitting metrics to CloudWatch (or) Enable verbose
+logging etc.
+
+Static Assets
+~~~~~~~~~~~~~
+
+Often, it’s useful to serve up static assets (e.g CSS/HTML/Javascript
+etc) when developing a Serverless application. On AWS, this would
+normally be done with CloudFront/S3. SAM CLI by default looks for a
+``./public/`` directory in your SAM project directory and will serve up
+all files from it at the root of the HTTP server when using
+``sam local start-api``. You can override the default static asset
+directory by using the ``-s`` or ``--static-dir`` command line flag. You
+can also disable this behaviour completely by setting
+``--static-dir ""``.
+
+Local Logging
+~~~~~~~~~~~~~
+
+Both ``invoke`` and ``start-api`` command allow you to pipe logs from
+the function’s invocation into a file. This will be useful if you are
+running automated tests against SAM CLI and want to capture logs for
+analysis.
+
+Example:
+
+.. code:: bash
+
+   $ sam local invoke --log-file ./output.log
+
+Remote Docker
+~~~~~~~~~~~~~
+
+Sam CLI loads function code by mounting filesystem to a Docker Volume.
+As a result, The project directory must be pre-mounted on the remote
+host where the Docker is running.
+
+If mounted, you can use the remote docker normally using
+``--docker-volume-basedir`` or environment variable
+``SAM_DOCKER_VOLUME_BASEDIR``.
+
+Example - Docker Toolbox (Windows):
+
+When you install and run Docker Toolbox, the Linux VM with Docker is
+automatically installed in the virtual box.
+
+The /c/ path for this Linux VM is automatically shared with C: on the
+host machine.
+
+.. code:: powershell
+
+   sam local invoke --docker-volume-basedir /c/Users/shlee322/projects/test "Ratings"
+
+Project Status
+--------------
+
+-  [ ] Python Versions support
+
+   -  [x] Python 2.7
+   -  [ ] Python 3.6
+
+-  [ ] Supported AWS Lambda Runtimes
+
+   -  [x] ``nodejs``
+   -  [x] ``nodejs4.3``
+   -  [x] ``nodejs6.10``
+   -  [x] ``nodejs8.10``
+   -  [x] ``java8``
+   -  [x] ``python2.7``
+   -  [x] ``python3.6``
+   -  [ ] ``dotnetcore1.0``
+   -  [x] ``dotnetcore2.0``
+
+-  [x] AWS credential support
+-  [x] Debugging support
+-  [x] Inline Swagger support within SAM templates
+-  [x] Validating SAM templates locally
+-  [x] Generating boilerplate templates
+
+   -  [x] ``nodejs``
+   -  [x] ``nodejs4.3``
+   -  [x] ``nodejs6.10``
+   -  [x] ``nodejs8.10``
+   -  [x] ``java8``
+   -  [x] ``python2.7``
+   -  [x] ``python3.6``
+   -  [x] ``dotnetcore1.0``
+   -  [x] ``dotnetcore2.0``
+
+Contributing
+------------
+
+Contributions and feedback are welcome! Proposals and pull requests will
+be considered and responded to. For more information, see the
+`CONTRIBUTING <CONTRIBUTING.md>`__ file.
+
+A special thank you
+-------------------
+
+SAM CLI uses the open source
+`docker-lambda <https://github.com/lambci/docker-lambda>`__ Docker
+images created by [@mhart](https://github.com/mhart).
+
+Examples
+--------
+
+You can find sample functions code and a SAM template used in this
+README under the
+`samples <https://github.com/awslabs/aws-sam-local/tree/master/samples>`__
+folder within this repo.
+
+.. raw:: html
+
+   <!-- Links -->
+
+.. |Build Status| image:: https://travis-ci.org/awslabs/aws-sam-local.svg?branch=develop
+.. |Apache-2.0| image:: https://img.shields.io/npm/l/aws-sam-local.svg?maxAge=2592000
+.. |Contributers| image:: https://img.shields.io/github/contributors/awslabs/aws-sam-local.svg?maxAge=2592000
+.. |GitHub-release| image:: https://img.shields.io/github/release/awslabs/aws-sam-local.svg?maxAge=2592000
+.. |PyPI version| image:: https://badge.fury.io/py/aws-sam-cli.svg
+
diff --git a/aws_sam_local_suite_test.go b/aws_sam_local_suite_test.go
deleted file mode 100644
index d3f10ba96a..0000000000
--- a/aws_sam_local_suite_test.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package main
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"testing"
-)
-
-func TestAwsSamLocal(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "AwsSamLocal Suite")
-}
diff --git a/convert.go b/convert.go
deleted file mode 100644
index 1affe019d5..0000000000
--- a/convert.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package main
-
-import (
-	"regexp"
-	"strings"
-
-	"github.com/awslabs/goformation/cloudformation"
-)
-
-// addCloudformationLambdaFunctions converts all Cloudformation Lambda functions to Serverless functions. On name collisions, existing
-// serverless functions are preserved.
-func addCloudformationLambdaFunctions(template *cloudformation.Template, functions map[string]cloudformation.AWSServerlessFunction) {
-	// convert all lambda functions to serverless functions so that invoke works for them
-	for n, f := range template.GetAllAWSLambdaFunctionResources() {
-		if _, found := functions[n]; !found {
-			functions[n] = lambdaToServerless(f)
-		}
-	}
-}
-
-// dlqTypeEx is used to extract the DLQ type from an ARN
-var dlqTypeEx = regexp.MustCompile(`^arn:aws(?:-[\\w]+)*:(sns|sqs):([a-zA-Z_0-9+=,.@\-/:]+)$`)
-
-// lambdaToServerless converts a Cloudformation lambda to its Serverless counterpart. The conversion makes the following assumptions:
-// * codeUri is set to nil in order to use the local code and not the remote one
-// * no events are associated with the serverless function
-// * no policies are added because a role is already specified
-func lambdaToServerless(lambda cloudformation.AWSLambdaFunction) (serverless cloudformation.AWSServerlessFunction) {
-	// serverless policies are not needed because lambdas have a role
-	serverless.Policies = nil
-
-	// no events are associated with the function
-	serverless.Events = nil
-
-	// codeUri is set to nil in order to get the code locally and not from a remote source
-	serverless.CodeUri = nil
-
-	serverless.FunctionName = lambda.FunctionName
-	serverless.Description = lambda.Description
-	serverless.Handler = lambda.Handler
-	serverless.Timeout = lambda.Timeout
-	serverless.KmsKeyArn = lambda.KmsKeyArn
-	serverless.Role = lambda.Role
-	serverless.Runtime = lambda.Runtime
-	serverless.MemorySize = lambda.MemorySize
-
-	if lambda.DeadLetterConfig != nil {
-		dlqType := "SQS"
-		match := dlqTypeEx.FindAllStringSubmatch(lambda.DeadLetterConfig.TargetArn, -1)
-		if len(match) > 0 {
-			dlqType = match[0][1]
-		}
-
-		serverless.DeadLetterQueue = &cloudformation.AWSServerlessFunction_DeadLetterQueue{
-			TargetArn: lambda.DeadLetterConfig.TargetArn,
-			Type:      strings.ToUpper(dlqType),
-		}
-	}
-
-	if len(lambda.Tags) > 0 {
-		tags := make(map[string]string)
-		for _, t := range lambda.Tags {
-			tags[t.Key] = t.Value
-		}
-		serverless.Tags = tags
-	}
-
-	if lambda.TracingConfig != nil {
-		serverless.Tracing = lambda.TracingConfig.Mode
-	}
-
-	if lambda.Environment != nil {
-		serverless.Environment = &cloudformation.AWSServerlessFunction_FunctionEnvironment{
-			Variables: lambda.Environment.Variables,
-		}
-	}
-
-	if lambda.VpcConfig != nil {
-		serverless.VpcConfig = &cloudformation.AWSServerlessFunction_VpcConfig{
-			SecurityGroupIds: lambda.VpcConfig.SecurityGroupIds,
-			SubnetIds:        lambda.VpcConfig.SubnetIds,
-		}
-	}
-
-	return
-}
diff --git a/convert_test.go b/convert_test.go
deleted file mode 100644
index 3a6810cfb6..0000000000
--- a/convert_test.go
+++ /dev/null
@@ -1,127 +0,0 @@
-package main
-
-import (
-	"github.com/awslabs/goformation"
-	"github.com/awslabs/goformation/cloudformation"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Convert Cloudformation Lambda functions to Serverless", func() {
-
-	Context("with normal input", func() {
-
-		It("converts an empty function", func() {
-			f := cloudformation.AWSLambdaFunction{}
-			expected := cloudformation.AWSServerlessFunction{}
-			Expect(lambdaToServerless(f)).To(Equal(expected))
-		})
-
-		It("converts a function", func() {
-			f := cloudformation.AWSLambdaFunction{
-				FunctionName: "foo",
-				Description:  "desc",
-				Handler:      "index.js",
-				Timeout:      30,
-				Runtime:      "nodejs6.10",
-				MemorySize:   300,
-				Role:         "arn:aws:iam::123456789012:role/S3Access",
-				KmsKeyArn:    "arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012",
-				DeadLetterConfig: &cloudformation.AWSLambdaFunction_DeadLetterConfig{
-					TargetArn: "arn:aws:sns:us-east-1:123456789012:my_corporate_topic:02034b43-fefa-4e07-a5eb-3be56f8c54ce",
-				},
-				Tags: []cloudformation.Tag{{Key: "key", Value: "value"}},
-				TracingConfig: &cloudformation.AWSLambdaFunction_TracingConfig{
-					Mode: "PassThrough",
-				},
-				Environment: &cloudformation.AWSLambdaFunction_Environment{
-					Variables: map[string]string{"k1": "v1"},
-				},
-				VpcConfig: &cloudformation.AWSLambdaFunction_VpcConfig{
-					SecurityGroupIds: []string{"sg-edcd9784"},
-					SubnetIds:        []string{"subnet"},
-				},
-			}
-			expected := cloudformation.AWSServerlessFunction{
-				CodeUri:      nil,
-				Events:       nil,
-				Policies:     nil,
-				FunctionName: "foo",
-				Description:  "desc",
-				Handler:      "index.js",
-				Timeout:      30,
-				Runtime:      "nodejs6.10",
-				MemorySize:   300,
-				Role:         "arn:aws:iam::123456789012:role/S3Access",
-				KmsKeyArn:    "arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012",
-				DeadLetterQueue: &cloudformation.AWSServerlessFunction_DeadLetterQueue{
-					TargetArn: "arn:aws:sns:us-east-1:123456789012:my_corporate_topic:02034b43-fefa-4e07-a5eb-3be56f8c54ce",
-					Type:      "SNS",
-				},
-				Tags:    map[string]string{"key": "value"},
-				Tracing: "PassThrough",
-				Environment: &cloudformation.AWSServerlessFunction_FunctionEnvironment{
-					Variables: map[string]string{"k1": "v1"},
-				},
-				VpcConfig: &cloudformation.AWSServerlessFunction_VpcConfig{
-					SecurityGroupIds: []string{"sg-edcd9784"},
-					SubnetIds:        []string{"subnet"},
-				},
-			}
-
-			Expect(lambdaToServerless(f)).To(Equal(expected))
-		})
-
-	})
-
-	Context("with existing template", func() {
-
-		functions := map[string]cloudformation.AWSServerlessFunction{
-			"ExistingFunction": cloudformation.AWSServerlessFunction{},
-		}
-		const input = `{
-            "Resources": {
-              "ExistingFunction": {
-                "Type": "AWS::Lambda::Function",
-                "Properties": {
-                  "FunctionName": "ExistingFunction",
-                  "Handler": "com.foo.bar.Dispatcher::handleRequest"
-                }
-              },
-              "Func1": {
-                "Type": "AWS::Lambda::Function",
-                "Properties": {
-                  "FunctionName": "Func1",
-                  "Handler": "com.foo.bar.Dispatcher::handleRequest"
-                }
-              }
-            }
-          }`
-
-		template, err := goformation.ParseJSON([]byte(input))
-
-		It("parses correctly", func() {
-			Expect(err).To(BeNil())
-			Expect(template).To(Not(BeNil()))
-			lambdas := template.GetAllAWSLambdaFunctionResources()
-			Expect(lambdas).To(HaveLen(2))
-			Expect(lambdas).To(HaveKey("Func1"))
-			Expect(lambdas).To(HaveKey("ExistingFunction"))
-		})
-
-		if template != nil {
-			addCloudformationLambdaFunctions(template, functions)
-		}
-
-		It("adds lambda functions that don't clash", func() {
-			Expect(functions).To(HaveLen(2))
-			Expect(functions).To(HaveKey("Func1"))
-			Expect(functions).To(HaveKey("ExistingFunction"))
-		})
-
-		It("ignores lambda functions which already exist", func() {
-			Expect(functions).To(HaveKeyWithValue("ExistingFunction", Equal(cloudformation.AWSServerlessFunction{})))
-		})
-
-	})
-})
diff --git a/deploy.go b/deploy.go
deleted file mode 100644
index 3619686c8f..0000000000
--- a/deploy.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package main
-
-import (
-	"io"
-	"log"
-	"os"
-	"os/exec"
-)
-
-func deploy() {
-
-	args := []string{"cloudformation", "deploy"}
-	for _, arg := range os.Args[2:] {
-		args = append(args, arg)
-	}
-
-	cmd := exec.Command("aws", args...)
-
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if err := cmd.Start(); err != nil {
-		log.Fatal(err)
-	}
-
-	go io.Copy(os.Stderr, stderr)
-	go io.Copy(os.Stdout, stdout)
-
-	if err := cmd.Wait(); err != nil {
-		os.Exit(1)
-	}
-}
diff --git a/distribution/npm/npm-release.sh b/distribution/npm/npm-release.sh
deleted file mode 100755
index 0f7cf382e3..0000000000
--- a/distribution/npm/npm-release.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-# Set NPM_TOKEN environment variable to the User's token before running the script
-#
-# USAGE: ./npm-release.sh
-# Picks up the version from latest tag
-
-VERSION=`git describe --abbrev=0 --tags`
-VERSION="${VERSION:1:${#VERSION}}" # Remove starting 'v' v0.0.1 => 0.0.1
-PACKAGE=./package.json
-BACKUP=./package.json.bck
-
-PKG_ROOT=`pwd`
-NPM_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $NPM_DIR
-
-# Add Readme to NPM package to show in NPM Package's webpage
-cp $PKG_ROOT/README.md $NPM_DIR
-
-# 1. Replace __VERSION__ from package.json with version tag passed as first argument
-cp $PACKAGE $BACKUP
-sed -i '' -e "s/__VERSION__/$VERSION/g" $PACKAGE
-
-# Make sure the replace actually happened
-grep __VERSION__ $PACKAGE
-if [ $? -eq 0 ]
-then
-    echo "Replacing __VERSION__ in $PACKAGE was unsuccessful"
-    cat $PACKAGE
-    exit 1
-fi
-
-# 2. Generated package.json should be published to NPM
-npm publish ./
-
-if [ $? -ne 0 ]
-then
-    echo "ERROR publishing to npm"
-    exit 1
-fi
-
-# Restore package.json file
-mv $BACKUP $PACKAGE
-rm $NPM_DIR/README.md
-echo "Successfully published NPM for version $VERSION"
-exit 0
diff --git a/distribution/npm/package.json b/distribution/npm/package.json
deleted file mode 100644
index d1bae674b7..0000000000
--- a/distribution/npm/package.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name":"aws-sam-local",
-  "version":"__VERSION__",
-  "description":"Built binaries for AWS SAM Local CLI - https://github.com/awslabs/aws-sam-local",
-  "main":"index.js",
-  "dependencies":{
-    "go-npm":"^0.1.8"
-  },
-  "scripts":{
-    "postinstall":"go-npm install",
-    "preuninstall":"go-npm uninstall"
-  },
-  "goBinary":{
-    "name":"sam",
-    "path":"./bin",
-    "url":"https://github.com/awslabs/aws-sam-local/releases/download/v{{version}}/sam_{{version}}_{{platform}}_{{arch}}.tar.gz"
-  },
-  "preferGlobal":"true",
-  "license":"Apache-2.0",
-  "repository":{
-    "type":"git",
-    "url":"https://github.com/awslabs/aws-sam-local.git"
-  },
-  "bugs":{
-    "url":"https://github.com/awslabs/aws-sam-local/issues"
-  },
-  "homepage":"https://github.com/awslabs/aws-sam-local#readme"
-}
diff --git a/vendor/github.com/docker/go-connections/sockets/README.md b/docs/.gitkeep
similarity index 100%
rename from vendor/github.com/docker/go-connections/sockets/README.md
rename to docs/.gitkeep
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 0000000000..0d692e8b5c
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+SPHINXPROJ    = SAMCLI
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
new file mode 100644
index 0000000000..74ad42a370
--- /dev/null
+++ b/docs/conf.py
@@ -0,0 +1,169 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# SAM CLI documentation build configuration file, created by
+# sphinx-quickstart on Fri Apr 27 12:48:05 2018.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = []
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'SAM CLI'
+copyright = '2018, AWS SAM'
+author = 'AWS SAM'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = ''
+# The full version, including alpha/beta/rc tags.
+release = ''
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Custom sidebar templates, must be a dictionary that maps document names
+# to template names.
+#
+# This is required for the alabaster theme
+# refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars
+html_sidebars = {
+    '**': [
+        'relations.html',  # needs 'show_related': True theme option to display
+        'searchbox.html',
+    ]
+}
+
+
+# -- Options for HTMLHelp output ------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'SAMCLIdoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'SAMCLI.tex', 'SAM CLI Documentation',
+     'AWS SAM', 'manual'),
+]
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'samcli', 'SAM CLI Documentation',
+     [author], 1)
+]
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'SAMCLI', 'SAM CLI Documentation',
+     author, 'SAMCLI', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+
+
diff --git a/docs/deploying_serverless_applications.rst b/docs/deploying_serverless_applications.rst
new file mode 100644
index 0000000000..92eab4fd82
--- /dev/null
+++ b/docs/deploying_serverless_applications.rst
@@ -0,0 +1,48 @@
+Once you have created a Lambda function and a template.yaml file, you can use the AWS CLI to package and deploy your serverless application.
+
+Packaging and deploying your application
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to complete the procedures below, you need to first complete the following:
+
+ `Set up an AWS Account <https://docs.aws.amazon.com/lambda/latest/dg/setup.html>`__.
+
+ `Set up the AWS CLI <https://docs.aws.amazon.com/lambda/latest/dg/setup-awscli.html>`__ .
+
+Packaging your application
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+To package your application, create an Amazon S3 bucket that the package command will use to upload your ZIP deployment package (if you haven't specified one in your example.yaml file). You can use the following command to create the Amazon S3 bucket:
+
+.. code:: bash
+
+    aws s3 mb s3://bucket-name --region <region-name>
+
+Next, open a command prompt and type the following:
+
+.. code:: bash
+
+    sam package \
+        --template-file file path/template.yaml \
+        --output-template-file packaged.yaml \
+        --s3-bucket s3-bucket-name
+
+The package command returns an AWS SAM template named serverless-output.yaml that contains the CodeUri that points to the deployment zip in the Amazon S3 bucket that you specified. This template represents your serverless application. You are now ready to deploy it.
+
+Deploying your application
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To deploy the application, run the following command:
+
+.. code:: bash
+
+    sam deploy \
+        --template-file serverless-template.yaml \
+        --stack-name new-stack-name \
+        --capabilities CAPABILITY_IAM
+
+Note that the value you specify for the --template-file parameter is the name of the SAM template that was returned by the package command. In addition, the --capabilities parameter is optional. The AWS::Serverless::Function resource will implicitly create a role to execute the Lambda function if one is not specified in the template. You use the --capabilities parameter to explicitly acknowledge that AWS CloudFormation is allowed to create roles on your behalf.
+
+When you run the aws sam deploy command, it creates an AWS CloudFormation ChangeSet, which is a list of changes to the AWS CloudFormation stack, and then deploys it. Some stack templates might include resources that can affect permissions in your AWS account, for example, by creating new AWS Identity and Access Management (IAM) users. For those stacks, you must explicitly acknowledge their capabilities by specifying the --capabilities parameter.
+
+To verify your results, open the AWS CloudFormation console to view the newly created AWS CloudFormation stack and the Lambda console to view your function.
+
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
new file mode 100644
index 0000000000..d90c07461e
--- /dev/null
+++ b/docs/getting_started.rst
@@ -0,0 +1,58 @@
+Getting started with SAM and the SAM CLI
+========================================
+The following sections introduce the Serverless Application Model (SAM) and the the tools available to implement it (SAM CLI):
+
+What is SAM
+===========
+The AWS Serverless Application Model (AWS SAM) is a model to define serverless applications. AWS SAM is natively supported by AWS CloudFormation and defines simplified syntax for expressing serverless resources. The specification currently covers APIs, Lambda functions and Amazon DynamoDB tables. SAM is available under Apache 2.0 for AWS partners and customers to adopt and extend within their own toolsets.
+
+What is SAM CLI
+===============
+Based on AWS SAM, SAM CLI is an AWS CLI tool that provides an environment for you to develop, test, and analyze your serverless applications locally before uploading them to the Lambda runtime. Whether you're developing on Linux, Mac, or Microsoft Windows, you can use SAM CLI to create a local testing environment that simulates the AWS runtime environment. The SAM CLI also allows faster, iterative development of your Lambda function code because there is no need to redeploy your application package to the AWS Lambda runtime.
+
+
+Installing Docker
+~~~~~~~~~~~~~~~~~
+
+To use SAM CLI, you first need to install Docker, an open-source software container platform that allows you to build, manage and test applications, whether you're running on Linux, Mac or Windows. For more information and download instructions, see `Docker <https://www.docker.com/>`__.
+
+Once you have Docker installed, SAM CLI automatically provides a customized Docker image called docker-lambda. This image is designed specifically by an AWS partner to simulate the live AWS Lambda execution environment. This environment includes installed software, libraries, security permissions, environment variables, and other features outlined at Lambda Execution Environment and Available Libraries.
+
+Using docker-lambda, you can invoke your Lambda function locally. In this environment, your serverless applications execute and perform much as in the AWS Lambda runtime, without your having to redeploy the runtime. Their execution and performance in this environment reflect such considerations as timeouts and memory use.
+
+  Important
+
+  Because this is a simulated environment, there is no guarantee that your local testing results will exactly match those in the actual AWS runtime.
+For more information, see `docker-lambda <https://github.com/lambci/docker-lambda>`__.
+
+Installing SAM CLI
+~~~~~~~~~~~~~~~~~~
+
+The easiest way to install SAM CLI is to use `pip <https://pypi.org/project/pip/>`__.
+
+.. code:: bash
+
+    pip install aws-sam-cli
+
+Then verify that the installation succeeded.
+
+.. code:: bash
+
+  sam --version
+
+If pip doesn't work for you, you can download the latest binary and start using SAM CLI immediately. You can find the binaries under the Releases section in the `SAM CLI GitHub Repository <https://github.com/awslabs/aws-sam-local/releases>`__.
+
+Creating a hello-world app (init)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+To get started with a project in SAM, you can use the 'sam init' command provided by the SAM CLI to get a fully deployable boilerplate serverless application in any of the supported runtimes.  SAM init provides a quick way for customers to get started with creating a Lambda-based application and allow them to grow their idea into a production application by using other commands in the SAM CLI.
+
+To use 'sam init', nagivate to a directory where where you want the serverless application to be created. Using the SAM CLI, run the following command (using the runtime of your choice. The following example uses Python for demonstration purposes.):
+
+.. code::
+
+  $ sam init --runtime python
+  [+] Initializing project structure...
+  [SUCCESS] - Read sam-app/README.md for further instructions on how to proceed
+  [*] Project initialization is now complete
+This will create a folder in the current directory titled sam-app. This folder will contain an `AWS  SAM template <https://github.com/awslabs/serverless-application-model>`__, along with your function code file and a README file that provides further guidance on how to proceed with your SAM application. The SAM template defines the AWS Resources that your application will need to run in the AWS Cloud.
+
diff --git a/docs/make.bat b/docs/make.bat
new file mode 100644
index 0000000000..95f33dc2ee
--- /dev/null
+++ b/docs/make.bat
@@ -0,0 +1,36 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=.
+set BUILDDIR=_build
+set SPHINXPROJ=SAMCLI
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+
+:end
+popd
diff --git a/docs/running_and_debugging_serverless_applications_locally.rst b/docs/running_and_debugging_serverless_applications_locally.rst
new file mode 100644
index 0000000000..ccfb8de5b2
--- /dev/null
+++ b/docs/running_and_debugging_serverless_applications_locally.rst
@@ -0,0 +1,113 @@
+Running and debugging serverless applications locally
+=====================================================
+SAM CLI works with AWS SAM, allowing you to invoke functions defined in SAM templates, whether directly or through API Gateway endpoints. By using SAM CLI, you can analyze your SAM application's performance in your own testing environment and update accordingly.
+
+Invoking Lambda functions locally
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code:: bash
+
+    # Invoking function with event file
+
+    $ echo '{"message": "Hey, are you there?" }' | sam local invoke "Ratings"
+
+    # For more options
+
+    $ sam local invoke --help
+
+
+Running API Gateway Locally
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+start-api: Creates a local HTTP server hosting all of your Lambda functions. When accessed by using a browser or the CLI, this operation launches a Docker container locally to invoke your function. It reads the CodeUri property of the AWS::Serverless::Function resource to find the path in your file system containing the Lambda function code. This path can be the project's root directory for interpreted languages like Node.js or Python, a build directory that stores your compiled artifacts, or for Java, a .jar file.
+
+If you use an interpreted language, local changes are made available within the same Docker container. This approach means you can reinvoke your Lambda function with no need for redeployment.
+
+invoke: Invokes a local Lambda function once and terminates after invocation completes.
+
+.. code::
+
+    $ sam local start-api
+
+    2018-05-08 08:48:38 Mounting HelloWorld at http://127.0.0.1:3000/ [GET]
+    2018-05-08 08:48:38 Mounting HelloWorld at http://127.0.0.1:3000/thumbnail [GET]
+    2018-05-08 08:48:38 You can now browse to the above endpoints to invoke your functions. You do not need to restart/reload SAM CLI while working on your functions changes will be reflected instantly/automatically. You only need to restart SAM CLI if you update your AWS SAM template
+    2018-05-08 08:48:38  * Running on http://127.0.0.1:3000/ (Press CTRL+C to quit)
+
+Debugging With SAM CLI
+~~~~~~~~~~~~~~~~~~~~~~
+
+Both sam local invoke and sam local start-api support local debugging of your functions. To run SAM CLI with debugging support enabled, specify --debug-port or -d on the command line.
+
+.. code:: bash
+
+    # Invoke a function locally in debug mode on port 5858
+
+    $ sam local invoke -d 5858 function logical id
+
+    # Start local API Gateway in debug mode on port 5858
+
+    $ sam local start-api -d 5858
+
+If you use sam local start-api, the local API Gateway exposes all of your Lambda functions. But because you can specify only one debug port, you can only debug one function at a time.
+
+Connecting a Debugger to your IDE
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+For compiled languages or projects requiring complex packing support, we recommend that you run your own build solution and point AWS SAM to the directory that contains the build dependency files needed. You can use the following IDEs or one of your choosing.
+
+- Cloud9
+- Eclipse
+- Visual Studio Code
+
+Integrating other services
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+You can use the AWS Serverless Application Model to integrate other services as event sources to your application. For example, assume you have an application that requires a Dynamo DB table. The following shows an example:
+
+.. code:: yaml
+
+    AWSTemplateFormatVersion: '2010-09-09'
+    Transform: AWS::Serverless-2016-10-31
+    Resources:
+      ProcessDynamoDBStream:
+        Type: AWS::Serverless::Function
+        Properties:
+          Handler: handler
+          Runtime: runtime
+          Policies: AWSLambdaDynamoDBExecutionRole
+          Events:
+            Stream:
+              Type: DynamoDB
+              Properties:
+                Stream: !GetAtt DynamoDBTable.StreamArn
+                BatchSize: 100
+                StartingPosition: TRIM_HORIZON
+
+      DynamoDBTable:
+        Type: AWS::DynamoDB::Table
+        Properties:
+          AttributeDefinitions:
+            - AttributeName: id
+              AttributeType: S
+          KeySchema:
+            - AttributeName: id
+              KeyType: HASH
+          ProvisionedThroughput:
+            ReadCapacityUnits: 5
+            WriteCapacityUnits: 5
+          StreamSpecification:
+            StreamViewType: NEW_IMAGE
+
+Validate your SAM template
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+You can use SAM CLI to validate your template against the official AWS Serverless Application Model specification. The following is an example if you specify either an unsupported runtime or deprecated runtime version.
+
+.. code::
+
+    $ sam validate
+
+    Error: Invalid Serverless Application Specification document. Number of errors found: 1. Resource with id [SkillFunction] is invalid. property Runtim not defined for resource of type AWS::Serverless::Function
+
+    $ sed -i 's/Runtim/Runtime/g` template.yaml
+
+    $ sam validate
+    template.yaml is a valid SAM Template
+
diff --git a/env.go b/env.go
deleted file mode 100644
index 3b9ed18df9..0000000000
--- a/env.go
+++ /dev/null
@@ -1,197 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"log"
-	"os"
-	"strconv"
-	"strings"
-
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/awslabs/goformation/cloudformation"
-)
-
-/**
- The Environment Variable Saga..
-
- There are two types of environment variables
- 	- Lambda runtime variables starting with "AWS_" and passed to every function
- 	- Custom environment variables defined in SAM template for each function
-
- Custom environment variables defined in the SAM template can contain hard-coded
- values or fetch from a stack parameter or use Intrinsics to generate a value at
- at stack creation time like ARNs. It can get complicated to support all cases
-
- Instead we will parse only hard-coded values from the template. For the rest,
- users can supply values through the Shell's environment or the env-var override
- CLI argument. If a value is provided through more than one method, the method
- with higher priority will win.
-
- Priority (Highest to lowest)
-	Env-Var CLI argument
-	Shell's Environment
-	Hard-coded values from template
-
- This priority also applies to AWS_* system variables
-*/
-
-func getEnvironmentVariables(logicalID string, function *cloudformation.AWSServerlessFunction, overrideFile string, profile string) map[string]string {
-
-	env := getEnvDefaults(function, profile)
-	osenv := getEnvFromOS()
-	overrides := getEnvOverrides(logicalID, overrideFile)
-
-	if function.Environment != nil {
-		for name, value := range function.Environment.Variables {
-
-			// hard-coded values, lowest priority
-			if stringedValue, ok := toStringMaybe(value); ok {
-				// Get only hard-coded values from the template
-				env[name] = stringedValue
-			}
-
-			// Shell's environment, second priority
-			if value, ok := osenv[name]; ok {
-				env[name] = value
-			}
-
-			// EnvVars overrides provided by customer, highest priority
-			if len(overrides) > 0 {
-				if value, ok := overrides[name]; ok {
-					env[name] = value
-				}
-			}
-		}
-	}
-
-	return env
-
-}
-
-func getEnvDefaults(function *cloudformation.AWSServerlessFunction, profile string) map[string]string {
-
-	creds := getSessionOrDefaultCreds(profile)
-
-	// Variables available in Lambda execution environment for all functions (AWS_* variables)
-	env := map[string]string{
-		"AWS_SAM_LOCAL":                   "true",
-		"AWS_REGION":                      creds["region"],
-		"AWS_DEFAULT_REGION":              creds["region"],
-		"AWS_ACCESS_KEY_ID":               creds["key"],
-		"AWS_SECRET_ACCESS_KEY":           creds["secret"],
-		"AWS_LAMBDA_FUNCTION_MEMORY_SIZE": strconv.Itoa(int(function.MemorySize)),
-		"AWS_LAMBDA_FUNCTION_TIMEOUT":     strconv.Itoa(int(function.Timeout)),
-		"AWS_LAMBDA_FUNCTION_HANDLER":     function.Handler,
-		// "AWS_ACCOUNT_ID=",
-		// "AWS_LAMBDA_EVENT_BODY=",
-		// "AWS_REGION=",
-		// "AWS_LAMBDA_FUNCTION_NAME=",
-		// "AWS_LAMBDA_FUNCTION_VERSION=",
-	}
-
-	if token, ok := creds["sessiontoken"]; ok && token != "" {
-		env["AWS_SESSION_TOKEN"] = token
-	}
-
-	return env
-
-}
-
-func getEnvOverrides(logicalID string, filename string) map[string]string {
-
-	if len(filename) > 0 {
-
-		data, err := ioutil.ReadFile(filename)
-		if err != nil {
-			log.Printf("Could not read environment overrides from %s: %s\n", filename, err)
-			return map[string]string{}
-		}
-
-		// This is a JSON of structure {FunctionName: {key:value}, FunctionName: {key:value}}
-		overrides := map[string]map[string]string{}
-		if err = json.Unmarshal(data, &overrides); err != nil {
-			log.Printf("Invalid environment override file %s: %s\n", filename, err)
-			return map[string]string{}
-		}
-		// In case we have a cloudformation parameters json, structure {Parameters: {key:value}}
-		if _,ok := overrides["Parameters"]; ok {
-			if _,ok := overrides[logicalID]; ! ok {
-				overrides[logicalID] = map[string]string{}
-			}
-
-			for k, v := range overrides["Parameters"] {
-		    	overrides[logicalID][k] = v
-			}
-		}
-		return overrides[logicalID]
-
-	}
-
-	return map[string]string{}
-
-}
-
-func getSessionOrDefaultCreds(profile string) map[string]string {
-
-	region := "us-east-1"
-	key := "defaultkey"
-	secret := "defaultsecret"
-
-	result := map[string]string{
-		"region": region,
-		"key":    key,
-		"secret": secret,
-	}
-
-	opts := session.Options{}
-	opts.Profile = profile
-	// Obtain AWS credentials and pass them through to the container runtime via env variables
-	if sess, err := session.NewSessionWithOptions(opts); err == nil {
-		creds, err := sess.Config.Credentials.Get()
-		if err != nil {
-			log.Printf("WARNING: No AWS credentials found. Missing credentials may lead to slow startup times as detailed in https://github.com/awslabs/aws-sam-local/issues/134")
-		} else {
-			if *sess.Config.Region != "" {
-				result["region"] = *sess.Config.Region
-			}
-
-			result["key"] = creds.AccessKeyID
-			result["secret"] = creds.SecretAccessKey
-			if creds.SessionToken != "" {
-				result["sessiontoken"] = creds.SessionToken
-			}
-		}
-	}
-
-	return result
-}
-
-func getEnvFromOS() map[string]string {
-
-	result := map[string]string{}
-	for _, value := range os.Environ() {
-		keyVal := strings.Split(value, "=")
-		result[keyVal[0]] = keyVal[1]
-	}
-
-	return result
-}
-
-// Converts the input to string if it is a primitive type, Otherwise returns nil
-func toStringMaybe(value interface{}) (string, bool) {
-
-	switch value.(type) {
-	case string:
-		return value.(string), true
-	case int:
-		return strconv.Itoa(value.(int)), true
-	case float32, float64:
-		return strconv.FormatFloat(value.(float64), 'f', -1, 64), true
-	case bool:
-		return strconv.FormatBool(value.(bool)), true
-	default:
-		return "", false
-	}
-
-}
diff --git a/env_test.go b/env_test.go
deleted file mode 100644
index 63c51ee774..0000000000
--- a/env_test.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"github.com/awslabs/goformation"
-	"github.com/awslabs/goformation/cloudformation"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Environment Variables", func() {
-
-	Context("with a template that has environment variables defined", func() {
-
-		var functions map[string]cloudformation.AWSServerlessFunction
-		BeforeEach(func() {
-			template, _ := goformation.Open("test/templates/sam-official-samples/iot_backend/template.yaml")
-			functions = template.GetAllAWSServerlessFunctionResources()
-		})
-
-		It("return defaults with those defined in the template", func() {
-
-			for name, function := range functions {
-				variables := getEnvironmentVariables(name, &function, "", "")
-				Expect(variables).To(HaveLen(9))
-				Expect(variables).To(HaveKey("AWS_SAM_LOCAL"))
-				Expect(variables).To(HaveKey("AWS_REGION"))
-				Expect(variables).To(HaveKey("AWS_DEFAULT_REGION"))
-				Expect(variables).To(HaveKey("AWS_ACCESS_KEY_ID"))
-				Expect(variables).To(HaveKey("AWS_SECRET_ACCESS_KEY"))
-				Expect(variables).To(Not(HaveKey("AWS_SESSION_TOKEN")))
-				Expect(variables).To(HaveKey("AWS_LAMBDA_FUNCTION_MEMORY_SIZE"))
-				Expect(variables).To(HaveKey("AWS_LAMBDA_FUNCTION_TIMEOUT"))
-				Expect(variables).To(HaveKey("AWS_LAMBDA_FUNCTION_HANDLER"))
-				Expect(variables).To(HaveKey("TABLE_NAME"))
-			}
-		})
-
-		It("removes AWS_SESSION_TOKEN if the value is empty", func() {
-
-			for name, function := range functions {
-
-				os.Setenv("AWS_ACCESS_KEY_ID", "id")
-				os.Setenv("AWS_SECRET_ACCESS_KEY", "secret")
-				os.Unsetenv("AWS_SESSION_TOKEN")
-
-				variables := getEnvironmentVariables(name, &function, "", "")
-				Expect(variables).To(HaveLen(9))
-				Expect(variables).To(HaveKey("AWS_SAM_LOCAL"))
-				Expect(variables).To(HaveKey("AWS_REGION"))
-				Expect(variables).To(HaveKey("AWS_DEFAULT_REGION"))
-				Expect(variables).To(HaveKey("AWS_ACCESS_KEY_ID"))
-				Expect(variables).To(HaveKey("AWS_SECRET_ACCESS_KEY"))
-				Expect(variables).To(Not(HaveKey("AWS_SESSION_TOKEN")))
-				Expect(variables).To(HaveKey("AWS_LAMBDA_FUNCTION_MEMORY_SIZE"))
-				Expect(variables).To(HaveKey("AWS_LAMBDA_FUNCTION_TIMEOUT"))
-				Expect(variables).To(HaveKey("AWS_LAMBDA_FUNCTION_HANDLER"))
-				Expect(variables).To(HaveKey("TABLE_NAME"))
-
-				os.Unsetenv("AWS_ACCESS_KEY_ID")
-				os.Unsetenv("AWS_SECRET_ACCESS_KEY")
-			}
-		})
-
-		It("only sets AWS_SESSION_TOKEN if the value is non-nil", func() {
-
-			for name, function := range functions {
-
-				os.Setenv("AWS_ACCESS_KEY_ID", "id")
-				os.Setenv("AWS_SECRET_ACCESS_KEY", "secret")
-				os.Setenv("AWS_SESSION_TOKEN", "token")
-
-				variables := getEnvironmentVariables(name, &function, "", "")
-				Expect(variables).To(HaveLen(10))
-				Expect(variables).To(HaveKey("AWS_SAM_LOCAL"))
-				Expect(variables).To(HaveKey("AWS_REGION"))
-				Expect(variables).To(HaveKey("AWS_DEFAULT_REGION"))
-				Expect(variables).To(HaveKey("AWS_ACCESS_KEY_ID"))
-				Expect(variables).To(HaveKey("AWS_SECRET_ACCESS_KEY"))
-				Expect(variables).To(HaveKey("AWS_SESSION_TOKEN"))
-				Expect(variables).To(HaveKey("AWS_LAMBDA_FUNCTION_MEMORY_SIZE"))
-				Expect(variables).To(HaveKey("AWS_LAMBDA_FUNCTION_TIMEOUT"))
-				Expect(variables).To(HaveKey("AWS_LAMBDA_FUNCTION_HANDLER"))
-				Expect(variables).To(HaveKey("TABLE_NAME"))
-
-				Expect(variables["AWS_SESSION_TOKEN"]).To(Equal("token"))
-
-				os.Unsetenv("AWS_ACCESS_KEY_ID")
-				os.Unsetenv("AWS_SECRET_ACCESS_KEY")
-				os.Unsetenv("AWS_SESSION_TOKEN")
-
-			}
-		})
-
-		It("overides template with environment variables", func() {
-			for name, function := range functions {
-				variables := getEnvironmentVariables(name, &function, "", "")
-				Expect(variables["TABLE_NAME"]).To(Equal(""))
-
-				os.Setenv("TABLE_NAME", "ENV_TABLE")
-				variables = getEnvironmentVariables(name, &function, "", "")
-				Expect(variables["TABLE_NAME"]).To(Equal("ENV_TABLE"))
-				os.Unsetenv("TABLE_NAME")
-			}
-		})
-
-		It("overrides template and environment with customer overrides", func() {
-			for name, function := range functions {
-				variables := getEnvironmentVariables(name, &function, "test/environment-overrides.json", "")
-				Expect(variables["TABLE_NAME"]).To(Equal("OVERRIDE_TABLE"))
-			}
-			os.Unsetenv("TABLE_NAME")
-		})
-
-	})
-})
diff --git a/generate-event.go b/generate-event.go
deleted file mode 100644
index 0db8d362a4..0000000000
--- a/generate-event.go
+++ /dev/null
@@ -1,367 +0,0 @@
-package main
-
-import (
-	"encoding/base64"
-	"fmt"
-	"os"
-	"text/template"
-
-	"github.com/codegangsta/cli"
-)
-
-var events = map[string]string{
-	"S3":       s3Event,
-	"SNS":      snsEvent,
-	"Kinesis":  kinesisEvent,
-	"DynamoDB": dynamodbEvent,
-	"Api":      apiEvent,
-	"Schedule": scheduleEvent,
-}
-
-func generate(eventType string, c *cli.Context) {
-
-	sample, ok := events[eventType]
-	if !ok {
-		fmt.Printf("Unsupported event type: %s", eventType)
-		os.Exit(1)
-	}
-
-	t, err := template.New("event").Parse(sample)
-	if err != nil {
-		fmt.Printf("Failed to load sample %s event: %s", eventType, err)
-		os.Exit(1)
-	}
-
-	switch eventType {
-	case "S3":
-
-		t.Execute(os.Stdout, struct {
-			Region string
-			Bucket string
-			Key    string
-		}{
-			Region: c.String("region"),
-			Bucket: c.String("bucket"),
-			Key:    c.String("key"),
-		})
-		os.Exit(0)
-
-	case "SNS":
-
-		t.Execute(os.Stdout, struct {
-			Message string
-			Subject string
-			Topic   string
-		}{
-			Message: c.String("message"),
-			Subject: c.String("subject"),
-			Topic:   c.String("topic"),
-		})
-		os.Exit(0)
-
-	case "Kinesis":
-
-		t.Execute(os.Stdout, struct {
-			Region    string
-			Partition string
-			Sequence  string
-			Data      string
-		}{
-			Region:    c.String("region"),
-			Partition: c.String("partition"),
-			Sequence:  c.String("sequence"),
-			Data:      base64.StdEncoding.EncodeToString([]byte(c.String("data"))),
-		})
-		os.Exit(0)
-
-	case "DynamoDB":
-		t.Execute(os.Stdout, struct {
-			Region string
-		}{
-			Region: c.String("region"),
-		})
-		os.Exit(0)
-
-	case "Api":
-
-		t.Execute(os.Stdout, struct {
-			Method   string
-			Body     string
-			Resource string
-			Path     string
-		}{
-			Method:   c.String("method"),
-			Body:     c.String("body"),
-			Resource: c.String("resource"),
-			Path:     c.String("path"),
-		})
-		os.Exit(0)
-
-	case "Schedule":
-		t.Execute(os.Stdout, struct {
-			Region string
-		}{
-			Region: c.String("region"),
-		})
-		os.Exit(0)
-
-	}
-
-	fmt.Printf("Error - event type %s not implemented\n", eventType)
-	os.Exit(1)
-
-}
-
-var s3Event = `{
-  "Records": [
-    {
-      "eventVersion": "2.0",
-      "eventTime": "1970-01-01T00:00:00.000Z",
-      "requestParameters": {
-        "sourceIPAddress": "127.0.0.1"
-      },
-      "s3": {
-        "configurationId": "testConfigRule",
-        "object": {
-          "eTag": "0123456789abcdef0123456789abcdef",
-          "sequencer": "0A1B2C3D4E5F678901",
-          "key": "{{.Key}}",
-          "size": 1024
-        },
-        "bucket": {
-          "arn": "arn:aws:s3:::{{.Bucket}}",
-          "name": "{{.Bucket}}",
-          "ownerIdentity": {
-            "principalId": "EXAMPLE"
-          }
-        },
-        "s3SchemaVersion": "1.0"
-      },
-      "responseElements": {
-        "x-amz-id-2": "EXAMPLE123/5678abcdefghijklambdaisawesome/mnopqrstuvwxyzABCDEFGH",
-        "x-amz-request-id": "EXAMPLE123456789"
-      },
-      "awsRegion": "{{.Region}}",
-      "eventName": "ObjectCreated:Put",
-      "userIdentity": {
-        "principalId": "EXAMPLE"
-      },
-      "eventSource": "aws:s3"
-    }
-  ]
-}`
-
-var snsEvent = `{
-  "Records": [
-    {
-      "EventVersion": "1.0",
-      "EventSubscriptionArn": "arn:aws:sns:EXAMPLE",
-      "EventSource": "aws:sns",
-      "Sns": {
-        "SignatureVersion": "1",
-        "Timestamp": "1970-01-01T00:00:00.000Z",
-        "Signature": "EXAMPLE",
-        "SigningCertUrl": "EXAMPLE",
-        "MessageId": "95df01b4-ee98-5cb9-9903-4c221d41eb5e",
-        "Message": "{{.Message}}",
-        "MessageAttributes": {
-          "Test": {
-            "Type": "String",
-            "Value": "TestString"
-          },
-          "TestBinary": {
-            "Type": "Binary",
-            "Value": "TestBinary"
-          }
-        },
-        "Type": "Notification",
-        "UnsubscribeUrl": "EXAMPLE",
-        "TopicArn": "{{.Topic}}",
-        "Subject": "{{.Subject}}"
-      }
-    }
-  ]
-}`
-
-var kinesisEvent = `{
-  "Records": [
-    {
-      "eventID": "shardId-000000000000:{{.Sequence}}",
-      "eventVersion": "1.0",
-      "kinesis": {
-        "approximateArrivalTimestamp": 1428537600,
-        "partitionKey": "{{.Partition}}",
-        "data": "{{.Data}}",
-        "kinesisSchemaVersion": "1.0",
-        "sequenceNumber": "{{.Sequence}}"
-      },
-      "invokeIdentityArn": "arn:aws:iam::EXAMPLE",
-      "eventName": "aws:kinesis:record",
-      "eventSourceARN": "arn:aws:kinesis:EXAMPLE",
-      "eventSource": "aws:kinesis",
-      "awsRegion": "{{.Region}}"
-    }
-  ]
-}
-`
-var dynamodbEvent = `{
-  "Records": [
-    {
-      "eventID": "1",
-      "eventVersion": "1.0",
-      "dynamodb": {
-        "Keys": {
-          "Id": {
-            "N": "101"
-          }
-        },
-        "NewImage": {
-          "Message": {
-            "S": "New item!"
-          },
-          "Id": {
-            "N": "101"
-          }
-        },
-        "StreamViewType": "NEW_AND_OLD_IMAGES",
-        "SequenceNumber": "111",
-        "SizeBytes": 26
-      },
-      "awsRegion": "{{.Region}}",
-      "eventName": "INSERT",
-      "eventSourceARN": "arn:aws:dynamodb:{{.Region}}:account-id:table/ExampleTableWithStream/stream/2015-06-27T00:48:05.899",
-      "eventSource": "aws:dynamodb"
-    },
-    {
-      "eventID": "2",
-      "eventVersion": "1.0",
-      "dynamodb": {
-        "OldImage": {
-          "Message": {
-            "S": "New item!"
-          },
-          "Id": {
-            "N": "101"
-          }
-        },
-        "SequenceNumber": "222",
-        "Keys": {
-          "Id": {
-            "N": "101"
-          }
-        },
-        "SizeBytes": 59,
-        "NewImage": {
-          "Message": {
-            "S": "This item has changed"
-          },
-          "Id": {
-            "N": "101"
-          }
-        },
-        "StreamViewType": "NEW_AND_OLD_IMAGES"
-      },
-      "awsRegion": "{{.Region}}",
-      "eventName": "MODIFY",
-      "eventSourceARN": "arn:aws:dynamodb:{{.Region}}:account-id:table/ExampleTableWithStream/stream/2015-06-27T00:48:05.899",
-      "eventSource": "aws:dynamodb"
-    },
-    {
-      "eventID": "3",
-      "eventVersion": "1.0",
-      "dynamodb": {
-        "Keys": {
-          "Id": {
-            "N": "101"
-          }
-        },
-        "SizeBytes": 38,
-        "SequenceNumber": "333",
-        "OldImage": {
-          "Message": {
-            "S": "This item has changed"
-          },
-          "Id": {
-            "N": "101"
-          }
-        },
-        "StreamViewType": "NEW_AND_OLD_IMAGES"
-      },
-      "awsRegion": "{{.Region}}",
-      "eventName": "REMOVE",
-      "eventSourceARN": "arn:aws:dynamodb:{{.Region}}:account-id:table/ExampleTableWithStream/stream/2015-06-27T00:48:05.899",
-      "eventSource": "aws:dynamodb"
-    }
-  ]
-}`
-
-var apiEvent = `{
-  "body": "{{.Body}}",
-  "resource": "{{.Resource}}",
-  "requestContext": {
-    "resourceId": "123456",
-    "apiId": "1234567890",
-    "resourcePath": "{{.Resource}}",
-    "httpMethod": "{{.Method}}",
-    "requestId": "c6af9ac6-7b61-11e6-9a41-93e8deadbeef",
-    "accountId": "123456789012",
-    "identity": {
-      "apiKey": null,
-      "userArn": null,
-      "cognitoAuthenticationType": null,
-      "caller": null,
-      "userAgent": "Custom User Agent String",
-      "user": null,
-      "cognitoIdentityPoolId": null,
-      "cognitoIdentityId": null,
-      "cognitoAuthenticationProvider": null,
-      "sourceIp": "127.0.0.1",
-      "accountId": null
-    },
-    "stage": "prod"
-  },
-  "queryStringParameters": {
-    "foo": "bar"
-  },
-  "headers": {
-    "Via": "1.1 08f323deadbeefa7af34d5feb414ce27.cloudfront.net (CloudFront)",
-    "Accept-Language": "en-US,en;q=0.8",
-    "CloudFront-Is-Desktop-Viewer": "true",
-    "CloudFront-Is-SmartTV-Viewer": "false",
-    "CloudFront-Is-Mobile-Viewer": "false",
-    "X-Forwarded-For": "127.0.0.1, 127.0.0.2",
-    "CloudFront-Viewer-Country": "US",
-    "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8",
-    "Upgrade-Insecure-Requests": "1",
-    "X-Forwarded-Port": "443",
-    "Host": "1234567890.execute-api.us-east-1.amazonaws.com",
-    "X-Forwarded-Proto": "https",
-    "X-Amz-Cf-Id": "aaaaaaaaaae3VYQb9jd-nvCd-de396Uhbp027Y2JvkCPNLmGJHqlaA==",
-    "CloudFront-Is-Tablet-Viewer": "false",
-    "Cache-Control": "max-age=0",
-    "User-Agent": "Custom User Agent String",
-    "CloudFront-Forwarded-Proto": "https",
-    "Accept-Encoding": "gzip, deflate, sdch"
-  },
-  "pathParameters": {
-    "proxy": "{{.Path}}"
-  },
-  "httpMethod": "{{.Method}}",
-  "stageVariables": {
-    "baz": "qux"
-  },
-  "path": "{{.Path}}"
-}`
-
-var scheduleEvent = `{
-  "account": "123456789012",
-  "region": "{{.Region}}",
-  "detail": {},
-  "detail-type": "Scheduled Event",
-  "source": "aws.events",
-  "time": "1970-01-01T00:00:00Z",
-  "id": "cdc73f9d-aea9-11e3-9d5a-835b769c0d9c",
-  "resources": [
-    "arn:aws:events:us-east-1:123456789012:rule/my-schedule"
-  ]
-}`
diff --git a/invoke.go b/invoke.go
deleted file mode 100644
index 6b3fbe21fa..0000000000
--- a/invoke.go
+++ /dev/null
@@ -1,149 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"path/filepath"
-
-	"io/ioutil"
-
-	"io"
-	"sync"
-
-	"github.com/awslabs/goformation"
-	"github.com/awslabs/goformation/intrinsics"
-	"github.com/codegangsta/cli"
-)
-
-func invoke(c *cli.Context) {
-
-	// Setup the logger
-	stdout := io.Writer(os.Stdout)
-	stderr := io.Writer(os.Stderr)
-	logarg := c.String("log-file") // matches the definition in main.go
-
-	if len(logarg) > 0 {
-		if logFile, err := os.Create(logarg); err == nil {
-			stderr = io.Writer(logFile)
-			stdout = io.Writer(logFile)
-			log.SetOutput(stderr)
-		} else {
-			log.Fatalf("Failed to open log file %s: %s\n", c.String("log"), err)
-		}
-	}
-
-	filename := getTemplateFilename(c.String("template"))
-	template, err := goformation.OpenWithOptions(filename, &intrinsics.ProcessorOptions{
-		ParameterOverrides: parseParameters(c.String("parameter-values")),
-	})
-	if err != nil {
-		log.Fatalf("Failed to parse template: %s\n", err)
-	}
-
-	log.Printf("Successfully parsed %s\n", filename)
-
-	name := c.Args().First()
-
-	// Find the specified function in the SAM template. Either check for a function whose
-	// logical ID matches the first CLI argument, or if they only have a single function
-	// defined, and don't specify a name, then just use that function.
-	functions := template.GetAllAWSServerlessFunctionResources()
-
-	addCloudformationLambdaFunctions(template, functions)
-
-	function, found := functions[name]
-	if !found {
-		if len(functions) == 1 && name == "" {
-			for _, f := range functions {
-				function = f
-			}
-		} else {
-			if name == "" {
-				fmt.Fprintf(os.Stderr, "ERROR: You must provide a function identifier (function's Logical ID in the SAM template) as the first argument.\n")
-			} else {
-				fmt.Fprintf(os.Stderr, "ERROR: Could not find a AWS::Serverless::Function with logical ID '%s'\n", name)
-			}
-			// If have functions defined in the template, be helpful and suggest them
-			if len(functions) > 0 {
-				fmt.Fprintf(os.Stderr, "Possible options in your template:\n")
-				for resourceName := range functions {
-					fmt.Fprintf(os.Stderr, " * %s\n", resourceName)
-				}
-			}
-			os.Exit(1)
-		}
-	}
-
-	// Check connectivity to docker
-	dockerVersion, err := getDockerVersion()
-	if err != nil {
-		log.Printf("Running AWS SAM projects locally requires Docker. Have you got it installed?\n")
-		log.Printf("%s\n", err)
-		os.Exit(1)
-	}
-
-	log.Printf("Connected to Docker %s", dockerVersion)
-
-	cwd := filepath.Dir(filename)
-	if c.String("docker-volume-basedir") != "" {
-		cwd = c.String("docker-volume-basedir")
-	}
-
-	runt, err := NewRuntime(NewRuntimeOpt{
-		Cwd:             cwd,
-		LogicalID:       name,
-		Function:        function,
-		Logger:          stderr,
-		EnvOverrideFile: c.String("env-vars"),
-		DebugPort:       c.String("debug-port"),
-		SkipPullImage:   c.Bool("skip-pull-image"),
-		DockerNetwork:   c.String("docker-network"),
-	})
-
-	if err != nil {
-		log.Fatalf("Could not initiate %s runtime: %s\n", function.Runtime, err)
-	}
-
-	eventFile := c.String("event")
-	event := ""
-	if eventFile == "" {
-		// The event payload wasn't provided with --event, so read from stdin
-		log.Printf("Reading invoke payload from stdin (you can also pass it from file with --event)\n")
-		pb, err := ioutil.ReadAll(os.Stdin)
-		if err != nil {
-			log.Fatalf("Could not read event from stdin: %s\n", err)
-		}
-		event = string(pb)
-	} else {
-		// The event payload should be read from the file provided
-		pb, err := ioutil.ReadFile(eventFile)
-		if err != nil {
-			log.Fatalf("Could not read event from file: %s\n", err)
-		}
-		event = string(pb)
-	}
-
-	stdoutTxt, stderrTxt, err := runt.Invoke(event, c.String("profile"))
-	if err != nil {
-		log.Fatalf("Could not invoke function: %s\n", err)
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	go func() {
-		io.Copy(stderr, stderrTxt)
-		wg.Done()
-	}()
-
-	go func() {
-		io.Copy(stdout, stdoutTxt)
-		wg.Done()
-	}()
-
-	wg.Wait()
-
-	fmt.Fprintf(stderr, "\n")
-	runt.CleanUp()
-}
diff --git a/main.go b/main.go
deleted file mode 100644
index 1bba1fd014..0000000000
--- a/main.go
+++ /dev/null
@@ -1,424 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-
-	"github.com/codegangsta/cli"
-	"github.com/fatih/color"
-)
-
-const LOCAL_BUILD_VERSION = "snapshot"
-
-// `version` property will be replaced by the build upon release
-var version = LOCAL_BUILD_VERSION
-
-func main() {
-
-	color.Unset()
-
-	if version != LOCAL_BUILD_VERSION {
-		// Enable version checking only on public releases
-
-		v, err := checkVersion()
-		if err == nil && !v.IsUpToDate {
-			fmt.Fprintf(os.Stderr, "A newer version of the AWS SAM CLI is available!\n")
-			fmt.Fprintf(os.Stderr, "Your version:   %s\n", version)
-			fmt.Fprintf(os.Stderr, "Latest version: %s\n", v.LatestVersion)
-			fmt.Fprintf(os.Stderr, "See https://github.com/awslabs/aws-sam-local for upgrade instructions\n\n")
-		}
-	}
-
-	app := cli.NewApp()
-
-	app.Name = "sam"
-	app.Version = version
-	app.Usage = `
-			___      _____   ___   _   __  __
-	   /_\ \    / / __| / __| /_\ |  \/  |
-	  / _ \ \/\/ /\__ \ \__ \/ _ \| |\/| |
-	 /_/ \_\_/\_/ |___/ |___/_/ \_\_|  |_|
-
-     AWS Serverless Application Model (SAM) CLI
-
-     The AWS Serverless Application Model extends AWS CloudFormation to provide a simplified way of defining the Amazon API Gateway APIs, AWS Lambda functions, and Amazon DynamoDB tables needed by your serverless application. You can find more in-depth guide about the SAM specification here: https://github.com/awslabs/serverless-application-model.
-	`
-	app.EnableBashCompletion = true // \m/
-
-	app.Commands = []cli.Command{
-		cli.Command{
-			Name:  "local",
-			Usage: "Run your Serverless application locally for quick development & testing",
-			Subcommands: []cli.Command{
-				cli.Command{
-					Name:   "start-api",
-					Action: start,
-					Usage:  "Allows you to run your Serverless application locally for quick development & testing. When run in a directory that contains your Serverless functions and your AWS SAM template, it will create a local HTTP server hosting all of your functions. When accessed (via browser, cli etc), it will launch a Docker container locally to invoke the function. It will read the CodeUri property of AWS::Serverless::Function resource to find the path in your file system containing the Lambda Function code. This could be the project's root directory for interpreted languages like Node & Python, or a build directory that stores your compiled artifacts or a JAR file. If you are using a interpreted language, local changes will be available immediately in Docker container on every invoke. For more compiled languages or projects requiring complex packing support, we recommended you run your own building solution and point SAM to the directory or file containing build artifacts.\n",
-					Flags: []cli.Flag{
-						cli.StringFlag{
-							Name:   "template, t",
-							Value:  "template.[yaml|yml]",
-							Usage:  "AWS SAM template file",
-							EnvVar: "SAM_TEMPLATE_FILE",
-						},
-						cli.StringFlag{
-							Name:   "parameter-values",
-							Usage:  "Optional. A string that contains CloudFormation parameter overrides encoded as key-value pairs. Use the same format as the AWS CLI, e.g. 'ParameterKey=KeyPairName,ParameterValue=MyKey ParameterKey=InstanceType,ParameterValue=t1.micro'. In case of parsing errors all values are ignored",
-							EnvVar: "SAM_TEMPLATE_PARAM_ARG",
-						},
-						cli.StringFlag{
-							Name:  "log-file, l",
-							Usage: "Optional logfile to send runtime logs to",
-						},
-						cli.StringFlag{
-							Name:  "static-dir, s",
-							Usage: "Any static assets (e.g. CSS/Javascript/HTML) files located in this directory will be presented at /",
-							Value: "public",
-						},
-						cli.StringFlag{
-							Name:  "port, p",
-							Value: "3000",
-							Usage: "Local port number to listen on",
-						},
-						cli.StringFlag{
-							Name:  "host",
-							Value: "127.0.0.1",
-							Usage: "Local hostname or IP address to bind to",
-						},
-						cli.StringFlag{
-							Name:  "env-vars, n",
-							Usage: "Optional. JSON file containing values for Lambda function's environment variables. ",
-						},
-						cli.StringFlag{
-							Name:   "debug-port, d",
-							Usage:  "Optional. When specified, Lambda function container will start in debug mode and will expose this port on localhost.",
-							EnvVar: "SAM_DEBUG_PORT",
-						},
-						cli.StringFlag{
-							Name: "docker-volume-basedir, v",
-							Usage: "Optional. Specifies the location basedir where the SAM file exists. If the Docker is running on a remote machine, " +
-								"you must mount the path where the SAM file exists on the docker machine and modify this value to match the remote machine.",
-							EnvVar: "SAM_DOCKER_VOLUME_BASEDIR",
-						},
-						cli.StringFlag{
-							Name: "docker-network",
-							Usage: "Optional. Specifies the name or id of an existing docker network to lambda docker " +
-								"containers should connect to, along with the default bridge network. If not specified, " +
-								"the lambdadocker containers will only connect to the default bridge docker network.",
-							EnvVar: "SAM_DOCKER_NETWORK",
-						},
-						cli.BoolFlag{
-							Name:   "skip-pull-image",
-							Usage:  "Optional. Specify whether SAM should skip pulling down the latest Docker image. Default is false.",
-							EnvVar: "SAM_SKIP_PULL_IMAGE",
-						},
-						cli.StringFlag{
-							Name:  "profile",
-							Usage: "Optional. Specify which AWS credentials profile to use.",
-						},
-						cli.BoolFlag{
-							Name:   "prefix-routing",
-							Usage:  "Optional. Specify whether SAM routing is based on prefix or exact matching (e.g. given a function mounted at '/' with prefix routing calls to '/beers' will be routed the function).",
-							EnvVar: "SAM_PREFIX_ROUTING",
-						},
-					},
-				},
-				cli.Command{
-					Name:   "invoke",
-					Action: invoke,
-					Usage: "Invokes a local Lambda function once and quits after invocation completes. \n\n" +
-						"Useful for developing serverless functions that handle asynchronous events (such as S3/Kinesis etc), or if you want to compose a script of test cases. " +
-						"Event body can be passed in either by stdin (default), or by using the --event parameter. Runtime output (logs etc) will be outputted to stderr, and the Lambda function result will be outputted to stdout.\n",
-					ArgsUsage: "<function-identifier>",
-					Flags: []cli.Flag{
-						cli.StringFlag{
-							Name:   "template, t",
-							Value:  "template.[yaml|yml]",
-							Usage:  "AWS SAM template file",
-							EnvVar: "SAM_TEMPLATE_FILE",
-						},
-						cli.StringFlag{
-							Name:   "parameter-values",
-							Usage:  "Optional. A string that contains CloudFormation parameter overrides encoded as key-value pairs. Use the same format as the AWS CLI, e.g. 'ParameterKey=KeyPairName,ParameterValue=MyKey ParameterKey=InstanceType,ParameterValue=t1.micro'. In case of parsing errors all values are ignored",
-							EnvVar: "SAM_TEMPLATE_PARAM_ARG",
-						},
-						cli.StringFlag{
-							Name:  "log-file, l",
-							Usage: "Optional. Logfile to send runtime logs to",
-						},
-						cli.StringFlag{
-							Name:  "env-vars, n",
-							Usage: "Optional. JSON file containing values for Lambda function's environment variables. ",
-						},
-						cli.StringFlag{
-							Name:  "event, e",
-							Usage: "JSON file containing event data passed to the Lambda function during invoke",
-						},
-						cli.StringFlag{
-							Name:   "debug-port, d",
-							Usage:  "Optional. When specified, Lambda function container will start in debug mode and will expose this port on localhost.",
-							EnvVar: "SAM_DEBUG_PORT",
-						},
-						cli.StringFlag{
-							Name: "docker-volume-basedir, v",
-							Usage: "Optional. Specifies the location basedir where the SAM file exists. If the Docker is running on a remote machine, " +
-								"you must mount the path where the SAM file exists on the docker machine and modify this value to match the remote machine.",
-							EnvVar: "SAM_DOCKER_VOLUME_BASEDIR",
-						},
-						cli.StringFlag{
-							Name: "docker-network",
-							Usage: "Optional. Specifies the name or id of an existing docker network to lambda docker " +
-								"containers should connect to, along with the default bridge network. If not specified, " +
-								"the lambdadocker containers will only connect to the default bridge docker network.",
-							EnvVar: "SAM_DOCKER_NETWORK",
-						},
-						cli.BoolFlag{
-							Name:   "skip-pull-image",
-							Usage:  "Optional. Specify whether SAM should skip pulling down the latest Docker image. Default is false.",
-							EnvVar: "SAM_SKIP_PULL_IMAGE",
-						},
-						cli.StringFlag{
-							Name:  "profile",
-							Usage: "Optional. Specify which AWS credentials profile to use.",
-						},
-					},
-				},
-				cli.Command{
-					Name:  "generate-event",
-					Usage: "Generates Lambda events (e.g. for S3/Kinesis etc) that can be piped to 'sam local invoke'",
-					Subcommands: []cli.Command{
-						cli.Command{
-							Name:  "s3",
-							Usage: "Generates a sample Amazon S3 event",
-							Flags: []cli.Flag{
-								cli.StringFlag{
-									Name:  "region, r",
-									Usage: "The region the event should come from",
-									Value: "us-east-1",
-								},
-								cli.StringFlag{
-									Name:  "bucket, b",
-									Usage: "The S3 bucket the event should reference",
-									Value: "example-bucket",
-								},
-								cli.StringFlag{
-									Name:  "key, k",
-									Usage: "The S3 key the event should reference",
-									Value: "test/key",
-								},
-							},
-							Action: func(c *cli.Context) {
-								generate("S3", c)
-							},
-						},
-						cli.Command{
-							Name:  "sns",
-							Usage: "Generates a sample Amazon SNS event",
-							Flags: []cli.Flag{
-								cli.StringFlag{
-									Name:  "message, m",
-									Usage: "The SNS message body",
-									Value: "example message",
-								},
-								cli.StringFlag{
-									Name:  "topic, t",
-									Usage: "The SNS topic",
-									Value: "arn:aws:sns:us-east-1:111122223333:ExampleTopic",
-								},
-								cli.StringFlag{
-									Name:  "subject, s",
-									Usage: "The SNS subject",
-									Value: "example subject",
-								},
-							},
-							Action: func(c *cli.Context) {
-								generate("SNS", c)
-							},
-						},
-						cli.Command{
-							Name:  "kinesis",
-							Usage: "Generates a sample Amazon Kinesis event",
-							Flags: []cli.Flag{
-								cli.StringFlag{
-									Name:  "region, r",
-									Usage: "The region the event should come from",
-									Value: "us-east-1",
-								},
-								cli.StringFlag{
-									Name:  "partition, p",
-									Usage: "The Kinesis partition key",
-									Value: "partitionKey-03",
-								},
-								cli.StringFlag{
-									Name:  "sequence, s",
-									Usage: "The Kinesis sequence number",
-									Value: "49545115243490985018280067714973144582180062593244200961",
-								},
-								cli.StringFlag{
-									Name:  "data, d",
-									Usage: "The Kinesis message payload. There is no need to base64 this - sam will do this for you",
-									Value: "Hello, this is a test 123.",
-								},
-							},
-							Action: func(c *cli.Context) {
-								generate("Kinesis", c)
-							},
-						},
-						cli.Command{
-							Name:  "dynamodb",
-							Usage: "Generates a sample Amazon DynamoDB event",
-							Flags: []cli.Flag{
-								cli.StringFlag{
-									Name:  "region, r",
-									Usage: "The region the event should come from",
-									Value: "us-east-1",
-								},
-							},
-							Action: func(c *cli.Context) {
-								generate("DynamoDB", c)
-							},
-						},
-						cli.Command{
-							Name:  "api",
-							Usage: "Generates a sample Amazon API Gateway event",
-							Flags: []cli.Flag{
-								cli.StringFlag{
-									Name:  "method, m",
-									Usage: "HTTP method",
-									Value: "POST",
-								},
-								cli.StringFlag{
-									Name:  "body, b",
-									Usage: "HTTP body",
-									Value: `{ \"test\": \"body\"}`,
-								},
-								cli.StringFlag{
-									Name:  "resource, r",
-									Usage: "API Gateway resource name",
-									Value: "/{proxy+}",
-								},
-								cli.StringFlag{
-									Name:  "path, p",
-									Usage: "HTTP path",
-									Value: "/examplepath",
-								},
-							},
-							Action: func(c *cli.Context) {
-								generate("Api", c)
-							},
-						},
-						cli.Command{
-							Name:  "schedule",
-							Usage: "Generates a sample scheduled event",
-							Flags: []cli.Flag{
-								cli.StringFlag{
-									Name:  "region, r",
-									Usage: "The region the event should come from",
-									Value: "us-east-1",
-								},
-							},
-							Action: func(c *cli.Context) {
-								generate("Schedule", c)
-							},
-						},
-					},
-				},
-			},
-		},
-
-		cli.Command{
-			Name:   "validate",
-			Usage:  "Validates an AWS SAM template. If valid, will print a summary of the resources found within the SAM template. If the template is invalid, returns a non-zero exit code.",
-			Action: validate,
-			Flags: []cli.Flag{
-				cli.StringFlag{
-					Name:   "template, t",
-					Value:  "template.[yaml|yml]",
-					Usage:  "AWS SAM template file",
-					EnvVar: "SAM_TEMPLATE_FILE",
-				},
-			},
-		},
-
-		cli.Command{
-			// This is just here for consistent usage and --help
-			Name:   "package",
-			Usage:  "Package an AWS SAM application. This is an alias for 'aws cloudformation package'.",
-			Action: pkg,
-		},
-
-		cli.Command{
-			// This is just here for consistent usage and --help
-			Name:   "deploy",
-			Usage:  "Deploy an AWS SAM application. This is an alias for 'aws cloudformation deploy'.",
-			Action: deploy,
-		},
-	}
-
-	// For 'package' and 'deploy' CLI options, we want to intercept
-	// and just pass all arguments through to the AWS CLI commands.
-	if len(os.Args) > 1 && os.Args[1] == "package" {
-		pkg()
-		return
-	}
-
-	// For 'package' and 'deploy' CLI options, we want to intercept
-	// and just pass all arguments through to the AWS CLI commands.
-	if len(os.Args) > 1 && os.Args[1] == "deploy" {
-		deploy()
-		return
-	}
-
-	app.Run(os.Args)
-
-}
-
-// regexp that parses Cloudformation paramter key-value pair: https://regex101.com/r/hruxlg/3
-var paramRe = regexp.MustCompile(`(?:ParameterKey)=("(?:\\.|[^"\\]+)*"|(?:\\.|[^, "\\]+)*),(?:ParameterValue)=("(?:\\.|[^"\\]+)*"|(?:\\.|[^ ,"\\]+)*)`)
-
-// parseParameters parses the Cloudformation parameters like string and converts
-// it into a map of key-value pairs.
-func parseParameters(arg string) (overrides map[string]interface{}) {
-	overrides = make(map[string]interface{})
-
-	unquote := func(orig string) string {
-		return strings.Replace(strings.TrimSuffix(strings.TrimPrefix(orig, `"`), `"`), `\ `, ` `, -1)
-	}
-
-	for _, match := range paramRe.FindAllStringSubmatch(arg, -1) {
-		overrides[unquote(match[1])] = unquote(match[2])
-	}
-	return
-}
-
-// getTemplateFilename allows SAM Local to default to either template.yaml
-// or template.yml for the --template/-t parameter. This is helpful, as there
-// isn't a hard definition for the filename suffix and usage tends to be mixed
-func getTemplateFilename(filename string) string {
-
-	if filename != "template.[yaml|yml]" {
-		return filename
-	}
-
-	// See whether to use template.yaml or template.yml
-
-	// First shoot for .yaml
-	fp, err := filepath.Abs("template.yaml")
-	if err != nil {
-		// Can't work out the absolute path, so just use whatever was passed in
-		return filename
-	}
-
-	fi, err := os.Stat(fp)
-	if err == nil {
-		// There is a template.yaml, so use it
-		return fi.Name()
-	}
-
-	// We couldn't find a template.yaml, so fallback to template.yml
-	return "template.yml"
-
-}
diff --git a/media/sam-local-banner.png b/media/sam-cli-banner.png
similarity index 100%
rename from media/sam-local-banner.png
rename to media/sam-cli-banner.png
diff --git a/package.go b/package.go
deleted file mode 100644
index 6f3faf9c99..0000000000
--- a/package.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package main
-
-import (
-	"io"
-	"log"
-	"os"
-	"os/exec"
-)
-
-func pkg() {
-
-	args := []string{"cloudformation", "package"}
-	for _, arg := range os.Args[2:] {
-		args = append(args, arg)
-	}
-
-	cmd := exec.Command("aws", args...)
-
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if err := cmd.Start(); err != nil {
-		log.Fatal(err)
-	}
-
-	go io.Copy(os.Stderr, stderr)
-	go io.Copy(os.Stdout, stdout)
-
-	if err := cmd.Wait(); err != nil {
-		os.Exit(1)
-	}
-}
diff --git a/params_test.go b/params_test.go
deleted file mode 100644
index 25d087d667..0000000000
--- a/params_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package main
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Parse Cloudformation parameters", func() {
-
-	Context("with normal input", func() {
-
-		It("returns empty map when input is missing", func() {
-			p := parseParameters("")
-			Expect(p).To(BeEmpty())
-		})
-
-		It("returns expected values when input is correct", func() {
-			p := parseParameters("ParameterKey=KeyPairName,ParameterValue=MyKey ParameterKey=InstanceType,ParameterValue=t1.micro")
-			Expect(p).To(HaveLen(2))
-			Expect(p).To(HaveKeyWithValue("KeyPairName", "MyKey"))
-			Expect(p).To(HaveKeyWithValue("InstanceType", "t1.micro"))
-		})
-
-		It("returns partial values when input is malformed", func() {
-			p := parseParameters("ParameterKey=KeyPairName,ParameterValue=MyKey Para")
-			Expect(p).To(HaveLen(1))
-			Expect(p).To(HaveKeyWithValue("KeyPairName", "MyKey"))
-		})
-	})
-
-	Context("with escaped input", func() {
-
-		It("returns expected values when keys or values are quoted", func() {
-			p := parseParameters(`ParameterKey="KeyPairName",ParameterValue="MyKey " ParameterKey=InstanceType,ParameterValue=t1\ mic\ ro`)
-			Expect(p).To(HaveLen(2))
-			Expect(p).To(HaveKeyWithValue("KeyPairName", "MyKey "))
-			Expect(p).To(HaveKeyWithValue("InstanceType", "t1 mic ro"))
-		})
-
-		It("handles wrong quotings", func() {
-			p := parseParameters(`ParameterKey="KeyPairName,ParameterValue="MyKey" ParameterKey=InstanceType,ParameterValue=t1\ micro`)
-			Expect(p).To(HaveLen(1))
-			Expect(p).To(HaveKeyWithValue("InstanceType", "t1 micro"))
-		})
-
-	})
-})
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000000..fd1b9f27dc
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,4 @@
+[pytest]
+env =
+    AWS_DEFAULT_REGION = ap-southeast-1
+
diff --git a/requirements/base.txt b/requirements/base.txt
new file mode 100644
index 0000000000..74574676ec
--- /dev/null
+++ b/requirements/base.txt
@@ -0,0 +1,9 @@
+six~=1.11.0
+click~=6.7
+enum34~=1.1.6
+Flask~=0.12.2
+boto3~=1.5
+PyYAML~=3.12
+cookiecutter~=1.6.0
+aws-sam-translator==1.5.4
+docker>=3.3.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
new file mode 100644
index 0000000000..d7ae73ee3f
--- /dev/null
+++ b/requirements/dev.txt
@@ -0,0 +1,16 @@
+coverage==4.3.4
+flake8==3.3.0
+tox==2.2.1
+pytest-cov==2.4.0
+pylint==1.7.2
+
+# Test requirements
+pytest==3.0.7
+py==1.4.33
+mock==2.0.0
+requests>=2.18.0
+parameterized==0.6.1
+pathlib2==2.3.2
+futures==3.2.0
+# Py3.2 backport
+backports.tempfile==1.0
diff --git a/router/api.go b/router/api.go
deleted file mode 100644
index 2a7d91921e..0000000000
--- a/router/api.go
+++ /dev/null
@@ -1,296 +0,0 @@
-package router
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"log"
-
-	"strings"
-
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/s3"
-	"github.com/awslabs/goformation/cloudformation"
-	"github.com/go-openapi/spec"
-	"github.com/sanathkr/go-yaml"
-)
-
-const apiGatewayIntegrationExtension = "x-amazon-apigateway-integration"
-const apiGatewayAnyMethodExtension = "x-amazon-apigateway-any-method"
-const apiGatewayBinaryMediaTypesExtension = "x-amazon-apigateway-binary-media-types"
-
-// temporary object. This is just used to marshal and unmarshal the any method
-// API Gateway swagger extension
-type ApiGatewayAnyMethod struct {
-	IntegrationSettings interface{} `json:"x-amazon-apigateway-integration"`
-}
-
-// AWSServerlessApi wraps GoFormation's AWS::Serverless::Api definition
-// and adds some convenience methods for extracting the ServerlessRouterMount's
-// from the swagger defintion etc.
-type AWSServerlessApi struct {
-	*cloudformation.AWSServerlessApi
-}
-
-// Mounts fetches an array of the ServerlessRouterMount's for this API.
-// These contain the path, method and handler function for each mount point.
-func (api *AWSServerlessApi) Mounts() ([]*ServerlessRouterMount, error) {
-	jsonDefinition, err := api.Swagger()
-
-	if err != nil {
-		// this is our own error so we return it directly
-		return nil, err
-	}
-
-	swagger := spec.Swagger{}
-	err = swagger.UnmarshalJSON(jsonDefinition)
-
-	if err != nil {
-		return nil, fmt.Errorf("Cannot parse Swagger definition: %s", err.Error())
-	}
-
-	mounts := []*ServerlessRouterMount{}
-
-	binaryMediaTypes, ok := swagger.VendorExtensible.Extensions.GetStringSlice(apiGatewayBinaryMediaTypesExtension)
-	if !ok {
-		binaryMediaTypes = []string{}
-	}
-
-	for path, pathItem := range swagger.Paths.Paths {
-		// temporary tracking of mounted methods for the current path. Used to
-		// mount all non-existing methods for the any extension. This is because
-		// the err from JSONLookup did not work as expected
-		mappedMethods := map[string]bool{}
-
-		for _, method := range HttpMethods {
-
-			if operationIface, err := pathItem.JSONLookup(strings.ToLower(method)); err == nil {
-				operation := spec.Operation{}
-				operationJSON, err := json.Marshal(operationIface)
-				if err != nil {
-					return nil, fmt.Errorf("Could not parse %s operation: %s", method, err.Error())
-				}
-				operation.UnmarshalJSON(operationJSON)
-
-				// the JSON will always contain the method because it's a property in the Swagger model
-				// If we don't have an integration defined then we skip it.
-				if operation.Extensions[apiGatewayIntegrationExtension] == nil {
-					continue
-				}
-
-				integration, _ := operation.Extensions[apiGatewayIntegrationExtension]
-				mounts = append(mounts, api.createMount(
-					path,
-					strings.ToLower(method),
-					api.parseIntegrationSettings(integration),
-					binaryMediaTypes))
-				mappedMethods[method] = true
-			}
-		}
-
-		anyMethod, available := pathItem.Extensions[apiGatewayAnyMethodExtension]
-		if available {
-			// any method to json then unmarshal to temporary object
-			anyMethodJSON, err := json.Marshal(anyMethod)
-			if err != nil {
-				return nil, fmt.Errorf("Could not marshal any method object to json")
-			}
-
-			anyMethodObject := ApiGatewayAnyMethod{}
-			err = json.Unmarshal(anyMethodJSON, &anyMethodObject)
-
-			if err != nil {
-				return nil, fmt.Errorf("Could not unmarshal any method josn to object model")
-			}
-
-			for _, method := range HttpMethods {
-				if _, ok := mappedMethods[method]; !ok {
-					mounts = append(mounts, api.createMount(
-						path,
-						strings.ToLower(method),
-						api.parseIntegrationSettings(anyMethodObject.IntegrationSettings),
-						binaryMediaTypes))
-				}
-			}
-		}
-	}
-
-	return mounts, nil
-}
-
-// parses a byte[] for the API Gateway inetegration extension from a method and return
-// the object representation
-func (api *AWSServerlessApi) parseIntegrationSettings(integrationData interface{}) *ApiGatewayIntegration {
-	integrationJSON, err := json.Marshal(integrationData)
-	if err != nil {
-		log.Printf("Could not parse integration data to json")
-		return nil
-	}
-
-	integration := ApiGatewayIntegration{}
-	err = json.Unmarshal(integrationJSON, &integration)
-
-	if err != nil {
-		log.Printf("Could not unmarshal integration data to ApiGatewayIntegration model")
-		return nil
-	}
-
-	return &integration
-}
-
-func (api *AWSServerlessApi) createMount(path string, verb string, integration *ApiGatewayIntegration, binaryMediaTypes []string) *(ServerlessRouterMount) {
-	newMount := &ServerlessRouterMount{
-		Name:             path,
-		Path:             path,
-		Method:           verb,
-		BinaryMediaTypes: binaryMediaTypes,
-	}
-
-	if integration == nil {
-		log.Printf("No integration defined for method")
-		return newMount
-	}
-
-	functionName, err := integration.GetFunctionArn()
-
-	if err != nil {
-		log.Printf("Could not extract Lambda function ARN: %s", err.Error())
-	}
-	newMount.IntegrationArn = functionName
-
-	return newMount
-}
-
-// Swagger gets the swagger definition for the API.
-// Returns the swagger definition as a []byte of JSON.
-func (api *AWSServerlessApi) Swagger() ([]byte, error) {
-
-	// The swagger definition can be passed in 1 of 4 ways:
-
-	// 1. A definition URI defined as a string
-	if api.DefinitionUri != nil {
-		if api.DefinitionUri.String != nil {
-			data, err := api.getSwaggerFromURI(*api.DefinitionUri.String)
-			if err != nil {
-				return nil, err
-			}
-			return api.ensureJSON(data)
-		}
-	}
-
-	// 2. A definition URI defined as an S3 Location
-	if api.DefinitionUri != nil {
-		if api.DefinitionUri.S3Location != nil {
-			data, err := api.getSwaggerFromS3Location(*api.DefinitionUri.S3Location)
-			if err != nil {
-				return nil, err
-			}
-			return api.ensureJSON(data)
-		}
-	}
-
-	if api.DefinitionBody != nil {
-
-		switch val := api.DefinitionBody.(type) {
-
-		case string:
-			// 3. A definition body defined as JSON (which will unmarshal to a string)
-			return api.getSwaggerFromString(val)
-
-		case map[string]interface{}:
-			// 4. A definition body defined as YAML (which will unmarshal to map[string]interface{})
-			return api.getSwaggerFromMap(val)
-		}
-
-	}
-
-	return nil, fmt.Errorf("no swagger definition found")
-}
-
-func (api *AWSServerlessApi) ensureJSON(data []byte) ([]byte, error) {
-	var tmpDefinition interface{}
-	err := json.Unmarshal(data, &tmpDefinition)
-
-	if err != nil { // may be yaml
-		err = yaml.Unmarshal(data, &tmpDefinition)
-
-		if err != nil {
-			// we can't make it work either as json or yaml. fail :(
-			return nil, err
-		}
-		tmpDefinition = yamlToJSON(tmpDefinition)
-
-		outputData, err := json.Marshal(tmpDefinition)
-		if err != nil {
-			return nil, err
-		}
-		return outputData, nil
-	}
-
-	return data, nil
-}
-
-func (api *AWSServerlessApi) getSwaggerFromURI(uri string) ([]byte, error) {
-	data, err := ioutil.ReadFile(uri)
-	if err != nil {
-		return nil, fmt.Errorf("Cannot read local Swagger definition (%s): %s", uri, err.Error())
-	}
-	return data, nil
-}
-
-func (api *AWSServerlessApi) getSwaggerFromS3Location(loc cloudformation.AWSServerlessApi_S3Location) ([]byte, error) {
-	sess := session.Must(session.NewSession())
-	client := s3.New(sess)
-
-	objectVersion := string(loc.Version)
-	s3Input := s3.GetObjectInput{
-		Bucket:    &loc.Bucket,
-		Key:       &loc.Key,
-		VersionId: &objectVersion,
-	}
-
-	object, err := client.GetObject(&s3Input)
-
-	if err != nil {
-		return nil, fmt.Errorf("Error while fetching Swagger template from S3: %s\n%s", loc.Bucket+loc.Key, err.Error())
-	}
-
-	body, err := ioutil.ReadAll(object.Body)
-
-	if err != nil {
-		return nil, fmt.Errorf("Cannot read s3 Swagger boject body: %s", err.Error())
-	}
-	return body, nil
-}
-
-func (api *AWSServerlessApi) getSwaggerFromString(input string) ([]byte, error) {
-	return []byte(input), nil
-}
-
-func (api *AWSServerlessApi) getSwaggerFromMap(input map[string]interface{}) ([]byte, error) {
-	return json.Marshal(input)
-}
-
-// Recursively convert a map[interface{}]interface{} (yaml) to map[string]interface{} (json)
-// with an additional special case for the Swagger version that makes the offical Swagger
-// library very upset.
-func yamlToJSON(i interface{}) interface{} {
-	switch x := i.(type) {
-	case map[interface{}]interface{}:
-		m2 := map[string]interface{}{}
-		for k, v := range x {
-			// we have a special case for the swagger version, we need to convert it to a string
-			if strings.ToLower(k.(string)) == "swagger" {
-				m2[k.(string)] = fmt.Sprintf("%v", v)
-			} else {
-				m2[k.(string)] = yamlToJSON(v)
-			}
-		}
-		return m2
-	case []interface{}:
-		for i, v := range x {
-			x[i] = yamlToJSON(v)
-		}
-	}
-	return i
-}
diff --git a/router/api_test.go b/router/api_test.go
deleted file mode 100644
index 453dfe0a92..0000000000
--- a/router/api_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package router_test
-
-import (
-	"strings"
-
-	"github.com/awslabs/aws-sam-local/router"
-	"github.com/awslabs/goformation/cloudformation"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-func getApiResourceFromTemplate(path string) *router.AWSServerlessApi {
-	templateUri := &path
-	apiResource := &router.AWSServerlessApi{
-		AWSServerlessApi: &cloudformation.AWSServerlessApi{
-			DefinitionUri: &cloudformation.AWSServerlessApi_DefinitionUri{
-				String: templateUri,
-			},
-		},
-	}
-	return apiResource
-}
-
-var _ = Describe("Api", func() {
-
-	Context("Load local Swagger definitions", func() {
-		It("Succesfully loads the basic template", func() {
-			apiResource := getApiResourceFromTemplate("../test/templates/open-api/pet-store-simple.json")
-
-			mounts, err := apiResource.Mounts()
-
-			Expect(err).Should(BeNil())
-			Expect(mounts).ShouldNot(BeNil())
-
-			Expect(mounts).ShouldNot(BeEmpty())
-			Expect(len(mounts)).Should(BeIdenticalTo(4))
-		})
-
-		It("Succesfully reads integration definition", func() {
-			apiResource := getApiResourceFromTemplate("../test/templates/open-api/pet-store-simple.json")
-
-			mounts, err := apiResource.Mounts()
-
-			Expect(err).Should(BeNil())
-			Expect(mounts).ShouldNot(BeNil())
-
-			for _, mount := range mounts {
-				if mount.Method == "get" && mount.Path == "/pets" {
-					Expect(mount.IntegrationArn.Arn).Should(BeIdenticalTo("arn:aws:lambda:us-west-2:123456789012:function:Calc"))
-				}
-			}
-		})
-
-		It("Loads the proxy template", func() {
-			apiResource := getApiResourceFromTemplate("../test/templates/open-api/pet-store-proxy.json")
-
-			mounts, err := apiResource.Mounts()
-
-			Expect(err).Should(BeNil())
-			Expect(mounts).ShouldNot(BeNil())
-			// we expect 9 here because the any method should generate all 7
-			Expect(len(mounts)).To(BeIdenticalTo(9))
-
-			for _, mount := range mounts {
-				if mount.Method == "post" && mount.Path == "/pets/{proxy+}" {
-					Expect(mount.IntegrationArn.Arn).Should(ContainSubstring("AnyMethod"))
-				}
-				if mount.Method == "delete" && mount.Path == "/pets/{proxy+}" {
-					Expect(mount.IntegrationArn.Arn).Should(ContainSubstring("Calc"))
-				}
-			}
-		})
-
-		It("Loads a YAML Swagger template", func() {
-			apiResource := getApiResourceFromTemplate("../test/templates/open-api/simple-yaml.yaml")
-
-			mounts, err := apiResource.Mounts()
-			Expect(err).To(BeNil())
-			Expect(mounts).ToNot(BeNil())
-			Expect(1).To(Equal(len(mounts)))
-			Expect("/").To(Equal(mounts[0].Path))
-			Expect("post").To(Equal(strings.ToLower(mounts[0].Method)))
-		})
-
-	})
-})
diff --git a/router/event.go b/router/event.go
deleted file mode 100644
index 734b2ceb7f..0000000000
--- a/router/event.go
+++ /dev/null
@@ -1,126 +0,0 @@
-package router
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-	"strings"
-
-	"github.com/gorilla/mux"
-)
-
-// Event represents an event passed to an AWS Lambda function by the runtime
-type Event struct {
-	HTTPMethod        string            `json:"httpMethod"`
-	Body              string            `json:"body"`
-	Resource          string            `json:"resource"`
-	RequestContext    RequestContext    `json:"requestContext"`
-	QueryStringParams map[string]string `json:"queryStringParameters"`
-	Headers           map[string]string `json:"headers"`
-	PathParameters    map[string]string `json:"pathParameters"`
-	StageVariables    map[string]string `json:"stageVariables"`
-	Path              string            `json:"path"`
-	IsBase64Encoded   bool              `json:"isBase64Encoded"`
-}
-
-// RequestContext represents the context object that gets passed to an AWS Lambda function
-type RequestContext struct {
-	ResourceID   string          `json:"resourceId,omitempty"`
-	APIID        string          `json:"apiId,omitempty"`
-	ResourcePath string          `json:"resourcePath,omitempty"`
-	HTTPMethod   string          `json:"httpMethod,omitempty"`
-	RequestID    string          `json:"requestId,omitempty"`
-	AccountsID   string          `json:"accountId,omitempty"`
-	Stage        string          `json:"stage,omitempty"`
-	Identity     ContextIdentity `json:"identity,omitempty"`
-}
-
-// ContextIdentity represents the identity section of the context object that gets passed to an AWS Lambda function
-type ContextIdentity struct {
-	APIKey                        string `json:"apiKey,omitempty"`
-	UserARN                       string `json:"userArn,omitempty"`
-	CognitoAuthenticationType     string `json:"cognitoAuthenticationType,omitempty"`
-	Caller                        string `json:"caller,omitempty"`
-	UserAgent                     string `json:"userAgent,omitempty"`
-	User                          string `json:"user,omitempty"`
-	CognitoIdentityPoolID         string `json:"cognitoIdentityPoolId,omitempty"`
-	CognitoIdentityID             string `json:"cognitoIdentityId,omitempty"`
-	CognitoAuthenticationProvider string `json:"cognitoAuthenticationProvider,omitempty"`
-	SourceIP                      string `json:"sourceIp,omitempty"`
-	AccountID                     string `json:"accountId,omitempty"`
-}
-
-// NewEvent initalises and populates a new ApiEvent with
-// event details from a http.Request and isBase64Encoded value
-func NewEvent(req *http.Request, isBase64Encoded bool) (*Event, error) {
-
-	var body []byte
-	if req.Body != nil {
-		var err error
-		body, err = ioutil.ReadAll(req.Body)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	headers := map[string]string{}
-	for name, values := range req.Header {
-		for _, value := range values {
-			headers[name] = value
-		}
-	}
-
-	// add the forwarded headers we expect to see from an API Gateway request
-	if _, ok := headers["Host"]; !ok {
-		host := req.Host
-		if strings.Contains(host, ":") {
-			host = host[:strings.Index(host, ":")]
-		}
-		headers["Host"] = host
-	}
-	headers["X-Forwarded-Proto"] = req.URL.Scheme
-	headers["X-Forwarded-Port"] = req.URL.Port()
-
-	query := map[string]string{}
-	for name, values := range req.URL.Query() {
-		for _, value := range values {
-			query[name] = value
-		}
-	}
-
-	pathParams := mux.Vars(req)
-	if len(pathParams) == 0 {
-		pathParams = nil
-	}
-
-	event := &Event{
-		HTTPMethod:        req.Method,
-		Body:              string(body),
-		Headers:           headers,
-		QueryStringParams: query,
-		Path:              req.URL.Path,
-		Resource:          req.URL.Path,
-		PathParameters:    pathParams,
-		IsBase64Encoded:   isBase64Encoded,
-	}
-
-	event.RequestContext.Identity.SourceIP = req.RemoteAddr
-	event.RequestContext.ResourcePath = req.URL.Path
-	event.RequestContext.HTTPMethod = req.Method
-	event.RequestContext.Stage = "prod"
-
-	return event, nil
-
-}
-
-// JSON returns the event as a JSON string
-func (e *Event) JSON() (string, error) {
-
-	data, err := json.Marshal(e)
-	if err != nil {
-		return "", err
-	}
-
-	return string(data), nil
-
-}
diff --git a/router/event_test.go b/router/event_test.go
deleted file mode 100644
index c78bdf02ae..0000000000
--- a/router/event_test.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package router
-
-import (
-	"bytes"
-	"net/http"
-	"net/http/httptest"
-
-	"github.com/awslabs/goformation/cloudformation"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Event", func() {
-	Describe("PathParameters", func() {
-		var r *ServerlessRouter
-		BeforeEach(func() {
-			r = NewServerlessRouter(false)
-		})
-
-		Context("with path parameters on the route", func() {
-			function := &cloudformation.AWSServerlessFunction{
-				Runtime: "nodejs6.10",
-				Events: map[string]cloudformation.AWSServerlessFunction_EventSource{
-					"GetRequest": cloudformation.AWSServerlessFunction_EventSource{
-						Type: "Api",
-						Properties: &cloudformation.AWSServerlessFunction_Properties{
-							ApiEvent: &cloudformation.AWSServerlessFunction_ApiEvent{
-								Path:   "/get",
-								Method: "get",
-							},
-						},
-					},
-					"GetRequestsWithParams": cloudformation.AWSServerlessFunction_EventSource{
-						Type: "Api",
-						Properties: &cloudformation.AWSServerlessFunction_Properties{
-							ApiEvent: &cloudformation.AWSServerlessFunction_ApiEvent{
-								Path:   "/get/{parameter}",
-								Method: "get",
-							},
-						},
-					},
-				},
-			}
-
-			Context("and path parameters on the request", func() {
-				req, _ := http.NewRequest("GET", "/get/1", new(bytes.Buffer))
-
-				It("returns the parameters on the event", func() {
-					r.AddFunction(function, func(w http.ResponseWriter, e *Event) {
-						Expect(e.PathParameters).To(HaveKeyWithValue("parameter", "1"))
-					})
-
-					rec := httptest.NewRecorder()
-					r.Router().ServeHTTP(rec, req)
-				})
-			})
-
-			Context("and path parameters on the request", func() {
-				req, _ := http.NewRequest("GET", "/get/1", new(bytes.Buffer))
-
-				It("returns stage property with value \"prod\"", func() {
-					r.AddFunction(function, func(w http.ResponseWriter, e *Event) {
-						Expect(e.RequestContext.Stage).To(BeIdenticalTo("prod"))
-					})
-
-					rec := httptest.NewRecorder()
-					r.Router().ServeHTTP(rec, req)
-				})
-			})
-
-			Context("and no path parameters on the request", func() {
-				req, _ := http.NewRequest("GET", "/get", new(bytes.Buffer))
-
-				It("returns nil for PathParameters on the event", func() {
-					r.AddFunction(function, func(w http.ResponseWriter, e *Event) {
-						Expect(e.PathParameters).To(BeNil())
-					})
-
-					rec := httptest.NewRecorder()
-					r.Router().ServeHTTP(rec, req)
-				})
-			})
-
-			Context("Includes forwarded headers", func() {
-				req, _ := http.NewRequest("GET", "http://localhost:3000/get", new(bytes.Buffer))
-
-				It("Includes Host header", func() {
-					r.AddFunction(function, func(w http.ResponseWriter, e *Event) {
-						hostHeader, ok := e.Headers["Host"]
-						Expect(ok).To(BeTrue())
-						Expect(hostHeader).To(BeIdenticalTo("localhost"))
-					})
-					rec := httptest.NewRecorder()
-					r.Router().ServeHTTP(rec, req)
-				})
-
-				It("Includes X-Forwarded-Proto header", func() {
-					r.AddFunction(function, func(w http.ResponseWriter, e *Event) {
-						hostHeader, ok := e.Headers["X-Forwarded-Proto"]
-						Expect(ok).To(BeTrue())
-						Expect(hostHeader).To(BeIdenticalTo("http"))
-					})
-					rec := httptest.NewRecorder()
-					r.Router().ServeHTTP(rec, req)
-				})
-
-				It("Includes X-Forwarded-Port header", func() {
-					r.AddFunction(function, func(w http.ResponseWriter, e *Event) {
-						hostHeader, ok := e.Headers["X-Forwarded-Port"]
-						Expect(ok).To(BeTrue())
-						Expect(hostHeader).To(BeIdenticalTo("3000"))
-					})
-					rec := httptest.NewRecorder()
-					r.Router().ServeHTTP(rec, req)
-				})
-			})
-		})
-
-		Context("with no parameters on the route", func() {
-			function := &cloudformation.AWSServerlessFunction{
-				Runtime: "nodejs6.10",
-				Events: map[string]cloudformation.AWSServerlessFunction_EventSource{
-					"GetRequest": cloudformation.AWSServerlessFunction_EventSource{
-						Type: "Api",
-						Properties: &cloudformation.AWSServerlessFunction_Properties{
-							ApiEvent: &cloudformation.AWSServerlessFunction_ApiEvent{
-								Path:   "/get",
-								Method: "get",
-							},
-						},
-					},
-				},
-			}
-
-			req, _ := http.NewRequest("GET", "/get", new(bytes.Buffer))
-
-			It("returns nil for PathParameters on the event", func() {
-				r.AddFunction(function, func(w http.ResponseWriter, e *Event) {
-					Expect(e.PathParameters).To(BeNil())
-				})
-
-				rec := httptest.NewRecorder()
-				r.Router().ServeHTTP(rec, req)
-			})
-		})
-	})
-})
diff --git a/router/function.go b/router/function.go
deleted file mode 100644
index 5602fa081b..0000000000
--- a/router/function.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package router
-
-import (
-	"github.com/awslabs/goformation/cloudformation"
-)
-
-// AWSServerlessFunction wraps GoFormation's AWS::Serverless::Function definition
-// and adds some convenience methods for extracting the ServerlessRouterMount's
-// from the event sources.
-type AWSServerlessFunction struct {
-	*cloudformation.AWSServerlessFunction
-	handler EventHandlerFunc
-}
-
-// Mounts fetches an array of the ServerlessRouterMount's for this API.
-// These contain the path, method and handler function for each mount point.
-func (f *AWSServerlessFunction) Mounts() ([]*ServerlessRouterMount, error) {
-
-	mounts := []*ServerlessRouterMount{}
-
-	for name, event := range f.Events {
-		if event.Type == "Api" {
-			if event.Properties != nil && event.Properties.ApiEvent != nil {
-				mounts = append(mounts, &ServerlessRouterMount{
-					Name:      name,
-					Path:      event.Properties.ApiEvent.Path,
-					Method:    event.Properties.ApiEvent.Method,
-					Handler:   f.handler,
-					Function:  f,
-				})
-			}
-		}
-	}
-
-	return mounts, nil
-
-}
diff --git a/router/function_test.go b/router/function_test.go
deleted file mode 100644
index 930fddb587..0000000000
--- a/router/function_test.go
+++ /dev/null
@@ -1,260 +0,0 @@
-package router_test
-
-import (
-	"net/http"
-	"net/http/httptest"
-
-	"github.com/awslabs/aws-sam-local/router"
-	"github.com/awslabs/goformation/cloudformation"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	. "github.com/onsi/gomega/gstruct"
-)
-
-var _ = Describe("Function", func() {
-
-	Context("with a GoFormation AWS::Serverless::Function", func() {
-
-		r := router.NewServerlessRouter(false)
-
-		function := &cloudformation.AWSServerlessFunction{
-			Runtime: "nodejs6.10",
-			Events: map[string]cloudformation.AWSServerlessFunction_EventSource{
-				"GetRequests": cloudformation.AWSServerlessFunction_EventSource{
-					Type: "Api",
-					Properties: &cloudformation.AWSServerlessFunction_Properties{
-						ApiEvent: &cloudformation.AWSServerlessFunction_ApiEvent{
-							Path:   "/get",
-							Method: "get",
-						},
-					},
-				},
-				"PostRequests": cloudformation.AWSServerlessFunction_EventSource{
-					Type: "Api",
-					Properties: &cloudformation.AWSServerlessFunction_Properties{
-						ApiEvent: &cloudformation.AWSServerlessFunction_ApiEvent{
-							Path:   "/post",
-							Method: "post",
-						},
-					},
-				},
-				"AnyRequests": cloudformation.AWSServerlessFunction_EventSource{
-					Type: "Api",
-					Properties: &cloudformation.AWSServerlessFunction_Properties{
-						ApiEvent: &cloudformation.AWSServerlessFunction_ApiEvent{
-							Path:   "/any",
-							Method: "any",
-						},
-					},
-				},
-				"ProxyResource": cloudformation.AWSServerlessFunction_EventSource{
-					Type: "Api",
-					Properties: &cloudformation.AWSServerlessFunction_Properties{
-						ApiEvent: &cloudformation.AWSServerlessFunction_ApiEvent{
-							Path:   "/proxy/{proxy+}",
-							Method: "any",
-						},
-					},
-				},
-			},
-		}
-
-		err := r.AddFunction(function, func(w http.ResponseWriter, e *router.Event) {
-			w.WriteHeader(200)
-			w.Write([]byte("ok"))
-		})
-
-		It("should add the function successfully", func() {
-			Expect(err).To(BeNil())
-		})
-
-		mounts := r.Mounts()
-		It("should find three API event sources", func() {
-			Expect(mounts).To(HaveLen(4))
-		})
-
-		It("should have the correct values for an event with GET http method", func() {
-			Expect(mounts).To(ContainElement(PointTo(MatchFields(IgnoreExtras, Fields{
-				"Name":      Equal("GetRequests"),
-				"Path":      Equal("/get"),
-				"Method":    Equal("get"),
-			}))))
-		})
-
-		It("should have the correct values for an event with POST http method", func() {
-			Expect(mounts).To(ContainElement(PointTo(MatchFields(IgnoreExtras, Fields{
-				"Name":      Equal("PostRequests"),
-				"Path":      Equal("/post"),
-				"Method":    Equal("post"),
-			}))))
-		})
-
-		It("should have the correct values for an event with ANY http method", func() {
-			Expect(mounts).To(ContainElement(PointTo(MatchFields(IgnoreExtras, Fields{
-				"Name":      Equal("AnyRequests"),
-				"Path":      Equal("/any"),
-				"Method":    Equal("any"),
-			}))))
-		})
-
-		It("should have the correct values for an event with catchAll path", func() {
-			Expect(mounts).To(ContainElement(PointTo(MatchFields(IgnoreExtras, Fields{
-				"Name":      Equal("ProxyResource"),
-				"Path":      Equal("/proxy/{proxy+}"),
-				"Method":    Equal("any"),
-			}))))
-		})
-
-		It("should respond to HTTP requests on GET /get", func() {
-			req, _ := http.NewRequest("GET", "/get", nil)
-			rr := httptest.NewRecorder()
-			r.Router().ServeHTTP(rr, req)
-			Expect(rr.Code).To(Equal(http.StatusOK))
-			Expect(rr.Body.String()).To(Equal("ok"))
-		})
-
-		It("should respond to HTTP requests on POST /post", func() {
-			req, _ := http.NewRequest("POST", "/post", nil)
-			rr := httptest.NewRecorder()
-			r.Router().ServeHTTP(rr, req)
-			Expect(rr.Code).To(Equal(http.StatusOK))
-			Expect(rr.Body.String()).To(Equal("ok"))
-		})
-
-		It("should respond to HTTP requests on POST /post", func() {
-			req, _ := http.NewRequest("POST", "/post", nil)
-			rr := httptest.NewRecorder()
-			r.Router().ServeHTTP(rr, req)
-			Expect(rr.Code).To(Equal(http.StatusOK))
-			Expect(rr.Body.String()).To(Equal("ok"))
-		})
-
-		It("should respond with a 404 to HTTP requests on an invalid path", func() {
-			req, _ := http.NewRequest("GET", "/invalid", nil)
-			rr := httptest.NewRecorder()
-			r.Router().ServeHTTP(rr, req)
-			Expect(rr.Code).To(Equal(http.StatusNotFound))
-		})
-
-		It("should respond to GET requests on any path in catch-all resource", func() {
-			req, _ := http.NewRequest("GET", "/proxy/hello/world", nil)
-			rr := httptest.NewRecorder()
-			r.Router().ServeHTTP(rr, req)
-			Expect(rr.Code).To(Equal(http.StatusOK))
-		})
-
-		It("should respond to GET requests on a single sub-resource", func() {
-			req, _ := http.NewRequest("GET", "/proxy/hello", nil)
-			rr := httptest.NewRecorder()
-			r.Router().ServeHTTP(rr, req)
-			Expect(rr.Code).To(Equal(http.StatusOK))
-		})
-
-		It("should not respond to base proxy path, only sub-resources", func() {
-			req, _ := http.NewRequest("GET", "/proxy", nil)
-			rr := httptest.NewRecorder()
-			r.Router().ServeHTTP(rr, req)
-			Expect(rr.Code).To(Equal(http.StatusNotFound))
-		})
-
-		methods := []string{"OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "PATCH"}
-		for _, method := range methods {
-			It("should respond to HTTP requests on "+method+" /any", func() {
-				req, _ := http.NewRequest(method, "/any", nil)
-				rr := httptest.NewRecorder()
-				r.Router().ServeHTTP(rr, req)
-				Expect(rr.Code).To(Equal(http.StatusOK))
-				Expect(rr.Body.String()).To(Equal("ok"))
-			})
-		}
-
-	})
-
-	Context("with a GoFormation AWS::Serverless::Function and prefix matching", func() {
-
-		r := router.NewServerlessRouter(true)
-
-		function := &cloudformation.AWSServerlessFunction{
-			Runtime: "nodejs6.10",
-			Events: map[string]cloudformation.AWSServerlessFunction_EventSource{
-				"AnyRequests": cloudformation.AWSServerlessFunction_EventSource{
-					Type: "Api",
-					Properties: &cloudformation.AWSServerlessFunction_Properties{
-						ApiEvent: &cloudformation.AWSServerlessFunction_ApiEvent{
-							Path:   "/any",
-							Method: "any",
-						},
-					},
-				},
-			},
-		}
-
-		err := r.AddFunction(function, func(w http.ResponseWriter, e *router.Event) {
-			w.WriteHeader(200)
-			w.Write([]byte("ok"))
-		})
-
-		It("should add the function successfully", func() {
-			Expect(err).To(BeNil())
-		})
-
-		mounts := r.Mounts()
-		It("should find three API event sources", func() {
-			Expect(mounts).To(HaveLen(1))
-		})
-
-		It("should have the correct values for an event with ANY http method", func() {
-			Expect(mounts).To(ContainElement(PointTo(MatchFields(IgnoreExtras, Fields{
-				"Name":   Equal("AnyRequests"),
-				"Path":   Equal("/any"),
-				"Method": Equal("any"),
-			}))))
-		})
-
-		It("should respond with a 404 to HTTP requests on an invalid path", func() {
-			req, _ := http.NewRequest("GET", "/invalid", nil)
-			rr := httptest.NewRecorder()
-			r.Router().ServeHTTP(rr, req)
-			Expect(rr.Code).To(Equal(http.StatusNotFound))
-		})
-
-		methods := []string{"OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "PATCH"}
-		for _, method := range methods {
-			It("should respond to HTTP requests on "+method+" /any", func() {
-				req, _ := http.NewRequest(method, "/any", nil)
-				rr := httptest.NewRecorder()
-				r.Router().ServeHTTP(rr, req)
-				Expect(rr.Code).To(Equal(http.StatusOK))
-			})
-
-			It("should respond to HTTP requests on "+method+" /any/foo", func() {
-				req, _ := http.NewRequest(method, "/any/foo", nil)
-				rr := httptest.NewRecorder()
-				r.Router().ServeHTTP(rr, req)
-				Expect(rr.Code).To(Equal(http.StatusNotFound))
-			})
-		}
-
-	})
-
-	Context("with a GoFormation AWS::Serverless::Function that has no 'Api' event sources", func() {
-
-		r := router.NewServerlessRouter(false)
-
-		function := &cloudformation.AWSServerlessFunction{
-			Runtime: "nodejs6.10",
-		}
-
-		err := r.AddFunction(function, func(w http.ResponseWriter, e *router.Event) {
-			w.WriteHeader(200)
-			w.Write([]byte("ok"))
-		})
-
-		It("should throw a ErrNoEventsFound error", func() {
-			Expect(err).To(MatchError(router.ErrNoEventsFound))
-		})
-
-	})
-
-})
diff --git a/router/integration.go b/router/integration.go
deleted file mode 100644
index 2f6785be6e..0000000000
--- a/router/integration.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package router
-
-import (
-	"regexp"
-	"fmt"
-)
-
-type ApiGatewayIntegration struct {
-	Uri string `json:"uri"`
-	PassthroughBehavior string `json:"passthroughBehavior"`
-	Type string `json:"type"`
-}
-
-func (i *ApiGatewayIntegration) GetFunctionArn() (*LambdaFunctionArn, error) {
-	// arn:aws:apigateway:us-west-2:lambda:path//2015-03-31/functions/arn:aws:lambda:us-west-2:123456789012:function:Calc/invocations
-	firstMatch, err := getFirstMatch(`.*/functions/(.*)/invocations`, i.Uri)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return &LambdaFunctionArn{ Arn: firstMatch }, nil
-}
-
-type LambdaFunctionArn struct {
-	Arn string
-}
-
-func (a *LambdaFunctionArn) GetFunctionName() (string, error) {
-	firstMatch, err := getFirstMatch(`.*:function:(.*)/invocations`, a.Arn)
-
-	if err != nil {
-		return "", err
-	}
-
-	return firstMatch, nil
-}
-
-func getFirstMatch(regex string, value string) (string, error) {
-	re := regexp.MustCompile(regex)
-	match := re.FindStringSubmatch(value)
-
-	if len(match) < 2 {
-		return "", fmt.Errorf("Could not find match in %s", value)
-	}
-
-	return match[1], nil
-}
\ No newline at end of file
diff --git a/router/mount.go b/router/mount.go
deleted file mode 100644
index 7878ed1e05..0000000000
--- a/router/mount.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package router
-
-import (
-	"encoding/base64"
-	"io/ioutil"
-	"mime"
-	"net/http"
-	"strings"
-	"unicode/utf8"
-	"log"
-	"fmt"
-)
-
-const MuxPathRegex = ".+"
-var HttpMethods = []string{"OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "PATCH"}
-
-// EventHandlerFunc is similar to Go http.Handler but it receives an event from API Gateway
-// instead of http.Request
-type EventHandlerFunc func(http.ResponseWriter, *Event)
-
-// ServerlessRouterMount represents a single mount point on the API
-// Such as '/path', the HTTP method, and the function to resolve it
-type ServerlessRouterMount struct {
-	Name             string
-	Function         *AWSServerlessFunction
-	Handler          EventHandlerFunc
-	Path             string
-	Method           string
-	BinaryMediaTypes []string
-
-	// authorization settings
-	AuthType       string
-	AuthFunction   *AWSServerlessFunction
-	IntegrationArn *LambdaFunctionArn
-}
-
-// Returns the wrapped handler to encode the body as base64 when binary
-// media types contains Content-Type
-func (m *ServerlessRouterMount) WrappedHandler() http.HandlerFunc {
-	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		contentType := req.Header.Get("Content-Type")
-		mediaType, _, err := mime.ParseMediaType(contentType)
-		binaryContent := false
-
-		if err == nil {
-			for _, value := range m.BinaryMediaTypes {
-				if value != "" && value == mediaType {
-					binaryContent = true
-					break
-				}
-			}
-		}
-
-		if binaryContent {
-			if body, err := ioutil.ReadAll(req.Body); err == nil && !utf8.Valid(body) {
-				req.Body = ioutil.NopCloser(strings.NewReader(base64.StdEncoding.EncodeToString(body)))
-			} else {
-				req.Body = ioutil.NopCloser(strings.NewReader(string(body)))
-			}
-		}
-
-		event, err := NewEvent(req, binaryContent)
-		if err != nil {
-			msg := fmt.Sprintf("Error creating a new event: %s", err)
-			log.Println(msg)
-			w.WriteHeader(http.StatusInternalServerError)
-			w.Write([]byte(`{ "message": "Internal server error" }`))
-		} else {
-			m.Handler(w, event)
-		}
-	})
-}
-
-// Methods gets an array of HTTP methods from a AWS::Serverless::Function
-// API event source method declaration (which could include 'any')
-func (m *ServerlessRouterMount) Methods() []string {
-	switch strings.ToUpper(m.Method) {
-	case "ANY":
-		return HttpMethods
-	default:
-		return []string{strings.ToUpper(m.Method)}
-	}
-}
-
-// Returns the mount path adjusted for mux syntax. For example, if the
-// SAM template specifies /{proxy+} we replace that with /{proxy:.*}
-func (m *ServerlessRouterMount) GetMuxPath() string {
-	outputPath := m.Path
-
-	if strings.Contains(outputPath, "+") {
-		outputPath = strings.Replace(outputPath, "+", ":" + MuxPathRegex, -1)
-	}
-
-	return outputPath
-}
\ No newline at end of file
diff --git a/router/mount_test.go b/router/mount_test.go
deleted file mode 100644
index bd6f6d3550..0000000000
--- a/router/mount_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package router_test
-
-import (
-	. "github.com/awslabs/aws-sam-local/router"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("ServerlessRouterMount", func() {
-
-	Context("with a method in uppercase", func() {
-
-		m := ServerlessRouterMount{
-			Path:   "/test",
-			Method: "GET",
-		}
-
-		methods := m.Methods()
-		It("should have the correct HTTP method", func() {
-			Expect(methods).To(HaveLen(1))
-			Expect(methods).To(ContainElement("GET"))
-		})
-
-	})
-
-	Context("with a method in lowercase", func() {
-
-		m := ServerlessRouterMount{
-			Path:   "/test",
-			Method: "get",
-		}
-
-		methods := m.Methods()
-		It("should have the correct HTTP method", func() {
-			Expect(methods).To(HaveLen(1))
-			Expect(methods).To(ContainElement("GET"))
-		})
-
-	})
-
-	Context("with method 'any'", func() {
-
-		m := ServerlessRouterMount{
-			Path:   "/test",
-			Method: "any",
-		}
-
-		methods := m.Methods()
-		It("should have the correct HTTP method", func() {
-			Expect(methods).To(HaveLen(7))
-			Expect(methods).To(ContainElement("OPTIONS"))
-			Expect(methods).To(ContainElement("GET"))
-			Expect(methods).To(ContainElement("HEAD"))
-			Expect(methods).To(ContainElement("POST"))
-			Expect(methods).To(ContainElement("PUT"))
-			Expect(methods).To(ContainElement("DELETE"))
-			Expect(methods).To(ContainElement("PATCH"))
-		})
-
-	})
-
-	Context("Catch-all resource path", func() {
-		m := ServerlessRouterMount{
-			Path: "/{proxy+}",
-			Method: "any",
-		}
-
-		It("should replace + correctly", func() {
-			Expect(m.GetMuxPath()).To(Equal("/{proxy:" + MuxPathRegex + "}"))
-		})
-		It("should support all methods", func() {
-			Expect(m.Methods()).To(HaveLen(7))
-		})
-	})
-
-})
diff --git a/router/router.go b/router/router.go
deleted file mode 100644
index fa5279d18a..0000000000
--- a/router/router.go
+++ /dev/null
@@ -1,136 +0,0 @@
-package router
-
-import (
-	"errors"
-	"net/http"
-	"strings"
-
-	"github.com/awslabs/goformation/cloudformation"
-	"github.com/gorilla/mux"
-	//"github.com/docker/docker/api/types/mount"
-)
-
-// ErrNoEventsFound is thrown if a AWS::Serverless::Function is added to this
-// router, but no API event sources exist for it.
-var ErrNoEventsFound = errors.New("no events with type 'Api' were found")
-
-// ServerlessRouter takes AWS::Serverless::Function and AWS::Serverless::API objects
-// and creates a Go http.Handler with the correct paths/methods mounted
-type ServerlessRouter struct {
-	mux       *mux.Router
-	mounts    []*ServerlessRouterMount
-	usePrefix bool
-}
-
-// NewServerlessRouter creates a new instance of ServerlessRouter.
-// If usePrefix is true then route matching is done using prefix instead of exact match
-func NewServerlessRouter(usePrefix bool) *ServerlessRouter {
-	return &ServerlessRouter{
-		mux:       mux.NewRouter(),
-		mounts:    []*ServerlessRouterMount{},
-		usePrefix: usePrefix,
-	}
-}
-
-// AddFunction adds a AWS::Serverless::Function to the router and mounts all of it's
-// event sources that have type 'Api'
-func (r *ServerlessRouter) AddFunction(f *cloudformation.AWSServerlessFunction, handler EventHandlerFunc) error {
-
-	// Wrap GoFormation's AWS::Serverless::Function definition in our own, which provides
-	// convenience methods for extracting the ServerlessRouterMount(s) from it.
-	function := &AWSServerlessFunction{f, handler}
-	mounts, err := function.Mounts()
-	if err != nil {
-		return err
-	}
-
-	if len(mounts) < 1 {
-		return ErrNoEventsFound
-	}
-
-	//r.mounts = append(r.mounts, mounts...)
-	err = r.mergeMounts(mounts)
-	if err != nil {
-		return err
-	}
-
-	return nil
-
-}
-
-// AddAPI adds a AWS::Serverless::Api resource to the router, and mounts all of it's API definition
-func (r *ServerlessRouter) AddAPI(a *cloudformation.AWSServerlessApi) error {
-
-	// Wrap GoFormation's AWS::Serverless::Api definition in our own, which provides
-	// convenience methods for extracting the ServerlessRouterMount(s) from it.
-	api := &AWSServerlessApi{a}
-	mounts, err := api.Mounts()
-	if err != nil {
-		return err
-	}
-
-	//r.mounts = append(r.mounts, mounts...)
-	err = r.mergeMounts(mounts)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// merges the various mount paths. mounts could be coming from a function as well as API
-// definition. Mounts defined by an API do not have a handler, only a function ARN.
-func (r *ServerlessRouter) mergeMounts(newMounts []*ServerlessRouterMount) error {
-	for _, newMount := range newMounts {
-		newMountExists := false
-
-		for _, existingMount := range r.mounts {
-			if newMount.Path == existingMount.Path && strings.ToLower(newMount.Method) == strings.ToLower(existingMount.Method) {
-				newMountExists = true
-				// if the new mount has a valid handler I override the existing one anyway
-				if newMount.Handler != nil {
-					existingMount.Handler = newMount.Handler
-					existingMount.Function = newMount.Function
-				}
-			}
-		}
-
-		if !newMountExists {
-			if newMount.Handler == nil {
-				newMount.Handler = r.missingFunctionHandler()
-			}
-			r.mounts = append(r.mounts, newMount)
-		}
-	}
-	return nil
-}
-
-// AddStaticDir mounts a static directory provided, at the mount point also provided
-func (r *ServerlessRouter) AddStaticDir(dirname string) {
-	r.mux.NotFoundHandler = http.FileServer(http.Dir(dirname))
-}
-
-// Router returns the Go http.Handler for the router, to be passed to http.ListenAndServe()
-func (r *ServerlessRouter) Router() http.Handler {
-
-	// Mount all of the things!
-	for _, mount := range r.Mounts() {
-		r.mux.Handle(mount.GetMuxPath(), mount.WrappedHandler()).Methods(mount.Methods()...)
-	}
-
-	return r.mux
-
-}
-
-// Mounts returns a list of the mounts associated with this router
-func (r *ServerlessRouter) Mounts() []*ServerlessRouterMount {
-	return r.mounts
-}
-
-func (r *ServerlessRouter) missingFunctionHandler() func(http.ResponseWriter, *Event) {
-	return func(w http.ResponseWriter, event *Event) {
-		w.Header().Set("Content-Type", "application/json")
-		w.WriteHeader(http.StatusBadGateway)
-		w.Write([]byte(`{ "message": "No function defined for resource method" }`))
-	}
-}
diff --git a/router/router_suite_test.go b/router/router_suite_test.go
deleted file mode 100644
index 71e2054f58..0000000000
--- a/router/router_suite_test.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package router_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"testing"
-)
-
-func TestRouter(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Router Suite")
-}
diff --git a/router/router_test.go b/router/router_test.go
deleted file mode 100644
index be9667d63a..0000000000
--- a/router/router_test.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package router
-
-import (
-	"bytes"
-	"encoding/base64"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-
-	"github.com/awslabs/goformation"
-	"github.com/awslabs/goformation/cloudformation"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("ServerlessRouter", func() {
-	Context("With a swagger template that has empty mounts", func() {
-		It("Mounts the missing function handler", func() {
-			template, err := goformation.Open("../test/templates/api-missing-method.yaml")
-
-			Expect(err).To(BeNil())
-			Expect(len(template.Resources)).To(Equal(2))
-			mux := NewServerlessRouter(false)
-			templateApis := template.GetAllAWSServerlessApiResources()
-
-			Expect(len(templateApis)).To(Equal(1))
-
-			for _, api := range templateApis {
-				err := mux.AddAPI(&api)
-				Expect(err).To(BeNil())
-			}
-
-			mounts := mux.Mounts()
-
-			Expect(mounts).ToNot(BeNil())
-			Expect(len(mounts)).To(Equal(2))
-
-			req, _ := http.NewRequest("GET", "/badget", nil)
-			rr := httptest.NewRecorder()
-			mux.Router().ServeHTTP(rr, req)
-			Expect(rr.Code).To(Equal(http.StatusBadGateway))
-		})
-	})
-
-	Context("with SAM template and x-amazon-apigateway-binary-media-types defined in it", func() {
-		const input = `{
-            "Resources": {
-              "MyApi": {
-                "Type": "AWS::Serverless::Api",
-                "Properties": {
-                  "DefinitionBody": {
-                    "swagger": "2.0",
-                    "paths": {
-                      "/post": {
-                        "post": {
-                          "x-amazon-apigateway-integration": {
-                            "httpMethod": "POST",
-                            "type": "aws_proxy",
-                            "uri": {
-                              "Fn::Sub": "arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/dummy/invocations"
-                            }
-                          },
-                          "responses": {}
-                        }
-                      }
-                    },
-                    "x-amazon-apigateway-binary-media-types": ["multipart/form-data"]
-                  }
-                }
-              }
-            }
-          }`
-		template, _ := goformation.ParseJSON([]byte(input))
-
-		function := &cloudformation.AWSServerlessFunction{
-			Runtime: "nodejs6.10",
-			Events: map[string]cloudformation.AWSServerlessFunction_EventSource{
-				"PostRequest": {
-					Type: "Api",
-					Properties: &cloudformation.AWSServerlessFunction_Properties{
-						ApiEvent: &cloudformation.AWSServerlessFunction_ApiEvent{
-							Path:   "/post",
-							Method: "post",
-						},
-					},
-				},
-			},
-		}
-		templateApis := template.GetAllAWSServerlessApiResources()
-
-		It("returns the base64 encoded body on a binary request", func() {
-			mux := NewServerlessRouter(false)
-
-			for _, api := range templateApis {
-				err := mux.AddAPI(&api)
-				Expect(err).To(BeNil())
-			}
-			data := []byte{'\xe3'}
-			req, _ := http.NewRequest("POST", "/post", bytes.NewReader(data))
-			req.Header.Add("Content-Type", "multipart/form-data; boundary=something")
-
-			mux.AddFunction(function, func(w http.ResponseWriter, e *Event) {
-				Expect(string(e.Body)).To(Equal(base64.StdEncoding.EncodeToString(data)))
-			})
-
-			rec := httptest.NewRecorder()
-			mux.Router().ServeHTTP(rec, req)
-		})
-
-		It("returns the text body on a text request", func() {
-			mux := NewServerlessRouter(false)
-
-			for _, api := range templateApis {
-				err := mux.AddAPI(&api)
-				Expect(err).To(BeNil())
-			}
-			text := "foo"
-			req, _ := http.NewRequest("POST", "/post", strings.NewReader(text))
-			req.Header.Add("Content-Type", "multipart/form-data; boundary=something")
-
-			mux.AddFunction(function, func(w http.ResponseWriter, e *Event) {
-				Expect(string(e.Body)).To(Equal(text))
-			})
-
-			rec := httptest.NewRecorder()
-			mux.Router().ServeHTTP(rec, req)
-		})
-	})
-})
diff --git a/runtime.go b/runtime.go
deleted file mode 100644
index 75e74315b6..0000000000
--- a/runtime.go
+++ /dev/null
@@ -1,856 +0,0 @@
-package main
-
-import (
-	"archive/zip"
-	"bytes"
-	"io"
-	"io/ioutil"
-	"log"
-	"mime"
-	"net/http"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"strings"
-
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"path"
-
-	"os/signal"
-	"syscall"
-
-	"github.com/awslabs/aws-sam-local/router"
-	"github.com/awslabs/goformation/cloudformation"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/pkg/stdcopy"
-	"github.com/docker/docker/pkg/term"
-	"github.com/docker/go-connections/nat"
-	"github.com/fatih/color"
-	"github.com/imdario/mergo"
-	"github.com/mattn/go-colorable"
-	"github.com/pkg/errors"
-)
-
-// Invoker is a simple interface to help with testing runtimes
-type Invoker interface {
-	Invoke(string, string) (io.Reader, io.Reader, error)
-	InvokeHTTP(string) func(http.ResponseWriter, *router.Event)
-	CleanUp()
-}
-
-// Runtime contains a reference to a single container for a specific runtime. It is used to invoke functions multiple times against a single container.
-type Runtime struct {
-	LogicalID       string
-	ID              string
-	Name            string
-	Image           string
-	Cwd             string
-	DecompressedCwd string
-	Function        cloudformation.AWSServerlessFunction
-	EnvOverrideFile string
-	DebugPort       string
-	Context         context.Context
-	Client          *client.Client
-	TimeoutTimer    *time.Timer
-	Logger          io.Writer
-	DockerNetwork   string
-}
-
-var (
-	// ErrRuntimeNotDownloaded is thrown when NewRuntime() is called, but the requested
-	// runtime has not been downloaded
-	ErrRuntimeNotDownloaded = errors.New("requested runtime has not been downloaded")
-
-	// ErrRuntimeNotSupported is thrown with the requested runtime is not yet supported
-	ErrRuntimeNotSupported = errors.New("unsupported runtime")
-)
-
-var runtimeName = struct {
-	nodejs       string
-	nodejs43     string
-	nodejs610    string
-	nodejs810    string
-	python27     string
-	python36     string
-	java8        string
-	go1x         string
-	dotnetcore20 string
-}{
-	nodejs:       "nodejs",
-	nodejs43:     "nodejs4.3",
-	nodejs610:    "nodejs6.10",
-	nodejs810:    "nodejs8.10",
-	python27:     "python2.7",
-	python36:     "python3.6",
-	java8:        "java8",
-	go1x:         "go1.x",
-	dotnetcore20: "dotnetcore2.0",
-}
-
-var runtimeImageFor = map[string]string{
-	runtimeName.nodejs:       "lambci/lambda:nodejs",
-	runtimeName.nodejs43:     "lambci/lambda:nodejs4.3",
-	runtimeName.nodejs610:    "lambci/lambda:nodejs6.10",
-	runtimeName.nodejs810:    "lambci/lambda:nodejs8.10",
-	runtimeName.python27:     "lambci/lambda:python2.7",
-	runtimeName.python36:     "lambci/lambda:python3.6",
-	runtimeName.java8:        "lambci/lambda:java8",
-	runtimeName.go1x:         "lambci/lambda:go1.x",
-	runtimeName.dotnetcore20: "lambci/lambda:dotnetcore2.0",
-}
-
-// NewRuntimeOpt contains parameters that are passed to the NewRuntime method
-type NewRuntimeOpt struct {
-	Cwd             string
-	LogicalID       string
-	Function        cloudformation.AWSServerlessFunction
-	EnvOverrideFile string
-	DebugPort       string
-	Logger          io.Writer
-	SkipPullImage   bool
-	DockerNetwork   string
-}
-
-// NewRuntime instantiates a Lambda runtime container
-func NewRuntime(opt NewRuntimeOpt) (Invoker, error) {
-	// Determine which docker image to use for the provided runtime
-	image, found := runtimeImageFor[opt.Function.Runtime]
-	if !found {
-		return nil, ErrRuntimeNotSupported
-	}
-
-	cli, err := client.NewEnvClient()
-	if err != nil {
-		return nil, err
-	}
-
-	r := &Runtime{
-		LogicalID:       opt.LogicalID,
-		Name:            opt.Function.Runtime,
-		Cwd:             getWorkingDir(opt.Cwd),
-		Image:           image,
-		Function:        opt.Function,
-		EnvOverrideFile: opt.EnvOverrideFile,
-		DebugPort:       opt.DebugPort,
-		Context:         context.Background(),
-		Client:          cli,
-		Logger:          opt.Logger,
-		DockerNetwork:   opt.DockerNetwork,
-	}
-
-	// Check if we have the required Docker image for this runtime
-	filter := filters.NewArgs()
-	filter.Add("reference", r.Image)
-	images, err := cli.ImageList(r.Context, types.ImageListOptions{
-		Filters: filter,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	// By default, pull images unless we are told not to
-	pullImage := true
-
-	if opt.SkipPullImage {
-		log.Printf("Requested to skip pulling images ...\n")
-		pullImage = false
-	}
-
-	// However, if we don't have the image we will need it...
-	if len(images) == 0 {
-		log.Printf("Runtime image missing, will pull....\n")
-		pullImage = true
-	}
-
-	if pullImage {
-		log.Printf("Fetching %s image for %s runtime...\n", r.Image, opt.Function.Runtime)
-		progress, err := cli.ImagePull(r.Context, r.Image, types.ImagePullOptions{})
-		if len(images) < 0 && err != nil {
-			log.Fatalf("Could not fetch %s Docker image\n%s", r.Image, err)
-			return nil, err
-		}
-
-		if err != nil {
-			log.Printf("Could not fetch %s Docker image: %s\n", r.Image, err)
-		} else {
-
-			// Use Docker's standard progressbar to show image pull progress.
-			// However there is a bug that we are working around. We'll do the same
-			// as Docker does, and temporarily set the TERM to a non-existant
-			// terminal
-			// More info here:
-			// https://github.com/Nvveen/Gotty/pull/1
-
-			origTerm := os.Getenv("TERM")
-			os.Setenv("TERM", "eifjccgifcdekgnbtlvrgrinjjvfjggrcudfrriivjht")
-			defer os.Setenv("TERM", origTerm)
-
-			// Show the Docker pull messages in green
-			color.Output = colorable.NewColorableStderr()
-			color.Set(color.FgGreen)
-			defer color.Unset()
-
-			jsonmessage.DisplayJSONMessagesStream(progress, os.Stderr, os.Stderr.Fd(), term.IsTerminal(os.Stderr.Fd()), nil)
-		}
-	}
-
-	return r, nil
-
-}
-
-func overrideHostConfig(cfg *container.HostConfig) error {
-
-	const dotfile = ".config/aws-sam-local/container-config.json"
-	const eMsg = "unable to use container host config override file from '$HOME/%s'"
-
-	homeDir := os.Getenv("HOME")
-	if len(homeDir) == 0 {
-		return errors.Wrapf(errors.New("HOME env variable is not set"), eMsg, dotfile)
-	}
-
-	reader, err := os.Open(path.Join(homeDir, dotfile))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return errors.Wrapf(err, eMsg, dotfile)
-	}
-	defer reader.Close()
-
-	override := new(container.HostConfig)
-	if err := json.NewDecoder(reader).Decode(override); err != nil {
-		return errors.Wrapf(err, eMsg, dotfile)
-	}
-
-	return errors.Wrapf(mergo.MergeWithOverwrite(cfg, override), eMsg, dotfile)
-}
-
-func (r *Runtime) getHostConfig() (*container.HostConfig, error) {
-
-	// Check if there is a decompressed archive directory we should
-	// be using instead of the normal working directory (e.g. if a
-	// ZIP/JAR archive was specified as the CodeUri)
-	mount := r.Cwd
-	if r.DecompressedCwd != "" {
-		mount = r.DecompressedCwd
-	}
-
-	// If the path is a Windows style one, convert it to the format that Docker Toolbox requires.
-	mount = convertWindowsPath(mount)
-
-	log.Printf("Mounting %s as /var/task:ro inside runtime container\n", mount)
-	host := &container.HostConfig{
-		Resources: container.Resources{
-			Memory: int64(r.Function.MemorySize * 1024 * 1024),
-		},
-		Binds: []string{
-			fmt.Sprintf("%s:/var/task:ro", mount),
-		},
-		PortBindings: r.getDebugPortBindings(),
-	}
-
-	if err := overrideHostConfig(host); err != nil {
-		log.Print(err)
-	}
-
-	return host, nil
-}
-
-// Invoke runs a Lambda function within the runtime with the provided event
-// payload and returns a pair of io.Readers for it's stdout (callback results)
-// and stderr (runtime logs).
-func (r *Runtime) Invoke(event string, profile string) (io.Reader, io.Reader, error) {
-
-	log.Printf("Invoking %s (%s)\n", r.Function.Handler, r.Name)
-
-	// If the CodeUri has been specified as a .jar or .zip file, unzip it on the fly
-	if r.Function.CodeUri != nil && r.Function.CodeUri.String != nil {
-		codeuri := filepath.Join(r.Cwd, *r.Function.CodeUri.String)
-
-		// Check if the CodeUri exists on the local filesystem
-		if _, err := os.Stat(codeuri); err == nil {
-			// It does exist - maybe it's a ZIP/JAR that we need to decompress on the fly
-			if strings.HasSuffix(codeuri, ".jar") || strings.HasSuffix(codeuri, ".zip") {
-				log.Printf("Decompressing %s\n", codeuri)
-				decompressedDir, err := decompressArchive(codeuri)
-				if err != nil {
-					log.Printf("ERROR: Failed to decompress archive: %s\n", err)
-					return nil, nil, fmt.Errorf("failed to decompress archive: %s", err)
-				}
-				r.DecompressedCwd = decompressedDir
-			} else {
-				// We have a CodeUri that exists locally, but isn't a ZIP/JAR.
-				// Just append it to the working directory
-				r.Cwd = codeuri
-			}
-		} else {
-			// The CodeUri specified doesn't exist locally. It could be
-			// an S3 location (s3://.....), so just ignore it.
-		}
-	}
-
-	// If the timeout hasn't been set for the function in the SAM template
-	// then default to 3 seconds (as per SAM specification).
-	// This needs to be done before environment variables are generated for
-	// the Lambda runtime so that the correct AWS_LAMBDA_FUNCTION_TIMEOUT is used
-	if r.Function.Timeout <= 0 {
-		r.Function.Timeout = 3
-	}
-
-	// If the memory size hasn't been set for the function in the SAM template
-	// then default to 128MB (as per SAM specification).
-	// This needs to be done before environment variables are generated for
-	// the Lambda runtime so that the correct AWS_LAMBDA_FUNCTION_MEMORY_SIZE is used
-	if r.Function.MemorySize <= 0 {
-		r.Function.MemorySize = 128
-	}
-
-	// Define the container options
-	config := &container.Config{
-		WorkingDir:   "/var/task",
-		Image:        r.Image,
-		Tty:          false,
-		ExposedPorts: r.getDebugExposedPorts(),
-		Entrypoint:   r.getDebugEntrypoint(),
-		Cmd:          []string{r.Function.Handler, event},
-		Env: func() []string {
-			result := []string{}
-			for k, v := range getEnvironmentVariables(r.LogicalID, &r.Function, r.EnvOverrideFile, profile) {
-				result = append(result, k+"="+v)
-			}
-			return result
-		}(),
-	}
-
-	host, err := r.getHostConfig()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	resp, err := r.Client.ContainerCreate(r.Context, config, host, nil, "")
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r.ID = resp.ID
-
-	if r.DockerNetwork != "" {
-		if err := r.Client.NetworkConnect(r.Context, r.DockerNetwork, resp.ID, nil); err != nil {
-			return nil, nil, err
-		}
-		log.Printf("Connecting container %s to network %s", resp.ID, r.DockerNetwork)
-	}
-
-	// Invoke the container
-	if err := r.Client.ContainerStart(r.Context, resp.ID, types.ContainerStartOptions{}); err != nil {
-		return nil, nil, err
-	}
-
-	// Attach to the container to read the stdout/stderr stream
-	attach, err := r.Client.ContainerAttach(r.Context, resp.ID, types.ContainerAttachOptions{
-		Stream: true,
-		Stdin:  false,
-		Stdout: true,
-		Stderr: true,
-		Logs:   true,
-	})
-
-	// As per the Docker SDK documentation, when attaching to a container
-	// the resulting io.Reader stream is has stdin, stdout and stderr muxed
-	// into a single stream, with a 8 byte header defining the type/size.
-	// Demux the stream into separate io.Readers for stdout and stderr
-	// src: https://docs.docker.com/engine/api/v1.28/#operation/ContainerAttach
-	stdout, stderr, err := demuxDockerStream(attach.Reader)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if len(r.DebugPort) == 0 {
-		r.setupTimeoutTimer(stdout, stderr)
-	} else {
-		r.setupInterruptHandler(stdout, stderr)
-	}
-
-	return stdout, stderr, nil
-
-}
-
-func (r *Runtime) setupTimeoutTimer(stdout, stderr io.ReadCloser) {
-
-	// Start a timer, we'll use this to abort the function if it runs beyond the specified timeout
-	timeout := time.Duration(r.Function.Timeout) * time.Second
-
-	r.TimeoutTimer = time.NewTimer(timeout)
-	go func() {
-		<-r.TimeoutTimer.C
-		log.Printf("Function %s timed out after %d seconds", r.Function.Handler, timeout/time.Second)
-		stderr.Close()
-		stdout.Close()
-		r.CleanUp()
-	}()
-}
-
-func (r *Runtime) setupInterruptHandler(stdout, stderr io.ReadCloser) {
-	iChan := make(chan os.Signal, 2)
-	signal.Notify(iChan, os.Interrupt, syscall.SIGTERM)
-	go func() {
-		<-iChan
-		log.Printf("Execution of function %q was interrupted", r.Function.Handler)
-		stderr.Close()
-		stdout.Close()
-		r.CleanUp()
-		os.Exit(0)
-	}()
-}
-
-func (r *Runtime) getDebugPortBindings() nat.PortMap {
-	if len(r.DebugPort) == 0 {
-		return nil
-	}
-	return nat.PortMap{
-		nat.Port(r.DebugPort): []nat.PortBinding{{HostPort: r.DebugPort}},
-	}
-}
-
-func (r *Runtime) getDebugExposedPorts() nat.PortSet {
-	if len(r.DebugPort) == 0 {
-		return nil
-	}
-	return nat.PortSet{nat.Port(r.DebugPort): {}}
-}
-
-func (r *Runtime) getDebugEntrypoint() (overrides []string) {
-	if len(r.DebugPort) == 0 {
-		return
-	}
-
-	debuggerArgs := os.Getenv("DEBUGGER_ARGS")
-	debuggerArgsArray := []string{}
-	if len(debuggerArgs) > 0 {
-		debuggerArgsArray = strings.Split(debuggerArgs, " ")
-	}
-
-	switch r.Name {
-	// configs from: https://github.com/lambci/docker-lambda
-	// to which we add the extra debug mode options
-	case runtimeName.java8:
-		overrides = []string{
-			"/usr/bin/java",
-		}
-		overrides = append(overrides, debuggerArgsArray...)
-		overrides = append(overrides,
-			"-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address="+r.DebugPort,
-			"-XX:MaxHeapSize=1336935k",
-			"-XX:MaxMetaspaceSize=157286k",
-			"-XX:ReservedCodeCacheSize=78643k",
-			"-XX:+UseSerialGC",
-			//"-Xshare:on", doesn't work in conjunction with the debug options
-			"-XX:-TieredCompilation",
-			"-Djava.net.preferIPv4Stack=true",
-			"-jar",
-			"/var/runtime/lib/LambdaJavaRTEntry-1.0.jar",
-		)
-	case runtimeName.nodejs:
-		overrides = []string{
-			"/usr/bin/node",
-		}
-		overrides = append(overrides, debuggerArgsArray...)
-		overrides = append(overrides,
-			"--debug-brk="+r.DebugPort,
-			"--nolazy",
-			"--max-old-space-size=1229",
-			"--max-new-space-size=153",
-			"--max-executable-size=153",
-			"--expose-gc",
-			"/var/runtime/node_modules/awslambda/bin/awslambda",
-		)
-	case runtimeName.nodejs43:
-		overrides = []string{
-			"/usr/local/lib64/node-v4.3.x/bin/node",
-		}
-		overrides = append(overrides, debuggerArgsArray...)
-		overrides = append(overrides,
-			"--debug-brk="+r.DebugPort,
-			"--nolazy",
-			"--max-old-space-size=2547",
-			"--max-semi-space-size=150",
-			"--max-executable-size=160",
-			"--expose-gc",
-			"/var/runtime/node_modules/awslambda/index.js",
-		)
-	case runtimeName.nodejs610:
-		overrides = []string{
-			"/var/lang/bin/node",
-		}
-		overrides = append(overrides, debuggerArgsArray...)
-		overrides = append(overrides,
-			"--debug-brk="+r.DebugPort,
-			"--nolazy",
-			"--max-old-space-size=2547",
-			"--max-semi-space-size=150",
-			"--max-executable-size=160",
-			"--expose-gc",
-			"/var/runtime/node_modules/awslambda/index.js",
-		)
-	case runtimeName.nodejs810:
-		overrides = []string{
-			"/var/lang/bin/node",
-		}
-		overrides = append(overrides, debuggerArgsArray...)
-		overrides = append(overrides,
-			// Node8 requires the host to be explicitly set in order to bind to localhost instead of 127.0.0.1
-			// https://github.com/nodejs/node/issues/11591#issuecomment-283110138
-			"--inspect-brk=0.0.0.0:"+r.DebugPort,
-			"--nolazy",
-			"--expose-gc",
-			"--max-semi-space-size=150",
-			"--max-old-space-size=2707",
-			"/var/runtime/node_modules/awslambda/index.js",
-		)
-	case runtimeName.python27:
-		overrides = []string{
-			"/usr/bin/python2.7",
-		}
-		overrides = append(overrides, debuggerArgsArray...)
-		overrides = append(overrides, "/var/runtime/awslambda/bootstrap.py")
-	case runtimeName.python36:
-		overrides = []string{
-			"/var/lang/bin/python3.6",
-		}
-		overrides = append(overrides, debuggerArgsArray...)
-		overrides = append(overrides, "/var/runtime/awslambda/bootstrap.py")
-	}
-	return
-}
-
-// CleanUp removes the Docker container used by this runtime
-func (r *Runtime) CleanUp() {
-
-	// Stop the Lambda timeout timer
-	if r.TimeoutTimer != nil {
-		r.TimeoutTimer.Stop()
-	}
-
-	// Remove the container
-	r.Client.ContainerKill(r.Context, r.ID, "SIGKILL")
-	r.Client.ContainerRemove(r.Context, r.ID, types.ContainerRemoveOptions{})
-
-	// Remove any decompressed archive if there was one (e.g. ZIP/JAR)
-	if r.DecompressedCwd != "" {
-		os.RemoveAll(r.DecompressedCwd)
-	}
-
-}
-
-// InvokeHTTP invokes a Lambda function.
-func (r *Runtime) InvokeHTTP(profile string) func(http.ResponseWriter, *router.Event) {
-
-	return func(w http.ResponseWriter, event *router.Event) {
-		var wg sync.WaitGroup
-		w.Header().Set("Content-Type", "application/json")
-		acceptHeader, ok := event.Headers["Accept"]
-		if !ok {
-			acceptHeader = ""
-		}
-
-		eventJSON, err := event.JSON()
-		if err != nil {
-			msg := fmt.Sprintf("Error invoking %s runtime: %s", r.Function.Runtime, err)
-			log.Println(msg)
-			w.WriteHeader(http.StatusInternalServerError)
-			w.Write([]byte(`{ "message": "Internal server error" }`))
-			return
-		}
-
-		stdoutTxt, stderrTxt, err := r.Invoke(eventJSON, profile)
-		if err != nil {
-			msg := fmt.Sprintf("Error invoking %s runtime: %s", r.Function.Runtime, err)
-			log.Println(msg)
-			w.WriteHeader(http.StatusInternalServerError)
-			w.Write([]byte(`{ "message": "Internal server error" }`))
-			return
-		}
-
-		wg.Add(1)
-		var output []byte
-		go func() {
-			output = parseOutput(w, stdoutTxt, r.Function.Runtime, &wg, acceptHeader)
-		}()
-
-		wg.Add(1)
-		go func() {
-			// Finally, copy the container stdout and stderr (runtime logs) to the console stderr
-			r.Logger.Write(output)
-			io.Copy(r.Logger, stderrTxt)
-			wg.Done()
-		}()
-
-		wg.Wait()
-
-		r.CleanUp()
-	}
-
-}
-
-// parseOutput decodes the proxy response from the output of the function and returns
-// the rest
-func parseOutput(w http.ResponseWriter, stdoutTxt io.Reader, runtime string, wg *sync.WaitGroup, acceptHeader string) (output []byte) {
-	defer wg.Done()
-
-	result, err := ioutil.ReadAll(stdoutTxt)
-	if err != nil {
-		msg := fmt.Sprintf("Error invoking %s runtime: %s", runtime, err)
-		log.Println(msg)
-		w.WriteHeader(http.StatusInternalServerError)
-		w.Write([]byte(`{ "message": "Internal server error" }`))
-		return
-	}
-
-	// At this point, we need to see whether the response is in the format
-	// of a Lambda proxy response (inc statusCode / body), and if so, handle it
-	// otherwise just copy the whole output back to the http.ResponseWriter
-	proxy := &struct {
-		StatusCode      json.Number       `json:"statusCode"`
-		Headers         map[string]string `json:"headers"`
-		Body            json.Number       `json:"body"`
-		IsBase64Encoded bool              `json:"isBase64Encoded"`
-	}{}
-
-	// We only want the last line of stdout, because it's possible that
-	// the function may have written directly to stdout using
-	// System.out.println or similar, before docker-lambda output the result
-	lastNewlineIx := bytes.LastIndexByte(bytes.TrimRight(result, "\n"), '\n')
-	if lastNewlineIx > 0 {
-		output = result[:lastNewlineIx]
-		result = result[lastNewlineIx:]
-	}
-
-	if err := json.Unmarshal(result, proxy); err != nil || (proxy.StatusCode == "" && len(proxy.Headers) == 0 && proxy.Body == "") {
-		// This is not a proxy integration function, as the response doesn't container headers, statusCode or body.
-		// Return HTTP 502 (Bad Gateway) to match API Gateway behaviour: http://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-set-up-simple-proxy.html#api-gateway-simple-proxy-for-lambda-output-format
-		log.Printf(color.RedString("Function returned an invalid response (must include one of: body, headers or statusCode in the response object): %s\n"), err)
-		w.WriteHeader(http.StatusBadGateway)
-		w.Write([]byte(`{ "message": "Internal server error" }`))
-		return
-	}
-
-	// Set any HTTP headers requested by the proxy function
-	if len(proxy.Headers) > 0 {
-		for key, value := range proxy.Headers {
-			w.Header().Add(key, value)
-		}
-	}
-
-	// This is a proxy function, so set the http status code and return the body
-	if statusCode, err := proxy.StatusCode.Int64(); err != nil {
-		w.WriteHeader(http.StatusBadGateway)
-	} else {
-		w.WriteHeader(int(statusCode))
-	}
-
-	acceptMediaTypeMatched := false
-	if acceptHeader != "" {
-		//API Gateway only honors the first Accept media type.
-		acceptMediaType := strings.Split(acceptHeader, ",")[0]
-		contentType := proxy.Headers["Content-Type"]
-		contentMediaType, _, err := mime.ParseMediaType(contentType)
-		acceptMediaTypeMatched = err == nil && acceptMediaType == contentMediaType
-	}
-
-	if proxy.IsBase64Encoded && acceptMediaTypeMatched {
-		if decodedBytes, err := base64.StdEncoding.DecodeString(string(proxy.Body)); err != nil {
-			log.Printf(color.RedString("Function returned an invalid base64 body: %s\n"), err)
-			w.WriteHeader(http.StatusInternalServerError)
-			w.Write([]byte(`{ "message": "Internal server error" }`))
-		} else {
-			w.Write(decodedBytes)
-		}
-	} else {
-		w.Write([]byte(proxy.Body))
-	}
-
-	return
-}
-
-// demuxDockerStream takes a Docker attach stream, and parses out stdout/stderr
-// into separate streams, based on the Docker engine documentation here:
-// https://docs.docker.com/engine/api/v1.28/#operation/ContainerAttach
-// Due to the use of io.Pipe, you should take care to read from the streams
-// in a separate Go routine to avoid deadlocks.
-func demuxDockerStream(input io.Reader) (io.ReadCloser, io.ReadCloser, error) {
-
-	stdoutreader, stdoutwriter := io.Pipe()
-	stderrreader, stderrwriter := io.Pipe()
-
-	// Return early and continue to copy i/o in another go routine
-	go func() {
-
-		_, err := stdcopy.StdCopy(stdoutwriter, stderrwriter, input)
-		if err != nil {
-			log.Printf("Error reading I/O from runtime container: %s\n", err)
-		}
-
-		stdoutwriter.Write([]byte("\n"))
-
-		stdoutwriter.Close()
-		stderrwriter.Close()
-
-	}()
-
-	return stdoutreader, stderrreader, nil
-
-}
-
-func getDockerVersion() (string, error) {
-
-	cli, err := client.NewEnvClient()
-	if err != nil {
-		return "", err
-	}
-
-	response, err := cli.Ping(context.Background())
-	return response.APIVersion, err
-
-}
-
-func getWorkingDir(dir string) string {
-
-	// If the template filepath isn't set, just use the cwd
-	if dir == "" || dir == "." {
-		cwd, err := os.Getwd()
-		if err != nil {
-			// A directory wasn't specified on the command line
-			// and we can't determin the current working directory.
-			log.Printf("Could not find working directory for template: %s\n", err)
-			return ""
-		}
-		dir = cwd
-	}
-
-	// Docker volumes require an absolute path.
-	// If the path exists, use the absolute version.
-	if _, err := os.Stat(dir); err == nil {
-		absolute, err := filepath.Abs(dir)
-		if err == nil {
-			dir = absolute
-		}
-	}
-
-	// Windows uses \ as the path delimiter, but Docker requires / as the path delimiter.
-	// Hence the use of filepath.ToSlash for return values.
-	return filepath.ToSlash(dir)
-
-}
-
-// decompressArchive unzips a ZIP archive to a temporary directory and returns
-// the temporary directory name, or an error
-func decompressArchive(src string) (string, error) {
-
-	// Create a temporary directory just for this decompression (dirname: OS tmp directory + unix timestamp))
-	tmpdir := os.TempDir()
-
-	// By default on macOS, os.TempDir() returns a directory in /var/folders/.
-	// This sits outside the default Docker Shared Files directories, however
-	// /var/folders is just a symlink to /private/var/folders/, so use that instead
-	if strings.HasPrefix(tmpdir, "/var/folders") {
-		tmpdir = "/private" + tmpdir
-	}
-
-	dest := filepath.Join(tmpdir, "aws-sam-local-"+strconv.FormatInt(time.Now().UnixNano(), 10))
-
-	var filenames []string
-
-	r, err := zip.OpenReader(src)
-	if err != nil {
-		return dest, err
-	}
-	defer r.Close()
-
-	for _, f := range r.File {
-
-		err := func() error {
-			rc, err := f.Open()
-			if err != nil {
-				return err
-			}
-			defer rc.Close()
-
-			// Store filename/path for returning and using later on
-			fpath := filepath.Join(dest, f.Name)
-			filenames = append(filenames, fpath)
-
-			if f.FileInfo().IsDir() {
-
-				// Make Folder
-				os.MkdirAll(fpath, os.ModePerm)
-
-			} else {
-
-				// Make File
-				var fdir string
-				if lastIndex := strings.LastIndex(fpath, string(os.PathSeparator)); lastIndex > -1 {
-					fdir = fpath[:lastIndex]
-				}
-
-				err = os.MkdirAll(fdir, os.ModePerm)
-				if err != nil {
-					return err
-				}
-				f, err := os.OpenFile(
-					fpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
-				if err != nil {
-					return err
-				}
-				defer f.Close()
-
-				_, err = io.Copy(f, rc)
-				if err != nil {
-					return err
-				}
-			}
-
-			return nil
-		}()
-
-		if err != nil {
-			log.Fatal(err)
-			return dest, err
-		}
-	}
-
-	return dest, nil
-
-}
-
-func convertWindowsPath(input string) string {
-
-	rg := regexp.MustCompile(`^([A-Za-z]+):`)
-	drive := rg.FindAllStringSubmatch(input, 1)
-	if drive != nil {
-
-		// The path starts with a drive letter.
-		// Docker toolbox mounts C:\ as /c/ so we need to extract, convert to lowercase
-		// and replace into the correct format
-		letter := drive[0][1]
-
-		input = rg.ReplaceAllString(input, "/"+strings.ToLower(letter))
-
-	}
-
-	// Convert all OS seperators to '/'
-	input = filepath.ToSlash(input)
-	return input
-
-}
diff --git a/runtime_test.go b/runtime_test.go
deleted file mode 100644
index 29f378b1af..0000000000
--- a/runtime_test.go
+++ /dev/null
@@ -1,204 +0,0 @@
-package main
-
-import (
-	"encoding/base64"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"strings"
-	"sync"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("sam", func() {
-
-	Describe("runtime", func() {
-
-		Context("mount directory", func() {
-			Context("with a windows style path", func() {
-				input := `C:/Users/username/path`
-				It("should replace it with the docker-toolbox format", func() {
-					result := convertWindowsPath(input)
-					Expect(result).To(Equal("/c/Users/username/path"))
-				})
-			})
-		})
-
-		Context("working directory", func() {
-
-			cwd, err := os.Getwd()
-			It("should determin the current working directory", func() {
-				Expect(cwd).ToNot(BeNil())
-				Expect(err).To(BeNil())
-			})
-
-			inputs := [][]string{
-				// input path, output path
-				[]string{"", cwd},
-				[]string{".", cwd},
-				[]string{"/test/directory", "/test/directory"},
-				[]string{"test/non-existant-directory", "test/non-existant-directory"},
-				[]string{"test", cwd + "/test"},
-			}
-
-			// func getWorkingDir(basedir string, codeuri string, checkWorkingDirExist bool) (string, error) {
-			for _, input := range inputs {
-
-				in := input[0]
-				expected := input[1]
-
-				context := fmt.Sprintf("with input %s", in)
-				Context(context, func() {
-					It("should have the correct directory", func() {
-						dir := getWorkingDir(in)
-						Expect(dir).To(Equal(expected))
-					})
-				})
-
-			}
-
-		})
-
-		Context("parse output", func() {
-			var wg sync.WaitGroup
-			var out []byte
-			var r *fakeResponse
-
-			inputs := []struct {
-				name         string
-				output       io.Reader
-				body         []byte
-				status       int
-				headers      http.Header
-				trailing     string
-				acceptHeader string
-			}{
-				{
-					name:    "only proxy response",
-					output:  strings.NewReader(`{"statusCode":202,"headers":{"foo":"bar"},"body":"{\"nextToken\":null,\"beers\":[]}","isBase64Encoded":false}`),
-					body:    []byte(`{"nextToken":null,"beers":[]}`),
-					status:  202,
-					headers: http.Header(map[string][]string{"foo": []string{"bar"}}),
-				},
-				{
-					name: "proxy response with extra output",
-					output: strings.NewReader(`Foo
-					Bar
-					{"statusCode":200,"headers":null,"body":"{\"nextToken\":null,\"beers\":[]}","isBase64Encoded":false}`),
-					body:    []byte(`{"nextToken":null,"beers":[]}`),
-					status:  200,
-					headers: make(http.Header),
-					trailing: `Foo
-					Bar`,
-				},
-				{
-					name:    "no output",
-					output:  strings.NewReader(``),
-					body:    []byte(`{ "message": "Internal server error" }`),
-					status:  502,
-					headers: make(http.Header),
-				},
-				{
-					name:    "bad status code",
-					output:  strings.NewReader(`{"statusCode":"xxx","headers":null,"body":"{\"nextToken\":null,\"beers\":[]}","isBase64Encoded":false}`),
-					body:    []byte(`{"nextToken":null,"beers":[]}`),
-					status:  502,
-					headers: make(http.Header),
-				},
-				{
-					name:    "io error",
-					output:  &errReader{},
-					body:    []byte(`{ "message": "Internal server error" }`),
-					status:  500,
-					headers: make(http.Header),
-				},
-				{
-					name:         "base64 encoded response and Accept and Content-Type media types are matched",
-					output:       strings.NewReader(fmt.Sprintf(`{"statusCode":200,"headers":{"Content-Type": "multipart/form-data; boundary=something"},"body": "%v","isBase64Encoded":true}`, base64.StdEncoding.EncodeToString([]byte("abc")))),
-					body:         []byte("abc"),
-					status:       200,
-					headers:      http.Header(map[string][]string{"Content-Type": []string{"multipart/form-data; boundary=something"}}),
-					acceptHeader: "multipart/form-data, application/foo",
-				},
-				{
-					name:         "invalid base64 encoded response and Accept and Content-Type media types are matched",
-					output:       strings.NewReader(fmt.Sprintf(`{"statusCode":200,"headers":{"Content-Type":"multipart/form-data; boundary=something"},"body": "a","isBase64Encoded":true}`)),
-					body:         []byte(`{ "message": "Internal server error" }`),
-					status:       500,
-					headers:      http.Header(map[string][]string{"Content-Type": []string{"multipart/form-data; boundary=something"}}),
-					acceptHeader: "multipart/form-data, application/foo",
-				},
-				{
-					name:         "base64 encoded response but Accept and Content-Type media types are not matched",
-					output:       strings.NewReader(fmt.Sprintf(`{"statusCode":200,"headers":{"Content-Type": "multipart/form-data; boundary=something"},"body": "%v","isBase64Encoded":true}`, base64.StdEncoding.EncodeToString([]byte("abc")))),
-					body:         []byte(base64.StdEncoding.EncodeToString([]byte("abc"))),
-					status:       200,
-					headers:      http.Header(map[string][]string{"Content-Type": []string{"multipart/form-data; boundary=something"}}),
-					acceptHeader: "application/foo",
-				},
-				{
-					name:         "base64 encoded response and empty Accept and Content-Type headers",
-					output:       strings.NewReader(fmt.Sprintf(`{"statusCode":200,"headers":{"Content-Type": ""},"body": "%v","isBase64Encoded":true}`, base64.StdEncoding.EncodeToString([]byte("abc")))),
-					body:         []byte(base64.StdEncoding.EncodeToString([]byte("abc"))),
-					status:       200,
-					headers:      http.Header(map[string][]string{"Content-Type": []string{""}}),
-					acceptHeader: "",
-				},
-			}
-
-			for _, input := range inputs {
-
-				Context(input.name, func() {
-					wg.Add(1)
-					r = newResponse()
-					out = parseOutput(r, input.output, "foo", &wg, input.acceptHeader)
-
-					It("should have the expected output", func() {
-						Expect(r.status).To(Equal(input.status))
-						Expect(r.body).To(Equal(input.body))
-						Expect(r.headers).To(Equal(input.headers))
-						Expect(string(out)).To(Equal(input.trailing))
-					})
-
-				})
-
-			}
-
-		})
-
-	})
-})
-
-type errReader struct{}
-
-func (r *errReader) Read(p []byte) (int, error) {
-	return 0, io.ErrUnexpectedEOF
-}
-
-type fakeResponse struct {
-	headers http.Header
-	body    []byte
-	status  int
-}
-
-func newResponse() *fakeResponse {
-	return &fakeResponse{
-		headers: make(http.Header),
-	}
-}
-
-func (r *fakeResponse) Header() http.Header {
-	return r.headers
-}
-
-func (r *fakeResponse) Write(body []byte) (int, error) {
-	r.body = body
-	return len(body), nil
-}
-
-func (r *fakeResponse) WriteHeader(status int) {
-	r.status = status
-}
diff --git a/sam-banner.png b/sam-banner.png
deleted file mode 100644
index 8e9255ce01..0000000000
Binary files a/sam-banner.png and /dev/null differ
diff --git a/samcli/__init__.py b/samcli/__init__.py
new file mode 100644
index 0000000000..51197b937b
--- /dev/null
+++ b/samcli/__init__.py
@@ -0,0 +1,5 @@
+"""
+SAM CLI version
+"""
+
+__version__ = '0.3.0'
diff --git a/samcli/cli/__init__.py b/samcli/cli/__init__.py
new file mode 100644
index 0000000000..060dc25d17
--- /dev/null
+++ b/samcli/cli/__init__.py
@@ -0,0 +1,3 @@
+"""
+CLI Framework
+"""
diff --git a/samcli/cli/command.py b/samcli/cli/command.py
new file mode 100644
index 0000000000..b627872948
--- /dev/null
+++ b/samcli/cli/command.py
@@ -0,0 +1,109 @@
+"""
+Base classes that implement the CLI framework
+"""
+
+import logging
+import importlib
+import click
+
+logger = logging.getLogger(__name__)
+
+# Commands that are bundled with the CLI by default
+_SAM_CLI_COMMAND_PACKAGES = {
+    "samcli.commands.local.local",
+    "samcli.commands.validate.validate",
+    "samcli.commands.init",
+    "samcli.commands.deploy",
+    "samcli.commands.package",
+}
+
+
+class BaseCommand(click.MultiCommand):
+    """
+    Dynamically loads commands. It takes a list of names of Python packages representing the commands, loads
+    these packages, and initializes them as Click commands. If a command "hello" is available in a Python package
+    "foo.bar.hello", then this package name is passed to this class to load the command. This allows commands
+    to be written as standalone packages that are dynamically initialized by the CLI.
+
+    Each command, along with any subcommands, is implemented using Click annotations. When the command is loaded
+    dynamically, this class expects the Click object to be exposed through an attribute called ``cli``. If the
+    attribute is not present, or is not a Click object, then an exception will be raised.
+
+    For example: if "foo.bar.hello" is the package where "hello" command is implemented, then
+    "/foo/bar/hello/__init__.py" file is expected to contain a Click object called ``cli``.
+
+    The command package is dynamically loaded using Python's standard ``importlib`` library. Therefore package names
+    can be specified using the standard Python's dot notation such as "foo.bar.hello".
+
+    By convention, the name of last module in the package's name is the command's name. ie. A package of "foo.bar.baz"
+    will produce a command name "baz".
+    """
+
+    def __init__(self, cmd_packages=None, *args, **kwargs):
+        """
+        Initializes the class, optionally with a list of available commands
+
+        :param cmd_packages: List of Python packages names of CLI commands
+        :param args: Other Arguments passed to super class
+        :param kwargs: Other Arguments passed to super class
+        """
+        super(BaseCommand, self).__init__(*args, **kwargs)
+
+        if not cmd_packages:
+            cmd_packages = _SAM_CLI_COMMAND_PACKAGES
+
+        self._commands = {}
+        self._commands = BaseCommand._set_commands(cmd_packages)
+
+    @staticmethod
+    def _set_commands(package_names):
+        """
+        Extract the command name from package name. Last part of the module path is the command
+        ie. if path is foo.bar.baz, then "baz" is the command name.
+
+        :param package_names: List of package names
+        :return: Dictionary with command name as key and the package name as value.
+        """
+
+        commands = {}
+
+        for pkg_name in package_names:
+            cmd_name = pkg_name.split('.')[-1]
+            commands[cmd_name] = pkg_name
+
+        return commands
+
+    def list_commands(self, ctx):
+        """
+        Overrides a method from Click that returns a list of commands available in the CLI.
+
+        :param ctx: Click context
+        :return: List of commands available in the CLI
+        """
+        return list(self._commands.keys())
+
+    def get_command(self, ctx, cmd_name):
+        """
+        Overrides method from ``click.MultiCommand`` that returns Click CLI object for given command name, if found.
+
+        :param ctx: Click context
+        :param cmd_name: Top-level command name
+        :return: Click object representing the command
+        """
+        if cmd_name not in self._commands:
+            logger.error("Command %s not available", cmd_name)
+            return
+
+        pkg_name = self._commands[cmd_name]
+
+        try:
+            mod = importlib.import_module(pkg_name)
+        except ImportError:
+            logger.exception("Command '%s' is not configured correctly. Unable to import '%s'", cmd_name, pkg_name)
+            return
+
+        if not hasattr(mod, "cli"):
+            logger.error("Command %s is not configured correctly. It must expose an function called 'cli'", cmd_name)
+            return
+
+        return mod.cli
diff --git a/samcli/cli/context.py b/samcli/cli/context.py
new file mode 100644
index 0000000000..7861e9329d
--- /dev/null
+++ b/samcli/cli/context.py
@@ -0,0 +1,42 @@
+"""
+Context information passed to each CLI command
+"""
+
+import logging
+
+
+class Context(object):
+    """
+    Top level context object for the CLI. Exposes common functionality required by a CLI, including logging,
+    environment config parsing, debug logging etc.
+
+    This object is passed by Click to every command that adds the proper annotation.
+    Read this for more details on Click Context - http://click.pocoo.org/5/commands/#nested-handling-and-contexts
+    Each command gets its own context object, but linked to both parent and child command's context, like a Linked List.
+
+    This class itself does not rely on how Click works. It is just a plain old Python class that holds common
+    properties used by every CLI command.
+    """
+
+    def __init__(self):
+        """
+        Initialize the context with default values
+        """
+        self._debug = False
+
+    @property
+    def debug(self):
+        return self._debug
+
+    @debug.setter
+    def debug(self, value):
+        """
+        Turn on debug logging if necessary.
+
+        :param value: Value of debug flag
+        """
+        self._debug = value
+
+        if self._debug:
+            # Turn on debug logging
+            logging.getLogger().setLevel(logging.DEBUG)
diff --git a/samcli/cli/main.py b/samcli/cli/main.py
new file mode 100644
index 0000000000..9693562586
--- /dev/null
+++ b/samcli/cli/main.py
@@ -0,0 +1,43 @@
+"""
+Entry point for the CLI
+"""
+
+import logging
+import click
+
+from samcli import __version__
+from .options import debug_option
+from .context import Context
+from .command import BaseCommand
+
+logger = logging.getLogger(__name__)
+logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
+
+
+pass_context = click.make_pass_decorator(Context)
+
+
+def common_options(f):
+    """
+    Common CLI options used by all commands. Ex: --debug
+    :param f: Callback function passed by Click
+    :return: Callback function
+    """
+    f = debug_option(f)
+    return f
+
+
+@click.command(cls=BaseCommand)
+@common_options
+@click.version_option(version=__version__, prog_name="SAM CLI")
+@pass_context
+def cli(ctx):
+    """
+    AWS Serverless Application Model (SAM) CLI
+
+    The AWS Serverless Application Model extends AWS CloudFormation to provide a simplified way of defining the
+    Amazon API Gateway APIs, AWS Lambda functions, and Amazon DynamoDB tables needed by your serverless application.
+    You can find more in-depth guide about the SAM specification here:
+    https://github.com/awslabs/serverless-application-model.
+    """
+    pass
diff --git a/samcli/cli/options.py b/samcli/cli/options.py
new file mode 100644
index 0000000000..04052313a3
--- /dev/null
+++ b/samcli/cli/options.py
@@ -0,0 +1,27 @@
+"""
+This file contains common CLI options common to all commands. As we add more commands, this will
+become a repository of options that other commands could use when needed.
+"""
+
+import click
+
+from .context import Context
+
+
+def debug_option(f):
+    """
+    Configures --debug option for CLI
+
+    :param f: Callback Function to be passed to Click
+    """
+    def callback(ctx, param, value):
+        state = ctx.ensure_object(Context)
+        state.debug = value
+        return value
+
+    return click.option('--debug',
+                        expose_value=False,
+                        is_flag=True,
+                        envvar="SAM_DEBUG",
+                        help='Turn on debug logging',
+                        callback=callback)(f)
diff --git a/samcli/commands/__init__.py b/samcli/commands/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/deploy/__init__.py b/samcli/commands/deploy/__init__.py
new file mode 100644
index 0000000000..9ab2e30550
--- /dev/null
+++ b/samcli/commands/deploy/__init__.py
@@ -0,0 +1,26 @@
+"""
+CLI command for "deploy" command
+"""
+
+import click
+
+from samcli.cli.main import pass_context, common_options
+from samcli.lib.samlib.cloudformation_command import execute_command
+
+
+SHORT_HELP = "Deploy an AWS SAM application. This is an alias for 'aws cloudformation deploy'."
+
+
+@click.command("deploy", short_help=SHORT_HELP, context_settings={"ignore_unknown_options": True})
+@click.argument("args", nargs=-1, type=click.UNPROCESSED)
+@common_options
+@pass_context
+def cli(ctx, args):
+
+    # All logic must be implemented in the ``do_cli`` method. This helps with easy unit testing
+
+    do_cli(args)  # pragma: no cover
+
+
+def do_cli(args):
+    execute_command("deploy", args)
diff --git a/samcli/commands/init/__init__.py b/samcli/commands/init/__init__.py
new file mode 100644
index 0000000000..14d8273dae
--- /dev/null
+++ b/samcli/commands/init/__init__.py
@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+"""
+Init command to scaffold a project app from a template
+"""
+import logging
+import click
+
+from samcli.cli.main import pass_context, common_options
+from samcli.local.init import generate_project
+from samcli.local.init import RUNTIME_TEMPLATE_MAPPING
+from samcli.local.init.exceptions import GenerateProjectFailedError
+from samcli.commands.local.cli_common.user_exceptions import UserException
+
+LOG = logging.getLogger(__name__)
+SUPPORTED_RUNTIME = [r for r in RUNTIME_TEMPLATE_MAPPING]
+
+
+@click.command(context_settings=dict(help_option_names=[u'-h', u'--help']))
+@click.option('-l', '--location', help="Template location (git, mercurial, http(s), zip, path)")
+@click.option('-r', '--runtime', type=click.Choice(SUPPORTED_RUNTIME), default="nodejs8.10",
+              help="Lambda Runtime of your app")
+@click.option('-o', '--output-dir', default='.', type=click.Path(), help="Where to output the initialized app into")
+@click.option('-n', '--name', default="sam-app", help="Name of your project to be generated as a folder")
+@click.option('--no-input', is_flag=True, default=False,
+              help="Disable prompting and accept default values defined template config")
+@common_options
+@pass_context
+def cli(ctx, location, runtime, output_dir, name, no_input):
+    """ \b
+        Initialize a serverless application with a SAM template, folder
+        structure for your Lambda functions, connected to an event source such as APIs,
+        S3 Buckets or DynamoDB Tables. This application includes everything you need to
+        get started with serverless and eventually grow into a production scale application.
+        \b
+        This command can initialize a boilerplate serverless app. If you want to create your own
+        template as well as use a custom location please take a look at our official documentation.
+
+    \b
+    Common usage:
+
+        \b
+        Initializes a new SAM project using Python 3.6 default template runtime
+        \b
+        $ sam init --runtime python3.6
+        \b
+        Initializes a new SAM project using custom template in a Git/Mercurial repository
+        \b
+        # gh being expanded to github url
+        $ sam init --location gh:aws-samples/cookiecutter-sam-python
+        \b
+        $ sam init --location git+ssh://git@github.com/aws-samples/cookiecutter-sam-python.git
+        \b
+        $ sam init --location hg+ssh://hg@bitbucket.org/repo/template-name
+        \b
+        $ sam init --location hg+ssh://hg@bitbucket.org/repo/template-name
+
+        \b
+        Initializes a new SAM project using custom template in a Zipfile
+        \b
+        $ sam init --location /path/to/template.zip
+        \b
+        $ sam init --location https://example.com/path/to/template.zip
+
+        \b
+        Initializes a new SAM project using custom template in a local path
+        \b
+        $ sam init --location /path/to/template/folder
+
+    """
+    # All logic must be implemented in the `do_cli` method. This helps ease unit tests
+    do_cli(ctx, location, runtime, output_dir,
+           name, no_input)  # pragma: no cover
+
+
+def do_cli(ctx, location, runtime, output_dir, name, no_input):
+    """
+    Implementation of the ``cli`` method, just separated out for unit testing purposes
+    """
+    LOG.debug("Init command")
+    click.secho("[+] Initializing project structure...", fg="green")
+
+    try:
+        generate_project(location, runtime, output_dir, name, no_input)
+        # Custom templates can implement their own visual cues so let's not repeat the message
+        if not location:
+            click.secho(
+                "[SUCCESS] - Read {name}/README.md for further instructions on how to proceed"
+                .format(name=name), bold=True)
+        click.secho("[*] Project initialization is now complete", fg="green")
+    except GenerateProjectFailedError as e:
+        raise UserException(str(e))
diff --git a/samcli/commands/local/__init__.py b/samcli/commands/local/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/cli_common/__init__.py b/samcli/commands/local/cli_common/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/cli_common/invoke_context.py b/samcli/commands/local/cli_common/invoke_context.py
new file mode 100644
index 0000000000..103f175da2
--- /dev/null
+++ b/samcli/commands/local/cli_common/invoke_context.py
@@ -0,0 +1,274 @@
+"""
+Reads CLI arguments and performs necessary preparation to be able to run the function
+"""
+
+import os
+import sys
+import json
+import yaml
+import docker
+
+from requests.exceptions import ConnectionError
+
+from samcli.yamlhelper import yaml_parse
+from samcli.commands.local.lib.local_lambda import LocalLambdaRunner
+from samcli.local.lambdafn.runtime import LambdaRuntime
+from samcli.local.docker.manager import ContainerManager
+from .user_exceptions import InvokeContextException
+from ..lib.sam_function_provider import SamFunctionProvider
+
+
+class InvokeContext(object):
+    """
+    Sets up a context to invoke Lambda functions locally by parsing all command line arguments necessary for the
+    invoke.
+
+    ``start-api`` command will also use this class to read and parse invoke related CLI arguments and setup the
+    necessary context to invoke.
+
+    This class *must* be used inside a `with` statement as follows:
+
+        with InvokeContext(**kwargs) as context:
+            context.local_lambda_runner.invoke(...)
+
+    This class sets up some resources that need to be cleaned up after the context object is used.
+    """
+
+    def __init__(self,
+                 template_file,
+                 function_identifier=None,
+                 env_vars_file=None,
+                 debug_port=None,
+                 debug_args=None,
+                 docker_volume_basedir=None,
+                 docker_network=None,
+                 log_file=None,
+                 skip_pull_image=None,
+                 aws_profile=None):
+        """
+        Initialize the context
+
+        :param string template_file: Name or path to template
+        :param string function_identifier: Identifier of the function to invoke
+        :param string env_vars_file: Path to a file containing values for environment variables
+        :param int debug_port: Port to bind the debugger
+        :param string docker_volume_basedir: Directory for the Docker volume
+        :param string docker_network: Docker network identifier
+        :param string log_file: Path to a file to send container output to. If the file does not exist, it will be
+            created
+        :param bool skip_pull_image: Should we skip pulling the Docker container image?
+        :param string aws_profile: Name of the profile to fetch AWS credentials from
+        """
+
+        self._template_file = template_file
+        self._function_identifier = function_identifier
+        self._env_vars_file = env_vars_file
+        self._debug_port = debug_port
+        self._debug_args = debug_args
+        self._docker_volume_basedir = docker_volume_basedir
+        self._docker_network = docker_network
+        self._log_file = log_file
+        self._skip_pull_image = skip_pull_image
+        self._aws_profile = aws_profile
+
+        self._template_dict = None
+        self._function_provider = None
+        self._env_vars_value = None
+        self._log_file_handle = None
+
+    def __enter__(self):
+        """
+        Performs some basic checks and returns itself when everything is ready to invoke a Lambda function.
+
+        :returns InvokeContext: Returns this object
+        """
+
+        # Grab template from file and create a provider
+        self._template_dict = self._get_template_data(self._template_file)
+        self._function_provider = SamFunctionProvider(self._template_dict)
+
+        self._env_vars_value = self._get_env_vars_value(self._env_vars_file)
+        self._log_file_handle = self._setup_log_file(self._log_file)
+
+        self._check_docker_connectivity()
+
+        return self
+
+    def __exit__(self, *args):
+        """
+        Cleanup any necessary opened files
+        """
+
+        if self._log_file_handle:
+            self._log_file_handle.close()
+            self._log_file_handle = None
+
+    @property
+    def function_name(self):
+        """
+        Returns name of the function to invoke. If no function identifier is provided, this method will return name of
+        the only function from the template
+
+        :return string: Name of the function
+        :raises InvokeContextException: If function identifier is not provided
+        """
+        if self._function_identifier:
+            return self._function_identifier
+
+        # Function Identifier is *not* provided. If there is only one function in the template,
+        # default to it.
+
+        all_functions = [f for f in self._function_provider.get_all()]
+        if len(all_functions) == 1:
+            return all_functions[0].name
+
+        # Get all the available function names to print helpful exception message
+        all_function_names = [f.name for f in all_functions]
+
+        # There are more functions in the template, and function identifier is not provided, hence raise.
+        raise InvokeContextException("You must provide a function identifier (function's Logical ID in the template). "
+                                     "Possible options in your template: {}".format(all_function_names))
+
+    @property
+    def local_lambda_runner(self):
+        """
+        Returns an instance of the runner capable of running Lambda functions locally
+
+        :return samcli.commands.local.lib.local_lambda.LocalLambdaRunner: Runner configured to run Lambda functions
+            locally
+        """
+
+        container_manager = ContainerManager(docker_network_id=self._docker_network,
+                                             skip_pull_image=self._skip_pull_image)
+
+        lambda_runtime = LambdaRuntime(container_manager)
+        return LocalLambdaRunner(local_runtime=lambda_runtime,
+                                 function_provider=self._function_provider,
+                                 cwd=self.get_cwd(),
+                                 env_vars_values=self._env_vars_value,
+                                 debug_port=self._debug_port,
+                                 debug_args=self._debug_args,
+                                 aws_profile=self._aws_profile)
+
+    @property
+    def stdout(self):
+        """
+        Returns a stdout stream to output Lambda function logs to
+
+        :return File like object: Stream where the output of the function is sent to
+        """
+        if self._log_file_handle:
+            return self._log_file_handle
+
+        return sys.stdout
+
+    @property
+    def stderr(self):
+        """
+        Returns stderr stream to output Lambda function errors to
+
+        :return File like object: Stream where the stderr of the function is sent to
+        """
+        if self._log_file_handle:
+            return self._log_file_handle
+
+        return sys.stderr
+
+    @property
+    def template(self):
+        """
+        Returns the template data as dictionary
+
+        :return dict: Template data
+        """
+        return self._template_dict
+
+    def get_cwd(self):
+        """
+        Get the working directory. This is usually relative to the directory that contains the template. If a Docker
+        volume location is specified, it takes preference
+
+        All Lambda function code paths are resolved relative to this working directory
+
+        :return string: Working directory
+        """
+
+        cwd = os.path.dirname(os.path.abspath(self._template_file))
+        if self._docker_volume_basedir:
+            cwd = self._docker_volume_basedir
+
+        return cwd
+
+    @staticmethod
+    def _get_template_data(template_file):
+        """
+        Read the template file, parse it as JSON/YAML and return the template as a dictionary.
+
+        :param string template_file: Path to the template to read
+        :return dict: Template data as a dictionary
+        :raises InvokeContextException: If template file was not found or the data was not a JSON/YAML
+        """
+
+        if not os.path.exists(template_file):
+            raise InvokeContextException("Template file not found at {}".format(template_file))
+
+        with open(template_file, 'r') as fp:
+            try:
+                return yaml_parse(fp.read())
+            except (ValueError, yaml.YAMLError) as ex:
+                raise InvokeContextException("Failed to parse template: {}".format(str(ex)))
+
+    @staticmethod
+    def _get_env_vars_value(filename):
+        """
+        If the user provided a file containing values of environment variables, this method will read the file and
+        return its value
+
+        :param string filename: Path to file containing environment variable values
+        :return dict: Value of environment variables, if provided. None otherwise
+        :raises InvokeContextException: If the file was not found or not a valid JSON
+        """
+        if not filename:
+            return None
+
+        # Try to read the file and parse it as JSON
+        try:
+
+            with open(filename, 'r') as fp:
+                return json.load(fp)
+
+        except Exception as ex:
+            raise InvokeContextException("Could not read environment variables overrides from file {}: {}".format(
+                                         filename,
+                                         str(ex)))
+
+    @staticmethod
+    def _setup_log_file(log_file):
+        """
+        Open a log file if necessary and return the file handle. This will create a file if it does not exist
+
+        :param string log_file: Path to a file where the logs should be written to
+        :return: Handle to the opened log file, if necessary. None otherwise
+        """
+        if not log_file:
+            return None
+
+        return open(log_file, 'w')
+
+    @staticmethod
+    def _check_docker_connectivity(docker_client=None):
+        """
+        Checks if Docker daemon is running. This is required for us to invoke the function locally
+
+        :param docker_client: Instance of Docker client
+        :return bool: True, if Docker is available
+        :raises InvokeContextException: If Docker is not available
+        """
+
+        docker_client = docker_client or docker.from_env()
+
+        try:
+            docker_client.ping()
+        # When Docker is not installed, a request.exceptions.ConnectionError is thrown.
+        except (docker.errors.APIError, ConnectionError):
+            raise InvokeContextException("Running AWS SAM projects locally requires Docker. Have you got it installed?")
diff --git a/samcli/commands/local/cli_common/options.py b/samcli/commands/local/cli_common/options.py
new file mode 100644
index 0000000000..d75f28ed48
--- /dev/null
+++ b/samcli/commands/local/cli_common/options.py
@@ -0,0 +1,110 @@
+"""
+Common CLI options for invoke command
+"""
+
+import os
+import click
+
+_TEMPLATE_OPTION_DEFAULT_VALUE = "template.[yaml|yml]"
+
+
+def get_or_default_template_file_name(ctx, param, provided_value):
+    """
+    Default value for the template file name option is more complex than what Click can handle.
+    This method either returns user provided file name or one of the two default options (template.yaml/template.yml)
+    depending on the file that exists
+
+    :param ctx: Click Context
+    :param param: Param name
+    :param provided_value: Value provided by Click. It could either be the default value or provided by user.
+    :return: Actual value to be used in the CLI
+    """
+
+    if provided_value == _TEMPLATE_OPTION_DEFAULT_VALUE:
+        # Default value was used. Value can either be template.yaml or template.yml. Decide based on which file exists
+        # .yml is the default, even if it does not exist.
+        provided_value = "template.yml"
+
+        option = "template.yaml"
+        if os.path.exists(option):
+            provided_value = option
+
+    return os.path.abspath(provided_value)
+
+
+def template_common_option(f):
+    """
+    Common ClI option for template
+
+    :param f: Callback passed by Click
+    :return: Callback
+    """
+    return template_click_option()(f)
+
+
+def template_click_option():
+    """
+    Click Option for template option
+    """
+    return click.option('--template', '-t',
+                        default=_TEMPLATE_OPTION_DEFAULT_VALUE,
+                        type=click.Path(),
+                        envvar="SAM_TEMPLATE_FILE",
+                        callback=get_or_default_template_file_name,
+                        show_default=True,
+                        help="AWS SAM template file")
+
+
+def invoke_common_options(f):
+    """
+    Common CLI options shared by "local invoke" and "local start-api" commands
+
+    :param f: Callback passed by Click
+    """
+
+    invoke_options = [
+        template_click_option(),
+
+        click.option('--env-vars', '-n',
+                     type=click.Path(exists=True),
+                     help="JSON file containing values for Lambda function's environment variables."),
+
+        click.option('--debug-port', '-d',
+                     help="When specified, Lambda function container will start in debug mode and will expose this "
+                          "port on localhost.",
+                     envvar="SAM_DEBUG_PORT"),
+
+        click.option('--debug-args',
+                     help="Additional arguments to be passed to the debugger",
+                     envvar="DEBUGGER_ARGS"),
+
+        click.option('--docker-volume-basedir', '-v',
+                     envvar="SAM_DOCKER_VOLUME_BASEDIR",
+                     help="Specifies the location basedir where the SAM file exists. If the Docker is running on "
+                          "a remote machine, you must mount the path where the SAM file exists on the docker machine "
+                          "and modify this value to match the remote machine."),
+
+        click.option('--docker-network',
+                     envvar="SAM_DOCKER_NETWORK",
+                     help="Specifies the name or id of an existing docker network to lambda docker"
+                          "containers should connect to, along with the default bridge network. If not specified,"
+                          "the Lambda containers will only connect to the default bridge docker network."),
+
+        click.option('--log-file', '-l',
+                     help="logfile to send runtime logs to"),
+
+        click.option('--skip-pull-image',
+                     is_flag=True,
+                     help="Specify whether CLI should skip pulling down the latest Docker image for Lambda runtime",
+                     envvar="SAM_SKIP_PULL_IMAGE"),
+
+        click.option('--profile',
+                     help="Specify which AWS credentials profile to use."),
+
+    ]
+
+    # Reverse the list to maintain ordering of options in help text printed with --help
+    for option in reversed(invoke_options):
+        option(f)
+
+    return f
diff --git a/samcli/commands/local/cli_common/user_exceptions.py b/samcli/commands/local/cli_common/user_exceptions.py
new file mode 100644
index 0000000000..846781852a
--- /dev/null
+++ b/samcli/commands/local/cli_common/user_exceptions.py
@@ -0,0 +1,35 @@
+"""
+Class containing error conditions that are exposed to the user.
+"""
+
+import click
+
+
+class UserException(click.ClickException):
+    """
+    Base class for all exceptions that need to be surfaced to the user. Typically, we will display the exception
+    message to user and return the error code from CLI process
+    """
+
+    exit_code = 1
+
+
+class InvokeContextException(UserException):
+    """
+    Something went wrong invoking the function.
+    """
+    pass
+
+
+class InvalidSamTemplateException(UserException):
+    """
+    The template provided was invalid and not able to transform into a Standard CloudFormation Template
+    """
+    pass
+
+
+class SamTemplateNotFoundException(UserException):
+    """
+    The SAM Template provided could not be found
+    """
+    pass
diff --git a/samcli/commands/local/generate_event/__init__.py b/samcli/commands/local/generate_event/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/generate_event/api/__init__.py b/samcli/commands/local/generate_event/api/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/generate_event/api/cli.py b/samcli/commands/local/generate_event/api/cli.py
new file mode 100644
index 0000000000..29d64ca7d8
--- /dev/null
+++ b/samcli/commands/local/generate_event/api/cli.py
@@ -0,0 +1,43 @@
+"""
+Generates an Api Gateway Event for a Lambda Invoke
+"""
+import json
+
+import click
+
+from samcli.cli.main import pass_context, common_options as cli_framework_options
+from samcli.commands.local.lib.events import generate_api_event
+
+
+@click.command("api", short_help="Generates a sample Amazon API Gateway event")
+@click.option("--method", "-m",
+              type=str,
+              default="POST",
+              help='HTTP method (default: "POST")')
+@click.option("--body", "-b",
+              type=str,
+              default="{ \"test\": \"body\"}",
+              help='HTTP body (default: "{ \"test\": \"body\"}")')
+@click.option("--resource", "-r",
+              type=str,
+              default="/{proxy+}",
+              help='API Gateway resource name (default: "/{proxy+}")')
+@click.option("--path", "-p",
+              type=str,
+              default="/examplepath",
+              help=' HTTP path (default: "/examplepath")')
+@cli_framework_options
+@pass_context
+def cli(ctx, method, body, resource, path):
+    # All logic must be implemented in the ``do_cli`` method. This helps with easy unit testing
+
+    do_cli(ctx, method, body, resource, path)  # pragma: no cover
+
+
+def do_cli(ctx, method, body, resource, path):
+    """
+    Implementation of the ``cli`` method, just separated out for unit testing purposes
+    """
+    event_dict = generate_api_event(method, body, resource, path)
+    event = json.dumps(event_dict, indent=4)
+    click.echo(event)
diff --git a/samcli/commands/local/generate_event/cli.py b/samcli/commands/local/generate_event/cli.py
new file mode 100644
index 0000000000..f99691c6fc
--- /dev/null
+++ b/samcli/commands/local/generate_event/cli.py
@@ -0,0 +1,39 @@
+"""
+Command group for "generate-event" suite for commands.
+"""
+
+import click
+
+from .s3.cli import cli as s3_cli
+from .api.cli import cli as api_cli
+from .dynamodb.cli import cli as dynamodb_cli
+from .kinesis.cli import cli as kinesis_cli
+from .schedule.cli import cli as schedule_cli
+from .sns.cli import cli as sns_cli
+
+
+HELP_TEXT = """
+Generate a Lambda Event that can be used to invoke a Lambda Function.
+
+Useful for developing serverless functions that handle asynchronous events (such as S3/Kinesis etc), or if you want to
+compose a script of test cases. Event body can be passed in either by stdin (default), or by using the --event
+parameter. Runtime output (logs etc) will be outputted to stderr, and the Lambda function result will be outputted to
+stdout.
+"""
+
+
+@click.group("generate-event")
+def cli():
+    """
+    Generate an event
+    """
+    pass  # pragma: no cover
+
+
+# Add individual commands under this group
+cli.add_command(s3_cli)
+cli.add_command(api_cli)
+cli.add_command(dynamodb_cli)
+cli.add_command(kinesis_cli)
+cli.add_command(schedule_cli)
+cli.add_command(sns_cli)
diff --git a/samcli/commands/local/generate_event/dynamodb/__init__.py b/samcli/commands/local/generate_event/dynamodb/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/generate_event/dynamodb/cli.py b/samcli/commands/local/generate_event/dynamodb/cli.py
new file mode 100644
index 0000000000..6071b5f7e4
--- /dev/null
+++ b/samcli/commands/local/generate_event/dynamodb/cli.py
@@ -0,0 +1,31 @@
+"""
+Generates a DynamoDB Event for a Lambda Invoke
+"""
+import json
+
+import click
+
+from samcli.cli.main import pass_context, common_options as cli_framework_options
+from samcli.commands.local.lib.events import generate_dynamodb_event
+
+
+@click.command("dynamodb", short_help="Generates a sample Amazon DynamoDB event")
+@click.option("--region", "-r",
+              type=str,
+              default="us-east-1",
+              help='The region the event should come from (default: "us-east-1")')
+@pass_context
+@cli_framework_options
+def cli(ctx, region):
+    # All of the logic must be implemented in the ``do_cli`` method. This helps with easy unit testing
+
+    do_cli(ctx, region)  # pragma: no cover
+
+
+def do_cli(ctx, region):
+    """
+    Implementation of the ``cli`` method, just separated out for unit testing purposes
+    """
+    event_dict = generate_dynamodb_event(region)
+    event = json.dumps(event_dict, indent=4)
+    click.echo(event)
diff --git a/samcli/commands/local/generate_event/kinesis/__init__.py b/samcli/commands/local/generate_event/kinesis/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/generate_event/kinesis/cli.py b/samcli/commands/local/generate_event/kinesis/cli.py
new file mode 100644
index 0000000000..2ade43e34d
--- /dev/null
+++ b/samcli/commands/local/generate_event/kinesis/cli.py
@@ -0,0 +1,48 @@
+"""
+Generates a Kinesis Event for a Lambda Invoke
+"""
+import base64
+import json
+
+import click
+
+from samcli.cli.main import pass_context, common_options as cli_framework_options
+from samcli.commands.local.lib.events import generate_kinesis_event
+
+
+@click.command("kinesis", short_help="Generates a sample Amazon Kinesis event")
+@click.option("--region", "-r",
+              type=str,
+              default="us-east-1",
+              help='The region the event should come from (default: "us-east-1")')
+@click.option("--partition", "-p",
+              type=str,
+              default="partitionKey-03",
+              help='The Kinesis partition key (default: "partitionKey-03")')
+@click.option("--sequence", "-s",
+              type=str,
+              default="49545115243490985018280067714973144582180062593244200961",
+              help='The Kinesis sequence number (default: "49545115243490985018280067714973144582180062593244200961")')
+@click.option("--data", "-d",
+              type=str,
+              default="Hello, this is a test 123.",
+              help='The Kinesis message payload. There is no need to base64 this - sam will do this for you '
+                   '(default: "Hello, this is a test 123.")')
+@cli_framework_options
+@pass_context
+def cli(ctx, region, partition, sequence, data):
+    # All logic must be implemented in the ``do_cli`` method. This helps with easy unit testing
+
+    do_cli(ctx, region, partition, sequence, data)  # pragma: no cover
+
+
+def do_cli(ctx, region, partition, sequence, data):
+    """
+    Implementation of the ``cli`` method, just separated out for unit testing purposes
+    """
+
+    # base64 encode the data
+    date_base64 = base64.urlsafe_b64encode(data.encode('utf8'))
+    event_dict = generate_kinesis_event(region, partition, sequence, date_base64)
+    event = json.dumps(event_dict, indent=4)
+    click.echo(event)
diff --git a/samcli/commands/local/generate_event/s3/__init__.py b/samcli/commands/local/generate_event/s3/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/generate_event/s3/cli.py b/samcli/commands/local/generate_event/s3/cli.py
new file mode 100644
index 0000000000..89046f5109
--- /dev/null
+++ b/samcli/commands/local/generate_event/s3/cli.py
@@ -0,0 +1,39 @@
+"""
+Generates a S3 Event for a Lambda Invoke
+"""
+import json
+
+import click
+
+from samcli.cli.main import pass_context, common_options as cli_framework_options
+from samcli.commands.local.lib.events import generate_s3_event
+
+
+@click.command("s3", short_help="Generates a sample Amazon S3 event")
+@click.option("--region", "-r",
+              type=str,
+              default="us-east-1",
+              help='The region the event should come from (default: "us-east-1")')
+@click.option("--bucket", "-b",
+              type=str,
+              default="example-bucket",
+              help='The S3 bucket the event should reference (default: "example-bucket")')
+@click.option("--key", "-k",
+              type=str,
+              default="test/key",
+              help='The S3 key the event should reference (default: "test/key")')
+@cli_framework_options
+@pass_context
+def cli(ctx, region, bucket, key):
+    # All logic must be implemented in the ``do_cli`` method. This helps with easy unit testing
+
+    do_cli(ctx, region, bucket, key)  # pragma: no cover
+
+
+def do_cli(ctx, region, bucket, key):
+    """
+    Implementation of the ``cli`` method, just separated out for unit testing purposes
+    """
+    event_dict = generate_s3_event(region, bucket, key)
+    event = json.dumps(event_dict, indent=4)
+    click.echo(event)
diff --git a/samcli/commands/local/generate_event/schedule/__init__.py b/samcli/commands/local/generate_event/schedule/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/generate_event/schedule/cli.py b/samcli/commands/local/generate_event/schedule/cli.py
new file mode 100644
index 0000000000..107e7fad84
--- /dev/null
+++ b/samcli/commands/local/generate_event/schedule/cli.py
@@ -0,0 +1,31 @@
+"""
+Generates a Schedule Event for a Lambda Invoke
+"""
+import json
+
+import click
+
+from samcli.cli.main import pass_context, common_options as cli_framework_options
+from samcli.commands.local.lib.events import generate_schedule_event
+
+
+@click.command("schedule", short_help="Generates a sample scheduled event")
+@click.option("--region", "-r",
+              type=str,
+              default="us-east-1",
+              help='The region the event should come from (default: "us-east-1")')
+@cli_framework_options
+@pass_context
+def cli(ctx, region):
+    # All logic must be implemented in the ``do_cli`` method. This helps with easy unit testing
+
+    do_cli(ctx, region)  # pragma: no cover
+
+
+def do_cli(ctx, region):
+    """
+    Implementation of the ``cli`` method, just separated out for unit testing purposes
+    """
+    event_dict = generate_schedule_event(region)
+    event = json.dumps(event_dict, indent=4)
+    click.echo(event)
diff --git a/samcli/commands/local/generate_event/sns/__init__.py b/samcli/commands/local/generate_event/sns/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/generate_event/sns/cli.py b/samcli/commands/local/generate_event/sns/cli.py
new file mode 100644
index 0000000000..9075a2e7a8
--- /dev/null
+++ b/samcli/commands/local/generate_event/sns/cli.py
@@ -0,0 +1,39 @@
+"""
+Generates a SNS Event for a Lambda Invoke
+"""
+import json
+
+import click
+
+from samcli.cli.main import pass_context, common_options as cli_framework_options
+from samcli.commands.local.lib.events import generate_sns_event
+
+
+@click.command("sns", short_help="Generates a sample Amazon SNS event")
+@click.option("--message", "-m",
+              type=str,
+              default="example message",
+              help='The SNS message body (default: "example message")')
+@click.option("--topic", "-t",
+              type=str,
+              default="arn:aws:sns:us-east-1:111122223333:ExampleTopic",
+              help='The SNS topic (default: "arn:aws:sns:us-east-1:111122223333:ExampleTopic")')
+@click.option("--subject", "-s",
+              type=str,
+              default="example subject",
+              help='The SNS subject (default: "example subject")')
+@cli_framework_options
+@pass_context
+def cli(ctx, message, topic, subject):
+    # All logic must be implemented in the ``do_cli`` method. This helps with easy unit testing
+
+    do_cli(ctx, message, topic, subject)  # pragma: no cover
+
+
+def do_cli(ctx, message, topic, subject):
+    """
+    Implementation of the ``cli`` method, just separated out for unit testing purposes
+    """
+    event_dict = generate_sns_event(message, topic, subject)
+    event = json.dumps(event_dict, indent=4)
+    click.echo(event)
diff --git a/samcli/commands/local/invoke/__init__.py b/samcli/commands/local/invoke/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/invoke/cli.py b/samcli/commands/local/invoke/cli.py
new file mode 100644
index 0000000000..0bb8ae6353
--- /dev/null
+++ b/samcli/commands/local/invoke/cli.py
@@ -0,0 +1,99 @@
+"""
+CLI command for "local invoke" command
+"""
+
+import logging
+import click
+
+from samcli.cli.main import pass_context, common_options as cli_framework_options
+from samcli.commands.local.cli_common.options import invoke_common_options
+from samcli.commands.local.cli_common.user_exceptions import UserException
+from samcli.commands.local.cli_common.invoke_context import InvokeContext
+from samcli.local.lambdafn.exceptions import FunctionNotFound
+from samcli.commands.validate.lib.exceptions import InvalidSamDocumentException
+
+LOG = logging.getLogger(__name__)
+
+
+HELP_TEXT = """
+Invokes a local Lambda function once and quits after invocation completes.
+
+Useful for developing serverless functions that handle asynchronous events (such as S3/Kinesis etc), or if you want to
+compose a script of test cases. Event body can be passed in either by stdin (default), or by using the --event
+parameter. Runtime output (logs etc) will be outputted to stderr, and the Lambda function result will be outputted to
+stdout.
+"""
+
+
+@click.command("invoke", help=HELP_TEXT, short_help="Invokes a local Lambda function once")
+@click.option("--event", '-e',
+              type=click.Path(),
+              default="-",  # Defaults to stdin
+              help="JSON file containing event data passed to the Lambda function during invoke. If this option "
+                   "is not specified, we will default to reading JSON from stdin")
+@invoke_common_options
+@cli_framework_options
+@click.argument('function_identifier', required=False)
+@pass_context
+def cli(ctx, function_identifier, template, event, env_vars, debug_port, debug_args, docker_volume_basedir,
+        docker_network, log_file, skip_pull_image, profile):
+
+    # All logic must be implemented in the ``do_cli`` method. This helps with easy unit testing
+
+    do_cli(ctx, function_identifier, template, event, env_vars, debug_port, debug_args, docker_volume_basedir,
+           docker_network, log_file, skip_pull_image, profile)  # pragma: no cover
+
+
+def do_cli(ctx, function_identifier, template, event, env_vars, debug_port, debug_args, docker_volume_basedir,
+           docker_network, log_file, skip_pull_image, profile):
+    """
+    Implementation of the ``cli`` method, just separated out for unit testing purposes
+    """
+
+    LOG.debug("local invoke command is called")
+
+    event_data = _get_event(event)
+
+    # Pass all inputs to setup necessary context to invoke function locally.
+    # Handler exception raised by the processor for invalid args and print errors
+    try:
+
+        with InvokeContext(template_file=template,
+                           function_identifier=function_identifier,
+                           env_vars_file=env_vars,
+                           debug_port=debug_port,
+                           debug_args=debug_args,
+                           docker_volume_basedir=docker_volume_basedir,
+                           docker_network=docker_network,
+                           log_file=log_file,
+                           skip_pull_image=skip_pull_image,
+                           aws_profile=profile) as context:
+
+            # Invoke the function
+            context.local_lambda_runner.invoke(context.function_name,
+                                               event=event_data,
+                                               stdout=context.stdout,
+                                               stderr=context.stderr)
+
+    except FunctionNotFound:
+        raise UserException("Function {} not found in template".format(function_identifier))
+    except InvalidSamDocumentException as ex:
+        raise UserException(str(ex))
+
+
+def _get_event(event_file_name):
+    """
+    Read the event JSON data from the given file. If no file is provided, read the event from stdin.
+
+    :param string event_file_name: Path to event file, or '-' for stdin
+    :return string: Contents of the event file or stdin
+    """
+
+    if event_file_name == "-":
+        # If event is empty, listen to stdin for event data until EOF
+        LOG.info("Reading invoke payload from stdin (you can also pass it from file with --event)")
+
+    # click.open_file knows to open stdin when filename is '-'. This is safer than manually opening streams, and
+    # accidentally closing a standard stream
+    with click.open_file(event_file_name, 'r') as fp:
+        return fp.read()
diff --git a/samcli/commands/local/lib/__init__.py b/samcli/commands/local/lib/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/lib/events.py b/samcli/commands/local/lib/events.py
new file mode 100644
index 0000000000..17bd77b863
--- /dev/null
+++ b/samcli/commands/local/lib/events.py
@@ -0,0 +1,305 @@
+"""
+File that holds functions for generating different types of events
+"""
+
+from samcli.local.events.api_event import ContextIdentity, ApiGatewayLambdaEvent, RequestContext
+
+
+def generate_s3_event(region, bucket, key):
+    """
+    Generates a S3 Event
+
+    :param str region: AWS Region
+    :param str bucket: Name of the S3 bucket
+    :param str key: S3 Bucket Key
+    :return dict: Dictionary representing the S3 Event
+    """
+    return {
+        "Records": [{
+            "eventVersion": "2.0",
+            "eventTime": "1970-01-01T00:00:00.000Z",
+            "requestParameters": {
+                "sourceIPAddress": "127.0.0.1"
+            },
+            "s3": {
+                "configurationId": "testConfigRule",
+                "object": {
+                    "eTag": "0123456789abcdef0123456789abcdef",
+                    "sequencer": "0A1B2C3D4E5F678901",
+                    "key": key,
+                    "size": 1024
+                },
+                "bucket": {
+                    "arn": "arn:aws:s3:::{}".format(bucket),
+                    "name": bucket,
+                    "ownerIdentity": {
+                        "principalId": "EXAMPLE"
+                    }
+                },
+                "s3SchemaVersion": "1.0"
+            },
+            "responseElements": {
+                "x-amz-id-2": "EXAMPLE123/5678abcdefghijklambdaisawesome/mnopqrstuvwxyzABCDEFGH",
+                "x-amz-request-id": "EXAMPLE123456789"
+            },
+            "awsRegion": region,
+            "eventName": "ObjectCreated:Put",
+            "userIdentity": {
+                "principalId": "EXAMPLE"
+            },
+            "eventSource": "aws:s3"
+        }]
+    }
+
+
+def generate_sns_event(message, topic, subject):
+    """
+    Generates a SNS Event
+
+    :param str message: Message sent to the topic
+    :param str topic: Name of the Topic
+    :param str subject: Subject of the Topic
+    :return dict: Dictionary representing the SNS Event
+    """
+    return {
+        "Records": [{
+            "EventVersion": "1.0",
+            "EventSubscriptionArn": "arn:aws:sns:EXAMPLE",
+            "EventSource": "aws:sns",
+            "Sns": {
+                "SignatureVersion": "1",
+                "Timestamp": "1970-01-01T00:00:00.000Z",
+                "Signature": "EXAMPLE",
+                "SigningCertUrl": "EXAMPLE",
+                "MessageId": "95df01b4-ee98-5cb9-9903-4c221d41eb5e",
+                "Message": message,
+                "MessageAttributes": {
+                    "Test": {
+                        "Type": "String",
+                        "Value": "TestString"
+                    },
+                    "TestBinary": {
+                        "Type": "Binary",
+                        "Value": "TestBinary"
+                    }
+                },
+                "Type": "Notification",
+                "UnsubscribeUrl": "EXAMPLE",
+                "TopicArn": topic,
+                "Subject": subject
+            }
+        }]
+    }
+
+
+def generate_schedule_event(region):
+    """
+    Generates a Scheduled Event
+
+    :param str region: AWS Region
+    :return dict: Dictionary representing the Schedule Event
+    """
+    return {
+        "account": "123456789012",
+        "region": region,
+        "detail": {},
+        "detail-type": "Scheduled Event",
+        "source": "aws.events",
+        "time": "1970-01-01T00:00:00Z",
+        "id": "cdc73f9d-aea9-11e3-9d5a-835b769c0d9c",
+        "resources": [
+            "arn:aws:events:us-east-1:123456789012:rule/my-schedule"
+        ]
+    }
+
+
+def generate_dynamodb_event(region):
+    """
+    Generates a DynamoDG Event
+
+    :param str region: AWS region
+    :return dict: Dictionary representing the DynamoDB Event
+    """
+    return {
+        "Records": [
+            {
+                "eventID": "1",
+                "eventVersion": "1.0",
+                "dynamodb": {
+                    "Keys": {
+                        "Id": {
+                            "N": "101"
+                        }
+                    },
+                    "NewImage": {
+                        "Message": {
+                            "S": "New item!"
+                        },
+                        "Id": {
+                            "N": "101"
+                        }
+                    },
+                    "StreamViewType": "NEW_AND_OLD_IMAGES",
+                    "SequenceNumber": "111",
+                    "SizeBytes": 26
+                },
+                "awsRegion": region,
+                "eventName": "INSERT",
+                "eventSourceARN": "arn:aws:dynamodb:{}:account-id:table/"
+                                  "ExampleTableWithStream/stream/2015-06-27T00:48:05.899".format(region),
+                "eventSource": "aws:dynamodb"
+            },
+            {
+                "eventID": "2",
+                "eventVersion": "1.0",
+                "dynamodb": {
+                    "OldImage": {
+                        "Message": {
+                            "S": "New item!"
+                        },
+                        "Id": {
+                            "N": "101"
+                        }
+                    },
+                    "SequenceNumber": "222",
+                    "Keys": {
+                        "Id": {
+                            "N": "101"
+                        }
+                    },
+                    "SizeBytes": 59,
+                    "NewImage": {
+                        "Message": {
+                            "S": "This item has changed"
+                        },
+                        "Id": {
+                            "N": "101"
+                        }
+                    },
+                    "StreamViewType": "NEW_AND_OLD_IMAGES"
+                },
+                "awsRegion": region,
+                "eventName": "MODIFY",
+                "eventSourceARN":
+                    "arn:aws:dynamodb:{}:account-id:table/"
+                    "ExampleTableWithStream/stream/2015-06-27T00:48:05.899".format(region),
+                "eventSource": "aws:dynamodb"
+            },
+            {
+                "eventID": "3",
+                "eventVersion": "1.0",
+                "dynamodb": {
+                    "Keys": {
+                        "Id": {
+                            "N": "101"
+                        }
+                    },
+                    "SizeBytes": 38,
+                    "SequenceNumber": "333",
+                    "OldImage": {
+                        "Message": {
+                            "S": "This item has changed"
+                        },
+                        "Id": {
+                            "N": "101"
+                        }
+                    },
+                    "StreamViewType": "NEW_AND_OLD_IMAGES"
+                },
+                "awsRegion": region,
+                "eventName": "REMOVE",
+                "eventSourceARN": "arn:aws:dynamodb:{}:account-id:table/"
+                                  "ExampleTableWithStream/stream/2015-06-27T00:48:05.899".format(region),
+                "eventSource": "aws:dynamodb"
+            }
+        ]
+    }
+
+
+def generate_kinesis_event(region, partition, sequence, data):
+    """
+    Generates a Kinesis Event
+
+    :param str region: AWS Region
+    :param str partition: PartitionKey in Kinesis
+    :param str sequence: Sequence Number as a string
+    :param str data: Data for the stream
+    :return dict: Dictionary representing the Kinesis Event
+    """
+    return {
+        "Records": [{
+            "eventID": "shardId-000000000000:{}".format(sequence),
+            "eventVersion": "1.0",
+            "kinesis": {
+                "approximateArrivalTimestamp": 1428537600,
+                "partitionKey": partition,
+                "data": data,
+                "kinesisSchemaVersion": "1.0",
+                "sequenceNumber": sequence
+            },
+            "invokeIdentityArn": "arn:aws:iam::EXAMPLE",
+            "eventName": "aws:kinesis:record",
+            "eventSourceARN": "arn:aws:kinesis:EXAMPLE",
+            "eventSource": "aws:kinesis",
+            "awsRegion": region
+        }]
+    }
+
+
+def generate_api_event(method, body, resource, path):
+    """
+    Generates an Api Event
+
+    :param str method: HTTP Method of the request
+    :param str body: Body of the request
+    :param str resource: Api Gateway resource path
+    :param str path: Request path
+    :return dict: Dictionary representing the Api Event
+    """
+    headers = {
+        "Via": "1.1 08f323deadbeefa7af34d5feb414ce27.cloudfront.net (CloudFront)",
+        "Accept-Language": "en-US,en;q=0.8",
+        "CloudFront-Is-Desktop-Viewer": "true",
+        "CloudFront-Is-SmartTV-Viewer": "false",
+        "CloudFront-Is-Mobile-Viewer": "false",
+        "X-Forwarded-For": "127.0.0.1, 127.0.0.2",
+        "CloudFront-Viewer-Country": "US",
+        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8",
+        "Upgrade-Insecure-Requests": "1",
+        "X-Forwarded-Port": "443",
+        "Host": "1234567890.execute-api.us-east-1.amazonaws.com",
+        "X-Forwarded-Proto": "https",
+        "X-Amz-Cf-Id": "aaaaaaaaaae3VYQb9jd-nvCd-de396Uhbp027Y2JvkCPNLmGJHqlaA==",
+        "CloudFront-Is-Tablet-Viewer": "false",
+        "Cache-Control": "max-age=0",
+        "User-Agent": "Custom User Agent String",
+        "CloudFront-Forwarded-Proto": "https",
+        "Accept-Encoding": "gzip, deflate, sdch"
+    }
+
+    query_params = {
+        "foo": "bar"
+    }
+
+    path_params = {
+        "proxy": path
+    }
+
+    identity = ContextIdentity(source_ip='127.0.0.1')
+
+    context = RequestContext(resource_path=resource,
+                             http_method=method,
+                             stage="prod",
+                             identity=identity,
+                             path=resource)
+
+    event = ApiGatewayLambdaEvent(http_method=method,
+                                  body=body,
+                                  resource=resource,
+                                  request_context=context,
+                                  query_string_params=query_params,
+                                  headers=headers,
+                                  path_parameters=path_params,
+                                  path=path)
+
+    return event.to_dict()
diff --git a/samcli/commands/local/lib/exceptions.py b/samcli/commands/local/lib/exceptions.py
new file mode 100644
index 0000000000..f7fefd0259
--- /dev/null
+++ b/samcli/commands/local/lib/exceptions.py
@@ -0,0 +1,10 @@
+"""
+Custom exceptions raised by this local library
+"""
+
+
+class NoApisDefined(Exception):
+    """
+    Raised when there are no APIs defined in the template
+    """
+    pass
diff --git a/samcli/commands/local/lib/local_api_service.py b/samcli/commands/local/lib/local_api_service.py
new file mode 100644
index 0000000000..e8761798de
--- /dev/null
+++ b/samcli/commands/local/lib/local_api_service.py
@@ -0,0 +1,168 @@
+"""
+Connects the CLI with Local API Gateway service.
+"""
+
+import os
+import logging
+
+from samcli.local.apigw.service import Service, Route
+from samcli.commands.local.lib.sam_api_provider import SamApiProvider
+from samcli.commands.local.lib.exceptions import NoApisDefined
+
+LOG = logging.getLogger(__name__)
+
+
+class LocalApiService(object):
+    """
+    Implementation of Local API service that is capable of serving APIs defined in a SAM file that invoke a Lambda
+    function.
+    """
+
+    def __init__(self,
+                 lambda_invoke_context,
+                 port,
+                 host,
+                 static_dir):
+        """
+        Initialize the local API service.
+
+        :param samcli.commands.local.cli_common.invoke_context.InvokeContext lambda_invoke_context: Context object
+            that can help with Lambda invocation
+        :param int port: Port to listen on
+        :param string host: Local hostname or IP address to bind to
+        :param string static_dir: Optional, directory from which static files will be mounted
+        """
+
+        self.port = port
+        self.host = host
+        self.static_dir = static_dir
+
+        self.cwd = lambda_invoke_context.get_cwd()
+        self.api_provider = SamApiProvider(lambda_invoke_context.template, cwd=self.cwd)
+        self.lambda_runner = lambda_invoke_context.local_lambda_runner
+        self.stderr_stream = lambda_invoke_context.stderr
+
+    def start(self):
+        """
+        Creates and starts the local API Gateway service. This method will block until the service is stopped
+        manually using an interrupt. After the service is started, callers can make HTTP requests to the endpoint
+        to invoke the Lambda function and receive a response.
+
+        NOTE: This is a blocking call that will not return until the thread is interrupted with SIGINT/SIGTERM
+        """
+
+        routing_list = self._make_routing_list(self.api_provider)
+
+        if not routing_list:
+            raise NoApisDefined("No APIs available in SAM template")
+
+        static_dir_path = self._make_static_dir_path(self.cwd, self.static_dir)
+
+        # We care about passing only stderr to the Service and not stdout because stdout from Docker container
+        # contains the response to the API which is sent out as HTTP response. Only stderr needs to be printed
+        # to the console or a log file. stderr from Docker container contains runtime logs and output of print
+        # statements from the Lambda function
+        service = Service(routing_list=routing_list,
+                          lambda_runner=self.lambda_runner,
+                          static_dir=static_dir_path,
+                          port=self.port,
+                          host=self.host,
+                          stderr=self.stderr_stream)
+
+        service.create()
+
+        # Print out the list of routes that will be mounted
+        self._print_routes(self.api_provider, self.host, self.port)
+        LOG.info("You can now browse to the above endpoints to invoke your functions. "
+                 "You do not need to restart/reload SAM CLI while working on your functions "
+                 "changes will be reflected instantly/automatically. You only need to restart "
+                 "SAM CLI if you update your AWS SAM template")
+
+        service.run()
+
+    @staticmethod
+    def _make_routing_list(api_provider):
+        """
+        Returns a list of routes to configure the Local API Service based on the APIs configured in the template.
+
+        Parameters
+        ----------
+        api_provider : samcli.commands.local.lib.sam_api_provider.SamApiProvider
+
+        Returns
+        -------
+        list(samcli.local.apigw.service.Route)
+            List of Routes to pass to the service
+        """
+
+        routes = []
+        for api in api_provider.get_all():
+            route = Route(methods=[api.method], function_name=api.function_name, path=api.path,
+                          binary_types=api.binary_media_types)
+            routes.append(route)
+
+        return routes
+
+    @staticmethod
+    def _print_routes(api_provider, host, port):
+        """
+        Helper method to print the APIs that will be mounted. This method is purely for printing purposes.
+        This method takes in a list of Route Configurations and prints out the Routes grouped by path.
+        Grouping routes by Function Name + Path is the bulk of the logic.
+
+        Example output:
+            Mounting Product at http://127.0.0.1:3000/path1/bar [GET, POST, DELETE]
+            Mounting Product at http://127.0.0.1:3000/path2/bar [HEAD]
+
+        :param samcli.commands.local.lib.provider.ApiProvider api_provider: API Provider that can return a list of APIs
+        :param string host: Host name where the service is running
+        :param int port: Port number where the service is running
+        :returns list(string): List of lines that were printed to the console. Helps with testing
+        """
+        grouped_api_configs = {}
+
+        for api in api_provider.get_all():
+            key = "{}-{}".format(api.function_name, api.path)
+
+            config = grouped_api_configs.get(key, {})
+            config.setdefault("methods", [])
+
+            config["function_name"] = api.function_name
+            config["path"] = api.path
+            config["methods"].append(api.method)
+
+            grouped_api_configs[key] = config
+
+        print_lines = []
+        for _, config in grouped_api_configs.items():
+            methods_str = "[{}]".format(', '.join(config["methods"]))
+            output = "Mounting {} at http://{}:{}{} {}".format(
+                         config["function_name"],
+                         host,
+                         port,
+                         config["path"],
+                         methods_str)
+            print_lines.append(output)
+
+            LOG.info(output)
+
+        return print_lines
+
+    @staticmethod
+    def _make_static_dir_path(cwd, static_dir):
+        """
+        This method returns the path to the directory where static files are to be served from. If static_dir is a
+        relative path, then it is resolved to be relative to the current working directory. If no static directory is
+        provided, or if the resolved directory does not exist, this method will return None
+
+        :param string cwd: Current working directory relative to which we will resolve the static directory
+        :param string static_dir: Path to the static directory
+        :return string: Path to the static directory, if it exists. None, otherwise
+        """
+        if not static_dir:
+            return None
+
+        static_dir_path = os.path.join(cwd, static_dir)
+        if os.path.exists(static_dir_path):
+            LOG.info("Mounting static files from %s at /", static_dir_path)
+            return static_dir_path
diff --git a/samcli/commands/local/lib/local_lambda.py b/samcli/commands/local/lib/local_lambda.py
new file mode 100644
index 0000000000..2e7c9805e1
--- /dev/null
+++ b/samcli/commands/local/lib/local_lambda.py
@@ -0,0 +1,219 @@
+"""
+Implementation of Local Lambda runner
+"""
+
+import os
+import logging
+import boto3
+
+from samcli.local.lambdafn.env_vars import EnvironmentVariables
+from samcli.local.lambdafn.config import FunctionConfig
+from samcli.local.lambdafn.exceptions import FunctionNotFound
+
+LOG = logging.getLogger(__name__)
+
+
+class LocalLambdaRunner(object):
+    """
+    Runs Lambda functions locally. This class is a wrapper around the `samcli.local` library which takes care
+    of actually running the function on a Docker container.
+    """
+    PRESENT_DIR = "."
+
+    def __init__(self,
+                 local_runtime,
+                 function_provider,
+                 cwd,
+                 env_vars_values=None,
+                 debug_port=None,
+                 debug_args=None,
+                 aws_profile=None
+                 ):
+        """
+        Initializes the class
+
+        :param samcli.local.lambdafn.runtime.LambdaRuntime local_runtime: Lambda runtime capable of running a function
+        :param samcli.commands.local.lib.provider.FunctionProvider function_provider: Provider that can return a
+            Lambda function
+        :param string cwd: Current working directory. We will resolve all function CodeURIs relative to this directory.
+        :param dict env_vars_values: Optional. Dictionary containing values of environment variables
+        :param integer debug_port: Optional. Port to bind the debugger to
+        :param string debug_args: Optional. Additional arguments passed to the debugger
+        :param string aws_profile: Optional. AWS Credentials profile to use
+        """
+
+        self.local_runtime = local_runtime
+        self.provider = function_provider
+        self.cwd = cwd
+        self.env_vars_values = env_vars_values or {}
+        self.debug_port = debug_port
+        self.debug_args = debug_args
+        self.aws_profile = aws_profile
+
+    def invoke(self, function_name, event, stdout=None, stderr=None):
+        """
+        Find the Lambda function with given name and invoke it. Pass the given event to the function and return
+        response through the given streams.
+
+        This function will block until either the function completes or times out.
+
+        :param string function_name: Name of the Lambda function to invoke
+        :param string event: Event data passed to the function. Must be a valid JSON String.
+        :param io.BaseIO stdout: Stream to write the output of the Lambda function to.
+        :param io.BaseIO stderr: Stream to write the Lambda runtime logs to.
+        :raises FunctionNotfound: When we cannot find a function with the given name
+        """
+
+        # Generate the correct configuration based on given inputs
+        function = self.provider.get(function_name)
+
+        if not function:
+            raise FunctionNotFound("Unable to find a Function with name '%s'", function_name)
+
+        LOG.debug("Found one Lambda function with name '%s'", function_name)
+
+        LOG.info("Invoking %s (%s)", function.handler, function.runtime)
+        config = self._get_invoke_config(function)
+
+        # Invoke the function
+        self.local_runtime.invoke(config, event, debug_port=self.debug_port, debug_args=self.debug_args,
+                                  stdout=stdout, stderr=stderr)
+
+    def is_debugging(self):
+        """
+        Are we debugging the invoke?
+
+        Returns
+        -------
+        bool
+            True, if we are debugging the invoke ie. the Docker container will break into the debugger and wait for
+            attach
+        """
+        return bool(self.debug_port)
+
+    def _get_invoke_config(self, function):
+        """
+        Returns invoke configuration to pass to Lambda Runtime to invoke the given function
+
+        :param samcli.commands.local.lib.provider.Function function: Lambda function to generate the configuration for
+        :return samcli.local.lambdafn.config.FunctionConfig: Function configuration to pass to Lambda runtime
+        """
+
+        env_vars = self._make_env_vars(function)
+        code_abs_path = self._get_code_path(function.codeuri)
+
+        LOG.debug("Resolved absolute path to code is %s", code_abs_path)
+
+        return FunctionConfig(name=function.name,
+                              runtime=function.runtime,
+                              handler=function.handler,
+                              code_abs_path=code_abs_path,
+                              memory=function.memory,
+                              timeout=function.timeout,
+                              env_vars=env_vars)
+
+    def _make_env_vars(self, function):
+        """
+        Returns the environment variables configuration for this function
+
+        :param samcli.commands.local.lib.provider.Function function: Lambda function to generate the configuration for
+        :return samcli.local.lambdafn.env_vars.EnvironmentVariables: Environment variable configuration for this
+            function
+        """
+
+        name = function.name
+
+        variables = None
+        if function.environment and isinstance(function.environment, dict) and "Variables" in function.environment:
+            variables = function.environment["Variables"]
+        else:
+            LOG.debug("No environment variables found for function '%s'", name)
+
+        # This could either be in standard format, or a CloudFormation parameter file format.
+        #
+        # Standard format is {FunctionName: {key:value}, FunctionName: {key:value}}
+        # CloudFormation parameter file is {"Parameters": {key:value}}
+        if "Parameters" in self.env_vars_values:
+            LOG.debug("Environment variables overrides data is in CloudFormation parameter file format")
+            # CloudFormation parameter file format
+            overrides = self.env_vars_values["Parameters"]
+        else:
+            # Standard format
+            LOG.debug("Environment variables overrides data is standard format")
+            overrides = self.env_vars_values.get(name, None)
+
+        shell_env = os.environ
+        aws_creds = self.get_aws_creds()
+
+        return EnvironmentVariables(function.memory,
+                                    function.timeout,
+                                    function.handler,
+                                    variables=variables,
+                                    shell_env_values=shell_env,
+                                    override_values=overrides,
+                                    aws_creds=aws_creds)
+
+    def _get_code_path(self, codeuri):
+        """
+        Returns path to the function code resolved based on current working directory.
+
+        :param string codeuri: CodeURI of the function. This should contain the path to the function code
+        :return string: Absolute path to the function code
+        """
+
+        LOG.debug("Resolving code path. Cwd=%s, CodeUri=%s", self.cwd, codeuri)
+
+        # First, let us figure out the current working directory.
+        # If current working directory is not provided, then default to the directory where the CLI is running from
+        if not self.cwd or self.cwd == self.PRESENT_DIR:
+            self.cwd = os.getcwd()
+
+        # Make sure cwd is an absolute path
+        self.cwd = os.path.abspath(self.cwd)
+
+        # Next, let us get absolute path of function code.
+        # Codepath is always relative to current working directory
+        # If the path is relative, then construct the absolute version
+        if not os.path.isabs(codeuri):
+            codeuri = os.path.normpath(os.path.join(self.cwd, codeuri))
+
+        return codeuri
+
+    def get_aws_creds(self):
+        """
+        Returns AWS credentials obtained from the shell environment or given profile
+
+        :return dict: A dictionary containing credentials. This dict has the structure
+             {"region": "", "key": "", "secret": "", "sessiontoken": ""}. If credentials could not be resolved,
+             this returns None
+        """
+        result = {}
+
+        LOG.debug("Loading AWS credentials from session with profile '%s'", self.aws_profile)
+        session = boto3.session.Session(profile_name=self.aws_profile)
+
+        if not session:
+            return result
+
+        # Load the credentials from profile/environment
+        creds = session.get_credentials()
+
+        if not creds:
+            # If we were unable to load credentials, then just return empty. We will use the default
+            return result
+
+        # After loading credentials, region name might be available here.
+        if hasattr(session, 'region_name') and session.region_name:
+            result["region"] = session.region_name
+
+        # Only add the key, if its value is present
+        if hasattr(creds, 'access_key') and creds.access_key:
+            result["key"] = creds.access_key
+
+        if hasattr(creds, 'secret_key') and creds.secret_key:
+            result["secret"] = creds.secret_key
+
+        if hasattr(creds, 'token') and creds.token:
+            result["sessiontoken"] = creds.token
+
+        return result
diff --git a/samcli/commands/local/lib/provider.py b/samcli/commands/local/lib/provider.py
new file mode 100644
index 0000000000..7e3183fc7b
--- /dev/null
+++ b/samcli/commands/local/lib/provider.py
@@ -0,0 +1,105 @@
+"""
+A provider class that can parse and return Lambda Functions from a variety of sources. A SAM template is one such
+source
+"""
+
+from collections import namedtuple
+
+# Named Tuple to representing the properties of a Lambda Function
+Function = namedtuple("Function", [
+    # Function name or logical ID
+    "name",
+
+    # Runtime/language
+    "runtime",
+
+    # Memory in MBs
+    "memory",
+
+    # Function Timeout in seconds
+    "timeout",
+
+    # Name of the handler
+    "handler",
+
+    # Path to the code. This could be a S3 URI or local path or a dictionary of S3 Bucket, Key, Version
+    "codeuri",
+
+    # Environment variables. This is a dictionary with one key called Variables inside it. This contains the definition
+    # of environment variables
+    "environment",
+
+    # Lambda Execution IAM Role ARN. In the future, this can be used by Local Lambda runtime to assume the IAM role
+    # to get credentials to run the container with. This gives a much higher fidelity simulation of cloud Lambda.
+    "rolearn"
+])
+
+
+class FunctionProvider(object):
+    """
+    Abstract base class of the function provider.
+    """
+
+    def get(self, name):
+        """
+        Given name of the function, this method must return the Function object
+
+        :param string name: Name of the function
+        :return Function: namedtuple containing the Function information
+        """
+        raise NotImplementedError("not implemented")
+
+    def get_all(self):
+        """
+        Yields all the Lambda functions available in the provider.
+
+        :yields Function: namedtuple containing the function information
+        """
+        raise NotImplementedError("not implemented")
+
+
+_ApiTuple = namedtuple("Api", [
+
+    # String. Path that this API serves. Ex: /foo, /bar/baz
+    "path",
+
+    # String. HTTP Method this API responds with
+    "method",
+
+    # String. Name of the Function this API connects to
+    "function_name",
+
+    # Optional Dictionary containing CORS configuration on this path+method
+    # If this configuration is set, then API server will automatically respond to OPTIONS HTTP method on this path and
+    # respond with appropriate CORS headers based on configuration.
+    "cors",
+
+    # List(Str). List of the binary media types the API
+    "binary_media_types"
+])
+_ApiTuple.__new__.__defaults__ = (None,  # Cors is optional and defaults to None
+                                  []     # binary_media_types is optional and defaults to empty
+                                  )
+
+
+class Api(_ApiTuple):
+    def __hash__(self):
+        # Other properties are not a part of the hash
+        return hash(self.path) * hash(self.method) * hash(self.function_name)
+
+
+Cors = namedtuple("Cors", ["AllowOrigin", "AllowMethods", "AllowHeaders"])
+
+
+class ApiProvider(object):
+    """
+    Abstract base class to return APIs and the functions they route to
+    """
+
+    def get_all(self):
+        """
+        Yields all the APIs available.
+
+        :yields Api: namedtuple containing the API information
+        """
+        raise NotImplementedError("not implemented")
diff --git a/samcli/commands/local/lib/sam_api_provider.py b/samcli/commands/local/lib/sam_api_provider.py
new file mode 100644
index 0000000000..901dfbd8ac
--- /dev/null
+++ b/samcli/commands/local/lib/sam_api_provider.py
@@ -0,0 +1,468 @@
+"""Class that provides Apis from a SAM Template"""
+
+import logging
+from collections import namedtuple
+
+from six import string_types
+
+from samcli.commands.local.lib.swagger.parser import SwaggerParser
+from samcli.commands.local.lib.provider import ApiProvider, Api
+from samcli.commands.local.lib.sam_base_provider import SamBaseProvider
+from samcli.commands.local.lib.swagger.reader import SamSwaggerReader
+from samcli.commands.validate.lib.exceptions import InvalidSamDocumentException
+
+LOG = logging.getLogger(__name__)
+
+
+class SamApiProvider(ApiProvider):
+
+    _IMPLICIT_API_RESOURCE_ID = "ServerlessRestApi"
+    _SERVERLESS_FUNCTION = "AWS::Serverless::Function"
+    _SERVERLESS_API = "AWS::Serverless::Api"
+    _TYPE = "Type"
+
+    _FUNCTION_EVENT_TYPE_API = "Api"
+    _FUNCTION_EVENT = "Events"
+    _EVENT_PATH = "Path"
+    _EVENT_METHOD = "Method"
+
+    _ANY_HTTP_METHODS = ["GET",
+                         "DELETE",
+                         "PUT",
+                         "POST",
+                         "HEAD",
+                         "OPTIONS",
+                         "PATCH"]
+
+    def __init__(self, template_dict, cwd=None):
+        """
+        Initialize the class with SAM template data. The template_dict (SAM Templated) is assumed
+        to be valid, normalized and a dictionary. template_dict should be normalized by running any and all
+        pre-processing before passing to this class.
+        This class does not perform any syntactic validation of the template.
+
+        After the class is initialized, changes to ``template_dict`` will not be reflected in here.
+        You will need to explicitly update the class with new template, if necessary.
+
+        Parameters
+        ----------
+        template_dict : dict
+            SAM Template as a dictionary
+        cwd : str
+            Optional working directory with respect to which we will resolve relative path to Swagger file
+        """
+
+        self.template_dict = SamBaseProvider.get_template(template_dict)
+        self.resources = self.template_dict.get("Resources", {})
+
+        LOG.debug("%d resources found in the template", len(self.resources))
+
+        # Store a set of apis
+        self.cwd = cwd
+        self.apis = self._extract_apis(self.resources)
+
+        LOG.debug("%d APIs found in the template", len(self.apis))
+
+    def get_all(self):
+        """
+        Yields all the Lambda functions with Api Events available in the SAM Template.
+
+        :yields Api: namedtuple containing the Api information
+        """
+
+        for api in self.apis:
+            yield api
+
+    def _extract_apis(self, resources):
+        """
+        Extract all Implicit Apis (Apis defined through Serverless Function with an Api Event
+
+        :param dict resources: Dictionary of SAM/CloudFormation resources
+        :return: List of nametuple Api
+        """
+
+        # Some properties like BinaryMediaTypes, Cors are set once on the resource but need to be applied to each API.
+        # For Implicit APIs, which are defined on the Function resource, these properties
+        # are defined on a AWS::Serverless::Api resource with logical ID "ServerlessRestApi". Therefore, no matter
+        # if it is an implicit API or an explicit API, there is a corresponding resource of type AWS::Serverless::Api
+        # that contains these additional configurations.
+        #
+        # We use this assumption in the following loop to collect information from resources of type
+        # AWS::Serverless::Api. We also extract API from Serverless::Function resource and add them to the
+        # corresponding Serverless::Api resource. This is all done using the ``collector``.
+
+        collector = ApiCollector()
+
+        for logical_id, resource in resources.items():
+
+            resource_type = resource.get(SamApiProvider._TYPE)
+
+            if resource_type == SamApiProvider._SERVERLESS_FUNCTION:
+                self._extract_apis_from_function(logical_id, resource, collector)
+
+            if resource_type == SamApiProvider._SERVERLESS_API:
+                self._extract_from_serverless_api(logical_id, resource, collector)
+
+        apis = SamApiProvider._merge_apis(collector)
+        return self._normalize_apis(apis)
+
+    def _extract_from_serverless_api(self, logical_id, api_resource, collector):
+        """
+        Extract APIs from AWS::Serverless::Api resource by reading and parsing Swagger documents. The result is added
+        to the collector.
+
+        Parameters
+        ----------
+        logical_id : str
+            Logical ID of the resource
+
+        api_resource : dict
+            Resource definition, including its properties
+
+        collector : ApiCollector
+            Instance of the API collector that where we will save the API information
+        """
+
+        properties = api_resource.get("Properties", {})
+        body = properties.get("DefinitionBody")
+        uri = properties.get("DefinitionUri")
+        binary_media = properties.get("BinaryMediaTypes", [])
+
+        if not body and not uri:
+            # Swagger is not found anywhere.
+            LOG.debug("Skipping resource '%s'. Swagger document not found in DefinitionBody and DefinitionUri",
+                      logical_id)
+            return
+
+        reader = SamSwaggerReader(definition_body=body,
+                                  definition_uri=uri,
+                                  working_dir=self.cwd)
+        swagger = reader.read()
+        parser = SwaggerParser(swagger)
+        apis = parser.get_apis()
+        LOG.debug("Found '%s' APIs in resource '%s'", len(apis), logical_id)
+
+        collector.add_apis(logical_id, apis)
+        collector.add_binary_media_types(logical_id, parser.get_binary_media_types())  # Binary media from swagger
+        collector.add_binary_media_types(logical_id, binary_media)  # Binary media specified on resource in template
+
+    @staticmethod
+    def _merge_apis(collector):
+        """
+        Quite often, an API is defined both in Implicit and Explicit API definitions. In such cases, Implicit API
+        definition wins because that conveys clear intent that the API is backed by a function. This method will
+        merge two such list of Apis with the right order of precedence. If a Path+Method combination is defined
+        in both the places, only one wins.
+
+        Parameters
+        ----------
+        collector : ApiCollector
+            Collector object that holds all the APIs specified in the template
+
+        Returns
+        -------
+        list of samcli.commands.local.lib.provider.Api
+            List of APIs obtained by combining both the input lists.
+        """
+
+        implicit_apis = []
+        explicit_apis = []
+
+        # Store implicit and explicit APIs separately in order to merge them later in the correct order
+        # Implicit APIs are defined on a resource with logicalID ServerlessRestApi
+        for logical_id, apis in collector:
+            if logical_id == SamApiProvider._IMPLICIT_API_RESOURCE_ID:
+                implicit_apis.extend(apis)
+            else:
+                explicit_apis.extend(apis)
+
+        # We will use "path+method" combination as key to this dictionary and store the Api config for this combination.
+        # If an path+method combo already exists, then overwrite it if and only if this is an implicit API
+        all_apis = {}
+
+        # By adding implicit APIs to the end of the list, they will be iterated last. If a configuration was already
+        # written by explicit API, it will be overriden by implicit API, just by virtue of order of iteration.
+        all_configs = explicit_apis + implicit_apis
+
+        for config in all_configs:
+            # Normalize the methods before de-duping to allow an ANY method in implicit API to override a regular HTTP
+            # method on explicit API.
+            for normalized_method in SamApiProvider._normalize_http_methods(config.method):
+                key = config.path + normalized_method
+                all_apis[key] = config
+
+        result = set(all_apis.values())  # Assign to a set() to de-dupe
+        LOG.debug("Removed duplicates from '%d' Explicit APIs and '%d' Implicit APIs to produce '%d' APIs",
+                  len(explicit_apis), len(implicit_apis), len(result))
+
+        return list(result)
+
+    @staticmethod
+    def _normalize_apis(apis):
+        """
+        Normalize the APIs to use standard method name
+
+        Parameters
+        ----------
+        apis : list of samcli.commands.local.lib.provider.Api
+            List of APIs to replace normalize
+
+        Returns
+        -------
+        list of samcli.commands.local.lib.provider.Api
+            List of normalized APIs
+        """
+
+        result = list()
+        for api in apis:
+            for normalized_method in SamApiProvider._normalize_http_methods(api.method):
+                # _replace returns a copy of the namedtuple. This is the official way of creating copies of namedtuple
+                result.append(api._replace(method=normalized_method))
+
+        return result
+
+    @staticmethod
+    def _extract_apis_from_function(logical_id, function_resource, collector):
+        """
+        Fetches a list of APIs configured for this SAM Function resource.
+
+        Parameters
+        ----------
+        logical_id : str
+            Logical ID of the resource
+
+        function_resource : dict
+            Contents of the function resource including its properties
+
+        collector : ApiCollector
+            Instance of the API collector that where we will save the API information
+        """
+
+        resource_properties = function_resource.get("Properties", {})
+        serverless_function_events = resource_properties.get(SamApiProvider._FUNCTION_EVENT, {})
+        SamApiProvider._extract_apis_from_events(logical_id, serverless_function_events, collector)
+
+    @staticmethod
+    def _extract_apis_from_events(function_logical_id, serverless_function_events, collector):
+        """
+        Given an AWS::Serverless::Function Event Dictionary, extract out all 'Api' events and store  within the
+        collector
+
+        Parameters
+        ----------
+        function_logical_id : str
+            LogicalId of the AWS::Serverless::Function
+
+        serverless_function_events : dict
+            Event Dictionary of a AWS::Serverless::Function
+
+        collector : ApiCollector
+            Instance of the API collector that where we will save the API information
+        """
+        count = 0
+        for _, event in serverless_function_events.items():
+
+            if SamApiProvider._FUNCTION_EVENT_TYPE_API == event.get(SamApiProvider._TYPE):
+                api_resource_id, api = SamApiProvider._convert_event_api(function_logical_id, event.get("Properties"))
+                collector.add_apis(api_resource_id, [api])
+                count += 1
+
+        LOG.debug("Found '%d' API Events in Serverless function with name '%s'", count, function_logical_id)
+
+    @staticmethod
+    def _convert_event_api(lambda_logical_id, event_properties):
+        """
+        Converts a AWS::Serverless::Function's Event Property to an Api configuration usable by the provider.
+
+        :param str lambda_logical_id: Logical Id of the AWS::Serverless::Function
+        :param dict event_properties: Dictionary of the Event's Property
+        :return tuple: tuple of API resource name and Api namedTuple
+        """
+        path = event_properties.get(SamApiProvider._EVENT_PATH)
+        method = event_properties.get(SamApiProvider._EVENT_METHOD)
+
+        # An API Event, can have RestApiId property which designates the resource that owns this API. If omitted,
+        # the API is owned by Implicit API resource. This could either be a direct resource logical ID or a
+        # "Ref" of the logicalID
+        api_resource_id = event_properties.get("RestApiId", SamApiProvider._IMPLICIT_API_RESOURCE_ID)
+        if isinstance(api_resource_id, dict) and "Ref" in api_resource_id:
+            api_resource_id = api_resource_id["Ref"]
+
+        # This is still a dictionary. Something wrong with the template
+        if isinstance(api_resource_id, dict):
+            LOG.debug("Invalid RestApiId property of event %s", event_properties)
+            raise InvalidSamDocumentException("RestApiId property of resource with logicalId '{}' is invalid. "
+                                              "It should either be a LogicalId string or a Ref of a Logical Id string"
+                                              .format(lambda_logical_id))
+
+        return api_resource_id, Api(path=path, method=method, function_name=lambda_logical_id)
+
+    @staticmethod
+    def _normalize_http_methods(http_method):
+        """
+        Normalizes Http Methods. Api Gateway allows a Http Methods of ANY. This is a special verb to denote all
+        supported Http Methods on Api Gateway.
+
+        :param str http_method: Http method
+        :yield str: Either the input http_method or one of the _ANY_HTTP_METHODS (normalized Http Methods)
+        """
+
+        if http_method.upper() == 'ANY':
+            for method in SamApiProvider._ANY_HTTP_METHODS:
+                yield method.upper()
+        else:
+            yield http_method.upper()
+
+
+class ApiCollector(object):
+    """
+    Class to store the API configurations in the SAM Template. This class helps store both implicit and explicit
+    APIs in a standardized format
+    """
+
+    # Properties of each API. The structure is quite similar to the properties of AWS::Serverless::Api resource.
+    # This is intentional because it allows us to easily extend this class to support future properties on the API.
+    # We will store properties of Implicit APIs also in this format which converges the handling of implicit & explicit
+    # APIs.
+    Properties = namedtuple("Properties", ["apis", "binary_media_types", "cors"])
+
+    def __init__(self):
+        # API properties stored per resource. Key is the LogicalId of the AWS::Serverless::Api resource and
+        # value is the properties
+        self.by_resource = {}
+
+    def __iter__(self):
+        """
+        Iterator to iterate through all the APIs stored in the collector. In each iteration, this yields the
+        LogicalId of the API resource and a list of APIs available in this resource.
+
+        Yields
+        -------
+        str
+            LogicalID of the AWS::Serverless::Api resource
+        list samcli.commands.local.lib.provider.Api
+            List of the API available in this resource along with additional configuration like binary media types.
+        """
+
+        for logical_id, _ in self.by_resource.items():
+            yield logical_id, self._get_apis_with_config(logical_id)
+
+    def add_apis(self, logical_id, apis):
+        """
+        Stores the given APIs tagged under the given logicalId
+
+        Parameters
+        ----------
+        logical_id : str
+            LogicalId of the AWS::Serverless::Api resource
+
+        apis : list of samcli.commands.local.lib.provider.Api
+            List of APIs available in this resource
+        """
+        properties = self._get_properties(logical_id)
+        properties.apis.extend(apis)
+
+    def add_binary_media_types(self, logical_id, binary_media_types):
+        """
+        Stores the binary media type configuration for the API with given logical ID
+
+        Parameters
+        ----------
+        logical_id : str
+            LogicalId of the AWS::Serverless::Api resource
+
+        binary_media_types : list of str
+            List of binary media types supported by this resource
+
+        """
+        properties = self._get_properties(logical_id)
+
+        binary_media_types = binary_media_types or []
+        for value in binary_media_types:
+            normalized_value = self._normalize_binary_media_type(value)
+
+            # If the value is not supported, then just skip it.
+            if normalized_value:
+                properties.binary_media_types.add(normalized_value)
+            else:
+                LOG.debug("Unsupported data type of binary media type value of resource '%s'", logical_id)
+
+    def _get_apis_with_config(self, logical_id):
+        """
+        Returns the list of APIs in this resource along with other extra configuration such as binary media types,
+        cors etc. Additional configuration is merged directly into the API data because these properties, although
+        defined globally, actually apply to each API.
+
+        Parameters
+        ----------
+        logical_id : str
+            Logical ID of the resource to fetch data for
+
+        Returns
+        -------
+        list of samcli.commands.local.lib.provider.Api
+            List of APIs with additional configurations for the resource with given logicalId. If there are no APIs,
+            then it returns an empty list
+        """
+
+        properties = self._get_properties(logical_id)
+
+        # These configs need to be applied to each API
+        binary_media = sorted(list(properties.binary_media_types))  # Also sort the list to keep the ordering stable
+        cors = properties.cors
+
+        result = []
+        for api in properties.apis:
+            # Create a copy of the API with updated configuration
+            updated_api = api._replace(binary_media_types=binary_media,
+                                       cors=cors)
+            result.append(updated_api)
+
+        return result
+
+    def _get_properties(self, logical_id):
+        """
+        Returns the properties of resource with given logical ID. If a resource is not found, then it returns an
+        empty data.
+
+        Parameters
+        ----------
+        logical_id : str
+            Logical ID of the resource
+
+        Returns
+        -------
+        samcli.commands.local.lib.sam_api_provider.ApiCollector.Properties
+            Properties object for this resource.
+        """
+
+        if logical_id not in self.by_resource:
+            self.by_resource[logical_id] = self.Properties(apis=[],
+                                                           # Use a set() to be able to easily de-dupe
+                                                           binary_media_types=set(),
+                                                           cors=None)
+
+        return self.by_resource[logical_id]
+
+    @staticmethod
+    def _normalize_binary_media_type(value):
+        """
+        Converts binary media types values to the canonical format. Ex: image~1gif -> image/gif. If the value is not
+        a string, then this method just returns None
+
+        Parameters
+        ----------
+        value : str
+            Value to be normalized
+
+        Returns
+        -------
+        str or None
+            Normalized value. If the input was not a string, then None is returned
+        """
+
+        if not isinstance(value, string_types):
+            # It is possible that user specified a dict value for one of the binary media types. We just skip them
+            return None
+
+        return value.replace("~1", "/")
diff --git a/samcli/commands/local/lib/sam_base_provider.py b/samcli/commands/local/lib/sam_base_provider.py
new file mode 100644
index 0000000000..50c6f94b78
--- /dev/null
+++ b/samcli/commands/local/lib/sam_base_provider.py
@@ -0,0 +1,19 @@
+"""
+Base class for SAM Template providers
+"""
+
+from samcli.lib.samlib.wrapper import SamTranslatorWrapper
+
+
+class SamBaseProvider(object):
+    """
+    Base class for SAM Template providers
+    """
+
+    @staticmethod
+    def get_template(template_dict):
+        template_dict = template_dict or {}
+        if template_dict:
+            template_dict = SamTranslatorWrapper(template_dict).run_plugins()
+
+        return template_dict
diff --git a/samcli/commands/local/lib/sam_function_provider.py b/samcli/commands/local/lib/sam_function_provider.py
new file mode 100644
index 0000000000..395c8961f2
--- /dev/null
+++ b/samcli/commands/local/lib/sam_function_provider.py
@@ -0,0 +1,163 @@
+"""
+Class that provides functions from a given SAM template
+"""
+
+import logging
+import six
+
+from .provider import FunctionProvider, Function
+from .sam_base_provider import SamBaseProvider
+
+LOG = logging.getLogger(__name__)
+
+
+class SamFunctionProvider(FunctionProvider):
+    """
+    Fetches and returns Lambda Functions from a SAM Template. The SAM template passed to this provider is assumed
+    to be valid, normalized and a dictionary.
+
+    It may or may not contain a function.
+    """
+
+    _SERVERLESS_FUNCTION = "AWS::Serverless::Function"
+    _LAMBDA_FUNCTION = "AWS::Lambda::Function"
+    _DEFAULT_CODEURI = "."
+
+    def __init__(self, template_dict):
+        """
+        Initialize the class with SAM template data. The SAM template passed to this provider is assumed
+        to be valid, normalized and a dictionary. It should be normalized by running all pre-processing
+        before passing to this class. The process of normalization will remove structures like ``Globals``, resolve
+        intrinsic functions etc.
+        This class does not perform any syntactic validation of the template.
+
+        After the class is initialized, any changes to the ``template_dict`` will not be reflected in here.
+        You need to explicitly update the class with new template, if necessary.
+
+        :param dict template_dict: SAM Template as a dictionary
+        """
+
+        self.template_dict = SamBaseProvider.get_template(template_dict)
+        self.resources = self.template_dict.get("Resources", {})
+
+        LOG.debug("%d resources found in the template", len(self.resources))
+
+        # Store a map of function name to function information for quick reference
+        self.functions = self._extract_functions(self.resources)
+
+    def get(self, name):
+        """
+        Returns the function given name or LogicalId of the function. Every SAM resource has a logicalId, but it may
+        also have a function name. This method searches only for LogicalID and returns the function that matches
+        it.
+
+        :param string name: Name of the function
+        :return Function: namedtuple containing the Function information if function is found.
+                          None, if function is not found
+        :raises ValueError If name is not given
+        """
+
+        if not name:
+            raise ValueError("Function name is required")
+
+        return self.functions.get(name)
+
+    def get_all(self):
+        """
+        Yields all the Lambda functions available in the SAM Template.
+
+        :yields Function: namedtuple containing the function information
+        """
+
+        for _, function in self.functions.items():
+            yield function
+
+    @staticmethod
+    def _extract_functions(resources):
+        """
+        Extracts and returns function information from the given dictionary of SAM/CloudFormation resources. This
+        method supports functions defined with AWS::Serverless::Function and AWS::Lambda::Function
+
+        :param dict resources: Dictionary of SAM/CloudFormation resources
+        :return dict(string : samcli.commands.local.lib.provider.Function): Dictionary of function LogicalId to the
+            Function configuration object
+        """
+
+        result = {}
+
+        for name, resource in resources.items():
+
+            resource_type = resource.get("Type")
+            resource_properties = resource.get("Properties", {})
+
+            if resource_type == SamFunctionProvider._SERVERLESS_FUNCTION:
+                result[name] = SamFunctionProvider._convert_sam_function_resource(name, resource_properties)
+
+            elif resource_type == SamFunctionProvider._LAMBDA_FUNCTION:
+                result[name] = SamFunctionProvider._convert_lambda_function_resource(name, resource_properties)
+
+            # We don't care about other resource types. Just ignore them
+
+        return result
+
+    @staticmethod
+    def _convert_sam_function_resource(name, resource_properties):
+        """
+        Converts a AWS::Serverless::Function resource to a Function configuration usable by the provider.
+
+        :param string name: LogicalID of the resource NOTE: This is *not* the function name because not all functions
+            declare a name
+        :param dict resource_properties: Properties of this resource
+        :return samcli.commands.local.lib.provider.Function: Function configuration
+        """
+
+        codeuri = resource_properties.get("CodeUri", SamFunctionProvider._DEFAULT_CODEURI)
+
+        # CodeUri can be a dictionary of S3 Bucket/Key or a S3 URI, neither of which are supported
+        if isinstance(codeuri, dict) or \
+                (isinstance(codeuri, six.string_types) and codeuri.startswith("s3://")):
+
+            codeuri = SamFunctionProvider._DEFAULT_CODEURI
+            LOG.warning("Lambda function '%s' has specified S3 location for CodeUri which is unsupported. "
+                        "Using default value of '%s' instead", name, codeuri)
+
+        LOG.debug("Found Serverless function with name='%s' and CodeUri='%s'", name, codeuri)
+
+        return Function(
+            name=name,
+            runtime=resource_properties.get("Runtime"),
+            memory=resource_properties.get("MemorySize"),
+            timeout=resource_properties.get("Timeout"),
+            handler=resource_properties.get("Handler"),
+            codeuri=codeuri,
+            environment=resource_properties.get("Environment"),
+            rolearn=resource_properties.get("Role")
+        )
+
+    @staticmethod
+    def _convert_lambda_function_resource(name, resource_properties):  # pylint: disable=invalid-name
+        """
+        Converts a AWS::Serverless::Function resource to a Function configuration usable by the provider.
+
+        :param string name: LogicalID of the resource NOTE: This is *not* the function name because not all functions
+            declare a name
+        :param dict resource_properties: Properties of this resource
+        :return samcli.commands.local.lib.provider.Function: Function configuration
+        """
+
+        # CodeUri is set to "." in order to get code locally from current directory. AWS::Lambda::Function's ``Code``
+        # property does not support specifying a local path
+        codeuri = SamFunctionProvider._DEFAULT_CODEURI
+
+        LOG.debug("Found Lambda function with name='%s' and CodeUri='%s'", name, codeuri)
+
+        return Function(
+            name=name,
+            runtime=resource_properties.get("Runtime"),
+            memory=resource_properties.get("MemorySize"),
+            timeout=resource_properties.get("Timeout"),
+            handler=resource_properties.get("Handler"),
+            codeuri=codeuri,
+            environment=resource_properties.get("Environment"),
+            rolearn=resource_properties.get("Role")
+        )
diff --git a/samcli/commands/local/lib/swagger/__init__.py b/samcli/commands/local/lib/swagger/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/lib/swagger/integration_uri.py b/samcli/commands/local/lib/swagger/integration_uri.py
new file mode 100644
index 0000000000..fd0c169b97
--- /dev/null
+++ b/samcli/commands/local/lib/swagger/integration_uri.py
@@ -0,0 +1,275 @@
+"""
+Handles parsing of Swagger Integration data. This contains the arn of the Lambda function it connects to,
+integration type, response template etc.
+"""
+
+import re
+import logging
+
+from enum import Enum
+from six import string_types
+
+LOG = logging.getLogger(__name__)
+
+
+class LambdaUri(object):
+    """
+    Purely static class that helps you parse Lambda Function Integration URI ARN
+    """
+
+    _FN_SUB = "Fn::Sub"
+
+    # From an ARN like below, extract just the Lambda Function ARN
+    # arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:123456789012:function:Calculator:ProdAlias/invocations  # NOQA
+    _REGEX_GET_FUNCTION_ARN = r'.*/functions/(.*)/invocations'
+
+    # From Lamdba Function ARN like below, extract the function name. Note, the [^:] syntax is to capture only function
+    # name and exclude the Alias name that can optionally follow it.
+    # arn:aws:lambda:us-west-2:123456789012:function:Calculator:ProdAlias
+    _REGEX_GET_FUNCTION_NAME = r'.*:function:([^:]*)'
+
+    # ${stageVariable.MyFunctionName}
+    _REGEX_STAGE_VARIABLE = r'\$\{stageVariables\..+\}'
+
+    # Got this regex from Lambda's CreateFunction API docs
+    _REGEX_VALID_FUNCTION_NAME = r'([a-zA-Z0-9-_]+)'
+
+    # Get the function name from variables within Fn::Sub. Supports ${Resource.Arn} and ${Resource.Alias}
+    # Ex: "arn:aws:apigateway:function/${LambdaFunction.Arn}/invocations => ${LambdaFunction.Arn} => LambdaFunction
+    _REGEX_SUB_FUNCTION_ARN = r'\$\{([A-Za-z0-9]+)\.(Arn|Alias)\}'
+
+    @staticmethod
+    def get_function_name(integration_uri):
+        """
+        Gets the name of the function from the Integration URI ARN. This is a best effort service which returns None
+        if function name could not be parsed. This can happen when the ARN is an intrinsic function which is too
+        complex or the ARN is not a Lambda integration.
+
+        Parameters
+        ----------
+        integration_uri : basestring or dict
+            Integration URI data extracted from Swagger dictionary. This could be a string of the ARN or an intrinsic
+            function that will resolve to the ARN
+
+        Returns
+        -------
+        basestring or None
+            If the function name could be parsed out of the Integration URI ARN. None, otherwise
+        """
+
+        arn = LambdaUri._get_function_arn(integration_uri)
+
+        LOG.debug("Extracted Function ARN: %s", arn)
+
+        return LambdaUri._get_function_name_from_arn(arn)
+
+    @staticmethod
+    def _get_function_arn(uri_data):
+        """
+        Integration URI can be expressed in various shapes and forms. This method normalizes the Integration URI ARN
+        and returns the Lambda Function ARN. Here are the different forms of Integration URI ARN:
+
+        - String:
+            - Fully resolved ARN
+            - ARN with Stage Variables:
+              Ex: arn:aws:apigateway:ap-southeast-2:lambda:path/2015-03-31/functions/arn:aws:lambda:ap-southeast-2:123456789012:function:${stageVariables.PostFunctionName}/invocations  # NOQA
+
+        - Dictionary: Usually contains intrinsic functions
+
+            - Fn::Sub:
+              Example:
+              {
+                "Fn::Sub":
+                  "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${LambdaFunction.Arn}/invocations"
+              }
+
+            - Fn::Join: **Unsupported**. It is very hard to combine the joins into one string especially when
+              certain properties are resolved only at runtime.
+
+            - Ref, Fn::GetAtt: **Unsupported**. Impossible to use these intrinsics with integration URI. CFN doesn't
+              support this functionality.
+
+        Note
+        ~~~~
+        This method supports only a very restricted subset of intrinsic functions with Swagger document. This is the
+        best we can do without implementing a full blown intrinsic function resolution module.
+
+        Parameters
+        ----------
+        uri_data : string or dict
+            Value of Integration URI. It can either be a string or an intrinsic function that resolves to a string
+
+        Returns
+        -------
+        basestring or None
+            Lambda Function ARN extracted from Integration URI. None, if it cannot get function Arn
+        """
+
+        if not uri_data:
+            return None
+
+        if LambdaUri._is_sub_intrinsic(uri_data):
+            uri_data = LambdaUri._resolve_fn_sub(uri_data)
+            LOG.debug("Resolved Sub intrinsic function: %s", uri_data)
+
+        # Even after processing intrinsics, this is not a string. Give up.
+        if not isinstance(uri_data, string_types):
+            LOG.debug("This Integration URI format is not supported: %s", uri_data)
+            return None
+
+        # uri_data is a string.
+        # Let's check if it is actually a Lambda Integration URI and if so, extract the Function ARN
+        matches = re.match(LambdaUri._REGEX_GET_FUNCTION_ARN, uri_data)
+        if not matches or not matches.groups():
+            LOG.debug("Ignoring Integration URI because it is not a Lambda Function integration: %s", uri_data)
+            return None
+
+        groups = matches.groups()
+        return groups[0]  # First group in the regex is the Lambda Function ARN
+
+    @staticmethod
+    def _get_function_name_from_arn(function_arn):
+        """
+        Given the integration ARN, extract the Lambda function name from the ARN. If there
+        are stage variables, or other unsupported formats, this function will return None.
+
+        Parameters
+        ----------
+        function_arn : basestring or None
+            Function ARN from the swagger document
+
+        Returns
+        -------
+        basestring or None
+            Function name of this integration. None if the ARN is not parsable
+        """
+
+        if not function_arn:
+            return None
+
+        matches = re.match(LambdaUri._REGEX_GET_FUNCTION_NAME, function_arn)
+        if not matches or not matches.groups():
+            LOG.debug("No Lambda function ARN defined for integration containing ARN %s", function_arn)
+            return None
+
+        groups = matches.groups()
+        maybe_function_name = groups[0]  # This regex has only one group match
+
+        # Function name could be a real name or a stage variable or some unknown format
+        if re.match(LambdaUri._REGEX_STAGE_VARIABLE, maybe_function_name):
+            # yes, this is a stage variable
+            LOG.debug("Stage variables are not supported. Ignoring integration with function ARN %s", function_arn)
+            return None
+
+        elif re.match(LambdaUri._REGEX_VALID_FUNCTION_NAME, maybe_function_name):
+            # Yes, this is a real function name
+            return maybe_function_name
+
+        # Some unknown format
+        LOG.debug("Ignoring integration ARN. Unable to parse Function Name from function arn %s",
+                  function_arn)
+
+    @staticmethod
+    def _resolve_fn_sub(uri_data):
+        """
+        Tries to resolve an Integration URI which contains Fn::Sub intrinsic function. This method tries to resolve
+        and produce a string output.
+
+        Example:
+        {
+          "Fn::Sub":
+            "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${LambdaFunction.Arn}/invocations"
+        }
+
+        Fn::Sub Processing:
+        ~~~~~~~~~~~~~~~~~~
+
+        If this is a Fn::Sub, resolve as following:
+            1. Get the ARN String:
+                - If Sub is using the array syntax, then use element which is a string.
+                - If Sub is using string syntax, then just use the string.
+            2. If there is a ${XXX.Arn} then replace it with a dummy ARN
+            3. Otherwise skip it
+
+        .. code:
+            Input:
+            {
+              "Fn::Sub":
+                "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${LambdaFunction.Arn}/invocations"
+            }
+
+            Output: "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:LambdaFunction/invocations"  # NOQA
+
+        Note
+        ~~~~
+        This method supports only a very restricted subset of intrinsic functions with Swagger document. This is the
+        best we can do without implementing a full blown intrinsic function resolution module.
+
+        Parameters
+        ----------
+        uri_data : string or dict
+            Value of Integration URI. It can either be a string or an intrinsic function that resolves to a string
+
+        Returns
+        -------
+        string
+            Integration URI as a string, if we were able to resolve the Sub intrinsic
+        dict
+            Input data is returned unmodified if we are unable to resolve the intrinsic
+        """
+
+        # Try the short form of Fn::Sub syntax where the value is the ARN
+        arn = uri_data[LambdaUri._FN_SUB]
+
+        if isinstance(arn, list):
+            # This is the long form of Fn::Sub syntax
+            #
+            # {
+            #   "Fn::Sub":[ "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyARn}/invocations",
+            #               {"MyARn": {"Ref": MyFunction"}
+            #             ]
+            # }
+            #
+            # Get the ARN out of the list
+            arn = arn[0]
+
+        if not isinstance(arn, string_types):
+            # Even after all the processing, ARN is still not a string. Probably customer provided wrong syntax
+            # for Fn::Sub. Let's skip this altogether
+            LOG.debug("Unable to resolve Fn::Sub value for integration URI: %s", uri_data)
+            return uri_data
+
+        # Now finally we got the ARN string. Let us try to resolve it.
+        # We only support value of type ${XXX.Arn} or ${YYY.Alias}. The `.Alias` syntax is a SAM specific intrinsic
+        # to get ARN of Lambda Alias when using DeploymentPreference
+        lambda_function_arn_template = r'arn:aws:lambda:${AWS::Region}:123456789012:function:\1'
+
+        return re.sub(LambdaUri._REGEX_SUB_FUNCTION_ARN,  # Find all ${blah} patterns
+                      # Replace with Lambda Function ARN, where function name is from pattern
+                      lambda_function_arn_template,
+                      arn)
+
+    @staticmethod
+    def _is_sub_intrinsic(data):
+        """
+        Is this input data a Fn::Sub intrinsic function
+
+        Parameters
+        ----------
+        data
+            Data to check
+
+        Returns
+        -------
+        bool
+            True if the data Fn::Sub intrinsic function
+        """
+        return isinstance(data, dict) and len(data) == 1 and LambdaUri._FN_SUB in data
+
+
+class IntegrationType(Enum):
+    # Mainly used with Lambda integration
+    aws_proxy = "aws_proxy"
+
+    # Mainly used if someone specifies CORS response in Swagger
+    mock = "mock"
diff --git a/samcli/commands/local/lib/swagger/parser.py b/samcli/commands/local/lib/swagger/parser.py
new file mode 100644
index 0000000000..f475eb2cee
--- /dev/null
+++ b/samcli/commands/local/lib/swagger/parser.py
@@ -0,0 +1,121 @@
+"""Handles Swagger Parsing"""
+
+import logging
+
+from samcli.commands.local.lib.provider import Api
+from samcli.commands.local.lib.swagger.integration_uri import LambdaUri, IntegrationType
+
+LOG = logging.getLogger(__name__)
+
+
+class SwaggerParser(object):
+
+    _INTEGRATION_KEY = "x-amazon-apigateway-integration"
+    _ANY_METHOD_EXTENSION_KEY = "x-amazon-apigateway-any-method"
+    _BINARY_MEDIA_TYPES_EXTENSION_KEY = "x-amazon-apigateway-binary-media-types"  # pylint: disable=C0103
+    _ANY_METHOD = "ANY"
+
+    def __init__(self, swagger):
+        """
+        Constructs an Swagger Parser object
+
+        :param dict swagger: Dictionary representation of a Swagger document
+        """
+        self.swagger = swagger or {}
+
+    def get_binary_media_types(self):
+        """
+        Get the list of Binary Media Types from Swagger
+
+        Returns
+        -------
+        list of str
+            List of strings that represent the Binary Media Types for the API, defaulting to empty list is None
+
+        """
+        return self.swagger.get(self._BINARY_MEDIA_TYPES_EXTENSION_KEY) or []
+
+    def get_apis(self):
+        """
+        Parses a swagger document and returns a list of APIs configured in the document.
+
+        Swagger documents have the following structure
+        {
+            "/path1": {    # path
+                "get": {   # method
+                    "x-amazon-apigateway-integration": {   # integration
+                        "type": "aws_proxy",
+
+                        # URI contains the Lambda function ARN that needs to be parsed to get Function Name
+                        "uri": {
+                            "Fn::Sub":
+                                "arn:aws:apigateway:aws:lambda:path/2015-03-31/functions/${LambdaFunction.Arn}/..."
+                        }
+                    }
+                },
+                "post": {
+                },
+            },
+            "/path2": {
+                ...
+            }
+        }
+
+        Returns
+        -------
+        list of samcli.commands.local.lib.provider.Api
+            List of APIs that are configured in the Swagger document
+        """
+
+        result = []
+        paths_dict = self.swagger.get("paths", {})
+
+        binary_media_types = self.get_binary_media_types()
+
+        for full_path, path_config in paths_dict.items():
+            for method, method_config in path_config.items():
+
+                function_name = self._get_integration_function_name(method_config)
+                if not function_name:
+                    LOG.debug("Lambda function integration not found in Swagger document at path='%s' method='%s'",
+                              full_path, method)
+                    continue
+
+                if method.lower() == self._ANY_METHOD_EXTENSION_KEY:
+                    # Convert to a more commonly used method notation
+                    method = self._ANY_METHOD
+
+                api = Api(path=full_path, method=method, function_name=function_name, cors=None,
+                          binary_media_types=binary_media_types)
+                result.append(api)
+
+        return result
+
+    def _get_integration_function_name(self, method_config):
+        """
+        Tries to parse the Lambda Function name from the Integration defined in the method configuration.
+        Integration configuration is defined under the special "x-amazon-apigateway-integration" key. We care only
+        about Lambda integrations, which are of type aws_proxy, and ignore the rest. Integration URI is complex and
+        hard to parse. Hence we do our best to extract function name out of integration URI. If not possible, we
+        return None.
+
+        Parameters
+        ----------
+        method_config : dict
+            Dictionary containing the method configuration which might contain integration settings
+
+        Returns
+        -------
+        string or None
+            Lambda function name, if possible. None, if not.
+        """
+        if not isinstance(method_config, dict) or self._INTEGRATION_KEY not in method_config:
+            return None
+
+        integration = method_config[self._INTEGRATION_KEY]
+
+        if integration \
+                and isinstance(integration, dict) \
+                and integration.get("type") == IntegrationType.aws_proxy.value:
+            # Integration must be "aws_proxy" otherwise we don't care about it
+            return LambdaUri.get_function_name(integration.get("uri"))
diff --git a/samcli/commands/local/lib/swagger/reader.py b/samcli/commands/local/lib/swagger/reader.py
new file mode 100644
index 0000000000..e7e92f58af
--- /dev/null
+++ b/samcli/commands/local/lib/swagger/reader.py
@@ -0,0 +1,282 @@
+"""
+Read Swagger documents from variety of sources
+"""
+
+import os
+import tempfile
+import logging
+
+import boto3
+import botocore
+
+from six import string_types
+from six.moves.urllib.parse import urlparse, parse_qs  # pylint: disable=relative-import
+from samcli.yamlhelper import yaml_parse
+
+LOG = logging.getLogger(__name__)
+_FN_TRANSFORM = "Fn::Transform"
+
+
+def parse_aws_include_transform(data):
+    """
+    If the input data is an AWS::Include data, then parse and return the location of the included file.
+
+    AWS::Include transform data usually has the following format:
+    {
+        "Fn::Transform": {
+            "Name": "AWS::Include",
+            "Parameters": {
+                "Location": "s3://MyAmazonS3BucketName/swagger.yaml"
+            }
+        }
+    }
+
+    Parameters
+    ----------
+    data : dict
+        Dictionary data to parse
+
+    Returns
+    -------
+    str
+        Location of the included file, if available. None, otherwise
+    """
+
+    if not data:
+        return
+
+    if _FN_TRANSFORM not in data:
+        return
+
+    transform_data = data[_FN_TRANSFORM]
+
+    name = transform_data.get("Name")
+    location = transform_data.get("Parameters", {}).get("Location")
+    if name == "AWS::Include":
+        LOG.debug("Successfully parsed location from AWS::Include transform: %s", location)
+        return location
+
+
+class SamSwaggerReader(object):
+    """
+    Class to read and parse Swagger document from a variety of sources. This class accepts the same data formats as
+    available in Serverless::Api SAM resource
+    """
+
+    def __init__(self, definition_body=None, definition_uri=None, working_dir=None):
+        """
+        Initialize the class with swagger location
+
+        Parameters
+        ----------
+        definition_body : dict
+            Swagger document as a dictionary directly or inlined using AWS::Include transform.
+
+        definition_uri : str or dict
+            Location of the Swagger file. Supports three formats:
+                - S3 URI Ex: ``s3://mybucket/swagger.yaml``
+                - S3 URI as a dictionary Ex: ``{"Bucket": "mybucket", "Key": "swagger.yaml", "Version": "123"}``
+                - Local file path either as absolute or relative path Ex: ``./swagger.yaml``. Relative paths are
+                  resolved to with respect to the given working directory.
+
+        working_dir : str
+            Path to the working directory with respect which we will resolve local relative paths
+        """
+        self.definition_body = definition_body
+        self.definition_uri = definition_uri
+        self.working_dir = working_dir
+
+        if not self.definition_body and not self.definition_uri:
+            raise ValueError("Require value for either DefinitionBody or DefinitionUri")
+
+    def read(self):
+        """
+        Gets the Swagger document from either of the given locations. If we fail to retrieve or parse the Swagger
+        file, this method will return None.
+
+        Returns
+        -------
+        dict:
+            Swagger document. None, if we cannot retrieve the document
+        """
+
+        swagger = None
+
+        # First check if there is inline swagger
+        if self.definition_body:
+            swagger = self._read_from_definition_body()
+
+        if not swagger and self.definition_uri:
+            # If not, then try to download it from the given URI
+            swagger = self._download_swagger(self.definition_uri)
+
+        return swagger
+
+    def _read_from_definition_body(self):
+        """
+        Read the Swagger document from DefinitionBody. It could either be an inline Swagger dictionary or an
+        AWS::Include macro that contains location of the included Swagger. In the later case, we will download and
+        parse the Swagger document.
+
+        Returns
+        -------
+        dict
+            Swagger document, if we were able to parse. None, otherwise
+        """
+
+        # Let's try to parse it as AWS::Include Transform first. If not, then fall back to assuming the Swagger document
+        # was inclined directly into the body
+        location = parse_aws_include_transform(self.definition_body)
+        if location:
+            LOG.debug("Trying to download Swagger from %s", location)
+            return self._download_swagger(location)
+
+        # Inline Swagger, just return the contents which should already be a dictionary
+        LOG.debug("Detected Inline Swagger definition")
+        return self.definition_body
+
+    def _download_swagger(self, location):
+        """
+        Download the file from given local or remote location and return it
+
+        Parameters
+        ----------
+        location : str or dict
+            Local path or S3 path to Swagger file to download. Consult the ``__init__.py`` documentation for specifics
+            on structure of this property.
+
+        Returns
+        -------
+        dict or None
+            Downloaded and parsed Swagger document. None, if unable to download
+        """
+
+        if not location:
+            return
+
+        bucket, key, version = self._parse_s3_location(location)
+        if bucket and key:
+            LOG.debug("Downloading Swagger document from Bucket=%s, Key=%s, Version=%s", bucket, key, version)
+            swagger_str = self._download_from_s3(bucket, key, version)
+            return yaml_parse(swagger_str)
+
+        if not isinstance(location, string_types):
+            # This is not a string and not a S3 Location dictionary. Probably something invalid
+            LOG.debug("Unable to download Swagger file. Invalid location: %s", location)
+            return
+
+        # ``location`` is a string and not a S3 path. It is probably a local path. Let's resolve relative path if any
+        filepath = location
+        if self.working_dir:
+            # Resolve relative paths, if any, with respect to working directory
+            filepath = os.path.join(self.working_dir, location)
+
+        if not os.path.exists(filepath):
+            LOG.debug("Unable to download Swagger file. File not found at location %s", filepath)
+            return
+
+        LOG.debug("Reading Swagger document from local file at %s", filepath)
+        with open(filepath, "r") as fp:
+            return yaml_parse(fp.read())
+
+    @staticmethod
+    def _download_from_s3(bucket, key, version=None):
+        """
+        Download a file from given S3 location, if available.
+
+        Parameters
+        ----------
+        bucket : str
+            S3 Bucket name
+
+        key : str
+            S3 Bucket Key aka file path
+
+        version : str
+            Optional Version ID of the file
+
+        Returns
+        -------
+        str
+            Contents of the file that was downloaded
+
+        Raises
+        ------
+        botocore.exceptions.ClientError if we were unable to download the file from S3
+        """
+
+        s3 = boto3.client('s3')
+
+        extra_args = {}
+        if version:
+            extra_args["VersionId"] = version
+
+        with tempfile.TemporaryFile() as fp:
+            try:
+                s3.download_file(
+                    bucket, key, fp,
+                    ExtraArgs=extra_args)
+
+                # go to start of file
+                fp.seek(0)
+
+                # Read and return all the contents
+                return fp.read()
+
+            except botocore.exceptions.ClientError:
+                LOG.error("Unable to download Swagger document from S3 Bucket=%s Key=%s Version=%s",
+                          bucket, key, version)
+                raise
+
+    @staticmethod
+    def _parse_s3_location(location):
+        """
+        Parses the given location input as a S3 Location and returns the file's bucket, key and version as separate
+        values. Input can be in two different formats:
+
+        1. Dictionary with ``Bucket``, ``Key``, ``Version`` keys
+        2. String of S3 URI in format ``s3://<bucket>/<key>?versionId=<version>``
+
+        If the input is not in either of the above formats, this method will return (None, None, None) tuple for all
+        the values.
+
+        Parameters
+        ----------
+        location : str or dict
+            Location of the S3 file
+
+        Returns
+        -------
+        str
+            Name of the S3 Bucket. None, if bucket value was not found
+        str
+            Key of the file from S3. None, if key was not provided
+        str
+            Optional Version ID of the file. None, if version ID is not provided
+        """
+
+        bucket, key, version = None, None, None
+        if isinstance(location, dict):
+            # This is a S3 Location dictionary. Just grab the fields. It is very well possible that
+            # this dictionary has none of the fields we expect. Return None if the fields don't exist.
+            bucket, key, version = (
+                location.get("Bucket"),
+                location.get("Key"),
+                location.get("Version")
+            )
+
+        elif isinstance(location, string_types) and location.startswith("s3://"):
+            # This is a S3 URI. Parse it using a standard URI parser to extract the components
+
+            parsed = urlparse(location)
+            query = parse_qs(parsed.query)
+
+            bucket = parsed.netloc
+            key = parsed.path.lstrip('/')  # Leading '/' messes with S3 APIs. Remove it.
+
+            # If there is a query string that has a single versionId field,
+            # set the object version and return
+            if query and 'versionId' in query and len(query['versionId']) == 1:
+                version = query['versionId'][0]
+
+        return bucket, key, version
diff --git a/samcli/commands/local/local.py b/samcli/commands/local/local.py
new file mode 100644
index 0000000000..ce54fd7d21
--- /dev/null
+++ b/samcli/commands/local/local.py
@@ -0,0 +1,24 @@
+"""
+Command group for "local" suite for commands. It provides common CLI arguments, template parsing capabilities,
+setting up stdin/stdout etc
+"""
+
+import click
+
+from .invoke.cli import cli as invoke_cli
+from .start_api.cli import cli as start_api_cli
+from .generate_event.cli import cli as generate_event_cli
+
+
+@click.group()
+def cli():
+    """
+    Run your Serverless application locally for quick development & testing
+    """
+    pass  # pragma: no cover
+
+
+# Add individual commands under this group
+cli.add_command(invoke_cli)
+cli.add_command(start_api_cli)
+cli.add_command(generate_event_cli)
diff --git a/samcli/commands/local/start_api/__init__.py b/samcli/commands/local/start_api/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/local/start_api/cli.py b/samcli/commands/local/start_api/cli.py
new file mode 100644
index 0000000000..2cb4e88fe3
--- /dev/null
+++ b/samcli/commands/local/start_api/cli.py
@@ -0,0 +1,91 @@
+"""
+CLI command for "local start-api" command
+"""
+
+import logging
+import click
+
+from samcli.cli.main import pass_context, common_options as cli_framework_options
+from samcli.commands.local.cli_common.options import invoke_common_options
+from samcli.commands.local.cli_common.invoke_context import InvokeContext
+from samcli.commands.local.lib.exceptions import NoApisDefined
+from samcli.commands.local.cli_common.user_exceptions import UserException
+from samcli.commands.local.lib.local_api_service import LocalApiService
+from samcli.commands.validate.lib.exceptions import InvalidSamDocumentException
+
+LOG = logging.getLogger(__name__)
+
+HELP_TEXT = """
+Allows you to run your Serverless application locally for quick development & testing.
+ When run in a directory that contains your Serverless functions and your AWS SAM template, it will create a local HTTP
+ server hosting all of your functions. When accessed (via browser, cli etc), it will launch a Docker container locally
+ to invoke the function. It will read the CodeUri property of AWS::Serverless::Function resource to find the path in
+ your file system containing the Lambda Function code. This could be the project's root directory for interpreted
+ languages like Node & Python, or a build directory that stores your compiled artifacts or a JAR file. If you are using
+ a interpreted language, local changes will be available immediately in Docker container on every invoke. For more
+ compiled languages or projects requiring complex packing support, we recommended you run your own building solution
+and point SAM to the directory or file containing build artifacts.
+"""
+
+
+@click.command("start-api", help=HELP_TEXT, short_help="Runs your APIs locally")
+@click.option("--host",
+              default="127.0.0.1",
+              help="Local hostname or IP address to bind to (default: '127.0.0.1')")
+@click.option("--port", "-p",
+              default=3000,
+              help="Local port number to listen on (default: '3000')")
+@click.option("--static-dir", "-s",
+              default="public",
+              help="Any static assets (e.g. CSS/Javascript/HTML) files located in this directory "
+                   "will be presented at /")
+@invoke_common_options
+@cli_framework_options
+@pass_context
+def cli(ctx,
+        # start-api Specific Options
+        host, port, static_dir,
+
+        # Common Options for Lambda Invoke
+        template, env_vars, debug_port, debug_args, docker_volume_basedir,
+        docker_network, log_file, skip_pull_image, profile
+        ):
+    # All logic must be implemented in the ``do_cli`` method. This helps with easy unit testing
+
+    do_cli(ctx, host, port, static_dir, template, env_vars, debug_port, debug_args, docker_volume_basedir,
+           docker_network, log_file, skip_pull_image, profile)  # pragma: no cover
+
+
+def do_cli(ctx, host, port, static_dir, template, env_vars, debug_port, debug_args,  # pylint: disable=R0914
+           docker_volume_basedir, docker_network, log_file, skip_pull_image, profile):
+    """
+    Implementation of the ``cli`` method, just separated out for unit testing purposes
+    """
+
+    LOG.debug("local start-api command is called")
+
+    # Pass all inputs to setup necessary context to invoke function locally.
+    # Handler exception raised by the processor for invalid args and print errors
+
+    try:
+        with InvokeContext(template_file=template,
+                           function_identifier=None,  # Don't scope to one particular function
+                           env_vars_file=env_vars,
+                           debug_port=debug_port,
+                           debug_args=debug_args,
+                           docker_volume_basedir=docker_volume_basedir,
+                           docker_network=docker_network,
+                           log_file=log_file,
+                           skip_pull_image=skip_pull_image,
+                           aws_profile=profile) as invoke_context:
+
+            service = LocalApiService(lambda_invoke_context=invoke_context,
+                                      port=port,
+                                      host=host,
+                                      static_dir=static_dir)
+            service.start()
+
+    except NoApisDefined:
+        raise UserException("Template does not have any APIs connected to Lambda functions")
+    except InvalidSamDocumentException as ex:
+        raise UserException(str(ex))
diff --git a/samcli/commands/package/__init__.py b/samcli/commands/package/__init__.py
new file mode 100644
index 0000000000..92ce038531
--- /dev/null
+++ b/samcli/commands/package/__init__.py
@@ -0,0 +1,26 @@
+"""
+CLI command for "package" command
+"""
+
+import click
+
+from samcli.cli.main import pass_context, common_options
+from samcli.lib.samlib.cloudformation_command import execute_command
+
+
+SHORT_HELP = "Package an AWS SAM application. This is an alias for 'aws cloudformation package'."
+
+
+@click.command("package", short_help=SHORT_HELP, context_settings={"ignore_unknown_options": True})
+@click.argument("args", nargs=-1, type=click.UNPROCESSED)
+@common_options
+@pass_context
+def cli(ctx, args):
+
+    # All logic must be implemented in the ``do_cli`` method. This helps with easy unit testing
+
+    do_cli(args)  # pragma: no cover
+
+
+def do_cli(args):
+    execute_command("package", args)
diff --git a/samcli/commands/validate/__init__.py b/samcli/commands/validate/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/validate/lib/__init__.py b/samcli/commands/validate/lib/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/commands/validate/lib/exceptions.py b/samcli/commands/validate/lib/exceptions.py
new file mode 100644
index 0000000000..84f6210e3b
--- /dev/null
+++ b/samcli/commands/validate/lib/exceptions.py
@@ -0,0 +1,10 @@
+"""
+Custom Exceptions for 'sam validate' commands
+"""
+
+
+class InvalidSamDocumentException(Exception):
+    """
+    Exception for Invalid Sam Documents
+    """
+    pass
diff --git a/samcli/commands/validate/lib/sam_template_validator.py b/samcli/commands/validate/lib/sam_template_validator.py
new file mode 100644
index 0000000000..fbda164032
--- /dev/null
+++ b/samcli/commands/validate/lib/sam_template_validator.py
@@ -0,0 +1,127 @@
+"""
+Library for Validating Sam Templates
+"""
+from samtranslator.public.exceptions import InvalidDocumentException
+from samtranslator.parser.parser import Parser
+from samtranslator.translator.translator import Translator
+import six
+
+from .exceptions import InvalidSamDocumentException
+
+
+class SamTemplateValidator(object):
+
+    def __init__(self, sam_template, managed_policy_loader):
+        """
+        Construct a SamTemplateValidator
+
+        Design Details:
+
+        managed_policy_loader is injected into the `__init__` to allow future expansion
+        and overriding capabilities. A typically pattern is to pass the name of the class into
+        the `__init__` as keyword args. As long as the class 'conforms' to the same 'interface'.
+        This allows the class to be changed by the client and allowing customization of the class being
+        initialized. Something I had in mind would be allowing a template to be run and checked
+        'offline' (not needing aws creds). To make this an easier transition in the future, we ingest
+        the ManagedPolicyLoader class.
+
+        Parameters
+        ----------
+        sam_template dict
+            Dictionary representing a SAM Template
+        managed_policy_loader ManagedPolicyLoader
+            Sam ManagedPolicyLoader
+        """
+        self.sam_template = sam_template
+        self.managed_policy_loader = managed_policy_loader
+
+        self.sam_parser = Parser()
+
+    def is_valid(self):
+        """
+        Runs the SAM Translator to determine if the template provided is valid. This is similar to running a
+        ChangeSet in CloudFormation for a SAM Template
+
+        Raises
+        -------
+        InvalidSamDocumentException
+             If the template is not valid, an InvalidSamDocumentException is raised
+        """
+        managed_policy_map = self.managed_policy_loader.load()
+
+        sam_translator = Translator(managed_policy_map=managed_policy_map,
+                                    sam_parser=self.sam_parser,
+                                    plugins=[])
+
+        self._replace_local_codeuri()
+
+        try:
+            sam_translator.translate(sam_template=self.sam_template,
+                                     parameter_values={})
+        except InvalidDocumentException as e:
+            raise InvalidSamDocumentException(
+                reduce(lambda message, error: message + ' ' + error.message, e.causes, e.message))
+
+    def _replace_local_codeuri(self):
+        """
+        Replaces the CodeUri in AWS::Serverless::Function and DefinitionUri in AWS::Serverless::Api to a fake
+        S3 Uri. This is to support running the SAM Translator with valid values for these fields. If this in not done,
+        the template is invalid in the eyes of SAM Translator (the translator does not support local paths)
+        """
+
+        all_resources = self.sam_template.get("Resources", {})
+
+        for _, resource in all_resources.items():
+
+            resource_type = resource.get("Type")
+            resource_dict = resource.get("Properties")
+
+            if resource_type == "AWS::Serverless::Function":
+
+                SamTemplateValidator._update_to_s3_uri("CodeUri", resource_dict)
+
+            if resource_type == "AWS::Serverless::Api":
+
+                SamTemplateValidator._update_to_s3_uri("DefinitionUri", resource_dict)
+
+    @staticmethod
+    def is_s3_uri(uri):
+        """
+        Checks the uri and determines if it is a valid S3 Uri
+
+        Parameters
+        ----------
+        uri str, required
+            Uri to check
+
+        Returns
+        -------
+        bool
+            Returns True if the uri given is an S3 uri, otherwise False
+
+        """
+        return isinstance(uri, six.string_types) and uri.startswith("s3://")
+
+    @staticmethod
+    def _update_to_s3_uri(property_key, resource_property_dict, s3_uri_value="s3://bucket/value"):
+        """
+        Updates the 'property_key' in the 'resource_property_dict' to the value of 's3_uri_value'
+
+        Note: The function will mutate the resource_property_dict that is pass in
+
+        Parameters
+        ----------
+        property_key str, required
+            Key in the resource_property_dict
+        resource_property_dict dict, required
+            Property dictionary of a Resource in the template to replace
+        s3_uri_value str, optional
+            Value to update the value of the property_key to
+        """
+        uri_property = resource_property_dict.get(property_key, ".")
+
+        # ignore if dict or already an S3 Uri
+        if isinstance(uri_property, dict) or SamTemplateValidator.is_s3_uri(uri_property):
+            return
+
+        resource_property_dict[property_key] = s3_uri_value
diff --git a/samcli/commands/validate/validate.py b/samcli/commands/validate/validate.py
new file mode 100644
index 0000000000..6b3c4aecc1
--- /dev/null
+++ b/samcli/commands/validate/validate.py
@@ -0,0 +1,65 @@
+"""
+CLI Command for Validating a SAM Template
+"""
+import os
+
+import boto3
+import click
+from samtranslator.translator.managed_policy_translator import ManagedPolicyLoader
+
+
+from samcli.cli.main import pass_context, common_options as cli_framework_options
+from samcli.commands.local.cli_common.options import template_common_option as template_option
+from samcli.commands.local.cli_common.user_exceptions import InvalidSamTemplateException, SamTemplateNotFoundException
+from samcli.yamlhelper import yaml_parse
+from .lib.exceptions import InvalidSamDocumentException
+from .lib.sam_template_validator import SamTemplateValidator
+
+
+@click.command("validate",
+               short_help="Validate an AWS SAM template.")
+@template_option
+@cli_framework_options
+@pass_context
+def cli(ctx, template):
+
+    # All logic must be implemented in the ``do_cli`` method. This helps with easy unit testing
+
+    do_cli(ctx, template)  # pragma: no cover
+
+
+def do_cli(ctx, template):
+    """
+    Implementation of the ``cli`` method, just separated out for unit testing purposes
+    """
+
+    sam_template = _read_sam_file(template)
+
+    iam_client = boto3.client('iam')
+    validator = SamTemplateValidator(sam_template, ManagedPolicyLoader(iam_client))
+
+    try:
+        validator.is_valid()
+    except InvalidSamDocumentException as e:
+        click.secho("Template provided at '{}' was invalid SAM Template.".format(template), bg='red')
+        raise InvalidSamTemplateException(e.message)
+
+    click.secho("{} is a valid SAM Template".format(template), fg='green')
+
+
+def _read_sam_file(template):
+    """
+    Reads the file (json and yaml supported) provided and returns the dictionary representation of the file.
+
+    :param str template: Path to the template file
+    :return dict: Dictionary representing the SAM Template
+    :raises: SamTemplateNotFoundException when the template file does not exist
+    """
+    if not os.path.exists(template):
+        click.secho("SAM Template Not Found", bg='red')
+        raise SamTemplateNotFoundException("Template at {} is not found".format(template))
+
+    with click.open_file(template, 'r') as sam_template:
+        sam_template = yaml_parse(sam_template.read())
+
+    return sam_template
diff --git a/samcli/lib/__init__.py b/samcli/lib/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/lib/samlib/__init__.py b/samcli/lib/samlib/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/lib/samlib/cloudformation_command.py b/samcli/lib/samlib/cloudformation_command.py
new file mode 100644
index 0000000000..b9af364997
--- /dev/null
+++ b/samcli/lib/samlib/cloudformation_command.py
@@ -0,0 +1,22 @@
+"""
+Utility to call cloudformation command with args
+"""
+
+import logging
+import platform
+import subprocess
+import sys
+
+LOG = logging.getLogger(__name__)
+
+
+def execute_command(command, args):
+    LOG.debug("%s command is called", command)
+    try:
+        aws_cmd = 'aws' if platform.system().lower() != 'windows' else 'aws.cmd'
+        subprocess.check_call([aws_cmd, 'cloudformation', command] + list(args))
+        LOG.debug("%s command successful", command)
+    except subprocess.CalledProcessError as e:
+        # Underlying aws command will print the exception to the user
+        LOG.debug("Exception: %s", e)
+        sys.exit(e.returncode)
diff --git a/samcli/lib/samlib/default_managed_policies.json b/samcli/lib/samlib/default_managed_policies.json
new file mode 100644
index 0000000000..011382b900
--- /dev/null
+++ b/samcli/lib/samlib/default_managed_policies.json
@@ -0,0 +1,372 @@
+{
+  "SecurityAudit": "arn:aws:iam::aws:policy/SecurityAudit", 
+  "AWSElasticBeanstalkMulticontainerDocker": "arn:aws:iam::aws:policy/AWSElasticBeanstalkMulticontainerDocker", 
+  "AWSGreengrassResourceAccessRolePolicy": "arn:aws:iam::aws:policy/service-role/AWSGreengrassResourceAccessRolePolicy", 
+  "AmazonS3ReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonS3ReadOnlyAccess", 
+  "AmazonEC2RoleforDataPipelineRole": "arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforDataPipelineRole", 
+  "AWSElasticBeanstalkService": "arn:aws:iam::aws:policy/service-role/AWSElasticBeanstalkService", 
+  "AWSQuickSightIoTAnalyticsAccess": "arn:aws:iam::aws:policy/AWSQuickSightIoTAnalyticsAccess", 
+  "AWSElasticBeanstalkCustomPlatformforEC2Role": "arn:aws:iam::aws:policy/AWSElasticBeanstalkCustomPlatformforEC2Role", 
+  "AWSStepFunctionsConsoleFullAccess": "arn:aws:iam::aws:policy/AWSStepFunctionsConsoleFullAccess", 
+  "AWSCloudTrailFullAccess": "arn:aws:iam::aws:policy/AWSCloudTrailFullAccess", 
+  "NetworkAdministrator": "arn:aws:iam::aws:policy/job-function/NetworkAdministrator", 
+  "AWSCodePipelineApproverAccess": "arn:aws:iam::aws:policy/AWSCodePipelineApproverAccess", 
+  "AWSDirectConnectReadOnlyAccess": "arn:aws:iam::aws:policy/AWSDirectConnectReadOnlyAccess", 
+  "AmazonMobileAnalyticsFinancialReportAccess": "arn:aws:iam::aws:policy/AmazonMobileAnalyticsFinancialReportAccess", 
+  "AWSDeepLensLambdaFunctionAccessPolicy": "arn:aws:iam::aws:policy/AWSDeepLensLambdaFunctionAccessPolicy", 
+  "AutoScalingFullAccess": "arn:aws:iam::aws:policy/AutoScalingFullAccess", 
+  "AmazonLexRunBotsOnly": "arn:aws:iam::aws:policy/AmazonLexRunBotsOnly", 
+  "AmazonEC2RoleforAWSCodeDeploy": "arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforAWSCodeDeploy", 
+  "AWSLambdaReplicator": "arn:aws:iam::aws:policy/aws-service-role/AWSLambdaReplicator", 
+  "CloudWatchEventsReadOnlyAccess": "arn:aws:iam::aws:policy/CloudWatchEventsReadOnlyAccess", 
+  "CloudWatchActionsEC2Access": "arn:aws:iam::aws:policy/CloudWatchActionsEC2Access", 
+  "ViewOnlyAccess": "arn:aws:iam::aws:policy/job-function/ViewOnlyAccess", 
+  "AmazonECSTaskExecutionRolePolicy": "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy", 
+  "AmazonMacieServiceRole": "arn:aws:iam::aws:policy/service-role/AmazonMacieServiceRole", 
+  "ResourceGroupsandTagEditorFullAccess": "arn:aws:iam::aws:policy/ResourceGroupsandTagEditorFullAccess", 
+  "AmazonESReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonESReadOnlyAccess", 
+  "IAMReadOnlyAccess": "arn:aws:iam::aws:policy/IAMReadOnlyAccess", 
+  "AWSCloud9User": "arn:aws:iam::aws:policy/AWSCloud9User", 
+  "AmazonMachineLearningRealTimePredictionOnlyAccess": "arn:aws:iam::aws:policy/AmazonMachineLearningRealTimePredictionOnlyAccess", 
+  "AWSCloud9ServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSCloud9ServiceRolePolicy", 
+  "AmazonMachineLearningCreateOnlyAccess": "arn:aws:iam::aws:policy/AmazonMachineLearningCreateOnlyAccess", 
+  "AmazonRoute53AutoNamingFullAccess": "arn:aws:iam::aws:policy/AmazonRoute53AutoNamingFullAccess", 
+  "AWSXrayFullAccess": "arn:aws:iam::aws:policy/AWSXrayFullAccess", 
+  "AWSElasticBeanstalkWebTier": "arn:aws:iam::aws:policy/AWSElasticBeanstalkWebTier", 
+  "AWSConfigRoleForOrganizations": "arn:aws:iam::aws:policy/service-role/AWSConfigRoleForOrganizations", 
+  "AmazonRDSFullAccess": "arn:aws:iam::aws:policy/AmazonRDSFullAccess", 
+  "AWSIoTLogging": "arn:aws:iam::aws:policy/service-role/AWSIoTLogging", 
+  "AWSConfigRole": "arn:aws:iam::aws:policy/service-role/AWSConfigRole", 
+  "AWSStorageGatewayReadOnlyAccess": "arn:aws:iam::aws:policy/AWSStorageGatewayReadOnlyAccess", 
+  "AWSCodeDeployDeployerAccess": "arn:aws:iam::aws:policy/AWSCodeDeployDeployerAccess", 
+  "AmazonWorkMailReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonWorkMailReadOnlyAccess", 
+  "AmazonSNSRole": "arn:aws:iam::aws:policy/service-role/AmazonSNSRole", 
+  "AWSImportExportFullAccess": "arn:aws:iam::aws:policy/AWSImportExportFullAccess", 
+  "AmazonAppStreamServiceAccess": "arn:aws:iam::aws:policy/service-role/AmazonAppStreamServiceAccess", 
+  "AWSGlueConsoleFullAccess": "arn:aws:iam::aws:policy/AWSGlueConsoleFullAccess", 
+  "ComprehendReadOnly": "arn:aws:iam::aws:policy/ComprehendReadOnly", 
+  "AmazonMachineLearningBatchPredictionsAccess": "arn:aws:iam::aws:policy/AmazonMachineLearningBatchPredictionsAccess", 
+  "AWSEnhancedClassicNetworkingMangementPolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSEnhancedClassicNetworkingMangementPolicy", 
+  "SecretsManagerReadWrite": "arn:aws:iam::aws:policy/SecretsManagerReadWrite", 
+  "AmazonMQFullAccess": "arn:aws:iam::aws:policy/AmazonMQFullAccess", 
+  "AWSIoTConfigReadOnlyAccess": "arn:aws:iam::aws:policy/AWSIoTConfigReadOnlyAccess", 
+  "AWSElasticLoadBalancingClassicServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSElasticLoadBalancingClassicServiceRolePolicy", 
+  "SystemAdministrator": "arn:aws:iam::aws:policy/job-function/SystemAdministrator", 
+  "AmazonEC2ContainerRegistryFullAccess": "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryFullAccess", 
+  "CloudWatchEventsInvocationAccess": "arn:aws:iam::aws:policy/service-role/CloudWatchEventsInvocationAccess", 
+  "AmazonECSServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AmazonECSServiceRolePolicy", 
+  "AmazonCognitoPowerUser": "arn:aws:iam::aws:policy/AmazonCognitoPowerUser", 
+  "ElastiCacheServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/ElastiCacheServiceRolePolicy", 
+  "AWSCloudFormationReadOnlyAccess": "arn:aws:iam::aws:policy/AWSCloudFormationReadOnlyAccess", 
+  "ApplicationAutoScalingForAmazonAppStreamAccess": "arn:aws:iam::aws:policy/service-role/ApplicationAutoScalingForAmazonAppStreamAccess", 
+  "AWSCloud9EnvironmentMember": "arn:aws:iam::aws:policy/AWSCloud9EnvironmentMember", 
+  "AmazonLexFullAccess": "arn:aws:iam::aws:policy/AmazonLexFullAccess", 
+  "AmazonElastiCacheFullAccess": "arn:aws:iam::aws:policy/AmazonElastiCacheFullAccess", 
+  "AWSBatchServiceRole": "arn:aws:iam::aws:policy/service-role/AWSBatchServiceRole", 
+  "AmazonKinesisAnalyticsFullAccess": "arn:aws:iam::aws:policy/AmazonKinesisAnalyticsFullAccess", 
+  "AWSApplicationAutoscalingDynamoDBTablePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSApplicationAutoscalingDynamoDBTablePolicy", 
+  "AmazonElasticFileSystemFullAccess": "arn:aws:iam::aws:policy/AmazonElasticFileSystemFullAccess", 
+  "AmazonEC2ContainerServiceAutoscaleRole": "arn:aws:iam::aws:policy/service-role/AmazonEC2ContainerServiceAutoscaleRole", 
+  "AWSCodeDeployReadOnlyAccess": "arn:aws:iam::aws:policy/AWSCodeDeployReadOnlyAccess", 
+  "AWSHealthFullAccess": "arn:aws:iam::aws:policy/AWSHealthFullAccess", 
+  "AmazonDynamoDBReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonDynamoDBReadOnlyAccess", 
+  "AmazonVPCFullAccess": "arn:aws:iam::aws:policy/AmazonVPCFullAccess", 
+  "AmazonEC2RoleforSSM": "arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM", 
+  "AmazonMobileAnalyticsNon-financialReportAccess": "arn:aws:iam::aws:policy/AmazonMobileAnalyticsNon-financialReportAccess", 
+  "AmazonSageMakerReadOnly": "arn:aws:iam::aws:policy/AmazonSageMakerReadOnly", 
+  "AWSCloudHSMReadOnlyAccess": "arn:aws:iam::aws:policy/AWSCloudHSMReadOnlyAccess", 
+  "AmazonCognitoDeveloperAuthenticatedIdentities": "arn:aws:iam::aws:policy/AmazonCognitoDeveloperAuthenticatedIdentities", 
+  "AmazonRDSEnhancedMonitoringRole": "arn:aws:iam::aws:policy/service-role/AmazonRDSEnhancedMonitoringRole", 
+  "AWSCodeBuildReadOnlyAccess": "arn:aws:iam::aws:policy/AWSCodeBuildReadOnlyAccess", 
+  "AWSDirectoryServiceReadOnlyAccess": "arn:aws:iam::aws:policy/AWSDirectoryServiceReadOnlyAccess", 
+  "AmazonCloudDirectoryReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonCloudDirectoryReadOnlyAccess", 
+  "CloudSearchReadOnlyAccess": "arn:aws:iam::aws:policy/CloudSearchReadOnlyAccess", 
+  "AWSElementalMediaStoreReadOnly": "arn:aws:iam::aws:policy/AWSElementalMediaStoreReadOnly", 
+  "LexChannelPolicy": "arn:aws:iam::aws:policy/aws-service-role/LexChannelPolicy", 
+  "AWSSSOServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSSSOServiceRolePolicy", 
+  "AWSConfigRulesExecutionRole": "arn:aws:iam::aws:policy/service-role/AWSConfigRulesExecutionRole", 
+  "AmazonChimeUserManagement": "arn:aws:iam::aws:policy/AmazonChimeUserManagement", 
+  "IAMFullAccess": "arn:aws:iam::aws:policy/IAMFullAccess", 
+  "IAMUserChangePassword": "arn:aws:iam::aws:policy/IAMUserChangePassword", 
+  "AWSKeyManagementServicePowerUser": "arn:aws:iam::aws:policy/AWSKeyManagementServicePowerUser", 
+  "AWSMobileHub_FullAccess": "arn:aws:iam::aws:policy/AWSMobileHub_FullAccess", 
+  "AWSLambdaReplicatorInternal": "arn:aws:iam::aws:policy/aws-service-role/AWSLambdaReplicatorInternal", 
+  "AWSOpsWorksCMServiceRole": "arn:aws:iam::aws:policy/service-role/AWSOpsWorksCMServiceRole", 
+  "AmazonZocaloFullAccess": "arn:aws:iam::aws:policy/AmazonZocaloFullAccess", 
+  "AWSCertificateManagerFullAccess": "arn:aws:iam::aws:policy/AWSCertificateManagerFullAccess", 
+  "AmazonEC2ReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonEC2ReadOnlyAccess", 
+  "AmazonDynamoDBFullAccess": "arn:aws:iam::aws:policy/AmazonDynamoDBFullAccess", 
+  "DAXServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/DAXServiceRolePolicy", 
+  "AWSApplicationAutoscalingSageMakerEndpointPolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSApplicationAutoscalingSageMakerEndpointPolicy", 
+  "AmazonWorkSpacesApplicationManagerAdminAccess": "arn:aws:iam::aws:policy/AmazonWorkSpacesApplicationManagerAdminAccess", 
+  "AmazonElasticMapReduceforEC2Role": "arn:aws:iam::aws:policy/service-role/AmazonElasticMapReduceforEC2Role", 
+  "AmazonSNSReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonSNSReadOnlyAccess", 
+  "CloudHSMServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/CloudHSMServiceRolePolicy", 
+  "AWSApplicationAutoscalingAppStreamFleetPolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSApplicationAutoscalingAppStreamFleetPolicy", 
+  "IAMUserSSHKeys": "arn:aws:iam::aws:policy/IAMUserSSHKeys", 
+  "AmazonVPCCrossAccountNetworkInterfaceOperations": "arn:aws:iam::aws:policy/AmazonVPCCrossAccountNetworkInterfaceOperations", 
+  "AmazonFreeRTOSFullAccess": "arn:aws:iam::aws:policy/AmazonFreeRTOSFullAccess", 
+  "AmazonInspectorReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonInspectorReadOnlyAccess", 
+  "AmazonEMRCleanupPolicy": "arn:aws:iam::aws:policy/aws-service-role/AmazonEMRCleanupPolicy", 
+  "IAMSelfManageServiceSpecificCredentials": "arn:aws:iam::aws:policy/IAMSelfManageServiceSpecificCredentials", 
+  "AWSQuicksightAthenaAccess": "arn:aws:iam::aws:policy/service-role/AWSQuicksightAthenaAccess", 
+  "AmazonEC2ContainerServiceRole": "arn:aws:iam::aws:policy/service-role/AmazonEC2ContainerServiceRole", 
+  "AmazonMechanicalTurkReadOnly": "arn:aws:iam::aws:policy/AmazonMechanicalTurkReadOnly", 
+  "AmazonEC2ReportsAccess": "arn:aws:iam::aws:policy/AmazonEC2ReportsAccess", 
+  "AWSElementalMediaStoreFullAccess": "arn:aws:iam::aws:policy/AWSElementalMediaStoreFullAccess", 
+  "AWSBatchServiceEventTargetRole": "arn:aws:iam::aws:policy/service-role/AWSBatchServiceEventTargetRole", 
+  "AWSCodeDeployFullAccess": "arn:aws:iam::aws:policy/AWSCodeDeployFullAccess", 
+  "CloudWatchAgentServerPolicy": "arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy", 
+  "AWSApplicationAutoscalingRDSClusterPolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSApplicationAutoscalingRDSClusterPolicy", 
+  "AmazonVPCReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonVPCReadOnlyAccess", 
+  "AmazonRoute53DomainsReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonRoute53DomainsReadOnlyAccess", 
+  "AWSElasticBeanstalkReadOnlyAccess": "arn:aws:iam::aws:policy/AWSElasticBeanstalkReadOnlyAccess", 
+  "AWSStepFunctionsReadOnlyAccess": "arn:aws:iam::aws:policy/AWSStepFunctionsReadOnlyAccess", 
+  "AWSSupportAccess": "arn:aws:iam::aws:policy/AWSSupportAccess", 
+  "GreengrassOTAUpdateArtifactAccess": "arn:aws:iam::aws:policy/service-role/GreengrassOTAUpdateArtifactAccess", 
+  "AmazonEC2ContainerServiceforEC2Role": "arn:aws:iam::aws:policy/service-role/AmazonEC2ContainerServiceforEC2Role", 
+  "AmazonKinesisVideoStreamsReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonKinesisVideoStreamsReadOnlyAccess", 
+  "AWSMarketplaceFullAccess": "arn:aws:iam::aws:policy/AWSMarketplaceFullAccess", 
+  "AWSOpsWorksCloudWatchLogs": "arn:aws:iam::aws:policy/AWSOpsWorksCloudWatchLogs", 
+  "AWSStepFunctionsFullAccess": "arn:aws:iam::aws:policy/AWSStepFunctionsFullAccess", 
+  "AmazonSQSReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonSQSReadOnlyAccess", 
+  "AmazonElasticMapReduceRole": "arn:aws:iam::aws:policy/service-role/AmazonElasticMapReduceRole", 
+  "AWSOpsWorksCMInstanceProfileRole": "arn:aws:iam::aws:policy/AWSOpsWorksCMInstanceProfileRole", 
+  "AWSMarketplaceRead-only": "arn:aws:iam::aws:policy/AWSMarketplaceRead-only", 
+  "AWSWAFFullAccess": "arn:aws:iam::aws:policy/AWSWAFFullAccess", 
+  "AmazonSQSFullAccess": "arn:aws:iam::aws:policy/AmazonSQSFullAccess", 
+  "AmazonMobileAnalyticsFullAccess": "arn:aws:iam::aws:policy/AmazonMobileAnalyticsFullAccess", 
+  "AutoScalingConsoleFullAccess": "arn:aws:iam::aws:policy/AutoScalingConsoleFullAccess", 
+  "QuickSightAccessForS3StorageManagementAnalyticsReadOnly": "arn:aws:iam::aws:policy/service-role/QuickSightAccessForS3StorageManagementAnalyticsReadOnly", 
+  "AmazonESCognitoAccess": "arn:aws:iam::aws:policy/AmazonESCognitoAccess", 
+  "AWSAppSyncSchemaAuthor": "arn:aws:iam::aws:policy/AWSAppSyncSchemaAuthor", 
+  "AWSIoTConfigAccess": "arn:aws:iam::aws:policy/AWSIoTConfigAccess", 
+  "AWSAppSyncPushToCloudWatchLogs": "arn:aws:iam::aws:policy/service-role/AWSAppSyncPushToCloudWatchLogs", 
+  "AWSDataPipeline_PowerUser": "arn:aws:iam::aws:policy/AWSDataPipeline_PowerUser", 
+  "AWSStorageGatewayFullAccess": "arn:aws:iam::aws:policy/AWSStorageGatewayFullAccess", 
+  "AmazonElasticTranscoderReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonElasticTranscoderReadOnlyAccess", 
+  "AmazonSSMServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AmazonSSMServiceRolePolicy", 
+  "AWSMigrationHubSMSAccess": "arn:aws:iam::aws:policy/service-role/AWSMigrationHubSMSAccess", 
+  "AWSCertificateManagerReadOnly": "arn:aws:iam::aws:policy/AWSCertificateManagerReadOnly", 
+  "AWSLambdaKinesisExecutionRole": "arn:aws:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole", 
+  "AWSDeepLensServiceRolePolicy": "arn:aws:iam::aws:policy/service-role/AWSDeepLensServiceRolePolicy", 
+  "AWSApplicationDiscoveryAgentAccess": "arn:aws:iam::aws:policy/AWSApplicationDiscoveryAgentAccess", 
+  "AWSServiceCatalogAdminFullAccess": "arn:aws:iam::aws:policy/AWSServiceCatalogAdminFullAccess", 
+  "AdministratorAccess": "arn:aws:iam::aws:policy/AdministratorAccess", 
+  "CloudSearchFullAccess": "arn:aws:iam::aws:policy/CloudSearchFullAccess", 
+  "AmazonInspectorServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AmazonInspectorServiceRolePolicy", 
+  "AmazonGlacierFullAccess": "arn:aws:iam::aws:policy/AmazonGlacierFullAccess", 
+  "AWSConnector": "arn:aws:iam::aws:policy/AWSConnector", 
+  "FMSServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/FMSServiceRolePolicy", 
+  "AWSXrayWriteOnlyAccess": "arn:aws:iam::aws:policy/AWSXrayWriteOnlyAccess", 
+  "AmazonMachineLearningRoleforRedshiftDataSource": "arn:aws:iam::aws:policy/service-role/AmazonMachineLearningRoleforRedshiftDataSource", 
+  "AmazonSESReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonSESReadOnlyAccess", 
+  "AmazonAppStreamFullAccess": "arn:aws:iam::aws:policy/AmazonAppStreamFullAccess", 
+  "AWSMobileHub_ReadOnly": "arn:aws:iam::aws:policy/AWSMobileHub_ReadOnly", 
+  "AWSEC2FleetServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSEC2FleetServiceRolePolicy", 
+  "AWSElementalMediaPackageFullAccess": "arn:aws:iam::aws:policy/AWSElementalMediaPackageFullAccess", 
+  "AWSQuickSightListIAM": "arn:aws:iam::aws:policy/service-role/AWSQuickSightListIAM", 
+  "AmazonAPIGatewayPushToCloudWatchLogs": "arn:aws:iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs", 
+  "AmazonDynamoDBFullAccesswithDataPipeline": "arn:aws:iam::aws:policy/AmazonDynamoDBFullAccesswithDataPipeline", 
+  "AmazonAppStreamReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonAppStreamReadOnlyAccess", 
+  "AWSGlueServiceRole": "arn:aws:iam::aws:policy/service-role/AWSGlueServiceRole", 
+  "AWSServiceCatalogEndUserFullAccess": "arn:aws:iam::aws:policy/AWSServiceCatalogEndUserFullAccess", 
+  "AmazonElasticTranscoderRole": "arn:aws:iam::aws:policy/service-role/AmazonElasticTranscoderRole", 
+  "AWSMarketplaceGetEntitlements": "arn:aws:iam::aws:policy/AWSMarketplaceGetEntitlements", 
+  "SupportUser": "arn:aws:iam::aws:policy/job-function/SupportUser", 
+  "AWSIoTOTAUpdate": "arn:aws:iam::aws:policy/service-role/AWSIoTOTAUpdate", 
+  "AutoScalingServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AutoScalingServiceRolePolicy", 
+  "AmazonZocaloReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonZocaloReadOnlyAccess", 
+  "AmazonPollyFullAccess": "arn:aws:iam::aws:policy/AmazonPollyFullAccess", 
+  "AWSQuickSightDescribeRDS": "arn:aws:iam::aws:policy/service-role/AWSQuickSightDescribeRDS", 
+  "AWSCloudHSMRole": "arn:aws:iam::aws:policy/service-role/AWSCloudHSMRole", 
+  "AWSGlueServiceNotebookRole": "arn:aws:iam::aws:policy/service-role/AWSGlueServiceNotebookRole", 
+  "CloudWatchEventsServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/CloudWatchEventsServiceRolePolicy", 
+  "AmazonRedshiftReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonRedshiftReadOnlyAccess", 
+  "AWSLambdaInvocation-DynamoDB": "arn:aws:iam::aws:policy/AWSLambdaInvocation-DynamoDB", 
+  "AmazonRekognitionServiceRole": "arn:aws:iam::aws:policy/service-role/AmazonRekognitionServiceRole", 
+  "AWSQuickSightDescribeRedshift": "arn:aws:iam::aws:policy/service-role/AWSQuickSightDescribeRedshift", 
+  "AmazonAPIGatewayAdministrator": "arn:aws:iam::aws:policy/AmazonAPIGatewayAdministrator", 
+  "AWSCodeBuildDeveloperAccess": "arn:aws:iam::aws:policy/AWSCodeBuildDeveloperAccess", 
+  "AmazonEC2FullAccess": "arn:aws:iam::aws:policy/AmazonEC2FullAccess", 
+  "AWSCodeCommitPowerUser": "arn:aws:iam::aws:policy/AWSCodeCommitPowerUser", 
+  "AmazonRoute53AutoNamingReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonRoute53AutoNamingReadOnlyAccess", 
+  "AWSCodeDeployRole": "arn:aws:iam::aws:policy/service-role/AWSCodeDeployRole", 
+  "ServerMigrationConnector": "arn:aws:iam::aws:policy/ServerMigrationConnector", 
+  "CloudWatchLogsReadOnlyAccess": "arn:aws:iam::aws:policy/CloudWatchLogsReadOnlyAccess", 
+  "PowerUserAccess": "arn:aws:iam::aws:policy/PowerUserAccess", 
+  "AWSMarketplaceManageSubscriptions": "arn:aws:iam::aws:policy/AWSMarketplaceManageSubscriptions", 
+  "AmazonRDSReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonRDSReadOnlyAccess", 
+  "ServiceCatalogEndUserAccess": "arn:aws:iam::aws:policy/ServiceCatalogEndUserAccess", 
+  "AWSOpsWorksRole": "arn:aws:iam::aws:policy/service-role/AWSOpsWorksRole", 
+  "AmazonSSMReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonSSMReadOnlyAccess", 
+  "AWSCodePipelineCustomActionAccess": "arn:aws:iam::aws:policy/AWSCodePipelineCustomActionAccess", 
+  "AmazonRoute53AutoNamingRegistrantAccess": "arn:aws:iam::aws:policy/AmazonRoute53AutoNamingRegistrantAccess", 
+  "AmazonMachineLearningReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonMachineLearningReadOnlyAccess", 
+  "AmazonESFullAccess": "arn:aws:iam::aws:policy/AmazonESFullAccess", 
+  "AWSConfigUserAccess": "arn:aws:iam::aws:policy/AWSConfigUserAccess", 
+  "DatabaseAdministrator": "arn:aws:iam::aws:policy/job-function/DatabaseAdministrator", 
+  "CloudWatchLogsFullAccess": "arn:aws:iam::aws:policy/CloudWatchLogsFullAccess", 
+  "AmazonSSMAutomationRole": "arn:aws:iam::aws:policy/service-role/AmazonSSMAutomationRole", 
+  "AmazonMachineLearningFullAccess": "arn:aws:iam::aws:policy/AmazonMachineLearningFullAccess", 
+  "AmazonSageMakerFullAccess": "arn:aws:iam::aws:policy/AmazonSageMakerFullAccess", 
+  "ServerMigrationServiceRole": "arn:aws:iam::aws:policy/service-role/ServerMigrationServiceRole", 
+  "AWSLambdaVPCAccessExecutionRole": "arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole", 
+  "AmazonSESFullAccess": "arn:aws:iam::aws:policy/AmazonSESFullAccess", 
+  "AmazonTranscribeReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonTranscribeReadOnlyAccess", 
+  "AmazonKinesisAnalyticsReadOnly": "arn:aws:iam::aws:policy/AmazonKinesisAnalyticsReadOnly", 
+  "AmazonRekognitionReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonRekognitionReadOnlyAccess", 
+  "AmazonInspectorFullAccess": "arn:aws:iam::aws:policy/AmazonInspectorFullAccess", 
+  "AmazonElasticMapReduceforAutoScalingRole": "arn:aws:iam::aws:policy/service-role/AmazonElasticMapReduceforAutoScalingRole", 
+  "AWSImportExportReadOnlyAccess": "arn:aws:iam::aws:policy/AWSImportExportReadOnlyAccess", 
+  "AmazonMQReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonMQReadOnlyAccess", 
+  "AWSElasticBeanstalkEnhancedHealth": "arn:aws:iam::aws:policy/service-role/AWSElasticBeanstalkEnhancedHealth", 
+  "AmazonGuardDutyServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AmazonGuardDutyServiceRolePolicy", 
+  "AWSAppSyncAdministrator": "arn:aws:iam::aws:policy/AWSAppSyncAdministrator", 
+  "AWSCodeBuildAdminAccess": "arn:aws:iam::aws:policy/AWSCodeBuildAdminAccess", 
+  "AWSServiceRoleForEC2ScheduledInstances": "arn:aws:iam::aws:policy/aws-service-role/AWSServiceRoleForEC2ScheduledInstances", 
+  "AWSDeviceFarmFullAccess": "arn:aws:iam::aws:policy/AWSDeviceFarmFullAccess", 
+  "ComprehendFullAccess": "arn:aws:iam::aws:policy/ComprehendFullAccess", 
+  "AWSAgentlessDiscoveryService": "arn:aws:iam::aws:policy/AWSAgentlessDiscoveryService", 
+  "CloudWatchReadOnlyAccess": "arn:aws:iam::aws:policy/CloudWatchReadOnlyAccess", 
+  "AmazonElasticMapReduceReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonElasticMapReduceReadOnlyAccess", 
+  "CloudWatchAgentAdminPolicy": "arn:aws:iam::aws:policy/CloudWatchAgentAdminPolicy", 
+  "AWSCodeStarServiceRole": "arn:aws:iam::aws:policy/service-role/AWSCodeStarServiceRole", 
+  "AmazonMacieSetupRole": "arn:aws:iam::aws:policy/service-role/AmazonMacieSetupRole", 
+  "AWSLambdaENIManagementAccess": "arn:aws:iam::aws:policy/service-role/AWSLambdaENIManagementAccess", 
+  "AWSOpsWorksInstanceRegistration": "arn:aws:iam::aws:policy/AWSOpsWorksInstanceRegistration", 
+  "AWSDirectoryServiceFullAccess": "arn:aws:iam::aws:policy/AWSDirectoryServiceFullAccess", 
+  "CloudWatchEventsBuiltInTargetExecutionAccess": "arn:aws:iam::aws:policy/service-role/CloudWatchEventsBuiltInTargetExecutionAccess", 
+  "AWSIoTFullAccess": "arn:aws:iam::aws:policy/AWSIoTFullAccess", 
+  "ServiceCatalogAdminReadOnlyAccess": "arn:aws:iam::aws:policy/ServiceCatalogAdminReadOnlyAccess", 
+  "AWSGreengrassFullAccess": "arn:aws:iam::aws:policy/AWSGreengrassFullAccess", 
+  "AWSCodeCommitFullAccess": "arn:aws:iam::aws:policy/AWSCodeCommitFullAccess", 
+  "AlexaForBusinessGatewayExecution": "arn:aws:iam::aws:policy/AlexaForBusinessGatewayExecution", 
+  "AWSMigrationHubFullAccess": "arn:aws:iam::aws:policy/AWSMigrationHubFullAccess", 
+  "AWSMarketplaceMeteringFullAccess": "arn:aws:iam::aws:policy/AWSMarketplaceMeteringFullAccess", 
+  "CloudFrontFullAccess": "arn:aws:iam::aws:policy/CloudFrontFullAccess", 
+  "AmazonAthenaFullAccess": "arn:aws:iam::aws:policy/AmazonAthenaFullAccess", 
+  "AWSCodeDeployRoleForLambda": "arn:aws:iam::aws:policy/service-role/AWSCodeDeployRoleForLambda", 
+  "AWSElasticLoadBalancingServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSElasticLoadBalancingServiceRolePolicy", 
+  "AmazonKinesisFullAccess": "arn:aws:iam::aws:policy/AmazonKinesisFullAccess", 
+  "AWSApplicationAutoscalingEMRInstanceGroupPolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSApplicationAutoscalingEMRInstanceGroupPolicy", 
+  "AWSArtifactAccountSync": "arn:aws:iam::aws:policy/service-role/AWSArtifactAccountSync", 
+  "AWSBatchFullAccess": "arn:aws:iam::aws:policy/AWSBatchFullAccess", 
+  "AmazonRoute53FullAccess": "arn:aws:iam::aws:policy/AmazonRoute53FullAccess", 
+  "AWSTrustedAdvisorServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSTrustedAdvisorServiceRolePolicy", 
+  "AWSCodePipelineFullAccess": "arn:aws:iam::aws:policy/AWSCodePipelineFullAccess", 
+  "AmazonWorkMailFullAccess": "arn:aws:iam::aws:policy/AmazonWorkMailFullAccess", 
+  "TranslateReadOnly": "arn:aws:iam::aws:policy/TranslateReadOnly", 
+  "AmazonDMSVPCManagementRole": "arn:aws:iam::aws:policy/service-role/AmazonDMSVPCManagementRole", 
+  "AWSCodeCommitReadOnly": "arn:aws:iam::aws:policy/AWSCodeCommitReadOnly", 
+  "CloudWatchEventsFullAccess": "arn:aws:iam::aws:policy/CloudWatchEventsFullAccess", 
+  "AWSDataPipelineRole": "arn:aws:iam::aws:policy/service-role/AWSDataPipelineRole", 
+  "AmazonMobileAnalyticsWriteOnlyAccess": "arn:aws:iam::aws:policy/AmazonMobileAnalyticsWriteOnlyAccess", 
+  "AWSLambdaFullAccess": "arn:aws:iam::aws:policy/AWSLambdaFullAccess", 
+  "APIGatewayServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/APIGatewayServiceRolePolicy", 
+  "DataScientist": "arn:aws:iam::aws:policy/job-function/DataScientist", 
+  "AmazonLexReadOnly": "arn:aws:iam::aws:policy/AmazonLexReadOnly", 
+  "AWSDataPipeline_FullAccess": "arn:aws:iam::aws:policy/AWSDataPipeline_FullAccess", 
+  "AWSCloud9Administrator": "arn:aws:iam::aws:policy/AWSCloud9Administrator", 
+  "AmazonRDSServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AmazonRDSServiceRolePolicy", 
+  "AmazonMachineLearningManageRealTimeEndpointOnlyAccess": "arn:aws:iam::aws:policy/AmazonMachineLearningManageRealTimeEndpointOnlyAccess", 
+  "AutoScalingReadOnlyAccess": "arn:aws:iam::aws:policy/AutoScalingReadOnlyAccess", 
+  "AWSApplicationAutoscalingECSServicePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSApplicationAutoscalingECSServicePolicy", 
+  "AmazonECS_FullAccess": "arn:aws:iam::aws:policy/AmazonECS_FullAccess", 
+  "AmazonMechanicalTurkFullAccess": "arn:aws:iam::aws:policy/AmazonMechanicalTurkFullAccess", 
+  "AmazonS3FullAccess": "arn:aws:iam::aws:policy/AmazonS3FullAccess", 
+  "AmazonKinesisFirehoseReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonKinesisFirehoseReadOnlyAccess", 
+  "AWSCodeStarFullAccess": "arn:aws:iam::aws:policy/AWSCodeStarFullAccess", 
+  "AmazonElasticsearchServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AmazonElasticsearchServiceRolePolicy", 
+  "AmazonWorkSpacesAdmin": "arn:aws:iam::aws:policy/AmazonWorkSpacesAdmin", 
+  "AmazonMechanicalTurkCrowdReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonMechanicalTurkCrowdReadOnlyAccess", 
+  "AmazonRoute53DomainsFullAccess": "arn:aws:iam::aws:policy/AmazonRoute53DomainsFullAccess", 
+  "AmazonEC2ContainerRegistryReadOnly": "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly", 
+  "AmazonRekognitionFullAccess": "arn:aws:iam::aws:policy/AmazonRekognitionFullAccess", 
+  "AWSLambdaRole": "arn:aws:iam::aws:policy/service-role/AWSLambdaRole", 
+  "AWSApplicationAutoscalingEC2SpotFleetRequestPolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSApplicationAutoscalingEC2SpotFleetRequestPolicy", 
+  "CloudFrontReadOnlyAccess": "arn:aws:iam::aws:policy/CloudFrontReadOnlyAccess", 
+  "AmazonCloudDirectoryFullAccess": "arn:aws:iam::aws:policy/AmazonCloudDirectoryFullAccess", 
+  "AWSIoTRuleActions": "arn:aws:iam::aws:policy/service-role/AWSIoTRuleActions", 
+  "AmazonEC2SpotFleetTaggingRole": "arn:aws:iam::aws:policy/service-role/AmazonEC2SpotFleetTaggingRole", 
+  "AWSLambdaDynamoDBExecutionRole": "arn:aws:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole", 
+  "AmazonElastiCacheReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonElastiCacheReadOnlyAccess", 
+  "AWSMigrationHubDiscoveryAccess": "arn:aws:iam::aws:policy/service-role/AWSMigrationHubDiscoveryAccess", 
+  "AWSLambdaExecute": "arn:aws:iam::aws:policy/AWSLambdaExecute", 
+  "AWSIoTDataAccess": "arn:aws:iam::aws:policy/AWSIoTDataAccess", 
+  "AmazonChimeReadOnly": "arn:aws:iam::aws:policy/AmazonChimeReadOnly", 
+  "AlexaForBusinessDeviceSetup": "arn:aws:iam::aws:policy/AlexaForBusinessDeviceSetup", 
+  "AmazonRedshiftFullAccess": "arn:aws:iam::aws:policy/AmazonRedshiftFullAccess", 
+  "AmazonDRSVPCManagement": "arn:aws:iam::aws:policy/AmazonDRSVPCManagement", 
+  "AWSAccountUsageReportAccess": "arn:aws:iam::aws:policy/AWSAccountUsageReportAccess", 
+  "VMImportExportRoleForAWSConnector": "arn:aws:iam::aws:policy/service-role/VMImportExportRoleForAWSConnector", 
+  "AWSDirectConnectFullAccess": "arn:aws:iam::aws:policy/AWSDirectConnectFullAccess", 
+  "AutoScalingNotificationAccessRole": "arn:aws:iam::aws:policy/service-role/AutoScalingNotificationAccessRole", 
+  "AmazonElasticMapReduceFullAccess": "arn:aws:iam::aws:policy/AmazonElasticMapReduceFullAccess", 
+  "AmazonEC2ContainerServiceFullAccess": "arn:aws:iam::aws:policy/AmazonEC2ContainerServiceFullAccess", 
+  "AmazonCognitoReadOnly": "arn:aws:iam::aws:policy/AmazonCognitoReadOnly", 
+  "AWSApplicationDiscoveryServiceFullAccess": "arn:aws:iam::aws:policy/AWSApplicationDiscoveryServiceFullAccess", 
+  "AmazonDMSRedshiftS3Role": "arn:aws:iam::aws:policy/service-role/AmazonDMSRedshiftS3Role", 
+  "AmazonSSMAutomationApproverAccess": "arn:aws:iam::aws:policy/AmazonSSMAutomationApproverAccess", 
+  "AWSMobileHub_ServiceUseOnly": "arn:aws:iam::aws:policy/service-role/AWSMobileHub_ServiceUseOnly", 
+  "AmazonAPIGatewayInvokeFullAccess": "arn:aws:iam::aws:policy/AmazonAPIGatewayInvokeFullAccess", 
+  "ReadOnlyAccess": "arn:aws:iam::aws:policy/ReadOnlyAccess", 
+  "DynamoDBReplicationServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/DynamoDBReplicationServiceRolePolicy", 
+  "AmazonSSMMaintenanceWindowRole": "arn:aws:iam::aws:policy/service-role/AmazonSSMMaintenanceWindowRole", 
+  "AmazonGuardDutyFullAccess": "arn:aws:iam::aws:policy/AmazonGuardDutyFullAccess", 
+  "AWSWAFReadOnlyAccess": "arn:aws:iam::aws:policy/AWSWAFReadOnlyAccess", 
+  "AutoScalingConsoleReadOnlyAccess": "arn:aws:iam::aws:policy/AutoScalingConsoleReadOnlyAccess", 
+  "AmazonRoute53ReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonRoute53ReadOnlyAccess", 
+  "AmazonGuardDutyReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonGuardDutyReadOnlyAccess", 
+  "AmazonElasticFileSystemReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonElasticFileSystemReadOnlyAccess", 
+  "AmazonEC2ContainerRegistryPowerUser": "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryPowerUser", 
+  "AWSElasticBeanstalkFullAccess": "arn:aws:iam::aws:policy/AWSElasticBeanstalkFullAccess", 
+  "AmazonSSMFullAccess": "arn:aws:iam::aws:policy/AmazonSSMFullAccess", 
+  "Billing": "arn:aws:iam::aws:policy/job-function/Billing", 
+  "AWSElasticBeanstalkServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSElasticBeanstalkServiceRolePolicy", 
+  "LexBotPolicy": "arn:aws:iam::aws:policy/aws-service-role/LexBotPolicy", 
+  "AmazonDMSCloudWatchLogsRole": "arn:aws:iam::aws:policy/service-role/AmazonDMSCloudWatchLogsRole", 
+  "AWSOrganizationsServiceTrustPolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSOrganizationsServiceTrustPolicy", 
+  "AmazonEC2SpotFleetAutoscaleRole": "arn:aws:iam::aws:policy/service-role/AmazonEC2SpotFleetAutoscaleRole", 
+  "AWSIoTThingsRegistration": "arn:aws:iam::aws:policy/service-role/AWSIoTThingsRegistration", 
+  "IsengardControllerPolicy": "arn:aws:iam::aws:policy/aws-service-role/IsengardControllerPolicy", 
+  "AmazonRDSDirectoryServiceAccess": "arn:aws:iam::aws:policy/service-role/AmazonRDSDirectoryServiceAccess", 
+  "AmazonElasticTranscoderJobsSubmitter": "arn:aws:iam::aws:policy/AmazonElasticTranscoderJobsSubmitter", 
+  "AWSCodePipelineReadOnlyAccess": "arn:aws:iam::aws:policy/AWSCodePipelineReadOnlyAccess", 
+  "AWSEC2SpotFleetServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSEC2SpotFleetServiceRolePolicy", 
+  "AlexaForBusinessReadOnlyAccess": "arn:aws:iam::aws:policy/AlexaForBusinessReadOnlyAccess", 
+  "AWSOpsWorksRegisterCLI": "arn:aws:iam::aws:policy/AWSOpsWorksRegisterCLI", 
+  "CloudWatchFullAccess": "arn:aws:iam::aws:policy/CloudWatchFullAccess", 
+  "AmazonEC2ContainerServiceEventsRole": "arn:aws:iam::aws:policy/service-role/AmazonEC2ContainerServiceEventsRole", 
+  "AWSAccountActivityAccess": "arn:aws:iam::aws:policy/AWSAccountActivityAccess", 
+  "AmazonGlacierReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonGlacierReadOnlyAccess", 
+  "AWSCloudHSMFullAccess": "arn:aws:iam::aws:policy/AWSCloudHSMFullAccess", 
+  "AWSMigrationHubDMSAccess": "arn:aws:iam::aws:policy/service-role/AWSMigrationHubDMSAccess", 
+  "AWSAppSyncInvokeFullAccess": "arn:aws:iam::aws:policy/AWSAppSyncInvokeFullAccess", 
+  "RDSCloudHsmAuthorizationRole": "arn:aws:iam::aws:policy/service-role/RDSCloudHsmAuthorizationRole", 
+  "AmazonTranscribeFullAccess": "arn:aws:iam::aws:policy/AmazonTranscribeFullAccess", 
+  "AmazonChimeFullAccess": "arn:aws:iam::aws:policy/AmazonChimeFullAccess", 
+  "AmazonKinesisReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonKinesisReadOnlyAccess", 
+  "AmazonKinesisVideoStreamsFullAccess": "arn:aws:iam::aws:policy/AmazonKinesisVideoStreamsFullAccess", 
+  "AWSEC2SpotServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSEC2SpotServiceRolePolicy", 
+  "AWSResourceGroupsReadOnlyAccess": "arn:aws:iam::aws:policy/AWSResourceGroupsReadOnlyAccess", 
+  "AWSLambdaBasicExecutionRole": "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
+  "AWSCloudTrailReadOnlyAccess": "arn:aws:iam::aws:policy/AWSCloudTrailReadOnlyAccess", 
+  "AWSXrayReadOnlyAccess": "arn:aws:iam::aws:policy/AWSXrayReadOnlyAccess", 
+  "AWSPriceListServiceFullAccess": "arn:aws:iam::aws:policy/AWSPriceListServiceFullAccess", 
+  "AmazonRedshiftServiceLinkedRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AmazonRedshiftServiceLinkedRolePolicy", 
+  "AWSOpsWorksFullAccess": "arn:aws:iam::aws:policy/AWSOpsWorksFullAccess", 
+  "AmazonElasticTranscoderFullAccess": "arn:aws:iam::aws:policy/AmazonElasticTranscoderFullAccess", 
+  "AWSElasticBeanstalkWorkerTier": "arn:aws:iam::aws:policy/AWSElasticBeanstalkWorkerTier", 
+  "AWSLambdaReadOnlyAccess": "arn:aws:iam::aws:policy/AWSLambdaReadOnlyAccess", 
+  "AmazonSNSFullAccess": "arn:aws:iam::aws:policy/AmazonSNSFullAccess", 
+  "AlexaForBusinessFullAccess": "arn:aws:iam::aws:policy/AlexaForBusinessFullAccess", 
+  "SimpleWorkflowFullAccess": "arn:aws:iam::aws:policy/SimpleWorkflowFullAccess", 
+  "ResourceGroupsandTagEditorReadOnlyAccess": "arn:aws:iam::aws:policy/ResourceGroupsandTagEditorReadOnlyAccess", 
+  "AmazonKinesisFirehoseFullAccess": "arn:aws:iam::aws:policy/AmazonKinesisFirehoseFullAccess", 
+  "AmazonMacieFullAccess": "arn:aws:iam::aws:policy/AmazonMacieFullAccess", 
+  "AmazonEC2SpotFleetRole": "arn:aws:iam::aws:policy/service-role/AmazonEC2SpotFleetRole", 
+  "AmazonPollyReadOnlyAccess": "arn:aws:iam::aws:policy/AmazonPollyReadOnlyAccess", 
+  "AWSElementalMediaPackageReadOnly": "arn:aws:iam::aws:policy/AWSElementalMediaPackageReadOnly", 
+  "AmazonMechanicalTurkCrowdFullAccess": "arn:aws:iam::aws:policy/AmazonMechanicalTurkCrowdFullAccess"
+}
\ No newline at end of file
diff --git a/samcli/lib/samlib/local_uri_plugin.py b/samcli/lib/samlib/local_uri_plugin.py
new file mode 100644
index 0000000000..e7ec0294af
--- /dev/null
+++ b/samcli/lib/samlib/local_uri_plugin.py
@@ -0,0 +1,23 @@
+"""
+Plugin to validate and convert local paths for CodeUri and DefinitionUri into mock S3 paths. This is required
+for SAM Parser and Validator to work because the underlying SAM library expects the URIs to be S3 paths.
+"""
+
+from samtranslator.public.plugins import BasePlugin
+
+
+class SupportLocalUriPlugin(BasePlugin):
+
+    _SERVERLESS_FUNCTION = "AWS::Serverless::Function"
+
+    def __init__(self):
+        """
+        Initialize the plugin
+        """
+        super(SupportLocalUriPlugin, self).__init__(SupportLocalUriPlugin.__name__)
+
+    def on_before_transform_resource(self, logical_id, resource_type, resource_properties):
+
+        if resource_type == self._SERVERLESS_FUNCTION and not resource_properties.get("CodeUri"):
+            # If CodeUri is *not* present, set it to "." which is functionally equivalent
+            resource_properties["CodeUri"] = "."
diff --git a/samcli/lib/samlib/wrapper.py b/samcli/lib/samlib/wrapper.py
new file mode 100644
index 0000000000..fe07319067
--- /dev/null
+++ b/samcli/lib/samlib/wrapper.py
@@ -0,0 +1,145 @@
+"""
+Wrapper for the SAM Translator and Parser classes.
+
+##### NOTE #####
+This module uses internal packages of SAM Translator library in order to provide a nice interface for the CLI. This is
+a tech debt that we have decided to take on. This will be eventually thrown away when SAM Translator exposes a
+rich public interface.
+"""
+
+import copy
+import os
+import json
+import boto3
+
+# SAM Translator Library Internal module imports #
+from samtranslator.model.exceptions import \
+    InvalidDocumentException, InvalidTemplateException, InvalidResourceException, InvalidEventException
+from samtranslator.validator.validator import SamTemplateValidator
+from samtranslator.model import ResourceTypeResolver, sam_resources
+from samtranslator.plugins import LifeCycleEvents
+from samtranslator.translator.translator import prepare_plugins, Translator
+from samtranslator.translator.managed_policy_translator import ManagedPolicyLoader
+from samtranslator.parser.parser import Parser
+
+from samcli.commands.validate.lib.exceptions import InvalidSamDocumentException
+from .local_uri_plugin import SupportLocalUriPlugin
+
+
+class SamTranslatorWrapper(object):
+
+    _thisdir = os.path.dirname(os.path.abspath(__file__))
+    _DEFAULT_MANAGED_POLICIES_FILE = os.path.join(_thisdir, "default_managed_policies.json")
+
+    def __init__(self, sam_template, offline_fallback=True):
+        """
+
+        Parameters
+        ----------
+        sam_template dict:
+            SAM Template dictionary
+        offline_fallback bool:
+            Set it to True to make the translator work entirely offline, if internet is not available
+        """
+        self.local_uri_plugin = SupportLocalUriPlugin()
+        self.extra_plugins = [
+            # Extra plugin specific to the SAM CLI that will support local paths for CodeUri & DefinitionUri
+            self.local_uri_plugin
+        ]
+
+        self._sam_template = sam_template
+        self._offline_fallback = offline_fallback
+
+    def run_plugins(self, convert_local_uris=True):
+        template_copy = self.template
+
+        additional_plugins = []
+        if convert_local_uris:
+            # Add all the plugins to convert local path if asked to.
+            additional_plugins.append(self.local_uri_plugin)
+
+        parser = _SamParserReimplemented()
+        all_plugins = prepare_plugins(additional_plugins)
+
+        try:
+            parser.parse(template_copy, all_plugins)  # parse() will run all configured plugins
+        except InvalidDocumentException as e:
+            raise InvalidSamDocumentException(
+                reduce(lambda message, error: message + ' ' + error.message, e.causes, e.message))
+
+        return template_copy
+
+    def __translate(self, parameter_values):
+        """
+        This method is unused and a Work In Progress
+        """
+
+        template_copy = self.template
+
+        sam_parser = Parser()
+        sam_translator = Translator(managed_policy_map=self.__managed_policy_map(),
+                                    sam_parser=sam_parser,
+                                    # Default plugins are already initialized within the Translator
+                                    plugins=self.extra_plugins)
+
+        return sam_translator.translate(sam_template=template_copy,
+                                        parameter_values=parameter_values)
+
+    @property
+    def template(self):
+        return copy.deepcopy(self._sam_template)
+
+    def __managed_policy_map(self):
+        """
+        This method is unused and a Work In Progress
+        """
+        try:
+            iam_client = boto3.client('iam')
+            return ManagedPolicyLoader(iam_client).load()
+        except Exception as ex:
+
+            if self._offline_fallback:
+                # If offline flag is set, then fall back to the list of default managed policies
+                # This should be sufficient for most cases
+                with open(self._DEFAULT_MANAGED_POLICIES_FILE, 'r') as fp:
+                    return json.load(fp)
+
+            # Offline is not enabled. So just raise the exception
+            raise ex
+
+
+class _SamParserReimplemented(object):
+    """
+    Re-implementation (almost copy) of Parser class from SAM Translator
+    """
+
+    def parse(self, sam_template, sam_plugins):
+        self._validate(sam_template)
+        sam_plugins.act(LifeCycleEvents.before_transform_template, sam_template)
+        macro_resolver = ResourceTypeResolver(sam_resources)
+        document_errors = []
+
+        for logical_id, resource in sam_template["Resources"].items():
+            try:
+                if macro_resolver.can_resolve(resource):
+                    macro_resolver \
+                        .resolve_resource_type(resource) \
+                        .from_dict(logical_id, resource, sam_plugins=sam_plugins)
+            except (InvalidResourceException, InvalidEventException) as e:
+                document_errors.append(e)
+
+        if document_errors:
+            raise InvalidDocumentException(document_errors)
+
+    def _validate(self, sam_template):
+        """ Validates the template and parameter values and raises exceptions if there's an issue
+
+        :param dict sam_template: SAM template
+        """
+
+        if "Resources" not in sam_template or not isinstance(sam_template["Resources"], dict) \
+                or not sam_template["Resources"]:
+            raise InvalidDocumentException(
+                [InvalidTemplateException("'Resources' section is required")])
+
+        SamTemplateValidator.validate(sam_template)
diff --git a/samcli/local/__init__.py b/samcli/local/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/local/apigw/__init__.py b/samcli/local/apigw/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/local/apigw/path_converter.py b/samcli/local/apigw/path_converter.py
new file mode 100644
index 0000000000..c862b51efc
--- /dev/null
+++ b/samcli/local/apigw/path_converter.py
@@ -0,0 +1,55 @@
+"""
+Converter class that handles the conversion of paths from Api Gateway to Flask and back.
+"""
+
+import re
+
+FLASK_PATH_PARAMS = "/<path:proxy>"
+APIGW_PATH_PARAMS_ESCAPED = r"/{proxy\+}"
+APIGW_PATH_PARAMS = "/{proxy+}"
+LEFT_BRACKET = "{"
+RIGHT_BRACKET = "}"
+LEFT_ANGLE_BRACKET = "<"
+RIGHT_ANGLE_BRACKET = ">"
+
+APIGW_TO_FLASK_REGEX = re.compile(APIGW_PATH_PARAMS_ESCAPED)
+FLASK_TO_APIGW_REGEX = re.compile(FLASK_PATH_PARAMS)
+
+
+class PathConverter(object):
+
+    @staticmethod
+    def convert_path_to_flask(path):
+        """
+        Converts a Path from an Api Gateway defined path to one that is accepted by Flask
+
+        Examples:
+
+        '/id/{id}' => '/id/<id>'
+        '/{proxy+}' => '/<path:proxy>'
+
+        :param str path: Path to convert to Flask defined path
+        :return str: Path representing a Flask path
+        """
+        proxy_sub_path = APIGW_TO_FLASK_REGEX.sub(FLASK_PATH_PARAMS, path)
+
+        # Replace the '{' and '}' with '<' and '>' respectively
+        return proxy_sub_path.replace(LEFT_BRACKET, LEFT_ANGLE_BRACKET).replace(RIGHT_BRACKET, RIGHT_ANGLE_BRACKET)
+
+    @staticmethod
+    def convert_path_to_api_gateway(path):
+        """
+        Converts a Path from a Flask defined path to one that is accepted by Api Gateway
+
+        Examples:
+
+        '/id/<id>' => '/id/{id}'
+        '/<path:proxy>' => '/{proxy+}'
+
+        :param str path: Path to convert to Api Gateway defined path
+        :return str: Path representing an Api Gateway path
+        """
+        proxy_sub_path = FLASK_TO_APIGW_REGEX.sub(APIGW_PATH_PARAMS, path)
+
+        # Replace the '<' and '>' with '{' and '}' respectively
+        return proxy_sub_path.replace(LEFT_ANGLE_BRACKET, LEFT_BRACKET).replace(RIGHT_ANGLE_BRACKET, RIGHT_BRACKET)
diff --git a/samcli/local/apigw/service.py b/samcli/local/apigw/service.py
new file mode 100644
index 0000000000..e21312187c
--- /dev/null
+++ b/samcli/local/apigw/service.py
@@ -0,0 +1,386 @@
+"""API Gateway Local Service"""
+import io
+import json
+import logging
+import base64
+
+from flask import Flask, request, Response
+
+from samcli.local.lambdafn.exceptions import FunctionNotFound
+from samcli.local.events.api_event import ContextIdentity, RequestContext, ApiGatewayLambdaEvent
+from .service_error_responses import ServiceErrorResponses
+from .path_converter import PathConverter
+
+LOG = logging.getLogger(__name__)
+
+
+class Route(object):
+
+    def __init__(self, methods, function_name, path, binary_types=None):
+        """
+        Creates an ApiGatewayRoute
+
+        :param list(str) methods: List of HTTP Methods
+        :param function_name: Name of the Lambda function this API is connected to
+        :param str path: Path off the base url
+        """
+        self.methods = methods
+        self.function_name = function_name
+        self.path = path
+        self.binary_types = binary_types or []
+
+
+class Service(object):
+
+    _DEFAULT_PORT = 3000
+    _DEFAULT_HOST = '127.0.0.1'
+
+    def __init__(self, routing_list, lambda_runner, static_dir=None, port=None, host=None, stderr=None):
+        """
+        Creates an ApiGatewayService
+
+        :param list(ApiGatewayCallModel) routing_list: A list of the Model that represent
+          the service paths to create.
+        :param samcli.commands.local.lib.local_lambda.LocalLambdaRunner lambda_runner: The Lambda runner class capable
+            of invoking the function
+        :param str static_dir: Directory from which to serve static files
+        :param int port: Optional. port for the service to start listening on
+          Defaults to 3000
+        :param str host: Optional. host to start the service on
+          Defaults to '0.0.0.0'
+        :param io.BaseIO stderr: Optional stream where the stderr from Docker container should be written to
+        """
+        self.routing_list = routing_list
+        self.lambda_runner = lambda_runner
+        self.static_dir = static_dir
+        self.port = port or self._DEFAULT_PORT
+        self.host = host or self._DEFAULT_HOST
+        self._dict_of_routes = {}
+        self._app = None
+        self.stderr = stderr
+
+    def create(self):
+        """
+        Creates a Flask Application that can be started.
+        """
+
+        self._app = Flask(__name__,
+                          static_url_path="",  # Mount static files at root '/'
+                          static_folder=self.static_dir  # Serve static files from this directory
+                          )
+
+        for api_gateway_route in self.routing_list:
+            path = PathConverter.convert_path_to_flask(api_gateway_route.path)
+            for route_key in self._generate_route_keys(api_gateway_route.methods,
+                                                       path):
+                self._dict_of_routes[route_key] = api_gateway_route
+
+            self._app.add_url_rule(path,
+                                   endpoint=path,
+                                   view_func=self._request_handler,
+                                   methods=api_gateway_route.methods)
+
+        self._construct_error_handling()
+
+    def _generate_route_keys(self, methods, path):
+        """
+        Generates the key to the _dict_of_routes based on the list of methods
+        and path supplied
+
+        :param list(str) methods: List of HTTP Methods
+        :param str path: Path off the base url
+        :return: str of Path:Method
+        """
+        for method in methods:
+            yield self._route_key(method, path)
+
+    @staticmethod
+    def _route_key(method, path):
+        return '{}:{}'.format(path, method)
+
+    def _construct_error_handling(self):
+        """
+        Updates the Flask app with Error Handlers for different Error Codes
+        """
+        # Both path and method not present
+        self._app.register_error_handler(404, ServiceErrorResponses.route_not_found)
+        # Path is present, but method not allowed
+        self._app.register_error_handler(405, ServiceErrorResponses.route_not_found)
+        # Something went wrong
+        self._app.register_error_handler(500, ServiceErrorResponses.lambda_failure_response)
+
+    def run(self):
+        """
+        This starts up the (threaded) Local Server.
+        Note: This is a **blocking call**
+
+        :raise RuntimeError: If the service was not created
+        """
+
+        if not self._app:
+            raise RuntimeError("The application must be created before running")
+
+        # Flask can operate as a single threaded server (which is default) and a multi-threaded server which is
+        # more for development. When the Lambda container is going to be debugged, then it does not make sense
+        # to turn on multi-threading because customers can realistically attach only one container at a time to
+        # the debugger. Keeping this single threaded also enables the Lambda Runner to handle Ctrl+C in order to
+        # kill the container gracefully (Ctrl+C can be handled only by the main thread)
+        multi_threaded = not self.lambda_runner.is_debugging()
+
+        LOG.debug("Local API Server starting up. Multi-threading = %s", multi_threaded)
+        self._app.run(threaded=multi_threaded, host=self.host, port=self.port)
+
+    def _request_handler(self, **kwargs):
+        """
+        We handle all requests to the host:port. The general flow of handling a request is as follows
+
+        * Fetch request from the Flask Global state. This is where Flask places the request and is per thread so
+          multiple requests are still handled correctly
+        * Find the Lambda function to invoke by doing a look up based on the request.endpoint and method
+        * If we don't find the function, we will throw a 502 (just like the 404 and 405 responses we get
+          from Flask.
+        * Since we found a Lambda function to invoke, we construct the Lambda Event from the request
+        * Then Invoke the Lambda function (docker container)
+        * We then transform the response or errors we get from the Invoke and return the data back to
+          the caller
+
+        :param kwargs dict: Keyword Args that are passed to the function from Flask. This happens when we have
+            Path Parameters.
+        :return: Response object
+        """
+        route = self._get_current_route(request)
+
+        try:
+            event = self._construct_event(request, self.port, route.binary_types)
+        except UnicodeDecodeError:
+            return ServiceErrorResponses.lambda_failure_response()
+
+        stdout_stream = io.BytesIO()
+
+        try:
+            self.lambda_runner.invoke(route.function_name, event, stdout=stdout_stream, stderr=self.stderr)
+        except FunctionNotFound:
+            return ServiceErrorResponses.lambda_not_found_response()
+
+        lambda_response, lambda_logs = self._get_lambda_output(stdout_stream)
+
+        if self.stderr and lambda_logs:
+            # Write the logs to stderr if available.
+            self.stderr.write(lambda_logs)
+
+        try:
+            (status_code, headers, body) = self._parse_lambda_output(lambda_response,
+                                                                     route.binary_types,
+                                                                     request)
+        except (KeyError, TypeError, ValueError):
+            LOG.error("Function returned an invalid response (must include one of: body, headers or "
+                      "statusCode in the response object). Response received: %s", lambda_response)
+            return ServiceErrorResponses.lambda_failure_response()
+
+        return self._service_response(body, headers, status_code)
+
+    @staticmethod
+    def _service_response(body, headers, status_code):
+        """
+        Constructs a Flask Response from the body, headers, and status_code.
+
+        :param str body: Response body as a string
+        :param dict headers: headers for the response
+        :param int status_code: status_code for response
+        :return: Flask Response
+        """
+        response = Response(body)
+        response.headers = headers
+        response.status_code = status_code
+        return response
+
+    def _get_current_route(self, flask_request):
+        """
+        Get the route (Route) based on the current request
+
+        :param request flask_request: Flask Request
+        :return: Route matching the endpoint and method of the request
+        """
+        endpoint = flask_request.endpoint
+        method = flask_request.method
+
+        route_key = self._route_key(method, endpoint)
+        route = self._dict_of_routes.get(route_key, None)
+
+        if not route:
+            LOG.debug("Lambda function for the route not found. This should not happen because Flask is "
+                      "already configured to serve all path/methods given to the service. "
+                      "Path=%s Method=%s RouteKey=%s", endpoint, method, route_key)
+            raise KeyError("Lambda function for the route not found")
+
+        return route
+
+    @staticmethod
+    def _get_lambda_output(stdout_stream):
+        """
+        This method will extract read the given stream and return the response from Lambda function separated out
+        from any log statements it might have outputted. Logs end up in the stdout stream if the Lambda function
+        wrote directly to stdout using System.out.println or equivalents.
+
+        Parameters
+        ----------
+        stdout_stream : io.BaseIO
+            Stream to fetch data from
+
+        Returns
+        -------
+        str
+            String data containing response from Lambda function
+        str
+            String data containng logs statements, if any.
+        """
+        # We only want the last line of stdout, because it's possible that
+        # the function may have written directly to stdout using
+        # System.out.println or similar, before docker-lambda output the result
+        stdout_data = stdout_stream.getvalue().rstrip('\n')
+
+        # Usually the output is just one line and contains response as JSON string, but if the Lambda function
+        # wrote anything directly to stdout, there will be additional lines. So just extract the last line as
+        # response and everything else as log output.
+        lambda_response = stdout_data
+        lambda_logs = None
+
+        last_line_position = stdout_data.rfind('\n')
+        if last_line_position > 0:
+            # So there are multiple lines. Separate them out.
+            # Everything but the last line are logs
+            lambda_logs = stdout_data[:last_line_position]
+            # Last line is Lambda response. Make sure to strip() so we get rid of extra whitespaces & newlines around
+            lambda_response = stdout_data[last_line_position:].strip()
+
+        return lambda_response, lambda_logs
+
+    # Consider moving this out to its own class. Logic is started to get dense and looks messy @jfuss
+    @staticmethod
+    def _parse_lambda_output(lambda_output, binary_types, flask_request):
+        """
+        Parses the output from the Lambda Container
+
+        :param str lambda_output: Output from Lambda Invoke
+        :return: Tuple(int, dict, str, bool)
+        """
+        json_output = json.loads(lambda_output)
+
+        if not isinstance(json_output, dict):
+            raise TypeError("Lambda returned %{s} instead of dict", type(json_output))
+
+        status_code = json_output.get("statusCode") or 200
+        headers = json_output.get("headers") or {}
+        body = json_output.get("body") or "no data"
+        is_base_64_encoded = json_output.get("isBase64Encoded") or False
+
+        if not isinstance(status_code, int) or status_code <= 0:
+            message = "statusCode must be a positive int"
+            LOG.error(message)
+            raise TypeError(message)
+
+        # If the customer doesn't define Content-Type default to application/json
+        if "Content-Type" not in headers:
+            LOG.info("No Content-Type given. Defaulting to 'application/json'.")
+            headers["Content-Type"] = "application/json"
+
+        if Service._should_base64_decode_body(binary_types, flask_request, headers, is_base_64_encoded):
+            body = base64.b64decode(body)
+
+        return status_code, headers, body
+
+    @staticmethod
+    def _should_base64_decode_body(binary_types, flask_request, lamba_response_headers, is_base_64_encoded):
+        """
+        Whether or not the body should be decoded from Base64 to Binary
+
+        Parameters
+        ----------
+        binary_types list(basestring)
+            Corresponds to self.binary_types (aka. what is parsed from SAM Template
+        flask_request flask.request
+            Flask request
+        lamba_response_headers dict
+            Headers Lambda returns
+        is_base_64_encoded bool
+            True if the body is Base64 encoded
+
+        Returns
+        -------
+        True if the body from the request should be converted to binary, otherwise false
+
+        """
+        best_match_mimetype = flask_request.accept_mimetypes.best_match([lamba_response_headers["Content-Type"]])
+        is_best_match_in_binary_types = best_match_mimetype in binary_types or '*/*' in binary_types
+
+        return best_match_mimetype and is_best_match_in_binary_types and is_base_64_encoded
+
+    @staticmethod
+    def _construct_event(flask_request, port, binary_types):
+        """
+        Helper method that constructs the Event to be passed to Lambda
+
+        :param request flask_request: Flask Request
+        :return: String representing the event
+        """
+
+        identity = ContextIdentity(source_ip=flask_request.remote_addr)
+
+        endpoint = PathConverter.convert_path_to_api_gateway(flask_request.endpoint)
+        method = flask_request.method
+
+        request_data = flask_request.data
+
+        request_mimetype = flask_request.mimetype
+
+        is_base_64 = Service._should_base64_encode(binary_types, request_mimetype)
+
+        if is_base_64:
+            LOG.debug("Incoming Request seems to be binary. Base64 encoding the request data before sending to Lambda.")
+            request_data = base64.b64encode(request_data)
+        elif request_data:
+            # Flask does not parse/decode the request data. We should do it ourselves
+            request_data = request_data.decode('utf-8')
+
+        context = RequestContext(resource_path=endpoint,
+                                 http_method=method,
+                                 stage="prod",
+                                 identity=identity,
+                                 path=endpoint)
+
+        event_headers = dict(flask_request.headers)
+        event_headers["X-Forwarded-Proto"] = flask_request.scheme
+        event_headers["X-Forwarded-Port"] = str(port)
+
+        event = ApiGatewayLambdaEvent(http_method=method,
+                                      body=request_data,
+                                      resource=endpoint,
+                                      request_context=context,
+                                      query_string_params=flask_request.args,
+                                      headers=event_headers,
+                                      path_parameters=flask_request.view_args,
+                                      path=flask_request.path,
+                                      is_base_64_encoded=is_base_64)
+
+        event_str = json.dumps(event.to_dict())
+        LOG.debug("Constructed String representation of Event to invoke Lambda. Event: %s", event_str)
+        return event_str
+
+    @staticmethod
+    def _should_base64_encode(binary_types, request_mimetype):
+        """
+        Whether or not to encode the data from the request to Base64
+
+        Parameters
+        ----------
+        binary_types list(basestring)
+            Corresponds to self.binary_types (aka. what is parsed from SAM Template
+        request_mimetype str
+            Mimetype for the request
+
+        Returns
+        -------
+            True if the data should be encoded to Base64 otherwise False
+
+        """
+        return request_mimetype in binary_types or "*/*" in binary_types
diff --git a/samcli/local/apigw/service_error_responses.py b/samcli/local/apigw/service_error_responses.py
new file mode 100644
index 0000000000..e32f6ec23a
--- /dev/null
+++ b/samcli/local/apigw/service_error_responses.py
@@ -0,0 +1,44 @@
+"""Class container to hold common Service Responses"""
+
+from flask import jsonify, make_response
+
+
+class ServiceErrorResponses(object):
+
+    _NO_LAMBDA_INTEGRATION = {"message": "No function defined for resource method"}
+    _MISSING_AUTHENTICATION = {"message": "Missing Authentication Token"}
+    _LAMBDA_FAILURE = {"message": "Internal server error"}
+
+    HTTP_STATUS_CODE_502 = 502
+    HTTP_STATUS_CODE_403 = 403
+
+    @staticmethod
+    def lambda_failure_response(*args):
+        """
+        Helper function to create a Lambda Failure Response
+
+        :return: A Flask Response
+        """
+        response_data = jsonify(ServiceErrorResponses._LAMBDA_FAILURE)
+        return make_response(response_data, ServiceErrorResponses.HTTP_STATUS_CODE_502)
+
+    @staticmethod
+    def lambda_not_found_response(*args):
+        """
+        Constructs a Flask Response for when a Lambda function is not found for an endpoint
+
+        :return: a Flask Response
+        """
+        response_data = jsonify(ServiceErrorResponses._NO_LAMBDA_INTEGRATION)
+        return make_response(response_data, ServiceErrorResponses.HTTP_STATUS_CODE_502)
+
+    @staticmethod
+    def route_not_found(*args):
+        """
+        Constructs a Flask Response for when a API Route (path+method) is not found. This is usually
+        HTTP 404 but with API Gateway this is a HTTP 403 (https://forums.aws.amazon.com/thread.jspa?threadID=2166840)
+
+        :return: a Flask Response
+        """
+        response_data = jsonify(ServiceErrorResponses._MISSING_AUTHENTICATION)
+        return make_response(response_data, ServiceErrorResponses.HTTP_STATUS_CODE_403)
diff --git a/samcli/local/docker/__init__.py b/samcli/local/docker/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/local/docker/attach_api.py b/samcli/local/docker/attach_api.py
new file mode 100644
index 0000000000..08c1824e1a
--- /dev/null
+++ b/samcli/local/docker/attach_api.py
@@ -0,0 +1,173 @@
+"""
+Wrapper to Docker Attach API
+"""
+
+import struct
+from docker.utils.socket import read, read_exactly, SocketError
+
+
+def attach(docker_client, container, stdout=True, stderr=True, logs=False):
+    """
+
+    Implements a method that wraps Docker Attach API to attach to a container and demux stdout and stderr data from the
+    single data stream that Docker API returns.
+
+    The signature of this method is intentionally similar to Docker Python SDK's ``attach()`` method except for the
+    addition of one parameter called `demux` which, if set to True, will return an iterator that provides the stream
+    data along with a stream type identifier. Caller can handle the data appropriately.
+
+    Parameters
+    ----------
+    docker_client : docker.Client
+        Docker client used to talk to Docker daemon
+
+    container : docker.container
+        Instance of the container to attach to
+
+    stdout : bool
+        Do you want to get stdout data?
+
+    stderr : bool
+        Do you want to get stderr data?
+
+    logs : bool
+        Do you want to include the container's previous output?
+    """
+
+    headers = {
+        "Connection": "Upgrade",
+        "Upgrade": "tcp"
+    }
+
+    query_params = {
+        "stdout": 1 if stdout else 0,
+        "stderr": 1 if stderr else 0,
+        "logs": 1 if logs else 0,
+        "stream": 1,  # Yes, we always stream
+        "stdin": 0,  # We don't support stdin
+    }
+
+    # API client is a lower level Docker client that wraps the Docker APIs. It has methods that will help us
+    # talk to the API directly. It is an instance of ``docker.APIClient``. We are going to use private methods of
+    # class here because it is sometimes more convenient.
+    api_client = docker_client.api
+
+    # URL where the Docker daemon is running
+    url = "{}/containers/{}/attach".format(api_client.base_url, container.id)
+
+    # Send out the attach request and read the socket for response
+    response = api_client._post(url, headers=headers, params=query_params, stream=True)  # pylint: disable=W0212
+    socket = api_client._get_raw_response_socket(response)  # pylint: disable=W0212
+
+    return _read_socket(socket)
+
+
+def _read_socket(socket):
+    """
+    The stdout and stderr data from the container multiplexed into one stream of response from the Docker API.
+    It follows the protocol described here https://docs.docker.com/engine/api/v1.30/#operation/ContainerAttach.
+    The stream starts with a 8 byte header that contains the frame type and also payload size. Follwing that is the
+    actual payload of given size. Once you read off this payload, we are ready to read the next header.
+
+    This method will follow this protocol to read payload from the stream and return an iterator that returns
+    a tuple containing the frame type and frame data. Callers can handle the data appropriately based on the frame
+    type.
+
+        Stdout => Frame Type = 1
+        Stderr => Frame Type = 2
+
+
+    Parameters
+    ----------
+    socket
+        Socket to read responses from
+
+    Yields
+    -------
+    int
+        Type of the stream (1 => stdout, 2 => stderr)
+    str
+        Data in the stream
+    """
+
+    # Keep reading the stream until the stream terminates
+    while True:
+
+        try:
+
+            payload_type, payload_size = _read_header(socket)
+            if payload_size < 0:
+                # Something is wrong with the data stream. Payload size can't be less than zero
+                break
+
+            for data in _read_payload(socket, payload_size):
+                yield payload_type, data
+
+        except SocketError:
+            # There isn't enough data in the stream. Probably the socket terminated
+            break
+
+
+def _read_payload(socket, payload_size):
+    """
+    From the given socket, reads and yields payload of the given size. With sockets, we don't receive all data at
+    once. Therefore this method will yield each time we read some data from the socket until the payload_size has
+    reached or socket has no more data.
+
+    Parameters
+    ----------
+    socket
+        Socket to read from
+
+    payload_size : int
+        Size of the payload to read. Exactly these many bytes are read from the socket before stopping the yield.
+
+    Yields
+    -------
+    int
+        Type of the stream (1 => stdout, 2 => stderr)
+    str
+        Data in the stream
+    """
+
+    remaining = payload_size
+    while remaining > 0:
+
+        # Try and read as much as possible
+        data = read(socket, remaining)
+        if data is None:
+            # ``read`` will terminate with an empty string. This is just a transient state where we didn't get any data
+            continue
+
+        if len(data) == 0:  # pylint: disable=C1801
+            # Empty string. Socket does not have any more data. We are done here even if we haven't read full payload
+            break
+
+        remaining -= len(data)
+        yield data
+
+
+def _read_header(socket):
+    """
+    Reads the header from socket stream to determine the size of next frame to read. Header is 8 bytes long, where
+    the first byte is the stream type and last four bytes (bigendian) is size of the payload
+
+        header := [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}
+
+    Parameters
+    ----------
+    socket
+        Socket to read the responses from
+
+    Returns
+    -------
+    int
+        Type of the frame
+    int
+        Size of the payload
+    """
+
+    data = read_exactly(socket, 8)
+
+    # >BxxxL is the struct notation to unpack data in correct header format in big-endian
+    return struct.unpack('>BxxxL', data)
diff --git a/samcli/local/docker/container.py b/samcli/local/docker/container.py
new file mode 100644
index 0000000000..aa2357c5d7
--- /dev/null
+++ b/samcli/local/docker/container.py
@@ -0,0 +1,253 @@
+"""
+Representation of a generic Docker container
+"""
+
+import logging
+import docker
+
+from samcli.local.docker.attach_api import attach
+
+LOG = logging.getLogger(__name__)
+
+
+class Container(object):
+    """
+    Represents an instance of a Docker container with a specific configuration. The container is not actually created
+    or executed until the appropriate methods are called. Each container instance is uniquely identified by an ID that
+    the Docker Daemon creates when the container is started.
+
+    NOTE: This class does not download container images. It should be pulled separately and made available before
+          creating a container with this class
+    """
+
+    # This frame type value is coming directly from Docker Attach Stream API spec
+    _STDOUT_FRAME_TYPE = 1
+    _STDERR_FRAME_TYPE = 2
+
+    def __init__(self,
+                 image,
+                 cmd,
+                 working_dir,
+                 host_dir,
+                 memory_limit_mb=None,
+                 exposed_ports=None,
+                 entrypoint=None,
+                 env_vars=None,
+                 docker_client=None):
+        """
+        Initializes the class with given configuration. This does not automatically create or run the container.
+
+        :param string image: Name of the Docker image to create container with
+        :param string working_dir: Working directory for the container
+        :param string host_dir: Directory in the host operating system that should be mounted to the ``working_dir`` on
+            container
+        :param list cmd: Command to pass to container
+        :param int memory_limit_mb: Optional. Max limit of memory in MegaBytes this Lambda function can use.
+        :param dict exposed_ports: Optional. Dict of ports to expose
+        :param list entrypoint: Optional. Entry point process for the container. Defaults to the value in Dockerfile
+        :param dict env_vars: Optional. Dict of environment variables to setup in the container
+        """
+
+        self._image = image
+        self._cmd = cmd
+        self._working_dir = working_dir
+        self._host_dir = host_dir
+        self._exposed_ports = exposed_ports
+        self._entrypoint = entrypoint
+        self._env_vars = env_vars
+        self._memory_limit_mb = memory_limit_mb
+        self._network_id = None
+
+        # Use the given Docker client or create new one
+        self.docker_client = docker_client or docker.from_env()
+
+        # Runtime properties of the container. They won't have value until container is created or started
+        self.id = None
+
+    def create(self):
+        """
+        Calls Docker API to creates the Docker container instance. Creating the container does *not* run the container.
+        Use ``start`` method to run the container
+
+        :return string: ID of the created container
+        :raise RuntimeError: If this method is called after a container already has been created
+        """
+
+        if self.is_created():
+            raise RuntimeError("This container already exists. Cannot create again.")
+
+        LOG.info("Mounting %s as %s:ro inside runtime container", self._host_dir, self._working_dir)
+
+        kwargs = {
+            "command": self._cmd,
+            "working_dir": self._working_dir,
+            "volumes": {
+                self._host_dir: {
+                    # Mount the host directory as "read only" directory inside container at working_dir
+                    # https://docs.docker.com/storage/bind-mounts
+                    # Mount the host directory as "read only" inside container
+                    "bind": self._working_dir,
+                    "mode": "ro"
+                }
+            },
+            # We are not running an interactive shell here.
+            "tty": False
+        }
+
+        if self._env_vars:
+            kwargs["environment"] = self._env_vars
+
+        if self._exposed_ports:
+            kwargs["ports"] = self._exposed_ports
+
+        if self._entrypoint:
+            kwargs["entrypoint"] = self._entrypoint
+
+        if self._memory_limit_mb:
+            # Ex: 128m => 128MB
+            kwargs["mem_limit"] = "{}m".format(self._memory_limit_mb)
+
+        real_container = self.docker_client.containers.create(self._image, **kwargs)
+        self.id = real_container.id
+
+        if self.network_id:
+            network = self.docker_client.networks.get(self.network_id)
+            network.connect(self.id)
+
+        return self.id
+
+    def delete(self):
+        """
+        Removes a container that was created earlier.
+        """
+
+        if not self.is_created():
+            LOG.debug("Container was not created. Skipping deletion")
+            return
+
+        try:
+            self.docker_client.containers\
+                .get(self.id)\
+                .remove(force=True)  # Remove a container, even if it is running
+        except docker.errors.NotFound:
+            # Container is already not there
+            LOG.debug("Container with ID %s does not exist. Skipping deletion", self.id)
+        except docker.errors.APIError as ex:
+            msg = str(ex)
+            removal_in_progress = ("removal of container" in msg) and ("is already in progress" in msg)
+
+            # When removal is already started, Docker API will throw an exception
+            # Skip such exceptions.
+            if not removal_in_progress:
+                raise ex
+
+        self.id = None
+
+    def start(self, input_data=None):
+        """
+        Calls Docker API to start the container. The container must be created at the first place to run.
+        It waits for the container to complete, fetches both stdout and stderr logs and returns through the
+        given streams.
+
+        :param input_data: Optional. Input data sent to the container through container's stdin.
+        :param io.StringIO stdout: Optional. IO Stream to that receives stdout text from container.
+        :param io.StringIO stderr: Optional. IO Stream that receives stderr text from container
+        """
+
+        if input_data:
+            raise ValueError("Passing input through container's stdin is not supported")
+
+        if not self.is_created():
+            raise RuntimeError("Container does not exist. Cannot start this container")
+
+        # Get the underlying container instance from Docker API
+        real_container = self.docker_client.containers.get(self.id)
+
+        # Start the container
+        real_container.start()
+
+    def wait_for_logs(self, stdout=None, stderr=None):
+
+        # Return instantly if we don't have to fetch any logs
+        if not stdout and not stderr:
+            return
+
+        if not self.is_created():
+            raise RuntimeError("Container does not exist. Cannot get logs for this container")
+
+        real_container = self.docker_client.containers.get(self.id)
+
+        # Fetch both stdout and stderr streams from Docker as a single iterator.
+        logs_itr = attach(self.docker_client,
+                          container=real_container,
+                          stdout=True,
+                          stderr=True,
+                          logs=True)
+
+        self._write_container_output(logs_itr, stdout=stdout, stderr=stderr)
+
+    @staticmethod
+    def _write_container_output(output_itr, stdout=None, stderr=None):
+        """
+        Based on the data returned from the Container output, via the iterator, write it to the appropriate streams
+
+        Parameters
+        ----------
+        output_itr: Iterator
+            Iterator returned by the Docker Attach command
+        stdout: io.BaseIO, optional
+            Stream to write stdout data from Container into
+        stderr: io.BaseIO, optional
+            Stream to write stderr data from the Container into
+        """
+
+        # Iterator returns a tuple of (frame_type, data) where the frame type determines which stream we write output
+        # to
+        for frame_type, data in output_itr:
+
+            if frame_type == Container._STDOUT_FRAME_TYPE and stdout:
+                # Frame type 1 is stdout data.
+                stdout.write(data)
+
+            elif frame_type == Container._STDERR_FRAME_TYPE and stderr:
+                # Frame type 2 is stderr data.
+                stderr.write(data)
+
+            else:
+                # Either an unsupported frame type or stream for this frame type is not configured
+                LOG.debug("Dropping Docker container output because of unconfigured frame type. "
+                          "Frame Type: %s. Data: %s", frame_type, data)
+
+    @property
+    def network_id(self):
+        """
+        Gets the ID of the network this container connects to
+        :return string: ID of the network
+        """
+        return self._network_id
+
+    @network_id.setter
+    def network_id(self, value):
+        """
+        Set the ID of network that this container should connect to
+
+        :param string value: Value of the network ID
+        """
+        self._network_id = value
+
+    @property
+    def image(self):
+        """
+        Returns the image used by this container
+
+        :return string: Name of the container image
+        """
+        return self._image
+
+    def is_created(self):
+        """
+        Checks if a container exists?
+
+        :return bool: True if the container was created
+        """
+        return self.id is not None
diff --git a/samcli/local/docker/lambda_container.py b/samcli/local/docker/lambda_container.py
new file mode 100644
index 0000000000..ac397e93c8
--- /dev/null
+++ b/samcli/local/docker/lambda_container.py
@@ -0,0 +1,221 @@
+"""
+Represents Lambda runtime containers.
+"""
+from enum import Enum
+
+from .container import Container
+
+
+class Runtime(Enum):
+    nodejs = "nodejs"
+    nodejs43 = "nodejs4.3"
+    nodejs610 = "nodejs6.10"
+    nodejs810 = "nodejs8.10"
+    python27 = "python2.7"
+    python36 = "python3.6"
+    java8 = "java8"
+    go1x = "go1.x"
+    dotnetcore20 = "dotnetcore2.0"
+
+    @classmethod
+    def has_value(cls, value):
+        """
+        Checks if the enum has this value
+
+        :param string value: Value to check
+        :return bool: True, if enum has the value
+        """
+        return any(value == item.value for item in cls)
+
+
+class LambdaContainer(Container):
+    """
+    Represents a Lambda runtime container. This class knows how to setup entry points, environment variables,
+    exposed ports etc specific to Lambda runtime container. The container management functionality (create/start/stop)
+    is provided by the base class
+    """
+
+    _IMAGE_REPO_NAME = "lambci/lambda"
+    _WORKING_DIR = "/var/task"
+
+    def __init__(self,
+                 runtime,
+                 handler,
+                 code_dir,
+                 memory_mb=128,
+                 env_vars=None,
+                 debug_port=None,
+                 debug_args=None):
+        """
+        Initializes the class
+
+        :param string runtime: Name of the Lambda runtime
+        :param string handler: Handler of the function to run
+        :param string code_dir: Directory where the Lambda function code is present. This directory will be mounted
+            to the container to execute
+        :param int memory_mb: Optional. Max limit of memory in MegaBytes this Lambda function can use.
+        :param dict env_vars: Optional. Dictionary containing environment variables passed to container
+        :param int debug_port: Optional. Bind the runtime's debugger to this port
+        :param string debug_args: Optional. Extra arguments passed to the entry point to setup debugging
+        """
+
+        if not Runtime.has_value(runtime):
+            raise ValueError("Unsupported Lambda runtime {}".format(runtime))
+
+        image = LambdaContainer._get_image(runtime)
+        ports = LambdaContainer._get_exposed_ports(debug_port)
+        entry = LambdaContainer._get_entry_point(runtime, debug_port, debug_args)
+        cmd = [handler]
+
+        super(LambdaContainer, self).__init__(image,
+                                              cmd,
+                                              self._WORKING_DIR,
+                                              code_dir,
+                                              memory_limit_mb=memory_mb,
+                                              exposed_ports=ports,
+                                              entrypoint=entry,
+                                              env_vars=env_vars)
+
+    @staticmethod
+    def _get_exposed_ports(debug_port):
+        """
+        Return Docker container port binding information. If a debug port is given, then we will ask Docker to
+        bind to same port both inside and outside the container ie. Runtime process is started in debug mode with
+        at given port inside the container and exposed to the host machine at the same port
+
+        :param int debug_port: Optional, integer value of debug port
+        :return dict: Dictionary containing port binding information. None, if debug_port was not given
+        """
+        if not debug_port:
+            return None
+
+        return {
+            # container port : host port
+            debug_port: debug_port
+        }
+
+    @staticmethod
+    def _get_image(runtime):
+        """
+        Returns the name of Docker Image for the given runtime
+
+        :param string runtime: Name of the runtime
+        :return: Name of Docker Image for the given runtime
+        """
+        return "{}:{}".format(LambdaContainer._IMAGE_REPO_NAME, runtime)
+
+    @staticmethod
+    def _get_entry_point(runtime, debug_port=None, debug_args=None):
+        """
+        Returns the entry point for the container. The default value for the entry point is already configured in the
+        Dockerfile. We override this default specifically when enabling debugging. The overridden entry point includes
+        a few extra flags to start the runtime in debug mode.
+
+        :param string runtime: Lambda function runtime name
+        :param int debug_port: Optional, port for debugger
+        :param string debug_args: Optional additional arguments passed to the entry point.
+        :return list: List containing the new entry points. Each element in the list is one portion of the command.
+            ie. if command is ``node index.js arg1 arg2``, then this list will be ["node", "index.js", "arg1", "arg2"]
+        """
+
+        if not debug_port:
+            return None
+
+        debug_args_list = []
+        if debug_args:
+            debug_args_list = debug_args.split(" ")
+
+        # configs from: https://github.com/lambci/docker-lambda
+        # to which we add the extra debug mode options
+        entrypoint = None
+        if runtime == Runtime.java8.value:
+
+            entrypoint = ["/usr/bin/java"] \
+                   + debug_args_list \
+                   + [
+                        "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=" + str(debug_port),
+                        "-XX:MaxHeapSize=1336935k",
+                        "-XX:MaxMetaspaceSize=157286k",
+                        "-XX:ReservedCodeCacheSize=78643k",
+                        "-XX:+UseSerialGC",
+                        # "-Xshare:on", doesn't work in conjunction with the debug options
+                        "-XX:-TieredCompilation",
+                        "-Djava.net.preferIPv4Stack=true",
+                        "-jar",
+                        "/var/runtime/lib/LambdaJavaRTEntry-1.0.jar",
+                   ]
+
+        elif runtime == Runtime.nodejs.value:
+
+            entrypoint = ["/usr/bin/node"] \
+                   + debug_args_list \
+                   + [
+                       "--debug-brk=" + str(debug_port),
+                       "--nolazy",
+                       "--max-old-space-size=1229",
+                       "--max-new-space-size=153",
+                       "--max-executable-size=153",
+                       "--expose-gc",
+                       "/var/runtime/node_modules/awslambda/bin/awslambda",
+                   ]
+
+        elif runtime == Runtime.nodejs43.value:
+
+            entrypoint = ["/usr/local/lib64/node-v4.3.x/bin/node"] \
+                   + debug_args_list \
+                   + [
+                       "--debug-brk=" + str(debug_port),
+                       "--nolazy",
+                       "--max-old-space-size=2547",
+                       "--max-semi-space-size=150",
+                       "--max-executable-size=160",
+                       "--expose-gc",
+                       "/var/runtime/node_modules/awslambda/index.js",
+                   ]
+
+        elif runtime == Runtime.nodejs610.value:
+
+            entrypoint = ["/var/lang/bin/node"] \
+                   + debug_args_list \
+                   + [
+                       "--debug-brk=" + str(debug_port),
+                       "--nolazy",
+                       "--max-old-space-size=2547",
+                       "--max-semi-space-size=150",
+                       "--max-executable-size=160",
+                       "--expose-gc",
+                       "/var/runtime/node_modules/awslambda/index.js",
+                   ]
+
+        elif runtime == Runtime.nodejs810.value:
+
+            entrypoint = ["/var/lang/bin/node"] \
+                    + debug_args_list \
+                    + [
+                        # Node8 requires the host to be explicitly set in order to bind to localhost
+                        # instead of 127.0.0.1. https://github.com/nodejs/node/issues/11591#issuecomment-283110138
+                        "--inspect-brk=0.0.0.0:" + str(debug_port),
+                        "--nolazy",
+                        "--expose-gc",
+                        "--max-semi-space-size=150",
+                        "--max-old-space-size=2707",
+                        "/var/runtime/node_modules/awslambda/index.js",
+                    ]
+
+        elif runtime == Runtime.python27.value:
+
+            entrypoint = ["/usr/bin/python2.7"] \
+                   + debug_args_list \
+                   + [
+                       "/var/runtime/awslambda/bootstrap.py"
+                   ]
+
+        elif runtime == Runtime.python36.value:
+
+            entrypoint = ["/var/lang/bin/python3.6"] \
+                   + debug_args_list \
+                   + [
+                       "/var/runtime/awslambda/bootstrap.py"
+                   ]
+
+        return entrypoint
diff --git a/samcli/local/docker/manager.py b/samcli/local/docker/manager.py
new file mode 100644
index 0000000000..35bcc61d60
--- /dev/null
+++ b/samcli/local/docker/manager.py
@@ -0,0 +1,115 @@
+"""
+Provides classes that interface with Docker to create, execute and manage containers.
+"""
+
+import logging
+import sys
+import docker
+
+LOG = logging.getLogger(__name__)
+
+
+class ContainerManager(object):
+    """
+    This class knows how to interface with Docker to create, execute and manage the container's life cycle. It can
+    run multiple containers in parallel, and also comes with the ability to reuse existing containers in order to
+    serve requests faster. It is also thread-safe.
+    """
+
+    def __init__(self,
+                 docker_network_id=None,
+                 docker_client=None,
+                 skip_pull_image=False):
+        """
+        Instantiate the container manager
+
+        :param docker_network_id: Optional Docker network to run this container in.
+        :param docker_client: Optional docker client object
+        :param bool skip_pull_image: Should we pull new Docker container image?
+        """
+
+        self.skip_pull_image = skip_pull_image
+        self.docker_network_id = docker_network_id
+        self.docker_client = docker_client or docker.from_env()
+
+    def run(self, container, input_data=None, warm=False):
+        """
+        Create and run a Docker container based on the given configuration.
+
+        :param samcli.local.docker.container.Container container: Container to create and run
+        :param input_data: Optional. Input data sent to the container through container's stdin.
+        :param bool warm: Indicates if an existing container can be reused. Defaults False ie. a new container will
+            be created for every request.
+        :raises DockerImageNotFoundException: If the Docker image was not available in the server
+        """
+
+        if warm:
+            raise ValueError("The facility to invoke warm container does not exist")
+
+        image_name = container.image
+
+        # Pull a new image if: a) Image is not available OR b) We are not asked to skip pulling the image
+        if not self.has_image(image_name) or not self.skip_pull_image:
+            self.pull_image(image_name)
+        else:
+            LOG.info("Requested to skip pulling images ...\n")
+
+        if not container.is_created():
+            # Create the container first before running.
+            # Create the container in appropriate Docker network
+            container.network_id = self.docker_network_id
+            container.create()
+
+        container.start(input_data=input_data)
+
+    def stop(self, container):
+        """
+        Stop and delete the container
+
+        :param samcli.local.docker.container.Container container: Container to stop
+        """
+        container.delete()
+
+    def pull_image(self, image_name, stream=None):
+        """
+        Ask Docker to pull the container image with given name.
+
+        :param string image_name: Name of the image
+        :param stream: Optional stream to write output to. Defaults to stderr
+        :raises DockerImageNotFoundException: If the Docker image was not available in the server
+        """
+        stream = stream or sys.stderr
+        try:
+            result_itr = self.docker_client.api.pull(image_name, stream=True, decode=True)
+        except docker.errors.ImageNotFound as ex:
+            raise DockerImageNotFoundException(str(ex))
+
+        # io streams, especially StringIO, work only with unicode strings
+        stream.write(u"\nFetching {} Docker container image...".format(image_name))
+
+        # Each line contains information on progress of the pull. Each line is a JSON string
+        for _ in result_itr:
+            # For every line, print a dot to show progress
+            stream.write(u'.')
+            stream.flush()
+
+        # We are done. Go to the next line
+        stream.write(u"\n")
+
+    def has_image(self, image_name):
+        """
+        Is the container image with given name available?
+
+        :param string image_name: Name of the image
+        :return bool: True, if image is available. False, otherwise
+        """
+
+        try:
+            self.docker_client.images.get(image_name)
+            return True
+        except docker.errors.ImageNotFound:
+            return False
+
+
+class DockerImageNotFoundException(Exception):
+    pass
diff --git a/samcli/local/events/__init__.py b/samcli/local/events/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/local/events/api_event.py b/samcli/local/events/api_event.py
new file mode 100644
index 0000000000..83ee88845a
--- /dev/null
+++ b/samcli/local/events/api_event.py
@@ -0,0 +1,201 @@
+"""Holds Classes for API Gateway to Lambda Events"""
+
+
+class ContextIdentity(object):
+
+    def __init__(self,
+                 api_key=None,
+                 user_arn=None,
+                 cognito_authentication_type=None,
+                 caller=None,
+                 user_agent="Custom User Agent String",
+                 user=None,
+                 cognito_identity_pool_id=None,
+                 cognito_authentication_provider=None,
+                 source_ip="127.0.0.1",
+                 account_id=None):
+        """
+        Constructs a ContextIdentity
+
+        :param str api_key: API Key used for the request
+        :param str user_arn: ARN of the caller
+        :param str cognito_authentication_type: Auth Type used
+        :param str caller: Caller that make the request
+        :param str user_agent: User agent (Default: Custom User Agent String)
+        :param str user: User
+        :param str cognito_identity_pool_id: Identity Pool Id used
+        :param str cognito_authentication_provider: Auth Provider
+        :param str source_ip: Source Ip of the request (Default: 127.0.0.1)
+        :param str account_id: Account Id of the request
+        """
+        self.api_key = api_key
+        self.user_arn = user_arn
+        self.cognito_authentication_type = cognito_authentication_type
+        self.caller = caller
+        self.user_agent = user_agent
+        self.user = user
+        self.cognito_identity_pool_id = cognito_identity_pool_id
+        self.cognito_authentication_provider = cognito_authentication_provider
+        self.source_ip = source_ip
+        self.account_id = account_id
+
+    def to_dict(self):
+        """
+        Constructs an dictionary representation of the Identity Object to be used in serializing to JSON
+
+        :return: dict representing the object
+        """
+        json_dict = {"apiKey": self.api_key,
+                     "userArn": self.user_arn,
+                     "cognitoAuthenticationType": self.cognito_authentication_type,
+                     "caller": self.caller,
+                     "userAgent": self.user_agent,
+                     "user": self.user,
+                     "cognitoIdentityPoolId": self.cognito_identity_pool_id,
+                     "cognitoAuthenticationProvider": self.cognito_authentication_provider,
+                     "sourceIp": self.source_ip,
+                     "accountId": self.account_id
+                     }
+
+        return json_dict
+
+
+class RequestContext(object):
+
+    def __init__(self,
+                 resource_id="123456",
+                 api_id="1234567890",
+                 resource_path=None,
+                 http_method=None,
+                 request_id="c6af9ac6-7b61-11e6-9a41-93e8deadbeef",
+                 account_id="123456789012",
+                 stage=None,
+                 identity=None,
+                 extended_request_id=None,
+                 path=None):
+        """
+        Constructs a RequestContext
+
+        :param str resource_id: Resource Id of the Request (Default: 123456)
+        :param str api_id: Api Id for the Request (Default: 1234567890)
+        :param str resource_path: Path for the Request
+        :param str http_method: HTTPMethod for the request
+        :param str request_id: Request Id for the request (Default: c6af9ac6-7b61-11e6-9a41-93e8deadbeef)
+        :param str account_id: Account Id of the Request (Default: 123456789012)
+        :param str stage: Api Gateway Stage
+        :param ContextIdentity identity: Identity for the Request
+        :param str extended_request_id:
+        :param str path:
+        """
+
+        self.resource_id = resource_id
+        self.api_id = api_id
+        self.resource_path = resource_path
+        self.http_method = http_method
+        self.request_id = request_id
+        self.account_id = account_id
+        self.stage = stage
+        self.identity = identity
+        self.extended_request_id = extended_request_id
+        self.path = path
+
+    def to_dict(self):
+        """
+        Constructs an dictionary representation of the RequestContext Object to be used in serializing to JSON
+
+        :return: dict representing the object
+        """
+        identity_dict = {}
+        if self.identity:
+            identity_dict = self.identity.to_dict()
+
+        json_dict = {"resourceId": self.resource_id,
+                     "apiId": self.api_id,
+                     "resourcePath": self.resource_path,
+                     "httpMethod": self.http_method,
+                     "requestId": self.request_id,
+                     "accountId": self.account_id,
+                     "stage": self.stage,
+                     "identity": identity_dict,
+                     "extendedRequestId": self.extended_request_id,
+                     "path": self.path
+                     }
+
+        return json_dict
+
+
+class ApiGatewayLambdaEvent(object):
+
+    def __init__(self,
+                 http_method=None,
+                 body=None,
+                 resource=None,
+                 request_context=None,
+                 query_string_params=None,
+                 headers=None,
+                 path_parameters=None,
+                 stage_variables=None,
+                 path=None,
+                 is_base_64_encoded=False):
+        """
+        Constructs an ApiGatewayLambdaEvent
+
+        :param str http_method: HTTPMethod of the request
+        :param str body: Body or data for the request
+        :param str resource: Resource for the reqeust
+        :param RequestContext request_context: RequestContext for the request
+        :param dict query_string_params: Query String parameters
+        :param dict headers: dict of the request Headers
+        :param dict path_parameters: Path Parameters
+        :param dict stage_variables: API Gateway Stage Variables
+        :param str path: Path of the request
+        :param bool is_base_64_encoded: True if the data is base64 encoded.
+        """
+
+        if not isinstance(query_string_params, dict) and \
+                query_string_params is not None:
+            raise TypeError("'query_string_params' must be of type dict or None")
+
+        if not isinstance(headers, dict) and headers is not None:
+            raise TypeError("'headers' must be of type dict or None")
+
+        if not isinstance(path_parameters, dict) and path_parameters is not None:
+            raise TypeError("'path_parameters' must be of type dict or None")
+
+        if not isinstance(stage_variables, dict) and stage_variables is not None:
+            raise TypeError("'stage_variables' must be of type dict or None")
+
+        self.http_method = http_method
+        self.body = body
+        self.resource = resource
+        self.request_context = request_context
+        self.query_string_params = query_string_params
+        self.headers = headers
+        self.path_parameters = path_parameters
+        self.stage_variables = stage_variables
+        self.path = path
+        self.is_base_64_encoded = is_base_64_encoded
+
+    def to_dict(self):
+        """
+        Constructs an dictionary representation of the ApiGatewayLambdaEvent Object to be used in serializing to JSON
+
+        :return: dict representing the object
+        """
+        request_context_dict = {}
+        if self.request_context:
+            request_context_dict = self.request_context.to_dict()
+
+        json_dict = {"httpMethod": self.http_method,
+                     "body": self.body if self.body else None,
+                     "resource": self.resource,
+                     "requestContext": request_context_dict,
+                     "queryStringParameters": dict(self.query_string_params) if self.query_string_params else None,
+                     "headers": dict(self.headers) if self.headers else None,
+                     "pathParameters": dict(self.path_parameters) if self.path_parameters else None,
+                     "stageVariables": dict(self.stage_variables) if self.stage_variables else None,
+                     "path": self.path,
+                     "isBase64Encoded": self.is_base_64_encoded
+                     }
+
+        return json_dict
diff --git a/samcli/local/init/__init__.py b/samcli/local/init/__init__.py
new file mode 100644
index 0000000000..209c1e96a4
--- /dev/null
+++ b/samcli/local/init/__init__.py
@@ -0,0 +1,86 @@
+"""
+Init module to scaffold a project app from a template
+"""
+import logging
+import os
+
+from cookiecutter.main import cookiecutter
+from cookiecutter.exceptions import CookiecutterException
+from samcli.local.init.exceptions import GenerateProjectFailedError
+
+LOG = logging.getLogger(__name__)
+
+_init_path = os.path.dirname(__file__)
+_templates = os.path.join(_init_path, 'templates')
+
+RUNTIME_TEMPLATE_MAPPING = {
+    "python3.6": os.path.join(_templates, "cookiecutter-aws-sam-hello-python"),
+    "python2.7": os.path.join(_templates, "cookiecutter-aws-sam-hello-python"),
+    "python": os.path.join(_templates, "cookiecutter-aws-sam-hello-python"),
+    "nodejs6.10": os.path.join(_templates, "cookiecutter-aws-sam-hello-nodejs"),
+    "nodejs8.10": os.path.join(_templates, "cookiecutter-aws-sam-hello-nodejs"),
+    "nodejs4.3": os.path.join(_templates, "cookiecutter-aws-sam-hello-nodejs"),
+    "nodejs": os.path.join(_templates, "cookiecutter-aws-sam-hello-nodejs"),
+    "dotnetcore2.0": os.path.join(_templates, "cookiecutter-aws-sam-hello-dotnet"),
+    "dotnetcore1.0": os.path.join(_templates, "cookiecutter-aws-sam-hello-dotnet"),
+    "dotnetcore": os.path.join(_templates, "cookiecutter-aws-sam-hello-dotnet"),
+    "dotnet": os.path.join(_templates, "cookiecutter-aws-sam-hello-dotnet"),
+    "go1.x": os.path.join(_templates, "cookiecutter-aws-sam-hello-golang"),
+    "go": os.path.join(_templates, "cookiecutter-aws-sam-hello-golang"),
+    "java8": os.path.join(_templates, "cookiecutter-aws-sam-hello-java"),
+    "java": os.path.join(_templates, "cookiecutter-aws-sam-hello-java")
+}
+
+
+def generate_project(
+        location=None, runtime="nodejs",
+        output_dir=".", name='sam-sample-app', no_input=False):
+    """Generates project using cookiecutter and options given
+
+    Generate project scaffolds a project using default templates if user
+    doesn't provide one via location parameter. Default templates are
+    automatically chosen depending on runtime given by the user.
+
+    Parameters
+    ----------
+    location: Path, optional
+        Git, HTTP, Local path or Zip containing cookiecutter template
+        (the default is None, which means no custom template)
+    runtime: str, optional
+        Lambda Runtime (the default is "nodejs", which creates a nodejs project)
+    output_dir: str, optional
+        Output directory where project should be generated
+        (the default is ".", which implies current folder)
+    name: str, optional
+        Name of the project
+        (the default is "sam-sample-app", which implies a project named sam-sample-app will be created)
+    no_input : bool, optional
+        Whether to prompt for input or to accept default values
+        (the default is False, which prompts the user for values it doesn't know for baking)
+
+    Raises
+    ------
+    GenerateProjectFailedError
+        If the process of baking a project fails
+    """
+
+    params = {
+        "template": location if location else RUNTIME_TEMPLATE_MAPPING[runtime],
+        "output_dir": output_dir,
+        "no_input": no_input
+    }
+
+    LOG.debug("Parameters dict created with input given")
+    LOG.debug("%s", params)
+
+    if not location and name is not None:
+        params['extra_context'] = {'project_name': name, 'runtime': runtime}
+        params['no_input'] = True
+        LOG.debug("Parameters dict updated with project name as extra_context")
+        LOG.debug("%s", params)
+
+    try:
+        LOG.debug("Baking a new template with cookiecutter with all parameters")
+        cookiecutter(**params)
+    except CookiecutterException as e:
+        raise GenerateProjectFailedError(project=name, provider_error=e)
diff --git a/samcli/local/init/exceptions.py b/samcli/local/init/exceptions.py
new file mode 100644
index 0000000000..e53981e8d6
--- /dev/null
+++ b/samcli/local/init/exceptions.py
@@ -0,0 +1,17 @@
+"""
+Custom Exceptions for Init module
+"""
+
+
+class InitErrorException(Exception):
+    fmt = 'An unspecified error occurred'
+
+    def __init__(self, **kwargs):
+        msg = self.fmt.format(**kwargs)
+        Exception.__init__(self, msg)
+        self.kwargs = kwargs
+
+
+class GenerateProjectFailedError(InitErrorException):
+    fmt = \
+        ("An error ocurred while generating this {project}: {provider_error}")
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/.gitignore b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/.gitignore
new file mode 100644
index 0000000000..74ea25e0e5
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/.gitignore
@@ -0,0 +1,168 @@
+
+# Created by https://www.gitignore.io/api/osx,linux,python,windows
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### OSX ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+.pytest_cache/
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule.*
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+
+# End of https://www.gitignore.io/api/osx,linux,python,windows
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/LICENSE b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/LICENSE
new file mode 100644
index 0000000000..f19aaa6d09
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/LICENSE
@@ -0,0 +1,14 @@
+MIT No Attribution
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/Pipfile b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/Pipfile
new file mode 100644
index 0000000000..a22660daae
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/Pipfile
@@ -0,0 +1,13 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+cookiecutter = "*"
+pytest-cookies = "*"
+pytest = "*"
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/README.md b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/README.md
new file mode 100644
index 0000000000..a324e12e26
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/README.md
@@ -0,0 +1,42 @@
+# Cookiecutter SAM for dotNet based Lambda functions
+
+This is a [Cookiecutter](https://github.com/audreyr/cookiecutter) template to create a Serverless Hello World App based on Serverless Application Model (SAM) and dotnet 2.0.
+
+It is important to note that you should not try to `git clone` this project but use `cookiecutter` CLI instead as ``{{cookiecutter.project_name}}`` will be rendered based on your input and therefore all variables and files will be rendered properly.
+
+## Requirements
+
+Install `cookiecutter` command line:
+
+**Pip users**:
+
+* `pip install cookiecutter`
+
+**Homebrew users**:
+
+* `brew install cookiecutter`
+
+**Windows or Pipenv users**:
+
+* `pipenv install cookiecutter`
+
+**NOTE**: [`Pipenv`](https://github.com/pypa/pipenv) is the new and recommended Python packaging tool that works across multiple platforms and makes Windows a first-class citizen.
+
+## Usage
+
+Generate a new SAM based Serverless App: `cookiecutter gh:aws-samples/cookiecutter-aws-sam-hello-dotnet`. 
+
+You'll be prompted a few questions to help this cookiecutter template to scaffold this project and after its completed you should see a new folder at your current path with the name of the project you gave as input.
+
+**NOTE**: After you understand how cookiecutter works (cookiecutter.json, mainly), you can fork this repo and apply your own mechanisms to accelerate your development process and this can be followed for any programming language and OS.
+
+
+# Credits
+
+* This project has been generated with [Cookiecutter](https://github.com/audreyr/cookiecutter)
+
+
+License
+-------
+
+This project is licensed under the terms of the [MIT License with no attribution](/LICENSE)
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/cookiecutter.json b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/cookiecutter.json
new file mode 100644
index 0000000000..135672404c
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/cookiecutter.json
@@ -0,0 +1,3 @@
+{
+    "project_name": "Name of the project"
+}
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/setup.cfg b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/setup.cfg
new file mode 100644
index 0000000000..eee4ab11a7
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/setup.cfg
@@ -0,0 +1,2 @@
+[install]
+prefix= 
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/tests/test_cookiecutter.py b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/tests/test_cookiecutter.py
new file mode 100644
index 0000000000..285b06b26c
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/tests/test_cookiecutter.py
@@ -0,0 +1,47 @@
+"""
+    Tests cookiecutter baking process and rendered content
+"""
+
+
+def test_project_tree(cookies):
+    result = cookies.bake(extra_context={
+        'project_name': 'hello sam'
+    })
+    assert result.exit_code == 0
+    assert result.exception is None
+    assert result.project.basename == 'hello sam'
+    assert result.project.isdir()
+    assert result.project.join('.gitignore').isfile()
+    assert result.project.join('template.yaml').isfile()
+    assert result.project.join('README.md').isfile()
+    assert result.project.join('src').isdir()
+    assert result.project.join('test').isdir()
+    assert result.project.join('src', 'HelloWorld').isdir()
+    assert result.project.join(
+        'src', 'HelloWorld', 'HelloWorld.csproj').isfile()
+    assert result.project.join('src', 'HelloWorld', 'Program.cs').isfile()
+    assert result.project.join(
+        'src', 'HelloWorld', 'aws-lambda-tools-defaults.json').isfile()
+    assert result.project.join(
+        'test', 'HelloWorld.Test', 'FunctionTest.cs').isfile()
+    assert result.project.join(
+        'test', 'HelloWorld.Test', 'HelloWorld.Tests.csproj').isfile()
+
+
+def test_app_content(cookies):
+    result = cookies.bake(extra_context={'project_name': 'my_lambda'})
+    app_file = result.project.join('src', 'HelloWorld', 'Program.cs')
+    app_content = app_file.readlines()
+    app_content = ''.join(app_content)
+
+    contents = (
+        "GetCallingIP",
+        "GetStringAsync",
+        "location",
+        "message",
+        "hello world",
+        "StatusCode"
+    )
+
+    for content in contents:
+        assert content in app_content
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/.gitignore b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/.gitignore
new file mode 100644
index 0000000000..9baa19505f
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/.gitignore
@@ -0,0 +1,405 @@
+
+# Created by https://www.gitignore.io/api/macos,linux,windows,sublimetext,dotsettings,visualstudio,visualstudiocode
+
+### DotSettings ###
+*.DotSettings
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### SublimeText ###
+# cache files for sublime text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+
+# workspace files are user-specific
+*.sublime-workspace
+
+# project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using SublimeText
+# *.sublime-project
+
+# sftp configuration file
+sftp-config.json
+
+# Package control specific files
+Package Control.last-run
+Package Control.ca-list
+Package Control.ca-bundle
+Package Control.system-ca-bundle
+Package Control.cache/
+Package Control.ca-certs/
+Package Control.merged-ca-bundle
+Package Control.user-ca-bundle
+oscrypto-ca-bundle.crt
+bh_unicode_properties.cache
+
+# Sublime-github package stores a github token in this file
+# https://packagecontrol.io/packages/sublime-github
+GitHub.sublime-settings
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+### VisualStudio ###
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Uncomment the next line to ignore your web deploy settings.
+# By default, sensitive information, such as encrypted password
+# should be stored in the .pubxml.user file.
+#*.pubxml
+*.pubxml.user
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+### VisualStudio Patch ###
+# By default, sensitive information, such as encrypted password
+# should be stored in the .pubxml.user file.
+
+
+# End of https://www.gitignore.io/api/macos,linux,windows,sublimetext,dotsettings,visualstudio,visualstudiocode
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/README.md b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/README.md
new file mode 100644
index 0000000000..a530dc0ee3
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/README.md
@@ -0,0 +1,130 @@
+# {{ cookiecutter.project_name }}
+
+This is a sample template for {{ cookiecutter.project_name }}
+
+## Requirements
+
+* AWS CLI already configured with at least PowerUser permission
+* [Docker installed](https://www.docker.com/community-edition)
+* [SAM Local installed](https://github.com/awslabs/aws-sam-cli)
+* [DotNet Core installed](https://www.microsoft.com/net/download/macos)
+
+## Setup process
+
+### Creating the project and its dependencies
+
+In this example we use DotNet Core CLI to bundle our project with its dependencies:
+
+```bash
+dotnet publish src/HelloWorld
+```
+
+### Local development
+
+**Invoking function locally through local API Gateway**
+
+```bash
+sam local start-api
+```
+
+**SAM Local** is used to emulate both Lambda and API Gateway locally and uses our `template.yaml` to understand how to bootstrap this environment (runtime, where the source code is, etc.) - The following excerpt is what the CLI will read in order to initialize an API and its routes:
+
+```yaml
+...
+Events:
+    {{cookiecutter.project_name}}:
+        Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+        Properties:
+            Path: /hello
+            Method: get
+```
+
+
+If the previous command run successfully you should now be able to hit the following local endpoint to invoke your function `http://localhost:3000/hello`
+
+## Packaging and deployment
+
+AWS Lambda C# runtime requires a flat folder with all dependencies including the application. SAM will use `CodeUri` property to know where to look up for both application and dependencies:
+
+```yaml
+...
+    FirstFunction:
+        Type: AWS::Serverless::Function
+        Properties:
+            CodeUri: src/HelloWorld/bin/Debug/netcoreapp2.0/publish            
+            ...
+```
+
+First and foremost, we need an `S3 bucket` where we can upload our Lambda functions packaged as ZIP before we deploy anything - If you don't have a S3 bucket to store code artifacts then this is a good time to create one:
+
+```bash
+aws s3 mb s3://BUCKET_NAME
+```
+
+Next, run the following command to package our Lambda function to S3:
+
+```bash
+sam package \
+    --template-file template.yaml \
+    --output-template-file packaged.yaml \
+    --s3-bucket REPLACE_THIS_WITH_YOUR_S3_BUCKET_NAME
+```
+
+Next, the following command will create a Cloudformation Stack and deploy your SAM resources.
+
+```bash
+sam deploy \
+    --template-file packaged.yaml \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --capabilities CAPABILITY_IAM
+```
+
+> **See [Serverless Application Model (SAM) HOWTO Guide](https://github.com/awslabs/serverless-application-model/blob/master/HOWTO.md) for more details in how to get started.**
+
+After deployment is complete you can run the following command to retrieve the API Gateway Endpoint URL:
+
+```bash
+aws cloudformation describe-stacks \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --query 'Stacks[].Outputs'
+```
+## Testing
+
+For testing our code, we use XUnit and you can use `dotnet test` to run tests defined under `test/`
+
+```bash
+dotnet test test/HelloWorld.Test
+```
+# Appendix
+
+## AWS CLI commands
+
+AWS CLI commands to package, deploy and describe outputs defined within the cloudformation stack:
+
+```bash
+aws cloudformation package \
+    --template-file template.yaml \
+    --output-template-file packaged.yaml \
+    --s3-bucket REPLACE_THIS_WITH_YOUR_S3_BUCKET_NAME
+
+aws cloudformation deploy \
+    --template-file packaged.yaml \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --capabilities CAPABILITY_IAM \
+    --parameter-overrides MyParameterSample=MySampleValue
+
+aws cloudformation describe-stacks \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} --query 'Stacks[].Outputs'
+```
+
+## Bringing to the next level
+
+Here are a few ideas that you can use to get more acquainted as to how this overall process works:
+
+* Create an additional API resource (e.g. /hello/{proxy+}) and return the name requested through this new path
+* Update unit test to capture that
+* Package & Deploy
+
+Next, you can use the following resources to know more about beyond hello world samples and how others structure their Serverless applications:
+
+* [AWS Serverless Application Repository](https://aws.amazon.com/serverless/serverlessrepo/)
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/HelloWorld.csproj b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/HelloWorld.csproj
new file mode 100644
index 0000000000..be4feb0f72
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/HelloWorld.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Amazon.Lambda.Core" Version="1.0.0" />
+    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="1.0.2" />
+    <PackageReference Include="Amazon.Lambda.Serialization.Json" Version="1.1.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <DotNetCliToolReference Include="Amazon.Lambda.Tools" Version="2.1.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/Program.cs b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/Program.cs
new file mode 100644
index 0000000000..32f4d6b7e0
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/Program.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using Newtonsoft.Json;
+
+using Amazon.Lambda.Core;
+using Amazon.Lambda.APIGatewayEvents;
+
+// Assembly attribute to enable the Lambda function's JSON input to be converted into a .NET class.
+[assembly: LambdaSerializer(typeof(Amazon.Lambda.Serialization.Json.JsonSerializer))]
+
+namespace HelloWorld
+{
+
+    public class Function
+    {
+
+        private static readonly HttpClient client = new HttpClient();
+
+        private static async Task<string> GetCallingIP()
+        {
+            client.DefaultRequestHeaders.Accept.Clear();
+            client.DefaultRequestHeaders.Add("User-Agent", "AWS Lambda .Net Client");
+
+            var stringTask = client.GetStringAsync("http://checkip.amazonaws.com/").ConfigureAwait(continueOnCapturedContext:false);
+
+            var msg = await stringTask;
+            return msg.Replace("\n","");
+        }
+
+        public APIGatewayProxyResponse FunctionHandler(APIGatewayProxyRequest apigProxyEvent, ILambdaContext context)
+        {
+
+            string location = GetCallingIP().Result;
+            Dictionary<string, string> body = new Dictionary<string, string>
+            {
+                { "message", "hello world" },
+                { "location", location },
+            };
+
+            return new APIGatewayProxyResponse
+            {
+                Body = JsonConvert.SerializeObject(body),
+                StatusCode = 200,
+                Headers = new Dictionary<string, string> { { "Content-Type", "application/json" } }
+            };
+        }
+    }
+}
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/Readme.md b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/Readme.md
new file mode 100644
index 0000000000..5badecf662
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/Readme.md
@@ -0,0 +1,45 @@
+# AWS Lambda Empty Function Project
+
+This starter project consists of:
+* Function.cs - class file containing a class with a single function handler method
+* aws-lambda-tools-defaults.json - default argument settings for use with Visual Studio and command line deployment tools for AWS
+
+You may also have a test project depending on the options selected.
+
+The generated function handler is a simple method accepting a string argument that returns the uppercase equivalent of the input string. Replace the body of this method, and parameters, to suit your needs.
+
+## Here are some steps to follow from Visual Studio:
+
+To deploy your function to AWS Lambda, right click the project in Solution Explorer and select *Publish to AWS Lambda*.
+
+To view your deployed function open its Function View window by double-clicking the function name shown beneath the AWS Lambda node in the AWS Explorer tree.
+
+To perform testing against your deployed function use the Test Invoke tab in the opened Function View window.
+
+To configure event sources for your deployed function, for example to have your function invoked when an object is created in an Amazon S3 bucket, use the Event Sources tab in the opened Function View window.
+
+To update the runtime configuration of your deployed function use the Configuration tab in the opened Function View window.
+
+To view execution logs of invocations of your function use the Logs tab in the opened Function View window.
+
+## Here are some steps to follow to get started from the command line:
+
+Once you have edited your function you can use the following command lines to build, test and deploy your function to AWS Lambda from the command line (these examples assume the project name is *EmptyFunction*):
+
+Restore dependencies
+```
+    cd "{{cookiecutter.project_name}}"
+    dotnet restore
+```
+
+Execute unit tests
+```
+    cd "{{cookiecutter.project_name}}/test/{{cookiecutter.project_name}}.Tests"
+    dotnet test
+```
+
+Deploy function to AWS Lambda
+```
+    cd "{{cookiecutter.project_name}}/src/{{cookiecutter.project_name}}"
+    dotnet lambda deploy-function
+```
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/aws-lambda-tools-defaults.json b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/aws-lambda-tools-defaults.json
new file mode 100644
index 0000000000..b050733aca
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/aws-lambda-tools-defaults.json
@@ -0,0 +1,16 @@
+{
+  "Information": [
+    "This file provides default values for the deployment wizard inside Visual Studio and the AWS Lambda commands added to the .NET Core CLI.",
+    "To learn more about the Lambda commands with the .NET Core CLI execute the following command at the command line in the project root directory.",
+    "dotnet lambda help",
+    "All the command line options for the Lambda command can be specified in this file."
+  ],
+  "profile": "default",
+  "region": "us-east-2",
+  "configuration": "Release",
+  "framework": "netcoreapp2.0",
+  "function-runtime": "dotnetcore2.0",
+  "function-memory-size": 256,
+  "function-timeout": 30,
+  "function-handler": "HelloWorld::HelloWorld.Function::FunctionHandler"
+}
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/template.yaml b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/template.yaml
new file mode 100644
index 0000000000..6602b37f39
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/template.yaml
@@ -0,0 +1,42 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+    Sample SAM Template for {{ cookiecutter.project_name }}
+
+# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
+Globals:
+    Function:
+        Timeout: 10
+
+
+Resources:
+
+    HelloWorldFunction:
+        Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+        Properties:
+            CodeUri: src/HelloWorld/bin/Debug/netcoreapp2.0/publish
+            Handler: HelloWorld::HelloWorld.Function::FunctionHandler
+            Runtime: dotnetcore2.0
+            Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
+                Variables:
+                    PARAM1: VALUE
+            Events:
+                HelloWorld:
+                    Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+                    Properties:
+                        Path: /hello
+                        Method: get
+
+Outputs:
+
+    HelloWorldApi:
+      Description: "API Gateway endpoint URL for Prod stage for Hello World function"
+      Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/hello/"
+
+    HelloWorldFunction:
+      Description: "Hello World Lambda Function ARN"
+      Value: !GetAtt HelloWorldFunction.Arn
+
+    HelloWorldFunctionIamRole:
+      Description: "Implicit IAM Role created for Hello World function"
+      Value: !GetAtt HelloWorldFunctionRole.Arn
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/test/HelloWorld.Test/FunctionTest.cs b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/test/HelloWorld.Test/FunctionTest.cs
new file mode 100644
index 0000000000..96881f0c67
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/test/HelloWorld.Test/FunctionTest.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Net.Http;
+using System.Net.Http.Headers;
+
+using Newtonsoft.Json;
+using Xunit;
+using Amazon.Lambda.Core;
+using Amazon.Lambda.TestUtilities;
+using Amazon.Lambda.APIGatewayEvents;
+
+namespace HelloWorld.Tests
+{
+  public class FunctionTest
+  {
+    private static readonly HttpClient client = new HttpClient();
+
+    private static async Task<string> GetCallingIP()
+    {
+            client.DefaultRequestHeaders.Accept.Clear();
+            client.DefaultRequestHeaders.Add("User-Agent", "AWS Lambda .Net Client");
+
+            var stringTask = client.GetStringAsync("http://checkip.amazonaws.com/").ConfigureAwait(continueOnCapturedContext:false);
+
+            var msg = await stringTask;
+            return msg.Replace("\n","");
+    }
+
+    [Fact]
+    public void TestHelloWorldFunctionHandler()
+    {
+            TestLambdaContext context;
+            APIGatewayProxyRequest request;
+            APIGatewayProxyResponse response;
+
+            request = new APIGatewayProxyRequest();
+            context = new TestLambdaContext();
+            string location = GetCallingIP().Result;
+            Dictionary<string, string> body = new Dictionary<string, string>
+            {
+                { "message", "hello world" },
+                { "location", location },
+            };
+
+            var ExpectedResponse = new APIGatewayProxyResponse
+            {
+                Body = JsonConvert.SerializeObject(body),
+                StatusCode = 200,
+                Headers = new Dictionary<string, string> { { "Content-Type", "application/json" } }
+            };
+
+            var function = new Function();
+            response = function.FunctionHandler(request, context);
+
+            Console.WriteLine("Lambda Response: \n" + response.Body);
+            Console.WriteLine("Expected Response: \n" + ExpectedResponse.Body);
+
+            Assert.Equal(ExpectedResponse.Body, response.Body);
+            Assert.Equal(ExpectedResponse.Headers, response.Headers);
+            Assert.Equal(ExpectedResponse.StatusCode, response.StatusCode);
+    }
+  }
+}
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/test/HelloWorld.Test/HelloWorld.Tests.csproj b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/test/HelloWorld.Test/HelloWorld.Tests.csproj
new file mode 100644
index 0000000000..cb5448d587
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/test/HelloWorld.Test/HelloWorld.Tests.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+
+    <PackageReference Include="Amazon.Lambda.Core" Version="1.0.0" />
+    <PackageReference Include="Amazon.Lambda.TestUtilities" Version="1.0.0" />
+
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\HelloWorld\HelloWorld.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/README.md b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/README.md
new file mode 100644
index 0000000000..d6af33a924
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/README.md
@@ -0,0 +1,49 @@
+# Cookiecutter SAM for golang Lambda functions
+
+This is a [Cookiecutter](https://github.com/audreyr/cookiecutter) template to create a Serverless App based on Serverless Application Model (SAM).
+
+It is important to note that you should not try to `git clone` this project but use `cookiecutter` CLI instead as ``\\{\\{cookiecutter.project_slug\\}\\}`` will be rendered based on your input and therefore all variables and files will be rendered properly.
+
+## Requirements
+
+Install `cookiecutter` command line:
+
+**Pip users**:
+
+* `pip install cookiecutter`
+
+**Homebrew users**:
+
+* `brew install cookiecutter`
+
+**Windows or Pipenv users**:
+
+* `pipenv install cookiecutter`
+
+**NOTE**: [`Pipenv`](https://github.com/pypa/pipenv) is the new and recommended Python packaging tool that works across multiple platforms and makes Windows a first-class citizen.
+
+## Usage
+
+Generate a new SAM based Serverless App: `cookiecutter gh:aws-samples/cookiecutter-aws-sam-golang`.
+
+You'll be prompted a few questions to help this cookiecutter template to scaffold this project and after its completed you should see a new folder at your current path with the name of the project you gave as input.
+
+**NOTE**: After you understand how cookiecutter works (cookiecutter.json, mainly), you can fork this repo and apply your own mechanisms to accelerate your development process and this can be followed for any programming language and OS.
+
+## Options
+
+Option | Description
+------------------------------------------------- | ---------------------------------------------------------------------------------
+`include_apigw` | Includes sample code for API Gateway Proxy integration for Lambda and a Catch All method in SAM as a starting point
+`include_xray` | Includes both sample code for getting started with AWS X-Ray and adds necessary permission and `Tracing` to your function
+`include_safe_deployment` | Sends by default 10% of traffic for every 1 minute to a newly deployed function using [CodeDeploy + SAM integration](https://github.com/awslabs/serverless-application-model/blob/master/docs/safe_lambda_deployments.rst) - Linear10PercentEvery1Minute
+`include_experimental_make` | Includes a `Makefile` for advanced users to automate packaging, build, tests and SAM Local - Only works on OSX/Linux at the moment
+
+## Credits
+
+* This project has been generated with [Cookiecutter](https://github.com/audreyr/cookiecutter)
+* [Bruno Alla's Lambda function template](https://github.com/browniebroke/cookiecutter-lambda-function)
+
+## License
+
+This project is licensed under the terms of the [MIT License with no attribution](/LICENSE)
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/cookiecutter.json b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/cookiecutter.json
new file mode 100644
index 0000000000..4ed0aa2924
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/cookiecutter.json
@@ -0,0 +1,3 @@
+{
+    "project_name": "Name of the project"
+}
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/requirements-dev.txt b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/requirements-dev.txt
new file mode 100644
index 0000000000..b10c8d1048
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/requirements-dev.txt
@@ -0,0 +1,4 @@
+cookiecutter==1.6.0
+flake8==3.5.0
+pytest==3.3.2
+pytest-cookies==0.3.0
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/tests/__init__.py b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/tests/test_bake_project.py b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/tests/test_bake_project.py
new file mode 100644
index 0000000000..9d32aebfe0
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/tests/test_bake_project.py
@@ -0,0 +1,79 @@
+from contextlib import contextmanager
+
+import os
+import subprocess
+
+
+@contextmanager
+def inside_dir(dirpath):
+    """
+    Execute code from inside the given directory
+    :param dirpath: String, path of the directory the command is being run.
+    """
+    old_path = os.getcwd()
+    try:
+        os.chdir(dirpath)
+        yield
+    finally:
+        os.chdir(old_path)
+
+
+def test_project_tree(cookies):
+    result = cookies.bake(extra_context={'project_name': 'test_project'})
+    assert result.exit_code == 0
+    assert result.exception is None
+    assert result.project.basename == 'test_project'
+
+    assert result.project.isdir()
+    assert result.project.join('README.md').isfile()
+    assert result.project.join('template.yaml').isfile()
+    assert result.project.join('hello-world').isdir()
+    assert result.project.join('hello-world', 'main.go').isfile()
+    assert result.project.join('hello-world', 'main_test.go').isfile()
+
+
+def test_app_content(cookies):
+    result = cookies.bake(extra_context={'project_name': 'test_project'})
+    app_file = result.project.join('hello-world', 'main.go')
+    app_content = app_file.readlines()
+    app_content = ''.join(app_content)
+
+    contents = (
+        "github.com/aws/aws-lambda-go/events",
+        "resp, err := http.Get(DefaultHTTPGetAddress)",
+        "lambda.Start(handler)"
+    )
+
+    for content in contents:
+        assert content in app_content
+
+
+def test_app_test_content(cookies):
+    result = cookies.bake(extra_context={'project_name': 'test_project'})
+    app_file = result.project.join('hello-world', 'main_test.go')
+    app_content = app_file.readlines()
+    app_content = ''.join(app_content)
+
+    contents = (
+        "DefaultHTTPGetAddress = \"http://127.0.0.1:12345\"",
+        "DefaultHTTPGetAddress = ts.URL",
+        "Successful Request"
+    )
+
+    for content in contents:
+        assert content in app_content
+
+
+def test_app_template_content(cookies):
+    result = cookies.bake(extra_context={'project_name': 'test_project'})
+    app_file = result.project.join('template.yaml')
+    app_content = app_file.readlines()
+    app_content = ''.join(app_content)
+
+    contents = (
+        "Runtime: go1.x",
+        "HelloWorldFunction",
+    )
+
+    for content in contents:
+        assert content in app_content
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/Makefile b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/Makefile
new file mode 100644
index 0000000000..78a2494dba
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/Makefile
@@ -0,0 +1,10 @@
+.PHONY: deps clean build
+
+deps:
+	go get -u ./...
+
+clean: 
+	rm -rf ./hello-world/hello-world
+	
+build:
+	GOOS=linux GOARCH=amd64 go build -o hello-world/hello-world ./hello-world
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/README.md b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/README.md
new file mode 100644
index 0000000000..849d17bc91
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/README.md
@@ -0,0 +1,187 @@
+# {{ cookiecutter.project_name }}
+
+This is a sample template for {{ cookiecutter.project_name }} - Below is a brief explanation of what we have generated for you:
+
+```bash
+.
+├── Makefile                    <-- Make to automate build
+├── README.md                   <-- This instructions file
+├── hello-world                 <-- Source code for a lambda function
+│   ├── main.go                 <-- Lambda function code
+│   └── main_test.go            <-- Unit tests
+└── template.yaml
+```
+
+## Requirements
+
+* AWS CLI already configured with at least PowerUser permission
+* [Docker installed](https://www.docker.com/community-edition)
+* [Golang](https://golang.org)
+
+## Setup process
+
+### Installing dependencies
+
+In this example we use the built-in `go get` and the only dependency we need is AWS Lambda Go SDK:
+
+```shell
+go get -u github.com/aws/aws-lambda-go/...
+```
+
+**NOTE:** As you change your application code as well as dependencies during development, you might want to research how to handle dependencies in Golang at scale.
+
+### Building
+
+Golang is a staticly compiled language, meaning that in order to run it you have to build the executeable target.
+
+You can issue the following command in a shell to build it:
+
+```shell
+GOOS=linux GOARCH=amd64 go build -o hello-world/hello-world ./hello-world
+```
+
+**NOTE**: If you're not building the function on a Linux machine, you will need to specify the `GOOS` and `GOARCH` environment variables, this allows Golang to build your function for another system architecture and ensure compatability.
+
+### Local development
+
+**Invoking function locally through local API Gateway**
+
+```bash
+sam local start-api
+```
+
+If the previous command ran successfully you should now be able to hit the following local endpoint to invoke your function `http://localhost:3000/hello`
+
+**SAM CLI** is used to emulate both Lambda and API Gateway locally and uses our `template.yaml` to understand how to bootstrap this environment (runtime, where the source code is, etc.) - The following excerpt is what the CLI will read in order to initialize an API and its routes:
+
+```yaml
+...
+Events:
+    HelloWorld:
+        Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+        Properties:
+            Path: /hello
+            Method: get
+```
+
+## Packaging and deployment
+
+AWS Lambda Python runtime requires a flat folder with all dependencies including the application. SAM will use `CodeUri` property to know where to look up for both application and dependencies:
+
+```yaml
+...
+    FirstFunction:
+        Type: AWS::Serverless::Function
+        Properties:
+            CodeUri: hello_world/
+            ...
+```
+
+First and foremost, we need a `S3 bucket` where we can upload our Lambda functions packaged as ZIP before we deploy anything - If you don't have a S3 bucket to store code artifacts then this is a good time to create one:
+
+```bash
+aws s3 mb s3://BUCKET_NAME
+```
+
+Next, run the following command to package our Lambda function to S3:
+
+```bash
+sam package \
+    --template-file template.yaml \
+    --output-template-file packaged.yaml \
+    --s3-bucket REPLACE_THIS_WITH_YOUR_S3_BUCKET_NAME
+```
+
+Next, the following command will create a Cloudformation Stack and deploy your SAM resources.
+
+```bash
+sam deploy \
+    --template-file packaged.yaml \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --capabilities CAPABILITY_IAM
+```
+
+> **See [Serverless Application Model (SAM) HOWTO Guide](https://github.com/awslabs/serverless-application-model/blob/master/HOWTO.md) for more details in how to get started.**
+
+After deployment is complete you can run the following command to retrieve the API Gateway Endpoint URL:
+
+```bash
+aws cloudformation describe-stacks \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --query 'Stacks[].Outputs'
+``` 
+
+### Testing
+
+We use `testing` package that is built-in in Golang and you can simply run the following command to run our tests:
+
+```shell
+go test -v ./hello-world/
+```
+# Appendix
+
+### Golang installation
+
+Please ensure Go 1.x (where 'x' is the latest version) is installed as per the instructions on the official golang website: https://golang.org/doc/install
+
+A quickstart way would be to use Homebrew, chocolatey or your linux package manager.
+
+#### Homebrew (Mac)
+
+Issue the following command from the terminal:
+
+```shell
+brew install golang
+```
+
+If it's already installed, run the following command to ensure it's the latest version:
+
+```shell
+brew update
+brew upgrade golang
+```
+
+#### Chocolatey (Windows)
+
+Issue the following command from the powershell:
+
+```shell
+choco install golang
+```
+
+If it's already installed, run the following command to ensure it's the latest version:
+
+```shell
+choco upgrade golang
+```
+## AWS CLI commands
+
+AWS CLI commands to package, deploy and describe outputs defined within the cloudformation stack:
+
+```bash
+sam package \
+    --template-file template.yaml \
+    --output-template-file packaged.yaml \
+    --s3-bucket REPLACE_THIS_WITH_YOUR_S3_BUCKET_NAME
+
+sam deploy \
+    --template-file packaged.yaml \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --capabilities CAPABILITY_IAM \
+    --parameter-overrides MyParameterSample=MySampleValue
+
+aws cloudformation describe-stacks \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} --query 'Stacks[].Outputs'
+```
+
+## Bringing to the next level
+
+Here are a few ideas that you can use to get more acquainted as to how this overall process works:
+
+* Create an additional API resource (e.g. /hello/{proxy+}) and return the name requested through this new path
+* Update unit test to capture that
+* Package & Deploy
+
+Next, you can use the following resources to know more about beyond hello world samples and how others structure their Serverless applications:
+
+* [AWS Serverless Application Repository](https://aws.amazon.com/serverless/serverlessrepo/)
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/hello-world/main.go b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/hello-world/main.go
new file mode 100644
index 0000000000..8c105bd0ac
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/hello-world/main.go
@@ -0,0 +1,51 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+
+	"github.com/aws/aws-lambda-go/events"
+	"github.com/aws/aws-lambda-go/lambda"
+)
+
+var (
+	// DefaultHTTPGetAddress Default Address
+	DefaultHTTPGetAddress = "https://checkip.amazonaws.com"
+
+	// ErrNoIP No IP found in response
+	ErrNoIP = errors.New("No IP in HTTP response")
+
+	// ErrNon200Response non 200 status code in response
+	ErrNon200Response = errors.New("Non 200 Response found")
+)
+
+func handler(request events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
+	resp, err := http.Get(DefaultHTTPGetAddress)
+	if err != nil {
+		return events.APIGatewayProxyResponse{}, err
+	}
+
+	if resp.StatusCode != 200 {
+		return events.APIGatewayProxyResponse{}, ErrNon200Response
+	}
+
+	ip, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return events.APIGatewayProxyResponse{}, err
+	}
+
+	if len(ip) == 0 {
+		return events.APIGatewayProxyResponse{}, ErrNoIP
+	}
+
+	return events.APIGatewayProxyResponse{
+		Body:       fmt.Sprintf("Hello, %v", string(ip)),
+		StatusCode: 200,
+	}, nil
+}
+
+func main() {
+	lambda.Start(handler)
+}
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/hello-world/main_test.go b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/hello-world/main_test.go
new file mode 100644
index 0000000000..bb1d2a2f1c
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/hello-world/main_test.go
@@ -0,0 +1,64 @@
+package main
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/aws/aws-lambda-go/events"
+)
+
+func TestHandler(t *testing.T) {
+	t.Run("Unable to get IP", func(t *testing.T) {
+		DefaultHTTPGetAddress = "http://127.0.0.1:12345"
+
+		_, err := handler(events.APIGatewayProxyRequest{})
+		if err == nil {
+			t.Fatal("Error failed to trigger with an invalid request")
+		}
+	})
+
+	t.Run("Non 200 Response", func(t *testing.T) {
+		ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(500)
+		}))
+		defer ts.Close()
+
+		DefaultHTTPGetAddress = ts.URL
+
+		_, err := handler(events.APIGatewayProxyRequest{})
+		if err != nil && err.Error() != ErrNon200Response.Error() {
+			t.Fatalf("Error failed to trigger with an invalid HTTP response: %v", err)
+		}
+	})
+
+	t.Run("Unable decode IP", func(t *testing.T) {
+		ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(500)
+		}))
+		defer ts.Close()
+
+		DefaultHTTPGetAddress = ts.URL
+
+		_, err := handler(events.APIGatewayProxyRequest{})
+		if err == nil {
+			t.Fatal("Error failed to trigger with an invalid HTTP response")
+		}
+	})
+
+	t.Run("Successful Request", func(t *testing.T) {
+		ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(200)
+			fmt.Fprintf(w, "127.0.0.1")
+		}))
+		defer ts.Close()
+
+		DefaultHTTPGetAddress = ts.URL
+
+		_, err := handler(events.APIGatewayProxyRequest{})
+		if err != nil {
+			t.Fatal("Everything should be ok")
+		}
+	})
+}
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/template.yaml b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/template.yaml
new file mode 100644
index 0000000000..96d7aa160b
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-golang/{{cookiecutter.project_name}}/template.yaml
@@ -0,0 +1,42 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+  {{ cookiecutter.project_name }}
+  
+  Sample SAM Template for {{ cookiecutter.project_name }}
+
+# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
+Globals:
+  Function:
+    Timeout: 5
+
+Resources:
+  HelloWorldFunction:
+    Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+    Properties:
+      CodeUri: hello-world/
+      Handler: hello-world
+      Runtime: go1.x
+      Tracing: Active # https://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html
+      Events:
+        CatchAll:
+          Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+          Properties:
+            Path: /hello
+            Method: GET
+      Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
+        Variables:
+          PARAM1: VALUE
+
+Outputs:
+  HelloWorldAPI:
+    Description: "API Gateway endpoint URL for Prod environment for First Function"
+    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/hello/"
+
+  HelloWorldFunction:
+    Description: "First Lambda Function ARN"
+    Value: !GetAtt HelloWorldFunction.Arn
+
+  HelloWorldFunctionIamRole:
+    Description: "Implicit IAM Role created for Hello World function"
+    Value: !GetAtt HelloWorldFunctionRole.Arn
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/LICENSE b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/LICENSE
new file mode 100644
index 0000000000..f19aaa6d09
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/LICENSE
@@ -0,0 +1,14 @@
+MIT No Attribution
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/README.md b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/README.md
new file mode 100644
index 0000000000..ec9954e48b
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/README.md
@@ -0,0 +1,42 @@
+# Cookiecutter SAM for Java Lambda functions
+
+This is a [Cookiecutter](https://github.com/audreyr/cookiecutter) template to create a Serverless Hello World App based on Serverless Application Model (SAM) and Java.
+
+It is important to note that you should not try to `git clone` this project but use `cookiecutter` CLI instead as ``{{cookiecutter.project_name}}`` will be rendered based on your input and therefore all variables and files will be rendered properly.
+
+## Requirements
+
+Install `cookiecutter` command line:
+
+**Pip users**:
+
+* `pip install cookiecutter`
+
+**Homebrew users**:
+
+* `brew install cookiecutter`
+
+**Windows or Pipenv users**:
+
+* `pipenv install cookiecutter`
+
+**NOTE**: [`Pipenv`](https://github.com/pypa/pipenv) is the new and recommended Python packaging tool that works across multiple platforms and makes Windows a first-class citizen.
+
+## Usage
+
+Generate a new SAM based Serverless App: `cookiecutter gh:aws-samples/cookiecutter-aws-sam-hello-java`.
+
+You'll be prompted a few questions to help this cookiecutter template to scaffold this project and after its completed you should see a new folder at your current path with the name of the project you gave as input.
+
+**NOTE**: After you understand how cookiecutter works (cookiecutter.json, mainly), you can fork this repo and apply your own mechanisms to accelerate your development process and this can be followed for any programming language and OS.
+
+
+# Credits
+
+* This project has been generated with [Cookiecutter](https://github.com/audreyr/cookiecutter)
+
+
+License
+-------
+
+This project is licensed under the terms of the [MIT License with no attribution](/LICENSE)
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/cookiecutter.json b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/cookiecutter.json
new file mode 100644
index 0000000000..9d928e8536
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/cookiecutter.json
@@ -0,0 +1,4 @@
+{
+    "project_name": "Name of the project",
+    "runtime": "java8"
+}
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/tests/test_cookiecutter.py b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/tests/test_cookiecutter.py
new file mode 100644
index 0000000000..8f2a6cf519
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/tests/test_cookiecutter.py
@@ -0,0 +1,41 @@
+"""
+    Tests cookiecutter baking process and rendered content
+"""
+
+def test_project_tree(cookies):
+    result = cookies.bake(extra_context={
+        'project_name': 'hello sam'
+    })
+    assert result.exit_code == 0
+    assert result.exception is None
+    assert result.project.basename == 'hello sam'
+    assert result.project.isdir()
+    assert result.project.join('template.yaml').isfile()
+    assert result.project.join('README.md').isfile()
+    assert result.project.join('src').isdir()
+    assert result.project.join('src', 'main').isdir()
+    assert result.project.join('src', 'main', 'java').isdir()
+    assert result.project.join('src', 'main', 'java', 'helloworld').isdir()
+    assert result.project.join('src', 'main', 'java', 'helloworld', 'App.java').isfile()
+    assert result.project.join('src', 'main', 'java', 'helloworld', 'GatewayResponse.java').isfile()
+    assert result.project.join('src', 'test', 'java').isdir()
+    assert result.project.join('src', 'test', 'java', 'helloworld').isdir()
+    assert result.project.join('src', 'test', 'java', 'helloworld', 'AppTest.java').isfile()
+
+
+def test_app_content(cookies):
+    result = cookies.bake(extra_context={'project_name': 'my_lambda'})
+    app_file = result.project.join('src', 'main', 'java', 'helloworld', 'App.java')
+    app_content = app_file.readlines()
+    app_content = ''.join(app_content)
+
+    contents = (
+        "package helloword",
+        "class App implements RequestHandler<Object, Object>",
+        "https://checkip.amazonaws.com",
+        "return new GatewayResponse",
+        "getPageContents",
+    )
+
+    for content in contents:
+        assert content in app_content
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/README.md b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/README.md
new file mode 100644
index 0000000000..b95a44ac1c
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/README.md
@@ -0,0 +1,147 @@
+# {{ cookiecutter.project_name }}
+
+This is a sample template for {{ cookiecutter.project_name }} - Below is a brief explanation of what we have generated for you:
+
+```bash
+.
+├── README.md                               <-- This instructions file
+├── pom.xml                                 <-- Java dependencies
+├── src
+│   ├── main
+│   │   └── java
+│   │       └── helloworld                  <-- Source code for a lambda function
+│   │           ├── App.java                <-- Lambda function code
+│   │           └── GatewayResponse.java    <-- POJO for API Gateway Responses object 
+│   └── test                                <-- Unit tests
+│       └── java
+│           └── helloworld
+│               └── AppTest.java
+└── template.yaml
+```
+
+## Requirements
+
+* AWS CLI already configured with at least PowerUser permission
+* [Java SE Development Kit 8 installed](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html)
+* [Docker installed](https://www.docker.com/community-edition)
+* [Maven](https://maven.apache.org/install.html)
+
+## Setup process
+
+### Installing dependencies
+
+We use `maven` to install our dependencies and package our application into a JAR file:
+
+```bash
+mvn package
+```
+### Local development
+
+**Invoking function locally through local API Gateway**
+
+```bash
+sam local start-api
+```
+
+If the previous command ran successfully you should now be able to hit the following local endpoint to invoke your function `http://localhost:3000/hello`
+
+**SAM CLI** is used to emulate both Lambda and API Gateway locally and uses our `template.yaml` to understand how to bootstrap this environment (runtime, where the source code is, etc.) - The following excerpt is what the CLI will read in order to initialize an API and its routes:
+
+```yaml
+...
+Events:
+    HelloWorld:
+        Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+        Properties:
+            Path: /hello
+            Method: get
+```
+
+## Packaging and deployment
+
+AWS Lambda Java runtime accepts either a zip file or a standalone JAR file - We use the latter in this example. SAM will use `CodeUri` property to know where to look up for both application and dependencies:
+
+```yaml
+...
+    HelloWorldFunction:
+        Type: AWS::Serverless::Function
+        Properties:
+            CodeUri: target/HelloWorld-1.0.jar
+            Handler: helloworld.App::handleRequest
+```
+
+Firstly, we need a `S3 bucket` where we can upload our Lambda functions packaged as ZIP before we deploy anything - If you don't have a S3 bucket to store code artifacts then this is a good time to create one:
+
+```bash
+aws s3 mb s3://BUCKET_NAME
+```
+
+Next, run the following command to package our Lambda function to S3:
+
+```bash
+sam package \
+    --template-file template.yaml \
+    --output-template-file packaged.yaml \
+    --s3-bucket REPLACE_THIS_WITH_YOUR_S3_BUCKET_NAME
+```
+
+Next, the following command will create a Cloudformation Stack and deploy your SAM resources.
+
+```bash
+sam deploy \
+    --template-file packaged.yaml \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --capabilities CAPABILITY_IAM
+```
+
+> **See [Serverless Application Model (SAM) HOWTO Guide](https://github.com/awslabs/serverless-application-model/blob/master/HOWTO.md) for more details in how to get started.**
+
+After deployment is complete you can run the following command to retrieve the API Gateway Endpoint URL:
+
+```bash
+aws cloudformation describe-stacks \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --query 'Stacks[].Outputs'
+```
+
+## Testing
+
+We use `JUnit` for testing our code and you can simply run the following command to run our tests:
+
+```bash
+mvn test
+```
+
+# Appendix
+
+## AWS CLI commands
+
+AWS CLI commands to package, deploy and describe outputs defined within the cloudformation stack:
+
+```bash
+sam package \
+    --template-file template.yaml \
+    --output-template-file packaged.yaml \
+    --s3-bucket REPLACE_THIS_WITH_YOUR_S3_BUCKET_NAME
+
+sam deploy \
+    --template-file packaged.yaml \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --capabilities CAPABILITY_IAM \
+    --parameter-overrides MyParameterSample=MySampleValue
+
+aws cloudformation describe-stacks \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} --query 'Stacks[].Outputs'
+```
+
+## Bringing to the next level
+
+Here are a few ideas that you can use to get more acquainted as to how this overall process works:
+
+* Create an additional API resource (e.g. /hello/{proxy+}) and return the name requested through this new path
+* Update unit test to capture that
+* Package & Deploy
+
+Next, you can use the following resources to know more about beyond hello world samples and how others structure their Serverless applications:
+
+* [AWS Serverless Application Repository](https://aws.amazon.com/serverless/serverlessrepo/)
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/pom.xml b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/pom.xml
new file mode 100644
index 0000000000..b0346a7f5f
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/pom.xml
@@ -0,0 +1,47 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>helloworld</groupId>
+    <artifactId>HelloWorld</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>A sample Hello World created for SAM CLI.</name>
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>4.12</version>
+          <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.1.1</version>
+          <configuration>
+          </configuration>
+          <executions>
+            <execution>
+              <phase>package</phase>
+              <goals>
+                <goal>shade</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </build>
+</project>
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/src/main/java/helloworld/App.java b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/src/main/java/helloworld/App.java
new file mode 100644
index 0000000000..f89a7f499d
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/src/main/java/helloworld/App.java
@@ -0,0 +1,49 @@
+package helloworld;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringJoiner;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+
+/**
+ * Handler for requests to Lambda function.
+ */
+public class App implements RequestHandler<Object, Object> {
+
+    public Object handleRequest(final Object input, final Context context) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Content-Type", "application/json");
+        headers.put("X-Custom-Header", "application/json");
+        try {
+            final String pageContents = this.getPageContents("https://checkip.amazonaws.com");
+            String output = String.format("{ \"message\": \"hello world\", \"location\": \"%s\" }", pageContents);
+            return new GatewayResponse(output, headers, 200);
+        } catch (IOException e) {
+            return new GatewayResponse("{}", headers, 400);
+        }
+    }
+
+    private String getPageContents(String address) throws IOException{
+        BufferedReader br = null;
+        StringJoiner lines = new StringJoiner(System.lineSeparator());
+        try {
+            URL url = new URL(address);
+            br = new BufferedReader(new InputStreamReader(url.openStream()));
+            String line;
+            while ((line = br.readLine()) != null) {
+                lines.add(line);
+            }
+        } finally {
+            if (br != null) {
+                br.close();
+            }
+        }
+        return lines.toString();
+    }
+}
diff --git a/samples/java/src/main/java/com/aws/codestar/projecttemplates/GatewayResponse.java b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/src/main/java/helloworld/GatewayResponse.java
similarity index 94%
rename from samples/java/src/main/java/com/aws/codestar/projecttemplates/GatewayResponse.java
rename to samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/src/main/java/helloworld/GatewayResponse.java
index 0d3bb005a0..ea58a79c99 100644
--- a/samples/java/src/main/java/com/aws/codestar/projecttemplates/GatewayResponse.java
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/src/main/java/helloworld/GatewayResponse.java
@@ -1,4 +1,4 @@
-package com.aws.codestar.projecttemplates;
+package helloworld;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/src/test/java/helloworld/AppTest.java b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/src/test/java/helloworld/AppTest.java
new file mode 100644
index 0000000000..e64bdfc55a
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/src/test/java/helloworld/AppTest.java
@@ -0,0 +1,21 @@
+package helloworld;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public class AppTest {
+  @Test
+  public void successfulResponse() {
+    App app = new App();
+    GatewayResponse result = (GatewayResponse) app.handleRequest(null, null);
+    assertEquals(result.getStatusCode(), 200);
+    assertEquals(result.getHeaders().get("Content-Type"), "application/json");
+    String content = result.getBody();
+    assertNotNull(content);
+    assertTrue(content.contains("\"message\""));
+    assertTrue(content.contains("\"hello world\""));
+    assertTrue(content.contains("\"location\""));
+  }
+}
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/template.yaml b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/template.yaml
new file mode 100644
index 0000000000..bd687f3e32
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-java/{{cookiecutter.project_name}}/template.yaml
@@ -0,0 +1,44 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+    {{ cookiecutter.project_name }}
+
+    Sample SAM Template for {{ cookiecutter.project_name }}
+
+# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
+Globals:
+    Function:
+        Timeout: 20
+
+
+Resources:
+
+    HelloWorldFunction:
+        Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+        Properties:
+            CodeUri: target/HelloWorld-1.0.jar
+            Handler: helloworld.App::handleRequest
+            Runtime: java8
+            Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
+                Variables:
+                    PARAM1: VALUE
+            Events:
+                HelloWorld:
+                    Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+                    Properties:
+                        Path: /hello
+                        Method: get
+
+Outputs:
+
+    HelloWorldApi:
+      Description: "API Gateway endpoint URL for Prod stage for Hello World function"
+      Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/hello/"
+
+    HelloWorldFunction:
+      Description: "Hello World Lambda Function ARN"
+      Value: !GetAtt HelloWorldFunction.Arn
+
+    HelloWorldFunctionIamRole:
+      Description: "Implicit IAM Role created for Hello World function"
+      Value: !GetAtt HelloWorldFunctionRole.Arn
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/.gitignore b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/.gitignore
new file mode 100644
index 0000000000..74ea25e0e5
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/.gitignore
@@ -0,0 +1,168 @@
+
+# Created by https://www.gitignore.io/api/osx,linux,python,windows
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### OSX ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+.pytest_cache/
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule.*
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+
+# End of https://www.gitignore.io/api/osx,linux,python,windows
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/LICENSE b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/LICENSE
new file mode 100644
index 0000000000..f19aaa6d09
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/LICENSE
@@ -0,0 +1,14 @@
+MIT No Attribution
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/Pipfile b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/Pipfile
new file mode 100644
index 0000000000..a22660daae
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/Pipfile
@@ -0,0 +1,13 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+cookiecutter = "*"
+pytest-cookies = "*"
+pytest = "*"
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/README.md b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/README.md
new file mode 100644
index 0000000000..4644aac6bf
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/README.md
@@ -0,0 +1,42 @@
+# Cookiecutter SAM for Node Lambda functions
+
+This is a [Cookiecutter](https://github.com/audreyr/cookiecutter) template to create a Serverless Hello World App based on Serverless Application Model (SAM) and NodeJS.
+
+It is important to note that you should not try to `git clone` this project but use `cookiecutter` CLI instead as ``{{cookiecutter.project_name}}`` will be rendered based on your input and therefore all variables and files will be rendered properly.
+
+## Requirements
+
+Install `cookiecutter` command line: 
+
+**Pip users**:
+
+* `pip install cookiecutter`
+
+**Homebrew users**:
+
+* `brew install cookiecutter`
+
+**Windows or Pipenv users**:
+
+* `pipenv install cookiecutter`
+
+**NOTE**: [`Pipenv`](https://github.com/pypa/pipenv) is the new and recommended Python packaging tool that works across multiple platforms and makes Windows a first-class citizen.
+
+## Usage
+
+Generate a new SAM based Serverless App: `cookiecutter gh:aws-samples/cookiecutter-aws-sam-hello-nodejs`. 
+
+You'll be prompted a few questions to help this cookiecutter template to scaffold this project and after its completed you should see a new folder at your current path with the name of the project you gave as input.
+
+**NOTE**: After you understand how cookiecutter works (cookiecutter.json, mainly), you can fork this repo and apply your own mechanisms to accelerate your development process and this can be followed for any programming language and OS.
+
+
+# Credits
+
+* This project has been generated with [Cookiecutter](https://github.com/audreyr/cookiecutter)
+
+
+License
+-------
+
+This project is licensed under the terms of the [MIT License with no attribution](/LICENSE)
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/cookiecutter.json b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/cookiecutter.json
new file mode 100644
index 0000000000..1462701ea8
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/cookiecutter.json
@@ -0,0 +1,4 @@
+{
+    "project_name": "Name of the project",
+    "runtime": "nodejs8.10"
+}
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/setup.cfg b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/setup.cfg
new file mode 100644
index 0000000000..eee4ab11a7
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/setup.cfg
@@ -0,0 +1,2 @@
+[install]
+prefix= 
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/tests/test_cookiecutter.py b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/tests/test_cookiecutter.py
new file mode 100644
index 0000000000..cd70e453ff
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/tests/test_cookiecutter.py
@@ -0,0 +1,41 @@
+"""
+    Tests cookiecutter baking process and rendered content
+"""
+
+
+def test_project_tree(cookies):
+    result = cookies.bake(extra_context={
+        'project_name': 'hello sam'
+    })
+    assert result.exit_code == 0
+    assert result.exception is None
+    assert result.project.basename == 'hello sam'    
+    assert result.project.isdir()
+    assert result.project.join('.gitignore').isfile()
+    assert result.project.join('template.yaml').isfile()    
+    assert result.project.join('README.md').isfile()
+    assert result.project.join('hello_world').isdir()
+    assert result.project.join('hello_world', 'app.js').isfile()
+    assert result.project.join('hello_world', 'package.json').isfile()
+    assert result.project.join('hello_world', 'yarn.lock').isfile()
+    assert result.project.join('hello_world', 'tests').isdir()
+    assert result.project.join('hello_world', 'tests', 'unit', 'test.spec.js').isfile()
+
+
+def test_app_content(cookies):
+    result = cookies.bake(extra_context={'project_name': 'my_lambda'})
+    app_file = result.project.join('hello_world', 'app.js')
+    app_content = app_file.readlines()
+    app_content = ''.join(app_content)
+
+    contents = (
+        "const axios",
+        "JSON.stringify",
+        "location",
+        "message",
+        "hello world",
+        "statusCode"
+    )
+
+    for content in contents:
+        assert content in app_content
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/.gitignore b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/.gitignore
new file mode 100644
index 0000000000..eb1db5fbec
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/.gitignore
@@ -0,0 +1,129 @@
+
+# Created by https://www.gitignore.io/api/osx,node,linux,windows
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+
+### OSX ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+
+# End of https://www.gitignore.io/api/osx,node,linux,windows
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/README.md b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/README.md
new file mode 100644
index 0000000000..181cfcd428
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/README.md
@@ -0,0 +1,153 @@
+# {{ cookiecutter.project_name }}
+
+This is a sample template for {{ cookiecutter.project_name }} - Below is a brief explanation of what we have generated for you:
+
+```bash
+.
+├── README.md                   <-- This instructions file
+├── hello_world                 <-- Source code for a lambda function
+│   ├── app.js                  <-- Lambda function code
+│   ├── package.json            <-- NodeJS dependencies
+│   └── tests                   <-- Unit tests
+│       └── unit
+│           └── test_handler.js
+└── template.yaml               <-- SAM template
+```
+
+## Requirements
+
+* AWS CLI already configured with at least PowerUser permission
+{%- if cookiecutter.runtime == 'nodejs6.10' %}
+* [NodeJS 6.10 installed](https://nodejs.org/en/download/releases/)
+{%- elif cookiecutter.runtime =='nodejs4.3' %}
+* [NodeJS 4.3 installed](https://nodejs.org/en/download/releases/)
+{%- else %}
+* [NodeJS 8.10+ installed](https://nodejs.org/en/download/)
+{%- endif %}
+* [Docker installed](https://www.docker.com/community-edition)
+
+## Setup process
+
+### Installing dependencies
+
+In this example we use `npm` but you can use `yarn` if you prefer to manage NodeJS dependencies:
+
+```bash
+cd hello_world
+npm install
+cd ../
+```
+
+### Local development
+
+**Invoking function locally through local API Gateway**
+
+```bash
+sam local start-api
+```
+
+If the previous command ran successfully you should now be able to hit the following local endpoint to invoke your function `http://localhost:3000/hello`
+
+**SAM CLI** is used to emulate both Lambda and API Gateway locally and uses our `template.yaml` to understand how to bootstrap this environment (runtime, where the source code is, etc.) - The following excerpt is what the CLI will read in order to initialize an API and its routes:
+
+```yaml
+...
+Events:
+    HelloWorld:
+        Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+        Properties:
+            Path: /hello
+            Method: get
+```
+
+## Packaging and deployment
+
+AWS Lambda NodeJS runtime requires a flat folder with all dependencies including the application. SAM will use `CodeUri` property to know where to look up for both application and dependencies:
+
+```yaml
+...
+    FirstFunction:
+        Type: AWS::Serverless::Function
+        Properties:
+            CodeUri: hello_world/
+            ...
+```
+
+Firstly, we need a `S3 bucket` where we can upload our Lambda functions packaged as ZIP before we deploy anything - If you don't have a S3 bucket to store code artifacts then this is a good time to create one:
+
+```bash
+aws s3 mb s3://BUCKET_NAME
+```
+
+Next, run the following command to package our Lambda function to S3:
+
+```bash
+sam package \
+    --template-file template.yaml \
+    --output-template-file packaged.yaml \
+    --s3-bucket REPLACE_THIS_WITH_YOUR_S3_BUCKET_NAME
+```
+
+Next, the following command will create a Cloudformation Stack and deploy your SAM resources.
+
+```bash
+sam deploy \
+    --template-file packaged.yaml \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --capabilities CAPABILITY_IAM
+```
+
+> **See [Serverless Application Model (SAM) HOWTO Guide](https://github.com/awslabs/serverless-application-model/blob/master/HOWTO.md) for more details in how to get started.**
+
+After deployment is complete you can run the following command to retrieve the API Gateway Endpoint URL:
+
+```bash
+aws cloudformation describe-stacks \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --query 'Stacks[].Outputs'
+``` 
+
+## Testing
+
+We use `jest` for testing our code and it is already added in `package.json` under `scripts`, so that we can simply run the following command to run our tests:
+
+```bash
+cd hello_world
+npm run test
+```
+
+# Appendix
+
+## AWS CLI commands
+
+AWS CLI commands to package, deploy and describe outputs defined within the cloudformation stack:
+
+```bash
+sam package \
+    --template-file template.yaml \
+    --output-template-file packaged.yaml \
+    --s3-bucket REPLACE_THIS_WITH_YOUR_S3_BUCKET_NAME
+
+sam deploy \
+    --template-file packaged.yaml \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --capabilities CAPABILITY_IAM \
+    --parameter-overrides MyParameterSample=MySampleValue
+
+aws cloudformation describe-stacks \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} --query 'Stacks[].Outputs'
+```
+
+**NOTE**: Alternatively this could be part of package.json scripts section.
+
+## Bringing to the next level
+
+Here are a few ideas that you can use to get more acquainted as to how this overall process works:
+
+* Create an additional API resource (e.g. /hello/{proxy+}) and return the name requested through this new path
+* Update unit test to capture that
+* Package & Deploy
+
+Next, you can use the following resources to know more about beyond hello world samples and how others structure their Serverless applications:
+
+* [AWS Serverless Application Repository](https://aws.amazon.com/serverless/serverlessrepo/)
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/hello_world/app.js b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/hello_world/app.js
new file mode 100644
index 0000000000..e56ef07f4a
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/hello_world/app.js
@@ -0,0 +1,48 @@
+{%- if cookiecutter.runtime == 'nodejs4.3' %}
+var axios = require('axios')
+var url = 'http://checkip.amazonaws.com/';
+var response;
+{%- else %}
+const axios = require('axios')
+const url = 'http://checkip.amazonaws.com/';
+let response;
+{%- endif %}
+
+{% if cookiecutter.runtime == 'nodejs6.10' or cookiecutter.runtime == 'nodejs4.3' %}
+exports.lambda_handler = function (event, context, callback) {
+    axios(url)
+        .then(function (ret) {
+            response = {
+                'statusCode': 200,
+                'body': JSON.stringify({
+                    message: 'hello world',
+                    location: ret.data.trim()
+                })
+            }
+            callback(null, response);
+        })
+        .catch(function (err) {
+            console.log(err);
+            callback(err, "");
+        });    
+};
+{% else %}
+exports.lambda_handler = async (event, context, callback) => {
+    try {
+        const ret = await axios(url);
+        response = {
+            'statusCode': 200,
+            'body': JSON.stringify({
+                message: 'hello world',
+                location: ret.data.trim()
+            })
+        }
+    }
+    catch (err) {
+        console.log(err);
+        callback(err, null);
+    }
+
+    callback(null, response)
+};
+{% endif %}
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/hello_world/package.json b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/hello_world/package.json
new file mode 100644
index 0000000000..1c0951db9a
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/hello_world/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "hello_world",
+  "version": "1.0.0",
+  "description": "hello world sample for NodeJS",
+  "main": "src/index.js",
+  "repository": "https://github.com/aws-samples/cookiecutter-aws-sam-hello-nodejs",
+  "author": "SAM CLI",
+  "license": "MIT",
+  "dependencies": {
+    "axios": "^0.18.0"
+  },
+  "scripts": {
+    "test": "mocha tests/unit/"
+  },
+  "devDependencies": {
+    "chai": "^4.1.2",
+    "mocha": "^5.1.1"
+  }
+}
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/hello_world/tests/unit/test_handler.js b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/hello_world/tests/unit/test_handler.js
new file mode 100644
index 0000000000..ef45ec8035
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/hello_world/tests/unit/test_handler.js
@@ -0,0 +1,45 @@
+'use strict';
+
+const app = require('../../app.js');
+const chai = require('chai');
+const expect = chai.expect;
+var event, context;
+
+{% if cookiecutter.runtime == 'nodejs6.10' or cookiecutter.runtime == 'nodejs4.3' %}
+describe('Tests Handler', function () {
+    it('verifies successful response', function (done) {
+        app.lambda_handler(event, context, function (err, result) {
+            try {
+                expect(result).to.be.an('object');
+                expect(result.statusCode).to.equal(200);
+                expect(result.body).to.be.an('string');
+
+                let response = JSON.parse(result.body);
+
+                expect(response).to.be.an('object');
+                expect(response.message).to.be.equal("hello world");
+                expect(response.location).to.be.an("string");
+                done();
+            } catch (e) {
+                done(e);
+            }
+        });
+    });
+});
+{% else %}
+describe('Tests index', function () {
+    it('verifies successful response', async () => {
+        const result = await app.lambda_handler(event, context, (err, result) => {
+            expect(result).to.be.an('object');
+            expect(result.statusCode).to.equal(200);
+            expect(result.body).to.be.an('string');
+
+            let response = JSON.parse(result.body);
+
+            expect(response).to.be.an('object');
+            expect(response.message).to.be.equal("hello world");
+            expect(response.location).to.be.an("string");
+        });
+    });
+});
+{% endif %}
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/template.yaml b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/template.yaml
new file mode 100644
index 0000000000..bae7593a3d
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs/{{cookiecutter.project_name}}/template.yaml
@@ -0,0 +1,50 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+    {{ cookiecutter.project_name }}
+
+    Sample SAM Template for {{ cookiecutter.project_name }}
+    
+# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
+Globals:
+    Function:
+        Timeout: 3
+
+
+Resources:
+
+    HelloWorldFunction:
+        Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+        Properties:
+            CodeUri: hello_world/
+            Handler: app.lambda_handler
+            {%- if cookiecutter.runtime == 'nodejs6.10' %}
+            Runtime: nodejs6.10
+            {%- elif cookiecutter.runtime =='nodejs4.3' %}
+            Runtime: nodejs4.3
+            {%- else %}
+            Runtime: nodejs8.10
+            {%- endif %}
+            Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
+                Variables:
+                    PARAM1: VALUE
+            Events:
+                HelloWorld:
+                    Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+                    Properties:
+                        Path: /hello
+                        Method: get
+
+Outputs:
+
+    HelloWorldApi:
+      Description: "API Gateway endpoint URL for Prod stage for Hello World function"
+      Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/hello/"
+
+    HelloWorldFunction:
+      Description: "Hello World Lambda Function ARN"
+      Value: !GetAtt HelloWorldFunction.Arn
+
+    HelloWorldFunctionIamRole:
+      Description: "Implicit IAM Role created for Hello World function"
+      Value: !GetAtt HelloWorldFunctionRole.Arn
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/.gitignore b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/.gitignore
new file mode 100644
index 0000000000..74ea25e0e5
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/.gitignore
@@ -0,0 +1,168 @@
+
+# Created by https://www.gitignore.io/api/osx,linux,python,windows
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### OSX ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+.pytest_cache/
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule.*
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+
+# End of https://www.gitignore.io/api/osx,linux,python,windows
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/LICENSE b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/LICENSE
new file mode 100644
index 0000000000..f19aaa6d09
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/LICENSE
@@ -0,0 +1,14 @@
+MIT No Attribution
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/Pipfile b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/Pipfile
new file mode 100644
index 0000000000..a22660daae
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/Pipfile
@@ -0,0 +1,13 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+cookiecutter = "*"
+pytest-cookies = "*"
+pytest = "*"
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/README.md b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/README.md
new file mode 100644
index 0000000000..1b5721f31b
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/README.md
@@ -0,0 +1,42 @@
+# Cookiecutter SAM for Python Lambda functions
+
+This is a [Cookiecutter](https://github.com/audreyr/cookiecutter) template to create a Serverless Hello World App based on Serverless Application Model (SAM) and Python.
+
+It is important to note that you should not try to `git clone` this project but use `cookiecutter` CLI instead as ``{{cookiecutter.project_name}}`` will be rendered based on your input and therefore all variables and files will be rendered properly.
+
+## Requirements
+
+Install `cookiecutter` command line: 
+
+**Pip users**:
+
+* `pip install cookiecutter`
+
+**Homebrew users**:
+
+* `brew install cookiecutter`
+
+**Windows or Pipenv users**:
+
+* `pipenv install cookiecutter`
+
+**NOTE**: [`Pipenv`](https://github.com/pypa/pipenv) is the new and recommended Python packaging tool that works across multiple platforms and makes Windows a first-class citizen.
+
+## Usage
+
+Generate a new SAM based Serverless App: `cookiecutter gh:aws-samples/cookiecutter-aws-sam-hello-python`. 
+
+You'll be prompted a few questions to help this cookiecutter template to scaffold this project and after its completed you should see a new folder at your current path with the name of the project you gave as input.
+
+**NOTE**: After you understand how cookiecutter works (cookiecutter.json, mainly), you can fork this repo and apply your own mechanisms to accelerate your development process and this can be followed for any programming language and OS.
+
+
+# Credits
+
+* This project has been generated with [Cookiecutter](https://github.com/audreyr/cookiecutter)
+
+
+License
+-------
+
+This project is licensed under the terms of the [MIT License with no attribution](/LICENSE)
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/cookiecutter.json b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/cookiecutter.json
new file mode 100644
index 0000000000..1b996b510e
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/cookiecutter.json
@@ -0,0 +1,4 @@
+{
+    "project_name": "Name of the project",
+    "runtime": "python3.6"
+}
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/setup.cfg b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/setup.cfg
new file mode 100644
index 0000000000..eee4ab11a7
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/setup.cfg
@@ -0,0 +1,2 @@
+[install]
+prefix= 
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/tests/test_cookiecutter.py b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/tests/test_cookiecutter.py
new file mode 100644
index 0000000000..361b9f2d02
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/tests/test_cookiecutter.py
@@ -0,0 +1,42 @@
+"""
+    Tests cookiecutter baking process and rendered content
+"""
+
+
+def test_project_tree(cookies):
+    result = cookies.bake(extra_context={
+        'project_name': 'hello sam'
+    })
+    assert result.exit_code == 0
+    assert result.exception is None
+    assert result.project.basename == 'hello sam'    
+    assert result.project.isdir()
+    assert result.project.join('requirements.txt').isfile()
+    assert result.project.join('.gitignore').isfile()
+    assert result.project.join('template.yaml').isfile()    
+    assert result.project.join('README.md').isfile()
+    assert result.project.join('hello_world').isdir()
+    assert result.project.join('hello_world', 'app.py').isfile()
+    assert result.project.join('hello_world', '__init__.py').isfile()
+    assert result.project.join('tests').isdir()
+    assert result.project.join('tests', 'unit', '__init__.py').isfile()
+    assert result.project.join('tests', 'unit', 'test_handler.py').isfile()
+
+
+def test_app_content(cookies):
+    result = cookies.bake(extra_context={'project_name': 'my_lambda'})
+    app_file = result.project.join('hello_world', 'app.py')
+    app_content = app_file.readlines()
+    app_content = ''.join(app_content)
+
+    contents = (
+        "import requests",
+        "Sample pure Lambda function",
+        "location",
+        "message",
+        "hello world",
+        "statusCode"
+    )
+
+    for content in contents:
+        assert content in app_content
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/.gitignore b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/.gitignore
new file mode 100644
index 0000000000..4808264dbf
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/.gitignore
@@ -0,0 +1,244 @@
+
+# Created by https://www.gitignore.io/api/osx,linux,python,windows,pycharm,visualstudiocode
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### OSX ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### PyCharm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Ruby plugin and RubyMine
+/.rakeTasks
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### PyCharm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+.pytest_cache/
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule.*
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# Build folder
+
+*/build/*
+
+# End of https://www.gitignore.io/api/osx,linux,python,windows,pycharm,visualstudiocode
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/README.md b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/README.md
new file mode 100644
index 0000000000..097e180ca9
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/README.md
@@ -0,0 +1,190 @@
+# {{ cookiecutter.project_name }}
+
+This is a sample template for {{ cookiecutter.project_name }} - Below is a brief explanation of what we have generated for you:
+
+```bash
+.
+├── README.md                   <-- This instructions file
+├── hello_world                 <-- Source code for a lambda function
+│   ├── __init__.py
+│   └── app.py                  <-- Lambda function code
+├── requirements.txt            <-- Python dependencies
+├── template.yaml               <-- SAM template
+└── tests                       <-- Unit tests
+    └── unit
+        ├── __init__.py
+        └── test_handler.py
+```
+
+## Requirements
+
+* AWS CLI already configured with at least PowerUser permission
+{%- if cookiecutter.runtime == 'python3.6' %}
+* [Python 3 installed](https://www.python.org/downloads/)
+{%- else %}
+* [Python 2.7 installed](https://www.python.org/downloads/)
+{%- endif %}
+* [Docker installed](https://www.docker.com/community-edition)
+* [Python Virtual Environment](http://docs.python-guide.org/en/latest/dev/virtualenvs/)
+
+## Setup process
+
+### Installing dependencies
+
+[AWS Lambda requires a flat folder](https://docs.aws.amazon.com/lambda/latest/dg/lambda-python-how-to-create-deployment-package.html) with the application as well as its dependencies. Therefore, we need to have a 2 step process in order to enable local testing as well as packaging/deployment later on - This consist of two commands you can run as follows:
+
+```bash
+pip install -r requirements.txt -t hello_world/build/
+cp hello_world/*.py hello_world/build/
+```
+
+1. Step 1 install our dependencies into ``build`` folder 
+2. Step 2 copies our application into ``build`` folder
+
+**NOTE:** As you change your application code as well as dependencies during development you'll need to make sure these steps are repated in order to execute your Lambda and/or API Gateway locally.
+
+### Local development
+
+**Invoking function locally through local API Gateway**
+
+```bash
+sam local start-api
+```
+
+If the previous command ran successfully you should now be able to hit the following local endpoint to invoke your function `http://localhost:3000/hello`
+
+**SAM CLI** is used to emulate both Lambda and API Gateway locally and uses our `template.yaml` to understand how to bootstrap this environment (runtime, where the source code is, etc.) - The following excerpt is what the CLI will read in order to initialize an API and its routes:
+
+```yaml
+...
+Events:
+    HelloWorld:
+        Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+        Properties:
+            Path: /hello
+            Method: get
+```
+
+## Packaging and deployment
+
+AWS Lambda Python runtime requires a flat folder with all dependencies including the application. SAM will use `CodeUri` property to know where to look up for both application and dependencies:
+
+```yaml
+...
+    HelloWorldFunction:
+        Type: AWS::Serverless::Function
+        Properties:
+            CodeUri: hello_world/
+            ...
+```
+
+Firstly, we need a `S3 bucket` where we can upload our Lambda functions packaged as ZIP before we deploy anything - If you don't have a S3 bucket to store code artifacts then this is a good time to create one:
+
+```bash
+aws s3 mb s3://BUCKET_NAME
+```
+
+Next, run the following command to package our Lambda function to S3:
+
+```bash
+sam package \
+    --template-file template.yaml \
+    --output-template-file packaged.yaml \
+    --s3-bucket REPLACE_THIS_WITH_YOUR_S3_BUCKET_NAME
+```
+
+Next, the following command will create a Cloudformation Stack and deploy your SAM resources.
+
+```bash
+sam deploy \
+    --template-file packaged.yaml \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --capabilities CAPABILITY_IAM
+```
+
+> **See [Serverless Application Model (SAM) HOWTO Guide](https://github.com/awslabs/serverless-application-model/blob/master/HOWTO.md) for more details in how to get started.**
+
+After deployment is complete you can run the following command to retrieve the API Gateway Endpoint URL:
+
+```bash
+aws cloudformation describe-stacks \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --query 'Stacks[].Outputs'
+``` 
+
+## Testing
+
+We use **Pytest** for testing our code and you can install it using pip: ``pip install pytest`` 
+
+Next, we run `pytest` against our `tests` folder to run our initial unit tests:
+
+```bash
+python -m pytest tests/ -v
+```
+
+**NOTE**: It is recommended to use a Python Virtual environment to separate your application development from  your system Python installation.
+
+# Appendix
+
+### Python Virtual environment
+
+{%- if cookiecutter.runtime == 'python3.6' %}
+**In case you're new to this**, python3 comes with `virtualenv` library by default so you can simply run the following:
+
+1. Create a new virtual environment
+2. Install dependencies in the new virtual environment
+
+```bash
+python3 -m venv .venv
+. .venv/bin/activate
+pip install -r requirements.txt
+```
+{%- else %}
+**In case you're new to this**, python2 `virtualenv` module is not available in the standard library so we need to install it and then we can install our dependencies:
+
+1. Create a new virtual environment
+2. Install dependencies in the new virtual environment
+
+```bash
+pip install virtualenv
+virtualenv .venv
+. .venv/bin/activate
+pip install -r requirements.txt
+```
+{%- endif %}
+
+
+**NOTE:** You can find more information about Virtual Environment at [Python Official Docs here](https://docs.python.org/3/tutorial/venv.html). Alternatively, you may want to look at [Pipenv](https://github.com/pypa/pipenv) as the new way of setting up development workflows
+## AWS CLI commands
+
+AWS CLI commands to package, deploy and describe outputs defined within the cloudformation stack:
+
+```bash
+sam package \
+    --template-file template.yaml \
+    --output-template-file packaged.yaml \
+    --s3-bucket REPLACE_THIS_WITH_YOUR_S3_BUCKET_NAME
+
+sam deploy \
+    --template-file packaged.yaml \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} \
+    --capabilities CAPABILITY_IAM \
+    --parameter-overrides MyParameterSample=MySampleValue
+
+aws cloudformation describe-stacks \
+    --stack-name {{ cookiecutter.project_name.lower().replace(' ', '-') }} --query 'Stacks[].Outputs'
+```
+
+## Bringing to the next level
+
+Here are a few ideas that you can use to get more acquainted as to how this overall process works:
+
+* Create an additional API resource (e.g. /hello/{proxy+}) and return the name requested through this new path
+* Update unit test to capture that
+* Package & Deploy
+
+Next, you can use the following resources to know more about beyond hello world samples and how others structure their Serverless applications:
+
+* [AWS Serverless Application Repository](https://aws.amazon.com/serverless/serverlessrepo/)
+* [Chalice Python Serverless framework](https://github.com/aws/chalice)
+* Sample Python with 3rd party dependencies, pipenv and Makefile: ``sam init --location https://github.com/aws-samples/cookiecutter-aws-sam-python``
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/hello_world/__init__.py b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/hello_world/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/hello_world/app.py b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/hello_world/app.py
new file mode 100644
index 0000000000..741d41760c
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/hello_world/app.py
@@ -0,0 +1,25 @@
+import json
+
+import requests
+
+
+def lambda_handler(event, context):
+    """Sample pure Lambda function
+
+    Arguments:
+        event LambdaEvent -- Lambda Event received from Invoke API
+        context LambdaContext -- Lambda Context runtime methods and attributes
+
+    Returns:
+        dict -- {'statusCode': int, 'body': dict}
+    """
+
+    ip = requests.get('http://checkip.amazonaws.com/')
+
+    return {
+        "statusCode": 200,
+        "body": json.dumps({
+            'message': 'hello world',
+            'location': ip.text.replace('\n', ''),
+        })
+    }
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/requirements.txt b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/requirements.txt
new file mode 100644
index 0000000000..271baf7e23
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/requirements.txt
@@ -0,0 +1 @@
+requests==2.18.4
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/template.yaml b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/template.yaml
new file mode 100644
index 0000000000..c45a873c21
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/template.yaml
@@ -0,0 +1,48 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+    {{ cookiecutter.project_name }}
+
+    Sample SAM Template for {{ cookiecutter.project_name }}
+    
+# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
+Globals:
+    Function:
+        Timeout: 3
+
+
+Resources:
+
+    HelloWorldFunction:
+        Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+        Properties:
+            CodeUri: hello_world/build/
+            Handler: app.lambda_handler
+            {%- if cookiecutter.runtime == 'python3.6' %}
+            Runtime: python3.6
+            {%- else %}
+            Runtime: python2.7
+            {%- endif %}
+            Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
+                Variables:
+                    PARAM1: VALUE
+            Events:
+                HelloWorld:
+                    Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+                    Properties:
+                        Path: /hello
+                        Method: get
+
+Outputs:
+
+    HelloWorldApi:
+      Description: "API Gateway endpoint URL for Prod stage for Hello World function"
+      Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/hello/"
+
+    HelloWorldFunction:
+      Description: "Hello World Lambda Function ARN"
+      Value: !GetAtt HelloWorldFunction.Arn
+
+    HelloWorldFunctionIamRole:
+      Description: "Implicit IAM Role created for Hello World function"
+      Value: !GetAtt HelloWorldFunctionRole.Arn
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/tests/unit/__init__.py b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/tests/unit/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/tests/unit/test_handler.py b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/tests/unit/test_handler.py
new file mode 100644
index 0000000000..522935a3ce
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-python/{{cookiecutter.project_name}}/tests/unit/test_handler.py
@@ -0,0 +1,96 @@
+import json
+import pytest
+from hello_world import app
+
+
+@pytest.fixture()
+def apigw_event():
+    """ Generates API GW Event"""
+
+    return {
+        "body": "{ \"test\": \"body\"}",
+        "resource": "/{proxy+}",
+        "requestContext": {
+            "resourceId": "123456",
+            "apiId": "1234567890",
+            "resourcePath": "/{proxy+}",
+            "httpMethod": "POST",
+            "requestId": "c6af9ac6-7b61-11e6-9a41-93e8deadbeef",
+            "accountId": "123456789012",
+            "identity": {
+                "apiKey": "",
+                "userArn": "",
+                "cognitoAuthenticationType": "",
+                "caller": "",
+                "userAgent": "Custom User Agent String",
+                "user": "",
+                "cognitoIdentityPoolId": "",
+                "cognitoIdentityId": "",
+                "cognitoAuthenticationProvider": "",
+                "sourceIp": "127.0.0.1",
+                "accountId": ""
+            },
+            "stage": "prod"
+        },
+        "queryStringParameters": {
+            "foo": "bar"
+        },
+        "headers": {
+            "Via":
+            "1.1 08f323deadbeefa7af34d5feb414ce27.cloudfront.net (CloudFront)",
+            "Accept-Language":
+            "en-US,en;q=0.8",
+            "CloudFront-Is-Desktop-Viewer":
+            "true",
+            "CloudFront-Is-SmartTV-Viewer":
+            "false",
+            "CloudFront-Is-Mobile-Viewer":
+            "false",
+            "X-Forwarded-For":
+            "127.0.0.1, 127.0.0.2",
+            "CloudFront-Viewer-Country":
+            "US",
+            "Accept":
+            "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8",
+            "Upgrade-Insecure-Requests":
+            "1",
+            "X-Forwarded-Port":
+            "443",
+            "Host":
+            "1234567890.execute-api.us-east-1.amazonaws.com",
+            "X-Forwarded-Proto":
+            "https",
+            "X-Amz-Cf-Id":
+            "aaaaaaaaaae3VYQb9jd-nvCd-de396Uhbp027Y2JvkCPNLmGJHqlaA==",
+            "CloudFront-Is-Tablet-Viewer":
+            "false",
+            "Cache-Control":
+            "max-age=0",
+            "User-Agent":
+            "Custom User Agent String",
+            "CloudFront-Forwarded-Proto":
+            "https",
+            "Accept-Encoding":
+            "gzip, deflate, sdch"
+        },
+        "pathParameters": {
+            "proxy": "/examplepath"
+        },
+        "httpMethod": "POST",
+        "stageVariables": {
+            "baz": "qux"
+        },
+        "path": "/examplepath"
+    }
+
+
+def test_lambda_handler(apigw_event):
+
+    ret = app.lambda_handler(apigw_event, "")
+    assert ret['statusCode'] == 200
+
+    for key in ('message', 'location'):
+        assert key in ret['body']
+
+    data = json.loads(ret['body'])
+    assert data['message'] == 'hello world'
diff --git a/samcli/local/lambdafn/__init__.py b/samcli/local/lambdafn/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samcli/local/lambdafn/config.py b/samcli/local/lambdafn/config.py
new file mode 100644
index 0000000000..a1194a0141
--- /dev/null
+++ b/samcli/local/lambdafn/config.py
@@ -0,0 +1,52 @@
+"""
+Lambda Function configuration data required by the runtime
+"""
+
+from .env_vars import EnvironmentVariables
+
+
+class FunctionConfig(object):
+    """
+    Data class to store function configuration. This class is a flavor of function configuration passed to
+    AWS Lambda APIs on the cloud. It is limited to properties that make sense in a local testing environment.
+    """
+
+    _DEFAULT_TIMEOUT_SECONDS = 3
+    _DEFAULT_MEMORY = 128
+
+    def __init__(self,
+                 name,
+                 runtime,
+                 handler,
+                 code_abs_path,
+                 memory=None,
+                 timeout=None,
+                 env_vars=None):
+        """
+        Initialize the class.
+
+        :param string name: Name of the function
+        :param string runtime: Runtime of function
+        :param string handler: Handler method
+        :param string code_abs_path: Absolute path to the code
+        :param integer memory: Function memory limit in MB
+        :param integer timeout: Function timeout in seconds
+        :param samcli.local.lambdafn.env_vars.EnvironmentVariables env_vars: Optional, Environment variables.
+            If it not provided, this class will generate one for you based on the function properties
+        """
+
+        self.name = name
+        self.runtime = runtime
+        self.handler = handler
+        self.code_abs_path = code_abs_path
+        self.memory = memory or self._DEFAULT_MEMORY
+        self.timeout = timeout or self._DEFAULT_TIMEOUT_SECONDS
+
+        if not env_vars:
+            env_vars = EnvironmentVariables(self.memory, self.timeout, self.handler)
+
+        self.env_vars = env_vars
+        # Re-apply memory & timeout because those could have been set to default values
+        self.env_vars.handler = self.handler
+        self.env_vars.memory = self.memory
+        self.env_vars.timeout = self.timeout
diff --git a/samcli/local/lambdafn/env_vars.py b/samcli/local/lambdafn/env_vars.py
new file mode 100644
index 0000000000..6badb4b027
--- /dev/null
+++ b/samcli/local/lambdafn/env_vars.py
@@ -0,0 +1,197 @@
+"""
+Supplies the environment variables necessary to set up Local Lambda runtime
+"""
+
+
+class EnvironmentVariables(object):
+    """
+    Use this class to get the environment variables necessary to run the Lambda function. It returns the AWS specific
+    variables (credentials, regions, etc) along with any environment variables configured on the function.
+
+    Customers define the name of the environment variables along with default values, if any, when creating the
+    function. In order to test the function with different scenarios, customers can override values for some of the
+    variables. This class supports three mechanisms of providing values to environment variables.
+    If a variable is given a value through all the three mechanisms, then the value from higher priority will be used:
+
+    Priority (Highest to Lowest):
+        - Override Values - User specified these
+        - Shell Environment Values - Came from the shell environment
+        - Default Values - Hard coded values
+
+    If a variable does *not* get a value from either of the above mechanisms, it is given a value of "" (empty string).
+    If the value of a variable is an intrinsic function dict/list, then it is given a value of "" (empty string).
+
+    If real AWS Credentials were supplied, this class will expose them through appropriate environment variables.
+    If not, this class will provide the following placeholder values to AWS Credentials:
+        region = "us-east-1"
+        key = "defaultkey"
+        secret = "defaultsecret"
+    """
+
+    _BLANK_VALUE = ""
+    _DEFAULT_AWS_CREDS = {
+        "region": "us-east-1",
+        "key": "defaultkey",
+        "secret": "defaultsecret"
+    }
+
+    def __init__(self,
+                 function_memory=None,
+                 function_timeout=None,
+                 function_handler=None,
+                 variables=None,
+                 shell_env_values=None,
+                 override_values=None,
+                 aws_creds=None):
+        """
+        Initializes this class. It takes in two sets of properties:
+            a) (Required) Function information
+            b) (Optional) Environment variable configured on the function
+
+        :param integer function_memory: Memory size of the function in megabytes
+        :param integer function_timeout: Function's timeout in seconds
+        :param string function_handler: Handler of the function
+        :param dict variables: Optional. Dict whose key is the environment variable names and value is the default
+            values for the variable.
+        :param dict shell_env_values: Optional. Dict containing values for the variables grabbed from the shell's
+            environment.
+        :param dict override_values: Optional. Dict containing values for the variables that will override the values
+            from ``default_values`` and ``shell_env_values``.
+        :param dict aws_creds: Optional. Dictionary containing AWS credentials passed to the Lambda runtime through
+            environment variables. It should contain "key", "secret", "region" and optional "sessiontoken" keys
+        """
+
+        self._function = {
+            "memory": function_memory,
+            "timeout": function_timeout,
+            "handler": function_handler
+        }
+
+        self.variables = variables or {}
+        self.shell_env_values = shell_env_values or {}
+        self.override_values = override_values or {}
+        self.aws_creds = aws_creds or {}
+
+    def resolve(self):
+        """
+        Resolves the values from different sources and returns a dict of environment variables to use when running
+        the function locally.
+
+        :return dict: Dict where key is the variable name and value is the value of the variable. Both key and values
+            are strings
+        """
+
+        # AWS_* variables must always be passed to the function, but user has the choice to override them
+        result = self._get_aws_variables()
+
+        # Default value for the variable gets lowest priority
+        for name, value in self.variables.items():
+
+            # Shell environment values, second priority
+            if name in self.shell_env_values:
+                value = self.shell_env_values[name]
+
+            # Overridden values, highest priority
+            if name in self.override_values:
+                value = self.override_values[name]
+
+            # Any value must be a string when passed to Lambda runtime.
+            # Runtime expects a Map<String, String> for environment variables
+            result[name] = self._stringify_value(value)
+
+        return result
+
+    def add_lambda_event_body(self, value):
+        """
+        Adds the value of AWS_LAMBDA_EVENT_BODY environment variable.
+        """
+        self.variables["AWS_LAMBDA_EVENT_BODY"] = value
+
+    @property
+    def timeout(self):
+        return self._function["timeout"]
+
+    @timeout.setter
+    def timeout(self, value):
+        self._function["timeout"] = value
+
+    @property
+    def memory(self):
+        return self._function["memory"]
+
+    @memory.setter
+    def memory(self, value):
+        self._function["memory"] = value
+
+    @property
+    def handler(self):
+        return self._function["handler"]
+
+    @handler.setter
+    def handler(self, value):
+        self._function["handler"] = value
+
+    def _get_aws_variables(self):
+        """
+        Returns the AWS specific environment variables that should be available in the Lambda runtime.
+        They are prefixed it "AWS_*".
+
+        :return dict: Name and value of AWS environment variable
+        """
+
+        result = {
+            # Variable that says this function is running in Local Lambda
+            "AWS_SAM_LOCAL": "true",
+
+            # Function configuration
+            "AWS_LAMBDA_FUNCTION_MEMORY_SIZE": str(self.memory),
+            "AWS_LAMBDA_FUNCTION_TIMEOUT": str(self.timeout),
+            "AWS_LAMBDA_FUNCTION_HANDLER": str(self._function["handler"]),
+
+            # AWS Credentials - Use the input credentials or use the defaults
+            "AWS_REGION": self.aws_creds.get("region", self._DEFAULT_AWS_CREDS["region"]),
+
+            "AWS_DEFAULT_REGION": self.aws_creds.get("region", self._DEFAULT_AWS_CREDS["region"]),
+
+            "AWS_ACCESS_KEY_ID": self.aws_creds.get("key", self._DEFAULT_AWS_CREDS["key"]),
+
+            "AWS_SECRET_ACCESS_KEY": self.aws_creds.get("secret", self._DEFAULT_AWS_CREDS["secret"])
+
+            # Additional variables we don't fill in
+            # "AWS_ACCOUNT_ID="
+            # "AWS_LAMBDA_EVENT_BODY=",
+            # "AWS_LAMBDA_FUNCTION_NAME=",
+            # "AWS_LAMBDA_FUNCTION_VERSION=",
+        }
+
+        # Session Token should be added **only** if the input creds have a token and the value is not empty.
+        if self.aws_creds.get("sessiontoken"):
+            result["AWS_SESSION_TOKEN"] = self.aws_creds.get("sessiontoken")
+
+        return result
+
+    def _stringify_value(self, value):
+        """
+        This method stringifies values of environment variables. If the value of the method is a list or dictionary,
+        then this method will replace it with empty string. Values of environment variables in Lambda must be a string.
+        List or dictionary usually means they are intrinsic functions which have not been resolved.
+
+        :param value: Value to stringify
+        :return string: Stringified value
+        """
+
+        # List/dict/None values are replaced with a blank
+        if isinstance(value, (dict, list, tuple)) or value is None:
+            result = self._BLANK_VALUE
+
+        # str(True) will output "True". To maintain backwards compatibility we need to output "true" or "false"
+        elif value is True:
+            result = "true"
+        elif value is False:
+            result = "false"
+
+        # value is a scalar type like int, str which can be stringified
+        else:
+            result = str(value)
+
+        return result
diff --git a/samcli/local/lambdafn/exceptions.py b/samcli/local/lambdafn/exceptions.py
new file mode 100644
index 0000000000..f99ff10404
--- /dev/null
+++ b/samcli/local/lambdafn/exceptions.py
@@ -0,0 +1,10 @@
+"""
+Custom exception used by Local Lambda execution
+"""
+
+
+class FunctionNotFound(Exception):
+    """
+    Raised when the requested Lambda function is not found
+    """
+    pass
diff --git a/samcli/local/lambdafn/runtime.py b/samcli/local/lambdafn/runtime.py
new file mode 100644
index 0000000000..88a3b02806
--- /dev/null
+++ b/samcli/local/lambdafn/runtime.py
@@ -0,0 +1,200 @@
+"""
+Classes representing a local Lambda runtime
+"""
+
+import os
+import shutil
+import zipfile
+import tempfile
+import signal
+import logging
+import threading
+from contextlib import contextmanager
+
+from samcli.local.docker.lambda_container import LambdaContainer
+
+LOG = logging.getLogger(__name__)
+
+
+class LambdaRuntime(object):
+    """
+    This class represents a Local Lambda runtime. It can run the Lambda function code locally in a Docker container
+    and return results. Public methods exposed by this class are similar to the AWS Lambda APIs, for convenience only.
+    This class is **not** intended to be an local replica of the Lambda APIs.
+    """
+
+    SUPPORTED_ARCHIVE_EXTENSIONS = (".zip", ".jar", ".ZIP", ".JAR")
+
+    def __init__(self, container_manager):
+        """
+        Initialize the Local Lambda runtime
+
+        :param samcli.local.docker.manager.ContainerManager container_manager: Instance of the ContainerManager class
+            that can run a local Docker container
+        """
+        self._container_manager = container_manager
+
+    def invoke(self,
+               function_config,
+               event,
+               debug_port=None,
+               debug_args=None,
+               stdout=None,
+               stderr=None):
+        """
+        Invoke the given Lambda function locally.
+
+        ##### NOTE: THIS IS A LONG BLOCKING CALL #####
+        This method will block until either the Lambda function completes or timed out, which could be seconds.
+        A blocking call will block the thread preventing any other operations from happening. If you are using this
+        method in a web-server or in contexts where your application needs to be responsive when function is running,
+        take care to invoke the function in a separate thread. Co-Routines or micro-threads might not perform well
+        because the underlying implementation essentially blocks on a socket, which is synchronous.
+
+        :param FunctionConfig function_config: Configuration of the function to invoke
+        :param event: String input event passed to Lambda function
+        :param integer debug_port: Optional, port to attach debugger to
+        :param string debug_args: Optional, additional args to pass to debugger
+        :param io.IOBase stdout: Optional. IO Stream to that receives stdout text from container.
+        :param io.IOBase stderr: Optional. IO Stream that receives stderr text from container
+        :raises Keyboard
+        """
+        timer = None
+
+        # Update with event input
+        environ = function_config.env_vars
+        environ.add_lambda_event_body(event)
+        # Generate a dictionary of environment variable key:values
+        env_vars = environ.resolve()
+
+        with self._get_code_dir(function_config.code_abs_path) as code_dir:
+
+            container = LambdaContainer(function_config.runtime,
+                                        function_config.handler,
+                                        code_dir,
+                                        memory_mb=function_config.memory,
+                                        env_vars=env_vars,
+                                        debug_port=debug_port,
+                                        debug_args=debug_args)
+
+            try:
+
+                # Start the container. This call returns immediately after the container starts
+                self._container_manager.run(container)
+
+                # Setup appropriate interrupt - timeout or Ctrl+C - before function starts executing.
+                #
+                # Start the timer **after** container starts. Container startup takes several seconds, only after which,
+                # our Lambda function code will run. Starting the timer is a reasonable approximation that function has
+                # started running.
+                timer = self._configure_interrupt(function_config.name,
+                                                  function_config.timeout,
+                                                  container,
+                                                  bool(debug_port))
+
+                # NOTE: BLOCKING METHOD
+                # Block the thread waiting to fetch logs from the container. This method will return after container
+                # terminates, either successfully or killed by one of the interrupt handlers above.
+                container.wait_for_logs(stdout=stdout, stderr=stderr)
+
+            except KeyboardInterrupt:
+                # When user presses Ctrl+C, we receive a Keyboard Interrupt. This is especially very common when
+                # container is in debugging mode. We have special handling of Ctrl+C. So handle KeyboardInterrupt
+                # and swallow the exception. The ``finally`` block will also take care of cleaning it up.
+                LOG.debug("Ctrl+C was pressed. Aborting Lambda execution")
+
+            finally:
+                # We will be done with execution, if either the execution completed or an interrupt was fired
+                # Any case, cleanup the timer and container.
+                #
+                # If we are in debugging mode, timer would not be created. So skip cleanup of the timer
+                if timer:
+                    timer.cancel()
+                self._container_manager.stop(container)
+
+    def _configure_interrupt(self, function_name, timeout, container, is_debugging):
+        """
+        When a Lambda function is executing, we setup certain interrupt handlers to stop the execution.
+        Usually, we setup a function timeout interrupt to kill the container after timeout expires. If debugging though,
+        we don't enforce a timeout. But we setup a SIGINT interrupt to catch Ctrl+C and terminate the container.
+
+        :param string function_name: Name of the function we are running
+        :param integer timeout: Timeout in seconds
+        :param samcli.local.docker.container.Container container: Instance of a container to terminate
+        :param bool is_debugging: Are we debugging?
+        :return threading.Timer: Timer object, if we setup a timer. None otherwise
+        """
+
+        def timer_handler():
+            # NOTE: This handler runs in a separate thread. So don't try to mutate any non-thread-safe data structures
+            LOG.info("Function '%s' timed out after %d seconds", function_name, timeout)
+            self._container_manager.stop(container)
+
+        def signal_handler(sig, frame):
+            # NOTE: This handler runs in a separate thread. So don't try to mutate any non-thread-safe data structures
+            LOG.info("Execution of function %s was interrupted", function_name)
+            self._container_manager.stop(container)
+
+        if is_debugging:
+            LOG.debug("Setting up SIGTERM interrupt handler")
+            signal.signal(signal.SIGTERM, signal_handler)
+        else:
+            # Start a timer, we'll use this to abort the function if it runs beyond the specified timeout
+            LOG.debug("Starting a timer for %s seconds for function '%s'", timeout, function_name)
+            timer = threading.Timer(timeout, timer_handler, ())
+            timer.start()
+            return timer
+
+    @contextmanager
+    def _get_code_dir(self, code_path):
+        """
+        Method to get a path to a directory where the Lambda function code is available. This directory will
+        be mounted directly inside the Docker container.
+
+        This method handles a few different cases for ``code_path``:
+            - ``code_path``is a existent zip/jar file: Unzip in a temp directory and return the temp directory
+            - ``code_path`` is a existent directory: Return this immediately
+            - ``code_path`` is a file/dir that does not exist: Return it as is. May be this method is not clever to
+                detect the existence of the path
+
+        :param string code_path: Path to the code. This could be pointing at a file or folder either on a local
+            disk or in some network file system
+        :return string: Directory containing Lambda function code. It can be mounted directly in container
+        """
+
+        decompressed_dir = None
+
+        try:
+            if os.path.isfile(code_path) and code_path.endswith(self.SUPPORTED_ARCHIVE_EXTENSIONS):
+
+                decompressed_dir = _unzip_file(code_path)
+                yield decompressed_dir
+
+            else:
+                LOG.debug("Code %s is not a zip/jar file", code_path)
+                yield code_path
+        finally:
+            if decompressed_dir:
+                shutil.rmtree(decompressed_dir)
+
+
+def _unzip_file(filepath):
+    """
+    Helper method to unzip a file to a temporary directory
+
+    :param string filepath: Absolute path to this file
+    :return string: Path to the temporary directory where it was unzipped
+    """
+
+    temp_dir = tempfile.mkdtemp()
+
+    LOG.info("Decompressing %s", filepath)
+
+    zip_ref = zipfile.ZipFile(filepath, 'r')
+    zip_ref.extractall(temp_dir)
+
+    # The directory that Python returns might have symlinks. The Docker File sharing settings will not resolve
+    # symlinks. Hence get the real path before passing to Docker.
+    # Especially useful in Mac OSX which returns /var/folders which is a symlink to /private/var/folders that is a
+    # part of Docker's Shared Files directories
+    return os.path.realpath(temp_dir)
diff --git a/samcli/yamlhelper.py b/samcli/yamlhelper.py
new file mode 100644
index 0000000000..c4d3365361
--- /dev/null
+++ b/samcli/yamlhelper.py
@@ -0,0 +1,67 @@
+"""
+Helper to be able to parse/dump YAML files
+"""
+
+import json
+import six
+
+import yaml
+from yaml.resolver import ScalarNode, SequenceNode
+
+
+def intrinsics_multi_constructor(loader, tag_prefix, node):
+    """
+    YAML constructor to parse CloudFormation intrinsics.
+    This will return a dictionary with key being the instrinsic name
+    """
+
+    # Get the actual tag name excluding the first exclamation
+    tag = node.tag[1:]
+
+    # Some intrinsic functions doesn't support prefix "Fn::"
+    prefix = "Fn::"
+    if tag in ["Ref", "Condition"]:
+        prefix = ""
+
+    cfntag = prefix + tag
+
+    if tag == "GetAtt" and isinstance(node.value, six.string_types):
+        # ShortHand notation for !GetAtt accepts Resource.Attribute format
+        # while the standard notation is to use an array
+        # [Resource, Attribute]. Convert shorthand to standard format
+        value = node.value.split(".", 1)
+
+    elif isinstance(node, ScalarNode):
+        # Value of this node is scalar
+        value = loader.construct_scalar(node)
+
+    elif isinstance(node, SequenceNode):
+        # Value of this node is an array (Ex: [1,2])
+        value = loader.construct_sequence(node)
+
+    else:
+        # Value of this node is an mapping (ex: {foo: bar})
+        value = loader.construct_mapping(node)
+
+    return {cfntag: value}
+
+
+def yaml_dump(dict_to_dump):
+    """
+    Dumps the dictionary as a YAML document
+    :param dict_to_dump:
+    :return:
+    """
+    return yaml.safe_dump(dict_to_dump, default_flow_style=False)
+
+
+def yaml_parse(yamlstr):
+    """Parse a yaml string"""
+    try:
+        # PyYAML doesn't support json as well as it should, so if the input
+        # is actually just json it is better to parse it with the standard
+        # json parser.
+        return json.loads(yamlstr)
+    except ValueError:
+        yaml.SafeLoader.add_multi_constructor("!", intrinsics_multi_constructor)
+        return yaml.safe_load(yamlstr)
diff --git a/samples/.gitignore b/samples/.gitignore
deleted file mode 100644
index 07c98fb9ac..0000000000
--- a/samples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-packaged-template.yaml
diff --git a/samples/README.md b/samples/README.md
deleted file mode 100644
index 9d8dc48d5d..0000000000
--- a/samples/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# AWS SAM Examples #
-
-To work with the example applications in this repository, first ensure that you've installed and configured the requirements listed below. Then follow the instructions in the README files in the application/language subdirectories.
-
-## Requirements ##
-
-* An AWS account
-* The AWS Command Line Interface (AWS CLI)
-* Docker
-* SAM Local
-* An Amazon S3 bucket
-* (Optional) Maven
-
-To install the AWS CLI, follow the instructions at [Installing the AWS Command Line Interface](http://docs.aws.amazon.com/cli/latest/userguide/installing.html).
-
-To install Docker and SAM Local, follow the instructions at [Requirements for Using SAM Local](http://docs.aws.amazon.com/lambda/latest/dg/test-sam-local.html#sam-cli-requirements).
-
-To create an Amazon S3 bucket, follow the instructions at [Create a Bucket](http://docs.aws.amazon.com/AmazonS3/latest/gsg/CreatingABucket.html).
-
-To run the Java examples, you'll need to install Maven. For more information, see [Creating a .jar Deployment Package Using Maven without any IDE (Java) ](http://docs.aws.amazon.com/lambda/latest/dg/java-create-jar-pkg-maven-no-ide.html).
-
-## Recommended ##
-
-* [Postman](https://www.getpostman.com/)
-
-You can use Postman to test API Gateway.
diff --git a/samples/api-event-source/node/index.js b/samples/api-event-source/node/index.js
deleted file mode 100644
index 2f7a0af683..0000000000
--- a/samples/api-event-source/node/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-exports.handler = (event, context, callback) => {
-
-    callback(null, {
-        statusCode: 200,
-        body: "OK"
-    })
-
-}
diff --git a/samples/api-event-source/node/template.yaml b/samples/api-event-source/node/template.yaml
deleted file mode 100644
index acfeebf6a9..0000000000
--- a/samples/api-event-source/node/template.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-AWSTemplateFormatVersion : '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-
-Description: |
-  An example RESTful service
-
-Resources:
-  ExampleFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: nodejs6.10
-      Handler: index.handler
-      Events:
-        ListCustomers:
-          Type: Api
-          Properties:
-            Path: /
-            Method: any
diff --git a/samples/api-event-source/python/api.py b/samples/api-event-source/python/api.py
deleted file mode 100644
index f8bb8bdbe0..0000000000
--- a/samples/api-event-source/python/api.py
+++ /dev/null
@@ -1,6 +0,0 @@
-def get(event, context):
-    return {"body": "GET OK", "statusCode": 200}
-
-
-def put(event, context):
-    return {"body": "PUT OK", "statusCode": 200}
diff --git a/samples/api-event-source/python/template.yaml b/samples/api-event-source/python/template.yaml
deleted file mode 100644
index d96a29f0ae..0000000000
--- a/samples/api-event-source/python/template.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-AWSTemplateFormatVersion : '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-
-Description: |
-  An example RESTful service
-
-Resources:
-  ExampleGetFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: python3.6
-      Handler: api.get
-      Events:
-        GetItems:
-          Type: Api
-          Properties:
-            Path: /
-            Method: get
-  ExamplePutFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: python3.6
-      Handler: api.put
-      Events:
-        PutItems:
-          Type: Api
-          Properties:
-            Path: /
-            Method: put
-
diff --git a/samples/go-lambda/README.md b/samples/go-lambda/README.md
deleted file mode 100644
index ef06b35c42..0000000000
--- a/samples/go-lambda/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-This is a very simple Hello World application written in Golang.
-
-### Instructions
-
-1. Build the binary to be compatible with Linux: `GOOS=linux go build main.go`
-2. Zip up the binary: `zip main.zip ./main`
-3. Invoke locally
-```bash
-$ echo '"world"' | sam local invoke
-
-2018/01/23 16:00:46 Successfully parsed template.yaml
-2018/01/23 16:00:46 Connected to Docker 1.30
-2018/01/23 16:00:46 Fetching lambci/lambda:go1.x image for go1.x runtime...
-....
-"Hello world!"
-
-```
-
diff --git a/samples/go-lambda/main.go b/samples/go-lambda/main.go
deleted file mode 100644
index 0609d6d3b2..0000000000
--- a/samples/go-lambda/main.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package main
-
-import (
-        "fmt"
-        "github.com/aws/aws-lambda-go/lambda"
-)
-
-func HandleRequest(name string) (string, error) {
-        return fmt.Sprintf("Hello %s!", name), nil
-}
-
-func main() {
-        lambda.Start(HandleRequest)
-}
diff --git a/samples/go-lambda/template.yaml b/samples/go-lambda/template.yaml
deleted file mode 100644
index 74dbf3165a..0000000000
--- a/samples/go-lambda/template.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-AWSTemplateFormatVersion : '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Hello World Go Lambda function 
-
-Resources:
-
-  Function:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: main
-      CodeUri: ./main.zip
-      Runtime: go1.x
diff --git a/samples/hello-world/golang/README.md b/samples/hello-world/golang/README.md
deleted file mode 100644
index 045a7a39e0..0000000000
--- a/samples/hello-world/golang/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# AWS SAM Hello World Example #
-
-A simple AWS SAM template that specifies a single Lambda function.
-
-## Usage ##
-
-To create and deploy the SAM Hello World example, first ensure that you've met the requirements described in the [root README](../../README.md). Then follow the steps below.
-
-### Build your package ###
-
-    GOOS=linux go build -o main
-
-### Test your application locally ###
-
-Use [SAM Local](https://github.com/awslabs/aws-sam-local) to run your Lambda function locally:
-
-    sam local invoke "HelloWorld" -e event.json
-
-### Package artifacts ###
-
-Run the following command, replacing `BUCKET-NAME` with the name of your bucket:
-
-    sam package --template-file template.yaml --s3-bucket BUCKET-NAME --output-template-file packaged-template.yaml
-
-This creates a new template file, packaged-template.yaml, that you will use to deploy your serverless application.
-
-### Deploy to AWS CloudFormation ###
-
-Run the following command, replacing `MY-NEW-STACK` with a name for your CloudFormation stack.
-
-    sam deploy --template-file packaged-template.yaml --stack-name MY-NEW-STACK --capabilities CAPABILITY_IAM
-
-This uploads your template to an S3 bucket and deploys the specified resources using AWS CloudFormation.
diff --git a/samples/hello-world/golang/main.go b/samples/hello-world/golang/main.go
deleted file mode 100644
index 9944e2aa6f..0000000000
--- a/samples/hello-world/golang/main.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package main
-
-import (
-        "fmt"
-        "log"
-        "context"
-        "github.com/aws/aws-lambda-go/lambda"
-)
-
-type Event map[string]interface{}
-
-func HandleRequest(ctx context.Context, event Event) (string, error) {
-        log.Print("value1 = ", event["key1"] )
-        log.Print("value2 = ", event["key2"] )
-        log.Print("value3 = ", event["key3"] )
-
-        return fmt.Sprintf("Hello World"), nil
-}
-
-func main() {
-        lambda.Start(HandleRequest)
-}
diff --git a/samples/hello-world/golang/template.yaml b/samples/hello-world/golang/template.yaml
deleted file mode 100644
index fed1a828af..0000000000
--- a/samples/hello-world/golang/template.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-AWSTemplateFormatVersion : '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-
-Description: A simple Hello World Serverless project
-Resources:
-  HelloWorld:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: go1.x
-      Handler: main
-      CodeUri: .
diff --git a/samples/hello-world/java/README.md b/samples/hello-world/java/README.md
deleted file mode 100644
index db3f250282..0000000000
--- a/samples/hello-world/java/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# AWS SAM Hello World Example #
-
-A simple AWS SAM template that specifies a single Lambda function.
-
-## Usage ##
-
-To create and deploy the SAM Hello World example, first ensure that you've met the requirements described in the [root README](../../README.md). Then follow the steps below.
-
-### Build your package ###
-
-    mvn package shade:shade
-
-### Test your application locally ###
-
-Use [SAM Local](https://github.com/awslabs/aws-sam-local) to run your Lambda function locally:
-
-    sam local invoke "HelloWorldFunction" -e event.json
-
-### Package artifacts ###
-
-Run the following command, replacing `BUCKET-NAME` with the name of your bucket:
-
-    sam package --template-file template.yaml --s3-bucket BUCKET-NAME --output-template-file packaged-template.yaml
-
-This creates a new template file, packaged-template.yaml, that you will use to deploy your serverless application.
-
-### Deploy to AWS CloudFormation ###
-
-Run the following command, replacing `MY-NEW-STACK` with a name for your CloudFormation stack.
-
-    sam deploy --template-file packaged-template.yaml --stack-name MY-NEW-STACK --capabilities CAPABILITY_IAM
-
-This uploads your template to an S3 bucket and deploys the specified resources using AWS CloudFormation.
diff --git a/samples/hello-world/java/event.json b/samples/hello-world/java/event.json
deleted file mode 100644
index a5fb7093c9..0000000000
--- a/samples/hello-world/java/event.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "key1": "value1",
-    "key2": "value2",
-    "key3": "value3"
-}
diff --git a/samples/hello-world/java/pom.xml b/samples/hello-world/java/pom.xml
deleted file mode 100644
index e67064ff8a..0000000000
--- a/samples/hello-world/java/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.amazonaws.examples</groupId>
-  <artifactId>HelloWorld</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0</version>
-  <name>AWS SAM Local Hello World Example</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-lambda-java-core</artifactId>
-      <version>1.1.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <createDependencyReducedPom>false</createDependencyReducedPom>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/samples/hello-world/java/src/main/java/com/amazonaws/HelloWorld.java b/samples/hello-world/java/src/main/java/com/amazonaws/HelloWorld.java
deleted file mode 100644
index c895e0aeea..0000000000
--- a/samples/hello-world/java/src/main/java/com/amazonaws/HelloWorld.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.amazonaws.examples;
-
-import com.amazonaws.services.lambda.runtime.Context;
-import com.amazonaws.services.lambda.runtime.RequestHandler;
-
-public class HelloWorld implements RequestHandler<Request, Response> {
-    public Response handleRequest(Request request, Context context) {
-        System.out.println("value1 = " + request.key1);
-        System.out.println("value2 = " + request.key2);
-        System.out.println("value3 = " + request.key3);
-
-        return new Response("Hello World");
-    }
-}
diff --git a/samples/hello-world/java/src/main/java/com/amazonaws/examples/Request.java b/samples/hello-world/java/src/main/java/com/amazonaws/examples/Request.java
deleted file mode 100644
index 03b6d4818f..0000000000
--- a/samples/hello-world/java/src/main/java/com/amazonaws/examples/Request.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.amazonaws.examples;
-
-public class Request {
-    String key1;
-    String key2;
-    String key3;
-
-    public String getKey1() {
-        return key1;
-    }
-
-    public void setKey1(String key1) {
-        this.key1 = key1;
-    }
-
-    public String getKey2() {
-        return key2;
-    }
-
-    public void setKey2(String key2) {
-        this.key2 = key2;
-    }
-
-    public String getKey3() {
-        return key3;
-    }
-
-    public void setKey3(String key3) {
-        this.key3 = key3;
-    }
-
-    public Request(String key1, String key2, String key3) {
-        this.key1 = key1;
-        this.key2 = key2;
-        this.key3 = key3;
-    }
-
-    public Request() {}
-}
diff --git a/samples/hello-world/java/src/main/java/com/amazonaws/examples/Response.java b/samples/hello-world/java/src/main/java/com/amazonaws/examples/Response.java
deleted file mode 100644
index 0dc8ce9204..0000000000
--- a/samples/hello-world/java/src/main/java/com/amazonaws/examples/Response.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.amazonaws.examples;
-
-public class Response {
-    String message;
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public Response(String message) {
-        this.message = message;
-    }
-
-    public Response() {}
-}
diff --git a/samples/hello-world/java/template.yaml b/samples/hello-world/java/template.yaml
deleted file mode 100644
index 21bad96424..0000000000
--- a/samples/hello-world/java/template.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-AWSTemplateFormatVersion : '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: A hello world application.
-Resources:
-  HelloWorldFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: com.amazonaws.examples.HelloWorld
-      Runtime: java8
-      CodeUri: ./target/HelloWorld-1.0.jar
diff --git a/samples/hello-world/node/README.md b/samples/hello-world/node/README.md
deleted file mode 100644
index 4cfec21d19..0000000000
--- a/samples/hello-world/node/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# AWS SAM Hello World Example #
-
-A simple AWS SAM template that specifies a single Lambda function.
-
-## Usage ##
-
-To create and deploy the SAM Hello World example, first ensure that you've met the requirements described in the [root README](../../README.md). Then follow the steps below.
-
-### Test your application locally ###
-
-Use [SAM Local](https://github.com/awslabs/aws-sam-local) to run your Lambda function locally:
-
-    sam local invoke "HelloWorld" -e event.json
-
-### Package artifacts ###
-
-Run the following command, replacing `BUCKET-NAME` with the name of your bucket:
-
-    sam package --template-file template.yaml --s3-bucket BUCKET-NAME --output-template-file packaged-template.yaml
-
-This creates a new template file, packaged-template.yaml, that you will use to deploy your serverless application.
-
-### Deploy to AWS CloudFormation ###
-
-Run the following command, replacing `MY-NEW-STACK` with a name for your CloudFormation stack.
-
-    sam deploy --template-file packaged-template.yaml --stack-name MY-NEW-STACK --capabilities CAPABILITY_IAM
-
-This uploads your template to an S3 bucket and deploys the specified resources using AWS CloudFormation.
diff --git a/samples/hello-world/node/event.json b/samples/hello-world/node/event.json
deleted file mode 100644
index 442e32a789..0000000000
--- a/samples/hello-world/node/event.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "name": "Bob"
-}
diff --git a/samples/hello-world/node/index.js b/samples/hello-world/node/index.js
deleted file mode 100644
index 1c88103667..0000000000
--- a/samples/hello-world/node/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-
-// A simple hello world Lambda function
-exports.handler = (event, context, callback) => {
-
-    console.log('LOG: Name is ' + event.name);
-    callback(null, "Hello " + event.name);
-
-}
diff --git a/samples/hello-world/node/template.yaml b/samples/hello-world/node/template.yaml
deleted file mode 100644
index b70e5a1929..0000000000
--- a/samples/hello-world/node/template.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-AWSTemplateFormatVersion : '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-
-Description: A simple Hello World Serverless project
-Resources:
-  HelloWorld:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: nodejs6.10
-      Handler: index.handler
-      CodeUri: .
diff --git a/samples/hello-world/python/README.md b/samples/hello-world/python/README.md
deleted file mode 100644
index 491a2ef099..0000000000
--- a/samples/hello-world/python/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# AWS SAM Hello World Example #
-
-A simple AWS SAM template that specifies a single Lambda function.
-
-## Usage ##
-
-To create and deploy the SAM Hello World example, first ensure that you've met the requirements described in the [root README](../../README.md). Then follow the steps below.
-
-### Test your application locally ###
-
-Use [SAM Local](https://github.com/awslabs/aws-sam-local) to run your Lambda function locally:
-
-    sam local invoke "HelloWorldFunction" -e event.json
-
-### Package artifacts ###
-
-Run the following command, replacing `BUCKET-NAME` with the name of your bucket:
-
-    sam package --template-file template.yaml --s3-bucket BUCKET-NAME --output-template-file packaged-template.yaml
-
-This creates a new template file, packaged-template.yaml, that you will use to deploy your serverless application.
-
-### Deploy to AWS CloudFormation ###
-
-Run the following command, replacing `MY-NEW-STACK` with a name for your CloudFormation stack.
-
-    sam deploy --template-file packaged-template.yaml --stack-name MY-NEW-STACK --capabilities CAPABILITY_IAM
-
-This uploads your template to an S3 bucket and deploys the specified resources using AWS CloudFormation.
diff --git a/samples/hello-world/python/event.json b/samples/hello-world/python/event.json
deleted file mode 100644
index a5fb7093c9..0000000000
--- a/samples/hello-world/python/event.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "key1": "value1",
-    "key2": "value2",
-    "key3": "value3"
-}
diff --git a/samples/hello-world/python/main.py b/samples/hello-world/python/main.py
deleted file mode 100644
index d0ec46f048..0000000000
--- a/samples/hello-world/python/main.py
+++ /dev/null
@@ -1,8 +0,0 @@
-print('Loading function')
-
-def handler(event, context):
-    print("value1 = " + event['key1'])
-    print("value2 = " + event['key2'])
-    print("value3 = " + event['key3'])
-
-    return "Hello world"
diff --git a/samples/hello-world/python/template.yaml b/samples/hello-world/python/template.yaml
deleted file mode 100644
index 4a17740077..0000000000
--- a/samples/hello-world/python/template.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-AWSTemplateFormatVersion : '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: A hello world application.
-Resources:
-  HelloWorldFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: main.handler
-      Runtime: python3.6
-      CodeUri: .
diff --git a/samples/java/.gitignore b/samples/java/.gitignore
deleted file mode 100644
index e420ee4ba0..0000000000
--- a/samples/java/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-target/*
diff --git a/samples/java/README.md b/samples/java/README.md
deleted file mode 100644
index e2cfb82be8..0000000000
--- a/samples/java/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-Welcome to the AWS CodeStar sample web service
-==============================================
-
-This sample code helps get you started with a simple Java web service using
-AWS Lambda and Amazon API Gateway.
-
-What's Here
------------
-
-This sample includes:
-
-* README.md - this file
-* buildspec.yml - this file is used by AWS CodeBuild to build the web
-  service
-* pom.xml - this file is the Maven Project Object Model for the web service
-* src/ - this directory contains your Java service source files
-* template.yml - this file contains the Serverless Application Model (SAM) used
-  by AWS Cloudformation to deploy your application to AWS Lambda and Amazon API
-  Gateway.
-
-
-What Do I Do Next?
-------------------
-
-If you have checked out a local copy of your AWS CodeCommit repository you can
-start making changes to the sample code.  We suggest making a small change to
-index.py first, so you can see how changes pushed to your project's repository
-in AWS CodeCommit are automatically picked up by your project pipeline and
-deployed to AWS Lambda and Amazon API Gateway.  (You can watch the pipeline
-progress on your AWS CodeStar project dashboard.)  Once you've seen how that
-works, start developing your own code, and have fun!
-
-Learn more about Serverless Application Model (SAM) and how it works here:
-https://github.com/awslabs/serverless-application-model/blob/master/HOWTO.md
-
-AWS Lambda Developer Guide:
-http://docs.aws.amazon.com/lambda/latest/dg/deploying-lambda-apps.html
-
-Learn more about AWS CodeStar by reading the user guide, and post questions and
-comments about AWS CodeStar on our forum.
-
-AWS CodeStar User Guide:
-http://docs.aws.amazon.com/codestar/latest/userguide/welcome.html
-
-AWS CodeStar Forum: https://forums.aws.amazon.com/forum.jspa?forumID=248
diff --git a/samples/java/buildspec.yml b/samples/java/buildspec.yml
deleted file mode 100644
index 1b8a006adb..0000000000
--- a/samples/java/buildspec.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: 0.2
-
-phases:
-  build:
-    commands:
-      - echo Entering build phase...
-      - echo Build started on `date`
-      - mvn package shade:shade
-      - mv target/HelloWorld-1.0.jar .
-      - unzip HelloWorld-1.0.jar
-      - rm -rf target src buildspec.yml pom.xml HelloWorld-1.0.jar
-      - aws cloudformation package --template template.yml --s3-bucket $S3_BUCKET --output-template template-export.json
-artifacts:
-  files:
-    - template-export.json
\ No newline at end of file
diff --git a/samples/java/pom.xml b/samples/java/pom.xml
deleted file mode 100644
index c78dfa7bfa..0000000000
--- a/samples/java/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.aws.codestar.projecttemplates</groupId>
-    <artifactId>HelloWorld</artifactId>
-    <version>1.0</version>
-    <packaging>jar</packaging>
-    <name>A sample Java Spring web service created with AWS CodeStar.</name>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.3.RELEASE</version>
-    </parent>
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-lambda-java-core</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
-                    <version>2.3</version>
-                    <configuration>
-                      <createDependencyReducedPom>false</createDependencyReducedPom>
-                    </configuration>
-                    <executions>
-                      <execution>
-                        <phase>package</phase>
-                        <goals>
-                          <goal>shade</goal>
-                        </goals>
-                      </execution>
-                    </executions>
-                  </plugin>
-                <plugin>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-maven-plugin</artifactId>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>
diff --git a/samples/java/src/main/java/com/aws/codestar/projecttemplates/Application.java b/samples/java/src/main/java/com/aws/codestar/projecttemplates/Application.java
deleted file mode 100644
index b6702649bd..0000000000
--- a/samples/java/src/main/java/com/aws/codestar/projecttemplates/Application.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.aws.codestar.projecttemplates;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/** Simple class to start up the application.
- *
- * @SpringBootApplication adds:
- *  @Configuration
- *  @EnableAutoConfiguration
- *  @ComponentScan
- */
-@SpringBootApplication
-public class Application {
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-}
diff --git a/samples/java/src/main/java/com/aws/codestar/projecttemplates/handler/HelloWorldHandler.java b/samples/java/src/main/java/com/aws/codestar/projecttemplates/handler/HelloWorldHandler.java
deleted file mode 100644
index d437d09328..0000000000
--- a/samples/java/src/main/java/com/aws/codestar/projecttemplates/handler/HelloWorldHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.aws.codestar.projecttemplates.handler;
-
-import com.amazonaws.services.lambda.runtime.Context;
-import com.amazonaws.services.lambda.runtime.RequestHandler;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.aws.codestar.projecttemplates.GatewayResponse;
-
-/**
- * Handler for requests to Lambda function.
- */
-public class HelloWorldHandler implements RequestHandler<Object, Object> {
-
-    public Object handleRequest(final Object input, final Context context) {
-        Map<String, String> headers = new HashMap<>();
-        headers.put("Content-Type", "application/json");
-        headers.put("X-Custom-Header", "application/json");
-        System.err.println("This is a test log message 1");
-        System.err.println("This is a test log message 2");
-        return new GatewayResponse("{ \"Output\": \"Hello World!\"}", headers, 200);
-    }
-}
diff --git a/samples/java/template.yml b/samples/java/template.yml
deleted file mode 100644
index fc39258588..0000000000
--- a/samples/java/template.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Transform:
-- AWS::Serverless-2016-10-31
-- AWS::CodeStar
-
-Parameters:
-  ProjectId:
-    Type: String
-    Description: AWS CodeStar projectID used to associate new resources to team members
-
-Resources:
-  GetHelloWorld:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: com.aws.codestar.projecttemplates.handler.HelloWorldHandler
-      CodeUri: ./target/HelloWorld-1.0.jar
-      Runtime: java8
-      Role:
-        Fn::ImportValue:
-          !Join ['-', [!Ref 'ProjectId', !Ref 'AWS::Region', 'LambdaTrustRole']]
-      Events:
-        GetEvent:
-          Type: Api
-          Properties:
-            Path: /java
-            Method: get
-
-  PostHelloWorld:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: com.aws.codestar.projecttemplates.handler.HelloWorldHandler
-      CodeUri: ./target/HelloWorld-1.0.jar
-      Runtime: java8
-      Role:
-        Fn::ImportValue:
-          !Join ['-', [!Ref 'ProjectId', !Ref 'AWS::Region', 'LambdaTrustRole']]
-      Events:
-        PostEvent:
-          Type: Api
-          Properties:
-            Path: /
-            Method: post
diff --git a/samples/python-with-packages/.gitignore b/samples/python-with-packages/.gitignore
deleted file mode 100644
index e5aeba8201..0000000000
--- a/samples/python-with-packages/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.py[co]
-*.egg-info
-
-/bundle.zip
-/packaged.yml
-
-/var
-/.venv
diff --git a/samples/python-with-packages/Makefile b/samples/python-with-packages/Makefile
deleted file mode 100644
index 3feeb20e44..0000000000
--- a/samples/python-with-packages/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-SHELL := /bin/bash
-PY_VERSION := 3.6
-
-export PYTHONUNBUFFERED := 1
-
-AWS_PROFILE ?= sandbox
-BUCKET ?= <<bucket>>
-S3_PREFIX ?= sources
-STACK_NAME ?= stack-cloudschedule
-
-BASE := $(shell /bin/pwd)
-VENV_DIR := $(BASE)/.venv
-export PATH := var:$(PATH):$(VENV_DIR)/bin
-
-PYTHON := $(shell /usr/bin/which python$(PY_VERSION))
-VIRTUALENV := $(PYTHON) -m venv
-ZIP_FILE := $(BASE)/bundle.zip
-
-.DEFAULT_GOAL := build
-.PHONY: build clean release describe deploy package bundle bundle.local
-
-
-build:
-	$(VIRTUALENV) "$(VENV_DIR)"
-	mkdir -p "$(VENV_DIR)/lib64/python$(PY_VERSION)/site-packages"
-	touch "$(VENV_DIR)/lib64/python$(PY_VERSION)/site-packages/file"
-	"$(VENV_DIR)/bin/pip$(PY_VERSION)" \
-		--isolated \
-		--disable-pip-version-check \
-		install --no-binary :all: -Ur requirements.txt
-	find "$(VENV_DIR)" -name "*.pyc" -exec rm -f {} \;
-
-bundle.local:
-	zip -r -9 "$(ZIP_FILE)" example
-	cd "$(VENV_DIR)/lib/python$(PY_VERSION)/site-packages" \
-		&& zip -r9 "$(ZIP_FILE)" *
-	cd "$(VENV_DIR)/lib64/python$(PY_VERSION)/site-packages" \
-		&& zip -r9 "$(ZIP_FILE)" *
-
-bundle:
-	docker run -v $$PWD:/var/task -it lambci/lambda:build-python3.6 /bin/bash -c 'make clean build bundle.local'
-
-package:
-	sam package \
-		--template-file template.yml \
-		--s3-bucket $(BUCKET) \
-		--s3-prefix $(S3_PREFIX) \
-		--output-template-file packaged.yml
-
-deploy:
-	sam deploy \
-		--template-file packaged.yml \
-		--stack-name $(STACK_NAME) \
-		--capabilities CAPABILITY_IAM
-
-# call this in case of errors
-describe:
-	aws cloudformation describe-stack-events --stack-name $(STACK_NAME)
-
-release:
-	@make bundle
-	@make package
-	@make deploy
-
-clean:
-	rm -rf "$(VENV_DIR)" "$(BASE)/var" "$(BASE)/__pycache__" "$(ZIP_FILE)"
-
diff --git a/samples/python-with-packages/README.md b/samples/python-with-packages/README.md
deleted file mode 100644
index e2b97667b3..0000000000
--- a/samples/python-with-packages/README.md
+++ /dev/null
@@ -1,130 +0,0 @@
-# Full Example for a Python Lambda with external Dependencies
-
-## Development 
-
-### Prerequisites
-
-- Install [Docker](https://github.com/awslabs/aws-sam-local#prerequisites)
-- Install [AWS SAM local](https://github.com/awslabs/aws-sam-local) from 
-  [here](https://github.com/awslabs/aws-sam-local/releases)
-
-### Run 
-
-As we defined `EnvDownHandler` in [`template.yml`](template.yml), our 
-`invoke` call looks like this
-
-```bash
-$ echo '{ "resources": ["arn:aws:events:eu-west-1:482174156240:rule/10MinuteTickRule"] }' | sam local invoke EnvDownHandler
-2017/09/06 11:06:39 Successfully parsed template.yml
-2017/09/06 11:06:39 Connected to Docker 1.30
-2017/09/06 11:06:39 Fetching lambci/lambda:python3.6 image for python3.6 runtime...
-python3.6: Pulling from lambci/lambda
-Digest: sha256:b0245d6aaae7648b4c488ffa3113e20d67b77ecc15392589162f67e7fa8e1bb7
-Status: Image is up to date for lambci/lambda:python3.6
-2017/09/06 11:06:41 Reading invoke payload from stdin (you can also pass it from file with --event)
-2017/09/06 11:06:41 Invoking schedule.lambda_sandbox_down_handler (python3.6)
-START RequestId: 09c35258-f743-4906-bbc5-35f12a542fb9 Version: $LATEST
-hello from handler
-END RequestId: 09c35258-f743-4906-bbc5-35f12a542fb9
-REPORT RequestId: 09c35258-f743-4906-bbc5-35f12a542fb9 Duration: 31 ms Billed Duration: 0 ms Memory Size: 0 MB Max Memory Used: 19 MB
-
-"foo"
-```
-
-We can see what kind of payload we'll receive via
- 
-```bash
-$ sam local generate-event schedule
-{
-  "account": "123456789012",
-  "region": "us-east-1",
-  "detail": {},
-  "detail-type": "Scheduled Event",
-  "source": "aws.events",
-  "time": "1970-01-01T00:00:00Z",
-  "id": "cdc73f9d-aea9-11e3-9d5a-835b769c0d9c",
-  "resources": [
-    "arn:aws:events:us-east-1:123456789012:rule/my-schedule"
-  ]
-}
-```
-
-### Build
-
-To be able to package third-party dependencies as we know it via virtualenv, we need to interact 
-with docker directly [5]. 
-
-To just build the current status, run 
-
-```bash
-make bundle
-```
-
-If you want to inspect the image, perform an interactive shell
-
-```bash
-docker run -v $PWD:/var/task -it lambci/lambda:build-python3.6 /bin/bash
-```
-
-### Deploy 
-
-#### TL;DR
-
-For a complete release action, just call 
-
-```bash
-make release
-```
-
-
-#### More Detailed
-
-For deployment we follow [the SAM documentation](https://github.com/awslabs/aws-sam-local#package-and-deploy-to-lambda)
-
-To include our AWS credentials and to make things easy, there are two `make` targets
-
-```bash
-make package
-make deploy
-```
-
-- `make package` takes the `template.yml`, uploads our `build.zip` and creates a new template (`packaged.yml`) 
-  with the matching S3 reference in `CodeUri`.
-
-- `make deploy` will wire the uploaded zip file on S3 to a fully functional lambda. Ours can be listed 
-  [here](https://eu-west-1.console.aws.amazon.com/lambda/home?region=eu-west-1#/functions)
-  
-
-### Using the virtualenv in a different Architecture
-
-There is no reason not to call 
-
-```bash
-make clean build
-``` 
-locally. Just ensure that you always use `clean` to avoid confusion inside of the virtualenv.
-
-
-## Background
-
-1.  A general blueprint how to start with cloudwatch events and lambda handlers exists [from Amazon](https://aws.amazon.com/premiumsupport/knowledge-center/start-stop-lambda-cloudwatch/). This does
-not include SAM Local or external sources; still it provides a good overview.
- 
-1.  A python package with dependencies requires us to [build a `virtualenv` on 
-a `amd64` kernel](
-http://docs.aws.amazon.com/lambda/latest/dg/with-s3-example-deployment-pkg.html#with-s3-example-deployment-pkg-python).
-
-1.  Howto integrate third party libs into lambda via SAM Local [seems unclear](https://github.com/awslabs/aws-sam-local/issues/53)
-
-1.  About [Packaging Lambda Functions](https://github.com/awslabs/serverless-application-model/blob/master/HOWTO.md#packing-artifacts) 
-
-1.  [Replications](https://github.com/lambci/docker-lambda) of the live AWS Lambda environment
-
-1.  [About packaging `virtualenv` projects for AWS Lambda](http://www.perrygeo.com/running-python-with-compiled-code-on-aws-lambda.html)
-
-1.  Create a Deployment Package [on AWS](http://docs.aws.amazon.com/lambda/latest/dg/with-s3-example-deployment-pkg.html#with-s3-example-deployment-pkg-python) 
-1.  Create a Deployment Package [for Lambda](http://docs.aws.amazon.com/lambda/latest/dg/lambda-python-how-to-create-deployment-package.html#deployment-pkg-for-virtualenv) 
-
-1.  [About Lambda Roles](http://docs.aws.amazon.com/lambda/latest/dg/with-s3-example-create-iam-role.html)
-
-1.  [Example Policies for EC2 handling](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ExamplePolicies_EC2.html)
\ No newline at end of file
diff --git a/samples/python-with-packages/VERSION b/samples/python-with-packages/VERSION
deleted file mode 100644
index 8acdd82b76..0000000000
--- a/samples/python-with-packages/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.0.1
diff --git a/samples/python-with-packages/example/__init__.py b/samples/python-with-packages/example/__init__.py
deleted file mode 100644
index 3d76c97dbf..0000000000
--- a/samples/python-with-packages/example/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# https://www.python.org/dev/peps/pep-0382/
-__import__('pkg_resources').declare_namespace(__name__)
\ No newline at end of file
diff --git a/samples/python-with-packages/example/schedule.py b/samples/python-with-packages/example/schedule.py
deleted file mode 100644
index bca0296365..0000000000
--- a/samples/python-with-packages/example/schedule.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import logging
-
-logging.basicConfig(level=logging.INFO)
-log = logging.getLogger(__name__)
-log.setLevel(logging.INFO)
-
-def lambda_sandbox_down_handler(event: dict, context):
-    log.info('running DOWN handler with event: %s and context: %s', event, context)
-
diff --git a/samples/python-with-packages/requirements.txt b/samples/python-with-packages/requirements.txt
deleted file mode 100644
index 6d803117dc..0000000000
--- a/samples/python-with-packages/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# we're only loading one example dep here
-requests==2.18.4
-.
\ No newline at end of file
diff --git a/samples/python-with-packages/setup.cfg b/samples/python-with-packages/setup.cfg
deleted file mode 100644
index 6302b3a02b..0000000000
--- a/samples/python-with-packages/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[install]
-prefix=
\ No newline at end of file
diff --git a/samples/python-with-packages/setup.py b/samples/python-with-packages/setup.py
deleted file mode 100644
index 12af7d738f..0000000000
--- a/samples/python-with-packages/setup.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-import os
-from setuptools import setup, find_packages
-
-here = os.path.abspath(os.path.dirname(__file__))
-VERSION = open(os.path.join(here, 'VERSION')).read().strip()
-
-required_eggs = [
-    'requests>=2.18.4',
-    'boto3>=1.4.7',
-]
-
-setup(
-    name='example.cloudschedule',
-    version=VERSION,
-    description="",
-    author="zerotired",
-    author_email='andi@doppelpop.de',
-    url='',
-    packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
-    # http://pythonhosted.org/distribute/setuptools.html#namespace-packages
-    namespace_packages=['example'],
-    # TODO amb
-    # include_package_data=True,
-    package_data={'example': ['static/*.*', 'templates/*.*']},
-    install_requires=required_eggs,
-    extras_require=dict(
-        test=required_eggs + [
-            'pytest>=3.2',
-        ],
-        develop=required_eggs + [
-            'ipdb>=0.10.2',
-        ]),
-    zip_safe=False,
-    entry_points={
-        'console_scripts': [
-            'index=example.schedule:lambda_sandbox_down_handler'
-        ],
-    },
-    dependency_links=[
-    ],
-)
diff --git a/samples/python-with-packages/template.yml b/samples/python-with-packages/template.yml
deleted file mode 100644
index e2509fc51f..0000000000
--- a/samples/python-with-packages/template.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Example Lambda
-Resources:
-  EnvDownHandler:
-    Type: AWS::Serverless::Function
-    Properties:
-      # as soon as we rely on third-party depedencies (pip packages to `virtualenv`), we are
-      # forced to create a zip-file, containing all relevant data
-      CodeUri: bundle.zip
-      Handler: example.schedule.lambda_sandbox_down_handler
-      Runtime: python3.6
-      Environment:
-        Variables:
-          AWS_ENVIRONMENT: sandbox
diff --git a/samples/s3-event-source/index.js b/samples/s3-event-source/index.js
deleted file mode 100644
index ecc245a5c0..0000000000
--- a/samples/s3-event-source/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict';
-
-exports.handler = (event, context, callback) => {
-
-    for (let record of event.Records) {
-        console.log("Got an S3 event:");
-        console.log(" - Bucket: " + record.s3.bucket.arn);
-        console.log(" - Key: " + record.s3.object.key);
-    }
-
-    callback(null, "")
-
-}
\ No newline at end of file
diff --git a/samples/s3-event-source/template.yaml b/samples/s3-event-source/template.yaml
deleted file mode 100644
index d591bc021a..0000000000
--- a/samples/s3-event-source/template.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-AWSTemplateFormatVersion : '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-
-Description: |
-  A sample Serverless project triggered from S3 CreateObject events
-
-Resources:
-  ExampleFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: nodejs6.10
-      Handler: index.handler
-      Events:
-        S3CreateObject:
-          Type: S3
-          Properties:
-            Bucket: !Ref MyPhotoBucket
-            Events: s3:ObjectCreated:*
-
-  MyPhotoBucket:
-    Type: AWS::S3::Bucket
diff --git a/samples/using-aws-sdk/.gitignore b/samples/using-aws-sdk/.gitignore
deleted file mode 100644
index 00cbbdf53f..0000000000
--- a/samples/using-aws-sdk/.gitignore
+++ /dev/null
@@ -1,59 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# Typescript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
diff --git a/samples/using-aws-sdk/index.js b/samples/using-aws-sdk/index.js
deleted file mode 100644
index fa4562900e..0000000000
--- a/samples/using-aws-sdk/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-
-// Make sure to run 'npm install' before running this function.
-// This will fetch the AWS SDK to ./node_modules.
-
-// Create a new AWS SDK object
-const AWS = require('aws-sdk');
-
-// Create S3 service object
-const s3 = new AWS.S3({apiVersion: '2006-03-01'});
-
-exports.handler = (event, context, callback) => {
-  
-    s3.listBuckets((err, data) => {
-
-        if(err){
-            console.log("Error listing S3 buckets: " + err);
-            callback(err, null);
-            return;
-        }
-
-        for (let bucket of data.Buckets){
-            console.log("s3://" + bucket.Name)
-            callback(null, "ok")
-        }
-
-    })
-
-}
\ No newline at end of file
diff --git a/samples/using-aws-sdk/package-lock.json b/samples/using-aws-sdk/package-lock.json
deleted file mode 100644
index 57bb91f39c..0000000000
--- a/samples/using-aws-sdk/package-lock.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "name": "using-aws-sdk",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "aws-sdk": {
-      "version": "2.94.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.94.0.tgz",
-      "integrity": "sha1-cEPePvjCTLarS/I18I2H2EFz4XQ=",
-      "requires": {
-        "buffer": "4.9.1",
-        "crypto-browserify": "1.0.9",
-        "events": "1.1.1",
-        "jmespath": "0.15.0",
-        "querystring": "0.2.0",
-        "sax": "1.2.1",
-        "url": "0.10.3",
-        "uuid": "3.0.1",
-        "xml2js": "0.4.17",
-        "xmlbuilder": "4.2.1"
-      }
-    },
-    "base64-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
-    },
-    "buffer": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-      "requires": {
-        "base64-js": "1.2.1",
-        "ieee754": "1.1.8",
-        "isarray": "1.0.0"
-      }
-    },
-    "crypto-browserify": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz",
-      "integrity": "sha1-zFRJaF37hesRyYKKzHy4erW7/MA="
-    },
-    "events": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
-    },
-    "ieee754": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "jmespath": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
-      "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
-    },
-    "lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
-    },
-    "punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-    },
-    "sax": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-      "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
-    },
-    "url": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-      "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "uuid": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-      "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
-    },
-    "xml2js": {
-      "version": "0.4.17",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
-      "integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=",
-      "requires": {
-        "sax": "1.2.1",
-        "xmlbuilder": "4.2.1"
-      }
-    },
-    "xmlbuilder": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
-      "integrity": "sha1-qlijBBoGb5DqoWwvU4n/GfP0YaU=",
-      "requires": {
-        "lodash": "4.17.4"
-      }
-    }
-  }
-}
diff --git a/samples/using-aws-sdk/package.json b/samples/using-aws-sdk/package.json
deleted file mode 100644
index 7c5217a0b1..0000000000
--- a/samples/using-aws-sdk/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "using-aws-sdk",
-  "version": "1.0.0",
-  "description": "An example Serverless project that uses the AWS SDK to list S3 buckets",
-  "main": "index.js",
-  "dependencies": {
-    "aws-sdk": "^2.94.0"
-  },
-  "devDependencies": {},
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Paul Maddox <pmaddox@amazon.com>",
-  "license": "Apache-2.0"
-}
diff --git a/samples/using-aws-sdk/template.yaml b/samples/using-aws-sdk/template.yaml
deleted file mode 100644
index 5a3dd70199..0000000000
--- a/samples/using-aws-sdk/template.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-AWSTemplateFormatVersion : '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-
-Description: |
-  An example Serverless project that uses the AWS SDK to list S3 buckets
-
-Resources:
-  # Place your project resources here (AWS Lambda functions, API Gateway) etc
-
-  ExampleFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: nodejs6.10
-      Handler: index.handler     
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000000..11e9ec40ee
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[metadata]
+description-file = README.rst
\ No newline at end of file
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000000..270d07b268
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+
+import io
+import re
+import os
+from setuptools import setup, find_packages
+
+
+def read(*filenames, **kwargs):
+    encoding = kwargs.get('encoding', 'utf-8')
+    sep = kwargs.get('sep', os.linesep)
+    buf = []
+    for filename in filenames:
+        with io.open(filename, encoding=encoding) as f:
+            buf.append(f.read())
+    return sep.join(buf)
+
+
+def read_requirements(req='base.txt'):
+    content = read(os.path.join('requirements', req))
+    return [line for line in content.split(os.linesep)
+            if not line.strip().startswith('#')]
+
+
+def read_version():
+    content = read(os.path.join(
+        os.path.dirname(__file__), 'samcli', '__init__.py'))
+    return re.search(r"__version__ = '([^']+)'", content).group(1)
+
+
+cmd_name = "sam"
+if os.getenv("SAM_CLI_DEV"):
+    # We are installing in a dev environment
+    cmd_name = "samdev"
+
+setup(
+    name='aws-sam-cli',
+    version=read_version(),
+    description='AWS SAM CLI is a CLI tool for local development and testing of Serverless applications',
+    long_description=read('README.rst'),
+    author='Amazon Web Services',
+    author_email='aws-sam-developers@amazon.com',
+    url='https://github.com/awslabs/aws-sam-cli',
+    license=read('LICENSE'),
+    packages=find_packages(exclude=('tests', 'docs')),
+    keywords="AWS SAM CLI",
+    # Support Python2.7 and higher, but not 3.x
+    python_requires='~=2.7',
+    entry_points={
+        'console_scripts': [
+            '{}=samcli.cli.main:cli'.format(cmd_name)
+        ]
+    },
+    install_requires=read_requirements('base.txt'),
+    extras_require={
+        'dev': read_requirements('dev.txt')
+    },
+    include_package_data=True,
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Environment :: Other Environment',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'License :: OSI Approved :: Apache Software License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.7',
+        'Topic :: Internet',
+        'Topic :: Software Development :: Build Tools',
+        'Topic :: Utilities',
+    ]
+)
diff --git a/start.go b/start.go
deleted file mode 100644
index 2ee99baabc..0000000000
--- a/start.go
+++ /dev/null
@@ -1,160 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"net/http"
-	"os"
-	"path/filepath"
-
-	"github.com/awslabs/goformation/intrinsics"
-	"github.com/fatih/color"
-
-	"github.com/awslabs/aws-sam-local/router"
-	"github.com/awslabs/goformation"
-	"github.com/codegangsta/cli"
-)
-
-// messages color
-var errMsg = color.New(color.FgRed).Add(color.Bold)
-var warnMsg = color.New(color.FgYellow).Add(color.Bold)
-var successMsg = color.New(color.FgGreen).Add(color.Bold)
-
-func start(c *cli.Context) {
-
-	// Setup the logger
-	stderr := io.Writer(os.Stderr)
-	logarg := c.String("log-file")
-
-	if len(logarg) > 0 {
-		if logFile, err := os.Create(logarg); err == nil {
-			stderr = io.Writer(logFile)
-			log.SetOutput(stderr)
-		} else {
-			log.Fatalf("Failed to open log file %s: %s\n", c.String("log"), err)
-		}
-	}
-
-	filename := getTemplateFilename(c.String("template"))
-	template, err := goformation.OpenWithOptions(filename, &intrinsics.ProcessorOptions{
-		ParameterOverrides: parseParameters(c.String("parameter-values")),
-	})
-	if err != nil {
-		log.Fatalf("Failed to parse template: %s\n", err)
-	}
-
-	// Check connectivity to docker
-	dockerVersion, err := getDockerVersion()
-	if err != nil {
-		log.Printf("Running AWS SAM projects locally requires Docker. Have you got it installed?\n")
-		log.Printf("%s\n", err)
-		os.Exit(1)
-	}
-	log.Printf("Connected to Docker %s", dockerVersion)
-
-	// Get the working directory for the project based on
-	// the template directory. Also, give an opportunity for
-	// this to be overriden by the --docker-volume-basedir flag.
-	cwd := filepath.Dir(filename)
-	if c.String("docker-volume-basedir") != "" {
-		cwd = c.String("docker-volume-basedir")
-	}
-
-	// Create a new router
-	mux := router.NewServerlessRouter(c.Bool("prefix-routing"))
-
-	templateApis := template.GetAllAWSServerlessApiResources()
-
-	for _, api := range templateApis {
-		err := mux.AddAPI(&api)
-		if err != nil {
-			errMsg.Printf("%s\n\n", err.Error())
-			os.Exit(1)
-		}
-	}
-
-	functions := template.GetAllAWSServerlessFunctionResources()
-
-	for name, function := range functions {
-
-		cwd := filepath.Dir(filename)
-		if c.String("docker-volume-basedir") != "" {
-			cwd = c.String("docker-volume-basedir")
-		}
-
-		// Initiate a new Lambda runtime
-		runt, err := NewRuntime(NewRuntimeOpt{
-			Cwd:             cwd,
-			LogicalID:       name,
-			Function:        function,
-			Logger:          stderr,
-			EnvOverrideFile: c.String("env-vars"),
-			DebugPort:       c.String("debug-port"),
-			SkipPullImage:   c.Bool("skip-pull-image"),
-			DockerNetwork:   c.String("docker-network"),
-		})
-
-		// Check there wasn't a problem initiating the Lambda runtime
-		if err != nil {
-			if err == ErrRuntimeNotSupported {
-				warnMsg.Printf("Ignoring %s (%s) due to unsupported runtime (%s)\n", name, function.Handler, function.Runtime)
-				continue
-			} else {
-				warnMsg.Printf("Ignoring %s (%s) due to %s runtime init error: %s\n", name, function.Handler, function.Runtime, err)
-				continue
-			}
-		}
-
-		// Add this AWS::Serverless::Function to the HTTP router
-		if err := mux.AddFunction(&function, runt.InvokeHTTP(c.String("profile"))); err != nil {
-			if err == router.ErrNoEventsFound {
-				warnMsg.Printf("Ignoring %s (%s) as no API event sources are defined\n", name, function.Handler)
-			}
-		}
-	}
-
-	// Check we actually mounted some functions on our HTTP router
-	if len(mux.Mounts()) < 1 {
-		if len(functions) < 1 {
-			errMsg.Fprintf(stderr, "ERROR: No Serverless functions were found in your SAM template.\n")
-			os.Exit(1)
-		}
-		errMsg.Fprintf(stderr, "ERROR: None of the Serverless functions in your SAM template were able to be mounted. See above for errors.\n")
-		os.Exit(1)
-	}
-
-	fmt.Fprintf(stderr, "\n")
-
-	for _, mount := range mux.Mounts() {
-		if mount.Function == nil || len(mount.Function.Handler) == 0 {
-			msg := warnMsg.Sprint(fmt.Sprintf("WARNING: Could not find function for %s to %s resource", mount.Methods(), mount.Path))
-			fmt.Fprintf(os.Stderr, "%s\n", msg)
-			continue
-		}
-
-		msg := successMsg.Sprintf("Mounting %s (%s) at http://%s:%s%s %s", mount.Function.Handler, mount.Function.Runtime, c.String("host"), c.String("port"), mount.Path, mount.Methods())
-		fmt.Fprintf(os.Stderr, "%s\n", msg)
-	}
-
-	// Mount static files
-	if c.String("static-dir") != "" {
-		static := filepath.Join(cwd, c.String("static-dir"))
-
-		if _, err := os.Stat(static); err == nil {
-			fmt.Fprintf(os.Stderr, "Mounting static files from %s at /\n", static)
-			mux.AddStaticDir(static)
-		}
-	}
-
-	fmt.Fprintf(stderr, "\n")
-	fmt.Fprintf(stderr, "You can now browse to the above endpoints to invoke your functions.\n")
-	fmt.Fprintf(stderr, "You do not need to restart/reload SAM CLI while working on your functions,\n")
-	fmt.Fprintf(stderr, "changes will be reflected instantly/automatically. You only need to restart\n")
-	fmt.Fprintf(stderr, "SAM CLI if you update your AWS SAM template.\n")
-	fmt.Fprintf(stderr, "\n")
-
-	// Start the HTTP listener
-	log.Fatal(http.ListenAndServe(c.String("host")+":"+c.String("port"), mux.Router()))
-
-}
diff --git a/test/environment-overrides.json b/test/environment-overrides.json
deleted file mode 100644
index a4670777db..0000000000
--- a/test/environment-overrides.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "IoTFunction": {
-        "TABLE_NAME": "OVERRIDE_TABLE"
-    }
-}
\ No newline at end of file
diff --git a/test/templates/api-backend.yaml b/test/templates/api-backend.yaml
deleted file mode 100644
index 649aef9a3e..0000000000
--- a/test/templates/api-backend.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Simple CRUD webservice. State is stored in a SimpleTable (DynamoDB) resource.
-Resources:
-  GetFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.get
-      Runtime: nodejs
-      CodeUri: s3://<bucket>/api_backend.zip
-      Policies: AmazonDynamoDBReadOnlyAccess
-      Environment:
-        Variables:
-          TABLE_NAME: !Ref Table1
-      Events:
-        GetResource:
-          Type: Api
-          Properties:
-            Path: /resource/{resourceId}
-            Method: get
-  PutFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.put
-      Runtime: nodejs4.3
-      CodeUri: s3://<bucket>/api_backend.zip
-      Policies: AmazonDynamoDBFullAccess
-      Environment:
-        Variables:
-          TABLE_NAME: !Ref Table2
-      Events:
-        PutResource:
-          Type: Api
-          Properties:
-            Path: /resource/{resourceId}
-            Method: put
-
-  DeleteFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.delete
-      Runtime: nodejs4.3
-      CodeUri: s3://<bucket>/api_backend.zip
-      Policies: AmazonDynamoDBFullAccess
-      Environment:
-        Variables:
-          TABLE_NAME: !Ref Table3
-      Events:
-        DeleteResource:
-          Type: Api
-          Properties:
-            Path: /resource/{resourceId}
-            Method: delete
\ No newline at end of file
diff --git a/test/templates/api-missing-method.yaml b/test/templates/api-missing-method.yaml
deleted file mode 100644
index 314aaf6559..0000000000
--- a/test/templates/api-missing-method.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Simple API Endpoint configured using Swagger specified inline and backed by a Lambda function
-Resources:
-  MyApi:
-    Type: AWS::Serverless::Api
-    Properties:
-        StageName: prod
-        DefinitionBody:
-            swagger: "2.0"
-            info:
-              title:
-                Ref: AWS::StackName
-            paths:
-              "/get":
-                get:
-                  x-amazon-apigateway-integration:
-                    httpMethod: POST
-                    type: aws_proxy
-                    uri:
-                      Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyLambdaFunction.Arn}/invocations
-                  responses: {}
-              "/badget":
-                get:
-                  x-amazon-apigateway-integration:
-                    httpMethod: POST
-                    type: aws_proxy
-                    uri:
-                      Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyLambdaFunction.Arn}/invocations
-                  responses: {}
-
-
-
-
-  MyLambdaFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.handler
-      Runtime: nodejs6.10
-      CodeUri: func/
-      Events:
-        GetApi:
-          Type: Api
-          Properties:
-            Path: /get
-            Method: GET
-            RestApiId:
-                Ref: MyApi
\ No newline at end of file
diff --git a/test/templates/api-swagger-intrinsic.yaml b/test/templates/api-swagger-intrinsic.yaml
deleted file mode 100644
index 429cb977e8..0000000000
--- a/test/templates/api-swagger-intrinsic.yaml
+++ /dev/null
@@ -1,1038 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Swagger demo for Integration Requests
-
-Parameters:
-
-  NotificationEmail:
-    Type: String
-    Description: Email address to subscribe to SNS topic and receive notifications from Notifier Workflow
-
-  SlackToken:
-    Type: String
-    Description: Legacy Slack Token (xoxp-ywz) to send messages on channel
-    Default: None
-
-Resources:
-
-
-  SnsNotifierServiceRole:
-    Type: "AWS::IAM::Role"
-    Properties:
-      Path: "/"
-      ManagedPolicyArns:
-          - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Sid: "AllowLambdaServiceToAssumeRole"
-            Effect: "Allow"
-            Action: 
-              - "sts:AssumeRole"
-            Principal:
-              Service:
-                - "lambda.amazonaws.com"
-      Policies:
-        -
-          PolicyName: "PublishSnsTopic"
-          PolicyDocument:
-            Version: '2012-10-17'
-            Statement:
-              -
-                Effect: "Allow"
-                Action:
-                  - "sns:Publish"
-                Resource: 
-                  - !Ref NotifierSNSTopic
-                  - "*" # can't restrict on SMS number yet, so *
-
-
-  EmailNotifierServiceFunction:
-    Type: 'AWS::Serverless::Function'
-    Properties:
-      Handler: email_sns.lambda_handler
-      Runtime: python2.7
-      CodeUri: ../code/email/
-      Role: !GetAtt SnsNotifierServiceRole.Arn
-      Environment:
-        Variables:
-          NOTIFIER_TOPIC: !Ref NotifierSNSTopic
-
-
-  SmsNotifierServiceFunction:
-    Type: 'AWS::Serverless::Function'
-    Properties:
-      Handler: sms_sns.lambda_handler
-      Runtime: python2.7
-      CodeUri: ../code/sms/
-      Role: !GetAtt SnsNotifierServiceRole.Arn
-      Environment:
-        Variables:
-          NOTIFIER_TOPIC: !Ref NotifierSNSTopic
-
-  # No need for extra permissions other than Basic Execution
-  # SAM takes care of creating basic IAM Role if none is provided
-  SlackNotifierServiceFunction:
-    Type: 'AWS::Serverless::Function'
-    Properties:
-      Handler: slack.lambda_handler
-      Runtime: python2.7
-      CodeUri: ../code/slack.zip    # Slack contains 3rd party libraries
-      Environment:
-        Variables:
-          SLACK_TOKEN: !Ref SlackToken
-  # IAM Role API Gateway will assume in order to call StepFunctions StartExecution API
-  ApiGatewayStepFunctionsRole:
-    Type: "AWS::IAM::Role"
-    Properties:
-        Path: "/"
-        AssumeRolePolicyDocument:
-          Version: "2012-10-17"
-          Statement:
-            -
-              Sid: "AllowApiGatewayServiceToAssumeRole"
-              Effect: "Allow"
-              Action: 
-                - "sts:AssumeRole"
-              Principal:
-                Service:
-                  - "apigateway.amazonaws.com"
-        Policies:
-          -
-            PolicyName: "CallStepFunctions"
-            PolicyDocument:
-              Version: '2012-10-17'
-              Statement:
-                -
-                  Effect: "Allow"
-                  Action:
-                    - "states:StartExecution"
-                  Resource: 
-                    - !Ref StepFunctionStateMachine
-
-  AnotherRandomAPI:
-    Type: AWS::Serverless::Api
-    Properties:
-      StageName: prod
-      DefinitionBody:
-        swagger: "2.0"
-        info:
-          description: "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters"
-          version: 1.0.0
-          title: Swagger Petstore YAML
-          termsOfService: "http://swagger.io/terms/"
-          contact:
-            email: "apiteam@swagger.io"
-          license:
-            name: Apache 2.0
-            url: "http://www.apache.org/licenses/LICENSE-2.0.html"
-        basePath: /v2
-        tags:
-          - name: pet
-            description: Everything about your Pets
-            externalDocs:
-              description: Find out more
-              url: "http://swagger.io"
-          - name: store
-            description: Operations about user
-          - name: user
-            description: Access to Petstore orders
-            externalDocs:
-              description: Find out more about our store
-              url: "http://swagger.io"
-        schemes:
-          - http
-        paths:
-          /pet:
-            post:
-              tags:
-                - pet
-              summary: Add a new pet to the store
-              x-swagger-router-controller: SampleController
-              description: ""
-              operationId: addPet
-              consumes:
-                - application/json
-                - application/xml
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - in: body
-                  name: body
-                  description: Pet object that needs to be added to the store
-                  required: false
-                  schema:
-                    $ref: "#/definitions/Pet"
-              responses:
-                "405":
-                  description: Invalid input
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-            put:
-              tags:
-                - pet
-              summary: Update an existing pet
-              description: ""
-              operationId: updatePet
-              consumes:
-                - application/json
-                - application/xml
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - in: body
-                  name: body
-                  description: Pet object that needs to be added to the store
-                  required: false
-                  schema:
-                    $ref: "#/definitions/Pet"
-              responses:
-                "400":
-                  description: Invalid ID supplied
-                "404":
-                  description: Pet not found
-                "405":
-                  description: Validation exception
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-          /pet/findByStatus:
-            get:
-              tags:
-                - pet
-              summary: Finds Pets by status
-              description: Multiple status values can be provided with comma seperated strings
-              operationId: findPetsByStatus
-              consumes:
-                - application/xml
-                - application/json
-                - multipart/form-data
-                - application/x-www-form-urlencoded
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: status
-                  in: query
-                  description: Status values that need to be considered for filter
-                  required: false
-                  type: array
-                  items:
-                    type: string
-                  collectionFormat: multi
-                  default: available
-                  enum:
-                    - available
-                    - pending
-                    - sold
-                - name: testlong
-                  in: query
-                  description: Status values that need to be considered for filter
-                  required: false
-                  type: array
-                  items:
-                    type: long
-                  collectionFormat: multi
-                  default: available
-                  enum:
-                    - 1234567890123456
-                    - 345
-                    - 678
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    type: array
-                    items:
-                      $ref: "#/definitions/Pet"
-                "400":
-                  description: Invalid status value
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-          /pet/findByTags:
-            get:
-              tags:
-                - pet
-              summary: Finds Pets by tags
-              description: "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing."
-              operationId: findPetsByTags
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: tags
-                  in: query
-                  description: Tags to filter by
-                  required: false
-                  type: array
-                  items:
-                    type: string
-                  collectionFormat: multi
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    type: array
-                    items:
-                      $ref: "#/definitions/Pet"
-                "400":
-                  description: Invalid tag value
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-          "/pet/{petId}":
-            get:
-              tags:
-                - pet
-              summary: Find pet by ID
-              description: Returns a single pet
-              operationId: getPetById
-              consumes:
-                - application/x-www-form-urlencoded
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: petId
-                  in: path
-                  description: ID of pet to return
-                  required: true
-                  type: integer
-                  format: int64
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    $ref: "#/definitions/Pet"
-                "400":
-                  description: Invalid ID supplied
-                "404":
-                  description: Pet not found
-              security:
-                - api_key: []
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-            post:
-              tags:
-                - pet
-              summary: Updates a pet in the store with form data
-              description: ""
-              operationId: updatePetWithForm
-              consumes:
-                - application/x-www-form-urlencoded
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: petId
-                  in: path
-                  description: ID of pet that needs to be updated
-                  required: true
-                  type: string
-                - name: name
-                  in: formData
-                  description: Updated name of the pet
-                  required: false
-                  type: string
-                - name: status
-                  in: formData
-                  description: Updated status of the pet
-                  required: false
-                  type: string
-              responses:
-                "405":
-                  description: Invalid input
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-            delete:
-              tags:
-                - pet
-              summary: Deletes a pet
-              description: ""
-              operationId: deletePet
-              consumes:
-                - multipart/form-data
-                - application/x-www-form-urlencoded
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: api_key
-                  in: header
-                  description: ""
-                  required: false
-                  type: string
-                - name: petId
-                  in: path
-                  description: Pet id to delete
-                  required: true
-                  type: integer
-                  format: int64
-              responses:
-                "400":
-                  description: Invalid pet value
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-          "/pet/{petId}/uploadImage":
-            post:
-              tags:
-                - pet
-              summary: uploads an image
-              x-swagger-router-controller: SampleController
-              description: ""
-              operationId: uploadFile
-              consumes:
-                - multipart/form-data
-              produces:
-                - application/json
-              parameters:
-                - name: petId
-                  in: path
-                  description: ID of pet to update
-                  required: true
-                  type: integer
-                  format: int64
-                - name: additionalMetadata
-                  in: formData
-                  description: Additional data to pass to server
-                  required: false
-                  type: string
-                - name: file
-                  in: formData
-                  description: file to upload
-                  required: false
-                  type: file
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    $ref: "#/definitions/ApiResponse"
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-          /store/inventory:
-            get:
-              tags:
-                - store
-              summary: Returns pet inventories by status
-              description: Returns a map of status codes to quantities
-              operationId: getInventory
-              produces:
-                - application/json
-              parameters: []
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    type: object
-                    additionalProperties:
-                      type: integer
-                      format: int32
-              security:
-                - api_key: []
-          /store/order:
-            post:
-              tags:
-                - store
-              summary: Place an order for a pet
-              description: ""
-              operationId: placeOrder
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - in: body
-                  name: body
-                  description: order placed for purchasing the pet
-                  required: false
-                  schema:
-                    $ref: "#/definitions/Order"
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    $ref: "#/definitions/Order"
-                "400":
-                  description: Invalid Order
-          "/store/order/{orderId}":
-            get:
-              tags:
-                - store
-              summary: Find purchase order by ID
-              description: "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
-              operationId: getOrderById
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: orderId
-                  in: path
-                  description: ID of pet that needs to be fetched
-                  required: true
-                  type: string
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    $ref: "#/definitions/Order"
-                "400":
-                  description: Invalid ID supplied
-                "404":
-                  description: Order not found
-            delete:
-              tags:
-                - store
-              summary: Delete purchase order by ID
-              description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-              operationId: deleteOrder
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: orderId
-                  in: path
-                  description: ID of the order that needs to be deleted
-                  required: true
-                  type: string
-              responses:
-                "400":
-                  description: Invalid ID supplied
-                "404":
-                  description: Order not found
-          /user:
-            post:
-              tags:
-                - user
-              summary: Create user
-              description: This can only be done by the logged in user.
-              operationId: createUser
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - in: body
-                  name: body
-                  description: Created user object
-                  required: false
-                  schema:
-                    $ref: "#/definitions/User"
-              responses:
-                default:
-                  description: successful operation
-          /user/createWithArray:
-            post:
-              tags:
-                - user
-              summary: Creates list of users with given input array
-              description: ""
-              operationId: createUsersWithArrayInput
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - in: body
-                  name: body
-                  description: List of user object
-                  required: false
-                  schema:
-                    type: array
-                    items:
-                      $ref: "#/definitions/User"
-              responses:
-                default:
-                  description: successful operation
-          /user/createWithList:
-            post:
-              tags:
-                - user
-              summary: Creates list of users with given input array
-              description: ""
-              operationId: createUsersWithListInput
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - in: body
-                  name: body
-                  description: List of user object
-                  required: false
-                  schema:
-                    type: array
-                    items:
-                      $ref: "#/definitions/User"
-              responses:
-                default:
-                  description: successful operation
-          /user/login:
-            get:
-              tags:
-                - user
-              summary: Logs user into the system
-              description: ""
-              operationId: loginUser
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: username
-                  in: query
-                  description: The user name for login
-                  required: false
-                  type: string
-                - name: password
-                  in: query
-                  description: The password for login in clear text
-                  required: false
-                  type: string
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    type: string
-                  headers:
-                    X-Rate-Limit:
-                      type: integer
-                      format: int32
-                      description: calls per hour allowed by the user
-                    X-Expires-After:
-                      type: string
-                      format: date-time
-                      description: date in UTC when toekn expires
-                "400":
-                  description: Invalid username/password supplied
-              x-amazon-apigateway-integration:
-                uri: 
-                  Fn::GetAtt: [ "SmsNotifierServiceFunction", "Arn" ]
-                httpMethod: POST
-          /user/logout:
-            get:
-              tags:
-                - user
-              summary: Logs out current logged in user session
-              description: ""
-              operationId: logoutUser
-              produces:
-                - application/xml
-                - application/json
-              parameters: []
-              responses:
-                default:
-                  description: successful operation
-              x-amazon-apigateway-integration:
-                uri: 
-                  Fn::Sub: 
-                    - "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:${FunctionName}/invocations"
-                    - {"FunctionName": !Ref EmailNotifierServiceFunction }
-                httpMethod: POST
-          "/user/{username}":
-            get:
-              tags:
-                - user
-              summary: Get user by user name
-              description: ""
-              operationId: getUserByName
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: username
-                  in: path
-                  description: "The name that needs to be fetched. Use user1 for testing. "
-                  required: true
-                  type: string
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    $ref: "#/definitions/User"
-                "400":
-                  description: Invalid username supplied
-                "404":
-                  description: User not found
-            put:
-              tags:
-                - user
-              summary: Updated user
-              description: This can only be done by the logged in user.
-              operationId: updateUser
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: username
-                  in: path
-                  description: name that need to be deleted
-                  required: true
-                  type: string
-                - in: body
-                  name: body
-                  description: Updated user object
-                  required: false
-                  schema:
-                    $ref: "#/definitions/User"
-              responses:
-                "400":
-                  description: Invalid user supplied
-                "404":
-                  description: User not found
-            delete:
-              tags:
-                - user
-              summary: Delete user
-              description: This can only be done by the logged in user.
-              operationId: deleteUser
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: username
-                  in: path
-                  description: The name that needs to be deleted
-                  required: true
-                  type: string
-              responses:
-                "400":
-                  description: Invalid username supplied
-                "404":
-                  description: User not found
-        securityDefinitions:
-          petstore_auth:
-            type: oauth2
-            authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
-            flow: implicit
-            scopes:
-              "write:pets": modify pets in your account
-              "read:pets": read your pets
-          api_key:
-            type: apiKey
-            name: api_key
-            in: header
-        definitions:
-          Order:
-            properties:
-              id:
-                type: integer
-                format: int64
-              petId:
-                type: integer
-                format: int64
-              quantity:
-                type: integer
-                format: int32
-              shipDate:
-                type: string
-                format: date-time
-              status:
-                type: string
-                description: Order Status
-                enum:
-                  - placed
-                  - approved
-                  - delivered
-              complete:
-                type: boolean
-            xml:
-              name: Order
-          Category:
-            properties:
-              id:
-                type: integer
-                format: int64
-              name:
-                type: string
-            xml:
-              name: Category
-          User:
-            properties:
-              id:
-                type: integer
-                format: int64
-              username:
-                type: string
-              firstName:
-                type: string
-              lastName:
-                type: string
-              email:
-                type: string
-              password:
-                type: string
-              phone:
-                type: string
-              userStatus:
-                type: integer
-                format: int32
-                description: User Status
-            xml:
-              name: User
-          Tag:
-            properties:
-              id:
-                type: integer
-                format: int64
-              name:
-                type: string
-            xml:
-              name: Tag
-          Pet:
-            required:
-              - name
-              - photoUrls
-            properties:
-              id:
-                type: integer
-                format: int64
-              category:
-                $ref: "#/definitions/Category"
-              name:
-                type: string
-                example: doggie
-              photoUrls:
-                type: array
-                xml:
-                  name: photoUrl
-                  wrapped: true
-                items:
-                  type: string
-              tags:
-                type: array
-                xml:
-                  name: tag
-                  wrapped: true
-                items:
-                  $ref: "#/definitions/Tag"
-              status:
-                type: string
-                description: pet status in the store
-                enum:
-                  - available
-                  - pending
-                  - sold
-            xml:
-              name: Pet
-          ApiResponse:
-            properties:
-              code:
-                type: integer
-                format: int32
-              type:
-                type: string
-              message:
-                type: string
-            xml:
-              name: "##default"
-        externalDocs:
-          description: Find out more about Swagger
-          url: "http://swagger.io"
-  StepFunctionsAPI:
-    Type: AWS::Serverless::Api
-    Properties:
-        StageName: dev
-        DefinitionBody:
-            swagger: "2.0"
-            basePath: /prod
-            info:
-              title: AwsSamExample
-            schemes:
-            - https
-            paths:
-              /:
-                x-amazon-apigateway-any-method:
-                  security:
-                  - test-authorizer: []
-                  produces:
-                  - application/json
-                  responses:
-                    200:
-                      description: 200 response
-                      schema:
-                        $ref: "#/definitions/Empty"
-                  x-amazon-apigateway-integration:
-                    responses:
-                      default:
-                        statusCode: 200
-                    # NOTE: Replace <<region>> and <<account>> fields
-                    uri: arn:aws:apigateway:<<region>>:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations
-
-                    passthroughBehavior: when_no_match
-                    httpMethod: POST
-                    type: aws_proxy
-                options:
-                  consumes:
-                  - application/json
-                  produces:
-                  - application/json
-                  responses:
-                    200:
-                      description: 200 response
-                      schema:
-                        $ref: "#/definitions/Empty"
-                      headers:
-                        Access-Control-Allow-Origin:
-                          type: string
-                        Access-Control-Allow-Methods:
-                          type: string
-                        Access-Control-Allow-Headers:
-                          type: string
-                  x-amazon-apigateway-integration:
-                    type: aws
-                    uri: arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:012345678901:function:HelloWorld/invocations
-                    httpMethod: POST
-                    credentials: arn:aws:iam::012345678901:role/apigateway-invoke-lambda-exec-role
-                    requestTemplates:
-                      application/json: '#set ($root=$input.path(''$'')) { "stage": "$root.name", "user-id":
-                        "$root.key" }'
-                      application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
-                    requestParameters:
-                      integration.request.path.stage: method.request.querystring.version
-                      integration.request.querystring.provider: method.request.querystring.vendor
-                    cacheNamespace: cache namespace
-                    cacheKeyParameters: []
-                    responses:
-                      '302':
-                        statusCode: '302'
-                        responseParameters:
-                          method.response.header.Location: integration.response.body.redirect.url
-                      2\d{2}:
-                        statusCode: '200'
-                        responseParameters:
-                          method.response.header.requestId: integration.response.header.cid
-                        responseTemplates:
-                          application/json: '#set ($root=$input.path(''$'')) { "stage": "$root.name",
-                            "user-id": "$root.key" }'
-                          application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
-                      default:
-                        statusCode: '400'
-                        responseParameters:
-                          method.response.header.test-method-response-header: "'static value'"
-                      x-amazon-apigateway-integration:
-                        uri: !Sub 
-                          - "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:${EmailNotifierServiceFunction}${Test}/invocations"
-                          - { "Test": "ABCD", "OtherTest": !Ref something }
-                        httpMethod: POST
-  StepFunctionsServiceRole:
-      Type: "AWS::IAM::Role"
-      Properties:
-          Path: "/"
-          ManagedPolicyArns:
-            - "arn:aws:iam::aws:policy/AWSStepFunctionsFullAccess"
-          AssumeRolePolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              -
-                Sid: "AllowStepFunctionsServiceToAssumeRole"
-                Effect: "Allow"
-                Action: 
-                  - "sts:AssumeRole"
-                Principal:
-                  Service:
-                    - !Sub "states.${AWS::Region}.amazonaws.com"
-          Policies:
-            -
-              PolicyName: "CallLambdaFunctions"
-              PolicyDocument:
-                Version: '2012-10-17'
-                Statement:
-                  -
-                    Effect: "Allow"
-                    Action:
-                      - "lambda:InvokeFunction"
-                    Resource: 
-                      - !Sub "${SlackNotifierServiceFunction.Arn}"
-                      - !Sub "${EmailNotifierServiceFunction.Arn}"
-                      - !Sub "${SmsNotifierServiceFunction.Arn}"
-
-  StepFunctionStateMachine:
-    Type: "AWS::StepFunctions::StateMachine"
-    Properties:
-      DefinitionString: !Sub |
-        {
-          "Comment": "Demo for API GW->SFN",
-          "StartAt": "NotifierState",
-          "States": {
-            "NotifierState": {
-              "Type" : "Choice",
-              "Choices": [
-                {
-                  "Variable": "$.notifier",
-                  "StringEquals": "Email",
-                  "Next": "EmailNotifier"
-                },
-                {
-                  "Variable": "$.notifier",
-                  "StringEquals": "Sms",
-                  "Next": "SmsNotifier"
-                },
-                {
-                  "Variable": "$.notifier",
-                  "StringEquals": "Slack",
-                  "Next": "SlackNotifier"
-                },
-                {
-                  "Variable": "$.notify",
-                  "StringEquals": "Twilio",
-                  "Next": "NotImplementedYet"
-                }
-              ],
-              "Default": "IgnoreNotification"
-            },
-            "IgnoreNotification": {
-              "Type": "Pass",
-              "Next": "SayHi"
-            },
-            "NotImplementedYet": {
-              "Type": "Fail",
-              "Cause": "Feature not implemented yet!"
-            },
-            "EmailNotifier": {
-              "Type": "Task",
-              "Resource": "${EmailNotifierServiceFunction.Arn}",
-              "Next": "SayHi"
-            },
-            "SlackNotifier": {
-              "Type": "Task",
-              "Resource": "${SlackNotifierServiceFunction.Arn}",
-              "Next": "SayHi"
-            },
-            "SmsNotifier": {
-              "Type": "Task",
-              "Resource": "${SmsNotifierServiceFunction.Arn}",
-              "Next": "SayHi"
-            },
-            "SayHi": {
-              "Type": "Pass",
-              "Result": "Hi!",
-              "End": true
-            }
-          }
-        }
-      RoleArn: !GetAtt StepFunctionsServiceRole.Arn
-  NotifierSNSTopic:
-    Type: AWS::SNS::Topic
-    Properties:
-      Subscription:
-      - Endpoint: !Ref NotificationEmail
-        Protocol: email
-Outputs:
-  NotifyUrl:
-    Description: Notify Workflow URL 
-    Value: !Sub "https://${StepFunctionsAPI}.execute-api.${AWS::Region}.amazonaws.com/dev/notify"
-
-  StepFunctionsStateMachine:
-    Description: Step Functions State Machine ARN
-    Value: !Ref StepFunctionStateMachine
\ No newline at end of file
diff --git a/test/templates/api-swagger-plain.yaml b/test/templates/api-swagger-plain.yaml
deleted file mode 100644
index cc7f499ce4..0000000000
--- a/test/templates/api-swagger-plain.yaml
+++ /dev/null
@@ -1,1111 +0,0 @@
-AWSTemplateFormatVersion: "2010-09-09"
-Description: "Swagger demo for Integration Requests"
-Outputs: 
-  NotifyUrl: 
-    Description: "Notify Workflow URL"
-    Value: "https://${StepFunctionsAPI}.execute-api.${AWS::Region}.amazonaws.com/dev/notify"
-  StepFunctionsStateMachine: 
-    Description: "Step Functions State Machine ARN"
-    Value: StepFunctionStateMachine
-Parameters: 
-  NotificationEmail: 
-    Description: "Email address to subscribe to SNS topic and receive notifications from Notifier Workflow"
-    Type: String
-  SlackToken: 
-    Default: None
-    Description: "Legacy Slack Token (xoxp-ywz) to send messages on channel"
-    Type: String
-Resources: 
-  AnotherRandomAPI: 
-    Properties: 
-      DefinitionBody: 
-        basePath: /v2
-        definitions: 
-          ApiResponse: 
-            properties: 
-              code: 
-                format: int32
-                type: integer
-              message: 
-                type: string
-              type: 
-                type: string
-            xml: 
-              name: "##default"
-          Category: 
-            properties: 
-              id: 
-                format: int64
-                type: integer
-              name: 
-                type: string
-            xml: 
-              name: Category
-          Order: 
-            properties: 
-              complete: 
-                type: boolean
-              id: 
-                format: int64
-                type: integer
-              petId: 
-                format: int64
-                type: integer
-              quantity: 
-                format: int32
-                type: integer
-              shipDate: 
-                format: date-time
-                type: string
-              status: 
-                description: "Order Status"
-                enum: 
-                  - placed
-                  - approved
-                  - delivered
-                type: string
-            xml: 
-              name: Order
-          Pet: 
-            properties: 
-              category: 
-                $ref: "#/definitions/Category"
-              id: 
-                format: int64
-                type: integer
-              name: 
-                example: doggie
-                type: string
-              photoUrls: 
-                items: 
-                  type: string
-                type: array
-                xml: 
-                  name: photoUrl
-                  wrapped: true
-              status: 
-                description: "pet status in the store"
-                enum: 
-                  - available
-                  - pending
-                  - sold
-                type: string
-              tags: 
-                items: 
-                  $ref: "#/definitions/Tag"
-                type: array
-                xml: 
-                  name: tag
-                  wrapped: true
-            required: 
-              - name
-              - photoUrls
-            xml: 
-              name: Pet
-          Tag: 
-            properties: 
-              id: 
-                format: int64
-                type: integer
-              name: 
-                type: string
-            xml: 
-              name: Tag
-          User: 
-            properties: 
-              email: 
-                type: string
-              firstName: 
-                type: string
-              id: 
-                format: int64
-                type: integer
-              lastName: 
-                type: string
-              password: 
-                type: string
-              phone: 
-                type: string
-              userStatus: 
-                description: "User Status"
-                format: int32
-                type: integer
-              username: 
-                type: string
-            xml: 
-              name: User
-        externalDocs: 
-          description: "Find out more about Swagger"
-          url: "http://swagger.io"
-        info: 
-          contact: 
-            email: apiteam@swagger.io
-          description: "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters"
-          license: 
-            name: "Apache 2.0"
-            url: "http://www.apache.org/licenses/LICENSE-2.0.html"
-          termsOfService: "http://swagger.io/terms/"
-          title: "Swagger Petstore YAML"
-          version: "1.0.0"
-        paths: 
-          /pet: 
-            post: 
-              consumes: 
-                - application/json
-                - application/xml
-              description: ""
-              operationId: addPet
-              parameters: 
-                - 
-                  description: "Pet object that needs to be added to the store"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    $ref: "#/definitions/Pet"
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "405": 
-                  description: "Invalid input"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Add a new pet to the store"
-              tags: 
-                - pet
-              x-swagger-router-controller: SampleController
-            put: 
-              consumes: 
-                - application/json
-                - application/xml
-              description: ""
-              operationId: updatePet
-              parameters: 
-                - 
-                  description: "Pet object that needs to be added to the store"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    $ref: "#/definitions/Pet"
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "400": 
-                  description: "Invalid ID supplied"
-                "404": 
-                  description: "Pet not found"
-                "405": 
-                  description: "Validation exception"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Update an existing pet"
-              tags: 
-                - pet
-          /pet/findByStatus: 
-            get: 
-              consumes: 
-                - application/xml
-                - application/json
-                - multipart/form-data
-                - application/x-www-form-urlencoded
-              description: "Multiple status values can be provided with comma seperated strings"
-              operationId: findPetsByStatus
-              parameters: 
-                - 
-                  collectionFormat: multi
-                  default: available
-                  description: "Status values that need to be considered for filter"
-                  enum: 
-                    - available
-                    - pending
-                    - sold
-                  in: query
-                  items: 
-                    type: string
-                  name: status
-                  required: false
-                  type: array
-                - 
-                  collectionFormat: multi
-                  default: available
-                  description: "Status values that need to be considered for filter"
-                  enum: 
-                    - 1234567890123456
-                    - 345
-                    - 678
-                  in: query
-                  items: 
-                    type: long
-                  name: testlong
-                  required: false
-                  type: array
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    items: 
-                      $ref: "#/definitions/Pet"
-                    type: array
-                "400": 
-                  description: "Invalid status value"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Finds Pets by status"
-              tags: 
-                - pet
-          /pet/findByTags: 
-            get: 
-              description: "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing."
-              operationId: findPetsByTags
-              parameters: 
-                - 
-                  collectionFormat: multi
-                  description: "Tags to filter by"
-                  in: query
-                  items: 
-                    type: string
-                  name: tags
-                  required: false
-                  type: array
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    items: 
-                      $ref: "#/definitions/Pet"
-                    type: array
-                "400": 
-                  description: "Invalid tag value"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Finds Pets by tags"
-              tags: 
-                - pet
-          ? "/pet/{petId}"
-          : 
-            delete: 
-              consumes: 
-                - multipart/form-data
-                - application/x-www-form-urlencoded
-              description: ""
-              operationId: deletePet
-              parameters: 
-                - 
-                  description: ""
-                  in: header
-                  name: api_key
-                  required: false
-                  type: string
-                - 
-                  description: "Pet id to delete"
-                  format: int64
-                  in: path
-                  name: petId
-                  required: true
-                  type: integer
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "400": 
-                  description: "Invalid pet value"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Deletes a pet"
-              tags: 
-                - pet
-            get: 
-              consumes: 
-                - application/x-www-form-urlencoded
-              description: "Returns a single pet"
-              operationId: getPetById
-              parameters: 
-                - 
-                  description: "ID of pet to return"
-                  format: int64
-                  in: path
-                  name: petId
-                  required: true
-                  type: integer
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    $ref: "#/definitions/Pet"
-                "400": 
-                  description: "Invalid ID supplied"
-                "404": 
-                  description: "Pet not found"
-              security: 
-                - 
-                  api_key: []
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Find pet by ID"
-              tags: 
-                - pet
-            post: 
-              consumes: 
-                - application/x-www-form-urlencoded
-              description: ""
-              operationId: updatePetWithForm
-              parameters: 
-                - 
-                  description: "ID of pet that needs to be updated"
-                  in: path
-                  name: petId
-                  required: true
-                  type: string
-                - 
-                  description: "Updated name of the pet"
-                  in: formData
-                  name: name
-                  required: false
-                  type: string
-                - 
-                  description: "Updated status of the pet"
-                  in: formData
-                  name: status
-                  required: false
-                  type: string
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "405": 
-                  description: "Invalid input"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Updates a pet in the store with form data"
-              tags: 
-                - pet
-          ? "/pet/{petId}/uploadImage"
-          : 
-            post: 
-              consumes: 
-                - multipart/form-data
-              description: ""
-              operationId: uploadFile
-              parameters: 
-                - 
-                  description: "ID of pet to update"
-                  format: int64
-                  in: path
-                  name: petId
-                  required: true
-                  type: integer
-                - 
-                  description: "Additional data to pass to server"
-                  in: formData
-                  name: additionalMetadata
-                  required: false
-                  type: string
-                - 
-                  description: "file to upload"
-                  in: formData
-                  name: file
-                  required: false
-                  type: file
-              produces: 
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    $ref: "#/definitions/ApiResponse"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "uploads an image"
-              tags: 
-                - pet
-              x-swagger-router-controller: SampleController
-          /store/inventory: 
-            get: 
-              description: "Returns a map of status codes to quantities"
-              operationId: getInventory
-              parameters: []
-              produces: 
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    additionalProperties: 
-                      format: int32
-                      type: integer
-                    type: object
-              security: 
-                - 
-                  api_key: []
-              summary: "Returns pet inventories by status"
-              tags: 
-                - store
-          /store/order: 
-            post: 
-              description: ""
-              operationId: placeOrder
-              parameters: 
-                - 
-                  description: "order placed for purchasing the pet"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    $ref: "#/definitions/Order"
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    $ref: "#/definitions/Order"
-                "400": 
-                  description: "Invalid Order"
-              summary: "Place an order for a pet"
-              tags: 
-                - store
-          ? "/store/order/{orderId}"
-          : 
-            delete: 
-              description: "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors"
-              operationId: deleteOrder
-              parameters: 
-                - 
-                  description: "ID of the order that needs to be deleted"
-                  in: path
-                  name: orderId
-                  required: true
-                  type: string
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "400": 
-                  description: "Invalid ID supplied"
-                "404": 
-                  description: "Order not found"
-              summary: "Delete purchase order by ID"
-              tags: 
-                - store
-            get: 
-              description: "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
-              operationId: getOrderById
-              parameters: 
-                - 
-                  description: "ID of pet that needs to be fetched"
-                  in: path
-                  name: orderId
-                  required: true
-                  type: string
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    $ref: "#/definitions/Order"
-                "400": 
-                  description: "Invalid ID supplied"
-                "404": 
-                  description: "Order not found"
-              summary: "Find purchase order by ID"
-              tags: 
-                - store
-          /user: 
-            post: 
-              description: "This can only be done by the logged in user."
-              operationId: createUser
-              parameters: 
-                - 
-                  description: "Created user object"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    $ref: "#/definitions/User"
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                default: 
-                  description: "successful operation"
-              summary: "Create user"
-              tags: 
-                - user
-          /user/createWithArray: 
-            post: 
-              description: ""
-              operationId: createUsersWithArrayInput
-              parameters: 
-                - 
-                  description: "List of user object"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    items: 
-                      $ref: "#/definitions/User"
-                    type: array
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                default: 
-                  description: "successful operation"
-              summary: "Creates list of users with given input array"
-              tags: 
-                - user
-          /user/createWithList: 
-            post: 
-              description: ""
-              operationId: createUsersWithListInput
-              parameters: 
-                - 
-                  description: "List of user object"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    items: 
-                      $ref: "#/definitions/User"
-                    type: array
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                default: 
-                  description: "successful operation"
-              summary: "Creates list of users with given input array"
-              tags: 
-                - user
-          /user/login: 
-            get: 
-              description: ""
-              operationId: loginUser
-              parameters: 
-                - 
-                  description: "The user name for login"
-                  in: query
-                  name: username
-                  required: false
-                  type: string
-                - 
-                  description: "The password for login in clear text"
-                  in: query
-                  name: password
-                  required: false
-                  type: string
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  headers: 
-                    X-Expires-After: 
-                      description: "date in UTC when toekn expires"
-                      format: date-time
-                      type: string
-                    X-Rate-Limit: 
-                      description: "calls per hour allowed by the user"
-                      format: int32
-                      type: integer
-                  schema: 
-                    type: string
-                "400": 
-                  description: "Invalid username/password supplied"
-              summary: "Logs user into the system"
-              tags: 
-                - user
-          /user/logout: 
-            get: 
-              description: ""
-              operationId: logoutUser
-              parameters: []
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                default: 
-                  description: "successful operation"
-              summary: "Logs out current logged in user session"
-              tags: 
-                - user
-          ? "/user/{username}"
-          : 
-            delete: 
-              description: "This can only be done by the logged in user."
-              operationId: deleteUser
-              parameters: 
-                - 
-                  description: "The name that needs to be deleted"
-                  in: path
-                  name: username
-                  required: true
-                  type: string
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "400": 
-                  description: "Invalid username supplied"
-                "404": 
-                  description: "User not found"
-              summary: "Delete user"
-              tags: 
-                - user
-            get: 
-              description: ""
-              operationId: getUserByName
-              parameters: 
-                - 
-                  description: "The name that needs to be fetched. Use user1 for testing. "
-                  in: path
-                  name: username
-                  required: true
-                  type: string
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    $ref: "#/definitions/User"
-                "400": 
-                  description: "Invalid username supplied"
-                "404": 
-                  description: "User not found"
-              summary: "Get user by user name"
-              tags: 
-                - user
-            put: 
-              description: "This can only be done by the logged in user."
-              operationId: updateUser
-              parameters: 
-                - 
-                  description: "name that need to be deleted"
-                  in: path
-                  name: username
-                  required: true
-                  type: string
-                - 
-                  description: "Updated user object"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    $ref: "#/definitions/User"
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "400": 
-                  description: "Invalid user supplied"
-                "404": 
-                  description: "User not found"
-              summary: "Updated user"
-              tags: 
-                - user
-        schemes: 
-          - http
-        securityDefinitions: 
-          api_key: 
-            in: header
-            name: api_key
-            type: apiKey
-          petstore_auth: 
-            authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
-            flow: implicit
-            scopes: 
-              ? "read:pets"
-              : "read your pets"
-              ? "write:pets"
-              : "modify pets in your account"
-            type: oauth2
-        swagger: "2.0"
-        tags: 
-          - 
-            description: "Everything about your Pets"
-            externalDocs: 
-              description: "Find out more"
-              url: "http://swagger.io"
-            name: pet
-          - 
-            description: "Operations about user"
-            name: store
-          - 
-            description: "Access to Petstore orders"
-            externalDocs: 
-              description: "Find out more about our store"
-              url: "http://swagger.io"
-            name: user
-      StageName: prod
-    Type: "AWS::Serverless::Api"
-  ApiGatewayStepFunctionsRole: 
-    Properties: 
-      AssumeRolePolicyDocument: 
-        Statement: 
-          - 
-            Action: 
-              - "sts:AssumeRole"
-            Effect: Allow
-            Principal: 
-              Service: 
-                - apigateway.amazonaws.com
-            Sid: AllowApiGatewayServiceToAssumeRole
-        Version: "2012-10-17"
-      Path: /
-      Policies: 
-        - 
-          PolicyDocument: 
-            Statement: 
-              - 
-                Action: 
-                  - "states:StartExecution"
-                Effect: Allow
-                Resource: 
-                  - StepFunctionStateMachine
-            Version: "2012-10-17"
-          PolicyName: CallStepFunctions
-    Type: "AWS::IAM::Role"
-  EmailNotifierServiceFunction: 
-    Properties: 
-      CodeUri: ../code/email/
-      Environment: 
-        Variables: 
-          NOTIFIER_TOPIC: NotifierSNSTopic
-      Handler: email_sns.lambda_handler
-      Role: SnsNotifierServiceRole.Arn
-      Runtime: python2.7
-    Type: "AWS::Serverless::Function"
-  NotifierSNSTopic: 
-    Properties: 
-      Subscription: 
-        - 
-          Endpoint: NotificationEmail
-          Protocol: email
-    Type: "AWS::SNS::Topic"
-  SlackNotifierServiceFunction: 
-    Properties: 
-      CodeUri: ../code/slack.zip
-      Environment: 
-        Variables: 
-          SLACK_TOKEN: SlackToken
-      Handler: slack.lambda_handler
-      Runtime: python2.7
-    Type: "AWS::Serverless::Function"
-  SmsNotifierServiceFunction: 
-    Properties: 
-      CodeUri: ../code/sms/
-      Environment: 
-        Variables: 
-          NOTIFIER_TOPIC: NotifierSNSTopic
-      Handler: sms_sns.lambda_handler
-      Role: SnsNotifierServiceRole.Arn
-      Runtime: python2.7
-    Type: "AWS::Serverless::Function"
-  SnsNotifierServiceRole: 
-    Properties: 
-      AssumeRolePolicyDocument: 
-        Statement: 
-          - 
-            Action: 
-              - "sts:AssumeRole"
-            Effect: Allow
-            Principal: 
-              Service: 
-                - lambda.amazonaws.com
-            Sid: AllowLambdaServiceToAssumeRole
-        Version: "2012-10-17"
-      ManagedPolicyArns: 
-        - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-      Path: /
-      Policies: 
-        - 
-          PolicyDocument: 
-            Statement: 
-              - 
-                Action: 
-                  - "sns:Publish"
-                Effect: Allow
-                Resource: 
-                  - NotifierSNSTopic
-                  - "*"
-            Version: "2012-10-17"
-          PolicyName: PublishSnsTopic
-    Type: "AWS::IAM::Role"
-  StepFunctionStateMachine: 
-    Properties: 
-      DefinitionString: |
-          {
-              "Comment": "Demo for API GW->SFN",
-              "StartAt": "NotifierState",
-              "States": {
-                "NotifierState": {
-                  "Type" : "Choice",
-                  "Choices": [
-                    {
-                      "Variable": "$.notifier",
-                      "StringEquals": "Email",
-                      "Next": "EmailNotifier"
-                    },
-                    {
-                      "Variable": "$.notifier",
-                      "StringEquals": "Sms",
-                      "Next": "SmsNotifier"
-                    },
-                    {
-                      "Variable": "$.notifier",
-                      "StringEquals": "Slack",
-                      "Next": "SlackNotifier"
-                    },
-                    {
-                      "Variable": "$.notify",
-                      "StringEquals": "Twilio",
-                      "Next": "NotImplementedYet"
-                    }
-                  ],
-                  "Default": "IgnoreNotification"
-                },
-                "IgnoreNotification": {
-                  "Type": "Pass",
-                  "Next": "SayHi"
-                },
-                "NotImplementedYet": {
-                  "Type": "Fail",
-                  "Cause": "Feature not implemented yet!"
-                },
-                "EmailNotifier": {
-                  "Type": "Task",
-                  "Resource": "${EmailNotifierServiceFunction.Arn}",
-                  "Next": "SayHi"
-                },
-                "SlackNotifier": {
-                  "Type": "Task",
-                  "Resource": "${SlackNotifierServiceFunction.Arn}",
-                  "Next": "SayHi"
-                },
-                "SmsNotifier": {
-                  "Type": "Task",
-                  "Resource": "${SmsNotifierServiceFunction.Arn}",
-                  "Next": "SayHi"
-                },
-                "SayHi": {
-                  "Type": "Pass",
-                  "Result": "Hi!",
-                  "End": true
-                }
-              }
-          }
-      RoleArn: StepFunctionsServiceRole.Arn
-    Type: "AWS::StepFunctions::StateMachine"
-  StepFunctionsAPI: 
-    Properties: 
-      DefinitionBody: 
-        basePath: /prod
-        definitions: 
-          Empty: 
-            title: "Empty Schema"
-            type: object
-        info: 
-          title: AwsSamExample
-        paths: 
-          /: 
-            options: 
-              consumes: 
-                - application/json
-              produces: 
-                - application/json
-              responses: 
-                200: 
-                  description: "200 response"
-                  headers: 
-                    Access-Control-Allow-Headers: 
-                      type: string
-                    Access-Control-Allow-Methods: 
-                      type: string
-                    Access-Control-Allow-Origin: 
-                      type: string
-                  schema: 
-                    $ref: "#/definitions/Empty"
-              x-amazon-apigateway-integration: 
-                cacheKeyParameters: []
-                cacheNamespace: "cache namespace"
-                credentials: "arn:aws:iam::012345678901:role/apigateway-invoke-lambda-exec-role"
-                httpMethod: POST
-                requestParameters: 
-                  integration.request.path.stage: method.request.querystring.version
-                  integration.request.querystring.provider: method.request.querystring.vendor
-                requestTemplates: 
-                  application/json: "#set ($root=$input.path('$')) { \"stage\": \"$root.name\", \"user-id\": \"$root.key\" }"
-                  application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
-                responses: 
-                  "2\\d{2}": 
-                    responseParameters: 
-                      method.response.header.requestId: integration.response.header.cid
-                    responseTemplates: 
-                      application/json: "#set ($root=$input.path('$')) { \"stage\": \"$root.name\", \"user-id\": \"$root.key\" }"
-                      application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
-                    statusCode: "200"
-                  "302": 
-                    responseParameters: 
-                      method.response.header.Location: integration.response.body.redirect.url
-                    statusCode: "302"
-                  default: 
-                    responseParameters: 
-                      method.response.header.test-method-response-header: "'static value'"
-                    statusCode: "400"
-                type: aws
-                uri: "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:012345678901:function:HelloWorld/invocations"
-            x-amazon-apigateway-any-method: 
-              produces: 
-                - application/json
-              responses: 
-                200: 
-                  description: "200 response"
-                  schema: 
-                    $ref: "#/definitions/Empty"
-              security: 
-                - 
-                  test-authorizer: []
-              x-amazon-apigateway-integration: 
-                httpMethod: POST
-                passthroughBehavior: when_no_match
-                responses: 
-                  default: 
-                    statusCode: 200
-                type: aws_proxy
-                uri: EmailNotifierServiceFunction.Arn
-          "/{proxy+}":
-            options: 
-              consumes: 
-                - application/json
-              produces: 
-                - application/json
-              responses: 
-                200: 
-                  description: "200 response"
-                  headers: 
-                    Access-Control-Allow-Headers: 
-                      type: string
-                    Access-Control-Allow-Methods: 
-                      type: string
-                    Access-Control-Allow-Origin: 
-                      type: string
-                  schema: 
-                    $ref: "#/definitions/Empty"
-              x-amazon-apigateway-integration: 
-                passthroughBehavior: when_no_match
-                requestTemplates: 
-                  application/json: "{\"statusCode\": 200}"
-                responses: 
-                  default: 
-                    responseParameters: 
-                      method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
-                      method.response.header.Access-Control-Allow-Methods: "'DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT'"
-                      method.response.header.Access-Control-Allow-Origin: "'*'"
-                    statusCode: 200
-                type: mock
-            x-amazon-apigateway-any-method: 
-              parameters: 
-                - 
-                  in: path
-                  name: proxy
-                  required: true
-                  type: string
-              produces: 
-                - application/json
-              responses: {}
-              x-amazon-apigateway-auth: 
-                type: aws_iam
-              x-amazon-apigateway-integration: 
-                httpMethod: POST
-                type: aws_proxy
-                uri: "arn:aws:apigateway:<<region>>:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations"
-        schemes: 
-          - https
-        securityDefinitions: 
-          test-authorizer: 
-            in: header
-            name: Authorization
-            type: apiKey
-            x-amazon-apigateway-authorizer: 
-              authorizerCredentials: "arn:aws:iam::account-id:role"
-              authorizerResultTtlInSeconds: 60
-              authorizerUri: "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:account-id:function:function-name/invocations"
-              identityValidationExpression: "^x-[a-z]+"
-              type: token
-            x-amazon-apigateway-authtype: oauth2
-        swagger: "2.0"
-      StageName: dev
-    Type: "AWS::Serverless::Api"
-  StepFunctionsServiceRole: 
-    Properties: 
-      AssumeRolePolicyDocument: 
-        Statement: 
-          - 
-            Action: 
-              - "sts:AssumeRole"
-            Effect: Allow
-            Principal: 
-              Service: 
-                - "states.${AWS::Region}.amazonaws.com"
-            Sid: AllowStepFunctionsServiceToAssumeRole
-        Version: "2012-10-17"
-      ManagedPolicyArns: 
-        - "arn:aws:iam::aws:policy/AWSStepFunctionsFullAccess"
-      Path: /
-      Policies: 
-        - 
-          PolicyDocument: 
-            Statement: 
-              - 
-                Action: 
-                  - "lambda:InvokeFunction"
-                Effect: Allow
-                Resource: 
-                  - "${SlackNotifierServiceFunction.Arn}"
-                  - "${EmailNotifierServiceFunction.Arn}"
-                  - "${SmsNotifierServiceFunction.Arn}"
-            Version: "2012-10-17"
-          PolicyName: CallLambdaFunctions
-    Type: "AWS::IAM::Role"
-Transform: "AWS::Serverless-2016-10-31"
diff --git a/test/templates/aws-common-string-or-s3-location.yaml b/test/templates/aws-common-string-or-s3-location.yaml
deleted file mode 100644
index f11107a9fd..0000000000
--- a/test/templates/aws-common-string-or-s3-location.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: SAM template for testing CodeUri property parsing
-Resources:
-
-  CodeUriWithS3LocationSpecifiedAsString:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: nodejs
-      CodeUri: s3://testbucket/testkey.zip
-
-  CodeUriWithS3LocationSpecifiedAsObject:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: nodejs
-      CodeUri: 
-        Bucket: testbucket
-        Key: testkey.zip
-        Version: 5
-
-  CodeUriWithString:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: nodejs
-      CodeUri: ./testfolder
diff --git a/test/templates/codestar/java.yml b/test/templates/codestar/java.yml
deleted file mode 100644
index 98d1966c8e..0000000000
--- a/test/templates/codestar/java.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Transform:
-- AWS::Serverless-2016-10-31
-- AWS::CodeStar
-
-Parameters:
-  ProjectId:
-    Type: String
-    Description: AWS CodeStar projectID used to associate new resources to team members
-
-Resources:
-  GetHelloWorld:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: com.aws.codestar.projecttemplates.handler.HelloWorldHandler
-      CodeUri: target/
-      Runtime: java8
-      Role:
-        Fn::ImportValue:
-          !Join ['-', [!Ref 'ProjectId', !Ref 'AWS::Region', 'LambdaTrustRole']]
-      Events:
-        GetEvent:
-          Type: Api
-          Properties:
-            Path: /
-            Method: get
-
-  PostHelloWorld:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: com.aws.codestar.projecttemplates.handler.HelloWorldHandler
-      Runtime: java8
-      Role:
-        Fn::ImportValue:
-          !Join ['-', [!Ref 'ProjectId', !Ref 'AWS::Region', 'LambdaTrustRole']]
-      Events:
-        PostEvent:
-          Type: Api
-          Properties:
-            Path: /
-            Method: post
diff --git a/test/templates/codestar/nodejs.yml b/test/templates/codestar/nodejs.yml
deleted file mode 100644
index f28f69f5d6..0000000000
--- a/test/templates/codestar/nodejs.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Transform:
-- AWS::Serverless-2016-10-31
-- AWS::CodeStar
-
-Parameters:
-  ProjectId:
-    Type: String
-    Description: AWS CodeStar projectID used to associate new resources to team members
-
-Resources:
-  GetHelloWorld:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.get
-      Runtime: nodejs4.3
-      Role:
-        Fn::ImportValue:
-          !Join ['-', [!Ref 'ProjectId', !Ref 'AWS::Region', 'LambdaTrustRole']]
-      Events:
-        GetEvent:
-          Type: Api
-          Properties:
-            Path: /
-            Method: get
\ No newline at end of file
diff --git a/test/templates/codestar/python.yml b/test/templates/codestar/python.yml
deleted file mode 100644
index 97ae2a910d..0000000000
--- a/test/templates/codestar/python.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Transform:
-- AWS::Serverless-2016-10-31
-- AWS::CodeStar
-
-Parameters:
-  ProjectId:
-    Type: String
-    Description: CodeStar projectId used to associate new resources to team members
-
-Resources:
-  HelloWorld:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.handler
-      Runtime: python2.7
-      Role:
-        Fn::ImportValue:
-          !Join ['-', [!Ref 'ProjectId', !Ref 'AWS::Region', 'LambdaTrustRole']]
-      Events:
-        GetEvent:
-          Type: Api
-          Properties:
-            Path: /
-            Method: get
-        PostEvent:
-          Type: Api
-          Properties:
-            Path: /
-            Method: post
diff --git a/test/templates/function-2016-10-31.yaml b/test/templates/function-2016-10-31.yaml
deleted file mode 100644
index 376ff804c0..0000000000
--- a/test/templates/function-2016-10-31.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-Transform: AWS::Serverless-2016-10-31
-Resources:
-  Function20161031:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: file.method
-      Runtime: nodejs
-      CodeUri: s3://bucket/path/key
-      FunctionName: functionname
-      Description: description
-      MemorySize: 128
-      Timeout: 30
-      Role: aws::arn::123456789012::some/role
-      Policies: 
-        - AmazonDynamoDBFullAccess
-      Environment:
-        Variables:
-          NAME: VALUE
-      VpcConfig:
-        SecurityGroupIds:
-          - String
-        SubnetIds:
-          - String
-      Events:
-        TestApi:
-          Type: Api
-          Properties:
-            Path: /testing
-            Method: any
\ No newline at end of file
diff --git a/test/templates/function-environment-variables.yaml b/test/templates/function-environment-variables.yaml
deleted file mode 100644
index ea1682cd5e..0000000000
--- a/test/templates/function-environment-variables.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-AWSTemplateFormatVersion : '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-
-Description: |
-  Use this section to describe your Serverless project
-
-Parameters:
-  # Optional: Use parameters to pass in runtime configuration (such as a database connection string) 
-  # See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/parameters-section-structure.html
-
-  ExampleParameter:
-    Description: This is just an example parameter, used to show how to pass in environment variables to Lambda
-    Type: String
-    Default: SomeValue
-
-Resources:
-  # Place your project resources here (AWS Lambda functions, API Gateway) etc
-
-  EnvironmentVariableTestFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: nodejs6.10
-      Handler: filename.method
-      Environment:
-        Variables:
-          STRING_ENV_VAR: test123
-      Events:
-        GetRequest:
-          Type: Api
-          Properties:
-            Path: /
-            Method: get
-
-  NoValueEnvironmentVariableTestFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: nodejs6.10
-      Handler: filename.method
-      Environment:
-        Variables:
-          EMPTY_ENV_VAR: ""
-      Events:
-        GetRequest:
-          Type: Api
-          Properties:
-            Path: /
-            Method: get
-
-  SubEnvironmentVariableTestFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      FunctionName: sub
-      Runtime: nodejs6.10
-      Handler: filename.method
-      Environment:
-        Variables:
-          SUB_ENV_VAR: !Sub Hello
-      Events:
-        GetRequest:
-          Type: Api
-          Properties:
-            Path: /
-            Method: get
-
-  NonExistSubEnvironmentVariableTestFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      FunctionName: sub
-      Runtime: nodejs6.10
-      Handler: filename.method
-      Environment:
-        Variables:
-          SUB_REF_ENV_VAR: !Sub Hello-${ThisReferenceDoesntExist}
-      Events:
-        GetRequest:
-          Type: Api
-          Properties:
-            Path: /
-            Method: get
-
-  IntrinsicEnvironmentVariableTestFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Runtime: nodejs6.10
-      Handler: filename.method
-      Environment:
-        Variables:
-          REF_ENV_VAR: !Ref ExampleParameter
-      Events:
-        GetRequest:
-          Type: Api
-          Properties:
-            Path: /
-            Method: get
-
-Outputs:
-  # Optional: The optional Outputs section declares output values that you can import into other stacks
-  # (to create cross-stack references), return in response (to describe stack calls), or view on the
-  # AWS CloudFormation console.
-  # See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/outputs-section-structure.html
-
-  ExampleOutput:
-    Description: This is an example output, used to show how to return the ARN of the created Lambda function
-    Value: !Ref ExampleFunction
diff --git a/test/templates/open-api/pet-store-proxy.json b/test/templates/open-api/pet-store-proxy.json
deleted file mode 100644
index c0300506d5..0000000000
--- a/test/templates/open-api/pet-store-proxy.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "version": "1.0.0",
-    "title": "Swagger Petstore",
-    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
-    "termsOfService": "http://swagger.io/terms/",
-    "contact": {
-      "name": "Swagger API Team"
-    },
-    "license": {
-      "name": "MIT"
-    }
-  },
-  "host": "petstore.swagger.io",
-  "basePath": "/api",
-  "schemes": [
-    "http"
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "paths": {
-    "/pets": {
-      "get": {
-        "description": "Returns all pets from the system that the user has access to",
-        "operationId": "findPets",
-        "produces": [
-          "application/json",
-          "application/xml",
-          "text/xml",
-          "text/html"
-        ],
-        "parameters": [
-          {
-            "name": "tags",
-            "in": "query",
-            "description": "tags to filter by",
-            "required": false,
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "collectionFormat": "csv"
-          },
-          {
-            "name": "limit",
-            "in": "query",
-            "description": "maximum number of results to return",
-            "required": false,
-            "type": "integer",
-            "format": "int32"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "pet response",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/Pet"
-              }
-            }
-          },
-          "default": {
-            "description": "unexpected error",
-            "schema": {
-              "$ref": "#/definitions/ErrorModel"
-            }
-          }
-        },
-        "x-amazon-apigateway-integration": {
-          "responses": {
-            "default": {
-              "statusCode": "200"
-            }
-          },
-          "uri": "arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:123456789012:function:Calc/invocations",
-          "passthroughBehavior": "when_no_match",
-          "httpMethod": "POST",
-          "type": "aws_proxy"
-        }
-      },
-      "post": {
-        "description": "Creates a new pet in the store.  Duplicates are allowed",
-        "operationId": "addPet",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "name": "pet",
-            "in": "body",
-            "description": "Pet to add to the store",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/NewPet"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "pet response",
-            "schema": {
-              "$ref": "#/definitions/Pet"
-            }
-          },
-          "default": {
-            "description": "unexpected error",
-            "schema": {
-              "$ref": "#/definitions/ErrorModel"
-            }
-          }
-        },
-        "x-amazon-apigateway-integration": {
-          "responses": {
-            "default": {
-              "statusCode": "200"
-            }
-          },
-          "uri": "arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:123456789012:function:Calc/invocations",
-          "passthroughBehavior": "when_no_match",
-          "httpMethod": "POST",
-          "type": "aws_proxy"
-        }
-      }
-    },
-    "/pets/{proxy+}": {
-      "x-amazon-apigateway-any-method": {
-        "x-amazon-apigateway-integration": {
-          "responses": {
-            "default": {
-              "statusCode": "200"
-            }
-          },
-          "uri": "arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:123456789012:function:AnyMethod/invocations",
-          "passthroughBehavior": "when_no_match",
-          "httpMethod": "POST",
-          "type": "aws_proxy"
-        }
-      },
-      "delete": {
-        "description": "deletes a single pet based on the ID supplied",
-        "operationId": "deletePet",
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "description": "ID of pet to delete",
-            "required": true,
-            "type": "integer",
-            "format": "int64"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "pet deleted"
-          },
-          "default": {
-            "description": "unexpected error",
-            "schema": {
-              "$ref": "#/definitions/ErrorModel"
-            }
-          }
-        },
-        "x-amazon-apigateway-integration": {
-          "responses": {
-            "default": {
-              "statusCode": "200"
-            }
-          },
-          "uri": "arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:123456789012:function:Calc/invocations",
-          "passthroughBehavior": "when_no_match",
-          "httpMethod": "POST",
-          "type": "aws_proxy"
-        }
-      }
-    }
-  },
-  "definitions": {
-    "Pet": {
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/NewPet"
-        },
-        {
-          "required": [
-            "id"
-          ],
-          "properties": {
-            "id": {
-              "type": "integer",
-              "format": "int64"
-            }
-          }
-        }
-      ]
-    },
-    "NewPet": {
-      "type": "object",
-      "required": [
-        "name"
-      ],
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "tag": {
-          "type": "string"
-        }
-      }
-    },
-    "ErrorModel": {
-      "type": "object",
-      "required": [
-        "code",
-        "message"
-      ],
-      "properties": {
-        "code": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "message": {
-          "type": "string"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/test/templates/open-api/pet-store-simple.json b/test/templates/open-api/pet-store-simple.json
deleted file mode 100644
index 65106f5e58..0000000000
--- a/test/templates/open-api/pet-store-simple.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "version": "1.0.0",
-    "title": "Swagger Petstore",
-    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
-    "termsOfService": "http://swagger.io/terms/",
-    "contact": {
-      "name": "Swagger API Team"
-    },
-    "license": {
-      "name": "MIT"
-    }
-  },
-  "host": "petstore.swagger.io",
-  "basePath": "/api",
-  "schemes": [
-    "http"
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "paths": {
-    "/pets": {
-      "get": {
-        "description": "Returns all pets from the system that the user has access to",
-        "operationId": "findPets",
-        "produces": [
-          "application/json",
-          "application/xml",
-          "text/xml",
-          "text/html"
-        ],
-        "parameters": [
-          {
-            "name": "tags",
-            "in": "query",
-            "description": "tags to filter by",
-            "required": false,
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "collectionFormat": "csv"
-          },
-          {
-            "name": "limit",
-            "in": "query",
-            "description": "maximum number of results to return",
-            "required": false,
-            "type": "integer",
-            "format": "int32"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "pet response",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/Pet"
-              }
-            }
-          },
-          "default": {
-            "description": "unexpected error",
-            "schema": {
-              "$ref": "#/definitions/ErrorModel"
-            }
-          }
-        },
-        "x-amazon-apigateway-integration": {
-          "responses": {
-            "default": {
-              "statusCode": "200"
-            }
-          },
-          "uri": "arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:123456789012:function:Calc/invocations",
-          "passthroughBehavior": "when_no_match",
-          "httpMethod": "POST",
-          "type": "aws_proxy"
-        }
-      },
-      "post": {
-        "description": "Creates a new pet in the store.  Duplicates are allowed",
-        "operationId": "addPet",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "name": "pet",
-            "in": "body",
-            "description": "Pet to add to the store",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/NewPet"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "pet response",
-            "schema": {
-              "$ref": "#/definitions/Pet"
-            }
-          },
-          "default": {
-            "description": "unexpected error",
-            "schema": {
-              "$ref": "#/definitions/ErrorModel"
-            }
-          }
-        },
-        "x-amazon-apigateway-integration": {
-          "responses": {
-            "default": {
-              "statusCode": "200"
-            }
-          },
-          "uri": "arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:123456789012:function:Calc/invocations",
-          "passthroughBehavior": "when_no_match",
-          "httpMethod": "POST",
-          "type": "aws_proxy"
-        }
-      }
-    },
-    "/pets/{id}": {
-      "get": {
-        "description": "Returns a user based on a single ID, if the user does not have access to the pet",
-        "operationId": "findPetById",
-        "produces": [
-          "application/json",
-          "application/xml",
-          "text/xml",
-          "text/html"
-        ],
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "description": "ID of pet to fetch",
-            "required": true,
-            "type": "integer",
-            "format": "int64"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "pet response",
-            "schema": {
-              "$ref": "#/definitions/Pet"
-            }
-          },
-          "default": {
-            "description": "unexpected error",
-            "schema": {
-              "$ref": "#/definitions/ErrorModel"
-            }
-          }
-        },
-        "x-amazon-apigateway-integration": {
-          "responses": {
-            "default": {
-              "statusCode": "200"
-            }
-          },
-          "uri": "arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:123456789012:function:Calc/invocations",
-          "passthroughBehavior": "when_no_match",
-          "httpMethod": "POST",
-          "type": "aws_proxy"
-        }
-      },
-      "delete": {
-        "description": "deletes a single pet based on the ID supplied",
-        "operationId": "deletePet",
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "description": "ID of pet to delete",
-            "required": true,
-            "type": "integer",
-            "format": "int64"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "pet deleted"
-          },
-          "default": {
-            "description": "unexpected error",
-            "schema": {
-              "$ref": "#/definitions/ErrorModel"
-            }
-          }
-        },
-        "x-amazon-apigateway-integration": {
-          "responses": {
-            "default": {
-              "statusCode": "200"
-            }
-          },
-          "uri": "arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:123456789012:function:Calc/invocations",
-          "passthroughBehavior": "when_no_match",
-          "httpMethod": "POST",
-          "type": "aws_proxy"
-        }
-      }
-    }
-  },
-  "definitions": {
-    "Pet": {
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/NewPet"
-        },
-        {
-          "required": [
-            "id"
-          ],
-          "properties": {
-            "id": {
-              "type": "integer",
-              "format": "int64"
-            }
-          }
-        }
-      ]
-    },
-    "NewPet": {
-      "type": "object",
-      "required": [
-        "name"
-      ],
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "tag": {
-          "type": "string"
-        }
-      }
-    },
-    "ErrorModel": {
-      "type": "object",
-      "required": [
-        "code",
-        "message"
-      ],
-      "properties": {
-        "code": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "message": {
-          "type": "string"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/test/templates/open-api/simple-yaml.yaml b/test/templates/open-api/simple-yaml.yaml
deleted file mode 100644
index b8f4eabaf5..0000000000
--- a/test/templates/open-api/simple-yaml.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-swagger: 2.0
-
-info:
-  title: example
-  version: 0.1.0
-
-paths:
-  /:
-    post:
-      x-amazon-apigateway-integration:
-        httpMethod: POST
-        type: aws_proxy
-        uri: arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations
diff --git a/test/templates/output_section.yaml b/test/templates/output_section.yaml
deleted file mode 100644
index 91cb5cf105..0000000000
--- a/test/templates/output_section.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Simple CRUD webservice. State is stored in a SimpleTable (DynamoDB) resource.
-Resources:
-  MyApi:
-    Type: AWS::Serverless::Api
-    Properties:
-      DefinitionUri: s3://bucket/key
-      StageName: prod
-
-Outputs:
-  ApiUrl:
-    Description: URL of API endpoint
-    Value: !Join ['', ['https://', !Ref "MyApi", '.execute-api.', !Ref 'AWS::Region', '.amazonaws.com/Prod']]
\ No newline at end of file
diff --git a/test/templates/sam-official-samples/alexa_skill/index.js b/test/templates/sam-official-samples/alexa_skill/index.js
deleted file mode 100644
index 2b0de8b136..0000000000
--- a/test/templates/sam-official-samples/alexa_skill/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-'use strict';
-console.log('Loading hello world function');
-
-exports.handler = function(event, context) {
-    var name = "World";
-    var responseCode = 200;
-    console.log("request: " + JSON.stringify(event));
-    if (event.queryStringParameters !== null && event.queryStringParameters !== undefined) {
-        if (event.queryStringParameters.name !== undefined && event.queryStringParameters.name !== null && event.queryStringParameters.name !== "") {
-            console.log("Received name: " + event.queryStringParameters.name);
-            name = event.queryStringParameters.name;
-        }
-
-        if (event.queryStringParameters.httpStatus !== undefined && event.queryStringParameters.httpStatus !== null && event.queryStringParameters.httpStatus !== "") {
-            console.log("Received http status: " + event.queryStringParameters.httpStatus);
-            responseCode = event.queryStringParameters.httpStatus;
-        }
-    }
-
-    var responseBody = {
-        message: "Hello " + name + "!",
-        input: event
-    };
-    var response = {
-        statusCode: responseCode,
-        headers: {
-            "x-custom-header" : "my custom header value"
-        },
-        body: JSON.stringify(responseBody)
-    };
-    console.log("response: " + JSON.stringify(response))
-    context.succeed(response);
-};
diff --git a/test/templates/sam-official-samples/alexa_skill/template.yaml b/test/templates/sam-official-samples/alexa_skill/template.yaml
deleted file mode 100644
index 80ad8c0a11..0000000000
--- a/test/templates/sam-official-samples/alexa_skill/template.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Alexa Skill https://developer.amazon.com/alexa-skills-kit
-Resources:
-  AlexaSkillFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      CodeUri: s3://<bucket>/alexa_skill.zip
-      Handler: index.handler
-      Runtime: nodejs4.3
-      Events:
-        AlexaSkillEvent:
-          Type: AlexaSkill
-          Properties:
-            Whatever: whatever
diff --git a/test/templates/sam-official-samples/api-swagger-intrinsic.yaml b/test/templates/sam-official-samples/api-swagger-intrinsic.yaml
deleted file mode 100644
index 429cb977e8..0000000000
--- a/test/templates/sam-official-samples/api-swagger-intrinsic.yaml
+++ /dev/null
@@ -1,1038 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Swagger demo for Integration Requests
-
-Parameters:
-
-  NotificationEmail:
-    Type: String
-    Description: Email address to subscribe to SNS topic and receive notifications from Notifier Workflow
-
-  SlackToken:
-    Type: String
-    Description: Legacy Slack Token (xoxp-ywz) to send messages on channel
-    Default: None
-
-Resources:
-
-
-  SnsNotifierServiceRole:
-    Type: "AWS::IAM::Role"
-    Properties:
-      Path: "/"
-      ManagedPolicyArns:
-          - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          -
-            Sid: "AllowLambdaServiceToAssumeRole"
-            Effect: "Allow"
-            Action: 
-              - "sts:AssumeRole"
-            Principal:
-              Service:
-                - "lambda.amazonaws.com"
-      Policies:
-        -
-          PolicyName: "PublishSnsTopic"
-          PolicyDocument:
-            Version: '2012-10-17'
-            Statement:
-              -
-                Effect: "Allow"
-                Action:
-                  - "sns:Publish"
-                Resource: 
-                  - !Ref NotifierSNSTopic
-                  - "*" # can't restrict on SMS number yet, so *
-
-
-  EmailNotifierServiceFunction:
-    Type: 'AWS::Serverless::Function'
-    Properties:
-      Handler: email_sns.lambda_handler
-      Runtime: python2.7
-      CodeUri: ../code/email/
-      Role: !GetAtt SnsNotifierServiceRole.Arn
-      Environment:
-        Variables:
-          NOTIFIER_TOPIC: !Ref NotifierSNSTopic
-
-
-  SmsNotifierServiceFunction:
-    Type: 'AWS::Serverless::Function'
-    Properties:
-      Handler: sms_sns.lambda_handler
-      Runtime: python2.7
-      CodeUri: ../code/sms/
-      Role: !GetAtt SnsNotifierServiceRole.Arn
-      Environment:
-        Variables:
-          NOTIFIER_TOPIC: !Ref NotifierSNSTopic
-
-  # No need for extra permissions other than Basic Execution
-  # SAM takes care of creating basic IAM Role if none is provided
-  SlackNotifierServiceFunction:
-    Type: 'AWS::Serverless::Function'
-    Properties:
-      Handler: slack.lambda_handler
-      Runtime: python2.7
-      CodeUri: ../code/slack.zip    # Slack contains 3rd party libraries
-      Environment:
-        Variables:
-          SLACK_TOKEN: !Ref SlackToken
-  # IAM Role API Gateway will assume in order to call StepFunctions StartExecution API
-  ApiGatewayStepFunctionsRole:
-    Type: "AWS::IAM::Role"
-    Properties:
-        Path: "/"
-        AssumeRolePolicyDocument:
-          Version: "2012-10-17"
-          Statement:
-            -
-              Sid: "AllowApiGatewayServiceToAssumeRole"
-              Effect: "Allow"
-              Action: 
-                - "sts:AssumeRole"
-              Principal:
-                Service:
-                  - "apigateway.amazonaws.com"
-        Policies:
-          -
-            PolicyName: "CallStepFunctions"
-            PolicyDocument:
-              Version: '2012-10-17'
-              Statement:
-                -
-                  Effect: "Allow"
-                  Action:
-                    - "states:StartExecution"
-                  Resource: 
-                    - !Ref StepFunctionStateMachine
-
-  AnotherRandomAPI:
-    Type: AWS::Serverless::Api
-    Properties:
-      StageName: prod
-      DefinitionBody:
-        swagger: "2.0"
-        info:
-          description: "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters"
-          version: 1.0.0
-          title: Swagger Petstore YAML
-          termsOfService: "http://swagger.io/terms/"
-          contact:
-            email: "apiteam@swagger.io"
-          license:
-            name: Apache 2.0
-            url: "http://www.apache.org/licenses/LICENSE-2.0.html"
-        basePath: /v2
-        tags:
-          - name: pet
-            description: Everything about your Pets
-            externalDocs:
-              description: Find out more
-              url: "http://swagger.io"
-          - name: store
-            description: Operations about user
-          - name: user
-            description: Access to Petstore orders
-            externalDocs:
-              description: Find out more about our store
-              url: "http://swagger.io"
-        schemes:
-          - http
-        paths:
-          /pet:
-            post:
-              tags:
-                - pet
-              summary: Add a new pet to the store
-              x-swagger-router-controller: SampleController
-              description: ""
-              operationId: addPet
-              consumes:
-                - application/json
-                - application/xml
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - in: body
-                  name: body
-                  description: Pet object that needs to be added to the store
-                  required: false
-                  schema:
-                    $ref: "#/definitions/Pet"
-              responses:
-                "405":
-                  description: Invalid input
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-            put:
-              tags:
-                - pet
-              summary: Update an existing pet
-              description: ""
-              operationId: updatePet
-              consumes:
-                - application/json
-                - application/xml
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - in: body
-                  name: body
-                  description: Pet object that needs to be added to the store
-                  required: false
-                  schema:
-                    $ref: "#/definitions/Pet"
-              responses:
-                "400":
-                  description: Invalid ID supplied
-                "404":
-                  description: Pet not found
-                "405":
-                  description: Validation exception
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-          /pet/findByStatus:
-            get:
-              tags:
-                - pet
-              summary: Finds Pets by status
-              description: Multiple status values can be provided with comma seperated strings
-              operationId: findPetsByStatus
-              consumes:
-                - application/xml
-                - application/json
-                - multipart/form-data
-                - application/x-www-form-urlencoded
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: status
-                  in: query
-                  description: Status values that need to be considered for filter
-                  required: false
-                  type: array
-                  items:
-                    type: string
-                  collectionFormat: multi
-                  default: available
-                  enum:
-                    - available
-                    - pending
-                    - sold
-                - name: testlong
-                  in: query
-                  description: Status values that need to be considered for filter
-                  required: false
-                  type: array
-                  items:
-                    type: long
-                  collectionFormat: multi
-                  default: available
-                  enum:
-                    - 1234567890123456
-                    - 345
-                    - 678
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    type: array
-                    items:
-                      $ref: "#/definitions/Pet"
-                "400":
-                  description: Invalid status value
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-          /pet/findByTags:
-            get:
-              tags:
-                - pet
-              summary: Finds Pets by tags
-              description: "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing."
-              operationId: findPetsByTags
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: tags
-                  in: query
-                  description: Tags to filter by
-                  required: false
-                  type: array
-                  items:
-                    type: string
-                  collectionFormat: multi
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    type: array
-                    items:
-                      $ref: "#/definitions/Pet"
-                "400":
-                  description: Invalid tag value
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-          "/pet/{petId}":
-            get:
-              tags:
-                - pet
-              summary: Find pet by ID
-              description: Returns a single pet
-              operationId: getPetById
-              consumes:
-                - application/x-www-form-urlencoded
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: petId
-                  in: path
-                  description: ID of pet to return
-                  required: true
-                  type: integer
-                  format: int64
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    $ref: "#/definitions/Pet"
-                "400":
-                  description: Invalid ID supplied
-                "404":
-                  description: Pet not found
-              security:
-                - api_key: []
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-            post:
-              tags:
-                - pet
-              summary: Updates a pet in the store with form data
-              description: ""
-              operationId: updatePetWithForm
-              consumes:
-                - application/x-www-form-urlencoded
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: petId
-                  in: path
-                  description: ID of pet that needs to be updated
-                  required: true
-                  type: string
-                - name: name
-                  in: formData
-                  description: Updated name of the pet
-                  required: false
-                  type: string
-                - name: status
-                  in: formData
-                  description: Updated status of the pet
-                  required: false
-                  type: string
-              responses:
-                "405":
-                  description: Invalid input
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-            delete:
-              tags:
-                - pet
-              summary: Deletes a pet
-              description: ""
-              operationId: deletePet
-              consumes:
-                - multipart/form-data
-                - application/x-www-form-urlencoded
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: api_key
-                  in: header
-                  description: ""
-                  required: false
-                  type: string
-                - name: petId
-                  in: path
-                  description: Pet id to delete
-                  required: true
-                  type: integer
-                  format: int64
-              responses:
-                "400":
-                  description: Invalid pet value
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-          "/pet/{petId}/uploadImage":
-            post:
-              tags:
-                - pet
-              summary: uploads an image
-              x-swagger-router-controller: SampleController
-              description: ""
-              operationId: uploadFile
-              consumes:
-                - multipart/form-data
-              produces:
-                - application/json
-              parameters:
-                - name: petId
-                  in: path
-                  description: ID of pet to update
-                  required: true
-                  type: integer
-                  format: int64
-                - name: additionalMetadata
-                  in: formData
-                  description: Additional data to pass to server
-                  required: false
-                  type: string
-                - name: file
-                  in: formData
-                  description: file to upload
-                  required: false
-                  type: file
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    $ref: "#/definitions/ApiResponse"
-              security:
-                - petstore_auth:
-                    - "write:pets"
-                    - "read:pets"
-          /store/inventory:
-            get:
-              tags:
-                - store
-              summary: Returns pet inventories by status
-              description: Returns a map of status codes to quantities
-              operationId: getInventory
-              produces:
-                - application/json
-              parameters: []
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    type: object
-                    additionalProperties:
-                      type: integer
-                      format: int32
-              security:
-                - api_key: []
-          /store/order:
-            post:
-              tags:
-                - store
-              summary: Place an order for a pet
-              description: ""
-              operationId: placeOrder
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - in: body
-                  name: body
-                  description: order placed for purchasing the pet
-                  required: false
-                  schema:
-                    $ref: "#/definitions/Order"
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    $ref: "#/definitions/Order"
-                "400":
-                  description: Invalid Order
-          "/store/order/{orderId}":
-            get:
-              tags:
-                - store
-              summary: Find purchase order by ID
-              description: "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
-              operationId: getOrderById
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: orderId
-                  in: path
-                  description: ID of pet that needs to be fetched
-                  required: true
-                  type: string
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    $ref: "#/definitions/Order"
-                "400":
-                  description: Invalid ID supplied
-                "404":
-                  description: Order not found
-            delete:
-              tags:
-                - store
-              summary: Delete purchase order by ID
-              description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-              operationId: deleteOrder
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: orderId
-                  in: path
-                  description: ID of the order that needs to be deleted
-                  required: true
-                  type: string
-              responses:
-                "400":
-                  description: Invalid ID supplied
-                "404":
-                  description: Order not found
-          /user:
-            post:
-              tags:
-                - user
-              summary: Create user
-              description: This can only be done by the logged in user.
-              operationId: createUser
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - in: body
-                  name: body
-                  description: Created user object
-                  required: false
-                  schema:
-                    $ref: "#/definitions/User"
-              responses:
-                default:
-                  description: successful operation
-          /user/createWithArray:
-            post:
-              tags:
-                - user
-              summary: Creates list of users with given input array
-              description: ""
-              operationId: createUsersWithArrayInput
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - in: body
-                  name: body
-                  description: List of user object
-                  required: false
-                  schema:
-                    type: array
-                    items:
-                      $ref: "#/definitions/User"
-              responses:
-                default:
-                  description: successful operation
-          /user/createWithList:
-            post:
-              tags:
-                - user
-              summary: Creates list of users with given input array
-              description: ""
-              operationId: createUsersWithListInput
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - in: body
-                  name: body
-                  description: List of user object
-                  required: false
-                  schema:
-                    type: array
-                    items:
-                      $ref: "#/definitions/User"
-              responses:
-                default:
-                  description: successful operation
-          /user/login:
-            get:
-              tags:
-                - user
-              summary: Logs user into the system
-              description: ""
-              operationId: loginUser
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: username
-                  in: query
-                  description: The user name for login
-                  required: false
-                  type: string
-                - name: password
-                  in: query
-                  description: The password for login in clear text
-                  required: false
-                  type: string
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    type: string
-                  headers:
-                    X-Rate-Limit:
-                      type: integer
-                      format: int32
-                      description: calls per hour allowed by the user
-                    X-Expires-After:
-                      type: string
-                      format: date-time
-                      description: date in UTC when toekn expires
-                "400":
-                  description: Invalid username/password supplied
-              x-amazon-apigateway-integration:
-                uri: 
-                  Fn::GetAtt: [ "SmsNotifierServiceFunction", "Arn" ]
-                httpMethod: POST
-          /user/logout:
-            get:
-              tags:
-                - user
-              summary: Logs out current logged in user session
-              description: ""
-              operationId: logoutUser
-              produces:
-                - application/xml
-                - application/json
-              parameters: []
-              responses:
-                default:
-                  description: successful operation
-              x-amazon-apigateway-integration:
-                uri: 
-                  Fn::Sub: 
-                    - "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:${FunctionName}/invocations"
-                    - {"FunctionName": !Ref EmailNotifierServiceFunction }
-                httpMethod: POST
-          "/user/{username}":
-            get:
-              tags:
-                - user
-              summary: Get user by user name
-              description: ""
-              operationId: getUserByName
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: username
-                  in: path
-                  description: "The name that needs to be fetched. Use user1 for testing. "
-                  required: true
-                  type: string
-              responses:
-                "200":
-                  description: successful operation
-                  schema:
-                    $ref: "#/definitions/User"
-                "400":
-                  description: Invalid username supplied
-                "404":
-                  description: User not found
-            put:
-              tags:
-                - user
-              summary: Updated user
-              description: This can only be done by the logged in user.
-              operationId: updateUser
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: username
-                  in: path
-                  description: name that need to be deleted
-                  required: true
-                  type: string
-                - in: body
-                  name: body
-                  description: Updated user object
-                  required: false
-                  schema:
-                    $ref: "#/definitions/User"
-              responses:
-                "400":
-                  description: Invalid user supplied
-                "404":
-                  description: User not found
-            delete:
-              tags:
-                - user
-              summary: Delete user
-              description: This can only be done by the logged in user.
-              operationId: deleteUser
-              produces:
-                - application/xml
-                - application/json
-              parameters:
-                - name: username
-                  in: path
-                  description: The name that needs to be deleted
-                  required: true
-                  type: string
-              responses:
-                "400":
-                  description: Invalid username supplied
-                "404":
-                  description: User not found
-        securityDefinitions:
-          petstore_auth:
-            type: oauth2
-            authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
-            flow: implicit
-            scopes:
-              "write:pets": modify pets in your account
-              "read:pets": read your pets
-          api_key:
-            type: apiKey
-            name: api_key
-            in: header
-        definitions:
-          Order:
-            properties:
-              id:
-                type: integer
-                format: int64
-              petId:
-                type: integer
-                format: int64
-              quantity:
-                type: integer
-                format: int32
-              shipDate:
-                type: string
-                format: date-time
-              status:
-                type: string
-                description: Order Status
-                enum:
-                  - placed
-                  - approved
-                  - delivered
-              complete:
-                type: boolean
-            xml:
-              name: Order
-          Category:
-            properties:
-              id:
-                type: integer
-                format: int64
-              name:
-                type: string
-            xml:
-              name: Category
-          User:
-            properties:
-              id:
-                type: integer
-                format: int64
-              username:
-                type: string
-              firstName:
-                type: string
-              lastName:
-                type: string
-              email:
-                type: string
-              password:
-                type: string
-              phone:
-                type: string
-              userStatus:
-                type: integer
-                format: int32
-                description: User Status
-            xml:
-              name: User
-          Tag:
-            properties:
-              id:
-                type: integer
-                format: int64
-              name:
-                type: string
-            xml:
-              name: Tag
-          Pet:
-            required:
-              - name
-              - photoUrls
-            properties:
-              id:
-                type: integer
-                format: int64
-              category:
-                $ref: "#/definitions/Category"
-              name:
-                type: string
-                example: doggie
-              photoUrls:
-                type: array
-                xml:
-                  name: photoUrl
-                  wrapped: true
-                items:
-                  type: string
-              tags:
-                type: array
-                xml:
-                  name: tag
-                  wrapped: true
-                items:
-                  $ref: "#/definitions/Tag"
-              status:
-                type: string
-                description: pet status in the store
-                enum:
-                  - available
-                  - pending
-                  - sold
-            xml:
-              name: Pet
-          ApiResponse:
-            properties:
-              code:
-                type: integer
-                format: int32
-              type:
-                type: string
-              message:
-                type: string
-            xml:
-              name: "##default"
-        externalDocs:
-          description: Find out more about Swagger
-          url: "http://swagger.io"
-  StepFunctionsAPI:
-    Type: AWS::Serverless::Api
-    Properties:
-        StageName: dev
-        DefinitionBody:
-            swagger: "2.0"
-            basePath: /prod
-            info:
-              title: AwsSamExample
-            schemes:
-            - https
-            paths:
-              /:
-                x-amazon-apigateway-any-method:
-                  security:
-                  - test-authorizer: []
-                  produces:
-                  - application/json
-                  responses:
-                    200:
-                      description: 200 response
-                      schema:
-                        $ref: "#/definitions/Empty"
-                  x-amazon-apigateway-integration:
-                    responses:
-                      default:
-                        statusCode: 200
-                    # NOTE: Replace <<region>> and <<account>> fields
-                    uri: arn:aws:apigateway:<<region>>:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations
-
-                    passthroughBehavior: when_no_match
-                    httpMethod: POST
-                    type: aws_proxy
-                options:
-                  consumes:
-                  - application/json
-                  produces:
-                  - application/json
-                  responses:
-                    200:
-                      description: 200 response
-                      schema:
-                        $ref: "#/definitions/Empty"
-                      headers:
-                        Access-Control-Allow-Origin:
-                          type: string
-                        Access-Control-Allow-Methods:
-                          type: string
-                        Access-Control-Allow-Headers:
-                          type: string
-                  x-amazon-apigateway-integration:
-                    type: aws
-                    uri: arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:012345678901:function:HelloWorld/invocations
-                    httpMethod: POST
-                    credentials: arn:aws:iam::012345678901:role/apigateway-invoke-lambda-exec-role
-                    requestTemplates:
-                      application/json: '#set ($root=$input.path(''$'')) { "stage": "$root.name", "user-id":
-                        "$root.key" }'
-                      application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
-                    requestParameters:
-                      integration.request.path.stage: method.request.querystring.version
-                      integration.request.querystring.provider: method.request.querystring.vendor
-                    cacheNamespace: cache namespace
-                    cacheKeyParameters: []
-                    responses:
-                      '302':
-                        statusCode: '302'
-                        responseParameters:
-                          method.response.header.Location: integration.response.body.redirect.url
-                      2\d{2}:
-                        statusCode: '200'
-                        responseParameters:
-                          method.response.header.requestId: integration.response.header.cid
-                        responseTemplates:
-                          application/json: '#set ($root=$input.path(''$'')) { "stage": "$root.name",
-                            "user-id": "$root.key" }'
-                          application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
-                      default:
-                        statusCode: '400'
-                        responseParameters:
-                          method.response.header.test-method-response-header: "'static value'"
-                      x-amazon-apigateway-integration:
-                        uri: !Sub 
-                          - "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:${EmailNotifierServiceFunction}${Test}/invocations"
-                          - { "Test": "ABCD", "OtherTest": !Ref something }
-                        httpMethod: POST
-  StepFunctionsServiceRole:
-      Type: "AWS::IAM::Role"
-      Properties:
-          Path: "/"
-          ManagedPolicyArns:
-            - "arn:aws:iam::aws:policy/AWSStepFunctionsFullAccess"
-          AssumeRolePolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              -
-                Sid: "AllowStepFunctionsServiceToAssumeRole"
-                Effect: "Allow"
-                Action: 
-                  - "sts:AssumeRole"
-                Principal:
-                  Service:
-                    - !Sub "states.${AWS::Region}.amazonaws.com"
-          Policies:
-            -
-              PolicyName: "CallLambdaFunctions"
-              PolicyDocument:
-                Version: '2012-10-17'
-                Statement:
-                  -
-                    Effect: "Allow"
-                    Action:
-                      - "lambda:InvokeFunction"
-                    Resource: 
-                      - !Sub "${SlackNotifierServiceFunction.Arn}"
-                      - !Sub "${EmailNotifierServiceFunction.Arn}"
-                      - !Sub "${SmsNotifierServiceFunction.Arn}"
-
-  StepFunctionStateMachine:
-    Type: "AWS::StepFunctions::StateMachine"
-    Properties:
-      DefinitionString: !Sub |
-        {
-          "Comment": "Demo for API GW->SFN",
-          "StartAt": "NotifierState",
-          "States": {
-            "NotifierState": {
-              "Type" : "Choice",
-              "Choices": [
-                {
-                  "Variable": "$.notifier",
-                  "StringEquals": "Email",
-                  "Next": "EmailNotifier"
-                },
-                {
-                  "Variable": "$.notifier",
-                  "StringEquals": "Sms",
-                  "Next": "SmsNotifier"
-                },
-                {
-                  "Variable": "$.notifier",
-                  "StringEquals": "Slack",
-                  "Next": "SlackNotifier"
-                },
-                {
-                  "Variable": "$.notify",
-                  "StringEquals": "Twilio",
-                  "Next": "NotImplementedYet"
-                }
-              ],
-              "Default": "IgnoreNotification"
-            },
-            "IgnoreNotification": {
-              "Type": "Pass",
-              "Next": "SayHi"
-            },
-            "NotImplementedYet": {
-              "Type": "Fail",
-              "Cause": "Feature not implemented yet!"
-            },
-            "EmailNotifier": {
-              "Type": "Task",
-              "Resource": "${EmailNotifierServiceFunction.Arn}",
-              "Next": "SayHi"
-            },
-            "SlackNotifier": {
-              "Type": "Task",
-              "Resource": "${SlackNotifierServiceFunction.Arn}",
-              "Next": "SayHi"
-            },
-            "SmsNotifier": {
-              "Type": "Task",
-              "Resource": "${SmsNotifierServiceFunction.Arn}",
-              "Next": "SayHi"
-            },
-            "SayHi": {
-              "Type": "Pass",
-              "Result": "Hi!",
-              "End": true
-            }
-          }
-        }
-      RoleArn: !GetAtt StepFunctionsServiceRole.Arn
-  NotifierSNSTopic:
-    Type: AWS::SNS::Topic
-    Properties:
-      Subscription:
-      - Endpoint: !Ref NotificationEmail
-        Protocol: email
-Outputs:
-  NotifyUrl:
-    Description: Notify Workflow URL 
-    Value: !Sub "https://${StepFunctionsAPI}.execute-api.${AWS::Region}.amazonaws.com/dev/notify"
-
-  StepFunctionsStateMachine:
-    Description: Step Functions State Machine ARN
-    Value: !Ref StepFunctionStateMachine
\ No newline at end of file
diff --git a/test/templates/sam-official-samples/api-swagger-plain.yaml b/test/templates/sam-official-samples/api-swagger-plain.yaml
deleted file mode 100644
index cc7f499ce4..0000000000
--- a/test/templates/sam-official-samples/api-swagger-plain.yaml
+++ /dev/null
@@ -1,1111 +0,0 @@
-AWSTemplateFormatVersion: "2010-09-09"
-Description: "Swagger demo for Integration Requests"
-Outputs: 
-  NotifyUrl: 
-    Description: "Notify Workflow URL"
-    Value: "https://${StepFunctionsAPI}.execute-api.${AWS::Region}.amazonaws.com/dev/notify"
-  StepFunctionsStateMachine: 
-    Description: "Step Functions State Machine ARN"
-    Value: StepFunctionStateMachine
-Parameters: 
-  NotificationEmail: 
-    Description: "Email address to subscribe to SNS topic and receive notifications from Notifier Workflow"
-    Type: String
-  SlackToken: 
-    Default: None
-    Description: "Legacy Slack Token (xoxp-ywz) to send messages on channel"
-    Type: String
-Resources: 
-  AnotherRandomAPI: 
-    Properties: 
-      DefinitionBody: 
-        basePath: /v2
-        definitions: 
-          ApiResponse: 
-            properties: 
-              code: 
-                format: int32
-                type: integer
-              message: 
-                type: string
-              type: 
-                type: string
-            xml: 
-              name: "##default"
-          Category: 
-            properties: 
-              id: 
-                format: int64
-                type: integer
-              name: 
-                type: string
-            xml: 
-              name: Category
-          Order: 
-            properties: 
-              complete: 
-                type: boolean
-              id: 
-                format: int64
-                type: integer
-              petId: 
-                format: int64
-                type: integer
-              quantity: 
-                format: int32
-                type: integer
-              shipDate: 
-                format: date-time
-                type: string
-              status: 
-                description: "Order Status"
-                enum: 
-                  - placed
-                  - approved
-                  - delivered
-                type: string
-            xml: 
-              name: Order
-          Pet: 
-            properties: 
-              category: 
-                $ref: "#/definitions/Category"
-              id: 
-                format: int64
-                type: integer
-              name: 
-                example: doggie
-                type: string
-              photoUrls: 
-                items: 
-                  type: string
-                type: array
-                xml: 
-                  name: photoUrl
-                  wrapped: true
-              status: 
-                description: "pet status in the store"
-                enum: 
-                  - available
-                  - pending
-                  - sold
-                type: string
-              tags: 
-                items: 
-                  $ref: "#/definitions/Tag"
-                type: array
-                xml: 
-                  name: tag
-                  wrapped: true
-            required: 
-              - name
-              - photoUrls
-            xml: 
-              name: Pet
-          Tag: 
-            properties: 
-              id: 
-                format: int64
-                type: integer
-              name: 
-                type: string
-            xml: 
-              name: Tag
-          User: 
-            properties: 
-              email: 
-                type: string
-              firstName: 
-                type: string
-              id: 
-                format: int64
-                type: integer
-              lastName: 
-                type: string
-              password: 
-                type: string
-              phone: 
-                type: string
-              userStatus: 
-                description: "User Status"
-                format: int32
-                type: integer
-              username: 
-                type: string
-            xml: 
-              name: User
-        externalDocs: 
-          description: "Find out more about Swagger"
-          url: "http://swagger.io"
-        info: 
-          contact: 
-            email: apiteam@swagger.io
-          description: "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters"
-          license: 
-            name: "Apache 2.0"
-            url: "http://www.apache.org/licenses/LICENSE-2.0.html"
-          termsOfService: "http://swagger.io/terms/"
-          title: "Swagger Petstore YAML"
-          version: "1.0.0"
-        paths: 
-          /pet: 
-            post: 
-              consumes: 
-                - application/json
-                - application/xml
-              description: ""
-              operationId: addPet
-              parameters: 
-                - 
-                  description: "Pet object that needs to be added to the store"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    $ref: "#/definitions/Pet"
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "405": 
-                  description: "Invalid input"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Add a new pet to the store"
-              tags: 
-                - pet
-              x-swagger-router-controller: SampleController
-            put: 
-              consumes: 
-                - application/json
-                - application/xml
-              description: ""
-              operationId: updatePet
-              parameters: 
-                - 
-                  description: "Pet object that needs to be added to the store"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    $ref: "#/definitions/Pet"
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "400": 
-                  description: "Invalid ID supplied"
-                "404": 
-                  description: "Pet not found"
-                "405": 
-                  description: "Validation exception"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Update an existing pet"
-              tags: 
-                - pet
-          /pet/findByStatus: 
-            get: 
-              consumes: 
-                - application/xml
-                - application/json
-                - multipart/form-data
-                - application/x-www-form-urlencoded
-              description: "Multiple status values can be provided with comma seperated strings"
-              operationId: findPetsByStatus
-              parameters: 
-                - 
-                  collectionFormat: multi
-                  default: available
-                  description: "Status values that need to be considered for filter"
-                  enum: 
-                    - available
-                    - pending
-                    - sold
-                  in: query
-                  items: 
-                    type: string
-                  name: status
-                  required: false
-                  type: array
-                - 
-                  collectionFormat: multi
-                  default: available
-                  description: "Status values that need to be considered for filter"
-                  enum: 
-                    - 1234567890123456
-                    - 345
-                    - 678
-                  in: query
-                  items: 
-                    type: long
-                  name: testlong
-                  required: false
-                  type: array
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    items: 
-                      $ref: "#/definitions/Pet"
-                    type: array
-                "400": 
-                  description: "Invalid status value"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Finds Pets by status"
-              tags: 
-                - pet
-          /pet/findByTags: 
-            get: 
-              description: "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing."
-              operationId: findPetsByTags
-              parameters: 
-                - 
-                  collectionFormat: multi
-                  description: "Tags to filter by"
-                  in: query
-                  items: 
-                    type: string
-                  name: tags
-                  required: false
-                  type: array
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    items: 
-                      $ref: "#/definitions/Pet"
-                    type: array
-                "400": 
-                  description: "Invalid tag value"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Finds Pets by tags"
-              tags: 
-                - pet
-          ? "/pet/{petId}"
-          : 
-            delete: 
-              consumes: 
-                - multipart/form-data
-                - application/x-www-form-urlencoded
-              description: ""
-              operationId: deletePet
-              parameters: 
-                - 
-                  description: ""
-                  in: header
-                  name: api_key
-                  required: false
-                  type: string
-                - 
-                  description: "Pet id to delete"
-                  format: int64
-                  in: path
-                  name: petId
-                  required: true
-                  type: integer
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "400": 
-                  description: "Invalid pet value"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Deletes a pet"
-              tags: 
-                - pet
-            get: 
-              consumes: 
-                - application/x-www-form-urlencoded
-              description: "Returns a single pet"
-              operationId: getPetById
-              parameters: 
-                - 
-                  description: "ID of pet to return"
-                  format: int64
-                  in: path
-                  name: petId
-                  required: true
-                  type: integer
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    $ref: "#/definitions/Pet"
-                "400": 
-                  description: "Invalid ID supplied"
-                "404": 
-                  description: "Pet not found"
-              security: 
-                - 
-                  api_key: []
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Find pet by ID"
-              tags: 
-                - pet
-            post: 
-              consumes: 
-                - application/x-www-form-urlencoded
-              description: ""
-              operationId: updatePetWithForm
-              parameters: 
-                - 
-                  description: "ID of pet that needs to be updated"
-                  in: path
-                  name: petId
-                  required: true
-                  type: string
-                - 
-                  description: "Updated name of the pet"
-                  in: formData
-                  name: name
-                  required: false
-                  type: string
-                - 
-                  description: "Updated status of the pet"
-                  in: formData
-                  name: status
-                  required: false
-                  type: string
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "405": 
-                  description: "Invalid input"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "Updates a pet in the store with form data"
-              tags: 
-                - pet
-          ? "/pet/{petId}/uploadImage"
-          : 
-            post: 
-              consumes: 
-                - multipart/form-data
-              description: ""
-              operationId: uploadFile
-              parameters: 
-                - 
-                  description: "ID of pet to update"
-                  format: int64
-                  in: path
-                  name: petId
-                  required: true
-                  type: integer
-                - 
-                  description: "Additional data to pass to server"
-                  in: formData
-                  name: additionalMetadata
-                  required: false
-                  type: string
-                - 
-                  description: "file to upload"
-                  in: formData
-                  name: file
-                  required: false
-                  type: file
-              produces: 
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    $ref: "#/definitions/ApiResponse"
-              security: 
-                - 
-                  petstore_auth: 
-                    - "write:pets"
-                    - "read:pets"
-              summary: "uploads an image"
-              tags: 
-                - pet
-              x-swagger-router-controller: SampleController
-          /store/inventory: 
-            get: 
-              description: "Returns a map of status codes to quantities"
-              operationId: getInventory
-              parameters: []
-              produces: 
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    additionalProperties: 
-                      format: int32
-                      type: integer
-                    type: object
-              security: 
-                - 
-                  api_key: []
-              summary: "Returns pet inventories by status"
-              tags: 
-                - store
-          /store/order: 
-            post: 
-              description: ""
-              operationId: placeOrder
-              parameters: 
-                - 
-                  description: "order placed for purchasing the pet"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    $ref: "#/definitions/Order"
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    $ref: "#/definitions/Order"
-                "400": 
-                  description: "Invalid Order"
-              summary: "Place an order for a pet"
-              tags: 
-                - store
-          ? "/store/order/{orderId}"
-          : 
-            delete: 
-              description: "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors"
-              operationId: deleteOrder
-              parameters: 
-                - 
-                  description: "ID of the order that needs to be deleted"
-                  in: path
-                  name: orderId
-                  required: true
-                  type: string
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "400": 
-                  description: "Invalid ID supplied"
-                "404": 
-                  description: "Order not found"
-              summary: "Delete purchase order by ID"
-              tags: 
-                - store
-            get: 
-              description: "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
-              operationId: getOrderById
-              parameters: 
-                - 
-                  description: "ID of pet that needs to be fetched"
-                  in: path
-                  name: orderId
-                  required: true
-                  type: string
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    $ref: "#/definitions/Order"
-                "400": 
-                  description: "Invalid ID supplied"
-                "404": 
-                  description: "Order not found"
-              summary: "Find purchase order by ID"
-              tags: 
-                - store
-          /user: 
-            post: 
-              description: "This can only be done by the logged in user."
-              operationId: createUser
-              parameters: 
-                - 
-                  description: "Created user object"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    $ref: "#/definitions/User"
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                default: 
-                  description: "successful operation"
-              summary: "Create user"
-              tags: 
-                - user
-          /user/createWithArray: 
-            post: 
-              description: ""
-              operationId: createUsersWithArrayInput
-              parameters: 
-                - 
-                  description: "List of user object"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    items: 
-                      $ref: "#/definitions/User"
-                    type: array
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                default: 
-                  description: "successful operation"
-              summary: "Creates list of users with given input array"
-              tags: 
-                - user
-          /user/createWithList: 
-            post: 
-              description: ""
-              operationId: createUsersWithListInput
-              parameters: 
-                - 
-                  description: "List of user object"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    items: 
-                      $ref: "#/definitions/User"
-                    type: array
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                default: 
-                  description: "successful operation"
-              summary: "Creates list of users with given input array"
-              tags: 
-                - user
-          /user/login: 
-            get: 
-              description: ""
-              operationId: loginUser
-              parameters: 
-                - 
-                  description: "The user name for login"
-                  in: query
-                  name: username
-                  required: false
-                  type: string
-                - 
-                  description: "The password for login in clear text"
-                  in: query
-                  name: password
-                  required: false
-                  type: string
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  headers: 
-                    X-Expires-After: 
-                      description: "date in UTC when toekn expires"
-                      format: date-time
-                      type: string
-                    X-Rate-Limit: 
-                      description: "calls per hour allowed by the user"
-                      format: int32
-                      type: integer
-                  schema: 
-                    type: string
-                "400": 
-                  description: "Invalid username/password supplied"
-              summary: "Logs user into the system"
-              tags: 
-                - user
-          /user/logout: 
-            get: 
-              description: ""
-              operationId: logoutUser
-              parameters: []
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                default: 
-                  description: "successful operation"
-              summary: "Logs out current logged in user session"
-              tags: 
-                - user
-          ? "/user/{username}"
-          : 
-            delete: 
-              description: "This can only be done by the logged in user."
-              operationId: deleteUser
-              parameters: 
-                - 
-                  description: "The name that needs to be deleted"
-                  in: path
-                  name: username
-                  required: true
-                  type: string
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "400": 
-                  description: "Invalid username supplied"
-                "404": 
-                  description: "User not found"
-              summary: "Delete user"
-              tags: 
-                - user
-            get: 
-              description: ""
-              operationId: getUserByName
-              parameters: 
-                - 
-                  description: "The name that needs to be fetched. Use user1 for testing. "
-                  in: path
-                  name: username
-                  required: true
-                  type: string
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "200": 
-                  description: "successful operation"
-                  schema: 
-                    $ref: "#/definitions/User"
-                "400": 
-                  description: "Invalid username supplied"
-                "404": 
-                  description: "User not found"
-              summary: "Get user by user name"
-              tags: 
-                - user
-            put: 
-              description: "This can only be done by the logged in user."
-              operationId: updateUser
-              parameters: 
-                - 
-                  description: "name that need to be deleted"
-                  in: path
-                  name: username
-                  required: true
-                  type: string
-                - 
-                  description: "Updated user object"
-                  in: body
-                  name: body
-                  required: false
-                  schema: 
-                    $ref: "#/definitions/User"
-              produces: 
-                - application/xml
-                - application/json
-              responses: 
-                "400": 
-                  description: "Invalid user supplied"
-                "404": 
-                  description: "User not found"
-              summary: "Updated user"
-              tags: 
-                - user
-        schemes: 
-          - http
-        securityDefinitions: 
-          api_key: 
-            in: header
-            name: api_key
-            type: apiKey
-          petstore_auth: 
-            authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
-            flow: implicit
-            scopes: 
-              ? "read:pets"
-              : "read your pets"
-              ? "write:pets"
-              : "modify pets in your account"
-            type: oauth2
-        swagger: "2.0"
-        tags: 
-          - 
-            description: "Everything about your Pets"
-            externalDocs: 
-              description: "Find out more"
-              url: "http://swagger.io"
-            name: pet
-          - 
-            description: "Operations about user"
-            name: store
-          - 
-            description: "Access to Petstore orders"
-            externalDocs: 
-              description: "Find out more about our store"
-              url: "http://swagger.io"
-            name: user
-      StageName: prod
-    Type: "AWS::Serverless::Api"
-  ApiGatewayStepFunctionsRole: 
-    Properties: 
-      AssumeRolePolicyDocument: 
-        Statement: 
-          - 
-            Action: 
-              - "sts:AssumeRole"
-            Effect: Allow
-            Principal: 
-              Service: 
-                - apigateway.amazonaws.com
-            Sid: AllowApiGatewayServiceToAssumeRole
-        Version: "2012-10-17"
-      Path: /
-      Policies: 
-        - 
-          PolicyDocument: 
-            Statement: 
-              - 
-                Action: 
-                  - "states:StartExecution"
-                Effect: Allow
-                Resource: 
-                  - StepFunctionStateMachine
-            Version: "2012-10-17"
-          PolicyName: CallStepFunctions
-    Type: "AWS::IAM::Role"
-  EmailNotifierServiceFunction: 
-    Properties: 
-      CodeUri: ../code/email/
-      Environment: 
-        Variables: 
-          NOTIFIER_TOPIC: NotifierSNSTopic
-      Handler: email_sns.lambda_handler
-      Role: SnsNotifierServiceRole.Arn
-      Runtime: python2.7
-    Type: "AWS::Serverless::Function"
-  NotifierSNSTopic: 
-    Properties: 
-      Subscription: 
-        - 
-          Endpoint: NotificationEmail
-          Protocol: email
-    Type: "AWS::SNS::Topic"
-  SlackNotifierServiceFunction: 
-    Properties: 
-      CodeUri: ../code/slack.zip
-      Environment: 
-        Variables: 
-          SLACK_TOKEN: SlackToken
-      Handler: slack.lambda_handler
-      Runtime: python2.7
-    Type: "AWS::Serverless::Function"
-  SmsNotifierServiceFunction: 
-    Properties: 
-      CodeUri: ../code/sms/
-      Environment: 
-        Variables: 
-          NOTIFIER_TOPIC: NotifierSNSTopic
-      Handler: sms_sns.lambda_handler
-      Role: SnsNotifierServiceRole.Arn
-      Runtime: python2.7
-    Type: "AWS::Serverless::Function"
-  SnsNotifierServiceRole: 
-    Properties: 
-      AssumeRolePolicyDocument: 
-        Statement: 
-          - 
-            Action: 
-              - "sts:AssumeRole"
-            Effect: Allow
-            Principal: 
-              Service: 
-                - lambda.amazonaws.com
-            Sid: AllowLambdaServiceToAssumeRole
-        Version: "2012-10-17"
-      ManagedPolicyArns: 
-        - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-      Path: /
-      Policies: 
-        - 
-          PolicyDocument: 
-            Statement: 
-              - 
-                Action: 
-                  - "sns:Publish"
-                Effect: Allow
-                Resource: 
-                  - NotifierSNSTopic
-                  - "*"
-            Version: "2012-10-17"
-          PolicyName: PublishSnsTopic
-    Type: "AWS::IAM::Role"
-  StepFunctionStateMachine: 
-    Properties: 
-      DefinitionString: |
-          {
-              "Comment": "Demo for API GW->SFN",
-              "StartAt": "NotifierState",
-              "States": {
-                "NotifierState": {
-                  "Type" : "Choice",
-                  "Choices": [
-                    {
-                      "Variable": "$.notifier",
-                      "StringEquals": "Email",
-                      "Next": "EmailNotifier"
-                    },
-                    {
-                      "Variable": "$.notifier",
-                      "StringEquals": "Sms",
-                      "Next": "SmsNotifier"
-                    },
-                    {
-                      "Variable": "$.notifier",
-                      "StringEquals": "Slack",
-                      "Next": "SlackNotifier"
-                    },
-                    {
-                      "Variable": "$.notify",
-                      "StringEquals": "Twilio",
-                      "Next": "NotImplementedYet"
-                    }
-                  ],
-                  "Default": "IgnoreNotification"
-                },
-                "IgnoreNotification": {
-                  "Type": "Pass",
-                  "Next": "SayHi"
-                },
-                "NotImplementedYet": {
-                  "Type": "Fail",
-                  "Cause": "Feature not implemented yet!"
-                },
-                "EmailNotifier": {
-                  "Type": "Task",
-                  "Resource": "${EmailNotifierServiceFunction.Arn}",
-                  "Next": "SayHi"
-                },
-                "SlackNotifier": {
-                  "Type": "Task",
-                  "Resource": "${SlackNotifierServiceFunction.Arn}",
-                  "Next": "SayHi"
-                },
-                "SmsNotifier": {
-                  "Type": "Task",
-                  "Resource": "${SmsNotifierServiceFunction.Arn}",
-                  "Next": "SayHi"
-                },
-                "SayHi": {
-                  "Type": "Pass",
-                  "Result": "Hi!",
-                  "End": true
-                }
-              }
-          }
-      RoleArn: StepFunctionsServiceRole.Arn
-    Type: "AWS::StepFunctions::StateMachine"
-  StepFunctionsAPI: 
-    Properties: 
-      DefinitionBody: 
-        basePath: /prod
-        definitions: 
-          Empty: 
-            title: "Empty Schema"
-            type: object
-        info: 
-          title: AwsSamExample
-        paths: 
-          /: 
-            options: 
-              consumes: 
-                - application/json
-              produces: 
-                - application/json
-              responses: 
-                200: 
-                  description: "200 response"
-                  headers: 
-                    Access-Control-Allow-Headers: 
-                      type: string
-                    Access-Control-Allow-Methods: 
-                      type: string
-                    Access-Control-Allow-Origin: 
-                      type: string
-                  schema: 
-                    $ref: "#/definitions/Empty"
-              x-amazon-apigateway-integration: 
-                cacheKeyParameters: []
-                cacheNamespace: "cache namespace"
-                credentials: "arn:aws:iam::012345678901:role/apigateway-invoke-lambda-exec-role"
-                httpMethod: POST
-                requestParameters: 
-                  integration.request.path.stage: method.request.querystring.version
-                  integration.request.querystring.provider: method.request.querystring.vendor
-                requestTemplates: 
-                  application/json: "#set ($root=$input.path('$')) { \"stage\": \"$root.name\", \"user-id\": \"$root.key\" }"
-                  application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
-                responses: 
-                  "2\\d{2}": 
-                    responseParameters: 
-                      method.response.header.requestId: integration.response.header.cid
-                    responseTemplates: 
-                      application/json: "#set ($root=$input.path('$')) { \"stage\": \"$root.name\", \"user-id\": \"$root.key\" }"
-                      application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
-                    statusCode: "200"
-                  "302": 
-                    responseParameters: 
-                      method.response.header.Location: integration.response.body.redirect.url
-                    statusCode: "302"
-                  default: 
-                    responseParameters: 
-                      method.response.header.test-method-response-header: "'static value'"
-                    statusCode: "400"
-                type: aws
-                uri: "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:012345678901:function:HelloWorld/invocations"
-            x-amazon-apigateway-any-method: 
-              produces: 
-                - application/json
-              responses: 
-                200: 
-                  description: "200 response"
-                  schema: 
-                    $ref: "#/definitions/Empty"
-              security: 
-                - 
-                  test-authorizer: []
-              x-amazon-apigateway-integration: 
-                httpMethod: POST
-                passthroughBehavior: when_no_match
-                responses: 
-                  default: 
-                    statusCode: 200
-                type: aws_proxy
-                uri: EmailNotifierServiceFunction.Arn
-          "/{proxy+}":
-            options: 
-              consumes: 
-                - application/json
-              produces: 
-                - application/json
-              responses: 
-                200: 
-                  description: "200 response"
-                  headers: 
-                    Access-Control-Allow-Headers: 
-                      type: string
-                    Access-Control-Allow-Methods: 
-                      type: string
-                    Access-Control-Allow-Origin: 
-                      type: string
-                  schema: 
-                    $ref: "#/definitions/Empty"
-              x-amazon-apigateway-integration: 
-                passthroughBehavior: when_no_match
-                requestTemplates: 
-                  application/json: "{\"statusCode\": 200}"
-                responses: 
-                  default: 
-                    responseParameters: 
-                      method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
-                      method.response.header.Access-Control-Allow-Methods: "'DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT'"
-                      method.response.header.Access-Control-Allow-Origin: "'*'"
-                    statusCode: 200
-                type: mock
-            x-amazon-apigateway-any-method: 
-              parameters: 
-                - 
-                  in: path
-                  name: proxy
-                  required: true
-                  type: string
-              produces: 
-                - application/json
-              responses: {}
-              x-amazon-apigateway-auth: 
-                type: aws_iam
-              x-amazon-apigateway-integration: 
-                httpMethod: POST
-                type: aws_proxy
-                uri: "arn:aws:apigateway:<<region>>:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations"
-        schemes: 
-          - https
-        securityDefinitions: 
-          test-authorizer: 
-            in: header
-            name: Authorization
-            type: apiKey
-            x-amazon-apigateway-authorizer: 
-              authorizerCredentials: "arn:aws:iam::account-id:role"
-              authorizerResultTtlInSeconds: 60
-              authorizerUri: "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:account-id:function:function-name/invocations"
-              identityValidationExpression: "^x-[a-z]+"
-              type: token
-            x-amazon-apigateway-authtype: oauth2
-        swagger: "2.0"
-      StageName: dev
-    Type: "AWS::Serverless::Api"
-  StepFunctionsServiceRole: 
-    Properties: 
-      AssumeRolePolicyDocument: 
-        Statement: 
-          - 
-            Action: 
-              - "sts:AssumeRole"
-            Effect: Allow
-            Principal: 
-              Service: 
-                - "states.${AWS::Region}.amazonaws.com"
-            Sid: AllowStepFunctionsServiceToAssumeRole
-        Version: "2012-10-17"
-      ManagedPolicyArns: 
-        - "arn:aws:iam::aws:policy/AWSStepFunctionsFullAccess"
-      Path: /
-      Policies: 
-        - 
-          PolicyDocument: 
-            Statement: 
-              - 
-                Action: 
-                  - "lambda:InvokeFunction"
-                Effect: Allow
-                Resource: 
-                  - "${SlackNotifierServiceFunction.Arn}"
-                  - "${EmailNotifierServiceFunction.Arn}"
-                  - "${SmsNotifierServiceFunction.Arn}"
-            Version: "2012-10-17"
-          PolicyName: CallLambdaFunctions
-    Type: "AWS::IAM::Role"
-Transform: "AWS::Serverless-2016-10-31"
diff --git a/test/templates/sam-official-samples/api_backend/index.js b/test/templates/sam-official-samples/api_backend/index.js
deleted file mode 100644
index 5420b07b56..0000000000
--- a/test/templates/sam-official-samples/api_backend/index.js
+++ /dev/null
@@ -1,87 +0,0 @@
-'use strict';
-
-
-const AWS = require('aws-sdk');
-const dynamo = new AWS.DynamoDB.DocumentClient();
-
-const tableName = process.env.TABLE_NAME;
-
-const createResponse = (statusCode, body) => {
-    
-    return {
-        statusCode: statusCode,
-        body: body
-    }
-};
-
-exports.get = (event, context, callback) => {
-    
-    let params = {
-        TableName: tableName,
-        Key: {
-            id: event.pathParameters.resourceId
-        }
-    };
-    
-    let dbGet = (params) => { return dynamo.get(params).promise() };
-    
-    dbGet(params).then( (data) => {
-        if (!data.Item) {
-            callback(null, createResponse(404, "ITEM NOT FOUND"));
-            return;
-        }
-        console.log(`RETRIEVED ITEM SUCCESSFULLY WITH doc = ${data.Item.doc}`);
-        callback(null, createResponse(200, data.Item.doc));
-    }).catch( (err) => { 
-        console.log(`GET ITEM FAILED FOR doc = ${data.Item.doc}, WITH ERROR: ${err}`);
-        callback(null, createResponse(500, err));
-    });
-};
-
-exports.put = (event, context, callback) => {
-    
-    let item = {
-        id: event.pathParameters.resourceId,
-        doc: event.body
-    };
-
-    let params = {
-        TableName: tableName,
-        Item: item
-    };
-    
-    let dbPut = (params) => { return dynamo.put(params).promise() };
-    
-    dbPut(params).then( (data) => {
-        console.log(`PUT ITEM SUCCEEDED WITH doc = ${item.doc}`);
-        callback(null, createResponse(200, null));
-    }).catch( (err) => { 
-        console.log(`PUT ITEM FAILED FOR doc = ${item.doc}, WITH ERROR: ${err}`);
-        callback(null, createResponse(500, err)); 
-    });
-};
-
-exports.delete = (event, context, callback) => {
-    
-    let params = {
-        TableName: tableName,
-        Key: {
-            id: event.pathParameters.resourceId
-        },
-        ReturnValues: 'ALL_OLD'
-    };
-    
-    let dbDelete = (params) => { return dynamo.delete(params).promise() };
-    
-    dbDelete(params).then( (data) => {
-        if (!data.Attributes) {
-            callback(null, createResponse(404, "ITEM NOT FOUND FOR DELETION"));
-            return;
-        }
-        console.log(`DELETED ITEM SUCCESSFULLY WITH id = ${event.pathParameters.resourceId}`);
-        callback(null, createResponse(200, null));
-    }).catch( (err) => { 
-        console.log(`DELETE ITEM FAILED FOR id = ${event.pathParameters.resourceId}, WITH ERROR: ${err}`);
-        callback(null, createResponse(500, err));
-    });
-};
diff --git a/test/templates/sam-official-samples/api_backend/template.yaml b/test/templates/sam-official-samples/api_backend/template.yaml
deleted file mode 100644
index 5b2710a255..0000000000
--- a/test/templates/sam-official-samples/api_backend/template.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Simple CRUD webservice. State is stored in a SimpleTable (DynamoDB) resource.
-Resources:
-  GetFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.get
-      Runtime: nodejs4.3
-      CodeUri: s3://<bucket>/api_backend.zip
-      Policies: AmazonDynamoDBReadOnlyAccess
-      Environment:
-        Variables:
-          TABLE_NAME: !Ref Table
-      Events:
-        GetResource:
-          Type: Api
-          Properties:
-            Path: /resource/{resourceId}
-            Method: get
-
-  PutFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.put
-      Runtime: nodejs4.3
-      CodeUri: s3://<bucket>/api_backend.zip
-      Policies: AmazonDynamoDBFullAccess
-      Environment:
-        Variables:
-          TABLE_NAME: !Ref Table
-      Events:
-        PutResource:
-          Type: Api
-          Properties:
-            Path: /resource/{resourceId}
-            Method: put
-
-  DeleteFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.delete
-      Runtime: nodejs4.3
-      CodeUri: s3://<bucket>/api_backend.zip
-      Policies: AmazonDynamoDBFullAccess
-      Environment:
-        Variables:
-          TABLE_NAME: !Ref Table
-      Events:
-        DeleteResource:
-          Type: Api
-          Properties:
-            Path: /resource/{resourceId}
-            Method: delete
\ No newline at end of file
diff --git a/test/templates/sam-official-samples/api_swagger_cors/index.js b/test/templates/sam-official-samples/api_swagger_cors/index.js
deleted file mode 100644
index 03d56b3116..0000000000
--- a/test/templates/sam-official-samples/api_swagger_cors/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-exports.handler = function(event, context, callback) {
-
-    callback(null, {
-        statusCode: '200',
-        body: "Hello world"
-    });
-
-}
diff --git a/test/templates/sam-official-samples/api_swagger_cors/swagger.yaml b/test/templates/sam-official-samples/api_swagger_cors/swagger.yaml
deleted file mode 100644
index 70546630a9..0000000000
--- a/test/templates/sam-official-samples/api_swagger_cors/swagger.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
----
-swagger: 2.0
-basePath: /prod
-info:
-  title: AwsSamExample
-schemes:
-- https
-paths:
-  /:
-    x-amazon-apigateway-any-method:
-      produces:
-      - application/json
-      responses:
-        200:
-          description: 200 response
-          schema:
-            $ref: "#/definitions/Empty"
-      x-amazon-apigateway-integration:
-        responses:
-          default:
-            statusCode: 200
-        # NOTE: Replace <<region>> and <<account>> fields
-        uri: arn:aws:apigateway:<<region>>:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations
-
-        passthroughBehavior: when_no_match
-        httpMethod: POST
-        type: aws_proxy
-    options:
-      consumes:
-      - application/json
-      produces:
-      - application/json
-      responses:
-        200:
-          description: 200 response
-          schema:
-            $ref: "#/definitions/Empty"
-          headers:
-            Access-Control-Allow-Origin:
-              type: string
-            Access-Control-Allow-Methods:
-              type: string
-            Access-Control-Allow-Headers:
-              type: string
-      x-amazon-apigateway-integration:
-        responses:
-          default:
-            statusCode: 200
-            responseParameters:
-              method.response.header.Access-Control-Allow-Methods: "'DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT'"
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-        passthroughBehavior: when_no_match
-        requestTemplates:
-          application/json: "{\"statusCode\": 200}"
-        type: mock
-  /{proxy+}:
-    x-amazon-apigateway-any-method:
-      x-amazon-apigateway-auth:
-        type: aws_iam
-      produces:
-      - application/json
-      parameters:
-      - name: proxy
-        in: path
-        required: true
-        type: string
-      responses: {}
-      x-amazon-apigateway-integration:
-        uri: arn:aws:apigateway:<<region>>:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations
-        httpMethod: POST
-        type: aws_proxy
-    options:
-      consumes:
-      - application/json
-      produces:
-      - application/json
-      responses:
-        200:
-          description: 200 response
-          schema:
-            $ref: "#/definitions/Empty"
-          headers:
-            Access-Control-Allow-Origin:
-              type: string
-            Access-Control-Allow-Methods:
-              type: string
-            Access-Control-Allow-Headers:
-              type: string
-      x-amazon-apigateway-integration:
-        responses:
-          default:
-            statusCode: 200
-            responseParameters:
-              method.response.header.Access-Control-Allow-Methods: "'DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT'"
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-        passthroughBehavior: when_no_match
-        requestTemplates:
-          application/json: "{\"statusCode\": 200}"
-        type: mock
-definitions:
-  Empty:
-    type: object
-    title: Empty Schema
diff --git a/test/templates/sam-official-samples/api_swagger_cors/template.yaml b/test/templates/sam-official-samples/api_swagger_cors/template.yaml
deleted file mode 100644
index d7e8450561..0000000000
--- a/test/templates/sam-official-samples/api_swagger_cors/template.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: AWS SAM template with API defined in an external Swagger file along with Lambda integrations and CORS configurations
-Resources:
-  ApiGatewayApi:
-    Type: AWS::Serverless::Api
-    Properties:
-      DefinitionUri: s3://<bucket>/swagger.yaml
-      StageName: Prod
-      Variables:
-        # NOTE: Before using this template, replace the <<region>> and <<account>> fields
-        #       in Lambda integration URI in the swagger file to region and accountId 
-        #       you are deploying to
-        LambdaFunctionName: !Ref LambdaFunction
-
-  LambdaFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      CodeUri: s3://<bucket>/api_swagger_cors.zip
-      Handler: index.handler
-      Runtime: nodejs4.3
-      Events:
-        ProxyApiRoot:
-          Type: Api
-          Properties:
-            RestApiId: !Ref ApiGatewayApi
-            Path: /
-            Method: ANY
-        ProxyApiGreedy:
-          Type: Api
-          Properties:
-            RestApiId: !Ref ApiGatewayApi
-            Path: /{proxy+}
-            Method: ANY
-
-Outputs:
-  ApiUrl:
-    Description: URL of your API endpoint
-    Value: !Join
-      - ''
-      - - https://
-        - !Ref ApiGatewayApi
-        - '.execute-api.'
-        - !Ref 'AWS::Region'
-        - '.amazonaws.com/Prod'
diff --git a/test/templates/sam-official-samples/codestar-node4.3.yaml b/test/templates/sam-official-samples/codestar-node4.3.yaml
deleted file mode 100644
index f28f69f5d6..0000000000
--- a/test/templates/sam-official-samples/codestar-node4.3.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Transform:
-- AWS::Serverless-2016-10-31
-- AWS::CodeStar
-
-Parameters:
-  ProjectId:
-    Type: String
-    Description: AWS CodeStar projectID used to associate new resources to team members
-
-Resources:
-  GetHelloWorld:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.get
-      Runtime: nodejs4.3
-      Role:
-        Fn::ImportValue:
-          !Join ['-', [!Ref 'ProjectId', !Ref 'AWS::Region', 'LambdaTrustRole']]
-      Events:
-        GetEvent:
-          Type: Api
-          Properties:
-            Path: /
-            Method: get
\ No newline at end of file
diff --git a/test/templates/sam-official-samples/encryption_proxy/README.MD b/test/templates/sam-official-samples/encryption_proxy/README.MD
deleted file mode 100644
index f439e69bd6..0000000000
--- a/test/templates/sam-official-samples/encryption_proxy/README.MD
+++ /dev/null
@@ -1,48 +0,0 @@
-### Encryption/Decryption Proxy
-
-This template creates the following resources:
-
-* 2 Lambda functions (Encryption, Decryption)
-    - SAM takes care of creating 2 stages API Gateway {Stage,Prod} that sits on top
-* IAM Role for each function
-* KMS Key and KMS Decrypt/Encrypt permissions for each IAM Role separately
-    - KMS Key ID is then passed to Encryption Lambda via Env vars
-
-
-#### Encrypt Action
-
-* Consumes up to 4KB of data (string, json blob, etc.)
-* Returns encrypted data via JSON blob as follows
-
-```javascript
-{
-    "data": "base64_encrypted_blob"
-}
-```
-
-**Encrypting data via cURL**
-
-```bash
-encryptURL=$(aws cloudformation describe-stacks --stack-name encryption-proxy --query 'Stacks[].Outputs[?OutputKey==`EncryptURL`].OutputValue' --output text)
-
-curl -H 'Content-Type: application/json' -X POST -d 'Here it is my super secret data...' ${encryptURL}
-```
-
-#### Decrypt Action
-
-* Consumes JSON blob received out of Encryption Action
-* Returns decrypted data via JSON blob as follows
-
-```javascript
-{
-    "data": "decrypted_data"
-}
-```
-
-**Decrypting data via cURL**
-
-```bash
-decryptURL=$(aws cloudformation describe-stacks --stack-name encryption-proxy --query 'Stacks[].Outputs[?OutputKey==`DecryptURL`].OutputValue' --output text)
-
-curl -H 'Content-Type: application/json' -X POST -d '{ "data": "AQECAHjgf/RDFTAO0+ief3VXaJRnnKbyaaEsVhkmYxTcbiNhcgAAAHIwcAYJKoZIhvcNAQcGoGMw\nYQIBADBcBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDBX7iv8CwG1gr2Hc4wIBEIAvS1cXraMW\n3PU96z4AACGj7Wuo007HwWjtK/quSi3FKyYFvkJ10YhDOEvzxOD7Ntw=\n" }' ${decryptURL}
-```
diff --git a/test/templates/sam-official-samples/encryption_proxy/decryption.py b/test/templates/sam-official-samples/encryption_proxy/decryption.py
deleted file mode 100644
index ac04a86fa5..0000000000
--- a/test/templates/sam-official-samples/encryption_proxy/decryption.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import boto3
-import json
-import base64
-
-kms = boto3.client('kms')
-bad_request = {
-    'statusCode': 400,
-    'headers': {
-        'Content-Type': 'application/json'
-    },
-    'body': json.dumps({'error': 'Invalid argument'})
-}
-
-
-def decrypt(message):
-    '''decrypt leverages KMS decrypt and base64-encode decrypted blob
-
-        More info on KMS decrypt API:
-        https://docs.aws.amazon.com/kms/latest/APIReference/API_decrypt.html
-    '''
-    try:
-        ret = kms.decrypt(
-            CiphertextBlob=base64.decodestring(message))
-        decrypted_data = ret.get('Plaintext')
-    except Exception as e:
-        # returns http 500 back to user and log error details in Cloudwatch Logs
-        raise Exception("Unable to decrypt data: ", e)
-
-    return decrypted_data
-
-
-def post(event, context):
-
-    try:
-        payload = json.loads(event['body'])
-        message = payload['data']
-    except (KeyError, TypeError, ValueError):
-        return bad_request
-
-    decrypted_message = decrypt(message)
-    response = {'data': decrypted_message}
-
-    return {
-        'statusCode': 200,
-        'headers': {
-            'Content-Type': 'application/json'
-        },
-        'body': json.dumps(response)
-    }
diff --git a/test/templates/sam-official-samples/encryption_proxy/encryption.py b/test/templates/sam-official-samples/encryption_proxy/encryption.py
deleted file mode 100644
index 72598f3c47..0000000000
--- a/test/templates/sam-official-samples/encryption_proxy/encryption.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import boto3
-import json
-import base64
-import os
-
-kms = boto3.client('kms')
-bad_request = {
-    'statusCode': 400,
-    'headers': {
-        'Content-Type': 'application/json'
-    },
-    'body': json.dumps({'error': 'Invalid argument'})
-}
-
-
-def encrypt(key, message):
-    '''encrypt leverages KMS encrypt and base64-encode encrypted blob
-
-        More info on KMS encrypt API:
-        https://docs.aws.amazon.com/kms/latest/APIReference/API_encrypt.html
-    '''
-    try:
-        ret = kms.encrypt(KeyId=key, Plaintext=message)
-        encrypted_data = base64.encodestring(ret.get('CiphertextBlob'))
-    except Exception as e:
-        # returns http 500 back to user and log error details in Cloudwatch Logs
-        raise Exception("Unable to encrypt data: ", e)
-
-    return encrypted_data
-
-
-def post(event, context):
-
-    try:
-        key_id = os.environ['keyId']
-        message = event['body']
-        if message is None:
-            raise ValueError
-    except KeyError:
-        raise Exception("KMS Key ID not found.")
-    except ValueError:
-        return bad_request
-
-    encrypted_message = encrypt(key_id, message)
-    response = {'data': encrypted_message}
-
-    return {
-        'statusCode': 200,
-        'headers': {
-            'Content-Type': 'application/json'
-        },
-        'body': json.dumps(response)
-    }
diff --git a/test/templates/sam-official-samples/encryption_proxy/template.yaml b/test/templates/sam-official-samples/encryption_proxy/template.yaml
deleted file mode 100644
index dc7bd9c05c..0000000000
--- a/test/templates/sam-official-samples/encryption_proxy/template.yaml
+++ /dev/null
@@ -1,129 +0,0 @@
-AWSTemplateFormatVersion: "2010-09-09"
-Description: |
-      This SAM example creates the following resources:
-      
-        Encryption Proxy: Comprised of Encryption and Decryption Lambda functions + IAM Roles
-        KMS Key: KMS Key and encrypt/decrypt permission for each IAM Role separately
-      
-      Last Modified: 22nd November 2016 Author: Heitor Lessa <lessa@amazon.com>
-Outputs: 
-  DecryptFunction: 
-    Description: "Decryption Lambda Function ARN"
-    Value: DecryptionFunction.Arn
-  DecryptURL: 
-    Description: "Decrypt endpoint URL for Stage environment"
-    Value: "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Stage/decrypt"
-  EncryptFunction: 
-    Description: "Encryption Lambda Function ARN"
-    Value: EncryptionFunction.Arn
-  EncryptURL: 
-    Description: "Encrypt endpoint URL for Stage environment"
-    Value: "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Stage/encrypt"
-Resources: 
-  EncryptionDecryptionKey: 
-    Properties: 
-      Description: "Encryption and Decryption key for Lambda"
-      KeyPolicy: 
-        Id: LambdaEncDec
-        Statement: 
-          - 
-            Action: 
-              - "kms:Create*"
-              - "kms:Describe*"
-              - "kms:Enable*"
-              - "kms:List*"
-              - "kms:Put*"
-              - "kms:Update*"
-              - "kms:Revoke*"
-              - "kms:Disable*"
-              - "kms:Get*"
-              - "kms:Delete*"
-              - "kms:ScheduleKeyDeletion"
-              - "kms:CancelKeyDeletion"
-            Effect: Allow
-            Principal: 
-              AWS: "AWS::AccountId"
-            Resource: "*"
-            Sid: "Allow administration of the key"
-          - 
-            Action: 
-              - "kms:Encrypt"
-            Effect: Allow
-            Principal: 
-              AWS: EncryptionServiceIAMRole.Arn
-            Resource: "*"
-            Sid: "Allow Encryption Service to use this key"
-          - 
-            Action: 
-              - "kms:Decrypt"
-            Effect: Allow
-            Principal: 
-              AWS: DecryptionServiceIAMRole.Arn
-            Resource: "*"
-            Sid: "Allow Decryption Service to use this key"
-        Version: "2012-10-17"
-    Type: "AWS::KMS::Key"
-  EncryptionServiceIAMRole: 
-    DecryptionFunction: 
-      Properties: 
-        CodeUri: "s3://<bucket>/encryption_proxy.zip"
-        Events: 
-          decryptAction: 
-            Properties: 
-              Method: post
-              Path: /decrypt
-            Type: Api
-        Handler: decryption.post
-        Role: DecryptionServiceIAMRole.Arn
-        Runtime: python2.7
-      Type: "AWS::Serverless::Function"
-    DecryptionServiceIAMRole: 
-      Properties: 
-        AssumeRolePolicyDocument: 
-          Statement: 
-            - 
-              Action: 
-                - "sts:AssumeRole"
-              Effect: Allow
-              Principal: 
-                Service: 
-                  - lambda.amazonaws.com
-              Sid: AllowLambdaServiceToAssumeRole
-          Version: "2012-10-17"
-        ManagedPolicyArns: 
-          - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        Path: /
-      Type: "AWS::IAM::Role"
-    EncryptionFunction: 
-      Properties: 
-        CodeUri: "s3://<bucket>/encryption_proxy.zip"
-        Environment: 
-          Variables: 
-            keyId: EncryptionDecryptionKey
-        Events: 
-          encryptAction: 
-            Properties: 
-              Method: post
-              Path: /encrypt
-            Type: Api
-        Handler: encryption.post
-        Role: EncryptionServiceIAMRole.Arn
-        Runtime: python2.7
-      Type: "AWS::Serverless::Function"
-    Properties: 
-      AssumeRolePolicyDocument: 
-        Statement: 
-          - 
-            Action: 
-              - "sts:AssumeRole"
-            Effect: Allow
-            Principal: 
-              Service: 
-                - lambda.amazonaws.com
-            Sid: AllowLambdaServiceToAssumeRole
-        Version: "2012-10-17"
-      ManagedPolicyArns: 
-        - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-      Path: /
-    Type: "AWS::IAM::Role"
-Transform: "AWS::Serverless-2016-10-31"
diff --git a/test/templates/sam-official-samples/function.yaml b/test/templates/sam-official-samples/function.yaml
deleted file mode 100644
index 0b89c7a52e..0000000000
--- a/test/templates/sam-official-samples/function.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-Transform: AWS::Serverless-2016-10-31
-Resources:
-  TestFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: file.method
-      Runtime: nodejs
-      CodeUri: s3://bucket/path/key
-      FunctionName: functionname
-      Description: description
-      MemorySize: 128
-      Timeout: 30
-      Role: aws::arn::123456789012::some/role
-      Policies: 
-        - AmazonDynamoDBFullAccess
-      Environment:
-        Variables:
-          NAME: VALUE
-      VpcConfig:
-        SecurityGroupIds:
-          - String
-        SubnetIds:
-          - String
-      Events:
-        TestApi:
-          Type: Api
-          Properties:
-            Path: /testing
-            Method: any
\ No newline at end of file
diff --git a/test/templates/sam-official-samples/hello_world/index.js b/test/templates/sam-official-samples/hello_world/index.js
deleted file mode 100644
index 300dd0e6d0..0000000000
--- a/test/templates/sam-official-samples/hello_world/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-'use strict';
-console.log('Loading function');
-
-exports.handler = (event, context, callback) => {
-    callback(null, 'Hello World!');
-};
\ No newline at end of file
diff --git a/test/templates/sam-official-samples/hello_world/template.yaml b/test/templates/sam-official-samples/hello_world/template.yaml
deleted file mode 100644
index d0f01b66f5..0000000000
--- a/test/templates/sam-official-samples/hello_world/template.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-AWSTemplateFormatVersion : '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: A hello world application.
-Parameters:
-  Bucket:
-    Type: String
-  CodeZipKey:
-    Type: String
-Resources:
-  HelloWorldFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.handler
-      Runtime: nodejs4.3
-      CodeUri: 
-        Bucket: !Bucket
-        Key: !CodeZipKey
diff --git a/test/templates/sam-official-samples/inline_swagger/index.js b/test/templates/sam-official-samples/inline_swagger/index.js
deleted file mode 100644
index 7f7a6018dd..0000000000
--- a/test/templates/sam-official-samples/inline_swagger/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-exports.handler = function(event, context, callback) {
-    callback(null, {
-        "statusCode": 200,
-        "body": "hello world" 
-    });
-}
diff --git a/test/templates/sam-official-samples/inline_swagger/template.yaml b/test/templates/sam-official-samples/inline_swagger/template.yaml
deleted file mode 100644
index b9dc3018c4..0000000000
--- a/test/templates/sam-official-samples/inline_swagger/template.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Simple API Endpoint configured using Swagger specified inline and backed by a Lambda function
-Resources:
-  MyApi:
-    Type: AWS::Serverless::Api
-    Properties:
-      StageName: prod
-      DefinitionBody:
-        swagger: 2.0
-        info:
-          title:
-            Ref: AWS::StackName
-        paths:
-          "/get":
-            get:
-              x-amazon-apigateway-integration:
-                httpMethod: POST
-                type: aws_proxy
-                uri:
-                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyLambdaFunction.Arn}/invocations
-              responses: {}
-        swagger: '2.0'
-
-
-            
-  MyLambdaFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.handler
-      Runtime: nodejs4.3
-      CodeUri: s3://<bucket>/inline_swagger.zip
-      Events:
-        GetApi:
-          Type: Api
-          Properties:
-            Path: /get
-            Method: GET
-            RestApiId: 
-              Ref: MyApi
-
diff --git a/test/templates/sam-official-samples/iot_backend/index.js b/test/templates/sam-official-samples/iot_backend/index.js
deleted file mode 100644
index b18f84d411..0000000000
--- a/test/templates/sam-official-samples/iot_backend/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-console.log('Loading function');
-
-var AWS = require('aws-sdk');
-var dynamo = new AWS.DynamoDB.DocumentClient();
-var table = process.env.TABLE_NAME;
-
-exports.handler = function(event, context, callback) {
-    //console.log('Received event:', JSON.stringify(event, null, 2));
-
-   var params = {
-    TableName:table,
-    Item:{
-        "id": event.id,
-        "thing": event.thing
-        }
-    };
-       
-    console.log("Adding a new IoT device...");
-    dynamo.put(params, function(err, data) {
-    if (err) {
-        console.error("Unable to add device. Error JSON:", JSON.stringify(err, null, 2));
-        callback(err);
-    } else {
-        console.log("Added device:", JSON.stringify(data, null, 2));
-        callback(null,'DynamoDB updated');
-    }
-    });
-
-    
-}
diff --git a/test/templates/sam-official-samples/iot_backend/template.yaml b/test/templates/sam-official-samples/iot_backend/template.yaml
deleted file mode 100644
index 8486c72a79..0000000000
--- a/test/templates/sam-official-samples/iot_backend/template.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: IoT -> Lambda -> DynamoDB
-Resources:
-  IoTFunction: 
-    Type: AWS::Serverless::Function
-    Properties: 
-      Handler: index.handler
-      Runtime: nodejs4.3
-      CodeUri: s3://<bucket>/iot_backend.zip
-      Policies: AmazonDynamoDBFullAccess
-      Environment: 
-        Variables: 
-          TABLE_NAME: 
-            Ref: Table
-      Events: 
-        IoT: 
-          Type: IoTRule
-          Properties: 
-            AwsIotSqlVersion: 2016-03-23
-            Sql: "SELECT * FROM 'iot2ddb'"
-  Table:
-    Type: AWS::Serverless::SimpleTable
-    Properties:
-      PrimaryKey:
-        Name: id
-        Type: String
-
-
diff --git a/test/templates/sam-official-samples/s3_processor/index.js b/test/templates/sam-official-samples/s3_processor/index.js
deleted file mode 100644
index ad412345b2..0000000000
--- a/test/templates/sam-official-samples/s3_processor/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-console.log('Loading function');
-
-let aws = require('aws-sdk');
-let s3 = new aws.S3({ apiVersion: '2006-03-01' });
-
-exports.handler = (event, context, callback) => {
-    // Get the object from the event and show its content type
-    const bucket = event.Records[0].s3.bucket.name;
-    const key = decodeURIComponent(event.Records[0].s3.object.key.replace(/\+/g, ' '));
-    const params = {
-        Bucket: bucket,
-        Key: key
-    };
-    s3.getObject(params, (err, data) => {
-        if (err) {
-            console.log(err);
-            const message = `Error getting object ${key} from bucket ${bucket}. Make sure they exist and your bucket is in the same region as this function.`;
-            console.log(message);
-            callback(message);
-        } else {
-            console.log('CONTENT TYPE:', data.ContentType);
-            callback(null, data.ContentType);
-        }
-    });
-};
\ No newline at end of file
diff --git a/test/templates/sam-official-samples/s3_processor/template.yaml b/test/templates/sam-official-samples/s3_processor/template.yaml
deleted file mode 100644
index 5ff7aa2c29..0000000000
--- a/test/templates/sam-official-samples/s3_processor/template.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: A function is triggered off an upload to a bucket. It logs the content type of the uploaded object.
-Resources:
-  ProcessorFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.handler
-      Runtime: nodejs4.3
-      CodeUri: s3://<bucket>/s3_processor.zip
-      Policies: AmazonS3ReadOnlyAccess
-      Events:
-        PhotoUpload:
-          Type: S3
-          Properties:
-            Bucket: !Ref Bucket
-            Events: s3:ObjectCreated:*
-  
-  Bucket:
-    Type: AWS::S3::Bucket
-    Properties:
-      BucketName: Test
\ No newline at end of file
diff --git a/test/templates/sam-official-samples/schedule/index.js b/test/templates/sam-official-samples/schedule/index.js
deleted file mode 100644
index d77afb94bb..0000000000
--- a/test/templates/sam-official-samples/schedule/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-console.log('Loading function');
-
-exports.handler = (event, context, callback) => {
-    console.log("Invocation with event =", event);
-    callback(null, 'Everything is ok!');
-};
\ No newline at end of file
diff --git a/test/templates/sam-official-samples/schedule/template.yaml b/test/templates/sam-official-samples/schedule/template.yaml
deleted file mode 100644
index 4bd022e8c9..0000000000
--- a/test/templates/sam-official-samples/schedule/template.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: A function triggered on a timer.
-Resources:
-  ScheduledFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.handler
-      Runtime: nodejs4.3
-      CodeUri: s3://<bucket>/schedule.zip
-      Events:
-        Timer:
-          Type: Schedule
-          Properties:
-            Schedule: rate(5 minutes)
\ No newline at end of file
diff --git a/test/templates/sam-official-samples/stream_processor/index.js b/test/templates/sam-official-samples/stream_processor/index.js
deleted file mode 100644
index ea051babc8..0000000000
--- a/test/templates/sam-official-samples/stream_processor/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-'use strict';
-console.log('Loading function');
-
-exports.handler = (event, context, callback) => {
-    event.Records.forEach((record) => {
-        // Kinesis data is base64 encoded so decode here
-        const payload = new Buffer(record.kinesis.data, 'base64').toString('ascii');
-        console.log('Decoded payload:', payload);
-    });
-    callback(null, `Successfully processed ${event.Records.length} records.`);
-};
\ No newline at end of file
diff --git a/test/templates/sam-official-samples/stream_processor/template.yaml b/test/templates/sam-official-samples/stream_processor/template.yaml
deleted file mode 100644
index 48de30be6b..0000000000
--- a/test/templates/sam-official-samples/stream_processor/template.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: A function that processes data from a Kinesis stream.
-Resources:
-  StreamProcessor:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.handler
-      Runtime: nodejs4.3
-      CodeUri: s3://<bucket>/stream_processor.zip
-      Events:
-        Stream:
-          Type: Kinesis
-          Properties:
-            Stream: !GetAtt Stream.Arn
-            StartingPosition: TRIM_HORIZON
-
-  Stream:
-    Type: AWS::Kinesis::Stream
-    Properties:
-      ShardCount: 1
diff --git a/test/templates/sam-official-samples/templates/basic.yaml b/test/templates/sam-official-samples/templates/basic.yaml
deleted file mode 100644
index eb8dc991ab..0000000000
--- a/test/templates/sam-official-samples/templates/basic.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Alexa Skill https://developer.amazon.com/alexa-skills-kit
-Resources:
-  AlexaSkillFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      CodeUri: s3://<bucket>/alexa_skill.zip
-      Handler: index.handler
-      Runtime: nodejs4.3
-      Events:
-        AlexaSkillEvent:
-          Type: AlexaSkill
\ No newline at end of file
diff --git a/test/templates/sam-official-samples/templates/intrinsic.yaml b/test/templates/sam-official-samples/templates/intrinsic.yaml
deleted file mode 100644
index caf18af6d6..0000000000
--- a/test/templates/sam-official-samples/templates/intrinsic.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Alexa Skill https://developer.amazon.com/alexa-skills-kit
-Resources:
-  AlexaSkillFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      CodeUri: s3://<bucket>/alexa_skill.zip
-      Handler: index.handler
-      Runtime: !Ref InlineParameter
-      Environment: 
-        Variables:
-          BASE_64_SIMPLE: !Base64 "123456"
-          # TODO More Base64
-          # TODO Conditionals
-          # TODO FindInMap
-          GET_ATT: 
-            "Fn::GetAtt": [ "SomeResource", "AndParameter" ]
-          # TODO ImportValue
-          # TODO Join
-          # TODO Select
-          # TODO Split
-          SUB_SIMPLE: !Sub "Building with ${AWS::Region} parameters and ${SomeCustom} ones"
-          SUB_FULL: 
-            "Fn::Sub":
-              - "Some full text with ${AWS::Region} parameters and ${CustomParams}"
-              - { "CustomParams": "${SomeOtherResource}" }
-
-
diff --git a/test/templates/sam-official-samples/templates/wrong.yaml b/test/templates/sam-official-samples/templates/wrong.yaml
deleted file mode 100644
index de8ae7dcc5..0000000000
--- a/test/templates/sam-official-samples/templates/wrong.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: Alexa Skill https://developer.amazon.com/alexa-skills-kit
-Resources:
-  AlexaSkillFunction:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: index.handler
-      Runtime: nodejs4.3
-      Events:
-        AlexaSkillEvent:
-          Type: AlexaSkill
\ No newline at end of file
diff --git a/test/templates/validation-errors/no-resources-section.yaml b/test/templates/validation-errors/no-resources-section.yaml
deleted file mode 100644
index ee4bec3f97..0000000000
--- a/test/templates/validation-errors/no-resources-section.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-AWSTemplateFormatVersion: 2010-09-09
-Transform: AWS::Serverless-2016-10-31
\ No newline at end of file
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/commands/__init__.py b/tests/functional/commands/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/commands/local/__init__.py b/tests/functional/commands/local/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/commands/local/lib/__init__.py b/tests/functional/commands/local/lib/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/commands/local/lib/test_local_api_service.py b/tests/functional/commands/local/lib/test_local_api_service.py
new file mode 100644
index 0000000000..bb1c5c4b9b
--- /dev/null
+++ b/tests/functional/commands/local/lib/test_local_api_service.py
@@ -0,0 +1,128 @@
+"""
+Function test for Local API service
+"""
+
+import os
+import shutil
+import random
+import threading
+import requests
+import time
+import logging
+
+from samcli.commands.local.lib import provider
+from samcli.commands.local.lib.local_lambda import LocalLambdaRunner
+from samcli.local.lambdafn.runtime import LambdaRuntime
+from samcli.local.docker.manager import ContainerManager
+from samcli.commands.local.lib.local_api_service import LocalApiService
+
+from tests.functional.function_code import nodejs_lambda, API_GATEWAY_ECHO_EVENT
+from unittest import TestCase
+from mock import Mock, patch
+
+logging.basicConfig(level=logging.INFO)
+
+
+class TestFunctionalLocalLambda(TestCase):
+
+    def setUp(self):
+        self.host = "0.0.0.0"
+        self.port = random.randint(30000, 40000)  # get a random port
+        self.url = "http://{}:{}".format(self.host, self.port)
+
+        self.code_abs_path = nodejs_lambda(API_GATEWAY_ECHO_EVENT)
+
+        # Let's convert this absolute path to relative path. Let the parent be the CWD, and codeuri be the folder
+        self.cwd = os.path.dirname(self.code_abs_path)
+        self.code_uri = os.path.relpath(self.code_abs_path, self.cwd)  # Get relative path with respect to CWD
+
+        # Setup a static file in the directory
+        self.static_dir = "mystaticdir"
+        self.static_file_name = "myfile.txt"
+        self.static_file_content = "This is a static file"
+        self._setup_static_file(os.path.join(self.cwd, self.static_dir),   # Create static directory with in cwd
+                                self.static_file_name,
+                                self.static_file_content)
+
+        # Create one Lambda function
+        self.function_name = "name"
+        self.function = provider.Function(name=self.function_name, runtime="nodejs4.3", memory=256, timeout=5,
+                                          handler="index.handler", codeuri=self.code_uri,
+                                          environment={},
+                                          rolearn=None)
+        self.mock_function_provider = Mock()
+        self.mock_function_provider.get.return_value = self.function
+
+        # Setup two APIs pointing to the same function
+        apis = [
+            provider.Api(path="/get", method="GET", function_name=self.function_name, cors="cors"),
+            provider.Api(path="/post", method="POST", function_name=self.function_name, cors="cors"),
+        ]
+        self.api_provider_mock = Mock()
+        self.api_provider_mock.get_all.return_value = apis
+
+        # Now wire up the Lambda invoker and pass it through the context
+        self.lambda_invoke_context_mock = Mock()
+        manager = ContainerManager()
+        local_runtime = LambdaRuntime(manager)
+        lambda_runner = LocalLambdaRunner(local_runtime, self.mock_function_provider, self.cwd, env_vars_values=None,
+                                          debug_args=None, debug_port=None, aws_profile=None)
+        self.lambda_invoke_context_mock.local_lambda_runner = lambda_runner
+        self.lambda_invoke_context_mock.get_cwd.return_value = self.cwd
+
+    def tearDown(self):
+        shutil.rmtree(self.code_abs_path)
+
+    @patch("samcli.commands.local.lib.local_api_service.SamApiProvider")
+    def test_must_start_service_and_serve_endpoints(self, SamApiProviderMock):
+        SamApiProviderMock.return_value = self.api_provider_mock
+
+        local_service = LocalApiService(self.lambda_invoke_context_mock,
+                                        self.port,
+                                        self.host,
+                                        None)  # No static directory
+
+        self._start_service_thread(local_service)
+
+        response = requests.get(self.url + '/get')
+        self.assertEquals(response.status_code, 200)
+
+        response = requests.post(self.url + '/post', {})
+        self.assertEquals(response.status_code, 200)
+
+        response = requests.get(self.url + '/post')
+        self.assertEquals(response.status_code, 403)  # "HTTP GET /post" must not exist
+
+    @patch("samcli.commands.local.lib.local_api_service.SamApiProvider")
+    def test_must_serve_static_files(self, SamApiProviderMock):
+        SamApiProviderMock.return_value = self.api_provider_mock
+
+        local_service = LocalApiService(self.lambda_invoke_context_mock,
+                                        self.port,
+                                        self.host,
+                                        self.static_dir)  # Mount the static directory
+
+        self._start_service_thread(local_service)
+
+        # NOTE: The URL does not contain the static_dir because this directory is mounted directly at /
+        response = requests.get("{}/{}".format(self.url, self.static_file_name))
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(self.static_file_content, response.text)
+
+    @staticmethod
+    def _start_service_thread(service):
+        t = threading.Thread(name='thread', target=service.start, args=())
+        t.setDaemon(True)
+        t.start()
+        time.sleep(1)  # Wait for the Web server to spin up
+
+    @staticmethod
+    def _setup_static_file(directory, filename, contents):
+
+        if not os.path.isdir(directory):
+            os.mkdir(directory)
+
+        with open(os.path.join(directory, filename), "w") as fp:
+            fp.write(contents)
+
diff --git a/tests/functional/commands/local/lib/test_local_lambda.py b/tests/functional/commands/local/lib/test_local_lambda.py
new file mode 100644
index 0000000000..10f87a1efc
--- /dev/null
+++ b/tests/functional/commands/local/lib/test_local_lambda.py
@@ -0,0 +1,92 @@
+"""
+Function test for Local Lambda runner
+"""
+
+import os
+import io
+import json
+import shutil
+import logging
+
+from samcli.commands.local.lib import provider
+from samcli.commands.local.lib.local_lambda import LocalLambdaRunner
+from samcli.local.lambdafn.runtime import LambdaRuntime
+from samcli.local.docker.manager import ContainerManager
+
+from tests.functional.function_code import nodejs_lambda, GET_ENV_VAR
+from unittest import TestCase
+from mock import Mock
+
+logging.basicConfig(level=logging.INFO)
+
+
+class TestFunctionalLocalLambda(TestCase):
+
+    def setUp(self):
+        self.code_abs_path = nodejs_lambda(GET_ENV_VAR)
+
+        # Let's convert this absolute path to relative path. Let the parent be the CWD, and codeuri be the folder
+        self.cwd = os.path.dirname(self.code_abs_path)
+        self.code_uri = os.path.relpath(self.code_abs_path, self.cwd)  # Get relative path with respect to CWD
+
+        self.function_name = "name"
+        self.variables = {
+            "var1": "defaultvalue1",
+            "var2": "defaultvalue2"
+        }
+
+        self.env_var_overrides = {
+            self.function_name: {
+                "var1": "override_value1"
+            }
+        }
+
+        # Override "var2" through the Shell environment
+        os.environ["var2"] = "shell_env_value2"
+
+        self.function = provider.Function(name=self.function_name, runtime="nodejs4.3", memory=256, timeout=5,
+                                          handler="index.handler", codeuri=self.code_uri,
+                                          environment={"Variables": self.variables},
+                                          rolearn=None)
+
+        self.mock_function_provider = Mock()
+        self.mock_function_provider.get.return_value = self.function
+
+    def tearDown(self):
+
+        del os.environ["var2"]
+        shutil.rmtree(self.code_abs_path)
+
+    def test_must_invoke(self):
+        input_event = '"some data"'
+        expected_env_vars = {
+            "var1": "override_value1",
+            "var2": "shell_env_value2"
+        }
+
+        manager = ContainerManager()
+        local_runtime = LambdaRuntime(manager)
+        runner = LocalLambdaRunner(local_runtime, self.mock_function_provider, self.cwd, self.env_var_overrides,
+                                   debug_args=None, debug_port=None, aws_profile=None)
+
+        # Append the real AWS credentials to the expected values.
+        creds = runner.get_aws_creds()
+        # default value for creds is not configured by the test. But coming from a downstream class
+        expected_env_vars["AWS_SECRET_ACCESS_KEY"] = creds.get("secret", "defaultsecret")
+        expected_env_vars["AWS_ACCESS_KEY_ID"] = creds.get("key", "defaultkey")
+        expected_env_vars["AWS_REGION"] = creds.get("region", "us-east-1")
+
+        stdout_stream = io.BytesIO()
+        stderr_stream = io.BytesIO()
+        runner.invoke(self.function_name, input_event, stdout=stdout_stream, stderr=stderr_stream)
+
+        # stderr is where the Lambda container runtime logs are available. It usually contains requestId, start time
+        # etc. So it is non-zero in size
+        self.assertGreater(len(stderr_stream.getvalue().strip()), 0, "stderr stream must contain data")
+
+        # This should contain all the environment variables passed to the function
+        actual_output = json.loads(stdout_stream.getvalue().strip())
+
+        for key, value in expected_env_vars.items():
+            self.assertTrue(key in actual_output, "Key '{}' must be in function output".format(key))
+            self.assertEquals(actual_output.get(key), value)
diff --git a/tests/functional/commands/validate/__init__.py b/tests/functional/commands/validate/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/commands/validate/lib/__init__.py b/tests/functional/commands/validate/lib/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/commands/validate/lib/test_sam_template_validator.py b/tests/functional/commands/validate/lib/test_sam_template_validator.py
new file mode 100644
index 0000000000..64e0505f7f
--- /dev/null
+++ b/tests/functional/commands/validate/lib/test_sam_template_validator.py
@@ -0,0 +1,150 @@
+from unittest import TestCase
+from mock import Mock
+
+from samcli.commands.validate.lib.sam_template_validator import SamTemplateValidator
+from samcli.commands.validate.lib.exceptions import InvalidSamDocumentException
+
+
+class TestValidate(TestCase):
+
+    def test_valid_template(self):
+        template = {
+            "AWSTemplateFormatVersion": "2010-09-09",
+            "Transform": "AWS::Serverless-2016-10-31",
+            "Resources": {
+                "ServerlessFunction": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "Handler": "index.handler",
+                        "CodeUri": "s3://fake-bucket/lambda-code.zip",
+                        "Runtime": "nodejs6.10",
+                        "Timeout": 60
+                    }
+                }
+            }
+        }
+
+        managed_policy_mock = Mock()
+        managed_policy_mock.load.return_value = {"PolicyName": "FakePolicy"}
+
+        validator = SamTemplateValidator(template, managed_policy_mock)
+
+        # Should not throw an exception
+        validator.is_valid()
+
+    def test_invalid_template(self):
+        template = {
+            "AWSTemplateFormatVersion": "2010-09-09",
+            "Transform": "AWS::Serverless-2016-10-31",
+            "Resources": {
+                "ServerlessFunction": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "Handler": "index.handler",
+                        "CodeUri": "s3://lambda-code.zip",
+                        "Timeout": 60
+                    }
+                }
+            }
+        }
+
+        managed_policy_mock = Mock()
+        managed_policy_mock.load.return_value = {"PolicyName": "FakePolicy"}
+
+        validator = SamTemplateValidator(template, managed_policy_mock)
+
+        with self.assertRaises(InvalidSamDocumentException):
+            validator.is_valid()
+
+    def test_valid_template_with_local_code_for_function(self):
+        template = {
+            "AWSTemplateFormatVersion": "2010-09-09",
+            "Transform": "AWS::Serverless-2016-10-31",
+            "Resources": {
+                "ServerlessFunction": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "Handler": "index.handler",
+                        "CodeUri": "./",
+                        "Runtime": "nodejs6.10",
+                        "Timeout": 60
+                        }
+                    }
+                }
+            }
+
+        managed_policy_mock = Mock()
+        managed_policy_mock.load.return_value = {"PolicyName": "FakePolicy"}
+
+        validator = SamTemplateValidator(template, managed_policy_mock)
+
+        # Should not throw an exception
+        validator.is_valid()
+
+    def test_valid_template_with_local_code_for_api(self):
+        template = {
+            "AWSTemplateFormatVersion": "2010-09-09",
+            "Transform": "AWS::Serverless-2016-10-31",
+            "Resources": {
+                "ServerlessApi": {
+                    "Type": "AWS::Serverless::Api",
+                    "Properties": {
+                        "StageName": "Prod",
+                        "DefinitionUri": "./"
+                        }
+                    }
+                }
+            }
+
+        managed_policy_mock = Mock()
+        managed_policy_mock.load.return_value = {"PolicyName": "FakePolicy"}
+
+        validator = SamTemplateValidator(template, managed_policy_mock)
+
+        # Should not throw an exception
+        validator.is_valid()
+
+
+    def test_valid_template_with_s3_object_passed(self):
+        template = {
+            "AWSTemplateFormatVersion": "2010-09-09",
+            "Transform": "AWS::Serverless-2016-10-31",
+            "Resources": {
+                "ServerlessApi": {
+                    "Type": "AWS::Serverless::Api",
+                    "Properties": {
+                        "StageName": "Prod",
+                        "DefinitionUri": {
+                            "Bucket": "mybucket-name",
+                            "Key": "swagger",
+                            "Version": 121212
+                            }
+                        }
+                    },
+                "ServerlessFunction": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "Handler": "index.handler",
+                        "CodeUri": {
+                            "Bucket": "mybucket-name",
+                            "Key": "code.zip",
+                            "Version": 121212
+                            },
+                        "Runtime": "nodejs6.10",
+                        "Timeout": 60
+                        }
+                    }
+                }
+            }
+
+        managed_policy_mock = Mock()
+        managed_policy_mock.load.return_value = {"PolicyName": "FakePolicy"}
+
+        validator = SamTemplateValidator(template, managed_policy_mock)
+
+        # Should not throw an exception
+        validator.is_valid()
+
+        # validate the CodeUri was not changed
+        self.assertEquals(validator.sam_template.get("Resources").get("ServerlessApi").get("Properties").get("DefinitionUri"), {"Bucket": "mybucket-name", "Key": "swagger", "Version": 121212})
+        self.assertEquals(validator.sam_template.get("Resources").get("ServerlessFunction").get("Properties").get("CodeUri"), {"Bucket": "mybucket-name", "Key": "code.zip", "Version": 121212})
\ No newline at end of file
diff --git a/tests/functional/function_code.py b/tests/functional/function_code.py
new file mode 100644
index 0000000000..1a88c6b269
--- /dev/null
+++ b/tests/functional/function_code.py
@@ -0,0 +1,142 @@
+"""
+Helper class for tests to generate code folders with different types of Lambda functions
+"""
+
+import tempfile
+import os
+import shutil
+
+from contextlib import contextmanager
+
+# Echoes the input back as result
+ECHO_CODE = """
+exports.handler = function(event, context, callback){
+
+    console.log("Hello World"); 
+    callback(null, event)
+}
+"""
+
+# Sleeps for input number of seconds before returning
+SLEEP_CODE = """
+exports.handler = function(event, context, callback) {
+    // Duration for the sleep comes in the event
+    
+    duration = event * 1000 // milliseconds
+    setTimeout(function() { callback(null, event) }, duration)
+}
+"""
+
+# Returns all  the environment variables as an output
+GET_ENV_VAR = """
+exports.handler = function(event, context, callback) {
+    callback(null, process.env)
+}
+"""
+
+CONSOLE_LOG_LAMBDA = """
+exports.handler = function(event, context, callback) {
+    console.log("Hello World")
+    callback(null, null)
+}
+"""
+
+HELLO_FROM_LAMBDA = """
+exports.handler = function(event, context) {
+    context.done(null, 'Hello from Lambda');
+};
+"""
+
+API_GATEWAY_ECHO_EVENT = """
+exports.handler = function(event, context, callback){
+
+    response = {"statusCode":200,"headers":{},"body":JSON.stringify(event),"isBase64Encoded":false}
+    context.done(null, response);
+}
+"""
+
+API_GATEWAY_BAD_PROXY_RESPONSE = """
+exports.handler = function(event, context, callback){
+
+    response = "Non Proxy Response"
+    context.done(null, response);
+}
+"""
+
+API_GATEWAY_ECHO_BASE64_EVENT = """
+exports.base54request = function(event, context, callback){
+
+    response = {"statusCode":200,"headers":{"Content-Type":"image/gif"},"body":event["body"],"isBase64Encoded":event["isBase64Encoded"]}
+    context.done(null, response);
+}
+
+exports.echoimagehandler = function(event, context, callback) {
+
+    gifImageBase64 = "R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+goOXMv8+fhw/v739/f+8PD98fH/8mJl+fn/9ZWb8/PzWlwv///6wWGbImAPgTEMImIN9gUFCEm/gDALULDN8PAD6atYdCTX9gUNKlj8wZAKUsAOzZz+UMAOsJAP/Z2ccMDA8PD/95eX5NWvsJCOVNQPtfX/8zM8+QePLl38MGBr8JCP+zs9myn/8GBqwpAP/GxgwJCPny78lzYLgjAJ8vAP9fX/+MjMUcAN8zM/9wcM8ZGcATEL+QePdZWf/29uc/P9cmJu9MTDImIN+/r7+/vz8/P8VNQGNugV8AAF9fX8swMNgTAFlDOICAgPNSUnNWSMQ5MBAQEJE3QPIGAM9AQMqGcG9vb6MhJsEdGM8vLx8fH98AANIWAMuQeL8fABkTEPPQ0OM5OSYdGFl5jo+Pj/+pqcsTE78wMFNGQLYmID4dGPvd3UBAQJmTkP+8vH9QUK+vr8ZWSHpzcJMmILdwcLOGcHRQUHxwcK9PT9DQ0O/v70w5MLypoG8wKOuwsP/g4P/Q0IcwKEswKMl8aJ9fX2xjdOtGRs/Pz+Dg4GImIP8gIH0sKEAwKKmTiKZ8aB/f39Wsl+LFt8dgUE9PT5x5aHBwcP+AgP+WltdgYMyZfyywz78AAAAAAAD///8AAP9mZv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAKgALAAAAAA9AEQAAAj/AFEJHEiwoMGDCBMqXMiwocAbBww4nEhxoYkUpzJGrMixogkfGUNqlNixJEIDB0SqHGmyJSojM1bKZOmyop0gM3Oe2liTISKMOoPy7GnwY9CjIYcSRYm0aVKSLmE6nfq05QycVLPuhDrxBlCtYJUqNAq2bNWEBj6ZXRuyxZyDRtqwnXvkhACDV+euTeJm1Ki7A73qNWtFiF+/gA95Gly2CJLDhwEHMOUAAuOpLYDEgBxZ4GRTlC1fDnpkM+fOqD6DDj1aZpITp0dtGCDhr+fVuCu3zlg49ijaokTZTo27uG7Gjn2P+hI8+PDPERoUB318bWbfAJ5sUNFcuGRTYUqV/3ogfXp1rWlMc6awJjiAAd2fm4ogXjz56aypOoIde4OE5u/F9x199dlXnnGiHZWEYbGpsAEA3QXYnHwEFliKAgswgJ8LPeiUXGwedCAKABACCN+EA1pYIIYaFlcDhytd51sGAJbo3onOpajiihlO92KHGaUXGwWjUBChjSPiWJuOO/LYIm4v1tXfE6J4gCSJEZ7YgRYUNrkji9P55sF/ogxw5ZkSqIDaZBV6aSGYq/lGZplndkckZ98xoICbTcIJGQAZcNmdmUc210hs35nCyJ58fgmIKX5RQGOZowxaZwYA+JaoKQwswGijBV4C6SiTUmpphMspJx9unX4KaimjDv9aaXOEBteBqmuuxgEHoLX6Kqx+yXqqBANsgCtit4FWQAEkrNbpq7HSOmtwag5w57GrmlJBASEU18ADjUYb3ADTinIttsgSB1oJFfA63bduimuqKB1keqwUhoCSK374wbujvOSu4QG6UvxBRydcpKsav++Ca6G8A6Pr1x2kVMyHwsVxUALDq/krnrhPSOzXG1lUTIoffqGR7Goi2MAxbv6O2kEG56I7CSlRsEFKFVyovDJoIRTg7sugNRDGqCJzJgcKE0ywc0ELm6KBCCJo8DIPFeCWNGcyqNFE06ToAfV0HBRgxsvLThHn1oddQMrXj5DyAQgjEHSAJMWZwS3HPxT/QMbabI/iBCliMLEJKX2EEkomBAUCxRi42VDADxyTYDVogV+wSChqmKxEKCDAYFDFj4OmwbY7bDGdBhtrnTQYOigeChUmc1K3QTnAUfEgGFgAWt88hKA6aCRIXhxnQ1yg3BCayK44EWdkUQcBByEQChFXfCB776aQsG0BIlQgQgE8qO26X1h8cEUep8ngRBnOy74E9QgRgEAC8SvOfQkh7FDBDmS43PmGoIiKUUEGkMEC/PJHgxw0xH74yx/3XnaYRJgMB8obxQW6kL9QYEJ0FIFgByfIL7/IQAlvQwEpnAC7DtLNJCKUoO/w45c44GwCXiAFB/OXAATQryUxdN4LfFiwgjCNYg+kYMIEFkCKDs6PKAIJouyGWMS1FSKJOMRB/BoIxYJIUXFUxNwoIkEKPAgCBZSQHQ1A2EWDfDEUVLyADj5AChSIQW6gu10bE/JG2VnCZGfo4R4d0sdQoBAHhPjhIB94v/wRoRKQWGRHgrhGSQJxCS+0pCZbEhAAOw=="
+
+    callback(null, {
+        statusCode: 200,
+        body: gifImageBase64,
+
+        // API Gateway will automatically convert the base64 encoded response to binary if the Accept header in 
+        // request matches the Content-Type of response. Unfortunately, if you use this in an HTML Image tag
+        // <img src="https://your-api"/>, then browsers don't send a specific Accept header. Therefore API Gateway 
+        // will return the base64 text response. If serving image in HTML tag is your primary usecase,
+        // then you can use */* as value for BinaryMediaType which will make API Gateway treat every response
+        // as binary type, and hence decode base64 always.
+        isBase64Encoded: true,
+        headers: {
+            "Content-Type": "image/gif"
+        }
+    });
+}
+"""
+
+
+def nodejs_lambda(code):
+    """
+    In a temporary directory, create "index.js" file with the passed in code and return directory path.
+    This is a contextmanager. So it can be used inside `with` statements to automatically cleanup
+    temp folder upon exit
+
+    :param string code: Code to be written to the index.js file
+    :return string: directory path
+
+    """
+    directory = tempfile.mkdtemp()
+    filename = os.path.join(directory, "index.js")
+
+    with open(filename, "w+") as fp:
+        fp.write(code)
+        fp.flush()
+
+    # The directory that Python returns might have symlinks. The Docker File sharing settings will not resolve
+    # symlinks. Hence get the real path before passing to Docker.
+    return os.path.realpath(directory)
+
+@contextmanager
+def make_zip(directory, extension="zip"):
+    """
+    Zip up the contents of the directory and return path to the zipfile. This method can be used inside a ``with``
+    statement so it will cleanup the zipfile after the context exists.
+
+    :param string directory: Path to the directory to zip up
+    :param string extension: Extension for the file
+    :return string: Path to the zip file
+    """
+    tmpdir = None
+
+    try:
+        tmpdir = tempfile.mkdtemp()
+        path_prefix = os.path.join(tmpdir, "code")
+
+        zipfile_current_path = shutil.make_archive(path_prefix, 'zip', directory)
+
+        # shutil always sets the file with .zip extension. Hence rename/move the file to be with right extension
+        expected_path = path_prefix + "." + extension
+        os.rename(zipfile_current_path, expected_path)
+
+        yield expected_path
+    finally:
+        if tmpdir:
+            shutil.rmtree(tmpdir)
diff --git a/tests/functional/init/__init__.py b/tests/functional/init/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/init/test_generate_project.py b/tests/functional/init/test_generate_project.py
new file mode 100644
index 0000000000..5df2b6ff41
--- /dev/null
+++ b/tests/functional/init/test_generate_project.py
@@ -0,0 +1,54 @@
+import os
+import random
+import tempfile
+import shutil
+from unittest import TestCase
+
+from samcli.commands.init import do_cli as init_cli
+
+
+class TestCli(TestCase):
+
+    def setUp(self):
+        self.location = None
+        self.runtime = "python3.6"
+        self.output_dir = tempfile.mkdtemp()
+        self.name = "testing project {}".format(random.randint(1, 10))
+        self.no_input = False
+        self.cookiecutter_dir = tempfile.mkdtemp()
+        self.project_folder = os.path.abspath(
+                                os.path.join(self.output_dir, self.name))
+        self.custom_location_folder = os.path.abspath(
+                                        os.path.join(self.output_dir, 'name-of-the-project'))
+
+    def tearDown(self):
+        leftover_folders = (self.output_dir, self.cookiecutter_dir)
+
+        for folder in leftover_folders:
+            if os.path.isdir(folder):
+                shutil.rmtree(folder)
+
+    def test_generate_project(self):
+        # GIVEN generate_project successfully created a project
+        # WHEN a project name has been passed
+        init_cli(
+            ctx=None, location=self.location, runtime=self.runtime, output_dir=self.output_dir, 
+            name=self.name, no_input=self.no_input)
+
+        # THEN we should see a new project created and a successful return
+        self.assertTrue(os.path.isdir(self.project_folder))
+
+    def test_custom_location(self):
+        # GIVEN generate_project successfuly created a project
+        # WHEN a custom template has been passed
+        # and we were asked to accept default values provided by the template
+        self.location = "https://github.com/aws-samples/cookiecutter-aws-sam-python"
+
+        init_cli(
+            ctx=None, location=self.location, runtime=self.runtime, output_dir=self.output_dir,
+            name=self.name, no_input=True)
+
+        # THEN we should see a new project created and a successful return
+        # and this new folder should be named 'name-of-the-project'
+        # which is the default value for this custom template
+        self.assertTrue(os.path.isdir(self.custom_location_folder))
diff --git a/tests/functional/local/__init__.py b/tests/functional/local/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/local/apigw/__init__.py b/tests/functional/local/apigw/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/local/apigw/test_service.py b/tests/functional/local/apigw/test_service.py
new file mode 100644
index 0000000000..ae6348b1f9
--- /dev/null
+++ b/tests/functional/local/apigw/test_service.py
@@ -0,0 +1,500 @@
+from unittest import TestCase
+import threading
+import os
+import shutil
+import json
+import time
+
+import requests
+import random
+from mock import Mock
+
+from samcli.local.apigw.service import Route, Service
+from tests.functional.function_code import nodejs_lambda, API_GATEWAY_ECHO_EVENT, API_GATEWAY_BAD_PROXY_RESPONSE, API_GATEWAY_ECHO_BASE64_EVENT
+from samcli.commands.local.lib import provider
+from samcli.local.lambdafn.runtime import LambdaRuntime
+from samcli.commands.local.lib.local_lambda import LocalLambdaRunner
+from samcli.local.docker.manager import ContainerManager
+
+
+class TestService_InvalidResponses(TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.code_abs_path = nodejs_lambda(API_GATEWAY_BAD_PROXY_RESPONSE)
+
+        # Let's convert this absolute path to relative path. Let the parent be the CWD, and codeuri be the folder
+        cls.cwd = os.path.dirname(cls.code_abs_path)
+        cls.code_uri = os.path.relpath(cls.code_abs_path, cls.cwd)  # Get relative path with respect to CWD
+
+        cls.function_name = "name"
+
+        cls.function = provider.Function(name=cls.function_name, runtime="nodejs4.3", memory=256, timeout=5,
+                                         handler="index.handler", codeuri=cls.code_uri, environment=None,
+                                         rolearn=None)
+
+        cls.mock_function_provider = Mock()
+        cls.mock_function_provider.get.return_value = cls.function
+
+        list_of_routes = [Route(['POST', 'GET'], cls.function_name, '/something'),
+                          Route(['GET'], cls.function_name, '/'),
+                          Route(['GET', 'PUT'], cls.function_name, '/something/{event}'),
+                          ]
+
+        cls.service, cls.port, cls.url, cls.scheme = make_service(list_of_routes, cls.mock_function_provider, cls.cwd)
+        cls.service.create()
+        t = threading.Thread(name='thread', target=cls.service.run, args=())
+        t.setDaemon(True)
+        t.start()
+        time.sleep(1)
+
+    @classmethod
+    def tearDownClass(cls):
+        shutil.rmtree(cls.code_abs_path)
+
+    def test_non_proxy_response(self):
+        expected = {"message": "Internal server error"}
+
+        response = requests.get(self.url)
+
+        actual = response.json()
+
+        self.assertEquals(actual, expected)
+        self.assertEquals(response.status_code, 502)
+        self.assertEquals(response.headers.get('Content-Type'), "application/json")
+
+
+class TestService_EventSerialization(TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.code_abs_path = nodejs_lambda(API_GATEWAY_ECHO_EVENT)
+
+        # Let's convert this absolute path to relative path. Let the parent be the CWD, and codeuri be the folder
+        cls.cwd = os.path.dirname(cls.code_abs_path)
+        cls.code_uri = os.path.relpath(cls.code_abs_path, cls.cwd)  # Get relative path with respect to CWD
+
+        cls.function_name = "name"
+
+        cls.function = provider.Function(name=cls.function_name, runtime="nodejs4.3", memory=256, timeout=5,
+                                         handler="index.handler", codeuri=cls.code_uri, environment=None,
+                                         rolearn=None)
+
+        cls.base64_response_function = provider.Function(name=cls.function_name, runtime="nodejs4.3", memory=256, timeout=5,
+                                                         handler="index.handler", codeuri=cls.code_uri, environment=None,
+                                                         rolearn=None)
+
+        cls.mock_function_provider = Mock()
+        cls.mock_function_provider.get.return_value = cls.function
+
+        list_of_routes = [Route(['POST', 'GET'], cls.function_name, '/something'),
+                          Route(['GET'], cls.function_name, '/'),
+                          Route(['GET', 'PUT'], cls.function_name, '/something/{event}'),
+                          Route(['GET'], cls.function_name, '/proxypath/{proxy+}')
+                          ]
+
+        cls.service, cls.port, cls.url, cls.scheme = make_service(list_of_routes, cls.mock_function_provider, cls.cwd)
+        cls.service.create()
+        t = threading.Thread(name='thread', target=cls.service.run, args=())
+        t.setDaemon(True)
+        t.start()
+
+    @classmethod
+    def tearDownClass(cls):
+        shutil.rmtree(cls.code_abs_path)
+
+    def setUp(self):
+        # Print full diff when comparing large dictionaries
+        self.maxDiff = None
+
+    def test_calling_service_root(self):
+        expected = make_service_response(self.port,
+                                         scheme=self.scheme,
+                                         method="GET",
+                                         resourcePath="/",
+                                         resolvedResourcePath="/",
+                                         pathParameters=None,
+                                         body=None,
+                                         queryParams=None,
+                                         headers=None)
+
+        response = requests.get(self.url)
+
+        actual = response.json()
+
+        self.assertEquals(actual, expected)
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get('Content-Type'), "application/json")
+
+    def test_calling_service_with_nonexistent_endpoint(self):
+        expected = {"message": "Missing Authentication Token"}
+
+        response = requests.get(self.url + "/nothere")
+
+        actual = response.json()
+
+        self.assertEquals(actual, expected)
+        self.assertEquals(response.status_code, 403)
+        self.assertEquals(response.headers.get('Content-Type'), "application/json")
+
+    def test_calling_service_with_valid_path_invalid_method(self):
+        expected = {"message": "Missing Authentication Token"}
+
+        response = requests.put(self.url)
+
+        actual = response.json()
+
+        self.assertEquals(actual, expected)
+        self.assertEquals(response.status_code, 403)
+        self.assertEquals(response.headers.get('Content-Type'), "application/json")
+
+    def test_calling_service_with_data_on_path(self):
+        path = "/something"
+        body = {"json": "data"}
+        expected = make_service_response(self.port,
+                                         scheme=self.scheme,
+                                         method="POST",
+                                         resourcePath=path,
+                                         resolvedResourcePath=path,
+                                         pathParameters=None,
+                                         body=json.dumps(body),
+                                         queryParams=None,
+                                         headers={"Content-Length": "16",
+                                                  "Content-Type": "application/json"})
+
+        response = requests.post(self.url + path, json=body)
+
+        actual = response.json()
+
+        self.assertEquals(actual, expected)
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get('Content-Type'), "application/json")
+
+    def test_calling_service_with_path_params(self):
+        path = '/something/event1'
+        expected = make_service_response(self.port,
+                                         scheme=self.scheme,
+                                         method="GET",
+                                         resourcePath="/something/{event}",
+                                         resolvedResourcePath=path,
+                                         pathParameters={"event": "event1"},
+                                         body=None,
+                                         queryParams=None,
+                                         headers=None)
+
+        response = requests.get(self.url + path)
+
+        actual = response.json()
+
+        self.assertEquals(actual, expected)
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get('Content-Type'), "application/json")
+
+    def test_calling_proxy_path(self):
+        path = '/proxypath/thisisproxypath/thatshouldbecaught'
+        expected = make_service_response(self.port,
+                                         scheme=self.scheme,
+                                         method="GET",
+                                         resourcePath="/proxypath/{proxy+}",
+                                         resolvedResourcePath=path,
+                                         pathParameters={"proxy": "thisisproxypath/thatshouldbecaught"},
+                                         body=None,
+                                         queryParams=None,
+                                         headers=None)
+
+        response = requests.get(self.url + path)
+
+        actual = response.json()
+
+        self.assertEquals(actual, expected)
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get('Content-Type'), "application/json")
+
+    def test_calling_service_with_body_and_query_and_headers(self):
+        path = "/something/event1"
+        body = {"json": "data"}
+        headers = {"X-Test": "TestValue"}
+
+        expected = make_service_response(self.port,
+                                         scheme=self.scheme,
+                                         method="PUT",
+                                         resourcePath="/something/{event}",
+                                         resolvedResourcePath=path,
+                                         pathParameters={"event": "event1"},
+                                         body=json.dumps(body),
+                                         queryParams={"key": ["value"]},
+                                         headers={"X-Test": "TestValue", "Content-Length": "16",
+                                                  "Content-Type": "application/json"})
+
+        response = requests.put(self.url + path,
+                                json=body,
+                                params={"key": "value"},
+                                headers=headers)
+
+        actual = response.json()
+
+        self.assertEquals(actual, expected)
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get('Content-Type'), "application/json")
+
+
+class TestService_ProxyAtBasePath(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.code_abs_path = nodejs_lambda(API_GATEWAY_ECHO_EVENT)
+
+        # Let's convert this absolute path to relative path. Let the parent be the CWD, and codeuri be the folder
+        cls.cwd = os.path.dirname(cls.code_abs_path)
+        cls.code_uri = os.path.relpath(cls.code_abs_path, cls.cwd)  # Get relative path with respect to CWD
+
+        cls.function_name = "name"
+
+        cls.function = provider.Function(name=cls.function_name, runtime="nodejs4.3", memory=256, timeout=5,
+                                         handler="index.handler", codeuri=cls.code_uri, environment=None,
+                                         rolearn=None)
+
+        cls.mock_function_provider = Mock()
+        cls.mock_function_provider.get.return_value = cls.function
+
+        list_of_routes = [
+                          Route(['GET'], cls.function_name, '/{proxy+}')
+                          ]
+
+        cls.service, cls.port, cls.url, cls.scheme = make_service(list_of_routes, cls.mock_function_provider, cls.cwd)
+        cls.service.create()
+        t = threading.Thread(name='thread', target=cls.service.run, args=())
+        t.setDaemon(True)
+        t.start()
+
+    @classmethod
+    def tearDownClass(cls):
+        shutil.rmtree(cls.code_abs_path)
+
+    def setUp(self):
+        # Print full diff when comparing large dictionaries
+        self.maxDiff = None
+
+    def test_calling_proxy_path(self):
+        path = '/proxypath/thisisproxypath/thatshouldbecaught'
+        expected = make_service_response(self.port,
+                                         scheme=self.scheme,
+                                         method="GET",
+                                         resourcePath="/{proxy+}",
+                                         resolvedResourcePath=path,
+                                         pathParameters={"proxy": "proxypath/thisisproxypath/thatshouldbecaught"},
+                                         body=None,
+                                         queryParams=None,
+                                         headers=None)
+
+        response = requests.get(self.url + path)
+
+        actual = response.json()
+
+        self.assertEquals(actual, expected)
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get('Content-Type'), "application/json")
+
+
+class TestService_Binary(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.code_abs_path = nodejs_lambda(API_GATEWAY_ECHO_BASE64_EVENT)
+
+        # Let's convert this absolute path to relative path. Let the parent be the CWD, and codeuri be the folder
+        cls.cwd = os.path.dirname(cls.code_abs_path)
+        cls.code_uri = os.path.relpath(cls.code_abs_path, cls.cwd)  # Get relative path with respect to CWD
+
+        cls.function_name = "name"
+
+        cls.function = provider.Function(name=cls.function_name, runtime="nodejs4.3", memory=256, timeout=5,
+                                         handler="index.echoimagehandler", codeuri=cls.code_uri, environment=None,
+                                         rolearn=None)
+
+        cls.mock_function_provider = Mock()
+        cls.mock_function_provider.get.return_value = cls.function
+
+        list_of_routes = [
+            Route(['GET'], cls.function_name, '/getimagegifbinarydata', binary_types=['image/gif']),
+            Route(['GET'], cls.function_name, '/getanygifbinarydata', binary_types=['*/*']),
+            Route(['POST'], cls.function_name, '/postbinarygif', binary_types=['image/gif'])
+
+            ]
+
+        cls.service, cls.port, cls.url, cls.scheme = make_service(list_of_routes, cls.mock_function_provider, cls.cwd)
+        cls.service.create()
+        t = threading.Thread(name='thread', target=cls.service.run, args=())
+        t.setDaemon(True)
+        t.start()
+
+    @classmethod
+    def tearDownClass(cls):
+        shutil.rmtree(cls.code_abs_path)
+
+    def setUp(self):
+        # Print full diff when comparing large dictionaries
+        self.maxDiff = None
+
+    def test_echo_with_defined_binary_types(self):
+        path = '/getimagegifbinarydata'
+
+        response = requests.get(self.url + path)
+
+        actual = response.content
+
+        self.assertEquals(actual, 'GIF89a=\x00D\x00\xf7\xa8\x00\x9a,3\xff\xc0\xc0\xef\xc0\xc0uXg\xfc\xf9\xf7\x993\x00\xff\xec\xec\xff\xa0\xa0\xe5\xcc\xbf\xcf\x9f\x87\x0f\xef\xef\x7f\x7f\x7f\xef\x0f\x0f\xdf\x1f\x1f\xff&&_\x9f\x9f\xffYY\xbf??5\xa5\xc2\xff\xff\xff\xac\x16\x19\xb2&\x00\xf8\x13\x10\xc2& \xdf`PP\x84\x9b\xf8\x03\x00\xb5\x0b\x0c\xdf\x0f\x00>\x9a\xb5\x87BM\x7f`P\xd2\xa5\x8f\xcc\x19\x00\xa5,\x00\xec\xd9\xcf\xe5\x0c\x00\xeb\t\x00\xff\xd9\xd9\xc7\x0c\x0c\x0f\x0f\x0f\xffyy~MZ\xfb\t\x08\xe5M@\xfb__\xff33\xcf\x90x\xf2\xe5\xdf\xc3\x06\x06\xbf\t\x08\xff\xb3\xb3\xd9\xb2\x9f\xff\x06\x06\xac)\x00\xff\xc6\xc6\x0c\t\x08\xf9\xf2\xef\xc9s`\xb8#\x00\x9f/\x00\xff__\xff\x8c\x8c\xc5\x1c\x00\xdf33\xffpp\xcf\x19\x19\xc0\x13\x10\xbf\x90x\xf7YY\xff\xf6\xf6\xe7??\xd7&&\xefLL2& \xdf\xbf\xaf\xbf\xbf\xbf???\xc5M@cn\x81_\x00\x00___\xcb00\xd8\x13\x00YC8\x80\x80\x80\xf3RRsVH\xc490\x10\x10\x10\x917@\xf2\x06\x00\xcf@@\xca\x86pooo\xa3!&\xc1\x1d\x18\xcf//\x1f\x1f\x1f\xdf\x00\x00\xd2\x16\x00\xcb\x90x\xbf\x1f\x00\x19\x13\x10\xf3\xd0\xd0\xe399&\x1d\x18Yy\x8e\x8f\x8f\x8f\xff\xa9\xa9\xcb\x13\x13\xbf00SF@\xb6& >\x1d\x18\xfb\xdd\xdd@@@\x99\x93\x90\xff\xbc\xbc\x7fPP\xaf\xaf\xaf\xc6VHzsp\x93& \xb7pp\xb3\x86ptPP|pp\xafOO\xd0\xd0\xd0\xef\xef\xefL90\xbc\xa9\xa0o0(\xeb\xb0\xb0\xff\xe0\xe0\xff\xd0\xd0\x870(K0(\xc9|h\x9f__lct\xebFF\xcf\xcf\xcf\xe0\xe0\xe0b& \xff  },(@0(\xa9\x93\x88\xa6|h\x1f\xdf\xdf\xd5\xac\x97\xe2\xc5\xb7\xc7`POOO\x9cyhppp\xff\x80\x80\xff\x96\x96\xd7``\xcc\x99\x7f,\xb0\xcf\xbf\x00\x00\x00\x00\x00\x00\xff\xff\xff\x00\x00\xffff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\xa8\x00,\x00\x00\x00\x00=\x00D\x00\x00\x08\xff\x00Q\t\x1cH\xb0\xa0\xc1\x83\x08\x13*\\\xc8\xb0\xa1\xc0\x1b\x07\x0c8\x9cHq\xa1\x89\x14\xa72F\xac\xc8\xb1\xa2\t\x1f\x19Cj\x94\xd8\xb1$B\x03\x07D\xaa\x1ci\xb2%*#3V\xcad\xe9\xb2\xa2\x9d 3s\x9e\xdaX\x93!"\x8c:\x83\xf2\xeci\xf0c\xd0\xa3!\x87\x12E\x89\xb4iR\x92.a:\x9d\xfa\xb4\xe5\x0c\x9cT\xb3\xee\x84:\xf1\x06P\xad`\x95*4\n\xb6l\xd5\x84\x06>\x99]\x1b\xb2\xc5\x9c\x83F\xda\xb0\x9d{\xe4\x84\x00\x83W\xe7\xaeM\xe2f\xd4\xa8\xbb\x03\xbd\xea5kE\x88_\xbf\x80\x0fy\x1a\\\xb6\x08\x92\xc3\x87\x01\x070\xe5\x00\x02\xe3\xa9-\x80\xc4\x80\x1cY\xe0dS\x94-_\x0ezd3\xe7\xce\xa8>\x83\x0e=Zf\x92\x13\xa7Gm\x18 \xe1\xaf\xe7\xd5\xb8+\xb7\xceX8\xf6(\xda\xa2D\xd9N\x8d\xbb\xb8n\xc6\x8e}\x8f\xfa\x12<\xf8\xf0\xcf\x11\x1a\x14\x07}|mf\xdf\x00\x9elP\xd1\\\xb8dSaJ\x95\xffz }zu\xadiLs\xa6\xb0&8\x80\x01\xdd\x9f\x9b\x8a ^<\xf9\xe9\xac\xa9:\x82\x1d{\x83\x84\xe6\xef\xc5\xf7\x1d}\xf5\xd9W\x9eq\xa2\x1d\x95\x84a\xb1\xa9\xb0\x01\x00\xdd\x05\xd8\x9c|\x04\x16X\x8a\x02\x0b0\x80\x9f\x0b=\xe8\x94\\l\x1et \n\x00\x10\x02\x08\xdf\x84\x03ZX \x86\x1a\x16W\x03\x87+]\xe7[\x06\x00\x96\xe8\xde\x89\xce\xa5\xa8\xe2\x8a\x19N\xf7b\x87\x19\xa5\x17\x1b\x05\xa3P\x10\xa1\x8d#\xe2X\x9b\x8e;\xf2\xd8"n/\xd6\xd5\xdf\x13\xa2x\x80$\x89\x11\x9e\xd8\x81\x16\x146\xb9#\x8b\xd3\xf9\xe6\xc1\x7f\xa2\x0cp\xe5\x99\x12\xa8\x80\xdad\x15zi!\x98\xab\xf9Ff\x99gvG$g\xdf1\xa0\x80\x9bM\xc2\t\x19\x00\x19p\xd9\x9d\x99G6\xd7Hl\xdf\x99\xc2\xc8\x9e|~\t\x88)~Q@c\x99\xa3\x0cZg\x06\x00\xf8\x96\xa8)\x0c,\xc0h\xa3\x05^\x02\xe9(\x93Rji\x84\xcb)\'\x1fn\x9d~\nj)\xa3\x0e\xffZis\x84\x06\xd7\x81\xaak\xae\xc6\x01\x07\xa0\xb5\xfa*\xac~\xc9z\xaa\x04\x03l\x80+b\xb7\x81V@\x01$\xac\xd6\xe9\xab\xb1\xd2:kpj\x0ep\xe7\xb1\xab\x9aRA\x01!\x14\xd7\xc0\x03\x8dF\x1b\xdc\x00\xd3\x8ar-\xb6\xc8\x12\x07Z\t\x15\xf0:\xdd\xb7n\x8ak\xaa(\x1ddz\xac\x14\x86\x80\x92+~\xf8\xc1\xbb\xa3\xbc\xe4\xae\xe1\x01\xbaR\xfcAG\'\\\xa4\xab\x1a\xbf\xef\x82k\xa1\xbc\x03\xa3\xeb\xd7\x1d\xa4T\xcc\x87\xc2\xc5qP\x02\xc3\xab\xf9+\x9e\xb8OH\xec\xd7\x1bYTL\x8a\x1f~\xa1\x91\xecj"\xd8\xc01n\xfe\x8e\xdaA\x06\xe7\xa2;\t)Q\xb0AJ\x15\\\xa8\xbc2h!\x14\xe0\xee\xcb\xa05\x10\xc6\xa8"s&\x07\n\x13L\xb0sA\x0b\x9b\xa2\x81\x08"h\xf02\x0f\x15\xe0\x964g2\xa8\xd1D\xd3\xa4\xe8\x01\xf5t\x1c\x14`\xc6\xcb\xcbN\x11\xe7\xd6\x87]@\xca\xd7\x8f\x90\xf2\x01\x08#\x10t\x80$\xc5\x99\xc1-\xc7?\x14\xff@\xc6\xdal\x8f\xe2\x04)b0\xb1\t)}\x84\x12J&\x04\x05\x02\xc5\x18\xb8\xd9P\xc0\x0f\x1c\x93`5h\x81_\xb0H(j\x98\xacD( \xc0`P\xc5\x8f\x83\xa6\xc1\xb6;l1\x9d\x06\x1bk\x9d4\x18:(\x1e\n\x15&sR\xb7A9\xc0Q\xf1 \x18X\x00Z\xdf<\x84\xa0:h$H^\x1cgC\\\xa0\xdc\x10\x9a\xc8\xae8\x11gdQ\x07\x01\x07!\x10\n\x11W| {\xef\xa6\x90\xb0m\x01"T B\x01<\xa8\xed\xba_X|pE\x1e\xa7\xc9\xe0D\x19\xce\xcb\xbe\x04\xf5\x08\x11\x80@\x02\xf1+\xce}\t!\xecP\xc1\x0ed\xb8\xdc\xf9\x86\xa0\x88\x8aQA\x06\x90\xc1\x02\xfc\xf2G\x83\x1c4\xc4~\xf8\xcb\x1f\xf7^v\x98D\x98\x0c\x07\xca\x1b\xc5\x05\xba\x90\xbfP`Bt\x14\x81`\x07\'\xc8/\xbf\xc8@\toC\x01)\x9c\x00\xbb\x0e\xd2\xcd$"\x94\xa0\xef\xf0\xe3\x978\xe0l\x02^ \x05\x07\xf3\x97\x00\x04\xd0\xaf%1t\xde\x0b|X\xb0\x820\x8db\x0f\xa4`\xc2\x04\x16@\x8a\x0e\xce\x8f(\x02\t\xa2\xec\x86X\xc4\xb5\x15"\x898\xc4A\xfc\x1a\x08\xc5\x82HQqT\xc4\xdc("A\n<\x08\x02\x05\x94\x90\x1d\r@\xd8E\x83|1\x14T\xbc\x80\x0e>@\n\x14\x88An\xa0\xbb]\x1b\x13\xf2F\xd9Y\xc2dg\xe8\xe1\x1e\x1d\xd2\xc7P\xa0\x10\x07\x84\xf8\xe1 \x1fx\xbf\xfc\x11\xa1\x12\x90XdG\x82\xb8FI\x02q\t/\xb4\xa4&[\x12\x10\x00;')  # NOQA
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get('Content-Type'), "image/gif")
+
+    def test_echo_with_any_binary_types(self):
+        path = '/getanygifbinarydata'
+
+        response = requests.get(self.url + path)
+
+        actual = response.content
+
+        self.assertEquals(actual, 'GIF89a=\x00D\x00\xf7\xa8\x00\x9a,3\xff\xc0\xc0\xef\xc0\xc0uXg\xfc\xf9\xf7\x993\x00\xff\xec\xec\xff\xa0\xa0\xe5\xcc\xbf\xcf\x9f\x87\x0f\xef\xef\x7f\x7f\x7f\xef\x0f\x0f\xdf\x1f\x1f\xff&&_\x9f\x9f\xffYY\xbf??5\xa5\xc2\xff\xff\xff\xac\x16\x19\xb2&\x00\xf8\x13\x10\xc2& \xdf`PP\x84\x9b\xf8\x03\x00\xb5\x0b\x0c\xdf\x0f\x00>\x9a\xb5\x87BM\x7f`P\xd2\xa5\x8f\xcc\x19\x00\xa5,\x00\xec\xd9\xcf\xe5\x0c\x00\xeb\t\x00\xff\xd9\xd9\xc7\x0c\x0c\x0f\x0f\x0f\xffyy~MZ\xfb\t\x08\xe5M@\xfb__\xff33\xcf\x90x\xf2\xe5\xdf\xc3\x06\x06\xbf\t\x08\xff\xb3\xb3\xd9\xb2\x9f\xff\x06\x06\xac)\x00\xff\xc6\xc6\x0c\t\x08\xf9\xf2\xef\xc9s`\xb8#\x00\x9f/\x00\xff__\xff\x8c\x8c\xc5\x1c\x00\xdf33\xffpp\xcf\x19\x19\xc0\x13\x10\xbf\x90x\xf7YY\xff\xf6\xf6\xe7??\xd7&&\xefLL2& \xdf\xbf\xaf\xbf\xbf\xbf???\xc5M@cn\x81_\x00\x00___\xcb00\xd8\x13\x00YC8\x80\x80\x80\xf3RRsVH\xc490\x10\x10\x10\x917@\xf2\x06\x00\xcf@@\xca\x86pooo\xa3!&\xc1\x1d\x18\xcf//\x1f\x1f\x1f\xdf\x00\x00\xd2\x16\x00\xcb\x90x\xbf\x1f\x00\x19\x13\x10\xf3\xd0\xd0\xe399&\x1d\x18Yy\x8e\x8f\x8f\x8f\xff\xa9\xa9\xcb\x13\x13\xbf00SF@\xb6& >\x1d\x18\xfb\xdd\xdd@@@\x99\x93\x90\xff\xbc\xbc\x7fPP\xaf\xaf\xaf\xc6VHzsp\x93& \xb7pp\xb3\x86ptPP|pp\xafOO\xd0\xd0\xd0\xef\xef\xefL90\xbc\xa9\xa0o0(\xeb\xb0\xb0\xff\xe0\xe0\xff\xd0\xd0\x870(K0(\xc9|h\x9f__lct\xebFF\xcf\xcf\xcf\xe0\xe0\xe0b& \xff  },(@0(\xa9\x93\x88\xa6|h\x1f\xdf\xdf\xd5\xac\x97\xe2\xc5\xb7\xc7`POOO\x9cyhppp\xff\x80\x80\xff\x96\x96\xd7``\xcc\x99\x7f,\xb0\xcf\xbf\x00\x00\x00\x00\x00\x00\xff\xff\xff\x00\x00\xffff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\xa8\x00,\x00\x00\x00\x00=\x00D\x00\x00\x08\xff\x00Q\t\x1cH\xb0\xa0\xc1\x83\x08\x13*\\\xc8\xb0\xa1\xc0\x1b\x07\x0c8\x9cHq\xa1\x89\x14\xa72F\xac\xc8\xb1\xa2\t\x1f\x19Cj\x94\xd8\xb1$B\x03\x07D\xaa\x1ci\xb2%*#3V\xcad\xe9\xb2\xa2\x9d 3s\x9e\xdaX\x93!"\x8c:\x83\xf2\xeci\xf0c\xd0\xa3!\x87\x12E\x89\xb4iR\x92.a:\x9d\xfa\xb4\xe5\x0c\x9cT\xb3\xee\x84:\xf1\x06P\xad`\x95*4\n\xb6l\xd5\x84\x06>\x99]\x1b\xb2\xc5\x9c\x83F\xda\xb0\x9d{\xe4\x84\x00\x83W\xe7\xaeM\xe2f\xd4\xa8\xbb\x03\xbd\xea5kE\x88_\xbf\x80\x0fy\x1a\\\xb6\x08\x92\xc3\x87\x01\x070\xe5\x00\x02\xe3\xa9-\x80\xc4\x80\x1cY\xe0dS\x94-_\x0ezd3\xe7\xce\xa8>\x83\x0e=Zf\x92\x13\xa7Gm\x18 \xe1\xaf\xe7\xd5\xb8+\xb7\xceX8\xf6(\xda\xa2D\xd9N\x8d\xbb\xb8n\xc6\x8e}\x8f\xfa\x12<\xf8\xf0\xcf\x11\x1a\x14\x07}|mf\xdf\x00\x9elP\xd1\\\xb8dSaJ\x95\xffz }zu\xadiLs\xa6\xb0&8\x80\x01\xdd\x9f\x9b\x8a ^<\xf9\xe9\xac\xa9:\x82\x1d{\x83\x84\xe6\xef\xc5\xf7\x1d}\xf5\xd9W\x9eq\xa2\x1d\x95\x84a\xb1\xa9\xb0\x01\x00\xdd\x05\xd8\x9c|\x04\x16X\x8a\x02\x0b0\x80\x9f\x0b=\xe8\x94\\l\x1et \n\x00\x10\x02\x08\xdf\x84\x03ZX \x86\x1a\x16W\x03\x87+]\xe7[\x06\x00\x96\xe8\xde\x89\xce\xa5\xa8\xe2\x8a\x19N\xf7b\x87\x19\xa5\x17\x1b\x05\xa3P\x10\xa1\x8d#\xe2X\x9b\x8e;\xf2\xd8"n/\xd6\xd5\xdf\x13\xa2x\x80$\x89\x11\x9e\xd8\x81\x16\x146\xb9#\x8b\xd3\xf9\xe6\xc1\x7f\xa2\x0cp\xe5\x99\x12\xa8\x80\xdad\x15zi!\x98\xab\xf9Ff\x99gvG$g\xdf1\xa0\x80\x9bM\xc2\t\x19\x00\x19p\xd9\x9d\x99G6\xd7Hl\xdf\x99\xc2\xc8\x9e|~\t\x88)~Q@c\x99\xa3\x0cZg\x06\x00\xf8\x96\xa8)\x0c,\xc0h\xa3\x05^\x02\xe9(\x93Rji\x84\xcb)\'\x1fn\x9d~\nj)\xa3\x0e\xffZis\x84\x06\xd7\x81\xaak\xae\xc6\x01\x07\xa0\xb5\xfa*\xac~\xc9z\xaa\x04\x03l\x80+b\xb7\x81V@\x01$\xac\xd6\xe9\xab\xb1\xd2:kpj\x0ep\xe7\xb1\xab\x9aRA\x01!\x14\xd7\xc0\x03\x8dF\x1b\xdc\x00\xd3\x8ar-\xb6\xc8\x12\x07Z\t\x15\xf0:\xdd\xb7n\x8ak\xaa(\x1ddz\xac\x14\x86\x80\x92+~\xf8\xc1\xbb\xa3\xbc\xe4\xae\xe1\x01\xbaR\xfcAG\'\\\xa4\xab\x1a\xbf\xef\x82k\xa1\xbc\x03\xa3\xeb\xd7\x1d\xa4T\xcc\x87\xc2\xc5qP\x02\xc3\xab\xf9+\x9e\xb8OH\xec\xd7\x1bYTL\x8a\x1f~\xa1\x91\xecj"\xd8\xc01n\xfe\x8e\xdaA\x06\xe7\xa2;\t)Q\xb0AJ\x15\\\xa8\xbc2h!\x14\xe0\xee\xcb\xa05\x10\xc6\xa8"s&\x07\n\x13L\xb0sA\x0b\x9b\xa2\x81\x08"h\xf02\x0f\x15\xe0\x964g2\xa8\xd1D\xd3\xa4\xe8\x01\xf5t\x1c\x14`\xc6\xcb\xcbN\x11\xe7\xd6\x87]@\xca\xd7\x8f\x90\xf2\x01\x08#\x10t\x80$\xc5\x99\xc1-\xc7?\x14\xff@\xc6\xdal\x8f\xe2\x04)b0\xb1\t)}\x84\x12J&\x04\x05\x02\xc5\x18\xb8\xd9P\xc0\x0f\x1c\x93`5h\x81_\xb0H(j\x98\xacD( \xc0`P\xc5\x8f\x83\xa6\xc1\xb6;l1\x9d\x06\x1bk\x9d4\x18:(\x1e\n\x15&sR\xb7A9\xc0Q\xf1 \x18X\x00Z\xdf<\x84\xa0:h$H^\x1cgC\\\xa0\xdc\x10\x9a\xc8\xae8\x11gdQ\x07\x01\x07!\x10\n\x11W| {\xef\xa6\x90\xb0m\x01"T B\x01<\xa8\xed\xba_X|pE\x1e\xa7\xc9\xe0D\x19\xce\xcb\xbe\x04\xf5\x08\x11\x80@\x02\xf1+\xce}\t!\xecP\xc1\x0ed\xb8\xdc\xf9\x86\xa0\x88\x8aQA\x06\x90\xc1\x02\xfc\xf2G\x83\x1c4\xc4~\xf8\xcb\x1f\xf7^v\x98D\x98\x0c\x07\xca\x1b\xc5\x05\xba\x90\xbfP`Bt\x14\x81`\x07\'\xc8/\xbf\xc8@\toC\x01)\x9c\x00\xbb\x0e\xd2\xcd$"\x94\xa0\xef\xf0\xe3\x978\xe0l\x02^ \x05\x07\xf3\x97\x00\x04\xd0\xaf%1t\xde\x0b|X\xb0\x820\x8db\x0f\xa4`\xc2\x04\x16@\x8a\x0e\xce\x8f(\x02\t\xa2\xec\x86X\xc4\xb5\x15"\x898\xc4A\xfc\x1a\x08\xc5\x82HQqT\xc4\xdc("A\n<\x08\x02\x05\x94\x90\x1d\r@\xd8E\x83|1\x14T\xbc\x80\x0e>@\n\x14\x88An\xa0\xbb]\x1b\x13\xf2F\xd9Y\xc2dg\xe8\xe1\x1e\x1d\xd2\xc7P\xa0\x10\x07\x84\xf8\xe1 \x1fx\xbf\xfc\x11\xa1\x12\x90XdG\x82\xb8FI\x02q\t/\xb4\xa4&[\x12\x10\x00;')  # NOQA
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get('Content-Type'), "image/gif")
+
+    def test_accept_json_should_return_base64(self):
+        # This test is asserting the behavior we currently have. I find it strange that we will return a Content-Type
+        # that does not match the Accept headers
+        path = '/getimagegifbinarydata'
+
+        response = requests.get(self.url + path, headers={"Accept": "application/json"})
+
+        actual = response.content
+
+        self.assertEquals(actual, "R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+goOXMv8+fhw/v739/f+8PD98fH/8mJl+fn/9ZWb8/PzWlwv///6wWGbImAPgTEMImIN9gUFCEm/gDALULDN8PAD6atYdCTX9gUNKlj8wZAKUsAOzZz+UMAOsJAP/Z2ccMDA8PD/95eX5NWvsJCOVNQPtfX/8zM8+QePLl38MGBr8JCP+zs9myn/8GBqwpAP/GxgwJCPny78lzYLgjAJ8vAP9fX/+MjMUcAN8zM/9wcM8ZGcATEL+QePdZWf/29uc/P9cmJu9MTDImIN+/r7+/vz8/P8VNQGNugV8AAF9fX8swMNgTAFlDOICAgPNSUnNWSMQ5MBAQEJE3QPIGAM9AQMqGcG9vb6MhJsEdGM8vLx8fH98AANIWAMuQeL8fABkTEPPQ0OM5OSYdGFl5jo+Pj/+pqcsTE78wMFNGQLYmID4dGPvd3UBAQJmTkP+8vH9QUK+vr8ZWSHpzcJMmILdwcLOGcHRQUHxwcK9PT9DQ0O/v70w5MLypoG8wKOuwsP/g4P/Q0IcwKEswKMl8aJ9fX2xjdOtGRs/Pz+Dg4GImIP8gIH0sKEAwKKmTiKZ8aB/f39Wsl+LFt8dgUE9PT5x5aHBwcP+AgP+WltdgYMyZfyywz78AAAAAAAD///8AAP9mZv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAKgALAAAAAA9AEQAAAj/AFEJHEiwoMGDCBMqXMiwocAbBww4nEhxoYkUpzJGrMixogkfGUNqlNixJEIDB0SqHGmyJSojM1bKZOmyop0gM3Oe2liTISKMOoPy7GnwY9CjIYcSRYm0aVKSLmE6nfq05QycVLPuhDrxBlCtYJUqNAq2bNWEBj6ZXRuyxZyDRtqwnXvkhACDV+euTeJm1Ki7A73qNWtFiF+/gA95Gly2CJLDhwEHMOUAAuOpLYDEgBxZ4GRTlC1fDnpkM+fOqD6DDj1aZpITp0dtGCDhr+fVuCu3zlg49ijaokTZTo27uG7Gjn2P+hI8+PDPERoUB318bWbfAJ5sUNFcuGRTYUqV/3ogfXp1rWlMc6awJjiAAd2fm4ogXjz56aypOoIde4OE5u/F9x199dlXnnGiHZWEYbGpsAEA3QXYnHwEFliKAgswgJ8LPeiUXGwedCAKABACCN+EA1pYIIYaFlcDhytd51sGAJbo3onOpajiihlO92KHGaUXGwWjUBChjSPiWJuOO/LYIm4v1tXfE6J4gCSJEZ7YgRYUNrkji9P55sF/ogxw5ZkSqIDaZBV6aSGYq/lGZplndkckZ98xoICbTcIJGQAZcNmdmUc210hs35nCyJ58fgmIKX5RQGOZowxaZwYA+JaoKQwswGijBV4C6SiTUmpphMspJx9unX4KaimjDv9aaXOEBteBqmuuxgEHoLX6Kqx+yXqqBANsgCtit4FWQAEkrNbpq7HSOmtwag5w57GrmlJBASEU18ADjUYb3ADTinIttsgSB1oJFfA63bduimuqKB1keqwUhoCSK374wbujvOSu4QG6UvxBRydcpKsav++Ca6G8A6Pr1x2kVMyHwsVxUALDq/krnrhPSOzXG1lUTIoffqGR7Goi2MAxbv6O2kEG56I7CSlRsEFKFVyovDJoIRTg7sugNRDGqCJzJgcKE0ywc0ELm6KBCCJo8DIPFeCWNGcyqNFE06ToAfV0HBRgxsvLThHn1oddQMrXj5DyAQgjEHSAJMWZwS3HPxT/QMbabI/iBCliMLEJKX2EEkomBAUCxRi42VDADxyTYDVogV+wSChqmKxEKCDAYFDFj4OmwbY7bDGdBhtrnTQYOigeChUmc1K3QTnAUfEgGFgAWt88hKA6aCRIXhxnQ1yg3BCayK44EWdkUQcBByEQChFXfCB776aQsG0BIlQgQgE8qO26X1h8cEUep8ngRBnOy74E9QgRgEAC8SvOfQkh7FDBDmS43PmGoIiKUUEGkMEC/PJHgxw0xH74yx/3XnaYRJgMB8obxQW6kL9QYEJ0FIFgByfIL7/IQAlvQwEpnAC7DtLNJCKUoO/w45c44GwCXiAFB/OXAATQryUxdN4LfFiwgjCNYg+kYMIEFkCKDs6PKAIJouyGWMS1FSKJOMRB/BoIxYJIUXFUxNwoIkEKPAgCBZSQHQ1A2EWDfDEUVLyADj5AChSIQW6gu10bE/JG2VnCZGfo4R4d0sdQoBAHhPjhIB94v/wRoRKQWGRHgrhGSQJxCS+0pCZbEhAAOw==")  # NOQA
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get('Content-Type'), "image/gif")
+
+
+class TestService_PostingBinary(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.code_abs_path = nodejs_lambda(API_GATEWAY_ECHO_BASE64_EVENT)
+
+        # Let's convert this absolute path to relative path. Let the parent be the CWD, and codeuri be the folder
+        cls.cwd = os.path.dirname(cls.code_abs_path)
+        cls.code_uri = os.path.relpath(cls.code_abs_path, cls.cwd)  # Get relative path with respect to CWD
+
+        cls.function_name = "name"
+
+        cls.function = provider.Function(name=cls.function_name, runtime="nodejs4.3", memory=256, timeout=5,
+                                         handler="index.base54request", codeuri=cls.code_uri, environment=None,
+                                         rolearn=None)
+
+        cls.mock_function_provider = Mock()
+        cls.mock_function_provider.get.return_value = cls.function
+
+        list_of_routes = [
+            Route(['POST'], cls.function_name, '/postbinarygif', binary_types=['image/gif']),
+            Route(['POST'], cls.function_name, '/postanybinary', binary_types=['*/*'])
+            ]
+
+        cls.service, cls.port, cls.url, cls.scheme = make_service(list_of_routes, cls.mock_function_provider, cls.cwd)
+        cls.service.create()
+        t = threading.Thread(name='thread', target=cls.service.run, args=())
+        t.setDaemon(True)
+        t.start()
+
+    @classmethod
+    def tearDownClass(cls):
+        shutil.rmtree(cls.code_abs_path)
+
+    def setUp(self):
+        # Print full diff when comparing large dictionaries
+        self.maxDiff = None
+
+    def test_post_binary_image_gif(self):
+        path = '/postbinarygif'
+
+        response = requests.post(self.url + path,
+                                 headers={"Content-Type": "image/gif"},
+                                 data='GIF89a=\x00D\x00\xf7\xa8\x00\x9a,3\xff\xc0\xc0\xef\xc0\xc0uXg\xfc\xf9\xf7\x993\x00\xff\xec\xec\xff\xa0\xa0\xe5\xcc\xbf\xcf\x9f\x87\x0f\xef\xef\x7f\x7f\x7f\xef\x0f\x0f\xdf\x1f\x1f\xff&&_\x9f\x9f\xffYY\xbf??5\xa5\xc2\xff\xff\xff\xac\x16\x19\xb2&\x00\xf8\x13\x10\xc2& \xdf`PP\x84\x9b\xf8\x03\x00\xb5\x0b\x0c\xdf\x0f\x00>\x9a\xb5\x87BM\x7f`P\xd2\xa5\x8f\xcc\x19\x00\xa5,\x00\xec\xd9\xcf\xe5\x0c\x00\xeb\t\x00\xff\xd9\xd9\xc7\x0c\x0c\x0f\x0f\x0f\xffyy~MZ\xfb\t\x08\xe5M@\xfb__\xff33\xcf\x90x\xf2\xe5\xdf\xc3\x06\x06\xbf\t\x08\xff\xb3\xb3\xd9\xb2\x9f\xff\x06\x06\xac)\x00\xff\xc6\xc6\x0c\t\x08\xf9\xf2\xef\xc9s`\xb8#\x00\x9f/\x00\xff__\xff\x8c\x8c\xc5\x1c\x00\xdf33\xffpp\xcf\x19\x19\xc0\x13\x10\xbf\x90x\xf7YY\xff\xf6\xf6\xe7??\xd7&&\xefLL2& \xdf\xbf\xaf\xbf\xbf\xbf???\xc5M@cn\x81_\x00\x00___\xcb00\xd8\x13\x00YC8\x80\x80\x80\xf3RRsVH\xc490\x10\x10\x10\x917@\xf2\x06\x00\xcf@@\xca\x86pooo\xa3!&\xc1\x1d\x18\xcf//\x1f\x1f\x1f\xdf\x00\x00\xd2\x16\x00\xcb\x90x\xbf\x1f\x00\x19\x13\x10\xf3\xd0\xd0\xe399&\x1d\x18Yy\x8e\x8f\x8f\x8f\xff\xa9\xa9\xcb\x13\x13\xbf00SF@\xb6& >\x1d\x18\xfb\xdd\xdd@@@\x99\x93\x90\xff\xbc\xbc\x7fPP\xaf\xaf\xaf\xc6VHzsp\x93& \xb7pp\xb3\x86ptPP|pp\xafOO\xd0\xd0\xd0\xef\xef\xefL90\xbc\xa9\xa0o0(\xeb\xb0\xb0\xff\xe0\xe0\xff\xd0\xd0\x870(K0(\xc9|h\x9f__lct\xebFF\xcf\xcf\xcf\xe0\xe0\xe0b& \xff  },(@0(\xa9\x93\x88\xa6|h\x1f\xdf\xdf\xd5\xac\x97\xe2\xc5\xb7\xc7`POOO\x9cyhppp\xff\x80\x80\xff\x96\x96\xd7``\xcc\x99\x7f,\xb0\xcf\xbf\x00\x00\x00\x00\x00\x00\xff\xff\xff\x00\x00\xffff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\xa8\x00,\x00\x00\x00\x00=\x00D\x00\x00\x08\xff\x00Q\t\x1cH\xb0\xa0\xc1\x83\x08\x13*\\\xc8\xb0\xa1\xc0\x1b\x07\x0c8\x9cHq\xa1\x89\x14\xa72F\xac\xc8\xb1\xa2\t\x1f\x19Cj\x94\xd8\xb1$B\x03\x07D\xaa\x1ci\xb2%*#3V\xcad\xe9\xb2\xa2\x9d 3s\x9e\xdaX\x93!"\x8c:\x83\xf2\xeci\xf0c\xd0\xa3!\x87\x12E\x89\xb4iR\x92.a:\x9d\xfa\xb4\xe5\x0c\x9cT\xb3\xee\x84:\xf1\x06P\xad`\x95*4\n\xb6l\xd5\x84\x06>\x99]\x1b\xb2\xc5\x9c\x83F\xda\xb0\x9d{\xe4\x84\x00\x83W\xe7\xaeM\xe2f\xd4\xa8\xbb\x03\xbd\xea5kE\x88_\xbf\x80\x0fy\x1a\\\xb6\x08\x92\xc3\x87\x01\x070\xe5\x00\x02\xe3\xa9-\x80\xc4\x80\x1cY\xe0dS\x94-_\x0ezd3\xe7\xce\xa8>\x83\x0e=Zf\x92\x13\xa7Gm\x18 \xe1\xaf\xe7\xd5\xb8+\xb7\xceX8\xf6(\xda\xa2D\xd9N\x8d\xbb\xb8n\xc6\x8e}\x8f\xfa\x12<\xf8\xf0\xcf\x11\x1a\x14\x07}|mf\xdf\x00\x9elP\xd1\\\xb8dSaJ\x95\xffz }zu\xadiLs\xa6\xb0&8\x80\x01\xdd\x9f\x9b\x8a ^<\xf9\xe9\xac\xa9:\x82\x1d{\x83\x84\xe6\xef\xc5\xf7\x1d}\xf5\xd9W\x9eq\xa2\x1d\x95\x84a\xb1\xa9\xb0\x01\x00\xdd\x05\xd8\x9c|\x04\x16X\x8a\x02\x0b0\x80\x9f\x0b=\xe8\x94\\l\x1et \n\x00\x10\x02\x08\xdf\x84\x03ZX \x86\x1a\x16W\x03\x87+]\xe7[\x06\x00\x96\xe8\xde\x89\xce\xa5\xa8\xe2\x8a\x19N\xf7b\x87\x19\xa5\x17\x1b\x05\xa3P\x10\xa1\x8d#\xe2X\x9b\x8e;\xf2\xd8"n/\xd6\xd5\xdf\x13\xa2x\x80$\x89\x11\x9e\xd8\x81\x16\x146\xb9#\x8b\xd3\xf9\xe6\xc1\x7f\xa2\x0cp\xe5\x99\x12\xa8\x80\xdad\x15zi!\x98\xab\xf9Ff\x99gvG$g\xdf1\xa0\x80\x9bM\xc2\t\x19\x00\x19p\xd9\x9d\x99G6\xd7Hl\xdf\x99\xc2\xc8\x9e|~\t\x88)~Q@c\x99\xa3\x0cZg\x06\x00\xf8\x96\xa8)\x0c,\xc0h\xa3\x05^\x02\xe9(\x93Rji\x84\xcb)\'\x1fn\x9d~\nj)\xa3\x0e\xffZis\x84\x06\xd7\x81\xaak\xae\xc6\x01\x07\xa0\xb5\xfa*\xac~\xc9z\xaa\x04\x03l\x80+b\xb7\x81V@\x01$\xac\xd6\xe9\xab\xb1\xd2:kpj\x0ep\xe7\xb1\xab\x9aRA\x01!\x14\xd7\xc0\x03\x8dF\x1b\xdc\x00\xd3\x8ar-\xb6\xc8\x12\x07Z\t\x15\xf0:\xdd\xb7n\x8ak\xaa(\x1ddz\xac\x14\x86\x80\x92+~\xf8\xc1\xbb\xa3\xbc\xe4\xae\xe1\x01\xbaR\xfcAG\'\\\xa4\xab\x1a\xbf\xef\x82k\xa1\xbc\x03\xa3\xeb\xd7\x1d\xa4T\xcc\x87\xc2\xc5qP\x02\xc3\xab\xf9+\x9e\xb8OH\xec\xd7\x1bYTL\x8a\x1f~\xa1\x91\xecj"\xd8\xc01n\xfe\x8e\xdaA\x06\xe7\xa2;\t)Q\xb0AJ\x15\\\xa8\xbc2h!\x14\xe0\xee\xcb\xa05\x10\xc6\xa8"s&\x07\n\x13L\xb0sA\x0b\x9b\xa2\x81\x08"h\xf02\x0f\x15\xe0\x964g2\xa8\xd1D\xd3\xa4\xe8\x01\xf5t\x1c\x14`\xc6\xcb\xcbN\x11\xe7\xd6\x87]@\xca\xd7\x8f\x90\xf2\x01\x08#\x10t\x80$\xc5\x99\xc1-\xc7?\x14\xff@\xc6\xdal\x8f\xe2\x04)b0\xb1\t)}\x84\x12J&\x04\x05\x02\xc5\x18\xb8\xd9P\xc0\x0f\x1c\x93`5h\x81_\xb0H(j\x98\xacD( \xc0`P\xc5\x8f\x83\xa6\xc1\xb6;l1\x9d\x06\x1bk\x9d4\x18:(\x1e\n\x15&sR\xb7A9\xc0Q\xf1 \x18X\x00Z\xdf<\x84\xa0:h$H^\x1cgC\\\xa0\xdc\x10\x9a\xc8\xae8\x11gdQ\x07\x01\x07!\x10\n\x11W| {\xef\xa6\x90\xb0m\x01"T B\x01<\xa8\xed\xba_X|pE\x1e\xa7\xc9\xe0D\x19\xce\xcb\xbe\x04\xf5\x08\x11\x80@\x02\xf1+\xce}\t!\xecP\xc1\x0ed\xb8\xdc\xf9\x86\xa0\x88\x8aQA\x06\x90\xc1\x02\xfc\xf2G\x83\x1c4\xc4~\xf8\xcb\x1f\xf7^v\x98D\x98\x0c\x07\xca\x1b\xc5\x05\xba\x90\xbfP`Bt\x14\x81`\x07\'\xc8/\xbf\xc8@\toC\x01)\x9c\x00\xbb\x0e\xd2\xcd$"\x94\xa0\xef\xf0\xe3\x978\xe0l\x02^ \x05\x07\xf3\x97\x00\x04\xd0\xaf%1t\xde\x0b|X\xb0\x820\x8db\x0f\xa4`\xc2\x04\x16@\x8a\x0e\xce\x8f(\x02\t\xa2\xec\x86X\xc4\xb5\x15"\x898\xc4A\xfc\x1a\x08\xc5\x82HQqT\xc4\xdc("A\n<\x08\x02\x05\x94\x90\x1d\r@\xd8E\x83|1\x14T\xbc\x80\x0e>@\n\x14\x88An\xa0\xbb]\x1b\x13\xf2F\xd9Y\xc2dg\xe8\xe1\x1e\x1d\xd2\xc7P\xa0\x10\x07\x84\xf8\xe1 \x1fx\xbf\xfc\x11\xa1\x12\x90XdG\x82\xb8FI\x02q\t/\xb4\xa4&[\x12\x10\x00;')  # NOQA
+
+        actual = response.content
+
+        self.assertEquals(actual, 'GIF89a=\x00D\x00\xf7\xa8\x00\x9a,3\xff\xc0\xc0\xef\xc0\xc0uXg\xfc\xf9\xf7\x993\x00\xff\xec\xec\xff\xa0\xa0\xe5\xcc\xbf\xcf\x9f\x87\x0f\xef\xef\x7f\x7f\x7f\xef\x0f\x0f\xdf\x1f\x1f\xff&&_\x9f\x9f\xffYY\xbf??5\xa5\xc2\xff\xff\xff\xac\x16\x19\xb2&\x00\xf8\x13\x10\xc2& \xdf`PP\x84\x9b\xf8\x03\x00\xb5\x0b\x0c\xdf\x0f\x00>\x9a\xb5\x87BM\x7f`P\xd2\xa5\x8f\xcc\x19\x00\xa5,\x00\xec\xd9\xcf\xe5\x0c\x00\xeb\t\x00\xff\xd9\xd9\xc7\x0c\x0c\x0f\x0f\x0f\xffyy~MZ\xfb\t\x08\xe5M@\xfb__\xff33\xcf\x90x\xf2\xe5\xdf\xc3\x06\x06\xbf\t\x08\xff\xb3\xb3\xd9\xb2\x9f\xff\x06\x06\xac)\x00\xff\xc6\xc6\x0c\t\x08\xf9\xf2\xef\xc9s`\xb8#\x00\x9f/\x00\xff__\xff\x8c\x8c\xc5\x1c\x00\xdf33\xffpp\xcf\x19\x19\xc0\x13\x10\xbf\x90x\xf7YY\xff\xf6\xf6\xe7??\xd7&&\xefLL2& \xdf\xbf\xaf\xbf\xbf\xbf???\xc5M@cn\x81_\x00\x00___\xcb00\xd8\x13\x00YC8\x80\x80\x80\xf3RRsVH\xc490\x10\x10\x10\x917@\xf2\x06\x00\xcf@@\xca\x86pooo\xa3!&\xc1\x1d\x18\xcf//\x1f\x1f\x1f\xdf\x00\x00\xd2\x16\x00\xcb\x90x\xbf\x1f\x00\x19\x13\x10\xf3\xd0\xd0\xe399&\x1d\x18Yy\x8e\x8f\x8f\x8f\xff\xa9\xa9\xcb\x13\x13\xbf00SF@\xb6& >\x1d\x18\xfb\xdd\xdd@@@\x99\x93\x90\xff\xbc\xbc\x7fPP\xaf\xaf\xaf\xc6VHzsp\x93& \xb7pp\xb3\x86ptPP|pp\xafOO\xd0\xd0\xd0\xef\xef\xefL90\xbc\xa9\xa0o0(\xeb\xb0\xb0\xff\xe0\xe0\xff\xd0\xd0\x870(K0(\xc9|h\x9f__lct\xebFF\xcf\xcf\xcf\xe0\xe0\xe0b& \xff  },(@0(\xa9\x93\x88\xa6|h\x1f\xdf\xdf\xd5\xac\x97\xe2\xc5\xb7\xc7`POOO\x9cyhppp\xff\x80\x80\xff\x96\x96\xd7``\xcc\x99\x7f,\xb0\xcf\xbf\x00\x00\x00\x00\x00\x00\xff\xff\xff\x00\x00\xffff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\xa8\x00,\x00\x00\x00\x00=\x00D\x00\x00\x08\xff\x00Q\t\x1cH\xb0\xa0\xc1\x83\x08\x13*\\\xc8\xb0\xa1\xc0\x1b\x07\x0c8\x9cHq\xa1\x89\x14\xa72F\xac\xc8\xb1\xa2\t\x1f\x19Cj\x94\xd8\xb1$B\x03\x07D\xaa\x1ci\xb2%*#3V\xcad\xe9\xb2\xa2\x9d 3s\x9e\xdaX\x93!"\x8c:\x83\xf2\xeci\xf0c\xd0\xa3!\x87\x12E\x89\xb4iR\x92.a:\x9d\xfa\xb4\xe5\x0c\x9cT\xb3\xee\x84:\xf1\x06P\xad`\x95*4\n\xb6l\xd5\x84\x06>\x99]\x1b\xb2\xc5\x9c\x83F\xda\xb0\x9d{\xe4\x84\x00\x83W\xe7\xaeM\xe2f\xd4\xa8\xbb\x03\xbd\xea5kE\x88_\xbf\x80\x0fy\x1a\\\xb6\x08\x92\xc3\x87\x01\x070\xe5\x00\x02\xe3\xa9-\x80\xc4\x80\x1cY\xe0dS\x94-_\x0ezd3\xe7\xce\xa8>\x83\x0e=Zf\x92\x13\xa7Gm\x18 \xe1\xaf\xe7\xd5\xb8+\xb7\xceX8\xf6(\xda\xa2D\xd9N\x8d\xbb\xb8n\xc6\x8e}\x8f\xfa\x12<\xf8\xf0\xcf\x11\x1a\x14\x07}|mf\xdf\x00\x9elP\xd1\\\xb8dSaJ\x95\xffz }zu\xadiLs\xa6\xb0&8\x80\x01\xdd\x9f\x9b\x8a ^<\xf9\xe9\xac\xa9:\x82\x1d{\x83\x84\xe6\xef\xc5\xf7\x1d}\xf5\xd9W\x9eq\xa2\x1d\x95\x84a\xb1\xa9\xb0\x01\x00\xdd\x05\xd8\x9c|\x04\x16X\x8a\x02\x0b0\x80\x9f\x0b=\xe8\x94\\l\x1et \n\x00\x10\x02\x08\xdf\x84\x03ZX \x86\x1a\x16W\x03\x87+]\xe7[\x06\x00\x96\xe8\xde\x89\xce\xa5\xa8\xe2\x8a\x19N\xf7b\x87\x19\xa5\x17\x1b\x05\xa3P\x10\xa1\x8d#\xe2X\x9b\x8e;\xf2\xd8"n/\xd6\xd5\xdf\x13\xa2x\x80$\x89\x11\x9e\xd8\x81\x16\x146\xb9#\x8b\xd3\xf9\xe6\xc1\x7f\xa2\x0cp\xe5\x99\x12\xa8\x80\xdad\x15zi!\x98\xab\xf9Ff\x99gvG$g\xdf1\xa0\x80\x9bM\xc2\t\x19\x00\x19p\xd9\x9d\x99G6\xd7Hl\xdf\x99\xc2\xc8\x9e|~\t\x88)~Q@c\x99\xa3\x0cZg\x06\x00\xf8\x96\xa8)\x0c,\xc0h\xa3\x05^\x02\xe9(\x93Rji\x84\xcb)\'\x1fn\x9d~\nj)\xa3\x0e\xffZis\x84\x06\xd7\x81\xaak\xae\xc6\x01\x07\xa0\xb5\xfa*\xac~\xc9z\xaa\x04\x03l\x80+b\xb7\x81V@\x01$\xac\xd6\xe9\xab\xb1\xd2:kpj\x0ep\xe7\xb1\xab\x9aRA\x01!\x14\xd7\xc0\x03\x8dF\x1b\xdc\x00\xd3\x8ar-\xb6\xc8\x12\x07Z\t\x15\xf0:\xdd\xb7n\x8ak\xaa(\x1ddz\xac\x14\x86\x80\x92+~\xf8\xc1\xbb\xa3\xbc\xe4\xae\xe1\x01\xbaR\xfcAG\'\\\xa4\xab\x1a\xbf\xef\x82k\xa1\xbc\x03\xa3\xeb\xd7\x1d\xa4T\xcc\x87\xc2\xc5qP\x02\xc3\xab\xf9+\x9e\xb8OH\xec\xd7\x1bYTL\x8a\x1f~\xa1\x91\xecj"\xd8\xc01n\xfe\x8e\xdaA\x06\xe7\xa2;\t)Q\xb0AJ\x15\\\xa8\xbc2h!\x14\xe0\xee\xcb\xa05\x10\xc6\xa8"s&\x07\n\x13L\xb0sA\x0b\x9b\xa2\x81\x08"h\xf02\x0f\x15\xe0\x964g2\xa8\xd1D\xd3\xa4\xe8\x01\xf5t\x1c\x14`\xc6\xcb\xcbN\x11\xe7\xd6\x87]@\xca\xd7\x8f\x90\xf2\x01\x08#\x10t\x80$\xc5\x99\xc1-\xc7?\x14\xff@\xc6\xdal\x8f\xe2\x04)b0\xb1\t)}\x84\x12J&\x04\x05\x02\xc5\x18\xb8\xd9P\xc0\x0f\x1c\x93`5h\x81_\xb0H(j\x98\xacD( \xc0`P\xc5\x8f\x83\xa6\xc1\xb6;l1\x9d\x06\x1bk\x9d4\x18:(\x1e\n\x15&sR\xb7A9\xc0Q\xf1 \x18X\x00Z\xdf<\x84\xa0:h$H^\x1cgC\\\xa0\xdc\x10\x9a\xc8\xae8\x11gdQ\x07\x01\x07!\x10\n\x11W| {\xef\xa6\x90\xb0m\x01"T B\x01<\xa8\xed\xba_X|pE\x1e\xa7\xc9\xe0D\x19\xce\xcb\xbe\x04\xf5\x08\x11\x80@\x02\xf1+\xce}\t!\xecP\xc1\x0ed\xb8\xdc\xf9\x86\xa0\x88\x8aQA\x06\x90\xc1\x02\xfc\xf2G\x83\x1c4\xc4~\xf8\xcb\x1f\xf7^v\x98D\x98\x0c\x07\xca\x1b\xc5\x05\xba\x90\xbfP`Bt\x14\x81`\x07\'\xc8/\xbf\xc8@\toC\x01)\x9c\x00\xbb\x0e\xd2\xcd$"\x94\xa0\xef\xf0\xe3\x978\xe0l\x02^ \x05\x07\xf3\x97\x00\x04\xd0\xaf%1t\xde\x0b|X\xb0\x820\x8db\x0f\xa4`\xc2\x04\x16@\x8a\x0e\xce\x8f(\x02\t\xa2\xec\x86X\xc4\xb5\x15"\x898\xc4A\xfc\x1a\x08\xc5\x82HQqT\xc4\xdc("A\n<\x08\x02\x05\x94\x90\x1d\r@\xd8E\x83|1\x14T\xbc\x80\x0e>@\n\x14\x88An\xa0\xbb]\x1b\x13\xf2F\xd9Y\xc2dg\xe8\xe1\x1e\x1d\xd2\xc7P\xa0\x10\x07\x84\xf8\xe1 \x1fx\xbf\xfc\x11\xa1\x12\x90XdG\x82\xb8FI\x02q\t/\xb4\xa4&[\x12\x10\x00;')  # NOQA
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get('Content-Type'), "image/gif")
+
+    def test_post_binary_and_accept_any(self):
+        path = '/postanybinary'
+
+        response = requests.post(self.url + path,
+                                 headers={"Content-Type": "image/gif"},
+                                 data='GIF89a=\x00D\x00\xf7\xa8\x00\x9a,3\xff\xc0\xc0\xef\xc0\xc0uXg\xfc\xf9\xf7\x993\x00\xff\xec\xec\xff\xa0\xa0\xe5\xcc\xbf\xcf\x9f\x87\x0f\xef\xef\x7f\x7f\x7f\xef\x0f\x0f\xdf\x1f\x1f\xff&&_\x9f\x9f\xffYY\xbf??5\xa5\xc2\xff\xff\xff\xac\x16\x19\xb2&\x00\xf8\x13\x10\xc2& \xdf`PP\x84\x9b\xf8\x03\x00\xb5\x0b\x0c\xdf\x0f\x00>\x9a\xb5\x87BM\x7f`P\xd2\xa5\x8f\xcc\x19\x00\xa5,\x00\xec\xd9\xcf\xe5\x0c\x00\xeb\t\x00\xff\xd9\xd9\xc7\x0c\x0c\x0f\x0f\x0f\xffyy~MZ\xfb\t\x08\xe5M@\xfb__\xff33\xcf\x90x\xf2\xe5\xdf\xc3\x06\x06\xbf\t\x08\xff\xb3\xb3\xd9\xb2\x9f\xff\x06\x06\xac)\x00\xff\xc6\xc6\x0c\t\x08\xf9\xf2\xef\xc9s`\xb8#\x00\x9f/\x00\xff__\xff\x8c\x8c\xc5\x1c\x00\xdf33\xffpp\xcf\x19\x19\xc0\x13\x10\xbf\x90x\xf7YY\xff\xf6\xf6\xe7??\xd7&&\xefLL2& \xdf\xbf\xaf\xbf\xbf\xbf???\xc5M@cn\x81_\x00\x00___\xcb00\xd8\x13\x00YC8\x80\x80\x80\xf3RRsVH\xc490\x10\x10\x10\x917@\xf2\x06\x00\xcf@@\xca\x86pooo\xa3!&\xc1\x1d\x18\xcf//\x1f\x1f\x1f\xdf\x00\x00\xd2\x16\x00\xcb\x90x\xbf\x1f\x00\x19\x13\x10\xf3\xd0\xd0\xe399&\x1d\x18Yy\x8e\x8f\x8f\x8f\xff\xa9\xa9\xcb\x13\x13\xbf00SF@\xb6& >\x1d\x18\xfb\xdd\xdd@@@\x99\x93\x90\xff\xbc\xbc\x7fPP\xaf\xaf\xaf\xc6VHzsp\x93& \xb7pp\xb3\x86ptPP|pp\xafOO\xd0\xd0\xd0\xef\xef\xefL90\xbc\xa9\xa0o0(\xeb\xb0\xb0\xff\xe0\xe0\xff\xd0\xd0\x870(K0(\xc9|h\x9f__lct\xebFF\xcf\xcf\xcf\xe0\xe0\xe0b& \xff  },(@0(\xa9\x93\x88\xa6|h\x1f\xdf\xdf\xd5\xac\x97\xe2\xc5\xb7\xc7`POOO\x9cyhppp\xff\x80\x80\xff\x96\x96\xd7``\xcc\x99\x7f,\xb0\xcf\xbf\x00\x00\x00\x00\x00\x00\xff\xff\xff\x00\x00\xffff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\xa8\x00,\x00\x00\x00\x00=\x00D\x00\x00\x08\xff\x00Q\t\x1cH\xb0\xa0\xc1\x83\x08\x13*\\\xc8\xb0\xa1\xc0\x1b\x07\x0c8\x9cHq\xa1\x89\x14\xa72F\xac\xc8\xb1\xa2\t\x1f\x19Cj\x94\xd8\xb1$B\x03\x07D\xaa\x1ci\xb2%*#3V\xcad\xe9\xb2\xa2\x9d 3s\x9e\xdaX\x93!"\x8c:\x83\xf2\xeci\xf0c\xd0\xa3!\x87\x12E\x89\xb4iR\x92.a:\x9d\xfa\xb4\xe5\x0c\x9cT\xb3\xee\x84:\xf1\x06P\xad`\x95*4\n\xb6l\xd5\x84\x06>\x99]\x1b\xb2\xc5\x9c\x83F\xda\xb0\x9d{\xe4\x84\x00\x83W\xe7\xaeM\xe2f\xd4\xa8\xbb\x03\xbd\xea5kE\x88_\xbf\x80\x0fy\x1a\\\xb6\x08\x92\xc3\x87\x01\x070\xe5\x00\x02\xe3\xa9-\x80\xc4\x80\x1cY\xe0dS\x94-_\x0ezd3\xe7\xce\xa8>\x83\x0e=Zf\x92\x13\xa7Gm\x18 \xe1\xaf\xe7\xd5\xb8+\xb7\xceX8\xf6(\xda\xa2D\xd9N\x8d\xbb\xb8n\xc6\x8e}\x8f\xfa\x12<\xf8\xf0\xcf\x11\x1a\x14\x07}|mf\xdf\x00\x9elP\xd1\\\xb8dSaJ\x95\xffz }zu\xadiLs\xa6\xb0&8\x80\x01\xdd\x9f\x9b\x8a ^<\xf9\xe9\xac\xa9:\x82\x1d{\x83\x84\xe6\xef\xc5\xf7\x1d}\xf5\xd9W\x9eq\xa2\x1d\x95\x84a\xb1\xa9\xb0\x01\x00\xdd\x05\xd8\x9c|\x04\x16X\x8a\x02\x0b0\x80\x9f\x0b=\xe8\x94\\l\x1et \n\x00\x10\x02\x08\xdf\x84\x03ZX \x86\x1a\x16W\x03\x87+]\xe7[\x06\x00\x96\xe8\xde\x89\xce\xa5\xa8\xe2\x8a\x19N\xf7b\x87\x19\xa5\x17\x1b\x05\xa3P\x10\xa1\x8d#\xe2X\x9b\x8e;\xf2\xd8"n/\xd6\xd5\xdf\x13\xa2x\x80$\x89\x11\x9e\xd8\x81\x16\x146\xb9#\x8b\xd3\xf9\xe6\xc1\x7f\xa2\x0cp\xe5\x99\x12\xa8\x80\xdad\x15zi!\x98\xab\xf9Ff\x99gvG$g\xdf1\xa0\x80\x9bM\xc2\t\x19\x00\x19p\xd9\x9d\x99G6\xd7Hl\xdf\x99\xc2\xc8\x9e|~\t\x88)~Q@c\x99\xa3\x0cZg\x06\x00\xf8\x96\xa8)\x0c,\xc0h\xa3\x05^\x02\xe9(\x93Rji\x84\xcb)\'\x1fn\x9d~\nj)\xa3\x0e\xffZis\x84\x06\xd7\x81\xaak\xae\xc6\x01\x07\xa0\xb5\xfa*\xac~\xc9z\xaa\x04\x03l\x80+b\xb7\x81V@\x01$\xac\xd6\xe9\xab\xb1\xd2:kpj\x0ep\xe7\xb1\xab\x9aRA\x01!\x14\xd7\xc0\x03\x8dF\x1b\xdc\x00\xd3\x8ar-\xb6\xc8\x12\x07Z\t\x15\xf0:\xdd\xb7n\x8ak\xaa(\x1ddz\xac\x14\x86\x80\x92+~\xf8\xc1\xbb\xa3\xbc\xe4\xae\xe1\x01\xbaR\xfcAG\'\\\xa4\xab\x1a\xbf\xef\x82k\xa1\xbc\x03\xa3\xeb\xd7\x1d\xa4T\xcc\x87\xc2\xc5qP\x02\xc3\xab\xf9+\x9e\xb8OH\xec\xd7\x1bYTL\x8a\x1f~\xa1\x91\xecj"\xd8\xc01n\xfe\x8e\xdaA\x06\xe7\xa2;\t)Q\xb0AJ\x15\\\xa8\xbc2h!\x14\xe0\xee\xcb\xa05\x10\xc6\xa8"s&\x07\n\x13L\xb0sA\x0b\x9b\xa2\x81\x08"h\xf02\x0f\x15\xe0\x964g2\xa8\xd1D\xd3\xa4\xe8\x01\xf5t\x1c\x14`\xc6\xcb\xcbN\x11\xe7\xd6\x87]@\xca\xd7\x8f\x90\xf2\x01\x08#\x10t\x80$\xc5\x99\xc1-\xc7?\x14\xff@\xc6\xdal\x8f\xe2\x04)b0\xb1\t)}\x84\x12J&\x04\x05\x02\xc5\x18\xb8\xd9P\xc0\x0f\x1c\x93`5h\x81_\xb0H(j\x98\xacD( \xc0`P\xc5\x8f\x83\xa6\xc1\xb6;l1\x9d\x06\x1bk\x9d4\x18:(\x1e\n\x15&sR\xb7A9\xc0Q\xf1 \x18X\x00Z\xdf<\x84\xa0:h$H^\x1cgC\\\xa0\xdc\x10\x9a\xc8\xae8\x11gdQ\x07\x01\x07!\x10\n\x11W| {\xef\xa6\x90\xb0m\x01"T B\x01<\xa8\xed\xba_X|pE\x1e\xa7\xc9\xe0D\x19\xce\xcb\xbe\x04\xf5\x08\x11\x80@\x02\xf1+\xce}\t!\xecP\xc1\x0ed\xb8\xdc\xf9\x86\xa0\x88\x8aQA\x06\x90\xc1\x02\xfc\xf2G\x83\x1c4\xc4~\xf8\xcb\x1f\xf7^v\x98D\x98\x0c\x07\xca\x1b\xc5\x05\xba\x90\xbfP`Bt\x14\x81`\x07\'\xc8/\xbf\xc8@\toC\x01)\x9c\x00\xbb\x0e\xd2\xcd$"\x94\xa0\xef\xf0\xe3\x978\xe0l\x02^ \x05\x07\xf3\x97\x00\x04\xd0\xaf%1t\xde\x0b|X\xb0\x820\x8db\x0f\xa4`\xc2\x04\x16@\x8a\x0e\xce\x8f(\x02\t\xa2\xec\x86X\xc4\xb5\x15"\x898\xc4A\xfc\x1a\x08\xc5\x82HQqT\xc4\xdc("A\n<\x08\x02\x05\x94\x90\x1d\r@\xd8E\x83|1\x14T\xbc\x80\x0e>@\n\x14\x88An\xa0\xbb]\x1b\x13\xf2F\xd9Y\xc2dg\xe8\xe1\x1e\x1d\xd2\xc7P\xa0\x10\x07\x84\xf8\xe1 \x1fx\xbf\xfc\x11\xa1\x12\x90XdG\x82\xb8FI\x02q\t/\xb4\xa4&[\x12\x10\x00;')  # NOQA
+
+        actual = response.content
+
+        self.assertEquals(actual, 'GIF89a=\x00D\x00\xf7\xa8\x00\x9a,3\xff\xc0\xc0\xef\xc0\xc0uXg\xfc\xf9\xf7\x993\x00\xff\xec\xec\xff\xa0\xa0\xe5\xcc\xbf\xcf\x9f\x87\x0f\xef\xef\x7f\x7f\x7f\xef\x0f\x0f\xdf\x1f\x1f\xff&&_\x9f\x9f\xffYY\xbf??5\xa5\xc2\xff\xff\xff\xac\x16\x19\xb2&\x00\xf8\x13\x10\xc2& \xdf`PP\x84\x9b\xf8\x03\x00\xb5\x0b\x0c\xdf\x0f\x00>\x9a\xb5\x87BM\x7f`P\xd2\xa5\x8f\xcc\x19\x00\xa5,\x00\xec\xd9\xcf\xe5\x0c\x00\xeb\t\x00\xff\xd9\xd9\xc7\x0c\x0c\x0f\x0f\x0f\xffyy~MZ\xfb\t\x08\xe5M@\xfb__\xff33\xcf\x90x\xf2\xe5\xdf\xc3\x06\x06\xbf\t\x08\xff\xb3\xb3\xd9\xb2\x9f\xff\x06\x06\xac)\x00\xff\xc6\xc6\x0c\t\x08\xf9\xf2\xef\xc9s`\xb8#\x00\x9f/\x00\xff__\xff\x8c\x8c\xc5\x1c\x00\xdf33\xffpp\xcf\x19\x19\xc0\x13\x10\xbf\x90x\xf7YY\xff\xf6\xf6\xe7??\xd7&&\xefLL2& \xdf\xbf\xaf\xbf\xbf\xbf???\xc5M@cn\x81_\x00\x00___\xcb00\xd8\x13\x00YC8\x80\x80\x80\xf3RRsVH\xc490\x10\x10\x10\x917@\xf2\x06\x00\xcf@@\xca\x86pooo\xa3!&\xc1\x1d\x18\xcf//\x1f\x1f\x1f\xdf\x00\x00\xd2\x16\x00\xcb\x90x\xbf\x1f\x00\x19\x13\x10\xf3\xd0\xd0\xe399&\x1d\x18Yy\x8e\x8f\x8f\x8f\xff\xa9\xa9\xcb\x13\x13\xbf00SF@\xb6& >\x1d\x18\xfb\xdd\xdd@@@\x99\x93\x90\xff\xbc\xbc\x7fPP\xaf\xaf\xaf\xc6VHzsp\x93& \xb7pp\xb3\x86ptPP|pp\xafOO\xd0\xd0\xd0\xef\xef\xefL90\xbc\xa9\xa0o0(\xeb\xb0\xb0\xff\xe0\xe0\xff\xd0\xd0\x870(K0(\xc9|h\x9f__lct\xebFF\xcf\xcf\xcf\xe0\xe0\xe0b& \xff  },(@0(\xa9\x93\x88\xa6|h\x1f\xdf\xdf\xd5\xac\x97\xe2\xc5\xb7\xc7`POOO\x9cyhppp\xff\x80\x80\xff\x96\x96\xd7``\xcc\x99\x7f,\xb0\xcf\xbf\x00\x00\x00\x00\x00\x00\xff\xff\xff\x00\x00\xffff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\xa8\x00,\x00\x00\x00\x00=\x00D\x00\x00\x08\xff\x00Q\t\x1cH\xb0\xa0\xc1\x83\x08\x13*\\\xc8\xb0\xa1\xc0\x1b\x07\x0c8\x9cHq\xa1\x89\x14\xa72F\xac\xc8\xb1\xa2\t\x1f\x19Cj\x94\xd8\xb1$B\x03\x07D\xaa\x1ci\xb2%*#3V\xcad\xe9\xb2\xa2\x9d 3s\x9e\xdaX\x93!"\x8c:\x83\xf2\xeci\xf0c\xd0\xa3!\x87\x12E\x89\xb4iR\x92.a:\x9d\xfa\xb4\xe5\x0c\x9cT\xb3\xee\x84:\xf1\x06P\xad`\x95*4\n\xb6l\xd5\x84\x06>\x99]\x1b\xb2\xc5\x9c\x83F\xda\xb0\x9d{\xe4\x84\x00\x83W\xe7\xaeM\xe2f\xd4\xa8\xbb\x03\xbd\xea5kE\x88_\xbf\x80\x0fy\x1a\\\xb6\x08\x92\xc3\x87\x01\x070\xe5\x00\x02\xe3\xa9-\x80\xc4\x80\x1cY\xe0dS\x94-_\x0ezd3\xe7\xce\xa8>\x83\x0e=Zf\x92\x13\xa7Gm\x18 \xe1\xaf\xe7\xd5\xb8+\xb7\xceX8\xf6(\xda\xa2D\xd9N\x8d\xbb\xb8n\xc6\x8e}\x8f\xfa\x12<\xf8\xf0\xcf\x11\x1a\x14\x07}|mf\xdf\x00\x9elP\xd1\\\xb8dSaJ\x95\xffz }zu\xadiLs\xa6\xb0&8\x80\x01\xdd\x9f\x9b\x8a ^<\xf9\xe9\xac\xa9:\x82\x1d{\x83\x84\xe6\xef\xc5\xf7\x1d}\xf5\xd9W\x9eq\xa2\x1d\x95\x84a\xb1\xa9\xb0\x01\x00\xdd\x05\xd8\x9c|\x04\x16X\x8a\x02\x0b0\x80\x9f\x0b=\xe8\x94\\l\x1et \n\x00\x10\x02\x08\xdf\x84\x03ZX \x86\x1a\x16W\x03\x87+]\xe7[\x06\x00\x96\xe8\xde\x89\xce\xa5\xa8\xe2\x8a\x19N\xf7b\x87\x19\xa5\x17\x1b\x05\xa3P\x10\xa1\x8d#\xe2X\x9b\x8e;\xf2\xd8"n/\xd6\xd5\xdf\x13\xa2x\x80$\x89\x11\x9e\xd8\x81\x16\x146\xb9#\x8b\xd3\xf9\xe6\xc1\x7f\xa2\x0cp\xe5\x99\x12\xa8\x80\xdad\x15zi!\x98\xab\xf9Ff\x99gvG$g\xdf1\xa0\x80\x9bM\xc2\t\x19\x00\x19p\xd9\x9d\x99G6\xd7Hl\xdf\x99\xc2\xc8\x9e|~\t\x88)~Q@c\x99\xa3\x0cZg\x06\x00\xf8\x96\xa8)\x0c,\xc0h\xa3\x05^\x02\xe9(\x93Rji\x84\xcb)\'\x1fn\x9d~\nj)\xa3\x0e\xffZis\x84\x06\xd7\x81\xaak\xae\xc6\x01\x07\xa0\xb5\xfa*\xac~\xc9z\xaa\x04\x03l\x80+b\xb7\x81V@\x01$\xac\xd6\xe9\xab\xb1\xd2:kpj\x0ep\xe7\xb1\xab\x9aRA\x01!\x14\xd7\xc0\x03\x8dF\x1b\xdc\x00\xd3\x8ar-\xb6\xc8\x12\x07Z\t\x15\xf0:\xdd\xb7n\x8ak\xaa(\x1ddz\xac\x14\x86\x80\x92+~\xf8\xc1\xbb\xa3\xbc\xe4\xae\xe1\x01\xbaR\xfcAG\'\\\xa4\xab\x1a\xbf\xef\x82k\xa1\xbc\x03\xa3\xeb\xd7\x1d\xa4T\xcc\x87\xc2\xc5qP\x02\xc3\xab\xf9+\x9e\xb8OH\xec\xd7\x1bYTL\x8a\x1f~\xa1\x91\xecj"\xd8\xc01n\xfe\x8e\xdaA\x06\xe7\xa2;\t)Q\xb0AJ\x15\\\xa8\xbc2h!\x14\xe0\xee\xcb\xa05\x10\xc6\xa8"s&\x07\n\x13L\xb0sA\x0b\x9b\xa2\x81\x08"h\xf02\x0f\x15\xe0\x964g2\xa8\xd1D\xd3\xa4\xe8\x01\xf5t\x1c\x14`\xc6\xcb\xcbN\x11\xe7\xd6\x87]@\xca\xd7\x8f\x90\xf2\x01\x08#\x10t\x80$\xc5\x99\xc1-\xc7?\x14\xff@\xc6\xdal\x8f\xe2\x04)b0\xb1\t)}\x84\x12J&\x04\x05\x02\xc5\x18\xb8\xd9P\xc0\x0f\x1c\x93`5h\x81_\xb0H(j\x98\xacD( \xc0`P\xc5\x8f\x83\xa6\xc1\xb6;l1\x9d\x06\x1bk\x9d4\x18:(\x1e\n\x15&sR\xb7A9\xc0Q\xf1 \x18X\x00Z\xdf<\x84\xa0:h$H^\x1cgC\\\xa0\xdc\x10\x9a\xc8\xae8\x11gdQ\x07\x01\x07!\x10\n\x11W| {\xef\xa6\x90\xb0m\x01"T B\x01<\xa8\xed\xba_X|pE\x1e\xa7\xc9\xe0D\x19\xce\xcb\xbe\x04\xf5\x08\x11\x80@\x02\xf1+\xce}\t!\xecP\xc1\x0ed\xb8\xdc\xf9\x86\xa0\x88\x8aQA\x06\x90\xc1\x02\xfc\xf2G\x83\x1c4\xc4~\xf8\xcb\x1f\xf7^v\x98D\x98\x0c\x07\xca\x1b\xc5\x05\xba\x90\xbfP`Bt\x14\x81`\x07\'\xc8/\xbf\xc8@\toC\x01)\x9c\x00\xbb\x0e\xd2\xcd$"\x94\xa0\xef\xf0\xe3\x978\xe0l\x02^ \x05\x07\xf3\x97\x00\x04\xd0\xaf%1t\xde\x0b|X\xb0\x820\x8db\x0f\xa4`\xc2\x04\x16@\x8a\x0e\xce\x8f(\x02\t\xa2\xec\x86X\xc4\xb5\x15"\x898\xc4A\xfc\x1a\x08\xc5\x82HQqT\xc4\xdc("A\n<\x08\x02\x05\x94\x90\x1d\r@\xd8E\x83|1\x14T\xbc\x80\x0e>@\n\x14\x88An\xa0\xbb]\x1b\x13\xf2F\xd9Y\xc2dg\xe8\xe1\x1e\x1d\xd2\xc7P\xa0\x10\x07\x84\xf8\xe1 \x1fx\xbf\xfc\x11\xa1\x12\x90XdG\x82\xb8FI\x02q\t/\xb4\xa4&[\x12\x10\x00;')  # NOQA
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get('Content-Type'), "image/gif")
+
+    def test_post_binary_with_incorrect_content_type(self):
+        expected = {"message": "Internal server error"}
+
+        path = '/postbinarygif'
+
+        response = requests.post(self.url + path,
+                                 headers={"Content-Type": "application/json"},
+                                 data='GIF89a=\x00D\x00\xf7\xa8\x00\x9a,3\xff\xc0\xc0\xef\xc0\xc0uXg\xfc\xf9\xf7\x993\x00\xff\xec\xec\xff\xa0\xa0\xe5\xcc\xbf\xcf\x9f\x87\x0f\xef\xef\x7f\x7f\x7f\xef\x0f\x0f\xdf\x1f\x1f\xff&&_\x9f\x9f\xffYY\xbf??5\xa5\xc2\xff\xff\xff\xac\x16\x19\xb2&\x00\xf8\x13\x10\xc2& \xdf`PP\x84\x9b\xf8\x03\x00\xb5\x0b\x0c\xdf\x0f\x00>\x9a\xb5\x87BM\x7f`P\xd2\xa5\x8f\xcc\x19\x00\xa5,\x00\xec\xd9\xcf\xe5\x0c\x00\xeb\t\x00\xff\xd9\xd9\xc7\x0c\x0c\x0f\x0f\x0f\xffyy~MZ\xfb\t\x08\xe5M@\xfb__\xff33\xcf\x90x\xf2\xe5\xdf\xc3\x06\x06\xbf\t\x08\xff\xb3\xb3\xd9\xb2\x9f\xff\x06\x06\xac)\x00\xff\xc6\xc6\x0c\t\x08\xf9\xf2\xef\xc9s`\xb8#\x00\x9f/\x00\xff__\xff\x8c\x8c\xc5\x1c\x00\xdf33\xffpp\xcf\x19\x19\xc0\x13\x10\xbf\x90x\xf7YY\xff\xf6\xf6\xe7??\xd7&&\xefLL2& \xdf\xbf\xaf\xbf\xbf\xbf???\xc5M@cn\x81_\x00\x00___\xcb00\xd8\x13\x00YC8\x80\x80\x80\xf3RRsVH\xc490\x10\x10\x10\x917@\xf2\x06\x00\xcf@@\xca\x86pooo\xa3!&\xc1\x1d\x18\xcf//\x1f\x1f\x1f\xdf\x00\x00\xd2\x16\x00\xcb\x90x\xbf\x1f\x00\x19\x13\x10\xf3\xd0\xd0\xe399&\x1d\x18Yy\x8e\x8f\x8f\x8f\xff\xa9\xa9\xcb\x13\x13\xbf00SF@\xb6& >\x1d\x18\xfb\xdd\xdd@@@\x99\x93\x90\xff\xbc\xbc\x7fPP\xaf\xaf\xaf\xc6VHzsp\x93& \xb7pp\xb3\x86ptPP|pp\xafOO\xd0\xd0\xd0\xef\xef\xefL90\xbc\xa9\xa0o0(\xeb\xb0\xb0\xff\xe0\xe0\xff\xd0\xd0\x870(K0(\xc9|h\x9f__lct\xebFF\xcf\xcf\xcf\xe0\xe0\xe0b& \xff  },(@0(\xa9\x93\x88\xa6|h\x1f\xdf\xdf\xd5\xac\x97\xe2\xc5\xb7\xc7`POOO\x9cyhppp\xff\x80\x80\xff\x96\x96\xd7``\xcc\x99\x7f,\xb0\xcf\xbf\x00\x00\x00\x00\x00\x00\xff\xff\xff\x00\x00\xffff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\xa8\x00,\x00\x00\x00\x00=\x00D\x00\x00\x08\xff\x00Q\t\x1cH\xb0\xa0\xc1\x83\x08\x13*\\\xc8\xb0\xa1\xc0\x1b\x07\x0c8\x9cHq\xa1\x89\x14\xa72F\xac\xc8\xb1\xa2\t\x1f\x19Cj\x94\xd8\xb1$B\x03\x07D\xaa\x1ci\xb2%*#3V\xcad\xe9\xb2\xa2\x9d 3s\x9e\xdaX\x93!"\x8c:\x83\xf2\xeci\xf0c\xd0\xa3!\x87\x12E\x89\xb4iR\x92.a:\x9d\xfa\xb4\xe5\x0c\x9cT\xb3\xee\x84:\xf1\x06P\xad`\x95*4\n\xb6l\xd5\x84\x06>\x99]\x1b\xb2\xc5\x9c\x83F\xda\xb0\x9d{\xe4\x84\x00\x83W\xe7\xaeM\xe2f\xd4\xa8\xbb\x03\xbd\xea5kE\x88_\xbf\x80\x0fy\x1a\\\xb6\x08\x92\xc3\x87\x01\x070\xe5\x00\x02\xe3\xa9-\x80\xc4\x80\x1cY\xe0dS\x94-_\x0ezd3\xe7\xce\xa8>\x83\x0e=Zf\x92\x13\xa7Gm\x18 \xe1\xaf\xe7\xd5\xb8+\xb7\xceX8\xf6(\xda\xa2D\xd9N\x8d\xbb\xb8n\xc6\x8e}\x8f\xfa\x12<\xf8\xf0\xcf\x11\x1a\x14\x07}|mf\xdf\x00\x9elP\xd1\\\xb8dSaJ\x95\xffz }zu\xadiLs\xa6\xb0&8\x80\x01\xdd\x9f\x9b\x8a ^<\xf9\xe9\xac\xa9:\x82\x1d{\x83\x84\xe6\xef\xc5\xf7\x1d}\xf5\xd9W\x9eq\xa2\x1d\x95\x84a\xb1\xa9\xb0\x01\x00\xdd\x05\xd8\x9c|\x04\x16X\x8a\x02\x0b0\x80\x9f\x0b=\xe8\x94\\l\x1et \n\x00\x10\x02\x08\xdf\x84\x03ZX \x86\x1a\x16W\x03\x87+]\xe7[\x06\x00\x96\xe8\xde\x89\xce\xa5\xa8\xe2\x8a\x19N\xf7b\x87\x19\xa5\x17\x1b\x05\xa3P\x10\xa1\x8d#\xe2X\x9b\x8e;\xf2\xd8"n/\xd6\xd5\xdf\x13\xa2x\x80$\x89\x11\x9e\xd8\x81\x16\x146\xb9#\x8b\xd3\xf9\xe6\xc1\x7f\xa2\x0cp\xe5\x99\x12\xa8\x80\xdad\x15zi!\x98\xab\xf9Ff\x99gvG$g\xdf1\xa0\x80\x9bM\xc2\t\x19\x00\x19p\xd9\x9d\x99G6\xd7Hl\xdf\x99\xc2\xc8\x9e|~\t\x88)~Q@c\x99\xa3\x0cZg\x06\x00\xf8\x96\xa8)\x0c,\xc0h\xa3\x05^\x02\xe9(\x93Rji\x84\xcb)\'\x1fn\x9d~\nj)\xa3\x0e\xffZis\x84\x06\xd7\x81\xaak\xae\xc6\x01\x07\xa0\xb5\xfa*\xac~\xc9z\xaa\x04\x03l\x80+b\xb7\x81V@\x01$\xac\xd6\xe9\xab\xb1\xd2:kpj\x0ep\xe7\xb1\xab\x9aRA\x01!\x14\xd7\xc0\x03\x8dF\x1b\xdc\x00\xd3\x8ar-\xb6\xc8\x12\x07Z\t\x15\xf0:\xdd\xb7n\x8ak\xaa(\x1ddz\xac\x14\x86\x80\x92+~\xf8\xc1\xbb\xa3\xbc\xe4\xae\xe1\x01\xbaR\xfcAG\'\\\xa4\xab\x1a\xbf\xef\x82k\xa1\xbc\x03\xa3\xeb\xd7\x1d\xa4T\xcc\x87\xc2\xc5qP\x02\xc3\xab\xf9+\x9e\xb8OH\xec\xd7\x1bYTL\x8a\x1f~\xa1\x91\xecj"\xd8\xc01n\xfe\x8e\xdaA\x06\xe7\xa2;\t)Q\xb0AJ\x15\\\xa8\xbc2h!\x14\xe0\xee\xcb\xa05\x10\xc6\xa8"s&\x07\n\x13L\xb0sA\x0b\x9b\xa2\x81\x08"h\xf02\x0f\x15\xe0\x964g2\xa8\xd1D\xd3\xa4\xe8\x01\xf5t\x1c\x14`\xc6\xcb\xcbN\x11\xe7\xd6\x87]@\xca\xd7\x8f\x90\xf2\x01\x08#\x10t\x80$\xc5\x99\xc1-\xc7?\x14\xff@\xc6\xdal\x8f\xe2\x04)b0\xb1\t)}\x84\x12J&\x04\x05\x02\xc5\x18\xb8\xd9P\xc0\x0f\x1c\x93`5h\x81_\xb0H(j\x98\xacD( \xc0`P\xc5\x8f\x83\xa6\xc1\xb6;l1\x9d\x06\x1bk\x9d4\x18:(\x1e\n\x15&sR\xb7A9\xc0Q\xf1 \x18X\x00Z\xdf<\x84\xa0:h$H^\x1cgC\\\xa0\xdc\x10\x9a\xc8\xae8\x11gdQ\x07\x01\x07!\x10\n\x11W| {\xef\xa6\x90\xb0m\x01"T B\x01<\xa8\xed\xba_X|pE\x1e\xa7\xc9\xe0D\x19\xce\xcb\xbe\x04\xf5\x08\x11\x80@\x02\xf1+\xce}\t!\xecP\xc1\x0ed\xb8\xdc\xf9\x86\xa0\x88\x8aQA\x06\x90\xc1\x02\xfc\xf2G\x83\x1c4\xc4~\xf8\xcb\x1f\xf7^v\x98D\x98\x0c\x07\xca\x1b\xc5\x05\xba\x90\xbfP`Bt\x14\x81`\x07\'\xc8/\xbf\xc8@\toC\x01)\x9c\x00\xbb\x0e\xd2\xcd$"\x94\xa0\xef\xf0\xe3\x978\xe0l\x02^ \x05\x07\xf3\x97\x00\x04\xd0\xaf%1t\xde\x0b|X\xb0\x820\x8db\x0f\xa4`\xc2\x04\x16@\x8a\x0e\xce\x8f(\x02\t\xa2\xec\x86X\xc4\xb5\x15"\x898\xc4A\xfc\x1a\x08\xc5\x82HQqT\xc4\xdc("A\n<\x08\x02\x05\x94\x90\x1d\r@\xd8E\x83|1\x14T\xbc\x80\x0e>@\n\x14\x88An\xa0\xbb]\x1b\x13\xf2F\xd9Y\xc2dg\xe8\xe1\x1e\x1d\xd2\xc7P\xa0\x10\x07\x84\xf8\xe1 \x1fx\xbf\xfc\x11\xa1\x12\x90XdG\x82\xb8FI\x02q\t/\xb4\xa4&[\x12\x10\x00;')  # NOQA
+
+        actual = response.json()
+
+        self.assertEquals(actual, expected)
+        self.assertEquals(response.status_code, 502)
+        self.assertEquals(response.headers.get('Content-Type'), "application/json")
+
+
+def make_service(list_of_routes, function_provider, cwd):
+    port = random_port()
+    manager = ContainerManager()
+    local_runtime = LambdaRuntime(manager)
+    lambda_runner = LocalLambdaRunner(local_runtime=local_runtime,
+                                      function_provider=function_provider,
+                                      cwd=cwd)
+
+    service = Service(list_of_routes, lambda_runner, port=port)
+
+    scheme = "http"
+    url = '{}://0.0.0.0:{}'.format(scheme, port)
+    return service, port, url, scheme
+
+
+def make_service_response(port, method, scheme, resourcePath, resolvedResourcePath, pathParameters=None,
+                          body=None, headers=None, queryParams=None, isBase64Encoded=False):
+    response_str = '{"httpMethod": "GET", "body": null, "resource": "/something/{event}", "requestContext": {"resourceId": "123456", "apiId": "1234567890", "resourcePath": "/something/{event}", "httpMethod": "GET", "requestId": "c6af9ac6-7b61-11e6-9a41-93e8deadbeef", "accountId": "123456789012", "stage": "prod", "identity": {"apiKey": null, "userArn": null, "cognitoAuthenticationType": null, "caller": null, "userAgent": "Custom User Agent String", "user": null, "cognitoIdentityPoolId": null, "cognitoAuthenticationProvider": null, "sourceIp": "127.0.0.1", "accountId": null}, "extendedRequestId": null, "path": "/something/{event}"}, "queryStringParameters": null, "headers": {"Host": "0.0.0.0:33651", "User-Agent": "python-requests/2.18.4", "Accept-Encoding": "gzip, deflate", "Accept": "*/*", "Connection": "keep-alive"}, "pathParameters": {"event": "event1"}, "stageVariables": null, "path": "/something/event1", "isBase64Encoded": false}' # NOQA
+    response = json.loads(response_str)
+
+    if body:
+        response["body"] = body
+
+    response["httpMethod"] = method
+    response['requestContext']["httpMethod"] = method
+    response["requestContext"]["resourcePath"] = resourcePath
+    response["requestContext"]["path"] = resourcePath
+    response["resource"] = resourcePath
+    response["path"] = resolvedResourcePath
+    response["pathParameters"] = pathParameters
+    response["queryStringParameters"] = queryParams
+    response["isBase64Encoded"] = isBase64Encoded
+
+
+    headers = headers or {}
+    for header, value in headers.items():
+        response["headers"][header] = value
+
+    response["headers"]["Host"] = "0.0.0.0:{}".format(port)
+    response["headers"]["X-Forwarded-Port"] = str(port)
+    response["headers"]["X-Forwarded-Proto"] = scheme
+
+    return response
+
+
+def random_port():
+    return random.randint(30000, 40000)
+
diff --git a/tests/functional/local/docker/__init__.py b/tests/functional/local/docker/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/local/docker/test_container_manager.py b/tests/functional/local/docker/test_container_manager.py
new file mode 100644
index 0000000000..1a23f871e3
--- /dev/null
+++ b/tests/functional/local/docker/test_container_manager.py
@@ -0,0 +1,41 @@
+import docker
+
+from unittest import TestCase
+from samcli.local.docker.manager import ContainerManager
+
+
+class TestContainerManager(TestCase):
+    """
+    Verifies functionality of ContainerManager by calling Docker APIs
+    """
+    IMAGE = "busybox"  # small sized Linux container
+
+    @classmethod
+    def setUpClass(cls):
+        # Make sure we start with a clean slate
+        docker_client = docker.from_env()
+        TestContainerManager._remove_image(docker_client)
+
+    def setUp(self):
+        self.manager = ContainerManager()
+        self.docker_client = docker.from_env()
+
+    def tearDown(self):
+        self._remove_image(self.docker_client)
+
+    def test_pull_image(self):
+        # Image should not exist
+        self.assertFalse(self.manager.has_image(self.IMAGE))
+
+        # Pull the image
+        self.manager.pull_image(self.IMAGE)
+
+        # Image should be available now
+        self.assertTrue(self.manager.has_image(self.IMAGE))
+
+    @classmethod
+    def _remove_image(cls, docker_client):
+        try:
+            docker_client.images.remove(cls.IMAGE)
+        except docker.errors.ImageNotFound:
+            pass
diff --git a/tests/functional/local/docker/test_lambda_container.py b/tests/functional/local/docker/test_lambda_container.py
new file mode 100644
index 0000000000..50212de553
--- /dev/null
+++ b/tests/functional/local/docker/test_lambda_container.py
@@ -0,0 +1,166 @@
+"""
+Functional test to ensure Lambda runtime Docker containers can be created, run and managed
+"""
+import os
+import io
+import random
+import shutil
+import docker
+import six
+
+from contextlib import contextmanager
+from unittest import TestCase
+
+from tests.functional.function_code import nodejs_lambda
+from samcli.local.docker.lambda_container import LambdaContainer
+from samcli.local.docker.manager import ContainerManager
+
+
+class TestLambdaContainer(TestCase):
+    """
+    Verify that the Lambda runtime Docker container is setup properly. It focuses on functionality that are
+    non-trivial to unit test such as connecting container to correct network, mounting folder properly, or
+    setting up debug port forwarding. These operations might also exhibit differences across Operating Systems, hence
+    necessary to tests them here.
+    """
+    IMAGE_NAME = "lambci/lambda:nodejs4.3"
+
+    HELLO_WORLD_CODE = """
+    exports.handler = function(event, context, callback){
+    
+        console.log("**This string is printed from Lambda function**"); 
+        callback(null, {"a": "b"})
+    }
+    """
+
+    @classmethod
+    def setUpClass(cls):
+
+        manager = ContainerManager()
+        if not manager.has_image(cls.IMAGE_NAME):
+            manager.pull_image(cls.IMAGE_NAME)
+
+    def setUp(self):
+        random.seed()
+
+        self.runtime = "nodejs4.3"
+        self.expected_docker_image = self.IMAGE_NAME
+        self.handler = "index.handler"
+        self.debug_port = _rand_port()
+        self.code_dir = nodejs_lambda(self.HELLO_WORLD_CODE)
+        self.network_prefix = "sam_cli_test_network"
+
+        self.docker_client = docker.from_env()
+
+    def testDown(self):
+
+        # Delete the code path if it exists
+        if os.path.exists(self.code_dir):
+            shutil.rmtree(self.code_dir)
+
+    def test_basic_creation(self):
+        """
+        A docker container must be successfully created
+        """
+
+        container = LambdaContainer(self.runtime, self.handler, self.code_dir)
+
+        self.assertIsNone(container.id, "Container must not have ID before creation")
+
+        # Create the container and verify its properties
+        with self._create(container):
+            self.assertIsNotNone(container.id, "Container must have an ID")
+
+            # Call Docker API to make sure container indeed exists
+            actual_container = self.docker_client.containers.get(container.id)
+            self.assertEquals(actual_container.status, "created")
+            self.assertTrue(self.expected_docker_image in actual_container.image.tags,
+                            "Image name of the container must be " + self.expected_docker_image)
+
+    def test_debug_port_is_created_on_host(self):
+
+        container = LambdaContainer(self.runtime, self.handler, self.code_dir, debug_port=self.debug_port)
+
+        with self._create(container):
+
+            container.start()
+
+            # After container is started, query the container to make sure it is bound to the right ports
+            port_binding = self.docker_client.api.port(container.id, self.debug_port)
+            self.assertIsNotNone(port_binding, "Container must be bound to a port on host machine")
+            self.assertEquals(1, len(port_binding), "Only one port must be bound to the container")
+            self.assertEquals(port_binding[0]["HostPort"], str(self.debug_port))
+
+    def test_container_is_attached_to_network(self):
+        container = LambdaContainer(self.runtime, self.handler, self.code_dir)
+
+        with self._network_create() as network:
+
+            # Ask the container to attach to the network
+            container.network_id = network.id
+            with self._create(container):
+
+                container.start()
+
+                # Now that the container has been created, it would be connected to the network
+                # Fetch the latest information about this network from server
+                network.reload()
+
+                self.assertEquals(1, len(network.containers))
+                self.assertEquals(container.id, network.containers[0].id)
+
+    def test_function_result_is_available_in_stdout_and_logs_in_stderr(self):
+
+        # This is the JSON result from Lambda function
+        # Convert to proper binary type to be compatible with Python 2 & 3
+        expected_output = six.binary_type('{"a":"b"}'.encode('utf-8'))
+        expected_stderr = six.binary_type("**This string is printed from Lambda function**".encode("utf-8"))
+
+        container = LambdaContainer(self.runtime, self.handler, self.code_dir)
+        stdout_stream = io.BytesIO()
+        stderr_stream = io.BytesIO()
+
+        with self._create(container):
+
+            container.start()
+            container.wait_for_logs(stdout=stdout_stream, stderr=stderr_stream)
+
+            function_output = stdout_stream.getvalue()
+            function_stderr = stderr_stream.getvalue()
+
+            self.assertEquals(function_output.strip(), expected_output)
+            self.assertIn(expected_stderr, function_stderr)
+
+    @contextmanager
+    def _create(self, container):
+        """
+        Create a container and delete it when execute leaves the given context
+
+        :param samcli.local.docker.container.Container container: Container to create
+        :yield: ID of the created container
+        """
+
+        id = None
+        try:
+            id = container.create()
+            yield id
+        finally:
+            if id:
+                container.delete()
+
+    @contextmanager
+    def _network_create(self):
+
+        name = "{}_{}".format(self.network_prefix, random.randint(1, 100))
+        network = None
+
+        try:
+            network = self.docker_client.networks.create(name)
+            yield network
+        finally:
+            if network:
+                network.remove()
+
+def _rand_port():
+    return random.randint(30000, 40000)
+
diff --git a/tests/functional/local/lambdafn/__init__.py b/tests/functional/local/lambdafn/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/functional/local/lambdafn/test_runtime.py b/tests/functional/local/lambdafn/test_runtime.py
new file mode 100644
index 0000000000..9205ac1736
--- /dev/null
+++ b/tests/functional/local/lambdafn/test_runtime.py
@@ -0,0 +1,252 @@
+import shutil
+import io
+import logging
+import json
+import random
+import threading
+
+from collections import namedtuple
+from timeit import default_timer as timer
+from unittest import TestCase
+from parameterized import parameterized, param
+
+from tests.functional.function_code import nodejs_lambda, make_zip, ECHO_CODE, SLEEP_CODE, GET_ENV_VAR
+from samcli.local.docker.manager import ContainerManager
+from samcli.local.lambdafn.runtime import LambdaRuntime
+from samcli.local.lambdafn.config import FunctionConfig
+
+logging.basicConfig(level=logging.INFO)
+
+RUNTIME = "nodejs4.3"
+HANDLER = "index.handler"
+MEMORY = 1024
+
+
+class TestLambdaRuntime(TestCase):
+
+    # Approx Number of seconds it takes to startup a Docker container. This helps us measure
+    # the approx time that the Lambda Function actually ran for
+    CONTAINER_STARTUP_OVERHEAD_SECONDS = 5
+
+    def setUp(self):
+        self.code_dir = {
+            "echo": nodejs_lambda(ECHO_CODE),
+            "sleep": nodejs_lambda(SLEEP_CODE),
+            "envvar": nodejs_lambda(GET_ENV_VAR)
+        }
+
+        self.container_manager = ContainerManager()
+        self.runtime = LambdaRuntime(self.container_manager)
+
+    def tearDown(self):
+        for _, dir in self.code_dir.items():
+            shutil.rmtree(dir)
+
+    def test_echo_function(self):
+        timeout = 3
+        input_event = '{"a":"b"}'
+        expected_output = '{"a":"b"}'
+
+        config = FunctionConfig(name="helloworld",
+                                runtime=RUNTIME,
+                                handler=HANDLER,
+                                code_abs_path=self.code_dir["echo"],
+                                timeout=timeout)
+
+        stdout_stream = io.BytesIO()
+        self.runtime.invoke(config, input_event, stdout=stdout_stream)
+
+        actual_output = stdout_stream.getvalue()
+        self.assertEquals(actual_output.strip().decode('utf-8'), expected_output)
+
+    def test_function_timeout(self):
+        """
+        Setup a short timeout and verify that the container is stopped
+        """
+        stdout_stream = io.BytesIO()
+        timeout = 1  # 1 second timeout
+        sleep_seconds = 20  # Ask the function to sleep for 20 seconds
+
+        config = FunctionConfig(name="sleep_timeout",
+                                runtime=RUNTIME,
+                                handler=HANDLER,
+                                code_abs_path=self.code_dir["sleep"],
+                                timeout=timeout)
+
+        # Measure the actual duration of execution
+        start = timer()
+        self.runtime.invoke(config, str(sleep_seconds), stdout=stdout_stream)
+        end = timer()
+
+        # Make sure that the wall clock duration is around the ballpark of timeout value
+        wall_clock_func_duration = end - start
+        print("Function completed in {} seconds".format(wall_clock_func_duration))
+        # The function should *not* preemptively stop
+        self.assertGreater(wall_clock_func_duration, timeout - 1)
+        # The function should not run for much longer than timeout.
+        self.assertLess(wall_clock_func_duration, timeout + self.CONTAINER_STARTUP_OVERHEAD_SECONDS)
+
+        # There should be no output from the function because timer was interrupted
+        actual_output = stdout_stream.getvalue()
+        self.assertEquals(actual_output.strip().decode('utf-8'), "")
+
+    @parameterized.expand([
+        ("zip"),
+        ("jar"),
+        ("ZIP"),
+        ("JAR")
+    ])
+    def test_echo_function_with_zip_file(self, file_name_extension):
+        timeout = 3
+        input_event = '"this input should be echoed"'
+        expected_output = '"this input should be echoed"'
+
+        code_dir = self.code_dir["echo"]
+        with make_zip(code_dir, file_name_extension) as code_zip_path:
+
+            config = FunctionConfig(name="helloworld",
+                                    runtime=RUNTIME,
+                                    handler=HANDLER,
+                                    code_abs_path=code_zip_path,
+                                    timeout=timeout)
+
+            stdout_stream = io.BytesIO()
+            self.runtime.invoke(config, input_event, stdout=stdout_stream)
+
+            actual_output = stdout_stream.getvalue()
+            self.assertEquals(actual_output.strip().decode('utf-8'), expected_output)
+
+    def test_check_environment_variables(self):
+        variables = {"var1": "value1", "var2": "value2"}
+        aws_creds = {"region": "ap-south-1", "key": "mykey", "secret": "mysecret"}
+
+        timeout = 30
+        input_event = ""
+        stdout_stream = io.BytesIO()
+        expected_output = {
+            "AWS_SAM_LOCAL": "true",
+            "AWS_LAMBDA_FUNCTION_MEMORY_SIZE": "1024",
+            "AWS_LAMBDA_FUNCTION_TIMEOUT": "30",
+            "AWS_LAMBDA_FUNCTION_HANDLER": "index.handler",
+
+            # Values coming from AWS Credentials
+            "AWS_REGION": "ap-south-1",
+            "AWS_DEFAULT_REGION": "ap-south-1",
+            "AWS_ACCESS_KEY_ID": "mykey",
+            "AWS_SECRET_ACCESS_KEY": "mysecret",
+
+            # Custom environment variables
+            "var1": "value1",
+            "var2": "value2"
+        }
+
+        config = FunctionConfig(name="helloworld",
+                                runtime=RUNTIME,
+                                handler=HANDLER,
+                                code_abs_path=self.code_dir["envvar"],
+                                memory=MEMORY,
+                                timeout=timeout)
+
+        # Set the appropriate environment variables
+        config.env_vars.variables = variables
+        config.env_vars.aws_creds = aws_creds
+
+        self.runtime.invoke(config, input_event, stdout=stdout_stream)
+
+        actual_output = json.loads(stdout_stream.getvalue().strip())  # Output is a JSON String. Deserialize.
+
+        # Make sure all key/value from expected_output is present in actual_output
+        for key, value in expected_output.items():
+            # Do the key check first to print a nice error error message when it fails
+            self.assertTrue(key in actual_output, "'{}' should be in environment variable output".format(key))
+            self.assertEquals(actual_output[key], expected_output[key],
+                              "Value of environment variable '{}' differs fromm expectation".format(key))
+
+
+class TestLambdaRuntime_MultipleInvokes(TestCase):
+
+    def setUp(self):
+        self.code_dir = nodejs_lambda(SLEEP_CODE)
+
+        Input = namedtuple('Input', ["timeout", "sleep", "check_stdout"])
+        self.inputs = [
+            Input(sleep=1, timeout=10, check_stdout=True),
+            Input(sleep=2, timeout=10, check_stdout=True),
+            Input(sleep=3, timeout=10, check_stdout=True),
+            Input(sleep=5, timeout=10, check_stdout=True),
+            Input(sleep=8, timeout=10, check_stdout=True),
+            Input(sleep=13, timeout=12, check_stdout=False),  # Must timeout
+            Input(sleep=21, timeout=20, check_stdout=False),  # Must timeout. So stdout will be empty
+        ]
+        random.shuffle(self.inputs)
+
+        container_manager = ContainerManager()
+        self.runtime = LambdaRuntime(container_manager)
+
+    def tearDown(self):
+        shutil.rmtree(self.code_dir)
+
+    def _invoke_sleep(self, timeout, sleep_duration, check_stdout, exceptions=None):
+
+        name = "sleepfunction_timeout_{}_sleep_{}".format(timeout, sleep_duration)
+        print("Invoking function " + name)
+        try:
+            stdout_stream = io.BytesIO()
+            config = FunctionConfig(name=name,
+                                    runtime=RUNTIME,
+                                    handler=HANDLER,
+                                    code_abs_path=self.code_dir,
+                                    memory=1024,
+                                    timeout=timeout)
+
+            self.runtime.invoke(config, sleep_duration, stdout=stdout_stream)
+            actual_output = stdout_stream.getvalue().strip()  # Must output the sleep duration
+            if check_stdout:
+                self.assertEquals(actual_output.decode('utf-8'), str(sleep_duration))
+        except Exception as ex:
+            if exceptions is not None:
+                exceptions.append({"name": name, "error": ex})
+            else:
+                raise
+
+    def test_serial(self):
+        """
+        Making sure we can invoke multiple times on the same ``LambdaRuntime`` object. This is test is necessary to
+        catch timer that was not cancelled, race conditions, memory leak issues, etc.
+        """
+
+        for input in self.inputs:
+            self._invoke_sleep(input.timeout, input.sleep, input.check_stdout)
+
+    def test_parallel(self):
+        """
+        Making sure we can invoke multiple times on the same ``LambdaRuntime`` object. This is test is necessary to
+        catch timer that was not cancelled, race conditions, memory leak issues, etc.
+        """
+
+        threads = []
+
+        # Collect all exceptions from threads. This is important because exceptions reported in thread don't bubble
+        # to the main thread. Therefore test runner will never catch and fail the test.
+        exceptions = []
+
+        for input in self.inputs:
+
+            t = threading.Thread(name='thread', target=self._invoke_sleep,
+                                 args=(input.timeout, input.sleep, input.check_stdout, exceptions))
+            t.setDaemon(True)
+            t.start()
+            threads.append(t)
+
+        # Wait for all threads to exit
+        for t in threads:
+            t.join()
+
+        for e in exceptions:
+            print("-------------")
+            print("ERROR in function " + e["name"])
+            print(e["error"])
+            print("-------------")
+
+        if len(exceptions) > 0:
+            raise AssertionError("Test failed. See print outputs above for details on the thread that failed")
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/init/__init__.py b/tests/integration/init/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/init/test_init_command.py b/tests/integration/init/test_init_command.py
new file mode 100644
index 0000000000..f657ee53d7
--- /dev/null
+++ b/tests/integration/init/test_init_command.py
@@ -0,0 +1,24 @@
+from unittest import TestCase
+from subprocess import Popen
+import os
+
+from backports import tempfile
+
+
+class TestBasicInitCommand(TestCase):
+
+    def test_init_command_passes_and_dir_created(self):
+        with tempfile.TemporaryDirectory() as temp:
+            process = Popen([TestBasicInitCommand._get_command(), "init", "-o", temp])
+            return_code = process.wait()
+
+            self.assertEquals(return_code, 0)
+            self.assertTrue(os.path.isdir(temp + "/sam-app"))
+
+    @staticmethod
+    def _get_command():
+        command = "sam"
+        if os.getenv("SAM_CLI_DEV"):
+            command = "samdev"
+
+        return command
diff --git a/tests/integration/local/__init__.py b/tests/integration/local/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/local/invoke/__init__.py b/tests/integration/local/invoke/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/local/invoke/invoke_integ_base.py b/tests/integration/local/invoke/invoke_integ_base.py
new file mode 100644
index 0000000000..7d2faefe18
--- /dev/null
+++ b/tests/integration/local/invoke/invoke_integ_base.py
@@ -0,0 +1,42 @@
+import os
+from unittest import TestCase
+
+try:
+    from pathlib import Path
+except ImportError:
+    from pathlib2 import Path
+
+
+class InvokeIntegBase(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.cmd = cls.base_command()
+
+        integration_dir = str(Path(__file__).resolve().parents[2])
+
+        cls.template_path = integration_dir + "/testdata/invoke/template.yml"
+        cls.event_path = integration_dir + "/testdata/invoke/event.json"
+        cls.env_var_path = integration_dir + "/testdata/invoke/vars.json"
+
+    @classmethod
+    def base_command(cls):
+        command = "sam"
+        if os.getenv("SAM_CLI_DEV"):
+            command = "samdev"
+
+        return command
+
+    def get_command_list(self, function_to_invoke, template_path=None, event_path=None, env_var_path=None):
+        command_list = [self.cmd, "local", "invoke", function_to_invoke]
+
+        if template_path:
+            command_list = command_list + ["-t", template_path]
+
+        if event_path:
+            command_list = command_list + ["-e", event_path]
+
+        if env_var_path:
+            command_list = command_list + ["-n", env_var_path]
+
+        return command_list
diff --git a/tests/integration/local/invoke/test_integrations_cli.py b/tests/integration/local/invoke/test_integrations_cli.py
new file mode 100644
index 0000000000..ca5889f1fd
--- /dev/null
+++ b/tests/integration/local/invoke/test_integrations_cli.py
@@ -0,0 +1,96 @@
+from subprocess import Popen, PIPE
+from timeit import default_timer as timer
+
+from .invoke_integ_base import InvokeIntegBase
+
+
+class TestSamPython36HelloWorldIntegration(InvokeIntegBase):
+
+    def test_invoke_returncode_is_zero(self):
+        command_list = self.get_command_list("HelloWorldServerlessFunction",
+                                             template_path=self.template_path,
+                                             event_path=self.event_path)
+
+        process = Popen(command_list, stdout=PIPE)
+        return_code = process.wait()
+
+        self.assertEquals(return_code, 0)
+
+    def test_invoke_returns_execpted_results(self):
+        command_list = self.get_command_list("HelloWorldServerlessFunction",
+                                             template_path=self.template_path,
+                                             event_path=self.event_path)
+
+        process = Popen(command_list, stdout=PIPE)
+        process.wait()
+        process_stdout = "".join(process.stdout.readlines()).strip()
+        self.assertEquals(process_stdout, '"Hello world"')
+
+    def test_invoke_of_lambda_function(self):
+        command_list = self.get_command_list("HelloWorldLambdaFunction",
+                                             template_path=self.template_path,
+                                             event_path=self.event_path)
+
+        process = Popen(command_list, stdout=PIPE)
+        process.wait()
+        process_stdout = "".join(process.stdout.readlines()).strip()
+        self.assertEquals(process_stdout, '"Hello world"')
+
+    def test_invoke_with_timeout_set(self):
+        command_list = self.get_command_list("HelloWorldSleepFunction",
+                                             template_path=self.template_path,
+                                             event_path=self.event_path)
+
+        start = timer()
+        process = Popen(command_list, stdout=PIPE)
+        return_code = process.wait()
+        end = timer()
+
+        wall_clock_cli_duration = end - start
+
+        process_stdout = "".join(process.stdout.readlines()).strip()
+
+        # validate the time of the cli (timeout is set to 5s)
+        self.assertGreater(wall_clock_cli_duration, 5)
+        self.assertLess(wall_clock_cli_duration, 20)
+
+        self.assertEquals(return_code, 0)
+        self.assertEquals(process_stdout, "", msg="The return statement in the LambdaFunction "
+                                                  "should never return leading to an empty string")
+
+    def test_invoke_with_env_vars(self):
+        command_list = self.get_command_list("EchoCustomEnvVarFunction",
+                                             template_path=self.template_path,
+                                             event_path=self.event_path,
+                                             env_var_path=self.env_var_path)
+
+        process = Popen(command_list, stdout=PIPE)
+        process.wait()
+        process_stdout = "".join(process.stdout.readlines()).strip()
+        self.assertEquals(process_stdout, '"MyVar"')
+
+    def test_invoke_when_function_writes_stdout(self):
+        command_list = self.get_command_list("WriteToStdoutFunction",
+                                             template_path=self.template_path,
+                                             event_path=self.event_path)
+
+        process = Popen(command_list, stdout=PIPE, stderr=PIPE)
+        process.wait()
+
+        process_stdout = "".join(process.stdout.readlines()).strip()
+        process_stderr = "".join(process.stderr.readlines()).strip()
+
+        self.assertIn("Docker Lambda is writing to stdout", process_stderr)
+        self.assertIn("wrote to stdout", process_stdout)
+
+    def test_invoke_when_function_writes_stderr(self):
+        command_list = self.get_command_list("WriteToStderrFunction",
+                                             template_path=self.template_path,
+                                             event_path=self.event_path)
+
+        process = Popen(command_list, stderr=PIPE)
+        process.wait()
+
+        process_stderr = "".join(process.stderr.readlines()).strip()
+
+        self.assertIn("Docker Lambda is writing to stderr", process_stderr)
diff --git a/tests/integration/local/start_api/__init__.py b/tests/integration/local/start_api/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integration/local/start_api/start_api_integ_base.py b/tests/integration/local/start_api/start_api_integ_base.py
new file mode 100644
index 0000000000..08306a2649
--- /dev/null
+++ b/tests/integration/local/start_api/start_api_integ_base.py
@@ -0,0 +1,59 @@
+from unittest import TestCase
+import threading
+from subprocess import Popen
+import time
+import os
+import random
+
+try:
+    from pathlib import Path
+except ImportError:
+    from pathlib2 import Path
+
+
+class StartApiIntegBaseClass(TestCase):
+    template = None
+    binary_data_file = None
+    integration_dir = str(Path(__file__).resolve().parents[2])
+
+    @classmethod
+    def setUpClass(cls):
+        # This is the directory for tests/integration which will be used to file the testdata
+        # files for integ tests
+        cls.template = cls.integration_dir + cls.template_path
+
+        if cls.binary_data_file:
+            cls.binary_data_file = os.path.join(cls.integration_dir, cls.binary_data_file)
+
+        cls.port = str(StartApiIntegBaseClass.random_port())
+
+        cls.thread = threading.Thread(target=cls.start_api())
+        cls.thread.setDaemon(True)
+        cls.thread.start()
+
+    @classmethod
+    def start_api(cls):
+        command = "sam"
+        if os.getenv("SAM_CLI_DEV"):
+            command = "samdev"
+
+        cls.start_api_process = Popen([command, "local", "start-api", "-t", cls.template, "-p", cls.port, "--debug"])
+        # we need to wait some time for start-api to start, hence the sleep
+        time.sleep(5)
+
+    @classmethod
+    def tearDownClass(cls):
+        # After all the tests run, we need to kill the start-api process.
+        cls.start_api_process.kill()
+
+    @staticmethod
+    def random_port():
+        return random.randint(30000, 40000)
+
+    @staticmethod
+    def get_binary_data(filename):
+        if not filename:
+            return None
+
+        with open(filename, "rb") as fp:
+            return fp.read()
diff --git a/tests/integration/local/start_api/test_start_api.py b/tests/integration/local/start_api/test_start_api.py
new file mode 100644
index 0000000000..be1350f501
--- /dev/null
+++ b/tests/integration/local/start_api/test_start_api.py
@@ -0,0 +1,418 @@
+import requests
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from time import time
+
+from .start_api_integ_base import StartApiIntegBaseClass
+
+
+class TestParallelRequests(StartApiIntegBaseClass):
+    """
+    Test Class centered around sending parallel requests to the service `sam local start-api`
+    """
+    # This is here so the setUpClass doesn't fail. Set to this something else once the class is implemented
+    template_path = "/testdata/start_api/template.yaml"
+
+    def setUp(self):
+        self.url = "http://127.0.0.1:{}".format(self.port)
+
+    def test_same_endpoint(self):
+        """
+        Send two requests to the same path at the same time. This is to ensure we can handle
+        multiple requests at once and do not block/queue up requests
+        """
+        number_of_requests = 10
+        start_time = time()
+        thread_pool = ThreadPoolExecutor(number_of_requests)
+
+        futures = [thread_pool.submit(requests.get, self.url + "/sleepfortenseconds/function1")
+                   for _ in range(0, number_of_requests)]
+        results = [r.result() for r in as_completed(futures)]
+
+        end_time = time()
+
+        self.assertEquals(len(results), 10)
+        self.assertGreater(end_time - start_time, 10)
+        self.assertLess(end_time - start_time, 20)
+
+        for result in results:
+            self.assertEquals(result.status_code, 200)
+            self.assertEquals(result.json(), {"message": "HelloWorld! I just slept and waking up."})
+
+    def test_different_endpoints(self):
+        """
+        Send two requests to different paths at the same time. This is to ensure we can handle
+        multiple requests for different paths and do not block/queue up the requests
+        """
+        number_of_requests = 10
+        start_time = time()
+        thread_pool = ThreadPoolExecutor(10)
+
+        test_url_paths = ["/sleepfortenseconds/function0", "/sleepfortenseconds/function1"]
+
+        futures = [thread_pool.submit(requests.get, self.url + test_url_paths[function_num % len(test_url_paths)])
+                   for function_num in range(0, number_of_requests)]
+        results = [r.result() for r in as_completed(futures)]
+
+        end_time = time()
+
+        self.assertEquals(len(results), 10)
+        self.assertGreater(end_time - start_time, 10)
+        self.assertLess(end_time - start_time, 20)
+
+        for result in results:
+            self.assertEquals(result.status_code, 200)
+            self.assertEquals(result.json(), {"message": "HelloWorld! I just slept and waking up."})
+
+
+class TestServiceErrorResponses(StartApiIntegBaseClass):
+    """
+    Test Class centered around the Error Responses the Service can return for a given api
+    """
+    # This is here so the setUpClass doesn't fail. Set to this something else once the class is implemented.
+    template_path = "/testdata/start_api/template.yaml"
+
+    def setUp(self):
+        self.url = "http://127.0.0.1:{}".format(self.port)
+
+    def test_invalid_http_verb_for_endpoint(self):
+        response = requests.get(self.url + "/id")
+
+        self.assertEquals(response.status_code, 403)
+        self.assertEquals(response.json(), {"message": "Missing Authentication Token"})
+
+    def test_invalid_response_from_lambda(self):
+        response = requests.get(self.url + "/invalidresponsereturned")
+
+        self.assertEquals(response.status_code, 502)
+        self.assertEquals(response.json(), {"message": "Internal server error"})
+
+    def test_request_timeout(self):
+        pass
+
+
+class TestService(StartApiIntegBaseClass):
+    """
+    Testing general requirements around the Service that powers `sam local start-api`
+    """
+    template_path = "/testdata/start_api/template.yaml"
+
+    def setUp(self):
+        self.url = "http://127.0.0.1:{}".format(self.port)
+
+    def test_static_directory(self):
+        pass
+
+    def test_calling_proxy_endpoint(self):
+        response = requests.get(self.url + "/proxypath/this/is/some/path")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_get_call_with_path_setup_with_any_implicit_api(self):
+        """
+        Get Request to a path that was defined as ANY in SAM through AWS::Serverless::Function Events
+        """
+        response = requests.get(self.url + "/anyandall")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_post_call_with_path_setup_with_any_implicit_api(self):
+        """
+        Post Request to a path that was defined as ANY in SAM through AWS::Serverless::Function Events
+        """
+        response = requests.post(self.url + "/anyandall", json={})
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_put_call_with_path_setup_with_any_implicit_api(self):
+        """
+        Put Request to a path that was defined as ANY in SAM through AWS::Serverless::Function Events
+        """
+        response = requests.put(self.url + "/anyandall", json={})
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_head_call_with_path_setup_with_any_implicit_api(self):
+        """
+        Head Request to a path that was defined as ANY in SAM through AWS::Serverless::Function Events
+        """
+        response = requests.head(self.url + "/anyandall")
+
+        self.assertEquals(response.status_code, 200)
+
+    def test_delete_call_with_path_setup_with_any_implicit_api(self):
+        """
+        Delete Request to a path that was defined as ANY in SAM through AWS::Serverless::Function Events
+        """
+        response = requests.delete(self.url + "/anyandall")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_options_call_with_path_setup_with_any_implicit_api(self):
+        """
+        Options Request to a path that was defined as ANY in SAM through AWS::Serverless::Function Events
+        """
+        response = requests.options(self.url + "/anyandall")
+
+        self.assertEquals(response.status_code, 200)
+
+    def test_patch_call_with_path_setup_with_any_implicit_api(self):
+        """
+        Patch Request to a path that was defined as ANY in SAM through AWS::Serverless::Function Events
+        """
+        response = requests.patch(self.url + "/anyandall")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+
+class TestStartApiWithSwaggerApis(StartApiIntegBaseClass):
+    template_path = "/testdata/start_api/swagger-template.yaml"
+    binary_data_file = "testdata/start_api/binarydata.gif"
+
+    def setUp(self):
+        self.url = "http://127.0.0.1:{}".format(self.port)
+
+    def test_get_call_with_path_setup_with_any_swagger(self):
+        """
+        Get Request to a path that was defined as ANY in SAM through Swagger
+        """
+        response = requests.get(self.url + "/anyandall")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_post_call_with_path_setup_with_any_swagger(self):
+        """
+        Post Request to a path that was defined as ANY in SAM through Swagger
+        """
+        response = requests.post(self.url + "/anyandall", json={})
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_put_call_with_path_setup_with_any_swagger(self):
+        """
+        Put Request to a path that was defined as ANY in SAM through Swagger
+        """
+        response = requests.put(self.url + "/anyandall", json={})
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_head_call_with_path_setup_with_any_swagger(self):
+        """
+        Head Request to a path that was defined as ANY in SAM through Swagger
+        """
+        response = requests.head(self.url + "/anyandall")
+
+        self.assertEquals(response.status_code, 200)
+
+    def test_delete_call_with_path_setup_with_any_swagger(self):
+        """
+        Delete Request to a path that was defined as ANY in SAM through Swagger
+        """
+        response = requests.delete(self.url + "/anyandall")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_options_call_with_path_setup_with_any_swagger(self):
+        """
+        Options Request to a path that was defined as ANY in SAM through Swagger
+        """
+        response = requests.options(self.url + "/anyandall")
+
+        self.assertEquals(response.status_code, 200)
+
+    def test_patch_call_with_path_setup_with_any_swagger(self):
+        """
+        Patch Request to a path that was defined as ANY in SAM through Swagger
+        """
+        response = requests.patch(self.url + "/anyandall")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_function_not_defined_in_template(self):
+        response = requests.get(self.url + "/nofunctionfound")
+
+        self.assertEquals(response.status_code, 502)
+        self.assertEquals(response.json(), {"message": "No function defined for resource method"})
+
+    def test_function_with_no_api_event_is_reachable(self):
+        response = requests.get(self.url + "/functionwithnoapievent")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_lambda_function_resource_is_reachable(self):
+        response = requests.get(self.url + "/nonserverlessfunction")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_binary_request(self):
+        """
+        This tests that the service can accept and invoke a lambda when given binary data in a request
+        """
+        input_data = self.get_binary_data(self.binary_data_file)
+        response = requests.post(self.url + '/echobase64eventbody',
+                                 headers={"Content-Type": "image/gif"},
+                                 data=input_data)
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get("Content-Type"), "image/gif")
+        self.assertEquals(response.content, input_data)
+
+    def test_binary_response(self):
+        """
+        Binary data is returned correctly
+        """
+        expected = self.get_binary_data(self.binary_data_file)
+
+        response = requests.get(self.url + '/base64response')
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get("Content-Type"), "image/gif")
+        self.assertEquals(response.content, expected)
+
+
+class TestServiceResponses(StartApiIntegBaseClass):
+    """
+    Test Class centered around the different responses that can happen in Lambda and pass through start-api
+    """
+    template_path = "/testdata/start_api/template.yaml"
+    binary_data_file = "testdata/start_api/binarydata.gif"
+
+    def setUp(self):
+        self.url = "http://127.0.0.1:{}".format(self.port)
+
+    def test_binary_response(self):
+        """
+        Binary data is returned correctly
+        """
+        expected = self.get_binary_data(self.binary_data_file)
+
+        response = requests.get(self.url + '/base64response')
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get("Content-Type"), "image/gif")
+        self.assertEquals(response.content, expected)
+
+    def test_default_header_content_type(self):
+        """
+        Test that if no ContentType is given the default is "application/json"
+        """
+        response = requests.get(self.url + "/onlysetstatuscode")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.content, "no data")
+        self.assertEquals(response.headers.get("Content-Type"), "application/json")
+
+    def test_default_status_code(self):
+        """
+        Test that if no status_code is given, the status code is 200
+        :return:
+        """
+        response = requests.get(self.url + "/onlysetbody")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_default_body(self):
+        """
+        Test that if no body is given, the response is 'no data'
+        """
+        response = requests.get(self.url + "/onlysetstatuscode")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.content, "no data")
+
+    def test_function_writing_to_stdout(self):
+        response = requests.get(self.url + "/writetostdout")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+    def test_function_writing_to_stderr(self):
+        response = requests.get(self.url + "/writetostderr")
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.json(), {'hello': 'world'})
+
+
+class TestServiceRequests(StartApiIntegBaseClass):
+    """
+    Test Class centered around the different requests that can happen
+    """
+    template_path = "/testdata/start_api/template.yaml"
+    binary_data_file = "testdata/start_api/binarydata.gif"
+
+    def setUp(self):
+        self.url = "http://127.0.0.1:{}".format(self.port)
+
+    def test_binary_request(self):
+        """
+        This tests that the service can accept and invoke a lambda when given binary data in a request
+        """
+        input_data = self.get_binary_data(self.binary_data_file)
+        response = requests.post(self.url + '/echobase64eventbody',
+                                 headers={"Content-Type": "image/gif"},
+                                 data=input_data)
+
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response.headers.get("Content-Type"), "image/gif")
+        self.assertEquals(response.content, input_data)
+
+    def test_request_with_query_params(self):
+        """
+        Query params given should be put into the Event to Lambda
+        """
+        response = requests.get(self.url + "/id/4",
+                                params={"key": "value"})
+
+        self.assertEquals(response.status_code, 200)
+
+        response_data = response.json()
+
+        self.assertEquals(response_data.get("queryStringParameters"), {"key": ["value"]})
+
+    def test_request_with_path_params(self):
+        """
+        Path Parameters given should be put into the Event to Lambda
+        """
+        response = requests.get(self.url + "/id/4")
+
+        self.assertEquals(response.status_code, 200)
+
+        response_data = response.json()
+
+        self.assertEquals(response_data.get("pathParameters"), {"id": "4"})
+
+    def test_request_with_many_path_params(self):
+        """
+        Path Parameters given should be put into the Event to Lambda
+        """
+        response = requests.get(self.url + "/id/4/user/jacob")
+
+        self.assertEquals(response.status_code, 200)
+
+        response_data = response.json()
+
+        self.assertEquals(response_data.get("pathParameters"), {"id": "4", "user": "jacob"})
+
+    def test_forward_headers_are_added_to_event(self):
+        """
+        Test the Forwarding Headers exist in the Api Event to Lambda
+        """
+        response = requests.get(self.url + "/id/4")
+
+        response_data = response.json()
+
+        self.assertEquals(response_data.get("headers").get("X-Forwarded-Proto"), "http")
+        self.assertEquals(response_data.get("headers").get("X-Forwarded-Port"), self.port)
diff --git a/samples/hello-world/golang/event.json b/tests/integration/testdata/invoke/event.json
similarity index 100%
rename from samples/hello-world/golang/event.json
rename to tests/integration/testdata/invoke/event.json
diff --git a/tests/integration/testdata/invoke/main.py b/tests/integration/testdata/invoke/main.py
new file mode 100644
index 0000000000..f36b7e9d63
--- /dev/null
+++ b/tests/integration/testdata/invoke/main.py
@@ -0,0 +1,35 @@
+import time
+import os
+import sys
+print('Loading function')
+
+
+def handler(event, context):
+    print("value1 = " + event['key1'])
+    print("value2 = " + event['key2'])
+    print("value3 = " + event['key3'])
+
+    sys.stdout.write("Docker Lambda is writing to stderr")
+
+    return "Hello world"
+
+
+def sleep_handler(event, context):
+    time.sleep(10)
+    return "Slept for 10s"
+
+
+def env_var_echo_hanler(event, context):
+    return os.environ.get("CustomEnvVar")
+
+
+def write_to_stderr(event, context):
+    sys.stderr.write("Docker Lambda is writing to stderr")
+
+    return "wrote to stderr"
+
+
+def write_to_stdout(event, context):
+    sys.stdout.write("Docker Lambda is writing to stdout")
+
+    return "wrote to stdout"
diff --git a/tests/integration/testdata/invoke/template.yml b/tests/integration/testdata/invoke/template.yml
new file mode 100644
index 0000000000..7ff2617d26
--- /dev/null
+++ b/tests/integration/testdata/invoke/template.yml
@@ -0,0 +1,50 @@
+AWSTemplateFormatVersion : '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: A hello world application.
+Resources:
+  HelloWorldServerlessFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.handler
+      Runtime: python3.6
+      CodeUri: .
+      Timeout: 600
+
+  HelloWorldLambdaFunction:
+    Type: AWS::Lambda::Function
+    Properties:
+      Handler: main.handler
+      Runtime: python3.6
+      CodeUri: .
+
+  HelloWorldSleepFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.sleep_handler
+      Runtime: python3.6
+      CodeUri: .
+      Timeout: 5
+
+  EchoCustomEnvVarFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.env_var_echo_hanler
+      Runtime: python3.6
+      CodeUri: .
+      Environment:
+        Variables:
+          CustomEnvVar: "MyVar"
+
+  WriteToStderrFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.write_to_stderr
+      Runtime: python3.6
+      CodeUri: .
+
+  WriteToStdoutFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.write_to_stdout
+      Runtime: python3.6
+      CodeUri: .
diff --git a/tests/integration/testdata/invoke/vars.json b/tests/integration/testdata/invoke/vars.json
new file mode 100644
index 0000000000..a55702360a
--- /dev/null
+++ b/tests/integration/testdata/invoke/vars.json
@@ -0,0 +1,5 @@
+{
+  "EchoCustomEnvVarFunction": {
+    "CustomEnvVar": "MyVar"
+  }
+}
\ No newline at end of file
diff --git a/tests/integration/testdata/start_api/binarydata.gif b/tests/integration/testdata/start_api/binarydata.gif
new file mode 100644
index 0000000000..855b404179
Binary files /dev/null and b/tests/integration/testdata/start_api/binarydata.gif differ
diff --git a/tests/integration/testdata/start_api/main.py b/tests/integration/testdata/start_api/main.py
new file mode 100644
index 0000000000..7e13f99dd8
--- /dev/null
+++ b/tests/integration/testdata/start_api/main.py
@@ -0,0 +1,75 @@
+import json
+import sys
+import time
+
+
+def handler(event, context):
+
+    return {"statusCode": 200, "body": json.dumps({"hello": "world"})}
+
+
+def echo_event_handler(event, context):
+
+    return {"statusCode": 200, "body": json.dumps(event)}
+
+
+def content_type_setter_handler(event, context):
+
+    return {"statusCode": 200, "body": "hello", "headers": {"Content-Type": "text/plain"}}
+
+
+def only_set_status_code_handler(event, context):
+
+    return {"statusCode": 200}
+
+
+def only_set_body_handler(event, context):
+
+    return {"body": json.dumps({"hello": "world"})}
+
+
+def sleep_10_sec_handler(event, context):
+    # sleep thread for 10s. This is useful for testing multiple requests
+    time.sleep(10)
+
+    return {"statusCode": 200, "body": json.dumps({"message": "HelloWorld! I just slept and waking up."})}
+
+
+def write_to_stderr(event, context):
+    sys.stderr.write("Docker Lambda is writing to stderr")
+
+    return {"statusCode": 200, "body": json.dumps({"hello": "world"})}
+
+
+def write_to_stdout(event, context):
+    sys.stdout.write("Docker Lambda is writing to stdout")
+
+    return {"statusCode": 200, "body": json.dumps({"hello": "world"})}
+
+
+def invalid_response_returned(event, context):
+    return "This is invalid"
+
+
+def base64_response(event, context):
+    gifImageBase64 = "R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+goOXMv8+fhw/v739/f+8PD98fH/8mJl+fn/9ZWb8/PzWlwv///6wWGbImAPgTEMImIN9gUFCEm/gDALULDN8PAD6atYdCTX9gUNKlj8wZAKUsAOzZz+UMAOsJAP/Z2ccMDA8PD/95eX5NWvsJCOVNQPtfX/8zM8+QePLl38MGBr8JCP+zs9myn/8GBqwpAP/GxgwJCPny78lzYLgjAJ8vAP9fX/+MjMUcAN8zM/9wcM8ZGcATEL+QePdZWf/29uc/P9cmJu9MTDImIN+/r7+/vz8/P8VNQGNugV8AAF9fX8swMNgTAFlDOICAgPNSUnNWSMQ5MBAQEJE3QPIGAM9AQMqGcG9vb6MhJsEdGM8vLx8fH98AANIWAMuQeL8fABkTEPPQ0OM5OSYdGFl5jo+Pj/+pqcsTE78wMFNGQLYmID4dGPvd3UBAQJmTkP+8vH9QUK+vr8ZWSHpzcJMmILdwcLOGcHRQUHxwcK9PT9DQ0O/v70w5MLypoG8wKOuwsP/g4P/Q0IcwKEswKMl8aJ9fX2xjdOtGRs/Pz+Dg4GImIP8gIH0sKEAwKKmTiKZ8aB/f39Wsl+LFt8dgUE9PT5x5aHBwcP+AgP+WltdgYMyZfyywz78AAAAAAAD///8AAP9mZv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAKgALAAAAAA9AEQAAAj/AFEJHEiwoMGDCBMqXMiwocAbBww4nEhxoYkUpzJGrMixogkfGUNqlNixJEIDB0SqHGmyJSojM1bKZOmyop0gM3Oe2liTISKMOoPy7GnwY9CjIYcSRYm0aVKSLmE6nfq05QycVLPuhDrxBlCtYJUqNAq2bNWEBj6ZXRuyxZyDRtqwnXvkhACDV+euTeJm1Ki7A73qNWtFiF+/gA95Gly2CJLDhwEHMOUAAuOpLYDEgBxZ4GRTlC1fDnpkM+fOqD6DDj1aZpITp0dtGCDhr+fVuCu3zlg49ijaokTZTo27uG7Gjn2P+hI8+PDPERoUB318bWbfAJ5sUNFcuGRTYUqV/3ogfXp1rWlMc6awJjiAAd2fm4ogXjz56aypOoIde4OE5u/F9x199dlXnnGiHZWEYbGpsAEA3QXYnHwEFliKAgswgJ8LPeiUXGwedCAKABACCN+EA1pYIIYaFlcDhytd51sGAJbo3onOpajiihlO92KHGaUXGwWjUBChjSPiWJuOO/LYIm4v1tXfE6J4gCSJEZ7YgRYUNrkji9P55sF/ogxw5ZkSqIDaZBV6aSGYq/lGZplndkckZ98xoICbTcIJGQAZcNmdmUc210hs35nCyJ58fgmIKX5RQGOZowxaZwYA+JaoKQwswGijBV4C6SiTUmpphMspJx9unX4KaimjDv9aaXOEBteBqmuuxgEHoLX6Kqx+yXqqBANsgCtit4FWQAEkrNbpq7HSOmtwag5w57GrmlJBASEU18ADjUYb3ADTinIttsgSB1oJFfA63bduimuqKB1keqwUhoCSK374wbujvOSu4QG6UvxBRydcpKsav++Ca6G8A6Pr1x2kVMyHwsVxUALDq/krnrhPSOzXG1lUTIoffqGR7Goi2MAxbv6O2kEG56I7CSlRsEFKFVyovDJoIRTg7sugNRDGqCJzJgcKE0ywc0ELm6KBCCJo8DIPFeCWNGcyqNFE06ToAfV0HBRgxsvLThHn1oddQMrXj5DyAQgjEHSAJMWZwS3HPxT/QMbabI/iBCliMLEJKX2EEkomBAUCxRi42VDADxyTYDVogV+wSChqmKxEKCDAYFDFj4OmwbY7bDGdBhtrnTQYOigeChUmc1K3QTnAUfEgGFgAWt88hKA6aCRIXhxnQ1yg3BCayK44EWdkUQcBByEQChFXfCB776aQsG0BIlQgQgE8qO26X1h8cEUep8ngRBnOy74E9QgRgEAC8SvOfQkh7FDBDmS43PmGoIiKUUEGkMEC/PJHgxw0xH74yx/3XnaYRJgMB8obxQW6kL9QYEJ0FIFgByfIL7/IQAlvQwEpnAC7DtLNJCKUoO/w45c44GwCXiAFB/OXAATQryUxdN4LfFiwgjCNYg+kYMIEFkCKDs6PKAIJouyGWMS1FSKJOMRB/BoIxYJIUXFUxNwoIkEKPAgCBZSQHQ1A2EWDfDEUVLyADj5AChSIQW6gu10bE/JG2VnCZGfo4R4d0sdQoBAHhPjhIB94v/wRoRKQWGRHgrhGSQJxCS+0pCZbEhAAOw=="  # NOQA
+
+    return {
+        "statusCode": 200,
+        "body": gifImageBase64,
+        "isBase64Encoded": True,
+        "headers": {
+            "Content-Type": "image/gif"
+        }
+    }
+
+
+def echo_base64_event_body(event, context):
+    return {
+        "statusCode": 200,
+        "body": event["body"],
+        "headers": {
+            "Content-Type": event["headers"]["Content-Type"]
+        },
+        "isBase64Encoded": event["isBase64Encoded"]
+    }
diff --git a/tests/integration/testdata/start_api/swagger-template.yaml b/tests/integration/testdata/start_api/swagger-template.yaml
new file mode 100644
index 0000000000..bee44de7cf
--- /dev/null
+++ b/tests/integration/testdata/start_api/swagger-template.yaml
@@ -0,0 +1,111 @@
+AWSTemplateFormatVersion : '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+
+Globals:
+  Api:
+    BinaryMediaTypes:
+      # These are equivalent to image/gif and image/png when deployed
+      - image~1png
+
+Resources:
+  MyApi:
+    Type: AWS::Serverless::Api
+    Properties:
+      StageName: prod
+      DefinitionBody:
+        swagger: "2.0"
+        info:
+          title:
+            Ref: AWS::StackName
+        "x-amazon-apigateway-binary-media-types":
+          - image/gif
+        paths:
+          "/functionwithnoapievent":
+            get:
+              x-amazon-apigateway-integration:
+                httpMethod: POST
+                type: aws_proxy
+                uri:
+                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${NoApiEventFunction.Arn}/invocations
+                responses: {}
+          "/anyandall":
+            x-amazon-apigateway-any-method:
+              x-amazon-apigateway-integration:
+                httpMethod: POST
+                type: aws_proxy
+                uri:
+                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyLambdaFunction.Arn}/invocations
+                responses: {}
+          "/nonserverlessfunction":
+            get:
+              x-amazon-apigateway-integration:
+                httpMethod: POST
+                type: aws_proxy
+                uri:
+                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyNonServerlessLambdaFunction.Arn}/invocations
+          "/nofunctionfound":
+            get:
+              x-amazon-apigateway-integration:
+                httpMethod: POST
+                type: aws_proxy
+                uri:
+                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${WhatFunction.Arn}/invocations
+
+          "/base64response":
+            get:
+              x-amazon-apigateway-integration:
+                httpMethod: POST
+                type: aws_proxy
+                uri:
+                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${Base64ResponseFunction.Arn}/invocations
+
+          "/echobase64eventbody":
+            post:
+              x-amazon-apigateway-integration:
+                httpMethod: POST
+                type: aws_proxy
+                uri:
+                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${EchoBase64EventBodyFunction.Arn}/invocations
+
+  MyLambdaFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.handler
+      Runtime: python3.6
+      CodeUri: .
+      Events:
+        GetApi:
+          Type: Api
+          Properties:
+            Path: /get
+            Method: GET
+            RestApiId:
+              Ref: MyApi
+
+  NoApiEventFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.handler
+      Runtime: python3.6
+      CodeUri: .
+
+  MyNonServerlessLambdaFunction:
+    Type: AWS::Lambda::Function
+    Properties:
+      Handler: main.handler
+      Runtime: python3.6
+      CodeUri: .
+
+  Base64ResponseFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.base64_response
+      Runtime: python3.6
+      CodeUri: .
+
+  EchoBase64EventBodyFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.echo_base64_event_body
+      Runtime: python3.6
+      CodeUri: .
diff --git a/tests/integration/testdata/start_api/template.yaml b/tests/integration/testdata/start_api/template.yaml
new file mode 100644
index 0000000000..bb80fccb0e
--- /dev/null
+++ b/tests/integration/testdata/start_api/template.yaml
@@ -0,0 +1,186 @@
+AWSTemplateFormatVersion : '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+
+Globals:
+  Api:
+    BinaryMediaTypes:
+      # These are equivalent to image/gif and image/png when deployed
+      - image~1gif
+      - image~1png
+
+Resources:
+  HelloWorldFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.handler
+      Runtime: python3.6
+      CodeUri: .
+      Events:
+        IdBasePath:
+          Type: Api
+          Properties:
+            Method: POST
+            Path: /id
+
+        PathWithAnyMethod:
+          Type: Api
+          Properties:
+            Method: ANY
+            Path: /anyandall
+
+        ProxyPath:
+          Type: Api
+          Properties:
+            Method: GET
+            Path: /proxypath/{proxy+}
+
+  EchoEventFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.echo_event_handler
+      Runtime: python3.6
+      CodeUri: .
+      Events:
+        PathWithPathParams:
+          Type: Api
+          Properties:
+            Method: GET
+            Path: /id/{id}/user/{user}
+
+        PathWithPathParam:
+          Type: Api
+          Properties:
+            Method: GET
+            Path: /id/{id}
+
+  ContentTypeSetterFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.content_type_setter_handler
+      Runtime: python3.6
+      CodeUri: .
+      Events:
+        ContentTypeSetter:
+          Type: Api
+          Properties:
+            Method: GET
+            Path: /getcontenttype
+
+  OnlySetStatusCodeFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.only_set_status_code_handler
+      Runtime: python3.6
+      CodeUri: .
+      Events:
+        OnlySetStatusCodePath:
+          Type: Api
+          Properties:
+            Method: Get
+            Path: /onlysetstatuscode
+
+  OnlySetBodyFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.only_set_body_handler
+      Runtime: python3.6
+      CodeUri: .
+      Events:
+        OnlySetBodyPath:
+          Type: Api
+          Properties:
+            Method: Get
+            Path: /onlysetbody
+
+  SleepFunction0:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.sleep_10_sec_handler
+      Runtime: python3.6
+      CodeUri: .
+      Timeout: 20
+      Events:
+        SleepPath:
+          Type: Api
+          Properties:
+            Method: GET
+            Path: /sleepfortenseconds/function0
+
+  SleepFunction1:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.sleep_10_sec_handler
+      Runtime: python3.6
+      CodeUri: .
+      Timeout: 20
+      Events:
+        SleepPath:
+          Type: Api
+          Properties:
+            Method: GET
+            Path: /sleepfortenseconds/function1
+
+  WriteToStderrFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.write_to_stderr
+      Runtime: python3.6
+      CodeUri: .
+      Events:
+        WriteToStderrPath:
+          Type: Api
+          Properties:
+            Method: GET
+            Path: /writetostderr
+
+  WriteToStdoutFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.write_to_stdout
+      Runtime: python3.6
+      CodeUri: .
+      Events:
+        WriteToStdoutPath:
+          Type: Api
+          Properties:
+            Method: GET
+            Path: /writetostdout
+
+  InvalidResponseFromLambdaFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.invalid_response_returned
+      Runtime: python3.6
+      CodeUri: .
+      Events:
+        InvalidResponseReturned:
+          Type: Api
+          Properties:
+            Method: GET
+            Path: /invalidresponsereturned
+
+  Base64ResponseFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.base64_response
+      Runtime: python3.6
+      CodeUri: .
+      Events:
+        Base64ResponsePath:
+          Type: Api
+          Properties:
+            Method: GET
+            Path: /base64response
+
+  EchoBase64EventBodyFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: main.echo_base64_event_body
+      Runtime: python3.6
+      CodeUri: .
+      Events:
+        EchoBase64EventBodyPath:
+          Type: Api
+          Properties:
+            Method: POST
+            Path: /echobase64eventbody
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/cli/__init__.py b/tests/unit/cli/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/cli/test_command.py b/tests/unit/cli/test_command.py
new file mode 100644
index 0000000000..baa93e14a8
--- /dev/null
+++ b/tests/unit/cli/test_command.py
@@ -0,0 +1,93 @@
+import click
+
+from unittest import TestCase
+from mock import Mock, patch, call
+from samcli.cli.command import BaseCommand
+
+
+class TestBaseCommand(TestCase):
+
+    def setUp(self):
+
+        self.packages = [
+            "a.b.cmd1",
+            "foo.cmd2",
+            "cmd3"
+        ]
+
+    def test_must_inherit(self):
+
+        cmd = BaseCommand()
+        self.assertTrue(isinstance(cmd, click.MultiCommand))
+
+    def test_set_commands_must_extract_command_name(self):
+        expected = {
+            "cmd1": "a.b.cmd1",
+            "cmd2": "foo.cmd2",
+            "cmd3": "cmd3"
+        }
+
+        result = BaseCommand._set_commands(self.packages)
+        self.assertEquals(result, expected)
+
+    def test_list_commands_must_return_commands_name(self):
+        expected = ["cmd1", "cmd2", "cmd3"].sort()
+
+        cmd = BaseCommand(cmd_packages=self.packages)
+        result = cmd.list_commands(ctx=None)
+        self.assertEquals(result.sort(), expected)
+
+    @patch("samcli.cli.command.importlib")
+    def test_get_command_must_return_command_module(self, importlib_mock):
+        module_mock = Mock()
+        module_mock.cli = Mock()
+
+        importlib_mock.import_module = Mock()
+        importlib_mock.import_module.return_value = module_mock
+
+        cmd = BaseCommand(cmd_packages=self.packages)
+
+        result = cmd.get_command(None, "cmd1")
+        self.assertEquals(result, module_mock.cli)
+
+        result = cmd.get_command(None, "cmd2")
+        self.assertEquals(result, module_mock.cli)
+
+        result = cmd.get_command(None, "cmd3")
+        self.assertEquals(result, module_mock.cli)
+
+        # Library to import the modules must be called three times
+        importlib_mock.import_module.assert_has_calls([
+            call("a.b.cmd1"),
+            call("foo.cmd2"),
+            call("cmd3")
+        ])
+
+    def test_get_command_must_skip_unknown_commands(self):
+
+        cmd = BaseCommand(cmd_packages=self.packages)
+        result = cmd.get_command(None, "unknown_command")
+
+        self.assertEquals(result, None, "must not return a command")
+
+    @patch("samcli.cli.command.importlib")
+    def test_get_command_must_skip_on_exception_loading_module(self, importlib_mock):
+
+        cmd = BaseCommand(cmd_packages=self.packages)
+
+        importlib_mock.import_module = Mock()
+        importlib_mock.import_module.side_effect = ImportError()
+
+        result = cmd.get_command(None, "cmd1")
+        self.assertEquals(result, None, "must not return a command")
+
+    @patch("samcli.cli.command.importlib")
+    def test_get_command_must_skip_on_absence_of_cli_method(self, importlib_mock):
+
+        cmd = BaseCommand(cmd_packages=self.packages)
+
+        importlib_mock.import_module = Mock()
+        importlib_mock.import_module.return_value = {}  # Returned Module does *not* have 'cli' property
+
+        result = cmd.get_command(None, "cmd1")
+        self.assertEquals(result, None, "must not return a command")
diff --git a/tests/unit/cli/test_context.py b/tests/unit/cli/test_context.py
new file mode 100644
index 0000000000..219118ba45
--- /dev/null
+++ b/tests/unit/cli/test_context.py
@@ -0,0 +1,29 @@
+import logging
+
+from unittest import TestCase
+from samcli.cli.context import Context
+
+
+class TestContext(TestCase):
+
+    def test_must_initialize_with_defaults(self):
+        ctx = Context()
+
+        self.assertEquals(ctx.debug, False, "debug must default to False")
+
+    def test_must_set_get_debug_flag(self):
+        ctx = Context()
+
+        ctx.debug = True
+        self.assertEquals(ctx.debug, True, "debug must be set to True")
+        self.assertEquals(logging.getLogger().getEffectiveLevel(), logging.DEBUG)
+
+    def test_must_unset_get_debug_flag(self):
+        ctx = Context()
+
+        ctx.debug = True
+        self.assertEquals(ctx.debug, True, "debug must be set to True")
+
+        # Flipping from True to False
+        ctx.debug = False
+        self.assertEquals(ctx.debug, False, "debug must be set to False")
diff --git a/tests/unit/cli/test_main.py b/tests/unit/cli/test_main.py
new file mode 100644
index 0000000000..d22372e16e
--- /dev/null
+++ b/tests/unit/cli/test_main.py
@@ -0,0 +1,29 @@
+from unittest import TestCase
+from click.testing import CliRunner
+from samcli.cli.main import cli
+
+
+class TestCliBase(TestCase):
+
+    def test_cli_base(self):
+        """
+        Just invoke the CLI without any commands and assert that help text was printed
+        :return:
+        """
+        runner = CliRunner()
+        result = runner.invoke(cli, [])
+        self.assertEquals(result.exit_code, 0)
+        self.assertTrue("--help" in result.output, "Help text must be printed")
+        self.assertTrue("--debug" in result.output, "--debug option must be present in help text")
+
+    def test_cli_some_command(self):
+
+        runner = CliRunner()
+        result = runner.invoke(cli, ["validate"])
+        self.assertEquals(result.exit_code, 1)
+
+    def test_cli_with_debug(self):
+
+        runner = CliRunner()
+        result = runner.invoke(cli, ["validate", "--debug"])
+        self.assertEquals(result.exit_code, 1)
diff --git a/tests/unit/commands/__init__.py b/tests/unit/commands/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/init/__init__.py b/tests/unit/commands/init/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/init/test_cli.py b/tests/unit/commands/init/test_cli.py
new file mode 100644
index 0000000000..a2a201076a
--- /dev/null
+++ b/tests/unit/commands/init/test_cli.py
@@ -0,0 +1,49 @@
+from unittest import TestCase
+from mock import patch
+
+from samcli.commands.init import do_cli as init_cli
+from samcli.local.init.exceptions import GenerateProjectFailedError
+from samcli.commands.local.cli_common.user_exceptions import UserException
+
+
+class TestCli(TestCase):
+
+    def setUp(self):
+        self.ctx = None
+        self.location = None
+        self.runtime = "python3.6"
+        self.output_dir = "."
+        self.name = "testing project"
+        self.no_input = False
+
+    @patch("samcli.commands.init.generate_project")
+    def test_init_cli(self, generate_project_patch):
+        # GIVEN generate_project successfully created a project
+        # WHEN a project name has been passed
+        init_cli(
+            ctx=self.ctx, location=self.location, runtime=self.runtime, output_dir=self.output_dir,
+            name=self.name, no_input=self.no_input)
+
+        # THEN we should receive no errors
+        generate_project_patch.assert_called_once_with(
+                self.location, self.runtime,
+                self.output_dir, self.name, self.no_input)
+
+    @patch("samcli.commands.init.generate_project")
+    def test_init_cli_generate_project_fails(self, generate_project_patch):
+
+        # GIVEN generate_project fails to create a project
+        generate_project_patch.side_effect = GenerateProjectFailedError(
+                project=self.name, provider_error="Something wrong happened"
+        )
+
+        # WHEN generate_project returns an error
+        # THEN we should receive a GenerateProjectFailedError Exception
+        with self.assertRaises(UserException):
+            init_cli(
+                    self.ctx, location="self.location", runtime=self.runtime,
+                    output_dir=self.output_dir, name=self.name, no_input=self.no_input)
+
+            generate_project_patch.assert_called_with(
+                    self.location, self.runtime,
+                    self.output_dir, self.name, self.no_input)
diff --git a/tests/unit/commands/local/__init__.py b/tests/unit/commands/local/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/local/cli_common/__init__.py b/tests/unit/commands/local/cli_common/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/local/cli_common/test_invoke_context.py b/tests/unit/commands/local/cli_common/test_invoke_context.py
new file mode 100644
index 0000000000..1b0cdcde49
--- /dev/null
+++ b/tests/unit/commands/local/cli_common/test_invoke_context.py
@@ -0,0 +1,387 @@
+"""
+Tests the InvokeContext class
+"""
+
+import os
+import sys
+import yaml
+import docker
+
+import requests
+
+from samcli.commands.local.cli_common.user_exceptions import InvokeContextException
+from samcli.commands.local.cli_common.invoke_context import InvokeContext
+
+from unittest import TestCase
+from mock import Mock, patch, ANY, mock_open
+from parameterized import parameterized, param
+
+
+class TestInvokeContext__enter__(TestCase):
+
+    @patch("samcli.commands.local.cli_common.invoke_context.SamFunctionProvider")
+    def test_must_read_from_necessary_files(self, SamFunctionProviderMock):
+        function_provider = Mock()
+
+        SamFunctionProviderMock.return_value = function_provider
+
+        template_file = "template_file"
+        env_vars_file = "env_vars_file"
+        log_file = "log_file"
+
+        invoke_context = InvokeContext(template_file=template_file,
+                                       function_identifier="id",
+                                       env_vars_file=env_vars_file,
+                                       debug_port=123,
+                                       debug_args="args",
+                                       docker_volume_basedir="volumedir",
+                                       docker_network="network",
+                                       log_file=log_file,
+                                       skip_pull_image=True,
+                                       aws_profile="profile")
+
+        template_dict = "template_dict"
+        invoke_context._get_template_data = Mock()
+        invoke_context._get_template_data.return_value = template_dict
+
+        env_vars_value = "env_vars_value"
+        invoke_context._get_env_vars_value = Mock()
+        invoke_context._get_env_vars_value.return_value = env_vars_value
+
+        log_file_handle = "handle"
+        invoke_context._setup_log_file = Mock()
+        invoke_context._setup_log_file.return_value = log_file_handle
+
+        invoke_context._check_docker_connectivity = Mock()
+
+        # Call Enter method manually for testing purposes
+        result = invoke_context.__enter__()
+        self.assertTrue(result is invoke_context, "__enter__() must return self")
+
+        self.assertEquals(invoke_context._template_dict, template_dict)
+        self.assertEquals(invoke_context._function_provider, function_provider)
+        self.assertEquals(invoke_context._env_vars_value, env_vars_value)
+        self.assertEquals(invoke_context._log_file_handle, log_file_handle)
+
+        invoke_context._get_template_data.assert_called_with(template_file)
+        SamFunctionProviderMock.assert_called_with(template_dict)
+        invoke_context._get_env_vars_value.assert_called_with(env_vars_file)
+        invoke_context._setup_log_file.assert_called_with(log_file)
+        invoke_context._check_docker_connectivity.assert_called_with()
+
+
+class TestInvokeContext__exit__(TestCase):
+
+    def test_must_close_opened_logfile(self):
+        context = InvokeContext(template_file="template")
+        handle_mock = Mock()
+        context._log_file_handle = handle_mock
+
+        context.__exit__()
+
+        handle_mock.close.assert_called_with()
+        self.assertIsNone(context._log_file_handle)
+
+    def test_must_ignore_if_handle_is_absent(self):
+        context = InvokeContext(template_file="template")
+        context._log_file_handle = None
+
+        context.__exit__()
+        self.assertIsNone(context._log_file_handle)
+
+
+class TestInvokeContextAsContextManager(TestCase):
+    """
+    Must be able to use the class as a context manager
+    """
+
+    @patch.object(InvokeContext, "__enter__")
+    @patch.object(InvokeContext, "__exit__")
+    def test_must_work_in_with_statement(self, ExitMock, EnterMock):
+
+        context_obj = Mock()
+        EnterMock.return_value = context_obj
+
+        with InvokeContext(template_file="template_file",
+                           function_identifier="id",
+                           env_vars_file="env_vars_file",
+                           debug_port=123,
+                           debug_args="args",
+                           docker_volume_basedir="volumedir",
+                           docker_network="network",
+                           log_file="log_file",
+                           skip_pull_image=True,
+                           aws_profile="profile") as context:
+            self.assertEquals(context_obj, context)
+
+        EnterMock.assert_called_with()
+        self.assertEquals(1, ExitMock.call_count)
+
+
+class TestInvokeContext_function_name_property(TestCase):
+
+    def test_must_return_function_name_if_present(self):
+        id = "id"
+        context = InvokeContext(template_file="template_file", function_identifier=id)
+
+        self.assertEquals(id, context.function_name)
+
+    def test_must_return_one_function_from_template(self):
+        context = InvokeContext(template_file="template_file")
+
+        function = Mock()
+        function.name = "myname"
+        context._function_provider = Mock()
+        context._function_provider.get_all.return_value = [function]  # Provider returns only one function
+
+        self.assertEquals("myname", context.function_name)
+
+    def test_must_raise_if_more_than_one_function(self):
+        context = InvokeContext(template_file="template_file")
+
+        context._function_provider = Mock()
+        context._function_provider.get_all.return_value = [Mock(), Mock(), Mock()]  # Provider returns three functions
+
+        with self.assertRaises(InvokeContextException):
+            context.function_name
+
+
+class TestInvokeContext_local_lambda_runner(TestCase):
+
+    def setUp(self):
+        self.context = InvokeContext(template_file="template_file",
+                                     function_identifier="id",
+                                     env_vars_file="env_vars_file",
+                                     debug_port=123,
+                                     debug_args="args",
+                                     docker_volume_basedir="volumedir",
+                                     docker_network="network",
+                                     log_file="log_file",
+                                     skip_pull_image=True,
+                                     aws_profile="profile")
+
+    @patch("samcli.commands.local.cli_common.invoke_context.ContainerManager")
+    @patch("samcli.commands.local.cli_common.invoke_context.LambdaRuntime")
+    @patch("samcli.commands.local.cli_common.invoke_context.LocalLambdaRunner")
+    def test_must_create_runner(self, LocalLambdaMock, LambdaRuntimeMock, ContainerManagerMock):
+
+        container_mock = Mock()
+        ContainerManagerMock.return_value = container_mock
+
+        runtime_mock = Mock()
+        LambdaRuntimeMock.return_value = runtime_mock
+
+        runner_mock = Mock()
+        LocalLambdaMock.return_value = runner_mock
+
+        cwd = "cwd"
+        self.context.get_cwd = Mock()
+        self.context.get_cwd.return_value = cwd
+
+        result = self.context.local_lambda_runner
+        self.assertEquals(result, runner_mock)
+
+        ContainerManagerMock.assert_called_with(docker_network_id="network",
+                                                skip_pull_image=True)
+        LambdaRuntimeMock.assert_called_with(container_mock)
+        LocalLambdaMock.assert_called_with(local_runtime=runtime_mock,
+                                           function_provider=ANY,
+                                           cwd=cwd,
+                                           env_vars_values=ANY,
+                                           debug_port=123,
+                                           debug_args="args",
+                                           aws_profile="profile")
+
+
+class TestInvokeContext_stdout_property(TestCase):
+
+    def test_must_return_log_file_handle(self):
+        context = InvokeContext(template_file="template")
+        context._log_file_handle = "handle"
+
+        self.assertEquals("handle", context.stdout)
+
+    def test_must_return_sys_stdout(self):
+        context = InvokeContext(template_file="template")
+
+        self.assertEquals(sys.stdout, context.stdout)
+
+
+class TestInvokeContext_stderr_property(TestCase):
+
+    def test_must_return_log_file_handle(self):
+        context = InvokeContext(template_file="template")
+        context._log_file_handle = "handle"
+
+        self.assertEquals("handle", context.stderr)
+
+    def test_must_return_sys_stderr(self):
+        context = InvokeContext(template_file="template")
+
+        self.assertEquals(sys.stderr, context.stderr)
+
+
+class TestInvokeContext_template_property(TestCase):
+
+    def test_must_return_tempalte_dict(self):
+        context = InvokeContext(template_file="file")
+        context._template_dict = "My template"
+
+        self.assertEquals("My template", context.template)
+
+
+class TestInvokeContextget_cwd(TestCase):
+
+    def test_must_return_template_file_dir_name(self):
+        filename = "filename"
+        context = InvokeContext(template_file=filename)
+
+        expected = os.path.dirname(os.path.abspath(filename))
+        result = context.get_cwd()
+
+        self.assertEquals(result, expected)
+
+    def test_must_return_docker_volume_dir(self):
+        filename = "filename"
+        context = InvokeContext(template_file=filename, docker_volume_basedir="basedir")
+
+        result = context.get_cwd()
+        self.assertEquals(result, "basedir")
+
+
+class TestInvokeContext_get_template_data(TestCase):
+
+    def test_must_raise_if_file_does_not_exist(self):
+        filename = "filename"
+
+        with self.assertRaises(InvokeContextException) as exception_ctx:
+            InvokeContext._get_template_data(filename)
+
+        ex = exception_ctx.exception
+        self.assertEquals(str(ex), "Template file not found at {}".format(filename))
+
+    @patch("samcli.commands.local.cli_common.invoke_context.yaml_parse")
+    @patch("samcli.commands.local.cli_common.invoke_context.os")
+    def test_must_read_file_and_parse(self, os_mock, yaml_parse_mock):
+        filename = "filename"
+        file_data = "contents of the file"
+        parse_result = "parse result"
+
+        os_mock.patch.exists.return_value = True  # Fake that the file exists
+
+        m = mock_open(read_data=file_data)
+        yaml_parse_mock.return_value = parse_result
+
+        with patch("samcli.commands.local.cli_common.invoke_context.open", m):
+            result = InvokeContext._get_template_data(filename)
+
+            self.assertEquals(result, parse_result)
+
+        m.assert_called_with(filename, 'r')
+        yaml_parse_mock.assert_called_with(file_data)
+
+    @parameterized.expand([
+        param(ValueError()),
+        param(yaml.YAMLError())
+    ])
+    @patch("samcli.commands.local.cli_common.invoke_context.yaml_parse")
+    @patch("samcli.commands.local.cli_common.invoke_context.os")
+    def test_must_raise_on_parse_errors(self, exception, os_mock, yaml_parse_mock):
+        filename = "filename"
+        file_data = "contents of the file"
+
+        os_mock.patch.exists.return_value = True  # Fake that the file exists
+
+        m = mock_open(read_data=file_data)
+        yaml_parse_mock.side_effect = exception
+
+        with patch("samcli.commands.local.cli_common.invoke_context.open", m):
+
+            with self.assertRaises(InvokeContextException) as ex_ctx:
+                InvokeContext._get_template_data(filename)
+
+            actual_exception = ex_ctx.exception
+            self.assertTrue(str(actual_exception).startswith("Failed to parse template: "))
+
+
+class TestInvokeContext_get_env_vars_value(TestCase):
+
+    def test_must_return_if_no_file(self):
+        result = InvokeContext._get_env_vars_value(filename=None)
+        self.assertIsNone(result, "No value must be returned")
+
+    def test_must_read_file_and_parse_as_json(self):
+        filename = "filename"
+        file_data = '{"a": "b"}'
+        expected = {"a": "b"}
+
+        m = mock_open(read_data=file_data)
+
+        with patch("samcli.commands.local.cli_common.invoke_context.open", m):
+            result = InvokeContext._get_env_vars_value(filename)
+
+            self.assertEquals(expected, result)
+
+        m.assert_called_with(filename, 'r')
+
+    def test_must_raise_if_failed_to_parse_json(self):
+        filename = "filename"
+        file_data = 'invalid json'
+
+        m = mock_open(read_data=file_data)
+
+        with patch("samcli.commands.local.cli_common.invoke_context.open", m):
+
+            with self.assertRaises(InvokeContextException) as ex_ctx:
+                InvokeContext._get_env_vars_value(filename)
+
+            msg = str(ex_ctx.exception)
+            self.assertTrue(msg.startswith("Could not read environment variables overrides from file {}".format(
+                filename)))
+
+
+class TestInvokeContext_setup_log_file(TestCase):
+
+    def test_must_return_if_file_not_given(self):
+        result = InvokeContext._setup_log_file(log_file=None)
+        self.assertIsNone(result, "Log file must not be setup")
+
+    def test_must_open_file_for_writing(self):
+        filename = "foo"
+        m = mock_open()
+
+        with patch("samcli.commands.local.cli_common.invoke_context.open", m):
+            InvokeContext._setup_log_file(filename)
+
+        m.assert_called_with(filename, 'w')
+
+
+class TestInvokeContext_check_docker_connectivity(TestCase):
+
+    def test_must_call_ping(self):
+        client = Mock()
+        InvokeContext._check_docker_connectivity(client)
+        client.ping.assert_called_with()
+
+    @patch("samcli.commands.local.cli_common.invoke_context.docker")
+    def test_must_call_ping_with_docker_client_from_env(self, docker_mock):
+        client = Mock()
+        docker_mock.from_env.return_value = client
+
+        InvokeContext._check_docker_connectivity()
+        client.ping.assert_called_with()
+
+    @parameterized.expand([
+        param("Docker APIError thrown", docker.errors.APIError("error")),
+        param("Requests ConnectionError thrown", requests.exceptions.ConnectionError("error"))
+    ])
+    def test_must_raise_if_docker_not_found(self, test_name, error_docker_throws):
+        client = Mock()
+
+        client.ping.side_effect = error_docker_throws
+
+        with self.assertRaises(InvokeContextException) as ex_ctx:
+            InvokeContext._check_docker_connectivity(client)
+
+        msg = str(ex_ctx.exception)
+        self.assertEquals(msg, "Running AWS SAM projects locally requires Docker. Have you got it installed?")
diff --git a/tests/unit/commands/local/cli_common/test_options.py b/tests/unit/commands/local/cli_common/test_options.py
new file mode 100644
index 0000000000..e15ef13218
--- /dev/null
+++ b/tests/unit/commands/local/cli_common/test_options.py
@@ -0,0 +1,41 @@
+"""
+Test the common CLI options for invoke
+"""
+
+import os
+
+from unittest import TestCase
+from mock import patch
+from samcli.commands.local.cli_common.options import get_or_default_template_file_name, _TEMPLATE_OPTION_DEFAULT_VALUE
+
+
+class TestGetOrDefaultTemplateFileName(TestCase):
+
+    def test_must_return_abspath_of_user_provided_value(self):
+        filename = "foo.txt"
+        expected = os.path.abspath(filename)
+
+        result = get_or_default_template_file_name(None, None, filename)
+        self.assertEquals(result, expected)
+
+    @patch("samcli.commands.local.cli_common.options.os")
+    def test_must_return_yml_extension(self, os_mock):
+        expected = "template.yml"
+
+        os_mock.path.exists.return_value = False  # Fake .yaml file to not exist.
+        os_mock.path.abspath.return_value = "absPath"
+
+        result = get_or_default_template_file_name(None, None, _TEMPLATE_OPTION_DEFAULT_VALUE)
+        self.assertEquals(result, "absPath")
+        os_mock.path.abspath.assert_called_with(expected)
+
+    @patch("samcli.commands.local.cli_common.options.os")
+    def test_must_return_yaml_extension(self, os_mock):
+        expected = "template.yaml"
+
+        os_mock.path.exists.return_value = True
+        os_mock.path.abspath.return_value = "absPath"
+
+        result = get_or_default_template_file_name(None, None, _TEMPLATE_OPTION_DEFAULT_VALUE)
+        self.assertEquals(result, "absPath")
+        os_mock.path.abspath.assert_called_with(expected)
diff --git a/tests/unit/commands/local/generate_event/__init__.py b/tests/unit/commands/local/generate_event/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/local/generate_event/api/__init__.py b/tests/unit/commands/local/generate_event/api/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/local/generate_event/api/test_cli.py b/tests/unit/commands/local/generate_event/api/test_cli.py
new file mode 100644
index 0000000000..cb8d16f9e2
--- /dev/null
+++ b/tests/unit/commands/local/generate_event/api/test_cli.py
@@ -0,0 +1,23 @@
+from unittest import TestCase
+from mock import patch
+
+from samcli.commands.local.generate_event.api.cli import do_cli as api_cli
+
+
+class TestCli(TestCase):
+
+    @patch("samcli.commands.local.generate_event.api.cli.json")
+    @patch("samcli.commands.local.generate_event.api.cli.click")
+    @patch("samcli.commands.local.generate_event.api.cli.generate_api_event")
+    def test_generate_schedule_event(self, api_event_patch, click_patch, json_patch):
+        json_patch.dumps.return_value = "This to be echoed by click"
+
+        method = "method"
+        body = "body"
+        resource = "resource"
+        path = "path"
+
+        api_cli(ctx=None, method=method, body=body, resource=resource, path=path)
+
+        api_event_patch.assert_called_once_with(method, body, resource, path)
+        click_patch.echo.assert_called_once_with("This to be echoed by click")
diff --git a/tests/unit/commands/local/generate_event/dynamodb/__init__.py b/tests/unit/commands/local/generate_event/dynamodb/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/local/generate_event/dynamodb/test_cli.py b/tests/unit/commands/local/generate_event/dynamodb/test_cli.py
new file mode 100644
index 0000000000..56a45f5d19
--- /dev/null
+++ b/tests/unit/commands/local/generate_event/dynamodb/test_cli.py
@@ -0,0 +1,20 @@
+from unittest import TestCase
+from mock import patch
+
+from samcli.commands.local.generate_event.dynamodb.cli import do_cli as dynamodb_cli
+
+
+class TestCli(TestCase):
+
+    @patch("samcli.commands.local.generate_event.dynamodb.cli.json")
+    @patch("samcli.commands.local.generate_event.dynamodb.cli.click")
+    @patch("samcli.commands.local.generate_event.dynamodb.cli.generate_dynamodb_event")
+    def test_generate_schedule_event(self, dynamodb_event_patch, click_patch, json_patch):
+        json_patch.dumps.return_value = "This to be echoed by click"
+
+        region = "region"
+
+        dynamodb_cli(ctx=None, region=region)
+
+        dynamodb_event_patch.assert_called_once_with(region)
+        click_patch.echo.assert_called_once_with("This to be echoed by click")
diff --git a/tests/unit/commands/local/generate_event/kinesis/__init__.py b/tests/unit/commands/local/generate_event/kinesis/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/local/generate_event/kinesis/test_cli.py b/tests/unit/commands/local/generate_event/kinesis/test_cli.py
new file mode 100644
index 0000000000..ae91e3fb70
--- /dev/null
+++ b/tests/unit/commands/local/generate_event/kinesis/test_cli.py
@@ -0,0 +1,25 @@
+from unittest import TestCase
+from mock import patch
+
+from samcli.commands.local.generate_event.kinesis.cli import do_cli as kinesis_cli
+
+
+class TestCli(TestCase):
+
+    @patch("samcli.commands.local.generate_event.kinesis.cli.json")
+    @patch("samcli.commands.local.generate_event.kinesis.cli.click")
+    @patch("samcli.commands.local.generate_event.kinesis.cli.generate_kinesis_event")
+    def test_generate_schedule_event(self, kinesis_event_patch, click_patch, json_patch):
+        json_patch.dumps.return_value = "This to be echoed by click"
+
+        region = "region"
+        partition = "partition"
+        sequence = "sequence"
+        data = "data"
+
+        data_base64 = b"ZGF0YQ=="
+
+        kinesis_cli(ctx=None, region=region, partition=partition, sequence=sequence, data=data)
+
+        kinesis_event_patch.assert_called_once_with(region, partition, sequence, data_base64)
+        click_patch.echo.assert_called_once_with("This to be echoed by click")
diff --git a/tests/unit/commands/local/generate_event/s3/__init__.py b/tests/unit/commands/local/generate_event/s3/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/local/generate_event/s3/test_cli.py b/tests/unit/commands/local/generate_event/s3/test_cli.py
new file mode 100644
index 0000000000..da2d86035d
--- /dev/null
+++ b/tests/unit/commands/local/generate_event/s3/test_cli.py
@@ -0,0 +1,22 @@
+from unittest import TestCase
+from mock import patch
+
+from samcli.commands.local.generate_event.s3.cli import do_cli as s3_cli
+
+
+class TestCli(TestCase):
+
+    @patch("samcli.commands.local.generate_event.s3.cli.json")
+    @patch("samcli.commands.local.generate_event.s3.cli.click")
+    @patch("samcli.commands.local.generate_event.s3.cli.generate_s3_event")
+    def test_generate_schedule_event(self, s3_event_patch, click_patch, json_patch):
+        json_patch.dumps.return_value = "This to be echoed by click"
+
+        region = "region"
+        bucket = "bucket"
+        key = "key"
+
+        s3_cli(ctx=None, region=region, bucket=bucket, key=key)
+
+        s3_event_patch.assert_called_once_with(region, bucket, key)
+        click_patch.echo.assert_called_once_with("This to be echoed by click")
diff --git a/tests/unit/commands/local/generate_event/schedule/__init__.py b/tests/unit/commands/local/generate_event/schedule/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/local/generate_event/schedule/test_cli.py b/tests/unit/commands/local/generate_event/schedule/test_cli.py
new file mode 100644
index 0000000000..0bd874608a
--- /dev/null
+++ b/tests/unit/commands/local/generate_event/schedule/test_cli.py
@@ -0,0 +1,20 @@
+from unittest import TestCase
+from mock import patch
+
+from samcli.commands.local.generate_event.schedule.cli import do_cli as schedule_cli
+
+
+class TestCli(TestCase):
+
+    @patch("samcli.commands.local.generate_event.schedule.cli.json")
+    @patch("samcli.commands.local.generate_event.schedule.cli.click")
+    @patch("samcli.commands.local.generate_event.schedule.cli.generate_schedule_event")
+    def test_generate_schedule_event(self, schedule_event_patch, click_patch, json_patch):
+        json_patch.dumps.return_value = "This to be echoed by click"
+
+        region = "us-east-1"
+
+        schedule_cli(ctx=None, region=region)
+
+        schedule_event_patch.assert_called_once_with(region)
+        click_patch.echo.assert_called_once_with("This to be echoed by click")
diff --git a/tests/unit/commands/local/generate_event/sns/__init__.py b/tests/unit/commands/local/generate_event/sns/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/local/generate_event/sns/test_cli.py b/tests/unit/commands/local/generate_event/sns/test_cli.py
new file mode 100644
index 0000000000..a3091c6a98
--- /dev/null
+++ b/tests/unit/commands/local/generate_event/sns/test_cli.py
@@ -0,0 +1,22 @@
+from unittest import TestCase
+from mock import patch
+
+from samcli.commands.local.generate_event.sns.cli import do_cli as sns_cli
+
+
+class TestCli(TestCase):
+
+    @patch("samcli.commands.local.generate_event.sns.cli.json")
+    @patch("samcli.commands.local.generate_event.sns.cli.click")
+    @patch("samcli.commands.local.generate_event.sns.cli.generate_sns_event")
+    def test_generate_schedule_event(self, sns_event_patch, click_patch, json_patch):
+        json_patch.dumps.return_value = "This to be echoed by click"
+
+        message = "message"
+        topic = "topic"
+        subject = "subject"
+
+        sns_cli(ctx=None, message=message, topic=topic, subject=subject)
+
+        sns_event_patch.assert_called_once_with(message, topic, subject)
+        click_patch.echo.assert_called_once_with("This to be echoed by click")
diff --git a/tests/unit/commands/local/invoke/__init__.py b/tests/unit/commands/local/invoke/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/local/invoke/test_cli.py b/tests/unit/commands/local/invoke/test_cli.py
new file mode 100644
index 0000000000..e635ef95ff
--- /dev/null
+++ b/tests/unit/commands/local/invoke/test_cli.py
@@ -0,0 +1,147 @@
+"""
+Tests Local Invoke CLI
+"""
+
+from unittest import TestCase
+from mock import patch, Mock
+from parameterized import parameterized, param
+
+from samcli.local.lambdafn.exceptions import FunctionNotFound
+from samcli.commands.validate.lib.exceptions import InvalidSamDocumentException
+from samcli.commands.local.cli_common.user_exceptions import UserException
+from samcli.commands.local.invoke.cli import do_cli as invoke_cli, _get_event as invoke_cli_get_event
+
+
+class TestCli(TestCase):
+
+    def setUp(self):
+        self.function_id = "id"
+        self.template = "template"
+        self.eventfile = "eventfile"
+        self.env_vars = "env-vars"
+        self.debug_port = 123
+        self.debug_args = "args"
+        self.docker_volume_basedir = "basedir"
+        self.docker_network = "network"
+        self.log_file = "logfile"
+        self.skip_pull_image = True
+        self.profile = "profile"
+
+    @patch("samcli.commands.local.invoke.cli.InvokeContext")
+    @patch("samcli.commands.local.invoke.cli._get_event")
+    def test_cli_must_setup_context_and_invoke(self, get_event_mock, InvokeContextMock):
+        event_data = "data"
+        get_event_mock.return_value = event_data
+
+        # Mock the __enter__ method to return a object inside a context manager
+        context_mock = Mock()
+        InvokeContextMock.return_value.__enter__.return_value = context_mock
+
+        invoke_cli(ctx=None,
+                   function_identifier=self.function_id,
+                   template=self.template,
+                   event=self.eventfile,
+                   env_vars=self.env_vars,
+                   debug_port=self.debug_port,
+                   debug_args=self.debug_args,
+                   docker_volume_basedir=self.docker_volume_basedir,
+                   docker_network=self.docker_network,
+                   log_file=self.log_file,
+                   skip_pull_image=self.skip_pull_image,
+                   profile=self.profile)
+
+        InvokeContextMock.assert_called_with(template_file=self.template,
+                                             function_identifier=self.function_id,
+                                             env_vars_file=self.env_vars,
+                                             debug_port=self.debug_port,
+                                             debug_args=self.debug_args,
+                                             docker_volume_basedir=self.docker_volume_basedir,
+                                             docker_network=self.docker_network,
+                                             log_file=self.log_file,
+                                             skip_pull_image=self.skip_pull_image,
+                                             aws_profile=self.profile)
+
+        context_mock.local_lambda_runner.invoke.assert_called_with(context_mock.function_name,
+                                                                   event=event_data,
+                                                                   stdout=context_mock.stdout,
+                                                                   stderr=context_mock.stderr)
+        get_event_mock.assert_called_with(self.eventfile)
+
+    @patch("samcli.commands.local.invoke.cli.InvokeContext")
+    @patch("samcli.commands.local.invoke.cli._get_event")
+    def test_must_raise_user_exception_on_function_not_found(self, get_event_mock, InvokeContextMock):
+        event_data = "data"
+        get_event_mock.return_value = event_data
+
+        # Mock the __enter__ method to return a object inside a context manager
+        context_mock = Mock()
+        InvokeContextMock.return_value.__enter__.return_value = context_mock
+
+        context_mock.local_lambda_runner.invoke.side_effect = FunctionNotFound("not found")
+
+        with self.assertRaises(UserException) as ex_ctx:
+
+            invoke_cli(ctx=None,
+                       function_identifier=self.function_id,
+                       template=self.template,
+                       event=self.eventfile,
+                       env_vars=self.env_vars,
+                       debug_port=self.debug_port,
+                       debug_args=self.debug_args,
+                       docker_volume_basedir=self.docker_volume_basedir,
+                       docker_network=self.docker_network,
+                       log_file=self.log_file,
+                       skip_pull_image=self.skip_pull_image,
+                       profile=self.profile)
+
+        msg = str(ex_ctx.exception)
+        self.assertEquals(msg, "Function {} not found in template".format(self.function_id))
+
+    @patch("samcli.commands.local.invoke.cli.InvokeContext")
+    @patch("samcli.commands.local.invoke.cli._get_event")
+    def test_must_raise_user_exception_on_invalid_sam_template(self, get_event_mock, InvokeContextMock):
+        event_data = "data"
+        get_event_mock.return_value = event_data
+
+        InvokeContextMock.side_effect = InvalidSamDocumentException("bad template")
+
+        with self.assertRaises(UserException) as ex_ctx:
+
+            invoke_cli(ctx=None,
+                       function_identifier=self.function_id,
+                       template=self.template,
+                       event=self.eventfile,
+                       env_vars=self.env_vars,
+                       debug_port=self.debug_port,
+                       debug_args=self.debug_args,
+                       docker_volume_basedir=self.docker_volume_basedir,
+                       docker_network=self.docker_network,
+                       log_file=self.log_file,
+                       skip_pull_image=self.skip_pull_image,
+                       profile=self.profile)
+
+        msg = str(ex_ctx.exception)
+        self.assertEquals(msg, "bad template")
+
+
+class TestGetEvent(TestCase):
+
+    @parameterized.expand([
+        param("-"),
+        param("somefile")
+    ])
+    @patch("samcli.commands.local.invoke.cli.click")
+    def test_must_work_with_stdin(self, filename, click_mock):
+        event_data = "some data"
+
+        # Mock file pointer
+        fp_mock = Mock()
+
+        # Mock the context manager
+        click_mock.open_file.return_value.__enter__.return_value = fp_mock
+        fp_mock.read.return_value = event_data
+
+        result = invoke_cli_get_event(filename)
+
+        self.assertEquals(result, event_data)
+        fp_mock.read.assert_called_with()
diff --git a/tests/unit/commands/local/lib/__init__.py b/tests/unit/commands/local/lib/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/local/lib/swagger/__init__.py b/tests/unit/commands/local/lib/swagger/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/local/lib/swagger/test_integration_uri.py b/tests/unit/commands/local/lib/swagger/test_integration_uri.py
new file mode 100644
index 0000000000..4eb9dc1813
--- /dev/null
+++ b/tests/unit/commands/local/lib/swagger/test_integration_uri.py
@@ -0,0 +1,182 @@
+"""
+Unit test for Lambda Integration URI parsing
+"""
+
+import logging
+
+from samcli.commands.local.lib.swagger.integration_uri import LambdaUri
+from unittest import TestCase
+from parameterized import parameterized
+
+
+logging.basicConfig(level=logging.DEBUG)
+
+
+class TestLambdaUri(TestCase):
+
+    FUNCTION_NAME = "MyCoolFunction"
+
+    SUCCESS_CASES = [
+        (
+            "URI is a string with fully resolved ARN",
+            "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:123456789012:function:MyCoolFunction/invocations"  # NOQA
+        ),
+
+        (
+            "URI is a full ARN with any region and any account id",
+            "arn:aws:apigateway:<<someregion>>:<<someservice>>:path/2015-03-31/functions/arn:aws:lambda:region:accountid:function:MyCoolFunction/invocations"  # NOQA
+        ),
+
+        (
+
+            "URI is a Fn::Sub with a Lambda ARN as a variable",
+            {
+                "Fn::Sub": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/${MyCoolFunction.Arn}/invocations"  # NOQA
+            }
+        ),
+
+        (
+            "URI is a Fn::Sub with a Lambda Alias as a variable",
+            {
+                "Fn::Sub": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/${MyCoolFunction.Alias}/invocations"  # NOQA
+            }
+        ),
+
+        (
+            "URI is a Fn::Sub with a Lambda ARN as a variable in addition to others provided as string",
+            {
+                "Fn::Sub": "arn:${AWS::Partition}:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyCoolFunction.Arn}/invocations"  # NOQA
+            }
+        ),
+
+        (
+            "URI is a Fn::Sub with a Lambda ARN as a variable in addition to others provided as array",
+            {
+                "Fn::Sub": [
+                    "arn:aws:apigateway:${region}:lambda:path/2015-03-31/functions/${MyCoolFunction.Arn}/invocations",
+                    {"region": {"Ref": "AWS::Region"}}
+                ]
+            }
+        ),
+
+        (
+            "URI is a Fn::Sub resolvable intrinsic as an array",
+            {
+                "Fn::Sub": [
+                    "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/${MyCoolFunction.Arn}/invocations",
+                ]
+            }
+        ),
+
+        (
+            "URI is a string with just enough information to pass regex tests",
+            "foo/functions/bar:function:MyCoolFunction/invocations"  # NOQA
+        ),
+    ]
+
+    @parameterized.expand(SUCCESS_CASES)
+    def test_get_function_name_success(self, test_case_name, uri):
+
+        result = LambdaUri.get_function_name(uri)
+        self.assertEquals(result, self.FUNCTION_NAME)
+
+    FAILURE_CASES = [
+
+        (
+            "URI is a string with stage variables",
+            "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:123456789012:function:${stageVariables.FunctionName}/invocations" # NOQA
+        ),
+
+        (
+            "URI is an ARN string of non-Lambda resource",
+            "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:something:us-east-1:123456789012:event:MyCoolFunction/invocations" # NOQA
+        ),
+
+        (
+            "URI is a random string",
+            "hello world"
+        ),
+
+        (
+            "URI is an integration ARN without proper Lambda function name",
+            "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:123456789012:function:${ThisIntrinsicDidntGetSubstituted}/invocations" # NOQA
+        ),
+
+        (
+            "URI is a list",
+            [1, 2, 3]
+        ),
+
+        (
+            "URI is a dictionary with more than one keys",
+            {
+                "Fn::Sub": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/${MyCoolFunction.Arn}/invocations",  # NOQA
+                "SomeKey": "value"
+            }
+        ),
+
+        (
+            "URI is a Ref",
+            {
+                "Ref": "MyCoolFunction"
+            }
+        ),
+
+        (
+            "URI is a GetAtt",
+            {
+                "Fn::GetAtt": "MyCoolFunction.Arn"
+            }
+        ),
+
+        (
+            "URI is a Fn::Sub with array values that would resolve in CloudFormation",
+            {
+                "Fn::Sub": [
+                    # In CloudFormation this intrinsic function will resolve to correct function name.
+                    # But unfortunately we don't support this here
+                    "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/${MyArn}/invocations",
+                    {
+                        "MyArn": {"Fn::GetAtt": "MyCoolFunction.Arn"}
+                    }
+                ],
+            }
+        ),
+
+        (
+            "URI is a Fn::Sub with intrinsic that does not return an Arn or Alias",
+            {
+                "Fn::Sub": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/${MyCoolFunction}/invocations",  # NOQA
+            }
+        ),
+
+        (
+            "URI is a Fn::Sub with ignored variable created with ${! syntax",
+            {
+                "Fn::Sub": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/${!MyCoolFunction.Arn}/invocations",  # NOQA
+            }
+        ),
+
+        (
+            "URI is a Fn::Sub is invalid in structure",
+            {
+                "Fn::Sub": {"foo": "bar"},
+            }
+        ),
+
+        (
+            "URI is empty string",
+            ""
+        ),
+
+        (
+            "URI without enough information to pass regex test",
+            "bar:function:MyCoolFunction/invocations"
+        ),
+    ]
+
+    @parameterized.expand(FAILURE_CASES)
+    def test_get_function_name_failure(self, test_case_name, uri):
+
+        result = LambdaUri.get_function_name(uri)
+        self.assertIsNone(result, "Must fail to get function name when " + test_case_name)
diff --git a/tests/unit/commands/local/lib/swagger/test_parser.py b/tests/unit/commands/local/lib/swagger/test_parser.py
new file mode 100644
index 0000000000..59db1ea969
--- /dev/null
+++ b/tests/unit/commands/local/lib/swagger/test_parser.py
@@ -0,0 +1,211 @@
+"""
+Test the swagger parser
+"""
+
+from samcli.commands.local.lib.swagger.parser import SwaggerParser
+from samcli.commands.local.lib.provider import Api
+
+from unittest import TestCase
+from mock import patch, Mock
+from parameterized import parameterized, param
+
+
+class TestSwaggerParser_get_apis(TestCase):
+
+    def test_with_one_path_method(self):
+        function_name = "myfunction"
+        swagger = {
+            "paths": {
+                "/path1": {
+                    "get": {
+                        "x-amazon-apigateway-integration": {
+                            "type": "aws_proxy",
+                            "uri": "someuri"
+                        }
+                    }
+                }
+            }
+        }
+
+        parser = SwaggerParser(swagger)
+        parser._get_integration_function_name = Mock()
+        parser._get_integration_function_name.return_value = function_name
+
+        expected = [Api(path="/path1", method="get", function_name=function_name, cors=None)]
+        result = parser.get_apis()
+
+        self.assertEquals(expected, result)
+        parser._get_integration_function_name.assert_called_with({
+            "x-amazon-apigateway-integration": {
+                "type": "aws_proxy",
+                "uri": "someuri"
+            }
+        })
+
+    def test_with_combination_of_paths_methods(self):
+        function_name = "myfunction"
+        swagger = {
+            "paths": {
+                "/path1": {
+                    "get": {
+                        "x-amazon-apigateway-integration": {
+                            "type": "aws_proxy",
+                            "uri": "someuri"
+                        }
+                    },
+                    "delete": {
+                        "x-amazon-apigateway-integration": {
+                            "type": "aws_proxy",
+                            "uri": "someuri"
+                        }
+                    }
+                },
+
+                "/path2": {
+                    "post": {
+                        "x-amazon-apigateway-integration": {
+                            "type": "aws_proxy",
+                            "uri": "someuri"
+                        }
+                    }
+                }
+            }
+        }
+
+        parser = SwaggerParser(swagger)
+        parser._get_integration_function_name = Mock()
+        parser._get_integration_function_name.return_value = function_name
+
+        expected = {
+            Api(path="/path1", method="get", function_name=function_name, cors=None),
+            Api(path="/path1", method="delete", function_name=function_name, cors=None),
+            Api(path="/path2", method="post", function_name=function_name, cors=None),
+        }
+        result = parser.get_apis()
+
+        self.assertEquals(expected, set(result))
+
+    def test_with_any_method(self):
+        function_name = "myfunction"
+        swagger = {
+            "paths": {
+                "/path1": {
+                    "x-amazon-apigateway-any-method": {
+                        "x-amazon-apigateway-integration": {
+                            "type": "aws_proxy",
+                            "uri": "someuri"
+                        }
+                    }
+                }
+            }
+        }
+
+        parser = SwaggerParser(swagger)
+        parser._get_integration_function_name = Mock()
+        parser._get_integration_function_name.return_value = function_name
+
+        expected = [Api(path="/path1", method="ANY", function_name=function_name, cors=None)]
+        result = parser.get_apis()
+
+        self.assertEquals(expected, result)
+
+    def test_does_not_have_function_name(self):
+        swagger = {
+            "paths": {
+                "/path1": {
+                    "post": {
+                        "x-amazon-apigateway-integration": {
+                            "type": "aws_proxy",
+                            "uri": "someuri"
+                        }
+                    }
+                }
+            }
+        }
+
+        parser = SwaggerParser(swagger)
+        parser._get_integration_function_name = Mock()
+        parser._get_integration_function_name.return_value = None  # Function Name could not be resolved
+
+        expected = []
+        result = parser.get_apis()
+
+        self.assertEquals(expected, result)
+
+    @parameterized.expand([
+        param("empty swagger", {}),
+        param("'paths' property is absent", {"foo": "bar"}),
+        param("no paths", {"paths": {}}),
+        param("no methods", {"paths": {
+            "/path1": {}
+        }}),
+        param("no integration", {"paths": {
+            "/path1": {
+                "get": {}
+            }
+        }})
+    ])
+    def test_invalid_swagger(self, test_case_name, swagger):
+
+        parser = SwaggerParser(swagger)
+        result = parser.get_apis()
+
+        expected = []
+        self.assertEquals(expected, result)
+
+
+class TestSwaggerParser_get_integration_function_name(TestCase):
+
+    @patch('samcli.commands.local.lib.swagger.parser.LambdaUri')
+    def test_valid_integration(self, LambdaUriMock):
+        function_name = "name"
+        LambdaUriMock.get_function_name.return_value = function_name
+
+        method_config = {
+            "x-amazon-apigateway-integration": {
+                "type": "aws_proxy",
+                "uri": "someuri"
+            }
+        }
+
+        parser = SwaggerParser({})
+        result = parser._get_integration_function_name(method_config)
+
+        self.assertEquals(function_name, result)
+        LambdaUriMock.get_function_name.assert_called_with("someuri")
+
+    @parameterized.expand([
+        param("config is not dict", "myconfig"),
+        param("integration key is not in config", {"key": "value"}),
+        param("integration value is empty", {"x-amazon-apigateway-integration": {}}),
+        param("integration value is not dict", {"x-amazon-apigateway-integration": "someval"}),
+        param("integration type is not aws_proxy", {"x-amazon-apigateway-integration": {
+            "type": "mock",
+        }}),
+        param("integration uri is not present", {"x-amazon-apigateway-integration": {
+            "type": "aws_proxy"
+        }})
+    ])
+    @patch('samcli.commands.local.lib.swagger.parser.LambdaUri')
+    def test_invalid_integration(self, test_case_name, method_config, LambdaUriMock):
+        LambdaUriMock.get_function_name.return_value = None
+
+        parser = SwaggerParser({})
+        result = parser._get_integration_function_name(method_config)
+
+        self.assertIsNone(result, "must not parse invalid integration")
+
+
+class TestSwaggerParser_get_binary_media_types(TestCase):
+
+    @parameterized.expand([
+        param("Swagger was none", None, []),
+        param("Swagger is has no binary media types defined", {}, []),
+        param("Swagger define binary media types",
+              {"x-amazon-apigateway-binary-media-types": ["image/gif", "application/json"]},
+              ["image/gif", "application/json"])
+    ])
+    def test_binary_media_type_returned(self, test_case_name, swagger, expected_result):
+        parser = SwaggerParser(swagger)
+
+        self.assertEquals(parser.get_binary_media_types(), expected_result)
diff --git a/tests/unit/commands/local/lib/swagger/test_reader.py b/tests/unit/commands/local/lib/swagger/test_reader.py
new file mode 100644
index 0000000000..249ae61a82
--- /dev/null
+++ b/tests/unit/commands/local/lib/swagger/test_reader.py
@@ -0,0 +1,352 @@
+
+import tempfile
+import json
+import os
+import botocore
+
+from unittest import TestCase
+from parameterized import parameterized, param
+from mock import Mock, patch
+
+from samcli.commands.local.lib.swagger.reader import parse_aws_include_transform, SamSwaggerReader
+
+
+class TestParseAwsIncludeTransform(TestCase):
+
+    def test_must_return_location(self):
+
+        data = {
+            "Fn::Transform": {
+                "Name": "AWS::Include",
+                "Parameters": {
+                    "Location": "s3://bucket/swagger.yaml"
+                }
+            }
+        }
+
+        expected = "s3://bucket/swagger.yaml"
+        result = parse_aws_include_transform(data)
+
+        self.assertEquals(result, expected)
+
+    @parameterized.expand([
+        param({}),
+        param(None),
+        param({
+            "Name": "AWS::Include",
+            "Parameters": {
+                "Location": "s3://bucket/swagger.yaml"
+            }
+        }),
+        param({
+            "Fn::Transform": {
+                "Name": "AWS::SomeTransformName",
+                "Parameters": {
+                    "Location": "s3://bucket/swagger.yaml"
+                }
+            }
+        })
+    ])
+    def test_invalid_aws_include_data(self, data):
+        result = parse_aws_include_transform(data)
+        self.assertIsNone(result)
+
+
+class TestSamSwaggerReader_init(TestCase):
+
+    def test_definition_body_and_uri_required(self):
+
+        with self.assertRaises(ValueError):
+            SamSwaggerReader()
+
+
+class TestSamSwaggerReader_read(TestCase):
+
+    def test_must_read_first_from_definition_body(self):
+        body = {"this is": "swagger"}
+        uri = "./file.txt"
+        expected = {"some": "value"}
+
+        reader = SamSwaggerReader(definition_body=body, definition_uri=uri)
+        reader._download_swagger = Mock()
+        reader._read_from_definition_body = Mock()
+        reader._read_from_definition_body.return_value = expected
+
+        actual = reader.read()
+        self.assertEquals(actual, expected)
+
+        reader._read_from_definition_body.assert_called_with()
+        reader._download_swagger.assert_not_called()
+
+    def test_read_from_definition_uri(self):
+        uri = "./file.txt"
+        expected = {"some": "value"}
+
+        reader = SamSwaggerReader(definition_uri=uri)
+        reader._download_swagger = Mock()
+        reader._download_swagger.return_value = expected
+
+        actual = reader.read()
+        self.assertEquals(actual, expected)
+
+        reader._download_swagger.assert_called_with(uri)
+
+    def test_must_use_definition_uri_if_body_does_not_exist(self):
+        body = {"this is": "swagger"}
+        uri = "./file.txt"
+        expected = {"some": "value"}
+
+        reader = SamSwaggerReader(definition_body=body, definition_uri=uri)
+        reader._download_swagger = Mock()
+        reader._download_swagger.return_value = expected
+
+        # Set the output of reading the definition body to be None
+        reader._read_from_definition_body = Mock()
+        reader._read_from_definition_body.return_value = None
+
+        actual = reader.read()
+        self.assertEquals(actual, expected)
+
+        reader._read_from_definition_body.assert_called_with()
+        reader._download_swagger.assert_called_with(uri)
+
+
+class TestSamSwaggerReader_read_from_definition_body(TestCase):
+
+    @patch("samcli.commands.local.lib.swagger.reader.parse_aws_include_transform")
+    def test_must_work_with_include_transform(self, parse_mock):
+        body = {'this': 'swagger'}
+        expected = {'k': 'v'}
+        location = "some location"
+
+        reader = SamSwaggerReader(definition_body=body)
+        reader._download_swagger = Mock()
+        reader._download_swagger.return_value = expected
+        parse_mock.return_value = location
+
+        actual = reader._read_from_definition_body()
+        self.assertEquals(actual, expected)
+        parse_mock.assert_called_with(body)
+
+    @patch("samcli.commands.local.lib.swagger.reader.parse_aws_include_transform")
+    def test_must_get_body_directly(self, parse_mock):
+        body = {'this': 'swagger'}
+
+        reader = SamSwaggerReader(definition_body=body)
+        parse_mock.return_value = None  # No location is returned from aws_include parser
+
+        actual = reader._read_from_definition_body()
+        self.assertEquals(actual, body)
+
+
+class TestSamSwaggerReader_download_swagger(TestCase):
+
+    @patch("samcli.commands.local.lib.swagger.reader.yaml_parse")
+    def test_must_download_from_s3_for_s3_locations(self, yaml_parse_mock):
+        location = {
+            "Bucket": "mybucket",
+            "Key": "swagger.yaml",
+            "Version": "versionId"
+        }
+        swagger_str = "some swagger str"
+        expected = "some data"
+
+        reader = SamSwaggerReader(definition_uri=location)
+        reader._download_from_s3 = Mock()
+        reader._download_from_s3.return_value = swagger_str
+        yaml_parse_mock.return_value = expected
+
+        actual = reader._download_swagger(location)
+
+        self.assertEquals(actual, expected)
+        reader._download_from_s3.assert_called_with(location["Bucket"],
+                                                    location["Key"],
+                                                    location["Version"])
+        yaml_parse_mock.assert_called_with(swagger_str)
+
+    @patch("samcli.commands.local.lib.swagger.reader.yaml_parse")
+    def test_must_skip_non_s3_dictionaries(self, yaml_parse_mock):
+
+        location = {"some": "value"}
+
+        reader = SamSwaggerReader(definition_uri=location)
+        reader._download_from_s3 = Mock()
+
+        actual = reader._download_swagger(location)
+
+        self.assertIsNone(actual)
+        reader._download_from_s3.assert_not_called()
+        yaml_parse_mock.assert_not_called()
+
+    @patch("samcli.commands.local.lib.swagger.reader.yaml_parse")
+    def test_must_read_from_local_file(self, yaml_parse_mock):
+        data = {"some": "value"}
+        expected = "parsed result"
+        yaml_parse_mock.return_value = expected
+
+        with tempfile.NamedTemporaryFile() as fp:
+            filepath = fp.name
+
+            json.dump(data, fp)
+            fp.flush()
+
+            cwd = os.path.dirname(filepath)
+            filename = os.path.basename(filepath)
+
+            reader = SamSwaggerReader(definition_uri=filename, working_dir=cwd)
+            actual = reader._download_swagger(filename)
+
+            self.assertEquals(actual, expected)
+            yaml_parse_mock.assert_called_with('{"some": "value"}')  # data was read back from the file as JSON string
+
+    @patch("samcli.commands.local.lib.swagger.reader.yaml_parse")
+    def test_must_read_from_local_file_without_working_directory(self, yaml_parse_mock):
+        data = {"some": "value"}
+        expected = "parsed result"
+        yaml_parse_mock.return_value = expected
+
+        with tempfile.NamedTemporaryFile() as fp:
+            filepath = fp.name
+
+            json.dump(data, fp)
+            fp.flush()
+
+            reader = SamSwaggerReader(definition_uri=filepath)
+            actual = reader._download_swagger(filepath)
+
+            self.assertEquals(actual, expected)
+            yaml_parse_mock.assert_called_with('{"some": "value"}')  # data was read back from the file as JSON string
+
+    @patch("samcli.commands.local.lib.swagger.reader.yaml_parse")
+    def test_must_return_none_if_file_not_found(self, yaml_parse_mock):
+        expected = "parsed result"
+        yaml_parse_mock.return_value = expected
+
+        reader = SamSwaggerReader(definition_uri="somepath")
+        actual = reader._download_swagger("abcdefgh.txt")
+
+        self.assertIsNone(actual)
+        yaml_parse_mock.assert_not_called()
+
+    def test_with_invalid_location(self):
+
+        reader = SamSwaggerReader(definition_uri="something")
+        actual = reader._download_swagger({})
+
+        self.assertIsNone(actual)
+
+
+class TestSamSwaggerReaderDownloadFromS3(TestCase):
+
+    def setUp(self):
+        self.bucket = "mybucket"
+        self.key = "mykey"
+        self.version = "versionid"
+
+    @patch('samcli.commands.local.lib.swagger.reader.boto3')
+    @patch('samcli.commands.local.lib.swagger.reader.tempfile')
+    def test_must_download_file_from_s3(self, tempfilemock, botomock):
+
+        s3_mock = Mock()
+        botomock.client.return_value = s3_mock
+
+        fp_mock = Mock()
+        tempfilemock.TemporaryFile.return_value.__enter__.return_value = fp_mock  # mocking context manager
+
+        expected = "data from file"
+        fp_mock.read.return_value = expected
+
+        actual = SamSwaggerReader._download_from_s3(self.bucket, self.key, self.version)
+        self.assertEquals(actual, expected)
+
+        s3_mock.download_file.assert_called_with(self.bucket, self.key, fp_mock,
+                                                 ExtraArgs={"VersionId": self.version})
+
+        fp_mock.seek.assert_called_with(0)  # make sure we seek the file before reading
+        fp_mock.read.assert_called_with()
+
+    @patch('samcli.commands.local.lib.swagger.reader.boto3')
+    @patch('samcli.commands.local.lib.swagger.reader.tempfile')
+    def test_must_work_without_object_version_id(self, tempfilemock, botomock):
+
+        s3_mock = Mock()
+        botomock.client.return_value = s3_mock
+
+        fp_mock = Mock()
+        tempfilemock.TemporaryFile.return_value.__enter__.return_value = fp_mock  # mocking context manager
+
+        expected = "data from file"
+        fp_mock.read.return_value = expected
+
+        actual = SamSwaggerReader._download_from_s3(self.bucket, self.key)
+        self.assertEquals(actual, expected)
+
+        s3_mock.download_file.assert_called_with(self.bucket, self.key, fp_mock,
+                                                 ExtraArgs={})
+
+    @patch('samcli.commands.local.lib.swagger.reader.boto3')
+    @patch('samcli.commands.local.lib.swagger.reader.tempfile')
+    def test_must_log_on_download_exception(self, tempfilemock, botomock):
+
+        s3_mock = Mock()
+        botomock.client.return_value = s3_mock
+
+        fp_mock = Mock()
+        tempfilemock.TemporaryFile.return_value.__enter__.return_value = fp_mock  # mocking context manager
+        s3_mock.download_file.side_effect = botocore.exceptions.ClientError({"Error": {}},
+                                                                            "download_file")
+
+        with self.assertRaises(botocore.exceptions.ClientError):
+            SamSwaggerReader._download_from_s3(self.bucket, self.key)
+
+            fp_mock.read.assert_not_called()
+
+
+class TestSamSwaggerReader_parse_s3_location(TestCase):
+
+    def setUp(self):
+        self.bucket = "mybucket"
+        self.key = "mykey"
+        self.version = "myversion"
+
+    def test_must_parse_valid_dict(self):
+        location = {
+            "Bucket": self.bucket,
+            "Key": self.key,
+            "Version": self.version
+        }
+
+        result = SamSwaggerReader._parse_s3_location(location)
+        self.assertEquals(result, (self.bucket, self.key, self.version))
+
+    def test_must_parse_dict_without_version(self):
+        location = {
+            "Bucket": self.bucket,
+            "Key": self.key
+        }
+
+        result = SamSwaggerReader._parse_s3_location(location)
+        self.assertEquals(result, (self.bucket, self.key, None))
+
+    def test_must_parse_s3_uri_string(self):
+        location = "s3://{}/{}?versionId={}".format(self.bucket, self.key, self.version)
+
+        result = SamSwaggerReader._parse_s3_location(location)
+        self.assertEquals(result, (self.bucket, self.key, self.version))
+
+    def test_must_parse_s3_uri_string_without_version_id(self):
+        location = "s3://{}/{}".format(self.bucket, self.key)
+
+        result = SamSwaggerReader._parse_s3_location(location)
+        self.assertEquals(result, (self.bucket, self.key, None))
+
+    @parameterized.expand([
+        param("http://s3.amazonaws.com/bucket/key"),
+        param("./foo/bar.txt"),
+        param("/home/user/bar.txt"),
+        param({"k": "v"}),
+    ])
+    def test_must_parse_invalid_location(self, location):
+
+        result = SamSwaggerReader._parse_s3_location(location)
+        self.assertEquals(result, (None, None, None))
diff --git a/tests/unit/commands/local/lib/test_events.py b/tests/unit/commands/local/lib/test_events.py
new file mode 100644
index 0000000000..825d2b5f14
--- /dev/null
+++ b/tests/unit/commands/local/lib/test_events.py
@@ -0,0 +1,285 @@
+from unittest import TestCase
+
+from samcli.commands.local.lib.events import generate_api_event, generate_dynamodb_event, generate_kinesis_event, \
+    generate_schedule_event, generate_sns_event, generate_s3_event
+
+
+class TestGeneratedEvent(TestCase):
+
+    def test_s3_event(self):
+        actual_event = generate_s3_event("us-east-1", "bucket", "key")
+
+        expected_event = {
+            "Records": [{
+                "eventVersion": "2.0",
+                "eventTime": "1970-01-01T00:00:00.000Z",
+                "requestParameters": {
+                    "sourceIPAddress": "127.0.0.1"
+                },
+                "s3": {
+                    "configurationId": "testConfigRule",
+                    "object": {
+                        "eTag": "0123456789abcdef0123456789abcdef",
+                        "sequencer": "0A1B2C3D4E5F678901",
+                        "key": "key",
+                        "size": 1024
+                    },
+                    "bucket": {
+                        "arn": "arn:aws:s3:::bucket",
+                        "name": "bucket",
+                        "ownerIdentity": {
+                            "principalId": "EXAMPLE"
+                        }
+                    },
+                    "s3SchemaVersion": "1.0"
+                },
+                "responseElements": {
+                    "x-amz-id-2": "EXAMPLE123/5678abcdefghijklambdaisawesome/mnopqrstuvwxyzABCDEFGH",
+                    "x-amz-request-id": "EXAMPLE123456789"
+                },
+                "awsRegion": "us-east-1",
+                "eventName": "ObjectCreated:Put",
+                "userIdentity": {
+                    "principalId": "EXAMPLE"
+                },
+                "eventSource": "aws:s3"
+            }]
+        }
+
+        self.assertEquals(actual_event, expected_event)
+
+    def test_sns_event(self):
+        actual_event = generate_sns_event("message", "topic", "subject")
+
+        expected_event = {
+            "Records": [{
+                "EventVersion": "1.0",
+                "EventSubscriptionArn": "arn:aws:sns:EXAMPLE",
+                "EventSource": "aws:sns",
+                "Sns": {
+                    "SignatureVersion": "1",
+                    "Timestamp": "1970-01-01T00:00:00.000Z",
+                    "Signature": "EXAMPLE",
+                    "SigningCertUrl": "EXAMPLE",
+                    "MessageId": "95df01b4-ee98-5cb9-9903-4c221d41eb5e",
+                    "Message": "message",
+                    "MessageAttributes": {
+                        "Test": {
+                            "Type": "String",
+                            "Value": "TestString"
+                        },
+                        "TestBinary": {
+                            "Type": "Binary",
+                            "Value": "TestBinary"
+                        }
+                    },
+                    "Type": "Notification",
+                    "UnsubscribeUrl": "EXAMPLE",
+                    "TopicArn": "topic",
+                    "Subject": "subject"
+                }
+            }]
+        }
+
+        self.assertEquals(actual_event, expected_event)
+
+    def test_api_event(self):
+        actual_event = generate_api_event("GET", "body of the request", "/path", "/path")
+        self.maxDiff = None
+
+        expected_event = {
+            'body': 'body of the request',
+            'headers': {
+                'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
+                'Accept-Encoding': 'gzip, deflate, sdch',
+                'Accept-Language': 'en-US,en;q=0.8',
+                'Cache-Control': 'max-age=0',
+                'CloudFront-Forwarded-Proto': 'https',
+                'CloudFront-Is-Desktop-Viewer': 'true',
+                'CloudFront-Is-Mobile-Viewer': 'false',
+                'CloudFront-Is-SmartTV-Viewer': 'false',
+                'CloudFront-Is-Tablet-Viewer': 'false',
+                'CloudFront-Viewer-Country': 'US',
+                'Host': '1234567890.execute-api.us-east-1.amazonaws.com',
+                'Upgrade-Insecure-Requests': '1',
+                'User-Agent': 'Custom User Agent String',
+                'Via': '1.1 08f323deadbeefa7af34d5feb414ce27.cloudfront.net (CloudFront)',
+                'X-Amz-Cf-Id': 'aaaaaaaaaae3VYQb9jd-nvCd-de396Uhbp027Y2JvkCPNLmGJHqlaA==',
+                'X-Forwarded-For': '127.0.0.1, 127.0.0.2',
+                'X-Forwarded-Port': '443',
+                'X-Forwarded-Proto': 'https'
+            },
+            'httpMethod': 'GET',
+            'isBase64Encoded': False,
+            'path': '/path',
+            'pathParameters': {'proxy': '/path'},
+            'queryStringParameters': {'foo': 'bar'},
+            'requestContext': {
+                'accountId': "123456789012",
+                'apiId': "1234567890",
+                'extendedRequestId': None,
+                'httpMethod': 'GET',
+                'identity': {
+                    'accountId': None,
+                    'apiKey': None,
+                    'caller': None,
+                    'cognitoAuthenticationProvider': None,
+                    'cognitoAuthenticationType': None,
+                    'cognitoIdentityPoolId': None,
+                    'sourceIp': '127.0.0.1',
+                    'user': None,
+                    'userAgent': "Custom User Agent String",
+                    'userArn': None
+                },
+                'path': '/path',
+                'requestId': "c6af9ac6-7b61-11e6-9a41-93e8deadbeef",
+                'resourceId': "123456",
+                'resourcePath': '/path',
+                'stage': 'prod'
+            },
+            'resource': '/path',
+            'stageVariables': None
+        }
+
+        self.assertEquals(actual_event, expected_event)
+
+    def test_dynamodb_event(self):
+        actual_event = generate_dynamodb_event("us-east-1")
+
+        expected_event = {
+            "Records": [
+                {
+                    "eventID": "1",
+                    "eventVersion": "1.0",
+                    "dynamodb": {
+                        "Keys": {
+                            "Id": {
+                                "N": "101"
+                            }
+                        },
+                        "NewImage": {
+                            "Message": {
+                                "S": "New item!"
+                            },
+                            "Id": {
+                                "N": "101"
+                            }
+                        },
+                        "StreamViewType": "NEW_AND_OLD_IMAGES",
+                        "SequenceNumber": "111",
+                        "SizeBytes": 26
+                    },
+                    "awsRegion": "us-east-1",
+                    "eventName": "INSERT",
+                    "eventSourceARN": "arn:aws:dynamodb:us-east-1:account-id:table/"
+                                      "ExampleTableWithStream/stream/2015-06-27T00:48:05.899",
+                    "eventSource": "aws:dynamodb"
+                },
+                {
+                    "eventID": "2",
+                    "eventVersion": "1.0",
+                    "dynamodb": {
+                        "OldImage": {
+                            "Message": {
+                                "S": "New item!"
+                            },
+                            "Id": {
+                                "N": "101"
+                            }
+                        },
+                        "SequenceNumber": "222",
+                        "Keys": {
+                            "Id": {
+                                "N": "101"
+                            }
+                        },
+                        "SizeBytes": 59,
+                        "NewImage": {
+                            "Message": {
+                                "S": "This item has changed"
+                            },
+                            "Id": {
+                                "N": "101"
+                            }
+                        },
+                        "StreamViewType": "NEW_AND_OLD_IMAGES"
+                    },
+                    "awsRegion": "us-east-1",
+                    "eventName": "MODIFY",
+                    "eventSourceARN": "arn:aws:dynamodb:us-east-1:account-id:table/"
+                                      "ExampleTableWithStream/stream/2015-06-27T00:48:05.899",
+                    "eventSource": "aws:dynamodb"
+                },
+                {
+                    "eventID": "3",
+                    "eventVersion": "1.0",
+                    "dynamodb": {
+                        "Keys": {
+                            "Id": {
+                                "N": "101"
+                            }
+                        },
+                        "SizeBytes": 38,
+                        "SequenceNumber": "333",
+                        "OldImage": {
+                            "Message": {
+                                "S": "This item has changed"
+                            },
+                            "Id": {
+                                "N": "101"
+                            }
+                        },
+                        "StreamViewType": "NEW_AND_OLD_IMAGES"
+                    },
+                    "awsRegion": "us-east-1",
+                    "eventName": "REMOVE",
+                    "eventSourceARN": "arn:aws:dynamodb:us-east-1:account-id:table/"
+                                      "ExampleTableWithStream/stream/2015-06-27T00:48:05.899",
+                    "eventSource": "aws:dynamodb"
+                }
+            ]
+        }
+
+        self.assertEquals(actual_event, expected_event)
+
+    def test_scheudle_event(self):
+        actual_event = generate_schedule_event("us-east-1")
+
+        expected_event = {
+            "account": "123456789012",
+            "region": "us-east-1",
+            "detail": {},
+            "detail-type": "Scheduled Event",
+            "source": "aws.events",
+            "time": "1970-01-01T00:00:00Z",
+            "id": "cdc73f9d-aea9-11e3-9d5a-835b769c0d9c",
+            "resources": [
+                "arn:aws:events:us-east-1:123456789012:rule/my-schedule"
+            ]
+        }
+
+        self.assertEquals(actual_event, expected_event)
+
+    def test_kinesis_event(self):
+        actual_event = generate_kinesis_event("us-east-1", "partition", "sequence", "this is data")
+
+        expected_event = {
+            "Records": [{
+                "eventID": "shardId-000000000000:sequence",
+                "eventVersion": "1.0",
+                "kinesis": {
+                    "approximateArrivalTimestamp": 1428537600,
+                    "partitionKey": "partition",
+                    "data": "this is data",
+                    "kinesisSchemaVersion": "1.0",
+                    "sequenceNumber": "sequence"
+                },
+                "invokeIdentityArn": "arn:aws:iam::EXAMPLE",
+                "eventName": "aws:kinesis:record",
+                "eventSourceARN": "arn:aws:kinesis:EXAMPLE",
+                "eventSource": "aws:kinesis",
+                "awsRegion": "us-east-1"
+            }]
+        }
+
+        self.assertEquals(actual_event, expected_event)
diff --git a/tests/unit/commands/local/lib/test_local_api_service.py b/tests/unit/commands/local/lib/test_local_api_service.py
new file mode 100644
index 0000000000..aee6f7f4fa
--- /dev/null
+++ b/tests/unit/commands/local/lib/test_local_api_service.py
@@ -0,0 +1,181 @@
+"""
+Unit test for local API service
+"""
+
+from unittest import TestCase
+from mock import Mock, patch
+
+from samcli.commands.local.lib.local_api_service import LocalApiService
+from samcli.commands.local.lib.exceptions import NoApisDefined
+from samcli.commands.local.lib.provider import Api
+from samcli.local.apigw.service import Route
+
+
+class TestLocalApiService_start(TestCase):
+
+    def setUp(self):
+        self.port = 123
+        self.host = "abc"
+        self.static_dir = "static"
+        self.cwd = "cwd"
+        self.template = {"hello": "world"}
+
+        self.lambda_invoke_context_mock = Mock()
+        self.lambda_runner_mock = Mock()
+        self.api_provider_mock = Mock()
+        self.apigw_service = Mock()
+        self.stderr_mock = Mock()
+
+        self.lambda_invoke_context_mock.template = self.template
+        self.lambda_invoke_context_mock.local_lambda_runner = self.lambda_runner_mock
+        self.lambda_invoke_context_mock.get_cwd = Mock()
+        self.lambda_invoke_context_mock.get_cwd.return_value = self.cwd
+        self.lambda_invoke_context_mock.stderr = self.stderr_mock
+
+    @patch("samcli.commands.local.lib.local_api_service.Service")
+    @patch("samcli.commands.local.lib.local_api_service.SamApiProvider")
+    @patch.object(LocalApiService, "_make_static_dir_path")
+    @patch.object(LocalApiService, "_print_routes")
+    @patch.object(LocalApiService, "_make_routing_list")
+    def test_must_start_service(self,
+                                make_routing_list_mock,
+                                log_routes_mock,
+                                make_static_dir_mock,
+                                SamApiProviderMock,
+                                ApiGwServiceMock):
+
+        routing_list = [1, 2, 3]  # something
+        static_dir_path = "/foo/bar"
+
+        make_routing_list_mock.return_value = routing_list
+        make_static_dir_mock.return_value = static_dir_path
+
+        SamApiProviderMock.return_value = self.api_provider_mock
+        ApiGwServiceMock.return_value = self.apigw_service
+
+        # Now start the service
+        local_service = LocalApiService(self.lambda_invoke_context_mock, self.port, self.host, self.static_dir)
+        local_service.start()
+
+        # Make sure the right methods are called
+        SamApiProviderMock.assert_called_with(self.template, cwd=self.cwd)
+
+        make_routing_list_mock.assert_called_with(self.api_provider_mock)
+        log_routes_mock.assert_called_with(self.api_provider_mock, self.host, self.port)
+        make_static_dir_mock.assert_called_with(self.cwd, self.static_dir)
+        ApiGwServiceMock.assert_called_with(routing_list=routing_list,
+                                            lambda_runner=self.lambda_runner_mock,
+                                            static_dir=static_dir_path,
+                                            port=self.port,
+                                            host=self.host,
+                                            stderr=self.stderr_mock)
+
+        self.apigw_service.create.assert_called_with()
+        self.apigw_service.run.assert_called_with()
+
+    @patch("samcli.commands.local.lib.local_api_service.Service")
+    @patch("samcli.commands.local.lib.local_api_service.SamApiProvider")
+    @patch.object(LocalApiService, "_make_static_dir_path")
+    @patch.object(LocalApiService, "_print_routes")
+    @patch.object(LocalApiService, "_make_routing_list")
+    def test_must_raise_if_route_not_available(self,
+                                               make_routing_list_mock,
+                                               log_routes_mock,
+                                               make_static_dir_mock,
+                                               SamApiProviderMock,
+                                               ApiGwServiceMock):
+
+        routing_list = []  # Empty
+
+        make_routing_list_mock.return_value = routing_list
+
+        SamApiProviderMock.return_value = self.api_provider_mock
+        ApiGwServiceMock.return_value = self.apigw_service
+
+        # Now start the service
+        local_service = LocalApiService(self.lambda_invoke_context_mock, self.port, self.host, self.static_dir)
+
+        with self.assertRaises(NoApisDefined):
+            local_service.start()
+
+
+class TestLocalApiService_make_routing_list(TestCase):
+
+    def test_must_return_routing_list_from_apis(self):
+        api_provider = Mock()
+        apis = [
+            Api(path="/1", method="GET1", function_name="name1", cors="CORS1"),
+            Api(path="/2", method="GET2", function_name="name2", cors="CORS2"),
+            Api(path="/3", method="GET3", function_name="name3", cors="CORS3"),
+        ]
+        expected = [
+            Route(path="/1", methods=["GET1"], function_name="name1"),
+            Route(path="/2", methods=["GET2"], function_name="name2"),
+            Route(path="/3", methods=["GET3"], function_name="name3")
+        ]
+
+        api_provider.get_all.return_value = apis
+
+        result = LocalApiService._make_routing_list(api_provider)
+        self.assertEquals(len(result), len(expected))
+        for index, r in enumerate(result):
+            self.assertEquals(r.__dict__, expected[index].__dict__)
+
+
+class TestLocalApiService_print_routes(TestCase):
+
+    def test_must_print_routes(self):
+        host = "host"
+        port = 123
+
+        api_provider = Mock()
+        apis = [
+            Api(path="/1", method="GET", function_name="name1", cors="CORS1"),
+            Api(path="/1", method="POST", function_name="name1", cors="CORS1"),
+            Api(path="/1", method="DELETE", function_name="othername1", cors="CORS1"),
+            Api(path="/2", method="GET2", function_name="name2", cors="CORS2"),
+            Api(path="/3", method="GET3", function_name="name3", cors="CORS3"),
+        ]
+        api_provider.get_all.return_value = apis
+
+        expected = {"Mounting name1 at http://host:123/1 [GET, POST]",
+                    "Mounting othername1 at http://host:123/1 [DELETE]",
+                    "Mounting name2 at http://host:123/2 [GET2]",
+                    "Mounting name3 at http://host:123/3 [GET3]"}
+
+        actual = LocalApiService._print_routes(api_provider, host, port)
+        self.assertEquals(expected, set(actual))
+
+
+class TestLocalApiService_make_static_dir_path(TestCase):
+
+    def test_must_skip_if_none(self):
+        result = LocalApiService._make_static_dir_path("something", None)
+        self.assertIsNone(result)
+
+    @patch("samcli.commands.local.lib.local_api_service.os")
+    def test_must_resolve_with_respect_to_cwd(self, os_mock):
+        static_dir = "mydir"
+        cwd = "cwd"
+        resolved_path = "cwd/mydir"
+
+        os_mock.path.join.return_value = resolved_path
+        os_mock.path.exists.return_value = True  # Fake the path to exist
+
+        result = LocalApiService._make_static_dir_path(cwd, static_dir)
+        self.assertEquals(resolved_path, result)
+
+        os_mock.path.join.assert_called_with(cwd, static_dir)
+        os_mock.path.exists.assert_called_with(resolved_path)
+
+    @patch("samcli.commands.local.lib.local_api_service.os")
+    def test_must_return_none_if_path_not_exists(self, os_mock):
+        static_dir = "mydir"
+        cwd = "cwd"
+        resolved_path = "cwd/mydir"
+
+        os_mock.path.join.return_value = resolved_path
+        os_mock.path.exists.return_value = False  # Resolved path does not exist
+
+        result = LocalApiService._make_static_dir_path(cwd, static_dir)
+        self.assertIsNone(result)
diff --git a/tests/unit/commands/local/lib/test_local_lambda.py b/tests/unit/commands/local/lib/test_local_lambda.py
new file mode 100644
index 0000000000..812ce60daf
--- /dev/null
+++ b/tests/unit/commands/local/lib/test_local_lambda.py
@@ -0,0 +1,496 @@
+"""
+Testing local lambda runner
+"""
+import os
+
+from unittest import TestCase
+from mock import Mock, patch
+from parameterized import parameterized, param
+
+from samcli.commands.local.lib.local_lambda import LocalLambdaRunner
+from samcli.commands.local.lib.provider import Function
+from samcli.local.lambdafn.exceptions import FunctionNotFound
+
+
+class TestLocalLambda_get_aws_creds(TestCase):
+
+    def setUp(self):
+        self.region = "region"
+        self.key = "key"
+        self.secret = "secret"
+        self.token = "token"
+
+        self.runtime_mock = Mock()
+        self.function_provider_mock = Mock()
+        self.cwd = "cwd"
+        self.env_vars_values = {}
+        self.debug_port = 123
+        self.debug_args = "abc"
+        self.aws_profile = "myprofile"
+
+        self.local_lambda = LocalLambdaRunner(self.runtime_mock,
+                                              self.function_provider_mock,
+                                              self.cwd,
+                                              self.env_vars_values,
+                                              self.debug_port,
+                                              self.debug_args,
+                                              self.aws_profile)
+
+    @patch("samcli.commands.local.lib.local_lambda.boto3")
+    def test_must_get_from_boto_session(self, boto3_mock):
+        creds = Mock()
+        creds.access_key = self.key
+        creds.secret_key = self.secret
+        creds.token = self.token
+
+        mock_session = Mock()
+        mock_session.region_name = self.region
+
+        boto3_mock.session.Session.return_value = mock_session
+        mock_session.get_credentials.return_value = creds
+
+        expected = {
+            "region": self.region,
+            "key": self.key,
+            "secret": self.secret,
+            "sessiontoken": self.token
+        }
+
+        actual = self.local_lambda.get_aws_creds()
+        self.assertEquals(expected, actual)
+
+        boto3_mock.session.Session.assert_called_with(profile_name=self.aws_profile)
+
+    @patch("samcli.commands.local.lib.local_lambda.boto3")
+    def test_must_work_with_no_region_name(self, boto3_mock):
+        creds = Mock()
+        creds.access_key = self.key
+        creds.secret_key = self.secret
+        creds.token = self.token
+
+        mock_session = Mock()
+        del mock_session.region_name   # Ask mock to return AttributeError when 'region_name' is accessed
+
+        boto3_mock.session.Session.return_value = mock_session
+        mock_session.get_credentials.return_value = creds
+
+        expected = {
+            "key": self.key,
+            "secret": self.secret,
+            "sessiontoken": self.token
+        }
+
+        actual = self.local_lambda.get_aws_creds()
+        self.assertEquals(expected, actual)
+
+        boto3_mock.session.Session.assert_called_with(profile_name=self.aws_profile)
+
+    @patch("samcli.commands.local.lib.local_lambda.boto3")
+    def test_must_work_with_no_access_key(self, boto3_mock):
+        creds = Mock()
+        del creds.access_key   # No access key
+        creds.secret_key = self.secret
+        creds.token = self.token
+
+        mock_session = Mock()
+        mock_session.region_name = self.region
+
+        boto3_mock.session.Session.return_value = mock_session
+        mock_session.get_credentials.return_value = creds
+
+        expected = {
+            "region": self.region,
+            "secret": self.secret,
+            "sessiontoken": self.token
+        }
+
+        actual = self.local_lambda.get_aws_creds()
+        self.assertEquals(expected, actual)
+
+        boto3_mock.session.Session.assert_called_with(profile_name=self.aws_profile)
+
+    @patch("samcli.commands.local.lib.local_lambda.boto3")
+    def test_must_work_with_no_secret_key(self, boto3_mock):
+        creds = Mock()
+        creds.access_key = self.key
+        del creds.secret_key   # No secret key
+        creds.token = self.token
+
+        mock_session = Mock()
+        mock_session.region_name = self.region
+
+        boto3_mock.session.Session.return_value = mock_session
+        mock_session.get_credentials.return_value = creds
+
+        expected = {
+            "region": self.region,
+            "key": self.key,
+            "sessiontoken": self.token
+        }
+
+        actual = self.local_lambda.get_aws_creds()
+        self.assertEquals(expected, actual)
+
+        boto3_mock.session.Session.assert_called_with(profile_name=self.aws_profile)
+
+    @patch("samcli.commands.local.lib.local_lambda.boto3")
+    def test_must_work_with_no_session_token(self, boto3_mock):
+        creds = Mock()
+        creds.access_key = self.key
+        creds.secret_key = self.secret
+        del creds.token   # No Token
+
+        mock_session = Mock()
+        mock_session.region_name = self.region
+
+        boto3_mock.session.Session.return_value = mock_session
+        mock_session.get_credentials.return_value = creds
+
+        expected = {
+            "region": self.region,
+            "key": self.key,
+            "secret": self.secret
+        }
+
+        actual = self.local_lambda.get_aws_creds()
+        self.assertEquals(expected, actual)
+
+        boto3_mock.session.Session.assert_called_with(profile_name=self.aws_profile)
+
+    @patch("samcli.commands.local.lib.local_lambda.boto3")
+    def test_must_work_with_no_credentials(self, boto3_mock):
+        mock_session = Mock()
+        boto3_mock.session.Session.return_value = mock_session
+        mock_session.get_credentials.return_value = None
+
+        expected = {}
+        actual = self.local_lambda.get_aws_creds()
+        self.assertEquals(expected, actual)
+
+        boto3_mock.session.Session.assert_called_with(profile_name=self.aws_profile)
+
+    @patch("samcli.commands.local.lib.local_lambda.boto3")
+    def test_must_work_with_no_session(self, boto3_mock):
+        boto3_mock.session.Session.return_value = None
+
+        expected = {}
+        actual = self.local_lambda.get_aws_creds()
+        self.assertEquals(expected, actual)
+
+        boto3_mock.session.Session.assert_called_with(profile_name=self.aws_profile)
+
+
+class TestLocalLambda_get_code_path(TestCase):
+
+    def setUp(self):
+        self.runtime_mock = Mock()
+        self.function_provider_mock = Mock()
+        self.cwd = "/my/current/working/directory"
+        self.env_vars_values = {}
+        self.debug_port = 123
+        self.debug_args = "abc"
+        self.aws_profile = "myprofile"
+
+        self.relative_codeuri = "./my/path"
+        self.absolute_codeuri = "/home/foo/bar"  # Some absolute path to use
+        self.os_cwd = os.getcwd()
+
+        self.local_lambda = LocalLambdaRunner(self.runtime_mock,
+                                              self.function_provider_mock,
+                                              self.cwd,
+                                              self.env_vars_values,
+                                              self.debug_port,
+                                              self.debug_args,
+                                              self.aws_profile)
+
+    @parameterized.expand([
+        ("."),
+        ("")
+    ])
+    def test_must_resolve_present_cwd(self, cwd_path):
+
+        self.local_lambda.cwd = cwd_path
+        codeuri = self.relative_codeuri
+        expected = os.path.normpath(os.path.join(self.os_cwd, codeuri))
+
+        actual = self.local_lambda._get_code_path(codeuri)
+        self.assertEquals(expected, actual)
+        self.assertTrue(os.path.isabs(actual), "Result must be an absolute path")
+
+    @parameterized.expand([
+        ("var/task"),
+        ("some/dir")
+    ])
+    def test_must_resolve_relative_cwd(self, cwd_path):
+
+        self.local_lambda.cwd = cwd_path
+        codeuri = self.relative_codeuri
+
+        abs_cwd = os.path.abspath(cwd_path)
+        expected = os.path.normpath(os.path.join(abs_cwd, codeuri))
+
+        actual = self.local_lambda._get_code_path(codeuri)
+        self.assertEquals(expected, actual)
+        self.assertTrue(os.path.isabs(actual), "Result must be an absolute path")
+
+    @parameterized.expand([
+        (""),
+        ("."),
+        ("hello"),
+        ("a/b/c/d"),
+        ("../../c/d/e")
+    ])
+    def test_must_resolve_relative_codeuri(self, codeuri):
+
+        expected = os.path.normpath(os.path.join(self.cwd, codeuri))
+
+        actual = self.local_lambda._get_code_path(codeuri)
+        self.assertEquals(expected, actual)
+        self.assertTrue(os.path.isabs(actual), "Result must be an absolute path")
+
+    @parameterized.expand([
+        ("/a/b/c"),
+        ("/")
+    ])
+    def test_must_resolve_absolute_codeuri(self, codeuri):
+
+        expected = codeuri  # CodeUri must be return as is for absolute paths
+
+        actual = self.local_lambda._get_code_path(codeuri)
+        self.assertEquals(expected, actual)
+        self.assertTrue(os.path.isabs(actual), "Result must be an absolute path")
+
+
+class TestLocalLambda_make_env_vars(TestCase):
+
+    def setUp(self):
+        self.runtime_mock = Mock()
+        self.function_provider_mock = Mock()
+        self.cwd = "/my/current/working/directory"
+        self.debug_port = 123
+        self.debug_args = "abc"
+        self.aws_profile = "myprofile"
+        self.env_vars_values = {}
+
+        self.environ = {
+            "Variables": {
+                "var1": "value1",
+            }
+        }
+
+        self.local_lambda = LocalLambdaRunner(self.runtime_mock,
+                                              self.function_provider_mock,
+                                              self.cwd,
+                                              self.env_vars_values,
+                                              self.debug_port,
+                                              self.debug_args,
+                                              self.aws_profile)
+
+        self.aws_creds = {"key": "key"}
+        self.local_lambda.get_aws_creds = Mock()
+        self.local_lambda.get_aws_creds.return_value = self.aws_creds
+
+    @parameterized.expand([
+        # Override for the function exists
+        ({"function_name": {"a": "b"}}, {"a": "b"}),
+
+        # Override for the function does *not* exist
+        ({"otherfunction": {"c": "d"}}, None),
+
+        # Using a CloudFormation parameter file format
+        ({"Parameters": {"p1": "v1"}}, {"p1": "v1"}),
+    ])
+    @patch("samcli.commands.local.lib.local_lambda.EnvironmentVariables")
+    @patch("samcli.commands.local.lib.local_lambda.os")
+    def test_must_work_with_override_values(self, env_vars_values, expected_override_value, os_mock,
+                                            EnvironmentVariablesMock):
+        os_environ = {"some": "value"}
+        os_mock.environ = os_environ
+
+        function = Function(name="function_name",
+                            runtime="runtime",
+                            memory=1234,
+                            timeout=12,
+                            handler="handler",
+                            codeuri="codeuri",
+                            environment=self.environ,
+                            rolearn=None)
+
+        self.local_lambda.env_vars_values = env_vars_values
+
+        self.local_lambda._make_env_vars(function)
+
+        EnvironmentVariablesMock.assert_called_with(function.memory,
+                                                    function.timeout,
+                                                    function.handler,
+                                                    variables={"var1": "value1"},
+                                                    shell_env_values=os_environ,
+                                                    override_values=expected_override_value,
+                                                    aws_creds=self.aws_creds)
+
+    @parameterized.expand([
+        param({"a": "b"}),  # Does not have the "Variables" Key
+        param("somestring"),  # Must be a dict type
+        param(None)
+    ])
+    @patch("samcli.commands.local.lib.local_lambda.EnvironmentVariables")
+    @patch("samcli.commands.local.lib.local_lambda.os")
+    def test_must_work_with_invalid_environment_variable(self, environment_variable, os_mock, EnvironmentVariablesMock):
+        os_environ = {"some": "value"}
+        os_mock.environ = os_environ
+
+        function = Function(name="function_name",
+                            runtime="runtime",
+                            memory=1234,
+                            timeout=12,
+                            handler="handler",
+                            codeuri="codeuri",
+                            environment=environment_variable,
+                            rolearn=None)
+
+        self.local_lambda.env_vars_values = {}
+
+        self.local_lambda._make_env_vars(function)
+
+        EnvironmentVariablesMock.assert_called_with(function.memory,
+                                                    function.timeout,
+                                                    function.handler,
+                                                    variables=None,
+                                                    shell_env_values=os_environ,
+                                                    override_values=None,
+                                                    aws_creds=self.aws_creds)
+
+
+class TestLocalLambda_get_invoke_config(TestCase):
+
+    def setUp(self):
+        self.runtime_mock = Mock()
+        self.function_provider_mock = Mock()
+        self.cwd = "/my/current/working/directory"
+        self.debug_port = 123
+        self.debug_args = "abc"
+        self.aws_profile = "myprofile"
+        self.env_vars_values = {}
+
+        self.local_lambda = LocalLambdaRunner(self.runtime_mock,
+                                              self.function_provider_mock,
+                                              self.cwd,
+                                              self.env_vars_values,
+                                              self.debug_port,
+                                              self.debug_args,
+                                              self.aws_profile)
+
+    @patch('samcli.commands.local.lib.local_lambda.FunctionConfig')
+    def test_must_work(self, FunctionConfigMock):
+        env_vars = "envvars"
+        self.local_lambda._make_env_vars = Mock()
+        self.local_lambda._make_env_vars.return_value = env_vars
+
+        codepath = "codepath"
+        self.local_lambda._get_code_path = Mock()
+        self.local_lambda._get_code_path.return_value = codepath
+
+        function = Function(name="function_name",
+                            runtime="runtime",
+                            memory=1234,
+                            timeout=12,
+                            handler="handler",
+                            codeuri="codeuri",
+                            environment=None,
+                            rolearn=None)
+
+        config = "someconfig"
+        FunctionConfigMock.return_value = config
+        actual = self.local_lambda._get_invoke_config(function)
+        self.assertEquals(actual, config)
+
+        FunctionConfigMock.assert_called_with(name=function.name,
+                                              runtime=function.runtime,
+                                              handler=function.handler,
+                                              code_abs_path=codepath,
+                                              memory=function.memory,
+                                              timeout=function.timeout,
+                                              env_vars=env_vars)
+
+        self.local_lambda._get_code_path.assert_called_with(function.codeuri)
+        self.local_lambda._make_env_vars.assert_called_with(function)
+
+
+class TestLocalLambda_invoke(TestCase):
+
+    def setUp(self):
+        self.runtime_mock = Mock()
+        self.function_provider_mock = Mock()
+        self.cwd = "/my/current/working/directory"
+        self.debug_port = 123
+        self.debug_args = "abc"
+        self.aws_profile = "myprofile"
+        self.env_vars_values = {}
+
+        self.local_lambda = LocalLambdaRunner(self.runtime_mock,
+                                              self.function_provider_mock,
+                                              self.cwd,
+                                              self.env_vars_values,
+                                              self.debug_port,
+                                              self.debug_args,
+                                              self.aws_profile)
+
+    def test_must_work(self):
+        name = "name"
+        event = "event"
+        stdout = "stdout"
+        stderr = "stderr"
+        function = Mock()
+        invoke_config = "config"
+
+        self.function_provider_mock.get.return_value = function
+        self.local_lambda._get_invoke_config = Mock()
+        self.local_lambda._get_invoke_config.return_value = invoke_config
+
+        self.local_lambda.invoke(name, event, stdout, stderr)
+
+        self.runtime_mock.invoke.assert_called_with(invoke_config, event,
+                                                    debug_port=self.debug_port,
+                                                    debug_args=self.debug_args,
+                                                    stdout=stdout, stderr=stderr)
+
+    def test_must_raise_if_function_not_found(self):
+
+        self.function_provider_mock.get.return_value = None  # function not found
+        with self.assertRaises(FunctionNotFound):
+            self.local_lambda.invoke("name", "event")
+
+
+class TestLocalLambda_is_debugging(TestCase):
+
+    def setUp(self):
+        self.runtime_mock = Mock()
+        self.function_provider_mock = Mock()
+        self.cwd = "/my/current/working/directory"
+        self.debug_port = 123
+        self.debug_args = "abc"
+        self.aws_profile = "myprofile"
+        self.env_vars_values = {}
+
+        self.local_lambda = LocalLambdaRunner(self.runtime_mock,
+                                              self.function_provider_mock,
+                                              self.cwd,
+                                              self.env_vars_values,
+                                              self.debug_port,
+                                              self.debug_args,
+                                              self.aws_profile)
+
+    def test_must_be_on(self):
+        self.assertTrue(self.local_lambda.is_debugging())
+
+    def test_must_be_off(self):
+
+        self.local_lambda = LocalLambdaRunner(self.runtime_mock,
+                                              self.function_provider_mock,
+                                              self.cwd,
+                                              self.env_vars_values,
+                                              debug_port=None,  # No debug port
+                                              debug_args=self.debug_args,
+                                              aws_profile=self.aws_profile)
+
+        self.assertFalse(self.local_lambda.is_debugging())
diff --git a/tests/unit/commands/local/lib/test_sam_api_provider.py b/tests/unit/commands/local/lib/test_sam_api_provider.py
new file mode 100644
index 0000000000..aeed24c236
--- /dev/null
+++ b/tests/unit/commands/local/lib/test_sam_api_provider.py
@@ -0,0 +1,1005 @@
+import tempfile
+import json
+
+from unittest import TestCase
+from mock import patch
+from nose_parameterized import parameterized
+
+from samcli.commands.local.lib.sam_api_provider import SamApiProvider
+from samcli.commands.local.lib.provider import Api
+from samcli.commands.validate.lib.exceptions import InvalidSamDocumentException
+
+import logging
+logging.basicConfig(level=logging.INFO)
+
+
+class TestSamApiProvider_init(TestCase):
+
+    @patch.object(SamApiProvider, "_extract_apis")
+    @patch("samcli.commands.local.lib.sam_api_provider.SamBaseProvider")
+    def test_provider_with_valid_template(self, SamBaseProviderMock, extract_api_mock):
+        extract_api_mock.return_value = {"set", "of", "values"}
+
+        template = {"Resources": {"a": "b"}}
+        SamBaseProviderMock.get_template.return_value = template
+
+        provider = SamApiProvider(template)
+
+        self.assertEquals(len(provider.apis), 3)
+        self.assertEquals(provider.apis, set(["set", "of", "values"]))
+        self.assertEquals(provider.template_dict, {"Resources": {"a": "b"}})
+        self.assertEquals(provider.resources, {"a": "b"})
+
+
+class TestSamApiProviderWithImplicitApis(TestCase):
+
+    def test_provider_with_no_resource_properties(self):
+        template = {
+            "Resources": {
+
+                "SamFunc1": {
+                    "Type": "AWS::Lambda::Function"
+                }
+            }
+        }
+
+        provider = SamApiProvider(template)
+
+        self.assertEquals(len(provider.apis), 0)
+        self.assertEquals(provider.apis, [])
+
+    @parameterized.expand([("GET"), ("get")])
+    def test_provider_has_correct_api(self, method):
+        template = {
+            "Resources": {
+
+                "SamFunc1": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "CodeUri": "/usr/foo/bar",
+                        "Runtime": "nodejs4.3",
+                        "Handler": "index.handler",
+                        "Events": {
+                            "Event1": {
+                                "Type": "Api",
+                                "Properties": {
+                                    "Path": "/path",
+                                    "Method": method
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        provider = SamApiProvider(template)
+
+        self.assertEquals(len(provider.apis), 1)
+        self.assertEquals(list(provider.apis)[0], Api(path="/path", method="GET", function_name="SamFunc1", cors=None))
+
+    def test_provider_creates_api_for_all_events(self):
+        template = {
+            "Resources": {
+
+                "SamFunc1": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "CodeUri": "/usr/foo/bar",
+                        "Runtime": "nodejs4.3",
+                        "Handler": "index.handler",
+                        "Events": {
+                            "Event1": {
+                                "Type": "Api",
+                                "Properties": {
+                                    "Path": "/path",
+                                    "Method": "GET"
+                                }
+                            },
+                            "Event2": {
+                                "Type": "Api",
+                                "Properties": {
+                                    "Path": "/path",
+                                    "Method": "POST"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        provider = SamApiProvider(template)
+
+        api_event1 = Api(path="/path", method="GET", function_name="SamFunc1", cors=None)
+        api_event2 = Api(path="/path", method="POST", function_name="SamFunc1", cors=None)
+
+        self.assertIn(api_event1, provider.apis)
+        self.assertIn(api_event2, provider.apis)
+        self.assertEquals(len(provider.apis), 2)
+
+    def test_provider_has_correct_template(self):
+        template = {
+            "Resources": {
+
+                "SamFunc1": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "CodeUri": "/usr/foo/bar",
+                        "Runtime": "nodejs4.3",
+                        "Handler": "index.handler",
+                        "Events": {
+                            "Event1": {
+                                "Type": "Api",
+                                "Properties": {
+                                    "Path": "/path",
+                                    "Method": "GET"
+                                }
+                            }
+                        }
+                    }
+                },
+                "SamFunc2": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "CodeUri": "/usr/foo/bar",
+                        "Runtime": "nodejs4.3",
+                        "Handler": "index.handler",
+                        "Events": {
+                            "Event1": {
+                                "Type": "Api",
+                                "Properties": {
+                                    "Path": "/path",
+                                    "Method": "POST"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        provider = SamApiProvider(template)
+
+        api1 = Api(path="/path", method="GET", function_name="SamFunc1", cors=None)
+        api2 = Api(path="/path", method="POST", function_name="SamFunc2", cors=None)
+
+        self.assertIn(api1, provider.apis)
+        self.assertIn(api2, provider.apis)
+
+    def test_provider_with_no_api_events(self):
+        template = {
+            "Resources": {
+
+                "SamFunc1": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "CodeUri": "/usr/foo/bar",
+                        "Runtime": "nodejs4.3",
+                        "Handler": "index.handler",
+                        "Events": {
+                            "Event1": {
+                                "Type": "S3",
+                                "Properties": {
+                                    "Property1": "value"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        provider = SamApiProvider(template)
+
+        self.assertEquals(provider.apis, [])
+
+    def test_provider_with_no_serverless_function(self):
+        template = {
+            "Resources": {
+
+                "SamFunc1": {
+                    "Type": "AWS::Lambda::Function",
+                    "Properties": {
+                        "CodeUri": "/usr/foo/bar",
+                        "Runtime": "nodejs4.3",
+                        "Handler": "index.handler"
+                    }
+                }
+            }
+        }
+
+        provider = SamApiProvider(template)
+
+        self.assertEquals(provider.apis, [])
+
+    def test_provider_get_all(self):
+        template = {
+            "Resources": {
+
+                "SamFunc1": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "CodeUri": "/usr/foo/bar",
+                        "Runtime": "nodejs4.3",
+                        "Handler": "index.handler",
+                        "Events": {
+                            "Event1": {
+                                "Type": "Api",
+                                "Properties": {
+                                    "Path": "/path",
+                                    "Method": "GET"
+                                }
+                            }
+                        }
+                    }
+                },
+                "SamFunc2": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "CodeUri": "/usr/foo/bar",
+                        "Runtime": "nodejs4.3",
+                        "Handler": "index.handler",
+                        "Events": {
+                            "Event1": {
+                                "Type": "Api",
+                                "Properties": {
+                                    "Path": "/path",
+                                    "Method": "POST"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        provider = SamApiProvider(template)
+
+        result = [f for f in provider.get_all()]
+
+        api1 = Api(path="/path", method="GET", function_name="SamFunc1")
+        api2 = Api(path="/path", method="POST", function_name="SamFunc2")
+
+        self.assertIn(api1, result)
+        self.assertIn(api2, result)
+
+    def test_provider_get_all_with_no_apis(self):
+        template = {}
+
+        provider = SamApiProvider(template)
+
+        result = [f for f in provider.get_all()]
+
+        self.assertEquals(result, [])
+
+    @parameterized.expand([("ANY"), ("any")])
+    def test_provider_with_any_method(self, method):
+        template = {
+            "Resources": {
+
+                "SamFunc1": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "CodeUri": "/usr/foo/bar",
+                        "Runtime": "nodejs4.3",
+                        "Handler": "index.handler",
+                        "Events": {
+                            "Event1": {
+                                "Type": "Api",
+                                "Properties": {
+                                    "Path": "/path",
+                                    "Method": method
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        provider = SamApiProvider(template)
+
+        api_get = Api(path="/path", method="GET", function_name="SamFunc1", cors=None)
+        api_post = Api(path="/path", method="POST", function_name="SamFunc1", cors=None)
+        api_put = Api(path="/path", method="PUT", function_name="SamFunc1", cors=None)
+        api_delete = Api(path="/path", method="DELETE", function_name="SamFunc1", cors=None)
+        api_patch = Api(path="/path", method="PATCH", function_name="SamFunc1", cors=None)
+        api_head = Api(path="/path", method="HEAD", function_name="SamFunc1", cors=None)
+        api_options = Api(path="/path", method="OPTIONS", function_name="SamFunc1", cors=None)
+
+        self.assertEquals(len(provider.apis), 7)
+        self.assertIn(api_get, provider.apis)
+        self.assertIn(api_post, provider.apis)
+        self.assertIn(api_put, provider.apis)
+        self.assertIn(api_delete, provider.apis)
+        self.assertIn(api_patch, provider.apis)
+        self.assertIn(api_head, provider.apis)
+        self.assertIn(api_options, provider.apis)
+
+    def test_provider_must_support_binary_media_types(self):
+        template = {
+            "Globals": {
+                "Api": {
+                    "BinaryMediaTypes": [
+                        "image~1gif",
+                        "image~1png",
+                        "image~1png",  # Duplicates must be ignored
+                        {"Ref": "SomeParameter"}  # Refs are ignored as well
+                    ]
+                }
+            },
+            "Resources": {
+
+                "SamFunc1": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "CodeUri": "/usr/foo/bar",
+                        "Runtime": "nodejs4.3",
+                        "Handler": "index.handler",
+                        "Events": {
+                            "Event1": {
+                                "Type": "Api",
+                                "Properties": {
+                                    "Path": "/path",
+                                    "Method": "get"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        provider = SamApiProvider(template)
+
+        self.assertEquals(len(provider.apis), 1)
+        self.assertEquals(list(provider.apis)[0], Api(path="/path", method="GET", function_name="SamFunc1",
+                                                      binary_media_types=["image/gif", "image/png"], cors=None))
+
+    def test_provider_must_support_binary_media_types_with_any_method(self):
+        template = {
+            "Globals": {
+                "Api": {
+                    "BinaryMediaTypes": [
+                        "image~1gif",
+                        "image~1png",
+                        "text/html"
+                    ]
+                }
+            },
+            "Resources": {
+
+                "SamFunc1": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "CodeUri": "/usr/foo/bar",
+                        "Runtime": "nodejs4.3",
+                        "Handler": "index.handler",
+                        "Events": {
+                            "Event1": {
+                                "Type": "Api",
+                                "Properties": {
+                                    "Path": "/path",
+                                    "Method": "any"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        binary = ["image/gif", "image/png", "text/html"]
+
+        expected_apis = [
+            Api(path="/path", method="GET", function_name="SamFunc1", binary_media_types=binary),
+            Api(path="/path", method="POST", function_name="SamFunc1", binary_media_types=binary),
+            Api(path="/path", method="PUT", function_name="SamFunc1", binary_media_types=binary),
+            Api(path="/path", method="DELETE", function_name="SamFunc1", binary_media_types=binary),
+            Api(path="/path", method="HEAD", function_name="SamFunc1", binary_media_types=binary),
+            Api(path="/path", method="OPTIONS", function_name="SamFunc1", binary_media_types=binary),
+            Api(path="/path", method="PATCH", function_name="SamFunc1", binary_media_types=binary)
+        ]
+
+        provider = SamApiProvider(template)
+
+        self.assertItemsEqual(provider.apis, expected_apis)
+
+    def test_convert_event_api_with_invalid_event_properties(self):
+        properties = {
+            "Path": "/foo",
+            "Method": "get",
+            "RestApiId": {
+                # This is not supported. Only Ref is supported
+                "Fn::Sub": "foo"
+            }
+        }
+
+        with self.assertRaises(InvalidSamDocumentException):
+            SamApiProvider._convert_event_api("logicalId", properties)
+
+
+class TestSamApiProviderWithExplicitApis(TestCase):
+
+    def setUp(self):
+        self.binary_types = ["image/png", "image/jpg"]
+        self.input_apis = [
+            Api(path="/path1", method="GET", function_name="SamFunc1", cors=None),
+            Api(path="/path1", method="POST", function_name="SamFunc1", cors=None),
+
+            Api(path="/path2", method="PUT", function_name="SamFunc1", cors=None),
+            Api(path="/path2", method="GET", function_name="SamFunc1", cors=None),
+
+            Api(path="/path3", method="DELETE", function_name="SamFunc1", cors=None)
+        ]
+
+    def test_with_no_apis(self):
+        template = {
+            "Resources": {
+
+                "Api1": {
+                    "Type": "AWS::Serverless::Api",
+                    "Properties": {
+                        "StageName": "Prod"
+                    }
+                }
+            }
+        }
+
+        provider = SamApiProvider(template)
+
+        self.assertEquals(len(provider.apis), 0)
+        self.assertEquals(provider.apis, [])
+
+    def test_with_inline_swagger_apis(self):
+
+        template = {
+            "Resources": {
+
+                "Api1": {
+                    "Type": "AWS::Serverless::Api",
+                    "Properties": {
+                        "StageName": "Prod",
+                        "DefinitionBody": make_swagger(self.input_apis)
+                    }
+                }
+            }
+        }
+
+        provider = SamApiProvider(template)
+        self.assertItemsEqual(self.input_apis, provider.apis)
+
+    def test_with_swagger_as_local_file(self):
+
+        with tempfile.NamedTemporaryFile() as fp:
+            filename = fp.name
+
+            swagger = make_swagger(self.input_apis)
+            json.dump(swagger, fp)
+            fp.flush()
+
+            template = {
+                "Resources": {
+
+                    "Api1": {
+                        "Type": "AWS::Serverless::Api",
+                        "Properties": {
+                            "StageName": "Prod",
+                            "DefinitionUri": filename
+                        }
+                    }
+                }
+            }
+
+            provider = SamApiProvider(template)
+            self.assertItemsEqual(self.input_apis, provider.apis)
+
+    @patch("samcli.commands.local.lib.sam_api_provider.SamSwaggerReader")
+    def test_with_swagger_as_both_body_and_uri(self, SamSwaggerReaderMock):
+
+        body = {"some": "body"}
+        filename = "somefile.txt"
+
+        template = {
+            "Resources": {
+
+                "Api1": {
+                    "Type": "AWS::Serverless::Api",
+                    "Properties": {
+                        "StageName": "Prod",
+                        "DefinitionUri": filename,
+                        "DefinitionBody": body
+                    }
+                }
+            }
+        }
+
+        SamSwaggerReaderMock.return_value.read.return_value = make_swagger(self.input_apis)
+
+        cwd = "foo"
+        provider = SamApiProvider(template, cwd=cwd)
+        self.assertItemsEqual(self.input_apis, provider.apis)
+        SamSwaggerReaderMock.assert_called_with(definition_body=body, definition_uri=filename, working_dir=cwd)
+
+    def test_swagger_with_any_method(self):
+
+        apis = [
+            Api(path="/path", method="any", function_name="SamFunc1", cors=None)
+        ]
+
+        expected_apis = [
+            Api(path="/path", method="GET", function_name="SamFunc1", cors=None),
+            Api(path="/path", method="POST", function_name="SamFunc1", cors=None),
+            Api(path="/path", method="PUT", function_name="SamFunc1", cors=None),
+            Api(path="/path", method="DELETE", function_name="SamFunc1", cors=None),
+            Api(path="/path", method="HEAD", function_name="SamFunc1", cors=None),
+            Api(path="/path", method="OPTIONS", function_name="SamFunc1", cors=None),
+            Api(path="/path", method="PATCH", function_name="SamFunc1", cors=None)
+        ]
+
+        template = {
+            "Resources": {
+                "Api1": {
+                    "Type": "AWS::Serverless::Api",
+                    "Properties": {
+                        "StageName": "Prod",
+                        "DefinitionBody": make_swagger(apis)
+                    }
+                }
+            }
+        }
+
+        provider = SamApiProvider(template)
+        self.assertItemsEqual(expected_apis, provider.apis)
+
+    def test_with_binary_media_types(self):
+
+        template = {
+            "Resources": {
+
+                "Api1": {
+                    "Type": "AWS::Serverless::Api",
+                    "Properties": {
+                        "StageName": "Prod",
+                        "DefinitionBody": make_swagger(self.input_apis, binary_media_types=self.binary_types)
+                    }
+                }
+            }
+        }
+
+        expected_binary_types = sorted(self.binary_types)
+        expected_apis = [
+            Api(path="/path1", method="GET", function_name="SamFunc1", cors=None,
+                binary_media_types=expected_binary_types),
+            Api(path="/path1", method="POST", function_name="SamFunc1", cors=None,
+                binary_media_types=expected_binary_types),
+
+            Api(path="/path2", method="PUT", function_name="SamFunc1", cors=None,
+                binary_media_types=expected_binary_types),
+            Api(path="/path2", method="GET", function_name="SamFunc1", cors=None,
+                binary_media_types=expected_binary_types),
+
+            Api(path="/path3", method="DELETE", function_name="SamFunc1", cors=None,
+                binary_media_types=expected_binary_types)
+        ]
+
+        provider = SamApiProvider(template)
+        self.assertItemsEqual(expected_apis, provider.apis)
+
+    def test_with_binary_media_types_in_swagger_and_on_resource(self):
+
+        input_apis = [
+            Api(path="/path", method="OPTIONS", function_name="SamFunc1"),
+        ]
+        extra_binary_types = ["text/html"]
+
+        template = {
+            "Resources": {
+
+                "Api1": {
+                    "Type": "AWS::Serverless::Api",
+                    "Properties": {
+                        "BinaryMediaTypes": extra_binary_types,
+                        "StageName": "Prod",
+                        "DefinitionBody": make_swagger(input_apis, binary_media_types=self.binary_types)
+                    }
+                }
+            }
+        }
+
+        expected_binary_types = sorted(self.binary_types + extra_binary_types)
+        expected_apis = [
+            Api(path="/path", method="OPTIONS", function_name="SamFunc1", binary_media_types=expected_binary_types),
+        ]
+
+        provider = SamApiProvider(template)
+        self.assertItemsEqual(expected_apis, provider.apis)
+
+
+class TestSamApiProviderWithExplicitAndImplicitApis(TestCase):
+
+    def setUp(self):
+        self.explicit_apis = [
+            Api(path="/path1", method="GET", function_name="explicitfunction", cors=None),
+            Api(path="/path2", method="GET", function_name="explicitfunction", cors=None),
+            Api(path="/path3", method="GET", function_name="explicitfunction", cors=None)
+        ]
+
+        self.swagger = make_swagger(self.explicit_apis)
+
+        self.template = {
+            "Resources": {
+
+                "Api1": {
+                    "Type": "AWS::Serverless::Api",
+                    "Properties": {
+                        "StageName": "Prod",
+                    }
+                },
+
+                "ImplicitFunc": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "CodeUri": "/usr/foo/bar",
+                        "Runtime": "nodejs4.3",
+                        "Handler": "index.handler"
+                    }
+                }
+            }
+        }
+
+    def test_must_union_implicit_and_explicit(self):
+
+        events = {
+            "Event1": {
+                "Type": "Api",
+                "Properties": {
+                    "Path": "/path1",
+                    "Method": "POST"
+                }
+            },
+
+            "Event2": {
+                "Type": "Api",
+                "Properties": {
+                    "Path": "/path2",
+                    "Method": "POST"
+                }
+            },
+
+            "Event3": {
+                "Type": "Api",
+                "Properties": {
+                    "Path": "/path3",
+                    "Method": "POST"
+                }
+            }
+        }
+
+        self.template["Resources"]["Api1"]["Properties"]["DefinitionBody"] = self.swagger
+        self.template["Resources"]["ImplicitFunc"]["Properties"]["Events"] = events
+
+        expected_apis = [
+            # From Explicit APIs
+            Api(path="/path1", method="GET", function_name="explicitfunction", cors=None),
+            Api(path="/path2", method="GET", function_name="explicitfunction", cors=None),
+            Api(path="/path3", method="GET", function_name="explicitfunction", cors=None),
+            # From Implicit APIs
+            Api(path="/path1", method="POST", function_name="ImplicitFunc", cors=None),
+            Api(path="/path2", method="POST", function_name="ImplicitFunc", cors=None),
+            Api(path="/path3", method="POST", function_name="ImplicitFunc", cors=None)
+        ]
+
+        provider = SamApiProvider(self.template)
+        self.assertItemsEqual(expected_apis, provider.apis)
+
+    def test_must_prefer_implicit_api_over_explicit(self):
+
+        implicit_apis = {
+            "Event1": {
+                "Type": "Api",
+                "Properties": {
+                    # This API is duplicated between implicit & explicit
+                    "Path": "/path1",
+                    "Method": "get"
+                }
+            },
+
+            "Event2": {
+                "Type": "Api",
+                "Properties": {
+                    "Path": "/path2",
+                    "Method": "POST"
+                }
+            }
+        }
+
+        self.template["Resources"]["Api1"]["Properties"]["DefinitionBody"] = self.swagger
+        self.template["Resources"]["ImplicitFunc"]["Properties"]["Events"] = implicit_apis
+
+        expected_apis = [
+            Api(path="/path1", method="GET", function_name="ImplicitFunc", cors=None),  # Comes from Implicit
+
+            Api(path="/path2", method="GET", function_name="explicitfunction", cors=None),
+            Api(path="/path2", method="POST", function_name="ImplicitFunc", cors=None),  # Comes from implicit
+
+            Api(path="/path3", method="GET", function_name="explicitfunction", cors=None),
+        ]
+
+        provider = SamApiProvider(self.template)
+        self.assertItemsEqual(expected_apis, provider.apis)
+
+    def test_must_prefer_implicit_with_any_method(self):
+
+        implicit_apis = {
+            "Event1": {
+                "Type": "Api",
+                "Properties": {
+                    # This API is duplicated between implicit & explicit
+                    "Path": "/path",
+                    "Method": "ANY"
+                }
+            }
+        }
+
+        explicit_apis = [
+            # Explicit should be over masked completely by implicit, because of "ANY"
+            Api(path="/path", method="GET", function_name="explicitfunction", cors=None),
+            Api(path="/path", method="DELETE", function_name="explicitfunction", cors=None),
+        ]
+
+        self.template["Resources"]["Api1"]["Properties"]["DefinitionBody"] = make_swagger(explicit_apis)
+        self.template["Resources"]["ImplicitFunc"]["Properties"]["Events"] = implicit_apis
+
+        expected_apis = [
+            Api(path="/path", method="GET", function_name="ImplicitFunc", cors=None),
+            Api(path="/path", method="POST", function_name="ImplicitFunc", cors=None),
+            Api(path="/path", method="PUT", function_name="ImplicitFunc", cors=None),
+            Api(path="/path", method="DELETE", function_name="ImplicitFunc", cors=None),
+            Api(path="/path", method="HEAD", function_name="ImplicitFunc", cors=None),
+            Api(path="/path", method="OPTIONS", function_name="ImplicitFunc", cors=None),
+            Api(path="/path", method="PATCH", function_name="ImplicitFunc", cors=None)
+        ]
+
+        provider = SamApiProvider(self.template)
+        self.assertItemsEqual(expected_apis, provider.apis)
+
+    def test_with_any_method_on_both(self):
+
+        implicit_apis = {
+            "Event1": {
+                "Type": "Api",
+                "Properties": {
+                    # This API is duplicated between implicit & explicit
+                    "Path": "/path",
+                    "Method": "ANY"
+                }
+            },
+            "Event2": {
+                "Type": "Api",
+                "Properties": {
+                    # This API is duplicated between implicit & explicit
+                    "Path": "/path2",
+                    "Method": "GET"
+                }
+            }
+        }
+
+        explicit_apis = [
+            # Explicit should be over masked completely by implicit, because of "ANY"
+            Api(path="/path", method="ANY", function_name="explicitfunction", cors=None),
+            Api(path="/path2", method="POST", function_name="explicitfunction", cors=None),
+        ]
+
+        self.template["Resources"]["Api1"]["Properties"]["DefinitionBody"] = make_swagger(explicit_apis)
+        self.template["Resources"]["ImplicitFunc"]["Properties"]["Events"] = implicit_apis
+
+        expected_apis = [
+            Api(path="/path", method="GET", function_name="ImplicitFunc", cors=None),
+            Api(path="/path", method="POST", function_name="ImplicitFunc", cors=None),
+            Api(path="/path", method="PUT", function_name="ImplicitFunc", cors=None),
+            Api(path="/path", method="DELETE", function_name="ImplicitFunc", cors=None),
+            Api(path="/path", method="HEAD", function_name="ImplicitFunc", cors=None),
+            Api(path="/path", method="OPTIONS", function_name="ImplicitFunc", cors=None),
+            Api(path="/path", method="PATCH", function_name="ImplicitFunc", cors=None),
+
+            Api(path="/path2", method="GET", function_name="ImplicitFunc", cors=None),
+            Api(path="/path2", method="POST", function_name="explicitfunction", cors=None)
+        ]
+
+        provider = SamApiProvider(self.template)
+        self.assertItemsEqual(expected_apis, provider.apis)
+
+    def test_must_add_explicit_api_when_ref_with_rest_api_id(self):
+
+        events = {
+            "Event1": {
+                "Type": "Api",
+                "Properties": {
+                    "Path": "/newpath1",
+                    "Method": "POST",
+                    "RestApiId": "Api1"  # This path must get added to this API
+                }
+            },
+
+            "Event2": {
+                "Type": "Api",
+                "Properties": {
+                    "Path": "/newpath2",
+                    "Method": "POST",
+                    "RestApiId": {"Ref": "Api1"}  # This path must get added to this API
+                }
+            }
+        }
+
+        self.template["Resources"]["Api1"]["Properties"]["DefinitionBody"] = self.swagger
+        self.template["Resources"]["ImplicitFunc"]["Properties"]["Events"] = events
+
+        expected_apis = [
+            # From Explicit APIs
+            Api(path="/path1", method="GET", function_name="explicitfunction", cors=None),
+            Api(path="/path2", method="GET", function_name="explicitfunction", cors=None),
+            Api(path="/path3", method="GET", function_name="explicitfunction", cors=None),
+            # From Implicit APIs
+            Api(path="/newpath1", method="POST", function_name="ImplicitFunc", cors=None),
+            Api(path="/newpath2", method="POST", function_name="ImplicitFunc", cors=None)
+        ]
+
+        provider = SamApiProvider(self.template)
+        self.assertItemsEqual(expected_apis, provider.apis)
+
+    def test_both_apis_must_get_binary_media_types(self):
+
+        events = {
+            "Event1": {
+                "Type": "Api",
+                "Properties": {
+                    "Path": "/newpath1",
+                    "Method": "POST"
+                }
+            },
+
+            "Event2": {
+                "Type": "Api",
+                "Properties": {
+                    "Path": "/newpath2",
+                    "Method": "POST"
+                }
+            }
+        }
+
+        # Binary type for implicit
+        self.template["Globals"] = {
+            "Api": {
+                "BinaryMediaTypes": ["image~1gif", "image~1png"]
+            }
+        }
+        self.template["Resources"]["ImplicitFunc"]["Properties"]["Events"] = events
+
+        self.template["Resources"]["Api1"]["Properties"]["DefinitionBody"] = self.swagger
+        # Binary type for explicit
+        self.template["Resources"]["Api1"]["Properties"]["BinaryMediaTypes"] = ["explicit/type1", "explicit/type2"]
+
+        # Because of Globals, binary types will be concatenated on the explicit API
+        expected_explicit_binary_types = ["explicit/type1", "explicit/type2", "image/gif", "image/png"]
+        expected_implicit_binary_types = ["image/gif", "image/png"]
+
+        expected_apis = [
+            # From Explicit APIs
+            Api(path="/path1", method="GET", function_name="explicitfunction",
+                binary_media_types=expected_explicit_binary_types),
+            Api(path="/path2", method="GET", function_name="explicitfunction",
+                binary_media_types=expected_explicit_binary_types),
+            Api(path="/path3", method="GET", function_name="explicitfunction",
+                binary_media_types=expected_explicit_binary_types),
+            # From Implicit APIs
+            Api(path="/newpath1", method="POST", function_name="ImplicitFunc",
+                binary_media_types=expected_implicit_binary_types),
+            Api(path="/newpath2", method="POST", function_name="ImplicitFunc",
+                binary_media_types=expected_implicit_binary_types)
+        ]
+
+        provider = SamApiProvider(self.template)
+        self.assertItemsEqual(expected_apis, provider.apis)
+
+    def test_binary_media_types_with_rest_api_id_reference(self):
+
+        events = {
+            "Event1": {
+                "Type": "Api",
+                "Properties": {
+                    "Path": "/connected-to-explicit-path",
+                    "Method": "POST",
+                    "RestApiId": "Api1"
+                }
+            },
+
+            "Event2": {
+                "Type": "Api",
+                "Properties": {
+                    "Path": "/true-implicit-path",
+                    "Method": "POST"
+                }
+            }
+        }
+
+        # Binary type for implicit
+        self.template["Globals"] = {
+            "Api": {
+                "BinaryMediaTypes": ["image~1gif", "image~1png"]
+            }
+        }
+        self.template["Resources"]["ImplicitFunc"]["Properties"]["Events"] = events
+
+        self.template["Resources"]["Api1"]["Properties"]["DefinitionBody"] = self.swagger
+        # Binary type for explicit
+        self.template["Resources"]["Api1"]["Properties"]["BinaryMediaTypes"] = ["explicit/type1", "explicit/type2"]
+
+        # Because of Globals, binary types will be concatenated on the explicit API
+        expected_explicit_binary_types = ["explicit/type1", "explicit/type2", "image/gif", "image/png"]
+        expected_implicit_binary_types = ["image/gif", "image/png"]
+
+        expected_apis = [
+            # From Explicit APIs
+            Api(path="/path1", method="GET", function_name="explicitfunction",
+                binary_media_types=expected_explicit_binary_types),
+            Api(path="/path2", method="GET", function_name="explicitfunction",
+                binary_media_types=expected_explicit_binary_types),
+            Api(path="/path3", method="GET", function_name="explicitfunction",
+                binary_media_types=expected_explicit_binary_types),
+
+            # Because of the RestApiId, Implicit APIs will also get the binary media types inherited from
+            # the corresponding Explicit API
+            Api(path="/connected-to-explicit-path", method="POST", function_name="ImplicitFunc",
+                binary_media_types=expected_explicit_binary_types),
+
+            # This is still just a true implicit API because it does not have RestApiId property
+            Api(path="/true-implicit-path", method="POST", function_name="ImplicitFunc",
+                binary_media_types=expected_implicit_binary_types)
+        ]
+
+        provider = SamApiProvider(self.template)
+        self.assertItemsEqual(expected_apis, provider.apis)
+
+
+def make_swagger(apis, binary_media_types=None):
+    """
+    Given a list of API configurations named tuples, returns a Swagger document
+
+    Parameters
+    ----------
+    apis : list of samcli.commands.local.lib.provider.Api
+    binary_media_types : list of str
+
+    Returns
+    -------
+    dict
+        Swagger document
+
+    """
+    swagger = {
+        "paths": {
+        }
+    }
+
+    for api in apis:
+        swagger["paths"].setdefault(api.path, {})
+
+        integration = {
+            "x-amazon-apigateway-integration": {
+                "type": "aws_proxy",
+                "uri": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:123456789012:function:{}/invocations".format(api.function_name)  # NOQA
+            }
+        }
+
+        method = api.method
+        if method.lower() == "any":
+            method = "x-amazon-apigateway-any-method"
+
+        swagger["paths"][api.path][method] = integration
+
+    if binary_media_types:
+        swagger["x-amazon-apigateway-binary-media-types"] = binary_media_types
+
+    return swagger
diff --git a/tests/unit/commands/local/lib/test_sam_function_provider.py b/tests/unit/commands/local/lib/test_sam_function_provider.py
new file mode 100644
index 0000000000..ec50a18de8
--- /dev/null
+++ b/tests/unit/commands/local/lib/test_sam_function_provider.py
@@ -0,0 +1,403 @@
+from unittest import TestCase
+from mock import patch
+from parameterized import parameterized
+
+from samcli.commands.local.lib.provider import Function
+from samcli.commands.local.lib.sam_function_provider import SamFunctionProvider
+
+
+class TestSamFunctionProviderEndToEnd(TestCase):
+    """
+    Test all public methods with an input template
+    """
+
+    TEMPLATE = {
+        "Resources": {
+
+            "SamFunc1": {
+                "Type": "AWS::Serverless::Function",
+                "Properties": {
+                    "CodeUri": "/usr/foo/bar",
+                    "Runtime": "nodejs4.3",
+                    "Handler": "index.handler"
+                }
+            },
+            "SamFunc2": {
+                "Type": "AWS::Serverless::Function",
+                "Properties": {
+                    # CodeUri is unsupported S3 location
+                    "CodeUri": "s3://bucket/key",
+                    "Runtime": "nodejs4.3",
+                    "Handler": "index.handler"
+                }
+            },
+            "SamFunc3": {
+                "Type": "AWS::Serverless::Function",
+                "Properties": {
+                    # CodeUri is unsupported S3 location
+                    "CodeUri": {
+                        "Bucket": "bucket",
+                        "Key": "key"
+                    },
+                    "Runtime": "nodejs4.3",
+                    "Handler": "index.handler"
+                }
+            },
+            "LambdaFunc1": {
+                "Type": "AWS::Lambda::Function",
+                "Properties": {
+                    "Code": {
+                        "S3Bucket": "bucket",
+                        "S3Key": "key"
+                    },
+                    "Runtime": "nodejs4.3",
+                    "Handler": "index.handler"
+                }
+            },
+            "OtherResource": {
+                "Type": "AWS::Serverless::Api",
+                "Properties": {
+                    "StageName": "prod",
+                    "DefinitionUri": "s3://bucket/key"
+                }
+            }
+        }
+    }
+
+    EXPECTED_FUNCTIONS = ["SamFunc1", "SamFunc2", "SamFunc3", "LambdaFunc1"]
+
+    def setUp(self):
+        self.provider = SamFunctionProvider(self.TEMPLATE)
+
+    @parameterized.expand([
+        ("SamFunc1", Function(
+            name="SamFunc1",
+            runtime="nodejs4.3",
+            handler="index.handler",
+            codeuri="/usr/foo/bar",
+            memory=None,
+            timeout=None,
+            environment=None,
+            rolearn=None
+        )),
+        ("SamFunc2", Function(
+            name="SamFunc2",
+            runtime="nodejs4.3",
+            handler="index.handler",
+            codeuri=".",
+            memory=None,
+            timeout=None,
+            environment=None,
+            rolearn=None
+        )),
+        ("SamFunc3", Function(
+            name="SamFunc3",
+            runtime="nodejs4.3",
+            handler="index.handler",
+            codeuri=".",
+            memory=None,
+            timeout=None,
+            environment=None,
+            rolearn=None
+        )),
+        ("LambdaFunc1", Function(
+            name="LambdaFunc1",
+            runtime="nodejs4.3",
+            handler="index.handler",
+            codeuri=".",
+            memory=None,
+            timeout=None,
+            environment=None,
+            rolearn=None
+        ))
+    ])
+    def test_get_must_return_each_function(self, name, expected_output):
+
+        actual = self.provider.get(name)
+        self.assertEquals(actual, expected_output)
+
+    def test_get_all_must_return_all_functions(self):
+
+        result = {f.name for f in self.provider.get_all()}
+        expected = {"SamFunc1", "SamFunc2", "SamFunc3", "LambdaFunc1"}
+
+        self.assertEquals(result, expected)
+
+
+class TestSamFunctionProvider_init(TestCase):
+
+    @patch.object(SamFunctionProvider, "_extract_functions")
+    @patch("samcli.commands.local.lib.sam_function_provider.SamBaseProvider")
+    def test_must_extract_functions(self, SamBaseProviderMock, extract_mock):
+        extract_result = {"foo": "bar"}
+        extract_mock.return_value = extract_result
+
+        template = {"Resources": {"a": "b"}}
+        SamBaseProviderMock.get_template.return_value = template
+        provider = SamFunctionProvider(template)
+
+        extract_mock.assert_called_with({"a": "b"})
+        SamBaseProviderMock.get_template.assert_called_with(template)
+        self.assertEquals(provider.functions, extract_result)
+
+    @patch.object(SamFunctionProvider, "_extract_functions")
+    @patch("samcli.commands.local.lib.sam_function_provider.SamBaseProvider")
+    def test_must_default_to_empty_resources(self, SamBaseProviderMock, extract_mock):
+        extract_result = {"foo": "bar"}
+        extract_mock.return_value = extract_result
+
+        template = {"a": "b"}  # Template does *not* have 'Resources' key
+        SamBaseProviderMock.get_template.return_value = template
+        provider = SamFunctionProvider(template)
+
+        extract_mock.assert_called_with({})  # Empty Resources value must be passed
+        self.assertEquals(provider.functions, extract_result)
+        self.assertEquals(provider.resources, {})
+
+
+class TestSamFunctionProvider_extract_functions(TestCase):
+
+    @patch.object(SamFunctionProvider, "_convert_sam_function_resource")
+    def test_must_work_for_sam_function(self, convert_mock):
+        convertion_result = "some result"
+        convert_mock.return_value = convertion_result
+
+        resources = {
+            "Func1": {
+                "Type": "AWS::Serverless::Function",
+                "Properties": {"a": "b"}
+            }
+        }
+
+        expected = {
+            "Func1": "some result"
+        }
+
+        result = SamFunctionProvider._extract_functions(resources)
+        self.assertEquals(expected, result)
+        convert_mock.assert_called_with('Func1', {"a": "b"})
+
+    @patch.object(SamFunctionProvider, "_convert_sam_function_resource")
+    def test_must_work_with_no_properties(self, convert_mock):
+        convertion_result = "some result"
+        convert_mock.return_value = convertion_result
+
+        resources = {
+            "Func1": {
+                "Type": "AWS::Serverless::Function"
+                # No Properties
+            }
+        }
+
+        expected = {
+            "Func1": "some result"
+        }
+
+        result = SamFunctionProvider._extract_functions(resources)
+        self.assertEquals(expected, result)
+        convert_mock.assert_called_with('Func1', {})
+
+    @patch.object(SamFunctionProvider, "_convert_lambda_function_resource")
+    def test_must_work_for_lambda_function(self, convert_mock):
+        convertion_result = "some result"
+        convert_mock.return_value = convertion_result
+
+        resources = {
+            "Func1": {
+                "Type": "AWS::Lambda::Function",
+                "Properties": {"a": "b"}
+            }
+        }
+
+        expected = {
+            "Func1": "some result"
+        }
+
+        result = SamFunctionProvider._extract_functions(resources)
+        self.assertEquals(expected, result)
+        convert_mock.assert_called_with('Func1', {"a": "b"})
+
+    def test_must_skip_unknown_resource(self):
+        resources = {
+            "Func1": {
+                "Type": "AWS::SomeOther::Function",
+                "Properties": {"a": "b"}
+            }
+        }
+
+        expected = {}
+
+        result = SamFunctionProvider._extract_functions(resources)
+        self.assertEquals(expected, result)
+
+
+class TestSamFunctionProvider_convert_sam_function_resource(TestCase):
+
+    def test_must_convert(self):
+
+        name = "myname"
+        properties = {
+            "CodeUri": "/usr/local",
+            "Runtime": "myruntime",
+            "MemorySize": "mymemorysize",
+            "Timeout": "mytimeout",
+            "Handler": "myhandler",
+            "Environment": "myenvironment",
+            "Role": "myrole"
+        }
+
+        expected = Function(
+            name="myname",
+            runtime="myruntime",
+            memory="mymemorysize",
+            timeout="mytimeout",
+            handler="myhandler",
+            codeuri="/usr/local",
+            environment="myenvironment",
+            rolearn="myrole"
+        )
+
+        result = SamFunctionProvider._convert_sam_function_resource(name, properties)
+
+        self.assertEquals(expected, result)
+
+    def test_must_skip_non_existent_properties(self):
+
+        name = "myname"
+        properties = {
+            "CodeUri": "/usr/local"
+        }
+
+        expected = Function(
+            name="myname",
+            runtime=None,
+            memory=None,
+            timeout=None,
+            handler=None,
+            codeuri="/usr/local",
+            environment=None,
+            rolearn=None
+        )
+
+        result = SamFunctionProvider._convert_sam_function_resource(name, properties)
+
+        self.assertEquals(expected, result)
+
+    def test_must_default_missing_code_uri(self):
+
+        name = "myname"
+        properties = {
+            "Runtime": "myruntime"
+        }
+
+        result = SamFunctionProvider._convert_sam_function_resource(name, properties)
+        self.assertEquals(result.codeuri, ".")  # Default value
+
+    def test_must_handle_code_dict(self):
+
+        name = "myname"
+        properties = {
+            "CodeUri": {
+                # CodeUri is some dictionary
+                "a": "b"
+            }
+        }
+
+        result = SamFunctionProvider._convert_sam_function_resource(name, properties)
+        self.assertEquals(result.codeuri, ".")  # Default value
+
+    def test_must_handle_code_s3_uri(self):
+
+        name = "myname"
+        properties = {
+            "CodeUri": "s3://bucket/key"
+        }
+
+        result = SamFunctionProvider._convert_sam_function_resource(name, properties)
+        self.assertEquals(result.codeuri, ".")  # Default value
+
+
+class TestSamFunctionProvider_convert_lambda_function_resource(TestCase):
+
+    def test_must_convert(self):
+
+        name = "myname"
+        properties = {
+            "Code": {
+                "Bucket": "bucket"
+            },
+            "Runtime": "myruntime",
+            "MemorySize": "mymemorysize",
+            "Timeout": "mytimeout",
+            "Handler": "myhandler",
+            "Environment": "myenvironment",
+            "Role": "myrole"
+        }
+
+        expected = Function(
+            name="myname",
+            runtime="myruntime",
+            memory="mymemorysize",
+            timeout="mytimeout",
+            handler="myhandler",
+            codeuri=".",
+            environment="myenvironment",
+            rolearn="myrole"
+        )
+
+        result = SamFunctionProvider._convert_lambda_function_resource(name, properties)
+
+        self.assertEquals(expected, result)
+
+    def test_must_skip_non_existent_properties(self):
+
+        name = "myname"
+        properties = {
+            "Code": {
+                "Bucket": "bucket"
+            }
+        }
+
+        expected = Function(
+            name="myname",
+            runtime=None,
+            memory=None,
+            timeout=None,
+            handler=None,
+            codeuri=".",
+            environment=None,
+            rolearn=None
+        )
+
+        result = SamFunctionProvider._convert_lambda_function_resource(name, properties)
+
+        self.assertEquals(expected, result)
+
+
+class TestSamFunctionProvider_get(TestCase):
+
+    def test_raise_on_invalid_name(self):
+        provider = SamFunctionProvider({})
+
+        with self.assertRaises(ValueError):
+            provider.get(None)
+
+    def test_must_return_function_value(self):
+        provider = SamFunctionProvider({})
+        provider.functions = {"func1": "value"}  # Cheat a bit here by setting the value of this property directly
+
+        self.assertEquals("value", provider.get("func1"))
+
+    def test_return_none_if_function_not_found(self):
+        provider = SamFunctionProvider({})
+
+        self.assertIsNone(provider.get("somefunc"), "Must return None when Function is not found")
+
+
+class TestSamFunctionProvider_get_all(TestCase):
+
+    def test_must_work_with_no_functions(self):
+        provider = SamFunctionProvider({})
+
+        result = [f for f in provider.get_all()]
+        self.assertEquals(result, [])
diff --git a/tests/unit/commands/local/start_api/test_cli.py b/tests/unit/commands/local/start_api/test_cli.py
new file mode 100644
index 0000000000..1e5d083519
--- /dev/null
+++ b/tests/unit/commands/local/start_api/test_cli.py
@@ -0,0 +1,107 @@
+"""
+Unit test for `start-api` CLI
+"""
+
+from unittest import TestCase
+from mock import patch, Mock
+
+from samcli.commands.local.start_api.cli import do_cli as start_api_cli
+from samcli.commands.local.lib.exceptions import NoApisDefined
+from samcli.commands.local.cli_common.user_exceptions import UserException
+from samcli.commands.validate.lib.exceptions import InvalidSamDocumentException
+
+
+class TestCli(TestCase):
+
+    def setUp(self):
+        self.template = "template"
+        self.env_vars = "env-vars"
+        self.debug_port = 123
+        self.debug_args = "args"
+        self.docker_volume_basedir = "basedir"
+        self.docker_network = "network"
+        self.log_file = "logfile"
+        self.skip_pull_image = True
+        self.profile = "profile"
+
+        self.host = "host"
+        self.port = 123
+        self.static_dir = "staticdir"
+
+    @patch("samcli.commands.local.start_api.cli.InvokeContext")
+    @patch("samcli.commands.local.start_api.cli.LocalApiService")
+    def test_cli_must_setup_context_and_start_service(self, LocalApiServiceMock, InvokeContextMock):
+
+        # Mock the __enter__ method to return a object inside a context manager
+        context_mock = Mock()
+        InvokeContextMock.return_value.__enter__.return_value = context_mock
+
+        service_mock = Mock()
+        LocalApiServiceMock.return_value = service_mock
+
+        self.call_cli()
+
+        InvokeContextMock.assert_called_with(template_file=self.template,
+                                             function_identifier=None,
+                                             env_vars_file=self.env_vars,
+                                             debug_port=self.debug_port,
+                                             debug_args=self.debug_args,
+                                             docker_volume_basedir=self.docker_volume_basedir,
+                                             docker_network=self.docker_network,
+                                             log_file=self.log_file,
+                                             skip_pull_image=self.skip_pull_image,
+                                             aws_profile=self.profile)
+
+        LocalApiServiceMock.assert_called_with(lambda_invoke_context=context_mock,
+                                               port=self.port,
+                                               host=self.host,
+                                               static_dir=self.static_dir)
+
+        service_mock.start.assert_called_with()
+
+    @patch("samcli.commands.local.start_api.cli.InvokeContext")
+    @patch("samcli.commands.local.start_api.cli.LocalApiService")
+    def test_must_raise_if_no_api_defined(self, LocalApiServiceMock, InvokeContextMock):
+
+        # Mock the __enter__ method to return a object inside a context manager
+        context_mock = Mock()
+        InvokeContextMock.return_value.__enter__.return_value = context_mock
+
+        service_mock = Mock()
+        LocalApiServiceMock.return_value = service_mock
+        service_mock.start.side_effect = NoApisDefined("no apis")
+
+        with self.assertRaises(UserException) as context:
+            self.call_cli()
+
+        msg = str(context.exception)
+        expected = "Template does not have any APIs connected to Lambda functions"
+        self.assertEquals(msg, expected)
+
+    @patch("samcli.commands.local.start_api.cli.InvokeContext")
+    @patch("samcli.commands.local.start_api.cli.LocalApiService")
+    def test_must_raise_user_exception_on_invalid_sam_template(self, LocalApiServiceMock, InvokeContextMock):
+
+        InvokeContextMock.side_effect = InvalidSamDocumentException("bad template")
+
+        with self.assertRaises(UserException) as context:
+            self.call_cli()
+
+        msg = str(context.exception)
+        expected = "bad template"
+        self.assertEquals(msg, expected)
+
+    def call_cli(self):
+        start_api_cli(ctx=None,
+                      host=self.host,
+                      port=self.port,
+                      static_dir=self.static_dir,
+                      template=self.template,
+                      env_vars=self.env_vars,
+                      debug_port=self.debug_port,
+                      debug_args=self.debug_args,
+                      docker_volume_basedir=self.docker_volume_basedir,
+                      docker_network=self.docker_network,
+                      log_file=self.log_file,
+                      skip_pull_image=self.skip_pull_image,
+                      profile=self.profile)
diff --git a/tests/unit/commands/test_deploy.py b/tests/unit/commands/test_deploy.py
new file mode 100644
index 0000000000..4b3c787984
--- /dev/null
+++ b/tests/unit/commands/test_deploy.py
@@ -0,0 +1,20 @@
+"""
+Tests Deploy CLI command
+"""
+
+from unittest import TestCase
+from mock import patch
+
+from samcli.commands.deploy import do_cli as deploy_cli
+
+
+class TestCli(TestCase):
+
+    def setUp(self):
+        self.args = ("--template-file", "file.yaml", "--stack-name", "stackName")
+
+    @patch("samcli.commands.deploy.execute_command")
+    def test_deploy_must_pass_args(self, execute_command_mock):
+        execute_command_mock.return_value = True
+        deploy_cli(self.args)
+        execute_command_mock.assert_called_with("deploy", self.args)
diff --git a/tests/unit/commands/test_package.py b/tests/unit/commands/test_package.py
new file mode 100644
index 0000000000..51e6e1809e
--- /dev/null
+++ b/tests/unit/commands/test_package.py
@@ -0,0 +1,20 @@
+"""
+Tests Package CLI command
+"""
+
+from unittest import TestCase
+from mock import patch
+
+from samcli.commands.package import do_cli as package_cli
+
+
+class TestCli(TestCase):
+
+    def setUp(self):
+        self.args = ("--template-file", "file.yaml", "--s3-bucket", "bucketName")
+
+    @patch("samcli.commands.package.execute_command")
+    def test_package_must_pass_args(self, execute_command_mock):
+        execute_command_mock.return_value = True
+        package_cli(self.args)
+        execute_command_mock.assert_called_with("package", self.args)
diff --git a/tests/unit/commands/validate/__init__.py b/tests/unit/commands/validate/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/validate/lib/__init__.py b/tests/unit/commands/validate/lib/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/commands/validate/lib/test_sam_template_validator.py b/tests/unit/commands/validate/lib/test_sam_template_validator.py
new file mode 100644
index 0000000000..3d33822144
--- /dev/null
+++ b/tests/unit/commands/validate/lib/test_sam_template_validator.py
@@ -0,0 +1,189 @@
+from unittest import TestCase
+from mock import Mock, patch
+
+from samtranslator.public.exceptions import InvalidDocumentException
+
+from samcli.commands.validate.lib.exceptions import InvalidSamDocumentException
+from samcli.commands.validate.lib.sam_template_validator import SamTemplateValidator
+
+
+class TestSamTemplateValidator(TestCase):
+
+    @patch('samcli.commands.validate.lib.sam_template_validator.Translator')
+    @patch('samcli.commands.validate.lib.sam_template_validator.Parser')
+    def test_is_valid_returns_true(self, sam_parser, sam_translator):
+        managed_policy_mock = Mock()
+        managed_policy_mock.load.return_value = {"policy": "SomePolicy"}
+        template = {"a": "b"}
+
+        parser = Mock()
+        sam_parser.return_value = parser
+
+        translate_mock = Mock()
+        translate_mock.translate.return_value = {"c": "d"}
+        sam_translator.return_value = translate_mock
+
+        validator = SamTemplateValidator(template, managed_policy_mock)
+
+        # Should not throw an Exception
+        validator.is_valid()
+
+        sam_translator.assert_called_once_with(managed_policy_map={"policy": "SomePolicy"},
+                                               sam_parser=parser,
+                                               plugins=[])
+        translate_mock.translate.assert_called_once_with(sam_template=template, parameter_values={})
+        sam_parser.assert_called_once()
+
+    @patch('samcli.commands.validate.lib.sam_template_validator.Translator')
+    @patch('samcli.commands.validate.lib.sam_template_validator.Parser')
+    def test_is_valid_raises_exception(self, sam_parser, sam_translator):
+        managed_policy_mock = Mock()
+        managed_policy_mock.load.return_value = {"policy": "SomePolicy"}
+        template = {"a": "b"}
+
+        parser = Mock()
+        sam_parser.return_value = parser
+
+        translate_mock = Mock()
+        translate_mock.translate.side_effect = InvalidDocumentException([Exception('message')])
+        sam_translator.return_value = translate_mock
+
+        validator = SamTemplateValidator(template, managed_policy_mock)
+
+        with self.assertRaises(InvalidSamDocumentException):
+            validator.is_valid()
+
+        sam_translator.assert_called_once_with(managed_policy_map={"policy": "SomePolicy"},
+                                               sam_parser=parser,
+                                               plugins=[])
+        translate_mock.translate.assert_called_once_with(sam_template=template, parameter_values={})
+        sam_parser.assert_called_once()
+
+    def test_init(self):
+        managed_policy_mock = Mock()
+        template = {"a": "b"}
+
+        validator = SamTemplateValidator(template, managed_policy_mock)
+
+        self.assertEquals(validator.managed_policy_loader, managed_policy_mock)
+        self.assertEquals(validator.sam_template, template)
+
+        # check to see if SamParser was created
+        self.assertIsNotNone(validator.sam_parser)
+
+    def test_uri_is_s3_uri(self):
+        self.assertTrue(SamTemplateValidator.is_s3_uri("s3://bucket/key"))
+
+    def test_uri_is_not_s3_uri(self):
+        self.assertFalse(SamTemplateValidator.is_s3_uri("www.amazon.com"))
+
+    def test_int_is_not_s3_uri(self):
+        self.assertFalse(SamTemplateValidator.is_s3_uri(100))
+
+    def test_update_to_s3_uri_with_non_s3_uri(self):
+        property_value = {"CodeUri": "somevalue"}
+        SamTemplateValidator._update_to_s3_uri("CodeUri", property_value)
+
+        self.assertEquals(property_value.get("CodeUri"), "s3://bucket/value")
+
+    def test_update_to_s3_url_with_dict(self):
+        property_value = {"CodeUri": {"Bucket": "mybucket-name", "Key": "swagger", "Version": 121212}}
+        SamTemplateValidator._update_to_s3_uri("CodeUri", property_value)
+
+        self.assertEquals(property_value.get("CodeUri"),
+                          {"Bucket": "mybucket-name", "Key": "swagger", "Version": 121212})
+
+    def test_update_to_s3_url_with_s3_uri(self):
+        property_value = {"CodeUri": "s3://bucket/key/version"}
+        SamTemplateValidator._update_to_s3_uri("CodeUri", property_value)
+
+        self.assertEquals(property_value.get("CodeUri"), "s3://bucket/key/version")
+
+    def test_replace_local_codeuri(self):
+        template = {
+            "AWSTemplateFormatVersion": "2010-09-09",
+            "Transform": "AWS::Serverless-2016-10-31",
+            "Resources": {
+                "ServerlessApi": {
+                    "Type": "AWS::Serverless::Api",
+                    "Properties": {
+                        "StageName": "Prod",
+                        "DefinitionUri": "./"
+                    }
+                },
+                "ServerlessFunction": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "Handler": "index.handler",
+                        "CodeUri": "./",
+                        "Runtime": "nodejs6.10",
+                        "Timeout": 60
+                    }
+                }
+            }
+        }
+
+        managed_policy_mock = Mock()
+
+        validator = SamTemplateValidator(template, managed_policy_mock)
+
+        validator._replace_local_codeuri()
+
+        # check template
+        tempalte_resources = validator.sam_template.get("Resources")
+        self.assertEquals(tempalte_resources.get("ServerlessApi").get("Properties").get("DefinitionUri"),
+                          "s3://bucket/value")
+        self.assertEquals(tempalte_resources.get("ServerlessFunction").get("Properties").get("CodeUri"),
+                          "s3://bucket/value")
+
+    def test_replace_local_codeuri_when_no_codeuri_given(self):
+        template = {
+            "AWSTemplateFormatVersion": "2010-09-09",
+            "Transform": "AWS::Serverless-2016-10-31",
+            "Resources": {
+                "ServerlessApi": {
+                    "Type": "AWS::Serverless::Api",
+                    "Properties": {
+                        "StageName": "Prod",
+                    }
+                },
+                "ServerlessFunction": {
+                    "Type": "AWS::Serverless::Function",
+                    "Properties": {
+                        "Handler": "index.handler",
+                        "Runtime": "nodejs6.10",
+                        "Timeout": 60
+                    }
+                }
+            }
+        }
+
+        managed_policy_mock = Mock()
+
+        validator = SamTemplateValidator(template, managed_policy_mock)
+
+        validator._replace_local_codeuri()
+
+        # check template
+        tempalte_resources = validator.sam_template.get("Resources")
+        self.assertEquals(tempalte_resources.get("ServerlessApi").get("Properties").get("DefinitionUri"),
+                          "s3://bucket/value")
+        self.assertEquals(tempalte_resources.get("ServerlessFunction").get("Properties").get("CodeUri"),
+                          "s3://bucket/value")
+
+    def test_replace_local_codeuri_with_no_resources(self):
+
+        template = {
+            "AWSTemplateFormatVersion": "2010-09-09",
+            "Transform": "AWS::Serverless-2016-10-31",
+            "Resources": {}
+        }
+
+        managed_policy_mock = Mock()
+
+        validator = SamTemplateValidator(template, managed_policy_mock)
+
+        validator._replace_local_codeuri()
+
+        # check template
+        self.assertEquals(validator.sam_template.get("Resources"), {})
diff --git a/tests/unit/commands/validate/test_cli.py b/tests/unit/commands/validate/test_cli.py
new file mode 100644
index 0000000000..d440eab06c
--- /dev/null
+++ b/tests/unit/commands/validate/test_cli.py
@@ -0,0 +1,62 @@
+from unittest import TestCase
+from mock import Mock, patch
+
+from samcli.commands.local.cli_common.user_exceptions import SamTemplateNotFoundException, InvalidSamTemplateException
+from samcli.commands.validate.lib.exceptions import InvalidSamDocumentException
+from samcli.commands.validate.validate import do_cli, _read_sam_file
+
+
+class TestValidateCli(TestCase):
+
+    @patch('samcli.commands.validate.validate.click')
+    @patch('samcli.commands.validate.validate.os.path.exists')
+    def test_file_not_found(self, path_exists_patch, click_patch):
+        template_path = 'path_to_template'
+
+        path_exists_patch.return_value = False
+
+        with self.assertRaises(SamTemplateNotFoundException):
+            _read_sam_file(template_path)
+
+    @patch('samcli.commands.validate.validate.yaml_parse')
+    @patch('samcli.commands.validate.validate.click')
+    @patch('samcli.commands.validate.validate.os.path.exists')
+    def test_file_parsed(self, path_exists_patch, click_patch, yaml_parse_patch):
+        template_path = 'path_to_template'
+
+        path_exists_patch.return_value = True
+
+        yaml_parse_patch.return_value = {"a": "b"}
+
+        actual_template = _read_sam_file(template_path)
+
+        self.assertEquals(actual_template, {"a": "b"})
+
+    @patch('samcli.commands.validate.validate.SamTemplateValidator')
+    @patch('samcli.commands.validate.validate.click')
+    @patch('samcli.commands.validate.validate._read_sam_file')
+    def test_template_fails_validation(self, read_sam_file_patch, click_patch, template_valiadator):
+        template_path = 'path_to_template'
+        read_sam_file_patch.return_value = {"a": "b"}
+
+        is_valid_mock = Mock()
+        is_valid_mock.is_valid.side_effect = InvalidSamDocumentException
+        template_valiadator.return_value = is_valid_mock
+
+        with self.assertRaises(InvalidSamTemplateException):
+            do_cli(ctx=None,
+                   template=template_path)
+
+    @patch('samcli.commands.validate.validate.SamTemplateValidator')
+    @patch('samcli.commands.validate.validate.click')
+    @patch('samcli.commands.validate.validate._read_sam_file')
+    def test_template_passes_validation(self, read_sam_file_patch, click_patch, template_valiadator):
+        template_path = 'path_to_template'
+        read_sam_file_patch.return_value = {"a": "b"}
+
+        is_valid_mock = Mock()
+        is_valid_mock.is_valid.return_value = True
+        template_valiadator.return_value = is_valid_mock
+
+        do_cli(ctx=None,
+               template=template_path)
diff --git a/tests/unit/lib/__init__.py b/tests/unit/lib/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/lib/samlib/__init__.py b/tests/unit/lib/samlib/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/lib/samlib/test_cloudformation_command.py b/tests/unit/lib/samlib/test_cloudformation_command.py
new file mode 100644
index 0000000000..c67de17358
--- /dev/null
+++ b/tests/unit/lib/samlib/test_cloudformation_command.py
@@ -0,0 +1,42 @@
+"""
+Tests Deploy  CLI
+"""
+
+from subprocess import CalledProcessError
+
+from unittest import TestCase
+from mock import patch
+
+from samcli.lib.samlib.cloudformation_command import execute_command
+
+
+class TestCli(TestCase):
+
+    def setUp(self):
+        self.args = ("--arg1", "value1", "different args", "more")
+
+    @patch("subprocess.check_call")
+    @patch("platform.system")
+    def test_command_must_call_aws_linux(self, platform_system_mock, check_call_mock):
+        platform_system_mock.return_value = "Linux"
+        check_call_mock.return_value = True
+        execute_command("command", self.args)
+        check_call_mock.assert_called_with(["aws", "cloudformation", "command"] + list(self.args))
+
+    @patch("subprocess.check_call")
+    @patch("platform.system")
+    def test_command_must_call_aws_windows(self, platform_system_mock, check_call_mock):
+        platform_system_mock.return_value = "Windows"
+        check_call_mock.return_value = True
+        execute_command("command", self.args)
+        check_call_mock.assert_called_with(["aws.cmd", "cloudformation", "command"] + list(self.args))
+
+    @patch("sys.exit")
+    @patch("subprocess.check_call")
+    @patch("platform.system")
+    def test_command_must_exit_with_status_code(self, platform_system_mock, check_call_mock, exit_mock):
+        platform_system_mock.return_value = "Any"
+        check_call_mock.side_effect = CalledProcessError(2, "Error")
+        exit_mock.return_value = True
+        execute_command("command", self.args)
+        exit_mock.assert_called_with(2)
diff --git a/tests/unit/local/__init__.py b/tests/unit/local/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/local/apigw/__init__.py b/tests/unit/local/apigw/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/local/apigw/test_path_converter.py b/tests/unit/local/apigw/test_path_converter.py
new file mode 100644
index 0000000000..e775086890
--- /dev/null
+++ b/tests/unit/local/apigw/test_path_converter.py
@@ -0,0 +1,79 @@
+from unittest import TestCase
+
+from samcli.local.apigw.path_converter import PathConverter
+
+
+class TestPathConverter_toFlask(TestCase):
+
+    def test_single_path_param(self):
+        path = "/{id}"
+
+        flask_path = PathConverter.convert_path_to_flask(path)
+
+        self.assertEquals(flask_path, "/<id>")
+
+    def test_proxy_path(self):
+        path = "/{proxy+}"
+
+        flask_path = PathConverter.convert_path_to_flask(path)
+
+        self.assertEquals(flask_path, "/<path:proxy>")
+
+    def test_proxy_with_path_param(self):
+        path = "/id/{id}/user/{proxy+}"
+
+        flask_path = PathConverter.convert_path_to_flask(path)
+
+        self.assertEquals(flask_path, "/id/<id>/user/<path:proxy>")
+
+    def test_multiple_path_params(self):
+        path = "/id/{id}/user/{user}"
+
+        flask_path = PathConverter.convert_path_to_flask(path)
+
+        self.assertEquals(flask_path, "/id/<id>/user/<user>")
+
+    def test_no_changes_to_path(self):
+        path = "/id/user"
+
+        flask_path = PathConverter.convert_path_to_flask(path)
+
+        self.assertEquals(flask_path, "/id/user")
+
+
+class TestPathConverter_toApiGateway(TestCase):
+
+    def test_single_path_param(self):
+        path = "/<id>"
+
+        flask_path = PathConverter.convert_path_to_api_gateway(path)
+
+        self.assertEquals(flask_path, "/{id}")
+
+    def test_proxy_path(self):
+        path = "/<path:proxy>"
+
+        flask_path = PathConverter.convert_path_to_api_gateway(path)
+
+        self.assertEquals(flask_path, "/{proxy+}")
+
+    def test_proxy_with_path_param(self):
+        path = "/id/<id>/user/<path:proxy>"
+
+        flask_path = PathConverter.convert_path_to_api_gateway(path)
+
+        self.assertEquals(flask_path, "/id/{id}/user/{proxy+}")
+
+    def test_multiple_path_params(self):
+        path = "/id/<id>/user/<user>"
+
+        flask_path = PathConverter.convert_path_to_api_gateway(path)
+
+        self.assertEquals(flask_path, "/id/{id}/user/{user}")
+
+    def test_no_changes_to_path(self):
+        path = "/id/user"
+
+        flask_path = PathConverter.convert_path_to_api_gateway(path)
+
+        self.assertEquals(flask_path, "/id/user")
diff --git a/tests/unit/local/apigw/test_service.py b/tests/unit/local/apigw/test_service.py
new file mode 100644
index 0000000000..b898cec383
--- /dev/null
+++ b/tests/unit/local/apigw/test_service.py
@@ -0,0 +1,527 @@
+from unittest import TestCase
+from mock import Mock, patch, MagicMock, ANY
+import json
+import base64
+
+from parameterized import parameterized, param
+
+from samcli.local.apigw.service import Service, Route
+from samcli.local.lambdafn.exceptions import FunctionNotFound
+
+
+class TestApiGatewayService(TestCase):
+
+    def setUp(self):
+        self.function_name = Mock()
+        self.api_gateway_route = Route(['GET'], self.function_name, '/')
+        self.list_of_routes = [self.api_gateway_route]
+
+        self.lambda_runner = Mock()
+
+        self.stderr = Mock()
+        self.service = Service(self.list_of_routes, self.lambda_runner, stderr=self.stderr)
+
+    def test_request_must_invoke_lambda(self):
+        make_response_mock = Mock()
+
+        self.service._service_response = make_response_mock
+        self.service._get_current_route = Mock()
+        self.service._construct_event = Mock()
+
+        parse_output_mock = Mock()
+        parse_output_mock.return_value = ("status_code", "headers", "body")
+        self.service._parse_lambda_output = parse_output_mock
+
+        service_response_mock = Mock()
+        service_response_mock.return_value = make_response_mock
+        self.service._service_response = service_response_mock
+
+        result = self.service._request_handler()
+
+        self.assertEquals(result, make_response_mock)
+        self.lambda_runner.invoke.assert_called_with(ANY,
+                                                     ANY,
+                                                     stdout=ANY,
+                                                     stderr=self.stderr)
+
+    def test_request_handler_returns_process_stdout_when_making_response(self):
+        make_response_mock = Mock()
+
+        self.service._service_response = make_response_mock
+        self.service._get_current_route = Mock()
+        self.service._construct_event = Mock()
+
+        parse_output_mock = Mock()
+        parse_output_mock.return_value = ("status_code", "headers", "body")
+        self.service._parse_lambda_output = parse_output_mock
+
+        lambda_logs = "logs"
+        lambda_response = "response"
+        self.service._get_lambda_output = Mock()
+        self.service._get_lambda_output.return_value = lambda_response, lambda_logs
+
+        service_response_mock = Mock()
+        service_response_mock.return_value = make_response_mock
+        self.service._service_response = service_response_mock
+
+        result = self.service._request_handler()
+
+        self.assertEquals(result, make_response_mock)
+        self.service._get_lambda_output.assert_called_with(ANY)
+
+        # Make sure the parse method is called only on the returned response and not on the raw data from stdout
+        parse_output_mock.assert_called_with(lambda_response, ANY, ANY)
+        # Make sure the logs are written to stderr
+        self.stderr.write.assert_called_with(lambda_logs)
+
+    def test_request_handler_returns_make_response(self):
+        make_response_mock = Mock()
+
+        self.service._service_response = make_response_mock
+        self.service._get_current_route = Mock()
+        self.service._construct_event = Mock()
+
+        parse_output_mock = Mock()
+        parse_output_mock.return_value = ("status_code", "headers", "body")
+        self.service._parse_lambda_output = parse_output_mock
+
+        service_response_mock = Mock()
+        service_response_mock.return_value = make_response_mock
+        self.service._service_response = service_response_mock
+
+        result = self.service._request_handler()
+
+        self.assertEquals(result, make_response_mock)
+
+    def test_runtime_error_raised_when_app_not_created(self):
+        with self.assertRaises(RuntimeError):
+            self.service.run()
+
+    def test_run_starts_service_multithreaded(self):
+        self.service._app = Mock()
+        app_run_mock = Mock()
+        self.service._app.run = app_run_mock
+
+        self.lambda_runner.is_debugging.return_value = False  # multithreaded
+        self.service.run()
+
+        app_run_mock.assert_called_once_with(threaded=True, host='127.0.0.1', port=3000)
+
+    def test_run_starts_service_singlethreaded(self):
+        self.service._app = Mock()
+        app_run_mock = Mock()
+        self.service._app.run = app_run_mock
+
+        self.lambda_runner.is_debugging.return_value = True  # single threaded
+        self.service.run()
+
+        app_run_mock.assert_called_once_with(threaded=False, host='127.0.0.1', port=3000)
+
+    def test_create_creates_dict_of_routes(self):
+        function_name_1 = Mock()
+        function_name_2 = Mock()
+        api_gateway_route_1 = Route(['GET'], function_name_1, '/')
+        api_gateway_route_2 = Route(['POST'], function_name_2, '/')
+
+        list_of_routes = [api_gateway_route_1, api_gateway_route_2]
+
+        lambda_runner = Mock()
+
+        service = Service(list_of_routes, lambda_runner)
+
+        service.create()
+
+        self.assertEquals(service._dict_of_routes, {'/:GET': api_gateway_route_1,
+                                                    '/:POST': api_gateway_route_2
+                                                    })
+
+    @patch('samcli.local.apigw.service.Flask')
+    def test_create_creates_flask_app_with_url_rules(self, flask):
+        app_mock = Mock()
+        flask.return_value = app_mock
+
+        self.service._construct_error_handling = Mock()
+
+        self.service.create()
+
+        app_mock.add_url_rule.assert_called_once_with('/',
+                                                      endpoint='/',
+                                                      view_func=self.service._request_handler,
+                                                      methods=['GET'])
+
+    def test_initalize_creates_default_values(self):
+        self.assertEquals(self.service.port, 3000)
+        self.assertEquals(self.service.host, '127.0.0.1')
+        self.assertEquals(self.service.routing_list, self.list_of_routes)
+        self.assertIsNone(self.service.static_dir)
+        self.assertEquals(self.service.lambda_runner, self.lambda_runner)
+
+    def test_initalize_with_values(self):
+        lambda_runner = Mock()
+        local_service = Service([], lambda_runner, static_dir='dir/static', port=5000, host='129.0.0.0')
+        self.assertEquals(local_service.port, 5000)
+        self.assertEquals(local_service.host, '129.0.0.0')
+        self.assertEquals(local_service.routing_list, [])
+        self.assertEquals(local_service.static_dir, 'dir/static')
+        self.assertEquals(local_service.lambda_runner, lambda_runner)
+
+    @patch('samcli.local.apigw.service.ServiceErrorResponses')
+    def test_request_handles_error_when_invoke_cant_find_function(self, service_error_responses_patch):
+
+        not_found_response_mock = Mock()
+        self.service._construct_event = Mock()
+        self.service._get_current_route = Mock()
+        service_error_responses_patch.lambda_not_found_response.return_value = not_found_response_mock
+
+        self.lambda_runner.invoke.side_effect = FunctionNotFound()
+
+        response = self.service._request_handler()
+
+        self.assertEquals(response, not_found_response_mock)
+
+    def test_request_throws_when_invoke_fails(self):
+        self.lambda_runner.invoke.side_effect = Exception()
+
+        self.service._construct_event = Mock()
+        self.service._get_current_route = Mock()
+
+        with self.assertRaises(Exception):
+            self.service._request_handler()
+
+    @patch('samcli.local.apigw.service.ServiceErrorResponses')
+    def test_request_handler_errors_when_parse_lambda_output_raises_keyerror(self, service_error_responses_patch):
+        parse_output_mock = Mock()
+        parse_output_mock.side_effect = KeyError()
+        self.service._parse_lambda_output = parse_output_mock
+
+        failure_response_mock = Mock()
+
+        service_error_responses_patch.lambda_failure_response.return_value = failure_response_mock
+
+        self.service._construct_event = Mock()
+        self.service._get_current_route = Mock()
+
+        result = self.service._request_handler()
+
+        self.assertEquals(result, failure_response_mock)
+
+    @patch('samcli.local.apigw.service.ServiceErrorResponses')
+    def test_request_handler_errors_when_get_current_route_fails(self, service_error_responses_patch):
+        get_current_route = Mock()
+        get_current_route.side_effect = KeyError()
+        self.service._get_current_route = get_current_route
+
+        with self.assertRaises(KeyError):
+            self.service._request_handler()
+
+    @patch('samcli.local.apigw.service.ServiceErrorResponses')
+    def test_request_handler_errors_when_unable_to_read_binary_data(self, service_error_responses_patch):
+        _construct_event = Mock()
+        _construct_event.side_effect = UnicodeDecodeError("utf8", "obj", 1, 2, "reason")
+        self.service._get_current_route = Mock()
+        self.service._construct_event = _construct_event
+
+        failure_mock = Mock()
+        service_error_responses_patch.lambda_failure_response.return_value = failure_mock
+
+        result = self.service._request_handler()
+        self.assertEquals(result, failure_mock)
+
+    @patch('samcli.local.apigw.service.request')
+    def test_get_current_route(self, request_patch):
+
+        request_mock = Mock()
+        request_mock.endpoint = "path"
+        request_mock.method = "method"
+
+        request_patch.return_value = request_mock
+
+        route_key_method_mock = Mock()
+        route_key_method_mock.return_value = "method:path"
+        self.service._route_key = route_key_method_mock
+        self.service._dict_of_routes = {"method:path": "function"}
+
+        self.assertEquals(self.service._get_current_route(request_mock), "function")
+
+    @patch('samcli.local.apigw.service.request')
+    def test_get_current_route_keyerror(self, request_patch):
+        """
+        When the a HTTP request for given method+path combination is allowed by Flask but not in the list of routes,
+        something is messed up. Flask should be configured only from the list of routes.
+        """
+
+        request_mock = Mock()
+        request_mock.endpoint = "path"
+        request_mock.method = "method"
+
+        request_patch.return_value = request_mock
+
+        route_key_method_mock = Mock()
+        route_key_method_mock.return_value = "method:path"
+        self.service._route_key = route_key_method_mock
+        self.service._dict_of_routes = {"a": "b"}
+
+        with self.assertRaises(KeyError):
+            self.service._get_current_route(request_mock)
+
+    @parameterized.expand([
+        param(
+            "with both logs and response",
+            'this\nis\nlog\ndata\n{"a": "b"}', 'this\nis\nlog\ndata', '{"a": "b"}'
+        ),
+        param(
+            "with response as string",
+            "logs\nresponse", "logs", "response"
+        ),
+        param(
+            "with response only",
+            '{"a": "b"}', None, '{"a": "b"}'
+        ),
+        param(
+            "with response only as string",
+            'this is the response line', None, 'this is the response line'
+        ),
+        param(
+            "with whitespaces",
+            'log\ndata\n{"a": "b"}  \n\n\n', "log\ndata", '{"a": "b"}'
+        ),
+        param(
+            "with empty data",
+            '', None, ''
+        ),
+        param(
+            "with just new lines",
+            '\n\n', None, ''
+        ),
+        param(
+            "with no data but with whitespaces",
+            '\n   \n   \n', '\n   ', ''   # Log data with whitespaces will be in the output unchanged
+        )
+    ])
+    def test_get_lambda_output_extracts_response(self, test_case_name, stdout_data, expected_logs, expected_response):
+        stdout = Mock()
+        stdout.getvalue.return_value = stdout_data
+
+        response, logs = self.service._get_lambda_output(stdout)
+        self.assertEquals(logs, expected_logs)
+        self.assertEquals(response, expected_response)
+
+
+class TestApiGatewayModel(TestCase):
+
+    def setUp(self):
+        self.function_name = "name"
+        self.api_gateway = Route(['POST'], self.function_name, '/')
+
+    def test_class_initialization(self):
+        self.assertEquals(self.api_gateway.methods, ['POST'])
+        self.assertEquals(self.api_gateway.function_name, self.function_name)
+        self.assertEquals(self.api_gateway.path, '/')
+
+
+class TestServiceParsingLambdaOutput(TestCase):
+
+    def test_default_content_type_header_added_with_no_headers(self):
+        lambda_output = '{"statusCode": 200, "body": "{\\"message\\":\\"Hello from Lambda\\"}", ' \
+                        '"isBase64Encoded": false}'
+
+        (_, headers, _) = Service._parse_lambda_output(lambda_output, binary_types=[], flask_request=Mock())
+
+        self.assertIn("Content-Type", headers)
+        self.assertEquals(headers["Content-Type"], "application/json")
+
+    def test_default_content_type_header_added_with_empty_headers(self):
+        lambda_output = '{"statusCode": 200, "headers":{}, "body": "{\\"message\\":\\"Hello from Lambda\\"}", ' \
+                        '"isBase64Encoded": false}'
+
+        (_, headers, _) = Service._parse_lambda_output(lambda_output, binary_types=[], flask_request=Mock())
+
+        self.assertIn("Content-Type", headers)
+        self.assertEquals(headers["Content-Type"], "application/json")
+
+    def test_custom_content_type_header_is_not_modified(self):
+        lambda_output = '{"statusCode": 200, "headers":{"Content-Type": "text/xml"}, "body": "{}", ' \
+                        '"isBase64Encoded": false}'
+
+        (_, headers, _) = Service._parse_lambda_output(lambda_output, binary_types=[], flask_request=Mock())
+
+        self.assertIn("Content-Type", headers)
+        self.assertEquals(headers["Content-Type"], "text/xml")
+
+    def test_extra_values_ignored(self):
+        lambda_output = '{"statusCode": 200, "headers": {}, "body": "{\\"message\\":\\"Hello from Lambda\\"}", ' \
+                        '"isBase64Encoded": false, "another_key": "some value"}'
+
+        (status_code, headers, body) = Service._parse_lambda_output(lambda_output,
+                                                                    binary_types=[],
+                                                                    flask_request=Mock())
+
+        self.assertEquals(status_code, 200)
+        self.assertEquals(headers, {"Content-Type": "application/json"})
+        self.assertEquals(body, '{"message":"Hello from Lambda"}')
+
+    def test_parse_returns_correct_tuple(self):
+        lambda_output = '{"statusCode": 200, "headers": {}, "body": "{\\"message\\":\\"Hello from Lambda\\"}", ' \
+                        '"isBase64Encoded": false}'
+
+        (status_code, headers, body) = Service._parse_lambda_output(lambda_output,
+                                                                    binary_types=[],
+                                                                    flask_request=Mock())
+
+        self.assertEquals(status_code, 200)
+        self.assertEquals(headers, {"Content-Type": "application/json"})
+        self.assertEquals(body, '{"message":"Hello from Lambda"}')
+
+    @patch('samcli.local.apigw.service.Service._should_base64_decode_body')
+    def test_parse_returns_decodes_base64_to_binary(self, should_decode_body_patch):
+        should_decode_body_patch.return_value = True
+        binary_body = "011000100110100101101110011000010111001001111001"  # binary in binary
+        base64_body = base64.b64encode(binary_body)
+        lambda_output = {"statusCode": 200,
+                         "headers": {"Content-Type": "application/octet-stream"},
+                         "body": base64_body,
+                         "isBase64Encoded": False}
+
+        (status_code, headers, body) = Service._parse_lambda_output(json.dumps(lambda_output),
+                                                                    binary_types=['*/*'],
+                                                                    flask_request=Mock())
+
+        self.assertEquals(status_code, 200)
+        self.assertEquals(headers, {"Content-Type": "application/octet-stream"})
+        self.assertEquals(body, binary_body)
+
+    def test_status_code_not_int(self):
+        lambda_output = '{"statusCode": "str", "headers": {}, "body": "{\\"message\\":\\"Hello from Lambda\\"}", ' \
+                        '"isBase64Encoded": false}'
+
+        with self.assertRaises(TypeError):
+            Service._parse_lambda_output(lambda_output,
+                                         binary_types=[],
+                                         flask_request=Mock())
+
+    def test_status_code_negative_int(self):
+        lambda_output = '{"statusCode": -1, "headers": {}, "body": "{\\"message\\":\\"Hello from Lambda\\"}", ' \
+                            '"isBase64Encoded": false}'
+
+        with self.assertRaises(TypeError):
+            Service._parse_lambda_output(lambda_output,
+                                         binary_types=[],
+                                         flask_request=Mock())
+
+    def test_lambda_output_list_not_dict(self):
+        lambda_output = '[]'
+
+        with self.assertRaises(TypeError):
+            Service._parse_lambda_output(lambda_output,
+                                         binary_types=[],
+                                         flask_request=Mock())
+
+    def test_lambda_output_not_json_serializable(self):
+        lambda_output = 'some str'
+
+        with self.assertRaises(ValueError):
+            Service._parse_lambda_output(lambda_output, binary_types=[], flask_request=Mock())
+
+    def test_properties_are_null(self):
+        lambda_output = '{"statusCode": 0, "headers": null, "body": null, ' \
+                        '"isBase64Encoded": null}'
+
+        (status_code, headers, body) = Service._parse_lambda_output(lambda_output,
+                                                                    binary_types=[],
+                                                                    flask_request=Mock())
+
+        self.assertEquals(status_code, 200)
+        self.assertEquals(headers, {"Content-Type": "application/json"})
+        self.assertEquals(body, "no data")
+
+
+class TestService_construct_event(TestCase):
+
+    def setUp(self):
+        self.request_mock = Mock()
+        self.request_mock.endpoint = "endpoint"
+        self.request_mock.path = "path"
+        self.request_mock.method = "GET"
+        self.request_mock.remote_addr = "190.0.0.0"
+        self.request_mock.data = b"DATA!!!!"
+        self.request_mock.args = {"query": "params"}
+        self.request_mock.headers = {"Content-Type": "application/json", "X-Test": "Value"}
+        self.request_mock.view_args = {"path": "params"}
+        self.request_mock.scheme = "http"
+
+        expected = '{"body": "DATA!!!!", "httpMethod": "GET", ' \
+                   '"queryStringParameters": {"query": "params"}, "resource": ' \
+                   '"endpoint", "requestContext": {"httpMethod": "GET", "requestId": ' \
+                   '"c6af9ac6-7b61-11e6-9a41-93e8deadbeef", "path": "endpoint", "extendedRequestId": null, ' \
+                   '"resourceId": "123456", "apiId": "1234567890", "stage": "prod", "resourcePath": "endpoint", ' \
+                   '"identity": {"accountId": null, "apiKey": null, "userArn": null, ' \
+                   '"cognitoAuthenticationProvider": null, "cognitoIdentityPoolId": null, "userAgent": ' \
+                   '"Custom User Agent String", "caller": null, "cognitoAuthenticationType": null, "sourceIp": ' \
+                   '"190.0.0.0", "user": null}, "accountId": "123456789012"}, "headers": {"Content-Type": ' \
+                   '"application/json", "X-Test": "Value", "X-Forwarded-Port": "3000", "X-Forwarded-Proto": "http"}, ' \
+                   '"stageVariables": null, "path": "path", "pathParameters": {"path": "params"}, ' \
+                   '"isBase64Encoded": false}'
+
+        self.expected_dict = json.loads(expected)
+
+    def test_construct_event_with_data(self):
+        actual_event_str = Service._construct_event(self.request_mock, 3000, binary_types=[])
+        self.assertEquals(json.loads(actual_event_str), self.expected_dict)
+
+    def test_construct_event_no_data(self):
+        self.request_mock.data = None
+        self.expected_dict["body"] = None
+
+        actual_event_str = Service._construct_event(self.request_mock, 3000, binary_types=[])
+        self.assertEquals(json.loads(actual_event_str), self.expected_dict)
+
+    @patch('samcli.local.apigw.service.Service._should_base64_encode')
+    def test_construct_event_with_binary_data(self, should_base64_encode_patch):
+        should_base64_encode_patch.return_value = True
+
+        binary_body = "011000100110100101101110011000010111001001111001"  # binary in binary
+        base64_body = base64.b64encode(binary_body)
+
+        self.request_mock.data = binary_body
+        self.expected_dict["body"] = base64_body
+        self.expected_dict["isBase64Encoded"] = True
+
+        actual_event_str = Service._construct_event(self.request_mock, 3000, binary_types=[])
+        self.assertEquals(json.loads(actual_event_str), self.expected_dict)
+
+
+class TestService_service_response(TestCase):
+
+    @patch('samcli.local.apigw.service.Response')
+    def test_service_response(self, flask_response_patch):
+        flask_response_mock = MagicMock()
+
+        flask_response_patch.return_value = flask_response_mock
+
+        body = "this is the body"
+        status_code = 200
+        headers = {"Content-Type": "application/json"}
+
+        actual_response = Service._service_response(body, headers, status_code)
+
+        flask_response_patch.assert_called_once_with("this is the body")
+
+        self.assertEquals(actual_response.status_code, 200)
+        self.assertEquals(actual_response.headers, {"Content-Type": "application/json"})
+
+
+class TestService_should_base64_encode(TestCase):
+
+    @parameterized.expand([
+        param("Mimeyype is in binary types", ['image/gif'], 'image/gif'),
+        param("Mimetype defined and binary types has */*", ['*/*'], 'image/gif'),
+        param("*/* is in binary types with no mimetype defined", ['*/*'], None)
+    ])
+    def test_should_base64_encode_returns_true(self, test_case_name, binary_types, mimetype):
+        self.assertTrue(Service._should_base64_encode(binary_types, mimetype))
+
+    @parameterized.expand([
+        param("Mimetype is not in binary types", ['image/gif'], "application/octet-stream")
+    ])
+    def test_should_base64_encode_returns_false(self, test_case_name, binary_types, mimetype):
+        self.assertFalse(Service._should_base64_encode(binary_types, mimetype))
diff --git a/tests/unit/local/apigw/test_service_error_responses.py b/tests/unit/local/apigw/test_service_error_responses.py
new file mode 100644
index 0000000000..5716edd147
--- /dev/null
+++ b/tests/unit/local/apigw/test_service_error_responses.py
@@ -0,0 +1,48 @@
+from unittest import TestCase
+from mock import patch, Mock
+
+from samcli.local.apigw.service_error_responses import ServiceErrorResponses
+
+
+class TestServiceErrorResponses(TestCase):
+
+    @patch('samcli.local.apigw.service_error_responses.make_response')
+    @patch('samcli.local.apigw.service_error_responses.jsonify')
+    def test_lambda_failure_response(self, jsonify_patch, make_response_patch):
+        jsonify_patch.return_value = {"json": "Response"}
+        make_response_patch.return_value = {"Some Response"}
+
+        response = ServiceErrorResponses.lambda_failure_response()
+
+        self.assertEquals(response, {"Some Response"})
+
+        jsonify_patch.assert_called_with({"message": "Internal server error"})
+        make_response_patch.assert_called_with({"json": "Response"}, 502)
+
+    @patch('samcli.local.apigw.service_error_responses.make_response')
+    @patch('samcli.local.apigw.service_error_responses.jsonify')
+    def test_lambda_not_found_response(self, jsonify_patch, make_response_patch):
+        jsonify_patch.return_value = {"json": "Response"}
+        make_response_patch.return_value = {"Some Response"}
+        error_mock = Mock()
+
+        response = ServiceErrorResponses.lambda_not_found_response(error_mock)
+
+        self.assertEquals(response, {"Some Response"})
+
+        jsonify_patch.assert_called_with({"message": "No function defined for resource method"})
+        make_response_patch.assert_called_with({"json": "Response"}, 502)
+
+    @patch('samcli.local.apigw.service_error_responses.make_response')
+    @patch('samcli.local.apigw.service_error_responses.jsonify')
+    def test_route_not_found(self, jsonify_patch, make_response_patch):
+        jsonify_patch.return_value = {"json": "Response"}
+        make_response_patch.return_value = {"Some Response"}
+        error_mock = Mock()
+
+        response = ServiceErrorResponses.route_not_found(error_mock)
+
+        self.assertEquals(response, {"Some Response"})
+
+        jsonify_patch.assert_called_with({"message": "Missing Authentication Token"})
+        make_response_patch.assert_called_with({"json": "Response"}, 403)
diff --git a/tests/unit/local/docker/__init__.py b/tests/unit/local/docker/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/local/docker/test_container.py b/tests/unit/local/docker/test_container.py
new file mode 100644
index 0000000000..b652588a05
--- /dev/null
+++ b/tests/unit/local/docker/test_container.py
@@ -0,0 +1,438 @@
+"""
+Unit test for Container class
+"""
+from docker.errors import NotFound, APIError
+from unittest import TestCase
+from mock import Mock, call, patch
+
+from samcli.local.docker.container import Container
+
+
+class TestContainer_init(TestCase):
+
+    def setUp(self):
+        self.image = "image"
+        self.cmd = "cmd"
+        self.working_dir = "working_dir"
+        self.host_dir = "host_dir"
+        self.memory_mb = 123
+        self.exposed_ports = {123: 123}
+        self.entrypoint = ["a", "b", "c"]
+        self.env_vars = {"key": "value"}
+
+        self.mock_docker_client = Mock()
+
+    def test_init_must_store_all_values(self):
+
+        container = Container(self.image,
+                              self.cmd,
+                              self.working_dir,
+                              self.host_dir,
+                              self.memory_mb,
+                              self.exposed_ports,
+                              self.entrypoint,
+                              self.env_vars,
+                              self.mock_docker_client)
+
+        self.assertEquals(self.image, container._image)
+        self.assertEquals(self.cmd, container._cmd)
+        self.assertEquals(self.working_dir, container._working_dir)
+        self.assertEquals(self.host_dir, container._host_dir)
+        self.assertEquals(self.exposed_ports, container._exposed_ports)
+        self.assertEquals(self.entrypoint, container._entrypoint)
+        self.assertEquals(self.env_vars, container._env_vars)
+        self.assertEquals(self.memory_mb, container._memory_limit_mb)
+        self.assertEquals(None, container._network_id)
+        self.assertEquals(None, container.id)
+        self.assertEquals(self.mock_docker_client, container.docker_client)
+
+
+class TestContainer_create(TestCase):
+
+    def setUp(self):
+        self.image = "image"
+        self.cmd = "cmd"
+        self.working_dir = "working_dir"
+        self.host_dir = "host_dir"
+        self.memory_mb = 123
+        self.exposed_ports = {123: 123}
+        self.entrypoint = ["a", "b", "c"]
+        self.env_vars = {"key": "value"}
+
+        self.mock_docker_client = Mock()
+        self.mock_docker_client.containers = Mock()
+        self.mock_docker_client.containers.create = Mock()
+        self.mock_docker_client.networks = Mock()
+        self.mock_docker_client.networks.get = Mock()
+
+    def test_must_create_container_with_required_values(self):
+        """
+        Create a container with only required values. Optional values are not provided
+        :return:
+        """
+
+        expected_volumes = {
+            self.host_dir: {
+                "bind": self.working_dir,
+                "mode": "ro"
+            }
+        }
+        generated_id = "fooobar"
+        self.mock_docker_client.containers.create.return_value = Mock()
+        self.mock_docker_client.containers.create.return_value.id = generated_id
+
+        container = Container(self.image,
+                              self.cmd,
+                              self.working_dir,
+                              self.host_dir,
+                              docker_client=self.mock_docker_client)
+
+        container_id = container.create()
+        self.assertEquals(container_id, generated_id)
+        self.assertEquals(container.id, generated_id)
+
+        self.mock_docker_client.containers.create.assert_called_with(self.image,
+                                                                     command=self.cmd,
+                                                                     working_dir=self.working_dir,
+                                                                     volumes=expected_volumes,
+                                                                     tty=False)
+        self.mock_docker_client.networks.get.assert_not_called()
+
+    def test_must_create_container_including_all_optional_values(self):
+        """
+        Create a container with only required values. Optional values are not provided
+        :return:
+        """
+
+        expected_volumes = {
+            self.host_dir: {
+                "bind": self.working_dir,
+                "mode": "ro"
+            }
+        }
+        expected_memory = "{}m".format(self.memory_mb)
+
+        generated_id = "fooobar"
+        self.mock_docker_client.containers.create.return_value = Mock()
+        self.mock_docker_client.containers.create.return_value.id = generated_id
+
+        container = Container(self.image,
+                              self.cmd,
+                              self.working_dir,
+                              self.host_dir,
+                              memory_limit_mb=self.memory_mb,
+                              exposed_ports=self.exposed_ports,
+                              entrypoint=self.entrypoint,
+                              env_vars=self.env_vars,
+                              docker_client=self.mock_docker_client)
+
+        container_id = container.create()
+        self.assertEquals(container_id, generated_id)
+        self.assertEquals(container.id, generated_id)
+
+        self.mock_docker_client.containers.create.assert_called_with(self.image,
+                                                                     command=self.cmd,
+                                                                     working_dir=self.working_dir,
+                                                                     volumes=expected_volumes,
+                                                                     tty=False,
+                                                                     environment=self.env_vars,
+                                                                     ports=self.exposed_ports,
+                                                                     entrypoint=self.entrypoint,
+                                                                     mem_limit=expected_memory)
+        self.mock_docker_client.networks.get.assert_not_called()
+
+    def test_must_connect_to_network_on_create(self):
+        """
+        Create a container with only required values. Optional values are not provided
+        :return:
+        """
+
+        network_id = "some id"
+        generated_id = "fooobar"
+        self.mock_docker_client.containers.create.return_value = Mock()
+        self.mock_docker_client.containers.create.return_value.id = generated_id
+
+        network_mock = Mock()
+        self.mock_docker_client.networks.get.return_value = network_mock
+        network_mock.connect = Mock()
+
+        container = Container(self.image,
+                              self.cmd,
+                              self.working_dir,
+                              self.host_dir,
+                              docker_client=self.mock_docker_client)
+
+        container.network_id = network_id
+
+        container_id = container.create()
+        self.assertEquals(container_id, generated_id)
+
+        self.mock_docker_client.networks.get.assert_called_with(network_id)
+        network_mock.connect.assert_called_with(container_id)
+
+    def test_must_fail_if_already_created(self):
+
+        container = Container(self.image,
+                              self.cmd,
+                              self.working_dir,
+                              self.host_dir,
+                              docker_client=self.mock_docker_client)
+
+        container.is_created = Mock()
+        container.is_created.return_value = True
+
+        with self.assertRaises(RuntimeError):
+            container.create()
+
+
+class TestContainer_delete(TestCase):
+
+    def setUp(self):
+        self.image = "image"
+        self.cmd = "cmd"
+        self.working_dir = "working_dir"
+        self.host_dir = "host_dir"
+
+        self.mock_docker_client = Mock()
+        self.mock_docker_client.containers = Mock()
+        self.mock_docker_client.containers.get = Mock()
+
+        self.container = Container(self.image,
+                                   self.cmd,
+                                   self.working_dir,
+                                   self.host_dir,
+                                   docker_client=self.mock_docker_client)
+        self.container.id = "someid"
+
+        self.container.is_created = Mock()
+
+    def test_must_delete(self):
+
+        self.container.is_created.return_value = True
+        real_container_mock = Mock()
+        self.mock_docker_client.containers.get.return_value = real_container_mock
+        real_container_mock.remove = Mock()
+
+        self.container.delete()
+
+        self.mock_docker_client.containers.get.assert_called_with("someid")
+        real_container_mock.remove.assert_called_with(force=True)
+
+        # Must reset ID to None because container is now gone
+        self.assertIsNone(self.container.id)
+
+    def test_must_work_when_container_is_not_found(self):
+        self.container.is_created.return_value = True
+        real_container_mock = Mock()
+        self.mock_docker_client.containers.get.side_effect = NotFound("msg")
+        real_container_mock.remove = Mock()
+
+        self.container.delete()
+
+        self.mock_docker_client.containers.get.assert_called_with("someid")
+        real_container_mock.remove.assert_not_called()
+
+        # Must reset ID to None because container is now gone
+        self.assertIsNone(self.container.id)
+
+    def test_must_work_if_container_delete_is_in_progress(self):
+        self.container.is_created.return_value = True
+        real_container_mock = Mock()
+        self.mock_docker_client.containers.get.return_value = real_container_mock
+        real_container_mock.remove = Mock()
+        real_container_mock.remove.side_effect = APIError("removal of container is already in progress")
+
+        self.container.delete()
+
+        self.mock_docker_client.containers.get.assert_called_with("someid")
+        real_container_mock.remove.assert_called_with(force=True)
+
+        # Must reset ID to None because container is now gone
+        self.assertIsNone(self.container.id)
+
+    def test_must_raise_unknown_docker_api_errors(self):
+        self.container.is_created.return_value = True
+        real_container_mock = Mock()
+        self.mock_docker_client.containers.get.return_value = real_container_mock
+        real_container_mock.remove = Mock()
+        real_container_mock.remove.side_effect = APIError("some error")
+
+        with self.assertRaises(APIError):
+            self.container.delete()
+
+        # Must *NOT* reset ID because Docker API raised an exception
+        self.assertIsNotNone(self.container.id)
+
+    def test_must_skip_if_container_is_not_created(self):
+
+        self.container.is_created.return_value = False
+        self.container.delete()
+        self.mock_docker_client.containers.get.assert_not_called()
+
+
+class TestContainer_start(TestCase):
+
+    def setUp(self):
+        self.image = "image"
+        self.cmd = "cmd"
+        self.working_dir = "working_dir"
+        self.host_dir = "host_dir"
+
+        self.mock_docker_client = Mock()
+        self.mock_docker_client.containers = Mock()
+        self.mock_docker_client.containers.get = Mock()
+
+        self.container = Container(self.image,
+                                   self.cmd,
+                                   self.working_dir,
+                                   self.host_dir,
+                                   docker_client=self.mock_docker_client)
+        self.container.id = "someid"
+
+        self.container.is_created = Mock()
+
+    def test_must_start_container(self):
+
+        self.container.is_created.return_value = True
+
+        container_mock = Mock()
+        self.mock_docker_client.containers.get.return_value = container_mock
+        container_mock.start = Mock()
+
+        self.container.start()
+
+        self.mock_docker_client.containers.get.assert_called_with(self.container.id)
+        container_mock.start.assert_called_with()
+
+    def test_must_not_start_if_container_is_not_created(self):
+
+        self.container.is_created.return_value = False
+
+        with self.assertRaises(RuntimeError):
+            self.container.start()
+
+    def test_must_not_support_input_data(self):
+
+        self.container.is_created.return_value = True
+
+        with self.assertRaises(ValueError):
+            self.container.start(input_data="some input data")
+
+
+class TestContainer_wait_for_logs(TestCase):
+
+    def setUp(self):
+        self.image = "image"
+        self.cmd = ["cmd"]
+        self.working_dir = "working_dir"
+        self.host_dir = "host_dir"
+
+        self.mock_docker_client = Mock()
+        self.mock_docker_client.containers = Mock()
+        self.mock_docker_client.containers.get = Mock()
+
+        self.container = Container(self.image,
+                                   self.cmd,
+                                   self.working_dir,
+                                   self.host_dir,
+                                   docker_client=self.mock_docker_client)
+        self.container.id = "someid"
+
+        self.container.is_created = Mock()
+
+    @patch("samcli.local.docker.container.attach")
+    def test_must_fetch_stdout_and_stderr_data(self, attach_mock):
+
+        self.container.is_created.return_value = True
+
+        real_container_mock = Mock()
+        self.mock_docker_client.containers.get.return_value = real_container_mock
+
+        output_itr = Mock()
+        attach_mock.return_value = output_itr
+        self.container._write_container_output = Mock()
+
+        stdout_mock = Mock()
+        stderr_mock = Mock()
+
+        self.container.wait_for_logs(stdout=stdout_mock, stderr=stderr_mock)
+
+        attach_mock.assert_called_with(self.mock_docker_client, container=real_container_mock,
+                                       stdout=True, stderr=True, logs=True)
+        self.container._write_container_output.assert_called_with(output_itr, stdout=stdout_mock, stderr=stderr_mock)
+
+    def test_must_skip_if_no_stdout_and_stderr(self):
+
+        self.container.wait_for_logs()
+        self.mock_docker_client.containers.get.assert_not_called()
+
+    def test_must_raise_if_container_is_not_created(self):
+
+        self.container.is_created.return_value = False
+
+        with self.assertRaises(RuntimeError):
+            self.container.wait_for_logs(stdout=Mock())
+
+
+class TestContainer_write_container_output(TestCase):
+
+    def setUp(self):
+        self.output_itr = [
+            (Container._STDOUT_FRAME_TYPE, "stdout1"),
+            (Container._STDERR_FRAME_TYPE, "stderr1"),
+            (30, "invalid1"),
+
+            (Container._STDOUT_FRAME_TYPE, "stdout2"),
+            (Container._STDERR_FRAME_TYPE, "stderr2"),
+            (30, "invalid2"),
+
+            (Container._STDOUT_FRAME_TYPE, "stdout3"),
+            (Container._STDERR_FRAME_TYPE, "stderr3"),
+            (30, "invalid3"),
+        ]
+
+        self.stdout_mock = Mock()
+        self.stderr_mock = Mock()
+
+    def test_must_write_stdout_and_stderr_data(self):
+        # All the invalid frames must be ignored
+
+        Container._write_container_output(self.output_itr, stdout=self.stdout_mock, stderr=self.stderr_mock)
+
+        self.stdout_mock.write.assert_has_calls([
+            call("stdout1"), call("stdout2"), call("stdout3")
+        ])
+
+        self.stderr_mock.write.assert_has_calls([
+            call("stderr1"), call("stderr2"), call("stderr3")
+        ])
+
+    def test_must_write_only_stdout(self):
+
+        Container._write_container_output(self.output_itr, stdout=self.stdout_mock, stderr=None)
+
+        self.stdout_mock.write.assert_has_calls([
+            call("stdout1"), call("stdout2"), call("stdout3")
+        ])
+
+        self.stderr_mock.write.assert_not_called()  # stderr must never be called
+
+    def test_must_write_only_stderr(self):
+        # All the invalid frames must be ignored
+
+        Container._write_container_output(self.output_itr, stdout=None, stderr=self.stderr_mock)
+
+        self.stdout_mock.write.assert_not_called()
+
+        self.stderr_mock.write.assert_has_calls([
+            call("stderr1"), call("stderr2"), call("stderr3")
+        ])
+
+
+class TestContainer_image(TestCase):
+
+    def test_must_return_image_value(self):
+        image = "myimage"
+        container = Container(image, "cmd", "dir", "dir")
+
+        self.assertEquals(image, container.image)
diff --git a/tests/unit/local/docker/test_lambda_container.py b/tests/unit/local/docker/test_lambda_container.py
new file mode 100644
index 0000000000..0fbaed363d
--- /dev/null
+++ b/tests/unit/local/docker/test_lambda_container.py
@@ -0,0 +1,143 @@
+"""
+Unit test for Lambda container management
+"""
+
+from unittest import TestCase
+from mock import patch
+from parameterized import parameterized, param
+
+from samcli.local.docker.lambda_container import LambdaContainer, Runtime
+
+RUNTIMES_WITH_ENTRYPOINT = [Runtime.java8.value,
+                            Runtime.nodejs.value,
+                            Runtime.nodejs43.value,
+                            Runtime.nodejs610.value,
+                            Runtime.nodejs810.value,
+                            Runtime.python36.value,
+                            Runtime.python27.value]
+
+ALL_RUNTIMES = [r for r in Runtime]
+
+
+class TestLambdaContainer_init(TestCase):
+
+    def setUp(self):
+        self.runtime = "nodejs4.3"
+        self.handler = "handler"
+        self.code_dir = "codedir"
+        self.env_var = {"var": "value"}
+        self.memory_mb = 1024
+        self.debug_port = 1235
+        self.debug_arg = "a=b c=d e=f"
+
+    @patch.object(LambdaContainer, "_get_image")
+    @patch.object(LambdaContainer, "_get_exposed_ports")
+    @patch.object(LambdaContainer, "_get_entry_point")
+    def test_must_configure_container_properly(self,
+                                               get_entry_point_mock,
+                                               get_exposed_ports_mock,
+                                               get_image_mock):
+
+        image = "image"
+        ports = {"a": "b"}
+        entry = [1, 2, 3]
+        expected_cmd = [self.handler]
+
+        get_image_mock.return_value = image
+        get_exposed_ports_mock.return_value = ports
+        get_entry_point_mock.return_value = entry
+
+        container = LambdaContainer(self.runtime,
+                                    self.handler,
+                                    self.code_dir,
+                                    env_vars=self.env_var,
+                                    memory_mb=self.memory_mb,
+                                    debug_port=self.debug_port,
+                                    debug_args=self.debug_arg)
+
+        self.assertEquals(image, container._image)
+        self.assertEquals(expected_cmd, container._cmd)
+        self.assertEquals("/var/task", container._working_dir)
+        self.assertEquals(self.code_dir, container._host_dir)
+        self.assertEquals(ports, container._exposed_ports)
+        self.assertEquals(entry, container._entrypoint)
+        self.assertEquals(self.env_var, container._env_vars)
+        self.assertEquals(self.memory_mb, container._memory_limit_mb)
+
+        get_image_mock.assert_called_with(self.runtime)
+        get_exposed_ports_mock.assert_called_with(self.debug_port)
+        get_entry_point_mock.assert_called_with(self.runtime, self.debug_port, self.debug_arg)
+
+    def test_must_fail_for_unsupported_runtime(self):
+
+        runtime = "foo"
+
+        with self.assertRaises(ValueError) as context:
+            LambdaContainer(runtime, self.handler, self.code_dir)
+
+        self.assertEquals(str(context.exception), "Unsupported Lambda runtime foo")
+
+
+class TestLambdaContainer_get_exposed_ports(TestCase):
+
+    def test_must_map_same_port_on_host_and_container(self):
+
+        port = 12345
+        expected = {port: port}
+        result = LambdaContainer._get_exposed_ports(port)
+
+        self.assertEquals(expected, result)
+
+    def test_must_skip_if_port_is_not_given(self):
+
+        self.assertIsNone(LambdaContainer._get_exposed_ports(None), "No ports should be exposed")
+
+
+class TestLambdaContainer_get_image(TestCase):
+
+    def test_must_return_lambci_image(self):
+
+        runtime = "foo"
+        expected = "lambci/lambda:foo"
+
+        self.assertEquals(LambdaContainer._get_image(runtime), expected)
+
+
+class TestLambdaContainer_get_entry_point(TestCase):
+
+    def setUp(self):
+
+        self.debug_port = 1235
+        self.debug_args = "a=b c=d e=f"
+
+    def test_must_skip_if_debug_port_is_not_specified(self):
+        self.assertIsNone(LambdaContainer._get_entry_point("runtime", None, self.debug_args),
+                          "Must not provide entrypoint if debug port is not given")
+
+    @parameterized.expand([param(r) for r in ALL_RUNTIMES])
+    def test_must_provide_entrypoint_for_certain_runtimes_only(self, runtime):
+
+        result = LambdaContainer._get_entry_point(runtime, self.debug_port, self.debug_args)
+
+        if runtime in RUNTIMES_WITH_ENTRYPOINT:
+            self.assertIsNotNone(result, "{} runtime must provide entrypoint".format(runtime))
+        else:
+            self.assertIsNone(result, "{} runtime must NOT provide entrypoint".format(runtime))
+
+    @parameterized.expand([param(r) for r in RUNTIMES_WITH_ENTRYPOINT])
+    def test_debug_arg_must_be_split_by_spaces_and_appended_to_entrypoint(self, runtime):
+        """
+        Debug args list is appended starting at second position in the array
+        """
+        expected_debug_args = ["a=b", "c=d", "e=f"]
+        result = LambdaContainer._get_entry_point(runtime, self.debug_port, self.debug_args)
+        actual = result[1:4]
+
+        self.assertEquals(actual, expected_debug_args)
+
+    @parameterized.expand([param(r) for r in RUNTIMES_WITH_ENTRYPOINT])
+    def test_must_provide_entrypoint_even_without_debug_args(self, runtime):
+
+        result = LambdaContainer._get_entry_point(runtime, self.debug_port)
+
+        self.assertIsNotNone(result)
diff --git a/tests/unit/local/docker/test_manager.py b/tests/unit/local/docker/test_manager.py
new file mode 100644
index 0000000000..c82fb0fbee
--- /dev/null
+++ b/tests/unit/local/docker/test_manager.py
@@ -0,0 +1,185 @@
+"""
+Tests container manager
+"""
+
+import io
+
+from unittest import TestCase
+from mock import Mock
+from docker.errors import ImageNotFound
+from samcli.local.docker.manager import ContainerManager, DockerImageNotFoundException
+
+
+class TestContainerManager_init(TestCase):
+
+    def test_must_initialize_with_default_value(self):
+
+        manager = ContainerManager()
+        self.assertFalse(manager.skip_pull_image)
+
+
+class TestContainerManager_run(TestCase):
+
+    def setUp(self):
+        self.mock_docker_client = Mock()
+        self.manager = ContainerManager(docker_client=self.mock_docker_client)
+
+        self.image_name = "image name"
+        self.container_mock = Mock()
+        self.container_mock.image = self.image_name
+        self.container_mock.start = Mock()
+        self.container_mock.create = Mock()
+        self.container_mock.is_created = Mock()
+
+    def test_must_error_with_warm(self):
+
+        with self.assertRaises(ValueError):
+            self.manager.run(self.container_mock, warm=True)
+
+    def test_must_pull_image_and_run_container(self):
+        input_data = "input data"
+
+        self.manager.has_image = Mock()
+        self.manager.pull_image = Mock()
+
+        # Assume the image doesn't exist.
+        self.manager.has_image.return_value = False
+
+        self.manager.run(self.container_mock, input_data)
+
+        self.manager.has_image.assert_called_with(self.image_name)
+        self.manager.pull_image.assert_called_with(self.image_name)
+        self.container_mock.start.assert_called_with(input_data=input_data)
+
+    def test_must_pull_image_if_image_exist_and_no_skip(self):
+        input_data = "input data"
+
+        self.manager.has_image = Mock()
+        self.manager.pull_image = Mock()
+
+        # Assume the image exist.
+        self.manager.has_image.return_value = True
+        # And, don't skip pulling => Pull again
+        self.manager.skip_pull_image = False
+
+        self.manager.run(self.container_mock, input_data)
+
+        self.manager.has_image.assert_called_with(self.image_name)
+        self.manager.pull_image.assert_called_with(self.image_name)
+        self.container_mock.start.assert_called_with(input_data=input_data)
+
+    def test_must_not_pull_image_if_asked_to_skip(self):
+        input_data = "input data"
+
+        self.manager.has_image = Mock()
+        self.manager.pull_image = Mock()
+
+        # Assume the image exist.
+        self.manager.has_image.return_value = True
+        # And, skip pulling
+        self.manager.skip_pull_image = True
+
+        self.manager.run(self.container_mock, input_data)
+
+        self.manager.has_image.assert_called_with(self.image_name)
+        # Must not call pull_image
+        self.manager.pull_image.assert_not_called()
+        self.container_mock.start.assert_called_with(input_data=input_data)
+
+    def test_must_create_container_if_not_exists(self):
+        input_data = "input data"
+        self.manager.has_image = Mock()
+        self.manager.pull_image = Mock()
+
+        # Assume container does NOT exist
+        self.container_mock.is_created.return_value = False
+
+        self.manager.run(self.container_mock, input_data)
+
+        # Container should be created
+        self.container_mock.create.assert_called_with()
+
+    def test_must_not_create_container_if_it_already_exists(self):
+        input_data = "input data"
+        self.manager.has_image = Mock()
+        self.manager.pull_image = Mock()
+
+        # Assume container does NOT exist
+        self.container_mock.is_created.return_value = True
+
+        self.manager.run(self.container_mock, input_data)
+
+        # Container should be created
+        self.container_mock.create.assert_not_called()
+
+
+class TestContainerManager_pull_image(TestCase):
+
+    def setUp(self):
+        self.image_name = "image name"
+
+        self.mock_docker_client = Mock()
+        self.mock_docker_client.api = Mock()
+        self.mock_docker_client.api.pull = Mock()
+
+        self.manager = ContainerManager(docker_client=self.mock_docker_client)
+
+    def test_must_pull_and_print_progress_dots(self):
+
+        stream = io.StringIO()
+        pull_result = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0]
+        self.mock_docker_client.api.pull.return_value = pull_result
+        expected_stream_output = "\nFetching {} Docker container image...{}\n".format(
+            self.image_name,
+            '.' * len(pull_result)  # Progress bar will print one dot per response from pull API
+        )
+
+        self.manager.pull_image(self.image_name, stream=stream)
+
+        self.mock_docker_client.api.pull.assert_called_with(self.image_name,
+                                                            stream=True,
+                                                            decode=True)
+        self.assertEquals(stream.getvalue(), expected_stream_output)
+
+    def test_must_raise_if_image_not_found(self):
+        msg = "some error"
+        self.mock_docker_client.api.pull.side_effect = ImageNotFound(msg)
+
+        with self.assertRaises(DockerImageNotFoundException) as context:
+            self.manager.pull_image("imagename")
+
+        ex = context.exception
+        self.assertEquals(str(ex), msg)
+
+
+class TestContainerManager_has_image(TestCase):
+
+    def setUp(self):
+        self.image_name = "image name"
+
+        self.mock_docker_client = Mock()
+        self.mock_docker_client.images = Mock()
+        self.mock_docker_client.images.get = Mock()
+
+        self.manager = ContainerManager(docker_client=self.mock_docker_client)
+
+    def test_must_find_an_image(self):
+
+        self.assertTrue(self.manager.has_image(self.image_name))
+
+    def test_must_not_find_image(self):
+
+        self.mock_docker_client.images.get.side_effect = ImageNotFound("test")
+        self.assertFalse(self.manager.has_image(self.image_name))
+
+
+class TestContainerManager_stop(TestCase):
+
+    def test_must_call_delete_on_container(self):
+
+        manager = ContainerManager()
+        container = Mock()
+        container.delete = Mock()
+
+        manager.stop(container)
+        container.delete.assert_called_with()
diff --git a/tests/unit/local/events/__init__.py b/tests/unit/local/events/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/local/events/test_api_event.py b/tests/unit/local/events/test_api_event.py
new file mode 100644
index 0000000000..e47c9e48c2
--- /dev/null
+++ b/tests/unit/local/events/test_api_event.py
@@ -0,0 +1,282 @@
+from unittest import TestCase
+from mock import Mock
+
+from samcli.local.events.api_event import ContextIdentity, RequestContext, ApiGatewayLambdaEvent
+
+
+class TestContextIdentity(TestCase):
+
+    def test_class_initialized(self):
+        identity = ContextIdentity('api_key',
+                                   'user_arn',
+                                   'cognito_authentication_type',
+                                   'caller',
+                                   'user_agent',
+                                   'user',
+                                   'cognito_identity_pool_id',
+                                   'cognito_authentication_provider',
+                                   'source_ip',
+                                   'account_id'
+                                   )
+
+        self.assertEquals(identity.api_key, 'api_key')
+        self.assertEquals(identity.user_arn, 'user_arn')
+        self.assertEquals(identity.cognito_authentication_type, 'cognito_authentication_type')
+        self.assertEquals(identity.caller, 'caller')
+        self.assertEquals(identity.user_agent, 'user_agent')
+        self.assertEquals(identity.user, 'user')
+        self.assertEquals(identity.cognito_identity_pool_id, 'cognito_identity_pool_id')
+        self.assertEquals(identity.cognito_authentication_provider, 'cognito_authentication_provider')
+        self.assertEquals(identity.source_ip, 'source_ip')
+        self.assertEquals(identity.account_id, 'account_id')
+
+    def test_to_dict(self):
+        identity = ContextIdentity('api_key',
+                                   'user_arn',
+                                   'cognito_authentication_type',
+                                   'caller',
+                                   'user_agent',
+                                   'user',
+                                   'cognito_identity_pool_id',
+                                   'cognito_authentication_provider',
+                                   'source_ip',
+                                   'account_id'
+                                   )
+
+        expected = {"apiKey": "api_key",
+                    "userArn": "user_arn",
+                    "cognitoAuthenticationType": "cognito_authentication_type",
+                    "caller": "caller",
+                    "userAgent": "user_agent",
+                    "user": "user",
+                    "cognitoIdentityPoolId": "cognito_identity_pool_id",
+                    "cognitoAuthenticationProvider": "cognito_authentication_provider",
+                    "sourceIp": "source_ip",
+                    "accountId": "account_id"
+                    }
+
+        self.assertEquals(identity.to_dict(), expected)
+
+    def test_to_dict_with_defaults(self):
+        identity = ContextIdentity()
+
+        expected = {"apiKey": None,
+                    "userArn": None,
+                    "cognitoAuthenticationType": None,
+                    "caller": None,
+                    "userAgent": "Custom User Agent String",
+                    "user": None,
+                    "cognitoIdentityPoolId": None,
+                    "cognitoAuthenticationProvider": None,
+                    "sourceIp": "127.0.0.1",
+                    "accountId": None
+                    }
+
+        self.assertEquals(identity.to_dict(), expected)
+
+
+class TestRequestContext(TestCase):
+
+    def test_class_initialized(self):
+        identity_mock = Mock()
+
+        request_context = RequestContext('resource_id',
+                                         'api_id',
+                                         'request_path',
+                                         'request_method',
+                                         'request_id',
+                                         'account_id',
+                                         'prod',
+                                         identity_mock,
+                                         'extended_request_id',
+                                         'path'
+                                         )
+
+        self.assertEquals(request_context.resource_id, 'resource_id')
+        self.assertEquals(request_context.api_id, 'api_id')
+        self.assertEquals(request_context.resource_path, 'request_path')
+        self.assertEquals(request_context.http_method, 'request_method')
+        self.assertEquals(request_context.request_id, 'request_id')
+        self.assertEquals(request_context.account_id, 'account_id')
+        self.assertEquals(request_context.stage, 'prod')
+        self.assertEquals(request_context.identity, identity_mock)
+        self.assertEquals(request_context.extended_request_id, 'extended_request_id')
+        self.assertEquals(request_context.path, 'path')
+
+    def test_to_dict(self):
+        identity_mock = Mock()
+        identity_mock.to_dict.return_value = {"identity": "the identity"}
+
+        request_context = RequestContext('resource_id',
+                                         'api_id',
+                                         'request_path',
+                                         'request_method',
+                                         'request_id',
+                                         'account_id',
+                                         'prod',
+                                         identity_mock,
+                                         'extended_request_id',
+                                         'path'
+                                         )
+
+        expected = {"resourceId": "resource_id",
+                    "apiId": "api_id",
+                    "resourcePath": "request_path",
+                    "httpMethod": "request_method",
+                    "requestId": "request_id",
+                    "accountId": "account_id",
+                    "stage": "prod",
+                    "identity": {"identity": "the identity"},
+                    "extendedRequestId": "extended_request_id",
+                    "path": "path"
+                    }
+
+        self.assertEquals(request_context.to_dict(), expected)
+
+    def test_to_dict_with_defaults(self):
+        request_context = RequestContext()
+
+        expected = {"resourceId": "123456",
+                    "apiId": "1234567890",
+                    "resourcePath": None,
+                    "httpMethod": None,
+                    "requestId": "c6af9ac6-7b61-11e6-9a41-93e8deadbeef",
+                    "accountId": "123456789012",
+                    "stage": None,
+                    "identity": {},
+                    "extendedRequestId": None,
+                    "path": None
+                    }
+
+        self.assertEquals(request_context.to_dict(), expected)
+
+
+class TestApiGatewayLambdaEvent(TestCase):
+
+    def test_class_initialized(self):
+        event = ApiGatewayLambdaEvent('request_method',
+                                      'request_data',
+                                      'resource',
+                                      'request_context',
+                                      {"query": "some query"},
+                                      {"header_key": "value"},
+                                      {"param": "some param"},
+                                      {"stage_vars": "some vars"},
+                                      'request_path',
+                                      False
+                                      )
+
+        self.assertEquals(event.http_method, 'request_method')
+        self.assertEquals(event.body, 'request_data')
+        self.assertEquals(event.resource, 'resource')
+        self.assertEquals(event.request_context, 'request_context')
+        self.assertEquals(event.query_string_params, {"query": "some query"})
+        self.assertEquals(event.headers, {"header_key": "value"})
+        self.assertEquals(event.path_parameters, {"param": "some param"})
+        self.assertEquals(event.stage_variables, {"stage_vars": "some vars"})
+        self.assertEquals(event.path, 'request_path')
+        self.assertEquals(event.is_base_64_encoded, False)
+
+    def test_to_dict(self):
+        request_context_mock = Mock()
+        request_context_mock.to_dict.return_value = {"request_context": "the request context"}
+
+        event = ApiGatewayLambdaEvent('request_method',
+                                      'request_data',
+                                      'resource',
+                                      request_context_mock,
+                                      {"query": "some query"},
+                                      {"header_key": "value"},
+                                      {"param": "some param"},
+                                      {"stagevars": "some vars"},
+                                      'request_path',
+                                      False
+                                      )
+
+        expected = {"httpMethod": "request_method",
+                    "body": "request_data",
+                    "resource": "resource",
+                    "requestContext": {"request_context": "the request context"},
+                    "queryStringParameters": {"query": "some query"},
+                    "headers": {"header_key": "value"},
+                    "pathParameters": {"param": "some param"},
+                    "stageVariables": {"stagevars": "some vars"},
+                    "path": "request_path",
+                    "isBase64Encoded": False
+                    }
+
+        self.assertEquals(event.to_dict(), expected)
+
+    def test_to_dict_with_defaults(self):
+        event = ApiGatewayLambdaEvent()
+
+        expected = {"httpMethod": None,
+                    "body": None,
+                    "resource": None,
+                    "requestContext": {},
+                    "queryStringParameters": None,
+                    "headers": None,
+                    "pathParameters": None,
+                    "stageVariables": None,
+                    "path": None,
+                    "isBase64Encoded": False
+                    }
+
+        self.assertEquals(event.to_dict(), expected)
+
+    def test_init_with_invalid_query_string_params(self):
+        with self.assertRaises(TypeError):
+            ApiGatewayLambdaEvent('request_method',
+                                  'request_data',
+                                  'resource',
+                                  'request_context',
+                                  "not a dict",
+                                  {"header_key": "value"},
+                                  {"param": "some param"},
+                                  {"stage_vars": "some vars"},
+                                  'request_path',
+                                  False
+                                  )
+
+    def test_init_with_invalid_headers(self):
+        with self.assertRaises(TypeError):
+            ApiGatewayLambdaEvent('request_method',
+                                  'request_data',
+                                  'resource',
+                                  'request_context',
+                                  {"query": "some query"},
+                                  "not EnvironHeaders",
+                                  {"param": "some param"},
+                                  {"stage_vars": "some vars"},
+                                  'request_path',
+                                  False
+                                  )
+
+    def test_init_with_invalid_path_parameters(self):
+        with self.assertRaises(TypeError):
+            ApiGatewayLambdaEvent('request_method',
+                                  'request_data',
+                                  'resource',
+                                  'request_context',
+                                  {"query": "some query"},
+                                  {"header_key": "value"},
+                                  "Not a dict",
+                                  {"stage_vars": "some vars"},
+                                  'request_path',
+                                  False
+                                  )
+
+    def test_init_with_invalid_stage_variables(self):
+        with self.assertRaises(TypeError):
+
+            ApiGatewayLambdaEvent('request_method',
+                                  'request_data',
+                                  'resource',
+                                  'request_context',
+                                  {"query": "some query"},
+                                  {"header_key": "value"},
+                                  {"param": "some param"},
+                                  "Not a dict",
+                                  'request_path',
+                                  False
+                                  )
diff --git a/tests/unit/local/init/__init__.py b/tests/unit/local/init/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/local/init/test_init.py b/tests/unit/local/init/test_init.py
new file mode 100644
index 0000000000..4e79db081e
--- /dev/null
+++ b/tests/unit/local/init/test_init.py
@@ -0,0 +1,77 @@
+from unittest import TestCase
+from mock import patch
+
+from cookiecutter.exceptions import CookiecutterException
+from samcli.local.init import generate_project
+from samcli.local.init import GenerateProjectFailedError
+from samcli.local.init import RUNTIME_TEMPLATE_MAPPING
+
+
+class TestInit(TestCase):
+
+    def setUp(self):
+        self.location = None
+        self.runtime = "python3.6"
+        self.output_dir = "."
+        self.name = "testing project"
+        self.no_input = True
+        self.extra_context = {'project_name': 'testing project', "runtime": self.runtime}
+        self.template = RUNTIME_TEMPLATE_MAPPING[self.runtime]
+
+    @patch("samcli.local.init.cookiecutter")
+    def test_init_successful(self, cookiecutter_patch):
+        # GIVEN generate_project successfully created a project
+        # WHEN a project name has been passed
+        generate_project(
+            location=self.location, runtime=self.runtime, output_dir=self.output_dir,
+            name=self.name, no_input=self.no_input)
+
+        # THEN we should receive no errors
+        cookiecutter_patch.assert_called_once_with(
+                extra_context=self.extra_context, no_input=self.no_input,
+                output_dir=self.output_dir, template=self.template)
+
+    @patch("samcli.local.init.cookiecutter")
+    def test_when_generate_project_returns_error(self, cookiecutter_patch):
+
+        # GIVEN generate_project fails to create a project
+        ex = CookiecutterException("something is wrong")
+        cookiecutter_patch.side_effect = ex
+
+        expected_msg = str(GenerateProjectFailedError(project=self.name, provider_error=ex))
+
+        # WHEN generate_project returns an error
+        # THEN we should receive a GenerateProjectFailedError Exception
+        with self.assertRaises(GenerateProjectFailedError) as ctx:
+            generate_project(
+                    location=self.location, runtime=self.runtime,
+                    output_dir=self.output_dir, name=self.name, no_input=self.no_input)
+
+        self.assertEquals(expected_msg, str(ctx.exception))
+
+    @patch("samcli.local.init.cookiecutter")
+    def test_must_not_set_name_when_location_is_given(self, cookiecutter_patch):
+        generate_project(runtime=self.runtime, output_dir=self.output_dir,
+                         name=self.name, no_input=False)
+
+        expected_extra_content = {
+            "project_name": self.name,
+            "runtime": self.runtime
+        }
+        # THEN we should receive no errors
+        cookiecutter_patch.assert_called_once_with(
+                template=self.template,
+                extra_context=expected_extra_content, no_input=True,
+                output_dir=self.output_dir)
+
+    @patch("samcli.local.init.cookiecutter")
+    def test_must_not_set_extra_content(self, cookiecutter_patch):
+        custom_location = "mylocation"
+        generate_project(location=custom_location,
+                         runtime=self.runtime, output_dir=self.output_dir,
+                         name=self.name, no_input=False)
+
+        # THEN we should receive no errors
+        cookiecutter_patch.assert_called_once_with(
+                template=custom_location, no_input=False,
+                output_dir=self.output_dir)
diff --git a/tests/unit/local/lambdafn/__init__.py b/tests/unit/local/lambdafn/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit/local/lambdafn/test_config.py b/tests/unit/local/lambdafn/test_config.py
new file mode 100644
index 0000000000..f52b5d45eb
--- /dev/null
+++ b/tests/unit/local/lambdafn/test_config.py
@@ -0,0 +1,51 @@
+
+from unittest import TestCase
+from mock import Mock
+
+from samcli.local.lambdafn.config import FunctionConfig
+
+
+class TestFunctionConfig(TestCase):
+
+    DEFAULT_MEMORY = 128
+    DEFAULT_TIMEOUT = 3
+
+    def setUp(self):
+        self.name = "name"
+        self.runtime = "runtime"
+        self.handler = "handler"
+        self.code_path = "codepath"
+        self.memory = 1234
+        self.timeout = 34
+        self.env_vars_mock = Mock()
+
+    def test_init_with_env_vars(self):
+        config = FunctionConfig(self.name, self.runtime, self.handler, self.code_path,
+                                memory=self.memory, timeout=self.timeout, env_vars=self.env_vars_mock)
+
+        self.assertEquals(config.name, self.name)
+        self.assertEquals(config.runtime, self.runtime)
+        self.assertEquals(config.handler, self.handler)
+        self.assertEquals(config.code_abs_path, self.code_path)
+        self.assertEquals(config.memory, self.memory)
+        self.assertEquals(config.timeout, self.timeout)
+        self.assertEquals(config.env_vars, self.env_vars_mock)
+
+        self.assertEquals(self.env_vars_mock.handler, self.handler)
+        self.assertEquals(self.env_vars_mock.memory, self.memory)
+        self.assertEquals(self.env_vars_mock.timeout, self.timeout)
+
+    def test_init_without_optional_values(self):
+        config = FunctionConfig(self.name, self.runtime, self.handler, self.code_path)
+
+        self.assertEquals(config.name, self.name)
+        self.assertEquals(config.runtime, self.runtime)
+        self.assertEquals(config.handler, self.handler)
+        self.assertEquals(config.code_abs_path, self.code_path)
+        self.assertEquals(config.memory, self.DEFAULT_MEMORY)
+        self.assertEquals(config.timeout, self.DEFAULT_TIMEOUT)
+        self.assertIsNotNone(config.env_vars)
+
+        self.assertEquals(config.env_vars.handler, self.handler)
+        self.assertEquals(config.env_vars.memory, self.DEFAULT_MEMORY)
+        self.assertEquals(config.env_vars.timeout, self.DEFAULT_TIMEOUT)
diff --git a/tests/unit/local/lambdafn/test_env_vars.py b/tests/unit/local/lambdafn/test_env_vars.py
new file mode 100644
index 0000000000..0b67355bc7
--- /dev/null
+++ b/tests/unit/local/lambdafn/test_env_vars.py
@@ -0,0 +1,343 @@
+"""
+Test for environment variable handling
+"""
+
+from parameterized import parameterized, param
+from unittest import TestCase
+from samcli.local.lambdafn.env_vars import EnvironmentVariables
+
+
+class TestEnvironmentVariables_init(TestCase):
+
+    def test_must_initialize_with_empty_values(self):
+
+        memory = 123
+        timeout = 10
+        handler = "handler"
+
+        environ = EnvironmentVariables()
+        environ.memory = memory
+        environ.timeout = timeout
+        environ.handler = handler
+
+        self.assertEquals(environ.memory, memory)
+        self.assertEquals(environ.timeout, timeout)
+        self.assertEquals(environ.handler, handler)
+
+    def test_must_initialize_values_with_required_values(self):
+        memory = 123
+        timeout = 10
+        handler = "handler"
+
+        environ = EnvironmentVariables(memory, timeout, handler)
+        self.assertEquals(environ.memory, memory)
+        self.assertEquals(environ.timeout, timeout)
+        self.assertEquals(environ.handler, handler)
+        self.assertEquals(environ.variables, {})
+        self.assertEquals(environ.shell_env_values, {})
+        self.assertEquals(environ.override_values, {})
+        self.assertEquals(environ.aws_creds, {})
+
+    def test_must_initialize_with_optional_values(self):
+        memory = 123
+        timeout = 10
+        handler = "handler"
+        variables = {"a": "b"}
+        shell_values = {"c": "d"}
+        overrides = {"e": "f"}
+        aws_creds = {"g": "h"}
+
+        environ = EnvironmentVariables(memory, timeout, handler,
+                                       variables=variables,
+                                       shell_env_values=shell_values,
+                                       override_values=overrides,
+                                       aws_creds=aws_creds)
+
+        self.assertEquals(environ.variables, {"a": "b"})
+        self.assertEquals(environ.shell_env_values, {"c": "d"})
+        self.assertEquals(environ.override_values, {"e": "f"})
+        self.assertEquals(environ.aws_creds, {"g": "h"})
+
+
+class TestEnvironmentVariables_resolve(TestCase):
+
+    def setUp(self):
+        self.memory = 1024
+        self.timeout = 123
+        self.handler = "handler"
+
+        self.aws_creds = {
+            "region": "some region",
+            "key": "some key",
+            "secret": "some other secret",
+            "sessiontoken": "some other token"
+        }
+
+        self.variables = {
+            "variable1": 1,
+            "variable2": "mystring",
+
+            "list_var": [1, 2, 3],
+            "dict_var": {"a": {"b": "c"}},
+            "none_var": None,
+            "true_var": True,
+            "false_var": False,
+
+            # We should be able to override AWS_*  values
+            "AWS_DEFAULT_REGION": "user-specified-region"
+        }
+
+        self.shell_env = {
+            # This variable is not defined in self.variables. So won't show up in resutlt
+            "myothervar": "somevalue",
+
+            "variable1": "variable1 value from shell_env"
+        }
+
+        self.override = {
+            # This variable is not defined in self.variables. So won't show up in resutlt
+            "unknown_var": "newvalue",
+
+            "variable1": "variable1 value from overrides",
+            "list_var": "list value coming from overrides"
+        }
+
+    def test_with_no_additional_variables(self):
+        """
+        Test assuming user has *not* passed any environment variables. Only AWS variables should be setup
+        """
+
+        expected = {
+            "AWS_SAM_LOCAL": "true",
+            "AWS_LAMBDA_FUNCTION_MEMORY_SIZE": "1024",
+            "AWS_LAMBDA_FUNCTION_TIMEOUT": "123",
+            "AWS_LAMBDA_FUNCTION_HANDLER": "handler",
+            "AWS_REGION": "some region",
+            "AWS_DEFAULT_REGION": "some region",
+            "AWS_ACCESS_KEY_ID": "some key",
+            "AWS_SECRET_ACCESS_KEY": "some other secret",
+            "AWS_SESSION_TOKEN": "some other token"
+        }
+
+        environ = EnvironmentVariables(self.memory, self.timeout, self.handler, aws_creds=self.aws_creds)
+
+        result = environ.resolve()
+
+        # With no additional environment variables, resolve() should just return all AWS variables
+        self.assertEquals(result, expected)
+
+    def test_with_only_default_values_for_variables(self):
+        """
+        Given only environment variable values, without any shell env values or overridden values
+        """
+
+        expected = {
+            "AWS_SAM_LOCAL": "true",
+            "AWS_LAMBDA_FUNCTION_MEMORY_SIZE": "1024",
+            "AWS_LAMBDA_FUNCTION_TIMEOUT": "123",
+            "AWS_LAMBDA_FUNCTION_HANDLER": "handler",
+            "AWS_REGION": "us-east-1",
+            "AWS_ACCESS_KEY_ID": "defaultkey",
+            "AWS_SECRET_ACCESS_KEY": "defaultsecret",
+
+            # This value is coming from user passed environment variable
+            "AWS_DEFAULT_REGION": "user-specified-region",
+            "variable1": "1",
+            "variable2": "mystring",
+
+            "list_var": "",
+            "dict_var": "",
+            "none_var": "",
+            "true_var": "true",
+            "false_var": "false"
+        }
+
+        environ = EnvironmentVariables(self.memory, self.timeout, self.handler,
+                                       variables=self.variables)
+
+        self.assertEquals(environ.resolve(), expected)
+
+    def test_with_shell_env_value(self):
+        """
+        Given values for the variables from shell environment
+        """
+
+        expected = {
+            "AWS_SAM_LOCAL": "true",
+            "AWS_LAMBDA_FUNCTION_MEMORY_SIZE": "1024",
+            "AWS_LAMBDA_FUNCTION_TIMEOUT": "123",
+            "AWS_LAMBDA_FUNCTION_HANDLER": "handler",
+            "AWS_REGION": "us-east-1",
+            "AWS_ACCESS_KEY_ID": "defaultkey",
+            "AWS_SECRET_ACCESS_KEY": "defaultsecret",
+
+            # This value is coming from user passed environment variable
+            "AWS_DEFAULT_REGION": "user-specified-region",
+
+            # Value coming from the shell
+            "variable1": "variable1 value from shell_env",
+            "variable2": "mystring",
+
+            "list_var": "",
+            "dict_var": "",
+            "none_var": "",
+            "true_var": "true",
+            "false_var": "false"
+        }
+
+        environ = EnvironmentVariables(self.memory, self.timeout, self.handler,
+                                       variables=self.variables,
+                                       shell_env_values=self.shell_env)
+
+        self.assertEquals(environ.resolve(), expected)
+
+    def test_with_overrides_value(self):
+        """
+        Given values for the variables from user specified overrides
+        """
+
+        expected = {
+            "AWS_SAM_LOCAL": "true",
+            "AWS_LAMBDA_FUNCTION_MEMORY_SIZE": "1024",
+            "AWS_LAMBDA_FUNCTION_TIMEOUT": "123",
+            "AWS_LAMBDA_FUNCTION_HANDLER": "handler",
+            "AWS_REGION": "us-east-1",
+            "AWS_ACCESS_KEY_ID": "defaultkey",
+            "AWS_SECRET_ACCESS_KEY": "defaultsecret",
+
+            # This value is coming from user passed environment variable
+            "AWS_DEFAULT_REGION": "user-specified-region",
+
+            "variable2": "mystring",
+
+            # Value coming from the overrides
+            "variable1": "variable1 value from overrides",
+            "list_var": "list value coming from overrides",
+
+            "dict_var": "",
+            "none_var": "",
+            "true_var": "true",
+            "false_var": "false"
+        }
+
+        environ = EnvironmentVariables(self.memory, self.timeout, self.handler,
+                                       variables=self.variables,
+                                       shell_env_values=self.shell_env,
+                                       override_values=self.override)
+
+        self.assertEquals(environ.resolve(), expected)
+
+
+class TestEnvironmentVariables_get_aws_variables(TestCase):
+
+    def setUp(self):
+        self.memory = 1024
+        self.timeout = 123
+        self.handler = "handler"
+
+        self.aws_creds = {
+            "region": "some region",
+            "key": "some key",
+            "secret": "some other secret",
+            "sessiontoken": "some other token"
+        }
+
+    def test_must_work_with_overridden_aws_creds(self):
+
+        expected = {
+            "AWS_SAM_LOCAL": "true",
+            "AWS_LAMBDA_FUNCTION_MEMORY_SIZE": "1024",
+            "AWS_LAMBDA_FUNCTION_TIMEOUT": "123",
+            "AWS_LAMBDA_FUNCTION_HANDLER": "handler",
+            "AWS_REGION": "some region",
+            "AWS_DEFAULT_REGION": "some region",
+            "AWS_ACCESS_KEY_ID": "some key",
+            "AWS_SECRET_ACCESS_KEY": "some other secret",
+            "AWS_SESSION_TOKEN": "some other token"
+        }
+
+        environ = EnvironmentVariables(self.memory, self.timeout, self.handler, aws_creds=self.aws_creds)
+
+        self.assertEquals(expected, environ._get_aws_variables())
+
+    def test_must_work_without_any_aws_creds(self):
+
+        expected = {
+            "AWS_SAM_LOCAL": "true",
+            "AWS_LAMBDA_FUNCTION_MEMORY_SIZE": "1024",
+            "AWS_LAMBDA_FUNCTION_TIMEOUT": "123",
+            "AWS_LAMBDA_FUNCTION_HANDLER": "handler",
+
+            # Default values assigned to these variables
+            "AWS_REGION": "us-east-1",
+            "AWS_DEFAULT_REGION": "us-east-1",
+            "AWS_ACCESS_KEY_ID": "defaultkey",
+            "AWS_SECRET_ACCESS_KEY": "defaultsecret",
+        }
+
+        environ = EnvironmentVariables(self.memory, self.timeout, self.handler)
+        self.assertEquals(expected, environ._get_aws_variables())
+
+    def test_must_work_with_partial_aws_creds(self):
+
+        creds = {
+            "region": "some other region",
+            "sessiontoken": "my awesome token"
+        }
+
+        expected = {
+            "AWS_SAM_LOCAL": "true",
+            "AWS_LAMBDA_FUNCTION_MEMORY_SIZE": "1024",
+            "AWS_LAMBDA_FUNCTION_TIMEOUT": "123",
+            "AWS_LAMBDA_FUNCTION_HANDLER": "handler",
+
+            # Values from the input creds
+            "AWS_REGION": "some other region",
+            "AWS_DEFAULT_REGION": "some other region",
+            "AWS_SESSION_TOKEN": "my awesome token",
+
+            # These variables still get the default value
+            "AWS_ACCESS_KEY_ID": "defaultkey",
+            "AWS_SECRET_ACCESS_KEY": "defaultsecret",
+        }
+
+        environ = EnvironmentVariables(self.memory, self.timeout, self.handler, aws_creds=creds)
+        self.assertEquals(expected, environ._get_aws_variables())
+
+
+class TestEnvironmentVariables_stringify_value(TestCase):
+
+    def setUp(self):
+
+        self.environ = EnvironmentVariables(1024, 10, "handler")
+
+    @parameterized.expand([
+        param([1, 2, 3]),
+        param({"a": {"b": "c"}}),
+        param(("this", "is", "tuple")),
+        param(None)
+    ])
+    def test_must_replace_non_scalar_with_blank_values(self, input):
+        self.assertEquals("", self.environ._stringify_value(input))
+
+    @parameterized.expand([
+        (True, "true"),
+        (False, "false"),
+        (1234, "1234"),
+        (3.14, "3.14"),
+        ("mystring", "mystring"),
+    ])
+    def test_must_stringify(self, input, expected):
+        self.assertEquals(expected, self.environ._stringify_value(input))
+
+
+class TestEnvironmentVariables_add_lambda_event_body(TestCase):
+
+    def test_must_add_proper_variable(self):
+
+        value = "foobar"
+
+        environ = EnvironmentVariables()
+        environ.add_lambda_event_body(value)
+
+        self.assertEquals(environ.variables.get("AWS_LAMBDA_EVENT_BODY"), value)
diff --git a/tests/unit/local/lambdafn/test_runtime.py b/tests/unit/local/lambdafn/test_runtime.py
new file mode 100644
index 0000000000..f77716c8c2
--- /dev/null
+++ b/tests/unit/local/lambdafn/test_runtime.py
@@ -0,0 +1,358 @@
+"""
+Unit tests for Lambda runtime
+"""
+
+from unittest import TestCase
+from mock import Mock, patch, MagicMock, ANY
+from parameterized import parameterized
+
+from samcli.local.lambdafn.runtime import LambdaRuntime, _unzip_file
+from samcli.local.lambdafn.config import FunctionConfig
+
+
+class LambdaRuntime_invoke(TestCase):
+
+    DEFAULT_MEMORY = 128
+    DEFAULT_TIMEOUT = 3
+
+    def setUp(self):
+
+        self.manager_mock = Mock()
+
+        self.name = "name"
+        self.lang = "runtime"
+        self.handler = "handler"
+        self.code_path = "code-path"
+        self.func_config = FunctionConfig(self.name, self.lang, self.handler, self.code_path)
+
+        self.env_vars = Mock()
+        self.func_config.env_vars = self.env_vars
+        self.env_var_value = {"a": "b"}
+        self.env_vars.resolve.return_value = self.env_var_value
+
+    @patch("samcli.local.lambdafn.runtime.LambdaContainer")
+    def test_must_run_container_and_wait_for_logs(self, LambdaContainerMock):
+        event = "event"
+        debug_port = 123
+        debug_arg = "abc"
+        code_dir = "some code dir"
+        stdout = "stdout"
+        stderr = "stderr"
+        container = Mock()
+        timer = Mock()
+
+        self.runtime = LambdaRuntime(self.manager_mock)
+
+        # Using MagicMock to mock the context manager
+        self.runtime._get_code_dir = MagicMock()
+        self.runtime._get_code_dir(self.code_path).__enter__.return_value = code_dir
+
+        # Configure interrupt handler
+        self.runtime._configure_interrupt = Mock()
+        self.runtime._configure_interrupt.return_value = timer
+
+        LambdaContainerMock.return_value = container
+
+        self.runtime.invoke(self.func_config,
+                            event,
+                            debug_port=debug_port,
+                            debug_args=debug_arg,
+                            stdout=stdout,
+                            stderr=stderr)
+
+        # Verify if Lambda Event data is set
+        self.env_vars.add_lambda_event_body.assert_called_with(event)
+
+        # Make sure env-vars get resolved
+        self.env_vars.resolve.assert_called_with()
+
+        # Make sure the context manager is called to return the code directory
+        self.runtime._get_code_dir.assert_called_with(self.code_path)
+
+        # Make sure the container is created with proper values
+        LambdaContainerMock.assert_called_with(self.lang, self.handler, code_dir,
+                                               memory_mb=self.DEFAULT_MEMORY, env_vars=self.env_var_value,
+                                               debug_port=debug_port, debug_args=debug_arg)
+
+        # Run the container and get results
+        self.manager_mock.run.assert_called_with(container)
+        self.runtime._configure_interrupt.assert_called_with(self.name, self.DEFAULT_TIMEOUT, container, True)
+        container.wait_for_logs.assert_called_with(stdout=stdout, stderr=stderr)
+
+        # Finally block
+        timer.cancel.assert_called_with()
+        self.manager_mock.stop.assert_called_with(container)
+
+    @patch("samcli.local.lambdafn.runtime.LambdaContainer")
+    def test_exception_from_run_must_trigger_cleanup(self, LambdaContainerMock):
+        event = "event"
+        debug_port = 123
+        debug_arg = "abc"
+        code_dir = "some code dir"
+        stdout = "stdout"
+        stderr = "stderr"
+        container = Mock()
+        timer = Mock()
+
+        self.runtime = LambdaRuntime(self.manager_mock)
+
+        # Using MagicMock to mock the context manager
+        self.runtime._get_code_dir = MagicMock()
+        self.runtime._get_code_dir(self.code_path).__enter__.return_value = code_dir
+        self.runtime._configure_interrupt = Mock()
+        self.runtime._configure_interrupt.return_value = timer
+
+        LambdaContainerMock.return_value = container
+
+        self.manager_mock.run.side_effect = ValueError("some exception")
+
+        with self.assertRaises(ValueError):
+            self.runtime.invoke(self.func_config,
+                                event,
+                                debug_port=debug_port,
+                                debug_args=debug_arg,
+                                stdout=stdout,
+                                stderr=stderr)
+
+        # Run the container and get results
+        self.manager_mock.run.assert_called_with(container)
+
+        self.runtime._configure_interrupt.assert_not_called()
+
+        # Finally block must be called
+        # But timer was not yet created. It should not be called
+        timer.cancel.assert_not_called()
+        # In any case, stop the container
+        self.manager_mock.stop.assert_called_with(container)
+
+    @patch("samcli.local.lambdafn.runtime.LambdaContainer")
+    def test_exception_from_wait_for_logs_must_trigger_cleanup(self, LambdaContainerMock):
+        event = "event"
+        debug_port = 123
+        debug_arg = "abc"
+        code_dir = "some code dir"
+        stdout = "stdout"
+        stderr = "stderr"
+        container = Mock()
+        timer = Mock()
+
+        self.runtime = LambdaRuntime(self.manager_mock)
+
+        # Using MagicMock to mock the context manager
+        self.runtime._get_code_dir = MagicMock()
+        self.runtime._get_code_dir(self.code_path).__enter__.return_value = code_dir
+        self.runtime._configure_interrupt = Mock()
+        self.runtime._configure_interrupt.return_value = timer
+
+        LambdaContainerMock.return_value = container
+
+        container.wait_for_logs.side_effect = ValueError("some exception")
+
+        with self.assertRaises(ValueError):
+            self.runtime.invoke(self.func_config,
+                                event,
+                                debug_port=debug_port,
+                                debug_args=debug_arg,
+                                stdout=stdout,
+                                stderr=stderr)
+
+        # Run the container and get results
+        self.manager_mock.run.assert_called_with(container)
+
+        self.runtime._configure_interrupt.assert_called_with(self.name, self.DEFAULT_TIMEOUT, container, True)
+
+        # Finally block must be called
+        # Timer was created. So it must be cancelled
+        timer.cancel.assert_called_with()
+        # In any case, stop the container
+        self.manager_mock.stop.assert_called_with(container)
+
+    @patch("samcli.local.lambdafn.runtime.LambdaContainer")
+    def test_keyboard_interrupt_must_not_raise(self, LambdaContainerMock):
+        event = "event"
+        debug_port = 123
+        debug_arg = "abc"
+        code_dir = "some code dir"
+        stdout = "stdout"
+        stderr = "stderr"
+        container = Mock()
+
+        self.runtime = LambdaRuntime(self.manager_mock)
+
+        # Using MagicMock to mock the context manager
+        self.runtime._get_code_dir = MagicMock()
+        self.runtime._get_code_dir(self.code_path).__enter__.return_value = code_dir
+        self.runtime._configure_interrupt = Mock()
+
+        LambdaContainerMock.return_value = container
+
+        self.manager_mock.run.side_effect = KeyboardInterrupt("some exception")
+
+        self.runtime.invoke(self.func_config,
+                            event,
+                            debug_port=debug_port,
+                            debug_args=debug_arg,
+                            stdout=stdout,
+                            stderr=stderr)
+
+        # Run the container and get results
+        self.manager_mock.run.assert_called_with(container)
+
+        self.runtime._configure_interrupt.assert_not_called()
+
+        # Finally block must be called
+        self.manager_mock.stop.assert_called_with(container)
+
+
+class TestLambdaRuntime_configure_interrupt(TestCase):
+
+    def setUp(self):
+        self.name = "name"
+        self.timeout = 123
+        self.container = Mock()
+
+        self.manager_mock = Mock()
+        self.runtime = LambdaRuntime(self.manager_mock)
+
+    @patch("samcli.local.lambdafn.runtime.threading")
+    @patch("samcli.local.lambdafn.runtime.signal")
+    def test_must_setup_timer(self, SignalMock, ThreadingMock):
+        is_debugging = False  # We are not debugging. So setup timer
+        timer_obj = Mock()
+        ThreadingMock.Timer.return_value = timer_obj
+
+        result = self.runtime._configure_interrupt(self.name, self.timeout, self.container, is_debugging)
+
+        self.assertEquals(result, timer_obj)
+
+        ThreadingMock.Timer.assert_called_with(self.timeout, ANY, ())
+        timer_obj.start.assert_called_with()
+
+        SignalMock.signal.assert_not_called()  # must not setup signal handler
+
+    @patch("samcli.local.lambdafn.runtime.threading")
+    @patch("samcli.local.lambdafn.runtime.signal")
+    def test_must_setup_signal_handler(self, SignalMock, ThreadingMock):
+        is_debugging = True  # We are debugging. So setup signal
+        SignalMock.SIGTERM = sigterm = "sigterm"
+
+        result = self.runtime._configure_interrupt(self.name, self.timeout, self.container, is_debugging)
+
+        self.assertIsNone(result, "There are no return values when setting up signal handler")
+
+        SignalMock.signal.assert_called_with(sigterm, ANY)
+        ThreadingMock.Timer.signal.assert_not_called()  # must not setup timer
+
+    @patch("samcli.local.lambdafn.runtime.threading")
+    @patch("samcli.local.lambdafn.runtime.signal")
+    def test_verify_signal_handler(self, SignalMock, ThreadingMock):
+        """
+        Verify the internal implementation of the Signal Handler
+        """
+        is_debugging = True  # We are debugging. So setup signal
+        SignalMock.SIGTERM = "sigterm"
+
+        # Fake the real method with a Lambda. Also run the handler immediately.
+        SignalMock.signal = lambda term, handler: handler("a", "b")
+
+        self.runtime._configure_interrupt(self.name, self.timeout, self.container, is_debugging)
+
+        # This method should be called from within the Signal Handler
+        self.manager_mock.stop.assert_called_with(self.container)
+
+    @patch("samcli.local.lambdafn.runtime.threading")
+    @patch("samcli.local.lambdafn.runtime.signal")
+    def test_verify_timer_handler(self, SignalMock, ThreadingMock):
+        """
+        Verify the internal implementation of the Signal Handler
+        """
+        is_debugging = False
+
+        def fake_timer(timeout, handler, args):
+            handler()
+            return Mock()
+
+        # Fake the real method with a Lambda. Also run the handler immediately.
+        ThreadingMock.Timer = fake_timer
+
+        self.runtime._configure_interrupt(self.name, self.timeout, self.container, is_debugging)
+
+        # This method should be called from within the Timer Handler
+        self.manager_mock.stop.assert_called_with(self.container)
+
+
+class TestLambdaRuntime_get_code_dir(TestCase):
+
+    def setUp(self):
+        self.manager_mock = Mock()
+        self.runtime = LambdaRuntime(self.manager_mock)
+
+    @parameterized.expand([
+        (".zip"),
+        (".ZIP"),
+        (".JAR"),
+        (".jar")
+    ])
+    @patch("samcli.local.lambdafn.runtime.os")
+    @patch("samcli.local.lambdafn.runtime.shutil")
+    @patch("samcli.local.lambdafn.runtime._unzip_file")
+    def test_must_uncompress_zip_files(self, extension, unzip_file_mock, shutil_mock, os_mock):
+        code_path = "foo" + extension
+        decompressed_dir = "decompressed-dir"
+
+        unzip_file_mock.return_value = decompressed_dir
+        os_mock.path.isfile.return_value = True
+
+        with self.runtime._get_code_dir(code_path) as result:
+            self.assertEquals(result, decompressed_dir)
+
+        unzip_file_mock.assert_called_with(code_path)
+        os_mock.path.isfile.assert_called_with(code_path)
+
+        # Finally block must call this after the context manager exists
+        shutil_mock.rmtree.assert_called_with(decompressed_dir)
+
+    @patch("samcli.local.lambdafn.runtime.os")
+    @patch("samcli.local.lambdafn.runtime.shutil")
+    @patch("samcli.local.lambdafn.runtime._unzip_file")
+    def test_must_return_a_valid_file(self, unzip_file_mock, shutil_mock, os_mock):
+        """
+        Input is a file that exists, but is not a zip/jar file
+        """
+        code_path = "foo.exe"
+
+        os_mock.path.isfile.return_value = True
+
+        with self.runtime._get_code_dir(code_path) as result:
+            # code path must be returned. No decompression
+            self.assertEquals(result, code_path)
+
+        unzip_file_mock.assert_not_called()  # Unzip must not be called
+        os_mock.path.isfile.assert_called_with(code_path)
+
+        # Because we never unzipped anything, we should never delete
+        shutil_mock.rmtree.assert_not_called()
+
+
+class TestUnzipFile(TestCase):
+
+    @patch("samcli.local.lambdafn.runtime.tempfile")
+    @patch("samcli.local.lambdafn.runtime.zipfile")
+    @patch("samcli.local.lambdafn.runtime.os")
+    def test_must_unzip(self, os_mock, zipfile_mock, tempfile_mock):
+        inputpath = "somepath"
+        tmpdir = "/tmp/dir"
+        realpath = "/foo/bar/tmp/dir/code.zip"
+        zipref = Mock()
+
+        tempfile_mock.mkdtemp.return_value = tmpdir
+        zipfile_mock.ZipFile.return_value = zipref
+        os_mock.path.realpath.return_value = realpath
+
+        output = _unzip_file(inputpath)
+        self.assertEquals(output, realpath)
+
+        tempfile_mock.mkdtemp.assert_called_with()
+        zipfile_mock.ZipFile.assert_called_with(inputpath, 'r')  # Open file for reading
+        zipref.extractall.assert_called_with(tmpdir)  # unzip files to temporary directory
+        os_mock.path.realpath(tmpdir)  # Return the real path of temporary directory
diff --git a/tests/unit/test_yamlhelper.py b/tests/unit/test_yamlhelper.py
new file mode 100644
index 0000000000..32adb6c72a
--- /dev/null
+++ b/tests/unit/test_yamlhelper.py
@@ -0,0 +1,80 @@
+"""
+Helper to be able to parse/dump YAML files
+"""
+
+from unittest import TestCase
+from samcli.yamlhelper import yaml_parse, yaml_dump
+
+
+class TestYaml(TestCase):
+
+    yaml_with_tags = """
+    Resource:
+        Key1: !Ref Something
+        Key2: !GetAtt Another.Arn
+        Key3: !FooBar [!Baz YetAnother, "hello"]
+        Key4: !SomeTag {"a": "1"}
+        Key5: !GetAtt OneMore.Outputs.Arn
+        Key6: !Condition OtherCondition
+    """
+
+    parsed_yaml_dict = {
+        "Resource": {
+            "Key1": {
+                "Ref": "Something"
+            },
+            "Key2": {
+                "Fn::GetAtt": ["Another", "Arn"]
+            },
+            "Key3": {
+                "Fn::FooBar": [
+                    {"Fn::Baz": "YetAnother"},
+                    "hello"
+                ]
+            },
+            "Key4": {
+                "Fn::SomeTag": {
+                    "a": "1"
+                }
+            },
+            "Key5": {
+                "Fn::GetAtt": ["OneMore", "Outputs.Arn"]
+            },
+            "Key6": {
+                "Condition": "OtherCondition"
+            }
+        }
+    }
+
+    def test_yaml_with_tags(self):
+        output = yaml_parse(self.yaml_with_tags)
+        self.assertEquals(self.parsed_yaml_dict, output)
+
+        # Make sure formatter and parser work well with each other
+        formatted_str = yaml_dump(output)
+        output_again = yaml_parse(formatted_str)
+        self.assertEquals(output, output_again)
+
+    def test_yaml_getatt(self):
+        # This is an invalid syntax for !GetAtt. But make sure the code does not crash when we encouter this syntax
+        # Let CloudFormation interpret this value at runtime
+        input = """
+        Resource:
+            Key: !GetAtt ["a", "b"]
+        """
+
+        output = {
+            "Resource": {
+                "Key": {
+                    "Fn::GetAtt": ["a", "b"]
+                }
+            }
+        }
+
+        actual_output = yaml_parse(input)
+        self.assertEquals(actual_output, output)
+
+    def test_parse_json_with_tabs(self):
+        template = '{\n\t"foo": "bar"\n}'
+        output = yaml_parse(template)
+        self.assertEqual(output, {'foo': 'bar'})
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000000..079492e903
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,11 @@
+# tox (https://tox.readthedocs.io/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py27
+
+[testenv]
+whitelist_externals = make
+commands = make pr
diff --git a/validate.go b/validate.go
deleted file mode 100644
index 9123e6925d..0000000000
--- a/validate.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/awslabs/goformation"
-	"github.com/codegangsta/cli"
-)
-
-func validate(c *cli.Context) {
-
-	_, err := goformation.Open(getTemplateFilename(c.String("template")))
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", err)
-		os.Exit(1)
-	}
-
-	fmt.Fprintf(os.Stderr, "Valid!\n")
-	os.Exit(0)
-
-}
diff --git a/validate_test.go b/validate_test.go
deleted file mode 100644
index 91940327ce..0000000000
--- a/validate_test.go
+++ /dev/null
@@ -1,232 +0,0 @@
-package main
-
-import (
-	"github.com/awslabs/goformation"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	. "github.com/onsi/gomega/gstruct"
-)
-
-var _ = Describe("sam", func() {
-	Describe("validate", func() {
-
-		Context("with the official AWS SAM example templates", func() {
-
-			inputs := []string{
-				"test/templates/sam-official-samples/alexa_skill/template.yaml",
-				"test/templates/sam-official-samples/api_backend/template.yaml",
-				"test/templates/sam-official-samples/api_swagger_cors/template.yaml",
-				"test/templates/sam-official-samples/encryption_proxy/template.yaml",
-				"test/templates/sam-official-samples/hello_world/template.yaml",
-				"test/templates/sam-official-samples/inline_swagger/template.yaml",
-				"test/templates/sam-official-samples/iot_backend/template.yaml",
-				"test/templates/sam-official-samples/s3_processor/template.yaml",
-				"test/templates/sam-official-samples/schedule/template.yaml",
-				"test/templates/sam-official-samples/stream_processor/template.yaml",
-			}
-
-			for _, filename := range inputs {
-				Context("including "+filename, func() {
-					template, err := goformation.Open(filename)
-					It("should successfully validate the SAM template", func() {
-						Expect(err).To(BeNil())
-						Expect(template).ShouldNot(BeNil())
-					})
-				})
-			}
-
-		})
-
-		Context("with the default AWS CodeStar templates", func() {
-
-			inputs := []string{
-				"test/templates/codestar/nodejs.yml",
-				"test/templates/codestar/python.yml",
-				"test/templates/codestar/java.yml",
-			}
-
-			for _, filename := range inputs {
-				Context("including "+filename, func() {
-					template, err := goformation.Open(filename)
-					It("should successfully validate the SAM template", func() {
-						Expect(err).To(BeNil())
-						Expect(template).ShouldNot(BeNil())
-					})
-				})
-			}
-		})
-
-		Context("with a Serverless template containing different CodeUri formats", func() {
-
-			template, err := goformation.Open("test/templates/aws-common-string-or-s3-location.yaml")
-			It("should successfully parse the template", func() {
-				Expect(err).To(BeNil())
-				Expect(template).ShouldNot(BeNil())
-			})
-
-			functions := template.GetAllAWSServerlessFunctionResources()
-
-			It("should have exactly three functions", func() {
-				Expect(functions).To(HaveLen(3))
-				Expect(functions).To(HaveKey("CodeUriWithS3LocationSpecifiedAsString"))
-				Expect(functions).To(HaveKey("CodeUriWithS3LocationSpecifiedAsObject"))
-				Expect(functions).To(HaveKey("CodeUriWithString"))
-			})
-
-			f1 := functions["CodeUriWithS3LocationSpecifiedAsString"]
-			It("should parse a CodeUri property with an S3 location specified as a string", func() {
-				Expect(f1.CodeUri.String).To(PointTo(Equal("s3://testbucket/testkey.zip")))
-			})
-
-			f2 := functions["CodeUriWithS3LocationSpecifiedAsObject"]
-			It("should parse a CodeUri property with an S3 location specified as an object", func() {
-				Expect(f2.CodeUri.S3Location.Bucket).To(Equal("testbucket"))
-				Expect(f2.CodeUri.S3Location.Key).To(Equal("testkey.zip"))
-				Expect(f2.CodeUri.S3Location.Version).To(Equal(5))
-			})
-
-			f3 := functions["CodeUriWithString"]
-			It("should parse a CodeUri property with a string", func() {
-				Expect(f3.CodeUri.String).To(PointTo(Equal("./testfolder")))
-			})
-
-		})
-
-		Context("with a Serverless template containing function environment variables", func() {
-
-			template, err := goformation.Open("test/templates/function-environment-variables.yaml")
-			It("should successfully parse the template", func() {
-				Expect(err).To(BeNil())
-				Expect(template).ShouldNot(BeNil())
-			})
-
-			functions := template.GetAllAWSServerlessFunctionResources()
-
-			It("should have exactly one function", func() {
-				Expect(functions).To(HaveLen(5))
-				Expect(functions).To(HaveKey("EnvironmentVariableTestFunction"))
-				Expect(functions).To(HaveKey("IntrinsicEnvironmentVariableTestFunction"))
-				Expect(functions).To(HaveKey("NoValueEnvironmentVariableTestFunction"))
-				Expect(functions).To(HaveKey("SubEnvironmentVariableTestFunction"))
-				Expect(functions).To(HaveKey("NonExistSubEnvironmentVariableTestFunction"))
-			})
-
-			f1 := functions["EnvironmentVariableTestFunction"]
-			Context("with a simple string based variable", func() {
-				It("should have an environment variable named STRING_ENV_VAR", func() {
-					Expect(f1.Environment).ToNot(BeNil())
-					Expect(f1.Environment.Variables).ToNot(BeNil())
-					Expect(f1.Environment.Variables).To(HaveLen(1))
-					Expect(f1.Environment.Variables).To(HaveKeyWithValue("STRING_ENV_VAR", "test123"))
-				})
-			})
-
-			f2 := functions["NoValueEnvironmentVariableTestFunction"]
-			Context("with an empty variable value", func() {
-				It("should have an environment variable named EMPTY_ENV_VAR", func() {
-					Expect(f2.Environment).ToNot(BeNil())
-					Expect(f2.Environment.Variables).ToNot(BeNil())
-					Expect(f2.Environment.Variables).To(HaveLen(1))
-					Expect(f2.Environment.Variables).To(HaveKeyWithValue("EMPTY_ENV_VAR", ""))
-				})
-			})
-
-			f3 := functions["IntrinsicEnvironmentVariableTestFunction"]
-			Context("with a !Ref lookup variable", func() {
-				It("should have an environment variable named REF_ENV_VAR", func() {
-					Expect(f3.Environment).ToNot(BeNil())
-					Expect(f3.Environment.Variables).ToNot(BeNil())
-					Expect(f3.Environment.Variables).To(HaveLen(1))
-					Expect(f3.Environment.Variables).To(HaveKeyWithValue("REF_ENV_VAR", "SomeValue"))
-				})
-			})
-
-			f4 := functions["SubEnvironmentVariableTestFunction"]
-			Context("with a !Sub variable value", func() {
-				It("should have an environment variable named SUB_ENV_VAR", func() {
-					Expect(f4.Environment).ToNot(BeNil())
-					Expect(f4.Environment.Variables).ToNot(BeNil())
-					Expect(f4.Environment.Variables).To(HaveLen(1))
-					Expect(f4.Environment.Variables).To(HaveKeyWithValue("SUB_ENV_VAR", "Hello"))
-				})
-			})
-
-			f5 := functions["NonExistSubEnvironmentVariableTestFunction"]
-			Context("with a !Sub variable value that contains a non-existant reference", func() {
-				It("should have an environment variable named SUB_REF_ENV_VAR", func() {
-					Expect(f5.Environment).ToNot(BeNil())
-					Expect(f5.Environment.Variables).ToNot(BeNil())
-					Expect(f5.Environment.Variables).To(HaveLen(1))
-					Expect(f5.Environment.Variables).To(HaveKeyWithValue("SUB_REF_ENV_VAR", "Hello-"))
-				})
-			})
-
-		})
-
-		Context("with a Serverless function matching 2016-10-31 specification", func() {
-
-			template, err := goformation.Open("test/templates/function-2016-10-31.yaml")
-			It("should successfully validate the SAM template", func() {
-				Expect(err).To(BeNil())
-				Expect(template).ShouldNot(BeNil())
-			})
-
-			functions := template.GetAllAWSServerlessFunctionResources()
-
-			It("should have exactly one function", func() {
-				Expect(functions).To(HaveLen(1))
-				Expect(functions).To(HaveKey("Function20161031"))
-			})
-
-			f := functions["Function20161031"]
-
-			It("should correctly parse all of the function properties", func() {
-
-				Expect(f.Handler).To(Equal("file.method"))
-				Expect(f.Runtime).To(Equal("nodejs"))
-				Expect(f.FunctionName).To(Equal("functionname"))
-				Expect(f.Description).To(Equal("description"))
-				Expect(f.MemorySize).To(Equal(128))
-				Expect(f.Timeout).To(Equal(30))
-				Expect(f.Role).To(Equal("aws::arn::123456789012::some/role"))
-				Expect(f.Policies.StringArray).To(PointTo(ContainElement("AmazonDynamoDBFullAccess")))
-				Expect(f.Environment).ToNot(BeNil())
-				Expect(f.Environment.Variables).To(HaveKeyWithValue("NAME", "VALUE"))
-
-			})
-
-			It("should correctly parse all of the function API event sources/endpoints", func() {
-
-				Expect(f.Events).ToNot(BeNil())
-				Expect(f.Events).To(HaveKey("TestApi"))
-				Expect(f.Events["TestApi"].Type).To(Equal("Api"))
-				Expect(f.Events["TestApi"].Properties.ApiEvent).ToNot(BeNil())
-
-				event := f.Events["TestApi"].Properties.ApiEvent
-				Expect(event.Method).To(Equal("any"))
-				Expect(event.Path).To(Equal("/testing"))
-
-			})
-
-		})
-
-		Context("with non-resource sections in CloudFormation template", func() {
-
-			inputs := []string{
-				"test/templates/output_section.yaml",
-			}
-
-			for _, filename := range inputs {
-				Context("including "+filename, func() {
-					template, err := goformation.Open(filename)
-					It("should successfully validate the SAM template", func() {
-						Expect(err).To(BeNil())
-						Expect(template).ShouldNot(BeNil())
-					})
-				})
-			}
-
-		})
-
-	})
-})
diff --git a/vendor/github.com/Azure/go-ansiterm/LICENSE b/vendor/github.com/Azure/go-ansiterm/LICENSE
deleted file mode 100644
index e3d9a64d1d..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Microsoft Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/github.com/Azure/go-ansiterm/README.md b/vendor/github.com/Azure/go-ansiterm/README.md
deleted file mode 100644
index 261c041e7a..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# go-ansiterm
-
-This is a cross platform Ansi Terminal Emulation library.  It reads a stream of Ansi characters and produces the appropriate function calls.  The results of the function calls are platform dependent.
-
-For example the parser might receive "ESC, [, A" as a stream of three characters.  This is the code for Cursor Up (http://www.vt100.net/docs/vt510-rm/CUU).  The parser then calls the cursor up function (CUU()) on an event handler.  The event handler determines what platform specific work must be done to cause the cursor to move up one position.
-
-The parser (parser.go) is a partial implementation of this state machine (http://vt100.net/emu/vt500_parser.png).  There are also two event handler implementations, one for tests (test_event_handler.go) to validate that the expected events are being produced and called, the other is a Windows implementation (winterm/win_event_handler.go).
-
-See parser_test.go for examples exercising the state machine and generating appropriate function calls.
-
------
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
diff --git a/vendor/github.com/Azure/go-ansiterm/constants.go b/vendor/github.com/Azure/go-ansiterm/constants.go
deleted file mode 100644
index 96504a33bc..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/constants.go
+++ /dev/null
@@ -1,188 +0,0 @@
-package ansiterm
-
-const LogEnv = "DEBUG_TERMINAL"
-
-// ANSI constants
-// References:
-// -- http://www.ecma-international.org/publications/standards/Ecma-048.htm
-// -- http://man7.org/linux/man-pages/man4/console_codes.4.html
-// -- http://manpages.ubuntu.com/manpages/intrepid/man4/console_codes.4.html
-// -- http://en.wikipedia.org/wiki/ANSI_escape_code
-// -- http://vt100.net/emu/dec_ansi_parser
-// -- http://vt100.net/emu/vt500_parser.svg
-// -- http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
-// -- http://www.inwap.com/pdp10/ansicode.txt
-const (
-	// ECMA-48 Set Graphics Rendition
-	// Note:
-	// -- Constants leading with an underscore (e.g., _ANSI_xxx) are unsupported or reserved
-	// -- Fonts could possibly be supported via SetCurrentConsoleFontEx
-	// -- Windows does not expose the per-window cursor (i.e., caret) blink times
-	ANSI_SGR_RESET              = 0
-	ANSI_SGR_BOLD               = 1
-	ANSI_SGR_DIM                = 2
-	_ANSI_SGR_ITALIC            = 3
-	ANSI_SGR_UNDERLINE          = 4
-	_ANSI_SGR_BLINKSLOW         = 5
-	_ANSI_SGR_BLINKFAST         = 6
-	ANSI_SGR_REVERSE            = 7
-	_ANSI_SGR_INVISIBLE         = 8
-	_ANSI_SGR_LINETHROUGH       = 9
-	_ANSI_SGR_FONT_00           = 10
-	_ANSI_SGR_FONT_01           = 11
-	_ANSI_SGR_FONT_02           = 12
-	_ANSI_SGR_FONT_03           = 13
-	_ANSI_SGR_FONT_04           = 14
-	_ANSI_SGR_FONT_05           = 15
-	_ANSI_SGR_FONT_06           = 16
-	_ANSI_SGR_FONT_07           = 17
-	_ANSI_SGR_FONT_08           = 18
-	_ANSI_SGR_FONT_09           = 19
-	_ANSI_SGR_FONT_10           = 20
-	_ANSI_SGR_DOUBLEUNDERLINE   = 21
-	ANSI_SGR_BOLD_DIM_OFF       = 22
-	_ANSI_SGR_ITALIC_OFF        = 23
-	ANSI_SGR_UNDERLINE_OFF      = 24
-	_ANSI_SGR_BLINK_OFF         = 25
-	_ANSI_SGR_RESERVED_00       = 26
-	ANSI_SGR_REVERSE_OFF        = 27
-	_ANSI_SGR_INVISIBLE_OFF     = 28
-	_ANSI_SGR_LINETHROUGH_OFF   = 29
-	ANSI_SGR_FOREGROUND_BLACK   = 30
-	ANSI_SGR_FOREGROUND_RED     = 31
-	ANSI_SGR_FOREGROUND_GREEN   = 32
-	ANSI_SGR_FOREGROUND_YELLOW  = 33
-	ANSI_SGR_FOREGROUND_BLUE    = 34
-	ANSI_SGR_FOREGROUND_MAGENTA = 35
-	ANSI_SGR_FOREGROUND_CYAN    = 36
-	ANSI_SGR_FOREGROUND_WHITE   = 37
-	_ANSI_SGR_RESERVED_01       = 38
-	ANSI_SGR_FOREGROUND_DEFAULT = 39
-	ANSI_SGR_BACKGROUND_BLACK   = 40
-	ANSI_SGR_BACKGROUND_RED     = 41
-	ANSI_SGR_BACKGROUND_GREEN   = 42
-	ANSI_SGR_BACKGROUND_YELLOW  = 43
-	ANSI_SGR_BACKGROUND_BLUE    = 44
-	ANSI_SGR_BACKGROUND_MAGENTA = 45
-	ANSI_SGR_BACKGROUND_CYAN    = 46
-	ANSI_SGR_BACKGROUND_WHITE   = 47
-	_ANSI_SGR_RESERVED_02       = 48
-	ANSI_SGR_BACKGROUND_DEFAULT = 49
-	// 50 - 65: Unsupported
-
-	ANSI_MAX_CMD_LENGTH = 4096
-
-	MAX_INPUT_EVENTS = 128
-	DEFAULT_WIDTH    = 80
-	DEFAULT_HEIGHT   = 24
-
-	ANSI_BEL              = 0x07
-	ANSI_BACKSPACE        = 0x08
-	ANSI_TAB              = 0x09
-	ANSI_LINE_FEED        = 0x0A
-	ANSI_VERTICAL_TAB     = 0x0B
-	ANSI_FORM_FEED        = 0x0C
-	ANSI_CARRIAGE_RETURN  = 0x0D
-	ANSI_ESCAPE_PRIMARY   = 0x1B
-	ANSI_ESCAPE_SECONDARY = 0x5B
-	ANSI_OSC_STRING_ENTRY = 0x5D
-	ANSI_COMMAND_FIRST    = 0x40
-	ANSI_COMMAND_LAST     = 0x7E
-	DCS_ENTRY             = 0x90
-	CSI_ENTRY             = 0x9B
-	OSC_STRING            = 0x9D
-	ANSI_PARAMETER_SEP    = ";"
-	ANSI_CMD_G0           = '('
-	ANSI_CMD_G1           = ')'
-	ANSI_CMD_G2           = '*'
-	ANSI_CMD_G3           = '+'
-	ANSI_CMD_DECPNM       = '>'
-	ANSI_CMD_DECPAM       = '='
-	ANSI_CMD_OSC          = ']'
-	ANSI_CMD_STR_TERM     = '\\'
-
-	KEY_CONTROL_PARAM_2 = ";2"
-	KEY_CONTROL_PARAM_3 = ";3"
-	KEY_CONTROL_PARAM_4 = ";4"
-	KEY_CONTROL_PARAM_5 = ";5"
-	KEY_CONTROL_PARAM_6 = ";6"
-	KEY_CONTROL_PARAM_7 = ";7"
-	KEY_CONTROL_PARAM_8 = ";8"
-	KEY_ESC_CSI         = "\x1B["
-	KEY_ESC_N           = "\x1BN"
-	KEY_ESC_O           = "\x1BO"
-
-	FILL_CHARACTER = ' '
-)
-
-func getByteRange(start byte, end byte) []byte {
-	bytes := make([]byte, 0, 32)
-	for i := start; i <= end; i++ {
-		bytes = append(bytes, byte(i))
-	}
-
-	return bytes
-}
-
-var toGroundBytes = getToGroundBytes()
-var executors = getExecuteBytes()
-
-// SPACE		  20+A0 hex  Always and everywhere a blank space
-// Intermediate	  20-2F hex   !"#$%&'()*+,-./
-var intermeds = getByteRange(0x20, 0x2F)
-
-// Parameters	  30-3F hex  0123456789:;<=>?
-// CSI Parameters 30-39, 3B hex 0123456789;
-var csiParams = getByteRange(0x30, 0x3F)
-
-var csiCollectables = append(getByteRange(0x30, 0x39), getByteRange(0x3B, 0x3F)...)
-
-// Uppercase	  40-5F hex  @ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_
-var upperCase = getByteRange(0x40, 0x5F)
-
-// Lowercase	  60-7E hex  `abcdefghijlkmnopqrstuvwxyz{|}~
-var lowerCase = getByteRange(0x60, 0x7E)
-
-// Alphabetics	  40-7E hex  (all of upper and lower case)
-var alphabetics = append(upperCase, lowerCase...)
-
-var printables = getByteRange(0x20, 0x7F)
-
-var escapeIntermediateToGroundBytes = getByteRange(0x30, 0x7E)
-var escapeToGroundBytes = getEscapeToGroundBytes()
-
-// See http://www.vt100.net/emu/vt500_parser.png for description of the complex
-// byte ranges below
-
-func getEscapeToGroundBytes() []byte {
-	escapeToGroundBytes := getByteRange(0x30, 0x4F)
-	escapeToGroundBytes = append(escapeToGroundBytes, getByteRange(0x51, 0x57)...)
-	escapeToGroundBytes = append(escapeToGroundBytes, 0x59)
-	escapeToGroundBytes = append(escapeToGroundBytes, 0x5A)
-	escapeToGroundBytes = append(escapeToGroundBytes, 0x5C)
-	escapeToGroundBytes = append(escapeToGroundBytes, getByteRange(0x60, 0x7E)...)
-	return escapeToGroundBytes
-}
-
-func getExecuteBytes() []byte {
-	executeBytes := getByteRange(0x00, 0x17)
-	executeBytes = append(executeBytes, 0x19)
-	executeBytes = append(executeBytes, getByteRange(0x1C, 0x1F)...)
-	return executeBytes
-}
-
-func getToGroundBytes() []byte {
-	groundBytes := []byte{0x18}
-	groundBytes = append(groundBytes, 0x1A)
-	groundBytes = append(groundBytes, getByteRange(0x80, 0x8F)...)
-	groundBytes = append(groundBytes, getByteRange(0x91, 0x97)...)
-	groundBytes = append(groundBytes, 0x99)
-	groundBytes = append(groundBytes, 0x9A)
-	groundBytes = append(groundBytes, 0x9C)
-	return groundBytes
-}
-
-// Delete		     7F hex  Always and everywhere ignored
-// C1 Control	  80-9F hex  32 additional control characters
-// G1 Displayable A1-FE hex  94 additional displayable characters
-// Special		  A0+FF hex  Same as SPACE and DELETE
diff --git a/vendor/github.com/Azure/go-ansiterm/context.go b/vendor/github.com/Azure/go-ansiterm/context.go
deleted file mode 100644
index 8d66e777c0..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/context.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package ansiterm
-
-type ansiContext struct {
-	currentChar byte
-	paramBuffer []byte
-	interBuffer []byte
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/csi_entry_state.go b/vendor/github.com/Azure/go-ansiterm/csi_entry_state.go
deleted file mode 100644
index 1bd6057da8..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/csi_entry_state.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package ansiterm
-
-type csiEntryState struct {
-	baseState
-}
-
-func (csiState csiEntryState) Handle(b byte) (s state, e error) {
-	logger.Infof("CsiEntry::Handle %#x", b)
-
-	nextState, err := csiState.baseState.Handle(b)
-	if nextState != nil || err != nil {
-		return nextState, err
-	}
-
-	switch {
-	case sliceContains(alphabetics, b):
-		return csiState.parser.ground, nil
-	case sliceContains(csiCollectables, b):
-		return csiState.parser.csiParam, nil
-	case sliceContains(executors, b):
-		return csiState, csiState.parser.execute()
-	}
-
-	return csiState, nil
-}
-
-func (csiState csiEntryState) Transition(s state) error {
-	logger.Infof("CsiEntry::Transition %s --> %s", csiState.Name(), s.Name())
-	csiState.baseState.Transition(s)
-
-	switch s {
-	case csiState.parser.ground:
-		return csiState.parser.csiDispatch()
-	case csiState.parser.csiParam:
-		switch {
-		case sliceContains(csiParams, csiState.parser.context.currentChar):
-			csiState.parser.collectParam()
-		case sliceContains(intermeds, csiState.parser.context.currentChar):
-			csiState.parser.collectInter()
-		}
-	}
-
-	return nil
-}
-
-func (csiState csiEntryState) Enter() error {
-	csiState.parser.clear()
-	return nil
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/csi_param_state.go b/vendor/github.com/Azure/go-ansiterm/csi_param_state.go
deleted file mode 100644
index 4be35c5fd2..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/csi_param_state.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package ansiterm
-
-type csiParamState struct {
-	baseState
-}
-
-func (csiState csiParamState) Handle(b byte) (s state, e error) {
-	logger.Infof("CsiParam::Handle %#x", b)
-
-	nextState, err := csiState.baseState.Handle(b)
-	if nextState != nil || err != nil {
-		return nextState, err
-	}
-
-	switch {
-	case sliceContains(alphabetics, b):
-		return csiState.parser.ground, nil
-	case sliceContains(csiCollectables, b):
-		csiState.parser.collectParam()
-		return csiState, nil
-	case sliceContains(executors, b):
-		return csiState, csiState.parser.execute()
-	}
-
-	return csiState, nil
-}
-
-func (csiState csiParamState) Transition(s state) error {
-	logger.Infof("CsiParam::Transition %s --> %s", csiState.Name(), s.Name())
-	csiState.baseState.Transition(s)
-
-	switch s {
-	case csiState.parser.ground:
-		return csiState.parser.csiDispatch()
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/escape_intermediate_state.go b/vendor/github.com/Azure/go-ansiterm/escape_intermediate_state.go
deleted file mode 100644
index 2189eb6b6b..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/escape_intermediate_state.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package ansiterm
-
-type escapeIntermediateState struct {
-	baseState
-}
-
-func (escState escapeIntermediateState) Handle(b byte) (s state, e error) {
-	logger.Infof("escapeIntermediateState::Handle %#x", b)
-	nextState, err := escState.baseState.Handle(b)
-	if nextState != nil || err != nil {
-		return nextState, err
-	}
-
-	switch {
-	case sliceContains(intermeds, b):
-		return escState, escState.parser.collectInter()
-	case sliceContains(executors, b):
-		return escState, escState.parser.execute()
-	case sliceContains(escapeIntermediateToGroundBytes, b):
-		return escState.parser.ground, nil
-	}
-
-	return escState, nil
-}
-
-func (escState escapeIntermediateState) Transition(s state) error {
-	logger.Infof("escapeIntermediateState::Transition %s --> %s", escState.Name(), s.Name())
-	escState.baseState.Transition(s)
-
-	switch s {
-	case escState.parser.ground:
-		return escState.parser.escDispatch()
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/escape_state.go b/vendor/github.com/Azure/go-ansiterm/escape_state.go
deleted file mode 100644
index 7b1b9ad3f1..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/escape_state.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package ansiterm
-
-type escapeState struct {
-	baseState
-}
-
-func (escState escapeState) Handle(b byte) (s state, e error) {
-	logger.Infof("escapeState::Handle %#x", b)
-	nextState, err := escState.baseState.Handle(b)
-	if nextState != nil || err != nil {
-		return nextState, err
-	}
-
-	switch {
-	case b == ANSI_ESCAPE_SECONDARY:
-		return escState.parser.csiEntry, nil
-	case b == ANSI_OSC_STRING_ENTRY:
-		return escState.parser.oscString, nil
-	case sliceContains(executors, b):
-		return escState, escState.parser.execute()
-	case sliceContains(escapeToGroundBytes, b):
-		return escState.parser.ground, nil
-	case sliceContains(intermeds, b):
-		return escState.parser.escapeIntermediate, nil
-	}
-
-	return escState, nil
-}
-
-func (escState escapeState) Transition(s state) error {
-	logger.Infof("Escape::Transition %s --> %s", escState.Name(), s.Name())
-	escState.baseState.Transition(s)
-
-	switch s {
-	case escState.parser.ground:
-		return escState.parser.escDispatch()
-	case escState.parser.escapeIntermediate:
-		return escState.parser.collectInter()
-	}
-
-	return nil
-}
-
-func (escState escapeState) Enter() error {
-	escState.parser.clear()
-	return nil
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/event_handler.go b/vendor/github.com/Azure/go-ansiterm/event_handler.go
deleted file mode 100644
index 98087b38c2..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/event_handler.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package ansiterm
-
-type AnsiEventHandler interface {
-	// Print
-	Print(b byte) error
-
-	// Execute C0 commands
-	Execute(b byte) error
-
-	// CUrsor Up
-	CUU(int) error
-
-	// CUrsor Down
-	CUD(int) error
-
-	// CUrsor Forward
-	CUF(int) error
-
-	// CUrsor Backward
-	CUB(int) error
-
-	// Cursor to Next Line
-	CNL(int) error
-
-	// Cursor to Previous Line
-	CPL(int) error
-
-	// Cursor Horizontal position Absolute
-	CHA(int) error
-
-	// Vertical line Position Absolute
-	VPA(int) error
-
-	// CUrsor Position
-	CUP(int, int) error
-
-	// Horizontal and Vertical Position (depends on PUM)
-	HVP(int, int) error
-
-	// Text Cursor Enable Mode
-	DECTCEM(bool) error
-
-	// Origin Mode
-	DECOM(bool) error
-
-	// 132 Column Mode
-	DECCOLM(bool) error
-
-	// Erase in Display
-	ED(int) error
-
-	// Erase in Line
-	EL(int) error
-
-	// Insert Line
-	IL(int) error
-
-	// Delete Line
-	DL(int) error
-
-	// Insert Character
-	ICH(int) error
-
-	// Delete Character
-	DCH(int) error
-
-	// Set Graphics Rendition
-	SGR([]int) error
-
-	// Pan Down
-	SU(int) error
-
-	// Pan Up
-	SD(int) error
-
-	// Device Attributes
-	DA([]string) error
-
-	// Set Top and Bottom Margins
-	DECSTBM(int, int) error
-
-	// Index
-	IND() error
-
-	// Reverse Index
-	RI() error
-
-	// Flush updates from previous commands
-	Flush() error
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/ground_state.go b/vendor/github.com/Azure/go-ansiterm/ground_state.go
deleted file mode 100644
index 52451e9469..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/ground_state.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package ansiterm
-
-type groundState struct {
-	baseState
-}
-
-func (gs groundState) Handle(b byte) (s state, e error) {
-	gs.parser.context.currentChar = b
-
-	nextState, err := gs.baseState.Handle(b)
-	if nextState != nil || err != nil {
-		return nextState, err
-	}
-
-	switch {
-	case sliceContains(printables, b):
-		return gs, gs.parser.print()
-
-	case sliceContains(executors, b):
-		return gs, gs.parser.execute()
-	}
-
-	return gs, nil
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/osc_string_state.go b/vendor/github.com/Azure/go-ansiterm/osc_string_state.go
deleted file mode 100644
index 24062d420e..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/osc_string_state.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package ansiterm
-
-type oscStringState struct {
-	baseState
-}
-
-func (oscState oscStringState) Handle(b byte) (s state, e error) {
-	logger.Infof("OscString::Handle %#x", b)
-	nextState, err := oscState.baseState.Handle(b)
-	if nextState != nil || err != nil {
-		return nextState, err
-	}
-
-	switch {
-	case isOscStringTerminator(b):
-		return oscState.parser.ground, nil
-	}
-
-	return oscState, nil
-}
-
-// See below for OSC string terminators for linux
-// http://man7.org/linux/man-pages/man4/console_codes.4.html
-func isOscStringTerminator(b byte) bool {
-
-	if b == ANSI_BEL || b == 0x5C {
-		return true
-	}
-
-	return false
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/parser.go b/vendor/github.com/Azure/go-ansiterm/parser.go
deleted file mode 100644
index 169f68dbef..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/parser.go
+++ /dev/null
@@ -1,136 +0,0 @@
-package ansiterm
-
-import (
-	"errors"
-	"io/ioutil"
-	"os"
-
-	"github.com/Sirupsen/logrus"
-)
-
-var logger *logrus.Logger
-
-type AnsiParser struct {
-	currState          state
-	eventHandler       AnsiEventHandler
-	context            *ansiContext
-	csiEntry           state
-	csiParam           state
-	dcsEntry           state
-	escape             state
-	escapeIntermediate state
-	error              state
-	ground             state
-	oscString          state
-	stateMap           []state
-}
-
-func CreateParser(initialState string, evtHandler AnsiEventHandler) *AnsiParser {
-	logFile := ioutil.Discard
-
-	if isDebugEnv := os.Getenv(LogEnv); isDebugEnv == "1" {
-		logFile, _ = os.Create("ansiParser.log")
-	}
-
-	logger = &logrus.Logger{
-		Out:       logFile,
-		Formatter: new(logrus.TextFormatter),
-		Level:     logrus.InfoLevel,
-	}
-
-	parser := &AnsiParser{
-		eventHandler: evtHandler,
-		context:      &ansiContext{},
-	}
-
-	parser.csiEntry = csiEntryState{baseState{name: "CsiEntry", parser: parser}}
-	parser.csiParam = csiParamState{baseState{name: "CsiParam", parser: parser}}
-	parser.dcsEntry = dcsEntryState{baseState{name: "DcsEntry", parser: parser}}
-	parser.escape = escapeState{baseState{name: "Escape", parser: parser}}
-	parser.escapeIntermediate = escapeIntermediateState{baseState{name: "EscapeIntermediate", parser: parser}}
-	parser.error = errorState{baseState{name: "Error", parser: parser}}
-	parser.ground = groundState{baseState{name: "Ground", parser: parser}}
-	parser.oscString = oscStringState{baseState{name: "OscString", parser: parser}}
-
-	parser.stateMap = []state{
-		parser.csiEntry,
-		parser.csiParam,
-		parser.dcsEntry,
-		parser.escape,
-		parser.escapeIntermediate,
-		parser.error,
-		parser.ground,
-		parser.oscString,
-	}
-
-	parser.currState = getState(initialState, parser.stateMap)
-
-	logger.Infof("CreateParser: parser %p", parser)
-	return parser
-}
-
-func getState(name string, states []state) state {
-	for _, el := range states {
-		if el.Name() == name {
-			return el
-		}
-	}
-
-	return nil
-}
-
-func (ap *AnsiParser) Parse(bytes []byte) (int, error) {
-	for i, b := range bytes {
-		if err := ap.handle(b); err != nil {
-			return i, err
-		}
-	}
-
-	return len(bytes), ap.eventHandler.Flush()
-}
-
-func (ap *AnsiParser) handle(b byte) error {
-	ap.context.currentChar = b
-	newState, err := ap.currState.Handle(b)
-	if err != nil {
-		return err
-	}
-
-	if newState == nil {
-		logger.Warning("newState is nil")
-		return errors.New("New state of 'nil' is invalid.")
-	}
-
-	if newState != ap.currState {
-		if err := ap.changeState(newState); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (ap *AnsiParser) changeState(newState state) error {
-	logger.Infof("ChangeState %s --> %s", ap.currState.Name(), newState.Name())
-
-	// Exit old state
-	if err := ap.currState.Exit(); err != nil {
-		logger.Infof("Exit state '%s' failed with : '%v'", ap.currState.Name(), err)
-		return err
-	}
-
-	// Perform transition action
-	if err := ap.currState.Transition(newState); err != nil {
-		logger.Infof("Transition from '%s' to '%s' failed with: '%v'", ap.currState.Name(), newState.Name, err)
-		return err
-	}
-
-	// Enter new state
-	if err := newState.Enter(); err != nil {
-		logger.Infof("Enter state '%s' failed with: '%v'", newState.Name(), err)
-		return err
-	}
-
-	ap.currState = newState
-	return nil
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/parser_action_helpers.go b/vendor/github.com/Azure/go-ansiterm/parser_action_helpers.go
deleted file mode 100644
index 8b69a67a5a..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/parser_action_helpers.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package ansiterm
-
-import (
-	"strconv"
-)
-
-func parseParams(bytes []byte) ([]string, error) {
-	paramBuff := make([]byte, 0, 0)
-	params := []string{}
-
-	for _, v := range bytes {
-		if v == ';' {
-			if len(paramBuff) > 0 {
-				// Completed parameter, append it to the list
-				s := string(paramBuff)
-				params = append(params, s)
-				paramBuff = make([]byte, 0, 0)
-			}
-		} else {
-			paramBuff = append(paramBuff, v)
-		}
-	}
-
-	// Last parameter may not be terminated with ';'
-	if len(paramBuff) > 0 {
-		s := string(paramBuff)
-		params = append(params, s)
-	}
-
-	logger.Infof("Parsed params: %v with length: %d", params, len(params))
-	return params, nil
-}
-
-func parseCmd(context ansiContext) (string, error) {
-	return string(context.currentChar), nil
-}
-
-func getInt(params []string, dflt int) int {
-	i := getInts(params, 1, dflt)[0]
-	logger.Infof("getInt: %v", i)
-	return i
-}
-
-func getInts(params []string, minCount int, dflt int) []int {
-	ints := []int{}
-
-	for _, v := range params {
-		i, _ := strconv.Atoi(v)
-		// Zero is mapped to the default value in VT100.
-		if i == 0 {
-			i = dflt
-		}
-		ints = append(ints, i)
-	}
-
-	if len(ints) < minCount {
-		remaining := minCount - len(ints)
-		for i := 0; i < remaining; i++ {
-			ints = append(ints, dflt)
-		}
-	}
-
-	logger.Infof("getInts: %v", ints)
-
-	return ints
-}
-
-func (ap *AnsiParser) modeDispatch(param string, set bool) error {
-	switch param {
-	case "?3":
-		return ap.eventHandler.DECCOLM(set)
-	case "?6":
-		return ap.eventHandler.DECOM(set)
-	case "?25":
-		return ap.eventHandler.DECTCEM(set)
-	}
-	return nil
-}
-
-func (ap *AnsiParser) hDispatch(params []string) error {
-	if len(params) == 1 {
-		return ap.modeDispatch(params[0], true)
-	}
-
-	return nil
-}
-
-func (ap *AnsiParser) lDispatch(params []string) error {
-	if len(params) == 1 {
-		return ap.modeDispatch(params[0], false)
-	}
-
-	return nil
-}
-
-func getEraseParam(params []string) int {
-	param := getInt(params, 0)
-	if param < 0 || 3 < param {
-		param = 0
-	}
-
-	return param
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/parser_actions.go b/vendor/github.com/Azure/go-ansiterm/parser_actions.go
deleted file mode 100644
index 58750a2d2b..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/parser_actions.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package ansiterm
-
-import (
-	"fmt"
-)
-
-func (ap *AnsiParser) collectParam() error {
-	currChar := ap.context.currentChar
-	logger.Infof("collectParam %#x", currChar)
-	ap.context.paramBuffer = append(ap.context.paramBuffer, currChar)
-	return nil
-}
-
-func (ap *AnsiParser) collectInter() error {
-	currChar := ap.context.currentChar
-	logger.Infof("collectInter %#x", currChar)
-	ap.context.paramBuffer = append(ap.context.interBuffer, currChar)
-	return nil
-}
-
-func (ap *AnsiParser) escDispatch() error {
-	cmd, _ := parseCmd(*ap.context)
-	intermeds := ap.context.interBuffer
-	logger.Infof("escDispatch currentChar: %#x", ap.context.currentChar)
-	logger.Infof("escDispatch: %v(%v)", cmd, intermeds)
-
-	switch cmd {
-	case "D": // IND
-		return ap.eventHandler.IND()
-	case "E": // NEL, equivalent to CRLF
-		err := ap.eventHandler.Execute(ANSI_CARRIAGE_RETURN)
-		if err == nil {
-			err = ap.eventHandler.Execute(ANSI_LINE_FEED)
-		}
-		return err
-	case "M": // RI
-		return ap.eventHandler.RI()
-	}
-
-	return nil
-}
-
-func (ap *AnsiParser) csiDispatch() error {
-	cmd, _ := parseCmd(*ap.context)
-	params, _ := parseParams(ap.context.paramBuffer)
-
-	logger.Infof("csiDispatch: %v(%v)", cmd, params)
-
-	switch cmd {
-	case "@":
-		return ap.eventHandler.ICH(getInt(params, 1))
-	case "A":
-		return ap.eventHandler.CUU(getInt(params, 1))
-	case "B":
-		return ap.eventHandler.CUD(getInt(params, 1))
-	case "C":
-		return ap.eventHandler.CUF(getInt(params, 1))
-	case "D":
-		return ap.eventHandler.CUB(getInt(params, 1))
-	case "E":
-		return ap.eventHandler.CNL(getInt(params, 1))
-	case "F":
-		return ap.eventHandler.CPL(getInt(params, 1))
-	case "G":
-		return ap.eventHandler.CHA(getInt(params, 1))
-	case "H":
-		ints := getInts(params, 2, 1)
-		x, y := ints[0], ints[1]
-		return ap.eventHandler.CUP(x, y)
-	case "J":
-		param := getEraseParam(params)
-		return ap.eventHandler.ED(param)
-	case "K":
-		param := getEraseParam(params)
-		return ap.eventHandler.EL(param)
-	case "L":
-		return ap.eventHandler.IL(getInt(params, 1))
-	case "M":
-		return ap.eventHandler.DL(getInt(params, 1))
-	case "P":
-		return ap.eventHandler.DCH(getInt(params, 1))
-	case "S":
-		return ap.eventHandler.SU(getInt(params, 1))
-	case "T":
-		return ap.eventHandler.SD(getInt(params, 1))
-	case "c":
-		return ap.eventHandler.DA(params)
-	case "d":
-		return ap.eventHandler.VPA(getInt(params, 1))
-	case "f":
-		ints := getInts(params, 2, 1)
-		x, y := ints[0], ints[1]
-		return ap.eventHandler.HVP(x, y)
-	case "h":
-		return ap.hDispatch(params)
-	case "l":
-		return ap.lDispatch(params)
-	case "m":
-		return ap.eventHandler.SGR(getInts(params, 1, 0))
-	case "r":
-		ints := getInts(params, 2, 1)
-		top, bottom := ints[0], ints[1]
-		return ap.eventHandler.DECSTBM(top, bottom)
-	default:
-		logger.Errorf(fmt.Sprintf("Unsupported CSI command: '%s', with full context:  %v", cmd, ap.context))
-		return nil
-	}
-
-}
-
-func (ap *AnsiParser) print() error {
-	return ap.eventHandler.Print(ap.context.currentChar)
-}
-
-func (ap *AnsiParser) clear() error {
-	ap.context = &ansiContext{}
-	return nil
-}
-
-func (ap *AnsiParser) execute() error {
-	return ap.eventHandler.Execute(ap.context.currentChar)
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/states.go b/vendor/github.com/Azure/go-ansiterm/states.go
deleted file mode 100644
index f2ea1fcd12..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/states.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package ansiterm
-
-type stateID int
-
-type state interface {
-	Enter() error
-	Exit() error
-	Handle(byte) (state, error)
-	Name() string
-	Transition(state) error
-}
-
-type baseState struct {
-	name   string
-	parser *AnsiParser
-}
-
-func (base baseState) Enter() error {
-	return nil
-}
-
-func (base baseState) Exit() error {
-	return nil
-}
-
-func (base baseState) Handle(b byte) (s state, e error) {
-
-	switch {
-	case b == CSI_ENTRY:
-		return base.parser.csiEntry, nil
-	case b == DCS_ENTRY:
-		return base.parser.dcsEntry, nil
-	case b == ANSI_ESCAPE_PRIMARY:
-		return base.parser.escape, nil
-	case b == OSC_STRING:
-		return base.parser.oscString, nil
-	case sliceContains(toGroundBytes, b):
-		return base.parser.ground, nil
-	}
-
-	return nil, nil
-}
-
-func (base baseState) Name() string {
-	return base.name
-}
-
-func (base baseState) Transition(s state) error {
-	if s == base.parser.ground {
-		execBytes := []byte{0x18}
-		execBytes = append(execBytes, 0x1A)
-		execBytes = append(execBytes, getByteRange(0x80, 0x8F)...)
-		execBytes = append(execBytes, getByteRange(0x91, 0x97)...)
-		execBytes = append(execBytes, 0x99)
-		execBytes = append(execBytes, 0x9A)
-
-		if sliceContains(execBytes, base.parser.context.currentChar) {
-			return base.parser.execute()
-		}
-	}
-
-	return nil
-}
-
-type dcsEntryState struct {
-	baseState
-}
-
-type errorState struct {
-	baseState
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/utilities.go b/vendor/github.com/Azure/go-ansiterm/utilities.go
deleted file mode 100644
index 392114493a..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/utilities.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package ansiterm
-
-import (
-	"strconv"
-)
-
-func sliceContains(bytes []byte, b byte) bool {
-	for _, v := range bytes {
-		if v == b {
-			return true
-		}
-	}
-
-	return false
-}
-
-func convertBytesToInteger(bytes []byte) int {
-	s := string(bytes)
-	i, _ := strconv.Atoi(s)
-	return i
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/winterm/ansi.go b/vendor/github.com/Azure/go-ansiterm/winterm/ansi.go
deleted file mode 100644
index daf2f06961..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/winterm/ansi.go
+++ /dev/null
@@ -1,182 +0,0 @@
-// +build windows
-
-package winterm
-
-import (
-	"fmt"
-	"os"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/Azure/go-ansiterm"
-)
-
-// Windows keyboard constants
-// See https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx.
-const (
-	VK_PRIOR    = 0x21 // PAGE UP key
-	VK_NEXT     = 0x22 // PAGE DOWN key
-	VK_END      = 0x23 // END key
-	VK_HOME     = 0x24 // HOME key
-	VK_LEFT     = 0x25 // LEFT ARROW key
-	VK_UP       = 0x26 // UP ARROW key
-	VK_RIGHT    = 0x27 // RIGHT ARROW key
-	VK_DOWN     = 0x28 // DOWN ARROW key
-	VK_SELECT   = 0x29 // SELECT key
-	VK_PRINT    = 0x2A // PRINT key
-	VK_EXECUTE  = 0x2B // EXECUTE key
-	VK_SNAPSHOT = 0x2C // PRINT SCREEN key
-	VK_INSERT   = 0x2D // INS key
-	VK_DELETE   = 0x2E // DEL key
-	VK_HELP     = 0x2F // HELP key
-	VK_F1       = 0x70 // F1 key
-	VK_F2       = 0x71 // F2 key
-	VK_F3       = 0x72 // F3 key
-	VK_F4       = 0x73 // F4 key
-	VK_F5       = 0x74 // F5 key
-	VK_F6       = 0x75 // F6 key
-	VK_F7       = 0x76 // F7 key
-	VK_F8       = 0x77 // F8 key
-	VK_F9       = 0x78 // F9 key
-	VK_F10      = 0x79 // F10 key
-	VK_F11      = 0x7A // F11 key
-	VK_F12      = 0x7B // F12 key
-
-	RIGHT_ALT_PRESSED  = 0x0001
-	LEFT_ALT_PRESSED   = 0x0002
-	RIGHT_CTRL_PRESSED = 0x0004
-	LEFT_CTRL_PRESSED  = 0x0008
-	SHIFT_PRESSED      = 0x0010
-	NUMLOCK_ON         = 0x0020
-	SCROLLLOCK_ON      = 0x0040
-	CAPSLOCK_ON        = 0x0080
-	ENHANCED_KEY       = 0x0100
-)
-
-type ansiCommand struct {
-	CommandBytes []byte
-	Command      string
-	Parameters   []string
-	IsSpecial    bool
-}
-
-func newAnsiCommand(command []byte) *ansiCommand {
-
-	if isCharacterSelectionCmdChar(command[1]) {
-		// Is Character Set Selection commands
-		return &ansiCommand{
-			CommandBytes: command,
-			Command:      string(command),
-			IsSpecial:    true,
-		}
-	}
-
-	// last char is command character
-	lastCharIndex := len(command) - 1
-
-	ac := &ansiCommand{
-		CommandBytes: command,
-		Command:      string(command[lastCharIndex]),
-		IsSpecial:    false,
-	}
-
-	// more than a single escape
-	if lastCharIndex != 0 {
-		start := 1
-		// skip if double char escape sequence
-		if command[0] == ansiterm.ANSI_ESCAPE_PRIMARY && command[1] == ansiterm.ANSI_ESCAPE_SECONDARY {
-			start++
-		}
-		// convert this to GetNextParam method
-		ac.Parameters = strings.Split(string(command[start:lastCharIndex]), ansiterm.ANSI_PARAMETER_SEP)
-	}
-
-	return ac
-}
-
-func (ac *ansiCommand) paramAsSHORT(index int, defaultValue int16) int16 {
-	if index < 0 || index >= len(ac.Parameters) {
-		return defaultValue
-	}
-
-	param, err := strconv.ParseInt(ac.Parameters[index], 10, 16)
-	if err != nil {
-		return defaultValue
-	}
-
-	return int16(param)
-}
-
-func (ac *ansiCommand) String() string {
-	return fmt.Sprintf("0x%v \"%v\" (\"%v\")",
-		bytesToHex(ac.CommandBytes),
-		ac.Command,
-		strings.Join(ac.Parameters, "\",\""))
-}
-
-// isAnsiCommandChar returns true if the passed byte falls within the range of ANSI commands.
-// See http://manpages.ubuntu.com/manpages/intrepid/man4/console_codes.4.html.
-func isAnsiCommandChar(b byte) bool {
-	switch {
-	case ansiterm.ANSI_COMMAND_FIRST <= b && b <= ansiterm.ANSI_COMMAND_LAST && b != ansiterm.ANSI_ESCAPE_SECONDARY:
-		return true
-	case b == ansiterm.ANSI_CMD_G1 || b == ansiterm.ANSI_CMD_OSC || b == ansiterm.ANSI_CMD_DECPAM || b == ansiterm.ANSI_CMD_DECPNM:
-		// non-CSI escape sequence terminator
-		return true
-	case b == ansiterm.ANSI_CMD_STR_TERM || b == ansiterm.ANSI_BEL:
-		// String escape sequence terminator
-		return true
-	}
-	return false
-}
-
-func isXtermOscSequence(command []byte, current byte) bool {
-	return (len(command) >= 2 && command[0] == ansiterm.ANSI_ESCAPE_PRIMARY && command[1] == ansiterm.ANSI_CMD_OSC && current != ansiterm.ANSI_BEL)
-}
-
-func isCharacterSelectionCmdChar(b byte) bool {
-	return (b == ansiterm.ANSI_CMD_G0 || b == ansiterm.ANSI_CMD_G1 || b == ansiterm.ANSI_CMD_G2 || b == ansiterm.ANSI_CMD_G3)
-}
-
-// bytesToHex converts a slice of bytes to a human-readable string.
-func bytesToHex(b []byte) string {
-	hex := make([]string, len(b))
-	for i, ch := range b {
-		hex[i] = fmt.Sprintf("%X", ch)
-	}
-	return strings.Join(hex, "")
-}
-
-// ensureInRange adjusts the passed value, if necessary, to ensure it is within
-// the passed min / max range.
-func ensureInRange(n int16, min int16, max int16) int16 {
-	if n < min {
-		return min
-	} else if n > max {
-		return max
-	} else {
-		return n
-	}
-}
-
-func GetStdFile(nFile int) (*os.File, uintptr) {
-	var file *os.File
-	switch nFile {
-	case syscall.STD_INPUT_HANDLE:
-		file = os.Stdin
-	case syscall.STD_OUTPUT_HANDLE:
-		file = os.Stdout
-	case syscall.STD_ERROR_HANDLE:
-		file = os.Stderr
-	default:
-		panic(fmt.Errorf("Invalid standard handle identifier: %v", nFile))
-	}
-
-	fd, err := syscall.GetStdHandle(nFile)
-	if err != nil {
-		panic(fmt.Errorf("Invalid standard handle indentifier: %v -- %v", nFile, err))
-	}
-
-	return file, uintptr(fd)
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/winterm/api.go b/vendor/github.com/Azure/go-ansiterm/winterm/api.go
deleted file mode 100644
index 462d92f8ef..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/winterm/api.go
+++ /dev/null
@@ -1,322 +0,0 @@
-// +build windows
-
-package winterm
-
-import (
-	"fmt"
-	"syscall"
-	"unsafe"
-)
-
-//===========================================================================================================
-// IMPORTANT NOTE:
-//
-//	The methods below make extensive use of the "unsafe" package to obtain the required pointers.
-//	Beginning in Go 1.3, the garbage collector may release local variables (e.g., incoming arguments, stack
-//	variables) the pointers reference *before* the API completes.
-//
-//  As a result, in those cases, the code must hint that the variables remain in active by invoking the
-//	dummy method "use" (see below). Newer versions of Go are planned to change the mechanism to no longer
-//	require unsafe pointers.
-//
-//	If you add or modify methods, ENSURE protection of local variables through the "use" builtin to inform
-//	the garbage collector the variables remain in use if:
-//
-//	-- The value is not a pointer (e.g., int32, struct)
-//	-- The value is not referenced by the method after passing the pointer to Windows
-//
-//	See http://golang.org/doc/go1.3.
-//===========================================================================================================
-
-var (
-	kernel32DLL = syscall.NewLazyDLL("kernel32.dll")
-
-	getConsoleCursorInfoProc       = kernel32DLL.NewProc("GetConsoleCursorInfo")
-	setConsoleCursorInfoProc       = kernel32DLL.NewProc("SetConsoleCursorInfo")
-	setConsoleCursorPositionProc   = kernel32DLL.NewProc("SetConsoleCursorPosition")
-	setConsoleModeProc             = kernel32DLL.NewProc("SetConsoleMode")
-	getConsoleScreenBufferInfoProc = kernel32DLL.NewProc("GetConsoleScreenBufferInfo")
-	setConsoleScreenBufferSizeProc = kernel32DLL.NewProc("SetConsoleScreenBufferSize")
-	scrollConsoleScreenBufferProc  = kernel32DLL.NewProc("ScrollConsoleScreenBufferA")
-	setConsoleTextAttributeProc    = kernel32DLL.NewProc("SetConsoleTextAttribute")
-	setConsoleWindowInfoProc       = kernel32DLL.NewProc("SetConsoleWindowInfo")
-	writeConsoleOutputProc         = kernel32DLL.NewProc("WriteConsoleOutputW")
-	readConsoleInputProc           = kernel32DLL.NewProc("ReadConsoleInputW")
-	waitForSingleObjectProc        = kernel32DLL.NewProc("WaitForSingleObject")
-)
-
-// Windows Console constants
-const (
-	// Console modes
-	// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms686033(v=vs.85).aspx.
-	ENABLE_PROCESSED_INPUT = 0x0001
-	ENABLE_LINE_INPUT      = 0x0002
-	ENABLE_ECHO_INPUT      = 0x0004
-	ENABLE_WINDOW_INPUT    = 0x0008
-	ENABLE_MOUSE_INPUT     = 0x0010
-	ENABLE_INSERT_MODE     = 0x0020
-	ENABLE_QUICK_EDIT_MODE = 0x0040
-	ENABLE_EXTENDED_FLAGS  = 0x0080
-
-	ENABLE_PROCESSED_OUTPUT   = 0x0001
-	ENABLE_WRAP_AT_EOL_OUTPUT = 0x0002
-
-	// Character attributes
-	// Note:
-	// -- The attributes are combined to produce various colors (e.g., Blue + Green will create Cyan).
-	//    Clearing all foreground or background colors results in black; setting all creates white.
-	// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms682088(v=vs.85).aspx#_win32_character_attributes.
-	FOREGROUND_BLUE      uint16 = 0x0001
-	FOREGROUND_GREEN     uint16 = 0x0002
-	FOREGROUND_RED       uint16 = 0x0004
-	FOREGROUND_INTENSITY uint16 = 0x0008
-	FOREGROUND_MASK      uint16 = 0x000F
-
-	BACKGROUND_BLUE      uint16 = 0x0010
-	BACKGROUND_GREEN     uint16 = 0x0020
-	BACKGROUND_RED       uint16 = 0x0040
-	BACKGROUND_INTENSITY uint16 = 0x0080
-	BACKGROUND_MASK      uint16 = 0x00F0
-
-	COMMON_LVB_MASK          uint16 = 0xFF00
-	COMMON_LVB_REVERSE_VIDEO uint16 = 0x4000
-	COMMON_LVB_UNDERSCORE    uint16 = 0x8000
-
-	// Input event types
-	// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms683499(v=vs.85).aspx.
-	KEY_EVENT                = 0x0001
-	MOUSE_EVENT              = 0x0002
-	WINDOW_BUFFER_SIZE_EVENT = 0x0004
-	MENU_EVENT               = 0x0008
-	FOCUS_EVENT              = 0x0010
-
-	// WaitForSingleObject return codes
-	WAIT_ABANDONED = 0x00000080
-	WAIT_FAILED    = 0xFFFFFFFF
-	WAIT_SIGNALED  = 0x0000000
-	WAIT_TIMEOUT   = 0x00000102
-
-	// WaitForSingleObject wait duration
-	WAIT_INFINITE       = 0xFFFFFFFF
-	WAIT_ONE_SECOND     = 1000
-	WAIT_HALF_SECOND    = 500
-	WAIT_QUARTER_SECOND = 250
-)
-
-// Windows API Console types
-// -- See https://msdn.microsoft.com/en-us/library/windows/desktop/ms682101(v=vs.85).aspx for Console specific types (e.g., COORD)
-// -- See https://msdn.microsoft.com/en-us/library/aa296569(v=vs.60).aspx for comments on alignment
-type (
-	CHAR_INFO struct {
-		UnicodeChar uint16
-		Attributes  uint16
-	}
-
-	CONSOLE_CURSOR_INFO struct {
-		Size    uint32
-		Visible int32
-	}
-
-	CONSOLE_SCREEN_BUFFER_INFO struct {
-		Size              COORD
-		CursorPosition    COORD
-		Attributes        uint16
-		Window            SMALL_RECT
-		MaximumWindowSize COORD
-	}
-
-	COORD struct {
-		X int16
-		Y int16
-	}
-
-	SMALL_RECT struct {
-		Left   int16
-		Top    int16
-		Right  int16
-		Bottom int16
-	}
-
-	// INPUT_RECORD is a C/C++ union of which KEY_EVENT_RECORD is one case, it is also the largest
-	// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms683499(v=vs.85).aspx.
-	INPUT_RECORD struct {
-		EventType uint16
-		KeyEvent  KEY_EVENT_RECORD
-	}
-
-	KEY_EVENT_RECORD struct {
-		KeyDown         int32
-		RepeatCount     uint16
-		VirtualKeyCode  uint16
-		VirtualScanCode uint16
-		UnicodeChar     uint16
-		ControlKeyState uint32
-	}
-
-	WINDOW_BUFFER_SIZE struct {
-		Size COORD
-	}
-)
-
-// boolToBOOL converts a Go bool into a Windows int32.
-func boolToBOOL(f bool) int32 {
-	if f {
-		return int32(1)
-	} else {
-		return int32(0)
-	}
-}
-
-// GetConsoleCursorInfo retrieves information about the size and visiblity of the console cursor.
-// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms683163(v=vs.85).aspx.
-func GetConsoleCursorInfo(handle uintptr, cursorInfo *CONSOLE_CURSOR_INFO) error {
-	r1, r2, err := getConsoleCursorInfoProc.Call(handle, uintptr(unsafe.Pointer(cursorInfo)), 0)
-	return checkError(r1, r2, err)
-}
-
-// SetConsoleCursorInfo sets the size and visiblity of the console cursor.
-// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms686019(v=vs.85).aspx.
-func SetConsoleCursorInfo(handle uintptr, cursorInfo *CONSOLE_CURSOR_INFO) error {
-	r1, r2, err := setConsoleCursorInfoProc.Call(handle, uintptr(unsafe.Pointer(cursorInfo)), 0)
-	return checkError(r1, r2, err)
-}
-
-// SetConsoleCursorPosition location of the console cursor.
-// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms686025(v=vs.85).aspx.
-func SetConsoleCursorPosition(handle uintptr, coord COORD) error {
-	r1, r2, err := setConsoleCursorPositionProc.Call(handle, coordToPointer(coord))
-	use(coord)
-	return checkError(r1, r2, err)
-}
-
-// GetConsoleMode gets the console mode for given file descriptor
-// See http://msdn.microsoft.com/en-us/library/windows/desktop/ms683167(v=vs.85).aspx.
-func GetConsoleMode(handle uintptr) (mode uint32, err error) {
-	err = syscall.GetConsoleMode(syscall.Handle(handle), &mode)
-	return mode, err
-}
-
-// SetConsoleMode sets the console mode for given file descriptor
-// See http://msdn.microsoft.com/en-us/library/windows/desktop/ms686033(v=vs.85).aspx.
-func SetConsoleMode(handle uintptr, mode uint32) error {
-	r1, r2, err := setConsoleModeProc.Call(handle, uintptr(mode), 0)
-	use(mode)
-	return checkError(r1, r2, err)
-}
-
-// GetConsoleScreenBufferInfo retrieves information about the specified console screen buffer.
-// See http://msdn.microsoft.com/en-us/library/windows/desktop/ms683171(v=vs.85).aspx.
-func GetConsoleScreenBufferInfo(handle uintptr) (*CONSOLE_SCREEN_BUFFER_INFO, error) {
-	info := CONSOLE_SCREEN_BUFFER_INFO{}
-	err := checkError(getConsoleScreenBufferInfoProc.Call(handle, uintptr(unsafe.Pointer(&info)), 0))
-	if err != nil {
-		return nil, err
-	}
-	return &info, nil
-}
-
-func ScrollConsoleScreenBuffer(handle uintptr, scrollRect SMALL_RECT, clipRect SMALL_RECT, destOrigin COORD, char CHAR_INFO) error {
-	r1, r2, err := scrollConsoleScreenBufferProc.Call(handle, uintptr(unsafe.Pointer(&scrollRect)), uintptr(unsafe.Pointer(&clipRect)), coordToPointer(destOrigin), uintptr(unsafe.Pointer(&char)))
-	use(scrollRect)
-	use(clipRect)
-	use(destOrigin)
-	use(char)
-	return checkError(r1, r2, err)
-}
-
-// SetConsoleScreenBufferSize sets the size of the console screen buffer.
-// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms686044(v=vs.85).aspx.
-func SetConsoleScreenBufferSize(handle uintptr, coord COORD) error {
-	r1, r2, err := setConsoleScreenBufferSizeProc.Call(handle, coordToPointer(coord))
-	use(coord)
-	return checkError(r1, r2, err)
-}
-
-// SetConsoleTextAttribute sets the attributes of characters written to the
-// console screen buffer by the WriteFile or WriteConsole function.
-// See http://msdn.microsoft.com/en-us/library/windows/desktop/ms686047(v=vs.85).aspx.
-func SetConsoleTextAttribute(handle uintptr, attribute uint16) error {
-	r1, r2, err := setConsoleTextAttributeProc.Call(handle, uintptr(attribute), 0)
-	use(attribute)
-	return checkError(r1, r2, err)
-}
-
-// SetConsoleWindowInfo sets the size and position of the console screen buffer's window.
-// Note that the size and location must be within and no larger than the backing console screen buffer.
-// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms686125(v=vs.85).aspx.
-func SetConsoleWindowInfo(handle uintptr, isAbsolute bool, rect SMALL_RECT) error {
-	r1, r2, err := setConsoleWindowInfoProc.Call(handle, uintptr(boolToBOOL(isAbsolute)), uintptr(unsafe.Pointer(&rect)))
-	use(isAbsolute)
-	use(rect)
-	return checkError(r1, r2, err)
-}
-
-// WriteConsoleOutput writes the CHAR_INFOs from the provided buffer to the active console buffer.
-// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms687404(v=vs.85).aspx.
-func WriteConsoleOutput(handle uintptr, buffer []CHAR_INFO, bufferSize COORD, bufferCoord COORD, writeRegion *SMALL_RECT) error {
-	r1, r2, err := writeConsoleOutputProc.Call(handle, uintptr(unsafe.Pointer(&buffer[0])), coordToPointer(bufferSize), coordToPointer(bufferCoord), uintptr(unsafe.Pointer(writeRegion)))
-	use(buffer)
-	use(bufferSize)
-	use(bufferCoord)
-	return checkError(r1, r2, err)
-}
-
-// ReadConsoleInput reads (and removes) data from the console input buffer.
-// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms684961(v=vs.85).aspx.
-func ReadConsoleInput(handle uintptr, buffer []INPUT_RECORD, count *uint32) error {
-	r1, r2, err := readConsoleInputProc.Call(handle, uintptr(unsafe.Pointer(&buffer[0])), uintptr(len(buffer)), uintptr(unsafe.Pointer(count)))
-	use(buffer)
-	return checkError(r1, r2, err)
-}
-
-// WaitForSingleObject waits for the passed handle to be signaled.
-// It returns true if the handle was signaled; false otherwise.
-// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms687032(v=vs.85).aspx.
-func WaitForSingleObject(handle uintptr, msWait uint32) (bool, error) {
-	r1, _, err := waitForSingleObjectProc.Call(handle, uintptr(uint32(msWait)))
-	switch r1 {
-	case WAIT_ABANDONED, WAIT_TIMEOUT:
-		return false, nil
-	case WAIT_SIGNALED:
-		return true, nil
-	}
-	use(msWait)
-	return false, err
-}
-
-// String helpers
-func (info CONSOLE_SCREEN_BUFFER_INFO) String() string {
-	return fmt.Sprintf("Size(%v) Cursor(%v) Window(%v) Max(%v)", info.Size, info.CursorPosition, info.Window, info.MaximumWindowSize)
-}
-
-func (coord COORD) String() string {
-	return fmt.Sprintf("%v,%v", coord.X, coord.Y)
-}
-
-func (rect SMALL_RECT) String() string {
-	return fmt.Sprintf("(%v,%v),(%v,%v)", rect.Left, rect.Top, rect.Right, rect.Bottom)
-}
-
-// checkError evaluates the results of a Windows API call and returns the error if it failed.
-func checkError(r1, r2 uintptr, err error) error {
-	// Windows APIs return non-zero to indicate success
-	if r1 != 0 {
-		return nil
-	}
-
-	// Return the error if provided, otherwise default to EINVAL
-	if err != nil {
-		return err
-	}
-	return syscall.EINVAL
-}
-
-// coordToPointer converts a COORD into a uintptr (by fooling the type system).
-func coordToPointer(c COORD) uintptr {
-	// Note: This code assumes the two SHORTs are correctly laid out; the "cast" to uint32 is just to get a pointer to pass.
-	return uintptr(*((*uint32)(unsafe.Pointer(&c))))
-}
-
-// use is a no-op, but the compiler cannot see that it is.
-// Calling use(p) ensures that p is kept live until that point.
-func use(p interface{}) {}
diff --git a/vendor/github.com/Azure/go-ansiterm/winterm/attr_translation.go b/vendor/github.com/Azure/go-ansiterm/winterm/attr_translation.go
deleted file mode 100644
index cbec8f728f..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/winterm/attr_translation.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// +build windows
-
-package winterm
-
-import "github.com/Azure/go-ansiterm"
-
-const (
-	FOREGROUND_COLOR_MASK = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE
-	BACKGROUND_COLOR_MASK = BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE
-)
-
-// collectAnsiIntoWindowsAttributes modifies the passed Windows text mode flags to reflect the
-// request represented by the passed ANSI mode.
-func collectAnsiIntoWindowsAttributes(windowsMode uint16, inverted bool, baseMode uint16, ansiMode int16) (uint16, bool) {
-	switch ansiMode {
-
-	// Mode styles
-	case ansiterm.ANSI_SGR_BOLD:
-		windowsMode = windowsMode | FOREGROUND_INTENSITY
-
-	case ansiterm.ANSI_SGR_DIM, ansiterm.ANSI_SGR_BOLD_DIM_OFF:
-		windowsMode &^= FOREGROUND_INTENSITY
-
-	case ansiterm.ANSI_SGR_UNDERLINE:
-		windowsMode = windowsMode | COMMON_LVB_UNDERSCORE
-
-	case ansiterm.ANSI_SGR_REVERSE:
-		inverted = true
-
-	case ansiterm.ANSI_SGR_REVERSE_OFF:
-		inverted = false
-
-	case ansiterm.ANSI_SGR_UNDERLINE_OFF:
-		windowsMode &^= COMMON_LVB_UNDERSCORE
-
-		// Foreground colors
-	case ansiterm.ANSI_SGR_FOREGROUND_DEFAULT:
-		windowsMode = (windowsMode &^ FOREGROUND_MASK) | (baseMode & FOREGROUND_MASK)
-
-	case ansiterm.ANSI_SGR_FOREGROUND_BLACK:
-		windowsMode = (windowsMode &^ FOREGROUND_COLOR_MASK)
-
-	case ansiterm.ANSI_SGR_FOREGROUND_RED:
-		windowsMode = (windowsMode &^ FOREGROUND_COLOR_MASK) | FOREGROUND_RED
-
-	case ansiterm.ANSI_SGR_FOREGROUND_GREEN:
-		windowsMode = (windowsMode &^ FOREGROUND_COLOR_MASK) | FOREGROUND_GREEN
-
-	case ansiterm.ANSI_SGR_FOREGROUND_YELLOW:
-		windowsMode = (windowsMode &^ FOREGROUND_COLOR_MASK) | FOREGROUND_RED | FOREGROUND_GREEN
-
-	case ansiterm.ANSI_SGR_FOREGROUND_BLUE:
-		windowsMode = (windowsMode &^ FOREGROUND_COLOR_MASK) | FOREGROUND_BLUE
-
-	case ansiterm.ANSI_SGR_FOREGROUND_MAGENTA:
-		windowsMode = (windowsMode &^ FOREGROUND_COLOR_MASK) | FOREGROUND_RED | FOREGROUND_BLUE
-
-	case ansiterm.ANSI_SGR_FOREGROUND_CYAN:
-		windowsMode = (windowsMode &^ FOREGROUND_COLOR_MASK) | FOREGROUND_GREEN | FOREGROUND_BLUE
-
-	case ansiterm.ANSI_SGR_FOREGROUND_WHITE:
-		windowsMode = (windowsMode &^ FOREGROUND_COLOR_MASK) | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE
-
-		// Background colors
-	case ansiterm.ANSI_SGR_BACKGROUND_DEFAULT:
-		// Black with no intensity
-		windowsMode = (windowsMode &^ BACKGROUND_MASK) | (baseMode & BACKGROUND_MASK)
-
-	case ansiterm.ANSI_SGR_BACKGROUND_BLACK:
-		windowsMode = (windowsMode &^ BACKGROUND_COLOR_MASK)
-
-	case ansiterm.ANSI_SGR_BACKGROUND_RED:
-		windowsMode = (windowsMode &^ BACKGROUND_COLOR_MASK) | BACKGROUND_RED
-
-	case ansiterm.ANSI_SGR_BACKGROUND_GREEN:
-		windowsMode = (windowsMode &^ BACKGROUND_COLOR_MASK) | BACKGROUND_GREEN
-
-	case ansiterm.ANSI_SGR_BACKGROUND_YELLOW:
-		windowsMode = (windowsMode &^ BACKGROUND_COLOR_MASK) | BACKGROUND_RED | BACKGROUND_GREEN
-
-	case ansiterm.ANSI_SGR_BACKGROUND_BLUE:
-		windowsMode = (windowsMode &^ BACKGROUND_COLOR_MASK) | BACKGROUND_BLUE
-
-	case ansiterm.ANSI_SGR_BACKGROUND_MAGENTA:
-		windowsMode = (windowsMode &^ BACKGROUND_COLOR_MASK) | BACKGROUND_RED | BACKGROUND_BLUE
-
-	case ansiterm.ANSI_SGR_BACKGROUND_CYAN:
-		windowsMode = (windowsMode &^ BACKGROUND_COLOR_MASK) | BACKGROUND_GREEN | BACKGROUND_BLUE
-
-	case ansiterm.ANSI_SGR_BACKGROUND_WHITE:
-		windowsMode = (windowsMode &^ BACKGROUND_COLOR_MASK) | BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE
-	}
-
-	return windowsMode, inverted
-}
-
-// invertAttributes inverts the foreground and background colors of a Windows attributes value
-func invertAttributes(windowsMode uint16) uint16 {
-	return (COMMON_LVB_MASK & windowsMode) | ((FOREGROUND_MASK & windowsMode) << 4) | ((BACKGROUND_MASK & windowsMode) >> 4)
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/winterm/cursor_helpers.go b/vendor/github.com/Azure/go-ansiterm/winterm/cursor_helpers.go
deleted file mode 100644
index f015723ade..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/winterm/cursor_helpers.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// +build windows
-
-package winterm
-
-const (
-	horizontal = iota
-	vertical
-)
-
-func (h *windowsAnsiEventHandler) getCursorWindow(info *CONSOLE_SCREEN_BUFFER_INFO) SMALL_RECT {
-	if h.originMode {
-		sr := h.effectiveSr(info.Window)
-		return SMALL_RECT{
-			Top:    sr.top,
-			Bottom: sr.bottom,
-			Left:   0,
-			Right:  info.Size.X - 1,
-		}
-	} else {
-		return SMALL_RECT{
-			Top:    info.Window.Top,
-			Bottom: info.Window.Bottom,
-			Left:   0,
-			Right:  info.Size.X - 1,
-		}
-	}
-}
-
-// setCursorPosition sets the cursor to the specified position, bounded to the screen size
-func (h *windowsAnsiEventHandler) setCursorPosition(position COORD, window SMALL_RECT) error {
-	position.X = ensureInRange(position.X, window.Left, window.Right)
-	position.Y = ensureInRange(position.Y, window.Top, window.Bottom)
-	err := SetConsoleCursorPosition(h.fd, position)
-	if err != nil {
-		return err
-	}
-	logger.Infof("Cursor position set: (%d, %d)", position.X, position.Y)
-	return err
-}
-
-func (h *windowsAnsiEventHandler) moveCursorVertical(param int) error {
-	return h.moveCursor(vertical, param)
-}
-
-func (h *windowsAnsiEventHandler) moveCursorHorizontal(param int) error {
-	return h.moveCursor(horizontal, param)
-}
-
-func (h *windowsAnsiEventHandler) moveCursor(moveMode int, param int) error {
-	info, err := GetConsoleScreenBufferInfo(h.fd)
-	if err != nil {
-		return err
-	}
-
-	position := info.CursorPosition
-	switch moveMode {
-	case horizontal:
-		position.X += int16(param)
-	case vertical:
-		position.Y += int16(param)
-	}
-
-	if err = h.setCursorPosition(position, h.getCursorWindow(info)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (h *windowsAnsiEventHandler) moveCursorLine(param int) error {
-	info, err := GetConsoleScreenBufferInfo(h.fd)
-	if err != nil {
-		return err
-	}
-
-	position := info.CursorPosition
-	position.X = 0
-	position.Y += int16(param)
-
-	if err = h.setCursorPosition(position, h.getCursorWindow(info)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (h *windowsAnsiEventHandler) moveCursorColumn(param int) error {
-	info, err := GetConsoleScreenBufferInfo(h.fd)
-	if err != nil {
-		return err
-	}
-
-	position := info.CursorPosition
-	position.X = int16(param) - 1
-
-	if err = h.setCursorPosition(position, h.getCursorWindow(info)); err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/winterm/erase_helpers.go b/vendor/github.com/Azure/go-ansiterm/winterm/erase_helpers.go
deleted file mode 100644
index 244b5fa25e..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/winterm/erase_helpers.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// +build windows
-
-package winterm
-
-import "github.com/Azure/go-ansiterm"
-
-func (h *windowsAnsiEventHandler) clearRange(attributes uint16, fromCoord COORD, toCoord COORD) error {
-	// Ignore an invalid (negative area) request
-	if toCoord.Y < fromCoord.Y {
-		return nil
-	}
-
-	var err error
-
-	var coordStart = COORD{}
-	var coordEnd = COORD{}
-
-	xCurrent, yCurrent := fromCoord.X, fromCoord.Y
-	xEnd, yEnd := toCoord.X, toCoord.Y
-
-	// Clear any partial initial line
-	if xCurrent > 0 {
-		coordStart.X, coordStart.Y = xCurrent, yCurrent
-		coordEnd.X, coordEnd.Y = xEnd, yCurrent
-
-		err = h.clearRect(attributes, coordStart, coordEnd)
-		if err != nil {
-			return err
-		}
-
-		xCurrent = 0
-		yCurrent += 1
-	}
-
-	// Clear intervening rectangular section
-	if yCurrent < yEnd {
-		coordStart.X, coordStart.Y = xCurrent, yCurrent
-		coordEnd.X, coordEnd.Y = xEnd, yEnd-1
-
-		err = h.clearRect(attributes, coordStart, coordEnd)
-		if err != nil {
-			return err
-		}
-
-		xCurrent = 0
-		yCurrent = yEnd
-	}
-
-	// Clear remaining partial ending line
-	coordStart.X, coordStart.Y = xCurrent, yCurrent
-	coordEnd.X, coordEnd.Y = xEnd, yEnd
-
-	err = h.clearRect(attributes, coordStart, coordEnd)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (h *windowsAnsiEventHandler) clearRect(attributes uint16, fromCoord COORD, toCoord COORD) error {
-	region := SMALL_RECT{Top: fromCoord.Y, Left: fromCoord.X, Bottom: toCoord.Y, Right: toCoord.X}
-	width := toCoord.X - fromCoord.X + 1
-	height := toCoord.Y - fromCoord.Y + 1
-	size := uint32(width) * uint32(height)
-
-	if size <= 0 {
-		return nil
-	}
-
-	buffer := make([]CHAR_INFO, size)
-
-	char := CHAR_INFO{ansiterm.FILL_CHARACTER, attributes}
-	for i := 0; i < int(size); i++ {
-		buffer[i] = char
-	}
-
-	err := WriteConsoleOutput(h.fd, buffer, COORD{X: width, Y: height}, COORD{X: 0, Y: 0}, &region)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/winterm/scroll_helper.go b/vendor/github.com/Azure/go-ansiterm/winterm/scroll_helper.go
deleted file mode 100644
index 706d270577..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/winterm/scroll_helper.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// +build windows
-
-package winterm
-
-// effectiveSr gets the current effective scroll region in buffer coordinates
-func (h *windowsAnsiEventHandler) effectiveSr(window SMALL_RECT) scrollRegion {
-	top := addInRange(window.Top, h.sr.top, window.Top, window.Bottom)
-	bottom := addInRange(window.Top, h.sr.bottom, window.Top, window.Bottom)
-	if top >= bottom {
-		top = window.Top
-		bottom = window.Bottom
-	}
-	return scrollRegion{top: top, bottom: bottom}
-}
-
-func (h *windowsAnsiEventHandler) scrollUp(param int) error {
-	info, err := GetConsoleScreenBufferInfo(h.fd)
-	if err != nil {
-		return err
-	}
-
-	sr := h.effectiveSr(info.Window)
-	return h.scroll(param, sr, info)
-}
-
-func (h *windowsAnsiEventHandler) scrollDown(param int) error {
-	return h.scrollUp(-param)
-}
-
-func (h *windowsAnsiEventHandler) deleteLines(param int) error {
-	info, err := GetConsoleScreenBufferInfo(h.fd)
-	if err != nil {
-		return err
-	}
-
-	start := info.CursorPosition.Y
-	sr := h.effectiveSr(info.Window)
-	// Lines cannot be inserted or deleted outside the scrolling region.
-	if start >= sr.top && start <= sr.bottom {
-		sr.top = start
-		return h.scroll(param, sr, info)
-	} else {
-		return nil
-	}
-}
-
-func (h *windowsAnsiEventHandler) insertLines(param int) error {
-	return h.deleteLines(-param)
-}
-
-// scroll scrolls the provided scroll region by param lines. The scroll region is in buffer coordinates.
-func (h *windowsAnsiEventHandler) scroll(param int, sr scrollRegion, info *CONSOLE_SCREEN_BUFFER_INFO) error {
-	logger.Infof("scroll: scrollTop: %d, scrollBottom: %d", sr.top, sr.bottom)
-	logger.Infof("scroll: windowTop: %d, windowBottom: %d", info.Window.Top, info.Window.Bottom)
-
-	// Copy from and clip to the scroll region (full buffer width)
-	scrollRect := SMALL_RECT{
-		Top:    sr.top,
-		Bottom: sr.bottom,
-		Left:   0,
-		Right:  info.Size.X - 1,
-	}
-
-	// Origin to which area should be copied
-	destOrigin := COORD{
-		X: 0,
-		Y: sr.top - int16(param),
-	}
-
-	char := CHAR_INFO{
-		UnicodeChar: ' ',
-		Attributes:  h.attributes,
-	}
-
-	if err := ScrollConsoleScreenBuffer(h.fd, scrollRect, scrollRect, destOrigin, char); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (h *windowsAnsiEventHandler) deleteCharacters(param int) error {
-	info, err := GetConsoleScreenBufferInfo(h.fd)
-	if err != nil {
-		return err
-	}
-	return h.scrollLine(param, info.CursorPosition, info)
-}
-
-func (h *windowsAnsiEventHandler) insertCharacters(param int) error {
-	return h.deleteCharacters(-param)
-}
-
-// scrollLine scrolls a line horizontally starting at the provided position by a number of columns.
-func (h *windowsAnsiEventHandler) scrollLine(columns int, position COORD, info *CONSOLE_SCREEN_BUFFER_INFO) error {
-	// Copy from and clip to the scroll region (full buffer width)
-	scrollRect := SMALL_RECT{
-		Top:    position.Y,
-		Bottom: position.Y,
-		Left:   position.X,
-		Right:  info.Size.X - 1,
-	}
-
-	// Origin to which area should be copied
-	destOrigin := COORD{
-		X: position.X - int16(columns),
-		Y: position.Y,
-	}
-
-	char := CHAR_INFO{
-		UnicodeChar: ' ',
-		Attributes:  h.attributes,
-	}
-
-	if err := ScrollConsoleScreenBuffer(h.fd, scrollRect, scrollRect, destOrigin, char); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/winterm/utilities.go b/vendor/github.com/Azure/go-ansiterm/winterm/utilities.go
deleted file mode 100644
index afa7635d77..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/winterm/utilities.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build windows
-
-package winterm
-
-// AddInRange increments a value by the passed quantity while ensuring the values
-// always remain within the supplied min / max range.
-func addInRange(n int16, increment int16, min int16, max int16) int16 {
-	return ensureInRange(n+increment, min, max)
-}
diff --git a/vendor/github.com/Azure/go-ansiterm/winterm/win_event_handler.go b/vendor/github.com/Azure/go-ansiterm/winterm/win_event_handler.go
deleted file mode 100644
index 4d858ed611..0000000000
--- a/vendor/github.com/Azure/go-ansiterm/winterm/win_event_handler.go
+++ /dev/null
@@ -1,726 +0,0 @@
-// +build windows
-
-package winterm
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"strconv"
-
-	"github.com/Azure/go-ansiterm"
-	"github.com/Sirupsen/logrus"
-)
-
-var logger *logrus.Logger
-
-type windowsAnsiEventHandler struct {
-	fd             uintptr
-	file           *os.File
-	infoReset      *CONSOLE_SCREEN_BUFFER_INFO
-	sr             scrollRegion
-	buffer         bytes.Buffer
-	attributes     uint16
-	inverted       bool
-	wrapNext       bool
-	drewMarginByte bool
-	originMode     bool
-	marginByte     byte
-	curInfo        *CONSOLE_SCREEN_BUFFER_INFO
-	curPos         COORD
-}
-
-func CreateWinEventHandler(fd uintptr, file *os.File) ansiterm.AnsiEventHandler {
-	logFile := ioutil.Discard
-
-	if isDebugEnv := os.Getenv(ansiterm.LogEnv); isDebugEnv == "1" {
-		logFile, _ = os.Create("winEventHandler.log")
-	}
-
-	logger = &logrus.Logger{
-		Out:       logFile,
-		Formatter: new(logrus.TextFormatter),
-		Level:     logrus.DebugLevel,
-	}
-
-	infoReset, err := GetConsoleScreenBufferInfo(fd)
-	if err != nil {
-		return nil
-	}
-
-	return &windowsAnsiEventHandler{
-		fd:         fd,
-		file:       file,
-		infoReset:  infoReset,
-		attributes: infoReset.Attributes,
-	}
-}
-
-type scrollRegion struct {
-	top    int16
-	bottom int16
-}
-
-// simulateLF simulates a LF or CR+LF by scrolling if necessary to handle the
-// current cursor position and scroll region settings, in which case it returns
-// true. If no special handling is necessary, then it does nothing and returns
-// false.
-//
-// In the false case, the caller should ensure that a carriage return
-// and line feed are inserted or that the text is otherwise wrapped.
-func (h *windowsAnsiEventHandler) simulateLF(includeCR bool) (bool, error) {
-	if h.wrapNext {
-		if err := h.Flush(); err != nil {
-			return false, err
-		}
-		h.clearWrap()
-	}
-	pos, info, err := h.getCurrentInfo()
-	if err != nil {
-		return false, err
-	}
-	sr := h.effectiveSr(info.Window)
-	if pos.Y == sr.bottom {
-		// Scrolling is necessary. Let Windows automatically scroll if the scrolling region
-		// is the full window.
-		if sr.top == info.Window.Top && sr.bottom == info.Window.Bottom {
-			if includeCR {
-				pos.X = 0
-				h.updatePos(pos)
-			}
-			return false, nil
-		}
-
-		// A custom scroll region is active. Scroll the window manually to simulate
-		// the LF.
-		if err := h.Flush(); err != nil {
-			return false, err
-		}
-		logger.Info("Simulating LF inside scroll region")
-		if err := h.scrollUp(1); err != nil {
-			return false, err
-		}
-		if includeCR {
-			pos.X = 0
-			if err := SetConsoleCursorPosition(h.fd, pos); err != nil {
-				return false, err
-			}
-		}
-		return true, nil
-
-	} else if pos.Y < info.Window.Bottom {
-		// Let Windows handle the LF.
-		pos.Y++
-		if includeCR {
-			pos.X = 0
-		}
-		h.updatePos(pos)
-		return false, nil
-	} else {
-		// The cursor is at the bottom of the screen but outside the scroll
-		// region. Skip the LF.
-		logger.Info("Simulating LF outside scroll region")
-		if includeCR {
-			if err := h.Flush(); err != nil {
-				return false, err
-			}
-			pos.X = 0
-			if err := SetConsoleCursorPosition(h.fd, pos); err != nil {
-				return false, err
-			}
-		}
-		return true, nil
-	}
-}
-
-// executeLF executes a LF without a CR.
-func (h *windowsAnsiEventHandler) executeLF() error {
-	handled, err := h.simulateLF(false)
-	if err != nil {
-		return err
-	}
-	if !handled {
-		// Windows LF will reset the cursor column position. Write the LF
-		// and restore the cursor position.
-		pos, _, err := h.getCurrentInfo()
-		if err != nil {
-			return err
-		}
-		h.buffer.WriteByte(ansiterm.ANSI_LINE_FEED)
-		if pos.X != 0 {
-			if err := h.Flush(); err != nil {
-				return err
-			}
-			logger.Info("Resetting cursor position for LF without CR")
-			if err := SetConsoleCursorPosition(h.fd, pos); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (h *windowsAnsiEventHandler) Print(b byte) error {
-	if h.wrapNext {
-		h.buffer.WriteByte(h.marginByte)
-		h.clearWrap()
-		if _, err := h.simulateLF(true); err != nil {
-			return err
-		}
-	}
-	pos, info, err := h.getCurrentInfo()
-	if err != nil {
-		return err
-	}
-	if pos.X == info.Size.X-1 {
-		h.wrapNext = true
-		h.marginByte = b
-	} else {
-		pos.X++
-		h.updatePos(pos)
-		h.buffer.WriteByte(b)
-	}
-	return nil
-}
-
-func (h *windowsAnsiEventHandler) Execute(b byte) error {
-	switch b {
-	case ansiterm.ANSI_TAB:
-		logger.Info("Execute(TAB)")
-		// Move to the next tab stop, but preserve auto-wrap if already set.
-		if !h.wrapNext {
-			pos, info, err := h.getCurrentInfo()
-			if err != nil {
-				return err
-			}
-			pos.X = (pos.X + 8) - pos.X%8
-			if pos.X >= info.Size.X {
-				pos.X = info.Size.X - 1
-			}
-			if err := h.Flush(); err != nil {
-				return err
-			}
-			if err := SetConsoleCursorPosition(h.fd, pos); err != nil {
-				return err
-			}
-		}
-		return nil
-
-	case ansiterm.ANSI_BEL:
-		h.buffer.WriteByte(ansiterm.ANSI_BEL)
-		return nil
-
-	case ansiterm.ANSI_BACKSPACE:
-		if h.wrapNext {
-			if err := h.Flush(); err != nil {
-				return err
-			}
-			h.clearWrap()
-		}
-		pos, _, err := h.getCurrentInfo()
-		if err != nil {
-			return err
-		}
-		if pos.X > 0 {
-			pos.X--
-			h.updatePos(pos)
-			h.buffer.WriteByte(ansiterm.ANSI_BACKSPACE)
-		}
-		return nil
-
-	case ansiterm.ANSI_VERTICAL_TAB, ansiterm.ANSI_FORM_FEED:
-		// Treat as true LF.
-		return h.executeLF()
-
-	case ansiterm.ANSI_LINE_FEED:
-		// Simulate a CR and LF for now since there is no way in go-ansiterm
-		// to tell if the LF should include CR (and more things break when it's
-		// missing than when it's incorrectly added).
-		handled, err := h.simulateLF(true)
-		if handled || err != nil {
-			return err
-		}
-		return h.buffer.WriteByte(ansiterm.ANSI_LINE_FEED)
-
-	case ansiterm.ANSI_CARRIAGE_RETURN:
-		if h.wrapNext {
-			if err := h.Flush(); err != nil {
-				return err
-			}
-			h.clearWrap()
-		}
-		pos, _, err := h.getCurrentInfo()
-		if err != nil {
-			return err
-		}
-		if pos.X != 0 {
-			pos.X = 0
-			h.updatePos(pos)
-			h.buffer.WriteByte(ansiterm.ANSI_CARRIAGE_RETURN)
-		}
-		return nil
-
-	default:
-		return nil
-	}
-}
-
-func (h *windowsAnsiEventHandler) CUU(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("CUU: [%v]", []string{strconv.Itoa(param)})
-	h.clearWrap()
-	return h.moveCursorVertical(-param)
-}
-
-func (h *windowsAnsiEventHandler) CUD(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("CUD: [%v]", []string{strconv.Itoa(param)})
-	h.clearWrap()
-	return h.moveCursorVertical(param)
-}
-
-func (h *windowsAnsiEventHandler) CUF(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("CUF: [%v]", []string{strconv.Itoa(param)})
-	h.clearWrap()
-	return h.moveCursorHorizontal(param)
-}
-
-func (h *windowsAnsiEventHandler) CUB(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("CUB: [%v]", []string{strconv.Itoa(param)})
-	h.clearWrap()
-	return h.moveCursorHorizontal(-param)
-}
-
-func (h *windowsAnsiEventHandler) CNL(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("CNL: [%v]", []string{strconv.Itoa(param)})
-	h.clearWrap()
-	return h.moveCursorLine(param)
-}
-
-func (h *windowsAnsiEventHandler) CPL(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("CPL: [%v]", []string{strconv.Itoa(param)})
-	h.clearWrap()
-	return h.moveCursorLine(-param)
-}
-
-func (h *windowsAnsiEventHandler) CHA(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("CHA: [%v]", []string{strconv.Itoa(param)})
-	h.clearWrap()
-	return h.moveCursorColumn(param)
-}
-
-func (h *windowsAnsiEventHandler) VPA(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("VPA: [[%d]]", param)
-	h.clearWrap()
-	info, err := GetConsoleScreenBufferInfo(h.fd)
-	if err != nil {
-		return err
-	}
-	window := h.getCursorWindow(info)
-	position := info.CursorPosition
-	position.Y = window.Top + int16(param) - 1
-	return h.setCursorPosition(position, window)
-}
-
-func (h *windowsAnsiEventHandler) CUP(row int, col int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("CUP: [[%d %d]]", row, col)
-	h.clearWrap()
-	info, err := GetConsoleScreenBufferInfo(h.fd)
-	if err != nil {
-		return err
-	}
-
-	window := h.getCursorWindow(info)
-	position := COORD{window.Left + int16(col) - 1, window.Top + int16(row) - 1}
-	return h.setCursorPosition(position, window)
-}
-
-func (h *windowsAnsiEventHandler) HVP(row int, col int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("HVP: [[%d %d]]", row, col)
-	h.clearWrap()
-	return h.CUP(row, col)
-}
-
-func (h *windowsAnsiEventHandler) DECTCEM(visible bool) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("DECTCEM: [%v]", []string{strconv.FormatBool(visible)})
-	h.clearWrap()
-	return nil
-}
-
-func (h *windowsAnsiEventHandler) DECOM(enable bool) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("DECOM: [%v]", []string{strconv.FormatBool(enable)})
-	h.clearWrap()
-	h.originMode = enable
-	return h.CUP(1, 1)
-}
-
-func (h *windowsAnsiEventHandler) DECCOLM(use132 bool) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("DECCOLM: [%v]", []string{strconv.FormatBool(use132)})
-	h.clearWrap()
-	if err := h.ED(2); err != nil {
-		return err
-	}
-	info, err := GetConsoleScreenBufferInfo(h.fd)
-	if err != nil {
-		return err
-	}
-	targetWidth := int16(80)
-	if use132 {
-		targetWidth = 132
-	}
-	if info.Size.X < targetWidth {
-		if err := SetConsoleScreenBufferSize(h.fd, COORD{targetWidth, info.Size.Y}); err != nil {
-			logger.Info("set buffer failed:", err)
-			return err
-		}
-	}
-	window := info.Window
-	window.Left = 0
-	window.Right = targetWidth - 1
-	if err := SetConsoleWindowInfo(h.fd, true, window); err != nil {
-		logger.Info("set window failed:", err)
-		return err
-	}
-	if info.Size.X > targetWidth {
-		if err := SetConsoleScreenBufferSize(h.fd, COORD{targetWidth, info.Size.Y}); err != nil {
-			logger.Info("set buffer failed:", err)
-			return err
-		}
-	}
-	return SetConsoleCursorPosition(h.fd, COORD{0, 0})
-}
-
-func (h *windowsAnsiEventHandler) ED(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("ED: [%v]", []string{strconv.Itoa(param)})
-	h.clearWrap()
-
-	// [J  -- Erases from the cursor to the end of the screen, including the cursor position.
-	// [1J -- Erases from the beginning of the screen to the cursor, including the cursor position.
-	// [2J -- Erases the complete display. The cursor does not move.
-	// Notes:
-	// -- Clearing the entire buffer, versus just the Window, works best for Windows Consoles
-
-	info, err := GetConsoleScreenBufferInfo(h.fd)
-	if err != nil {
-		return err
-	}
-
-	var start COORD
-	var end COORD
-
-	switch param {
-	case 0:
-		start = info.CursorPosition
-		end = COORD{info.Size.X - 1, info.Size.Y - 1}
-
-	case 1:
-		start = COORD{0, 0}
-		end = info.CursorPosition
-
-	case 2:
-		start = COORD{0, 0}
-		end = COORD{info.Size.X - 1, info.Size.Y - 1}
-	}
-
-	err = h.clearRange(h.attributes, start, end)
-	if err != nil {
-		return err
-	}
-
-	// If the whole buffer was cleared, move the window to the top while preserving
-	// the window-relative cursor position.
-	if param == 2 {
-		pos := info.CursorPosition
-		window := info.Window
-		pos.Y -= window.Top
-		window.Bottom -= window.Top
-		window.Top = 0
-		if err := SetConsoleCursorPosition(h.fd, pos); err != nil {
-			return err
-		}
-		if err := SetConsoleWindowInfo(h.fd, true, window); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (h *windowsAnsiEventHandler) EL(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("EL: [%v]", strconv.Itoa(param))
-	h.clearWrap()
-
-	// [K  -- Erases from the cursor to the end of the line, including the cursor position.
-	// [1K -- Erases from the beginning of the line to the cursor, including the cursor position.
-	// [2K -- Erases the complete line.
-
-	info, err := GetConsoleScreenBufferInfo(h.fd)
-	if err != nil {
-		return err
-	}
-
-	var start COORD
-	var end COORD
-
-	switch param {
-	case 0:
-		start = info.CursorPosition
-		end = COORD{info.Size.X, info.CursorPosition.Y}
-
-	case 1:
-		start = COORD{0, info.CursorPosition.Y}
-		end = info.CursorPosition
-
-	case 2:
-		start = COORD{0, info.CursorPosition.Y}
-		end = COORD{info.Size.X, info.CursorPosition.Y}
-	}
-
-	err = h.clearRange(h.attributes, start, end)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (h *windowsAnsiEventHandler) IL(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("IL: [%v]", strconv.Itoa(param))
-	h.clearWrap()
-	return h.insertLines(param)
-}
-
-func (h *windowsAnsiEventHandler) DL(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("DL: [%v]", strconv.Itoa(param))
-	h.clearWrap()
-	return h.deleteLines(param)
-}
-
-func (h *windowsAnsiEventHandler) ICH(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("ICH: [%v]", strconv.Itoa(param))
-	h.clearWrap()
-	return h.insertCharacters(param)
-}
-
-func (h *windowsAnsiEventHandler) DCH(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("DCH: [%v]", strconv.Itoa(param))
-	h.clearWrap()
-	return h.deleteCharacters(param)
-}
-
-func (h *windowsAnsiEventHandler) SGR(params []int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	strings := []string{}
-	for _, v := range params {
-		strings = append(strings, strconv.Itoa(v))
-	}
-
-	logger.Infof("SGR: [%v]", strings)
-
-	if len(params) <= 0 {
-		h.attributes = h.infoReset.Attributes
-		h.inverted = false
-	} else {
-		for _, attr := range params {
-
-			if attr == ansiterm.ANSI_SGR_RESET {
-				h.attributes = h.infoReset.Attributes
-				h.inverted = false
-				continue
-			}
-
-			h.attributes, h.inverted = collectAnsiIntoWindowsAttributes(h.attributes, h.inverted, h.infoReset.Attributes, int16(attr))
-		}
-	}
-
-	attributes := h.attributes
-	if h.inverted {
-		attributes = invertAttributes(attributes)
-	}
-	err := SetConsoleTextAttribute(h.fd, attributes)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (h *windowsAnsiEventHandler) SU(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("SU: [%v]", []string{strconv.Itoa(param)})
-	h.clearWrap()
-	return h.scrollUp(param)
-}
-
-func (h *windowsAnsiEventHandler) SD(param int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("SD: [%v]", []string{strconv.Itoa(param)})
-	h.clearWrap()
-	return h.scrollDown(param)
-}
-
-func (h *windowsAnsiEventHandler) DA(params []string) error {
-	logger.Infof("DA: [%v]", params)
-	// DA cannot be implemented because it must send data on the VT100 input stream,
-	// which is not available to go-ansiterm.
-	return nil
-}
-
-func (h *windowsAnsiEventHandler) DECSTBM(top int, bottom int) error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Infof("DECSTBM: [%d, %d]", top, bottom)
-
-	// Windows is 0 indexed, Linux is 1 indexed
-	h.sr.top = int16(top - 1)
-	h.sr.bottom = int16(bottom - 1)
-
-	// This command also moves the cursor to the origin.
-	h.clearWrap()
-	return h.CUP(1, 1)
-}
-
-func (h *windowsAnsiEventHandler) RI() error {
-	if err := h.Flush(); err != nil {
-		return err
-	}
-	logger.Info("RI: []")
-	h.clearWrap()
-
-	info, err := GetConsoleScreenBufferInfo(h.fd)
-	if err != nil {
-		return err
-	}
-
-	sr := h.effectiveSr(info.Window)
-	if info.CursorPosition.Y == sr.top {
-		return h.scrollDown(1)
-	}
-
-	return h.moveCursorVertical(-1)
-}
-
-func (h *windowsAnsiEventHandler) IND() error {
-	logger.Info("IND: []")
-	return h.executeLF()
-}
-
-func (h *windowsAnsiEventHandler) Flush() error {
-	h.curInfo = nil
-	if h.buffer.Len() > 0 {
-		logger.Infof("Flush: [%s]", h.buffer.Bytes())
-		if _, err := h.buffer.WriteTo(h.file); err != nil {
-			return err
-		}
-	}
-
-	if h.wrapNext && !h.drewMarginByte {
-		logger.Infof("Flush: drawing margin byte '%c'", h.marginByte)
-
-		info, err := GetConsoleScreenBufferInfo(h.fd)
-		if err != nil {
-			return err
-		}
-
-		charInfo := []CHAR_INFO{{UnicodeChar: uint16(h.marginByte), Attributes: info.Attributes}}
-		size := COORD{1, 1}
-		position := COORD{0, 0}
-		region := SMALL_RECT{Left: info.CursorPosition.X, Top: info.CursorPosition.Y, Right: info.CursorPosition.X, Bottom: info.CursorPosition.Y}
-		if err := WriteConsoleOutput(h.fd, charInfo, size, position, &region); err != nil {
-			return err
-		}
-		h.drewMarginByte = true
-	}
-	return nil
-}
-
-// cacheConsoleInfo ensures that the current console screen information has been queried
-// since the last call to Flush(). It must be called before accessing h.curInfo or h.curPos.
-func (h *windowsAnsiEventHandler) getCurrentInfo() (COORD, *CONSOLE_SCREEN_BUFFER_INFO, error) {
-	if h.curInfo == nil {
-		info, err := GetConsoleScreenBufferInfo(h.fd)
-		if err != nil {
-			return COORD{}, nil, err
-		}
-		h.curInfo = info
-		h.curPos = info.CursorPosition
-	}
-	return h.curPos, h.curInfo, nil
-}
-
-func (h *windowsAnsiEventHandler) updatePos(pos COORD) {
-	if h.curInfo == nil {
-		panic("failed to call getCurrentInfo before calling updatePos")
-	}
-	h.curPos = pos
-}
-
-// clearWrap clears the state where the cursor is in the margin
-// waiting for the next character before wrapping the line. This must
-// be done before most operations that act on the cursor.
-func (h *windowsAnsiEventHandler) clearWrap() {
-	h.wrapNext = false
-	h.drewMarginByte = false
-}
diff --git a/vendor/github.com/Microsoft/go-winio/LICENSE b/vendor/github.com/Microsoft/go-winio/LICENSE
deleted file mode 100644
index b8b569d774..0000000000
--- a/vendor/github.com/Microsoft/go-winio/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Microsoft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/vendor/github.com/Microsoft/go-winio/README.md b/vendor/github.com/Microsoft/go-winio/README.md
deleted file mode 100644
index 5680010575..0000000000
--- a/vendor/github.com/Microsoft/go-winio/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# go-winio
-
-This repository contains utilities for efficiently performing Win32 IO operations in
-Go. Currently, this is focused on accessing named pipes and other file handles, and
-for using named pipes as a net transport.
-
-This code relies on IO completion ports to avoid blocking IO on system threads, allowing Go
-to reuse the thread to schedule another goroutine. This limits support to Windows Vista and
-newer operating systems. This is similar to the implementation of network sockets in Go's net
-package.
-
-Please see the LICENSE file for licensing information.
-
-This project has adopted the [Microsoft Open Source Code of
-Conduct](https://opensource.microsoft.com/codeofconduct/). For more information
-see the [Code of Conduct
-FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact
-[opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional
-questions or comments.
-
-Thanks to natefinch for the inspiration for this library. See https://github.com/natefinch/npipe
-for another named pipe implementation.
diff --git a/vendor/github.com/Microsoft/go-winio/backup.go b/vendor/github.com/Microsoft/go-winio/backup.go
deleted file mode 100644
index 2be34af431..0000000000
--- a/vendor/github.com/Microsoft/go-winio/backup.go
+++ /dev/null
@@ -1,280 +0,0 @@
-// +build windows
-
-package winio
-
-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"runtime"
-	"syscall"
-	"unicode/utf16"
-)
-
-//sys backupRead(h syscall.Handle, b []byte, bytesRead *uint32, abort bool, processSecurity bool, context *uintptr) (err error) = BackupRead
-//sys backupWrite(h syscall.Handle, b []byte, bytesWritten *uint32, abort bool, processSecurity bool, context *uintptr) (err error) = BackupWrite
-
-const (
-	BackupData = uint32(iota + 1)
-	BackupEaData
-	BackupSecurity
-	BackupAlternateData
-	BackupLink
-	BackupPropertyData
-	BackupObjectId
-	BackupReparseData
-	BackupSparseBlock
-	BackupTxfsData
-)
-
-const (
-	StreamSparseAttributes = uint32(8)
-)
-
-const (
-	WRITE_DAC              = 0x40000
-	WRITE_OWNER            = 0x80000
-	ACCESS_SYSTEM_SECURITY = 0x1000000
-)
-
-// BackupHeader represents a backup stream of a file.
-type BackupHeader struct {
-	Id         uint32 // The backup stream ID
-	Attributes uint32 // Stream attributes
-	Size       int64  // The size of the stream in bytes
-	Name       string // The name of the stream (for BackupAlternateData only).
-	Offset     int64  // The offset of the stream in the file (for BackupSparseBlock only).
-}
-
-type win32StreamId struct {
-	StreamId   uint32
-	Attributes uint32
-	Size       uint64
-	NameSize   uint32
-}
-
-// BackupStreamReader reads from a stream produced by the BackupRead Win32 API and produces a series
-// of BackupHeader values.
-type BackupStreamReader struct {
-	r         io.Reader
-	bytesLeft int64
-}
-
-// NewBackupStreamReader produces a BackupStreamReader from any io.Reader.
-func NewBackupStreamReader(r io.Reader) *BackupStreamReader {
-	return &BackupStreamReader{r, 0}
-}
-
-// Next returns the next backup stream and prepares for calls to Read(). It skips the remainder of the current stream if
-// it was not completely read.
-func (r *BackupStreamReader) Next() (*BackupHeader, error) {
-	if r.bytesLeft > 0 {
-		if s, ok := r.r.(io.Seeker); ok {
-			// Make sure Seek on io.SeekCurrent sometimes succeeds
-			// before trying the actual seek.
-			if _, err := s.Seek(0, io.SeekCurrent); err == nil {
-				if _, err = s.Seek(r.bytesLeft, io.SeekCurrent); err != nil {
-					return nil, err
-				}
-				r.bytesLeft = 0
-			}
-		}
-		if _, err := io.Copy(ioutil.Discard, r); err != nil {
-			return nil, err
-		}
-	}
-	var wsi win32StreamId
-	if err := binary.Read(r.r, binary.LittleEndian, &wsi); err != nil {
-		return nil, err
-	}
-	hdr := &BackupHeader{
-		Id:         wsi.StreamId,
-		Attributes: wsi.Attributes,
-		Size:       int64(wsi.Size),
-	}
-	if wsi.NameSize != 0 {
-		name := make([]uint16, int(wsi.NameSize/2))
-		if err := binary.Read(r.r, binary.LittleEndian, name); err != nil {
-			return nil, err
-		}
-		hdr.Name = syscall.UTF16ToString(name)
-	}
-	if wsi.StreamId == BackupSparseBlock {
-		if err := binary.Read(r.r, binary.LittleEndian, &hdr.Offset); err != nil {
-			return nil, err
-		}
-		hdr.Size -= 8
-	}
-	r.bytesLeft = hdr.Size
-	return hdr, nil
-}
-
-// Read reads from the current backup stream.
-func (r *BackupStreamReader) Read(b []byte) (int, error) {
-	if r.bytesLeft == 0 {
-		return 0, io.EOF
-	}
-	if int64(len(b)) > r.bytesLeft {
-		b = b[:r.bytesLeft]
-	}
-	n, err := r.r.Read(b)
-	r.bytesLeft -= int64(n)
-	if err == io.EOF {
-		err = io.ErrUnexpectedEOF
-	} else if r.bytesLeft == 0 && err == nil {
-		err = io.EOF
-	}
-	return n, err
-}
-
-// BackupStreamWriter writes a stream compatible with the BackupWrite Win32 API.
-type BackupStreamWriter struct {
-	w         io.Writer
-	bytesLeft int64
-}
-
-// NewBackupStreamWriter produces a BackupStreamWriter on top of an io.Writer.
-func NewBackupStreamWriter(w io.Writer) *BackupStreamWriter {
-	return &BackupStreamWriter{w, 0}
-}
-
-// WriteHeader writes the next backup stream header and prepares for calls to Write().
-func (w *BackupStreamWriter) WriteHeader(hdr *BackupHeader) error {
-	if w.bytesLeft != 0 {
-		return fmt.Errorf("missing %d bytes", w.bytesLeft)
-	}
-	name := utf16.Encode([]rune(hdr.Name))
-	wsi := win32StreamId{
-		StreamId:   hdr.Id,
-		Attributes: hdr.Attributes,
-		Size:       uint64(hdr.Size),
-		NameSize:   uint32(len(name) * 2),
-	}
-	if hdr.Id == BackupSparseBlock {
-		// Include space for the int64 block offset
-		wsi.Size += 8
-	}
-	if err := binary.Write(w.w, binary.LittleEndian, &wsi); err != nil {
-		return err
-	}
-	if len(name) != 0 {
-		if err := binary.Write(w.w, binary.LittleEndian, name); err != nil {
-			return err
-		}
-	}
-	if hdr.Id == BackupSparseBlock {
-		if err := binary.Write(w.w, binary.LittleEndian, hdr.Offset); err != nil {
-			return err
-		}
-	}
-	w.bytesLeft = hdr.Size
-	return nil
-}
-
-// Write writes to the current backup stream.
-func (w *BackupStreamWriter) Write(b []byte) (int, error) {
-	if w.bytesLeft < int64(len(b)) {
-		return 0, fmt.Errorf("too many bytes by %d", int64(len(b))-w.bytesLeft)
-	}
-	n, err := w.w.Write(b)
-	w.bytesLeft -= int64(n)
-	return n, err
-}
-
-// BackupFileReader provides an io.ReadCloser interface on top of the BackupRead Win32 API.
-type BackupFileReader struct {
-	f               *os.File
-	includeSecurity bool
-	ctx             uintptr
-}
-
-// NewBackupFileReader returns a new BackupFileReader from a file handle. If includeSecurity is true,
-// Read will attempt to read the security descriptor of the file.
-func NewBackupFileReader(f *os.File, includeSecurity bool) *BackupFileReader {
-	r := &BackupFileReader{f, includeSecurity, 0}
-	return r
-}
-
-// Read reads a backup stream from the file by calling the Win32 API BackupRead().
-func (r *BackupFileReader) Read(b []byte) (int, error) {
-	var bytesRead uint32
-	err := backupRead(syscall.Handle(r.f.Fd()), b, &bytesRead, false, r.includeSecurity, &r.ctx)
-	if err != nil {
-		return 0, &os.PathError{"BackupRead", r.f.Name(), err}
-	}
-	runtime.KeepAlive(r.f)
-	if bytesRead == 0 {
-		return 0, io.EOF
-	}
-	return int(bytesRead), nil
-}
-
-// Close frees Win32 resources associated with the BackupFileReader. It does not close
-// the underlying file.
-func (r *BackupFileReader) Close() error {
-	if r.ctx != 0 {
-		backupRead(syscall.Handle(r.f.Fd()), nil, nil, true, false, &r.ctx)
-		runtime.KeepAlive(r.f)
-		r.ctx = 0
-	}
-	return nil
-}
-
-// BackupFileWriter provides an io.WriteCloser interface on top of the BackupWrite Win32 API.
-type BackupFileWriter struct {
-	f               *os.File
-	includeSecurity bool
-	ctx             uintptr
-}
-
-// NewBackupFileWriter returns a new BackupFileWriter from a file handle. If includeSecurity is true,
-// Write() will attempt to restore the security descriptor from the stream.
-func NewBackupFileWriter(f *os.File, includeSecurity bool) *BackupFileWriter {
-	w := &BackupFileWriter{f, includeSecurity, 0}
-	return w
-}
-
-// Write restores a portion of the file using the provided backup stream.
-func (w *BackupFileWriter) Write(b []byte) (int, error) {
-	var bytesWritten uint32
-	err := backupWrite(syscall.Handle(w.f.Fd()), b, &bytesWritten, false, w.includeSecurity, &w.ctx)
-	if err != nil {
-		return 0, &os.PathError{"BackupWrite", w.f.Name(), err}
-	}
-	runtime.KeepAlive(w.f)
-	if int(bytesWritten) != len(b) {
-		return int(bytesWritten), errors.New("not all bytes could be written")
-	}
-	return len(b), nil
-}
-
-// Close frees Win32 resources associated with the BackupFileWriter. It does not
-// close the underlying file.
-func (w *BackupFileWriter) Close() error {
-	if w.ctx != 0 {
-		backupWrite(syscall.Handle(w.f.Fd()), nil, nil, true, false, &w.ctx)
-		runtime.KeepAlive(w.f)
-		w.ctx = 0
-	}
-	return nil
-}
-
-// OpenForBackup opens a file or directory, potentially skipping access checks if the backup
-// or restore privileges have been acquired.
-//
-// If the file opened was a directory, it cannot be used with Readdir().
-func OpenForBackup(path string, access uint32, share uint32, createmode uint32) (*os.File, error) {
-	winPath, err := syscall.UTF16FromString(path)
-	if err != nil {
-		return nil, err
-	}
-	h, err := syscall.CreateFile(&winPath[0], access, share, nil, createmode, syscall.FILE_FLAG_BACKUP_SEMANTICS|syscall.FILE_FLAG_OPEN_REPARSE_POINT, 0)
-	if err != nil {
-		err = &os.PathError{Op: "open", Path: path, Err: err}
-		return nil, err
-	}
-	return os.NewFile(uintptr(h), path), nil
-}
diff --git a/vendor/github.com/Microsoft/go-winio/ea.go b/vendor/github.com/Microsoft/go-winio/ea.go
deleted file mode 100644
index b37e930d6a..0000000000
--- a/vendor/github.com/Microsoft/go-winio/ea.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package winio
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-)
-
-type fileFullEaInformation struct {
-	NextEntryOffset uint32
-	Flags           uint8
-	NameLength      uint8
-	ValueLength     uint16
-}
-
-var (
-	fileFullEaInformationSize = binary.Size(&fileFullEaInformation{})
-
-	errInvalidEaBuffer = errors.New("invalid extended attribute buffer")
-	errEaNameTooLarge  = errors.New("extended attribute name too large")
-	errEaValueTooLarge = errors.New("extended attribute value too large")
-)
-
-// ExtendedAttribute represents a single Windows EA.
-type ExtendedAttribute struct {
-	Name  string
-	Value []byte
-	Flags uint8
-}
-
-func parseEa(b []byte) (ea ExtendedAttribute, nb []byte, err error) {
-	var info fileFullEaInformation
-	err = binary.Read(bytes.NewReader(b), binary.LittleEndian, &info)
-	if err != nil {
-		err = errInvalidEaBuffer
-		return
-	}
-
-	nameOffset := fileFullEaInformationSize
-	nameLen := int(info.NameLength)
-	valueOffset := nameOffset + int(info.NameLength) + 1
-	valueLen := int(info.ValueLength)
-	nextOffset := int(info.NextEntryOffset)
-	if valueLen+valueOffset > len(b) || nextOffset < 0 || nextOffset > len(b) {
-		err = errInvalidEaBuffer
-		return
-	}
-
-	ea.Name = string(b[nameOffset : nameOffset+nameLen])
-	ea.Value = b[valueOffset : valueOffset+valueLen]
-	ea.Flags = info.Flags
-	if info.NextEntryOffset != 0 {
-		nb = b[info.NextEntryOffset:]
-	}
-	return
-}
-
-// DecodeExtendedAttributes decodes a list of EAs from a FILE_FULL_EA_INFORMATION
-// buffer retrieved from BackupRead, ZwQueryEaFile, etc.
-func DecodeExtendedAttributes(b []byte) (eas []ExtendedAttribute, err error) {
-	for len(b) != 0 {
-		ea, nb, err := parseEa(b)
-		if err != nil {
-			return nil, err
-		}
-
-		eas = append(eas, ea)
-		b = nb
-	}
-	return
-}
-
-func writeEa(buf *bytes.Buffer, ea *ExtendedAttribute, last bool) error {
-	if int(uint8(len(ea.Name))) != len(ea.Name) {
-		return errEaNameTooLarge
-	}
-	if int(uint16(len(ea.Value))) != len(ea.Value) {
-		return errEaValueTooLarge
-	}
-	entrySize := uint32(fileFullEaInformationSize + len(ea.Name) + 1 + len(ea.Value))
-	withPadding := (entrySize + 3) &^ 3
-	nextOffset := uint32(0)
-	if !last {
-		nextOffset = withPadding
-	}
-	info := fileFullEaInformation{
-		NextEntryOffset: nextOffset,
-		Flags:           ea.Flags,
-		NameLength:      uint8(len(ea.Name)),
-		ValueLength:     uint16(len(ea.Value)),
-	}
-
-	err := binary.Write(buf, binary.LittleEndian, &info)
-	if err != nil {
-		return err
-	}
-
-	_, err = buf.Write([]byte(ea.Name))
-	if err != nil {
-		return err
-	}
-
-	err = buf.WriteByte(0)
-	if err != nil {
-		return err
-	}
-
-	_, err = buf.Write(ea.Value)
-	if err != nil {
-		return err
-	}
-
-	_, err = buf.Write([]byte{0, 0, 0}[0 : withPadding-entrySize])
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// EncodeExtendedAttributes encodes a list of EAs into a FILE_FULL_EA_INFORMATION
-// buffer for use with BackupWrite, ZwSetEaFile, etc.
-func EncodeExtendedAttributes(eas []ExtendedAttribute) ([]byte, error) {
-	var buf bytes.Buffer
-	for i := range eas {
-		last := false
-		if i == len(eas)-1 {
-			last = true
-		}
-
-		err := writeEa(&buf, &eas[i], last)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return buf.Bytes(), nil
-}
diff --git a/vendor/github.com/Microsoft/go-winio/file.go b/vendor/github.com/Microsoft/go-winio/file.go
deleted file mode 100644
index 57ac3696a9..0000000000
--- a/vendor/github.com/Microsoft/go-winio/file.go
+++ /dev/null
@@ -1,310 +0,0 @@
-// +build windows
-
-package winio
-
-import (
-	"errors"
-	"io"
-	"runtime"
-	"sync"
-	"sync/atomic"
-	"syscall"
-	"time"
-)
-
-//sys cancelIoEx(file syscall.Handle, o *syscall.Overlapped) (err error) = CancelIoEx
-//sys createIoCompletionPort(file syscall.Handle, port syscall.Handle, key uintptr, threadCount uint32) (newport syscall.Handle, err error) = CreateIoCompletionPort
-//sys getQueuedCompletionStatus(port syscall.Handle, bytes *uint32, key *uintptr, o **ioOperation, timeout uint32) (err error) = GetQueuedCompletionStatus
-//sys setFileCompletionNotificationModes(h syscall.Handle, flags uint8) (err error) = SetFileCompletionNotificationModes
-//sys timeBeginPeriod(period uint32) (n int32) = winmm.timeBeginPeriod
-
-type atomicBool int32
-
-func (b *atomicBool) isSet() bool { return atomic.LoadInt32((*int32)(b)) != 0 }
-func (b *atomicBool) setFalse()   { atomic.StoreInt32((*int32)(b), 0) }
-func (b *atomicBool) setTrue()    { atomic.StoreInt32((*int32)(b), 1) }
-func (b *atomicBool) swap(new bool) bool {
-	var newInt int32
-	if new {
-		newInt = 1
-	}
-	return atomic.SwapInt32((*int32)(b), newInt) == 1
-}
-
-const (
-	cFILE_SKIP_COMPLETION_PORT_ON_SUCCESS = 1
-	cFILE_SKIP_SET_EVENT_ON_HANDLE        = 2
-)
-
-var (
-	ErrFileClosed = errors.New("file has already been closed")
-	ErrTimeout    = &timeoutError{}
-)
-
-type timeoutError struct{}
-
-func (e *timeoutError) Error() string   { return "i/o timeout" }
-func (e *timeoutError) Timeout() bool   { return true }
-func (e *timeoutError) Temporary() bool { return true }
-
-type timeoutChan chan struct{}
-
-var ioInitOnce sync.Once
-var ioCompletionPort syscall.Handle
-
-// ioResult contains the result of an asynchronous IO operation
-type ioResult struct {
-	bytes uint32
-	err   error
-}
-
-// ioOperation represents an outstanding asynchronous Win32 IO
-type ioOperation struct {
-	o  syscall.Overlapped
-	ch chan ioResult
-}
-
-func initIo() {
-	h, err := createIoCompletionPort(syscall.InvalidHandle, 0, 0, 0xffffffff)
-	if err != nil {
-		panic(err)
-	}
-	ioCompletionPort = h
-	go ioCompletionProcessor(h)
-}
-
-// win32File implements Reader, Writer, and Closer on a Win32 handle without blocking in a syscall.
-// It takes ownership of this handle and will close it if it is garbage collected.
-type win32File struct {
-	handle        syscall.Handle
-	wg            sync.WaitGroup
-	wgLock        sync.RWMutex
-	closing       atomicBool
-	readDeadline  deadlineHandler
-	writeDeadline deadlineHandler
-}
-
-type deadlineHandler struct {
-	setLock     sync.Mutex
-	channel     timeoutChan
-	channelLock sync.RWMutex
-	timer       *time.Timer
-	timedout    atomicBool
-}
-
-// makeWin32File makes a new win32File from an existing file handle
-func makeWin32File(h syscall.Handle) (*win32File, error) {
-	f := &win32File{handle: h}
-	ioInitOnce.Do(initIo)
-	_, err := createIoCompletionPort(h, ioCompletionPort, 0, 0xffffffff)
-	if err != nil {
-		return nil, err
-	}
-	err = setFileCompletionNotificationModes(h, cFILE_SKIP_COMPLETION_PORT_ON_SUCCESS|cFILE_SKIP_SET_EVENT_ON_HANDLE)
-	if err != nil {
-		return nil, err
-	}
-	f.readDeadline.channel = make(timeoutChan)
-	f.writeDeadline.channel = make(timeoutChan)
-	return f, nil
-}
-
-func MakeOpenFile(h syscall.Handle) (io.ReadWriteCloser, error) {
-	return makeWin32File(h)
-}
-
-// closeHandle closes the resources associated with a Win32 handle
-func (f *win32File) closeHandle() {
-	f.wgLock.Lock()
-	// Atomically set that we are closing, releasing the resources only once.
-	if !f.closing.swap(true) {
-		f.wgLock.Unlock()
-		// cancel all IO and wait for it to complete
-		cancelIoEx(f.handle, nil)
-		f.wg.Wait()
-		// at this point, no new IO can start
-		syscall.Close(f.handle)
-		f.handle = 0
-	} else {
-		f.wgLock.Unlock()
-	}
-}
-
-// Close closes a win32File.
-func (f *win32File) Close() error {
-	f.closeHandle()
-	return nil
-}
-
-// prepareIo prepares for a new IO operation.
-// The caller must call f.wg.Done() when the IO is finished, prior to Close() returning.
-func (f *win32File) prepareIo() (*ioOperation, error) {
-	f.wgLock.RLock()
-	if f.closing.isSet() {
-		f.wgLock.RUnlock()
-		return nil, ErrFileClosed
-	}
-	f.wg.Add(1)
-	f.wgLock.RUnlock()
-	c := &ioOperation{}
-	c.ch = make(chan ioResult)
-	return c, nil
-}
-
-// ioCompletionProcessor processes completed async IOs forever
-func ioCompletionProcessor(h syscall.Handle) {
-	// Set the timer resolution to 1. This fixes a performance regression in golang 1.6.
-	timeBeginPeriod(1)
-	for {
-		var bytes uint32
-		var key uintptr
-		var op *ioOperation
-		err := getQueuedCompletionStatus(h, &bytes, &key, &op, syscall.INFINITE)
-		if op == nil {
-			panic(err)
-		}
-		op.ch <- ioResult{bytes, err}
-	}
-}
-
-// asyncIo processes the return value from ReadFile or WriteFile, blocking until
-// the operation has actually completed.
-func (f *win32File) asyncIo(c *ioOperation, d *deadlineHandler, bytes uint32, err error) (int, error) {
-	if err != syscall.ERROR_IO_PENDING {
-		return int(bytes), err
-	}
-
-	if f.closing.isSet() {
-		cancelIoEx(f.handle, &c.o)
-	}
-
-	var timeout timeoutChan
-	if d != nil {
-		d.channelLock.Lock()
-		timeout = d.channel
-		d.channelLock.Unlock()
-	}
-
-	var r ioResult
-	select {
-	case r = <-c.ch:
-		err = r.err
-		if err == syscall.ERROR_OPERATION_ABORTED {
-			if f.closing.isSet() {
-				err = ErrFileClosed
-			}
-		}
-	case <-timeout:
-		cancelIoEx(f.handle, &c.o)
-		r = <-c.ch
-		err = r.err
-		if err == syscall.ERROR_OPERATION_ABORTED {
-			err = ErrTimeout
-		}
-	}
-
-	// runtime.KeepAlive is needed, as c is passed via native
-	// code to ioCompletionProcessor, c must remain alive
-	// until the channel read is complete.
-	runtime.KeepAlive(c)
-	return int(r.bytes), err
-}
-
-// Read reads from a file handle.
-func (f *win32File) Read(b []byte) (int, error) {
-	c, err := f.prepareIo()
-	if err != nil {
-		return 0, err
-	}
-	defer f.wg.Done()
-
-	if f.readDeadline.timedout.isSet() {
-		return 0, ErrTimeout
-	}
-
-	var bytes uint32
-	err = syscall.ReadFile(f.handle, b, &bytes, &c.o)
-	n, err := f.asyncIo(c, &f.readDeadline, bytes, err)
-	runtime.KeepAlive(b)
-
-	// Handle EOF conditions.
-	if err == nil && n == 0 && len(b) != 0 {
-		return 0, io.EOF
-	} else if err == syscall.ERROR_BROKEN_PIPE {
-		return 0, io.EOF
-	} else {
-		return n, err
-	}
-}
-
-// Write writes to a file handle.
-func (f *win32File) Write(b []byte) (int, error) {
-	c, err := f.prepareIo()
-	if err != nil {
-		return 0, err
-	}
-	defer f.wg.Done()
-
-	if f.writeDeadline.timedout.isSet() {
-		return 0, ErrTimeout
-	}
-
-	var bytes uint32
-	err = syscall.WriteFile(f.handle, b, &bytes, &c.o)
-	n, err := f.asyncIo(c, &f.writeDeadline, bytes, err)
-	runtime.KeepAlive(b)
-	return n, err
-}
-
-func (f *win32File) SetReadDeadline(deadline time.Time) error {
-	return f.readDeadline.set(deadline)
-}
-
-func (f *win32File) SetWriteDeadline(deadline time.Time) error {
-	return f.writeDeadline.set(deadline)
-}
-
-func (f *win32File) Flush() error {
-	return syscall.FlushFileBuffers(f.handle)
-}
-
-func (d *deadlineHandler) set(deadline time.Time) error {
-	d.setLock.Lock()
-	defer d.setLock.Unlock()
-
-	if d.timer != nil {
-		if !d.timer.Stop() {
-			<-d.channel
-		}
-		d.timer = nil
-	}
-	d.timedout.setFalse()
-
-	select {
-	case <-d.channel:
-		d.channelLock.Lock()
-		d.channel = make(chan struct{})
-		d.channelLock.Unlock()
-	default:
-	}
-
-	if deadline.IsZero() {
-		return nil
-	}
-
-	timeoutIO := func() {
-		d.timedout.setTrue()
-		close(d.channel)
-	}
-
-	now := time.Now()
-	duration := deadline.Sub(now)
-	if deadline.After(now) {
-		// Deadline is in the future, set a timer to wait
-		d.timer = time.AfterFunc(duration, timeoutIO)
-	} else {
-		// Deadline is in the past. Cancel all pending IO now.
-		timeoutIO()
-	}
-	return nil
-}
diff --git a/vendor/github.com/Microsoft/go-winio/fileinfo.go b/vendor/github.com/Microsoft/go-winio/fileinfo.go
deleted file mode 100644
index b1d60abb83..0000000000
--- a/vendor/github.com/Microsoft/go-winio/fileinfo.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// +build windows
-
-package winio
-
-import (
-	"os"
-	"runtime"
-	"syscall"
-	"unsafe"
-)
-
-//sys getFileInformationByHandleEx(h syscall.Handle, class uint32, buffer *byte, size uint32) (err error) = GetFileInformationByHandleEx
-//sys setFileInformationByHandle(h syscall.Handle, class uint32, buffer *byte, size uint32) (err error) = SetFileInformationByHandle
-
-const (
-	fileBasicInfo = 0
-	fileIDInfo    = 0x12
-)
-
-// FileBasicInfo contains file access time and file attributes information.
-type FileBasicInfo struct {
-	CreationTime, LastAccessTime, LastWriteTime, ChangeTime syscall.Filetime
-	FileAttributes                                          uintptr // includes padding
-}
-
-// GetFileBasicInfo retrieves times and attributes for a file.
-func GetFileBasicInfo(f *os.File) (*FileBasicInfo, error) {
-	bi := &FileBasicInfo{}
-	if err := getFileInformationByHandleEx(syscall.Handle(f.Fd()), fileBasicInfo, (*byte)(unsafe.Pointer(bi)), uint32(unsafe.Sizeof(*bi))); err != nil {
-		return nil, &os.PathError{Op: "GetFileInformationByHandleEx", Path: f.Name(), Err: err}
-	}
-	runtime.KeepAlive(f)
-	return bi, nil
-}
-
-// SetFileBasicInfo sets times and attributes for a file.
-func SetFileBasicInfo(f *os.File, bi *FileBasicInfo) error {
-	if err := setFileInformationByHandle(syscall.Handle(f.Fd()), fileBasicInfo, (*byte)(unsafe.Pointer(bi)), uint32(unsafe.Sizeof(*bi))); err != nil {
-		return &os.PathError{Op: "SetFileInformationByHandle", Path: f.Name(), Err: err}
-	}
-	runtime.KeepAlive(f)
-	return nil
-}
-
-// FileIDInfo contains the volume serial number and file ID for a file. This pair should be
-// unique on a system.
-type FileIDInfo struct {
-	VolumeSerialNumber uint64
-	FileID             [16]byte
-}
-
-// GetFileID retrieves the unique (volume, file ID) pair for a file.
-func GetFileID(f *os.File) (*FileIDInfo, error) {
-	fileID := &FileIDInfo{}
-	if err := getFileInformationByHandleEx(syscall.Handle(f.Fd()), fileIDInfo, (*byte)(unsafe.Pointer(fileID)), uint32(unsafe.Sizeof(*fileID))); err != nil {
-		return nil, &os.PathError{Op: "GetFileInformationByHandleEx", Path: f.Name(), Err: err}
-	}
-	runtime.KeepAlive(f)
-	return fileID, nil
-}
diff --git a/vendor/github.com/Microsoft/go-winio/pipe.go b/vendor/github.com/Microsoft/go-winio/pipe.go
deleted file mode 100644
index 44340b8167..0000000000
--- a/vendor/github.com/Microsoft/go-winio/pipe.go
+++ /dev/null
@@ -1,404 +0,0 @@
-// +build windows
-
-package winio
-
-import (
-	"errors"
-	"io"
-	"net"
-	"os"
-	"syscall"
-	"time"
-	"unsafe"
-)
-
-//sys connectNamedPipe(pipe syscall.Handle, o *syscall.Overlapped) (err error) = ConnectNamedPipe
-//sys createNamedPipe(name string, flags uint32, pipeMode uint32, maxInstances uint32, outSize uint32, inSize uint32, defaultTimeout uint32, sa *syscall.SecurityAttributes) (handle syscall.Handle, err error)  [failretval==syscall.InvalidHandle] = CreateNamedPipeW
-//sys createFile(name string, access uint32, mode uint32, sa *syscall.SecurityAttributes, createmode uint32, attrs uint32, templatefile syscall.Handle) (handle syscall.Handle, err error) [failretval==syscall.InvalidHandle] = CreateFileW
-//sys waitNamedPipe(name string, timeout uint32) (err error) = WaitNamedPipeW
-//sys getNamedPipeInfo(pipe syscall.Handle, flags *uint32, outSize *uint32, inSize *uint32, maxInstances *uint32) (err error) = GetNamedPipeInfo
-//sys getNamedPipeHandleState(pipe syscall.Handle, state *uint32, curInstances *uint32, maxCollectionCount *uint32, collectDataTimeout *uint32, userName *uint16, maxUserNameSize uint32) (err error) = GetNamedPipeHandleStateW
-//sys localAlloc(uFlags uint32, length uint32) (ptr uintptr) = LocalAlloc
-
-const (
-	cERROR_PIPE_BUSY      = syscall.Errno(231)
-	cERROR_PIPE_CONNECTED = syscall.Errno(535)
-	cERROR_SEM_TIMEOUT    = syscall.Errno(121)
-
-	cPIPE_ACCESS_DUPLEX            = 0x3
-	cFILE_FLAG_FIRST_PIPE_INSTANCE = 0x80000
-	cSECURITY_SQOS_PRESENT         = 0x100000
-	cSECURITY_ANONYMOUS            = 0
-
-	cPIPE_REJECT_REMOTE_CLIENTS = 0x8
-
-	cPIPE_UNLIMITED_INSTANCES = 255
-
-	cNMPWAIT_USE_DEFAULT_WAIT = 0
-	cNMPWAIT_NOWAIT           = 1
-
-	cPIPE_TYPE_MESSAGE = 4
-
-	cPIPE_READMODE_MESSAGE = 2
-)
-
-var (
-	// ErrPipeListenerClosed is returned for pipe operations on listeners that have been closed.
-	// This error should match net.errClosing since docker takes a dependency on its text.
-	ErrPipeListenerClosed = errors.New("use of closed network connection")
-
-	errPipeWriteClosed = errors.New("pipe has been closed for write")
-)
-
-type win32Pipe struct {
-	*win32File
-	path string
-}
-
-type win32MessageBytePipe struct {
-	win32Pipe
-	writeClosed bool
-	readEOF     bool
-}
-
-type pipeAddress string
-
-func (f *win32Pipe) LocalAddr() net.Addr {
-	return pipeAddress(f.path)
-}
-
-func (f *win32Pipe) RemoteAddr() net.Addr {
-	return pipeAddress(f.path)
-}
-
-func (f *win32Pipe) SetDeadline(t time.Time) error {
-	f.SetReadDeadline(t)
-	f.SetWriteDeadline(t)
-	return nil
-}
-
-// CloseWrite closes the write side of a message pipe in byte mode.
-func (f *win32MessageBytePipe) CloseWrite() error {
-	if f.writeClosed {
-		return errPipeWriteClosed
-	}
-	err := f.win32File.Flush()
-	if err != nil {
-		return err
-	}
-	_, err = f.win32File.Write(nil)
-	if err != nil {
-		return err
-	}
-	f.writeClosed = true
-	return nil
-}
-
-// Write writes bytes to a message pipe in byte mode. Zero-byte writes are ignored, since
-// they are used to implement CloseWrite().
-func (f *win32MessageBytePipe) Write(b []byte) (int, error) {
-	if f.writeClosed {
-		return 0, errPipeWriteClosed
-	}
-	if len(b) == 0 {
-		return 0, nil
-	}
-	return f.win32File.Write(b)
-}
-
-// Read reads bytes from a message pipe in byte mode. A read of a zero-byte message on a message
-// mode pipe will return io.EOF, as will all subsequent reads.
-func (f *win32MessageBytePipe) Read(b []byte) (int, error) {
-	if f.readEOF {
-		return 0, io.EOF
-	}
-	n, err := f.win32File.Read(b)
-	if err == io.EOF {
-		// If this was the result of a zero-byte read, then
-		// it is possible that the read was due to a zero-size
-		// message. Since we are simulating CloseWrite with a
-		// zero-byte message, ensure that all future Read() calls
-		// also return EOF.
-		f.readEOF = true
-	}
-	return n, err
-}
-
-func (s pipeAddress) Network() string {
-	return "pipe"
-}
-
-func (s pipeAddress) String() string {
-	return string(s)
-}
-
-// DialPipe connects to a named pipe by path, timing out if the connection
-// takes longer than the specified duration. If timeout is nil, then the timeout
-// is the default timeout established by the pipe server.
-func DialPipe(path string, timeout *time.Duration) (net.Conn, error) {
-	var absTimeout time.Time
-	if timeout != nil {
-		absTimeout = time.Now().Add(*timeout)
-	}
-	var err error
-	var h syscall.Handle
-	for {
-		h, err = createFile(path, syscall.GENERIC_READ|syscall.GENERIC_WRITE, 0, nil, syscall.OPEN_EXISTING, syscall.FILE_FLAG_OVERLAPPED|cSECURITY_SQOS_PRESENT|cSECURITY_ANONYMOUS, 0)
-		if err != cERROR_PIPE_BUSY {
-			break
-		}
-		now := time.Now()
-		var ms uint32
-		if absTimeout.IsZero() {
-			ms = cNMPWAIT_USE_DEFAULT_WAIT
-		} else if now.After(absTimeout) {
-			ms = cNMPWAIT_NOWAIT
-		} else {
-			ms = uint32(absTimeout.Sub(now).Nanoseconds() / 1000 / 1000)
-		}
-		err = waitNamedPipe(path, ms)
-		if err != nil {
-			if err == cERROR_SEM_TIMEOUT {
-				return nil, ErrTimeout
-			}
-			break
-		}
-	}
-	if err != nil {
-		return nil, &os.PathError{Op: "open", Path: path, Err: err}
-	}
-
-	var flags uint32
-	err = getNamedPipeInfo(h, &flags, nil, nil, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var state uint32
-	err = getNamedPipeHandleState(h, &state, nil, nil, nil, nil, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	if state&cPIPE_READMODE_MESSAGE != 0 {
-		return nil, &os.PathError{Op: "open", Path: path, Err: errors.New("message readmode pipes not supported")}
-	}
-
-	f, err := makeWin32File(h)
-	if err != nil {
-		syscall.Close(h)
-		return nil, err
-	}
-
-	// If the pipe is in message mode, return a message byte pipe, which
-	// supports CloseWrite().
-	if flags&cPIPE_TYPE_MESSAGE != 0 {
-		return &win32MessageBytePipe{
-			win32Pipe: win32Pipe{win32File: f, path: path},
-		}, nil
-	}
-	return &win32Pipe{win32File: f, path: path}, nil
-}
-
-type acceptResponse struct {
-	f   *win32File
-	err error
-}
-
-type win32PipeListener struct {
-	firstHandle        syscall.Handle
-	path               string
-	securityDescriptor []byte
-	config             PipeConfig
-	acceptCh           chan (chan acceptResponse)
-	closeCh            chan int
-	doneCh             chan int
-}
-
-func makeServerPipeHandle(path string, securityDescriptor []byte, c *PipeConfig, first bool) (syscall.Handle, error) {
-	var flags uint32 = cPIPE_ACCESS_DUPLEX | syscall.FILE_FLAG_OVERLAPPED
-	if first {
-		flags |= cFILE_FLAG_FIRST_PIPE_INSTANCE
-	}
-
-	var mode uint32 = cPIPE_REJECT_REMOTE_CLIENTS
-	if c.MessageMode {
-		mode |= cPIPE_TYPE_MESSAGE
-	}
-
-	sa := &syscall.SecurityAttributes{}
-	sa.Length = uint32(unsafe.Sizeof(*sa))
-	if securityDescriptor != nil {
-		len := uint32(len(securityDescriptor))
-		sa.SecurityDescriptor = localAlloc(0, len)
-		defer localFree(sa.SecurityDescriptor)
-		copy((*[0xffff]byte)(unsafe.Pointer(sa.SecurityDescriptor))[:], securityDescriptor)
-	}
-	h, err := createNamedPipe(path, flags, mode, cPIPE_UNLIMITED_INSTANCES, uint32(c.OutputBufferSize), uint32(c.InputBufferSize), 0, sa)
-	if err != nil {
-		return 0, &os.PathError{Op: "open", Path: path, Err: err}
-	}
-	return h, nil
-}
-
-func (l *win32PipeListener) makeServerPipe() (*win32File, error) {
-	h, err := makeServerPipeHandle(l.path, l.securityDescriptor, &l.config, false)
-	if err != nil {
-		return nil, err
-	}
-	f, err := makeWin32File(h)
-	if err != nil {
-		syscall.Close(h)
-		return nil, err
-	}
-	return f, nil
-}
-
-func (l *win32PipeListener) listenerRoutine() {
-	closed := false
-	for !closed {
-		select {
-		case <-l.closeCh:
-			closed = true
-		case responseCh := <-l.acceptCh:
-			p, err := l.makeServerPipe()
-			if err == nil {
-				// Wait for the client to connect.
-				ch := make(chan error)
-				go func(p *win32File) {
-					ch <- connectPipe(p)
-				}(p)
-				select {
-				case err = <-ch:
-					if err != nil {
-						p.Close()
-						p = nil
-					}
-				case <-l.closeCh:
-					// Abort the connect request by closing the handle.
-					p.Close()
-					p = nil
-					err = <-ch
-					if err == nil || err == ErrFileClosed {
-						err = ErrPipeListenerClosed
-					}
-					closed = true
-				}
-			}
-			responseCh <- acceptResponse{p, err}
-		}
-	}
-	syscall.Close(l.firstHandle)
-	l.firstHandle = 0
-	// Notify Close() and Accept() callers that the handle has been closed.
-	close(l.doneCh)
-}
-
-// PipeConfig contain configuration for the pipe listener.
-type PipeConfig struct {
-	// SecurityDescriptor contains a Windows security descriptor in SDDL format.
-	SecurityDescriptor string
-
-	// MessageMode determines whether the pipe is in byte or message mode. In either
-	// case the pipe is read in byte mode by default. The only practical difference in
-	// this implementation is that CloseWrite() is only supported for message mode pipes;
-	// CloseWrite() is implemented as a zero-byte write, but zero-byte writes are only
-	// transferred to the reader (and returned as io.EOF in this implementation)
-	// when the pipe is in message mode.
-	MessageMode bool
-
-	// InputBufferSize specifies the size the input buffer, in bytes.
-	InputBufferSize int32
-
-	// OutputBufferSize specifies the size the input buffer, in bytes.
-	OutputBufferSize int32
-}
-
-// ListenPipe creates a listener on a Windows named pipe path, e.g. \\.\pipe\mypipe.
-// The pipe must not already exist.
-func ListenPipe(path string, c *PipeConfig) (net.Listener, error) {
-	var (
-		sd  []byte
-		err error
-	)
-	if c == nil {
-		c = &PipeConfig{}
-	}
-	if c.SecurityDescriptor != "" {
-		sd, err = SddlToSecurityDescriptor(c.SecurityDescriptor)
-		if err != nil {
-			return nil, err
-		}
-	}
-	h, err := makeServerPipeHandle(path, sd, c, true)
-	if err != nil {
-		return nil, err
-	}
-	// Immediately open and then close a client handle so that the named pipe is
-	// created but not currently accepting connections.
-	h2, err := createFile(path, 0, 0, nil, syscall.OPEN_EXISTING, cSECURITY_SQOS_PRESENT|cSECURITY_ANONYMOUS, 0)
-	if err != nil {
-		syscall.Close(h)
-		return nil, err
-	}
-	syscall.Close(h2)
-	l := &win32PipeListener{
-		firstHandle:        h,
-		path:               path,
-		securityDescriptor: sd,
-		config:             *c,
-		acceptCh:           make(chan (chan acceptResponse)),
-		closeCh:            make(chan int),
-		doneCh:             make(chan int),
-	}
-	go l.listenerRoutine()
-	return l, nil
-}
-
-func connectPipe(p *win32File) error {
-	c, err := p.prepareIo()
-	if err != nil {
-		return err
-	}
-	defer p.wg.Done()
-
-	err = connectNamedPipe(p.handle, &c.o)
-	_, err = p.asyncIo(c, nil, 0, err)
-	if err != nil && err != cERROR_PIPE_CONNECTED {
-		return err
-	}
-	return nil
-}
-
-func (l *win32PipeListener) Accept() (net.Conn, error) {
-	ch := make(chan acceptResponse)
-	select {
-	case l.acceptCh <- ch:
-		response := <-ch
-		err := response.err
-		if err != nil {
-			return nil, err
-		}
-		if l.config.MessageMode {
-			return &win32MessageBytePipe{
-				win32Pipe: win32Pipe{win32File: response.f, path: l.path},
-			}, nil
-		}
-		return &win32Pipe{win32File: response.f, path: l.path}, nil
-	case <-l.doneCh:
-		return nil, ErrPipeListenerClosed
-	}
-}
-
-func (l *win32PipeListener) Close() error {
-	select {
-	case l.closeCh <- 1:
-		<-l.doneCh
-	case <-l.doneCh:
-	}
-	return nil
-}
-
-func (l *win32PipeListener) Addr() net.Addr {
-	return pipeAddress(l.path)
-}
diff --git a/vendor/github.com/Microsoft/go-winio/privilege.go b/vendor/github.com/Microsoft/go-winio/privilege.go
deleted file mode 100644
index 9c83d36fe5..0000000000
--- a/vendor/github.com/Microsoft/go-winio/privilege.go
+++ /dev/null
@@ -1,202 +0,0 @@
-// +build windows
-
-package winio
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"runtime"
-	"sync"
-	"syscall"
-	"unicode/utf16"
-
-	"golang.org/x/sys/windows"
-)
-
-//sys adjustTokenPrivileges(token windows.Token, releaseAll bool, input *byte, outputSize uint32, output *byte, requiredSize *uint32) (success bool, err error) [true] = advapi32.AdjustTokenPrivileges
-//sys impersonateSelf(level uint32) (err error) = advapi32.ImpersonateSelf
-//sys revertToSelf() (err error) = advapi32.RevertToSelf
-//sys openThreadToken(thread syscall.Handle, accessMask uint32, openAsSelf bool, token *windows.Token) (err error) = advapi32.OpenThreadToken
-//sys getCurrentThread() (h syscall.Handle) = GetCurrentThread
-//sys lookupPrivilegeValue(systemName string, name string, luid *uint64) (err error) = advapi32.LookupPrivilegeValueW
-//sys lookupPrivilegeName(systemName string, luid *uint64, buffer *uint16, size *uint32) (err error) = advapi32.LookupPrivilegeNameW
-//sys lookupPrivilegeDisplayName(systemName string, name *uint16, buffer *uint16, size *uint32, languageId *uint32) (err error) = advapi32.LookupPrivilegeDisplayNameW
-
-const (
-	SE_PRIVILEGE_ENABLED = 2
-
-	ERROR_NOT_ALL_ASSIGNED syscall.Errno = 1300
-
-	SeBackupPrivilege  = "SeBackupPrivilege"
-	SeRestorePrivilege = "SeRestorePrivilege"
-)
-
-const (
-	securityAnonymous = iota
-	securityIdentification
-	securityImpersonation
-	securityDelegation
-)
-
-var (
-	privNames     = make(map[string]uint64)
-	privNameMutex sync.Mutex
-)
-
-// PrivilegeError represents an error enabling privileges.
-type PrivilegeError struct {
-	privileges []uint64
-}
-
-func (e *PrivilegeError) Error() string {
-	s := ""
-	if len(e.privileges) > 1 {
-		s = "Could not enable privileges "
-	} else {
-		s = "Could not enable privilege "
-	}
-	for i, p := range e.privileges {
-		if i != 0 {
-			s += ", "
-		}
-		s += `"`
-		s += getPrivilegeName(p)
-		s += `"`
-	}
-	return s
-}
-
-// RunWithPrivilege enables a single privilege for a function call.
-func RunWithPrivilege(name string, fn func() error) error {
-	return RunWithPrivileges([]string{name}, fn)
-}
-
-// RunWithPrivileges enables privileges for a function call.
-func RunWithPrivileges(names []string, fn func() error) error {
-	privileges, err := mapPrivileges(names)
-	if err != nil {
-		return err
-	}
-	runtime.LockOSThread()
-	defer runtime.UnlockOSThread()
-	token, err := newThreadToken()
-	if err != nil {
-		return err
-	}
-	defer releaseThreadToken(token)
-	err = adjustPrivileges(token, privileges, SE_PRIVILEGE_ENABLED)
-	if err != nil {
-		return err
-	}
-	return fn()
-}
-
-func mapPrivileges(names []string) ([]uint64, error) {
-	var privileges []uint64
-	privNameMutex.Lock()
-	defer privNameMutex.Unlock()
-	for _, name := range names {
-		p, ok := privNames[name]
-		if !ok {
-			err := lookupPrivilegeValue("", name, &p)
-			if err != nil {
-				return nil, err
-			}
-			privNames[name] = p
-		}
-		privileges = append(privileges, p)
-	}
-	return privileges, nil
-}
-
-// EnableProcessPrivileges enables privileges globally for the process.
-func EnableProcessPrivileges(names []string) error {
-	return enableDisableProcessPrivilege(names, SE_PRIVILEGE_ENABLED)
-}
-
-// DisableProcessPrivileges disables privileges globally for the process.
-func DisableProcessPrivileges(names []string) error {
-	return enableDisableProcessPrivilege(names, 0)
-}
-
-func enableDisableProcessPrivilege(names []string, action uint32) error {
-	privileges, err := mapPrivileges(names)
-	if err != nil {
-		return err
-	}
-
-	p, _ := windows.GetCurrentProcess()
-	var token windows.Token
-	err = windows.OpenProcessToken(p, windows.TOKEN_ADJUST_PRIVILEGES|windows.TOKEN_QUERY, &token)
-	if err != nil {
-		return err
-	}
-
-	defer token.Close()
-	return adjustPrivileges(token, privileges, action)
-}
-
-func adjustPrivileges(token windows.Token, privileges []uint64, action uint32) error {
-	var b bytes.Buffer
-	binary.Write(&b, binary.LittleEndian, uint32(len(privileges)))
-	for _, p := range privileges {
-		binary.Write(&b, binary.LittleEndian, p)
-		binary.Write(&b, binary.LittleEndian, action)
-	}
-	prevState := make([]byte, b.Len())
-	reqSize := uint32(0)
-	success, err := adjustTokenPrivileges(token, false, &b.Bytes()[0], uint32(len(prevState)), &prevState[0], &reqSize)
-	if !success {
-		return err
-	}
-	if err == ERROR_NOT_ALL_ASSIGNED {
-		return &PrivilegeError{privileges}
-	}
-	return nil
-}
-
-func getPrivilegeName(luid uint64) string {
-	var nameBuffer [256]uint16
-	bufSize := uint32(len(nameBuffer))
-	err := lookupPrivilegeName("", &luid, &nameBuffer[0], &bufSize)
-	if err != nil {
-		return fmt.Sprintf("<unknown privilege %d>", luid)
-	}
-
-	var displayNameBuffer [256]uint16
-	displayBufSize := uint32(len(displayNameBuffer))
-	var langID uint32
-	err = lookupPrivilegeDisplayName("", &nameBuffer[0], &displayNameBuffer[0], &displayBufSize, &langID)
-	if err != nil {
-		return fmt.Sprintf("<unknown privilege %s>", string(utf16.Decode(nameBuffer[:bufSize])))
-	}
-
-	return string(utf16.Decode(displayNameBuffer[:displayBufSize]))
-}
-
-func newThreadToken() (windows.Token, error) {
-	err := impersonateSelf(securityImpersonation)
-	if err != nil {
-		return 0, err
-	}
-
-	var token windows.Token
-	err = openThreadToken(getCurrentThread(), syscall.TOKEN_ADJUST_PRIVILEGES|syscall.TOKEN_QUERY, false, &token)
-	if err != nil {
-		rerr := revertToSelf()
-		if rerr != nil {
-			panic(rerr)
-		}
-		return 0, err
-	}
-	return token, nil
-}
-
-func releaseThreadToken(h windows.Token) {
-	err := revertToSelf()
-	if err != nil {
-		panic(err)
-	}
-	h.Close()
-}
diff --git a/vendor/github.com/Microsoft/go-winio/reparse.go b/vendor/github.com/Microsoft/go-winio/reparse.go
deleted file mode 100644
index fc1ee4d3a3..0000000000
--- a/vendor/github.com/Microsoft/go-winio/reparse.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package winio
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"strings"
-	"unicode/utf16"
-	"unsafe"
-)
-
-const (
-	reparseTagMountPoint = 0xA0000003
-	reparseTagSymlink    = 0xA000000C
-)
-
-type reparseDataBuffer struct {
-	ReparseTag           uint32
-	ReparseDataLength    uint16
-	Reserved             uint16
-	SubstituteNameOffset uint16
-	SubstituteNameLength uint16
-	PrintNameOffset      uint16
-	PrintNameLength      uint16
-}
-
-// ReparsePoint describes a Win32 symlink or mount point.
-type ReparsePoint struct {
-	Target       string
-	IsMountPoint bool
-}
-
-// UnsupportedReparsePointError is returned when trying to decode a non-symlink or
-// mount point reparse point.
-type UnsupportedReparsePointError struct {
-	Tag uint32
-}
-
-func (e *UnsupportedReparsePointError) Error() string {
-	return fmt.Sprintf("unsupported reparse point %x", e.Tag)
-}
-
-// DecodeReparsePoint decodes a Win32 REPARSE_DATA_BUFFER structure containing either a symlink
-// or a mount point.
-func DecodeReparsePoint(b []byte) (*ReparsePoint, error) {
-	tag := binary.LittleEndian.Uint32(b[0:4])
-	return DecodeReparsePointData(tag, b[8:])
-}
-
-func DecodeReparsePointData(tag uint32, b []byte) (*ReparsePoint, error) {
-	isMountPoint := false
-	switch tag {
-	case reparseTagMountPoint:
-		isMountPoint = true
-	case reparseTagSymlink:
-	default:
-		return nil, &UnsupportedReparsePointError{tag}
-	}
-	nameOffset := 8 + binary.LittleEndian.Uint16(b[4:6])
-	if !isMountPoint {
-		nameOffset += 4
-	}
-	nameLength := binary.LittleEndian.Uint16(b[6:8])
-	name := make([]uint16, nameLength/2)
-	err := binary.Read(bytes.NewReader(b[nameOffset:nameOffset+nameLength]), binary.LittleEndian, &name)
-	if err != nil {
-		return nil, err
-	}
-	return &ReparsePoint{string(utf16.Decode(name)), isMountPoint}, nil
-}
-
-func isDriveLetter(c byte) bool {
-	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
-}
-
-// EncodeReparsePoint encodes a Win32 REPARSE_DATA_BUFFER structure describing a symlink or
-// mount point.
-func EncodeReparsePoint(rp *ReparsePoint) []byte {
-	// Generate an NT path and determine if this is a relative path.
-	var ntTarget string
-	relative := false
-	if strings.HasPrefix(rp.Target, `\\?\`) {
-		ntTarget = `\??\` + rp.Target[4:]
-	} else if strings.HasPrefix(rp.Target, `\\`) {
-		ntTarget = `\??\UNC\` + rp.Target[2:]
-	} else if len(rp.Target) >= 2 && isDriveLetter(rp.Target[0]) && rp.Target[1] == ':' {
-		ntTarget = `\??\` + rp.Target
-	} else {
-		ntTarget = rp.Target
-		relative = true
-	}
-
-	// The paths must be NUL-terminated even though they are counted strings.
-	target16 := utf16.Encode([]rune(rp.Target + "\x00"))
-	ntTarget16 := utf16.Encode([]rune(ntTarget + "\x00"))
-
-	size := int(unsafe.Sizeof(reparseDataBuffer{})) - 8
-	size += len(ntTarget16)*2 + len(target16)*2
-
-	tag := uint32(reparseTagMountPoint)
-	if !rp.IsMountPoint {
-		tag = reparseTagSymlink
-		size += 4 // Add room for symlink flags
-	}
-
-	data := reparseDataBuffer{
-		ReparseTag:           tag,
-		ReparseDataLength:    uint16(size),
-		SubstituteNameOffset: 0,
-		SubstituteNameLength: uint16((len(ntTarget16) - 1) * 2),
-		PrintNameOffset:      uint16(len(ntTarget16) * 2),
-		PrintNameLength:      uint16((len(target16) - 1) * 2),
-	}
-
-	var b bytes.Buffer
-	binary.Write(&b, binary.LittleEndian, &data)
-	if !rp.IsMountPoint {
-		flags := uint32(0)
-		if relative {
-			flags |= 1
-		}
-		binary.Write(&b, binary.LittleEndian, flags)
-	}
-
-	binary.Write(&b, binary.LittleEndian, ntTarget16)
-	binary.Write(&b, binary.LittleEndian, target16)
-	return b.Bytes()
-}
diff --git a/vendor/github.com/Microsoft/go-winio/sd.go b/vendor/github.com/Microsoft/go-winio/sd.go
deleted file mode 100644
index db1b370a1b..0000000000
--- a/vendor/github.com/Microsoft/go-winio/sd.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// +build windows
-
-package winio
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-//sys lookupAccountName(systemName *uint16, accountName string, sid *byte, sidSize *uint32, refDomain *uint16, refDomainSize *uint32, sidNameUse *uint32) (err error) = advapi32.LookupAccountNameW
-//sys convertSidToStringSid(sid *byte, str **uint16) (err error) = advapi32.ConvertSidToStringSidW
-//sys convertStringSecurityDescriptorToSecurityDescriptor(str string, revision uint32, sd *uintptr, size *uint32) (err error) = advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW
-//sys convertSecurityDescriptorToStringSecurityDescriptor(sd *byte, revision uint32, secInfo uint32, sddl **uint16, sddlSize *uint32) (err error) = advapi32.ConvertSecurityDescriptorToStringSecurityDescriptorW
-//sys localFree(mem uintptr) = LocalFree
-//sys getSecurityDescriptorLength(sd uintptr) (len uint32) = advapi32.GetSecurityDescriptorLength
-
-const (
-	cERROR_NONE_MAPPED = syscall.Errno(1332)
-)
-
-type AccountLookupError struct {
-	Name string
-	Err  error
-}
-
-func (e *AccountLookupError) Error() string {
-	if e.Name == "" {
-		return "lookup account: empty account name specified"
-	}
-	var s string
-	switch e.Err {
-	case cERROR_NONE_MAPPED:
-		s = "not found"
-	default:
-		s = e.Err.Error()
-	}
-	return "lookup account " + e.Name + ": " + s
-}
-
-type SddlConversionError struct {
-	Sddl string
-	Err  error
-}
-
-func (e *SddlConversionError) Error() string {
-	return "convert " + e.Sddl + ": " + e.Err.Error()
-}
-
-// LookupSidByName looks up the SID of an account by name
-func LookupSidByName(name string) (sid string, err error) {
-	if name == "" {
-		return "", &AccountLookupError{name, cERROR_NONE_MAPPED}
-	}
-
-	var sidSize, sidNameUse, refDomainSize uint32
-	err = lookupAccountName(nil, name, nil, &sidSize, nil, &refDomainSize, &sidNameUse)
-	if err != nil && err != syscall.ERROR_INSUFFICIENT_BUFFER {
-		return "", &AccountLookupError{name, err}
-	}
-	sidBuffer := make([]byte, sidSize)
-	refDomainBuffer := make([]uint16, refDomainSize)
-	err = lookupAccountName(nil, name, &sidBuffer[0], &sidSize, &refDomainBuffer[0], &refDomainSize, &sidNameUse)
-	if err != nil {
-		return "", &AccountLookupError{name, err}
-	}
-	var strBuffer *uint16
-	err = convertSidToStringSid(&sidBuffer[0], &strBuffer)
-	if err != nil {
-		return "", &AccountLookupError{name, err}
-	}
-	sid = syscall.UTF16ToString((*[0xffff]uint16)(unsafe.Pointer(strBuffer))[:])
-	localFree(uintptr(unsafe.Pointer(strBuffer)))
-	return sid, nil
-}
-
-func SddlToSecurityDescriptor(sddl string) ([]byte, error) {
-	var sdBuffer uintptr
-	err := convertStringSecurityDescriptorToSecurityDescriptor(sddl, 1, &sdBuffer, nil)
-	if err != nil {
-		return nil, &SddlConversionError{sddl, err}
-	}
-	defer localFree(sdBuffer)
-	sd := make([]byte, getSecurityDescriptorLength(sdBuffer))
-	copy(sd, (*[0xffff]byte)(unsafe.Pointer(sdBuffer))[:len(sd)])
-	return sd, nil
-}
-
-func SecurityDescriptorToSddl(sd []byte) (string, error) {
-	var sddl *uint16
-	// The returned string length seems to including an aribtrary number of terminating NULs.
-	// Don't use it.
-	err := convertSecurityDescriptorToStringSecurityDescriptor(&sd[0], 1, 0xff, &sddl, nil)
-	if err != nil {
-		return "", err
-	}
-	defer localFree(uintptr(unsafe.Pointer(sddl)))
-	return syscall.UTF16ToString((*[0xffff]uint16)(unsafe.Pointer(sddl))[:]), nil
-}
diff --git a/vendor/github.com/Microsoft/go-winio/syscall.go b/vendor/github.com/Microsoft/go-winio/syscall.go
deleted file mode 100644
index 20d64cf41d..0000000000
--- a/vendor/github.com/Microsoft/go-winio/syscall.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package winio
-
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go file.go pipe.go sd.go fileinfo.go privilege.go backup.go
diff --git a/vendor/github.com/Microsoft/go-winio/zsyscall_windows.go b/vendor/github.com/Microsoft/go-winio/zsyscall_windows.go
deleted file mode 100644
index 4f7a52eeb7..0000000000
--- a/vendor/github.com/Microsoft/go-winio/zsyscall_windows.go
+++ /dev/null
@@ -1,528 +0,0 @@
-// MACHINE GENERATED BY 'go generate' COMMAND; DO NOT EDIT
-
-package winio
-
-import (
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-var _ unsafe.Pointer
-
-// Do the interface allocations only once for common
-// Errno values.
-const (
-	errnoERROR_IO_PENDING = 997
-)
-
-var (
-	errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING)
-)
-
-// errnoErr returns common boxed Errno values, to prevent
-// allocations at runtime.
-func errnoErr(e syscall.Errno) error {
-	switch e {
-	case 0:
-		return nil
-	case errnoERROR_IO_PENDING:
-		return errERROR_IO_PENDING
-	}
-	// TODO: add more here, after collecting data on the common
-	// error values see on Windows. (perhaps when running
-	// all.bat?)
-	return e
-}
-
-var (
-	modkernel32 = windows.NewLazySystemDLL("kernel32.dll")
-	modwinmm    = windows.NewLazySystemDLL("winmm.dll")
-	modadvapi32 = windows.NewLazySystemDLL("advapi32.dll")
-
-	procCancelIoEx                                           = modkernel32.NewProc("CancelIoEx")
-	procCreateIoCompletionPort                               = modkernel32.NewProc("CreateIoCompletionPort")
-	procGetQueuedCompletionStatus                            = modkernel32.NewProc("GetQueuedCompletionStatus")
-	procSetFileCompletionNotificationModes                   = modkernel32.NewProc("SetFileCompletionNotificationModes")
-	proctimeBeginPeriod                                      = modwinmm.NewProc("timeBeginPeriod")
-	procConnectNamedPipe                                     = modkernel32.NewProc("ConnectNamedPipe")
-	procCreateNamedPipeW                                     = modkernel32.NewProc("CreateNamedPipeW")
-	procCreateFileW                                          = modkernel32.NewProc("CreateFileW")
-	procWaitNamedPipeW                                       = modkernel32.NewProc("WaitNamedPipeW")
-	procGetNamedPipeInfo                                     = modkernel32.NewProc("GetNamedPipeInfo")
-	procGetNamedPipeHandleStateW                             = modkernel32.NewProc("GetNamedPipeHandleStateW")
-	procLocalAlloc                                           = modkernel32.NewProc("LocalAlloc")
-	procLookupAccountNameW                                   = modadvapi32.NewProc("LookupAccountNameW")
-	procConvertSidToStringSidW                               = modadvapi32.NewProc("ConvertSidToStringSidW")
-	procConvertStringSecurityDescriptorToSecurityDescriptorW = modadvapi32.NewProc("ConvertStringSecurityDescriptorToSecurityDescriptorW")
-	procConvertSecurityDescriptorToStringSecurityDescriptorW = modadvapi32.NewProc("ConvertSecurityDescriptorToStringSecurityDescriptorW")
-	procLocalFree                                            = modkernel32.NewProc("LocalFree")
-	procGetSecurityDescriptorLength                          = modadvapi32.NewProc("GetSecurityDescriptorLength")
-	procGetFileInformationByHandleEx                         = modkernel32.NewProc("GetFileInformationByHandleEx")
-	procSetFileInformationByHandle                           = modkernel32.NewProc("SetFileInformationByHandle")
-	procAdjustTokenPrivileges                                = modadvapi32.NewProc("AdjustTokenPrivileges")
-	procImpersonateSelf                                      = modadvapi32.NewProc("ImpersonateSelf")
-	procRevertToSelf                                         = modadvapi32.NewProc("RevertToSelf")
-	procOpenThreadToken                                      = modadvapi32.NewProc("OpenThreadToken")
-	procGetCurrentThread                                     = modkernel32.NewProc("GetCurrentThread")
-	procLookupPrivilegeValueW                                = modadvapi32.NewProc("LookupPrivilegeValueW")
-	procLookupPrivilegeNameW                                 = modadvapi32.NewProc("LookupPrivilegeNameW")
-	procLookupPrivilegeDisplayNameW                          = modadvapi32.NewProc("LookupPrivilegeDisplayNameW")
-	procBackupRead                                           = modkernel32.NewProc("BackupRead")
-	procBackupWrite                                          = modkernel32.NewProc("BackupWrite")
-)
-
-func cancelIoEx(file syscall.Handle, o *syscall.Overlapped) (err error) {
-	r1, _, e1 := syscall.Syscall(procCancelIoEx.Addr(), 2, uintptr(file), uintptr(unsafe.Pointer(o)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func createIoCompletionPort(file syscall.Handle, port syscall.Handle, key uintptr, threadCount uint32) (newport syscall.Handle, err error) {
-	r0, _, e1 := syscall.Syscall6(procCreateIoCompletionPort.Addr(), 4, uintptr(file), uintptr(port), uintptr(key), uintptr(threadCount), 0, 0)
-	newport = syscall.Handle(r0)
-	if newport == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func getQueuedCompletionStatus(port syscall.Handle, bytes *uint32, key *uintptr, o **ioOperation, timeout uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procGetQueuedCompletionStatus.Addr(), 5, uintptr(port), uintptr(unsafe.Pointer(bytes)), uintptr(unsafe.Pointer(key)), uintptr(unsafe.Pointer(o)), uintptr(timeout), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func setFileCompletionNotificationModes(h syscall.Handle, flags uint8) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetFileCompletionNotificationModes.Addr(), 2, uintptr(h), uintptr(flags), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func timeBeginPeriod(period uint32) (n int32) {
-	r0, _, _ := syscall.Syscall(proctimeBeginPeriod.Addr(), 1, uintptr(period), 0, 0)
-	n = int32(r0)
-	return
-}
-
-func connectNamedPipe(pipe syscall.Handle, o *syscall.Overlapped) (err error) {
-	r1, _, e1 := syscall.Syscall(procConnectNamedPipe.Addr(), 2, uintptr(pipe), uintptr(unsafe.Pointer(o)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func createNamedPipe(name string, flags uint32, pipeMode uint32, maxInstances uint32, outSize uint32, inSize uint32, defaultTimeout uint32, sa *syscall.SecurityAttributes) (handle syscall.Handle, err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(name)
-	if err != nil {
-		return
-	}
-	return _createNamedPipe(_p0, flags, pipeMode, maxInstances, outSize, inSize, defaultTimeout, sa)
-}
-
-func _createNamedPipe(name *uint16, flags uint32, pipeMode uint32, maxInstances uint32, outSize uint32, inSize uint32, defaultTimeout uint32, sa *syscall.SecurityAttributes) (handle syscall.Handle, err error) {
-	r0, _, e1 := syscall.Syscall9(procCreateNamedPipeW.Addr(), 8, uintptr(unsafe.Pointer(name)), uintptr(flags), uintptr(pipeMode), uintptr(maxInstances), uintptr(outSize), uintptr(inSize), uintptr(defaultTimeout), uintptr(unsafe.Pointer(sa)), 0)
-	handle = syscall.Handle(r0)
-	if handle == syscall.InvalidHandle {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func createFile(name string, access uint32, mode uint32, sa *syscall.SecurityAttributes, createmode uint32, attrs uint32, templatefile syscall.Handle) (handle syscall.Handle, err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(name)
-	if err != nil {
-		return
-	}
-	return _createFile(_p0, access, mode, sa, createmode, attrs, templatefile)
-}
-
-func _createFile(name *uint16, access uint32, mode uint32, sa *syscall.SecurityAttributes, createmode uint32, attrs uint32, templatefile syscall.Handle) (handle syscall.Handle, err error) {
-	r0, _, e1 := syscall.Syscall9(procCreateFileW.Addr(), 7, uintptr(unsafe.Pointer(name)), uintptr(access), uintptr(mode), uintptr(unsafe.Pointer(sa)), uintptr(createmode), uintptr(attrs), uintptr(templatefile), 0, 0)
-	handle = syscall.Handle(r0)
-	if handle == syscall.InvalidHandle {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func waitNamedPipe(name string, timeout uint32) (err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(name)
-	if err != nil {
-		return
-	}
-	return _waitNamedPipe(_p0, timeout)
-}
-
-func _waitNamedPipe(name *uint16, timeout uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procWaitNamedPipeW.Addr(), 2, uintptr(unsafe.Pointer(name)), uintptr(timeout), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func getNamedPipeInfo(pipe syscall.Handle, flags *uint32, outSize *uint32, inSize *uint32, maxInstances *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procGetNamedPipeInfo.Addr(), 5, uintptr(pipe), uintptr(unsafe.Pointer(flags)), uintptr(unsafe.Pointer(outSize)), uintptr(unsafe.Pointer(inSize)), uintptr(unsafe.Pointer(maxInstances)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func getNamedPipeHandleState(pipe syscall.Handle, state *uint32, curInstances *uint32, maxCollectionCount *uint32, collectDataTimeout *uint32, userName *uint16, maxUserNameSize uint32) (err error) {
-	r1, _, e1 := syscall.Syscall9(procGetNamedPipeHandleStateW.Addr(), 7, uintptr(pipe), uintptr(unsafe.Pointer(state)), uintptr(unsafe.Pointer(curInstances)), uintptr(unsafe.Pointer(maxCollectionCount)), uintptr(unsafe.Pointer(collectDataTimeout)), uintptr(unsafe.Pointer(userName)), uintptr(maxUserNameSize), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func localAlloc(uFlags uint32, length uint32) (ptr uintptr) {
-	r0, _, _ := syscall.Syscall(procLocalAlloc.Addr(), 2, uintptr(uFlags), uintptr(length), 0)
-	ptr = uintptr(r0)
-	return
-}
-
-func lookupAccountName(systemName *uint16, accountName string, sid *byte, sidSize *uint32, refDomain *uint16, refDomainSize *uint32, sidNameUse *uint32) (err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(accountName)
-	if err != nil {
-		return
-	}
-	return _lookupAccountName(systemName, _p0, sid, sidSize, refDomain, refDomainSize, sidNameUse)
-}
-
-func _lookupAccountName(systemName *uint16, accountName *uint16, sid *byte, sidSize *uint32, refDomain *uint16, refDomainSize *uint32, sidNameUse *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall9(procLookupAccountNameW.Addr(), 7, uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(accountName)), uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(sidSize)), uintptr(unsafe.Pointer(refDomain)), uintptr(unsafe.Pointer(refDomainSize)), uintptr(unsafe.Pointer(sidNameUse)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func convertSidToStringSid(sid *byte, str **uint16) (err error) {
-	r1, _, e1 := syscall.Syscall(procConvertSidToStringSidW.Addr(), 2, uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(str)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func convertStringSecurityDescriptorToSecurityDescriptor(str string, revision uint32, sd *uintptr, size *uint32) (err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(str)
-	if err != nil {
-		return
-	}
-	return _convertStringSecurityDescriptorToSecurityDescriptor(_p0, revision, sd, size)
-}
-
-func _convertStringSecurityDescriptorToSecurityDescriptor(str *uint16, revision uint32, sd *uintptr, size *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procConvertStringSecurityDescriptorToSecurityDescriptorW.Addr(), 4, uintptr(unsafe.Pointer(str)), uintptr(revision), uintptr(unsafe.Pointer(sd)), uintptr(unsafe.Pointer(size)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func convertSecurityDescriptorToStringSecurityDescriptor(sd *byte, revision uint32, secInfo uint32, sddl **uint16, sddlSize *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procConvertSecurityDescriptorToStringSecurityDescriptorW.Addr(), 5, uintptr(unsafe.Pointer(sd)), uintptr(revision), uintptr(secInfo), uintptr(unsafe.Pointer(sddl)), uintptr(unsafe.Pointer(sddlSize)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func localFree(mem uintptr) {
-	syscall.Syscall(procLocalFree.Addr(), 1, uintptr(mem), 0, 0)
-	return
-}
-
-func getSecurityDescriptorLength(sd uintptr) (len uint32) {
-	r0, _, _ := syscall.Syscall(procGetSecurityDescriptorLength.Addr(), 1, uintptr(sd), 0, 0)
-	len = uint32(r0)
-	return
-}
-
-func getFileInformationByHandleEx(h syscall.Handle, class uint32, buffer *byte, size uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procGetFileInformationByHandleEx.Addr(), 4, uintptr(h), uintptr(class), uintptr(unsafe.Pointer(buffer)), uintptr(size), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func setFileInformationByHandle(h syscall.Handle, class uint32, buffer *byte, size uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procSetFileInformationByHandle.Addr(), 4, uintptr(h), uintptr(class), uintptr(unsafe.Pointer(buffer)), uintptr(size), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func adjustTokenPrivileges(token windows.Token, releaseAll bool, input *byte, outputSize uint32, output *byte, requiredSize *uint32) (success bool, err error) {
-	var _p0 uint32
-	if releaseAll {
-		_p0 = 1
-	} else {
-		_p0 = 0
-	}
-	r0, _, e1 := syscall.Syscall6(procAdjustTokenPrivileges.Addr(), 6, uintptr(token), uintptr(_p0), uintptr(unsafe.Pointer(input)), uintptr(outputSize), uintptr(unsafe.Pointer(output)), uintptr(unsafe.Pointer(requiredSize)))
-	success = r0 != 0
-	if true {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func impersonateSelf(level uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procImpersonateSelf.Addr(), 1, uintptr(level), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func revertToSelf() (err error) {
-	r1, _, e1 := syscall.Syscall(procRevertToSelf.Addr(), 0, 0, 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func openThreadToken(thread syscall.Handle, accessMask uint32, openAsSelf bool, token *windows.Token) (err error) {
-	var _p0 uint32
-	if openAsSelf {
-		_p0 = 1
-	} else {
-		_p0 = 0
-	}
-	r1, _, e1 := syscall.Syscall6(procOpenThreadToken.Addr(), 4, uintptr(thread), uintptr(accessMask), uintptr(_p0), uintptr(unsafe.Pointer(token)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func getCurrentThread() (h syscall.Handle) {
-	r0, _, _ := syscall.Syscall(procGetCurrentThread.Addr(), 0, 0, 0, 0)
-	h = syscall.Handle(r0)
-	return
-}
-
-func lookupPrivilegeValue(systemName string, name string, luid *uint64) (err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(systemName)
-	if err != nil {
-		return
-	}
-	var _p1 *uint16
-	_p1, err = syscall.UTF16PtrFromString(name)
-	if err != nil {
-		return
-	}
-	return _lookupPrivilegeValue(_p0, _p1, luid)
-}
-
-func _lookupPrivilegeValue(systemName *uint16, name *uint16, luid *uint64) (err error) {
-	r1, _, e1 := syscall.Syscall(procLookupPrivilegeValueW.Addr(), 3, uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(luid)))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func lookupPrivilegeName(systemName string, luid *uint64, buffer *uint16, size *uint32) (err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(systemName)
-	if err != nil {
-		return
-	}
-	return _lookupPrivilegeName(_p0, luid, buffer, size)
-}
-
-func _lookupPrivilegeName(systemName *uint16, luid *uint64, buffer *uint16, size *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procLookupPrivilegeNameW.Addr(), 4, uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(luid)), uintptr(unsafe.Pointer(buffer)), uintptr(unsafe.Pointer(size)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func lookupPrivilegeDisplayName(systemName string, name *uint16, buffer *uint16, size *uint32, languageId *uint32) (err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(systemName)
-	if err != nil {
-		return
-	}
-	return _lookupPrivilegeDisplayName(_p0, name, buffer, size, languageId)
-}
-
-func _lookupPrivilegeDisplayName(systemName *uint16, name *uint16, buffer *uint16, size *uint32, languageId *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procLookupPrivilegeDisplayNameW.Addr(), 5, uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(buffer)), uintptr(unsafe.Pointer(size)), uintptr(unsafe.Pointer(languageId)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func backupRead(h syscall.Handle, b []byte, bytesRead *uint32, abort bool, processSecurity bool, context *uintptr) (err error) {
-	var _p0 *byte
-	if len(b) > 0 {
-		_p0 = &b[0]
-	}
-	var _p1 uint32
-	if abort {
-		_p1 = 1
-	} else {
-		_p1 = 0
-	}
-	var _p2 uint32
-	if processSecurity {
-		_p2 = 1
-	} else {
-		_p2 = 0
-	}
-	r1, _, e1 := syscall.Syscall9(procBackupRead.Addr(), 7, uintptr(h), uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(unsafe.Pointer(bytesRead)), uintptr(_p1), uintptr(_p2), uintptr(unsafe.Pointer(context)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func backupWrite(h syscall.Handle, b []byte, bytesWritten *uint32, abort bool, processSecurity bool, context *uintptr) (err error) {
-	var _p0 *byte
-	if len(b) > 0 {
-		_p0 = &b[0]
-	}
-	var _p1 uint32
-	if abort {
-		_p1 = 1
-	} else {
-		_p1 = 0
-	}
-	var _p2 uint32
-	if processSecurity {
-		_p2 = 1
-	} else {
-		_p2 = 0
-	}
-	r1, _, e1 := syscall.Syscall9(procBackupWrite.Addr(), 7, uintptr(h), uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(unsafe.Pointer(bytesWritten)), uintptr(_p1), uintptr(_p2), uintptr(unsafe.Pointer(context)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
diff --git a/vendor/github.com/Nvveen/Gotty/LICENSE b/vendor/github.com/Nvveen/Gotty/LICENSE
deleted file mode 100644
index 0b71c97360..0000000000
--- a/vendor/github.com/Nvveen/Gotty/LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2012, Neal van Veen (nealvanveen@gmail.com)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met: 
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer. 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation are those
-of the authors and should not be interpreted as representing official policies, 
-either expressed or implied, of the FreeBSD Project.
diff --git a/vendor/github.com/Nvveen/Gotty/README b/vendor/github.com/Nvveen/Gotty/README
deleted file mode 100644
index a6b0d9a8fe..0000000000
--- a/vendor/github.com/Nvveen/Gotty/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Gotty is a library written in Go that determines and reads termcap database
-files to produce an interface for interacting with the capabilities of a
-terminal.
-See the godoc documentation or the source code for more information about
-function usage.
diff --git a/vendor/github.com/Nvveen/Gotty/TODO b/vendor/github.com/Nvveen/Gotty/TODO
deleted file mode 100644
index 470460531c..0000000000
--- a/vendor/github.com/Nvveen/Gotty/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-gotty.go:// TODO add more concurrency to name lookup, look for more opportunities.
-all:// TODO add more documentation, with function usage in a doc.go file.
-all:// TODO add more testing/benchmarking with go test.
diff --git a/vendor/github.com/Nvveen/Gotty/attributes.go b/vendor/github.com/Nvveen/Gotty/attributes.go
deleted file mode 100644
index a4c005fae5..0000000000
--- a/vendor/github.com/Nvveen/Gotty/attributes.go
+++ /dev/null
@@ -1,514 +0,0 @@
-// Copyright 2012 Neal van Veen. All rights reserved.
-// Usage of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package gotty
-
-// Boolean capabilities
-var BoolAttr = [...]string{
-	"auto_left_margin", "bw",
-	"auto_right_margin", "am",
-	"no_esc_ctlc", "xsb",
-	"ceol_standout_glitch", "xhp",
-	"eat_newline_glitch", "xenl",
-	"erase_overstrike", "eo",
-	"generic_type", "gn",
-	"hard_copy", "hc",
-	"has_meta_key", "km",
-	"has_status_line", "hs",
-	"insert_null_glitch", "in",
-	"memory_above", "da",
-	"memory_below", "db",
-	"move_insert_mode", "mir",
-	"move_standout_mode", "msgr",
-	"over_strike", "os",
-	"status_line_esc_ok", "eslok",
-	"dest_tabs_magic_smso", "xt",
-	"tilde_glitch", "hz",
-	"transparent_underline", "ul",
-	"xon_xoff", "nxon",
-	"needs_xon_xoff", "nxon",
-	"prtr_silent", "mc5i",
-	"hard_cursor", "chts",
-	"non_rev_rmcup", "nrrmc",
-	"no_pad_char", "npc",
-	"non_dest_scroll_region", "ndscr",
-	"can_change", "ccc",
-	"back_color_erase", "bce",
-	"hue_lightness_saturation", "hls",
-	"col_addr_glitch", "xhpa",
-	"cr_cancels_micro_mode", "crxm",
-	"has_print_wheel", "daisy",
-	"row_addr_glitch", "xvpa",
-	"semi_auto_right_margin", "sam",
-	"cpi_changes_res", "cpix",
-	"lpi_changes_res", "lpix",
-	"backspaces_with_bs", "",
-	"crt_no_scrolling", "",
-	"no_correctly_working_cr", "",
-	"gnu_has_meta_key", "",
-	"linefeed_is_newline", "",
-	"has_hardware_tabs", "",
-	"return_does_clr_eol", "",
-}
-
-// Numerical capabilities
-var NumAttr = [...]string{
-	"columns", "cols",
-	"init_tabs", "it",
-	"lines", "lines",
-	"lines_of_memory", "lm",
-	"magic_cookie_glitch", "xmc",
-	"padding_baud_rate", "pb",
-	"virtual_terminal", "vt",
-	"width_status_line", "wsl",
-	"num_labels", "nlab",
-	"label_height", "lh",
-	"label_width", "lw",
-	"max_attributes", "ma",
-	"maximum_windows", "wnum",
-	"max_colors", "colors",
-	"max_pairs", "pairs",
-	"no_color_video", "ncv",
-	"buffer_capacity", "bufsz",
-	"dot_vert_spacing", "spinv",
-	"dot_horz_spacing", "spinh",
-	"max_micro_address", "maddr",
-	"max_micro_jump", "mjump",
-	"micro_col_size", "mcs",
-	"micro_line_size", "mls",
-	"number_of_pins", "npins",
-	"output_res_char", "orc",
-	"output_res_line", "orl",
-	"output_res_horz_inch", "orhi",
-	"output_res_vert_inch", "orvi",
-	"print_rate", "cps",
-	"wide_char_size", "widcs",
-	"buttons", "btns",
-	"bit_image_entwining", "bitwin",
-	"bit_image_type", "bitype",
-	"magic_cookie_glitch_ul", "",
-	"carriage_return_delay", "",
-	"new_line_delay", "",
-	"backspace_delay", "",
-	"horizontal_tab_delay", "",
-	"number_of_function_keys", "",
-}
-
-// String capabilities
-var StrAttr = [...]string{
-	"back_tab", "cbt",
-	"bell", "bel",
-	"carriage_return", "cr",
-	"change_scroll_region", "csr",
-	"clear_all_tabs", "tbc",
-	"clear_screen", "clear",
-	"clr_eol", "el",
-	"clr_eos", "ed",
-	"column_address", "hpa",
-	"command_character", "cmdch",
-	"cursor_address", "cup",
-	"cursor_down", "cud1",
-	"cursor_home", "home",
-	"cursor_invisible", "civis",
-	"cursor_left", "cub1",
-	"cursor_mem_address", "mrcup",
-	"cursor_normal", "cnorm",
-	"cursor_right", "cuf1",
-	"cursor_to_ll", "ll",
-	"cursor_up", "cuu1",
-	"cursor_visible", "cvvis",
-	"delete_character", "dch1",
-	"delete_line", "dl1",
-	"dis_status_line", "dsl",
-	"down_half_line", "hd",
-	"enter_alt_charset_mode", "smacs",
-	"enter_blink_mode", "blink",
-	"enter_bold_mode", "bold",
-	"enter_ca_mode", "smcup",
-	"enter_delete_mode", "smdc",
-	"enter_dim_mode", "dim",
-	"enter_insert_mode", "smir",
-	"enter_secure_mode", "invis",
-	"enter_protected_mode", "prot",
-	"enter_reverse_mode", "rev",
-	"enter_standout_mode", "smso",
-	"enter_underline_mode", "smul",
-	"erase_chars", "ech",
-	"exit_alt_charset_mode", "rmacs",
-	"exit_attribute_mode", "sgr0",
-	"exit_ca_mode", "rmcup",
-	"exit_delete_mode", "rmdc",
-	"exit_insert_mode", "rmir",
-	"exit_standout_mode", "rmso",
-	"exit_underline_mode", "rmul",
-	"flash_screen", "flash",
-	"form_feed", "ff",
-	"from_status_line", "fsl",
-	"init_1string", "is1",
-	"init_2string", "is2",
-	"init_3string", "is3",
-	"init_file", "if",
-	"insert_character", "ich1",
-	"insert_line", "il1",
-	"insert_padding", "ip",
-	"key_backspace", "kbs",
-	"key_catab", "ktbc",
-	"key_clear", "kclr",
-	"key_ctab", "kctab",
-	"key_dc", "kdch1",
-	"key_dl", "kdl1",
-	"key_down", "kcud1",
-	"key_eic", "krmir",
-	"key_eol", "kel",
-	"key_eos", "ked",
-	"key_f0", "kf0",
-	"key_f1", "kf1",
-	"key_f10", "kf10",
-	"key_f2", "kf2",
-	"key_f3", "kf3",
-	"key_f4", "kf4",
-	"key_f5", "kf5",
-	"key_f6", "kf6",
-	"key_f7", "kf7",
-	"key_f8", "kf8",
-	"key_f9", "kf9",
-	"key_home", "khome",
-	"key_ic", "kich1",
-	"key_il", "kil1",
-	"key_left", "kcub1",
-	"key_ll", "kll",
-	"key_npage", "knp",
-	"key_ppage", "kpp",
-	"key_right", "kcuf1",
-	"key_sf", "kind",
-	"key_sr", "kri",
-	"key_stab", "khts",
-	"key_up", "kcuu1",
-	"keypad_local", "rmkx",
-	"keypad_xmit", "smkx",
-	"lab_f0", "lf0",
-	"lab_f1", "lf1",
-	"lab_f10", "lf10",
-	"lab_f2", "lf2",
-	"lab_f3", "lf3",
-	"lab_f4", "lf4",
-	"lab_f5", "lf5",
-	"lab_f6", "lf6",
-	"lab_f7", "lf7",
-	"lab_f8", "lf8",
-	"lab_f9", "lf9",
-	"meta_off", "rmm",
-	"meta_on", "smm",
-	"newline", "_glitch",
-	"pad_char", "npc",
-	"parm_dch", "dch",
-	"parm_delete_line", "dl",
-	"parm_down_cursor", "cud",
-	"parm_ich", "ich",
-	"parm_index", "indn",
-	"parm_insert_line", "il",
-	"parm_left_cursor", "cub",
-	"parm_right_cursor", "cuf",
-	"parm_rindex", "rin",
-	"parm_up_cursor", "cuu",
-	"pkey_key", "pfkey",
-	"pkey_local", "pfloc",
-	"pkey_xmit", "pfx",
-	"print_screen", "mc0",
-	"prtr_off", "mc4",
-	"prtr_on", "mc5",
-	"repeat_char", "rep",
-	"reset_1string", "rs1",
-	"reset_2string", "rs2",
-	"reset_3string", "rs3",
-	"reset_file", "rf",
-	"restore_cursor", "rc",
-	"row_address", "mvpa",
-	"save_cursor", "row_address",
-	"scroll_forward", "ind",
-	"scroll_reverse", "ri",
-	"set_attributes", "sgr",
-	"set_tab", "hts",
-	"set_window", "wind",
-	"tab", "s_magic_smso",
-	"to_status_line", "tsl",
-	"underline_char", "uc",
-	"up_half_line", "hu",
-	"init_prog", "iprog",
-	"key_a1", "ka1",
-	"key_a3", "ka3",
-	"key_b2", "kb2",
-	"key_c1", "kc1",
-	"key_c3", "kc3",
-	"prtr_non", "mc5p",
-	"char_padding", "rmp",
-	"acs_chars", "acsc",
-	"plab_norm", "pln",
-	"key_btab", "kcbt",
-	"enter_xon_mode", "smxon",
-	"exit_xon_mode", "rmxon",
-	"enter_am_mode", "smam",
-	"exit_am_mode", "rmam",
-	"xon_character", "xonc",
-	"xoff_character", "xoffc",
-	"ena_acs", "enacs",
-	"label_on", "smln",
-	"label_off", "rmln",
-	"key_beg", "kbeg",
-	"key_cancel", "kcan",
-	"key_close", "kclo",
-	"key_command", "kcmd",
-	"key_copy", "kcpy",
-	"key_create", "kcrt",
-	"key_end", "kend",
-	"key_enter", "kent",
-	"key_exit", "kext",
-	"key_find", "kfnd",
-	"key_help", "khlp",
-	"key_mark", "kmrk",
-	"key_message", "kmsg",
-	"key_move", "kmov",
-	"key_next", "knxt",
-	"key_open", "kopn",
-	"key_options", "kopt",
-	"key_previous", "kprv",
-	"key_print", "kprt",
-	"key_redo", "krdo",
-	"key_reference", "kref",
-	"key_refresh", "krfr",
-	"key_replace", "krpl",
-	"key_restart", "krst",
-	"key_resume", "kres",
-	"key_save", "ksav",
-	"key_suspend", "kspd",
-	"key_undo", "kund",
-	"key_sbeg", "kBEG",
-	"key_scancel", "kCAN",
-	"key_scommand", "kCMD",
-	"key_scopy", "kCPY",
-	"key_screate", "kCRT",
-	"key_sdc", "kDC",
-	"key_sdl", "kDL",
-	"key_select", "kslt",
-	"key_send", "kEND",
-	"key_seol", "kEOL",
-	"key_sexit", "kEXT",
-	"key_sfind", "kFND",
-	"key_shelp", "kHLP",
-	"key_shome", "kHOM",
-	"key_sic", "kIC",
-	"key_sleft", "kLFT",
-	"key_smessage", "kMSG",
-	"key_smove", "kMOV",
-	"key_snext", "kNXT",
-	"key_soptions", "kOPT",
-	"key_sprevious", "kPRV",
-	"key_sprint", "kPRT",
-	"key_sredo", "kRDO",
-	"key_sreplace", "kRPL",
-	"key_sright", "kRIT",
-	"key_srsume", "kRES",
-	"key_ssave", "kSAV",
-	"key_ssuspend", "kSPD",
-	"key_sundo", "kUND",
-	"req_for_input", "rfi",
-	"key_f11", "kf11",
-	"key_f12", "kf12",
-	"key_f13", "kf13",
-	"key_f14", "kf14",
-	"key_f15", "kf15",
-	"key_f16", "kf16",
-	"key_f17", "kf17",
-	"key_f18", "kf18",
-	"key_f19", "kf19",
-	"key_f20", "kf20",
-	"key_f21", "kf21",
-	"key_f22", "kf22",
-	"key_f23", "kf23",
-	"key_f24", "kf24",
-	"key_f25", "kf25",
-	"key_f26", "kf26",
-	"key_f27", "kf27",
-	"key_f28", "kf28",
-	"key_f29", "kf29",
-	"key_f30", "kf30",
-	"key_f31", "kf31",
-	"key_f32", "kf32",
-	"key_f33", "kf33",
-	"key_f34", "kf34",
-	"key_f35", "kf35",
-	"key_f36", "kf36",
-	"key_f37", "kf37",
-	"key_f38", "kf38",
-	"key_f39", "kf39",
-	"key_f40", "kf40",
-	"key_f41", "kf41",
-	"key_f42", "kf42",
-	"key_f43", "kf43",
-	"key_f44", "kf44",
-	"key_f45", "kf45",
-	"key_f46", "kf46",
-	"key_f47", "kf47",
-	"key_f48", "kf48",
-	"key_f49", "kf49",
-	"key_f50", "kf50",
-	"key_f51", "kf51",
-	"key_f52", "kf52",
-	"key_f53", "kf53",
-	"key_f54", "kf54",
-	"key_f55", "kf55",
-	"key_f56", "kf56",
-	"key_f57", "kf57",
-	"key_f58", "kf58",
-	"key_f59", "kf59",
-	"key_f60", "kf60",
-	"key_f61", "kf61",
-	"key_f62", "kf62",
-	"key_f63", "kf63",
-	"clr_bol", "el1",
-	"clear_margins", "mgc",
-	"set_left_margin", "smgl",
-	"set_right_margin", "smgr",
-	"label_format", "fln",
-	"set_clock", "sclk",
-	"display_clock", "dclk",
-	"remove_clock", "rmclk",
-	"create_window", "cwin",
-	"goto_window", "wingo",
-	"hangup", "hup",
-	"dial_phone", "dial",
-	"quick_dial", "qdial",
-	"tone", "tone",
-	"pulse", "pulse",
-	"flash_hook", "hook",
-	"fixed_pause", "pause",
-	"wait_tone", "wait",
-	"user0", "u0",
-	"user1", "u1",
-	"user2", "u2",
-	"user3", "u3",
-	"user4", "u4",
-	"user5", "u5",
-	"user6", "u6",
-	"user7", "u7",
-	"user8", "u8",
-	"user9", "u9",
-	"orig_pair", "op",
-	"orig_colors", "oc",
-	"initialize_color", "initc",
-	"initialize_pair", "initp",
-	"set_color_pair", "scp",
-	"set_foreground", "setf",
-	"set_background", "setb",
-	"change_char_pitch", "cpi",
-	"change_line_pitch", "lpi",
-	"change_res_horz", "chr",
-	"change_res_vert", "cvr",
-	"define_char", "defc",
-	"enter_doublewide_mode", "swidm",
-	"enter_draft_quality", "sdrfq",
-	"enter_italics_mode", "sitm",
-	"enter_leftward_mode", "slm",
-	"enter_micro_mode", "smicm",
-	"enter_near_letter_quality", "snlq",
-	"enter_normal_quality", "snrmq",
-	"enter_shadow_mode", "sshm",
-	"enter_subscript_mode", "ssubm",
-	"enter_superscript_mode", "ssupm",
-	"enter_upward_mode", "sum",
-	"exit_doublewide_mode", "rwidm",
-	"exit_italics_mode", "ritm",
-	"exit_leftward_mode", "rlm",
-	"exit_micro_mode", "rmicm",
-	"exit_shadow_mode", "rshm",
-	"exit_subscript_mode", "rsubm",
-	"exit_superscript_mode", "rsupm",
-	"exit_upward_mode", "rum",
-	"micro_column_address", "mhpa",
-	"micro_down", "mcud1",
-	"micro_left", "mcub1",
-	"micro_right", "mcuf1",
-	"micro_row_address", "mvpa",
-	"micro_up", "mcuu1",
-	"order_of_pins", "porder",
-	"parm_down_micro", "mcud",
-	"parm_left_micro", "mcub",
-	"parm_right_micro", "mcuf",
-	"parm_up_micro", "mcuu",
-	"select_char_set", "scs",
-	"set_bottom_margin", "smgb",
-	"set_bottom_margin_parm", "smgbp",
-	"set_left_margin_parm", "smglp",
-	"set_right_margin_parm", "smgrp",
-	"set_top_margin", "smgt",
-	"set_top_margin_parm", "smgtp",
-	"start_bit_image", "sbim",
-	"start_char_set_def", "scsd",
-	"stop_bit_image", "rbim",
-	"stop_char_set_def", "rcsd",
-	"subscript_characters", "subcs",
-	"superscript_characters", "supcs",
-	"these_cause_cr", "docr",
-	"zero_motion", "zerom",
-	"char_set_names", "csnm",
-	"key_mouse", "kmous",
-	"mouse_info", "minfo",
-	"req_mouse_pos", "reqmp",
-	"get_mouse", "getm",
-	"set_a_foreground", "setaf",
-	"set_a_background", "setab",
-	"pkey_plab", "pfxl",
-	"device_type", "devt",
-	"code_set_init", "csin",
-	"set0_des_seq", "s0ds",
-	"set1_des_seq", "s1ds",
-	"set2_des_seq", "s2ds",
-	"set3_des_seq", "s3ds",
-	"set_lr_margin", "smglr",
-	"set_tb_margin", "smgtb",
-	"bit_image_repeat", "birep",
-	"bit_image_newline", "binel",
-	"bit_image_carriage_return", "bicr",
-	"color_names", "colornm",
-	"define_bit_image_region", "defbi",
-	"end_bit_image_region", "endbi",
-	"set_color_band", "setcolor",
-	"set_page_length", "slines",
-	"display_pc_char", "dispc",
-	"enter_pc_charset_mode", "smpch",
-	"exit_pc_charset_mode", "rmpch",
-	"enter_scancode_mode", "smsc",
-	"exit_scancode_mode", "rmsc",
-	"pc_term_options", "pctrm",
-	"scancode_escape", "scesc",
-	"alt_scancode_esc", "scesa",
-	"enter_horizontal_hl_mode", "ehhlm",
-	"enter_left_hl_mode", "elhlm",
-	"enter_low_hl_mode", "elohlm",
-	"enter_right_hl_mode", "erhlm",
-	"enter_top_hl_mode", "ethlm",
-	"enter_vertical_hl_mode", "evhlm",
-	"set_a_attributes", "sgr1",
-	"set_pglen_inch", "slength",
-	"termcap_init2", "",
-	"termcap_reset", "",
-	"linefeed_if_not_lf", "",
-	"backspace_if_not_bs", "",
-	"other_non_function_keys", "",
-	"arrow_key_map", "",
-	"acs_ulcorner", "",
-	"acs_llcorner", "",
-	"acs_urcorner", "",
-	"acs_lrcorner", "",
-	"acs_ltee", "",
-	"acs_rtee", "",
-	"acs_btee", "",
-	"acs_ttee", "",
-	"acs_hline", "",
-	"acs_vline", "",
-	"acs_plus", "",
-	"memory_lock", "",
-	"memory_unlock", "",
-	"box_chars_1", "",
-}
diff --git a/vendor/github.com/Nvveen/Gotty/gotty.go b/vendor/github.com/Nvveen/Gotty/gotty.go
deleted file mode 100644
index 093cbf37e1..0000000000
--- a/vendor/github.com/Nvveen/Gotty/gotty.go
+++ /dev/null
@@ -1,238 +0,0 @@
-// Copyright 2012 Neal van Veen. All rights reserved.
-// Usage of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Gotty is a Go-package for reading and parsing the terminfo database
-package gotty
-
-// TODO add more concurrency to name lookup, look for more opportunities.
-
-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"os"
-	"reflect"
-	"strings"
-	"sync"
-)
-
-// Open a terminfo file by the name given and construct a TermInfo object.
-// If something went wrong reading the terminfo database file, an error is
-// returned.
-func OpenTermInfo(termName string) (*TermInfo, error) {
-	var term *TermInfo
-	var err error
-	// Find the environment variables
-	termloc := os.Getenv("TERMINFO")
-	if len(termloc) == 0 {
-		// Search like ncurses
-		locations := []string{os.Getenv("HOME") + "/.terminfo/", "/etc/terminfo/",
-			"/lib/terminfo/", "/usr/share/terminfo/"}
-		var path string
-		for _, str := range locations {
-			// Construct path
-			path = str + string(termName[0]) + "/" + termName
-			// Check if path can be opened
-			file, _ := os.Open(path)
-			if file != nil {
-				// Path can open, fall out and use current path
-				file.Close()
-				break
-			}
-		}
-		if len(path) > 0 {
-			term, err = readTermInfo(path)
-		} else {
-			err = errors.New(fmt.Sprintf("No terminfo file(-location) found"))
-		}
-	}
-	return term, err
-}
-
-// Open a terminfo file from the environment variable containing the current
-// terminal name and construct a TermInfo object. If something went wrong
-// reading the terminfo database file, an error is returned.
-func OpenTermInfoEnv() (*TermInfo, error) {
-	termenv := os.Getenv("TERM")
-	return OpenTermInfo(termenv)
-}
-
-// Return an attribute by the name attr provided. If none can be found,
-// an error is returned.
-func (term *TermInfo) GetAttribute(attr string) (stacker, error) {
-	// Channel to store the main value in.
-	var value stacker
-	// Add a blocking WaitGroup
-	var block sync.WaitGroup
-	// Keep track of variable being written.
-	written := false
-	// Function to put into goroutine.
-	f := func(ats interface{}) {
-		var ok bool
-		var v stacker
-		// Switch on type of map to use and assign value to it.
-		switch reflect.TypeOf(ats).Elem().Kind() {
-		case reflect.Bool:
-			v, ok = ats.(map[string]bool)[attr]
-		case reflect.Int16:
-			v, ok = ats.(map[string]int16)[attr]
-		case reflect.String:
-			v, ok = ats.(map[string]string)[attr]
-		}
-		// If ok, a value is found, so we can write.
-		if ok {
-			value = v
-			written = true
-		}
-		// Goroutine is done
-		block.Done()
-	}
-	block.Add(3)
-	// Go for all 3 attribute lists.
-	go f(term.boolAttributes)
-	go f(term.numAttributes)
-	go f(term.strAttributes)
-	// Wait until every goroutine is done.
-	block.Wait()
-	// If a value has been written, return it.
-	if written {
-		return value, nil
-	}
-	// Otherwise, error.
-	return nil, fmt.Errorf("Erorr finding attribute")
-}
-
-// Return an attribute by the name attr provided. If none can be found,
-// an error is returned. A name is first converted to its termcap value.
-func (term *TermInfo) GetAttributeName(name string) (stacker, error) {
-	tc := GetTermcapName(name)
-	return term.GetAttribute(tc)
-}
-
-// A utility function that finds and returns the termcap equivalent of a 
-// variable name.
-func GetTermcapName(name string) string {
-	// Termcap name
-	var tc string
-	// Blocking group
-	var wait sync.WaitGroup
-	// Function to put into a goroutine
-	f := func(attrs []string) {
-		// Find the string corresponding to the name
-		for i, s := range attrs {
-			if s == name {
-				tc = attrs[i+1]
-			}
-		}
-		// Goroutine is finished
-		wait.Done()
-	}
-	wait.Add(3)
-	// Go for all 3 attribute lists
-	go f(BoolAttr[:])
-	go f(NumAttr[:])
-	go f(StrAttr[:])
-	// Wait until every goroutine is done
-	wait.Wait()
-	// Return the termcap name
-	return tc
-}
-
-// This function takes a path to a terminfo file and reads it in binary
-// form to construct the actual TermInfo file.
-func readTermInfo(path string) (*TermInfo, error) {
-	// Open the terminfo file
-	file, err := os.Open(path)
-	defer file.Close()
-	if err != nil {
-		return nil, err
-	}
-
-	// magic, nameSize, boolSize, nrSNum, nrOffsetsStr, strSize
-	// Header is composed of the magic 0432 octal number, size of the name
-	// section, size of the boolean section, the amount of number values,
-	// the number of offsets of strings, and the size of the string section.
-	var header [6]int16
-	// Byte array is used to read in byte values
-	var byteArray []byte
-	// Short array is used to read in short values
-	var shArray []int16
-	// TermInfo object to store values
-	var term TermInfo
-
-	// Read in the header
-	err = binary.Read(file, binary.LittleEndian, &header)
-	if err != nil {
-		return nil, err
-	}
-	// If magic number isn't there or isn't correct, we have the wrong filetype
-	if header[0] != 0432 {
-		return nil, errors.New(fmt.Sprintf("Wrong filetype"))
-	}
-
-	// Read in the names
-	byteArray = make([]byte, header[1])
-	err = binary.Read(file, binary.LittleEndian, &byteArray)
-	if err != nil {
-		return nil, err
-	}
-	term.Names = strings.Split(string(byteArray), "|")
-
-	// Read in the booleans
-	byteArray = make([]byte, header[2])
-	err = binary.Read(file, binary.LittleEndian, &byteArray)
-	if err != nil {
-		return nil, err
-	}
-	term.boolAttributes = make(map[string]bool)
-	for i, b := range byteArray {
-		if b == 1 {
-			term.boolAttributes[BoolAttr[i*2+1]] = true
-		}
-	}
-	// If the number of bytes read is not even, a byte for alignment is added
-	if len(byteArray)%2 != 0 {
-		err = binary.Read(file, binary.LittleEndian, make([]byte, 1))
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// Read in shorts
-	shArray = make([]int16, header[3])
-	err = binary.Read(file, binary.LittleEndian, &shArray)
-	if err != nil {
-		return nil, err
-	}
-	term.numAttributes = make(map[string]int16)
-	for i, n := range shArray {
-		if n != 0377 && n > -1 {
-			term.numAttributes[NumAttr[i*2+1]] = n
-		}
-	}
-
-	// Read the offsets into the short array
-	shArray = make([]int16, header[4])
-	err = binary.Read(file, binary.LittleEndian, &shArray)
-	if err != nil {
-		return nil, err
-	}
-	// Read the actual strings in the byte array
-	byteArray = make([]byte, header[5])
-	err = binary.Read(file, binary.LittleEndian, &byteArray)
-	if err != nil {
-		return nil, err
-	}
-	term.strAttributes = make(map[string]string)
-	// We get an offset, and then iterate until the string is null-terminated
-	for i, offset := range shArray {
-		if offset > -1 {
-			r := offset
-			for ; byteArray[r] != 0; r++ {
-			}
-			term.strAttributes[StrAttr[i*2+1]] = string(byteArray[offset:r])
-		}
-	}
-	return &term, nil
-}
diff --git a/vendor/github.com/Nvveen/Gotty/parser.go b/vendor/github.com/Nvveen/Gotty/parser.go
deleted file mode 100644
index a9d5d23c54..0000000000
--- a/vendor/github.com/Nvveen/Gotty/parser.go
+++ /dev/null
@@ -1,362 +0,0 @@
-// Copyright 2012 Neal van Veen. All rights reserved.
-// Usage of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package gotty
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-var exp = [...]string{
-	"%%",
-	"%c",
-	"%s",
-	"%p(\\d)",
-	"%P([A-z])",
-	"%g([A-z])",
-	"%'(.)'",
-	"%{([0-9]+)}",
-	"%l",
-	"%\\+|%-|%\\*|%/|%m",
-	"%&|%\\||%\\^",
-	"%=|%>|%<",
-	"%A|%O",
-	"%!|%~",
-	"%i",
-	"%(:[\\ #\\-\\+]{0,4})?(\\d+\\.\\d+|\\d+)?[doxXs]",
-	"%\\?(.*?);",
-}
-
-var regex *regexp.Regexp
-var staticVar map[byte]stacker
-
-// Parses the attribute that is received with name attr and parameters params.
-func (term *TermInfo) Parse(attr string, params ...interface{}) (string, error) {
-	// Get the attribute name first.
-	iface, err := term.GetAttribute(attr)
-	str, ok := iface.(string)
-	if err != nil {
-		return "", err
-	}
-	if !ok {
-		return str, errors.New("Only string capabilities can be parsed.")
-	}
-	// Construct the hidden parser struct so we can use a recursive stack based
-	// parser.
-	ps := &parser{}
-	// Dynamic variables only exist in this context.
-	ps.dynamicVar = make(map[byte]stacker, 26)
-	ps.parameters = make([]stacker, len(params))
-	// Convert the parameters to insert them into the parser struct.
-	for i, x := range params {
-		ps.parameters[i] = x
-	}
-	// Recursively walk and return.
-	result, err := ps.walk(str)
-	return result, err
-}
-
-// Parses the attribute that is received with name attr and parameters params.
-// Only works on full name of a capability that is given, which it uses to
-// search for the termcap name.
-func (term *TermInfo) ParseName(attr string, params ...interface{}) (string, error) {
-	tc := GetTermcapName(attr)
-	return term.Parse(tc, params)
-}
-
-// Identify each token in a stack based manner and do the actual parsing.
-func (ps *parser) walk(attr string) (string, error) {
-	// We use a buffer to get the modified string.
-	var buf bytes.Buffer
-	// Next, find and identify all tokens by their indices and strings.
-	tokens := regex.FindAllStringSubmatch(attr, -1)
-	if len(tokens) == 0 {
-		return attr, nil
-	}
-	indices := regex.FindAllStringIndex(attr, -1)
-	q := 0 // q counts the matches of one token
-	// Iterate through the string per character.
-	for i := 0; i < len(attr); i++ {
-		// If the current position is an identified token, execute the following
-		// steps.
-		if q < len(indices) && i >= indices[q][0] && i < indices[q][1] {
-			// Switch on token.
-			switch {
-			case tokens[q][0][:2] == "%%":
-				// Literal percentage character.
-				buf.WriteByte('%')
-			case tokens[q][0][:2] == "%c":
-				// Pop a character.
-				c, err := ps.st.pop()
-				if err != nil {
-					return buf.String(), err
-				}
-				buf.WriteByte(c.(byte))
-			case tokens[q][0][:2] == "%s":
-				// Pop a string.
-				str, err := ps.st.pop()
-				if err != nil {
-					return buf.String(), err
-				}
-				if _, ok := str.(string); !ok {
-					return buf.String(), errors.New("Stack head is not a string")
-				}
-				buf.WriteString(str.(string))
-			case tokens[q][0][:2] == "%p":
-				// Push a parameter on the stack.
-				index, err := strconv.ParseInt(tokens[q][1], 10, 8)
-				index--
-				if err != nil {
-					return buf.String(), err
-				}
-				if int(index) >= len(ps.parameters) {
-					return buf.String(), errors.New("Parameters index out of bound")
-				}
-				ps.st.push(ps.parameters[index])
-			case tokens[q][0][:2] == "%P":
-				// Pop a variable from the stack as a dynamic or static variable.
-				val, err := ps.st.pop()
-				if err != nil {
-					return buf.String(), err
-				}
-				index := tokens[q][2]
-				if len(index) > 1 {
-					errorStr := fmt.Sprintf("%s is not a valid dynamic variables index",
-						index)
-					return buf.String(), errors.New(errorStr)
-				}
-				// Specify either dynamic or static.
-				if index[0] >= 'a' && index[0] <= 'z' {
-					ps.dynamicVar[index[0]] = val
-				} else if index[0] >= 'A' && index[0] <= 'Z' {
-					staticVar[index[0]] = val
-				}
-			case tokens[q][0][:2] == "%g":
-				// Push a variable from the stack as a dynamic or static variable.
-				index := tokens[q][3]
-				if len(index) > 1 {
-					errorStr := fmt.Sprintf("%s is not a valid static variables index",
-						index)
-					return buf.String(), errors.New(errorStr)
-				}
-				var val stacker
-				if index[0] >= 'a' && index[0] <= 'z' {
-					val = ps.dynamicVar[index[0]]
-				} else if index[0] >= 'A' && index[0] <= 'Z' {
-					val = staticVar[index[0]]
-				}
-				ps.st.push(val)
-			case tokens[q][0][:2] == "%'":
-				// Push a character constant.
-				con := tokens[q][4]
-				if len(con) > 1 {
-					errorStr := fmt.Sprintf("%s is not a valid character constant", con)
-					return buf.String(), errors.New(errorStr)
-				}
-				ps.st.push(con[0])
-			case tokens[q][0][:2] == "%{":
-				// Push an integer constant.
-				con, err := strconv.ParseInt(tokens[q][5], 10, 32)
-				if err != nil {
-					return buf.String(), err
-				}
-				ps.st.push(con)
-			case tokens[q][0][:2] == "%l":
-				// Push the length of the string that is popped from the stack.
-				popStr, err := ps.st.pop()
-				if err != nil {
-					return buf.String(), err
-				}
-				if _, ok := popStr.(string); !ok {
-					errStr := fmt.Sprintf("Stack head is not a string")
-					return buf.String(), errors.New(errStr)
-				}
-				ps.st.push(len(popStr.(string)))
-			case tokens[q][0][:2] == "%?":
-				// If-then-else construct. First, the whole string is identified and
-				// then inside this substring, we can specify which parts to switch on.
-				ifReg, _ := regexp.Compile("%\\?(.*)%t(.*)%e(.*);|%\\?(.*)%t(.*);")
-				ifTokens := ifReg.FindStringSubmatch(tokens[q][0])
-				var (
-					ifStr string
-					err   error
-				)
-				// Parse the if-part to determine if-else.
-				if len(ifTokens[1]) > 0 {
-					ifStr, err = ps.walk(ifTokens[1])
-				} else { // else
-					ifStr, err = ps.walk(ifTokens[4])
-				}
-				// Return any errors
-				if err != nil {
-					return buf.String(), err
-				} else if len(ifStr) > 0 {
-					// Self-defined limitation, not sure if this is correct, but didn't
-					// seem like it.
-					return buf.String(), errors.New("If-clause cannot print statements")
-				}
-				var thenStr string
-				// Pop the first value that is set by parsing the if-clause.
-				choose, err := ps.st.pop()
-				if err != nil {
-					return buf.String(), err
-				}
-				// Switch to if or else.
-				if choose.(int) == 0 && len(ifTokens[1]) > 0 {
-					thenStr, err = ps.walk(ifTokens[3])
-				} else if choose.(int) != 0 {
-					if len(ifTokens[1]) > 0 {
-						thenStr, err = ps.walk(ifTokens[2])
-					} else {
-						thenStr, err = ps.walk(ifTokens[5])
-					}
-				}
-				if err != nil {
-					return buf.String(), err
-				}
-				buf.WriteString(thenStr)
-			case tokens[q][0][len(tokens[q][0])-1] == 'd': // Fallthrough for printing
-				fallthrough
-			case tokens[q][0][len(tokens[q][0])-1] == 'o': // digits.
-				fallthrough
-			case tokens[q][0][len(tokens[q][0])-1] == 'x':
-				fallthrough
-			case tokens[q][0][len(tokens[q][0])-1] == 'X':
-				fallthrough
-			case tokens[q][0][len(tokens[q][0])-1] == 's':
-				token := tokens[q][0]
-				// Remove the : that comes before a flag.
-				if token[1] == ':' {
-					token = token[:1] + token[2:]
-				}
-				digit, err := ps.st.pop()
-				if err != nil {
-					return buf.String(), err
-				}
-				// The rest is determined like the normal formatted prints.
-				digitStr := fmt.Sprintf(token, digit.(int))
-				buf.WriteString(digitStr)
-			case tokens[q][0][:2] == "%i":
-				// Increment the parameters by one.
-				if len(ps.parameters) < 2 {
-					return buf.String(), errors.New("Not enough parameters to increment.")
-				}
-				val1, val2 := ps.parameters[0].(int), ps.parameters[1].(int)
-				val1++
-				val2++
-				ps.parameters[0], ps.parameters[1] = val1, val2
-			default:
-				// The rest of the tokens is a special case, where two values are
-				// popped and then operated on by the token that comes after them.
-				op1, err := ps.st.pop()
-				if err != nil {
-					return buf.String(), err
-				}
-				op2, err := ps.st.pop()
-				if err != nil {
-					return buf.String(), err
-				}
-				var result stacker
-				switch tokens[q][0][:2] {
-				case "%+":
-					// Addition
-					result = op2.(int) + op1.(int)
-				case "%-":
-					// Subtraction
-					result = op2.(int) - op1.(int)
-				case "%*":
-					// Multiplication
-					result = op2.(int) * op1.(int)
-				case "%/":
-					// Division
-					result = op2.(int) / op1.(int)
-				case "%m":
-					// Modulo
-					result = op2.(int) % op1.(int)
-				case "%&":
-					// Bitwise AND
-					result = op2.(int) & op1.(int)
-				case "%|":
-					// Bitwise OR
-					result = op2.(int) | op1.(int)
-				case "%^":
-					// Bitwise XOR
-					result = op2.(int) ^ op1.(int)
-				case "%=":
-					// Equals
-					result = op2 == op1
-				case "%>":
-					// Greater-than
-					result = op2.(int) > op1.(int)
-				case "%<":
-					// Lesser-than
-					result = op2.(int) < op1.(int)
-				case "%A":
-					// Logical AND
-					result = op2.(bool) && op1.(bool)
-				case "%O":
-					// Logical OR
-					result = op2.(bool) || op1.(bool)
-				case "%!":
-					// Logical complement
-					result = !op1.(bool)
-				case "%~":
-					// Bitwise complement
-					result = ^(op1.(int))
-				}
-				ps.st.push(result)
-			}
-
-			i = indices[q][1] - 1
-			q++
-		} else {
-			// We are not "inside" a token, so just skip until the end or the next
-			// token, and add all characters to the buffer.
-			j := i
-			if q != len(indices) {
-				for !(j >= indices[q][0] && j < indices[q][1]) {
-					j++
-				}
-			} else {
-				j = len(attr)
-			}
-			buf.WriteString(string(attr[i:j]))
-			i = j
-		}
-	}
-	// Return the buffer as a string.
-	return buf.String(), nil
-}
-
-// Push a stacker-value onto the stack.
-func (st *stack) push(s stacker) {
-	*st = append(*st, s)
-}
-
-// Pop a stacker-value from the stack.
-func (st *stack) pop() (stacker, error) {
-	if len(*st) == 0 {
-		return nil, errors.New("Stack is empty.")
-	}
-	newStack := make(stack, len(*st)-1)
-	val := (*st)[len(*st)-1]
-	copy(newStack, (*st)[:len(*st)-1])
-	*st = newStack
-	return val, nil
-}
-
-// Initialize regexes and the static vars (that don't get changed between
-// calls.
-func init() {
-	// Initialize the main regex.
-	expStr := strings.Join(exp[:], "|")
-	regex, _ = regexp.Compile(expStr)
-	// Initialize the static variables.
-	staticVar = make(map[byte]stacker, 26)
-}
diff --git a/vendor/github.com/Nvveen/Gotty/types.go b/vendor/github.com/Nvveen/Gotty/types.go
deleted file mode 100644
index 9bcc65e9b8..0000000000
--- a/vendor/github.com/Nvveen/Gotty/types.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2012 Neal van Veen. All rights reserved.
-// Usage of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package gotty
-
-type TermInfo struct {
-	boolAttributes map[string]bool
-	numAttributes  map[string]int16
-	strAttributes  map[string]string
-	// The various names of the TermInfo file.
-	Names []string
-}
-
-type stacker interface {
-}
-type stack []stacker
-
-type parser struct {
-	st         stack
-	parameters []stacker
-	dynamicVar map[byte]stacker
-}
diff --git a/vendor/github.com/PuerkitoBio/purell/LICENSE b/vendor/github.com/PuerkitoBio/purell/LICENSE
deleted file mode 100644
index 4b9986dea7..0000000000
--- a/vendor/github.com/PuerkitoBio/purell/LICENSE
+++ /dev/null
@@ -1,12 +0,0 @@
-Copyright (c) 2012, Martin Angers
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/PuerkitoBio/purell/README.md b/vendor/github.com/PuerkitoBio/purell/README.md
deleted file mode 100644
index f33e2e9d77..0000000000
--- a/vendor/github.com/PuerkitoBio/purell/README.md
+++ /dev/null
@@ -1,187 +0,0 @@
-# Purell
-
-Purell is a tiny Go library to normalize URLs. It returns a pure URL. Pure-ell. Sanitizer and all. Yeah, I know...
-
-Based on the [wikipedia paper][wiki] and the [RFC 3986 document][rfc].
-
-[![build status](https://travis-ci.org/PuerkitoBio/purell.svg?branch=master)](http://travis-ci.org/PuerkitoBio/purell)
-
-## Install
-
-`go get github.com/PuerkitoBio/purell`
-
-## Changelog
-
-*    **2016-11-14 (v1.1.0)** : IDN: Conform to RFC 5895: Fold character width (thanks to @beeker1121).
-*    **2016-07-27 (v1.0.0)** : Normalize IDN to ASCII (thanks to @zenovich).
-*    **2015-02-08** : Add fix for relative paths issue ([PR #5][pr5]) and add fix for unnecessary encoding of reserved characters ([see issue #7][iss7]).
-*    **v0.2.0** : Add benchmarks, Attempt IDN support.
-*    **v0.1.0** : Initial release.
-
-## Examples
-
-From `example_test.go` (note that in your code, you would import "github.com/PuerkitoBio/purell", and would prefix references to its methods and constants with "purell."):
-
-```go
-package purell
-
-import (
-  "fmt"
-  "net/url"
-)
-
-func ExampleNormalizeURLString() {
-  if normalized, err := NormalizeURLString("hTTp://someWEBsite.com:80/Amazing%3f/url/",
-    FlagLowercaseScheme|FlagLowercaseHost|FlagUppercaseEscapes); err != nil {
-    panic(err)
-  } else {
-    fmt.Print(normalized)
-  }
-  // Output: http://somewebsite.com:80/Amazing%3F/url/
-}
-
-func ExampleMustNormalizeURLString() {
-  normalized := MustNormalizeURLString("hTTpS://someWEBsite.com:443/Amazing%fa/url/",
-    FlagsUnsafeGreedy)
-  fmt.Print(normalized)
-
-  // Output: http://somewebsite.com/Amazing%FA/url
-}
-
-func ExampleNormalizeURL() {
-  if u, err := url.Parse("Http://SomeUrl.com:8080/a/b/.././c///g?c=3&a=1&b=9&c=0#target"); err != nil {
-    panic(err)
-  } else {
-    normalized := NormalizeURL(u, FlagsUsuallySafeGreedy|FlagRemoveDuplicateSlashes|FlagRemoveFragment)
-    fmt.Print(normalized)
-  }
-
-  // Output: http://someurl.com:8080/a/c/g?c=3&a=1&b=9&c=0
-}
-```
-
-## API
-
-As seen in the examples above, purell offers three methods, `NormalizeURLString(string, NormalizationFlags) (string, error)`, `MustNormalizeURLString(string, NormalizationFlags) (string)` and `NormalizeURL(*url.URL, NormalizationFlags) (string)`. They all normalize the provided URL based on the specified flags. Here are the available flags:
-
-```go
-const (
-	// Safe normalizations
-	FlagLowercaseScheme           NormalizationFlags = 1 << iota // HTTP://host -> http://host, applied by default in Go1.1
-	FlagLowercaseHost                                            // http://HOST -> http://host
-	FlagUppercaseEscapes                                         // http://host/t%ef -> http://host/t%EF
-	FlagDecodeUnnecessaryEscapes                                 // http://host/t%41 -> http://host/tA
-	FlagEncodeNecessaryEscapes                                   // http://host/!"#$ -> http://host/%21%22#$
-	FlagRemoveDefaultPort                                        // http://host:80 -> http://host
-	FlagRemoveEmptyQuerySeparator                                // http://host/path? -> http://host/path
-
-	// Usually safe normalizations
-	FlagRemoveTrailingSlash // http://host/path/ -> http://host/path
-	FlagAddTrailingSlash    // http://host/path -> http://host/path/ (should choose only one of these add/remove trailing slash flags)
-	FlagRemoveDotSegments   // http://host/path/./a/b/../c -> http://host/path/a/c
-
-	// Unsafe normalizations
-	FlagRemoveDirectoryIndex   // http://host/path/index.html -> http://host/path/
-	FlagRemoveFragment         // http://host/path#fragment -> http://host/path
-	FlagForceHTTP              // https://host -> http://host
-	FlagRemoveDuplicateSlashes // http://host/path//a///b -> http://host/path/a/b
-	FlagRemoveWWW              // http://www.host/ -> http://host/
-	FlagAddWWW                 // http://host/ -> http://www.host/ (should choose only one of these add/remove WWW flags)
-	FlagSortQuery              // http://host/path?c=3&b=2&a=1&b=1 -> http://host/path?a=1&b=1&b=2&c=3
-
-	// Normalizations not in the wikipedia article, required to cover tests cases
-	// submitted by jehiah
-	FlagDecodeDWORDHost           // http://1113982867 -> http://66.102.7.147
-	FlagDecodeOctalHost           // http://0102.0146.07.0223 -> http://66.102.7.147
-	FlagDecodeHexHost             // http://0x42660793 -> http://66.102.7.147
-	FlagRemoveUnnecessaryHostDots // http://.host../path -> http://host/path
-	FlagRemoveEmptyPortSeparator  // http://host:/path -> http://host/path
-
-	// Convenience set of safe normalizations
-	FlagsSafe NormalizationFlags = FlagLowercaseHost | FlagLowercaseScheme | FlagUppercaseEscapes | FlagDecodeUnnecessaryEscapes | FlagEncodeNecessaryEscapes | FlagRemoveDefaultPort | FlagRemoveEmptyQuerySeparator
-
-	// For convenience sets, "greedy" uses the "remove trailing slash" and "remove www. prefix" flags,
-	// while "non-greedy" uses the "add (or keep) the trailing slash" and "add www. prefix".
-
-	// Convenience set of usually safe normalizations (includes FlagsSafe)
-	FlagsUsuallySafeGreedy    NormalizationFlags = FlagsSafe | FlagRemoveTrailingSlash | FlagRemoveDotSegments
-	FlagsUsuallySafeNonGreedy NormalizationFlags = FlagsSafe | FlagAddTrailingSlash | FlagRemoveDotSegments
-
-	// Convenience set of unsafe normalizations (includes FlagsUsuallySafe)
-	FlagsUnsafeGreedy    NormalizationFlags = FlagsUsuallySafeGreedy | FlagRemoveDirectoryIndex | FlagRemoveFragment | FlagForceHTTP | FlagRemoveDuplicateSlashes | FlagRemoveWWW | FlagSortQuery
-	FlagsUnsafeNonGreedy NormalizationFlags = FlagsUsuallySafeNonGreedy | FlagRemoveDirectoryIndex | FlagRemoveFragment | FlagForceHTTP | FlagRemoveDuplicateSlashes | FlagAddWWW | FlagSortQuery
-
-	// Convenience set of all available flags
-	FlagsAllGreedy    = FlagsUnsafeGreedy | FlagDecodeDWORDHost | FlagDecodeOctalHost | FlagDecodeHexHost | FlagRemoveUnnecessaryHostDots | FlagRemoveEmptyPortSeparator
-	FlagsAllNonGreedy = FlagsUnsafeNonGreedy | FlagDecodeDWORDHost | FlagDecodeOctalHost | FlagDecodeHexHost | FlagRemoveUnnecessaryHostDots | FlagRemoveEmptyPortSeparator
-)
-```
-
-For convenience, the set of flags `FlagsSafe`, `FlagsUsuallySafe[Greedy|NonGreedy]`, `FlagsUnsafe[Greedy|NonGreedy]` and `FlagsAll[Greedy|NonGreedy]` are provided for the similarly grouped normalizations on [wikipedia's URL normalization page][wiki]. You can add (using the bitwise OR `|` operator) or remove (using the bitwise AND NOT `&^` operator) individual flags from the sets if required, to build your own custom set.
-
-The [full godoc reference is available on gopkgdoc][godoc].
-
-Some things to note:
-
-*    `FlagDecodeUnnecessaryEscapes`, `FlagEncodeNecessaryEscapes`, `FlagUppercaseEscapes` and `FlagRemoveEmptyQuerySeparator` are always implicitly set, because internally, the URL string is parsed as an URL object, which automatically decodes unnecessary escapes, uppercases and encodes necessary ones, and removes empty query separators (an unnecessary `?` at the end of the url). So this operation cannot **not** be done. For this reason, `FlagRemoveEmptyQuerySeparator` (as well as the other three) has been included in the `FlagsSafe` convenience set, instead of `FlagsUnsafe`, where Wikipedia puts it.
-
-*    The `FlagDecodeUnnecessaryEscapes` decodes the following escapes (*from -> to*):
-    -    %24 -> $
-    -    %26 -> &
-    -    %2B-%3B -> +,-./0123456789:;
-    -    %3D -> =
-    -    %40-%5A -> @ABCDEFGHIJKLMNOPQRSTUVWXYZ
-    -    %5F -> _
-    -    %61-%7A -> abcdefghijklmnopqrstuvwxyz
-    -    %7E -> ~
-
-
-*    When the `NormalizeURL` function is used (passing an URL object), this source URL object is modified (that is, after the call, the URL object will be modified to reflect the normalization).
-
-*    The *replace IP with domain name* normalization (`http://208.77.188.166/ → http://www.example.com/`) is obviously not possible for a library without making some network requests. This is not implemented in purell.
-
-*    The *remove unused query string parameters* and *remove default query parameters* are also not implemented, since this is a very case-specific normalization, and it is quite trivial to do with an URL object.
-
-### Safe vs Usually Safe vs Unsafe
-
-Purell allows you to control the level of risk you take while normalizing an URL. You can aggressively normalize, play it totally safe, or anything in between.
-
-Consider the following URL:
-
-`HTTPS://www.RooT.com/toto/t%45%1f///a/./b/../c/?z=3&w=2&a=4&w=1#invalid`
-
-Normalizing with the `FlagsSafe` gives:
-
-`https://www.root.com/toto/tE%1F///a/./b/../c/?z=3&w=2&a=4&w=1#invalid`
-
-With the `FlagsUsuallySafeGreedy`:
-
-`https://www.root.com/toto/tE%1F///a/c?z=3&w=2&a=4&w=1#invalid`
-
-And with `FlagsUnsafeGreedy`:
-
-`http://root.com/toto/tE%1F/a/c?a=4&w=1&w=2&z=3`
-
-## TODOs
-
-*    Add a class/default instance to allow specifying custom directory index names? At the moment, removing directory index removes `(^|/)((?:default|index)\.\w{1,4})$`.
-
-## Thanks / Contributions
-
-@rogpeppe
-@jehiah
-@opennota
-@pchristopher1275
-@zenovich
-@beeker1121
-
-## License
-
-The [BSD 3-Clause license][bsd].
-
-[bsd]: http://opensource.org/licenses/BSD-3-Clause
-[wiki]: http://en.wikipedia.org/wiki/URL_normalization
-[rfc]: http://tools.ietf.org/html/rfc3986#section-6
-[godoc]: http://go.pkgdoc.org/github.com/PuerkitoBio/purell
-[pr5]: https://github.com/PuerkitoBio/purell/pull/5
-[iss7]: https://github.com/PuerkitoBio/purell/issues/7
diff --git a/vendor/github.com/PuerkitoBio/purell/purell.go b/vendor/github.com/PuerkitoBio/purell/purell.go
deleted file mode 100644
index 6d0fc190a1..0000000000
--- a/vendor/github.com/PuerkitoBio/purell/purell.go
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
-Package purell offers URL normalization as described on the wikipedia page:
-http://en.wikipedia.org/wiki/URL_normalization
-*/
-package purell
-
-import (
-	"bytes"
-	"fmt"
-	"net/url"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/PuerkitoBio/urlesc"
-	"golang.org/x/net/idna"
-	"golang.org/x/text/unicode/norm"
-	"golang.org/x/text/width"
-)
-
-// A set of normalization flags determines how a URL will
-// be normalized.
-type NormalizationFlags uint
-
-const (
-	// Safe normalizations
-	FlagLowercaseScheme           NormalizationFlags = 1 << iota // HTTP://host -> http://host, applied by default in Go1.1
-	FlagLowercaseHost                                            // http://HOST -> http://host
-	FlagUppercaseEscapes                                         // http://host/t%ef -> http://host/t%EF
-	FlagDecodeUnnecessaryEscapes                                 // http://host/t%41 -> http://host/tA
-	FlagEncodeNecessaryEscapes                                   // http://host/!"#$ -> http://host/%21%22#$
-	FlagRemoveDefaultPort                                        // http://host:80 -> http://host
-	FlagRemoveEmptyQuerySeparator                                // http://host/path? -> http://host/path
-
-	// Usually safe normalizations
-	FlagRemoveTrailingSlash // http://host/path/ -> http://host/path
-	FlagAddTrailingSlash    // http://host/path -> http://host/path/ (should choose only one of these add/remove trailing slash flags)
-	FlagRemoveDotSegments   // http://host/path/./a/b/../c -> http://host/path/a/c
-
-	// Unsafe normalizations
-	FlagRemoveDirectoryIndex   // http://host/path/index.html -> http://host/path/
-	FlagRemoveFragment         // http://host/path#fragment -> http://host/path
-	FlagForceHTTP              // https://host -> http://host
-	FlagRemoveDuplicateSlashes // http://host/path//a///b -> http://host/path/a/b
-	FlagRemoveWWW              // http://www.host/ -> http://host/
-	FlagAddWWW                 // http://host/ -> http://www.host/ (should choose only one of these add/remove WWW flags)
-	FlagSortQuery              // http://host/path?c=3&b=2&a=1&b=1 -> http://host/path?a=1&b=1&b=2&c=3
-
-	// Normalizations not in the wikipedia article, required to cover tests cases
-	// submitted by jehiah
-	FlagDecodeDWORDHost           // http://1113982867 -> http://66.102.7.147
-	FlagDecodeOctalHost           // http://0102.0146.07.0223 -> http://66.102.7.147
-	FlagDecodeHexHost             // http://0x42660793 -> http://66.102.7.147
-	FlagRemoveUnnecessaryHostDots // http://.host../path -> http://host/path
-	FlagRemoveEmptyPortSeparator  // http://host:/path -> http://host/path
-
-	// Convenience set of safe normalizations
-	FlagsSafe NormalizationFlags = FlagLowercaseHost | FlagLowercaseScheme | FlagUppercaseEscapes | FlagDecodeUnnecessaryEscapes | FlagEncodeNecessaryEscapes | FlagRemoveDefaultPort | FlagRemoveEmptyQuerySeparator
-
-	// For convenience sets, "greedy" uses the "remove trailing slash" and "remove www. prefix" flags,
-	// while "non-greedy" uses the "add (or keep) the trailing slash" and "add www. prefix".
-
-	// Convenience set of usually safe normalizations (includes FlagsSafe)
-	FlagsUsuallySafeGreedy    NormalizationFlags = FlagsSafe | FlagRemoveTrailingSlash | FlagRemoveDotSegments
-	FlagsUsuallySafeNonGreedy NormalizationFlags = FlagsSafe | FlagAddTrailingSlash | FlagRemoveDotSegments
-
-	// Convenience set of unsafe normalizations (includes FlagsUsuallySafe)
-	FlagsUnsafeGreedy    NormalizationFlags = FlagsUsuallySafeGreedy | FlagRemoveDirectoryIndex | FlagRemoveFragment | FlagForceHTTP | FlagRemoveDuplicateSlashes | FlagRemoveWWW | FlagSortQuery
-	FlagsUnsafeNonGreedy NormalizationFlags = FlagsUsuallySafeNonGreedy | FlagRemoveDirectoryIndex | FlagRemoveFragment | FlagForceHTTP | FlagRemoveDuplicateSlashes | FlagAddWWW | FlagSortQuery
-
-	// Convenience set of all available flags
-	FlagsAllGreedy    = FlagsUnsafeGreedy | FlagDecodeDWORDHost | FlagDecodeOctalHost | FlagDecodeHexHost | FlagRemoveUnnecessaryHostDots | FlagRemoveEmptyPortSeparator
-	FlagsAllNonGreedy = FlagsUnsafeNonGreedy | FlagDecodeDWORDHost | FlagDecodeOctalHost | FlagDecodeHexHost | FlagRemoveUnnecessaryHostDots | FlagRemoveEmptyPortSeparator
-)
-
-const (
-	defaultHttpPort  = ":80"
-	defaultHttpsPort = ":443"
-)
-
-// Regular expressions used by the normalizations
-var rxPort = regexp.MustCompile(`(:\d+)/?$`)
-var rxDirIndex = regexp.MustCompile(`(^|/)((?:default|index)\.\w{1,4})$`)
-var rxDupSlashes = regexp.MustCompile(`/{2,}`)
-var rxDWORDHost = regexp.MustCompile(`^(\d+)((?:\.+)?(?:\:\d*)?)$`)
-var rxOctalHost = regexp.MustCompile(`^(0\d*)\.(0\d*)\.(0\d*)\.(0\d*)((?:\.+)?(?:\:\d*)?)$`)
-var rxHexHost = regexp.MustCompile(`^0x([0-9A-Fa-f]+)((?:\.+)?(?:\:\d*)?)$`)
-var rxHostDots = regexp.MustCompile(`^(.+?)(:\d+)?$`)
-var rxEmptyPort = regexp.MustCompile(`:+$`)
-
-// Map of flags to implementation function.
-// FlagDecodeUnnecessaryEscapes has no action, since it is done automatically
-// by parsing the string as an URL. Same for FlagUppercaseEscapes and FlagRemoveEmptyQuerySeparator.
-
-// Since maps have undefined traversing order, make a slice of ordered keys
-var flagsOrder = []NormalizationFlags{
-	FlagLowercaseScheme,
-	FlagLowercaseHost,
-	FlagRemoveDefaultPort,
-	FlagRemoveDirectoryIndex,
-	FlagRemoveDotSegments,
-	FlagRemoveFragment,
-	FlagForceHTTP, // Must be after remove default port (because https=443/http=80)
-	FlagRemoveDuplicateSlashes,
-	FlagRemoveWWW,
-	FlagAddWWW,
-	FlagSortQuery,
-	FlagDecodeDWORDHost,
-	FlagDecodeOctalHost,
-	FlagDecodeHexHost,
-	FlagRemoveUnnecessaryHostDots,
-	FlagRemoveEmptyPortSeparator,
-	FlagRemoveTrailingSlash, // These two (add/remove trailing slash) must be last
-	FlagAddTrailingSlash,
-}
-
-// ... and then the map, where order is unimportant
-var flags = map[NormalizationFlags]func(*url.URL){
-	FlagLowercaseScheme:           lowercaseScheme,
-	FlagLowercaseHost:             lowercaseHost,
-	FlagRemoveDefaultPort:         removeDefaultPort,
-	FlagRemoveDirectoryIndex:      removeDirectoryIndex,
-	FlagRemoveDotSegments:         removeDotSegments,
-	FlagRemoveFragment:            removeFragment,
-	FlagForceHTTP:                 forceHTTP,
-	FlagRemoveDuplicateSlashes:    removeDuplicateSlashes,
-	FlagRemoveWWW:                 removeWWW,
-	FlagAddWWW:                    addWWW,
-	FlagSortQuery:                 sortQuery,
-	FlagDecodeDWORDHost:           decodeDWORDHost,
-	FlagDecodeOctalHost:           decodeOctalHost,
-	FlagDecodeHexHost:             decodeHexHost,
-	FlagRemoveUnnecessaryHostDots: removeUnncessaryHostDots,
-	FlagRemoveEmptyPortSeparator:  removeEmptyPortSeparator,
-	FlagRemoveTrailingSlash:       removeTrailingSlash,
-	FlagAddTrailingSlash:          addTrailingSlash,
-}
-
-// MustNormalizeURLString returns the normalized string, and panics if an error occurs.
-// It takes an URL string as input, as well as the normalization flags.
-func MustNormalizeURLString(u string, f NormalizationFlags) string {
-	result, e := NormalizeURLString(u, f)
-	if e != nil {
-		panic(e)
-	}
-	return result
-}
-
-// NormalizeURLString returns the normalized string, or an error if it can't be parsed into an URL object.
-// It takes an URL string as input, as well as the normalization flags.
-func NormalizeURLString(u string, f NormalizationFlags) (string, error) {
-	parsed, err := url.Parse(u)
-	if err != nil {
-		return "", err
-	}
-
-	if f&FlagLowercaseHost == FlagLowercaseHost {
-		parsed.Host = strings.ToLower(parsed.Host)
-	}
-
-	// The idna package doesn't fully conform to RFC 5895
-	// (https://tools.ietf.org/html/rfc5895), so we do it here.
-	// Taken from Go 1.8 cycle source, courtesy of bradfitz.
-	// TODO: Remove when (if?) idna package conforms to RFC 5895.
-	parsed.Host = width.Fold.String(parsed.Host)
-	parsed.Host = norm.NFC.String(parsed.Host)
-	if parsed.Host, err = idna.ToASCII(parsed.Host); err != nil {
-		return "", err
-	}
-
-	return NormalizeURL(parsed, f), nil
-}
-
-// NormalizeURL returns the normalized string.
-// It takes a parsed URL object as input, as well as the normalization flags.
-func NormalizeURL(u *url.URL, f NormalizationFlags) string {
-	for _, k := range flagsOrder {
-		if f&k == k {
-			flags[k](u)
-		}
-	}
-	return urlesc.Escape(u)
-}
-
-func lowercaseScheme(u *url.URL) {
-	if len(u.Scheme) > 0 {
-		u.Scheme = strings.ToLower(u.Scheme)
-	}
-}
-
-func lowercaseHost(u *url.URL) {
-	if len(u.Host) > 0 {
-		u.Host = strings.ToLower(u.Host)
-	}
-}
-
-func removeDefaultPort(u *url.URL) {
-	if len(u.Host) > 0 {
-		scheme := strings.ToLower(u.Scheme)
-		u.Host = rxPort.ReplaceAllStringFunc(u.Host, func(val string) string {
-			if (scheme == "http" && val == defaultHttpPort) || (scheme == "https" && val == defaultHttpsPort) {
-				return ""
-			}
-			return val
-		})
-	}
-}
-
-func removeTrailingSlash(u *url.URL) {
-	if l := len(u.Path); l > 0 {
-		if strings.HasSuffix(u.Path, "/") {
-			u.Path = u.Path[:l-1]
-		}
-	} else if l = len(u.Host); l > 0 {
-		if strings.HasSuffix(u.Host, "/") {
-			u.Host = u.Host[:l-1]
-		}
-	}
-}
-
-func addTrailingSlash(u *url.URL) {
-	if l := len(u.Path); l > 0 {
-		if !strings.HasSuffix(u.Path, "/") {
-			u.Path += "/"
-		}
-	} else if l = len(u.Host); l > 0 {
-		if !strings.HasSuffix(u.Host, "/") {
-			u.Host += "/"
-		}
-	}
-}
-
-func removeDotSegments(u *url.URL) {
-	if len(u.Path) > 0 {
-		var dotFree []string
-		var lastIsDot bool
-
-		sections := strings.Split(u.Path, "/")
-		for _, s := range sections {
-			if s == ".." {
-				if len(dotFree) > 0 {
-					dotFree = dotFree[:len(dotFree)-1]
-				}
-			} else if s != "." {
-				dotFree = append(dotFree, s)
-			}
-			lastIsDot = (s == "." || s == "..")
-		}
-		// Special case if host does not end with / and new path does not begin with /
-		u.Path = strings.Join(dotFree, "/")
-		if u.Host != "" && !strings.HasSuffix(u.Host, "/") && !strings.HasPrefix(u.Path, "/") {
-			u.Path = "/" + u.Path
-		}
-		// Special case if the last segment was a dot, make sure the path ends with a slash
-		if lastIsDot && !strings.HasSuffix(u.Path, "/") {
-			u.Path += "/"
-		}
-	}
-}
-
-func removeDirectoryIndex(u *url.URL) {
-	if len(u.Path) > 0 {
-		u.Path = rxDirIndex.ReplaceAllString(u.Path, "$1")
-	}
-}
-
-func removeFragment(u *url.URL) {
-	u.Fragment = ""
-}
-
-func forceHTTP(u *url.URL) {
-	if strings.ToLower(u.Scheme) == "https" {
-		u.Scheme = "http"
-	}
-}
-
-func removeDuplicateSlashes(u *url.URL) {
-	if len(u.Path) > 0 {
-		u.Path = rxDupSlashes.ReplaceAllString(u.Path, "/")
-	}
-}
-
-func removeWWW(u *url.URL) {
-	if len(u.Host) > 0 && strings.HasPrefix(strings.ToLower(u.Host), "www.") {
-		u.Host = u.Host[4:]
-	}
-}
-
-func addWWW(u *url.URL) {
-	if len(u.Host) > 0 && !strings.HasPrefix(strings.ToLower(u.Host), "www.") {
-		u.Host = "www." + u.Host
-	}
-}
-
-func sortQuery(u *url.URL) {
-	q := u.Query()
-
-	if len(q) > 0 {
-		arKeys := make([]string, len(q))
-		i := 0
-		for k := range q {
-			arKeys[i] = k
-			i++
-		}
-		sort.Strings(arKeys)
-		buf := new(bytes.Buffer)
-		for _, k := range arKeys {
-			sort.Strings(q[k])
-			for _, v := range q[k] {
-				if buf.Len() > 0 {
-					buf.WriteRune('&')
-				}
-				buf.WriteString(fmt.Sprintf("%s=%s", k, urlesc.QueryEscape(v)))
-			}
-		}
-
-		// Rebuild the raw query string
-		u.RawQuery = buf.String()
-	}
-}
-
-func decodeDWORDHost(u *url.URL) {
-	if len(u.Host) > 0 {
-		if matches := rxDWORDHost.FindStringSubmatch(u.Host); len(matches) > 2 {
-			var parts [4]int64
-
-			dword, _ := strconv.ParseInt(matches[1], 10, 0)
-			for i, shift := range []uint{24, 16, 8, 0} {
-				parts[i] = dword >> shift & 0xFF
-			}
-			u.Host = fmt.Sprintf("%d.%d.%d.%d%s", parts[0], parts[1], parts[2], parts[3], matches[2])
-		}
-	}
-}
-
-func decodeOctalHost(u *url.URL) {
-	if len(u.Host) > 0 {
-		if matches := rxOctalHost.FindStringSubmatch(u.Host); len(matches) > 5 {
-			var parts [4]int64
-
-			for i := 1; i <= 4; i++ {
-				parts[i-1], _ = strconv.ParseInt(matches[i], 8, 0)
-			}
-			u.Host = fmt.Sprintf("%d.%d.%d.%d%s", parts[0], parts[1], parts[2], parts[3], matches[5])
-		}
-	}
-}
-
-func decodeHexHost(u *url.URL) {
-	if len(u.Host) > 0 {
-		if matches := rxHexHost.FindStringSubmatch(u.Host); len(matches) > 2 {
-			// Conversion is safe because of regex validation
-			parsed, _ := strconv.ParseInt(matches[1], 16, 0)
-			// Set host as DWORD (base 10) encoded host
-			u.Host = fmt.Sprintf("%d%s", parsed, matches[2])
-			// The rest is the same as decoding a DWORD host
-			decodeDWORDHost(u)
-		}
-	}
-}
-
-func removeUnncessaryHostDots(u *url.URL) {
-	if len(u.Host) > 0 {
-		if matches := rxHostDots.FindStringSubmatch(u.Host); len(matches) > 1 {
-			// Trim the leading and trailing dots
-			u.Host = strings.Trim(matches[1], ".")
-			if len(matches) > 2 {
-				u.Host += matches[2]
-			}
-		}
-	}
-}
-
-func removeEmptyPortSeparator(u *url.URL) {
-	if len(u.Host) > 0 {
-		u.Host = rxEmptyPort.ReplaceAllString(u.Host, "")
-	}
-}
diff --git a/vendor/github.com/PuerkitoBio/urlesc/LICENSE b/vendor/github.com/PuerkitoBio/urlesc/LICENSE
deleted file mode 100644
index 7448756763..0000000000
--- a/vendor/github.com/PuerkitoBio/urlesc/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/PuerkitoBio/urlesc/README.md b/vendor/github.com/PuerkitoBio/urlesc/README.md
deleted file mode 100644
index 57aff0a539..0000000000
--- a/vendor/github.com/PuerkitoBio/urlesc/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-urlesc [![Build Status](https://travis-ci.org/PuerkitoBio/urlesc.svg?branch=master)](https://travis-ci.org/PuerkitoBio/urlesc) [![GoDoc](http://godoc.org/github.com/PuerkitoBio/urlesc?status.svg)](http://godoc.org/github.com/PuerkitoBio/urlesc)
-======
-
-Package urlesc implements query escaping as per RFC 3986.
-
-It contains some parts of the net/url package, modified so as to allow
-some reserved characters incorrectly escaped by net/url (see [issue 5684](https://github.com/golang/go/issues/5684)).
-
-## Install
-
-    go get github.com/PuerkitoBio/urlesc
-
-## License
-
-Go license (BSD-3-Clause)
-
diff --git a/vendor/github.com/PuerkitoBio/urlesc/urlesc.go b/vendor/github.com/PuerkitoBio/urlesc/urlesc.go
deleted file mode 100644
index 1b84624594..0000000000
--- a/vendor/github.com/PuerkitoBio/urlesc/urlesc.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package urlesc implements query escaping as per RFC 3986.
-// It contains some parts of the net/url package, modified so as to allow
-// some reserved characters incorrectly escaped by net/url.
-// See https://github.com/golang/go/issues/5684
-package urlesc
-
-import (
-	"bytes"
-	"net/url"
-	"strings"
-)
-
-type encoding int
-
-const (
-	encodePath encoding = 1 + iota
-	encodeUserPassword
-	encodeQueryComponent
-	encodeFragment
-)
-
-// Return true if the specified character should be escaped when
-// appearing in a URL string, according to RFC 3986.
-func shouldEscape(c byte, mode encoding) bool {
-	// §2.3 Unreserved characters (alphanum)
-	if 'A' <= c && c <= 'Z' || 'a' <= c && c <= 'z' || '0' <= c && c <= '9' {
-		return false
-	}
-
-	switch c {
-	case '-', '.', '_', '~': // §2.3 Unreserved characters (mark)
-		return false
-
-	// §2.2 Reserved characters (reserved)
-	case ':', '/', '?', '#', '[', ']', '@', // gen-delims
-		'!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=': // sub-delims
-		// Different sections of the URL allow a few of
-		// the reserved characters to appear unescaped.
-		switch mode {
-		case encodePath: // §3.3
-			// The RFC allows sub-delims and : @.
-			// '/', '[' and ']' can be used to assign meaning to individual path
-			// segments.  This package only manipulates the path as a whole,
-			// so we allow those as well.  That leaves only ? and # to escape.
-			return c == '?' || c == '#'
-
-		case encodeUserPassword: // §3.2.1
-			// The RFC allows : and sub-delims in
-			// userinfo.  The parsing of userinfo treats ':' as special so we must escape
-			// all the gen-delims.
-			return c == ':' || c == '/' || c == '?' || c == '#' || c == '[' || c == ']' || c == '@'
-
-		case encodeQueryComponent: // §3.4
-			// The RFC allows / and ?.
-			return c != '/' && c != '?'
-
-		case encodeFragment: // §4.1
-			// The RFC text is silent but the grammar allows
-			// everything, so escape nothing but #
-			return c == '#'
-		}
-	}
-
-	// Everything else must be escaped.
-	return true
-}
-
-// QueryEscape escapes the string so it can be safely placed
-// inside a URL query.
-func QueryEscape(s string) string {
-	return escape(s, encodeQueryComponent)
-}
-
-func escape(s string, mode encoding) string {
-	spaceCount, hexCount := 0, 0
-	for i := 0; i < len(s); i++ {
-		c := s[i]
-		if shouldEscape(c, mode) {
-			if c == ' ' && mode == encodeQueryComponent {
-				spaceCount++
-			} else {
-				hexCount++
-			}
-		}
-	}
-
-	if spaceCount == 0 && hexCount == 0 {
-		return s
-	}
-
-	t := make([]byte, len(s)+2*hexCount)
-	j := 0
-	for i := 0; i < len(s); i++ {
-		switch c := s[i]; {
-		case c == ' ' && mode == encodeQueryComponent:
-			t[j] = '+'
-			j++
-		case shouldEscape(c, mode):
-			t[j] = '%'
-			t[j+1] = "0123456789ABCDEF"[c>>4]
-			t[j+2] = "0123456789ABCDEF"[c&15]
-			j += 3
-		default:
-			t[j] = s[i]
-			j++
-		}
-	}
-	return string(t)
-}
-
-var uiReplacer = strings.NewReplacer(
-	"%21", "!",
-	"%27", "'",
-	"%28", "(",
-	"%29", ")",
-	"%2A", "*",
-)
-
-// unescapeUserinfo unescapes some characters that need not to be escaped as per RFC3986.
-func unescapeUserinfo(s string) string {
-	return uiReplacer.Replace(s)
-}
-
-// Escape reassembles the URL into a valid URL string.
-// The general form of the result is one of:
-//
-//	scheme:opaque
-//	scheme://userinfo@host/path?query#fragment
-//
-// If u.Opaque is non-empty, String uses the first form;
-// otherwise it uses the second form.
-//
-// In the second form, the following rules apply:
-//	- if u.Scheme is empty, scheme: is omitted.
-//	- if u.User is nil, userinfo@ is omitted.
-//	- if u.Host is empty, host/ is omitted.
-//	- if u.Scheme and u.Host are empty and u.User is nil,
-//	   the entire scheme://userinfo@host/ is omitted.
-//	- if u.Host is non-empty and u.Path begins with a /,
-//	   the form host/path does not add its own /.
-//	- if u.RawQuery is empty, ?query is omitted.
-//	- if u.Fragment is empty, #fragment is omitted.
-func Escape(u *url.URL) string {
-	var buf bytes.Buffer
-	if u.Scheme != "" {
-		buf.WriteString(u.Scheme)
-		buf.WriteByte(':')
-	}
-	if u.Opaque != "" {
-		buf.WriteString(u.Opaque)
-	} else {
-		if u.Scheme != "" || u.Host != "" || u.User != nil {
-			buf.WriteString("//")
-			if ui := u.User; ui != nil {
-				buf.WriteString(unescapeUserinfo(ui.String()))
-				buf.WriteByte('@')
-			}
-			if h := u.Host; h != "" {
-				buf.WriteString(h)
-			}
-		}
-		if u.Path != "" && u.Path[0] != '/' && u.Host != "" {
-			buf.WriteByte('/')
-		}
-		buf.WriteString(escape(u.Path, encodePath))
-	}
-	if u.RawQuery != "" {
-		buf.WriteByte('?')
-		buf.WriteString(u.RawQuery)
-	}
-	if u.Fragment != "" {
-		buf.WriteByte('#')
-		buf.WriteString(escape(u.Fragment, encodeFragment))
-	}
-	return buf.String()
-}
diff --git a/vendor/github.com/Sirupsen/logrus/CHANGELOG.md b/vendor/github.com/Sirupsen/logrus/CHANGELOG.md
deleted file mode 100644
index 747e4d89a2..0000000000
--- a/vendor/github.com/Sirupsen/logrus/CHANGELOG.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# 0.11.5
-
-* feature: add writer and writerlevel to entry (#372)
-
-# 0.11.4
-
-* bug: fix undefined variable on solaris (#493)
-
-# 0.11.3
-
-* formatter: configure quoting of empty values (#484)
-* formatter: configure quoting character (default is `"`) (#484)
-* bug: fix not importing io correctly in non-linux environments (#481)
-
-# 0.11.2
-
-* bug: fix windows terminal detection (#476)
-
-# 0.11.1
-
-* bug: fix tty detection with custom out (#471)
-
-# 0.11.0
-
-* performance: Use bufferpool to allocate (#370)
-* terminal: terminal detection for app-engine (#343)
-* feature: exit handler (#375)
-
-# 0.10.0
-
-* feature: Add a test hook (#180)
-* feature: `ParseLevel` is now case-insensitive (#326)
-* feature: `FieldLogger` interface that generalizes `Logger` and `Entry` (#308)
-* performance: avoid re-allocations on `WithFields` (#335)
-
-# 0.9.0
-
-* logrus/text_formatter: don't emit empty msg
-* logrus/hooks/airbrake: move out of main repository
-* logrus/hooks/sentry: move out of main repository
-* logrus/hooks/papertrail: move out of main repository
-* logrus/hooks/bugsnag: move out of main repository
-* logrus/core: run tests with `-race`
-* logrus/core: detect TTY based on `stderr`
-* logrus/core: support `WithError` on logger
-* logrus/core: Solaris support
-
-# 0.8.7
-
-* logrus/core: fix possible race (#216)
-* logrus/doc: small typo fixes and doc improvements
-
-
-# 0.8.6
-
-* hooks/raven: allow passing an initialized client
-
-# 0.8.5
-
-* logrus/core: revert #208
-
-# 0.8.4
-
-* formatter/text: fix data race (#218)
-
-# 0.8.3
-
-* logrus/core: fix entry log level (#208)
-* logrus/core: improve performance of text formatter by 40%
-* logrus/core: expose `LevelHooks` type
-* logrus/core: add support for DragonflyBSD and NetBSD
-* formatter/text: print structs more verbosely
-
-# 0.8.2
-
-* logrus: fix more Fatal family functions
-
-# 0.8.1
-
-* logrus: fix not exiting on `Fatalf` and `Fatalln`
-
-# 0.8.0
-
-* logrus: defaults to stderr instead of stdout
-* hooks/sentry: add special field for `*http.Request`
-* formatter/text: ignore Windows for colors
-
-# 0.7.3
-
-* formatter/\*: allow configuration of timestamp layout
-
-# 0.7.2
-
-* formatter/text: Add configuration option for time format (#158)
diff --git a/vendor/github.com/Sirupsen/logrus/LICENSE b/vendor/github.com/Sirupsen/logrus/LICENSE
deleted file mode 100644
index f090cb42f3..0000000000
--- a/vendor/github.com/Sirupsen/logrus/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Simon Eskildsen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/github.com/Sirupsen/logrus/README.md b/vendor/github.com/Sirupsen/logrus/README.md
deleted file mode 100644
index c322876110..0000000000
--- a/vendor/github.com/Sirupsen/logrus/README.md
+++ /dev/null
@@ -1,479 +0,0 @@
-# Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:"/>&nbsp;[![Build Status](https://travis-ci.org/Sirupsen/logrus.svg?branch=master)](https://travis-ci.org/Sirupsen/logrus)&nbsp;[![GoDoc](https://godoc.org/github.com/Sirupsen/logrus?status.svg)](https://godoc.org/github.com/Sirupsen/logrus)
-
-**Seeing weird case-sensitive problems?** See [this
-issue](https://github.com/sirupsen/logrus/issues/451#issuecomment-264332021).
-This change has been reverted. I apologize for causing this. I greatly
-underestimated the impact this would have. Logrus strives for stability and
-backwards compatibility and failed to provide that.
-
-Logrus is a structured logger for Go (golang), completely API compatible with
-the standard library logger. [Godoc][godoc]. **Please note the Logrus API is not
-yet stable (pre 1.0). Logrus itself is completely stable and has been used in
-many large deployments. The core API is unlikely to change much but please
-version control your Logrus to make sure you aren't fetching latest `master` on
-every build.**
-
-Nicely color-coded in development (when a TTY is attached, otherwise just
-plain text):
-
-![Colored](http://i.imgur.com/PY7qMwd.png)
-
-With `log.SetFormatter(&log.JSONFormatter{})`, for easy parsing by logstash
-or Splunk:
-
-```json
-{"animal":"walrus","level":"info","msg":"A group of walrus emerges from the
-ocean","size":10,"time":"2014-03-10 19:57:38.562264131 -0400 EDT"}
-
-{"level":"warning","msg":"The group's number increased tremendously!",
-"number":122,"omg":true,"time":"2014-03-10 19:57:38.562471297 -0400 EDT"}
-
-{"animal":"walrus","level":"info","msg":"A giant walrus appears!",
-"size":10,"time":"2014-03-10 19:57:38.562500591 -0400 EDT"}
-
-{"animal":"walrus","level":"info","msg":"Tremendously sized cow enters the ocean.",
-"size":9,"time":"2014-03-10 19:57:38.562527896 -0400 EDT"}
-
-{"level":"fatal","msg":"The ice breaks!","number":100,"omg":true,
-"time":"2014-03-10 19:57:38.562543128 -0400 EDT"}
-```
-
-With the default `log.SetFormatter(&log.TextFormatter{})` when a TTY is not
-attached, the output is compatible with the
-[logfmt](http://godoc.org/github.com/kr/logfmt) format:
-
-```text
-time="2015-03-26T01:27:38-04:00" level=debug msg="Started observing beach" animal=walrus number=8
-time="2015-03-26T01:27:38-04:00" level=info msg="A group of walrus emerges from the ocean" animal=walrus size=10
-time="2015-03-26T01:27:38-04:00" level=warning msg="The group's number increased tremendously!" number=122 omg=true
-time="2015-03-26T01:27:38-04:00" level=debug msg="Temperature changes" temperature=-4
-time="2015-03-26T01:27:38-04:00" level=panic msg="It's over 9000!" animal=orca size=9009
-time="2015-03-26T01:27:38-04:00" level=fatal msg="The ice breaks!" err=&{0x2082280c0 map[animal:orca size:9009] 2015-03-26 01:27:38.441574009 -0400 EDT panic It's over 9000!} number=100 omg=true
-exit status 1
-```
-
-#### Example
-
-The simplest way to use Logrus is simply the package-level exported logger:
-
-```go
-package main
-
-import (
-  log "github.com/Sirupsen/logrus"
-)
-
-func main() {
-  log.WithFields(log.Fields{
-    "animal": "walrus",
-  }).Info("A walrus appears")
-}
-```
-
-Note that it's completely api-compatible with the stdlib logger, so you can
-replace your `log` imports everywhere with `log "github.com/Sirupsen/logrus"`
-and you'll now have the flexibility of Logrus. You can customize it all you
-want:
-
-```go
-package main
-
-import (
-  "os"
-  log "github.com/Sirupsen/logrus"
-)
-
-func init() {
-  // Log as JSON instead of the default ASCII formatter.
-  log.SetFormatter(&log.JSONFormatter{})
-
-  // Output to stdout instead of the default stderr
-  // Can be any io.Writer, see below for File example
-  log.SetOutput(os.Stdout)
-
-  // Only log the warning severity or above.
-  log.SetLevel(log.WarnLevel)
-}
-
-func main() {
-  log.WithFields(log.Fields{
-    "animal": "walrus",
-    "size":   10,
-  }).Info("A group of walrus emerges from the ocean")
-
-  log.WithFields(log.Fields{
-    "omg":    true,
-    "number": 122,
-  }).Warn("The group's number increased tremendously!")
-
-  log.WithFields(log.Fields{
-    "omg":    true,
-    "number": 100,
-  }).Fatal("The ice breaks!")
-
-  // A common pattern is to re-use fields between logging statements by re-using
-  // the logrus.Entry returned from WithFields()
-  contextLogger := log.WithFields(log.Fields{
-    "common": "this is a common field",
-    "other": "I also should be logged always",
-  })
-
-  contextLogger.Info("I'll be logged with common and other field")
-  contextLogger.Info("Me too")
-}
-```
-
-For more advanced usage such as logging to multiple locations from the same
-application, you can also create an instance of the `logrus` Logger:
-
-```go
-package main
-
-import (
-  "os"
-  "github.com/Sirupsen/logrus"
-)
-
-// Create a new instance of the logger. You can have any number of instances.
-var log = logrus.New()
-
-func main() {
-  // The API for setting attributes is a little different than the package level
-  // exported logger. See Godoc.
-  log.Out = os.Stdout
-
-  // You could set this to any `io.Writer` such as a file
-  // file, err := os.OpenFile("logrus.log", os.O_CREATE|os.O_WRONLY, 0666)
-  // if err == nil {
-  //  log.Out = file
-  // } else {
-  //  log.Info("Failed to log to file, using default stderr")
-  // }
-
-  log.WithFields(logrus.Fields{
-    "animal": "walrus",
-    "size":   10,
-  }).Info("A group of walrus emerges from the ocean")
-}
-```
-
-#### Fields
-
-Logrus encourages careful, structured logging though logging fields instead of
-long, unparseable error messages. For example, instead of: `log.Fatalf("Failed
-to send event %s to topic %s with key %d")`, you should log the much more
-discoverable:
-
-```go
-log.WithFields(log.Fields{
-  "event": event,
-  "topic": topic,
-  "key": key,
-}).Fatal("Failed to send event")
-```
-
-We've found this API forces you to think about logging in a way that produces
-much more useful logging messages. We've been in countless situations where just
-a single added field to a log statement that was already there would've saved us
-hours. The `WithFields` call is optional.
-
-In general, with Logrus using any of the `printf`-family functions should be
-seen as a hint you should add a field, however, you can still use the
-`printf`-family functions with Logrus.
-
-#### Default Fields
-
-Often it's helpful to have fields _always_ attached to log statements in an
-application or parts of one. For example, you may want to always log the
-`request_id` and `user_ip` in the context of a request. Instead of writing
-`log.WithFields(log.Fields{"request_id": request_id, "user_ip": user_ip})` on
-every line, you can create a `logrus.Entry` to pass around instead:
-
-```go
-requestLogger := log.WithFields(log.Fields{"request_id": request_id, "user_ip": user_ip})
-requestLogger.Info("something happened on that request") # will log request_id and user_ip
-requestLogger.Warn("something not great happened")
-```
-
-#### Hooks
-
-You can add hooks for logging levels. For example to send errors to an exception
-tracking service on `Error`, `Fatal` and `Panic`, info to StatsD or log to
-multiple places simultaneously, e.g. syslog.
-
-Logrus comes with [built-in hooks](hooks/). Add those, or your custom hook, in
-`init`:
-
-```go
-import (
-  log "github.com/Sirupsen/logrus"
-  "gopkg.in/gemnasium/logrus-airbrake-hook.v2" // the package is named "aibrake"
-  logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog"
-  "log/syslog"
-)
-
-func init() {
-
-  // Use the Airbrake hook to report errors that have Error severity or above to
-  // an exception tracker. You can create custom hooks, see the Hooks section.
-  log.AddHook(airbrake.NewHook(123, "xyz", "production"))
-
-  hook, err := logrus_syslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-  if err != nil {
-    log.Error("Unable to connect to local syslog daemon")
-  } else {
-    log.AddHook(hook)
-  }
-}
-```
-Note: Syslog hook also support connecting to local syslog (Ex. "/dev/log" or "/var/run/syslog" or "/var/run/log"). For the detail, please check the [syslog hook README](hooks/syslog/README.md).
-
-| Hook  | Description |
-| ----- | ----------- |
-| [Airbrake "legacy"](https://github.com/gemnasium/logrus-airbrake-legacy-hook) | Send errors to an exception tracking service compatible with the Airbrake API V2. Uses [`airbrake-go`](https://github.com/tobi/airbrake-go) behind the scenes. |
-| [Airbrake](https://github.com/gemnasium/logrus-airbrake-hook) | Send errors to the Airbrake API V3. Uses the official [`gobrake`](https://github.com/airbrake/gobrake) behind the scenes. |
-| [Amazon Kinesis](https://github.com/evalphobia/logrus_kinesis) | Hook for logging to [Amazon Kinesis](https://aws.amazon.com/kinesis/) |
-| [Amqp-Hook](https://github.com/vladoatanasov/logrus_amqp) | Hook for logging to Amqp broker (Like RabbitMQ) |
-| [Bugsnag](https://github.com/Shopify/logrus-bugsnag/blob/master/bugsnag.go) | Send errors to the Bugsnag exception tracking service. |
-| [DeferPanic](https://github.com/deferpanic/dp-logrus) | Hook for logging to DeferPanic |
-| [Discordrus](https://github.com/kz/discordrus) | Hook for logging to [Discord](https://discordapp.com/) |
-| [ElasticSearch](https://github.com/sohlich/elogrus) | Hook for logging to ElasticSearch|
-| [Firehose](https://github.com/beaubrewer/firehose) | Hook for logging to [Amazon Firehose](https://aws.amazon.com/kinesis/firehose/)
-| [Fluentd](https://github.com/evalphobia/logrus_fluent) | Hook for logging to fluentd |
-| [Go-Slack](https://github.com/multiplay/go-slack) | Hook for logging to [Slack](https://slack.com) |
-| [Graylog](https://github.com/gemnasium/logrus-graylog-hook) | Hook for logging to [Graylog](http://graylog2.org/) |
-| [Hiprus](https://github.com/nubo/hiprus) | Send errors to a channel in hipchat. |
-| [Honeybadger](https://github.com/agonzalezro/logrus_honeybadger) | Hook for sending exceptions to Honeybadger |
-| [InfluxDB](https://github.com/Abramovic/logrus_influxdb) | Hook for logging to influxdb |
-| [Influxus] (http://github.com/vlad-doru/influxus) | Hook for concurrently logging to [InfluxDB] (http://influxdata.com/) |
-| [Journalhook](https://github.com/wercker/journalhook) | Hook for logging to `systemd-journald` |
-| [KafkaLogrus](https://github.com/goibibo/KafkaLogrus) | Hook for logging to kafka |
-| [LFShook](https://github.com/rifflock/lfshook) | Hook for logging to the local filesystem |
-| [Logentries](https://github.com/jcftang/logentriesrus) | Hook for logging to [Logentries](https://logentries.com/) |
-| [Logentrus](https://github.com/puddingfactory/logentrus) | Hook for logging to [Logentries](https://logentries.com/) |
-| [Logmatic.io](https://github.com/logmatic/logmatic-go) | Hook for logging to [Logmatic.io](http://logmatic.io/) |
-| [Logrusly](https://github.com/sebest/logrusly) | Send logs to [Loggly](https://www.loggly.com/) |
-| [Logstash](https://github.com/bshuster-repo/logrus-logstash-hook) | Hook for logging to [Logstash](https://www.elastic.co/products/logstash) |
-| [Mail](https://github.com/zbindenren/logrus_mail) | Hook for sending exceptions via mail |
-| [Mongodb](https://github.com/weekface/mgorus) | Hook for logging to mongodb |
-| [NATS-Hook](https://github.com/rybit/nats_logrus_hook) | Hook for logging to [NATS](https://nats.io) |
-| [Octokit](https://github.com/dorajistyle/logrus-octokit-hook) | Hook for logging to github via octokit |
-| [Papertrail](https://github.com/polds/logrus-papertrail-hook) | Send errors to the [Papertrail](https://papertrailapp.com) hosted logging service via UDP. |
-| [PostgreSQL](https://github.com/gemnasium/logrus-postgresql-hook) | Send logs to [PostgreSQL](http://postgresql.org) |
-| [Pushover](https://github.com/toorop/logrus_pushover) | Send error via [Pushover](https://pushover.net) |
-| [Raygun](https://github.com/squirkle/logrus-raygun-hook) | Hook for logging to [Raygun.io](http://raygun.io/) |
-| [Redis-Hook](https://github.com/rogierlommers/logrus-redis-hook) | Hook for logging to a ELK stack (through Redis) |
-| [Rollrus](https://github.com/heroku/rollrus) | Hook for sending errors to rollbar |
-| [Scribe](https://github.com/sagar8192/logrus-scribe-hook) | Hook for logging to [Scribe](https://github.com/facebookarchive/scribe)|
-| [Sentry](https://github.com/evalphobia/logrus_sentry) | Send errors to the Sentry error logging and aggregation service. |
-| [Slackrus](https://github.com/johntdyer/slackrus) | Hook for Slack chat. |
-| [Stackdriver](https://github.com/knq/sdhook) | Hook for logging to [Google Stackdriver](https://cloud.google.com/logging/) |
-| [Sumorus](https://github.com/doublefree/sumorus) | Hook for logging to [SumoLogic](https://www.sumologic.com/)|
-| [Syslog](https://github.com/Sirupsen/logrus/blob/master/hooks/syslog/syslog.go) | Send errors to remote syslog server. Uses standard library `log/syslog` behind the scenes. |
-| [TraceView](https://github.com/evalphobia/logrus_appneta) | Hook for logging to [AppNeta TraceView](https://www.appneta.com/products/traceview/) |
-| [Typetalk](https://github.com/dragon3/logrus-typetalk-hook) | Hook for logging to [Typetalk](https://www.typetalk.in/) |
-| [logz.io](https://github.com/ripcurld00d/logrus-logzio-hook) | Hook for logging to [logz.io](https://logz.io), a Log as a Service using Logstash |
-
-#### Level logging
-
-Logrus has six logging levels: Debug, Info, Warning, Error, Fatal and Panic.
-
-```go
-log.Debug("Useful debugging information.")
-log.Info("Something noteworthy happened!")
-log.Warn("You should probably take a look at this.")
-log.Error("Something failed but I'm not quitting.")
-// Calls os.Exit(1) after logging
-log.Fatal("Bye.")
-// Calls panic() after logging
-log.Panic("I'm bailing.")
-```
-
-You can set the logging level on a `Logger`, then it will only log entries with
-that severity or anything above it:
-
-```go
-// Will log anything that is info or above (warn, error, fatal, panic). Default.
-log.SetLevel(log.InfoLevel)
-```
-
-It may be useful to set `log.Level = logrus.DebugLevel` in a debug or verbose
-environment if your application has that.
-
-#### Entries
-
-Besides the fields added with `WithField` or `WithFields` some fields are
-automatically added to all logging events:
-
-1. `time`. The timestamp when the entry was created.
-2. `msg`. The logging message passed to `{Info,Warn,Error,Fatal,Panic}` after
-   the `AddFields` call. E.g. `Failed to send event.`
-3. `level`. The logging level. E.g. `info`.
-
-#### Environments
-
-Logrus has no notion of environment.
-
-If you wish for hooks and formatters to only be used in specific environments,
-you should handle that yourself. For example, if your application has a global
-variable `Environment`, which is a string representation of the environment you
-could do:
-
-```go
-import (
-  log "github.com/Sirupsen/logrus"
-)
-
-init() {
-  // do something here to set environment depending on an environment variable
-  // or command-line flag
-  if Environment == "production" {
-    log.SetFormatter(&log.JSONFormatter{})
-  } else {
-    // The TextFormatter is default, you don't actually have to do this.
-    log.SetFormatter(&log.TextFormatter{})
-  }
-}
-```
-
-This configuration is how `logrus` was intended to be used, but JSON in
-production is mostly only useful if you do log aggregation with tools like
-Splunk or Logstash.
-
-#### Formatters
-
-The built-in logging formatters are:
-
-* `logrus.TextFormatter`. Logs the event in colors if stdout is a tty, otherwise
-  without colors.
-  * *Note:* to force colored output when there is no TTY, set the `ForceColors`
-    field to `true`.  To force no colored output even if there is a TTY  set the
-    `DisableColors` field to `true`. For Windows, see
-    [github.com/mattn/go-colorable](https://github.com/mattn/go-colorable).
-  * All options are listed in the [generated docs](https://godoc.org/github.com/sirupsen/logrus#TextFormatter).
-* `logrus.JSONFormatter`. Logs fields as JSON.
-  * All options are listed in the [generated docs](https://godoc.org/github.com/sirupsen/logrus#JSONFormatter).
-
-Third party logging formatters:
-
-* [`logstash`](https://github.com/bshuster-repo/logrus-logstash-hook). Logs fields as [Logstash](http://logstash.net) Events.
-* [`prefixed`](https://github.com/x-cray/logrus-prefixed-formatter). Displays log entry source along with alternative layout.
-* [`zalgo`](https://github.com/aybabtme/logzalgo). Invoking the P͉̫o̳̼̊w̖͈̰͎e̬͔̭͂r͚̼̹̲ ̫͓͉̳͈ō̠͕͖̚f̝͍̠ ͕̲̞͖͑Z̖̫̤̫ͪa͉̬͈̗l͖͎g̳̥o̰̥̅!̣͔̲̻͊̄ ̙̘̦̹̦.
-
-You can define your formatter by implementing the `Formatter` interface,
-requiring a `Format` method. `Format` takes an `*Entry`. `entry.Data` is a
-`Fields` type (`map[string]interface{}`) with all your fields as well as the
-default ones (see Entries section above):
-
-```go
-type MyJSONFormatter struct {
-}
-
-log.SetFormatter(new(MyJSONFormatter))
-
-func (f *MyJSONFormatter) Format(entry *Entry) ([]byte, error) {
-  // Note this doesn't include Time, Level and Message which are available on
-  // the Entry. Consult `godoc` on information about those fields or read the
-  // source of the official loggers.
-  serialized, err := json.Marshal(entry.Data)
-    if err != nil {
-      return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
-    }
-  return append(serialized, '\n'), nil
-}
-```
-
-#### Logger as an `io.Writer`
-
-Logrus can be transformed into an `io.Writer`. That writer is the end of an `io.Pipe` and it is your responsibility to close it.
-
-```go
-w := logger.Writer()
-defer w.Close()
-
-srv := http.Server{
-    // create a stdlib log.Logger that writes to
-    // logrus.Logger.
-    ErrorLog: log.New(w, "", 0),
-}
-```
-
-Each line written to that writer will be printed the usual way, using formatters
-and hooks. The level for those entries is `info`.
-
-This means that we can override the standard library logger easily:
-
-```go
-logger := logrus.New()
-logger.Formatter = &logrus.JSONFormatter{}
-
-// Use logrus for standard log output
-// Note that `log` here references stdlib's log
-// Not logrus imported under the name `log`.
-log.SetOutput(logger.Writer())
-```
-
-#### Rotation
-
-Log rotation is not provided with Logrus. Log rotation should be done by an
-external program (like `logrotate(8)`) that can compress and delete old log
-entries. It should not be a feature of the application-level logger.
-
-#### Tools
-
-| Tool | Description |
-| ---- | ----------- |
-|[Logrus Mate](https://github.com/gogap/logrus_mate)|Logrus mate is a tool for Logrus to manage loggers, you can initial logger's level, hook and formatter by config file, the logger will generated with different config at different environment.|
-|[Logrus Viper Helper](https://github.com/heirko/go-contrib/tree/master/logrusHelper)|An Helper around Logrus to wrap with spf13/Viper to load configuration with fangs! And to simplify Logrus configuration use some behavior of [Logrus Mate](https://github.com/gogap/logrus_mate). [sample](https://github.com/heirko/iris-contrib/blob/master/middleware/logrus-logger/example) |
-
-#### Testing
-
-Logrus has a built in facility for asserting the presence of log messages. This is implemented through the `test` hook and provides:
-
-* decorators for existing logger (`test.NewLocal` and `test.NewGlobal`) which basically just add the `test` hook
-* a test logger (`test.NewNullLogger`) that just records log messages (and does not output any):
-
-```go
-logger, hook := NewNullLogger()
-logger.Error("Hello error")
-
-assert.Equal(1, len(hook.Entries))
-assert.Equal(logrus.ErrorLevel, hook.LastEntry().Level)
-assert.Equal("Hello error", hook.LastEntry().Message)
-
-hook.Reset()
-assert.Nil(hook.LastEntry())
-```
-
-#### Fatal handlers
-
-Logrus can register one or more functions that will be called when any `fatal`
-level message is logged. The registered handlers will be executed before
-logrus performs a `os.Exit(1)`. This behavior may be helpful if callers need
-to gracefully shutdown. Unlike a `panic("Something went wrong...")` call which can be intercepted with a deferred `recover` a call to `os.Exit(1)` can not be intercepted.
-
-```
-...
-handler := func() {
-  // gracefully shutdown something...
-}
-logrus.RegisterExitHandler(handler)
-...
-```
-
-#### Thread safety
-
-By default Logger is protected by mutex for concurrent writes, this mutex is invoked when calling hooks and writing logs.
-If you are sure such locking is not needed, you can call logger.SetNoLock() to disable the locking.
-
-Situation when locking is not needed includes:
-
-* You have no hooks registered, or hooks calling is already thread-safe.
-
-* Writing to logger.Out is already thread-safe, for example:
-
-  1) logger.Out is protected by locks.
-
-  2) logger.Out is a os.File handler opened with `O_APPEND` flag, and every write is smaller than 4k. (This allow multi-thread/multi-process writing)
-
-     (Refer to http://www.notthewizard.com/2014/06/17/are-files-appends-really-atomic/)
diff --git a/vendor/github.com/Sirupsen/logrus/alt_exit.go b/vendor/github.com/Sirupsen/logrus/alt_exit.go
deleted file mode 100644
index 8af90637a9..0000000000
--- a/vendor/github.com/Sirupsen/logrus/alt_exit.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package logrus
-
-// The following code was sourced and modified from the
-// https://github.com/tebeka/atexit package governed by the following license:
-//
-// Copyright (c) 2012 Miki Tebeka <miki.tebeka@gmail.com>.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal in
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-// the Software, and to permit persons to whom the Software is furnished to do so,
-// subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-import (
-	"fmt"
-	"os"
-)
-
-var handlers = []func(){}
-
-func runHandler(handler func()) {
-	defer func() {
-		if err := recover(); err != nil {
-			fmt.Fprintln(os.Stderr, "Error: Logrus exit handler error:", err)
-		}
-	}()
-
-	handler()
-}
-
-func runHandlers() {
-	for _, handler := range handlers {
-		runHandler(handler)
-	}
-}
-
-// Exit runs all the Logrus atexit handlers and then terminates the program using os.Exit(code)
-func Exit(code int) {
-	runHandlers()
-	os.Exit(code)
-}
-
-// RegisterExitHandler adds a Logrus Exit handler, call logrus.Exit to invoke
-// all handlers. The handlers will also be invoked when any Fatal log entry is
-// made.
-//
-// This method is useful when a caller wishes to use logrus to log a fatal
-// message but also needs to gracefully shutdown. An example usecase could be
-// closing database connections, or sending a alert that the application is
-// closing.
-func RegisterExitHandler(handler func()) {
-	handlers = append(handlers, handler)
-}
diff --git a/vendor/github.com/Sirupsen/logrus/doc.go b/vendor/github.com/Sirupsen/logrus/doc.go
deleted file mode 100644
index dddd5f877b..0000000000
--- a/vendor/github.com/Sirupsen/logrus/doc.go
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Package logrus is a structured logger for Go, completely API compatible with the standard library logger.
-
-
-The simplest way to use Logrus is simply the package-level exported logger:
-
-  package main
-
-  import (
-    log "github.com/Sirupsen/logrus"
-  )
-
-  func main() {
-    log.WithFields(log.Fields{
-      "animal": "walrus",
-      "number": 1,
-      "size":   10,
-    }).Info("A walrus appears")
-  }
-
-Output:
-  time="2015-09-07T08:48:33Z" level=info msg="A walrus appears" animal=walrus number=1 size=10
-
-For a full guide visit https://github.com/Sirupsen/logrus
-*/
-package logrus
diff --git a/vendor/github.com/Sirupsen/logrus/entry.go b/vendor/github.com/Sirupsen/logrus/entry.go
deleted file mode 100644
index 4edbe7a2de..0000000000
--- a/vendor/github.com/Sirupsen/logrus/entry.go
+++ /dev/null
@@ -1,275 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"sync"
-	"time"
-)
-
-var bufferPool *sync.Pool
-
-func init() {
-	bufferPool = &sync.Pool{
-		New: func() interface{} {
-			return new(bytes.Buffer)
-		},
-	}
-}
-
-// Defines the key when adding errors using WithError.
-var ErrorKey = "error"
-
-// An entry is the final or intermediate Logrus logging entry. It contains all
-// the fields passed with WithField{,s}. It's finally logged when Debug, Info,
-// Warn, Error, Fatal or Panic is called on it. These objects can be reused and
-// passed around as much as you wish to avoid field duplication.
-type Entry struct {
-	Logger *Logger
-
-	// Contains all the fields set by the user.
-	Data Fields
-
-	// Time at which the log entry was created
-	Time time.Time
-
-	// Level the log entry was logged at: Debug, Info, Warn, Error, Fatal or Panic
-	Level Level
-
-	// Message passed to Debug, Info, Warn, Error, Fatal or Panic
-	Message string
-
-	// When formatter is called in entry.log(), an Buffer may be set to entry
-	Buffer *bytes.Buffer
-}
-
-func NewEntry(logger *Logger) *Entry {
-	return &Entry{
-		Logger: logger,
-		// Default is three fields, give a little extra room
-		Data: make(Fields, 5),
-	}
-}
-
-// Returns the string representation from the reader and ultimately the
-// formatter.
-func (entry *Entry) String() (string, error) {
-	serialized, err := entry.Logger.Formatter.Format(entry)
-	if err != nil {
-		return "", err
-	}
-	str := string(serialized)
-	return str, nil
-}
-
-// Add an error as single field (using the key defined in ErrorKey) to the Entry.
-func (entry *Entry) WithError(err error) *Entry {
-	return entry.WithField(ErrorKey, err)
-}
-
-// Add a single field to the Entry.
-func (entry *Entry) WithField(key string, value interface{}) *Entry {
-	return entry.WithFields(Fields{key: value})
-}
-
-// Add a map of fields to the Entry.
-func (entry *Entry) WithFields(fields Fields) *Entry {
-	data := make(Fields, len(entry.Data)+len(fields))
-	for k, v := range entry.Data {
-		data[k] = v
-	}
-	for k, v := range fields {
-		data[k] = v
-	}
-	return &Entry{Logger: entry.Logger, Data: data}
-}
-
-// This function is not declared with a pointer value because otherwise
-// race conditions will occur when using multiple goroutines
-func (entry Entry) log(level Level, msg string) {
-	var buffer *bytes.Buffer
-	entry.Time = time.Now()
-	entry.Level = level
-	entry.Message = msg
-
-	if err := entry.Logger.Hooks.Fire(level, &entry); err != nil {
-		entry.Logger.mu.Lock()
-		fmt.Fprintf(os.Stderr, "Failed to fire hook: %v\n", err)
-		entry.Logger.mu.Unlock()
-	}
-	buffer = bufferPool.Get().(*bytes.Buffer)
-	buffer.Reset()
-	defer bufferPool.Put(buffer)
-	entry.Buffer = buffer
-	serialized, err := entry.Logger.Formatter.Format(&entry)
-	entry.Buffer = nil
-	if err != nil {
-		entry.Logger.mu.Lock()
-		fmt.Fprintf(os.Stderr, "Failed to obtain reader, %v\n", err)
-		entry.Logger.mu.Unlock()
-	} else {
-		entry.Logger.mu.Lock()
-		_, err = entry.Logger.Out.Write(serialized)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Failed to write to log, %v\n", err)
-		}
-		entry.Logger.mu.Unlock()
-	}
-
-	// To avoid Entry#log() returning a value that only would make sense for
-	// panic() to use in Entry#Panic(), we avoid the allocation by checking
-	// directly here.
-	if level <= PanicLevel {
-		panic(&entry)
-	}
-}
-
-func (entry *Entry) Debug(args ...interface{}) {
-	if entry.Logger.Level >= DebugLevel {
-		entry.log(DebugLevel, fmt.Sprint(args...))
-	}
-}
-
-func (entry *Entry) Print(args ...interface{}) {
-	entry.Info(args...)
-}
-
-func (entry *Entry) Info(args ...interface{}) {
-	if entry.Logger.Level >= InfoLevel {
-		entry.log(InfoLevel, fmt.Sprint(args...))
-	}
-}
-
-func (entry *Entry) Warn(args ...interface{}) {
-	if entry.Logger.Level >= WarnLevel {
-		entry.log(WarnLevel, fmt.Sprint(args...))
-	}
-}
-
-func (entry *Entry) Warning(args ...interface{}) {
-	entry.Warn(args...)
-}
-
-func (entry *Entry) Error(args ...interface{}) {
-	if entry.Logger.Level >= ErrorLevel {
-		entry.log(ErrorLevel, fmt.Sprint(args...))
-	}
-}
-
-func (entry *Entry) Fatal(args ...interface{}) {
-	if entry.Logger.Level >= FatalLevel {
-		entry.log(FatalLevel, fmt.Sprint(args...))
-	}
-	Exit(1)
-}
-
-func (entry *Entry) Panic(args ...interface{}) {
-	if entry.Logger.Level >= PanicLevel {
-		entry.log(PanicLevel, fmt.Sprint(args...))
-	}
-	panic(fmt.Sprint(args...))
-}
-
-// Entry Printf family functions
-
-func (entry *Entry) Debugf(format string, args ...interface{}) {
-	if entry.Logger.Level >= DebugLevel {
-		entry.Debug(fmt.Sprintf(format, args...))
-	}
-}
-
-func (entry *Entry) Infof(format string, args ...interface{}) {
-	if entry.Logger.Level >= InfoLevel {
-		entry.Info(fmt.Sprintf(format, args...))
-	}
-}
-
-func (entry *Entry) Printf(format string, args ...interface{}) {
-	entry.Infof(format, args...)
-}
-
-func (entry *Entry) Warnf(format string, args ...interface{}) {
-	if entry.Logger.Level >= WarnLevel {
-		entry.Warn(fmt.Sprintf(format, args...))
-	}
-}
-
-func (entry *Entry) Warningf(format string, args ...interface{}) {
-	entry.Warnf(format, args...)
-}
-
-func (entry *Entry) Errorf(format string, args ...interface{}) {
-	if entry.Logger.Level >= ErrorLevel {
-		entry.Error(fmt.Sprintf(format, args...))
-	}
-}
-
-func (entry *Entry) Fatalf(format string, args ...interface{}) {
-	if entry.Logger.Level >= FatalLevel {
-		entry.Fatal(fmt.Sprintf(format, args...))
-	}
-	Exit(1)
-}
-
-func (entry *Entry) Panicf(format string, args ...interface{}) {
-	if entry.Logger.Level >= PanicLevel {
-		entry.Panic(fmt.Sprintf(format, args...))
-	}
-}
-
-// Entry Println family functions
-
-func (entry *Entry) Debugln(args ...interface{}) {
-	if entry.Logger.Level >= DebugLevel {
-		entry.Debug(entry.sprintlnn(args...))
-	}
-}
-
-func (entry *Entry) Infoln(args ...interface{}) {
-	if entry.Logger.Level >= InfoLevel {
-		entry.Info(entry.sprintlnn(args...))
-	}
-}
-
-func (entry *Entry) Println(args ...interface{}) {
-	entry.Infoln(args...)
-}
-
-func (entry *Entry) Warnln(args ...interface{}) {
-	if entry.Logger.Level >= WarnLevel {
-		entry.Warn(entry.sprintlnn(args...))
-	}
-}
-
-func (entry *Entry) Warningln(args ...interface{}) {
-	entry.Warnln(args...)
-}
-
-func (entry *Entry) Errorln(args ...interface{}) {
-	if entry.Logger.Level >= ErrorLevel {
-		entry.Error(entry.sprintlnn(args...))
-	}
-}
-
-func (entry *Entry) Fatalln(args ...interface{}) {
-	if entry.Logger.Level >= FatalLevel {
-		entry.Fatal(entry.sprintlnn(args...))
-	}
-	Exit(1)
-}
-
-func (entry *Entry) Panicln(args ...interface{}) {
-	if entry.Logger.Level >= PanicLevel {
-		entry.Panic(entry.sprintlnn(args...))
-	}
-}
-
-// Sprintlnn => Sprint no newline. This is to get the behavior of how
-// fmt.Sprintln where spaces are always added between operands, regardless of
-// their type. Instead of vendoring the Sprintln implementation to spare a
-// string allocation, we do the simplest thing.
-func (entry *Entry) sprintlnn(args ...interface{}) string {
-	msg := fmt.Sprintln(args...)
-	return msg[:len(msg)-1]
-}
diff --git a/vendor/github.com/Sirupsen/logrus/exported.go b/vendor/github.com/Sirupsen/logrus/exported.go
deleted file mode 100644
index 9a0120ac1d..0000000000
--- a/vendor/github.com/Sirupsen/logrus/exported.go
+++ /dev/null
@@ -1,193 +0,0 @@
-package logrus
-
-import (
-	"io"
-)
-
-var (
-	// std is the name of the standard logger in stdlib `log`
-	std = New()
-)
-
-func StandardLogger() *Logger {
-	return std
-}
-
-// SetOutput sets the standard logger output.
-func SetOutput(out io.Writer) {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	std.Out = out
-}
-
-// SetFormatter sets the standard logger formatter.
-func SetFormatter(formatter Formatter) {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	std.Formatter = formatter
-}
-
-// SetLevel sets the standard logger level.
-func SetLevel(level Level) {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	std.Level = level
-}
-
-// GetLevel returns the standard logger level.
-func GetLevel() Level {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	return std.Level
-}
-
-// AddHook adds a hook to the standard logger hooks.
-func AddHook(hook Hook) {
-	std.mu.Lock()
-	defer std.mu.Unlock()
-	std.Hooks.Add(hook)
-}
-
-// WithError creates an entry from the standard logger and adds an error to it, using the value defined in ErrorKey as key.
-func WithError(err error) *Entry {
-	return std.WithField(ErrorKey, err)
-}
-
-// WithField creates an entry from the standard logger and adds a field to
-// it. If you want multiple fields, use `WithFields`.
-//
-// Note that it doesn't log until you call Debug, Print, Info, Warn, Fatal
-// or Panic on the Entry it returns.
-func WithField(key string, value interface{}) *Entry {
-	return std.WithField(key, value)
-}
-
-// WithFields creates an entry from the standard logger and adds multiple
-// fields to it. This is simply a helper for `WithField`, invoking it
-// once for each field.
-//
-// Note that it doesn't log until you call Debug, Print, Info, Warn, Fatal
-// or Panic on the Entry it returns.
-func WithFields(fields Fields) *Entry {
-	return std.WithFields(fields)
-}
-
-// Debug logs a message at level Debug on the standard logger.
-func Debug(args ...interface{}) {
-	std.Debug(args...)
-}
-
-// Print logs a message at level Info on the standard logger.
-func Print(args ...interface{}) {
-	std.Print(args...)
-}
-
-// Info logs a message at level Info on the standard logger.
-func Info(args ...interface{}) {
-	std.Info(args...)
-}
-
-// Warn logs a message at level Warn on the standard logger.
-func Warn(args ...interface{}) {
-	std.Warn(args...)
-}
-
-// Warning logs a message at level Warn on the standard logger.
-func Warning(args ...interface{}) {
-	std.Warning(args...)
-}
-
-// Error logs a message at level Error on the standard logger.
-func Error(args ...interface{}) {
-	std.Error(args...)
-}
-
-// Panic logs a message at level Panic on the standard logger.
-func Panic(args ...interface{}) {
-	std.Panic(args...)
-}
-
-// Fatal logs a message at level Fatal on the standard logger.
-func Fatal(args ...interface{}) {
-	std.Fatal(args...)
-}
-
-// Debugf logs a message at level Debug on the standard logger.
-func Debugf(format string, args ...interface{}) {
-	std.Debugf(format, args...)
-}
-
-// Printf logs a message at level Info on the standard logger.
-func Printf(format string, args ...interface{}) {
-	std.Printf(format, args...)
-}
-
-// Infof logs a message at level Info on the standard logger.
-func Infof(format string, args ...interface{}) {
-	std.Infof(format, args...)
-}
-
-// Warnf logs a message at level Warn on the standard logger.
-func Warnf(format string, args ...interface{}) {
-	std.Warnf(format, args...)
-}
-
-// Warningf logs a message at level Warn on the standard logger.
-func Warningf(format string, args ...interface{}) {
-	std.Warningf(format, args...)
-}
-
-// Errorf logs a message at level Error on the standard logger.
-func Errorf(format string, args ...interface{}) {
-	std.Errorf(format, args...)
-}
-
-// Panicf logs a message at level Panic on the standard logger.
-func Panicf(format string, args ...interface{}) {
-	std.Panicf(format, args...)
-}
-
-// Fatalf logs a message at level Fatal on the standard logger.
-func Fatalf(format string, args ...interface{}) {
-	std.Fatalf(format, args...)
-}
-
-// Debugln logs a message at level Debug on the standard logger.
-func Debugln(args ...interface{}) {
-	std.Debugln(args...)
-}
-
-// Println logs a message at level Info on the standard logger.
-func Println(args ...interface{}) {
-	std.Println(args...)
-}
-
-// Infoln logs a message at level Info on the standard logger.
-func Infoln(args ...interface{}) {
-	std.Infoln(args...)
-}
-
-// Warnln logs a message at level Warn on the standard logger.
-func Warnln(args ...interface{}) {
-	std.Warnln(args...)
-}
-
-// Warningln logs a message at level Warn on the standard logger.
-func Warningln(args ...interface{}) {
-	std.Warningln(args...)
-}
-
-// Errorln logs a message at level Error on the standard logger.
-func Errorln(args ...interface{}) {
-	std.Errorln(args...)
-}
-
-// Panicln logs a message at level Panic on the standard logger.
-func Panicln(args ...interface{}) {
-	std.Panicln(args...)
-}
-
-// Fatalln logs a message at level Fatal on the standard logger.
-func Fatalln(args ...interface{}) {
-	std.Fatalln(args...)
-}
diff --git a/vendor/github.com/Sirupsen/logrus/formatter.go b/vendor/github.com/Sirupsen/logrus/formatter.go
deleted file mode 100644
index b5fbe934d1..0000000000
--- a/vendor/github.com/Sirupsen/logrus/formatter.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package logrus
-
-import "time"
-
-const DefaultTimestampFormat = time.RFC3339
-
-// The Formatter interface is used to implement a custom Formatter. It takes an
-// `Entry`. It exposes all the fields, including the default ones:
-//
-// * `entry.Data["msg"]`. The message passed from Info, Warn, Error ..
-// * `entry.Data["time"]`. The timestamp.
-// * `entry.Data["level"]. The level the entry was logged at.
-//
-// Any additional fields added with `WithField` or `WithFields` are also in
-// `entry.Data`. Format is expected to return an array of bytes which are then
-// logged to `logger.Out`.
-type Formatter interface {
-	Format(*Entry) ([]byte, error)
-}
-
-// This is to not silently overwrite `time`, `msg` and `level` fields when
-// dumping it. If this code wasn't there doing:
-//
-//  logrus.WithField("level", 1).Info("hello")
-//
-// Would just silently drop the user provided level. Instead with this code
-// it'll logged as:
-//
-//  {"level": "info", "fields.level": 1, "msg": "hello", "time": "..."}
-//
-// It's not exported because it's still using Data in an opinionated way. It's to
-// avoid code duplication between the two default formatters.
-func prefixFieldClashes(data Fields) {
-	if t, ok := data["time"]; ok {
-		data["fields.time"] = t
-	}
-
-	if m, ok := data["msg"]; ok {
-		data["fields.msg"] = m
-	}
-
-	if l, ok := data["level"]; ok {
-		data["fields.level"] = l
-	}
-}
diff --git a/vendor/github.com/Sirupsen/logrus/hooks.go b/vendor/github.com/Sirupsen/logrus/hooks.go
deleted file mode 100644
index 3f151cdc39..0000000000
--- a/vendor/github.com/Sirupsen/logrus/hooks.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package logrus
-
-// A hook to be fired when logging on the logging levels returned from
-// `Levels()` on your implementation of the interface. Note that this is not
-// fired in a goroutine or a channel with workers, you should handle such
-// functionality yourself if your call is non-blocking and you don't wish for
-// the logging calls for levels returned from `Levels()` to block.
-type Hook interface {
-	Levels() []Level
-	Fire(*Entry) error
-}
-
-// Internal type for storing the hooks on a logger instance.
-type LevelHooks map[Level][]Hook
-
-// Add a hook to an instance of logger. This is called with
-// `log.Hooks.Add(new(MyHook))` where `MyHook` implements the `Hook` interface.
-func (hooks LevelHooks) Add(hook Hook) {
-	for _, level := range hook.Levels() {
-		hooks[level] = append(hooks[level], hook)
-	}
-}
-
-// Fire all the hooks for the passed level. Used by `entry.log` to fire
-// appropriate hooks for a log entry.
-func (hooks LevelHooks) Fire(level Level, entry *Entry) error {
-	for _, hook := range hooks[level] {
-		if err := hook.Fire(entry); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/Sirupsen/logrus/json_formatter.go b/vendor/github.com/Sirupsen/logrus/json_formatter.go
deleted file mode 100644
index 266554e9ff..0000000000
--- a/vendor/github.com/Sirupsen/logrus/json_formatter.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package logrus
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-type fieldKey string
-type FieldMap map[fieldKey]string
-
-const (
-	FieldKeyMsg   = "msg"
-	FieldKeyLevel = "level"
-	FieldKeyTime  = "time"
-)
-
-func (f FieldMap) resolve(key fieldKey) string {
-	if k, ok := f[key]; ok {
-		return k
-	}
-
-	return string(key)
-}
-
-type JSONFormatter struct {
-	// TimestampFormat sets the format used for marshaling timestamps.
-	TimestampFormat string
-
-	// DisableTimestamp allows disabling automatic timestamps in output
-	DisableTimestamp bool
-
-	// FieldMap allows users to customize the names of keys for various fields.
-	// As an example:
-	// formatter := &JSONFormatter{
-	//   	FieldMap: FieldMap{
-	// 		 FieldKeyTime: "@timestamp",
-	// 		 FieldKeyLevel: "@level",
-	// 		 FieldKeyLevel: "@message",
-	//    },
-	// }
-	FieldMap FieldMap
-}
-
-func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
-	data := make(Fields, len(entry.Data)+3)
-	for k, v := range entry.Data {
-		switch v := v.(type) {
-		case error:
-			// Otherwise errors are ignored by `encoding/json`
-			// https://github.com/Sirupsen/logrus/issues/137
-			data[k] = v.Error()
-		default:
-			data[k] = v
-		}
-	}
-	prefixFieldClashes(data)
-
-	timestampFormat := f.TimestampFormat
-	if timestampFormat == "" {
-		timestampFormat = DefaultTimestampFormat
-	}
-
-	if !f.DisableTimestamp {
-		data[f.FieldMap.resolve(FieldKeyTime)] = entry.Time.Format(timestampFormat)
-	}
-	data[f.FieldMap.resolve(FieldKeyMsg)] = entry.Message
-	data[f.FieldMap.resolve(FieldKeyLevel)] = entry.Level.String()
-
-	serialized, err := json.Marshal(data)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
-	}
-	return append(serialized, '\n'), nil
-}
diff --git a/vendor/github.com/Sirupsen/logrus/logger.go b/vendor/github.com/Sirupsen/logrus/logger.go
deleted file mode 100644
index b769f3d352..0000000000
--- a/vendor/github.com/Sirupsen/logrus/logger.go
+++ /dev/null
@@ -1,308 +0,0 @@
-package logrus
-
-import (
-	"io"
-	"os"
-	"sync"
-)
-
-type Logger struct {
-	// The logs are `io.Copy`'d to this in a mutex. It's common to set this to a
-	// file, or leave it default which is `os.Stderr`. You can also set this to
-	// something more adventorous, such as logging to Kafka.
-	Out io.Writer
-	// Hooks for the logger instance. These allow firing events based on logging
-	// levels and log entries. For example, to send errors to an error tracking
-	// service, log to StatsD or dump the core on fatal errors.
-	Hooks LevelHooks
-	// All log entries pass through the formatter before logged to Out. The
-	// included formatters are `TextFormatter` and `JSONFormatter` for which
-	// TextFormatter is the default. In development (when a TTY is attached) it
-	// logs with colors, but to a file it wouldn't. You can easily implement your
-	// own that implements the `Formatter` interface, see the `README` or included
-	// formatters for examples.
-	Formatter Formatter
-	// The logging level the logger should log at. This is typically (and defaults
-	// to) `logrus.Info`, which allows Info(), Warn(), Error() and Fatal() to be
-	// logged. `logrus.Debug` is useful in
-	Level Level
-	// Used to sync writing to the log. Locking is enabled by Default
-	mu MutexWrap
-	// Reusable empty entry
-	entryPool sync.Pool
-}
-
-type MutexWrap struct {
-	lock     sync.Mutex
-	disabled bool
-}
-
-func (mw *MutexWrap) Lock() {
-	if !mw.disabled {
-		mw.lock.Lock()
-	}
-}
-
-func (mw *MutexWrap) Unlock() {
-	if !mw.disabled {
-		mw.lock.Unlock()
-	}
-}
-
-func (mw *MutexWrap) Disable() {
-	mw.disabled = true
-}
-
-// Creates a new logger. Configuration should be set by changing `Formatter`,
-// `Out` and `Hooks` directly on the default logger instance. You can also just
-// instantiate your own:
-//
-//    var log = &Logger{
-//      Out: os.Stderr,
-//      Formatter: new(JSONFormatter),
-//      Hooks: make(LevelHooks),
-//      Level: logrus.DebugLevel,
-//    }
-//
-// It's recommended to make this a global instance called `log`.
-func New() *Logger {
-	return &Logger{
-		Out:       os.Stderr,
-		Formatter: new(TextFormatter),
-		Hooks:     make(LevelHooks),
-		Level:     InfoLevel,
-	}
-}
-
-func (logger *Logger) newEntry() *Entry {
-	entry, ok := logger.entryPool.Get().(*Entry)
-	if ok {
-		return entry
-	}
-	return NewEntry(logger)
-}
-
-func (logger *Logger) releaseEntry(entry *Entry) {
-	logger.entryPool.Put(entry)
-}
-
-// Adds a field to the log entry, note that it doesn't log until you call
-// Debug, Print, Info, Warn, Fatal or Panic. It only creates a log entry.
-// If you want multiple fields, use `WithFields`.
-func (logger *Logger) WithField(key string, value interface{}) *Entry {
-	entry := logger.newEntry()
-	defer logger.releaseEntry(entry)
-	return entry.WithField(key, value)
-}
-
-// Adds a struct of fields to the log entry. All it does is call `WithField` for
-// each `Field`.
-func (logger *Logger) WithFields(fields Fields) *Entry {
-	entry := logger.newEntry()
-	defer logger.releaseEntry(entry)
-	return entry.WithFields(fields)
-}
-
-// Add an error as single field to the log entry.  All it does is call
-// `WithError` for the given `error`.
-func (logger *Logger) WithError(err error) *Entry {
-	entry := logger.newEntry()
-	defer logger.releaseEntry(entry)
-	return entry.WithError(err)
-}
-
-func (logger *Logger) Debugf(format string, args ...interface{}) {
-	if logger.Level >= DebugLevel {
-		entry := logger.newEntry()
-		entry.Debugf(format, args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Infof(format string, args ...interface{}) {
-	if logger.Level >= InfoLevel {
-		entry := logger.newEntry()
-		entry.Infof(format, args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Printf(format string, args ...interface{}) {
-	entry := logger.newEntry()
-	entry.Printf(format, args...)
-	logger.releaseEntry(entry)
-}
-
-func (logger *Logger) Warnf(format string, args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		entry := logger.newEntry()
-		entry.Warnf(format, args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Warningf(format string, args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		entry := logger.newEntry()
-		entry.Warnf(format, args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Errorf(format string, args ...interface{}) {
-	if logger.Level >= ErrorLevel {
-		entry := logger.newEntry()
-		entry.Errorf(format, args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Fatalf(format string, args ...interface{}) {
-	if logger.Level >= FatalLevel {
-		entry := logger.newEntry()
-		entry.Fatalf(format, args...)
-		logger.releaseEntry(entry)
-	}
-	Exit(1)
-}
-
-func (logger *Logger) Panicf(format string, args ...interface{}) {
-	if logger.Level >= PanicLevel {
-		entry := logger.newEntry()
-		entry.Panicf(format, args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Debug(args ...interface{}) {
-	if logger.Level >= DebugLevel {
-		entry := logger.newEntry()
-		entry.Debug(args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Info(args ...interface{}) {
-	if logger.Level >= InfoLevel {
-		entry := logger.newEntry()
-		entry.Info(args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Print(args ...interface{}) {
-	entry := logger.newEntry()
-	entry.Info(args...)
-	logger.releaseEntry(entry)
-}
-
-func (logger *Logger) Warn(args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		entry := logger.newEntry()
-		entry.Warn(args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Warning(args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		entry := logger.newEntry()
-		entry.Warn(args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Error(args ...interface{}) {
-	if logger.Level >= ErrorLevel {
-		entry := logger.newEntry()
-		entry.Error(args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Fatal(args ...interface{}) {
-	if logger.Level >= FatalLevel {
-		entry := logger.newEntry()
-		entry.Fatal(args...)
-		logger.releaseEntry(entry)
-	}
-	Exit(1)
-}
-
-func (logger *Logger) Panic(args ...interface{}) {
-	if logger.Level >= PanicLevel {
-		entry := logger.newEntry()
-		entry.Panic(args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Debugln(args ...interface{}) {
-	if logger.Level >= DebugLevel {
-		entry := logger.newEntry()
-		entry.Debugln(args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Infoln(args ...interface{}) {
-	if logger.Level >= InfoLevel {
-		entry := logger.newEntry()
-		entry.Infoln(args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Println(args ...interface{}) {
-	entry := logger.newEntry()
-	entry.Println(args...)
-	logger.releaseEntry(entry)
-}
-
-func (logger *Logger) Warnln(args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		entry := logger.newEntry()
-		entry.Warnln(args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Warningln(args ...interface{}) {
-	if logger.Level >= WarnLevel {
-		entry := logger.newEntry()
-		entry.Warnln(args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Errorln(args ...interface{}) {
-	if logger.Level >= ErrorLevel {
-		entry := logger.newEntry()
-		entry.Errorln(args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-func (logger *Logger) Fatalln(args ...interface{}) {
-	if logger.Level >= FatalLevel {
-		entry := logger.newEntry()
-		entry.Fatalln(args...)
-		logger.releaseEntry(entry)
-	}
-	Exit(1)
-}
-
-func (logger *Logger) Panicln(args ...interface{}) {
-	if logger.Level >= PanicLevel {
-		entry := logger.newEntry()
-		entry.Panicln(args...)
-		logger.releaseEntry(entry)
-	}
-}
-
-//When file is opened with appending mode, it's safe to
-//write concurrently to a file (within 4k message on Linux).
-//In these cases user can choose to disable the lock.
-func (logger *Logger) SetNoLock() {
-	logger.mu.Disable()
-}
diff --git a/vendor/github.com/Sirupsen/logrus/logrus.go b/vendor/github.com/Sirupsen/logrus/logrus.go
deleted file mode 100644
index e596691116..0000000000
--- a/vendor/github.com/Sirupsen/logrus/logrus.go
+++ /dev/null
@@ -1,143 +0,0 @@
-package logrus
-
-import (
-	"fmt"
-	"log"
-	"strings"
-)
-
-// Fields type, used to pass to `WithFields`.
-type Fields map[string]interface{}
-
-// Level type
-type Level uint8
-
-// Convert the Level to a string. E.g. PanicLevel becomes "panic".
-func (level Level) String() string {
-	switch level {
-	case DebugLevel:
-		return "debug"
-	case InfoLevel:
-		return "info"
-	case WarnLevel:
-		return "warning"
-	case ErrorLevel:
-		return "error"
-	case FatalLevel:
-		return "fatal"
-	case PanicLevel:
-		return "panic"
-	}
-
-	return "unknown"
-}
-
-// ParseLevel takes a string level and returns the Logrus log level constant.
-func ParseLevel(lvl string) (Level, error) {
-	switch strings.ToLower(lvl) {
-	case "panic":
-		return PanicLevel, nil
-	case "fatal":
-		return FatalLevel, nil
-	case "error":
-		return ErrorLevel, nil
-	case "warn", "warning":
-		return WarnLevel, nil
-	case "info":
-		return InfoLevel, nil
-	case "debug":
-		return DebugLevel, nil
-	}
-
-	var l Level
-	return l, fmt.Errorf("not a valid logrus Level: %q", lvl)
-}
-
-// A constant exposing all logging levels
-var AllLevels = []Level{
-	PanicLevel,
-	FatalLevel,
-	ErrorLevel,
-	WarnLevel,
-	InfoLevel,
-	DebugLevel,
-}
-
-// These are the different logging levels. You can set the logging level to log
-// on your instance of logger, obtained with `logrus.New()`.
-const (
-	// PanicLevel level, highest level of severity. Logs and then calls panic with the
-	// message passed to Debug, Info, ...
-	PanicLevel Level = iota
-	// FatalLevel level. Logs and then calls `os.Exit(1)`. It will exit even if the
-	// logging level is set to Panic.
-	FatalLevel
-	// ErrorLevel level. Logs. Used for errors that should definitely be noted.
-	// Commonly used for hooks to send errors to an error tracking service.
-	ErrorLevel
-	// WarnLevel level. Non-critical entries that deserve eyes.
-	WarnLevel
-	// InfoLevel level. General operational entries about what's going on inside the
-	// application.
-	InfoLevel
-	// DebugLevel level. Usually only enabled when debugging. Very verbose logging.
-	DebugLevel
-)
-
-// Won't compile if StdLogger can't be realized by a log.Logger
-var (
-	_ StdLogger = &log.Logger{}
-	_ StdLogger = &Entry{}
-	_ StdLogger = &Logger{}
-)
-
-// StdLogger is what your logrus-enabled library should take, that way
-// it'll accept a stdlib logger and a logrus logger. There's no standard
-// interface, this is the closest we get, unfortunately.
-type StdLogger interface {
-	Print(...interface{})
-	Printf(string, ...interface{})
-	Println(...interface{})
-
-	Fatal(...interface{})
-	Fatalf(string, ...interface{})
-	Fatalln(...interface{})
-
-	Panic(...interface{})
-	Panicf(string, ...interface{})
-	Panicln(...interface{})
-}
-
-// The FieldLogger interface generalizes the Entry and Logger types
-type FieldLogger interface {
-	WithField(key string, value interface{}) *Entry
-	WithFields(fields Fields) *Entry
-	WithError(err error) *Entry
-
-	Debugf(format string, args ...interface{})
-	Infof(format string, args ...interface{})
-	Printf(format string, args ...interface{})
-	Warnf(format string, args ...interface{})
-	Warningf(format string, args ...interface{})
-	Errorf(format string, args ...interface{})
-	Fatalf(format string, args ...interface{})
-	Panicf(format string, args ...interface{})
-
-	Debug(args ...interface{})
-	Info(args ...interface{})
-	Print(args ...interface{})
-	Warn(args ...interface{})
-	Warning(args ...interface{})
-	Error(args ...interface{})
-	Fatal(args ...interface{})
-	Panic(args ...interface{})
-
-	Debugln(args ...interface{})
-	Infoln(args ...interface{})
-	Println(args ...interface{})
-	Warnln(args ...interface{})
-	Warningln(args ...interface{})
-	Errorln(args ...interface{})
-	Fatalln(args ...interface{})
-	Panicln(args ...interface{})
-}
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_appengine.go b/vendor/github.com/Sirupsen/logrus/terminal_appengine.go
deleted file mode 100644
index e011a86945..0000000000
--- a/vendor/github.com/Sirupsen/logrus/terminal_appengine.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build appengine
-
-package logrus
-
-import "io"
-
-// IsTerminal returns true if stderr's file descriptor is a terminal.
-func IsTerminal(f io.Writer) bool {
-	return true
-}
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_bsd.go b/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
deleted file mode 100644
index 5f6be4d3c0..0000000000
--- a/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build darwin freebsd openbsd netbsd dragonfly
-// +build !appengine
-
-package logrus
-
-import "syscall"
-
-const ioctlReadTermios = syscall.TIOCGETA
-
-type Termios syscall.Termios
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_linux.go b/vendor/github.com/Sirupsen/logrus/terminal_linux.go
deleted file mode 100644
index 308160ca80..0000000000
--- a/vendor/github.com/Sirupsen/logrus/terminal_linux.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Based on ssh/terminal:
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !appengine
-
-package logrus
-
-import "syscall"
-
-const ioctlReadTermios = syscall.TCGETS
-
-type Termios syscall.Termios
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go b/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
deleted file mode 100644
index 190297abf3..0000000000
--- a/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Based on ssh/terminal:
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux darwin freebsd openbsd netbsd dragonfly
-// +build !appengine
-
-package logrus
-
-import (
-	"io"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-// IsTerminal returns true if stderr's file descriptor is a terminal.
-func IsTerminal(f io.Writer) bool {
-	var termios Termios
-	switch v := f.(type) {
-	case *os.File:
-		_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(v.Fd()), ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-		return err == 0
-	default:
-		return false
-	}
-}
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_solaris.go b/vendor/github.com/Sirupsen/logrus/terminal_solaris.go
deleted file mode 100644
index 3c86b1abee..0000000000
--- a/vendor/github.com/Sirupsen/logrus/terminal_solaris.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// +build solaris,!appengine
-
-package logrus
-
-import (
-	"io"
-	"os"
-
-	"golang.org/x/sys/unix"
-)
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal(f io.Writer) bool {
-	switch v := f.(type) {
-	case *os.File:
-		_, err := unix.IoctlGetTermios(int(v.Fd()), unix.TCGETA)
-		return err == nil
-	default:
-		return false
-	}
-}
diff --git a/vendor/github.com/Sirupsen/logrus/terminal_windows.go b/vendor/github.com/Sirupsen/logrus/terminal_windows.go
deleted file mode 100644
index 05d2f91f16..0000000000
--- a/vendor/github.com/Sirupsen/logrus/terminal_windows.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Based on ssh/terminal:
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows,!appengine
-
-package logrus
-
-import (
-	"io"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-var kernel32 = syscall.NewLazyDLL("kernel32.dll")
-
-var (
-	procGetConsoleMode = kernel32.NewProc("GetConsoleMode")
-)
-
-// IsTerminal returns true if stderr's file descriptor is a terminal.
-func IsTerminal(f io.Writer) bool {
-	switch v := f.(type) {
-	case *os.File:
-		var st uint32
-		r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(v.Fd()), uintptr(unsafe.Pointer(&st)), 0)
-		return r != 0 && e == 0
-	default:
-		return false
-	}
-}
diff --git a/vendor/github.com/Sirupsen/logrus/text_formatter.go b/vendor/github.com/Sirupsen/logrus/text_formatter.go
deleted file mode 100644
index ba88854061..0000000000
--- a/vendor/github.com/Sirupsen/logrus/text_formatter.go
+++ /dev/null
@@ -1,189 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"fmt"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-)
-
-const (
-	nocolor = 0
-	red     = 31
-	green   = 32
-	yellow  = 33
-	blue    = 34
-	gray    = 37
-)
-
-var (
-	baseTimestamp time.Time
-)
-
-func init() {
-	baseTimestamp = time.Now()
-}
-
-type TextFormatter struct {
-	// Set to true to bypass checking for a TTY before outputting colors.
-	ForceColors bool
-
-	// Force disabling colors.
-	DisableColors bool
-
-	// Disable timestamp logging. useful when output is redirected to logging
-	// system that already adds timestamps.
-	DisableTimestamp bool
-
-	// Enable logging the full timestamp when a TTY is attached instead of just
-	// the time passed since beginning of execution.
-	FullTimestamp bool
-
-	// TimestampFormat to use for display when a full timestamp is printed
-	TimestampFormat string
-
-	// The fields are sorted by default for a consistent output. For applications
-	// that log extremely frequently and don't use the JSON formatter this may not
-	// be desired.
-	DisableSorting bool
-
-	// QuoteEmptyFields will wrap empty fields in quotes if true
-	QuoteEmptyFields bool
-
-	// QuoteCharacter can be set to the override the default quoting character "
-	// with something else. For example: ', or `.
-	QuoteCharacter string
-
-	// Whether the logger's out is to a terminal
-	isTerminal bool
-
-	sync.Once
-}
-
-func (f *TextFormatter) init(entry *Entry) {
-	if len(f.QuoteCharacter) == 0 {
-		f.QuoteCharacter = "\""
-	}
-	if entry.Logger != nil {
-		f.isTerminal = IsTerminal(entry.Logger.Out)
-	}
-}
-
-func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
-	var b *bytes.Buffer
-	keys := make([]string, 0, len(entry.Data))
-	for k := range entry.Data {
-		keys = append(keys, k)
-	}
-
-	if !f.DisableSorting {
-		sort.Strings(keys)
-	}
-	if entry.Buffer != nil {
-		b = entry.Buffer
-	} else {
-		b = &bytes.Buffer{}
-	}
-
-	prefixFieldClashes(entry.Data)
-
-	f.Do(func() { f.init(entry) })
-
-	isColored := (f.ForceColors || f.isTerminal) && !f.DisableColors
-
-	timestampFormat := f.TimestampFormat
-	if timestampFormat == "" {
-		timestampFormat = DefaultTimestampFormat
-	}
-	if isColored {
-		f.printColored(b, entry, keys, timestampFormat)
-	} else {
-		if !f.DisableTimestamp {
-			f.appendKeyValue(b, "time", entry.Time.Format(timestampFormat))
-		}
-		f.appendKeyValue(b, "level", entry.Level.String())
-		if entry.Message != "" {
-			f.appendKeyValue(b, "msg", entry.Message)
-		}
-		for _, key := range keys {
-			f.appendKeyValue(b, key, entry.Data[key])
-		}
-	}
-
-	b.WriteByte('\n')
-	return b.Bytes(), nil
-}
-
-func (f *TextFormatter) printColored(b *bytes.Buffer, entry *Entry, keys []string, timestampFormat string) {
-	var levelColor int
-	switch entry.Level {
-	case DebugLevel:
-		levelColor = gray
-	case WarnLevel:
-		levelColor = yellow
-	case ErrorLevel, FatalLevel, PanicLevel:
-		levelColor = red
-	default:
-		levelColor = blue
-	}
-
-	levelText := strings.ToUpper(entry.Level.String())[0:4]
-
-	if f.DisableTimestamp {
-		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m %-44s ", levelColor, levelText, entry.Message)
-	} else if !f.FullTimestamp {
-		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%04d] %-44s ", levelColor, levelText, int(entry.Time.Sub(baseTimestamp)/time.Second), entry.Message)
-	} else {
-		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%s] %-44s ", levelColor, levelText, entry.Time.Format(timestampFormat), entry.Message)
-	}
-	for _, k := range keys {
-		v := entry.Data[k]
-		fmt.Fprintf(b, " \x1b[%dm%s\x1b[0m=", levelColor, k)
-		f.appendValue(b, v)
-	}
-}
-
-func (f *TextFormatter) needsQuoting(text string) bool {
-	if f.QuoteEmptyFields && len(text) == 0 {
-		return true
-	}
-	for _, ch := range text {
-		if !((ch >= 'a' && ch <= 'z') ||
-			(ch >= 'A' && ch <= 'Z') ||
-			(ch >= '0' && ch <= '9') ||
-			ch == '-' || ch == '.') {
-			return true
-		}
-	}
-	return false
-}
-
-func (f *TextFormatter) appendKeyValue(b *bytes.Buffer, key string, value interface{}) {
-
-	b.WriteString(key)
-	b.WriteByte('=')
-	f.appendValue(b, value)
-	b.WriteByte(' ')
-}
-
-func (f *TextFormatter) appendValue(b *bytes.Buffer, value interface{}) {
-	switch value := value.(type) {
-	case string:
-		if !f.needsQuoting(value) {
-			b.WriteString(value)
-		} else {
-			fmt.Fprintf(b, "%s%v%s", f.QuoteCharacter, value, f.QuoteCharacter)
-		}
-	case error:
-		errmsg := value.Error()
-		if !f.needsQuoting(errmsg) {
-			b.WriteString(errmsg)
-		} else {
-			fmt.Fprintf(b, "%s%v%s", f.QuoteCharacter, errmsg, f.QuoteCharacter)
-		}
-	default:
-		fmt.Fprint(b, value)
-	}
-}
diff --git a/vendor/github.com/Sirupsen/logrus/writer.go b/vendor/github.com/Sirupsen/logrus/writer.go
deleted file mode 100644
index 7bdebedc60..0000000000
--- a/vendor/github.com/Sirupsen/logrus/writer.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package logrus
-
-import (
-	"bufio"
-	"io"
-	"runtime"
-)
-
-func (logger *Logger) Writer() *io.PipeWriter {
-	return logger.WriterLevel(InfoLevel)
-}
-
-func (logger *Logger) WriterLevel(level Level) *io.PipeWriter {
-	return NewEntry(logger).WriterLevel(level)
-}
-
-func (entry *Entry) Writer() *io.PipeWriter {
-	return entry.WriterLevel(InfoLevel)
-}
-
-func (entry *Entry) WriterLevel(level Level) *io.PipeWriter {
-	reader, writer := io.Pipe()
-
-	var printFunc func(args ...interface{})
-
-	switch level {
-	case DebugLevel:
-		printFunc = entry.Debug
-	case InfoLevel:
-		printFunc = entry.Info
-	case WarnLevel:
-		printFunc = entry.Warn
-	case ErrorLevel:
-		printFunc = entry.Error
-	case FatalLevel:
-		printFunc = entry.Fatal
-	case PanicLevel:
-		printFunc = entry.Panic
-	default:
-		printFunc = entry.Print
-	}
-
-	go entry.writerScanner(reader, printFunc)
-	runtime.SetFinalizer(writer, writerFinalizer)
-
-	return writer
-}
-
-func (entry *Entry) writerScanner(reader *io.PipeReader, printFunc func(args ...interface{})) {
-	scanner := bufio.NewScanner(reader)
-	for scanner.Scan() {
-		printFunc(scanner.Text())
-	}
-	if err := scanner.Err(); err != nil {
-		entry.Errorf("Error while reading from Writer: %s", err)
-	}
-	reader.Close()
-}
-
-func writerFinalizer(writer *io.PipeWriter) {
-	writer.Close()
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go/CHANGELOG.md
deleted file mode 100644
index 5e57ef2ece..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/CHANGELOG.md
+++ /dev/null
@@ -1,1536 +0,0 @@
-Release v1.10.18 (2017-07-27)
-===
-
-### Service Client Updates
-* `service/ec2`: Updates service API and documentation
-  * The CreateDefaultVPC API enables you to create a new default VPC . You no longer need to contact AWS support, if your default VPC has been deleted.
-* `service/kinesisanalytics`: Updates service API and documentation
-  * Added additional exception types and clarified documentation.
-
-Release v1.10.17 (2017-07-27)
-===
-
-### Service Client Updates
-* `service/dynamodb`: Updates service documentation and examples
-  * Corrected a typo.
-* `service/ec2`: Updates service API and documentation
-  * Amazon EC2 Elastic GPUs allow you to easily attach low-cost graphics acceleration to current generation EC2 instances. With Amazon EC2 Elastic GPUs, you can configure the right amount of graphics acceleration to your particular workload without being constrained by fixed hardware configurations and limited GPU selection.
-* `service/monitoring`: Updates service documentation
-  * This release adds high resolution features to CloudWatch, with support for Custom Metrics down to 1 second and Alarms down to 10 seconds.
-
-Release v1.10.16 (2017-07-26)
-===
-
-### Service Client Updates
-* `service/clouddirectory`: Updates service API and documentation
-  * Cloud Directory adds support for additional batch operations.
-* `service/cloudformation`: Updates service API and documentation
-  * AWS CloudFormation StackSets enables you to manage stacks across multiple accounts and regions.
-
-### SDK Enhancements
-* `aws/signer/v4`: Optimize V4 signer's header duplicate space stripping. [#1417](https://github.com/aws/aws-sdk-go/pull/1417)
-
-Release v1.10.15 (2017-07-24)
-===
-
-### Service Client Updates
-* `service/appstream`: Updates service API, documentation, and waiters
-  * Amazon AppStream 2.0 image builders and fleets can now access applications and network resources that rely on Microsoft Active Directory (AD) for authentication and permissions. This new feature allows you to join your streaming instances to your AD, so you can use your existing AD user management tools.
-* `service/ec2`: Updates service API and documentation
-  * Spot Fleet tagging capability allows customers to automatically tag instances launched by Spot Fleet. You can use this feature to label or distinguish instances created by distinct Spot Fleets. Tagging your EC2 instances also enables you to see instance cost allocation by tag in your AWS bill.
-
-### SDK Bugs
-* `aws/signer/v4`: Fix out of bounds panic in stripExcessSpaces [#1412](https://github.com/aws/aws-sdk-go/pull/1412)
-  * Fixes the out of bands panic in stripExcessSpaces caused by an incorrect calculation of the stripToIdx value. Simplified to code also.
-  * Fixes [#1411](https://github.com/aws/aws-sdk-go/issues/1411)
-Release v1.10.14 (2017-07-20)
-===
-
-### Service Client Updates
-* `service/elasticmapreduce`: Updates service API and documentation
-  * Amazon EMR now includes the ability to use a custom Amazon Linux AMI and adjustable root volume size when launching a cluster.
-
-Release v1.10.13 (2017-07-19)
-===
-
-### Service Client Updates
-* `service/budgets`: Updates service API and documentation
-  * Update budget Management API's to list/create/update RI_UTILIZATION type budget. Update budget Management API's to support DAILY timeUnit for RI_UTILIZATION type budget.
-
-### SDK Enhancements
-* `service/s3`:  Use interfaces assertions instead of ValuesAtPath for S3 field lookups. [#1401](https://github.com/aws/aws-sdk-go/pull/1401)
-  * Improves the performance across the board for all S3 API calls by removing the usage of `ValuesAtPath` being used for every S3 API call.
-
-### SDK Bugs
-* `aws/request`: waiter test bug
-  * waiters_test.go file would sometimes fail due to travis hiccups. This occurs because a test would sometimes fail the cancel check and succeed the timeout. However, the timeout check should never occur in that test. This fix introduces a new field that dictates how waiters will sleep.
-Release v1.10.12 (2017-07-17)
-===
-
-### Service Client Updates
-* `service/cognito-idp`: Updates service API and documentation
-* `service/lambda`: Updates service API and documentation
-  * Lambda@Edge lets you run code closer to your end users without provisioning or managing servers. With Lambda@Edge, your code runs in AWS edge locations, allowing you to respond to your end users at the lowest latency. Your code is triggered by Amazon CloudFront events, such as requests to and from origin servers and viewers, and it is ready to execute at every AWS edge location whenever a request for content is received. You just upload your Node.js code to AWS Lambda and Lambda takes care of everything required to run and scale your code with high availability. You only pay for the compute time you consume - there is no charge when your code is not running.
-
-Release v1.10.11 (2017-07-14)
-===
-
-### Service Client Updates
-* `service/discovery`: Updates service API and documentation
-  * Adding feature to the Export API for Discovery Service to allow filters for the export task to allow export based on per agent id.
-* `service/ec2`: Updates service API
-  * New EC2 GPU Graphics instance
-* `service/marketplacecommerceanalytics`: Updates service documentation
-  * Update to Documentation Model For New Report Cadence / Reformat of Docs
-
-Release v1.10.10 (2017-07-13)
-===
-
-### Service Client Updates
-* `service/apigateway`: Updates service API and documentation
-  * Adds support for management of gateway responses.
-* `service/ec2`: Updates service API and documentation
-  * X-ENI (or Cross-Account ENI) is a new feature that allows the attachment or association of Elastic Network Interfaces (ENI) between VPCs in different AWS accounts located in the same availability zone. With this new capability, service providers and partners can deliver managed solutions in a variety of new architectural patterns where the provider and consumer of the service are in different AWS accounts.
-* `service/lex-models`: Updates service documentation
-
-Release v1.10.9 (2017-07-12)
-===
-
-### Service Client Updates
-* `service/autoscaling`: Updates service API and documentation
-  * Auto Scaling now supports a new type of scaling policy called target tracking scaling policies that you can use to set up dynamic scaling for your application.
-* `service/swf`: Updates service API, documentation, paginators, and examples
-  * Added support for attaching control data to Lambda tasks. Control data lets you attach arbitrary strings to your decisions and history events.
-
-Release v1.10.8 (2017-07-06)
-===
-
-### Service Client Updates
-* `service/ds`: Updates service API, documentation, and paginators
-  * You can now improve the resilience and performance of your Microsoft AD directory by deploying additional domain controllers. Added UpdateNumberofDomainControllers API that allows you to update the number of domain controllers you want for your directory, and DescribeDomainControllers API that allows you to describe the detailed information of each domain controller of your directory. Also added the 'DesiredNumberOfDomainControllers' field to the DescribeDirectories API output for Microsoft AD.
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/kinesis`: Updates service API and documentation
-  * You can now encrypt your data at rest within an Amazon Kinesis Stream using server-side encryption. Server-side encryption via AWS KMS makes it easy for customers to meet strict data management requirements by encrypting their data at rest within the Amazon Kinesis Streams, a fully managed real-time data processing service.
-* `service/kms`: Updates service API and documentation
-  * This release of AWS Key Management Service introduces the ability to determine whether a key is AWS managed or customer managed.
-* `service/ssm`: Updates service API and documentation
-  * Amazon EC2 Systems Manager now expands Patching support to Amazon Linux, Red Hat and Ubuntu in addition to the already supported Windows Server.
-
-Release v1.10.7 (2017-07-05)
-===
-
-### Service Client Updates
-* `service/monitoring`: Updates service API and documentation
-  * We are excited to announce the availability of APIs and CloudFormation support for CloudWatch Dashboards. You can use the new dashboard APIs or CloudFormation templates to dynamically build and maintain dashboards to monitor your infrastructure and applications. There are four new dashboard APIs - PutDashboard, GetDashboard, DeleteDashboards, and ListDashboards APIs. PutDashboard is used to create a new dashboard or modify an existing one whereas GetDashboard is the API to get the details of a specific dashboard. ListDashboards and DeleteDashboards are used to get the names or delete multiple dashboards respectively. Getting started with dashboard APIs is similar to any other AWS APIs. The APIs can be accessed through AWS SDK or through CLI tools.
-* `service/route53`: Updates service API and documentation
-  * Bug fix for InvalidChangeBatch exception.
-
-### SDK Enhancements
-* `service/s3/s3manager`: adding cleanup function to batch objects [#1375](https://github.com/aws/aws-sdk-go/issues/1375)
-  * This enhancement will add an After field that will be called after each iteration of the batch operation.
-
-Release v1.10.6 (2017-06-30)
-===
-
-### Service Client Updates
-* `service/marketplacecommerceanalytics`: Updates service documentation
-  * Documentation updates for AWS Marketplace Commerce Analytics.
-* `service/s3`: Updates service API and documentation
-  * API Update for S3: Adding Object Tagging Header to MultipartUpload Initialization
-
-Release v1.10.5 (2017-06-29)
-===
-
-### Service Client Updates
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/events`: Updates service API and documentation
-  * CloudWatch Events now allows different AWS accounts to share events with each other through a new resource called event bus. Event buses accept events from AWS services, other AWS accounts and PutEvents API calls. Currently all AWS accounts have one default event bus. To send events to another account, customers simply write rules to match the events of interest and attach an event bus in the receiving account as the target to the rule. The PutTargets API has been updated to allow adding cross account event buses as targets. In addition, we have released two new APIs - PutPermission and RemovePermission - that enables customers to add/remove permissions to their default event bus.
-* `service/gamelift`: Updates service API and documentation
-  * Allow developers to download GameLift fleet creation logs to assist with debugging.
-* `service/ssm`: Updates service API and documentation
-  * Adding Resource Data Sync support to SSM Inventory.  New APIs:  * CreateResourceDataSync - creates a new resource data sync configuration,  * ListResourceDataSync - lists existing resource data sync configurations,  * DeleteResourceDataSync - deletes an existing resource data sync configuration.
-
-Release v1.10.4 (2017-06-27)
-===
-
-### Service Client Updates
-* `service/servicecatalog`: Updates service API, documentation, and paginators
-  * Proper tagging of resources is critical to post-launch operations such as billing, cost allocation, and resource management. By using Service Catalog's TagOption Library, administrators can define a library of re-usable TagOptions that conform to company standards, and associate these with Service Catalog portfolios and products. Learn how to move your current tags to the new library, create new TagOptions, and view and associate your library items with portfolios and products. Understand how to ensure that the right tags are created on products launched through Service Catalog and how to provide users with defined selectable tags.
-
-### SDK Bugs
-* `aws/signer/v4`: checking length on `stripExcessSpaces` [#1372](https://github.com/aws/aws-sdk-go/issues/1372)
-  * Fixes a bug where `stripExcessSpaces` did not check length against the slice.
-  * Fixes: [#1371](https://github.com/aws/aws-sdk-go/issues/1371)
-Release v1.10.3 (2017-06-23)
-===
-
-### Service Client Updates
-* `service/lambda`: Updates service API and documentation
-  * The Lambda Invoke API will now throw new exception InvalidRuntimeException (status code 502) for invokes with deprecated runtimes.
-
-Release v1.10.2 (2017-06-22)
-===
-
-### Service Client Updates
-* `service/codepipeline`: Updates service API, documentation, and paginators
-  * A new API, ListPipelineExecutions, enables you to retrieve summary information about the most recent executions in a pipeline, including pipeline execution ID, status, start time, and last updated time. You can request information for a maximum of 100 executions. Pipeline execution data is available for the most recent 12 months of activity.
-* `service/dms`: Updates service API and documentation
-  * Added tagging for DMS certificates.
-* `service/elasticloadbalancing`: Updates service waiters
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/lightsail`: Updates service API and documentation
-  * This release adds a new nextPageToken property to the result of the GetOperationsForResource API. Developers can now get the next set of items in a list by making subsequent calls to GetOperationsForResource API with the token from the previous call. This release also deprecates the nextPageCount property, which previously returned null (use the nextPageToken property instead). This release also deprecates the customImageName property on the CreateInstancesRequest class, which was previously ignored by the API.
-* `service/route53`: Updates service API and documentation
-  * This release reintroduces the HealthCheckInUse exception.
-
-Release v1.10.1 (2017-06-21)
-===
-
-### Service Client Updates
-* `service/dax`: Adds new service
-  * Amazon DynamoDB Accelerator (DAX) is a fully managed, highly available, in-memory cache for DynamoDB that delivers up to a 10x performance improvement - from milliseconds to microseconds - even at millions of requests per second. DAX does all the heavy lifting required to add in-memory acceleration to your DynamoDB tables, without requiring developers to manage cache invalidation, data population, or cluster management.
-* `service/route53`: Updates service API and documentation
-  * Amazon Route 53 now supports multivalue answers in response to DNS queries, which lets you route traffic approximately randomly to multiple resources, such as web servers. Create one multivalue answer record for each resource and, optionally, associate an Amazon Route 53 health check with each record, and Amazon Route 53 responds to DNS queries with up to eight healthy records.
-* `service/ssm`: Updates service API, documentation, and paginators
-  * Adding hierarchy support to the SSM Parameter Store API. Added support tor tagging. New APIs: GetParameter - retrieves one parameter, DeleteParameters - deletes multiple parameters (max number 10), GetParametersByPath - retrieves parameters located in the hierarchy. Updated APIs: PutParameter - added ability to enforce parameter value by applying regex (AllowedPattern), DescribeParameters - modified to support Tag filtering.
-* `service/waf`: Updates service API and documentation
-  * You can now create, edit, update, and delete a new type of WAF rule with a rate tracking component.
-* `service/waf-regional`: Updates service API and documentation
-
-Release v1.10.0 (2017-06-20)
-===
-
-### Service Client Updates
-* `service/workdocs`: Updates service API and documentation
-  * This release provides a new API to retrieve the activities performed by WorkDocs users.
-
-### SDK Features
-* `aws/credentials/plugincreds`: Add support for Go plugin for credentials [#1320](https://github.com/aws/aws-sdk-go/pull/1320)
-  * Adds support for using plugins to retrieve credentials for API requests. This change adds a new package plugincreds under aws/credentials. See the `example/aws/credentials/plugincreds` folder in the SDK for example usage.
-
-Release v1.9.00 (2017-06-19)
-===
-
-### Service Client Updates
-* `service/organizations`: Updates service API and documentation
-  * Improvements to Exception Modeling
-
-### SDK Features
-* `service/s3/s3manager`: Adds batch operations to s3manager [#1333](https://github.com/aws/aws-sdk-go/pull/1333)
-  * Allows for batch upload, download, and delete of objects. Also adds the interface pattern to allow for easy traversal of objects. E.G `DownloadWithIterator`, `UploadWithIterator`, and `BatchDelete`. `BatchDelete` also contains a utility iterator using the `ListObjects` API to easily delete a list of objects.
-  
-Release v1.8.44 (2017-06-16)
-===
-
-### Service Client Updates
-* `service/xray`: Updates service API, documentation, and paginators
-  * Add a response time histogram to the services in response of GetServiceGraph API.
-
-Release v1.8.43 (2017-06-15)
-===
-
-### Service Client Updates
-* `service/ec2`: Updates service API and documentation
-  * Adds API to describe Amazon FPGA Images (AFIs) available to customers, which includes public AFIs, private AFIs that you own, and AFIs owned by other AWS accounts for which you have load permissions.
-* `service/ecs`: Updates service API and documentation
-  * Added support for cpu, memory, and memory reservation container overrides on the RunTask and StartTask APIs.
-* `service/iot`: Updates service API and documentation
-  * Revert the last release: remove CertificatePem from DescribeCertificate API.
-* `service/servicecatalog`: Updates service API, documentation, and paginators
-  * Added ProvisioningArtifactSummaries to DescribeProductAsAdmin's output to show the provisioning artifacts belong to the product. Allow filtering by SourceProductId in SearchProductsAsAdmin for AWS Marketplace products. Added a verbose option to DescribeProvisioningArtifact to display the CloudFormation template used to create the provisioning artifact.Added DescribeProvisionedProduct API. Changed the type of ProvisionedProduct's Status to be distinct from Record's Status. New ProvisionedProduct's Status are AVAILABLE, UNDER_CHANGE, TAINTED, ERROR. Changed Record's Status set of values to CREATED, IN_PROGRESS, IN_PROGRESS_IN_ERROR, SUCCEEDED, FAILED.
-
-### SDK Bugs
-* `private/model/api`: Fix RESTXML support for XML Namespace [#1343](https://github.com/aws/aws-sdk-go/pull/1343)
-  * Fixes a bug with the SDK's generation of services using the REST XML protocol not annotating shape references with the XML Namespace attribute.
-  * Fixes [#1334](https://github.com/aws/aws-sdk-go/pull/1334)
-Release v1.8.42 (2017-06-14)
-===
-
-### Service Client Updates
-* `service/applicationautoscaling`: Updates service API and documentation
-* `service/clouddirectory`: Updates service documentation
-  * Documentation update for Cloud Directory
-
-Release v1.8.41 (2017-06-13)
-===
-
-### Service Client Updates
-* `service/configservice`: Updates service API
-
-Release v1.8.40 (2017-06-13)
-===
-
-### Service Client Updates
-* `service/rds`: Updates service API and documentation
-  * API Update for RDS: this update enables copy-on-write, a new Aurora MySQL Compatible Edition feature that allows users to restore their database, and support copy of TDE enabled snapshot cross region.
-
-### SDK Bugs
-* `aws/request`: Fix NewErrParamMinLen to use correct ParamMinLenErrCode [#1336](https://github.com/aws/aws-sdk-go/issues/1336)
-  * Fixes the `NewErrParamMinLen` function returning the wrong error code. `ParamMinLenErrCode` should be returned not `ParamMinValueErrCode`.
-  * Fixes [#1335](https://github.com/aws/aws-sdk-go/issues/1335)
-Release v1.8.39 (2017-06-09)
-===
-
-### Service Client Updates
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/opsworks`: Updates service API and documentation
-  * Tagging Support for AWS OpsWorks Stacks
-
-Release v1.8.38 (2017-06-08)
-===
-
-### Service Client Updates
-* `service/iot`: Updates service API and documentation
-  * In addition to using certificate ID, AWS IoT customers can now obtain the description of a certificate with the certificate PEM.
-* `service/pinpoint`: Updates service API and documentation
-  * Starting today Amazon Pinpoint adds SMS Text and Email Messaging support in addition to Mobile Push Notifications, providing developers, product managers and marketers with multi-channel messaging capabilities to drive user engagement in their applications. Pinpoint also enables backend services and applications to message users directly and provides advanced user and app analytics to understand user behavior and messaging performance.
-* `service/rekognition`: Updates service API and documentation
-  * API Update for AmazonRekognition: Adding RecognizeCelebrities API
-
-Release v1.8.37 (2017-06-07)
-===
-
-### Service Client Updates
-* `service/codebuild`: Updates service API and documentation
-  * Add support to APIs for privileged containers. This change would allow performing privileged operations like starting the Docker daemon inside builds possible in custom docker images.
-* `service/greengrass`: Adds new service
-  * AWS Greengrass is software that lets you run local compute, messaging, and device state synchronization for connected devices in a secure way. With AWS Greengrass, connected devices can run AWS Lambda functions, keep device data in sync, and communicate with other devices securely even when not connected to the Internet. Using AWS Lambda, Greengrass ensures your IoT devices can respond quickly to local events, operate with intermittent connections, and minimize the cost of transmitting IoT data to the cloud.
-
-Release v1.8.36 (2017-06-06)
-===
-
-### Service Client Updates
-* `service/acm`: Updates service documentation
-  * Documentation update for AWS Certificate Manager.
-* `service/cloudfront`: Updates service documentation
-  * Doc update to fix incorrect prefix in S3OriginConfig
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/iot`: Updates service API
-  * Update client side validation for SalesForce action.
-
-Release v1.8.35 (2017-06-05)
-===
-
-### Service Client Updates
-* `service/appstream`: Updates service API and documentation
-  * AppStream 2.0 Custom Security Groups allows you to easily control what network resources your streaming instances and images have access to. You can assign up to 5 security groups per Fleet to control the inbound and outbound network access to your streaming instances to specific IP ranges, network protocols, or ports.
-* `service/iot`: Updates service API, documentation, paginators, and examples
-  * Added Salesforce action to IoT Rules Engine.
-
-Release v1.8.34 (2017-06-02)
-===
-
-### Service Client Updates
-* `service/kinesisanalytics`: Updates service API, documentation, and paginators
-  * Kinesis Analytics publishes error messages CloudWatch logs in case of application misconfigurations
-* `service/workdocs`: Updates service API and documentation
-  * This release includes new APIs to manage tags and custom metadata on resources and also new APIs to add and retrieve comments at the document level.
-
-Release v1.8.33 (2017-06-01)
-===
-
-### Service Client Updates
-* `service/codedeploy`: Updates service API and documentation
-  * AWS CodeDeploy has improved how it manages connections to GitHub accounts and repositories. You can now create and store up to 25 connections to GitHub accounts in order to associate AWS CodeDeploy applications with GitHub repositories. Each connection can support multiple repositories. You can create connections to up to 25 different GitHub accounts, or create more than one connection to a single account. The ListGitHubAccountTokenNames command has been introduced to retrieve the names of stored connections to GitHub accounts that you have created. The name of the connection to GitHub used for an AWS CodeDeploy application is also included in the ApplicationInfo structure.  Two new fields, lastAttemptedDeployment and lastSuccessfulDeployment, have been added to DeploymentGroupInfo to improve the handling of deployment group information in the AWS CodeDeploy console. Information about these latest deployments can also be retrieved using the GetDeploymentGroup and BatchGetDeployment group requests. Also includes a region update  (us-gov-west-1).
-* `service/cognitoidentityprovider`: Updates service API, documentation, and paginators
-* `service/elbv2`: Updates service API and documentation
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/lexmodelbuildingservice`: Updates service documentation and examples
-
-### SDK Enhancements
-* `aws/defaults`: Exports shared credentials and config default filenames used by the SDK. [#1308](https://github.com/aws/aws-sdk-go/pull/1308)
-  * Adds SharedCredentialsFilename and SharedConfigFilename functions to defaults package.
-
-### SDK Bugs
-* `aws/credentials`: Fixes shared credential provider's default filename on Windows. [#1308](https://github.com/aws/aws-sdk-go/pull/1308)
-  * The shared credentials provider would attempt to use the wrong filename on Windows if the `HOME` environment variable was defined.
-* `service/s3/s3manager`: service/s3/s3manager: Fix Downloader ignoring Range get parameter [#1311](https://github.com/aws/aws-sdk-go/pull/1311)
-  * Fixes the S3 Download Manager ignoring the GetObjectInput's Range parameter. If this parameter is provided it will force the downloader to fallback to a single GetObject request disabling concurrency and automatic part size gets.
-  * Fixes [#1296](https://github.com/aws/aws-sdk-go/issues/1296)
-Release v1.8.32 (2017-05-31)
-===
-
-### Service Client Updates
-* `service/rds`: Updates service API and documentation
-  * Amazon RDS customers can now easily and quickly stop and start their DB instances.
-
-Release v1.8.31 (2017-05-30)
-===
-
-### Service Client Updates
-* `service/clouddirectory`: Updates service API, documentation, and paginators
-  * Cloud Directory has launched support for Typed Links, enabling customers to create object-to-object relationships that are not hierarchical in nature. Typed Links enable customers to quickly query for data along these relationships. Customers can also enforce referential integrity using Typed Links, ensuring data in use is not inadvertently deleted.
-* `service/s3`: Updates service paginators and examples
-  * New example snippets for Amazon S3.
-
-Release v1.8.30 (2017-05-25)
-===
-
-### Service Client Updates
-* `service/appstream`: Updates service API and documentation
-  * Support added for persistent user storage, backed by S3.
-* `service/rekognition`: Updates service API and documentation
-  * Updated the CompareFaces API response to include orientation information, unmatched faces, landmarks, pose, and quality of the compared faces.
-
-Release v1.8.29 (2017-05-24)
-===
-
-### Service Client Updates
-* `service/iam`: Updates service API
-  * The unique ID and access key lengths were extended from 32 to 128
-* `service/storagegateway`: Updates service API and documentation
-  * Two Storage Gateway data types, Tape and TapeArchive, each have a new response element, TapeUsedInBytes. This element helps you manage your virtual tapes. By using TapeUsedInBytes, you can see the amount of data written to each virtual tape.
-* `service/sts`: Updates service API, documentation, and paginators
-  * The unique ID and access key lengths were extended from 32 to 128.
-
-Release v1.8.28 (2017-05-23)
-===
-
-### Service Client Updates
-* `service/databasemigrationservice`: Updates service API, documentation, paginators, and examples
-  * This release adds support for using Amazon S3 and Amazon DynamoDB as targets for database migration, and using MongoDB as a source for database migration. For more information, see the AWS Database Migration Service documentation.
-
-Release v1.8.27 (2017-05-22)
-===
-
-### Service Client Updates
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/resourcegroupstaggingapi`: Updates service API, documentation, and paginators
-  * You can now specify the number of resources returned per page in GetResources operation, as an optional parameter, to easily manage the list of resources returned by your queries.
-
-### SDK Bugs
-* `aws/request`: Add support for PUT temporary redirects (307) [#1283](https://github.com/aws/aws-sdk-go/issues/1283)
-  * Adds support for Go 1.8's GetBody function allowing the SDK's http request using PUT and POST methods to be redirected with temporary redirects with 307 status code.
-  * Fixes: [#1267](https://github.com/aws/aws-sdk-go/issues/1267)
-* `aws/request`: Add handling for retrying temporary errors during unmarshal [#1289](https://github.com/aws/aws-sdk-go/issues/1289)
-  * Adds support for retrying temporary errors that occur during unmarshaling of a request's response body.
-  * Fixes: [#1275](https://github.com/aws/aws-sdk-go/issues/1275)
-Release v1.8.26 (2017-05-18)
-===
-
-### Service Client Updates
-* `service/athena`: Adds new service
-  * This release adds support for Amazon Athena. Amazon Athena is an interactive query service that makes it easy to analyze data in Amazon S3 using standard SQL. Athena is serverless, so there is no infrastructure to manage, and you pay only for the queries that you run.
-* `service/lightsail`: Updates service API, documentation, and paginators
-  * This release adds new APIs that make it easier to set network port configurations on Lightsail instances. Developers can now make a single request to both open and close public ports on an instance using the PutInstancePublicPorts operation.
-
-### SDK Bugs
-* `aws/request`: Fix logging from reporting wrong retry request errors #1281
-  * Fixes the SDK's retry request logging to report the the actual error that occurred, not a stubbed Unknown error message.
-  * Fixes the SDK's response logger to not output the response log multiple times per retry.
-Release v1.8.25 (2017-05-17)
-===
-
-### Service Client Updates
-* `service/autoscaling`: Updates service documentation, paginators, and examples
-  * Various Auto Scaling documentation updates
-* `service/cloudwatchevents`: Updates service documentation
-  * Various CloudWatch Events documentation updates.
-* `service/cloudwatchlogs`: Updates service documentation and paginators
-  * Various CloudWatch Logs documentation updates.
-* `service/polly`: Updates service API
-  * Amazon Polly adds new German voice "Vicki"
-
-Release v1.8.24 (2017-05-16)
-===
-
-### Service Client Updates
-* `service/codedeploy`: Updates service API and documentation
-  * This release introduces the previousRevision field in the responses to the GetDeployment and BatchGetDeployments actions. previousRevision provides information about the application revision that was deployed to the deployment group before the most recent successful deployment.  Also, the fileExistsBehavior parameter has been added for CreateDeployment action requests. In the past, if the AWS CodeDeploy agent detected files in a target location that weren't part of the application revision from the most recent successful deployment, it would fail the current deployment by default. This new parameter provides options for how the agent handles these files: fail the deployment, retain the content, or overwrite the content.
-* `service/gamelift`: Updates service API and documentation
-  * Allow developers to specify how metrics are grouped in CloudWatch for their GameLift fleets. Developers can also specify how many concurrent game sessions activate on a per-instance basis.
-* `service/inspector`: Updates service API, documentation, paginators, and examples
-  * Adds ability to produce an assessment report that includes detailed and comprehensive results of a specified assessment run.
-* `service/kms`: Updates service documentation
-  * Update documentation for KMS.
-
-Release v1.8.23 (2017-05-15)
-===
-
-### Service Client Updates
-* `service/ssm`: Updates service API and documentation
-  * UpdateAssociation API now supports updating document name and targets of an association. GetAutomationExecution API can return FailureDetails as an optional field to the StepExecution Object, which contains failure type, failure stage as well as other failure related information for a failed step.
-
-### SDK Enhancements
-* `aws/session`: SDK should be able to load multiple custom shared config files. [#1258](https://github.com/aws/aws-sdk-go/issues/1258)
-  * This change adds a `SharedConfigFiles` field to the `session.Options` type that allows you to specify the files, and their order, the SDK will use for loading shared configuration and credentials from when the `Session` is created. Use the `NewSessionWithOptions` Session constructor to specify these options. You'll also most likely want to enable support for the shared configuration file's additional attributes by setting `session.Option`'s `SharedConfigState` to `session.SharedConfigEnabled`. 
-
-Release v1.8.22 (2017-05-11)
-===
-
-### Service Client Updates
-* `service/elb`: Updates service API, documentation, and paginators
-* `service/elbv2`: Updates service API and documentation
-* `service/lexmodelbuildingservice`: Updates service API and documentation
-* `service/organizations`: Updates service API, documentation, paginators, and examples
-  * AWS Organizations APIs that return an Account object now include the email address associated with the account’s root user.
-
-Release v1.8.21 (2017-05-09)
-===
-
-### Service Client Updates
-* `service/codestar`: Updates service documentation
-  * Updated documentation for AWS CodeStar.
-* `service/workspaces`: Updates service API, documentation, and paginators
-  * Doc-only Update for WorkSpaces
-
-Release v1.8.20 (2017-05-04)
-===
-
-### Service Client Updates
-* `service/ecs`: Updates service API, documentation, and paginators
-  * Exposes container instance registration time in ECS:DescribeContainerInstances.
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/marketplaceentitlementservice`: Adds new service
-* `service/lambda`: Updates service API and documentation
-  * Support for UpdateFunctionCode DryRun option
-
-Release v1.8.19 (2017-04-28)
-===
-
-### Service Client Updates
-* `service/cloudformation`: Updates service waiters and paginators
-  * Adding back the removed waiters and paginators.
-
-Release v1.8.18 (2017-04-28)
-===
-
-### Service Client Updates
-* `service/cloudformation`: Updates service API, documentation, waiters, paginators, and examples
-  * API update for CloudFormation: New optional parameter ClientRequestToken which can be used as an idempotency token to safely retry certain operations as well as tagging StackEvents.
-* `service/rds`: Updates service API, documentation, and examples
-  * The DescribeDBClusterSnapshots API now returns a SourceDBClusterSnapshotArn field which identifies the source DB cluster snapshot of a copied snapshot.
-* `service/rekognition`: Updates service API
-  * Fix for missing file type check
-* `service/snowball`: Updates service API, documentation, and paginators
-  * The Snowball API has a new exception that can be thrown for list operation requests.
-* `service/sqs`: Updates service API, documentation, and paginators
-  * Adding server-side encryption (SSE) support to SQS by integrating with AWS KMS; adding new queue attributes to SQS CreateQueue, SetQueueAttributes and GetQueueAttributes APIs to support SSE.
-
-Release v1.8.17 (2017-04-26)
-===
-
-### Service Client Updates
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/rds`: Updates service API and documentation
-  * With Amazon Relational Database Service (Amazon RDS) running MySQL or Amazon Aurora, you can now authenticate to your DB instance using IAM database authentication.
-
-Release v1.8.16 (2017-04-21)
-===
-
-### Service Client Updates
-* `service/appstream`: Updates service API, documentation, and paginators
-  * The new feature named "Default Internet Access" will enable Internet access from AppStream 2.0 instances - image builders and fleet instances. Admins will check a flag either through AWS management console for AppStream 2.0 or through API while creating an image builder or while creating/updating a fleet.
-* `service/kinesis`: Updates service API, documentation, waiters, and paginators
-  * Adds a new waiter, StreamNotExists, to Kinesis.
-
-### SDK Enhancements
-* `aws/endpoints`: Add utilities improving endpoints lookup (#1218)
-  * Adds several utilities to the endpoints packages to make looking up partitions, regions, and services easier.
-  * Fixes #994
-
-### SDK Bugs
-* `private/protocol/xml/xmlutil`: Fix unmarshaling dropping errors (#1219)
-  * The XML unmarshaler would drop any serialization or body read error that occurred on the floor effectively hiding any errors that would occur.
-  * Fixes #1205
-Release v1.8.15 (2017-04-20)
-===
-
-### Service Client Updates
-* `service/devicefarm`: Updates service API and documentation
-  * API Update for AWS Device Farm: Support for Deals and Promotions
-* `service/directconnect`: Updates service documentation
-  * Documentation updates for AWS Direct Connect.
-* `service/elbv2`: Updates service waiters
-* `service/kms`: Updates service documentation and examples
-  * Doc-only update for Key Management Service (KMS): Update docs for GrantConstraints and GenerateRandom
-* `service/route53`: Updates service documentation
-  * Release notes: SDK documentation now includes examples for ChangeResourceRecordSets for all types of resource record set, such as weighted, alias, and failover.
-* `service/route53domains`: Updates service API, documentation, and paginators
-  * Adding examples and other documentation updates.
-
-### SDK Enhancements
-* `service/s3`: Add utilities to make getting a bucket's region easier (#1207)
-  * Adds two features which make it easier to get a bucket's region, `s3.NormalizeBucketLocation` and `s3manager.GetBucketRegion`.
-
-### SDK Bugs
-* `service/s3`: Fix HeadObject's incorrect documented error codes (#1213)
-  * The HeadObject's model incorrectly states that the operation can return the NoSuchKey error code.
-  * Fixes #1208
-
-Release v1.8.14 (2017-04-19)
-===
-
-### Service Client Updates
-* `service/apigateway`: Updates service API and documentation
-  * Add support for "embed" property.
-* `service/codestar`: Adds new service
-  * AWS CodeStar is a cloud-based service for creating, managing, and working with software development projects on AWS. An AWS CodeStar project creates and integrates AWS services for your project development toolchain. AWS CodeStar also manages the permissions required for project users.
-* `service/ec2`: Updates service API and documentation
-  * Adds support for creating an Amazon FPGA Image (AFI) from a specified design checkpoint (DCP).
-* `service/iam`: Updates service API and documentation
-  * This changes introduces a new IAM role type, Service Linked Role, which works like a normal role but must be managed via services' control.
-* `service/lambda`: Updates service API and documentation
-  * Lambda integration with CloudDebugger service to enable customers to enable tracing for the Lambda functions and send trace information to the CloudDebugger service.
-* `service/lexmodelbuildingservice`: Adds new service
-* `service/polly`: Updates service API, documentation, and paginators
-  * API Update for Amazon Polly: Add support for speech marks
-* `service/rekognition`: Updates service API and documentation
-  * Given an image, the API detects explicit or suggestive adult content in the image and returns a list of corresponding labels with confidence scores, as well as a taxonomy (parent-child relation) for each label.
-
-Release v1.8.13 (2017-04-18)
-===
-
-### Service Client Updates
-* `service/lambda`: Updates service API and documentation
-  * You can use tags to group and filter your Lambda functions, making it easier to analyze them for billing allocation purposes. For more information, see Tagging Lambda Functions.  You can now write or upgrade your Lambda functions using Python version 3.6. For more information, see Programming Model for Authoring Lambda Functions in Python. Note: Features will be rolled out in the US regions on 4/19.
-
-### SDK Enhancements
-* `aws/request`: add support for appengine's custom standard library (#1190)
-  * Remove syscall error checking on appengine platforms.
-
-Release v1.8.12 (2017-04-11)
-===
-
-### Service Client Updates
-* `service/apigateway`: Updates service API and documentation
-  * API Gateway request validators
-* `service/batch`: Updates service API and documentation
-  * API Update for AWS Batch: Customer provided AMI for MANAGED Compute Environment
-* `service/gamelift`: Updates service API and documentation
-  * Allows developers to utilize an improved workflow when calling our Queues API and introduces a new feature that allows developers to specify a maximum allowable latency per Queue.
-* `service/opsworks`: Updates service API, documentation, and paginators
-  * Cloudwatch Logs agent configuration can now be attached to OpsWorks Layers using CreateLayer and UpdateLayer. OpsWorks will then automatically install and manage the CloudWatch Logs agent on the instances part of the OpsWorks Layer.
-
-### SDK Bugs
-* `aws/client`: Fix clients polluting handler list (#1197)
-  * Fixes the clients potentially polluting the passed in handler list with the client's customizations. This change ensures every client always works with a clean copy of the request handlers and it cannot pollute the handlers back upstream.
-  * Fixes #1184
-* `aws/request`: Fix waiter error match condition (#1195)
-  * Fixes the waiters's matching overwriting the request's err, effectively ignoring the error condition. This broke waiters with the FailureWaiterState matcher state.
-Release v1.8.11 (2017-04-07)
-===
-
-### Service Client Updates
-* `service/redshift`: Updates service API, documentation, and paginators
-  * This update adds the GetClusterCredentials API which is used to get temporary login credentials to the cluster. AccountWithRestoreAccess now has a new member AccountAlias, this is the identifier of the AWS support account authorized to restore the specified snapshot. This is added to support the feature where the customer can share their snapshot with the Amazon Redshift Support Account without having to manually specify the AWS Redshift Service account ID on the AWS Console/API.
-
-Release v1.8.10 (2017-04-06)
-===
-
-### Service Client Updates
-* `service/elbv2`: Updates service documentation
-
-Release v1.8.9 (2017-04-05)
-===
-
-### Service Client Updates
-* `service/elasticache`: Updates service API, documentation, paginators, and examples
-  * ElastiCache added support for testing the Elasticache Multi-AZ feature with Automatic Failover.
-
-Release v1.8.8 (2017-04-04)
-===
-
-### Service Client Updates
-* `service/cloudwatch`: Updates service API, documentation, and paginators
-  * Amazon Web Services announced the immediate availability of two additional alarm configuration rules for Amazon CloudWatch Alarms. The first rule is for configuring missing data treatment. Customers have the options to treat missing data as alarm threshold breached, alarm threshold not breached, maintain alarm state and the current default treatment. The second rule is for alarms based on percentiles metrics that can trigger unnecassarily if the percentile is calculated from a small number of samples. The new rule can treat percentiles with low sample counts as same as missing data. If the first rule is enabled, the same treatment will be applied when an alarm encounters a percentile with low sample counts.
-
-Release v1.8.7 (2017-04-03)
-===
-
-### Service Client Updates
-* `service/lexruntimeservice`: Updates service API and documentation
-  * Adds support to PostContent for speech input
-
-### SDK Enhancements
-* `aws/request`: Improve handler copy, push back, push front performance (#1171)
-  * Minor optimization to the handler list's handling of copying and pushing request handlers to the handler list.
-* Update codegen header to use Go std wording (#1172)
-  * Go recently accepted the proposal for standard generated file header wording in, https://golang.org/s/generatedcode.
-
-### SDK Bugs
-* `service/dynamodb`: Fix DynamoDB using custom retryer (#1170)
-  * Fixes (#1139) the DynamoDB service client clobbering any custom retryer that was passed into the service client or Session's config.
-Release v1.8.6 (2017-04-01)
-===
-
-### Service Client Updates
-* `service/clouddirectory`: Updates service API and documentation
-  * ListObjectAttributes now supports filtering by facet.
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-
-Release v1.8.5 (2017-03-30)
-===
-
-### Service Client Updates
-* `service/cloudformation`: Updates service waiters and paginators
-  * Adding paginators for ListExports and ListImports
-* `service/cloudfront`: Adds new service
-  * Amazon CloudFront now supports user configurable HTTP Read and Keep-Alive Idle Timeouts for your Custom Origin Servers
-* `service/configservice`: Updates service documentation
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/resourcegroupstaggingapi`: Adds new service
-* `service/storagegateway`: Updates service API and documentation
-  * File gateway mode in AWS Storage gateway provides access to objects in S3 as files on a Network File System (NFS) mount point. Once a file share is created, any changes made externally to the S3 bucket will not be reflected by the gateway. Using the cache refresh feature in this update, the customer can trigger an on-demand scan of the keys in their S3 bucket and refresh the file namespace cached on the gateway. It takes as an input the fileShare ARN and refreshes the cache for only that file share. Additionally there is new functionality on file gateway that allows you configure what squash options they would like on their file share, this allows a customer to configure their gateway to not squash root permissions. This can be done by setting options in NfsOptions for CreateNfsFileShare and UpdateNfsFileShare APIs.
-
-Release v1.8.4 (2017-03-28)
-===
-
-### Service Client Updates
-* `service/batch`: Updates service API, documentation, and paginators
-  * Customers can now provide a retryStrategy as part of the RegisterJobDefinition and SubmitJob API calls. The retryStrategy object has a number value for attempts. This is the number of non successful executions before a job is considered FAILED. In addition, the JobDetail object now has an attempts field and shows all execution attempts.
-* `service/ec2`: Updates service API and documentation
-	* Customers can now tag their Amazon EC2 Instances and Amazon EBS Volumes at
-	the time of their creation. You can do this from the EC2 Instance launch
-	wizard or through the RunInstances or CreateVolume APIs. By tagging
-	resources at the time of creation, you can eliminate the need to run custom
-	tagging scripts after resource creation. In addition, you can now set
-	resource-level permissions on the CreateVolume, CreateTags, DeleteTags, and
-	the RunInstances APIs. This allows you to implement stronger security
-	policies by giving you more granular control over which users and groups
-	have access to these APIs. You can also enforce the use of tagging and
-	control what tag keys and values are set on your resources. When you combine
-	tag usage and resource-level IAM policies together, you can ensure your
-	instances and volumes are properly secured upon creation and achieve more
-	accurate cost allocation reporting. These new features are provided at no
-	additional cost.
-
-### SDK Enhancements
-* `aws/request`: Add retry support for RequestTimeoutException (#1158)
-  * Adds support for retrying RequestTimeoutException error code that is returned by some services.
-
-### SDK Bugs
-* `private/model/api`: Fix Waiter and Paginators panic on nil param inputs (#1157)
-  * Corrects the code generation for Paginators and waiters that caused a panic if nil input parameters were used with the operations.
-Release v1.8.3 (2017-03-27)
-===
-
-## Service Client Updates
-* `service/ssm`: Updates service API, documentation, and paginators
-  * Updated validation rules for SendCommand and RegisterTaskWithMaintenanceWindow APIs.
-Release v1.8.2 (2017-03-24)
-===
-
-Service Client Updates
----
-* `service/applicationautoscaling`: Updates service API, documentation, and paginators
-  * Application AutoScaling is launching support for a new target resource (AppStream 2.0 Fleets) as a scalable target.
-* `service/cloudtrail`: Updates service API and documentation
-  * Doc-only Update for CloudTrail: Add required parameters for GetEventSelectors and PutEventSelectors
-
-Release v1.8.1 (2017-03-23)
-===
-
-Service Client Updates
----
-* `service/applicationdiscoveryservice`: Updates service API, documentation, and paginators
-  * Adds export configuration options to the AWS Discovery Service API.
-* `service/elbv2`: Updates waiters
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/lambda`: Updates service API and paginators
-  * Adds support for new runtime Node.js v6.10 for AWS Lambda service
-
-Release v1.8.0 (2017-03-22)
-===
-
-Service Client Updates
----
-* `service/codebuild`: Updates service documentation
-* `service/directconnect`: Updates service API
-  * Deprecated DescribeConnectionLoa, DescribeInterconnectLoa, AllocateConnectionOnInterconnect and DescribeConnectionsOnInterconnect operations in favor of DescribeLoa, DescribeLoa, AllocateHostedConnection and DescribeHostedConnections respectively.
-* `service/marketplacecommerceanalytics`: Updates service API, documentation, and paginators
-  * This update adds a new data set, us_sales_and_use_tax_records, which enables AWS Marketplace sellers to programmatically access to their U.S. Sales and Use Tax report data.
-* `service/pinpoint`: Updates service API and documentation
-  * Amazon Pinpoint User Segmentation
-  * Added ability to segment endpoints by user attributes in addition to endpoint attributes. Amazon Pinpoint Event Stream Preview
-  * Added functionality to publish raw app analytics and campaign events data as events streams to Kinesis and Kinesis Firehose
-  * The feature provides developers with increased flexibility of exporting raw events to S3, Redshift, Elasticsearch using a Kinesis Firehose stream or enable real time event processing use cases using a Kinesis stream
-* `service/rekognition`: Updates service documentation.
-
-SDK Features
----
-* `aws/request`: Add support for context.Context to SDK API operation requests (#1132)
-  * Adds support for context.Context to the SDK by adding `WithContext` methods for each API operation, Paginators and Waiters. e.g `PutObjectWithContext`. This change also adds the ability to provide request functional options to the method calls instead of requiring you to use the `Request` API operation method (e.g `PutObjectRequest`).
-  * Adds a `Complete` Request handler list that will be called ever time a request is completed. This includes both success and failure. Complete will only be called once per API operation request.
-  * `private/waiter` package moved from the private group to `aws/request/waiter` and made publicly available.
-  * Adds Context support to all API operations, Waiters(WaitUntil) and Paginators(Pages) methods.
-  * Adds Context support for s3manager and s3crypto clients.
-
-SDK Enhancements
----
-* `aws/signer/v4`: Adds support for unsigned payload signer config (#1130)
-  * Adds configuration option to the v4.Signer to specify the request's body should not be signed. This will only correclty function on services that support unsigned payload. e.g. S3, Glacier. 
-
-SDK Bug Fixes
----
-* `service/s3`: Fix S3 HostID to be available in S3 request error message (#1131)
-  * Adds a new type s3.RequestFailure which exposes the S3 HostID value from a S3 API operation response. This is helpful when you have an error with S3, and need to contact support. Both RequestID and HostID are needed.
-* `private/model/api`: Do not return a link if uid is empty (#1133)
-  * Fixes SDK's doc generation to not generate API reference doc links if the SDK us unable to create a valid link.
-* `aws/request`: Optimization to handler list copy to prevent multiple alloc calls. (#1134)
-Release v1.7.9 (2017-03-13)
-===
-
-Service Client Updates
----
-* `service/devicefarm`: Updates service API, documentation, paginators, and examples
-  * Network shaping allows users to simulate network connections and conditions while testing their Android, iOS, and web apps with AWS Device Farm.
-* `service/cloudwatchevents`: Updates service API, documentation, and examples
-
-SDK Enhancement
-===
-* `aws/session`: Add support for side loaded CA bundles (#1117)
-  * Adds supports for side loading Certificate Authority bundle files to the SDK using AWS_CA_BUNDLE environment variable or CustomCABundle session option.
-* `service/s3/s3crypto`: Add support for AES/CBC/PKCS5Padding (#1124)
-
-SDK Bug
-===
-* `service/rds`: Fixing issue when not providing `SourceRegion` on cross
-region operations (#1127)
-* `service/rds`: Enables cross region for `CopyDBClusterSnapshot` and
-`CreateDBCluster` (#1128)
-
-Release v1.7.8 (2017-03-10)
-===
-
-Service Client Updates
----
-* `service/codedeploy`: Updates service paginators
-  * Add paginators for Codedeploy
-* `service/emr`: Updates service API, documentation, and paginators
-  * This release includes support for instance fleets in Amazon EMR.
-
-Release v1.7.7 (2017-03-09)
-===
-
-Service Client Updates
----
-* `service/apigateway`: Updates service API, documentation, and paginators
-  * API Gateway has added support for ACM certificates on custom domain names. Both Amazon-issued certificates and uploaded third-part certificates are supported.
-* `service/clouddirectory`: Updates service API, documentation, and paginators
-  * Introduces a new Cloud Directory API that enables you to retrieve all available parent paths for any type of object (a node, leaf node, policy node, and index node) in a hierarchy.
-
-Release v1.7.6 (2017-03-09)
-===
-
-Service Client Updates
----
-* `service/organizations`: Updates service documentation and examples
-  * Doc-only Update for Organizations: Add SDK Code Snippets
-* `service/workdocs`: Adds new service
-  * The Administrative SDKs for Amazon WorkDocs provides full administrator level access to WorkDocs site resources, allowing developers to integrate their applications to manage WorkDocs users, content and permissions programmatically
-
-Release v1.7.5 (2017-03-08)
-===
-
-Service Client Updates
----
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/rds`: Updates service API and documentation
-  * Add support to using encrypted clusters as cross-region replication masters. Update CopyDBClusterSnapshot API to support encrypted cross region copy of Aurora cluster snapshots.
-
-Release v1.7.4 (2017-03-06)
-===
-
-Service Client Updates
----
-* `service/budgets`: Updates service API and paginators
-  * When creating or editing a budget via the AWS Budgets API you can define notifications that are sent to subscribers when the actual or forecasted value for cost or usage exceeds the notificationThreshold associated with the budget notification object. Starting today, the maximum allowed value for the notificationThreshold was raised from 100 to 300. This change was made to give you more flexibility when setting budget notifications.
-* `service/cloudtrail`: Updates service documentation and paginators
-  * Doc-only update for AWSCloudTrail: Updated links/descriptions
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/opsworkscm`: Updates service API, documentation, and paginators
-  * OpsWorks for Chef Automate has added a new field "AssociatePublicIpAddress" to the CreateServer request, "CloudFormationStackArn" to the Server model and "TERMINATED" server state.
-
-
-Release v1.7.3 (2017-02-28)
-===
-
-Service Client Updates
----
-* `service/mturk`: Renaming service
-  * service/mechanicalturkrequesterservice was renamed to service/mturk. Be sure to change any references of the old client to the new.
-
-Release v1.7.2 (2017-02-28)
-===
-
-Service Client Updates
----
-* `service/dynamodb`: Updates service API and documentation
-  * Release notes: Time to Live (TTL) is a feature that allows you to define when items in a table expire and can be purged from the database, so that you don't have to track expired data and delete it manually. With TTL enabled on a DynamoDB table, you can set a timestamp for deletion on a per-item basis, allowing you to limit storage usage to only those records that are relevant.
-* `service/iam`: Updates service API, documentation, and paginators
-  * This release adds support for AWS Organizations service control policies (SCPs) to SimulatePrincipalPolicy operation. If there are SCPs associated with the simulated user's account, their effect on the result is captured in the OrganizationDecisionDetail element in the EvaluationResult.
-* `service/mechanicalturkrequesterservice`: Adds new service
-  * Amazon Mechanical Turk is a web service that provides an on-demand, scalable, human workforce to complete jobs that humans can do better than computers, for example, recognizing objects in photos.
-* `service/organizations`: Adds new service
-  * AWS Organizations is a web service that enables you to consolidate your multiple AWS accounts into an organization and centrally manage your accounts and their resources.
-* `service/dynamodbstreams`: Updates service API, documentation, and paginators
-* `service/waf`: Updates service API, documentation, and paginators
-  * Aws WAF - For GetSampledRequests action, changed max number of samples from 100 to 500.
-* `service/wafregional`: Updates service API, documentation, and paginators
-
-Release v1.7.1 (2017-02-24)
-===
-
-Service Client Updates
----
-* `service/elasticsearchservice`: Updates service API, documentation, paginators, and examples
-  * Added three new API calls to existing Amazon Elasticsearch service to expose Amazon Elasticsearch imposed limits to customers.
-
-Release v1.7.0 (2017-02-23)
-===
-
-Service Client Updates
----
-* `service/ec2`: Updates service API
-  * New EC2 I3 instance type
-
-SDK Bug
----
-* `service/s3/s3manager`: Adding support for SSE (#1097)
-  * Fixes SSE fields not being applied to a part during multi part upload.
-
-SDK Feature
----
-* `aws/session`: Add support for AssumeRoles with MFA (#1088)
-  * Adds support for assuming IAM roles with MFA enabled. A TokenProvider func was added to stscreds.AssumeRoleProvider that will be called each time the role's credentials need to be refreshed. A basic token provider that sources the MFA token from stdin as stscreds.StdinTokenProvider.
-* `aws/session`: Update SDK examples and docs to use session.Must (#1099)
-  * Updates the SDK's example and docs to use session.Must where possible to highlight its usage as apposed to session error checking that is most cases errors will be terminal to the application anyways.
-Release v1.6.27 (2017-02-22)
-===
-
-Service Client Updates
----
-* `service/clouddirectory`: Updates service documentation
-  * ListObjectAttributes documentation updated based on forum feedback
-* `service/elasticbeanstalk`: Updates service API, documentation, and paginators
-  * Elastic Beanstalk adds support for creating and managing custom platform.
-* `service/gamelift`: Updates service API, documentation, and paginators
-  * Allow developers to configure global queues for creating GameSessions. Allow PlayerData on PlayerSessions to store player-specific data.
-* `service/route53`: Updates service API, documentation, and examples
-  * Added support for operations CreateVPCAssociationAuthorization and DeleteVPCAssociationAuthorization to throw a ConcurrentModification error when a conflicting modification occurs in parallel to the authorizations in place for a given hosted zone.
-
-Release v1.6.26 (2017-02-21)
-===
-
-Service Client Updates
----
-* `service/ec2`: Updates service API and documentation
-  * Added the billingProduct parameter to the RegisterImage API.
-
-Release v1.6.25 (2017-02-17)
-===
-
-Service Client Updates
----
-* `service/directconnect`: Updates service API, documentation, and paginators
-  * This update will introduce the ability for Direct Connect customers to take advantage of Link Aggregation (LAG).     This allows you to bundle many individual physical interfaces into a single logical interface, referred to as a LAG.     This makes administration much simpler as the majority of configuration is done on the LAG while you are free     to add or remove physical interfaces from the bundle as bandwidth demand increases or decreases. A concrete example     of the simplification added by LAG is that customers need only a single BGP session as opposed to one session per     physical connection.
-
-Release v1.6.24 (2017-02-16)
-===
-
-Service Client Updates
----
-* `service/cognitoidentity`: Updates service API, documentation, and paginators
-  * Allow createIdentityPool and updateIdentityPool API to set server side token check value on identity pool
-* `service/configservice`: Updates service API and documentation
-  * AWS Config now supports a new test mode for the PutEvaluations API. Set the TestMode parameter to true in your custom rule to verify whether your AWS Lambda function will deliver evaluation results to AWS Config. No updates occur to your existing evaluations, and evaluation results are not sent to AWS Config.
-
-Release v1.6.23 (2017-02-15)
-===
-
-Service Client Updates
----
-* `service/kms`: Updates service API, documentation, paginators, and examples
-  * his release of AWS Key Management Service introduces the ability to tag keys. Tagging keys can help you organize your keys and track your KMS costs in the cost allocation report. This release also increases the maximum length of a key ID to accommodate ARNs that include a long key alias.
-
-Release v1.6.22 (2017-02-14)
-===
-
-Service Client Updates
----
-* `service/ec2`: Updates service API, documentation, and paginators
-  * Adds support for the new Modify Volumes apis.
-
-Release v1.6.21 (2017-02-11)
-===
-
-Service Client Updates
----
-* `service/storagegateway`: Updates service API, documentation, and paginators
-  * File gateway mode in AWS Storage gateway provides access to objects in S3 as files on a Network File System (NFS) mount point. This is done by creating Nfs file shares using existing APIs CreateNfsFileShare. Using the feature in this update, the customer can restrict the clients that have read/write access to the gateway by specifying the list of clients as a list of IP addresses or CIDR blocks. This list can be specified using the API CreateNfsFileShare while creating new file shares, or UpdateNfsFileShare while update existing file shares. To find out the list of clients that have access, the existing API DescribeNfsFileShare will now output the list of clients that have access.
-
-Release v1.6.20 (2017-02-09)
-===
-
-Service Client Updates
----
-* `service/ec2`: Updates service API and documentation
-  * This feature allows customers to associate an IAM profile to running instances that do not have any.
-* `service/rekognition`: Updates service API and documentation
-  * DetectFaces and IndexFaces operations now return an estimate of the age of the face as an age range.
-
-SDK Features
----
-* `aws/endpoints`: Add option to resolve unknown endpoints (#1074)
-Release v1.6.19 (2017-02-08)
-===
-
-Service Client Updates
----
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/glacier`: Updates service examples
-	* Doc Update
-* `service/lexruntimeservice`: Adds new service
-	* Preview release
-
-SDK Bug Fixes
----
-* `private/protocol/json`: Fixes json to throw an error if a float number is (+/-)Inf and NaN (#1068)
-* `private/model/api`: Fix documentation error listing (#1067)
-
-SDK Features
----
-* `private/model`: Add service response error code generation (#1061)
-
-Release v1.6.18 (2017-01-27)
-===
-
-Service Client Updates
----
-* `service/clouddirectory`: Adds new service
-  * Amazon Cloud Directory is a highly scalable, high performance, multi-tenant directory service in the cloud. Its web-based directories make it easy for you to organize and manage application resources such as users, groups, locations, devices, policies, and the rich relationships between them.
-* `service/codedeploy`: Updates service API, documentation, and paginators
-  * This release of AWS CodeDeploy introduces support for blue/green deployments. In a blue/green deployment, the current set of instances in a deployment group is replaced by new instances that have the latest application revision installed on them. After traffic is rerouted behind a load balancer to the replacement instances, the original instances can be terminated automatically or kept running for other uses.
-* `service/ec2`: Updates service API and documentation
-  * Adds instance health check functionality to replace unhealthy EC2 Spot fleet instances with fresh ones.
-* `service/rds`: Updates service API and documentation
-  * Snapshot Engine Version Upgrade
-
-Release v1.6.17 (2017-01-25)
-===
-
-Service Client Updates
----
-* `service/elbv2`: Updates service API, documentation, and paginators
-  * Application Load Balancers now support native Internet Protocol version 6 (IPv6) in an Amazon Virtual Private Cloud (VPC). With this ability, clients can now connect to the Application Load Balancer in a dual-stack mode via either IPv4 or IPv6.
-* `service/rds`: Updates service API and documentation
-  * Cross Region Read Replica Copying (CreateDBInstanceReadReplica)
-
-Release v1.6.16 (2017-01-24)
-===
-
-Service Client Updates
----
-* `service/codebuild`: Updates service documentation and paginators
-  * Documentation updates
-* `service/codecommit`: Updates service API, documentation, and paginators
-  * AWS CodeCommit now includes the option to view the differences between a commit and its parent commit from within the console. You can view the differences inline (Unified view) or side by side (Split view). To view information about the differences between a commit and something other than its parent, you can use the AWS CLI and the get-differences and get-blob commands, or you can use the GetDifferences and GetBlob APIs.
-* `service/ecs`: Updates service API and documentation
-  * Amazon ECS now supports a state for container instances that can be used to drain a container instance in preparation for maintenance or cluster scale down.
-
-Release v1.6.15 (2017-01-20)
-===
-
-Service Client Updates
----
-* `service/acm`: Updates service API, documentation, and paginators
-  * Update for AWS Certificate Manager: Updated response elements for DescribeCertificate API in support of managed renewal
-* `service/health`: Updates service documentation
-
-Release v1.6.14 (2017-01-19)
-===
-
-Service Client Updates
----
-* `service/ec2`: Updates service API, documentation, and paginators
-  * Amazon EC2 Spot instances now support dedicated tenancy, providing the ability to run Spot instances single-tenant manner on physically isolated hardware within a VPC to satisfy security, privacy, or other compliance requirements. Dedicated Spot instances can be requested using RequestSpotInstances and RequestSpotFleet.
-
-Release v1.6.13 (2017-01-18)
-===
-
-Service Client Updates
----
-* `service/rds`: Updates service API, documentation, and paginators
-
-Release v1.6.12 (2017-01-17)
-===
-
-Service Client Updates
----
-* `service/dynamodb`: Updates service API, documentation, and paginators
-  * Tagging Support for Amazon DynamoDB Tables and Indexes
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/glacier`: Updates service API, paginators, and examples
-  * Doc-only Update for Glacier: Added code snippets
-* `service/polly`: Updates service documentation and examples
-  * Doc-only update for Amazon Polly -- added snippets
-* `service/rekognition`: Updates service documentation and paginators
-  * Added code samples to Rekognition reference topics.
-* `service/route53`: Updates service API and paginators
-  * Add ca-central-1 and eu-west-2 enum values to CloudWatchRegion enum
-
-Release v1.6.11 (2017-01-16)
-===
-
-Service Client Updates
----
-* `service/configservice`: Updates service API, documentation, and paginators
-* `service/costandusagereportservice`: Adds new service
-  * The AWS Cost and Usage Report Service API allows you to enable and disable the Cost & Usage report, as well as modify the report name, the data granularity, and the delivery preferences.
-* `service/dynamodb`: Updates service API, documentation, and examples
-  * Snippets for the DynamoDB API.
-* `service/elasticache`: Updates service API, documentation, and examples
-  * Adds new code examples.
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-
-Release v1.6.10 (2017-01-04)
-===
-
-Service Client Updates
----
-* `service/configservice`: Updates service API and documentation
-  * AWSConfig is planning to add support for OversizedConfigurationItemChangeNotification message type in putConfigRule. After this release customers can use/write rules based on OversizedConfigurationItemChangeNotification mesage type.
-* `service/efs`: Updates service API, documentation, and examples
-  * Doc-only Update for EFS: Added code snippets
-* `service/iam`: Updates service documentation and examples
-* `service/lambda`: Updates service documentation and examples
-  * Doc only updates for Lambda: Added code snippets
-* `service/marketplacecommerceanalytics`: Updates service API and documentation
-  * Added support for data set disbursed_amount_by_instance_hours, with historical data available starting 2012-09-04. New data is published to this data set every 30 days.
-* `service/rds`: Updates service documentation
-  * Updated documentation for CopyDBSnapshot.
-* `service/rekognition`: Updates service documentation and examples
-  * Doc-only Update for Rekognition: Added code snippets
-* `service/snowball`: Updates service examples
-* `service/dynamodbstreams`: Updates service API and examples
-  * Doc-only Update for DynamoDB Streams:  Added code snippets
-
-SDK Feature
----
-* `private/model/api`: Increasing the readability of code generated files. (#1024)
-Release v1.6.9 (2016-12-30)
-===
-
-Service Client Updates
----
-* `service/codedeploy`: Updates service API and documentation
-  * CodeDeploy will support Iam Session Arns in addition to Iam User Arns for on premise host authentication.
-* `service/ecs`: Updates service API and documentation
-  * Amazon EC2 Container Service (ECS) now supports the ability to customize the placement of tasks on container instances.
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-
-Release v1.6.8 (2016-12-22)
-===
-
-Service Client Updates
----
-* `service/apigateway`: Updates service API and documentation
-  * Amazon API Gateway is adding support for generating SDKs in more languages. This update introduces two new operations used to dynamically discover these SDK types and what configuration each type accepts.
-* `service/directoryservice`: Updates service documentation
-  * Added code snippets for the DS SDKs
-* `service/elasticbeanstalk`: Updates service API and documentation
-* `service/iam`: Updates service API and documentation
-  * Adds service-specific credentials to IAM service to make it easier to onboard CodeCommit customers.  These are username/password credentials that work with a single service.
-* `service/kms`: Updates service API, documentation, and examples
-  * Update docs and add SDK examples
-
-Release v1.6.7 (2016-12-22)
-===
-
-Service Client Updates
----
-* `service/ecr`: Updates service API and documentation
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/rds`: Updates service API and documentation
-  * Cross Region Encrypted Snapshot Copying (CopyDBSnapshot)
-
-Release v1.6.6 (2016-12-20)
-===
-
-Service Client Updates
----
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/firehose`: Updates service API, documentation, and examples
-  * Processing feature enables users to process and modify records before Amazon Firehose delivers them to destinations.
-* `service/route53`: Updates service API and documentation
-  * Enum updates for eu-west-2 and ca-central-1
-* `service/storagegateway`: Updates service API, documentation, and examples
-  * File gateway is a new mode in the AWS Storage Gateway that support a file interface into S3, alongside the current block-based volume and VTL storage. File gateway combines a service and virtual software appliance, enabling you to store and retrieve objects in Amazon S3 using industry standard file protocols such as NFS. The software appliance, or gateway, is deployed into your on-premises environment as a virtual machine (VM) running on VMware ESXi. The gateway provides access to objects in S3 as files on a Network File System (NFS) mount point.
-
-Release v1.6.5 (2016-12-19)
-===
-
-Service Client Updates
----
-* `service/cloudformation`: Updates service documentation
-  * Minor doc update for CloudFormation.
-* `service/cloudtrail`: Updates service paginators
-* `service/cognitoidentity`: Updates service API and documentation
-  * We are adding Groups to Cognito user pools. Developers can perform CRUD operations on groups, add and remove users from groups, list users in groups, etc. We are adding fine-grained role-based access control for Cognito identity pools. Developers can configure an identity pool to get the IAM role from an authenticated user's token, or they can configure rules that will map a user to a different role
-* `service/applicationdiscoveryservice`: Updates service API and documentation
-  * Adds new APIs to group discovered servers into Applications with get summary and neighbors. Includes additional filters for ListConfigurations and DescribeAgents API.
-* `service/inspector`: Updates service API, documentation, and examples
-  * Doc-only Update for Inspector: Adding SDK code snippets for Inspector
-* `service/sqs`: Updates service documentation
-
-SDK Bug Fixes
----
-* `aws/request`: Add PriorRequestNotComplete to throttle retry codes (#1011)
-  * Fixes: Not retrying when PriorRequestNotComplete #1009
-
-SDK Feature
----
-* `private/model/api`: Adds crosslinking to service documentation (#1010)
-
-Release v1.6.4 (2016-12-15)
-===
-
-Service Client Updates
----
-* `service/cognitoidentityprovider`: Updates service API and documentation
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/ssm`: Updates service API and documentation
-  * This will provide customers with access to the Patch Baseline and Patch Compliance APIs.
-
-SDK Bug Fixes
----
-* `service/route53`: Fix URL path cleaning for Route53 API requests (#1006)
-  * Fixes: SerializationError when using Route53 ChangeResourceRecordSets #1005
-* `aws/request`: Add PriorRequestNotComplete to throttle retry codes (#1002)
-  * Fixes: Not retrying when PriorRequestNotComplete #1001
-
-Release v1.6.3 (2016-12-14)
-===
-
-Service Client Updates
----
-* `service/batch`: Adds new service
-  * AWS Batch is a batch computing service that lets customers define queues and compute environments and then submit work as batch jobs.
-* `service/databasemigrationservice`: Updates service API and documentation
-  * Adds support for SSL enabled Oracle endpoints and task modification.
-* `service/elasticbeanstalk`: Updates service documentation
-* `aws/endpoints`: Updated Regions and Endpoints metadata.
-* `service/cloudwatchlogs`: Updates service API and documentation
-  * Add support for associating LogGroups with AWSTagris tags
-* `service/marketplacecommerceanalytics`: Updates service API and documentation
-  * Add new enum to DataSetType: sales_compensation_billed_revenue
-* `service/rds`: Updates service documentation
-  * Doc-only Update for RDS: New versions available in CreateDBInstance
-* `service/sts`: Updates service documentation
-  * Adding Code Snippet Examples for SDKs for STS
-
-SDK Bug Fixes
----
-* `aws/request`: Fix retrying timeout requests (#981)
-  * Fixes: Requests Retrying is broken if the error was caused due to a client timeout #947
-* `aws/request`: Fix for Go 1.8 request incorrectly sent with body (#991)
-  * Fixes: service/route53: ListHostedZones hangs and then fails with go1.8 #984
-* private/protocol/rest: Use RawPath instead of Opaque (#993)
-  * Fixes: HTTP2 request failing with REST protocol services, e.g AWS X-Ray
-* private/model/api: Generate REST-JSON JSONVersion correctly (#998)
-  * Fixes: REST-JSON protocol service code missing JSONVersion metadata.
-
-Release v1.6.2 (2016-12-08)
-===
-
-Service Client Updates
----
-* `service/cloudfront`: Add lambda function associations to cache behaviors
-* `service/codepipeline`: This is a doc-only update request to incorporate some recent minor revisions to the doc content.
-* `service/rds`: Updates service API and documentation
-* `service/wafregional`: With this new feature, customers can use AWS WAF directly on Application Load Balancers in a VPC within available regions to protect their websites and web services from malicious attacks such as SQL injection, Cross Site Scripting, bad bots, etc.
-
-Release v1.6.1 (2016-12-07)
-===
-
-Service Client Updates
----
-* `service/config`: Updates service API
-* `service/s3`: Updates service API
-* `service/sqs`: Updates service API and documentation
-
-Release v1.6.0 (2016-12-06)
-===
-
-Service Client Updates
----
-* `service/config`: Updates service API and documentation
-* `service/ec2`: Updates service API
-* `service/sts`: Updates service API, documentation, and examples
-
-SDK Bug Fixes
----
-* private/protocol/xml/xmlutil: Fix SDK XML unmarshaler #975
-  * Fixes GetBucketACL Grantee required type always nil. #916
-
-SDK Feature
----
-* aws/endpoints: Add endpoint metadata to SDK #961
-  * Adds Region and Endpoint metadata to the SDK. This allows you to enumerate regions and endpoint metadata based on a defined model embedded in the SDK.
-
-Release v1.5.13 (2016-12-01)
-===
-
-Service Client Updates
----
-* `service/apigateway`: Updates service API and documentation
-* `service/appstream`: Adds new service
-* `service/codebuild`: Adds new service
-* `service/directconnect`: Updates service API and documentation
-* `service/ec2`: Adds new service
-* `service/elasticbeanstalk`: Updates service API and documentation
-* `service/health`: Adds new service
-* `service/lambda`: Updates service API and documentation
-* `service/opsworkscm`: Adds new service
-* `service/pinpoint`: Adds new service
-* `service/shield`: Adds new service
-* `service/ssm`: Updates service API and documentation
-* `service/states`: Adds new service
-* `service/xray`: Adds new service
-
-Release v1.5.12 (2016-11-30)
-===
-
-Service Client Updates
----
-* `service/lightsail`: Adds new service
-* `service/polly`: Adds new service
-* `service/rekognition`: Adds new service
-* `service/snowball`: Updates service API and documentation
-
-Release v1.5.11 (2016-11-29)
-===
-
-Service Client Updates
----
-`service/s3`: Updates service API and documentation
-
-Release v1.5.10 (2016-11-22)
-===
-
-Service Client Updates
----
-* `service/cloudformation`: Updates service API and documentation
-* `service/glacier`: Updates service API, documentation, and examples
-* `service/route53`: Updates service API and documentation
-* `service/s3`: Updates service API and documentation
-
-SDK Bug Fixes
----
-* `private/protocol/xml/xmlutil`: Fixes xml marshaler to unmarshal properly
-into tagged fields 
-[#916](https://github.com/aws/aws-sdk-go/issues/916)
-
-Release v1.5.9 (2016-11-22)
-===
-
-Service Client Updates
----
-* `service/cloudtrail`: Updates service API and documentation
-* `service/ecs`: Updates service API and documentation
-
-Release v1.5.8 (2016-11-18)
-===
-
-Service Client Updates
----
-* `service/application-autoscaling`: Updates service API and documentation
-* `service/elasticmapreduce`: Updates service API and documentation
-* `service/elastictranscoder`: Updates service API, documentation, and examples
-* `service/gamelift`: Updates service API and documentation
-* `service/lambda`: Updates service API and documentation
-
-Release v1.5.7 (2016-11-18)
-===
-
-Service Client Updates
----
-* `service/apigateway`: Updates service API and documentation
-* `service/meteringmarketplace`: Updates service API and documentation
-* `service/monitoring`: Updates service API and documentation
-* `service/sqs`: Updates service API, documentation, and examples
-
-Release v1.5.6 (2016-11-16)
-===
-
-Service Client Updates
----
-`service/route53`: Updates service API and documentation
-`service/servicecatalog`: Updates service API and documentation
-
-Release v1.5.5 (2016-11-15)
-===
-
-Service Client Updates
----
-* `service/ds`: Updates service API and documentation
-* `service/elasticache`: Updates service API and documentation
-* `service/kinesis`: Updates service API and documentation
-
-Release v1.5.4 (2016-11-15)
-===
-
-Service Client Updates
----
-* `service/cognito-idp`: Updates service API and documentation
-
-Release v1.5.3 (2016-11-11)
-===
-
-Service Client Updates
----
-* `service/cloudformation`: Updates service documentation and examples
-* `service/logs`: Updates service API and documentation
-
-Release v1.5.2 (2016-11-03)
-===
-
-Service Client Updates
----
-* `service/directconnect`: Updates service API and documentation
-
-Release v1.5.1 (2016-11-02)
-===
-
-Service Client Updates
----
-* `service/email`: Updates service API and documentation
-
-Release v1.5.0 (2016-11-01)
-===
-
-Service Client Updates
----
-* `service/cloudformation`: Updates service API and documentation
-* `service/ecr`: Updates service paginators
-
-SDK Feature Updates
----
-* `private/model/api`: Add generated setters for API parameters (#918)
-  * Adds setters to the SDK's API parameter types, and are a convenience method that reduce the need to use `aws.String` and like utility. 
-
-Release v1.4.22 (2016-10-25)
-===
-
-Service Client Updates
----
-* `service/elasticloadbalancingv2`: Updates service documentation.
-* `service/autoscaling`: Updates service documentation.
-
-Release v1.4.21 (2016-10-24)
-===
-
-Service Client Updates
----
-* `service/sms`: AWS Server Migration Service (SMS) is an agentless service which makes it easier and faster for you to migrate thousands of on-premises workloads to AWS. AWS SMS allows you to automate, schedule, and track incremental replications of live server volumes, making it easier for you to coordinate large-scale server migrations.
-* `service/ecs`: Updates documentation.
-
-SDK Feature Updates
----
-* `private/models/api`: Improve code generation of documentation.
-
-Release v1.4.20 (2016-10-20)
-===
-
-Service Client Updates
----
-* `service/budgets`: Adds new service, AWS Budgets.
-* `service/waf`: Updates service documentation.
-
-Release v1.4.19 (2016-10-18)
-===
-
-Service Client Updates
----
-* `service/cloudfront`: Updates service API and documentation.
-  * Ability to use Amazon CloudFront to deliver your content both via IPv6 and IPv4 using HTTP/HTTPS.
-* `service/configservice`: Update service API and documentation.
-* `service/iot`: Updates service API and documentation.
-* `service/kinesisanalytics`: Updates service API and documentation.
-  * Whenever Amazon Kinesis Analytics is not able to detect schema for the given streaming source on DiscoverInputSchema API, we would return the raw records that was sampled to detect the schema.
-* `service/rds`: Updates service API and documentation.
-  * Amazon Aurora integrates with other AWS services to allow you to extend your Aurora DB cluster to utilize other capabilities in the AWS cloud. Permission to access other AWS services is granted by creating an IAM role with the necessary permissions, and then associating the role with your DB cluster.
-
-SDK Feature Updates
----
-* `service/dynamodb/dynamodbattribute`: Add UnmarshalListOfMaps #897
-  * Adds support for unmarshaling a list of maps. This is useful for unmarshaling the DynamoDB AttributeValue list of maps returned by APIs like Query and Scan.
-
-Release v1.4.18 (2016-10-17)
-===
-
-Service Model Updates
----
-* `service/route53`: Updates service API and documentation.
-
-Release v1.4.17
-===
-
-Service Model Updates
----
-* `service/acm`: Update service API, and documentation.
-  * This change allows users to import third-party SSL/TLS certificates into ACM.
-* `service/elasticbeanstalk`: Update service API, documentation, and pagination.
-  * Elastic Beanstalk DescribeApplicationVersions API is being updated to support pagination.
-* `service/gamelift`: Update service API, and documentation.
-  * New APIs to protect game developer resource (builds, alias, fleets, instances, game sessions and player sessions) against abuse.
-
-SDK Features
----
-* `service/s3`: Add support for accelerate with dualstack [#887](https://github.com/aws/aws-sdk-go/issues/887)
-
-Release v1.4.16 (2016-10-13)
-===
-
-Service Model Updates
----
-* `service/ecr`: Update Amazon EC2 Container Registry service model
-  * DescribeImages is a new api used to expose image metadata which today includes image size and image creation timestamp.
-* `service/elasticache`: Update Amazon ElastiCache service model
-  * Elasticache is launching a new major engine release of Redis, 3.2 (providing stability updates and new command sets over 2.8), as well as ElasticSupport for enabling Redis Cluster in 3.2, which provides support for multiple node groups to horizontally scale data, as well as superior engine failover capabilities 
-
-SDK Bug Fixes
----
-* `aws/session`: Skip shared config on read errors [#883](https://github.com/aws/aws-sdk-go/issues/883)
-* `aws/signer/v4`: Add support for URL.EscapedPath to signer [#885](https://github.com/aws/aws-sdk-go/issues/885)
-
-SDK Features
----
-* `private/model/api`: Add docs for errors to API operations [#881](https://github.com/aws/aws-sdk-go/issues/881)
-* `private/model/api`: Improve field and waiter doc strings [#879](https://github.com/aws/aws-sdk-go/issues/879)
-* `service/dynamodb/dynamodbattribute`: Allow multiple struct tag elements [#886](https://github.com/aws/aws-sdk-go/issues/886)
-* Add build tags to internal SDK tools [#880](https://github.com/aws/aws-sdk-go/issues/880)
-
-Release v1.4.15 (2016-10-06)
-===
-
-Service Model Updates
----
-* `service/cognitoidentityprovider`: Update Amazon Cognito Identity Provider service model
-* `service/devicefarm`: Update AWS Device Farm documentation
-* `service/opsworks`: Update AWS OpsWorks service model
-* `service/s3`: Update Amazon Simple Storage Service model
-* `service/waf`: Update AWS WAF service model
-
-SDK Bug Fixes
----
-* `aws/request`: Fix HTTP Request Body race condition [#874](https://github.com/aws/aws-sdk-go/issues/874)
-
-SDK Feature Updates
----
-* `aws/ec2metadata`: Add support for EC2 User Data [#872](https://github.com/aws/aws-sdk-go/issues/872)
-* `aws/signer/v4`: Remove logic determining if request needs to be resigned [#876](https://github.com/aws/aws-sdk-go/issues/876)
-
-Release v1.4.14 (2016-09-29)
-===
-* `service/ec2`:  api, documentation, and paginators updates.
-* `service/s3`:  api and documentation updates.
-
-Release v1.4.13 (2016-09-27)
-===
-* `service/codepipeline`:  documentation updates.
-* `service/cloudformation`:  api and documentation updates.
-* `service/kms`:  documentation updates.
-* `service/elasticfilesystem`:  documentation updates.
-* `service/snowball`:  documentation updates.
diff --git a/vendor/github.com/aws/aws-sdk-go/CHANGELOG_PENDING.md b/vendor/github.com/aws/aws-sdk-go/CHANGELOG_PENDING.md
deleted file mode 100644
index 8a1927a39c..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/CHANGELOG_PENDING.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### SDK Features
-
-### SDK Enhancements
-
-### SDK Bugs
diff --git a/vendor/github.com/aws/aws-sdk-go/CONTRIBUTING.md b/vendor/github.com/aws/aws-sdk-go/CONTRIBUTING.md
deleted file mode 100644
index 7c0186f0c9..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/CONTRIBUTING.md
+++ /dev/null
@@ -1,127 +0,0 @@
-Contributing to the AWS SDK for Go
-
-We work hard to provide a high-quality and useful SDK, and we greatly value
-feedback and contributions from our community. Whether it's a bug report,
-new feature, correction, or additional documentation, we welcome your issues
-and pull requests. Please read through this document before submitting any
-issues or pull requests to ensure we have all the necessary information to
-effectively respond to your bug report or contribution.
-
-
-## Filing Bug Reports
-
-You can file bug reports against the SDK on the [GitHub issues][issues] page.
-
-If you are filing a report for a bug or regression in the SDK, it's extremely
-helpful to provide as much information as possible when opening the original
-issue. This helps us reproduce and investigate the possible bug without having
-to wait for this extra information to be provided. Please read the following
-guidelines prior to filing a bug report.
-
-1. Search through existing [issues][] to ensure that your specific issue has
-   not yet been reported. If it is a common issue, it is likely there is
-   already a bug report for your problem.
-
-2. Ensure that you have tested the latest version of the SDK. Although you
-   may have an issue against an older version of the SDK, we cannot provide
-   bug fixes for old versions. It's also possible that the bug may have been
-   fixed in the latest release.
-
-3. Provide as much information about your environment, SDK version, and
-   relevant dependencies as possible. For example, let us know what version
-   of Go you are using, which and version of the operating system, and the
-   the environment your code is running in. e.g Container.
-
-4. Provide a minimal test case that reproduces your issue or any error
-   information you related to your problem. We can provide feedback much
-   more quickly if we know what operations you are calling in the SDK. If
-   you cannot provide a full test case, provide as much code as you can
-   to help us diagnose the problem. Any relevant information should be provided
-   as well, like whether this is a persistent issue, or if it only occurs
-   some of the time.
-
-
-## Submitting Pull Requests
-
-We are always happy to receive code and documentation contributions to the SDK.
-Please be aware of the following notes prior to opening a pull request:
-
-1. The SDK is released under the [Apache license][license]. Any code you submit
-   will be released under that license. For substantial contributions, we may
-   ask you to sign a [Contributor License Agreement (CLA)][cla].
-
-2. If you would like to implement support for a significant feature that is not
-   yet available in the SDK, please talk to us beforehand to avoid any
-   duplication of effort.
-
-3. Wherever possible, pull requests should contain tests as appropriate.
-   Bugfixes should contain tests that exercise the corrected behavior (i.e., the
-   test should fail without the bugfix and pass with it), and new features 
-   should be accompanied by tests exercising the feature.
-
-4. Pull requests that contain failing tests will not be merged until the test
-   failures are addressed. Pull requests that cause a significant drop in the
-   SDK's test coverage percentage are unlikely to be merged until tests have
-   been added.
-
-5. The JSON files under the SDK's `models` folder are sourced from outside the SDK.
-   Such as `models/apis/ec2/2016-11-15/api.json`. We will not accept pull requests
-   directly on these models. If you discover an issue with the models please
-   create a Github [issue](issues) describing the issue.
-
-### Testing
-
-To run the tests locally, running the `make unit` command will `go get` the 
-SDK's testing dependencies, and run vet, link and unit tests for the SDK.
-
-```
-make unit
-```
-
-Standard go testing functionality is supported as well. To test SDK code that
-is tagged with `codegen` you'll need to set the build tag in the go test
-command. The `make unit` command will do this automatically.
-
-```
-go test -tags codegen ./private/...
-```
-
-See the `Makefile` for additional testing tags that can be used in testing.
-
-To test on multiple platform the SDK includes several DockerFiles under the 
-`awstesting/sandbox` folder, and associated make recipes to to execute
-unit testing within environments configured for specific Go versions.
-
-```
-make sandbox-test-go18
-```
-
-To run all sandbox environments use the following make recipe
-
-```
-# Optionally update the Go tip that will be used during the batch testing
-make update-aws-golang-tip
-
-# Run all SDK tests for supported Go versions in sandboxes
-make sandbox-test
-```
-
-In addition the sandbox environment include make recipes for interactive modes
-so you can run command within the Docker container and context of the SDK.
-
-```
-make sandbox-go18
-```
-
-### Changelog
-
-You can see all release changes in the `CHANGELOG.md` file at the root of the
-repository. The release notes added to this file will contain service client
-updates, and major SDK changes.
-
-[issues]: https://github.com/aws/aws-sdk-go/issues
-[pr]: https://github.com/aws/aws-sdk-go/pulls
-[license]: http://aws.amazon.com/apache2.0/
-[cla]: http://en.wikipedia.org/wiki/Contributor_License_Agreement
-[releasenotes]: https://github.com/aws/aws-sdk-go/releases
-
diff --git a/vendor/github.com/aws/aws-sdk-go/LICENSE.txt b/vendor/github.com/aws/aws-sdk-go/LICENSE.txt
deleted file mode 100644
index d645695673..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/aws/aws-sdk-go/Makefile b/vendor/github.com/aws/aws-sdk-go/Makefile
deleted file mode 100644
index df9803c2a2..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/Makefile
+++ /dev/null
@@ -1,180 +0,0 @@
-LINTIGNOREDOT='awstesting/integration.+should not use dot imports'
-LINTIGNOREDOC='service/[^/]+/(api|service|waiters)\.go:.+(comment on exported|should have comment or be unexported)'
-LINTIGNORECONST='service/[^/]+/(api|service|waiters)\.go:.+(type|struct field|const|func) ([^ ]+) should be ([^ ]+)'
-LINTIGNORESTUTTER='service/[^/]+/(api|service)\.go:.+(and that stutters)'
-LINTIGNOREINFLECT='service/[^/]+/(api|errors|service)\.go:.+(method|const) .+ should be '
-LINTIGNOREINFLECTS3UPLOAD='service/s3/s3manager/upload\.go:.+struct field SSEKMSKeyId should be '
-LINTIGNOREDEPS='vendor/.+\.go'
-LINTIGNOREPKGCOMMENT='service/[^/]+/doc_custom.go:.+package comment should be of the form'
-UNIT_TEST_TAGS="example codegen awsinclude"
-
-SDK_WITH_VENDOR_PKGS=$(shell go list -tags ${UNIT_TEST_TAGS} ./... | grep -v "/vendor/src")
-SDK_ONLY_PKGS=$(shell go list ./... | grep -v "/vendor/")
-SDK_UNIT_TEST_ONLY_PKGS=$(shell go list -tags ${UNIT_TEST_TAGS} ./... | grep -v "/vendor/")
-SDK_GO_1_4=$(shell go version | grep "go1.4")
-SDK_GO_1_5=$(shell go version | grep "go1.5")
-SDK_GO_VERSION=$(shell go version | awk '''{print $$3}''' | tr -d '''\n''')
-
-all: get-deps generate unit
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  api_info                to print a list of services and versions"
-	@echo "  docs                    to build SDK documentation"
-	@echo "  build                   to go build the SDK"
-	@echo "  unit                    to run unit tests"
-	@echo "  integration             to run integration tests"
-	@echo "  performance             to run performance tests"
-	@echo "  verify                  to verify tests"
-	@echo "  lint                    to lint the SDK"
-	@echo "  vet                     to vet the SDK"
-	@echo "  generate                to go generate and make services"
-	@echo "  gen-test                to generate protocol tests"
-	@echo "  gen-services            to generate services"
-	@echo "  get-deps                to go get the SDK dependencies"
-	@echo "  get-deps-tests          to get the SDK's test dependencies"
-	@echo "  get-deps-verify         to get the SDK's verification dependencies"
-
-generate: gen-test gen-endpoints gen-services
-
-gen-test: gen-protocol-test
-
-gen-services:
-	go generate ./service
-
-gen-protocol-test:
-	go generate ./private/protocol/...
-
-gen-endpoints:
-	go generate ./models/endpoints/
-
-build:
-	@echo "go build SDK and vendor packages"
-	@go build ${SDK_ONLY_PKGS}
-
-unit: get-deps-tests build verify
-	@echo "go test SDK and vendor packages"
-	@go test -tags ${UNIT_TEST_TAGS} $(SDK_UNIT_TEST_ONLY_PKGS)
-
-unit-with-race-cover: get-deps-tests build verify
-	@echo "go test SDK and vendor packages"
-	@go test -tags ${UNIT_TEST_TAGS} -race -cpu=1,2,4 $(SDK_UNIT_TEST_ONLY_PKGS)
-
-integration: get-deps-tests integ-custom smoke-tests performance
-
-integ-custom:
-	go test -tags "integration" ./awstesting/integration/customizations/...
-
-cleanup-integ:
-	go run -tags "integration" ./awstesting/cmd/bucket_cleanup/main.go "aws-sdk-go-integration"
-
-smoke-tests: get-deps-tests
-	gucumber -go-tags "integration" ./awstesting/integration/smoke
-
-performance: get-deps-tests
-	AWS_TESTING_LOG_RESULTS=${log-detailed} AWS_TESTING_REGION=$(region) AWS_TESTING_DB_TABLE=$(table) gucumber -go-tags "integration" ./awstesting/performance
-
-sandbox-tests: sandbox-test-go15 sandbox-test-go15-novendorexp sandbox-test-go16 sandbox-test-go17 sandbox-test-go18 sandbox-test-gotip
-
-sandbox-build-go15:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.5 -t "aws-sdk-go-1.5" .
-sandbox-go15: sandbox-build-go15
-	docker run -i -t aws-sdk-go-1.5 bash
-sandbox-test-go15: sandbox-build-go15
-	docker run -t aws-sdk-go-1.5
-
-sandbox-build-go15-novendorexp:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.5-novendorexp -t "aws-sdk-go-1.5-novendorexp" .
-sandbox-go15-novendorexp: sandbox-build-go15-novendorexp
-	docker run -i -t aws-sdk-go-1.5-novendorexp bash
-sandbox-test-go15-novendorexp: sandbox-build-go15-novendorexp
-	docker run -t aws-sdk-go-1.5-novendorexp
-
-sandbox-build-go16:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.6 -t "aws-sdk-go-1.6" .
-sandbox-go16: sandbox-build-go16
-	docker run -i -t aws-sdk-go-1.6 bash
-sandbox-test-go16: sandbox-build-go16
-	docker run -t aws-sdk-go-1.6
-
-sandbox-build-go17:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.7 -t "aws-sdk-go-1.7" .
-sandbox-go17: sandbox-build-go17
-	docker run -i -t aws-sdk-go-1.7 bash
-sandbox-test-go17: sandbox-build-go17
-	docker run -t aws-sdk-go-1.7
-
-sandbox-build-go18:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.8 -t "aws-sdk-go-1.8" .
-sandbox-go18: sandbox-build-go18
-	docker run -i -t aws-sdk-go-1.8 bash
-sandbox-test-go18: sandbox-build-go18
-	docker run -t aws-sdk-go-1.8
-
-sandbox-build-gotip:
-	@echo "Run make update-aws-golang-tip, if this test fails because missing aws-golang:tip container"
-	docker build -f ./awstesting/sandbox/Dockerfile.test.gotip -t "aws-sdk-go-tip" .
-sandbox-gotip: sandbox-build-gotip
-	docker run -i -t aws-sdk-go-tip bash
-sandbox-test-gotip: sandbox-build-gotip
-	docker run -t aws-sdk-go-tip
-
-update-aws-golang-tip:
-	docker build --no-cache=true -f ./awstesting/sandbox/Dockerfile.golang-tip -t "aws-golang:tip" .
-
-verify: get-deps-verify lint vet
-
-lint:
-	@echo "go lint SDK and vendor packages"
-	@lint=`if [ \( -z "${SDK_GO_1_4}" \) -a \( -z "${SDK_GO_1_5}" \) ]; then  golint ./...; else echo "skipping golint"; fi`; \
-	lint=`echo "$$lint" | grep -E -v -e ${LINTIGNOREDOT} -e ${LINTIGNOREDOC} -e ${LINTIGNORECONST} -e ${LINTIGNORESTUTTER} -e ${LINTIGNOREINFLECT} -e ${LINTIGNOREDEPS} -e ${LINTIGNOREINFLECTS3UPLOAD} -e ${LINTIGNOREPKGCOMMENT}`; \
-	echo "$$lint"; \
-	if [ "$$lint" != "" ] && [ "$$lint" != "skipping golint" ]; then exit 1; fi
-
-SDK_BASE_FOLDERS=$(shell ls -d */ | grep -v vendor | grep -v awsmigrate)
-ifneq (,$(findstring go1.4, ${SDK_GO_VERSION}))
-	GO_VET_CMD=echo skipping go vet, ${SDK_GO_VERSION}
-else ifneq (,$(findstring go1.6, ${SDK_GO_VERSION}))
-	GO_VET_CMD=go tool vet --all -shadow -example=false
-else
-	GO_VET_CMD=go tool vet --all -shadow
-endif
-
-vet:
-	${GO_VET_CMD} ${SDK_BASE_FOLDERS}
-
-get-deps: get-deps-tests get-deps-verify
-	@echo "go get SDK dependencies"
-	@go get -v $(SDK_ONLY_PKGS)
-
-get-deps-tests:
-	@echo "go get SDK testing dependencies"
-	go get github.com/gucumber/gucumber/cmd/gucumber
-	go get github.com/stretchr/testify
-	go get github.com/smartystreets/goconvey
-	go get golang.org/x/net/html
-	go get golang.org/x/net/http2
-
-get-deps-verify:
-	@echo "go get SDK verification utilities"
-	@if [ \( -z "${SDK_GO_1_4}" \) -a \( -z "${SDK_GO_1_5}" \) ]; then  go get github.com/golang/lint/golint; else echo "skipped getting golint"; fi
-
-bench:
-	@echo "go bench SDK packages"
-	@go test -run NONE -bench . -benchmem -tags 'bench' $(SDK_ONLY_PKGS)
-
-bench-protocol:
-	@echo "go bench SDK protocol marshallers"
-	@go test -run NONE -bench . -benchmem -tags 'bench' ./private/protocol/...
-
-docs:
-	@echo "generate SDK docs"
-	@# This env variable, DOCS, is for internal use
-	@if [ -z ${AWS_DOC_GEN_TOOL} ]; then\
-		rm -rf doc && bundle install && bundle exec yard;\
-	else\
-		$(AWS_DOC_GEN_TOOL) `pwd`;\
-	fi
-
-api_info:
-	@go run private/model/cli/api-info/api-info.go
diff --git a/vendor/github.com/aws/aws-sdk-go/NOTICE.txt b/vendor/github.com/aws/aws-sdk-go/NOTICE.txt
deleted file mode 100644
index 5f14d1162e..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/NOTICE.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-AWS SDK for Go
-Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. 
-Copyright 2014-2015 Stripe, Inc.
diff --git a/vendor/github.com/aws/aws-sdk-go/README.md b/vendor/github.com/aws/aws-sdk-go/README.md
deleted file mode 100644
index 559697f66b..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/README.md
+++ /dev/null
@@ -1,449 +0,0 @@
-[![API Reference](http://img.shields.io/badge/api-reference-blue.svg)](http://docs.aws.amazon.com/sdk-for-go/api) [![Join the chat at https://gitter.im/aws/aws-sdk-go](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/aws/aws-sdk-go?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://img.shields.io/travis/aws/aws-sdk-go.svg)](https://travis-ci.org/aws/aws-sdk-go) [![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/aws/aws-sdk-go/blob/master/LICENSE.txt)
-
-# AWS SDK for Go
-
-aws-sdk-go is the official AWS SDK for the Go programming language.
-
-Checkout our [release notes](https://github.com/aws/aws-sdk-go/releases) for information about the latest bug fixes, updates, and features added to the SDK.
-
-## Installing
-
-If you are using Go 1.5 with the `GO15VENDOREXPERIMENT=1` vendoring flag, or 1.6 and higher you can use the following command to retrieve the SDK. The SDK's non-testing dependencies will be included and are vendored in the `vendor` folder.
-
-    go get -u github.com/aws/aws-sdk-go
-
-Otherwise if your Go environment does not have vendoring support enabled, or you do not want to include the vendored SDK's dependencies you can use the following command to retrieve the SDK and its non-testing dependencies using `go get`.
-
-    go get -u github.com/aws/aws-sdk-go/aws/...
-    go get -u github.com/aws/aws-sdk-go/service/...
-
-If you're looking to retrieve just the SDK without any dependencies use the following command.
-
-    go get -d github.com/aws/aws-sdk-go/
-
-These two processes will still include the `vendor` folder and it should be deleted if its not going to be used by your environment.
-
-    rm -rf $GOPATH/src/github.com/aws/aws-sdk-go/vendor
-
-## Getting Help
-
-Please use these community resources for getting help. We use the GitHub issues for tracking bugs and feature requests.
-
-* Ask a question on [StackOverflow](http://stackoverflow.com/) and tag it with the [`aws-sdk-go`](http://stackoverflow.com/questions/tagged/aws-sdk-go) tag.
-* Come join the AWS SDK for Go community chat on [gitter](https://gitter.im/aws/aws-sdk-go).
-* Open a support ticket with [AWS Support](http://docs.aws.amazon.com/awssupport/latest/user/getting-started.html).
-* If you think you may have found a bug, please open an [issue](https://github.com/aws/aws-sdk-go/issues/new).
-
-## Opening Issues
-
-If you encounter a bug with the AWS SDK for Go we would like to hear about it. Search the [existing issues](https://github.com/aws/aws-sdk-go/issues) and see if others are also experiencing the issue before opening a new issue. Please include the version of AWS SDK for Go, Go language, and OS you’re using. Please also include repro case when appropriate.
-
-The GitHub issues are intended for bug reports and feature requests. For help and questions with using AWS SDK for GO please make use of the resources listed in the [Getting Help](https://github.com/aws/aws-sdk-go#getting-help) section. Keeping the list of open issues lean will help us respond in a timely manner.
-
-## Reference Documentation
-
-[`Getting Started Guide`](https://aws.amazon.com/sdk-for-go/) - This document is a general introduction how to configure and make requests with the SDK. If this is your first time using the SDK, this documentation and the API documentation will help you get started. This document focuses on the syntax and behavior of the SDK. The [Service Developer Guide](https://aws.amazon.com/documentation/) will help you get started using specific AWS services.
-
-[`SDK API Reference Documentation`](https://docs.aws.amazon.com/sdk-for-go/api/) - Use this document to look up all API operation input and output parameters for AWS services supported by the SDK. The API reference also includes documentation of the SDK, and examples how to using the SDK, service client API operations, and API operation require parameters.
-
-[`Service Developer Guide`](https://aws.amazon.com/documentation/) - Use this documentation to learn how to interface with an AWS service. These are great guides both, if you're getting started with a service, or looking for more information on a service. You should not need this document for coding, though in some cases, services may supply helpful samples that you might want to look out for.
-
-[`SDK Examples`](https://github.com/aws/aws-sdk-go/tree/master/example) - Included in the SDK's repo are a several hand crafted examples using the SDK features and AWS services.
-
-## Overview of SDK's Packages
-
-The SDK is composed of two main components, SDK core, and service clients.
-The SDK core packages are all available under the aws package at the root of
-the SDK. Each client for a supported AWS service is available within its own
-package under the service folder at the root of the SDK.
-
-  * aws - SDK core, provides common shared types such as Config, Logger,
-    and utilities to make working with API parameters easier.
-
-      * awserr - Provides the error interface that the SDK will use for all
-        errors that occur in the SDK's processing. This includes service API
-        response errors as well. The Error type is made up of a code and message.
-        Cast the SDK's returned error type to awserr.Error and call the Code
-        method to compare returned error to specific error codes. See the package's
-        documentation for additional values that can be extracted such as RequestID.
-
-      * credentials - Provides the types and built in credentials providers
-        the SDK will use to retrieve AWS credentials to make API requests with.
-        Nested under this folder are also additional credentials providers such as
-        stscreds for assuming IAM roles, and ec2rolecreds for EC2 Instance roles.
-
-      * endpoints - Provides the AWS Regions and Endpoints metadata for the SDK.
-        Use this to lookup AWS service endpoint information such as which services
-        are in a region, and what regions a service is in. Constants are also provided
-        for all region identifiers, e.g UsWest2RegionID for "us-west-2".
-
-      * session - Provides initial default configuration, and load
-        configuration from external sources such as environment and shared
-        credentials file.
-
-      * request - Provides the API request sending, and retry logic for the SDK.
-        This package also includes utilities for defining your own request
-        retryer, and configuring how the SDK processes the request.
-
-  * service - Clients for AWS services. All services supported by the SDK are
-    available under this folder.
-
-## How to Use the SDK's AWS Service Clients
-
-The SDK includes the Go types and utilities you can use to make requests to
-AWS service APIs. Within the service folder at the root of the SDK you'll find
-a package for each AWS service the SDK supports. All service clients follows
-a common pattern of creation and usage.
-
-When creating a client for an AWS service you'll first need to have a Session
-value constructed. The Session provides shared configuration that can be shared
-between your service clients. When service clients are created you can pass
-in additional configuration via the aws.Config type to override configuration
-provided by in the Session to create service client instances with custom
-configuration.
-
-Once the service's client is created you can use it to make API requests the
-AWS service. These clients are safe to use concurrently.
-
-## Configuring the SDK
-
-In the AWS SDK for Go, you can configure settings for service clients, such
-as the log level and maximum number of retries. Most settings are optional;
-however, for each service client, you must specify a region and your credentials.
-The SDK uses these values to send requests to the correct AWS region and sign
-requests with the correct credentials. You can specify these values as part
-of a session or as environment variables.
-
-See the SDK's [configuration guide][config_guide] for more information.
-
-See the [session][session_pkg] package documentation for more information on how to use Session
-with the SDK.
-
-See the [Config][config_typ] type in the [aws][aws_pkg] package for more information on configuration
-options.
-
-[config_guide]: https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html
-[session_pkg]: https://docs.aws.amazon.com/sdk-for-go/api/aws/session/
-[config_typ]: https://docs.aws.amazon.com/sdk-for-go/api/aws/#Config
-[aws_pkg]: https://docs.aws.amazon.com/sdk-for-go/api/aws/
-
-### Configuring Credentials
-
-When using the SDK you'll generally need your AWS credentials to authenticate
-with AWS services. The SDK supports multiple methods of supporting these
-credentials. By default the SDK will source credentials automatically from
-its default credential chain. See the session package for more information
-on this chain, and how to configure it. The common items in the credential
-chain are the following:
-
-  * Environment Credentials - Set of environment variables that are useful
-    when sub processes are created for specific roles.
-
-  * Shared Credentials file (~/.aws/credentials) - This file stores your
-    credentials based on a profile name and is useful for local development.
-
-  * EC2 Instance Role Credentials - Use EC2 Instance Role to assign credentials
-    to application running on an EC2 instance. This removes the need to manage
-    credential files in production.
-
-Credentials can be configured in code as well by setting the Config's Credentials
-value to a custom provider or using one of the providers included with the
-SDK to bypass the default credential chain and use a custom one. This is
-helpful when you want to instruct the SDK to only use a specific set of
-credentials or providers.
-
-This example creates a credential provider for assuming an IAM role, "myRoleARN"
-and configures the S3 service client to use that role for API requests.
-
-```go
-  // Initial credentials loaded from SDK's default credential chain. Such as
-  // the environment, shared credentials (~/.aws/credentials), or EC2 Instance
-  // Role. These credentials will be used to to make the STS Assume Role API.
-  sess := session.Must(session.NewSession())
-
-  // Create the credentials from AssumeRoleProvider to assume the role
-  // referenced by the "myRoleARN" ARN.
-  creds := stscreds.NewCredentials(sess, "myRoleArn")
-
-  // Create service client value configured for credentials
-  // from assumed role.
-  svc := s3.New(sess, &aws.Config{Credentials: creds})/
-```
-
-See the [credentials][credentials_pkg] package documentation for more information on credential
-providers included with the SDK, and how to customize the SDK's usage of
-credentials.
-
-The SDK has support for the shared configuration file (~/.aws/config). This
-support can be enabled by setting the environment variable, "AWS_SDK_LOAD_CONFIG=1",
-or enabling the feature in code when creating a Session via the
-Option's SharedConfigState parameter.
-
-```go
-  sess := session.Must(session.NewSessionWithOptions(session.Options{
-      SharedConfigState: session.SharedConfigEnable,
-  }))
-```
-
-[credentials_pkg]: ttps://docs.aws.amazon.com/sdk-for-go/api/aws/credentials
-
-### Configuring AWS Region
-
-In addition to the credentials you'll need to specify the region the SDK
-will use to make AWS API requests to. In the SDK you can specify the region
-either with an environment variable, or directly in code when a Session or
-service client is created. The last value specified in code wins if the region
-is specified multiple ways.
-
-To set the region via the environment variable set the "AWS_REGION" to the
-region you want to the SDK to use. Using this method to set the region will
-allow you to run your application in multiple regions without needing additional
-code in the application to select the region.
-
-    AWS_REGION=us-west-2
-
-The endpoints package includes constants for all regions the SDK knows. The
-values are all suffixed with RegionID. These values are helpful, because they
-reduce the need to type the region string manually.
-
-To set the region on a Session use the aws package's Config struct parameter
-Region to the AWS region you want the service clients created from the session to
-use. This is helpful when you want to create multiple service clients, and
-all of the clients make API requests to the same region.
-
-```go
-  sess := session.Must(session.NewSession(&aws.Config{
-      Region: aws.String(endpoints.UsWest2RegionID),
-  }))
-```
-
-See the [endpoints][endpoints_pkg] package for the AWS Regions and Endpoints metadata.
-
-In addition to setting the region when creating a Session you can also set
-the region on a per service client bases. This overrides the region of a
-Session. This is helpful when you want to create service clients in specific
-regions different from the Session's region.
-
-```go
-  svc := s3.New(sess, &aws.Config{
-      Region: aws.String(endpoints.UsWest2RegionID),
-  })
-```
-
-See the [Config][config_typ] type in the [aws][aws_pkg] package for more information and additional
-options such as setting the Endpoint, and other service client configuration options.
-
-[endpoints_pkg]: https://docs.aws.amazon.com/sdk-for-go/api/aws/endpoints/
-
-## Making API Requests
-
-Once the client is created you can make an API request to the service.
-Each API method takes a input parameter, and returns the service response
-and an error. The SDK provides methods for making the API call in multiple ways.
-
-In this list we'll use the S3 ListObjects API as an example for the different
-ways of making API requests.
-
-  * ListObjects - Base API operation that will make the API request to the service.
-
-  * ListObjectsRequest - API methods suffixed with Request will construct the
-    API request, but not send it. This is also helpful when you want to get a
-    presigned URL for a request, and share the presigned URL instead of your
-    application making the request directly.
-
-  * ListObjectsPages - Same as the base API operation, but uses a callback to
-    automatically handle pagination of the API's response.
-
-  * ListObjectsWithContext - Same as base API operation, but adds support for
-    the Context pattern. This is helpful for controlling the canceling of in
-    flight requests. See the Go standard library context package for more
-    information. This method also takes request package's Option functional
-    options as the variadic argument for modifying how the request will be
-    made, or extracting information from the raw HTTP response.
-
-  * ListObjectsPagesWithContext - same as ListObjectsPages, but adds support for
-    the Context pattern. Similar to ListObjectsWithContext this method also
-    takes the request package's Option function option types as the variadic
-    argument.
-
-In addition to the API operations the SDK also includes several higher level
-methods that abstract checking for and waiting for an AWS resource to be in
-a desired state. In this list we'll use WaitUntilBucketExists to demonstrate
-the different forms of waiters.
-
-  * WaitUntilBucketExists. - Method to make API request to query an AWS service for
-    a resource's state. Will return successfully when that state is accomplished.
-
-  * WaitUntilBucketExistsWithContext - Same as WaitUntilBucketExists, but adds
-    support for the Context pattern. In addition these methods take request
-    package's WaiterOptions to configure the waiter, and how underlying request
-    will be made by the SDK.
-
-The API method will document which error codes the service might return for
-the operation. These errors will also be available as const strings prefixed
-with "ErrCode" in the service client's package. If there are no errors listed
-in the API's SDK documentation you'll need to consult the AWS service's API
-documentation for the errors that could be returned.
-
-```go
-  ctx := context.Background()
-
-  result, err := svc.GetObjectWithContext(ctx, &s3.GetObjectInput{
-      Bucket: aws.String("my-bucket"),
-      Key: aws.String("my-key"),
-  })
-  if err != nil {
-      // Cast err to awserr.Error to handle specific error codes.
-      aerr, ok := err.(awserr.Error)
-      if ok && aerr.Code() == s3.ErrCodeNoSuchKey {
-          // Specific error code handling
-      }
-      return err
-  }
-
-  // Make sure to close the body when done with it for S3 GetObject APIs or
-  // will leak connections.
-  defer result.Body.Close()
-
-  fmt.Println("Object Size:", aws.StringValue(result.ContentLength))
-```
-
-### API Request Pagination and Resource Waiters
-
-Pagination helper methods are suffixed with "Pages", and provide the
-functionality needed to round trip API page requests. Pagination methods
-take a callback function that will be called for each page of the API's response.
-
-```go
-   objects := []string{}
-   err := svc.ListObjectsPagesWithContext(ctx, &s3.ListObjectsInput{
-       Bucket: aws.String(myBucket),
-   }, func(p *s3.ListObjectsOutput, lastPage bool) bool {
-       for _, o := range p.Contents {
-           objects = append(objects, aws.StringValue(o.Key))
-       }
-       return true // continue paging
-   })
-   if err != nil {
-       panic(fmt.Sprintf("failed to list objects for bucket, %s, %v", myBucket, err))
-   }
-
-   fmt.Println("Objects in bucket:", objects)
-```
-
-Waiter helper methods provide the functionality to wait for an AWS resource
-state. These methods abstract the logic needed to to check the state of an
-AWS resource, and wait until that resource is in a desired state. The waiter
-will block until the resource is in the state that is desired, an error occurs,
-or the waiter times out. If a resource times out the error code returned will
-be request.WaiterResourceNotReadyErrorCode.
-
-```go
-  err := svc.WaitUntilBucketExistsWithContext(ctx, &s3.HeadBucketInput{
-      Bucket: aws.String(myBucket),
-  })
-  if err != nil {
-      aerr, ok := err.(awserr.Error)
-      if ok && aerr.Code() == request.WaiterResourceNotReadyErrorCode {
-          fmt.Fprintf(os.Stderr, "timed out while waiting for bucket to exist")
-      }
-      panic(fmt.Errorf("failed to wait for bucket to exist, %v", err))
-  }
-  fmt.Println("Bucket", myBucket, "exists")
-```
-
-## Complete SDK Example
-
-This example shows a complete working Go file which will upload a file to S3
-and use the Context pattern to implement timeout logic that will cancel the
-request if it takes too long. This example highlights how to use sessions,
-create a service client, make a request, handle the error, and process the
-response.
-
-```go
-  package main
-
-  import (
-  	"context"
-  	"flag"
-  	"fmt"
-  	"os"
-  	"time"
-
-  	"github.com/aws/aws-sdk-go/aws"
-  	"github.com/aws/aws-sdk-go/aws/awserr"
-  	"github.com/aws/aws-sdk-go/aws/request"
-  	"github.com/aws/aws-sdk-go/aws/session"
-  	"github.com/aws/aws-sdk-go/service/s3"
-  )
-
-  // Uploads a file to S3 given a bucket and object key. Also takes a duration
-  // value to terminate the update if it doesn't complete within that time.
-  //
-  // The AWS Region needs to be provided in the AWS shared config or on the
-  // environment variable as `AWS_REGION`. Credentials also must be provided
-  // Will default to shared config file, but can load from environment if provided.
-  //
-  // Usage:
-  //   # Upload myfile.txt to myBucket/myKey. Must complete within 10 minutes or will fail
-  //   go run withContext.go -b mybucket -k myKey -d 10m < myfile.txt
-  func main() {
-  	var bucket, key string
-  	var timeout time.Duration
-
-  	flag.StringVar(&bucket, "b", "", "Bucket name.")
-  	flag.StringVar(&key, "k", "", "Object key name.")
-  	flag.DurationVar(&timeout, "d", 0, "Upload timeout.")
-  	flag.Parse()
-
-  	// All clients require a Session. The Session provides the client with
- 	// shared configuration such as region, endpoint, and credentials. A
- 	// Session should be shared where possible to take advantage of
- 	// configuration and credential caching. See the session package for
- 	// more information.
-  	sess := session.Must(session.NewSession())
-
- 	// Create a new instance of the service's client with a Session.
- 	// Optional aws.Config values can also be provided as variadic arguments
- 	// to the New function. This option allows you to provide service
- 	// specific configuration.
-  	svc := s3.New(sess)
-
-  	// Create a context with a timeout that will abort the upload if it takes
-  	// more than the passed in timeout.
-  	ctx := context.Background()
-  	var cancelFn func()
-  	if timeout > 0 {
-  		ctx, cancelFn = context.WithTimeout(ctx, timeout)
-  	}
-  	// Ensure the context is canceled to prevent leaking.
-  	// See context package for more information, https://golang.org/pkg/context/
-  	defer cancelFn()
-
-  	// Uploads the object to S3. The Context will interrupt the request if the
-  	// timeout expires.
-  	_, err := svc.PutObjectWithContext(ctx, &s3.PutObjectInput{
-  		Bucket: aws.String(bucket),
-  		Key:    aws.String(key),
-  		Body:   os.Stdin,
-  	})
-  	if err != nil {
-  		if aerr, ok := err.(awserr.Error); ok && aerr.Code() == request.CanceledErrorCode {
-  			// If the SDK can determine the request or retry delay was canceled
-  			// by a context the CanceledErrorCode error code will be returned.
-  			fmt.Fprintf(os.Stderr, "upload canceled due to timeout, %v\n", err)
-  		} else {
-  			fmt.Fprintf(os.Stderr, "failed to upload object, %v\n", err)
-  		}
-  		os.Exit(1)
-  	}
-
-  	fmt.Printf("successfully uploaded file to %s/%s\n", bucket, key)
-  }
-```
-
-## License
-
-This SDK is distributed under the
-[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0),
-see LICENSE.txt and NOTICE.txt for more information.
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go
deleted file mode 100644
index 56fdfc2bfc..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Package awserr represents API error interface accessors for the SDK.
-package awserr
-
-// An Error wraps lower level errors with code, message and an original error.
-// The underlying concrete error type may also satisfy other interfaces which
-// can be to used to obtain more specific information about the error.
-//
-// Calling Error() or String() will always include the full information about
-// an error based on its underlying type.
-//
-// Example:
-//
-//     output, err := s3manage.Upload(svc, input, opts)
-//     if err != nil {
-//         if awsErr, ok := err.(awserr.Error); ok {
-//             // Get error details
-//             log.Println("Error:", awsErr.Code(), awsErr.Message())
-//
-//             // Prints out full error message, including original error if there was one.
-//             log.Println("Error:", awsErr.Error())
-//
-//             // Get original error
-//             if origErr := awsErr.OrigErr(); origErr != nil {
-//                 // operate on original error.
-//             }
-//         } else {
-//             fmt.Println(err.Error())
-//         }
-//     }
-//
-type Error interface {
-	// Satisfy the generic error interface.
-	error
-
-	// Returns the short phrase depicting the classification of the error.
-	Code() string
-
-	// Returns the error details message.
-	Message() string
-
-	// Returns the original error if one was set.  Nil is returned if not set.
-	OrigErr() error
-}
-
-// BatchError is a batch of errors which also wraps lower level errors with
-// code, message, and original errors. Calling Error() will include all errors
-// that occurred in the batch.
-//
-// Deprecated: Replaced with BatchedErrors. Only defined for backwards
-// compatibility.
-type BatchError interface {
-	// Satisfy the generic error interface.
-	error
-
-	// Returns the short phrase depicting the classification of the error.
-	Code() string
-
-	// Returns the error details message.
-	Message() string
-
-	// Returns the original error if one was set.  Nil is returned if not set.
-	OrigErrs() []error
-}
-
-// BatchedErrors is a batch of errors which also wraps lower level errors with
-// code, message, and original errors. Calling Error() will include all errors
-// that occurred in the batch.
-//
-// Replaces BatchError
-type BatchedErrors interface {
-	// Satisfy the base Error interface.
-	Error
-
-	// Returns the original error if one was set.  Nil is returned if not set.
-	OrigErrs() []error
-}
-
-// New returns an Error object described by the code, message, and origErr.
-//
-// If origErr satisfies the Error interface it will not be wrapped within a new
-// Error object and will instead be returned.
-func New(code, message string, origErr error) Error {
-	var errs []error
-	if origErr != nil {
-		errs = append(errs, origErr)
-	}
-	return newBaseError(code, message, errs)
-}
-
-// NewBatchError returns an BatchedErrors with a collection of errors as an
-// array of errors.
-func NewBatchError(code, message string, errs []error) BatchedErrors {
-	return newBaseError(code, message, errs)
-}
-
-// A RequestFailure is an interface to extract request failure information from
-// an Error such as the request ID of the failed request returned by a service.
-// RequestFailures may not always have a requestID value if the request failed
-// prior to reaching the service such as a connection error.
-//
-// Example:
-//
-//     output, err := s3manage.Upload(svc, input, opts)
-//     if err != nil {
-//         if reqerr, ok := err.(RequestFailure); ok {
-//             log.Println("Request failed", reqerr.Code(), reqerr.Message(), reqerr.RequestID())
-//         } else {
-//             log.Println("Error:", err.Error())
-//         }
-//     }
-//
-// Combined with awserr.Error:
-//
-//    output, err := s3manage.Upload(svc, input, opts)
-//    if err != nil {
-//        if awsErr, ok := err.(awserr.Error); ok {
-//            // Generic AWS Error with Code, Message, and original error (if any)
-//            fmt.Println(awsErr.Code(), awsErr.Message(), awsErr.OrigErr())
-//
-//            if reqErr, ok := err.(awserr.RequestFailure); ok {
-//                // A service error occurred
-//                fmt.Println(reqErr.StatusCode(), reqErr.RequestID())
-//            }
-//        } else {
-//            fmt.Println(err.Error())
-//        }
-//    }
-//
-type RequestFailure interface {
-	Error
-
-	// The status code of the HTTP response.
-	StatusCode() int
-
-	// The request ID returned by the service for a request failure. This will
-	// be empty if no request ID is available such as the request failed due
-	// to a connection error.
-	RequestID() string
-}
-
-// NewRequestFailure returns a new request error wrapper for the given Error
-// provided.
-func NewRequestFailure(err Error, statusCode int, reqID string) RequestFailure {
-	return newRequestError(err, statusCode, reqID)
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go
deleted file mode 100644
index 0202a008f5..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go
+++ /dev/null
@@ -1,194 +0,0 @@
-package awserr
-
-import "fmt"
-
-// SprintError returns a string of the formatted error code.
-//
-// Both extra and origErr are optional.  If they are included their lines
-// will be added, but if they are not included their lines will be ignored.
-func SprintError(code, message, extra string, origErr error) string {
-	msg := fmt.Sprintf("%s: %s", code, message)
-	if extra != "" {
-		msg = fmt.Sprintf("%s\n\t%s", msg, extra)
-	}
-	if origErr != nil {
-		msg = fmt.Sprintf("%s\ncaused by: %s", msg, origErr.Error())
-	}
-	return msg
-}
-
-// A baseError wraps the code and message which defines an error. It also
-// can be used to wrap an original error object.
-//
-// Should be used as the root for errors satisfying the awserr.Error. Also
-// for any error which does not fit into a specific error wrapper type.
-type baseError struct {
-	// Classification of error
-	code string
-
-	// Detailed information about error
-	message string
-
-	// Optional original error this error is based off of. Allows building
-	// chained errors.
-	errs []error
-}
-
-// newBaseError returns an error object for the code, message, and errors.
-//
-// code is a short no whitespace phrase depicting the classification of
-// the error that is being created.
-//
-// message is the free flow string containing detailed information about the
-// error.
-//
-// origErrs is the error objects which will be nested under the new errors to
-// be returned.
-func newBaseError(code, message string, origErrs []error) *baseError {
-	b := &baseError{
-		code:    code,
-		message: message,
-		errs:    origErrs,
-	}
-
-	return b
-}
-
-// Error returns the string representation of the error.
-//
-// See ErrorWithExtra for formatting.
-//
-// Satisfies the error interface.
-func (b baseError) Error() string {
-	size := len(b.errs)
-	if size > 0 {
-		return SprintError(b.code, b.message, "", errorList(b.errs))
-	}
-
-	return SprintError(b.code, b.message, "", nil)
-}
-
-// String returns the string representation of the error.
-// Alias for Error to satisfy the stringer interface.
-func (b baseError) String() string {
-	return b.Error()
-}
-
-// Code returns the short phrase depicting the classification of the error.
-func (b baseError) Code() string {
-	return b.code
-}
-
-// Message returns the error details message.
-func (b baseError) Message() string {
-	return b.message
-}
-
-// OrigErr returns the original error if one was set. Nil is returned if no
-// error was set. This only returns the first element in the list. If the full
-// list is needed, use BatchedErrors.
-func (b baseError) OrigErr() error {
-	switch len(b.errs) {
-	case 0:
-		return nil
-	case 1:
-		return b.errs[0]
-	default:
-		if err, ok := b.errs[0].(Error); ok {
-			return NewBatchError(err.Code(), err.Message(), b.errs[1:])
-		}
-		return NewBatchError("BatchedErrors",
-			"multiple errors occurred", b.errs)
-	}
-}
-
-// OrigErrs returns the original errors if one was set. An empty slice is
-// returned if no error was set.
-func (b baseError) OrigErrs() []error {
-	return b.errs
-}
-
-// So that the Error interface type can be included as an anonymous field
-// in the requestError struct and not conflict with the error.Error() method.
-type awsError Error
-
-// A requestError wraps a request or service error.
-//
-// Composed of baseError for code, message, and original error.
-type requestError struct {
-	awsError
-	statusCode int
-	requestID  string
-}
-
-// newRequestError returns a wrapped error with additional information for
-// request status code, and service requestID.
-//
-// Should be used to wrap all request which involve service requests. Even if
-// the request failed without a service response, but had an HTTP status code
-// that may be meaningful.
-//
-// Also wraps original errors via the baseError.
-func newRequestError(err Error, statusCode int, requestID string) *requestError {
-	return &requestError{
-		awsError:   err,
-		statusCode: statusCode,
-		requestID:  requestID,
-	}
-}
-
-// Error returns the string representation of the error.
-// Satisfies the error interface.
-func (r requestError) Error() string {
-	extra := fmt.Sprintf("status code: %d, request id: %s",
-		r.statusCode, r.requestID)
-	return SprintError(r.Code(), r.Message(), extra, r.OrigErr())
-}
-
-// String returns the string representation of the error.
-// Alias for Error to satisfy the stringer interface.
-func (r requestError) String() string {
-	return r.Error()
-}
-
-// StatusCode returns the wrapped status code for the error
-func (r requestError) StatusCode() int {
-	return r.statusCode
-}
-
-// RequestID returns the wrapped requestID
-func (r requestError) RequestID() string {
-	return r.requestID
-}
-
-// OrigErrs returns the original errors if one was set. An empty slice is
-// returned if no error was set.
-func (r requestError) OrigErrs() []error {
-	if b, ok := r.awsError.(BatchedErrors); ok {
-		return b.OrigErrs()
-	}
-	return []error{r.OrigErr()}
-}
-
-// An error list that satisfies the golang interface
-type errorList []error
-
-// Error returns the string representation of the error.
-//
-// Satisfies the error interface.
-func (e errorList) Error() string {
-	msg := ""
-	// How do we want to handle the array size being zero
-	if size := len(e); size > 0 {
-		for i := 0; i < size; i++ {
-			msg += fmt.Sprintf("%s", e[i].Error())
-			// We check the next index to see if it is within the slice.
-			// If it is, then we append a newline. We do this, because unit tests
-			// could be broken with the additional '\n'
-			if i+1 < size {
-				msg += "\n"
-			}
-		}
-	}
-	return msg
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
deleted file mode 100644
index 1a3d106d5c..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package awsutil
-
-import (
-	"io"
-	"reflect"
-	"time"
-)
-
-// Copy deeply copies a src structure to dst. Useful for copying request and
-// response structures.
-//
-// Can copy between structs of different type, but will only copy fields which
-// are assignable, and exist in both structs. Fields which are not assignable,
-// or do not exist in both structs are ignored.
-func Copy(dst, src interface{}) {
-	dstval := reflect.ValueOf(dst)
-	if !dstval.IsValid() {
-		panic("Copy dst cannot be nil")
-	}
-
-	rcopy(dstval, reflect.ValueOf(src), true)
-}
-
-// CopyOf returns a copy of src while also allocating the memory for dst.
-// src must be a pointer type or this operation will fail.
-func CopyOf(src interface{}) (dst interface{}) {
-	dsti := reflect.New(reflect.TypeOf(src).Elem())
-	dst = dsti.Interface()
-	rcopy(dsti, reflect.ValueOf(src), true)
-	return
-}
-
-// rcopy performs a recursive copy of values from the source to destination.
-//
-// root is used to skip certain aspects of the copy which are not valid
-// for the root node of a object.
-func rcopy(dst, src reflect.Value, root bool) {
-	if !src.IsValid() {
-		return
-	}
-
-	switch src.Kind() {
-	case reflect.Ptr:
-		if _, ok := src.Interface().(io.Reader); ok {
-			if dst.Kind() == reflect.Ptr && dst.Elem().CanSet() {
-				dst.Elem().Set(src)
-			} else if dst.CanSet() {
-				dst.Set(src)
-			}
-		} else {
-			e := src.Type().Elem()
-			if dst.CanSet() && !src.IsNil() {
-				if _, ok := src.Interface().(*time.Time); !ok {
-					dst.Set(reflect.New(e))
-				} else {
-					tempValue := reflect.New(e)
-					tempValue.Elem().Set(src.Elem())
-					// Sets time.Time's unexported values
-					dst.Set(tempValue)
-				}
-			}
-			if src.Elem().IsValid() {
-				// Keep the current root state since the depth hasn't changed
-				rcopy(dst.Elem(), src.Elem(), root)
-			}
-		}
-	case reflect.Struct:
-		t := dst.Type()
-		for i := 0; i < t.NumField(); i++ {
-			name := t.Field(i).Name
-			srcVal := src.FieldByName(name)
-			dstVal := dst.FieldByName(name)
-			if srcVal.IsValid() && dstVal.CanSet() {
-				rcopy(dstVal, srcVal, false)
-			}
-		}
-	case reflect.Slice:
-		if src.IsNil() {
-			break
-		}
-
-		s := reflect.MakeSlice(src.Type(), src.Len(), src.Cap())
-		dst.Set(s)
-		for i := 0; i < src.Len(); i++ {
-			rcopy(dst.Index(i), src.Index(i), false)
-		}
-	case reflect.Map:
-		if src.IsNil() {
-			break
-		}
-
-		s := reflect.MakeMap(src.Type())
-		dst.Set(s)
-		for _, k := range src.MapKeys() {
-			v := src.MapIndex(k)
-			v2 := reflect.New(v.Type()).Elem()
-			rcopy(v2, v, false)
-			dst.SetMapIndex(k, v2)
-		}
-	default:
-		// Assign the value if possible. If its not assignable, the value would
-		// need to be converted and the impact of that may be unexpected, or is
-		// not compatible with the dst type.
-		if src.Type().AssignableTo(dst.Type()) {
-			dst.Set(src)
-		}
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
deleted file mode 100644
index 59fa4a558a..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package awsutil
-
-import (
-	"reflect"
-)
-
-// DeepEqual returns if the two values are deeply equal like reflect.DeepEqual.
-// In addition to this, this method will also dereference the input values if
-// possible so the DeepEqual performed will not fail if one parameter is a
-// pointer and the other is not.
-//
-// DeepEqual will not perform indirection of nested values of the input parameters.
-func DeepEqual(a, b interface{}) bool {
-	ra := reflect.Indirect(reflect.ValueOf(a))
-	rb := reflect.Indirect(reflect.ValueOf(b))
-
-	if raValid, rbValid := ra.IsValid(), rb.IsValid(); !raValid && !rbValid {
-		// If the elements are both nil, and of the same type the are equal
-		// If they are of different types they are not equal
-		return reflect.TypeOf(a) == reflect.TypeOf(b)
-	} else if raValid != rbValid {
-		// Both values must be valid to be equal
-		return false
-	}
-
-	return reflect.DeepEqual(ra.Interface(), rb.Interface())
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
deleted file mode 100644
index 11c52c3896..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
+++ /dev/null
@@ -1,222 +0,0 @@
-package awsutil
-
-import (
-	"reflect"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/jmespath/go-jmespath"
-)
-
-var indexRe = regexp.MustCompile(`(.+)\[(-?\d+)?\]$`)
-
-// rValuesAtPath returns a slice of values found in value v. The values
-// in v are explored recursively so all nested values are collected.
-func rValuesAtPath(v interface{}, path string, createPath, caseSensitive, nilTerm bool) []reflect.Value {
-	pathparts := strings.Split(path, "||")
-	if len(pathparts) > 1 {
-		for _, pathpart := range pathparts {
-			vals := rValuesAtPath(v, pathpart, createPath, caseSensitive, nilTerm)
-			if len(vals) > 0 {
-				return vals
-			}
-		}
-		return nil
-	}
-
-	values := []reflect.Value{reflect.Indirect(reflect.ValueOf(v))}
-	components := strings.Split(path, ".")
-	for len(values) > 0 && len(components) > 0 {
-		var index *int64
-		var indexStar bool
-		c := strings.TrimSpace(components[0])
-		if c == "" { // no actual component, illegal syntax
-			return nil
-		} else if caseSensitive && c != "*" && strings.ToLower(c[0:1]) == c[0:1] {
-			// TODO normalize case for user
-			return nil // don't support unexported fields
-		}
-
-		// parse this component
-		if m := indexRe.FindStringSubmatch(c); m != nil {
-			c = m[1]
-			if m[2] == "" {
-				index = nil
-				indexStar = true
-			} else {
-				i, _ := strconv.ParseInt(m[2], 10, 32)
-				index = &i
-				indexStar = false
-			}
-		}
-
-		nextvals := []reflect.Value{}
-		for _, value := range values {
-			// pull component name out of struct member
-			if value.Kind() != reflect.Struct {
-				continue
-			}
-
-			if c == "*" { // pull all members
-				for i := 0; i < value.NumField(); i++ {
-					if f := reflect.Indirect(value.Field(i)); f.IsValid() {
-						nextvals = append(nextvals, f)
-					}
-				}
-				continue
-			}
-
-			value = value.FieldByNameFunc(func(name string) bool {
-				if c == name {
-					return true
-				} else if !caseSensitive && strings.ToLower(name) == strings.ToLower(c) {
-					return true
-				}
-				return false
-			})
-
-			if nilTerm && value.Kind() == reflect.Ptr && len(components[1:]) == 0 {
-				if !value.IsNil() {
-					value.Set(reflect.Zero(value.Type()))
-				}
-				return []reflect.Value{value}
-			}
-
-			if createPath && value.Kind() == reflect.Ptr && value.IsNil() {
-				// TODO if the value is the terminus it should not be created
-				// if the value to be set to its position is nil.
-				value.Set(reflect.New(value.Type().Elem()))
-				value = value.Elem()
-			} else {
-				value = reflect.Indirect(value)
-			}
-
-			if value.Kind() == reflect.Slice || value.Kind() == reflect.Map {
-				if !createPath && value.IsNil() {
-					value = reflect.ValueOf(nil)
-				}
-			}
-
-			if value.IsValid() {
-				nextvals = append(nextvals, value)
-			}
-		}
-		values = nextvals
-
-		if indexStar || index != nil {
-			nextvals = []reflect.Value{}
-			for _, valItem := range values {
-				value := reflect.Indirect(valItem)
-				if value.Kind() != reflect.Slice {
-					continue
-				}
-
-				if indexStar { // grab all indices
-					for i := 0; i < value.Len(); i++ {
-						idx := reflect.Indirect(value.Index(i))
-						if idx.IsValid() {
-							nextvals = append(nextvals, idx)
-						}
-					}
-					continue
-				}
-
-				// pull out index
-				i := int(*index)
-				if i >= value.Len() { // check out of bounds
-					if createPath {
-						// TODO resize slice
-					} else {
-						continue
-					}
-				} else if i < 0 { // support negative indexing
-					i = value.Len() + i
-				}
-				value = reflect.Indirect(value.Index(i))
-
-				if value.Kind() == reflect.Slice || value.Kind() == reflect.Map {
-					if !createPath && value.IsNil() {
-						value = reflect.ValueOf(nil)
-					}
-				}
-
-				if value.IsValid() {
-					nextvals = append(nextvals, value)
-				}
-			}
-			values = nextvals
-		}
-
-		components = components[1:]
-	}
-	return values
-}
-
-// ValuesAtPath returns a list of values at the case insensitive lexical
-// path inside of a structure.
-func ValuesAtPath(i interface{}, path string) ([]interface{}, error) {
-	result, err := jmespath.Search(path, i)
-	if err != nil {
-		return nil, err
-	}
-
-	v := reflect.ValueOf(result)
-	if !v.IsValid() || (v.Kind() == reflect.Ptr && v.IsNil()) {
-		return nil, nil
-	}
-	if s, ok := result.([]interface{}); ok {
-		return s, err
-	}
-	if v.Kind() == reflect.Map && v.Len() == 0 {
-		return nil, nil
-	}
-	if v.Kind() == reflect.Slice {
-		out := make([]interface{}, v.Len())
-		for i := 0; i < v.Len(); i++ {
-			out[i] = v.Index(i).Interface()
-		}
-		return out, nil
-	}
-
-	return []interface{}{result}, nil
-}
-
-// SetValueAtPath sets a value at the case insensitive lexical path inside
-// of a structure.
-func SetValueAtPath(i interface{}, path string, v interface{}) {
-	if rvals := rValuesAtPath(i, path, true, false, v == nil); rvals != nil {
-		for _, rval := range rvals {
-			if rval.Kind() == reflect.Ptr && rval.IsNil() {
-				continue
-			}
-			setValue(rval, v)
-		}
-	}
-}
-
-func setValue(dstVal reflect.Value, src interface{}) {
-	if dstVal.Kind() == reflect.Ptr {
-		dstVal = reflect.Indirect(dstVal)
-	}
-	srcVal := reflect.ValueOf(src)
-
-	if !srcVal.IsValid() { // src is literal nil
-		if dstVal.CanAddr() {
-			// Convert to pointer so that pointer's value can be nil'ed
-			//                     dstVal = dstVal.Addr()
-		}
-		dstVal.Set(reflect.Zero(dstVal.Type()))
-
-	} else if srcVal.Kind() == reflect.Ptr {
-		if srcVal.IsNil() {
-			srcVal = reflect.Zero(dstVal.Type())
-		} else {
-			srcVal = reflect.ValueOf(src).Elem()
-		}
-		dstVal.Set(srcVal)
-	} else {
-		dstVal.Set(srcVal)
-	}
-
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
deleted file mode 100644
index 710eb432f8..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/prettify.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package awsutil
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"reflect"
-	"strings"
-)
-
-// Prettify returns the string representation of a value.
-func Prettify(i interface{}) string {
-	var buf bytes.Buffer
-	prettify(reflect.ValueOf(i), 0, &buf)
-	return buf.String()
-}
-
-// prettify will recursively walk value v to build a textual
-// representation of the value.
-func prettify(v reflect.Value, indent int, buf *bytes.Buffer) {
-	for v.Kind() == reflect.Ptr {
-		v = v.Elem()
-	}
-
-	switch v.Kind() {
-	case reflect.Struct:
-		strtype := v.Type().String()
-		if strtype == "time.Time" {
-			fmt.Fprintf(buf, "%s", v.Interface())
-			break
-		} else if strings.HasPrefix(strtype, "io.") {
-			buf.WriteString("<buffer>")
-			break
-		}
-
-		buf.WriteString("{\n")
-
-		names := []string{}
-		for i := 0; i < v.Type().NumField(); i++ {
-			name := v.Type().Field(i).Name
-			f := v.Field(i)
-			if name[0:1] == strings.ToLower(name[0:1]) {
-				continue // ignore unexported fields
-			}
-			if (f.Kind() == reflect.Ptr || f.Kind() == reflect.Slice || f.Kind() == reflect.Map) && f.IsNil() {
-				continue // ignore unset fields
-			}
-			names = append(names, name)
-		}
-
-		for i, n := range names {
-			val := v.FieldByName(n)
-			buf.WriteString(strings.Repeat(" ", indent+2))
-			buf.WriteString(n + ": ")
-			prettify(val, indent+2, buf)
-
-			if i < len(names)-1 {
-				buf.WriteString(",\n")
-			}
-		}
-
-		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
-	case reflect.Slice:
-		strtype := v.Type().String()
-		if strtype == "[]uint8" {
-			fmt.Fprintf(buf, "<binary> len %d", v.Len())
-			break
-		}
-
-		nl, id, id2 := "", "", ""
-		if v.Len() > 3 {
-			nl, id, id2 = "\n", strings.Repeat(" ", indent), strings.Repeat(" ", indent+2)
-		}
-		buf.WriteString("[" + nl)
-		for i := 0; i < v.Len(); i++ {
-			buf.WriteString(id2)
-			prettify(v.Index(i), indent+2, buf)
-
-			if i < v.Len()-1 {
-				buf.WriteString("," + nl)
-			}
-		}
-
-		buf.WriteString(nl + id + "]")
-	case reflect.Map:
-		buf.WriteString("{\n")
-
-		for i, k := range v.MapKeys() {
-			buf.WriteString(strings.Repeat(" ", indent+2))
-			buf.WriteString(k.String() + ": ")
-			prettify(v.MapIndex(k), indent+2, buf)
-
-			if i < v.Len()-1 {
-				buf.WriteString(",\n")
-			}
-		}
-
-		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
-	default:
-		if !v.IsValid() {
-			fmt.Fprint(buf, "<invalid value>")
-			return
-		}
-		format := "%v"
-		switch v.Interface().(type) {
-		case string:
-			format = "%q"
-		case io.ReadSeeker, io.Reader:
-			format = "buffer(%p)"
-		}
-		fmt.Fprintf(buf, format, v.Interface())
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
deleted file mode 100644
index b6432f1a11..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/string_value.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package awsutil
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// StringValue returns the string representation of a value.
-func StringValue(i interface{}) string {
-	var buf bytes.Buffer
-	stringValue(reflect.ValueOf(i), 0, &buf)
-	return buf.String()
-}
-
-func stringValue(v reflect.Value, indent int, buf *bytes.Buffer) {
-	for v.Kind() == reflect.Ptr {
-		v = v.Elem()
-	}
-
-	switch v.Kind() {
-	case reflect.Struct:
-		buf.WriteString("{\n")
-
-		names := []string{}
-		for i := 0; i < v.Type().NumField(); i++ {
-			name := v.Type().Field(i).Name
-			f := v.Field(i)
-			if name[0:1] == strings.ToLower(name[0:1]) {
-				continue // ignore unexported fields
-			}
-			if (f.Kind() == reflect.Ptr || f.Kind() == reflect.Slice) && f.IsNil() {
-				continue // ignore unset fields
-			}
-			names = append(names, name)
-		}
-
-		for i, n := range names {
-			val := v.FieldByName(n)
-			buf.WriteString(strings.Repeat(" ", indent+2))
-			buf.WriteString(n + ": ")
-			stringValue(val, indent+2, buf)
-
-			if i < len(names)-1 {
-				buf.WriteString(",\n")
-			}
-		}
-
-		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
-	case reflect.Slice:
-		nl, id, id2 := "", "", ""
-		if v.Len() > 3 {
-			nl, id, id2 = "\n", strings.Repeat(" ", indent), strings.Repeat(" ", indent+2)
-		}
-		buf.WriteString("[" + nl)
-		for i := 0; i < v.Len(); i++ {
-			buf.WriteString(id2)
-			stringValue(v.Index(i), indent+2, buf)
-
-			if i < v.Len()-1 {
-				buf.WriteString("," + nl)
-			}
-		}
-
-		buf.WriteString(nl + id + "]")
-	case reflect.Map:
-		buf.WriteString("{\n")
-
-		for i, k := range v.MapKeys() {
-			buf.WriteString(strings.Repeat(" ", indent+2))
-			buf.WriteString(k.String() + ": ")
-			stringValue(v.MapIndex(k), indent+2, buf)
-
-			if i < v.Len()-1 {
-				buf.WriteString(",\n")
-			}
-		}
-
-		buf.WriteString("\n" + strings.Repeat(" ", indent) + "}")
-	default:
-		format := "%v"
-		switch v.Interface().(type) {
-		case string:
-			format = "%q"
-		}
-		fmt.Fprintf(buf, format, v.Interface())
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/client.go b/vendor/github.com/aws/aws-sdk-go/aws/client/client.go
deleted file mode 100644
index 788fe6e279..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/client/client.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package client
-
-import (
-	"fmt"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/client/metadata"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// A Config provides configuration to a service client instance.
-type Config struct {
-	Config        *aws.Config
-	Handlers      request.Handlers
-	Endpoint      string
-	SigningRegion string
-	SigningName   string
-}
-
-// ConfigProvider provides a generic way for a service client to receive
-// the ClientConfig without circular dependencies.
-type ConfigProvider interface {
-	ClientConfig(serviceName string, cfgs ...*aws.Config) Config
-}
-
-// ConfigNoResolveEndpointProvider same as ConfigProvider except it will not
-// resolve the endpoint automatically. The service client's endpoint must be
-// provided via the aws.Config.Endpoint field.
-type ConfigNoResolveEndpointProvider interface {
-	ClientConfigNoResolveEndpoint(cfgs ...*aws.Config) Config
-}
-
-// A Client implements the base client request and response handling
-// used by all service clients.
-type Client struct {
-	request.Retryer
-	metadata.ClientInfo
-
-	Config   aws.Config
-	Handlers request.Handlers
-}
-
-// New will return a pointer to a new initialized service client.
-func New(cfg aws.Config, info metadata.ClientInfo, handlers request.Handlers, options ...func(*Client)) *Client {
-	svc := &Client{
-		Config:     cfg,
-		ClientInfo: info,
-		Handlers:   handlers.Copy(),
-	}
-
-	switch retryer, ok := cfg.Retryer.(request.Retryer); {
-	case ok:
-		svc.Retryer = retryer
-	case cfg.Retryer != nil && cfg.Logger != nil:
-		s := fmt.Sprintf("WARNING: %T does not implement request.Retryer; using DefaultRetryer instead", cfg.Retryer)
-		cfg.Logger.Log(s)
-		fallthrough
-	default:
-		maxRetries := aws.IntValue(cfg.MaxRetries)
-		if cfg.MaxRetries == nil || maxRetries == aws.UseServiceDefaultRetries {
-			maxRetries = 3
-		}
-		svc.Retryer = DefaultRetryer{NumMaxRetries: maxRetries}
-	}
-
-	svc.AddDebugHandlers()
-
-	for _, option := range options {
-		option(svc)
-	}
-
-	return svc
-}
-
-// NewRequest returns a new Request pointer for the service API
-// operation and parameters.
-func (c *Client) NewRequest(operation *request.Operation, params interface{}, data interface{}) *request.Request {
-	return request.New(c.Config, c.ClientInfo, c.Handlers, c.Retryer, operation, params, data)
-}
-
-// AddDebugHandlers injects debug logging handlers into the service to log request
-// debug information.
-func (c *Client) AddDebugHandlers() {
-	if !c.Config.LogLevel.AtLeast(aws.LogDebug) {
-		return
-	}
-
-	c.Handlers.Send.PushFrontNamed(request.NamedHandler{Name: "awssdk.client.LogRequest", Fn: logRequest})
-	c.Handlers.Send.PushBackNamed(request.NamedHandler{Name: "awssdk.client.LogResponse", Fn: logResponse})
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
deleted file mode 100644
index e25a460fba..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package client
-
-import (
-	"math/rand"
-	"sync"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// DefaultRetryer implements basic retry logic using exponential backoff for
-// most services. If you want to implement custom retry logic, implement the
-// request.Retryer interface or create a structure type that composes this
-// struct and override the specific methods. For example, to override only
-// the MaxRetries method:
-//
-//		type retryer struct {
-//      client.DefaultRetryer
-//    }
-//
-//    // This implementation always has 100 max retries
-//    func (d retryer) MaxRetries() int { return 100 }
-type DefaultRetryer struct {
-	NumMaxRetries int
-}
-
-// MaxRetries returns the number of maximum returns the service will use to make
-// an individual API request.
-func (d DefaultRetryer) MaxRetries() int {
-	return d.NumMaxRetries
-}
-
-var seededRand = rand.New(&lockedSource{src: rand.NewSource(time.Now().UnixNano())})
-
-// RetryRules returns the delay duration before retrying this request again
-func (d DefaultRetryer) RetryRules(r *request.Request) time.Duration {
-	// Set the upper limit of delay in retrying at ~five minutes
-	minTime := 30
-	throttle := d.shouldThrottle(r)
-	if throttle {
-		minTime = 500
-	}
-
-	retryCount := r.RetryCount
-	if retryCount > 13 {
-		retryCount = 13
-	} else if throttle && retryCount > 8 {
-		retryCount = 8
-	}
-
-	delay := (1 << uint(retryCount)) * (seededRand.Intn(minTime) + minTime)
-	return time.Duration(delay) * time.Millisecond
-}
-
-// ShouldRetry returns true if the request should be retried.
-func (d DefaultRetryer) ShouldRetry(r *request.Request) bool {
-	// If one of the other handlers already set the retry state
-	// we don't want to override it based on the service's state
-	if r.Retryable != nil {
-		return *r.Retryable
-	}
-
-	if r.HTTPResponse.StatusCode >= 500 {
-		return true
-	}
-	return r.IsErrorRetryable() || d.shouldThrottle(r)
-}
-
-// ShouldThrottle returns true if the request should be throttled.
-func (d DefaultRetryer) shouldThrottle(r *request.Request) bool {
-	if r.HTTPResponse.StatusCode == 502 ||
-		r.HTTPResponse.StatusCode == 503 ||
-		r.HTTPResponse.StatusCode == 504 {
-		return true
-	}
-	return r.IsErrorThrottle()
-}
-
-// lockedSource is a thread-safe implementation of rand.Source
-type lockedSource struct {
-	lk  sync.Mutex
-	src rand.Source
-}
-
-func (r *lockedSource) Int63() (n int64) {
-	r.lk.Lock()
-	n = r.src.Int63()
-	r.lk.Unlock()
-	return
-}
-
-func (r *lockedSource) Seed(seed int64) {
-	r.lk.Lock()
-	r.src.Seed(seed)
-	r.lk.Unlock()
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go b/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go
deleted file mode 100644
index 1f39c91f2e..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http/httputil"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-const logReqMsg = `DEBUG: Request %s/%s Details:
----[ REQUEST POST-SIGN ]-----------------------------
-%s
------------------------------------------------------`
-
-const logReqErrMsg = `DEBUG ERROR: Request %s/%s:
----[ REQUEST DUMP ERROR ]-----------------------------
-%s
-------------------------------------------------------`
-
-type logWriter struct {
-	// Logger is what we will use to log the payload of a response.
-	Logger aws.Logger
-	// buf stores the contents of what has been read
-	buf *bytes.Buffer
-}
-
-func (logger *logWriter) Write(b []byte) (int, error) {
-	return logger.buf.Write(b)
-}
-
-type teeReaderCloser struct {
-	// io.Reader will be a tee reader that is used during logging.
-	// This structure will read from a body and write the contents to a logger.
-	io.Reader
-	// Source is used just to close when we are done reading.
-	Source io.ReadCloser
-}
-
-func (reader *teeReaderCloser) Close() error {
-	return reader.Source.Close()
-}
-
-func logRequest(r *request.Request) {
-	logBody := r.Config.LogLevel.Matches(aws.LogDebugWithHTTPBody)
-	dumpedBody, err := httputil.DumpRequestOut(r.HTTPRequest, logBody)
-	if err != nil {
-		r.Config.Logger.Log(fmt.Sprintf(logReqErrMsg, r.ClientInfo.ServiceName, r.Operation.Name, err))
-		return
-	}
-
-	if logBody {
-		// Reset the request body because dumpRequest will re-wrap the r.HTTPRequest's
-		// Body as a NoOpCloser and will not be reset after read by the HTTP
-		// client reader.
-		r.ResetBody()
-	}
-
-	r.Config.Logger.Log(fmt.Sprintf(logReqMsg, r.ClientInfo.ServiceName, r.Operation.Name, string(dumpedBody)))
-}
-
-const logRespMsg = `DEBUG: Response %s/%s Details:
----[ RESPONSE ]--------------------------------------
-%s
------------------------------------------------------`
-
-const logRespErrMsg = `DEBUG ERROR: Response %s/%s:
----[ RESPONSE DUMP ERROR ]-----------------------------
-%s
------------------------------------------------------`
-
-func logResponse(r *request.Request) {
-	lw := &logWriter{r.Config.Logger, bytes.NewBuffer(nil)}
-	r.HTTPResponse.Body = &teeReaderCloser{
-		Reader: io.TeeReader(r.HTTPResponse.Body, lw),
-		Source: r.HTTPResponse.Body,
-	}
-
-	handlerFn := func(req *request.Request) {
-		body, err := httputil.DumpResponse(req.HTTPResponse, false)
-		if err != nil {
-			lw.Logger.Log(fmt.Sprintf(logRespErrMsg, req.ClientInfo.ServiceName, req.Operation.Name, err))
-			return
-		}
-
-		b, err := ioutil.ReadAll(lw.buf)
-		if err != nil {
-			lw.Logger.Log(fmt.Sprintf(logRespErrMsg, req.ClientInfo.ServiceName, req.Operation.Name, err))
-			return
-		}
-		lw.Logger.Log(fmt.Sprintf(logRespMsg, req.ClientInfo.ServiceName, req.Operation.Name, string(body)))
-		if req.Config.LogLevel.Matches(aws.LogDebugWithHTTPBody) {
-			lw.Logger.Log(string(b))
-		}
-	}
-
-	const handlerName = "awsdk.client.LogResponse.ResponseBody"
-
-	r.Handlers.Unmarshal.SetBackNamed(request.NamedHandler{
-		Name: handlerName, Fn: handlerFn,
-	})
-	r.Handlers.UnmarshalError.SetBackNamed(request.NamedHandler{
-		Name: handlerName, Fn: handlerFn,
-	})
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go b/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
deleted file mode 100644
index 4778056ddf..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package metadata
-
-// ClientInfo wraps immutable data from the client.Client structure.
-type ClientInfo struct {
-	ServiceName   string
-	APIVersion    string
-	Endpoint      string
-	SigningName   string
-	SigningRegion string
-	JSONVersion   string
-	TargetPrefix  string
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/config.go b/vendor/github.com/aws/aws-sdk-go/aws/config.go
deleted file mode 100644
index ae3a286960..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/config.go
+++ /dev/null
@@ -1,470 +0,0 @@
-package aws
-
-import (
-	"net/http"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/endpoints"
-)
-
-// UseServiceDefaultRetries instructs the config to use the service's own
-// default number of retries. This will be the default action if
-// Config.MaxRetries is nil also.
-const UseServiceDefaultRetries = -1
-
-// RequestRetryer is an alias for a type that implements the request.Retryer
-// interface.
-type RequestRetryer interface{}
-
-// A Config provides service configuration for service clients. By default,
-// all clients will use the defaults.DefaultConfig tructure.
-//
-//     // Create Session with MaxRetry configuration to be shared by multiple
-//     // service clients.
-//     sess := session.Must(session.NewSession(&aws.Config{
-//         MaxRetries: aws.Int(3),
-//     }))
-//
-//     // Create S3 service client with a specific Region.
-//     svc := s3.New(sess, &aws.Config{
-//         Region: aws.String("us-west-2"),
-//     })
-type Config struct {
-	// Enables verbose error printing of all credential chain errors.
-	// Should be used when wanting to see all errors while attempting to
-	// retrieve credentials.
-	CredentialsChainVerboseErrors *bool
-
-	// The credentials object to use when signing requests. Defaults to a
-	// chain of credential providers to search for credentials in environment
-	// variables, shared credential file, and EC2 Instance Roles.
-	Credentials *credentials.Credentials
-
-	// An optional endpoint URL (hostname only or fully qualified URI)
-	// that overrides the default generated endpoint for a client. Set this
-	// to `""` to use the default generated endpoint.
-	//
-	// @note You must still provide a `Region` value when specifying an
-	//   endpoint for a client.
-	Endpoint *string
-
-	// The resolver to use for looking up endpoints for AWS service clients
-	// to use based on region.
-	EndpointResolver endpoints.Resolver
-
-	// EnforceShouldRetryCheck is used in the AfterRetryHandler to always call
-	// ShouldRetry regardless of whether or not if request.Retryable is set.
-	// This will utilize ShouldRetry method of custom retryers. If EnforceShouldRetryCheck
-	// is not set, then ShouldRetry will only be called if request.Retryable is nil.
-	// Proper handling of the request.Retryable field is important when setting this field.
-	EnforceShouldRetryCheck *bool
-
-	// The region to send requests to. This parameter is required and must
-	// be configured globally or on a per-client basis unless otherwise
-	// noted. A full list of regions is found in the "Regions and Endpoints"
-	// document.
-	//
-	// @see http://docs.aws.amazon.com/general/latest/gr/rande.html
-	//   AWS Regions and Endpoints
-	Region *string
-
-	// Set this to `true` to disable SSL when sending requests. Defaults
-	// to `false`.
-	DisableSSL *bool
-
-	// The HTTP client to use when sending requests. Defaults to
-	// `http.DefaultClient`.
-	HTTPClient *http.Client
-
-	// An integer value representing the logging level. The default log level
-	// is zero (LogOff), which represents no logging. To enable logging set
-	// to a LogLevel Value.
-	LogLevel *LogLevelType
-
-	// The logger writer interface to write logging messages to. Defaults to
-	// standard out.
-	Logger Logger
-
-	// The maximum number of times that a request will be retried for failures.
-	// Defaults to -1, which defers the max retry setting to the service
-	// specific configuration.
-	MaxRetries *int
-
-	// Retryer guides how HTTP requests should be retried in case of
-	// recoverable failures.
-	//
-	// When nil or the value does not implement the request.Retryer interface,
-	// the client.DefaultRetryer will be used.
-	//
-	// When both Retryer and MaxRetries are non-nil, the former is used and
-	// the latter ignored.
-	//
-	// To set the Retryer field in a type-safe manner and with chaining, use
-	// the request.WithRetryer helper function:
-	//
-	//   cfg := request.WithRetryer(aws.NewConfig(), myRetryer)
-	//
-	Retryer RequestRetryer
-
-	// Disables semantic parameter validation, which validates input for
-	// missing required fields and/or other semantic request input errors.
-	DisableParamValidation *bool
-
-	// Disables the computation of request and response checksums, e.g.,
-	// CRC32 checksums in Amazon DynamoDB.
-	DisableComputeChecksums *bool
-
-	// Set this to `true` to force the request to use path-style addressing,
-	// i.e., `http://s3.amazonaws.com/BUCKET/KEY`. By default, the S3 client
-	// will use virtual hosted bucket addressing when possible
-	// (`http://BUCKET.s3.amazonaws.com/KEY`).
-	//
-	// @note This configuration option is specific to the Amazon S3 service.
-	// @see http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html
-	//   Amazon S3: Virtual Hosting of Buckets
-	S3ForcePathStyle *bool
-
-	// Set this to `true` to disable the SDK adding the `Expect: 100-Continue`
-	// header to PUT requests over 2MB of content. 100-Continue instructs the
-	// HTTP client not to send the body until the service responds with a
-	// `continue` status. This is useful to prevent sending the request body
-	// until after the request is authenticated, and validated.
-	//
-	// http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUT.html
-	//
-	// 100-Continue is only enabled for Go 1.6 and above. See `http.Transport`'s
-	// `ExpectContinueTimeout` for information on adjusting the continue wait
-	// timeout. https://golang.org/pkg/net/http/#Transport
-	//
-	// You should use this flag to disble 100-Continue if you experience issues
-	// with proxies or third party S3 compatible services.
-	S3Disable100Continue *bool
-
-	// Set this to `true` to enable S3 Accelerate feature. For all operations
-	// compatible with S3 Accelerate will use the accelerate endpoint for
-	// requests. Requests not compatible will fall back to normal S3 requests.
-	//
-	// The bucket must be enable for accelerate to be used with S3 client with
-	// accelerate enabled. If the bucket is not enabled for accelerate an error
-	// will be returned. The bucket name must be DNS compatible to also work
-	// with accelerate.
-	S3UseAccelerate *bool
-
-	// Set this to `true` to disable the EC2Metadata client from overriding the
-	// default http.Client's Timeout. This is helpful if you do not want the
-	// EC2Metadata client to create a new http.Client. This options is only
-	// meaningful if you're not already using a custom HTTP client with the
-	// SDK. Enabled by default.
-	//
-	// Must be set and provided to the session.NewSession() in order to disable
-	// the EC2Metadata overriding the timeout for default credentials chain.
-	//
-	// Example:
-	//    sess := session.Must(session.NewSession(aws.NewConfig()
-	//       .WithEC2MetadataDiableTimeoutOverride(true)))
-	//
-	//    svc := s3.New(sess)
-	//
-	EC2MetadataDisableTimeoutOverride *bool
-
-	// Instructs the endpiont to be generated for a service client to
-	// be the dual stack endpoint. The dual stack endpoint will support
-	// both IPv4 and IPv6 addressing.
-	//
-	// Setting this for a service which does not support dual stack will fail
-	// to make requets. It is not recommended to set this value on the session
-	// as it will apply to all service clients created with the session. Even
-	// services which don't support dual stack endpoints.
-	//
-	// If the Endpoint config value is also provided the UseDualStack flag
-	// will be ignored.
-	//
-	// Only supported with.
-	//
-	//     sess := session.Must(session.NewSession())
-	//
-	//     svc := s3.New(sess, &aws.Config{
-	//         UseDualStack: aws.Bool(true),
-	//     })
-	UseDualStack *bool
-
-	// SleepDelay is an override for the func the SDK will call when sleeping
-	// during the lifecycle of a request. Specifically this will be used for
-	// request delays. This value should only be used for testing. To adjust
-	// the delay of a request see the aws/client.DefaultRetryer and
-	// aws/request.Retryer.
-	//
-	// SleepDelay will prevent any Context from being used for canceling retry
-	// delay of an API operation. It is recommended to not use SleepDelay at all
-	// and specify a Retryer instead.
-	SleepDelay func(time.Duration)
-
-	// DisableRestProtocolURICleaning will not clean the URL path when making rest protocol requests.
-	// Will default to false. This would only be used for empty directory names in s3 requests.
-	//
-	// Example:
-	//    sess := session.Must(session.NewSession(&aws.Config{
-	//         DisableRestProtocolURICleaning: aws.Bool(true),
-	//    }))
-	//
-	//    svc := s3.New(sess)
-	//    out, err := svc.GetObject(&s3.GetObjectInput {
-	//    	Bucket: aws.String("bucketname"),
-	//    	Key: aws.String("//foo//bar//moo"),
-	//    })
-	DisableRestProtocolURICleaning *bool
-}
-
-// NewConfig returns a new Config pointer that can be chained with builder
-// methods to set multiple configuration values inline without using pointers.
-//
-//     // Create Session with MaxRetry configuration to be shared by multiple
-//     // service clients.
-//     sess := session.Must(session.NewSession(aws.NewConfig().
-//         WithMaxRetries(3),
-//     ))
-//
-//     // Create S3 service client with a specific Region.
-//     svc := s3.New(sess, aws.NewConfig().
-//         WithRegion("us-west-2"),
-//     )
-func NewConfig() *Config {
-	return &Config{}
-}
-
-// WithCredentialsChainVerboseErrors sets a config verbose errors boolean and returning
-// a Config pointer.
-func (c *Config) WithCredentialsChainVerboseErrors(verboseErrs bool) *Config {
-	c.CredentialsChainVerboseErrors = &verboseErrs
-	return c
-}
-
-// WithCredentials sets a config Credentials value returning a Config pointer
-// for chaining.
-func (c *Config) WithCredentials(creds *credentials.Credentials) *Config {
-	c.Credentials = creds
-	return c
-}
-
-// WithEndpoint sets a config Endpoint value returning a Config pointer for
-// chaining.
-func (c *Config) WithEndpoint(endpoint string) *Config {
-	c.Endpoint = &endpoint
-	return c
-}
-
-// WithEndpointResolver sets a config EndpointResolver value returning a
-// Config pointer for chaining.
-func (c *Config) WithEndpointResolver(resolver endpoints.Resolver) *Config {
-	c.EndpointResolver = resolver
-	return c
-}
-
-// WithRegion sets a config Region value returning a Config pointer for
-// chaining.
-func (c *Config) WithRegion(region string) *Config {
-	c.Region = &region
-	return c
-}
-
-// WithDisableSSL sets a config DisableSSL value returning a Config pointer
-// for chaining.
-func (c *Config) WithDisableSSL(disable bool) *Config {
-	c.DisableSSL = &disable
-	return c
-}
-
-// WithHTTPClient sets a config HTTPClient value returning a Config pointer
-// for chaining.
-func (c *Config) WithHTTPClient(client *http.Client) *Config {
-	c.HTTPClient = client
-	return c
-}
-
-// WithMaxRetries sets a config MaxRetries value returning a Config pointer
-// for chaining.
-func (c *Config) WithMaxRetries(max int) *Config {
-	c.MaxRetries = &max
-	return c
-}
-
-// WithDisableParamValidation sets a config DisableParamValidation value
-// returning a Config pointer for chaining.
-func (c *Config) WithDisableParamValidation(disable bool) *Config {
-	c.DisableParamValidation = &disable
-	return c
-}
-
-// WithDisableComputeChecksums sets a config DisableComputeChecksums value
-// returning a Config pointer for chaining.
-func (c *Config) WithDisableComputeChecksums(disable bool) *Config {
-	c.DisableComputeChecksums = &disable
-	return c
-}
-
-// WithLogLevel sets a config LogLevel value returning a Config pointer for
-// chaining.
-func (c *Config) WithLogLevel(level LogLevelType) *Config {
-	c.LogLevel = &level
-	return c
-}
-
-// WithLogger sets a config Logger value returning a Config pointer for
-// chaining.
-func (c *Config) WithLogger(logger Logger) *Config {
-	c.Logger = logger
-	return c
-}
-
-// WithS3ForcePathStyle sets a config S3ForcePathStyle value returning a Config
-// pointer for chaining.
-func (c *Config) WithS3ForcePathStyle(force bool) *Config {
-	c.S3ForcePathStyle = &force
-	return c
-}
-
-// WithS3Disable100Continue sets a config S3Disable100Continue value returning
-// a Config pointer for chaining.
-func (c *Config) WithS3Disable100Continue(disable bool) *Config {
-	c.S3Disable100Continue = &disable
-	return c
-}
-
-// WithS3UseAccelerate sets a config S3UseAccelerate value returning a Config
-// pointer for chaining.
-func (c *Config) WithS3UseAccelerate(enable bool) *Config {
-	c.S3UseAccelerate = &enable
-	return c
-}
-
-// WithUseDualStack sets a config UseDualStack value returning a Config
-// pointer for chaining.
-func (c *Config) WithUseDualStack(enable bool) *Config {
-	c.UseDualStack = &enable
-	return c
-}
-
-// WithEC2MetadataDisableTimeoutOverride sets a config EC2MetadataDisableTimeoutOverride value
-// returning a Config pointer for chaining.
-func (c *Config) WithEC2MetadataDisableTimeoutOverride(enable bool) *Config {
-	c.EC2MetadataDisableTimeoutOverride = &enable
-	return c
-}
-
-// WithSleepDelay overrides the function used to sleep while waiting for the
-// next retry. Defaults to time.Sleep.
-func (c *Config) WithSleepDelay(fn func(time.Duration)) *Config {
-	c.SleepDelay = fn
-	return c
-}
-
-// MergeIn merges the passed in configs into the existing config object.
-func (c *Config) MergeIn(cfgs ...*Config) {
-	for _, other := range cfgs {
-		mergeInConfig(c, other)
-	}
-}
-
-func mergeInConfig(dst *Config, other *Config) {
-	if other == nil {
-		return
-	}
-
-	if other.CredentialsChainVerboseErrors != nil {
-		dst.CredentialsChainVerboseErrors = other.CredentialsChainVerboseErrors
-	}
-
-	if other.Credentials != nil {
-		dst.Credentials = other.Credentials
-	}
-
-	if other.Endpoint != nil {
-		dst.Endpoint = other.Endpoint
-	}
-
-	if other.EndpointResolver != nil {
-		dst.EndpointResolver = other.EndpointResolver
-	}
-
-	if other.Region != nil {
-		dst.Region = other.Region
-	}
-
-	if other.DisableSSL != nil {
-		dst.DisableSSL = other.DisableSSL
-	}
-
-	if other.HTTPClient != nil {
-		dst.HTTPClient = other.HTTPClient
-	}
-
-	if other.LogLevel != nil {
-		dst.LogLevel = other.LogLevel
-	}
-
-	if other.Logger != nil {
-		dst.Logger = other.Logger
-	}
-
-	if other.MaxRetries != nil {
-		dst.MaxRetries = other.MaxRetries
-	}
-
-	if other.Retryer != nil {
-		dst.Retryer = other.Retryer
-	}
-
-	if other.DisableParamValidation != nil {
-		dst.DisableParamValidation = other.DisableParamValidation
-	}
-
-	if other.DisableComputeChecksums != nil {
-		dst.DisableComputeChecksums = other.DisableComputeChecksums
-	}
-
-	if other.S3ForcePathStyle != nil {
-		dst.S3ForcePathStyle = other.S3ForcePathStyle
-	}
-
-	if other.S3Disable100Continue != nil {
-		dst.S3Disable100Continue = other.S3Disable100Continue
-	}
-
-	if other.S3UseAccelerate != nil {
-		dst.S3UseAccelerate = other.S3UseAccelerate
-	}
-
-	if other.UseDualStack != nil {
-		dst.UseDualStack = other.UseDualStack
-	}
-
-	if other.EC2MetadataDisableTimeoutOverride != nil {
-		dst.EC2MetadataDisableTimeoutOverride = other.EC2MetadataDisableTimeoutOverride
-	}
-
-	if other.SleepDelay != nil {
-		dst.SleepDelay = other.SleepDelay
-	}
-
-	if other.DisableRestProtocolURICleaning != nil {
-		dst.DisableRestProtocolURICleaning = other.DisableRestProtocolURICleaning
-	}
-
-	if other.EnforceShouldRetryCheck != nil {
-		dst.EnforceShouldRetryCheck = other.EnforceShouldRetryCheck
-	}
-}
-
-// Copy will return a shallow copy of the Config object. If any additional
-// configurations are provided they will be merged into the new config returned.
-func (c *Config) Copy(cfgs ...*Config) *Config {
-	dst := &Config{}
-	dst.MergeIn(c)
-
-	for _, cfg := range cfgs {
-		dst.MergeIn(cfg)
-	}
-
-	return dst
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/context.go b/vendor/github.com/aws/aws-sdk-go/aws/context.go
deleted file mode 100644
index 79f426853b..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/context.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package aws
-
-import (
-	"time"
-)
-
-// Context is an copy of the Go v1.7 stdlib's context.Context interface.
-// It is represented as a SDK interface to enable you to use the "WithContext"
-// API methods with Go v1.6 and a Context type such as golang.org/x/net/context.
-//
-// See https://golang.org/pkg/context on how to use contexts.
-type Context interface {
-	// Deadline returns the time when work done on behalf of this context
-	// should be canceled. Deadline returns ok==false when no deadline is
-	// set. Successive calls to Deadline return the same results.
-	Deadline() (deadline time.Time, ok bool)
-
-	// Done returns a channel that's closed when work done on behalf of this
-	// context should be canceled. Done may return nil if this context can
-	// never be canceled. Successive calls to Done return the same value.
-	Done() <-chan struct{}
-
-	// Err returns a non-nil error value after Done is closed. Err returns
-	// Canceled if the context was canceled or DeadlineExceeded if the
-	// context's deadline passed. No other values for Err are defined.
-	// After Done is closed, successive calls to Err return the same value.
-	Err() error
-
-	// Value returns the value associated with this context for key, or nil
-	// if no value is associated with key. Successive calls to Value with
-	// the same key returns the same result.
-	//
-	// Use context values only for request-scoped data that transits
-	// processes and API boundaries, not for passing optional parameters to
-	// functions.
-	Value(key interface{}) interface{}
-}
-
-// BackgroundContext returns a context that will never be canceled, has no
-// values, and no deadline. This context is used by the SDK to provide
-// backwards compatibility with non-context API operations and functionality.
-//
-// Go 1.6 and before:
-// This context function is equivalent to context.Background in the Go stdlib.
-//
-// Go 1.7 and later:
-// The context returned will be the value returned by context.Background()
-//
-// See https://golang.org/pkg/context for more information on Contexts.
-func BackgroundContext() Context {
-	return backgroundCtx
-}
-
-// SleepWithContext will wait for the timer duration to expire, or the context
-// is canceled. Which ever happens first. If the context is canceled the Context's
-// error will be returned.
-//
-// Expects Context to always return a non-nil error if the Done channel is closed.
-func SleepWithContext(ctx Context, dur time.Duration) error {
-	t := time.NewTimer(dur)
-	defer t.Stop()
-
-	select {
-	case <-t.C:
-		break
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/context_1_6.go b/vendor/github.com/aws/aws-sdk-go/aws/context_1_6.go
deleted file mode 100644
index e8cf93d269..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/context_1_6.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// +build !go1.7
-
-package aws
-
-import "time"
-
-// An emptyCtx is a copy of the the Go 1.7 context.emptyCtx type. This
-// is copied to provide a 1.6 and 1.5 safe version of context that is compatible
-// with Go 1.7's Context.
-//
-// An emptyCtx is never canceled, has no values, and has no deadline. It is not
-// struct{}, since vars of this type must have distinct addresses.
-type emptyCtx int
-
-func (*emptyCtx) Deadline() (deadline time.Time, ok bool) {
-	return
-}
-
-func (*emptyCtx) Done() <-chan struct{} {
-	return nil
-}
-
-func (*emptyCtx) Err() error {
-	return nil
-}
-
-func (*emptyCtx) Value(key interface{}) interface{} {
-	return nil
-}
-
-func (e *emptyCtx) String() string {
-	switch e {
-	case backgroundCtx:
-		return "aws.BackgroundContext"
-	}
-	return "unknown empty Context"
-}
-
-var (
-	backgroundCtx = new(emptyCtx)
-)
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/context_1_7.go b/vendor/github.com/aws/aws-sdk-go/aws/context_1_7.go
deleted file mode 100644
index 064f75c925..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/context_1_7.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build go1.7
-
-package aws
-
-import "context"
-
-var (
-	backgroundCtx = context.Background()
-)
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go b/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go
deleted file mode 100644
index 3b73a7da7f..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go
+++ /dev/null
@@ -1,369 +0,0 @@
-package aws
-
-import "time"
-
-// String returns a pointer to the string value passed in.
-func String(v string) *string {
-	return &v
-}
-
-// StringValue returns the value of the string pointer passed in or
-// "" if the pointer is nil.
-func StringValue(v *string) string {
-	if v != nil {
-		return *v
-	}
-	return ""
-}
-
-// StringSlice converts a slice of string values into a slice of
-// string pointers
-func StringSlice(src []string) []*string {
-	dst := make([]*string, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// StringValueSlice converts a slice of string pointers into a slice of
-// string values
-func StringValueSlice(src []*string) []string {
-	dst := make([]string, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// StringMap converts a string map of string values into a string
-// map of string pointers
-func StringMap(src map[string]string) map[string]*string {
-	dst := make(map[string]*string)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// StringValueMap converts a string map of string pointers into a string
-// map of string values
-func StringValueMap(src map[string]*string) map[string]string {
-	dst := make(map[string]string)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Bool returns a pointer to the bool value passed in.
-func Bool(v bool) *bool {
-	return &v
-}
-
-// BoolValue returns the value of the bool pointer passed in or
-// false if the pointer is nil.
-func BoolValue(v *bool) bool {
-	if v != nil {
-		return *v
-	}
-	return false
-}
-
-// BoolSlice converts a slice of bool values into a slice of
-// bool pointers
-func BoolSlice(src []bool) []*bool {
-	dst := make([]*bool, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// BoolValueSlice converts a slice of bool pointers into a slice of
-// bool values
-func BoolValueSlice(src []*bool) []bool {
-	dst := make([]bool, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// BoolMap converts a string map of bool values into a string
-// map of bool pointers
-func BoolMap(src map[string]bool) map[string]*bool {
-	dst := make(map[string]*bool)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// BoolValueMap converts a string map of bool pointers into a string
-// map of bool values
-func BoolValueMap(src map[string]*bool) map[string]bool {
-	dst := make(map[string]bool)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Int returns a pointer to the int value passed in.
-func Int(v int) *int {
-	return &v
-}
-
-// IntValue returns the value of the int pointer passed in or
-// 0 if the pointer is nil.
-func IntValue(v *int) int {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// IntSlice converts a slice of int values into a slice of
-// int pointers
-func IntSlice(src []int) []*int {
-	dst := make([]*int, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// IntValueSlice converts a slice of int pointers into a slice of
-// int values
-func IntValueSlice(src []*int) []int {
-	dst := make([]int, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// IntMap converts a string map of int values into a string
-// map of int pointers
-func IntMap(src map[string]int) map[string]*int {
-	dst := make(map[string]*int)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// IntValueMap converts a string map of int pointers into a string
-// map of int values
-func IntValueMap(src map[string]*int) map[string]int {
-	dst := make(map[string]int)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Int64 returns a pointer to the int64 value passed in.
-func Int64(v int64) *int64 {
-	return &v
-}
-
-// Int64Value returns the value of the int64 pointer passed in or
-// 0 if the pointer is nil.
-func Int64Value(v *int64) int64 {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// Int64Slice converts a slice of int64 values into a slice of
-// int64 pointers
-func Int64Slice(src []int64) []*int64 {
-	dst := make([]*int64, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// Int64ValueSlice converts a slice of int64 pointers into a slice of
-// int64 values
-func Int64ValueSlice(src []*int64) []int64 {
-	dst := make([]int64, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// Int64Map converts a string map of int64 values into a string
-// map of int64 pointers
-func Int64Map(src map[string]int64) map[string]*int64 {
-	dst := make(map[string]*int64)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// Int64ValueMap converts a string map of int64 pointers into a string
-// map of int64 values
-func Int64ValueMap(src map[string]*int64) map[string]int64 {
-	dst := make(map[string]int64)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Float64 returns a pointer to the float64 value passed in.
-func Float64(v float64) *float64 {
-	return &v
-}
-
-// Float64Value returns the value of the float64 pointer passed in or
-// 0 if the pointer is nil.
-func Float64Value(v *float64) float64 {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// Float64Slice converts a slice of float64 values into a slice of
-// float64 pointers
-func Float64Slice(src []float64) []*float64 {
-	dst := make([]*float64, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// Float64ValueSlice converts a slice of float64 pointers into a slice of
-// float64 values
-func Float64ValueSlice(src []*float64) []float64 {
-	dst := make([]float64, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// Float64Map converts a string map of float64 values into a string
-// map of float64 pointers
-func Float64Map(src map[string]float64) map[string]*float64 {
-	dst := make(map[string]*float64)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// Float64ValueMap converts a string map of float64 pointers into a string
-// map of float64 values
-func Float64ValueMap(src map[string]*float64) map[string]float64 {
-	dst := make(map[string]float64)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Time returns a pointer to the time.Time value passed in.
-func Time(v time.Time) *time.Time {
-	return &v
-}
-
-// TimeValue returns the value of the time.Time pointer passed in or
-// time.Time{} if the pointer is nil.
-func TimeValue(v *time.Time) time.Time {
-	if v != nil {
-		return *v
-	}
-	return time.Time{}
-}
-
-// TimeUnixMilli returns a Unix timestamp in milliseconds from "January 1, 1970 UTC".
-// The result is undefined if the Unix time cannot be represented by an int64.
-// Which includes calling TimeUnixMilli on a zero Time is undefined.
-//
-// This utility is useful for service API's such as CloudWatch Logs which require
-// their unix time values to be in milliseconds.
-//
-// See Go stdlib https://golang.org/pkg/time/#Time.UnixNano for more information.
-func TimeUnixMilli(t time.Time) int64 {
-	return t.UnixNano() / int64(time.Millisecond/time.Nanosecond)
-}
-
-// TimeSlice converts a slice of time.Time values into a slice of
-// time.Time pointers
-func TimeSlice(src []time.Time) []*time.Time {
-	dst := make([]*time.Time, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// TimeValueSlice converts a slice of time.Time pointers into a slice of
-// time.Time values
-func TimeValueSlice(src []*time.Time) []time.Time {
-	dst := make([]time.Time, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// TimeMap converts a string map of time.Time values into a string
-// map of time.Time pointers
-func TimeMap(src map[string]time.Time) map[string]*time.Time {
-	dst := make(map[string]*time.Time)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// TimeValueMap converts a string map of time.Time pointers into a string
-// map of time.Time values
-func TimeValueMap(src map[string]*time.Time) map[string]time.Time {
-	dst := make(map[string]time.Time)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
deleted file mode 100644
index 495e3ef62c..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
+++ /dev/null
@@ -1,242 +0,0 @@
-package corehandlers
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"regexp"
-	"runtime"
-	"strconv"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// Interface for matching types which also have a Len method.
-type lener interface {
-	Len() int
-}
-
-// BuildContentLengthHandler builds the content length of a request based on the body,
-// or will use the HTTPRequest.Header's "Content-Length" if defined. If unable
-// to determine request body length and no "Content-Length" was specified it will panic.
-//
-// The Content-Length will only be added to the request if the length of the body
-// is greater than 0. If the body is empty or the current `Content-Length`
-// header is <= 0, the header will also be stripped.
-var BuildContentLengthHandler = request.NamedHandler{Name: "core.BuildContentLengthHandler", Fn: func(r *request.Request) {
-	var length int64
-
-	if slength := r.HTTPRequest.Header.Get("Content-Length"); slength != "" {
-		length, _ = strconv.ParseInt(slength, 10, 64)
-	} else {
-		switch body := r.Body.(type) {
-		case nil:
-			length = 0
-		case lener:
-			length = int64(body.Len())
-		case io.Seeker:
-			r.BodyStart, _ = body.Seek(0, 1)
-			end, _ := body.Seek(0, 2)
-			body.Seek(r.BodyStart, 0) // make sure to seek back to original location
-			length = end - r.BodyStart
-		default:
-			panic("Cannot get length of body, must provide `ContentLength`")
-		}
-	}
-
-	if length > 0 {
-		r.HTTPRequest.ContentLength = length
-		r.HTTPRequest.Header.Set("Content-Length", fmt.Sprintf("%d", length))
-	} else {
-		r.HTTPRequest.ContentLength = 0
-		r.HTTPRequest.Header.Del("Content-Length")
-	}
-}}
-
-// SDKVersionUserAgentHandler is a request handler for adding the SDK Version to the user agent.
-var SDKVersionUserAgentHandler = request.NamedHandler{
-	Name: "core.SDKVersionUserAgentHandler",
-	Fn: request.MakeAddToUserAgentHandler(aws.SDKName, aws.SDKVersion,
-		runtime.Version(), runtime.GOOS, runtime.GOARCH),
-}
-
-var reStatusCode = regexp.MustCompile(`^(\d{3})`)
-
-// ValidateReqSigHandler is a request handler to ensure that the request's
-// signature doesn't expire before it is sent. This can happen when a request
-// is built and signed significantly before it is sent. Or significant delays
-// occur when retrying requests that would cause the signature to expire.
-var ValidateReqSigHandler = request.NamedHandler{
-	Name: "core.ValidateReqSigHandler",
-	Fn: func(r *request.Request) {
-		// Unsigned requests are not signed
-		if r.Config.Credentials == credentials.AnonymousCredentials {
-			return
-		}
-
-		signedTime := r.Time
-		if !r.LastSignedAt.IsZero() {
-			signedTime = r.LastSignedAt
-		}
-
-		// 10 minutes to allow for some clock skew/delays in transmission.
-		// Would be improved with aws/aws-sdk-go#423
-		if signedTime.Add(10 * time.Minute).After(time.Now()) {
-			return
-		}
-
-		fmt.Println("request expired, resigning")
-		r.Sign()
-	},
-}
-
-// SendHandler is a request handler to send service request using HTTP client.
-var SendHandler = request.NamedHandler{
-	Name: "core.SendHandler",
-	Fn: func(r *request.Request) {
-		sender := sendFollowRedirects
-		if r.DisableFollowRedirects {
-			sender = sendWithoutFollowRedirects
-		}
-
-		if request.NoBody == r.HTTPRequest.Body {
-			// Strip off the request body if the NoBody reader was used as a
-			// place holder for a request body. This prevents the SDK from
-			// making requests with a request body when it would be invalid
-			// to do so.
-			//
-			// Use a shallow copy of the http.Request to ensure the race condition
-			// of transport on Body will not trigger
-			reqOrig, reqCopy := r.HTTPRequest, *r.HTTPRequest
-			reqCopy.Body = nil
-			r.HTTPRequest = &reqCopy
-			defer func() {
-				r.HTTPRequest = reqOrig
-			}()
-		}
-
-		var err error
-		r.HTTPResponse, err = sender(r)
-		if err != nil {
-			handleSendError(r, err)
-		}
-	},
-}
-
-func sendFollowRedirects(r *request.Request) (*http.Response, error) {
-	return r.Config.HTTPClient.Do(r.HTTPRequest)
-}
-
-func sendWithoutFollowRedirects(r *request.Request) (*http.Response, error) {
-	transport := r.Config.HTTPClient.Transport
-	if transport == nil {
-		transport = http.DefaultTransport
-	}
-
-	return transport.RoundTrip(r.HTTPRequest)
-}
-
-func handleSendError(r *request.Request, err error) {
-	// Prevent leaking if an HTTPResponse was returned. Clean up
-	// the body.
-	if r.HTTPResponse != nil {
-		r.HTTPResponse.Body.Close()
-	}
-	// Capture the case where url.Error is returned for error processing
-	// response. e.g. 301 without location header comes back as string
-	// error and r.HTTPResponse is nil. Other URL redirect errors will
-	// comeback in a similar method.
-	if e, ok := err.(*url.Error); ok && e.Err != nil {
-		if s := reStatusCode.FindStringSubmatch(e.Err.Error()); s != nil {
-			code, _ := strconv.ParseInt(s[1], 10, 64)
-			r.HTTPResponse = &http.Response{
-				StatusCode: int(code),
-				Status:     http.StatusText(int(code)),
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte{})),
-			}
-			return
-		}
-	}
-	if r.HTTPResponse == nil {
-		// Add a dummy request response object to ensure the HTTPResponse
-		// value is consistent.
-		r.HTTPResponse = &http.Response{
-			StatusCode: int(0),
-			Status:     http.StatusText(int(0)),
-			Body:       ioutil.NopCloser(bytes.NewReader([]byte{})),
-		}
-	}
-	// Catch all other request errors.
-	r.Error = awserr.New("RequestError", "send request failed", err)
-	r.Retryable = aws.Bool(true) // network errors are retryable
-
-	// Override the error with a context canceled error, if that was canceled.
-	ctx := r.Context()
-	select {
-	case <-ctx.Done():
-		r.Error = awserr.New(request.CanceledErrorCode,
-			"request context canceled", ctx.Err())
-		r.Retryable = aws.Bool(false)
-	default:
-	}
-}
-
-// ValidateResponseHandler is a request handler to validate service response.
-var ValidateResponseHandler = request.NamedHandler{Name: "core.ValidateResponseHandler", Fn: func(r *request.Request) {
-	if r.HTTPResponse.StatusCode == 0 || r.HTTPResponse.StatusCode >= 300 {
-		// this may be replaced by an UnmarshalError handler
-		r.Error = awserr.New("UnknownError", "unknown error", nil)
-	}
-}}
-
-// AfterRetryHandler performs final checks to determine if the request should
-// be retried and how long to delay.
-var AfterRetryHandler = request.NamedHandler{Name: "core.AfterRetryHandler", Fn: func(r *request.Request) {
-	// If one of the other handlers already set the retry state
-	// we don't want to override it based on the service's state
-	if r.Retryable == nil || aws.BoolValue(r.Config.EnforceShouldRetryCheck) {
-		r.Retryable = aws.Bool(r.ShouldRetry(r))
-	}
-
-	if r.WillRetry() {
-		r.RetryDelay = r.RetryRules(r)
-
-		if sleepFn := r.Config.SleepDelay; sleepFn != nil {
-			// Support SleepDelay for backwards compatibility and testing
-			sleepFn(r.RetryDelay)
-		} else if err := aws.SleepWithContext(r.Context(), r.RetryDelay); err != nil {
-			r.Error = awserr.New(request.CanceledErrorCode,
-				"request context canceled", err)
-			r.Retryable = aws.Bool(false)
-			return
-		}
-
-		// when the expired token exception occurs the credentials
-		// need to be expired locally so that the next request to
-		// get credentials will trigger a credentials refresh.
-		if r.IsErrorExpired() {
-			r.Config.Credentials.Expire()
-		}
-
-		r.RetryCount++
-		r.Error = nil
-	}
-}}
-
-// ValidateEndpointHandler is a request handler to validate a request had the
-// appropriate Region and Endpoint set. Will set r.Error if the endpoint or
-// region is not valid.
-var ValidateEndpointHandler = request.NamedHandler{Name: "core.ValidateEndpointHandler", Fn: func(r *request.Request) {
-	if r.ClientInfo.SigningRegion == "" && aws.StringValue(r.Config.Region) == "" {
-		r.Error = aws.ErrMissingRegion
-	} else if r.ClientInfo.Endpoint == "" {
-		r.Error = aws.ErrMissingEndpoint
-	}
-}}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go
deleted file mode 100644
index 7d50b1557c..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package corehandlers
-
-import "github.com/aws/aws-sdk-go/aws/request"
-
-// ValidateParametersHandler is a request handler to validate the input parameters.
-// Validating parameters only has meaning if done prior to the request being sent.
-var ValidateParametersHandler = request.NamedHandler{Name: "core.ValidateParametersHandler", Fn: func(r *request.Request) {
-	if !r.ParamsFilled() {
-		return
-	}
-
-	if v, ok := r.Params.(request.Validator); ok {
-		if err := v.Validate(); err != nil {
-			r.Error = err
-		}
-	}
-}}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
deleted file mode 100644
index f298d65962..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package credentials
-
-import (
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-var (
-	// ErrNoValidProvidersFoundInChain Is returned when there are no valid
-	// providers in the ChainProvider.
-	//
-	// This has been deprecated. For verbose error messaging set
-	// aws.Config.CredentialsChainVerboseErrors to true
-	//
-	// @readonly
-	ErrNoValidProvidersFoundInChain = awserr.New("NoCredentialProviders",
-		`no valid providers in chain. Deprecated.
-	For verbose messaging see aws.Config.CredentialsChainVerboseErrors`,
-		nil)
-)
-
-// A ChainProvider will search for a provider which returns credentials
-// and cache that provider until Retrieve is called again.
-//
-// The ChainProvider provides a way of chaining multiple providers together
-// which will pick the first available using priority order of the Providers
-// in the list.
-//
-// If none of the Providers retrieve valid credentials Value, ChainProvider's
-// Retrieve() will return the error ErrNoValidProvidersFoundInChain.
-//
-// If a Provider is found which returns valid credentials Value ChainProvider
-// will cache that Provider for all calls to IsExpired(), until Retrieve is
-// called again.
-//
-// Example of ChainProvider to be used with an EnvProvider and EC2RoleProvider.
-// In this example EnvProvider will first check if any credentials are available
-// via the environment variables. If there are none ChainProvider will check
-// the next Provider in the list, EC2RoleProvider in this case. If EC2RoleProvider
-// does not return any credentials ChainProvider will return the error
-// ErrNoValidProvidersFoundInChain
-//
-//     creds := credentials.NewChainCredentials(
-//         []credentials.Provider{
-//             &credentials.EnvProvider{},
-//             &ec2rolecreds.EC2RoleProvider{
-//                 Client: ec2metadata.New(sess),
-//             },
-//         })
-//
-//     // Usage of ChainCredentials with aws.Config
-//     svc := ec2.New(session.Must(session.NewSession(&aws.Config{
-//       Credentials: creds,
-//     })))
-//
-type ChainProvider struct {
-	Providers     []Provider
-	curr          Provider
-	VerboseErrors bool
-}
-
-// NewChainCredentials returns a pointer to a new Credentials object
-// wrapping a chain of providers.
-func NewChainCredentials(providers []Provider) *Credentials {
-	return NewCredentials(&ChainProvider{
-		Providers: append([]Provider{}, providers...),
-	})
-}
-
-// Retrieve returns the credentials value or error if no provider returned
-// without error.
-//
-// If a provider is found it will be cached and any calls to IsExpired()
-// will return the expired state of the cached provider.
-func (c *ChainProvider) Retrieve() (Value, error) {
-	var errs []error
-	for _, p := range c.Providers {
-		creds, err := p.Retrieve()
-		if err == nil {
-			c.curr = p
-			return creds, nil
-		}
-		errs = append(errs, err)
-	}
-	c.curr = nil
-
-	var err error
-	err = ErrNoValidProvidersFoundInChain
-	if c.VerboseErrors {
-		err = awserr.NewBatchError("NoCredentialProviders", "no valid providers in chain", errs)
-	}
-	return Value{}, err
-}
-
-// IsExpired will returned the expired state of the currently cached provider
-// if there is one.  If there is no current provider, true will be returned.
-func (c *ChainProvider) IsExpired() bool {
-	if c.curr != nil {
-		return c.curr.IsExpired()
-	}
-
-	return true
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
deleted file mode 100644
index 42416fc2f0..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
+++ /dev/null
@@ -1,246 +0,0 @@
-// Package credentials provides credential retrieval and management
-//
-// The Credentials is the primary method of getting access to and managing
-// credentials Values. Using dependency injection retrieval of the credential
-// values is handled by a object which satisfies the Provider interface.
-//
-// By default the Credentials.Get() will cache the successful result of a
-// Provider's Retrieve() until Provider.IsExpired() returns true. At which
-// point Credentials will call Provider's Retrieve() to get new credential Value.
-//
-// The Provider is responsible for determining when credentials Value have expired.
-// It is also important to note that Credentials will always call Retrieve the
-// first time Credentials.Get() is called.
-//
-// Example of using the environment variable credentials.
-//
-//     creds := credentials.NewEnvCredentials()
-//
-//     // Retrieve the credentials value
-//     credValue, err := creds.Get()
-//     if err != nil {
-//         // handle error
-//     }
-//
-// Example of forcing credentials to expire and be refreshed on the next Get().
-// This may be helpful to proactively expire credentials and refresh them sooner
-// than they would naturally expire on their own.
-//
-//     creds := credentials.NewCredentials(&ec2rolecreds.EC2RoleProvider{})
-//     creds.Expire()
-//     credsValue, err := creds.Get()
-//     // New credentials will be retrieved instead of from cache.
-//
-//
-// Custom Provider
-//
-// Each Provider built into this package also provides a helper method to generate
-// a Credentials pointer setup with the provider. To use a custom Provider just
-// create a type which satisfies the Provider interface and pass it to the
-// NewCredentials method.
-//
-//     type MyProvider struct{}
-//     func (m *MyProvider) Retrieve() (Value, error) {...}
-//     func (m *MyProvider) IsExpired() bool {...}
-//
-//     creds := credentials.NewCredentials(&MyProvider{})
-//     credValue, err := creds.Get()
-//
-package credentials
-
-import (
-	"sync"
-	"time"
-)
-
-// AnonymousCredentials is an empty Credential object that can be used as
-// dummy placeholder credentials for requests that do not need signed.
-//
-// This Credentials can be used to configure a service to not sign requests
-// when making service API calls. For example, when accessing public
-// s3 buckets.
-//
-//     svc := s3.New(session.Must(session.NewSession(&aws.Config{
-//       Credentials: credentials.AnonymousCredentials,
-//     })))
-//     // Access public S3 buckets.
-//
-// @readonly
-var AnonymousCredentials = NewStaticCredentials("", "", "")
-
-// A Value is the AWS credentials value for individual credential fields.
-type Value struct {
-	// AWS Access key ID
-	AccessKeyID string
-
-	// AWS Secret Access Key
-	SecretAccessKey string
-
-	// AWS Session Token
-	SessionToken string
-
-	// Provider used to get credentials
-	ProviderName string
-}
-
-// A Provider is the interface for any component which will provide credentials
-// Value. A provider is required to manage its own Expired state, and what to
-// be expired means.
-//
-// The Provider should not need to implement its own mutexes, because
-// that will be managed by Credentials.
-type Provider interface {
-	// Retrieve returns nil if it successfully retrieved the value.
-	// Error is returned if the value were not obtainable, or empty.
-	Retrieve() (Value, error)
-
-	// IsExpired returns if the credentials are no longer valid, and need
-	// to be retrieved.
-	IsExpired() bool
-}
-
-// An ErrorProvider is a stub credentials provider that always returns an error
-// this is used by the SDK when construction a known provider is not possible
-// due to an error.
-type ErrorProvider struct {
-	// The error to be returned from Retrieve
-	Err error
-
-	// The provider name to set on the Retrieved returned Value
-	ProviderName string
-}
-
-// Retrieve will always return the error that the ErrorProvider was created with.
-func (p ErrorProvider) Retrieve() (Value, error) {
-	return Value{ProviderName: p.ProviderName}, p.Err
-}
-
-// IsExpired will always return not expired.
-func (p ErrorProvider) IsExpired() bool {
-	return false
-}
-
-// A Expiry provides shared expiration logic to be used by credentials
-// providers to implement expiry functionality.
-//
-// The best method to use this struct is as an anonymous field within the
-// provider's struct.
-//
-// Example:
-//     type EC2RoleProvider struct {
-//         Expiry
-//         ...
-//     }
-type Expiry struct {
-	// The date/time when to expire on
-	expiration time.Time
-
-	// If set will be used by IsExpired to determine the current time.
-	// Defaults to time.Now if CurrentTime is not set.  Available for testing
-	// to be able to mock out the current time.
-	CurrentTime func() time.Time
-}
-
-// SetExpiration sets the expiration IsExpired will check when called.
-//
-// If window is greater than 0 the expiration time will be reduced by the
-// window value.
-//
-// Using a window is helpful to trigger credentials to expire sooner than
-// the expiration time given to ensure no requests are made with expired
-// tokens.
-func (e *Expiry) SetExpiration(expiration time.Time, window time.Duration) {
-	e.expiration = expiration
-	if window > 0 {
-		e.expiration = e.expiration.Add(-window)
-	}
-}
-
-// IsExpired returns if the credentials are expired.
-func (e *Expiry) IsExpired() bool {
-	if e.CurrentTime == nil {
-		e.CurrentTime = time.Now
-	}
-	return e.expiration.Before(e.CurrentTime())
-}
-
-// A Credentials provides synchronous safe retrieval of AWS credentials Value.
-// Credentials will cache the credentials value until they expire. Once the value
-// expires the next Get will attempt to retrieve valid credentials.
-//
-// Credentials is safe to use across multiple goroutines and will manage the
-// synchronous state so the Providers do not need to implement their own
-// synchronization.
-//
-// The first Credentials.Get() will always call Provider.Retrieve() to get the
-// first instance of the credentials Value. All calls to Get() after that
-// will return the cached credentials Value until IsExpired() returns true.
-type Credentials struct {
-	creds        Value
-	forceRefresh bool
-	m            sync.Mutex
-
-	provider Provider
-}
-
-// NewCredentials returns a pointer to a new Credentials with the provider set.
-func NewCredentials(provider Provider) *Credentials {
-	return &Credentials{
-		provider:     provider,
-		forceRefresh: true,
-	}
-}
-
-// Get returns the credentials value, or error if the credentials Value failed
-// to be retrieved.
-//
-// Will return the cached credentials Value if it has not expired. If the
-// credentials Value has expired the Provider's Retrieve() will be called
-// to refresh the credentials.
-//
-// If Credentials.Expire() was called the credentials Value will be force
-// expired, and the next call to Get() will cause them to be refreshed.
-func (c *Credentials) Get() (Value, error) {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	if c.isExpired() {
-		creds, err := c.provider.Retrieve()
-		if err != nil {
-			return Value{}, err
-		}
-		c.creds = creds
-		c.forceRefresh = false
-	}
-
-	return c.creds, nil
-}
-
-// Expire expires the credentials and forces them to be retrieved on the
-// next call to Get().
-//
-// This will override the Provider's expired state, and force Credentials
-// to call the Provider's Retrieve().
-func (c *Credentials) Expire() {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	c.forceRefresh = true
-}
-
-// IsExpired returns if the credentials are no longer valid, and need
-// to be retrieved.
-//
-// If the Credentials were forced to be expired with Expire() this will
-// reflect that override.
-func (c *Credentials) IsExpired() bool {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	return c.isExpired()
-}
-
-// isExpired helper method wrapping the definition of expired credentials.
-func (c *Credentials) isExpired() bool {
-	return c.forceRefresh || c.provider.IsExpired()
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
deleted file mode 100644
index c39749524e..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
+++ /dev/null
@@ -1,178 +0,0 @@
-package ec2rolecreds
-
-import (
-	"bufio"
-	"encoding/json"
-	"fmt"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/client"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/ec2metadata"
-)
-
-// ProviderName provides a name of EC2Role provider
-const ProviderName = "EC2RoleProvider"
-
-// A EC2RoleProvider retrieves credentials from the EC2 service, and keeps track if
-// those credentials are expired.
-//
-// Example how to configure the EC2RoleProvider with custom http Client, Endpoint
-// or ExpiryWindow
-//
-//     p := &ec2rolecreds.EC2RoleProvider{
-//         // Pass in a custom timeout to be used when requesting
-//         // IAM EC2 Role credentials.
-//         Client: ec2metadata.New(sess, aws.Config{
-//             HTTPClient: &http.Client{Timeout: 10 * time.Second},
-//         }),
-//
-//         // Do not use early expiry of credentials. If a non zero value is
-//         // specified the credentials will be expired early
-//         ExpiryWindow: 0,
-//     }
-type EC2RoleProvider struct {
-	credentials.Expiry
-
-	// Required EC2Metadata client to use when connecting to EC2 metadata service.
-	Client *ec2metadata.EC2Metadata
-
-	// ExpiryWindow will allow the credentials to trigger refreshing prior to
-	// the credentials actually expiring. This is beneficial so race conditions
-	// with expiring credentials do not cause request to fail unexpectedly
-	// due to ExpiredTokenException exceptions.
-	//
-	// So a ExpiryWindow of 10s would cause calls to IsExpired() to return true
-	// 10 seconds before the credentials are actually expired.
-	//
-	// If ExpiryWindow is 0 or less it will be ignored.
-	ExpiryWindow time.Duration
-}
-
-// NewCredentials returns a pointer to a new Credentials object wrapping
-// the EC2RoleProvider. Takes a ConfigProvider to create a EC2Metadata client.
-// The ConfigProvider is satisfied by the session.Session type.
-func NewCredentials(c client.ConfigProvider, options ...func(*EC2RoleProvider)) *credentials.Credentials {
-	p := &EC2RoleProvider{
-		Client: ec2metadata.New(c),
-	}
-
-	for _, option := range options {
-		option(p)
-	}
-
-	return credentials.NewCredentials(p)
-}
-
-// NewCredentialsWithClient returns a pointer to a new Credentials object wrapping
-// the EC2RoleProvider. Takes a EC2Metadata client to use when connecting to EC2
-// metadata service.
-func NewCredentialsWithClient(client *ec2metadata.EC2Metadata, options ...func(*EC2RoleProvider)) *credentials.Credentials {
-	p := &EC2RoleProvider{
-		Client: client,
-	}
-
-	for _, option := range options {
-		option(p)
-	}
-
-	return credentials.NewCredentials(p)
-}
-
-// Retrieve retrieves credentials from the EC2 service.
-// Error will be returned if the request fails, or unable to extract
-// the desired credentials.
-func (m *EC2RoleProvider) Retrieve() (credentials.Value, error) {
-	credsList, err := requestCredList(m.Client)
-	if err != nil {
-		return credentials.Value{ProviderName: ProviderName}, err
-	}
-
-	if len(credsList) == 0 {
-		return credentials.Value{ProviderName: ProviderName}, awserr.New("EmptyEC2RoleList", "empty EC2 Role list", nil)
-	}
-	credsName := credsList[0]
-
-	roleCreds, err := requestCred(m.Client, credsName)
-	if err != nil {
-		return credentials.Value{ProviderName: ProviderName}, err
-	}
-
-	m.SetExpiration(roleCreds.Expiration, m.ExpiryWindow)
-
-	return credentials.Value{
-		AccessKeyID:     roleCreds.AccessKeyID,
-		SecretAccessKey: roleCreds.SecretAccessKey,
-		SessionToken:    roleCreds.Token,
-		ProviderName:    ProviderName,
-	}, nil
-}
-
-// A ec2RoleCredRespBody provides the shape for unmarshaling credential
-// request responses.
-type ec2RoleCredRespBody struct {
-	// Success State
-	Expiration      time.Time
-	AccessKeyID     string
-	SecretAccessKey string
-	Token           string
-
-	// Error state
-	Code    string
-	Message string
-}
-
-const iamSecurityCredsPath = "/iam/security-credentials"
-
-// requestCredList requests a list of credentials from the EC2 service.
-// If there are no credentials, or there is an error making or receiving the request
-func requestCredList(client *ec2metadata.EC2Metadata) ([]string, error) {
-	resp, err := client.GetMetadata(iamSecurityCredsPath)
-	if err != nil {
-		return nil, awserr.New("EC2RoleRequestError", "no EC2 instance role found", err)
-	}
-
-	credsList := []string{}
-	s := bufio.NewScanner(strings.NewReader(resp))
-	for s.Scan() {
-		credsList = append(credsList, s.Text())
-	}
-
-	if err := s.Err(); err != nil {
-		return nil, awserr.New("SerializationError", "failed to read EC2 instance role from metadata service", err)
-	}
-
-	return credsList, nil
-}
-
-// requestCred requests the credentials for a specific credentials from the EC2 service.
-//
-// If the credentials cannot be found, or there is an error reading the response
-// and error will be returned.
-func requestCred(client *ec2metadata.EC2Metadata, credsName string) (ec2RoleCredRespBody, error) {
-	resp, err := client.GetMetadata(path.Join(iamSecurityCredsPath, credsName))
-	if err != nil {
-		return ec2RoleCredRespBody{},
-			awserr.New("EC2RoleRequestError",
-				fmt.Sprintf("failed to get %s EC2 instance role credentials", credsName),
-				err)
-	}
-
-	respCreds := ec2RoleCredRespBody{}
-	if err := json.NewDecoder(strings.NewReader(resp)).Decode(&respCreds); err != nil {
-		return ec2RoleCredRespBody{},
-			awserr.New("SerializationError",
-				fmt.Sprintf("failed to decode %s EC2 instance role credentials", credsName),
-				err)
-	}
-
-	if respCreds.Code != "Success" {
-		// If an error code was returned something failed requesting the role.
-		return ec2RoleCredRespBody{}, awserr.New(respCreds.Code, respCreds.Message, nil)
-	}
-
-	return respCreds, nil
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/endpointcreds/provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/endpointcreds/provider.go
deleted file mode 100644
index a4cec5c553..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/endpointcreds/provider.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Package endpointcreds provides support for retrieving credentials from an
-// arbitrary HTTP endpoint.
-//
-// The credentials endpoint Provider can receive both static and refreshable
-// credentials that will expire. Credentials are static when an "Expiration"
-// value is not provided in the endpoint's response.
-//
-// Static credentials will never expire once they have been retrieved. The format
-// of the static credentials response:
-//    {
-//        "AccessKeyId" : "MUA...",
-//        "SecretAccessKey" : "/7PC5om....",
-//    }
-//
-// Refreshable credentials will expire within the "ExpiryWindow" of the Expiration
-// value in the response. The format of the refreshable credentials response:
-//    {
-//        "AccessKeyId" : "MUA...",
-//        "SecretAccessKey" : "/7PC5om....",
-//        "Token" : "AQoDY....=",
-//        "Expiration" : "2016-02-25T06:03:31Z"
-//    }
-//
-// Errors should be returned in the following format and only returned with 400
-// or 500 HTTP status codes.
-//    {
-//        "code": "ErrorCode",
-//        "message": "Helpful error message."
-//    }
-package endpointcreds
-
-import (
-	"encoding/json"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/client"
-	"github.com/aws/aws-sdk-go/aws/client/metadata"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// ProviderName is the name of the credentials provider.
-const ProviderName = `CredentialsEndpointProvider`
-
-// Provider satisfies the credentials.Provider interface, and is a client to
-// retrieve credentials from an arbitrary endpoint.
-type Provider struct {
-	staticCreds bool
-	credentials.Expiry
-
-	// Requires a AWS Client to make HTTP requests to the endpoint with.
-	// the Endpoint the request will be made to is provided by the aws.Config's
-	// Endpoint value.
-	Client *client.Client
-
-	// ExpiryWindow will allow the credentials to trigger refreshing prior to
-	// the credentials actually expiring. This is beneficial so race conditions
-	// with expiring credentials do not cause request to fail unexpectedly
-	// due to ExpiredTokenException exceptions.
-	//
-	// So a ExpiryWindow of 10s would cause calls to IsExpired() to return true
-	// 10 seconds before the credentials are actually expired.
-	//
-	// If ExpiryWindow is 0 or less it will be ignored.
-	ExpiryWindow time.Duration
-}
-
-// NewProviderClient returns a credentials Provider for retrieving AWS credentials
-// from arbitrary endpoint.
-func NewProviderClient(cfg aws.Config, handlers request.Handlers, endpoint string, options ...func(*Provider)) credentials.Provider {
-	p := &Provider{
-		Client: client.New(
-			cfg,
-			metadata.ClientInfo{
-				ServiceName: "CredentialsEndpoint",
-				Endpoint:    endpoint,
-			},
-			handlers,
-		),
-	}
-
-	p.Client.Handlers.Unmarshal.PushBack(unmarshalHandler)
-	p.Client.Handlers.UnmarshalError.PushBack(unmarshalError)
-	p.Client.Handlers.Validate.Clear()
-	p.Client.Handlers.Validate.PushBack(validateEndpointHandler)
-
-	for _, option := range options {
-		option(p)
-	}
-
-	return p
-}
-
-// NewCredentialsClient returns a Credentials wrapper for retrieving credentials
-// from an arbitrary endpoint concurrently. The client will request the
-func NewCredentialsClient(cfg aws.Config, handlers request.Handlers, endpoint string, options ...func(*Provider)) *credentials.Credentials {
-	return credentials.NewCredentials(NewProviderClient(cfg, handlers, endpoint, options...))
-}
-
-// IsExpired returns true if the credentials retrieved are expired, or not yet
-// retrieved.
-func (p *Provider) IsExpired() bool {
-	if p.staticCreds {
-		return false
-	}
-	return p.Expiry.IsExpired()
-}
-
-// Retrieve will attempt to request the credentials from the endpoint the Provider
-// was configured for. And error will be returned if the retrieval fails.
-func (p *Provider) Retrieve() (credentials.Value, error) {
-	resp, err := p.getCredentials()
-	if err != nil {
-		return credentials.Value{ProviderName: ProviderName},
-			awserr.New("CredentialsEndpointError", "failed to load credentials", err)
-	}
-
-	if resp.Expiration != nil {
-		p.SetExpiration(*resp.Expiration, p.ExpiryWindow)
-	} else {
-		p.staticCreds = true
-	}
-
-	return credentials.Value{
-		AccessKeyID:     resp.AccessKeyID,
-		SecretAccessKey: resp.SecretAccessKey,
-		SessionToken:    resp.Token,
-		ProviderName:    ProviderName,
-	}, nil
-}
-
-type getCredentialsOutput struct {
-	Expiration      *time.Time
-	AccessKeyID     string
-	SecretAccessKey string
-	Token           string
-}
-
-type errorOutput struct {
-	Code    string `json:"code"`
-	Message string `json:"message"`
-}
-
-func (p *Provider) getCredentials() (*getCredentialsOutput, error) {
-	op := &request.Operation{
-		Name:       "GetCredentials",
-		HTTPMethod: "GET",
-	}
-
-	out := &getCredentialsOutput{}
-	req := p.Client.NewRequest(op, nil, out)
-	req.HTTPRequest.Header.Set("Accept", "application/json")
-
-	return out, req.Send()
-}
-
-func validateEndpointHandler(r *request.Request) {
-	if len(r.ClientInfo.Endpoint) == 0 {
-		r.Error = aws.ErrMissingEndpoint
-	}
-}
-
-func unmarshalHandler(r *request.Request) {
-	defer r.HTTPResponse.Body.Close()
-
-	out := r.Data.(*getCredentialsOutput)
-	if err := json.NewDecoder(r.HTTPResponse.Body).Decode(&out); err != nil {
-		r.Error = awserr.New("SerializationError",
-			"failed to decode endpoint credentials",
-			err,
-		)
-	}
-}
-
-func unmarshalError(r *request.Request) {
-	defer r.HTTPResponse.Body.Close()
-
-	var errOut errorOutput
-	if err := json.NewDecoder(r.HTTPResponse.Body).Decode(&errOut); err != nil {
-		r.Error = awserr.New("SerializationError",
-			"failed to decode endpoint credentials",
-			err,
-		)
-	}
-
-	// Response body format is not consistent between metadata endpoints.
-	// Grab the error message as a string and include that as the source error
-	r.Error = awserr.New(errOut.Code, errOut.Message, nil)
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
deleted file mode 100644
index c14231a16f..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package credentials
-
-import (
-	"os"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-// EnvProviderName provides a name of Env provider
-const EnvProviderName = "EnvProvider"
-
-var (
-	// ErrAccessKeyIDNotFound is returned when the AWS Access Key ID can't be
-	// found in the process's environment.
-	//
-	// @readonly
-	ErrAccessKeyIDNotFound = awserr.New("EnvAccessKeyNotFound", "AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY not found in environment", nil)
-
-	// ErrSecretAccessKeyNotFound is returned when the AWS Secret Access Key
-	// can't be found in the process's environment.
-	//
-	// @readonly
-	ErrSecretAccessKeyNotFound = awserr.New("EnvSecretNotFound", "AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY not found in environment", nil)
-)
-
-// A EnvProvider retrieves credentials from the environment variables of the
-// running process. Environment credentials never expire.
-//
-// Environment variables used:
-//
-// * Access Key ID:     AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY
-//
-// * Secret Access Key: AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY
-type EnvProvider struct {
-	retrieved bool
-}
-
-// NewEnvCredentials returns a pointer to a new Credentials object
-// wrapping the environment variable provider.
-func NewEnvCredentials() *Credentials {
-	return NewCredentials(&EnvProvider{})
-}
-
-// Retrieve retrieves the keys from the environment.
-func (e *EnvProvider) Retrieve() (Value, error) {
-	e.retrieved = false
-
-	id := os.Getenv("AWS_ACCESS_KEY_ID")
-	if id == "" {
-		id = os.Getenv("AWS_ACCESS_KEY")
-	}
-
-	secret := os.Getenv("AWS_SECRET_ACCESS_KEY")
-	if secret == "" {
-		secret = os.Getenv("AWS_SECRET_KEY")
-	}
-
-	if id == "" {
-		return Value{ProviderName: EnvProviderName}, ErrAccessKeyIDNotFound
-	}
-
-	if secret == "" {
-		return Value{ProviderName: EnvProviderName}, ErrSecretAccessKeyNotFound
-	}
-
-	e.retrieved = true
-	return Value{
-		AccessKeyID:     id,
-		SecretAccessKey: secret,
-		SessionToken:    os.Getenv("AWS_SESSION_TOKEN"),
-		ProviderName:    EnvProviderName,
-	}, nil
-}
-
-// IsExpired returns if the credentials have been retrieved.
-func (e *EnvProvider) IsExpired() bool {
-	return !e.retrieved
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/example.ini b/vendor/github.com/aws/aws-sdk-go/aws/credentials/example.ini
deleted file mode 100644
index 7fc91d9d20..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/example.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[default]
-aws_access_key_id = accessKey
-aws_secret_access_key = secret
-aws_session_token = token
-
-[no_token]
-aws_access_key_id = accessKey
-aws_secret_access_key = secret
-
-[with_colon]
-aws_access_key_id: accessKey
-aws_secret_access_key: secret
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
deleted file mode 100644
index 51e21e0f38..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package credentials
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/go-ini/ini"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/internal/shareddefaults"
-)
-
-// SharedCredsProviderName provides a name of SharedCreds provider
-const SharedCredsProviderName = "SharedCredentialsProvider"
-
-var (
-	// ErrSharedCredentialsHomeNotFound is emitted when the user directory cannot be found.
-	ErrSharedCredentialsHomeNotFound = awserr.New("UserHomeNotFound", "user home directory not found.", nil)
-)
-
-// A SharedCredentialsProvider retrieves credentials from the current user's home
-// directory, and keeps track if those credentials are expired.
-//
-// Profile ini file example: $HOME/.aws/credentials
-type SharedCredentialsProvider struct {
-	// Path to the shared credentials file.
-	//
-	// If empty will look for "AWS_SHARED_CREDENTIALS_FILE" env variable. If the
-	// env value is empty will default to current user's home directory.
-	// Linux/OSX: "$HOME/.aws/credentials"
-	// Windows:   "%USERPROFILE%\.aws\credentials"
-	Filename string
-
-	// AWS Profile to extract credentials from the shared credentials file. If empty
-	// will default to environment variable "AWS_PROFILE" or "default" if
-	// environment variable is also not set.
-	Profile string
-
-	// retrieved states if the credentials have been successfully retrieved.
-	retrieved bool
-}
-
-// NewSharedCredentials returns a pointer to a new Credentials object
-// wrapping the Profile file provider.
-func NewSharedCredentials(filename, profile string) *Credentials {
-	return NewCredentials(&SharedCredentialsProvider{
-		Filename: filename,
-		Profile:  profile,
-	})
-}
-
-// Retrieve reads and extracts the shared credentials from the current
-// users home directory.
-func (p *SharedCredentialsProvider) Retrieve() (Value, error) {
-	p.retrieved = false
-
-	filename, err := p.filename()
-	if err != nil {
-		return Value{ProviderName: SharedCredsProviderName}, err
-	}
-
-	creds, err := loadProfile(filename, p.profile())
-	if err != nil {
-		return Value{ProviderName: SharedCredsProviderName}, err
-	}
-
-	p.retrieved = true
-	return creds, nil
-}
-
-// IsExpired returns if the shared credentials have expired.
-func (p *SharedCredentialsProvider) IsExpired() bool {
-	return !p.retrieved
-}
-
-// loadProfiles loads from the file pointed to by shared credentials filename for profile.
-// The credentials retrieved from the profile will be returned or error. Error will be
-// returned if it fails to read from the file, or the data is invalid.
-func loadProfile(filename, profile string) (Value, error) {
-	config, err := ini.Load(filename)
-	if err != nil {
-		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsLoad", "failed to load shared credentials file", err)
-	}
-	iniProfile, err := config.GetSection(profile)
-	if err != nil {
-		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsLoad", "failed to get profile", err)
-	}
-
-	id, err := iniProfile.GetKey("aws_access_key_id")
-	if err != nil {
-		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsAccessKey",
-			fmt.Sprintf("shared credentials %s in %s did not contain aws_access_key_id", profile, filename),
-			err)
-	}
-
-	secret, err := iniProfile.GetKey("aws_secret_access_key")
-	if err != nil {
-		return Value{ProviderName: SharedCredsProviderName}, awserr.New("SharedCredsSecret",
-			fmt.Sprintf("shared credentials %s in %s did not contain aws_secret_access_key", profile, filename),
-			nil)
-	}
-
-	// Default to empty string if not found
-	token := iniProfile.Key("aws_session_token")
-
-	return Value{
-		AccessKeyID:     id.String(),
-		SecretAccessKey: secret.String(),
-		SessionToken:    token.String(),
-		ProviderName:    SharedCredsProviderName,
-	}, nil
-}
-
-// filename returns the filename to use to read AWS shared credentials.
-//
-// Will return an error if the user's home directory path cannot be found.
-func (p *SharedCredentialsProvider) filename() (string, error) {
-	if len(p.Filename) != 0 {
-		return p.Filename, nil
-	}
-
-	if p.Filename = os.Getenv("AWS_SHARED_CREDENTIALS_FILE"); len(p.Filename) != 0 {
-		return p.Filename, nil
-	}
-
-	if home := shareddefaults.UserHomeDir(); len(home) == 0 {
-		// Backwards compatibility of home directly not found error being returned.
-		// This error is too verbose, failure when opening the file would of been
-		// a better error to return.
-		return "", ErrSharedCredentialsHomeNotFound
-	}
-
-	p.Filename = shareddefaults.SharedCredentialsFilename()
-
-	return p.Filename, nil
-}
-
-// profile returns the AWS shared credentials profile.  If empty will read
-// environment variable "AWS_PROFILE". If that is not set profile will
-// return "default".
-func (p *SharedCredentialsProvider) profile() string {
-	if p.Profile == "" {
-		p.Profile = os.Getenv("AWS_PROFILE")
-	}
-	if p.Profile == "" {
-		p.Profile = "default"
-	}
-
-	return p.Profile
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
deleted file mode 100644
index 4f5dab3fcc..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package credentials
-
-import (
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-// StaticProviderName provides a name of Static provider
-const StaticProviderName = "StaticProvider"
-
-var (
-	// ErrStaticCredentialsEmpty is emitted when static credentials are empty.
-	//
-	// @readonly
-	ErrStaticCredentialsEmpty = awserr.New("EmptyStaticCreds", "static credentials are empty", nil)
-)
-
-// A StaticProvider is a set of credentials which are set programmatically,
-// and will never expire.
-type StaticProvider struct {
-	Value
-}
-
-// NewStaticCredentials returns a pointer to a new Credentials object
-// wrapping a static credentials value provider.
-func NewStaticCredentials(id, secret, token string) *Credentials {
-	return NewCredentials(&StaticProvider{Value: Value{
-		AccessKeyID:     id,
-		SecretAccessKey: secret,
-		SessionToken:    token,
-	}})
-}
-
-// NewStaticCredentialsFromCreds returns a pointer to a new Credentials object
-// wrapping the static credentials value provide. Same as NewStaticCredentials
-// but takes the creds Value instead of individual fields
-func NewStaticCredentialsFromCreds(creds Value) *Credentials {
-	return NewCredentials(&StaticProvider{Value: creds})
-}
-
-// Retrieve returns the credentials or error if the credentials are invalid.
-func (s *StaticProvider) Retrieve() (Value, error) {
-	if s.AccessKeyID == "" || s.SecretAccessKey == "" {
-		return Value{ProviderName: StaticProviderName}, ErrStaticCredentialsEmpty
-	}
-
-	if len(s.Value.ProviderName) == 0 {
-		s.Value.ProviderName = StaticProviderName
-	}
-	return s.Value, nil
-}
-
-// IsExpired returns if the credentials are expired.
-//
-// For StaticProvider, the credentials never expired.
-func (s *StaticProvider) IsExpired() bool {
-	return false
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
deleted file mode 100644
index 4108e433e6..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
-Package stscreds are credential Providers to retrieve STS AWS credentials.
-
-STS provides multiple ways to retrieve credentials which can be used when making
-future AWS service API operation calls.
-
-The SDK will ensure that per instance of credentials.Credentials all requests
-to refresh the credentials will be synchronized. But, the SDK is unable to
-ensure synchronous usage of the AssumeRoleProvider if the value is shared
-between multiple Credentials, Sessions or service clients.
-
-Assume Role
-
-To assume an IAM role using STS with the SDK you can create a new Credentials
-with the SDKs's stscreds package.
-
-	// Initial credentials loaded from SDK's default credential chain. Such as
-	// the environment, shared credentials (~/.aws/credentials), or EC2 Instance
-	// Role. These credentials will be used to to make the STS Assume Role API.
-	sess := session.Must(session.NewSession())
-
-	// Create the credentials from AssumeRoleProvider to assume the role
-	// referenced by the "myRoleARN" ARN.
-	creds := stscreds.NewCredentials(sess, "myRoleArn")
-
-	// Create service client value configured for credentials
-	// from assumed role.
-	svc := s3.New(sess, &aws.Config{Credentials: creds})
-
-Assume Role with static MFA Token
-
-To assume an IAM role with a MFA token you can either specify a MFA token code
-directly or provide a function to prompt the user each time the credentials
-need to refresh the role's credentials. Specifying the TokenCode should be used
-for short lived operations that will not need to be refreshed, and when you do
-not want to have direct control over the user provides their MFA token.
-
-With TokenCode the AssumeRoleProvider will be not be able to refresh the role's
-credentials.
-
-	// Create the credentials from AssumeRoleProvider to assume the role
-	// referenced by the "myRoleARN" ARN using the MFA token code provided.
-	creds := stscreds.NewCredentials(sess, "myRoleArn", func(p *stscreds.AssumeRoleProvider) {
-		p.SerialNumber = aws.String("myTokenSerialNumber")
-		p.TokenCode = aws.String("00000000")
-	})
-
-	// Create service client value configured for credentials
-	// from assumed role.
-	svc := s3.New(sess, &aws.Config{Credentials: creds})
-
-Assume Role with MFA Token Provider
-
-To assume an IAM role with MFA for longer running tasks where the credentials
-may need to be refreshed setting the TokenProvider field of AssumeRoleProvider
-will allow the credential provider to prompt for new MFA token code when the
-role's credentials need to be refreshed.
-
-The StdinTokenProvider function is available to prompt on stdin to retrieve
-the MFA token code from the user. You can also implement custom prompts by
-satisfing the TokenProvider function signature.
-
-Using StdinTokenProvider with multiple AssumeRoleProviders, or Credentials will
-have undesirable results as the StdinTokenProvider will not be synchronized. A
-single Credentials with an AssumeRoleProvider can be shared safely.
-
-	// Create the credentials from AssumeRoleProvider to assume the role
-	// referenced by the "myRoleARN" ARN. Prompting for MFA token from stdin.
-	creds := stscreds.NewCredentials(sess, "myRoleArn", func(p *stscreds.AssumeRoleProvider) {
-		p.SerialNumber = aws.String("myTokenSerialNumber")
-		p.TokenProvider = stscreds.StdinTokenProvider
-	})
-
-	// Create service client value configured for credentials
-	// from assumed role.
-	svc := s3.New(sess, &aws.Config{Credentials: creds})
-
-*/
-package stscreds
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/client"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/service/sts"
-)
-
-// StdinTokenProvider will prompt on stdout and read from stdin for a string value.
-// An error is returned if reading from stdin fails.
-//
-// Use this function go read MFA tokens from stdin. The function makes no attempt
-// to make atomic prompts from stdin across multiple gorouties.
-//
-// Using StdinTokenProvider with multiple AssumeRoleProviders, or Credentials will
-// have undesirable results as the StdinTokenProvider will not be synchronized. A
-// single Credentials with an AssumeRoleProvider can be shared safely
-//
-// Will wait forever until something is provided on the stdin.
-func StdinTokenProvider() (string, error) {
-	var v string
-	fmt.Printf("Assume Role MFA token code: ")
-	_, err := fmt.Scanln(&v)
-
-	return v, err
-}
-
-// ProviderName provides a name of AssumeRole provider
-const ProviderName = "AssumeRoleProvider"
-
-// AssumeRoler represents the minimal subset of the STS client API used by this provider.
-type AssumeRoler interface {
-	AssumeRole(input *sts.AssumeRoleInput) (*sts.AssumeRoleOutput, error)
-}
-
-// DefaultDuration is the default amount of time in minutes that the credentials
-// will be valid for.
-var DefaultDuration = time.Duration(15) * time.Minute
-
-// AssumeRoleProvider retrieves temporary credentials from the STS service, and
-// keeps track of their expiration time.
-//
-// This credential provider will be used by the SDKs default credential change
-// when shared configuration is enabled, and the shared config or shared credentials
-// file configure assume role. See Session docs for how to do this.
-//
-// AssumeRoleProvider does not provide any synchronization and it is not safe
-// to share this value across multiple Credentials, Sessions, or service clients
-// without also sharing the same Credentials instance.
-type AssumeRoleProvider struct {
-	credentials.Expiry
-
-	// STS client to make assume role request with.
-	Client AssumeRoler
-
-	// Role to be assumed.
-	RoleARN string
-
-	// Session name, if you wish to reuse the credentials elsewhere.
-	RoleSessionName string
-
-	// Expiry duration of the STS credentials. Defaults to 15 minutes if not set.
-	Duration time.Duration
-
-	// Optional ExternalID to pass along, defaults to nil if not set.
-	ExternalID *string
-
-	// The policy plain text must be 2048 bytes or shorter. However, an internal
-	// conversion compresses it into a packed binary format with a separate limit.
-	// The PackedPolicySize response element indicates by percentage how close to
-	// the upper size limit the policy is, with 100% equaling the maximum allowed
-	// size.
-	Policy *string
-
-	// The identification number of the MFA device that is associated with the user
-	// who is making the AssumeRole call. Specify this value if the trust policy
-	// of the role being assumed includes a condition that requires MFA authentication.
-	// The value is either the serial number for a hardware device (such as GAHT12345678)
-	// or an Amazon Resource Name (ARN) for a virtual device (such as arn:aws:iam::123456789012:mfa/user).
-	SerialNumber *string
-
-	// The value provided by the MFA device, if the trust policy of the role being
-	// assumed requires MFA (that is, if the policy includes a condition that tests
-	// for MFA). If the role being assumed requires MFA and if the TokenCode value
-	// is missing or expired, the AssumeRole call returns an "access denied" error.
-	//
-	// If SerialNumber is set and neither TokenCode nor TokenProvider are also
-	// set an error will be returned.
-	TokenCode *string
-
-	// Async method of providing MFA token code for assuming an IAM role with MFA.
-	// The value returned by the function will be used as the TokenCode in the Retrieve
-	// call. See StdinTokenProvider for a provider that prompts and reads from stdin.
-	//
-	// This token provider will be called when ever the assumed role's
-	// credentials need to be refreshed when SerialNumber is also set and
-	// TokenCode is not set.
-	//
-	// If both TokenCode and TokenProvider is set, TokenProvider will be used and
-	// TokenCode is ignored.
-	TokenProvider func() (string, error)
-
-	// ExpiryWindow will allow the credentials to trigger refreshing prior to
-	// the credentials actually expiring. This is beneficial so race conditions
-	// with expiring credentials do not cause request to fail unexpectedly
-	// due to ExpiredTokenException exceptions.
-	//
-	// So a ExpiryWindow of 10s would cause calls to IsExpired() to return true
-	// 10 seconds before the credentials are actually expired.
-	//
-	// If ExpiryWindow is 0 or less it will be ignored.
-	ExpiryWindow time.Duration
-}
-
-// NewCredentials returns a pointer to a new Credentials object wrapping the
-// AssumeRoleProvider. The credentials will expire every 15 minutes and the
-// role will be named after a nanosecond timestamp of this operation.
-//
-// Takes a Config provider to create the STS client. The ConfigProvider is
-// satisfied by the session.Session type.
-//
-// It is safe to share the returned Credentials with multiple Sessions and
-// service clients. All access to the credentials and refreshing them
-// will be synchronized.
-func NewCredentials(c client.ConfigProvider, roleARN string, options ...func(*AssumeRoleProvider)) *credentials.Credentials {
-	p := &AssumeRoleProvider{
-		Client:   sts.New(c),
-		RoleARN:  roleARN,
-		Duration: DefaultDuration,
-	}
-
-	for _, option := range options {
-		option(p)
-	}
-
-	return credentials.NewCredentials(p)
-}
-
-// NewCredentialsWithClient returns a pointer to a new Credentials object wrapping the
-// AssumeRoleProvider. The credentials will expire every 15 minutes and the
-// role will be named after a nanosecond timestamp of this operation.
-//
-// Takes an AssumeRoler which can be satisfied by the STS client.
-//
-// It is safe to share the returned Credentials with multiple Sessions and
-// service clients. All access to the credentials and refreshing them
-// will be synchronized.
-func NewCredentialsWithClient(svc AssumeRoler, roleARN string, options ...func(*AssumeRoleProvider)) *credentials.Credentials {
-	p := &AssumeRoleProvider{
-		Client:   svc,
-		RoleARN:  roleARN,
-		Duration: DefaultDuration,
-	}
-
-	for _, option := range options {
-		option(p)
-	}
-
-	return credentials.NewCredentials(p)
-}
-
-// Retrieve generates a new set of temporary credentials using STS.
-func (p *AssumeRoleProvider) Retrieve() (credentials.Value, error) {
-
-	// Apply defaults where parameters are not set.
-	if p.RoleSessionName == "" {
-		// Try to work out a role name that will hopefully end up unique.
-		p.RoleSessionName = fmt.Sprintf("%d", time.Now().UTC().UnixNano())
-	}
-	if p.Duration == 0 {
-		// Expire as often as AWS permits.
-		p.Duration = DefaultDuration
-	}
-	input := &sts.AssumeRoleInput{
-		DurationSeconds: aws.Int64(int64(p.Duration / time.Second)),
-		RoleArn:         aws.String(p.RoleARN),
-		RoleSessionName: aws.String(p.RoleSessionName),
-		ExternalId:      p.ExternalID,
-	}
-	if p.Policy != nil {
-		input.Policy = p.Policy
-	}
-	if p.SerialNumber != nil {
-		if p.TokenCode != nil {
-			input.SerialNumber = p.SerialNumber
-			input.TokenCode = p.TokenCode
-		} else if p.TokenProvider != nil {
-			input.SerialNumber = p.SerialNumber
-			code, err := p.TokenProvider()
-			if err != nil {
-				return credentials.Value{ProviderName: ProviderName}, err
-			}
-			input.TokenCode = aws.String(code)
-		} else {
-			return credentials.Value{ProviderName: ProviderName},
-				awserr.New("AssumeRoleTokenNotAvailable",
-					"assume role with MFA enabled, but neither TokenCode nor TokenProvider are set", nil)
-		}
-	}
-
-	roleOutput, err := p.Client.AssumeRole(input)
-	if err != nil {
-		return credentials.Value{ProviderName: ProviderName}, err
-	}
-
-	// We will proactively generate new credentials before they expire.
-	p.SetExpiration(*roleOutput.Credentials.Expiration, p.ExpiryWindow)
-
-	return credentials.Value{
-		AccessKeyID:     *roleOutput.Credentials.AccessKeyId,
-		SecretAccessKey: *roleOutput.Credentials.SecretAccessKey,
-		SessionToken:    *roleOutput.Credentials.SessionToken,
-		ProviderName:    ProviderName,
-	}, nil
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
deleted file mode 100644
index 07afe3b8e6..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Package defaults is a collection of helpers to retrieve the SDK's default
-// configuration and handlers.
-//
-// Generally this package shouldn't be used directly, but session.Session
-// instead. This package is useful when you need to reset the defaults
-// of a session or service client to the SDK defaults before setting
-// additional parameters.
-package defaults
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-	"os"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/corehandlers"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
-	"github.com/aws/aws-sdk-go/aws/credentials/endpointcreds"
-	"github.com/aws/aws-sdk-go/aws/ec2metadata"
-	"github.com/aws/aws-sdk-go/aws/endpoints"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// A Defaults provides a collection of default values for SDK clients.
-type Defaults struct {
-	Config   *aws.Config
-	Handlers request.Handlers
-}
-
-// Get returns the SDK's default values with Config and handlers pre-configured.
-func Get() Defaults {
-	cfg := Config()
-	handlers := Handlers()
-	cfg.Credentials = CredChain(cfg, handlers)
-
-	return Defaults{
-		Config:   cfg,
-		Handlers: handlers,
-	}
-}
-
-// Config returns the default configuration without credentials.
-// To retrieve a config with credentials also included use
-// `defaults.Get().Config` instead.
-//
-// Generally you shouldn't need to use this method directly, but
-// is available if you need to reset the configuration of an
-// existing service client or session.
-func Config() *aws.Config {
-	return aws.NewConfig().
-		WithCredentials(credentials.AnonymousCredentials).
-		WithRegion(os.Getenv("AWS_REGION")).
-		WithHTTPClient(http.DefaultClient).
-		WithMaxRetries(aws.UseServiceDefaultRetries).
-		WithLogger(aws.NewDefaultLogger()).
-		WithLogLevel(aws.LogOff).
-		WithEndpointResolver(endpoints.DefaultResolver())
-}
-
-// Handlers returns the default request handlers.
-//
-// Generally you shouldn't need to use this method directly, but
-// is available if you need to reset the request handlers of an
-// existing service client or session.
-func Handlers() request.Handlers {
-	var handlers request.Handlers
-
-	handlers.Validate.PushBackNamed(corehandlers.ValidateEndpointHandler)
-	handlers.Validate.AfterEachFn = request.HandlerListStopOnError
-	handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler)
-	handlers.Build.AfterEachFn = request.HandlerListStopOnError
-	handlers.Sign.PushBackNamed(corehandlers.BuildContentLengthHandler)
-	handlers.Send.PushBackNamed(corehandlers.ValidateReqSigHandler)
-	handlers.Send.PushBackNamed(corehandlers.SendHandler)
-	handlers.AfterRetry.PushBackNamed(corehandlers.AfterRetryHandler)
-	handlers.ValidateResponse.PushBackNamed(corehandlers.ValidateResponseHandler)
-
-	return handlers
-}
-
-// CredChain returns the default credential chain.
-//
-// Generally you shouldn't need to use this method directly, but
-// is available if you need to reset the credentials of an
-// existing service client or session's Config.
-func CredChain(cfg *aws.Config, handlers request.Handlers) *credentials.Credentials {
-	return credentials.NewCredentials(&credentials.ChainProvider{
-		VerboseErrors: aws.BoolValue(cfg.CredentialsChainVerboseErrors),
-		Providers: []credentials.Provider{
-			&credentials.EnvProvider{},
-			&credentials.SharedCredentialsProvider{Filename: "", Profile: ""},
-			RemoteCredProvider(*cfg, handlers),
-		},
-	})
-}
-
-const (
-	httpProviderEnvVar     = "AWS_CONTAINER_CREDENTIALS_FULL_URI"
-	ecsCredsProviderEnvVar = "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"
-)
-
-// RemoteCredProvider returns a credentials provider for the default remote
-// endpoints such as EC2 or ECS Roles.
-func RemoteCredProvider(cfg aws.Config, handlers request.Handlers) credentials.Provider {
-	if u := os.Getenv(httpProviderEnvVar); len(u) > 0 {
-		return localHTTPCredProvider(cfg, handlers, u)
-	}
-
-	if uri := os.Getenv(ecsCredsProviderEnvVar); len(uri) > 0 {
-		u := fmt.Sprintf("http://169.254.170.2%s", uri)
-		return httpCredProvider(cfg, handlers, u)
-	}
-
-	return ec2RoleProvider(cfg, handlers)
-}
-
-func localHTTPCredProvider(cfg aws.Config, handlers request.Handlers, u string) credentials.Provider {
-	var errMsg string
-
-	parsed, err := url.Parse(u)
-	if err != nil {
-		errMsg = fmt.Sprintf("invalid URL, %v", err)
-	} else if host := aws.URLHostname(parsed); !(host == "localhost" || host == "127.0.0.1") {
-		errMsg = fmt.Sprintf("invalid host address, %q, only localhost and 127.0.0.1 are valid.", host)
-	}
-
-	if len(errMsg) > 0 {
-		if cfg.Logger != nil {
-			cfg.Logger.Log("Ignoring, HTTP credential provider", errMsg, err)
-		}
-		return credentials.ErrorProvider{
-			Err:          awserr.New("CredentialsEndpointError", errMsg, err),
-			ProviderName: endpointcreds.ProviderName,
-		}
-	}
-
-	return httpCredProvider(cfg, handlers, u)
-}
-
-func httpCredProvider(cfg aws.Config, handlers request.Handlers, u string) credentials.Provider {
-	return endpointcreds.NewProviderClient(cfg, handlers, u,
-		func(p *endpointcreds.Provider) {
-			p.ExpiryWindow = 5 * time.Minute
-		},
-	)
-}
-
-func ec2RoleProvider(cfg aws.Config, handlers request.Handlers) credentials.Provider {
-	resolver := cfg.EndpointResolver
-	if resolver == nil {
-		resolver = endpoints.DefaultResolver()
-	}
-
-	e, _ := resolver.EndpointFor(endpoints.Ec2metadataServiceID, "")
-	return &ec2rolecreds.EC2RoleProvider{
-		Client:       ec2metadata.NewClient(cfg, handlers, e.URL, e.SigningRegion),
-		ExpiryWindow: 5 * time.Minute,
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/defaults/shared_config.go b/vendor/github.com/aws/aws-sdk-go/aws/defaults/shared_config.go
deleted file mode 100644
index ca0ee1dcc7..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/defaults/shared_config.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package defaults
-
-import (
-	"github.com/aws/aws-sdk-go/internal/shareddefaults"
-)
-
-// SharedCredentialsFilename returns the SDK's default file path
-// for the shared credentials file.
-//
-// Builds the shared config file path based on the OS's platform.
-//
-//   - Linux/Unix: $HOME/.aws/credentials
-//   - Windows: %USERPROFILE%\.aws\credentials
-func SharedCredentialsFilename() string {
-	return shareddefaults.SharedCredentialsFilename()
-}
-
-// SharedConfigFilename returns the SDK's default file path for
-// the shared config file.
-//
-// Builds the shared config file path based on the OS's platform.
-//
-//   - Linux/Unix: $HOME/.aws/config
-//   - Windows: %USERPROFILE%\.aws\config
-func SharedConfigFilename() string {
-	return shareddefaults.SharedConfigFilename()
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/doc.go b/vendor/github.com/aws/aws-sdk-go/aws/doc.go
deleted file mode 100644
index 4fcb616184..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/doc.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Package aws provides the core SDK's utilities and shared types. Use this package's
-// utilities to simplify setting and reading API operations parameters.
-//
-// Value and Pointer Conversion Utilities
-//
-// This package includes a helper conversion utility for each scalar type the SDK's
-// API use. These utilities make getting a pointer of the scalar, and dereferencing
-// a pointer easier.
-//
-// Each conversion utility comes in two forms. Value to Pointer and Pointer to Value.
-// The Pointer to value will safely dereference the pointer and return its value.
-// If the pointer was nil, the scalar's zero value will be returned.
-//
-// The value to pointer functions will be named after the scalar type. So get a
-// *string from a string value use the "String" function. This makes it easy to
-// to get pointer of a literal string value, because getting the address of a
-// literal requires assigning the value to a variable first.
-//
-//    var strPtr *string
-//
-//    // Without the SDK's conversion functions
-//    str := "my string"
-//    strPtr = &str
-//
-//    // With the SDK's conversion functions
-//    strPtr = aws.String("my string")
-//
-//    // Convert *string to string value
-//    str = aws.StringValue(strPtr)
-//
-// In addition to scalars the aws package also includes conversion utilities for
-// map and slice for commonly types used in API parameters. The map and slice
-// conversion functions use similar naming pattern as the scalar conversion
-// functions.
-//
-//    var strPtrs []*string
-//    var strs []string = []string{"Go", "Gophers", "Go"}
-//
-//    // Convert []string to []*string
-//    strPtrs = aws.StringSlice(strs)
-//
-//    // Convert []*string to []string
-//    strs = aws.StringValueSlice(strPtrs)
-//
-// SDK Default HTTP Client
-//
-// The SDK will use the http.DefaultClient if a HTTP client is not provided to
-// the SDK's Session, or service client constructor. This means that if the
-// http.DefaultClient is modified by other components of your application the
-// modifications will be picked up by the SDK as well.
-//
-// In some cases this might be intended, but it is a better practice to create
-// a custom HTTP Client to share explicitly through your application. You can
-// configure the SDK to use the custom HTTP Client by setting the HTTPClient
-// value of the SDK's Config type when creating a Session or service client.
-package aws
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
deleted file mode 100644
index 984407a580..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
+++ /dev/null
@@ -1,162 +0,0 @@
-package ec2metadata
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// GetMetadata uses the path provided to request information from the EC2
-// instance metdata service. The content will be returned as a string, or
-// error if the request failed.
-func (c *EC2Metadata) GetMetadata(p string) (string, error) {
-	op := &request.Operation{
-		Name:       "GetMetadata",
-		HTTPMethod: "GET",
-		HTTPPath:   path.Join("/", "meta-data", p),
-	}
-
-	output := &metadataOutput{}
-	req := c.NewRequest(op, nil, output)
-
-	return output.Content, req.Send()
-}
-
-// GetUserData returns the userdata that was configured for the service. If
-// there is no user-data setup for the EC2 instance a "NotFoundError" error
-// code will be returned.
-func (c *EC2Metadata) GetUserData() (string, error) {
-	op := &request.Operation{
-		Name:       "GetUserData",
-		HTTPMethod: "GET",
-		HTTPPath:   path.Join("/", "user-data"),
-	}
-
-	output := &metadataOutput{}
-	req := c.NewRequest(op, nil, output)
-	req.Handlers.UnmarshalError.PushBack(func(r *request.Request) {
-		if r.HTTPResponse.StatusCode == http.StatusNotFound {
-			r.Error = awserr.New("NotFoundError", "user-data not found", r.Error)
-		}
-	})
-
-	return output.Content, req.Send()
-}
-
-// GetDynamicData uses the path provided to request information from the EC2
-// instance metadata service for dynamic data. The content will be returned
-// as a string, or error if the request failed.
-func (c *EC2Metadata) GetDynamicData(p string) (string, error) {
-	op := &request.Operation{
-		Name:       "GetDynamicData",
-		HTTPMethod: "GET",
-		HTTPPath:   path.Join("/", "dynamic", p),
-	}
-
-	output := &metadataOutput{}
-	req := c.NewRequest(op, nil, output)
-
-	return output.Content, req.Send()
-}
-
-// GetInstanceIdentityDocument retrieves an identity document describing an
-// instance. Error is returned if the request fails or is unable to parse
-// the response.
-func (c *EC2Metadata) GetInstanceIdentityDocument() (EC2InstanceIdentityDocument, error) {
-	resp, err := c.GetDynamicData("instance-identity/document")
-	if err != nil {
-		return EC2InstanceIdentityDocument{},
-			awserr.New("EC2MetadataRequestError",
-				"failed to get EC2 instance identity document", err)
-	}
-
-	doc := EC2InstanceIdentityDocument{}
-	if err := json.NewDecoder(strings.NewReader(resp)).Decode(&doc); err != nil {
-		return EC2InstanceIdentityDocument{},
-			awserr.New("SerializationError",
-				"failed to decode EC2 instance identity document", err)
-	}
-
-	return doc, nil
-}
-
-// IAMInfo retrieves IAM info from the metadata API
-func (c *EC2Metadata) IAMInfo() (EC2IAMInfo, error) {
-	resp, err := c.GetMetadata("iam/info")
-	if err != nil {
-		return EC2IAMInfo{},
-			awserr.New("EC2MetadataRequestError",
-				"failed to get EC2 IAM info", err)
-	}
-
-	info := EC2IAMInfo{}
-	if err := json.NewDecoder(strings.NewReader(resp)).Decode(&info); err != nil {
-		return EC2IAMInfo{},
-			awserr.New("SerializationError",
-				"failed to decode EC2 IAM info", err)
-	}
-
-	if info.Code != "Success" {
-		errMsg := fmt.Sprintf("failed to get EC2 IAM Info (%s)", info.Code)
-		return EC2IAMInfo{},
-			awserr.New("EC2MetadataError", errMsg, nil)
-	}
-
-	return info, nil
-}
-
-// Region returns the region the instance is running in.
-func (c *EC2Metadata) Region() (string, error) {
-	resp, err := c.GetMetadata("placement/availability-zone")
-	if err != nil {
-		return "", err
-	}
-
-	// returns region without the suffix. Eg: us-west-2a becomes us-west-2
-	return resp[:len(resp)-1], nil
-}
-
-// Available returns if the application has access to the EC2 Metadata service.
-// Can be used to determine if application is running within an EC2 Instance and
-// the metadata service is available.
-func (c *EC2Metadata) Available() bool {
-	if _, err := c.GetMetadata("instance-id"); err != nil {
-		return false
-	}
-
-	return true
-}
-
-// An EC2IAMInfo provides the shape for unmarshaling
-// an IAM info from the metadata API
-type EC2IAMInfo struct {
-	Code               string
-	LastUpdated        time.Time
-	InstanceProfileArn string
-	InstanceProfileID  string
-}
-
-// An EC2InstanceIdentityDocument provides the shape for unmarshaling
-// an instance identity document
-type EC2InstanceIdentityDocument struct {
-	DevpayProductCodes []string  `json:"devpayProductCodes"`
-	AvailabilityZone   string    `json:"availabilityZone"`
-	PrivateIP          string    `json:"privateIp"`
-	Version            string    `json:"version"`
-	Region             string    `json:"region"`
-	InstanceID         string    `json:"instanceId"`
-	BillingProducts    []string  `json:"billingProducts"`
-	InstanceType       string    `json:"instanceType"`
-	AccountID          string    `json:"accountId"`
-	PendingTime        time.Time `json:"pendingTime"`
-	ImageID            string    `json:"imageId"`
-	KernelID           string    `json:"kernelId"`
-	RamdiskID          string    `json:"ramdiskId"`
-	Architecture       string    `json:"architecture"`
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
deleted file mode 100644
index 5b4379dbd8..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Package ec2metadata provides the client for making API calls to the
-// EC2 Metadata service.
-package ec2metadata
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"net/http"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/client"
-	"github.com/aws/aws-sdk-go/aws/client/metadata"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// ServiceName is the name of the service.
-const ServiceName = "ec2metadata"
-
-// A EC2Metadata is an EC2 Metadata service Client.
-type EC2Metadata struct {
-	*client.Client
-}
-
-// New creates a new instance of the EC2Metadata client with a session.
-// This client is safe to use across multiple goroutines.
-//
-//
-// Example:
-//     // Create a EC2Metadata client from just a session.
-//     svc := ec2metadata.New(mySession)
-//
-//     // Create a EC2Metadata client with additional configuration
-//     svc := ec2metadata.New(mySession, aws.NewConfig().WithLogLevel(aws.LogDebugHTTPBody))
-func New(p client.ConfigProvider, cfgs ...*aws.Config) *EC2Metadata {
-	c := p.ClientConfig(ServiceName, cfgs...)
-	return NewClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion)
-}
-
-// NewClient returns a new EC2Metadata client. Should be used to create
-// a client when not using a session. Generally using just New with a session
-// is preferred.
-//
-// If an unmodified HTTP client is provided from the stdlib default, or no client
-// the EC2RoleProvider's EC2Metadata HTTP client's timeout will be shortened.
-// To disable this set Config.EC2MetadataDisableTimeoutOverride to false. Enabled by default.
-func NewClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegion string, opts ...func(*client.Client)) *EC2Metadata {
-	if !aws.BoolValue(cfg.EC2MetadataDisableTimeoutOverride) && httpClientZero(cfg.HTTPClient) {
-		// If the http client is unmodified and this feature is not disabled
-		// set custom timeouts for EC2Metadata requests.
-		cfg.HTTPClient = &http.Client{
-			// use a shorter timeout than default because the metadata
-			// service is local if it is running, and to fail faster
-			// if not running on an ec2 instance.
-			Timeout: 5 * time.Second,
-		}
-	}
-
-	svc := &EC2Metadata{
-		Client: client.New(
-			cfg,
-			metadata.ClientInfo{
-				ServiceName: ServiceName,
-				Endpoint:    endpoint,
-				APIVersion:  "latest",
-			},
-			handlers,
-		),
-	}
-
-	svc.Handlers.Unmarshal.PushBack(unmarshalHandler)
-	svc.Handlers.UnmarshalError.PushBack(unmarshalError)
-	svc.Handlers.Validate.Clear()
-	svc.Handlers.Validate.PushBack(validateEndpointHandler)
-
-	// Add additional options to the service config
-	for _, option := range opts {
-		option(svc.Client)
-	}
-
-	return svc
-}
-
-func httpClientZero(c *http.Client) bool {
-	return c == nil || (c.Transport == nil && c.CheckRedirect == nil && c.Jar == nil && c.Timeout == 0)
-}
-
-type metadataOutput struct {
-	Content string
-}
-
-func unmarshalHandler(r *request.Request) {
-	defer r.HTTPResponse.Body.Close()
-	b := &bytes.Buffer{}
-	if _, err := io.Copy(b, r.HTTPResponse.Body); err != nil {
-		r.Error = awserr.New("SerializationError", "unable to unmarshal EC2 metadata respose", err)
-		return
-	}
-
-	if data, ok := r.Data.(*metadataOutput); ok {
-		data.Content = b.String()
-	}
-}
-
-func unmarshalError(r *request.Request) {
-	defer r.HTTPResponse.Body.Close()
-	b := &bytes.Buffer{}
-	if _, err := io.Copy(b, r.HTTPResponse.Body); err != nil {
-		r.Error = awserr.New("SerializationError", "unable to unmarshal EC2 metadata error respose", err)
-		return
-	}
-
-	// Response body format is not consistent between metadata endpoints.
-	// Grab the error message as a string and include that as the source error
-	r.Error = awserr.New("EC2MetadataError", "failed to make EC2Metadata request", errors.New(b.String()))
-}
-
-func validateEndpointHandler(r *request.Request) {
-	if r.ClientInfo.Endpoint == "" {
-		r.Error = aws.ErrMissingEndpoint
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/decode.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/decode.go
deleted file mode 100644
index 74f72de073..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/decode.go
+++ /dev/null
@@ -1,133 +0,0 @@
-package endpoints
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-type modelDefinition map[string]json.RawMessage
-
-// A DecodeModelOptions are the options for how the endpoints model definition
-// are decoded.
-type DecodeModelOptions struct {
-	SkipCustomizations bool
-}
-
-// Set combines all of the option functions together.
-func (d *DecodeModelOptions) Set(optFns ...func(*DecodeModelOptions)) {
-	for _, fn := range optFns {
-		fn(d)
-	}
-}
-
-// DecodeModel unmarshals a Regions and Endpoint model definition file into
-// a endpoint Resolver. If the file format is not supported, or an error occurs
-// when unmarshaling the model an error will be returned.
-//
-// Casting the return value of this func to a EnumPartitions will
-// allow you to get a list of the partitions in the order the endpoints
-// will be resolved in.
-//
-//    resolver, err := endpoints.DecodeModel(reader)
-//
-//    partitions := resolver.(endpoints.EnumPartitions).Partitions()
-//    for _, p := range partitions {
-//        // ... inspect partitions
-//    }
-func DecodeModel(r io.Reader, optFns ...func(*DecodeModelOptions)) (Resolver, error) {
-	var opts DecodeModelOptions
-	opts.Set(optFns...)
-
-	// Get the version of the partition file to determine what
-	// unmarshaling model to use.
-	modelDef := modelDefinition{}
-	if err := json.NewDecoder(r).Decode(&modelDef); err != nil {
-		return nil, newDecodeModelError("failed to decode endpoints model", err)
-	}
-
-	var version string
-	if b, ok := modelDef["version"]; ok {
-		version = string(b)
-	} else {
-		return nil, newDecodeModelError("endpoints version not found in model", nil)
-	}
-
-	if version == "3" {
-		return decodeV3Endpoints(modelDef, opts)
-	}
-
-	return nil, newDecodeModelError(
-		fmt.Sprintf("endpoints version %s, not supported", version), nil)
-}
-
-func decodeV3Endpoints(modelDef modelDefinition, opts DecodeModelOptions) (Resolver, error) {
-	b, ok := modelDef["partitions"]
-	if !ok {
-		return nil, newDecodeModelError("endpoints model missing partitions", nil)
-	}
-
-	ps := partitions{}
-	if err := json.Unmarshal(b, &ps); err != nil {
-		return nil, newDecodeModelError("failed to decode endpoints model", err)
-	}
-
-	if opts.SkipCustomizations {
-		return ps, nil
-	}
-
-	// Customization
-	for i := 0; i < len(ps); i++ {
-		p := &ps[i]
-		custAddEC2Metadata(p)
-		custAddS3DualStack(p)
-		custRmIotDataService(p)
-	}
-
-	return ps, nil
-}
-
-func custAddS3DualStack(p *partition) {
-	if p.ID != "aws" {
-		return
-	}
-
-	s, ok := p.Services["s3"]
-	if !ok {
-		return
-	}
-
-	s.Defaults.HasDualStack = boxedTrue
-	s.Defaults.DualStackHostname = "{service}.dualstack.{region}.{dnsSuffix}"
-
-	p.Services["s3"] = s
-}
-
-func custAddEC2Metadata(p *partition) {
-	p.Services["ec2metadata"] = service{
-		IsRegionalized:    boxedFalse,
-		PartitionEndpoint: "aws-global",
-		Endpoints: endpoints{
-			"aws-global": endpoint{
-				Hostname:  "169.254.169.254/latest",
-				Protocols: []string{"http"},
-			},
-		},
-	}
-}
-
-func custRmIotDataService(p *partition) {
-	delete(p.Services, "data.iot")
-}
-
-type decodeModelError struct {
-	awsError
-}
-
-func newDecodeModelError(msg string, err error) decodeModelError {
-	return decodeModelError{
-		awsError: awserr.New("DecodeEndpointsModelError", msg, err),
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
deleted file mode 100644
index ba0c07b25b..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
+++ /dev/null
@@ -1,2331 +0,0 @@
-// Code generated by aws/endpoints/v3model_codegen.go. DO NOT EDIT.
-
-package endpoints
-
-import (
-	"regexp"
-)
-
-// Partition identifiers
-const (
-	AwsPartitionID      = "aws"        // AWS Standard partition.
-	AwsCnPartitionID    = "aws-cn"     // AWS China partition.
-	AwsUsGovPartitionID = "aws-us-gov" // AWS GovCloud (US) partition.
-)
-
-// AWS Standard partition's regions.
-const (
-	ApNortheast1RegionID = "ap-northeast-1" // Asia Pacific (Tokyo).
-	ApNortheast2RegionID = "ap-northeast-2" // Asia Pacific (Seoul).
-	ApSouth1RegionID     = "ap-south-1"     // Asia Pacific (Mumbai).
-	ApSoutheast1RegionID = "ap-southeast-1" // Asia Pacific (Singapore).
-	ApSoutheast2RegionID = "ap-southeast-2" // Asia Pacific (Sydney).
-	CaCentral1RegionID   = "ca-central-1"   // Canada (Central).
-	EuCentral1RegionID   = "eu-central-1"   // EU (Frankfurt).
-	EuWest1RegionID      = "eu-west-1"      // EU (Ireland).
-	EuWest2RegionID      = "eu-west-2"      // EU (London).
-	SaEast1RegionID      = "sa-east-1"      // South America (Sao Paulo).
-	UsEast1RegionID      = "us-east-1"      // US East (N. Virginia).
-	UsEast2RegionID      = "us-east-2"      // US East (Ohio).
-	UsWest1RegionID      = "us-west-1"      // US West (N. California).
-	UsWest2RegionID      = "us-west-2"      // US West (Oregon).
-)
-
-// AWS China partition's regions.
-const (
-	CnNorth1RegionID = "cn-north-1" // China (Beijing).
-)
-
-// AWS GovCloud (US) partition's regions.
-const (
-	UsGovWest1RegionID = "us-gov-west-1" // AWS GovCloud (US).
-)
-
-// Service identifiers
-const (
-	AcmServiceID                          = "acm"                          // Acm.
-	ApigatewayServiceID                   = "apigateway"                   // Apigateway.
-	ApplicationAutoscalingServiceID       = "application-autoscaling"      // ApplicationAutoscaling.
-	Appstream2ServiceID                   = "appstream2"                   // Appstream2.
-	AthenaServiceID                       = "athena"                       // Athena.
-	AutoscalingServiceID                  = "autoscaling"                  // Autoscaling.
-	BatchServiceID                        = "batch"                        // Batch.
-	BudgetsServiceID                      = "budgets"                      // Budgets.
-	ClouddirectoryServiceID               = "clouddirectory"               // Clouddirectory.
-	CloudformationServiceID               = "cloudformation"               // Cloudformation.
-	CloudfrontServiceID                   = "cloudfront"                   // Cloudfront.
-	CloudhsmServiceID                     = "cloudhsm"                     // Cloudhsm.
-	CloudsearchServiceID                  = "cloudsearch"                  // Cloudsearch.
-	CloudtrailServiceID                   = "cloudtrail"                   // Cloudtrail.
-	CodebuildServiceID                    = "codebuild"                    // Codebuild.
-	CodecommitServiceID                   = "codecommit"                   // Codecommit.
-	CodedeployServiceID                   = "codedeploy"                   // Codedeploy.
-	CodepipelineServiceID                 = "codepipeline"                 // Codepipeline.
-	CodestarServiceID                     = "codestar"                     // Codestar.
-	CognitoIdentityServiceID              = "cognito-identity"             // CognitoIdentity.
-	CognitoIdpServiceID                   = "cognito-idp"                  // CognitoIdp.
-	CognitoSyncServiceID                  = "cognito-sync"                 // CognitoSync.
-	ConfigServiceID                       = "config"                       // Config.
-	CurServiceID                          = "cur"                          // Cur.
-	DatapipelineServiceID                 = "datapipeline"                 // Datapipeline.
-	DevicefarmServiceID                   = "devicefarm"                   // Devicefarm.
-	DirectconnectServiceID                = "directconnect"                // Directconnect.
-	DiscoveryServiceID                    = "discovery"                    // Discovery.
-	DmsServiceID                          = "dms"                          // Dms.
-	DsServiceID                           = "ds"                           // Ds.
-	DynamodbServiceID                     = "dynamodb"                     // Dynamodb.
-	Ec2ServiceID                          = "ec2"                          // Ec2.
-	Ec2metadataServiceID                  = "ec2metadata"                  // Ec2metadata.
-	EcrServiceID                          = "ecr"                          // Ecr.
-	EcsServiceID                          = "ecs"                          // Ecs.
-	ElasticacheServiceID                  = "elasticache"                  // Elasticache.
-	ElasticbeanstalkServiceID             = "elasticbeanstalk"             // Elasticbeanstalk.
-	ElasticfilesystemServiceID            = "elasticfilesystem"            // Elasticfilesystem.
-	ElasticloadbalancingServiceID         = "elasticloadbalancing"         // Elasticloadbalancing.
-	ElasticmapreduceServiceID             = "elasticmapreduce"             // Elasticmapreduce.
-	ElastictranscoderServiceID            = "elastictranscoder"            // Elastictranscoder.
-	EmailServiceID                        = "email"                        // Email.
-	EntitlementMarketplaceServiceID       = "entitlement.marketplace"      // EntitlementMarketplace.
-	EsServiceID                           = "es"                           // Es.
-	EventsServiceID                       = "events"                       // Events.
-	FirehoseServiceID                     = "firehose"                     // Firehose.
-	GameliftServiceID                     = "gamelift"                     // Gamelift.
-	GlacierServiceID                      = "glacier"                      // Glacier.
-	GreengrassServiceID                   = "greengrass"                   // Greengrass.
-	HealthServiceID                       = "health"                       // Health.
-	IamServiceID                          = "iam"                          // Iam.
-	ImportexportServiceID                 = "importexport"                 // Importexport.
-	InspectorServiceID                    = "inspector"                    // Inspector.
-	IotServiceID                          = "iot"                          // Iot.
-	KinesisServiceID                      = "kinesis"                      // Kinesis.
-	KinesisanalyticsServiceID             = "kinesisanalytics"             // Kinesisanalytics.
-	KmsServiceID                          = "kms"                          // Kms.
-	LambdaServiceID                       = "lambda"                       // Lambda.
-	LightsailServiceID                    = "lightsail"                    // Lightsail.
-	LogsServiceID                         = "logs"                         // Logs.
-	MachinelearningServiceID              = "machinelearning"              // Machinelearning.
-	MarketplacecommerceanalyticsServiceID = "marketplacecommerceanalytics" // Marketplacecommerceanalytics.
-	MeteringMarketplaceServiceID          = "metering.marketplace"         // MeteringMarketplace.
-	MobileanalyticsServiceID              = "mobileanalytics"              // Mobileanalytics.
-	ModelsLexServiceID                    = "models.lex"                   // ModelsLex.
-	MonitoringServiceID                   = "monitoring"                   // Monitoring.
-	MturkRequesterServiceID               = "mturk-requester"              // MturkRequester.
-	OpsworksServiceID                     = "opsworks"                     // Opsworks.
-	OpsworksCmServiceID                   = "opsworks-cm"                  // OpsworksCm.
-	OrganizationsServiceID                = "organizations"                // Organizations.
-	PinpointServiceID                     = "pinpoint"                     // Pinpoint.
-	PollyServiceID                        = "polly"                        // Polly.
-	RdsServiceID                          = "rds"                          // Rds.
-	RedshiftServiceID                     = "redshift"                     // Redshift.
-	RekognitionServiceID                  = "rekognition"                  // Rekognition.
-	Route53ServiceID                      = "route53"                      // Route53.
-	Route53domainsServiceID               = "route53domains"               // Route53domains.
-	RuntimeLexServiceID                   = "runtime.lex"                  // RuntimeLex.
-	S3ServiceID                           = "s3"                           // S3.
-	SdbServiceID                          = "sdb"                          // Sdb.
-	ServicecatalogServiceID               = "servicecatalog"               // Servicecatalog.
-	ShieldServiceID                       = "shield"                       // Shield.
-	SmsServiceID                          = "sms"                          // Sms.
-	SnowballServiceID                     = "snowball"                     // Snowball.
-	SnsServiceID                          = "sns"                          // Sns.
-	SqsServiceID                          = "sqs"                          // Sqs.
-	SsmServiceID                          = "ssm"                          // Ssm.
-	StatesServiceID                       = "states"                       // States.
-	StoragegatewayServiceID               = "storagegateway"               // Storagegateway.
-	StreamsDynamodbServiceID              = "streams.dynamodb"             // StreamsDynamodb.
-	StsServiceID                          = "sts"                          // Sts.
-	SupportServiceID                      = "support"                      // Support.
-	SwfServiceID                          = "swf"                          // Swf.
-	TaggingServiceID                      = "tagging"                      // Tagging.
-	WafServiceID                          = "waf"                          // Waf.
-	WafRegionalServiceID                  = "waf-regional"                 // WafRegional.
-	WorkdocsServiceID                     = "workdocs"                     // Workdocs.
-	WorkspacesServiceID                   = "workspaces"                   // Workspaces.
-	XrayServiceID                         = "xray"                         // Xray.
-)
-
-// DefaultResolver returns an Endpoint resolver that will be able
-// to resolve endpoints for: AWS Standard, AWS China, and AWS GovCloud (US).
-//
-// Use DefaultPartitions() to get the list of the default partitions.
-func DefaultResolver() Resolver {
-	return defaultPartitions
-}
-
-// DefaultPartitions returns a list of the partitions the SDK is bundled
-// with. The available partitions are: AWS Standard, AWS China, and AWS GovCloud (US).
-//
-//    partitions := endpoints.DefaultPartitions
-//    for _, p := range partitions {
-//        // ... inspect partitions
-//    }
-func DefaultPartitions() []Partition {
-	return defaultPartitions.Partitions()
-}
-
-var defaultPartitions = partitions{
-	awsPartition,
-	awscnPartition,
-	awsusgovPartition,
-}
-
-// AwsPartition returns the Resolver for AWS Standard.
-func AwsPartition() Partition {
-	return awsPartition.Partition()
-}
-
-var awsPartition = partition{
-	ID:        "aws",
-	Name:      "AWS Standard",
-	DNSSuffix: "amazonaws.com",
-	RegionRegex: regionRegex{
-		Regexp: func() *regexp.Regexp {
-			reg, _ := regexp.Compile("^(us|eu|ap|sa|ca)\\-\\w+\\-\\d+$")
-			return reg
-		}(),
-	},
-	Defaults: endpoint{
-		Hostname:          "{service}.{region}.{dnsSuffix}",
-		Protocols:         []string{"https"},
-		SignatureVersions: []string{"v4"},
-	},
-	Regions: regions{
-		"ap-northeast-1": region{
-			Description: "Asia Pacific (Tokyo)",
-		},
-		"ap-northeast-2": region{
-			Description: "Asia Pacific (Seoul)",
-		},
-		"ap-south-1": region{
-			Description: "Asia Pacific (Mumbai)",
-		},
-		"ap-southeast-1": region{
-			Description: "Asia Pacific (Singapore)",
-		},
-		"ap-southeast-2": region{
-			Description: "Asia Pacific (Sydney)",
-		},
-		"ca-central-1": region{
-			Description: "Canada (Central)",
-		},
-		"eu-central-1": region{
-			Description: "EU (Frankfurt)",
-		},
-		"eu-west-1": region{
-			Description: "EU (Ireland)",
-		},
-		"eu-west-2": region{
-			Description: "EU (London)",
-		},
-		"sa-east-1": region{
-			Description: "South America (Sao Paulo)",
-		},
-		"us-east-1": region{
-			Description: "US East (N. Virginia)",
-		},
-		"us-east-2": region{
-			Description: "US East (Ohio)",
-		},
-		"us-west-1": region{
-			Description: "US West (N. California)",
-		},
-		"us-west-2": region{
-			Description: "US West (Oregon)",
-		},
-	},
-	Services: services{
-		"acm": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"apigateway": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"application-autoscaling": service{
-			Defaults: endpoint{
-				Hostname:  "autoscaling.{region}.amazonaws.com",
-				Protocols: []string{"http", "https"},
-				CredentialScope: credentialScope{
-					Service: "application-autoscaling",
-				},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"appstream2": service{
-			Defaults: endpoint{
-				Protocols: []string{"https"},
-				CredentialScope: credentialScope{
-					Service: "appstream",
-				},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"eu-west-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"athena": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"eu-west-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"autoscaling": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"batch": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"budgets": service{
-			PartitionEndpoint: "aws-global",
-			IsRegionalized:    boxedFalse,
-
-			Endpoints: endpoints{
-				"aws-global": endpoint{
-					Hostname: "budgets.amazonaws.com",
-					CredentialScope: credentialScope{
-						Region: "us-east-1",
-					},
-				},
-			},
-		},
-		"clouddirectory": service{
-
-			Endpoints: endpoints{
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"cloudformation": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"cloudfront": service{
-			PartitionEndpoint: "aws-global",
-			IsRegionalized:    boxedFalse,
-
-			Endpoints: endpoints{
-				"aws-global": endpoint{
-					Hostname:  "cloudfront.amazonaws.com",
-					Protocols: []string{"http", "https"},
-					CredentialScope: credentialScope{
-						Region: "us-east-1",
-					},
-				},
-			},
-		},
-		"cloudhsm": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"cloudsearch": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"cloudtrail": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"codebuild": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"codecommit": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"codedeploy": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"codepipeline": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"codestar": service{
-
-			Endpoints: endpoints{
-				"eu-west-1": endpoint{},
-				"us-east-1": endpoint{},
-				"us-east-2": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"cognito-identity": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"cognito-idp": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"cognito-sync": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"config": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"cur": service{
-
-			Endpoints: endpoints{
-				"us-east-1": endpoint{},
-			},
-		},
-		"datapipeline": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-west-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"devicefarm": service{
-
-			Endpoints: endpoints{
-				"us-west-2": endpoint{},
-			},
-		},
-		"directconnect": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"discovery": service{
-
-			Endpoints: endpoints{
-				"us-west-2": endpoint{},
-			},
-		},
-		"dms": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"ds": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"dynamodb": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"local": endpoint{
-					Hostname:  "localhost:8000",
-					Protocols: []string{"http"},
-					CredentialScope: credentialScope{
-						Region: "us-east-1",
-					},
-				},
-				"sa-east-1": endpoint{},
-				"us-east-1": endpoint{},
-				"us-east-2": endpoint{},
-				"us-west-1": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"ec2": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"ec2metadata": service{
-			PartitionEndpoint: "aws-global",
-			IsRegionalized:    boxedFalse,
-
-			Endpoints: endpoints{
-				"aws-global": endpoint{
-					Hostname:  "169.254.169.254/latest",
-					Protocols: []string{"http"},
-				},
-			},
-		},
-		"ecr": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"ecs": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"elasticache": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"elasticbeanstalk": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"elasticfilesystem": service{
-
-			Endpoints: endpoints{
-				"ap-southeast-2": endpoint{},
-				"eu-west-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"elasticloadbalancing": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"elasticmapreduce": service{
-			Defaults: endpoint{
-				SSLCommonName: "{region}.{service}.{dnsSuffix}",
-				Protocols:     []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1": endpoint{
-					SSLCommonName: "{service}.{region}.{dnsSuffix}",
-				},
-				"eu-west-1": endpoint{},
-				"eu-west-2": endpoint{},
-				"sa-east-1": endpoint{},
-				"us-east-1": endpoint{
-					SSLCommonName: "{service}.{region}.{dnsSuffix}",
-				},
-				"us-east-2": endpoint{},
-				"us-west-1": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"elastictranscoder": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-west-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"email": service{
-
-			Endpoints: endpoints{
-				"eu-west-1": endpoint{},
-				"us-east-1": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"entitlement.marketplace": service{
-			Defaults: endpoint{
-				CredentialScope: credentialScope{
-					Service: "aws-marketplace",
-				},
-			},
-			Endpoints: endpoints{
-				"us-east-1": endpoint{},
-			},
-		},
-		"es": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"events": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"firehose": service{
-
-			Endpoints: endpoints{
-				"eu-west-1": endpoint{},
-				"us-east-1": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"gamelift": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"glacier": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"greengrass": service{
-			IsRegionalized: boxedTrue,
-			Defaults: endpoint{
-				Protocols: []string{"https"},
-			},
-			Endpoints: endpoints{
-				"ap-southeast-2": endpoint{},
-				"eu-central-1":   endpoint{},
-				"us-east-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"health": service{
-
-			Endpoints: endpoints{
-				"us-east-1": endpoint{},
-			},
-		},
-		"iam": service{
-			PartitionEndpoint: "aws-global",
-			IsRegionalized:    boxedFalse,
-
-			Endpoints: endpoints{
-				"aws-global": endpoint{
-					Hostname: "iam.amazonaws.com",
-					CredentialScope: credentialScope{
-						Region: "us-east-1",
-					},
-				},
-			},
-		},
-		"importexport": service{
-			PartitionEndpoint: "aws-global",
-			IsRegionalized:    boxedFalse,
-
-			Endpoints: endpoints{
-				"aws-global": endpoint{
-					Hostname:          "importexport.amazonaws.com",
-					SignatureVersions: []string{"v2", "v4"},
-					CredentialScope: credentialScope{
-						Region:  "us-east-1",
-						Service: "IngestionService",
-					},
-				},
-			},
-		},
-		"inspector": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-west-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"iot": service{
-			Defaults: endpoint{
-				CredentialScope: credentialScope{
-					Service: "execute-api",
-				},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"kinesis": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"kinesisanalytics": service{
-
-			Endpoints: endpoints{
-				"eu-west-1": endpoint{},
-				"us-east-1": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"kms": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"lambda": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"lightsail": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"logs": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"machinelearning": service{
-
-			Endpoints: endpoints{
-				"eu-west-1": endpoint{},
-				"us-east-1": endpoint{},
-			},
-		},
-		"marketplacecommerceanalytics": service{
-
-			Endpoints: endpoints{
-				"us-east-1": endpoint{},
-			},
-		},
-		"metering.marketplace": service{
-			Defaults: endpoint{
-				CredentialScope: credentialScope{
-					Service: "aws-marketplace",
-				},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"mobileanalytics": service{
-
-			Endpoints: endpoints{
-				"us-east-1": endpoint{},
-			},
-		},
-		"models.lex": service{
-			Defaults: endpoint{
-				CredentialScope: credentialScope{
-					Service: "lex",
-				},
-			},
-			Endpoints: endpoints{
-				"us-east-1": endpoint{},
-			},
-		},
-		"monitoring": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"mturk-requester": service{
-			IsRegionalized: boxedFalse,
-
-			Endpoints: endpoints{
-				"sandbox": endpoint{
-					Hostname: "mturk-requester-sandbox.us-east-1.amazonaws.com",
-				},
-				"us-east-1": endpoint{},
-			},
-		},
-		"opsworks": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"opsworks-cm": service{
-
-			Endpoints: endpoints{
-				"eu-west-1": endpoint{},
-				"us-east-1": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"organizations": service{
-			PartitionEndpoint: "aws-global",
-			IsRegionalized:    boxedFalse,
-
-			Endpoints: endpoints{
-				"aws-global": endpoint{
-					Hostname: "organizations.us-east-1.amazonaws.com",
-					CredentialScope: credentialScope{
-						Region: "us-east-1",
-					},
-				},
-			},
-		},
-		"pinpoint": service{
-			Defaults: endpoint{
-				CredentialScope: credentialScope{
-					Service: "mobiletargeting",
-				},
-			},
-			Endpoints: endpoints{
-				"us-east-1": endpoint{},
-			},
-		},
-		"polly": service{
-
-			Endpoints: endpoints{
-				"eu-west-1": endpoint{},
-				"us-east-1": endpoint{},
-				"us-east-2": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"rds": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1": endpoint{
-					SSLCommonName: "{service}.{dnsSuffix}",
-				},
-				"us-east-2": endpoint{},
-				"us-west-1": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"redshift": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"rekognition": service{
-
-			Endpoints: endpoints{
-				"eu-west-1": endpoint{},
-				"us-east-1": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"route53": service{
-			PartitionEndpoint: "aws-global",
-			IsRegionalized:    boxedFalse,
-
-			Endpoints: endpoints{
-				"aws-global": endpoint{
-					Hostname: "route53.amazonaws.com",
-					CredentialScope: credentialScope{
-						Region: "us-east-1",
-					},
-				},
-			},
-		},
-		"route53domains": service{
-
-			Endpoints: endpoints{
-				"us-east-1": endpoint{},
-			},
-		},
-		"runtime.lex": service{
-			Defaults: endpoint{
-				CredentialScope: credentialScope{
-					Service: "lex",
-				},
-			},
-			Endpoints: endpoints{
-				"us-east-1": endpoint{},
-			},
-		},
-		"s3": service{
-			PartitionEndpoint: "us-east-1",
-			IsRegionalized:    boxedTrue,
-			Defaults: endpoint{
-				Protocols:         []string{"http", "https"},
-				SignatureVersions: []string{"s3v4"},
-
-				HasDualStack:      boxedTrue,
-				DualStackHostname: "{service}.dualstack.{region}.{dnsSuffix}",
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{
-					Hostname:          "s3-ap-northeast-1.amazonaws.com",
-					SignatureVersions: []string{"s3", "s3v4"},
-				},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{
-					Hostname:          "s3-ap-southeast-1.amazonaws.com",
-					SignatureVersions: []string{"s3", "s3v4"},
-				},
-				"ap-southeast-2": endpoint{
-					Hostname:          "s3-ap-southeast-2.amazonaws.com",
-					SignatureVersions: []string{"s3", "s3v4"},
-				},
-				"ca-central-1": endpoint{},
-				"eu-central-1": endpoint{},
-				"eu-west-1": endpoint{
-					Hostname:          "s3-eu-west-1.amazonaws.com",
-					SignatureVersions: []string{"s3", "s3v4"},
-				},
-				"eu-west-2": endpoint{},
-				"s3-external-1": endpoint{
-					Hostname:          "s3-external-1.amazonaws.com",
-					SignatureVersions: []string{"s3", "s3v4"},
-					CredentialScope: credentialScope{
-						Region: "us-east-1",
-					},
-				},
-				"sa-east-1": endpoint{
-					Hostname:          "s3-sa-east-1.amazonaws.com",
-					SignatureVersions: []string{"s3", "s3v4"},
-				},
-				"us-east-1": endpoint{
-					Hostname:          "s3.amazonaws.com",
-					SignatureVersions: []string{"s3", "s3v4"},
-				},
-				"us-east-2": endpoint{},
-				"us-west-1": endpoint{
-					Hostname:          "s3-us-west-1.amazonaws.com",
-					SignatureVersions: []string{"s3", "s3v4"},
-				},
-				"us-west-2": endpoint{
-					Hostname:          "s3-us-west-2.amazonaws.com",
-					SignatureVersions: []string{"s3", "s3v4"},
-				},
-			},
-		},
-		"sdb": service{
-			Defaults: endpoint{
-				Protocols:         []string{"http", "https"},
-				SignatureVersions: []string{"v2"},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-west-1":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1": endpoint{
-					Hostname: "sdb.amazonaws.com",
-				},
-				"us-west-1": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"servicecatalog": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"shield": service{
-			IsRegionalized: boxedFalse,
-			Defaults: endpoint{
-				SSLCommonName: "Shield.us-east-1.amazonaws.com",
-				Protocols:     []string{"https"},
-			},
-			Endpoints: endpoints{
-				"us-east-1": endpoint{},
-			},
-		},
-		"sms": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"snowball": service{
-
-			Endpoints: endpoints{
-				"ap-south-1":     endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"sns": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"sqs": service{
-			Defaults: endpoint{
-				SSLCommonName: "{region}.queue.{dnsSuffix}",
-				Protocols:     []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1": endpoint{
-					SSLCommonName: "queue.{dnsSuffix}",
-				},
-				"us-east-2": endpoint{},
-				"us-west-1": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"ssm": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"states": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"storagegateway": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"streams.dynamodb": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-				CredentialScope: credentialScope{
-					Service: "dynamodb",
-				},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"local": endpoint{
-					Hostname:  "localhost:8000",
-					Protocols: []string{"http"},
-					CredentialScope: credentialScope{
-						Region: "us-east-1",
-					},
-				},
-				"sa-east-1": endpoint{},
-				"us-east-1": endpoint{},
-				"us-east-2": endpoint{},
-				"us-west-1": endpoint{},
-				"us-west-2": endpoint{},
-			},
-		},
-		"sts": service{
-			PartitionEndpoint: "aws-global",
-			Defaults: endpoint{
-				Hostname: "sts.amazonaws.com",
-				CredentialScope: credentialScope{
-					Region: "us-east-1",
-				},
-			},
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{
-					Hostname: "sts.ap-northeast-2.amazonaws.com",
-					CredentialScope: credentialScope{
-						Region: "ap-northeast-2",
-					},
-				},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"aws-global":     endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-1-fips": endpoint{
-					Hostname: "sts-fips.us-east-1.amazonaws.com",
-					CredentialScope: credentialScope{
-						Region: "us-east-1",
-					},
-				},
-				"us-east-2": endpoint{},
-				"us-east-2-fips": endpoint{
-					Hostname: "sts-fips.us-east-2.amazonaws.com",
-					CredentialScope: credentialScope{
-						Region: "us-east-2",
-					},
-				},
-				"us-west-1": endpoint{},
-				"us-west-1-fips": endpoint{
-					Hostname: "sts-fips.us-west-1.amazonaws.com",
-					CredentialScope: credentialScope{
-						Region: "us-west-1",
-					},
-				},
-				"us-west-2": endpoint{},
-				"us-west-2-fips": endpoint{
-					Hostname: "sts-fips.us-west-2.amazonaws.com",
-					CredentialScope: credentialScope{
-						Region: "us-west-2",
-					},
-				},
-			},
-		},
-		"support": service{
-
-			Endpoints: endpoints{
-				"us-east-1": endpoint{},
-			},
-		},
-		"swf": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"tagging": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"waf": service{
-			PartitionEndpoint: "aws-global",
-			IsRegionalized:    boxedFalse,
-
-			Endpoints: endpoints{
-				"aws-global": endpoint{
-					Hostname: "waf.amazonaws.com",
-					CredentialScope: credentialScope{
-						Region: "us-east-1",
-					},
-				},
-			},
-		},
-		"waf-regional": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"eu-west-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"workdocs": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-west-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"workspaces": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-		"xray": service{
-
-			Endpoints: endpoints{
-				"ap-northeast-1": endpoint{},
-				"ap-northeast-2": endpoint{},
-				"ap-south-1":     endpoint{},
-				"ap-southeast-1": endpoint{},
-				"ap-southeast-2": endpoint{},
-				"ca-central-1":   endpoint{},
-				"eu-central-1":   endpoint{},
-				"eu-west-1":      endpoint{},
-				"eu-west-2":      endpoint{},
-				"sa-east-1":      endpoint{},
-				"us-east-1":      endpoint{},
-				"us-east-2":      endpoint{},
-				"us-west-1":      endpoint{},
-				"us-west-2":      endpoint{},
-			},
-		},
-	},
-}
-
-// AwsCnPartition returns the Resolver for AWS China.
-func AwsCnPartition() Partition {
-	return awscnPartition.Partition()
-}
-
-var awscnPartition = partition{
-	ID:        "aws-cn",
-	Name:      "AWS China",
-	DNSSuffix: "amazonaws.com.cn",
-	RegionRegex: regionRegex{
-		Regexp: func() *regexp.Regexp {
-			reg, _ := regexp.Compile("^cn\\-\\w+\\-\\d+$")
-			return reg
-		}(),
-	},
-	Defaults: endpoint{
-		Hostname:          "{service}.{region}.{dnsSuffix}",
-		Protocols:         []string{"https"},
-		SignatureVersions: []string{"v4"},
-	},
-	Regions: regions{
-		"cn-north-1": region{
-			Description: "China (Beijing)",
-		},
-	},
-	Services: services{
-		"autoscaling": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"cloudformation": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"cloudtrail": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"codedeploy": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"config": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"directconnect": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"dynamodb": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"ec2": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"ec2metadata": service{
-			PartitionEndpoint: "aws-global",
-			IsRegionalized:    boxedFalse,
-
-			Endpoints: endpoints{
-				"aws-global": endpoint{
-					Hostname:  "169.254.169.254/latest",
-					Protocols: []string{"http"},
-				},
-			},
-		},
-		"ecr": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"ecs": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"elasticache": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"elasticbeanstalk": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"elasticloadbalancing": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"elasticmapreduce": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"events": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"glacier": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"iam": service{
-			PartitionEndpoint: "aws-cn-global",
-			IsRegionalized:    boxedFalse,
-
-			Endpoints: endpoints{
-				"aws-cn-global": endpoint{
-					Hostname: "iam.cn-north-1.amazonaws.com.cn",
-					CredentialScope: credentialScope{
-						Region: "cn-north-1",
-					},
-				},
-			},
-		},
-		"kinesis": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"logs": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"monitoring": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"rds": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"redshift": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"s3": service{
-			Defaults: endpoint{
-				Protocols:         []string{"http", "https"},
-				SignatureVersions: []string{"s3v4"},
-			},
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"sns": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"sqs": service{
-			Defaults: endpoint{
-				SSLCommonName: "{region}.queue.{dnsSuffix}",
-				Protocols:     []string{"http", "https"},
-			},
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"ssm": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"storagegateway": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"streams.dynamodb": service{
-			Defaults: endpoint{
-				Protocols: []string{"http", "https"},
-				CredentialScope: credentialScope{
-					Service: "dynamodb",
-				},
-			},
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"sts": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"swf": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-		"tagging": service{
-
-			Endpoints: endpoints{
-				"cn-north-1": endpoint{},
-			},
-		},
-	},
-}
-
-// AwsUsGovPartition returns the Resolver for AWS GovCloud (US).
-func AwsUsGovPartition() Partition {
-	return awsusgovPartition.Partition()
-}
-
-var awsusgovPartition = partition{
-	ID:        "aws-us-gov",
-	Name:      "AWS GovCloud (US)",
-	DNSSuffix: "amazonaws.com",
-	RegionRegex: regionRegex{
-		Regexp: func() *regexp.Regexp {
-			reg, _ := regexp.Compile("^us\\-gov\\-\\w+\\-\\d+$")
-			return reg
-		}(),
-	},
-	Defaults: endpoint{
-		Hostname:          "{service}.{region}.{dnsSuffix}",
-		Protocols:         []string{"https"},
-		SignatureVersions: []string{"v4"},
-	},
-	Regions: regions{
-		"us-gov-west-1": region{
-			Description: "AWS GovCloud (US)",
-		},
-	},
-	Services: services{
-		"autoscaling": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{
-					Protocols: []string{"http", "https"},
-				},
-			},
-		},
-		"cloudformation": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"cloudhsm": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"cloudtrail": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"codedeploy": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"config": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"directconnect": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"dynamodb": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"ec2": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"ec2metadata": service{
-			PartitionEndpoint: "aws-global",
-			IsRegionalized:    boxedFalse,
-
-			Endpoints: endpoints{
-				"aws-global": endpoint{
-					Hostname:  "169.254.169.254/latest",
-					Protocols: []string{"http"},
-				},
-			},
-		},
-		"elasticache": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"elasticloadbalancing": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{
-					Protocols: []string{"http", "https"},
-				},
-			},
-		},
-		"elasticmapreduce": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{
-					Protocols: []string{"http", "https"},
-				},
-			},
-		},
-		"events": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"glacier": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{
-					Protocols: []string{"http", "https"},
-				},
-			},
-		},
-		"iam": service{
-			PartitionEndpoint: "aws-us-gov-global",
-			IsRegionalized:    boxedFalse,
-
-			Endpoints: endpoints{
-				"aws-us-gov-global": endpoint{
-					Hostname: "iam.us-gov.amazonaws.com",
-					CredentialScope: credentialScope{
-						Region: "us-gov-west-1",
-					},
-				},
-			},
-		},
-		"kinesis": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"kms": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"lambda": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"logs": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"monitoring": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"rds": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"redshift": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"rekognition": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"s3": service{
-			Defaults: endpoint{
-				SignatureVersions: []string{"s3", "s3v4"},
-			},
-			Endpoints: endpoints{
-				"fips-us-gov-west-1": endpoint{
-					Hostname: "s3-fips-us-gov-west-1.amazonaws.com",
-					CredentialScope: credentialScope{
-						Region: "us-gov-west-1",
-					},
-				},
-				"us-gov-west-1": endpoint{
-					Hostname:  "s3-us-gov-west-1.amazonaws.com",
-					Protocols: []string{"http", "https"},
-				},
-			},
-		},
-		"sms": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"snowball": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"sns": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{
-					Protocols: []string{"http", "https"},
-				},
-			},
-		},
-		"sqs": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{
-					SSLCommonName: "{region}.queue.{dnsSuffix}",
-					Protocols:     []string{"http", "https"},
-				},
-			},
-		},
-		"ssm": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"streams.dynamodb": service{
-			Defaults: endpoint{
-				CredentialScope: credentialScope{
-					Service: "dynamodb",
-				},
-			},
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"sts": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-		"swf": service{
-
-			Endpoints: endpoints{
-				"us-gov-west-1": endpoint{},
-			},
-		},
-	},
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/doc.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/doc.go
deleted file mode 100644
index 84316b92c0..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/doc.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Package endpoints provides the types and functionality for defining regions
-// and endpoints, as well as querying those definitions.
-//
-// The SDK's Regions and Endpoints metadata is code generated into the endpoints
-// package, and is accessible via the DefaultResolver function. This function
-// returns a endpoint Resolver will search the metadata and build an associated
-// endpoint if one is found. The default resolver will search all partitions
-// known by the SDK. e.g AWS Standard (aws), AWS China (aws-cn), and
-// AWS GovCloud (US) (aws-us-gov).
-// .
-//
-// Enumerating Regions and Endpoint Metadata
-//
-// Casting the Resolver returned by DefaultResolver to a EnumPartitions interface
-// will allow you to get access to the list of underlying Partitions with the
-// Partitions method. This is helpful if you want to limit the SDK's endpoint
-// resolving to a single partition, or enumerate regions, services, and endpoints
-// in the partition.
-//
-//     resolver := endpoints.DefaultResolver()
-//     partitions := resolver.(endpoints.EnumPartitions).Partitions()
-//
-//     for _, p := range partitions {
-//         fmt.Println("Regions for", p.ID())
-//         for id, _ := range p.Regions() {
-//             fmt.Println("*", id)
-//         }
-//
-//         fmt.Println("Services for", p.ID())
-//         for id, _ := range p.Services() {
-//             fmt.Println("*", id)
-//         }
-//     }
-//
-// Using Custom Endpoints
-//
-// The endpoints package also gives you the ability to use your own logic how
-// endpoints are resolved. This is a great way to define a custom endpoint
-// for select services, without passing that logic down through your code.
-//
-// If a type implements the Resolver interface it can be used to resolve
-// endpoints. To use this with the SDK's Session and Config set the value
-// of the type to the EndpointsResolver field of aws.Config when initializing
-// the session, or service client.
-//
-// In addition the ResolverFunc is a wrapper for a func matching the signature
-// of Resolver.EndpointFor, converting it to a type that satisfies the
-// Resolver interface.
-//
-//
-//     myCustomResolver := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) {
-//         if service == endpoints.S3ServiceID {
-//             return endpoints.ResolvedEndpoint{
-//                 URL:           "s3.custom.endpoint.com",
-//                 SigningRegion: "custom-signing-region",
-//             }, nil
-//         }
-//
-//         return endpoints.DefaultResolver().EndpointFor(service, region, optFns...)
-//     }
-//
-//     sess := session.Must(session.NewSession(&aws.Config{
-//         Region:           aws.String("us-west-2"),
-//         EndpointResolver: endpoints.ResolverFunc(myCustomResolver),
-//     }))
-package endpoints
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go
deleted file mode 100644
index 9c3eedb48d..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go
+++ /dev/null
@@ -1,439 +0,0 @@
-package endpoints
-
-import (
-	"fmt"
-	"regexp"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-// Options provide the configuration needed to direct how the
-// endpoints will be resolved.
-type Options struct {
-	// DisableSSL forces the endpoint to be resolved as HTTP.
-	// instead of HTTPS if the service supports it.
-	DisableSSL bool
-
-	// Sets the resolver to resolve the endpoint as a dualstack endpoint
-	// for the service. If dualstack support for a service is not known and
-	// StrictMatching is not enabled a dualstack endpoint for the service will
-	// be returned. This endpoint may not be valid. If StrictMatching is
-	// enabled only services that are known to support dualstack will return
-	// dualstack endpoints.
-	UseDualStack bool
-
-	// Enables strict matching of services and regions resolved endpoints.
-	// If the partition doesn't enumerate the exact service and region an
-	// error will be returned. This option will prevent returning endpoints
-	// that look valid, but may not resolve to any real endpoint.
-	StrictMatching bool
-
-	// Enables resolving a service endpoint based on the region provided if the
-	// service does not exist. The service endpoint ID will be used as the service
-	// domain name prefix. By default the endpoint resolver requires the service
-	// to be known when resolving endpoints.
-	//
-	// If resolving an endpoint on the partition list the provided region will
-	// be used to determine which partition's domain name pattern to the service
-	// endpoint ID with. If both the service and region are unkonwn and resolving
-	// the endpoint on partition list an UnknownEndpointError error will be returned.
-	//
-	// If resolving and endpoint on a partition specific resolver that partition's
-	// domain name pattern will be used with the service endpoint ID. If both
-	// region and service do not exist when resolving an endpoint on a specific
-	// partition the partition's domain pattern will be used to combine the
-	// endpoint and region together.
-	//
-	// This option is ignored if StrictMatching is enabled.
-	ResolveUnknownService bool
-}
-
-// Set combines all of the option functions together.
-func (o *Options) Set(optFns ...func(*Options)) {
-	for _, fn := range optFns {
-		fn(o)
-	}
-}
-
-// DisableSSLOption sets the DisableSSL options. Can be used as a functional
-// option when resolving endpoints.
-func DisableSSLOption(o *Options) {
-	o.DisableSSL = true
-}
-
-// UseDualStackOption sets the UseDualStack option. Can be used as a functional
-// option when resolving endpoints.
-func UseDualStackOption(o *Options) {
-	o.UseDualStack = true
-}
-
-// StrictMatchingOption sets the StrictMatching option. Can be used as a functional
-// option when resolving endpoints.
-func StrictMatchingOption(o *Options) {
-	o.StrictMatching = true
-}
-
-// ResolveUnknownServiceOption sets the ResolveUnknownService option. Can be used
-// as a functional option when resolving endpoints.
-func ResolveUnknownServiceOption(o *Options) {
-	o.ResolveUnknownService = true
-}
-
-// A Resolver provides the interface for functionality to resolve endpoints.
-// The build in Partition and DefaultResolver return value satisfy this interface.
-type Resolver interface {
-	EndpointFor(service, region string, opts ...func(*Options)) (ResolvedEndpoint, error)
-}
-
-// ResolverFunc is a helper utility that wraps a function so it satisfies the
-// Resolver interface. This is useful when you want to add additional endpoint
-// resolving logic, or stub out specific endpoints with custom values.
-type ResolverFunc func(service, region string, opts ...func(*Options)) (ResolvedEndpoint, error)
-
-// EndpointFor wraps the ResolverFunc function to satisfy the Resolver interface.
-func (fn ResolverFunc) EndpointFor(service, region string, opts ...func(*Options)) (ResolvedEndpoint, error) {
-	return fn(service, region, opts...)
-}
-
-var schemeRE = regexp.MustCompile("^([^:]+)://")
-
-// AddScheme adds the HTTP or HTTPS schemes to a endpoint URL if there is no
-// scheme. If disableSSL is true HTTP will set HTTP instead of the default HTTPS.
-//
-// If disableSSL is set, it will only set the URL's scheme if the URL does not
-// contain a scheme.
-func AddScheme(endpoint string, disableSSL bool) string {
-	if !schemeRE.MatchString(endpoint) {
-		scheme := "https"
-		if disableSSL {
-			scheme = "http"
-		}
-		endpoint = fmt.Sprintf("%s://%s", scheme, endpoint)
-	}
-
-	return endpoint
-}
-
-// EnumPartitions a provides a way to retrieve the underlying partitions that
-// make up the SDK's default Resolver, or any resolver decoded from a model
-// file.
-//
-// Use this interface with DefaultResolver and DecodeModels to get the list of
-// Partitions.
-type EnumPartitions interface {
-	Partitions() []Partition
-}
-
-// RegionsForService returns a map of regions for the partition and service.
-// If either the partition or service does not exist false will be returned
-// as the second parameter.
-//
-// This example shows how  to get the regions for DynamoDB in the AWS partition.
-//    rs, exists := endpoints.RegionsForService(endpoints.DefaultPartitions(), endpoints.AwsPartitionID, endpoints.DynamodbServiceID)
-//
-// This is equivalent to using the partition directly.
-//    rs := endpoints.AwsPartition().Services()[endpoints.DynamodbServiceID].Regions()
-func RegionsForService(ps []Partition, partitionID, serviceID string) (map[string]Region, bool) {
-	for _, p := range ps {
-		if p.ID() != partitionID {
-			continue
-		}
-		if _, ok := p.p.Services[serviceID]; !ok {
-			break
-		}
-
-		s := Service{
-			id: serviceID,
-			p:  p.p,
-		}
-		return s.Regions(), true
-	}
-
-	return map[string]Region{}, false
-}
-
-// PartitionForRegion returns the first partition which includes the region
-// passed in. This includes both known regions and regions which match
-// a pattern supported by the partition which may include regions that are
-// not explicitly known by the partition. Use the Regions method of the
-// returned Partition if explicit support is needed.
-func PartitionForRegion(ps []Partition, regionID string) (Partition, bool) {
-	for _, p := range ps {
-		if _, ok := p.p.Regions[regionID]; ok || p.p.RegionRegex.MatchString(regionID) {
-			return p, true
-		}
-	}
-
-	return Partition{}, false
-}
-
-// A Partition provides the ability to enumerate the partition's regions
-// and services.
-type Partition struct {
-	id string
-	p  *partition
-}
-
-// ID returns the identifier of the partition.
-func (p Partition) ID() string { return p.id }
-
-// EndpointFor attempts to resolve the endpoint based on service and region.
-// See Options for information on configuring how the endpoint is resolved.
-//
-// If the service cannot be found in the metadata the UnknownServiceError
-// error will be returned. This validation will occur regardless if
-// StrictMatching is enabled. To enable resolving unknown services set the
-// "ResolveUnknownService" option to true. When StrictMatching is disabled
-// this option allows the partition resolver to resolve a endpoint based on
-// the service endpoint ID provided.
-//
-// When resolving endpoints you can choose to enable StrictMatching. This will
-// require the provided service and region to be known by the partition.
-// If the endpoint cannot be strictly resolved an error will be returned. This
-// mode is useful to ensure the endpoint resolved is valid. Without
-// StrictMatching enabled the endpoint returned my look valid but may not work.
-// StrictMatching requires the SDK to be updated if you want to take advantage
-// of new regions and services expansions.
-//
-// Errors that can be returned.
-//   * UnknownServiceError
-//   * UnknownEndpointError
-func (p Partition) EndpointFor(service, region string, opts ...func(*Options)) (ResolvedEndpoint, error) {
-	return p.p.EndpointFor(service, region, opts...)
-}
-
-// Regions returns a map of Regions indexed by their ID. This is useful for
-// enumerating over the regions in a partition.
-func (p Partition) Regions() map[string]Region {
-	rs := map[string]Region{}
-	for id := range p.p.Regions {
-		rs[id] = Region{
-			id: id,
-			p:  p.p,
-		}
-	}
-
-	return rs
-}
-
-// Services returns a map of Service indexed by their ID. This is useful for
-// enumerating over the services in a partition.
-func (p Partition) Services() map[string]Service {
-	ss := map[string]Service{}
-	for id := range p.p.Services {
-		ss[id] = Service{
-			id: id,
-			p:  p.p,
-		}
-	}
-
-	return ss
-}
-
-// A Region provides information about a region, and ability to resolve an
-// endpoint from the context of a region, given a service.
-type Region struct {
-	id, desc string
-	p        *partition
-}
-
-// ID returns the region's identifier.
-func (r Region) ID() string { return r.id }
-
-// ResolveEndpoint resolves an endpoint from the context of the region given
-// a service. See Partition.EndpointFor for usage and errors that can be returned.
-func (r Region) ResolveEndpoint(service string, opts ...func(*Options)) (ResolvedEndpoint, error) {
-	return r.p.EndpointFor(service, r.id, opts...)
-}
-
-// Services returns a list of all services that are known to be in this region.
-func (r Region) Services() map[string]Service {
-	ss := map[string]Service{}
-	for id, s := range r.p.Services {
-		if _, ok := s.Endpoints[r.id]; ok {
-			ss[id] = Service{
-				id: id,
-				p:  r.p,
-			}
-		}
-	}
-
-	return ss
-}
-
-// A Service provides information about a service, and ability to resolve an
-// endpoint from the context of a service, given a region.
-type Service struct {
-	id string
-	p  *partition
-}
-
-// ID returns the identifier for the service.
-func (s Service) ID() string { return s.id }
-
-// ResolveEndpoint resolves an endpoint from the context of a service given
-// a region. See Partition.EndpointFor for usage and errors that can be returned.
-func (s Service) ResolveEndpoint(region string, opts ...func(*Options)) (ResolvedEndpoint, error) {
-	return s.p.EndpointFor(s.id, region, opts...)
-}
-
-// Regions returns a map of Regions that the service is present in.
-//
-// A region is the AWS region the service exists in. Whereas a Endpoint is
-// an URL that can be resolved to a instance of a service.
-func (s Service) Regions() map[string]Region {
-	rs := map[string]Region{}
-	for id := range s.p.Services[s.id].Endpoints {
-		if _, ok := s.p.Regions[id]; ok {
-			rs[id] = Region{
-				id: id,
-				p:  s.p,
-			}
-		}
-	}
-
-	return rs
-}
-
-// Endpoints returns a map of Endpoints indexed by their ID for all known
-// endpoints for a service.
-//
-// A region is the AWS region the service exists in. Whereas a Endpoint is
-// an URL that can be resolved to a instance of a service.
-func (s Service) Endpoints() map[string]Endpoint {
-	es := map[string]Endpoint{}
-	for id := range s.p.Services[s.id].Endpoints {
-		es[id] = Endpoint{
-			id:        id,
-			serviceID: s.id,
-			p:         s.p,
-		}
-	}
-
-	return es
-}
-
-// A Endpoint provides information about endpoints, and provides the ability
-// to resolve that endpoint for the service, and the region the endpoint
-// represents.
-type Endpoint struct {
-	id        string
-	serviceID string
-	p         *partition
-}
-
-// ID returns the identifier for an endpoint.
-func (e Endpoint) ID() string { return e.id }
-
-// ServiceID returns the identifier the endpoint belongs to.
-func (e Endpoint) ServiceID() string { return e.serviceID }
-
-// ResolveEndpoint resolves an endpoint from the context of a service and
-// region the endpoint represents. See Partition.EndpointFor for usage and
-// errors that can be returned.
-func (e Endpoint) ResolveEndpoint(opts ...func(*Options)) (ResolvedEndpoint, error) {
-	return e.p.EndpointFor(e.serviceID, e.id, opts...)
-}
-
-// A ResolvedEndpoint is an endpoint that has been resolved based on a partition
-// service, and region.
-type ResolvedEndpoint struct {
-	// The endpoint URL
-	URL string
-
-	// The region that should be used for signing requests.
-	SigningRegion string
-
-	// The service name that should be used for signing requests.
-	SigningName string
-
-	// The signing method that should be used for signing requests.
-	SigningMethod string
-}
-
-// So that the Error interface type can be included as an anonymous field
-// in the requestError struct and not conflict with the error.Error() method.
-type awsError awserr.Error
-
-// A EndpointNotFoundError is returned when in StrictMatching mode, and the
-// endpoint for the service and region cannot be found in any of the partitions.
-type EndpointNotFoundError struct {
-	awsError
-	Partition string
-	Service   string
-	Region    string
-}
-
-// A UnknownServiceError is returned when the service does not resolve to an
-// endpoint. Includes a list of all known services for the partition. Returned
-// when a partition does not support the service.
-type UnknownServiceError struct {
-	awsError
-	Partition string
-	Service   string
-	Known     []string
-}
-
-// NewUnknownServiceError builds and returns UnknownServiceError.
-func NewUnknownServiceError(p, s string, known []string) UnknownServiceError {
-	return UnknownServiceError{
-		awsError: awserr.New("UnknownServiceError",
-			"could not resolve endpoint for unknown service", nil),
-		Partition: p,
-		Service:   s,
-		Known:     known,
-	}
-}
-
-// String returns the string representation of the error.
-func (e UnknownServiceError) Error() string {
-	extra := fmt.Sprintf("partition: %q, service: %q",
-		e.Partition, e.Service)
-	if len(e.Known) > 0 {
-		extra += fmt.Sprintf(", known: %v", e.Known)
-	}
-	return awserr.SprintError(e.Code(), e.Message(), extra, e.OrigErr())
-}
-
-// String returns the string representation of the error.
-func (e UnknownServiceError) String() string {
-	return e.Error()
-}
-
-// A UnknownEndpointError is returned when in StrictMatching mode and the
-// service is valid, but the region does not resolve to an endpoint. Includes
-// a list of all known endpoints for the service.
-type UnknownEndpointError struct {
-	awsError
-	Partition string
-	Service   string
-	Region    string
-	Known     []string
-}
-
-// NewUnknownEndpointError builds and returns UnknownEndpointError.
-func NewUnknownEndpointError(p, s, r string, known []string) UnknownEndpointError {
-	return UnknownEndpointError{
-		awsError: awserr.New("UnknownEndpointError",
-			"could not resolve endpoint", nil),
-		Partition: p,
-		Service:   s,
-		Region:    r,
-		Known:     known,
-	}
-}
-
-// String returns the string representation of the error.
-func (e UnknownEndpointError) Error() string {
-	extra := fmt.Sprintf("partition: %q, service: %q, region: %q",
-		e.Partition, e.Service, e.Region)
-	if len(e.Known) > 0 {
-		extra += fmt.Sprintf(", known: %v", e.Known)
-	}
-	return awserr.SprintError(e.Code(), e.Message(), extra, e.OrigErr())
-}
-
-// String returns the string representation of the error.
-func (e UnknownEndpointError) String() string {
-	return e.Error()
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model.go
deleted file mode 100644
index 13d968a249..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model.go
+++ /dev/null
@@ -1,303 +0,0 @@
-package endpoints
-
-import (
-	"fmt"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-type partitions []partition
-
-func (ps partitions) EndpointFor(service, region string, opts ...func(*Options)) (ResolvedEndpoint, error) {
-	var opt Options
-	opt.Set(opts...)
-
-	for i := 0; i < len(ps); i++ {
-		if !ps[i].canResolveEndpoint(service, region, opt.StrictMatching) {
-			continue
-		}
-
-		return ps[i].EndpointFor(service, region, opts...)
-	}
-
-	// If loose matching fallback to first partition format to use
-	// when resolving the endpoint.
-	if !opt.StrictMatching && len(ps) > 0 {
-		return ps[0].EndpointFor(service, region, opts...)
-	}
-
-	return ResolvedEndpoint{}, NewUnknownEndpointError("all partitions", service, region, []string{})
-}
-
-// Partitions satisfies the EnumPartitions interface and returns a list
-// of Partitions representing each partition represented in the SDK's
-// endpoints model.
-func (ps partitions) Partitions() []Partition {
-	parts := make([]Partition, 0, len(ps))
-	for i := 0; i < len(ps); i++ {
-		parts = append(parts, ps[i].Partition())
-	}
-
-	return parts
-}
-
-type partition struct {
-	ID          string      `json:"partition"`
-	Name        string      `json:"partitionName"`
-	DNSSuffix   string      `json:"dnsSuffix"`
-	RegionRegex regionRegex `json:"regionRegex"`
-	Defaults    endpoint    `json:"defaults"`
-	Regions     regions     `json:"regions"`
-	Services    services    `json:"services"`
-}
-
-func (p partition) Partition() Partition {
-	return Partition{
-		id: p.ID,
-		p:  &p,
-	}
-}
-
-func (p partition) canResolveEndpoint(service, region string, strictMatch bool) bool {
-	s, hasService := p.Services[service]
-	_, hasEndpoint := s.Endpoints[region]
-
-	if hasEndpoint && hasService {
-		return true
-	}
-
-	if strictMatch {
-		return false
-	}
-
-	return p.RegionRegex.MatchString(region)
-}
-
-func (p partition) EndpointFor(service, region string, opts ...func(*Options)) (resolved ResolvedEndpoint, err error) {
-	var opt Options
-	opt.Set(opts...)
-
-	s, hasService := p.Services[service]
-	if !(hasService || opt.ResolveUnknownService) {
-		// Only return error if the resolver will not fallback to creating
-		// endpoint based on service endpoint ID passed in.
-		return resolved, NewUnknownServiceError(p.ID, service, serviceList(p.Services))
-	}
-
-	e, hasEndpoint := s.endpointForRegion(region)
-	if !hasEndpoint && opt.StrictMatching {
-		return resolved, NewUnknownEndpointError(p.ID, service, region, endpointList(s.Endpoints))
-	}
-
-	defs := []endpoint{p.Defaults, s.Defaults}
-	return e.resolve(service, region, p.DNSSuffix, defs, opt), nil
-}
-
-func serviceList(ss services) []string {
-	list := make([]string, 0, len(ss))
-	for k := range ss {
-		list = append(list, k)
-	}
-	return list
-}
-func endpointList(es endpoints) []string {
-	list := make([]string, 0, len(es))
-	for k := range es {
-		list = append(list, k)
-	}
-	return list
-}
-
-type regionRegex struct {
-	*regexp.Regexp
-}
-
-func (rr *regionRegex) UnmarshalJSON(b []byte) (err error) {
-	// Strip leading and trailing quotes
-	regex, err := strconv.Unquote(string(b))
-	if err != nil {
-		return fmt.Errorf("unable to strip quotes from regex, %v", err)
-	}
-
-	rr.Regexp, err = regexp.Compile(regex)
-	if err != nil {
-		return fmt.Errorf("unable to unmarshal region regex, %v", err)
-	}
-	return nil
-}
-
-type regions map[string]region
-
-type region struct {
-	Description string `json:"description"`
-}
-
-type services map[string]service
-
-type service struct {
-	PartitionEndpoint string    `json:"partitionEndpoint"`
-	IsRegionalized    boxedBool `json:"isRegionalized,omitempty"`
-	Defaults          endpoint  `json:"defaults"`
-	Endpoints         endpoints `json:"endpoints"`
-}
-
-func (s *service) endpointForRegion(region string) (endpoint, bool) {
-	if s.IsRegionalized == boxedFalse {
-		return s.Endpoints[s.PartitionEndpoint], region == s.PartitionEndpoint
-	}
-
-	if e, ok := s.Endpoints[region]; ok {
-		return e, true
-	}
-
-	// Unable to find any matching endpoint, return
-	// blank that will be used for generic endpoint creation.
-	return endpoint{}, false
-}
-
-type endpoints map[string]endpoint
-
-type endpoint struct {
-	Hostname        string          `json:"hostname"`
-	Protocols       []string        `json:"protocols"`
-	CredentialScope credentialScope `json:"credentialScope"`
-
-	// Custom fields not modeled
-	HasDualStack      boxedBool `json:"-"`
-	DualStackHostname string    `json:"-"`
-
-	// Signature Version not used
-	SignatureVersions []string `json:"signatureVersions"`
-
-	// SSLCommonName not used.
-	SSLCommonName string `json:"sslCommonName"`
-}
-
-const (
-	defaultProtocol = "https"
-	defaultSigner   = "v4"
-)
-
-var (
-	protocolPriority = []string{"https", "http"}
-	signerPriority   = []string{"v4", "v2"}
-)
-
-func getByPriority(s []string, p []string, def string) string {
-	if len(s) == 0 {
-		return def
-	}
-
-	for i := 0; i < len(p); i++ {
-		for j := 0; j < len(s); j++ {
-			if s[j] == p[i] {
-				return s[j]
-			}
-		}
-	}
-
-	return s[0]
-}
-
-func (e endpoint) resolve(service, region, dnsSuffix string, defs []endpoint, opts Options) ResolvedEndpoint {
-	var merged endpoint
-	for _, def := range defs {
-		merged.mergeIn(def)
-	}
-	merged.mergeIn(e)
-	e = merged
-
-	hostname := e.Hostname
-
-	// Offset the hostname for dualstack if enabled
-	if opts.UseDualStack && e.HasDualStack == boxedTrue {
-		hostname = e.DualStackHostname
-	}
-
-	u := strings.Replace(hostname, "{service}", service, 1)
-	u = strings.Replace(u, "{region}", region, 1)
-	u = strings.Replace(u, "{dnsSuffix}", dnsSuffix, 1)
-
-	scheme := getEndpointScheme(e.Protocols, opts.DisableSSL)
-	u = fmt.Sprintf("%s://%s", scheme, u)
-
-	signingRegion := e.CredentialScope.Region
-	if len(signingRegion) == 0 {
-		signingRegion = region
-	}
-	signingName := e.CredentialScope.Service
-	if len(signingName) == 0 {
-		signingName = service
-	}
-
-	return ResolvedEndpoint{
-		URL:           u,
-		SigningRegion: signingRegion,
-		SigningName:   signingName,
-		SigningMethod: getByPriority(e.SignatureVersions, signerPriority, defaultSigner),
-	}
-}
-
-func getEndpointScheme(protocols []string, disableSSL bool) string {
-	if disableSSL {
-		return "http"
-	}
-
-	return getByPriority(protocols, protocolPriority, defaultProtocol)
-}
-
-func (e *endpoint) mergeIn(other endpoint) {
-	if len(other.Hostname) > 0 {
-		e.Hostname = other.Hostname
-	}
-	if len(other.Protocols) > 0 {
-		e.Protocols = other.Protocols
-	}
-	if len(other.SignatureVersions) > 0 {
-		e.SignatureVersions = other.SignatureVersions
-	}
-	if len(other.CredentialScope.Region) > 0 {
-		e.CredentialScope.Region = other.CredentialScope.Region
-	}
-	if len(other.CredentialScope.Service) > 0 {
-		e.CredentialScope.Service = other.CredentialScope.Service
-	}
-	if len(other.SSLCommonName) > 0 {
-		e.SSLCommonName = other.SSLCommonName
-	}
-	if other.HasDualStack != boxedBoolUnset {
-		e.HasDualStack = other.HasDualStack
-	}
-	if len(other.DualStackHostname) > 0 {
-		e.DualStackHostname = other.DualStackHostname
-	}
-}
-
-type credentialScope struct {
-	Region  string `json:"region"`
-	Service string `json:"service"`
-}
-
-type boxedBool int
-
-func (b *boxedBool) UnmarshalJSON(buf []byte) error {
-	v, err := strconv.ParseBool(string(buf))
-	if err != nil {
-		return err
-	}
-
-	if v {
-		*b = boxedTrue
-	} else {
-		*b = boxedFalse
-	}
-
-	return nil
-}
-
-const (
-	boxedBoolUnset boxedBool = iota
-	boxedFalse
-	boxedTrue
-)
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model_codegen.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model_codegen.go
deleted file mode 100644
index 05e92df22a..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model_codegen.go
+++ /dev/null
@@ -1,337 +0,0 @@
-// +build codegen
-
-package endpoints
-
-import (
-	"fmt"
-	"io"
-	"reflect"
-	"strings"
-	"text/template"
-	"unicode"
-)
-
-// A CodeGenOptions are the options for code generating the endpoints into
-// Go code from the endpoints model definition.
-type CodeGenOptions struct {
-	// Options for how the model will be decoded.
-	DecodeModelOptions DecodeModelOptions
-}
-
-// Set combines all of the option functions together
-func (d *CodeGenOptions) Set(optFns ...func(*CodeGenOptions)) {
-	for _, fn := range optFns {
-		fn(d)
-	}
-}
-
-// CodeGenModel given a endpoints model file will decode it and attempt to
-// generate Go code from the model definition. Error will be returned if
-// the code is unable to be generated, or decoded.
-func CodeGenModel(modelFile io.Reader, outFile io.Writer, optFns ...func(*CodeGenOptions)) error {
-	var opts CodeGenOptions
-	opts.Set(optFns...)
-
-	resolver, err := DecodeModel(modelFile, func(d *DecodeModelOptions) {
-		*d = opts.DecodeModelOptions
-	})
-	if err != nil {
-		return err
-	}
-
-	tmpl := template.Must(template.New("tmpl").Funcs(funcMap).Parse(v3Tmpl))
-	if err := tmpl.ExecuteTemplate(outFile, "defaults", resolver); err != nil {
-		return fmt.Errorf("failed to execute template, %v", err)
-	}
-
-	return nil
-}
-
-func toSymbol(v string) string {
-	out := []rune{}
-	for _, c := range strings.Title(v) {
-		if !(unicode.IsNumber(c) || unicode.IsLetter(c)) {
-			continue
-		}
-
-		out = append(out, c)
-	}
-
-	return string(out)
-}
-
-func quoteString(v string) string {
-	return fmt.Sprintf("%q", v)
-}
-
-func regionConstName(p, r string) string {
-	return toSymbol(p) + toSymbol(r)
-}
-
-func partitionGetter(id string) string {
-	return fmt.Sprintf("%sPartition", toSymbol(id))
-}
-
-func partitionVarName(id string) string {
-	return fmt.Sprintf("%sPartition", strings.ToLower(toSymbol(id)))
-}
-
-func listPartitionNames(ps partitions) string {
-	names := []string{}
-	switch len(ps) {
-	case 1:
-		return ps[0].Name
-	case 2:
-		return fmt.Sprintf("%s and %s", ps[0].Name, ps[1].Name)
-	default:
-		for i, p := range ps {
-			if i == len(ps)-1 {
-				names = append(names, "and "+p.Name)
-			} else {
-				names = append(names, p.Name)
-			}
-		}
-		return strings.Join(names, ", ")
-	}
-}
-
-func boxedBoolIfSet(msg string, v boxedBool) string {
-	switch v {
-	case boxedTrue:
-		return fmt.Sprintf(msg, "boxedTrue")
-	case boxedFalse:
-		return fmt.Sprintf(msg, "boxedFalse")
-	default:
-		return ""
-	}
-}
-
-func stringIfSet(msg, v string) string {
-	if len(v) == 0 {
-		return ""
-	}
-
-	return fmt.Sprintf(msg, v)
-}
-
-func stringSliceIfSet(msg string, vs []string) string {
-	if len(vs) == 0 {
-		return ""
-	}
-
-	names := []string{}
-	for _, v := range vs {
-		names = append(names, `"`+v+`"`)
-	}
-
-	return fmt.Sprintf(msg, strings.Join(names, ","))
-}
-
-func endpointIsSet(v endpoint) bool {
-	return !reflect.DeepEqual(v, endpoint{})
-}
-
-func serviceSet(ps partitions) map[string]struct{} {
-	set := map[string]struct{}{}
-	for _, p := range ps {
-		for id := range p.Services {
-			set[id] = struct{}{}
-		}
-	}
-
-	return set
-}
-
-var funcMap = template.FuncMap{
-	"ToSymbol":           toSymbol,
-	"QuoteString":        quoteString,
-	"RegionConst":        regionConstName,
-	"PartitionGetter":    partitionGetter,
-	"PartitionVarName":   partitionVarName,
-	"ListPartitionNames": listPartitionNames,
-	"BoxedBoolIfSet":     boxedBoolIfSet,
-	"StringIfSet":        stringIfSet,
-	"StringSliceIfSet":   stringSliceIfSet,
-	"EndpointIsSet":      endpointIsSet,
-	"ServicesSet":        serviceSet,
-}
-
-const v3Tmpl = `
-{{ define "defaults" -}}
-// Code generated by aws/endpoints/v3model_codegen.go. DO NOT EDIT.
-
-package endpoints
-
-import (
-	"regexp"
-)
-
-	{{ template "partition consts" . }}
-
-	{{ range $_, $partition := . }}
-		{{ template "partition region consts" $partition }}
-	{{ end }}
-
-	{{ template "service consts" . }}
-	
-	{{ template "endpoint resolvers" . }}
-{{- end }}
-
-{{ define "partition consts" }}
-	// Partition identifiers
-	const (
-		{{ range $_, $p := . -}}
-			{{ ToSymbol $p.ID }}PartitionID = {{ QuoteString $p.ID }} // {{ $p.Name }} partition.
-		{{ end -}}
-	)
-{{- end }}
-
-{{ define "partition region consts" }}
-	// {{ .Name }} partition's regions.
-	const (
-		{{ range $id, $region := .Regions -}}
-			{{ ToSymbol $id }}RegionID = {{ QuoteString $id }} // {{ $region.Description }}.
-		{{ end -}}
-	)
-{{- end }}
-
-{{ define "service consts" }}
-	// Service identifiers
-	const (
-		{{ $serviceSet := ServicesSet . -}}
-		{{ range $id, $_ := $serviceSet -}}
-			{{ ToSymbol $id }}ServiceID = {{ QuoteString $id }} // {{ ToSymbol $id }}.
-		{{ end -}}
-	)
-{{- end }}
-
-{{ define "endpoint resolvers" }}
-	// DefaultResolver returns an Endpoint resolver that will be able
-	// to resolve endpoints for: {{ ListPartitionNames . }}.
-	//
-	// Use DefaultPartitions() to get the list of the default partitions.
-	func DefaultResolver() Resolver {
-		return defaultPartitions
-	}
-
-	// DefaultPartitions returns a list of the partitions the SDK is bundled
-	// with. The available partitions are: {{ ListPartitionNames . }}.
-	//
-	//    partitions := endpoints.DefaultPartitions
-	//    for _, p := range partitions {
-	//        // ... inspect partitions
-	//    }
-	func DefaultPartitions() []Partition {
-		return defaultPartitions.Partitions()
-	}
-
-	var defaultPartitions = partitions{
-		{{ range $_, $partition := . -}}
-			{{ PartitionVarName $partition.ID }},
-		{{ end }}
-	}
-	
-	{{ range $_, $partition := . -}}
-		{{ $name := PartitionGetter $partition.ID -}}
-		// {{ $name }} returns the Resolver for {{ $partition.Name }}.
-		func {{ $name }}() Partition {
-			return  {{ PartitionVarName $partition.ID }}.Partition()
-		}
-		var {{ PartitionVarName $partition.ID }} = {{ template "gocode Partition" $partition }}
-	{{ end }}
-{{ end }}
-
-{{ define "default partitions" }}
-	func DefaultPartitions() []Partition {
-		return []partition{
-			{{ range $_, $partition := . -}}
-			// {{ ToSymbol $partition.ID}}Partition(),
-			{{ end }}
-		}
-	}
-{{ end }}
-
-{{ define "gocode Partition" -}}
-partition{
-	{{ StringIfSet "ID: %q,\n" .ID -}}
-	{{ StringIfSet "Name: %q,\n" .Name -}}
-	{{ StringIfSet "DNSSuffix: %q,\n" .DNSSuffix -}}
-	RegionRegex: {{ template "gocode RegionRegex" .RegionRegex }},
-	{{ if EndpointIsSet .Defaults -}}
-		Defaults: {{ template "gocode Endpoint" .Defaults }},
-	{{- end }}
-	Regions:  {{ template "gocode Regions" .Regions }},
-	Services: {{ template "gocode Services" .Services }},
-}
-{{- end }}
-
-{{ define "gocode RegionRegex" -}}
-regionRegex{
-	Regexp: func() *regexp.Regexp{
-		reg, _ := regexp.Compile({{ QuoteString .Regexp.String }})
-		return reg
-	}(),
-}
-{{- end }}
-
-{{ define "gocode Regions" -}}
-regions{
-	{{ range $id, $region := . -}}
-		"{{ $id }}": {{ template "gocode Region" $region }},
-	{{ end -}}
-}
-{{- end }}
-
-{{ define "gocode Region" -}}
-region{
-	{{ StringIfSet "Description: %q,\n" .Description -}}
-}
-{{- end }}
-
-{{ define "gocode Services" -}}
-services{
-	{{ range $id, $service := . -}}
-	"{{ $id }}": {{ template "gocode Service" $service }},
-	{{ end }}
-}
-{{- end }}
-
-{{ define "gocode Service" -}}
-service{
-	{{ StringIfSet "PartitionEndpoint: %q,\n" .PartitionEndpoint -}}
-	{{ BoxedBoolIfSet "IsRegionalized: %s,\n" .IsRegionalized -}}
-	{{ if EndpointIsSet .Defaults -}}
-		Defaults: {{ template "gocode Endpoint" .Defaults -}},
-	{{- end }}
-	{{ if .Endpoints -}}
-		Endpoints: {{ template "gocode Endpoints" .Endpoints }},
-	{{- end }}
-}
-{{- end }}
-
-{{ define "gocode Endpoints" -}}
-endpoints{
-	{{ range $id, $endpoint := . -}}
-	"{{ $id }}": {{ template "gocode Endpoint" $endpoint }},
-	{{ end }}
-}
-{{- end }}
-
-{{ define "gocode Endpoint" -}}
-endpoint{
-	{{ StringIfSet "Hostname: %q,\n" .Hostname -}}
-	{{ StringIfSet "SSLCommonName: %q,\n" .SSLCommonName -}}
-	{{ StringSliceIfSet "Protocols: []string{%s},\n" .Protocols -}}
-	{{ StringSliceIfSet "SignatureVersions: []string{%s},\n" .SignatureVersions -}}
-	{{ if or .CredentialScope.Region .CredentialScope.Service -}}
-	CredentialScope: credentialScope{
-		{{ StringIfSet "Region: %q,\n" .CredentialScope.Region -}}
-		{{ StringIfSet "Service: %q,\n" .CredentialScope.Service -}}
-	},
-	{{- end }}
-	{{ BoxedBoolIfSet "HasDualStack: %s,\n" .HasDualStack -}}
-	{{ StringIfSet "DualStackHostname: %q,\n" .DualStackHostname -}}
-
-}
-{{- end }}
-`
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/errors.go b/vendor/github.com/aws/aws-sdk-go/aws/errors.go
deleted file mode 100644
index 5766361686..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/errors.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package aws
-
-import "github.com/aws/aws-sdk-go/aws/awserr"
-
-var (
-	// ErrMissingRegion is an error that is returned if region configuration is
-	// not found.
-	//
-	// @readonly
-	ErrMissingRegion = awserr.New("MissingRegion", "could not find region configuration", nil)
-
-	// ErrMissingEndpoint is an error that is returned if an endpoint cannot be
-	// resolved for a service.
-	//
-	// @readonly
-	ErrMissingEndpoint = awserr.New("MissingEndpoint", "'Endpoint' configuration is required for this service", nil)
-)
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/jsonvalue.go b/vendor/github.com/aws/aws-sdk-go/aws/jsonvalue.go
deleted file mode 100644
index 91a6f277a7..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/jsonvalue.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package aws
-
-// JSONValue is a representation of a grab bag type that will be marshaled
-// into a json string. This type can be used just like any other map.
-//
-//	Example:
-//
-//	values := aws.JSONValue{
-//		"Foo": "Bar",
-//	}
-//	values["Baz"] = "Qux"
-type JSONValue map[string]interface{}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/logger.go b/vendor/github.com/aws/aws-sdk-go/aws/logger.go
deleted file mode 100644
index 3babb5abdb..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/logger.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package aws
-
-import (
-	"log"
-	"os"
-)
-
-// A LogLevelType defines the level logging should be performed at. Used to instruct
-// the SDK which statements should be logged.
-type LogLevelType uint
-
-// LogLevel returns the pointer to a LogLevel. Should be used to workaround
-// not being able to take the address of a non-composite literal.
-func LogLevel(l LogLevelType) *LogLevelType {
-	return &l
-}
-
-// Value returns the LogLevel value or the default value LogOff if the LogLevel
-// is nil. Safe to use on nil value LogLevelTypes.
-func (l *LogLevelType) Value() LogLevelType {
-	if l != nil {
-		return *l
-	}
-	return LogOff
-}
-
-// Matches returns true if the v LogLevel is enabled by this LogLevel. Should be
-// used with logging sub levels. Is safe to use on nil value LogLevelTypes. If
-// LogLevel is nil, will default to LogOff comparison.
-func (l *LogLevelType) Matches(v LogLevelType) bool {
-	c := l.Value()
-	return c&v == v
-}
-
-// AtLeast returns true if this LogLevel is at least high enough to satisfies v.
-// Is safe to use on nil value LogLevelTypes. If LogLevel is nil, will default
-// to LogOff comparison.
-func (l *LogLevelType) AtLeast(v LogLevelType) bool {
-	c := l.Value()
-	return c >= v
-}
-
-const (
-	// LogOff states that no logging should be performed by the SDK. This is the
-	// default state of the SDK, and should be use to disable all logging.
-	LogOff LogLevelType = iota * 0x1000
-
-	// LogDebug state that debug output should be logged by the SDK. This should
-	// be used to inspect request made and responses received.
-	LogDebug
-)
-
-// Debug Logging Sub Levels
-const (
-	// LogDebugWithSigning states that the SDK should log request signing and
-	// presigning events. This should be used to log the signing details of
-	// requests for debugging. Will also enable LogDebug.
-	LogDebugWithSigning LogLevelType = LogDebug | (1 << iota)
-
-	// LogDebugWithHTTPBody states the SDK should log HTTP request and response
-	// HTTP bodys in addition to the headers and path. This should be used to
-	// see the body content of requests and responses made while using the SDK
-	// Will also enable LogDebug.
-	LogDebugWithHTTPBody
-
-	// LogDebugWithRequestRetries states the SDK should log when service requests will
-	// be retried. This should be used to log when you want to log when service
-	// requests are being retried. Will also enable LogDebug.
-	LogDebugWithRequestRetries
-
-	// LogDebugWithRequestErrors states the SDK should log when service requests fail
-	// to build, send, validate, or unmarshal.
-	LogDebugWithRequestErrors
-)
-
-// A Logger is a minimalistic interface for the SDK to log messages to. Should
-// be used to provide custom logging writers for the SDK to use.
-type Logger interface {
-	Log(...interface{})
-}
-
-// A LoggerFunc is a convenience type to convert a function taking a variadic
-// list of arguments and wrap it so the Logger interface can be used.
-//
-// Example:
-//     s3.New(sess, &aws.Config{Logger: aws.LoggerFunc(func(args ...interface{}) {
-//         fmt.Fprintln(os.Stdout, args...)
-//     })})
-type LoggerFunc func(...interface{})
-
-// Log calls the wrapped function with the arguments provided
-func (f LoggerFunc) Log(args ...interface{}) {
-	f(args...)
-}
-
-// NewDefaultLogger returns a Logger which will write log messages to stdout, and
-// use same formatting runes as the stdlib log.Logger
-func NewDefaultLogger() Logger {
-	return &defaultLogger{
-		logger: log.New(os.Stdout, "", log.LstdFlags),
-	}
-}
-
-// A defaultLogger provides a minimalistic logger satisfying the Logger interface.
-type defaultLogger struct {
-	logger *log.Logger
-}
-
-// Log logs the parameters to the stdlib logger. See log.Println.
-func (l defaultLogger) Log(args ...interface{}) {
-	l.logger.Println(args...)
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error.go b/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error.go
deleted file mode 100644
index 271da432ce..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build !appengine,!plan9
-
-package request
-
-import (
-	"net"
-	"os"
-	"syscall"
-)
-
-func isErrConnectionReset(err error) bool {
-	if opErr, ok := err.(*net.OpError); ok {
-		if sysErr, ok := opErr.Err.(*os.SyscallError); ok {
-			return sysErr.Err == syscall.ECONNRESET
-		}
-	}
-
-	return false
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other.go b/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other.go
deleted file mode 100644
index daf9eca437..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build appengine plan9
-
-package request
-
-import (
-	"strings"
-)
-
-func isErrConnectionReset(err error) bool {
-	return strings.Contains(err.Error(), "connection reset")
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go
deleted file mode 100644
index 802ac88ad5..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go
+++ /dev/null
@@ -1,256 +0,0 @@
-package request
-
-import (
-	"fmt"
-	"strings"
-)
-
-// A Handlers provides a collection of request handlers for various
-// stages of handling requests.
-type Handlers struct {
-	Validate         HandlerList
-	Build            HandlerList
-	Sign             HandlerList
-	Send             HandlerList
-	ValidateResponse HandlerList
-	Unmarshal        HandlerList
-	UnmarshalMeta    HandlerList
-	UnmarshalError   HandlerList
-	Retry            HandlerList
-	AfterRetry       HandlerList
-	Complete         HandlerList
-}
-
-// Copy returns of this handler's lists.
-func (h *Handlers) Copy() Handlers {
-	return Handlers{
-		Validate:         h.Validate.copy(),
-		Build:            h.Build.copy(),
-		Sign:             h.Sign.copy(),
-		Send:             h.Send.copy(),
-		ValidateResponse: h.ValidateResponse.copy(),
-		Unmarshal:        h.Unmarshal.copy(),
-		UnmarshalError:   h.UnmarshalError.copy(),
-		UnmarshalMeta:    h.UnmarshalMeta.copy(),
-		Retry:            h.Retry.copy(),
-		AfterRetry:       h.AfterRetry.copy(),
-		Complete:         h.Complete.copy(),
-	}
-}
-
-// Clear removes callback functions for all handlers
-func (h *Handlers) Clear() {
-	h.Validate.Clear()
-	h.Build.Clear()
-	h.Send.Clear()
-	h.Sign.Clear()
-	h.Unmarshal.Clear()
-	h.UnmarshalMeta.Clear()
-	h.UnmarshalError.Clear()
-	h.ValidateResponse.Clear()
-	h.Retry.Clear()
-	h.AfterRetry.Clear()
-	h.Complete.Clear()
-}
-
-// A HandlerListRunItem represents an entry in the HandlerList which
-// is being run.
-type HandlerListRunItem struct {
-	Index   int
-	Handler NamedHandler
-	Request *Request
-}
-
-// A HandlerList manages zero or more handlers in a list.
-type HandlerList struct {
-	list []NamedHandler
-
-	// Called after each request handler in the list is called. If set
-	// and the func returns true the HandlerList will continue to iterate
-	// over the request handlers. If false is returned the HandlerList
-	// will stop iterating.
-	//
-	// Should be used if extra logic to be performed between each handler
-	// in the list. This can be used to terminate a list's iteration
-	// based on a condition such as error like, HandlerListStopOnError.
-	// Or for logging like HandlerListLogItem.
-	AfterEachFn func(item HandlerListRunItem) bool
-}
-
-// A NamedHandler is a struct that contains a name and function callback.
-type NamedHandler struct {
-	Name string
-	Fn   func(*Request)
-}
-
-// copy creates a copy of the handler list.
-func (l *HandlerList) copy() HandlerList {
-	n := HandlerList{
-		AfterEachFn: l.AfterEachFn,
-	}
-	if len(l.list) == 0 {
-		return n
-	}
-
-	n.list = append(make([]NamedHandler, 0, len(l.list)), l.list...)
-	return n
-}
-
-// Clear clears the handler list.
-func (l *HandlerList) Clear() {
-	l.list = l.list[0:0]
-}
-
-// Len returns the number of handlers in the list.
-func (l *HandlerList) Len() int {
-	return len(l.list)
-}
-
-// PushBack pushes handler f to the back of the handler list.
-func (l *HandlerList) PushBack(f func(*Request)) {
-	l.PushBackNamed(NamedHandler{"__anonymous", f})
-}
-
-// PushBackNamed pushes named handler f to the back of the handler list.
-func (l *HandlerList) PushBackNamed(n NamedHandler) {
-	if cap(l.list) == 0 {
-		l.list = make([]NamedHandler, 0, 5)
-	}
-	l.list = append(l.list, n)
-}
-
-// PushFront pushes handler f to the front of the handler list.
-func (l *HandlerList) PushFront(f func(*Request)) {
-	l.PushFrontNamed(NamedHandler{"__anonymous", f})
-}
-
-// PushFrontNamed pushes named handler f to the front of the handler list.
-func (l *HandlerList) PushFrontNamed(n NamedHandler) {
-	if cap(l.list) == len(l.list) {
-		// Allocating new list required
-		l.list = append([]NamedHandler{n}, l.list...)
-	} else {
-		// Enough room to prepend into list.
-		l.list = append(l.list, NamedHandler{})
-		copy(l.list[1:], l.list)
-		l.list[0] = n
-	}
-}
-
-// Remove removes a NamedHandler n
-func (l *HandlerList) Remove(n NamedHandler) {
-	l.RemoveByName(n.Name)
-}
-
-// RemoveByName removes a NamedHandler by name.
-func (l *HandlerList) RemoveByName(name string) {
-	for i := 0; i < len(l.list); i++ {
-		m := l.list[i]
-		if m.Name == name {
-			// Shift array preventing creating new arrays
-			copy(l.list[i:], l.list[i+1:])
-			l.list[len(l.list)-1] = NamedHandler{}
-			l.list = l.list[:len(l.list)-1]
-
-			// decrement list so next check to length is correct
-			i--
-		}
-	}
-}
-
-// SwapNamed will swap out any existing handlers with the same name as the
-// passed in NamedHandler returning true if handlers were swapped. False is
-// returned otherwise.
-func (l *HandlerList) SwapNamed(n NamedHandler) (swapped bool) {
-	for i := 0; i < len(l.list); i++ {
-		if l.list[i].Name == n.Name {
-			l.list[i].Fn = n.Fn
-			swapped = true
-		}
-	}
-
-	return swapped
-}
-
-// SetBackNamed will replace the named handler if it exists in the handler list.
-// If the handler does not exist the handler will be added to the end of the list.
-func (l *HandlerList) SetBackNamed(n NamedHandler) {
-	if !l.SwapNamed(n) {
-		l.PushBackNamed(n)
-	}
-}
-
-// SetFrontNamed will replace the named handler if it exists in the handler list.
-// If the handler does not exist the handler will be added to the beginning of
-// the list.
-func (l *HandlerList) SetFrontNamed(n NamedHandler) {
-	if !l.SwapNamed(n) {
-		l.PushFrontNamed(n)
-	}
-}
-
-// Run executes all handlers in the list with a given request object.
-func (l *HandlerList) Run(r *Request) {
-	for i, h := range l.list {
-		h.Fn(r)
-		item := HandlerListRunItem{
-			Index: i, Handler: h, Request: r,
-		}
-		if l.AfterEachFn != nil && !l.AfterEachFn(item) {
-			return
-		}
-	}
-}
-
-// HandlerListLogItem logs the request handler and the state of the
-// request's Error value. Always returns true to continue iterating
-// request handlers in a HandlerList.
-func HandlerListLogItem(item HandlerListRunItem) bool {
-	if item.Request.Config.Logger == nil {
-		return true
-	}
-	item.Request.Config.Logger.Log("DEBUG: RequestHandler",
-		item.Index, item.Handler.Name, item.Request.Error)
-
-	return true
-}
-
-// HandlerListStopOnError returns false to stop the HandlerList iterating
-// over request handlers if Request.Error is not nil. True otherwise
-// to continue iterating.
-func HandlerListStopOnError(item HandlerListRunItem) bool {
-	return item.Request.Error == nil
-}
-
-// WithAppendUserAgent will add a string to the user agent prefixed with a
-// single white space.
-func WithAppendUserAgent(s string) Option {
-	return func(r *Request) {
-		r.Handlers.Build.PushBack(func(r2 *Request) {
-			AddToUserAgent(r, s)
-		})
-	}
-}
-
-// MakeAddToUserAgentHandler will add the name/version pair to the User-Agent request
-// header. If the extra parameters are provided they will be added as metadata to the
-// name/version pair resulting in the following format.
-// "name/version (extra0; extra1; ...)"
-// The user agent part will be concatenated with this current request's user agent string.
-func MakeAddToUserAgentHandler(name, version string, extra ...string) func(*Request) {
-	ua := fmt.Sprintf("%s/%s", name, version)
-	if len(extra) > 0 {
-		ua += fmt.Sprintf(" (%s)", strings.Join(extra, "; "))
-	}
-	return func(r *Request) {
-		AddToUserAgent(r, ua)
-	}
-}
-
-// MakeAddToUserAgentFreeFormHandler adds the input to the User-Agent request header.
-// The input string will be concatenated with the current request's user agent string.
-func MakeAddToUserAgentFreeFormHandler(s string) func(*Request) {
-	return func(r *Request) {
-		AddToUserAgent(r, s)
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/http_request.go b/vendor/github.com/aws/aws-sdk-go/aws/request/http_request.go
deleted file mode 100644
index 79f79602b0..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/http_request.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package request
-
-import (
-	"io"
-	"net/http"
-	"net/url"
-)
-
-func copyHTTPRequest(r *http.Request, body io.ReadCloser) *http.Request {
-	req := new(http.Request)
-	*req = *r
-	req.URL = &url.URL{}
-	*req.URL = *r.URL
-	req.Body = body
-
-	req.Header = http.Header{}
-	for k, v := range r.Header {
-		for _, vv := range v {
-			req.Header.Add(k, vv)
-		}
-	}
-
-	return req
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/offset_reader.go b/vendor/github.com/aws/aws-sdk-go/aws/request/offset_reader.go
deleted file mode 100644
index 02f07f4a46..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/offset_reader.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package request
-
-import (
-	"io"
-	"sync"
-)
-
-// offsetReader is a thread-safe io.ReadCloser to prevent racing
-// with retrying requests
-type offsetReader struct {
-	buf    io.ReadSeeker
-	lock   sync.Mutex
-	closed bool
-}
-
-func newOffsetReader(buf io.ReadSeeker, offset int64) *offsetReader {
-	reader := &offsetReader{}
-	buf.Seek(offset, 0)
-
-	reader.buf = buf
-	return reader
-}
-
-// Close will close the instance of the offset reader's access to
-// the underlying io.ReadSeeker.
-func (o *offsetReader) Close() error {
-	o.lock.Lock()
-	defer o.lock.Unlock()
-	o.closed = true
-	return nil
-}
-
-// Read is a thread-safe read of the underlying io.ReadSeeker
-func (o *offsetReader) Read(p []byte) (int, error) {
-	o.lock.Lock()
-	defer o.lock.Unlock()
-
-	if o.closed {
-		return 0, io.EOF
-	}
-
-	return o.buf.Read(p)
-}
-
-// Seek is a thread-safe seeking operation.
-func (o *offsetReader) Seek(offset int64, whence int) (int64, error) {
-	o.lock.Lock()
-	defer o.lock.Unlock()
-
-	return o.buf.Seek(offset, whence)
-}
-
-// CloseAndCopy will return a new offsetReader with a copy of the old buffer
-// and close the old buffer.
-func (o *offsetReader) CloseAndCopy(offset int64) *offsetReader {
-	o.Close()
-	return newOffsetReader(o.buf, offset)
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go
deleted file mode 100644
index 299dc379d1..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/request.go
+++ /dev/null
@@ -1,575 +0,0 @@
-package request
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/url"
-	"reflect"
-	"strings"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/client/metadata"
-)
-
-const (
-	// ErrCodeSerialization is the serialization error code that is received
-	// during protocol unmarshaling.
-	ErrCodeSerialization = "SerializationError"
-
-	// ErrCodeRead is an error that is returned during HTTP reads.
-	ErrCodeRead = "ReadError"
-
-	// ErrCodeResponseTimeout is the connection timeout error that is recieved
-	// during body reads.
-	ErrCodeResponseTimeout = "ResponseTimeout"
-
-	// CanceledErrorCode is the error code that will be returned by an
-	// API request that was canceled. Requests given a aws.Context may
-	// return this error when canceled.
-	CanceledErrorCode = "RequestCanceled"
-)
-
-// A Request is the service request to be made.
-type Request struct {
-	Config     aws.Config
-	ClientInfo metadata.ClientInfo
-	Handlers   Handlers
-
-	Retryer
-	Time                   time.Time
-	ExpireTime             time.Duration
-	Operation              *Operation
-	HTTPRequest            *http.Request
-	HTTPResponse           *http.Response
-	Body                   io.ReadSeeker
-	BodyStart              int64 // offset from beginning of Body that the request body starts
-	Params                 interface{}
-	Error                  error
-	Data                   interface{}
-	RequestID              string
-	RetryCount             int
-	Retryable              *bool
-	RetryDelay             time.Duration
-	NotHoist               bool
-	SignedHeaderVals       http.Header
-	LastSignedAt           time.Time
-	DisableFollowRedirects bool
-
-	context aws.Context
-
-	built bool
-
-	// Need to persist an intermediate body between the input Body and HTTP
-	// request body because the HTTP Client's transport can maintain a reference
-	// to the HTTP request's body after the client has returned. This value is
-	// safe to use concurrently and wrap the input Body for each HTTP request.
-	safeBody *offsetReader
-}
-
-// An Operation is the service API operation to be made.
-type Operation struct {
-	Name       string
-	HTTPMethod string
-	HTTPPath   string
-	*Paginator
-
-	BeforePresignFn func(r *Request) error
-}
-
-// New returns a new Request pointer for the service API
-// operation and parameters.
-//
-// Params is any value of input parameters to be the request payload.
-// Data is pointer value to an object which the request's response
-// payload will be deserialized to.
-func New(cfg aws.Config, clientInfo metadata.ClientInfo, handlers Handlers,
-	retryer Retryer, operation *Operation, params interface{}, data interface{}) *Request {
-
-	method := operation.HTTPMethod
-	if method == "" {
-		method = "POST"
-	}
-
-	httpReq, _ := http.NewRequest(method, "", nil)
-
-	var err error
-	httpReq.URL, err = url.Parse(clientInfo.Endpoint + operation.HTTPPath)
-	if err != nil {
-		httpReq.URL = &url.URL{}
-		err = awserr.New("InvalidEndpointURL", "invalid endpoint uri", err)
-	}
-
-	r := &Request{
-		Config:     cfg,
-		ClientInfo: clientInfo,
-		Handlers:   handlers.Copy(),
-
-		Retryer:     retryer,
-		Time:        time.Now(),
-		ExpireTime:  0,
-		Operation:   operation,
-		HTTPRequest: httpReq,
-		Body:        nil,
-		Params:      params,
-		Error:       err,
-		Data:        data,
-	}
-	r.SetBufferBody([]byte{})
-
-	return r
-}
-
-// A Option is a functional option that can augment or modify a request when
-// using a WithContext API operation method.
-type Option func(*Request)
-
-// WithGetResponseHeader builds a request Option which will retrieve a single
-// header value from the HTTP Response. If there are multiple values for the
-// header key use WithGetResponseHeaders instead to access the http.Header
-// map directly. The passed in val pointer must be non-nil.
-//
-// This Option can be used multiple times with a single API operation.
-//
-//    var id2, versionID string
-//    svc.PutObjectWithContext(ctx, params,
-//        request.WithGetResponseHeader("x-amz-id-2", &id2),
-//        request.WithGetResponseHeader("x-amz-version-id", &versionID),
-//    )
-func WithGetResponseHeader(key string, val *string) Option {
-	return func(r *Request) {
-		r.Handlers.Complete.PushBack(func(req *Request) {
-			*val = req.HTTPResponse.Header.Get(key)
-		})
-	}
-}
-
-// WithGetResponseHeaders builds a request Option which will retrieve the
-// headers from the HTTP response and assign them to the passed in headers
-// variable. The passed in headers pointer must be non-nil.
-//
-//    var headers http.Header
-//    svc.PutObjectWithContext(ctx, params, request.WithGetResponseHeaders(&headers))
-func WithGetResponseHeaders(headers *http.Header) Option {
-	return func(r *Request) {
-		r.Handlers.Complete.PushBack(func(req *Request) {
-			*headers = req.HTTPResponse.Header
-		})
-	}
-}
-
-// WithLogLevel is a request option that will set the request to use a specific
-// log level when the request is made.
-//
-//     svc.PutObjectWithContext(ctx, params, request.WithLogLevel(aws.LogDebugWithHTTPBody)
-func WithLogLevel(l aws.LogLevelType) Option {
-	return func(r *Request) {
-		r.Config.LogLevel = aws.LogLevel(l)
-	}
-}
-
-// ApplyOptions will apply each option to the request calling them in the order
-// the were provided.
-func (r *Request) ApplyOptions(opts ...Option) {
-	for _, opt := range opts {
-		opt(r)
-	}
-}
-
-// Context will always returns a non-nil context. If Request does not have a
-// context aws.BackgroundContext will be returned.
-func (r *Request) Context() aws.Context {
-	if r.context != nil {
-		return r.context
-	}
-	return aws.BackgroundContext()
-}
-
-// SetContext adds a Context to the current request that can be used to cancel
-// a in-flight request. The Context value must not be nil, or this method will
-// panic.
-//
-// Unlike http.Request.WithContext, SetContext does not return a copy of the
-// Request. It is not safe to use use a single Request value for multiple
-// requests. A new Request should be created for each API operation request.
-//
-// Go 1.6 and below:
-// The http.Request's Cancel field will be set to the Done() value of
-// the context. This will overwrite the Cancel field's value.
-//
-// Go 1.7 and above:
-// The http.Request.WithContext will be used to set the context on the underlying
-// http.Request. This will create a shallow copy of the http.Request. The SDK
-// may create sub contexts in the future for nested requests such as retries.
-func (r *Request) SetContext(ctx aws.Context) {
-	if ctx == nil {
-		panic("context cannot be nil")
-	}
-	setRequestContext(r, ctx)
-}
-
-// WillRetry returns if the request's can be retried.
-func (r *Request) WillRetry() bool {
-	return r.Error != nil && aws.BoolValue(r.Retryable) && r.RetryCount < r.MaxRetries()
-}
-
-// ParamsFilled returns if the request's parameters have been populated
-// and the parameters are valid. False is returned if no parameters are
-// provided or invalid.
-func (r *Request) ParamsFilled() bool {
-	return r.Params != nil && reflect.ValueOf(r.Params).Elem().IsValid()
-}
-
-// DataFilled returns true if the request's data for response deserialization
-// target has been set and is a valid. False is returned if data is not
-// set, or is invalid.
-func (r *Request) DataFilled() bool {
-	return r.Data != nil && reflect.ValueOf(r.Data).Elem().IsValid()
-}
-
-// SetBufferBody will set the request's body bytes that will be sent to
-// the service API.
-func (r *Request) SetBufferBody(buf []byte) {
-	r.SetReaderBody(bytes.NewReader(buf))
-}
-
-// SetStringBody sets the body of the request to be backed by a string.
-func (r *Request) SetStringBody(s string) {
-	r.SetReaderBody(strings.NewReader(s))
-}
-
-// SetReaderBody will set the request's body reader.
-func (r *Request) SetReaderBody(reader io.ReadSeeker) {
-	r.Body = reader
-	r.ResetBody()
-}
-
-// Presign returns the request's signed URL. Error will be returned
-// if the signing fails.
-func (r *Request) Presign(expireTime time.Duration) (string, error) {
-	r.ExpireTime = expireTime
-	r.NotHoist = false
-
-	if r.Operation.BeforePresignFn != nil {
-		r = r.copy()
-		err := r.Operation.BeforePresignFn(r)
-		if err != nil {
-			return "", err
-		}
-	}
-
-	r.Sign()
-	if r.Error != nil {
-		return "", r.Error
-	}
-	return r.HTTPRequest.URL.String(), nil
-}
-
-// PresignRequest behaves just like presign, but hoists all headers and signs them.
-// Also returns the signed hash back to the user
-func (r *Request) PresignRequest(expireTime time.Duration) (string, http.Header, error) {
-	r.ExpireTime = expireTime
-	r.NotHoist = true
-	r.Sign()
-	if r.Error != nil {
-		return "", nil, r.Error
-	}
-	return r.HTTPRequest.URL.String(), r.SignedHeaderVals, nil
-}
-
-func debugLogReqError(r *Request, stage string, retrying bool, err error) {
-	if !r.Config.LogLevel.Matches(aws.LogDebugWithRequestErrors) {
-		return
-	}
-
-	retryStr := "not retrying"
-	if retrying {
-		retryStr = "will retry"
-	}
-
-	r.Config.Logger.Log(fmt.Sprintf("DEBUG: %s %s/%s failed, %s, error %v",
-		stage, r.ClientInfo.ServiceName, r.Operation.Name, retryStr, err))
-}
-
-// Build will build the request's object so it can be signed and sent
-// to the service. Build will also validate all the request's parameters.
-// Anny additional build Handlers set on this request will be run
-// in the order they were set.
-//
-// The request will only be built once. Multiple calls to build will have
-// no effect.
-//
-// If any Validate or Build errors occur the build will stop and the error
-// which occurred will be returned.
-func (r *Request) Build() error {
-	if !r.built {
-		r.Handlers.Validate.Run(r)
-		if r.Error != nil {
-			debugLogReqError(r, "Validate Request", false, r.Error)
-			return r.Error
-		}
-		r.Handlers.Build.Run(r)
-		if r.Error != nil {
-			debugLogReqError(r, "Build Request", false, r.Error)
-			return r.Error
-		}
-		r.built = true
-	}
-
-	return r.Error
-}
-
-// Sign will sign the request returning error if errors are encountered.
-//
-// Send will build the request prior to signing. All Sign Handlers will
-// be executed in the order they were set.
-func (r *Request) Sign() error {
-	r.Build()
-	if r.Error != nil {
-		debugLogReqError(r, "Build Request", false, r.Error)
-		return r.Error
-	}
-
-	r.Handlers.Sign.Run(r)
-	return r.Error
-}
-
-func (r *Request) getNextRequestBody() (io.ReadCloser, error) {
-	if r.safeBody != nil {
-		r.safeBody.Close()
-	}
-
-	r.safeBody = newOffsetReader(r.Body, r.BodyStart)
-
-	// Go 1.8 tightened and clarified the rules code needs to use when building
-	// requests with the http package. Go 1.8 removed the automatic detection
-	// of if the Request.Body was empty, or actually had bytes in it. The SDK
-	// always sets the Request.Body even if it is empty and should not actually
-	// be sent. This is incorrect.
-	//
-	// Go 1.8 did add a http.NoBody value that the SDK can use to tell the http
-	// client that the request really should be sent without a body. The
-	// Request.Body cannot be set to nil, which is preferable, because the
-	// field is exported and could introduce nil pointer dereferences for users
-	// of the SDK if they used that field.
-	//
-	// Related golang/go#18257
-	l, err := computeBodyLength(r.Body)
-	if err != nil {
-		return nil, awserr.New(ErrCodeSerialization, "failed to compute request body size", err)
-	}
-
-	var body io.ReadCloser
-	if l == 0 {
-		body = NoBody
-	} else if l > 0 {
-		body = r.safeBody
-	} else {
-		// Hack to prevent sending bodies for methods where the body
-		// should be ignored by the server. Sending bodies on these
-		// methods without an associated ContentLength will cause the
-		// request to socket timeout because the server does not handle
-		// Transfer-Encoding: chunked bodies for these methods.
-		//
-		// This would only happen if a aws.ReaderSeekerCloser was used with
-		// a io.Reader that was not also an io.Seeker.
-		switch r.Operation.HTTPMethod {
-		case "GET", "HEAD", "DELETE":
-			body = NoBody
-		default:
-			body = r.safeBody
-		}
-	}
-
-	return body, nil
-}
-
-// Attempts to compute the length of the body of the reader using the
-// io.Seeker interface. If the value is not seekable because of being
-// a ReaderSeekerCloser without an unerlying Seeker -1 will be returned.
-// If no error occurs the length of the body will be returned.
-func computeBodyLength(r io.ReadSeeker) (int64, error) {
-	seekable := true
-	// Determine if the seeker is actually seekable. ReaderSeekerCloser
-	// hides the fact that a io.Readers might not actually be seekable.
-	switch v := r.(type) {
-	case aws.ReaderSeekerCloser:
-		seekable = v.IsSeeker()
-	case *aws.ReaderSeekerCloser:
-		seekable = v.IsSeeker()
-	}
-	if !seekable {
-		return -1, nil
-	}
-
-	curOffset, err := r.Seek(0, 1)
-	if err != nil {
-		return 0, err
-	}
-
-	endOffset, err := r.Seek(0, 2)
-	if err != nil {
-		return 0, err
-	}
-
-	_, err = r.Seek(curOffset, 0)
-	if err != nil {
-		return 0, err
-	}
-
-	return endOffset - curOffset, nil
-}
-
-// GetBody will return an io.ReadSeeker of the Request's underlying
-// input body with a concurrency safe wrapper.
-func (r *Request) GetBody() io.ReadSeeker {
-	return r.safeBody
-}
-
-// Send will send the request returning error if errors are encountered.
-//
-// Send will sign the request prior to sending. All Send Handlers will
-// be executed in the order they were set.
-//
-// Canceling a request is non-deterministic. If a request has been canceled,
-// then the transport will choose, randomly, one of the state channels during
-// reads or getting the connection.
-//
-// readLoop() and getConn(req *Request, cm connectMethod)
-// https://github.com/golang/go/blob/master/src/net/http/transport.go
-//
-// Send will not close the request.Request's body.
-func (r *Request) Send() error {
-	defer func() {
-		// Regardless of success or failure of the request trigger the Complete
-		// request handlers.
-		r.Handlers.Complete.Run(r)
-	}()
-
-	for {
-		if aws.BoolValue(r.Retryable) {
-			if r.Config.LogLevel.Matches(aws.LogDebugWithRequestRetries) {
-				r.Config.Logger.Log(fmt.Sprintf("DEBUG: Retrying Request %s/%s, attempt %d",
-					r.ClientInfo.ServiceName, r.Operation.Name, r.RetryCount))
-			}
-
-			// The previous http.Request will have a reference to the r.Body
-			// and the HTTP Client's Transport may still be reading from
-			// the request's body even though the Client's Do returned.
-			r.HTTPRequest = copyHTTPRequest(r.HTTPRequest, nil)
-			r.ResetBody()
-
-			// Closing response body to ensure that no response body is leaked
-			// between retry attempts.
-			if r.HTTPResponse != nil && r.HTTPResponse.Body != nil {
-				r.HTTPResponse.Body.Close()
-			}
-		}
-
-		r.Sign()
-		if r.Error != nil {
-			return r.Error
-		}
-
-		r.Retryable = nil
-
-		r.Handlers.Send.Run(r)
-		if r.Error != nil {
-			if !shouldRetryCancel(r) {
-				return r.Error
-			}
-
-			err := r.Error
-			r.Handlers.Retry.Run(r)
-			r.Handlers.AfterRetry.Run(r)
-			if r.Error != nil {
-				debugLogReqError(r, "Send Request", false, err)
-				return r.Error
-			}
-			debugLogReqError(r, "Send Request", true, err)
-			continue
-		}
-		r.Handlers.UnmarshalMeta.Run(r)
-		r.Handlers.ValidateResponse.Run(r)
-		if r.Error != nil {
-			r.Handlers.UnmarshalError.Run(r)
-			err := r.Error
-
-			r.Handlers.Retry.Run(r)
-			r.Handlers.AfterRetry.Run(r)
-			if r.Error != nil {
-				debugLogReqError(r, "Validate Response", false, err)
-				return r.Error
-			}
-			debugLogReqError(r, "Validate Response", true, err)
-			continue
-		}
-
-		r.Handlers.Unmarshal.Run(r)
-		if r.Error != nil {
-			err := r.Error
-			r.Handlers.Retry.Run(r)
-			r.Handlers.AfterRetry.Run(r)
-			if r.Error != nil {
-				debugLogReqError(r, "Unmarshal Response", false, err)
-				return r.Error
-			}
-			debugLogReqError(r, "Unmarshal Response", true, err)
-			continue
-		}
-
-		break
-	}
-
-	return nil
-}
-
-// copy will copy a request which will allow for local manipulation of the
-// request.
-func (r *Request) copy() *Request {
-	req := &Request{}
-	*req = *r
-	req.Handlers = r.Handlers.Copy()
-	op := *r.Operation
-	req.Operation = &op
-	return req
-}
-
-// AddToUserAgent adds the string to the end of the request's current user agent.
-func AddToUserAgent(r *Request, s string) {
-	curUA := r.HTTPRequest.Header.Get("User-Agent")
-	if len(curUA) > 0 {
-		s = curUA + " " + s
-	}
-	r.HTTPRequest.Header.Set("User-Agent", s)
-}
-
-func shouldRetryCancel(r *Request) bool {
-	awsErr, ok := r.Error.(awserr.Error)
-	timeoutErr := false
-	errStr := r.Error.Error()
-	if ok {
-		if awsErr.Code() == CanceledErrorCode {
-			return false
-		}
-		err := awsErr.OrigErr()
-		netErr, netOK := err.(net.Error)
-		timeoutErr = netOK && netErr.Temporary()
-		if urlErr, ok := err.(*url.Error); !timeoutErr && ok {
-			errStr = urlErr.Err.Error()
-		}
-	}
-
-	// There can be two types of canceled errors here.
-	// The first being a net.Error and the other being an error.
-	// If the request was timed out, we want to continue the retry
-	// process. Otherwise, return the canceled error.
-	return timeoutErr ||
-		(errStr != "net/http: request canceled" &&
-			errStr != "net/http: request canceled while waiting for connection")
-
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_7.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_7.go
deleted file mode 100644
index 869b97a1a0..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_7.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// +build !go1.8
-
-package request
-
-import "io"
-
-// NoBody is an io.ReadCloser with no bytes. Read always returns EOF
-// and Close always returns nil. It can be used in an outgoing client
-// request to explicitly signal that a request has zero bytes.
-// An alternative, however, is to simply set Request.Body to nil.
-//
-// Copy of Go 1.8 NoBody type from net/http/http.go
-type noBody struct{}
-
-func (noBody) Read([]byte) (int, error)         { return 0, io.EOF }
-func (noBody) Close() error                     { return nil }
-func (noBody) WriteTo(io.Writer) (int64, error) { return 0, nil }
-
-// NoBody is an empty reader that will trigger the Go HTTP client to not include
-// and body in the HTTP request.
-var NoBody = noBody{}
-
-// ResetBody rewinds the request body back to its starting position, and
-// set's the HTTP Request body reference. When the body is read prior
-// to being sent in the HTTP request it will need to be rewound.
-//
-// ResetBody will automatically be called by the SDK's build handler, but if
-// the request is being used directly ResetBody must be called before the request
-// is Sent.  SetStringBody, SetBufferBody, and SetReaderBody will automatically
-// call ResetBody.
-func (r *Request) ResetBody() {
-	body, err := r.getNextRequestBody()
-	if err != nil {
-		r.Error = err
-		return
-	}
-
-	r.HTTPRequest.Body = body
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_8.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_8.go
deleted file mode 100644
index c32fc69bc5..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_8.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// +build go1.8
-
-package request
-
-import (
-	"net/http"
-)
-
-// NoBody is a http.NoBody reader instructing Go HTTP client to not include
-// and body in the HTTP request.
-var NoBody = http.NoBody
-
-// ResetBody rewinds the request body back to its starting position, and
-// set's the HTTP Request body reference. When the body is read prior
-// to being sent in the HTTP request it will need to be rewound.
-//
-// ResetBody will automatically be called by the SDK's build handler, but if
-// the request is being used directly ResetBody must be called before the request
-// is Sent.  SetStringBody, SetBufferBody, and SetReaderBody will automatically
-// call ResetBody.
-//
-// Will also set the Go 1.8's http.Request.GetBody member to allow retrying
-// PUT/POST redirects.
-func (r *Request) ResetBody() {
-	body, err := r.getNextRequestBody()
-	if err != nil {
-		r.Error = err
-		return
-	}
-
-	r.HTTPRequest.Body = body
-	r.HTTPRequest.GetBody = r.getNextRequestBody
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request_context.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_context.go
deleted file mode 100644
index a7365cd1e4..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/request_context.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build go1.7
-
-package request
-
-import "github.com/aws/aws-sdk-go/aws"
-
-// setContext updates the Request to use the passed in context for cancellation.
-// Context will also be used for request retry delay.
-//
-// Creates shallow copy of the http.Request with the WithContext method.
-func setRequestContext(r *Request, ctx aws.Context) {
-	r.context = ctx
-	r.HTTPRequest = r.HTTPRequest.WithContext(ctx)
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request_context_1_6.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_context_1_6.go
deleted file mode 100644
index 307fa0705b..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/request_context_1_6.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !go1.7
-
-package request
-
-import "github.com/aws/aws-sdk-go/aws"
-
-// setContext updates the Request to use the passed in context for cancellation.
-// Context will also be used for request retry delay.
-//
-// Creates shallow copy of the http.Request with the WithContext method.
-func setRequestContext(r *Request, ctx aws.Context) {
-	r.context = ctx
-	r.HTTPRequest.Cancel = ctx.Done()
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
deleted file mode 100644
index 59de6736b6..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
+++ /dev/null
@@ -1,236 +0,0 @@
-package request
-
-import (
-	"reflect"
-	"sync/atomic"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awsutil"
-)
-
-// A Pagination provides paginating of SDK API operations which are paginatable.
-// Generally you should not use this type directly, but use the "Pages" API
-// operations method to automatically perform pagination for you. Such as,
-// "S3.ListObjectsPages", and "S3.ListObjectsPagesWithContext" methods.
-//
-// Pagination differs from a Paginator type in that pagination is the type that
-// does the pagination between API operations, and Paginator defines the
-// configuration that will be used per page request.
-//
-//     cont := true
-//     for p.Next() && cont {
-//         data := p.Page().(*s3.ListObjectsOutput)
-//         // process the page's data
-//     }
-//     return p.Err()
-//
-// See service client API operation Pages methods for examples how the SDK will
-// use the Pagination type.
-type Pagination struct {
-	// Function to return a Request value for each pagination request.
-	// Any configuration or handlers that need to be applied to the request
-	// prior to getting the next page should be done here before the request
-	// returned.
-	//
-	// NewRequest should always be built from the same API operations. It is
-	// undefined if different API operations are returned on subsequent calls.
-	NewRequest func() (*Request, error)
-
-	started    bool
-	nextTokens []interface{}
-
-	err     error
-	curPage interface{}
-}
-
-// HasNextPage will return true if Pagination is able to determine that the API
-// operation has additional pages. False will be returned if there are no more
-// pages remaining.
-//
-// Will always return true if Next has not been called yet.
-func (p *Pagination) HasNextPage() bool {
-	return !(p.started && len(p.nextTokens) == 0)
-}
-
-// Err returns the error Pagination encountered when retrieving the next page.
-func (p *Pagination) Err() error {
-	return p.err
-}
-
-// Page returns the current page. Page should only be called after a successful
-// call to Next. It is undefined what Page will return if Page is called after
-// Next returns false.
-func (p *Pagination) Page() interface{} {
-	return p.curPage
-}
-
-// Next will attempt to retrieve the next page for the API operation. When a page
-// is retrieved true will be returned. If the page cannot be retrieved, or there
-// are no more pages false will be returned.
-//
-// Use the Page method to retrieve the current page data. The data will need
-// to be cast to the API operation's output type.
-//
-// Use the Err method to determine if an error occurred if Page returns false.
-func (p *Pagination) Next() bool {
-	if !p.HasNextPage() {
-		return false
-	}
-
-	req, err := p.NewRequest()
-	if err != nil {
-		p.err = err
-		return false
-	}
-
-	if p.started {
-		for i, intok := range req.Operation.InputTokens {
-			awsutil.SetValueAtPath(req.Params, intok, p.nextTokens[i])
-		}
-	}
-	p.started = true
-
-	err = req.Send()
-	if err != nil {
-		p.err = err
-		return false
-	}
-
-	p.nextTokens = req.nextPageTokens()
-	p.curPage = req.Data
-
-	return true
-}
-
-// A Paginator is the configuration data that defines how an API operation
-// should be paginated. This type is used by the API service models to define
-// the generated pagination config for service APIs.
-//
-// The Pagination type is what provides iterating between pages of an API. It
-// is only used to store the token metadata the SDK should use for performing
-// pagination.
-type Paginator struct {
-	InputTokens     []string
-	OutputTokens    []string
-	LimitToken      string
-	TruncationToken string
-}
-
-// nextPageTokens returns the tokens to use when asking for the next page of data.
-func (r *Request) nextPageTokens() []interface{} {
-	if r.Operation.Paginator == nil {
-		return nil
-	}
-	if r.Operation.TruncationToken != "" {
-		tr, _ := awsutil.ValuesAtPath(r.Data, r.Operation.TruncationToken)
-		if len(tr) == 0 {
-			return nil
-		}
-
-		switch v := tr[0].(type) {
-		case *bool:
-			if !aws.BoolValue(v) {
-				return nil
-			}
-		case bool:
-			if v == false {
-				return nil
-			}
-		}
-	}
-
-	tokens := []interface{}{}
-	tokenAdded := false
-	for _, outToken := range r.Operation.OutputTokens {
-		v, _ := awsutil.ValuesAtPath(r.Data, outToken)
-		if len(v) > 0 {
-			tokens = append(tokens, v[0])
-			tokenAdded = true
-		} else {
-			tokens = append(tokens, nil)
-		}
-	}
-	if !tokenAdded {
-		return nil
-	}
-
-	return tokens
-}
-
-// Ensure a deprecated item is only logged once instead of each time its used.
-func logDeprecatedf(logger aws.Logger, flag *int32, msg string) {
-	if logger == nil {
-		return
-	}
-	if atomic.CompareAndSwapInt32(flag, 0, 1) {
-		logger.Log(msg)
-	}
-}
-
-var (
-	logDeprecatedHasNextPage int32
-	logDeprecatedNextPage    int32
-	logDeprecatedEachPage    int32
-)
-
-// HasNextPage returns true if this request has more pages of data available.
-//
-// Deprecated Use Pagination type for configurable pagination of API operations
-func (r *Request) HasNextPage() bool {
-	logDeprecatedf(r.Config.Logger, &logDeprecatedHasNextPage,
-		"Request.HasNextPage deprecated. Use Pagination type for configurable pagination of API operations")
-
-	return len(r.nextPageTokens()) > 0
-}
-
-// NextPage returns a new Request that can be executed to return the next
-// page of result data. Call .Send() on this request to execute it.
-//
-// Deprecated Use Pagination type for configurable pagination of API operations
-func (r *Request) NextPage() *Request {
-	logDeprecatedf(r.Config.Logger, &logDeprecatedNextPage,
-		"Request.NextPage deprecated. Use Pagination type for configurable pagination of API operations")
-
-	tokens := r.nextPageTokens()
-	if len(tokens) == 0 {
-		return nil
-	}
-
-	data := reflect.New(reflect.TypeOf(r.Data).Elem()).Interface()
-	nr := New(r.Config, r.ClientInfo, r.Handlers, r.Retryer, r.Operation, awsutil.CopyOf(r.Params), data)
-	for i, intok := range nr.Operation.InputTokens {
-		awsutil.SetValueAtPath(nr.Params, intok, tokens[i])
-	}
-	return nr
-}
-
-// EachPage iterates over each page of a paginated request object. The fn
-// parameter should be a function with the following sample signature:
-//
-//   func(page *T, lastPage bool) bool {
-//       return true // return false to stop iterating
-//   }
-//
-// Where "T" is the structure type matching the output structure of the given
-// operation. For example, a request object generated by
-// DynamoDB.ListTablesRequest() would expect to see dynamodb.ListTablesOutput
-// as the structure "T". The lastPage value represents whether the page is
-// the last page of data or not. The return value of this function should
-// return true to keep iterating or false to stop.
-//
-// Deprecated Use Pagination type for configurable pagination of API operations
-func (r *Request) EachPage(fn func(data interface{}, isLastPage bool) (shouldContinue bool)) error {
-	logDeprecatedf(r.Config.Logger, &logDeprecatedEachPage,
-		"Request.EachPage deprecated. Use Pagination type for configurable pagination of API operations")
-
-	for page := r; page != nil; page = page.NextPage() {
-		if err := page.Send(); err != nil {
-			return err
-		}
-		if getNextPage := fn(page.Data, !page.HasNextPage()); !getNextPage {
-			return page.Error
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
deleted file mode 100644
index 2c05dbdc2e..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
+++ /dev/null
@@ -1,161 +0,0 @@
-package request
-
-import (
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-// Retryer is an interface to control retry logic for a given service.
-// The default implementation used by most services is the client.DefaultRetryer
-// structure, which contains basic retry logic using exponential backoff.
-type Retryer interface {
-	RetryRules(*Request) time.Duration
-	ShouldRetry(*Request) bool
-	MaxRetries() int
-}
-
-// WithRetryer sets a config Retryer value to the given Config returning it
-// for chaining.
-func WithRetryer(cfg *aws.Config, retryer Retryer) *aws.Config {
-	cfg.Retryer = retryer
-	return cfg
-}
-
-// retryableCodes is a collection of service response codes which are retry-able
-// without any further action.
-var retryableCodes = map[string]struct{}{
-	"RequestError":            {},
-	"RequestTimeout":          {},
-	ErrCodeResponseTimeout:    {},
-	"RequestTimeoutException": {}, // Glacier's flavor of RequestTimeout
-}
-
-var throttleCodes = map[string]struct{}{
-	"ProvisionedThroughputExceededException": {},
-	"Throttling":                             {},
-	"ThrottlingException":                    {},
-	"RequestLimitExceeded":                   {},
-	"RequestThrottled":                       {},
-	"TooManyRequestsException":               {}, // Lambda functions
-	"PriorRequestNotComplete":                {}, // Route53
-}
-
-// credsExpiredCodes is a collection of error codes which signify the credentials
-// need to be refreshed. Expired tokens require refreshing of credentials, and
-// resigning before the request can be retried.
-var credsExpiredCodes = map[string]struct{}{
-	"ExpiredToken":          {},
-	"ExpiredTokenException": {},
-	"RequestExpired":        {}, // EC2 Only
-}
-
-func isCodeThrottle(code string) bool {
-	_, ok := throttleCodes[code]
-	return ok
-}
-
-func isCodeRetryable(code string) bool {
-	if _, ok := retryableCodes[code]; ok {
-		return true
-	}
-
-	return isCodeExpiredCreds(code)
-}
-
-func isCodeExpiredCreds(code string) bool {
-	_, ok := credsExpiredCodes[code]
-	return ok
-}
-
-var validParentCodes = map[string]struct{}{
-	ErrCodeSerialization: struct{}{},
-	ErrCodeRead:          struct{}{},
-}
-
-type temporaryError interface {
-	Temporary() bool
-}
-
-func isNestedErrorRetryable(parentErr awserr.Error) bool {
-	if parentErr == nil {
-		return false
-	}
-
-	if _, ok := validParentCodes[parentErr.Code()]; !ok {
-		return false
-	}
-
-	err := parentErr.OrigErr()
-	if err == nil {
-		return false
-	}
-
-	if aerr, ok := err.(awserr.Error); ok {
-		return isCodeRetryable(aerr.Code())
-	}
-
-	if t, ok := err.(temporaryError); ok {
-		return t.Temporary()
-	}
-
-	return isErrConnectionReset(err)
-}
-
-// IsErrorRetryable returns whether the error is retryable, based on its Code.
-// Returns false if error is nil.
-func IsErrorRetryable(err error) bool {
-	if err != nil {
-		if aerr, ok := err.(awserr.Error); ok {
-			return isCodeRetryable(aerr.Code()) || isNestedErrorRetryable(aerr)
-		}
-	}
-	return false
-}
-
-// IsErrorThrottle returns whether the error is to be throttled based on its code.
-// Returns false if error is nil.
-func IsErrorThrottle(err error) bool {
-	if err != nil {
-		if aerr, ok := err.(awserr.Error); ok {
-			return isCodeThrottle(aerr.Code())
-		}
-	}
-	return false
-}
-
-// IsErrorExpiredCreds returns whether the error code is a credential expiry error.
-// Returns false if error is nil.
-func IsErrorExpiredCreds(err error) bool {
-	if err != nil {
-		if aerr, ok := err.(awserr.Error); ok {
-			return isCodeExpiredCreds(aerr.Code())
-		}
-	}
-	return false
-}
-
-// IsErrorRetryable returns whether the error is retryable, based on its Code.
-// Returns false if the request has no Error set.
-//
-// Alias for the utility function IsErrorRetryable
-func (r *Request) IsErrorRetryable() bool {
-	return IsErrorRetryable(r.Error)
-}
-
-// IsErrorThrottle returns whether the error is to be throttled based on its code.
-// Returns false if the request has no Error set
-//
-// Alias for the utility function IsErrorThrottle
-func (r *Request) IsErrorThrottle() bool {
-	return IsErrorThrottle(r.Error)
-}
-
-// IsErrorExpired returns whether the error code is a credential expiry error.
-// Returns false if the request has no Error set.
-//
-// Alias for the utility function IsErrorExpiredCreds
-func (r *Request) IsErrorExpired() bool {
-	return IsErrorExpiredCreds(r.Error)
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/timeout_read_closer.go b/vendor/github.com/aws/aws-sdk-go/aws/request/timeout_read_closer.go
deleted file mode 100644
index 09a44eb987..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/timeout_read_closer.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package request
-
-import (
-	"io"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-var timeoutErr = awserr.New(
-	ErrCodeResponseTimeout,
-	"read on body has reached the timeout limit",
-	nil,
-)
-
-type readResult struct {
-	n   int
-	err error
-}
-
-// timeoutReadCloser will handle body reads that take too long.
-// We will return a ErrReadTimeout error if a timeout occurs.
-type timeoutReadCloser struct {
-	reader   io.ReadCloser
-	duration time.Duration
-}
-
-// Read will spin off a goroutine to call the reader's Read method. We will
-// select on the timer's channel or the read's channel. Whoever completes first
-// will be returned.
-func (r *timeoutReadCloser) Read(b []byte) (int, error) {
-	timer := time.NewTimer(r.duration)
-	c := make(chan readResult, 1)
-
-	go func() {
-		n, err := r.reader.Read(b)
-		timer.Stop()
-		c <- readResult{n: n, err: err}
-	}()
-
-	select {
-	case data := <-c:
-		return data.n, data.err
-	case <-timer.C:
-		return 0, timeoutErr
-	}
-}
-
-func (r *timeoutReadCloser) Close() error {
-	return r.reader.Close()
-}
-
-const (
-	// HandlerResponseTimeout is what we use to signify the name of the
-	// response timeout handler.
-	HandlerResponseTimeout = "ResponseTimeoutHandler"
-)
-
-// adaptToResponseTimeoutError is a handler that will replace any top level error
-// to a ErrCodeResponseTimeout, if its child is that.
-func adaptToResponseTimeoutError(req *Request) {
-	if err, ok := req.Error.(awserr.Error); ok {
-		aerr, ok := err.OrigErr().(awserr.Error)
-		if ok && aerr.Code() == ErrCodeResponseTimeout {
-			req.Error = aerr
-		}
-	}
-}
-
-// WithResponseReadTimeout is a request option that will wrap the body in a timeout read closer.
-// This will allow for per read timeouts. If a timeout occurred, we will return the
-// ErrCodeResponseTimeout.
-//
-//     svc.PutObjectWithContext(ctx, params, request.WithTimeoutReadCloser(30 * time.Second)
-func WithResponseReadTimeout(duration time.Duration) Option {
-	return func(r *Request) {
-
-		var timeoutHandler = NamedHandler{
-			HandlerResponseTimeout,
-			func(req *Request) {
-				req.HTTPResponse.Body = &timeoutReadCloser{
-					reader:   req.HTTPResponse.Body,
-					duration: duration,
-				}
-			}}
-
-		// remove the handler so we are not stomping over any new durations.
-		r.Handlers.Send.RemoveByName(HandlerResponseTimeout)
-		r.Handlers.Send.PushBackNamed(timeoutHandler)
-
-		r.Handlers.Unmarshal.PushBack(adaptToResponseTimeoutError)
-		r.Handlers.UnmarshalError.PushBack(adaptToResponseTimeoutError)
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/validation.go b/vendor/github.com/aws/aws-sdk-go/aws/request/validation.go
deleted file mode 100644
index 4012462282..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/validation.go
+++ /dev/null
@@ -1,234 +0,0 @@
-package request
-
-import (
-	"bytes"
-	"fmt"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-const (
-	// InvalidParameterErrCode is the error code for invalid parameters errors
-	InvalidParameterErrCode = "InvalidParameter"
-	// ParamRequiredErrCode is the error code for required parameter errors
-	ParamRequiredErrCode = "ParamRequiredError"
-	// ParamMinValueErrCode is the error code for fields with too low of a
-	// number value.
-	ParamMinValueErrCode = "ParamMinValueError"
-	// ParamMinLenErrCode is the error code for fields without enough elements.
-	ParamMinLenErrCode = "ParamMinLenError"
-)
-
-// Validator provides a way for types to perform validation logic on their
-// input values that external code can use to determine if a type's values
-// are valid.
-type Validator interface {
-	Validate() error
-}
-
-// An ErrInvalidParams provides wrapping of invalid parameter errors found when
-// validating API operation input parameters.
-type ErrInvalidParams struct {
-	// Context is the base context of the invalid parameter group.
-	Context string
-	errs    []ErrInvalidParam
-}
-
-// Add adds a new invalid parameter error to the collection of invalid
-// parameters. The context of the invalid parameter will be updated to reflect
-// this collection.
-func (e *ErrInvalidParams) Add(err ErrInvalidParam) {
-	err.SetContext(e.Context)
-	e.errs = append(e.errs, err)
-}
-
-// AddNested adds the invalid parameter errors from another ErrInvalidParams
-// value into this collection. The nested errors will have their nested context
-// updated and base context to reflect the merging.
-//
-// Use for nested validations errors.
-func (e *ErrInvalidParams) AddNested(nestedCtx string, nested ErrInvalidParams) {
-	for _, err := range nested.errs {
-		err.SetContext(e.Context)
-		err.AddNestedContext(nestedCtx)
-		e.errs = append(e.errs, err)
-	}
-}
-
-// Len returns the number of invalid parameter errors
-func (e ErrInvalidParams) Len() int {
-	return len(e.errs)
-}
-
-// Code returns the code of the error
-func (e ErrInvalidParams) Code() string {
-	return InvalidParameterErrCode
-}
-
-// Message returns the message of the error
-func (e ErrInvalidParams) Message() string {
-	return fmt.Sprintf("%d validation error(s) found.", len(e.errs))
-}
-
-// Error returns the string formatted form of the invalid parameters.
-func (e ErrInvalidParams) Error() string {
-	w := &bytes.Buffer{}
-	fmt.Fprintf(w, "%s: %s\n", e.Code(), e.Message())
-
-	for _, err := range e.errs {
-		fmt.Fprintf(w, "- %s\n", err.Message())
-	}
-
-	return w.String()
-}
-
-// OrigErr returns the invalid parameters as a awserr.BatchedErrors value
-func (e ErrInvalidParams) OrigErr() error {
-	return awserr.NewBatchError(
-		InvalidParameterErrCode, e.Message(), e.OrigErrs())
-}
-
-// OrigErrs returns a slice of the invalid parameters
-func (e ErrInvalidParams) OrigErrs() []error {
-	errs := make([]error, len(e.errs))
-	for i := 0; i < len(errs); i++ {
-		errs[i] = e.errs[i]
-	}
-
-	return errs
-}
-
-// An ErrInvalidParam represents an invalid parameter error type.
-type ErrInvalidParam interface {
-	awserr.Error
-
-	// Field name the error occurred on.
-	Field() string
-
-	// SetContext updates the context of the error.
-	SetContext(string)
-
-	// AddNestedContext updates the error's context to include a nested level.
-	AddNestedContext(string)
-}
-
-type errInvalidParam struct {
-	context       string
-	nestedContext string
-	field         string
-	code          string
-	msg           string
-}
-
-// Code returns the error code for the type of invalid parameter.
-func (e *errInvalidParam) Code() string {
-	return e.code
-}
-
-// Message returns the reason the parameter was invalid, and its context.
-func (e *errInvalidParam) Message() string {
-	return fmt.Sprintf("%s, %s.", e.msg, e.Field())
-}
-
-// Error returns the string version of the invalid parameter error.
-func (e *errInvalidParam) Error() string {
-	return fmt.Sprintf("%s: %s", e.code, e.Message())
-}
-
-// OrigErr returns nil, Implemented for awserr.Error interface.
-func (e *errInvalidParam) OrigErr() error {
-	return nil
-}
-
-// Field Returns the field and context the error occurred.
-func (e *errInvalidParam) Field() string {
-	field := e.context
-	if len(field) > 0 {
-		field += "."
-	}
-	if len(e.nestedContext) > 0 {
-		field += fmt.Sprintf("%s.", e.nestedContext)
-	}
-	field += e.field
-
-	return field
-}
-
-// SetContext updates the base context of the error.
-func (e *errInvalidParam) SetContext(ctx string) {
-	e.context = ctx
-}
-
-// AddNestedContext prepends a context to the field's path.
-func (e *errInvalidParam) AddNestedContext(ctx string) {
-	if len(e.nestedContext) == 0 {
-		e.nestedContext = ctx
-	} else {
-		e.nestedContext = fmt.Sprintf("%s.%s", ctx, e.nestedContext)
-	}
-
-}
-
-// An ErrParamRequired represents an required parameter error.
-type ErrParamRequired struct {
-	errInvalidParam
-}
-
-// NewErrParamRequired creates a new required parameter error.
-func NewErrParamRequired(field string) *ErrParamRequired {
-	return &ErrParamRequired{
-		errInvalidParam{
-			code:  ParamRequiredErrCode,
-			field: field,
-			msg:   fmt.Sprintf("missing required field"),
-		},
-	}
-}
-
-// An ErrParamMinValue represents a minimum value parameter error.
-type ErrParamMinValue struct {
-	errInvalidParam
-	min float64
-}
-
-// NewErrParamMinValue creates a new minimum value parameter error.
-func NewErrParamMinValue(field string, min float64) *ErrParamMinValue {
-	return &ErrParamMinValue{
-		errInvalidParam: errInvalidParam{
-			code:  ParamMinValueErrCode,
-			field: field,
-			msg:   fmt.Sprintf("minimum field value of %v", min),
-		},
-		min: min,
-	}
-}
-
-// MinValue returns the field's require minimum value.
-//
-// float64 is returned for both int and float min values.
-func (e *ErrParamMinValue) MinValue() float64 {
-	return e.min
-}
-
-// An ErrParamMinLen represents a minimum length parameter error.
-type ErrParamMinLen struct {
-	errInvalidParam
-	min int
-}
-
-// NewErrParamMinLen creates a new minimum length parameter error.
-func NewErrParamMinLen(field string, min int) *ErrParamMinLen {
-	return &ErrParamMinLen{
-		errInvalidParam: errInvalidParam{
-			code:  ParamMinLenErrCode,
-			field: field,
-			msg:   fmt.Sprintf("minimum field size of %v", min),
-		},
-		min: min,
-	}
-}
-
-// MinLen returns the field's required minimum length.
-func (e *ErrParamMinLen) MinLen() int {
-	return e.min
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/waiter.go b/vendor/github.com/aws/aws-sdk-go/aws/request/waiter.go
deleted file mode 100644
index 4601f883cc..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/waiter.go
+++ /dev/null
@@ -1,295 +0,0 @@
-package request
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/awsutil"
-)
-
-// WaiterResourceNotReadyErrorCode is the error code returned by a waiter when
-// the waiter's max attempts have been exhausted.
-const WaiterResourceNotReadyErrorCode = "ResourceNotReady"
-
-// A WaiterOption is a function that will update the Waiter value's fields to
-// configure the waiter.
-type WaiterOption func(*Waiter)
-
-// WithWaiterMaxAttempts returns the maximum number of times the waiter should
-// attempt to check the resource for the target state.
-func WithWaiterMaxAttempts(max int) WaiterOption {
-	return func(w *Waiter) {
-		w.MaxAttempts = max
-	}
-}
-
-// WaiterDelay will return a delay the waiter should pause between attempts to
-// check the resource state. The passed in attempt is the number of times the
-// Waiter has checked the resource state.
-//
-// Attempt is the number of attempts the Waiter has made checking the resource
-// state.
-type WaiterDelay func(attempt int) time.Duration
-
-// ConstantWaiterDelay returns a WaiterDelay that will always return a constant
-// delay the waiter should use between attempts. It ignores the number of
-// attempts made.
-func ConstantWaiterDelay(delay time.Duration) WaiterDelay {
-	return func(attempt int) time.Duration {
-		return delay
-	}
-}
-
-// WithWaiterDelay will set the Waiter to use the WaiterDelay passed in.
-func WithWaiterDelay(delayer WaiterDelay) WaiterOption {
-	return func(w *Waiter) {
-		w.Delay = delayer
-	}
-}
-
-// WithWaiterLogger returns a waiter option to set the logger a waiter
-// should use to log warnings and errors to.
-func WithWaiterLogger(logger aws.Logger) WaiterOption {
-	return func(w *Waiter) {
-		w.Logger = logger
-	}
-}
-
-// WithWaiterRequestOptions returns a waiter option setting the request
-// options for each request the waiter makes. Appends to waiter's request
-// options already set.
-func WithWaiterRequestOptions(opts ...Option) WaiterOption {
-	return func(w *Waiter) {
-		w.RequestOptions = append(w.RequestOptions, opts...)
-	}
-}
-
-// A Waiter provides the functionality to perform a blocking call which will
-// wait for a resource state to be satisfied by a service.
-//
-// This type should not be used directly. The API operations provided in the
-// service packages prefixed with "WaitUntil" should be used instead.
-type Waiter struct {
-	Name      string
-	Acceptors []WaiterAcceptor
-	Logger    aws.Logger
-
-	MaxAttempts int
-	Delay       WaiterDelay
-
-	RequestOptions   []Option
-	NewRequest       func([]Option) (*Request, error)
-	SleepWithContext func(aws.Context, time.Duration) error
-}
-
-// ApplyOptions updates the waiter with the list of waiter options provided.
-func (w *Waiter) ApplyOptions(opts ...WaiterOption) {
-	for _, fn := range opts {
-		fn(w)
-	}
-}
-
-// WaiterState are states the waiter uses based on WaiterAcceptor definitions
-// to identify if the resource state the waiter is waiting on has occurred.
-type WaiterState int
-
-// String returns the string representation of the waiter state.
-func (s WaiterState) String() string {
-	switch s {
-	case SuccessWaiterState:
-		return "success"
-	case FailureWaiterState:
-		return "failure"
-	case RetryWaiterState:
-		return "retry"
-	default:
-		return "unknown waiter state"
-	}
-}
-
-// States the waiter acceptors will use to identify target resource states.
-const (
-	SuccessWaiterState WaiterState = iota // waiter successful
-	FailureWaiterState                    // waiter failed
-	RetryWaiterState                      // waiter needs to be retried
-)
-
-// WaiterMatchMode is the mode that the waiter will use to match the WaiterAcceptor
-// definition's Expected attribute.
-type WaiterMatchMode int
-
-// Modes the waiter will use when inspecting API response to identify target
-// resource states.
-const (
-	PathAllWaiterMatch  WaiterMatchMode = iota // match on all paths
-	PathWaiterMatch                            // match on specific path
-	PathAnyWaiterMatch                         // match on any path
-	PathListWaiterMatch                        // match on list of paths
-	StatusWaiterMatch                          // match on status code
-	ErrorWaiterMatch                           // match on error
-)
-
-// String returns the string representation of the waiter match mode.
-func (m WaiterMatchMode) String() string {
-	switch m {
-	case PathAllWaiterMatch:
-		return "pathAll"
-	case PathWaiterMatch:
-		return "path"
-	case PathAnyWaiterMatch:
-		return "pathAny"
-	case PathListWaiterMatch:
-		return "pathList"
-	case StatusWaiterMatch:
-		return "status"
-	case ErrorWaiterMatch:
-		return "error"
-	default:
-		return "unknown waiter match mode"
-	}
-}
-
-// WaitWithContext will make requests for the API operation using NewRequest to
-// build API requests. The request's response will be compared against the
-// Waiter's Acceptors to determine the successful state of the resource the
-// waiter is inspecting.
-//
-// The passed in context must not be nil. If it is nil a panic will occur. The
-// Context will be used to cancel the waiter's pending requests and retry delays.
-// Use aws.BackgroundContext if no context is available.
-//
-// The waiter will continue until the target state defined by the Acceptors,
-// or the max attempts expires.
-//
-// Will return the WaiterResourceNotReadyErrorCode error code if the waiter's
-// retryer ShouldRetry returns false. This normally will happen when the max
-// wait attempts expires.
-func (w Waiter) WaitWithContext(ctx aws.Context) error {
-
-	for attempt := 1; ; attempt++ {
-		req, err := w.NewRequest(w.RequestOptions)
-		if err != nil {
-			waiterLogf(w.Logger, "unable to create request %v", err)
-			return err
-		}
-		req.Handlers.Build.PushBack(MakeAddToUserAgentFreeFormHandler("Waiter"))
-		err = req.Send()
-
-		// See if any of the acceptors match the request's response, or error
-		for _, a := range w.Acceptors {
-			if matched, matchErr := a.match(w.Name, w.Logger, req, err); matched {
-				return matchErr
-			}
-		}
-
-		// The Waiter should only check the resource state MaxAttempts times
-		// This is here instead of in the for loop above to prevent delaying
-		// unnecessary when the waiter will not retry.
-		if attempt == w.MaxAttempts {
-			break
-		}
-
-		// Delay to wait before inspecting the resource again
-		delay := w.Delay(attempt)
-		if sleepFn := req.Config.SleepDelay; sleepFn != nil {
-			// Support SleepDelay for backwards compatibility and testing
-			sleepFn(delay)
-		} else {
-			sleepCtxFn := w.SleepWithContext
-			if sleepCtxFn == nil {
-				sleepCtxFn = aws.SleepWithContext
-			}
-
-			if err := sleepCtxFn(ctx, delay); err != nil {
-				return awserr.New(CanceledErrorCode, "waiter context canceled", err)
-			}
-		}
-	}
-
-	return awserr.New(WaiterResourceNotReadyErrorCode, "exceeded wait attempts", nil)
-}
-
-// A WaiterAcceptor provides the information needed to wait for an API operation
-// to complete.
-type WaiterAcceptor struct {
-	State    WaiterState
-	Matcher  WaiterMatchMode
-	Argument string
-	Expected interface{}
-}
-
-// match returns if the acceptor found a match with the passed in request
-// or error. True is returned if the acceptor made a match, error is returned
-// if there was an error attempting to perform the match.
-func (a *WaiterAcceptor) match(name string, l aws.Logger, req *Request, err error) (bool, error) {
-	result := false
-	var vals []interface{}
-
-	switch a.Matcher {
-	case PathAllWaiterMatch, PathWaiterMatch:
-		// Require all matches to be equal for result to match
-		vals, _ = awsutil.ValuesAtPath(req.Data, a.Argument)
-		if len(vals) == 0 {
-			break
-		}
-		result = true
-		for _, val := range vals {
-			if !awsutil.DeepEqual(val, a.Expected) {
-				result = false
-				break
-			}
-		}
-	case PathAnyWaiterMatch:
-		// Only a single match needs to equal for the result to match
-		vals, _ = awsutil.ValuesAtPath(req.Data, a.Argument)
-		for _, val := range vals {
-			if awsutil.DeepEqual(val, a.Expected) {
-				result = true
-				break
-			}
-		}
-	case PathListWaiterMatch:
-		// ignored matcher
-	case StatusWaiterMatch:
-		s := a.Expected.(int)
-		result = s == req.HTTPResponse.StatusCode
-	case ErrorWaiterMatch:
-		if aerr, ok := err.(awserr.Error); ok {
-			result = aerr.Code() == a.Expected.(string)
-		}
-	default:
-		waiterLogf(l, "WARNING: Waiter %s encountered unexpected matcher: %s",
-			name, a.Matcher)
-	}
-
-	if !result {
-		// If there was no matching result found there is nothing more to do
-		// for this response, retry the request.
-		return false, nil
-	}
-
-	switch a.State {
-	case SuccessWaiterState:
-		// waiter completed
-		return true, nil
-	case FailureWaiterState:
-		// Waiter failure state triggered
-		return true, awserr.New(WaiterResourceNotReadyErrorCode,
-			"failed waiting for successful resource state", err)
-	case RetryWaiterState:
-		// clear the error and retry the operation
-		return false, nil
-	default:
-		waiterLogf(l, "WARNING: Waiter %s encountered unexpected state: %s",
-			name, a.State)
-		return false, nil
-	}
-}
-
-func waiterLogf(logger aws.Logger, msg string, args ...interface{}) {
-	if logger != nil {
-		logger.Log(fmt.Sprintf(msg, args...))
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/session/doc.go b/vendor/github.com/aws/aws-sdk-go/aws/session/doc.go
deleted file mode 100644
index ea7b886f81..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/session/doc.go
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
-Package session provides configuration for the SDK's service clients.
-
-Sessions can be shared across all service clients that share the same base
-configuration.  The Session is built from the SDK's default configuration and
-request handlers.
-
-Sessions should be cached when possible, because creating a new Session will
-load all configuration values from the environment, and config files each time
-the Session is created. Sharing the Session value across all of your service
-clients will ensure the configuration is loaded the fewest number of times possible.
-
-Concurrency
-
-Sessions are safe to use concurrently as long as the Session is not being
-modified. The SDK will not modify the Session once the Session has been created.
-Creating service clients concurrently from a shared Session is safe.
-
-Sessions from Shared Config
-
-Sessions can be created using the method above that will only load the
-additional config if the AWS_SDK_LOAD_CONFIG environment variable is set.
-Alternatively you can explicitly create a Session with shared config enabled.
-To do this you can use NewSessionWithOptions to configure how the Session will
-be created. Using the NewSessionWithOptions with SharedConfigState set to
-SharedConfigEnable will create the session as if the AWS_SDK_LOAD_CONFIG
-environment variable was set.
-
-Creating Sessions
-
-When creating Sessions optional aws.Config values can be passed in that will
-override the default, or loaded config values the Session is being created
-with. This allows you to provide additional, or case based, configuration
-as needed.
-
-By default NewSession will only load credentials from the shared credentials
-file (~/.aws/credentials). If the AWS_SDK_LOAD_CONFIG environment variable is
-set to a truthy value the Session will be created from the configuration
-values from the shared config (~/.aws/config) and shared credentials
-(~/.aws/credentials) files. See the section Sessions from Shared Config for
-more information.
-
-Create a Session with the default config and request handlers. With credentials
-region, and profile loaded from the environment and shared config automatically.
-Requires the AWS_PROFILE to be set, or "default" is used.
-
-	// Create Session
-	sess := session.Must(session.NewSession())
-
-	// Create a Session with a custom region
-	sess := session.Must(session.NewSession(&aws.Config{
-		Region: aws.String("us-east-1"),
-	}))
-
-	// Create a S3 client instance from a session
-	sess := session.Must(session.NewSession())
-
-	svc := s3.New(sess)
-
-Create Session With Option Overrides
-
-In addition to NewSession, Sessions can be created using NewSessionWithOptions.
-This func allows you to control and override how the Session will be created
-through code instead of being driven by environment variables only.
-
-Use NewSessionWithOptions when you want to provide the config profile, or
-override the shared config state (AWS_SDK_LOAD_CONFIG).
-
-	// Equivalent to session.NewSession()
-	sess := session.Must(session.NewSessionWithOptions(session.Options{
-		// Options
-	}))
-
-	// Specify profile to load for the session's config
-	sess := session.Must(session.NewSessionWithOptions(session.Options{
-		 Profile: "profile_name",
-	}))
-
-	// Specify profile for config and region for requests
-	sess := session.Must(session.NewSessionWithOptions(session.Options{
-		 Config: aws.Config{Region: aws.String("us-east-1")},
-		 Profile: "profile_name",
-	}))
-
-	// Force enable Shared Config support
-	sess := session.Must(session.NewSessionWithOptions(session.Options{
-		SharedConfigState: session.SharedConfigEnable,
-	}))
-
-Adding Handlers
-
-You can add handlers to a session for processing HTTP requests. All service
-clients that use the session inherit the handlers. For example, the following
-handler logs every request and its payload made by a service client:
-
-	// Create a session, and add additional handlers for all service
-	// clients created with the Session to inherit. Adds logging handler.
-	sess := session.Must(session.NewSession())
-
-	sess.Handlers.Send.PushFront(func(r *request.Request) {
-		// Log every request made and its payload
-		logger.Println("Request: %s/%s, Payload: %s",
-			r.ClientInfo.ServiceName, r.Operation, r.Params)
-	})
-
-Deprecated "New" function
-
-The New session function has been deprecated because it does not provide good
-way to return errors that occur when loading the configuration files and values.
-Because of this, NewSession was created so errors can be retrieved when
-creating a session fails.
-
-Shared Config Fields
-
-By default the SDK will only load the shared credentials file's (~/.aws/credentials)
-credentials values, and all other config is provided by the environment variables,
-SDK defaults, and user provided aws.Config values.
-
-If the AWS_SDK_LOAD_CONFIG environment variable is set, or SharedConfigEnable
-option is used to create the Session the full shared config values will be
-loaded. This includes credentials, region, and support for assume role. In
-addition the Session will load its configuration from both the shared config
-file (~/.aws/config) and shared credentials file (~/.aws/credentials). Both
-files have the same format.
-
-If both config files are present the configuration from both files will be
-read. The Session will be created from configuration values from the shared
-credentials file (~/.aws/credentials) over those in the shared config file (~/.aws/config).
-
-Credentials are the values the SDK should use for authenticating requests with
-AWS Services. They arfrom a configuration file will need to include both
-aws_access_key_id and aws_secret_access_key must be provided together in the
-same file to be considered valid. The values will be ignored if not a complete
-group. aws_session_token is an optional field that can be provided if both of
-the other two fields are also provided.
-
-	aws_access_key_id = AKID
-	aws_secret_access_key = SECRET
-	aws_session_token = TOKEN
-
-Assume Role values allow you to configure the SDK to assume an IAM role using
-a set of credentials provided in a config file via the source_profile field.
-Both "role_arn" and "source_profile" are required. The SDK supports assuming
-a role with MFA token if the session option AssumeRoleTokenProvider
-is set.
-
-	role_arn = arn:aws:iam::<account_number>:role/<role_name>
-	source_profile = profile_with_creds
-	external_id = 1234
-	mfa_serial = <serial or mfa arn>
-	role_session_name = session_name
-
-Region is the region the SDK should use for looking up AWS service endpoints
-and signing requests.
-
-	region = us-east-1
-
-Assume Role with MFA token
-
-To create a session with support for assuming an IAM role with MFA set the
-session option AssumeRoleTokenProvider to a function that will prompt for the
-MFA token code when the SDK assumes the role and refreshes the role's credentials.
-This allows you to configure the SDK via the shared config to assumea role
-with MFA tokens.
-
-In order for the SDK to assume a role with MFA the SharedConfigState
-session option must be set to SharedConfigEnable, or AWS_SDK_LOAD_CONFIG
-environment variable set.
-
-The shared configuration instructs the SDK to assume an IAM role with MFA
-when the mfa_serial configuration field is set in the shared config
-(~/.aws/config) or shared credentials (~/.aws/credentials) file.
-
-If mfa_serial is set in the configuration, the SDK will assume the role, and
-the AssumeRoleTokenProvider session option is not set an an error will
-be returned when creating the session.
-
-    sess := session.Must(session.NewSessionWithOptions(session.Options{
-        AssumeRoleTokenProvider: stscreds.StdinTokenProvider,
-    }))
-
-    // Create service client value configured for credentials
-    // from assumed role.
-    svc := s3.New(sess)
-
-To setup assume role outside of a session see the stscrds.AssumeRoleProvider
-documentation.
-
-Environment Variables
-
-When a Session is created several environment variables can be set to adjust
-how the SDK functions, and what configuration data it loads when creating
-Sessions. All environment values are optional, but some values like credentials
-require multiple of the values to set or the partial values will be ignored.
-All environment variable values are strings unless otherwise noted.
-
-Environment configuration values. If set both Access Key ID and Secret Access
-Key must be provided. Session Token and optionally also be provided, but is
-not required.
-
-	# Access Key ID
-	AWS_ACCESS_KEY_ID=AKID
-	AWS_ACCESS_KEY=AKID # only read if AWS_ACCESS_KEY_ID is not set.
-
-	# Secret Access Key
-	AWS_SECRET_ACCESS_KEY=SECRET
-	AWS_SECRET_KEY=SECRET=SECRET # only read if AWS_SECRET_ACCESS_KEY is not set.
-
-	# Session Token
-	AWS_SESSION_TOKEN=TOKEN
-
-Region value will instruct the SDK where to make service API requests to. If is
-not provided in the environment the region must be provided before a service
-client request is made.
-
-	AWS_REGION=us-east-1
-
-	# AWS_DEFAULT_REGION is only read if AWS_SDK_LOAD_CONFIG is also set,
-	# and AWS_REGION is not also set.
-	AWS_DEFAULT_REGION=us-east-1
-
-Profile name the SDK should load use when loading shared config from the
-configuration files. If not provided "default" will be used as the profile name.
-
-	AWS_PROFILE=my_profile
-
-	# AWS_DEFAULT_PROFILE is only read if AWS_SDK_LOAD_CONFIG is also set,
-	# and AWS_PROFILE is not also set.
-	AWS_DEFAULT_PROFILE=my_profile
-
-SDK load config instructs the SDK to load the shared config in addition to
-shared credentials. This also expands the configuration loaded so the shared
-credentials will have parity with the shared config file. This also enables
-Region and Profile support for the AWS_DEFAULT_REGION and AWS_DEFAULT_PROFILE
-env values as well.
-
-	AWS_SDK_LOAD_CONFIG=1
-
-Shared credentials file path can be set to instruct the SDK to use an alternative
-file for the shared credentials. If not set the file will be loaded from
-$HOME/.aws/credentials on Linux/Unix based systems, and
-%USERPROFILE%\.aws\credentials on Windows.
-
-	AWS_SHARED_CREDENTIALS_FILE=$HOME/my_shared_credentials
-
-Shared config file path can be set to instruct the SDK to use an alternative
-file for the shared config. If not set the file will be loaded from
-$HOME/.aws/config on Linux/Unix based systems, and
-%USERPROFILE%\.aws\config on Windows.
-
-	AWS_CONFIG_FILE=$HOME/my_shared_config
-
-Path to a custom Credentials Authority (CA) bundle PEM file that the SDK
-will use instead of the default system's root CA bundle. Use this only
-if you want to replace the CA bundle the SDK uses for TLS requests.
-
-	AWS_CA_BUNDLE=$HOME/my_custom_ca_bundle
-
-Enabling this option will attempt to merge the Transport into the SDK's HTTP
-client. If the client's Transport is not a http.Transport an error will be
-returned. If the Transport's TLS config is set this option will cause the SDK
-to overwrite the Transport's TLS config's  RootCAs value. If the CA bundle file
-contains multiple certificates all of them will be loaded.
-
-The Session option CustomCABundle is also available when creating sessions
-to also enable this feature. CustomCABundle session option field has priority
-over the AWS_CA_BUNDLE environment variable, and will be used if both are set.
-
-Setting a custom HTTPClient in the aws.Config options will override this setting.
-To use this option and custom HTTP client, the HTTP client needs to be provided
-when creating the session. Not the service client.
-*/
-package session
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/session/env_config.go b/vendor/github.com/aws/aws-sdk-go/aws/session/env_config.go
deleted file mode 100644
index 7357e545ac..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/session/env_config.go
+++ /dev/null
@@ -1,188 +0,0 @@
-package session
-
-import (
-	"os"
-	"strconv"
-
-	"github.com/aws/aws-sdk-go/aws/credentials"
-)
-
-// envConfig is a collection of environment values the SDK will read
-// setup config from. All environment values are optional. But some values
-// such as credentials require multiple values to be complete or the values
-// will be ignored.
-type envConfig struct {
-	// Environment configuration values. If set both Access Key ID and Secret Access
-	// Key must be provided. Session Token and optionally also be provided, but is
-	// not required.
-	//
-	//	# Access Key ID
-	//	AWS_ACCESS_KEY_ID=AKID
-	//	AWS_ACCESS_KEY=AKID # only read if AWS_ACCESS_KEY_ID is not set.
-	//
-	//	# Secret Access Key
-	//	AWS_SECRET_ACCESS_KEY=SECRET
-	//	AWS_SECRET_KEY=SECRET=SECRET # only read if AWS_SECRET_ACCESS_KEY is not set.
-	//
-	//	# Session Token
-	//	AWS_SESSION_TOKEN=TOKEN
-	Creds credentials.Value
-
-	// Region value will instruct the SDK where to make service API requests to. If is
-	// not provided in the environment the region must be provided before a service
-	// client request is made.
-	//
-	//	AWS_REGION=us-east-1
-	//
-	//	# AWS_DEFAULT_REGION is only read if AWS_SDK_LOAD_CONFIG is also set,
-	//	# and AWS_REGION is not also set.
-	//	AWS_DEFAULT_REGION=us-east-1
-	Region string
-
-	// Profile name the SDK should load use when loading shared configuration from the
-	// shared configuration files. If not provided "default" will be used as the
-	// profile name.
-	//
-	//	AWS_PROFILE=my_profile
-	//
-	//	# AWS_DEFAULT_PROFILE is only read if AWS_SDK_LOAD_CONFIG is also set,
-	//	# and AWS_PROFILE is not also set.
-	//	AWS_DEFAULT_PROFILE=my_profile
-	Profile string
-
-	// SDK load config instructs the SDK to load the shared config in addition to
-	// shared credentials. This also expands the configuration loaded from the shared
-	// credentials to have parity with the shared config file. This also enables
-	// Region and Profile support for the AWS_DEFAULT_REGION and AWS_DEFAULT_PROFILE
-	// env values as well.
-	//
-	//	AWS_SDK_LOAD_CONFIG=1
-	EnableSharedConfig bool
-
-	// Shared credentials file path can be set to instruct the SDK to use an alternate
-	// file for the shared credentials. If not set the file will be loaded from
-	// $HOME/.aws/credentials on Linux/Unix based systems, and
-	// %USERPROFILE%\.aws\credentials on Windows.
-	//
-	//	AWS_SHARED_CREDENTIALS_FILE=$HOME/my_shared_credentials
-	SharedCredentialsFile string
-
-	// Shared config file path can be set to instruct the SDK to use an alternate
-	// file for the shared config. If not set the file will be loaded from
-	// $HOME/.aws/config on Linux/Unix based systems, and
-	// %USERPROFILE%\.aws\config on Windows.
-	//
-	//	AWS_CONFIG_FILE=$HOME/my_shared_config
-	SharedConfigFile string
-
-	// Sets the path to a custom Credentials Authroity (CA) Bundle PEM file
-	// that the SDK will use instead of the the system's root CA bundle.
-	// Only use this if you want to configure the SDK to use a custom set
-	// of CAs.
-	//
-	// Enabling this option will attempt to merge the Transport
-	// into the SDK's HTTP client. If the client's Transport is
-	// not a http.Transport an error will be returned. If the
-	// Transport's TLS config is set this option will cause the
-	// SDK to overwrite the Transport's TLS config's  RootCAs value.
-	//
-	// Setting a custom HTTPClient in the aws.Config options will override this setting.
-	// To use this option and custom HTTP client, the HTTP client needs to be provided
-	// when creating the session. Not the service client.
-	//
-	//  AWS_CA_BUNDLE=$HOME/my_custom_ca_bundle
-	CustomCABundle string
-}
-
-var (
-	credAccessEnvKey = []string{
-		"AWS_ACCESS_KEY_ID",
-		"AWS_ACCESS_KEY",
-	}
-	credSecretEnvKey = []string{
-		"AWS_SECRET_ACCESS_KEY",
-		"AWS_SECRET_KEY",
-	}
-	credSessionEnvKey = []string{
-		"AWS_SESSION_TOKEN",
-	}
-
-	regionEnvKeys = []string{
-		"AWS_REGION",
-		"AWS_DEFAULT_REGION", // Only read if AWS_SDK_LOAD_CONFIG is also set
-	}
-	profileEnvKeys = []string{
-		"AWS_PROFILE",
-		"AWS_DEFAULT_PROFILE", // Only read if AWS_SDK_LOAD_CONFIG is also set
-	}
-	sharedCredsFileEnvKey = []string{
-		"AWS_SHARED_CREDENTIALS_FILE",
-	}
-	sharedConfigFileEnvKey = []string{
-		"AWS_CONFIG_FILE",
-	}
-)
-
-// loadEnvConfig retrieves the SDK's environment configuration.
-// See `envConfig` for the values that will be retrieved.
-//
-// If the environment variable `AWS_SDK_LOAD_CONFIG` is set to a truthy value
-// the shared SDK config will be loaded in addition to the SDK's specific
-// configuration values.
-func loadEnvConfig() envConfig {
-	enableSharedConfig, _ := strconv.ParseBool(os.Getenv("AWS_SDK_LOAD_CONFIG"))
-	return envConfigLoad(enableSharedConfig)
-}
-
-// loadEnvSharedConfig retrieves the SDK's environment configuration, and the
-// SDK shared config. See `envConfig` for the values that will be retrieved.
-//
-// Loads the shared configuration in addition to the SDK's specific configuration.
-// This will load the same values as `loadEnvConfig` if the `AWS_SDK_LOAD_CONFIG`
-// environment variable is set.
-func loadSharedEnvConfig() envConfig {
-	return envConfigLoad(true)
-}
-
-func envConfigLoad(enableSharedConfig bool) envConfig {
-	cfg := envConfig{}
-
-	cfg.EnableSharedConfig = enableSharedConfig
-
-	setFromEnvVal(&cfg.Creds.AccessKeyID, credAccessEnvKey)
-	setFromEnvVal(&cfg.Creds.SecretAccessKey, credSecretEnvKey)
-	setFromEnvVal(&cfg.Creds.SessionToken, credSessionEnvKey)
-
-	// Require logical grouping of credentials
-	if len(cfg.Creds.AccessKeyID) == 0 || len(cfg.Creds.SecretAccessKey) == 0 {
-		cfg.Creds = credentials.Value{}
-	} else {
-		cfg.Creds.ProviderName = "EnvConfigCredentials"
-	}
-
-	regionKeys := regionEnvKeys
-	profileKeys := profileEnvKeys
-	if !cfg.EnableSharedConfig {
-		regionKeys = regionKeys[:1]
-		profileKeys = profileKeys[:1]
-	}
-
-	setFromEnvVal(&cfg.Region, regionKeys)
-	setFromEnvVal(&cfg.Profile, profileKeys)
-
-	setFromEnvVal(&cfg.SharedCredentialsFile, sharedCredsFileEnvKey)
-	setFromEnvVal(&cfg.SharedConfigFile, sharedConfigFileEnvKey)
-
-	cfg.CustomCABundle = os.Getenv("AWS_CA_BUNDLE")
-
-	return cfg
-}
-
-func setFromEnvVal(dst *string, keys []string) {
-	for _, k := range keys {
-		if v := os.Getenv(k); len(v) > 0 {
-			*dst = v
-			break
-		}
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/session/session.go b/vendor/github.com/aws/aws-sdk-go/aws/session/session.go
deleted file mode 100644
index 9f75d5ac58..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/session/session.go
+++ /dev/null
@@ -1,606 +0,0 @@
-package session
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/client"
-	"github.com/aws/aws-sdk-go/aws/corehandlers"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
-	"github.com/aws/aws-sdk-go/aws/defaults"
-	"github.com/aws/aws-sdk-go/aws/endpoints"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// A Session provides a central location to create service clients from and
-// store configurations and request handlers for those services.
-//
-// Sessions are safe to create service clients concurrently, but it is not safe
-// to mutate the Session concurrently.
-//
-// The Session satisfies the service client's client.ClientConfigProvider.
-type Session struct {
-	Config   *aws.Config
-	Handlers request.Handlers
-}
-
-// New creates a new instance of the handlers merging in the provided configs
-// on top of the SDK's default configurations. Once the Session is created it
-// can be mutated to modify the Config or Handlers. The Session is safe to be
-// read concurrently, but it should not be written to concurrently.
-//
-// If the AWS_SDK_LOAD_CONFIG environment is set to a truthy value, the New
-// method could now encounter an error when loading the configuration. When
-// The environment variable is set, and an error occurs, New will return a
-// session that will fail all requests reporting the error that occurred while
-// loading the session. Use NewSession to get the error when creating the
-// session.
-//
-// If the AWS_SDK_LOAD_CONFIG environment variable is set to a truthy value
-// the shared config file (~/.aws/config) will also be loaded, in addition to
-// the shared credentials file (~/.aws/credentials). Values set in both the
-// shared config, and shared credentials will be taken from the shared
-// credentials file.
-//
-// Deprecated: Use NewSession functions to create sessions instead. NewSession
-// has the same functionality as New except an error can be returned when the
-// func is called instead of waiting to receive an error until a request is made.
-func New(cfgs ...*aws.Config) *Session {
-	// load initial config from environment
-	envCfg := loadEnvConfig()
-
-	if envCfg.EnableSharedConfig {
-		s, err := newSession(Options{}, envCfg, cfgs...)
-		if err != nil {
-			// Old session.New expected all errors to be discovered when
-			// a request is made, and would report the errors then. This
-			// needs to be replicated if an error occurs while creating
-			// the session.
-			msg := "failed to create session with AWS_SDK_LOAD_CONFIG enabled. " +
-				"Use session.NewSession to handle errors occurring during session creation."
-
-			// Session creation failed, need to report the error and prevent
-			// any requests from succeeding.
-			s = &Session{Config: defaults.Config()}
-			s.Config.MergeIn(cfgs...)
-			s.Config.Logger.Log("ERROR:", msg, "Error:", err)
-			s.Handlers.Validate.PushBack(func(r *request.Request) {
-				r.Error = err
-			})
-		}
-		return s
-	}
-
-	return deprecatedNewSession(cfgs...)
-}
-
-// NewSession returns a new Session created from SDK defaults, config files,
-// environment, and user provided config files. Once the Session is created
-// it can be mutated to modify the Config or Handlers. The Session is safe to
-// be read concurrently, but it should not be written to concurrently.
-//
-// If the AWS_SDK_LOAD_CONFIG environment variable is set to a truthy value
-// the shared config file (~/.aws/config) will also be loaded in addition to
-// the shared credentials file (~/.aws/credentials). Values set in both the
-// shared config, and shared credentials will be taken from the shared
-// credentials file. Enabling the Shared Config will also allow the Session
-// to be built with retrieving credentials with AssumeRole set in the config.
-//
-// See the NewSessionWithOptions func for information on how to override or
-// control through code how the Session will be created. Such as specifying the
-// config profile, and controlling if shared config is enabled or not.
-func NewSession(cfgs ...*aws.Config) (*Session, error) {
-	opts := Options{}
-	opts.Config.MergeIn(cfgs...)
-
-	return NewSessionWithOptions(opts)
-}
-
-// SharedConfigState provides the ability to optionally override the state
-// of the session's creation based on the shared config being enabled or
-// disabled.
-type SharedConfigState int
-
-const (
-	// SharedConfigStateFromEnv does not override any state of the
-	// AWS_SDK_LOAD_CONFIG env var. It is the default value of the
-	// SharedConfigState type.
-	SharedConfigStateFromEnv SharedConfigState = iota
-
-	// SharedConfigDisable overrides the AWS_SDK_LOAD_CONFIG env var value
-	// and disables the shared config functionality.
-	SharedConfigDisable
-
-	// SharedConfigEnable overrides the AWS_SDK_LOAD_CONFIG env var value
-	// and enables the shared config functionality.
-	SharedConfigEnable
-)
-
-// Options provides the means to control how a Session is created and what
-// configuration values will be loaded.
-//
-type Options struct {
-	// Provides config values for the SDK to use when creating service clients
-	// and making API requests to services. Any value set in with this field
-	// will override the associated value provided by the SDK defaults,
-	// environment or config files where relevant.
-	//
-	// If not set, configuration values from from SDK defaults, environment,
-	// config will be used.
-	Config aws.Config
-
-	// Overrides the config profile the Session should be created from. If not
-	// set the value of the environment variable will be loaded (AWS_PROFILE,
-	// or AWS_DEFAULT_PROFILE if the Shared Config is enabled).
-	//
-	// If not set and environment variables are not set the "default"
-	// (DefaultSharedConfigProfile) will be used as the profile to load the
-	// session config from.
-	Profile string
-
-	// Instructs how the Session will be created based on the AWS_SDK_LOAD_CONFIG
-	// environment variable. By default a Session will be created using the
-	// value provided by the AWS_SDK_LOAD_CONFIG environment variable.
-	//
-	// Setting this value to SharedConfigEnable or SharedConfigDisable
-	// will allow you to override the AWS_SDK_LOAD_CONFIG environment variable
-	// and enable or disable the shared config functionality.
-	SharedConfigState SharedConfigState
-
-	// Ordered list of files the session will load configuration from.
-	// It will override environment variable AWS_SHARED_CREDENTIALS_FILE, AWS_CONFIG_FILE.
-	SharedConfigFiles []string
-
-	// When the SDK's shared config is configured to assume a role with MFA
-	// this option is required in order to provide the mechanism that will
-	// retrieve the MFA token. There is no default value for this field. If
-	// it is not set an error will be returned when creating the session.
-	//
-	// This token provider will be called when ever the assumed role's
-	// credentials need to be refreshed. Within the context of service clients
-	// all sharing the same session the SDK will ensure calls to the token
-	// provider are atomic. When sharing a token provider across multiple
-	// sessions additional synchronization logic is needed to ensure the
-	// token providers do not introduce race conditions. It is recommend to
-	// share the session where possible.
-	//
-	// stscreds.StdinTokenProvider is a basic implementation that will prompt
-	// from stdin for the MFA token code.
-	//
-	// This field is only used if the shared configuration is enabled, and
-	// the config enables assume role wit MFA via the mfa_serial field.
-	AssumeRoleTokenProvider func() (string, error)
-
-	// Reader for a custom Credentials Authority (CA) bundle in PEM format that
-	// the SDK will use instead of the default system's root CA bundle. Use this
-	// only if you want to replace the CA bundle the SDK uses for TLS requests.
-	//
-	// Enabling this option will attempt to merge the Transport into the SDK's HTTP
-	// client. If the client's Transport is not a http.Transport an error will be
-	// returned. If the Transport's TLS config is set this option will cause the SDK
-	// to overwrite the Transport's TLS config's  RootCAs value. If the CA
-	// bundle reader contains multiple certificates all of them will be loaded.
-	//
-	// The Session option CustomCABundle is also available when creating sessions
-	// to also enable this feature. CustomCABundle session option field has priority
-	// over the AWS_CA_BUNDLE environment variable, and will be used if both are set.
-	CustomCABundle io.Reader
-}
-
-// NewSessionWithOptions returns a new Session created from SDK defaults, config files,
-// environment, and user provided config files. This func uses the Options
-// values to configure how the Session is created.
-//
-// If the AWS_SDK_LOAD_CONFIG environment variable is set to a truthy value
-// the shared config file (~/.aws/config) will also be loaded in addition to
-// the shared credentials file (~/.aws/credentials). Values set in both the
-// shared config, and shared credentials will be taken from the shared
-// credentials file. Enabling the Shared Config will also allow the Session
-// to be built with retrieving credentials with AssumeRole set in the config.
-//
-//     // Equivalent to session.New
-//     sess := session.Must(session.NewSessionWithOptions(session.Options{}))
-//
-//     // Specify profile to load for the session's config
-//     sess := session.Must(session.NewSessionWithOptions(session.Options{
-//          Profile: "profile_name",
-//     }))
-//
-//     // Specify profile for config and region for requests
-//     sess := session.Must(session.NewSessionWithOptions(session.Options{
-//          Config: aws.Config{Region: aws.String("us-east-1")},
-//          Profile: "profile_name",
-//     }))
-//
-//     // Force enable Shared Config support
-//     sess := session.Must(session.NewSessionWithOptions(session.Options{
-//         SharedConfigState: session.SharedConfigEnable,
-//     }))
-func NewSessionWithOptions(opts Options) (*Session, error) {
-	var envCfg envConfig
-	if opts.SharedConfigState == SharedConfigEnable {
-		envCfg = loadSharedEnvConfig()
-	} else {
-		envCfg = loadEnvConfig()
-	}
-
-	if len(opts.Profile) > 0 {
-		envCfg.Profile = opts.Profile
-	}
-
-	switch opts.SharedConfigState {
-	case SharedConfigDisable:
-		envCfg.EnableSharedConfig = false
-	case SharedConfigEnable:
-		envCfg.EnableSharedConfig = true
-	}
-
-	if len(envCfg.SharedCredentialsFile) == 0 {
-		envCfg.SharedCredentialsFile = defaults.SharedCredentialsFilename()
-	}
-	if len(envCfg.SharedConfigFile) == 0 {
-		envCfg.SharedConfigFile = defaults.SharedConfigFilename()
-	}
-
-	// Only use AWS_CA_BUNDLE if session option is not provided.
-	if len(envCfg.CustomCABundle) != 0 && opts.CustomCABundle == nil {
-		f, err := os.Open(envCfg.CustomCABundle)
-		if err != nil {
-			return nil, awserr.New("LoadCustomCABundleError",
-				"failed to open custom CA bundle PEM file", err)
-		}
-		defer f.Close()
-		opts.CustomCABundle = f
-	}
-
-	return newSession(opts, envCfg, &opts.Config)
-}
-
-// Must is a helper function to ensure the Session is valid and there was no
-// error when calling a NewSession function.
-//
-// This helper is intended to be used in variable initialization to load the
-// Session and configuration at startup. Such as:
-//
-//     var sess = session.Must(session.NewSession())
-func Must(sess *Session, err error) *Session {
-	if err != nil {
-		panic(err)
-	}
-
-	return sess
-}
-
-func deprecatedNewSession(cfgs ...*aws.Config) *Session {
-	cfg := defaults.Config()
-	handlers := defaults.Handlers()
-
-	// Apply the passed in configs so the configuration can be applied to the
-	// default credential chain
-	cfg.MergeIn(cfgs...)
-	if cfg.EndpointResolver == nil {
-		// An endpoint resolver is required for a session to be able to provide
-		// endpoints for service client configurations.
-		cfg.EndpointResolver = endpoints.DefaultResolver()
-	}
-	cfg.Credentials = defaults.CredChain(cfg, handlers)
-
-	// Reapply any passed in configs to override credentials if set
-	cfg.MergeIn(cfgs...)
-
-	s := &Session{
-		Config:   cfg,
-		Handlers: handlers,
-	}
-
-	initHandlers(s)
-
-	return s
-}
-
-func newSession(opts Options, envCfg envConfig, cfgs ...*aws.Config) (*Session, error) {
-	cfg := defaults.Config()
-	handlers := defaults.Handlers()
-
-	// Get a merged version of the user provided config to determine if
-	// credentials were.
-	userCfg := &aws.Config{}
-	userCfg.MergeIn(cfgs...)
-
-	// Ordered config files will be loaded in with later files overwriting
-	// previous config file values.
-	var cfgFiles []string
-	if opts.SharedConfigFiles != nil {
-		cfgFiles = opts.SharedConfigFiles
-	} else {
-		cfgFiles = []string{envCfg.SharedConfigFile, envCfg.SharedCredentialsFile}
-		if !envCfg.EnableSharedConfig {
-			// The shared config file (~/.aws/config) is only loaded if instructed
-			// to load via the envConfig.EnableSharedConfig (AWS_SDK_LOAD_CONFIG).
-			cfgFiles = cfgFiles[1:]
-		}
-	}
-
-	// Load additional config from file(s)
-	sharedCfg, err := loadSharedConfig(envCfg.Profile, cfgFiles)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := mergeConfigSrcs(cfg, userCfg, envCfg, sharedCfg, handlers, opts); err != nil {
-		return nil, err
-	}
-
-	s := &Session{
-		Config:   cfg,
-		Handlers: handlers,
-	}
-
-	initHandlers(s)
-
-	// Setup HTTP client with custom cert bundle if enabled
-	if opts.CustomCABundle != nil {
-		if err := loadCustomCABundle(s, opts.CustomCABundle); err != nil {
-			return nil, err
-		}
-	}
-
-	return s, nil
-}
-
-func loadCustomCABundle(s *Session, bundle io.Reader) error {
-	var t *http.Transport
-	switch v := s.Config.HTTPClient.Transport.(type) {
-	case *http.Transport:
-		t = v
-	default:
-		if s.Config.HTTPClient.Transport != nil {
-			return awserr.New("LoadCustomCABundleError",
-				"unable to load custom CA bundle, HTTPClient's transport unsupported type", nil)
-		}
-	}
-	if t == nil {
-		t = &http.Transport{}
-	}
-
-	p, err := loadCertPool(bundle)
-	if err != nil {
-		return err
-	}
-	if t.TLSClientConfig == nil {
-		t.TLSClientConfig = &tls.Config{}
-	}
-	t.TLSClientConfig.RootCAs = p
-
-	s.Config.HTTPClient.Transport = t
-
-	return nil
-}
-
-func loadCertPool(r io.Reader) (*x509.CertPool, error) {
-	b, err := ioutil.ReadAll(r)
-	if err != nil {
-		return nil, awserr.New("LoadCustomCABundleError",
-			"failed to read custom CA bundle PEM file", err)
-	}
-
-	p := x509.NewCertPool()
-	if !p.AppendCertsFromPEM(b) {
-		return nil, awserr.New("LoadCustomCABundleError",
-			"failed to load custom CA bundle PEM file", err)
-	}
-
-	return p, nil
-}
-
-func mergeConfigSrcs(cfg, userCfg *aws.Config, envCfg envConfig, sharedCfg sharedConfig, handlers request.Handlers, sessOpts Options) error {
-	// Merge in user provided configuration
-	cfg.MergeIn(userCfg)
-
-	// Region if not already set by user
-	if len(aws.StringValue(cfg.Region)) == 0 {
-		if len(envCfg.Region) > 0 {
-			cfg.WithRegion(envCfg.Region)
-		} else if envCfg.EnableSharedConfig && len(sharedCfg.Region) > 0 {
-			cfg.WithRegion(sharedCfg.Region)
-		}
-	}
-
-	// Configure credentials if not already set
-	if cfg.Credentials == credentials.AnonymousCredentials && userCfg.Credentials == nil {
-		if len(envCfg.Creds.AccessKeyID) > 0 {
-			cfg.Credentials = credentials.NewStaticCredentialsFromCreds(
-				envCfg.Creds,
-			)
-		} else if envCfg.EnableSharedConfig && len(sharedCfg.AssumeRole.RoleARN) > 0 && sharedCfg.AssumeRoleSource != nil {
-			cfgCp := *cfg
-			cfgCp.Credentials = credentials.NewStaticCredentialsFromCreds(
-				sharedCfg.AssumeRoleSource.Creds,
-			)
-			if len(sharedCfg.AssumeRole.MFASerial) > 0 && sessOpts.AssumeRoleTokenProvider == nil {
-				// AssumeRole Token provider is required if doing Assume Role
-				// with MFA.
-				return AssumeRoleTokenProviderNotSetError{}
-			}
-			cfg.Credentials = stscreds.NewCredentials(
-				&Session{
-					Config:   &cfgCp,
-					Handlers: handlers.Copy(),
-				},
-				sharedCfg.AssumeRole.RoleARN,
-				func(opt *stscreds.AssumeRoleProvider) {
-					opt.RoleSessionName = sharedCfg.AssumeRole.RoleSessionName
-
-					// Assume role with external ID
-					if len(sharedCfg.AssumeRole.ExternalID) > 0 {
-						opt.ExternalID = aws.String(sharedCfg.AssumeRole.ExternalID)
-					}
-
-					// Assume role with MFA
-					if len(sharedCfg.AssumeRole.MFASerial) > 0 {
-						opt.SerialNumber = aws.String(sharedCfg.AssumeRole.MFASerial)
-						opt.TokenProvider = sessOpts.AssumeRoleTokenProvider
-					}
-				},
-			)
-		} else if len(sharedCfg.Creds.AccessKeyID) > 0 {
-			cfg.Credentials = credentials.NewStaticCredentialsFromCreds(
-				sharedCfg.Creds,
-			)
-		} else {
-			// Fallback to default credentials provider, include mock errors
-			// for the credential chain so user can identify why credentials
-			// failed to be retrieved.
-			cfg.Credentials = credentials.NewCredentials(&credentials.ChainProvider{
-				VerboseErrors: aws.BoolValue(cfg.CredentialsChainVerboseErrors),
-				Providers: []credentials.Provider{
-					&credProviderError{Err: awserr.New("EnvAccessKeyNotFound", "failed to find credentials in the environment.", nil)},
-					&credProviderError{Err: awserr.New("SharedCredsLoad", fmt.Sprintf("failed to load profile, %s.", envCfg.Profile), nil)},
-					defaults.RemoteCredProvider(*cfg, handlers),
-				},
-			})
-		}
-	}
-
-	return nil
-}
-
-// AssumeRoleTokenProviderNotSetError is an error returned when creating a session when the
-// MFAToken option is not set when shared config is configured load assume a
-// role with an MFA token.
-type AssumeRoleTokenProviderNotSetError struct{}
-
-// Code is the short id of the error.
-func (e AssumeRoleTokenProviderNotSetError) Code() string {
-	return "AssumeRoleTokenProviderNotSetError"
-}
-
-// Message is the description of the error
-func (e AssumeRoleTokenProviderNotSetError) Message() string {
-	return fmt.Sprintf("assume role with MFA enabled, but AssumeRoleTokenProvider session option not set.")
-}
-
-// OrigErr is the underlying error that caused the failure.
-func (e AssumeRoleTokenProviderNotSetError) OrigErr() error {
-	return nil
-}
-
-// Error satisfies the error interface.
-func (e AssumeRoleTokenProviderNotSetError) Error() string {
-	return awserr.SprintError(e.Code(), e.Message(), "", nil)
-}
-
-type credProviderError struct {
-	Err error
-}
-
-var emptyCreds = credentials.Value{}
-
-func (c credProviderError) Retrieve() (credentials.Value, error) {
-	return credentials.Value{}, c.Err
-}
-func (c credProviderError) IsExpired() bool {
-	return true
-}
-
-func initHandlers(s *Session) {
-	// Add the Validate parameter handler if it is not disabled.
-	s.Handlers.Validate.Remove(corehandlers.ValidateParametersHandler)
-	if !aws.BoolValue(s.Config.DisableParamValidation) {
-		s.Handlers.Validate.PushBackNamed(corehandlers.ValidateParametersHandler)
-	}
-}
-
-// Copy creates and returns a copy of the current Session, coping the config
-// and handlers. If any additional configs are provided they will be merged
-// on top of the Session's copied config.
-//
-//     // Create a copy of the current Session, configured for the us-west-2 region.
-//     sess.Copy(&aws.Config{Region: aws.String("us-west-2")})
-func (s *Session) Copy(cfgs ...*aws.Config) *Session {
-	newSession := &Session{
-		Config:   s.Config.Copy(cfgs...),
-		Handlers: s.Handlers.Copy(),
-	}
-
-	initHandlers(newSession)
-
-	return newSession
-}
-
-// ClientConfig satisfies the client.ConfigProvider interface and is used to
-// configure the service client instances. Passing the Session to the service
-// client's constructor (New) will use this method to configure the client.
-func (s *Session) ClientConfig(serviceName string, cfgs ...*aws.Config) client.Config {
-	// Backwards compatibility, the error will be eaten if user calls ClientConfig
-	// directly. All SDK services will use ClientconfigWithError.
-	cfg, _ := s.clientConfigWithErr(serviceName, cfgs...)
-
-	return cfg
-}
-
-func (s *Session) clientConfigWithErr(serviceName string, cfgs ...*aws.Config) (client.Config, error) {
-	s = s.Copy(cfgs...)
-
-	var resolved endpoints.ResolvedEndpoint
-	var err error
-
-	region := aws.StringValue(s.Config.Region)
-
-	if endpoint := aws.StringValue(s.Config.Endpoint); len(endpoint) != 0 {
-		resolved.URL = endpoints.AddScheme(endpoint, aws.BoolValue(s.Config.DisableSSL))
-		resolved.SigningRegion = region
-	} else {
-		resolved, err = s.Config.EndpointResolver.EndpointFor(
-			serviceName, region,
-			func(opt *endpoints.Options) {
-				opt.DisableSSL = aws.BoolValue(s.Config.DisableSSL)
-				opt.UseDualStack = aws.BoolValue(s.Config.UseDualStack)
-
-				// Support the condition where the service is modeled but its
-				// endpoint metadata is not available.
-				opt.ResolveUnknownService = true
-			},
-		)
-	}
-
-	return client.Config{
-		Config:        s.Config,
-		Handlers:      s.Handlers,
-		Endpoint:      resolved.URL,
-		SigningRegion: resolved.SigningRegion,
-		SigningName:   resolved.SigningName,
-	}, err
-}
-
-// ClientConfigNoResolveEndpoint is the same as ClientConfig with the exception
-// that the EndpointResolver will not be used to resolve the endpoint. The only
-// endpoint set must come from the aws.Config.Endpoint field.
-func (s *Session) ClientConfigNoResolveEndpoint(cfgs ...*aws.Config) client.Config {
-	s = s.Copy(cfgs...)
-
-	var resolved endpoints.ResolvedEndpoint
-
-	region := aws.StringValue(s.Config.Region)
-
-	if ep := aws.StringValue(s.Config.Endpoint); len(ep) > 0 {
-		resolved.URL = endpoints.AddScheme(ep, aws.BoolValue(s.Config.DisableSSL))
-		resolved.SigningRegion = region
-	}
-
-	return client.Config{
-		Config:        s.Config,
-		Handlers:      s.Handlers,
-		Endpoint:      resolved.URL,
-		SigningRegion: resolved.SigningRegion,
-		SigningName:   resolved.SigningName,
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/session/shared_config.go b/vendor/github.com/aws/aws-sdk-go/aws/session/shared_config.go
deleted file mode 100644
index 09c8e5bc7a..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/session/shared_config.go
+++ /dev/null
@@ -1,295 +0,0 @@
-package session
-
-import (
-	"fmt"
-	"io/ioutil"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/go-ini/ini"
-)
-
-const (
-	// Static Credentials group
-	accessKeyIDKey  = `aws_access_key_id`     // group required
-	secretAccessKey = `aws_secret_access_key` // group required
-	sessionTokenKey = `aws_session_token`     // optional
-
-	// Assume Role Credentials group
-	roleArnKey         = `role_arn`          // group required
-	sourceProfileKey   = `source_profile`    // group required
-	externalIDKey      = `external_id`       // optional
-	mfaSerialKey       = `mfa_serial`        // optional
-	roleSessionNameKey = `role_session_name` // optional
-
-	// Additional Config fields
-	regionKey = `region`
-
-	// DefaultSharedConfigProfile is the default profile to be used when
-	// loading configuration from the config files if another profile name
-	// is not provided.
-	DefaultSharedConfigProfile = `default`
-)
-
-type assumeRoleConfig struct {
-	RoleARN         string
-	SourceProfile   string
-	ExternalID      string
-	MFASerial       string
-	RoleSessionName string
-}
-
-// sharedConfig represents the configuration fields of the SDK config files.
-type sharedConfig struct {
-	// Credentials values from the config file. Both aws_access_key_id
-	// and aws_secret_access_key must be provided together in the same file
-	// to be considered valid. The values will be ignored if not a complete group.
-	// aws_session_token is an optional field that can be provided if both of the
-	// other two fields are also provided.
-	//
-	//	aws_access_key_id
-	//	aws_secret_access_key
-	//	aws_session_token
-	Creds credentials.Value
-
-	AssumeRole       assumeRoleConfig
-	AssumeRoleSource *sharedConfig
-
-	// Region is the region the SDK should use for looking up AWS service endpoints
-	// and signing requests.
-	//
-	//	region
-	Region string
-}
-
-type sharedConfigFile struct {
-	Filename string
-	IniData  *ini.File
-}
-
-// loadSharedConfig retrieves the configuration from the list of files
-// using the profile provided. The order the files are listed will determine
-// precedence. Values in subsequent files will overwrite values defined in
-// earlier files.
-//
-// For example, given two files A and B. Both define credentials. If the order
-// of the files are A then B, B's credential values will be used instead of A's.
-//
-// See sharedConfig.setFromFile for information how the config files
-// will be loaded.
-func loadSharedConfig(profile string, filenames []string) (sharedConfig, error) {
-	if len(profile) == 0 {
-		profile = DefaultSharedConfigProfile
-	}
-
-	files, err := loadSharedConfigIniFiles(filenames)
-	if err != nil {
-		return sharedConfig{}, err
-	}
-
-	cfg := sharedConfig{}
-	if err = cfg.setFromIniFiles(profile, files); err != nil {
-		return sharedConfig{}, err
-	}
-
-	if len(cfg.AssumeRole.SourceProfile) > 0 {
-		if err := cfg.setAssumeRoleSource(profile, files); err != nil {
-			return sharedConfig{}, err
-		}
-	}
-
-	return cfg, nil
-}
-
-func loadSharedConfigIniFiles(filenames []string) ([]sharedConfigFile, error) {
-	files := make([]sharedConfigFile, 0, len(filenames))
-
-	for _, filename := range filenames {
-		b, err := ioutil.ReadFile(filename)
-		if err != nil {
-			// Skip files which can't be opened and read for whatever reason
-			continue
-		}
-
-		f, err := ini.Load(b)
-		if err != nil {
-			return nil, SharedConfigLoadError{Filename: filename, Err: err}
-		}
-
-		files = append(files, sharedConfigFile{
-			Filename: filename, IniData: f,
-		})
-	}
-
-	return files, nil
-}
-
-func (cfg *sharedConfig) setAssumeRoleSource(origProfile string, files []sharedConfigFile) error {
-	var assumeRoleSrc sharedConfig
-
-	// Multiple level assume role chains are not support
-	if cfg.AssumeRole.SourceProfile == origProfile {
-		assumeRoleSrc = *cfg
-		assumeRoleSrc.AssumeRole = assumeRoleConfig{}
-	} else {
-		err := assumeRoleSrc.setFromIniFiles(cfg.AssumeRole.SourceProfile, files)
-		if err != nil {
-			return err
-		}
-	}
-
-	if len(assumeRoleSrc.Creds.AccessKeyID) == 0 {
-		return SharedConfigAssumeRoleError{RoleARN: cfg.AssumeRole.RoleARN}
-	}
-
-	cfg.AssumeRoleSource = &assumeRoleSrc
-
-	return nil
-}
-
-func (cfg *sharedConfig) setFromIniFiles(profile string, files []sharedConfigFile) error {
-	// Trim files from the list that don't exist.
-	for _, f := range files {
-		if err := cfg.setFromIniFile(profile, f); err != nil {
-			if _, ok := err.(SharedConfigProfileNotExistsError); ok {
-				// Ignore proviles missings
-				continue
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// setFromFile loads the configuration from the file using
-// the profile provided. A sharedConfig pointer type value is used so that
-// multiple config file loadings can be chained.
-//
-// Only loads complete logically grouped values, and will not set fields in cfg
-// for incomplete grouped values in the config. Such as credentials. For example
-// if a config file only includes aws_access_key_id but no aws_secret_access_key
-// the aws_access_key_id will be ignored.
-func (cfg *sharedConfig) setFromIniFile(profile string, file sharedConfigFile) error {
-	section, err := file.IniData.GetSection(profile)
-	if err != nil {
-		// Fallback to to alternate profile name: profile <name>
-		section, err = file.IniData.GetSection(fmt.Sprintf("profile %s", profile))
-		if err != nil {
-			return SharedConfigProfileNotExistsError{Profile: profile, Err: err}
-		}
-	}
-
-	// Shared Credentials
-	akid := section.Key(accessKeyIDKey).String()
-	secret := section.Key(secretAccessKey).String()
-	if len(akid) > 0 && len(secret) > 0 {
-		cfg.Creds = credentials.Value{
-			AccessKeyID:     akid,
-			SecretAccessKey: secret,
-			SessionToken:    section.Key(sessionTokenKey).String(),
-			ProviderName:    fmt.Sprintf("SharedConfigCredentials: %s", file.Filename),
-		}
-	}
-
-	// Assume Role
-	roleArn := section.Key(roleArnKey).String()
-	srcProfile := section.Key(sourceProfileKey).String()
-	if len(roleArn) > 0 && len(srcProfile) > 0 {
-		cfg.AssumeRole = assumeRoleConfig{
-			RoleARN:         roleArn,
-			SourceProfile:   srcProfile,
-			ExternalID:      section.Key(externalIDKey).String(),
-			MFASerial:       section.Key(mfaSerialKey).String(),
-			RoleSessionName: section.Key(roleSessionNameKey).String(),
-		}
-	}
-
-	// Region
-	if v := section.Key(regionKey).String(); len(v) > 0 {
-		cfg.Region = v
-	}
-
-	return nil
-}
-
-// SharedConfigLoadError is an error for the shared config file failed to load.
-type SharedConfigLoadError struct {
-	Filename string
-	Err      error
-}
-
-// Code is the short id of the error.
-func (e SharedConfigLoadError) Code() string {
-	return "SharedConfigLoadError"
-}
-
-// Message is the description of the error
-func (e SharedConfigLoadError) Message() string {
-	return fmt.Sprintf("failed to load config file, %s", e.Filename)
-}
-
-// OrigErr is the underlying error that caused the failure.
-func (e SharedConfigLoadError) OrigErr() error {
-	return e.Err
-}
-
-// Error satisfies the error interface.
-func (e SharedConfigLoadError) Error() string {
-	return awserr.SprintError(e.Code(), e.Message(), "", e.Err)
-}
-
-// SharedConfigProfileNotExistsError is an error for the shared config when
-// the profile was not find in the config file.
-type SharedConfigProfileNotExistsError struct {
-	Profile string
-	Err     error
-}
-
-// Code is the short id of the error.
-func (e SharedConfigProfileNotExistsError) Code() string {
-	return "SharedConfigProfileNotExistsError"
-}
-
-// Message is the description of the error
-func (e SharedConfigProfileNotExistsError) Message() string {
-	return fmt.Sprintf("failed to get profile, %s", e.Profile)
-}
-
-// OrigErr is the underlying error that caused the failure.
-func (e SharedConfigProfileNotExistsError) OrigErr() error {
-	return e.Err
-}
-
-// Error satisfies the error interface.
-func (e SharedConfigProfileNotExistsError) Error() string {
-	return awserr.SprintError(e.Code(), e.Message(), "", e.Err)
-}
-
-// SharedConfigAssumeRoleError is an error for the shared config when the
-// profile contains assume role information, but that information is invalid
-// or not complete.
-type SharedConfigAssumeRoleError struct {
-	RoleARN string
-}
-
-// Code is the short id of the error.
-func (e SharedConfigAssumeRoleError) Code() string {
-	return "SharedConfigAssumeRoleError"
-}
-
-// Message is the description of the error
-func (e SharedConfigAssumeRoleError) Message() string {
-	return fmt.Sprintf("failed to load assume role for %s, source profile has no shared credentials",
-		e.RoleARN)
-}
-
-// OrigErr is the underlying error that caused the failure.
-func (e SharedConfigAssumeRoleError) OrigErr() error {
-	return nil
-}
-
-// Error satisfies the error interface.
-func (e SharedConfigAssumeRoleError) Error() string {
-	return awserr.SprintError(e.Code(), e.Message(), "", nil)
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/header_rules.go b/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/header_rules.go
deleted file mode 100644
index 244c86da05..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/header_rules.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package v4
-
-import (
-	"net/http"
-	"strings"
-)
-
-// validator houses a set of rule needed for validation of a
-// string value
-type rules []rule
-
-// rule interface allows for more flexible rules and just simply
-// checks whether or not a value adheres to that rule
-type rule interface {
-	IsValid(value string) bool
-}
-
-// IsValid will iterate through all rules and see if any rules
-// apply to the value and supports nested rules
-func (r rules) IsValid(value string) bool {
-	for _, rule := range r {
-		if rule.IsValid(value) {
-			return true
-		}
-	}
-	return false
-}
-
-// mapRule generic rule for maps
-type mapRule map[string]struct{}
-
-// IsValid for the map rule satisfies whether it exists in the map
-func (m mapRule) IsValid(value string) bool {
-	_, ok := m[value]
-	return ok
-}
-
-// whitelist is a generic rule for whitelisting
-type whitelist struct {
-	rule
-}
-
-// IsValid for whitelist checks if the value is within the whitelist
-func (w whitelist) IsValid(value string) bool {
-	return w.rule.IsValid(value)
-}
-
-// blacklist is a generic rule for blacklisting
-type blacklist struct {
-	rule
-}
-
-// IsValid for whitelist checks if the value is within the whitelist
-func (b blacklist) IsValid(value string) bool {
-	return !b.rule.IsValid(value)
-}
-
-type patterns []string
-
-// IsValid for patterns checks each pattern and returns if a match has
-// been found
-func (p patterns) IsValid(value string) bool {
-	for _, pattern := range p {
-		if strings.HasPrefix(http.CanonicalHeaderKey(value), pattern) {
-			return true
-		}
-	}
-	return false
-}
-
-// inclusiveRules rules allow for rules to depend on one another
-type inclusiveRules []rule
-
-// IsValid will return true if all rules are true
-func (r inclusiveRules) IsValid(value string) bool {
-	for _, rule := range r {
-		if !rule.IsValid(value) {
-			return false
-		}
-	}
-	return true
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/options.go b/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/options.go
deleted file mode 100644
index 6aa2ed241b..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/options.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package v4
-
-// WithUnsignedPayload will enable and set the UnsignedPayload field to
-// true of the signer.
-func WithUnsignedPayload(v4 *Signer) {
-	v4.UnsignedPayload = true
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/uri_path.go b/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/uri_path.go
deleted file mode 100644
index bd082e9d1f..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/uri_path.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// +build go1.5
-
-package v4
-
-import (
-	"net/url"
-	"strings"
-)
-
-func getURIPath(u *url.URL) string {
-	var uri string
-
-	if len(u.Opaque) > 0 {
-		uri = "/" + strings.Join(strings.Split(u.Opaque, "/")[3:], "/")
-	} else {
-		uri = u.EscapedPath()
-	}
-
-	if len(uri) == 0 {
-		uri = "/"
-	}
-
-	return uri
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go b/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go
deleted file mode 100644
index d68905acbb..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go
+++ /dev/null
@@ -1,761 +0,0 @@
-// Package v4 implements signing for AWS V4 signer
-//
-// Provides request signing for request that need to be signed with
-// AWS V4 Signatures.
-//
-// Standalone Signer
-//
-// Generally using the signer outside of the SDK should not require any additional
-// logic when using Go v1.5 or higher. The signer does this by taking advantage
-// of the URL.EscapedPath method. If your request URI requires additional escaping
-// you many need to use the URL.Opaque to define what the raw URI should be sent
-// to the service as.
-//
-// The signer will first check the URL.Opaque field, and use its value if set.
-// The signer does require the URL.Opaque field to be set in the form of:
-//
-//     "//<hostname>/<path>"
-//
-//     // e.g.
-//     "//example.com/some/path"
-//
-// The leading "//" and hostname are required or the URL.Opaque escaping will
-// not work correctly.
-//
-// If URL.Opaque is not set the signer will fallback to the URL.EscapedPath()
-// method and using the returned value. If you're using Go v1.4 you must set
-// URL.Opaque if the URI path needs escaping. If URL.Opaque is not set with
-// Go v1.5 the signer will fallback to URL.Path.
-//
-// AWS v4 signature validation requires that the canonical string's URI path
-// element must be the URI escaped form of the HTTP request's path.
-// http://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html
-//
-// The Go HTTP client will perform escaping automatically on the request. Some
-// of these escaping may cause signature validation errors because the HTTP
-// request differs from the URI path or query that the signature was generated.
-// https://golang.org/pkg/net/url/#URL.EscapedPath
-//
-// Because of this, it is recommended that when using the signer outside of the
-// SDK that explicitly escaping the request prior to being signed is preferable,
-// and will help prevent signature validation errors. This can be done by setting
-// the URL.Opaque or URL.RawPath. The SDK will use URL.Opaque first and then
-// call URL.EscapedPath() if Opaque is not set.
-//
-// If signing a request intended for HTTP2 server, and you're using Go 1.6.2
-// through 1.7.4 you should use the URL.RawPath as the pre-escaped form of the
-// request URL. https://github.com/golang/go/issues/16847 points to a bug in
-// Go pre 1.8 that fails to make HTTP2 requests using absolute URL in the HTTP
-// message. URL.Opaque generally will force Go to make requests with absolute URL.
-// URL.RawPath does not do this, but RawPath must be a valid escaping of Path
-// or url.EscapedPath will ignore the RawPath escaping.
-//
-// Test `TestStandaloneSign` provides a complete example of using the signer
-// outside of the SDK and pre-escaping the URI path.
-package v4
-
-import (
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/private/protocol/rest"
-)
-
-const (
-	authHeaderPrefix = "AWS4-HMAC-SHA256"
-	timeFormat       = "20060102T150405Z"
-	shortTimeFormat  = "20060102"
-
-	// emptyStringSHA256 is a SHA256 of an empty string
-	emptyStringSHA256 = `e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855`
-)
-
-var ignoredHeaders = rules{
-	blacklist{
-		mapRule{
-			"Authorization":   struct{}{},
-			"User-Agent":      struct{}{},
-			"X-Amzn-Trace-Id": struct{}{},
-		},
-	},
-}
-
-// requiredSignedHeaders is a whitelist for build canonical headers.
-var requiredSignedHeaders = rules{
-	whitelist{
-		mapRule{
-			"Cache-Control":                                               struct{}{},
-			"Content-Disposition":                                         struct{}{},
-			"Content-Encoding":                                            struct{}{},
-			"Content-Language":                                            struct{}{},
-			"Content-Md5":                                                 struct{}{},
-			"Content-Type":                                                struct{}{},
-			"Expires":                                                     struct{}{},
-			"If-Match":                                                    struct{}{},
-			"If-Modified-Since":                                           struct{}{},
-			"If-None-Match":                                               struct{}{},
-			"If-Unmodified-Since":                                         struct{}{},
-			"Range":                                                       struct{}{},
-			"X-Amz-Acl":                                                   struct{}{},
-			"X-Amz-Copy-Source":                                           struct{}{},
-			"X-Amz-Copy-Source-If-Match":                                  struct{}{},
-			"X-Amz-Copy-Source-If-Modified-Since":                         struct{}{},
-			"X-Amz-Copy-Source-If-None-Match":                             struct{}{},
-			"X-Amz-Copy-Source-If-Unmodified-Since":                       struct{}{},
-			"X-Amz-Copy-Source-Range":                                     struct{}{},
-			"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Algorithm": struct{}{},
-			"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key":       struct{}{},
-			"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key-Md5":   struct{}{},
-			"X-Amz-Grant-Full-control":                                    struct{}{},
-			"X-Amz-Grant-Read":                                            struct{}{},
-			"X-Amz-Grant-Read-Acp":                                        struct{}{},
-			"X-Amz-Grant-Write":                                           struct{}{},
-			"X-Amz-Grant-Write-Acp":                                       struct{}{},
-			"X-Amz-Metadata-Directive":                                    struct{}{},
-			"X-Amz-Mfa":                                                   struct{}{},
-			"X-Amz-Request-Payer":                                         struct{}{},
-			"X-Amz-Server-Side-Encryption":                                struct{}{},
-			"X-Amz-Server-Side-Encryption-Aws-Kms-Key-Id":                 struct{}{},
-			"X-Amz-Server-Side-Encryption-Customer-Algorithm":             struct{}{},
-			"X-Amz-Server-Side-Encryption-Customer-Key":                   struct{}{},
-			"X-Amz-Server-Side-Encryption-Customer-Key-Md5":               struct{}{},
-			"X-Amz-Storage-Class":                                         struct{}{},
-			"X-Amz-Website-Redirect-Location":                             struct{}{},
-		},
-	},
-	patterns{"X-Amz-Meta-"},
-}
-
-// allowedHoisting is a whitelist for build query headers. The boolean value
-// represents whether or not it is a pattern.
-var allowedQueryHoisting = inclusiveRules{
-	blacklist{requiredSignedHeaders},
-	patterns{"X-Amz-"},
-}
-
-// Signer applies AWS v4 signing to given request. Use this to sign requests
-// that need to be signed with AWS V4 Signatures.
-type Signer struct {
-	// The authentication credentials the request will be signed against.
-	// This value must be set to sign requests.
-	Credentials *credentials.Credentials
-
-	// Sets the log level the signer should use when reporting information to
-	// the logger. If the logger is nil nothing will be logged. See
-	// aws.LogLevelType for more information on available logging levels
-	//
-	// By default nothing will be logged.
-	Debug aws.LogLevelType
-
-	// The logger loging information will be written to. If there the logger
-	// is nil, nothing will be logged.
-	Logger aws.Logger
-
-	// Disables the Signer's moving HTTP header key/value pairs from the HTTP
-	// request header to the request's query string. This is most commonly used
-	// with pre-signed requests preventing headers from being added to the
-	// request's query string.
-	DisableHeaderHoisting bool
-
-	// Disables the automatic escaping of the URI path of the request for the
-	// siganture's canonical string's path. For services that do not need additional
-	// escaping then use this to disable the signer escaping the path.
-	//
-	// S3 is an example of a service that does not need additional escaping.
-	//
-	// http://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html
-	DisableURIPathEscaping bool
-
-	// Disales the automatical setting of the HTTP request's Body field with the
-	// io.ReadSeeker passed in to the signer. This is useful if you're using a
-	// custom wrapper around the body for the io.ReadSeeker and want to preserve
-	// the Body value on the Request.Body.
-	//
-	// This does run the risk of signing a request with a body that will not be
-	// sent in the request. Need to ensure that the underlying data of the Body
-	// values are the same.
-	DisableRequestBodyOverwrite bool
-
-	// currentTimeFn returns the time value which represents the current time.
-	// This value should only be used for testing. If it is nil the default
-	// time.Now will be used.
-	currentTimeFn func() time.Time
-
-	// UnsignedPayload will prevent signing of the payload. This will only
-	// work for services that have support for this.
-	UnsignedPayload bool
-}
-
-// NewSigner returns a Signer pointer configured with the credentials and optional
-// option values provided. If not options are provided the Signer will use its
-// default configuration.
-func NewSigner(credentials *credentials.Credentials, options ...func(*Signer)) *Signer {
-	v4 := &Signer{
-		Credentials: credentials,
-	}
-
-	for _, option := range options {
-		option(v4)
-	}
-
-	return v4
-}
-
-type signingCtx struct {
-	ServiceName      string
-	Region           string
-	Request          *http.Request
-	Body             io.ReadSeeker
-	Query            url.Values
-	Time             time.Time
-	ExpireTime       time.Duration
-	SignedHeaderVals http.Header
-
-	DisableURIPathEscaping bool
-
-	credValues         credentials.Value
-	isPresign          bool
-	formattedTime      string
-	formattedShortTime string
-	unsignedPayload    bool
-
-	bodyDigest       string
-	signedHeaders    string
-	canonicalHeaders string
-	canonicalString  string
-	credentialString string
-	stringToSign     string
-	signature        string
-	authorization    string
-}
-
-// Sign signs AWS v4 requests with the provided body, service name, region the
-// request is made to, and time the request is signed at. The signTime allows
-// you to specify that a request is signed for the future, and cannot be
-// used until then.
-//
-// Returns a list of HTTP headers that were included in the signature or an
-// error if signing the request failed. Generally for signed requests this value
-// is not needed as the full request context will be captured by the http.Request
-// value. It is included for reference though.
-//
-// Sign will set the request's Body to be the `body` parameter passed in. If
-// the body is not already an io.ReadCloser, it will be wrapped within one. If
-// a `nil` body parameter passed to Sign, the request's Body field will be
-// also set to nil. Its important to note that this functionality will not
-// change the request's ContentLength of the request.
-//
-// Sign differs from Presign in that it will sign the request using HTTP
-// header values. This type of signing is intended for http.Request values that
-// will not be shared, or are shared in a way the header values on the request
-// will not be lost.
-//
-// The requests body is an io.ReadSeeker so the SHA256 of the body can be
-// generated. To bypass the signer computing the hash you can set the
-// "X-Amz-Content-Sha256" header with a precomputed value. The signer will
-// only compute the hash if the request header value is empty.
-func (v4 Signer) Sign(r *http.Request, body io.ReadSeeker, service, region string, signTime time.Time) (http.Header, error) {
-	return v4.signWithBody(r, body, service, region, 0, signTime)
-}
-
-// Presign signs AWS v4 requests with the provided body, service name, region
-// the request is made to, and time the request is signed at. The signTime
-// allows you to specify that a request is signed for the future, and cannot
-// be used until then.
-//
-// Returns a list of HTTP headers that were included in the signature or an
-// error if signing the request failed. For presigned requests these headers
-// and their values must be included on the HTTP request when it is made. This
-// is helpful to know what header values need to be shared with the party the
-// presigned request will be distributed to.
-//
-// Presign differs from Sign in that it will sign the request using query string
-// instead of header values. This allows you to share the Presigned Request's
-// URL with third parties, or distribute it throughout your system with minimal
-// dependencies.
-//
-// Presign also takes an exp value which is the duration the
-// signed request will be valid after the signing time. This is allows you to
-// set when the request will expire.
-//
-// The requests body is an io.ReadSeeker so the SHA256 of the body can be
-// generated. To bypass the signer computing the hash you can set the
-// "X-Amz-Content-Sha256" header with a precomputed value. The signer will
-// only compute the hash if the request header value is empty.
-//
-// Presigning a S3 request will not compute the body's SHA256 hash by default.
-// This is done due to the general use case for S3 presigned URLs is to share
-// PUT/GET capabilities. If you would like to include the body's SHA256 in the
-// presigned request's signature you can set the "X-Amz-Content-Sha256"
-// HTTP header and that will be included in the request's signature.
-func (v4 Signer) Presign(r *http.Request, body io.ReadSeeker, service, region string, exp time.Duration, signTime time.Time) (http.Header, error) {
-	return v4.signWithBody(r, body, service, region, exp, signTime)
-}
-
-func (v4 Signer) signWithBody(r *http.Request, body io.ReadSeeker, service, region string, exp time.Duration, signTime time.Time) (http.Header, error) {
-	currentTimeFn := v4.currentTimeFn
-	if currentTimeFn == nil {
-		currentTimeFn = time.Now
-	}
-
-	ctx := &signingCtx{
-		Request:                r,
-		Body:                   body,
-		Query:                  r.URL.Query(),
-		Time:                   signTime,
-		ExpireTime:             exp,
-		isPresign:              exp != 0,
-		ServiceName:            service,
-		Region:                 region,
-		DisableURIPathEscaping: v4.DisableURIPathEscaping,
-		unsignedPayload:        v4.UnsignedPayload,
-	}
-
-	for key := range ctx.Query {
-		sort.Strings(ctx.Query[key])
-	}
-
-	if ctx.isRequestSigned() {
-		ctx.Time = currentTimeFn()
-		ctx.handlePresignRemoval()
-	}
-
-	var err error
-	ctx.credValues, err = v4.Credentials.Get()
-	if err != nil {
-		return http.Header{}, err
-	}
-
-	ctx.assignAmzQueryValues()
-	ctx.build(v4.DisableHeaderHoisting)
-
-	// If the request is not presigned the body should be attached to it. This
-	// prevents the confusion of wanting to send a signed request without
-	// the body the request was signed for attached.
-	if !(v4.DisableRequestBodyOverwrite || ctx.isPresign) {
-		var reader io.ReadCloser
-		if body != nil {
-			var ok bool
-			if reader, ok = body.(io.ReadCloser); !ok {
-				reader = ioutil.NopCloser(body)
-			}
-		}
-		r.Body = reader
-	}
-
-	if v4.Debug.Matches(aws.LogDebugWithSigning) {
-		v4.logSigningInfo(ctx)
-	}
-
-	return ctx.SignedHeaderVals, nil
-}
-
-func (ctx *signingCtx) handlePresignRemoval() {
-	if !ctx.isPresign {
-		return
-	}
-
-	// The credentials have expired for this request. The current signing
-	// is invalid, and needs to be request because the request will fail.
-	ctx.removePresign()
-
-	// Update the request's query string to ensure the values stays in
-	// sync in the case retrieving the new credentials fails.
-	ctx.Request.URL.RawQuery = ctx.Query.Encode()
-}
-
-func (ctx *signingCtx) assignAmzQueryValues() {
-	if ctx.isPresign {
-		ctx.Query.Set("X-Amz-Algorithm", authHeaderPrefix)
-		if ctx.credValues.SessionToken != "" {
-			ctx.Query.Set("X-Amz-Security-Token", ctx.credValues.SessionToken)
-		} else {
-			ctx.Query.Del("X-Amz-Security-Token")
-		}
-
-		return
-	}
-
-	if ctx.credValues.SessionToken != "" {
-		ctx.Request.Header.Set("X-Amz-Security-Token", ctx.credValues.SessionToken)
-	}
-}
-
-// SignRequestHandler is a named request handler the SDK will use to sign
-// service client request with using the V4 signature.
-var SignRequestHandler = request.NamedHandler{
-	Name: "v4.SignRequestHandler", Fn: SignSDKRequest,
-}
-
-// SignSDKRequest signs an AWS request with the V4 signature. This
-// request handler should only be used with the SDK's built in service client's
-// API operation requests.
-//
-// This function should not be used on its on its own, but in conjunction with
-// an AWS service client's API operation call. To sign a standalone request
-// not created by a service client's API operation method use the "Sign" or
-// "Presign" functions of the "Signer" type.
-//
-// If the credentials of the request's config are set to
-// credentials.AnonymousCredentials the request will not be signed.
-func SignSDKRequest(req *request.Request) {
-	signSDKRequestWithCurrTime(req, time.Now)
-}
-
-// BuildNamedHandler will build a generic handler for signing.
-func BuildNamedHandler(name string, opts ...func(*Signer)) request.NamedHandler {
-	return request.NamedHandler{
-		Name: name,
-		Fn: func(req *request.Request) {
-			signSDKRequestWithCurrTime(req, time.Now, opts...)
-		},
-	}
-}
-
-func signSDKRequestWithCurrTime(req *request.Request, curTimeFn func() time.Time, opts ...func(*Signer)) {
-	// If the request does not need to be signed ignore the signing of the
-	// request if the AnonymousCredentials object is used.
-	if req.Config.Credentials == credentials.AnonymousCredentials {
-		return
-	}
-
-	region := req.ClientInfo.SigningRegion
-	if region == "" {
-		region = aws.StringValue(req.Config.Region)
-	}
-
-	name := req.ClientInfo.SigningName
-	if name == "" {
-		name = req.ClientInfo.ServiceName
-	}
-
-	v4 := NewSigner(req.Config.Credentials, func(v4 *Signer) {
-		v4.Debug = req.Config.LogLevel.Value()
-		v4.Logger = req.Config.Logger
-		v4.DisableHeaderHoisting = req.NotHoist
-		v4.currentTimeFn = curTimeFn
-		if name == "s3" {
-			// S3 service should not have any escaping applied
-			v4.DisableURIPathEscaping = true
-		}
-		// Prevents setting the HTTPRequest's Body. Since the Body could be
-		// wrapped in a custom io.Closer that we do not want to be stompped
-		// on top of by the signer.
-		v4.DisableRequestBodyOverwrite = true
-	})
-
-	for _, opt := range opts {
-		opt(v4)
-	}
-
-	signingTime := req.Time
-	if !req.LastSignedAt.IsZero() {
-		signingTime = req.LastSignedAt
-	}
-
-	signedHeaders, err := v4.signWithBody(req.HTTPRequest, req.GetBody(),
-		name, region, req.ExpireTime, signingTime,
-	)
-	if err != nil {
-		req.Error = err
-		req.SignedHeaderVals = nil
-		return
-	}
-
-	req.SignedHeaderVals = signedHeaders
-	req.LastSignedAt = curTimeFn()
-}
-
-const logSignInfoMsg = `DEBUG: Request Signature:
----[ CANONICAL STRING  ]-----------------------------
-%s
----[ STRING TO SIGN ]--------------------------------
-%s%s
------------------------------------------------------`
-const logSignedURLMsg = `
----[ SIGNED URL ]------------------------------------
-%s`
-
-func (v4 *Signer) logSigningInfo(ctx *signingCtx) {
-	signedURLMsg := ""
-	if ctx.isPresign {
-		signedURLMsg = fmt.Sprintf(logSignedURLMsg, ctx.Request.URL.String())
-	}
-	msg := fmt.Sprintf(logSignInfoMsg, ctx.canonicalString, ctx.stringToSign, signedURLMsg)
-	v4.Logger.Log(msg)
-}
-
-func (ctx *signingCtx) build(disableHeaderHoisting bool) {
-	ctx.buildTime()             // no depends
-	ctx.buildCredentialString() // no depends
-
-	unsignedHeaders := ctx.Request.Header
-	if ctx.isPresign {
-		if !disableHeaderHoisting {
-			urlValues := url.Values{}
-			urlValues, unsignedHeaders = buildQuery(allowedQueryHoisting, unsignedHeaders) // no depends
-			for k := range urlValues {
-				ctx.Query[k] = urlValues[k]
-			}
-		}
-	}
-
-	ctx.buildBodyDigest()
-	ctx.buildCanonicalHeaders(ignoredHeaders, unsignedHeaders)
-	ctx.buildCanonicalString() // depends on canon headers / signed headers
-	ctx.buildStringToSign()    // depends on canon string
-	ctx.buildSignature()       // depends on string to sign
-
-	if ctx.isPresign {
-		ctx.Request.URL.RawQuery += "&X-Amz-Signature=" + ctx.signature
-	} else {
-		parts := []string{
-			authHeaderPrefix + " Credential=" + ctx.credValues.AccessKeyID + "/" + ctx.credentialString,
-			"SignedHeaders=" + ctx.signedHeaders,
-			"Signature=" + ctx.signature,
-		}
-		ctx.Request.Header.Set("Authorization", strings.Join(parts, ", "))
-	}
-}
-
-func (ctx *signingCtx) buildTime() {
-	ctx.formattedTime = ctx.Time.UTC().Format(timeFormat)
-	ctx.formattedShortTime = ctx.Time.UTC().Format(shortTimeFormat)
-
-	if ctx.isPresign {
-		duration := int64(ctx.ExpireTime / time.Second)
-		ctx.Query.Set("X-Amz-Date", ctx.formattedTime)
-		ctx.Query.Set("X-Amz-Expires", strconv.FormatInt(duration, 10))
-	} else {
-		ctx.Request.Header.Set("X-Amz-Date", ctx.formattedTime)
-	}
-}
-
-func (ctx *signingCtx) buildCredentialString() {
-	ctx.credentialString = strings.Join([]string{
-		ctx.formattedShortTime,
-		ctx.Region,
-		ctx.ServiceName,
-		"aws4_request",
-	}, "/")
-
-	if ctx.isPresign {
-		ctx.Query.Set("X-Amz-Credential", ctx.credValues.AccessKeyID+"/"+ctx.credentialString)
-	}
-}
-
-func buildQuery(r rule, header http.Header) (url.Values, http.Header) {
-	query := url.Values{}
-	unsignedHeaders := http.Header{}
-	for k, h := range header {
-		if r.IsValid(k) {
-			query[k] = h
-		} else {
-			unsignedHeaders[k] = h
-		}
-	}
-
-	return query, unsignedHeaders
-}
-func (ctx *signingCtx) buildCanonicalHeaders(r rule, header http.Header) {
-	var headers []string
-	headers = append(headers, "host")
-	for k, v := range header {
-		canonicalKey := http.CanonicalHeaderKey(k)
-		if !r.IsValid(canonicalKey) {
-			continue // ignored header
-		}
-		if ctx.SignedHeaderVals == nil {
-			ctx.SignedHeaderVals = make(http.Header)
-		}
-
-		lowerCaseKey := strings.ToLower(k)
-		if _, ok := ctx.SignedHeaderVals[lowerCaseKey]; ok {
-			// include additional values
-			ctx.SignedHeaderVals[lowerCaseKey] = append(ctx.SignedHeaderVals[lowerCaseKey], v...)
-			continue
-		}
-
-		headers = append(headers, lowerCaseKey)
-		ctx.SignedHeaderVals[lowerCaseKey] = v
-	}
-	sort.Strings(headers)
-
-	ctx.signedHeaders = strings.Join(headers, ";")
-
-	if ctx.isPresign {
-		ctx.Query.Set("X-Amz-SignedHeaders", ctx.signedHeaders)
-	}
-
-	headerValues := make([]string, len(headers))
-	for i, k := range headers {
-		if k == "host" {
-			if ctx.Request.Host != "" {
-				headerValues[i] = "host:" + ctx.Request.Host
-			} else {
-				headerValues[i] = "host:" + ctx.Request.URL.Host
-			}
-		} else {
-			headerValues[i] = k + ":" +
-				strings.Join(ctx.SignedHeaderVals[k], ",")
-		}
-	}
-	stripExcessSpaces(headerValues)
-	ctx.canonicalHeaders = strings.Join(headerValues, "\n")
-}
-
-func (ctx *signingCtx) buildCanonicalString() {
-	ctx.Request.URL.RawQuery = strings.Replace(ctx.Query.Encode(), "+", "%20", -1)
-
-	uri := getURIPath(ctx.Request.URL)
-
-	if !ctx.DisableURIPathEscaping {
-		uri = rest.EscapePath(uri, false)
-	}
-
-	ctx.canonicalString = strings.Join([]string{
-		ctx.Request.Method,
-		uri,
-		ctx.Request.URL.RawQuery,
-		ctx.canonicalHeaders + "\n",
-		ctx.signedHeaders,
-		ctx.bodyDigest,
-	}, "\n")
-}
-
-func (ctx *signingCtx) buildStringToSign() {
-	ctx.stringToSign = strings.Join([]string{
-		authHeaderPrefix,
-		ctx.formattedTime,
-		ctx.credentialString,
-		hex.EncodeToString(makeSha256([]byte(ctx.canonicalString))),
-	}, "\n")
-}
-
-func (ctx *signingCtx) buildSignature() {
-	secret := ctx.credValues.SecretAccessKey
-	date := makeHmac([]byte("AWS4"+secret), []byte(ctx.formattedShortTime))
-	region := makeHmac(date, []byte(ctx.Region))
-	service := makeHmac(region, []byte(ctx.ServiceName))
-	credentials := makeHmac(service, []byte("aws4_request"))
-	signature := makeHmac(credentials, []byte(ctx.stringToSign))
-	ctx.signature = hex.EncodeToString(signature)
-}
-
-func (ctx *signingCtx) buildBodyDigest() {
-	hash := ctx.Request.Header.Get("X-Amz-Content-Sha256")
-	if hash == "" {
-		if ctx.unsignedPayload || (ctx.isPresign && ctx.ServiceName == "s3") {
-			hash = "UNSIGNED-PAYLOAD"
-		} else if ctx.Body == nil {
-			hash = emptyStringSHA256
-		} else {
-			hash = hex.EncodeToString(makeSha256Reader(ctx.Body))
-		}
-		if ctx.unsignedPayload || ctx.ServiceName == "s3" || ctx.ServiceName == "glacier" {
-			ctx.Request.Header.Set("X-Amz-Content-Sha256", hash)
-		}
-	}
-	ctx.bodyDigest = hash
-}
-
-// isRequestSigned returns if the request is currently signed or presigned
-func (ctx *signingCtx) isRequestSigned() bool {
-	if ctx.isPresign && ctx.Query.Get("X-Amz-Signature") != "" {
-		return true
-	}
-	if ctx.Request.Header.Get("Authorization") != "" {
-		return true
-	}
-
-	return false
-}
-
-// unsign removes signing flags for both signed and presigned requests.
-func (ctx *signingCtx) removePresign() {
-	ctx.Query.Del("X-Amz-Algorithm")
-	ctx.Query.Del("X-Amz-Signature")
-	ctx.Query.Del("X-Amz-Security-Token")
-	ctx.Query.Del("X-Amz-Date")
-	ctx.Query.Del("X-Amz-Expires")
-	ctx.Query.Del("X-Amz-Credential")
-	ctx.Query.Del("X-Amz-SignedHeaders")
-}
-
-func makeHmac(key []byte, data []byte) []byte {
-	hash := hmac.New(sha256.New, key)
-	hash.Write(data)
-	return hash.Sum(nil)
-}
-
-func makeSha256(data []byte) []byte {
-	hash := sha256.New()
-	hash.Write(data)
-	return hash.Sum(nil)
-}
-
-func makeSha256Reader(reader io.ReadSeeker) []byte {
-	hash := sha256.New()
-	start, _ := reader.Seek(0, 1)
-	defer reader.Seek(start, 0)
-
-	io.Copy(hash, reader)
-	return hash.Sum(nil)
-}
-
-const doubleSpace = "  "
-
-// stripExcessSpaces will rewrite the passed in slice's string values to not
-// contain muliple side-by-side spaces.
-func stripExcessSpaces(vals []string) {
-	var j, k, l, m, spaces int
-	for i, str := range vals {
-		// Trim trailing spaces
-		for j = len(str) - 1; j >= 0 && str[j] == ' '; j-- {
-		}
-
-		// Trim leading spaces
-		for k = 0; k < j && str[k] == ' '; k++ {
-		}
-		str = str[k : j+1]
-
-		// Strip multiple spaces.
-		j = strings.Index(str, doubleSpace)
-		if j < 0 {
-			vals[i] = str
-			continue
-		}
-
-		buf := []byte(str)
-		for k, m, l = j, j, len(buf); k < l; k++ {
-			if buf[k] == ' ' {
-				if spaces == 0 {
-					// First space.
-					buf[m] = buf[k]
-					m++
-				}
-				spaces++
-			} else {
-				// End of multiple spaces.
-				spaces = 0
-				buf[m] = buf[k]
-				m++
-			}
-		}
-
-		vals[i] = string(buf[:m])
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/types.go b/vendor/github.com/aws/aws-sdk-go/aws/types.go
deleted file mode 100644
index 0e2d864e10..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/types.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package aws
-
-import (
-	"io"
-	"sync"
-)
-
-// ReadSeekCloser wraps a io.Reader returning a ReaderSeekerCloser. Should
-// only be used with an io.Reader that is also an io.Seeker. Doing so may
-// cause request signature errors, or request body's not sent for GET, HEAD
-// and DELETE HTTP methods.
-//
-// Deprecated: Should only be used with io.ReadSeeker. If using for
-// S3 PutObject to stream content use s3manager.Uploader instead.
-func ReadSeekCloser(r io.Reader) ReaderSeekerCloser {
-	return ReaderSeekerCloser{r}
-}
-
-// ReaderSeekerCloser represents a reader that can also delegate io.Seeker and
-// io.Closer interfaces to the underlying object if they are available.
-type ReaderSeekerCloser struct {
-	r io.Reader
-}
-
-// Read reads from the reader up to size of p. The number of bytes read, and
-// error if it occurred will be returned.
-//
-// If the reader is not an io.Reader zero bytes read, and nil error will be returned.
-//
-// Performs the same functionality as io.Reader Read
-func (r ReaderSeekerCloser) Read(p []byte) (int, error) {
-	switch t := r.r.(type) {
-	case io.Reader:
-		return t.Read(p)
-	}
-	return 0, nil
-}
-
-// Seek sets the offset for the next Read to offset, interpreted according to
-// whence: 0 means relative to the origin of the file, 1 means relative to the
-// current offset, and 2 means relative to the end. Seek returns the new offset
-// and an error, if any.
-//
-// If the ReaderSeekerCloser is not an io.Seeker nothing will be done.
-func (r ReaderSeekerCloser) Seek(offset int64, whence int) (int64, error) {
-	switch t := r.r.(type) {
-	case io.Seeker:
-		return t.Seek(offset, whence)
-	}
-	return int64(0), nil
-}
-
-// IsSeeker returns if the underlying reader is also a seeker.
-func (r ReaderSeekerCloser) IsSeeker() bool {
-	_, ok := r.r.(io.Seeker)
-	return ok
-}
-
-// Close closes the ReaderSeekerCloser.
-//
-// If the ReaderSeekerCloser is not an io.Closer nothing will be done.
-func (r ReaderSeekerCloser) Close() error {
-	switch t := r.r.(type) {
-	case io.Closer:
-		return t.Close()
-	}
-	return nil
-}
-
-// A WriteAtBuffer provides a in memory buffer supporting the io.WriterAt interface
-// Can be used with the s3manager.Downloader to download content to a buffer
-// in memory. Safe to use concurrently.
-type WriteAtBuffer struct {
-	buf []byte
-	m   sync.Mutex
-
-	// GrowthCoeff defines the growth rate of the internal buffer. By
-	// default, the growth rate is 1, where expanding the internal
-	// buffer will allocate only enough capacity to fit the new expected
-	// length.
-	GrowthCoeff float64
-}
-
-// NewWriteAtBuffer creates a WriteAtBuffer with an internal buffer
-// provided by buf.
-func NewWriteAtBuffer(buf []byte) *WriteAtBuffer {
-	return &WriteAtBuffer{buf: buf}
-}
-
-// WriteAt writes a slice of bytes to a buffer starting at the position provided
-// The number of bytes written will be returned, or error. Can overwrite previous
-// written slices if the write ats overlap.
-func (b *WriteAtBuffer) WriteAt(p []byte, pos int64) (n int, err error) {
-	pLen := len(p)
-	expLen := pos + int64(pLen)
-	b.m.Lock()
-	defer b.m.Unlock()
-	if int64(len(b.buf)) < expLen {
-		if int64(cap(b.buf)) < expLen {
-			if b.GrowthCoeff < 1 {
-				b.GrowthCoeff = 1
-			}
-			newBuf := make([]byte, expLen, int64(b.GrowthCoeff*float64(expLen)))
-			copy(newBuf, b.buf)
-			b.buf = newBuf
-		}
-		b.buf = b.buf[:expLen]
-	}
-	copy(b.buf[pos:], p)
-	return pLen, nil
-}
-
-// Bytes returns a slice of bytes written to the buffer.
-func (b *WriteAtBuffer) Bytes() []byte {
-	b.m.Lock()
-	defer b.m.Unlock()
-	return b.buf
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/url.go b/vendor/github.com/aws/aws-sdk-go/aws/url.go
deleted file mode 100644
index 6192b2455b..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/url.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build go1.8
-
-package aws
-
-import "net/url"
-
-// URLHostname will extract the Hostname without port from the URL value.
-//
-// Wrapper of net/url#URL.Hostname for backwards Go version compatibility.
-func URLHostname(url *url.URL) string {
-	return url.Hostname()
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/url_1_7.go b/vendor/github.com/aws/aws-sdk-go/aws/url_1_7.go
deleted file mode 100644
index 0210d2720e..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/url_1_7.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// +build !go1.8
-
-package aws
-
-import (
-	"net/url"
-	"strings"
-)
-
-// URLHostname will extract the Hostname without port from the URL value.
-//
-// Copy of Go 1.8's net/url#URL.Hostname functionality.
-func URLHostname(url *url.URL) string {
-	return stripPort(url.Host)
-
-}
-
-// stripPort is copy of Go 1.8 url#URL.Hostname functionality.
-// https://golang.org/src/net/url/url.go
-func stripPort(hostport string) string {
-	colon := strings.IndexByte(hostport, ':')
-	if colon == -1 {
-		return hostport
-	}
-	if i := strings.IndexByte(hostport, ']'); i != -1 {
-		return strings.TrimPrefix(hostport[:i], "[")
-	}
-	return hostport[:colon]
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go
deleted file mode 100644
index 971b08bcd0..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/version.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Package aws provides core functionality for making requests to AWS services.
-package aws
-
-// SDKName is the name of this AWS SDK
-const SDKName = "aws-sdk-go"
-
-// SDKVersion is the version of this SDK
-const SDKVersion = "1.10.18"
diff --git a/vendor/github.com/aws/aws-sdk-go/doc.go b/vendor/github.com/aws/aws-sdk-go/doc.go
deleted file mode 100644
index 3e077e51da..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/doc.go
+++ /dev/null
@@ -1,405 +0,0 @@
-// Package sdk is the official AWS SDK for the Go programming language.
-//
-// The AWS SDK for Go provides APIs and utilities that developers can use to
-// build Go applications that use AWS services, such as Amazon Elastic Compute
-// Cloud (Amazon EC2) and Amazon Simple Storage Service (Amazon S3).
-//
-// The SDK removes the complexity of coding directly against a web service
-// interface. It hides a lot of the lower-level plumbing, such as authentication,
-// request retries, and error handling.
-//
-// The SDK also includes helpful utilities on top of the AWS APIs that add additional
-// capabilities and functionality. For example, the Amazon S3 Download and Upload
-// Manager will automatically split up large objects into multiple parts and
-// transfer them concurrently.
-//
-// See the s3manager package documentation for more information.
-// https://docs.aws.amazon.com/sdk-for-go/api/service/s3/s3manager/
-//
-// Getting More Information
-//
-// Checkout the Getting Started Guide and API Reference Docs detailed the SDK's
-// components and details on each AWS client the SDK supports.
-//
-// The Getting Started Guide provides examples and detailed description of how
-// to get setup with the SDK.
-// https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/welcome.html
-//
-// The API Reference Docs include a detailed breakdown of the SDK's components
-// such as utilities and AWS clients. Use this as a reference of the Go types
-// included with the SDK, such as AWS clients, API operations, and API parameters.
-// https://docs.aws.amazon.com/sdk-for-go/api/
-//
-// Overview of SDK's Packages
-//
-// The SDK is composed of two main components, SDK core, and service clients.
-// The SDK core packages are all available under the aws package at the root of
-// the SDK. Each client for a supported AWS service is available within its own
-// package under the service folder at the root of the SDK.
-//
-//   * aws - SDK core, provides common shared types such as Config, Logger,
-//     and utilities to make working with API parameters easier.
-//
-//       * awserr - Provides the error interface that the SDK will use for all
-//         errors that occur in the SDK's processing. This includes service API
-//         response errors as well. The Error type is made up of a code and message.
-//         Cast the SDK's returned error type to awserr.Error and call the Code
-//         method to compare returned error to specific error codes. See the package's
-//         documentation for additional values that can be extracted such as RequestId.
-//
-//       * credentials - Provides the types and built in credentials providers
-//         the SDK will use to retrieve AWS credentials to make API requests with.
-//         Nested under this folder are also additional credentials providers such as
-//         stscreds for assuming IAM roles, and ec2rolecreds for EC2 Instance roles.
-//
-//       * endpoints - Provides the AWS Regions and Endpoints metadata for the SDK.
-//         Use this to lookup AWS service endpoint information such as which services
-//         are in a region, and what regions a service is in. Constants are also provided
-//         for all region identifiers, e.g UsWest2RegionID for "us-west-2".
-//
-//       * session - Provides initial default configuration, and load
-//         configuration from external sources such as environment and shared
-//         credentials file.
-//
-//       * request - Provides the API request sending, and retry logic for the SDK.
-//         This package also includes utilities for defining your own request
-//         retryer, and configuring how the SDK processes the request.
-//
-//   * service - Clients for AWS services. All services supported by the SDK are
-//     available under this folder.
-//
-// How to Use the SDK's AWS Service Clients
-//
-// The SDK includes the Go types and utilities you can use to make requests to
-// AWS service APIs. Within the service folder at the root of the SDK you'll find
-// a package for each AWS service the SDK supports. All service clients follows
-// a common pattern of creation and usage.
-//
-// When creating a client for an AWS service you'll first need to have a Session
-// value constructed. The Session provides shared configuration that can be shared
-// between your service clients. When service clients are created you can pass
-// in additional configuration via the aws.Config type to override configuration
-// provided by in the Session to create service client instances with custom
-// configuration.
-//
-// Once the service's client is created you can use it to make API requests the
-// AWS service. These clients are safe to use concurrently.
-//
-// Configuring the SDK
-//
-// In the AWS SDK for Go, you can configure settings for service clients, such
-// as the log level and maximum number of retries. Most settings are optional;
-// however, for each service client, you must specify a region and your credentials.
-// The SDK uses these values to send requests to the correct AWS region and sign
-// requests with the correct credentials. You can specify these values as part
-// of a session or as environment variables.
-//
-// See the SDK's configuration guide for more information.
-// https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html
-//
-// See the session package documentation for more information on how to use Session
-// with the SDK.
-// https://docs.aws.amazon.com/sdk-for-go/api/aws/session/
-//
-// See the Config type in the aws package for more information on configuration
-// options.
-// https://docs.aws.amazon.com/sdk-for-go/api/aws/#Config
-//
-// Configuring Credentials
-//
-// When using the SDK you'll generally need your AWS credentials to authenticate
-// with AWS services. The SDK supports multiple methods of supporting these
-// credentials. By default the SDK will source credentials automatically from
-// its default credential chain. See the session package for more information
-// on this chain, and how to configure it. The common items in the credential
-// chain are the following:
-//
-//   * Environment Credentials - Set of environment variables that are useful
-//     when sub processes are created for specific roles.
-//
-//   * Shared Credentials file (~/.aws/credentials) - This file stores your
-//     credentials based on a profile name and is useful for local development.
-//
-//   * EC2 Instance Role Credentials - Use EC2 Instance Role to assign credentials
-//     to application running on an EC2 instance. This removes the need to manage
-//     credential files in production.
-//
-// Credentials can be configured in code as well by setting the Config's Credentials
-// value to a custom provider or using one of the providers included with the
-// SDK to bypass the default credential chain and use a custom one. This is
-// helpful when you want to instruct the SDK to only use a specific set of
-// credentials or providers.
-//
-// This example creates a credential provider for assuming an IAM role, "myRoleARN"
-// and configures the S3 service client to use that role for API requests.
-//
-//   // Initial credentials loaded from SDK's default credential chain. Such as
-//   // the environment, shared credentials (~/.aws/credentials), or EC2 Instance
-//   // Role. These credentials will be used to to make the STS Assume Role API.
-//   sess := session.Must(session.NewSession())
-//
-//   // Create the credentials from AssumeRoleProvider to assume the role
-//   // referenced by the "myRoleARN" ARN.
-//   creds := stscreds.NewCredentials(sess, "myRoleArn")
-//
-//   // Create service client value configured for credentials
-//   // from assumed role.
-//   svc := s3.New(sess, &aws.Config{Credentials: creds})/
-//
-// See the credentials package documentation for more information on credential
-// providers included with the SDK, and how to customize the SDK's usage of
-// credentials.
-// https://docs.aws.amazon.com/sdk-for-go/api/aws/credentials
-//
-// The SDK has support for the shared configuration file (~/.aws/config). This
-// support can be enabled by setting the environment variable, "AWS_SDK_LOAD_CONFIG=1",
-// or enabling the feature in code when creating a Session via the
-// Option's SharedConfigState parameter.
-//
-//   sess := session.Must(session.NewSessionWithOptions(session.Options{
-//       SharedConfigState: session.SharedConfigEnable,
-//   }))
-//
-// Configuring AWS Region
-//
-// In addition to the credentials you'll need to specify the region the SDK
-// will use to make AWS API requests to. In the SDK you can specify the region
-// either with an environment variable, or directly in code when a Session or
-// service client is created. The last value specified in code wins if the region
-// is specified multiple ways.
-//
-// To set the region via the environment variable set the "AWS_REGION" to the
-// region you want to the SDK to use. Using this method to set the region will
-// allow you to run your application in multiple regions without needing additional
-// code in the application to select the region.
-//
-//   AWS_REGION=us-west-2
-//
-// The endpoints package includes constants for all regions the SDK knows. The
-// values are all suffixed with RegionID. These values are helpful, because they
-// reduce the need to type the region string manually.
-//
-// To set the region on a Session use the aws package's Config struct parameter
-// Region to the AWS region you want the service clients created from the session to
-// use. This is helpful when you want to create multiple service clients, and
-// all of the clients make API requests to the same region.
-//
-//   sess := session.Must(session.NewSession(&aws.Config{
-//       Region: aws.String(endpoints.UsWest2RegionID),
-//   }))
-//
-// See the endpoints package for the AWS Regions and Endpoints metadata.
-// https://docs.aws.amazon.com/sdk-for-go/api/aws/endpoints/
-//
-// In addition to setting the region when creating a Session you can also set
-// the region on a per service client bases. This overrides the region of a
-// Session. This is helpful when you want to create service clients in specific
-// regions different from the Session's region.
-//
-//   svc := s3.New(sess, &aws.Config{
-//       Region: aws.String(ednpoints.UsWest2RegionID),
-//   })
-//
-// See the Config type in the aws package for more information and additional
-// options such as setting the Endpoint, and other service client configuration options.
-// https://docs.aws.amazon.com/sdk-for-go/api/aws/#Config
-//
-// Making API Requests
-//
-// Once the client is created you can make an API request to the service.
-// Each API method takes a input parameter, and returns the service response
-// and an error. The SDK provides methods for making the API call in multiple ways.
-//
-// In this list we'll use the S3 ListObjects API as an example for the different
-// ways of making API requests.
-//
-//   * ListObjects - Base API operation that will make the API request to the service.
-//
-//   * ListObjectsRequest - API methods suffixed with Request will construct the
-//     API request, but not send it. This is also helpful when you want to get a
-//     presigned URL for a request, and share the presigned URL instead of your
-//     application making the request directly.
-//
-//   * ListObjectsPages - Same as the base API operation, but uses a callback to
-//     automatically handle pagination of the API's response.
-//
-//   * ListObjectsWithContext - Same as base API operation, but adds support for
-//     the Context pattern. This is helpful for controlling the canceling of in
-//     flight requests. See the Go standard library context package for more
-//     information. This method also takes request package's Option functional
-//     options as the variadic argument for modifying how the request will be
-//     made, or extracting information from the raw HTTP response.
-//
-//   * ListObjectsPagesWithContext - same as ListObjectsPages, but adds support for
-//     the Context pattern. Similar to ListObjectsWithContext this method also
-//     takes the request package's Option function option types as the variadic
-//     argument.
-//
-// In addition to the API operations the SDK also includes several higher level
-// methods that abstract checking for and waiting for an AWS resource to be in
-// a desired state. In this list we'll use WaitUntilBucketExists to demonstrate
-// the different forms of waiters.
-//
-//   * WaitUntilBucketExists. - Method to make API request to query an AWS service for
-//     a resource's state. Will return successfully when that state is accomplished.
-//
-//   * WaitUntilBucketExistsWithContext - Same as WaitUntilBucketExists, but adds
-//     support for the Context pattern. In addition these methods take request
-//     package's WaiterOptions to configure the waiter, and how underlying request
-//     will be made by the SDK.
-//
-// The API method will document which error codes the service might return for
-// the operation. These errors will also be available as const strings prefixed
-// with "ErrCode" in the service client's package. If there are no errors listed
-// in the API's SDK documentation you'll need to consult the AWS service's API
-// documentation for the errors that could be returned.
-//
-//   ctx := context.Background()
-//
-//   result, err := svc.GetObjectWithContext(ctx, &s3.GetObjectInput{
-//       Bucket: aws.String("my-bucket"),
-//       Key: aws.String("my-key"),
-//   })
-//   if err != nil {
-//       // Cast err to awserr.Error to handle specific error codes.
-//       aerr, ok := err.(awserr.Error)
-//       if ok && aerr.Code() == s3.ErrCodeNoSuchKey {
-//           // Specific error code handling
-//       }
-//       return err
-//   }
-//
-//   // Make sure to close the body when done with it for S3 GetObject APIs or
-//   // will leak connections.
-//   defer result.Body.Close()
-//
-//   fmt.Println("Object Size:", aws.StringValue(result.ContentLength))
-//
-// API Request Pagination and Resource Waiters
-//
-// Pagination helper methods are suffixed with "Pages", and provide the
-// functionality needed to round trip API page requests. Pagination methods
-// take a callback function that will be called for each page of the API's response.
-//
-//    objects := []string{}
-//    err := svc.ListObjectsPagesWithContext(ctx, &s3.ListObjectsInput{
-//        Bucket: aws.String(myBucket),
-//    }, func(p *s3.ListObjectsOutput, lastPage bool) bool {
-//        for _, o := range p.Contents {
-//            objects = append(objects, aws.StringValue(o.Key))
-//        }
-//        return true // continue paging
-//    })
-//    if err != nil {
-//        panic(fmt.Sprintf("failed to list objects for bucket, %s, %v", myBucket, err))
-//    }
-//
-//    fmt.Println("Objects in bucket:", objects)
-//
-// Waiter helper methods provide the functionality to wait for an AWS resource
-// state. These methods abstract the logic needed to to check the state of an
-// AWS resource, and wait until that resource is in a desired state. The waiter
-// will block until the resource is in the state that is desired, an error occurs,
-// or the waiter times out. If a resource times out the error code returned will
-// be request.WaiterResourceNotReadyErrorCode.
-//
-//   err := svc.WaitUntilBucketExistsWithContext(ctx, &s3.HeadBucketInput{
-//       Bucket: aws.String(myBucket),
-//   })
-//   if err != nil {
-//       aerr, ok := err.(awserr.Error)
-//       if ok && aerr.Code() == request.WaiterResourceNotReadyErrorCode {
-//           fmt.Fprintf(os.Stderr, "timed out while waiting for bucket to exist")
-//       }
-//       panic(fmt.Errorf("failed to wait for bucket to exist, %v", err))
-//   }
-//   fmt.Println("Bucket", myBucket, "exists")
-//
-// Complete SDK Example
-//
-// This example shows a complete working Go file which will upload a file to S3
-// and use the Context pattern to implement timeout logic that will cancel the
-// request if it takes too long. This example highlights how to use sessions,
-// create a service client, make a request, handle the error, and process the
-// response.
-//
-//   package main
-//
-//   import (
-//   	"context"
-//   	"flag"
-//   	"fmt"
-//   	"os"
-//   	"time"
-//
-//   	"github.com/aws/aws-sdk-go/aws"
-//   	"github.com/aws/aws-sdk-go/aws/awserr"
-//   	"github.com/aws/aws-sdk-go/aws/request"
-//   	"github.com/aws/aws-sdk-go/aws/session"
-//   	"github.com/aws/aws-sdk-go/service/s3"
-//   )
-//
-//   // Uploads a file to S3 given a bucket and object key. Also takes a duration
-//   // value to terminate the update if it doesn't complete within that time.
-//   //
-//   // The AWS Region needs to be provided in the AWS shared config or on the
-//   // environment variable as `AWS_REGION`. Credentials also must be provided
-//   // Will default to shared config file, but can load from environment if provided.
-//   //
-//   // Usage:
-//   //   # Upload myfile.txt to myBucket/myKey. Must complete within 10 minutes or will fail
-//   //   go run withContext.go -b mybucket -k myKey -d 10m < myfile.txt
-//   func main() {
-//   	var bucket, key string
-//   	var timeout time.Duration
-//
-//   	flag.StringVar(&bucket, "b", "", "Bucket name.")
-//   	flag.StringVar(&key, "k", "", "Object key name.")
-//   	flag.DurationVar(&timeout, "d", 0, "Upload timeout.")
-//   	flag.Parse()
-//
-//   	// All clients require a Session. The Session provides the client with
-//  	// shared configuration such as region, endpoint, and credentials. A
-//  	// Session should be shared where possible to take advantage of
-//  	// configuration and credential caching. See the session package for
-//  	// more information.
-//   	sess := session.Must(session.NewSession())
-//
-//  	// Create a new instance of the service's client with a Session.
-//  	// Optional aws.Config values can also be provided as variadic arguments
-//  	// to the New function. This option allows you to provide service
-//  	// specific configuration.
-//   	svc := s3.New(sess)
-//
-//   	// Create a context with a timeout that will abort the upload if it takes
-//   	// more than the passed in timeout.
-//   	ctx := context.Background()
-//   	var cancelFn func()
-//   	if timeout > 0 {
-//   		ctx, cancelFn = context.WithTimeout(ctx, timeout)
-//   	}
-//   	// Ensure the context is canceled to prevent leaking.
-//   	// See context package for more information, https://golang.org/pkg/context/
-//   	defer cancelFn()
-//
-//   	// Uploads the object to S3. The Context will interrupt the request if the
-//   	// timeout expires.
-//   	_, err := svc.PutObjectWithContext(ctx, &s3.PutObjectInput{
-//   		Bucket: aws.String(bucket),
-//   		Key:    aws.String(key),
-//   		Body:   os.Stdin,
-//   	})
-//   	if err != nil {
-//   		if aerr, ok := err.(awserr.Error); ok && aerr.Code() == request.CanceledErrorCode {
-//   			// If the SDK can determine the request or retry delay was canceled
-//   			// by a context the CanceledErrorCode error code will be returned.
-//   			fmt.Fprintf(os.Stderr, "upload canceled due to timeout, %v\n", err)
-//   		} else {
-//   			fmt.Fprintf(os.Stderr, "failed to upload object, %v\n", err)
-//   		}
-//   		os.Exit(1)
-//   	}
-//
-//   	fmt.Printf("successfully uploaded file to %s/%s\n", bucket, key)
-//   }
-package sdk
diff --git a/vendor/github.com/aws/aws-sdk-go/internal/shareddefaults/shared_config.go b/vendor/github.com/aws/aws-sdk-go/internal/shareddefaults/shared_config.go
deleted file mode 100644
index ebcbc2b40a..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/internal/shareddefaults/shared_config.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package shareddefaults
-
-import (
-	"os"
-	"path/filepath"
-	"runtime"
-)
-
-// SharedCredentialsFilename returns the SDK's default file path
-// for the shared credentials file.
-//
-// Builds the shared config file path based on the OS's platform.
-//
-//   - Linux/Unix: $HOME/.aws/credentials
-//   - Windows: %USERPROFILE%\.aws\credentials
-func SharedCredentialsFilename() string {
-	return filepath.Join(UserHomeDir(), ".aws", "credentials")
-}
-
-// SharedConfigFilename returns the SDK's default file path for
-// the shared config file.
-//
-// Builds the shared config file path based on the OS's platform.
-//
-//   - Linux/Unix: $HOME/.aws/config
-//   - Windows: %USERPROFILE%\.aws\config
-func SharedConfigFilename() string {
-	return filepath.Join(UserHomeDir(), ".aws", "config")
-}
-
-// UserHomeDir returns the home directory for the user the process is
-// running under.
-func UserHomeDir() string {
-	if runtime.GOOS == "windows" { // Windows
-		return os.Getenv("USERPROFILE")
-	}
-
-	// *nix
-	return os.Getenv("HOME")
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/idempotency.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/idempotency.go
deleted file mode 100644
index 53831dff98..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/idempotency.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package protocol
-
-import (
-	"crypto/rand"
-	"fmt"
-	"reflect"
-)
-
-// RandReader is the random reader the protocol package will use to read
-// random bytes from. This is exported for testing, and should not be used.
-var RandReader = rand.Reader
-
-const idempotencyTokenFillTag = `idempotencyToken`
-
-// CanSetIdempotencyToken returns true if the struct field should be
-// automatically populated with a Idempotency token.
-//
-// Only *string and string type fields that are tagged with idempotencyToken
-// which are not already set can be auto filled.
-func CanSetIdempotencyToken(v reflect.Value, f reflect.StructField) bool {
-	switch u := v.Interface().(type) {
-	// To auto fill an Idempotency token the field must be a string,
-	// tagged for auto fill, and have a zero value.
-	case *string:
-		return u == nil && len(f.Tag.Get(idempotencyTokenFillTag)) != 0
-	case string:
-		return len(u) == 0 && len(f.Tag.Get(idempotencyTokenFillTag)) != 0
-	}
-
-	return false
-}
-
-// GetIdempotencyToken returns a randomly generated idempotency token.
-func GetIdempotencyToken() string {
-	b := make([]byte, 16)
-	RandReader.Read(b)
-
-	return UUIDVersion4(b)
-}
-
-// SetIdempotencyToken will set the value provided with a Idempotency Token.
-// Given that the value can be set. Will panic if value is not setable.
-func SetIdempotencyToken(v reflect.Value) {
-	if v.Kind() == reflect.Ptr {
-		if v.IsNil() && v.CanSet() {
-			v.Set(reflect.New(v.Type().Elem()))
-		}
-		v = v.Elem()
-	}
-	v = reflect.Indirect(v)
-
-	if !v.CanSet() {
-		panic(fmt.Sprintf("unable to set idempotnecy token %v", v))
-	}
-
-	b := make([]byte, 16)
-	_, err := rand.Read(b)
-	if err != nil {
-		// TODO handle error
-		return
-	}
-
-	v.Set(reflect.ValueOf(UUIDVersion4(b)))
-}
-
-// UUIDVersion4 returns a Version 4 random UUID from the byte slice provided
-func UUIDVersion4(u []byte) string {
-	// https://en.wikipedia.org/wiki/Universally_unique_identifier#Version_4_.28random.29
-	// 13th character is "4"
-	u[6] = (u[6] | 0x40) & 0x4F
-	// 17th character is "8", "9", "a", or "b"
-	u[8] = (u[8] | 0x80) & 0xBF
-
-	return fmt.Sprintf(`%X-%X-%X-%X-%X`, u[0:4], u[4:6], u[6:8], u[8:10], u[10:])
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go
deleted file mode 100644
index 18169f0f8c..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Package query provides serialization of AWS query requests, and responses.
-package query
-
-//go:generate go run -tags codegen ../../../models/protocol_tests/generate.go ../../../models/protocol_tests/input/query.json build_test.go
-
-import (
-	"net/url"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/private/protocol/query/queryutil"
-)
-
-// BuildHandler is a named request handler for building query protocol requests
-var BuildHandler = request.NamedHandler{Name: "awssdk.query.Build", Fn: Build}
-
-// Build builds a request for an AWS Query service.
-func Build(r *request.Request) {
-	body := url.Values{
-		"Action":  {r.Operation.Name},
-		"Version": {r.ClientInfo.APIVersion},
-	}
-	if err := queryutil.Parse(body, r.Params, false); err != nil {
-		r.Error = awserr.New("SerializationError", "failed encoding Query request", err)
-		return
-	}
-
-	if r.ExpireTime == 0 {
-		r.HTTPRequest.Method = "POST"
-		r.HTTPRequest.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=utf-8")
-		r.SetBufferBody([]byte(body.Encode()))
-	} else { // This is a pre-signed request
-		r.HTTPRequest.Method = "GET"
-		r.HTTPRequest.URL.RawQuery = body.Encode()
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go
deleted file mode 100644
index 524ca952ad..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go
+++ /dev/null
@@ -1,237 +0,0 @@
-package queryutil
-
-import (
-	"encoding/base64"
-	"fmt"
-	"net/url"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/aws/aws-sdk-go/private/protocol"
-)
-
-// Parse parses an object i and fills a url.Values object. The isEC2 flag
-// indicates if this is the EC2 Query sub-protocol.
-func Parse(body url.Values, i interface{}, isEC2 bool) error {
-	q := queryParser{isEC2: isEC2}
-	return q.parseValue(body, reflect.ValueOf(i), "", "")
-}
-
-func elemOf(value reflect.Value) reflect.Value {
-	for value.Kind() == reflect.Ptr {
-		value = value.Elem()
-	}
-	return value
-}
-
-type queryParser struct {
-	isEC2 bool
-}
-
-func (q *queryParser) parseValue(v url.Values, value reflect.Value, prefix string, tag reflect.StructTag) error {
-	value = elemOf(value)
-
-	// no need to handle zero values
-	if !value.IsValid() {
-		return nil
-	}
-
-	t := tag.Get("type")
-	if t == "" {
-		switch value.Kind() {
-		case reflect.Struct:
-			t = "structure"
-		case reflect.Slice:
-			t = "list"
-		case reflect.Map:
-			t = "map"
-		}
-	}
-
-	switch t {
-	case "structure":
-		return q.parseStruct(v, value, prefix)
-	case "list":
-		return q.parseList(v, value, prefix, tag)
-	case "map":
-		return q.parseMap(v, value, prefix, tag)
-	default:
-		return q.parseScalar(v, value, prefix, tag)
-	}
-}
-
-func (q *queryParser) parseStruct(v url.Values, value reflect.Value, prefix string) error {
-	if !value.IsValid() {
-		return nil
-	}
-
-	t := value.Type()
-	for i := 0; i < value.NumField(); i++ {
-		elemValue := elemOf(value.Field(i))
-		field := t.Field(i)
-
-		if field.PkgPath != "" {
-			continue // ignore unexported fields
-		}
-		if field.Tag.Get("ignore") != "" {
-			continue
-		}
-
-		if protocol.CanSetIdempotencyToken(value.Field(i), field) {
-			token := protocol.GetIdempotencyToken()
-			elemValue = reflect.ValueOf(token)
-		}
-
-		var name string
-		if q.isEC2 {
-			name = field.Tag.Get("queryName")
-		}
-		if name == "" {
-			if field.Tag.Get("flattened") != "" && field.Tag.Get("locationNameList") != "" {
-				name = field.Tag.Get("locationNameList")
-			} else if locName := field.Tag.Get("locationName"); locName != "" {
-				name = locName
-			}
-			if name != "" && q.isEC2 {
-				name = strings.ToUpper(name[0:1]) + name[1:]
-			}
-		}
-		if name == "" {
-			name = field.Name
-		}
-
-		if prefix != "" {
-			name = prefix + "." + name
-		}
-
-		if err := q.parseValue(v, elemValue, name, field.Tag); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (q *queryParser) parseList(v url.Values, value reflect.Value, prefix string, tag reflect.StructTag) error {
-	// If it's empty, generate an empty value
-	if !value.IsNil() && value.Len() == 0 {
-		v.Set(prefix, "")
-		return nil
-	}
-
-	// check for unflattened list member
-	if !q.isEC2 && tag.Get("flattened") == "" {
-		if listName := tag.Get("locationNameList"); listName == "" {
-			prefix += ".member"
-		} else {
-			prefix += "." + listName
-		}
-	}
-
-	for i := 0; i < value.Len(); i++ {
-		slicePrefix := prefix
-		if slicePrefix == "" {
-			slicePrefix = strconv.Itoa(i + 1)
-		} else {
-			slicePrefix = slicePrefix + "." + strconv.Itoa(i+1)
-		}
-		if err := q.parseValue(v, value.Index(i), slicePrefix, ""); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (q *queryParser) parseMap(v url.Values, value reflect.Value, prefix string, tag reflect.StructTag) error {
-	// If it's empty, generate an empty value
-	if !value.IsNil() && value.Len() == 0 {
-		v.Set(prefix, "")
-		return nil
-	}
-
-	// check for unflattened list member
-	if !q.isEC2 && tag.Get("flattened") == "" {
-		prefix += ".entry"
-	}
-
-	// sort keys for improved serialization consistency.
-	// this is not strictly necessary for protocol support.
-	mapKeyValues := value.MapKeys()
-	mapKeys := map[string]reflect.Value{}
-	mapKeyNames := make([]string, len(mapKeyValues))
-	for i, mapKey := range mapKeyValues {
-		name := mapKey.String()
-		mapKeys[name] = mapKey
-		mapKeyNames[i] = name
-	}
-	sort.Strings(mapKeyNames)
-
-	for i, mapKeyName := range mapKeyNames {
-		mapKey := mapKeys[mapKeyName]
-		mapValue := value.MapIndex(mapKey)
-
-		kname := tag.Get("locationNameKey")
-		if kname == "" {
-			kname = "key"
-		}
-		vname := tag.Get("locationNameValue")
-		if vname == "" {
-			vname = "value"
-		}
-
-		// serialize key
-		var keyName string
-		if prefix == "" {
-			keyName = strconv.Itoa(i+1) + "." + kname
-		} else {
-			keyName = prefix + "." + strconv.Itoa(i+1) + "." + kname
-		}
-
-		if err := q.parseValue(v, mapKey, keyName, ""); err != nil {
-			return err
-		}
-
-		// serialize value
-		var valueName string
-		if prefix == "" {
-			valueName = strconv.Itoa(i+1) + "." + vname
-		} else {
-			valueName = prefix + "." + strconv.Itoa(i+1) + "." + vname
-		}
-
-		if err := q.parseValue(v, mapValue, valueName, ""); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (q *queryParser) parseScalar(v url.Values, r reflect.Value, name string, tag reflect.StructTag) error {
-	switch value := r.Interface().(type) {
-	case string:
-		v.Set(name, value)
-	case []byte:
-		if !r.IsNil() {
-			v.Set(name, base64.StdEncoding.EncodeToString(value))
-		}
-	case bool:
-		v.Set(name, strconv.FormatBool(value))
-	case int64:
-		v.Set(name, strconv.FormatInt(value, 10))
-	case int:
-		v.Set(name, strconv.Itoa(value))
-	case float64:
-		v.Set(name, strconv.FormatFloat(value, 'f', -1, 64))
-	case float32:
-		v.Set(name, strconv.FormatFloat(float64(value), 'f', -1, 32))
-	case time.Time:
-		const ISO8601UTC = "2006-01-02T15:04:05Z"
-		v.Set(name, value.UTC().Format(ISO8601UTC))
-	default:
-		return fmt.Errorf("unsupported value for param %s: %v (%s)", name, r.Interface(), r.Type().Name())
-	}
-	return nil
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go
deleted file mode 100644
index e0f4d5a541..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package query
-
-//go:generate go run -tags codegen ../../../models/protocol_tests/generate.go ../../../models/protocol_tests/output/query.json unmarshal_test.go
-
-import (
-	"encoding/xml"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil"
-)
-
-// UnmarshalHandler is a named request handler for unmarshaling query protocol requests
-var UnmarshalHandler = request.NamedHandler{Name: "awssdk.query.Unmarshal", Fn: Unmarshal}
-
-// UnmarshalMetaHandler is a named request handler for unmarshaling query protocol request metadata
-var UnmarshalMetaHandler = request.NamedHandler{Name: "awssdk.query.UnmarshalMeta", Fn: UnmarshalMeta}
-
-// Unmarshal unmarshals a response for an AWS Query service.
-func Unmarshal(r *request.Request) {
-	defer r.HTTPResponse.Body.Close()
-	if r.DataFilled() {
-		decoder := xml.NewDecoder(r.HTTPResponse.Body)
-		err := xmlutil.UnmarshalXML(r.Data, decoder, r.Operation.Name+"Result")
-		if err != nil {
-			r.Error = awserr.New("SerializationError", "failed decoding Query response", err)
-			return
-		}
-	}
-}
-
-// UnmarshalMeta unmarshals header response values for an AWS Query service.
-func UnmarshalMeta(r *request.Request) {
-	r.RequestID = r.HTTPResponse.Header.Get("X-Amzn-Requestid")
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go
deleted file mode 100644
index f214296171..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package query
-
-import (
-	"encoding/xml"
-	"io/ioutil"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-type xmlErrorResponse struct {
-	XMLName   xml.Name `xml:"ErrorResponse"`
-	Code      string   `xml:"Error>Code"`
-	Message   string   `xml:"Error>Message"`
-	RequestID string   `xml:"RequestId"`
-}
-
-type xmlServiceUnavailableResponse struct {
-	XMLName xml.Name `xml:"ServiceUnavailableException"`
-}
-
-// UnmarshalErrorHandler is a name request handler to unmarshal request errors
-var UnmarshalErrorHandler = request.NamedHandler{Name: "awssdk.query.UnmarshalError", Fn: UnmarshalError}
-
-// UnmarshalError unmarshals an error response for an AWS Query service.
-func UnmarshalError(r *request.Request) {
-	defer r.HTTPResponse.Body.Close()
-
-	bodyBytes, err := ioutil.ReadAll(r.HTTPResponse.Body)
-	if err != nil {
-		r.Error = awserr.New("SerializationError", "failed to read from query HTTP response body", err)
-		return
-	}
-
-	// First check for specific error
-	resp := xmlErrorResponse{}
-	decodeErr := xml.Unmarshal(bodyBytes, &resp)
-	if decodeErr == nil {
-		reqID := resp.RequestID
-		if reqID == "" {
-			reqID = r.RequestID
-		}
-		r.Error = awserr.NewRequestFailure(
-			awserr.New(resp.Code, resp.Message, nil),
-			r.HTTPResponse.StatusCode,
-			reqID,
-		)
-		return
-	}
-
-	// Check for unhandled error
-	servUnavailResp := xmlServiceUnavailableResponse{}
-	unavailErr := xml.Unmarshal(bodyBytes, &servUnavailResp)
-	if unavailErr == nil {
-		r.Error = awserr.NewRequestFailure(
-			awserr.New("ServiceUnavailableException", "service is unavailable", nil),
-			r.HTTPResponse.StatusCode,
-			r.RequestID,
-		)
-		return
-	}
-
-	// Failed to retrieve any error message from the response body
-	r.Error = awserr.New("SerializationError",
-		"failed to decode query XML error response", decodeErr)
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
deleted file mode 100644
index 7161835649..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
+++ /dev/null
@@ -1,290 +0,0 @@
-// Package rest provides RESTful serialization of AWS requests and responses.
-package rest
-
-import (
-	"bytes"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"path"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// RFC822 returns an RFC822 formatted timestamp for AWS protocols
-const RFC822 = "Mon, 2 Jan 2006 15:04:05 GMT"
-
-// Whether the byte value can be sent without escaping in AWS URLs
-var noEscape [256]bool
-
-var errValueNotSet = fmt.Errorf("value not set")
-
-func init() {
-	for i := 0; i < len(noEscape); i++ {
-		// AWS expects every character except these to be escaped
-		noEscape[i] = (i >= 'A' && i <= 'Z') ||
-			(i >= 'a' && i <= 'z') ||
-			(i >= '0' && i <= '9') ||
-			i == '-' ||
-			i == '.' ||
-			i == '_' ||
-			i == '~'
-	}
-}
-
-// BuildHandler is a named request handler for building rest protocol requests
-var BuildHandler = request.NamedHandler{Name: "awssdk.rest.Build", Fn: Build}
-
-// Build builds the REST component of a service request.
-func Build(r *request.Request) {
-	if r.ParamsFilled() {
-		v := reflect.ValueOf(r.Params).Elem()
-		buildLocationElements(r, v, false)
-		buildBody(r, v)
-	}
-}
-
-// BuildAsGET builds the REST component of a service request with the ability to hoist
-// data from the body.
-func BuildAsGET(r *request.Request) {
-	if r.ParamsFilled() {
-		v := reflect.ValueOf(r.Params).Elem()
-		buildLocationElements(r, v, true)
-		buildBody(r, v)
-	}
-}
-
-func buildLocationElements(r *request.Request, v reflect.Value, buildGETQuery bool) {
-	query := r.HTTPRequest.URL.Query()
-
-	// Setup the raw path to match the base path pattern. This is needed
-	// so that when the path is mutated a custom escaped version can be
-	// stored in RawPath that will be used by the Go client.
-	r.HTTPRequest.URL.RawPath = r.HTTPRequest.URL.Path
-
-	for i := 0; i < v.NumField(); i++ {
-		m := v.Field(i)
-		if n := v.Type().Field(i).Name; n[0:1] == strings.ToLower(n[0:1]) {
-			continue
-		}
-
-		if m.IsValid() {
-			field := v.Type().Field(i)
-			name := field.Tag.Get("locationName")
-			if name == "" {
-				name = field.Name
-			}
-			if kind := m.Kind(); kind == reflect.Ptr {
-				m = m.Elem()
-			} else if kind == reflect.Interface {
-				if !m.Elem().IsValid() {
-					continue
-				}
-			}
-			if !m.IsValid() {
-				continue
-			}
-			if field.Tag.Get("ignore") != "" {
-				continue
-			}
-
-			var err error
-			switch field.Tag.Get("location") {
-			case "headers": // header maps
-				err = buildHeaderMap(&r.HTTPRequest.Header, m, field.Tag)
-			case "header":
-				err = buildHeader(&r.HTTPRequest.Header, m, name, field.Tag)
-			case "uri":
-				err = buildURI(r.HTTPRequest.URL, m, name, field.Tag)
-			case "querystring":
-				err = buildQueryString(query, m, name, field.Tag)
-			default:
-				if buildGETQuery {
-					err = buildQueryString(query, m, name, field.Tag)
-				}
-			}
-			r.Error = err
-		}
-		if r.Error != nil {
-			return
-		}
-	}
-
-	r.HTTPRequest.URL.RawQuery = query.Encode()
-	if !aws.BoolValue(r.Config.DisableRestProtocolURICleaning) {
-		cleanPath(r.HTTPRequest.URL)
-	}
-}
-
-func buildBody(r *request.Request, v reflect.Value) {
-	if field, ok := v.Type().FieldByName("_"); ok {
-		if payloadName := field.Tag.Get("payload"); payloadName != "" {
-			pfield, _ := v.Type().FieldByName(payloadName)
-			if ptag := pfield.Tag.Get("type"); ptag != "" && ptag != "structure" {
-				payload := reflect.Indirect(v.FieldByName(payloadName))
-				if payload.IsValid() && payload.Interface() != nil {
-					switch reader := payload.Interface().(type) {
-					case io.ReadSeeker:
-						r.SetReaderBody(reader)
-					case []byte:
-						r.SetBufferBody(reader)
-					case string:
-						r.SetStringBody(reader)
-					default:
-						r.Error = awserr.New("SerializationError",
-							"failed to encode REST request",
-							fmt.Errorf("unknown payload type %s", payload.Type()))
-					}
-				}
-			}
-		}
-	}
-}
-
-func buildHeader(header *http.Header, v reflect.Value, name string, tag reflect.StructTag) error {
-	str, err := convertType(v, tag)
-	if err == errValueNotSet {
-		return nil
-	} else if err != nil {
-		return awserr.New("SerializationError", "failed to encode REST request", err)
-	}
-
-	header.Add(name, str)
-
-	return nil
-}
-
-func buildHeaderMap(header *http.Header, v reflect.Value, tag reflect.StructTag) error {
-	prefix := tag.Get("locationName")
-	for _, key := range v.MapKeys() {
-		str, err := convertType(v.MapIndex(key), tag)
-		if err == errValueNotSet {
-			continue
-		} else if err != nil {
-			return awserr.New("SerializationError", "failed to encode REST request", err)
-
-		}
-
-		header.Add(prefix+key.String(), str)
-	}
-	return nil
-}
-
-func buildURI(u *url.URL, v reflect.Value, name string, tag reflect.StructTag) error {
-	value, err := convertType(v, tag)
-	if err == errValueNotSet {
-		return nil
-	} else if err != nil {
-		return awserr.New("SerializationError", "failed to encode REST request", err)
-	}
-
-	u.Path = strings.Replace(u.Path, "{"+name+"}", value, -1)
-	u.Path = strings.Replace(u.Path, "{"+name+"+}", value, -1)
-
-	u.RawPath = strings.Replace(u.RawPath, "{"+name+"}", EscapePath(value, true), -1)
-	u.RawPath = strings.Replace(u.RawPath, "{"+name+"+}", EscapePath(value, false), -1)
-
-	return nil
-}
-
-func buildQueryString(query url.Values, v reflect.Value, name string, tag reflect.StructTag) error {
-	switch value := v.Interface().(type) {
-	case []*string:
-		for _, item := range value {
-			query.Add(name, *item)
-		}
-	case map[string]*string:
-		for key, item := range value {
-			query.Add(key, *item)
-		}
-	case map[string][]*string:
-		for key, items := range value {
-			for _, item := range items {
-				query.Add(key, *item)
-			}
-		}
-	default:
-		str, err := convertType(v, tag)
-		if err == errValueNotSet {
-			return nil
-		} else if err != nil {
-			return awserr.New("SerializationError", "failed to encode REST request", err)
-		}
-		query.Set(name, str)
-	}
-
-	return nil
-}
-
-func cleanPath(u *url.URL) {
-	hasSlash := strings.HasSuffix(u.Path, "/")
-
-	// clean up path, removing duplicate `/`
-	u.Path = path.Clean(u.Path)
-	u.RawPath = path.Clean(u.RawPath)
-
-	if hasSlash && !strings.HasSuffix(u.Path, "/") {
-		u.Path += "/"
-		u.RawPath += "/"
-	}
-}
-
-// EscapePath escapes part of a URL path in Amazon style
-func EscapePath(path string, encodeSep bool) string {
-	var buf bytes.Buffer
-	for i := 0; i < len(path); i++ {
-		c := path[i]
-		if noEscape[c] || (c == '/' && !encodeSep) {
-			buf.WriteByte(c)
-		} else {
-			fmt.Fprintf(&buf, "%%%02X", c)
-		}
-	}
-	return buf.String()
-}
-
-func convertType(v reflect.Value, tag reflect.StructTag) (string, error) {
-	v = reflect.Indirect(v)
-	if !v.IsValid() {
-		return "", errValueNotSet
-	}
-
-	var str string
-	switch value := v.Interface().(type) {
-	case string:
-		str = value
-	case []byte:
-		str = base64.StdEncoding.EncodeToString(value)
-	case bool:
-		str = strconv.FormatBool(value)
-	case int64:
-		str = strconv.FormatInt(value, 10)
-	case float64:
-		str = strconv.FormatFloat(value, 'f', -1, 64)
-	case time.Time:
-		str = value.UTC().Format(RFC822)
-	case aws.JSONValue:
-		b, err := json.Marshal(value)
-		if err != nil {
-			return "", err
-		}
-		if tag.Get("location") == "header" {
-			str = base64.StdEncoding.EncodeToString(b)
-		} else {
-			str = string(b)
-		}
-	default:
-		err := fmt.Errorf("Unsupported value for param %v (%s)", v.Interface(), v.Type())
-		return "", err
-	}
-	return str, nil
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
deleted file mode 100644
index 4366de2e1e..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/payload.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package rest
-
-import "reflect"
-
-// PayloadMember returns the payload field member of i if there is one, or nil.
-func PayloadMember(i interface{}) interface{} {
-	if i == nil {
-		return nil
-	}
-
-	v := reflect.ValueOf(i).Elem()
-	if !v.IsValid() {
-		return nil
-	}
-	if field, ok := v.Type().FieldByName("_"); ok {
-		if payloadName := field.Tag.Get("payload"); payloadName != "" {
-			field, _ := v.Type().FieldByName(payloadName)
-			if field.Tag.Get("type") != "structure" {
-				return nil
-			}
-
-			payload := v.FieldByName(payloadName)
-			if payload.IsValid() || (payload.Kind() == reflect.Ptr && !payload.IsNil()) {
-				return payload.Interface()
-			}
-		}
-	}
-	return nil
-}
-
-// PayloadType returns the type of a payload field member of i if there is one, or "".
-func PayloadType(i interface{}) string {
-	v := reflect.Indirect(reflect.ValueOf(i))
-	if !v.IsValid() {
-		return ""
-	}
-	if field, ok := v.Type().FieldByName("_"); ok {
-		if payloadName := field.Tag.Get("payload"); payloadName != "" {
-			if member, ok := v.Type().FieldByName(payloadName); ok {
-				return member.Tag.Get("type")
-			}
-		}
-	}
-	return ""
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
deleted file mode 100644
index 7a779ee226..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
+++ /dev/null
@@ -1,227 +0,0 @@
-package rest
-
-import (
-	"bytes"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// UnmarshalHandler is a named request handler for unmarshaling rest protocol requests
-var UnmarshalHandler = request.NamedHandler{Name: "awssdk.rest.Unmarshal", Fn: Unmarshal}
-
-// UnmarshalMetaHandler is a named request handler for unmarshaling rest protocol request metadata
-var UnmarshalMetaHandler = request.NamedHandler{Name: "awssdk.rest.UnmarshalMeta", Fn: UnmarshalMeta}
-
-// Unmarshal unmarshals the REST component of a response in a REST service.
-func Unmarshal(r *request.Request) {
-	if r.DataFilled() {
-		v := reflect.Indirect(reflect.ValueOf(r.Data))
-		unmarshalBody(r, v)
-	}
-}
-
-// UnmarshalMeta unmarshals the REST metadata of a response in a REST service
-func UnmarshalMeta(r *request.Request) {
-	r.RequestID = r.HTTPResponse.Header.Get("X-Amzn-Requestid")
-	if r.RequestID == "" {
-		// Alternative version of request id in the header
-		r.RequestID = r.HTTPResponse.Header.Get("X-Amz-Request-Id")
-	}
-	if r.DataFilled() {
-		v := reflect.Indirect(reflect.ValueOf(r.Data))
-		unmarshalLocationElements(r, v)
-	}
-}
-
-func unmarshalBody(r *request.Request, v reflect.Value) {
-	if field, ok := v.Type().FieldByName("_"); ok {
-		if payloadName := field.Tag.Get("payload"); payloadName != "" {
-			pfield, _ := v.Type().FieldByName(payloadName)
-			if ptag := pfield.Tag.Get("type"); ptag != "" && ptag != "structure" {
-				payload := v.FieldByName(payloadName)
-				if payload.IsValid() {
-					switch payload.Interface().(type) {
-					case []byte:
-						defer r.HTTPResponse.Body.Close()
-						b, err := ioutil.ReadAll(r.HTTPResponse.Body)
-						if err != nil {
-							r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
-						} else {
-							payload.Set(reflect.ValueOf(b))
-						}
-					case *string:
-						defer r.HTTPResponse.Body.Close()
-						b, err := ioutil.ReadAll(r.HTTPResponse.Body)
-						if err != nil {
-							r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
-						} else {
-							str := string(b)
-							payload.Set(reflect.ValueOf(&str))
-						}
-					default:
-						switch payload.Type().String() {
-						case "io.ReadCloser":
-							payload.Set(reflect.ValueOf(r.HTTPResponse.Body))
-						case "io.ReadSeeker":
-							b, err := ioutil.ReadAll(r.HTTPResponse.Body)
-							if err != nil {
-								r.Error = awserr.New("SerializationError",
-									"failed to read response body", err)
-								return
-							}
-							payload.Set(reflect.ValueOf(ioutil.NopCloser(bytes.NewReader(b))))
-						default:
-							io.Copy(ioutil.Discard, r.HTTPResponse.Body)
-							defer r.HTTPResponse.Body.Close()
-							r.Error = awserr.New("SerializationError",
-								"failed to decode REST response",
-								fmt.Errorf("unknown payload type %s", payload.Type()))
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-func unmarshalLocationElements(r *request.Request, v reflect.Value) {
-	for i := 0; i < v.NumField(); i++ {
-		m, field := v.Field(i), v.Type().Field(i)
-		if n := field.Name; n[0:1] == strings.ToLower(n[0:1]) {
-			continue
-		}
-
-		if m.IsValid() {
-			name := field.Tag.Get("locationName")
-			if name == "" {
-				name = field.Name
-			}
-
-			switch field.Tag.Get("location") {
-			case "statusCode":
-				unmarshalStatusCode(m, r.HTTPResponse.StatusCode)
-			case "header":
-				err := unmarshalHeader(m, r.HTTPResponse.Header.Get(name), field.Tag)
-				if err != nil {
-					r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
-					break
-				}
-			case "headers":
-				prefix := field.Tag.Get("locationName")
-				err := unmarshalHeaderMap(m, r.HTTPResponse.Header, prefix)
-				if err != nil {
-					r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
-					break
-				}
-			}
-		}
-		if r.Error != nil {
-			return
-		}
-	}
-}
-
-func unmarshalStatusCode(v reflect.Value, statusCode int) {
-	if !v.IsValid() {
-		return
-	}
-
-	switch v.Interface().(type) {
-	case *int64:
-		s := int64(statusCode)
-		v.Set(reflect.ValueOf(&s))
-	}
-}
-
-func unmarshalHeaderMap(r reflect.Value, headers http.Header, prefix string) error {
-	switch r.Interface().(type) {
-	case map[string]*string: // we only support string map value types
-		out := map[string]*string{}
-		for k, v := range headers {
-			k = http.CanonicalHeaderKey(k)
-			if strings.HasPrefix(strings.ToLower(k), strings.ToLower(prefix)) {
-				out[k[len(prefix):]] = &v[0]
-			}
-		}
-		r.Set(reflect.ValueOf(out))
-	}
-	return nil
-}
-
-func unmarshalHeader(v reflect.Value, header string, tag reflect.StructTag) error {
-	isJSONValue := tag.Get("type") == "jsonvalue"
-	if isJSONValue {
-		if len(header) == 0 {
-			return nil
-		}
-	} else if !v.IsValid() || (header == "" && v.Elem().Kind() != reflect.String) {
-		return nil
-	}
-
-	switch v.Interface().(type) {
-	case *string:
-		v.Set(reflect.ValueOf(&header))
-	case []byte:
-		b, err := base64.StdEncoding.DecodeString(header)
-		if err != nil {
-			return err
-		}
-		v.Set(reflect.ValueOf(&b))
-	case *bool:
-		b, err := strconv.ParseBool(header)
-		if err != nil {
-			return err
-		}
-		v.Set(reflect.ValueOf(&b))
-	case *int64:
-		i, err := strconv.ParseInt(header, 10, 64)
-		if err != nil {
-			return err
-		}
-		v.Set(reflect.ValueOf(&i))
-	case *float64:
-		f, err := strconv.ParseFloat(header, 64)
-		if err != nil {
-			return err
-		}
-		v.Set(reflect.ValueOf(&f))
-	case *time.Time:
-		t, err := time.Parse(RFC822, header)
-		if err != nil {
-			return err
-		}
-		v.Set(reflect.ValueOf(&t))
-	case aws.JSONValue:
-		b := []byte(header)
-		var err error
-		if tag.Get("location") == "header" {
-			b, err = base64.StdEncoding.DecodeString(header)
-			if err != nil {
-				return err
-			}
-		}
-
-		m := aws.JSONValue{}
-		err = json.Unmarshal(b, &m)
-		if err != nil {
-			return err
-		}
-		v.Set(reflect.ValueOf(m))
-	default:
-		err := fmt.Errorf("Unsupported value for param %v (%s)", v.Interface(), v.Type())
-		return err
-	}
-	return nil
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go
deleted file mode 100644
index 7bdf4c8538..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Package restxml provides RESTful XML serialization of AWS
-// requests and responses.
-package restxml
-
-//go:generate go run -tags codegen ../../../models/protocol_tests/generate.go ../../../models/protocol_tests/input/rest-xml.json build_test.go
-//go:generate go run -tags codegen ../../../models/protocol_tests/generate.go ../../../models/protocol_tests/output/rest-xml.json unmarshal_test.go
-
-import (
-	"bytes"
-	"encoding/xml"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/private/protocol/query"
-	"github.com/aws/aws-sdk-go/private/protocol/rest"
-	"github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil"
-)
-
-// BuildHandler is a named request handler for building restxml protocol requests
-var BuildHandler = request.NamedHandler{Name: "awssdk.restxml.Build", Fn: Build}
-
-// UnmarshalHandler is a named request handler for unmarshaling restxml protocol requests
-var UnmarshalHandler = request.NamedHandler{Name: "awssdk.restxml.Unmarshal", Fn: Unmarshal}
-
-// UnmarshalMetaHandler is a named request handler for unmarshaling restxml protocol request metadata
-var UnmarshalMetaHandler = request.NamedHandler{Name: "awssdk.restxml.UnmarshalMeta", Fn: UnmarshalMeta}
-
-// UnmarshalErrorHandler is a named request handler for unmarshaling restxml protocol request errors
-var UnmarshalErrorHandler = request.NamedHandler{Name: "awssdk.restxml.UnmarshalError", Fn: UnmarshalError}
-
-// Build builds a request payload for the REST XML protocol.
-func Build(r *request.Request) {
-	rest.Build(r)
-
-	if t := rest.PayloadType(r.Params); t == "structure" || t == "" {
-		var buf bytes.Buffer
-		err := xmlutil.BuildXML(r.Params, xml.NewEncoder(&buf))
-		if err != nil {
-			r.Error = awserr.New("SerializationError", "failed to encode rest XML request", err)
-			return
-		}
-		r.SetBufferBody(buf.Bytes())
-	}
-}
-
-// Unmarshal unmarshals a payload response for the REST XML protocol.
-func Unmarshal(r *request.Request) {
-	if t := rest.PayloadType(r.Data); t == "structure" || t == "" {
-		defer r.HTTPResponse.Body.Close()
-		decoder := xml.NewDecoder(r.HTTPResponse.Body)
-		err := xmlutil.UnmarshalXML(r.Data, decoder, "")
-		if err != nil {
-			r.Error = awserr.New("SerializationError", "failed to decode REST XML response", err)
-			return
-		}
-	} else {
-		rest.Unmarshal(r)
-	}
-}
-
-// UnmarshalMeta unmarshals response headers for the REST XML protocol.
-func UnmarshalMeta(r *request.Request) {
-	rest.UnmarshalMeta(r)
-}
-
-// UnmarshalError unmarshals a response error for the REST XML protocol.
-func UnmarshalError(r *request.Request) {
-	query.UnmarshalError(r)
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/unmarshal.go
deleted file mode 100644
index da1a68111d..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/unmarshal.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package protocol
-
-import (
-	"io"
-	"io/ioutil"
-
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// UnmarshalDiscardBodyHandler is a named request handler to empty and close a response's body
-var UnmarshalDiscardBodyHandler = request.NamedHandler{Name: "awssdk.shared.UnmarshalDiscardBody", Fn: UnmarshalDiscardBody}
-
-// UnmarshalDiscardBody is a request handler to empty a response's body and closing it.
-func UnmarshalDiscardBody(r *request.Request) {
-	if r.HTTPResponse == nil || r.HTTPResponse.Body == nil {
-		return
-	}
-
-	io.Copy(ioutil.Discard, r.HTTPResponse.Body)
-	r.HTTPResponse.Body.Close()
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go
deleted file mode 100644
index 7091b456d1..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go
+++ /dev/null
@@ -1,296 +0,0 @@
-// Package xmlutil provides XML serialization of AWS requests and responses.
-package xmlutil
-
-import (
-	"encoding/base64"
-	"encoding/xml"
-	"fmt"
-	"reflect"
-	"sort"
-	"strconv"
-	"time"
-
-	"github.com/aws/aws-sdk-go/private/protocol"
-)
-
-// BuildXML will serialize params into an xml.Encoder.
-// Error will be returned if the serialization of any of the params or nested values fails.
-func BuildXML(params interface{}, e *xml.Encoder) error {
-	b := xmlBuilder{encoder: e, namespaces: map[string]string{}}
-	root := NewXMLElement(xml.Name{})
-	if err := b.buildValue(reflect.ValueOf(params), root, ""); err != nil {
-		return err
-	}
-	for _, c := range root.Children {
-		for _, v := range c {
-			return StructToXML(e, v, false)
-		}
-	}
-	return nil
-}
-
-// Returns the reflection element of a value, if it is a pointer.
-func elemOf(value reflect.Value) reflect.Value {
-	for value.Kind() == reflect.Ptr {
-		value = value.Elem()
-	}
-	return value
-}
-
-// A xmlBuilder serializes values from Go code to XML
-type xmlBuilder struct {
-	encoder    *xml.Encoder
-	namespaces map[string]string
-}
-
-// buildValue generic XMLNode builder for any type. Will build value for their specific type
-// struct, list, map, scalar.
-//
-// Also takes a "type" tag value to set what type a value should be converted to XMLNode as. If
-// type is not provided reflect will be used to determine the value's type.
-func (b *xmlBuilder) buildValue(value reflect.Value, current *XMLNode, tag reflect.StructTag) error {
-	value = elemOf(value)
-	if !value.IsValid() { // no need to handle zero values
-		return nil
-	} else if tag.Get("location") != "" { // don't handle non-body location values
-		return nil
-	}
-
-	t := tag.Get("type")
-	if t == "" {
-		switch value.Kind() {
-		case reflect.Struct:
-			t = "structure"
-		case reflect.Slice:
-			t = "list"
-		case reflect.Map:
-			t = "map"
-		}
-	}
-
-	switch t {
-	case "structure":
-		if field, ok := value.Type().FieldByName("_"); ok {
-			tag = tag + reflect.StructTag(" ") + field.Tag
-		}
-		return b.buildStruct(value, current, tag)
-	case "list":
-		return b.buildList(value, current, tag)
-	case "map":
-		return b.buildMap(value, current, tag)
-	default:
-		return b.buildScalar(value, current, tag)
-	}
-}
-
-// buildStruct adds a struct and its fields to the current XMLNode. All fields any any nested
-// types are converted to XMLNodes also.
-func (b *xmlBuilder) buildStruct(value reflect.Value, current *XMLNode, tag reflect.StructTag) error {
-	if !value.IsValid() {
-		return nil
-	}
-
-	fieldAdded := false
-
-	// unwrap payloads
-	if payload := tag.Get("payload"); payload != "" {
-		field, _ := value.Type().FieldByName(payload)
-		tag = field.Tag
-		value = elemOf(value.FieldByName(payload))
-
-		if !value.IsValid() {
-			return nil
-		}
-	}
-
-	child := NewXMLElement(xml.Name{Local: tag.Get("locationName")})
-
-	// there is an xmlNamespace associated with this struct
-	if prefix, uri := tag.Get("xmlPrefix"), tag.Get("xmlURI"); uri != "" {
-		ns := xml.Attr{
-			Name:  xml.Name{Local: "xmlns"},
-			Value: uri,
-		}
-		if prefix != "" {
-			b.namespaces[prefix] = uri // register the namespace
-			ns.Name.Local = "xmlns:" + prefix
-		}
-
-		child.Attr = append(child.Attr, ns)
-	}
-
-	t := value.Type()
-	for i := 0; i < value.NumField(); i++ {
-		member := elemOf(value.Field(i))
-		field := t.Field(i)
-
-		if field.PkgPath != "" {
-			continue // ignore unexported fields
-		}
-		if field.Tag.Get("ignore") != "" {
-			continue
-		}
-
-		mTag := field.Tag
-		if mTag.Get("location") != "" { // skip non-body members
-			continue
-		}
-
-		if protocol.CanSetIdempotencyToken(value.Field(i), field) {
-			token := protocol.GetIdempotencyToken()
-			member = reflect.ValueOf(token)
-		}
-
-		memberName := mTag.Get("locationName")
-		if memberName == "" {
-			memberName = field.Name
-			mTag = reflect.StructTag(string(mTag) + ` locationName:"` + memberName + `"`)
-		}
-		if err := b.buildValue(member, child, mTag); err != nil {
-			return err
-		}
-
-		fieldAdded = true
-	}
-
-	if fieldAdded { // only append this child if we have one ore more valid members
-		current.AddChild(child)
-	}
-
-	return nil
-}
-
-// buildList adds the value's list items to the current XMLNode as children nodes. All
-// nested values in the list are converted to XMLNodes also.
-func (b *xmlBuilder) buildList(value reflect.Value, current *XMLNode, tag reflect.StructTag) error {
-	if value.IsNil() { // don't build omitted lists
-		return nil
-	}
-
-	// check for unflattened list member
-	flattened := tag.Get("flattened") != ""
-
-	xname := xml.Name{Local: tag.Get("locationName")}
-	if flattened {
-		for i := 0; i < value.Len(); i++ {
-			child := NewXMLElement(xname)
-			current.AddChild(child)
-			if err := b.buildValue(value.Index(i), child, ""); err != nil {
-				return err
-			}
-		}
-	} else {
-		list := NewXMLElement(xname)
-		current.AddChild(list)
-
-		for i := 0; i < value.Len(); i++ {
-			iname := tag.Get("locationNameList")
-			if iname == "" {
-				iname = "member"
-			}
-
-			child := NewXMLElement(xml.Name{Local: iname})
-			list.AddChild(child)
-			if err := b.buildValue(value.Index(i), child, ""); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-// buildMap adds the value's key/value pairs to the current XMLNode as children nodes. All
-// nested values in the map are converted to XMLNodes also.
-//
-// Error will be returned if it is unable to build the map's values into XMLNodes
-func (b *xmlBuilder) buildMap(value reflect.Value, current *XMLNode, tag reflect.StructTag) error {
-	if value.IsNil() { // don't build omitted maps
-		return nil
-	}
-
-	maproot := NewXMLElement(xml.Name{Local: tag.Get("locationName")})
-	current.AddChild(maproot)
-	current = maproot
-
-	kname, vname := "key", "value"
-	if n := tag.Get("locationNameKey"); n != "" {
-		kname = n
-	}
-	if n := tag.Get("locationNameValue"); n != "" {
-		vname = n
-	}
-
-	// sorting is not required for compliance, but it makes testing easier
-	keys := make([]string, value.Len())
-	for i, k := range value.MapKeys() {
-		keys[i] = k.String()
-	}
-	sort.Strings(keys)
-
-	for _, k := range keys {
-		v := value.MapIndex(reflect.ValueOf(k))
-
-		mapcur := current
-		if tag.Get("flattened") == "" { // add "entry" tag to non-flat maps
-			child := NewXMLElement(xml.Name{Local: "entry"})
-			mapcur.AddChild(child)
-			mapcur = child
-		}
-
-		kchild := NewXMLElement(xml.Name{Local: kname})
-		kchild.Text = k
-		vchild := NewXMLElement(xml.Name{Local: vname})
-		mapcur.AddChild(kchild)
-		mapcur.AddChild(vchild)
-
-		if err := b.buildValue(v, vchild, ""); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// buildScalar will convert the value into a string and append it as a attribute or child
-// of the current XMLNode.
-//
-// The value will be added as an attribute if tag contains a "xmlAttribute" attribute value.
-//
-// Error will be returned if the value type is unsupported.
-func (b *xmlBuilder) buildScalar(value reflect.Value, current *XMLNode, tag reflect.StructTag) error {
-	var str string
-	switch converted := value.Interface().(type) {
-	case string:
-		str = converted
-	case []byte:
-		if !value.IsNil() {
-			str = base64.StdEncoding.EncodeToString(converted)
-		}
-	case bool:
-		str = strconv.FormatBool(converted)
-	case int64:
-		str = strconv.FormatInt(converted, 10)
-	case int:
-		str = strconv.Itoa(converted)
-	case float64:
-		str = strconv.FormatFloat(converted, 'f', -1, 64)
-	case float32:
-		str = strconv.FormatFloat(float64(converted), 'f', -1, 32)
-	case time.Time:
-		const ISO8601UTC = "2006-01-02T15:04:05Z"
-		str = converted.UTC().Format(ISO8601UTC)
-	default:
-		return fmt.Errorf("unsupported value for param %s: %v (%s)",
-			tag.Get("locationName"), value.Interface(), value.Type().Name())
-	}
-
-	xname := xml.Name{Local: tag.Get("locationName")}
-	if tag.Get("xmlAttribute") != "" { // put into current node's attribute list
-		attr := xml.Attr{Name: xname, Value: str}
-		current.Attr = append(current.Attr, attr)
-	} else { // regular text node
-		current.AddChild(&XMLNode{Name: xname, Text: str})
-	}
-	return nil
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go
deleted file mode 100644
index 87584628a2..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go
+++ /dev/null
@@ -1,260 +0,0 @@
-package xmlutil
-
-import (
-	"encoding/base64"
-	"encoding/xml"
-	"fmt"
-	"io"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// UnmarshalXML deserializes an xml.Decoder into the container v. V
-// needs to match the shape of the XML expected to be decoded.
-// If the shape doesn't match unmarshaling will fail.
-func UnmarshalXML(v interface{}, d *xml.Decoder, wrapper string) error {
-	n, err := XMLToStruct(d, nil)
-	if err != nil {
-		return err
-	}
-	if n.Children != nil {
-		for _, root := range n.Children {
-			for _, c := range root {
-				if wrappedChild, ok := c.Children[wrapper]; ok {
-					c = wrappedChild[0] // pull out wrapped element
-				}
-
-				err = parse(reflect.ValueOf(v), c, "")
-				if err != nil {
-					if err == io.EOF {
-						return nil
-					}
-					return err
-				}
-			}
-		}
-		return nil
-	}
-	return nil
-}
-
-// parse deserializes any value from the XMLNode. The type tag is used to infer the type, or reflect
-// will be used to determine the type from r.
-func parse(r reflect.Value, node *XMLNode, tag reflect.StructTag) error {
-	rtype := r.Type()
-	if rtype.Kind() == reflect.Ptr {
-		rtype = rtype.Elem() // check kind of actual element type
-	}
-
-	t := tag.Get("type")
-	if t == "" {
-		switch rtype.Kind() {
-		case reflect.Struct:
-			t = "structure"
-		case reflect.Slice:
-			t = "list"
-		case reflect.Map:
-			t = "map"
-		}
-	}
-
-	switch t {
-	case "structure":
-		if field, ok := rtype.FieldByName("_"); ok {
-			tag = field.Tag
-		}
-		return parseStruct(r, node, tag)
-	case "list":
-		return parseList(r, node, tag)
-	case "map":
-		return parseMap(r, node, tag)
-	default:
-		return parseScalar(r, node, tag)
-	}
-}
-
-// parseStruct deserializes a structure and its fields from an XMLNode. Any nested
-// types in the structure will also be deserialized.
-func parseStruct(r reflect.Value, node *XMLNode, tag reflect.StructTag) error {
-	t := r.Type()
-	if r.Kind() == reflect.Ptr {
-		if r.IsNil() { // create the structure if it's nil
-			s := reflect.New(r.Type().Elem())
-			r.Set(s)
-			r = s
-		}
-
-		r = r.Elem()
-		t = t.Elem()
-	}
-
-	// unwrap any payloads
-	if payload := tag.Get("payload"); payload != "" {
-		field, _ := t.FieldByName(payload)
-		return parseStruct(r.FieldByName(payload), node, field.Tag)
-	}
-
-	for i := 0; i < t.NumField(); i++ {
-		field := t.Field(i)
-		if c := field.Name[0:1]; strings.ToLower(c) == c {
-			continue // ignore unexported fields
-		}
-
-		// figure out what this field is called
-		name := field.Name
-		if field.Tag.Get("flattened") != "" && field.Tag.Get("locationNameList") != "" {
-			name = field.Tag.Get("locationNameList")
-		} else if locName := field.Tag.Get("locationName"); locName != "" {
-			name = locName
-		}
-
-		// try to find the field by name in elements
-		elems := node.Children[name]
-
-		if elems == nil { // try to find the field in attributes
-			if val, ok := node.findElem(name); ok {
-				elems = []*XMLNode{{Text: val}}
-			}
-		}
-
-		member := r.FieldByName(field.Name)
-		for _, elem := range elems {
-			err := parse(member, elem, field.Tag)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-// parseList deserializes a list of values from an XML node. Each list entry
-// will also be deserialized.
-func parseList(r reflect.Value, node *XMLNode, tag reflect.StructTag) error {
-	t := r.Type()
-
-	if tag.Get("flattened") == "" { // look at all item entries
-		mname := "member"
-		if name := tag.Get("locationNameList"); name != "" {
-			mname = name
-		}
-
-		if Children, ok := node.Children[mname]; ok {
-			if r.IsNil() {
-				r.Set(reflect.MakeSlice(t, len(Children), len(Children)))
-			}
-
-			for i, c := range Children {
-				err := parse(r.Index(i), c, "")
-				if err != nil {
-					return err
-				}
-			}
-		}
-	} else { // flattened list means this is a single element
-		if r.IsNil() {
-			r.Set(reflect.MakeSlice(t, 0, 0))
-		}
-
-		childR := reflect.Zero(t.Elem())
-		r.Set(reflect.Append(r, childR))
-		err := parse(r.Index(r.Len()-1), node, "")
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// parseMap deserializes a map from an XMLNode. The direct children of the XMLNode
-// will also be deserialized as map entries.
-func parseMap(r reflect.Value, node *XMLNode, tag reflect.StructTag) error {
-	if r.IsNil() {
-		r.Set(reflect.MakeMap(r.Type()))
-	}
-
-	if tag.Get("flattened") == "" { // look at all child entries
-		for _, entry := range node.Children["entry"] {
-			parseMapEntry(r, entry, tag)
-		}
-	} else { // this element is itself an entry
-		parseMapEntry(r, node, tag)
-	}
-
-	return nil
-}
-
-// parseMapEntry deserializes a map entry from a XML node.
-func parseMapEntry(r reflect.Value, node *XMLNode, tag reflect.StructTag) error {
-	kname, vname := "key", "value"
-	if n := tag.Get("locationNameKey"); n != "" {
-		kname = n
-	}
-	if n := tag.Get("locationNameValue"); n != "" {
-		vname = n
-	}
-
-	keys, ok := node.Children[kname]
-	values := node.Children[vname]
-	if ok {
-		for i, key := range keys {
-			keyR := reflect.ValueOf(key.Text)
-			value := values[i]
-			valueR := reflect.New(r.Type().Elem()).Elem()
-
-			parse(valueR, value, "")
-			r.SetMapIndex(keyR, valueR)
-		}
-	}
-	return nil
-}
-
-// parseScaller deserializes an XMLNode value into a concrete type based on the
-// interface type of r.
-//
-// Error is returned if the deserialization fails due to invalid type conversion,
-// or unsupported interface type.
-func parseScalar(r reflect.Value, node *XMLNode, tag reflect.StructTag) error {
-	switch r.Interface().(type) {
-	case *string:
-		r.Set(reflect.ValueOf(&node.Text))
-		return nil
-	case []byte:
-		b, err := base64.StdEncoding.DecodeString(node.Text)
-		if err != nil {
-			return err
-		}
-		r.Set(reflect.ValueOf(b))
-	case *bool:
-		v, err := strconv.ParseBool(node.Text)
-		if err != nil {
-			return err
-		}
-		r.Set(reflect.ValueOf(&v))
-	case *int64:
-		v, err := strconv.ParseInt(node.Text, 10, 64)
-		if err != nil {
-			return err
-		}
-		r.Set(reflect.ValueOf(&v))
-	case *float64:
-		v, err := strconv.ParseFloat(node.Text, 64)
-		if err != nil {
-			return err
-		}
-		r.Set(reflect.ValueOf(&v))
-	case *time.Time:
-		const ISO8601UTC = "2006-01-02T15:04:05Z"
-		t, err := time.Parse(ISO8601UTC, node.Text)
-		if err != nil {
-			return err
-		}
-		r.Set(reflect.ValueOf(&t))
-	default:
-		return fmt.Errorf("unsupported value: %v (%s)", r.Interface(), r.Type())
-	}
-	return nil
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go
deleted file mode 100644
index 3e970b629d..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package xmlutil
-
-import (
-	"encoding/xml"
-	"fmt"
-	"io"
-	"sort"
-)
-
-// A XMLNode contains the values to be encoded or decoded.
-type XMLNode struct {
-	Name     xml.Name              `json:",omitempty"`
-	Children map[string][]*XMLNode `json:",omitempty"`
-	Text     string                `json:",omitempty"`
-	Attr     []xml.Attr            `json:",omitempty"`
-
-	namespaces map[string]string
-	parent     *XMLNode
-}
-
-// NewXMLElement returns a pointer to a new XMLNode initialized to default values.
-func NewXMLElement(name xml.Name) *XMLNode {
-	return &XMLNode{
-		Name:     name,
-		Children: map[string][]*XMLNode{},
-		Attr:     []xml.Attr{},
-	}
-}
-
-// AddChild adds child to the XMLNode.
-func (n *XMLNode) AddChild(child *XMLNode) {
-	if _, ok := n.Children[child.Name.Local]; !ok {
-		n.Children[child.Name.Local] = []*XMLNode{}
-	}
-	n.Children[child.Name.Local] = append(n.Children[child.Name.Local], child)
-}
-
-// XMLToStruct converts a xml.Decoder stream to XMLNode with nested values.
-func XMLToStruct(d *xml.Decoder, s *xml.StartElement) (*XMLNode, error) {
-	out := &XMLNode{}
-	for {
-		tok, err := d.Token()
-		if err != nil {
-			if err == io.EOF {
-				break
-			} else {
-				return out, err
-			}
-		}
-
-		if tok == nil {
-			break
-		}
-
-		switch typed := tok.(type) {
-		case xml.CharData:
-			out.Text = string(typed.Copy())
-		case xml.StartElement:
-			el := typed.Copy()
-			out.Attr = el.Attr
-			if out.Children == nil {
-				out.Children = map[string][]*XMLNode{}
-			}
-
-			name := typed.Name.Local
-			slice := out.Children[name]
-			if slice == nil {
-				slice = []*XMLNode{}
-			}
-			node, e := XMLToStruct(d, &el)
-			out.findNamespaces()
-			if e != nil {
-				return out, e
-			}
-			node.Name = typed.Name
-			node.findNamespaces()
-			tempOut := *out
-			// Save into a temp variable, simply because out gets squashed during
-			// loop iterations
-			node.parent = &tempOut
-			slice = append(slice, node)
-			out.Children[name] = slice
-		case xml.EndElement:
-			if s != nil && s.Name.Local == typed.Name.Local { // matching end token
-				return out, nil
-			}
-			out = &XMLNode{}
-		}
-	}
-	return out, nil
-}
-
-func (n *XMLNode) findNamespaces() {
-	ns := map[string]string{}
-	for _, a := range n.Attr {
-		if a.Name.Space == "xmlns" {
-			ns[a.Value] = a.Name.Local
-		}
-	}
-
-	n.namespaces = ns
-}
-
-func (n *XMLNode) findElem(name string) (string, bool) {
-	for node := n; node != nil; node = node.parent {
-		for _, a := range node.Attr {
-			namespace := a.Name.Space
-			if v, ok := node.namespaces[namespace]; ok {
-				namespace = v
-			}
-			if name == fmt.Sprintf("%s:%s", namespace, a.Name.Local) {
-				return a.Value, true
-			}
-		}
-	}
-	return "", false
-}
-
-// StructToXML writes an XMLNode to a xml.Encoder as tokens.
-func StructToXML(e *xml.Encoder, node *XMLNode, sorted bool) error {
-	e.EncodeToken(xml.StartElement{Name: node.Name, Attr: node.Attr})
-
-	if node.Text != "" {
-		e.EncodeToken(xml.CharData([]byte(node.Text)))
-	} else if sorted {
-		sortedNames := []string{}
-		for k := range node.Children {
-			sortedNames = append(sortedNames, k)
-		}
-		sort.Strings(sortedNames)
-
-		for _, k := range sortedNames {
-			for _, v := range node.Children[k] {
-				StructToXML(e, v, sorted)
-			}
-		}
-	} else {
-		for _, c := range node.Children {
-			for _, v := range c {
-				StructToXML(e, v, sorted)
-			}
-		}
-	}
-
-	e.EncodeToken(xml.EndElement{Name: node.Name})
-	return e.Flush()
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/api.go b/vendor/github.com/aws/aws-sdk-go/service/s3/api.go
deleted file mode 100644
index 564a39651c..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/api.go
+++ /dev/null
@@ -1,21374 +0,0 @@
-// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT.
-
-package s3
-
-import (
-	"fmt"
-	"io"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awsutil"
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/private/protocol"
-	"github.com/aws/aws-sdk-go/private/protocol/restxml"
-)
-
-const opAbortMultipartUpload = "AbortMultipartUpload"
-
-// AbortMultipartUploadRequest generates a "aws/request.Request" representing the
-// client's request for the AbortMultipartUpload operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See AbortMultipartUpload for more information on using the AbortMultipartUpload
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the AbortMultipartUploadRequest method.
-//    req, resp := client.AbortMultipartUploadRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AbortMultipartUpload
-func (c *S3) AbortMultipartUploadRequest(input *AbortMultipartUploadInput) (req *request.Request, output *AbortMultipartUploadOutput) {
-	op := &request.Operation{
-		Name:       opAbortMultipartUpload,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}/{Key+}",
-	}
-
-	if input == nil {
-		input = &AbortMultipartUploadInput{}
-	}
-
-	output = &AbortMultipartUploadOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// AbortMultipartUpload API operation for Amazon Simple Storage Service.
-//
-// Aborts a multipart upload.
-//
-// To verify that all parts have been removed, so you don't get charged for
-// the part storage, you should call the List Parts operation and ensure the
-// parts list is empty.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation AbortMultipartUpload for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeNoSuchUpload "NoSuchUpload"
-//   The specified multipart upload does not exist.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AbortMultipartUpload
-func (c *S3) AbortMultipartUpload(input *AbortMultipartUploadInput) (*AbortMultipartUploadOutput, error) {
-	req, out := c.AbortMultipartUploadRequest(input)
-	return out, req.Send()
-}
-
-// AbortMultipartUploadWithContext is the same as AbortMultipartUpload with the addition of
-// the ability to pass a context and additional request options.
-//
-// See AbortMultipartUpload for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) AbortMultipartUploadWithContext(ctx aws.Context, input *AbortMultipartUploadInput, opts ...request.Option) (*AbortMultipartUploadOutput, error) {
-	req, out := c.AbortMultipartUploadRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opCompleteMultipartUpload = "CompleteMultipartUpload"
-
-// CompleteMultipartUploadRequest generates a "aws/request.Request" representing the
-// client's request for the CompleteMultipartUpload operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See CompleteMultipartUpload for more information on using the CompleteMultipartUpload
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the CompleteMultipartUploadRequest method.
-//    req, resp := client.CompleteMultipartUploadRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompleteMultipartUpload
-func (c *S3) CompleteMultipartUploadRequest(input *CompleteMultipartUploadInput) (req *request.Request, output *CompleteMultipartUploadOutput) {
-	op := &request.Operation{
-		Name:       opCompleteMultipartUpload,
-		HTTPMethod: "POST",
-		HTTPPath:   "/{Bucket}/{Key+}",
-	}
-
-	if input == nil {
-		input = &CompleteMultipartUploadInput{}
-	}
-
-	output = &CompleteMultipartUploadOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// CompleteMultipartUpload API operation for Amazon Simple Storage Service.
-//
-// Completes a multipart upload by assembling previously uploaded parts.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation CompleteMultipartUpload for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompleteMultipartUpload
-func (c *S3) CompleteMultipartUpload(input *CompleteMultipartUploadInput) (*CompleteMultipartUploadOutput, error) {
-	req, out := c.CompleteMultipartUploadRequest(input)
-	return out, req.Send()
-}
-
-// CompleteMultipartUploadWithContext is the same as CompleteMultipartUpload with the addition of
-// the ability to pass a context and additional request options.
-//
-// See CompleteMultipartUpload for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) CompleteMultipartUploadWithContext(ctx aws.Context, input *CompleteMultipartUploadInput, opts ...request.Option) (*CompleteMultipartUploadOutput, error) {
-	req, out := c.CompleteMultipartUploadRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opCopyObject = "CopyObject"
-
-// CopyObjectRequest generates a "aws/request.Request" representing the
-// client's request for the CopyObject operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See CopyObject for more information on using the CopyObject
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the CopyObjectRequest method.
-//    req, resp := client.CopyObjectRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObject
-func (c *S3) CopyObjectRequest(input *CopyObjectInput) (req *request.Request, output *CopyObjectOutput) {
-	op := &request.Operation{
-		Name:       opCopyObject,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}/{Key+}",
-	}
-
-	if input == nil {
-		input = &CopyObjectInput{}
-	}
-
-	output = &CopyObjectOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// CopyObject API operation for Amazon Simple Storage Service.
-//
-// Creates a copy of an object that is already stored in Amazon S3.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation CopyObject for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeObjectNotInActiveTierError "ObjectNotInActiveTierError"
-//   The source object of the COPY operation is not in the active tier and is
-//   only stored in Amazon Glacier.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObject
-func (c *S3) CopyObject(input *CopyObjectInput) (*CopyObjectOutput, error) {
-	req, out := c.CopyObjectRequest(input)
-	return out, req.Send()
-}
-
-// CopyObjectWithContext is the same as CopyObject with the addition of
-// the ability to pass a context and additional request options.
-//
-// See CopyObject for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) CopyObjectWithContext(ctx aws.Context, input *CopyObjectInput, opts ...request.Option) (*CopyObjectOutput, error) {
-	req, out := c.CopyObjectRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opCreateBucket = "CreateBucket"
-
-// CreateBucketRequest generates a "aws/request.Request" representing the
-// client's request for the CreateBucket operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See CreateBucket for more information on using the CreateBucket
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the CreateBucketRequest method.
-//    req, resp := client.CreateBucketRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateBucket
-func (c *S3) CreateBucketRequest(input *CreateBucketInput) (req *request.Request, output *CreateBucketOutput) {
-	op := &request.Operation{
-		Name:       opCreateBucket,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}",
-	}
-
-	if input == nil {
-		input = &CreateBucketInput{}
-	}
-
-	output = &CreateBucketOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// CreateBucket API operation for Amazon Simple Storage Service.
-//
-// Creates a new bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation CreateBucket for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeBucketAlreadyExists "BucketAlreadyExists"
-//   The requested bucket name is not available. The bucket namespace is shared
-//   by all users of the system. Please select a different name and try again.
-//
-//   * ErrCodeBucketAlreadyOwnedByYou "BucketAlreadyOwnedByYou"
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateBucket
-func (c *S3) CreateBucket(input *CreateBucketInput) (*CreateBucketOutput, error) {
-	req, out := c.CreateBucketRequest(input)
-	return out, req.Send()
-}
-
-// CreateBucketWithContext is the same as CreateBucket with the addition of
-// the ability to pass a context and additional request options.
-//
-// See CreateBucket for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) CreateBucketWithContext(ctx aws.Context, input *CreateBucketInput, opts ...request.Option) (*CreateBucketOutput, error) {
-	req, out := c.CreateBucketRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opCreateMultipartUpload = "CreateMultipartUpload"
-
-// CreateMultipartUploadRequest generates a "aws/request.Request" representing the
-// client's request for the CreateMultipartUpload operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See CreateMultipartUpload for more information on using the CreateMultipartUpload
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the CreateMultipartUploadRequest method.
-//    req, resp := client.CreateMultipartUploadRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateMultipartUpload
-func (c *S3) CreateMultipartUploadRequest(input *CreateMultipartUploadInput) (req *request.Request, output *CreateMultipartUploadOutput) {
-	op := &request.Operation{
-		Name:       opCreateMultipartUpload,
-		HTTPMethod: "POST",
-		HTTPPath:   "/{Bucket}/{Key+}?uploads",
-	}
-
-	if input == nil {
-		input = &CreateMultipartUploadInput{}
-	}
-
-	output = &CreateMultipartUploadOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// CreateMultipartUpload API operation for Amazon Simple Storage Service.
-//
-// Initiates a multipart upload and returns an upload ID.
-//
-// Note: After you initiate multipart upload and upload one or more parts, you
-// must either complete or abort multipart upload in order to stop getting charged
-// for storage of the uploaded parts. Only after you either complete or abort
-// multipart upload, Amazon S3 frees up the parts storage and stops charging
-// you for the parts storage.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation CreateMultipartUpload for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateMultipartUpload
-func (c *S3) CreateMultipartUpload(input *CreateMultipartUploadInput) (*CreateMultipartUploadOutput, error) {
-	req, out := c.CreateMultipartUploadRequest(input)
-	return out, req.Send()
-}
-
-// CreateMultipartUploadWithContext is the same as CreateMultipartUpload with the addition of
-// the ability to pass a context and additional request options.
-//
-// See CreateMultipartUpload for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) CreateMultipartUploadWithContext(ctx aws.Context, input *CreateMultipartUploadInput, opts ...request.Option) (*CreateMultipartUploadOutput, error) {
-	req, out := c.CreateMultipartUploadRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteBucket = "DeleteBucket"
-
-// DeleteBucketRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteBucket operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteBucket for more information on using the DeleteBucket
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteBucketRequest method.
-//    req, resp := client.DeleteBucketRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucket
-func (c *S3) DeleteBucketRequest(input *DeleteBucketInput) (req *request.Request, output *DeleteBucketOutput) {
-	op := &request.Operation{
-		Name:       opDeleteBucket,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}",
-	}
-
-	if input == nil {
-		input = &DeleteBucketInput{}
-	}
-
-	output = &DeleteBucketOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// DeleteBucket API operation for Amazon Simple Storage Service.
-//
-// Deletes the bucket. All objects (including all object versions and Delete
-// Markers) in the bucket must be deleted before the bucket itself can be deleted.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteBucket for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucket
-func (c *S3) DeleteBucket(input *DeleteBucketInput) (*DeleteBucketOutput, error) {
-	req, out := c.DeleteBucketRequest(input)
-	return out, req.Send()
-}
-
-// DeleteBucketWithContext is the same as DeleteBucket with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteBucket for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteBucketWithContext(ctx aws.Context, input *DeleteBucketInput, opts ...request.Option) (*DeleteBucketOutput, error) {
-	req, out := c.DeleteBucketRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteBucketAnalyticsConfiguration = "DeleteBucketAnalyticsConfiguration"
-
-// DeleteBucketAnalyticsConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteBucketAnalyticsConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteBucketAnalyticsConfiguration for more information on using the DeleteBucketAnalyticsConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteBucketAnalyticsConfigurationRequest method.
-//    req, resp := client.DeleteBucketAnalyticsConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketAnalyticsConfiguration
-func (c *S3) DeleteBucketAnalyticsConfigurationRequest(input *DeleteBucketAnalyticsConfigurationInput) (req *request.Request, output *DeleteBucketAnalyticsConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opDeleteBucketAnalyticsConfiguration,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}?analytics",
-	}
-
-	if input == nil {
-		input = &DeleteBucketAnalyticsConfigurationInput{}
-	}
-
-	output = &DeleteBucketAnalyticsConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// DeleteBucketAnalyticsConfiguration API operation for Amazon Simple Storage Service.
-//
-// Deletes an analytics configuration for the bucket (specified by the analytics
-// configuration ID).
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteBucketAnalyticsConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketAnalyticsConfiguration
-func (c *S3) DeleteBucketAnalyticsConfiguration(input *DeleteBucketAnalyticsConfigurationInput) (*DeleteBucketAnalyticsConfigurationOutput, error) {
-	req, out := c.DeleteBucketAnalyticsConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// DeleteBucketAnalyticsConfigurationWithContext is the same as DeleteBucketAnalyticsConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteBucketAnalyticsConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteBucketAnalyticsConfigurationWithContext(ctx aws.Context, input *DeleteBucketAnalyticsConfigurationInput, opts ...request.Option) (*DeleteBucketAnalyticsConfigurationOutput, error) {
-	req, out := c.DeleteBucketAnalyticsConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteBucketCors = "DeleteBucketCors"
-
-// DeleteBucketCorsRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteBucketCors operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteBucketCors for more information on using the DeleteBucketCors
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteBucketCorsRequest method.
-//    req, resp := client.DeleteBucketCorsRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketCors
-func (c *S3) DeleteBucketCorsRequest(input *DeleteBucketCorsInput) (req *request.Request, output *DeleteBucketCorsOutput) {
-	op := &request.Operation{
-		Name:       opDeleteBucketCors,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}?cors",
-	}
-
-	if input == nil {
-		input = &DeleteBucketCorsInput{}
-	}
-
-	output = &DeleteBucketCorsOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// DeleteBucketCors API operation for Amazon Simple Storage Service.
-//
-// Deletes the cors configuration information set for the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteBucketCors for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketCors
-func (c *S3) DeleteBucketCors(input *DeleteBucketCorsInput) (*DeleteBucketCorsOutput, error) {
-	req, out := c.DeleteBucketCorsRequest(input)
-	return out, req.Send()
-}
-
-// DeleteBucketCorsWithContext is the same as DeleteBucketCors with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteBucketCors for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteBucketCorsWithContext(ctx aws.Context, input *DeleteBucketCorsInput, opts ...request.Option) (*DeleteBucketCorsOutput, error) {
-	req, out := c.DeleteBucketCorsRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteBucketEncryption = "DeleteBucketEncryption"
-
-// DeleteBucketEncryptionRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteBucketEncryption operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteBucketEncryption for more information on using the DeleteBucketEncryption
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteBucketEncryptionRequest method.
-//    req, resp := client.DeleteBucketEncryptionRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketEncryption
-func (c *S3) DeleteBucketEncryptionRequest(input *DeleteBucketEncryptionInput) (req *request.Request, output *DeleteBucketEncryptionOutput) {
-	op := &request.Operation{
-		Name:       opDeleteBucketEncryption,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}?encryption",
-	}
-
-	if input == nil {
-		input = &DeleteBucketEncryptionInput{}
-	}
-
-	output = &DeleteBucketEncryptionOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// DeleteBucketEncryption API operation for Amazon Simple Storage Service.
-//
-// Deletes the server-side encryption configuration from the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteBucketEncryption for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketEncryption
-func (c *S3) DeleteBucketEncryption(input *DeleteBucketEncryptionInput) (*DeleteBucketEncryptionOutput, error) {
-	req, out := c.DeleteBucketEncryptionRequest(input)
-	return out, req.Send()
-}
-
-// DeleteBucketEncryptionWithContext is the same as DeleteBucketEncryption with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteBucketEncryption for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteBucketEncryptionWithContext(ctx aws.Context, input *DeleteBucketEncryptionInput, opts ...request.Option) (*DeleteBucketEncryptionOutput, error) {
-	req, out := c.DeleteBucketEncryptionRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteBucketInventoryConfiguration = "DeleteBucketInventoryConfiguration"
-
-// DeleteBucketInventoryConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteBucketInventoryConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteBucketInventoryConfiguration for more information on using the DeleteBucketInventoryConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteBucketInventoryConfigurationRequest method.
-//    req, resp := client.DeleteBucketInventoryConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketInventoryConfiguration
-func (c *S3) DeleteBucketInventoryConfigurationRequest(input *DeleteBucketInventoryConfigurationInput) (req *request.Request, output *DeleteBucketInventoryConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opDeleteBucketInventoryConfiguration,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}?inventory",
-	}
-
-	if input == nil {
-		input = &DeleteBucketInventoryConfigurationInput{}
-	}
-
-	output = &DeleteBucketInventoryConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// DeleteBucketInventoryConfiguration API operation for Amazon Simple Storage Service.
-//
-// Deletes an inventory configuration (identified by the inventory ID) from
-// the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteBucketInventoryConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketInventoryConfiguration
-func (c *S3) DeleteBucketInventoryConfiguration(input *DeleteBucketInventoryConfigurationInput) (*DeleteBucketInventoryConfigurationOutput, error) {
-	req, out := c.DeleteBucketInventoryConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// DeleteBucketInventoryConfigurationWithContext is the same as DeleteBucketInventoryConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteBucketInventoryConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteBucketInventoryConfigurationWithContext(ctx aws.Context, input *DeleteBucketInventoryConfigurationInput, opts ...request.Option) (*DeleteBucketInventoryConfigurationOutput, error) {
-	req, out := c.DeleteBucketInventoryConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteBucketLifecycle = "DeleteBucketLifecycle"
-
-// DeleteBucketLifecycleRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteBucketLifecycle operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteBucketLifecycle for more information on using the DeleteBucketLifecycle
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteBucketLifecycleRequest method.
-//    req, resp := client.DeleteBucketLifecycleRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketLifecycle
-func (c *S3) DeleteBucketLifecycleRequest(input *DeleteBucketLifecycleInput) (req *request.Request, output *DeleteBucketLifecycleOutput) {
-	op := &request.Operation{
-		Name:       opDeleteBucketLifecycle,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}?lifecycle",
-	}
-
-	if input == nil {
-		input = &DeleteBucketLifecycleInput{}
-	}
-
-	output = &DeleteBucketLifecycleOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// DeleteBucketLifecycle API operation for Amazon Simple Storage Service.
-//
-// Deletes the lifecycle configuration from the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteBucketLifecycle for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketLifecycle
-func (c *S3) DeleteBucketLifecycle(input *DeleteBucketLifecycleInput) (*DeleteBucketLifecycleOutput, error) {
-	req, out := c.DeleteBucketLifecycleRequest(input)
-	return out, req.Send()
-}
-
-// DeleteBucketLifecycleWithContext is the same as DeleteBucketLifecycle with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteBucketLifecycle for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteBucketLifecycleWithContext(ctx aws.Context, input *DeleteBucketLifecycleInput, opts ...request.Option) (*DeleteBucketLifecycleOutput, error) {
-	req, out := c.DeleteBucketLifecycleRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteBucketMetricsConfiguration = "DeleteBucketMetricsConfiguration"
-
-// DeleteBucketMetricsConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteBucketMetricsConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteBucketMetricsConfiguration for more information on using the DeleteBucketMetricsConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteBucketMetricsConfigurationRequest method.
-//    req, resp := client.DeleteBucketMetricsConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketMetricsConfiguration
-func (c *S3) DeleteBucketMetricsConfigurationRequest(input *DeleteBucketMetricsConfigurationInput) (req *request.Request, output *DeleteBucketMetricsConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opDeleteBucketMetricsConfiguration,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}?metrics",
-	}
-
-	if input == nil {
-		input = &DeleteBucketMetricsConfigurationInput{}
-	}
-
-	output = &DeleteBucketMetricsConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// DeleteBucketMetricsConfiguration API operation for Amazon Simple Storage Service.
-//
-// Deletes a metrics configuration (specified by the metrics configuration ID)
-// from the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteBucketMetricsConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketMetricsConfiguration
-func (c *S3) DeleteBucketMetricsConfiguration(input *DeleteBucketMetricsConfigurationInput) (*DeleteBucketMetricsConfigurationOutput, error) {
-	req, out := c.DeleteBucketMetricsConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// DeleteBucketMetricsConfigurationWithContext is the same as DeleteBucketMetricsConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteBucketMetricsConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteBucketMetricsConfigurationWithContext(ctx aws.Context, input *DeleteBucketMetricsConfigurationInput, opts ...request.Option) (*DeleteBucketMetricsConfigurationOutput, error) {
-	req, out := c.DeleteBucketMetricsConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteBucketPolicy = "DeleteBucketPolicy"
-
-// DeleteBucketPolicyRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteBucketPolicy operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteBucketPolicy for more information on using the DeleteBucketPolicy
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteBucketPolicyRequest method.
-//    req, resp := client.DeleteBucketPolicyRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketPolicy
-func (c *S3) DeleteBucketPolicyRequest(input *DeleteBucketPolicyInput) (req *request.Request, output *DeleteBucketPolicyOutput) {
-	op := &request.Operation{
-		Name:       opDeleteBucketPolicy,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}?policy",
-	}
-
-	if input == nil {
-		input = &DeleteBucketPolicyInput{}
-	}
-
-	output = &DeleteBucketPolicyOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// DeleteBucketPolicy API operation for Amazon Simple Storage Service.
-//
-// Deletes the policy from the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteBucketPolicy for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketPolicy
-func (c *S3) DeleteBucketPolicy(input *DeleteBucketPolicyInput) (*DeleteBucketPolicyOutput, error) {
-	req, out := c.DeleteBucketPolicyRequest(input)
-	return out, req.Send()
-}
-
-// DeleteBucketPolicyWithContext is the same as DeleteBucketPolicy with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteBucketPolicy for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteBucketPolicyWithContext(ctx aws.Context, input *DeleteBucketPolicyInput, opts ...request.Option) (*DeleteBucketPolicyOutput, error) {
-	req, out := c.DeleteBucketPolicyRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteBucketReplication = "DeleteBucketReplication"
-
-// DeleteBucketReplicationRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteBucketReplication operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteBucketReplication for more information on using the DeleteBucketReplication
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteBucketReplicationRequest method.
-//    req, resp := client.DeleteBucketReplicationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketReplication
-func (c *S3) DeleteBucketReplicationRequest(input *DeleteBucketReplicationInput) (req *request.Request, output *DeleteBucketReplicationOutput) {
-	op := &request.Operation{
-		Name:       opDeleteBucketReplication,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}?replication",
-	}
-
-	if input == nil {
-		input = &DeleteBucketReplicationInput{}
-	}
-
-	output = &DeleteBucketReplicationOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// DeleteBucketReplication API operation for Amazon Simple Storage Service.
-//
-// Deletes the replication configuration from the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteBucketReplication for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketReplication
-func (c *S3) DeleteBucketReplication(input *DeleteBucketReplicationInput) (*DeleteBucketReplicationOutput, error) {
-	req, out := c.DeleteBucketReplicationRequest(input)
-	return out, req.Send()
-}
-
-// DeleteBucketReplicationWithContext is the same as DeleteBucketReplication with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteBucketReplication for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteBucketReplicationWithContext(ctx aws.Context, input *DeleteBucketReplicationInput, opts ...request.Option) (*DeleteBucketReplicationOutput, error) {
-	req, out := c.DeleteBucketReplicationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteBucketTagging = "DeleteBucketTagging"
-
-// DeleteBucketTaggingRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteBucketTagging operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteBucketTagging for more information on using the DeleteBucketTagging
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteBucketTaggingRequest method.
-//    req, resp := client.DeleteBucketTaggingRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketTagging
-func (c *S3) DeleteBucketTaggingRequest(input *DeleteBucketTaggingInput) (req *request.Request, output *DeleteBucketTaggingOutput) {
-	op := &request.Operation{
-		Name:       opDeleteBucketTagging,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}?tagging",
-	}
-
-	if input == nil {
-		input = &DeleteBucketTaggingInput{}
-	}
-
-	output = &DeleteBucketTaggingOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// DeleteBucketTagging API operation for Amazon Simple Storage Service.
-//
-// Deletes the tags from the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteBucketTagging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketTagging
-func (c *S3) DeleteBucketTagging(input *DeleteBucketTaggingInput) (*DeleteBucketTaggingOutput, error) {
-	req, out := c.DeleteBucketTaggingRequest(input)
-	return out, req.Send()
-}
-
-// DeleteBucketTaggingWithContext is the same as DeleteBucketTagging with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteBucketTagging for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteBucketTaggingWithContext(ctx aws.Context, input *DeleteBucketTaggingInput, opts ...request.Option) (*DeleteBucketTaggingOutput, error) {
-	req, out := c.DeleteBucketTaggingRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteBucketWebsite = "DeleteBucketWebsite"
-
-// DeleteBucketWebsiteRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteBucketWebsite operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteBucketWebsite for more information on using the DeleteBucketWebsite
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteBucketWebsiteRequest method.
-//    req, resp := client.DeleteBucketWebsiteRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketWebsite
-func (c *S3) DeleteBucketWebsiteRequest(input *DeleteBucketWebsiteInput) (req *request.Request, output *DeleteBucketWebsiteOutput) {
-	op := &request.Operation{
-		Name:       opDeleteBucketWebsite,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}?website",
-	}
-
-	if input == nil {
-		input = &DeleteBucketWebsiteInput{}
-	}
-
-	output = &DeleteBucketWebsiteOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// DeleteBucketWebsite API operation for Amazon Simple Storage Service.
-//
-// This operation removes the website configuration from the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteBucketWebsite for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketWebsite
-func (c *S3) DeleteBucketWebsite(input *DeleteBucketWebsiteInput) (*DeleteBucketWebsiteOutput, error) {
-	req, out := c.DeleteBucketWebsiteRequest(input)
-	return out, req.Send()
-}
-
-// DeleteBucketWebsiteWithContext is the same as DeleteBucketWebsite with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteBucketWebsite for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteBucketWebsiteWithContext(ctx aws.Context, input *DeleteBucketWebsiteInput, opts ...request.Option) (*DeleteBucketWebsiteOutput, error) {
-	req, out := c.DeleteBucketWebsiteRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteObject = "DeleteObject"
-
-// DeleteObjectRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteObject operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteObject for more information on using the DeleteObject
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteObjectRequest method.
-//    req, resp := client.DeleteObjectRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObject
-func (c *S3) DeleteObjectRequest(input *DeleteObjectInput) (req *request.Request, output *DeleteObjectOutput) {
-	op := &request.Operation{
-		Name:       opDeleteObject,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}/{Key+}",
-	}
-
-	if input == nil {
-		input = &DeleteObjectInput{}
-	}
-
-	output = &DeleteObjectOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// DeleteObject API operation for Amazon Simple Storage Service.
-//
-// Removes the null version (if there is one) of an object and inserts a delete
-// marker, which becomes the latest version of the object. If there isn't a
-// null version, Amazon S3 does not remove any objects.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteObject for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObject
-func (c *S3) DeleteObject(input *DeleteObjectInput) (*DeleteObjectOutput, error) {
-	req, out := c.DeleteObjectRequest(input)
-	return out, req.Send()
-}
-
-// DeleteObjectWithContext is the same as DeleteObject with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteObject for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteObjectWithContext(ctx aws.Context, input *DeleteObjectInput, opts ...request.Option) (*DeleteObjectOutput, error) {
-	req, out := c.DeleteObjectRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteObjectTagging = "DeleteObjectTagging"
-
-// DeleteObjectTaggingRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteObjectTagging operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteObjectTagging for more information on using the DeleteObjectTagging
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteObjectTaggingRequest method.
-//    req, resp := client.DeleteObjectTaggingRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectTagging
-func (c *S3) DeleteObjectTaggingRequest(input *DeleteObjectTaggingInput) (req *request.Request, output *DeleteObjectTaggingOutput) {
-	op := &request.Operation{
-		Name:       opDeleteObjectTagging,
-		HTTPMethod: "DELETE",
-		HTTPPath:   "/{Bucket}/{Key+}?tagging",
-	}
-
-	if input == nil {
-		input = &DeleteObjectTaggingInput{}
-	}
-
-	output = &DeleteObjectTaggingOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// DeleteObjectTagging API operation for Amazon Simple Storage Service.
-//
-// Removes the tag-set from an existing object.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteObjectTagging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectTagging
-func (c *S3) DeleteObjectTagging(input *DeleteObjectTaggingInput) (*DeleteObjectTaggingOutput, error) {
-	req, out := c.DeleteObjectTaggingRequest(input)
-	return out, req.Send()
-}
-
-// DeleteObjectTaggingWithContext is the same as DeleteObjectTagging with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteObjectTagging for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteObjectTaggingWithContext(ctx aws.Context, input *DeleteObjectTaggingInput, opts ...request.Option) (*DeleteObjectTaggingOutput, error) {
-	req, out := c.DeleteObjectTaggingRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDeleteObjects = "DeleteObjects"
-
-// DeleteObjectsRequest generates a "aws/request.Request" representing the
-// client's request for the DeleteObjects operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See DeleteObjects for more information on using the DeleteObjects
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the DeleteObjectsRequest method.
-//    req, resp := client.DeleteObjectsRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjects
-func (c *S3) DeleteObjectsRequest(input *DeleteObjectsInput) (req *request.Request, output *DeleteObjectsOutput) {
-	op := &request.Operation{
-		Name:       opDeleteObjects,
-		HTTPMethod: "POST",
-		HTTPPath:   "/{Bucket}?delete",
-	}
-
-	if input == nil {
-		input = &DeleteObjectsInput{}
-	}
-
-	output = &DeleteObjectsOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// DeleteObjects API operation for Amazon Simple Storage Service.
-//
-// This operation enables you to delete multiple objects from a bucket using
-// a single HTTP request. You may specify up to 1000 keys.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation DeleteObjects for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjects
-func (c *S3) DeleteObjects(input *DeleteObjectsInput) (*DeleteObjectsOutput, error) {
-	req, out := c.DeleteObjectsRequest(input)
-	return out, req.Send()
-}
-
-// DeleteObjectsWithContext is the same as DeleteObjects with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DeleteObjects for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) DeleteObjectsWithContext(ctx aws.Context, input *DeleteObjectsInput, opts ...request.Option) (*DeleteObjectsOutput, error) {
-	req, out := c.DeleteObjectsRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketAccelerateConfiguration = "GetBucketAccelerateConfiguration"
-
-// GetBucketAccelerateConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketAccelerateConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketAccelerateConfiguration for more information on using the GetBucketAccelerateConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketAccelerateConfigurationRequest method.
-//    req, resp := client.GetBucketAccelerateConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAccelerateConfiguration
-func (c *S3) GetBucketAccelerateConfigurationRequest(input *GetBucketAccelerateConfigurationInput) (req *request.Request, output *GetBucketAccelerateConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketAccelerateConfiguration,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?accelerate",
-	}
-
-	if input == nil {
-		input = &GetBucketAccelerateConfigurationInput{}
-	}
-
-	output = &GetBucketAccelerateConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketAccelerateConfiguration API operation for Amazon Simple Storage Service.
-//
-// Returns the accelerate configuration of a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketAccelerateConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAccelerateConfiguration
-func (c *S3) GetBucketAccelerateConfiguration(input *GetBucketAccelerateConfigurationInput) (*GetBucketAccelerateConfigurationOutput, error) {
-	req, out := c.GetBucketAccelerateConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketAccelerateConfigurationWithContext is the same as GetBucketAccelerateConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketAccelerateConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketAccelerateConfigurationWithContext(ctx aws.Context, input *GetBucketAccelerateConfigurationInput, opts ...request.Option) (*GetBucketAccelerateConfigurationOutput, error) {
-	req, out := c.GetBucketAccelerateConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketAcl = "GetBucketAcl"
-
-// GetBucketAclRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketAcl operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketAcl for more information on using the GetBucketAcl
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketAclRequest method.
-//    req, resp := client.GetBucketAclRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAcl
-func (c *S3) GetBucketAclRequest(input *GetBucketAclInput) (req *request.Request, output *GetBucketAclOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketAcl,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?acl",
-	}
-
-	if input == nil {
-		input = &GetBucketAclInput{}
-	}
-
-	output = &GetBucketAclOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketAcl API operation for Amazon Simple Storage Service.
-//
-// Gets the access control policy for the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketAcl for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAcl
-func (c *S3) GetBucketAcl(input *GetBucketAclInput) (*GetBucketAclOutput, error) {
-	req, out := c.GetBucketAclRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketAclWithContext is the same as GetBucketAcl with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketAcl for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketAclWithContext(ctx aws.Context, input *GetBucketAclInput, opts ...request.Option) (*GetBucketAclOutput, error) {
-	req, out := c.GetBucketAclRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketAnalyticsConfiguration = "GetBucketAnalyticsConfiguration"
-
-// GetBucketAnalyticsConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketAnalyticsConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketAnalyticsConfiguration for more information on using the GetBucketAnalyticsConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketAnalyticsConfigurationRequest method.
-//    req, resp := client.GetBucketAnalyticsConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAnalyticsConfiguration
-func (c *S3) GetBucketAnalyticsConfigurationRequest(input *GetBucketAnalyticsConfigurationInput) (req *request.Request, output *GetBucketAnalyticsConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketAnalyticsConfiguration,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?analytics",
-	}
-
-	if input == nil {
-		input = &GetBucketAnalyticsConfigurationInput{}
-	}
-
-	output = &GetBucketAnalyticsConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketAnalyticsConfiguration API operation for Amazon Simple Storage Service.
-//
-// Gets an analytics configuration for the bucket (specified by the analytics
-// configuration ID).
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketAnalyticsConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAnalyticsConfiguration
-func (c *S3) GetBucketAnalyticsConfiguration(input *GetBucketAnalyticsConfigurationInput) (*GetBucketAnalyticsConfigurationOutput, error) {
-	req, out := c.GetBucketAnalyticsConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketAnalyticsConfigurationWithContext is the same as GetBucketAnalyticsConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketAnalyticsConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketAnalyticsConfigurationWithContext(ctx aws.Context, input *GetBucketAnalyticsConfigurationInput, opts ...request.Option) (*GetBucketAnalyticsConfigurationOutput, error) {
-	req, out := c.GetBucketAnalyticsConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketCors = "GetBucketCors"
-
-// GetBucketCorsRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketCors operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketCors for more information on using the GetBucketCors
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketCorsRequest method.
-//    req, resp := client.GetBucketCorsRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketCors
-func (c *S3) GetBucketCorsRequest(input *GetBucketCorsInput) (req *request.Request, output *GetBucketCorsOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketCors,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?cors",
-	}
-
-	if input == nil {
-		input = &GetBucketCorsInput{}
-	}
-
-	output = &GetBucketCorsOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketCors API operation for Amazon Simple Storage Service.
-//
-// Returns the cors configuration for the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketCors for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketCors
-func (c *S3) GetBucketCors(input *GetBucketCorsInput) (*GetBucketCorsOutput, error) {
-	req, out := c.GetBucketCorsRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketCorsWithContext is the same as GetBucketCors with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketCors for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketCorsWithContext(ctx aws.Context, input *GetBucketCorsInput, opts ...request.Option) (*GetBucketCorsOutput, error) {
-	req, out := c.GetBucketCorsRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketEncryption = "GetBucketEncryption"
-
-// GetBucketEncryptionRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketEncryption operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketEncryption for more information on using the GetBucketEncryption
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketEncryptionRequest method.
-//    req, resp := client.GetBucketEncryptionRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketEncryption
-func (c *S3) GetBucketEncryptionRequest(input *GetBucketEncryptionInput) (req *request.Request, output *GetBucketEncryptionOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketEncryption,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?encryption",
-	}
-
-	if input == nil {
-		input = &GetBucketEncryptionInput{}
-	}
-
-	output = &GetBucketEncryptionOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketEncryption API operation for Amazon Simple Storage Service.
-//
-// Returns the server-side encryption configuration of a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketEncryption for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketEncryption
-func (c *S3) GetBucketEncryption(input *GetBucketEncryptionInput) (*GetBucketEncryptionOutput, error) {
-	req, out := c.GetBucketEncryptionRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketEncryptionWithContext is the same as GetBucketEncryption with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketEncryption for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketEncryptionWithContext(ctx aws.Context, input *GetBucketEncryptionInput, opts ...request.Option) (*GetBucketEncryptionOutput, error) {
-	req, out := c.GetBucketEncryptionRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketInventoryConfiguration = "GetBucketInventoryConfiguration"
-
-// GetBucketInventoryConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketInventoryConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketInventoryConfiguration for more information on using the GetBucketInventoryConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketInventoryConfigurationRequest method.
-//    req, resp := client.GetBucketInventoryConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketInventoryConfiguration
-func (c *S3) GetBucketInventoryConfigurationRequest(input *GetBucketInventoryConfigurationInput) (req *request.Request, output *GetBucketInventoryConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketInventoryConfiguration,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?inventory",
-	}
-
-	if input == nil {
-		input = &GetBucketInventoryConfigurationInput{}
-	}
-
-	output = &GetBucketInventoryConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketInventoryConfiguration API operation for Amazon Simple Storage Service.
-//
-// Returns an inventory configuration (identified by the inventory ID) from
-// the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketInventoryConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketInventoryConfiguration
-func (c *S3) GetBucketInventoryConfiguration(input *GetBucketInventoryConfigurationInput) (*GetBucketInventoryConfigurationOutput, error) {
-	req, out := c.GetBucketInventoryConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketInventoryConfigurationWithContext is the same as GetBucketInventoryConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketInventoryConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketInventoryConfigurationWithContext(ctx aws.Context, input *GetBucketInventoryConfigurationInput, opts ...request.Option) (*GetBucketInventoryConfigurationOutput, error) {
-	req, out := c.GetBucketInventoryConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketLifecycle = "GetBucketLifecycle"
-
-// GetBucketLifecycleRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketLifecycle operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketLifecycle for more information on using the GetBucketLifecycle
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketLifecycleRequest method.
-//    req, resp := client.GetBucketLifecycleRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycle
-func (c *S3) GetBucketLifecycleRequest(input *GetBucketLifecycleInput) (req *request.Request, output *GetBucketLifecycleOutput) {
-	if c.Client.Config.Logger != nil {
-		c.Client.Config.Logger.Log("This operation, GetBucketLifecycle, has been deprecated")
-	}
-	op := &request.Operation{
-		Name:       opGetBucketLifecycle,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?lifecycle",
-	}
-
-	if input == nil {
-		input = &GetBucketLifecycleInput{}
-	}
-
-	output = &GetBucketLifecycleOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketLifecycle API operation for Amazon Simple Storage Service.
-//
-// Deprecated, see the GetBucketLifecycleConfiguration operation.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketLifecycle for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycle
-func (c *S3) GetBucketLifecycle(input *GetBucketLifecycleInput) (*GetBucketLifecycleOutput, error) {
-	req, out := c.GetBucketLifecycleRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketLifecycleWithContext is the same as GetBucketLifecycle with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketLifecycle for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketLifecycleWithContext(ctx aws.Context, input *GetBucketLifecycleInput, opts ...request.Option) (*GetBucketLifecycleOutput, error) {
-	req, out := c.GetBucketLifecycleRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketLifecycleConfiguration = "GetBucketLifecycleConfiguration"
-
-// GetBucketLifecycleConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketLifecycleConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketLifecycleConfiguration for more information on using the GetBucketLifecycleConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketLifecycleConfigurationRequest method.
-//    req, resp := client.GetBucketLifecycleConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleConfiguration
-func (c *S3) GetBucketLifecycleConfigurationRequest(input *GetBucketLifecycleConfigurationInput) (req *request.Request, output *GetBucketLifecycleConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketLifecycleConfiguration,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?lifecycle",
-	}
-
-	if input == nil {
-		input = &GetBucketLifecycleConfigurationInput{}
-	}
-
-	output = &GetBucketLifecycleConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketLifecycleConfiguration API operation for Amazon Simple Storage Service.
-//
-// Returns the lifecycle configuration information set on the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketLifecycleConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleConfiguration
-func (c *S3) GetBucketLifecycleConfiguration(input *GetBucketLifecycleConfigurationInput) (*GetBucketLifecycleConfigurationOutput, error) {
-	req, out := c.GetBucketLifecycleConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketLifecycleConfigurationWithContext is the same as GetBucketLifecycleConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketLifecycleConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketLifecycleConfigurationWithContext(ctx aws.Context, input *GetBucketLifecycleConfigurationInput, opts ...request.Option) (*GetBucketLifecycleConfigurationOutput, error) {
-	req, out := c.GetBucketLifecycleConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketLocation = "GetBucketLocation"
-
-// GetBucketLocationRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketLocation operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketLocation for more information on using the GetBucketLocation
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketLocationRequest method.
-//    req, resp := client.GetBucketLocationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLocation
-func (c *S3) GetBucketLocationRequest(input *GetBucketLocationInput) (req *request.Request, output *GetBucketLocationOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketLocation,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?location",
-	}
-
-	if input == nil {
-		input = &GetBucketLocationInput{}
-	}
-
-	output = &GetBucketLocationOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketLocation API operation for Amazon Simple Storage Service.
-//
-// Returns the region the bucket resides in.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketLocation for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLocation
-func (c *S3) GetBucketLocation(input *GetBucketLocationInput) (*GetBucketLocationOutput, error) {
-	req, out := c.GetBucketLocationRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketLocationWithContext is the same as GetBucketLocation with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketLocation for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketLocationWithContext(ctx aws.Context, input *GetBucketLocationInput, opts ...request.Option) (*GetBucketLocationOutput, error) {
-	req, out := c.GetBucketLocationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketLogging = "GetBucketLogging"
-
-// GetBucketLoggingRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketLogging operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketLogging for more information on using the GetBucketLogging
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketLoggingRequest method.
-//    req, resp := client.GetBucketLoggingRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLogging
-func (c *S3) GetBucketLoggingRequest(input *GetBucketLoggingInput) (req *request.Request, output *GetBucketLoggingOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketLogging,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?logging",
-	}
-
-	if input == nil {
-		input = &GetBucketLoggingInput{}
-	}
-
-	output = &GetBucketLoggingOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketLogging API operation for Amazon Simple Storage Service.
-//
-// Returns the logging status of a bucket and the permissions users have to
-// view and modify that status. To use GET, you must be the bucket owner.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketLogging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLogging
-func (c *S3) GetBucketLogging(input *GetBucketLoggingInput) (*GetBucketLoggingOutput, error) {
-	req, out := c.GetBucketLoggingRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketLoggingWithContext is the same as GetBucketLogging with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketLogging for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketLoggingWithContext(ctx aws.Context, input *GetBucketLoggingInput, opts ...request.Option) (*GetBucketLoggingOutput, error) {
-	req, out := c.GetBucketLoggingRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketMetricsConfiguration = "GetBucketMetricsConfiguration"
-
-// GetBucketMetricsConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketMetricsConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketMetricsConfiguration for more information on using the GetBucketMetricsConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketMetricsConfigurationRequest method.
-//    req, resp := client.GetBucketMetricsConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketMetricsConfiguration
-func (c *S3) GetBucketMetricsConfigurationRequest(input *GetBucketMetricsConfigurationInput) (req *request.Request, output *GetBucketMetricsConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketMetricsConfiguration,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?metrics",
-	}
-
-	if input == nil {
-		input = &GetBucketMetricsConfigurationInput{}
-	}
-
-	output = &GetBucketMetricsConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketMetricsConfiguration API operation for Amazon Simple Storage Service.
-//
-// Gets a metrics configuration (specified by the metrics configuration ID)
-// from the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketMetricsConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketMetricsConfiguration
-func (c *S3) GetBucketMetricsConfiguration(input *GetBucketMetricsConfigurationInput) (*GetBucketMetricsConfigurationOutput, error) {
-	req, out := c.GetBucketMetricsConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketMetricsConfigurationWithContext is the same as GetBucketMetricsConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketMetricsConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketMetricsConfigurationWithContext(ctx aws.Context, input *GetBucketMetricsConfigurationInput, opts ...request.Option) (*GetBucketMetricsConfigurationOutput, error) {
-	req, out := c.GetBucketMetricsConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketNotification = "GetBucketNotification"
-
-// GetBucketNotificationRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketNotification operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketNotification for more information on using the GetBucketNotification
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketNotificationRequest method.
-//    req, resp := client.GetBucketNotificationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotification
-func (c *S3) GetBucketNotificationRequest(input *GetBucketNotificationConfigurationRequest) (req *request.Request, output *NotificationConfigurationDeprecated) {
-	if c.Client.Config.Logger != nil {
-		c.Client.Config.Logger.Log("This operation, GetBucketNotification, has been deprecated")
-	}
-	op := &request.Operation{
-		Name:       opGetBucketNotification,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?notification",
-	}
-
-	if input == nil {
-		input = &GetBucketNotificationConfigurationRequest{}
-	}
-
-	output = &NotificationConfigurationDeprecated{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketNotification API operation for Amazon Simple Storage Service.
-//
-// Deprecated, see the GetBucketNotificationConfiguration operation.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketNotification for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotification
-func (c *S3) GetBucketNotification(input *GetBucketNotificationConfigurationRequest) (*NotificationConfigurationDeprecated, error) {
-	req, out := c.GetBucketNotificationRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketNotificationWithContext is the same as GetBucketNotification with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketNotification for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketNotificationWithContext(ctx aws.Context, input *GetBucketNotificationConfigurationRequest, opts ...request.Option) (*NotificationConfigurationDeprecated, error) {
-	req, out := c.GetBucketNotificationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketNotificationConfiguration = "GetBucketNotificationConfiguration"
-
-// GetBucketNotificationConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketNotificationConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketNotificationConfiguration for more information on using the GetBucketNotificationConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketNotificationConfigurationRequest method.
-//    req, resp := client.GetBucketNotificationConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotificationConfiguration
-func (c *S3) GetBucketNotificationConfigurationRequest(input *GetBucketNotificationConfigurationRequest) (req *request.Request, output *NotificationConfiguration) {
-	op := &request.Operation{
-		Name:       opGetBucketNotificationConfiguration,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?notification",
-	}
-
-	if input == nil {
-		input = &GetBucketNotificationConfigurationRequest{}
-	}
-
-	output = &NotificationConfiguration{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketNotificationConfiguration API operation for Amazon Simple Storage Service.
-//
-// Returns the notification configuration of a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketNotificationConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotificationConfiguration
-func (c *S3) GetBucketNotificationConfiguration(input *GetBucketNotificationConfigurationRequest) (*NotificationConfiguration, error) {
-	req, out := c.GetBucketNotificationConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketNotificationConfigurationWithContext is the same as GetBucketNotificationConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketNotificationConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketNotificationConfigurationWithContext(ctx aws.Context, input *GetBucketNotificationConfigurationRequest, opts ...request.Option) (*NotificationConfiguration, error) {
-	req, out := c.GetBucketNotificationConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketPolicy = "GetBucketPolicy"
-
-// GetBucketPolicyRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketPolicy operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketPolicy for more information on using the GetBucketPolicy
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketPolicyRequest method.
-//    req, resp := client.GetBucketPolicyRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketPolicy
-func (c *S3) GetBucketPolicyRequest(input *GetBucketPolicyInput) (req *request.Request, output *GetBucketPolicyOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketPolicy,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?policy",
-	}
-
-	if input == nil {
-		input = &GetBucketPolicyInput{}
-	}
-
-	output = &GetBucketPolicyOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketPolicy API operation for Amazon Simple Storage Service.
-//
-// Returns the policy of a specified bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketPolicy for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketPolicy
-func (c *S3) GetBucketPolicy(input *GetBucketPolicyInput) (*GetBucketPolicyOutput, error) {
-	req, out := c.GetBucketPolicyRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketPolicyWithContext is the same as GetBucketPolicy with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketPolicy for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketPolicyWithContext(ctx aws.Context, input *GetBucketPolicyInput, opts ...request.Option) (*GetBucketPolicyOutput, error) {
-	req, out := c.GetBucketPolicyRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketReplication = "GetBucketReplication"
-
-// GetBucketReplicationRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketReplication operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketReplication for more information on using the GetBucketReplication
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketReplicationRequest method.
-//    req, resp := client.GetBucketReplicationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketReplication
-func (c *S3) GetBucketReplicationRequest(input *GetBucketReplicationInput) (req *request.Request, output *GetBucketReplicationOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketReplication,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?replication",
-	}
-
-	if input == nil {
-		input = &GetBucketReplicationInput{}
-	}
-
-	output = &GetBucketReplicationOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketReplication API operation for Amazon Simple Storage Service.
-//
-// Returns the replication configuration of a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketReplication for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketReplication
-func (c *S3) GetBucketReplication(input *GetBucketReplicationInput) (*GetBucketReplicationOutput, error) {
-	req, out := c.GetBucketReplicationRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketReplicationWithContext is the same as GetBucketReplication with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketReplication for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketReplicationWithContext(ctx aws.Context, input *GetBucketReplicationInput, opts ...request.Option) (*GetBucketReplicationOutput, error) {
-	req, out := c.GetBucketReplicationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketRequestPayment = "GetBucketRequestPayment"
-
-// GetBucketRequestPaymentRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketRequestPayment operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketRequestPayment for more information on using the GetBucketRequestPayment
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketRequestPaymentRequest method.
-//    req, resp := client.GetBucketRequestPaymentRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketRequestPayment
-func (c *S3) GetBucketRequestPaymentRequest(input *GetBucketRequestPaymentInput) (req *request.Request, output *GetBucketRequestPaymentOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketRequestPayment,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?requestPayment",
-	}
-
-	if input == nil {
-		input = &GetBucketRequestPaymentInput{}
-	}
-
-	output = &GetBucketRequestPaymentOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketRequestPayment API operation for Amazon Simple Storage Service.
-//
-// Returns the request payment configuration of a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketRequestPayment for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketRequestPayment
-func (c *S3) GetBucketRequestPayment(input *GetBucketRequestPaymentInput) (*GetBucketRequestPaymentOutput, error) {
-	req, out := c.GetBucketRequestPaymentRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketRequestPaymentWithContext is the same as GetBucketRequestPayment with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketRequestPayment for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketRequestPaymentWithContext(ctx aws.Context, input *GetBucketRequestPaymentInput, opts ...request.Option) (*GetBucketRequestPaymentOutput, error) {
-	req, out := c.GetBucketRequestPaymentRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketTagging = "GetBucketTagging"
-
-// GetBucketTaggingRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketTagging operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketTagging for more information on using the GetBucketTagging
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketTaggingRequest method.
-//    req, resp := client.GetBucketTaggingRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketTagging
-func (c *S3) GetBucketTaggingRequest(input *GetBucketTaggingInput) (req *request.Request, output *GetBucketTaggingOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketTagging,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?tagging",
-	}
-
-	if input == nil {
-		input = &GetBucketTaggingInput{}
-	}
-
-	output = &GetBucketTaggingOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketTagging API operation for Amazon Simple Storage Service.
-//
-// Returns the tag set associated with the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketTagging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketTagging
-func (c *S3) GetBucketTagging(input *GetBucketTaggingInput) (*GetBucketTaggingOutput, error) {
-	req, out := c.GetBucketTaggingRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketTaggingWithContext is the same as GetBucketTagging with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketTagging for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketTaggingWithContext(ctx aws.Context, input *GetBucketTaggingInput, opts ...request.Option) (*GetBucketTaggingOutput, error) {
-	req, out := c.GetBucketTaggingRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketVersioning = "GetBucketVersioning"
-
-// GetBucketVersioningRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketVersioning operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketVersioning for more information on using the GetBucketVersioning
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketVersioningRequest method.
-//    req, resp := client.GetBucketVersioningRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketVersioning
-func (c *S3) GetBucketVersioningRequest(input *GetBucketVersioningInput) (req *request.Request, output *GetBucketVersioningOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketVersioning,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?versioning",
-	}
-
-	if input == nil {
-		input = &GetBucketVersioningInput{}
-	}
-
-	output = &GetBucketVersioningOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketVersioning API operation for Amazon Simple Storage Service.
-//
-// Returns the versioning state of a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketVersioning for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketVersioning
-func (c *S3) GetBucketVersioning(input *GetBucketVersioningInput) (*GetBucketVersioningOutput, error) {
-	req, out := c.GetBucketVersioningRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketVersioningWithContext is the same as GetBucketVersioning with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketVersioning for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketVersioningWithContext(ctx aws.Context, input *GetBucketVersioningInput, opts ...request.Option) (*GetBucketVersioningOutput, error) {
-	req, out := c.GetBucketVersioningRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetBucketWebsite = "GetBucketWebsite"
-
-// GetBucketWebsiteRequest generates a "aws/request.Request" representing the
-// client's request for the GetBucketWebsite operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetBucketWebsite for more information on using the GetBucketWebsite
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetBucketWebsiteRequest method.
-//    req, resp := client.GetBucketWebsiteRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketWebsite
-func (c *S3) GetBucketWebsiteRequest(input *GetBucketWebsiteInput) (req *request.Request, output *GetBucketWebsiteOutput) {
-	op := &request.Operation{
-		Name:       opGetBucketWebsite,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?website",
-	}
-
-	if input == nil {
-		input = &GetBucketWebsiteInput{}
-	}
-
-	output = &GetBucketWebsiteOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetBucketWebsite API operation for Amazon Simple Storage Service.
-//
-// Returns the website configuration for a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetBucketWebsite for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketWebsite
-func (c *S3) GetBucketWebsite(input *GetBucketWebsiteInput) (*GetBucketWebsiteOutput, error) {
-	req, out := c.GetBucketWebsiteRequest(input)
-	return out, req.Send()
-}
-
-// GetBucketWebsiteWithContext is the same as GetBucketWebsite with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetBucketWebsite for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetBucketWebsiteWithContext(ctx aws.Context, input *GetBucketWebsiteInput, opts ...request.Option) (*GetBucketWebsiteOutput, error) {
-	req, out := c.GetBucketWebsiteRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetObject = "GetObject"
-
-// GetObjectRequest generates a "aws/request.Request" representing the
-// client's request for the GetObject operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetObject for more information on using the GetObject
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetObjectRequest method.
-//    req, resp := client.GetObjectRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObject
-func (c *S3) GetObjectRequest(input *GetObjectInput) (req *request.Request, output *GetObjectOutput) {
-	op := &request.Operation{
-		Name:       opGetObject,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}/{Key+}",
-	}
-
-	if input == nil {
-		input = &GetObjectInput{}
-	}
-
-	output = &GetObjectOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetObject API operation for Amazon Simple Storage Service.
-//
-// Retrieves objects from Amazon S3.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetObject for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeNoSuchKey "NoSuchKey"
-//   The specified key does not exist.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObject
-func (c *S3) GetObject(input *GetObjectInput) (*GetObjectOutput, error) {
-	req, out := c.GetObjectRequest(input)
-	return out, req.Send()
-}
-
-// GetObjectWithContext is the same as GetObject with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetObject for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetObjectWithContext(ctx aws.Context, input *GetObjectInput, opts ...request.Option) (*GetObjectOutput, error) {
-	req, out := c.GetObjectRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetObjectAcl = "GetObjectAcl"
-
-// GetObjectAclRequest generates a "aws/request.Request" representing the
-// client's request for the GetObjectAcl operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetObjectAcl for more information on using the GetObjectAcl
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetObjectAclRequest method.
-//    req, resp := client.GetObjectAclRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectAcl
-func (c *S3) GetObjectAclRequest(input *GetObjectAclInput) (req *request.Request, output *GetObjectAclOutput) {
-	op := &request.Operation{
-		Name:       opGetObjectAcl,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}/{Key+}?acl",
-	}
-
-	if input == nil {
-		input = &GetObjectAclInput{}
-	}
-
-	output = &GetObjectAclOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetObjectAcl API operation for Amazon Simple Storage Service.
-//
-// Returns the access control list (ACL) of an object.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetObjectAcl for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeNoSuchKey "NoSuchKey"
-//   The specified key does not exist.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectAcl
-func (c *S3) GetObjectAcl(input *GetObjectAclInput) (*GetObjectAclOutput, error) {
-	req, out := c.GetObjectAclRequest(input)
-	return out, req.Send()
-}
-
-// GetObjectAclWithContext is the same as GetObjectAcl with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetObjectAcl for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetObjectAclWithContext(ctx aws.Context, input *GetObjectAclInput, opts ...request.Option) (*GetObjectAclOutput, error) {
-	req, out := c.GetObjectAclRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetObjectTagging = "GetObjectTagging"
-
-// GetObjectTaggingRequest generates a "aws/request.Request" representing the
-// client's request for the GetObjectTagging operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetObjectTagging for more information on using the GetObjectTagging
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetObjectTaggingRequest method.
-//    req, resp := client.GetObjectTaggingRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTagging
-func (c *S3) GetObjectTaggingRequest(input *GetObjectTaggingInput) (req *request.Request, output *GetObjectTaggingOutput) {
-	op := &request.Operation{
-		Name:       opGetObjectTagging,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}/{Key+}?tagging",
-	}
-
-	if input == nil {
-		input = &GetObjectTaggingInput{}
-	}
-
-	output = &GetObjectTaggingOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetObjectTagging API operation for Amazon Simple Storage Service.
-//
-// Returns the tag-set of an object.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetObjectTagging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTagging
-func (c *S3) GetObjectTagging(input *GetObjectTaggingInput) (*GetObjectTaggingOutput, error) {
-	req, out := c.GetObjectTaggingRequest(input)
-	return out, req.Send()
-}
-
-// GetObjectTaggingWithContext is the same as GetObjectTagging with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetObjectTagging for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetObjectTaggingWithContext(ctx aws.Context, input *GetObjectTaggingInput, opts ...request.Option) (*GetObjectTaggingOutput, error) {
-	req, out := c.GetObjectTaggingRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetObjectTorrent = "GetObjectTorrent"
-
-// GetObjectTorrentRequest generates a "aws/request.Request" representing the
-// client's request for the GetObjectTorrent operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See GetObjectTorrent for more information on using the GetObjectTorrent
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the GetObjectTorrentRequest method.
-//    req, resp := client.GetObjectTorrentRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTorrent
-func (c *S3) GetObjectTorrentRequest(input *GetObjectTorrentInput) (req *request.Request, output *GetObjectTorrentOutput) {
-	op := &request.Operation{
-		Name:       opGetObjectTorrent,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}/{Key+}?torrent",
-	}
-
-	if input == nil {
-		input = &GetObjectTorrentInput{}
-	}
-
-	output = &GetObjectTorrentOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetObjectTorrent API operation for Amazon Simple Storage Service.
-//
-// Return torrent files from a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation GetObjectTorrent for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTorrent
-func (c *S3) GetObjectTorrent(input *GetObjectTorrentInput) (*GetObjectTorrentOutput, error) {
-	req, out := c.GetObjectTorrentRequest(input)
-	return out, req.Send()
-}
-
-// GetObjectTorrentWithContext is the same as GetObjectTorrent with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetObjectTorrent for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) GetObjectTorrentWithContext(ctx aws.Context, input *GetObjectTorrentInput, opts ...request.Option) (*GetObjectTorrentOutput, error) {
-	req, out := c.GetObjectTorrentRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opHeadBucket = "HeadBucket"
-
-// HeadBucketRequest generates a "aws/request.Request" representing the
-// client's request for the HeadBucket operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See HeadBucket for more information on using the HeadBucket
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the HeadBucketRequest method.
-//    req, resp := client.HeadBucketRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadBucket
-func (c *S3) HeadBucketRequest(input *HeadBucketInput) (req *request.Request, output *HeadBucketOutput) {
-	op := &request.Operation{
-		Name:       opHeadBucket,
-		HTTPMethod: "HEAD",
-		HTTPPath:   "/{Bucket}",
-	}
-
-	if input == nil {
-		input = &HeadBucketInput{}
-	}
-
-	output = &HeadBucketOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// HeadBucket API operation for Amazon Simple Storage Service.
-//
-// This operation is useful to determine if a bucket exists and you have permission
-// to access it.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation HeadBucket for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeNoSuchBucket "NoSuchBucket"
-//   The specified bucket does not exist.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadBucket
-func (c *S3) HeadBucket(input *HeadBucketInput) (*HeadBucketOutput, error) {
-	req, out := c.HeadBucketRequest(input)
-	return out, req.Send()
-}
-
-// HeadBucketWithContext is the same as HeadBucket with the addition of
-// the ability to pass a context and additional request options.
-//
-// See HeadBucket for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) HeadBucketWithContext(ctx aws.Context, input *HeadBucketInput, opts ...request.Option) (*HeadBucketOutput, error) {
-	req, out := c.HeadBucketRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opHeadObject = "HeadObject"
-
-// HeadObjectRequest generates a "aws/request.Request" representing the
-// client's request for the HeadObject operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See HeadObject for more information on using the HeadObject
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the HeadObjectRequest method.
-//    req, resp := client.HeadObjectRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadObject
-func (c *S3) HeadObjectRequest(input *HeadObjectInput) (req *request.Request, output *HeadObjectOutput) {
-	op := &request.Operation{
-		Name:       opHeadObject,
-		HTTPMethod: "HEAD",
-		HTTPPath:   "/{Bucket}/{Key+}",
-	}
-
-	if input == nil {
-		input = &HeadObjectInput{}
-	}
-
-	output = &HeadObjectOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// HeadObject API operation for Amazon Simple Storage Service.
-//
-// The HEAD operation retrieves metadata from an object without returning the
-// object itself. This operation is useful if you're only interested in an object's
-// metadata. To use HEAD, you must have READ access to the object.
-//
-// See http://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html#RESTErrorResponses
-// for more information on returned errors.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation HeadObject for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadObject
-func (c *S3) HeadObject(input *HeadObjectInput) (*HeadObjectOutput, error) {
-	req, out := c.HeadObjectRequest(input)
-	return out, req.Send()
-}
-
-// HeadObjectWithContext is the same as HeadObject with the addition of
-// the ability to pass a context and additional request options.
-//
-// See HeadObject for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) HeadObjectWithContext(ctx aws.Context, input *HeadObjectInput, opts ...request.Option) (*HeadObjectOutput, error) {
-	req, out := c.HeadObjectRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opListBucketAnalyticsConfigurations = "ListBucketAnalyticsConfigurations"
-
-// ListBucketAnalyticsConfigurationsRequest generates a "aws/request.Request" representing the
-// client's request for the ListBucketAnalyticsConfigurations operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See ListBucketAnalyticsConfigurations for more information on using the ListBucketAnalyticsConfigurations
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the ListBucketAnalyticsConfigurationsRequest method.
-//    req, resp := client.ListBucketAnalyticsConfigurationsRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketAnalyticsConfigurations
-func (c *S3) ListBucketAnalyticsConfigurationsRequest(input *ListBucketAnalyticsConfigurationsInput) (req *request.Request, output *ListBucketAnalyticsConfigurationsOutput) {
-	op := &request.Operation{
-		Name:       opListBucketAnalyticsConfigurations,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?analytics",
-	}
-
-	if input == nil {
-		input = &ListBucketAnalyticsConfigurationsInput{}
-	}
-
-	output = &ListBucketAnalyticsConfigurationsOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// ListBucketAnalyticsConfigurations API operation for Amazon Simple Storage Service.
-//
-// Lists the analytics configurations for the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation ListBucketAnalyticsConfigurations for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketAnalyticsConfigurations
-func (c *S3) ListBucketAnalyticsConfigurations(input *ListBucketAnalyticsConfigurationsInput) (*ListBucketAnalyticsConfigurationsOutput, error) {
-	req, out := c.ListBucketAnalyticsConfigurationsRequest(input)
-	return out, req.Send()
-}
-
-// ListBucketAnalyticsConfigurationsWithContext is the same as ListBucketAnalyticsConfigurations with the addition of
-// the ability to pass a context and additional request options.
-//
-// See ListBucketAnalyticsConfigurations for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListBucketAnalyticsConfigurationsWithContext(ctx aws.Context, input *ListBucketAnalyticsConfigurationsInput, opts ...request.Option) (*ListBucketAnalyticsConfigurationsOutput, error) {
-	req, out := c.ListBucketAnalyticsConfigurationsRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opListBucketInventoryConfigurations = "ListBucketInventoryConfigurations"
-
-// ListBucketInventoryConfigurationsRequest generates a "aws/request.Request" representing the
-// client's request for the ListBucketInventoryConfigurations operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See ListBucketInventoryConfigurations for more information on using the ListBucketInventoryConfigurations
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the ListBucketInventoryConfigurationsRequest method.
-//    req, resp := client.ListBucketInventoryConfigurationsRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketInventoryConfigurations
-func (c *S3) ListBucketInventoryConfigurationsRequest(input *ListBucketInventoryConfigurationsInput) (req *request.Request, output *ListBucketInventoryConfigurationsOutput) {
-	op := &request.Operation{
-		Name:       opListBucketInventoryConfigurations,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?inventory",
-	}
-
-	if input == nil {
-		input = &ListBucketInventoryConfigurationsInput{}
-	}
-
-	output = &ListBucketInventoryConfigurationsOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// ListBucketInventoryConfigurations API operation for Amazon Simple Storage Service.
-//
-// Returns a list of inventory configurations for the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation ListBucketInventoryConfigurations for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketInventoryConfigurations
-func (c *S3) ListBucketInventoryConfigurations(input *ListBucketInventoryConfigurationsInput) (*ListBucketInventoryConfigurationsOutput, error) {
-	req, out := c.ListBucketInventoryConfigurationsRequest(input)
-	return out, req.Send()
-}
-
-// ListBucketInventoryConfigurationsWithContext is the same as ListBucketInventoryConfigurations with the addition of
-// the ability to pass a context and additional request options.
-//
-// See ListBucketInventoryConfigurations for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListBucketInventoryConfigurationsWithContext(ctx aws.Context, input *ListBucketInventoryConfigurationsInput, opts ...request.Option) (*ListBucketInventoryConfigurationsOutput, error) {
-	req, out := c.ListBucketInventoryConfigurationsRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opListBucketMetricsConfigurations = "ListBucketMetricsConfigurations"
-
-// ListBucketMetricsConfigurationsRequest generates a "aws/request.Request" representing the
-// client's request for the ListBucketMetricsConfigurations operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See ListBucketMetricsConfigurations for more information on using the ListBucketMetricsConfigurations
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the ListBucketMetricsConfigurationsRequest method.
-//    req, resp := client.ListBucketMetricsConfigurationsRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketMetricsConfigurations
-func (c *S3) ListBucketMetricsConfigurationsRequest(input *ListBucketMetricsConfigurationsInput) (req *request.Request, output *ListBucketMetricsConfigurationsOutput) {
-	op := &request.Operation{
-		Name:       opListBucketMetricsConfigurations,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?metrics",
-	}
-
-	if input == nil {
-		input = &ListBucketMetricsConfigurationsInput{}
-	}
-
-	output = &ListBucketMetricsConfigurationsOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// ListBucketMetricsConfigurations API operation for Amazon Simple Storage Service.
-//
-// Lists the metrics configurations for the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation ListBucketMetricsConfigurations for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketMetricsConfigurations
-func (c *S3) ListBucketMetricsConfigurations(input *ListBucketMetricsConfigurationsInput) (*ListBucketMetricsConfigurationsOutput, error) {
-	req, out := c.ListBucketMetricsConfigurationsRequest(input)
-	return out, req.Send()
-}
-
-// ListBucketMetricsConfigurationsWithContext is the same as ListBucketMetricsConfigurations with the addition of
-// the ability to pass a context and additional request options.
-//
-// See ListBucketMetricsConfigurations for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListBucketMetricsConfigurationsWithContext(ctx aws.Context, input *ListBucketMetricsConfigurationsInput, opts ...request.Option) (*ListBucketMetricsConfigurationsOutput, error) {
-	req, out := c.ListBucketMetricsConfigurationsRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opListBuckets = "ListBuckets"
-
-// ListBucketsRequest generates a "aws/request.Request" representing the
-// client's request for the ListBuckets operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See ListBuckets for more information on using the ListBuckets
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the ListBucketsRequest method.
-//    req, resp := client.ListBucketsRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBuckets
-func (c *S3) ListBucketsRequest(input *ListBucketsInput) (req *request.Request, output *ListBucketsOutput) {
-	op := &request.Operation{
-		Name:       opListBuckets,
-		HTTPMethod: "GET",
-		HTTPPath:   "/",
-	}
-
-	if input == nil {
-		input = &ListBucketsInput{}
-	}
-
-	output = &ListBucketsOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// ListBuckets API operation for Amazon Simple Storage Service.
-//
-// Returns a list of all buckets owned by the authenticated sender of the request.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation ListBuckets for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBuckets
-func (c *S3) ListBuckets(input *ListBucketsInput) (*ListBucketsOutput, error) {
-	req, out := c.ListBucketsRequest(input)
-	return out, req.Send()
-}
-
-// ListBucketsWithContext is the same as ListBuckets with the addition of
-// the ability to pass a context and additional request options.
-//
-// See ListBuckets for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListBucketsWithContext(ctx aws.Context, input *ListBucketsInput, opts ...request.Option) (*ListBucketsOutput, error) {
-	req, out := c.ListBucketsRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opListMultipartUploads = "ListMultipartUploads"
-
-// ListMultipartUploadsRequest generates a "aws/request.Request" representing the
-// client's request for the ListMultipartUploads operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See ListMultipartUploads for more information on using the ListMultipartUploads
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the ListMultipartUploadsRequest method.
-//    req, resp := client.ListMultipartUploadsRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListMultipartUploads
-func (c *S3) ListMultipartUploadsRequest(input *ListMultipartUploadsInput) (req *request.Request, output *ListMultipartUploadsOutput) {
-	op := &request.Operation{
-		Name:       opListMultipartUploads,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?uploads",
-		Paginator: &request.Paginator{
-			InputTokens:     []string{"KeyMarker", "UploadIdMarker"},
-			OutputTokens:    []string{"NextKeyMarker", "NextUploadIdMarker"},
-			LimitToken:      "MaxUploads",
-			TruncationToken: "IsTruncated",
-		},
-	}
-
-	if input == nil {
-		input = &ListMultipartUploadsInput{}
-	}
-
-	output = &ListMultipartUploadsOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// ListMultipartUploads API operation for Amazon Simple Storage Service.
-//
-// This operation lists in-progress multipart uploads.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation ListMultipartUploads for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListMultipartUploads
-func (c *S3) ListMultipartUploads(input *ListMultipartUploadsInput) (*ListMultipartUploadsOutput, error) {
-	req, out := c.ListMultipartUploadsRequest(input)
-	return out, req.Send()
-}
-
-// ListMultipartUploadsWithContext is the same as ListMultipartUploads with the addition of
-// the ability to pass a context and additional request options.
-//
-// See ListMultipartUploads for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListMultipartUploadsWithContext(ctx aws.Context, input *ListMultipartUploadsInput, opts ...request.Option) (*ListMultipartUploadsOutput, error) {
-	req, out := c.ListMultipartUploadsRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-// ListMultipartUploadsPages iterates over the pages of a ListMultipartUploads operation,
-// calling the "fn" function with the response data for each page. To stop
-// iterating, return false from the fn function.
-//
-// See ListMultipartUploads method for more information on how to use this operation.
-//
-// Note: This operation can generate multiple requests to a service.
-//
-//    // Example iterating over at most 3 pages of a ListMultipartUploads operation.
-//    pageNum := 0
-//    err := client.ListMultipartUploadsPages(params,
-//        func(page *ListMultipartUploadsOutput, lastPage bool) bool {
-//            pageNum++
-//            fmt.Println(page)
-//            return pageNum <= 3
-//        })
-//
-func (c *S3) ListMultipartUploadsPages(input *ListMultipartUploadsInput, fn func(*ListMultipartUploadsOutput, bool) bool) error {
-	return c.ListMultipartUploadsPagesWithContext(aws.BackgroundContext(), input, fn)
-}
-
-// ListMultipartUploadsPagesWithContext same as ListMultipartUploadsPages except
-// it takes a Context and allows setting request options on the pages.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListMultipartUploadsPagesWithContext(ctx aws.Context, input *ListMultipartUploadsInput, fn func(*ListMultipartUploadsOutput, bool) bool, opts ...request.Option) error {
-	p := request.Pagination{
-		NewRequest: func() (*request.Request, error) {
-			var inCpy *ListMultipartUploadsInput
-			if input != nil {
-				tmp := *input
-				inCpy = &tmp
-			}
-			req, _ := c.ListMultipartUploadsRequest(inCpy)
-			req.SetContext(ctx)
-			req.ApplyOptions(opts...)
-			return req, nil
-		},
-	}
-
-	cont := true
-	for p.Next() && cont {
-		cont = fn(p.Page().(*ListMultipartUploadsOutput), !p.HasNextPage())
-	}
-	return p.Err()
-}
-
-const opListObjectVersions = "ListObjectVersions"
-
-// ListObjectVersionsRequest generates a "aws/request.Request" representing the
-// client's request for the ListObjectVersions operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See ListObjectVersions for more information on using the ListObjectVersions
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the ListObjectVersionsRequest method.
-//    req, resp := client.ListObjectVersionsRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectVersions
-func (c *S3) ListObjectVersionsRequest(input *ListObjectVersionsInput) (req *request.Request, output *ListObjectVersionsOutput) {
-	op := &request.Operation{
-		Name:       opListObjectVersions,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?versions",
-		Paginator: &request.Paginator{
-			InputTokens:     []string{"KeyMarker", "VersionIdMarker"},
-			OutputTokens:    []string{"NextKeyMarker", "NextVersionIdMarker"},
-			LimitToken:      "MaxKeys",
-			TruncationToken: "IsTruncated",
-		},
-	}
-
-	if input == nil {
-		input = &ListObjectVersionsInput{}
-	}
-
-	output = &ListObjectVersionsOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// ListObjectVersions API operation for Amazon Simple Storage Service.
-//
-// Returns metadata about all of the versions of objects in a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation ListObjectVersions for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectVersions
-func (c *S3) ListObjectVersions(input *ListObjectVersionsInput) (*ListObjectVersionsOutput, error) {
-	req, out := c.ListObjectVersionsRequest(input)
-	return out, req.Send()
-}
-
-// ListObjectVersionsWithContext is the same as ListObjectVersions with the addition of
-// the ability to pass a context and additional request options.
-//
-// See ListObjectVersions for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListObjectVersionsWithContext(ctx aws.Context, input *ListObjectVersionsInput, opts ...request.Option) (*ListObjectVersionsOutput, error) {
-	req, out := c.ListObjectVersionsRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-// ListObjectVersionsPages iterates over the pages of a ListObjectVersions operation,
-// calling the "fn" function with the response data for each page. To stop
-// iterating, return false from the fn function.
-//
-// See ListObjectVersions method for more information on how to use this operation.
-//
-// Note: This operation can generate multiple requests to a service.
-//
-//    // Example iterating over at most 3 pages of a ListObjectVersions operation.
-//    pageNum := 0
-//    err := client.ListObjectVersionsPages(params,
-//        func(page *ListObjectVersionsOutput, lastPage bool) bool {
-//            pageNum++
-//            fmt.Println(page)
-//            return pageNum <= 3
-//        })
-//
-func (c *S3) ListObjectVersionsPages(input *ListObjectVersionsInput, fn func(*ListObjectVersionsOutput, bool) bool) error {
-	return c.ListObjectVersionsPagesWithContext(aws.BackgroundContext(), input, fn)
-}
-
-// ListObjectVersionsPagesWithContext same as ListObjectVersionsPages except
-// it takes a Context and allows setting request options on the pages.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListObjectVersionsPagesWithContext(ctx aws.Context, input *ListObjectVersionsInput, fn func(*ListObjectVersionsOutput, bool) bool, opts ...request.Option) error {
-	p := request.Pagination{
-		NewRequest: func() (*request.Request, error) {
-			var inCpy *ListObjectVersionsInput
-			if input != nil {
-				tmp := *input
-				inCpy = &tmp
-			}
-			req, _ := c.ListObjectVersionsRequest(inCpy)
-			req.SetContext(ctx)
-			req.ApplyOptions(opts...)
-			return req, nil
-		},
-	}
-
-	cont := true
-	for p.Next() && cont {
-		cont = fn(p.Page().(*ListObjectVersionsOutput), !p.HasNextPage())
-	}
-	return p.Err()
-}
-
-const opListObjects = "ListObjects"
-
-// ListObjectsRequest generates a "aws/request.Request" representing the
-// client's request for the ListObjects operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See ListObjects for more information on using the ListObjects
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the ListObjectsRequest method.
-//    req, resp := client.ListObjectsRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjects
-func (c *S3) ListObjectsRequest(input *ListObjectsInput) (req *request.Request, output *ListObjectsOutput) {
-	op := &request.Operation{
-		Name:       opListObjects,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}",
-		Paginator: &request.Paginator{
-			InputTokens:     []string{"Marker"},
-			OutputTokens:    []string{"NextMarker || Contents[-1].Key"},
-			LimitToken:      "MaxKeys",
-			TruncationToken: "IsTruncated",
-		},
-	}
-
-	if input == nil {
-		input = &ListObjectsInput{}
-	}
-
-	output = &ListObjectsOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// ListObjects API operation for Amazon Simple Storage Service.
-//
-// Returns some or all (up to 1000) of the objects in a bucket. You can use
-// the request parameters as selection criteria to return a subset of the objects
-// in a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation ListObjects for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeNoSuchBucket "NoSuchBucket"
-//   The specified bucket does not exist.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjects
-func (c *S3) ListObjects(input *ListObjectsInput) (*ListObjectsOutput, error) {
-	req, out := c.ListObjectsRequest(input)
-	return out, req.Send()
-}
-
-// ListObjectsWithContext is the same as ListObjects with the addition of
-// the ability to pass a context and additional request options.
-//
-// See ListObjects for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListObjectsWithContext(ctx aws.Context, input *ListObjectsInput, opts ...request.Option) (*ListObjectsOutput, error) {
-	req, out := c.ListObjectsRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-// ListObjectsPages iterates over the pages of a ListObjects operation,
-// calling the "fn" function with the response data for each page. To stop
-// iterating, return false from the fn function.
-//
-// See ListObjects method for more information on how to use this operation.
-//
-// Note: This operation can generate multiple requests to a service.
-//
-//    // Example iterating over at most 3 pages of a ListObjects operation.
-//    pageNum := 0
-//    err := client.ListObjectsPages(params,
-//        func(page *ListObjectsOutput, lastPage bool) bool {
-//            pageNum++
-//            fmt.Println(page)
-//            return pageNum <= 3
-//        })
-//
-func (c *S3) ListObjectsPages(input *ListObjectsInput, fn func(*ListObjectsOutput, bool) bool) error {
-	return c.ListObjectsPagesWithContext(aws.BackgroundContext(), input, fn)
-}
-
-// ListObjectsPagesWithContext same as ListObjectsPages except
-// it takes a Context and allows setting request options on the pages.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListObjectsPagesWithContext(ctx aws.Context, input *ListObjectsInput, fn func(*ListObjectsOutput, bool) bool, opts ...request.Option) error {
-	p := request.Pagination{
-		NewRequest: func() (*request.Request, error) {
-			var inCpy *ListObjectsInput
-			if input != nil {
-				tmp := *input
-				inCpy = &tmp
-			}
-			req, _ := c.ListObjectsRequest(inCpy)
-			req.SetContext(ctx)
-			req.ApplyOptions(opts...)
-			return req, nil
-		},
-	}
-
-	cont := true
-	for p.Next() && cont {
-		cont = fn(p.Page().(*ListObjectsOutput), !p.HasNextPage())
-	}
-	return p.Err()
-}
-
-const opListObjectsV2 = "ListObjectsV2"
-
-// ListObjectsV2Request generates a "aws/request.Request" representing the
-// client's request for the ListObjectsV2 operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See ListObjectsV2 for more information on using the ListObjectsV2
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the ListObjectsV2Request method.
-//    req, resp := client.ListObjectsV2Request(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsV2
-func (c *S3) ListObjectsV2Request(input *ListObjectsV2Input) (req *request.Request, output *ListObjectsV2Output) {
-	op := &request.Operation{
-		Name:       opListObjectsV2,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}?list-type=2",
-		Paginator: &request.Paginator{
-			InputTokens:     []string{"ContinuationToken"},
-			OutputTokens:    []string{"NextContinuationToken"},
-			LimitToken:      "MaxKeys",
-			TruncationToken: "",
-		},
-	}
-
-	if input == nil {
-		input = &ListObjectsV2Input{}
-	}
-
-	output = &ListObjectsV2Output{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// ListObjectsV2 API operation for Amazon Simple Storage Service.
-//
-// Returns some or all (up to 1000) of the objects in a bucket. You can use
-// the request parameters as selection criteria to return a subset of the objects
-// in a bucket. Note: ListObjectsV2 is the revised List Objects API and we recommend
-// you use this revised API for new application development.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation ListObjectsV2 for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeNoSuchBucket "NoSuchBucket"
-//   The specified bucket does not exist.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsV2
-func (c *S3) ListObjectsV2(input *ListObjectsV2Input) (*ListObjectsV2Output, error) {
-	req, out := c.ListObjectsV2Request(input)
-	return out, req.Send()
-}
-
-// ListObjectsV2WithContext is the same as ListObjectsV2 with the addition of
-// the ability to pass a context and additional request options.
-//
-// See ListObjectsV2 for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListObjectsV2WithContext(ctx aws.Context, input *ListObjectsV2Input, opts ...request.Option) (*ListObjectsV2Output, error) {
-	req, out := c.ListObjectsV2Request(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-// ListObjectsV2Pages iterates over the pages of a ListObjectsV2 operation,
-// calling the "fn" function with the response data for each page. To stop
-// iterating, return false from the fn function.
-//
-// See ListObjectsV2 method for more information on how to use this operation.
-//
-// Note: This operation can generate multiple requests to a service.
-//
-//    // Example iterating over at most 3 pages of a ListObjectsV2 operation.
-//    pageNum := 0
-//    err := client.ListObjectsV2Pages(params,
-//        func(page *ListObjectsV2Output, lastPage bool) bool {
-//            pageNum++
-//            fmt.Println(page)
-//            return pageNum <= 3
-//        })
-//
-func (c *S3) ListObjectsV2Pages(input *ListObjectsV2Input, fn func(*ListObjectsV2Output, bool) bool) error {
-	return c.ListObjectsV2PagesWithContext(aws.BackgroundContext(), input, fn)
-}
-
-// ListObjectsV2PagesWithContext same as ListObjectsV2Pages except
-// it takes a Context and allows setting request options on the pages.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListObjectsV2PagesWithContext(ctx aws.Context, input *ListObjectsV2Input, fn func(*ListObjectsV2Output, bool) bool, opts ...request.Option) error {
-	p := request.Pagination{
-		NewRequest: func() (*request.Request, error) {
-			var inCpy *ListObjectsV2Input
-			if input != nil {
-				tmp := *input
-				inCpy = &tmp
-			}
-			req, _ := c.ListObjectsV2Request(inCpy)
-			req.SetContext(ctx)
-			req.ApplyOptions(opts...)
-			return req, nil
-		},
-	}
-
-	cont := true
-	for p.Next() && cont {
-		cont = fn(p.Page().(*ListObjectsV2Output), !p.HasNextPage())
-	}
-	return p.Err()
-}
-
-const opListParts = "ListParts"
-
-// ListPartsRequest generates a "aws/request.Request" representing the
-// client's request for the ListParts operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See ListParts for more information on using the ListParts
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the ListPartsRequest method.
-//    req, resp := client.ListPartsRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListParts
-func (c *S3) ListPartsRequest(input *ListPartsInput) (req *request.Request, output *ListPartsOutput) {
-	op := &request.Operation{
-		Name:       opListParts,
-		HTTPMethod: "GET",
-		HTTPPath:   "/{Bucket}/{Key+}",
-		Paginator: &request.Paginator{
-			InputTokens:     []string{"PartNumberMarker"},
-			OutputTokens:    []string{"NextPartNumberMarker"},
-			LimitToken:      "MaxParts",
-			TruncationToken: "IsTruncated",
-		},
-	}
-
-	if input == nil {
-		input = &ListPartsInput{}
-	}
-
-	output = &ListPartsOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// ListParts API operation for Amazon Simple Storage Service.
-//
-// Lists the parts that have been uploaded for a specific multipart upload.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation ListParts for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListParts
-func (c *S3) ListParts(input *ListPartsInput) (*ListPartsOutput, error) {
-	req, out := c.ListPartsRequest(input)
-	return out, req.Send()
-}
-
-// ListPartsWithContext is the same as ListParts with the addition of
-// the ability to pass a context and additional request options.
-//
-// See ListParts for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListPartsWithContext(ctx aws.Context, input *ListPartsInput, opts ...request.Option) (*ListPartsOutput, error) {
-	req, out := c.ListPartsRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-// ListPartsPages iterates over the pages of a ListParts operation,
-// calling the "fn" function with the response data for each page. To stop
-// iterating, return false from the fn function.
-//
-// See ListParts method for more information on how to use this operation.
-//
-// Note: This operation can generate multiple requests to a service.
-//
-//    // Example iterating over at most 3 pages of a ListParts operation.
-//    pageNum := 0
-//    err := client.ListPartsPages(params,
-//        func(page *ListPartsOutput, lastPage bool) bool {
-//            pageNum++
-//            fmt.Println(page)
-//            return pageNum <= 3
-//        })
-//
-func (c *S3) ListPartsPages(input *ListPartsInput, fn func(*ListPartsOutput, bool) bool) error {
-	return c.ListPartsPagesWithContext(aws.BackgroundContext(), input, fn)
-}
-
-// ListPartsPagesWithContext same as ListPartsPages except
-// it takes a Context and allows setting request options on the pages.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) ListPartsPagesWithContext(ctx aws.Context, input *ListPartsInput, fn func(*ListPartsOutput, bool) bool, opts ...request.Option) error {
-	p := request.Pagination{
-		NewRequest: func() (*request.Request, error) {
-			var inCpy *ListPartsInput
-			if input != nil {
-				tmp := *input
-				inCpy = &tmp
-			}
-			req, _ := c.ListPartsRequest(inCpy)
-			req.SetContext(ctx)
-			req.ApplyOptions(opts...)
-			return req, nil
-		},
-	}
-
-	cont := true
-	for p.Next() && cont {
-		cont = fn(p.Page().(*ListPartsOutput), !p.HasNextPage())
-	}
-	return p.Err()
-}
-
-const opPutBucketAccelerateConfiguration = "PutBucketAccelerateConfiguration"
-
-// PutBucketAccelerateConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketAccelerateConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketAccelerateConfiguration for more information on using the PutBucketAccelerateConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketAccelerateConfigurationRequest method.
-//    req, resp := client.PutBucketAccelerateConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAccelerateConfiguration
-func (c *S3) PutBucketAccelerateConfigurationRequest(input *PutBucketAccelerateConfigurationInput) (req *request.Request, output *PutBucketAccelerateConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketAccelerateConfiguration,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?accelerate",
-	}
-
-	if input == nil {
-		input = &PutBucketAccelerateConfigurationInput{}
-	}
-
-	output = &PutBucketAccelerateConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketAccelerateConfiguration API operation for Amazon Simple Storage Service.
-//
-// Sets the accelerate configuration of an existing bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketAccelerateConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAccelerateConfiguration
-func (c *S3) PutBucketAccelerateConfiguration(input *PutBucketAccelerateConfigurationInput) (*PutBucketAccelerateConfigurationOutput, error) {
-	req, out := c.PutBucketAccelerateConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketAccelerateConfigurationWithContext is the same as PutBucketAccelerateConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketAccelerateConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketAccelerateConfigurationWithContext(ctx aws.Context, input *PutBucketAccelerateConfigurationInput, opts ...request.Option) (*PutBucketAccelerateConfigurationOutput, error) {
-	req, out := c.PutBucketAccelerateConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketAcl = "PutBucketAcl"
-
-// PutBucketAclRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketAcl operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketAcl for more information on using the PutBucketAcl
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketAclRequest method.
-//    req, resp := client.PutBucketAclRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAcl
-func (c *S3) PutBucketAclRequest(input *PutBucketAclInput) (req *request.Request, output *PutBucketAclOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketAcl,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?acl",
-	}
-
-	if input == nil {
-		input = &PutBucketAclInput{}
-	}
-
-	output = &PutBucketAclOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketAcl API operation for Amazon Simple Storage Service.
-//
-// Sets the permissions on a bucket using access control lists (ACL).
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketAcl for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAcl
-func (c *S3) PutBucketAcl(input *PutBucketAclInput) (*PutBucketAclOutput, error) {
-	req, out := c.PutBucketAclRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketAclWithContext is the same as PutBucketAcl with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketAcl for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketAclWithContext(ctx aws.Context, input *PutBucketAclInput, opts ...request.Option) (*PutBucketAclOutput, error) {
-	req, out := c.PutBucketAclRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketAnalyticsConfiguration = "PutBucketAnalyticsConfiguration"
-
-// PutBucketAnalyticsConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketAnalyticsConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketAnalyticsConfiguration for more information on using the PutBucketAnalyticsConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketAnalyticsConfigurationRequest method.
-//    req, resp := client.PutBucketAnalyticsConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAnalyticsConfiguration
-func (c *S3) PutBucketAnalyticsConfigurationRequest(input *PutBucketAnalyticsConfigurationInput) (req *request.Request, output *PutBucketAnalyticsConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketAnalyticsConfiguration,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?analytics",
-	}
-
-	if input == nil {
-		input = &PutBucketAnalyticsConfigurationInput{}
-	}
-
-	output = &PutBucketAnalyticsConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketAnalyticsConfiguration API operation for Amazon Simple Storage Service.
-//
-// Sets an analytics configuration for the bucket (specified by the analytics
-// configuration ID).
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketAnalyticsConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAnalyticsConfiguration
-func (c *S3) PutBucketAnalyticsConfiguration(input *PutBucketAnalyticsConfigurationInput) (*PutBucketAnalyticsConfigurationOutput, error) {
-	req, out := c.PutBucketAnalyticsConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketAnalyticsConfigurationWithContext is the same as PutBucketAnalyticsConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketAnalyticsConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketAnalyticsConfigurationWithContext(ctx aws.Context, input *PutBucketAnalyticsConfigurationInput, opts ...request.Option) (*PutBucketAnalyticsConfigurationOutput, error) {
-	req, out := c.PutBucketAnalyticsConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketCors = "PutBucketCors"
-
-// PutBucketCorsRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketCors operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketCors for more information on using the PutBucketCors
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketCorsRequest method.
-//    req, resp := client.PutBucketCorsRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketCors
-func (c *S3) PutBucketCorsRequest(input *PutBucketCorsInput) (req *request.Request, output *PutBucketCorsOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketCors,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?cors",
-	}
-
-	if input == nil {
-		input = &PutBucketCorsInput{}
-	}
-
-	output = &PutBucketCorsOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketCors API operation for Amazon Simple Storage Service.
-//
-// Sets the cors configuration for a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketCors for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketCors
-func (c *S3) PutBucketCors(input *PutBucketCorsInput) (*PutBucketCorsOutput, error) {
-	req, out := c.PutBucketCorsRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketCorsWithContext is the same as PutBucketCors with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketCors for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketCorsWithContext(ctx aws.Context, input *PutBucketCorsInput, opts ...request.Option) (*PutBucketCorsOutput, error) {
-	req, out := c.PutBucketCorsRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketEncryption = "PutBucketEncryption"
-
-// PutBucketEncryptionRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketEncryption operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketEncryption for more information on using the PutBucketEncryption
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketEncryptionRequest method.
-//    req, resp := client.PutBucketEncryptionRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketEncryption
-func (c *S3) PutBucketEncryptionRequest(input *PutBucketEncryptionInput) (req *request.Request, output *PutBucketEncryptionOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketEncryption,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?encryption",
-	}
-
-	if input == nil {
-		input = &PutBucketEncryptionInput{}
-	}
-
-	output = &PutBucketEncryptionOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketEncryption API operation for Amazon Simple Storage Service.
-//
-// Creates a new server-side encryption configuration (or replaces an existing
-// one, if present).
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketEncryption for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketEncryption
-func (c *S3) PutBucketEncryption(input *PutBucketEncryptionInput) (*PutBucketEncryptionOutput, error) {
-	req, out := c.PutBucketEncryptionRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketEncryptionWithContext is the same as PutBucketEncryption with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketEncryption for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketEncryptionWithContext(ctx aws.Context, input *PutBucketEncryptionInput, opts ...request.Option) (*PutBucketEncryptionOutput, error) {
-	req, out := c.PutBucketEncryptionRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketInventoryConfiguration = "PutBucketInventoryConfiguration"
-
-// PutBucketInventoryConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketInventoryConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketInventoryConfiguration for more information on using the PutBucketInventoryConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketInventoryConfigurationRequest method.
-//    req, resp := client.PutBucketInventoryConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketInventoryConfiguration
-func (c *S3) PutBucketInventoryConfigurationRequest(input *PutBucketInventoryConfigurationInput) (req *request.Request, output *PutBucketInventoryConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketInventoryConfiguration,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?inventory",
-	}
-
-	if input == nil {
-		input = &PutBucketInventoryConfigurationInput{}
-	}
-
-	output = &PutBucketInventoryConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketInventoryConfiguration API operation for Amazon Simple Storage Service.
-//
-// Adds an inventory configuration (identified by the inventory ID) from the
-// bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketInventoryConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketInventoryConfiguration
-func (c *S3) PutBucketInventoryConfiguration(input *PutBucketInventoryConfigurationInput) (*PutBucketInventoryConfigurationOutput, error) {
-	req, out := c.PutBucketInventoryConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketInventoryConfigurationWithContext is the same as PutBucketInventoryConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketInventoryConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketInventoryConfigurationWithContext(ctx aws.Context, input *PutBucketInventoryConfigurationInput, opts ...request.Option) (*PutBucketInventoryConfigurationOutput, error) {
-	req, out := c.PutBucketInventoryConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketLifecycle = "PutBucketLifecycle"
-
-// PutBucketLifecycleRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketLifecycle operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketLifecycle for more information on using the PutBucketLifecycle
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketLifecycleRequest method.
-//    req, resp := client.PutBucketLifecycleRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycle
-func (c *S3) PutBucketLifecycleRequest(input *PutBucketLifecycleInput) (req *request.Request, output *PutBucketLifecycleOutput) {
-	if c.Client.Config.Logger != nil {
-		c.Client.Config.Logger.Log("This operation, PutBucketLifecycle, has been deprecated")
-	}
-	op := &request.Operation{
-		Name:       opPutBucketLifecycle,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?lifecycle",
-	}
-
-	if input == nil {
-		input = &PutBucketLifecycleInput{}
-	}
-
-	output = &PutBucketLifecycleOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketLifecycle API operation for Amazon Simple Storage Service.
-//
-// Deprecated, see the PutBucketLifecycleConfiguration operation.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketLifecycle for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycle
-func (c *S3) PutBucketLifecycle(input *PutBucketLifecycleInput) (*PutBucketLifecycleOutput, error) {
-	req, out := c.PutBucketLifecycleRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketLifecycleWithContext is the same as PutBucketLifecycle with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketLifecycle for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketLifecycleWithContext(ctx aws.Context, input *PutBucketLifecycleInput, opts ...request.Option) (*PutBucketLifecycleOutput, error) {
-	req, out := c.PutBucketLifecycleRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketLifecycleConfiguration = "PutBucketLifecycleConfiguration"
-
-// PutBucketLifecycleConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketLifecycleConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketLifecycleConfiguration for more information on using the PutBucketLifecycleConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketLifecycleConfigurationRequest method.
-//    req, resp := client.PutBucketLifecycleConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleConfiguration
-func (c *S3) PutBucketLifecycleConfigurationRequest(input *PutBucketLifecycleConfigurationInput) (req *request.Request, output *PutBucketLifecycleConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketLifecycleConfiguration,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?lifecycle",
-	}
-
-	if input == nil {
-		input = &PutBucketLifecycleConfigurationInput{}
-	}
-
-	output = &PutBucketLifecycleConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketLifecycleConfiguration API operation for Amazon Simple Storage Service.
-//
-// Sets lifecycle configuration for your bucket. If a lifecycle configuration
-// exists, it replaces it.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketLifecycleConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleConfiguration
-func (c *S3) PutBucketLifecycleConfiguration(input *PutBucketLifecycleConfigurationInput) (*PutBucketLifecycleConfigurationOutput, error) {
-	req, out := c.PutBucketLifecycleConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketLifecycleConfigurationWithContext is the same as PutBucketLifecycleConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketLifecycleConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketLifecycleConfigurationWithContext(ctx aws.Context, input *PutBucketLifecycleConfigurationInput, opts ...request.Option) (*PutBucketLifecycleConfigurationOutput, error) {
-	req, out := c.PutBucketLifecycleConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketLogging = "PutBucketLogging"
-
-// PutBucketLoggingRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketLogging operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketLogging for more information on using the PutBucketLogging
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketLoggingRequest method.
-//    req, resp := client.PutBucketLoggingRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLogging
-func (c *S3) PutBucketLoggingRequest(input *PutBucketLoggingInput) (req *request.Request, output *PutBucketLoggingOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketLogging,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?logging",
-	}
-
-	if input == nil {
-		input = &PutBucketLoggingInput{}
-	}
-
-	output = &PutBucketLoggingOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketLogging API operation for Amazon Simple Storage Service.
-//
-// Set the logging parameters for a bucket and to specify permissions for who
-// can view and modify the logging parameters. To set the logging status of
-// a bucket, you must be the bucket owner.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketLogging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLogging
-func (c *S3) PutBucketLogging(input *PutBucketLoggingInput) (*PutBucketLoggingOutput, error) {
-	req, out := c.PutBucketLoggingRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketLoggingWithContext is the same as PutBucketLogging with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketLogging for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketLoggingWithContext(ctx aws.Context, input *PutBucketLoggingInput, opts ...request.Option) (*PutBucketLoggingOutput, error) {
-	req, out := c.PutBucketLoggingRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketMetricsConfiguration = "PutBucketMetricsConfiguration"
-
-// PutBucketMetricsConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketMetricsConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketMetricsConfiguration for more information on using the PutBucketMetricsConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketMetricsConfigurationRequest method.
-//    req, resp := client.PutBucketMetricsConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketMetricsConfiguration
-func (c *S3) PutBucketMetricsConfigurationRequest(input *PutBucketMetricsConfigurationInput) (req *request.Request, output *PutBucketMetricsConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketMetricsConfiguration,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?metrics",
-	}
-
-	if input == nil {
-		input = &PutBucketMetricsConfigurationInput{}
-	}
-
-	output = &PutBucketMetricsConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketMetricsConfiguration API operation for Amazon Simple Storage Service.
-//
-// Sets a metrics configuration (specified by the metrics configuration ID)
-// for the bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketMetricsConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketMetricsConfiguration
-func (c *S3) PutBucketMetricsConfiguration(input *PutBucketMetricsConfigurationInput) (*PutBucketMetricsConfigurationOutput, error) {
-	req, out := c.PutBucketMetricsConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketMetricsConfigurationWithContext is the same as PutBucketMetricsConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketMetricsConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketMetricsConfigurationWithContext(ctx aws.Context, input *PutBucketMetricsConfigurationInput, opts ...request.Option) (*PutBucketMetricsConfigurationOutput, error) {
-	req, out := c.PutBucketMetricsConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketNotification = "PutBucketNotification"
-
-// PutBucketNotificationRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketNotification operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketNotification for more information on using the PutBucketNotification
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketNotificationRequest method.
-//    req, resp := client.PutBucketNotificationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotification
-func (c *S3) PutBucketNotificationRequest(input *PutBucketNotificationInput) (req *request.Request, output *PutBucketNotificationOutput) {
-	if c.Client.Config.Logger != nil {
-		c.Client.Config.Logger.Log("This operation, PutBucketNotification, has been deprecated")
-	}
-	op := &request.Operation{
-		Name:       opPutBucketNotification,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?notification",
-	}
-
-	if input == nil {
-		input = &PutBucketNotificationInput{}
-	}
-
-	output = &PutBucketNotificationOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketNotification API operation for Amazon Simple Storage Service.
-//
-// Deprecated, see the PutBucketNotificationConfiguraiton operation.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketNotification for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotification
-func (c *S3) PutBucketNotification(input *PutBucketNotificationInput) (*PutBucketNotificationOutput, error) {
-	req, out := c.PutBucketNotificationRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketNotificationWithContext is the same as PutBucketNotification with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketNotification for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketNotificationWithContext(ctx aws.Context, input *PutBucketNotificationInput, opts ...request.Option) (*PutBucketNotificationOutput, error) {
-	req, out := c.PutBucketNotificationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketNotificationConfiguration = "PutBucketNotificationConfiguration"
-
-// PutBucketNotificationConfigurationRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketNotificationConfiguration operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketNotificationConfiguration for more information on using the PutBucketNotificationConfiguration
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketNotificationConfigurationRequest method.
-//    req, resp := client.PutBucketNotificationConfigurationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationConfiguration
-func (c *S3) PutBucketNotificationConfigurationRequest(input *PutBucketNotificationConfigurationInput) (req *request.Request, output *PutBucketNotificationConfigurationOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketNotificationConfiguration,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?notification",
-	}
-
-	if input == nil {
-		input = &PutBucketNotificationConfigurationInput{}
-	}
-
-	output = &PutBucketNotificationConfigurationOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketNotificationConfiguration API operation for Amazon Simple Storage Service.
-//
-// Enables notifications of specified events for a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketNotificationConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationConfiguration
-func (c *S3) PutBucketNotificationConfiguration(input *PutBucketNotificationConfigurationInput) (*PutBucketNotificationConfigurationOutput, error) {
-	req, out := c.PutBucketNotificationConfigurationRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketNotificationConfigurationWithContext is the same as PutBucketNotificationConfiguration with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketNotificationConfiguration for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketNotificationConfigurationWithContext(ctx aws.Context, input *PutBucketNotificationConfigurationInput, opts ...request.Option) (*PutBucketNotificationConfigurationOutput, error) {
-	req, out := c.PutBucketNotificationConfigurationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketPolicy = "PutBucketPolicy"
-
-// PutBucketPolicyRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketPolicy operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketPolicy for more information on using the PutBucketPolicy
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketPolicyRequest method.
-//    req, resp := client.PutBucketPolicyRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketPolicy
-func (c *S3) PutBucketPolicyRequest(input *PutBucketPolicyInput) (req *request.Request, output *PutBucketPolicyOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketPolicy,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?policy",
-	}
-
-	if input == nil {
-		input = &PutBucketPolicyInput{}
-	}
-
-	output = &PutBucketPolicyOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketPolicy API operation for Amazon Simple Storage Service.
-//
-// Replaces a policy on a bucket. If the bucket already has a policy, the one
-// in this request completely replaces it.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketPolicy for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketPolicy
-func (c *S3) PutBucketPolicy(input *PutBucketPolicyInput) (*PutBucketPolicyOutput, error) {
-	req, out := c.PutBucketPolicyRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketPolicyWithContext is the same as PutBucketPolicy with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketPolicy for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketPolicyWithContext(ctx aws.Context, input *PutBucketPolicyInput, opts ...request.Option) (*PutBucketPolicyOutput, error) {
-	req, out := c.PutBucketPolicyRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketReplication = "PutBucketReplication"
-
-// PutBucketReplicationRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketReplication operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketReplication for more information on using the PutBucketReplication
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketReplicationRequest method.
-//    req, resp := client.PutBucketReplicationRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketReplication
-func (c *S3) PutBucketReplicationRequest(input *PutBucketReplicationInput) (req *request.Request, output *PutBucketReplicationOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketReplication,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?replication",
-	}
-
-	if input == nil {
-		input = &PutBucketReplicationInput{}
-	}
-
-	output = &PutBucketReplicationOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketReplication API operation for Amazon Simple Storage Service.
-//
-// Creates a new replication configuration (or replaces an existing one, if
-// present).
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketReplication for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketReplication
-func (c *S3) PutBucketReplication(input *PutBucketReplicationInput) (*PutBucketReplicationOutput, error) {
-	req, out := c.PutBucketReplicationRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketReplicationWithContext is the same as PutBucketReplication with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketReplication for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketReplicationWithContext(ctx aws.Context, input *PutBucketReplicationInput, opts ...request.Option) (*PutBucketReplicationOutput, error) {
-	req, out := c.PutBucketReplicationRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketRequestPayment = "PutBucketRequestPayment"
-
-// PutBucketRequestPaymentRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketRequestPayment operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketRequestPayment for more information on using the PutBucketRequestPayment
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketRequestPaymentRequest method.
-//    req, resp := client.PutBucketRequestPaymentRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketRequestPayment
-func (c *S3) PutBucketRequestPaymentRequest(input *PutBucketRequestPaymentInput) (req *request.Request, output *PutBucketRequestPaymentOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketRequestPayment,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?requestPayment",
-	}
-
-	if input == nil {
-		input = &PutBucketRequestPaymentInput{}
-	}
-
-	output = &PutBucketRequestPaymentOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketRequestPayment API operation for Amazon Simple Storage Service.
-//
-// Sets the request payment configuration for a bucket. By default, the bucket
-// owner pays for downloads from the bucket. This configuration parameter enables
-// the bucket owner (only) to specify that the person requesting the download
-// will be charged for the download. Documentation on requester pays buckets
-// can be found at http://docs.aws.amazon.com/AmazonS3/latest/dev/RequesterPaysBuckets.html
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketRequestPayment for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketRequestPayment
-func (c *S3) PutBucketRequestPayment(input *PutBucketRequestPaymentInput) (*PutBucketRequestPaymentOutput, error) {
-	req, out := c.PutBucketRequestPaymentRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketRequestPaymentWithContext is the same as PutBucketRequestPayment with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketRequestPayment for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketRequestPaymentWithContext(ctx aws.Context, input *PutBucketRequestPaymentInput, opts ...request.Option) (*PutBucketRequestPaymentOutput, error) {
-	req, out := c.PutBucketRequestPaymentRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketTagging = "PutBucketTagging"
-
-// PutBucketTaggingRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketTagging operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketTagging for more information on using the PutBucketTagging
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketTaggingRequest method.
-//    req, resp := client.PutBucketTaggingRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketTagging
-func (c *S3) PutBucketTaggingRequest(input *PutBucketTaggingInput) (req *request.Request, output *PutBucketTaggingOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketTagging,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?tagging",
-	}
-
-	if input == nil {
-		input = &PutBucketTaggingInput{}
-	}
-
-	output = &PutBucketTaggingOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketTagging API operation for Amazon Simple Storage Service.
-//
-// Sets the tags for a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketTagging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketTagging
-func (c *S3) PutBucketTagging(input *PutBucketTaggingInput) (*PutBucketTaggingOutput, error) {
-	req, out := c.PutBucketTaggingRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketTaggingWithContext is the same as PutBucketTagging with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketTagging for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketTaggingWithContext(ctx aws.Context, input *PutBucketTaggingInput, opts ...request.Option) (*PutBucketTaggingOutput, error) {
-	req, out := c.PutBucketTaggingRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketVersioning = "PutBucketVersioning"
-
-// PutBucketVersioningRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketVersioning operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketVersioning for more information on using the PutBucketVersioning
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketVersioningRequest method.
-//    req, resp := client.PutBucketVersioningRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketVersioning
-func (c *S3) PutBucketVersioningRequest(input *PutBucketVersioningInput) (req *request.Request, output *PutBucketVersioningOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketVersioning,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?versioning",
-	}
-
-	if input == nil {
-		input = &PutBucketVersioningInput{}
-	}
-
-	output = &PutBucketVersioningOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketVersioning API operation for Amazon Simple Storage Service.
-//
-// Sets the versioning state of an existing bucket. To set the versioning state,
-// you must be the bucket owner.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketVersioning for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketVersioning
-func (c *S3) PutBucketVersioning(input *PutBucketVersioningInput) (*PutBucketVersioningOutput, error) {
-	req, out := c.PutBucketVersioningRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketVersioningWithContext is the same as PutBucketVersioning with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketVersioning for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketVersioningWithContext(ctx aws.Context, input *PutBucketVersioningInput, opts ...request.Option) (*PutBucketVersioningOutput, error) {
-	req, out := c.PutBucketVersioningRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutBucketWebsite = "PutBucketWebsite"
-
-// PutBucketWebsiteRequest generates a "aws/request.Request" representing the
-// client's request for the PutBucketWebsite operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutBucketWebsite for more information on using the PutBucketWebsite
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutBucketWebsiteRequest method.
-//    req, resp := client.PutBucketWebsiteRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketWebsite
-func (c *S3) PutBucketWebsiteRequest(input *PutBucketWebsiteInput) (req *request.Request, output *PutBucketWebsiteOutput) {
-	op := &request.Operation{
-		Name:       opPutBucketWebsite,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}?website",
-	}
-
-	if input == nil {
-		input = &PutBucketWebsiteInput{}
-	}
-
-	output = &PutBucketWebsiteOutput{}
-	req = c.newRequest(op, input, output)
-	req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
-	req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
-	return
-}
-
-// PutBucketWebsite API operation for Amazon Simple Storage Service.
-//
-// Set the website configuration for a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutBucketWebsite for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketWebsite
-func (c *S3) PutBucketWebsite(input *PutBucketWebsiteInput) (*PutBucketWebsiteOutput, error) {
-	req, out := c.PutBucketWebsiteRequest(input)
-	return out, req.Send()
-}
-
-// PutBucketWebsiteWithContext is the same as PutBucketWebsite with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutBucketWebsite for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutBucketWebsiteWithContext(ctx aws.Context, input *PutBucketWebsiteInput, opts ...request.Option) (*PutBucketWebsiteOutput, error) {
-	req, out := c.PutBucketWebsiteRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutObject = "PutObject"
-
-// PutObjectRequest generates a "aws/request.Request" representing the
-// client's request for the PutObject operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutObject for more information on using the PutObject
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutObjectRequest method.
-//    req, resp := client.PutObjectRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObject
-func (c *S3) PutObjectRequest(input *PutObjectInput) (req *request.Request, output *PutObjectOutput) {
-	op := &request.Operation{
-		Name:       opPutObject,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}/{Key+}",
-	}
-
-	if input == nil {
-		input = &PutObjectInput{}
-	}
-
-	output = &PutObjectOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// PutObject API operation for Amazon Simple Storage Service.
-//
-// Adds an object to a bucket.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutObject for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObject
-func (c *S3) PutObject(input *PutObjectInput) (*PutObjectOutput, error) {
-	req, out := c.PutObjectRequest(input)
-	return out, req.Send()
-}
-
-// PutObjectWithContext is the same as PutObject with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutObject for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutObjectWithContext(ctx aws.Context, input *PutObjectInput, opts ...request.Option) (*PutObjectOutput, error) {
-	req, out := c.PutObjectRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutObjectAcl = "PutObjectAcl"
-
-// PutObjectAclRequest generates a "aws/request.Request" representing the
-// client's request for the PutObjectAcl operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutObjectAcl for more information on using the PutObjectAcl
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutObjectAclRequest method.
-//    req, resp := client.PutObjectAclRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectAcl
-func (c *S3) PutObjectAclRequest(input *PutObjectAclInput) (req *request.Request, output *PutObjectAclOutput) {
-	op := &request.Operation{
-		Name:       opPutObjectAcl,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}/{Key+}?acl",
-	}
-
-	if input == nil {
-		input = &PutObjectAclInput{}
-	}
-
-	output = &PutObjectAclOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// PutObjectAcl API operation for Amazon Simple Storage Service.
-//
-// uses the acl subresource to set the access control list (ACL) permissions
-// for an object that already exists in a bucket
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutObjectAcl for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeNoSuchKey "NoSuchKey"
-//   The specified key does not exist.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectAcl
-func (c *S3) PutObjectAcl(input *PutObjectAclInput) (*PutObjectAclOutput, error) {
-	req, out := c.PutObjectAclRequest(input)
-	return out, req.Send()
-}
-
-// PutObjectAclWithContext is the same as PutObjectAcl with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutObjectAcl for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutObjectAclWithContext(ctx aws.Context, input *PutObjectAclInput, opts ...request.Option) (*PutObjectAclOutput, error) {
-	req, out := c.PutObjectAclRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opPutObjectTagging = "PutObjectTagging"
-
-// PutObjectTaggingRequest generates a "aws/request.Request" representing the
-// client's request for the PutObjectTagging operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See PutObjectTagging for more information on using the PutObjectTagging
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the PutObjectTaggingRequest method.
-//    req, resp := client.PutObjectTaggingRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectTagging
-func (c *S3) PutObjectTaggingRequest(input *PutObjectTaggingInput) (req *request.Request, output *PutObjectTaggingOutput) {
-	op := &request.Operation{
-		Name:       opPutObjectTagging,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}/{Key+}?tagging",
-	}
-
-	if input == nil {
-		input = &PutObjectTaggingInput{}
-	}
-
-	output = &PutObjectTaggingOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// PutObjectTagging API operation for Amazon Simple Storage Service.
-//
-// Sets the supplied tag-set to an object that already exists in a bucket
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation PutObjectTagging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectTagging
-func (c *S3) PutObjectTagging(input *PutObjectTaggingInput) (*PutObjectTaggingOutput, error) {
-	req, out := c.PutObjectTaggingRequest(input)
-	return out, req.Send()
-}
-
-// PutObjectTaggingWithContext is the same as PutObjectTagging with the addition of
-// the ability to pass a context and additional request options.
-//
-// See PutObjectTagging for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) PutObjectTaggingWithContext(ctx aws.Context, input *PutObjectTaggingInput, opts ...request.Option) (*PutObjectTaggingOutput, error) {
-	req, out := c.PutObjectTaggingRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opRestoreObject = "RestoreObject"
-
-// RestoreObjectRequest generates a "aws/request.Request" representing the
-// client's request for the RestoreObject operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See RestoreObject for more information on using the RestoreObject
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the RestoreObjectRequest method.
-//    req, resp := client.RestoreObjectRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreObject
-func (c *S3) RestoreObjectRequest(input *RestoreObjectInput) (req *request.Request, output *RestoreObjectOutput) {
-	op := &request.Operation{
-		Name:       opRestoreObject,
-		HTTPMethod: "POST",
-		HTTPPath:   "/{Bucket}/{Key+}?restore",
-	}
-
-	if input == nil {
-		input = &RestoreObjectInput{}
-	}
-
-	output = &RestoreObjectOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// RestoreObject API operation for Amazon Simple Storage Service.
-//
-// Restores an archived copy of an object back into Amazon S3
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation RestoreObject for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeObjectAlreadyInActiveTierError "ObjectAlreadyInActiveTierError"
-//   This operation is not allowed against this storage tier
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreObject
-func (c *S3) RestoreObject(input *RestoreObjectInput) (*RestoreObjectOutput, error) {
-	req, out := c.RestoreObjectRequest(input)
-	return out, req.Send()
-}
-
-// RestoreObjectWithContext is the same as RestoreObject with the addition of
-// the ability to pass a context and additional request options.
-//
-// See RestoreObject for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) RestoreObjectWithContext(ctx aws.Context, input *RestoreObjectInput, opts ...request.Option) (*RestoreObjectOutput, error) {
-	req, out := c.RestoreObjectRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opUploadPart = "UploadPart"
-
-// UploadPartRequest generates a "aws/request.Request" representing the
-// client's request for the UploadPart operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See UploadPart for more information on using the UploadPart
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the UploadPartRequest method.
-//    req, resp := client.UploadPartRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPart
-func (c *S3) UploadPartRequest(input *UploadPartInput) (req *request.Request, output *UploadPartOutput) {
-	op := &request.Operation{
-		Name:       opUploadPart,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}/{Key+}",
-	}
-
-	if input == nil {
-		input = &UploadPartInput{}
-	}
-
-	output = &UploadPartOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// UploadPart API operation for Amazon Simple Storage Service.
-//
-// Uploads a part in a multipart upload.
-//
-// Note: After you initiate multipart upload and upload one or more parts, you
-// must either complete or abort multipart upload in order to stop getting charged
-// for storage of the uploaded parts. Only after you either complete or abort
-// multipart upload, Amazon S3 frees up the parts storage and stops charging
-// you for the parts storage.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation UploadPart for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPart
-func (c *S3) UploadPart(input *UploadPartInput) (*UploadPartOutput, error) {
-	req, out := c.UploadPartRequest(input)
-	return out, req.Send()
-}
-
-// UploadPartWithContext is the same as UploadPart with the addition of
-// the ability to pass a context and additional request options.
-//
-// See UploadPart for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) UploadPartWithContext(ctx aws.Context, input *UploadPartInput, opts ...request.Option) (*UploadPartOutput, error) {
-	req, out := c.UploadPartRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opUploadPartCopy = "UploadPartCopy"
-
-// UploadPartCopyRequest generates a "aws/request.Request" representing the
-// client's request for the UploadPartCopy operation. The "output" return
-// value will be populated with the request's response once the request complets
-// successfuly.
-//
-// Use "Send" method on the returned Request to send the API call to the service.
-// the "output" return value is not valid until after Send returns without error.
-//
-// See UploadPartCopy for more information on using the UploadPartCopy
-// API call, and error handling.
-//
-// This method is useful when you want to inject custom logic or configuration
-// into the SDK's request lifecycle. Such as custom headers, or retry logic.
-//
-//
-//    // Example sending a request using the UploadPartCopyRequest method.
-//    req, resp := client.UploadPartCopyRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartCopy
-func (c *S3) UploadPartCopyRequest(input *UploadPartCopyInput) (req *request.Request, output *UploadPartCopyOutput) {
-	op := &request.Operation{
-		Name:       opUploadPartCopy,
-		HTTPMethod: "PUT",
-		HTTPPath:   "/{Bucket}/{Key+}",
-	}
-
-	if input == nil {
-		input = &UploadPartCopyInput{}
-	}
-
-	output = &UploadPartCopyOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// UploadPartCopy API operation for Amazon Simple Storage Service.
-//
-// Uploads a part by copying data from an existing object as data source.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for Amazon Simple Storage Service's
-// API operation UploadPartCopy for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartCopy
-func (c *S3) UploadPartCopy(input *UploadPartCopyInput) (*UploadPartCopyOutput, error) {
-	req, out := c.UploadPartCopyRequest(input)
-	return out, req.Send()
-}
-
-// UploadPartCopyWithContext is the same as UploadPartCopy with the addition of
-// the ability to pass a context and additional request options.
-//
-// See UploadPartCopy for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) UploadPartCopyWithContext(ctx aws.Context, input *UploadPartCopyInput, opts ...request.Option) (*UploadPartCopyOutput, error) {
-	req, out := c.UploadPartCopyRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-// Specifies the days since the initiation of an Incomplete Multipart Upload
-// that Lifecycle will wait before permanently removing all parts of the upload.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AbortIncompleteMultipartUpload
-type AbortIncompleteMultipartUpload struct {
-	_ struct{} `type:"structure"`
-
-	// Indicates the number of days that must pass since initiation for Lifecycle
-	// to abort an Incomplete Multipart Upload.
-	DaysAfterInitiation *int64 `type:"integer"`
-}
-
-// String returns the string representation
-func (s AbortIncompleteMultipartUpload) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AbortIncompleteMultipartUpload) GoString() string {
-	return s.String()
-}
-
-// SetDaysAfterInitiation sets the DaysAfterInitiation field's value.
-func (s *AbortIncompleteMultipartUpload) SetDaysAfterInitiation(v int64) *AbortIncompleteMultipartUpload {
-	s.DaysAfterInitiation = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AbortMultipartUploadRequest
-type AbortMultipartUploadInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// UploadId is a required field
-	UploadId *string `location:"querystring" locationName:"uploadId" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s AbortMultipartUploadInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AbortMultipartUploadInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *AbortMultipartUploadInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "AbortMultipartUploadInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-	if s.UploadId == nil {
-		invalidParams.Add(request.NewErrParamRequired("UploadId"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *AbortMultipartUploadInput) SetBucket(v string) *AbortMultipartUploadInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *AbortMultipartUploadInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetKey sets the Key field's value.
-func (s *AbortMultipartUploadInput) SetKey(v string) *AbortMultipartUploadInput {
-	s.Key = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *AbortMultipartUploadInput) SetRequestPayer(v string) *AbortMultipartUploadInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetUploadId sets the UploadId field's value.
-func (s *AbortMultipartUploadInput) SetUploadId(v string) *AbortMultipartUploadInput {
-	s.UploadId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AbortMultipartUploadOutput
-type AbortMultipartUploadOutput struct {
-	_ struct{} `type:"structure"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-}
-
-// String returns the string representation
-func (s AbortMultipartUploadOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AbortMultipartUploadOutput) GoString() string {
-	return s.String()
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *AbortMultipartUploadOutput) SetRequestCharged(v string) *AbortMultipartUploadOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AccelerateConfiguration
-type AccelerateConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// The accelerate configuration of the bucket.
-	Status *string `type:"string" enum:"BucketAccelerateStatus"`
-}
-
-// String returns the string representation
-func (s AccelerateConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AccelerateConfiguration) GoString() string {
-	return s.String()
-}
-
-// SetStatus sets the Status field's value.
-func (s *AccelerateConfiguration) SetStatus(v string) *AccelerateConfiguration {
-	s.Status = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AccessControlPolicy
-type AccessControlPolicy struct {
-	_ struct{} `type:"structure"`
-
-	// A list of grants.
-	Grants []*Grant `locationName:"AccessControlList" locationNameList:"Grant" type:"list"`
-
-	Owner *Owner `type:"structure"`
-}
-
-// String returns the string representation
-func (s AccessControlPolicy) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AccessControlPolicy) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *AccessControlPolicy) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "AccessControlPolicy"}
-	if s.Grants != nil {
-		for i, v := range s.Grants {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Grants", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetGrants sets the Grants field's value.
-func (s *AccessControlPolicy) SetGrants(v []*Grant) *AccessControlPolicy {
-	s.Grants = v
-	return s
-}
-
-// SetOwner sets the Owner field's value.
-func (s *AccessControlPolicy) SetOwner(v *Owner) *AccessControlPolicy {
-	s.Owner = v
-	return s
-}
-
-// Container for information regarding the access control for replicas.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AccessControlTranslation
-type AccessControlTranslation struct {
-	_ struct{} `type:"structure"`
-
-	// The override value for the owner of the replica object.
-	//
-	// Owner is a required field
-	Owner *string `type:"string" required:"true" enum:"OwnerOverride"`
-}
-
-// String returns the string representation
-func (s AccessControlTranslation) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AccessControlTranslation) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *AccessControlTranslation) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "AccessControlTranslation"}
-	if s.Owner == nil {
-		invalidParams.Add(request.NewErrParamRequired("Owner"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetOwner sets the Owner field's value.
-func (s *AccessControlTranslation) SetOwner(v string) *AccessControlTranslation {
-	s.Owner = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AnalyticsAndOperator
-type AnalyticsAndOperator struct {
-	_ struct{} `type:"structure"`
-
-	// The prefix to use when evaluating an AND predicate.
-	Prefix *string `type:"string"`
-
-	// The list of tags to use when evaluating an AND predicate.
-	Tags []*Tag `locationName:"Tag" locationNameList:"Tag" type:"list" flattened:"true"`
-}
-
-// String returns the string representation
-func (s AnalyticsAndOperator) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AnalyticsAndOperator) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *AnalyticsAndOperator) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "AnalyticsAndOperator"}
-	if s.Tags != nil {
-		for i, v := range s.Tags {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Tags", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *AnalyticsAndOperator) SetPrefix(v string) *AnalyticsAndOperator {
-	s.Prefix = &v
-	return s
-}
-
-// SetTags sets the Tags field's value.
-func (s *AnalyticsAndOperator) SetTags(v []*Tag) *AnalyticsAndOperator {
-	s.Tags = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AnalyticsConfiguration
-type AnalyticsConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// The filter used to describe a set of objects for analyses. A filter must
-	// have exactly one prefix, one tag, or one conjunction (AnalyticsAndOperator).
-	// If no filter is provided, all objects will be considered in any analysis.
-	Filter *AnalyticsFilter `type:"structure"`
-
-	// The identifier used to represent an analytics configuration.
-	//
-	// Id is a required field
-	Id *string `type:"string" required:"true"`
-
-	// If present, it indicates that data related to access patterns will be collected
-	// and made available to analyze the tradeoffs between different storage classes.
-	//
-	// StorageClassAnalysis is a required field
-	StorageClassAnalysis *StorageClassAnalysis `type:"structure" required:"true"`
-}
-
-// String returns the string representation
-func (s AnalyticsConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AnalyticsConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *AnalyticsConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "AnalyticsConfiguration"}
-	if s.Id == nil {
-		invalidParams.Add(request.NewErrParamRequired("Id"))
-	}
-	if s.StorageClassAnalysis == nil {
-		invalidParams.Add(request.NewErrParamRequired("StorageClassAnalysis"))
-	}
-	if s.Filter != nil {
-		if err := s.Filter.Validate(); err != nil {
-			invalidParams.AddNested("Filter", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.StorageClassAnalysis != nil {
-		if err := s.StorageClassAnalysis.Validate(); err != nil {
-			invalidParams.AddNested("StorageClassAnalysis", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetFilter sets the Filter field's value.
-func (s *AnalyticsConfiguration) SetFilter(v *AnalyticsFilter) *AnalyticsConfiguration {
-	s.Filter = v
-	return s
-}
-
-// SetId sets the Id field's value.
-func (s *AnalyticsConfiguration) SetId(v string) *AnalyticsConfiguration {
-	s.Id = &v
-	return s
-}
-
-// SetStorageClassAnalysis sets the StorageClassAnalysis field's value.
-func (s *AnalyticsConfiguration) SetStorageClassAnalysis(v *StorageClassAnalysis) *AnalyticsConfiguration {
-	s.StorageClassAnalysis = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AnalyticsExportDestination
-type AnalyticsExportDestination struct {
-	_ struct{} `type:"structure"`
-
-	// A destination signifying output to an S3 bucket.
-	//
-	// S3BucketDestination is a required field
-	S3BucketDestination *AnalyticsS3BucketDestination `type:"structure" required:"true"`
-}
-
-// String returns the string representation
-func (s AnalyticsExportDestination) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AnalyticsExportDestination) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *AnalyticsExportDestination) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "AnalyticsExportDestination"}
-	if s.S3BucketDestination == nil {
-		invalidParams.Add(request.NewErrParamRequired("S3BucketDestination"))
-	}
-	if s.S3BucketDestination != nil {
-		if err := s.S3BucketDestination.Validate(); err != nil {
-			invalidParams.AddNested("S3BucketDestination", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetS3BucketDestination sets the S3BucketDestination field's value.
-func (s *AnalyticsExportDestination) SetS3BucketDestination(v *AnalyticsS3BucketDestination) *AnalyticsExportDestination {
-	s.S3BucketDestination = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AnalyticsFilter
-type AnalyticsFilter struct {
-	_ struct{} `type:"structure"`
-
-	// A conjunction (logical AND) of predicates, which is used in evaluating an
-	// analytics filter. The operator must have at least two predicates.
-	And *AnalyticsAndOperator `type:"structure"`
-
-	// The prefix to use when evaluating an analytics filter.
-	Prefix *string `type:"string"`
-
-	// The tag to use when evaluating an analytics filter.
-	Tag *Tag `type:"structure"`
-}
-
-// String returns the string representation
-func (s AnalyticsFilter) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AnalyticsFilter) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *AnalyticsFilter) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "AnalyticsFilter"}
-	if s.And != nil {
-		if err := s.And.Validate(); err != nil {
-			invalidParams.AddNested("And", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.Tag != nil {
-		if err := s.Tag.Validate(); err != nil {
-			invalidParams.AddNested("Tag", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetAnd sets the And field's value.
-func (s *AnalyticsFilter) SetAnd(v *AnalyticsAndOperator) *AnalyticsFilter {
-	s.And = v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *AnalyticsFilter) SetPrefix(v string) *AnalyticsFilter {
-	s.Prefix = &v
-	return s
-}
-
-// SetTag sets the Tag field's value.
-func (s *AnalyticsFilter) SetTag(v *Tag) *AnalyticsFilter {
-	s.Tag = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AnalyticsS3BucketDestination
-type AnalyticsS3BucketDestination struct {
-	_ struct{} `type:"structure"`
-
-	// The Amazon resource name (ARN) of the bucket to which data is exported.
-	//
-	// Bucket is a required field
-	Bucket *string `type:"string" required:"true"`
-
-	// The account ID that owns the destination bucket. If no account ID is provided,
-	// the owner will not be validated prior to exporting data.
-	BucketAccountId *string `type:"string"`
-
-	// The file format used when exporting data to Amazon S3.
-	//
-	// Format is a required field
-	Format *string `type:"string" required:"true" enum:"AnalyticsS3ExportFileFormat"`
-
-	// The prefix to use when exporting data. The exported data begins with this
-	// prefix.
-	Prefix *string `type:"string"`
-}
-
-// String returns the string representation
-func (s AnalyticsS3BucketDestination) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AnalyticsS3BucketDestination) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *AnalyticsS3BucketDestination) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "AnalyticsS3BucketDestination"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Format == nil {
-		invalidParams.Add(request.NewErrParamRequired("Format"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *AnalyticsS3BucketDestination) SetBucket(v string) *AnalyticsS3BucketDestination {
-	s.Bucket = &v
-	return s
-}
-
-func (s *AnalyticsS3BucketDestination) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetBucketAccountId sets the BucketAccountId field's value.
-func (s *AnalyticsS3BucketDestination) SetBucketAccountId(v string) *AnalyticsS3BucketDestination {
-	s.BucketAccountId = &v
-	return s
-}
-
-// SetFormat sets the Format field's value.
-func (s *AnalyticsS3BucketDestination) SetFormat(v string) *AnalyticsS3BucketDestination {
-	s.Format = &v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *AnalyticsS3BucketDestination) SetPrefix(v string) *AnalyticsS3BucketDestination {
-	s.Prefix = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Bucket
-type Bucket struct {
-	_ struct{} `type:"structure"`
-
-	// Date the bucket was created.
-	CreationDate *time.Time `type:"timestamp" timestampFormat:"iso8601"`
-
-	// The name of the bucket.
-	Name *string `type:"string"`
-}
-
-// String returns the string representation
-func (s Bucket) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Bucket) GoString() string {
-	return s.String()
-}
-
-// SetCreationDate sets the CreationDate field's value.
-func (s *Bucket) SetCreationDate(v time.Time) *Bucket {
-	s.CreationDate = &v
-	return s
-}
-
-// SetName sets the Name field's value.
-func (s *Bucket) SetName(v string) *Bucket {
-	s.Name = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/BucketLifecycleConfiguration
-type BucketLifecycleConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// Rules is a required field
-	Rules []*LifecycleRule `locationName:"Rule" type:"list" flattened:"true" required:"true"`
-}
-
-// String returns the string representation
-func (s BucketLifecycleConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s BucketLifecycleConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *BucketLifecycleConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "BucketLifecycleConfiguration"}
-	if s.Rules == nil {
-		invalidParams.Add(request.NewErrParamRequired("Rules"))
-	}
-	if s.Rules != nil {
-		for i, v := range s.Rules {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Rules", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetRules sets the Rules field's value.
-func (s *BucketLifecycleConfiguration) SetRules(v []*LifecycleRule) *BucketLifecycleConfiguration {
-	s.Rules = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/BucketLoggingStatus
-type BucketLoggingStatus struct {
-	_ struct{} `type:"structure"`
-
-	LoggingEnabled *LoggingEnabled `type:"structure"`
-}
-
-// String returns the string representation
-func (s BucketLoggingStatus) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s BucketLoggingStatus) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *BucketLoggingStatus) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "BucketLoggingStatus"}
-	if s.LoggingEnabled != nil {
-		if err := s.LoggingEnabled.Validate(); err != nil {
-			invalidParams.AddNested("LoggingEnabled", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetLoggingEnabled sets the LoggingEnabled field's value.
-func (s *BucketLoggingStatus) SetLoggingEnabled(v *LoggingEnabled) *BucketLoggingStatus {
-	s.LoggingEnabled = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CORSConfiguration
-type CORSConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// CORSRules is a required field
-	CORSRules []*CORSRule `locationName:"CORSRule" type:"list" flattened:"true" required:"true"`
-}
-
-// String returns the string representation
-func (s CORSConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CORSConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *CORSConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "CORSConfiguration"}
-	if s.CORSRules == nil {
-		invalidParams.Add(request.NewErrParamRequired("CORSRules"))
-	}
-	if s.CORSRules != nil {
-		for i, v := range s.CORSRules {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "CORSRules", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetCORSRules sets the CORSRules field's value.
-func (s *CORSConfiguration) SetCORSRules(v []*CORSRule) *CORSConfiguration {
-	s.CORSRules = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CORSRule
-type CORSRule struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies which headers are allowed in a pre-flight OPTIONS request.
-	AllowedHeaders []*string `locationName:"AllowedHeader" type:"list" flattened:"true"`
-
-	// Identifies HTTP methods that the domain/origin specified in the rule is allowed
-	// to execute.
-	//
-	// AllowedMethods is a required field
-	AllowedMethods []*string `locationName:"AllowedMethod" type:"list" flattened:"true" required:"true"`
-
-	// One or more origins you want customers to be able to access the bucket from.
-	//
-	// AllowedOrigins is a required field
-	AllowedOrigins []*string `locationName:"AllowedOrigin" type:"list" flattened:"true" required:"true"`
-
-	// One or more headers in the response that you want customers to be able to
-	// access from their applications (for example, from a JavaScript XMLHttpRequest
-	// object).
-	ExposeHeaders []*string `locationName:"ExposeHeader" type:"list" flattened:"true"`
-
-	// The time in seconds that your browser is to cache the preflight response
-	// for the specified resource.
-	MaxAgeSeconds *int64 `type:"integer"`
-}
-
-// String returns the string representation
-func (s CORSRule) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CORSRule) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *CORSRule) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "CORSRule"}
-	if s.AllowedMethods == nil {
-		invalidParams.Add(request.NewErrParamRequired("AllowedMethods"))
-	}
-	if s.AllowedOrigins == nil {
-		invalidParams.Add(request.NewErrParamRequired("AllowedOrigins"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetAllowedHeaders sets the AllowedHeaders field's value.
-func (s *CORSRule) SetAllowedHeaders(v []*string) *CORSRule {
-	s.AllowedHeaders = v
-	return s
-}
-
-// SetAllowedMethods sets the AllowedMethods field's value.
-func (s *CORSRule) SetAllowedMethods(v []*string) *CORSRule {
-	s.AllowedMethods = v
-	return s
-}
-
-// SetAllowedOrigins sets the AllowedOrigins field's value.
-func (s *CORSRule) SetAllowedOrigins(v []*string) *CORSRule {
-	s.AllowedOrigins = v
-	return s
-}
-
-// SetExposeHeaders sets the ExposeHeaders field's value.
-func (s *CORSRule) SetExposeHeaders(v []*string) *CORSRule {
-	s.ExposeHeaders = v
-	return s
-}
-
-// SetMaxAgeSeconds sets the MaxAgeSeconds field's value.
-func (s *CORSRule) SetMaxAgeSeconds(v int64) *CORSRule {
-	s.MaxAgeSeconds = &v
-	return s
-}
-
-// Describes how a CSV-formatted input object is formatted.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CSVInput
-type CSVInput struct {
-	_ struct{} `type:"structure"`
-
-	// Single character used to indicate a row should be ignored when present at
-	// the start of a row.
-	Comments *string `type:"string"`
-
-	// Value used to separate individual fields in a record.
-	FieldDelimiter *string `type:"string"`
-
-	// Describes the first line of input. Valid values: None, Ignore, Use.
-	FileHeaderInfo *string `type:"string" enum:"FileHeaderInfo"`
-
-	// Value used for escaping where the field delimiter is part of the value.
-	QuoteCharacter *string `type:"string"`
-
-	// Single character used for escaping the quote character inside an already
-	// escaped value.
-	QuoteEscapeCharacter *string `type:"string"`
-
-	// Value used to separate individual records.
-	RecordDelimiter *string `type:"string"`
-}
-
-// String returns the string representation
-func (s CSVInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CSVInput) GoString() string {
-	return s.String()
-}
-
-// SetComments sets the Comments field's value.
-func (s *CSVInput) SetComments(v string) *CSVInput {
-	s.Comments = &v
-	return s
-}
-
-// SetFieldDelimiter sets the FieldDelimiter field's value.
-func (s *CSVInput) SetFieldDelimiter(v string) *CSVInput {
-	s.FieldDelimiter = &v
-	return s
-}
-
-// SetFileHeaderInfo sets the FileHeaderInfo field's value.
-func (s *CSVInput) SetFileHeaderInfo(v string) *CSVInput {
-	s.FileHeaderInfo = &v
-	return s
-}
-
-// SetQuoteCharacter sets the QuoteCharacter field's value.
-func (s *CSVInput) SetQuoteCharacter(v string) *CSVInput {
-	s.QuoteCharacter = &v
-	return s
-}
-
-// SetQuoteEscapeCharacter sets the QuoteEscapeCharacter field's value.
-func (s *CSVInput) SetQuoteEscapeCharacter(v string) *CSVInput {
-	s.QuoteEscapeCharacter = &v
-	return s
-}
-
-// SetRecordDelimiter sets the RecordDelimiter field's value.
-func (s *CSVInput) SetRecordDelimiter(v string) *CSVInput {
-	s.RecordDelimiter = &v
-	return s
-}
-
-// Describes how CSV-formatted results are formatted.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CSVOutput
-type CSVOutput struct {
-	_ struct{} `type:"structure"`
-
-	// Value used to separate individual fields in a record.
-	FieldDelimiter *string `type:"string"`
-
-	// Value used for escaping where the field delimiter is part of the value.
-	QuoteCharacter *string `type:"string"`
-
-	// Single character used for escaping the quote character inside an already
-	// escaped value.
-	QuoteEscapeCharacter *string `type:"string"`
-
-	// Indicates whether or not all output fields should be quoted.
-	QuoteFields *string `type:"string" enum:"QuoteFields"`
-
-	// Value used to separate individual records.
-	RecordDelimiter *string `type:"string"`
-}
-
-// String returns the string representation
-func (s CSVOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CSVOutput) GoString() string {
-	return s.String()
-}
-
-// SetFieldDelimiter sets the FieldDelimiter field's value.
-func (s *CSVOutput) SetFieldDelimiter(v string) *CSVOutput {
-	s.FieldDelimiter = &v
-	return s
-}
-
-// SetQuoteCharacter sets the QuoteCharacter field's value.
-func (s *CSVOutput) SetQuoteCharacter(v string) *CSVOutput {
-	s.QuoteCharacter = &v
-	return s
-}
-
-// SetQuoteEscapeCharacter sets the QuoteEscapeCharacter field's value.
-func (s *CSVOutput) SetQuoteEscapeCharacter(v string) *CSVOutput {
-	s.QuoteEscapeCharacter = &v
-	return s
-}
-
-// SetQuoteFields sets the QuoteFields field's value.
-func (s *CSVOutput) SetQuoteFields(v string) *CSVOutput {
-	s.QuoteFields = &v
-	return s
-}
-
-// SetRecordDelimiter sets the RecordDelimiter field's value.
-func (s *CSVOutput) SetRecordDelimiter(v string) *CSVOutput {
-	s.RecordDelimiter = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CloudFunctionConfiguration
-type CloudFunctionConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	CloudFunction *string `type:"string"`
-
-	// Bucket event for which to send notifications.
-	Event *string `deprecated:"true" type:"string" enum:"Event"`
-
-	Events []*string `locationName:"Event" type:"list" flattened:"true"`
-
-	// Optional unique identifier for configurations in a notification configuration.
-	// If you don't provide one, Amazon S3 will assign an ID.
-	Id *string `type:"string"`
-
-	InvocationRole *string `type:"string"`
-}
-
-// String returns the string representation
-func (s CloudFunctionConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CloudFunctionConfiguration) GoString() string {
-	return s.String()
-}
-
-// SetCloudFunction sets the CloudFunction field's value.
-func (s *CloudFunctionConfiguration) SetCloudFunction(v string) *CloudFunctionConfiguration {
-	s.CloudFunction = &v
-	return s
-}
-
-// SetEvent sets the Event field's value.
-func (s *CloudFunctionConfiguration) SetEvent(v string) *CloudFunctionConfiguration {
-	s.Event = &v
-	return s
-}
-
-// SetEvents sets the Events field's value.
-func (s *CloudFunctionConfiguration) SetEvents(v []*string) *CloudFunctionConfiguration {
-	s.Events = v
-	return s
-}
-
-// SetId sets the Id field's value.
-func (s *CloudFunctionConfiguration) SetId(v string) *CloudFunctionConfiguration {
-	s.Id = &v
-	return s
-}
-
-// SetInvocationRole sets the InvocationRole field's value.
-func (s *CloudFunctionConfiguration) SetInvocationRole(v string) *CloudFunctionConfiguration {
-	s.InvocationRole = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CommonPrefix
-type CommonPrefix struct {
-	_ struct{} `type:"structure"`
-
-	Prefix *string `type:"string"`
-}
-
-// String returns the string representation
-func (s CommonPrefix) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CommonPrefix) GoString() string {
-	return s.String()
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *CommonPrefix) SetPrefix(v string) *CommonPrefix {
-	s.Prefix = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompleteMultipartUploadRequest
-type CompleteMultipartUploadInput struct {
-	_ struct{} `type:"structure" payload:"MultipartUpload"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	MultipartUpload *CompletedMultipartUpload `locationName:"CompleteMultipartUpload" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// UploadId is a required field
-	UploadId *string `location:"querystring" locationName:"uploadId" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s CompleteMultipartUploadInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CompleteMultipartUploadInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *CompleteMultipartUploadInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "CompleteMultipartUploadInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-	if s.UploadId == nil {
-		invalidParams.Add(request.NewErrParamRequired("UploadId"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *CompleteMultipartUploadInput) SetBucket(v string) *CompleteMultipartUploadInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *CompleteMultipartUploadInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetKey sets the Key field's value.
-func (s *CompleteMultipartUploadInput) SetKey(v string) *CompleteMultipartUploadInput {
-	s.Key = &v
-	return s
-}
-
-// SetMultipartUpload sets the MultipartUpload field's value.
-func (s *CompleteMultipartUploadInput) SetMultipartUpload(v *CompletedMultipartUpload) *CompleteMultipartUploadInput {
-	s.MultipartUpload = v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *CompleteMultipartUploadInput) SetRequestPayer(v string) *CompleteMultipartUploadInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetUploadId sets the UploadId field's value.
-func (s *CompleteMultipartUploadInput) SetUploadId(v string) *CompleteMultipartUploadInput {
-	s.UploadId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompleteMultipartUploadOutput
-type CompleteMultipartUploadOutput struct {
-	_ struct{} `type:"structure"`
-
-	Bucket *string `type:"string"`
-
-	// Entity tag of the object.
-	ETag *string `type:"string"`
-
-	// If the object expiration is configured, this will contain the expiration
-	// date (expiry-date) and rule ID (rule-id). The value of rule-id is URL encoded.
-	Expiration *string `location:"header" locationName:"x-amz-expiration" type:"string"`
-
-	Key *string `min:"1" type:"string"`
-
-	Location *string `type:"string"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-
-	// If present, specifies the ID of the AWS Key Management Service (KMS) master
-	// encryption key that was used for the object.
-	SSEKMSKeyId *string `location:"header" locationName:"x-amz-server-side-encryption-aws-kms-key-id" type:"string"`
-
-	// The Server-side encryption algorithm used when storing this object in S3
-	// (e.g., AES256, aws:kms).
-	ServerSideEncryption *string `location:"header" locationName:"x-amz-server-side-encryption" type:"string" enum:"ServerSideEncryption"`
-
-	// Version of the object.
-	VersionId *string `location:"header" locationName:"x-amz-version-id" type:"string"`
-}
-
-// String returns the string representation
-func (s CompleteMultipartUploadOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CompleteMultipartUploadOutput) GoString() string {
-	return s.String()
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *CompleteMultipartUploadOutput) SetBucket(v string) *CompleteMultipartUploadOutput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *CompleteMultipartUploadOutput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetETag sets the ETag field's value.
-func (s *CompleteMultipartUploadOutput) SetETag(v string) *CompleteMultipartUploadOutput {
-	s.ETag = &v
-	return s
-}
-
-// SetExpiration sets the Expiration field's value.
-func (s *CompleteMultipartUploadOutput) SetExpiration(v string) *CompleteMultipartUploadOutput {
-	s.Expiration = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *CompleteMultipartUploadOutput) SetKey(v string) *CompleteMultipartUploadOutput {
-	s.Key = &v
-	return s
-}
-
-// SetLocation sets the Location field's value.
-func (s *CompleteMultipartUploadOutput) SetLocation(v string) *CompleteMultipartUploadOutput {
-	s.Location = &v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *CompleteMultipartUploadOutput) SetRequestCharged(v string) *CompleteMultipartUploadOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// SetSSEKMSKeyId sets the SSEKMSKeyId field's value.
-func (s *CompleteMultipartUploadOutput) SetSSEKMSKeyId(v string) *CompleteMultipartUploadOutput {
-	s.SSEKMSKeyId = &v
-	return s
-}
-
-// SetServerSideEncryption sets the ServerSideEncryption field's value.
-func (s *CompleteMultipartUploadOutput) SetServerSideEncryption(v string) *CompleteMultipartUploadOutput {
-	s.ServerSideEncryption = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *CompleteMultipartUploadOutput) SetVersionId(v string) *CompleteMultipartUploadOutput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompletedMultipartUpload
-type CompletedMultipartUpload struct {
-	_ struct{} `type:"structure"`
-
-	Parts []*CompletedPart `locationName:"Part" type:"list" flattened:"true"`
-}
-
-// String returns the string representation
-func (s CompletedMultipartUpload) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CompletedMultipartUpload) GoString() string {
-	return s.String()
-}
-
-// SetParts sets the Parts field's value.
-func (s *CompletedMultipartUpload) SetParts(v []*CompletedPart) *CompletedMultipartUpload {
-	s.Parts = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompletedPart
-type CompletedPart struct {
-	_ struct{} `type:"structure"`
-
-	// Entity tag returned when the part was uploaded.
-	ETag *string `type:"string"`
-
-	// Part number that identifies the part. This is a positive integer between
-	// 1 and 10,000.
-	PartNumber *int64 `type:"integer"`
-}
-
-// String returns the string representation
-func (s CompletedPart) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CompletedPart) GoString() string {
-	return s.String()
-}
-
-// SetETag sets the ETag field's value.
-func (s *CompletedPart) SetETag(v string) *CompletedPart {
-	s.ETag = &v
-	return s
-}
-
-// SetPartNumber sets the PartNumber field's value.
-func (s *CompletedPart) SetPartNumber(v int64) *CompletedPart {
-	s.PartNumber = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Condition
-type Condition struct {
-	_ struct{} `type:"structure"`
-
-	// The HTTP error code when the redirect is applied. In the event of an error,
-	// if the error code equals this value, then the specified redirect is applied.
-	// Required when parent element Condition is specified and sibling KeyPrefixEquals
-	// is not specified. If both are specified, then both must be true for the redirect
-	// to be applied.
-	HttpErrorCodeReturnedEquals *string `type:"string"`
-
-	// The object key name prefix when the redirect is applied. For example, to
-	// redirect requests for ExamplePage.html, the key prefix will be ExamplePage.html.
-	// To redirect request for all pages with the prefix docs/, the key prefix will
-	// be /docs, which identifies all objects in the docs/ folder. Required when
-	// the parent element Condition is specified and sibling HttpErrorCodeReturnedEquals
-	// is not specified. If both conditions are specified, both must be true for
-	// the redirect to be applied.
-	KeyPrefixEquals *string `type:"string"`
-}
-
-// String returns the string representation
-func (s Condition) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Condition) GoString() string {
-	return s.String()
-}
-
-// SetHttpErrorCodeReturnedEquals sets the HttpErrorCodeReturnedEquals field's value.
-func (s *Condition) SetHttpErrorCodeReturnedEquals(v string) *Condition {
-	s.HttpErrorCodeReturnedEquals = &v
-	return s
-}
-
-// SetKeyPrefixEquals sets the KeyPrefixEquals field's value.
-func (s *Condition) SetKeyPrefixEquals(v string) *Condition {
-	s.KeyPrefixEquals = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObjectRequest
-type CopyObjectInput struct {
-	_ struct{} `type:"structure"`
-
-	// The canned ACL to apply to the object.
-	ACL *string `location:"header" locationName:"x-amz-acl" type:"string" enum:"ObjectCannedACL"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Specifies caching behavior along the request/reply chain.
-	CacheControl *string `location:"header" locationName:"Cache-Control" type:"string"`
-
-	// Specifies presentational information for the object.
-	ContentDisposition *string `location:"header" locationName:"Content-Disposition" type:"string"`
-
-	// Specifies what content encodings have been applied to the object and thus
-	// what decoding mechanisms must be applied to obtain the media-type referenced
-	// by the Content-Type header field.
-	ContentEncoding *string `location:"header" locationName:"Content-Encoding" type:"string"`
-
-	// The language the content is in.
-	ContentLanguage *string `location:"header" locationName:"Content-Language" type:"string"`
-
-	// A standard MIME type describing the format of the object data.
-	ContentType *string `location:"header" locationName:"Content-Type" type:"string"`
-
-	// The name of the source bucket and key name of the source object, separated
-	// by a slash (/). Must be URL-encoded.
-	//
-	// CopySource is a required field
-	CopySource *string `location:"header" locationName:"x-amz-copy-source" type:"string" required:"true"`
-
-	// Copies the object if its entity tag (ETag) matches the specified tag.
-	CopySourceIfMatch *string `location:"header" locationName:"x-amz-copy-source-if-match" type:"string"`
-
-	// Copies the object if it has been modified since the specified time.
-	CopySourceIfModifiedSince *time.Time `location:"header" locationName:"x-amz-copy-source-if-modified-since" type:"timestamp" timestampFormat:"rfc822"`
-
-	// Copies the object if its entity tag (ETag) is different than the specified
-	// ETag.
-	CopySourceIfNoneMatch *string `location:"header" locationName:"x-amz-copy-source-if-none-match" type:"string"`
-
-	// Copies the object if it hasn't been modified since the specified time.
-	CopySourceIfUnmodifiedSince *time.Time `location:"header" locationName:"x-amz-copy-source-if-unmodified-since" type:"timestamp" timestampFormat:"rfc822"`
-
-	// Specifies the algorithm to use when decrypting the source object (e.g., AES256).
-	CopySourceSSECustomerAlgorithm *string `location:"header" locationName:"x-amz-copy-source-server-side-encryption-customer-algorithm" type:"string"`
-
-	// Specifies the customer-provided encryption key for Amazon S3 to use to decrypt
-	// the source object. The encryption key provided in this header must be one
-	// that was used when the source object was created.
-	CopySourceSSECustomerKey *string `location:"header" locationName:"x-amz-copy-source-server-side-encryption-customer-key" type:"string"`
-
-	// Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321.
-	// Amazon S3 uses this header for a message integrity check to ensure the encryption
-	// key was transmitted without error.
-	CopySourceSSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-copy-source-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// The date and time at which the object is no longer cacheable.
-	Expires *time.Time `location:"header" locationName:"Expires" type:"timestamp" timestampFormat:"rfc822"`
-
-	// Gives the grantee READ, READ_ACP, and WRITE_ACP permissions on the object.
-	GrantFullControl *string `location:"header" locationName:"x-amz-grant-full-control" type:"string"`
-
-	// Allows grantee to read the object data and its metadata.
-	GrantRead *string `location:"header" locationName:"x-amz-grant-read" type:"string"`
-
-	// Allows grantee to read the object ACL.
-	GrantReadACP *string `location:"header" locationName:"x-amz-grant-read-acp" type:"string"`
-
-	// Allows grantee to write the ACL for the applicable object.
-	GrantWriteACP *string `location:"header" locationName:"x-amz-grant-write-acp" type:"string"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// A map of metadata to store with the object in S3.
-	Metadata map[string]*string `location:"headers" locationName:"x-amz-meta-" type:"map"`
-
-	// Specifies whether the metadata is copied from the source object or replaced
-	// with metadata provided in the request.
-	MetadataDirective *string `location:"header" locationName:"x-amz-metadata-directive" type:"string" enum:"MetadataDirective"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// Specifies the algorithm to use to when encrypting the object (e.g., AES256).
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// Specifies the customer-provided encryption key for Amazon S3 to use in encrypting
-	// data. This value is used to store the object and then it is discarded; Amazon
-	// does not store the encryption key. The key must be appropriate for use with
-	// the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm
-	// header.
-	SSECustomerKey *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key" type:"string"`
-
-	// Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321.
-	// Amazon S3 uses this header for a message integrity check to ensure the encryption
-	// key was transmitted without error.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// Specifies the AWS KMS key ID to use for object encryption. All GET and PUT
-	// requests for an object protected by AWS KMS will fail if not made via SSL
-	// or using SigV4. Documentation on configuring any of the officially supported
-	// AWS SDKs and CLI can be found at http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
-	SSEKMSKeyId *string `location:"header" locationName:"x-amz-server-side-encryption-aws-kms-key-id" type:"string"`
-
-	// The Server-side encryption algorithm used when storing this object in S3
-	// (e.g., AES256, aws:kms).
-	ServerSideEncryption *string `location:"header" locationName:"x-amz-server-side-encryption" type:"string" enum:"ServerSideEncryption"`
-
-	// The type of storage to use for the object. Defaults to 'STANDARD'.
-	StorageClass *string `location:"header" locationName:"x-amz-storage-class" type:"string" enum:"StorageClass"`
-
-	// The tag-set for the object destination object this value must be used in
-	// conjunction with the TaggingDirective. The tag-set must be encoded as URL
-	// Query parameters
-	Tagging *string `location:"header" locationName:"x-amz-tagging" type:"string"`
-
-	// Specifies whether the object tag-set are copied from the source object or
-	// replaced with tag-set provided in the request.
-	TaggingDirective *string `location:"header" locationName:"x-amz-tagging-directive" type:"string" enum:"TaggingDirective"`
-
-	// If the bucket is configured as a website, redirects requests for this object
-	// to another object in the same bucket or to an external URL. Amazon S3 stores
-	// the value of this header in the object metadata.
-	WebsiteRedirectLocation *string `location:"header" locationName:"x-amz-website-redirect-location" type:"string"`
-}
-
-// String returns the string representation
-func (s CopyObjectInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CopyObjectInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *CopyObjectInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "CopyObjectInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.CopySource == nil {
-		invalidParams.Add(request.NewErrParamRequired("CopySource"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetACL sets the ACL field's value.
-func (s *CopyObjectInput) SetACL(v string) *CopyObjectInput {
-	s.ACL = &v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *CopyObjectInput) SetBucket(v string) *CopyObjectInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *CopyObjectInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetCacheControl sets the CacheControl field's value.
-func (s *CopyObjectInput) SetCacheControl(v string) *CopyObjectInput {
-	s.CacheControl = &v
-	return s
-}
-
-// SetContentDisposition sets the ContentDisposition field's value.
-func (s *CopyObjectInput) SetContentDisposition(v string) *CopyObjectInput {
-	s.ContentDisposition = &v
-	return s
-}
-
-// SetContentEncoding sets the ContentEncoding field's value.
-func (s *CopyObjectInput) SetContentEncoding(v string) *CopyObjectInput {
-	s.ContentEncoding = &v
-	return s
-}
-
-// SetContentLanguage sets the ContentLanguage field's value.
-func (s *CopyObjectInput) SetContentLanguage(v string) *CopyObjectInput {
-	s.ContentLanguage = &v
-	return s
-}
-
-// SetContentType sets the ContentType field's value.
-func (s *CopyObjectInput) SetContentType(v string) *CopyObjectInput {
-	s.ContentType = &v
-	return s
-}
-
-// SetCopySource sets the CopySource field's value.
-func (s *CopyObjectInput) SetCopySource(v string) *CopyObjectInput {
-	s.CopySource = &v
-	return s
-}
-
-// SetCopySourceIfMatch sets the CopySourceIfMatch field's value.
-func (s *CopyObjectInput) SetCopySourceIfMatch(v string) *CopyObjectInput {
-	s.CopySourceIfMatch = &v
-	return s
-}
-
-// SetCopySourceIfModifiedSince sets the CopySourceIfModifiedSince field's value.
-func (s *CopyObjectInput) SetCopySourceIfModifiedSince(v time.Time) *CopyObjectInput {
-	s.CopySourceIfModifiedSince = &v
-	return s
-}
-
-// SetCopySourceIfNoneMatch sets the CopySourceIfNoneMatch field's value.
-func (s *CopyObjectInput) SetCopySourceIfNoneMatch(v string) *CopyObjectInput {
-	s.CopySourceIfNoneMatch = &v
-	return s
-}
-
-// SetCopySourceIfUnmodifiedSince sets the CopySourceIfUnmodifiedSince field's value.
-func (s *CopyObjectInput) SetCopySourceIfUnmodifiedSince(v time.Time) *CopyObjectInput {
-	s.CopySourceIfUnmodifiedSince = &v
-	return s
-}
-
-// SetCopySourceSSECustomerAlgorithm sets the CopySourceSSECustomerAlgorithm field's value.
-func (s *CopyObjectInput) SetCopySourceSSECustomerAlgorithm(v string) *CopyObjectInput {
-	s.CopySourceSSECustomerAlgorithm = &v
-	return s
-}
-
-// SetCopySourceSSECustomerKey sets the CopySourceSSECustomerKey field's value.
-func (s *CopyObjectInput) SetCopySourceSSECustomerKey(v string) *CopyObjectInput {
-	s.CopySourceSSECustomerKey = &v
-	return s
-}
-
-func (s *CopyObjectInput) getCopySourceSSECustomerKey() (v string) {
-	if s.CopySourceSSECustomerKey == nil {
-		return v
-	}
-	return *s.CopySourceSSECustomerKey
-}
-
-// SetCopySourceSSECustomerKeyMD5 sets the CopySourceSSECustomerKeyMD5 field's value.
-func (s *CopyObjectInput) SetCopySourceSSECustomerKeyMD5(v string) *CopyObjectInput {
-	s.CopySourceSSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetExpires sets the Expires field's value.
-func (s *CopyObjectInput) SetExpires(v time.Time) *CopyObjectInput {
-	s.Expires = &v
-	return s
-}
-
-// SetGrantFullControl sets the GrantFullControl field's value.
-func (s *CopyObjectInput) SetGrantFullControl(v string) *CopyObjectInput {
-	s.GrantFullControl = &v
-	return s
-}
-
-// SetGrantRead sets the GrantRead field's value.
-func (s *CopyObjectInput) SetGrantRead(v string) *CopyObjectInput {
-	s.GrantRead = &v
-	return s
-}
-
-// SetGrantReadACP sets the GrantReadACP field's value.
-func (s *CopyObjectInput) SetGrantReadACP(v string) *CopyObjectInput {
-	s.GrantReadACP = &v
-	return s
-}
-
-// SetGrantWriteACP sets the GrantWriteACP field's value.
-func (s *CopyObjectInput) SetGrantWriteACP(v string) *CopyObjectInput {
-	s.GrantWriteACP = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *CopyObjectInput) SetKey(v string) *CopyObjectInput {
-	s.Key = &v
-	return s
-}
-
-// SetMetadata sets the Metadata field's value.
-func (s *CopyObjectInput) SetMetadata(v map[string]*string) *CopyObjectInput {
-	s.Metadata = v
-	return s
-}
-
-// SetMetadataDirective sets the MetadataDirective field's value.
-func (s *CopyObjectInput) SetMetadataDirective(v string) *CopyObjectInput {
-	s.MetadataDirective = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *CopyObjectInput) SetRequestPayer(v string) *CopyObjectInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *CopyObjectInput) SetSSECustomerAlgorithm(v string) *CopyObjectInput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKey sets the SSECustomerKey field's value.
-func (s *CopyObjectInput) SetSSECustomerKey(v string) *CopyObjectInput {
-	s.SSECustomerKey = &v
-	return s
-}
-
-func (s *CopyObjectInput) getSSECustomerKey() (v string) {
-	if s.SSECustomerKey == nil {
-		return v
-	}
-	return *s.SSECustomerKey
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *CopyObjectInput) SetSSECustomerKeyMD5(v string) *CopyObjectInput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetSSEKMSKeyId sets the SSEKMSKeyId field's value.
-func (s *CopyObjectInput) SetSSEKMSKeyId(v string) *CopyObjectInput {
-	s.SSEKMSKeyId = &v
-	return s
-}
-
-// SetServerSideEncryption sets the ServerSideEncryption field's value.
-func (s *CopyObjectInput) SetServerSideEncryption(v string) *CopyObjectInput {
-	s.ServerSideEncryption = &v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *CopyObjectInput) SetStorageClass(v string) *CopyObjectInput {
-	s.StorageClass = &v
-	return s
-}
-
-// SetTagging sets the Tagging field's value.
-func (s *CopyObjectInput) SetTagging(v string) *CopyObjectInput {
-	s.Tagging = &v
-	return s
-}
-
-// SetTaggingDirective sets the TaggingDirective field's value.
-func (s *CopyObjectInput) SetTaggingDirective(v string) *CopyObjectInput {
-	s.TaggingDirective = &v
-	return s
-}
-
-// SetWebsiteRedirectLocation sets the WebsiteRedirectLocation field's value.
-func (s *CopyObjectInput) SetWebsiteRedirectLocation(v string) *CopyObjectInput {
-	s.WebsiteRedirectLocation = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObjectOutput
-type CopyObjectOutput struct {
-	_ struct{} `type:"structure" payload:"CopyObjectResult"`
-
-	CopyObjectResult *CopyObjectResult `type:"structure"`
-
-	CopySourceVersionId *string `location:"header" locationName:"x-amz-copy-source-version-id" type:"string"`
-
-	// If the object expiration is configured, the response includes this header.
-	Expiration *string `location:"header" locationName:"x-amz-expiration" type:"string"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header confirming the encryption algorithm
-	// used.
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header to provide round trip message integrity
-	// verification of the customer-provided encryption key.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// If present, specifies the ID of the AWS Key Management Service (KMS) master
-	// encryption key that was used for the object.
-	SSEKMSKeyId *string `location:"header" locationName:"x-amz-server-side-encryption-aws-kms-key-id" type:"string"`
-
-	// The Server-side encryption algorithm used when storing this object in S3
-	// (e.g., AES256, aws:kms).
-	ServerSideEncryption *string `location:"header" locationName:"x-amz-server-side-encryption" type:"string" enum:"ServerSideEncryption"`
-
-	// Version ID of the newly created copy.
-	VersionId *string `location:"header" locationName:"x-amz-version-id" type:"string"`
-}
-
-// String returns the string representation
-func (s CopyObjectOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CopyObjectOutput) GoString() string {
-	return s.String()
-}
-
-// SetCopyObjectResult sets the CopyObjectResult field's value.
-func (s *CopyObjectOutput) SetCopyObjectResult(v *CopyObjectResult) *CopyObjectOutput {
-	s.CopyObjectResult = v
-	return s
-}
-
-// SetCopySourceVersionId sets the CopySourceVersionId field's value.
-func (s *CopyObjectOutput) SetCopySourceVersionId(v string) *CopyObjectOutput {
-	s.CopySourceVersionId = &v
-	return s
-}
-
-// SetExpiration sets the Expiration field's value.
-func (s *CopyObjectOutput) SetExpiration(v string) *CopyObjectOutput {
-	s.Expiration = &v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *CopyObjectOutput) SetRequestCharged(v string) *CopyObjectOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *CopyObjectOutput) SetSSECustomerAlgorithm(v string) *CopyObjectOutput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *CopyObjectOutput) SetSSECustomerKeyMD5(v string) *CopyObjectOutput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetSSEKMSKeyId sets the SSEKMSKeyId field's value.
-func (s *CopyObjectOutput) SetSSEKMSKeyId(v string) *CopyObjectOutput {
-	s.SSEKMSKeyId = &v
-	return s
-}
-
-// SetServerSideEncryption sets the ServerSideEncryption field's value.
-func (s *CopyObjectOutput) SetServerSideEncryption(v string) *CopyObjectOutput {
-	s.ServerSideEncryption = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *CopyObjectOutput) SetVersionId(v string) *CopyObjectOutput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObjectResult
-type CopyObjectResult struct {
-	_ struct{} `type:"structure"`
-
-	ETag *string `type:"string"`
-
-	LastModified *time.Time `type:"timestamp" timestampFormat:"iso8601"`
-}
-
-// String returns the string representation
-func (s CopyObjectResult) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CopyObjectResult) GoString() string {
-	return s.String()
-}
-
-// SetETag sets the ETag field's value.
-func (s *CopyObjectResult) SetETag(v string) *CopyObjectResult {
-	s.ETag = &v
-	return s
-}
-
-// SetLastModified sets the LastModified field's value.
-func (s *CopyObjectResult) SetLastModified(v time.Time) *CopyObjectResult {
-	s.LastModified = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyPartResult
-type CopyPartResult struct {
-	_ struct{} `type:"structure"`
-
-	// Entity tag of the object.
-	ETag *string `type:"string"`
-
-	// Date and time at which the object was uploaded.
-	LastModified *time.Time `type:"timestamp" timestampFormat:"iso8601"`
-}
-
-// String returns the string representation
-func (s CopyPartResult) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CopyPartResult) GoString() string {
-	return s.String()
-}
-
-// SetETag sets the ETag field's value.
-func (s *CopyPartResult) SetETag(v string) *CopyPartResult {
-	s.ETag = &v
-	return s
-}
-
-// SetLastModified sets the LastModified field's value.
-func (s *CopyPartResult) SetLastModified(v time.Time) *CopyPartResult {
-	s.LastModified = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateBucketConfiguration
-type CreateBucketConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies the region where the bucket will be created. If you don't specify
-	// a region, the bucket will be created in US Standard.
-	LocationConstraint *string `type:"string" enum:"BucketLocationConstraint"`
-}
-
-// String returns the string representation
-func (s CreateBucketConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CreateBucketConfiguration) GoString() string {
-	return s.String()
-}
-
-// SetLocationConstraint sets the LocationConstraint field's value.
-func (s *CreateBucketConfiguration) SetLocationConstraint(v string) *CreateBucketConfiguration {
-	s.LocationConstraint = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateBucketRequest
-type CreateBucketInput struct {
-	_ struct{} `type:"structure" payload:"CreateBucketConfiguration"`
-
-	// The canned ACL to apply to the bucket.
-	ACL *string `location:"header" locationName:"x-amz-acl" type:"string" enum:"BucketCannedACL"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	CreateBucketConfiguration *CreateBucketConfiguration `locationName:"CreateBucketConfiguration" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-
-	// Allows grantee the read, write, read ACP, and write ACP permissions on the
-	// bucket.
-	GrantFullControl *string `location:"header" locationName:"x-amz-grant-full-control" type:"string"`
-
-	// Allows grantee to list the objects in the bucket.
-	GrantRead *string `location:"header" locationName:"x-amz-grant-read" type:"string"`
-
-	// Allows grantee to read the bucket ACL.
-	GrantReadACP *string `location:"header" locationName:"x-amz-grant-read-acp" type:"string"`
-
-	// Allows grantee to create, overwrite, and delete any object in the bucket.
-	GrantWrite *string `location:"header" locationName:"x-amz-grant-write" type:"string"`
-
-	// Allows grantee to write the ACL for the applicable bucket.
-	GrantWriteACP *string `location:"header" locationName:"x-amz-grant-write-acp" type:"string"`
-}
-
-// String returns the string representation
-func (s CreateBucketInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CreateBucketInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *CreateBucketInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "CreateBucketInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetACL sets the ACL field's value.
-func (s *CreateBucketInput) SetACL(v string) *CreateBucketInput {
-	s.ACL = &v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *CreateBucketInput) SetBucket(v string) *CreateBucketInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *CreateBucketInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetCreateBucketConfiguration sets the CreateBucketConfiguration field's value.
-func (s *CreateBucketInput) SetCreateBucketConfiguration(v *CreateBucketConfiguration) *CreateBucketInput {
-	s.CreateBucketConfiguration = v
-	return s
-}
-
-// SetGrantFullControl sets the GrantFullControl field's value.
-func (s *CreateBucketInput) SetGrantFullControl(v string) *CreateBucketInput {
-	s.GrantFullControl = &v
-	return s
-}
-
-// SetGrantRead sets the GrantRead field's value.
-func (s *CreateBucketInput) SetGrantRead(v string) *CreateBucketInput {
-	s.GrantRead = &v
-	return s
-}
-
-// SetGrantReadACP sets the GrantReadACP field's value.
-func (s *CreateBucketInput) SetGrantReadACP(v string) *CreateBucketInput {
-	s.GrantReadACP = &v
-	return s
-}
-
-// SetGrantWrite sets the GrantWrite field's value.
-func (s *CreateBucketInput) SetGrantWrite(v string) *CreateBucketInput {
-	s.GrantWrite = &v
-	return s
-}
-
-// SetGrantWriteACP sets the GrantWriteACP field's value.
-func (s *CreateBucketInput) SetGrantWriteACP(v string) *CreateBucketInput {
-	s.GrantWriteACP = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateBucketOutput
-type CreateBucketOutput struct {
-	_ struct{} `type:"structure"`
-
-	Location *string `location:"header" locationName:"Location" type:"string"`
-}
-
-// String returns the string representation
-func (s CreateBucketOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CreateBucketOutput) GoString() string {
-	return s.String()
-}
-
-// SetLocation sets the Location field's value.
-func (s *CreateBucketOutput) SetLocation(v string) *CreateBucketOutput {
-	s.Location = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateMultipartUploadRequest
-type CreateMultipartUploadInput struct {
-	_ struct{} `type:"structure"`
-
-	// The canned ACL to apply to the object.
-	ACL *string `location:"header" locationName:"x-amz-acl" type:"string" enum:"ObjectCannedACL"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Specifies caching behavior along the request/reply chain.
-	CacheControl *string `location:"header" locationName:"Cache-Control" type:"string"`
-
-	// Specifies presentational information for the object.
-	ContentDisposition *string `location:"header" locationName:"Content-Disposition" type:"string"`
-
-	// Specifies what content encodings have been applied to the object and thus
-	// what decoding mechanisms must be applied to obtain the media-type referenced
-	// by the Content-Type header field.
-	ContentEncoding *string `location:"header" locationName:"Content-Encoding" type:"string"`
-
-	// The language the content is in.
-	ContentLanguage *string `location:"header" locationName:"Content-Language" type:"string"`
-
-	// A standard MIME type describing the format of the object data.
-	ContentType *string `location:"header" locationName:"Content-Type" type:"string"`
-
-	// The date and time at which the object is no longer cacheable.
-	Expires *time.Time `location:"header" locationName:"Expires" type:"timestamp" timestampFormat:"rfc822"`
-
-	// Gives the grantee READ, READ_ACP, and WRITE_ACP permissions on the object.
-	GrantFullControl *string `location:"header" locationName:"x-amz-grant-full-control" type:"string"`
-
-	// Allows grantee to read the object data and its metadata.
-	GrantRead *string `location:"header" locationName:"x-amz-grant-read" type:"string"`
-
-	// Allows grantee to read the object ACL.
-	GrantReadACP *string `location:"header" locationName:"x-amz-grant-read-acp" type:"string"`
-
-	// Allows grantee to write the ACL for the applicable object.
-	GrantWriteACP *string `location:"header" locationName:"x-amz-grant-write-acp" type:"string"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// A map of metadata to store with the object in S3.
-	Metadata map[string]*string `location:"headers" locationName:"x-amz-meta-" type:"map"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// Specifies the algorithm to use to when encrypting the object (e.g., AES256).
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// Specifies the customer-provided encryption key for Amazon S3 to use in encrypting
-	// data. This value is used to store the object and then it is discarded; Amazon
-	// does not store the encryption key. The key must be appropriate for use with
-	// the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm
-	// header.
-	SSECustomerKey *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key" type:"string"`
-
-	// Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321.
-	// Amazon S3 uses this header for a message integrity check to ensure the encryption
-	// key was transmitted without error.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// Specifies the AWS KMS key ID to use for object encryption. All GET and PUT
-	// requests for an object protected by AWS KMS will fail if not made via SSL
-	// or using SigV4. Documentation on configuring any of the officially supported
-	// AWS SDKs and CLI can be found at http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
-	SSEKMSKeyId *string `location:"header" locationName:"x-amz-server-side-encryption-aws-kms-key-id" type:"string"`
-
-	// The Server-side encryption algorithm used when storing this object in S3
-	// (e.g., AES256, aws:kms).
-	ServerSideEncryption *string `location:"header" locationName:"x-amz-server-side-encryption" type:"string" enum:"ServerSideEncryption"`
-
-	// The type of storage to use for the object. Defaults to 'STANDARD'.
-	StorageClass *string `location:"header" locationName:"x-amz-storage-class" type:"string" enum:"StorageClass"`
-
-	// The tag-set for the object. The tag-set must be encoded as URL Query parameters
-	Tagging *string `location:"header" locationName:"x-amz-tagging" type:"string"`
-
-	// If the bucket is configured as a website, redirects requests for this object
-	// to another object in the same bucket or to an external URL. Amazon S3 stores
-	// the value of this header in the object metadata.
-	WebsiteRedirectLocation *string `location:"header" locationName:"x-amz-website-redirect-location" type:"string"`
-}
-
-// String returns the string representation
-func (s CreateMultipartUploadInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CreateMultipartUploadInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *CreateMultipartUploadInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "CreateMultipartUploadInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetACL sets the ACL field's value.
-func (s *CreateMultipartUploadInput) SetACL(v string) *CreateMultipartUploadInput {
-	s.ACL = &v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *CreateMultipartUploadInput) SetBucket(v string) *CreateMultipartUploadInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *CreateMultipartUploadInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetCacheControl sets the CacheControl field's value.
-func (s *CreateMultipartUploadInput) SetCacheControl(v string) *CreateMultipartUploadInput {
-	s.CacheControl = &v
-	return s
-}
-
-// SetContentDisposition sets the ContentDisposition field's value.
-func (s *CreateMultipartUploadInput) SetContentDisposition(v string) *CreateMultipartUploadInput {
-	s.ContentDisposition = &v
-	return s
-}
-
-// SetContentEncoding sets the ContentEncoding field's value.
-func (s *CreateMultipartUploadInput) SetContentEncoding(v string) *CreateMultipartUploadInput {
-	s.ContentEncoding = &v
-	return s
-}
-
-// SetContentLanguage sets the ContentLanguage field's value.
-func (s *CreateMultipartUploadInput) SetContentLanguage(v string) *CreateMultipartUploadInput {
-	s.ContentLanguage = &v
-	return s
-}
-
-// SetContentType sets the ContentType field's value.
-func (s *CreateMultipartUploadInput) SetContentType(v string) *CreateMultipartUploadInput {
-	s.ContentType = &v
-	return s
-}
-
-// SetExpires sets the Expires field's value.
-func (s *CreateMultipartUploadInput) SetExpires(v time.Time) *CreateMultipartUploadInput {
-	s.Expires = &v
-	return s
-}
-
-// SetGrantFullControl sets the GrantFullControl field's value.
-func (s *CreateMultipartUploadInput) SetGrantFullControl(v string) *CreateMultipartUploadInput {
-	s.GrantFullControl = &v
-	return s
-}
-
-// SetGrantRead sets the GrantRead field's value.
-func (s *CreateMultipartUploadInput) SetGrantRead(v string) *CreateMultipartUploadInput {
-	s.GrantRead = &v
-	return s
-}
-
-// SetGrantReadACP sets the GrantReadACP field's value.
-func (s *CreateMultipartUploadInput) SetGrantReadACP(v string) *CreateMultipartUploadInput {
-	s.GrantReadACP = &v
-	return s
-}
-
-// SetGrantWriteACP sets the GrantWriteACP field's value.
-func (s *CreateMultipartUploadInput) SetGrantWriteACP(v string) *CreateMultipartUploadInput {
-	s.GrantWriteACP = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *CreateMultipartUploadInput) SetKey(v string) *CreateMultipartUploadInput {
-	s.Key = &v
-	return s
-}
-
-// SetMetadata sets the Metadata field's value.
-func (s *CreateMultipartUploadInput) SetMetadata(v map[string]*string) *CreateMultipartUploadInput {
-	s.Metadata = v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *CreateMultipartUploadInput) SetRequestPayer(v string) *CreateMultipartUploadInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *CreateMultipartUploadInput) SetSSECustomerAlgorithm(v string) *CreateMultipartUploadInput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKey sets the SSECustomerKey field's value.
-func (s *CreateMultipartUploadInput) SetSSECustomerKey(v string) *CreateMultipartUploadInput {
-	s.SSECustomerKey = &v
-	return s
-}
-
-func (s *CreateMultipartUploadInput) getSSECustomerKey() (v string) {
-	if s.SSECustomerKey == nil {
-		return v
-	}
-	return *s.SSECustomerKey
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *CreateMultipartUploadInput) SetSSECustomerKeyMD5(v string) *CreateMultipartUploadInput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetSSEKMSKeyId sets the SSEKMSKeyId field's value.
-func (s *CreateMultipartUploadInput) SetSSEKMSKeyId(v string) *CreateMultipartUploadInput {
-	s.SSEKMSKeyId = &v
-	return s
-}
-
-// SetServerSideEncryption sets the ServerSideEncryption field's value.
-func (s *CreateMultipartUploadInput) SetServerSideEncryption(v string) *CreateMultipartUploadInput {
-	s.ServerSideEncryption = &v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *CreateMultipartUploadInput) SetStorageClass(v string) *CreateMultipartUploadInput {
-	s.StorageClass = &v
-	return s
-}
-
-// SetTagging sets the Tagging field's value.
-func (s *CreateMultipartUploadInput) SetTagging(v string) *CreateMultipartUploadInput {
-	s.Tagging = &v
-	return s
-}
-
-// SetWebsiteRedirectLocation sets the WebsiteRedirectLocation field's value.
-func (s *CreateMultipartUploadInput) SetWebsiteRedirectLocation(v string) *CreateMultipartUploadInput {
-	s.WebsiteRedirectLocation = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateMultipartUploadOutput
-type CreateMultipartUploadOutput struct {
-	_ struct{} `type:"structure"`
-
-	// Date when multipart upload will become eligible for abort operation by lifecycle.
-	AbortDate *time.Time `location:"header" locationName:"x-amz-abort-date" type:"timestamp" timestampFormat:"rfc822"`
-
-	// Id of the lifecycle rule that makes a multipart upload eligible for abort
-	// operation.
-	AbortRuleId *string `location:"header" locationName:"x-amz-abort-rule-id" type:"string"`
-
-	// Name of the bucket to which the multipart upload was initiated.
-	Bucket *string `locationName:"Bucket" type:"string"`
-
-	// Object key for which the multipart upload was initiated.
-	Key *string `min:"1" type:"string"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header confirming the encryption algorithm
-	// used.
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header to provide round trip message integrity
-	// verification of the customer-provided encryption key.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// If present, specifies the ID of the AWS Key Management Service (KMS) master
-	// encryption key that was used for the object.
-	SSEKMSKeyId *string `location:"header" locationName:"x-amz-server-side-encryption-aws-kms-key-id" type:"string"`
-
-	// The Server-side encryption algorithm used when storing this object in S3
-	// (e.g., AES256, aws:kms).
-	ServerSideEncryption *string `location:"header" locationName:"x-amz-server-side-encryption" type:"string" enum:"ServerSideEncryption"`
-
-	// ID for the initiated multipart upload.
-	UploadId *string `type:"string"`
-}
-
-// String returns the string representation
-func (s CreateMultipartUploadOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s CreateMultipartUploadOutput) GoString() string {
-	return s.String()
-}
-
-// SetAbortDate sets the AbortDate field's value.
-func (s *CreateMultipartUploadOutput) SetAbortDate(v time.Time) *CreateMultipartUploadOutput {
-	s.AbortDate = &v
-	return s
-}
-
-// SetAbortRuleId sets the AbortRuleId field's value.
-func (s *CreateMultipartUploadOutput) SetAbortRuleId(v string) *CreateMultipartUploadOutput {
-	s.AbortRuleId = &v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *CreateMultipartUploadOutput) SetBucket(v string) *CreateMultipartUploadOutput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *CreateMultipartUploadOutput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetKey sets the Key field's value.
-func (s *CreateMultipartUploadOutput) SetKey(v string) *CreateMultipartUploadOutput {
-	s.Key = &v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *CreateMultipartUploadOutput) SetRequestCharged(v string) *CreateMultipartUploadOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *CreateMultipartUploadOutput) SetSSECustomerAlgorithm(v string) *CreateMultipartUploadOutput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *CreateMultipartUploadOutput) SetSSECustomerKeyMD5(v string) *CreateMultipartUploadOutput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetSSEKMSKeyId sets the SSEKMSKeyId field's value.
-func (s *CreateMultipartUploadOutput) SetSSEKMSKeyId(v string) *CreateMultipartUploadOutput {
-	s.SSEKMSKeyId = &v
-	return s
-}
-
-// SetServerSideEncryption sets the ServerSideEncryption field's value.
-func (s *CreateMultipartUploadOutput) SetServerSideEncryption(v string) *CreateMultipartUploadOutput {
-	s.ServerSideEncryption = &v
-	return s
-}
-
-// SetUploadId sets the UploadId field's value.
-func (s *CreateMultipartUploadOutput) SetUploadId(v string) *CreateMultipartUploadOutput {
-	s.UploadId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Delete
-type Delete struct {
-	_ struct{} `type:"structure"`
-
-	// Objects is a required field
-	Objects []*ObjectIdentifier `locationName:"Object" type:"list" flattened:"true" required:"true"`
-
-	// Element to enable quiet mode for the request. When you add this element,
-	// you must set its value to true.
-	Quiet *bool `type:"boolean"`
-}
-
-// String returns the string representation
-func (s Delete) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Delete) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *Delete) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "Delete"}
-	if s.Objects == nil {
-		invalidParams.Add(request.NewErrParamRequired("Objects"))
-	}
-	if s.Objects != nil {
-		for i, v := range s.Objects {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Objects", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetObjects sets the Objects field's value.
-func (s *Delete) SetObjects(v []*ObjectIdentifier) *Delete {
-	s.Objects = v
-	return s
-}
-
-// SetQuiet sets the Quiet field's value.
-func (s *Delete) SetQuiet(v bool) *Delete {
-	s.Quiet = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketAnalyticsConfigurationRequest
-type DeleteBucketAnalyticsConfigurationInput struct {
-	_ struct{} `type:"structure"`
-
-	// The name of the bucket from which an analytics configuration is deleted.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The identifier used to represent an analytics configuration.
-	//
-	// Id is a required field
-	Id *string `location:"querystring" locationName:"id" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s DeleteBucketAnalyticsConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketAnalyticsConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteBucketAnalyticsConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteBucketAnalyticsConfigurationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Id == nil {
-		invalidParams.Add(request.NewErrParamRequired("Id"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteBucketAnalyticsConfigurationInput) SetBucket(v string) *DeleteBucketAnalyticsConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteBucketAnalyticsConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetId sets the Id field's value.
-func (s *DeleteBucketAnalyticsConfigurationInput) SetId(v string) *DeleteBucketAnalyticsConfigurationInput {
-	s.Id = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketAnalyticsConfigurationOutput
-type DeleteBucketAnalyticsConfigurationOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s DeleteBucketAnalyticsConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketAnalyticsConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketCorsRequest
-type DeleteBucketCorsInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s DeleteBucketCorsInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketCorsInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteBucketCorsInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteBucketCorsInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteBucketCorsInput) SetBucket(v string) *DeleteBucketCorsInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteBucketCorsInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketCorsOutput
-type DeleteBucketCorsOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s DeleteBucketCorsOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketCorsOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketEncryptionRequest
-type DeleteBucketEncryptionInput struct {
-	_ struct{} `type:"structure"`
-
-	// The name of the bucket containing the server-side encryption configuration
-	// to delete.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s DeleteBucketEncryptionInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketEncryptionInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteBucketEncryptionInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteBucketEncryptionInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteBucketEncryptionInput) SetBucket(v string) *DeleteBucketEncryptionInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteBucketEncryptionInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketEncryptionOutput
-type DeleteBucketEncryptionOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s DeleteBucketEncryptionOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketEncryptionOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketRequest
-type DeleteBucketInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s DeleteBucketInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteBucketInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteBucketInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteBucketInput) SetBucket(v string) *DeleteBucketInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteBucketInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketInventoryConfigurationRequest
-type DeleteBucketInventoryConfigurationInput struct {
-	_ struct{} `type:"structure"`
-
-	// The name of the bucket containing the inventory configuration to delete.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The ID used to identify the inventory configuration.
-	//
-	// Id is a required field
-	Id *string `location:"querystring" locationName:"id" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s DeleteBucketInventoryConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketInventoryConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteBucketInventoryConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteBucketInventoryConfigurationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Id == nil {
-		invalidParams.Add(request.NewErrParamRequired("Id"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteBucketInventoryConfigurationInput) SetBucket(v string) *DeleteBucketInventoryConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteBucketInventoryConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetId sets the Id field's value.
-func (s *DeleteBucketInventoryConfigurationInput) SetId(v string) *DeleteBucketInventoryConfigurationInput {
-	s.Id = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketInventoryConfigurationOutput
-type DeleteBucketInventoryConfigurationOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s DeleteBucketInventoryConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketInventoryConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketLifecycleRequest
-type DeleteBucketLifecycleInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s DeleteBucketLifecycleInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketLifecycleInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteBucketLifecycleInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteBucketLifecycleInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteBucketLifecycleInput) SetBucket(v string) *DeleteBucketLifecycleInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteBucketLifecycleInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketLifecycleOutput
-type DeleteBucketLifecycleOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s DeleteBucketLifecycleOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketLifecycleOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketMetricsConfigurationRequest
-type DeleteBucketMetricsConfigurationInput struct {
-	_ struct{} `type:"structure"`
-
-	// The name of the bucket containing the metrics configuration to delete.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The ID used to identify the metrics configuration.
-	//
-	// Id is a required field
-	Id *string `location:"querystring" locationName:"id" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s DeleteBucketMetricsConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketMetricsConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteBucketMetricsConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteBucketMetricsConfigurationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Id == nil {
-		invalidParams.Add(request.NewErrParamRequired("Id"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteBucketMetricsConfigurationInput) SetBucket(v string) *DeleteBucketMetricsConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteBucketMetricsConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetId sets the Id field's value.
-func (s *DeleteBucketMetricsConfigurationInput) SetId(v string) *DeleteBucketMetricsConfigurationInput {
-	s.Id = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketMetricsConfigurationOutput
-type DeleteBucketMetricsConfigurationOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s DeleteBucketMetricsConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketMetricsConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketOutput
-type DeleteBucketOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s DeleteBucketOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketPolicyRequest
-type DeleteBucketPolicyInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s DeleteBucketPolicyInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketPolicyInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteBucketPolicyInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteBucketPolicyInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteBucketPolicyInput) SetBucket(v string) *DeleteBucketPolicyInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteBucketPolicyInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketPolicyOutput
-type DeleteBucketPolicyOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s DeleteBucketPolicyOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketPolicyOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketReplicationRequest
-type DeleteBucketReplicationInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s DeleteBucketReplicationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketReplicationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteBucketReplicationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteBucketReplicationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteBucketReplicationInput) SetBucket(v string) *DeleteBucketReplicationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteBucketReplicationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketReplicationOutput
-type DeleteBucketReplicationOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s DeleteBucketReplicationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketReplicationOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketTaggingRequest
-type DeleteBucketTaggingInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s DeleteBucketTaggingInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketTaggingInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteBucketTaggingInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteBucketTaggingInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteBucketTaggingInput) SetBucket(v string) *DeleteBucketTaggingInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteBucketTaggingInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketTaggingOutput
-type DeleteBucketTaggingOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s DeleteBucketTaggingOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketTaggingOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketWebsiteRequest
-type DeleteBucketWebsiteInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s DeleteBucketWebsiteInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketWebsiteInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteBucketWebsiteInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteBucketWebsiteInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteBucketWebsiteInput) SetBucket(v string) *DeleteBucketWebsiteInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteBucketWebsiteInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketWebsiteOutput
-type DeleteBucketWebsiteOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s DeleteBucketWebsiteOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteBucketWebsiteOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteMarkerEntry
-type DeleteMarkerEntry struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies whether the object is (true) or is not (false) the latest version
-	// of an object.
-	IsLatest *bool `type:"boolean"`
-
-	// The object key.
-	Key *string `min:"1" type:"string"`
-
-	// Date and time the object was last modified.
-	LastModified *time.Time `type:"timestamp" timestampFormat:"iso8601"`
-
-	Owner *Owner `type:"structure"`
-
-	// Version ID of an object.
-	VersionId *string `type:"string"`
-}
-
-// String returns the string representation
-func (s DeleteMarkerEntry) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteMarkerEntry) GoString() string {
-	return s.String()
-}
-
-// SetIsLatest sets the IsLatest field's value.
-func (s *DeleteMarkerEntry) SetIsLatest(v bool) *DeleteMarkerEntry {
-	s.IsLatest = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *DeleteMarkerEntry) SetKey(v string) *DeleteMarkerEntry {
-	s.Key = &v
-	return s
-}
-
-// SetLastModified sets the LastModified field's value.
-func (s *DeleteMarkerEntry) SetLastModified(v time.Time) *DeleteMarkerEntry {
-	s.LastModified = &v
-	return s
-}
-
-// SetOwner sets the Owner field's value.
-func (s *DeleteMarkerEntry) SetOwner(v *Owner) *DeleteMarkerEntry {
-	s.Owner = v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *DeleteMarkerEntry) SetVersionId(v string) *DeleteMarkerEntry {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectRequest
-type DeleteObjectInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// The concatenation of the authentication device's serial number, a space,
-	// and the value that is displayed on your authentication device.
-	MFA *string `location:"header" locationName:"x-amz-mfa" type:"string"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// VersionId used to reference a specific version of the object.
-	VersionId *string `location:"querystring" locationName:"versionId" type:"string"`
-}
-
-// String returns the string representation
-func (s DeleteObjectInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteObjectInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteObjectInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteObjectInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteObjectInput) SetBucket(v string) *DeleteObjectInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteObjectInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetKey sets the Key field's value.
-func (s *DeleteObjectInput) SetKey(v string) *DeleteObjectInput {
-	s.Key = &v
-	return s
-}
-
-// SetMFA sets the MFA field's value.
-func (s *DeleteObjectInput) SetMFA(v string) *DeleteObjectInput {
-	s.MFA = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *DeleteObjectInput) SetRequestPayer(v string) *DeleteObjectInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *DeleteObjectInput) SetVersionId(v string) *DeleteObjectInput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectOutput
-type DeleteObjectOutput struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies whether the versioned object that was permanently deleted was (true)
-	// or was not (false) a delete marker.
-	DeleteMarker *bool `location:"header" locationName:"x-amz-delete-marker" type:"boolean"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-
-	// Returns the version ID of the delete marker created as a result of the DELETE
-	// operation.
-	VersionId *string `location:"header" locationName:"x-amz-version-id" type:"string"`
-}
-
-// String returns the string representation
-func (s DeleteObjectOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteObjectOutput) GoString() string {
-	return s.String()
-}
-
-// SetDeleteMarker sets the DeleteMarker field's value.
-func (s *DeleteObjectOutput) SetDeleteMarker(v bool) *DeleteObjectOutput {
-	s.DeleteMarker = &v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *DeleteObjectOutput) SetRequestCharged(v string) *DeleteObjectOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *DeleteObjectOutput) SetVersionId(v string) *DeleteObjectOutput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectTaggingRequest
-type DeleteObjectTaggingInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// The versionId of the object that the tag-set will be removed from.
-	VersionId *string `location:"querystring" locationName:"versionId" type:"string"`
-}
-
-// String returns the string representation
-func (s DeleteObjectTaggingInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteObjectTaggingInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteObjectTaggingInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteObjectTaggingInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteObjectTaggingInput) SetBucket(v string) *DeleteObjectTaggingInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteObjectTaggingInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetKey sets the Key field's value.
-func (s *DeleteObjectTaggingInput) SetKey(v string) *DeleteObjectTaggingInput {
-	s.Key = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *DeleteObjectTaggingInput) SetVersionId(v string) *DeleteObjectTaggingInput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectTaggingOutput
-type DeleteObjectTaggingOutput struct {
-	_ struct{} `type:"structure"`
-
-	// The versionId of the object the tag-set was removed from.
-	VersionId *string `location:"header" locationName:"x-amz-version-id" type:"string"`
-}
-
-// String returns the string representation
-func (s DeleteObjectTaggingOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteObjectTaggingOutput) GoString() string {
-	return s.String()
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *DeleteObjectTaggingOutput) SetVersionId(v string) *DeleteObjectTaggingOutput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectsRequest
-type DeleteObjectsInput struct {
-	_ struct{} `type:"structure" payload:"Delete"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Delete is a required field
-	Delete *Delete `locationName:"Delete" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-
-	// The concatenation of the authentication device's serial number, a space,
-	// and the value that is displayed on your authentication device.
-	MFA *string `location:"header" locationName:"x-amz-mfa" type:"string"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-}
-
-// String returns the string representation
-func (s DeleteObjectsInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteObjectsInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DeleteObjectsInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DeleteObjectsInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Delete == nil {
-		invalidParams.Add(request.NewErrParamRequired("Delete"))
-	}
-	if s.Delete != nil {
-		if err := s.Delete.Validate(); err != nil {
-			invalidParams.AddNested("Delete", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *DeleteObjectsInput) SetBucket(v string) *DeleteObjectsInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *DeleteObjectsInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetDelete sets the Delete field's value.
-func (s *DeleteObjectsInput) SetDelete(v *Delete) *DeleteObjectsInput {
-	s.Delete = v
-	return s
-}
-
-// SetMFA sets the MFA field's value.
-func (s *DeleteObjectsInput) SetMFA(v string) *DeleteObjectsInput {
-	s.MFA = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *DeleteObjectsInput) SetRequestPayer(v string) *DeleteObjectsInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectsOutput
-type DeleteObjectsOutput struct {
-	_ struct{} `type:"structure"`
-
-	Deleted []*DeletedObject `type:"list" flattened:"true"`
-
-	Errors []*Error `locationName:"Error" type:"list" flattened:"true"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-}
-
-// String returns the string representation
-func (s DeleteObjectsOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeleteObjectsOutput) GoString() string {
-	return s.String()
-}
-
-// SetDeleted sets the Deleted field's value.
-func (s *DeleteObjectsOutput) SetDeleted(v []*DeletedObject) *DeleteObjectsOutput {
-	s.Deleted = v
-	return s
-}
-
-// SetErrors sets the Errors field's value.
-func (s *DeleteObjectsOutput) SetErrors(v []*Error) *DeleteObjectsOutput {
-	s.Errors = v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *DeleteObjectsOutput) SetRequestCharged(v string) *DeleteObjectsOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeletedObject
-type DeletedObject struct {
-	_ struct{} `type:"structure"`
-
-	DeleteMarker *bool `type:"boolean"`
-
-	DeleteMarkerVersionId *string `type:"string"`
-
-	Key *string `min:"1" type:"string"`
-
-	VersionId *string `type:"string"`
-}
-
-// String returns the string representation
-func (s DeletedObject) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DeletedObject) GoString() string {
-	return s.String()
-}
-
-// SetDeleteMarker sets the DeleteMarker field's value.
-func (s *DeletedObject) SetDeleteMarker(v bool) *DeletedObject {
-	s.DeleteMarker = &v
-	return s
-}
-
-// SetDeleteMarkerVersionId sets the DeleteMarkerVersionId field's value.
-func (s *DeletedObject) SetDeleteMarkerVersionId(v string) *DeletedObject {
-	s.DeleteMarkerVersionId = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *DeletedObject) SetKey(v string) *DeletedObject {
-	s.Key = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *DeletedObject) SetVersionId(v string) *DeletedObject {
-	s.VersionId = &v
-	return s
-}
-
-// Container for replication destination information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Destination
-type Destination struct {
-	_ struct{} `type:"structure"`
-
-	// Container for information regarding the access control for replicas.
-	AccessControlTranslation *AccessControlTranslation `type:"structure"`
-
-	// Account ID of the destination bucket. Currently this is only being verified
-	// if Access Control Translation is enabled
-	Account *string `type:"string"`
-
-	// Amazon resource name (ARN) of the bucket where you want Amazon S3 to store
-	// replicas of the object identified by the rule.
-	//
-	// Bucket is a required field
-	Bucket *string `type:"string" required:"true"`
-
-	// Container for information regarding encryption based configuration for replicas.
-	EncryptionConfiguration *EncryptionConfiguration `type:"structure"`
-
-	// The class of storage used to store the object.
-	StorageClass *string `type:"string" enum:"StorageClass"`
-}
-
-// String returns the string representation
-func (s Destination) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Destination) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *Destination) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "Destination"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.AccessControlTranslation != nil {
-		if err := s.AccessControlTranslation.Validate(); err != nil {
-			invalidParams.AddNested("AccessControlTranslation", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetAccessControlTranslation sets the AccessControlTranslation field's value.
-func (s *Destination) SetAccessControlTranslation(v *AccessControlTranslation) *Destination {
-	s.AccessControlTranslation = v
-	return s
-}
-
-// SetAccount sets the Account field's value.
-func (s *Destination) SetAccount(v string) *Destination {
-	s.Account = &v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *Destination) SetBucket(v string) *Destination {
-	s.Bucket = &v
-	return s
-}
-
-func (s *Destination) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetEncryptionConfiguration sets the EncryptionConfiguration field's value.
-func (s *Destination) SetEncryptionConfiguration(v *EncryptionConfiguration) *Destination {
-	s.EncryptionConfiguration = v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *Destination) SetStorageClass(v string) *Destination {
-	s.StorageClass = &v
-	return s
-}
-
-// Describes the server-side encryption that will be applied to the restore
-// results.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Encryption
-type Encryption struct {
-	_ struct{} `type:"structure"`
-
-	// The server-side encryption algorithm used when storing job results in Amazon
-	// S3 (e.g., AES256, aws:kms).
-	//
-	// EncryptionType is a required field
-	EncryptionType *string `type:"string" required:"true" enum:"ServerSideEncryption"`
-
-	// If the encryption type is aws:kms, this optional value can be used to specify
-	// the encryption context for the restore results.
-	KMSContext *string `type:"string"`
-
-	// If the encryption type is aws:kms, this optional value specifies the AWS
-	// KMS key ID to use for encryption of job results.
-	KMSKeyId *string `type:"string"`
-}
-
-// String returns the string representation
-func (s Encryption) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Encryption) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *Encryption) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "Encryption"}
-	if s.EncryptionType == nil {
-		invalidParams.Add(request.NewErrParamRequired("EncryptionType"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetEncryptionType sets the EncryptionType field's value.
-func (s *Encryption) SetEncryptionType(v string) *Encryption {
-	s.EncryptionType = &v
-	return s
-}
-
-// SetKMSContext sets the KMSContext field's value.
-func (s *Encryption) SetKMSContext(v string) *Encryption {
-	s.KMSContext = &v
-	return s
-}
-
-// SetKMSKeyId sets the KMSKeyId field's value.
-func (s *Encryption) SetKMSKeyId(v string) *Encryption {
-	s.KMSKeyId = &v
-	return s
-}
-
-// Container for information regarding encryption based configuration for replicas.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/EncryptionConfiguration
-type EncryptionConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// The id of the KMS key used to encrypt the replica object.
-	ReplicaKmsKeyID *string `type:"string"`
-}
-
-// String returns the string representation
-func (s EncryptionConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s EncryptionConfiguration) GoString() string {
-	return s.String()
-}
-
-// SetReplicaKmsKeyID sets the ReplicaKmsKeyID field's value.
-func (s *EncryptionConfiguration) SetReplicaKmsKeyID(v string) *EncryptionConfiguration {
-	s.ReplicaKmsKeyID = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Error
-type Error struct {
-	_ struct{} `type:"structure"`
-
-	Code *string `type:"string"`
-
-	Key *string `min:"1" type:"string"`
-
-	Message *string `type:"string"`
-
-	VersionId *string `type:"string"`
-}
-
-// String returns the string representation
-func (s Error) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Error) GoString() string {
-	return s.String()
-}
-
-// SetCode sets the Code field's value.
-func (s *Error) SetCode(v string) *Error {
-	s.Code = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *Error) SetKey(v string) *Error {
-	s.Key = &v
-	return s
-}
-
-// SetMessage sets the Message field's value.
-func (s *Error) SetMessage(v string) *Error {
-	s.Message = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *Error) SetVersionId(v string) *Error {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ErrorDocument
-type ErrorDocument struct {
-	_ struct{} `type:"structure"`
-
-	// The object key name to use when a 4XX class error occurs.
-	//
-	// Key is a required field
-	Key *string `min:"1" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s ErrorDocument) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ErrorDocument) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ErrorDocument) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ErrorDocument"}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetKey sets the Key field's value.
-func (s *ErrorDocument) SetKey(v string) *ErrorDocument {
-	s.Key = &v
-	return s
-}
-
-// Container for key value pair that defines the criteria for the filter rule.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/FilterRule
-type FilterRule struct {
-	_ struct{} `type:"structure"`
-
-	// Object key name prefix or suffix identifying one or more objects to which
-	// the filtering rule applies. Maximum prefix length can be up to 1,024 characters.
-	// Overlapping prefixes and suffixes are not supported. For more information,
-	// go to Configuring Event Notifications (http://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
-	Name *string `type:"string" enum:"FilterRuleName"`
-
-	Value *string `type:"string"`
-}
-
-// String returns the string representation
-func (s FilterRule) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s FilterRule) GoString() string {
-	return s.String()
-}
-
-// SetName sets the Name field's value.
-func (s *FilterRule) SetName(v string) *FilterRule {
-	s.Name = &v
-	return s
-}
-
-// SetValue sets the Value field's value.
-func (s *FilterRule) SetValue(v string) *FilterRule {
-	s.Value = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAccelerateConfigurationRequest
-type GetBucketAccelerateConfigurationInput struct {
-	_ struct{} `type:"structure"`
-
-	// Name of the bucket for which the accelerate configuration is retrieved.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketAccelerateConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketAccelerateConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketAccelerateConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketAccelerateConfigurationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketAccelerateConfigurationInput) SetBucket(v string) *GetBucketAccelerateConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketAccelerateConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAccelerateConfigurationOutput
-type GetBucketAccelerateConfigurationOutput struct {
-	_ struct{} `type:"structure"`
-
-	// The accelerate configuration of the bucket.
-	Status *string `type:"string" enum:"BucketAccelerateStatus"`
-}
-
-// String returns the string representation
-func (s GetBucketAccelerateConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketAccelerateConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// SetStatus sets the Status field's value.
-func (s *GetBucketAccelerateConfigurationOutput) SetStatus(v string) *GetBucketAccelerateConfigurationOutput {
-	s.Status = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAclRequest
-type GetBucketAclInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketAclInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketAclInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketAclInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketAclInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketAclInput) SetBucket(v string) *GetBucketAclInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketAclInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAclOutput
-type GetBucketAclOutput struct {
-	_ struct{} `type:"structure"`
-
-	// A list of grants.
-	Grants []*Grant `locationName:"AccessControlList" locationNameList:"Grant" type:"list"`
-
-	Owner *Owner `type:"structure"`
-}
-
-// String returns the string representation
-func (s GetBucketAclOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketAclOutput) GoString() string {
-	return s.String()
-}
-
-// SetGrants sets the Grants field's value.
-func (s *GetBucketAclOutput) SetGrants(v []*Grant) *GetBucketAclOutput {
-	s.Grants = v
-	return s
-}
-
-// SetOwner sets the Owner field's value.
-func (s *GetBucketAclOutput) SetOwner(v *Owner) *GetBucketAclOutput {
-	s.Owner = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAnalyticsConfigurationRequest
-type GetBucketAnalyticsConfigurationInput struct {
-	_ struct{} `type:"structure"`
-
-	// The name of the bucket from which an analytics configuration is retrieved.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The identifier used to represent an analytics configuration.
-	//
-	// Id is a required field
-	Id *string `location:"querystring" locationName:"id" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketAnalyticsConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketAnalyticsConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketAnalyticsConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketAnalyticsConfigurationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Id == nil {
-		invalidParams.Add(request.NewErrParamRequired("Id"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketAnalyticsConfigurationInput) SetBucket(v string) *GetBucketAnalyticsConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketAnalyticsConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetId sets the Id field's value.
-func (s *GetBucketAnalyticsConfigurationInput) SetId(v string) *GetBucketAnalyticsConfigurationInput {
-	s.Id = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAnalyticsConfigurationOutput
-type GetBucketAnalyticsConfigurationOutput struct {
-	_ struct{} `type:"structure" payload:"AnalyticsConfiguration"`
-
-	// The configuration and any analyses for the analytics filter.
-	AnalyticsConfiguration *AnalyticsConfiguration `type:"structure"`
-}
-
-// String returns the string representation
-func (s GetBucketAnalyticsConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketAnalyticsConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// SetAnalyticsConfiguration sets the AnalyticsConfiguration field's value.
-func (s *GetBucketAnalyticsConfigurationOutput) SetAnalyticsConfiguration(v *AnalyticsConfiguration) *GetBucketAnalyticsConfigurationOutput {
-	s.AnalyticsConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketCorsRequest
-type GetBucketCorsInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketCorsInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketCorsInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketCorsInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketCorsInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketCorsInput) SetBucket(v string) *GetBucketCorsInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketCorsInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketCorsOutput
-type GetBucketCorsOutput struct {
-	_ struct{} `type:"structure"`
-
-	CORSRules []*CORSRule `locationName:"CORSRule" type:"list" flattened:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketCorsOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketCorsOutput) GoString() string {
-	return s.String()
-}
-
-// SetCORSRules sets the CORSRules field's value.
-func (s *GetBucketCorsOutput) SetCORSRules(v []*CORSRule) *GetBucketCorsOutput {
-	s.CORSRules = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketEncryptionRequest
-type GetBucketEncryptionInput struct {
-	_ struct{} `type:"structure"`
-
-	// The name of the bucket from which the server-side encryption configuration
-	// is retrieved.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketEncryptionInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketEncryptionInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketEncryptionInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketEncryptionInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketEncryptionInput) SetBucket(v string) *GetBucketEncryptionInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketEncryptionInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketEncryptionOutput
-type GetBucketEncryptionOutput struct {
-	_ struct{} `type:"structure" payload:"ServerSideEncryptionConfiguration"`
-
-	// Container for server-side encryption configuration rules. Currently S3 supports
-	// one rule only.
-	ServerSideEncryptionConfiguration *ServerSideEncryptionConfiguration `type:"structure"`
-}
-
-// String returns the string representation
-func (s GetBucketEncryptionOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketEncryptionOutput) GoString() string {
-	return s.String()
-}
-
-// SetServerSideEncryptionConfiguration sets the ServerSideEncryptionConfiguration field's value.
-func (s *GetBucketEncryptionOutput) SetServerSideEncryptionConfiguration(v *ServerSideEncryptionConfiguration) *GetBucketEncryptionOutput {
-	s.ServerSideEncryptionConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketInventoryConfigurationRequest
-type GetBucketInventoryConfigurationInput struct {
-	_ struct{} `type:"structure"`
-
-	// The name of the bucket containing the inventory configuration to retrieve.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The ID used to identify the inventory configuration.
-	//
-	// Id is a required field
-	Id *string `location:"querystring" locationName:"id" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketInventoryConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketInventoryConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketInventoryConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketInventoryConfigurationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Id == nil {
-		invalidParams.Add(request.NewErrParamRequired("Id"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketInventoryConfigurationInput) SetBucket(v string) *GetBucketInventoryConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketInventoryConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetId sets the Id field's value.
-func (s *GetBucketInventoryConfigurationInput) SetId(v string) *GetBucketInventoryConfigurationInput {
-	s.Id = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketInventoryConfigurationOutput
-type GetBucketInventoryConfigurationOutput struct {
-	_ struct{} `type:"structure" payload:"InventoryConfiguration"`
-
-	// Specifies the inventory configuration.
-	InventoryConfiguration *InventoryConfiguration `type:"structure"`
-}
-
-// String returns the string representation
-func (s GetBucketInventoryConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketInventoryConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// SetInventoryConfiguration sets the InventoryConfiguration field's value.
-func (s *GetBucketInventoryConfigurationOutput) SetInventoryConfiguration(v *InventoryConfiguration) *GetBucketInventoryConfigurationOutput {
-	s.InventoryConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleConfigurationRequest
-type GetBucketLifecycleConfigurationInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketLifecycleConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketLifecycleConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketLifecycleConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketLifecycleConfigurationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketLifecycleConfigurationInput) SetBucket(v string) *GetBucketLifecycleConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketLifecycleConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleConfigurationOutput
-type GetBucketLifecycleConfigurationOutput struct {
-	_ struct{} `type:"structure"`
-
-	Rules []*LifecycleRule `locationName:"Rule" type:"list" flattened:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketLifecycleConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketLifecycleConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// SetRules sets the Rules field's value.
-func (s *GetBucketLifecycleConfigurationOutput) SetRules(v []*LifecycleRule) *GetBucketLifecycleConfigurationOutput {
-	s.Rules = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleRequest
-type GetBucketLifecycleInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketLifecycleInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketLifecycleInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketLifecycleInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketLifecycleInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketLifecycleInput) SetBucket(v string) *GetBucketLifecycleInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketLifecycleInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleOutput
-type GetBucketLifecycleOutput struct {
-	_ struct{} `type:"structure"`
-
-	Rules []*Rule `locationName:"Rule" type:"list" flattened:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketLifecycleOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketLifecycleOutput) GoString() string {
-	return s.String()
-}
-
-// SetRules sets the Rules field's value.
-func (s *GetBucketLifecycleOutput) SetRules(v []*Rule) *GetBucketLifecycleOutput {
-	s.Rules = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLocationRequest
-type GetBucketLocationInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketLocationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketLocationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketLocationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketLocationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketLocationInput) SetBucket(v string) *GetBucketLocationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketLocationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLocationOutput
-type GetBucketLocationOutput struct {
-	_ struct{} `type:"structure"`
-
-	LocationConstraint *string `type:"string" enum:"BucketLocationConstraint"`
-}
-
-// String returns the string representation
-func (s GetBucketLocationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketLocationOutput) GoString() string {
-	return s.String()
-}
-
-// SetLocationConstraint sets the LocationConstraint field's value.
-func (s *GetBucketLocationOutput) SetLocationConstraint(v string) *GetBucketLocationOutput {
-	s.LocationConstraint = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLoggingRequest
-type GetBucketLoggingInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketLoggingInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketLoggingInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketLoggingInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketLoggingInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketLoggingInput) SetBucket(v string) *GetBucketLoggingInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketLoggingInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLoggingOutput
-type GetBucketLoggingOutput struct {
-	_ struct{} `type:"structure"`
-
-	LoggingEnabled *LoggingEnabled `type:"structure"`
-}
-
-// String returns the string representation
-func (s GetBucketLoggingOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketLoggingOutput) GoString() string {
-	return s.String()
-}
-
-// SetLoggingEnabled sets the LoggingEnabled field's value.
-func (s *GetBucketLoggingOutput) SetLoggingEnabled(v *LoggingEnabled) *GetBucketLoggingOutput {
-	s.LoggingEnabled = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketMetricsConfigurationRequest
-type GetBucketMetricsConfigurationInput struct {
-	_ struct{} `type:"structure"`
-
-	// The name of the bucket containing the metrics configuration to retrieve.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The ID used to identify the metrics configuration.
-	//
-	// Id is a required field
-	Id *string `location:"querystring" locationName:"id" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketMetricsConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketMetricsConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketMetricsConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketMetricsConfigurationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Id == nil {
-		invalidParams.Add(request.NewErrParamRequired("Id"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketMetricsConfigurationInput) SetBucket(v string) *GetBucketMetricsConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketMetricsConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetId sets the Id field's value.
-func (s *GetBucketMetricsConfigurationInput) SetId(v string) *GetBucketMetricsConfigurationInput {
-	s.Id = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketMetricsConfigurationOutput
-type GetBucketMetricsConfigurationOutput struct {
-	_ struct{} `type:"structure" payload:"MetricsConfiguration"`
-
-	// Specifies the metrics configuration.
-	MetricsConfiguration *MetricsConfiguration `type:"structure"`
-}
-
-// String returns the string representation
-func (s GetBucketMetricsConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketMetricsConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// SetMetricsConfiguration sets the MetricsConfiguration field's value.
-func (s *GetBucketMetricsConfigurationOutput) SetMetricsConfiguration(v *MetricsConfiguration) *GetBucketMetricsConfigurationOutput {
-	s.MetricsConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotificationConfigurationRequest
-type GetBucketNotificationConfigurationRequest struct {
-	_ struct{} `type:"structure"`
-
-	// Name of the bucket to get the notification configuration for.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketNotificationConfigurationRequest) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketNotificationConfigurationRequest) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketNotificationConfigurationRequest) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketNotificationConfigurationRequest"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketNotificationConfigurationRequest) SetBucket(v string) *GetBucketNotificationConfigurationRequest {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketNotificationConfigurationRequest) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketPolicyRequest
-type GetBucketPolicyInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketPolicyInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketPolicyInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketPolicyInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketPolicyInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketPolicyInput) SetBucket(v string) *GetBucketPolicyInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketPolicyInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketPolicyOutput
-type GetBucketPolicyOutput struct {
-	_ struct{} `type:"structure" payload:"Policy"`
-
-	// The bucket policy as a JSON document.
-	Policy *string `type:"string"`
-}
-
-// String returns the string representation
-func (s GetBucketPolicyOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketPolicyOutput) GoString() string {
-	return s.String()
-}
-
-// SetPolicy sets the Policy field's value.
-func (s *GetBucketPolicyOutput) SetPolicy(v string) *GetBucketPolicyOutput {
-	s.Policy = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketReplicationRequest
-type GetBucketReplicationInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketReplicationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketReplicationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketReplicationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketReplicationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketReplicationInput) SetBucket(v string) *GetBucketReplicationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketReplicationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketReplicationOutput
-type GetBucketReplicationOutput struct {
-	_ struct{} `type:"structure" payload:"ReplicationConfiguration"`
-
-	// Container for replication rules. You can add as many as 1,000 rules. Total
-	// replication configuration size can be up to 2 MB.
-	ReplicationConfiguration *ReplicationConfiguration `type:"structure"`
-}
-
-// String returns the string representation
-func (s GetBucketReplicationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketReplicationOutput) GoString() string {
-	return s.String()
-}
-
-// SetReplicationConfiguration sets the ReplicationConfiguration field's value.
-func (s *GetBucketReplicationOutput) SetReplicationConfiguration(v *ReplicationConfiguration) *GetBucketReplicationOutput {
-	s.ReplicationConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketRequestPaymentRequest
-type GetBucketRequestPaymentInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketRequestPaymentInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketRequestPaymentInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketRequestPaymentInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketRequestPaymentInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketRequestPaymentInput) SetBucket(v string) *GetBucketRequestPaymentInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketRequestPaymentInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketRequestPaymentOutput
-type GetBucketRequestPaymentOutput struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies who pays for the download and request fees.
-	Payer *string `type:"string" enum:"Payer"`
-}
-
-// String returns the string representation
-func (s GetBucketRequestPaymentOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketRequestPaymentOutput) GoString() string {
-	return s.String()
-}
-
-// SetPayer sets the Payer field's value.
-func (s *GetBucketRequestPaymentOutput) SetPayer(v string) *GetBucketRequestPaymentOutput {
-	s.Payer = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketTaggingRequest
-type GetBucketTaggingInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketTaggingInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketTaggingInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketTaggingInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketTaggingInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketTaggingInput) SetBucket(v string) *GetBucketTaggingInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketTaggingInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketTaggingOutput
-type GetBucketTaggingOutput struct {
-	_ struct{} `type:"structure"`
-
-	// TagSet is a required field
-	TagSet []*Tag `locationNameList:"Tag" type:"list" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketTaggingOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketTaggingOutput) GoString() string {
-	return s.String()
-}
-
-// SetTagSet sets the TagSet field's value.
-func (s *GetBucketTaggingOutput) SetTagSet(v []*Tag) *GetBucketTaggingOutput {
-	s.TagSet = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketVersioningRequest
-type GetBucketVersioningInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketVersioningInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketVersioningInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketVersioningInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketVersioningInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketVersioningInput) SetBucket(v string) *GetBucketVersioningInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketVersioningInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketVersioningOutput
-type GetBucketVersioningOutput struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies whether MFA delete is enabled in the bucket versioning configuration.
-	// This element is only returned if the bucket has been configured with MFA
-	// delete. If the bucket has never been so configured, this element is not returned.
-	MFADelete *string `locationName:"MfaDelete" type:"string" enum:"MFADeleteStatus"`
-
-	// The versioning state of the bucket.
-	Status *string `type:"string" enum:"BucketVersioningStatus"`
-}
-
-// String returns the string representation
-func (s GetBucketVersioningOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketVersioningOutput) GoString() string {
-	return s.String()
-}
-
-// SetMFADelete sets the MFADelete field's value.
-func (s *GetBucketVersioningOutput) SetMFADelete(v string) *GetBucketVersioningOutput {
-	s.MFADelete = &v
-	return s
-}
-
-// SetStatus sets the Status field's value.
-func (s *GetBucketVersioningOutput) SetStatus(v string) *GetBucketVersioningOutput {
-	s.Status = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketWebsiteRequest
-type GetBucketWebsiteInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s GetBucketWebsiteInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketWebsiteInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetBucketWebsiteInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetBucketWebsiteInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetBucketWebsiteInput) SetBucket(v string) *GetBucketWebsiteInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetBucketWebsiteInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketWebsiteOutput
-type GetBucketWebsiteOutput struct {
-	_ struct{} `type:"structure"`
-
-	ErrorDocument *ErrorDocument `type:"structure"`
-
-	IndexDocument *IndexDocument `type:"structure"`
-
-	RedirectAllRequestsTo *RedirectAllRequestsTo `type:"structure"`
-
-	RoutingRules []*RoutingRule `locationNameList:"RoutingRule" type:"list"`
-}
-
-// String returns the string representation
-func (s GetBucketWebsiteOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetBucketWebsiteOutput) GoString() string {
-	return s.String()
-}
-
-// SetErrorDocument sets the ErrorDocument field's value.
-func (s *GetBucketWebsiteOutput) SetErrorDocument(v *ErrorDocument) *GetBucketWebsiteOutput {
-	s.ErrorDocument = v
-	return s
-}
-
-// SetIndexDocument sets the IndexDocument field's value.
-func (s *GetBucketWebsiteOutput) SetIndexDocument(v *IndexDocument) *GetBucketWebsiteOutput {
-	s.IndexDocument = v
-	return s
-}
-
-// SetRedirectAllRequestsTo sets the RedirectAllRequestsTo field's value.
-func (s *GetBucketWebsiteOutput) SetRedirectAllRequestsTo(v *RedirectAllRequestsTo) *GetBucketWebsiteOutput {
-	s.RedirectAllRequestsTo = v
-	return s
-}
-
-// SetRoutingRules sets the RoutingRules field's value.
-func (s *GetBucketWebsiteOutput) SetRoutingRules(v []*RoutingRule) *GetBucketWebsiteOutput {
-	s.RoutingRules = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectAclRequest
-type GetObjectAclInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// VersionId used to reference a specific version of the object.
-	VersionId *string `location:"querystring" locationName:"versionId" type:"string"`
-}
-
-// String returns the string representation
-func (s GetObjectAclInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetObjectAclInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetObjectAclInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetObjectAclInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetObjectAclInput) SetBucket(v string) *GetObjectAclInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetObjectAclInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetKey sets the Key field's value.
-func (s *GetObjectAclInput) SetKey(v string) *GetObjectAclInput {
-	s.Key = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *GetObjectAclInput) SetRequestPayer(v string) *GetObjectAclInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *GetObjectAclInput) SetVersionId(v string) *GetObjectAclInput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectAclOutput
-type GetObjectAclOutput struct {
-	_ struct{} `type:"structure"`
-
-	// A list of grants.
-	Grants []*Grant `locationName:"AccessControlList" locationNameList:"Grant" type:"list"`
-
-	Owner *Owner `type:"structure"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-}
-
-// String returns the string representation
-func (s GetObjectAclOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetObjectAclOutput) GoString() string {
-	return s.String()
-}
-
-// SetGrants sets the Grants field's value.
-func (s *GetObjectAclOutput) SetGrants(v []*Grant) *GetObjectAclOutput {
-	s.Grants = v
-	return s
-}
-
-// SetOwner sets the Owner field's value.
-func (s *GetObjectAclOutput) SetOwner(v *Owner) *GetObjectAclOutput {
-	s.Owner = v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *GetObjectAclOutput) SetRequestCharged(v string) *GetObjectAclOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectRequest
-type GetObjectInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Return the object only if its entity tag (ETag) is the same as the one specified,
-	// otherwise return a 412 (precondition failed).
-	IfMatch *string `location:"header" locationName:"If-Match" type:"string"`
-
-	// Return the object only if it has been modified since the specified time,
-	// otherwise return a 304 (not modified).
-	IfModifiedSince *time.Time `location:"header" locationName:"If-Modified-Since" type:"timestamp" timestampFormat:"rfc822"`
-
-	// Return the object only if its entity tag (ETag) is different from the one
-	// specified, otherwise return a 304 (not modified).
-	IfNoneMatch *string `location:"header" locationName:"If-None-Match" type:"string"`
-
-	// Return the object only if it has not been modified since the specified time,
-	// otherwise return a 412 (precondition failed).
-	IfUnmodifiedSince *time.Time `location:"header" locationName:"If-Unmodified-Since" type:"timestamp" timestampFormat:"rfc822"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// Part number of the object being read. This is a positive integer between
-	// 1 and 10,000. Effectively performs a 'ranged' GET request for the part specified.
-	// Useful for downloading just a part of an object.
-	PartNumber *int64 `location:"querystring" locationName:"partNumber" type:"integer"`
-
-	// Downloads the specified range bytes of an object. For more information about
-	// the HTTP Range header, go to http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.
-	Range *string `location:"header" locationName:"Range" type:"string"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// Sets the Cache-Control header of the response.
-	ResponseCacheControl *string `location:"querystring" locationName:"response-cache-control" type:"string"`
-
-	// Sets the Content-Disposition header of the response
-	ResponseContentDisposition *string `location:"querystring" locationName:"response-content-disposition" type:"string"`
-
-	// Sets the Content-Encoding header of the response.
-	ResponseContentEncoding *string `location:"querystring" locationName:"response-content-encoding" type:"string"`
-
-	// Sets the Content-Language header of the response.
-	ResponseContentLanguage *string `location:"querystring" locationName:"response-content-language" type:"string"`
-
-	// Sets the Content-Type header of the response.
-	ResponseContentType *string `location:"querystring" locationName:"response-content-type" type:"string"`
-
-	// Sets the Expires header of the response.
-	ResponseExpires *time.Time `location:"querystring" locationName:"response-expires" type:"timestamp" timestampFormat:"iso8601"`
-
-	// Specifies the algorithm to use to when encrypting the object (e.g., AES256).
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// Specifies the customer-provided encryption key for Amazon S3 to use in encrypting
-	// data. This value is used to store the object and then it is discarded; Amazon
-	// does not store the encryption key. The key must be appropriate for use with
-	// the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm
-	// header.
-	SSECustomerKey *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key" type:"string"`
-
-	// Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321.
-	// Amazon S3 uses this header for a message integrity check to ensure the encryption
-	// key was transmitted without error.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// VersionId used to reference a specific version of the object.
-	VersionId *string `location:"querystring" locationName:"versionId" type:"string"`
-}
-
-// String returns the string representation
-func (s GetObjectInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetObjectInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetObjectInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetObjectInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetObjectInput) SetBucket(v string) *GetObjectInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetObjectInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetIfMatch sets the IfMatch field's value.
-func (s *GetObjectInput) SetIfMatch(v string) *GetObjectInput {
-	s.IfMatch = &v
-	return s
-}
-
-// SetIfModifiedSince sets the IfModifiedSince field's value.
-func (s *GetObjectInput) SetIfModifiedSince(v time.Time) *GetObjectInput {
-	s.IfModifiedSince = &v
-	return s
-}
-
-// SetIfNoneMatch sets the IfNoneMatch field's value.
-func (s *GetObjectInput) SetIfNoneMatch(v string) *GetObjectInput {
-	s.IfNoneMatch = &v
-	return s
-}
-
-// SetIfUnmodifiedSince sets the IfUnmodifiedSince field's value.
-func (s *GetObjectInput) SetIfUnmodifiedSince(v time.Time) *GetObjectInput {
-	s.IfUnmodifiedSince = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *GetObjectInput) SetKey(v string) *GetObjectInput {
-	s.Key = &v
-	return s
-}
-
-// SetPartNumber sets the PartNumber field's value.
-func (s *GetObjectInput) SetPartNumber(v int64) *GetObjectInput {
-	s.PartNumber = &v
-	return s
-}
-
-// SetRange sets the Range field's value.
-func (s *GetObjectInput) SetRange(v string) *GetObjectInput {
-	s.Range = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *GetObjectInput) SetRequestPayer(v string) *GetObjectInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetResponseCacheControl sets the ResponseCacheControl field's value.
-func (s *GetObjectInput) SetResponseCacheControl(v string) *GetObjectInput {
-	s.ResponseCacheControl = &v
-	return s
-}
-
-// SetResponseContentDisposition sets the ResponseContentDisposition field's value.
-func (s *GetObjectInput) SetResponseContentDisposition(v string) *GetObjectInput {
-	s.ResponseContentDisposition = &v
-	return s
-}
-
-// SetResponseContentEncoding sets the ResponseContentEncoding field's value.
-func (s *GetObjectInput) SetResponseContentEncoding(v string) *GetObjectInput {
-	s.ResponseContentEncoding = &v
-	return s
-}
-
-// SetResponseContentLanguage sets the ResponseContentLanguage field's value.
-func (s *GetObjectInput) SetResponseContentLanguage(v string) *GetObjectInput {
-	s.ResponseContentLanguage = &v
-	return s
-}
-
-// SetResponseContentType sets the ResponseContentType field's value.
-func (s *GetObjectInput) SetResponseContentType(v string) *GetObjectInput {
-	s.ResponseContentType = &v
-	return s
-}
-
-// SetResponseExpires sets the ResponseExpires field's value.
-func (s *GetObjectInput) SetResponseExpires(v time.Time) *GetObjectInput {
-	s.ResponseExpires = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *GetObjectInput) SetSSECustomerAlgorithm(v string) *GetObjectInput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKey sets the SSECustomerKey field's value.
-func (s *GetObjectInput) SetSSECustomerKey(v string) *GetObjectInput {
-	s.SSECustomerKey = &v
-	return s
-}
-
-func (s *GetObjectInput) getSSECustomerKey() (v string) {
-	if s.SSECustomerKey == nil {
-		return v
-	}
-	return *s.SSECustomerKey
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *GetObjectInput) SetSSECustomerKeyMD5(v string) *GetObjectInput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *GetObjectInput) SetVersionId(v string) *GetObjectInput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectOutput
-type GetObjectOutput struct {
-	_ struct{} `type:"structure" payload:"Body"`
-
-	AcceptRanges *string `location:"header" locationName:"accept-ranges" type:"string"`
-
-	// Object data.
-	Body io.ReadCloser `type:"blob"`
-
-	// Specifies caching behavior along the request/reply chain.
-	CacheControl *string `location:"header" locationName:"Cache-Control" type:"string"`
-
-	// Specifies presentational information for the object.
-	ContentDisposition *string `location:"header" locationName:"Content-Disposition" type:"string"`
-
-	// Specifies what content encodings have been applied to the object and thus
-	// what decoding mechanisms must be applied to obtain the media-type referenced
-	// by the Content-Type header field.
-	ContentEncoding *string `location:"header" locationName:"Content-Encoding" type:"string"`
-
-	// The language the content is in.
-	ContentLanguage *string `location:"header" locationName:"Content-Language" type:"string"`
-
-	// Size of the body in bytes.
-	ContentLength *int64 `location:"header" locationName:"Content-Length" type:"long"`
-
-	// The portion of the object returned in the response.
-	ContentRange *string `location:"header" locationName:"Content-Range" type:"string"`
-
-	// A standard MIME type describing the format of the object data.
-	ContentType *string `location:"header" locationName:"Content-Type" type:"string"`
-
-	// Specifies whether the object retrieved was (true) or was not (false) a Delete
-	// Marker. If false, this response header does not appear in the response.
-	DeleteMarker *bool `location:"header" locationName:"x-amz-delete-marker" type:"boolean"`
-
-	// An ETag is an opaque identifier assigned by a web server to a specific version
-	// of a resource found at a URL
-	ETag *string `location:"header" locationName:"ETag" type:"string"`
-
-	// If the object expiration is configured (see PUT Bucket lifecycle), the response
-	// includes this header. It includes the expiry-date and rule-id key value pairs
-	// providing object expiration information. The value of the rule-id is URL
-	// encoded.
-	Expiration *string `location:"header" locationName:"x-amz-expiration" type:"string"`
-
-	// The date and time at which the object is no longer cacheable.
-	Expires *string `location:"header" locationName:"Expires" type:"string"`
-
-	// Last modified date of the object
-	LastModified *time.Time `location:"header" locationName:"Last-Modified" type:"timestamp" timestampFormat:"rfc822"`
-
-	// A map of metadata to store with the object in S3.
-	Metadata map[string]*string `location:"headers" locationName:"x-amz-meta-" type:"map"`
-
-	// This is set to the number of metadata entries not returned in x-amz-meta
-	// headers. This can happen if you create metadata using an API like SOAP that
-	// supports more flexible metadata than the REST API. For example, using SOAP,
-	// you can create metadata whose values are not legal HTTP headers.
-	MissingMeta *int64 `location:"header" locationName:"x-amz-missing-meta" type:"integer"`
-
-	// The count of parts this object has.
-	PartsCount *int64 `location:"header" locationName:"x-amz-mp-parts-count" type:"integer"`
-
-	ReplicationStatus *string `location:"header" locationName:"x-amz-replication-status" type:"string" enum:"ReplicationStatus"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-
-	// Provides information about object restoration operation and expiration time
-	// of the restored object copy.
-	Restore *string `location:"header" locationName:"x-amz-restore" type:"string"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header confirming the encryption algorithm
-	// used.
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header to provide round trip message integrity
-	// verification of the customer-provided encryption key.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// If present, specifies the ID of the AWS Key Management Service (KMS) master
-	// encryption key that was used for the object.
-	SSEKMSKeyId *string `location:"header" locationName:"x-amz-server-side-encryption-aws-kms-key-id" type:"string"`
-
-	// The Server-side encryption algorithm used when storing this object in S3
-	// (e.g., AES256, aws:kms).
-	ServerSideEncryption *string `location:"header" locationName:"x-amz-server-side-encryption" type:"string" enum:"ServerSideEncryption"`
-
-	StorageClass *string `location:"header" locationName:"x-amz-storage-class" type:"string" enum:"StorageClass"`
-
-	// The number of tags, if any, on the object.
-	TagCount *int64 `location:"header" locationName:"x-amz-tagging-count" type:"integer"`
-
-	// Version of the object.
-	VersionId *string `location:"header" locationName:"x-amz-version-id" type:"string"`
-
-	// If the bucket is configured as a website, redirects requests for this object
-	// to another object in the same bucket or to an external URL. Amazon S3 stores
-	// the value of this header in the object metadata.
-	WebsiteRedirectLocation *string `location:"header" locationName:"x-amz-website-redirect-location" type:"string"`
-}
-
-// String returns the string representation
-func (s GetObjectOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetObjectOutput) GoString() string {
-	return s.String()
-}
-
-// SetAcceptRanges sets the AcceptRanges field's value.
-func (s *GetObjectOutput) SetAcceptRanges(v string) *GetObjectOutput {
-	s.AcceptRanges = &v
-	return s
-}
-
-// SetBody sets the Body field's value.
-func (s *GetObjectOutput) SetBody(v io.ReadCloser) *GetObjectOutput {
-	s.Body = v
-	return s
-}
-
-// SetCacheControl sets the CacheControl field's value.
-func (s *GetObjectOutput) SetCacheControl(v string) *GetObjectOutput {
-	s.CacheControl = &v
-	return s
-}
-
-// SetContentDisposition sets the ContentDisposition field's value.
-func (s *GetObjectOutput) SetContentDisposition(v string) *GetObjectOutput {
-	s.ContentDisposition = &v
-	return s
-}
-
-// SetContentEncoding sets the ContentEncoding field's value.
-func (s *GetObjectOutput) SetContentEncoding(v string) *GetObjectOutput {
-	s.ContentEncoding = &v
-	return s
-}
-
-// SetContentLanguage sets the ContentLanguage field's value.
-func (s *GetObjectOutput) SetContentLanguage(v string) *GetObjectOutput {
-	s.ContentLanguage = &v
-	return s
-}
-
-// SetContentLength sets the ContentLength field's value.
-func (s *GetObjectOutput) SetContentLength(v int64) *GetObjectOutput {
-	s.ContentLength = &v
-	return s
-}
-
-// SetContentRange sets the ContentRange field's value.
-func (s *GetObjectOutput) SetContentRange(v string) *GetObjectOutput {
-	s.ContentRange = &v
-	return s
-}
-
-// SetContentType sets the ContentType field's value.
-func (s *GetObjectOutput) SetContentType(v string) *GetObjectOutput {
-	s.ContentType = &v
-	return s
-}
-
-// SetDeleteMarker sets the DeleteMarker field's value.
-func (s *GetObjectOutput) SetDeleteMarker(v bool) *GetObjectOutput {
-	s.DeleteMarker = &v
-	return s
-}
-
-// SetETag sets the ETag field's value.
-func (s *GetObjectOutput) SetETag(v string) *GetObjectOutput {
-	s.ETag = &v
-	return s
-}
-
-// SetExpiration sets the Expiration field's value.
-func (s *GetObjectOutput) SetExpiration(v string) *GetObjectOutput {
-	s.Expiration = &v
-	return s
-}
-
-// SetExpires sets the Expires field's value.
-func (s *GetObjectOutput) SetExpires(v string) *GetObjectOutput {
-	s.Expires = &v
-	return s
-}
-
-// SetLastModified sets the LastModified field's value.
-func (s *GetObjectOutput) SetLastModified(v time.Time) *GetObjectOutput {
-	s.LastModified = &v
-	return s
-}
-
-// SetMetadata sets the Metadata field's value.
-func (s *GetObjectOutput) SetMetadata(v map[string]*string) *GetObjectOutput {
-	s.Metadata = v
-	return s
-}
-
-// SetMissingMeta sets the MissingMeta field's value.
-func (s *GetObjectOutput) SetMissingMeta(v int64) *GetObjectOutput {
-	s.MissingMeta = &v
-	return s
-}
-
-// SetPartsCount sets the PartsCount field's value.
-func (s *GetObjectOutput) SetPartsCount(v int64) *GetObjectOutput {
-	s.PartsCount = &v
-	return s
-}
-
-// SetReplicationStatus sets the ReplicationStatus field's value.
-func (s *GetObjectOutput) SetReplicationStatus(v string) *GetObjectOutput {
-	s.ReplicationStatus = &v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *GetObjectOutput) SetRequestCharged(v string) *GetObjectOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// SetRestore sets the Restore field's value.
-func (s *GetObjectOutput) SetRestore(v string) *GetObjectOutput {
-	s.Restore = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *GetObjectOutput) SetSSECustomerAlgorithm(v string) *GetObjectOutput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *GetObjectOutput) SetSSECustomerKeyMD5(v string) *GetObjectOutput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetSSEKMSKeyId sets the SSEKMSKeyId field's value.
-func (s *GetObjectOutput) SetSSEKMSKeyId(v string) *GetObjectOutput {
-	s.SSEKMSKeyId = &v
-	return s
-}
-
-// SetServerSideEncryption sets the ServerSideEncryption field's value.
-func (s *GetObjectOutput) SetServerSideEncryption(v string) *GetObjectOutput {
-	s.ServerSideEncryption = &v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *GetObjectOutput) SetStorageClass(v string) *GetObjectOutput {
-	s.StorageClass = &v
-	return s
-}
-
-// SetTagCount sets the TagCount field's value.
-func (s *GetObjectOutput) SetTagCount(v int64) *GetObjectOutput {
-	s.TagCount = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *GetObjectOutput) SetVersionId(v string) *GetObjectOutput {
-	s.VersionId = &v
-	return s
-}
-
-// SetWebsiteRedirectLocation sets the WebsiteRedirectLocation field's value.
-func (s *GetObjectOutput) SetWebsiteRedirectLocation(v string) *GetObjectOutput {
-	s.WebsiteRedirectLocation = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTaggingRequest
-type GetObjectTaggingInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	VersionId *string `location:"querystring" locationName:"versionId" type:"string"`
-}
-
-// String returns the string representation
-func (s GetObjectTaggingInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetObjectTaggingInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetObjectTaggingInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetObjectTaggingInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetObjectTaggingInput) SetBucket(v string) *GetObjectTaggingInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetObjectTaggingInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetKey sets the Key field's value.
-func (s *GetObjectTaggingInput) SetKey(v string) *GetObjectTaggingInput {
-	s.Key = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *GetObjectTaggingInput) SetVersionId(v string) *GetObjectTaggingInput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTaggingOutput
-type GetObjectTaggingOutput struct {
-	_ struct{} `type:"structure"`
-
-	// TagSet is a required field
-	TagSet []*Tag `locationNameList:"Tag" type:"list" required:"true"`
-
-	VersionId *string `location:"header" locationName:"x-amz-version-id" type:"string"`
-}
-
-// String returns the string representation
-func (s GetObjectTaggingOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetObjectTaggingOutput) GoString() string {
-	return s.String()
-}
-
-// SetTagSet sets the TagSet field's value.
-func (s *GetObjectTaggingOutput) SetTagSet(v []*Tag) *GetObjectTaggingOutput {
-	s.TagSet = v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *GetObjectTaggingOutput) SetVersionId(v string) *GetObjectTaggingOutput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTorrentRequest
-type GetObjectTorrentInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-}
-
-// String returns the string representation
-func (s GetObjectTorrentInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetObjectTorrentInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetObjectTorrentInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetObjectTorrentInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *GetObjectTorrentInput) SetBucket(v string) *GetObjectTorrentInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *GetObjectTorrentInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetKey sets the Key field's value.
-func (s *GetObjectTorrentInput) SetKey(v string) *GetObjectTorrentInput {
-	s.Key = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *GetObjectTorrentInput) SetRequestPayer(v string) *GetObjectTorrentInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTorrentOutput
-type GetObjectTorrentOutput struct {
-	_ struct{} `type:"structure" payload:"Body"`
-
-	Body io.ReadCloser `type:"blob"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-}
-
-// String returns the string representation
-func (s GetObjectTorrentOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetObjectTorrentOutput) GoString() string {
-	return s.String()
-}
-
-// SetBody sets the Body field's value.
-func (s *GetObjectTorrentOutput) SetBody(v io.ReadCloser) *GetObjectTorrentOutput {
-	s.Body = v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *GetObjectTorrentOutput) SetRequestCharged(v string) *GetObjectTorrentOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GlacierJobParameters
-type GlacierJobParameters struct {
-	_ struct{} `type:"structure"`
-
-	// Glacier retrieval tier at which the restore will be processed.
-	//
-	// Tier is a required field
-	Tier *string `type:"string" required:"true" enum:"Tier"`
-}
-
-// String returns the string representation
-func (s GlacierJobParameters) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GlacierJobParameters) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GlacierJobParameters) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GlacierJobParameters"}
-	if s.Tier == nil {
-		invalidParams.Add(request.NewErrParamRequired("Tier"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetTier sets the Tier field's value.
-func (s *GlacierJobParameters) SetTier(v string) *GlacierJobParameters {
-	s.Tier = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Grant
-type Grant struct {
-	_ struct{} `type:"structure"`
-
-	Grantee *Grantee `type:"structure" xmlPrefix:"xsi" xmlURI:"http://www.w3.org/2001/XMLSchema-instance"`
-
-	// Specifies the permission given to the grantee.
-	Permission *string `type:"string" enum:"Permission"`
-}
-
-// String returns the string representation
-func (s Grant) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Grant) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *Grant) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "Grant"}
-	if s.Grantee != nil {
-		if err := s.Grantee.Validate(); err != nil {
-			invalidParams.AddNested("Grantee", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetGrantee sets the Grantee field's value.
-func (s *Grant) SetGrantee(v *Grantee) *Grant {
-	s.Grantee = v
-	return s
-}
-
-// SetPermission sets the Permission field's value.
-func (s *Grant) SetPermission(v string) *Grant {
-	s.Permission = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Grantee
-type Grantee struct {
-	_ struct{} `type:"structure" xmlPrefix:"xsi" xmlURI:"http://www.w3.org/2001/XMLSchema-instance"`
-
-	// Screen name of the grantee.
-	DisplayName *string `type:"string"`
-
-	// Email address of the grantee.
-	EmailAddress *string `type:"string"`
-
-	// The canonical user ID of the grantee.
-	ID *string `type:"string"`
-
-	// Type of grantee
-	//
-	// Type is a required field
-	Type *string `locationName:"xsi:type" type:"string" xmlAttribute:"true" required:"true" enum:"Type"`
-
-	// URI of the grantee group.
-	URI *string `type:"string"`
-}
-
-// String returns the string representation
-func (s Grantee) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Grantee) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *Grantee) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "Grantee"}
-	if s.Type == nil {
-		invalidParams.Add(request.NewErrParamRequired("Type"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetDisplayName sets the DisplayName field's value.
-func (s *Grantee) SetDisplayName(v string) *Grantee {
-	s.DisplayName = &v
-	return s
-}
-
-// SetEmailAddress sets the EmailAddress field's value.
-func (s *Grantee) SetEmailAddress(v string) *Grantee {
-	s.EmailAddress = &v
-	return s
-}
-
-// SetID sets the ID field's value.
-func (s *Grantee) SetID(v string) *Grantee {
-	s.ID = &v
-	return s
-}
-
-// SetType sets the Type field's value.
-func (s *Grantee) SetType(v string) *Grantee {
-	s.Type = &v
-	return s
-}
-
-// SetURI sets the URI field's value.
-func (s *Grantee) SetURI(v string) *Grantee {
-	s.URI = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadBucketRequest
-type HeadBucketInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s HeadBucketInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s HeadBucketInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *HeadBucketInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "HeadBucketInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *HeadBucketInput) SetBucket(v string) *HeadBucketInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *HeadBucketInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadBucketOutput
-type HeadBucketOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s HeadBucketOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s HeadBucketOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadObjectRequest
-type HeadObjectInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Return the object only if its entity tag (ETag) is the same as the one specified,
-	// otherwise return a 412 (precondition failed).
-	IfMatch *string `location:"header" locationName:"If-Match" type:"string"`
-
-	// Return the object only if it has been modified since the specified time,
-	// otherwise return a 304 (not modified).
-	IfModifiedSince *time.Time `location:"header" locationName:"If-Modified-Since" type:"timestamp" timestampFormat:"rfc822"`
-
-	// Return the object only if its entity tag (ETag) is different from the one
-	// specified, otherwise return a 304 (not modified).
-	IfNoneMatch *string `location:"header" locationName:"If-None-Match" type:"string"`
-
-	// Return the object only if it has not been modified since the specified time,
-	// otherwise return a 412 (precondition failed).
-	IfUnmodifiedSince *time.Time `location:"header" locationName:"If-Unmodified-Since" type:"timestamp" timestampFormat:"rfc822"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// Part number of the object being read. This is a positive integer between
-	// 1 and 10,000. Effectively performs a 'ranged' HEAD request for the part specified.
-	// Useful querying about the size of the part and the number of parts in this
-	// object.
-	PartNumber *int64 `location:"querystring" locationName:"partNumber" type:"integer"`
-
-	// Downloads the specified range bytes of an object. For more information about
-	// the HTTP Range header, go to http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.
-	Range *string `location:"header" locationName:"Range" type:"string"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// Specifies the algorithm to use to when encrypting the object (e.g., AES256).
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// Specifies the customer-provided encryption key for Amazon S3 to use in encrypting
-	// data. This value is used to store the object and then it is discarded; Amazon
-	// does not store the encryption key. The key must be appropriate for use with
-	// the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm
-	// header.
-	SSECustomerKey *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key" type:"string"`
-
-	// Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321.
-	// Amazon S3 uses this header for a message integrity check to ensure the encryption
-	// key was transmitted without error.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// VersionId used to reference a specific version of the object.
-	VersionId *string `location:"querystring" locationName:"versionId" type:"string"`
-}
-
-// String returns the string representation
-func (s HeadObjectInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s HeadObjectInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *HeadObjectInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "HeadObjectInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *HeadObjectInput) SetBucket(v string) *HeadObjectInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *HeadObjectInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetIfMatch sets the IfMatch field's value.
-func (s *HeadObjectInput) SetIfMatch(v string) *HeadObjectInput {
-	s.IfMatch = &v
-	return s
-}
-
-// SetIfModifiedSince sets the IfModifiedSince field's value.
-func (s *HeadObjectInput) SetIfModifiedSince(v time.Time) *HeadObjectInput {
-	s.IfModifiedSince = &v
-	return s
-}
-
-// SetIfNoneMatch sets the IfNoneMatch field's value.
-func (s *HeadObjectInput) SetIfNoneMatch(v string) *HeadObjectInput {
-	s.IfNoneMatch = &v
-	return s
-}
-
-// SetIfUnmodifiedSince sets the IfUnmodifiedSince field's value.
-func (s *HeadObjectInput) SetIfUnmodifiedSince(v time.Time) *HeadObjectInput {
-	s.IfUnmodifiedSince = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *HeadObjectInput) SetKey(v string) *HeadObjectInput {
-	s.Key = &v
-	return s
-}
-
-// SetPartNumber sets the PartNumber field's value.
-func (s *HeadObjectInput) SetPartNumber(v int64) *HeadObjectInput {
-	s.PartNumber = &v
-	return s
-}
-
-// SetRange sets the Range field's value.
-func (s *HeadObjectInput) SetRange(v string) *HeadObjectInput {
-	s.Range = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *HeadObjectInput) SetRequestPayer(v string) *HeadObjectInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *HeadObjectInput) SetSSECustomerAlgorithm(v string) *HeadObjectInput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKey sets the SSECustomerKey field's value.
-func (s *HeadObjectInput) SetSSECustomerKey(v string) *HeadObjectInput {
-	s.SSECustomerKey = &v
-	return s
-}
-
-func (s *HeadObjectInput) getSSECustomerKey() (v string) {
-	if s.SSECustomerKey == nil {
-		return v
-	}
-	return *s.SSECustomerKey
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *HeadObjectInput) SetSSECustomerKeyMD5(v string) *HeadObjectInput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *HeadObjectInput) SetVersionId(v string) *HeadObjectInput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadObjectOutput
-type HeadObjectOutput struct {
-	_ struct{} `type:"structure"`
-
-	AcceptRanges *string `location:"header" locationName:"accept-ranges" type:"string"`
-
-	// Specifies caching behavior along the request/reply chain.
-	CacheControl *string `location:"header" locationName:"Cache-Control" type:"string"`
-
-	// Specifies presentational information for the object.
-	ContentDisposition *string `location:"header" locationName:"Content-Disposition" type:"string"`
-
-	// Specifies what content encodings have been applied to the object and thus
-	// what decoding mechanisms must be applied to obtain the media-type referenced
-	// by the Content-Type header field.
-	ContentEncoding *string `location:"header" locationName:"Content-Encoding" type:"string"`
-
-	// The language the content is in.
-	ContentLanguage *string `location:"header" locationName:"Content-Language" type:"string"`
-
-	// Size of the body in bytes.
-	ContentLength *int64 `location:"header" locationName:"Content-Length" type:"long"`
-
-	// A standard MIME type describing the format of the object data.
-	ContentType *string `location:"header" locationName:"Content-Type" type:"string"`
-
-	// Specifies whether the object retrieved was (true) or was not (false) a Delete
-	// Marker. If false, this response header does not appear in the response.
-	DeleteMarker *bool `location:"header" locationName:"x-amz-delete-marker" type:"boolean"`
-
-	// An ETag is an opaque identifier assigned by a web server to a specific version
-	// of a resource found at a URL
-	ETag *string `location:"header" locationName:"ETag" type:"string"`
-
-	// If the object expiration is configured (see PUT Bucket lifecycle), the response
-	// includes this header. It includes the expiry-date and rule-id key value pairs
-	// providing object expiration information. The value of the rule-id is URL
-	// encoded.
-	Expiration *string `location:"header" locationName:"x-amz-expiration" type:"string"`
-
-	// The date and time at which the object is no longer cacheable.
-	Expires *string `location:"header" locationName:"Expires" type:"string"`
-
-	// Last modified date of the object
-	LastModified *time.Time `location:"header" locationName:"Last-Modified" type:"timestamp" timestampFormat:"rfc822"`
-
-	// A map of metadata to store with the object in S3.
-	Metadata map[string]*string `location:"headers" locationName:"x-amz-meta-" type:"map"`
-
-	// This is set to the number of metadata entries not returned in x-amz-meta
-	// headers. This can happen if you create metadata using an API like SOAP that
-	// supports more flexible metadata than the REST API. For example, using SOAP,
-	// you can create metadata whose values are not legal HTTP headers.
-	MissingMeta *int64 `location:"header" locationName:"x-amz-missing-meta" type:"integer"`
-
-	// The count of parts this object has.
-	PartsCount *int64 `location:"header" locationName:"x-amz-mp-parts-count" type:"integer"`
-
-	ReplicationStatus *string `location:"header" locationName:"x-amz-replication-status" type:"string" enum:"ReplicationStatus"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-
-	// Provides information about object restoration operation and expiration time
-	// of the restored object copy.
-	Restore *string `location:"header" locationName:"x-amz-restore" type:"string"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header confirming the encryption algorithm
-	// used.
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header to provide round trip message integrity
-	// verification of the customer-provided encryption key.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// If present, specifies the ID of the AWS Key Management Service (KMS) master
-	// encryption key that was used for the object.
-	SSEKMSKeyId *string `location:"header" locationName:"x-amz-server-side-encryption-aws-kms-key-id" type:"string"`
-
-	// The Server-side encryption algorithm used when storing this object in S3
-	// (e.g., AES256, aws:kms).
-	ServerSideEncryption *string `location:"header" locationName:"x-amz-server-side-encryption" type:"string" enum:"ServerSideEncryption"`
-
-	StorageClass *string `location:"header" locationName:"x-amz-storage-class" type:"string" enum:"StorageClass"`
-
-	// Version of the object.
-	VersionId *string `location:"header" locationName:"x-amz-version-id" type:"string"`
-
-	// If the bucket is configured as a website, redirects requests for this object
-	// to another object in the same bucket or to an external URL. Amazon S3 stores
-	// the value of this header in the object metadata.
-	WebsiteRedirectLocation *string `location:"header" locationName:"x-amz-website-redirect-location" type:"string"`
-}
-
-// String returns the string representation
-func (s HeadObjectOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s HeadObjectOutput) GoString() string {
-	return s.String()
-}
-
-// SetAcceptRanges sets the AcceptRanges field's value.
-func (s *HeadObjectOutput) SetAcceptRanges(v string) *HeadObjectOutput {
-	s.AcceptRanges = &v
-	return s
-}
-
-// SetCacheControl sets the CacheControl field's value.
-func (s *HeadObjectOutput) SetCacheControl(v string) *HeadObjectOutput {
-	s.CacheControl = &v
-	return s
-}
-
-// SetContentDisposition sets the ContentDisposition field's value.
-func (s *HeadObjectOutput) SetContentDisposition(v string) *HeadObjectOutput {
-	s.ContentDisposition = &v
-	return s
-}
-
-// SetContentEncoding sets the ContentEncoding field's value.
-func (s *HeadObjectOutput) SetContentEncoding(v string) *HeadObjectOutput {
-	s.ContentEncoding = &v
-	return s
-}
-
-// SetContentLanguage sets the ContentLanguage field's value.
-func (s *HeadObjectOutput) SetContentLanguage(v string) *HeadObjectOutput {
-	s.ContentLanguage = &v
-	return s
-}
-
-// SetContentLength sets the ContentLength field's value.
-func (s *HeadObjectOutput) SetContentLength(v int64) *HeadObjectOutput {
-	s.ContentLength = &v
-	return s
-}
-
-// SetContentType sets the ContentType field's value.
-func (s *HeadObjectOutput) SetContentType(v string) *HeadObjectOutput {
-	s.ContentType = &v
-	return s
-}
-
-// SetDeleteMarker sets the DeleteMarker field's value.
-func (s *HeadObjectOutput) SetDeleteMarker(v bool) *HeadObjectOutput {
-	s.DeleteMarker = &v
-	return s
-}
-
-// SetETag sets the ETag field's value.
-func (s *HeadObjectOutput) SetETag(v string) *HeadObjectOutput {
-	s.ETag = &v
-	return s
-}
-
-// SetExpiration sets the Expiration field's value.
-func (s *HeadObjectOutput) SetExpiration(v string) *HeadObjectOutput {
-	s.Expiration = &v
-	return s
-}
-
-// SetExpires sets the Expires field's value.
-func (s *HeadObjectOutput) SetExpires(v string) *HeadObjectOutput {
-	s.Expires = &v
-	return s
-}
-
-// SetLastModified sets the LastModified field's value.
-func (s *HeadObjectOutput) SetLastModified(v time.Time) *HeadObjectOutput {
-	s.LastModified = &v
-	return s
-}
-
-// SetMetadata sets the Metadata field's value.
-func (s *HeadObjectOutput) SetMetadata(v map[string]*string) *HeadObjectOutput {
-	s.Metadata = v
-	return s
-}
-
-// SetMissingMeta sets the MissingMeta field's value.
-func (s *HeadObjectOutput) SetMissingMeta(v int64) *HeadObjectOutput {
-	s.MissingMeta = &v
-	return s
-}
-
-// SetPartsCount sets the PartsCount field's value.
-func (s *HeadObjectOutput) SetPartsCount(v int64) *HeadObjectOutput {
-	s.PartsCount = &v
-	return s
-}
-
-// SetReplicationStatus sets the ReplicationStatus field's value.
-func (s *HeadObjectOutput) SetReplicationStatus(v string) *HeadObjectOutput {
-	s.ReplicationStatus = &v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *HeadObjectOutput) SetRequestCharged(v string) *HeadObjectOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// SetRestore sets the Restore field's value.
-func (s *HeadObjectOutput) SetRestore(v string) *HeadObjectOutput {
-	s.Restore = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *HeadObjectOutput) SetSSECustomerAlgorithm(v string) *HeadObjectOutput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *HeadObjectOutput) SetSSECustomerKeyMD5(v string) *HeadObjectOutput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetSSEKMSKeyId sets the SSEKMSKeyId field's value.
-func (s *HeadObjectOutput) SetSSEKMSKeyId(v string) *HeadObjectOutput {
-	s.SSEKMSKeyId = &v
-	return s
-}
-
-// SetServerSideEncryption sets the ServerSideEncryption field's value.
-func (s *HeadObjectOutput) SetServerSideEncryption(v string) *HeadObjectOutput {
-	s.ServerSideEncryption = &v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *HeadObjectOutput) SetStorageClass(v string) *HeadObjectOutput {
-	s.StorageClass = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *HeadObjectOutput) SetVersionId(v string) *HeadObjectOutput {
-	s.VersionId = &v
-	return s
-}
-
-// SetWebsiteRedirectLocation sets the WebsiteRedirectLocation field's value.
-func (s *HeadObjectOutput) SetWebsiteRedirectLocation(v string) *HeadObjectOutput {
-	s.WebsiteRedirectLocation = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/IndexDocument
-type IndexDocument struct {
-	_ struct{} `type:"structure"`
-
-	// A suffix that is appended to a request that is for a directory on the website
-	// endpoint (e.g. if the suffix is index.html and you make a request to samplebucket/images/
-	// the data that is returned will be for the object with the key name images/index.html)
-	// The suffix must not be empty and must not include a slash character.
-	//
-	// Suffix is a required field
-	Suffix *string `type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s IndexDocument) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s IndexDocument) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *IndexDocument) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "IndexDocument"}
-	if s.Suffix == nil {
-		invalidParams.Add(request.NewErrParamRequired("Suffix"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetSuffix sets the Suffix field's value.
-func (s *IndexDocument) SetSuffix(v string) *IndexDocument {
-	s.Suffix = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Initiator
-type Initiator struct {
-	_ struct{} `type:"structure"`
-
-	// Name of the Principal.
-	DisplayName *string `type:"string"`
-
-	// If the principal is an AWS account, it provides the Canonical User ID. If
-	// the principal is an IAM User, it provides a user ARN value.
-	ID *string `type:"string"`
-}
-
-// String returns the string representation
-func (s Initiator) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Initiator) GoString() string {
-	return s.String()
-}
-
-// SetDisplayName sets the DisplayName field's value.
-func (s *Initiator) SetDisplayName(v string) *Initiator {
-	s.DisplayName = &v
-	return s
-}
-
-// SetID sets the ID field's value.
-func (s *Initiator) SetID(v string) *Initiator {
-	s.ID = &v
-	return s
-}
-
-// Describes the serialization format of the object.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InputSerialization
-type InputSerialization struct {
-	_ struct{} `type:"structure"`
-
-	// Describes the serialization of a CSV-encoded object.
-	CSV *CSVInput `type:"structure"`
-}
-
-// String returns the string representation
-func (s InputSerialization) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s InputSerialization) GoString() string {
-	return s.String()
-}
-
-// SetCSV sets the CSV field's value.
-func (s *InputSerialization) SetCSV(v *CSVInput) *InputSerialization {
-	s.CSV = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventoryConfiguration
-type InventoryConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// Contains information about where to publish the inventory results.
-	//
-	// Destination is a required field
-	Destination *InventoryDestination `type:"structure" required:"true"`
-
-	// Specifies an inventory filter. The inventory only includes objects that meet
-	// the filter's criteria.
-	Filter *InventoryFilter `type:"structure"`
-
-	// The ID used to identify the inventory configuration.
-	//
-	// Id is a required field
-	Id *string `type:"string" required:"true"`
-
-	// Specifies which object version(s) to included in the inventory results.
-	//
-	// IncludedObjectVersions is a required field
-	IncludedObjectVersions *string `type:"string" required:"true" enum:"InventoryIncludedObjectVersions"`
-
-	// Specifies whether the inventory is enabled or disabled.
-	//
-	// IsEnabled is a required field
-	IsEnabled *bool `type:"boolean" required:"true"`
-
-	// Contains the optional fields that are included in the inventory results.
-	OptionalFields []*string `locationNameList:"Field" type:"list"`
-
-	// Specifies the schedule for generating inventory results.
-	//
-	// Schedule is a required field
-	Schedule *InventorySchedule `type:"structure" required:"true"`
-}
-
-// String returns the string representation
-func (s InventoryConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s InventoryConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *InventoryConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "InventoryConfiguration"}
-	if s.Destination == nil {
-		invalidParams.Add(request.NewErrParamRequired("Destination"))
-	}
-	if s.Id == nil {
-		invalidParams.Add(request.NewErrParamRequired("Id"))
-	}
-	if s.IncludedObjectVersions == nil {
-		invalidParams.Add(request.NewErrParamRequired("IncludedObjectVersions"))
-	}
-	if s.IsEnabled == nil {
-		invalidParams.Add(request.NewErrParamRequired("IsEnabled"))
-	}
-	if s.Schedule == nil {
-		invalidParams.Add(request.NewErrParamRequired("Schedule"))
-	}
-	if s.Destination != nil {
-		if err := s.Destination.Validate(); err != nil {
-			invalidParams.AddNested("Destination", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.Filter != nil {
-		if err := s.Filter.Validate(); err != nil {
-			invalidParams.AddNested("Filter", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.Schedule != nil {
-		if err := s.Schedule.Validate(); err != nil {
-			invalidParams.AddNested("Schedule", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetDestination sets the Destination field's value.
-func (s *InventoryConfiguration) SetDestination(v *InventoryDestination) *InventoryConfiguration {
-	s.Destination = v
-	return s
-}
-
-// SetFilter sets the Filter field's value.
-func (s *InventoryConfiguration) SetFilter(v *InventoryFilter) *InventoryConfiguration {
-	s.Filter = v
-	return s
-}
-
-// SetId sets the Id field's value.
-func (s *InventoryConfiguration) SetId(v string) *InventoryConfiguration {
-	s.Id = &v
-	return s
-}
-
-// SetIncludedObjectVersions sets the IncludedObjectVersions field's value.
-func (s *InventoryConfiguration) SetIncludedObjectVersions(v string) *InventoryConfiguration {
-	s.IncludedObjectVersions = &v
-	return s
-}
-
-// SetIsEnabled sets the IsEnabled field's value.
-func (s *InventoryConfiguration) SetIsEnabled(v bool) *InventoryConfiguration {
-	s.IsEnabled = &v
-	return s
-}
-
-// SetOptionalFields sets the OptionalFields field's value.
-func (s *InventoryConfiguration) SetOptionalFields(v []*string) *InventoryConfiguration {
-	s.OptionalFields = v
-	return s
-}
-
-// SetSchedule sets the Schedule field's value.
-func (s *InventoryConfiguration) SetSchedule(v *InventorySchedule) *InventoryConfiguration {
-	s.Schedule = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventoryDestination
-type InventoryDestination struct {
-	_ struct{} `type:"structure"`
-
-	// Contains the bucket name, file format, bucket owner (optional), and prefix
-	// (optional) where inventory results are published.
-	//
-	// S3BucketDestination is a required field
-	S3BucketDestination *InventoryS3BucketDestination `type:"structure" required:"true"`
-}
-
-// String returns the string representation
-func (s InventoryDestination) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s InventoryDestination) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *InventoryDestination) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "InventoryDestination"}
-	if s.S3BucketDestination == nil {
-		invalidParams.Add(request.NewErrParamRequired("S3BucketDestination"))
-	}
-	if s.S3BucketDestination != nil {
-		if err := s.S3BucketDestination.Validate(); err != nil {
-			invalidParams.AddNested("S3BucketDestination", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetS3BucketDestination sets the S3BucketDestination field's value.
-func (s *InventoryDestination) SetS3BucketDestination(v *InventoryS3BucketDestination) *InventoryDestination {
-	s.S3BucketDestination = v
-	return s
-}
-
-// Contains the type of server-side encryption used to encrypt the inventory
-// results.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventoryEncryption
-type InventoryEncryption struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies the use of SSE-KMS to encrypt delievered Inventory reports.
-	SSEKMS *SSEKMS `locationName:"SSE-KMS" type:"structure"`
-
-	// Specifies the use of SSE-S3 to encrypt delievered Inventory reports.
-	SSES3 *SSES3 `locationName:"SSE-S3" type:"structure"`
-}
-
-// String returns the string representation
-func (s InventoryEncryption) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s InventoryEncryption) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *InventoryEncryption) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "InventoryEncryption"}
-	if s.SSEKMS != nil {
-		if err := s.SSEKMS.Validate(); err != nil {
-			invalidParams.AddNested("SSEKMS", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetSSEKMS sets the SSEKMS field's value.
-func (s *InventoryEncryption) SetSSEKMS(v *SSEKMS) *InventoryEncryption {
-	s.SSEKMS = v
-	return s
-}
-
-// SetSSES3 sets the SSES3 field's value.
-func (s *InventoryEncryption) SetSSES3(v *SSES3) *InventoryEncryption {
-	s.SSES3 = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventoryFilter
-type InventoryFilter struct {
-	_ struct{} `type:"structure"`
-
-	// The prefix that an object must have to be included in the inventory results.
-	//
-	// Prefix is a required field
-	Prefix *string `type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s InventoryFilter) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s InventoryFilter) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *InventoryFilter) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "InventoryFilter"}
-	if s.Prefix == nil {
-		invalidParams.Add(request.NewErrParamRequired("Prefix"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *InventoryFilter) SetPrefix(v string) *InventoryFilter {
-	s.Prefix = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventoryS3BucketDestination
-type InventoryS3BucketDestination struct {
-	_ struct{} `type:"structure"`
-
-	// The ID of the account that owns the destination bucket.
-	AccountId *string `type:"string"`
-
-	// The Amazon resource name (ARN) of the bucket where inventory results will
-	// be published.
-	//
-	// Bucket is a required field
-	Bucket *string `type:"string" required:"true"`
-
-	// Contains the type of server-side encryption used to encrypt the inventory
-	// results.
-	Encryption *InventoryEncryption `type:"structure"`
-
-	// Specifies the output format of the inventory results.
-	//
-	// Format is a required field
-	Format *string `type:"string" required:"true" enum:"InventoryFormat"`
-
-	// The prefix that is prepended to all inventory results.
-	Prefix *string `type:"string"`
-}
-
-// String returns the string representation
-func (s InventoryS3BucketDestination) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s InventoryS3BucketDestination) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *InventoryS3BucketDestination) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "InventoryS3BucketDestination"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Format == nil {
-		invalidParams.Add(request.NewErrParamRequired("Format"))
-	}
-	if s.Encryption != nil {
-		if err := s.Encryption.Validate(); err != nil {
-			invalidParams.AddNested("Encryption", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetAccountId sets the AccountId field's value.
-func (s *InventoryS3BucketDestination) SetAccountId(v string) *InventoryS3BucketDestination {
-	s.AccountId = &v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *InventoryS3BucketDestination) SetBucket(v string) *InventoryS3BucketDestination {
-	s.Bucket = &v
-	return s
-}
-
-func (s *InventoryS3BucketDestination) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetEncryption sets the Encryption field's value.
-func (s *InventoryS3BucketDestination) SetEncryption(v *InventoryEncryption) *InventoryS3BucketDestination {
-	s.Encryption = v
-	return s
-}
-
-// SetFormat sets the Format field's value.
-func (s *InventoryS3BucketDestination) SetFormat(v string) *InventoryS3BucketDestination {
-	s.Format = &v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *InventoryS3BucketDestination) SetPrefix(v string) *InventoryS3BucketDestination {
-	s.Prefix = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventorySchedule
-type InventorySchedule struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies how frequently inventory results are produced.
-	//
-	// Frequency is a required field
-	Frequency *string `type:"string" required:"true" enum:"InventoryFrequency"`
-}
-
-// String returns the string representation
-func (s InventorySchedule) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s InventorySchedule) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *InventorySchedule) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "InventorySchedule"}
-	if s.Frequency == nil {
-		invalidParams.Add(request.NewErrParamRequired("Frequency"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetFrequency sets the Frequency field's value.
-func (s *InventorySchedule) SetFrequency(v string) *InventorySchedule {
-	s.Frequency = &v
-	return s
-}
-
-// Container for object key name prefix and suffix filtering rules.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/S3KeyFilter
-type KeyFilter struct {
-	_ struct{} `type:"structure"`
-
-	// A list of containers for key value pair that defines the criteria for the
-	// filter rule.
-	FilterRules []*FilterRule `locationName:"FilterRule" type:"list" flattened:"true"`
-}
-
-// String returns the string representation
-func (s KeyFilter) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s KeyFilter) GoString() string {
-	return s.String()
-}
-
-// SetFilterRules sets the FilterRules field's value.
-func (s *KeyFilter) SetFilterRules(v []*FilterRule) *KeyFilter {
-	s.FilterRules = v
-	return s
-}
-
-// Container for specifying the AWS Lambda notification configuration.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LambdaFunctionConfiguration
-type LambdaFunctionConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// Events is a required field
-	Events []*string `locationName:"Event" type:"list" flattened:"true" required:"true"`
-
-	// Container for object key name filtering rules. For information about key
-	// name filtering, go to Configuring Event Notifications (http://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
-	Filter *NotificationConfigurationFilter `type:"structure"`
-
-	// Optional unique identifier for configurations in a notification configuration.
-	// If you don't provide one, Amazon S3 will assign an ID.
-	Id *string `type:"string"`
-
-	// Lambda cloud function ARN that Amazon S3 can invoke when it detects events
-	// of the specified type.
-	//
-	// LambdaFunctionArn is a required field
-	LambdaFunctionArn *string `locationName:"CloudFunction" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s LambdaFunctionConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s LambdaFunctionConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *LambdaFunctionConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "LambdaFunctionConfiguration"}
-	if s.Events == nil {
-		invalidParams.Add(request.NewErrParamRequired("Events"))
-	}
-	if s.LambdaFunctionArn == nil {
-		invalidParams.Add(request.NewErrParamRequired("LambdaFunctionArn"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetEvents sets the Events field's value.
-func (s *LambdaFunctionConfiguration) SetEvents(v []*string) *LambdaFunctionConfiguration {
-	s.Events = v
-	return s
-}
-
-// SetFilter sets the Filter field's value.
-func (s *LambdaFunctionConfiguration) SetFilter(v *NotificationConfigurationFilter) *LambdaFunctionConfiguration {
-	s.Filter = v
-	return s
-}
-
-// SetId sets the Id field's value.
-func (s *LambdaFunctionConfiguration) SetId(v string) *LambdaFunctionConfiguration {
-	s.Id = &v
-	return s
-}
-
-// SetLambdaFunctionArn sets the LambdaFunctionArn field's value.
-func (s *LambdaFunctionConfiguration) SetLambdaFunctionArn(v string) *LambdaFunctionConfiguration {
-	s.LambdaFunctionArn = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LifecycleConfiguration
-type LifecycleConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// Rules is a required field
-	Rules []*Rule `locationName:"Rule" type:"list" flattened:"true" required:"true"`
-}
-
-// String returns the string representation
-func (s LifecycleConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s LifecycleConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *LifecycleConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "LifecycleConfiguration"}
-	if s.Rules == nil {
-		invalidParams.Add(request.NewErrParamRequired("Rules"))
-	}
-	if s.Rules != nil {
-		for i, v := range s.Rules {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Rules", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetRules sets the Rules field's value.
-func (s *LifecycleConfiguration) SetRules(v []*Rule) *LifecycleConfiguration {
-	s.Rules = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LifecycleExpiration
-type LifecycleExpiration struct {
-	_ struct{} `type:"structure"`
-
-	// Indicates at what date the object is to be moved or deleted. Should be in
-	// GMT ISO 8601 Format.
-	Date *time.Time `type:"timestamp" timestampFormat:"iso8601"`
-
-	// Indicates the lifetime, in days, of the objects that are subject to the rule.
-	// The value must be a non-zero positive integer.
-	Days *int64 `type:"integer"`
-
-	// Indicates whether Amazon S3 will remove a delete marker with no noncurrent
-	// versions. If set to true, the delete marker will be expired; if set to false
-	// the policy takes no action. This cannot be specified with Days or Date in
-	// a Lifecycle Expiration Policy.
-	ExpiredObjectDeleteMarker *bool `type:"boolean"`
-}
-
-// String returns the string representation
-func (s LifecycleExpiration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s LifecycleExpiration) GoString() string {
-	return s.String()
-}
-
-// SetDate sets the Date field's value.
-func (s *LifecycleExpiration) SetDate(v time.Time) *LifecycleExpiration {
-	s.Date = &v
-	return s
-}
-
-// SetDays sets the Days field's value.
-func (s *LifecycleExpiration) SetDays(v int64) *LifecycleExpiration {
-	s.Days = &v
-	return s
-}
-
-// SetExpiredObjectDeleteMarker sets the ExpiredObjectDeleteMarker field's value.
-func (s *LifecycleExpiration) SetExpiredObjectDeleteMarker(v bool) *LifecycleExpiration {
-	s.ExpiredObjectDeleteMarker = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LifecycleRule
-type LifecycleRule struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies the days since the initiation of an Incomplete Multipart Upload
-	// that Lifecycle will wait before permanently removing all parts of the upload.
-	AbortIncompleteMultipartUpload *AbortIncompleteMultipartUpload `type:"structure"`
-
-	Expiration *LifecycleExpiration `type:"structure"`
-
-	// The Filter is used to identify objects that a Lifecycle Rule applies to.
-	// A Filter must have exactly one of Prefix, Tag, or And specified.
-	Filter *LifecycleRuleFilter `type:"structure"`
-
-	// Unique identifier for the rule. The value cannot be longer than 255 characters.
-	ID *string `type:"string"`
-
-	// Specifies when noncurrent object versions expire. Upon expiration, Amazon
-	// S3 permanently deletes the noncurrent object versions. You set this lifecycle
-	// configuration action on a bucket that has versioning enabled (or suspended)
-	// to request that Amazon S3 delete noncurrent object versions at a specific
-	// period in the object's lifetime.
-	NoncurrentVersionExpiration *NoncurrentVersionExpiration `type:"structure"`
-
-	NoncurrentVersionTransitions []*NoncurrentVersionTransition `locationName:"NoncurrentVersionTransition" type:"list" flattened:"true"`
-
-	// Prefix identifying one or more objects to which the rule applies. This is
-	// deprecated; use Filter instead.
-	Prefix *string `deprecated:"true" type:"string"`
-
-	// If 'Enabled', the rule is currently being applied. If 'Disabled', the rule
-	// is not currently being applied.
-	//
-	// Status is a required field
-	Status *string `type:"string" required:"true" enum:"ExpirationStatus"`
-
-	Transitions []*Transition `locationName:"Transition" type:"list" flattened:"true"`
-}
-
-// String returns the string representation
-func (s LifecycleRule) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s LifecycleRule) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *LifecycleRule) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "LifecycleRule"}
-	if s.Status == nil {
-		invalidParams.Add(request.NewErrParamRequired("Status"))
-	}
-	if s.Filter != nil {
-		if err := s.Filter.Validate(); err != nil {
-			invalidParams.AddNested("Filter", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetAbortIncompleteMultipartUpload sets the AbortIncompleteMultipartUpload field's value.
-func (s *LifecycleRule) SetAbortIncompleteMultipartUpload(v *AbortIncompleteMultipartUpload) *LifecycleRule {
-	s.AbortIncompleteMultipartUpload = v
-	return s
-}
-
-// SetExpiration sets the Expiration field's value.
-func (s *LifecycleRule) SetExpiration(v *LifecycleExpiration) *LifecycleRule {
-	s.Expiration = v
-	return s
-}
-
-// SetFilter sets the Filter field's value.
-func (s *LifecycleRule) SetFilter(v *LifecycleRuleFilter) *LifecycleRule {
-	s.Filter = v
-	return s
-}
-
-// SetID sets the ID field's value.
-func (s *LifecycleRule) SetID(v string) *LifecycleRule {
-	s.ID = &v
-	return s
-}
-
-// SetNoncurrentVersionExpiration sets the NoncurrentVersionExpiration field's value.
-func (s *LifecycleRule) SetNoncurrentVersionExpiration(v *NoncurrentVersionExpiration) *LifecycleRule {
-	s.NoncurrentVersionExpiration = v
-	return s
-}
-
-// SetNoncurrentVersionTransitions sets the NoncurrentVersionTransitions field's value.
-func (s *LifecycleRule) SetNoncurrentVersionTransitions(v []*NoncurrentVersionTransition) *LifecycleRule {
-	s.NoncurrentVersionTransitions = v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *LifecycleRule) SetPrefix(v string) *LifecycleRule {
-	s.Prefix = &v
-	return s
-}
-
-// SetStatus sets the Status field's value.
-func (s *LifecycleRule) SetStatus(v string) *LifecycleRule {
-	s.Status = &v
-	return s
-}
-
-// SetTransitions sets the Transitions field's value.
-func (s *LifecycleRule) SetTransitions(v []*Transition) *LifecycleRule {
-	s.Transitions = v
-	return s
-}
-
-// This is used in a Lifecycle Rule Filter to apply a logical AND to two or
-// more predicates. The Lifecycle Rule will apply to any object matching all
-// of the predicates configured inside the And operator.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LifecycleRuleAndOperator
-type LifecycleRuleAndOperator struct {
-	_ struct{} `type:"structure"`
-
-	Prefix *string `type:"string"`
-
-	// All of these tags must exist in the object's tag set in order for the rule
-	// to apply.
-	Tags []*Tag `locationName:"Tag" locationNameList:"Tag" type:"list" flattened:"true"`
-}
-
-// String returns the string representation
-func (s LifecycleRuleAndOperator) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s LifecycleRuleAndOperator) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *LifecycleRuleAndOperator) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "LifecycleRuleAndOperator"}
-	if s.Tags != nil {
-		for i, v := range s.Tags {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Tags", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *LifecycleRuleAndOperator) SetPrefix(v string) *LifecycleRuleAndOperator {
-	s.Prefix = &v
-	return s
-}
-
-// SetTags sets the Tags field's value.
-func (s *LifecycleRuleAndOperator) SetTags(v []*Tag) *LifecycleRuleAndOperator {
-	s.Tags = v
-	return s
-}
-
-// The Filter is used to identify objects that a Lifecycle Rule applies to.
-// A Filter must have exactly one of Prefix, Tag, or And specified.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LifecycleRuleFilter
-type LifecycleRuleFilter struct {
-	_ struct{} `type:"structure"`
-
-	// This is used in a Lifecycle Rule Filter to apply a logical AND to two or
-	// more predicates. The Lifecycle Rule will apply to any object matching all
-	// of the predicates configured inside the And operator.
-	And *LifecycleRuleAndOperator `type:"structure"`
-
-	// Prefix identifying one or more objects to which the rule applies.
-	Prefix *string `type:"string"`
-
-	// This tag must exist in the object's tag set in order for the rule to apply.
-	Tag *Tag `type:"structure"`
-}
-
-// String returns the string representation
-func (s LifecycleRuleFilter) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s LifecycleRuleFilter) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *LifecycleRuleFilter) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "LifecycleRuleFilter"}
-	if s.And != nil {
-		if err := s.And.Validate(); err != nil {
-			invalidParams.AddNested("And", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.Tag != nil {
-		if err := s.Tag.Validate(); err != nil {
-			invalidParams.AddNested("Tag", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetAnd sets the And field's value.
-func (s *LifecycleRuleFilter) SetAnd(v *LifecycleRuleAndOperator) *LifecycleRuleFilter {
-	s.And = v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *LifecycleRuleFilter) SetPrefix(v string) *LifecycleRuleFilter {
-	s.Prefix = &v
-	return s
-}
-
-// SetTag sets the Tag field's value.
-func (s *LifecycleRuleFilter) SetTag(v *Tag) *LifecycleRuleFilter {
-	s.Tag = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketAnalyticsConfigurationsRequest
-type ListBucketAnalyticsConfigurationsInput struct {
-	_ struct{} `type:"structure"`
-
-	// The name of the bucket from which analytics configurations are retrieved.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The ContinuationToken that represents a placeholder from where this request
-	// should begin.
-	ContinuationToken *string `location:"querystring" locationName:"continuation-token" type:"string"`
-}
-
-// String returns the string representation
-func (s ListBucketAnalyticsConfigurationsInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListBucketAnalyticsConfigurationsInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ListBucketAnalyticsConfigurationsInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ListBucketAnalyticsConfigurationsInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *ListBucketAnalyticsConfigurationsInput) SetBucket(v string) *ListBucketAnalyticsConfigurationsInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *ListBucketAnalyticsConfigurationsInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetContinuationToken sets the ContinuationToken field's value.
-func (s *ListBucketAnalyticsConfigurationsInput) SetContinuationToken(v string) *ListBucketAnalyticsConfigurationsInput {
-	s.ContinuationToken = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketAnalyticsConfigurationsOutput
-type ListBucketAnalyticsConfigurationsOutput struct {
-	_ struct{} `type:"structure"`
-
-	// The list of analytics configurations for a bucket.
-	AnalyticsConfigurationList []*AnalyticsConfiguration `locationName:"AnalyticsConfiguration" type:"list" flattened:"true"`
-
-	// The ContinuationToken that represents where this request began.
-	ContinuationToken *string `type:"string"`
-
-	// Indicates whether the returned list of analytics configurations is complete.
-	// A value of true indicates that the list is not complete and the NextContinuationToken
-	// will be provided for a subsequent request.
-	IsTruncated *bool `type:"boolean"`
-
-	// NextContinuationToken is sent when isTruncated is true, which indicates that
-	// there are more analytics configurations to list. The next request must include
-	// this NextContinuationToken. The token is obfuscated and is not a usable value.
-	NextContinuationToken *string `type:"string"`
-}
-
-// String returns the string representation
-func (s ListBucketAnalyticsConfigurationsOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListBucketAnalyticsConfigurationsOutput) GoString() string {
-	return s.String()
-}
-
-// SetAnalyticsConfigurationList sets the AnalyticsConfigurationList field's value.
-func (s *ListBucketAnalyticsConfigurationsOutput) SetAnalyticsConfigurationList(v []*AnalyticsConfiguration) *ListBucketAnalyticsConfigurationsOutput {
-	s.AnalyticsConfigurationList = v
-	return s
-}
-
-// SetContinuationToken sets the ContinuationToken field's value.
-func (s *ListBucketAnalyticsConfigurationsOutput) SetContinuationToken(v string) *ListBucketAnalyticsConfigurationsOutput {
-	s.ContinuationToken = &v
-	return s
-}
-
-// SetIsTruncated sets the IsTruncated field's value.
-func (s *ListBucketAnalyticsConfigurationsOutput) SetIsTruncated(v bool) *ListBucketAnalyticsConfigurationsOutput {
-	s.IsTruncated = &v
-	return s
-}
-
-// SetNextContinuationToken sets the NextContinuationToken field's value.
-func (s *ListBucketAnalyticsConfigurationsOutput) SetNextContinuationToken(v string) *ListBucketAnalyticsConfigurationsOutput {
-	s.NextContinuationToken = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketInventoryConfigurationsRequest
-type ListBucketInventoryConfigurationsInput struct {
-	_ struct{} `type:"structure"`
-
-	// The name of the bucket containing the inventory configurations to retrieve.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The marker used to continue an inventory configuration listing that has been
-	// truncated. Use the NextContinuationToken from a previously truncated list
-	// response to continue the listing. The continuation token is an opaque value
-	// that Amazon S3 understands.
-	ContinuationToken *string `location:"querystring" locationName:"continuation-token" type:"string"`
-}
-
-// String returns the string representation
-func (s ListBucketInventoryConfigurationsInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListBucketInventoryConfigurationsInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ListBucketInventoryConfigurationsInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ListBucketInventoryConfigurationsInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *ListBucketInventoryConfigurationsInput) SetBucket(v string) *ListBucketInventoryConfigurationsInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *ListBucketInventoryConfigurationsInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetContinuationToken sets the ContinuationToken field's value.
-func (s *ListBucketInventoryConfigurationsInput) SetContinuationToken(v string) *ListBucketInventoryConfigurationsInput {
-	s.ContinuationToken = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketInventoryConfigurationsOutput
-type ListBucketInventoryConfigurationsOutput struct {
-	_ struct{} `type:"structure"`
-
-	// If sent in the request, the marker that is used as a starting point for this
-	// inventory configuration list response.
-	ContinuationToken *string `type:"string"`
-
-	// The list of inventory configurations for a bucket.
-	InventoryConfigurationList []*InventoryConfiguration `locationName:"InventoryConfiguration" type:"list" flattened:"true"`
-
-	// Indicates whether the returned list of inventory configurations is truncated
-	// in this response. A value of true indicates that the list is truncated.
-	IsTruncated *bool `type:"boolean"`
-
-	// The marker used to continue this inventory configuration listing. Use the
-	// NextContinuationToken from this response to continue the listing in a subsequent
-	// request. The continuation token is an opaque value that Amazon S3 understands.
-	NextContinuationToken *string `type:"string"`
-}
-
-// String returns the string representation
-func (s ListBucketInventoryConfigurationsOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListBucketInventoryConfigurationsOutput) GoString() string {
-	return s.String()
-}
-
-// SetContinuationToken sets the ContinuationToken field's value.
-func (s *ListBucketInventoryConfigurationsOutput) SetContinuationToken(v string) *ListBucketInventoryConfigurationsOutput {
-	s.ContinuationToken = &v
-	return s
-}
-
-// SetInventoryConfigurationList sets the InventoryConfigurationList field's value.
-func (s *ListBucketInventoryConfigurationsOutput) SetInventoryConfigurationList(v []*InventoryConfiguration) *ListBucketInventoryConfigurationsOutput {
-	s.InventoryConfigurationList = v
-	return s
-}
-
-// SetIsTruncated sets the IsTruncated field's value.
-func (s *ListBucketInventoryConfigurationsOutput) SetIsTruncated(v bool) *ListBucketInventoryConfigurationsOutput {
-	s.IsTruncated = &v
-	return s
-}
-
-// SetNextContinuationToken sets the NextContinuationToken field's value.
-func (s *ListBucketInventoryConfigurationsOutput) SetNextContinuationToken(v string) *ListBucketInventoryConfigurationsOutput {
-	s.NextContinuationToken = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketMetricsConfigurationsRequest
-type ListBucketMetricsConfigurationsInput struct {
-	_ struct{} `type:"structure"`
-
-	// The name of the bucket containing the metrics configurations to retrieve.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The marker that is used to continue a metrics configuration listing that
-	// has been truncated. Use the NextContinuationToken from a previously truncated
-	// list response to continue the listing. The continuation token is an opaque
-	// value that Amazon S3 understands.
-	ContinuationToken *string `location:"querystring" locationName:"continuation-token" type:"string"`
-}
-
-// String returns the string representation
-func (s ListBucketMetricsConfigurationsInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListBucketMetricsConfigurationsInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ListBucketMetricsConfigurationsInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ListBucketMetricsConfigurationsInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *ListBucketMetricsConfigurationsInput) SetBucket(v string) *ListBucketMetricsConfigurationsInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *ListBucketMetricsConfigurationsInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetContinuationToken sets the ContinuationToken field's value.
-func (s *ListBucketMetricsConfigurationsInput) SetContinuationToken(v string) *ListBucketMetricsConfigurationsInput {
-	s.ContinuationToken = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketMetricsConfigurationsOutput
-type ListBucketMetricsConfigurationsOutput struct {
-	_ struct{} `type:"structure"`
-
-	// The marker that is used as a starting point for this metrics configuration
-	// list response. This value is present if it was sent in the request.
-	ContinuationToken *string `type:"string"`
-
-	// Indicates whether the returned list of metrics configurations is complete.
-	// A value of true indicates that the list is not complete and the NextContinuationToken
-	// will be provided for a subsequent request.
-	IsTruncated *bool `type:"boolean"`
-
-	// The list of metrics configurations for a bucket.
-	MetricsConfigurationList []*MetricsConfiguration `locationName:"MetricsConfiguration" type:"list" flattened:"true"`
-
-	// The marker used to continue a metrics configuration listing that has been
-	// truncated. Use the NextContinuationToken from a previously truncated list
-	// response to continue the listing. The continuation token is an opaque value
-	// that Amazon S3 understands.
-	NextContinuationToken *string `type:"string"`
-}
-
-// String returns the string representation
-func (s ListBucketMetricsConfigurationsOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListBucketMetricsConfigurationsOutput) GoString() string {
-	return s.String()
-}
-
-// SetContinuationToken sets the ContinuationToken field's value.
-func (s *ListBucketMetricsConfigurationsOutput) SetContinuationToken(v string) *ListBucketMetricsConfigurationsOutput {
-	s.ContinuationToken = &v
-	return s
-}
-
-// SetIsTruncated sets the IsTruncated field's value.
-func (s *ListBucketMetricsConfigurationsOutput) SetIsTruncated(v bool) *ListBucketMetricsConfigurationsOutput {
-	s.IsTruncated = &v
-	return s
-}
-
-// SetMetricsConfigurationList sets the MetricsConfigurationList field's value.
-func (s *ListBucketMetricsConfigurationsOutput) SetMetricsConfigurationList(v []*MetricsConfiguration) *ListBucketMetricsConfigurationsOutput {
-	s.MetricsConfigurationList = v
-	return s
-}
-
-// SetNextContinuationToken sets the NextContinuationToken field's value.
-func (s *ListBucketMetricsConfigurationsOutput) SetNextContinuationToken(v string) *ListBucketMetricsConfigurationsOutput {
-	s.NextContinuationToken = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketsInput
-type ListBucketsInput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s ListBucketsInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListBucketsInput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketsOutput
-type ListBucketsOutput struct {
-	_ struct{} `type:"structure"`
-
-	Buckets []*Bucket `locationNameList:"Bucket" type:"list"`
-
-	Owner *Owner `type:"structure"`
-}
-
-// String returns the string representation
-func (s ListBucketsOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListBucketsOutput) GoString() string {
-	return s.String()
-}
-
-// SetBuckets sets the Buckets field's value.
-func (s *ListBucketsOutput) SetBuckets(v []*Bucket) *ListBucketsOutput {
-	s.Buckets = v
-	return s
-}
-
-// SetOwner sets the Owner field's value.
-func (s *ListBucketsOutput) SetOwner(v *Owner) *ListBucketsOutput {
-	s.Owner = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListMultipartUploadsRequest
-type ListMultipartUploadsInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Character you use to group keys.
-	Delimiter *string `location:"querystring" locationName:"delimiter" type:"string"`
-
-	// Requests Amazon S3 to encode the object keys in the response and specifies
-	// the encoding method to use. An object key may contain any Unicode character;
-	// however, XML 1.0 parser cannot parse some characters, such as characters
-	// with an ASCII value from 0 to 10. For characters that are not supported in
-	// XML 1.0, you can add this parameter to request that Amazon S3 encode the
-	// keys in the response.
-	EncodingType *string `location:"querystring" locationName:"encoding-type" type:"string" enum:"EncodingType"`
-
-	// Together with upload-id-marker, this parameter specifies the multipart upload
-	// after which listing should begin.
-	KeyMarker *string `location:"querystring" locationName:"key-marker" type:"string"`
-
-	// Sets the maximum number of multipart uploads, from 1 to 1,000, to return
-	// in the response body. 1,000 is the maximum number of uploads that can be
-	// returned in a response.
-	MaxUploads *int64 `location:"querystring" locationName:"max-uploads" type:"integer"`
-
-	// Lists in-progress uploads only for those keys that begin with the specified
-	// prefix.
-	Prefix *string `location:"querystring" locationName:"prefix" type:"string"`
-
-	// Together with key-marker, specifies the multipart upload after which listing
-	// should begin. If key-marker is not specified, the upload-id-marker parameter
-	// is ignored.
-	UploadIdMarker *string `location:"querystring" locationName:"upload-id-marker" type:"string"`
-}
-
-// String returns the string representation
-func (s ListMultipartUploadsInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListMultipartUploadsInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ListMultipartUploadsInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ListMultipartUploadsInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *ListMultipartUploadsInput) SetBucket(v string) *ListMultipartUploadsInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *ListMultipartUploadsInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetDelimiter sets the Delimiter field's value.
-func (s *ListMultipartUploadsInput) SetDelimiter(v string) *ListMultipartUploadsInput {
-	s.Delimiter = &v
-	return s
-}
-
-// SetEncodingType sets the EncodingType field's value.
-func (s *ListMultipartUploadsInput) SetEncodingType(v string) *ListMultipartUploadsInput {
-	s.EncodingType = &v
-	return s
-}
-
-// SetKeyMarker sets the KeyMarker field's value.
-func (s *ListMultipartUploadsInput) SetKeyMarker(v string) *ListMultipartUploadsInput {
-	s.KeyMarker = &v
-	return s
-}
-
-// SetMaxUploads sets the MaxUploads field's value.
-func (s *ListMultipartUploadsInput) SetMaxUploads(v int64) *ListMultipartUploadsInput {
-	s.MaxUploads = &v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *ListMultipartUploadsInput) SetPrefix(v string) *ListMultipartUploadsInput {
-	s.Prefix = &v
-	return s
-}
-
-// SetUploadIdMarker sets the UploadIdMarker field's value.
-func (s *ListMultipartUploadsInput) SetUploadIdMarker(v string) *ListMultipartUploadsInput {
-	s.UploadIdMarker = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListMultipartUploadsOutput
-type ListMultipartUploadsOutput struct {
-	_ struct{} `type:"structure"`
-
-	// Name of the bucket to which the multipart upload was initiated.
-	Bucket *string `type:"string"`
-
-	CommonPrefixes []*CommonPrefix `type:"list" flattened:"true"`
-
-	Delimiter *string `type:"string"`
-
-	// Encoding type used by Amazon S3 to encode object keys in the response.
-	EncodingType *string `type:"string" enum:"EncodingType"`
-
-	// Indicates whether the returned list of multipart uploads is truncated. A
-	// value of true indicates that the list was truncated. The list can be truncated
-	// if the number of multipart uploads exceeds the limit allowed or specified
-	// by max uploads.
-	IsTruncated *bool `type:"boolean"`
-
-	// The key at or after which the listing began.
-	KeyMarker *string `type:"string"`
-
-	// Maximum number of multipart uploads that could have been included in the
-	// response.
-	MaxUploads *int64 `type:"integer"`
-
-	// When a list is truncated, this element specifies the value that should be
-	// used for the key-marker request parameter in a subsequent request.
-	NextKeyMarker *string `type:"string"`
-
-	// When a list is truncated, this element specifies the value that should be
-	// used for the upload-id-marker request parameter in a subsequent request.
-	NextUploadIdMarker *string `type:"string"`
-
-	// When a prefix is provided in the request, this field contains the specified
-	// prefix. The result contains only keys starting with the specified prefix.
-	Prefix *string `type:"string"`
-
-	// Upload ID after which listing began.
-	UploadIdMarker *string `type:"string"`
-
-	Uploads []*MultipartUpload `locationName:"Upload" type:"list" flattened:"true"`
-}
-
-// String returns the string representation
-func (s ListMultipartUploadsOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListMultipartUploadsOutput) GoString() string {
-	return s.String()
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *ListMultipartUploadsOutput) SetBucket(v string) *ListMultipartUploadsOutput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *ListMultipartUploadsOutput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetCommonPrefixes sets the CommonPrefixes field's value.
-func (s *ListMultipartUploadsOutput) SetCommonPrefixes(v []*CommonPrefix) *ListMultipartUploadsOutput {
-	s.CommonPrefixes = v
-	return s
-}
-
-// SetDelimiter sets the Delimiter field's value.
-func (s *ListMultipartUploadsOutput) SetDelimiter(v string) *ListMultipartUploadsOutput {
-	s.Delimiter = &v
-	return s
-}
-
-// SetEncodingType sets the EncodingType field's value.
-func (s *ListMultipartUploadsOutput) SetEncodingType(v string) *ListMultipartUploadsOutput {
-	s.EncodingType = &v
-	return s
-}
-
-// SetIsTruncated sets the IsTruncated field's value.
-func (s *ListMultipartUploadsOutput) SetIsTruncated(v bool) *ListMultipartUploadsOutput {
-	s.IsTruncated = &v
-	return s
-}
-
-// SetKeyMarker sets the KeyMarker field's value.
-func (s *ListMultipartUploadsOutput) SetKeyMarker(v string) *ListMultipartUploadsOutput {
-	s.KeyMarker = &v
-	return s
-}
-
-// SetMaxUploads sets the MaxUploads field's value.
-func (s *ListMultipartUploadsOutput) SetMaxUploads(v int64) *ListMultipartUploadsOutput {
-	s.MaxUploads = &v
-	return s
-}
-
-// SetNextKeyMarker sets the NextKeyMarker field's value.
-func (s *ListMultipartUploadsOutput) SetNextKeyMarker(v string) *ListMultipartUploadsOutput {
-	s.NextKeyMarker = &v
-	return s
-}
-
-// SetNextUploadIdMarker sets the NextUploadIdMarker field's value.
-func (s *ListMultipartUploadsOutput) SetNextUploadIdMarker(v string) *ListMultipartUploadsOutput {
-	s.NextUploadIdMarker = &v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *ListMultipartUploadsOutput) SetPrefix(v string) *ListMultipartUploadsOutput {
-	s.Prefix = &v
-	return s
-}
-
-// SetUploadIdMarker sets the UploadIdMarker field's value.
-func (s *ListMultipartUploadsOutput) SetUploadIdMarker(v string) *ListMultipartUploadsOutput {
-	s.UploadIdMarker = &v
-	return s
-}
-
-// SetUploads sets the Uploads field's value.
-func (s *ListMultipartUploadsOutput) SetUploads(v []*MultipartUpload) *ListMultipartUploadsOutput {
-	s.Uploads = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectVersionsRequest
-type ListObjectVersionsInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// A delimiter is a character you use to group keys.
-	Delimiter *string `location:"querystring" locationName:"delimiter" type:"string"`
-
-	// Requests Amazon S3 to encode the object keys in the response and specifies
-	// the encoding method to use. An object key may contain any Unicode character;
-	// however, XML 1.0 parser cannot parse some characters, such as characters
-	// with an ASCII value from 0 to 10. For characters that are not supported in
-	// XML 1.0, you can add this parameter to request that Amazon S3 encode the
-	// keys in the response.
-	EncodingType *string `location:"querystring" locationName:"encoding-type" type:"string" enum:"EncodingType"`
-
-	// Specifies the key to start with when listing objects in a bucket.
-	KeyMarker *string `location:"querystring" locationName:"key-marker" type:"string"`
-
-	// Sets the maximum number of keys returned in the response. The response might
-	// contain fewer keys but will never contain more.
-	MaxKeys *int64 `location:"querystring" locationName:"max-keys" type:"integer"`
-
-	// Limits the response to keys that begin with the specified prefix.
-	Prefix *string `location:"querystring" locationName:"prefix" type:"string"`
-
-	// Specifies the object version you want to start listing from.
-	VersionIdMarker *string `location:"querystring" locationName:"version-id-marker" type:"string"`
-}
-
-// String returns the string representation
-func (s ListObjectVersionsInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListObjectVersionsInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ListObjectVersionsInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ListObjectVersionsInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *ListObjectVersionsInput) SetBucket(v string) *ListObjectVersionsInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *ListObjectVersionsInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetDelimiter sets the Delimiter field's value.
-func (s *ListObjectVersionsInput) SetDelimiter(v string) *ListObjectVersionsInput {
-	s.Delimiter = &v
-	return s
-}
-
-// SetEncodingType sets the EncodingType field's value.
-func (s *ListObjectVersionsInput) SetEncodingType(v string) *ListObjectVersionsInput {
-	s.EncodingType = &v
-	return s
-}
-
-// SetKeyMarker sets the KeyMarker field's value.
-func (s *ListObjectVersionsInput) SetKeyMarker(v string) *ListObjectVersionsInput {
-	s.KeyMarker = &v
-	return s
-}
-
-// SetMaxKeys sets the MaxKeys field's value.
-func (s *ListObjectVersionsInput) SetMaxKeys(v int64) *ListObjectVersionsInput {
-	s.MaxKeys = &v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *ListObjectVersionsInput) SetPrefix(v string) *ListObjectVersionsInput {
-	s.Prefix = &v
-	return s
-}
-
-// SetVersionIdMarker sets the VersionIdMarker field's value.
-func (s *ListObjectVersionsInput) SetVersionIdMarker(v string) *ListObjectVersionsInput {
-	s.VersionIdMarker = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectVersionsOutput
-type ListObjectVersionsOutput struct {
-	_ struct{} `type:"structure"`
-
-	CommonPrefixes []*CommonPrefix `type:"list" flattened:"true"`
-
-	DeleteMarkers []*DeleteMarkerEntry `locationName:"DeleteMarker" type:"list" flattened:"true"`
-
-	Delimiter *string `type:"string"`
-
-	// Encoding type used by Amazon S3 to encode object keys in the response.
-	EncodingType *string `type:"string" enum:"EncodingType"`
-
-	// A flag that indicates whether or not Amazon S3 returned all of the results
-	// that satisfied the search criteria. If your results were truncated, you can
-	// make a follow-up paginated request using the NextKeyMarker and NextVersionIdMarker
-	// response parameters as a starting place in another request to return the
-	// rest of the results.
-	IsTruncated *bool `type:"boolean"`
-
-	// Marks the last Key returned in a truncated response.
-	KeyMarker *string `type:"string"`
-
-	MaxKeys *int64 `type:"integer"`
-
-	Name *string `type:"string"`
-
-	// Use this value for the key marker request parameter in a subsequent request.
-	NextKeyMarker *string `type:"string"`
-
-	// Use this value for the next version id marker parameter in a subsequent request.
-	NextVersionIdMarker *string `type:"string"`
-
-	Prefix *string `type:"string"`
-
-	VersionIdMarker *string `type:"string"`
-
-	Versions []*ObjectVersion `locationName:"Version" type:"list" flattened:"true"`
-}
-
-// String returns the string representation
-func (s ListObjectVersionsOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListObjectVersionsOutput) GoString() string {
-	return s.String()
-}
-
-// SetCommonPrefixes sets the CommonPrefixes field's value.
-func (s *ListObjectVersionsOutput) SetCommonPrefixes(v []*CommonPrefix) *ListObjectVersionsOutput {
-	s.CommonPrefixes = v
-	return s
-}
-
-// SetDeleteMarkers sets the DeleteMarkers field's value.
-func (s *ListObjectVersionsOutput) SetDeleteMarkers(v []*DeleteMarkerEntry) *ListObjectVersionsOutput {
-	s.DeleteMarkers = v
-	return s
-}
-
-// SetDelimiter sets the Delimiter field's value.
-func (s *ListObjectVersionsOutput) SetDelimiter(v string) *ListObjectVersionsOutput {
-	s.Delimiter = &v
-	return s
-}
-
-// SetEncodingType sets the EncodingType field's value.
-func (s *ListObjectVersionsOutput) SetEncodingType(v string) *ListObjectVersionsOutput {
-	s.EncodingType = &v
-	return s
-}
-
-// SetIsTruncated sets the IsTruncated field's value.
-func (s *ListObjectVersionsOutput) SetIsTruncated(v bool) *ListObjectVersionsOutput {
-	s.IsTruncated = &v
-	return s
-}
-
-// SetKeyMarker sets the KeyMarker field's value.
-func (s *ListObjectVersionsOutput) SetKeyMarker(v string) *ListObjectVersionsOutput {
-	s.KeyMarker = &v
-	return s
-}
-
-// SetMaxKeys sets the MaxKeys field's value.
-func (s *ListObjectVersionsOutput) SetMaxKeys(v int64) *ListObjectVersionsOutput {
-	s.MaxKeys = &v
-	return s
-}
-
-// SetName sets the Name field's value.
-func (s *ListObjectVersionsOutput) SetName(v string) *ListObjectVersionsOutput {
-	s.Name = &v
-	return s
-}
-
-// SetNextKeyMarker sets the NextKeyMarker field's value.
-func (s *ListObjectVersionsOutput) SetNextKeyMarker(v string) *ListObjectVersionsOutput {
-	s.NextKeyMarker = &v
-	return s
-}
-
-// SetNextVersionIdMarker sets the NextVersionIdMarker field's value.
-func (s *ListObjectVersionsOutput) SetNextVersionIdMarker(v string) *ListObjectVersionsOutput {
-	s.NextVersionIdMarker = &v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *ListObjectVersionsOutput) SetPrefix(v string) *ListObjectVersionsOutput {
-	s.Prefix = &v
-	return s
-}
-
-// SetVersionIdMarker sets the VersionIdMarker field's value.
-func (s *ListObjectVersionsOutput) SetVersionIdMarker(v string) *ListObjectVersionsOutput {
-	s.VersionIdMarker = &v
-	return s
-}
-
-// SetVersions sets the Versions field's value.
-func (s *ListObjectVersionsOutput) SetVersions(v []*ObjectVersion) *ListObjectVersionsOutput {
-	s.Versions = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsRequest
-type ListObjectsInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// A delimiter is a character you use to group keys.
-	Delimiter *string `location:"querystring" locationName:"delimiter" type:"string"`
-
-	// Requests Amazon S3 to encode the object keys in the response and specifies
-	// the encoding method to use. An object key may contain any Unicode character;
-	// however, XML 1.0 parser cannot parse some characters, such as characters
-	// with an ASCII value from 0 to 10. For characters that are not supported in
-	// XML 1.0, you can add this parameter to request that Amazon S3 encode the
-	// keys in the response.
-	EncodingType *string `location:"querystring" locationName:"encoding-type" type:"string" enum:"EncodingType"`
-
-	// Specifies the key to start with when listing objects in a bucket.
-	Marker *string `location:"querystring" locationName:"marker" type:"string"`
-
-	// Sets the maximum number of keys returned in the response. The response might
-	// contain fewer keys but will never contain more.
-	MaxKeys *int64 `location:"querystring" locationName:"max-keys" type:"integer"`
-
-	// Limits the response to keys that begin with the specified prefix.
-	Prefix *string `location:"querystring" locationName:"prefix" type:"string"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// list objects request. Bucket owners need not specify this parameter in their
-	// requests.
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-}
-
-// String returns the string representation
-func (s ListObjectsInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListObjectsInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ListObjectsInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ListObjectsInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *ListObjectsInput) SetBucket(v string) *ListObjectsInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *ListObjectsInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetDelimiter sets the Delimiter field's value.
-func (s *ListObjectsInput) SetDelimiter(v string) *ListObjectsInput {
-	s.Delimiter = &v
-	return s
-}
-
-// SetEncodingType sets the EncodingType field's value.
-func (s *ListObjectsInput) SetEncodingType(v string) *ListObjectsInput {
-	s.EncodingType = &v
-	return s
-}
-
-// SetMarker sets the Marker field's value.
-func (s *ListObjectsInput) SetMarker(v string) *ListObjectsInput {
-	s.Marker = &v
-	return s
-}
-
-// SetMaxKeys sets the MaxKeys field's value.
-func (s *ListObjectsInput) SetMaxKeys(v int64) *ListObjectsInput {
-	s.MaxKeys = &v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *ListObjectsInput) SetPrefix(v string) *ListObjectsInput {
-	s.Prefix = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *ListObjectsInput) SetRequestPayer(v string) *ListObjectsInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsOutput
-type ListObjectsOutput struct {
-	_ struct{} `type:"structure"`
-
-	CommonPrefixes []*CommonPrefix `type:"list" flattened:"true"`
-
-	Contents []*Object `type:"list" flattened:"true"`
-
-	Delimiter *string `type:"string"`
-
-	// Encoding type used by Amazon S3 to encode object keys in the response.
-	EncodingType *string `type:"string" enum:"EncodingType"`
-
-	// A flag that indicates whether or not Amazon S3 returned all of the results
-	// that satisfied the search criteria.
-	IsTruncated *bool `type:"boolean"`
-
-	Marker *string `type:"string"`
-
-	MaxKeys *int64 `type:"integer"`
-
-	Name *string `type:"string"`
-
-	// When response is truncated (the IsTruncated element value in the response
-	// is true), you can use the key name in this field as marker in the subsequent
-	// request to get next set of objects. Amazon S3 lists objects in alphabetical
-	// order Note: This element is returned only if you have delimiter request parameter
-	// specified. If response does not include the NextMaker and it is truncated,
-	// you can use the value of the last Key in the response as the marker in the
-	// subsequent request to get the next set of object keys.
-	NextMarker *string `type:"string"`
-
-	Prefix *string `type:"string"`
-}
-
-// String returns the string representation
-func (s ListObjectsOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListObjectsOutput) GoString() string {
-	return s.String()
-}
-
-// SetCommonPrefixes sets the CommonPrefixes field's value.
-func (s *ListObjectsOutput) SetCommonPrefixes(v []*CommonPrefix) *ListObjectsOutput {
-	s.CommonPrefixes = v
-	return s
-}
-
-// SetContents sets the Contents field's value.
-func (s *ListObjectsOutput) SetContents(v []*Object) *ListObjectsOutput {
-	s.Contents = v
-	return s
-}
-
-// SetDelimiter sets the Delimiter field's value.
-func (s *ListObjectsOutput) SetDelimiter(v string) *ListObjectsOutput {
-	s.Delimiter = &v
-	return s
-}
-
-// SetEncodingType sets the EncodingType field's value.
-func (s *ListObjectsOutput) SetEncodingType(v string) *ListObjectsOutput {
-	s.EncodingType = &v
-	return s
-}
-
-// SetIsTruncated sets the IsTruncated field's value.
-func (s *ListObjectsOutput) SetIsTruncated(v bool) *ListObjectsOutput {
-	s.IsTruncated = &v
-	return s
-}
-
-// SetMarker sets the Marker field's value.
-func (s *ListObjectsOutput) SetMarker(v string) *ListObjectsOutput {
-	s.Marker = &v
-	return s
-}
-
-// SetMaxKeys sets the MaxKeys field's value.
-func (s *ListObjectsOutput) SetMaxKeys(v int64) *ListObjectsOutput {
-	s.MaxKeys = &v
-	return s
-}
-
-// SetName sets the Name field's value.
-func (s *ListObjectsOutput) SetName(v string) *ListObjectsOutput {
-	s.Name = &v
-	return s
-}
-
-// SetNextMarker sets the NextMarker field's value.
-func (s *ListObjectsOutput) SetNextMarker(v string) *ListObjectsOutput {
-	s.NextMarker = &v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *ListObjectsOutput) SetPrefix(v string) *ListObjectsOutput {
-	s.Prefix = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsV2Request
-type ListObjectsV2Input struct {
-	_ struct{} `type:"structure"`
-
-	// Name of the bucket to list.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// ContinuationToken indicates Amazon S3 that the list is being continued on
-	// this bucket with a token. ContinuationToken is obfuscated and is not a real
-	// key
-	ContinuationToken *string `location:"querystring" locationName:"continuation-token" type:"string"`
-
-	// A delimiter is a character you use to group keys.
-	Delimiter *string `location:"querystring" locationName:"delimiter" type:"string"`
-
-	// Encoding type used by Amazon S3 to encode object keys in the response.
-	EncodingType *string `location:"querystring" locationName:"encoding-type" type:"string" enum:"EncodingType"`
-
-	// The owner field is not present in listV2 by default, if you want to return
-	// owner field with each key in the result then set the fetch owner field to
-	// true
-	FetchOwner *bool `location:"querystring" locationName:"fetch-owner" type:"boolean"`
-
-	// Sets the maximum number of keys returned in the response. The response might
-	// contain fewer keys but will never contain more.
-	MaxKeys *int64 `location:"querystring" locationName:"max-keys" type:"integer"`
-
-	// Limits the response to keys that begin with the specified prefix.
-	Prefix *string `location:"querystring" locationName:"prefix" type:"string"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// list objects request in V2 style. Bucket owners need not specify this parameter
-	// in their requests.
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// StartAfter is where you want Amazon S3 to start listing from. Amazon S3 starts
-	// listing after this specified key. StartAfter can be any key in the bucket
-	StartAfter *string `location:"querystring" locationName:"start-after" type:"string"`
-}
-
-// String returns the string representation
-func (s ListObjectsV2Input) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListObjectsV2Input) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ListObjectsV2Input) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ListObjectsV2Input"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *ListObjectsV2Input) SetBucket(v string) *ListObjectsV2Input {
-	s.Bucket = &v
-	return s
-}
-
-func (s *ListObjectsV2Input) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetContinuationToken sets the ContinuationToken field's value.
-func (s *ListObjectsV2Input) SetContinuationToken(v string) *ListObjectsV2Input {
-	s.ContinuationToken = &v
-	return s
-}
-
-// SetDelimiter sets the Delimiter field's value.
-func (s *ListObjectsV2Input) SetDelimiter(v string) *ListObjectsV2Input {
-	s.Delimiter = &v
-	return s
-}
-
-// SetEncodingType sets the EncodingType field's value.
-func (s *ListObjectsV2Input) SetEncodingType(v string) *ListObjectsV2Input {
-	s.EncodingType = &v
-	return s
-}
-
-// SetFetchOwner sets the FetchOwner field's value.
-func (s *ListObjectsV2Input) SetFetchOwner(v bool) *ListObjectsV2Input {
-	s.FetchOwner = &v
-	return s
-}
-
-// SetMaxKeys sets the MaxKeys field's value.
-func (s *ListObjectsV2Input) SetMaxKeys(v int64) *ListObjectsV2Input {
-	s.MaxKeys = &v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *ListObjectsV2Input) SetPrefix(v string) *ListObjectsV2Input {
-	s.Prefix = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *ListObjectsV2Input) SetRequestPayer(v string) *ListObjectsV2Input {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetStartAfter sets the StartAfter field's value.
-func (s *ListObjectsV2Input) SetStartAfter(v string) *ListObjectsV2Input {
-	s.StartAfter = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsV2Output
-type ListObjectsV2Output struct {
-	_ struct{} `type:"structure"`
-
-	// CommonPrefixes contains all (if there are any) keys between Prefix and the
-	// next occurrence of the string specified by delimiter
-	CommonPrefixes []*CommonPrefix `type:"list" flattened:"true"`
-
-	// Metadata about each object returned.
-	Contents []*Object `type:"list" flattened:"true"`
-
-	// ContinuationToken indicates Amazon S3 that the list is being continued on
-	// this bucket with a token. ContinuationToken is obfuscated and is not a real
-	// key
-	ContinuationToken *string `type:"string"`
-
-	// A delimiter is a character you use to group keys.
-	Delimiter *string `type:"string"`
-
-	// Encoding type used by Amazon S3 to encode object keys in the response.
-	EncodingType *string `type:"string" enum:"EncodingType"`
-
-	// A flag that indicates whether or not Amazon S3 returned all of the results
-	// that satisfied the search criteria.
-	IsTruncated *bool `type:"boolean"`
-
-	// KeyCount is the number of keys returned with this request. KeyCount will
-	// always be less than equals to MaxKeys field. Say you ask for 50 keys, your
-	// result will include less than equals 50 keys
-	KeyCount *int64 `type:"integer"`
-
-	// Sets the maximum number of keys returned in the response. The response might
-	// contain fewer keys but will never contain more.
-	MaxKeys *int64 `type:"integer"`
-
-	// Name of the bucket to list.
-	Name *string `type:"string"`
-
-	// NextContinuationToken is sent when isTruncated is true which means there
-	// are more keys in the bucket that can be listed. The next list requests to
-	// Amazon S3 can be continued with this NextContinuationToken. NextContinuationToken
-	// is obfuscated and is not a real key
-	NextContinuationToken *string `type:"string"`
-
-	// Limits the response to keys that begin with the specified prefix.
-	Prefix *string `type:"string"`
-
-	// StartAfter is where you want Amazon S3 to start listing from. Amazon S3 starts
-	// listing after this specified key. StartAfter can be any key in the bucket
-	StartAfter *string `type:"string"`
-}
-
-// String returns the string representation
-func (s ListObjectsV2Output) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListObjectsV2Output) GoString() string {
-	return s.String()
-}
-
-// SetCommonPrefixes sets the CommonPrefixes field's value.
-func (s *ListObjectsV2Output) SetCommonPrefixes(v []*CommonPrefix) *ListObjectsV2Output {
-	s.CommonPrefixes = v
-	return s
-}
-
-// SetContents sets the Contents field's value.
-func (s *ListObjectsV2Output) SetContents(v []*Object) *ListObjectsV2Output {
-	s.Contents = v
-	return s
-}
-
-// SetContinuationToken sets the ContinuationToken field's value.
-func (s *ListObjectsV2Output) SetContinuationToken(v string) *ListObjectsV2Output {
-	s.ContinuationToken = &v
-	return s
-}
-
-// SetDelimiter sets the Delimiter field's value.
-func (s *ListObjectsV2Output) SetDelimiter(v string) *ListObjectsV2Output {
-	s.Delimiter = &v
-	return s
-}
-
-// SetEncodingType sets the EncodingType field's value.
-func (s *ListObjectsV2Output) SetEncodingType(v string) *ListObjectsV2Output {
-	s.EncodingType = &v
-	return s
-}
-
-// SetIsTruncated sets the IsTruncated field's value.
-func (s *ListObjectsV2Output) SetIsTruncated(v bool) *ListObjectsV2Output {
-	s.IsTruncated = &v
-	return s
-}
-
-// SetKeyCount sets the KeyCount field's value.
-func (s *ListObjectsV2Output) SetKeyCount(v int64) *ListObjectsV2Output {
-	s.KeyCount = &v
-	return s
-}
-
-// SetMaxKeys sets the MaxKeys field's value.
-func (s *ListObjectsV2Output) SetMaxKeys(v int64) *ListObjectsV2Output {
-	s.MaxKeys = &v
-	return s
-}
-
-// SetName sets the Name field's value.
-func (s *ListObjectsV2Output) SetName(v string) *ListObjectsV2Output {
-	s.Name = &v
-	return s
-}
-
-// SetNextContinuationToken sets the NextContinuationToken field's value.
-func (s *ListObjectsV2Output) SetNextContinuationToken(v string) *ListObjectsV2Output {
-	s.NextContinuationToken = &v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *ListObjectsV2Output) SetPrefix(v string) *ListObjectsV2Output {
-	s.Prefix = &v
-	return s
-}
-
-// SetStartAfter sets the StartAfter field's value.
-func (s *ListObjectsV2Output) SetStartAfter(v string) *ListObjectsV2Output {
-	s.StartAfter = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListPartsRequest
-type ListPartsInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// Sets the maximum number of parts to return.
-	MaxParts *int64 `location:"querystring" locationName:"max-parts" type:"integer"`
-
-	// Specifies the part after which listing should begin. Only parts with higher
-	// part numbers will be listed.
-	PartNumberMarker *int64 `location:"querystring" locationName:"part-number-marker" type:"integer"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// Upload ID identifying the multipart upload whose parts are being listed.
-	//
-	// UploadId is a required field
-	UploadId *string `location:"querystring" locationName:"uploadId" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s ListPartsInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListPartsInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ListPartsInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ListPartsInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-	if s.UploadId == nil {
-		invalidParams.Add(request.NewErrParamRequired("UploadId"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *ListPartsInput) SetBucket(v string) *ListPartsInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *ListPartsInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetKey sets the Key field's value.
-func (s *ListPartsInput) SetKey(v string) *ListPartsInput {
-	s.Key = &v
-	return s
-}
-
-// SetMaxParts sets the MaxParts field's value.
-func (s *ListPartsInput) SetMaxParts(v int64) *ListPartsInput {
-	s.MaxParts = &v
-	return s
-}
-
-// SetPartNumberMarker sets the PartNumberMarker field's value.
-func (s *ListPartsInput) SetPartNumberMarker(v int64) *ListPartsInput {
-	s.PartNumberMarker = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *ListPartsInput) SetRequestPayer(v string) *ListPartsInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetUploadId sets the UploadId field's value.
-func (s *ListPartsInput) SetUploadId(v string) *ListPartsInput {
-	s.UploadId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListPartsOutput
-type ListPartsOutput struct {
-	_ struct{} `type:"structure"`
-
-	// Date when multipart upload will become eligible for abort operation by lifecycle.
-	AbortDate *time.Time `location:"header" locationName:"x-amz-abort-date" type:"timestamp" timestampFormat:"rfc822"`
-
-	// Id of the lifecycle rule that makes a multipart upload eligible for abort
-	// operation.
-	AbortRuleId *string `location:"header" locationName:"x-amz-abort-rule-id" type:"string"`
-
-	// Name of the bucket to which the multipart upload was initiated.
-	Bucket *string `type:"string"`
-
-	// Identifies who initiated the multipart upload.
-	Initiator *Initiator `type:"structure"`
-
-	// Indicates whether the returned list of parts is truncated.
-	IsTruncated *bool `type:"boolean"`
-
-	// Object key for which the multipart upload was initiated.
-	Key *string `min:"1" type:"string"`
-
-	// Maximum number of parts that were allowed in the response.
-	MaxParts *int64 `type:"integer"`
-
-	// When a list is truncated, this element specifies the last part in the list,
-	// as well as the value to use for the part-number-marker request parameter
-	// in a subsequent request.
-	NextPartNumberMarker *int64 `type:"integer"`
-
-	Owner *Owner `type:"structure"`
-
-	// Part number after which listing begins.
-	PartNumberMarker *int64 `type:"integer"`
-
-	Parts []*Part `locationName:"Part" type:"list" flattened:"true"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-
-	// The class of storage used to store the object.
-	StorageClass *string `type:"string" enum:"StorageClass"`
-
-	// Upload ID identifying the multipart upload whose parts are being listed.
-	UploadId *string `type:"string"`
-}
-
-// String returns the string representation
-func (s ListPartsOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ListPartsOutput) GoString() string {
-	return s.String()
-}
-
-// SetAbortDate sets the AbortDate field's value.
-func (s *ListPartsOutput) SetAbortDate(v time.Time) *ListPartsOutput {
-	s.AbortDate = &v
-	return s
-}
-
-// SetAbortRuleId sets the AbortRuleId field's value.
-func (s *ListPartsOutput) SetAbortRuleId(v string) *ListPartsOutput {
-	s.AbortRuleId = &v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *ListPartsOutput) SetBucket(v string) *ListPartsOutput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *ListPartsOutput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetInitiator sets the Initiator field's value.
-func (s *ListPartsOutput) SetInitiator(v *Initiator) *ListPartsOutput {
-	s.Initiator = v
-	return s
-}
-
-// SetIsTruncated sets the IsTruncated field's value.
-func (s *ListPartsOutput) SetIsTruncated(v bool) *ListPartsOutput {
-	s.IsTruncated = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *ListPartsOutput) SetKey(v string) *ListPartsOutput {
-	s.Key = &v
-	return s
-}
-
-// SetMaxParts sets the MaxParts field's value.
-func (s *ListPartsOutput) SetMaxParts(v int64) *ListPartsOutput {
-	s.MaxParts = &v
-	return s
-}
-
-// SetNextPartNumberMarker sets the NextPartNumberMarker field's value.
-func (s *ListPartsOutput) SetNextPartNumberMarker(v int64) *ListPartsOutput {
-	s.NextPartNumberMarker = &v
-	return s
-}
-
-// SetOwner sets the Owner field's value.
-func (s *ListPartsOutput) SetOwner(v *Owner) *ListPartsOutput {
-	s.Owner = v
-	return s
-}
-
-// SetPartNumberMarker sets the PartNumberMarker field's value.
-func (s *ListPartsOutput) SetPartNumberMarker(v int64) *ListPartsOutput {
-	s.PartNumberMarker = &v
-	return s
-}
-
-// SetParts sets the Parts field's value.
-func (s *ListPartsOutput) SetParts(v []*Part) *ListPartsOutput {
-	s.Parts = v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *ListPartsOutput) SetRequestCharged(v string) *ListPartsOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *ListPartsOutput) SetStorageClass(v string) *ListPartsOutput {
-	s.StorageClass = &v
-	return s
-}
-
-// SetUploadId sets the UploadId field's value.
-func (s *ListPartsOutput) SetUploadId(v string) *ListPartsOutput {
-	s.UploadId = &v
-	return s
-}
-
-// Describes an S3 location that will receive the results of the restore request.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/S3Location
-type Location struct {
-	_ struct{} `type:"structure"`
-
-	// A list of grants that control access to the staged results.
-	AccessControlList []*Grant `locationNameList:"Grant" type:"list"`
-
-	// The name of the bucket where the restore results will be placed.
-	//
-	// BucketName is a required field
-	BucketName *string `type:"string" required:"true"`
-
-	// The canned ACL to apply to the restore results.
-	CannedACL *string `type:"string" enum:"ObjectCannedACL"`
-
-	// Describes the server-side encryption that will be applied to the restore
-	// results.
-	Encryption *Encryption `type:"structure"`
-
-	// The prefix that is prepended to the restore results for this request.
-	//
-	// Prefix is a required field
-	Prefix *string `type:"string" required:"true"`
-
-	// The class of storage used to store the restore results.
-	StorageClass *string `type:"string" enum:"StorageClass"`
-
-	// The tag-set that is applied to the restore results.
-	Tagging *Tagging `type:"structure"`
-
-	// A list of metadata to store with the restore results in S3.
-	UserMetadata []*MetadataEntry `locationNameList:"MetadataEntry" type:"list"`
-}
-
-// String returns the string representation
-func (s Location) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Location) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *Location) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "Location"}
-	if s.BucketName == nil {
-		invalidParams.Add(request.NewErrParamRequired("BucketName"))
-	}
-	if s.Prefix == nil {
-		invalidParams.Add(request.NewErrParamRequired("Prefix"))
-	}
-	if s.AccessControlList != nil {
-		for i, v := range s.AccessControlList {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "AccessControlList", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-	if s.Encryption != nil {
-		if err := s.Encryption.Validate(); err != nil {
-			invalidParams.AddNested("Encryption", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.Tagging != nil {
-		if err := s.Tagging.Validate(); err != nil {
-			invalidParams.AddNested("Tagging", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetAccessControlList sets the AccessControlList field's value.
-func (s *Location) SetAccessControlList(v []*Grant) *Location {
-	s.AccessControlList = v
-	return s
-}
-
-// SetBucketName sets the BucketName field's value.
-func (s *Location) SetBucketName(v string) *Location {
-	s.BucketName = &v
-	return s
-}
-
-// SetCannedACL sets the CannedACL field's value.
-func (s *Location) SetCannedACL(v string) *Location {
-	s.CannedACL = &v
-	return s
-}
-
-// SetEncryption sets the Encryption field's value.
-func (s *Location) SetEncryption(v *Encryption) *Location {
-	s.Encryption = v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *Location) SetPrefix(v string) *Location {
-	s.Prefix = &v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *Location) SetStorageClass(v string) *Location {
-	s.StorageClass = &v
-	return s
-}
-
-// SetTagging sets the Tagging field's value.
-func (s *Location) SetTagging(v *Tagging) *Location {
-	s.Tagging = v
-	return s
-}
-
-// SetUserMetadata sets the UserMetadata field's value.
-func (s *Location) SetUserMetadata(v []*MetadataEntry) *Location {
-	s.UserMetadata = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LoggingEnabled
-type LoggingEnabled struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies the bucket where you want Amazon S3 to store server access logs.
-	// You can have your logs delivered to any bucket that you own, including the
-	// same bucket that is being logged. You can also configure multiple buckets
-	// to deliver their logs to the same target bucket. In this case you should
-	// choose a different TargetPrefix for each source bucket so that the delivered
-	// log files can be distinguished by key.
-	TargetBucket *string `type:"string"`
-
-	TargetGrants []*TargetGrant `locationNameList:"Grant" type:"list"`
-
-	// This element lets you specify a prefix for the keys that the log files will
-	// be stored under.
-	TargetPrefix *string `type:"string"`
-}
-
-// String returns the string representation
-func (s LoggingEnabled) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s LoggingEnabled) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *LoggingEnabled) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "LoggingEnabled"}
-	if s.TargetGrants != nil {
-		for i, v := range s.TargetGrants {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "TargetGrants", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetTargetBucket sets the TargetBucket field's value.
-func (s *LoggingEnabled) SetTargetBucket(v string) *LoggingEnabled {
-	s.TargetBucket = &v
-	return s
-}
-
-// SetTargetGrants sets the TargetGrants field's value.
-func (s *LoggingEnabled) SetTargetGrants(v []*TargetGrant) *LoggingEnabled {
-	s.TargetGrants = v
-	return s
-}
-
-// SetTargetPrefix sets the TargetPrefix field's value.
-func (s *LoggingEnabled) SetTargetPrefix(v string) *LoggingEnabled {
-	s.TargetPrefix = &v
-	return s
-}
-
-// A metadata key-value pair to store with an object.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/MetadataEntry
-type MetadataEntry struct {
-	_ struct{} `type:"structure"`
-
-	Name *string `type:"string"`
-
-	Value *string `type:"string"`
-}
-
-// String returns the string representation
-func (s MetadataEntry) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s MetadataEntry) GoString() string {
-	return s.String()
-}
-
-// SetName sets the Name field's value.
-func (s *MetadataEntry) SetName(v string) *MetadataEntry {
-	s.Name = &v
-	return s
-}
-
-// SetValue sets the Value field's value.
-func (s *MetadataEntry) SetValue(v string) *MetadataEntry {
-	s.Value = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/MetricsAndOperator
-type MetricsAndOperator struct {
-	_ struct{} `type:"structure"`
-
-	// The prefix used when evaluating an AND predicate.
-	Prefix *string `type:"string"`
-
-	// The list of tags used when evaluating an AND predicate.
-	Tags []*Tag `locationName:"Tag" locationNameList:"Tag" type:"list" flattened:"true"`
-}
-
-// String returns the string representation
-func (s MetricsAndOperator) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s MetricsAndOperator) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *MetricsAndOperator) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "MetricsAndOperator"}
-	if s.Tags != nil {
-		for i, v := range s.Tags {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Tags", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *MetricsAndOperator) SetPrefix(v string) *MetricsAndOperator {
-	s.Prefix = &v
-	return s
-}
-
-// SetTags sets the Tags field's value.
-func (s *MetricsAndOperator) SetTags(v []*Tag) *MetricsAndOperator {
-	s.Tags = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/MetricsConfiguration
-type MetricsConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies a metrics configuration filter. The metrics configuration will
-	// only include objects that meet the filter's criteria. A filter must be a
-	// prefix, a tag, or a conjunction (MetricsAndOperator).
-	Filter *MetricsFilter `type:"structure"`
-
-	// The ID used to identify the metrics configuration.
-	//
-	// Id is a required field
-	Id *string `type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s MetricsConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s MetricsConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *MetricsConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "MetricsConfiguration"}
-	if s.Id == nil {
-		invalidParams.Add(request.NewErrParamRequired("Id"))
-	}
-	if s.Filter != nil {
-		if err := s.Filter.Validate(); err != nil {
-			invalidParams.AddNested("Filter", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetFilter sets the Filter field's value.
-func (s *MetricsConfiguration) SetFilter(v *MetricsFilter) *MetricsConfiguration {
-	s.Filter = v
-	return s
-}
-
-// SetId sets the Id field's value.
-func (s *MetricsConfiguration) SetId(v string) *MetricsConfiguration {
-	s.Id = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/MetricsFilter
-type MetricsFilter struct {
-	_ struct{} `type:"structure"`
-
-	// A conjunction (logical AND) of predicates, which is used in evaluating a
-	// metrics filter. The operator must have at least two predicates, and an object
-	// must match all of the predicates in order for the filter to apply.
-	And *MetricsAndOperator `type:"structure"`
-
-	// The prefix used when evaluating a metrics filter.
-	Prefix *string `type:"string"`
-
-	// The tag used when evaluating a metrics filter.
-	Tag *Tag `type:"structure"`
-}
-
-// String returns the string representation
-func (s MetricsFilter) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s MetricsFilter) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *MetricsFilter) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "MetricsFilter"}
-	if s.And != nil {
-		if err := s.And.Validate(); err != nil {
-			invalidParams.AddNested("And", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.Tag != nil {
-		if err := s.Tag.Validate(); err != nil {
-			invalidParams.AddNested("Tag", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetAnd sets the And field's value.
-func (s *MetricsFilter) SetAnd(v *MetricsAndOperator) *MetricsFilter {
-	s.And = v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *MetricsFilter) SetPrefix(v string) *MetricsFilter {
-	s.Prefix = &v
-	return s
-}
-
-// SetTag sets the Tag field's value.
-func (s *MetricsFilter) SetTag(v *Tag) *MetricsFilter {
-	s.Tag = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/MultipartUpload
-type MultipartUpload struct {
-	_ struct{} `type:"structure"`
-
-	// Date and time at which the multipart upload was initiated.
-	Initiated *time.Time `type:"timestamp" timestampFormat:"iso8601"`
-
-	// Identifies who initiated the multipart upload.
-	Initiator *Initiator `type:"structure"`
-
-	// Key of the object for which the multipart upload was initiated.
-	Key *string `min:"1" type:"string"`
-
-	Owner *Owner `type:"structure"`
-
-	// The class of storage used to store the object.
-	StorageClass *string `type:"string" enum:"StorageClass"`
-
-	// Upload ID that identifies the multipart upload.
-	UploadId *string `type:"string"`
-}
-
-// String returns the string representation
-func (s MultipartUpload) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s MultipartUpload) GoString() string {
-	return s.String()
-}
-
-// SetInitiated sets the Initiated field's value.
-func (s *MultipartUpload) SetInitiated(v time.Time) *MultipartUpload {
-	s.Initiated = &v
-	return s
-}
-
-// SetInitiator sets the Initiator field's value.
-func (s *MultipartUpload) SetInitiator(v *Initiator) *MultipartUpload {
-	s.Initiator = v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *MultipartUpload) SetKey(v string) *MultipartUpload {
-	s.Key = &v
-	return s
-}
-
-// SetOwner sets the Owner field's value.
-func (s *MultipartUpload) SetOwner(v *Owner) *MultipartUpload {
-	s.Owner = v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *MultipartUpload) SetStorageClass(v string) *MultipartUpload {
-	s.StorageClass = &v
-	return s
-}
-
-// SetUploadId sets the UploadId field's value.
-func (s *MultipartUpload) SetUploadId(v string) *MultipartUpload {
-	s.UploadId = &v
-	return s
-}
-
-// Specifies when noncurrent object versions expire. Upon expiration, Amazon
-// S3 permanently deletes the noncurrent object versions. You set this lifecycle
-// configuration action on a bucket that has versioning enabled (or suspended)
-// to request that Amazon S3 delete noncurrent object versions at a specific
-// period in the object's lifetime.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/NoncurrentVersionExpiration
-type NoncurrentVersionExpiration struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies the number of days an object is noncurrent before Amazon S3 can
-	// perform the associated action. For information about the noncurrent days
-	// calculations, see How Amazon S3 Calculates When an Object Became Noncurrent
-	// (http://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html)
-	NoncurrentDays *int64 `type:"integer"`
-}
-
-// String returns the string representation
-func (s NoncurrentVersionExpiration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s NoncurrentVersionExpiration) GoString() string {
-	return s.String()
-}
-
-// SetNoncurrentDays sets the NoncurrentDays field's value.
-func (s *NoncurrentVersionExpiration) SetNoncurrentDays(v int64) *NoncurrentVersionExpiration {
-	s.NoncurrentDays = &v
-	return s
-}
-
-// Container for the transition rule that describes when noncurrent objects
-// transition to the STANDARD_IA or GLACIER storage class. If your bucket is
-// versioning-enabled (or versioning is suspended), you can set this action
-// to request that Amazon S3 transition noncurrent object versions to the STANDARD_IA
-// or GLACIER storage class at a specific period in the object's lifetime.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/NoncurrentVersionTransition
-type NoncurrentVersionTransition struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies the number of days an object is noncurrent before Amazon S3 can
-	// perform the associated action. For information about the noncurrent days
-	// calculations, see How Amazon S3 Calculates When an Object Became Noncurrent
-	// (http://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html)
-	NoncurrentDays *int64 `type:"integer"`
-
-	// The class of storage used to store the object.
-	StorageClass *string `type:"string" enum:"TransitionStorageClass"`
-}
-
-// String returns the string representation
-func (s NoncurrentVersionTransition) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s NoncurrentVersionTransition) GoString() string {
-	return s.String()
-}
-
-// SetNoncurrentDays sets the NoncurrentDays field's value.
-func (s *NoncurrentVersionTransition) SetNoncurrentDays(v int64) *NoncurrentVersionTransition {
-	s.NoncurrentDays = &v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *NoncurrentVersionTransition) SetStorageClass(v string) *NoncurrentVersionTransition {
-	s.StorageClass = &v
-	return s
-}
-
-// Container for specifying the notification configuration of the bucket. If
-// this element is empty, notifications are turned off on the bucket.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/NotificationConfiguration
-type NotificationConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	LambdaFunctionConfigurations []*LambdaFunctionConfiguration `locationName:"CloudFunctionConfiguration" type:"list" flattened:"true"`
-
-	QueueConfigurations []*QueueConfiguration `locationName:"QueueConfiguration" type:"list" flattened:"true"`
-
-	TopicConfigurations []*TopicConfiguration `locationName:"TopicConfiguration" type:"list" flattened:"true"`
-}
-
-// String returns the string representation
-func (s NotificationConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s NotificationConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *NotificationConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "NotificationConfiguration"}
-	if s.LambdaFunctionConfigurations != nil {
-		for i, v := range s.LambdaFunctionConfigurations {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "LambdaFunctionConfigurations", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-	if s.QueueConfigurations != nil {
-		for i, v := range s.QueueConfigurations {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "QueueConfigurations", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-	if s.TopicConfigurations != nil {
-		for i, v := range s.TopicConfigurations {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "TopicConfigurations", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetLambdaFunctionConfigurations sets the LambdaFunctionConfigurations field's value.
-func (s *NotificationConfiguration) SetLambdaFunctionConfigurations(v []*LambdaFunctionConfiguration) *NotificationConfiguration {
-	s.LambdaFunctionConfigurations = v
-	return s
-}
-
-// SetQueueConfigurations sets the QueueConfigurations field's value.
-func (s *NotificationConfiguration) SetQueueConfigurations(v []*QueueConfiguration) *NotificationConfiguration {
-	s.QueueConfigurations = v
-	return s
-}
-
-// SetTopicConfigurations sets the TopicConfigurations field's value.
-func (s *NotificationConfiguration) SetTopicConfigurations(v []*TopicConfiguration) *NotificationConfiguration {
-	s.TopicConfigurations = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/NotificationConfigurationDeprecated
-type NotificationConfigurationDeprecated struct {
-	_ struct{} `type:"structure"`
-
-	CloudFunctionConfiguration *CloudFunctionConfiguration `type:"structure"`
-
-	QueueConfiguration *QueueConfigurationDeprecated `type:"structure"`
-
-	TopicConfiguration *TopicConfigurationDeprecated `type:"structure"`
-}
-
-// String returns the string representation
-func (s NotificationConfigurationDeprecated) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s NotificationConfigurationDeprecated) GoString() string {
-	return s.String()
-}
-
-// SetCloudFunctionConfiguration sets the CloudFunctionConfiguration field's value.
-func (s *NotificationConfigurationDeprecated) SetCloudFunctionConfiguration(v *CloudFunctionConfiguration) *NotificationConfigurationDeprecated {
-	s.CloudFunctionConfiguration = v
-	return s
-}
-
-// SetQueueConfiguration sets the QueueConfiguration field's value.
-func (s *NotificationConfigurationDeprecated) SetQueueConfiguration(v *QueueConfigurationDeprecated) *NotificationConfigurationDeprecated {
-	s.QueueConfiguration = v
-	return s
-}
-
-// SetTopicConfiguration sets the TopicConfiguration field's value.
-func (s *NotificationConfigurationDeprecated) SetTopicConfiguration(v *TopicConfigurationDeprecated) *NotificationConfigurationDeprecated {
-	s.TopicConfiguration = v
-	return s
-}
-
-// Container for object key name filtering rules. For information about key
-// name filtering, go to Configuring Event Notifications (http://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/NotificationConfigurationFilter
-type NotificationConfigurationFilter struct {
-	_ struct{} `type:"structure"`
-
-	// Container for object key name prefix and suffix filtering rules.
-	Key *KeyFilter `locationName:"S3Key" type:"structure"`
-}
-
-// String returns the string representation
-func (s NotificationConfigurationFilter) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s NotificationConfigurationFilter) GoString() string {
-	return s.String()
-}
-
-// SetKey sets the Key field's value.
-func (s *NotificationConfigurationFilter) SetKey(v *KeyFilter) *NotificationConfigurationFilter {
-	s.Key = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Object
-type Object struct {
-	_ struct{} `type:"structure"`
-
-	ETag *string `type:"string"`
-
-	Key *string `min:"1" type:"string"`
-
-	LastModified *time.Time `type:"timestamp" timestampFormat:"iso8601"`
-
-	Owner *Owner `type:"structure"`
-
-	Size *int64 `type:"integer"`
-
-	// The class of storage used to store the object.
-	StorageClass *string `type:"string" enum:"ObjectStorageClass"`
-}
-
-// String returns the string representation
-func (s Object) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Object) GoString() string {
-	return s.String()
-}
-
-// SetETag sets the ETag field's value.
-func (s *Object) SetETag(v string) *Object {
-	s.ETag = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *Object) SetKey(v string) *Object {
-	s.Key = &v
-	return s
-}
-
-// SetLastModified sets the LastModified field's value.
-func (s *Object) SetLastModified(v time.Time) *Object {
-	s.LastModified = &v
-	return s
-}
-
-// SetOwner sets the Owner field's value.
-func (s *Object) SetOwner(v *Owner) *Object {
-	s.Owner = v
-	return s
-}
-
-// SetSize sets the Size field's value.
-func (s *Object) SetSize(v int64) *Object {
-	s.Size = &v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *Object) SetStorageClass(v string) *Object {
-	s.StorageClass = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ObjectIdentifier
-type ObjectIdentifier struct {
-	_ struct{} `type:"structure"`
-
-	// Key name of the object to delete.
-	//
-	// Key is a required field
-	Key *string `min:"1" type:"string" required:"true"`
-
-	// VersionId for the specific version of the object to delete.
-	VersionId *string `type:"string"`
-}
-
-// String returns the string representation
-func (s ObjectIdentifier) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ObjectIdentifier) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ObjectIdentifier) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ObjectIdentifier"}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetKey sets the Key field's value.
-func (s *ObjectIdentifier) SetKey(v string) *ObjectIdentifier {
-	s.Key = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *ObjectIdentifier) SetVersionId(v string) *ObjectIdentifier {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ObjectVersion
-type ObjectVersion struct {
-	_ struct{} `type:"structure"`
-
-	ETag *string `type:"string"`
-
-	// Specifies whether the object is (true) or is not (false) the latest version
-	// of an object.
-	IsLatest *bool `type:"boolean"`
-
-	// The object key.
-	Key *string `min:"1" type:"string"`
-
-	// Date and time the object was last modified.
-	LastModified *time.Time `type:"timestamp" timestampFormat:"iso8601"`
-
-	Owner *Owner `type:"structure"`
-
-	// Size in bytes of the object.
-	Size *int64 `type:"integer"`
-
-	// The class of storage used to store the object.
-	StorageClass *string `type:"string" enum:"ObjectVersionStorageClass"`
-
-	// Version ID of an object.
-	VersionId *string `type:"string"`
-}
-
-// String returns the string representation
-func (s ObjectVersion) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ObjectVersion) GoString() string {
-	return s.String()
-}
-
-// SetETag sets the ETag field's value.
-func (s *ObjectVersion) SetETag(v string) *ObjectVersion {
-	s.ETag = &v
-	return s
-}
-
-// SetIsLatest sets the IsLatest field's value.
-func (s *ObjectVersion) SetIsLatest(v bool) *ObjectVersion {
-	s.IsLatest = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *ObjectVersion) SetKey(v string) *ObjectVersion {
-	s.Key = &v
-	return s
-}
-
-// SetLastModified sets the LastModified field's value.
-func (s *ObjectVersion) SetLastModified(v time.Time) *ObjectVersion {
-	s.LastModified = &v
-	return s
-}
-
-// SetOwner sets the Owner field's value.
-func (s *ObjectVersion) SetOwner(v *Owner) *ObjectVersion {
-	s.Owner = v
-	return s
-}
-
-// SetSize sets the Size field's value.
-func (s *ObjectVersion) SetSize(v int64) *ObjectVersion {
-	s.Size = &v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *ObjectVersion) SetStorageClass(v string) *ObjectVersion {
-	s.StorageClass = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *ObjectVersion) SetVersionId(v string) *ObjectVersion {
-	s.VersionId = &v
-	return s
-}
-
-// Describes the location where the restore job's output is stored.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/OutputLocation
-type OutputLocation struct {
-	_ struct{} `type:"structure"`
-
-	// Describes an S3 location that will receive the results of the restore request.
-	S3 *Location `type:"structure"`
-}
-
-// String returns the string representation
-func (s OutputLocation) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s OutputLocation) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *OutputLocation) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "OutputLocation"}
-	if s.S3 != nil {
-		if err := s.S3.Validate(); err != nil {
-			invalidParams.AddNested("S3", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetS3 sets the S3 field's value.
-func (s *OutputLocation) SetS3(v *Location) *OutputLocation {
-	s.S3 = v
-	return s
-}
-
-// Describes how results of the Select job are serialized.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/OutputSerialization
-type OutputSerialization struct {
-	_ struct{} `type:"structure"`
-
-	// Describes the serialization of CSV-encoded Select results.
-	CSV *CSVOutput `type:"structure"`
-}
-
-// String returns the string representation
-func (s OutputSerialization) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s OutputSerialization) GoString() string {
-	return s.String()
-}
-
-// SetCSV sets the CSV field's value.
-func (s *OutputSerialization) SetCSV(v *CSVOutput) *OutputSerialization {
-	s.CSV = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Owner
-type Owner struct {
-	_ struct{} `type:"structure"`
-
-	DisplayName *string `type:"string"`
-
-	ID *string `type:"string"`
-}
-
-// String returns the string representation
-func (s Owner) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Owner) GoString() string {
-	return s.String()
-}
-
-// SetDisplayName sets the DisplayName field's value.
-func (s *Owner) SetDisplayName(v string) *Owner {
-	s.DisplayName = &v
-	return s
-}
-
-// SetID sets the ID field's value.
-func (s *Owner) SetID(v string) *Owner {
-	s.ID = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Part
-type Part struct {
-	_ struct{} `type:"structure"`
-
-	// Entity tag returned when the part was uploaded.
-	ETag *string `type:"string"`
-
-	// Date and time at which the part was uploaded.
-	LastModified *time.Time `type:"timestamp" timestampFormat:"iso8601"`
-
-	// Part number identifying the part. This is a positive integer between 1 and
-	// 10,000.
-	PartNumber *int64 `type:"integer"`
-
-	// Size of the uploaded part data.
-	Size *int64 `type:"integer"`
-}
-
-// String returns the string representation
-func (s Part) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Part) GoString() string {
-	return s.String()
-}
-
-// SetETag sets the ETag field's value.
-func (s *Part) SetETag(v string) *Part {
-	s.ETag = &v
-	return s
-}
-
-// SetLastModified sets the LastModified field's value.
-func (s *Part) SetLastModified(v time.Time) *Part {
-	s.LastModified = &v
-	return s
-}
-
-// SetPartNumber sets the PartNumber field's value.
-func (s *Part) SetPartNumber(v int64) *Part {
-	s.PartNumber = &v
-	return s
-}
-
-// SetSize sets the Size field's value.
-func (s *Part) SetSize(v int64) *Part {
-	s.Size = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAccelerateConfigurationRequest
-type PutBucketAccelerateConfigurationInput struct {
-	_ struct{} `type:"structure" payload:"AccelerateConfiguration"`
-
-	// Specifies the Accelerate Configuration you want to set for the bucket.
-	//
-	// AccelerateConfiguration is a required field
-	AccelerateConfiguration *AccelerateConfiguration `locationName:"AccelerateConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-
-	// Name of the bucket for which the accelerate configuration is set.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s PutBucketAccelerateConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketAccelerateConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketAccelerateConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketAccelerateConfigurationInput"}
-	if s.AccelerateConfiguration == nil {
-		invalidParams.Add(request.NewErrParamRequired("AccelerateConfiguration"))
-	}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetAccelerateConfiguration sets the AccelerateConfiguration field's value.
-func (s *PutBucketAccelerateConfigurationInput) SetAccelerateConfiguration(v *AccelerateConfiguration) *PutBucketAccelerateConfigurationInput {
-	s.AccelerateConfiguration = v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketAccelerateConfigurationInput) SetBucket(v string) *PutBucketAccelerateConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketAccelerateConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAccelerateConfigurationOutput
-type PutBucketAccelerateConfigurationOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketAccelerateConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketAccelerateConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAclRequest
-type PutBucketAclInput struct {
-	_ struct{} `type:"structure" payload:"AccessControlPolicy"`
-
-	// The canned ACL to apply to the bucket.
-	ACL *string `location:"header" locationName:"x-amz-acl" type:"string" enum:"BucketCannedACL"`
-
-	AccessControlPolicy *AccessControlPolicy `locationName:"AccessControlPolicy" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Allows grantee the read, write, read ACP, and write ACP permissions on the
-	// bucket.
-	GrantFullControl *string `location:"header" locationName:"x-amz-grant-full-control" type:"string"`
-
-	// Allows grantee to list the objects in the bucket.
-	GrantRead *string `location:"header" locationName:"x-amz-grant-read" type:"string"`
-
-	// Allows grantee to read the bucket ACL.
-	GrantReadACP *string `location:"header" locationName:"x-amz-grant-read-acp" type:"string"`
-
-	// Allows grantee to create, overwrite, and delete any object in the bucket.
-	GrantWrite *string `location:"header" locationName:"x-amz-grant-write" type:"string"`
-
-	// Allows grantee to write the ACL for the applicable bucket.
-	GrantWriteACP *string `location:"header" locationName:"x-amz-grant-write-acp" type:"string"`
-}
-
-// String returns the string representation
-func (s PutBucketAclInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketAclInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketAclInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketAclInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.AccessControlPolicy != nil {
-		if err := s.AccessControlPolicy.Validate(); err != nil {
-			invalidParams.AddNested("AccessControlPolicy", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetACL sets the ACL field's value.
-func (s *PutBucketAclInput) SetACL(v string) *PutBucketAclInput {
-	s.ACL = &v
-	return s
-}
-
-// SetAccessControlPolicy sets the AccessControlPolicy field's value.
-func (s *PutBucketAclInput) SetAccessControlPolicy(v *AccessControlPolicy) *PutBucketAclInput {
-	s.AccessControlPolicy = v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketAclInput) SetBucket(v string) *PutBucketAclInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketAclInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetGrantFullControl sets the GrantFullControl field's value.
-func (s *PutBucketAclInput) SetGrantFullControl(v string) *PutBucketAclInput {
-	s.GrantFullControl = &v
-	return s
-}
-
-// SetGrantRead sets the GrantRead field's value.
-func (s *PutBucketAclInput) SetGrantRead(v string) *PutBucketAclInput {
-	s.GrantRead = &v
-	return s
-}
-
-// SetGrantReadACP sets the GrantReadACP field's value.
-func (s *PutBucketAclInput) SetGrantReadACP(v string) *PutBucketAclInput {
-	s.GrantReadACP = &v
-	return s
-}
-
-// SetGrantWrite sets the GrantWrite field's value.
-func (s *PutBucketAclInput) SetGrantWrite(v string) *PutBucketAclInput {
-	s.GrantWrite = &v
-	return s
-}
-
-// SetGrantWriteACP sets the GrantWriteACP field's value.
-func (s *PutBucketAclInput) SetGrantWriteACP(v string) *PutBucketAclInput {
-	s.GrantWriteACP = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAclOutput
-type PutBucketAclOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketAclOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketAclOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAnalyticsConfigurationRequest
-type PutBucketAnalyticsConfigurationInput struct {
-	_ struct{} `type:"structure" payload:"AnalyticsConfiguration"`
-
-	// The configuration and any analyses for the analytics filter.
-	//
-	// AnalyticsConfiguration is a required field
-	AnalyticsConfiguration *AnalyticsConfiguration `locationName:"AnalyticsConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-
-	// The name of the bucket to which an analytics configuration is stored.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The identifier used to represent an analytics configuration.
-	//
-	// Id is a required field
-	Id *string `location:"querystring" locationName:"id" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s PutBucketAnalyticsConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketAnalyticsConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketAnalyticsConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketAnalyticsConfigurationInput"}
-	if s.AnalyticsConfiguration == nil {
-		invalidParams.Add(request.NewErrParamRequired("AnalyticsConfiguration"))
-	}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Id == nil {
-		invalidParams.Add(request.NewErrParamRequired("Id"))
-	}
-	if s.AnalyticsConfiguration != nil {
-		if err := s.AnalyticsConfiguration.Validate(); err != nil {
-			invalidParams.AddNested("AnalyticsConfiguration", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetAnalyticsConfiguration sets the AnalyticsConfiguration field's value.
-func (s *PutBucketAnalyticsConfigurationInput) SetAnalyticsConfiguration(v *AnalyticsConfiguration) *PutBucketAnalyticsConfigurationInput {
-	s.AnalyticsConfiguration = v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketAnalyticsConfigurationInput) SetBucket(v string) *PutBucketAnalyticsConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketAnalyticsConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetId sets the Id field's value.
-func (s *PutBucketAnalyticsConfigurationInput) SetId(v string) *PutBucketAnalyticsConfigurationInput {
-	s.Id = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAnalyticsConfigurationOutput
-type PutBucketAnalyticsConfigurationOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketAnalyticsConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketAnalyticsConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketCorsRequest
-type PutBucketCorsInput struct {
-	_ struct{} `type:"structure" payload:"CORSConfiguration"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// CORSConfiguration is a required field
-	CORSConfiguration *CORSConfiguration `locationName:"CORSConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketCorsInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketCorsInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketCorsInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketCorsInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.CORSConfiguration == nil {
-		invalidParams.Add(request.NewErrParamRequired("CORSConfiguration"))
-	}
-	if s.CORSConfiguration != nil {
-		if err := s.CORSConfiguration.Validate(); err != nil {
-			invalidParams.AddNested("CORSConfiguration", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketCorsInput) SetBucket(v string) *PutBucketCorsInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketCorsInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetCORSConfiguration sets the CORSConfiguration field's value.
-func (s *PutBucketCorsInput) SetCORSConfiguration(v *CORSConfiguration) *PutBucketCorsInput {
-	s.CORSConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketCorsOutput
-type PutBucketCorsOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketCorsOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketCorsOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketEncryptionRequest
-type PutBucketEncryptionInput struct {
-	_ struct{} `type:"structure" payload:"ServerSideEncryptionConfiguration"`
-
-	// The name of the bucket for which the server-side encryption configuration
-	// is set.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Container for server-side encryption configuration rules. Currently S3 supports
-	// one rule only.
-	//
-	// ServerSideEncryptionConfiguration is a required field
-	ServerSideEncryptionConfiguration *ServerSideEncryptionConfiguration `locationName:"ServerSideEncryptionConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketEncryptionInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketEncryptionInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketEncryptionInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketEncryptionInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.ServerSideEncryptionConfiguration == nil {
-		invalidParams.Add(request.NewErrParamRequired("ServerSideEncryptionConfiguration"))
-	}
-	if s.ServerSideEncryptionConfiguration != nil {
-		if err := s.ServerSideEncryptionConfiguration.Validate(); err != nil {
-			invalidParams.AddNested("ServerSideEncryptionConfiguration", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketEncryptionInput) SetBucket(v string) *PutBucketEncryptionInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketEncryptionInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetServerSideEncryptionConfiguration sets the ServerSideEncryptionConfiguration field's value.
-func (s *PutBucketEncryptionInput) SetServerSideEncryptionConfiguration(v *ServerSideEncryptionConfiguration) *PutBucketEncryptionInput {
-	s.ServerSideEncryptionConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketEncryptionOutput
-type PutBucketEncryptionOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketEncryptionOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketEncryptionOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketInventoryConfigurationRequest
-type PutBucketInventoryConfigurationInput struct {
-	_ struct{} `type:"structure" payload:"InventoryConfiguration"`
-
-	// The name of the bucket where the inventory configuration will be stored.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The ID used to identify the inventory configuration.
-	//
-	// Id is a required field
-	Id *string `location:"querystring" locationName:"id" type:"string" required:"true"`
-
-	// Specifies the inventory configuration.
-	//
-	// InventoryConfiguration is a required field
-	InventoryConfiguration *InventoryConfiguration `locationName:"InventoryConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketInventoryConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketInventoryConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketInventoryConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketInventoryConfigurationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Id == nil {
-		invalidParams.Add(request.NewErrParamRequired("Id"))
-	}
-	if s.InventoryConfiguration == nil {
-		invalidParams.Add(request.NewErrParamRequired("InventoryConfiguration"))
-	}
-	if s.InventoryConfiguration != nil {
-		if err := s.InventoryConfiguration.Validate(); err != nil {
-			invalidParams.AddNested("InventoryConfiguration", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketInventoryConfigurationInput) SetBucket(v string) *PutBucketInventoryConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketInventoryConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetId sets the Id field's value.
-func (s *PutBucketInventoryConfigurationInput) SetId(v string) *PutBucketInventoryConfigurationInput {
-	s.Id = &v
-	return s
-}
-
-// SetInventoryConfiguration sets the InventoryConfiguration field's value.
-func (s *PutBucketInventoryConfigurationInput) SetInventoryConfiguration(v *InventoryConfiguration) *PutBucketInventoryConfigurationInput {
-	s.InventoryConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketInventoryConfigurationOutput
-type PutBucketInventoryConfigurationOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketInventoryConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketInventoryConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleConfigurationRequest
-type PutBucketLifecycleConfigurationInput struct {
-	_ struct{} `type:"structure" payload:"LifecycleConfiguration"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	LifecycleConfiguration *BucketLifecycleConfiguration `locationName:"LifecycleConfiguration" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketLifecycleConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketLifecycleConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketLifecycleConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketLifecycleConfigurationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.LifecycleConfiguration != nil {
-		if err := s.LifecycleConfiguration.Validate(); err != nil {
-			invalidParams.AddNested("LifecycleConfiguration", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketLifecycleConfigurationInput) SetBucket(v string) *PutBucketLifecycleConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketLifecycleConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetLifecycleConfiguration sets the LifecycleConfiguration field's value.
-func (s *PutBucketLifecycleConfigurationInput) SetLifecycleConfiguration(v *BucketLifecycleConfiguration) *PutBucketLifecycleConfigurationInput {
-	s.LifecycleConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleConfigurationOutput
-type PutBucketLifecycleConfigurationOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketLifecycleConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketLifecycleConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleRequest
-type PutBucketLifecycleInput struct {
-	_ struct{} `type:"structure" payload:"LifecycleConfiguration"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	LifecycleConfiguration *LifecycleConfiguration `locationName:"LifecycleConfiguration" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketLifecycleInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketLifecycleInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketLifecycleInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketLifecycleInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.LifecycleConfiguration != nil {
-		if err := s.LifecycleConfiguration.Validate(); err != nil {
-			invalidParams.AddNested("LifecycleConfiguration", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketLifecycleInput) SetBucket(v string) *PutBucketLifecycleInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketLifecycleInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetLifecycleConfiguration sets the LifecycleConfiguration field's value.
-func (s *PutBucketLifecycleInput) SetLifecycleConfiguration(v *LifecycleConfiguration) *PutBucketLifecycleInput {
-	s.LifecycleConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleOutput
-type PutBucketLifecycleOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketLifecycleOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketLifecycleOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLoggingRequest
-type PutBucketLoggingInput struct {
-	_ struct{} `type:"structure" payload:"BucketLoggingStatus"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// BucketLoggingStatus is a required field
-	BucketLoggingStatus *BucketLoggingStatus `locationName:"BucketLoggingStatus" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketLoggingInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketLoggingInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketLoggingInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketLoggingInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.BucketLoggingStatus == nil {
-		invalidParams.Add(request.NewErrParamRequired("BucketLoggingStatus"))
-	}
-	if s.BucketLoggingStatus != nil {
-		if err := s.BucketLoggingStatus.Validate(); err != nil {
-			invalidParams.AddNested("BucketLoggingStatus", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketLoggingInput) SetBucket(v string) *PutBucketLoggingInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketLoggingInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetBucketLoggingStatus sets the BucketLoggingStatus field's value.
-func (s *PutBucketLoggingInput) SetBucketLoggingStatus(v *BucketLoggingStatus) *PutBucketLoggingInput {
-	s.BucketLoggingStatus = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLoggingOutput
-type PutBucketLoggingOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketLoggingOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketLoggingOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketMetricsConfigurationRequest
-type PutBucketMetricsConfigurationInput struct {
-	_ struct{} `type:"structure" payload:"MetricsConfiguration"`
-
-	// The name of the bucket for which the metrics configuration is set.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The ID used to identify the metrics configuration.
-	//
-	// Id is a required field
-	Id *string `location:"querystring" locationName:"id" type:"string" required:"true"`
-
-	// Specifies the metrics configuration.
-	//
-	// MetricsConfiguration is a required field
-	MetricsConfiguration *MetricsConfiguration `locationName:"MetricsConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketMetricsConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketMetricsConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketMetricsConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketMetricsConfigurationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Id == nil {
-		invalidParams.Add(request.NewErrParamRequired("Id"))
-	}
-	if s.MetricsConfiguration == nil {
-		invalidParams.Add(request.NewErrParamRequired("MetricsConfiguration"))
-	}
-	if s.MetricsConfiguration != nil {
-		if err := s.MetricsConfiguration.Validate(); err != nil {
-			invalidParams.AddNested("MetricsConfiguration", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketMetricsConfigurationInput) SetBucket(v string) *PutBucketMetricsConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketMetricsConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetId sets the Id field's value.
-func (s *PutBucketMetricsConfigurationInput) SetId(v string) *PutBucketMetricsConfigurationInput {
-	s.Id = &v
-	return s
-}
-
-// SetMetricsConfiguration sets the MetricsConfiguration field's value.
-func (s *PutBucketMetricsConfigurationInput) SetMetricsConfiguration(v *MetricsConfiguration) *PutBucketMetricsConfigurationInput {
-	s.MetricsConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketMetricsConfigurationOutput
-type PutBucketMetricsConfigurationOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketMetricsConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketMetricsConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationConfigurationRequest
-type PutBucketNotificationConfigurationInput struct {
-	_ struct{} `type:"structure" payload:"NotificationConfiguration"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Container for specifying the notification configuration of the bucket. If
-	// this element is empty, notifications are turned off on the bucket.
-	//
-	// NotificationConfiguration is a required field
-	NotificationConfiguration *NotificationConfiguration `locationName:"NotificationConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketNotificationConfigurationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketNotificationConfigurationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketNotificationConfigurationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketNotificationConfigurationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.NotificationConfiguration == nil {
-		invalidParams.Add(request.NewErrParamRequired("NotificationConfiguration"))
-	}
-	if s.NotificationConfiguration != nil {
-		if err := s.NotificationConfiguration.Validate(); err != nil {
-			invalidParams.AddNested("NotificationConfiguration", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketNotificationConfigurationInput) SetBucket(v string) *PutBucketNotificationConfigurationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketNotificationConfigurationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetNotificationConfiguration sets the NotificationConfiguration field's value.
-func (s *PutBucketNotificationConfigurationInput) SetNotificationConfiguration(v *NotificationConfiguration) *PutBucketNotificationConfigurationInput {
-	s.NotificationConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationConfigurationOutput
-type PutBucketNotificationConfigurationOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketNotificationConfigurationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketNotificationConfigurationOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationRequest
-type PutBucketNotificationInput struct {
-	_ struct{} `type:"structure" payload:"NotificationConfiguration"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// NotificationConfiguration is a required field
-	NotificationConfiguration *NotificationConfigurationDeprecated `locationName:"NotificationConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketNotificationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketNotificationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketNotificationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketNotificationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.NotificationConfiguration == nil {
-		invalidParams.Add(request.NewErrParamRequired("NotificationConfiguration"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketNotificationInput) SetBucket(v string) *PutBucketNotificationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketNotificationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetNotificationConfiguration sets the NotificationConfiguration field's value.
-func (s *PutBucketNotificationInput) SetNotificationConfiguration(v *NotificationConfigurationDeprecated) *PutBucketNotificationInput {
-	s.NotificationConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationOutput
-type PutBucketNotificationOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketNotificationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketNotificationOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketPolicyRequest
-type PutBucketPolicyInput struct {
-	_ struct{} `type:"structure" payload:"Policy"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Set this parameter to true to confirm that you want to remove your permissions
-	// to change this bucket policy in the future.
-	ConfirmRemoveSelfBucketAccess *bool `location:"header" locationName:"x-amz-confirm-remove-self-bucket-access" type:"boolean"`
-
-	// The bucket policy as a JSON document.
-	//
-	// Policy is a required field
-	Policy *string `type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s PutBucketPolicyInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketPolicyInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketPolicyInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketPolicyInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Policy == nil {
-		invalidParams.Add(request.NewErrParamRequired("Policy"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketPolicyInput) SetBucket(v string) *PutBucketPolicyInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketPolicyInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetConfirmRemoveSelfBucketAccess sets the ConfirmRemoveSelfBucketAccess field's value.
-func (s *PutBucketPolicyInput) SetConfirmRemoveSelfBucketAccess(v bool) *PutBucketPolicyInput {
-	s.ConfirmRemoveSelfBucketAccess = &v
-	return s
-}
-
-// SetPolicy sets the Policy field's value.
-func (s *PutBucketPolicyInput) SetPolicy(v string) *PutBucketPolicyInput {
-	s.Policy = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketPolicyOutput
-type PutBucketPolicyOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketPolicyOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketPolicyOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketReplicationRequest
-type PutBucketReplicationInput struct {
-	_ struct{} `type:"structure" payload:"ReplicationConfiguration"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Container for replication rules. You can add as many as 1,000 rules. Total
-	// replication configuration size can be up to 2 MB.
-	//
-	// ReplicationConfiguration is a required field
-	ReplicationConfiguration *ReplicationConfiguration `locationName:"ReplicationConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketReplicationInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketReplicationInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketReplicationInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketReplicationInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.ReplicationConfiguration == nil {
-		invalidParams.Add(request.NewErrParamRequired("ReplicationConfiguration"))
-	}
-	if s.ReplicationConfiguration != nil {
-		if err := s.ReplicationConfiguration.Validate(); err != nil {
-			invalidParams.AddNested("ReplicationConfiguration", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketReplicationInput) SetBucket(v string) *PutBucketReplicationInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketReplicationInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetReplicationConfiguration sets the ReplicationConfiguration field's value.
-func (s *PutBucketReplicationInput) SetReplicationConfiguration(v *ReplicationConfiguration) *PutBucketReplicationInput {
-	s.ReplicationConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketReplicationOutput
-type PutBucketReplicationOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketReplicationOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketReplicationOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketRequestPaymentRequest
-type PutBucketRequestPaymentInput struct {
-	_ struct{} `type:"structure" payload:"RequestPaymentConfiguration"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// RequestPaymentConfiguration is a required field
-	RequestPaymentConfiguration *RequestPaymentConfiguration `locationName:"RequestPaymentConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketRequestPaymentInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketRequestPaymentInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketRequestPaymentInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketRequestPaymentInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.RequestPaymentConfiguration == nil {
-		invalidParams.Add(request.NewErrParamRequired("RequestPaymentConfiguration"))
-	}
-	if s.RequestPaymentConfiguration != nil {
-		if err := s.RequestPaymentConfiguration.Validate(); err != nil {
-			invalidParams.AddNested("RequestPaymentConfiguration", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketRequestPaymentInput) SetBucket(v string) *PutBucketRequestPaymentInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketRequestPaymentInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetRequestPaymentConfiguration sets the RequestPaymentConfiguration field's value.
-func (s *PutBucketRequestPaymentInput) SetRequestPaymentConfiguration(v *RequestPaymentConfiguration) *PutBucketRequestPaymentInput {
-	s.RequestPaymentConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketRequestPaymentOutput
-type PutBucketRequestPaymentOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketRequestPaymentOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketRequestPaymentOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketTaggingRequest
-type PutBucketTaggingInput struct {
-	_ struct{} `type:"structure" payload:"Tagging"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Tagging is a required field
-	Tagging *Tagging `locationName:"Tagging" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketTaggingInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketTaggingInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketTaggingInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketTaggingInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Tagging == nil {
-		invalidParams.Add(request.NewErrParamRequired("Tagging"))
-	}
-	if s.Tagging != nil {
-		if err := s.Tagging.Validate(); err != nil {
-			invalidParams.AddNested("Tagging", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketTaggingInput) SetBucket(v string) *PutBucketTaggingInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketTaggingInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetTagging sets the Tagging field's value.
-func (s *PutBucketTaggingInput) SetTagging(v *Tagging) *PutBucketTaggingInput {
-	s.Tagging = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketTaggingOutput
-type PutBucketTaggingOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketTaggingOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketTaggingOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketVersioningRequest
-type PutBucketVersioningInput struct {
-	_ struct{} `type:"structure" payload:"VersioningConfiguration"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The concatenation of the authentication device's serial number, a space,
-	// and the value that is displayed on your authentication device.
-	MFA *string `location:"header" locationName:"x-amz-mfa" type:"string"`
-
-	// VersioningConfiguration is a required field
-	VersioningConfiguration *VersioningConfiguration `locationName:"VersioningConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketVersioningInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketVersioningInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketVersioningInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketVersioningInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.VersioningConfiguration == nil {
-		invalidParams.Add(request.NewErrParamRequired("VersioningConfiguration"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketVersioningInput) SetBucket(v string) *PutBucketVersioningInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketVersioningInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetMFA sets the MFA field's value.
-func (s *PutBucketVersioningInput) SetMFA(v string) *PutBucketVersioningInput {
-	s.MFA = &v
-	return s
-}
-
-// SetVersioningConfiguration sets the VersioningConfiguration field's value.
-func (s *PutBucketVersioningInput) SetVersioningConfiguration(v *VersioningConfiguration) *PutBucketVersioningInput {
-	s.VersioningConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketVersioningOutput
-type PutBucketVersioningOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketVersioningOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketVersioningOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketWebsiteRequest
-type PutBucketWebsiteInput struct {
-	_ struct{} `type:"structure" payload:"WebsiteConfiguration"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// WebsiteConfiguration is a required field
-	WebsiteConfiguration *WebsiteConfiguration `locationName:"WebsiteConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-}
-
-// String returns the string representation
-func (s PutBucketWebsiteInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketWebsiteInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutBucketWebsiteInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutBucketWebsiteInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.WebsiteConfiguration == nil {
-		invalidParams.Add(request.NewErrParamRequired("WebsiteConfiguration"))
-	}
-	if s.WebsiteConfiguration != nil {
-		if err := s.WebsiteConfiguration.Validate(); err != nil {
-			invalidParams.AddNested("WebsiteConfiguration", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutBucketWebsiteInput) SetBucket(v string) *PutBucketWebsiteInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutBucketWebsiteInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetWebsiteConfiguration sets the WebsiteConfiguration field's value.
-func (s *PutBucketWebsiteInput) SetWebsiteConfiguration(v *WebsiteConfiguration) *PutBucketWebsiteInput {
-	s.WebsiteConfiguration = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketWebsiteOutput
-type PutBucketWebsiteOutput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s PutBucketWebsiteOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutBucketWebsiteOutput) GoString() string {
-	return s.String()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectAclRequest
-type PutObjectAclInput struct {
-	_ struct{} `type:"structure" payload:"AccessControlPolicy"`
-
-	// The canned ACL to apply to the object.
-	ACL *string `location:"header" locationName:"x-amz-acl" type:"string" enum:"ObjectCannedACL"`
-
-	AccessControlPolicy *AccessControlPolicy `locationName:"AccessControlPolicy" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Allows grantee the read, write, read ACP, and write ACP permissions on the
-	// bucket.
-	GrantFullControl *string `location:"header" locationName:"x-amz-grant-full-control" type:"string"`
-
-	// Allows grantee to list the objects in the bucket.
-	GrantRead *string `location:"header" locationName:"x-amz-grant-read" type:"string"`
-
-	// Allows grantee to read the bucket ACL.
-	GrantReadACP *string `location:"header" locationName:"x-amz-grant-read-acp" type:"string"`
-
-	// Allows grantee to create, overwrite, and delete any object in the bucket.
-	GrantWrite *string `location:"header" locationName:"x-amz-grant-write" type:"string"`
-
-	// Allows grantee to write the ACL for the applicable bucket.
-	GrantWriteACP *string `location:"header" locationName:"x-amz-grant-write-acp" type:"string"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// VersionId used to reference a specific version of the object.
-	VersionId *string `location:"querystring" locationName:"versionId" type:"string"`
-}
-
-// String returns the string representation
-func (s PutObjectAclInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutObjectAclInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutObjectAclInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutObjectAclInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-	if s.AccessControlPolicy != nil {
-		if err := s.AccessControlPolicy.Validate(); err != nil {
-			invalidParams.AddNested("AccessControlPolicy", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetACL sets the ACL field's value.
-func (s *PutObjectAclInput) SetACL(v string) *PutObjectAclInput {
-	s.ACL = &v
-	return s
-}
-
-// SetAccessControlPolicy sets the AccessControlPolicy field's value.
-func (s *PutObjectAclInput) SetAccessControlPolicy(v *AccessControlPolicy) *PutObjectAclInput {
-	s.AccessControlPolicy = v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutObjectAclInput) SetBucket(v string) *PutObjectAclInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutObjectAclInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetGrantFullControl sets the GrantFullControl field's value.
-func (s *PutObjectAclInput) SetGrantFullControl(v string) *PutObjectAclInput {
-	s.GrantFullControl = &v
-	return s
-}
-
-// SetGrantRead sets the GrantRead field's value.
-func (s *PutObjectAclInput) SetGrantRead(v string) *PutObjectAclInput {
-	s.GrantRead = &v
-	return s
-}
-
-// SetGrantReadACP sets the GrantReadACP field's value.
-func (s *PutObjectAclInput) SetGrantReadACP(v string) *PutObjectAclInput {
-	s.GrantReadACP = &v
-	return s
-}
-
-// SetGrantWrite sets the GrantWrite field's value.
-func (s *PutObjectAclInput) SetGrantWrite(v string) *PutObjectAclInput {
-	s.GrantWrite = &v
-	return s
-}
-
-// SetGrantWriteACP sets the GrantWriteACP field's value.
-func (s *PutObjectAclInput) SetGrantWriteACP(v string) *PutObjectAclInput {
-	s.GrantWriteACP = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *PutObjectAclInput) SetKey(v string) *PutObjectAclInput {
-	s.Key = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *PutObjectAclInput) SetRequestPayer(v string) *PutObjectAclInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *PutObjectAclInput) SetVersionId(v string) *PutObjectAclInput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectAclOutput
-type PutObjectAclOutput struct {
-	_ struct{} `type:"structure"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-}
-
-// String returns the string representation
-func (s PutObjectAclOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutObjectAclOutput) GoString() string {
-	return s.String()
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *PutObjectAclOutput) SetRequestCharged(v string) *PutObjectAclOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectRequest
-type PutObjectInput struct {
-	_ struct{} `type:"structure" payload:"Body"`
-
-	// The canned ACL to apply to the object.
-	ACL *string `location:"header" locationName:"x-amz-acl" type:"string" enum:"ObjectCannedACL"`
-
-	// Object data.
-	Body io.ReadSeeker `type:"blob"`
-
-	// Name of the bucket to which the PUT operation was initiated.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Specifies caching behavior along the request/reply chain.
-	CacheControl *string `location:"header" locationName:"Cache-Control" type:"string"`
-
-	// Specifies presentational information for the object.
-	ContentDisposition *string `location:"header" locationName:"Content-Disposition" type:"string"`
-
-	// Specifies what content encodings have been applied to the object and thus
-	// what decoding mechanisms must be applied to obtain the media-type referenced
-	// by the Content-Type header field.
-	ContentEncoding *string `location:"header" locationName:"Content-Encoding" type:"string"`
-
-	// The language the content is in.
-	ContentLanguage *string `location:"header" locationName:"Content-Language" type:"string"`
-
-	// Size of the body in bytes. This parameter is useful when the size of the
-	// body cannot be determined automatically.
-	ContentLength *int64 `location:"header" locationName:"Content-Length" type:"long"`
-
-	// The base64-encoded 128-bit MD5 digest of the part data.
-	ContentMD5 *string `location:"header" locationName:"Content-MD5" type:"string"`
-
-	// A standard MIME type describing the format of the object data.
-	ContentType *string `location:"header" locationName:"Content-Type" type:"string"`
-
-	// The date and time at which the object is no longer cacheable.
-	Expires *time.Time `location:"header" locationName:"Expires" type:"timestamp" timestampFormat:"rfc822"`
-
-	// Gives the grantee READ, READ_ACP, and WRITE_ACP permissions on the object.
-	GrantFullControl *string `location:"header" locationName:"x-amz-grant-full-control" type:"string"`
-
-	// Allows grantee to read the object data and its metadata.
-	GrantRead *string `location:"header" locationName:"x-amz-grant-read" type:"string"`
-
-	// Allows grantee to read the object ACL.
-	GrantReadACP *string `location:"header" locationName:"x-amz-grant-read-acp" type:"string"`
-
-	// Allows grantee to write the ACL for the applicable object.
-	GrantWriteACP *string `location:"header" locationName:"x-amz-grant-write-acp" type:"string"`
-
-	// Object key for which the PUT operation was initiated.
-	//
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// A map of metadata to store with the object in S3.
-	Metadata map[string]*string `location:"headers" locationName:"x-amz-meta-" type:"map"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// Specifies the algorithm to use to when encrypting the object (e.g., AES256).
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// Specifies the customer-provided encryption key for Amazon S3 to use in encrypting
-	// data. This value is used to store the object and then it is discarded; Amazon
-	// does not store the encryption key. The key must be appropriate for use with
-	// the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm
-	// header.
-	SSECustomerKey *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key" type:"string"`
-
-	// Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321.
-	// Amazon S3 uses this header for a message integrity check to ensure the encryption
-	// key was transmitted without error.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// Specifies the AWS KMS key ID to use for object encryption. All GET and PUT
-	// requests for an object protected by AWS KMS will fail if not made via SSL
-	// or using SigV4. Documentation on configuring any of the officially supported
-	// AWS SDKs and CLI can be found at http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version
-	SSEKMSKeyId *string `location:"header" locationName:"x-amz-server-side-encryption-aws-kms-key-id" type:"string"`
-
-	// The Server-side encryption algorithm used when storing this object in S3
-	// (e.g., AES256, aws:kms).
-	ServerSideEncryption *string `location:"header" locationName:"x-amz-server-side-encryption" type:"string" enum:"ServerSideEncryption"`
-
-	// The type of storage to use for the object. Defaults to 'STANDARD'.
-	StorageClass *string `location:"header" locationName:"x-amz-storage-class" type:"string" enum:"StorageClass"`
-
-	// The tag-set for the object. The tag-set must be encoded as URL Query parameters
-	Tagging *string `location:"header" locationName:"x-amz-tagging" type:"string"`
-
-	// If the bucket is configured as a website, redirects requests for this object
-	// to another object in the same bucket or to an external URL. Amazon S3 stores
-	// the value of this header in the object metadata.
-	WebsiteRedirectLocation *string `location:"header" locationName:"x-amz-website-redirect-location" type:"string"`
-}
-
-// String returns the string representation
-func (s PutObjectInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutObjectInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutObjectInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutObjectInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetACL sets the ACL field's value.
-func (s *PutObjectInput) SetACL(v string) *PutObjectInput {
-	s.ACL = &v
-	return s
-}
-
-// SetBody sets the Body field's value.
-func (s *PutObjectInput) SetBody(v io.ReadSeeker) *PutObjectInput {
-	s.Body = v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutObjectInput) SetBucket(v string) *PutObjectInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutObjectInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetCacheControl sets the CacheControl field's value.
-func (s *PutObjectInput) SetCacheControl(v string) *PutObjectInput {
-	s.CacheControl = &v
-	return s
-}
-
-// SetContentDisposition sets the ContentDisposition field's value.
-func (s *PutObjectInput) SetContentDisposition(v string) *PutObjectInput {
-	s.ContentDisposition = &v
-	return s
-}
-
-// SetContentEncoding sets the ContentEncoding field's value.
-func (s *PutObjectInput) SetContentEncoding(v string) *PutObjectInput {
-	s.ContentEncoding = &v
-	return s
-}
-
-// SetContentLanguage sets the ContentLanguage field's value.
-func (s *PutObjectInput) SetContentLanguage(v string) *PutObjectInput {
-	s.ContentLanguage = &v
-	return s
-}
-
-// SetContentLength sets the ContentLength field's value.
-func (s *PutObjectInput) SetContentLength(v int64) *PutObjectInput {
-	s.ContentLength = &v
-	return s
-}
-
-// SetContentMD5 sets the ContentMD5 field's value.
-func (s *PutObjectInput) SetContentMD5(v string) *PutObjectInput {
-	s.ContentMD5 = &v
-	return s
-}
-
-// SetContentType sets the ContentType field's value.
-func (s *PutObjectInput) SetContentType(v string) *PutObjectInput {
-	s.ContentType = &v
-	return s
-}
-
-// SetExpires sets the Expires field's value.
-func (s *PutObjectInput) SetExpires(v time.Time) *PutObjectInput {
-	s.Expires = &v
-	return s
-}
-
-// SetGrantFullControl sets the GrantFullControl field's value.
-func (s *PutObjectInput) SetGrantFullControl(v string) *PutObjectInput {
-	s.GrantFullControl = &v
-	return s
-}
-
-// SetGrantRead sets the GrantRead field's value.
-func (s *PutObjectInput) SetGrantRead(v string) *PutObjectInput {
-	s.GrantRead = &v
-	return s
-}
-
-// SetGrantReadACP sets the GrantReadACP field's value.
-func (s *PutObjectInput) SetGrantReadACP(v string) *PutObjectInput {
-	s.GrantReadACP = &v
-	return s
-}
-
-// SetGrantWriteACP sets the GrantWriteACP field's value.
-func (s *PutObjectInput) SetGrantWriteACP(v string) *PutObjectInput {
-	s.GrantWriteACP = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *PutObjectInput) SetKey(v string) *PutObjectInput {
-	s.Key = &v
-	return s
-}
-
-// SetMetadata sets the Metadata field's value.
-func (s *PutObjectInput) SetMetadata(v map[string]*string) *PutObjectInput {
-	s.Metadata = v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *PutObjectInput) SetRequestPayer(v string) *PutObjectInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *PutObjectInput) SetSSECustomerAlgorithm(v string) *PutObjectInput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKey sets the SSECustomerKey field's value.
-func (s *PutObjectInput) SetSSECustomerKey(v string) *PutObjectInput {
-	s.SSECustomerKey = &v
-	return s
-}
-
-func (s *PutObjectInput) getSSECustomerKey() (v string) {
-	if s.SSECustomerKey == nil {
-		return v
-	}
-	return *s.SSECustomerKey
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *PutObjectInput) SetSSECustomerKeyMD5(v string) *PutObjectInput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetSSEKMSKeyId sets the SSEKMSKeyId field's value.
-func (s *PutObjectInput) SetSSEKMSKeyId(v string) *PutObjectInput {
-	s.SSEKMSKeyId = &v
-	return s
-}
-
-// SetServerSideEncryption sets the ServerSideEncryption field's value.
-func (s *PutObjectInput) SetServerSideEncryption(v string) *PutObjectInput {
-	s.ServerSideEncryption = &v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *PutObjectInput) SetStorageClass(v string) *PutObjectInput {
-	s.StorageClass = &v
-	return s
-}
-
-// SetTagging sets the Tagging field's value.
-func (s *PutObjectInput) SetTagging(v string) *PutObjectInput {
-	s.Tagging = &v
-	return s
-}
-
-// SetWebsiteRedirectLocation sets the WebsiteRedirectLocation field's value.
-func (s *PutObjectInput) SetWebsiteRedirectLocation(v string) *PutObjectInput {
-	s.WebsiteRedirectLocation = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectOutput
-type PutObjectOutput struct {
-	_ struct{} `type:"structure"`
-
-	// Entity tag for the uploaded object.
-	ETag *string `location:"header" locationName:"ETag" type:"string"`
-
-	// If the object expiration is configured, this will contain the expiration
-	// date (expiry-date) and rule ID (rule-id). The value of rule-id is URL encoded.
-	Expiration *string `location:"header" locationName:"x-amz-expiration" type:"string"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header confirming the encryption algorithm
-	// used.
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header to provide round trip message integrity
-	// verification of the customer-provided encryption key.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// If present, specifies the ID of the AWS Key Management Service (KMS) master
-	// encryption key that was used for the object.
-	SSEKMSKeyId *string `location:"header" locationName:"x-amz-server-side-encryption-aws-kms-key-id" type:"string"`
-
-	// The Server-side encryption algorithm used when storing this object in S3
-	// (e.g., AES256, aws:kms).
-	ServerSideEncryption *string `location:"header" locationName:"x-amz-server-side-encryption" type:"string" enum:"ServerSideEncryption"`
-
-	// Version of the object.
-	VersionId *string `location:"header" locationName:"x-amz-version-id" type:"string"`
-}
-
-// String returns the string representation
-func (s PutObjectOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutObjectOutput) GoString() string {
-	return s.String()
-}
-
-// SetETag sets the ETag field's value.
-func (s *PutObjectOutput) SetETag(v string) *PutObjectOutput {
-	s.ETag = &v
-	return s
-}
-
-// SetExpiration sets the Expiration field's value.
-func (s *PutObjectOutput) SetExpiration(v string) *PutObjectOutput {
-	s.Expiration = &v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *PutObjectOutput) SetRequestCharged(v string) *PutObjectOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *PutObjectOutput) SetSSECustomerAlgorithm(v string) *PutObjectOutput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *PutObjectOutput) SetSSECustomerKeyMD5(v string) *PutObjectOutput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetSSEKMSKeyId sets the SSEKMSKeyId field's value.
-func (s *PutObjectOutput) SetSSEKMSKeyId(v string) *PutObjectOutput {
-	s.SSEKMSKeyId = &v
-	return s
-}
-
-// SetServerSideEncryption sets the ServerSideEncryption field's value.
-func (s *PutObjectOutput) SetServerSideEncryption(v string) *PutObjectOutput {
-	s.ServerSideEncryption = &v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *PutObjectOutput) SetVersionId(v string) *PutObjectOutput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectTaggingRequest
-type PutObjectTaggingInput struct {
-	_ struct{} `type:"structure" payload:"Tagging"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// Tagging is a required field
-	Tagging *Tagging `locationName:"Tagging" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-
-	VersionId *string `location:"querystring" locationName:"versionId" type:"string"`
-}
-
-// String returns the string representation
-func (s PutObjectTaggingInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutObjectTaggingInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *PutObjectTaggingInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "PutObjectTaggingInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-	if s.Tagging == nil {
-		invalidParams.Add(request.NewErrParamRequired("Tagging"))
-	}
-	if s.Tagging != nil {
-		if err := s.Tagging.Validate(); err != nil {
-			invalidParams.AddNested("Tagging", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *PutObjectTaggingInput) SetBucket(v string) *PutObjectTaggingInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *PutObjectTaggingInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetKey sets the Key field's value.
-func (s *PutObjectTaggingInput) SetKey(v string) *PutObjectTaggingInput {
-	s.Key = &v
-	return s
-}
-
-// SetTagging sets the Tagging field's value.
-func (s *PutObjectTaggingInput) SetTagging(v *Tagging) *PutObjectTaggingInput {
-	s.Tagging = v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *PutObjectTaggingInput) SetVersionId(v string) *PutObjectTaggingInput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectTaggingOutput
-type PutObjectTaggingOutput struct {
-	_ struct{} `type:"structure"`
-
-	VersionId *string `location:"header" locationName:"x-amz-version-id" type:"string"`
-}
-
-// String returns the string representation
-func (s PutObjectTaggingOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s PutObjectTaggingOutput) GoString() string {
-	return s.String()
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *PutObjectTaggingOutput) SetVersionId(v string) *PutObjectTaggingOutput {
-	s.VersionId = &v
-	return s
-}
-
-// Container for specifying an configuration when you want Amazon S3 to publish
-// events to an Amazon Simple Queue Service (Amazon SQS) queue.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/QueueConfiguration
-type QueueConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// Events is a required field
-	Events []*string `locationName:"Event" type:"list" flattened:"true" required:"true"`
-
-	// Container for object key name filtering rules. For information about key
-	// name filtering, go to Configuring Event Notifications (http://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
-	Filter *NotificationConfigurationFilter `type:"structure"`
-
-	// Optional unique identifier for configurations in a notification configuration.
-	// If you don't provide one, Amazon S3 will assign an ID.
-	Id *string `type:"string"`
-
-	// Amazon SQS queue ARN to which Amazon S3 will publish a message when it detects
-	// events of specified type.
-	//
-	// QueueArn is a required field
-	QueueArn *string `locationName:"Queue" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s QueueConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s QueueConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *QueueConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "QueueConfiguration"}
-	if s.Events == nil {
-		invalidParams.Add(request.NewErrParamRequired("Events"))
-	}
-	if s.QueueArn == nil {
-		invalidParams.Add(request.NewErrParamRequired("QueueArn"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetEvents sets the Events field's value.
-func (s *QueueConfiguration) SetEvents(v []*string) *QueueConfiguration {
-	s.Events = v
-	return s
-}
-
-// SetFilter sets the Filter field's value.
-func (s *QueueConfiguration) SetFilter(v *NotificationConfigurationFilter) *QueueConfiguration {
-	s.Filter = v
-	return s
-}
-
-// SetId sets the Id field's value.
-func (s *QueueConfiguration) SetId(v string) *QueueConfiguration {
-	s.Id = &v
-	return s
-}
-
-// SetQueueArn sets the QueueArn field's value.
-func (s *QueueConfiguration) SetQueueArn(v string) *QueueConfiguration {
-	s.QueueArn = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/QueueConfigurationDeprecated
-type QueueConfigurationDeprecated struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket event for which to send notifications.
-	Event *string `deprecated:"true" type:"string" enum:"Event"`
-
-	Events []*string `locationName:"Event" type:"list" flattened:"true"`
-
-	// Optional unique identifier for configurations in a notification configuration.
-	// If you don't provide one, Amazon S3 will assign an ID.
-	Id *string `type:"string"`
-
-	Queue *string `type:"string"`
-}
-
-// String returns the string representation
-func (s QueueConfigurationDeprecated) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s QueueConfigurationDeprecated) GoString() string {
-	return s.String()
-}
-
-// SetEvent sets the Event field's value.
-func (s *QueueConfigurationDeprecated) SetEvent(v string) *QueueConfigurationDeprecated {
-	s.Event = &v
-	return s
-}
-
-// SetEvents sets the Events field's value.
-func (s *QueueConfigurationDeprecated) SetEvents(v []*string) *QueueConfigurationDeprecated {
-	s.Events = v
-	return s
-}
-
-// SetId sets the Id field's value.
-func (s *QueueConfigurationDeprecated) SetId(v string) *QueueConfigurationDeprecated {
-	s.Id = &v
-	return s
-}
-
-// SetQueue sets the Queue field's value.
-func (s *QueueConfigurationDeprecated) SetQueue(v string) *QueueConfigurationDeprecated {
-	s.Queue = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Redirect
-type Redirect struct {
-	_ struct{} `type:"structure"`
-
-	// The host name to use in the redirect request.
-	HostName *string `type:"string"`
-
-	// The HTTP redirect code to use on the response. Not required if one of the
-	// siblings is present.
-	HttpRedirectCode *string `type:"string"`
-
-	// Protocol to use (http, https) when redirecting requests. The default is the
-	// protocol that is used in the original request.
-	Protocol *string `type:"string" enum:"Protocol"`
-
-	// The object key prefix to use in the redirect request. For example, to redirect
-	// requests for all pages with prefix docs/ (objects in the docs/ folder) to
-	// documents/, you can set a condition block with KeyPrefixEquals set to docs/
-	// and in the Redirect set ReplaceKeyPrefixWith to /documents. Not required
-	// if one of the siblings is present. Can be present only if ReplaceKeyWith
-	// is not provided.
-	ReplaceKeyPrefixWith *string `type:"string"`
-
-	// The specific object key to use in the redirect request. For example, redirect
-	// request to error.html. Not required if one of the sibling is present. Can
-	// be present only if ReplaceKeyPrefixWith is not provided.
-	ReplaceKeyWith *string `type:"string"`
-}
-
-// String returns the string representation
-func (s Redirect) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Redirect) GoString() string {
-	return s.String()
-}
-
-// SetHostName sets the HostName field's value.
-func (s *Redirect) SetHostName(v string) *Redirect {
-	s.HostName = &v
-	return s
-}
-
-// SetHttpRedirectCode sets the HttpRedirectCode field's value.
-func (s *Redirect) SetHttpRedirectCode(v string) *Redirect {
-	s.HttpRedirectCode = &v
-	return s
-}
-
-// SetProtocol sets the Protocol field's value.
-func (s *Redirect) SetProtocol(v string) *Redirect {
-	s.Protocol = &v
-	return s
-}
-
-// SetReplaceKeyPrefixWith sets the ReplaceKeyPrefixWith field's value.
-func (s *Redirect) SetReplaceKeyPrefixWith(v string) *Redirect {
-	s.ReplaceKeyPrefixWith = &v
-	return s
-}
-
-// SetReplaceKeyWith sets the ReplaceKeyWith field's value.
-func (s *Redirect) SetReplaceKeyWith(v string) *Redirect {
-	s.ReplaceKeyWith = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RedirectAllRequestsTo
-type RedirectAllRequestsTo struct {
-	_ struct{} `type:"structure"`
-
-	// Name of the host where requests will be redirected.
-	//
-	// HostName is a required field
-	HostName *string `type:"string" required:"true"`
-
-	// Protocol to use (http, https) when redirecting requests. The default is the
-	// protocol that is used in the original request.
-	Protocol *string `type:"string" enum:"Protocol"`
-}
-
-// String returns the string representation
-func (s RedirectAllRequestsTo) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s RedirectAllRequestsTo) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *RedirectAllRequestsTo) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "RedirectAllRequestsTo"}
-	if s.HostName == nil {
-		invalidParams.Add(request.NewErrParamRequired("HostName"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetHostName sets the HostName field's value.
-func (s *RedirectAllRequestsTo) SetHostName(v string) *RedirectAllRequestsTo {
-	s.HostName = &v
-	return s
-}
-
-// SetProtocol sets the Protocol field's value.
-func (s *RedirectAllRequestsTo) SetProtocol(v string) *RedirectAllRequestsTo {
-	s.Protocol = &v
-	return s
-}
-
-// Container for replication rules. You can add as many as 1,000 rules. Total
-// replication configuration size can be up to 2 MB.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ReplicationConfiguration
-type ReplicationConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// Amazon Resource Name (ARN) of an IAM role for Amazon S3 to assume when replicating
-	// the objects.
-	//
-	// Role is a required field
-	Role *string `type:"string" required:"true"`
-
-	// Container for information about a particular replication rule. Replication
-	// configuration must have at least one rule and can contain up to 1,000 rules.
-	//
-	// Rules is a required field
-	Rules []*ReplicationRule `locationName:"Rule" type:"list" flattened:"true" required:"true"`
-}
-
-// String returns the string representation
-func (s ReplicationConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ReplicationConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ReplicationConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ReplicationConfiguration"}
-	if s.Role == nil {
-		invalidParams.Add(request.NewErrParamRequired("Role"))
-	}
-	if s.Rules == nil {
-		invalidParams.Add(request.NewErrParamRequired("Rules"))
-	}
-	if s.Rules != nil {
-		for i, v := range s.Rules {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Rules", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetRole sets the Role field's value.
-func (s *ReplicationConfiguration) SetRole(v string) *ReplicationConfiguration {
-	s.Role = &v
-	return s
-}
-
-// SetRules sets the Rules field's value.
-func (s *ReplicationConfiguration) SetRules(v []*ReplicationRule) *ReplicationConfiguration {
-	s.Rules = v
-	return s
-}
-
-// Container for information about a particular replication rule.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ReplicationRule
-type ReplicationRule struct {
-	_ struct{} `type:"structure"`
-
-	// Container for replication destination information.
-	//
-	// Destination is a required field
-	Destination *Destination `type:"structure" required:"true"`
-
-	// Unique identifier for the rule. The value cannot be longer than 255 characters.
-	ID *string `type:"string"`
-
-	// Object keyname prefix identifying one or more objects to which the rule applies.
-	// Maximum prefix length can be up to 1,024 characters. Overlapping prefixes
-	// are not supported.
-	//
-	// Prefix is a required field
-	Prefix *string `type:"string" required:"true"`
-
-	// Container for filters that define which source objects should be replicated.
-	SourceSelectionCriteria *SourceSelectionCriteria `type:"structure"`
-
-	// The rule is ignored if status is not Enabled.
-	//
-	// Status is a required field
-	Status *string `type:"string" required:"true" enum:"ReplicationRuleStatus"`
-}
-
-// String returns the string representation
-func (s ReplicationRule) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ReplicationRule) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ReplicationRule) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ReplicationRule"}
-	if s.Destination == nil {
-		invalidParams.Add(request.NewErrParamRequired("Destination"))
-	}
-	if s.Prefix == nil {
-		invalidParams.Add(request.NewErrParamRequired("Prefix"))
-	}
-	if s.Status == nil {
-		invalidParams.Add(request.NewErrParamRequired("Status"))
-	}
-	if s.Destination != nil {
-		if err := s.Destination.Validate(); err != nil {
-			invalidParams.AddNested("Destination", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.SourceSelectionCriteria != nil {
-		if err := s.SourceSelectionCriteria.Validate(); err != nil {
-			invalidParams.AddNested("SourceSelectionCriteria", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetDestination sets the Destination field's value.
-func (s *ReplicationRule) SetDestination(v *Destination) *ReplicationRule {
-	s.Destination = v
-	return s
-}
-
-// SetID sets the ID field's value.
-func (s *ReplicationRule) SetID(v string) *ReplicationRule {
-	s.ID = &v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *ReplicationRule) SetPrefix(v string) *ReplicationRule {
-	s.Prefix = &v
-	return s
-}
-
-// SetSourceSelectionCriteria sets the SourceSelectionCriteria field's value.
-func (s *ReplicationRule) SetSourceSelectionCriteria(v *SourceSelectionCriteria) *ReplicationRule {
-	s.SourceSelectionCriteria = v
-	return s
-}
-
-// SetStatus sets the Status field's value.
-func (s *ReplicationRule) SetStatus(v string) *ReplicationRule {
-	s.Status = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RequestPaymentConfiguration
-type RequestPaymentConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies who pays for the download and request fees.
-	//
-	// Payer is a required field
-	Payer *string `type:"string" required:"true" enum:"Payer"`
-}
-
-// String returns the string representation
-func (s RequestPaymentConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s RequestPaymentConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *RequestPaymentConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "RequestPaymentConfiguration"}
-	if s.Payer == nil {
-		invalidParams.Add(request.NewErrParamRequired("Payer"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetPayer sets the Payer field's value.
-func (s *RequestPaymentConfiguration) SetPayer(v string) *RequestPaymentConfiguration {
-	s.Payer = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreObjectRequest
-type RestoreObjectInput struct {
-	_ struct{} `type:"structure" payload:"RestoreRequest"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// Container for restore job parameters.
-	RestoreRequest *RestoreRequest `locationName:"RestoreRequest" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
-
-	VersionId *string `location:"querystring" locationName:"versionId" type:"string"`
-}
-
-// String returns the string representation
-func (s RestoreObjectInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s RestoreObjectInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *RestoreObjectInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "RestoreObjectInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-	if s.RestoreRequest != nil {
-		if err := s.RestoreRequest.Validate(); err != nil {
-			invalidParams.AddNested("RestoreRequest", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *RestoreObjectInput) SetBucket(v string) *RestoreObjectInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *RestoreObjectInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetKey sets the Key field's value.
-func (s *RestoreObjectInput) SetKey(v string) *RestoreObjectInput {
-	s.Key = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *RestoreObjectInput) SetRequestPayer(v string) *RestoreObjectInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetRestoreRequest sets the RestoreRequest field's value.
-func (s *RestoreObjectInput) SetRestoreRequest(v *RestoreRequest) *RestoreObjectInput {
-	s.RestoreRequest = v
-	return s
-}
-
-// SetVersionId sets the VersionId field's value.
-func (s *RestoreObjectInput) SetVersionId(v string) *RestoreObjectInput {
-	s.VersionId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreObjectOutput
-type RestoreObjectOutput struct {
-	_ struct{} `type:"structure"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-
-	// Indicates the path in the provided S3 output location where Select results
-	// will be restored to.
-	RestoreOutputPath *string `location:"header" locationName:"x-amz-restore-output-path" type:"string"`
-}
-
-// String returns the string representation
-func (s RestoreObjectOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s RestoreObjectOutput) GoString() string {
-	return s.String()
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *RestoreObjectOutput) SetRequestCharged(v string) *RestoreObjectOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// SetRestoreOutputPath sets the RestoreOutputPath field's value.
-func (s *RestoreObjectOutput) SetRestoreOutputPath(v string) *RestoreObjectOutput {
-	s.RestoreOutputPath = &v
-	return s
-}
-
-// Container for restore job parameters.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreRequest
-type RestoreRequest struct {
-	_ struct{} `type:"structure"`
-
-	// Lifetime of the active copy in days. Do not use with restores that specify
-	// OutputLocation.
-	Days *int64 `type:"integer"`
-
-	// The optional description for the job.
-	Description *string `type:"string"`
-
-	// Glacier related parameters pertaining to this job. Do not use with restores
-	// that specify OutputLocation.
-	GlacierJobParameters *GlacierJobParameters `type:"structure"`
-
-	// Describes the location where the restore job's output is stored.
-	OutputLocation *OutputLocation `type:"structure"`
-
-	// Describes the parameters for Select job types.
-	SelectParameters *SelectParameters `type:"structure"`
-
-	// Glacier retrieval tier at which the restore will be processed.
-	Tier *string `type:"string" enum:"Tier"`
-
-	// Type of restore request.
-	Type *string `type:"string" enum:"RestoreRequestType"`
-}
-
-// String returns the string representation
-func (s RestoreRequest) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s RestoreRequest) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *RestoreRequest) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "RestoreRequest"}
-	if s.GlacierJobParameters != nil {
-		if err := s.GlacierJobParameters.Validate(); err != nil {
-			invalidParams.AddNested("GlacierJobParameters", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.OutputLocation != nil {
-		if err := s.OutputLocation.Validate(); err != nil {
-			invalidParams.AddNested("OutputLocation", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.SelectParameters != nil {
-		if err := s.SelectParameters.Validate(); err != nil {
-			invalidParams.AddNested("SelectParameters", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetDays sets the Days field's value.
-func (s *RestoreRequest) SetDays(v int64) *RestoreRequest {
-	s.Days = &v
-	return s
-}
-
-// SetDescription sets the Description field's value.
-func (s *RestoreRequest) SetDescription(v string) *RestoreRequest {
-	s.Description = &v
-	return s
-}
-
-// SetGlacierJobParameters sets the GlacierJobParameters field's value.
-func (s *RestoreRequest) SetGlacierJobParameters(v *GlacierJobParameters) *RestoreRequest {
-	s.GlacierJobParameters = v
-	return s
-}
-
-// SetOutputLocation sets the OutputLocation field's value.
-func (s *RestoreRequest) SetOutputLocation(v *OutputLocation) *RestoreRequest {
-	s.OutputLocation = v
-	return s
-}
-
-// SetSelectParameters sets the SelectParameters field's value.
-func (s *RestoreRequest) SetSelectParameters(v *SelectParameters) *RestoreRequest {
-	s.SelectParameters = v
-	return s
-}
-
-// SetTier sets the Tier field's value.
-func (s *RestoreRequest) SetTier(v string) *RestoreRequest {
-	s.Tier = &v
-	return s
-}
-
-// SetType sets the Type field's value.
-func (s *RestoreRequest) SetType(v string) *RestoreRequest {
-	s.Type = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RoutingRule
-type RoutingRule struct {
-	_ struct{} `type:"structure"`
-
-	// A container for describing a condition that must be met for the specified
-	// redirect to apply. For example, 1. If request is for pages in the /docs folder,
-	// redirect to the /documents folder. 2. If request results in HTTP error 4xx,
-	// redirect request to another host where you might process the error.
-	Condition *Condition `type:"structure"`
-
-	// Container for redirect information. You can redirect requests to another
-	// host, to another page, or with another protocol. In the event of an error,
-	// you can can specify a different error code to return.
-	//
-	// Redirect is a required field
-	Redirect *Redirect `type:"structure" required:"true"`
-}
-
-// String returns the string representation
-func (s RoutingRule) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s RoutingRule) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *RoutingRule) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "RoutingRule"}
-	if s.Redirect == nil {
-		invalidParams.Add(request.NewErrParamRequired("Redirect"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetCondition sets the Condition field's value.
-func (s *RoutingRule) SetCondition(v *Condition) *RoutingRule {
-	s.Condition = v
-	return s
-}
-
-// SetRedirect sets the Redirect field's value.
-func (s *RoutingRule) SetRedirect(v *Redirect) *RoutingRule {
-	s.Redirect = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Rule
-type Rule struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies the days since the initiation of an Incomplete Multipart Upload
-	// that Lifecycle will wait before permanently removing all parts of the upload.
-	AbortIncompleteMultipartUpload *AbortIncompleteMultipartUpload `type:"structure"`
-
-	Expiration *LifecycleExpiration `type:"structure"`
-
-	// Unique identifier for the rule. The value cannot be longer than 255 characters.
-	ID *string `type:"string"`
-
-	// Specifies when noncurrent object versions expire. Upon expiration, Amazon
-	// S3 permanently deletes the noncurrent object versions. You set this lifecycle
-	// configuration action on a bucket that has versioning enabled (or suspended)
-	// to request that Amazon S3 delete noncurrent object versions at a specific
-	// period in the object's lifetime.
-	NoncurrentVersionExpiration *NoncurrentVersionExpiration `type:"structure"`
-
-	// Container for the transition rule that describes when noncurrent objects
-	// transition to the STANDARD_IA or GLACIER storage class. If your bucket is
-	// versioning-enabled (or versioning is suspended), you can set this action
-	// to request that Amazon S3 transition noncurrent object versions to the STANDARD_IA
-	// or GLACIER storage class at a specific period in the object's lifetime.
-	NoncurrentVersionTransition *NoncurrentVersionTransition `type:"structure"`
-
-	// Prefix identifying one or more objects to which the rule applies.
-	//
-	// Prefix is a required field
-	Prefix *string `type:"string" required:"true"`
-
-	// If 'Enabled', the rule is currently being applied. If 'Disabled', the rule
-	// is not currently being applied.
-	//
-	// Status is a required field
-	Status *string `type:"string" required:"true" enum:"ExpirationStatus"`
-
-	Transition *Transition `type:"structure"`
-}
-
-// String returns the string representation
-func (s Rule) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Rule) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *Rule) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "Rule"}
-	if s.Prefix == nil {
-		invalidParams.Add(request.NewErrParamRequired("Prefix"))
-	}
-	if s.Status == nil {
-		invalidParams.Add(request.NewErrParamRequired("Status"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetAbortIncompleteMultipartUpload sets the AbortIncompleteMultipartUpload field's value.
-func (s *Rule) SetAbortIncompleteMultipartUpload(v *AbortIncompleteMultipartUpload) *Rule {
-	s.AbortIncompleteMultipartUpload = v
-	return s
-}
-
-// SetExpiration sets the Expiration field's value.
-func (s *Rule) SetExpiration(v *LifecycleExpiration) *Rule {
-	s.Expiration = v
-	return s
-}
-
-// SetID sets the ID field's value.
-func (s *Rule) SetID(v string) *Rule {
-	s.ID = &v
-	return s
-}
-
-// SetNoncurrentVersionExpiration sets the NoncurrentVersionExpiration field's value.
-func (s *Rule) SetNoncurrentVersionExpiration(v *NoncurrentVersionExpiration) *Rule {
-	s.NoncurrentVersionExpiration = v
-	return s
-}
-
-// SetNoncurrentVersionTransition sets the NoncurrentVersionTransition field's value.
-func (s *Rule) SetNoncurrentVersionTransition(v *NoncurrentVersionTransition) *Rule {
-	s.NoncurrentVersionTransition = v
-	return s
-}
-
-// SetPrefix sets the Prefix field's value.
-func (s *Rule) SetPrefix(v string) *Rule {
-	s.Prefix = &v
-	return s
-}
-
-// SetStatus sets the Status field's value.
-func (s *Rule) SetStatus(v string) *Rule {
-	s.Status = &v
-	return s
-}
-
-// SetTransition sets the Transition field's value.
-func (s *Rule) SetTransition(v *Transition) *Rule {
-	s.Transition = v
-	return s
-}
-
-// Specifies the use of SSE-KMS to encrypt delievered Inventory reports.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SSEKMS
-type SSEKMS struct {
-	_ struct{} `locationName:"SSE-KMS" type:"structure"`
-
-	// Specifies the ID of the AWS Key Management Service (KMS) master encryption
-	// key to use for encrypting Inventory reports.
-	//
-	// KeyId is a required field
-	KeyId *string `type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s SSEKMS) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s SSEKMS) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *SSEKMS) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "SSEKMS"}
-	if s.KeyId == nil {
-		invalidParams.Add(request.NewErrParamRequired("KeyId"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetKeyId sets the KeyId field's value.
-func (s *SSEKMS) SetKeyId(v string) *SSEKMS {
-	s.KeyId = &v
-	return s
-}
-
-// Specifies the use of SSE-S3 to encrypt delievered Inventory reports.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SSES3
-type SSES3 struct {
-	_ struct{} `locationName:"SSE-S3" type:"structure"`
-}
-
-// String returns the string representation
-func (s SSES3) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s SSES3) GoString() string {
-	return s.String()
-}
-
-// Describes the parameters for Select job types.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SelectParameters
-type SelectParameters struct {
-	_ struct{} `type:"structure"`
-
-	// The expression that is used to query the object.
-	//
-	// Expression is a required field
-	Expression *string `type:"string" required:"true"`
-
-	// The type of the provided expression (e.g., SQL).
-	//
-	// ExpressionType is a required field
-	ExpressionType *string `type:"string" required:"true" enum:"ExpressionType"`
-
-	// Describes the serialization format of the object.
-	//
-	// InputSerialization is a required field
-	InputSerialization *InputSerialization `type:"structure" required:"true"`
-
-	// Describes how the results of the Select job are serialized.
-	//
-	// OutputSerialization is a required field
-	OutputSerialization *OutputSerialization `type:"structure" required:"true"`
-}
-
-// String returns the string representation
-func (s SelectParameters) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s SelectParameters) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *SelectParameters) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "SelectParameters"}
-	if s.Expression == nil {
-		invalidParams.Add(request.NewErrParamRequired("Expression"))
-	}
-	if s.ExpressionType == nil {
-		invalidParams.Add(request.NewErrParamRequired("ExpressionType"))
-	}
-	if s.InputSerialization == nil {
-		invalidParams.Add(request.NewErrParamRequired("InputSerialization"))
-	}
-	if s.OutputSerialization == nil {
-		invalidParams.Add(request.NewErrParamRequired("OutputSerialization"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetExpression sets the Expression field's value.
-func (s *SelectParameters) SetExpression(v string) *SelectParameters {
-	s.Expression = &v
-	return s
-}
-
-// SetExpressionType sets the ExpressionType field's value.
-func (s *SelectParameters) SetExpressionType(v string) *SelectParameters {
-	s.ExpressionType = &v
-	return s
-}
-
-// SetInputSerialization sets the InputSerialization field's value.
-func (s *SelectParameters) SetInputSerialization(v *InputSerialization) *SelectParameters {
-	s.InputSerialization = v
-	return s
-}
-
-// SetOutputSerialization sets the OutputSerialization field's value.
-func (s *SelectParameters) SetOutputSerialization(v *OutputSerialization) *SelectParameters {
-	s.OutputSerialization = v
-	return s
-}
-
-// Describes the default server-side encryption to apply to new objects in the
-// bucket. If Put Object request does not specify any server-side encryption,
-// this default encryption will be applied.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ServerSideEncryptionByDefault
-type ServerSideEncryptionByDefault struct {
-	_ struct{} `type:"structure"`
-
-	// KMS master key ID to use for the default encryption. This parameter is allowed
-	// if SSEAlgorithm is aws:kms.
-	KMSMasterKeyID *string `type:"string"`
-
-	// Server-side encryption algorithm to use for the default encryption.
-	//
-	// SSEAlgorithm is a required field
-	SSEAlgorithm *string `type:"string" required:"true" enum:"ServerSideEncryption"`
-}
-
-// String returns the string representation
-func (s ServerSideEncryptionByDefault) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ServerSideEncryptionByDefault) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ServerSideEncryptionByDefault) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ServerSideEncryptionByDefault"}
-	if s.SSEAlgorithm == nil {
-		invalidParams.Add(request.NewErrParamRequired("SSEAlgorithm"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetKMSMasterKeyID sets the KMSMasterKeyID field's value.
-func (s *ServerSideEncryptionByDefault) SetKMSMasterKeyID(v string) *ServerSideEncryptionByDefault {
-	s.KMSMasterKeyID = &v
-	return s
-}
-
-// SetSSEAlgorithm sets the SSEAlgorithm field's value.
-func (s *ServerSideEncryptionByDefault) SetSSEAlgorithm(v string) *ServerSideEncryptionByDefault {
-	s.SSEAlgorithm = &v
-	return s
-}
-
-// Container for server-side encryption configuration rules. Currently S3 supports
-// one rule only.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ServerSideEncryptionConfiguration
-type ServerSideEncryptionConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// Container for information about a particular server-side encryption configuration
-	// rule.
-	//
-	// Rules is a required field
-	Rules []*ServerSideEncryptionRule `locationName:"Rule" type:"list" flattened:"true" required:"true"`
-}
-
-// String returns the string representation
-func (s ServerSideEncryptionConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ServerSideEncryptionConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ServerSideEncryptionConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ServerSideEncryptionConfiguration"}
-	if s.Rules == nil {
-		invalidParams.Add(request.NewErrParamRequired("Rules"))
-	}
-	if s.Rules != nil {
-		for i, v := range s.Rules {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Rules", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetRules sets the Rules field's value.
-func (s *ServerSideEncryptionConfiguration) SetRules(v []*ServerSideEncryptionRule) *ServerSideEncryptionConfiguration {
-	s.Rules = v
-	return s
-}
-
-// Container for information about a particular server-side encryption configuration
-// rule.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ServerSideEncryptionRule
-type ServerSideEncryptionRule struct {
-	_ struct{} `type:"structure"`
-
-	// Describes the default server-side encryption to apply to new objects in the
-	// bucket. If Put Object request does not specify any server-side encryption,
-	// this default encryption will be applied.
-	ApplyServerSideEncryptionByDefault *ServerSideEncryptionByDefault `type:"structure"`
-}
-
-// String returns the string representation
-func (s ServerSideEncryptionRule) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s ServerSideEncryptionRule) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *ServerSideEncryptionRule) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "ServerSideEncryptionRule"}
-	if s.ApplyServerSideEncryptionByDefault != nil {
-		if err := s.ApplyServerSideEncryptionByDefault.Validate(); err != nil {
-			invalidParams.AddNested("ApplyServerSideEncryptionByDefault", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetApplyServerSideEncryptionByDefault sets the ApplyServerSideEncryptionByDefault field's value.
-func (s *ServerSideEncryptionRule) SetApplyServerSideEncryptionByDefault(v *ServerSideEncryptionByDefault) *ServerSideEncryptionRule {
-	s.ApplyServerSideEncryptionByDefault = v
-	return s
-}
-
-// Container for filters that define which source objects should be replicated.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SourceSelectionCriteria
-type SourceSelectionCriteria struct {
-	_ struct{} `type:"structure"`
-
-	// Container for filter information of selection of KMS Encrypted S3 objects.
-	SseKmsEncryptedObjects *SseKmsEncryptedObjects `type:"structure"`
-}
-
-// String returns the string representation
-func (s SourceSelectionCriteria) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s SourceSelectionCriteria) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *SourceSelectionCriteria) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "SourceSelectionCriteria"}
-	if s.SseKmsEncryptedObjects != nil {
-		if err := s.SseKmsEncryptedObjects.Validate(); err != nil {
-			invalidParams.AddNested("SseKmsEncryptedObjects", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetSseKmsEncryptedObjects sets the SseKmsEncryptedObjects field's value.
-func (s *SourceSelectionCriteria) SetSseKmsEncryptedObjects(v *SseKmsEncryptedObjects) *SourceSelectionCriteria {
-	s.SseKmsEncryptedObjects = v
-	return s
-}
-
-// Container for filter information of selection of KMS Encrypted S3 objects.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SseKmsEncryptedObjects
-type SseKmsEncryptedObjects struct {
-	_ struct{} `type:"structure"`
-
-	// The replication for KMS encrypted S3 objects is disabled if status is not
-	// Enabled.
-	//
-	// Status is a required field
-	Status *string `type:"string" required:"true" enum:"SseKmsEncryptedObjectsStatus"`
-}
-
-// String returns the string representation
-func (s SseKmsEncryptedObjects) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s SseKmsEncryptedObjects) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *SseKmsEncryptedObjects) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "SseKmsEncryptedObjects"}
-	if s.Status == nil {
-		invalidParams.Add(request.NewErrParamRequired("Status"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetStatus sets the Status field's value.
-func (s *SseKmsEncryptedObjects) SetStatus(v string) *SseKmsEncryptedObjects {
-	s.Status = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/StorageClassAnalysis
-type StorageClassAnalysis struct {
-	_ struct{} `type:"structure"`
-
-	// A container used to describe how data related to the storage class analysis
-	// should be exported.
-	DataExport *StorageClassAnalysisDataExport `type:"structure"`
-}
-
-// String returns the string representation
-func (s StorageClassAnalysis) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s StorageClassAnalysis) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *StorageClassAnalysis) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "StorageClassAnalysis"}
-	if s.DataExport != nil {
-		if err := s.DataExport.Validate(); err != nil {
-			invalidParams.AddNested("DataExport", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetDataExport sets the DataExport field's value.
-func (s *StorageClassAnalysis) SetDataExport(v *StorageClassAnalysisDataExport) *StorageClassAnalysis {
-	s.DataExport = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/StorageClassAnalysisDataExport
-type StorageClassAnalysisDataExport struct {
-	_ struct{} `type:"structure"`
-
-	// The place to store the data for an analysis.
-	//
-	// Destination is a required field
-	Destination *AnalyticsExportDestination `type:"structure" required:"true"`
-
-	// The version of the output schema to use when exporting data. Must be V_1.
-	//
-	// OutputSchemaVersion is a required field
-	OutputSchemaVersion *string `type:"string" required:"true" enum:"StorageClassAnalysisSchemaVersion"`
-}
-
-// String returns the string representation
-func (s StorageClassAnalysisDataExport) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s StorageClassAnalysisDataExport) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *StorageClassAnalysisDataExport) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "StorageClassAnalysisDataExport"}
-	if s.Destination == nil {
-		invalidParams.Add(request.NewErrParamRequired("Destination"))
-	}
-	if s.OutputSchemaVersion == nil {
-		invalidParams.Add(request.NewErrParamRequired("OutputSchemaVersion"))
-	}
-	if s.Destination != nil {
-		if err := s.Destination.Validate(); err != nil {
-			invalidParams.AddNested("Destination", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetDestination sets the Destination field's value.
-func (s *StorageClassAnalysisDataExport) SetDestination(v *AnalyticsExportDestination) *StorageClassAnalysisDataExport {
-	s.Destination = v
-	return s
-}
-
-// SetOutputSchemaVersion sets the OutputSchemaVersion field's value.
-func (s *StorageClassAnalysisDataExport) SetOutputSchemaVersion(v string) *StorageClassAnalysisDataExport {
-	s.OutputSchemaVersion = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Tag
-type Tag struct {
-	_ struct{} `type:"structure"`
-
-	// Name of the tag.
-	//
-	// Key is a required field
-	Key *string `min:"1" type:"string" required:"true"`
-
-	// Value of the tag.
-	//
-	// Value is a required field
-	Value *string `type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s Tag) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Tag) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *Tag) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "Tag"}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-	if s.Value == nil {
-		invalidParams.Add(request.NewErrParamRequired("Value"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetKey sets the Key field's value.
-func (s *Tag) SetKey(v string) *Tag {
-	s.Key = &v
-	return s
-}
-
-// SetValue sets the Value field's value.
-func (s *Tag) SetValue(v string) *Tag {
-	s.Value = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Tagging
-type Tagging struct {
-	_ struct{} `type:"structure"`
-
-	// TagSet is a required field
-	TagSet []*Tag `locationNameList:"Tag" type:"list" required:"true"`
-}
-
-// String returns the string representation
-func (s Tagging) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Tagging) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *Tagging) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "Tagging"}
-	if s.TagSet == nil {
-		invalidParams.Add(request.NewErrParamRequired("TagSet"))
-	}
-	if s.TagSet != nil {
-		for i, v := range s.TagSet {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "TagSet", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetTagSet sets the TagSet field's value.
-func (s *Tagging) SetTagSet(v []*Tag) *Tagging {
-	s.TagSet = v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/TargetGrant
-type TargetGrant struct {
-	_ struct{} `type:"structure"`
-
-	Grantee *Grantee `type:"structure" xmlPrefix:"xsi" xmlURI:"http://www.w3.org/2001/XMLSchema-instance"`
-
-	// Logging permissions assigned to the Grantee for the bucket.
-	Permission *string `type:"string" enum:"BucketLogsPermission"`
-}
-
-// String returns the string representation
-func (s TargetGrant) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s TargetGrant) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *TargetGrant) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "TargetGrant"}
-	if s.Grantee != nil {
-		if err := s.Grantee.Validate(); err != nil {
-			invalidParams.AddNested("Grantee", err.(request.ErrInvalidParams))
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetGrantee sets the Grantee field's value.
-func (s *TargetGrant) SetGrantee(v *Grantee) *TargetGrant {
-	s.Grantee = v
-	return s
-}
-
-// SetPermission sets the Permission field's value.
-func (s *TargetGrant) SetPermission(v string) *TargetGrant {
-	s.Permission = &v
-	return s
-}
-
-// Container for specifying the configuration when you want Amazon S3 to publish
-// events to an Amazon Simple Notification Service (Amazon SNS) topic.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/TopicConfiguration
-type TopicConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// Events is a required field
-	Events []*string `locationName:"Event" type:"list" flattened:"true" required:"true"`
-
-	// Container for object key name filtering rules. For information about key
-	// name filtering, go to Configuring Event Notifications (http://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
-	Filter *NotificationConfigurationFilter `type:"structure"`
-
-	// Optional unique identifier for configurations in a notification configuration.
-	// If you don't provide one, Amazon S3 will assign an ID.
-	Id *string `type:"string"`
-
-	// Amazon SNS topic ARN to which Amazon S3 will publish a message when it detects
-	// events of specified type.
-	//
-	// TopicArn is a required field
-	TopicArn *string `locationName:"Topic" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s TopicConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s TopicConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *TopicConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "TopicConfiguration"}
-	if s.Events == nil {
-		invalidParams.Add(request.NewErrParamRequired("Events"))
-	}
-	if s.TopicArn == nil {
-		invalidParams.Add(request.NewErrParamRequired("TopicArn"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetEvents sets the Events field's value.
-func (s *TopicConfiguration) SetEvents(v []*string) *TopicConfiguration {
-	s.Events = v
-	return s
-}
-
-// SetFilter sets the Filter field's value.
-func (s *TopicConfiguration) SetFilter(v *NotificationConfigurationFilter) *TopicConfiguration {
-	s.Filter = v
-	return s
-}
-
-// SetId sets the Id field's value.
-func (s *TopicConfiguration) SetId(v string) *TopicConfiguration {
-	s.Id = &v
-	return s
-}
-
-// SetTopicArn sets the TopicArn field's value.
-func (s *TopicConfiguration) SetTopicArn(v string) *TopicConfiguration {
-	s.TopicArn = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/TopicConfigurationDeprecated
-type TopicConfigurationDeprecated struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket event for which to send notifications.
-	Event *string `deprecated:"true" type:"string" enum:"Event"`
-
-	Events []*string `locationName:"Event" type:"list" flattened:"true"`
-
-	// Optional unique identifier for configurations in a notification configuration.
-	// If you don't provide one, Amazon S3 will assign an ID.
-	Id *string `type:"string"`
-
-	// Amazon SNS topic to which Amazon S3 will publish a message to report the
-	// specified events for the bucket.
-	Topic *string `type:"string"`
-}
-
-// String returns the string representation
-func (s TopicConfigurationDeprecated) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s TopicConfigurationDeprecated) GoString() string {
-	return s.String()
-}
-
-// SetEvent sets the Event field's value.
-func (s *TopicConfigurationDeprecated) SetEvent(v string) *TopicConfigurationDeprecated {
-	s.Event = &v
-	return s
-}
-
-// SetEvents sets the Events field's value.
-func (s *TopicConfigurationDeprecated) SetEvents(v []*string) *TopicConfigurationDeprecated {
-	s.Events = v
-	return s
-}
-
-// SetId sets the Id field's value.
-func (s *TopicConfigurationDeprecated) SetId(v string) *TopicConfigurationDeprecated {
-	s.Id = &v
-	return s
-}
-
-// SetTopic sets the Topic field's value.
-func (s *TopicConfigurationDeprecated) SetTopic(v string) *TopicConfigurationDeprecated {
-	s.Topic = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Transition
-type Transition struct {
-	_ struct{} `type:"structure"`
-
-	// Indicates at what date the object is to be moved or deleted. Should be in
-	// GMT ISO 8601 Format.
-	Date *time.Time `type:"timestamp" timestampFormat:"iso8601"`
-
-	// Indicates the lifetime, in days, of the objects that are subject to the rule.
-	// The value must be a non-zero positive integer.
-	Days *int64 `type:"integer"`
-
-	// The class of storage used to store the object.
-	StorageClass *string `type:"string" enum:"TransitionStorageClass"`
-}
-
-// String returns the string representation
-func (s Transition) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Transition) GoString() string {
-	return s.String()
-}
-
-// SetDate sets the Date field's value.
-func (s *Transition) SetDate(v time.Time) *Transition {
-	s.Date = &v
-	return s
-}
-
-// SetDays sets the Days field's value.
-func (s *Transition) SetDays(v int64) *Transition {
-	s.Days = &v
-	return s
-}
-
-// SetStorageClass sets the StorageClass field's value.
-func (s *Transition) SetStorageClass(v string) *Transition {
-	s.StorageClass = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartCopyRequest
-type UploadPartCopyInput struct {
-	_ struct{} `type:"structure"`
-
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// The name of the source bucket and key name of the source object, separated
-	// by a slash (/). Must be URL-encoded.
-	//
-	// CopySource is a required field
-	CopySource *string `location:"header" locationName:"x-amz-copy-source" type:"string" required:"true"`
-
-	// Copies the object if its entity tag (ETag) matches the specified tag.
-	CopySourceIfMatch *string `location:"header" locationName:"x-amz-copy-source-if-match" type:"string"`
-
-	// Copies the object if it has been modified since the specified time.
-	CopySourceIfModifiedSince *time.Time `location:"header" locationName:"x-amz-copy-source-if-modified-since" type:"timestamp" timestampFormat:"rfc822"`
-
-	// Copies the object if its entity tag (ETag) is different than the specified
-	// ETag.
-	CopySourceIfNoneMatch *string `location:"header" locationName:"x-amz-copy-source-if-none-match" type:"string"`
-
-	// Copies the object if it hasn't been modified since the specified time.
-	CopySourceIfUnmodifiedSince *time.Time `location:"header" locationName:"x-amz-copy-source-if-unmodified-since" type:"timestamp" timestampFormat:"rfc822"`
-
-	// The range of bytes to copy from the source object. The range value must use
-	// the form bytes=first-last, where the first and last are the zero-based byte
-	// offsets to copy. For example, bytes=0-9 indicates that you want to copy the
-	// first ten bytes of the source. You can copy a range only if the source object
-	// is greater than 5 GB.
-	CopySourceRange *string `location:"header" locationName:"x-amz-copy-source-range" type:"string"`
-
-	// Specifies the algorithm to use when decrypting the source object (e.g., AES256).
-	CopySourceSSECustomerAlgorithm *string `location:"header" locationName:"x-amz-copy-source-server-side-encryption-customer-algorithm" type:"string"`
-
-	// Specifies the customer-provided encryption key for Amazon S3 to use to decrypt
-	// the source object. The encryption key provided in this header must be one
-	// that was used when the source object was created.
-	CopySourceSSECustomerKey *string `location:"header" locationName:"x-amz-copy-source-server-side-encryption-customer-key" type:"string"`
-
-	// Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321.
-	// Amazon S3 uses this header for a message integrity check to ensure the encryption
-	// key was transmitted without error.
-	CopySourceSSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-copy-source-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// Part number of part being copied. This is a positive integer between 1 and
-	// 10,000.
-	//
-	// PartNumber is a required field
-	PartNumber *int64 `location:"querystring" locationName:"partNumber" type:"integer" required:"true"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// Specifies the algorithm to use to when encrypting the object (e.g., AES256).
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// Specifies the customer-provided encryption key for Amazon S3 to use in encrypting
-	// data. This value is used to store the object and then it is discarded; Amazon
-	// does not store the encryption key. The key must be appropriate for use with
-	// the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm
-	// header. This must be the same encryption key specified in the initiate multipart
-	// upload request.
-	SSECustomerKey *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key" type:"string"`
-
-	// Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321.
-	// Amazon S3 uses this header for a message integrity check to ensure the encryption
-	// key was transmitted without error.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// Upload ID identifying the multipart upload whose part is being copied.
-	//
-	// UploadId is a required field
-	UploadId *string `location:"querystring" locationName:"uploadId" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s UploadPartCopyInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s UploadPartCopyInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *UploadPartCopyInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "UploadPartCopyInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.CopySource == nil {
-		invalidParams.Add(request.NewErrParamRequired("CopySource"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-	if s.PartNumber == nil {
-		invalidParams.Add(request.NewErrParamRequired("PartNumber"))
-	}
-	if s.UploadId == nil {
-		invalidParams.Add(request.NewErrParamRequired("UploadId"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *UploadPartCopyInput) SetBucket(v string) *UploadPartCopyInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *UploadPartCopyInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetCopySource sets the CopySource field's value.
-func (s *UploadPartCopyInput) SetCopySource(v string) *UploadPartCopyInput {
-	s.CopySource = &v
-	return s
-}
-
-// SetCopySourceIfMatch sets the CopySourceIfMatch field's value.
-func (s *UploadPartCopyInput) SetCopySourceIfMatch(v string) *UploadPartCopyInput {
-	s.CopySourceIfMatch = &v
-	return s
-}
-
-// SetCopySourceIfModifiedSince sets the CopySourceIfModifiedSince field's value.
-func (s *UploadPartCopyInput) SetCopySourceIfModifiedSince(v time.Time) *UploadPartCopyInput {
-	s.CopySourceIfModifiedSince = &v
-	return s
-}
-
-// SetCopySourceIfNoneMatch sets the CopySourceIfNoneMatch field's value.
-func (s *UploadPartCopyInput) SetCopySourceIfNoneMatch(v string) *UploadPartCopyInput {
-	s.CopySourceIfNoneMatch = &v
-	return s
-}
-
-// SetCopySourceIfUnmodifiedSince sets the CopySourceIfUnmodifiedSince field's value.
-func (s *UploadPartCopyInput) SetCopySourceIfUnmodifiedSince(v time.Time) *UploadPartCopyInput {
-	s.CopySourceIfUnmodifiedSince = &v
-	return s
-}
-
-// SetCopySourceRange sets the CopySourceRange field's value.
-func (s *UploadPartCopyInput) SetCopySourceRange(v string) *UploadPartCopyInput {
-	s.CopySourceRange = &v
-	return s
-}
-
-// SetCopySourceSSECustomerAlgorithm sets the CopySourceSSECustomerAlgorithm field's value.
-func (s *UploadPartCopyInput) SetCopySourceSSECustomerAlgorithm(v string) *UploadPartCopyInput {
-	s.CopySourceSSECustomerAlgorithm = &v
-	return s
-}
-
-// SetCopySourceSSECustomerKey sets the CopySourceSSECustomerKey field's value.
-func (s *UploadPartCopyInput) SetCopySourceSSECustomerKey(v string) *UploadPartCopyInput {
-	s.CopySourceSSECustomerKey = &v
-	return s
-}
-
-func (s *UploadPartCopyInput) getCopySourceSSECustomerKey() (v string) {
-	if s.CopySourceSSECustomerKey == nil {
-		return v
-	}
-	return *s.CopySourceSSECustomerKey
-}
-
-// SetCopySourceSSECustomerKeyMD5 sets the CopySourceSSECustomerKeyMD5 field's value.
-func (s *UploadPartCopyInput) SetCopySourceSSECustomerKeyMD5(v string) *UploadPartCopyInput {
-	s.CopySourceSSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *UploadPartCopyInput) SetKey(v string) *UploadPartCopyInput {
-	s.Key = &v
-	return s
-}
-
-// SetPartNumber sets the PartNumber field's value.
-func (s *UploadPartCopyInput) SetPartNumber(v int64) *UploadPartCopyInput {
-	s.PartNumber = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *UploadPartCopyInput) SetRequestPayer(v string) *UploadPartCopyInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *UploadPartCopyInput) SetSSECustomerAlgorithm(v string) *UploadPartCopyInput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKey sets the SSECustomerKey field's value.
-func (s *UploadPartCopyInput) SetSSECustomerKey(v string) *UploadPartCopyInput {
-	s.SSECustomerKey = &v
-	return s
-}
-
-func (s *UploadPartCopyInput) getSSECustomerKey() (v string) {
-	if s.SSECustomerKey == nil {
-		return v
-	}
-	return *s.SSECustomerKey
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *UploadPartCopyInput) SetSSECustomerKeyMD5(v string) *UploadPartCopyInput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetUploadId sets the UploadId field's value.
-func (s *UploadPartCopyInput) SetUploadId(v string) *UploadPartCopyInput {
-	s.UploadId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartCopyOutput
-type UploadPartCopyOutput struct {
-	_ struct{} `type:"structure" payload:"CopyPartResult"`
-
-	CopyPartResult *CopyPartResult `type:"structure"`
-
-	// The version of the source object that was copied, if you have enabled versioning
-	// on the source bucket.
-	CopySourceVersionId *string `location:"header" locationName:"x-amz-copy-source-version-id" type:"string"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header confirming the encryption algorithm
-	// used.
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header to provide round trip message integrity
-	// verification of the customer-provided encryption key.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// If present, specifies the ID of the AWS Key Management Service (KMS) master
-	// encryption key that was used for the object.
-	SSEKMSKeyId *string `location:"header" locationName:"x-amz-server-side-encryption-aws-kms-key-id" type:"string"`
-
-	// The Server-side encryption algorithm used when storing this object in S3
-	// (e.g., AES256, aws:kms).
-	ServerSideEncryption *string `location:"header" locationName:"x-amz-server-side-encryption" type:"string" enum:"ServerSideEncryption"`
-}
-
-// String returns the string representation
-func (s UploadPartCopyOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s UploadPartCopyOutput) GoString() string {
-	return s.String()
-}
-
-// SetCopyPartResult sets the CopyPartResult field's value.
-func (s *UploadPartCopyOutput) SetCopyPartResult(v *CopyPartResult) *UploadPartCopyOutput {
-	s.CopyPartResult = v
-	return s
-}
-
-// SetCopySourceVersionId sets the CopySourceVersionId field's value.
-func (s *UploadPartCopyOutput) SetCopySourceVersionId(v string) *UploadPartCopyOutput {
-	s.CopySourceVersionId = &v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *UploadPartCopyOutput) SetRequestCharged(v string) *UploadPartCopyOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *UploadPartCopyOutput) SetSSECustomerAlgorithm(v string) *UploadPartCopyOutput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *UploadPartCopyOutput) SetSSECustomerKeyMD5(v string) *UploadPartCopyOutput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetSSEKMSKeyId sets the SSEKMSKeyId field's value.
-func (s *UploadPartCopyOutput) SetSSEKMSKeyId(v string) *UploadPartCopyOutput {
-	s.SSEKMSKeyId = &v
-	return s
-}
-
-// SetServerSideEncryption sets the ServerSideEncryption field's value.
-func (s *UploadPartCopyOutput) SetServerSideEncryption(v string) *UploadPartCopyOutput {
-	s.ServerSideEncryption = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartRequest
-type UploadPartInput struct {
-	_ struct{} `type:"structure" payload:"Body"`
-
-	// Object data.
-	Body io.ReadSeeker `type:"blob"`
-
-	// Name of the bucket to which the multipart upload was initiated.
-	//
-	// Bucket is a required field
-	Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
-
-	// Size of the body in bytes. This parameter is useful when the size of the
-	// body cannot be determined automatically.
-	ContentLength *int64 `location:"header" locationName:"Content-Length" type:"long"`
-
-	// The base64-encoded 128-bit MD5 digest of the part data.
-	ContentMD5 *string `location:"header" locationName:"Content-MD5" type:"string"`
-
-	// Object key for which the multipart upload was initiated.
-	//
-	// Key is a required field
-	Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
-
-	// Part number of part being uploaded. This is a positive integer between 1
-	// and 10,000.
-	//
-	// PartNumber is a required field
-	PartNumber *int64 `location:"querystring" locationName:"partNumber" type:"integer" required:"true"`
-
-	// Confirms that the requester knows that she or he will be charged for the
-	// request. Bucket owners need not specify this parameter in their requests.
-	// Documentation on downloading objects from requester pays buckets can be found
-	// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-	RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
-
-	// Specifies the algorithm to use to when encrypting the object (e.g., AES256).
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// Specifies the customer-provided encryption key for Amazon S3 to use in encrypting
-	// data. This value is used to store the object and then it is discarded; Amazon
-	// does not store the encryption key. The key must be appropriate for use with
-	// the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm
-	// header. This must be the same encryption key specified in the initiate multipart
-	// upload request.
-	SSECustomerKey *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key" type:"string"`
-
-	// Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321.
-	// Amazon S3 uses this header for a message integrity check to ensure the encryption
-	// key was transmitted without error.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// Upload ID identifying the multipart upload whose part is being uploaded.
-	//
-	// UploadId is a required field
-	UploadId *string `location:"querystring" locationName:"uploadId" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s UploadPartInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s UploadPartInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *UploadPartInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "UploadPartInput"}
-	if s.Bucket == nil {
-		invalidParams.Add(request.NewErrParamRequired("Bucket"))
-	}
-	if s.Key == nil {
-		invalidParams.Add(request.NewErrParamRequired("Key"))
-	}
-	if s.Key != nil && len(*s.Key) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Key", 1))
-	}
-	if s.PartNumber == nil {
-		invalidParams.Add(request.NewErrParamRequired("PartNumber"))
-	}
-	if s.UploadId == nil {
-		invalidParams.Add(request.NewErrParamRequired("UploadId"))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetBody sets the Body field's value.
-func (s *UploadPartInput) SetBody(v io.ReadSeeker) *UploadPartInput {
-	s.Body = v
-	return s
-}
-
-// SetBucket sets the Bucket field's value.
-func (s *UploadPartInput) SetBucket(v string) *UploadPartInput {
-	s.Bucket = &v
-	return s
-}
-
-func (s *UploadPartInput) getBucket() (v string) {
-	if s.Bucket == nil {
-		return v
-	}
-	return *s.Bucket
-}
-
-// SetContentLength sets the ContentLength field's value.
-func (s *UploadPartInput) SetContentLength(v int64) *UploadPartInput {
-	s.ContentLength = &v
-	return s
-}
-
-// SetContentMD5 sets the ContentMD5 field's value.
-func (s *UploadPartInput) SetContentMD5(v string) *UploadPartInput {
-	s.ContentMD5 = &v
-	return s
-}
-
-// SetKey sets the Key field's value.
-func (s *UploadPartInput) SetKey(v string) *UploadPartInput {
-	s.Key = &v
-	return s
-}
-
-// SetPartNumber sets the PartNumber field's value.
-func (s *UploadPartInput) SetPartNumber(v int64) *UploadPartInput {
-	s.PartNumber = &v
-	return s
-}
-
-// SetRequestPayer sets the RequestPayer field's value.
-func (s *UploadPartInput) SetRequestPayer(v string) *UploadPartInput {
-	s.RequestPayer = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *UploadPartInput) SetSSECustomerAlgorithm(v string) *UploadPartInput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKey sets the SSECustomerKey field's value.
-func (s *UploadPartInput) SetSSECustomerKey(v string) *UploadPartInput {
-	s.SSECustomerKey = &v
-	return s
-}
-
-func (s *UploadPartInput) getSSECustomerKey() (v string) {
-	if s.SSECustomerKey == nil {
-		return v
-	}
-	return *s.SSECustomerKey
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *UploadPartInput) SetSSECustomerKeyMD5(v string) *UploadPartInput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetUploadId sets the UploadId field's value.
-func (s *UploadPartInput) SetUploadId(v string) *UploadPartInput {
-	s.UploadId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartOutput
-type UploadPartOutput struct {
-	_ struct{} `type:"structure"`
-
-	// Entity tag for the uploaded object.
-	ETag *string `location:"header" locationName:"ETag" type:"string"`
-
-	// If present, indicates that the requester was successfully charged for the
-	// request.
-	RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header confirming the encryption algorithm
-	// used.
-	SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
-
-	// If server-side encryption with a customer-provided encryption key was requested,
-	// the response will include this header to provide round trip message integrity
-	// verification of the customer-provided encryption key.
-	SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
-
-	// If present, specifies the ID of the AWS Key Management Service (KMS) master
-	// encryption key that was used for the object.
-	SSEKMSKeyId *string `location:"header" locationName:"x-amz-server-side-encryption-aws-kms-key-id" type:"string"`
-
-	// The Server-side encryption algorithm used when storing this object in S3
-	// (e.g., AES256, aws:kms).
-	ServerSideEncryption *string `location:"header" locationName:"x-amz-server-side-encryption" type:"string" enum:"ServerSideEncryption"`
-}
-
-// String returns the string representation
-func (s UploadPartOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s UploadPartOutput) GoString() string {
-	return s.String()
-}
-
-// SetETag sets the ETag field's value.
-func (s *UploadPartOutput) SetETag(v string) *UploadPartOutput {
-	s.ETag = &v
-	return s
-}
-
-// SetRequestCharged sets the RequestCharged field's value.
-func (s *UploadPartOutput) SetRequestCharged(v string) *UploadPartOutput {
-	s.RequestCharged = &v
-	return s
-}
-
-// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
-func (s *UploadPartOutput) SetSSECustomerAlgorithm(v string) *UploadPartOutput {
-	s.SSECustomerAlgorithm = &v
-	return s
-}
-
-// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
-func (s *UploadPartOutput) SetSSECustomerKeyMD5(v string) *UploadPartOutput {
-	s.SSECustomerKeyMD5 = &v
-	return s
-}
-
-// SetSSEKMSKeyId sets the SSEKMSKeyId field's value.
-func (s *UploadPartOutput) SetSSEKMSKeyId(v string) *UploadPartOutput {
-	s.SSEKMSKeyId = &v
-	return s
-}
-
-// SetServerSideEncryption sets the ServerSideEncryption field's value.
-func (s *UploadPartOutput) SetServerSideEncryption(v string) *UploadPartOutput {
-	s.ServerSideEncryption = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/VersioningConfiguration
-type VersioningConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	// Specifies whether MFA delete is enabled in the bucket versioning configuration.
-	// This element is only returned if the bucket has been configured with MFA
-	// delete. If the bucket has never been so configured, this element is not returned.
-	MFADelete *string `locationName:"MfaDelete" type:"string" enum:"MFADelete"`
-
-	// The versioning state of the bucket.
-	Status *string `type:"string" enum:"BucketVersioningStatus"`
-}
-
-// String returns the string representation
-func (s VersioningConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s VersioningConfiguration) GoString() string {
-	return s.String()
-}
-
-// SetMFADelete sets the MFADelete field's value.
-func (s *VersioningConfiguration) SetMFADelete(v string) *VersioningConfiguration {
-	s.MFADelete = &v
-	return s
-}
-
-// SetStatus sets the Status field's value.
-func (s *VersioningConfiguration) SetStatus(v string) *VersioningConfiguration {
-	s.Status = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/WebsiteConfiguration
-type WebsiteConfiguration struct {
-	_ struct{} `type:"structure"`
-
-	ErrorDocument *ErrorDocument `type:"structure"`
-
-	IndexDocument *IndexDocument `type:"structure"`
-
-	RedirectAllRequestsTo *RedirectAllRequestsTo `type:"structure"`
-
-	RoutingRules []*RoutingRule `locationNameList:"RoutingRule" type:"list"`
-}
-
-// String returns the string representation
-func (s WebsiteConfiguration) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s WebsiteConfiguration) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *WebsiteConfiguration) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "WebsiteConfiguration"}
-	if s.ErrorDocument != nil {
-		if err := s.ErrorDocument.Validate(); err != nil {
-			invalidParams.AddNested("ErrorDocument", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.IndexDocument != nil {
-		if err := s.IndexDocument.Validate(); err != nil {
-			invalidParams.AddNested("IndexDocument", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.RedirectAllRequestsTo != nil {
-		if err := s.RedirectAllRequestsTo.Validate(); err != nil {
-			invalidParams.AddNested("RedirectAllRequestsTo", err.(request.ErrInvalidParams))
-		}
-	}
-	if s.RoutingRules != nil {
-		for i, v := range s.RoutingRules {
-			if v == nil {
-				continue
-			}
-			if err := v.Validate(); err != nil {
-				invalidParams.AddNested(fmt.Sprintf("%s[%v]", "RoutingRules", i), err.(request.ErrInvalidParams))
-			}
-		}
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetErrorDocument sets the ErrorDocument field's value.
-func (s *WebsiteConfiguration) SetErrorDocument(v *ErrorDocument) *WebsiteConfiguration {
-	s.ErrorDocument = v
-	return s
-}
-
-// SetIndexDocument sets the IndexDocument field's value.
-func (s *WebsiteConfiguration) SetIndexDocument(v *IndexDocument) *WebsiteConfiguration {
-	s.IndexDocument = v
-	return s
-}
-
-// SetRedirectAllRequestsTo sets the RedirectAllRequestsTo field's value.
-func (s *WebsiteConfiguration) SetRedirectAllRequestsTo(v *RedirectAllRequestsTo) *WebsiteConfiguration {
-	s.RedirectAllRequestsTo = v
-	return s
-}
-
-// SetRoutingRules sets the RoutingRules field's value.
-func (s *WebsiteConfiguration) SetRoutingRules(v []*RoutingRule) *WebsiteConfiguration {
-	s.RoutingRules = v
-	return s
-}
-
-const (
-	// AnalyticsS3ExportFileFormatCsv is a AnalyticsS3ExportFileFormat enum value
-	AnalyticsS3ExportFileFormatCsv = "CSV"
-)
-
-const (
-	// BucketAccelerateStatusEnabled is a BucketAccelerateStatus enum value
-	BucketAccelerateStatusEnabled = "Enabled"
-
-	// BucketAccelerateStatusSuspended is a BucketAccelerateStatus enum value
-	BucketAccelerateStatusSuspended = "Suspended"
-)
-
-const (
-	// BucketCannedACLPrivate is a BucketCannedACL enum value
-	BucketCannedACLPrivate = "private"
-
-	// BucketCannedACLPublicRead is a BucketCannedACL enum value
-	BucketCannedACLPublicRead = "public-read"
-
-	// BucketCannedACLPublicReadWrite is a BucketCannedACL enum value
-	BucketCannedACLPublicReadWrite = "public-read-write"
-
-	// BucketCannedACLAuthenticatedRead is a BucketCannedACL enum value
-	BucketCannedACLAuthenticatedRead = "authenticated-read"
-)
-
-const (
-	// BucketLocationConstraintEu is a BucketLocationConstraint enum value
-	BucketLocationConstraintEu = "EU"
-
-	// BucketLocationConstraintEuWest1 is a BucketLocationConstraint enum value
-	BucketLocationConstraintEuWest1 = "eu-west-1"
-
-	// BucketLocationConstraintUsWest1 is a BucketLocationConstraint enum value
-	BucketLocationConstraintUsWest1 = "us-west-1"
-
-	// BucketLocationConstraintUsWest2 is a BucketLocationConstraint enum value
-	BucketLocationConstraintUsWest2 = "us-west-2"
-
-	// BucketLocationConstraintApSouth1 is a BucketLocationConstraint enum value
-	BucketLocationConstraintApSouth1 = "ap-south-1"
-
-	// BucketLocationConstraintApSoutheast1 is a BucketLocationConstraint enum value
-	BucketLocationConstraintApSoutheast1 = "ap-southeast-1"
-
-	// BucketLocationConstraintApSoutheast2 is a BucketLocationConstraint enum value
-	BucketLocationConstraintApSoutheast2 = "ap-southeast-2"
-
-	// BucketLocationConstraintApNortheast1 is a BucketLocationConstraint enum value
-	BucketLocationConstraintApNortheast1 = "ap-northeast-1"
-
-	// BucketLocationConstraintSaEast1 is a BucketLocationConstraint enum value
-	BucketLocationConstraintSaEast1 = "sa-east-1"
-
-	// BucketLocationConstraintCnNorth1 is a BucketLocationConstraint enum value
-	BucketLocationConstraintCnNorth1 = "cn-north-1"
-
-	// BucketLocationConstraintEuCentral1 is a BucketLocationConstraint enum value
-	BucketLocationConstraintEuCentral1 = "eu-central-1"
-)
-
-const (
-	// BucketLogsPermissionFullControl is a BucketLogsPermission enum value
-	BucketLogsPermissionFullControl = "FULL_CONTROL"
-
-	// BucketLogsPermissionRead is a BucketLogsPermission enum value
-	BucketLogsPermissionRead = "READ"
-
-	// BucketLogsPermissionWrite is a BucketLogsPermission enum value
-	BucketLogsPermissionWrite = "WRITE"
-)
-
-const (
-	// BucketVersioningStatusEnabled is a BucketVersioningStatus enum value
-	BucketVersioningStatusEnabled = "Enabled"
-
-	// BucketVersioningStatusSuspended is a BucketVersioningStatus enum value
-	BucketVersioningStatusSuspended = "Suspended"
-)
-
-// Requests Amazon S3 to encode the object keys in the response and specifies
-// the encoding method to use. An object key may contain any Unicode character;
-// however, XML 1.0 parser cannot parse some characters, such as characters
-// with an ASCII value from 0 to 10. For characters that are not supported in
-// XML 1.0, you can add this parameter to request that Amazon S3 encode the
-// keys in the response.
-const (
-	// EncodingTypeUrl is a EncodingType enum value
-	EncodingTypeUrl = "url"
-)
-
-// Bucket event for which to send notifications.
-const (
-	// EventS3ReducedRedundancyLostObject is a Event enum value
-	EventS3ReducedRedundancyLostObject = "s3:ReducedRedundancyLostObject"
-
-	// EventS3ObjectCreated is a Event enum value
-	EventS3ObjectCreated = "s3:ObjectCreated:*"
-
-	// EventS3ObjectCreatedPut is a Event enum value
-	EventS3ObjectCreatedPut = "s3:ObjectCreated:Put"
-
-	// EventS3ObjectCreatedPost is a Event enum value
-	EventS3ObjectCreatedPost = "s3:ObjectCreated:Post"
-
-	// EventS3ObjectCreatedCopy is a Event enum value
-	EventS3ObjectCreatedCopy = "s3:ObjectCreated:Copy"
-
-	// EventS3ObjectCreatedCompleteMultipartUpload is a Event enum value
-	EventS3ObjectCreatedCompleteMultipartUpload = "s3:ObjectCreated:CompleteMultipartUpload"
-
-	// EventS3ObjectRemoved is a Event enum value
-	EventS3ObjectRemoved = "s3:ObjectRemoved:*"
-
-	// EventS3ObjectRemovedDelete is a Event enum value
-	EventS3ObjectRemovedDelete = "s3:ObjectRemoved:Delete"
-
-	// EventS3ObjectRemovedDeleteMarkerCreated is a Event enum value
-	EventS3ObjectRemovedDeleteMarkerCreated = "s3:ObjectRemoved:DeleteMarkerCreated"
-)
-
-const (
-	// ExpirationStatusEnabled is a ExpirationStatus enum value
-	ExpirationStatusEnabled = "Enabled"
-
-	// ExpirationStatusDisabled is a ExpirationStatus enum value
-	ExpirationStatusDisabled = "Disabled"
-)
-
-const (
-	// ExpressionTypeSql is a ExpressionType enum value
-	ExpressionTypeSql = "SQL"
-)
-
-const (
-	// FileHeaderInfoUse is a FileHeaderInfo enum value
-	FileHeaderInfoUse = "USE"
-
-	// FileHeaderInfoIgnore is a FileHeaderInfo enum value
-	FileHeaderInfoIgnore = "IGNORE"
-
-	// FileHeaderInfoNone is a FileHeaderInfo enum value
-	FileHeaderInfoNone = "NONE"
-)
-
-const (
-	// FilterRuleNamePrefix is a FilterRuleName enum value
-	FilterRuleNamePrefix = "prefix"
-
-	// FilterRuleNameSuffix is a FilterRuleName enum value
-	FilterRuleNameSuffix = "suffix"
-)
-
-const (
-	// InventoryFormatCsv is a InventoryFormat enum value
-	InventoryFormatCsv = "CSV"
-
-	// InventoryFormatOrc is a InventoryFormat enum value
-	InventoryFormatOrc = "ORC"
-)
-
-const (
-	// InventoryFrequencyDaily is a InventoryFrequency enum value
-	InventoryFrequencyDaily = "Daily"
-
-	// InventoryFrequencyWeekly is a InventoryFrequency enum value
-	InventoryFrequencyWeekly = "Weekly"
-)
-
-const (
-	// InventoryIncludedObjectVersionsAll is a InventoryIncludedObjectVersions enum value
-	InventoryIncludedObjectVersionsAll = "All"
-
-	// InventoryIncludedObjectVersionsCurrent is a InventoryIncludedObjectVersions enum value
-	InventoryIncludedObjectVersionsCurrent = "Current"
-)
-
-const (
-	// InventoryOptionalFieldSize is a InventoryOptionalField enum value
-	InventoryOptionalFieldSize = "Size"
-
-	// InventoryOptionalFieldLastModifiedDate is a InventoryOptionalField enum value
-	InventoryOptionalFieldLastModifiedDate = "LastModifiedDate"
-
-	// InventoryOptionalFieldStorageClass is a InventoryOptionalField enum value
-	InventoryOptionalFieldStorageClass = "StorageClass"
-
-	// InventoryOptionalFieldEtag is a InventoryOptionalField enum value
-	InventoryOptionalFieldEtag = "ETag"
-
-	// InventoryOptionalFieldIsMultipartUploaded is a InventoryOptionalField enum value
-	InventoryOptionalFieldIsMultipartUploaded = "IsMultipartUploaded"
-
-	// InventoryOptionalFieldReplicationStatus is a InventoryOptionalField enum value
-	InventoryOptionalFieldReplicationStatus = "ReplicationStatus"
-
-	// InventoryOptionalFieldEncryptionStatus is a InventoryOptionalField enum value
-	InventoryOptionalFieldEncryptionStatus = "EncryptionStatus"
-)
-
-const (
-	// MFADeleteEnabled is a MFADelete enum value
-	MFADeleteEnabled = "Enabled"
-
-	// MFADeleteDisabled is a MFADelete enum value
-	MFADeleteDisabled = "Disabled"
-)
-
-const (
-	// MFADeleteStatusEnabled is a MFADeleteStatus enum value
-	MFADeleteStatusEnabled = "Enabled"
-
-	// MFADeleteStatusDisabled is a MFADeleteStatus enum value
-	MFADeleteStatusDisabled = "Disabled"
-)
-
-const (
-	// MetadataDirectiveCopy is a MetadataDirective enum value
-	MetadataDirectiveCopy = "COPY"
-
-	// MetadataDirectiveReplace is a MetadataDirective enum value
-	MetadataDirectiveReplace = "REPLACE"
-)
-
-const (
-	// ObjectCannedACLPrivate is a ObjectCannedACL enum value
-	ObjectCannedACLPrivate = "private"
-
-	// ObjectCannedACLPublicRead is a ObjectCannedACL enum value
-	ObjectCannedACLPublicRead = "public-read"
-
-	// ObjectCannedACLPublicReadWrite is a ObjectCannedACL enum value
-	ObjectCannedACLPublicReadWrite = "public-read-write"
-
-	// ObjectCannedACLAuthenticatedRead is a ObjectCannedACL enum value
-	ObjectCannedACLAuthenticatedRead = "authenticated-read"
-
-	// ObjectCannedACLAwsExecRead is a ObjectCannedACL enum value
-	ObjectCannedACLAwsExecRead = "aws-exec-read"
-
-	// ObjectCannedACLBucketOwnerRead is a ObjectCannedACL enum value
-	ObjectCannedACLBucketOwnerRead = "bucket-owner-read"
-
-	// ObjectCannedACLBucketOwnerFullControl is a ObjectCannedACL enum value
-	ObjectCannedACLBucketOwnerFullControl = "bucket-owner-full-control"
-)
-
-const (
-	// ObjectStorageClassStandard is a ObjectStorageClass enum value
-	ObjectStorageClassStandard = "STANDARD"
-
-	// ObjectStorageClassReducedRedundancy is a ObjectStorageClass enum value
-	ObjectStorageClassReducedRedundancy = "REDUCED_REDUNDANCY"
-
-	// ObjectStorageClassGlacier is a ObjectStorageClass enum value
-	ObjectStorageClassGlacier = "GLACIER"
-)
-
-const (
-	// ObjectVersionStorageClassStandard is a ObjectVersionStorageClass enum value
-	ObjectVersionStorageClassStandard = "STANDARD"
-)
-
-const (
-	// OwnerOverrideDestination is a OwnerOverride enum value
-	OwnerOverrideDestination = "Destination"
-)
-
-const (
-	// PayerRequester is a Payer enum value
-	PayerRequester = "Requester"
-
-	// PayerBucketOwner is a Payer enum value
-	PayerBucketOwner = "BucketOwner"
-)
-
-const (
-	// PermissionFullControl is a Permission enum value
-	PermissionFullControl = "FULL_CONTROL"
-
-	// PermissionWrite is a Permission enum value
-	PermissionWrite = "WRITE"
-
-	// PermissionWriteAcp is a Permission enum value
-	PermissionWriteAcp = "WRITE_ACP"
-
-	// PermissionRead is a Permission enum value
-	PermissionRead = "READ"
-
-	// PermissionReadAcp is a Permission enum value
-	PermissionReadAcp = "READ_ACP"
-)
-
-const (
-	// ProtocolHttp is a Protocol enum value
-	ProtocolHttp = "http"
-
-	// ProtocolHttps is a Protocol enum value
-	ProtocolHttps = "https"
-)
-
-const (
-	// QuoteFieldsAlways is a QuoteFields enum value
-	QuoteFieldsAlways = "ALWAYS"
-
-	// QuoteFieldsAsneeded is a QuoteFields enum value
-	QuoteFieldsAsneeded = "ASNEEDED"
-)
-
-const (
-	// ReplicationRuleStatusEnabled is a ReplicationRuleStatus enum value
-	ReplicationRuleStatusEnabled = "Enabled"
-
-	// ReplicationRuleStatusDisabled is a ReplicationRuleStatus enum value
-	ReplicationRuleStatusDisabled = "Disabled"
-)
-
-const (
-	// ReplicationStatusComplete is a ReplicationStatus enum value
-	ReplicationStatusComplete = "COMPLETE"
-
-	// ReplicationStatusPending is a ReplicationStatus enum value
-	ReplicationStatusPending = "PENDING"
-
-	// ReplicationStatusFailed is a ReplicationStatus enum value
-	ReplicationStatusFailed = "FAILED"
-
-	// ReplicationStatusReplica is a ReplicationStatus enum value
-	ReplicationStatusReplica = "REPLICA"
-)
-
-// If present, indicates that the requester was successfully charged for the
-// request.
-const (
-	// RequestChargedRequester is a RequestCharged enum value
-	RequestChargedRequester = "requester"
-)
-
-// Confirms that the requester knows that she or he will be charged for the
-// request. Bucket owners need not specify this parameter in their requests.
-// Documentation on downloading objects from requester pays buckets can be found
-// at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
-const (
-	// RequestPayerRequester is a RequestPayer enum value
-	RequestPayerRequester = "requester"
-)
-
-const (
-	// RestoreRequestTypeSelect is a RestoreRequestType enum value
-	RestoreRequestTypeSelect = "SELECT"
-)
-
-const (
-	// ServerSideEncryptionAes256 is a ServerSideEncryption enum value
-	ServerSideEncryptionAes256 = "AES256"
-
-	// ServerSideEncryptionAwsKms is a ServerSideEncryption enum value
-	ServerSideEncryptionAwsKms = "aws:kms"
-)
-
-const (
-	// SseKmsEncryptedObjectsStatusEnabled is a SseKmsEncryptedObjectsStatus enum value
-	SseKmsEncryptedObjectsStatusEnabled = "Enabled"
-
-	// SseKmsEncryptedObjectsStatusDisabled is a SseKmsEncryptedObjectsStatus enum value
-	SseKmsEncryptedObjectsStatusDisabled = "Disabled"
-)
-
-const (
-	// StorageClassStandard is a StorageClass enum value
-	StorageClassStandard = "STANDARD"
-
-	// StorageClassReducedRedundancy is a StorageClass enum value
-	StorageClassReducedRedundancy = "REDUCED_REDUNDANCY"
-
-	// StorageClassStandardIa is a StorageClass enum value
-	StorageClassStandardIa = "STANDARD_IA"
-)
-
-const (
-	// StorageClassAnalysisSchemaVersionV1 is a StorageClassAnalysisSchemaVersion enum value
-	StorageClassAnalysisSchemaVersionV1 = "V_1"
-)
-
-const (
-	// TaggingDirectiveCopy is a TaggingDirective enum value
-	TaggingDirectiveCopy = "COPY"
-
-	// TaggingDirectiveReplace is a TaggingDirective enum value
-	TaggingDirectiveReplace = "REPLACE"
-)
-
-const (
-	// TierStandard is a Tier enum value
-	TierStandard = "Standard"
-
-	// TierBulk is a Tier enum value
-	TierBulk = "Bulk"
-
-	// TierExpedited is a Tier enum value
-	TierExpedited = "Expedited"
-)
-
-const (
-	// TransitionStorageClassGlacier is a TransitionStorageClass enum value
-	TransitionStorageClassGlacier = "GLACIER"
-
-	// TransitionStorageClassStandardIa is a TransitionStorageClass enum value
-	TransitionStorageClassStandardIa = "STANDARD_IA"
-)
-
-const (
-	// TypeCanonicalUser is a Type enum value
-	TypeCanonicalUser = "CanonicalUser"
-
-	// TypeAmazonCustomerByEmail is a Type enum value
-	TypeAmazonCustomerByEmail = "AmazonCustomerByEmail"
-
-	// TypeGroup is a Type enum value
-	TypeGroup = "Group"
-)
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/bucket_location.go b/vendor/github.com/aws/aws-sdk-go/service/s3/bucket_location.go
deleted file mode 100644
index bc68a46acf..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/bucket_location.go
+++ /dev/null
@@ -1,106 +0,0 @@
-package s3
-
-import (
-	"io/ioutil"
-	"regexp"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/awsutil"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-var reBucketLocation = regexp.MustCompile(`>([^<>]+)<\/Location`)
-
-// NormalizeBucketLocation is a utility function which will update the
-// passed in value to always be a region ID. Generally this would be used
-// with GetBucketLocation API operation.
-//
-// Replaces empty string with "us-east-1", and "EU" with "eu-west-1".
-//
-// See http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETlocation.html
-// for more information on the values that can be returned.
-func NormalizeBucketLocation(loc string) string {
-	switch loc {
-	case "":
-		loc = "us-east-1"
-	case "EU":
-		loc = "eu-west-1"
-	}
-
-	return loc
-}
-
-// NormalizeBucketLocationHandler is a request handler which will update the
-// GetBucketLocation's result LocationConstraint value to always be a region ID.
-//
-// Replaces empty string with "us-east-1", and "EU" with "eu-west-1".
-//
-// See http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETlocation.html
-// for more information on the values that can be returned.
-//
-//     req, result := svc.GetBucketLocationRequest(&s3.GetBucketLocationInput{
-//         Bucket: aws.String(bucket),
-//     })
-//     req.Handlers.Unmarshal.PushBackNamed(NormalizeBucketLocationHandler)
-//     err := req.Send()
-var NormalizeBucketLocationHandler = request.NamedHandler{
-	Name: "awssdk.s3.NormalizeBucketLocation",
-	Fn: func(req *request.Request) {
-		if req.Error != nil {
-			return
-		}
-
-		out := req.Data.(*GetBucketLocationOutput)
-		loc := NormalizeBucketLocation(aws.StringValue(out.LocationConstraint))
-		out.LocationConstraint = aws.String(loc)
-	},
-}
-
-// WithNormalizeBucketLocation is a request option which will update the
-// GetBucketLocation's result LocationConstraint value to always be a region ID.
-//
-// Replaces empty string with "us-east-1", and "EU" with "eu-west-1".
-//
-// See http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETlocation.html
-// for more information on the values that can be returned.
-//
-//     result, err := svc.GetBucketLocationWithContext(ctx,
-//         &s3.GetBucketLocationInput{
-//             Bucket: aws.String(bucket),
-//         },
-//         s3.WithNormalizeBucketLocation,
-//     )
-func WithNormalizeBucketLocation(r *request.Request) {
-	r.Handlers.Unmarshal.PushBackNamed(NormalizeBucketLocationHandler)
-}
-
-func buildGetBucketLocation(r *request.Request) {
-	if r.DataFilled() {
-		out := r.Data.(*GetBucketLocationOutput)
-		b, err := ioutil.ReadAll(r.HTTPResponse.Body)
-		if err != nil {
-			r.Error = awserr.New("SerializationError", "failed reading response body", err)
-			return
-		}
-
-		match := reBucketLocation.FindSubmatch(b)
-		if len(match) > 1 {
-			loc := string(match[1])
-			out.LocationConstraint = aws.String(loc)
-		}
-	}
-}
-
-func populateLocationConstraint(r *request.Request) {
-	if r.ParamsFilled() && aws.StringValue(r.Config.Region) != "us-east-1" {
-		in := r.Params.(*CreateBucketInput)
-		if in.CreateBucketConfiguration == nil {
-			r.Params = awsutil.CopyOf(r.Params)
-			in = r.Params.(*CreateBucketInput)
-			in.CreateBucketConfiguration = &CreateBucketConfiguration{
-				LocationConstraint: r.Config.Region,
-			}
-		}
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/content_md5.go b/vendor/github.com/aws/aws-sdk-go/service/s3/content_md5.go
deleted file mode 100644
index 9fc5df94d3..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/content_md5.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package s3
-
-import (
-	"crypto/md5"
-	"encoding/base64"
-	"io"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// contentMD5 computes and sets the HTTP Content-MD5 header for requests that
-// require it.
-func contentMD5(r *request.Request) {
-	h := md5.New()
-
-	// hash the body.  seek back to the first position after reading to reset
-	// the body for transmission.  copy errors may be assumed to be from the
-	// body.
-	_, err := io.Copy(h, r.Body)
-	if err != nil {
-		r.Error = awserr.New("ContentMD5", "failed to read body", err)
-		return
-	}
-	_, err = r.Body.Seek(0, 0)
-	if err != nil {
-		r.Error = awserr.New("ContentMD5", "failed to seek body", err)
-		return
-	}
-
-	// encode the md5 checksum in base64 and set the request header.
-	sum := h.Sum(nil)
-	sum64 := make([]byte, base64.StdEncoding.EncodedLen(len(sum)))
-	base64.StdEncoding.Encode(sum64, sum)
-	r.HTTPRequest.Header.Set("Content-MD5", string(sum64))
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/customizations.go b/vendor/github.com/aws/aws-sdk-go/service/s3/customizations.go
deleted file mode 100644
index 899d5e8d10..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/customizations.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package s3
-
-import (
-	"github.com/aws/aws-sdk-go/aws/client"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-func init() {
-	initClient = defaultInitClientFn
-	initRequest = defaultInitRequestFn
-}
-
-func defaultInitClientFn(c *client.Client) {
-	// Support building custom endpoints based on config
-	c.Handlers.Build.PushFront(updateEndpointForS3Config)
-
-	// Require SSL when using SSE keys
-	c.Handlers.Validate.PushBack(validateSSERequiresSSL)
-	c.Handlers.Build.PushBack(computeSSEKeys)
-
-	// S3 uses custom error unmarshaling logic
-	c.Handlers.UnmarshalError.Clear()
-	c.Handlers.UnmarshalError.PushBack(unmarshalError)
-}
-
-func defaultInitRequestFn(r *request.Request) {
-	// Add reuest handlers for specific platforms.
-	// e.g. 100-continue support for PUT requests using Go 1.6
-	platformRequestHandlers(r)
-
-	switch r.Operation.Name {
-	case opPutBucketCors, opPutBucketLifecycle, opPutBucketPolicy,
-		opPutBucketTagging, opDeleteObjects, opPutBucketLifecycleConfiguration,
-		opPutBucketReplication:
-		// These S3 operations require Content-MD5 to be set
-		r.Handlers.Build.PushBack(contentMD5)
-	case opGetBucketLocation:
-		// GetBucketLocation has custom parsing logic
-		r.Handlers.Unmarshal.PushFront(buildGetBucketLocation)
-	case opCreateBucket:
-		// Auto-populate LocationConstraint with current region
-		r.Handlers.Validate.PushFront(populateLocationConstraint)
-	case opCopyObject, opUploadPartCopy, opCompleteMultipartUpload:
-		r.Handlers.Unmarshal.PushFront(copyMultipartStatusOKUnmarhsalError)
-	}
-}
-
-// bucketGetter is an accessor interface to grab the "Bucket" field from
-// an S3 type.
-type bucketGetter interface {
-	getBucket() string
-}
-
-// sseCustomerKeyGetter is an accessor interface to grab the "SSECustomerKey"
-// field from an S3 type.
-type sseCustomerKeyGetter interface {
-	getSSECustomerKey() string
-}
-
-// copySourceSSECustomerKeyGetter is an accessor interface to grab the
-// "CopySourceSSECustomerKey" field from an S3 type.
-type copySourceSSECustomerKeyGetter interface {
-	getCopySourceSSECustomerKey() string
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/doc.go b/vendor/github.com/aws/aws-sdk-go/service/s3/doc.go
deleted file mode 100644
index 0def02255a..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/doc.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT.
-
-// Package s3 provides the client and types for making API
-// requests to Amazon Simple Storage Service.
-//
-// See https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01 for more information on this service.
-//
-// See s3 package documentation for more information.
-// https://docs.aws.amazon.com/sdk-for-go/api/service/s3/
-//
-// Using the Client
-//
-// To contact Amazon Simple Storage Service with the SDK use the New function to create
-// a new service client. With that client you can make API requests to the service.
-// These clients are safe to use concurrently.
-//
-// See the SDK's documentation for more information on how to use the SDK.
-// https://docs.aws.amazon.com/sdk-for-go/api/
-//
-// See aws.Config documentation for more information on configuring SDK clients.
-// https://docs.aws.amazon.com/sdk-for-go/api/aws/#Config
-//
-// See the Amazon Simple Storage Service client S3 for more
-// information on creating client for this service.
-// https://docs.aws.amazon.com/sdk-for-go/api/service/s3/#New
-package s3
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/doc_custom.go b/vendor/github.com/aws/aws-sdk-go/service/s3/doc_custom.go
deleted file mode 100644
index 39b912c260..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/doc_custom.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Upload Managers
-//
-// The s3manager package's Uploader provides concurrent upload of content to S3
-// by taking advantage of S3's Multipart APIs. The Uploader also supports both
-// io.Reader for streaming uploads, and will also take advantage of io.ReadSeeker
-// for optimizations if the Body satisfies that type. Once the Uploader instance
-// is created you can call Upload concurrently from multiple goroutines safely.
-//
-//   // The session the S3 Uploader will use
-//   sess := session.Must(session.NewSession())
-//
-//   // Create an uploader with the session and default options
-//   uploader := s3manager.NewUploader(sess)
-//
-//   f, err  := os.Open(filename)
-//   if err != nil {
-//       return fmt.Errorf("failed to open file %q, %v", filename, err)
-//   }
-//
-//   // Upload the file to S3.
-//   result, err := uploader.Upload(&s3manager.UploadInput{
-//       Bucket: aws.String(myBucket),
-//       Key:    aws.String(myString),
-//       Body:   f,
-//   })
-//   if err != nil {
-//       return fmt.Errorf("failed to upload file, %v", err)
-//   }
-//   fmt.Printf("file uploaded to, %s\n", aws.StringValue(result.Location))
-//
-// See the s3manager package's Uploader type documentation for more information.
-// https://docs.aws.amazon.com/sdk-for-go/api/service/s3/s3manager/#Uploader
-//
-// Download Manager
-//
-// The s3manager package's Downloader provides concurrently downloading of Objects
-// from S3. The Downloader will write S3 Object content with an io.WriterAt.
-// Once the Downloader instance is created you can call Download concurrently from
-// multiple goroutines safely.
-//
-//   // The session the S3 Downloader will use
-//   sess := session.Must(session.NewSession())
-//
-//   // Create a downloader with the session and default options
-//   downloader := s3manager.NewDownloader(sess)
-//
-//   // Create a file to write the S3 Object contents to.
-//   f, err := os.Create(filename)
-//   if err != nil {
-//       return fmt.Errorf("failed to create file %q, %v", filename, err)
-//   }
-//
-//   // Write the contents of S3 Object to the file
-//   n, err := downloader.Download(f, &s3.GetObjectInput{
-//       Bucket: aws.String(myBucket),
-//       Key:    aws.String(myString),
-//   })
-//   if err != nil {
-//       return fmt.Errorf("failed to download file, %v", err)
-//   }
-//   fmt.Printf("file downloaded, %d bytes\n", n)
-//
-// See the s3manager package's Downloader type documentation for more information.
-// https://docs.aws.amazon.com/sdk-for-go/api/service/s3/s3manager/#Downloader
-//
-// Get Bucket Region
-//
-// GetBucketRegion will attempt to get the region for a bucket using a region
-// hint to determine which AWS partition to perform the query on. Use this utility
-// to determine the region a bucket is in.
-//
-//   sess := session.Must(session.NewSession())
-//
-//   bucket := "my-bucket"
-//   region, err := s3manager.GetBucketRegion(ctx, sess, bucket, "us-west-2")
-//   if err != nil {
-//       if aerr, ok := err.(awserr.Error); ok && aerr.Code() == "NotFound" {
-//            fmt.Fprintf(os.Stderr, "unable to find bucket %s's region not found\n", bucket)
-//       }
-//       return err
-//   }
-//   fmt.Printf("Bucket %s is in %s region\n", bucket, region)
-//
-// See the s3manager package's GetBucketRegion function documentation for more information
-// https://docs.aws.amazon.com/sdk-for-go/api/service/s3/s3manager/#GetBucketRegion
-//
-// S3 Crypto Client
-//
-// The s3crypto package provides the tools to upload and download encrypted
-// content from S3. The Encryption and Decryption clients can be used concurrently
-// once the client is created.
-//
-//    sess := session.Must(session.NewSession())
-//
-//    // Create the decryption client.
-//    svc := s3crypto.NewDecryptionClient(sess)
-//
-//    // The object will be downloaded from S3 and decrypted locally. By metadata
-//    // about the object's encryption will instruct the decryption client how
-//    // decrypt the content of the object. By default KMS is used for keys.
-//    result, err := svc.GetObject(&s3.GetObjectInput {
-//        Bucket: aws.String(myBucket),
-//        Key: aws.String(myKey),
-//    })
-//
-// See the s3crypto package documentation for more information.
-// https://docs.aws.amazon.com/sdk-for-go/api/service/s3/s3crypto/
-//
-package s3
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/errors.go b/vendor/github.com/aws/aws-sdk-go/service/s3/errors.go
deleted file mode 100644
index 931cb17bb0..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/errors.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT.
-
-package s3
-
-const (
-
-	// ErrCodeBucketAlreadyExists for service response error code
-	// "BucketAlreadyExists".
-	//
-	// The requested bucket name is not available. The bucket namespace is shared
-	// by all users of the system. Please select a different name and try again.
-	ErrCodeBucketAlreadyExists = "BucketAlreadyExists"
-
-	// ErrCodeBucketAlreadyOwnedByYou for service response error code
-	// "BucketAlreadyOwnedByYou".
-	ErrCodeBucketAlreadyOwnedByYou = "BucketAlreadyOwnedByYou"
-
-	// ErrCodeNoSuchBucket for service response error code
-	// "NoSuchBucket".
-	//
-	// The specified bucket does not exist.
-	ErrCodeNoSuchBucket = "NoSuchBucket"
-
-	// ErrCodeNoSuchKey for service response error code
-	// "NoSuchKey".
-	//
-	// The specified key does not exist.
-	ErrCodeNoSuchKey = "NoSuchKey"
-
-	// ErrCodeNoSuchUpload for service response error code
-	// "NoSuchUpload".
-	//
-	// The specified multipart upload does not exist.
-	ErrCodeNoSuchUpload = "NoSuchUpload"
-
-	// ErrCodeObjectAlreadyInActiveTierError for service response error code
-	// "ObjectAlreadyInActiveTierError".
-	//
-	// This operation is not allowed against this storage tier
-	ErrCodeObjectAlreadyInActiveTierError = "ObjectAlreadyInActiveTierError"
-
-	// ErrCodeObjectNotInActiveTierError for service response error code
-	// "ObjectNotInActiveTierError".
-	//
-	// The source object of the COPY operation is not in the active tier and is
-	// only stored in Amazon Glacier.
-	ErrCodeObjectNotInActiveTierError = "ObjectNotInActiveTierError"
-)
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go b/vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go
deleted file mode 100644
index a7fbc2de2f..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package s3
-
-import (
-	"fmt"
-	"net/url"
-	"regexp"
-	"strings"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// an operationBlacklist is a list of operation names that should a
-// request handler should not be executed with.
-type operationBlacklist []string
-
-// Continue will return true of the Request's operation name is not
-// in the blacklist. False otherwise.
-func (b operationBlacklist) Continue(r *request.Request) bool {
-	for i := 0; i < len(b); i++ {
-		if b[i] == r.Operation.Name {
-			return false
-		}
-	}
-	return true
-}
-
-var accelerateOpBlacklist = operationBlacklist{
-	opListBuckets, opCreateBucket, opDeleteBucket,
-}
-
-// Request handler to automatically add the bucket name to the endpoint domain
-// if possible. This style of bucket is valid for all bucket names which are
-// DNS compatible and do not contain "."
-func updateEndpointForS3Config(r *request.Request) {
-	forceHostStyle := aws.BoolValue(r.Config.S3ForcePathStyle)
-	accelerate := aws.BoolValue(r.Config.S3UseAccelerate)
-
-	if accelerate && accelerateOpBlacklist.Continue(r) {
-		if forceHostStyle {
-			if r.Config.Logger != nil {
-				r.Config.Logger.Log("ERROR: aws.Config.S3UseAccelerate is not compatible with aws.Config.S3ForcePathStyle, ignoring S3ForcePathStyle.")
-			}
-		}
-		updateEndpointForAccelerate(r)
-	} else if !forceHostStyle && r.Operation.Name != opGetBucketLocation {
-		updateEndpointForHostStyle(r)
-	}
-}
-
-func updateEndpointForHostStyle(r *request.Request) {
-	bucket, ok := bucketNameFromReqParams(r.Params)
-	if !ok {
-		// Ignore operation requests if the bucketname was not provided
-		// if this is an input validation error the validation handler
-		// will report it.
-		return
-	}
-
-	if !hostCompatibleBucketName(r.HTTPRequest.URL, bucket) {
-		// bucket name must be valid to put into the host
-		return
-	}
-
-	moveBucketToHost(r.HTTPRequest.URL, bucket)
-}
-
-var (
-	accelElem = []byte("s3-accelerate.dualstack.")
-)
-
-func updateEndpointForAccelerate(r *request.Request) {
-	bucket, ok := bucketNameFromReqParams(r.Params)
-	if !ok {
-		// Ignore operation requests if the bucketname was not provided
-		// if this is an input validation error the validation handler
-		// will report it.
-		return
-	}
-
-	if !hostCompatibleBucketName(r.HTTPRequest.URL, bucket) {
-		r.Error = awserr.New("InvalidParameterException",
-			fmt.Sprintf("bucket name %s is not compatible with S3 Accelerate", bucket),
-			nil)
-		return
-	}
-
-	parts := strings.Split(r.HTTPRequest.URL.Host, ".")
-	if len(parts) < 3 {
-		r.Error = awserr.New("InvalidParameterExecption",
-			fmt.Sprintf("unable to update endpoint host for S3 accelerate, hostname invalid, %s",
-				r.HTTPRequest.URL.Host), nil)
-		return
-	}
-
-	if parts[0] == "s3" || strings.HasPrefix(parts[0], "s3-") {
-		parts[0] = "s3-accelerate"
-	}
-	for i := 1; i+1 < len(parts); i++ {
-		if parts[i] == aws.StringValue(r.Config.Region) {
-			parts = append(parts[:i], parts[i+1:]...)
-			break
-		}
-	}
-
-	r.HTTPRequest.URL.Host = strings.Join(parts, ".")
-
-	moveBucketToHost(r.HTTPRequest.URL, bucket)
-}
-
-// Attempts to retrieve the bucket name from the request input parameters.
-// If no bucket is found, or the field is empty "", false will be returned.
-func bucketNameFromReqParams(params interface{}) (string, bool) {
-	if iface, ok := params.(bucketGetter); ok {
-		b := iface.getBucket()
-		return b, len(b) > 0
-	}
-
-	return "", false
-}
-
-// hostCompatibleBucketName returns true if the request should
-// put the bucket in the host. This is false if S3ForcePathStyle is
-// explicitly set or if the bucket is not DNS compatible.
-func hostCompatibleBucketName(u *url.URL, bucket string) bool {
-	// Bucket might be DNS compatible but dots in the hostname will fail
-	// certificate validation, so do not use host-style.
-	if u.Scheme == "https" && strings.Contains(bucket, ".") {
-		return false
-	}
-
-	// if the bucket is DNS compatible
-	return dnsCompatibleBucketName(bucket)
-}
-
-var reDomain = regexp.MustCompile(`^[a-z0-9][a-z0-9\.\-]{1,61}[a-z0-9]$`)
-var reIPAddress = regexp.MustCompile(`^(\d+\.){3}\d+$`)
-
-// dnsCompatibleBucketName returns true if the bucket name is DNS compatible.
-// Buckets created outside of the classic region MUST be DNS compatible.
-func dnsCompatibleBucketName(bucket string) bool {
-	return reDomain.MatchString(bucket) &&
-		!reIPAddress.MatchString(bucket) &&
-		!strings.Contains(bucket, "..")
-}
-
-// moveBucketToHost moves the bucket name from the URI path to URL host.
-func moveBucketToHost(u *url.URL, bucket string) {
-	u.Host = bucket + "." + u.Host
-	u.Path = strings.Replace(u.Path, "/{Bucket}", "", -1)
-	if u.Path == "" {
-		u.Path = "/"
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/platform_handlers.go b/vendor/github.com/aws/aws-sdk-go/service/s3/platform_handlers.go
deleted file mode 100644
index 8e6f3307d4..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/platform_handlers.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !go1.6
-
-package s3
-
-import "github.com/aws/aws-sdk-go/aws/request"
-
-func platformRequestHandlers(r *request.Request) {
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/platform_handlers_go1.6.go b/vendor/github.com/aws/aws-sdk-go/service/s3/platform_handlers_go1.6.go
deleted file mode 100644
index 14d05f7b75..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/platform_handlers_go1.6.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// +build go1.6
-
-package s3
-
-import (
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-func platformRequestHandlers(r *request.Request) {
-	if r.Operation.HTTPMethod == "PUT" {
-		// 100-Continue should only be used on put requests.
-		r.Handlers.Sign.PushBack(add100Continue)
-	}
-}
-
-func add100Continue(r *request.Request) {
-	if aws.BoolValue(r.Config.S3Disable100Continue) {
-		return
-	}
-	if r.HTTPRequest.ContentLength < 1024*1024*2 {
-		// Ignore requests smaller than 2MB. This helps prevent delaying
-		// requests unnecessarily.
-		return
-	}
-
-	r.HTTPRequest.Header.Set("Expect", "100-Continue")
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/service.go b/vendor/github.com/aws/aws-sdk-go/service/s3/service.go
deleted file mode 100644
index 614e477d3b..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/service.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT.
-
-package s3
-
-import (
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/client"
-	"github.com/aws/aws-sdk-go/aws/client/metadata"
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/aws/signer/v4"
-	"github.com/aws/aws-sdk-go/private/protocol/restxml"
-)
-
-// S3 provides the API operation methods for making requests to
-// Amazon Simple Storage Service. See this package's package overview docs
-// for details on the service.
-//
-// S3 methods are safe to use concurrently. It is not safe to
-// modify mutate any of the struct's properties though.
-type S3 struct {
-	*client.Client
-}
-
-// Used for custom client initialization logic
-var initClient func(*client.Client)
-
-// Used for custom request initialization logic
-var initRequest func(*request.Request)
-
-// Service information constants
-const (
-	ServiceName = "s3"        // Service endpoint prefix API calls made to.
-	EndpointsID = ServiceName // Service ID for Regions and Endpoints metadata.
-)
-
-// New creates a new instance of the S3 client with a session.
-// If additional configuration is needed for the client instance use the optional
-// aws.Config parameter to add your extra config.
-//
-// Example:
-//     // Create a S3 client from just a session.
-//     svc := s3.New(mySession)
-//
-//     // Create a S3 client with additional configuration
-//     svc := s3.New(mySession, aws.NewConfig().WithRegion("us-west-2"))
-func New(p client.ConfigProvider, cfgs ...*aws.Config) *S3 {
-	c := p.ClientConfig(EndpointsID, cfgs...)
-	return newClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName)
-}
-
-// newClient creates, initializes and returns a new service client instance.
-func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *S3 {
-	svc := &S3{
-		Client: client.New(
-			cfg,
-			metadata.ClientInfo{
-				ServiceName:   ServiceName,
-				SigningName:   signingName,
-				SigningRegion: signingRegion,
-				Endpoint:      endpoint,
-				APIVersion:    "2006-03-01",
-			},
-			handlers,
-		),
-	}
-
-	// Handlers
-	svc.Handlers.Sign.PushBackNamed(v4.SignRequestHandler)
-	svc.Handlers.Build.PushBackNamed(restxml.BuildHandler)
-	svc.Handlers.Unmarshal.PushBackNamed(restxml.UnmarshalHandler)
-	svc.Handlers.UnmarshalMeta.PushBackNamed(restxml.UnmarshalMetaHandler)
-	svc.Handlers.UnmarshalError.PushBackNamed(restxml.UnmarshalErrorHandler)
-
-	// Run custom client initialization if present
-	if initClient != nil {
-		initClient(svc.Client)
-	}
-
-	return svc
-}
-
-// newRequest creates a new request for a S3 operation and runs any
-// custom request initialization.
-func (c *S3) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(op, params, data)
-
-	// Run custom request initialization if present
-	if initRequest != nil {
-		initRequest(req)
-	}
-
-	return req
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go b/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go
deleted file mode 100644
index 8010c4fa19..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package s3
-
-import (
-	"crypto/md5"
-	"encoding/base64"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-var errSSERequiresSSL = awserr.New("ConfigError", "cannot send SSE keys over HTTP.", nil)
-
-func validateSSERequiresSSL(r *request.Request) {
-	if r.HTTPRequest.URL.Scheme == "https" {
-		return
-	}
-
-	if iface, ok := r.Params.(sseCustomerKeyGetter); ok {
-		if len(iface.getSSECustomerKey()) > 0 {
-			r.Error = errSSERequiresSSL
-			return
-		}
-	}
-
-	if iface, ok := r.Params.(copySourceSSECustomerKeyGetter); ok {
-		if len(iface.getCopySourceSSECustomerKey()) > 0 {
-			r.Error = errSSERequiresSSL
-			return
-		}
-	}
-}
-
-func computeSSEKeys(r *request.Request) {
-	headers := []string{
-		"x-amz-server-side-encryption-customer-key",
-		"x-amz-copy-source-server-side-encryption-customer-key",
-	}
-
-	for _, h := range headers {
-		md5h := h + "-md5"
-		if key := r.HTTPRequest.Header.Get(h); key != "" {
-			// Base64-encode the value
-			b64v := base64.StdEncoding.EncodeToString([]byte(key))
-			r.HTTPRequest.Header.Set(h, b64v)
-
-			// Add MD5 if it wasn't computed
-			if r.HTTPRequest.Header.Get(md5h) == "" {
-				sum := md5.Sum([]byte(key))
-				b64sum := base64.StdEncoding.EncodeToString(sum[:])
-				r.HTTPRequest.Header.Set(md5h, b64sum)
-			}
-		}
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go b/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go
deleted file mode 100644
index 5a78fd3370..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package s3
-
-import (
-	"bytes"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-func copyMultipartStatusOKUnmarhsalError(r *request.Request) {
-	b, err := ioutil.ReadAll(r.HTTPResponse.Body)
-	if err != nil {
-		r.Error = awserr.New("SerializationError", "unable to read response body", err)
-		return
-	}
-	body := bytes.NewReader(b)
-	r.HTTPResponse.Body = ioutil.NopCloser(body)
-	defer body.Seek(0, 0)
-
-	if body.Len() == 0 {
-		// If there is no body don't attempt to parse the body.
-		return
-	}
-
-	unmarshalError(r)
-	if err, ok := r.Error.(awserr.Error); ok && err != nil {
-		if err.Code() == "SerializationError" {
-			r.Error = nil
-			return
-		}
-		r.HTTPResponse.StatusCode = http.StatusServiceUnavailable
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go b/vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go
deleted file mode 100644
index bcca8627af..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/unmarshal_error.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package s3
-
-import (
-	"encoding/xml"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"strings"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-type xmlErrorResponse struct {
-	XMLName xml.Name `xml:"Error"`
-	Code    string   `xml:"Code"`
-	Message string   `xml:"Message"`
-}
-
-func unmarshalError(r *request.Request) {
-	defer r.HTTPResponse.Body.Close()
-	defer io.Copy(ioutil.Discard, r.HTTPResponse.Body)
-
-	hostID := r.HTTPResponse.Header.Get("X-Amz-Id-2")
-
-	// Bucket exists in a different region, and request needs
-	// to be made to the correct region.
-	if r.HTTPResponse.StatusCode == http.StatusMovedPermanently {
-		r.Error = requestFailure{
-			RequestFailure: awserr.NewRequestFailure(
-				awserr.New("BucketRegionError",
-					fmt.Sprintf("incorrect region, the bucket is not in '%s' region",
-						aws.StringValue(r.Config.Region)),
-					nil),
-				r.HTTPResponse.StatusCode,
-				r.RequestID,
-			),
-			hostID: hostID,
-		}
-		return
-	}
-
-	var errCode, errMsg string
-
-	// Attempt to parse error from body if it is known
-	resp := &xmlErrorResponse{}
-	err := xml.NewDecoder(r.HTTPResponse.Body).Decode(resp)
-	if err != nil && err != io.EOF {
-		errCode = "SerializationError"
-		errMsg = "failed to decode S3 XML error response"
-	} else {
-		errCode = resp.Code
-		errMsg = resp.Message
-		err = nil
-	}
-
-	// Fallback to status code converted to message if still no error code
-	if len(errCode) == 0 {
-		statusText := http.StatusText(r.HTTPResponse.StatusCode)
-		errCode = strings.Replace(statusText, " ", "", -1)
-		errMsg = statusText
-	}
-
-	r.Error = requestFailure{
-		RequestFailure: awserr.NewRequestFailure(
-			awserr.New(errCode, errMsg, err),
-			r.HTTPResponse.StatusCode,
-			r.RequestID,
-		),
-		hostID: hostID,
-	}
-}
-
-// A RequestFailure provides access to the S3 Request ID and Host ID values
-// returned from API operation errors. Getting the error as a string will
-// return the formated error with the same information as awserr.RequestFailure,
-// while also adding the HostID value from the response.
-type RequestFailure interface {
-	awserr.RequestFailure
-
-	// Host ID is the S3 Host ID needed for debug, and contacting support
-	HostID() string
-}
-
-type requestFailure struct {
-	awserr.RequestFailure
-
-	hostID string
-}
-
-func (r requestFailure) Error() string {
-	extra := fmt.Sprintf("status code: %d, request id: %s, host id: %s",
-		r.StatusCode(), r.RequestID(), r.hostID)
-	return awserr.SprintError(r.Code(), r.Message(), extra, r.OrigErr())
-}
-func (r requestFailure) String() string {
-	return r.Error()
-}
-func (r requestFailure) HostID() string {
-	return r.hostID
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/waiters.go b/vendor/github.com/aws/aws-sdk-go/service/s3/waiters.go
deleted file mode 100644
index 2596c694b5..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/waiters.go
+++ /dev/null
@@ -1,214 +0,0 @@
-// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT.
-
-package s3
-
-import (
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-// WaitUntilBucketExists uses the Amazon S3 API operation
-// HeadBucket to wait for a condition to be met before returning.
-// If the condition is not met within the max attempt window, an error will
-// be returned.
-func (c *S3) WaitUntilBucketExists(input *HeadBucketInput) error {
-	return c.WaitUntilBucketExistsWithContext(aws.BackgroundContext(), input)
-}
-
-// WaitUntilBucketExistsWithContext is an extended version of WaitUntilBucketExists.
-// With the support for passing in a context and options to configure the
-// Waiter and the underlying request options.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) WaitUntilBucketExistsWithContext(ctx aws.Context, input *HeadBucketInput, opts ...request.WaiterOption) error {
-	w := request.Waiter{
-		Name:        "WaitUntilBucketExists",
-		MaxAttempts: 20,
-		Delay:       request.ConstantWaiterDelay(5 * time.Second),
-		Acceptors: []request.WaiterAcceptor{
-			{
-				State:    request.SuccessWaiterState,
-				Matcher:  request.StatusWaiterMatch,
-				Expected: 200,
-			},
-			{
-				State:    request.SuccessWaiterState,
-				Matcher:  request.StatusWaiterMatch,
-				Expected: 301,
-			},
-			{
-				State:    request.SuccessWaiterState,
-				Matcher:  request.StatusWaiterMatch,
-				Expected: 403,
-			},
-			{
-				State:    request.RetryWaiterState,
-				Matcher:  request.StatusWaiterMatch,
-				Expected: 404,
-			},
-		},
-		Logger: c.Config.Logger,
-		NewRequest: func(opts []request.Option) (*request.Request, error) {
-			var inCpy *HeadBucketInput
-			if input != nil {
-				tmp := *input
-				inCpy = &tmp
-			}
-			req, _ := c.HeadBucketRequest(inCpy)
-			req.SetContext(ctx)
-			req.ApplyOptions(opts...)
-			return req, nil
-		},
-	}
-	w.ApplyOptions(opts...)
-
-	return w.WaitWithContext(ctx)
-}
-
-// WaitUntilBucketNotExists uses the Amazon S3 API operation
-// HeadBucket to wait for a condition to be met before returning.
-// If the condition is not met within the max attempt window, an error will
-// be returned.
-func (c *S3) WaitUntilBucketNotExists(input *HeadBucketInput) error {
-	return c.WaitUntilBucketNotExistsWithContext(aws.BackgroundContext(), input)
-}
-
-// WaitUntilBucketNotExistsWithContext is an extended version of WaitUntilBucketNotExists.
-// With the support for passing in a context and options to configure the
-// Waiter and the underlying request options.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) WaitUntilBucketNotExistsWithContext(ctx aws.Context, input *HeadBucketInput, opts ...request.WaiterOption) error {
-	w := request.Waiter{
-		Name:        "WaitUntilBucketNotExists",
-		MaxAttempts: 20,
-		Delay:       request.ConstantWaiterDelay(5 * time.Second),
-		Acceptors: []request.WaiterAcceptor{
-			{
-				State:    request.SuccessWaiterState,
-				Matcher:  request.StatusWaiterMatch,
-				Expected: 404,
-			},
-		},
-		Logger: c.Config.Logger,
-		NewRequest: func(opts []request.Option) (*request.Request, error) {
-			var inCpy *HeadBucketInput
-			if input != nil {
-				tmp := *input
-				inCpy = &tmp
-			}
-			req, _ := c.HeadBucketRequest(inCpy)
-			req.SetContext(ctx)
-			req.ApplyOptions(opts...)
-			return req, nil
-		},
-	}
-	w.ApplyOptions(opts...)
-
-	return w.WaitWithContext(ctx)
-}
-
-// WaitUntilObjectExists uses the Amazon S3 API operation
-// HeadObject to wait for a condition to be met before returning.
-// If the condition is not met within the max attempt window, an error will
-// be returned.
-func (c *S3) WaitUntilObjectExists(input *HeadObjectInput) error {
-	return c.WaitUntilObjectExistsWithContext(aws.BackgroundContext(), input)
-}
-
-// WaitUntilObjectExistsWithContext is an extended version of WaitUntilObjectExists.
-// With the support for passing in a context and options to configure the
-// Waiter and the underlying request options.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) WaitUntilObjectExistsWithContext(ctx aws.Context, input *HeadObjectInput, opts ...request.WaiterOption) error {
-	w := request.Waiter{
-		Name:        "WaitUntilObjectExists",
-		MaxAttempts: 20,
-		Delay:       request.ConstantWaiterDelay(5 * time.Second),
-		Acceptors: []request.WaiterAcceptor{
-			{
-				State:    request.SuccessWaiterState,
-				Matcher:  request.StatusWaiterMatch,
-				Expected: 200,
-			},
-			{
-				State:    request.RetryWaiterState,
-				Matcher:  request.StatusWaiterMatch,
-				Expected: 404,
-			},
-		},
-		Logger: c.Config.Logger,
-		NewRequest: func(opts []request.Option) (*request.Request, error) {
-			var inCpy *HeadObjectInput
-			if input != nil {
-				tmp := *input
-				inCpy = &tmp
-			}
-			req, _ := c.HeadObjectRequest(inCpy)
-			req.SetContext(ctx)
-			req.ApplyOptions(opts...)
-			return req, nil
-		},
-	}
-	w.ApplyOptions(opts...)
-
-	return w.WaitWithContext(ctx)
-}
-
-// WaitUntilObjectNotExists uses the Amazon S3 API operation
-// HeadObject to wait for a condition to be met before returning.
-// If the condition is not met within the max attempt window, an error will
-// be returned.
-func (c *S3) WaitUntilObjectNotExists(input *HeadObjectInput) error {
-	return c.WaitUntilObjectNotExistsWithContext(aws.BackgroundContext(), input)
-}
-
-// WaitUntilObjectNotExistsWithContext is an extended version of WaitUntilObjectNotExists.
-// With the support for passing in a context and options to configure the
-// Waiter and the underlying request options.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *S3) WaitUntilObjectNotExistsWithContext(ctx aws.Context, input *HeadObjectInput, opts ...request.WaiterOption) error {
-	w := request.Waiter{
-		Name:        "WaitUntilObjectNotExists",
-		MaxAttempts: 20,
-		Delay:       request.ConstantWaiterDelay(5 * time.Second),
-		Acceptors: []request.WaiterAcceptor{
-			{
-				State:    request.SuccessWaiterState,
-				Matcher:  request.StatusWaiterMatch,
-				Expected: 404,
-			},
-		},
-		Logger: c.Config.Logger,
-		NewRequest: func(opts []request.Option) (*request.Request, error) {
-			var inCpy *HeadObjectInput
-			if input != nil {
-				tmp := *input
-				inCpy = &tmp
-			}
-			req, _ := c.HeadObjectRequest(inCpy)
-			req.SetContext(ctx)
-			req.ApplyOptions(opts...)
-			return req, nil
-		},
-	}
-	w.ApplyOptions(opts...)
-
-	return w.WaitWithContext(ctx)
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/sts/api.go b/vendor/github.com/aws/aws-sdk-go/service/sts/api.go
deleted file mode 100644
index e5c105fed8..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/sts/api.go
+++ /dev/null
@@ -1,2365 +0,0 @@
-// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT.
-
-package sts
-
-import (
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awsutil"
-	"github.com/aws/aws-sdk-go/aws/request"
-)
-
-const opAssumeRole = "AssumeRole"
-
-// AssumeRoleRequest generates a "aws/request.Request" representing the
-// client's request for the AssumeRole operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
-//
-// See AssumeRole for usage and error information.
-//
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the AssumeRole method directly
-// instead.
-//
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
-//
-//    // Example sending a request using the AssumeRoleRequest method.
-//    req, resp := client.AssumeRoleRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRole
-func (c *STS) AssumeRoleRequest(input *AssumeRoleInput) (req *request.Request, output *AssumeRoleOutput) {
-	op := &request.Operation{
-		Name:       opAssumeRole,
-		HTTPMethod: "POST",
-		HTTPPath:   "/",
-	}
-
-	if input == nil {
-		input = &AssumeRoleInput{}
-	}
-
-	output = &AssumeRoleOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// AssumeRole API operation for AWS Security Token Service.
-//
-// Returns a set of temporary security credentials (consisting of an access
-// key ID, a secret access key, and a security token) that you can use to access
-// AWS resources that you might not normally have access to. Typically, you
-// use AssumeRole for cross-account access or federation. For a comparison of
-// AssumeRole with the other APIs that produce temporary credentials, see Requesting
-// Temporary Security Credentials (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html)
-// and Comparing the AWS STS APIs (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison)
-// in the IAM User Guide.
-//
-// Important: You cannot call AssumeRole by using AWS root account credentials;
-// access is denied. You must use credentials for an IAM user or an IAM role
-// to call AssumeRole.
-//
-// For cross-account access, imagine that you own multiple accounts and need
-// to access resources in each account. You could create long-term credentials
-// in each account to access those resources. However, managing all those credentials
-// and remembering which one can access which account can be time consuming.
-// Instead, you can create one set of long-term credentials in one account and
-// then use temporary security credentials to access all the other accounts
-// by assuming roles in those accounts. For more information about roles, see
-// IAM Roles (Delegation and Federation) (http://docs.aws.amazon.com/IAM/latest/UserGuide/roles-toplevel.html)
-// in the IAM User Guide.
-//
-// For federation, you can, for example, grant single sign-on access to the
-// AWS Management Console. If you already have an identity and authentication
-// system in your corporate network, you don't have to recreate user identities
-// in AWS in order to grant those user identities access to AWS. Instead, after
-// a user has been authenticated, you call AssumeRole (and specify the role
-// with the appropriate permissions) to get temporary security credentials for
-// that user. With those temporary security credentials, you construct a sign-in
-// URL that users can use to access the console. For more information, see Common
-// Scenarios for Temporary Credentials (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html#sts-introduction)
-// in the IAM User Guide.
-//
-// The temporary security credentials are valid for the duration that you specified
-// when calling AssumeRole, which can be from 900 seconds (15 minutes) to a
-// maximum of 3600 seconds (1 hour). The default is 1 hour.
-//
-// The temporary security credentials created by AssumeRole can be used to make
-// API calls to any AWS service with the following exception: you cannot call
-// the STS service's GetFederationToken or GetSessionToken APIs.
-//
-// Optionally, you can pass an IAM access policy to this operation. If you choose
-// not to pass a policy, the temporary security credentials that are returned
-// by the operation have the permissions that are defined in the access policy
-// of the role that is being assumed. If you pass a policy to this operation,
-// the temporary security credentials that are returned by the operation have
-// the permissions that are allowed by both the access policy of the role that
-// is being assumed, and the policy that you pass. This gives you a way to further
-// restrict the permissions for the resulting temporary security credentials.
-// You cannot use the passed policy to grant permissions that are in excess
-// of those allowed by the access policy of the role that is being assumed.
-// For more information, see Permissions for AssumeRole, AssumeRoleWithSAML,
-// and AssumeRoleWithWebIdentity (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html)
-// in the IAM User Guide.
-//
-// To assume a role, your AWS account must be trusted by the role. The trust
-// relationship is defined in the role's trust policy when the role is created.
-// That trust policy states which accounts are allowed to delegate access to
-// this account's role.
-//
-// The user who wants to access the role must also have permissions delegated
-// from the role's administrator. If the user is in a different account than
-// the role, then the user's administrator must attach a policy that allows
-// the user to call AssumeRole on the ARN of the role in the other account.
-// If the user is in the same account as the role, then you can either attach
-// a policy to the user (identical to the previous different account user),
-// or you can add the user as a principal directly in the role's trust policy
-//
-// Using MFA with AssumeRole
-//
-// You can optionally include multi-factor authentication (MFA) information
-// when you call AssumeRole. This is useful for cross-account scenarios in which
-// you want to make sure that the user who is assuming the role has been authenticated
-// using an AWS MFA device. In that scenario, the trust policy of the role being
-// assumed includes a condition that tests for MFA authentication; if the caller
-// does not include valid MFA information, the request to assume the role is
-// denied. The condition in a trust policy that tests for MFA authentication
-// might look like the following example.
-//
-// "Condition": {"Bool": {"aws:MultiFactorAuthPresent": true}}
-//
-// For more information, see Configuring MFA-Protected API Access (http://docs.aws.amazon.com/IAM/latest/UserGuide/MFAProtectedAPI.html)
-// in the IAM User Guide guide.
-//
-// To use MFA with AssumeRole, you pass values for the SerialNumber and TokenCode
-// parameters. The SerialNumber value identifies the user's hardware or virtual
-// MFA device. The TokenCode is the time-based one-time password (TOTP) that
-// the MFA devices produces.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for AWS Security Token Service's
-// API operation AssumeRole for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeMalformedPolicyDocumentException "MalformedPolicyDocument"
-//   The request was rejected because the policy document was malformed. The error
-//   message describes the specific error.
-//
-//   * ErrCodePackedPolicyTooLargeException "PackedPolicyTooLarge"
-//   The request was rejected because the policy document was too large. The error
-//   message describes how big the policy document is, in packed form, as a percentage
-//   of what the API allows.
-//
-//   * ErrCodeRegionDisabledException "RegionDisabledException"
-//   STS is not activated in the requested region for the account that is being
-//   asked to generate credentials. The account administrator must use the IAM
-//   console to activate STS in that region. For more information, see Activating
-//   and Deactivating AWS STS in an AWS Region (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html)
-//   in the IAM User Guide.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRole
-func (c *STS) AssumeRole(input *AssumeRoleInput) (*AssumeRoleOutput, error) {
-	req, out := c.AssumeRoleRequest(input)
-	return out, req.Send()
-}
-
-// AssumeRoleWithContext is the same as AssumeRole with the addition of
-// the ability to pass a context and additional request options.
-//
-// See AssumeRole for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *STS) AssumeRoleWithContext(ctx aws.Context, input *AssumeRoleInput, opts ...request.Option) (*AssumeRoleOutput, error) {
-	req, out := c.AssumeRoleRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opAssumeRoleWithSAML = "AssumeRoleWithSAML"
-
-// AssumeRoleWithSAMLRequest generates a "aws/request.Request" representing the
-// client's request for the AssumeRoleWithSAML operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
-//
-// See AssumeRoleWithSAML for usage and error information.
-//
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the AssumeRoleWithSAML method directly
-// instead.
-//
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
-//
-//    // Example sending a request using the AssumeRoleWithSAMLRequest method.
-//    req, resp := client.AssumeRoleWithSAMLRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithSAML
-func (c *STS) AssumeRoleWithSAMLRequest(input *AssumeRoleWithSAMLInput) (req *request.Request, output *AssumeRoleWithSAMLOutput) {
-	op := &request.Operation{
-		Name:       opAssumeRoleWithSAML,
-		HTTPMethod: "POST",
-		HTTPPath:   "/",
-	}
-
-	if input == nil {
-		input = &AssumeRoleWithSAMLInput{}
-	}
-
-	output = &AssumeRoleWithSAMLOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// AssumeRoleWithSAML API operation for AWS Security Token Service.
-//
-// Returns a set of temporary security credentials for users who have been authenticated
-// via a SAML authentication response. This operation provides a mechanism for
-// tying an enterprise identity store or directory to role-based AWS access
-// without user-specific credentials or configuration. For a comparison of AssumeRoleWithSAML
-// with the other APIs that produce temporary credentials, see Requesting Temporary
-// Security Credentials (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html)
-// and Comparing the AWS STS APIs (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison)
-// in the IAM User Guide.
-//
-// The temporary security credentials returned by this operation consist of
-// an access key ID, a secret access key, and a security token. Applications
-// can use these temporary security credentials to sign calls to AWS services.
-//
-// The temporary security credentials are valid for the duration that you specified
-// when calling AssumeRole, or until the time specified in the SAML authentication
-// response's SessionNotOnOrAfter value, whichever is shorter. The duration
-// can be from 900 seconds (15 minutes) to a maximum of 3600 seconds (1 hour).
-// The default is 1 hour.
-//
-// The temporary security credentials created by AssumeRoleWithSAML can be used
-// to make API calls to any AWS service with the following exception: you cannot
-// call the STS service's GetFederationToken or GetSessionToken APIs.
-//
-// Optionally, you can pass an IAM access policy to this operation. If you choose
-// not to pass a policy, the temporary security credentials that are returned
-// by the operation have the permissions that are defined in the access policy
-// of the role that is being assumed. If you pass a policy to this operation,
-// the temporary security credentials that are returned by the operation have
-// the permissions that are allowed by the intersection of both the access policy
-// of the role that is being assumed, and the policy that you pass. This means
-// that both policies must grant the permission for the action to be allowed.
-// This gives you a way to further restrict the permissions for the resulting
-// temporary security credentials. You cannot use the passed policy to grant
-// permissions that are in excess of those allowed by the access policy of the
-// role that is being assumed. For more information, see Permissions for AssumeRole,
-// AssumeRoleWithSAML, and AssumeRoleWithWebIdentity (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html)
-// in the IAM User Guide.
-//
-// Before your application can call AssumeRoleWithSAML, you must configure your
-// SAML identity provider (IdP) to issue the claims required by AWS. Additionally,
-// you must use AWS Identity and Access Management (IAM) to create a SAML provider
-// entity in your AWS account that represents your identity provider, and create
-// an IAM role that specifies this SAML provider in its trust policy.
-//
-// Calling AssumeRoleWithSAML does not require the use of AWS security credentials.
-// The identity of the caller is validated by using keys in the metadata document
-// that is uploaded for the SAML provider entity for your identity provider.
-//
-// Calling AssumeRoleWithSAML can result in an entry in your AWS CloudTrail
-// logs. The entry includes the value in the NameID element of the SAML assertion.
-// We recommend that you use a NameIDType that is not associated with any personally
-// identifiable information (PII). For example, you could instead use the Persistent
-// Identifier (urn:oasis:names:tc:SAML:2.0:nameid-format:persistent).
-//
-// For more information, see the following resources:
-//
-//    * About SAML 2.0-based Federation (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_saml.html)
-//    in the IAM User Guide.
-//
-//    * Creating SAML Identity Providers (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_saml.html)
-//    in the IAM User Guide.
-//
-//    * Configuring a Relying Party and Claims (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_saml_relying-party.html)
-//    in the IAM User Guide.
-//
-//    * Creating a Role for SAML 2.0 Federation (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-idp_saml.html)
-//    in the IAM User Guide.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for AWS Security Token Service's
-// API operation AssumeRoleWithSAML for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeMalformedPolicyDocumentException "MalformedPolicyDocument"
-//   The request was rejected because the policy document was malformed. The error
-//   message describes the specific error.
-//
-//   * ErrCodePackedPolicyTooLargeException "PackedPolicyTooLarge"
-//   The request was rejected because the policy document was too large. The error
-//   message describes how big the policy document is, in packed form, as a percentage
-//   of what the API allows.
-//
-//   * ErrCodeIDPRejectedClaimException "IDPRejectedClaim"
-//   The identity provider (IdP) reported that authentication failed. This might
-//   be because the claim is invalid.
-//
-//   If this error is returned for the AssumeRoleWithWebIdentity operation, it
-//   can also mean that the claim has expired or has been explicitly revoked.
-//
-//   * ErrCodeInvalidIdentityTokenException "InvalidIdentityToken"
-//   The web identity token that was passed could not be validated by AWS. Get
-//   a new identity token from the identity provider and then retry the request.
-//
-//   * ErrCodeExpiredTokenException "ExpiredTokenException"
-//   The web identity token that was passed is expired or is not valid. Get a
-//   new identity token from the identity provider and then retry the request.
-//
-//   * ErrCodeRegionDisabledException "RegionDisabledException"
-//   STS is not activated in the requested region for the account that is being
-//   asked to generate credentials. The account administrator must use the IAM
-//   console to activate STS in that region. For more information, see Activating
-//   and Deactivating AWS STS in an AWS Region (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html)
-//   in the IAM User Guide.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithSAML
-func (c *STS) AssumeRoleWithSAML(input *AssumeRoleWithSAMLInput) (*AssumeRoleWithSAMLOutput, error) {
-	req, out := c.AssumeRoleWithSAMLRequest(input)
-	return out, req.Send()
-}
-
-// AssumeRoleWithSAMLWithContext is the same as AssumeRoleWithSAML with the addition of
-// the ability to pass a context and additional request options.
-//
-// See AssumeRoleWithSAML for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *STS) AssumeRoleWithSAMLWithContext(ctx aws.Context, input *AssumeRoleWithSAMLInput, opts ...request.Option) (*AssumeRoleWithSAMLOutput, error) {
-	req, out := c.AssumeRoleWithSAMLRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opAssumeRoleWithWebIdentity = "AssumeRoleWithWebIdentity"
-
-// AssumeRoleWithWebIdentityRequest generates a "aws/request.Request" representing the
-// client's request for the AssumeRoleWithWebIdentity operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
-//
-// See AssumeRoleWithWebIdentity for usage and error information.
-//
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the AssumeRoleWithWebIdentity method directly
-// instead.
-//
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
-//
-//    // Example sending a request using the AssumeRoleWithWebIdentityRequest method.
-//    req, resp := client.AssumeRoleWithWebIdentityRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithWebIdentity
-func (c *STS) AssumeRoleWithWebIdentityRequest(input *AssumeRoleWithWebIdentityInput) (req *request.Request, output *AssumeRoleWithWebIdentityOutput) {
-	op := &request.Operation{
-		Name:       opAssumeRoleWithWebIdentity,
-		HTTPMethod: "POST",
-		HTTPPath:   "/",
-	}
-
-	if input == nil {
-		input = &AssumeRoleWithWebIdentityInput{}
-	}
-
-	output = &AssumeRoleWithWebIdentityOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// AssumeRoleWithWebIdentity API operation for AWS Security Token Service.
-//
-// Returns a set of temporary security credentials for users who have been authenticated
-// in a mobile or web application with a web identity provider, such as Amazon
-// Cognito, Login with Amazon, Facebook, Google, or any OpenID Connect-compatible
-// identity provider.
-//
-// For mobile applications, we recommend that you use Amazon Cognito. You can
-// use Amazon Cognito with the AWS SDK for iOS (http://aws.amazon.com/sdkforios/)
-// and the AWS SDK for Android (http://aws.amazon.com/sdkforandroid/) to uniquely
-// identify a user and supply the user with a consistent identity throughout
-// the lifetime of an application.
-//
-// To learn more about Amazon Cognito, see Amazon Cognito Overview (http://docs.aws.amazon.com/mobile/sdkforandroid/developerguide/cognito-auth.html#d0e840)
-// in the AWS SDK for Android Developer Guide guide and Amazon Cognito Overview
-// (http://docs.aws.amazon.com/mobile/sdkforios/developerguide/cognito-auth.html#d0e664)
-// in the AWS SDK for iOS Developer Guide.
-//
-// Calling AssumeRoleWithWebIdentity does not require the use of AWS security
-// credentials. Therefore, you can distribute an application (for example, on
-// mobile devices) that requests temporary security credentials without including
-// long-term AWS credentials in the application, and without deploying server-based
-// proxy services that use long-term AWS credentials. Instead, the identity
-// of the caller is validated by using a token from the web identity provider.
-// For a comparison of AssumeRoleWithWebIdentity with the other APIs that produce
-// temporary credentials, see Requesting Temporary Security Credentials (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html)
-// and Comparing the AWS STS APIs (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison)
-// in the IAM User Guide.
-//
-// The temporary security credentials returned by this API consist of an access
-// key ID, a secret access key, and a security token. Applications can use these
-// temporary security credentials to sign calls to AWS service APIs.
-//
-// The credentials are valid for the duration that you specified when calling
-// AssumeRoleWithWebIdentity, which can be from 900 seconds (15 minutes) to
-// a maximum of 3600 seconds (1 hour). The default is 1 hour.
-//
-// The temporary security credentials created by AssumeRoleWithWebIdentity can
-// be used to make API calls to any AWS service with the following exception:
-// you cannot call the STS service's GetFederationToken or GetSessionToken APIs.
-//
-// Optionally, you can pass an IAM access policy to this operation. If you choose
-// not to pass a policy, the temporary security credentials that are returned
-// by the operation have the permissions that are defined in the access policy
-// of the role that is being assumed. If you pass a policy to this operation,
-// the temporary security credentials that are returned by the operation have
-// the permissions that are allowed by both the access policy of the role that
-// is being assumed, and the policy that you pass. This gives you a way to further
-// restrict the permissions for the resulting temporary security credentials.
-// You cannot use the passed policy to grant permissions that are in excess
-// of those allowed by the access policy of the role that is being assumed.
-// For more information, see Permissions for AssumeRole, AssumeRoleWithSAML,
-// and AssumeRoleWithWebIdentity (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html)
-// in the IAM User Guide.
-//
-// Before your application can call AssumeRoleWithWebIdentity, you must have
-// an identity token from a supported identity provider and create a role that
-// the application can assume. The role that your application assumes must trust
-// the identity provider that is associated with the identity token. In other
-// words, the identity provider must be specified in the role's trust policy.
-//
-// Calling AssumeRoleWithWebIdentity can result in an entry in your AWS CloudTrail
-// logs. The entry includes the Subject (http://openid.net/specs/openid-connect-core-1_0.html#Claims)
-// of the provided Web Identity Token. We recommend that you avoid using any
-// personally identifiable information (PII) in this field. For example, you
-// could instead use a GUID or a pairwise identifier, as suggested in the OIDC
-// specification (http://openid.net/specs/openid-connect-core-1_0.html#SubjectIDTypes).
-//
-// For more information about how to use web identity federation and the AssumeRoleWithWebIdentity
-// API, see the following resources:
-//
-//    * Using Web Identity Federation APIs for Mobile Apps (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_oidc_manual.html)
-//    and Federation Through a Web-based Identity Provider (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_assumerolewithwebidentity).
-//
-//
-//    *  Web Identity Federation Playground (https://web-identity-federation-playground.s3.amazonaws.com/index.html).
-//    This interactive website lets you walk through the process of authenticating
-//    via Login with Amazon, Facebook, or Google, getting temporary security
-//    credentials, and then using those credentials to make a request to AWS.
-//
-//
-//    * AWS SDK for iOS (http://aws.amazon.com/sdkforios/) and AWS SDK for Android
-//    (http://aws.amazon.com/sdkforandroid/). These toolkits contain sample
-//    apps that show how to invoke the identity providers, and then how to use
-//    the information from these providers to get and use temporary security
-//    credentials.
-//
-//    * Web Identity Federation with Mobile Applications (http://aws.amazon.com/articles/4617974389850313).
-//    This article discusses web identity federation and shows an example of
-//    how to use web identity federation to get access to content in Amazon
-//    S3.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for AWS Security Token Service's
-// API operation AssumeRoleWithWebIdentity for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeMalformedPolicyDocumentException "MalformedPolicyDocument"
-//   The request was rejected because the policy document was malformed. The error
-//   message describes the specific error.
-//
-//   * ErrCodePackedPolicyTooLargeException "PackedPolicyTooLarge"
-//   The request was rejected because the policy document was too large. The error
-//   message describes how big the policy document is, in packed form, as a percentage
-//   of what the API allows.
-//
-//   * ErrCodeIDPRejectedClaimException "IDPRejectedClaim"
-//   The identity provider (IdP) reported that authentication failed. This might
-//   be because the claim is invalid.
-//
-//   If this error is returned for the AssumeRoleWithWebIdentity operation, it
-//   can also mean that the claim has expired or has been explicitly revoked.
-//
-//   * ErrCodeIDPCommunicationErrorException "IDPCommunicationError"
-//   The request could not be fulfilled because the non-AWS identity provider
-//   (IDP) that was asked to verify the incoming identity token could not be reached.
-//   This is often a transient error caused by network conditions. Retry the request
-//   a limited number of times so that you don't exceed the request rate. If the
-//   error persists, the non-AWS identity provider might be down or not responding.
-//
-//   * ErrCodeInvalidIdentityTokenException "InvalidIdentityToken"
-//   The web identity token that was passed could not be validated by AWS. Get
-//   a new identity token from the identity provider and then retry the request.
-//
-//   * ErrCodeExpiredTokenException "ExpiredTokenException"
-//   The web identity token that was passed is expired or is not valid. Get a
-//   new identity token from the identity provider and then retry the request.
-//
-//   * ErrCodeRegionDisabledException "RegionDisabledException"
-//   STS is not activated in the requested region for the account that is being
-//   asked to generate credentials. The account administrator must use the IAM
-//   console to activate STS in that region. For more information, see Activating
-//   and Deactivating AWS STS in an AWS Region (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html)
-//   in the IAM User Guide.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithWebIdentity
-func (c *STS) AssumeRoleWithWebIdentity(input *AssumeRoleWithWebIdentityInput) (*AssumeRoleWithWebIdentityOutput, error) {
-	req, out := c.AssumeRoleWithWebIdentityRequest(input)
-	return out, req.Send()
-}
-
-// AssumeRoleWithWebIdentityWithContext is the same as AssumeRoleWithWebIdentity with the addition of
-// the ability to pass a context and additional request options.
-//
-// See AssumeRoleWithWebIdentity for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *STS) AssumeRoleWithWebIdentityWithContext(ctx aws.Context, input *AssumeRoleWithWebIdentityInput, opts ...request.Option) (*AssumeRoleWithWebIdentityOutput, error) {
-	req, out := c.AssumeRoleWithWebIdentityRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opDecodeAuthorizationMessage = "DecodeAuthorizationMessage"
-
-// DecodeAuthorizationMessageRequest generates a "aws/request.Request" representing the
-// client's request for the DecodeAuthorizationMessage operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
-//
-// See DecodeAuthorizationMessage for usage and error information.
-//
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DecodeAuthorizationMessage method directly
-// instead.
-//
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
-//
-//    // Example sending a request using the DecodeAuthorizationMessageRequest method.
-//    req, resp := client.DecodeAuthorizationMessageRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/DecodeAuthorizationMessage
-func (c *STS) DecodeAuthorizationMessageRequest(input *DecodeAuthorizationMessageInput) (req *request.Request, output *DecodeAuthorizationMessageOutput) {
-	op := &request.Operation{
-		Name:       opDecodeAuthorizationMessage,
-		HTTPMethod: "POST",
-		HTTPPath:   "/",
-	}
-
-	if input == nil {
-		input = &DecodeAuthorizationMessageInput{}
-	}
-
-	output = &DecodeAuthorizationMessageOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// DecodeAuthorizationMessage API operation for AWS Security Token Service.
-//
-// Decodes additional information about the authorization status of a request
-// from an encoded message returned in response to an AWS request.
-//
-// For example, if a user is not authorized to perform an action that he or
-// she has requested, the request returns a Client.UnauthorizedOperation response
-// (an HTTP 403 response). Some AWS actions additionally return an encoded message
-// that can provide details about this authorization failure.
-//
-// Only certain AWS actions return an encoded authorization message. The documentation
-// for an individual action indicates whether that action returns an encoded
-// message in addition to returning an HTTP code.
-//
-// The message is encoded because the details of the authorization status can
-// constitute privileged information that the user who requested the action
-// should not see. To decode an authorization status message, a user must be
-// granted permissions via an IAM policy to request the DecodeAuthorizationMessage
-// (sts:DecodeAuthorizationMessage) action.
-//
-// The decoded message includes the following type of information:
-//
-//    * Whether the request was denied due to an explicit deny or due to the
-//    absence of an explicit allow. For more information, see Determining Whether
-//    a Request is Allowed or Denied (http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_evaluation-logic.html#policy-eval-denyallow)
-//    in the IAM User Guide.
-//
-//    * The principal who made the request.
-//
-//    * The requested action.
-//
-//    * The requested resource.
-//
-//    * The values of condition keys in the context of the user's request.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for AWS Security Token Service's
-// API operation DecodeAuthorizationMessage for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeInvalidAuthorizationMessageException "InvalidAuthorizationMessageException"
-//   The error returned if the message passed to DecodeAuthorizationMessage was
-//   invalid. This can happen if the token contains invalid characters, such as
-//   linebreaks.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/DecodeAuthorizationMessage
-func (c *STS) DecodeAuthorizationMessage(input *DecodeAuthorizationMessageInput) (*DecodeAuthorizationMessageOutput, error) {
-	req, out := c.DecodeAuthorizationMessageRequest(input)
-	return out, req.Send()
-}
-
-// DecodeAuthorizationMessageWithContext is the same as DecodeAuthorizationMessage with the addition of
-// the ability to pass a context and additional request options.
-//
-// See DecodeAuthorizationMessage for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *STS) DecodeAuthorizationMessageWithContext(ctx aws.Context, input *DecodeAuthorizationMessageInput, opts ...request.Option) (*DecodeAuthorizationMessageOutput, error) {
-	req, out := c.DecodeAuthorizationMessageRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetCallerIdentity = "GetCallerIdentity"
-
-// GetCallerIdentityRequest generates a "aws/request.Request" representing the
-// client's request for the GetCallerIdentity operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
-//
-// See GetCallerIdentity for usage and error information.
-//
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetCallerIdentity method directly
-// instead.
-//
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
-//
-//    // Example sending a request using the GetCallerIdentityRequest method.
-//    req, resp := client.GetCallerIdentityRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetCallerIdentity
-func (c *STS) GetCallerIdentityRequest(input *GetCallerIdentityInput) (req *request.Request, output *GetCallerIdentityOutput) {
-	op := &request.Operation{
-		Name:       opGetCallerIdentity,
-		HTTPMethod: "POST",
-		HTTPPath:   "/",
-	}
-
-	if input == nil {
-		input = &GetCallerIdentityInput{}
-	}
-
-	output = &GetCallerIdentityOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetCallerIdentity API operation for AWS Security Token Service.
-//
-// Returns details about the IAM identity whose credentials are used to call
-// the API.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for AWS Security Token Service's
-// API operation GetCallerIdentity for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetCallerIdentity
-func (c *STS) GetCallerIdentity(input *GetCallerIdentityInput) (*GetCallerIdentityOutput, error) {
-	req, out := c.GetCallerIdentityRequest(input)
-	return out, req.Send()
-}
-
-// GetCallerIdentityWithContext is the same as GetCallerIdentity with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetCallerIdentity for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *STS) GetCallerIdentityWithContext(ctx aws.Context, input *GetCallerIdentityInput, opts ...request.Option) (*GetCallerIdentityOutput, error) {
-	req, out := c.GetCallerIdentityRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetFederationToken = "GetFederationToken"
-
-// GetFederationTokenRequest generates a "aws/request.Request" representing the
-// client's request for the GetFederationToken operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
-//
-// See GetFederationToken for usage and error information.
-//
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetFederationToken method directly
-// instead.
-//
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
-//
-//    // Example sending a request using the GetFederationTokenRequest method.
-//    req, resp := client.GetFederationTokenRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetFederationToken
-func (c *STS) GetFederationTokenRequest(input *GetFederationTokenInput) (req *request.Request, output *GetFederationTokenOutput) {
-	op := &request.Operation{
-		Name:       opGetFederationToken,
-		HTTPMethod: "POST",
-		HTTPPath:   "/",
-	}
-
-	if input == nil {
-		input = &GetFederationTokenInput{}
-	}
-
-	output = &GetFederationTokenOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetFederationToken API operation for AWS Security Token Service.
-//
-// Returns a set of temporary security credentials (consisting of an access
-// key ID, a secret access key, and a security token) for a federated user.
-// A typical use is in a proxy application that gets temporary security credentials
-// on behalf of distributed applications inside a corporate network. Because
-// you must call the GetFederationToken action using the long-term security
-// credentials of an IAM user, this call is appropriate in contexts where those
-// credentials can be safely stored, usually in a server-based application.
-// For a comparison of GetFederationToken with the other APIs that produce temporary
-// credentials, see Requesting Temporary Security Credentials (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html)
-// and Comparing the AWS STS APIs (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison)
-// in the IAM User Guide.
-//
-// If you are creating a mobile-based or browser-based app that can authenticate
-// users using a web identity provider like Login with Amazon, Facebook, Google,
-// or an OpenID Connect-compatible identity provider, we recommend that you
-// use Amazon Cognito (http://aws.amazon.com/cognito/) or AssumeRoleWithWebIdentity.
-// For more information, see Federation Through a Web-based Identity Provider
-// (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_assumerolewithwebidentity).
-//
-// The GetFederationToken action must be called by using the long-term AWS security
-// credentials of an IAM user. You can also call GetFederationToken using the
-// security credentials of an AWS root account, but we do not recommended it.
-// Instead, we recommend that you create an IAM user for the purpose of the
-// proxy application and then attach a policy to the IAM user that limits federated
-// users to only the actions and resources that they need access to. For more
-// information, see IAM Best Practices (http://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html)
-// in the IAM User Guide.
-//
-// The temporary security credentials that are obtained by using the long-term
-// credentials of an IAM user are valid for the specified duration, from 900
-// seconds (15 minutes) up to a maximium of 129600 seconds (36 hours). The default
-// is 43200 seconds (12 hours). Temporary credentials that are obtained by using
-// AWS root account credentials have a maximum duration of 3600 seconds (1 hour).
-//
-// The temporary security credentials created by GetFederationToken can be used
-// to make API calls to any AWS service with the following exceptions:
-//
-//    * You cannot use these credentials to call any IAM APIs.
-//
-//    * You cannot call any STS APIs except GetCallerIdentity.
-//
-// Permissions
-//
-// The permissions for the temporary security credentials returned by GetFederationToken
-// are determined by a combination of the following:
-//
-//    * The policy or policies that are attached to the IAM user whose credentials
-//    are used to call GetFederationToken.
-//
-//    * The policy that is passed as a parameter in the call.
-//
-// The passed policy is attached to the temporary security credentials that
-// result from the GetFederationToken API call--that is, to the federated user.
-// When the federated user makes an AWS request, AWS evaluates the policy attached
-// to the federated user in combination with the policy or policies attached
-// to the IAM user whose credentials were used to call GetFederationToken. AWS
-// allows the federated user's request only when both the federated user and
-// the IAM user are explicitly allowed to perform the requested action. The
-// passed policy cannot grant more permissions than those that are defined in
-// the IAM user policy.
-//
-// A typical use case is that the permissions of the IAM user whose credentials
-// are used to call GetFederationToken are designed to allow access to all the
-// actions and resources that any federated user will need. Then, for individual
-// users, you pass a policy to the operation that scopes down the permissions
-// to a level that's appropriate to that individual user, using a policy that
-// allows only a subset of permissions that are granted to the IAM user.
-//
-// If you do not pass a policy, the resulting temporary security credentials
-// have no effective permissions. The only exception is when the temporary security
-// credentials are used to access a resource that has a resource-based policy
-// that specifically allows the federated user to access the resource.
-//
-// For more information about how permissions work, see Permissions for GetFederationToken
-// (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_getfederationtoken.html).
-// For information about using GetFederationToken to create temporary security
-// credentials, see GetFederationToken—Federation Through a Custom Identity
-// Broker (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_getfederationtoken).
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for AWS Security Token Service's
-// API operation GetFederationToken for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeMalformedPolicyDocumentException "MalformedPolicyDocument"
-//   The request was rejected because the policy document was malformed. The error
-//   message describes the specific error.
-//
-//   * ErrCodePackedPolicyTooLargeException "PackedPolicyTooLarge"
-//   The request was rejected because the policy document was too large. The error
-//   message describes how big the policy document is, in packed form, as a percentage
-//   of what the API allows.
-//
-//   * ErrCodeRegionDisabledException "RegionDisabledException"
-//   STS is not activated in the requested region for the account that is being
-//   asked to generate credentials. The account administrator must use the IAM
-//   console to activate STS in that region. For more information, see Activating
-//   and Deactivating AWS STS in an AWS Region (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html)
-//   in the IAM User Guide.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetFederationToken
-func (c *STS) GetFederationToken(input *GetFederationTokenInput) (*GetFederationTokenOutput, error) {
-	req, out := c.GetFederationTokenRequest(input)
-	return out, req.Send()
-}
-
-// GetFederationTokenWithContext is the same as GetFederationToken with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetFederationToken for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *STS) GetFederationTokenWithContext(ctx aws.Context, input *GetFederationTokenInput, opts ...request.Option) (*GetFederationTokenOutput, error) {
-	req, out := c.GetFederationTokenRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-const opGetSessionToken = "GetSessionToken"
-
-// GetSessionTokenRequest generates a "aws/request.Request" representing the
-// client's request for the GetSessionToken operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
-//
-// See GetSessionToken for usage and error information.
-//
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetSessionToken method directly
-// instead.
-//
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
-//
-//    // Example sending a request using the GetSessionTokenRequest method.
-//    req, resp := client.GetSessionTokenRequest(params)
-//
-//    err := req.Send()
-//    if err == nil { // resp is now filled
-//        fmt.Println(resp)
-//    }
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetSessionToken
-func (c *STS) GetSessionTokenRequest(input *GetSessionTokenInput) (req *request.Request, output *GetSessionTokenOutput) {
-	op := &request.Operation{
-		Name:       opGetSessionToken,
-		HTTPMethod: "POST",
-		HTTPPath:   "/",
-	}
-
-	if input == nil {
-		input = &GetSessionTokenInput{}
-	}
-
-	output = &GetSessionTokenOutput{}
-	req = c.newRequest(op, input, output)
-	return
-}
-
-// GetSessionToken API operation for AWS Security Token Service.
-//
-// Returns a set of temporary credentials for an AWS account or IAM user. The
-// credentials consist of an access key ID, a secret access key, and a security
-// token. Typically, you use GetSessionToken if you want to use MFA to protect
-// programmatic calls to specific AWS APIs like Amazon EC2 StopInstances. MFA-enabled
-// IAM users would need to call GetSessionToken and submit an MFA code that
-// is associated with their MFA device. Using the temporary security credentials
-// that are returned from the call, IAM users can then make programmatic calls
-// to APIs that require MFA authentication. If you do not supply a correct MFA
-// code, then the API returns an access denied error. For a comparison of GetSessionToken
-// with the other APIs that produce temporary credentials, see Requesting Temporary
-// Security Credentials (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html)
-// and Comparing the AWS STS APIs (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison)
-// in the IAM User Guide.
-//
-// The GetSessionToken action must be called by using the long-term AWS security
-// credentials of the AWS account or an IAM user. Credentials that are created
-// by IAM users are valid for the duration that you specify, from 900 seconds
-// (15 minutes) up to a maximum of 129600 seconds (36 hours), with a default
-// of 43200 seconds (12 hours); credentials that are created by using account
-// credentials can range from 900 seconds (15 minutes) up to a maximum of 3600
-// seconds (1 hour), with a default of 1 hour.
-//
-// The temporary security credentials created by GetSessionToken can be used
-// to make API calls to any AWS service with the following exceptions:
-//
-//    * You cannot call any IAM APIs unless MFA authentication information is
-//    included in the request.
-//
-//    * You cannot call any STS API exceptAssumeRole or GetCallerIdentity.
-//
-// We recommend that you do not call GetSessionToken with root account credentials.
-// Instead, follow our best practices (http://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#create-iam-users)
-// by creating one or more IAM users, giving them the necessary permissions,
-// and using IAM users for everyday interaction with AWS.
-//
-// The permissions associated with the temporary security credentials returned
-// by GetSessionToken are based on the permissions associated with account or
-// IAM user whose credentials are used to call the action. If GetSessionToken
-// is called using root account credentials, the temporary credentials have
-// root account permissions. Similarly, if GetSessionToken is called using the
-// credentials of an IAM user, the temporary credentials have the same permissions
-// as the IAM user.
-//
-// For more information about using GetSessionToken to create temporary credentials,
-// go to Temporary Credentials for Users in Untrusted Environments (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_getsessiontoken)
-// in the IAM User Guide.
-//
-// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
-// with awserr.Error's Code and Message methods to get detailed information about
-// the error.
-//
-// See the AWS API reference guide for AWS Security Token Service's
-// API operation GetSessionToken for usage and error information.
-//
-// Returned Error Codes:
-//   * ErrCodeRegionDisabledException "RegionDisabledException"
-//   STS is not activated in the requested region for the account that is being
-//   asked to generate credentials. The account administrator must use the IAM
-//   console to activate STS in that region. For more information, see Activating
-//   and Deactivating AWS STS in an AWS Region (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html)
-//   in the IAM User Guide.
-//
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetSessionToken
-func (c *STS) GetSessionToken(input *GetSessionTokenInput) (*GetSessionTokenOutput, error) {
-	req, out := c.GetSessionTokenRequest(input)
-	return out, req.Send()
-}
-
-// GetSessionTokenWithContext is the same as GetSessionToken with the addition of
-// the ability to pass a context and additional request options.
-//
-// See GetSessionToken for details on how to use this API operation.
-//
-// The context must be non-nil and will be used for request cancellation. If
-// the context is nil a panic will occur. In the future the SDK may create
-// sub-contexts for http.Requests. See https://golang.org/pkg/context/
-// for more information on using Contexts.
-func (c *STS) GetSessionTokenWithContext(ctx aws.Context, input *GetSessionTokenInput, opts ...request.Option) (*GetSessionTokenOutput, error) {
-	req, out := c.GetSessionTokenRequest(input)
-	req.SetContext(ctx)
-	req.ApplyOptions(opts...)
-	return out, req.Send()
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleRequest
-type AssumeRoleInput struct {
-	_ struct{} `type:"structure"`
-
-	// The duration, in seconds, of the role session. The value can range from 900
-	// seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set
-	// to 3600 seconds.
-	//
-	// This is separate from the duration of a console session that you might request
-	// using the returned credentials. The request to the federation endpoint for
-	// a console sign-in token takes a SessionDuration parameter that specifies
-	// the maximum length of the console session, separately from the DurationSeconds
-	// parameter on this API. For more information, see Creating a URL that Enables
-	// Federated Users to Access the AWS Management Console (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html)
-	// in the IAM User Guide.
-	DurationSeconds *int64 `min:"900" type:"integer"`
-
-	// A unique identifier that is used by third parties when assuming roles in
-	// their customers' accounts. For each role that the third party can assume,
-	// they should instruct their customers to ensure the role's trust policy checks
-	// for the external ID that the third party generated. Each time the third party
-	// assumes the role, they should pass the customer's external ID. The external
-	// ID is useful in order to help third parties bind a role to the customer who
-	// created it. For more information about the external ID, see How to Use an
-	// External ID When Granting Access to Your AWS Resources to a Third Party (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html)
-	// in the IAM User Guide.
-	//
-	// The regex used to validated this parameter is a string of characters consisting
-	// of upper- and lower-case alphanumeric characters with no spaces. You can
-	// also include underscores or any of the following characters: =,.@:/-
-	ExternalId *string `min:"2" type:"string"`
-
-	// An IAM policy in JSON format.
-	//
-	// This parameter is optional. If you pass a policy, the temporary security
-	// credentials that are returned by the operation have the permissions that
-	// are allowed by both (the intersection of) the access policy of the role that
-	// is being assumed, and the policy that you pass. This gives you a way to further
-	// restrict the permissions for the resulting temporary security credentials.
-	// You cannot use the passed policy to grant permissions that are in excess
-	// of those allowed by the access policy of the role that is being assumed.
-	// For more information, see Permissions for AssumeRole, AssumeRoleWithSAML,
-	// and AssumeRoleWithWebIdentity (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html)
-	// in the IAM User Guide.
-	//
-	// The format for this parameter, as described by its regex pattern, is a string
-	// of characters up to 2048 characters in length. The characters can be any
-	// ASCII character from the space character to the end of the valid character
-	// list (\u0020-\u00FF). It can also include the tab (\u0009), linefeed (\u000A),
-	// and carriage return (\u000D) characters.
-	//
-	// The policy plain text must be 2048 bytes or shorter. However, an internal
-	// conversion compresses it into a packed binary format with a separate limit.
-	// The PackedPolicySize response element indicates by percentage how close to
-	// the upper size limit the policy is, with 100% equaling the maximum allowed
-	// size.
-	Policy *string `min:"1" type:"string"`
-
-	// The Amazon Resource Name (ARN) of the role to assume.
-	//
-	// RoleArn is a required field
-	RoleArn *string `min:"20" type:"string" required:"true"`
-
-	// An identifier for the assumed role session.
-	//
-	// Use the role session name to uniquely identify a session when the same role
-	// is assumed by different principals or for different reasons. In cross-account
-	// scenarios, the role session name is visible to, and can be logged by the
-	// account that owns the role. The role session name is also used in the ARN
-	// of the assumed role principal. This means that subsequent cross-account API
-	// requests using the temporary security credentials will expose the role session
-	// name to the external account in their CloudTrail logs.
-	//
-	// The regex used to validate this parameter is a string of characters consisting
-	// of upper- and lower-case alphanumeric characters with no spaces. You can
-	// also include underscores or any of the following characters: =,.@-
-	//
-	// RoleSessionName is a required field
-	RoleSessionName *string `min:"2" type:"string" required:"true"`
-
-	// The identification number of the MFA device that is associated with the user
-	// who is making the AssumeRole call. Specify this value if the trust policy
-	// of the role being assumed includes a condition that requires MFA authentication.
-	// The value is either the serial number for a hardware device (such as GAHT12345678)
-	// or an Amazon Resource Name (ARN) for a virtual device (such as arn:aws:iam::123456789012:mfa/user).
-	//
-	// The regex used to validate this parameter is a string of characters consisting
-	// of upper- and lower-case alphanumeric characters with no spaces. You can
-	// also include underscores or any of the following characters: =,.@-
-	SerialNumber *string `min:"9" type:"string"`
-
-	// The value provided by the MFA device, if the trust policy of the role being
-	// assumed requires MFA (that is, if the policy includes a condition that tests
-	// for MFA). If the role being assumed requires MFA and if the TokenCode value
-	// is missing or expired, the AssumeRole call returns an "access denied" error.
-	//
-	// The format for this parameter, as described by its regex pattern, is a sequence
-	// of six numeric digits.
-	TokenCode *string `min:"6" type:"string"`
-}
-
-// String returns the string representation
-func (s AssumeRoleInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AssumeRoleInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *AssumeRoleInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "AssumeRoleInput"}
-	if s.DurationSeconds != nil && *s.DurationSeconds < 900 {
-		invalidParams.Add(request.NewErrParamMinValue("DurationSeconds", 900))
-	}
-	if s.ExternalId != nil && len(*s.ExternalId) < 2 {
-		invalidParams.Add(request.NewErrParamMinLen("ExternalId", 2))
-	}
-	if s.Policy != nil && len(*s.Policy) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Policy", 1))
-	}
-	if s.RoleArn == nil {
-		invalidParams.Add(request.NewErrParamRequired("RoleArn"))
-	}
-	if s.RoleArn != nil && len(*s.RoleArn) < 20 {
-		invalidParams.Add(request.NewErrParamMinLen("RoleArn", 20))
-	}
-	if s.RoleSessionName == nil {
-		invalidParams.Add(request.NewErrParamRequired("RoleSessionName"))
-	}
-	if s.RoleSessionName != nil && len(*s.RoleSessionName) < 2 {
-		invalidParams.Add(request.NewErrParamMinLen("RoleSessionName", 2))
-	}
-	if s.SerialNumber != nil && len(*s.SerialNumber) < 9 {
-		invalidParams.Add(request.NewErrParamMinLen("SerialNumber", 9))
-	}
-	if s.TokenCode != nil && len(*s.TokenCode) < 6 {
-		invalidParams.Add(request.NewErrParamMinLen("TokenCode", 6))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetDurationSeconds sets the DurationSeconds field's value.
-func (s *AssumeRoleInput) SetDurationSeconds(v int64) *AssumeRoleInput {
-	s.DurationSeconds = &v
-	return s
-}
-
-// SetExternalId sets the ExternalId field's value.
-func (s *AssumeRoleInput) SetExternalId(v string) *AssumeRoleInput {
-	s.ExternalId = &v
-	return s
-}
-
-// SetPolicy sets the Policy field's value.
-func (s *AssumeRoleInput) SetPolicy(v string) *AssumeRoleInput {
-	s.Policy = &v
-	return s
-}
-
-// SetRoleArn sets the RoleArn field's value.
-func (s *AssumeRoleInput) SetRoleArn(v string) *AssumeRoleInput {
-	s.RoleArn = &v
-	return s
-}
-
-// SetRoleSessionName sets the RoleSessionName field's value.
-func (s *AssumeRoleInput) SetRoleSessionName(v string) *AssumeRoleInput {
-	s.RoleSessionName = &v
-	return s
-}
-
-// SetSerialNumber sets the SerialNumber field's value.
-func (s *AssumeRoleInput) SetSerialNumber(v string) *AssumeRoleInput {
-	s.SerialNumber = &v
-	return s
-}
-
-// SetTokenCode sets the TokenCode field's value.
-func (s *AssumeRoleInput) SetTokenCode(v string) *AssumeRoleInput {
-	s.TokenCode = &v
-	return s
-}
-
-// Contains the response to a successful AssumeRole request, including temporary
-// AWS credentials that can be used to make AWS requests.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleResponse
-type AssumeRoleOutput struct {
-	_ struct{} `type:"structure"`
-
-	// The Amazon Resource Name (ARN) and the assumed role ID, which are identifiers
-	// that you can use to refer to the resulting temporary security credentials.
-	// For example, you can reference these credentials as a principal in a resource-based
-	// policy by using the ARN or assumed role ID. The ARN and ID include the RoleSessionName
-	// that you specified when you called AssumeRole.
-	AssumedRoleUser *AssumedRoleUser `type:"structure"`
-
-	// The temporary security credentials, which include an access key ID, a secret
-	// access key, and a security (or session) token.
-	//
-	// Note: The size of the security token that STS APIs return is not fixed. We
-	// strongly recommend that you make no assumptions about the maximum size. As
-	// of this writing, the typical size is less than 4096 bytes, but that can vary.
-	// Also, future updates to AWS might require larger sizes.
-	Credentials *Credentials `type:"structure"`
-
-	// A percentage value that indicates the size of the policy in packed form.
-	// The service rejects any policy with a packed size greater than 100 percent,
-	// which means the policy exceeded the allowed space.
-	PackedPolicySize *int64 `type:"integer"`
-}
-
-// String returns the string representation
-func (s AssumeRoleOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AssumeRoleOutput) GoString() string {
-	return s.String()
-}
-
-// SetAssumedRoleUser sets the AssumedRoleUser field's value.
-func (s *AssumeRoleOutput) SetAssumedRoleUser(v *AssumedRoleUser) *AssumeRoleOutput {
-	s.AssumedRoleUser = v
-	return s
-}
-
-// SetCredentials sets the Credentials field's value.
-func (s *AssumeRoleOutput) SetCredentials(v *Credentials) *AssumeRoleOutput {
-	s.Credentials = v
-	return s
-}
-
-// SetPackedPolicySize sets the PackedPolicySize field's value.
-func (s *AssumeRoleOutput) SetPackedPolicySize(v int64) *AssumeRoleOutput {
-	s.PackedPolicySize = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithSAMLRequest
-type AssumeRoleWithSAMLInput struct {
-	_ struct{} `type:"structure"`
-
-	// The duration, in seconds, of the role session. The value can range from 900
-	// seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set
-	// to 3600 seconds. An expiration can also be specified in the SAML authentication
-	// response's SessionNotOnOrAfter value. The actual expiration time is whichever
-	// value is shorter.
-	//
-	// This is separate from the duration of a console session that you might request
-	// using the returned credentials. The request to the federation endpoint for
-	// a console sign-in token takes a SessionDuration parameter that specifies
-	// the maximum length of the console session, separately from the DurationSeconds
-	// parameter on this API. For more information, see Enabling SAML 2.0 Federated
-	// Users to Access the AWS Management Console (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-saml.html)
-	// in the IAM User Guide.
-	DurationSeconds *int64 `min:"900" type:"integer"`
-
-	// An IAM policy in JSON format.
-	//
-	// The policy parameter is optional. If you pass a policy, the temporary security
-	// credentials that are returned by the operation have the permissions that
-	// are allowed by both the access policy of the role that is being assumed,
-	// and the policy that you pass. This gives you a way to further restrict the
-	// permissions for the resulting temporary security credentials. You cannot
-	// use the passed policy to grant permissions that are in excess of those allowed
-	// by the access policy of the role that is being assumed. For more information,
-	// Permissions for AssumeRole, AssumeRoleWithSAML, and AssumeRoleWithWebIdentity
-	// (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html)
-	// in the IAM User Guide.
-	//
-	// The format for this parameter, as described by its regex pattern, is a string
-	// of characters up to 2048 characters in length. The characters can be any
-	// ASCII character from the space character to the end of the valid character
-	// list (\u0020-\u00FF). It can also include the tab (\u0009), linefeed (\u000A),
-	// and carriage return (\u000D) characters.
-	//
-	// The policy plain text must be 2048 bytes or shorter. However, an internal
-	// conversion compresses it into a packed binary format with a separate limit.
-	// The PackedPolicySize response element indicates by percentage how close to
-	// the upper size limit the policy is, with 100% equaling the maximum allowed
-	// size.
-	Policy *string `min:"1" type:"string"`
-
-	// The Amazon Resource Name (ARN) of the SAML provider in IAM that describes
-	// the IdP.
-	//
-	// PrincipalArn is a required field
-	PrincipalArn *string `min:"20" type:"string" required:"true"`
-
-	// The Amazon Resource Name (ARN) of the role that the caller is assuming.
-	//
-	// RoleArn is a required field
-	RoleArn *string `min:"20" type:"string" required:"true"`
-
-	// The base-64 encoded SAML authentication response provided by the IdP.
-	//
-	// For more information, see Configuring a Relying Party and Adding Claims (http://docs.aws.amazon.com/IAM/latest/UserGuide/create-role-saml-IdP-tasks.html)
-	// in the Using IAM guide.
-	//
-	// SAMLAssertion is a required field
-	SAMLAssertion *string `min:"4" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s AssumeRoleWithSAMLInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AssumeRoleWithSAMLInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *AssumeRoleWithSAMLInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "AssumeRoleWithSAMLInput"}
-	if s.DurationSeconds != nil && *s.DurationSeconds < 900 {
-		invalidParams.Add(request.NewErrParamMinValue("DurationSeconds", 900))
-	}
-	if s.Policy != nil && len(*s.Policy) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Policy", 1))
-	}
-	if s.PrincipalArn == nil {
-		invalidParams.Add(request.NewErrParamRequired("PrincipalArn"))
-	}
-	if s.PrincipalArn != nil && len(*s.PrincipalArn) < 20 {
-		invalidParams.Add(request.NewErrParamMinLen("PrincipalArn", 20))
-	}
-	if s.RoleArn == nil {
-		invalidParams.Add(request.NewErrParamRequired("RoleArn"))
-	}
-	if s.RoleArn != nil && len(*s.RoleArn) < 20 {
-		invalidParams.Add(request.NewErrParamMinLen("RoleArn", 20))
-	}
-	if s.SAMLAssertion == nil {
-		invalidParams.Add(request.NewErrParamRequired("SAMLAssertion"))
-	}
-	if s.SAMLAssertion != nil && len(*s.SAMLAssertion) < 4 {
-		invalidParams.Add(request.NewErrParamMinLen("SAMLAssertion", 4))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetDurationSeconds sets the DurationSeconds field's value.
-func (s *AssumeRoleWithSAMLInput) SetDurationSeconds(v int64) *AssumeRoleWithSAMLInput {
-	s.DurationSeconds = &v
-	return s
-}
-
-// SetPolicy sets the Policy field's value.
-func (s *AssumeRoleWithSAMLInput) SetPolicy(v string) *AssumeRoleWithSAMLInput {
-	s.Policy = &v
-	return s
-}
-
-// SetPrincipalArn sets the PrincipalArn field's value.
-func (s *AssumeRoleWithSAMLInput) SetPrincipalArn(v string) *AssumeRoleWithSAMLInput {
-	s.PrincipalArn = &v
-	return s
-}
-
-// SetRoleArn sets the RoleArn field's value.
-func (s *AssumeRoleWithSAMLInput) SetRoleArn(v string) *AssumeRoleWithSAMLInput {
-	s.RoleArn = &v
-	return s
-}
-
-// SetSAMLAssertion sets the SAMLAssertion field's value.
-func (s *AssumeRoleWithSAMLInput) SetSAMLAssertion(v string) *AssumeRoleWithSAMLInput {
-	s.SAMLAssertion = &v
-	return s
-}
-
-// Contains the response to a successful AssumeRoleWithSAML request, including
-// temporary AWS credentials that can be used to make AWS requests.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithSAMLResponse
-type AssumeRoleWithSAMLOutput struct {
-	_ struct{} `type:"structure"`
-
-	// The identifiers for the temporary security credentials that the operation
-	// returns.
-	AssumedRoleUser *AssumedRoleUser `type:"structure"`
-
-	// The value of the Recipient attribute of the SubjectConfirmationData element
-	// of the SAML assertion.
-	Audience *string `type:"string"`
-
-	// The temporary security credentials, which include an access key ID, a secret
-	// access key, and a security (or session) token.
-	//
-	// Note: The size of the security token that STS APIs return is not fixed. We
-	// strongly recommend that you make no assumptions about the maximum size. As
-	// of this writing, the typical size is less than 4096 bytes, but that can vary.
-	// Also, future updates to AWS might require larger sizes.
-	Credentials *Credentials `type:"structure"`
-
-	// The value of the Issuer element of the SAML assertion.
-	Issuer *string `type:"string"`
-
-	// A hash value based on the concatenation of the Issuer response value, the
-	// AWS account ID, and the friendly name (the last part of the ARN) of the SAML
-	// provider in IAM. The combination of NameQualifier and Subject can be used
-	// to uniquely identify a federated user.
-	//
-	// The following pseudocode shows how the hash value is calculated:
-	//
-	// BASE64 ( SHA1 ( "https://example.com/saml" + "123456789012" + "/MySAMLIdP"
-	// ) )
-	NameQualifier *string `type:"string"`
-
-	// A percentage value that indicates the size of the policy in packed form.
-	// The service rejects any policy with a packed size greater than 100 percent,
-	// which means the policy exceeded the allowed space.
-	PackedPolicySize *int64 `type:"integer"`
-
-	// The value of the NameID element in the Subject element of the SAML assertion.
-	Subject *string `type:"string"`
-
-	// The format of the name ID, as defined by the Format attribute in the NameID
-	// element of the SAML assertion. Typical examples of the format are transient
-	// or persistent.
-	//
-	// If the format includes the prefix urn:oasis:names:tc:SAML:2.0:nameid-format,
-	// that prefix is removed. For example, urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-	// is returned as transient. If the format includes any other prefix, the format
-	// is returned with no modifications.
-	SubjectType *string `type:"string"`
-}
-
-// String returns the string representation
-func (s AssumeRoleWithSAMLOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AssumeRoleWithSAMLOutput) GoString() string {
-	return s.String()
-}
-
-// SetAssumedRoleUser sets the AssumedRoleUser field's value.
-func (s *AssumeRoleWithSAMLOutput) SetAssumedRoleUser(v *AssumedRoleUser) *AssumeRoleWithSAMLOutput {
-	s.AssumedRoleUser = v
-	return s
-}
-
-// SetAudience sets the Audience field's value.
-func (s *AssumeRoleWithSAMLOutput) SetAudience(v string) *AssumeRoleWithSAMLOutput {
-	s.Audience = &v
-	return s
-}
-
-// SetCredentials sets the Credentials field's value.
-func (s *AssumeRoleWithSAMLOutput) SetCredentials(v *Credentials) *AssumeRoleWithSAMLOutput {
-	s.Credentials = v
-	return s
-}
-
-// SetIssuer sets the Issuer field's value.
-func (s *AssumeRoleWithSAMLOutput) SetIssuer(v string) *AssumeRoleWithSAMLOutput {
-	s.Issuer = &v
-	return s
-}
-
-// SetNameQualifier sets the NameQualifier field's value.
-func (s *AssumeRoleWithSAMLOutput) SetNameQualifier(v string) *AssumeRoleWithSAMLOutput {
-	s.NameQualifier = &v
-	return s
-}
-
-// SetPackedPolicySize sets the PackedPolicySize field's value.
-func (s *AssumeRoleWithSAMLOutput) SetPackedPolicySize(v int64) *AssumeRoleWithSAMLOutput {
-	s.PackedPolicySize = &v
-	return s
-}
-
-// SetSubject sets the Subject field's value.
-func (s *AssumeRoleWithSAMLOutput) SetSubject(v string) *AssumeRoleWithSAMLOutput {
-	s.Subject = &v
-	return s
-}
-
-// SetSubjectType sets the SubjectType field's value.
-func (s *AssumeRoleWithSAMLOutput) SetSubjectType(v string) *AssumeRoleWithSAMLOutput {
-	s.SubjectType = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithWebIdentityRequest
-type AssumeRoleWithWebIdentityInput struct {
-	_ struct{} `type:"structure"`
-
-	// The duration, in seconds, of the role session. The value can range from 900
-	// seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set
-	// to 3600 seconds.
-	//
-	// This is separate from the duration of a console session that you might request
-	// using the returned credentials. The request to the federation endpoint for
-	// a console sign-in token takes a SessionDuration parameter that specifies
-	// the maximum length of the console session, separately from the DurationSeconds
-	// parameter on this API. For more information, see Creating a URL that Enables
-	// Federated Users to Access the AWS Management Console (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html)
-	// in the IAM User Guide.
-	DurationSeconds *int64 `min:"900" type:"integer"`
-
-	// An IAM policy in JSON format.
-	//
-	// The policy parameter is optional. If you pass a policy, the temporary security
-	// credentials that are returned by the operation have the permissions that
-	// are allowed by both the access policy of the role that is being assumed,
-	// and the policy that you pass. This gives you a way to further restrict the
-	// permissions for the resulting temporary security credentials. You cannot
-	// use the passed policy to grant permissions that are in excess of those allowed
-	// by the access policy of the role that is being assumed. For more information,
-	// see Permissions for AssumeRoleWithWebIdentity (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_assumerole.html)
-	// in the IAM User Guide.
-	//
-	// The format for this parameter, as described by its regex pattern, is a string
-	// of characters up to 2048 characters in length. The characters can be any
-	// ASCII character from the space character to the end of the valid character
-	// list (\u0020-\u00FF). It can also include the tab (\u0009), linefeed (\u000A),
-	// and carriage return (\u000D) characters.
-	//
-	// The policy plain text must be 2048 bytes or shorter. However, an internal
-	// conversion compresses it into a packed binary format with a separate limit.
-	// The PackedPolicySize response element indicates by percentage how close to
-	// the upper size limit the policy is, with 100% equaling the maximum allowed
-	// size.
-	Policy *string `min:"1" type:"string"`
-
-	// The fully qualified host component of the domain name of the identity provider.
-	//
-	// Specify this value only for OAuth 2.0 access tokens. Currently www.amazon.com
-	// and graph.facebook.com are the only supported identity providers for OAuth
-	// 2.0 access tokens. Do not include URL schemes and port numbers.
-	//
-	// Do not specify this value for OpenID Connect ID tokens.
-	ProviderId *string `min:"4" type:"string"`
-
-	// The Amazon Resource Name (ARN) of the role that the caller is assuming.
-	//
-	// RoleArn is a required field
-	RoleArn *string `min:"20" type:"string" required:"true"`
-
-	// An identifier for the assumed role session. Typically, you pass the name
-	// or identifier that is associated with the user who is using your application.
-	// That way, the temporary security credentials that your application will use
-	// are associated with that user. This session name is included as part of the
-	// ARN and assumed role ID in the AssumedRoleUser response element.
-	//
-	// The regex used to validate this parameter is a string of characters consisting
-	// of upper- and lower-case alphanumeric characters with no spaces. You can
-	// also include underscores or any of the following characters: =,.@-
-	//
-	// RoleSessionName is a required field
-	RoleSessionName *string `min:"2" type:"string" required:"true"`
-
-	// The OAuth 2.0 access token or OpenID Connect ID token that is provided by
-	// the identity provider. Your application must get this token by authenticating
-	// the user who is using your application with a web identity provider before
-	// the application makes an AssumeRoleWithWebIdentity call.
-	//
-	// WebIdentityToken is a required field
-	WebIdentityToken *string `min:"4" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s AssumeRoleWithWebIdentityInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AssumeRoleWithWebIdentityInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *AssumeRoleWithWebIdentityInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "AssumeRoleWithWebIdentityInput"}
-	if s.DurationSeconds != nil && *s.DurationSeconds < 900 {
-		invalidParams.Add(request.NewErrParamMinValue("DurationSeconds", 900))
-	}
-	if s.Policy != nil && len(*s.Policy) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Policy", 1))
-	}
-	if s.ProviderId != nil && len(*s.ProviderId) < 4 {
-		invalidParams.Add(request.NewErrParamMinLen("ProviderId", 4))
-	}
-	if s.RoleArn == nil {
-		invalidParams.Add(request.NewErrParamRequired("RoleArn"))
-	}
-	if s.RoleArn != nil && len(*s.RoleArn) < 20 {
-		invalidParams.Add(request.NewErrParamMinLen("RoleArn", 20))
-	}
-	if s.RoleSessionName == nil {
-		invalidParams.Add(request.NewErrParamRequired("RoleSessionName"))
-	}
-	if s.RoleSessionName != nil && len(*s.RoleSessionName) < 2 {
-		invalidParams.Add(request.NewErrParamMinLen("RoleSessionName", 2))
-	}
-	if s.WebIdentityToken == nil {
-		invalidParams.Add(request.NewErrParamRequired("WebIdentityToken"))
-	}
-	if s.WebIdentityToken != nil && len(*s.WebIdentityToken) < 4 {
-		invalidParams.Add(request.NewErrParamMinLen("WebIdentityToken", 4))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetDurationSeconds sets the DurationSeconds field's value.
-func (s *AssumeRoleWithWebIdentityInput) SetDurationSeconds(v int64) *AssumeRoleWithWebIdentityInput {
-	s.DurationSeconds = &v
-	return s
-}
-
-// SetPolicy sets the Policy field's value.
-func (s *AssumeRoleWithWebIdentityInput) SetPolicy(v string) *AssumeRoleWithWebIdentityInput {
-	s.Policy = &v
-	return s
-}
-
-// SetProviderId sets the ProviderId field's value.
-func (s *AssumeRoleWithWebIdentityInput) SetProviderId(v string) *AssumeRoleWithWebIdentityInput {
-	s.ProviderId = &v
-	return s
-}
-
-// SetRoleArn sets the RoleArn field's value.
-func (s *AssumeRoleWithWebIdentityInput) SetRoleArn(v string) *AssumeRoleWithWebIdentityInput {
-	s.RoleArn = &v
-	return s
-}
-
-// SetRoleSessionName sets the RoleSessionName field's value.
-func (s *AssumeRoleWithWebIdentityInput) SetRoleSessionName(v string) *AssumeRoleWithWebIdentityInput {
-	s.RoleSessionName = &v
-	return s
-}
-
-// SetWebIdentityToken sets the WebIdentityToken field's value.
-func (s *AssumeRoleWithWebIdentityInput) SetWebIdentityToken(v string) *AssumeRoleWithWebIdentityInput {
-	s.WebIdentityToken = &v
-	return s
-}
-
-// Contains the response to a successful AssumeRoleWithWebIdentity request,
-// including temporary AWS credentials that can be used to make AWS requests.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithWebIdentityResponse
-type AssumeRoleWithWebIdentityOutput struct {
-	_ struct{} `type:"structure"`
-
-	// The Amazon Resource Name (ARN) and the assumed role ID, which are identifiers
-	// that you can use to refer to the resulting temporary security credentials.
-	// For example, you can reference these credentials as a principal in a resource-based
-	// policy by using the ARN or assumed role ID. The ARN and ID include the RoleSessionName
-	// that you specified when you called AssumeRole.
-	AssumedRoleUser *AssumedRoleUser `type:"structure"`
-
-	// The intended audience (also known as client ID) of the web identity token.
-	// This is traditionally the client identifier issued to the application that
-	// requested the web identity token.
-	Audience *string `type:"string"`
-
-	// The temporary security credentials, which include an access key ID, a secret
-	// access key, and a security token.
-	//
-	// Note: The size of the security token that STS APIs return is not fixed. We
-	// strongly recommend that you make no assumptions about the maximum size. As
-	// of this writing, the typical size is less than 4096 bytes, but that can vary.
-	// Also, future updates to AWS might require larger sizes.
-	Credentials *Credentials `type:"structure"`
-
-	// A percentage value that indicates the size of the policy in packed form.
-	// The service rejects any policy with a packed size greater than 100 percent,
-	// which means the policy exceeded the allowed space.
-	PackedPolicySize *int64 `type:"integer"`
-
-	// The issuing authority of the web identity token presented. For OpenID Connect
-	// ID Tokens this contains the value of the iss field. For OAuth 2.0 access
-	// tokens, this contains the value of the ProviderId parameter that was passed
-	// in the AssumeRoleWithWebIdentity request.
-	Provider *string `type:"string"`
-
-	// The unique user identifier that is returned by the identity provider. This
-	// identifier is associated with the WebIdentityToken that was submitted with
-	// the AssumeRoleWithWebIdentity call. The identifier is typically unique to
-	// the user and the application that acquired the WebIdentityToken (pairwise
-	// identifier). For OpenID Connect ID tokens, this field contains the value
-	// returned by the identity provider as the token's sub (Subject) claim.
-	SubjectFromWebIdentityToken *string `min:"6" type:"string"`
-}
-
-// String returns the string representation
-func (s AssumeRoleWithWebIdentityOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AssumeRoleWithWebIdentityOutput) GoString() string {
-	return s.String()
-}
-
-// SetAssumedRoleUser sets the AssumedRoleUser field's value.
-func (s *AssumeRoleWithWebIdentityOutput) SetAssumedRoleUser(v *AssumedRoleUser) *AssumeRoleWithWebIdentityOutput {
-	s.AssumedRoleUser = v
-	return s
-}
-
-// SetAudience sets the Audience field's value.
-func (s *AssumeRoleWithWebIdentityOutput) SetAudience(v string) *AssumeRoleWithWebIdentityOutput {
-	s.Audience = &v
-	return s
-}
-
-// SetCredentials sets the Credentials field's value.
-func (s *AssumeRoleWithWebIdentityOutput) SetCredentials(v *Credentials) *AssumeRoleWithWebIdentityOutput {
-	s.Credentials = v
-	return s
-}
-
-// SetPackedPolicySize sets the PackedPolicySize field's value.
-func (s *AssumeRoleWithWebIdentityOutput) SetPackedPolicySize(v int64) *AssumeRoleWithWebIdentityOutput {
-	s.PackedPolicySize = &v
-	return s
-}
-
-// SetProvider sets the Provider field's value.
-func (s *AssumeRoleWithWebIdentityOutput) SetProvider(v string) *AssumeRoleWithWebIdentityOutput {
-	s.Provider = &v
-	return s
-}
-
-// SetSubjectFromWebIdentityToken sets the SubjectFromWebIdentityToken field's value.
-func (s *AssumeRoleWithWebIdentityOutput) SetSubjectFromWebIdentityToken(v string) *AssumeRoleWithWebIdentityOutput {
-	s.SubjectFromWebIdentityToken = &v
-	return s
-}
-
-// The identifiers for the temporary security credentials that the operation
-// returns.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumedRoleUser
-type AssumedRoleUser struct {
-	_ struct{} `type:"structure"`
-
-	// The ARN of the temporary security credentials that are returned from the
-	// AssumeRole action. For more information about ARNs and how to use them in
-	// policies, see IAM Identifiers (http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html)
-	// in Using IAM.
-	//
-	// Arn is a required field
-	Arn *string `min:"20" type:"string" required:"true"`
-
-	// A unique identifier that contains the role ID and the role session name of
-	// the role that is being assumed. The role ID is generated by AWS when the
-	// role is created.
-	//
-	// AssumedRoleId is a required field
-	AssumedRoleId *string `min:"2" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s AssumedRoleUser) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s AssumedRoleUser) GoString() string {
-	return s.String()
-}
-
-// SetArn sets the Arn field's value.
-func (s *AssumedRoleUser) SetArn(v string) *AssumedRoleUser {
-	s.Arn = &v
-	return s
-}
-
-// SetAssumedRoleId sets the AssumedRoleId field's value.
-func (s *AssumedRoleUser) SetAssumedRoleId(v string) *AssumedRoleUser {
-	s.AssumedRoleId = &v
-	return s
-}
-
-// AWS credentials for API authentication.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/Credentials
-type Credentials struct {
-	_ struct{} `type:"structure"`
-
-	// The access key ID that identifies the temporary security credentials.
-	//
-	// AccessKeyId is a required field
-	AccessKeyId *string `min:"16" type:"string" required:"true"`
-
-	// The date on which the current credentials expire.
-	//
-	// Expiration is a required field
-	Expiration *time.Time `type:"timestamp" timestampFormat:"iso8601" required:"true"`
-
-	// The secret access key that can be used to sign requests.
-	//
-	// SecretAccessKey is a required field
-	SecretAccessKey *string `type:"string" required:"true"`
-
-	// The token that users must pass to the service API to use the temporary credentials.
-	//
-	// SessionToken is a required field
-	SessionToken *string `type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s Credentials) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s Credentials) GoString() string {
-	return s.String()
-}
-
-// SetAccessKeyId sets the AccessKeyId field's value.
-func (s *Credentials) SetAccessKeyId(v string) *Credentials {
-	s.AccessKeyId = &v
-	return s
-}
-
-// SetExpiration sets the Expiration field's value.
-func (s *Credentials) SetExpiration(v time.Time) *Credentials {
-	s.Expiration = &v
-	return s
-}
-
-// SetSecretAccessKey sets the SecretAccessKey field's value.
-func (s *Credentials) SetSecretAccessKey(v string) *Credentials {
-	s.SecretAccessKey = &v
-	return s
-}
-
-// SetSessionToken sets the SessionToken field's value.
-func (s *Credentials) SetSessionToken(v string) *Credentials {
-	s.SessionToken = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/DecodeAuthorizationMessageRequest
-type DecodeAuthorizationMessageInput struct {
-	_ struct{} `type:"structure"`
-
-	// The encoded message that was returned with the response.
-	//
-	// EncodedMessage is a required field
-	EncodedMessage *string `min:"1" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s DecodeAuthorizationMessageInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DecodeAuthorizationMessageInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *DecodeAuthorizationMessageInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "DecodeAuthorizationMessageInput"}
-	if s.EncodedMessage == nil {
-		invalidParams.Add(request.NewErrParamRequired("EncodedMessage"))
-	}
-	if s.EncodedMessage != nil && len(*s.EncodedMessage) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("EncodedMessage", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetEncodedMessage sets the EncodedMessage field's value.
-func (s *DecodeAuthorizationMessageInput) SetEncodedMessage(v string) *DecodeAuthorizationMessageInput {
-	s.EncodedMessage = &v
-	return s
-}
-
-// A document that contains additional information about the authorization status
-// of a request from an encoded message that is returned in response to an AWS
-// request.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/DecodeAuthorizationMessageResponse
-type DecodeAuthorizationMessageOutput struct {
-	_ struct{} `type:"structure"`
-
-	// An XML document that contains the decoded message.
-	DecodedMessage *string `type:"string"`
-}
-
-// String returns the string representation
-func (s DecodeAuthorizationMessageOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s DecodeAuthorizationMessageOutput) GoString() string {
-	return s.String()
-}
-
-// SetDecodedMessage sets the DecodedMessage field's value.
-func (s *DecodeAuthorizationMessageOutput) SetDecodedMessage(v string) *DecodeAuthorizationMessageOutput {
-	s.DecodedMessage = &v
-	return s
-}
-
-// Identifiers for the federated user that is associated with the credentials.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/FederatedUser
-type FederatedUser struct {
-	_ struct{} `type:"structure"`
-
-	// The ARN that specifies the federated user that is associated with the credentials.
-	// For more information about ARNs and how to use them in policies, see IAM
-	// Identifiers (http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html)
-	// in Using IAM.
-	//
-	// Arn is a required field
-	Arn *string `min:"20" type:"string" required:"true"`
-
-	// The string that identifies the federated user associated with the credentials,
-	// similar to the unique ID of an IAM user.
-	//
-	// FederatedUserId is a required field
-	FederatedUserId *string `min:"2" type:"string" required:"true"`
-}
-
-// String returns the string representation
-func (s FederatedUser) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s FederatedUser) GoString() string {
-	return s.String()
-}
-
-// SetArn sets the Arn field's value.
-func (s *FederatedUser) SetArn(v string) *FederatedUser {
-	s.Arn = &v
-	return s
-}
-
-// SetFederatedUserId sets the FederatedUserId field's value.
-func (s *FederatedUser) SetFederatedUserId(v string) *FederatedUser {
-	s.FederatedUserId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetCallerIdentityRequest
-type GetCallerIdentityInput struct {
-	_ struct{} `type:"structure"`
-}
-
-// String returns the string representation
-func (s GetCallerIdentityInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetCallerIdentityInput) GoString() string {
-	return s.String()
-}
-
-// Contains the response to a successful GetCallerIdentity request, including
-// information about the entity making the request.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetCallerIdentityResponse
-type GetCallerIdentityOutput struct {
-	_ struct{} `type:"structure"`
-
-	// The AWS account ID number of the account that owns or contains the calling
-	// entity.
-	Account *string `type:"string"`
-
-	// The AWS ARN associated with the calling entity.
-	Arn *string `min:"20" type:"string"`
-
-	// The unique identifier of the calling entity. The exact value depends on the
-	// type of entity making the call. The values returned are those listed in the
-	// aws:userid column in the Principal table (http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_variables.html#principaltable)
-	// found on the Policy Variables reference page in the IAM User Guide.
-	UserId *string `type:"string"`
-}
-
-// String returns the string representation
-func (s GetCallerIdentityOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetCallerIdentityOutput) GoString() string {
-	return s.String()
-}
-
-// SetAccount sets the Account field's value.
-func (s *GetCallerIdentityOutput) SetAccount(v string) *GetCallerIdentityOutput {
-	s.Account = &v
-	return s
-}
-
-// SetArn sets the Arn field's value.
-func (s *GetCallerIdentityOutput) SetArn(v string) *GetCallerIdentityOutput {
-	s.Arn = &v
-	return s
-}
-
-// SetUserId sets the UserId field's value.
-func (s *GetCallerIdentityOutput) SetUserId(v string) *GetCallerIdentityOutput {
-	s.UserId = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetFederationTokenRequest
-type GetFederationTokenInput struct {
-	_ struct{} `type:"structure"`
-
-	// The duration, in seconds, that the session should last. Acceptable durations
-	// for federation sessions range from 900 seconds (15 minutes) to 129600 seconds
-	// (36 hours), with 43200 seconds (12 hours) as the default. Sessions obtained
-	// using AWS account (root) credentials are restricted to a maximum of 3600
-	// seconds (one hour). If the specified duration is longer than one hour, the
-	// session obtained by using AWS account (root) credentials defaults to one
-	// hour.
-	DurationSeconds *int64 `min:"900" type:"integer"`
-
-	// The name of the federated user. The name is used as an identifier for the
-	// temporary security credentials (such as Bob). For example, you can reference
-	// the federated user name in a resource-based policy, such as in an Amazon
-	// S3 bucket policy.
-	//
-	// The regex used to validate this parameter is a string of characters consisting
-	// of upper- and lower-case alphanumeric characters with no spaces. You can
-	// also include underscores or any of the following characters: =,.@-
-	//
-	// Name is a required field
-	Name *string `min:"2" type:"string" required:"true"`
-
-	// An IAM policy in JSON format that is passed with the GetFederationToken call
-	// and evaluated along with the policy or policies that are attached to the
-	// IAM user whose credentials are used to call GetFederationToken. The passed
-	// policy is used to scope down the permissions that are available to the IAM
-	// user, by allowing only a subset of the permissions that are granted to the
-	// IAM user. The passed policy cannot grant more permissions than those granted
-	// to the IAM user. The final permissions for the federated user are the most
-	// restrictive set based on the intersection of the passed policy and the IAM
-	// user policy.
-	//
-	// If you do not pass a policy, the resulting temporary security credentials
-	// have no effective permissions. The only exception is when the temporary security
-	// credentials are used to access a resource that has a resource-based policy
-	// that specifically allows the federated user to access the resource.
-	//
-	// The format for this parameter, as described by its regex pattern, is a string
-	// of characters up to 2048 characters in length. The characters can be any
-	// ASCII character from the space character to the end of the valid character
-	// list (\u0020-\u00FF). It can also include the tab (\u0009), linefeed (\u000A),
-	// and carriage return (\u000D) characters.
-	//
-	// The policy plain text must be 2048 bytes or shorter. However, an internal
-	// conversion compresses it into a packed binary format with a separate limit.
-	// The PackedPolicySize response element indicates by percentage how close to
-	// the upper size limit the policy is, with 100% equaling the maximum allowed
-	// size.
-	//
-	// For more information about how permissions work, see Permissions for GetFederationToken
-	// (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_getfederationtoken.html).
-	Policy *string `min:"1" type:"string"`
-}
-
-// String returns the string representation
-func (s GetFederationTokenInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetFederationTokenInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetFederationTokenInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetFederationTokenInput"}
-	if s.DurationSeconds != nil && *s.DurationSeconds < 900 {
-		invalidParams.Add(request.NewErrParamMinValue("DurationSeconds", 900))
-	}
-	if s.Name == nil {
-		invalidParams.Add(request.NewErrParamRequired("Name"))
-	}
-	if s.Name != nil && len(*s.Name) < 2 {
-		invalidParams.Add(request.NewErrParamMinLen("Name", 2))
-	}
-	if s.Policy != nil && len(*s.Policy) < 1 {
-		invalidParams.Add(request.NewErrParamMinLen("Policy", 1))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetDurationSeconds sets the DurationSeconds field's value.
-func (s *GetFederationTokenInput) SetDurationSeconds(v int64) *GetFederationTokenInput {
-	s.DurationSeconds = &v
-	return s
-}
-
-// SetName sets the Name field's value.
-func (s *GetFederationTokenInput) SetName(v string) *GetFederationTokenInput {
-	s.Name = &v
-	return s
-}
-
-// SetPolicy sets the Policy field's value.
-func (s *GetFederationTokenInput) SetPolicy(v string) *GetFederationTokenInput {
-	s.Policy = &v
-	return s
-}
-
-// Contains the response to a successful GetFederationToken request, including
-// temporary AWS credentials that can be used to make AWS requests.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetFederationTokenResponse
-type GetFederationTokenOutput struct {
-	_ struct{} `type:"structure"`
-
-	// The temporary security credentials, which include an access key ID, a secret
-	// access key, and a security (or session) token.
-	//
-	// Note: The size of the security token that STS APIs return is not fixed. We
-	// strongly recommend that you make no assumptions about the maximum size. As
-	// of this writing, the typical size is less than 4096 bytes, but that can vary.
-	// Also, future updates to AWS might require larger sizes.
-	Credentials *Credentials `type:"structure"`
-
-	// Identifiers for the federated user associated with the credentials (such
-	// as arn:aws:sts::123456789012:federated-user/Bob or 123456789012:Bob). You
-	// can use the federated user's ARN in your resource-based policies, such as
-	// an Amazon S3 bucket policy.
-	FederatedUser *FederatedUser `type:"structure"`
-
-	// A percentage value indicating the size of the policy in packed form. The
-	// service rejects policies for which the packed size is greater than 100 percent
-	// of the allowed value.
-	PackedPolicySize *int64 `type:"integer"`
-}
-
-// String returns the string representation
-func (s GetFederationTokenOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetFederationTokenOutput) GoString() string {
-	return s.String()
-}
-
-// SetCredentials sets the Credentials field's value.
-func (s *GetFederationTokenOutput) SetCredentials(v *Credentials) *GetFederationTokenOutput {
-	s.Credentials = v
-	return s
-}
-
-// SetFederatedUser sets the FederatedUser field's value.
-func (s *GetFederationTokenOutput) SetFederatedUser(v *FederatedUser) *GetFederationTokenOutput {
-	s.FederatedUser = v
-	return s
-}
-
-// SetPackedPolicySize sets the PackedPolicySize field's value.
-func (s *GetFederationTokenOutput) SetPackedPolicySize(v int64) *GetFederationTokenOutput {
-	s.PackedPolicySize = &v
-	return s
-}
-
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetSessionTokenRequest
-type GetSessionTokenInput struct {
-	_ struct{} `type:"structure"`
-
-	// The duration, in seconds, that the credentials should remain valid. Acceptable
-	// durations for IAM user sessions range from 900 seconds (15 minutes) to 129600
-	// seconds (36 hours), with 43200 seconds (12 hours) as the default. Sessions
-	// for AWS account owners are restricted to a maximum of 3600 seconds (one hour).
-	// If the duration is longer than one hour, the session for AWS account owners
-	// defaults to one hour.
-	DurationSeconds *int64 `min:"900" type:"integer"`
-
-	// The identification number of the MFA device that is associated with the IAM
-	// user who is making the GetSessionToken call. Specify this value if the IAM
-	// user has a policy that requires MFA authentication. The value is either the
-	// serial number for a hardware device (such as GAHT12345678) or an Amazon Resource
-	// Name (ARN) for a virtual device (such as arn:aws:iam::123456789012:mfa/user).
-	// You can find the device for an IAM user by going to the AWS Management Console
-	// and viewing the user's security credentials.
-	//
-	// The regex used to validated this parameter is a string of characters consisting
-	// of upper- and lower-case alphanumeric characters with no spaces. You can
-	// also include underscores or any of the following characters: =,.@:/-
-	SerialNumber *string `min:"9" type:"string"`
-
-	// The value provided by the MFA device, if MFA is required. If any policy requires
-	// the IAM user to submit an MFA code, specify this value. If MFA authentication
-	// is required, and the user does not provide a code when requesting a set of
-	// temporary security credentials, the user will receive an "access denied"
-	// response when requesting resources that require MFA authentication.
-	//
-	// The format for this parameter, as described by its regex pattern, is a sequence
-	// of six numeric digits.
-	TokenCode *string `min:"6" type:"string"`
-}
-
-// String returns the string representation
-func (s GetSessionTokenInput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetSessionTokenInput) GoString() string {
-	return s.String()
-}
-
-// Validate inspects the fields of the type to determine if they are valid.
-func (s *GetSessionTokenInput) Validate() error {
-	invalidParams := request.ErrInvalidParams{Context: "GetSessionTokenInput"}
-	if s.DurationSeconds != nil && *s.DurationSeconds < 900 {
-		invalidParams.Add(request.NewErrParamMinValue("DurationSeconds", 900))
-	}
-	if s.SerialNumber != nil && len(*s.SerialNumber) < 9 {
-		invalidParams.Add(request.NewErrParamMinLen("SerialNumber", 9))
-	}
-	if s.TokenCode != nil && len(*s.TokenCode) < 6 {
-		invalidParams.Add(request.NewErrParamMinLen("TokenCode", 6))
-	}
-
-	if invalidParams.Len() > 0 {
-		return invalidParams
-	}
-	return nil
-}
-
-// SetDurationSeconds sets the DurationSeconds field's value.
-func (s *GetSessionTokenInput) SetDurationSeconds(v int64) *GetSessionTokenInput {
-	s.DurationSeconds = &v
-	return s
-}
-
-// SetSerialNumber sets the SerialNumber field's value.
-func (s *GetSessionTokenInput) SetSerialNumber(v string) *GetSessionTokenInput {
-	s.SerialNumber = &v
-	return s
-}
-
-// SetTokenCode sets the TokenCode field's value.
-func (s *GetSessionTokenInput) SetTokenCode(v string) *GetSessionTokenInput {
-	s.TokenCode = &v
-	return s
-}
-
-// Contains the response to a successful GetSessionToken request, including
-// temporary AWS credentials that can be used to make AWS requests.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetSessionTokenResponse
-type GetSessionTokenOutput struct {
-	_ struct{} `type:"structure"`
-
-	// The temporary security credentials, which include an access key ID, a secret
-	// access key, and a security (or session) token.
-	//
-	// Note: The size of the security token that STS APIs return is not fixed. We
-	// strongly recommend that you make no assumptions about the maximum size. As
-	// of this writing, the typical size is less than 4096 bytes, but that can vary.
-	// Also, future updates to AWS might require larger sizes.
-	Credentials *Credentials `type:"structure"`
-}
-
-// String returns the string representation
-func (s GetSessionTokenOutput) String() string {
-	return awsutil.Prettify(s)
-}
-
-// GoString returns the string representation
-func (s GetSessionTokenOutput) GoString() string {
-	return s.String()
-}
-
-// SetCredentials sets the Credentials field's value.
-func (s *GetSessionTokenOutput) SetCredentials(v *Credentials) *GetSessionTokenOutput {
-	s.Credentials = v
-	return s
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/sts/customizations.go b/vendor/github.com/aws/aws-sdk-go/service/sts/customizations.go
deleted file mode 100644
index 4010cc7fa1..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/sts/customizations.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package sts
-
-import "github.com/aws/aws-sdk-go/aws/request"
-
-func init() {
-	initRequest = func(r *request.Request) {
-		switch r.Operation.Name {
-		case opAssumeRoleWithSAML, opAssumeRoleWithWebIdentity:
-			r.Handlers.Sign.Clear() // these operations are unsigned
-		}
-	}
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/sts/doc.go b/vendor/github.com/aws/aws-sdk-go/service/sts/doc.go
deleted file mode 100644
index d2af518cfa..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/sts/doc.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT.
-
-// Package sts provides the client and types for making API
-// requests to AWS Security Token Service.
-//
-// The AWS Security Token Service (STS) is a web service that enables you to
-// request temporary, limited-privilege credentials for AWS Identity and Access
-// Management (IAM) users or for users that you authenticate (federated users).
-// This guide provides descriptions of the STS API. For more detailed information
-// about using this service, go to Temporary Security Credentials (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html).
-//
-// As an alternative to using the API, you can use one of the AWS SDKs, which
-// consist of libraries and sample code for various programming languages and
-// platforms (Java, Ruby, .NET, iOS, Android, etc.). The SDKs provide a convenient
-// way to create programmatic access to STS. For example, the SDKs take care
-// of cryptographically signing requests, managing errors, and retrying requests
-// automatically. For information about the AWS SDKs, including how to download
-// and install them, see the Tools for Amazon Web Services page (http://aws.amazon.com/tools/).
-//
-// For information about setting up signatures and authorization through the
-// API, go to Signing AWS API Requests (http://docs.aws.amazon.com/general/latest/gr/signing_aws_api_requests.html)
-// in the AWS General Reference. For general information about the Query API,
-// go to Making Query Requests (http://docs.aws.amazon.com/IAM/latest/UserGuide/IAM_UsingQueryAPI.html)
-// in Using IAM. For information about using security tokens with other AWS
-// products, go to AWS Services That Work with IAM (http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_aws-services-that-work-with-iam.html)
-// in the IAM User Guide.
-//
-// If you're new to AWS and need additional technical information about a specific
-// AWS product, you can find the product's technical documentation at http://aws.amazon.com/documentation/
-// (http://aws.amazon.com/documentation/).
-//
-// Endpoints
-//
-// The AWS Security Token Service (STS) has a default endpoint of https://sts.amazonaws.com
-// that maps to the US East (N. Virginia) region. Additional regions are available
-// and are activated by default. For more information, see Activating and Deactivating
-// AWS STS in an AWS Region (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html)
-// in the IAM User Guide.
-//
-// For information about STS endpoints, see Regions and Endpoints (http://docs.aws.amazon.com/general/latest/gr/rande.html#sts_region)
-// in the AWS General Reference.
-//
-// Recording API requests
-//
-// STS supports AWS CloudTrail, which is a service that records AWS calls for
-// your AWS account and delivers log files to an Amazon S3 bucket. By using
-// information collected by CloudTrail, you can determine what requests were
-// successfully made to STS, who made the request, when it was made, and so
-// on. To learn more about CloudTrail, including how to turn it on and find
-// your log files, see the AWS CloudTrail User Guide (http://docs.aws.amazon.com/awscloudtrail/latest/userguide/what_is_cloud_trail_top_level.html).
-//
-// See https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15 for more information on this service.
-//
-// See sts package documentation for more information.
-// https://docs.aws.amazon.com/sdk-for-go/api/service/sts/
-//
-// Using the Client
-//
-// To use the client for AWS Security Token Service you will first need
-// to create a new instance of it.
-//
-// When creating a client for an AWS service you'll first need to have a Session
-// already created. The Session provides configuration that can be shared
-// between multiple service clients. Additional configuration can be applied to
-// the Session and service's client when they are constructed. The aws package's
-// Config type contains several fields such as Region for the AWS Region the
-// client should make API requests too. The optional Config value can be provided
-// as the variadic argument for Sessions and client creation.
-//
-// Once the service's client is created you can use it to make API requests the
-// AWS service. These clients are safe to use concurrently.
-//
-//   // Create a session to share configuration, and load external configuration.
-//   sess := session.Must(session.NewSession())
-//
-//   // Create the service's client with the session.
-//   svc := sts.New(sess)
-//
-// See the SDK's documentation for more information on how to use service clients.
-// https://docs.aws.amazon.com/sdk-for-go/api/
-//
-// See aws package's Config type for more information on configuration options.
-// https://docs.aws.amazon.com/sdk-for-go/api/aws/#Config
-//
-// See the AWS Security Token Service client STS for more
-// information on creating the service's client.
-// https://docs.aws.amazon.com/sdk-for-go/api/service/sts/#New
-//
-// Once the client is created you can make an API request to the service.
-// Each API method takes a input parameter, and returns the service response
-// and an error.
-//
-// The API method will document which error codes the service can be returned
-// by the operation if the service models the API operation's errors. These
-// errors will also be available as const strings prefixed with "ErrCode".
-//
-//   result, err := svc.AssumeRole(params)
-//   if err != nil {
-//       // Cast err to awserr.Error to handle specific error codes.
-//       aerr, ok := err.(awserr.Error)
-//       if ok && aerr.Code() == <error code to check for> {
-//           // Specific error code handling
-//       }
-//       return err
-//   }
-//
-//   fmt.Println("AssumeRole result:")
-//   fmt.Println(result)
-//
-// Using the Client with Context
-//
-// The service's client also provides methods to make API requests with a Context
-// value. This allows you to control the timeout, and cancellation of pending
-// requests. These methods also take request Option as variadic parameter to apply
-// additional configuration to the API request.
-//
-//   ctx := context.Background()
-//
-//   result, err := svc.AssumeRoleWithContext(ctx, params)
-//
-// See the request package documentation for more information on using Context pattern
-// with the SDK.
-// https://docs.aws.amazon.com/sdk-for-go/api/aws/request/
-package sts
diff --git a/vendor/github.com/aws/aws-sdk-go/service/sts/errors.go b/vendor/github.com/aws/aws-sdk-go/service/sts/errors.go
deleted file mode 100644
index e24884ef37..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/sts/errors.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT.
-
-package sts
-
-const (
-
-	// ErrCodeExpiredTokenException for service response error code
-	// "ExpiredTokenException".
-	//
-	// The web identity token that was passed is expired or is not valid. Get a
-	// new identity token from the identity provider and then retry the request.
-	ErrCodeExpiredTokenException = "ExpiredTokenException"
-
-	// ErrCodeIDPCommunicationErrorException for service response error code
-	// "IDPCommunicationError".
-	//
-	// The request could not be fulfilled because the non-AWS identity provider
-	// (IDP) that was asked to verify the incoming identity token could not be reached.
-	// This is often a transient error caused by network conditions. Retry the request
-	// a limited number of times so that you don't exceed the request rate. If the
-	// error persists, the non-AWS identity provider might be down or not responding.
-	ErrCodeIDPCommunicationErrorException = "IDPCommunicationError"
-
-	// ErrCodeIDPRejectedClaimException for service response error code
-	// "IDPRejectedClaim".
-	//
-	// The identity provider (IdP) reported that authentication failed. This might
-	// be because the claim is invalid.
-	//
-	// If this error is returned for the AssumeRoleWithWebIdentity operation, it
-	// can also mean that the claim has expired or has been explicitly revoked.
-	ErrCodeIDPRejectedClaimException = "IDPRejectedClaim"
-
-	// ErrCodeInvalidAuthorizationMessageException for service response error code
-	// "InvalidAuthorizationMessageException".
-	//
-	// The error returned if the message passed to DecodeAuthorizationMessage was
-	// invalid. This can happen if the token contains invalid characters, such as
-	// linebreaks.
-	ErrCodeInvalidAuthorizationMessageException = "InvalidAuthorizationMessageException"
-
-	// ErrCodeInvalidIdentityTokenException for service response error code
-	// "InvalidIdentityToken".
-	//
-	// The web identity token that was passed could not be validated by AWS. Get
-	// a new identity token from the identity provider and then retry the request.
-	ErrCodeInvalidIdentityTokenException = "InvalidIdentityToken"
-
-	// ErrCodeMalformedPolicyDocumentException for service response error code
-	// "MalformedPolicyDocument".
-	//
-	// The request was rejected because the policy document was malformed. The error
-	// message describes the specific error.
-	ErrCodeMalformedPolicyDocumentException = "MalformedPolicyDocument"
-
-	// ErrCodePackedPolicyTooLargeException for service response error code
-	// "PackedPolicyTooLarge".
-	//
-	// The request was rejected because the policy document was too large. The error
-	// message describes how big the policy document is, in packed form, as a percentage
-	// of what the API allows.
-	ErrCodePackedPolicyTooLargeException = "PackedPolicyTooLarge"
-
-	// ErrCodeRegionDisabledException for service response error code
-	// "RegionDisabledException".
-	//
-	// STS is not activated in the requested region for the account that is being
-	// asked to generate credentials. The account administrator must use the IAM
-	// console to activate STS in that region. For more information, see Activating
-	// and Deactivating AWS STS in an AWS Region (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html)
-	// in the IAM User Guide.
-	ErrCodeRegionDisabledException = "RegionDisabledException"
-)
diff --git a/vendor/github.com/aws/aws-sdk-go/service/sts/service.go b/vendor/github.com/aws/aws-sdk-go/service/sts/service.go
deleted file mode 100644
index 1ee5839e04..0000000000
--- a/vendor/github.com/aws/aws-sdk-go/service/sts/service.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT.
-
-package sts
-
-import (
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/client"
-	"github.com/aws/aws-sdk-go/aws/client/metadata"
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/aws/signer/v4"
-	"github.com/aws/aws-sdk-go/private/protocol/query"
-)
-
-// STS provides the API operation methods for making requests to
-// AWS Security Token Service. See this package's package overview docs
-// for details on the service.
-//
-// STS methods are safe to use concurrently. It is not safe to
-// modify mutate any of the struct's properties though.
-type STS struct {
-	*client.Client
-}
-
-// Used for custom client initialization logic
-var initClient func(*client.Client)
-
-// Used for custom request initialization logic
-var initRequest func(*request.Request)
-
-// Service information constants
-const (
-	ServiceName = "sts"       // Service endpoint prefix API calls made to.
-	EndpointsID = ServiceName // Service ID for Regions and Endpoints metadata.
-)
-
-// New creates a new instance of the STS client with a session.
-// If additional configuration is needed for the client instance use the optional
-// aws.Config parameter to add your extra config.
-//
-// Example:
-//     // Create a STS client from just a session.
-//     svc := sts.New(mySession)
-//
-//     // Create a STS client with additional configuration
-//     svc := sts.New(mySession, aws.NewConfig().WithRegion("us-west-2"))
-func New(p client.ConfigProvider, cfgs ...*aws.Config) *STS {
-	c := p.ClientConfig(EndpointsID, cfgs...)
-	return newClient(*c.Config, c.Handlers, c.Endpoint, c.SigningRegion, c.SigningName)
-}
-
-// newClient creates, initializes and returns a new service client instance.
-func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegion, signingName string) *STS {
-	svc := &STS{
-		Client: client.New(
-			cfg,
-			metadata.ClientInfo{
-				ServiceName:   ServiceName,
-				SigningName:   signingName,
-				SigningRegion: signingRegion,
-				Endpoint:      endpoint,
-				APIVersion:    "2011-06-15",
-			},
-			handlers,
-		),
-	}
-
-	// Handlers
-	svc.Handlers.Sign.PushBackNamed(v4.SignRequestHandler)
-	svc.Handlers.Build.PushBackNamed(query.BuildHandler)
-	svc.Handlers.Unmarshal.PushBackNamed(query.UnmarshalHandler)
-	svc.Handlers.UnmarshalMeta.PushBackNamed(query.UnmarshalMetaHandler)
-	svc.Handlers.UnmarshalError.PushBackNamed(query.UnmarshalErrorHandler)
-
-	// Run custom client initialization if present
-	if initClient != nil {
-		initClient(svc.Client)
-	}
-
-	return svc
-}
-
-// newRequest creates a new request for a STS operation and runs any
-// custom request initialization.
-func (c *STS) newRequest(op *request.Operation, params, data interface{}) *request.Request {
-	req := c.NewRequest(op, params, data)
-
-	// Run custom request initialization if present
-	if initRequest != nil {
-		initRequest(req)
-	}
-
-	return req
-}
diff --git a/vendor/github.com/awslabs/goformation/CONTRIBUTING.md b/vendor/github.com/awslabs/goformation/CONTRIBUTING.md
deleted file mode 100644
index f5c85f6d96..0000000000
--- a/vendor/github.com/awslabs/goformation/CONTRIBUTING.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributing to GoFormation
-
-Contributions to GoFormation should be made via GitHub [pull
-requests](https://github.com/awslabs/goformation/pulls) and discussed using
-GitHub [issues](https://github.com/awslabs/goformation/issues).
-
-### Before you start
-
-If you would like to make a significant change, it's a good idea to first open
-an issue to discuss it.
-
-### Making the request
-
-1. Create a fork of the GoFormation repository [(quick link)](https://github.com/awslabs/goformation#fork-destination-box)
-2. Commit your changes to your fork
-3. Create a new pull request [(quick link)](https://github.com/awslabs/goformation/compare)  
-
-### Testing
-
-Any contributions should pass all tests, including those not run by our
-current CI system.
-
-You may run all tests by running `go test` (requires `go` to be installed).
-
-## Licensing
-
-GoFormation is released under an [Apache 2.0](http://aws.amazon.com/apache-2-0/) license. Any code you submit will be released under that license.
-
-For significant changes, we may ask you to sign a [Contributor License Agreement (http://en.wikipedia.org/wiki/Contributor_License_Agreement).
diff --git a/vendor/github.com/awslabs/goformation/LICENSE b/vendor/github.com/awslabs/goformation/LICENSE
deleted file mode 100644
index 8dada3edaf..0000000000
--- a/vendor/github.com/awslabs/goformation/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/awslabs/goformation/NOTICE b/vendor/github.com/awslabs/goformation/NOTICE
deleted file mode 100644
index 595536ae35..0000000000
--- a/vendor/github.com/awslabs/goformation/NOTICE
+++ /dev/null
@@ -1,2 +0,0 @@
-GoFormation
-Copyright 2011-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. 
diff --git a/vendor/github.com/awslabs/goformation/README.md b/vendor/github.com/awslabs/goformation/README.md
deleted file mode 100644
index b69daad2fd..0000000000
--- a/vendor/github.com/awslabs/goformation/README.md
+++ /dev/null
@@ -1,225 +0,0 @@
-# AWS GoFormation
-
-[![Build Status](https://travis-ci.org/awslabs/goformation.svg?branch=0.1.0)](https://travis-ci.org/awslabs/goformation) [![GoDoc Reference](https://godoc.org/gopkg.in/awslabs/goformation.v1?status.svg)](http://godoc.org/github.com/awslabs/goformation) ![Apache-2.0](https://img.shields.io/badge/Licence-Apache%202.0-blue.svg) 
-
-`GoFormation` is a Go library for working with AWS CloudFormation / AWS Serverless Application Model (SAM) templates. 
-- [AWS GoFormation](#aws-goformation)
-    - [Main features](#main-features)
-    - [Installation](#installation)
-    - [Usage](#usage)
-        - [Marshalling CloudFormation/SAM described with Go structs, into YAML/JSON](#marshalling-cloudformationsam-described-with-go-structs-into-yamljson)
-        - [Unmarshalling CloudFormation YAML/JSON into Go structs](#unmarshalling-cloudformation-yamljson-into-go-structs)
-    - [Updating CloudFormation / SAM Resources in GoFormation](#updating-cloudformation-sam-resources-in-goformation)
-    - [Advanced](#advanced)
-        - [AWS CloudFormation Intrinsic Functions](#aws-cloudformation-intrinsic-functions)
-            - [Resolving References (Ref)](#resolving-references-ref)
-    - [Contributing](#contributing)
-
-## Main features
-
- * Describe AWS CloudFormation and AWS SAM templates as Go objects (structs), and then turn it into JSON/YAML.
- * Parse JSON/YAML AWS CloudFormation and AWS SAM templates and turn them into Go structs.
- * Strongly typed Go structs generated for every AWS CloudFormation and AWS SAM resource.
- * Automatically generated, from the published AWS CloudFormation Resource Specification.
-
-## Installation
-
-As with other Go libraries, GoFormation can be installed with `go get`.
-
-```
-$ go get github.com/awslabs/goformation
-```
-
-## Usage
-
-### Marshalling CloudFormation/SAM described with Go structs, into YAML/JSON
-
-Below is an example of building a CloudFormation template programmatically, then outputting the resulting JSON
-
-```go
-package main
-
-import (
-	"fmt"
-
-	"github.com/awslabs/goformation/cloudformation"
-)
-
-func main() {
-
-	// Create a new CloudFormation template
-	template := cloudformation.NewTemplate()
-
-	// An an example SNS Topic
-	template.Resources["MySNSTopic"] = &cloudformation.AWSSNSTopic{
-		DisplayName: "test-sns-topic-display-name",
-		TopicName:   "test-sns-topic-name",
-		Subscription: []cloudformation.AWSSNSTopic_Subscription{
-			cloudformation.AWSSNSTopic_Subscription{
-				Endpoint: "test-sns-topic-subscription-endpoint",
-				Protocol: "test-sns-topic-subscription-protocol",
-			},
-		},
-	}
-
-	// ...and a Route 53 Hosted Zone too
-	template.Resources["MyRoute53HostedZone"] = &cloudformation.AWSRoute53HostedZone{
-		Name: "example.com",
-	}
-
-	// Let's see the JSON
-	j, err := template.JSON()
-	if err != nil {
-		fmt.Printf("Failed to generate JSON: %s\n", err)
-	} else {
-		fmt.Printf("%s\n", string(j))
-	}
-
-	y, err := template.YAML()
-	if err != nil {
-		fmt.Printf("Failed to generate YAML: %s\n", err)
-	} else {
-		fmt.Printf("%s\n", string(y))
-	}
-
-}
-```
-
-Would output the following JSON template:
-
-```javascript
-{
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Resources": {
-    "MyRoute53HostedZone": {
-      "Type": "AWS::Route53::HostedZone",
-      "Properties": {
-        "Name": "example.com"
-      }
-    },
-    "MySNSTopic": {
-      "Type": "AWS::SNS::Topic",
-      "Properties": {
-        "DisplayName": "test-sns-topic-display-name",
-        "Subscription": [
-          {
-            "Endpoint": "test-sns-topic-subscription-endpoint",
-            "Protocol": "test-sns-topic-subscription-protocol"
-          }
-        ],
-        "TopicName": "test-sns-topic-name"
-      }
-    }
-  }
-}
-```
-
-...and the following YAML template:
-
-```yaml
-AWSTemplateFormatVersion: 2010-09-09
-Resources:
-  MyRoute53HostedZone:
-    Type: AWS::Route53::HostedZone
-    Properties:
-      Name: example.com
-  MySNSTopic:
-    Type: AWS::SNS::Topic
-    Properties:
-      DisplayName: test-sns-topic-display-name
-      Subscription:
-      - Endpoint: test-sns-topic-subscription-endpoint
-        Protocol: test-sns-topic-subscription-protocol
-      TopicName: test-sns-topic-name
-```
-
-
-### Unmarshalling CloudFormation YAML/JSON into Go structs 
-
-GoFormation also works the other way - parsing JSON/YAML CloudFormation/SAM templates into Go structs.
-
-```go
-package main
-
-import (
-    "fmt"
-    "github.com/awslabs/goformation"
-    "github.com/awslabs/goformation/cloudformation"
-)
-
-func main() {
-
-    // Open a template from file (can be JSON or YAML)
-    template, err := goformation.Open("template.yaml")
-
-    // ...or provide one as a byte array ([]byte)
-    template, err := goformation.ParseYAML(data)
-
-    // You can then inspect all of the values
-    for name, resource := range template.Resources {
-
-        // E.g. Found a resource with name MyLambdaFunction and type AWS::Lambda::Function
-        log.Printf("Found a resource with name %s and type %s", name, resource.Type)
-
-    }
-
-    // You can extract all resources of a certain type
-    // Each AWS CloudFormation / SAM resource is a strongly typed struct
-    functions := template.GetAllAWSLambdaFunctionResources()
-    for name, function := range functions {
-
-        // E.g. Found a AWS::Lambda::Function with name MyLambdaFunction and nodejs6.10 handler 
-        log.Printf("Found a %s with name %s and %s handler", name, function.Type(), function.Handler)
-
-    }
-
-}
-```
-
-## Updating CloudFormation / SAM Resources in GoFormation
- 
-AWS GoFormation contains automatically generated Go structs for every CloudFormation/SAM resource, located in the [cloudformation/](cloudformation/) directory. These can be generated, from the latest [AWS CloudFormation Resource Specification](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-resource-specification.html) published for `us-east-1` by just running `go generate`:
-
-```
-$ go generate
-
-Generated 587 AWS CloudFormation resources from specification v1.4.2
-Generated 17 AWS SAM resources from specification v2016-10-31
-Generated JSON Schema: schema/cloudformation.schema.json
-```
-
-The GoFormation build pipeline automatically checks for any updated AWS CloudFormation resources on a daily basis, and creates a pull request against this repository if any are found.
-
-## Advanced
-
-### AWS CloudFormation Intrinsic Functions
-
-The following [AWS CloudFormation Intrinsic Functions](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference.html) are supported in GoFormation:
-
-- [x] [Fn::Base64](intrinsics/fnbase64.go)
-- [x] [Fn::FindInMap](intrinsics/fnfindinmap.go)
-- [x] [Fn::Join](intrinsics/fnjoin.go)
-- [x] [Fn::Select](intrinsics/fnselect.go)
-- [x] [Fn::Split](intrinsics/fnsplit.go)
-- [x] [Fn::Sub](intrinsics/fnsub.go)
-- [x] [Ref](intrinsics/ref.go) 
-- [x] [Fn::And](intrinsics/fnand.go)      
-- [x] [Fn::Equals](intrinsics/fnequals.go)  
-- [x] [Fn::If](intrinsics/fnif.go)     
-- [x] [Fn::Not](intrinsics/fnnot.go)      
-- [x] [Fn::Or](intrinsics/fnor.go)       
-- [ ] Fn::GetAtt   
-- [x] [Fn::GetAZs](intrinsics/fngetazs.go)
-- [ ] Fn::ImportValue
-
-Any unsupported intrinsic functions will return `nil`.
-
-#### Resolving References (Ref)
-
-The intrinsic 'Ref' function as implemented will resolve all of the [pseudo parameters](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-ref.html) such as `AWS::AccountId` with their default value as listed on [the bottom of this page](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-ref.html).
-
-If a reference is not a pseudo parameter, GoFormation will try to resolve it within the AWS CloudFormation template. **Currently, this implementation only searches for `Parameters` with a name that matches the ref, and returns the `Default` if it has one.**
-
-## Contributing
-
-Contributions and feedback are welcome! Proposals and pull requests will be considered and responded to. For more information, see the [CONTRIBUTING](CONTRIBUTING.md) file.
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/README.md b/vendor/github.com/awslabs/goformation/cloudformation/README.md
deleted file mode 100644
index a1e31aab26..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Important
-
-All resource files in this directory are auto-generated by running 'go generate' in the repository root directory.
-
-Do not manually edit any of generated resource files 
\ No newline at end of file
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-account.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-account.go
deleted file mode 100644
index 1603a5da74..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-account.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayAccount AWS CloudFormation Resource (AWS::ApiGateway::Account)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-account.html
-type AWSApiGatewayAccount struct {
-
-	// CloudWatchRoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-account.html#cfn-apigateway-account-cloudwatchrolearn
-	CloudWatchRoleArn string `json:"CloudWatchRoleArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayAccount) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Account"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayAccount) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayAccount
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayAccount) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayAccount
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayAccount(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayAccountResources retrieves all AWSApiGatewayAccount items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayAccountResources() map[string]AWSApiGatewayAccount {
-	results := map[string]AWSApiGatewayAccount{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayAccount:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Account" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayAccount
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayAccountWithName retrieves all AWSApiGatewayAccount items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayAccountWithName(name string) (AWSApiGatewayAccount, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayAccount:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Account" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayAccount
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayAccount{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-apikey.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-apikey.go
deleted file mode 100644
index f4dc531547..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-apikey.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayApiKey AWS CloudFormation Resource (AWS::ApiGateway::ApiKey)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html
-type AWSApiGatewayApiKey struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apigateway-apikey-description
-	Description string `json:"Description,omitempty"`
-
-	// Enabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apigateway-apikey-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apigateway-apikey-name
-	Name string `json:"Name,omitempty"`
-
-	// StageKeys AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apigateway-apikey-stagekeys
-	StageKeys []AWSApiGatewayApiKey_StageKey `json:"StageKeys,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayApiKey) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::ApiKey"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayApiKey) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayApiKey
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayApiKey) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayApiKey
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayApiKey(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayApiKeyResources retrieves all AWSApiGatewayApiKey items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayApiKeyResources() map[string]AWSApiGatewayApiKey {
-	results := map[string]AWSApiGatewayApiKey{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayApiKey:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::ApiKey" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayApiKey
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayApiKeyWithName retrieves all AWSApiGatewayApiKey items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayApiKeyWithName(name string) (AWSApiGatewayApiKey, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayApiKey:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::ApiKey" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayApiKey
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayApiKey{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-apikey_stagekey.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-apikey_stagekey.go
deleted file mode 100644
index c275afa146..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-apikey_stagekey.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSApiGatewayApiKey_StageKey AWS CloudFormation Resource (AWS::ApiGateway::ApiKey.StageKey)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-apikey-stagekey.html
-type AWSApiGatewayApiKey_StageKey struct {
-
-	// RestApiId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-apikey-stagekey.html#cfn-apigateway-apikey-stagekey-restapiid
-	RestApiId string `json:"RestApiId,omitempty"`
-
-	// StageName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-apikey-stagekey.html#cfn-apigateway-apikey-stagekey-stagename
-	StageName string `json:"StageName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayApiKey_StageKey) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::ApiKey.StageKey"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-authorizer.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-authorizer.go
deleted file mode 100644
index 1cb95efb88..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-authorizer.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayAuthorizer AWS CloudFormation Resource (AWS::ApiGateway::Authorizer)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html
-type AWSApiGatewayAuthorizer struct {
-
-	// AuthType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-authtype
-	AuthType string `json:"AuthType,omitempty"`
-
-	// AuthorizerCredentials AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-authorizercredentials
-	AuthorizerCredentials string `json:"AuthorizerCredentials,omitempty"`
-
-	// AuthorizerResultTtlInSeconds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-authorizerresultttlinseconds
-	AuthorizerResultTtlInSeconds int `json:"AuthorizerResultTtlInSeconds,omitempty"`
-
-	// AuthorizerUri AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-authorizeruri
-	AuthorizerUri string `json:"AuthorizerUri,omitempty"`
-
-	// IdentitySource AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-identitysource
-	IdentitySource string `json:"IdentitySource,omitempty"`
-
-	// IdentityValidationExpression AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-identityvalidationexpression
-	IdentityValidationExpression string `json:"IdentityValidationExpression,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-name
-	Name string `json:"Name,omitempty"`
-
-	// ProviderARNs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-providerarns
-	ProviderARNs []string `json:"ProviderARNs,omitempty"`
-
-	// RestApiId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-restapiid
-	RestApiId string `json:"RestApiId,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayAuthorizer) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Authorizer"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayAuthorizer) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayAuthorizer
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayAuthorizer) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayAuthorizer
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayAuthorizer(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayAuthorizerResources retrieves all AWSApiGatewayAuthorizer items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayAuthorizerResources() map[string]AWSApiGatewayAuthorizer {
-	results := map[string]AWSApiGatewayAuthorizer{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayAuthorizer:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Authorizer" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayAuthorizer
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayAuthorizerWithName retrieves all AWSApiGatewayAuthorizer items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayAuthorizerWithName(name string) (AWSApiGatewayAuthorizer, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayAuthorizer:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Authorizer" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayAuthorizer
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayAuthorizer{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-basepathmapping.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-basepathmapping.go
deleted file mode 100644
index 31b96f3057..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-basepathmapping.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayBasePathMapping AWS CloudFormation Resource (AWS::ApiGateway::BasePathMapping)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmapping.html
-type AWSApiGatewayBasePathMapping struct {
-
-	// BasePath AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmapping.html#cfn-apigateway-basepathmapping-basepath
-	BasePath string `json:"BasePath,omitempty"`
-
-	// DomainName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmapping.html#cfn-apigateway-basepathmapping-domainname
-	DomainName string `json:"DomainName,omitempty"`
-
-	// RestApiId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmapping.html#cfn-apigateway-basepathmapping-restapiid
-	RestApiId string `json:"RestApiId,omitempty"`
-
-	// Stage AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmapping.html#cfn-apigateway-basepathmapping-stage
-	Stage string `json:"Stage,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayBasePathMapping) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::BasePathMapping"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayBasePathMapping) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayBasePathMapping
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayBasePathMapping) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayBasePathMapping
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayBasePathMapping(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayBasePathMappingResources retrieves all AWSApiGatewayBasePathMapping items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayBasePathMappingResources() map[string]AWSApiGatewayBasePathMapping {
-	results := map[string]AWSApiGatewayBasePathMapping{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayBasePathMapping:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::BasePathMapping" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayBasePathMapping
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayBasePathMappingWithName retrieves all AWSApiGatewayBasePathMapping items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayBasePathMappingWithName(name string) (AWSApiGatewayBasePathMapping, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayBasePathMapping:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::BasePathMapping" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayBasePathMapping
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayBasePathMapping{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-clientcertificate.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-clientcertificate.go
deleted file mode 100644
index 50602f10e7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-clientcertificate.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayClientCertificate AWS CloudFormation Resource (AWS::ApiGateway::ClientCertificate)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-clientcertificate.html
-type AWSApiGatewayClientCertificate struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-clientcertificate.html#cfn-apigateway-clientcertificate-description
-	Description string `json:"Description,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayClientCertificate) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::ClientCertificate"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayClientCertificate) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayClientCertificate
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayClientCertificate) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayClientCertificate
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayClientCertificate(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayClientCertificateResources retrieves all AWSApiGatewayClientCertificate items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayClientCertificateResources() map[string]AWSApiGatewayClientCertificate {
-	results := map[string]AWSApiGatewayClientCertificate{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayClientCertificate:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::ClientCertificate" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayClientCertificate
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayClientCertificateWithName retrieves all AWSApiGatewayClientCertificate items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayClientCertificateWithName(name string) (AWSApiGatewayClientCertificate, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayClientCertificate:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::ClientCertificate" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayClientCertificate
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayClientCertificate{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-deployment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-deployment.go
deleted file mode 100644
index 2f148c4893..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-deployment.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayDeployment AWS CloudFormation Resource (AWS::ApiGateway::Deployment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html
-type AWSApiGatewayDeployment struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html#cfn-apigateway-deployment-description
-	Description string `json:"Description,omitempty"`
-
-	// RestApiId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html#cfn-apigateway-deployment-restapiid
-	RestApiId string `json:"RestApiId,omitempty"`
-
-	// StageDescription AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html#cfn-apigateway-deployment-stagedescription
-	StageDescription *AWSApiGatewayDeployment_StageDescription `json:"StageDescription,omitempty"`
-
-	// StageName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html#cfn-apigateway-deployment-stagename
-	StageName string `json:"StageName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayDeployment) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Deployment"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayDeployment) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayDeployment
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayDeployment) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayDeployment
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayDeployment(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayDeploymentResources retrieves all AWSApiGatewayDeployment items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayDeploymentResources() map[string]AWSApiGatewayDeployment {
-	results := map[string]AWSApiGatewayDeployment{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayDeployment:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Deployment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayDeployment
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayDeploymentWithName retrieves all AWSApiGatewayDeployment items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayDeploymentWithName(name string) (AWSApiGatewayDeployment, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayDeployment:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Deployment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayDeployment
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayDeployment{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-deployment_methodsetting.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-deployment_methodsetting.go
deleted file mode 100644
index e9849b1cf2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-deployment_methodsetting.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package cloudformation
-
-// AWSApiGatewayDeployment_MethodSetting AWS CloudFormation Resource (AWS::ApiGateway::Deployment.MethodSetting)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html
-type AWSApiGatewayDeployment_MethodSetting struct {
-
-	// CacheDataEncrypted AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-cachedataencrypted
-	CacheDataEncrypted bool `json:"CacheDataEncrypted,omitempty"`
-
-	// CacheTtlInSeconds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-cachettlinseconds
-	CacheTtlInSeconds int `json:"CacheTtlInSeconds,omitempty"`
-
-	// CachingEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-cachingenabled
-	CachingEnabled bool `json:"CachingEnabled,omitempty"`
-
-	// DataTraceEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-datatraceenabled
-	DataTraceEnabled bool `json:"DataTraceEnabled,omitempty"`
-
-	// HttpMethod AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-httpmethod
-	HttpMethod string `json:"HttpMethod,omitempty"`
-
-	// LoggingLevel AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-logginglevel
-	LoggingLevel string `json:"LoggingLevel,omitempty"`
-
-	// MetricsEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-metricsenabled
-	MetricsEnabled bool `json:"MetricsEnabled,omitempty"`
-
-	// ResourcePath AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-resourcepath
-	ResourcePath string `json:"ResourcePath,omitempty"`
-
-	// ThrottlingBurstLimit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-throttlingburstlimit
-	ThrottlingBurstLimit int `json:"ThrottlingBurstLimit,omitempty"`
-
-	// ThrottlingRateLimit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-throttlingratelimit
-	ThrottlingRateLimit float64 `json:"ThrottlingRateLimit,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayDeployment_MethodSetting) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Deployment.MethodSetting"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-deployment_stagedescription.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-deployment_stagedescription.go
deleted file mode 100644
index 684e030784..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-deployment_stagedescription.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package cloudformation
-
-// AWSApiGatewayDeployment_StageDescription AWS CloudFormation Resource (AWS::ApiGateway::Deployment.StageDescription)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html
-type AWSApiGatewayDeployment_StageDescription struct {
-
-	// CacheClusterEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-cacheclusterenabled
-	CacheClusterEnabled bool `json:"CacheClusterEnabled,omitempty"`
-
-	// CacheClusterSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-cacheclustersize
-	CacheClusterSize string `json:"CacheClusterSize,omitempty"`
-
-	// CacheDataEncrypted AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-cachedataencrypted
-	CacheDataEncrypted bool `json:"CacheDataEncrypted,omitempty"`
-
-	// CacheTtlInSeconds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-cachettlinseconds
-	CacheTtlInSeconds int `json:"CacheTtlInSeconds,omitempty"`
-
-	// CachingEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-cachingenabled
-	CachingEnabled bool `json:"CachingEnabled,omitempty"`
-
-	// ClientCertificateId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-clientcertificateid
-	ClientCertificateId string `json:"ClientCertificateId,omitempty"`
-
-	// DataTraceEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-datatraceenabled
-	DataTraceEnabled bool `json:"DataTraceEnabled,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-description
-	Description string `json:"Description,omitempty"`
-
-	// DocumentationVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-documentationversion
-	DocumentationVersion string `json:"DocumentationVersion,omitempty"`
-
-	// LoggingLevel AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-logginglevel
-	LoggingLevel string `json:"LoggingLevel,omitempty"`
-
-	// MethodSettings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-methodsettings
-	MethodSettings []AWSApiGatewayDeployment_MethodSetting `json:"MethodSettings,omitempty"`
-
-	// MetricsEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-metricsenabled
-	MetricsEnabled bool `json:"MetricsEnabled,omitempty"`
-
-	// ThrottlingBurstLimit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-throttlingburstlimit
-	ThrottlingBurstLimit int `json:"ThrottlingBurstLimit,omitempty"`
-
-	// ThrottlingRateLimit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-throttlingratelimit
-	ThrottlingRateLimit float64 `json:"ThrottlingRateLimit,omitempty"`
-
-	// Variables AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-variables
-	Variables map[string]string `json:"Variables,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayDeployment_StageDescription) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Deployment.StageDescription"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-documentationpart.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-documentationpart.go
deleted file mode 100644
index e55daa97bd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-documentationpart.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayDocumentationPart AWS CloudFormation Resource (AWS::ApiGateway::DocumentationPart)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationpart.html
-type AWSApiGatewayDocumentationPart struct {
-
-	// Location AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationpart.html#cfn-apigateway-documentationpart-location
-	Location *AWSApiGatewayDocumentationPart_Location `json:"Location,omitempty"`
-
-	// Properties AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationpart.html#cfn-apigateway-documentationpart-properties
-	Properties string `json:"Properties,omitempty"`
-
-	// RestApiId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationpart.html#cfn-apigateway-documentationpart-restapiid
-	RestApiId string `json:"RestApiId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayDocumentationPart) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::DocumentationPart"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayDocumentationPart) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayDocumentationPart
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayDocumentationPart) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayDocumentationPart
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayDocumentationPart(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayDocumentationPartResources retrieves all AWSApiGatewayDocumentationPart items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayDocumentationPartResources() map[string]AWSApiGatewayDocumentationPart {
-	results := map[string]AWSApiGatewayDocumentationPart{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayDocumentationPart:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::DocumentationPart" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayDocumentationPart
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayDocumentationPartWithName retrieves all AWSApiGatewayDocumentationPart items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayDocumentationPartWithName(name string) (AWSApiGatewayDocumentationPart, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayDocumentationPart:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::DocumentationPart" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayDocumentationPart
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayDocumentationPart{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-documentationpart_location.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-documentationpart_location.go
deleted file mode 100644
index 4189f180ca..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-documentationpart_location.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSApiGatewayDocumentationPart_Location AWS CloudFormation Resource (AWS::ApiGateway::DocumentationPart.Location)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-documentationpart-location.html
-type AWSApiGatewayDocumentationPart_Location struct {
-
-	// Method AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-documentationpart-location.html#cfn-apigateway-documentationpart-location-method
-	Method string `json:"Method,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-documentationpart-location.html#cfn-apigateway-documentationpart-location-name
-	Name string `json:"Name,omitempty"`
-
-	// Path AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-documentationpart-location.html#cfn-apigateway-documentationpart-location-path
-	Path string `json:"Path,omitempty"`
-
-	// StatusCode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-documentationpart-location.html#cfn-apigateway-documentationpart-location-statuscode
-	StatusCode string `json:"StatusCode,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-documentationpart-location.html#cfn-apigateway-documentationpart-location-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayDocumentationPart_Location) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::DocumentationPart.Location"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-documentationversion.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-documentationversion.go
deleted file mode 100644
index 137c0cfb02..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-documentationversion.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayDocumentationVersion AWS CloudFormation Resource (AWS::ApiGateway::DocumentationVersion)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationversion.html
-type AWSApiGatewayDocumentationVersion struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationversion.html#cfn-apigateway-documentationversion-description
-	Description string `json:"Description,omitempty"`
-
-	// DocumentationVersion AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationversion.html#cfn-apigateway-documentationversion-documentationversion
-	DocumentationVersion string `json:"DocumentationVersion,omitempty"`
-
-	// RestApiId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationversion.html#cfn-apigateway-documentationversion-restapiid
-	RestApiId string `json:"RestApiId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayDocumentationVersion) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::DocumentationVersion"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayDocumentationVersion) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayDocumentationVersion
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayDocumentationVersion) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayDocumentationVersion
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayDocumentationVersion(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayDocumentationVersionResources retrieves all AWSApiGatewayDocumentationVersion items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayDocumentationVersionResources() map[string]AWSApiGatewayDocumentationVersion {
-	results := map[string]AWSApiGatewayDocumentationVersion{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayDocumentationVersion:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::DocumentationVersion" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayDocumentationVersion
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayDocumentationVersionWithName retrieves all AWSApiGatewayDocumentationVersion items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayDocumentationVersionWithName(name string) (AWSApiGatewayDocumentationVersion, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayDocumentationVersion:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::DocumentationVersion" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayDocumentationVersion
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayDocumentationVersion{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-domainname.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-domainname.go
deleted file mode 100644
index 2dd1458269..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-domainname.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayDomainName AWS CloudFormation Resource (AWS::ApiGateway::DomainName)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html
-type AWSApiGatewayDomainName struct {
-
-	// CertificateArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-certificatearn
-	CertificateArn string `json:"CertificateArn,omitempty"`
-
-	// DomainName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-domainname
-	DomainName string `json:"DomainName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayDomainName) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::DomainName"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayDomainName) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayDomainName
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayDomainName) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayDomainName
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayDomainName(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayDomainNameResources retrieves all AWSApiGatewayDomainName items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayDomainNameResources() map[string]AWSApiGatewayDomainName {
-	results := map[string]AWSApiGatewayDomainName{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayDomainName:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::DomainName" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayDomainName
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayDomainNameWithName retrieves all AWSApiGatewayDomainName items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayDomainNameWithName(name string) (AWSApiGatewayDomainName, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayDomainName:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::DomainName" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayDomainName
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayDomainName{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-gatewayresponse.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-gatewayresponse.go
deleted file mode 100644
index ed4e03851e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-gatewayresponse.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayGatewayResponse AWS CloudFormation Resource (AWS::ApiGateway::GatewayResponse)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html
-type AWSApiGatewayGatewayResponse struct {
-
-	// ResponseParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html#cfn-apigateway-gatewayresponse-responseparameters
-	ResponseParameters map[string]string `json:"ResponseParameters,omitempty"`
-
-	// ResponseTemplates AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html#cfn-apigateway-gatewayresponse-responsetemplates
-	ResponseTemplates map[string]string `json:"ResponseTemplates,omitempty"`
-
-	// ResponseType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html#cfn-apigateway-gatewayresponse-responsetype
-	ResponseType string `json:"ResponseType,omitempty"`
-
-	// RestApiId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html#cfn-apigateway-gatewayresponse-restapiid
-	RestApiId string `json:"RestApiId,omitempty"`
-
-	// StatusCode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html#cfn-apigateway-gatewayresponse-statuscode
-	StatusCode string `json:"StatusCode,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayGatewayResponse) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::GatewayResponse"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayGatewayResponse) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayGatewayResponse
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayGatewayResponse) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayGatewayResponse
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayGatewayResponse(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayGatewayResponseResources retrieves all AWSApiGatewayGatewayResponse items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayGatewayResponseResources() map[string]AWSApiGatewayGatewayResponse {
-	results := map[string]AWSApiGatewayGatewayResponse{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayGatewayResponse:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::GatewayResponse" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayGatewayResponse
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayGatewayResponseWithName retrieves all AWSApiGatewayGatewayResponse items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayGatewayResponseWithName(name string) (AWSApiGatewayGatewayResponse, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayGatewayResponse:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::GatewayResponse" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayGatewayResponse
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayGatewayResponse{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-method.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-method.go
deleted file mode 100644
index 76a2b5f541..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-method.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayMethod AWS CloudFormation Resource (AWS::ApiGateway::Method)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html
-type AWSApiGatewayMethod struct {
-
-	// ApiKeyRequired AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-apikeyrequired
-	ApiKeyRequired bool `json:"ApiKeyRequired,omitempty"`
-
-	// AuthorizationType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-authorizationtype
-	AuthorizationType string `json:"AuthorizationType,omitempty"`
-
-	// AuthorizerId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-authorizerid
-	AuthorizerId string `json:"AuthorizerId,omitempty"`
-
-	// HttpMethod AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-httpmethod
-	HttpMethod string `json:"HttpMethod,omitempty"`
-
-	// Integration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-integration
-	Integration *AWSApiGatewayMethod_Integration `json:"Integration,omitempty"`
-
-	// MethodResponses AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-methodresponses
-	MethodResponses []AWSApiGatewayMethod_MethodResponse `json:"MethodResponses,omitempty"`
-
-	// OperationName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-operationname
-	OperationName string `json:"OperationName,omitempty"`
-
-	// RequestModels AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-requestmodels
-	RequestModels map[string]string `json:"RequestModels,omitempty"`
-
-	// RequestParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-requestparameters
-	RequestParameters map[string]bool `json:"RequestParameters,omitempty"`
-
-	// RequestValidatorId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-requestvalidatorid
-	RequestValidatorId string `json:"RequestValidatorId,omitempty"`
-
-	// ResourceId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-resourceid
-	ResourceId string `json:"ResourceId,omitempty"`
-
-	// RestApiId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-restapiid
-	RestApiId string `json:"RestApiId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayMethod) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Method"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayMethod) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayMethod
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayMethod) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayMethod
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayMethod(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayMethodResources retrieves all AWSApiGatewayMethod items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayMethodResources() map[string]AWSApiGatewayMethod {
-	results := map[string]AWSApiGatewayMethod{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayMethod:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Method" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayMethod
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayMethodWithName retrieves all AWSApiGatewayMethod items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayMethodWithName(name string) (AWSApiGatewayMethod, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayMethod:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Method" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayMethod
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayMethod{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-method_integration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-method_integration.go
deleted file mode 100644
index 5f20fa79e2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-method_integration.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package cloudformation
-
-// AWSApiGatewayMethod_Integration AWS CloudFormation Resource (AWS::ApiGateway::Method.Integration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html
-type AWSApiGatewayMethod_Integration struct {
-
-	// CacheKeyParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-cachekeyparameters
-	CacheKeyParameters []string `json:"CacheKeyParameters,omitempty"`
-
-	// CacheNamespace AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-cachenamespace
-	CacheNamespace string `json:"CacheNamespace,omitempty"`
-
-	// ContentHandling AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-contenthandling
-	ContentHandling string `json:"ContentHandling,omitempty"`
-
-	// Credentials AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-credentials
-	Credentials string `json:"Credentials,omitempty"`
-
-	// IntegrationHttpMethod AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-integrationhttpmethod
-	IntegrationHttpMethod string `json:"IntegrationHttpMethod,omitempty"`
-
-	// IntegrationResponses AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-integrationresponses
-	IntegrationResponses []AWSApiGatewayMethod_IntegrationResponse `json:"IntegrationResponses,omitempty"`
-
-	// PassthroughBehavior AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-passthroughbehavior
-	PassthroughBehavior string `json:"PassthroughBehavior,omitempty"`
-
-	// RequestParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-requestparameters
-	RequestParameters map[string]string `json:"RequestParameters,omitempty"`
-
-	// RequestTemplates AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-requesttemplates
-	RequestTemplates map[string]string `json:"RequestTemplates,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-type
-	Type string `json:"Type,omitempty"`
-
-	// Uri AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-uri
-	Uri string `json:"Uri,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayMethod_Integration) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Method.Integration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-method_integrationresponse.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-method_integrationresponse.go
deleted file mode 100644
index 5534d689f2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-method_integrationresponse.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSApiGatewayMethod_IntegrationResponse AWS CloudFormation Resource (AWS::ApiGateway::Method.IntegrationResponse)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration-integrationresponse.html
-type AWSApiGatewayMethod_IntegrationResponse struct {
-
-	// ContentHandling AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration-integrationresponse.html#cfn-apigateway-method-integrationresponse-contenthandling
-	ContentHandling string `json:"ContentHandling,omitempty"`
-
-	// ResponseParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration-integrationresponse.html#cfn-apigateway-method-integration-integrationresponse-responseparameters
-	ResponseParameters map[string]string `json:"ResponseParameters,omitempty"`
-
-	// ResponseTemplates AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration-integrationresponse.html#cfn-apigateway-method-integration-integrationresponse-responsetemplates
-	ResponseTemplates map[string]string `json:"ResponseTemplates,omitempty"`
-
-	// SelectionPattern AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration-integrationresponse.html#cfn-apigateway-method-integration-integrationresponse-selectionpattern
-	SelectionPattern string `json:"SelectionPattern,omitempty"`
-
-	// StatusCode AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration-integrationresponse.html#cfn-apigateway-method-integration-integrationresponse-statuscode
-	StatusCode string `json:"StatusCode,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayMethod_IntegrationResponse) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Method.IntegrationResponse"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-method_methodresponse.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-method_methodresponse.go
deleted file mode 100644
index 256763cac7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-method_methodresponse.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSApiGatewayMethod_MethodResponse AWS CloudFormation Resource (AWS::ApiGateway::Method.MethodResponse)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-methodresponse.html
-type AWSApiGatewayMethod_MethodResponse struct {
-
-	// ResponseModels AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-methodresponse.html#cfn-apigateway-method-methodresponse-responsemodels
-	ResponseModels map[string]string `json:"ResponseModels,omitempty"`
-
-	// ResponseParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-methodresponse.html#cfn-apigateway-method-methodresponse-responseparameters
-	ResponseParameters map[string]bool `json:"ResponseParameters,omitempty"`
-
-	// StatusCode AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-methodresponse.html#cfn-apigateway-method-methodresponse-statuscode
-	StatusCode string `json:"StatusCode,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayMethod_MethodResponse) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Method.MethodResponse"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-model.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-model.go
deleted file mode 100644
index 2dc019653c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-model.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayModel AWS CloudFormation Resource (AWS::ApiGateway::Model)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html
-type AWSApiGatewayModel struct {
-
-	// ContentType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html#cfn-apigateway-model-contenttype
-	ContentType string `json:"ContentType,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html#cfn-apigateway-model-description
-	Description string `json:"Description,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html#cfn-apigateway-model-name
-	Name string `json:"Name,omitempty"`
-
-	// RestApiId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html#cfn-apigateway-model-restapiid
-	RestApiId string `json:"RestApiId,omitempty"`
-
-	// Schema AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html#cfn-apigateway-model-schema
-	Schema interface{} `json:"Schema,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayModel) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Model"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayModel) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayModel
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayModel) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayModel
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayModel(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayModelResources retrieves all AWSApiGatewayModel items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayModelResources() map[string]AWSApiGatewayModel {
-	results := map[string]AWSApiGatewayModel{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayModel:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Model" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayModel
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayModelWithName retrieves all AWSApiGatewayModel items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayModelWithName(name string) (AWSApiGatewayModel, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayModel:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Model" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayModel
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayModel{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-requestvalidator.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-requestvalidator.go
deleted file mode 100644
index 4e68bc16b9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-requestvalidator.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayRequestValidator AWS CloudFormation Resource (AWS::ApiGateway::RequestValidator)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-requestvalidator.html
-type AWSApiGatewayRequestValidator struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-requestvalidator.html#cfn-apigateway-requestvalidator-name
-	Name string `json:"Name,omitempty"`
-
-	// RestApiId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-requestvalidator.html#cfn-apigateway-requestvalidator-restapiid
-	RestApiId string `json:"RestApiId,omitempty"`
-
-	// ValidateRequestBody AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-requestvalidator.html#cfn-apigateway-requestvalidator-validaterequestbody
-	ValidateRequestBody bool `json:"ValidateRequestBody,omitempty"`
-
-	// ValidateRequestParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-requestvalidator.html#cfn-apigateway-requestvalidator-validaterequestparameters
-	ValidateRequestParameters bool `json:"ValidateRequestParameters,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayRequestValidator) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::RequestValidator"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayRequestValidator) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayRequestValidator
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayRequestValidator) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayRequestValidator
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayRequestValidator(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayRequestValidatorResources retrieves all AWSApiGatewayRequestValidator items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayRequestValidatorResources() map[string]AWSApiGatewayRequestValidator {
-	results := map[string]AWSApiGatewayRequestValidator{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayRequestValidator:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::RequestValidator" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayRequestValidator
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayRequestValidatorWithName retrieves all AWSApiGatewayRequestValidator items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayRequestValidatorWithName(name string) (AWSApiGatewayRequestValidator, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayRequestValidator:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::RequestValidator" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayRequestValidator
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayRequestValidator{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-resource.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-resource.go
deleted file mode 100644
index cf0eca5122..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-resource.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayResource AWS CloudFormation Resource (AWS::ApiGateway::Resource)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-resource.html
-type AWSApiGatewayResource struct {
-
-	// ParentId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-resource.html#cfn-apigateway-resource-parentid
-	ParentId string `json:"ParentId,omitempty"`
-
-	// PathPart AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-resource.html#cfn-apigateway-resource-pathpart
-	PathPart string `json:"PathPart,omitempty"`
-
-	// RestApiId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-resource.html#cfn-apigateway-resource-restapiid
-	RestApiId string `json:"RestApiId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayResource) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Resource"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayResource) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayResource
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayResource) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayResource
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayResource(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayResourceResources retrieves all AWSApiGatewayResource items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayResourceResources() map[string]AWSApiGatewayResource {
-	results := map[string]AWSApiGatewayResource{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayResource:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Resource" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayResource
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayResourceWithName retrieves all AWSApiGatewayResource items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayResourceWithName(name string) (AWSApiGatewayResource, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayResource:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Resource" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayResource
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayResource{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-restapi.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-restapi.go
deleted file mode 100644
index 20c8d59727..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-restapi.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayRestApi AWS CloudFormation Resource (AWS::ApiGateway::RestApi)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html
-type AWSApiGatewayRestApi struct {
-
-	// BinaryMediaTypes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-binarymediatypes
-	BinaryMediaTypes []string `json:"BinaryMediaTypes,omitempty"`
-
-	// Body AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-body
-	Body interface{} `json:"Body,omitempty"`
-
-	// BodyS3Location AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-bodys3location
-	BodyS3Location *AWSApiGatewayRestApi_S3Location `json:"BodyS3Location,omitempty"`
-
-	// CloneFrom AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-clonefrom
-	CloneFrom string `json:"CloneFrom,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-description
-	Description string `json:"Description,omitempty"`
-
-	// FailOnWarnings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-failonwarnings
-	FailOnWarnings bool `json:"FailOnWarnings,omitempty"`
-
-	// Mode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-mode
-	Mode string `json:"Mode,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-name
-	Name string `json:"Name,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-parameters
-	Parameters map[string]string `json:"Parameters,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayRestApi) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::RestApi"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayRestApi) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayRestApi
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayRestApi) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayRestApi
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayRestApi(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayRestApiResources retrieves all AWSApiGatewayRestApi items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayRestApiResources() map[string]AWSApiGatewayRestApi {
-	results := map[string]AWSApiGatewayRestApi{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayRestApi:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::RestApi" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayRestApi
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayRestApiWithName retrieves all AWSApiGatewayRestApi items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayRestApiWithName(name string) (AWSApiGatewayRestApi, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayRestApi:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::RestApi" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayRestApi
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayRestApi{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-restapi_s3location.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-restapi_s3location.go
deleted file mode 100644
index 56f36a0c09..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-restapi_s3location.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSApiGatewayRestApi_S3Location AWS CloudFormation Resource (AWS::ApiGateway::RestApi.S3Location)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-restapi-bodys3location.html
-type AWSApiGatewayRestApi_S3Location struct {
-
-	// Bucket AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-restapi-bodys3location.html#cfn-apigateway-restapi-s3location-bucket
-	Bucket string `json:"Bucket,omitempty"`
-
-	// ETag AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-restapi-bodys3location.html#cfn-apigateway-restapi-s3location-etag
-	ETag string `json:"ETag,omitempty"`
-
-	// Key AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-restapi-bodys3location.html#cfn-apigateway-restapi-s3location-key
-	Key string `json:"Key,omitempty"`
-
-	// Version AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-restapi-bodys3location.html#cfn-apigateway-restapi-s3location-version
-	Version string `json:"Version,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayRestApi_S3Location) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::RestApi.S3Location"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-stage.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-stage.go
deleted file mode 100644
index 798b61c2b2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-stage.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayStage AWS CloudFormation Resource (AWS::ApiGateway::Stage)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html
-type AWSApiGatewayStage struct {
-
-	// CacheClusterEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-cacheclusterenabled
-	CacheClusterEnabled bool `json:"CacheClusterEnabled,omitempty"`
-
-	// CacheClusterSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-cacheclustersize
-	CacheClusterSize string `json:"CacheClusterSize,omitempty"`
-
-	// ClientCertificateId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-clientcertificateid
-	ClientCertificateId string `json:"ClientCertificateId,omitempty"`
-
-	// DeploymentId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-deploymentid
-	DeploymentId string `json:"DeploymentId,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-description
-	Description string `json:"Description,omitempty"`
-
-	// DocumentationVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-documentationversion
-	DocumentationVersion string `json:"DocumentationVersion,omitempty"`
-
-	// MethodSettings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-methodsettings
-	MethodSettings []AWSApiGatewayStage_MethodSetting `json:"MethodSettings,omitempty"`
-
-	// RestApiId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-restapiid
-	RestApiId string `json:"RestApiId,omitempty"`
-
-	// StageName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-stagename
-	StageName string `json:"StageName,omitempty"`
-
-	// Variables AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-variables
-	Variables map[string]string `json:"Variables,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayStage) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Stage"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayStage) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayStage
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayStage) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayStage
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayStage(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayStageResources retrieves all AWSApiGatewayStage items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayStageResources() map[string]AWSApiGatewayStage {
-	results := map[string]AWSApiGatewayStage{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayStage:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Stage" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayStage
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayStageWithName retrieves all AWSApiGatewayStage items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayStageWithName(name string) (AWSApiGatewayStage, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayStage:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::Stage" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayStage
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayStage{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-stage_methodsetting.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-stage_methodsetting.go
deleted file mode 100644
index 8f850edcb3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-stage_methodsetting.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package cloudformation
-
-// AWSApiGatewayStage_MethodSetting AWS CloudFormation Resource (AWS::ApiGateway::Stage.MethodSetting)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html
-type AWSApiGatewayStage_MethodSetting struct {
-
-	// CacheDataEncrypted AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-cachedataencrypted
-	CacheDataEncrypted bool `json:"CacheDataEncrypted,omitempty"`
-
-	// CacheTtlInSeconds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-cachettlinseconds
-	CacheTtlInSeconds int `json:"CacheTtlInSeconds,omitempty"`
-
-	// CachingEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-cachingenabled
-	CachingEnabled bool `json:"CachingEnabled,omitempty"`
-
-	// DataTraceEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-datatraceenabled
-	DataTraceEnabled bool `json:"DataTraceEnabled,omitempty"`
-
-	// HttpMethod AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-httpmethod
-	HttpMethod string `json:"HttpMethod,omitempty"`
-
-	// LoggingLevel AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-logginglevel
-	LoggingLevel string `json:"LoggingLevel,omitempty"`
-
-	// MetricsEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-metricsenabled
-	MetricsEnabled bool `json:"MetricsEnabled,omitempty"`
-
-	// ResourcePath AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-resourcepath
-	ResourcePath string `json:"ResourcePath,omitempty"`
-
-	// ThrottlingBurstLimit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-throttlingburstlimit
-	ThrottlingBurstLimit int `json:"ThrottlingBurstLimit,omitempty"`
-
-	// ThrottlingRateLimit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-throttlingratelimit
-	ThrottlingRateLimit float64 `json:"ThrottlingRateLimit,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayStage_MethodSetting) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::Stage.MethodSetting"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplan.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplan.go
deleted file mode 100644
index e70db3463d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplan.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayUsagePlan AWS CloudFormation Resource (AWS::ApiGateway::UsagePlan)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html
-type AWSApiGatewayUsagePlan struct {
-
-	// ApiStages AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html#cfn-apigateway-usageplan-apistages
-	ApiStages []AWSApiGatewayUsagePlan_ApiStage `json:"ApiStages,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html#cfn-apigateway-usageplan-description
-	Description string `json:"Description,omitempty"`
-
-	// Quota AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html#cfn-apigateway-usageplan-quota
-	Quota *AWSApiGatewayUsagePlan_QuotaSettings `json:"Quota,omitempty"`
-
-	// Throttle AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html#cfn-apigateway-usageplan-throttle
-	Throttle *AWSApiGatewayUsagePlan_ThrottleSettings `json:"Throttle,omitempty"`
-
-	// UsagePlanName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html#cfn-apigateway-usageplan-usageplanname
-	UsagePlanName string `json:"UsagePlanName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayUsagePlan) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::UsagePlan"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayUsagePlan) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayUsagePlan
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayUsagePlan) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayUsagePlan
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayUsagePlan(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayUsagePlanResources retrieves all AWSApiGatewayUsagePlan items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayUsagePlanResources() map[string]AWSApiGatewayUsagePlan {
-	results := map[string]AWSApiGatewayUsagePlan{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayUsagePlan:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::UsagePlan" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayUsagePlan
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayUsagePlanWithName retrieves all AWSApiGatewayUsagePlan items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayUsagePlanWithName(name string) (AWSApiGatewayUsagePlan, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayUsagePlan:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::UsagePlan" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayUsagePlan
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayUsagePlan{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplan_apistage.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplan_apistage.go
deleted file mode 100644
index 19a3dc7674..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplan_apistage.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSApiGatewayUsagePlan_ApiStage AWS CloudFormation Resource (AWS::ApiGateway::UsagePlan.ApiStage)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-apistage.html
-type AWSApiGatewayUsagePlan_ApiStage struct {
-
-	// ApiId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-apistage.html#cfn-apigateway-usageplan-apistage-apiid
-	ApiId string `json:"ApiId,omitempty"`
-
-	// Stage AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-apistage.html#cfn-apigateway-usageplan-apistage-stage
-	Stage string `json:"Stage,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayUsagePlan_ApiStage) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::UsagePlan.ApiStage"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplan_quotasettings.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplan_quotasettings.go
deleted file mode 100644
index 4d3af3cf57..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplan_quotasettings.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSApiGatewayUsagePlan_QuotaSettings AWS CloudFormation Resource (AWS::ApiGateway::UsagePlan.QuotaSettings)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-quotasettings.html
-type AWSApiGatewayUsagePlan_QuotaSettings struct {
-
-	// Limit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-quotasettings.html#cfn-apigateway-usageplan-quotasettings-limit
-	Limit int `json:"Limit,omitempty"`
-
-	// Offset AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-quotasettings.html#cfn-apigateway-usageplan-quotasettings-offset
-	Offset int `json:"Offset,omitempty"`
-
-	// Period AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-quotasettings.html#cfn-apigateway-usageplan-quotasettings-period
-	Period string `json:"Period,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayUsagePlan_QuotaSettings) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::UsagePlan.QuotaSettings"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplan_throttlesettings.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplan_throttlesettings.go
deleted file mode 100644
index 7aa059a16a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplan_throttlesettings.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSApiGatewayUsagePlan_ThrottleSettings AWS CloudFormation Resource (AWS::ApiGateway::UsagePlan.ThrottleSettings)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-throttlesettings.html
-type AWSApiGatewayUsagePlan_ThrottleSettings struct {
-
-	// BurstLimit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-throttlesettings.html#cfn-apigateway-usageplan-throttlesettings-burstlimit
-	BurstLimit int `json:"BurstLimit,omitempty"`
-
-	// RateLimit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-throttlesettings.html#cfn-apigateway-usageplan-throttlesettings-ratelimit
-	RateLimit float64 `json:"RateLimit,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayUsagePlan_ThrottleSettings) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::UsagePlan.ThrottleSettings"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplankey.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplankey.go
deleted file mode 100644
index b4946f5ed7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-apigateway-usageplankey.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApiGatewayUsagePlanKey AWS CloudFormation Resource (AWS::ApiGateway::UsagePlanKey)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplankey.html
-type AWSApiGatewayUsagePlanKey struct {
-
-	// KeyId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplankey.html#cfn-apigateway-usageplankey-keyid
-	KeyId string `json:"KeyId,omitempty"`
-
-	// KeyType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplankey.html#cfn-apigateway-usageplankey-keytype
-	KeyType string `json:"KeyType,omitempty"`
-
-	// UsagePlanId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplankey.html#cfn-apigateway-usageplankey-usageplanid
-	UsagePlanId string `json:"UsagePlanId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApiGatewayUsagePlanKey) AWSCloudFormationType() string {
-	return "AWS::ApiGateway::UsagePlanKey"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApiGatewayUsagePlanKey) MarshalJSON() ([]byte, error) {
-	type Properties AWSApiGatewayUsagePlanKey
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApiGatewayUsagePlanKey) UnmarshalJSON(b []byte) error {
-	type Properties AWSApiGatewayUsagePlanKey
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApiGatewayUsagePlanKey(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApiGatewayUsagePlanKeyResources retrieves all AWSApiGatewayUsagePlanKey items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApiGatewayUsagePlanKeyResources() map[string]AWSApiGatewayUsagePlanKey {
-	results := map[string]AWSApiGatewayUsagePlanKey{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayUsagePlanKey:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::UsagePlanKey" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayUsagePlanKey
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApiGatewayUsagePlanKeyWithName retrieves all AWSApiGatewayUsagePlanKey items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApiGatewayUsagePlanKeyWithName(name string) (AWSApiGatewayUsagePlanKey, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApiGatewayUsagePlanKey:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApiGateway::UsagePlanKey" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApiGatewayUsagePlanKey
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApiGatewayUsagePlanKey{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalabletarget.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalabletarget.go
deleted file mode 100644
index bb7d9fe0f0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalabletarget.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApplicationAutoScalingScalableTarget AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalableTarget)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html
-type AWSApplicationAutoScalingScalableTarget struct {
-
-	// MaxCapacity AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-maxcapacity
-	MaxCapacity int `json:"MaxCapacity,omitempty"`
-
-	// MinCapacity AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-mincapacity
-	MinCapacity int `json:"MinCapacity,omitempty"`
-
-	// ResourceId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-resourceid
-	ResourceId string `json:"ResourceId,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-
-	// ScalableDimension AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-scalabledimension
-	ScalableDimension string `json:"ScalableDimension,omitempty"`
-
-	// ServiceNamespace AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-servicenamespace
-	ServiceNamespace string `json:"ServiceNamespace,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApplicationAutoScalingScalableTarget) AWSCloudFormationType() string {
-	return "AWS::ApplicationAutoScaling::ScalableTarget"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApplicationAutoScalingScalableTarget) MarshalJSON() ([]byte, error) {
-	type Properties AWSApplicationAutoScalingScalableTarget
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApplicationAutoScalingScalableTarget) UnmarshalJSON(b []byte) error {
-	type Properties AWSApplicationAutoScalingScalableTarget
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApplicationAutoScalingScalableTarget(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApplicationAutoScalingScalableTargetResources retrieves all AWSApplicationAutoScalingScalableTarget items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApplicationAutoScalingScalableTargetResources() map[string]AWSApplicationAutoScalingScalableTarget {
-	results := map[string]AWSApplicationAutoScalingScalableTarget{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApplicationAutoScalingScalableTarget:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApplicationAutoScaling::ScalableTarget" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApplicationAutoScalingScalableTarget
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApplicationAutoScalingScalableTargetWithName retrieves all AWSApplicationAutoScalingScalableTarget items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApplicationAutoScalingScalableTargetWithName(name string) (AWSApplicationAutoScalingScalableTarget, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApplicationAutoScalingScalableTarget:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApplicationAutoScaling::ScalableTarget" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApplicationAutoScalingScalableTarget
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApplicationAutoScalingScalableTarget{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy.go
deleted file mode 100644
index 16040e9741..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSApplicationAutoScalingScalingPolicy AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html
-type AWSApplicationAutoScalingScalingPolicy struct {
-
-	// PolicyName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-policyname
-	PolicyName string `json:"PolicyName,omitempty"`
-
-	// PolicyType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-policytype
-	PolicyType string `json:"PolicyType,omitempty"`
-
-	// ResourceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-resourceid
-	ResourceId string `json:"ResourceId,omitempty"`
-
-	// ScalableDimension AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-scalabledimension
-	ScalableDimension string `json:"ScalableDimension,omitempty"`
-
-	// ScalingTargetId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-scalingtargetid
-	ScalingTargetId string `json:"ScalingTargetId,omitempty"`
-
-	// ServiceNamespace AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-servicenamespace
-	ServiceNamespace string `json:"ServiceNamespace,omitempty"`
-
-	// StepScalingPolicyConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration
-	StepScalingPolicyConfiguration *AWSApplicationAutoScalingScalingPolicy_StepScalingPolicyConfiguration `json:"StepScalingPolicyConfiguration,omitempty"`
-
-	// TargetTrackingScalingPolicyConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration
-	TargetTrackingScalingPolicyConfiguration *AWSApplicationAutoScalingScalingPolicy_TargetTrackingScalingPolicyConfiguration `json:"TargetTrackingScalingPolicyConfiguration,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApplicationAutoScalingScalingPolicy) AWSCloudFormationType() string {
-	return "AWS::ApplicationAutoScaling::ScalingPolicy"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSApplicationAutoScalingScalingPolicy) MarshalJSON() ([]byte, error) {
-	type Properties AWSApplicationAutoScalingScalingPolicy
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSApplicationAutoScalingScalingPolicy) UnmarshalJSON(b []byte) error {
-	type Properties AWSApplicationAutoScalingScalingPolicy
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSApplicationAutoScalingScalingPolicy(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSApplicationAutoScalingScalingPolicyResources retrieves all AWSApplicationAutoScalingScalingPolicy items from an AWS CloudFormation template
-func (t *Template) GetAllAWSApplicationAutoScalingScalingPolicyResources() map[string]AWSApplicationAutoScalingScalingPolicy {
-	results := map[string]AWSApplicationAutoScalingScalingPolicy{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSApplicationAutoScalingScalingPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApplicationAutoScaling::ScalingPolicy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApplicationAutoScalingScalingPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSApplicationAutoScalingScalingPolicyWithName retrieves all AWSApplicationAutoScalingScalingPolicy items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSApplicationAutoScalingScalingPolicyWithName(name string) (AWSApplicationAutoScalingScalingPolicy, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSApplicationAutoScalingScalingPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ApplicationAutoScaling::ScalingPolicy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSApplicationAutoScalingScalingPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSApplicationAutoScalingScalingPolicy{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go
deleted file mode 100644
index d7b230718a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSApplicationAutoScalingScalingPolicy_CustomizedMetricSpecification AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-customizedmetricspecification.html
-type AWSApplicationAutoScalingScalingPolicy_CustomizedMetricSpecification struct {
-
-	// Dimensions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-customizedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-customizedmetricspecification-dimensions
-	Dimensions []AWSApplicationAutoScalingScalingPolicy_MetricDimension `json:"Dimensions,omitempty"`
-
-	// MetricName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-customizedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-customizedmetricspecification-metricname
-	MetricName string `json:"MetricName,omitempty"`
-
-	// Namespace AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-customizedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-customizedmetricspecification-namespace
-	Namespace string `json:"Namespace,omitempty"`
-
-	// Statistic AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-customizedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-customizedmetricspecification-statistic
-	Statistic string `json:"Statistic,omitempty"`
-
-	// Unit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-customizedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-customizedmetricspecification-unit
-	Unit string `json:"Unit,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApplicationAutoScalingScalingPolicy_CustomizedMetricSpecification) AWSCloudFormationType() string {
-	return "AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_metricdimension.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_metricdimension.go
deleted file mode 100644
index 11293772ea..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_metricdimension.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSApplicationAutoScalingScalingPolicy_MetricDimension AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-metricdimension.html
-type AWSApplicationAutoScalingScalingPolicy_MetricDimension struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-metricdimension.html#cfn-applicationautoscaling-scalingpolicy-metricdimension-name
-	Name string `json:"Name,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-metricdimension.html#cfn-applicationautoscaling-scalingpolicy-metricdimension-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApplicationAutoScalingScalingPolicy_MetricDimension) AWSCloudFormationType() string {
-	return "AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go
deleted file mode 100644
index 1623e565a4..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSApplicationAutoScalingScalingPolicy_PredefinedMetricSpecification AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-predefinedmetricspecification.html
-type AWSApplicationAutoScalingScalingPolicy_PredefinedMetricSpecification struct {
-
-	// PredefinedMetricType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-predefinedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-predefinedmetricspecification-predefinedmetrictype
-	PredefinedMetricType string `json:"PredefinedMetricType,omitempty"`
-
-	// ResourceLabel AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-predefinedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-predefinedmetricspecification-resourcelabel
-	ResourceLabel string `json:"ResourceLabel,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApplicationAutoScalingScalingPolicy_PredefinedMetricSpecification) AWSCloudFormationType() string {
-	return "AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_stepadjustment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_stepadjustment.go
deleted file mode 100644
index 449c55e0c0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_stepadjustment.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSApplicationAutoScalingScalingPolicy_StepAdjustment AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment.html
-type AWSApplicationAutoScalingScalingPolicy_StepAdjustment struct {
-
-	// MetricIntervalLowerBound AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment-metricintervallowerbound
-	MetricIntervalLowerBound float64 `json:"MetricIntervalLowerBound,omitempty"`
-
-	// MetricIntervalUpperBound AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment-metricintervalupperbound
-	MetricIntervalUpperBound float64 `json:"MetricIntervalUpperBound,omitempty"`
-
-	// ScalingAdjustment AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment-scalingadjustment
-	ScalingAdjustment int `json:"ScalingAdjustment,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApplicationAutoScalingScalingPolicy_StepAdjustment) AWSCloudFormationType() string {
-	return "AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go
deleted file mode 100644
index 486fc58d33..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSApplicationAutoScalingScalingPolicy_StepScalingPolicyConfiguration AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration.html
-type AWSApplicationAutoScalingScalingPolicy_StepScalingPolicyConfiguration struct {
-
-	// AdjustmentType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-adjustmenttype
-	AdjustmentType string `json:"AdjustmentType,omitempty"`
-
-	// Cooldown AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-cooldown
-	Cooldown int `json:"Cooldown,omitempty"`
-
-	// MetricAggregationType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-metricaggregationtype
-	MetricAggregationType string `json:"MetricAggregationType,omitempty"`
-
-	// MinAdjustmentMagnitude AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-minadjustmentmagnitude
-	MinAdjustmentMagnitude int `json:"MinAdjustmentMagnitude,omitempty"`
-
-	// StepAdjustments AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustments
-	StepAdjustments []AWSApplicationAutoScalingScalingPolicy_StepAdjustment `json:"StepAdjustments,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApplicationAutoScalingScalingPolicy_StepScalingPolicyConfiguration) AWSCloudFormationType() string {
-	return "AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go
deleted file mode 100644
index 3a999b815f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSApplicationAutoScalingScalingPolicy_TargetTrackingScalingPolicyConfiguration AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html
-type AWSApplicationAutoScalingScalingPolicy_TargetTrackingScalingPolicyConfiguration struct {
-
-	// CustomizedMetricSpecification AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration-customizedmetricspecification
-	CustomizedMetricSpecification *AWSApplicationAutoScalingScalingPolicy_CustomizedMetricSpecification `json:"CustomizedMetricSpecification,omitempty"`
-
-	// PredefinedMetricSpecification AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration-predefinedmetricspecification
-	PredefinedMetricSpecification *AWSApplicationAutoScalingScalingPolicy_PredefinedMetricSpecification `json:"PredefinedMetricSpecification,omitempty"`
-
-	// ScaleInCooldown AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration-scaleincooldown
-	ScaleInCooldown int `json:"ScaleInCooldown,omitempty"`
-
-	// ScaleOutCooldown AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration-scaleoutcooldown
-	ScaleOutCooldown int `json:"ScaleOutCooldown,omitempty"`
-
-	// TargetValue AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration-targetvalue
-	TargetValue float64 `json:"TargetValue,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSApplicationAutoScalingScalingPolicy_TargetTrackingScalingPolicyConfiguration) AWSCloudFormationType() string {
-	return "AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-athena-namedquery.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-athena-namedquery.go
deleted file mode 100644
index 23a8289fa7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-athena-namedquery.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSAthenaNamedQuery AWS CloudFormation Resource (AWS::Athena::NamedQuery)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html
-type AWSAthenaNamedQuery struct {
-
-	// Database AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-database
-	Database string `json:"Database,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-description
-	Description string `json:"Description,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-name
-	Name string `json:"Name,omitempty"`
-
-	// QueryString AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-querystring
-	QueryString string `json:"QueryString,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAthenaNamedQuery) AWSCloudFormationType() string {
-	return "AWS::Athena::NamedQuery"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSAthenaNamedQuery) MarshalJSON() ([]byte, error) {
-	type Properties AWSAthenaNamedQuery
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSAthenaNamedQuery) UnmarshalJSON(b []byte) error {
-	type Properties AWSAthenaNamedQuery
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSAthenaNamedQuery(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSAthenaNamedQueryResources retrieves all AWSAthenaNamedQuery items from an AWS CloudFormation template
-func (t *Template) GetAllAWSAthenaNamedQueryResources() map[string]AWSAthenaNamedQuery {
-	results := map[string]AWSAthenaNamedQuery{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSAthenaNamedQuery:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Athena::NamedQuery" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSAthenaNamedQuery
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSAthenaNamedQueryWithName retrieves all AWSAthenaNamedQuery items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSAthenaNamedQueryWithName(name string) (AWSAthenaNamedQuery, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSAthenaNamedQuery:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Athena::NamedQuery" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSAthenaNamedQuery
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSAthenaNamedQuery{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup.go
deleted file mode 100644
index 4ad2dfc7c0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup.go
+++ /dev/null
@@ -1,195 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSAutoScalingAutoScalingGroup AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html
-type AWSAutoScalingAutoScalingGroup struct {
-
-	// AsTags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-tags
-	AsTags []AWSAutoScalingAutoScalingGroup_TagProperty `json:"AsTags,omitempty"`
-
-	// AvailabilityZones AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-availabilityzones
-	AvailabilityZones []string `json:"AvailabilityZones,omitempty"`
-
-	// Cooldown AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-cooldown
-	Cooldown string `json:"Cooldown,omitempty"`
-
-	// DesiredCapacity AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-desiredcapacity
-	DesiredCapacity string `json:"DesiredCapacity,omitempty"`
-
-	// HealthCheckGracePeriod AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-healthcheckgraceperiod
-	HealthCheckGracePeriod int `json:"HealthCheckGracePeriod,omitempty"`
-
-	// HealthCheckType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-healthchecktype
-	HealthCheckType string `json:"HealthCheckType,omitempty"`
-
-	// InstanceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-instanceid
-	InstanceId string `json:"InstanceId,omitempty"`
-
-	// LaunchConfigurationName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-launchconfigurationname
-	LaunchConfigurationName string `json:"LaunchConfigurationName,omitempty"`
-
-	// LifecycleHookSpecificationList AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecificationlist
-	LifecycleHookSpecificationList []AWSAutoScalingAutoScalingGroup_LifecycleHookSpecification `json:"LifecycleHookSpecificationList,omitempty"`
-
-	// LoadBalancerNames AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-loadbalancernames
-	LoadBalancerNames []string `json:"LoadBalancerNames,omitempty"`
-
-	// MaxSize AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-maxsize
-	MaxSize string `json:"MaxSize,omitempty"`
-
-	// MetricsCollection AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-metricscollection
-	MetricsCollection []AWSAutoScalingAutoScalingGroup_MetricsCollection `json:"MetricsCollection,omitempty"`
-
-	// MinSize AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-minsize
-	MinSize string `json:"MinSize,omitempty"`
-
-	// NotificationConfigurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-notificationconfigurations
-	NotificationConfigurations []AWSAutoScalingAutoScalingGroup_NotificationConfiguration `json:"NotificationConfigurations,omitempty"`
-
-	// PlacementGroup AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-placementgroup
-	PlacementGroup string `json:"PlacementGroup,omitempty"`
-
-	// TargetGroupARNs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-targetgrouparns
-	TargetGroupARNs []string `json:"TargetGroupARNs,omitempty"`
-
-	// TerminationPolicies AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-termpolicy
-	TerminationPolicies []string `json:"TerminationPolicies,omitempty"`
-
-	// VPCZoneIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-vpczoneidentifier
-	VPCZoneIdentifier []string `json:"VPCZoneIdentifier,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingAutoScalingGroup) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::AutoScalingGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSAutoScalingAutoScalingGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSAutoScalingAutoScalingGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSAutoScalingAutoScalingGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSAutoScalingAutoScalingGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSAutoScalingAutoScalingGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSAutoScalingAutoScalingGroupResources retrieves all AWSAutoScalingAutoScalingGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSAutoScalingAutoScalingGroupResources() map[string]AWSAutoScalingAutoScalingGroup {
-	results := map[string]AWSAutoScalingAutoScalingGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSAutoScalingAutoScalingGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::AutoScaling::AutoScalingGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSAutoScalingAutoScalingGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSAutoScalingAutoScalingGroupWithName retrieves all AWSAutoScalingAutoScalingGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSAutoScalingAutoScalingGroupWithName(name string) (AWSAutoScalingAutoScalingGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSAutoScalingAutoScalingGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::AutoScaling::AutoScalingGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSAutoScalingAutoScalingGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSAutoScalingAutoScalingGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go
deleted file mode 100644
index 3a1c860d7e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package cloudformation
-
-// AWSAutoScalingAutoScalingGroup_LifecycleHookSpecification AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html
-type AWSAutoScalingAutoScalingGroup_LifecycleHookSpecification struct {
-
-	// DefaultResult AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-defaultresult
-	DefaultResult string `json:"DefaultResult,omitempty"`
-
-	// HeartbeatTimeout AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-heartbeattimeout
-	HeartbeatTimeout int `json:"HeartbeatTimeout,omitempty"`
-
-	// LifecycleHookName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-lifecyclehookname
-	LifecycleHookName string `json:"LifecycleHookName,omitempty"`
-
-	// LifecycleTransition AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-lifecycletransition
-	LifecycleTransition string `json:"LifecycleTransition,omitempty"`
-
-	// NotificationMetadata AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-notificationmetadata
-	NotificationMetadata string `json:"NotificationMetadata,omitempty"`
-
-	// NotificationTargetARN AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-notificationtargetarn
-	NotificationTargetARN string `json:"NotificationTargetARN,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingAutoScalingGroup_LifecycleHookSpecification) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup_metricscollection.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup_metricscollection.go
deleted file mode 100644
index bbd0c266e8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup_metricscollection.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSAutoScalingAutoScalingGroup_MetricsCollection AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.MetricsCollection)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-metricscollection.html
-type AWSAutoScalingAutoScalingGroup_MetricsCollection struct {
-
-	// Granularity AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-metricscollection.html#cfn-as-metricscollection-granularity
-	Granularity string `json:"Granularity,omitempty"`
-
-	// Metrics AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-metricscollection.html#cfn-as-metricscollection-metrics
-	Metrics []string `json:"Metrics,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingAutoScalingGroup_MetricsCollection) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::AutoScalingGroup.MetricsCollection"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup_notificationconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup_notificationconfiguration.go
deleted file mode 100644
index 5c24350973..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup_notificationconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSAutoScalingAutoScalingGroup_NotificationConfiguration AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-notificationconfigurations.html
-type AWSAutoScalingAutoScalingGroup_NotificationConfiguration struct {
-
-	// NotificationTypes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-notificationconfigurations.html#cfn-as-group-notificationconfigurations-notificationtypes
-	NotificationTypes []string `json:"NotificationTypes,omitempty"`
-
-	// TopicARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-notificationconfigurations.html#cfn-autoscaling-autoscalinggroup-notificationconfigurations-topicarn
-	TopicARN string `json:"TopicARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingAutoScalingGroup_NotificationConfiguration) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup_tagproperty.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup_tagproperty.go
deleted file mode 100644
index 29ebeb8c93..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-autoscalinggroup_tagproperty.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSAutoScalingAutoScalingGroup_TagProperty AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.TagProperty)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-tags.html
-type AWSAutoScalingAutoScalingGroup_TagProperty struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-tags.html#cfn-as-tags-Key
-	Key string `json:"Key,omitempty"`
-
-	// PropagateAtLaunch AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-tags.html#cfn-as-tags-PropagateAtLaunch
-	PropagateAtLaunch bool `json:"PropagateAtLaunch,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-tags.html#cfn-as-tags-Value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingAutoScalingGroup_TagProperty) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::AutoScalingGroup.TagProperty"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-launchconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-launchconfiguration.go
deleted file mode 100644
index c7b29ace54..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-launchconfiguration.go
+++ /dev/null
@@ -1,190 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSAutoScalingLaunchConfiguration AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html
-type AWSAutoScalingLaunchConfiguration struct {
-
-	// AssociatePublicIpAddress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cf-as-launchconfig-associatepubip
-	AssociatePublicIpAddress bool `json:"AssociatePublicIpAddress,omitempty"`
-
-	// BlockDeviceMappings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-blockdevicemappings
-	BlockDeviceMappings []AWSAutoScalingLaunchConfiguration_BlockDeviceMapping `json:"BlockDeviceMappings,omitempty"`
-
-	// ClassicLinkVPCId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-classiclinkvpcid
-	ClassicLinkVPCId string `json:"ClassicLinkVPCId,omitempty"`
-
-	// ClassicLinkVPCSecurityGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-classiclinkvpcsecuritygroups
-	ClassicLinkVPCSecurityGroups []string `json:"ClassicLinkVPCSecurityGroups,omitempty"`
-
-	// EbsOptimized AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-ebsoptimized
-	EbsOptimized bool `json:"EbsOptimized,omitempty"`
-
-	// IamInstanceProfile AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-iaminstanceprofile
-	IamInstanceProfile string `json:"IamInstanceProfile,omitempty"`
-
-	// ImageId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-imageid
-	ImageId string `json:"ImageId,omitempty"`
-
-	// InstanceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-instanceid
-	InstanceId string `json:"InstanceId,omitempty"`
-
-	// InstanceMonitoring AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-instancemonitoring
-	InstanceMonitoring bool `json:"InstanceMonitoring,omitempty"`
-
-	// InstanceType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-instancetype
-	InstanceType string `json:"InstanceType,omitempty"`
-
-	// KernelId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-kernelid
-	KernelId string `json:"KernelId,omitempty"`
-
-	// KeyName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-keyname
-	KeyName string `json:"KeyName,omitempty"`
-
-	// PlacementTenancy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-placementtenancy
-	PlacementTenancy string `json:"PlacementTenancy,omitempty"`
-
-	// RamDiskId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-ramdiskid
-	RamDiskId string `json:"RamDiskId,omitempty"`
-
-	// SecurityGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-securitygroups
-	SecurityGroups []string `json:"SecurityGroups,omitempty"`
-
-	// SpotPrice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-spotprice
-	SpotPrice string `json:"SpotPrice,omitempty"`
-
-	// UserData AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-userdata
-	UserData string `json:"UserData,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingLaunchConfiguration) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::LaunchConfiguration"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSAutoScalingLaunchConfiguration) MarshalJSON() ([]byte, error) {
-	type Properties AWSAutoScalingLaunchConfiguration
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSAutoScalingLaunchConfiguration) UnmarshalJSON(b []byte) error {
-	type Properties AWSAutoScalingLaunchConfiguration
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSAutoScalingLaunchConfiguration(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSAutoScalingLaunchConfigurationResources retrieves all AWSAutoScalingLaunchConfiguration items from an AWS CloudFormation template
-func (t *Template) GetAllAWSAutoScalingLaunchConfigurationResources() map[string]AWSAutoScalingLaunchConfiguration {
-	results := map[string]AWSAutoScalingLaunchConfiguration{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSAutoScalingLaunchConfiguration:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::AutoScaling::LaunchConfiguration" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSAutoScalingLaunchConfiguration
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSAutoScalingLaunchConfigurationWithName retrieves all AWSAutoScalingLaunchConfiguration items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSAutoScalingLaunchConfigurationWithName(name string) (AWSAutoScalingLaunchConfiguration, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSAutoScalingLaunchConfiguration:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::AutoScaling::LaunchConfiguration" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSAutoScalingLaunchConfiguration
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSAutoScalingLaunchConfiguration{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-launchconfiguration_blockdevice.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-launchconfiguration_blockdevice.go
deleted file mode 100644
index c2cea84f37..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-launchconfiguration_blockdevice.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSAutoScalingLaunchConfiguration_BlockDevice AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration.BlockDevice)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html
-type AWSAutoScalingLaunchConfiguration_BlockDevice struct {
-
-	// DeleteOnTermination AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-deleteonterm
-	DeleteOnTermination bool `json:"DeleteOnTermination,omitempty"`
-
-	// Encrypted AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-encrypted
-	Encrypted bool `json:"Encrypted,omitempty"`
-
-	// Iops AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-iops
-	Iops int `json:"Iops,omitempty"`
-
-	// SnapshotId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-snapshotid
-	SnapshotId string `json:"SnapshotId,omitempty"`
-
-	// VolumeSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-volumesize
-	VolumeSize int `json:"VolumeSize,omitempty"`
-
-	// VolumeType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-volumetype
-	VolumeType string `json:"VolumeType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingLaunchConfiguration_BlockDevice) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::LaunchConfiguration.BlockDevice"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-launchconfiguration_blockdevicemapping.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-launchconfiguration_blockdevicemapping.go
deleted file mode 100644
index 9f987307b0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-launchconfiguration_blockdevicemapping.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSAutoScalingLaunchConfiguration_BlockDeviceMapping AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-mapping.html
-type AWSAutoScalingLaunchConfiguration_BlockDeviceMapping struct {
-
-	// DeviceName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-mapping.html#cfn-as-launchconfig-blockdev-mapping-devicename
-	DeviceName string `json:"DeviceName,omitempty"`
-
-	// Ebs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-mapping.html#cfn-as-launchconfig-blockdev-mapping-ebs
-	Ebs *AWSAutoScalingLaunchConfiguration_BlockDevice `json:"Ebs,omitempty"`
-
-	// NoDevice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-mapping.html#cfn-as-launchconfig-blockdev-mapping-nodevice
-	NoDevice bool `json:"NoDevice,omitempty"`
-
-	// VirtualName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-mapping.html#cfn-as-launchconfig-blockdev-mapping-virtualname
-	VirtualName string `json:"VirtualName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingLaunchConfiguration_BlockDeviceMapping) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-lifecyclehook.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-lifecyclehook.go
deleted file mode 100644
index 9cb7bbead2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-lifecyclehook.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSAutoScalingLifecycleHook AWS CloudFormation Resource (AWS::AutoScaling::LifecycleHook)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-lifecyclehook.html
-type AWSAutoScalingLifecycleHook struct {
-
-	// AutoScalingGroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-lifecyclehook.html#cfn-as-lifecyclehook-autoscalinggroupname
-	AutoScalingGroupName string `json:"AutoScalingGroupName,omitempty"`
-
-	// DefaultResult AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-lifecyclehook.html#cfn-as-lifecyclehook-defaultresult
-	DefaultResult string `json:"DefaultResult,omitempty"`
-
-	// HeartbeatTimeout AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-lifecyclehook.html#cfn-as-lifecyclehook-heartbeattimeout
-	HeartbeatTimeout int `json:"HeartbeatTimeout,omitempty"`
-
-	// LifecycleHookName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-lifecyclehook.html#cfn-autoscaling-lifecyclehook-lifecyclehookname
-	LifecycleHookName string `json:"LifecycleHookName,omitempty"`
-
-	// LifecycleTransition AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-lifecyclehook.html#cfn-as-lifecyclehook-lifecycletransition
-	LifecycleTransition string `json:"LifecycleTransition,omitempty"`
-
-	// NotificationMetadata AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-lifecyclehook.html#cfn-as-lifecyclehook-notificationmetadata
-	NotificationMetadata string `json:"NotificationMetadata,omitempty"`
-
-	// NotificationTargetARN AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-lifecyclehook.html#cfn-as-lifecyclehook-notificationtargetarn
-	NotificationTargetARN string `json:"NotificationTargetARN,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-lifecyclehook.html#cfn-as-lifecyclehook-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingLifecycleHook) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::LifecycleHook"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSAutoScalingLifecycleHook) MarshalJSON() ([]byte, error) {
-	type Properties AWSAutoScalingLifecycleHook
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSAutoScalingLifecycleHook) UnmarshalJSON(b []byte) error {
-	type Properties AWSAutoScalingLifecycleHook
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSAutoScalingLifecycleHook(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSAutoScalingLifecycleHookResources retrieves all AWSAutoScalingLifecycleHook items from an AWS CloudFormation template
-func (t *Template) GetAllAWSAutoScalingLifecycleHookResources() map[string]AWSAutoScalingLifecycleHook {
-	results := map[string]AWSAutoScalingLifecycleHook{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSAutoScalingLifecycleHook:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::AutoScaling::LifecycleHook" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSAutoScalingLifecycleHook
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSAutoScalingLifecycleHookWithName retrieves all AWSAutoScalingLifecycleHook items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSAutoScalingLifecycleHookWithName(name string) (AWSAutoScalingLifecycleHook, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSAutoScalingLifecycleHook:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::AutoScaling::LifecycleHook" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSAutoScalingLifecycleHook
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSAutoScalingLifecycleHook{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy.go
deleted file mode 100644
index 5c06a29825..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSAutoScalingScalingPolicy AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html
-type AWSAutoScalingScalingPolicy struct {
-
-	// AdjustmentType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-adjustmenttype
-	AdjustmentType string `json:"AdjustmentType,omitempty"`
-
-	// AutoScalingGroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-autoscalinggroupname
-	AutoScalingGroupName string `json:"AutoScalingGroupName,omitempty"`
-
-	// Cooldown AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-cooldown
-	Cooldown string `json:"Cooldown,omitempty"`
-
-	// EstimatedInstanceWarmup AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-estimatedinstancewarmup
-	EstimatedInstanceWarmup int `json:"EstimatedInstanceWarmup,omitempty"`
-
-	// MetricAggregationType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-metricaggregationtype
-	MetricAggregationType string `json:"MetricAggregationType,omitempty"`
-
-	// MinAdjustmentMagnitude AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-minadjustmentmagnitude
-	MinAdjustmentMagnitude int `json:"MinAdjustmentMagnitude,omitempty"`
-
-	// PolicyType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-policytype
-	PolicyType string `json:"PolicyType,omitempty"`
-
-	// ScalingAdjustment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-scalingadjustment
-	ScalingAdjustment int `json:"ScalingAdjustment,omitempty"`
-
-	// StepAdjustments AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-stepadjustments
-	StepAdjustments []AWSAutoScalingScalingPolicy_StepAdjustment `json:"StepAdjustments,omitempty"`
-
-	// TargetTrackingConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-autoscaling-scalingpolicy-targettrackingconfiguration
-	TargetTrackingConfiguration *AWSAutoScalingScalingPolicy_TargetTrackingConfiguration `json:"TargetTrackingConfiguration,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingScalingPolicy) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::ScalingPolicy"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSAutoScalingScalingPolicy) MarshalJSON() ([]byte, error) {
-	type Properties AWSAutoScalingScalingPolicy
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSAutoScalingScalingPolicy) UnmarshalJSON(b []byte) error {
-	type Properties AWSAutoScalingScalingPolicy
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSAutoScalingScalingPolicy(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSAutoScalingScalingPolicyResources retrieves all AWSAutoScalingScalingPolicy items from an AWS CloudFormation template
-func (t *Template) GetAllAWSAutoScalingScalingPolicyResources() map[string]AWSAutoScalingScalingPolicy {
-	results := map[string]AWSAutoScalingScalingPolicy{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSAutoScalingScalingPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::AutoScaling::ScalingPolicy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSAutoScalingScalingPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSAutoScalingScalingPolicyWithName retrieves all AWSAutoScalingScalingPolicy items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSAutoScalingScalingPolicyWithName(name string) (AWSAutoScalingScalingPolicy, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSAutoScalingScalingPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::AutoScaling::ScalingPolicy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSAutoScalingScalingPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSAutoScalingScalingPolicy{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_customizedmetricspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
deleted file mode 100644
index 7bc0e3bafd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSAutoScalingScalingPolicy_CustomizedMetricSpecification AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html
-type AWSAutoScalingScalingPolicy_CustomizedMetricSpecification struct {
-
-	// Dimensions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-dimensions
-	Dimensions []AWSAutoScalingScalingPolicy_MetricDimension `json:"Dimensions,omitempty"`
-
-	// MetricName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-metricname
-	MetricName string `json:"MetricName,omitempty"`
-
-	// Namespace AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-namespace
-	Namespace string `json:"Namespace,omitempty"`
-
-	// Statistic AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-statistic
-	Statistic string `json:"Statistic,omitempty"`
-
-	// Unit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-unit
-	Unit string `json:"Unit,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingScalingPolicy_CustomizedMetricSpecification) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_metricdimension.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_metricdimension.go
deleted file mode 100644
index 28d407a786..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_metricdimension.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSAutoScalingScalingPolicy_MetricDimension AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.MetricDimension)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-metricdimension.html
-type AWSAutoScalingScalingPolicy_MetricDimension struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-metricdimension.html#cfn-autoscaling-scalingpolicy-metricdimension-name
-	Name string `json:"Name,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-metricdimension.html#cfn-autoscaling-scalingpolicy-metricdimension-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingScalingPolicy_MetricDimension) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::ScalingPolicy.MetricDimension"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go
deleted file mode 100644
index 1d9c0fd3fd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSAutoScalingScalingPolicy_PredefinedMetricSpecification AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predefinedmetricspecification.html
-type AWSAutoScalingScalingPolicy_PredefinedMetricSpecification struct {
-
-	// PredefinedMetricType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predefinedmetricspecification.html#cfn-autoscaling-scalingpolicy-predefinedmetricspecification-predefinedmetrictype
-	PredefinedMetricType string `json:"PredefinedMetricType,omitempty"`
-
-	// ResourceLabel AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predefinedmetricspecification.html#cfn-autoscaling-scalingpolicy-predefinedmetricspecification-resourcelabel
-	ResourceLabel string `json:"ResourceLabel,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingScalingPolicy_PredefinedMetricSpecification) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_stepadjustment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_stepadjustment.go
deleted file mode 100644
index 4558547993..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_stepadjustment.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSAutoScalingScalingPolicy_StepAdjustment AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.StepAdjustment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-stepadjustments.html
-type AWSAutoScalingScalingPolicy_StepAdjustment struct {
-
-	// MetricIntervalLowerBound AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-stepadjustments.html#cfn-autoscaling-scalingpolicy-stepadjustment-metricintervallowerbound
-	MetricIntervalLowerBound float64 `json:"MetricIntervalLowerBound,omitempty"`
-
-	// MetricIntervalUpperBound AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-stepadjustments.html#cfn-autoscaling-scalingpolicy-stepadjustment-metricintervalupperbound
-	MetricIntervalUpperBound float64 `json:"MetricIntervalUpperBound,omitempty"`
-
-	// ScalingAdjustment AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-stepadjustments.html#cfn-autoscaling-scalingpolicy-stepadjustment-scalingadjustment
-	ScalingAdjustment int `json:"ScalingAdjustment,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingScalingPolicy_StepAdjustment) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::ScalingPolicy.StepAdjustment"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go
deleted file mode 100644
index 37431b739d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSAutoScalingScalingPolicy_TargetTrackingConfiguration AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingconfiguration.html
-type AWSAutoScalingScalingPolicy_TargetTrackingConfiguration struct {
-
-	// CustomizedMetricSpecification AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingconfiguration.html#cfn-autoscaling-scalingpolicy-targettrackingconfiguration-customizedmetricspecification
-	CustomizedMetricSpecification *AWSAutoScalingScalingPolicy_CustomizedMetricSpecification `json:"CustomizedMetricSpecification,omitempty"`
-
-	// DisableScaleIn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingconfiguration.html#cfn-autoscaling-scalingpolicy-targettrackingconfiguration-disablescalein
-	DisableScaleIn bool `json:"DisableScaleIn,omitempty"`
-
-	// PredefinedMetricSpecification AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingconfiguration.html#cfn-autoscaling-scalingpolicy-targettrackingconfiguration-predefinedmetricspecification
-	PredefinedMetricSpecification *AWSAutoScalingScalingPolicy_PredefinedMetricSpecification `json:"PredefinedMetricSpecification,omitempty"`
-
-	// TargetValue AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingconfiguration.html#cfn-autoscaling-scalingpolicy-targettrackingconfiguration-targetvalue
-	TargetValue float64 `json:"TargetValue,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingScalingPolicy_TargetTrackingConfiguration) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scheduledaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scheduledaction.go
deleted file mode 100644
index caac146c93..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-autoscaling-scheduledaction.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSAutoScalingScheduledAction AWS CloudFormation Resource (AWS::AutoScaling::ScheduledAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html
-type AWSAutoScalingScheduledAction struct {
-
-	// AutoScalingGroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-asgname
-	AutoScalingGroupName string `json:"AutoScalingGroupName,omitempty"`
-
-	// DesiredCapacity AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-desiredcapacity
-	DesiredCapacity int `json:"DesiredCapacity,omitempty"`
-
-	// EndTime AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-endtime
-	EndTime string `json:"EndTime,omitempty"`
-
-	// MaxSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-maxsize
-	MaxSize int `json:"MaxSize,omitempty"`
-
-	// MinSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-minsize
-	MinSize int `json:"MinSize,omitempty"`
-
-	// Recurrence AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-recurrence
-	Recurrence string `json:"Recurrence,omitempty"`
-
-	// StartTime AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-starttime
-	StartTime string `json:"StartTime,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSAutoScalingScheduledAction) AWSCloudFormationType() string {
-	return "AWS::AutoScaling::ScheduledAction"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSAutoScalingScheduledAction) MarshalJSON() ([]byte, error) {
-	type Properties AWSAutoScalingScheduledAction
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSAutoScalingScheduledAction) UnmarshalJSON(b []byte) error {
-	type Properties AWSAutoScalingScheduledAction
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSAutoScalingScheduledAction(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSAutoScalingScheduledActionResources retrieves all AWSAutoScalingScheduledAction items from an AWS CloudFormation template
-func (t *Template) GetAllAWSAutoScalingScheduledActionResources() map[string]AWSAutoScalingScheduledAction {
-	results := map[string]AWSAutoScalingScheduledAction{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSAutoScalingScheduledAction:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::AutoScaling::ScheduledAction" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSAutoScalingScheduledAction
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSAutoScalingScheduledActionWithName retrieves all AWSAutoScalingScheduledAction items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSAutoScalingScheduledActionWithName(name string) (AWSAutoScalingScheduledAction, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSAutoScalingScheduledAction:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::AutoScaling::ScheduledAction" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSAutoScalingScheduledAction
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSAutoScalingScheduledAction{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-computeenvironment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-computeenvironment.go
deleted file mode 100644
index ab722997bd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-computeenvironment.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSBatchComputeEnvironment AWS CloudFormation Resource (AWS::Batch::ComputeEnvironment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html
-type AWSBatchComputeEnvironment struct {
-
-	// ComputeEnvironmentName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-computeenvironmentname
-	ComputeEnvironmentName string `json:"ComputeEnvironmentName,omitempty"`
-
-	// ComputeResources AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-computeresources
-	ComputeResources *AWSBatchComputeEnvironment_ComputeResources `json:"ComputeResources,omitempty"`
-
-	// ServiceRole AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-servicerole
-	ServiceRole string `json:"ServiceRole,omitempty"`
-
-	// State AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-state
-	State string `json:"State,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSBatchComputeEnvironment) AWSCloudFormationType() string {
-	return "AWS::Batch::ComputeEnvironment"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSBatchComputeEnvironment) MarshalJSON() ([]byte, error) {
-	type Properties AWSBatchComputeEnvironment
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSBatchComputeEnvironment) UnmarshalJSON(b []byte) error {
-	type Properties AWSBatchComputeEnvironment
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSBatchComputeEnvironment(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSBatchComputeEnvironmentResources retrieves all AWSBatchComputeEnvironment items from an AWS CloudFormation template
-func (t *Template) GetAllAWSBatchComputeEnvironmentResources() map[string]AWSBatchComputeEnvironment {
-	results := map[string]AWSBatchComputeEnvironment{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSBatchComputeEnvironment:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Batch::ComputeEnvironment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSBatchComputeEnvironment
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSBatchComputeEnvironmentWithName retrieves all AWSBatchComputeEnvironment items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSBatchComputeEnvironmentWithName(name string) (AWSBatchComputeEnvironment, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSBatchComputeEnvironment:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Batch::ComputeEnvironment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSBatchComputeEnvironment
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSBatchComputeEnvironment{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-computeenvironment_computeresources.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-computeenvironment_computeresources.go
deleted file mode 100644
index a8da06bce9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-computeenvironment_computeresources.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package cloudformation
-
-// AWSBatchComputeEnvironment_ComputeResources AWS CloudFormation Resource (AWS::Batch::ComputeEnvironment.ComputeResources)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html
-type AWSBatchComputeEnvironment_ComputeResources struct {
-
-	// BidPercentage AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-bidpercentage
-	BidPercentage int `json:"BidPercentage,omitempty"`
-
-	// DesiredvCpus AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-desiredvcpus
-	DesiredvCpus int `json:"DesiredvCpus,omitempty"`
-
-	// Ec2KeyPair AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-ec2keypair
-	Ec2KeyPair string `json:"Ec2KeyPair,omitempty"`
-
-	// ImageId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-imageid
-	ImageId string `json:"ImageId,omitempty"`
-
-	// InstanceRole AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-instancerole
-	InstanceRole string `json:"InstanceRole,omitempty"`
-
-	// InstanceTypes AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-instancetypes
-	InstanceTypes []string `json:"InstanceTypes,omitempty"`
-
-	// MaxvCpus AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-maxvcpus
-	MaxvCpus int `json:"MaxvCpus,omitempty"`
-
-	// MinvCpus AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-minvcpus
-	MinvCpus int `json:"MinvCpus,omitempty"`
-
-	// SecurityGroupIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-securitygroupids
-	SecurityGroupIds []string `json:"SecurityGroupIds,omitempty"`
-
-	// SpotIamFleetRole AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-spotiamfleetrole
-	SpotIamFleetRole string `json:"SpotIamFleetRole,omitempty"`
-
-	// Subnets AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-subnets
-	Subnets []string `json:"Subnets,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-tags
-	Tags interface{} `json:"Tags,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSBatchComputeEnvironment_ComputeResources) AWSCloudFormationType() string {
-	return "AWS::Batch::ComputeEnvironment.ComputeResources"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition.go
deleted file mode 100644
index 615099032a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSBatchJobDefinition AWS CloudFormation Resource (AWS::Batch::JobDefinition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html
-type AWSBatchJobDefinition struct {
-
-	// ContainerProperties AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-containerproperties
-	ContainerProperties *AWSBatchJobDefinition_ContainerProperties `json:"ContainerProperties,omitempty"`
-
-	// JobDefinitionName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-jobdefinitionname
-	JobDefinitionName string `json:"JobDefinitionName,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-parameters
-	Parameters interface{} `json:"Parameters,omitempty"`
-
-	// RetryStrategy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-retrystrategy
-	RetryStrategy *AWSBatchJobDefinition_RetryStrategy `json:"RetryStrategy,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSBatchJobDefinition) AWSCloudFormationType() string {
-	return "AWS::Batch::JobDefinition"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSBatchJobDefinition) MarshalJSON() ([]byte, error) {
-	type Properties AWSBatchJobDefinition
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSBatchJobDefinition) UnmarshalJSON(b []byte) error {
-	type Properties AWSBatchJobDefinition
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSBatchJobDefinition(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSBatchJobDefinitionResources retrieves all AWSBatchJobDefinition items from an AWS CloudFormation template
-func (t *Template) GetAllAWSBatchJobDefinitionResources() map[string]AWSBatchJobDefinition {
-	results := map[string]AWSBatchJobDefinition{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSBatchJobDefinition:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Batch::JobDefinition" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSBatchJobDefinition
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSBatchJobDefinitionWithName retrieves all AWSBatchJobDefinition items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSBatchJobDefinitionWithName(name string) (AWSBatchJobDefinition, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSBatchJobDefinition:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Batch::JobDefinition" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSBatchJobDefinition
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSBatchJobDefinition{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_containerproperties.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_containerproperties.go
deleted file mode 100644
index 5726595025..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_containerproperties.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package cloudformation
-
-// AWSBatchJobDefinition_ContainerProperties AWS CloudFormation Resource (AWS::Batch::JobDefinition.ContainerProperties)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html
-type AWSBatchJobDefinition_ContainerProperties struct {
-
-	// Command AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-command
-	Command []string `json:"Command,omitempty"`
-
-	// Environment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-environment
-	Environment []AWSBatchJobDefinition_Environment `json:"Environment,omitempty"`
-
-	// Image AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-image
-	Image string `json:"Image,omitempty"`
-
-	// JobRoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-jobrolearn
-	JobRoleArn string `json:"JobRoleArn,omitempty"`
-
-	// Memory AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-memory
-	Memory int `json:"Memory,omitempty"`
-
-	// MountPoints AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-mountpoints
-	MountPoints []AWSBatchJobDefinition_MountPoints `json:"MountPoints,omitempty"`
-
-	// Privileged AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-privileged
-	Privileged bool `json:"Privileged,omitempty"`
-
-	// ReadonlyRootFilesystem AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-readonlyrootfilesystem
-	ReadonlyRootFilesystem bool `json:"ReadonlyRootFilesystem,omitempty"`
-
-	// Ulimits AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-ulimits
-	Ulimits []AWSBatchJobDefinition_Ulimit `json:"Ulimits,omitempty"`
-
-	// User AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-user
-	User string `json:"User,omitempty"`
-
-	// Vcpus AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-vcpus
-	Vcpus int `json:"Vcpus,omitempty"`
-
-	// Volumes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-volumes
-	Volumes []AWSBatchJobDefinition_Volumes `json:"Volumes,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSBatchJobDefinition_ContainerProperties) AWSCloudFormationType() string {
-	return "AWS::Batch::JobDefinition.ContainerProperties"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_environment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_environment.go
deleted file mode 100644
index 62561546c5..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_environment.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSBatchJobDefinition_Environment AWS CloudFormation Resource (AWS::Batch::JobDefinition.Environment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-environment.html
-type AWSBatchJobDefinition_Environment struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-environment.html#cfn-batch-jobdefinition-environment-name
-	Name string `json:"Name,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-environment.html#cfn-batch-jobdefinition-environment-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSBatchJobDefinition_Environment) AWSCloudFormationType() string {
-	return "AWS::Batch::JobDefinition.Environment"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_mountpoints.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_mountpoints.go
deleted file mode 100644
index 957b6359b8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_mountpoints.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSBatchJobDefinition_MountPoints AWS CloudFormation Resource (AWS::Batch::JobDefinition.MountPoints)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-mountpoints.html
-type AWSBatchJobDefinition_MountPoints struct {
-
-	// ContainerPath AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-mountpoints.html#cfn-batch-jobdefinition-mountpoints-containerpath
-	ContainerPath string `json:"ContainerPath,omitempty"`
-
-	// ReadOnly AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-mountpoints.html#cfn-batch-jobdefinition-mountpoints-readonly
-	ReadOnly bool `json:"ReadOnly,omitempty"`
-
-	// SourceVolume AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-mountpoints.html#cfn-batch-jobdefinition-mountpoints-sourcevolume
-	SourceVolume string `json:"SourceVolume,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSBatchJobDefinition_MountPoints) AWSCloudFormationType() string {
-	return "AWS::Batch::JobDefinition.MountPoints"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_retrystrategy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_retrystrategy.go
deleted file mode 100644
index 42aa890319..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_retrystrategy.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSBatchJobDefinition_RetryStrategy AWS CloudFormation Resource (AWS::Batch::JobDefinition.RetryStrategy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-retrystrategy.html
-type AWSBatchJobDefinition_RetryStrategy struct {
-
-	// Attempts AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-retrystrategy.html#cfn-batch-jobdefinition-retrystrategy-attempts
-	Attempts int `json:"Attempts,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSBatchJobDefinition_RetryStrategy) AWSCloudFormationType() string {
-	return "AWS::Batch::JobDefinition.RetryStrategy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_ulimit.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_ulimit.go
deleted file mode 100644
index 9497cdeaf6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_ulimit.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSBatchJobDefinition_Ulimit AWS CloudFormation Resource (AWS::Batch::JobDefinition.Ulimit)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-ulimit.html
-type AWSBatchJobDefinition_Ulimit struct {
-
-	// HardLimit AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-ulimit.html#cfn-batch-jobdefinition-ulimit-hardlimit
-	HardLimit int `json:"HardLimit,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-ulimit.html#cfn-batch-jobdefinition-ulimit-name
-	Name string `json:"Name,omitempty"`
-
-	// SoftLimit AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-ulimit.html#cfn-batch-jobdefinition-ulimit-softlimit
-	SoftLimit int `json:"SoftLimit,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSBatchJobDefinition_Ulimit) AWSCloudFormationType() string {
-	return "AWS::Batch::JobDefinition.Ulimit"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_volumes.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_volumes.go
deleted file mode 100644
index 5622031c16..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_volumes.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSBatchJobDefinition_Volumes AWS CloudFormation Resource (AWS::Batch::JobDefinition.Volumes)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-volumes.html
-type AWSBatchJobDefinition_Volumes struct {
-
-	// Host AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-volumes.html#cfn-batch-jobdefinition-volumes-host
-	Host *AWSBatchJobDefinition_VolumesHost `json:"Host,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-volumes.html#cfn-batch-jobdefinition-volumes-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSBatchJobDefinition_Volumes) AWSCloudFormationType() string {
-	return "AWS::Batch::JobDefinition.Volumes"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_volumeshost.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_volumeshost.go
deleted file mode 100644
index 43ca56124e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobdefinition_volumeshost.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSBatchJobDefinition_VolumesHost AWS CloudFormation Resource (AWS::Batch::JobDefinition.VolumesHost)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-volumeshost.html
-type AWSBatchJobDefinition_VolumesHost struct {
-
-	// SourcePath AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-volumeshost.html#cfn-batch-jobdefinition-volumeshost-sourcepath
-	SourcePath string `json:"SourcePath,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSBatchJobDefinition_VolumesHost) AWSCloudFormationType() string {
-	return "AWS::Batch::JobDefinition.VolumesHost"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobqueue.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobqueue.go
deleted file mode 100644
index 33ce578f87..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobqueue.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSBatchJobQueue AWS CloudFormation Resource (AWS::Batch::JobQueue)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html
-type AWSBatchJobQueue struct {
-
-	// ComputeEnvironmentOrder AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-computeenvironmentorder
-	ComputeEnvironmentOrder []AWSBatchJobQueue_ComputeEnvironmentOrder `json:"ComputeEnvironmentOrder,omitempty"`
-
-	// JobQueueName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-jobqueuename
-	JobQueueName string `json:"JobQueueName,omitempty"`
-
-	// Priority AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-priority
-	Priority int `json:"Priority,omitempty"`
-
-	// State AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-state
-	State string `json:"State,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSBatchJobQueue) AWSCloudFormationType() string {
-	return "AWS::Batch::JobQueue"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSBatchJobQueue) MarshalJSON() ([]byte, error) {
-	type Properties AWSBatchJobQueue
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSBatchJobQueue) UnmarshalJSON(b []byte) error {
-	type Properties AWSBatchJobQueue
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSBatchJobQueue(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSBatchJobQueueResources retrieves all AWSBatchJobQueue items from an AWS CloudFormation template
-func (t *Template) GetAllAWSBatchJobQueueResources() map[string]AWSBatchJobQueue {
-	results := map[string]AWSBatchJobQueue{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSBatchJobQueue:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Batch::JobQueue" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSBatchJobQueue
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSBatchJobQueueWithName retrieves all AWSBatchJobQueue items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSBatchJobQueueWithName(name string) (AWSBatchJobQueue, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSBatchJobQueue:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Batch::JobQueue" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSBatchJobQueue
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSBatchJobQueue{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobqueue_computeenvironmentorder.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobqueue_computeenvironmentorder.go
deleted file mode 100644
index cbc889f906..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-batch-jobqueue_computeenvironmentorder.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSBatchJobQueue_ComputeEnvironmentOrder AWS CloudFormation Resource (AWS::Batch::JobQueue.ComputeEnvironmentOrder)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobqueue-computeenvironmentorder.html
-type AWSBatchJobQueue_ComputeEnvironmentOrder struct {
-
-	// ComputeEnvironment AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobqueue-computeenvironmentorder.html#cfn-batch-jobqueue-computeenvironmentorder-computeenvironment
-	ComputeEnvironment string `json:"ComputeEnvironment,omitempty"`
-
-	// Order AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobqueue-computeenvironmentorder.html#cfn-batch-jobqueue-computeenvironmentorder-order
-	Order int `json:"Order,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSBatchJobQueue_ComputeEnvironmentOrder) AWSCloudFormationType() string {
-	return "AWS::Batch::JobQueue.ComputeEnvironmentOrder"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-certificatemanager-certificate.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-certificatemanager-certificate.go
deleted file mode 100644
index 9e889693a0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-certificatemanager-certificate.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCertificateManagerCertificate AWS CloudFormation Resource (AWS::CertificateManager::Certificate)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html
-type AWSCertificateManagerCertificate struct {
-
-	// DomainName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html#cfn-certificatemanager-certificate-domainname
-	DomainName string `json:"DomainName,omitempty"`
-
-	// DomainValidationOptions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html#cfn-certificatemanager-certificate-domainvalidationoptions
-	DomainValidationOptions []AWSCertificateManagerCertificate_DomainValidationOption `json:"DomainValidationOptions,omitempty"`
-
-	// SubjectAlternativeNames AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html#cfn-certificatemanager-certificate-subjectalternativenames
-	SubjectAlternativeNames []string `json:"SubjectAlternativeNames,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html#cfn-certificatemanager-certificate-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCertificateManagerCertificate) AWSCloudFormationType() string {
-	return "AWS::CertificateManager::Certificate"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCertificateManagerCertificate) MarshalJSON() ([]byte, error) {
-	type Properties AWSCertificateManagerCertificate
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCertificateManagerCertificate) UnmarshalJSON(b []byte) error {
-	type Properties AWSCertificateManagerCertificate
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCertificateManagerCertificate(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCertificateManagerCertificateResources retrieves all AWSCertificateManagerCertificate items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCertificateManagerCertificateResources() map[string]AWSCertificateManagerCertificate {
-	results := map[string]AWSCertificateManagerCertificate{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCertificateManagerCertificate:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CertificateManager::Certificate" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCertificateManagerCertificate
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCertificateManagerCertificateWithName retrieves all AWSCertificateManagerCertificate items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCertificateManagerCertificateWithName(name string) (AWSCertificateManagerCertificate, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCertificateManagerCertificate:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CertificateManager::Certificate" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCertificateManagerCertificate
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCertificateManagerCertificate{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-certificatemanager-certificate_domainvalidationoption.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-certificatemanager-certificate_domainvalidationoption.go
deleted file mode 100644
index 0cdf8d6c44..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-certificatemanager-certificate_domainvalidationoption.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCertificateManagerCertificate_DomainValidationOption AWS CloudFormation Resource (AWS::CertificateManager::Certificate.DomainValidationOption)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-certificatemanager-certificate-domainvalidationoption.html
-type AWSCertificateManagerCertificate_DomainValidationOption struct {
-
-	// DomainName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-certificatemanager-certificate-domainvalidationoption.html#cfn-certificatemanager-certificate-domainvalidationoptions-domainname
-	DomainName string `json:"DomainName,omitempty"`
-
-	// ValidationDomain AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-certificatemanager-certificate-domainvalidationoption.html#cfn-certificatemanager-certificate-domainvalidationoption-validationdomain
-	ValidationDomain string `json:"ValidationDomain,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCertificateManagerCertificate_DomainValidationOption) AWSCloudFormationType() string {
-	return "AWS::CertificateManager::Certificate.DomainValidationOption"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudformation-customresource.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudformation-customresource.go
deleted file mode 100644
index deb5f33556..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudformation-customresource.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCloudFormationCustomResource AWS CloudFormation Resource (AWS::CloudFormation::CustomResource)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cfn-customresource.html
-type AWSCloudFormationCustomResource struct {
-
-	// ServiceToken AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cfn-customresource.html#cfn-customresource-servicetoken
-	ServiceToken string `json:"ServiceToken,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCloudFormationCustomResource) AWSCloudFormationType() string {
-	return "AWS::CloudFormation::CustomResource"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCloudFormationCustomResource) MarshalJSON() ([]byte, error) {
-	type Properties AWSCloudFormationCustomResource
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCloudFormationCustomResource) UnmarshalJSON(b []byte) error {
-	type Properties AWSCloudFormationCustomResource
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCloudFormationCustomResource(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCloudFormationCustomResourceResources retrieves all AWSCloudFormationCustomResource items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCloudFormationCustomResourceResources() map[string]AWSCloudFormationCustomResource {
-	results := map[string]AWSCloudFormationCustomResource{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCloudFormationCustomResource:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudFormation::CustomResource" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudFormationCustomResource
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCloudFormationCustomResourceWithName retrieves all AWSCloudFormationCustomResource items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCloudFormationCustomResourceWithName(name string) (AWSCloudFormationCustomResource, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCloudFormationCustomResource:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudFormation::CustomResource" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudFormationCustomResource
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCloudFormationCustomResource{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudformation-stack.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudformation-stack.go
deleted file mode 100644
index 866d68651b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudformation-stack.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCloudFormationStack AWS CloudFormation Resource (AWS::CloudFormation::Stack)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html
-type AWSCloudFormationStack struct {
-
-	// NotificationARNs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html#cfn-cloudformation-stack-notificationarns
-	NotificationARNs []string `json:"NotificationARNs,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html#cfn-cloudformation-stack-parameters
-	Parameters map[string]string `json:"Parameters,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html#cfn-cloudformation-stack-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// TemplateURL AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html#cfn-cloudformation-stack-templateurl
-	TemplateURL string `json:"TemplateURL,omitempty"`
-
-	// TimeoutInMinutes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html#cfn-cloudformation-stack-timeoutinminutes
-	TimeoutInMinutes int `json:"TimeoutInMinutes,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCloudFormationStack) AWSCloudFormationType() string {
-	return "AWS::CloudFormation::Stack"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCloudFormationStack) MarshalJSON() ([]byte, error) {
-	type Properties AWSCloudFormationStack
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCloudFormationStack) UnmarshalJSON(b []byte) error {
-	type Properties AWSCloudFormationStack
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCloudFormationStack(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCloudFormationStackResources retrieves all AWSCloudFormationStack items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCloudFormationStackResources() map[string]AWSCloudFormationStack {
-	results := map[string]AWSCloudFormationStack{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCloudFormationStack:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudFormation::Stack" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudFormationStack
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCloudFormationStackWithName retrieves all AWSCloudFormationStack items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCloudFormationStackWithName(name string) (AWSCloudFormationStack, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCloudFormationStack:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudFormation::Stack" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudFormationStack
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCloudFormationStack{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudformation-waitcondition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudformation-waitcondition.go
deleted file mode 100644
index ed3b56dd0b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudformation-waitcondition.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCloudFormationWaitCondition AWS CloudFormation Resource (AWS::CloudFormation::WaitCondition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waitcondition.html
-type AWSCloudFormationWaitCondition struct {
-
-	// Count AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waitcondition.html#cfn-waitcondition-count
-	Count int `json:"Count,omitempty"`
-
-	// Handle AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waitcondition.html#cfn-waitcondition-handle
-	Handle string `json:"Handle,omitempty"`
-
-	// Timeout AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waitcondition.html#cfn-waitcondition-timeout
-	Timeout string `json:"Timeout,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCloudFormationWaitCondition) AWSCloudFormationType() string {
-	return "AWS::CloudFormation::WaitCondition"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCloudFormationWaitCondition) MarshalJSON() ([]byte, error) {
-	type Properties AWSCloudFormationWaitCondition
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCloudFormationWaitCondition) UnmarshalJSON(b []byte) error {
-	type Properties AWSCloudFormationWaitCondition
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCloudFormationWaitCondition(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCloudFormationWaitConditionResources retrieves all AWSCloudFormationWaitCondition items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCloudFormationWaitConditionResources() map[string]AWSCloudFormationWaitCondition {
-	results := map[string]AWSCloudFormationWaitCondition{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCloudFormationWaitCondition:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudFormation::WaitCondition" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudFormationWaitCondition
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCloudFormationWaitConditionWithName retrieves all AWSCloudFormationWaitCondition items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCloudFormationWaitConditionWithName(name string) (AWSCloudFormationWaitCondition, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCloudFormationWaitCondition:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudFormation::WaitCondition" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudFormationWaitCondition
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCloudFormationWaitCondition{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudformation-waitconditionhandle.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudformation-waitconditionhandle.go
deleted file mode 100644
index 6766dbb918..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudformation-waitconditionhandle.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCloudFormationWaitConditionHandle AWS CloudFormation Resource (AWS::CloudFormation::WaitConditionHandle)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waitconditionhandle.html
-type AWSCloudFormationWaitConditionHandle struct {
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCloudFormationWaitConditionHandle) AWSCloudFormationType() string {
-	return "AWS::CloudFormation::WaitConditionHandle"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCloudFormationWaitConditionHandle) MarshalJSON() ([]byte, error) {
-	type Properties AWSCloudFormationWaitConditionHandle
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCloudFormationWaitConditionHandle) UnmarshalJSON(b []byte) error {
-	type Properties AWSCloudFormationWaitConditionHandle
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCloudFormationWaitConditionHandle(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCloudFormationWaitConditionHandleResources retrieves all AWSCloudFormationWaitConditionHandle items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCloudFormationWaitConditionHandleResources() map[string]AWSCloudFormationWaitConditionHandle {
-	results := map[string]AWSCloudFormationWaitConditionHandle{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCloudFormationWaitConditionHandle:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudFormation::WaitConditionHandle" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudFormationWaitConditionHandle
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCloudFormationWaitConditionHandleWithName retrieves all AWSCloudFormationWaitConditionHandle items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCloudFormationWaitConditionHandleWithName(name string) (AWSCloudFormationWaitConditionHandle, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCloudFormationWaitConditionHandle:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudFormation::WaitConditionHandle" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudFormationWaitConditionHandle
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCloudFormationWaitConditionHandle{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudtrail-trail.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudtrail-trail.go
deleted file mode 100644
index efe1b52d4f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudtrail-trail.go
+++ /dev/null
@@ -1,170 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCloudTrailTrail AWS CloudFormation Resource (AWS::CloudTrail::Trail)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html
-type AWSCloudTrailTrail struct {
-
-	// CloudWatchLogsLogGroupArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-cloudwatchlogsloggrouparn
-	CloudWatchLogsLogGroupArn string `json:"CloudWatchLogsLogGroupArn,omitempty"`
-
-	// CloudWatchLogsRoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-cloudwatchlogsrolearn
-	CloudWatchLogsRoleArn string `json:"CloudWatchLogsRoleArn,omitempty"`
-
-	// EnableLogFileValidation AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-enablelogfilevalidation
-	EnableLogFileValidation bool `json:"EnableLogFileValidation,omitempty"`
-
-	// EventSelectors AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-eventselectors
-	EventSelectors []AWSCloudTrailTrail_EventSelector `json:"EventSelectors,omitempty"`
-
-	// IncludeGlobalServiceEvents AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-includeglobalserviceevents
-	IncludeGlobalServiceEvents bool `json:"IncludeGlobalServiceEvents,omitempty"`
-
-	// IsLogging AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-islogging
-	IsLogging bool `json:"IsLogging,omitempty"`
-
-	// IsMultiRegionTrail AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-ismultiregiontrail
-	IsMultiRegionTrail bool `json:"IsMultiRegionTrail,omitempty"`
-
-	// KMSKeyId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-kmskeyid
-	KMSKeyId string `json:"KMSKeyId,omitempty"`
-
-	// S3BucketName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-s3bucketname
-	S3BucketName string `json:"S3BucketName,omitempty"`
-
-	// S3KeyPrefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-s3keyprefix
-	S3KeyPrefix string `json:"S3KeyPrefix,omitempty"`
-
-	// SnsTopicName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-snstopicname
-	SnsTopicName string `json:"SnsTopicName,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// TrailName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-trailname
-	TrailName string `json:"TrailName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCloudTrailTrail) AWSCloudFormationType() string {
-	return "AWS::CloudTrail::Trail"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCloudTrailTrail) MarshalJSON() ([]byte, error) {
-	type Properties AWSCloudTrailTrail
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCloudTrailTrail) UnmarshalJSON(b []byte) error {
-	type Properties AWSCloudTrailTrail
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCloudTrailTrail(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCloudTrailTrailResources retrieves all AWSCloudTrailTrail items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCloudTrailTrailResources() map[string]AWSCloudTrailTrail {
-	results := map[string]AWSCloudTrailTrail{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCloudTrailTrail:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudTrail::Trail" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudTrailTrail
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCloudTrailTrailWithName retrieves all AWSCloudTrailTrail items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCloudTrailTrailWithName(name string) (AWSCloudTrailTrail, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCloudTrailTrail:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudTrail::Trail" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudTrailTrail
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCloudTrailTrail{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudtrail-trail_dataresource.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudtrail-trail_dataresource.go
deleted file mode 100644
index bfbe4b369c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudtrail-trail_dataresource.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCloudTrailTrail_DataResource AWS CloudFormation Resource (AWS::CloudTrail::Trail.DataResource)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-dataresource.html
-type AWSCloudTrailTrail_DataResource struct {
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-dataresource.html#cfn-cloudtrail-trail-dataresource-type
-	Type string `json:"Type,omitempty"`
-
-	// Values AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-dataresource.html#cfn-cloudtrail-trail-dataresource-values
-	Values []string `json:"Values,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCloudTrailTrail_DataResource) AWSCloudFormationType() string {
-	return "AWS::CloudTrail::Trail.DataResource"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudtrail-trail_eventselector.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudtrail-trail_eventselector.go
deleted file mode 100644
index cdc110e4a9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudtrail-trail_eventselector.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCloudTrailTrail_EventSelector AWS CloudFormation Resource (AWS::CloudTrail::Trail.EventSelector)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-eventselector.html
-type AWSCloudTrailTrail_EventSelector struct {
-
-	// DataResources AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-eventselector.html#cfn-cloudtrail-trail-eventselector-dataresources
-	DataResources []AWSCloudTrailTrail_DataResource `json:"DataResources,omitempty"`
-
-	// IncludeManagementEvents AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-eventselector.html#cfn-cloudtrail-trail-eventselector-includemanagementevents
-	IncludeManagementEvents bool `json:"IncludeManagementEvents,omitempty"`
-
-	// ReadWriteType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-eventselector.html#cfn-cloudtrail-trail-eventselector-readwritetype
-	ReadWriteType string `json:"ReadWriteType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCloudTrailTrail_EventSelector) AWSCloudFormationType() string {
-	return "AWS::CloudTrail::Trail.EventSelector"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudwatch-alarm.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudwatch-alarm.go
deleted file mode 100644
index 76d90fef87..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudwatch-alarm.go
+++ /dev/null
@@ -1,195 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCloudWatchAlarm AWS CloudFormation Resource (AWS::CloudWatch::Alarm)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html
-type AWSCloudWatchAlarm struct {
-
-	// ActionsEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-actionsenabled
-	ActionsEnabled bool `json:"ActionsEnabled,omitempty"`
-
-	// AlarmActions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-alarmactions
-	AlarmActions []string `json:"AlarmActions,omitempty"`
-
-	// AlarmDescription AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-alarmdescription
-	AlarmDescription string `json:"AlarmDescription,omitempty"`
-
-	// AlarmName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-alarmname
-	AlarmName string `json:"AlarmName,omitempty"`
-
-	// ComparisonOperator AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-comparisonoperator
-	ComparisonOperator string `json:"ComparisonOperator,omitempty"`
-
-	// Dimensions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-dimension
-	Dimensions []AWSCloudWatchAlarm_Dimension `json:"Dimensions,omitempty"`
-
-	// EvaluateLowSampleCountPercentile AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-evaluatelowsamplecountpercentile
-	EvaluateLowSampleCountPercentile string `json:"EvaluateLowSampleCountPercentile,omitempty"`
-
-	// EvaluationPeriods AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-evaluationperiods
-	EvaluationPeriods int `json:"EvaluationPeriods,omitempty"`
-
-	// ExtendedStatistic AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-extendedstatistic
-	ExtendedStatistic string `json:"ExtendedStatistic,omitempty"`
-
-	// InsufficientDataActions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-insufficientdataactions
-	InsufficientDataActions []string `json:"InsufficientDataActions,omitempty"`
-
-	// MetricName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-metricname
-	MetricName string `json:"MetricName,omitempty"`
-
-	// Namespace AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-namespace
-	Namespace string `json:"Namespace,omitempty"`
-
-	// OKActions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-okactions
-	OKActions []string `json:"OKActions,omitempty"`
-
-	// Period AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-period
-	Period int `json:"Period,omitempty"`
-
-	// Statistic AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-statistic
-	Statistic string `json:"Statistic,omitempty"`
-
-	// Threshold AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-threshold
-	Threshold float64 `json:"Threshold,omitempty"`
-
-	// TreatMissingData AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-treatmissingdata
-	TreatMissingData string `json:"TreatMissingData,omitempty"`
-
-	// Unit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-unit
-	Unit string `json:"Unit,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCloudWatchAlarm) AWSCloudFormationType() string {
-	return "AWS::CloudWatch::Alarm"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCloudWatchAlarm) MarshalJSON() ([]byte, error) {
-	type Properties AWSCloudWatchAlarm
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCloudWatchAlarm) UnmarshalJSON(b []byte) error {
-	type Properties AWSCloudWatchAlarm
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCloudWatchAlarm(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCloudWatchAlarmResources retrieves all AWSCloudWatchAlarm items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCloudWatchAlarmResources() map[string]AWSCloudWatchAlarm {
-	results := map[string]AWSCloudWatchAlarm{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCloudWatchAlarm:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudWatch::Alarm" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudWatchAlarm
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCloudWatchAlarmWithName retrieves all AWSCloudWatchAlarm items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCloudWatchAlarmWithName(name string) (AWSCloudWatchAlarm, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCloudWatchAlarm:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudWatch::Alarm" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudWatchAlarm
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCloudWatchAlarm{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudwatch-alarm_dimension.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudwatch-alarm_dimension.go
deleted file mode 100644
index c0ec2ca484..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudwatch-alarm_dimension.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCloudWatchAlarm_Dimension AWS CloudFormation Resource (AWS::CloudWatch::Alarm.Dimension)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-dimension.html
-type AWSCloudWatchAlarm_Dimension struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-dimension.html#cfn-cloudwatch-alarm-dimension-name
-	Name string `json:"Name,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-dimension.html#cfn-cloudwatch-alarm-dimension-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCloudWatchAlarm_Dimension) AWSCloudFormationType() string {
-	return "AWS::CloudWatch::Alarm.Dimension"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudwatch-dashboard.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudwatch-dashboard.go
deleted file mode 100644
index 7133edeb4f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cloudwatch-dashboard.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCloudWatchDashboard AWS CloudFormation Resource (AWS::CloudWatch::Dashboard)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-dashboard.html
-type AWSCloudWatchDashboard struct {
-
-	// DashboardBody AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-dashboard.html#cfn-cloudwatch-dashboard-dashboardbody
-	DashboardBody string `json:"DashboardBody,omitempty"`
-
-	// DashboardName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-dashboard.html#cfn-cloudwatch-dashboard-dashboardname
-	DashboardName string `json:"DashboardName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCloudWatchDashboard) AWSCloudFormationType() string {
-	return "AWS::CloudWatch::Dashboard"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCloudWatchDashboard) MarshalJSON() ([]byte, error) {
-	type Properties AWSCloudWatchDashboard
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCloudWatchDashboard) UnmarshalJSON(b []byte) error {
-	type Properties AWSCloudWatchDashboard
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCloudWatchDashboard(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCloudWatchDashboardResources retrieves all AWSCloudWatchDashboard items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCloudWatchDashboardResources() map[string]AWSCloudWatchDashboard {
-	results := map[string]AWSCloudWatchDashboard{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCloudWatchDashboard:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudWatch::Dashboard" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudWatchDashboard
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCloudWatchDashboardWithName retrieves all AWSCloudWatchDashboard items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCloudWatchDashboardWithName(name string) (AWSCloudWatchDashboard, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCloudWatchDashboard:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CloudWatch::Dashboard" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCloudWatchDashboard
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCloudWatchDashboard{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project.go
deleted file mode 100644
index 6426423d67..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCodeBuildProject AWS CloudFormation Resource (AWS::CodeBuild::Project)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html
-type AWSCodeBuildProject struct {
-
-	// Artifacts AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-artifacts
-	Artifacts *AWSCodeBuildProject_Artifacts `json:"Artifacts,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-description
-	Description string `json:"Description,omitempty"`
-
-	// EncryptionKey AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-encryptionkey
-	EncryptionKey string `json:"EncryptionKey,omitempty"`
-
-	// Environment AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-environment
-	Environment *AWSCodeBuildProject_Environment `json:"Environment,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-name
-	Name string `json:"Name,omitempty"`
-
-	// ServiceRole AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-servicerole
-	ServiceRole string `json:"ServiceRole,omitempty"`
-
-	// Source AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-source
-	Source *AWSCodeBuildProject_Source `json:"Source,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// TimeoutInMinutes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-timeoutinminutes
-	TimeoutInMinutes int `json:"TimeoutInMinutes,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeBuildProject) AWSCloudFormationType() string {
-	return "AWS::CodeBuild::Project"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCodeBuildProject) MarshalJSON() ([]byte, error) {
-	type Properties AWSCodeBuildProject
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCodeBuildProject) UnmarshalJSON(b []byte) error {
-	type Properties AWSCodeBuildProject
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCodeBuildProject(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCodeBuildProjectResources retrieves all AWSCodeBuildProject items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCodeBuildProjectResources() map[string]AWSCodeBuildProject {
-	results := map[string]AWSCodeBuildProject{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCodeBuildProject:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodeBuild::Project" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodeBuildProject
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCodeBuildProjectWithName retrieves all AWSCodeBuildProject items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCodeBuildProjectWithName(name string) (AWSCodeBuildProject, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCodeBuildProject:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodeBuild::Project" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodeBuildProject
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCodeBuildProject{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_artifacts.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_artifacts.go
deleted file mode 100644
index 87469e4f79..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_artifacts.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSCodeBuildProject_Artifacts AWS CloudFormation Resource (AWS::CodeBuild::Project.Artifacts)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html
-type AWSCodeBuildProject_Artifacts struct {
-
-	// Location AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-location
-	Location string `json:"Location,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-name
-	Name string `json:"Name,omitempty"`
-
-	// NamespaceType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-namespacetype
-	NamespaceType string `json:"NamespaceType,omitempty"`
-
-	// Packaging AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-packaging
-	Packaging string `json:"Packaging,omitempty"`
-
-	// Path AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-path
-	Path string `json:"Path,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeBuildProject_Artifacts) AWSCloudFormationType() string {
-	return "AWS::CodeBuild::Project.Artifacts"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_environment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_environment.go
deleted file mode 100644
index 08786ac31e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_environment.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSCodeBuildProject_Environment AWS CloudFormation Resource (AWS::CodeBuild::Project.Environment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html
-type AWSCodeBuildProject_Environment struct {
-
-	// ComputeType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-computetype
-	ComputeType string `json:"ComputeType,omitempty"`
-
-	// EnvironmentVariables AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-environmentvariables
-	EnvironmentVariables []AWSCodeBuildProject_EnvironmentVariable `json:"EnvironmentVariables,omitempty"`
-
-	// Image AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-image
-	Image string `json:"Image,omitempty"`
-
-	// PrivilegedMode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-privilegedmode
-	PrivilegedMode bool `json:"PrivilegedMode,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeBuildProject_Environment) AWSCloudFormationType() string {
-	return "AWS::CodeBuild::Project.Environment"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_environmentvariable.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_environmentvariable.go
deleted file mode 100644
index 2d30e32bce..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_environmentvariable.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCodeBuildProject_EnvironmentVariable AWS CloudFormation Resource (AWS::CodeBuild::Project.EnvironmentVariable)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environmentvariable.html
-type AWSCodeBuildProject_EnvironmentVariable struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environmentvariable.html#cfn-codebuild-project-environmentvariable-name
-	Name string `json:"Name,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environmentvariable.html#cfn-codebuild-project-environmentvariable-type
-	Type string `json:"Type,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environmentvariable.html#cfn-codebuild-project-environmentvariable-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeBuildProject_EnvironmentVariable) AWSCloudFormationType() string {
-	return "AWS::CodeBuild::Project.EnvironmentVariable"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_source.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_source.go
deleted file mode 100644
index 3e5fb3c301..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_source.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSCodeBuildProject_Source AWS CloudFormation Resource (AWS::CodeBuild::Project.Source)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html
-type AWSCodeBuildProject_Source struct {
-
-	// Auth AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-auth
-	Auth *AWSCodeBuildProject_SourceAuth `json:"Auth,omitempty"`
-
-	// BuildSpec AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-buildspec
-	BuildSpec string `json:"BuildSpec,omitempty"`
-
-	// Location AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-location
-	Location string `json:"Location,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeBuildProject_Source) AWSCloudFormationType() string {
-	return "AWS::CodeBuild::Project.Source"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_sourceauth.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_sourceauth.go
deleted file mode 100644
index 06aa1dd961..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codebuild-project_sourceauth.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCodeBuildProject_SourceAuth AWS CloudFormation Resource (AWS::CodeBuild::Project.SourceAuth)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-sourceauth.html
-type AWSCodeBuildProject_SourceAuth struct {
-
-	// Resource AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-sourceauth.html#cfn-codebuild-project-sourceauth-resource
-	Resource string `json:"Resource,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-sourceauth.html#cfn-codebuild-project-sourceauth-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeBuildProject_SourceAuth) AWSCloudFormationType() string {
-	return "AWS::CodeBuild::Project.SourceAuth"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codecommit-repository.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codecommit-repository.go
deleted file mode 100644
index bec9860afc..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codecommit-repository.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCodeCommitRepository AWS CloudFormation Resource (AWS::CodeCommit::Repository)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html
-type AWSCodeCommitRepository struct {
-
-	// RepositoryDescription AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription
-	RepositoryDescription string `json:"RepositoryDescription,omitempty"`
-
-	// RepositoryName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname
-	RepositoryName string `json:"RepositoryName,omitempty"`
-
-	// Triggers AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers
-	Triggers []AWSCodeCommitRepository_RepositoryTrigger `json:"Triggers,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeCommitRepository) AWSCloudFormationType() string {
-	return "AWS::CodeCommit::Repository"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCodeCommitRepository) MarshalJSON() ([]byte, error) {
-	type Properties AWSCodeCommitRepository
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCodeCommitRepository) UnmarshalJSON(b []byte) error {
-	type Properties AWSCodeCommitRepository
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCodeCommitRepository(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCodeCommitRepositoryResources retrieves all AWSCodeCommitRepository items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCodeCommitRepositoryResources() map[string]AWSCodeCommitRepository {
-	results := map[string]AWSCodeCommitRepository{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCodeCommitRepository:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodeCommit::Repository" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodeCommitRepository
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCodeCommitRepositoryWithName retrieves all AWSCodeCommitRepository items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCodeCommitRepositoryWithName(name string) (AWSCodeCommitRepository, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCodeCommitRepository:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodeCommit::Repository" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodeCommitRepository
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCodeCommitRepository{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codecommit-repository_repositorytrigger.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codecommit-repository_repositorytrigger.go
deleted file mode 100644
index 04bcbd8827..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codecommit-repository_repositorytrigger.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSCodeCommitRepository_RepositoryTrigger AWS CloudFormation Resource (AWS::CodeCommit::Repository.RepositoryTrigger)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-repositorytrigger.html
-type AWSCodeCommitRepository_RepositoryTrigger struct {
-
-	// Branches AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-repositorytrigger.html#cfn-codecommit-repository-repositorytrigger-branches
-	Branches []string `json:"Branches,omitempty"`
-
-	// CustomData AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-repositorytrigger.html#cfn-codecommit-repository-repositorytrigger-customdata
-	CustomData string `json:"CustomData,omitempty"`
-
-	// DestinationArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-repositorytrigger.html#cfn-codecommit-repository-repositorytrigger-destinationarn
-	DestinationArn string `json:"DestinationArn,omitempty"`
-
-	// Events AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-repositorytrigger.html#cfn-codecommit-repository-repositorytrigger-events
-	Events []string `json:"Events,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-repositorytrigger.html#cfn-codecommit-repository-repositorytrigger-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeCommitRepository_RepositoryTrigger) AWSCloudFormationType() string {
-	return "AWS::CodeCommit::Repository.RepositoryTrigger"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-application.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-application.go
deleted file mode 100644
index c7980df772..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-application.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCodeDeployApplication AWS CloudFormation Resource (AWS::CodeDeploy::Application)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-application.html
-type AWSCodeDeployApplication struct {
-
-	// ApplicationName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-application.html#cfn-codedeploy-application-applicationname
-	ApplicationName string `json:"ApplicationName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployApplication) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::Application"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCodeDeployApplication) MarshalJSON() ([]byte, error) {
-	type Properties AWSCodeDeployApplication
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCodeDeployApplication) UnmarshalJSON(b []byte) error {
-	type Properties AWSCodeDeployApplication
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCodeDeployApplication(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCodeDeployApplicationResources retrieves all AWSCodeDeployApplication items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCodeDeployApplicationResources() map[string]AWSCodeDeployApplication {
-	results := map[string]AWSCodeDeployApplication{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCodeDeployApplication:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodeDeploy::Application" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodeDeployApplication
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCodeDeployApplicationWithName retrieves all AWSCodeDeployApplication items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCodeDeployApplicationWithName(name string) (AWSCodeDeployApplication, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCodeDeployApplication:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodeDeploy::Application" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodeDeployApplication
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCodeDeployApplication{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentconfig.go
deleted file mode 100644
index 88204a7250..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentconfig.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCodeDeployDeploymentConfig AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentconfig.html
-type AWSCodeDeployDeploymentConfig struct {
-
-	// DeploymentConfigName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentconfig.html#cfn-codedeploy-deploymentconfig-deploymentconfigname
-	DeploymentConfigName string `json:"DeploymentConfigName,omitempty"`
-
-	// MinimumHealthyHosts AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentconfig.html#cfn-codedeploy-deploymentconfig-minimumhealthyhosts
-	MinimumHealthyHosts *AWSCodeDeployDeploymentConfig_MinimumHealthyHosts `json:"MinimumHealthyHosts,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentConfig) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentConfig"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCodeDeployDeploymentConfig) MarshalJSON() ([]byte, error) {
-	type Properties AWSCodeDeployDeploymentConfig
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCodeDeployDeploymentConfig) UnmarshalJSON(b []byte) error {
-	type Properties AWSCodeDeployDeploymentConfig
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCodeDeployDeploymentConfig(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCodeDeployDeploymentConfigResources retrieves all AWSCodeDeployDeploymentConfig items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCodeDeployDeploymentConfigResources() map[string]AWSCodeDeployDeploymentConfig {
-	results := map[string]AWSCodeDeployDeploymentConfig{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCodeDeployDeploymentConfig:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodeDeploy::DeploymentConfig" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodeDeployDeploymentConfig
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCodeDeployDeploymentConfigWithName retrieves all AWSCodeDeployDeploymentConfig items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCodeDeployDeploymentConfigWithName(name string) (AWSCodeDeployDeploymentConfig, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCodeDeployDeploymentConfig:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodeDeploy::DeploymentConfig" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodeDeployDeploymentConfig
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCodeDeployDeploymentConfig{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go
deleted file mode 100644
index 1653689d7a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentConfig_MinimumHealthyHosts AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-minimumhealthyhosts.html
-type AWSCodeDeployDeploymentConfig_MinimumHealthyHosts struct {
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-minimumhealthyhosts.html#cfn-codedeploy-deploymentconfig-minimumhealthyhosts-type
-	Type string `json:"Type,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-minimumhealthyhosts.html#cfn-codedeploy-deploymentconfig-minimumhealthyhosts-value
-	Value int `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentConfig_MinimumHealthyHosts) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup.go
deleted file mode 100644
index 3e2dbce9b1..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup.go
+++ /dev/null
@@ -1,170 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCodeDeployDeploymentGroup AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html
-type AWSCodeDeployDeploymentGroup struct {
-
-	// AlarmConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-alarmconfiguration
-	AlarmConfiguration *AWSCodeDeployDeploymentGroup_AlarmConfiguration `json:"AlarmConfiguration,omitempty"`
-
-	// ApplicationName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-applicationname
-	ApplicationName string `json:"ApplicationName,omitempty"`
-
-	// AutoRollbackConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-autorollbackconfiguration
-	AutoRollbackConfiguration *AWSCodeDeployDeploymentGroup_AutoRollbackConfiguration `json:"AutoRollbackConfiguration,omitempty"`
-
-	// AutoScalingGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-autoscalinggroups
-	AutoScalingGroups []string `json:"AutoScalingGroups,omitempty"`
-
-	// Deployment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-deployment
-	Deployment *AWSCodeDeployDeploymentGroup_Deployment `json:"Deployment,omitempty"`
-
-	// DeploymentConfigName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-deploymentconfigname
-	DeploymentConfigName string `json:"DeploymentConfigName,omitempty"`
-
-	// DeploymentGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-deploymentgroupname
-	DeploymentGroupName string `json:"DeploymentGroupName,omitempty"`
-
-	// DeploymentStyle AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-deploymentstyle
-	DeploymentStyle *AWSCodeDeployDeploymentGroup_DeploymentStyle `json:"DeploymentStyle,omitempty"`
-
-	// Ec2TagFilters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-ec2tagfilters
-	Ec2TagFilters []AWSCodeDeployDeploymentGroup_EC2TagFilter `json:"Ec2TagFilters,omitempty"`
-
-	// LoadBalancerInfo AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-loadbalancerinfo
-	LoadBalancerInfo *AWSCodeDeployDeploymentGroup_LoadBalancerInfo `json:"LoadBalancerInfo,omitempty"`
-
-	// OnPremisesInstanceTagFilters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-onpremisesinstancetagfilters
-	OnPremisesInstanceTagFilters []AWSCodeDeployDeploymentGroup_TagFilter `json:"OnPremisesInstanceTagFilters,omitempty"`
-
-	// ServiceRoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-servicerolearn
-	ServiceRoleArn string `json:"ServiceRoleArn,omitempty"`
-
-	// TriggerConfigurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-triggerconfigurations
-	TriggerConfigurations []AWSCodeDeployDeploymentGroup_TriggerConfig `json:"TriggerConfigurations,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCodeDeployDeploymentGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSCodeDeployDeploymentGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCodeDeployDeploymentGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSCodeDeployDeploymentGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCodeDeployDeploymentGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCodeDeployDeploymentGroupResources retrieves all AWSCodeDeployDeploymentGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCodeDeployDeploymentGroupResources() map[string]AWSCodeDeployDeploymentGroup {
-	results := map[string]AWSCodeDeployDeploymentGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCodeDeployDeploymentGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodeDeploy::DeploymentGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodeDeployDeploymentGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCodeDeployDeploymentGroupWithName retrieves all AWSCodeDeployDeploymentGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCodeDeployDeploymentGroupWithName(name string) (AWSCodeDeployDeploymentGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCodeDeployDeploymentGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodeDeploy::DeploymentGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodeDeployDeploymentGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCodeDeployDeploymentGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_alarm.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_alarm.go
deleted file mode 100644
index 6f8c064215..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_alarm.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_Alarm AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.Alarm)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-alarm.html
-type AWSCodeDeployDeploymentGroup_Alarm struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-alarm.html#cfn-codedeploy-deploymentgroup-alarm-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_Alarm) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.Alarm"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_alarmconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_alarmconfiguration.go
deleted file mode 100644
index 9b6d143249..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_alarmconfiguration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_AlarmConfiguration AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-alarmconfiguration.html
-type AWSCodeDeployDeploymentGroup_AlarmConfiguration struct {
-
-	// Alarms AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-alarmconfiguration.html#cfn-codedeploy-deploymentgroup-alarmconfiguration-alarms
-	Alarms []AWSCodeDeployDeploymentGroup_Alarm `json:"Alarms,omitempty"`
-
-	// Enabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-alarmconfiguration.html#cfn-codedeploy-deploymentgroup-alarmconfiguration-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// IgnorePollAlarmFailure AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-alarmconfiguration.html#cfn-codedeploy-deploymentgroup-alarmconfiguration-ignorepollalarmfailure
-	IgnorePollAlarmFailure bool `json:"IgnorePollAlarmFailure,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_AlarmConfiguration) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go
deleted file mode 100644
index c98b5400f8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_AutoRollbackConfiguration AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-autorollbackconfiguration.html
-type AWSCodeDeployDeploymentGroup_AutoRollbackConfiguration struct {
-
-	// Enabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-autorollbackconfiguration.html#cfn-codedeploy-deploymentgroup-autorollbackconfiguration-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// Events AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-autorollbackconfiguration.html#cfn-codedeploy-deploymentgroup-autorollbackconfiguration-events
-	Events []string `json:"Events,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_AutoRollbackConfiguration) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_deployment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_deployment.go
deleted file mode 100644
index b51f7488d4..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_deployment.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_Deployment AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.Deployment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment.html
-type AWSCodeDeployDeploymentGroup_Deployment struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment.html#cfn-properties-codedeploy-deploymentgroup-deployment-description
-	Description string `json:"Description,omitempty"`
-
-	// IgnoreApplicationStopFailures AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment.html#cfn-properties-codedeploy-deploymentgroup-deployment-ignoreapplicationstopfailures
-	IgnoreApplicationStopFailures bool `json:"IgnoreApplicationStopFailures,omitempty"`
-
-	// Revision AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision
-	Revision *AWSCodeDeployDeploymentGroup_RevisionLocation `json:"Revision,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_Deployment) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.Deployment"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_deploymentstyle.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_deploymentstyle.go
deleted file mode 100644
index 112f724bdc..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_deploymentstyle.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_DeploymentStyle AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.DeploymentStyle)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deploymentstyle.html
-type AWSCodeDeployDeploymentGroup_DeploymentStyle struct {
-
-	// DeploymentOption AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deploymentstyle.html#cfn-codedeploy-deploymentgroup-deploymentstyle-deploymentoption
-	DeploymentOption string `json:"DeploymentOption,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_DeploymentStyle) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.DeploymentStyle"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_ec2tagfilter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_ec2tagfilter.go
deleted file mode 100644
index 2337a79fb1..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_ec2tagfilter.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_EC2TagFilter AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.EC2TagFilter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ec2tagfilters.html
-type AWSCodeDeployDeploymentGroup_EC2TagFilter struct {
-
-	// Key AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ec2tagfilters.html#cfn-properties-codedeploy-deploymentgroup-ec2tagfilters-key
-	Key string `json:"Key,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ec2tagfilters.html#cfn-properties-codedeploy-deploymentgroup-ec2tagfilters-type
-	Type string `json:"Type,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ec2tagfilters.html#cfn-properties-codedeploy-deploymentgroup-ec2tagfilters-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_EC2TagFilter) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.EC2TagFilter"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_elbinfo.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_elbinfo.go
deleted file mode 100644
index 6aa4a5e14e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_elbinfo.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_ELBInfo AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.ELBInfo)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-elbinfo.html
-type AWSCodeDeployDeploymentGroup_ELBInfo struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-elbinfo.html#cfn-codedeploy-deploymentgroup-elbinfo-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_ELBInfo) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.ELBInfo"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_githublocation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_githublocation.go
deleted file mode 100644
index 1eceddba7d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_githublocation.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_GitHubLocation AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.GitHubLocation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-githublocation.html
-type AWSCodeDeployDeploymentGroup_GitHubLocation struct {
-
-	// CommitId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-githublocation.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-githublocation-commitid
-	CommitId string `json:"CommitId,omitempty"`
-
-	// Repository AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-githublocation.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-githublocation-repository
-	Repository string `json:"Repository,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_GitHubLocation) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.GitHubLocation"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_loadbalancerinfo.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_loadbalancerinfo.go
deleted file mode 100644
index 683a44d7fa..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_loadbalancerinfo.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_LoadBalancerInfo AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-loadbalancerinfo.html
-type AWSCodeDeployDeploymentGroup_LoadBalancerInfo struct {
-
-	// ElbInfoList AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-loadbalancerinfo.html#cfn-codedeploy-deploymentgroup-loadbalancerinfo-elbinfolist
-	ElbInfoList []AWSCodeDeployDeploymentGroup_ELBInfo `json:"ElbInfoList,omitempty"`
-
-	// TargetGroupInfoList AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-loadbalancerinfo.html#cfn-codedeploy-deploymentgroup-loadbalancerinfo-targetgroupinfolist
-	TargetGroupInfoList []AWSCodeDeployDeploymentGroup_TargetGroupInfo `json:"TargetGroupInfoList,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_LoadBalancerInfo) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_revisionlocation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_revisionlocation.go
deleted file mode 100644
index a74c7e4d18..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_revisionlocation.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_RevisionLocation AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.RevisionLocation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision.html
-type AWSCodeDeployDeploymentGroup_RevisionLocation struct {
-
-	// GitHubLocation AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-githublocation
-	GitHubLocation *AWSCodeDeployDeploymentGroup_GitHubLocation `json:"GitHubLocation,omitempty"`
-
-	// RevisionType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-revisiontype
-	RevisionType string `json:"RevisionType,omitempty"`
-
-	// S3Location AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-s3location
-	S3Location *AWSCodeDeployDeploymentGroup_S3Location `json:"S3Location,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_RevisionLocation) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.RevisionLocation"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_s3location.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_s3location.go
deleted file mode 100644
index 40c7ebbd3b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_s3location.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_S3Location AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.S3Location)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-s3location.html
-type AWSCodeDeployDeploymentGroup_S3Location struct {
-
-	// Bucket AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-s3location.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-s3location-bucket
-	Bucket string `json:"Bucket,omitempty"`
-
-	// BundleType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-s3location.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-s3location-bundletype
-	BundleType string `json:"BundleType,omitempty"`
-
-	// ETag AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-s3location.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-s3location-etag
-	ETag string `json:"ETag,omitempty"`
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-s3location.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-s3location-key
-	Key string `json:"Key,omitempty"`
-
-	// Version AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-s3location.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-s3location-value
-	Version string `json:"Version,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_S3Location) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.S3Location"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_tagfilter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_tagfilter.go
deleted file mode 100644
index 91e988c08c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_tagfilter.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_TagFilter AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.TagFilter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-onpremisesinstancetagfilters.html
-type AWSCodeDeployDeploymentGroup_TagFilter struct {
-
-	// Key AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-onpremisesinstancetagfilters.html#cfn-properties-codedeploy-deploymentgroup-onpremisesinstancetagfilters-key
-	Key string `json:"Key,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-onpremisesinstancetagfilters.html#cfn-properties-codedeploy-deploymentgroup-onpremisesinstancetagfilters-type
-	Type string `json:"Type,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-onpremisesinstancetagfilters.html#cfn-properties-codedeploy-deploymentgroup-onpremisesinstancetagfilters-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_TagFilter) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.TagFilter"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_targetgroupinfo.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_targetgroupinfo.go
deleted file mode 100644
index 0efb7f3e6b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_targetgroupinfo.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_TargetGroupInfo AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-targetgroupinfo.html
-type AWSCodeDeployDeploymentGroup_TargetGroupInfo struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-targetgroupinfo.html#cfn-codedeploy-deploymentgroup-targetgroupinfo-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_TargetGroupInfo) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_triggerconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_triggerconfig.go
deleted file mode 100644
index fd5d1e8f12..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codedeploy-deploymentgroup_triggerconfig.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCodeDeployDeploymentGroup_TriggerConfig AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.TriggerConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-triggerconfig.html
-type AWSCodeDeployDeploymentGroup_TriggerConfig struct {
-
-	// TriggerEvents AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-triggerconfig.html#cfn-codedeploy-deploymentgroup-triggerconfig-triggerevents
-	TriggerEvents []string `json:"TriggerEvents,omitempty"`
-
-	// TriggerName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-triggerconfig.html#cfn-codedeploy-deploymentgroup-triggerconfig-triggername
-	TriggerName string `json:"TriggerName,omitempty"`
-
-	// TriggerTargetArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-triggerconfig.html#cfn-codedeploy-deploymentgroup-triggerconfig-triggertargetarn
-	TriggerTargetArn string `json:"TriggerTargetArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodeDeployDeploymentGroup_TriggerConfig) AWSCloudFormationType() string {
-	return "AWS::CodeDeploy::DeploymentGroup.TriggerConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-customactiontype.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-customactiontype.go
deleted file mode 100644
index 990df7163e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-customactiontype.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCodePipelineCustomActionType AWS CloudFormation Resource (AWS::CodePipeline::CustomActionType)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html
-type AWSCodePipelineCustomActionType struct {
-
-	// Category AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-category
-	Category string `json:"Category,omitempty"`
-
-	// ConfigurationProperties AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-configurationproperties
-	ConfigurationProperties []AWSCodePipelineCustomActionType_ConfigurationProperties `json:"ConfigurationProperties,omitempty"`
-
-	// InputArtifactDetails AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-inputartifactdetails
-	InputArtifactDetails *AWSCodePipelineCustomActionType_ArtifactDetails `json:"InputArtifactDetails,omitempty"`
-
-	// OutputArtifactDetails AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-outputartifactdetails
-	OutputArtifactDetails *AWSCodePipelineCustomActionType_ArtifactDetails `json:"OutputArtifactDetails,omitempty"`
-
-	// Provider AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-provider
-	Provider string `json:"Provider,omitempty"`
-
-	// Settings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-settings
-	Settings *AWSCodePipelineCustomActionType_Settings `json:"Settings,omitempty"`
-
-	// Version AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-version
-	Version string `json:"Version,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelineCustomActionType) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::CustomActionType"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCodePipelineCustomActionType) MarshalJSON() ([]byte, error) {
-	type Properties AWSCodePipelineCustomActionType
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCodePipelineCustomActionType) UnmarshalJSON(b []byte) error {
-	type Properties AWSCodePipelineCustomActionType
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCodePipelineCustomActionType(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCodePipelineCustomActionTypeResources retrieves all AWSCodePipelineCustomActionType items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCodePipelineCustomActionTypeResources() map[string]AWSCodePipelineCustomActionType {
-	results := map[string]AWSCodePipelineCustomActionType{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCodePipelineCustomActionType:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodePipeline::CustomActionType" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodePipelineCustomActionType
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCodePipelineCustomActionTypeWithName retrieves all AWSCodePipelineCustomActionType items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCodePipelineCustomActionTypeWithName(name string) (AWSCodePipelineCustomActionType, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCodePipelineCustomActionType:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodePipeline::CustomActionType" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodePipelineCustomActionType
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCodePipelineCustomActionType{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-customactiontype_artifactdetails.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-customactiontype_artifactdetails.go
deleted file mode 100644
index ccb42aa00b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-customactiontype_artifactdetails.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCodePipelineCustomActionType_ArtifactDetails AWS CloudFormation Resource (AWS::CodePipeline::CustomActionType.ArtifactDetails)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-artifactdetails.html
-type AWSCodePipelineCustomActionType_ArtifactDetails struct {
-
-	// MaximumCount AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-artifactdetails.html#cfn-codepipeline-customactiontype-artifactdetails-maximumcount
-	MaximumCount int `json:"MaximumCount,omitempty"`
-
-	// MinimumCount AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-artifactdetails.html#cfn-codepipeline-customactiontype-artifactdetails-minimumcount
-	MinimumCount int `json:"MinimumCount,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelineCustomActionType_ArtifactDetails) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::CustomActionType.ArtifactDetails"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-customactiontype_configurationproperties.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-customactiontype_configurationproperties.go
deleted file mode 100644
index ac4c8eb7e2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-customactiontype_configurationproperties.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package cloudformation
-
-// AWSCodePipelineCustomActionType_ConfigurationProperties AWS CloudFormation Resource (AWS::CodePipeline::CustomActionType.ConfigurationProperties)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html
-type AWSCodePipelineCustomActionType_ConfigurationProperties struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-description
-	Description string `json:"Description,omitempty"`
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-key
-	Key bool `json:"Key,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-name
-	Name string `json:"Name,omitempty"`
-
-	// Queryable AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-queryable
-	Queryable bool `json:"Queryable,omitempty"`
-
-	// Required AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-required
-	Required bool `json:"Required,omitempty"`
-
-	// Secret AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-secret
-	Secret bool `json:"Secret,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelineCustomActionType_ConfigurationProperties) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::CustomActionType.ConfigurationProperties"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-customactiontype_settings.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-customactiontype_settings.go
deleted file mode 100644
index 62eb0a759a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-customactiontype_settings.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSCodePipelineCustomActionType_Settings AWS CloudFormation Resource (AWS::CodePipeline::CustomActionType.Settings)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-settings.html
-type AWSCodePipelineCustomActionType_Settings struct {
-
-	// EntityUrlTemplate AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-settings.html#cfn-codepipeline-customactiontype-settings-entityurltemplate
-	EntityUrlTemplate string `json:"EntityUrlTemplate,omitempty"`
-
-	// ExecutionUrlTemplate AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-settings.html#cfn-codepipeline-customactiontype-settings-executionurltemplate
-	ExecutionUrlTemplate string `json:"ExecutionUrlTemplate,omitempty"`
-
-	// RevisionUrlTemplate AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-settings.html#cfn-codepipeline-customactiontype-settings-revisionurltemplate
-	RevisionUrlTemplate string `json:"RevisionUrlTemplate,omitempty"`
-
-	// ThirdPartyConfigurationUrl AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-settings.html#cfn-codepipeline-customactiontype-settings-thirdpartyconfigurationurl
-	ThirdPartyConfigurationUrl string `json:"ThirdPartyConfigurationUrl,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelineCustomActionType_Settings) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::CustomActionType.Settings"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline.go
deleted file mode 100644
index e5a81baa97..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCodePipelinePipeline AWS CloudFormation Resource (AWS::CodePipeline::Pipeline)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html
-type AWSCodePipelinePipeline struct {
-
-	// ArtifactStore AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-artifactstore
-	ArtifactStore *AWSCodePipelinePipeline_ArtifactStore `json:"ArtifactStore,omitempty"`
-
-	// DisableInboundStageTransitions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-disableinboundstagetransitions
-	DisableInboundStageTransitions []AWSCodePipelinePipeline_StageTransition `json:"DisableInboundStageTransitions,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-name
-	Name string `json:"Name,omitempty"`
-
-	// RestartExecutionOnUpdate AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-restartexecutiononupdate
-	RestartExecutionOnUpdate bool `json:"RestartExecutionOnUpdate,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// Stages AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-stages
-	Stages []AWSCodePipelinePipeline_StageDeclaration `json:"Stages,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelinePipeline) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::Pipeline"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCodePipelinePipeline) MarshalJSON() ([]byte, error) {
-	type Properties AWSCodePipelinePipeline
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCodePipelinePipeline) UnmarshalJSON(b []byte) error {
-	type Properties AWSCodePipelinePipeline
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCodePipelinePipeline(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCodePipelinePipelineResources retrieves all AWSCodePipelinePipeline items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCodePipelinePipelineResources() map[string]AWSCodePipelinePipeline {
-	results := map[string]AWSCodePipelinePipeline{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCodePipelinePipeline:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodePipeline::Pipeline" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodePipelinePipeline
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCodePipelinePipelineWithName retrieves all AWSCodePipelinePipeline items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCodePipelinePipelineWithName(name string) (AWSCodePipelinePipeline, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCodePipelinePipeline:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::CodePipeline::Pipeline" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCodePipelinePipeline
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCodePipelinePipeline{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_actiondeclaration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_actiondeclaration.go
deleted file mode 100644
index 12f8a1bc4d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_actiondeclaration.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package cloudformation
-
-// AWSCodePipelinePipeline_ActionDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.ActionDeclaration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html
-type AWSCodePipelinePipeline_ActionDeclaration struct {
-
-	// ActionTypeId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-actiontypeid
-	ActionTypeId *AWSCodePipelinePipeline_ActionTypeId `json:"ActionTypeId,omitempty"`
-
-	// Configuration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-configuration
-	Configuration interface{} `json:"Configuration,omitempty"`
-
-	// InputArtifacts AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-inputartifacts
-	InputArtifacts []AWSCodePipelinePipeline_InputArtifact `json:"InputArtifacts,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-name
-	Name string `json:"Name,omitempty"`
-
-	// OutputArtifacts AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-outputartifacts
-	OutputArtifacts []AWSCodePipelinePipeline_OutputArtifact `json:"OutputArtifacts,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// RunOrder AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-runorder
-	RunOrder int `json:"RunOrder,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelinePipeline_ActionDeclaration) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::Pipeline.ActionDeclaration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_actiontypeid.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_actiontypeid.go
deleted file mode 100644
index aa35ba2f2a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_actiontypeid.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSCodePipelinePipeline_ActionTypeId AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.ActionTypeId)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-actiontypeid.html
-type AWSCodePipelinePipeline_ActionTypeId struct {
-
-	// Category AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-actiontypeid.html#cfn-codepipeline-pipeline-stages-actions-actiontypeid-category
-	Category string `json:"Category,omitempty"`
-
-	// Owner AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-actiontypeid.html#cfn-codepipeline-pipeline-stages-actions-actiontypeid-owner
-	Owner string `json:"Owner,omitempty"`
-
-	// Provider AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-actiontypeid.html#cfn-codepipeline-pipeline-stages-actions-actiontypeid-provider
-	Provider string `json:"Provider,omitempty"`
-
-	// Version AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-actiontypeid.html#cfn-codepipeline-pipeline-stages-actions-actiontypeid-version
-	Version string `json:"Version,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelinePipeline_ActionTypeId) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::Pipeline.ActionTypeId"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_artifactstore.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_artifactstore.go
deleted file mode 100644
index 97f4f33a5e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_artifactstore.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCodePipelinePipeline_ArtifactStore AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.ArtifactStore)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore.html
-type AWSCodePipelinePipeline_ArtifactStore struct {
-
-	// EncryptionKey AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore.html#cfn-codepipeline-pipeline-artifactstore-encryptionkey
-	EncryptionKey *AWSCodePipelinePipeline_EncryptionKey `json:"EncryptionKey,omitempty"`
-
-	// Location AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore.html#cfn-codepipeline-pipeline-artifactstore-location
-	Location string `json:"Location,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore.html#cfn-codepipeline-pipeline-artifactstore-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelinePipeline_ArtifactStore) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::Pipeline.ArtifactStore"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_blockerdeclaration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_blockerdeclaration.go
deleted file mode 100644
index 96c6e1062f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_blockerdeclaration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCodePipelinePipeline_BlockerDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.BlockerDeclaration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-blockers.html
-type AWSCodePipelinePipeline_BlockerDeclaration struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-blockers.html#cfn-codepipeline-pipeline-stages-blockers-name
-	Name string `json:"Name,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-blockers.html#cfn-codepipeline-pipeline-stages-blockers-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelinePipeline_BlockerDeclaration) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::Pipeline.BlockerDeclaration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_encryptionkey.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_encryptionkey.go
deleted file mode 100644
index dd78aa03bc..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_encryptionkey.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCodePipelinePipeline_EncryptionKey AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.EncryptionKey)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore-encryptionkey.html
-type AWSCodePipelinePipeline_EncryptionKey struct {
-
-	// Id AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore-encryptionkey.html#cfn-codepipeline-pipeline-artifactstore-encryptionkey-id
-	Id string `json:"Id,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore-encryptionkey.html#cfn-codepipeline-pipeline-artifactstore-encryptionkey-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelinePipeline_EncryptionKey) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::Pipeline.EncryptionKey"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_inputartifact.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_inputartifact.go
deleted file mode 100644
index 93613601fb..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_inputartifact.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSCodePipelinePipeline_InputArtifact AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.InputArtifact)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-inputartifacts.html
-type AWSCodePipelinePipeline_InputArtifact struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-inputartifacts.html#cfn-codepipeline-pipeline-stages-actions-inputartifacts-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelinePipeline_InputArtifact) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::Pipeline.InputArtifact"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_outputartifact.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_outputartifact.go
deleted file mode 100644
index 7655efb3da..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_outputartifact.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSCodePipelinePipeline_OutputArtifact AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.OutputArtifact)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-outputartifacts.html
-type AWSCodePipelinePipeline_OutputArtifact struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-outputartifacts.html#cfn-codepipeline-pipeline-stages-actions-outputartifacts-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelinePipeline_OutputArtifact) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::Pipeline.OutputArtifact"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_stagedeclaration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_stagedeclaration.go
deleted file mode 100644
index 771ef17d5b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_stagedeclaration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCodePipelinePipeline_StageDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.StageDeclaration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages.html
-type AWSCodePipelinePipeline_StageDeclaration struct {
-
-	// Actions AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages.html#cfn-codepipeline-pipeline-stages-actions
-	Actions []AWSCodePipelinePipeline_ActionDeclaration `json:"Actions,omitempty"`
-
-	// Blockers AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages.html#cfn-codepipeline-pipeline-stages-blockers
-	Blockers []AWSCodePipelinePipeline_BlockerDeclaration `json:"Blockers,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages.html#cfn-codepipeline-pipeline-stages-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelinePipeline_StageDeclaration) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::Pipeline.StageDeclaration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_stagetransition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_stagetransition.go
deleted file mode 100644
index c37925d928..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-codepipeline-pipeline_stagetransition.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCodePipelinePipeline_StageTransition AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.StageTransition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-disableinboundstagetransitions.html
-type AWSCodePipelinePipeline_StageTransition struct {
-
-	// Reason AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-disableinboundstagetransitions.html#cfn-codepipeline-pipeline-disableinboundstagetransitions-reason
-	Reason string `json:"Reason,omitempty"`
-
-	// StageName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-disableinboundstagetransitions.html#cfn-codepipeline-pipeline-disableinboundstagetransitions-stagename
-	StageName string `json:"StageName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCodePipelinePipeline_StageTransition) AWSCloudFormationType() string {
-	return "AWS::CodePipeline::Pipeline.StageTransition"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypool.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypool.go
deleted file mode 100644
index 4f9b3031f6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypool.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCognitoIdentityPool AWS CloudFormation Resource (AWS::Cognito::IdentityPool)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html
-type AWSCognitoIdentityPool struct {
-
-	// AllowUnauthenticatedIdentities AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-allowunauthenticatedidentities
-	AllowUnauthenticatedIdentities bool `json:"AllowUnauthenticatedIdentities,omitempty"`
-
-	// CognitoEvents AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-cognitoevents
-	CognitoEvents interface{} `json:"CognitoEvents,omitempty"`
-
-	// CognitoIdentityProviders AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-cognitoidentityproviders
-	CognitoIdentityProviders []AWSCognitoIdentityPool_CognitoIdentityProvider `json:"CognitoIdentityProviders,omitempty"`
-
-	// CognitoStreams AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-cognitostreams
-	CognitoStreams *AWSCognitoIdentityPool_CognitoStreams `json:"CognitoStreams,omitempty"`
-
-	// DeveloperProviderName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-developerprovidername
-	DeveloperProviderName string `json:"DeveloperProviderName,omitempty"`
-
-	// IdentityPoolName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-identitypoolname
-	IdentityPoolName string `json:"IdentityPoolName,omitempty"`
-
-	// OpenIdConnectProviderARNs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-openidconnectproviderarns
-	OpenIdConnectProviderARNs []string `json:"OpenIdConnectProviderARNs,omitempty"`
-
-	// PushSync AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-pushsync
-	PushSync *AWSCognitoIdentityPool_PushSync `json:"PushSync,omitempty"`
-
-	// SamlProviderARNs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-samlproviderarns
-	SamlProviderARNs []string `json:"SamlProviderARNs,omitempty"`
-
-	// SupportedLoginProviders AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-supportedloginproviders
-	SupportedLoginProviders interface{} `json:"SupportedLoginProviders,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoIdentityPool) AWSCloudFormationType() string {
-	return "AWS::Cognito::IdentityPool"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCognitoIdentityPool) MarshalJSON() ([]byte, error) {
-	type Properties AWSCognitoIdentityPool
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCognitoIdentityPool) UnmarshalJSON(b []byte) error {
-	type Properties AWSCognitoIdentityPool
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCognitoIdentityPool(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCognitoIdentityPoolResources retrieves all AWSCognitoIdentityPool items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCognitoIdentityPoolResources() map[string]AWSCognitoIdentityPool {
-	results := map[string]AWSCognitoIdentityPool{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCognitoIdentityPool:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::IdentityPool" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoIdentityPool
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCognitoIdentityPoolWithName retrieves all AWSCognitoIdentityPool items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCognitoIdentityPoolWithName(name string) (AWSCognitoIdentityPool, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCognitoIdentityPool:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::IdentityPool" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoIdentityPool
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCognitoIdentityPool{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypool_cognitoidentityprovider.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypool_cognitoidentityprovider.go
deleted file mode 100644
index f0945732b6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypool_cognitoidentityprovider.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCognitoIdentityPool_CognitoIdentityProvider AWS CloudFormation Resource (AWS::Cognito::IdentityPool.CognitoIdentityProvider)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitoidentityprovider.html
-type AWSCognitoIdentityPool_CognitoIdentityProvider struct {
-
-	// ClientId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitoidentityprovider.html#cfn-cognito-identitypool-cognitoidentityprovider-clientid
-	ClientId string `json:"ClientId,omitempty"`
-
-	// ProviderName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitoidentityprovider.html#cfn-cognito-identitypool-cognitoidentityprovider-providername
-	ProviderName string `json:"ProviderName,omitempty"`
-
-	// ServerSideTokenCheck AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitoidentityprovider.html#cfn-cognito-identitypool-cognitoidentityprovider-serversidetokencheck
-	ServerSideTokenCheck bool `json:"ServerSideTokenCheck,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoIdentityPool_CognitoIdentityProvider) AWSCloudFormationType() string {
-	return "AWS::Cognito::IdentityPool.CognitoIdentityProvider"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypool_cognitostreams.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypool_cognitostreams.go
deleted file mode 100644
index 14d9ee3923..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypool_cognitostreams.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCognitoIdentityPool_CognitoStreams AWS CloudFormation Resource (AWS::Cognito::IdentityPool.CognitoStreams)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitostreams.html
-type AWSCognitoIdentityPool_CognitoStreams struct {
-
-	// RoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitostreams.html#cfn-cognito-identitypool-cognitostreams-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// StreamName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitostreams.html#cfn-cognito-identitypool-cognitostreams-streamname
-	StreamName string `json:"StreamName,omitempty"`
-
-	// StreamingStatus AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitostreams.html#cfn-cognito-identitypool-cognitostreams-streamingstatus
-	StreamingStatus string `json:"StreamingStatus,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoIdentityPool_CognitoStreams) AWSCloudFormationType() string {
-	return "AWS::Cognito::IdentityPool.CognitoStreams"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypool_pushsync.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypool_pushsync.go
deleted file mode 100644
index da9db28727..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypool_pushsync.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCognitoIdentityPool_PushSync AWS CloudFormation Resource (AWS::Cognito::IdentityPool.PushSync)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-pushsync.html
-type AWSCognitoIdentityPool_PushSync struct {
-
-	// ApplicationArns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-pushsync.html#cfn-cognito-identitypool-pushsync-applicationarns
-	ApplicationArns []string `json:"ApplicationArns,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-pushsync.html#cfn-cognito-identitypool-pushsync-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoIdentityPool_PushSync) AWSCloudFormationType() string {
-	return "AWS::Cognito::IdentityPool.PushSync"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypoolroleattachment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypoolroleattachment.go
deleted file mode 100644
index 2c94428361..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypoolroleattachment.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCognitoIdentityPoolRoleAttachment AWS CloudFormation Resource (AWS::Cognito::IdentityPoolRoleAttachment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolroleattachment.html
-type AWSCognitoIdentityPoolRoleAttachment struct {
-
-	// IdentityPoolId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolroleattachment.html#cfn-cognito-identitypoolroleattachment-identitypoolid
-	IdentityPoolId string `json:"IdentityPoolId,omitempty"`
-
-	// RoleMappings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolroleattachment.html#cfn-cognito-identitypoolroleattachment-rolemappings
-	RoleMappings interface{} `json:"RoleMappings,omitempty"`
-
-	// Roles AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolroleattachment.html#cfn-cognito-identitypoolroleattachment-roles
-	Roles interface{} `json:"Roles,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoIdentityPoolRoleAttachment) AWSCloudFormationType() string {
-	return "AWS::Cognito::IdentityPoolRoleAttachment"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCognitoIdentityPoolRoleAttachment) MarshalJSON() ([]byte, error) {
-	type Properties AWSCognitoIdentityPoolRoleAttachment
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCognitoIdentityPoolRoleAttachment) UnmarshalJSON(b []byte) error {
-	type Properties AWSCognitoIdentityPoolRoleAttachment
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCognitoIdentityPoolRoleAttachment(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCognitoIdentityPoolRoleAttachmentResources retrieves all AWSCognitoIdentityPoolRoleAttachment items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCognitoIdentityPoolRoleAttachmentResources() map[string]AWSCognitoIdentityPoolRoleAttachment {
-	results := map[string]AWSCognitoIdentityPoolRoleAttachment{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCognitoIdentityPoolRoleAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::IdentityPoolRoleAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoIdentityPoolRoleAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCognitoIdentityPoolRoleAttachmentWithName retrieves all AWSCognitoIdentityPoolRoleAttachment items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCognitoIdentityPoolRoleAttachmentWithName(name string) (AWSCognitoIdentityPoolRoleAttachment, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCognitoIdentityPoolRoleAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::IdentityPoolRoleAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoIdentityPoolRoleAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCognitoIdentityPoolRoleAttachment{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypoolroleattachment_mappingrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypoolroleattachment_mappingrule.go
deleted file mode 100644
index 173ea186d8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypoolroleattachment_mappingrule.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSCognitoIdentityPoolRoleAttachment_MappingRule AWS CloudFormation Resource (AWS::Cognito::IdentityPoolRoleAttachment.MappingRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-mappingrule.html
-type AWSCognitoIdentityPoolRoleAttachment_MappingRule struct {
-
-	// Claim AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-mappingrule.html#cfn-cognito-identitypoolroleattachment-mappingrule-claim
-	Claim string `json:"Claim,omitempty"`
-
-	// MatchType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-mappingrule.html#cfn-cognito-identitypoolroleattachment-mappingrule-matchtype
-	MatchType string `json:"MatchType,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-mappingrule.html#cfn-cognito-identitypoolroleattachment-mappingrule-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-mappingrule.html#cfn-cognito-identitypoolroleattachment-mappingrule-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoIdentityPoolRoleAttachment_MappingRule) AWSCloudFormationType() string {
-	return "AWS::Cognito::IdentityPoolRoleAttachment.MappingRule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypoolroleattachment_rolemapping.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypoolroleattachment_rolemapping.go
deleted file mode 100644
index eea3113d58..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypoolroleattachment_rolemapping.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCognitoIdentityPoolRoleAttachment_RoleMapping AWS CloudFormation Resource (AWS::Cognito::IdentityPoolRoleAttachment.RoleMapping)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rolemapping.html
-type AWSCognitoIdentityPoolRoleAttachment_RoleMapping struct {
-
-	// AmbiguousRoleResolution AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rolemapping.html#cfn-cognito-identitypoolroleattachment-rolemapping-ambiguousroleresolution
-	AmbiguousRoleResolution string `json:"AmbiguousRoleResolution,omitempty"`
-
-	// RulesConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rolemapping.html#cfn-cognito-identitypoolroleattachment-rolemapping-rulesconfiguration
-	RulesConfiguration *AWSCognitoIdentityPoolRoleAttachment_RulesConfigurationType `json:"RulesConfiguration,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rolemapping.html#cfn-cognito-identitypoolroleattachment-rolemapping-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoIdentityPoolRoleAttachment_RoleMapping) AWSCloudFormationType() string {
-	return "AWS::Cognito::IdentityPoolRoleAttachment.RoleMapping"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go
deleted file mode 100644
index 9803d12abe..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSCognitoIdentityPoolRoleAttachment_RulesConfigurationType AWS CloudFormation Resource (AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rulesconfigurationtype.html
-type AWSCognitoIdentityPoolRoleAttachment_RulesConfigurationType struct {
-
-	// Rules AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rulesconfigurationtype.html#cfn-cognito-identitypoolroleattachment-rulesconfigurationtype-rules
-	Rules []AWSCognitoIdentityPoolRoleAttachment_MappingRule `json:"Rules,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoIdentityPoolRoleAttachment_RulesConfigurationType) AWSCloudFormationType() string {
-	return "AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool.go
deleted file mode 100644
index d94baf59bd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool.go
+++ /dev/null
@@ -1,185 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCognitoUserPool AWS CloudFormation Resource (AWS::Cognito::UserPool)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html
-type AWSCognitoUserPool struct {
-
-	// AdminCreateUserConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-admincreateuserconfig
-	AdminCreateUserConfig *AWSCognitoUserPool_AdminCreateUserConfig `json:"AdminCreateUserConfig,omitempty"`
-
-	// AliasAttributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-aliasattributes
-	AliasAttributes []string `json:"AliasAttributes,omitempty"`
-
-	// AutoVerifiedAttributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-autoverifiedattributes
-	AutoVerifiedAttributes []string `json:"AutoVerifiedAttributes,omitempty"`
-
-	// DeviceConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-deviceconfiguration
-	DeviceConfiguration *AWSCognitoUserPool_DeviceConfiguration `json:"DeviceConfiguration,omitempty"`
-
-	// EmailConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-emailconfiguration
-	EmailConfiguration *AWSCognitoUserPool_EmailConfiguration `json:"EmailConfiguration,omitempty"`
-
-	// EmailVerificationMessage AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-emailverificationmessage
-	EmailVerificationMessage string `json:"EmailVerificationMessage,omitempty"`
-
-	// EmailVerificationSubject AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-emailverificationsubject
-	EmailVerificationSubject string `json:"EmailVerificationSubject,omitempty"`
-
-	// LambdaConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-lambdaconfig
-	LambdaConfig *AWSCognitoUserPool_LambdaConfig `json:"LambdaConfig,omitempty"`
-
-	// MfaConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-mfaconfiguration
-	MfaConfiguration string `json:"MfaConfiguration,omitempty"`
-
-	// Policies AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-policies
-	Policies *AWSCognitoUserPool_Policies `json:"Policies,omitempty"`
-
-	// Schema AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-schema
-	Schema []AWSCognitoUserPool_SchemaAttribute `json:"Schema,omitempty"`
-
-	// SmsAuthenticationMessage AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-smsauthenticationmessage
-	SmsAuthenticationMessage string `json:"SmsAuthenticationMessage,omitempty"`
-
-	// SmsConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-smsconfiguration
-	SmsConfiguration *AWSCognitoUserPool_SmsConfiguration `json:"SmsConfiguration,omitempty"`
-
-	// SmsVerificationMessage AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-smsverificationmessage
-	SmsVerificationMessage string `json:"SmsVerificationMessage,omitempty"`
-
-	// UserPoolName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-userpoolname
-	UserPoolName string `json:"UserPoolName,omitempty"`
-
-	// UserPoolTags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-userpooltags
-	UserPoolTags interface{} `json:"UserPoolTags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPool) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPool"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCognitoUserPool) MarshalJSON() ([]byte, error) {
-	type Properties AWSCognitoUserPool
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCognitoUserPool) UnmarshalJSON(b []byte) error {
-	type Properties AWSCognitoUserPool
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCognitoUserPool(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCognitoUserPoolResources retrieves all AWSCognitoUserPool items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCognitoUserPoolResources() map[string]AWSCognitoUserPool {
-	results := map[string]AWSCognitoUserPool{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCognitoUserPool:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::UserPool" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoUserPool
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCognitoUserPoolWithName retrieves all AWSCognitoUserPool items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCognitoUserPoolWithName(name string) (AWSCognitoUserPool, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCognitoUserPool:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::UserPool" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoUserPool
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCognitoUserPool{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_admincreateuserconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_admincreateuserconfig.go
deleted file mode 100644
index d918c5738c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_admincreateuserconfig.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCognitoUserPool_AdminCreateUserConfig AWS CloudFormation Resource (AWS::Cognito::UserPool.AdminCreateUserConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-admincreateuserconfig.html
-type AWSCognitoUserPool_AdminCreateUserConfig struct {
-
-	// AllowAdminCreateUserOnly AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-admincreateuserconfig.html#cfn-cognito-userpool-admincreateuserconfig-allowadmincreateuseronly
-	AllowAdminCreateUserOnly bool `json:"AllowAdminCreateUserOnly,omitempty"`
-
-	// InviteMessageTemplate AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-admincreateuserconfig.html#cfn-cognito-userpool-admincreateuserconfig-invitemessagetemplate
-	InviteMessageTemplate *AWSCognitoUserPool_InviteMessageTemplate `json:"InviteMessageTemplate,omitempty"`
-
-	// UnusedAccountValidityDays AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-admincreateuserconfig.html#cfn-cognito-userpool-admincreateuserconfig-unusedaccountvaliditydays
-	UnusedAccountValidityDays float64 `json:"UnusedAccountValidityDays,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPool_AdminCreateUserConfig) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPool.AdminCreateUserConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_deviceconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_deviceconfiguration.go
deleted file mode 100644
index 173e977ff6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_deviceconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCognitoUserPool_DeviceConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPool.DeviceConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-deviceconfiguration.html
-type AWSCognitoUserPool_DeviceConfiguration struct {
-
-	// ChallengeRequiredOnNewDevice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-deviceconfiguration.html#cfn-cognito-userpool-deviceconfiguration-challengerequiredonnewdevice
-	ChallengeRequiredOnNewDevice bool `json:"ChallengeRequiredOnNewDevice,omitempty"`
-
-	// DeviceOnlyRememberedOnUserPrompt AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-deviceconfiguration.html#cfn-cognito-userpool-deviceconfiguration-deviceonlyrememberedonuserprompt
-	DeviceOnlyRememberedOnUserPrompt bool `json:"DeviceOnlyRememberedOnUserPrompt,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPool_DeviceConfiguration) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPool.DeviceConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_emailconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_emailconfiguration.go
deleted file mode 100644
index e767cc4873..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_emailconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCognitoUserPool_EmailConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPool.EmailConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-emailconfiguration.html
-type AWSCognitoUserPool_EmailConfiguration struct {
-
-	// ReplyToEmailAddress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-emailconfiguration.html#cfn-cognito-userpool-emailconfiguration-replytoemailaddress
-	ReplyToEmailAddress string `json:"ReplyToEmailAddress,omitempty"`
-
-	// SourceArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-emailconfiguration.html#cfn-cognito-userpool-emailconfiguration-sourcearn
-	SourceArn string `json:"SourceArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPool_EmailConfiguration) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPool.EmailConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_invitemessagetemplate.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_invitemessagetemplate.go
deleted file mode 100644
index 17e2e5e303..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_invitemessagetemplate.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSCognitoUserPool_InviteMessageTemplate AWS CloudFormation Resource (AWS::Cognito::UserPool.InviteMessageTemplate)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-invitemessagetemplate.html
-type AWSCognitoUserPool_InviteMessageTemplate struct {
-
-	// EmailMessage AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-invitemessagetemplate.html#cfn-cognito-userpool-invitemessagetemplate-emailmessage
-	EmailMessage string `json:"EmailMessage,omitempty"`
-
-	// EmailSubject AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-invitemessagetemplate.html#cfn-cognito-userpool-invitemessagetemplate-emailsubject
-	EmailSubject string `json:"EmailSubject,omitempty"`
-
-	// SMSMessage AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-invitemessagetemplate.html#cfn-cognito-userpool-invitemessagetemplate-smsmessage
-	SMSMessage string `json:"SMSMessage,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPool_InviteMessageTemplate) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPool.InviteMessageTemplate"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_lambdaconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_lambdaconfig.go
deleted file mode 100644
index b4f1857c6c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_lambdaconfig.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package cloudformation
-
-// AWSCognitoUserPool_LambdaConfig AWS CloudFormation Resource (AWS::Cognito::UserPool.LambdaConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html
-type AWSCognitoUserPool_LambdaConfig struct {
-
-	// CreateAuthChallenge AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-createauthchallenge
-	CreateAuthChallenge string `json:"CreateAuthChallenge,omitempty"`
-
-	// CustomMessage AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-custommessage
-	CustomMessage string `json:"CustomMessage,omitempty"`
-
-	// DefineAuthChallenge AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-defineauthchallenge
-	DefineAuthChallenge string `json:"DefineAuthChallenge,omitempty"`
-
-	// PostAuthentication AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-postauthentication
-	PostAuthentication string `json:"PostAuthentication,omitempty"`
-
-	// PostConfirmation AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-postconfirmation
-	PostConfirmation string `json:"PostConfirmation,omitempty"`
-
-	// PreAuthentication AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-preauthentication
-	PreAuthentication string `json:"PreAuthentication,omitempty"`
-
-	// PreSignUp AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-presignup
-	PreSignUp string `json:"PreSignUp,omitempty"`
-
-	// VerifyAuthChallengeResponse AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-verifyauthchallengeresponse
-	VerifyAuthChallengeResponse string `json:"VerifyAuthChallengeResponse,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPool_LambdaConfig) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPool.LambdaConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_numberattributeconstraints.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_numberattributeconstraints.go
deleted file mode 100644
index a6e3603a10..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_numberattributeconstraints.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCognitoUserPool_NumberAttributeConstraints AWS CloudFormation Resource (AWS::Cognito::UserPool.NumberAttributeConstraints)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-numberattributeconstraints.html
-type AWSCognitoUserPool_NumberAttributeConstraints struct {
-
-	// MaxValue AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-numberattributeconstraints.html#cfn-cognito-userpool-numberattributeconstraints-maxvalue
-	MaxValue string `json:"MaxValue,omitempty"`
-
-	// MinValue AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-numberattributeconstraints.html#cfn-cognito-userpool-numberattributeconstraints-minvalue
-	MinValue string `json:"MinValue,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPool_NumberAttributeConstraints) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPool.NumberAttributeConstraints"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_passwordpolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_passwordpolicy.go
deleted file mode 100644
index c1171a5ce9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_passwordpolicy.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSCognitoUserPool_PasswordPolicy AWS CloudFormation Resource (AWS::Cognito::UserPool.PasswordPolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html
-type AWSCognitoUserPool_PasswordPolicy struct {
-
-	// MinimumLength AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-minimumlength
-	MinimumLength int `json:"MinimumLength,omitempty"`
-
-	// RequireLowercase AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-requirelowercase
-	RequireLowercase bool `json:"RequireLowercase,omitempty"`
-
-	// RequireNumbers AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-requirenumbers
-	RequireNumbers bool `json:"RequireNumbers,omitempty"`
-
-	// RequireSymbols AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-requiresymbols
-	RequireSymbols bool `json:"RequireSymbols,omitempty"`
-
-	// RequireUppercase AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-requireuppercase
-	RequireUppercase bool `json:"RequireUppercase,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPool_PasswordPolicy) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPool.PasswordPolicy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_policies.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_policies.go
deleted file mode 100644
index 56de90c6f3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_policies.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSCognitoUserPool_Policies AWS CloudFormation Resource (AWS::Cognito::UserPool.Policies)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-policies.html
-type AWSCognitoUserPool_Policies struct {
-
-	// PasswordPolicy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-policies.html#cfn-cognito-userpool-policies-passwordpolicy
-	PasswordPolicy *AWSCognitoUserPool_PasswordPolicy `json:"PasswordPolicy,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPool_Policies) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPool.Policies"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_schemaattribute.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_schemaattribute.go
deleted file mode 100644
index 49523d7f7a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_schemaattribute.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package cloudformation
-
-// AWSCognitoUserPool_SchemaAttribute AWS CloudFormation Resource (AWS::Cognito::UserPool.SchemaAttribute)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html
-type AWSCognitoUserPool_SchemaAttribute struct {
-
-	// AttributeDataType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-attributedatatype
-	AttributeDataType string `json:"AttributeDataType,omitempty"`
-
-	// DeveloperOnlyAttribute AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-developeronlyattribute
-	DeveloperOnlyAttribute bool `json:"DeveloperOnlyAttribute,omitempty"`
-
-	// Mutable AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-mutable
-	Mutable bool `json:"Mutable,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-name
-	Name string `json:"Name,omitempty"`
-
-	// NumberAttributeConstraints AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-numberattributeconstraints
-	NumberAttributeConstraints *AWSCognitoUserPool_NumberAttributeConstraints `json:"NumberAttributeConstraints,omitempty"`
-
-	// Required AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-required
-	Required bool `json:"Required,omitempty"`
-
-	// StringAttributeConstraints AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-stringattributeconstraints
-	StringAttributeConstraints *AWSCognitoUserPool_StringAttributeConstraints `json:"StringAttributeConstraints,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPool_SchemaAttribute) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPool.SchemaAttribute"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_smsconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_smsconfiguration.go
deleted file mode 100644
index 1166462f4c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_smsconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCognitoUserPool_SmsConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPool.SmsConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-smsconfiguration.html
-type AWSCognitoUserPool_SmsConfiguration struct {
-
-	// ExternalId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-smsconfiguration.html#cfn-cognito-userpool-smsconfiguration-externalid
-	ExternalId string `json:"ExternalId,omitempty"`
-
-	// SnsCallerArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-smsconfiguration.html#cfn-cognito-userpool-smsconfiguration-snscallerarn
-	SnsCallerArn string `json:"SnsCallerArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPool_SmsConfiguration) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPool.SmsConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_stringattributeconstraints.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_stringattributeconstraints.go
deleted file mode 100644
index c5857a75d2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpool_stringattributeconstraints.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCognitoUserPool_StringAttributeConstraints AWS CloudFormation Resource (AWS::Cognito::UserPool.StringAttributeConstraints)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-stringattributeconstraints.html
-type AWSCognitoUserPool_StringAttributeConstraints struct {
-
-	// MaxLength AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-stringattributeconstraints.html#cfn-cognito-userpool-stringattributeconstraints-maxlength
-	MaxLength string `json:"MaxLength,omitempty"`
-
-	// MinLength AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-stringattributeconstraints.html#cfn-cognito-userpool-stringattributeconstraints-minlength
-	MinLength string `json:"MinLength,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPool_StringAttributeConstraints) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPool.StringAttributeConstraints"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpoolclient.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpoolclient.go
deleted file mode 100644
index e20622708e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpoolclient.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCognitoUserPoolClient AWS CloudFormation Resource (AWS::Cognito::UserPoolClient)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html
-type AWSCognitoUserPoolClient struct {
-
-	// ClientName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-clientname
-	ClientName string `json:"ClientName,omitempty"`
-
-	// ExplicitAuthFlows AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-explicitauthflows
-	ExplicitAuthFlows []string `json:"ExplicitAuthFlows,omitempty"`
-
-	// GenerateSecret AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-generatesecret
-	GenerateSecret bool `json:"GenerateSecret,omitempty"`
-
-	// ReadAttributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-readattributes
-	ReadAttributes []string `json:"ReadAttributes,omitempty"`
-
-	// RefreshTokenValidity AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-refreshtokenvalidity
-	RefreshTokenValidity float64 `json:"RefreshTokenValidity,omitempty"`
-
-	// UserPoolId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-userpoolid
-	UserPoolId string `json:"UserPoolId,omitempty"`
-
-	// WriteAttributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-writeattributes
-	WriteAttributes []string `json:"WriteAttributes,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPoolClient) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPoolClient"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCognitoUserPoolClient) MarshalJSON() ([]byte, error) {
-	type Properties AWSCognitoUserPoolClient
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCognitoUserPoolClient) UnmarshalJSON(b []byte) error {
-	type Properties AWSCognitoUserPoolClient
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCognitoUserPoolClient(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCognitoUserPoolClientResources retrieves all AWSCognitoUserPoolClient items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCognitoUserPoolClientResources() map[string]AWSCognitoUserPoolClient {
-	results := map[string]AWSCognitoUserPoolClient{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCognitoUserPoolClient:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::UserPoolClient" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoUserPoolClient
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCognitoUserPoolClientWithName retrieves all AWSCognitoUserPoolClient items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCognitoUserPoolClientWithName(name string) (AWSCognitoUserPoolClient, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCognitoUserPoolClient:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::UserPoolClient" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoUserPoolClient
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCognitoUserPoolClient{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpoolgroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpoolgroup.go
deleted file mode 100644
index b7cc3f4ec4..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpoolgroup.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCognitoUserPoolGroup AWS CloudFormation Resource (AWS::Cognito::UserPoolGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html
-type AWSCognitoUserPoolGroup struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html#cfn-cognito-userpoolgroup-description
-	Description string `json:"Description,omitempty"`
-
-	// GroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html#cfn-cognito-userpoolgroup-groupname
-	GroupName string `json:"GroupName,omitempty"`
-
-	// Precedence AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html#cfn-cognito-userpoolgroup-precedence
-	Precedence float64 `json:"Precedence,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html#cfn-cognito-userpoolgroup-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// UserPoolId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html#cfn-cognito-userpoolgroup-userpoolid
-	UserPoolId string `json:"UserPoolId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPoolGroup) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPoolGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCognitoUserPoolGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSCognitoUserPoolGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCognitoUserPoolGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSCognitoUserPoolGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCognitoUserPoolGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCognitoUserPoolGroupResources retrieves all AWSCognitoUserPoolGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCognitoUserPoolGroupResources() map[string]AWSCognitoUserPoolGroup {
-	results := map[string]AWSCognitoUserPoolGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCognitoUserPoolGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::UserPoolGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoUserPoolGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCognitoUserPoolGroupWithName retrieves all AWSCognitoUserPoolGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCognitoUserPoolGroupWithName(name string) (AWSCognitoUserPoolGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCognitoUserPoolGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::UserPoolGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoUserPoolGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCognitoUserPoolGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpooluser.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpooluser.go
deleted file mode 100644
index 462fc49a19..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpooluser.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCognitoUserPoolUser AWS CloudFormation Resource (AWS::Cognito::UserPoolUser)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html
-type AWSCognitoUserPoolUser struct {
-
-	// DesiredDeliveryMediums AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-desireddeliverymediums
-	DesiredDeliveryMediums []string `json:"DesiredDeliveryMediums,omitempty"`
-
-	// ForceAliasCreation AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-forcealiascreation
-	ForceAliasCreation bool `json:"ForceAliasCreation,omitempty"`
-
-	// MessageAction AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-messageaction
-	MessageAction string `json:"MessageAction,omitempty"`
-
-	// UserAttributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-userattributes
-	UserAttributes []AWSCognitoUserPoolUser_AttributeType `json:"UserAttributes,omitempty"`
-
-	// UserPoolId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-userpoolid
-	UserPoolId string `json:"UserPoolId,omitempty"`
-
-	// Username AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-username
-	Username string `json:"Username,omitempty"`
-
-	// ValidationData AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-validationdata
-	ValidationData []AWSCognitoUserPoolUser_AttributeType `json:"ValidationData,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPoolUser) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPoolUser"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCognitoUserPoolUser) MarshalJSON() ([]byte, error) {
-	type Properties AWSCognitoUserPoolUser
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCognitoUserPoolUser) UnmarshalJSON(b []byte) error {
-	type Properties AWSCognitoUserPoolUser
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCognitoUserPoolUser(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCognitoUserPoolUserResources retrieves all AWSCognitoUserPoolUser items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCognitoUserPoolUserResources() map[string]AWSCognitoUserPoolUser {
-	results := map[string]AWSCognitoUserPoolUser{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCognitoUserPoolUser:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::UserPoolUser" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoUserPoolUser
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCognitoUserPoolUserWithName retrieves all AWSCognitoUserPoolUser items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCognitoUserPoolUserWithName(name string) (AWSCognitoUserPoolUser, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCognitoUserPoolUser:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::UserPoolUser" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoUserPoolUser
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCognitoUserPoolUser{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpooluser_attributetype.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpooluser_attributetype.go
deleted file mode 100644
index 7318245cf1..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpooluser_attributetype.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSCognitoUserPoolUser_AttributeType AWS CloudFormation Resource (AWS::Cognito::UserPoolUser.AttributeType)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpooluser-attributetype.html
-type AWSCognitoUserPoolUser_AttributeType struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpooluser-attributetype.html#cfn-cognito-userpooluser-attributetype-name
-	Name string `json:"Name,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpooluser-attributetype.html#cfn-cognito-userpooluser-attributetype-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPoolUser_AttributeType) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPoolUser.AttributeType"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpoolusertogroupattachment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpoolusertogroupattachment.go
deleted file mode 100644
index 9009485746..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-cognito-userpoolusertogroupattachment.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSCognitoUserPoolUserToGroupAttachment AWS CloudFormation Resource (AWS::Cognito::UserPoolUserToGroupAttachment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html
-type AWSCognitoUserPoolUserToGroupAttachment struct {
-
-	// GroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html#cfn-cognito-userpoolusertogroupattachment-groupname
-	GroupName string `json:"GroupName,omitempty"`
-
-	// UserPoolId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html#cfn-cognito-userpoolusertogroupattachment-userpoolid
-	UserPoolId string `json:"UserPoolId,omitempty"`
-
-	// Username AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html#cfn-cognito-userpoolusertogroupattachment-username
-	Username string `json:"Username,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSCognitoUserPoolUserToGroupAttachment) AWSCloudFormationType() string {
-	return "AWS::Cognito::UserPoolUserToGroupAttachment"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSCognitoUserPoolUserToGroupAttachment) MarshalJSON() ([]byte, error) {
-	type Properties AWSCognitoUserPoolUserToGroupAttachment
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSCognitoUserPoolUserToGroupAttachment) UnmarshalJSON(b []byte) error {
-	type Properties AWSCognitoUserPoolUserToGroupAttachment
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSCognitoUserPoolUserToGroupAttachment(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSCognitoUserPoolUserToGroupAttachmentResources retrieves all AWSCognitoUserPoolUserToGroupAttachment items from an AWS CloudFormation template
-func (t *Template) GetAllAWSCognitoUserPoolUserToGroupAttachmentResources() map[string]AWSCognitoUserPoolUserToGroupAttachment {
-	results := map[string]AWSCognitoUserPoolUserToGroupAttachment{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSCognitoUserPoolUserToGroupAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::UserPoolUserToGroupAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoUserPoolUserToGroupAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSCognitoUserPoolUserToGroupAttachmentWithName retrieves all AWSCognitoUserPoolUserToGroupAttachment items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSCognitoUserPoolUserToGroupAttachmentWithName(name string) (AWSCognitoUserPoolUserToGroupAttachment, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSCognitoUserPoolUserToGroupAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Cognito::UserPoolUserToGroupAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSCognitoUserPoolUserToGroupAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSCognitoUserPoolUserToGroupAttachment{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configrule.go
deleted file mode 100644
index bf1208b84d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configrule.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSConfigConfigRule AWS CloudFormation Resource (AWS::Config::ConfigRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html
-type AWSConfigConfigRule struct {
-
-	// ConfigRuleName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html#cfn-config-configrule-configrulename
-	ConfigRuleName string `json:"ConfigRuleName,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html#cfn-config-configrule-description
-	Description string `json:"Description,omitempty"`
-
-	// InputParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html#cfn-config-configrule-inputparameters
-	InputParameters interface{} `json:"InputParameters,omitempty"`
-
-	// MaximumExecutionFrequency AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html#cfn-config-configrule-maximumexecutionfrequency
-	MaximumExecutionFrequency string `json:"MaximumExecutionFrequency,omitempty"`
-
-	// Scope AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html#cfn-config-configrule-scope
-	Scope *AWSConfigConfigRule_Scope `json:"Scope,omitempty"`
-
-	// Source AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html#cfn-config-configrule-source
-	Source *AWSConfigConfigRule_Source `json:"Source,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSConfigConfigRule) AWSCloudFormationType() string {
-	return "AWS::Config::ConfigRule"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSConfigConfigRule) MarshalJSON() ([]byte, error) {
-	type Properties AWSConfigConfigRule
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSConfigConfigRule) UnmarshalJSON(b []byte) error {
-	type Properties AWSConfigConfigRule
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSConfigConfigRule(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSConfigConfigRuleResources retrieves all AWSConfigConfigRule items from an AWS CloudFormation template
-func (t *Template) GetAllAWSConfigConfigRuleResources() map[string]AWSConfigConfigRule {
-	results := map[string]AWSConfigConfigRule{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSConfigConfigRule:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Config::ConfigRule" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSConfigConfigRule
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSConfigConfigRuleWithName retrieves all AWSConfigConfigRule items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSConfigConfigRuleWithName(name string) (AWSConfigConfigRule, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSConfigConfigRule:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Config::ConfigRule" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSConfigConfigRule
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSConfigConfigRule{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configrule_scope.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configrule_scope.go
deleted file mode 100644
index 733c6a69e9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configrule_scope.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSConfigConfigRule_Scope AWS CloudFormation Resource (AWS::Config::ConfigRule.Scope)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-scope.html
-type AWSConfigConfigRule_Scope struct {
-
-	// ComplianceResourceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-scope.html#cfn-config-configrule-scope-complianceresourceid
-	ComplianceResourceId string `json:"ComplianceResourceId,omitempty"`
-
-	// ComplianceResourceTypes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-scope.html#cfn-config-configrule-scope-complianceresourcetypes
-	ComplianceResourceTypes []string `json:"ComplianceResourceTypes,omitempty"`
-
-	// TagKey AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-scope.html#cfn-config-configrule-scope-tagkey
-	TagKey string `json:"TagKey,omitempty"`
-
-	// TagValue AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-scope.html#cfn-config-configrule-scope-tagvalue
-	TagValue string `json:"TagValue,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSConfigConfigRule_Scope) AWSCloudFormationType() string {
-	return "AWS::Config::ConfigRule.Scope"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configrule_source.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configrule_source.go
deleted file mode 100644
index 2d4d48938e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configrule_source.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSConfigConfigRule_Source AWS CloudFormation Resource (AWS::Config::ConfigRule.Source)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source.html
-type AWSConfigConfigRule_Source struct {
-
-	// Owner AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source.html#cfn-config-configrule-source-owner
-	Owner string `json:"Owner,omitempty"`
-
-	// SourceDetails AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source.html#cfn-config-configrule-source-sourcedetails
-	SourceDetails []AWSConfigConfigRule_SourceDetail `json:"SourceDetails,omitempty"`
-
-	// SourceIdentifier AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source.html#cfn-config-configrule-source-sourceidentifier
-	SourceIdentifier string `json:"SourceIdentifier,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSConfigConfigRule_Source) AWSCloudFormationType() string {
-	return "AWS::Config::ConfigRule.Source"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configrule_sourcedetail.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configrule_sourcedetail.go
deleted file mode 100644
index 84cb646434..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configrule_sourcedetail.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSConfigConfigRule_SourceDetail AWS CloudFormation Resource (AWS::Config::ConfigRule.SourceDetail)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source-sourcedetails.html
-type AWSConfigConfigRule_SourceDetail struct {
-
-	// EventSource AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source-sourcedetails.html#cfn-config-configrule-source-sourcedetail-eventsource
-	EventSource string `json:"EventSource,omitempty"`
-
-	// MaximumExecutionFrequency AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source-sourcedetails.html#cfn-config-configrule-sourcedetail-maximumexecutionfrequency
-	MaximumExecutionFrequency string `json:"MaximumExecutionFrequency,omitempty"`
-
-	// MessageType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source-sourcedetails.html#cfn-config-configrule-source-sourcedetail-messagetype
-	MessageType string `json:"MessageType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSConfigConfigRule_SourceDetail) AWSCloudFormationType() string {
-	return "AWS::Config::ConfigRule.SourceDetail"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configurationrecorder.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configurationrecorder.go
deleted file mode 100644
index 5c49de8ce0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configurationrecorder.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSConfigConfigurationRecorder AWS CloudFormation Resource (AWS::Config::ConfigurationRecorder)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationrecorder.html
-type AWSConfigConfigurationRecorder struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationrecorder.html#cfn-config-configurationrecorder-name
-	Name string `json:"Name,omitempty"`
-
-	// RecordingGroup AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationrecorder.html#cfn-config-configurationrecorder-recordinggroup
-	RecordingGroup *AWSConfigConfigurationRecorder_RecordingGroup `json:"RecordingGroup,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationrecorder.html#cfn-config-configurationrecorder-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSConfigConfigurationRecorder) AWSCloudFormationType() string {
-	return "AWS::Config::ConfigurationRecorder"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSConfigConfigurationRecorder) MarshalJSON() ([]byte, error) {
-	type Properties AWSConfigConfigurationRecorder
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSConfigConfigurationRecorder) UnmarshalJSON(b []byte) error {
-	type Properties AWSConfigConfigurationRecorder
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSConfigConfigurationRecorder(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSConfigConfigurationRecorderResources retrieves all AWSConfigConfigurationRecorder items from an AWS CloudFormation template
-func (t *Template) GetAllAWSConfigConfigurationRecorderResources() map[string]AWSConfigConfigurationRecorder {
-	results := map[string]AWSConfigConfigurationRecorder{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSConfigConfigurationRecorder:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Config::ConfigurationRecorder" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSConfigConfigurationRecorder
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSConfigConfigurationRecorderWithName retrieves all AWSConfigConfigurationRecorder items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSConfigConfigurationRecorderWithName(name string) (AWSConfigConfigurationRecorder, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSConfigConfigurationRecorder:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Config::ConfigurationRecorder" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSConfigConfigurationRecorder
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSConfigConfigurationRecorder{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configurationrecorder_recordinggroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configurationrecorder_recordinggroup.go
deleted file mode 100644
index f23d025b12..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-configurationrecorder_recordinggroup.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSConfigConfigurationRecorder_RecordingGroup AWS CloudFormation Resource (AWS::Config::ConfigurationRecorder.RecordingGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationrecorder-recordinggroup.html
-type AWSConfigConfigurationRecorder_RecordingGroup struct {
-
-	// AllSupported AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationrecorder-recordinggroup.html#cfn-config-configurationrecorder-recordinggroup-allsupported
-	AllSupported bool `json:"AllSupported,omitempty"`
-
-	// IncludeGlobalResourceTypes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationrecorder-recordinggroup.html#cfn-config-configurationrecorder-recordinggroup-includeglobalresourcetypes
-	IncludeGlobalResourceTypes bool `json:"IncludeGlobalResourceTypes,omitempty"`
-
-	// ResourceTypes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationrecorder-recordinggroup.html#cfn-config-configurationrecorder-recordinggroup-resourcetypes
-	ResourceTypes []string `json:"ResourceTypes,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSConfigConfigurationRecorder_RecordingGroup) AWSCloudFormationType() string {
-	return "AWS::Config::ConfigurationRecorder.RecordingGroup"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-deliverychannel.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-config-deliverychannel.go
deleted file mode 100644
index 06663baf1a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-deliverychannel.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSConfigDeliveryChannel AWS CloudFormation Resource (AWS::Config::DeliveryChannel)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html
-type AWSConfigDeliveryChannel struct {
-
-	// ConfigSnapshotDeliveryProperties AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html#cfn-config-deliverychannel-configsnapshotdeliveryproperties
-	ConfigSnapshotDeliveryProperties *AWSConfigDeliveryChannel_ConfigSnapshotDeliveryProperties `json:"ConfigSnapshotDeliveryProperties,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html#cfn-config-deliverychannel-name
-	Name string `json:"Name,omitempty"`
-
-	// S3BucketName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html#cfn-config-deliverychannel-s3bucketname
-	S3BucketName string `json:"S3BucketName,omitempty"`
-
-	// S3KeyPrefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html#cfn-config-deliverychannel-s3keyprefix
-	S3KeyPrefix string `json:"S3KeyPrefix,omitempty"`
-
-	// SnsTopicARN AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html#cfn-config-deliverychannel-snstopicarn
-	SnsTopicARN string `json:"SnsTopicARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSConfigDeliveryChannel) AWSCloudFormationType() string {
-	return "AWS::Config::DeliveryChannel"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSConfigDeliveryChannel) MarshalJSON() ([]byte, error) {
-	type Properties AWSConfigDeliveryChannel
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSConfigDeliveryChannel) UnmarshalJSON(b []byte) error {
-	type Properties AWSConfigDeliveryChannel
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSConfigDeliveryChannel(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSConfigDeliveryChannelResources retrieves all AWSConfigDeliveryChannel items from an AWS CloudFormation template
-func (t *Template) GetAllAWSConfigDeliveryChannelResources() map[string]AWSConfigDeliveryChannel {
-	results := map[string]AWSConfigDeliveryChannel{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSConfigDeliveryChannel:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Config::DeliveryChannel" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSConfigDeliveryChannel
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSConfigDeliveryChannelWithName retrieves all AWSConfigDeliveryChannel items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSConfigDeliveryChannelWithName(name string) (AWSConfigDeliveryChannel, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSConfigDeliveryChannel:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Config::DeliveryChannel" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSConfigDeliveryChannel
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSConfigDeliveryChannel{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-deliverychannel_configsnapshotdeliveryproperties.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-config-deliverychannel_configsnapshotdeliveryproperties.go
deleted file mode 100644
index 011c75e9c9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-config-deliverychannel_configsnapshotdeliveryproperties.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSConfigDeliveryChannel_ConfigSnapshotDeliveryProperties AWS CloudFormation Resource (AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-deliverychannel-configsnapshotdeliveryproperties.html
-type AWSConfigDeliveryChannel_ConfigSnapshotDeliveryProperties struct {
-
-	// DeliveryFrequency AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-deliverychannel-configsnapshotdeliveryproperties.html#cfn-config-deliverychannel-configsnapshotdeliveryproperties-deliveryfrequency
-	DeliveryFrequency string `json:"DeliveryFrequency,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSConfigDeliveryChannel_ConfigSnapshotDeliveryProperties) AWSCloudFormationType() string {
-	return "AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline.go
deleted file mode 100644
index fe31240dc3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDataPipelinePipeline AWS CloudFormation Resource (AWS::DataPipeline::Pipeline)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html
-type AWSDataPipelinePipeline struct {
-
-	// Activate AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-activate
-	Activate bool `json:"Activate,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-description
-	Description string `json:"Description,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-name
-	Name string `json:"Name,omitempty"`
-
-	// ParameterObjects AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-parameterobjects
-	ParameterObjects []AWSDataPipelinePipeline_ParameterObject `json:"ParameterObjects,omitempty"`
-
-	// ParameterValues AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-parametervalues
-	ParameterValues []AWSDataPipelinePipeline_ParameterValue `json:"ParameterValues,omitempty"`
-
-	// PipelineObjects AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-pipelineobjects
-	PipelineObjects []AWSDataPipelinePipeline_PipelineObject `json:"PipelineObjects,omitempty"`
-
-	// PipelineTags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-pipelinetags
-	PipelineTags []AWSDataPipelinePipeline_PipelineTag `json:"PipelineTags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDataPipelinePipeline) AWSCloudFormationType() string {
-	return "AWS::DataPipeline::Pipeline"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDataPipelinePipeline) MarshalJSON() ([]byte, error) {
-	type Properties AWSDataPipelinePipeline
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDataPipelinePipeline) UnmarshalJSON(b []byte) error {
-	type Properties AWSDataPipelinePipeline
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDataPipelinePipeline(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDataPipelinePipelineResources retrieves all AWSDataPipelinePipeline items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDataPipelinePipelineResources() map[string]AWSDataPipelinePipeline {
-	results := map[string]AWSDataPipelinePipeline{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDataPipelinePipeline:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DataPipeline::Pipeline" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDataPipelinePipeline
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDataPipelinePipelineWithName retrieves all AWSDataPipelinePipeline items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDataPipelinePipelineWithName(name string) (AWSDataPipelinePipeline, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDataPipelinePipeline:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DataPipeline::Pipeline" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDataPipelinePipeline
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDataPipelinePipeline{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_field.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_field.go
deleted file mode 100644
index 08cc3f6eb3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_field.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSDataPipelinePipeline_Field AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.Field)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects-fields.html
-type AWSDataPipelinePipeline_Field struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects-fields.html#cfn-datapipeline-pipeline-pipelineobjects-fields-key
-	Key string `json:"Key,omitempty"`
-
-	// RefValue AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects-fields.html#cfn-datapipeline-pipeline-pipelineobjects-fields-refvalue
-	RefValue string `json:"RefValue,omitempty"`
-
-	// StringValue AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects-fields.html#cfn-datapipeline-pipeline-pipelineobjects-fields-stringvalue
-	StringValue string `json:"StringValue,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDataPipelinePipeline_Field) AWSCloudFormationType() string {
-	return "AWS::DataPipeline::Pipeline.Field"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_parameterattribute.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_parameterattribute.go
deleted file mode 100644
index 2edc518f1b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_parameterattribute.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSDataPipelinePipeline_ParameterAttribute AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.ParameterAttribute)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parameterobjects-attributes.html
-type AWSDataPipelinePipeline_ParameterAttribute struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parameterobjects-attributes.html#cfn-datapipeline-pipeline-parameterobjects-attribtues-key
-	Key string `json:"Key,omitempty"`
-
-	// StringValue AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parameterobjects-attributes.html#cfn-datapipeline-pipeline-parameterobjects-attribtues-stringvalue
-	StringValue string `json:"StringValue,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDataPipelinePipeline_ParameterAttribute) AWSCloudFormationType() string {
-	return "AWS::DataPipeline::Pipeline.ParameterAttribute"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_parameterobject.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_parameterobject.go
deleted file mode 100644
index fcbdad4d0c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_parameterobject.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSDataPipelinePipeline_ParameterObject AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.ParameterObject)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parameterobjects.html
-type AWSDataPipelinePipeline_ParameterObject struct {
-
-	// Attributes AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parameterobjects.html#cfn-datapipeline-pipeline-parameterobjects-attributes
-	Attributes []AWSDataPipelinePipeline_ParameterAttribute `json:"Attributes,omitempty"`
-
-	// Id AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parameterobjects.html#cfn-datapipeline-pipeline-parameterobjects-id
-	Id string `json:"Id,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDataPipelinePipeline_ParameterObject) AWSCloudFormationType() string {
-	return "AWS::DataPipeline::Pipeline.ParameterObject"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_parametervalue.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_parametervalue.go
deleted file mode 100644
index ac71d3b7db..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_parametervalue.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSDataPipelinePipeline_ParameterValue AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.ParameterValue)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parametervalues.html
-type AWSDataPipelinePipeline_ParameterValue struct {
-
-	// Id AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parametervalues.html#cfn-datapipeline-pipeline-parametervalues-id
-	Id string `json:"Id,omitempty"`
-
-	// StringValue AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parametervalues.html#cfn-datapipeline-pipeline-parametervalues-stringvalue
-	StringValue string `json:"StringValue,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDataPipelinePipeline_ParameterValue) AWSCloudFormationType() string {
-	return "AWS::DataPipeline::Pipeline.ParameterValue"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_pipelineobject.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_pipelineobject.go
deleted file mode 100644
index 1087a4e7cf..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_pipelineobject.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSDataPipelinePipeline_PipelineObject AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.PipelineObject)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects.html
-type AWSDataPipelinePipeline_PipelineObject struct {
-
-	// Fields AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects.html#cfn-datapipeline-pipeline-pipelineobjects-fields
-	Fields []AWSDataPipelinePipeline_Field `json:"Fields,omitempty"`
-
-	// Id AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects.html#cfn-datapipeline-pipeline-pipelineobjects-id
-	Id string `json:"Id,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects.html#cfn-datapipeline-pipeline-pipelineobjects-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDataPipelinePipeline_PipelineObject) AWSCloudFormationType() string {
-	return "AWS::DataPipeline::Pipeline.PipelineObject"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_pipelinetag.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_pipelinetag.go
deleted file mode 100644
index 8c0b8a834c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-datapipeline-pipeline_pipelinetag.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSDataPipelinePipeline_PipelineTag AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.PipelineTag)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelinetags.html
-type AWSDataPipelinePipeline_PipelineTag struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelinetags.html#cfn-datapipeline-pipeline-pipelinetags-key
-	Key string `json:"Key,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelinetags.html#cfn-datapipeline-pipeline-pipelinetags-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDataPipelinePipeline_PipelineTag) AWSCloudFormationType() string {
-	return "AWS::DataPipeline::Pipeline.PipelineTag"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dax-cluster.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dax-cluster.go
deleted file mode 100644
index 239e677c86..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dax-cluster.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDAXCluster AWS CloudFormation Resource (AWS::DAX::Cluster)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html
-type AWSDAXCluster struct {
-
-	// AvailabilityZones AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-availabilityzones
-	AvailabilityZones []string `json:"AvailabilityZones,omitempty"`
-
-	// ClusterName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-clustername
-	ClusterName string `json:"ClusterName,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-description
-	Description string `json:"Description,omitempty"`
-
-	// IAMRoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-iamrolearn
-	IAMRoleARN string `json:"IAMRoleARN,omitempty"`
-
-	// NodeType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-nodetype
-	NodeType string `json:"NodeType,omitempty"`
-
-	// NotificationTopicARN AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-notificationtopicarn
-	NotificationTopicARN string `json:"NotificationTopicARN,omitempty"`
-
-	// ParameterGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-parametergroupname
-	ParameterGroupName string `json:"ParameterGroupName,omitempty"`
-
-	// PreferredMaintenanceWindow AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-preferredmaintenancewindow
-	PreferredMaintenanceWindow string `json:"PreferredMaintenanceWindow,omitempty"`
-
-	// ReplicationFactor AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-replicationfactor
-	ReplicationFactor int `json:"ReplicationFactor,omitempty"`
-
-	// SecurityGroupIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-securitygroupids
-	SecurityGroupIds []string `json:"SecurityGroupIds,omitempty"`
-
-	// SubnetGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-subnetgroupname
-	SubnetGroupName string `json:"SubnetGroupName,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-tags
-	Tags interface{} `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDAXCluster) AWSCloudFormationType() string {
-	return "AWS::DAX::Cluster"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDAXCluster) MarshalJSON() ([]byte, error) {
-	type Properties AWSDAXCluster
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDAXCluster) UnmarshalJSON(b []byte) error {
-	type Properties AWSDAXCluster
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDAXCluster(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDAXClusterResources retrieves all AWSDAXCluster items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDAXClusterResources() map[string]AWSDAXCluster {
-	results := map[string]AWSDAXCluster{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDAXCluster:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DAX::Cluster" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDAXCluster
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDAXClusterWithName retrieves all AWSDAXCluster items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDAXClusterWithName(name string) (AWSDAXCluster, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDAXCluster:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DAX::Cluster" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDAXCluster
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDAXCluster{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dax-parametergroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dax-parametergroup.go
deleted file mode 100644
index 5a47a7b014..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dax-parametergroup.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDAXParameterGroup AWS CloudFormation Resource (AWS::DAX::ParameterGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html
-type AWSDAXParameterGroup struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-description
-	Description string `json:"Description,omitempty"`
-
-	// ParameterGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parametergroupname
-	ParameterGroupName string `json:"ParameterGroupName,omitempty"`
-
-	// ParameterNameValues AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parameternamevalues
-	ParameterNameValues interface{} `json:"ParameterNameValues,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDAXParameterGroup) AWSCloudFormationType() string {
-	return "AWS::DAX::ParameterGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDAXParameterGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSDAXParameterGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDAXParameterGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSDAXParameterGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDAXParameterGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDAXParameterGroupResources retrieves all AWSDAXParameterGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDAXParameterGroupResources() map[string]AWSDAXParameterGroup {
-	results := map[string]AWSDAXParameterGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDAXParameterGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DAX::ParameterGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDAXParameterGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDAXParameterGroupWithName retrieves all AWSDAXParameterGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDAXParameterGroupWithName(name string) (AWSDAXParameterGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDAXParameterGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DAX::ParameterGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDAXParameterGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDAXParameterGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dax-subnetgroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dax-subnetgroup.go
deleted file mode 100644
index becc31461b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dax-subnetgroup.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDAXSubnetGroup AWS CloudFormation Resource (AWS::DAX::SubnetGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html
-type AWSDAXSubnetGroup struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-description
-	Description string `json:"Description,omitempty"`
-
-	// SubnetGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetgroupname
-	SubnetGroupName string `json:"SubnetGroupName,omitempty"`
-
-	// SubnetIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetids
-	SubnetIds []string `json:"SubnetIds,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDAXSubnetGroup) AWSCloudFormationType() string {
-	return "AWS::DAX::SubnetGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDAXSubnetGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSDAXSubnetGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDAXSubnetGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSDAXSubnetGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDAXSubnetGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDAXSubnetGroupResources retrieves all AWSDAXSubnetGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDAXSubnetGroupResources() map[string]AWSDAXSubnetGroup {
-	results := map[string]AWSDAXSubnetGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDAXSubnetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DAX::SubnetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDAXSubnetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDAXSubnetGroupWithName retrieves all AWSDAXSubnetGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDAXSubnetGroupWithName(name string) (AWSDAXSubnetGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDAXSubnetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DAX::SubnetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDAXSubnetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDAXSubnetGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-directoryservice-microsoftad.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-directoryservice-microsoftad.go
deleted file mode 100644
index 308cb7d378..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-directoryservice-microsoftad.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDirectoryServiceMicrosoftAD AWS CloudFormation Resource (AWS::DirectoryService::MicrosoftAD)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html
-type AWSDirectoryServiceMicrosoftAD struct {
-
-	// CreateAlias AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-createalias
-	CreateAlias bool `json:"CreateAlias,omitempty"`
-
-	// EnableSso AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-enablesso
-	EnableSso bool `json:"EnableSso,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-name
-	Name string `json:"Name,omitempty"`
-
-	// Password AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-password
-	Password string `json:"Password,omitempty"`
-
-	// ShortName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-shortname
-	ShortName string `json:"ShortName,omitempty"`
-
-	// VpcSettings AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-vpcsettings
-	VpcSettings *AWSDirectoryServiceMicrosoftAD_VpcSettings `json:"VpcSettings,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDirectoryServiceMicrosoftAD) AWSCloudFormationType() string {
-	return "AWS::DirectoryService::MicrosoftAD"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDirectoryServiceMicrosoftAD) MarshalJSON() ([]byte, error) {
-	type Properties AWSDirectoryServiceMicrosoftAD
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDirectoryServiceMicrosoftAD) UnmarshalJSON(b []byte) error {
-	type Properties AWSDirectoryServiceMicrosoftAD
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDirectoryServiceMicrosoftAD(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDirectoryServiceMicrosoftADResources retrieves all AWSDirectoryServiceMicrosoftAD items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDirectoryServiceMicrosoftADResources() map[string]AWSDirectoryServiceMicrosoftAD {
-	results := map[string]AWSDirectoryServiceMicrosoftAD{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDirectoryServiceMicrosoftAD:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DirectoryService::MicrosoftAD" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDirectoryServiceMicrosoftAD
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDirectoryServiceMicrosoftADWithName retrieves all AWSDirectoryServiceMicrosoftAD items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDirectoryServiceMicrosoftADWithName(name string) (AWSDirectoryServiceMicrosoftAD, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDirectoryServiceMicrosoftAD:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DirectoryService::MicrosoftAD" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDirectoryServiceMicrosoftAD
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDirectoryServiceMicrosoftAD{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-directoryservice-microsoftad_vpcsettings.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-directoryservice-microsoftad_vpcsettings.go
deleted file mode 100644
index 05b0760c5d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-directoryservice-microsoftad_vpcsettings.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSDirectoryServiceMicrosoftAD_VpcSettings AWS CloudFormation Resource (AWS::DirectoryService::MicrosoftAD.VpcSettings)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-microsoftad-vpcsettings.html
-type AWSDirectoryServiceMicrosoftAD_VpcSettings struct {
-
-	// SubnetIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-microsoftad-vpcsettings.html#cfn-directoryservice-microsoftad-vpcsettings-subnetids
-	SubnetIds []string `json:"SubnetIds,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-microsoftad-vpcsettings.html#cfn-directoryservice-microsoftad-vpcsettings-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDirectoryServiceMicrosoftAD_VpcSettings) AWSCloudFormationType() string {
-	return "AWS::DirectoryService::MicrosoftAD.VpcSettings"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-directoryservice-simplead.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-directoryservice-simplead.go
deleted file mode 100644
index 1f486fcfdb..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-directoryservice-simplead.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDirectoryServiceSimpleAD AWS CloudFormation Resource (AWS::DirectoryService::SimpleAD)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html
-type AWSDirectoryServiceSimpleAD struct {
-
-	// CreateAlias AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-createalias
-	CreateAlias bool `json:"CreateAlias,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-description
-	Description string `json:"Description,omitempty"`
-
-	// EnableSso AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-enablesso
-	EnableSso bool `json:"EnableSso,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-name
-	Name string `json:"Name,omitempty"`
-
-	// Password AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-password
-	Password string `json:"Password,omitempty"`
-
-	// ShortName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-shortname
-	ShortName string `json:"ShortName,omitempty"`
-
-	// Size AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-size
-	Size string `json:"Size,omitempty"`
-
-	// VpcSettings AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-vpcsettings
-	VpcSettings *AWSDirectoryServiceSimpleAD_VpcSettings `json:"VpcSettings,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDirectoryServiceSimpleAD) AWSCloudFormationType() string {
-	return "AWS::DirectoryService::SimpleAD"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDirectoryServiceSimpleAD) MarshalJSON() ([]byte, error) {
-	type Properties AWSDirectoryServiceSimpleAD
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDirectoryServiceSimpleAD) UnmarshalJSON(b []byte) error {
-	type Properties AWSDirectoryServiceSimpleAD
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDirectoryServiceSimpleAD(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDirectoryServiceSimpleADResources retrieves all AWSDirectoryServiceSimpleAD items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDirectoryServiceSimpleADResources() map[string]AWSDirectoryServiceSimpleAD {
-	results := map[string]AWSDirectoryServiceSimpleAD{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDirectoryServiceSimpleAD:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DirectoryService::SimpleAD" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDirectoryServiceSimpleAD
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDirectoryServiceSimpleADWithName retrieves all AWSDirectoryServiceSimpleAD items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDirectoryServiceSimpleADWithName(name string) (AWSDirectoryServiceSimpleAD, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDirectoryServiceSimpleAD:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DirectoryService::SimpleAD" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDirectoryServiceSimpleAD
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDirectoryServiceSimpleAD{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-directoryservice-simplead_vpcsettings.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-directoryservice-simplead_vpcsettings.go
deleted file mode 100644
index 3db230f671..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-directoryservice-simplead_vpcsettings.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSDirectoryServiceSimpleAD_VpcSettings AWS CloudFormation Resource (AWS::DirectoryService::SimpleAD.VpcSettings)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-simplead-vpcsettings.html
-type AWSDirectoryServiceSimpleAD_VpcSettings struct {
-
-	// SubnetIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-simplead-vpcsettings.html#cfn-directoryservice-simplead-vpcsettings-subnetids
-	SubnetIds []string `json:"SubnetIds,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-simplead-vpcsettings.html#cfn-directoryservice-simplead-vpcsettings-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDirectoryServiceSimpleAD_VpcSettings) AWSCloudFormationType() string {
-	return "AWS::DirectoryService::SimpleAD.VpcSettings"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-certificate.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-certificate.go
deleted file mode 100644
index 3268f45d75..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-certificate.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDMSCertificate AWS CloudFormation Resource (AWS::DMS::Certificate)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html
-type AWSDMSCertificate struct {
-
-	// CertificateIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificateidentifier
-	CertificateIdentifier string `json:"CertificateIdentifier,omitempty"`
-
-	// CertificatePem AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatepem
-	CertificatePem string `json:"CertificatePem,omitempty"`
-
-	// CertificateWallet AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatewallet
-	CertificateWallet string `json:"CertificateWallet,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDMSCertificate) AWSCloudFormationType() string {
-	return "AWS::DMS::Certificate"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDMSCertificate) MarshalJSON() ([]byte, error) {
-	type Properties AWSDMSCertificate
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDMSCertificate) UnmarshalJSON(b []byte) error {
-	type Properties AWSDMSCertificate
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDMSCertificate(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDMSCertificateResources retrieves all AWSDMSCertificate items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDMSCertificateResources() map[string]AWSDMSCertificate {
-	results := map[string]AWSDMSCertificate{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDMSCertificate:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DMS::Certificate" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDMSCertificate
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDMSCertificateWithName retrieves all AWSDMSCertificate items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDMSCertificateWithName(name string) (AWSDMSCertificate, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDMSCertificate:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DMS::Certificate" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDMSCertificate
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDMSCertificate{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-endpoint.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-endpoint.go
deleted file mode 100644
index 36b75d0c3d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-endpoint.go
+++ /dev/null
@@ -1,185 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDMSEndpoint AWS CloudFormation Resource (AWS::DMS::Endpoint)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html
-type AWSDMSEndpoint struct {
-
-	// CertificateArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-certificatearn
-	CertificateArn string `json:"CertificateArn,omitempty"`
-
-	// DatabaseName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-databasename
-	DatabaseName string `json:"DatabaseName,omitempty"`
-
-	// DynamoDbSettings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-dynamodbsettings
-	DynamoDbSettings *AWSDMSEndpoint_DynamoDbSettings `json:"DynamoDbSettings,omitempty"`
-
-	// EndpointIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointidentifier
-	EndpointIdentifier string `json:"EndpointIdentifier,omitempty"`
-
-	// EndpointType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointtype
-	EndpointType string `json:"EndpointType,omitempty"`
-
-	// EngineName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-enginename
-	EngineName string `json:"EngineName,omitempty"`
-
-	// ExtraConnectionAttributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-extraconnectionattributes
-	ExtraConnectionAttributes string `json:"ExtraConnectionAttributes,omitempty"`
-
-	// KmsKeyId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kmskeyid
-	KmsKeyId string `json:"KmsKeyId,omitempty"`
-
-	// MongoDbSettings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-mongodbsettings
-	MongoDbSettings *AWSDMSEndpoint_MongoDbSettings `json:"MongoDbSettings,omitempty"`
-
-	// Password AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-password
-	Password string `json:"Password,omitempty"`
-
-	// Port AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-port
-	Port int `json:"Port,omitempty"`
-
-	// S3Settings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-s3settings
-	S3Settings *AWSDMSEndpoint_S3Settings `json:"S3Settings,omitempty"`
-
-	// ServerName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-servername
-	ServerName string `json:"ServerName,omitempty"`
-
-	// SslMode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-sslmode
-	SslMode string `json:"SslMode,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// Username AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-username
-	Username string `json:"Username,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDMSEndpoint) AWSCloudFormationType() string {
-	return "AWS::DMS::Endpoint"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDMSEndpoint) MarshalJSON() ([]byte, error) {
-	type Properties AWSDMSEndpoint
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDMSEndpoint) UnmarshalJSON(b []byte) error {
-	type Properties AWSDMSEndpoint
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDMSEndpoint(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDMSEndpointResources retrieves all AWSDMSEndpoint items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDMSEndpointResources() map[string]AWSDMSEndpoint {
-	results := map[string]AWSDMSEndpoint{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDMSEndpoint:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DMS::Endpoint" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDMSEndpoint
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDMSEndpointWithName retrieves all AWSDMSEndpoint items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDMSEndpointWithName(name string) (AWSDMSEndpoint, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDMSEndpoint:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DMS::Endpoint" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDMSEndpoint
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDMSEndpoint{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-endpoint_dynamodbsettings.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-endpoint_dynamodbsettings.go
deleted file mode 100644
index a0381945a5..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-endpoint_dynamodbsettings.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSDMSEndpoint_DynamoDbSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.DynamoDbSettings)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-dynamodbsettings.html
-type AWSDMSEndpoint_DynamoDbSettings struct {
-
-	// ServiceAccessRoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-dynamodbsettings.html#cfn-dms-endpoint-dynamodbsettings-serviceaccessrolearn
-	ServiceAccessRoleArn string `json:"ServiceAccessRoleArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDMSEndpoint_DynamoDbSettings) AWSCloudFormationType() string {
-	return "AWS::DMS::Endpoint.DynamoDbSettings"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-endpoint_mongodbsettings.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-endpoint_mongodbsettings.go
deleted file mode 100644
index 7702c1d811..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-endpoint_mongodbsettings.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package cloudformation
-
-// AWSDMSEndpoint_MongoDbSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.MongoDbSettings)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html
-type AWSDMSEndpoint_MongoDbSettings struct {
-
-	// AuthMechanism AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-authmechanism
-	AuthMechanism string `json:"AuthMechanism,omitempty"`
-
-	// AuthSource AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-authsource
-	AuthSource string `json:"AuthSource,omitempty"`
-
-	// AuthType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-authtype
-	AuthType string `json:"AuthType,omitempty"`
-
-	// DatabaseName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-databasename
-	DatabaseName string `json:"DatabaseName,omitempty"`
-
-	// DocsToInvestigate AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-docstoinvestigate
-	DocsToInvestigate string `json:"DocsToInvestigate,omitempty"`
-
-	// ExtractDocId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-extractdocid
-	ExtractDocId string `json:"ExtractDocId,omitempty"`
-
-	// NestingLevel AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-nestinglevel
-	NestingLevel string `json:"NestingLevel,omitempty"`
-
-	// Password AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-password
-	Password string `json:"Password,omitempty"`
-
-	// Port AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-port
-	Port int `json:"Port,omitempty"`
-
-	// ServerName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-servername
-	ServerName string `json:"ServerName,omitempty"`
-
-	// Username AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-username
-	Username string `json:"Username,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDMSEndpoint_MongoDbSettings) AWSCloudFormationType() string {
-	return "AWS::DMS::Endpoint.MongoDbSettings"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-endpoint_s3settings.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-endpoint_s3settings.go
deleted file mode 100644
index a5e93b0394..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-endpoint_s3settings.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package cloudformation
-
-// AWSDMSEndpoint_S3Settings AWS CloudFormation Resource (AWS::DMS::Endpoint.S3Settings)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html
-type AWSDMSEndpoint_S3Settings struct {
-
-	// BucketFolder AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-bucketfolder
-	BucketFolder string `json:"BucketFolder,omitempty"`
-
-	// BucketName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-bucketname
-	BucketName string `json:"BucketName,omitempty"`
-
-	// CompressionType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-compressiontype
-	CompressionType string `json:"CompressionType,omitempty"`
-
-	// CsvDelimiter AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-csvdelimiter
-	CsvDelimiter string `json:"CsvDelimiter,omitempty"`
-
-	// CsvRowDelimiter AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-csvrowdelimiter
-	CsvRowDelimiter string `json:"CsvRowDelimiter,omitempty"`
-
-	// ExternalTableDefinition AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-externaltabledefinition
-	ExternalTableDefinition string `json:"ExternalTableDefinition,omitempty"`
-
-	// ServiceAccessRoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-serviceaccessrolearn
-	ServiceAccessRoleArn string `json:"ServiceAccessRoleArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDMSEndpoint_S3Settings) AWSCloudFormationType() string {
-	return "AWS::DMS::Endpoint.S3Settings"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-eventsubscription.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-eventsubscription.go
deleted file mode 100644
index 0d6ab95a53..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-eventsubscription.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDMSEventSubscription AWS CloudFormation Resource (AWS::DMS::EventSubscription)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html
-type AWSDMSEventSubscription struct {
-
-	// Enabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// EventCategories AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-eventcategories
-	EventCategories []string `json:"EventCategories,omitempty"`
-
-	// SnsTopicArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-snstopicarn
-	SnsTopicArn string `json:"SnsTopicArn,omitempty"`
-
-	// SourceIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourceids
-	SourceIds []string `json:"SourceIds,omitempty"`
-
-	// SourceType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourcetype
-	SourceType string `json:"SourceType,omitempty"`
-
-	// SubscriptionName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-subscriptionname
-	SubscriptionName string `json:"SubscriptionName,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDMSEventSubscription) AWSCloudFormationType() string {
-	return "AWS::DMS::EventSubscription"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDMSEventSubscription) MarshalJSON() ([]byte, error) {
-	type Properties AWSDMSEventSubscription
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDMSEventSubscription) UnmarshalJSON(b []byte) error {
-	type Properties AWSDMSEventSubscription
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDMSEventSubscription(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDMSEventSubscriptionResources retrieves all AWSDMSEventSubscription items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDMSEventSubscriptionResources() map[string]AWSDMSEventSubscription {
-	results := map[string]AWSDMSEventSubscription{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDMSEventSubscription:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DMS::EventSubscription" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDMSEventSubscription
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDMSEventSubscriptionWithName retrieves all AWSDMSEventSubscription items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDMSEventSubscriptionWithName(name string) (AWSDMSEventSubscription, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDMSEventSubscription:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DMS::EventSubscription" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDMSEventSubscription
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDMSEventSubscription{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-replicationinstance.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-replicationinstance.go
deleted file mode 100644
index 8ec13e44f4..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-replicationinstance.go
+++ /dev/null
@@ -1,175 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDMSReplicationInstance AWS CloudFormation Resource (AWS::DMS::ReplicationInstance)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html
-type AWSDMSReplicationInstance struct {
-
-	// AllocatedStorage AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allocatedstorage
-	AllocatedStorage int `json:"AllocatedStorage,omitempty"`
-
-	// AllowMajorVersionUpgrade AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allowmajorversionupgrade
-	AllowMajorVersionUpgrade bool `json:"AllowMajorVersionUpgrade,omitempty"`
-
-	// AutoMinorVersionUpgrade AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-autominorversionupgrade
-	AutoMinorVersionUpgrade bool `json:"AutoMinorVersionUpgrade,omitempty"`
-
-	// AvailabilityZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-availabilityzone
-	AvailabilityZone string `json:"AvailabilityZone,omitempty"`
-
-	// EngineVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-engineversion
-	EngineVersion string `json:"EngineVersion,omitempty"`
-
-	// KmsKeyId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-kmskeyid
-	KmsKeyId string `json:"KmsKeyId,omitempty"`
-
-	// MultiAZ AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-multiaz
-	MultiAZ bool `json:"MultiAZ,omitempty"`
-
-	// PreferredMaintenanceWindow AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-preferredmaintenancewindow
-	PreferredMaintenanceWindow string `json:"PreferredMaintenanceWindow,omitempty"`
-
-	// PubliclyAccessible AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-publiclyaccessible
-	PubliclyAccessible bool `json:"PubliclyAccessible,omitempty"`
-
-	// ReplicationInstanceClass AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceclass
-	ReplicationInstanceClass string `json:"ReplicationInstanceClass,omitempty"`
-
-	// ReplicationInstanceIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceidentifier
-	ReplicationInstanceIdentifier string `json:"ReplicationInstanceIdentifier,omitempty"`
-
-	// ReplicationSubnetGroupIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationsubnetgroupidentifier
-	ReplicationSubnetGroupIdentifier string `json:"ReplicationSubnetGroupIdentifier,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// VpcSecurityGroupIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-vpcsecuritygroupids
-	VpcSecurityGroupIds []string `json:"VpcSecurityGroupIds,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDMSReplicationInstance) AWSCloudFormationType() string {
-	return "AWS::DMS::ReplicationInstance"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDMSReplicationInstance) MarshalJSON() ([]byte, error) {
-	type Properties AWSDMSReplicationInstance
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDMSReplicationInstance) UnmarshalJSON(b []byte) error {
-	type Properties AWSDMSReplicationInstance
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDMSReplicationInstance(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDMSReplicationInstanceResources retrieves all AWSDMSReplicationInstance items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDMSReplicationInstanceResources() map[string]AWSDMSReplicationInstance {
-	results := map[string]AWSDMSReplicationInstance{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDMSReplicationInstance:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DMS::ReplicationInstance" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDMSReplicationInstance
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDMSReplicationInstanceWithName retrieves all AWSDMSReplicationInstance items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDMSReplicationInstanceWithName(name string) (AWSDMSReplicationInstance, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDMSReplicationInstance:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DMS::ReplicationInstance" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDMSReplicationInstance
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDMSReplicationInstance{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-replicationsubnetgroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-replicationsubnetgroup.go
deleted file mode 100644
index d6abfa3b6d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-replicationsubnetgroup.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDMSReplicationSubnetGroup AWS CloudFormation Resource (AWS::DMS::ReplicationSubnetGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html
-type AWSDMSReplicationSubnetGroup struct {
-
-	// ReplicationSubnetGroupDescription AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupdescription
-	ReplicationSubnetGroupDescription string `json:"ReplicationSubnetGroupDescription,omitempty"`
-
-	// ReplicationSubnetGroupIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupidentifier
-	ReplicationSubnetGroupIdentifier string `json:"ReplicationSubnetGroupIdentifier,omitempty"`
-
-	// SubnetIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-subnetids
-	SubnetIds []string `json:"SubnetIds,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDMSReplicationSubnetGroup) AWSCloudFormationType() string {
-	return "AWS::DMS::ReplicationSubnetGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDMSReplicationSubnetGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSDMSReplicationSubnetGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDMSReplicationSubnetGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSDMSReplicationSubnetGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDMSReplicationSubnetGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDMSReplicationSubnetGroupResources retrieves all AWSDMSReplicationSubnetGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDMSReplicationSubnetGroupResources() map[string]AWSDMSReplicationSubnetGroup {
-	results := map[string]AWSDMSReplicationSubnetGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDMSReplicationSubnetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DMS::ReplicationSubnetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDMSReplicationSubnetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDMSReplicationSubnetGroupWithName retrieves all AWSDMSReplicationSubnetGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDMSReplicationSubnetGroupWithName(name string) (AWSDMSReplicationSubnetGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDMSReplicationSubnetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DMS::ReplicationSubnetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDMSReplicationSubnetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDMSReplicationSubnetGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-replicationtask.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-replicationtask.go
deleted file mode 100644
index afdefcea59..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dms-replicationtask.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDMSReplicationTask AWS CloudFormation Resource (AWS::DMS::ReplicationTask)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html
-type AWSDMSReplicationTask struct {
-
-	// CdcStartTime AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-cdcstarttime
-	CdcStartTime float64 `json:"CdcStartTime,omitempty"`
-
-	// MigrationType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-migrationtype
-	MigrationType string `json:"MigrationType,omitempty"`
-
-	// ReplicationInstanceArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationinstancearn
-	ReplicationInstanceArn string `json:"ReplicationInstanceArn,omitempty"`
-
-	// ReplicationTaskIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtaskidentifier
-	ReplicationTaskIdentifier string `json:"ReplicationTaskIdentifier,omitempty"`
-
-	// ReplicationTaskSettings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtasksettings
-	ReplicationTaskSettings string `json:"ReplicationTaskSettings,omitempty"`
-
-	// SourceEndpointArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-sourceendpointarn
-	SourceEndpointArn string `json:"SourceEndpointArn,omitempty"`
-
-	// TableMappings AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tablemappings
-	TableMappings string `json:"TableMappings,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// TargetEndpointArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-targetendpointarn
-	TargetEndpointArn string `json:"TargetEndpointArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDMSReplicationTask) AWSCloudFormationType() string {
-	return "AWS::DMS::ReplicationTask"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDMSReplicationTask) MarshalJSON() ([]byte, error) {
-	type Properties AWSDMSReplicationTask
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDMSReplicationTask) UnmarshalJSON(b []byte) error {
-	type Properties AWSDMSReplicationTask
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDMSReplicationTask(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDMSReplicationTaskResources retrieves all AWSDMSReplicationTask items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDMSReplicationTaskResources() map[string]AWSDMSReplicationTask {
-	results := map[string]AWSDMSReplicationTask{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDMSReplicationTask:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DMS::ReplicationTask" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDMSReplicationTask
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDMSReplicationTaskWithName retrieves all AWSDMSReplicationTask items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDMSReplicationTaskWithName(name string) (AWSDMSReplicationTask, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDMSReplicationTask:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DMS::ReplicationTask" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDMSReplicationTask
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDMSReplicationTask{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table.go
deleted file mode 100644
index 70a20c3297..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSDynamoDBTable AWS CloudFormation Resource (AWS::DynamoDB::Table)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html
-type AWSDynamoDBTable struct {
-
-	// AttributeDefinitions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-attributedef
-	AttributeDefinitions []AWSDynamoDBTable_AttributeDefinition `json:"AttributeDefinitions,omitempty"`
-
-	// GlobalSecondaryIndexes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-gsi
-	GlobalSecondaryIndexes []AWSDynamoDBTable_GlobalSecondaryIndex `json:"GlobalSecondaryIndexes,omitempty"`
-
-	// KeySchema AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-keyschema
-	KeySchema []AWSDynamoDBTable_KeySchema `json:"KeySchema,omitempty"`
-
-	// LocalSecondaryIndexes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-lsi
-	LocalSecondaryIndexes []AWSDynamoDBTable_LocalSecondaryIndex `json:"LocalSecondaryIndexes,omitempty"`
-
-	// ProvisionedThroughput AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-provisionedthroughput
-	ProvisionedThroughput *AWSDynamoDBTable_ProvisionedThroughput `json:"ProvisionedThroughput,omitempty"`
-
-	// StreamSpecification AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-streamspecification
-	StreamSpecification *AWSDynamoDBTable_StreamSpecification `json:"StreamSpecification,omitempty"`
-
-	// TableName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-tablename
-	TableName string `json:"TableName,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// TimeToLiveSpecification AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-timetolivespecification
-	TimeToLiveSpecification *AWSDynamoDBTable_TimeToLiveSpecification `json:"TimeToLiveSpecification,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDynamoDBTable) AWSCloudFormationType() string {
-	return "AWS::DynamoDB::Table"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSDynamoDBTable) MarshalJSON() ([]byte, error) {
-	type Properties AWSDynamoDBTable
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSDynamoDBTable) UnmarshalJSON(b []byte) error {
-	type Properties AWSDynamoDBTable
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSDynamoDBTable(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSDynamoDBTableResources retrieves all AWSDynamoDBTable items from an AWS CloudFormation template
-func (t *Template) GetAllAWSDynamoDBTableResources() map[string]AWSDynamoDBTable {
-	results := map[string]AWSDynamoDBTable{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSDynamoDBTable:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DynamoDB::Table" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDynamoDBTable
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSDynamoDBTableWithName retrieves all AWSDynamoDBTable items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSDynamoDBTableWithName(name string) (AWSDynamoDBTable, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSDynamoDBTable:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::DynamoDB::Table" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSDynamoDBTable
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSDynamoDBTable{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_attributedefinition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_attributedefinition.go
deleted file mode 100644
index 2b91b05238..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_attributedefinition.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSDynamoDBTable_AttributeDefinition AWS CloudFormation Resource (AWS::DynamoDB::Table.AttributeDefinition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-attributedef.html
-type AWSDynamoDBTable_AttributeDefinition struct {
-
-	// AttributeName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-attributedef.html#cfn-dynamodb-attributedef-attributename
-	AttributeName string `json:"AttributeName,omitempty"`
-
-	// AttributeType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-attributedef.html#cfn-dynamodb-attributedef-attributename-attributetype
-	AttributeType string `json:"AttributeType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDynamoDBTable_AttributeDefinition) AWSCloudFormationType() string {
-	return "AWS::DynamoDB::Table.AttributeDefinition"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_globalsecondaryindex.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_globalsecondaryindex.go
deleted file mode 100644
index 6ee3a0ccf9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_globalsecondaryindex.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSDynamoDBTable_GlobalSecondaryIndex AWS CloudFormation Resource (AWS::DynamoDB::Table.GlobalSecondaryIndex)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-gsi.html
-type AWSDynamoDBTable_GlobalSecondaryIndex struct {
-
-	// IndexName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-gsi.html#cfn-dynamodb-gsi-indexname
-	IndexName string `json:"IndexName,omitempty"`
-
-	// KeySchema AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-gsi.html#cfn-dynamodb-gsi-keyschema
-	KeySchema []AWSDynamoDBTable_KeySchema `json:"KeySchema,omitempty"`
-
-	// Projection AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-gsi.html#cfn-dynamodb-gsi-projection
-	Projection *AWSDynamoDBTable_Projection `json:"Projection,omitempty"`
-
-	// ProvisionedThroughput AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-gsi.html#cfn-dynamodb-gsi-provisionedthroughput
-	ProvisionedThroughput *AWSDynamoDBTable_ProvisionedThroughput `json:"ProvisionedThroughput,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDynamoDBTable_GlobalSecondaryIndex) AWSCloudFormationType() string {
-	return "AWS::DynamoDB::Table.GlobalSecondaryIndex"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_keyschema.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_keyschema.go
deleted file mode 100644
index 495b8b2ff8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_keyschema.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSDynamoDBTable_KeySchema AWS CloudFormation Resource (AWS::DynamoDB::Table.KeySchema)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-keyschema.html
-type AWSDynamoDBTable_KeySchema struct {
-
-	// AttributeName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-keyschema.html#aws-properties-dynamodb-keyschema-attributename
-	AttributeName string `json:"AttributeName,omitempty"`
-
-	// KeyType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-keyschema.html#aws-properties-dynamodb-keyschema-keytype
-	KeyType string `json:"KeyType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDynamoDBTable_KeySchema) AWSCloudFormationType() string {
-	return "AWS::DynamoDB::Table.KeySchema"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_localsecondaryindex.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_localsecondaryindex.go
deleted file mode 100644
index 4b1411f3d0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_localsecondaryindex.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSDynamoDBTable_LocalSecondaryIndex AWS CloudFormation Resource (AWS::DynamoDB::Table.LocalSecondaryIndex)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-lsi.html
-type AWSDynamoDBTable_LocalSecondaryIndex struct {
-
-	// IndexName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-lsi.html#cfn-dynamodb-lsi-indexname
-	IndexName string `json:"IndexName,omitempty"`
-
-	// KeySchema AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-lsi.html#cfn-dynamodb-lsi-keyschema
-	KeySchema []AWSDynamoDBTable_KeySchema `json:"KeySchema,omitempty"`
-
-	// Projection AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-lsi.html#cfn-dynamodb-lsi-projection
-	Projection *AWSDynamoDBTable_Projection `json:"Projection,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDynamoDBTable_LocalSecondaryIndex) AWSCloudFormationType() string {
-	return "AWS::DynamoDB::Table.LocalSecondaryIndex"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_projection.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_projection.go
deleted file mode 100644
index ae2ce9f308..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_projection.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSDynamoDBTable_Projection AWS CloudFormation Resource (AWS::DynamoDB::Table.Projection)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-projectionobject.html
-type AWSDynamoDBTable_Projection struct {
-
-	// NonKeyAttributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-projectionobject.html#cfn-dynamodb-projectionobj-nonkeyatt
-	NonKeyAttributes []string `json:"NonKeyAttributes,omitempty"`
-
-	// ProjectionType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-projectionobject.html#cfn-dynamodb-projectionobj-projtype
-	ProjectionType string `json:"ProjectionType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDynamoDBTable_Projection) AWSCloudFormationType() string {
-	return "AWS::DynamoDB::Table.Projection"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_provisionedthroughput.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_provisionedthroughput.go
deleted file mode 100644
index 244b147210..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_provisionedthroughput.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSDynamoDBTable_ProvisionedThroughput AWS CloudFormation Resource (AWS::DynamoDB::Table.ProvisionedThroughput)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html
-type AWSDynamoDBTable_ProvisionedThroughput struct {
-
-	// ReadCapacityUnits AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html#cfn-dynamodb-provisionedthroughput-readcapacityunits
-	ReadCapacityUnits int64 `json:"ReadCapacityUnits,omitempty"`
-
-	// WriteCapacityUnits AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html#cfn-dynamodb-provisionedthroughput-writecapacityunits
-	WriteCapacityUnits int64 `json:"WriteCapacityUnits,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDynamoDBTable_ProvisionedThroughput) AWSCloudFormationType() string {
-	return "AWS::DynamoDB::Table.ProvisionedThroughput"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_streamspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_streamspecification.go
deleted file mode 100644
index 67755dbcb1..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_streamspecification.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSDynamoDBTable_StreamSpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.StreamSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-streamspecification.html
-type AWSDynamoDBTable_StreamSpecification struct {
-
-	// StreamViewType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-streamspecification.html#cfn-dynamodb-streamspecification-streamviewtype
-	StreamViewType string `json:"StreamViewType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDynamoDBTable_StreamSpecification) AWSCloudFormationType() string {
-	return "AWS::DynamoDB::Table.StreamSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_timetolivespecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_timetolivespecification.go
deleted file mode 100644
index 1bfef1d459..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-dynamodb-table_timetolivespecification.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSDynamoDBTable_TimeToLiveSpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.TimeToLiveSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-timetolivespecification.html
-type AWSDynamoDBTable_TimeToLiveSpecification struct {
-
-	// AttributeName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-timetolivespecification.html#cfn-dynamodb-timetolivespecification-attributename
-	AttributeName string `json:"AttributeName,omitempty"`
-
-	// Enabled AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-timetolivespecification.html#cfn-dynamodb-timetolivespecification-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSDynamoDBTable_TimeToLiveSpecification) AWSCloudFormationType() string {
-	return "AWS::DynamoDB::Table.TimeToLiveSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-customergateway.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-customergateway.go
deleted file mode 100644
index e6087c9789..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-customergateway.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2CustomerGateway AWS CloudFormation Resource (AWS::EC2::CustomerGateway)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customer-gateway.html
-type AWSEC2CustomerGateway struct {
-
-	// BgpAsn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customer-gateway.html#cfn-ec2-customergateway-bgpasn
-	BgpAsn int `json:"BgpAsn,omitempty"`
-
-	// IpAddress AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customer-gateway.html#cfn-ec2-customergateway-ipaddress
-	IpAddress string `json:"IpAddress,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customer-gateway.html#cfn-ec2-customergateway-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customer-gateway.html#cfn-ec2-customergateway-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2CustomerGateway) AWSCloudFormationType() string {
-	return "AWS::EC2::CustomerGateway"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2CustomerGateway) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2CustomerGateway
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2CustomerGateway) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2CustomerGateway
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2CustomerGateway(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2CustomerGatewayResources retrieves all AWSEC2CustomerGateway items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2CustomerGatewayResources() map[string]AWSEC2CustomerGateway {
-	results := map[string]AWSEC2CustomerGateway{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2CustomerGateway:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::CustomerGateway" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2CustomerGateway
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2CustomerGatewayWithName retrieves all AWSEC2CustomerGateway items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2CustomerGatewayWithName(name string) (AWSEC2CustomerGateway, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2CustomerGateway:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::CustomerGateway" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2CustomerGateway
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2CustomerGateway{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-dhcpoptions.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-dhcpoptions.go
deleted file mode 100644
index 2e2f5dc144..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-dhcpoptions.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2DHCPOptions AWS CloudFormation Resource (AWS::EC2::DHCPOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcp-options.html
-type AWSEC2DHCPOptions struct {
-
-	// DomainName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcp-options.html#cfn-ec2-dhcpoptions-domainname
-	DomainName string `json:"DomainName,omitempty"`
-
-	// DomainNameServers AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcp-options.html#cfn-ec2-dhcpoptions-domainnameservers
-	DomainNameServers []string `json:"DomainNameServers,omitempty"`
-
-	// NetbiosNameServers AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcp-options.html#cfn-ec2-dhcpoptions-netbiosnameservers
-	NetbiosNameServers []string `json:"NetbiosNameServers,omitempty"`
-
-	// NetbiosNodeType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcp-options.html#cfn-ec2-dhcpoptions-netbiosnodetype
-	NetbiosNodeType int `json:"NetbiosNodeType,omitempty"`
-
-	// NtpServers AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcp-options.html#cfn-ec2-dhcpoptions-ntpservers
-	NtpServers []string `json:"NtpServers,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcp-options.html#cfn-ec2-dhcpoptions-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2DHCPOptions) AWSCloudFormationType() string {
-	return "AWS::EC2::DHCPOptions"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2DHCPOptions) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2DHCPOptions
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2DHCPOptions) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2DHCPOptions
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2DHCPOptions(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2DHCPOptionsResources retrieves all AWSEC2DHCPOptions items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2DHCPOptionsResources() map[string]AWSEC2DHCPOptions {
-	results := map[string]AWSEC2DHCPOptions{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2DHCPOptions:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::DHCPOptions" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2DHCPOptions
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2DHCPOptionsWithName retrieves all AWSEC2DHCPOptions items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2DHCPOptionsWithName(name string) (AWSEC2DHCPOptions, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2DHCPOptions:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::DHCPOptions" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2DHCPOptions
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2DHCPOptions{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-egressonlyinternetgateway.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-egressonlyinternetgateway.go
deleted file mode 100644
index d397159ce5..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-egressonlyinternetgateway.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2EgressOnlyInternetGateway AWS CloudFormation Resource (AWS::EC2::EgressOnlyInternetGateway)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-egressonlyinternetgateway.html
-type AWSEC2EgressOnlyInternetGateway struct {
-
-	// VpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-egressonlyinternetgateway.html#cfn-ec2-egressonlyinternetgateway-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2EgressOnlyInternetGateway) AWSCloudFormationType() string {
-	return "AWS::EC2::EgressOnlyInternetGateway"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2EgressOnlyInternetGateway) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2EgressOnlyInternetGateway
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2EgressOnlyInternetGateway) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2EgressOnlyInternetGateway
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2EgressOnlyInternetGateway(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2EgressOnlyInternetGatewayResources retrieves all AWSEC2EgressOnlyInternetGateway items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2EgressOnlyInternetGatewayResources() map[string]AWSEC2EgressOnlyInternetGateway {
-	results := map[string]AWSEC2EgressOnlyInternetGateway{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2EgressOnlyInternetGateway:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::EgressOnlyInternetGateway" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2EgressOnlyInternetGateway
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2EgressOnlyInternetGatewayWithName retrieves all AWSEC2EgressOnlyInternetGateway items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2EgressOnlyInternetGatewayWithName(name string) (AWSEC2EgressOnlyInternetGateway, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2EgressOnlyInternetGateway:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::EgressOnlyInternetGateway" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2EgressOnlyInternetGateway
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2EgressOnlyInternetGateway{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-eip.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-eip.go
deleted file mode 100644
index 2c19499663..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-eip.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2EIP AWS CloudFormation Resource (AWS::EC2::EIP)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html
-type AWSEC2EIP struct {
-
-	// Domain AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-domain
-	Domain string `json:"Domain,omitempty"`
-
-	// InstanceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-instanceid
-	InstanceId string `json:"InstanceId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2EIP) AWSCloudFormationType() string {
-	return "AWS::EC2::EIP"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2EIP) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2EIP
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2EIP) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2EIP
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2EIP(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2EIPResources retrieves all AWSEC2EIP items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2EIPResources() map[string]AWSEC2EIP {
-	results := map[string]AWSEC2EIP{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2EIP:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::EIP" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2EIP
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2EIPWithName retrieves all AWSEC2EIP items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2EIPWithName(name string) (AWSEC2EIP, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2EIP:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::EIP" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2EIP
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2EIP{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-eipassociation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-eipassociation.go
deleted file mode 100644
index 66e77ce592..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-eipassociation.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2EIPAssociation AWS CloudFormation Resource (AWS::EC2::EIPAssociation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip-association.html
-type AWSEC2EIPAssociation struct {
-
-	// AllocationId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip-association.html#cfn-ec2-eipassociation-allocationid
-	AllocationId string `json:"AllocationId,omitempty"`
-
-	// EIP AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip-association.html#cfn-ec2-eipassociation-eip
-	EIP string `json:"EIP,omitempty"`
-
-	// InstanceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip-association.html#cfn-ec2-eipassociation-instanceid
-	InstanceId string `json:"InstanceId,omitempty"`
-
-	// NetworkInterfaceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip-association.html#cfn-ec2-eipassociation-networkinterfaceid
-	NetworkInterfaceId string `json:"NetworkInterfaceId,omitempty"`
-
-	// PrivateIpAddress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip-association.html#cfn-ec2-eipassociation-PrivateIpAddress
-	PrivateIpAddress string `json:"PrivateIpAddress,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2EIPAssociation) AWSCloudFormationType() string {
-	return "AWS::EC2::EIPAssociation"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2EIPAssociation) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2EIPAssociation
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2EIPAssociation) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2EIPAssociation
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2EIPAssociation(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2EIPAssociationResources retrieves all AWSEC2EIPAssociation items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2EIPAssociationResources() map[string]AWSEC2EIPAssociation {
-	results := map[string]AWSEC2EIPAssociation{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2EIPAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::EIPAssociation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2EIPAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2EIPAssociationWithName retrieves all AWSEC2EIPAssociation items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2EIPAssociationWithName(name string) (AWSEC2EIPAssociation, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2EIPAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::EIPAssociation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2EIPAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2EIPAssociation{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-flowlog.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-flowlog.go
deleted file mode 100644
index 65dfe8acd8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-flowlog.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2FlowLog AWS CloudFormation Resource (AWS::EC2::FlowLog)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html
-type AWSEC2FlowLog struct {
-
-	// DeliverLogsPermissionArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-deliverlogspermissionarn
-	DeliverLogsPermissionArn string `json:"DeliverLogsPermissionArn,omitempty"`
-
-	// LogGroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-loggroupname
-	LogGroupName string `json:"LogGroupName,omitempty"`
-
-	// ResourceId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-resourceid
-	ResourceId string `json:"ResourceId,omitempty"`
-
-	// ResourceType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-resourcetype
-	ResourceType string `json:"ResourceType,omitempty"`
-
-	// TrafficType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-traffictype
-	TrafficType string `json:"TrafficType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2FlowLog) AWSCloudFormationType() string {
-	return "AWS::EC2::FlowLog"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2FlowLog) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2FlowLog
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2FlowLog) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2FlowLog
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2FlowLog(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2FlowLogResources retrieves all AWSEC2FlowLog items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2FlowLogResources() map[string]AWSEC2FlowLog {
-	results := map[string]AWSEC2FlowLog{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2FlowLog:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::FlowLog" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2FlowLog
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2FlowLogWithName retrieves all AWSEC2FlowLog items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2FlowLogWithName(name string) (AWSEC2FlowLog, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2FlowLog:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::FlowLog" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2FlowLog
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2FlowLog{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-host.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-host.go
deleted file mode 100644
index 08f7f87ff0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-host.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2Host AWS CloudFormation Resource (AWS::EC2::Host)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-host.html
-type AWSEC2Host struct {
-
-	// AutoPlacement AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-host.html#cfn-ec2-host-autoplacement
-	AutoPlacement string `json:"AutoPlacement,omitempty"`
-
-	// AvailabilityZone AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-host.html#cfn-ec2-host-availabilityzone
-	AvailabilityZone string `json:"AvailabilityZone,omitempty"`
-
-	// InstanceType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-host.html#cfn-ec2-host-instancetype
-	InstanceType string `json:"InstanceType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Host) AWSCloudFormationType() string {
-	return "AWS::EC2::Host"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2Host) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2Host
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2Host) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2Host
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2Host(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2HostResources retrieves all AWSEC2Host items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2HostResources() map[string]AWSEC2Host {
-	results := map[string]AWSEC2Host{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2Host:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::Host" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2Host
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2HostWithName retrieves all AWSEC2Host items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2HostWithName(name string) (AWSEC2Host, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2Host:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::Host" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2Host
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2Host{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance.go
deleted file mode 100644
index 9282233224..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance.go
+++ /dev/null
@@ -1,255 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2Instance AWS CloudFormation Resource (AWS::EC2::Instance)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html
-type AWSEC2Instance struct {
-
-	// AdditionalInfo AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-additionalinfo
-	AdditionalInfo string `json:"AdditionalInfo,omitempty"`
-
-	// Affinity AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-affinity
-	Affinity string `json:"Affinity,omitempty"`
-
-	// AvailabilityZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-availabilityzone
-	AvailabilityZone string `json:"AvailabilityZone,omitempty"`
-
-	// BlockDeviceMappings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-blockdevicemappings
-	BlockDeviceMappings []AWSEC2Instance_BlockDeviceMapping `json:"BlockDeviceMappings,omitempty"`
-
-	// DisableApiTermination AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-disableapitermination
-	DisableApiTermination bool `json:"DisableApiTermination,omitempty"`
-
-	// EbsOptimized AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-ebsoptimized
-	EbsOptimized bool `json:"EbsOptimized,omitempty"`
-
-	// ElasticGpuSpecifications AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-elasticgpuspecifications
-	ElasticGpuSpecifications []AWSEC2Instance_ElasticGpuSpecification `json:"ElasticGpuSpecifications,omitempty"`
-
-	// HostId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-hostid
-	HostId string `json:"HostId,omitempty"`
-
-	// IamInstanceProfile AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-iaminstanceprofile
-	IamInstanceProfile string `json:"IamInstanceProfile,omitempty"`
-
-	// ImageId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-imageid
-	ImageId string `json:"ImageId,omitempty"`
-
-	// InstanceInitiatedShutdownBehavior AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-instanceinitiatedshutdownbehavior
-	InstanceInitiatedShutdownBehavior string `json:"InstanceInitiatedShutdownBehavior,omitempty"`
-
-	// InstanceType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-instancetype
-	InstanceType string `json:"InstanceType,omitempty"`
-
-	// Ipv6AddressCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-ipv6addresscount
-	Ipv6AddressCount int `json:"Ipv6AddressCount,omitempty"`
-
-	// Ipv6Addresses AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-ipv6addresses
-	Ipv6Addresses []AWSEC2Instance_InstanceIpv6Address `json:"Ipv6Addresses,omitempty"`
-
-	// KernelId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-kernelid
-	KernelId string `json:"KernelId,omitempty"`
-
-	// KeyName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-keyname
-	KeyName string `json:"KeyName,omitempty"`
-
-	// Monitoring AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-monitoring
-	Monitoring bool `json:"Monitoring,omitempty"`
-
-	// NetworkInterfaces AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-networkinterfaces
-	NetworkInterfaces []AWSEC2Instance_NetworkInterface `json:"NetworkInterfaces,omitempty"`
-
-	// PlacementGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-placementgroupname
-	PlacementGroupName string `json:"PlacementGroupName,omitempty"`
-
-	// PrivateIpAddress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-privateipaddress
-	PrivateIpAddress string `json:"PrivateIpAddress,omitempty"`
-
-	// RamdiskId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-ramdiskid
-	RamdiskId string `json:"RamdiskId,omitempty"`
-
-	// SecurityGroupIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-securitygroupids
-	SecurityGroupIds []string `json:"SecurityGroupIds,omitempty"`
-
-	// SecurityGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-securitygroups
-	SecurityGroups []string `json:"SecurityGroups,omitempty"`
-
-	// SourceDestCheck AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-sourcedestcheck
-	SourceDestCheck bool `json:"SourceDestCheck,omitempty"`
-
-	// SsmAssociations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-ssmassociations
-	SsmAssociations []AWSEC2Instance_SsmAssociation `json:"SsmAssociations,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// Tenancy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-tenancy
-	Tenancy string `json:"Tenancy,omitempty"`
-
-	// UserData AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-userdata
-	UserData string `json:"UserData,omitempty"`
-
-	// Volumes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-volumes
-	Volumes []AWSEC2Instance_Volume `json:"Volumes,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Instance) AWSCloudFormationType() string {
-	return "AWS::EC2::Instance"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2Instance) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2Instance
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2Instance) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2Instance
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2Instance(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2InstanceResources retrieves all AWSEC2Instance items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2InstanceResources() map[string]AWSEC2Instance {
-	results := map[string]AWSEC2Instance{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2Instance:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::Instance" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2Instance
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2InstanceWithName retrieves all AWSEC2Instance items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2InstanceWithName(name string) (AWSEC2Instance, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2Instance:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::Instance" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2Instance
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2Instance{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_associationparameter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_associationparameter.go
deleted file mode 100644
index 0af8b10922..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_associationparameter.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEC2Instance_AssociationParameter AWS CloudFormation Resource (AWS::EC2::Instance.AssociationParameter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-ssmassociations-associationparameters.html
-type AWSEC2Instance_AssociationParameter struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-ssmassociations-associationparameters.html#cfn-ec2-instance-ssmassociations-associationparameters-key
-	Key string `json:"Key,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-ssmassociations-associationparameters.html#cfn-ec2-instance-ssmassociations-associationparameters-value
-	Value []string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Instance_AssociationParameter) AWSCloudFormationType() string {
-	return "AWS::EC2::Instance.AssociationParameter"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_blockdevicemapping.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_blockdevicemapping.go
deleted file mode 100644
index a2e727a4ad..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_blockdevicemapping.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSEC2Instance_BlockDeviceMapping AWS CloudFormation Resource (AWS::EC2::Instance.BlockDeviceMapping)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-mapping.html
-type AWSEC2Instance_BlockDeviceMapping struct {
-
-	// DeviceName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-mapping.html#cfn-ec2-blockdev-mapping-devicename
-	DeviceName string `json:"DeviceName,omitempty"`
-
-	// Ebs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-mapping.html#cfn-ec2-blockdev-mapping-ebs
-	Ebs *AWSEC2Instance_Ebs `json:"Ebs,omitempty"`
-
-	// NoDevice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-mapping.html#cfn-ec2-blockdev-mapping-nodevice
-	NoDevice *AWSEC2Instance_NoDevice `json:"NoDevice,omitempty"`
-
-	// VirtualName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-mapping.html#cfn-ec2-blockdev-mapping-virtualname
-	VirtualName string `json:"VirtualName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Instance_BlockDeviceMapping) AWSCloudFormationType() string {
-	return "AWS::EC2::Instance.BlockDeviceMapping"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_ebs.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_ebs.go
deleted file mode 100644
index f2e7e9abd7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_ebs.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSEC2Instance_Ebs AWS CloudFormation Resource (AWS::EC2::Instance.Ebs)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html
-type AWSEC2Instance_Ebs struct {
-
-	// DeleteOnTermination AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-deleteontermination
-	DeleteOnTermination bool `json:"DeleteOnTermination,omitempty"`
-
-	// Encrypted AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-encrypted
-	Encrypted bool `json:"Encrypted,omitempty"`
-
-	// Iops AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-iops
-	Iops int `json:"Iops,omitempty"`
-
-	// SnapshotId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-snapshotid
-	SnapshotId string `json:"SnapshotId,omitempty"`
-
-	// VolumeSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-volumesize
-	VolumeSize int `json:"VolumeSize,omitempty"`
-
-	// VolumeType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-volumetype
-	VolumeType string `json:"VolumeType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Instance_Ebs) AWSCloudFormationType() string {
-	return "AWS::EC2::Instance.Ebs"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_elasticgpuspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_elasticgpuspecification.go
deleted file mode 100644
index 893a48cd0e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_elasticgpuspecification.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEC2Instance_ElasticGpuSpecification AWS CloudFormation Resource (AWS::EC2::Instance.ElasticGpuSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-elasticgpuspecification.html
-type AWSEC2Instance_ElasticGpuSpecification struct {
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-elasticgpuspecification.html#cfn-ec2-instance-elasticgpuspecification-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Instance_ElasticGpuSpecification) AWSCloudFormationType() string {
-	return "AWS::EC2::Instance.ElasticGpuSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_instanceipv6address.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_instanceipv6address.go
deleted file mode 100644
index 9540847143..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_instanceipv6address.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEC2Instance_InstanceIpv6Address AWS CloudFormation Resource (AWS::EC2::Instance.InstanceIpv6Address)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-instanceipv6address.html
-type AWSEC2Instance_InstanceIpv6Address struct {
-
-	// Ipv6Address AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-instanceipv6address.html#cfn-ec2-instance-instanceipv6address-ipv6address
-	Ipv6Address string `json:"Ipv6Address,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Instance_InstanceIpv6Address) AWSCloudFormationType() string {
-	return "AWS::EC2::Instance.InstanceIpv6Address"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_networkinterface.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_networkinterface.go
deleted file mode 100644
index 0ebfc6968e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_networkinterface.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package cloudformation
-
-// AWSEC2Instance_NetworkInterface AWS CloudFormation Resource (AWS::EC2::Instance.NetworkInterface)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html
-type AWSEC2Instance_NetworkInterface struct {
-
-	// AssociatePublicIpAddress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-associatepubip
-	AssociatePublicIpAddress bool `json:"AssociatePublicIpAddress,omitempty"`
-
-	// DeleteOnTermination AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-delete
-	DeleteOnTermination bool `json:"DeleteOnTermination,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-description
-	Description string `json:"Description,omitempty"`
-
-	// DeviceIndex AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-deviceindex
-	DeviceIndex string `json:"DeviceIndex,omitempty"`
-
-	// GroupSet AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-groupset
-	GroupSet []string `json:"GroupSet,omitempty"`
-
-	// Ipv6AddressCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#cfn-ec2-instance-networkinterface-ipv6addresscount
-	Ipv6AddressCount int `json:"Ipv6AddressCount,omitempty"`
-
-	// Ipv6Addresses AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#cfn-ec2-instance-networkinterface-ipv6addresses
-	Ipv6Addresses []AWSEC2Instance_InstanceIpv6Address `json:"Ipv6Addresses,omitempty"`
-
-	// NetworkInterfaceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-network-iface
-	NetworkInterfaceId string `json:"NetworkInterfaceId,omitempty"`
-
-	// PrivateIpAddress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-privateipaddress
-	PrivateIpAddress string `json:"PrivateIpAddress,omitempty"`
-
-	// PrivateIpAddresses AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-privateipaddresses
-	PrivateIpAddresses []AWSEC2Instance_PrivateIpAddressSpecification `json:"PrivateIpAddresses,omitempty"`
-
-	// SecondaryPrivateIpAddressCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-secondprivateip
-	SecondaryPrivateIpAddressCount int `json:"SecondaryPrivateIpAddressCount,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Instance_NetworkInterface) AWSCloudFormationType() string {
-	return "AWS::EC2::Instance.NetworkInterface"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_nodevice.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_nodevice.go
deleted file mode 100644
index 83e8a00b0c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_nodevice.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package cloudformation
-
-// AWSEC2Instance_NoDevice AWS CloudFormation Resource (AWS::EC2::Instance.NoDevice)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-nodevice.html
-type AWSEC2Instance_NoDevice struct {
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Instance_NoDevice) AWSCloudFormationType() string {
-	return "AWS::EC2::Instance.NoDevice"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_privateipaddressspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_privateipaddressspecification.go
deleted file mode 100644
index 60e9f3e16e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_privateipaddressspecification.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEC2Instance_PrivateIpAddressSpecification AWS CloudFormation Resource (AWS::EC2::Instance.PrivateIpAddressSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-interface-privateipspec.html
-type AWSEC2Instance_PrivateIpAddressSpecification struct {
-
-	// Primary AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-interface-privateipspec.html#cfn-ec2-networkinterface-privateipspecification-primary
-	Primary bool `json:"Primary,omitempty"`
-
-	// PrivateIpAddress AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-interface-privateipspec.html#cfn-ec2-networkinterface-privateipspecification-privateipaddress
-	PrivateIpAddress string `json:"PrivateIpAddress,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Instance_PrivateIpAddressSpecification) AWSCloudFormationType() string {
-	return "AWS::EC2::Instance.PrivateIpAddressSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_ssmassociation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_ssmassociation.go
deleted file mode 100644
index 4dc82484a1..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_ssmassociation.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEC2Instance_SsmAssociation AWS CloudFormation Resource (AWS::EC2::Instance.SsmAssociation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-ssmassociations.html
-type AWSEC2Instance_SsmAssociation struct {
-
-	// AssociationParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-ssmassociations.html#cfn-ec2-instance-ssmassociations-associationparameters
-	AssociationParameters []AWSEC2Instance_AssociationParameter `json:"AssociationParameters,omitempty"`
-
-	// DocumentName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-ssmassociations.html#cfn-ec2-instance-ssmassociations-documentname
-	DocumentName string `json:"DocumentName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Instance_SsmAssociation) AWSCloudFormationType() string {
-	return "AWS::EC2::Instance.SsmAssociation"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_volume.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_volume.go
deleted file mode 100644
index ea5a399b08..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-instance_volume.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEC2Instance_Volume AWS CloudFormation Resource (AWS::EC2::Instance.Volume)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-mount-point.html
-type AWSEC2Instance_Volume struct {
-
-	// Device AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-mount-point.html#cfn-ec2-mountpoint-device
-	Device string `json:"Device,omitempty"`
-
-	// VolumeId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-mount-point.html#cfn-ec2-mountpoint-volumeid
-	VolumeId string `json:"VolumeId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Instance_Volume) AWSCloudFormationType() string {
-	return "AWS::EC2::Instance.Volume"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-internetgateway.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-internetgateway.go
deleted file mode 100644
index ac083042b0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-internetgateway.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2InternetGateway AWS CloudFormation Resource (AWS::EC2::InternetGateway)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-internetgateway.html
-type AWSEC2InternetGateway struct {
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-internetgateway.html#cfn-ec2-internetgateway-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2InternetGateway) AWSCloudFormationType() string {
-	return "AWS::EC2::InternetGateway"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2InternetGateway) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2InternetGateway
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2InternetGateway) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2InternetGateway
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2InternetGateway(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2InternetGatewayResources retrieves all AWSEC2InternetGateway items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2InternetGatewayResources() map[string]AWSEC2InternetGateway {
-	results := map[string]AWSEC2InternetGateway{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2InternetGateway:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::InternetGateway" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2InternetGateway
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2InternetGatewayWithName retrieves all AWSEC2InternetGateway items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2InternetGatewayWithName(name string) (AWSEC2InternetGateway, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2InternetGateway:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::InternetGateway" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2InternetGateway
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2InternetGateway{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-natgateway.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-natgateway.go
deleted file mode 100644
index b416b519e3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-natgateway.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2NatGateway AWS CloudFormation Resource (AWS::EC2::NatGateway)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-natgateway.html
-type AWSEC2NatGateway struct {
-
-	// AllocationId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-natgateway.html#cfn-ec2-natgateway-allocationid
-	AllocationId string `json:"AllocationId,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-natgateway.html#cfn-ec2-natgateway-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-natgateway.html#cfn-ec2-natgateway-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2NatGateway) AWSCloudFormationType() string {
-	return "AWS::EC2::NatGateway"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2NatGateway) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2NatGateway
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2NatGateway) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2NatGateway
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2NatGateway(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2NatGatewayResources retrieves all AWSEC2NatGateway items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2NatGatewayResources() map[string]AWSEC2NatGateway {
-	results := map[string]AWSEC2NatGateway{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2NatGateway:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::NatGateway" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2NatGateway
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2NatGatewayWithName retrieves all AWSEC2NatGateway items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2NatGatewayWithName(name string) (AWSEC2NatGateway, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2NatGateway:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::NatGateway" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2NatGateway
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2NatGateway{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkacl.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkacl.go
deleted file mode 100644
index 9b3bdf0c71..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkacl.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2NetworkAcl AWS CloudFormation Resource (AWS::EC2::NetworkAcl)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl.html
-type AWSEC2NetworkAcl struct {
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl.html#cfn-ec2-networkacl-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl.html#cfn-ec2-networkacl-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2NetworkAcl) AWSCloudFormationType() string {
-	return "AWS::EC2::NetworkAcl"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2NetworkAcl) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2NetworkAcl
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2NetworkAcl) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2NetworkAcl
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2NetworkAcl(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2NetworkAclResources retrieves all AWSEC2NetworkAcl items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2NetworkAclResources() map[string]AWSEC2NetworkAcl {
-	results := map[string]AWSEC2NetworkAcl{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2NetworkAcl:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::NetworkAcl" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2NetworkAcl
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2NetworkAclWithName retrieves all AWSEC2NetworkAcl items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2NetworkAclWithName(name string) (AWSEC2NetworkAcl, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2NetworkAcl:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::NetworkAcl" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2NetworkAcl
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2NetworkAcl{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkaclentry.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkaclentry.go
deleted file mode 100644
index 2170e60607..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkaclentry.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2NetworkAclEntry AWS CloudFormation Resource (AWS::EC2::NetworkAclEntry)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html
-type AWSEC2NetworkAclEntry struct {
-
-	// CidrBlock AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html#cfn-ec2-networkaclentry-cidrblock
-	CidrBlock string `json:"CidrBlock,omitempty"`
-
-	// Egress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html#cfn-ec2-networkaclentry-egress
-	Egress bool `json:"Egress,omitempty"`
-
-	// Icmp AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html#cfn-ec2-networkaclentry-icmp
-	Icmp *AWSEC2NetworkAclEntry_Icmp `json:"Icmp,omitempty"`
-
-	// Ipv6CidrBlock AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html#cfn-ec2-networkaclentry-ipv6cidrblock
-	Ipv6CidrBlock string `json:"Ipv6CidrBlock,omitempty"`
-
-	// NetworkAclId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html#cfn-ec2-networkaclentry-networkaclid
-	NetworkAclId string `json:"NetworkAclId,omitempty"`
-
-	// PortRange AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html#cfn-ec2-networkaclentry-portrange
-	PortRange *AWSEC2NetworkAclEntry_PortRange `json:"PortRange,omitempty"`
-
-	// Protocol AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html#cfn-ec2-networkaclentry-protocol
-	Protocol int `json:"Protocol,omitempty"`
-
-	// RuleAction AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html#cfn-ec2-networkaclentry-ruleaction
-	RuleAction string `json:"RuleAction,omitempty"`
-
-	// RuleNumber AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html#cfn-ec2-networkaclentry-rulenumber
-	RuleNumber int `json:"RuleNumber,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2NetworkAclEntry) AWSCloudFormationType() string {
-	return "AWS::EC2::NetworkAclEntry"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2NetworkAclEntry) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2NetworkAclEntry
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2NetworkAclEntry) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2NetworkAclEntry
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2NetworkAclEntry(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2NetworkAclEntryResources retrieves all AWSEC2NetworkAclEntry items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2NetworkAclEntryResources() map[string]AWSEC2NetworkAclEntry {
-	results := map[string]AWSEC2NetworkAclEntry{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2NetworkAclEntry:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::NetworkAclEntry" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2NetworkAclEntry
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2NetworkAclEntryWithName retrieves all AWSEC2NetworkAclEntry items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2NetworkAclEntryWithName(name string) (AWSEC2NetworkAclEntry, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2NetworkAclEntry:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::NetworkAclEntry" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2NetworkAclEntry
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2NetworkAclEntry{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkaclentry_icmp.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkaclentry_icmp.go
deleted file mode 100644
index 99e386f7bf..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkaclentry_icmp.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEC2NetworkAclEntry_Icmp AWS CloudFormation Resource (AWS::EC2::NetworkAclEntry.Icmp)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkaclentry-icmp.html
-type AWSEC2NetworkAclEntry_Icmp struct {
-
-	// Code AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkaclentry-icmp.html#cfn-ec2-networkaclentry-icmp-code
-	Code int `json:"Code,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkaclentry-icmp.html#cfn-ec2-networkaclentry-icmp-type
-	Type int `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2NetworkAclEntry_Icmp) AWSCloudFormationType() string {
-	return "AWS::EC2::NetworkAclEntry.Icmp"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkaclentry_portrange.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkaclentry_portrange.go
deleted file mode 100644
index ec5f33247d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkaclentry_portrange.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEC2NetworkAclEntry_PortRange AWS CloudFormation Resource (AWS::EC2::NetworkAclEntry.PortRange)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkaclentry-portrange.html
-type AWSEC2NetworkAclEntry_PortRange struct {
-
-	// From AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkaclentry-portrange.html#cfn-ec2-networkaclentry-portrange-from
-	From int `json:"From,omitempty"`
-
-	// To AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkaclentry-portrange.html#cfn-ec2-networkaclentry-portrange-to
-	To int `json:"To,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2NetworkAclEntry_PortRange) AWSCloudFormationType() string {
-	return "AWS::EC2::NetworkAclEntry.PortRange"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterface.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterface.go
deleted file mode 100644
index fa0b03d5d8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterface.go
+++ /dev/null
@@ -1,160 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2NetworkInterface AWS CloudFormation Resource (AWS::EC2::NetworkInterface)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html
-type AWSEC2NetworkInterface struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html#cfn-awsec2networkinterface-description
-	Description string `json:"Description,omitempty"`
-
-	// GroupSet AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html#cfn-awsec2networkinterface-groupset
-	GroupSet []string `json:"GroupSet,omitempty"`
-
-	// InterfaceType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html#cfn-ec2-networkinterface-interfacetype
-	InterfaceType string `json:"InterfaceType,omitempty"`
-
-	// Ipv6AddressCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html#cfn-ec2-networkinterface-ipv6addresscount
-	Ipv6AddressCount int `json:"Ipv6AddressCount,omitempty"`
-
-	// Ipv6Addresses AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html#cfn-ec2-networkinterface-ipv6addresses
-	Ipv6Addresses *AWSEC2NetworkInterface_InstanceIpv6Address `json:"Ipv6Addresses,omitempty"`
-
-	// PrivateIpAddress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html#cfn-awsec2networkinterface-privateipaddress
-	PrivateIpAddress string `json:"PrivateIpAddress,omitempty"`
-
-	// PrivateIpAddresses AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html#cfn-awsec2networkinterface-privateipaddresses
-	PrivateIpAddresses []AWSEC2NetworkInterface_PrivateIpAddressSpecification `json:"PrivateIpAddresses,omitempty"`
-
-	// SecondaryPrivateIpAddressCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html#cfn-awsec2networkinterface-secondaryprivateipcount
-	SecondaryPrivateIpAddressCount int `json:"SecondaryPrivateIpAddressCount,omitempty"`
-
-	// SourceDestCheck AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html#cfn-awsec2networkinterface-sourcedestcheck
-	SourceDestCheck bool `json:"SourceDestCheck,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html#cfn-awsec2networkinterface-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface.html#cfn-awsec2networkinterface-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2NetworkInterface) AWSCloudFormationType() string {
-	return "AWS::EC2::NetworkInterface"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2NetworkInterface) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2NetworkInterface
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2NetworkInterface) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2NetworkInterface
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2NetworkInterface(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2NetworkInterfaceResources retrieves all AWSEC2NetworkInterface items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2NetworkInterfaceResources() map[string]AWSEC2NetworkInterface {
-	results := map[string]AWSEC2NetworkInterface{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2NetworkInterface:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::NetworkInterface" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2NetworkInterface
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2NetworkInterfaceWithName retrieves all AWSEC2NetworkInterface items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2NetworkInterfaceWithName(name string) (AWSEC2NetworkInterface, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2NetworkInterface:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::NetworkInterface" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2NetworkInterface
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2NetworkInterface{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterface_instanceipv6address.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterface_instanceipv6address.go
deleted file mode 100644
index 1d7c07da09..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterface_instanceipv6address.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEC2NetworkInterface_InstanceIpv6Address AWS CloudFormation Resource (AWS::EC2::NetworkInterface.InstanceIpv6Address)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinterface-instanceipv6address.html
-type AWSEC2NetworkInterface_InstanceIpv6Address struct {
-
-	// Ipv6Address AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinterface-instanceipv6address.html#cfn-ec2-networkinterface-instanceipv6address-ipv6address
-	Ipv6Address string `json:"Ipv6Address,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2NetworkInterface_InstanceIpv6Address) AWSCloudFormationType() string {
-	return "AWS::EC2::NetworkInterface.InstanceIpv6Address"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterface_privateipaddressspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterface_privateipaddressspecification.go
deleted file mode 100644
index ae9d2f451f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterface_privateipaddressspecification.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEC2NetworkInterface_PrivateIpAddressSpecification AWS CloudFormation Resource (AWS::EC2::NetworkInterface.PrivateIpAddressSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-interface-privateipspec.html
-type AWSEC2NetworkInterface_PrivateIpAddressSpecification struct {
-
-	// Primary AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-interface-privateipspec.html#cfn-ec2-networkinterface-privateipspecification-primary
-	Primary bool `json:"Primary,omitempty"`
-
-	// PrivateIpAddress AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-interface-privateipspec.html#cfn-ec2-networkinterface-privateipspecification-privateipaddress
-	PrivateIpAddress string `json:"PrivateIpAddress,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2NetworkInterface_PrivateIpAddressSpecification) AWSCloudFormationType() string {
-	return "AWS::EC2::NetworkInterface.PrivateIpAddressSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterfaceattachment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterfaceattachment.go
deleted file mode 100644
index 9ded9d8b66..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterfaceattachment.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2NetworkInterfaceAttachment AWS CloudFormation Resource (AWS::EC2::NetworkInterfaceAttachment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface-attachment.html
-type AWSEC2NetworkInterfaceAttachment struct {
-
-	// DeleteOnTermination AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface-attachment.html#cfn-ec2-network-interface-attachment-deleteonterm
-	DeleteOnTermination bool `json:"DeleteOnTermination,omitempty"`
-
-	// DeviceIndex AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface-attachment.html#cfn-ec2-network-interface-attachment-deviceindex
-	DeviceIndex string `json:"DeviceIndex,omitempty"`
-
-	// InstanceId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface-attachment.html#cfn-ec2-network-interface-attachment-instanceid
-	InstanceId string `json:"InstanceId,omitempty"`
-
-	// NetworkInterfaceId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface-attachment.html#cfn-ec2-network-interface-attachment-networkinterfaceid
-	NetworkInterfaceId string `json:"NetworkInterfaceId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2NetworkInterfaceAttachment) AWSCloudFormationType() string {
-	return "AWS::EC2::NetworkInterfaceAttachment"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2NetworkInterfaceAttachment) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2NetworkInterfaceAttachment
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2NetworkInterfaceAttachment) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2NetworkInterfaceAttachment
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2NetworkInterfaceAttachment(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2NetworkInterfaceAttachmentResources retrieves all AWSEC2NetworkInterfaceAttachment items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2NetworkInterfaceAttachmentResources() map[string]AWSEC2NetworkInterfaceAttachment {
-	results := map[string]AWSEC2NetworkInterfaceAttachment{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2NetworkInterfaceAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::NetworkInterfaceAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2NetworkInterfaceAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2NetworkInterfaceAttachmentWithName retrieves all AWSEC2NetworkInterfaceAttachment items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2NetworkInterfaceAttachmentWithName(name string) (AWSEC2NetworkInterfaceAttachment, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2NetworkInterfaceAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::NetworkInterfaceAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2NetworkInterfaceAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2NetworkInterfaceAttachment{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterfacepermission.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterfacepermission.go
deleted file mode 100644
index a04fa1efac..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-networkinterfacepermission.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2NetworkInterfacePermission AWS CloudFormation Resource (AWS::EC2::NetworkInterfacePermission)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterfacepermission.html
-type AWSEC2NetworkInterfacePermission struct {
-
-	// AwsAccountId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterfacepermission.html#cfn-ec2-networkinterfacepermission-awsaccountid
-	AwsAccountId string `json:"AwsAccountId,omitempty"`
-
-	// NetworkInterfaceId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterfacepermission.html#cfn-ec2-networkinterfacepermission-networkinterfaceid
-	NetworkInterfaceId string `json:"NetworkInterfaceId,omitempty"`
-
-	// Permission AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterfacepermission.html#cfn-ec2-networkinterfacepermission-permission
-	Permission string `json:"Permission,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2NetworkInterfacePermission) AWSCloudFormationType() string {
-	return "AWS::EC2::NetworkInterfacePermission"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2NetworkInterfacePermission) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2NetworkInterfacePermission
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2NetworkInterfacePermission) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2NetworkInterfacePermission
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2NetworkInterfacePermission(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2NetworkInterfacePermissionResources retrieves all AWSEC2NetworkInterfacePermission items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2NetworkInterfacePermissionResources() map[string]AWSEC2NetworkInterfacePermission {
-	results := map[string]AWSEC2NetworkInterfacePermission{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2NetworkInterfacePermission:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::NetworkInterfacePermission" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2NetworkInterfacePermission
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2NetworkInterfacePermissionWithName retrieves all AWSEC2NetworkInterfacePermission items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2NetworkInterfacePermissionWithName(name string) (AWSEC2NetworkInterfacePermission, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2NetworkInterfacePermission:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::NetworkInterfacePermission" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2NetworkInterfacePermission
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2NetworkInterfacePermission{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-placementgroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-placementgroup.go
deleted file mode 100644
index 1c5144d7a2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-placementgroup.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2PlacementGroup AWS CloudFormation Resource (AWS::EC2::PlacementGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-placementgroup.html
-type AWSEC2PlacementGroup struct {
-
-	// Strategy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-placementgroup.html#cfn-ec2-placementgroup-strategy
-	Strategy string `json:"Strategy,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2PlacementGroup) AWSCloudFormationType() string {
-	return "AWS::EC2::PlacementGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2PlacementGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2PlacementGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2PlacementGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2PlacementGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2PlacementGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2PlacementGroupResources retrieves all AWSEC2PlacementGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2PlacementGroupResources() map[string]AWSEC2PlacementGroup {
-	results := map[string]AWSEC2PlacementGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2PlacementGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::PlacementGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2PlacementGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2PlacementGroupWithName retrieves all AWSEC2PlacementGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2PlacementGroupWithName(name string) (AWSEC2PlacementGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2PlacementGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::PlacementGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2PlacementGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2PlacementGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-route.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-route.go
deleted file mode 100644
index 20ea56f44a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-route.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2Route AWS CloudFormation Resource (AWS::EC2::Route)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
-type AWSEC2Route struct {
-
-	// DestinationCidrBlock AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-destinationcidrblock
-	DestinationCidrBlock string `json:"DestinationCidrBlock,omitempty"`
-
-	// DestinationIpv6CidrBlock AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-destinationipv6cidrblock
-	DestinationIpv6CidrBlock string `json:"DestinationIpv6CidrBlock,omitempty"`
-
-	// EgressOnlyInternetGatewayId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-egressonlyinternetgatewayid
-	EgressOnlyInternetGatewayId string `json:"EgressOnlyInternetGatewayId,omitempty"`
-
-	// GatewayId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-gatewayid
-	GatewayId string `json:"GatewayId,omitempty"`
-
-	// InstanceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-instanceid
-	InstanceId string `json:"InstanceId,omitempty"`
-
-	// NatGatewayId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-natgatewayid
-	NatGatewayId string `json:"NatGatewayId,omitempty"`
-
-	// NetworkInterfaceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-networkinterfaceid
-	NetworkInterfaceId string `json:"NetworkInterfaceId,omitempty"`
-
-	// RouteTableId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-routetableid
-	RouteTableId string `json:"RouteTableId,omitempty"`
-
-	// VpcPeeringConnectionId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-vpcpeeringconnectionid
-	VpcPeeringConnectionId string `json:"VpcPeeringConnectionId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Route) AWSCloudFormationType() string {
-	return "AWS::EC2::Route"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2Route) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2Route
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2Route) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2Route
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2Route(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2RouteResources retrieves all AWSEC2Route items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2RouteResources() map[string]AWSEC2Route {
-	results := map[string]AWSEC2Route{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2Route:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::Route" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2Route
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2RouteWithName retrieves all AWSEC2Route items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2RouteWithName(name string) (AWSEC2Route, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2Route:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::Route" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2Route
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2Route{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-routetable.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-routetable.go
deleted file mode 100644
index 0631257de8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-routetable.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2RouteTable AWS CloudFormation Resource (AWS::EC2::RouteTable)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html
-type AWSEC2RouteTable struct {
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html#cfn-ec2-routetable-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route-table.html#cfn-ec2-routetable-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2RouteTable) AWSCloudFormationType() string {
-	return "AWS::EC2::RouteTable"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2RouteTable) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2RouteTable
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2RouteTable) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2RouteTable
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2RouteTable(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2RouteTableResources retrieves all AWSEC2RouteTable items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2RouteTableResources() map[string]AWSEC2RouteTable {
-	results := map[string]AWSEC2RouteTable{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2RouteTable:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::RouteTable" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2RouteTable
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2RouteTableWithName retrieves all AWSEC2RouteTable items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2RouteTableWithName(name string) (AWSEC2RouteTable, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2RouteTable:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::RouteTable" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2RouteTable
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2RouteTable{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroup.go
deleted file mode 100644
index 882da21a4d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroup.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2SecurityGroup AWS CloudFormation Resource (AWS::EC2::SecurityGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html
-type AWSEC2SecurityGroup struct {
-
-	// GroupDescription AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2-securitygroup-groupdescription
-	GroupDescription string `json:"GroupDescription,omitempty"`
-
-	// GroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2-securitygroup-groupname
-	GroupName string `json:"GroupName,omitempty"`
-
-	// SecurityGroupEgress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2-securitygroup-securitygroupegress
-	SecurityGroupEgress []AWSEC2SecurityGroup_Egress `json:"SecurityGroupEgress,omitempty"`
-
-	// SecurityGroupIngress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2-securitygroup-securitygroupingress
-	SecurityGroupIngress []AWSEC2SecurityGroup_Ingress `json:"SecurityGroupIngress,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2-securitygroup-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2-securitygroup-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SecurityGroup) AWSCloudFormationType() string {
-	return "AWS::EC2::SecurityGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2SecurityGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2SecurityGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2SecurityGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2SecurityGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2SecurityGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2SecurityGroupResources retrieves all AWSEC2SecurityGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2SecurityGroupResources() map[string]AWSEC2SecurityGroup {
-	results := map[string]AWSEC2SecurityGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2SecurityGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SecurityGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SecurityGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2SecurityGroupWithName retrieves all AWSEC2SecurityGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2SecurityGroupWithName(name string) (AWSEC2SecurityGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2SecurityGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SecurityGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SecurityGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2SecurityGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroup_egress.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroup_egress.go
deleted file mode 100644
index 1a30ab439d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroup_egress.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package cloudformation
-
-// AWSEC2SecurityGroup_Egress AWS CloudFormation Resource (AWS::EC2::SecurityGroup.Egress)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html
-type AWSEC2SecurityGroup_Egress struct {
-
-	// CidrIp AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-cidrip
-	CidrIp string `json:"CidrIp,omitempty"`
-
-	// CidrIpv6 AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-cidripv6
-	CidrIpv6 string `json:"CidrIpv6,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-description
-	Description string `json:"Description,omitempty"`
-
-	// DestinationPrefixListId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-destinationprefixlistid
-	DestinationPrefixListId string `json:"DestinationPrefixListId,omitempty"`
-
-	// DestinationSecurityGroupId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-destsecgroupid
-	DestinationSecurityGroupId string `json:"DestinationSecurityGroupId,omitempty"`
-
-	// FromPort AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-fromport
-	FromPort int `json:"FromPort,omitempty"`
-
-	// IpProtocol AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-ipprotocol
-	IpProtocol string `json:"IpProtocol,omitempty"`
-
-	// ToPort AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-toport
-	ToPort int `json:"ToPort,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SecurityGroup_Egress) AWSCloudFormationType() string {
-	return "AWS::EC2::SecurityGroup.Egress"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroup_ingress.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroup_ingress.go
deleted file mode 100644
index f6d2c2ca04..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroup_ingress.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package cloudformation
-
-// AWSEC2SecurityGroup_Ingress AWS CloudFormation Resource (AWS::EC2::SecurityGroup.Ingress)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html
-type AWSEC2SecurityGroup_Ingress struct {
-
-	// CidrIp AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-cidrip
-	CidrIp string `json:"CidrIp,omitempty"`
-
-	// CidrIpv6 AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-cidripv6
-	CidrIpv6 string `json:"CidrIpv6,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-description
-	Description string `json:"Description,omitempty"`
-
-	// FromPort AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-fromport
-	FromPort int `json:"FromPort,omitempty"`
-
-	// IpProtocol AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-ipprotocol
-	IpProtocol string `json:"IpProtocol,omitempty"`
-
-	// SourceSecurityGroupId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-sourcesecuritygroupid
-	SourceSecurityGroupId string `json:"SourceSecurityGroupId,omitempty"`
-
-	// SourceSecurityGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-sourcesecuritygroupname
-	SourceSecurityGroupName string `json:"SourceSecurityGroupName,omitempty"`
-
-	// SourceSecurityGroupOwnerId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-sourcesecuritygroupownerid
-	SourceSecurityGroupOwnerId string `json:"SourceSecurityGroupOwnerId,omitempty"`
-
-	// ToPort AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-toport
-	ToPort int `json:"ToPort,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SecurityGroup_Ingress) AWSCloudFormationType() string {
-	return "AWS::EC2::SecurityGroup.Ingress"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroupegress.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroupegress.go
deleted file mode 100644
index 2f50ba602c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroupegress.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2SecurityGroupEgress AWS CloudFormation Resource (AWS::EC2::SecurityGroupEgress)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html
-type AWSEC2SecurityGroupEgress struct {
-
-	// CidrIp AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-cidrip
-	CidrIp string `json:"CidrIp,omitempty"`
-
-	// CidrIpv6 AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-cidripv6
-	CidrIpv6 string `json:"CidrIpv6,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-description
-	Description string `json:"Description,omitempty"`
-
-	// DestinationPrefixListId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-destinationprefixlistid
-	DestinationPrefixListId string `json:"DestinationPrefixListId,omitempty"`
-
-	// DestinationSecurityGroupId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-destinationsecuritygroupid
-	DestinationSecurityGroupId string `json:"DestinationSecurityGroupId,omitempty"`
-
-	// FromPort AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-fromport
-	FromPort int `json:"FromPort,omitempty"`
-
-	// GroupId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-groupid
-	GroupId string `json:"GroupId,omitempty"`
-
-	// IpProtocol AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-ipprotocol
-	IpProtocol string `json:"IpProtocol,omitempty"`
-
-	// ToPort AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-toport
-	ToPort int `json:"ToPort,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SecurityGroupEgress) AWSCloudFormationType() string {
-	return "AWS::EC2::SecurityGroupEgress"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2SecurityGroupEgress) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2SecurityGroupEgress
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2SecurityGroupEgress) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2SecurityGroupEgress
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2SecurityGroupEgress(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2SecurityGroupEgressResources retrieves all AWSEC2SecurityGroupEgress items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2SecurityGroupEgressResources() map[string]AWSEC2SecurityGroupEgress {
-	results := map[string]AWSEC2SecurityGroupEgress{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2SecurityGroupEgress:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SecurityGroupEgress" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SecurityGroupEgress
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2SecurityGroupEgressWithName retrieves all AWSEC2SecurityGroupEgress items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2SecurityGroupEgressWithName(name string) (AWSEC2SecurityGroupEgress, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2SecurityGroupEgress:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SecurityGroupEgress" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SecurityGroupEgress
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2SecurityGroupEgress{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroupingress.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroupingress.go
deleted file mode 100644
index f8407f50d6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-securitygroupingress.go
+++ /dev/null
@@ -1,160 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2SecurityGroupIngress AWS CloudFormation Resource (AWS::EC2::SecurityGroupIngress)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html
-type AWSEC2SecurityGroupIngress struct {
-
-	// CidrIp AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-cidrip
-	CidrIp string `json:"CidrIp,omitempty"`
-
-	// CidrIpv6 AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-cidripv6
-	CidrIpv6 string `json:"CidrIpv6,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-description
-	Description string `json:"Description,omitempty"`
-
-	// FromPort AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-fromport
-	FromPort int `json:"FromPort,omitempty"`
-
-	// GroupId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-groupid
-	GroupId string `json:"GroupId,omitempty"`
-
-	// GroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-groupname
-	GroupName string `json:"GroupName,omitempty"`
-
-	// IpProtocol AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-ipprotocol
-	IpProtocol string `json:"IpProtocol,omitempty"`
-
-	// SourceSecurityGroupId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-sourcesecuritygroupid
-	SourceSecurityGroupId string `json:"SourceSecurityGroupId,omitempty"`
-
-	// SourceSecurityGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-sourcesecuritygroupname
-	SourceSecurityGroupName string `json:"SourceSecurityGroupName,omitempty"`
-
-	// SourceSecurityGroupOwnerId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-sourcesecuritygroupownerid
-	SourceSecurityGroupOwnerId string `json:"SourceSecurityGroupOwnerId,omitempty"`
-
-	// ToPort AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-toport
-	ToPort int `json:"ToPort,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SecurityGroupIngress) AWSCloudFormationType() string {
-	return "AWS::EC2::SecurityGroupIngress"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2SecurityGroupIngress) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2SecurityGroupIngress
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2SecurityGroupIngress) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2SecurityGroupIngress
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2SecurityGroupIngress(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2SecurityGroupIngressResources retrieves all AWSEC2SecurityGroupIngress items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2SecurityGroupIngressResources() map[string]AWSEC2SecurityGroupIngress {
-	results := map[string]AWSEC2SecurityGroupIngress{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2SecurityGroupIngress:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SecurityGroupIngress" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SecurityGroupIngress
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2SecurityGroupIngressWithName retrieves all AWSEC2SecurityGroupIngress items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2SecurityGroupIngressWithName(name string) (AWSEC2SecurityGroupIngress, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2SecurityGroupIngress:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SecurityGroupIngress" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SecurityGroupIngress
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2SecurityGroupIngress{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet.go
deleted file mode 100644
index cfe8862554..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2SpotFleet AWS CloudFormation Resource (AWS::EC2::SpotFleet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-spotfleet.html
-type AWSEC2SpotFleet struct {
-
-	// SpotFleetRequestConfigData AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-spotfleet.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata
-	SpotFleetRequestConfigData *AWSEC2SpotFleet_SpotFleetRequestConfigData `json:"SpotFleetRequestConfigData,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SpotFleet) AWSCloudFormationType() string {
-	return "AWS::EC2::SpotFleet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2SpotFleet) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2SpotFleet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2SpotFleet) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2SpotFleet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2SpotFleet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2SpotFleetResources retrieves all AWSEC2SpotFleet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2SpotFleetResources() map[string]AWSEC2SpotFleet {
-	results := map[string]AWSEC2SpotFleet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2SpotFleet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SpotFleet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SpotFleet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2SpotFleetWithName retrieves all AWSEC2SpotFleet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2SpotFleetWithName(name string) (AWSEC2SpotFleet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2SpotFleet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SpotFleet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SpotFleet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2SpotFleet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_blockdevicemapping.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_blockdevicemapping.go
deleted file mode 100644
index 30f32fb03a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_blockdevicemapping.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSEC2SpotFleet_BlockDeviceMapping AWS CloudFormation Resource (AWS::EC2::SpotFleet.BlockDeviceMapping)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-blockdevicemappings.html
-type AWSEC2SpotFleet_BlockDeviceMapping struct {
-
-	// DeviceName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-blockdevicemappings.html#cfn-ec2-spotfleet-blockdevicemapping-devicename
-	DeviceName string `json:"DeviceName,omitempty"`
-
-	// Ebs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-blockdevicemappings.html#cfn-ec2-spotfleet-blockdevicemapping-ebs
-	Ebs *AWSEC2SpotFleet_EbsBlockDevice `json:"Ebs,omitempty"`
-
-	// NoDevice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-blockdevicemappings.html#cfn-ec2-spotfleet-blockdevicemapping-nodevice
-	NoDevice string `json:"NoDevice,omitempty"`
-
-	// VirtualName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-blockdevicemappings.html#cfn-ec2-spotfleet-blockdevicemapping-virtualname
-	VirtualName string `json:"VirtualName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SpotFleet_BlockDeviceMapping) AWSCloudFormationType() string {
-	return "AWS::EC2::SpotFleet.BlockDeviceMapping"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_ebsblockdevice.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_ebsblockdevice.go
deleted file mode 100644
index 5251560fc2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_ebsblockdevice.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSEC2SpotFleet_EbsBlockDevice AWS CloudFormation Resource (AWS::EC2::SpotFleet.EbsBlockDevice)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-blockdevicemappings-ebs.html
-type AWSEC2SpotFleet_EbsBlockDevice struct {
-
-	// DeleteOnTermination AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-blockdevicemappings-ebs.html#cfn-ec2-spotfleet-ebsblockdevice-deleteontermination
-	DeleteOnTermination bool `json:"DeleteOnTermination,omitempty"`
-
-	// Encrypted AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-blockdevicemappings-ebs.html#cfn-ec2-spotfleet-ebsblockdevice-encrypted
-	Encrypted bool `json:"Encrypted,omitempty"`
-
-	// Iops AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-blockdevicemappings-ebs.html#cfn-ec2-spotfleet-ebsblockdevice-iops
-	Iops int `json:"Iops,omitempty"`
-
-	// SnapshotId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-blockdevicemappings-ebs.html#cfn-ec2-spotfleet-ebsblockdevice-snapshotid
-	SnapshotId string `json:"SnapshotId,omitempty"`
-
-	// VolumeSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-blockdevicemappings-ebs.html#cfn-ec2-spotfleet-ebsblockdevice-volumesize
-	VolumeSize int `json:"VolumeSize,omitempty"`
-
-	// VolumeType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-blockdevicemappings-ebs.html#cfn-ec2-spotfleet-ebsblockdevice-volumetype
-	VolumeType string `json:"VolumeType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SpotFleet_EbsBlockDevice) AWSCloudFormationType() string {
-	return "AWS::EC2::SpotFleet.EbsBlockDevice"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_groupidentifier.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_groupidentifier.go
deleted file mode 100644
index be177fe558..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_groupidentifier.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEC2SpotFleet_GroupIdentifier AWS CloudFormation Resource (AWS::EC2::SpotFleet.GroupIdentifier)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-securitygroups.html
-type AWSEC2SpotFleet_GroupIdentifier struct {
-
-	// GroupId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-securitygroups.html#cfn-ec2-spotfleet-groupidentifier-groupid
-	GroupId string `json:"GroupId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SpotFleet_GroupIdentifier) AWSCloudFormationType() string {
-	return "AWS::EC2::SpotFleet.GroupIdentifier"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_iaminstanceprofilespecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_iaminstanceprofilespecification.go
deleted file mode 100644
index 7fc2daf9fe..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_iaminstanceprofilespecification.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEC2SpotFleet_IamInstanceProfileSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.IamInstanceProfileSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-iaminstanceprofile.html
-type AWSEC2SpotFleet_IamInstanceProfileSpecification struct {
-
-	// Arn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-iaminstanceprofile.html#cfn-ec2-spotfleet-iaminstanceprofilespecification-arn
-	Arn string `json:"Arn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SpotFleet_IamInstanceProfileSpecification) AWSCloudFormationType() string {
-	return "AWS::EC2::SpotFleet.IamInstanceProfileSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_instanceipv6address.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_instanceipv6address.go
deleted file mode 100644
index 85f4676552..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_instanceipv6address.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEC2SpotFleet_InstanceIpv6Address AWS CloudFormation Resource (AWS::EC2::SpotFleet.InstanceIpv6Address)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instanceipv6address.html
-type AWSEC2SpotFleet_InstanceIpv6Address struct {
-
-	// Ipv6Address AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instanceipv6address.html#cfn-ec2-spotfleet-instanceipv6address-ipv6address
-	Ipv6Address string `json:"Ipv6Address,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SpotFleet_InstanceIpv6Address) AWSCloudFormationType() string {
-	return "AWS::EC2::SpotFleet.InstanceIpv6Address"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_instancenetworkinterfacespecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_instancenetworkinterfacespecification.go
deleted file mode 100644
index 2f86c7af4c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_instancenetworkinterfacespecification.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package cloudformation
-
-// AWSEC2SpotFleet_InstanceNetworkInterfaceSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces.html
-type AWSEC2SpotFleet_InstanceNetworkInterfaceSpecification struct {
-
-	// AssociatePublicIpAddress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-associatepublicipaddress
-	AssociatePublicIpAddress bool `json:"AssociatePublicIpAddress,omitempty"`
-
-	// DeleteOnTermination AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-deleteontermination
-	DeleteOnTermination bool `json:"DeleteOnTermination,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-description
-	Description string `json:"Description,omitempty"`
-
-	// DeviceIndex AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-deviceindex
-	DeviceIndex int `json:"DeviceIndex,omitempty"`
-
-	// Groups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-groups
-	Groups []string `json:"Groups,omitempty"`
-
-	// Ipv6AddressCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-ipv6addresscount
-	Ipv6AddressCount int `json:"Ipv6AddressCount,omitempty"`
-
-	// Ipv6Addresses AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-ipv6addresses
-	Ipv6Addresses []AWSEC2SpotFleet_InstanceIpv6Address `json:"Ipv6Addresses,omitempty"`
-
-	// NetworkInterfaceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-networkinterfaceid
-	NetworkInterfaceId string `json:"NetworkInterfaceId,omitempty"`
-
-	// PrivateIpAddresses AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-privateipaddresses
-	PrivateIpAddresses []AWSEC2SpotFleet_PrivateIpAddressSpecification `json:"PrivateIpAddresses,omitempty"`
-
-	// SecondaryPrivateIpAddressCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-secondaryprivateipaddresscount
-	SecondaryPrivateIpAddressCount int `json:"SecondaryPrivateIpAddressCount,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SpotFleet_InstanceNetworkInterfaceSpecification) AWSCloudFormationType() string {
-	return "AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_privateipaddressspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_privateipaddressspecification.go
deleted file mode 100644
index b232be7dde..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_privateipaddressspecification.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEC2SpotFleet_PrivateIpAddressSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.PrivateIpAddressSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces-privateipaddresses.html
-type AWSEC2SpotFleet_PrivateIpAddressSpecification struct {
-
-	// Primary AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces-privateipaddresses.html#cfn-ec2-spotfleet-privateipaddressspecification-primary
-	Primary bool `json:"Primary,omitempty"`
-
-	// PrivateIpAddress AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-networkinterfaces-privateipaddresses.html#cfn-ec2-spotfleet-privateipaddressspecification-privateipaddress
-	PrivateIpAddress string `json:"PrivateIpAddress,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SpotFleet_PrivateIpAddressSpecification) AWSCloudFormationType() string {
-	return "AWS::EC2::SpotFleet.PrivateIpAddressSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_spotfleetlaunchspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_spotfleetlaunchspecification.go
deleted file mode 100644
index 82e4049573..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_spotfleetlaunchspecification.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package cloudformation
-
-// AWSEC2SpotFleet_SpotFleetLaunchSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotFleetLaunchSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html
-type AWSEC2SpotFleet_SpotFleetLaunchSpecification struct {
-
-	// BlockDeviceMappings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-blockdevicemappings
-	BlockDeviceMappings []AWSEC2SpotFleet_BlockDeviceMapping `json:"BlockDeviceMappings,omitempty"`
-
-	// EbsOptimized AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-ebsoptimized
-	EbsOptimized bool `json:"EbsOptimized,omitempty"`
-
-	// IamInstanceProfile AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-iaminstanceprofile
-	IamInstanceProfile *AWSEC2SpotFleet_IamInstanceProfileSpecification `json:"IamInstanceProfile,omitempty"`
-
-	// ImageId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-imageid
-	ImageId string `json:"ImageId,omitempty"`
-
-	// InstanceType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-instancetype
-	InstanceType string `json:"InstanceType,omitempty"`
-
-	// KernelId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-kernelid
-	KernelId string `json:"KernelId,omitempty"`
-
-	// KeyName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-keyname
-	KeyName string `json:"KeyName,omitempty"`
-
-	// Monitoring AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-monitoring
-	Monitoring *AWSEC2SpotFleet_SpotFleetMonitoring `json:"Monitoring,omitempty"`
-
-	// NetworkInterfaces AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-networkinterfaces
-	NetworkInterfaces []AWSEC2SpotFleet_InstanceNetworkInterfaceSpecification `json:"NetworkInterfaces,omitempty"`
-
-	// Placement AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-placement
-	Placement *AWSEC2SpotFleet_SpotPlacement `json:"Placement,omitempty"`
-
-	// RamdiskId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-ramdiskid
-	RamdiskId string `json:"RamdiskId,omitempty"`
-
-	// SecurityGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-securitygroups
-	SecurityGroups []AWSEC2SpotFleet_GroupIdentifier `json:"SecurityGroups,omitempty"`
-
-	// SpotPrice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-spotprice
-	SpotPrice string `json:"SpotPrice,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-
-	// UserData AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-userdata
-	UserData string `json:"UserData,omitempty"`
-
-	// WeightedCapacity AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-weightedcapacity
-	WeightedCapacity float64 `json:"WeightedCapacity,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SpotFleet_SpotFleetLaunchSpecification) AWSCloudFormationType() string {
-	return "AWS::EC2::SpotFleet.SpotFleetLaunchSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_spotfleetmonitoring.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_spotfleetmonitoring.go
deleted file mode 100644
index 0989ca6d59..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_spotfleetmonitoring.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEC2SpotFleet_SpotFleetMonitoring AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotFleetMonitoring)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-monitoring.html
-type AWSEC2SpotFleet_SpotFleetMonitoring struct {
-
-	// Enabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-monitoring.html#cfn-ec2-spotfleet-spotfleetmonitoring-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SpotFleet_SpotFleetMonitoring) AWSCloudFormationType() string {
-	return "AWS::EC2::SpotFleet.SpotFleetMonitoring"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_spotfleetrequestconfigdata.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_spotfleetrequestconfigdata.go
deleted file mode 100644
index 169c5927d6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_spotfleetrequestconfigdata.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package cloudformation
-
-// AWSEC2SpotFleet_SpotFleetRequestConfigData AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotFleetRequestConfigData)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html
-type AWSEC2SpotFleet_SpotFleetRequestConfigData struct {
-
-	// AllocationStrategy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-allocationstrategy
-	AllocationStrategy string `json:"AllocationStrategy,omitempty"`
-
-	// ExcessCapacityTerminationPolicy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-excesscapacityterminationpolicy
-	ExcessCapacityTerminationPolicy string `json:"ExcessCapacityTerminationPolicy,omitempty"`
-
-	// IamFleetRole AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-iamfleetrole
-	IamFleetRole string `json:"IamFleetRole,omitempty"`
-
-	// LaunchSpecifications AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications
-	LaunchSpecifications []AWSEC2SpotFleet_SpotFleetLaunchSpecification `json:"LaunchSpecifications,omitempty"`
-
-	// ReplaceUnhealthyInstances AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-replaceunhealthyinstances
-	ReplaceUnhealthyInstances bool `json:"ReplaceUnhealthyInstances,omitempty"`
-
-	// SpotPrice AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-spotprice
-	SpotPrice string `json:"SpotPrice,omitempty"`
-
-	// TargetCapacity AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-targetcapacity
-	TargetCapacity int `json:"TargetCapacity,omitempty"`
-
-	// TerminateInstancesWithExpiration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-terminateinstanceswithexpiration
-	TerminateInstancesWithExpiration bool `json:"TerminateInstancesWithExpiration,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-type
-	Type string `json:"Type,omitempty"`
-
-	// ValidFrom AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-validfrom
-	ValidFrom string `json:"ValidFrom,omitempty"`
-
-	// ValidUntil AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-validuntil
-	ValidUntil string `json:"ValidUntil,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SpotFleet_SpotFleetRequestConfigData) AWSCloudFormationType() string {
-	return "AWS::EC2::SpotFleet.SpotFleetRequestConfigData"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_spotplacement.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_spotplacement.go
deleted file mode 100644
index 56d1f33e73..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-spotfleet_spotplacement.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEC2SpotFleet_SpotPlacement AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotPlacement)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-placement.html
-type AWSEC2SpotFleet_SpotPlacement struct {
-
-	// AvailabilityZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-placement.html#cfn-ec2-spotfleet-spotplacement-availabilityzone
-	AvailabilityZone string `json:"AvailabilityZone,omitempty"`
-
-	// GroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications-placement.html#cfn-ec2-spotfleet-spotplacement-groupname
-	GroupName string `json:"GroupName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SpotFleet_SpotPlacement) AWSCloudFormationType() string {
-	return "AWS::EC2::SpotFleet.SpotPlacement"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-subnet.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-subnet.go
deleted file mode 100644
index 499f1caccd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-subnet.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2Subnet AWS CloudFormation Resource (AWS::EC2::Subnet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-type AWSEC2Subnet struct {
-
-	// AssignIpv6AddressOnCreation AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-assignipv6addressoncreation
-	AssignIpv6AddressOnCreation bool `json:"AssignIpv6AddressOnCreation,omitempty"`
-
-	// AvailabilityZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-availabilityzone
-	AvailabilityZone string `json:"AvailabilityZone,omitempty"`
-
-	// CidrBlock AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-cidrblock
-	CidrBlock string `json:"CidrBlock,omitempty"`
-
-	// Ipv6CidrBlock AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-ipv6cidrblock
-	Ipv6CidrBlock string `json:"Ipv6CidrBlock,omitempty"`
-
-	// MapPublicIpOnLaunch AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-mappubliciponlaunch
-	MapPublicIpOnLaunch bool `json:"MapPublicIpOnLaunch,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-awsec2subnet-prop-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Subnet) AWSCloudFormationType() string {
-	return "AWS::EC2::Subnet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2Subnet) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2Subnet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2Subnet) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2Subnet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2Subnet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2SubnetResources retrieves all AWSEC2Subnet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2SubnetResources() map[string]AWSEC2Subnet {
-	results := map[string]AWSEC2Subnet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2Subnet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::Subnet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2Subnet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2SubnetWithName retrieves all AWSEC2Subnet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2SubnetWithName(name string) (AWSEC2Subnet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2Subnet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::Subnet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2Subnet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2Subnet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-subnetcidrblock.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-subnetcidrblock.go
deleted file mode 100644
index d66ca0de67..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-subnetcidrblock.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2SubnetCidrBlock AWS CloudFormation Resource (AWS::EC2::SubnetCidrBlock)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetcidrblock.html
-type AWSEC2SubnetCidrBlock struct {
-
-	// Ipv6CidrBlock AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetcidrblock.html#cfn-ec2-subnetcidrblock-ipv6cidrblock
-	Ipv6CidrBlock string `json:"Ipv6CidrBlock,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetcidrblock.html#cfn-ec2-subnetcidrblock-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SubnetCidrBlock) AWSCloudFormationType() string {
-	return "AWS::EC2::SubnetCidrBlock"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2SubnetCidrBlock) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2SubnetCidrBlock
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2SubnetCidrBlock) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2SubnetCidrBlock
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2SubnetCidrBlock(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2SubnetCidrBlockResources retrieves all AWSEC2SubnetCidrBlock items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2SubnetCidrBlockResources() map[string]AWSEC2SubnetCidrBlock {
-	results := map[string]AWSEC2SubnetCidrBlock{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2SubnetCidrBlock:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SubnetCidrBlock" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SubnetCidrBlock
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2SubnetCidrBlockWithName retrieves all AWSEC2SubnetCidrBlock items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2SubnetCidrBlockWithName(name string) (AWSEC2SubnetCidrBlock, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2SubnetCidrBlock:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SubnetCidrBlock" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SubnetCidrBlock
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2SubnetCidrBlock{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-subnetnetworkaclassociation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-subnetnetworkaclassociation.go
deleted file mode 100644
index 8328707755..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-subnetnetworkaclassociation.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2SubnetNetworkAclAssociation AWS CloudFormation Resource (AWS::EC2::SubnetNetworkAclAssociation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-network-acl-assoc.html
-type AWSEC2SubnetNetworkAclAssociation struct {
-
-	// NetworkAclId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-network-acl-assoc.html#cfn-ec2-subnetnetworkaclassociation-networkaclid
-	NetworkAclId string `json:"NetworkAclId,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-network-acl-assoc.html#cfn-ec2-subnetnetworkaclassociation-associationid
-	SubnetId string `json:"SubnetId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SubnetNetworkAclAssociation) AWSCloudFormationType() string {
-	return "AWS::EC2::SubnetNetworkAclAssociation"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2SubnetNetworkAclAssociation) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2SubnetNetworkAclAssociation
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2SubnetNetworkAclAssociation) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2SubnetNetworkAclAssociation
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2SubnetNetworkAclAssociation(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2SubnetNetworkAclAssociationResources retrieves all AWSEC2SubnetNetworkAclAssociation items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2SubnetNetworkAclAssociationResources() map[string]AWSEC2SubnetNetworkAclAssociation {
-	results := map[string]AWSEC2SubnetNetworkAclAssociation{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2SubnetNetworkAclAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SubnetNetworkAclAssociation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SubnetNetworkAclAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2SubnetNetworkAclAssociationWithName retrieves all AWSEC2SubnetNetworkAclAssociation items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2SubnetNetworkAclAssociationWithName(name string) (AWSEC2SubnetNetworkAclAssociation, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2SubnetNetworkAclAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SubnetNetworkAclAssociation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SubnetNetworkAclAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2SubnetNetworkAclAssociation{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-subnetroutetableassociation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-subnetroutetableassociation.go
deleted file mode 100644
index 0daa72a50d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-subnetroutetableassociation.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2SubnetRouteTableAssociation AWS CloudFormation Resource (AWS::EC2::SubnetRouteTableAssociation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html
-type AWSEC2SubnetRouteTableAssociation struct {
-
-	// RouteTableId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html#cfn-ec2-subnetroutetableassociation-routetableid
-	RouteTableId string `json:"RouteTableId,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html#cfn-ec2-subnetroutetableassociation-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2SubnetRouteTableAssociation) AWSCloudFormationType() string {
-	return "AWS::EC2::SubnetRouteTableAssociation"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2SubnetRouteTableAssociation) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2SubnetRouteTableAssociation
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2SubnetRouteTableAssociation) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2SubnetRouteTableAssociation
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2SubnetRouteTableAssociation(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2SubnetRouteTableAssociationResources retrieves all AWSEC2SubnetRouteTableAssociation items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2SubnetRouteTableAssociationResources() map[string]AWSEC2SubnetRouteTableAssociation {
-	results := map[string]AWSEC2SubnetRouteTableAssociation{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2SubnetRouteTableAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SubnetRouteTableAssociation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SubnetRouteTableAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2SubnetRouteTableAssociationWithName retrieves all AWSEC2SubnetRouteTableAssociation items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2SubnetRouteTableAssociationWithName(name string) (AWSEC2SubnetRouteTableAssociation, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2SubnetRouteTableAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::SubnetRouteTableAssociation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2SubnetRouteTableAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2SubnetRouteTableAssociation{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-trunkinterfaceassociation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-trunkinterfaceassociation.go
deleted file mode 100644
index 238cce04fb..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-trunkinterfaceassociation.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2TrunkInterfaceAssociation AWS CloudFormation Resource (AWS::EC2::TrunkInterfaceAssociation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trunkinterfaceassociation.html
-type AWSEC2TrunkInterfaceAssociation struct {
-
-	// BranchInterfaceId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trunkinterfaceassociation.html#cfn-ec2-trunkinterfaceassociation-branchinterfaceid
-	BranchInterfaceId string `json:"BranchInterfaceId,omitempty"`
-
-	// GREKey AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trunkinterfaceassociation.html#cfn-ec2-trunkinterfaceassociation-grekey
-	GREKey int `json:"GREKey,omitempty"`
-
-	// TrunkInterfaceId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trunkinterfaceassociation.html#cfn-ec2-trunkinterfaceassociation-trunkinterfaceid
-	TrunkInterfaceId string `json:"TrunkInterfaceId,omitempty"`
-
-	// VLANId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trunkinterfaceassociation.html#cfn-ec2-trunkinterfaceassociation-vlanid
-	VLANId int `json:"VLANId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2TrunkInterfaceAssociation) AWSCloudFormationType() string {
-	return "AWS::EC2::TrunkInterfaceAssociation"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2TrunkInterfaceAssociation) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2TrunkInterfaceAssociation
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2TrunkInterfaceAssociation) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2TrunkInterfaceAssociation
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2TrunkInterfaceAssociation(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2TrunkInterfaceAssociationResources retrieves all AWSEC2TrunkInterfaceAssociation items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2TrunkInterfaceAssociationResources() map[string]AWSEC2TrunkInterfaceAssociation {
-	results := map[string]AWSEC2TrunkInterfaceAssociation{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2TrunkInterfaceAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::TrunkInterfaceAssociation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2TrunkInterfaceAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2TrunkInterfaceAssociationWithName retrieves all AWSEC2TrunkInterfaceAssociation items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2TrunkInterfaceAssociationWithName(name string) (AWSEC2TrunkInterfaceAssociation, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2TrunkInterfaceAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::TrunkInterfaceAssociation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2TrunkInterfaceAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2TrunkInterfaceAssociation{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-volume.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-volume.go
deleted file mode 100644
index 5170cde5cd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-volume.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2Volume AWS CloudFormation Resource (AWS::EC2::Volume)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html
-type AWSEC2Volume struct {
-
-	// AutoEnableIO AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-autoenableio
-	AutoEnableIO bool `json:"AutoEnableIO,omitempty"`
-
-	// AvailabilityZone AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-availabilityzone
-	AvailabilityZone string `json:"AvailabilityZone,omitempty"`
-
-	// Encrypted AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-encrypted
-	Encrypted bool `json:"Encrypted,omitempty"`
-
-	// Iops AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-iops
-	Iops int `json:"Iops,omitempty"`
-
-	// KmsKeyId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-kmskeyid
-	KmsKeyId string `json:"KmsKeyId,omitempty"`
-
-	// Size AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-size
-	Size int `json:"Size,omitempty"`
-
-	// SnapshotId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-snapshotid
-	SnapshotId string `json:"SnapshotId,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// VolumeType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-volumetype
-	VolumeType string `json:"VolumeType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2Volume) AWSCloudFormationType() string {
-	return "AWS::EC2::Volume"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2Volume) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2Volume
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2Volume) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2Volume
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2Volume(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2VolumeResources retrieves all AWSEC2Volume items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2VolumeResources() map[string]AWSEC2Volume {
-	results := map[string]AWSEC2Volume{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2Volume:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::Volume" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2Volume
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2VolumeWithName retrieves all AWSEC2Volume items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2VolumeWithName(name string) (AWSEC2Volume, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2Volume:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::Volume" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2Volume
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2Volume{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-volumeattachment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-volumeattachment.go
deleted file mode 100644
index 62a882a6e6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-volumeattachment.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2VolumeAttachment AWS CloudFormation Resource (AWS::EC2::VolumeAttachment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volumeattachment.html
-type AWSEC2VolumeAttachment struct {
-
-	// Device AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volumeattachment.html#cfn-ec2-ebs-volumeattachment-device
-	Device string `json:"Device,omitempty"`
-
-	// InstanceId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volumeattachment.html#cfn-ec2-ebs-volumeattachment-instanceid
-	InstanceId string `json:"InstanceId,omitempty"`
-
-	// VolumeId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volumeattachment.html#cfn-ec2-ebs-volumeattachment-volumeid
-	VolumeId string `json:"VolumeId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2VolumeAttachment) AWSCloudFormationType() string {
-	return "AWS::EC2::VolumeAttachment"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2VolumeAttachment) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2VolumeAttachment
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2VolumeAttachment) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2VolumeAttachment
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2VolumeAttachment(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2VolumeAttachmentResources retrieves all AWSEC2VolumeAttachment items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2VolumeAttachmentResources() map[string]AWSEC2VolumeAttachment {
-	results := map[string]AWSEC2VolumeAttachment{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2VolumeAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VolumeAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VolumeAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2VolumeAttachmentWithName retrieves all AWSEC2VolumeAttachment items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2VolumeAttachmentWithName(name string) (AWSEC2VolumeAttachment, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2VolumeAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VolumeAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VolumeAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2VolumeAttachment{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpc.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpc.go
deleted file mode 100644
index 8d6245de2f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpc.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2VPC AWS CloudFormation Resource (AWS::EC2::VPC)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html
-type AWSEC2VPC struct {
-
-	// CidrBlock AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html#cfn-aws-ec2-vpc-cidrblock
-	CidrBlock string `json:"CidrBlock,omitempty"`
-
-	// EnableDnsHostnames AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html#cfn-aws-ec2-vpc-EnableDnsHostnames
-	EnableDnsHostnames bool `json:"EnableDnsHostnames,omitempty"`
-
-	// EnableDnsSupport AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html#cfn-aws-ec2-vpc-EnableDnsSupport
-	EnableDnsSupport bool `json:"EnableDnsSupport,omitempty"`
-
-	// InstanceTenancy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html#cfn-aws-ec2-vpc-instancetenancy
-	InstanceTenancy string `json:"InstanceTenancy,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html#cfn-aws-ec2-vpc-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2VPC) AWSCloudFormationType() string {
-	return "AWS::EC2::VPC"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2VPC) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2VPC
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2VPC) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2VPC
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2VPC(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2VPCResources retrieves all AWSEC2VPC items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2VPCResources() map[string]AWSEC2VPC {
-	results := map[string]AWSEC2VPC{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2VPC:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPC" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPC
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2VPCWithName retrieves all AWSEC2VPC items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2VPCWithName(name string) (AWSEC2VPC, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2VPC:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPC" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPC
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2VPC{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpccidrblock.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpccidrblock.go
deleted file mode 100644
index 2b58ea009b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpccidrblock.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2VPCCidrBlock AWS CloudFormation Resource (AWS::EC2::VPCCidrBlock)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html
-type AWSEC2VPCCidrBlock struct {
-
-	// AmazonProvidedIpv6CidrBlock AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html#cfn-ec2-vpccidrblock-amazonprovidedipv6cidrblock
-	AmazonProvidedIpv6CidrBlock bool `json:"AmazonProvidedIpv6CidrBlock,omitempty"`
-
-	// CidrBlock AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html#cfn-ec2-vpccidrblock-cidrblock
-	CidrBlock string `json:"CidrBlock,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html#cfn-ec2-vpccidrblock-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2VPCCidrBlock) AWSCloudFormationType() string {
-	return "AWS::EC2::VPCCidrBlock"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2VPCCidrBlock) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2VPCCidrBlock
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2VPCCidrBlock) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2VPCCidrBlock
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2VPCCidrBlock(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2VPCCidrBlockResources retrieves all AWSEC2VPCCidrBlock items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2VPCCidrBlockResources() map[string]AWSEC2VPCCidrBlock {
-	results := map[string]AWSEC2VPCCidrBlock{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2VPCCidrBlock:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPCCidrBlock" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPCCidrBlock
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2VPCCidrBlockWithName retrieves all AWSEC2VPCCidrBlock items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2VPCCidrBlockWithName(name string) (AWSEC2VPCCidrBlock, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2VPCCidrBlock:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPCCidrBlock" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPCCidrBlock
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2VPCCidrBlock{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpcdhcpoptionsassociation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpcdhcpoptionsassociation.go
deleted file mode 100644
index 5b26a28b48..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpcdhcpoptionsassociation.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2VPCDHCPOptionsAssociation AWS CloudFormation Resource (AWS::EC2::VPCDHCPOptionsAssociation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-dhcp-options-assoc.html
-type AWSEC2VPCDHCPOptionsAssociation struct {
-
-	// DhcpOptionsId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-dhcp-options-assoc.html#cfn-ec2-vpcdhcpoptionsassociation-dhcpoptionsid
-	DhcpOptionsId string `json:"DhcpOptionsId,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-dhcp-options-assoc.html#cfn-ec2-vpcdhcpoptionsassociation-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2VPCDHCPOptionsAssociation) AWSCloudFormationType() string {
-	return "AWS::EC2::VPCDHCPOptionsAssociation"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2VPCDHCPOptionsAssociation) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2VPCDHCPOptionsAssociation
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2VPCDHCPOptionsAssociation) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2VPCDHCPOptionsAssociation
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2VPCDHCPOptionsAssociation(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2VPCDHCPOptionsAssociationResources retrieves all AWSEC2VPCDHCPOptionsAssociation items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2VPCDHCPOptionsAssociationResources() map[string]AWSEC2VPCDHCPOptionsAssociation {
-	results := map[string]AWSEC2VPCDHCPOptionsAssociation{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2VPCDHCPOptionsAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPCDHCPOptionsAssociation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPCDHCPOptionsAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2VPCDHCPOptionsAssociationWithName retrieves all AWSEC2VPCDHCPOptionsAssociation items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2VPCDHCPOptionsAssociationWithName(name string) (AWSEC2VPCDHCPOptionsAssociation, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2VPCDHCPOptionsAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPCDHCPOptionsAssociation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPCDHCPOptionsAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2VPCDHCPOptionsAssociation{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpcendpoint.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpcendpoint.go
deleted file mode 100644
index 7bdec43e80..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpcendpoint.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2VPCEndpoint AWS CloudFormation Resource (AWS::EC2::VPCEndpoint)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
-type AWSEC2VPCEndpoint struct {
-
-	// PolicyDocument AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html#cfn-ec2-vpcendpoint-policydocument
-	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
-
-	// RouteTableIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html#cfn-ec2-vpcendpoint-routetableids
-	RouteTableIds []string `json:"RouteTableIds,omitempty"`
-
-	// ServiceName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html#cfn-ec2-vpcendpoint-servicename
-	ServiceName string `json:"ServiceName,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html#cfn-ec2-vpcendpoint-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2VPCEndpoint) AWSCloudFormationType() string {
-	return "AWS::EC2::VPCEndpoint"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2VPCEndpoint) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2VPCEndpoint
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2VPCEndpoint) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2VPCEndpoint
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2VPCEndpoint(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2VPCEndpointResources retrieves all AWSEC2VPCEndpoint items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2VPCEndpointResources() map[string]AWSEC2VPCEndpoint {
-	results := map[string]AWSEC2VPCEndpoint{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2VPCEndpoint:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPCEndpoint" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPCEndpoint
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2VPCEndpointWithName retrieves all AWSEC2VPCEndpoint items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2VPCEndpointWithName(name string) (AWSEC2VPCEndpoint, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2VPCEndpoint:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPCEndpoint" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPCEndpoint
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2VPCEndpoint{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpcgatewayattachment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpcgatewayattachment.go
deleted file mode 100644
index ee3f3d1215..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpcgatewayattachment.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2VPCGatewayAttachment AWS CloudFormation Resource (AWS::EC2::VPCGatewayAttachment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html
-type AWSEC2VPCGatewayAttachment struct {
-
-	// InternetGatewayId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html#cfn-ec2-vpcgatewayattachment-internetgatewayid
-	InternetGatewayId string `json:"InternetGatewayId,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html#cfn-ec2-vpcgatewayattachment-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-
-	// VpnGatewayId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html#cfn-ec2-vpcgatewayattachment-vpngatewayid
-	VpnGatewayId string `json:"VpnGatewayId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2VPCGatewayAttachment) AWSCloudFormationType() string {
-	return "AWS::EC2::VPCGatewayAttachment"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2VPCGatewayAttachment) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2VPCGatewayAttachment
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2VPCGatewayAttachment) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2VPCGatewayAttachment
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2VPCGatewayAttachment(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2VPCGatewayAttachmentResources retrieves all AWSEC2VPCGatewayAttachment items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2VPCGatewayAttachmentResources() map[string]AWSEC2VPCGatewayAttachment {
-	results := map[string]AWSEC2VPCGatewayAttachment{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2VPCGatewayAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPCGatewayAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPCGatewayAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2VPCGatewayAttachmentWithName retrieves all AWSEC2VPCGatewayAttachment items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2VPCGatewayAttachmentWithName(name string) (AWSEC2VPCGatewayAttachment, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2VPCGatewayAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPCGatewayAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPCGatewayAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2VPCGatewayAttachment{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpcpeeringconnection.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpcpeeringconnection.go
deleted file mode 100644
index ddce8f7ce2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpcpeeringconnection.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2VPCPeeringConnection AWS CloudFormation Resource (AWS::EC2::VPCPeeringConnection)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html
-type AWSEC2VPCPeeringConnection struct {
-
-	// PeerOwnerId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-peerownerid
-	PeerOwnerId string `json:"PeerOwnerId,omitempty"`
-
-	// PeerRoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-peerrolearn
-	PeerRoleArn string `json:"PeerRoleArn,omitempty"`
-
-	// PeerVpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-peervpcid
-	PeerVpcId string `json:"PeerVpcId,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2VPCPeeringConnection) AWSCloudFormationType() string {
-	return "AWS::EC2::VPCPeeringConnection"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2VPCPeeringConnection) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2VPCPeeringConnection
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2VPCPeeringConnection) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2VPCPeeringConnection
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2VPCPeeringConnection(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2VPCPeeringConnectionResources retrieves all AWSEC2VPCPeeringConnection items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2VPCPeeringConnectionResources() map[string]AWSEC2VPCPeeringConnection {
-	results := map[string]AWSEC2VPCPeeringConnection{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2VPCPeeringConnection:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPCPeeringConnection" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPCPeeringConnection
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2VPCPeeringConnectionWithName retrieves all AWSEC2VPCPeeringConnection items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2VPCPeeringConnectionWithName(name string) (AWSEC2VPCPeeringConnection, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2VPCPeeringConnection:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPCPeeringConnection" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPCPeeringConnection
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2VPCPeeringConnection{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpnconnection.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpnconnection.go
deleted file mode 100644
index e06095cd61..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpnconnection.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2VPNConnection AWS CloudFormation Resource (AWS::EC2::VPNConnection)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html
-type AWSEC2VPNConnection struct {
-
-	// CustomerGatewayId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-customergatewayid
-	CustomerGatewayId string `json:"CustomerGatewayId,omitempty"`
-
-	// StaticRoutesOnly AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-StaticRoutesOnly
-	StaticRoutesOnly bool `json:"StaticRoutesOnly,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-type
-	Type string `json:"Type,omitempty"`
-
-	// VpnGatewayId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-vpngatewayid
-	VpnGatewayId string `json:"VpnGatewayId,omitempty"`
-
-	// VpnTunnelOptionsSpecifications AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-vpntunneloptionsspecifications
-	VpnTunnelOptionsSpecifications []AWSEC2VPNConnection_VpnTunnelOptionsSpecification `json:"VpnTunnelOptionsSpecifications,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2VPNConnection) AWSCloudFormationType() string {
-	return "AWS::EC2::VPNConnection"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2VPNConnection) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2VPNConnection
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2VPNConnection) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2VPNConnection
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2VPNConnection(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2VPNConnectionResources retrieves all AWSEC2VPNConnection items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2VPNConnectionResources() map[string]AWSEC2VPNConnection {
-	results := map[string]AWSEC2VPNConnection{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2VPNConnection:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPNConnection" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPNConnection
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2VPNConnectionWithName retrieves all AWSEC2VPNConnection items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2VPNConnectionWithName(name string) (AWSEC2VPNConnection, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2VPNConnection:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPNConnection" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPNConnection
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2VPNConnection{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpnconnection_vpntunneloptionsspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpnconnection_vpntunneloptionsspecification.go
deleted file mode 100644
index 347237d0d9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpnconnection_vpntunneloptionsspecification.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEC2VPNConnection_VpnTunnelOptionsSpecification AWS CloudFormation Resource (AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-vpnconnection-vpntunneloptionsspecification.html
-type AWSEC2VPNConnection_VpnTunnelOptionsSpecification struct {
-
-	// PreSharedKey AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-vpnconnection-vpntunneloptionsspecification.html#cfn-ec2-vpnconnection-vpntunneloptionsspecification-presharedkey
-	PreSharedKey string `json:"PreSharedKey,omitempty"`
-
-	// TunnelInsideCidr AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-vpnconnection-vpntunneloptionsspecification.html#cfn-ec2-vpnconnection-vpntunneloptionsspecification-tunnelinsidecidr
-	TunnelInsideCidr string `json:"TunnelInsideCidr,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2VPNConnection_VpnTunnelOptionsSpecification) AWSCloudFormationType() string {
-	return "AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpnconnectionroute.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpnconnectionroute.go
deleted file mode 100644
index 1577677215..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpnconnectionroute.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2VPNConnectionRoute AWS CloudFormation Resource (AWS::EC2::VPNConnectionRoute)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection-route.html
-type AWSEC2VPNConnectionRoute struct {
-
-	// DestinationCidrBlock AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection-route.html#cfn-ec2-vpnconnectionroute-cidrblock
-	DestinationCidrBlock string `json:"DestinationCidrBlock,omitempty"`
-
-	// VpnConnectionId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection-route.html#cfn-ec2-vpnconnectionroute-connectionid
-	VpnConnectionId string `json:"VpnConnectionId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2VPNConnectionRoute) AWSCloudFormationType() string {
-	return "AWS::EC2::VPNConnectionRoute"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2VPNConnectionRoute) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2VPNConnectionRoute
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2VPNConnectionRoute) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2VPNConnectionRoute
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2VPNConnectionRoute(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2VPNConnectionRouteResources retrieves all AWSEC2VPNConnectionRoute items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2VPNConnectionRouteResources() map[string]AWSEC2VPNConnectionRoute {
-	results := map[string]AWSEC2VPNConnectionRoute{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2VPNConnectionRoute:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPNConnectionRoute" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPNConnectionRoute
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2VPNConnectionRouteWithName retrieves all AWSEC2VPNConnectionRoute items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2VPNConnectionRouteWithName(name string) (AWSEC2VPNConnectionRoute, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2VPNConnectionRoute:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPNConnectionRoute" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPNConnectionRoute
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2VPNConnectionRoute{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpngateway.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpngateway.go
deleted file mode 100644
index cdfe65ac2b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpngateway.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2VPNGateway AWS CloudFormation Resource (AWS::EC2::VPNGateway)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gateway.html
-type AWSEC2VPNGateway struct {
-
-	// AmazonSideAsn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gateway.html#cfn-ec2-vpngateway-amazonsideasn
-	AmazonSideAsn int64 `json:"AmazonSideAsn,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gateway.html#cfn-ec2-vpngateway-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gateway.html#cfn-ec2-vpngateway-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2VPNGateway) AWSCloudFormationType() string {
-	return "AWS::EC2::VPNGateway"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2VPNGateway) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2VPNGateway
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2VPNGateway) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2VPNGateway
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2VPNGateway(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2VPNGatewayResources retrieves all AWSEC2VPNGateway items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2VPNGatewayResources() map[string]AWSEC2VPNGateway {
-	results := map[string]AWSEC2VPNGateway{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2VPNGateway:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPNGateway" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPNGateway
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2VPNGatewayWithName retrieves all AWSEC2VPNGateway items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2VPNGatewayWithName(name string) (AWSEC2VPNGateway, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2VPNGateway:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPNGateway" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPNGateway
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2VPNGateway{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpngatewayroutepropagation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpngatewayroutepropagation.go
deleted file mode 100644
index 38b4f93fd4..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ec2-vpngatewayroutepropagation.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEC2VPNGatewayRoutePropagation AWS CloudFormation Resource (AWS::EC2::VPNGatewayRoutePropagation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gatewayrouteprop.html
-type AWSEC2VPNGatewayRoutePropagation struct {
-
-	// RouteTableIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gatewayrouteprop.html#cfn-ec2-vpngatewayrouteprop-routetableids
-	RouteTableIds []string `json:"RouteTableIds,omitempty"`
-
-	// VpnGatewayId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gatewayrouteprop.html#cfn-ec2-vpngatewayrouteprop-vpngatewayid
-	VpnGatewayId string `json:"VpnGatewayId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEC2VPNGatewayRoutePropagation) AWSCloudFormationType() string {
-	return "AWS::EC2::VPNGatewayRoutePropagation"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEC2VPNGatewayRoutePropagation) MarshalJSON() ([]byte, error) {
-	type Properties AWSEC2VPNGatewayRoutePropagation
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEC2VPNGatewayRoutePropagation) UnmarshalJSON(b []byte) error {
-	type Properties AWSEC2VPNGatewayRoutePropagation
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEC2VPNGatewayRoutePropagation(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEC2VPNGatewayRoutePropagationResources retrieves all AWSEC2VPNGatewayRoutePropagation items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEC2VPNGatewayRoutePropagationResources() map[string]AWSEC2VPNGatewayRoutePropagation {
-	results := map[string]AWSEC2VPNGatewayRoutePropagation{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEC2VPNGatewayRoutePropagation:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPNGatewayRoutePropagation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPNGatewayRoutePropagation
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEC2VPNGatewayRoutePropagationWithName retrieves all AWSEC2VPNGatewayRoutePropagation items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEC2VPNGatewayRoutePropagationWithName(name string) (AWSEC2VPNGatewayRoutePropagation, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEC2VPNGatewayRoutePropagation:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EC2::VPNGatewayRoutePropagation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEC2VPNGatewayRoutePropagation
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEC2VPNGatewayRoutePropagation{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecr-repository.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecr-repository.go
deleted file mode 100644
index c5343e4b6e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecr-repository.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSECRRepository AWS CloudFormation Resource (AWS::ECR::Repository)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html
-type AWSECRRepository struct {
-
-	// RepositoryName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-repositoryname
-	RepositoryName string `json:"RepositoryName,omitempty"`
-
-	// RepositoryPolicyText AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-repositorypolicytext
-	RepositoryPolicyText interface{} `json:"RepositoryPolicyText,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECRRepository) AWSCloudFormationType() string {
-	return "AWS::ECR::Repository"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSECRRepository) MarshalJSON() ([]byte, error) {
-	type Properties AWSECRRepository
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSECRRepository) UnmarshalJSON(b []byte) error {
-	type Properties AWSECRRepository
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSECRRepository(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSECRRepositoryResources retrieves all AWSECRRepository items from an AWS CloudFormation template
-func (t *Template) GetAllAWSECRRepositoryResources() map[string]AWSECRRepository {
-	results := map[string]AWSECRRepository{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSECRRepository:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ECR::Repository" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSECRRepository
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSECRRepositoryWithName retrieves all AWSECRRepository items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSECRRepositoryWithName(name string) (AWSECRRepository, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSECRRepository:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ECR::Repository" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSECRRepository
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSECRRepository{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-cluster.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-cluster.go
deleted file mode 100644
index 227abb3dfd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-cluster.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSECSCluster AWS CloudFormation Resource (AWS::ECS::Cluster)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-cluster.html
-type AWSECSCluster struct {
-
-	// ClusterName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-cluster.html#cfn-ecs-cluster-clustername
-	ClusterName string `json:"ClusterName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSCluster) AWSCloudFormationType() string {
-	return "AWS::ECS::Cluster"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSECSCluster) MarshalJSON() ([]byte, error) {
-	type Properties AWSECSCluster
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSECSCluster) UnmarshalJSON(b []byte) error {
-	type Properties AWSECSCluster
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSECSCluster(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSECSClusterResources retrieves all AWSECSCluster items from an AWS CloudFormation template
-func (t *Template) GetAllAWSECSClusterResources() map[string]AWSECSCluster {
-	results := map[string]AWSECSCluster{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSECSCluster:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ECS::Cluster" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSECSCluster
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSECSClusterWithName retrieves all AWSECSCluster items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSECSClusterWithName(name string) (AWSECSCluster, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSECSCluster:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ECS::Cluster" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSECSCluster
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSECSCluster{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service.go
deleted file mode 100644
index e5f872466a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSECSService AWS CloudFormation Resource (AWS::ECS::Service)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html
-type AWSECSService struct {
-
-	// Cluster AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-cluster
-	Cluster string `json:"Cluster,omitempty"`
-
-	// DeploymentConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-deploymentconfiguration
-	DeploymentConfiguration *AWSECSService_DeploymentConfiguration `json:"DeploymentConfiguration,omitempty"`
-
-	// DesiredCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-desiredcount
-	DesiredCount int `json:"DesiredCount,omitempty"`
-
-	// LoadBalancers AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-loadbalancers
-	LoadBalancers []AWSECSService_LoadBalancer `json:"LoadBalancers,omitempty"`
-
-	// PlacementConstraints AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-placementconstraints
-	PlacementConstraints []AWSECSService_PlacementConstraint `json:"PlacementConstraints,omitempty"`
-
-	// PlacementStrategies AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-placementstrategies
-	PlacementStrategies []AWSECSService_PlacementStrategy `json:"PlacementStrategies,omitempty"`
-
-	// Role AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-role
-	Role string `json:"Role,omitempty"`
-
-	// ServiceName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-servicename
-	ServiceName string `json:"ServiceName,omitempty"`
-
-	// TaskDefinition AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-taskdefinition
-	TaskDefinition string `json:"TaskDefinition,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSService) AWSCloudFormationType() string {
-	return "AWS::ECS::Service"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSECSService) MarshalJSON() ([]byte, error) {
-	type Properties AWSECSService
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSECSService) UnmarshalJSON(b []byte) error {
-	type Properties AWSECSService
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSECSService(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSECSServiceResources retrieves all AWSECSService items from an AWS CloudFormation template
-func (t *Template) GetAllAWSECSServiceResources() map[string]AWSECSService {
-	results := map[string]AWSECSService{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSECSService:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ECS::Service" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSECSService
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSECSServiceWithName retrieves all AWSECSService items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSECSServiceWithName(name string) (AWSECSService, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSECSService:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ECS::Service" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSECSService
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSECSService{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service_deploymentconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service_deploymentconfiguration.go
deleted file mode 100644
index 785399069d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service_deploymentconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSECSService_DeploymentConfiguration AWS CloudFormation Resource (AWS::ECS::Service.DeploymentConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-deploymentconfiguration.html
-type AWSECSService_DeploymentConfiguration struct {
-
-	// MaximumPercent AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-deploymentconfiguration.html#cfn-ecs-service-deploymentconfiguration-maximumpercent
-	MaximumPercent int `json:"MaximumPercent,omitempty"`
-
-	// MinimumHealthyPercent AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-deploymentconfiguration.html#cfn-ecs-service-deploymentconfiguration-minimumhealthypercent
-	MinimumHealthyPercent int `json:"MinimumHealthyPercent,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSService_DeploymentConfiguration) AWSCloudFormationType() string {
-	return "AWS::ECS::Service.DeploymentConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service_loadbalancer.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service_loadbalancer.go
deleted file mode 100644
index 80b9f0f0d1..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service_loadbalancer.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSECSService_LoadBalancer AWS CloudFormation Resource (AWS::ECS::Service.LoadBalancer)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-loadbalancers.html
-type AWSECSService_LoadBalancer struct {
-
-	// ContainerName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-loadbalancers.html#cfn-ecs-service-loadbalancers-containername
-	ContainerName string `json:"ContainerName,omitempty"`
-
-	// ContainerPort AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-loadbalancers.html#cfn-ecs-service-loadbalancers-containerport
-	ContainerPort int `json:"ContainerPort,omitempty"`
-
-	// LoadBalancerName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-loadbalancers.html#cfn-ecs-service-loadbalancers-loadbalancername
-	LoadBalancerName string `json:"LoadBalancerName,omitempty"`
-
-	// TargetGroupArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-loadbalancers.html#cfn-ecs-service-loadbalancers-targetgrouparn
-	TargetGroupArn string `json:"TargetGroupArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSService_LoadBalancer) AWSCloudFormationType() string {
-	return "AWS::ECS::Service.LoadBalancer"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service_placementconstraint.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service_placementconstraint.go
deleted file mode 100644
index 2be8f0e313..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service_placementconstraint.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSECSService_PlacementConstraint AWS CloudFormation Resource (AWS::ECS::Service.PlacementConstraint)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-placementconstraint.html
-type AWSECSService_PlacementConstraint struct {
-
-	// Expression AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-placementconstraint.html#cfn-ecs-service-placementconstraint-expression
-	Expression string `json:"Expression,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-placementconstraint.html#cfn-ecs-service-placementconstraint-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSService_PlacementConstraint) AWSCloudFormationType() string {
-	return "AWS::ECS::Service.PlacementConstraint"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service_placementstrategy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service_placementstrategy.go
deleted file mode 100644
index 3c31865668..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-service_placementstrategy.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSECSService_PlacementStrategy AWS CloudFormation Resource (AWS::ECS::Service.PlacementStrategy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-placementstrategy.html
-type AWSECSService_PlacementStrategy struct {
-
-	// Field AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-placementstrategy.html#cfn-ecs-service-placementstrategy-field
-	Field string `json:"Field,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-placementstrategy.html#cfn-ecs-service-placementstrategy-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSService_PlacementStrategy) AWSCloudFormationType() string {
-	return "AWS::ECS::Service.PlacementStrategy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition.go
deleted file mode 100644
index ee2ee00b3f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSECSTaskDefinition AWS CloudFormation Resource (AWS::ECS::TaskDefinition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html
-type AWSECSTaskDefinition struct {
-
-	// ContainerDefinitions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-containerdefinitions
-	ContainerDefinitions []AWSECSTaskDefinition_ContainerDefinition `json:"ContainerDefinitions,omitempty"`
-
-	// Family AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-family
-	Family string `json:"Family,omitempty"`
-
-	// NetworkMode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-networkmode
-	NetworkMode string `json:"NetworkMode,omitempty"`
-
-	// PlacementConstraints AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-placementconstraints
-	PlacementConstraints []AWSECSTaskDefinition_TaskDefinitionPlacementConstraint `json:"PlacementConstraints,omitempty"`
-
-	// TaskRoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-taskrolearn
-	TaskRoleArn string `json:"TaskRoleArn,omitempty"`
-
-	// Volumes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-volumes
-	Volumes []AWSECSTaskDefinition_Volume `json:"Volumes,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSTaskDefinition) AWSCloudFormationType() string {
-	return "AWS::ECS::TaskDefinition"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSECSTaskDefinition) MarshalJSON() ([]byte, error) {
-	type Properties AWSECSTaskDefinition
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSECSTaskDefinition) UnmarshalJSON(b []byte) error {
-	type Properties AWSECSTaskDefinition
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSECSTaskDefinition(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSECSTaskDefinitionResources retrieves all AWSECSTaskDefinition items from an AWS CloudFormation template
-func (t *Template) GetAllAWSECSTaskDefinitionResources() map[string]AWSECSTaskDefinition {
-	results := map[string]AWSECSTaskDefinition{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSECSTaskDefinition:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ECS::TaskDefinition" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSECSTaskDefinition
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSECSTaskDefinitionWithName retrieves all AWSECSTaskDefinition items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSECSTaskDefinitionWithName(name string) (AWSECSTaskDefinition, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSECSTaskDefinition:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ECS::TaskDefinition" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSECSTaskDefinition
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSECSTaskDefinition{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_containerdefinition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_containerdefinition.go
deleted file mode 100644
index 0368a0d828..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_containerdefinition.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package cloudformation
-
-// AWSECSTaskDefinition_ContainerDefinition AWS CloudFormation Resource (AWS::ECS::TaskDefinition.ContainerDefinition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html
-type AWSECSTaskDefinition_ContainerDefinition struct {
-
-	// Command AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-command
-	Command []string `json:"Command,omitempty"`
-
-	// Cpu AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-cpu
-	Cpu int `json:"Cpu,omitempty"`
-
-	// DisableNetworking AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-disablenetworking
-	DisableNetworking bool `json:"DisableNetworking,omitempty"`
-
-	// DnsSearchDomains AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-dnssearchdomains
-	DnsSearchDomains []string `json:"DnsSearchDomains,omitempty"`
-
-	// DnsServers AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-dnsservers
-	DnsServers []string `json:"DnsServers,omitempty"`
-
-	// DockerLabels AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-dockerlabels
-	DockerLabels map[string]string `json:"DockerLabels,omitempty"`
-
-	// DockerSecurityOptions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-dockersecurityoptions
-	DockerSecurityOptions []string `json:"DockerSecurityOptions,omitempty"`
-
-	// EntryPoint AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-entrypoint
-	EntryPoint []string `json:"EntryPoint,omitempty"`
-
-	// Environment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-environment
-	Environment []AWSECSTaskDefinition_KeyValuePair `json:"Environment,omitempty"`
-
-	// Essential AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-essential
-	Essential bool `json:"Essential,omitempty"`
-
-	// ExtraHosts AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-extrahosts
-	ExtraHosts []AWSECSTaskDefinition_HostEntry `json:"ExtraHosts,omitempty"`
-
-	// Hostname AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-hostname
-	Hostname string `json:"Hostname,omitempty"`
-
-	// Image AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-image
-	Image string `json:"Image,omitempty"`
-
-	// Links AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-links
-	Links []string `json:"Links,omitempty"`
-
-	// LogConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-logconfiguration
-	LogConfiguration *AWSECSTaskDefinition_LogConfiguration `json:"LogConfiguration,omitempty"`
-
-	// Memory AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-memory
-	Memory int `json:"Memory,omitempty"`
-
-	// MemoryReservation AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-memoryreservation
-	MemoryReservation int `json:"MemoryReservation,omitempty"`
-
-	// MountPoints AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-mountpoints
-	MountPoints []AWSECSTaskDefinition_MountPoint `json:"MountPoints,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-name
-	Name string `json:"Name,omitempty"`
-
-	// PortMappings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-portmappings
-	PortMappings []AWSECSTaskDefinition_PortMapping `json:"PortMappings,omitempty"`
-
-	// Privileged AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-privileged
-	Privileged bool `json:"Privileged,omitempty"`
-
-	// ReadonlyRootFilesystem AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-readonlyrootfilesystem
-	ReadonlyRootFilesystem bool `json:"ReadonlyRootFilesystem,omitempty"`
-
-	// Ulimits AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-ulimits
-	Ulimits []AWSECSTaskDefinition_Ulimit `json:"Ulimits,omitempty"`
-
-	// User AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-user
-	User string `json:"User,omitempty"`
-
-	// VolumesFrom AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-volumesfrom
-	VolumesFrom []AWSECSTaskDefinition_VolumeFrom `json:"VolumesFrom,omitempty"`
-
-	// WorkingDirectory AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-workingdirectory
-	WorkingDirectory string `json:"WorkingDirectory,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSTaskDefinition_ContainerDefinition) AWSCloudFormationType() string {
-	return "AWS::ECS::TaskDefinition.ContainerDefinition"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_hostentry.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_hostentry.go
deleted file mode 100644
index 6ce10d61de..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_hostentry.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSECSTaskDefinition_HostEntry AWS CloudFormation Resource (AWS::ECS::TaskDefinition.HostEntry)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-hostentry.html
-type AWSECSTaskDefinition_HostEntry struct {
-
-	// Hostname AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-hostentry.html#cfn-ecs-taskdefinition-containerdefinition-hostentry-hostname
-	Hostname string `json:"Hostname,omitempty"`
-
-	// IpAddress AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-hostentry.html#cfn-ecs-taskdefinition-containerdefinition-hostentry-ipaddress
-	IpAddress string `json:"IpAddress,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSTaskDefinition_HostEntry) AWSCloudFormationType() string {
-	return "AWS::ECS::TaskDefinition.HostEntry"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_hostvolumeproperties.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_hostvolumeproperties.go
deleted file mode 100644
index 0badcd2b1a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_hostvolumeproperties.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSECSTaskDefinition_HostVolumeProperties AWS CloudFormation Resource (AWS::ECS::TaskDefinition.HostVolumeProperties)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-volumes-host.html
-type AWSECSTaskDefinition_HostVolumeProperties struct {
-
-	// SourcePath AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-volumes-host.html#cfn-ecs-taskdefinition-volumes-host-sourcepath
-	SourcePath string `json:"SourcePath,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSTaskDefinition_HostVolumeProperties) AWSCloudFormationType() string {
-	return "AWS::ECS::TaskDefinition.HostVolumeProperties"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_keyvaluepair.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_keyvaluepair.go
deleted file mode 100644
index 5d216e2158..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_keyvaluepair.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSECSTaskDefinition_KeyValuePair AWS CloudFormation Resource (AWS::ECS::TaskDefinition.KeyValuePair)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-environment.html
-type AWSECSTaskDefinition_KeyValuePair struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-environment.html#cfn-ecs-taskdefinition-containerdefinition-environment-name
-	Name string `json:"Name,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-environment.html#cfn-ecs-taskdefinition-containerdefinition-environment-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSTaskDefinition_KeyValuePair) AWSCloudFormationType() string {
-	return "AWS::ECS::TaskDefinition.KeyValuePair"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_logconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_logconfiguration.go
deleted file mode 100644
index 7579f2825c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_logconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSECSTaskDefinition_LogConfiguration AWS CloudFormation Resource (AWS::ECS::TaskDefinition.LogConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-logconfiguration.html
-type AWSECSTaskDefinition_LogConfiguration struct {
-
-	// LogDriver AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-logconfiguration.html#cfn-ecs-taskdefinition-containerdefinition-logconfiguration-logdriver
-	LogDriver string `json:"LogDriver,omitempty"`
-
-	// Options AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-logconfiguration.html#cfn-ecs-taskdefinition-containerdefinition-logconfiguration-options
-	Options map[string]string `json:"Options,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSTaskDefinition_LogConfiguration) AWSCloudFormationType() string {
-	return "AWS::ECS::TaskDefinition.LogConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_mountpoint.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_mountpoint.go
deleted file mode 100644
index e447bceea1..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_mountpoint.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSECSTaskDefinition_MountPoint AWS CloudFormation Resource (AWS::ECS::TaskDefinition.MountPoint)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-mountpoints.html
-type AWSECSTaskDefinition_MountPoint struct {
-
-	// ContainerPath AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-mountpoints.html#cfn-ecs-taskdefinition-containerdefinition-mountpoints-containerpath
-	ContainerPath string `json:"ContainerPath,omitempty"`
-
-	// ReadOnly AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-mountpoints.html#cfn-ecs-taskdefinition-containerdefinition-mountpoints-readonly
-	ReadOnly bool `json:"ReadOnly,omitempty"`
-
-	// SourceVolume AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-mountpoints.html#cfn-ecs-taskdefinition-containerdefinition-mountpoints-sourcevolume
-	SourceVolume string `json:"SourceVolume,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSTaskDefinition_MountPoint) AWSCloudFormationType() string {
-	return "AWS::ECS::TaskDefinition.MountPoint"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_portmapping.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_portmapping.go
deleted file mode 100644
index 5452b10ddd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_portmapping.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSECSTaskDefinition_PortMapping AWS CloudFormation Resource (AWS::ECS::TaskDefinition.PortMapping)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-portmappings.html
-type AWSECSTaskDefinition_PortMapping struct {
-
-	// ContainerPort AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-portmappings.html#cfn-ecs-taskdefinition-containerdefinition-portmappings-containerport
-	ContainerPort int `json:"ContainerPort,omitempty"`
-
-	// HostPort AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-portmappings.html#cfn-ecs-taskdefinition-containerdefinition-portmappings-readonly
-	HostPort int `json:"HostPort,omitempty"`
-
-	// Protocol AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-portmappings.html#cfn-ecs-taskdefinition-containerdefinition-portmappings-sourcevolume
-	Protocol string `json:"Protocol,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSTaskDefinition_PortMapping) AWSCloudFormationType() string {
-	return "AWS::ECS::TaskDefinition.PortMapping"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go
deleted file mode 100644
index 504755041c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSECSTaskDefinition_TaskDefinitionPlacementConstraint AWS CloudFormation Resource (AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-taskdefinitionplacementconstraint.html
-type AWSECSTaskDefinition_TaskDefinitionPlacementConstraint struct {
-
-	// Expression AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-taskdefinitionplacementconstraint.html#cfn-ecs-taskdefinition-taskdefinitionplacementconstraint-expression
-	Expression string `json:"Expression,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-taskdefinitionplacementconstraint.html#cfn-ecs-taskdefinition-taskdefinitionplacementconstraint-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSTaskDefinition_TaskDefinitionPlacementConstraint) AWSCloudFormationType() string {
-	return "AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_ulimit.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_ulimit.go
deleted file mode 100644
index 312be33a0c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_ulimit.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSECSTaskDefinition_Ulimit AWS CloudFormation Resource (AWS::ECS::TaskDefinition.Ulimit)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-ulimit.html
-type AWSECSTaskDefinition_Ulimit struct {
-
-	// HardLimit AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-ulimit.html#cfn-ecs-taskdefinition-containerdefinition-ulimit-hardlimit
-	HardLimit int `json:"HardLimit,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-ulimit.html#cfn-ecs-taskdefinition-containerdefinition-ulimit-name
-	Name string `json:"Name,omitempty"`
-
-	// SoftLimit AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-ulimit.html#cfn-ecs-taskdefinition-containerdefinition-ulimit-softlimit
-	SoftLimit int `json:"SoftLimit,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSTaskDefinition_Ulimit) AWSCloudFormationType() string {
-	return "AWS::ECS::TaskDefinition.Ulimit"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_volume.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_volume.go
deleted file mode 100644
index 903269d937..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_volume.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSECSTaskDefinition_Volume AWS CloudFormation Resource (AWS::ECS::TaskDefinition.Volume)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-volumes.html
-type AWSECSTaskDefinition_Volume struct {
-
-	// Host AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-volumes.html#cfn-ecs-taskdefinition-volumes-host
-	Host *AWSECSTaskDefinition_HostVolumeProperties `json:"Host,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-volumes.html#cfn-ecs-taskdefinition-volumes-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSTaskDefinition_Volume) AWSCloudFormationType() string {
-	return "AWS::ECS::TaskDefinition.Volume"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_volumefrom.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_volumefrom.go
deleted file mode 100644
index 36499016dc..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ecs-taskdefinition_volumefrom.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSECSTaskDefinition_VolumeFrom AWS CloudFormation Resource (AWS::ECS::TaskDefinition.VolumeFrom)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-volumesfrom.html
-type AWSECSTaskDefinition_VolumeFrom struct {
-
-	// ReadOnly AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-volumesfrom.html#cfn-ecs-taskdefinition-containerdefinition-volumesfrom-readonly
-	ReadOnly bool `json:"ReadOnly,omitempty"`
-
-	// SourceContainer AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-volumesfrom.html#cfn-ecs-taskdefinition-containerdefinition-volumesfrom-sourcecontainer
-	SourceContainer string `json:"SourceContainer,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSECSTaskDefinition_VolumeFrom) AWSCloudFormationType() string {
-	return "AWS::ECS::TaskDefinition.VolumeFrom"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-efs-filesystem.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-efs-filesystem.go
deleted file mode 100644
index 8d8ccb01c2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-efs-filesystem.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEFSFileSystem AWS CloudFormation Resource (AWS::EFS::FileSystem)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html
-type AWSEFSFileSystem struct {
-
-	// Encrypted AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-encrypted
-	Encrypted bool `json:"Encrypted,omitempty"`
-
-	// FileSystemTags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-filesystemtags
-	FileSystemTags []AWSEFSFileSystem_ElasticFileSystemTag `json:"FileSystemTags,omitempty"`
-
-	// KmsKeyId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-kmskeyid
-	KmsKeyId string `json:"KmsKeyId,omitempty"`
-
-	// PerformanceMode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-performancemode
-	PerformanceMode string `json:"PerformanceMode,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEFSFileSystem) AWSCloudFormationType() string {
-	return "AWS::EFS::FileSystem"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEFSFileSystem) MarshalJSON() ([]byte, error) {
-	type Properties AWSEFSFileSystem
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEFSFileSystem) UnmarshalJSON(b []byte) error {
-	type Properties AWSEFSFileSystem
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEFSFileSystem(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEFSFileSystemResources retrieves all AWSEFSFileSystem items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEFSFileSystemResources() map[string]AWSEFSFileSystem {
-	results := map[string]AWSEFSFileSystem{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEFSFileSystem:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EFS::FileSystem" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEFSFileSystem
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEFSFileSystemWithName retrieves all AWSEFSFileSystem items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEFSFileSystemWithName(name string) (AWSEFSFileSystem, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEFSFileSystem:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EFS::FileSystem" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEFSFileSystem
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEFSFileSystem{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-efs-filesystem_elasticfilesystemtag.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-efs-filesystem_elasticfilesystemtag.go
deleted file mode 100644
index 4421b17dae..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-efs-filesystem_elasticfilesystemtag.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEFSFileSystem_ElasticFileSystemTag AWS CloudFormation Resource (AWS::EFS::FileSystem.ElasticFileSystemTag)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-filesystem-filesystemtags.html
-type AWSEFSFileSystem_ElasticFileSystemTag struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-filesystem-filesystemtags.html#cfn-efs-filesystem-filesystemtags-key
-	Key string `json:"Key,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-filesystem-filesystemtags.html#cfn-efs-filesystem-filesystemtags-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEFSFileSystem_ElasticFileSystemTag) AWSCloudFormationType() string {
-	return "AWS::EFS::FileSystem.ElasticFileSystemTag"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-efs-mounttarget.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-efs-mounttarget.go
deleted file mode 100644
index ac14214fff..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-efs-mounttarget.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEFSMountTarget AWS CloudFormation Resource (AWS::EFS::MountTarget)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html
-type AWSEFSMountTarget struct {
-
-	// FileSystemId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html#cfn-efs-mounttarget-filesystemid
-	FileSystemId string `json:"FileSystemId,omitempty"`
-
-	// IpAddress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html#cfn-efs-mounttarget-ipaddress
-	IpAddress string `json:"IpAddress,omitempty"`
-
-	// SecurityGroups AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html#cfn-efs-mounttarget-securitygroups
-	SecurityGroups []string `json:"SecurityGroups,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html#cfn-efs-mounttarget-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEFSMountTarget) AWSCloudFormationType() string {
-	return "AWS::EFS::MountTarget"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEFSMountTarget) MarshalJSON() ([]byte, error) {
-	type Properties AWSEFSMountTarget
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEFSMountTarget) UnmarshalJSON(b []byte) error {
-	type Properties AWSEFSMountTarget
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEFSMountTarget(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEFSMountTargetResources retrieves all AWSEFSMountTarget items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEFSMountTargetResources() map[string]AWSEFSMountTarget {
-	results := map[string]AWSEFSMountTarget{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEFSMountTarget:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EFS::MountTarget" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEFSMountTarget
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEFSMountTargetWithName retrieves all AWSEFSMountTarget items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEFSMountTargetWithName(name string) (AWSEFSMountTarget, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEFSMountTarget:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EFS::MountTarget" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEFSMountTarget
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEFSMountTarget{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-cachecluster.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-cachecluster.go
deleted file mode 100644
index d76defd63b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-cachecluster.go
+++ /dev/null
@@ -1,210 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElastiCacheCacheCluster AWS CloudFormation Resource (AWS::ElastiCache::CacheCluster)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html
-type AWSElastiCacheCacheCluster struct {
-
-	// AZMode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-azmode
-	AZMode string `json:"AZMode,omitempty"`
-
-	// AutoMinorVersionUpgrade AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-autominorversionupgrade
-	AutoMinorVersionUpgrade bool `json:"AutoMinorVersionUpgrade,omitempty"`
-
-	// CacheNodeType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-cachenodetype
-	CacheNodeType string `json:"CacheNodeType,omitempty"`
-
-	// CacheParameterGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-cacheparametergroupname
-	CacheParameterGroupName string `json:"CacheParameterGroupName,omitempty"`
-
-	// CacheSecurityGroupNames AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-cachesecuritygroupnames
-	CacheSecurityGroupNames []string `json:"CacheSecurityGroupNames,omitempty"`
-
-	// CacheSubnetGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-cachesubnetgroupname
-	CacheSubnetGroupName string `json:"CacheSubnetGroupName,omitempty"`
-
-	// ClusterName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-clustername
-	ClusterName string `json:"ClusterName,omitempty"`
-
-	// Engine AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-engine
-	Engine string `json:"Engine,omitempty"`
-
-	// EngineVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-engineversion
-	EngineVersion string `json:"EngineVersion,omitempty"`
-
-	// NotificationTopicArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-notificationtopicarn
-	NotificationTopicArn string `json:"NotificationTopicArn,omitempty"`
-
-	// NumCacheNodes AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-numcachenodes
-	NumCacheNodes int `json:"NumCacheNodes,omitempty"`
-
-	// Port AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-port
-	Port int `json:"Port,omitempty"`
-
-	// PreferredAvailabilityZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-preferredavailabilityzone
-	PreferredAvailabilityZone string `json:"PreferredAvailabilityZone,omitempty"`
-
-	// PreferredAvailabilityZones AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-preferredavailabilityzones
-	PreferredAvailabilityZones []string `json:"PreferredAvailabilityZones,omitempty"`
-
-	// PreferredMaintenanceWindow AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-preferredmaintenancewindow
-	PreferredMaintenanceWindow string `json:"PreferredMaintenanceWindow,omitempty"`
-
-	// SnapshotArns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-snapshotarns
-	SnapshotArns []string `json:"SnapshotArns,omitempty"`
-
-	// SnapshotName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-snapshotname
-	SnapshotName string `json:"SnapshotName,omitempty"`
-
-	// SnapshotRetentionLimit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-snapshotretentionlimit
-	SnapshotRetentionLimit int `json:"SnapshotRetentionLimit,omitempty"`
-
-	// SnapshotWindow AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-snapshotwindow
-	SnapshotWindow string `json:"SnapshotWindow,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// VpcSecurityGroupIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-vpcsecuritygroupids
-	VpcSecurityGroupIds []string `json:"VpcSecurityGroupIds,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElastiCacheCacheCluster) AWSCloudFormationType() string {
-	return "AWS::ElastiCache::CacheCluster"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElastiCacheCacheCluster) MarshalJSON() ([]byte, error) {
-	type Properties AWSElastiCacheCacheCluster
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElastiCacheCacheCluster) UnmarshalJSON(b []byte) error {
-	type Properties AWSElastiCacheCacheCluster
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElastiCacheCacheCluster(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElastiCacheCacheClusterResources retrieves all AWSElastiCacheCacheCluster items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElastiCacheCacheClusterResources() map[string]AWSElastiCacheCacheCluster {
-	results := map[string]AWSElastiCacheCacheCluster{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElastiCacheCacheCluster:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElastiCache::CacheCluster" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElastiCacheCacheCluster
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElastiCacheCacheClusterWithName retrieves all AWSElastiCacheCacheCluster items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElastiCacheCacheClusterWithName(name string) (AWSElastiCacheCacheCluster, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElastiCacheCacheCluster:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElastiCache::CacheCluster" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElastiCacheCacheCluster
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElastiCacheCacheCluster{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-parametergroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-parametergroup.go
deleted file mode 100644
index bd13890651..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-parametergroup.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElastiCacheParameterGroup AWS CloudFormation Resource (AWS::ElastiCache::ParameterGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-parameter-group.html
-type AWSElastiCacheParameterGroup struct {
-
-	// CacheParameterGroupFamily AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-parameter-group.html#cfn-elasticache-parametergroup-cacheparametergroupfamily
-	CacheParameterGroupFamily string `json:"CacheParameterGroupFamily,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-parameter-group.html#cfn-elasticache-parametergroup-description
-	Description string `json:"Description,omitempty"`
-
-	// Properties AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-parameter-group.html#cfn-elasticache-parametergroup-properties
-	Properties map[string]string `json:"Properties,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElastiCacheParameterGroup) AWSCloudFormationType() string {
-	return "AWS::ElastiCache::ParameterGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElastiCacheParameterGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSElastiCacheParameterGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElastiCacheParameterGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSElastiCacheParameterGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElastiCacheParameterGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElastiCacheParameterGroupResources retrieves all AWSElastiCacheParameterGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElastiCacheParameterGroupResources() map[string]AWSElastiCacheParameterGroup {
-	results := map[string]AWSElastiCacheParameterGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElastiCacheParameterGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElastiCache::ParameterGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElastiCacheParameterGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElastiCacheParameterGroupWithName retrieves all AWSElastiCacheParameterGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElastiCacheParameterGroupWithName(name string) (AWSElastiCacheParameterGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElastiCacheParameterGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElastiCache::ParameterGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElastiCacheParameterGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElastiCacheParameterGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-replicationgroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-replicationgroup.go
deleted file mode 100644
index 89735c84f6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-replicationgroup.go
+++ /dev/null
@@ -1,235 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElastiCacheReplicationGroup AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html
-type AWSElastiCacheReplicationGroup struct {
-
-	// AutoMinorVersionUpgrade AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-autominorversionupgrade
-	AutoMinorVersionUpgrade bool `json:"AutoMinorVersionUpgrade,omitempty"`
-
-	// AutomaticFailoverEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-automaticfailoverenabled
-	AutomaticFailoverEnabled bool `json:"AutomaticFailoverEnabled,omitempty"`
-
-	// CacheNodeType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-cachenodetype
-	CacheNodeType string `json:"CacheNodeType,omitempty"`
-
-	// CacheParameterGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-cacheparametergroupname
-	CacheParameterGroupName string `json:"CacheParameterGroupName,omitempty"`
-
-	// CacheSecurityGroupNames AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-cachesecuritygroupnames
-	CacheSecurityGroupNames []string `json:"CacheSecurityGroupNames,omitempty"`
-
-	// CacheSubnetGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-cachesubnetgroupname
-	CacheSubnetGroupName string `json:"CacheSubnetGroupName,omitempty"`
-
-	// Engine AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-engine
-	Engine string `json:"Engine,omitempty"`
-
-	// EngineVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-engineversion
-	EngineVersion string `json:"EngineVersion,omitempty"`
-
-	// NodeGroupConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-nodegroupconfiguration
-	NodeGroupConfiguration []AWSElastiCacheReplicationGroup_NodeGroupConfiguration `json:"NodeGroupConfiguration,omitempty"`
-
-	// NotificationTopicArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-notificationtopicarn
-	NotificationTopicArn string `json:"NotificationTopicArn,omitempty"`
-
-	// NumCacheClusters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-numcacheclusters
-	NumCacheClusters int `json:"NumCacheClusters,omitempty"`
-
-	// NumNodeGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-numnodegroups
-	NumNodeGroups int `json:"NumNodeGroups,omitempty"`
-
-	// Port AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-port
-	Port int `json:"Port,omitempty"`
-
-	// PreferredCacheClusterAZs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-preferredcacheclusterazs
-	PreferredCacheClusterAZs []string `json:"PreferredCacheClusterAZs,omitempty"`
-
-	// PreferredMaintenanceWindow AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-preferredmaintenancewindow
-	PreferredMaintenanceWindow string `json:"PreferredMaintenanceWindow,omitempty"`
-
-	// PrimaryClusterId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-primaryclusterid
-	PrimaryClusterId string `json:"PrimaryClusterId,omitempty"`
-
-	// ReplicasPerNodeGroup AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-replicaspernodegroup
-	ReplicasPerNodeGroup int `json:"ReplicasPerNodeGroup,omitempty"`
-
-	// ReplicationGroupDescription AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-replicationgroupdescription
-	ReplicationGroupDescription string `json:"ReplicationGroupDescription,omitempty"`
-
-	// ReplicationGroupId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-replicationgroupid
-	ReplicationGroupId string `json:"ReplicationGroupId,omitempty"`
-
-	// SecurityGroupIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-securitygroupids
-	SecurityGroupIds []string `json:"SecurityGroupIds,omitempty"`
-
-	// SnapshotArns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-snapshotarns
-	SnapshotArns []string `json:"SnapshotArns,omitempty"`
-
-	// SnapshotName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-snapshotname
-	SnapshotName string `json:"SnapshotName,omitempty"`
-
-	// SnapshotRetentionLimit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-snapshotretentionlimit
-	SnapshotRetentionLimit int `json:"SnapshotRetentionLimit,omitempty"`
-
-	// SnapshotWindow AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-snapshotwindow
-	SnapshotWindow string `json:"SnapshotWindow,omitempty"`
-
-	// SnapshottingClusterId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-snapshottingclusterid
-	SnapshottingClusterId string `json:"SnapshottingClusterId,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElastiCacheReplicationGroup) AWSCloudFormationType() string {
-	return "AWS::ElastiCache::ReplicationGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElastiCacheReplicationGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSElastiCacheReplicationGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElastiCacheReplicationGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSElastiCacheReplicationGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElastiCacheReplicationGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElastiCacheReplicationGroupResources retrieves all AWSElastiCacheReplicationGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElastiCacheReplicationGroupResources() map[string]AWSElastiCacheReplicationGroup {
-	results := map[string]AWSElastiCacheReplicationGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElastiCacheReplicationGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElastiCache::ReplicationGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElastiCacheReplicationGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElastiCacheReplicationGroupWithName retrieves all AWSElastiCacheReplicationGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElastiCacheReplicationGroupWithName(name string) (AWSElastiCacheReplicationGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElastiCacheReplicationGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElastiCache::ReplicationGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElastiCacheReplicationGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElastiCacheReplicationGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-replicationgroup_nodegroupconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-replicationgroup_nodegroupconfiguration.go
deleted file mode 100644
index 35c192070a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-replicationgroup_nodegroupconfiguration.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSElastiCacheReplicationGroup_NodeGroupConfiguration AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-nodegroupconfiguration.html
-type AWSElastiCacheReplicationGroup_NodeGroupConfiguration struct {
-
-	// PrimaryAvailabilityZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-nodegroupconfiguration.html#cfn-elasticache-replicationgroup-nodegroupconfiguration-primaryavailabilityzone
-	PrimaryAvailabilityZone string `json:"PrimaryAvailabilityZone,omitempty"`
-
-	// ReplicaAvailabilityZones AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-nodegroupconfiguration.html#cfn-elasticache-replicationgroup-nodegroupconfiguration-replicaavailabilityzones
-	ReplicaAvailabilityZones []string `json:"ReplicaAvailabilityZones,omitempty"`
-
-	// ReplicaCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-nodegroupconfiguration.html#cfn-elasticache-replicationgroup-nodegroupconfiguration-replicacount
-	ReplicaCount int `json:"ReplicaCount,omitempty"`
-
-	// Slots AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-nodegroupconfiguration.html#cfn-elasticache-replicationgroup-nodegroupconfiguration-slots
-	Slots string `json:"Slots,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElastiCacheReplicationGroup_NodeGroupConfiguration) AWSCloudFormationType() string {
-	return "AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-securitygroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-securitygroup.go
deleted file mode 100644
index ae28fd2192..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-securitygroup.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElastiCacheSecurityGroup AWS CloudFormation Resource (AWS::ElastiCache::SecurityGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group.html
-type AWSElastiCacheSecurityGroup struct {
-
-	// Description AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group.html#cfn-elasticache-securitygroup-description
-	Description string `json:"Description,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElastiCacheSecurityGroup) AWSCloudFormationType() string {
-	return "AWS::ElastiCache::SecurityGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElastiCacheSecurityGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSElastiCacheSecurityGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElastiCacheSecurityGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSElastiCacheSecurityGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElastiCacheSecurityGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElastiCacheSecurityGroupResources retrieves all AWSElastiCacheSecurityGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElastiCacheSecurityGroupResources() map[string]AWSElastiCacheSecurityGroup {
-	results := map[string]AWSElastiCacheSecurityGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElastiCacheSecurityGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElastiCache::SecurityGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElastiCacheSecurityGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElastiCacheSecurityGroupWithName retrieves all AWSElastiCacheSecurityGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElastiCacheSecurityGroupWithName(name string) (AWSElastiCacheSecurityGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElastiCacheSecurityGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElastiCache::SecurityGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElastiCacheSecurityGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElastiCacheSecurityGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-securitygroupingress.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-securitygroupingress.go
deleted file mode 100644
index 3d33ab9bf8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-securitygroupingress.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElastiCacheSecurityGroupIngress AWS CloudFormation Resource (AWS::ElastiCache::SecurityGroupIngress)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group-ingress.html
-type AWSElastiCacheSecurityGroupIngress struct {
-
-	// CacheSecurityGroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group-ingress.html#cfn-elasticache-securitygroupingress-cachesecuritygroupname
-	CacheSecurityGroupName string `json:"CacheSecurityGroupName,omitempty"`
-
-	// EC2SecurityGroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group-ingress.html#cfn-elasticache-securitygroupingress-ec2securitygroupname
-	EC2SecurityGroupName string `json:"EC2SecurityGroupName,omitempty"`
-
-	// EC2SecurityGroupOwnerId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group-ingress.html#cfn-elasticache-securitygroupingress-ec2securitygroupownerid
-	EC2SecurityGroupOwnerId string `json:"EC2SecurityGroupOwnerId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElastiCacheSecurityGroupIngress) AWSCloudFormationType() string {
-	return "AWS::ElastiCache::SecurityGroupIngress"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElastiCacheSecurityGroupIngress) MarshalJSON() ([]byte, error) {
-	type Properties AWSElastiCacheSecurityGroupIngress
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElastiCacheSecurityGroupIngress) UnmarshalJSON(b []byte) error {
-	type Properties AWSElastiCacheSecurityGroupIngress
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElastiCacheSecurityGroupIngress(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElastiCacheSecurityGroupIngressResources retrieves all AWSElastiCacheSecurityGroupIngress items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElastiCacheSecurityGroupIngressResources() map[string]AWSElastiCacheSecurityGroupIngress {
-	results := map[string]AWSElastiCacheSecurityGroupIngress{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElastiCacheSecurityGroupIngress:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElastiCache::SecurityGroupIngress" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElastiCacheSecurityGroupIngress
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElastiCacheSecurityGroupIngressWithName retrieves all AWSElastiCacheSecurityGroupIngress items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElastiCacheSecurityGroupIngressWithName(name string) (AWSElastiCacheSecurityGroupIngress, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElastiCacheSecurityGroupIngress:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElastiCache::SecurityGroupIngress" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElastiCacheSecurityGroupIngress
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElastiCacheSecurityGroupIngress{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-subnetgroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-subnetgroup.go
deleted file mode 100644
index b49d80e6f0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticache-subnetgroup.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElastiCacheSubnetGroup AWS CloudFormation Resource (AWS::ElastiCache::SubnetGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-subnetgroup.html
-type AWSElastiCacheSubnetGroup struct {
-
-	// CacheSubnetGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-subnetgroup.html#cfn-elasticache-subnetgroup-cachesubnetgroupname
-	CacheSubnetGroupName string `json:"CacheSubnetGroupName,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-subnetgroup.html#cfn-elasticache-subnetgroup-description
-	Description string `json:"Description,omitempty"`
-
-	// SubnetIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-subnetgroup.html#cfn-elasticache-subnetgroup-subnetids
-	SubnetIds []string `json:"SubnetIds,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElastiCacheSubnetGroup) AWSCloudFormationType() string {
-	return "AWS::ElastiCache::SubnetGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElastiCacheSubnetGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSElastiCacheSubnetGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElastiCacheSubnetGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSElastiCacheSubnetGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElastiCacheSubnetGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElastiCacheSubnetGroupResources retrieves all AWSElastiCacheSubnetGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElastiCacheSubnetGroupResources() map[string]AWSElastiCacheSubnetGroup {
-	results := map[string]AWSElastiCacheSubnetGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElastiCacheSubnetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElastiCache::SubnetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElastiCacheSubnetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElastiCacheSubnetGroupWithName retrieves all AWSElastiCacheSubnetGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElastiCacheSubnetGroupWithName(name string) (AWSElastiCacheSubnetGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElastiCacheSubnetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElastiCache::SubnetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElastiCacheSubnetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElastiCacheSubnetGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application.go
deleted file mode 100644
index 62be14cbb5..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElasticBeanstalkApplication AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk.html
-type AWSElasticBeanstalkApplication struct {
-
-	// ApplicationName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk.html#cfn-elasticbeanstalk-application-name
-	ApplicationName string `json:"ApplicationName,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk.html#cfn-elasticbeanstalk-application-description
-	Description string `json:"Description,omitempty"`
-
-	// ResourceLifecycleConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk.html#cfn-elasticbeanstalk-application-resourcelifecycleconfig
-	ResourceLifecycleConfig *AWSElasticBeanstalkApplication_ApplicationResourceLifecycleConfig `json:"ResourceLifecycleConfig,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkApplication) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::Application"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElasticBeanstalkApplication) MarshalJSON() ([]byte, error) {
-	type Properties AWSElasticBeanstalkApplication
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElasticBeanstalkApplication) UnmarshalJSON(b []byte) error {
-	type Properties AWSElasticBeanstalkApplication
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElasticBeanstalkApplication(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElasticBeanstalkApplicationResources retrieves all AWSElasticBeanstalkApplication items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElasticBeanstalkApplicationResources() map[string]AWSElasticBeanstalkApplication {
-	results := map[string]AWSElasticBeanstalkApplication{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElasticBeanstalkApplication:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticBeanstalk::Application" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticBeanstalkApplication
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElasticBeanstalkApplicationWithName retrieves all AWSElasticBeanstalkApplication items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElasticBeanstalkApplicationWithName(name string) (AWSElasticBeanstalkApplication, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElasticBeanstalkApplication:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticBeanstalk::Application" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticBeanstalkApplication
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElasticBeanstalkApplication{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go
deleted file mode 100644
index cc276ecd51..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticBeanstalkApplication_ApplicationResourceLifecycleConfig AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationresourcelifecycleconfig.html
-type AWSElasticBeanstalkApplication_ApplicationResourceLifecycleConfig struct {
-
-	// ServiceRole AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationresourcelifecycleconfig.html#cfn-elasticbeanstalk-application-applicationresourcelifecycleconfig-servicerole
-	ServiceRole string `json:"ServiceRole,omitempty"`
-
-	// VersionLifecycleConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationresourcelifecycleconfig.html#cfn-elasticbeanstalk-application-applicationresourcelifecycleconfig-versionlifecycleconfig
-	VersionLifecycleConfig *AWSElasticBeanstalkApplication_ApplicationVersionLifecycleConfig `json:"VersionLifecycleConfig,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkApplication_ApplicationResourceLifecycleConfig) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go
deleted file mode 100644
index 53cff7b4cd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticBeanstalkApplication_ApplicationVersionLifecycleConfig AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationversionlifecycleconfig.html
-type AWSElasticBeanstalkApplication_ApplicationVersionLifecycleConfig struct {
-
-	// MaxAgeRule AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationversionlifecycleconfig.html#cfn-elasticbeanstalk-application-applicationversionlifecycleconfig-maxagerule
-	MaxAgeRule *AWSElasticBeanstalkApplication_MaxAgeRule `json:"MaxAgeRule,omitempty"`
-
-	// MaxCountRule AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationversionlifecycleconfig.html#cfn-elasticbeanstalk-application-applicationversionlifecycleconfig-maxcountrule
-	MaxCountRule *AWSElasticBeanstalkApplication_MaxCountRule `json:"MaxCountRule,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkApplication_ApplicationVersionLifecycleConfig) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application_maxagerule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application_maxagerule.go
deleted file mode 100644
index d38ca2cdcc..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application_maxagerule.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSElasticBeanstalkApplication_MaxAgeRule AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application.MaxAgeRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxagerule.html
-type AWSElasticBeanstalkApplication_MaxAgeRule struct {
-
-	// DeleteSourceFromS3 AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxagerule.html#cfn-elasticbeanstalk-application-maxagerule-deletesourcefroms3
-	DeleteSourceFromS3 bool `json:"DeleteSourceFromS3,omitempty"`
-
-	// Enabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxagerule.html#cfn-elasticbeanstalk-application-maxagerule-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// MaxAgeInDays AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxagerule.html#cfn-elasticbeanstalk-application-maxagerule-maxageindays
-	MaxAgeInDays int `json:"MaxAgeInDays,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkApplication_MaxAgeRule) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::Application.MaxAgeRule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application_maxcountrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application_maxcountrule.go
deleted file mode 100644
index e99dea3a24..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-application_maxcountrule.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSElasticBeanstalkApplication_MaxCountRule AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application.MaxCountRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxcountrule.html
-type AWSElasticBeanstalkApplication_MaxCountRule struct {
-
-	// DeleteSourceFromS3 AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxcountrule.html#cfn-elasticbeanstalk-application-maxcountrule-deletesourcefroms3
-	DeleteSourceFromS3 bool `json:"DeleteSourceFromS3,omitempty"`
-
-	// Enabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxcountrule.html#cfn-elasticbeanstalk-application-maxcountrule-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// MaxCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxcountrule.html#cfn-elasticbeanstalk-application-maxcountrule-maxcount
-	MaxCount int `json:"MaxCount,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkApplication_MaxCountRule) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::Application.MaxCountRule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-applicationversion.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-applicationversion.go
deleted file mode 100644
index 9e1b15e981..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-applicationversion.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElasticBeanstalkApplicationVersion AWS CloudFormation Resource (AWS::ElasticBeanstalk::ApplicationVersion)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-version.html
-type AWSElasticBeanstalkApplicationVersion struct {
-
-	// ApplicationName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-version.html#cfn-elasticbeanstalk-applicationversion-applicationname
-	ApplicationName string `json:"ApplicationName,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-version.html#cfn-elasticbeanstalk-applicationversion-description
-	Description string `json:"Description,omitempty"`
-
-	// SourceBundle AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-version.html#cfn-elasticbeanstalk-applicationversion-sourcebundle
-	SourceBundle *AWSElasticBeanstalkApplicationVersion_SourceBundle `json:"SourceBundle,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkApplicationVersion) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::ApplicationVersion"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElasticBeanstalkApplicationVersion) MarshalJSON() ([]byte, error) {
-	type Properties AWSElasticBeanstalkApplicationVersion
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElasticBeanstalkApplicationVersion) UnmarshalJSON(b []byte) error {
-	type Properties AWSElasticBeanstalkApplicationVersion
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElasticBeanstalkApplicationVersion(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElasticBeanstalkApplicationVersionResources retrieves all AWSElasticBeanstalkApplicationVersion items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElasticBeanstalkApplicationVersionResources() map[string]AWSElasticBeanstalkApplicationVersion {
-	results := map[string]AWSElasticBeanstalkApplicationVersion{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElasticBeanstalkApplicationVersion:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticBeanstalk::ApplicationVersion" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticBeanstalkApplicationVersion
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElasticBeanstalkApplicationVersionWithName retrieves all AWSElasticBeanstalkApplicationVersion items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElasticBeanstalkApplicationVersionWithName(name string) (AWSElasticBeanstalkApplicationVersion, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElasticBeanstalkApplicationVersion:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticBeanstalk::ApplicationVersion" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticBeanstalkApplicationVersion
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElasticBeanstalkApplicationVersion{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-applicationversion_sourcebundle.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-applicationversion_sourcebundle.go
deleted file mode 100644
index 538ed72005..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-applicationversion_sourcebundle.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticBeanstalkApplicationVersion_SourceBundle AWS CloudFormation Resource (AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-sourcebundle.html
-type AWSElasticBeanstalkApplicationVersion_SourceBundle struct {
-
-	// S3Bucket AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-sourcebundle.html#cfn-beanstalk-sourcebundle-s3bucket
-	S3Bucket string `json:"S3Bucket,omitempty"`
-
-	// S3Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-sourcebundle.html#cfn-beanstalk-sourcebundle-s3key
-	S3Key string `json:"S3Key,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkApplicationVersion_SourceBundle) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-configurationtemplate.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-configurationtemplate.go
deleted file mode 100644
index 55e1ad8282..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-configurationtemplate.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElasticBeanstalkConfigurationTemplate AWS CloudFormation Resource (AWS::ElasticBeanstalk::ConfigurationTemplate)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html
-type AWSElasticBeanstalkConfigurationTemplate struct {
-
-	// ApplicationName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-applicationname
-	ApplicationName string `json:"ApplicationName,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-description
-	Description string `json:"Description,omitempty"`
-
-	// EnvironmentId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-environmentid
-	EnvironmentId string `json:"EnvironmentId,omitempty"`
-
-	// OptionSettings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-optionsettings
-	OptionSettings []AWSElasticBeanstalkConfigurationTemplate_ConfigurationOptionSetting `json:"OptionSettings,omitempty"`
-
-	// PlatformArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-platformarn
-	PlatformArn string `json:"PlatformArn,omitempty"`
-
-	// SolutionStackName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-solutionstackname
-	SolutionStackName string `json:"SolutionStackName,omitempty"`
-
-	// SourceConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-beanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-sourceconfiguration
-	SourceConfiguration *AWSElasticBeanstalkConfigurationTemplate_SourceConfiguration `json:"SourceConfiguration,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkConfigurationTemplate) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::ConfigurationTemplate"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElasticBeanstalkConfigurationTemplate) MarshalJSON() ([]byte, error) {
-	type Properties AWSElasticBeanstalkConfigurationTemplate
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElasticBeanstalkConfigurationTemplate) UnmarshalJSON(b []byte) error {
-	type Properties AWSElasticBeanstalkConfigurationTemplate
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElasticBeanstalkConfigurationTemplate(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElasticBeanstalkConfigurationTemplateResources retrieves all AWSElasticBeanstalkConfigurationTemplate items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElasticBeanstalkConfigurationTemplateResources() map[string]AWSElasticBeanstalkConfigurationTemplate {
-	results := map[string]AWSElasticBeanstalkConfigurationTemplate{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElasticBeanstalkConfigurationTemplate:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticBeanstalk::ConfigurationTemplate" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticBeanstalkConfigurationTemplate
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElasticBeanstalkConfigurationTemplateWithName retrieves all AWSElasticBeanstalkConfigurationTemplate items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElasticBeanstalkConfigurationTemplateWithName(name string) (AWSElasticBeanstalkConfigurationTemplate, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElasticBeanstalkConfigurationTemplate:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticBeanstalk::ConfigurationTemplate" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticBeanstalkConfigurationTemplate
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElasticBeanstalkConfigurationTemplate{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go
deleted file mode 100644
index 05b6bf2bf3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSElasticBeanstalkConfigurationTemplate_ConfigurationOptionSetting AWS CloudFormation Resource (AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html
-type AWSElasticBeanstalkConfigurationTemplate_ConfigurationOptionSetting struct {
-
-	// Namespace AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-beanstalk-optionsettings-namespace
-	Namespace string `json:"Namespace,omitempty"`
-
-	// OptionName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-beanstalk-optionsettings-optionname
-	OptionName string `json:"OptionName,omitempty"`
-
-	// ResourceName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-elasticbeanstalk-configurationtemplate-configurationoptionsetting-resourcename
-	ResourceName string `json:"ResourceName,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-beanstalk-optionsettings-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkConfigurationTemplate_ConfigurationOptionSetting) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go
deleted file mode 100644
index 04b3803d16..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticBeanstalkConfigurationTemplate_SourceConfiguration AWS CloudFormation Resource (AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-configurationtemplate-sourceconfiguration.html
-type AWSElasticBeanstalkConfigurationTemplate_SourceConfiguration struct {
-
-	// ApplicationName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-configurationtemplate-sourceconfiguration.html#cfn-beanstalk-configurationtemplate-sourceconfiguration-applicationname
-	ApplicationName string `json:"ApplicationName,omitempty"`
-
-	// TemplateName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-configurationtemplate-sourceconfiguration.html#cfn-beanstalk-configurationtemplate-sourceconfiguration-templatename
-	TemplateName string `json:"TemplateName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkConfigurationTemplate_SourceConfiguration) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-environment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-environment.go
deleted file mode 100644
index ea77b57767..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-environment.go
+++ /dev/null
@@ -1,160 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElasticBeanstalkEnvironment AWS CloudFormation Resource (AWS::ElasticBeanstalk::Environment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html
-type AWSElasticBeanstalkEnvironment struct {
-
-	// ApplicationName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-applicationname
-	ApplicationName string `json:"ApplicationName,omitempty"`
-
-	// CNAMEPrefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-cnameprefix
-	CNAMEPrefix string `json:"CNAMEPrefix,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-description
-	Description string `json:"Description,omitempty"`
-
-	// EnvironmentName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-name
-	EnvironmentName string `json:"EnvironmentName,omitempty"`
-
-	// OptionSettings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-optionsettings
-	OptionSettings []AWSElasticBeanstalkEnvironment_OptionSetting `json:"OptionSettings,omitempty"`
-
-	// PlatformArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-platformarn
-	PlatformArn string `json:"PlatformArn,omitempty"`
-
-	// SolutionStackName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-solutionstackname
-	SolutionStackName string `json:"SolutionStackName,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-elasticbeanstalk-environment-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// TemplateName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-templatename
-	TemplateName string `json:"TemplateName,omitempty"`
-
-	// Tier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-tier
-	Tier *AWSElasticBeanstalkEnvironment_Tier `json:"Tier,omitempty"`
-
-	// VersionLabel AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-versionlabel
-	VersionLabel string `json:"VersionLabel,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkEnvironment) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::Environment"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElasticBeanstalkEnvironment) MarshalJSON() ([]byte, error) {
-	type Properties AWSElasticBeanstalkEnvironment
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElasticBeanstalkEnvironment) UnmarshalJSON(b []byte) error {
-	type Properties AWSElasticBeanstalkEnvironment
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElasticBeanstalkEnvironment(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElasticBeanstalkEnvironmentResources retrieves all AWSElasticBeanstalkEnvironment items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElasticBeanstalkEnvironmentResources() map[string]AWSElasticBeanstalkEnvironment {
-	results := map[string]AWSElasticBeanstalkEnvironment{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElasticBeanstalkEnvironment:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticBeanstalk::Environment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticBeanstalkEnvironment
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElasticBeanstalkEnvironmentWithName retrieves all AWSElasticBeanstalkEnvironment items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElasticBeanstalkEnvironmentWithName(name string) (AWSElasticBeanstalkEnvironment, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElasticBeanstalkEnvironment:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticBeanstalk::Environment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticBeanstalkEnvironment
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElasticBeanstalkEnvironment{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-environment_optionsetting.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-environment_optionsetting.go
deleted file mode 100644
index 8079af730c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-environment_optionsetting.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSElasticBeanstalkEnvironment_OptionSetting AWS CloudFormation Resource (AWS::ElasticBeanstalk::Environment.OptionSetting)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html
-type AWSElasticBeanstalkEnvironment_OptionSetting struct {
-
-	// Namespace AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-beanstalk-optionsettings-namespace
-	Namespace string `json:"Namespace,omitempty"`
-
-	// OptionName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-beanstalk-optionsettings-optionname
-	OptionName string `json:"OptionName,omitempty"`
-
-	// ResourceName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-elasticbeanstalk-environment-optionsetting-resourcename
-	ResourceName string `json:"ResourceName,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-beanstalk-optionsettings-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkEnvironment_OptionSetting) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::Environment.OptionSetting"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-environment_tier.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-environment_tier.go
deleted file mode 100644
index 87d7fcb0b8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticbeanstalk-environment_tier.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSElasticBeanstalkEnvironment_Tier AWS CloudFormation Resource (AWS::ElasticBeanstalk::Environment.Tier)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment-tier.html
-type AWSElasticBeanstalkEnvironment_Tier struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment-tier.html#cfn-beanstalk-env-tier-name
-	Name string `json:"Name,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment-tier.html#cfn-beanstalk-env-tier-type
-	Type string `json:"Type,omitempty"`
-
-	// Version AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment-tier.html#cfn-beanstalk-env-tier-version
-	Version string `json:"Version,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticBeanstalkEnvironment_Tier) AWSCloudFormationType() string {
-	return "AWS::ElasticBeanstalk::Environment.Tier"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer.go
deleted file mode 100644
index 73bbed492e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer.go
+++ /dev/null
@@ -1,185 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElasticLoadBalancingLoadBalancer AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html
-type AWSElasticLoadBalancingLoadBalancer struct {
-
-	// AccessLoggingPolicy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-accessloggingpolicy
-	AccessLoggingPolicy *AWSElasticLoadBalancingLoadBalancer_AccessLoggingPolicy `json:"AccessLoggingPolicy,omitempty"`
-
-	// AppCookieStickinessPolicy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-appcookiestickinesspolicy
-	AppCookieStickinessPolicy []AWSElasticLoadBalancingLoadBalancer_AppCookieStickinessPolicy `json:"AppCookieStickinessPolicy,omitempty"`
-
-	// AvailabilityZones AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-availabilityzones
-	AvailabilityZones []string `json:"AvailabilityZones,omitempty"`
-
-	// ConnectionDrainingPolicy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-connectiondrainingpolicy
-	ConnectionDrainingPolicy *AWSElasticLoadBalancingLoadBalancer_ConnectionDrainingPolicy `json:"ConnectionDrainingPolicy,omitempty"`
-
-	// ConnectionSettings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-connectionsettings
-	ConnectionSettings *AWSElasticLoadBalancingLoadBalancer_ConnectionSettings `json:"ConnectionSettings,omitempty"`
-
-	// CrossZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-crosszone
-	CrossZone bool `json:"CrossZone,omitempty"`
-
-	// HealthCheck AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-healthcheck
-	HealthCheck *AWSElasticLoadBalancingLoadBalancer_HealthCheck `json:"HealthCheck,omitempty"`
-
-	// Instances AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-instances
-	Instances []string `json:"Instances,omitempty"`
-
-	// LBCookieStickinessPolicy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-lbcookiestickinesspolicy
-	LBCookieStickinessPolicy []AWSElasticLoadBalancingLoadBalancer_LBCookieStickinessPolicy `json:"LBCookieStickinessPolicy,omitempty"`
-
-	// Listeners AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-listeners
-	Listeners []AWSElasticLoadBalancingLoadBalancer_Listeners `json:"Listeners,omitempty"`
-
-	// LoadBalancerName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-elbname
-	LoadBalancerName string `json:"LoadBalancerName,omitempty"`
-
-	// Policies AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-policies
-	Policies []AWSElasticLoadBalancingLoadBalancer_Policies `json:"Policies,omitempty"`
-
-	// Scheme AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-scheme
-	Scheme string `json:"Scheme,omitempty"`
-
-	// SecurityGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-securitygroups
-	SecurityGroups []string `json:"SecurityGroups,omitempty"`
-
-	// Subnets AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-subnets
-	Subnets []string `json:"Subnets,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-elasticloadbalancing-loadbalancer-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingLoadBalancer) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancing::LoadBalancer"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElasticLoadBalancingLoadBalancer) MarshalJSON() ([]byte, error) {
-	type Properties AWSElasticLoadBalancingLoadBalancer
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElasticLoadBalancingLoadBalancer) UnmarshalJSON(b []byte) error {
-	type Properties AWSElasticLoadBalancingLoadBalancer
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElasticLoadBalancingLoadBalancer(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElasticLoadBalancingLoadBalancerResources retrieves all AWSElasticLoadBalancingLoadBalancer items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElasticLoadBalancingLoadBalancerResources() map[string]AWSElasticLoadBalancingLoadBalancer {
-	results := map[string]AWSElasticLoadBalancingLoadBalancer{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElasticLoadBalancingLoadBalancer:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticLoadBalancing::LoadBalancer" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticLoadBalancingLoadBalancer
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElasticLoadBalancingLoadBalancerWithName retrieves all AWSElasticLoadBalancingLoadBalancer items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElasticLoadBalancingLoadBalancerWithName(name string) (AWSElasticLoadBalancingLoadBalancer, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElasticLoadBalancingLoadBalancer:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticLoadBalancing::LoadBalancer" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticLoadBalancingLoadBalancer
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElasticLoadBalancingLoadBalancer{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go
deleted file mode 100644
index fade970f39..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingLoadBalancer_AccessLoggingPolicy AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-accessloggingpolicy.html
-type AWSElasticLoadBalancingLoadBalancer_AccessLoggingPolicy struct {
-
-	// EmitInterval AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-accessloggingpolicy.html#cfn-elb-accessloggingpolicy-emitinterval
-	EmitInterval int `json:"EmitInterval,omitempty"`
-
-	// Enabled AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-accessloggingpolicy.html#cfn-elb-accessloggingpolicy-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// S3BucketName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-accessloggingpolicy.html#cfn-elb-accessloggingpolicy-s3bucketname
-	S3BucketName string `json:"S3BucketName,omitempty"`
-
-	// S3BucketPrefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-accessloggingpolicy.html#cfn-elb-accessloggingpolicy-s3bucketprefix
-	S3BucketPrefix string `json:"S3BucketPrefix,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingLoadBalancer_AccessLoggingPolicy) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go
deleted file mode 100644
index b09daef02a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingLoadBalancer_AppCookieStickinessPolicy AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-AppCookieStickinessPolicy.html
-type AWSElasticLoadBalancingLoadBalancer_AppCookieStickinessPolicy struct {
-
-	// CookieName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-AppCookieStickinessPolicy.html#cfn-elb-appcookiestickinesspolicy-cookiename
-	CookieName string `json:"CookieName,omitempty"`
-
-	// PolicyName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-AppCookieStickinessPolicy.html#cfn-elb-appcookiestickinesspolicy-policyname
-	PolicyName string `json:"PolicyName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingLoadBalancer_AppCookieStickinessPolicy) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go
deleted file mode 100644
index d3c3acbff7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingLoadBalancer_ConnectionDrainingPolicy AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-connectiondrainingpolicy.html
-type AWSElasticLoadBalancingLoadBalancer_ConnectionDrainingPolicy struct {
-
-	// Enabled AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-connectiondrainingpolicy.html#cfn-elb-connectiondrainingpolicy-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// Timeout AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-connectiondrainingpolicy.html#cfn-elb-connectiondrainingpolicy-timeout
-	Timeout int `json:"Timeout,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingLoadBalancer_ConnectionDrainingPolicy) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_connectionsettings.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_connectionsettings.go
deleted file mode 100644
index b1e6b03d39..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_connectionsettings.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingLoadBalancer_ConnectionSettings AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-connectionsettings.html
-type AWSElasticLoadBalancingLoadBalancer_ConnectionSettings struct {
-
-	// IdleTimeout AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-connectionsettings.html#cfn-elb-connectionsettings-idletimeout
-	IdleTimeout int `json:"IdleTimeout,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingLoadBalancer_ConnectionSettings) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_healthcheck.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_healthcheck.go
deleted file mode 100644
index 65cac4cfcb..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_healthcheck.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingLoadBalancer_HealthCheck AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-health-check.html
-type AWSElasticLoadBalancingLoadBalancer_HealthCheck struct {
-
-	// HealthyThreshold AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-health-check.html#cfn-elb-healthcheck-healthythreshold
-	HealthyThreshold string `json:"HealthyThreshold,omitempty"`
-
-	// Interval AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-health-check.html#cfn-elb-healthcheck-interval
-	Interval string `json:"Interval,omitempty"`
-
-	// Target AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-health-check.html#cfn-elb-healthcheck-target
-	Target string `json:"Target,omitempty"`
-
-	// Timeout AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-health-check.html#cfn-elb-healthcheck-timeout
-	Timeout string `json:"Timeout,omitempty"`
-
-	// UnhealthyThreshold AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-health-check.html#cfn-elb-healthcheck-unhealthythreshold
-	UnhealthyThreshold string `json:"UnhealthyThreshold,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingLoadBalancer_HealthCheck) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go
deleted file mode 100644
index 51a2860545..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingLoadBalancer_LBCookieStickinessPolicy AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-LBCookieStickinessPolicy.html
-type AWSElasticLoadBalancingLoadBalancer_LBCookieStickinessPolicy struct {
-
-	// CookieExpirationPeriod AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-LBCookieStickinessPolicy.html#cfn-elb-lbcookiestickinesspolicy-cookieexpirationperiod
-	CookieExpirationPeriod string `json:"CookieExpirationPeriod,omitempty"`
-
-	// PolicyName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-LBCookieStickinessPolicy.html#cfn-elb-lbcookiestickinesspolicy-policyname
-	PolicyName string `json:"PolicyName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingLoadBalancer_LBCookieStickinessPolicy) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_listeners.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_listeners.go
deleted file mode 100644
index 09b70901e9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_listeners.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingLoadBalancer_Listeners AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.Listeners)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html
-type AWSElasticLoadBalancingLoadBalancer_Listeners struct {
-
-	// InstancePort AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html#cfn-ec2-elb-listener-instanceport
-	InstancePort string `json:"InstancePort,omitempty"`
-
-	// InstanceProtocol AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html#cfn-ec2-elb-listener-instanceprotocol
-	InstanceProtocol string `json:"InstanceProtocol,omitempty"`
-
-	// LoadBalancerPort AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html#cfn-ec2-elb-listener-loadbalancerport
-	LoadBalancerPort string `json:"LoadBalancerPort,omitempty"`
-
-	// PolicyNames AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html#cfn-ec2-elb-listener-policynames
-	PolicyNames []string `json:"PolicyNames,omitempty"`
-
-	// Protocol AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html#cfn-ec2-elb-listener-protocol
-	Protocol string `json:"Protocol,omitempty"`
-
-	// SSLCertificateId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html#cfn-ec2-elb-listener-sslcertificateid
-	SSLCertificateId string `json:"SSLCertificateId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingLoadBalancer_Listeners) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancing::LoadBalancer.Listeners"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_policies.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_policies.go
deleted file mode 100644
index 3590c56fd8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancing-loadbalancer_policies.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingLoadBalancer_Policies AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.Policies)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-policy.html
-type AWSElasticLoadBalancingLoadBalancer_Policies struct {
-
-	// Attributes AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-policy.html#cfn-ec2-elb-policy-attributes
-	Attributes []interface{} `json:"Attributes,omitempty"`
-
-	// InstancePorts AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-policy.html#cfn-ec2-elb-policy-instanceports
-	InstancePorts []string `json:"InstancePorts,omitempty"`
-
-	// LoadBalancerPorts AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-policy.html#cfn-ec2-elb-policy-loadbalancerports
-	LoadBalancerPorts []string `json:"LoadBalancerPorts,omitempty"`
-
-	// PolicyName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-policy.html#cfn-ec2-elb-policy-policyname
-	PolicyName string `json:"PolicyName,omitempty"`
-
-	// PolicyType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-policy.html#cfn-ec2-elb-policy-policytype
-	PolicyType string `json:"PolicyType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingLoadBalancer_Policies) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancing::LoadBalancer.Policies"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listener.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listener.go
deleted file mode 100644
index 43f8b21476..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listener.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElasticLoadBalancingV2Listener AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html
-type AWSElasticLoadBalancingV2Listener struct {
-
-	// Certificates AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-certificates
-	Certificates []AWSElasticLoadBalancingV2Listener_Certificate `json:"Certificates,omitempty"`
-
-	// DefaultActions AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-defaultactions
-	DefaultActions []AWSElasticLoadBalancingV2Listener_Action `json:"DefaultActions,omitempty"`
-
-	// LoadBalancerArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-loadbalancerarn
-	LoadBalancerArn string `json:"LoadBalancerArn,omitempty"`
-
-	// Port AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-port
-	Port int `json:"Port,omitempty"`
-
-	// Protocol AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-protocol
-	Protocol string `json:"Protocol,omitempty"`
-
-	// SslPolicy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-sslpolicy
-	SslPolicy string `json:"SslPolicy,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2Listener) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::Listener"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElasticLoadBalancingV2Listener) MarshalJSON() ([]byte, error) {
-	type Properties AWSElasticLoadBalancingV2Listener
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElasticLoadBalancingV2Listener) UnmarshalJSON(b []byte) error {
-	type Properties AWSElasticLoadBalancingV2Listener
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElasticLoadBalancingV2Listener(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElasticLoadBalancingV2ListenerResources retrieves all AWSElasticLoadBalancingV2Listener items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElasticLoadBalancingV2ListenerResources() map[string]AWSElasticLoadBalancingV2Listener {
-	results := map[string]AWSElasticLoadBalancingV2Listener{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElasticLoadBalancingV2Listener:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticLoadBalancingV2::Listener" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticLoadBalancingV2Listener
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElasticLoadBalancingV2ListenerWithName retrieves all AWSElasticLoadBalancingV2Listener items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElasticLoadBalancingV2ListenerWithName(name string) (AWSElasticLoadBalancingV2Listener, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElasticLoadBalancingV2Listener:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticLoadBalancingV2::Listener" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticLoadBalancingV2Listener
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElasticLoadBalancingV2Listener{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listener_action.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listener_action.go
deleted file mode 100644
index e90aa58261..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listener_action.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingV2Listener_Action AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.Action)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-defaultactions.html
-type AWSElasticLoadBalancingV2Listener_Action struct {
-
-	// TargetGroupArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-defaultactions.html#cfn-elasticloadbalancingv2-listener-defaultactions-targetgrouparn
-	TargetGroupArn string `json:"TargetGroupArn,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-defaultactions.html#cfn-elasticloadbalancingv2-listener-defaultactions-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2Listener_Action) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::Listener.Action"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listener_certificate.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listener_certificate.go
deleted file mode 100644
index b7b3351d96..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listener_certificate.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingV2Listener_Certificate AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.Certificate)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-certificates.html
-type AWSElasticLoadBalancingV2Listener_Certificate struct {
-
-	// CertificateArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-certificates.html#cfn-elasticloadbalancingv2-listener-certificates-certificatearn
-	CertificateArn string `json:"CertificateArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2Listener_Certificate) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::Listener.Certificate"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenercertificate.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenercertificate.go
deleted file mode 100644
index 25772c288d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenercertificate.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElasticLoadBalancingV2ListenerCertificate AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerCertificate)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenercertificate.html
-type AWSElasticLoadBalancingV2ListenerCertificate struct {
-
-	// Certificates AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenercertificate.html#cfn-elasticloadbalancingv2-listenercertificate-certificates
-	Certificates []AWSElasticLoadBalancingV2ListenerCertificate_Certificate `json:"Certificates,omitempty"`
-
-	// ListenerArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenercertificate.html#cfn-elasticloadbalancingv2-listenercertificate-listenerarn
-	ListenerArn string `json:"ListenerArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2ListenerCertificate) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::ListenerCertificate"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElasticLoadBalancingV2ListenerCertificate) MarshalJSON() ([]byte, error) {
-	type Properties AWSElasticLoadBalancingV2ListenerCertificate
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElasticLoadBalancingV2ListenerCertificate) UnmarshalJSON(b []byte) error {
-	type Properties AWSElasticLoadBalancingV2ListenerCertificate
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElasticLoadBalancingV2ListenerCertificate(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElasticLoadBalancingV2ListenerCertificateResources retrieves all AWSElasticLoadBalancingV2ListenerCertificate items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElasticLoadBalancingV2ListenerCertificateResources() map[string]AWSElasticLoadBalancingV2ListenerCertificate {
-	results := map[string]AWSElasticLoadBalancingV2ListenerCertificate{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElasticLoadBalancingV2ListenerCertificate:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticLoadBalancingV2::ListenerCertificate" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticLoadBalancingV2ListenerCertificate
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElasticLoadBalancingV2ListenerCertificateWithName retrieves all AWSElasticLoadBalancingV2ListenerCertificate items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElasticLoadBalancingV2ListenerCertificateWithName(name string) (AWSElasticLoadBalancingV2ListenerCertificate, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElasticLoadBalancingV2ListenerCertificate:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticLoadBalancingV2::ListenerCertificate" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticLoadBalancingV2ListenerCertificate
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElasticLoadBalancingV2ListenerCertificate{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenercertificate_certificate.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenercertificate_certificate.go
deleted file mode 100644
index c64b2196df..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenercertificate_certificate.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingV2ListenerCertificate_Certificate AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-certificates.html
-type AWSElasticLoadBalancingV2ListenerCertificate_Certificate struct {
-
-	// CertificateArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-certificates.html#cfn-elasticloadbalancingv2-listener-certificates-certificatearn
-	CertificateArn string `json:"CertificateArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2ListenerCertificate_Certificate) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenerrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenerrule.go
deleted file mode 100644
index 0d5bb899c8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenerrule.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElasticLoadBalancingV2ListenerRule AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html
-type AWSElasticLoadBalancingV2ListenerRule struct {
-
-	// Actions AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html#cfn-elasticloadbalancingv2-listenerrule-actions
-	Actions []AWSElasticLoadBalancingV2ListenerRule_Action `json:"Actions,omitempty"`
-
-	// Conditions AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html#cfn-elasticloadbalancingv2-listenerrule-conditions
-	Conditions []AWSElasticLoadBalancingV2ListenerRule_RuleCondition `json:"Conditions,omitempty"`
-
-	// ListenerArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html#cfn-elasticloadbalancingv2-listenerrule-listenerarn
-	ListenerArn string `json:"ListenerArn,omitempty"`
-
-	// Priority AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html#cfn-elasticloadbalancingv2-listenerrule-priority
-	Priority int `json:"Priority,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2ListenerRule) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::ListenerRule"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElasticLoadBalancingV2ListenerRule) MarshalJSON() ([]byte, error) {
-	type Properties AWSElasticLoadBalancingV2ListenerRule
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElasticLoadBalancingV2ListenerRule) UnmarshalJSON(b []byte) error {
-	type Properties AWSElasticLoadBalancingV2ListenerRule
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElasticLoadBalancingV2ListenerRule(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElasticLoadBalancingV2ListenerRuleResources retrieves all AWSElasticLoadBalancingV2ListenerRule items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElasticLoadBalancingV2ListenerRuleResources() map[string]AWSElasticLoadBalancingV2ListenerRule {
-	results := map[string]AWSElasticLoadBalancingV2ListenerRule{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElasticLoadBalancingV2ListenerRule:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticLoadBalancingV2::ListenerRule" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticLoadBalancingV2ListenerRule
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElasticLoadBalancingV2ListenerRuleWithName retrieves all AWSElasticLoadBalancingV2ListenerRule items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElasticLoadBalancingV2ListenerRuleWithName(name string) (AWSElasticLoadBalancingV2ListenerRule, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElasticLoadBalancingV2ListenerRule:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticLoadBalancingV2::ListenerRule" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticLoadBalancingV2ListenerRule
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElasticLoadBalancingV2ListenerRule{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenerrule_action.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenerrule_action.go
deleted file mode 100644
index ac9bbd5817..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenerrule_action.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingV2ListenerRule_Action AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.Action)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-actions.html
-type AWSElasticLoadBalancingV2ListenerRule_Action struct {
-
-	// TargetGroupArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-actions.html#cfn-elasticloadbalancingv2-listener-actions-targetgrouparn
-	TargetGroupArn string `json:"TargetGroupArn,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-actions.html#cfn-elasticloadbalancingv2-listener-actions-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2ListenerRule_Action) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::ListenerRule.Action"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenerrule_rulecondition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenerrule_rulecondition.go
deleted file mode 100644
index 0354e6d4bf..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-listenerrule_rulecondition.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingV2ListenerRule_RuleCondition AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-conditions.html
-type AWSElasticLoadBalancingV2ListenerRule_RuleCondition struct {
-
-	// Field AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-conditions.html#cfn-elasticloadbalancingv2-listenerrule-conditions-field
-	Field string `json:"Field,omitempty"`
-
-	// Values AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-conditions.html#cfn-elasticloadbalancingv2-listenerrule-conditions-values
-	Values []string `json:"Values,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2ListenerRule_RuleCondition) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-loadbalancer.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-loadbalancer.go
deleted file mode 100644
index 5e942390d4..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-loadbalancer.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElasticLoadBalancingV2LoadBalancer AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::LoadBalancer)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html
-type AWSElasticLoadBalancingV2LoadBalancer struct {
-
-	// IpAddressType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-ipaddresstype
-	IpAddressType string `json:"IpAddressType,omitempty"`
-
-	// LoadBalancerAttributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-loadbalancerattributes
-	LoadBalancerAttributes []AWSElasticLoadBalancingV2LoadBalancer_LoadBalancerAttribute `json:"LoadBalancerAttributes,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-name
-	Name string `json:"Name,omitempty"`
-
-	// Scheme AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-scheme
-	Scheme string `json:"Scheme,omitempty"`
-
-	// SecurityGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-securitygroups
-	SecurityGroups []string `json:"SecurityGroups,omitempty"`
-
-	// SubnetMappings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-subnetmappings
-	SubnetMappings []AWSElasticLoadBalancingV2LoadBalancer_SubnetMapping `json:"SubnetMappings,omitempty"`
-
-	// Subnets AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-subnets
-	Subnets []string `json:"Subnets,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2LoadBalancer) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::LoadBalancer"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElasticLoadBalancingV2LoadBalancer) MarshalJSON() ([]byte, error) {
-	type Properties AWSElasticLoadBalancingV2LoadBalancer
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElasticLoadBalancingV2LoadBalancer) UnmarshalJSON(b []byte) error {
-	type Properties AWSElasticLoadBalancingV2LoadBalancer
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElasticLoadBalancingV2LoadBalancer(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElasticLoadBalancingV2LoadBalancerResources retrieves all AWSElasticLoadBalancingV2LoadBalancer items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElasticLoadBalancingV2LoadBalancerResources() map[string]AWSElasticLoadBalancingV2LoadBalancer {
-	results := map[string]AWSElasticLoadBalancingV2LoadBalancer{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElasticLoadBalancingV2LoadBalancer:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticLoadBalancingV2::LoadBalancer" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticLoadBalancingV2LoadBalancer
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElasticLoadBalancingV2LoadBalancerWithName retrieves all AWSElasticLoadBalancingV2LoadBalancer items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElasticLoadBalancingV2LoadBalancerWithName(name string) (AWSElasticLoadBalancingV2LoadBalancer, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElasticLoadBalancingV2LoadBalancer:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticLoadBalancingV2::LoadBalancer" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticLoadBalancingV2LoadBalancer
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElasticLoadBalancingV2LoadBalancer{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go
deleted file mode 100644
index 4c8c596981..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingV2LoadBalancer_LoadBalancerAttribute AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-loadbalancerattributes.html
-type AWSElasticLoadBalancingV2LoadBalancer_LoadBalancerAttribute struct {
-
-	// Key AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-loadbalancerattributes.html#cfn-elasticloadbalancingv2-loadbalancer-loadbalancerattributes-key
-	Key string `json:"Key,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-loadbalancerattributes.html#cfn-elasticloadbalancingv2-loadbalancer-loadbalancerattributes-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2LoadBalancer_LoadBalancerAttribute) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go
deleted file mode 100644
index fd5294d9da..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingV2LoadBalancer_SubnetMapping AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-subnetmapping.html
-type AWSElasticLoadBalancingV2LoadBalancer_SubnetMapping struct {
-
-	// AllocationId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-subnetmapping.html#cfn-elasticloadbalancingv2-loadbalancer-subnetmapping-allocationid
-	AllocationId string `json:"AllocationId,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-subnetmapping.html#cfn-elasticloadbalancingv2-loadbalancer-subnetmapping-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2LoadBalancer_SubnetMapping) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-targetgroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-targetgroup.go
deleted file mode 100644
index 3d96d72c13..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-targetgroup.go
+++ /dev/null
@@ -1,185 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElasticLoadBalancingV2TargetGroup AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::TargetGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html
-type AWSElasticLoadBalancingV2TargetGroup struct {
-
-	// HealthCheckIntervalSeconds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthcheckintervalseconds
-	HealthCheckIntervalSeconds int `json:"HealthCheckIntervalSeconds,omitempty"`
-
-	// HealthCheckPath AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthcheckpath
-	HealthCheckPath string `json:"HealthCheckPath,omitempty"`
-
-	// HealthCheckPort AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthcheckport
-	HealthCheckPort string `json:"HealthCheckPort,omitempty"`
-
-	// HealthCheckProtocol AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthcheckprotocol
-	HealthCheckProtocol string `json:"HealthCheckProtocol,omitempty"`
-
-	// HealthCheckTimeoutSeconds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthchecktimeoutseconds
-	HealthCheckTimeoutSeconds int `json:"HealthCheckTimeoutSeconds,omitempty"`
-
-	// HealthyThresholdCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthythresholdcount
-	HealthyThresholdCount int `json:"HealthyThresholdCount,omitempty"`
-
-	// Matcher AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-matcher
-	Matcher *AWSElasticLoadBalancingV2TargetGroup_Matcher `json:"Matcher,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-name
-	Name string `json:"Name,omitempty"`
-
-	// Port AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-port
-	Port int `json:"Port,omitempty"`
-
-	// Protocol AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-protocol
-	Protocol string `json:"Protocol,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// TargetGroupAttributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-targetgroupattributes
-	TargetGroupAttributes []AWSElasticLoadBalancingV2TargetGroup_TargetGroupAttribute `json:"TargetGroupAttributes,omitempty"`
-
-	// TargetType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-targettype
-	TargetType string `json:"TargetType,omitempty"`
-
-	// Targets AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-targets
-	Targets []AWSElasticLoadBalancingV2TargetGroup_TargetDescription `json:"Targets,omitempty"`
-
-	// UnhealthyThresholdCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-unhealthythresholdcount
-	UnhealthyThresholdCount int `json:"UnhealthyThresholdCount,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2TargetGroup) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::TargetGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElasticLoadBalancingV2TargetGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSElasticLoadBalancingV2TargetGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElasticLoadBalancingV2TargetGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSElasticLoadBalancingV2TargetGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElasticLoadBalancingV2TargetGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElasticLoadBalancingV2TargetGroupResources retrieves all AWSElasticLoadBalancingV2TargetGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElasticLoadBalancingV2TargetGroupResources() map[string]AWSElasticLoadBalancingV2TargetGroup {
-	results := map[string]AWSElasticLoadBalancingV2TargetGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElasticLoadBalancingV2TargetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticLoadBalancingV2::TargetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticLoadBalancingV2TargetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElasticLoadBalancingV2TargetGroupWithName retrieves all AWSElasticLoadBalancingV2TargetGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElasticLoadBalancingV2TargetGroupWithName(name string) (AWSElasticLoadBalancingV2TargetGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElasticLoadBalancingV2TargetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::ElasticLoadBalancingV2::TargetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticLoadBalancingV2TargetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElasticLoadBalancingV2TargetGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-targetgroup_matcher.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-targetgroup_matcher.go
deleted file mode 100644
index a4c709e6bb..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-targetgroup_matcher.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingV2TargetGroup_Matcher AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::TargetGroup.Matcher)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-matcher.html
-type AWSElasticLoadBalancingV2TargetGroup_Matcher struct {
-
-	// HttpCode AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-matcher.html#cfn-elasticloadbalancingv2-targetgroup-matcher-httpcode
-	HttpCode string `json:"HttpCode,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2TargetGroup_Matcher) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::TargetGroup.Matcher"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-targetgroup_targetdescription.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-targetgroup_targetdescription.go
deleted file mode 100644
index 0f659c025e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-targetgroup_targetdescription.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingV2TargetGroup_TargetDescription AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetdescription.html
-type AWSElasticLoadBalancingV2TargetGroup_TargetDescription struct {
-
-	// AvailabilityZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetdescription.html#cfn-elasticloadbalancingv2-targetgroup-targetdescription-availabilityzone
-	AvailabilityZone string `json:"AvailabilityZone,omitempty"`
-
-	// Id AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetdescription.html#cfn-elasticloadbalancingv2-targetgroup-targetdescription-id
-	Id string `json:"Id,omitempty"`
-
-	// Port AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetdescription.html#cfn-elasticloadbalancingv2-targetgroup-targetdescription-port
-	Port int `json:"Port,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2TargetGroup_TargetDescription) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go
deleted file mode 100644
index 7b04252f71..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSElasticLoadBalancingV2TargetGroup_TargetGroupAttribute AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetgroupattribute.html
-type AWSElasticLoadBalancingV2TargetGroup_TargetGroupAttribute struct {
-
-	// Key AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetgroupattribute.html#cfn-elasticloadbalancingv2-targetgroup-targetgroupattribute-key
-	Key string `json:"Key,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetgroupattribute.html#cfn-elasticloadbalancingv2-targetgroup-targetgroupattribute-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticLoadBalancingV2TargetGroup_TargetGroupAttribute) AWSCloudFormationType() string {
-	return "AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticsearch-domain.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticsearch-domain.go
deleted file mode 100644
index c70063d03a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticsearch-domain.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSElasticsearchDomain AWS CloudFormation Resource (AWS::Elasticsearch::Domain)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html
-type AWSElasticsearchDomain struct {
-
-	// AccessPolicies AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-accesspolicies
-	AccessPolicies interface{} `json:"AccessPolicies,omitempty"`
-
-	// AdvancedOptions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-advancedoptions
-	AdvancedOptions map[string]string `json:"AdvancedOptions,omitempty"`
-
-	// DomainName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-domainname
-	DomainName string `json:"DomainName,omitempty"`
-
-	// EBSOptions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-ebsoptions
-	EBSOptions *AWSElasticsearchDomain_EBSOptions `json:"EBSOptions,omitempty"`
-
-	// ElasticsearchClusterConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-elasticsearchclusterconfig
-	ElasticsearchClusterConfig *AWSElasticsearchDomain_ElasticsearchClusterConfig `json:"ElasticsearchClusterConfig,omitempty"`
-
-	// ElasticsearchVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-elasticsearchversion
-	ElasticsearchVersion string `json:"ElasticsearchVersion,omitempty"`
-
-	// SnapshotOptions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-snapshotoptions
-	SnapshotOptions *AWSElasticsearchDomain_SnapshotOptions `json:"SnapshotOptions,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticsearchDomain) AWSCloudFormationType() string {
-	return "AWS::Elasticsearch::Domain"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSElasticsearchDomain) MarshalJSON() ([]byte, error) {
-	type Properties AWSElasticsearchDomain
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSElasticsearchDomain) UnmarshalJSON(b []byte) error {
-	type Properties AWSElasticsearchDomain
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSElasticsearchDomain(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSElasticsearchDomainResources retrieves all AWSElasticsearchDomain items from an AWS CloudFormation template
-func (t *Template) GetAllAWSElasticsearchDomainResources() map[string]AWSElasticsearchDomain {
-	results := map[string]AWSElasticsearchDomain{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSElasticsearchDomain:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Elasticsearch::Domain" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticsearchDomain
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSElasticsearchDomainWithName retrieves all AWSElasticsearchDomain items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSElasticsearchDomainWithName(name string) (AWSElasticsearchDomain, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSElasticsearchDomain:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Elasticsearch::Domain" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSElasticsearchDomain
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSElasticsearchDomain{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticsearch-domain_ebsoptions.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticsearch-domain_ebsoptions.go
deleted file mode 100644
index 9f82863443..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticsearch-domain_ebsoptions.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSElasticsearchDomain_EBSOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.EBSOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-ebsoptions.html
-type AWSElasticsearchDomain_EBSOptions struct {
-
-	// EBSEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-ebsoptions.html#cfn-elasticsearch-domain-ebsoptions-ebsenabled
-	EBSEnabled bool `json:"EBSEnabled,omitempty"`
-
-	// Iops AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-ebsoptions.html#cfn-elasticsearch-domain-ebsoptions-iops
-	Iops int `json:"Iops,omitempty"`
-
-	// VolumeSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-ebsoptions.html#cfn-elasticsearch-domain-ebsoptions-volumesize
-	VolumeSize int `json:"VolumeSize,omitempty"`
-
-	// VolumeType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-ebsoptions.html#cfn-elasticsearch-domain-ebsoptions-volumetype
-	VolumeType string `json:"VolumeType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticsearchDomain_EBSOptions) AWSCloudFormationType() string {
-	return "AWS::Elasticsearch::Domain.EBSOptions"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticsearch-domain_elasticsearchclusterconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticsearch-domain_elasticsearchclusterconfig.go
deleted file mode 100644
index b20cc89882..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticsearch-domain_elasticsearchclusterconfig.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSElasticsearchDomain_ElasticsearchClusterConfig AWS CloudFormation Resource (AWS::Elasticsearch::Domain.ElasticsearchClusterConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html
-type AWSElasticsearchDomain_ElasticsearchClusterConfig struct {
-
-	// DedicatedMasterCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-dedicatedmastercount
-	DedicatedMasterCount int `json:"DedicatedMasterCount,omitempty"`
-
-	// DedicatedMasterEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-dedicatedmasterenabled
-	DedicatedMasterEnabled bool `json:"DedicatedMasterEnabled,omitempty"`
-
-	// DedicatedMasterType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-dedicatedmastertype
-	DedicatedMasterType string `json:"DedicatedMasterType,omitempty"`
-
-	// InstanceCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-instancecount
-	InstanceCount int `json:"InstanceCount,omitempty"`
-
-	// InstanceType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-instnacetype
-	InstanceType string `json:"InstanceType,omitempty"`
-
-	// ZoneAwarenessEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-zoneawarenessenabled
-	ZoneAwarenessEnabled bool `json:"ZoneAwarenessEnabled,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticsearchDomain_ElasticsearchClusterConfig) AWSCloudFormationType() string {
-	return "AWS::Elasticsearch::Domain.ElasticsearchClusterConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticsearch-domain_snapshotoptions.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticsearch-domain_snapshotoptions.go
deleted file mode 100644
index 5ea4554fce..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-elasticsearch-domain_snapshotoptions.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSElasticsearchDomain_SnapshotOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.SnapshotOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-snapshotoptions.html
-type AWSElasticsearchDomain_SnapshotOptions struct {
-
-	// AutomatedSnapshotStartHour AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-snapshotoptions.html#cfn-elasticsearch-domain-snapshotoptions-automatedsnapshotstarthour
-	AutomatedSnapshotStartHour int `json:"AutomatedSnapshotStartHour,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSElasticsearchDomain_SnapshotOptions) AWSCloudFormationType() string {
-	return "AWS::Elasticsearch::Domain.SnapshotOptions"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster.go
deleted file mode 100644
index 48518fbaf4..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster.go
+++ /dev/null
@@ -1,185 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEMRCluster AWS CloudFormation Resource (AWS::EMR::Cluster)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html
-type AWSEMRCluster struct {
-
-	// AdditionalInfo AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-additionalinfo
-	AdditionalInfo interface{} `json:"AdditionalInfo,omitempty"`
-
-	// Applications AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-applications
-	Applications []AWSEMRCluster_Application `json:"Applications,omitempty"`
-
-	// AutoScalingRole AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-autoscalingrole
-	AutoScalingRole string `json:"AutoScalingRole,omitempty"`
-
-	// BootstrapActions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-bootstrapactions
-	BootstrapActions []AWSEMRCluster_BootstrapActionConfig `json:"BootstrapActions,omitempty"`
-
-	// Configurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-configurations
-	Configurations []AWSEMRCluster_Configuration `json:"Configurations,omitempty"`
-
-	// CustomAmiId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-customamiid
-	CustomAmiId string `json:"CustomAmiId,omitempty"`
-
-	// Instances AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-instances
-	Instances *AWSEMRCluster_JobFlowInstancesConfig `json:"Instances,omitempty"`
-
-	// JobFlowRole AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-jobflowrole
-	JobFlowRole string `json:"JobFlowRole,omitempty"`
-
-	// LogUri AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-loguri
-	LogUri string `json:"LogUri,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-name
-	Name string `json:"Name,omitempty"`
-
-	// ReleaseLabel AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-releaselabel
-	ReleaseLabel string `json:"ReleaseLabel,omitempty"`
-
-	// ScaleDownBehavior AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-scaledownbehavior
-	ScaleDownBehavior string `json:"ScaleDownBehavior,omitempty"`
-
-	// SecurityConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-securityconfiguration
-	SecurityConfiguration string `json:"SecurityConfiguration,omitempty"`
-
-	// ServiceRole AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-servicerole
-	ServiceRole string `json:"ServiceRole,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// VisibleToAllUsers AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-visibletoallusers
-	VisibleToAllUsers bool `json:"VisibleToAllUsers,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEMRCluster) MarshalJSON() ([]byte, error) {
-	type Properties AWSEMRCluster
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEMRCluster) UnmarshalJSON(b []byte) error {
-	type Properties AWSEMRCluster
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEMRCluster(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEMRClusterResources retrieves all AWSEMRCluster items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEMRClusterResources() map[string]AWSEMRCluster {
-	results := map[string]AWSEMRCluster{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEMRCluster:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EMR::Cluster" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEMRCluster
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEMRClusterWithName retrieves all AWSEMRCluster items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEMRClusterWithName(name string) (AWSEMRCluster, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEMRCluster:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EMR::Cluster" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEMRCluster
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEMRCluster{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_application.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_application.go
deleted file mode 100644
index b5807665fa..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_application.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_Application AWS CloudFormation Resource (AWS::EMR::Cluster.Application)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-application.html
-type AWSEMRCluster_Application struct {
-
-	// AdditionalInfo AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-application.html#cfn-elasticmapreduce-cluster-application-additionalinfo
-	AdditionalInfo map[string]string `json:"AdditionalInfo,omitempty"`
-
-	// Args AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-application.html#cfn-elasticmapreduce-cluster-application-args
-	Args []string `json:"Args,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-application.html#cfn-elasticmapreduce-cluster-application-name
-	Name string `json:"Name,omitempty"`
-
-	// Version AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-application.html#cfn-elasticmapreduce-cluster-application-version
-	Version string `json:"Version,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_Application) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.Application"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_autoscalingpolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_autoscalingpolicy.go
deleted file mode 100644
index 20978da3b8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_autoscalingpolicy.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_AutoScalingPolicy AWS CloudFormation Resource (AWS::EMR::Cluster.AutoScalingPolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-autoscalingpolicy.html
-type AWSEMRCluster_AutoScalingPolicy struct {
-
-	// Constraints AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-autoscalingpolicy.html#cfn-elasticmapreduce-cluster-autoscalingpolicy-constraints
-	Constraints *AWSEMRCluster_ScalingConstraints `json:"Constraints,omitempty"`
-
-	// Rules AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-autoscalingpolicy.html#cfn-elasticmapreduce-cluster-autoscalingpolicy-rules
-	Rules []AWSEMRCluster_ScalingRule `json:"Rules,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_AutoScalingPolicy) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.AutoScalingPolicy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_bootstrapactionconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_bootstrapactionconfig.go
deleted file mode 100644
index 6fab14e941..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_bootstrapactionconfig.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_BootstrapActionConfig AWS CloudFormation Resource (AWS::EMR::Cluster.BootstrapActionConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-bootstrapactionconfig.html
-type AWSEMRCluster_BootstrapActionConfig struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-bootstrapactionconfig.html#cfn-elasticmapreduce-cluster-bootstrapactionconfig-name
-	Name string `json:"Name,omitempty"`
-
-	// ScriptBootstrapAction AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-bootstrapactionconfig.html#cfn-elasticmapreduce-cluster-bootstrapactionconfig-scriptbootstrapaction
-	ScriptBootstrapAction *AWSEMRCluster_ScriptBootstrapActionConfig `json:"ScriptBootstrapAction,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_BootstrapActionConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.BootstrapActionConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_cloudwatchalarmdefinition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_cloudwatchalarmdefinition.go
deleted file mode 100644
index eaf4552b1b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_cloudwatchalarmdefinition.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_CloudWatchAlarmDefinition AWS CloudFormation Resource (AWS::EMR::Cluster.CloudWatchAlarmDefinition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html
-type AWSEMRCluster_CloudWatchAlarmDefinition struct {
-
-	// ComparisonOperator AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-comparisonoperator
-	ComparisonOperator string `json:"ComparisonOperator,omitempty"`
-
-	// Dimensions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-dimensions
-	Dimensions []AWSEMRCluster_MetricDimension `json:"Dimensions,omitempty"`
-
-	// EvaluationPeriods AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-evaluationperiods
-	EvaluationPeriods int `json:"EvaluationPeriods,omitempty"`
-
-	// MetricName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-metricname
-	MetricName string `json:"MetricName,omitempty"`
-
-	// Namespace AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-namespace
-	Namespace string `json:"Namespace,omitempty"`
-
-	// Period AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-period
-	Period int `json:"Period,omitempty"`
-
-	// Statistic AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-statistic
-	Statistic string `json:"Statistic,omitempty"`
-
-	// Threshold AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-threshold
-	Threshold float64 `json:"Threshold,omitempty"`
-
-	// Unit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-unit
-	Unit string `json:"Unit,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_CloudWatchAlarmDefinition) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.CloudWatchAlarmDefinition"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_configuration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_configuration.go
deleted file mode 100644
index 221b0cb695..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_configuration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_Configuration AWS CloudFormation Resource (AWS::EMR::Cluster.Configuration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-configuration.html
-type AWSEMRCluster_Configuration struct {
-
-	// Classification AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-configuration.html#cfn-elasticmapreduce-cluster-configuration-classification
-	Classification string `json:"Classification,omitempty"`
-
-	// ConfigurationProperties AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-configuration.html#cfn-elasticmapreduce-cluster-configuration-configurationproperties
-	ConfigurationProperties map[string]string `json:"ConfigurationProperties,omitempty"`
-
-	// Configurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-configuration.html#cfn-elasticmapreduce-cluster-configuration-configurations
-	Configurations []AWSEMRCluster_Configuration `json:"Configurations,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_Configuration) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.Configuration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_ebsblockdeviceconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_ebsblockdeviceconfig.go
deleted file mode 100644
index b4208b9911..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_ebsblockdeviceconfig.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_EbsBlockDeviceConfig AWS CloudFormation Resource (AWS::EMR::Cluster.EbsBlockDeviceConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ebsblockdeviceconfig.html
-type AWSEMRCluster_EbsBlockDeviceConfig struct {
-
-	// VolumeSpecification AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ebsblockdeviceconfig.html#cfn-elasticmapreduce-cluster-ebsblockdeviceconfig-volumespecification
-	VolumeSpecification *AWSEMRCluster_VolumeSpecification `json:"VolumeSpecification,omitempty"`
-
-	// VolumesPerInstance AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ebsblockdeviceconfig.html#cfn-elasticmapreduce-cluster-ebsblockdeviceconfig-volumesperinstance
-	VolumesPerInstance int `json:"VolumesPerInstance,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_EbsBlockDeviceConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.EbsBlockDeviceConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_ebsconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_ebsconfiguration.go
deleted file mode 100644
index 6553a14053..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_ebsconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_EbsConfiguration AWS CloudFormation Resource (AWS::EMR::Cluster.EbsConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ebsconfiguration.html
-type AWSEMRCluster_EbsConfiguration struct {
-
-	// EbsBlockDeviceConfigs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ebsconfiguration.html#cfn-elasticmapreduce-cluster-ebsconfiguration-ebsblockdeviceconfigs
-	EbsBlockDeviceConfigs []AWSEMRCluster_EbsBlockDeviceConfig `json:"EbsBlockDeviceConfigs,omitempty"`
-
-	// EbsOptimized AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ebsconfiguration.html#cfn-elasticmapreduce-cluster-ebsconfiguration-ebsoptimized
-	EbsOptimized bool `json:"EbsOptimized,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_EbsConfiguration) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.EbsConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_instancefleetconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_instancefleetconfig.go
deleted file mode 100644
index 9ebb006cbc..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_instancefleetconfig.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_InstanceFleetConfig AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceFleetConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html
-type AWSEMRCluster_InstanceFleetConfig struct {
-
-	// InstanceTypeConfigs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html#cfn-elasticmapreduce-cluster-instancefleetconfig-instancetypeconfigs
-	InstanceTypeConfigs []AWSEMRCluster_InstanceTypeConfig `json:"InstanceTypeConfigs,omitempty"`
-
-	// LaunchSpecifications AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html#cfn-elasticmapreduce-cluster-instancefleetconfig-launchspecifications
-	LaunchSpecifications *AWSEMRCluster_InstanceFleetProvisioningSpecifications `json:"LaunchSpecifications,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html#cfn-elasticmapreduce-cluster-instancefleetconfig-name
-	Name string `json:"Name,omitempty"`
-
-	// TargetOnDemandCapacity AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html#cfn-elasticmapreduce-cluster-instancefleetconfig-targetondemandcapacity
-	TargetOnDemandCapacity int `json:"TargetOnDemandCapacity,omitempty"`
-
-	// TargetSpotCapacity AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html#cfn-elasticmapreduce-cluster-instancefleetconfig-targetspotcapacity
-	TargetSpotCapacity int `json:"TargetSpotCapacity,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_InstanceFleetConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.InstanceFleetConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_instancefleetprovisioningspecifications.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_instancefleetprovisioningspecifications.go
deleted file mode 100644
index 63367ba59c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_instancefleetprovisioningspecifications.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_InstanceFleetProvisioningSpecifications AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetprovisioningspecifications.html
-type AWSEMRCluster_InstanceFleetProvisioningSpecifications struct {
-
-	// SpotSpecification AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetprovisioningspecifications.html#cfn-elasticmapreduce-cluster-instancefleetprovisioningspecifications-spotspecification
-	SpotSpecification *AWSEMRCluster_SpotProvisioningSpecification `json:"SpotSpecification,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_InstanceFleetProvisioningSpecifications) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_instancegroupconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_instancegroupconfig.go
deleted file mode 100644
index d63bd2dedb..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_instancegroupconfig.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_InstanceGroupConfig AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceGroupConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html
-type AWSEMRCluster_InstanceGroupConfig struct {
-
-	// AutoScalingPolicy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-autoscalingpolicy
-	AutoScalingPolicy *AWSEMRCluster_AutoScalingPolicy `json:"AutoScalingPolicy,omitempty"`
-
-	// BidPrice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-bidprice
-	BidPrice string `json:"BidPrice,omitempty"`
-
-	// Configurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-configurations
-	Configurations []AWSEMRCluster_Configuration `json:"Configurations,omitempty"`
-
-	// EbsConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-ebsconfiguration
-	EbsConfiguration *AWSEMRCluster_EbsConfiguration `json:"EbsConfiguration,omitempty"`
-
-	// InstanceCount AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-instancecount
-	InstanceCount int `json:"InstanceCount,omitempty"`
-
-	// InstanceType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-instancetype
-	InstanceType string `json:"InstanceType,omitempty"`
-
-	// Market AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-market
-	Market string `json:"Market,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_InstanceGroupConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.InstanceGroupConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_instancetypeconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_instancetypeconfig.go
deleted file mode 100644
index 9a79cc4cf0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_instancetypeconfig.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_InstanceTypeConfig AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceTypeConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html
-type AWSEMRCluster_InstanceTypeConfig struct {
-
-	// BidPrice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-bidprice
-	BidPrice string `json:"BidPrice,omitempty"`
-
-	// BidPriceAsPercentageOfOnDemandPrice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-bidpriceaspercentageofondemandprice
-	BidPriceAsPercentageOfOnDemandPrice float64 `json:"BidPriceAsPercentageOfOnDemandPrice,omitempty"`
-
-	// Configurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-configurations
-	Configurations []AWSEMRCluster_Configuration `json:"Configurations,omitempty"`
-
-	// EbsConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-ebsconfiguration
-	EbsConfiguration *AWSEMRCluster_EbsConfiguration `json:"EbsConfiguration,omitempty"`
-
-	// InstanceType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-instancetype
-	InstanceType string `json:"InstanceType,omitempty"`
-
-	// WeightedCapacity AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-weightedcapacity
-	WeightedCapacity int `json:"WeightedCapacity,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_InstanceTypeConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.InstanceTypeConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_jobflowinstancesconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_jobflowinstancesconfig.go
deleted file mode 100644
index 5dc76527ae..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_jobflowinstancesconfig.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_JobFlowInstancesConfig AWS CloudFormation Resource (AWS::EMR::Cluster.JobFlowInstancesConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html
-type AWSEMRCluster_JobFlowInstancesConfig struct {
-
-	// AdditionalMasterSecurityGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-additionalmastersecuritygroups
-	AdditionalMasterSecurityGroups []string `json:"AdditionalMasterSecurityGroups,omitempty"`
-
-	// AdditionalSlaveSecurityGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-additionalslavesecuritygroups
-	AdditionalSlaveSecurityGroups []string `json:"AdditionalSlaveSecurityGroups,omitempty"`
-
-	// CoreInstanceFleet AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-coreinstancefleet
-	CoreInstanceFleet *AWSEMRCluster_InstanceFleetConfig `json:"CoreInstanceFleet,omitempty"`
-
-	// CoreInstanceGroup AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-coreinstancegroup
-	CoreInstanceGroup *AWSEMRCluster_InstanceGroupConfig `json:"CoreInstanceGroup,omitempty"`
-
-	// Ec2KeyName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-ec2keyname
-	Ec2KeyName string `json:"Ec2KeyName,omitempty"`
-
-	// Ec2SubnetId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-ec2subnetid
-	Ec2SubnetId string `json:"Ec2SubnetId,omitempty"`
-
-	// EmrManagedMasterSecurityGroup AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-emrmanagedmastersecuritygroup
-	EmrManagedMasterSecurityGroup string `json:"EmrManagedMasterSecurityGroup,omitempty"`
-
-	// EmrManagedSlaveSecurityGroup AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-emrmanagedslavesecuritygroup
-	EmrManagedSlaveSecurityGroup string `json:"EmrManagedSlaveSecurityGroup,omitempty"`
-
-	// HadoopVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-hadoopversion
-	HadoopVersion string `json:"HadoopVersion,omitempty"`
-
-	// MasterInstanceFleet AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-masterinstancefleet
-	MasterInstanceFleet *AWSEMRCluster_InstanceFleetConfig `json:"MasterInstanceFleet,omitempty"`
-
-	// MasterInstanceGroup AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-masterinstancegroup
-	MasterInstanceGroup *AWSEMRCluster_InstanceGroupConfig `json:"MasterInstanceGroup,omitempty"`
-
-	// Placement AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-placement
-	Placement *AWSEMRCluster_PlacementType `json:"Placement,omitempty"`
-
-	// ServiceAccessSecurityGroup AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-serviceaccesssecuritygroup
-	ServiceAccessSecurityGroup string `json:"ServiceAccessSecurityGroup,omitempty"`
-
-	// TerminationProtected AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-terminationprotected
-	TerminationProtected bool `json:"TerminationProtected,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_JobFlowInstancesConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.JobFlowInstancesConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_metricdimension.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_metricdimension.go
deleted file mode 100644
index 994caaddd1..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_metricdimension.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_MetricDimension AWS CloudFormation Resource (AWS::EMR::Cluster.MetricDimension)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-metricdimension.html
-type AWSEMRCluster_MetricDimension struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-metricdimension.html#cfn-elasticmapreduce-cluster-metricdimension-key
-	Key string `json:"Key,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-metricdimension.html#cfn-elasticmapreduce-cluster-metricdimension-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_MetricDimension) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.MetricDimension"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_placementtype.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_placementtype.go
deleted file mode 100644
index 21cd6a5cbc..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_placementtype.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_PlacementType AWS CloudFormation Resource (AWS::EMR::Cluster.PlacementType)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-placementtype.html
-type AWSEMRCluster_PlacementType struct {
-
-	// AvailabilityZone AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-placementtype.html#cfn-elasticmapreduce-cluster-placementtype-availabilityzone
-	AvailabilityZone string `json:"AvailabilityZone,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_PlacementType) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.PlacementType"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scalingaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scalingaction.go
deleted file mode 100644
index 022110c8da..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scalingaction.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_ScalingAction AWS CloudFormation Resource (AWS::EMR::Cluster.ScalingAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingaction.html
-type AWSEMRCluster_ScalingAction struct {
-
-	// Market AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingaction.html#cfn-elasticmapreduce-cluster-scalingaction-market
-	Market string `json:"Market,omitempty"`
-
-	// SimpleScalingPolicyConfiguration AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingaction.html#cfn-elasticmapreduce-cluster-scalingaction-simplescalingpolicyconfiguration
-	SimpleScalingPolicyConfiguration *AWSEMRCluster_SimpleScalingPolicyConfiguration `json:"SimpleScalingPolicyConfiguration,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_ScalingAction) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.ScalingAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scalingconstraints.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scalingconstraints.go
deleted file mode 100644
index ce81b1308e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scalingconstraints.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_ScalingConstraints AWS CloudFormation Resource (AWS::EMR::Cluster.ScalingConstraints)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingconstraints.html
-type AWSEMRCluster_ScalingConstraints struct {
-
-	// MaxCapacity AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingconstraints.html#cfn-elasticmapreduce-cluster-scalingconstraints-maxcapacity
-	MaxCapacity int `json:"MaxCapacity,omitempty"`
-
-	// MinCapacity AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingconstraints.html#cfn-elasticmapreduce-cluster-scalingconstraints-mincapacity
-	MinCapacity int `json:"MinCapacity,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_ScalingConstraints) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.ScalingConstraints"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scalingrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scalingrule.go
deleted file mode 100644
index 26633e85c5..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scalingrule.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_ScalingRule AWS CloudFormation Resource (AWS::EMR::Cluster.ScalingRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingrule.html
-type AWSEMRCluster_ScalingRule struct {
-
-	// Action AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingrule.html#cfn-elasticmapreduce-cluster-scalingrule-action
-	Action *AWSEMRCluster_ScalingAction `json:"Action,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingrule.html#cfn-elasticmapreduce-cluster-scalingrule-description
-	Description string `json:"Description,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingrule.html#cfn-elasticmapreduce-cluster-scalingrule-name
-	Name string `json:"Name,omitempty"`
-
-	// Trigger AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingrule.html#cfn-elasticmapreduce-cluster-scalingrule-trigger
-	Trigger *AWSEMRCluster_ScalingTrigger `json:"Trigger,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_ScalingRule) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.ScalingRule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scalingtrigger.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scalingtrigger.go
deleted file mode 100644
index 0d09c5b5b3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scalingtrigger.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_ScalingTrigger AWS CloudFormation Resource (AWS::EMR::Cluster.ScalingTrigger)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingtrigger.html
-type AWSEMRCluster_ScalingTrigger struct {
-
-	// CloudWatchAlarmDefinition AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingtrigger.html#cfn-elasticmapreduce-cluster-scalingtrigger-cloudwatchalarmdefinition
-	CloudWatchAlarmDefinition *AWSEMRCluster_CloudWatchAlarmDefinition `json:"CloudWatchAlarmDefinition,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_ScalingTrigger) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.ScalingTrigger"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scriptbootstrapactionconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scriptbootstrapactionconfig.go
deleted file mode 100644
index 0793b0909e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_scriptbootstrapactionconfig.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_ScriptBootstrapActionConfig AWS CloudFormation Resource (AWS::EMR::Cluster.ScriptBootstrapActionConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scriptbootstrapactionconfig.html
-type AWSEMRCluster_ScriptBootstrapActionConfig struct {
-
-	// Args AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scriptbootstrapactionconfig.html#cfn-elasticmapreduce-cluster-scriptbootstrapactionconfig-args
-	Args []string `json:"Args,omitempty"`
-
-	// Path AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scriptbootstrapactionconfig.html#cfn-elasticmapreduce-cluster-scriptbootstrapactionconfig-path
-	Path string `json:"Path,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_ScriptBootstrapActionConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.ScriptBootstrapActionConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_simplescalingpolicyconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_simplescalingpolicyconfiguration.go
deleted file mode 100644
index 9dd11dae49..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_simplescalingpolicyconfiguration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_SimpleScalingPolicyConfiguration AWS CloudFormation Resource (AWS::EMR::Cluster.SimpleScalingPolicyConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-simplescalingpolicyconfiguration.html
-type AWSEMRCluster_SimpleScalingPolicyConfiguration struct {
-
-	// AdjustmentType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-simplescalingpolicyconfiguration.html#cfn-elasticmapreduce-cluster-simplescalingpolicyconfiguration-adjustmenttype
-	AdjustmentType string `json:"AdjustmentType,omitempty"`
-
-	// CoolDown AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-simplescalingpolicyconfiguration.html#cfn-elasticmapreduce-cluster-simplescalingpolicyconfiguration-cooldown
-	CoolDown int `json:"CoolDown,omitempty"`
-
-	// ScalingAdjustment AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-simplescalingpolicyconfiguration.html#cfn-elasticmapreduce-cluster-simplescalingpolicyconfiguration-scalingadjustment
-	ScalingAdjustment int `json:"ScalingAdjustment,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_SimpleScalingPolicyConfiguration) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.SimpleScalingPolicyConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_spotprovisioningspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_spotprovisioningspecification.go
deleted file mode 100644
index a70ba797e0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_spotprovisioningspecification.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_SpotProvisioningSpecification AWS CloudFormation Resource (AWS::EMR::Cluster.SpotProvisioningSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotprovisioningspecification.html
-type AWSEMRCluster_SpotProvisioningSpecification struct {
-
-	// BlockDurationMinutes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotprovisioningspecification.html#cfn-elasticmapreduce-cluster-spotprovisioningspecification-blockdurationminutes
-	BlockDurationMinutes int `json:"BlockDurationMinutes,omitempty"`
-
-	// TimeoutAction AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotprovisioningspecification.html#cfn-elasticmapreduce-cluster-spotprovisioningspecification-timeoutaction
-	TimeoutAction string `json:"TimeoutAction,omitempty"`
-
-	// TimeoutDurationMinutes AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotprovisioningspecification.html#cfn-elasticmapreduce-cluster-spotprovisioningspecification-timeoutdurationminutes
-	TimeoutDurationMinutes int `json:"TimeoutDurationMinutes,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_SpotProvisioningSpecification) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.SpotProvisioningSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_volumespecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_volumespecification.go
deleted file mode 100644
index 6952dac149..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-cluster_volumespecification.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSEMRCluster_VolumeSpecification AWS CloudFormation Resource (AWS::EMR::Cluster.VolumeSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-volumespecification.html
-type AWSEMRCluster_VolumeSpecification struct {
-
-	// Iops AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-volumespecification.html#cfn-elasticmapreduce-cluster-volumespecification-iops
-	Iops int `json:"Iops,omitempty"`
-
-	// SizeInGB AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-volumespecification.html#cfn-elasticmapreduce-cluster-volumespecification-sizeingb
-	SizeInGB int `json:"SizeInGB,omitempty"`
-
-	// VolumeType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-volumespecification.html#cfn-elasticmapreduce-cluster-volumespecification-volumetype
-	VolumeType string `json:"VolumeType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRCluster_VolumeSpecification) AWSCloudFormationType() string {
-	return "AWS::EMR::Cluster.VolumeSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig.go
deleted file mode 100644
index 4d8a4a0c01..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEMRInstanceFleetConfig AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html
-type AWSEMRInstanceFleetConfig struct {
-
-	// ClusterId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-clusterid
-	ClusterId string `json:"ClusterId,omitempty"`
-
-	// InstanceFleetType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancefleettype
-	InstanceFleetType string `json:"InstanceFleetType,omitempty"`
-
-	// InstanceTypeConfigs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfigs
-	InstanceTypeConfigs []AWSEMRInstanceFleetConfig_InstanceTypeConfig `json:"InstanceTypeConfigs,omitempty"`
-
-	// LaunchSpecifications AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-launchspecifications
-	LaunchSpecifications *AWSEMRInstanceFleetConfig_InstanceFleetProvisioningSpecifications `json:"LaunchSpecifications,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-name
-	Name string `json:"Name,omitempty"`
-
-	// TargetOnDemandCapacity AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-targetondemandcapacity
-	TargetOnDemandCapacity int `json:"TargetOnDemandCapacity,omitempty"`
-
-	// TargetSpotCapacity AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-targetspotcapacity
-	TargetSpotCapacity int `json:"TargetSpotCapacity,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceFleetConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceFleetConfig"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEMRInstanceFleetConfig) MarshalJSON() ([]byte, error) {
-	type Properties AWSEMRInstanceFleetConfig
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEMRInstanceFleetConfig) UnmarshalJSON(b []byte) error {
-	type Properties AWSEMRInstanceFleetConfig
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEMRInstanceFleetConfig(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEMRInstanceFleetConfigResources retrieves all AWSEMRInstanceFleetConfig items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEMRInstanceFleetConfigResources() map[string]AWSEMRInstanceFleetConfig {
-	results := map[string]AWSEMRInstanceFleetConfig{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEMRInstanceFleetConfig:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EMR::InstanceFleetConfig" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEMRInstanceFleetConfig
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEMRInstanceFleetConfigWithName retrieves all AWSEMRInstanceFleetConfig items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEMRInstanceFleetConfigWithName(name string) (AWSEMRInstanceFleetConfig, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEMRInstanceFleetConfig:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EMR::InstanceFleetConfig" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEMRInstanceFleetConfig
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEMRInstanceFleetConfig{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_configuration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_configuration.go
deleted file mode 100644
index 7929a72d88..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_configuration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceFleetConfig_Configuration AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.Configuration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-configuration.html
-type AWSEMRInstanceFleetConfig_Configuration struct {
-
-	// Classification AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-configuration.html#cfn-elasticmapreduce-instancefleetconfig-configuration-classification
-	Classification string `json:"Classification,omitempty"`
-
-	// ConfigurationProperties AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-configuration.html#cfn-elasticmapreduce-instancefleetconfig-configuration-configurationproperties
-	ConfigurationProperties map[string]string `json:"ConfigurationProperties,omitempty"`
-
-	// Configurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-configuration.html#cfn-elasticmapreduce-instancefleetconfig-configuration-configurations
-	Configurations []AWSEMRInstanceFleetConfig_Configuration `json:"Configurations,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceFleetConfig_Configuration) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceFleetConfig.Configuration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go
deleted file mode 100644
index aa2b5839b7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceFleetConfig_EbsBlockDeviceConfig AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ebsblockdeviceconfig.html
-type AWSEMRInstanceFleetConfig_EbsBlockDeviceConfig struct {
-
-	// VolumeSpecification AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ebsblockdeviceconfig.html#cfn-elasticmapreduce-instancefleetconfig-ebsblockdeviceconfig-volumespecification
-	VolumeSpecification *AWSEMRInstanceFleetConfig_VolumeSpecification `json:"VolumeSpecification,omitempty"`
-
-	// VolumesPerInstance AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ebsblockdeviceconfig.html#cfn-elasticmapreduce-instancefleetconfig-ebsblockdeviceconfig-volumesperinstance
-	VolumesPerInstance int `json:"VolumesPerInstance,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceFleetConfig_EbsBlockDeviceConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_ebsconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_ebsconfiguration.go
deleted file mode 100644
index 4d4179e452..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_ebsconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceFleetConfig_EbsConfiguration AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.EbsConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ebsconfiguration.html
-type AWSEMRInstanceFleetConfig_EbsConfiguration struct {
-
-	// EbsBlockDeviceConfigs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ebsconfiguration.html#cfn-elasticmapreduce-instancefleetconfig-ebsconfiguration-ebsblockdeviceconfigs
-	EbsBlockDeviceConfigs []AWSEMRInstanceFleetConfig_EbsBlockDeviceConfig `json:"EbsBlockDeviceConfigs,omitempty"`
-
-	// EbsOptimized AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ebsconfiguration.html#cfn-elasticmapreduce-instancefleetconfig-ebsconfiguration-ebsoptimized
-	EbsOptimized bool `json:"EbsOptimized,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceFleetConfig_EbsConfiguration) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceFleetConfig.EbsConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go
deleted file mode 100644
index 1195bd58cb..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceFleetConfig_InstanceFleetProvisioningSpecifications AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancefleetprovisioningspecifications.html
-type AWSEMRInstanceFleetConfig_InstanceFleetProvisioningSpecifications struct {
-
-	// SpotSpecification AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancefleetprovisioningspecifications.html#cfn-elasticmapreduce-instancefleetconfig-instancefleetprovisioningspecifications-spotspecification
-	SpotSpecification *AWSEMRInstanceFleetConfig_SpotProvisioningSpecification `json:"SpotSpecification,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceFleetConfig_InstanceFleetProvisioningSpecifications) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_instancetypeconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_instancetypeconfig.go
deleted file mode 100644
index 93144b004f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_instancetypeconfig.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceFleetConfig_InstanceTypeConfig AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.InstanceTypeConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html
-type AWSEMRInstanceFleetConfig_InstanceTypeConfig struct {
-
-	// BidPrice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-bidprice
-	BidPrice string `json:"BidPrice,omitempty"`
-
-	// BidPriceAsPercentageOfOnDemandPrice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-bidpriceaspercentageofondemandprice
-	BidPriceAsPercentageOfOnDemandPrice float64 `json:"BidPriceAsPercentageOfOnDemandPrice,omitempty"`
-
-	// Configurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-configurations
-	Configurations []AWSEMRInstanceFleetConfig_Configuration `json:"Configurations,omitempty"`
-
-	// EbsConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-ebsconfiguration
-	EbsConfiguration *AWSEMRInstanceFleetConfig_EbsConfiguration `json:"EbsConfiguration,omitempty"`
-
-	// InstanceType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-instancetype
-	InstanceType string `json:"InstanceType,omitempty"`
-
-	// WeightedCapacity AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-weightedcapacity
-	WeightedCapacity int `json:"WeightedCapacity,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceFleetConfig_InstanceTypeConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceFleetConfig.InstanceTypeConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_spotprovisioningspecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_spotprovisioningspecification.go
deleted file mode 100644
index 502b43c239..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_spotprovisioningspecification.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceFleetConfig_SpotProvisioningSpecification AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotprovisioningspecification.html
-type AWSEMRInstanceFleetConfig_SpotProvisioningSpecification struct {
-
-	// BlockDurationMinutes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-spotprovisioningspecification-blockdurationminutes
-	BlockDurationMinutes int `json:"BlockDurationMinutes,omitempty"`
-
-	// TimeoutAction AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-spotprovisioningspecification-timeoutaction
-	TimeoutAction string `json:"TimeoutAction,omitempty"`
-
-	// TimeoutDurationMinutes AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-spotprovisioningspecification-timeoutdurationminutes
-	TimeoutDurationMinutes int `json:"TimeoutDurationMinutes,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceFleetConfig_SpotProvisioningSpecification) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_volumespecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_volumespecification.go
deleted file mode 100644
index 17c43f7e33..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancefleetconfig_volumespecification.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceFleetConfig_VolumeSpecification AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.VolumeSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-volumespecification.html
-type AWSEMRInstanceFleetConfig_VolumeSpecification struct {
-
-	// Iops AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-volumespecification.html#cfn-elasticmapreduce-instancefleetconfig-volumespecification-iops
-	Iops int `json:"Iops,omitempty"`
-
-	// SizeInGB AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-volumespecification.html#cfn-elasticmapreduce-instancefleetconfig-volumespecification-sizeingb
-	SizeInGB int `json:"SizeInGB,omitempty"`
-
-	// VolumeType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-volumespecification.html#cfn-elasticmapreduce-instancefleetconfig-volumespecification-volumetype
-	VolumeType string `json:"VolumeType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceFleetConfig_VolumeSpecification) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceFleetConfig.VolumeSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig.go
deleted file mode 100644
index cc6fef772c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEMRInstanceGroupConfig AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html
-type AWSEMRInstanceGroupConfig struct {
-
-	// AutoScalingPolicy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-elasticmapreduce-instancegroupconfig-autoscalingpolicy
-	AutoScalingPolicy *AWSEMRInstanceGroupConfig_AutoScalingPolicy `json:"AutoScalingPolicy,omitempty"`
-
-	// BidPrice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-bidprice
-	BidPrice string `json:"BidPrice,omitempty"`
-
-	// Configurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-configurations
-	Configurations []AWSEMRInstanceGroupConfig_Configuration `json:"Configurations,omitempty"`
-
-	// EbsConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-ebsconfiguration
-	EbsConfiguration *AWSEMRInstanceGroupConfig_EbsConfiguration `json:"EbsConfiguration,omitempty"`
-
-	// InstanceCount AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfiginstancecount-
-	InstanceCount int `json:"InstanceCount,omitempty"`
-
-	// InstanceRole AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-instancerole
-	InstanceRole string `json:"InstanceRole,omitempty"`
-
-	// InstanceType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-instancetype
-	InstanceType string `json:"InstanceType,omitempty"`
-
-	// JobFlowId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-jobflowid
-	JobFlowId string `json:"JobFlowId,omitempty"`
-
-	// Market AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-market
-	Market string `json:"Market,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEMRInstanceGroupConfig) MarshalJSON() ([]byte, error) {
-	type Properties AWSEMRInstanceGroupConfig
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEMRInstanceGroupConfig) UnmarshalJSON(b []byte) error {
-	type Properties AWSEMRInstanceGroupConfig
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEMRInstanceGroupConfig(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEMRInstanceGroupConfigResources retrieves all AWSEMRInstanceGroupConfig items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEMRInstanceGroupConfigResources() map[string]AWSEMRInstanceGroupConfig {
-	results := map[string]AWSEMRInstanceGroupConfig{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEMRInstanceGroupConfig:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EMR::InstanceGroupConfig" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEMRInstanceGroupConfig
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEMRInstanceGroupConfigWithName retrieves all AWSEMRInstanceGroupConfig items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEMRInstanceGroupConfigWithName(name string) (AWSEMRInstanceGroupConfig, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEMRInstanceGroupConfig:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EMR::InstanceGroupConfig" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEMRInstanceGroupConfig
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEMRInstanceGroupConfig{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_autoscalingpolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_autoscalingpolicy.go
deleted file mode 100644
index 333848f7c0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_autoscalingpolicy.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceGroupConfig_AutoScalingPolicy AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.AutoScalingPolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-autoscalingpolicy.html
-type AWSEMRInstanceGroupConfig_AutoScalingPolicy struct {
-
-	// Constraints AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-autoscalingpolicy.html#cfn-elasticmapreduce-instancegroupconfig-autoscalingpolicy-constraints
-	Constraints *AWSEMRInstanceGroupConfig_ScalingConstraints `json:"Constraints,omitempty"`
-
-	// Rules AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-autoscalingpolicy.html#cfn-elasticmapreduce-instancegroupconfig-autoscalingpolicy-rules
-	Rules []AWSEMRInstanceGroupConfig_ScalingRule `json:"Rules,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig_AutoScalingPolicy) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig.AutoScalingPolicy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go
deleted file mode 100644
index 5ea3b4c650..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceGroupConfig_CloudWatchAlarmDefinition AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html
-type AWSEMRInstanceGroupConfig_CloudWatchAlarmDefinition struct {
-
-	// ComparisonOperator AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-comparisonoperator
-	ComparisonOperator string `json:"ComparisonOperator,omitempty"`
-
-	// Dimensions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-dimensions
-	Dimensions []AWSEMRInstanceGroupConfig_MetricDimension `json:"Dimensions,omitempty"`
-
-	// EvaluationPeriods AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-evaluationperiods
-	EvaluationPeriods int `json:"EvaluationPeriods,omitempty"`
-
-	// MetricName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-metricname
-	MetricName string `json:"MetricName,omitempty"`
-
-	// Namespace AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-namespace
-	Namespace string `json:"Namespace,omitempty"`
-
-	// Period AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-period
-	Period int `json:"Period,omitempty"`
-
-	// Statistic AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-statistic
-	Statistic string `json:"Statistic,omitempty"`
-
-	// Threshold AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-threshold
-	Threshold float64 `json:"Threshold,omitempty"`
-
-	// Unit AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-unit
-	Unit string `json:"Unit,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig_CloudWatchAlarmDefinition) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_configuration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_configuration.go
deleted file mode 100644
index 09b9e52f55..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_configuration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceGroupConfig_Configuration AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.Configuration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-cluster-configuration.html
-type AWSEMRInstanceGroupConfig_Configuration struct {
-
-	// Classification AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-cluster-configuration.html#cfn-emr-cluster-configuration-classification
-	Classification string `json:"Classification,omitempty"`
-
-	// ConfigurationProperties AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-cluster-configuration.html#cfn-emr-cluster-configuration-configurationproperties
-	ConfigurationProperties map[string]string `json:"ConfigurationProperties,omitempty"`
-
-	// Configurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-cluster-configuration.html#cfn-emr-cluster-configuration-configurations
-	Configurations []AWSEMRInstanceGroupConfig_Configuration `json:"Configurations,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig_Configuration) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig.Configuration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go
deleted file mode 100644
index 4b3a86cdb6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceGroupConfig_EbsBlockDeviceConfig AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig.html
-type AWSEMRInstanceGroupConfig_EbsBlockDeviceConfig struct {
-
-	// VolumeSpecification AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig.html#cfn-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification
-	VolumeSpecification *AWSEMRInstanceGroupConfig_VolumeSpecification `json:"VolumeSpecification,omitempty"`
-
-	// VolumesPerInstance AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig.html#cfn-emr-ebsconfiguration-ebsblockdeviceconfig-volumesperinstance
-	VolumesPerInstance int `json:"VolumesPerInstance,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig_EbsBlockDeviceConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_ebsconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_ebsconfiguration.go
deleted file mode 100644
index 6a4983413f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_ebsconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceGroupConfig_EbsConfiguration AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.EbsConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration.html
-type AWSEMRInstanceGroupConfig_EbsConfiguration struct {
-
-	// EbsBlockDeviceConfigs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration.html#cfn-emr-ebsconfiguration-ebsblockdeviceconfigs
-	EbsBlockDeviceConfigs []AWSEMRInstanceGroupConfig_EbsBlockDeviceConfig `json:"EbsBlockDeviceConfigs,omitempty"`
-
-	// EbsOptimized AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration.html#cfn-emr-ebsconfiguration-ebsoptimized
-	EbsOptimized bool `json:"EbsOptimized,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig_EbsConfiguration) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig.EbsConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_metricdimension.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_metricdimension.go
deleted file mode 100644
index 3407472f41..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_metricdimension.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceGroupConfig_MetricDimension AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.MetricDimension)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-metricdimension.html
-type AWSEMRInstanceGroupConfig_MetricDimension struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-metricdimension.html#cfn-elasticmapreduce-instancegroupconfig-metricdimension-key
-	Key string `json:"Key,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-metricdimension.html#cfn-elasticmapreduce-instancegroupconfig-metricdimension-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig_MetricDimension) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig.MetricDimension"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_scalingaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_scalingaction.go
deleted file mode 100644
index 5160eae470..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_scalingaction.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceGroupConfig_ScalingAction AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.ScalingAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingaction.html
-type AWSEMRInstanceGroupConfig_ScalingAction struct {
-
-	// Market AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingaction.html#cfn-elasticmapreduce-instancegroupconfig-scalingaction-market
-	Market string `json:"Market,omitempty"`
-
-	// SimpleScalingPolicyConfiguration AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingaction.html#cfn-elasticmapreduce-instancegroupconfig-scalingaction-simplescalingpolicyconfiguration
-	SimpleScalingPolicyConfiguration *AWSEMRInstanceGroupConfig_SimpleScalingPolicyConfiguration `json:"SimpleScalingPolicyConfiguration,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig_ScalingAction) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig.ScalingAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_scalingconstraints.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_scalingconstraints.go
deleted file mode 100644
index b465b79744..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_scalingconstraints.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceGroupConfig_ScalingConstraints AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.ScalingConstraints)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingconstraints.html
-type AWSEMRInstanceGroupConfig_ScalingConstraints struct {
-
-	// MaxCapacity AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingconstraints.html#cfn-elasticmapreduce-instancegroupconfig-scalingconstraints-maxcapacity
-	MaxCapacity int `json:"MaxCapacity,omitempty"`
-
-	// MinCapacity AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingconstraints.html#cfn-elasticmapreduce-instancegroupconfig-scalingconstraints-mincapacity
-	MinCapacity int `json:"MinCapacity,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig_ScalingConstraints) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig.ScalingConstraints"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_scalingrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_scalingrule.go
deleted file mode 100644
index fb3106ac50..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_scalingrule.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceGroupConfig_ScalingRule AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.ScalingRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingrule.html
-type AWSEMRInstanceGroupConfig_ScalingRule struct {
-
-	// Action AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingrule.html#cfn-elasticmapreduce-instancegroupconfig-scalingrule-action
-	Action *AWSEMRInstanceGroupConfig_ScalingAction `json:"Action,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingrule.html#cfn-elasticmapreduce-instancegroupconfig-scalingrule-description
-	Description string `json:"Description,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingrule.html#cfn-elasticmapreduce-instancegroupconfig-scalingrule-name
-	Name string `json:"Name,omitempty"`
-
-	// Trigger AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingrule.html#cfn-elasticmapreduce-instancegroupconfig-scalingrule-trigger
-	Trigger *AWSEMRInstanceGroupConfig_ScalingTrigger `json:"Trigger,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig_ScalingRule) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig.ScalingRule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_scalingtrigger.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_scalingtrigger.go
deleted file mode 100644
index 4464acdf39..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_scalingtrigger.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceGroupConfig_ScalingTrigger AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.ScalingTrigger)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingtrigger.html
-type AWSEMRInstanceGroupConfig_ScalingTrigger struct {
-
-	// CloudWatchAlarmDefinition AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingtrigger.html#cfn-elasticmapreduce-instancegroupconfig-scalingtrigger-cloudwatchalarmdefinition
-	CloudWatchAlarmDefinition *AWSEMRInstanceGroupConfig_CloudWatchAlarmDefinition `json:"CloudWatchAlarmDefinition,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig_ScalingTrigger) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig.ScalingTrigger"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go
deleted file mode 100644
index 2994af6d9d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceGroupConfig_SimpleScalingPolicyConfiguration AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration.html
-type AWSEMRInstanceGroupConfig_SimpleScalingPolicyConfiguration struct {
-
-	// AdjustmentType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration.html#cfn-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration-adjustmenttype
-	AdjustmentType string `json:"AdjustmentType,omitempty"`
-
-	// CoolDown AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration.html#cfn-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration-cooldown
-	CoolDown int `json:"CoolDown,omitempty"`
-
-	// ScalingAdjustment AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration.html#cfn-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration-scalingadjustment
-	ScalingAdjustment int `json:"ScalingAdjustment,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig_SimpleScalingPolicyConfiguration) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_volumespecification.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_volumespecification.go
deleted file mode 100644
index 5a229fa8ef..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-instancegroupconfig_volumespecification.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSEMRInstanceGroupConfig_VolumeSpecification AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.VolumeSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification.html
-type AWSEMRInstanceGroupConfig_VolumeSpecification struct {
-
-	// Iops AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification.html#cfn-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification-iops
-	Iops int `json:"Iops,omitempty"`
-
-	// SizeInGB AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification.html#cfn-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification-sizeingb
-	SizeInGB int `json:"SizeInGB,omitempty"`
-
-	// VolumeType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification.html#cfn-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification-volumetype
-	VolumeType string `json:"VolumeType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRInstanceGroupConfig_VolumeSpecification) AWSCloudFormationType() string {
-	return "AWS::EMR::InstanceGroupConfig.VolumeSpecification"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-securityconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-securityconfiguration.go
deleted file mode 100644
index c55d3f1099..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-securityconfiguration.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEMRSecurityConfiguration AWS CloudFormation Resource (AWS::EMR::SecurityConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-securityconfiguration.html
-type AWSEMRSecurityConfiguration struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-securityconfiguration.html#cfn-emr-securityconfiguration-name
-	Name string `json:"Name,omitempty"`
-
-	// SecurityConfiguration AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-securityconfiguration.html#cfn-emr-securityconfiguration-securityconfiguration
-	SecurityConfiguration interface{} `json:"SecurityConfiguration,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRSecurityConfiguration) AWSCloudFormationType() string {
-	return "AWS::EMR::SecurityConfiguration"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEMRSecurityConfiguration) MarshalJSON() ([]byte, error) {
-	type Properties AWSEMRSecurityConfiguration
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEMRSecurityConfiguration) UnmarshalJSON(b []byte) error {
-	type Properties AWSEMRSecurityConfiguration
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEMRSecurityConfiguration(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEMRSecurityConfigurationResources retrieves all AWSEMRSecurityConfiguration items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEMRSecurityConfigurationResources() map[string]AWSEMRSecurityConfiguration {
-	results := map[string]AWSEMRSecurityConfiguration{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEMRSecurityConfiguration:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EMR::SecurityConfiguration" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEMRSecurityConfiguration
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEMRSecurityConfigurationWithName retrieves all AWSEMRSecurityConfiguration items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEMRSecurityConfigurationWithName(name string) (AWSEMRSecurityConfiguration, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEMRSecurityConfiguration:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EMR::SecurityConfiguration" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEMRSecurityConfiguration
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEMRSecurityConfiguration{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-step.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-step.go
deleted file mode 100644
index de329a1614..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-step.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEMRStep AWS CloudFormation Resource (AWS::EMR::Step)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-step.html
-type AWSEMRStep struct {
-
-	// ActionOnFailure AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-step.html#cfn-elasticmapreduce-step-actiononfailure
-	ActionOnFailure string `json:"ActionOnFailure,omitempty"`
-
-	// HadoopJarStep AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-step.html#cfn-elasticmapreduce-step-hadoopjarstep
-	HadoopJarStep *AWSEMRStep_HadoopJarStepConfig `json:"HadoopJarStep,omitempty"`
-
-	// JobFlowId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-step.html#cfn-elasticmapreduce-step-jobflowid
-	JobFlowId string `json:"JobFlowId,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-step.html#cfn-elasticmapreduce-step-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRStep) AWSCloudFormationType() string {
-	return "AWS::EMR::Step"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEMRStep) MarshalJSON() ([]byte, error) {
-	type Properties AWSEMRStep
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEMRStep) UnmarshalJSON(b []byte) error {
-	type Properties AWSEMRStep
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEMRStep(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEMRStepResources retrieves all AWSEMRStep items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEMRStepResources() map[string]AWSEMRStep {
-	results := map[string]AWSEMRStep{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEMRStep:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EMR::Step" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEMRStep
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEMRStepWithName retrieves all AWSEMRStep items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEMRStepWithName(name string) (AWSEMRStep, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEMRStep:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::EMR::Step" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEMRStep
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEMRStep{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-step_hadoopjarstepconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-step_hadoopjarstepconfig.go
deleted file mode 100644
index 440f0783de..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-step_hadoopjarstepconfig.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSEMRStep_HadoopJarStepConfig AWS CloudFormation Resource (AWS::EMR::Step.HadoopJarStepConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-hadoopjarstepconfig.html
-type AWSEMRStep_HadoopJarStepConfig struct {
-
-	// Args AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-hadoopjarstepconfig.html#cfn-elasticmapreduce-step-hadoopjarstepconfig-args
-	Args []string `json:"Args,omitempty"`
-
-	// Jar AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-hadoopjarstepconfig.html#cfn-elasticmapreduce-step-hadoopjarstepconfig-jar
-	Jar string `json:"Jar,omitempty"`
-
-	// MainClass AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-hadoopjarstepconfig.html#cfn-elasticmapreduce-step-hadoopjarstepconfig-mainclass
-	MainClass string `json:"MainClass,omitempty"`
-
-	// StepProperties AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-hadoopjarstepconfig.html#cfn-elasticmapreduce-step-hadoopjarstepconfig-stepproperties
-	StepProperties []AWSEMRStep_KeyValue `json:"StepProperties,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRStep_HadoopJarStepConfig) AWSCloudFormationType() string {
-	return "AWS::EMR::Step.HadoopJarStepConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-step_keyvalue.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-step_keyvalue.go
deleted file mode 100644
index 0337914824..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-emr-step_keyvalue.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEMRStep_KeyValue AWS CloudFormation Resource (AWS::EMR::Step.KeyValue)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-keyvalue.html
-type AWSEMRStep_KeyValue struct {
-
-	// Key AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-keyvalue.html#cfn-elasticmapreduce-step-keyvalue-key
-	Key string `json:"Key,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-keyvalue.html#cfn-elasticmapreduce-step-keyvalue-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEMRStep_KeyValue) AWSCloudFormationType() string {
-	return "AWS::EMR::Step.KeyValue"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule.go
deleted file mode 100644
index 0881658b4b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSEventsRule AWS CloudFormation Resource (AWS::Events::Rule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html
-type AWSEventsRule struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-description
-	Description string `json:"Description,omitempty"`
-
-	// EventPattern AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-eventpattern
-	EventPattern interface{} `json:"EventPattern,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-name
-	Name string `json:"Name,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// ScheduleExpression AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-scheduleexpression
-	ScheduleExpression string `json:"ScheduleExpression,omitempty"`
-
-	// State AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-state
-	State string `json:"State,omitempty"`
-
-	// Targets AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-targets
-	Targets []AWSEventsRule_Target `json:"Targets,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEventsRule) AWSCloudFormationType() string {
-	return "AWS::Events::Rule"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSEventsRule) MarshalJSON() ([]byte, error) {
-	type Properties AWSEventsRule
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSEventsRule) UnmarshalJSON(b []byte) error {
-	type Properties AWSEventsRule
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSEventsRule(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSEventsRuleResources retrieves all AWSEventsRule items from an AWS CloudFormation template
-func (t *Template) GetAllAWSEventsRuleResources() map[string]AWSEventsRule {
-	results := map[string]AWSEventsRule{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSEventsRule:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Events::Rule" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEventsRule
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSEventsRuleWithName retrieves all AWSEventsRule items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSEventsRuleWithName(name string) (AWSEventsRule, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSEventsRule:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Events::Rule" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSEventsRule
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSEventsRule{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_ecsparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_ecsparameters.go
deleted file mode 100644
index ec3d4f6327..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_ecsparameters.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEventsRule_EcsParameters AWS CloudFormation Resource (AWS::Events::Rule.EcsParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html
-type AWSEventsRule_EcsParameters struct {
-
-	// TaskCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-taskcount
-	TaskCount int `json:"TaskCount,omitempty"`
-
-	// TaskDefinitionArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-taskdefinitionarn
-	TaskDefinitionArn string `json:"TaskDefinitionArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEventsRule_EcsParameters) AWSCloudFormationType() string {
-	return "AWS::Events::Rule.EcsParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_inputtransformer.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_inputtransformer.go
deleted file mode 100644
index 722e9c9e96..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_inputtransformer.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEventsRule_InputTransformer AWS CloudFormation Resource (AWS::Events::Rule.InputTransformer)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-inputtransformer.html
-type AWSEventsRule_InputTransformer struct {
-
-	// InputPathsMap AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-inputtransformer.html#cfn-events-rule-inputtransformer-inputpathsmap
-	InputPathsMap map[string]string `json:"InputPathsMap,omitempty"`
-
-	// InputTemplate AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-inputtransformer.html#cfn-events-rule-inputtransformer-inputtemplate
-	InputTemplate string `json:"InputTemplate,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEventsRule_InputTransformer) AWSCloudFormationType() string {
-	return "AWS::Events::Rule.InputTransformer"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_kinesisparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_kinesisparameters.go
deleted file mode 100644
index 57a38cc8ec..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_kinesisparameters.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEventsRule_KinesisParameters AWS CloudFormation Resource (AWS::Events::Rule.KinesisParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-kinesisparameters.html
-type AWSEventsRule_KinesisParameters struct {
-
-	// PartitionKeyPath AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-kinesisparameters.html#cfn-events-rule-kinesisparameters-partitionkeypath
-	PartitionKeyPath string `json:"PartitionKeyPath,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEventsRule_KinesisParameters) AWSCloudFormationType() string {
-	return "AWS::Events::Rule.KinesisParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_runcommandparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_runcommandparameters.go
deleted file mode 100644
index 350e961933..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_runcommandparameters.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSEventsRule_RunCommandParameters AWS CloudFormation Resource (AWS::Events::Rule.RunCommandParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-runcommandparameters.html
-type AWSEventsRule_RunCommandParameters struct {
-
-	// RunCommandTargets AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-runcommandparameters.html#cfn-events-rule-runcommandparameters-runcommandtargets
-	RunCommandTargets []AWSEventsRule_RunCommandTarget `json:"RunCommandTargets,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEventsRule_RunCommandParameters) AWSCloudFormationType() string {
-	return "AWS::Events::Rule.RunCommandParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_runcommandtarget.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_runcommandtarget.go
deleted file mode 100644
index 2f78a5853d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_runcommandtarget.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSEventsRule_RunCommandTarget AWS CloudFormation Resource (AWS::Events::Rule.RunCommandTarget)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-runcommandtarget.html
-type AWSEventsRule_RunCommandTarget struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-runcommandtarget.html#cfn-events-rule-runcommandtarget-key
-	Key string `json:"Key,omitempty"`
-
-	// Values AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-runcommandtarget.html#cfn-events-rule-runcommandtarget-values
-	Values []string `json:"Values,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEventsRule_RunCommandTarget) AWSCloudFormationType() string {
-	return "AWS::Events::Rule.RunCommandTarget"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_target.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_target.go
deleted file mode 100644
index bbbe4db55c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-events-rule_target.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package cloudformation
-
-// AWSEventsRule_Target AWS CloudFormation Resource (AWS::Events::Rule.Target)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html
-type AWSEventsRule_Target struct {
-
-	// Arn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-arn
-	Arn string `json:"Arn,omitempty"`
-
-	// EcsParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-ecsparameters
-	EcsParameters *AWSEventsRule_EcsParameters `json:"EcsParameters,omitempty"`
-
-	// Id AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-id
-	Id string `json:"Id,omitempty"`
-
-	// Input AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-input
-	Input string `json:"Input,omitempty"`
-
-	// InputPath AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-inputpath
-	InputPath string `json:"InputPath,omitempty"`
-
-	// InputTransformer AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-inputtransformer
-	InputTransformer *AWSEventsRule_InputTransformer `json:"InputTransformer,omitempty"`
-
-	// KinesisParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-kinesisparameters
-	KinesisParameters *AWSEventsRule_KinesisParameters `json:"KinesisParameters,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// RunCommandParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-runcommandparameters
-	RunCommandParameters *AWSEventsRule_RunCommandParameters `json:"RunCommandParameters,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSEventsRule_Target) AWSCloudFormationType() string {
-	return "AWS::Events::Rule.Target"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-alias.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-alias.go
deleted file mode 100644
index 4778ec029d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-alias.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSGameLiftAlias AWS CloudFormation Resource (AWS::GameLift::Alias)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-alias.html
-type AWSGameLiftAlias struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-alias.html#cfn-gamelift-alias-description
-	Description string `json:"Description,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-alias.html#cfn-gamelift-alias-name
-	Name string `json:"Name,omitempty"`
-
-	// RoutingStrategy AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-alias.html#cfn-gamelift-alias-routingstrategy
-	RoutingStrategy *AWSGameLiftAlias_RoutingStrategy `json:"RoutingStrategy,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGameLiftAlias) AWSCloudFormationType() string {
-	return "AWS::GameLift::Alias"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSGameLiftAlias) MarshalJSON() ([]byte, error) {
-	type Properties AWSGameLiftAlias
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSGameLiftAlias) UnmarshalJSON(b []byte) error {
-	type Properties AWSGameLiftAlias
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSGameLiftAlias(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSGameLiftAliasResources retrieves all AWSGameLiftAlias items from an AWS CloudFormation template
-func (t *Template) GetAllAWSGameLiftAliasResources() map[string]AWSGameLiftAlias {
-	results := map[string]AWSGameLiftAlias{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSGameLiftAlias:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::GameLift::Alias" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGameLiftAlias
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSGameLiftAliasWithName retrieves all AWSGameLiftAlias items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSGameLiftAliasWithName(name string) (AWSGameLiftAlias, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSGameLiftAlias:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::GameLift::Alias" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGameLiftAlias
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSGameLiftAlias{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-alias_routingstrategy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-alias_routingstrategy.go
deleted file mode 100644
index 22b1397094..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-alias_routingstrategy.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSGameLiftAlias_RoutingStrategy AWS CloudFormation Resource (AWS::GameLift::Alias.RoutingStrategy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-alias-routingstrategy.html
-type AWSGameLiftAlias_RoutingStrategy struct {
-
-	// FleetId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-alias-routingstrategy.html#cfn-gamelift-alias-routingstrategy-fleetid
-	FleetId string `json:"FleetId,omitempty"`
-
-	// Message AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-alias-routingstrategy.html#cfn-gamelift-alias-routingstrategy-message
-	Message string `json:"Message,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-alias-routingstrategy.html#cfn-gamelift-alias-routingstrategy-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGameLiftAlias_RoutingStrategy) AWSCloudFormationType() string {
-	return "AWS::GameLift::Alias.RoutingStrategy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-build.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-build.go
deleted file mode 100644
index 2441463d41..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-build.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSGameLiftBuild AWS CloudFormation Resource (AWS::GameLift::Build)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-build.html
-type AWSGameLiftBuild struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-build.html#cfn-gamelift-build-name
-	Name string `json:"Name,omitempty"`
-
-	// StorageLocation AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-build.html#cfn-gamelift-build-storagelocation
-	StorageLocation *AWSGameLiftBuild_S3Location `json:"StorageLocation,omitempty"`
-
-	// Version AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-build.html#cfn-gamelift-build-version
-	Version string `json:"Version,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGameLiftBuild) AWSCloudFormationType() string {
-	return "AWS::GameLift::Build"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSGameLiftBuild) MarshalJSON() ([]byte, error) {
-	type Properties AWSGameLiftBuild
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSGameLiftBuild) UnmarshalJSON(b []byte) error {
-	type Properties AWSGameLiftBuild
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSGameLiftBuild(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSGameLiftBuildResources retrieves all AWSGameLiftBuild items from an AWS CloudFormation template
-func (t *Template) GetAllAWSGameLiftBuildResources() map[string]AWSGameLiftBuild {
-	results := map[string]AWSGameLiftBuild{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSGameLiftBuild:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::GameLift::Build" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGameLiftBuild
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSGameLiftBuildWithName retrieves all AWSGameLiftBuild items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSGameLiftBuildWithName(name string) (AWSGameLiftBuild, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSGameLiftBuild:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::GameLift::Build" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGameLiftBuild
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSGameLiftBuild{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-build_s3location.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-build_s3location.go
deleted file mode 100644
index cc53ad7456..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-build_s3location.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSGameLiftBuild_S3Location AWS CloudFormation Resource (AWS::GameLift::Build.S3Location)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html
-type AWSGameLiftBuild_S3Location struct {
-
-	// Bucket AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html#cfn-gamelift-build-storage-bucket
-	Bucket string `json:"Bucket,omitempty"`
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html#cfn-gamelift-build-storage-key
-	Key string `json:"Key,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html#cfn-gamelift-build-storage-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGameLiftBuild_S3Location) AWSCloudFormationType() string {
-	return "AWS::GameLift::Build.S3Location"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-fleet.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-fleet.go
deleted file mode 100644
index cf013cc09a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-fleet.go
+++ /dev/null
@@ -1,160 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSGameLiftFleet AWS CloudFormation Resource (AWS::GameLift::Fleet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html
-type AWSGameLiftFleet struct {
-
-	// BuildId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-buildid
-	BuildId string `json:"BuildId,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-description
-	Description string `json:"Description,omitempty"`
-
-	// DesiredEC2Instances AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-desiredec2instances
-	DesiredEC2Instances int `json:"DesiredEC2Instances,omitempty"`
-
-	// EC2InboundPermissions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-ec2inboundpermissions
-	EC2InboundPermissions []AWSGameLiftFleet_IpPermission `json:"EC2InboundPermissions,omitempty"`
-
-	// EC2InstanceType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-ec2instancetype
-	EC2InstanceType string `json:"EC2InstanceType,omitempty"`
-
-	// LogPaths AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-logpaths
-	LogPaths []string `json:"LogPaths,omitempty"`
-
-	// MaxSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-maxsize
-	MaxSize int `json:"MaxSize,omitempty"`
-
-	// MinSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-minsize
-	MinSize int `json:"MinSize,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-name
-	Name string `json:"Name,omitempty"`
-
-	// ServerLaunchParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-serverlaunchparameters
-	ServerLaunchParameters string `json:"ServerLaunchParameters,omitempty"`
-
-	// ServerLaunchPath AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-serverlaunchpath
-	ServerLaunchPath string `json:"ServerLaunchPath,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGameLiftFleet) AWSCloudFormationType() string {
-	return "AWS::GameLift::Fleet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSGameLiftFleet) MarshalJSON() ([]byte, error) {
-	type Properties AWSGameLiftFleet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSGameLiftFleet) UnmarshalJSON(b []byte) error {
-	type Properties AWSGameLiftFleet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSGameLiftFleet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSGameLiftFleetResources retrieves all AWSGameLiftFleet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSGameLiftFleetResources() map[string]AWSGameLiftFleet {
-	results := map[string]AWSGameLiftFleet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSGameLiftFleet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::GameLift::Fleet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGameLiftFleet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSGameLiftFleetWithName retrieves all AWSGameLiftFleet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSGameLiftFleetWithName(name string) (AWSGameLiftFleet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSGameLiftFleet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::GameLift::Fleet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGameLiftFleet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSGameLiftFleet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-fleet_ippermission.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-fleet_ippermission.go
deleted file mode 100644
index b0f197bb00..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-gamelift-fleet_ippermission.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSGameLiftFleet_IpPermission AWS CloudFormation Resource (AWS::GameLift::Fleet.IpPermission)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-ec2inboundpermission.html
-type AWSGameLiftFleet_IpPermission struct {
-
-	// FromPort AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-ec2inboundpermission.html#cfn-gamelift-fleet-ec2inboundpermissions-fromport
-	FromPort int `json:"FromPort,omitempty"`
-
-	// IpRange AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-ec2inboundpermission.html#cfn-gamelift-fleet-ec2inboundpermissions-iprange
-	IpRange string `json:"IpRange,omitempty"`
-
-	// Protocol AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-ec2inboundpermission.html#cfn-gamelift-fleet-ec2inboundpermissions-protocol
-	Protocol string `json:"Protocol,omitempty"`
-
-	// ToPort AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-ec2inboundpermission.html#cfn-gamelift-fleet-ec2inboundpermissions-toport
-	ToPort int `json:"ToPort,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGameLiftFleet_IpPermission) AWSCloudFormationType() string {
-	return "AWS::GameLift::Fleet.IpPermission"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-classifier.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-classifier.go
deleted file mode 100644
index 0e50cf06cc..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-classifier.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSGlueClassifier AWS CloudFormation Resource (AWS::Glue::Classifier)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html
-type AWSGlueClassifier struct {
-
-	// GrokClassifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-grokclassifier
-	GrokClassifier *AWSGlueClassifier_GrokClassifier `json:"GrokClassifier,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueClassifier) AWSCloudFormationType() string {
-	return "AWS::Glue::Classifier"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSGlueClassifier) MarshalJSON() ([]byte, error) {
-	type Properties AWSGlueClassifier
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSGlueClassifier) UnmarshalJSON(b []byte) error {
-	type Properties AWSGlueClassifier
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSGlueClassifier(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSGlueClassifierResources retrieves all AWSGlueClassifier items from an AWS CloudFormation template
-func (t *Template) GetAllAWSGlueClassifierResources() map[string]AWSGlueClassifier {
-	results := map[string]AWSGlueClassifier{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSGlueClassifier:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Classifier" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueClassifier
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSGlueClassifierWithName retrieves all AWSGlueClassifier items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSGlueClassifierWithName(name string) (AWSGlueClassifier, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSGlueClassifier:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Classifier" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueClassifier
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSGlueClassifier{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-classifier_grokclassifier.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-classifier_grokclassifier.go
deleted file mode 100644
index de13d67f9a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-classifier_grokclassifier.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSGlueClassifier_GrokClassifier AWS CloudFormation Resource (AWS::Glue::Classifier.GrokClassifier)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-grokclassifier.html
-type AWSGlueClassifier_GrokClassifier struct {
-
-	// Classification AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-grokclassifier.html#cfn-glue-classifier-grokclassifier-classification
-	Classification string `json:"Classification,omitempty"`
-
-	// CustomPatterns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-grokclassifier.html#cfn-glue-classifier-grokclassifier-custompatterns
-	CustomPatterns string `json:"CustomPatterns,omitempty"`
-
-	// GrokPattern AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-grokclassifier.html#cfn-glue-classifier-grokclassifier-grokpattern
-	GrokPattern string `json:"GrokPattern,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-grokclassifier.html#cfn-glue-classifier-grokclassifier-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueClassifier_GrokClassifier) AWSCloudFormationType() string {
-	return "AWS::Glue::Classifier.GrokClassifier"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-connection.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-connection.go
deleted file mode 100644
index af57b792d4..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-connection.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSGlueConnection AWS CloudFormation Resource (AWS::Glue::Connection)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html
-type AWSGlueConnection struct {
-
-	// CatalogId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-catalogid
-	CatalogId string `json:"CatalogId,omitempty"`
-
-	// ConnectionInput AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-connectioninput
-	ConnectionInput *AWSGlueConnection_ConnectionInput `json:"ConnectionInput,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueConnection) AWSCloudFormationType() string {
-	return "AWS::Glue::Connection"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSGlueConnection) MarshalJSON() ([]byte, error) {
-	type Properties AWSGlueConnection
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSGlueConnection) UnmarshalJSON(b []byte) error {
-	type Properties AWSGlueConnection
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSGlueConnection(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSGlueConnectionResources retrieves all AWSGlueConnection items from an AWS CloudFormation template
-func (t *Template) GetAllAWSGlueConnectionResources() map[string]AWSGlueConnection {
-	results := map[string]AWSGlueConnection{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSGlueConnection:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Connection" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueConnection
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSGlueConnectionWithName retrieves all AWSGlueConnection items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSGlueConnectionWithName(name string) (AWSGlueConnection, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSGlueConnection:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Connection" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueConnection
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSGlueConnection{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-connection_connectioninput.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-connection_connectioninput.go
deleted file mode 100644
index 2459ea54e5..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-connection_connectioninput.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSGlueConnection_ConnectionInput AWS CloudFormation Resource (AWS::Glue::Connection.ConnectionInput)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html
-type AWSGlueConnection_ConnectionInput struct {
-
-	// ConnectionProperties AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-connectionproperties
-	ConnectionProperties interface{} `json:"ConnectionProperties,omitempty"`
-
-	// ConnectionType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-connectiontype
-	ConnectionType string `json:"ConnectionType,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-description
-	Description string `json:"Description,omitempty"`
-
-	// MatchCriteria AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-matchcriteria
-	MatchCriteria []string `json:"MatchCriteria,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-name
-	Name string `json:"Name,omitempty"`
-
-	// PhysicalConnectionRequirements AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-physicalconnectionrequirements
-	PhysicalConnectionRequirements *AWSGlueConnection_PhysicalConnectionRequirements `json:"PhysicalConnectionRequirements,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueConnection_ConnectionInput) AWSCloudFormationType() string {
-	return "AWS::Glue::Connection.ConnectionInput"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-connection_physicalconnectionrequirements.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-connection_physicalconnectionrequirements.go
deleted file mode 100644
index ccde2455fa..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-connection_physicalconnectionrequirements.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSGlueConnection_PhysicalConnectionRequirements AWS CloudFormation Resource (AWS::Glue::Connection.PhysicalConnectionRequirements)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-physicalconnectionrequirements.html
-type AWSGlueConnection_PhysicalConnectionRequirements struct {
-
-	// AvailabilityZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-physicalconnectionrequirements.html#cfn-glue-connection-physicalconnectionrequirements-availabilityzone
-	AvailabilityZone string `json:"AvailabilityZone,omitempty"`
-
-	// SecurityGroupIdList AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-physicalconnectionrequirements.html#cfn-glue-connection-physicalconnectionrequirements-securitygroupidlist
-	SecurityGroupIdList []string `json:"SecurityGroupIdList,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-physicalconnectionrequirements.html#cfn-glue-connection-physicalconnectionrequirements-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueConnection_PhysicalConnectionRequirements) AWSCloudFormationType() string {
-	return "AWS::Glue::Connection.PhysicalConnectionRequirements"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler.go
deleted file mode 100644
index b99a1fa4be..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSGlueCrawler AWS CloudFormation Resource (AWS::Glue::Crawler)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html
-type AWSGlueCrawler struct {
-
-	// Classifiers AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-classifiers
-	Classifiers []string `json:"Classifiers,omitempty"`
-
-	// DatabaseName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-databasename
-	DatabaseName string `json:"DatabaseName,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-description
-	Description string `json:"Description,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-name
-	Name string `json:"Name,omitempty"`
-
-	// Role AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-role
-	Role string `json:"Role,omitempty"`
-
-	// Schedule AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schedule
-	Schedule *AWSGlueCrawler_Schedule `json:"Schedule,omitempty"`
-
-	// SchemaChangePolicy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schemachangepolicy
-	SchemaChangePolicy *AWSGlueCrawler_SchemaChangePolicy `json:"SchemaChangePolicy,omitempty"`
-
-	// TablePrefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tableprefix
-	TablePrefix string `json:"TablePrefix,omitempty"`
-
-	// Targets AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-targets
-	Targets *AWSGlueCrawler_Targets `json:"Targets,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueCrawler) AWSCloudFormationType() string {
-	return "AWS::Glue::Crawler"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSGlueCrawler) MarshalJSON() ([]byte, error) {
-	type Properties AWSGlueCrawler
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSGlueCrawler) UnmarshalJSON(b []byte) error {
-	type Properties AWSGlueCrawler
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSGlueCrawler(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSGlueCrawlerResources retrieves all AWSGlueCrawler items from an AWS CloudFormation template
-func (t *Template) GetAllAWSGlueCrawlerResources() map[string]AWSGlueCrawler {
-	results := map[string]AWSGlueCrawler{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSGlueCrawler:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Crawler" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueCrawler
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSGlueCrawlerWithName retrieves all AWSGlueCrawler items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSGlueCrawlerWithName(name string) (AWSGlueCrawler, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSGlueCrawler:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Crawler" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueCrawler
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSGlueCrawler{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_jdbctarget.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_jdbctarget.go
deleted file mode 100644
index ec76a9a218..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_jdbctarget.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSGlueCrawler_JdbcTarget AWS CloudFormation Resource (AWS::Glue::Crawler.JdbcTarget)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-jdbctarget.html
-type AWSGlueCrawler_JdbcTarget struct {
-
-	// ConnectionName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-jdbctarget.html#cfn-glue-crawler-jdbctarget-connectionname
-	ConnectionName string `json:"ConnectionName,omitempty"`
-
-	// Exclusions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-jdbctarget.html#cfn-glue-crawler-jdbctarget-exclusions
-	Exclusions []string `json:"Exclusions,omitempty"`
-
-	// Path AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-jdbctarget.html#cfn-glue-crawler-jdbctarget-path
-	Path string `json:"Path,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueCrawler_JdbcTarget) AWSCloudFormationType() string {
-	return "AWS::Glue::Crawler.JdbcTarget"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_s3target.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_s3target.go
deleted file mode 100644
index 17f6f64664..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_s3target.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSGlueCrawler_S3Target AWS CloudFormation Resource (AWS::Glue::Crawler.S3Target)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-s3target.html
-type AWSGlueCrawler_S3Target struct {
-
-	// Exclusions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-s3target.html#cfn-glue-crawler-s3target-exclusions
-	Exclusions []string `json:"Exclusions,omitempty"`
-
-	// Path AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-s3target.html#cfn-glue-crawler-s3target-path
-	Path string `json:"Path,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueCrawler_S3Target) AWSCloudFormationType() string {
-	return "AWS::Glue::Crawler.S3Target"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_schedule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_schedule.go
deleted file mode 100644
index cdb30535f7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_schedule.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSGlueCrawler_Schedule AWS CloudFormation Resource (AWS::Glue::Crawler.Schedule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-schedule.html
-type AWSGlueCrawler_Schedule struct {
-
-	// ScheduleExpression AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-schedule.html#cfn-glue-crawler-schedule-scheduleexpression
-	ScheduleExpression string `json:"ScheduleExpression,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueCrawler_Schedule) AWSCloudFormationType() string {
-	return "AWS::Glue::Crawler.Schedule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_schemachangepolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_schemachangepolicy.go
deleted file mode 100644
index 2c3c04319e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_schemachangepolicy.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSGlueCrawler_SchemaChangePolicy AWS CloudFormation Resource (AWS::Glue::Crawler.SchemaChangePolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-schemachangepolicy.html
-type AWSGlueCrawler_SchemaChangePolicy struct {
-
-	// DeleteBehavior AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-schemachangepolicy.html#cfn-glue-crawler-schemachangepolicy-deletebehavior
-	DeleteBehavior string `json:"DeleteBehavior,omitempty"`
-
-	// UpdateBehavior AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-schemachangepolicy.html#cfn-glue-crawler-schemachangepolicy-updatebehavior
-	UpdateBehavior string `json:"UpdateBehavior,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueCrawler_SchemaChangePolicy) AWSCloudFormationType() string {
-	return "AWS::Glue::Crawler.SchemaChangePolicy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_targets.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_targets.go
deleted file mode 100644
index 31adde7891..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-crawler_targets.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSGlueCrawler_Targets AWS CloudFormation Resource (AWS::Glue::Crawler.Targets)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-targets.html
-type AWSGlueCrawler_Targets struct {
-
-	// JdbcTargets AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-targets.html#cfn-glue-crawler-targets-jdbctargets
-	JdbcTargets []AWSGlueCrawler_JdbcTarget `json:"JdbcTargets,omitempty"`
-
-	// S3Targets AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-targets.html#cfn-glue-crawler-targets-s3targets
-	S3Targets []AWSGlueCrawler_S3Target `json:"S3Targets,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueCrawler_Targets) AWSCloudFormationType() string {
-	return "AWS::Glue::Crawler.Targets"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-database.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-database.go
deleted file mode 100644
index c2752bdb29..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-database.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSGlueDatabase AWS CloudFormation Resource (AWS::Glue::Database)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html
-type AWSGlueDatabase struct {
-
-	// CatalogId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-catalogid
-	CatalogId string `json:"CatalogId,omitempty"`
-
-	// DatabaseInput AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-databaseinput
-	DatabaseInput *AWSGlueDatabase_DatabaseInput `json:"DatabaseInput,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueDatabase) AWSCloudFormationType() string {
-	return "AWS::Glue::Database"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSGlueDatabase) MarshalJSON() ([]byte, error) {
-	type Properties AWSGlueDatabase
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSGlueDatabase) UnmarshalJSON(b []byte) error {
-	type Properties AWSGlueDatabase
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSGlueDatabase(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSGlueDatabaseResources retrieves all AWSGlueDatabase items from an AWS CloudFormation template
-func (t *Template) GetAllAWSGlueDatabaseResources() map[string]AWSGlueDatabase {
-	results := map[string]AWSGlueDatabase{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSGlueDatabase:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Database" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueDatabase
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSGlueDatabaseWithName retrieves all AWSGlueDatabase items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSGlueDatabaseWithName(name string) (AWSGlueDatabase, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSGlueDatabase:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Database" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueDatabase
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSGlueDatabase{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-database_databaseinput.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-database_databaseinput.go
deleted file mode 100644
index 154331311f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-database_databaseinput.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSGlueDatabase_DatabaseInput AWS CloudFormation Resource (AWS::Glue::Database.DatabaseInput)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html
-type AWSGlueDatabase_DatabaseInput struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html#cfn-glue-database-databaseinput-description
-	Description string `json:"Description,omitempty"`
-
-	// LocationUri AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html#cfn-glue-database-databaseinput-locationuri
-	LocationUri string `json:"LocationUri,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html#cfn-glue-database-databaseinput-name
-	Name string `json:"Name,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html#cfn-glue-database-databaseinput-parameters
-	Parameters interface{} `json:"Parameters,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueDatabase_DatabaseInput) AWSCloudFormationType() string {
-	return "AWS::Glue::Database.DatabaseInput"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-devendpoint.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-devendpoint.go
deleted file mode 100644
index 08d5876053..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-devendpoint.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSGlueDevEndpoint AWS CloudFormation Resource (AWS::Glue::DevEndpoint)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html
-type AWSGlueDevEndpoint struct {
-
-	// EndpointName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-endpointname
-	EndpointName string `json:"EndpointName,omitempty"`
-
-	// ExtraJarsS3Path AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrajarss3path
-	ExtraJarsS3Path string `json:"ExtraJarsS3Path,omitempty"`
-
-	// ExtraPythonLibsS3Path AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrapythonlibss3path
-	ExtraPythonLibsS3Path string `json:"ExtraPythonLibsS3Path,omitempty"`
-
-	// NumberOfNodes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-numberofnodes
-	NumberOfNodes int `json:"NumberOfNodes,omitempty"`
-
-	// PublicKey AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-publickey
-	PublicKey string `json:"PublicKey,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// SecurityGroupIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securitygroupids
-	SecurityGroupIds []string `json:"SecurityGroupIds,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueDevEndpoint) AWSCloudFormationType() string {
-	return "AWS::Glue::DevEndpoint"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSGlueDevEndpoint) MarshalJSON() ([]byte, error) {
-	type Properties AWSGlueDevEndpoint
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSGlueDevEndpoint) UnmarshalJSON(b []byte) error {
-	type Properties AWSGlueDevEndpoint
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSGlueDevEndpoint(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSGlueDevEndpointResources retrieves all AWSGlueDevEndpoint items from an AWS CloudFormation template
-func (t *Template) GetAllAWSGlueDevEndpointResources() map[string]AWSGlueDevEndpoint {
-	results := map[string]AWSGlueDevEndpoint{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSGlueDevEndpoint:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::DevEndpoint" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueDevEndpoint
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSGlueDevEndpointWithName retrieves all AWSGlueDevEndpoint items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSGlueDevEndpointWithName(name string) (AWSGlueDevEndpoint, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSGlueDevEndpoint:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::DevEndpoint" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueDevEndpoint
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSGlueDevEndpoint{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-job.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-job.go
deleted file mode 100644
index 83a6431d80..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-job.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSGlueJob AWS CloudFormation Resource (AWS::Glue::Job)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html
-type AWSGlueJob struct {
-
-	// AllocatedCapacity AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-allocatedcapacity
-	AllocatedCapacity float64 `json:"AllocatedCapacity,omitempty"`
-
-	// Command AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-command
-	Command *AWSGlueJob_JobCommand `json:"Command,omitempty"`
-
-	// Connections AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-connections
-	Connections *AWSGlueJob_ConnectionsList `json:"Connections,omitempty"`
-
-	// DefaultArguments AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-defaultarguments
-	DefaultArguments interface{} `json:"DefaultArguments,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-description
-	Description string `json:"Description,omitempty"`
-
-	// ExecutionProperty AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-executionproperty
-	ExecutionProperty *AWSGlueJob_ExecutionProperty `json:"ExecutionProperty,omitempty"`
-
-	// LogUri AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-loguri
-	LogUri string `json:"LogUri,omitempty"`
-
-	// MaxRetries AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-maxretries
-	MaxRetries float64 `json:"MaxRetries,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-name
-	Name string `json:"Name,omitempty"`
-
-	// Role AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-role
-	Role string `json:"Role,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueJob) AWSCloudFormationType() string {
-	return "AWS::Glue::Job"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSGlueJob) MarshalJSON() ([]byte, error) {
-	type Properties AWSGlueJob
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSGlueJob) UnmarshalJSON(b []byte) error {
-	type Properties AWSGlueJob
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSGlueJob(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSGlueJobResources retrieves all AWSGlueJob items from an AWS CloudFormation template
-func (t *Template) GetAllAWSGlueJobResources() map[string]AWSGlueJob {
-	results := map[string]AWSGlueJob{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSGlueJob:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Job" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueJob
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSGlueJobWithName retrieves all AWSGlueJob items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSGlueJobWithName(name string) (AWSGlueJob, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSGlueJob:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Job" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueJob
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSGlueJob{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-job_connectionslist.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-job_connectionslist.go
deleted file mode 100644
index 68a03c11b6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-job_connectionslist.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSGlueJob_ConnectionsList AWS CloudFormation Resource (AWS::Glue::Job.ConnectionsList)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-connectionslist.html
-type AWSGlueJob_ConnectionsList struct {
-
-	// Connections AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-connectionslist.html#cfn-glue-job-connectionslist-connections
-	Connections []string `json:"Connections,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueJob_ConnectionsList) AWSCloudFormationType() string {
-	return "AWS::Glue::Job.ConnectionsList"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-job_executionproperty.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-job_executionproperty.go
deleted file mode 100644
index 2bddba7c6d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-job_executionproperty.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSGlueJob_ExecutionProperty AWS CloudFormation Resource (AWS::Glue::Job.ExecutionProperty)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-executionproperty.html
-type AWSGlueJob_ExecutionProperty struct {
-
-	// MaxConcurrentRuns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-executionproperty.html#cfn-glue-job-executionproperty-maxconcurrentruns
-	MaxConcurrentRuns float64 `json:"MaxConcurrentRuns,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueJob_ExecutionProperty) AWSCloudFormationType() string {
-	return "AWS::Glue::Job.ExecutionProperty"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-job_jobcommand.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-job_jobcommand.go
deleted file mode 100644
index 02d5c667bc..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-job_jobcommand.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSGlueJob_JobCommand AWS CloudFormation Resource (AWS::Glue::Job.JobCommand)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-jobcommand.html
-type AWSGlueJob_JobCommand struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-jobcommand.html#cfn-glue-job-jobcommand-name
-	Name string `json:"Name,omitempty"`
-
-	// ScriptLocation AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-jobcommand.html#cfn-glue-job-jobcommand-scriptlocation
-	ScriptLocation string `json:"ScriptLocation,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueJob_JobCommand) AWSCloudFormationType() string {
-	return "AWS::Glue::Job.JobCommand"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition.go
deleted file mode 100644
index 8e5ccfdb58..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSGluePartition AWS CloudFormation Resource (AWS::Glue::Partition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html
-type AWSGluePartition struct {
-
-	// CatalogId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-catalogid
-	CatalogId string `json:"CatalogId,omitempty"`
-
-	// DatabaseName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-databasename
-	DatabaseName string `json:"DatabaseName,omitempty"`
-
-	// PartitionInput AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-partitioninput
-	PartitionInput *AWSGluePartition_PartitionInput `json:"PartitionInput,omitempty"`
-
-	// TableName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-tablename
-	TableName string `json:"TableName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGluePartition) AWSCloudFormationType() string {
-	return "AWS::Glue::Partition"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSGluePartition) MarshalJSON() ([]byte, error) {
-	type Properties AWSGluePartition
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSGluePartition) UnmarshalJSON(b []byte) error {
-	type Properties AWSGluePartition
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSGluePartition(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSGluePartitionResources retrieves all AWSGluePartition items from an AWS CloudFormation template
-func (t *Template) GetAllAWSGluePartitionResources() map[string]AWSGluePartition {
-	results := map[string]AWSGluePartition{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSGluePartition:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Partition" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGluePartition
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSGluePartitionWithName retrieves all AWSGluePartition items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSGluePartitionWithName(name string) (AWSGluePartition, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSGluePartition:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Partition" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGluePartition
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSGluePartition{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_column.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_column.go
deleted file mode 100644
index 7143084010..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_column.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSGluePartition_Column AWS CloudFormation Resource (AWS::Glue::Partition.Column)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-column.html
-type AWSGluePartition_Column struct {
-
-	// Comment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-column.html#cfn-glue-partition-column-comment
-	Comment string `json:"Comment,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-column.html#cfn-glue-partition-column-name
-	Name string `json:"Name,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-column.html#cfn-glue-partition-column-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGluePartition_Column) AWSCloudFormationType() string {
-	return "AWS::Glue::Partition.Column"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_order.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_order.go
deleted file mode 100644
index b5fb286e8e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_order.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSGluePartition_Order AWS CloudFormation Resource (AWS::Glue::Partition.Order)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-order.html
-type AWSGluePartition_Order struct {
-
-	// Column AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-order.html#cfn-glue-partition-order-column
-	Column string `json:"Column,omitempty"`
-
-	// SortOrder AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-order.html#cfn-glue-partition-order-sortorder
-	SortOrder int `json:"SortOrder,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGluePartition_Order) AWSCloudFormationType() string {
-	return "AWS::Glue::Partition.Order"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_partitioninput.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_partitioninput.go
deleted file mode 100644
index 70aaf54c6a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_partitioninput.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSGluePartition_PartitionInput AWS CloudFormation Resource (AWS::Glue::Partition.PartitionInput)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-partitioninput.html
-type AWSGluePartition_PartitionInput struct {
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-partitioninput.html#cfn-glue-partition-partitioninput-parameters
-	Parameters interface{} `json:"Parameters,omitempty"`
-
-	// StorageDescriptor AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-partitioninput.html#cfn-glue-partition-partitioninput-storagedescriptor
-	StorageDescriptor *AWSGluePartition_StorageDescriptor `json:"StorageDescriptor,omitempty"`
-
-	// Values AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-partitioninput.html#cfn-glue-partition-partitioninput-values
-	Values []string `json:"Values,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGluePartition_PartitionInput) AWSCloudFormationType() string {
-	return "AWS::Glue::Partition.PartitionInput"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_serdeinfo.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_serdeinfo.go
deleted file mode 100644
index 72fe00d2e9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_serdeinfo.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSGluePartition_SerdeInfo AWS CloudFormation Resource (AWS::Glue::Partition.SerdeInfo)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-serdeinfo.html
-type AWSGluePartition_SerdeInfo struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-serdeinfo.html#cfn-glue-partition-serdeinfo-name
-	Name string `json:"Name,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-serdeinfo.html#cfn-glue-partition-serdeinfo-parameters
-	Parameters interface{} `json:"Parameters,omitempty"`
-
-	// SerializationLibrary AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-serdeinfo.html#cfn-glue-partition-serdeinfo-serializationlibrary
-	SerializationLibrary string `json:"SerializationLibrary,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGluePartition_SerdeInfo) AWSCloudFormationType() string {
-	return "AWS::Glue::Partition.SerdeInfo"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_skewedinfo.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_skewedinfo.go
deleted file mode 100644
index 855ed8758e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_skewedinfo.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSGluePartition_SkewedInfo AWS CloudFormation Resource (AWS::Glue::Partition.SkewedInfo)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-skewedinfo.html
-type AWSGluePartition_SkewedInfo struct {
-
-	// SkewedColumnNames AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-skewedinfo.html#cfn-glue-partition-skewedinfo-skewedcolumnnames
-	SkewedColumnNames []string `json:"SkewedColumnNames,omitempty"`
-
-	// SkewedColumnValueLocationMaps AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-skewedinfo.html#cfn-glue-partition-skewedinfo-skewedcolumnvaluelocationmaps
-	SkewedColumnValueLocationMaps interface{} `json:"SkewedColumnValueLocationMaps,omitempty"`
-
-	// SkewedColumnValues AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-skewedinfo.html#cfn-glue-partition-skewedinfo-skewedcolumnvalues
-	SkewedColumnValues []string `json:"SkewedColumnValues,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGluePartition_SkewedInfo) AWSCloudFormationType() string {
-	return "AWS::Glue::Partition.SkewedInfo"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_storagedescriptor.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_storagedescriptor.go
deleted file mode 100644
index 31598adb08..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-partition_storagedescriptor.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package cloudformation
-
-// AWSGluePartition_StorageDescriptor AWS CloudFormation Resource (AWS::Glue::Partition.StorageDescriptor)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html
-type AWSGluePartition_StorageDescriptor struct {
-
-	// BucketColumns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-bucketcolumns
-	BucketColumns []string `json:"BucketColumns,omitempty"`
-
-	// Columns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-columns
-	Columns []AWSGluePartition_Column `json:"Columns,omitempty"`
-
-	// Compressed AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-compressed
-	Compressed bool `json:"Compressed,omitempty"`
-
-	// InputFormat AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-inputformat
-	InputFormat string `json:"InputFormat,omitempty"`
-
-	// Location AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-location
-	Location string `json:"Location,omitempty"`
-
-	// NumberOfBuckets AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-numberofbuckets
-	NumberOfBuckets int `json:"NumberOfBuckets,omitempty"`
-
-	// OutputFormat AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-outputformat
-	OutputFormat string `json:"OutputFormat,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-parameters
-	Parameters interface{} `json:"Parameters,omitempty"`
-
-	// SerdeInfo AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-serdeinfo
-	SerdeInfo *AWSGluePartition_SerdeInfo `json:"SerdeInfo,omitempty"`
-
-	// SkewedInfo AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-skewedinfo
-	SkewedInfo *AWSGluePartition_SkewedInfo `json:"SkewedInfo,omitempty"`
-
-	// SortColumns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-sortcolumns
-	SortColumns []AWSGluePartition_Order `json:"SortColumns,omitempty"`
-
-	// StoredAsSubDirectories AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-storedassubdirectories
-	StoredAsSubDirectories bool `json:"StoredAsSubDirectories,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGluePartition_StorageDescriptor) AWSCloudFormationType() string {
-	return "AWS::Glue::Partition.StorageDescriptor"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table.go
deleted file mode 100644
index 4e43f83055..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSGlueTable AWS CloudFormation Resource (AWS::Glue::Table)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html
-type AWSGlueTable struct {
-
-	// CatalogId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-catalogid
-	CatalogId string `json:"CatalogId,omitempty"`
-
-	// DatabaseName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-databasename
-	DatabaseName string `json:"DatabaseName,omitempty"`
-
-	// TableInput AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-tableinput
-	TableInput *AWSGlueTable_TableInput `json:"TableInput,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueTable) AWSCloudFormationType() string {
-	return "AWS::Glue::Table"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSGlueTable) MarshalJSON() ([]byte, error) {
-	type Properties AWSGlueTable
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSGlueTable) UnmarshalJSON(b []byte) error {
-	type Properties AWSGlueTable
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSGlueTable(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSGlueTableResources retrieves all AWSGlueTable items from an AWS CloudFormation template
-func (t *Template) GetAllAWSGlueTableResources() map[string]AWSGlueTable {
-	results := map[string]AWSGlueTable{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSGlueTable:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Table" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueTable
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSGlueTableWithName retrieves all AWSGlueTable items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSGlueTableWithName(name string) (AWSGlueTable, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSGlueTable:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Table" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueTable
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSGlueTable{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_column.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_column.go
deleted file mode 100644
index dfef0af03d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_column.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSGlueTable_Column AWS CloudFormation Resource (AWS::Glue::Table.Column)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-column.html
-type AWSGlueTable_Column struct {
-
-	// Comment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-column.html#cfn-glue-table-column-comment
-	Comment string `json:"Comment,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-column.html#cfn-glue-table-column-name
-	Name string `json:"Name,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-column.html#cfn-glue-table-column-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueTable_Column) AWSCloudFormationType() string {
-	return "AWS::Glue::Table.Column"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_order.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_order.go
deleted file mode 100644
index f1785601bd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_order.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSGlueTable_Order AWS CloudFormation Resource (AWS::Glue::Table.Order)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-order.html
-type AWSGlueTable_Order struct {
-
-	// Column AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-order.html#cfn-glue-table-order-column
-	Column string `json:"Column,omitempty"`
-
-	// SortOrder AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-order.html#cfn-glue-table-order-sortorder
-	SortOrder int `json:"SortOrder,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueTable_Order) AWSCloudFormationType() string {
-	return "AWS::Glue::Table.Order"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_serdeinfo.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_serdeinfo.go
deleted file mode 100644
index 23fd1625bd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_serdeinfo.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSGlueTable_SerdeInfo AWS CloudFormation Resource (AWS::Glue::Table.SerdeInfo)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-serdeinfo.html
-type AWSGlueTable_SerdeInfo struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-serdeinfo.html#cfn-glue-table-serdeinfo-name
-	Name string `json:"Name,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-serdeinfo.html#cfn-glue-table-serdeinfo-parameters
-	Parameters interface{} `json:"Parameters,omitempty"`
-
-	// SerializationLibrary AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-serdeinfo.html#cfn-glue-table-serdeinfo-serializationlibrary
-	SerializationLibrary string `json:"SerializationLibrary,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueTable_SerdeInfo) AWSCloudFormationType() string {
-	return "AWS::Glue::Table.SerdeInfo"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_skewedinfo.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_skewedinfo.go
deleted file mode 100644
index cbea185b52..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_skewedinfo.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSGlueTable_SkewedInfo AWS CloudFormation Resource (AWS::Glue::Table.SkewedInfo)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-skewedinfo.html
-type AWSGlueTable_SkewedInfo struct {
-
-	// SkewedColumnNames AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-skewedinfo.html#cfn-glue-table-skewedinfo-skewedcolumnnames
-	SkewedColumnNames []string `json:"SkewedColumnNames,omitempty"`
-
-	// SkewedColumnValueLocationMaps AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-skewedinfo.html#cfn-glue-table-skewedinfo-skewedcolumnvaluelocationmaps
-	SkewedColumnValueLocationMaps interface{} `json:"SkewedColumnValueLocationMaps,omitempty"`
-
-	// SkewedColumnValues AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-skewedinfo.html#cfn-glue-table-skewedinfo-skewedcolumnvalues
-	SkewedColumnValues []string `json:"SkewedColumnValues,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueTable_SkewedInfo) AWSCloudFormationType() string {
-	return "AWS::Glue::Table.SkewedInfo"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_storagedescriptor.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_storagedescriptor.go
deleted file mode 100644
index dd646e25ed..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_storagedescriptor.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package cloudformation
-
-// AWSGlueTable_StorageDescriptor AWS CloudFormation Resource (AWS::Glue::Table.StorageDescriptor)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html
-type AWSGlueTable_StorageDescriptor struct {
-
-	// BucketColumns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-bucketcolumns
-	BucketColumns []string `json:"BucketColumns,omitempty"`
-
-	// Columns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-columns
-	Columns []AWSGlueTable_Column `json:"Columns,omitempty"`
-
-	// Compressed AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-compressed
-	Compressed bool `json:"Compressed,omitempty"`
-
-	// InputFormat AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-inputformat
-	InputFormat string `json:"InputFormat,omitempty"`
-
-	// Location AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-location
-	Location string `json:"Location,omitempty"`
-
-	// NumberOfBuckets AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-numberofbuckets
-	NumberOfBuckets int `json:"NumberOfBuckets,omitempty"`
-
-	// OutputFormat AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-outputformat
-	OutputFormat string `json:"OutputFormat,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-parameters
-	Parameters interface{} `json:"Parameters,omitempty"`
-
-	// SerdeInfo AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-serdeinfo
-	SerdeInfo *AWSGlueTable_SerdeInfo `json:"SerdeInfo,omitempty"`
-
-	// SkewedInfo AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-skewedinfo
-	SkewedInfo *AWSGlueTable_SkewedInfo `json:"SkewedInfo,omitempty"`
-
-	// SortColumns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-sortcolumns
-	SortColumns []AWSGlueTable_Order `json:"SortColumns,omitempty"`
-
-	// StoredAsSubDirectories AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-storedassubdirectories
-	StoredAsSubDirectories bool `json:"StoredAsSubDirectories,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueTable_StorageDescriptor) AWSCloudFormationType() string {
-	return "AWS::Glue::Table.StorageDescriptor"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_tableinput.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_tableinput.go
deleted file mode 100644
index 4713807ec0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-table_tableinput.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package cloudformation
-
-// AWSGlueTable_TableInput AWS CloudFormation Resource (AWS::Glue::Table.TableInput)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html
-type AWSGlueTable_TableInput struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-description
-	Description string `json:"Description,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-name
-	Name string `json:"Name,omitempty"`
-
-	// Owner AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-owner
-	Owner string `json:"Owner,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-parameters
-	Parameters interface{} `json:"Parameters,omitempty"`
-
-	// PartitionKeys AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-partitionkeys
-	PartitionKeys []AWSGlueTable_Column `json:"PartitionKeys,omitempty"`
-
-	// Retention AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-retention
-	Retention int `json:"Retention,omitempty"`
-
-	// StorageDescriptor AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-storagedescriptor
-	StorageDescriptor *AWSGlueTable_StorageDescriptor `json:"StorageDescriptor,omitempty"`
-
-	// TableType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-tabletype
-	TableType string `json:"TableType,omitempty"`
-
-	// ViewExpandedText AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-viewexpandedtext
-	ViewExpandedText string `json:"ViewExpandedText,omitempty"`
-
-	// ViewOriginalText AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-vieworiginaltext
-	ViewOriginalText string `json:"ViewOriginalText,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueTable_TableInput) AWSCloudFormationType() string {
-	return "AWS::Glue::Table.TableInput"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-trigger.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-trigger.go
deleted file mode 100644
index 88b0c189ea..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-trigger.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSGlueTrigger AWS CloudFormation Resource (AWS::Glue::Trigger)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html
-type AWSGlueTrigger struct {
-
-	// Actions AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-actions
-	Actions []AWSGlueTrigger_Action `json:"Actions,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-description
-	Description string `json:"Description,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-name
-	Name string `json:"Name,omitempty"`
-
-	// Predicate AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-predicate
-	Predicate *AWSGlueTrigger_Predicate `json:"Predicate,omitempty"`
-
-	// Schedule AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-schedule
-	Schedule string `json:"Schedule,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueTrigger) AWSCloudFormationType() string {
-	return "AWS::Glue::Trigger"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSGlueTrigger) MarshalJSON() ([]byte, error) {
-	type Properties AWSGlueTrigger
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSGlueTrigger) UnmarshalJSON(b []byte) error {
-	type Properties AWSGlueTrigger
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSGlueTrigger(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSGlueTriggerResources retrieves all AWSGlueTrigger items from an AWS CloudFormation template
-func (t *Template) GetAllAWSGlueTriggerResources() map[string]AWSGlueTrigger {
-	results := map[string]AWSGlueTrigger{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSGlueTrigger:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Trigger" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueTrigger
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSGlueTriggerWithName retrieves all AWSGlueTrigger items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSGlueTriggerWithName(name string) (AWSGlueTrigger, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSGlueTrigger:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Glue::Trigger" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSGlueTrigger
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSGlueTrigger{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-trigger_action.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-trigger_action.go
deleted file mode 100644
index 693fd0fdc7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-trigger_action.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSGlueTrigger_Action AWS CloudFormation Resource (AWS::Glue::Trigger.Action)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-action.html
-type AWSGlueTrigger_Action struct {
-
-	// Arguments AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-action.html#cfn-glue-trigger-action-arguments
-	Arguments interface{} `json:"Arguments,omitempty"`
-
-	// JobName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-action.html#cfn-glue-trigger-action-jobname
-	JobName string `json:"JobName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueTrigger_Action) AWSCloudFormationType() string {
-	return "AWS::Glue::Trigger.Action"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-trigger_condition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-trigger_condition.go
deleted file mode 100644
index 63f812a9e9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-trigger_condition.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSGlueTrigger_Condition AWS CloudFormation Resource (AWS::Glue::Trigger.Condition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-condition.html
-type AWSGlueTrigger_Condition struct {
-
-	// JobName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-condition.html#cfn-glue-trigger-condition-jobname
-	JobName string `json:"JobName,omitempty"`
-
-	// LogicalOperator AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-condition.html#cfn-glue-trigger-condition-logicaloperator
-	LogicalOperator string `json:"LogicalOperator,omitempty"`
-
-	// State AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-condition.html#cfn-glue-trigger-condition-state
-	State string `json:"State,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueTrigger_Condition) AWSCloudFormationType() string {
-	return "AWS::Glue::Trigger.Condition"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-trigger_predicate.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-trigger_predicate.go
deleted file mode 100644
index 67a13f69ac..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-glue-trigger_predicate.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSGlueTrigger_Predicate AWS CloudFormation Resource (AWS::Glue::Trigger.Predicate)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-predicate.html
-type AWSGlueTrigger_Predicate struct {
-
-	// Conditions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-predicate.html#cfn-glue-trigger-predicate-conditions
-	Conditions []AWSGlueTrigger_Condition `json:"Conditions,omitempty"`
-
-	// Logical AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-predicate.html#cfn-glue-trigger-predicate-logical
-	Logical string `json:"Logical,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSGlueTrigger_Predicate) AWSCloudFormationType() string {
-	return "AWS::Glue::Trigger.Predicate"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-accesskey.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-accesskey.go
deleted file mode 100644
index 7ece4892ef..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-accesskey.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIAMAccessKey AWS CloudFormation Resource (AWS::IAM::AccessKey)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html
-type AWSIAMAccessKey struct {
-
-	// Serial AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html#cfn-iam-accesskey-serial
-	Serial int `json:"Serial,omitempty"`
-
-	// Status AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html#cfn-iam-accesskey-status
-	Status string `json:"Status,omitempty"`
-
-	// UserName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html#cfn-iam-accesskey-username
-	UserName string `json:"UserName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIAMAccessKey) AWSCloudFormationType() string {
-	return "AWS::IAM::AccessKey"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIAMAccessKey) MarshalJSON() ([]byte, error) {
-	type Properties AWSIAMAccessKey
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIAMAccessKey) UnmarshalJSON(b []byte) error {
-	type Properties AWSIAMAccessKey
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIAMAccessKey(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIAMAccessKeyResources retrieves all AWSIAMAccessKey items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIAMAccessKeyResources() map[string]AWSIAMAccessKey {
-	results := map[string]AWSIAMAccessKey{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIAMAccessKey:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::AccessKey" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMAccessKey
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIAMAccessKeyWithName retrieves all AWSIAMAccessKey items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIAMAccessKeyWithName(name string) (AWSIAMAccessKey, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIAMAccessKey:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::AccessKey" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMAccessKey
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIAMAccessKey{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-group.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-group.go
deleted file mode 100644
index c5dac8dafe..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-group.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIAMGroup AWS CloudFormation Resource (AWS::IAM::Group)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html
-type AWSIAMGroup struct {
-
-	// GroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html#cfn-iam-group-groupname
-	GroupName string `json:"GroupName,omitempty"`
-
-	// ManagedPolicyArns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html#cfn-iam-group-managepolicyarns
-	ManagedPolicyArns []string `json:"ManagedPolicyArns,omitempty"`
-
-	// Path AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html#cfn-iam-group-path
-	Path string `json:"Path,omitempty"`
-
-	// Policies AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html#cfn-iam-group-policies
-	Policies []AWSIAMGroup_Policy `json:"Policies,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIAMGroup) AWSCloudFormationType() string {
-	return "AWS::IAM::Group"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIAMGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSIAMGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIAMGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSIAMGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIAMGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIAMGroupResources retrieves all AWSIAMGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIAMGroupResources() map[string]AWSIAMGroup {
-	results := map[string]AWSIAMGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIAMGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::Group" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIAMGroupWithName retrieves all AWSIAMGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIAMGroupWithName(name string) (AWSIAMGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIAMGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::Group" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIAMGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-group_policy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-group_policy.go
deleted file mode 100644
index 78b16e0b48..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-group_policy.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSIAMGroup_Policy AWS CloudFormation Resource (AWS::IAM::Group.Policy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html
-type AWSIAMGroup_Policy struct {
-
-	// PolicyDocument AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policydocument
-	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
-
-	// PolicyName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname
-	PolicyName string `json:"PolicyName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIAMGroup_Policy) AWSCloudFormationType() string {
-	return "AWS::IAM::Group.Policy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-instanceprofile.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-instanceprofile.go
deleted file mode 100644
index 8c5698b5c9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-instanceprofile.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIAMInstanceProfile AWS CloudFormation Resource (AWS::IAM::InstanceProfile)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html
-type AWSIAMInstanceProfile struct {
-
-	// InstanceProfileName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html#cfn-iam-instanceprofile-instanceprofilename
-	InstanceProfileName string `json:"InstanceProfileName,omitempty"`
-
-	// Path AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html#cfn-iam-instanceprofile-path
-	Path string `json:"Path,omitempty"`
-
-	// Roles AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html#cfn-iam-instanceprofile-roles
-	Roles []string `json:"Roles,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIAMInstanceProfile) AWSCloudFormationType() string {
-	return "AWS::IAM::InstanceProfile"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIAMInstanceProfile) MarshalJSON() ([]byte, error) {
-	type Properties AWSIAMInstanceProfile
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIAMInstanceProfile) UnmarshalJSON(b []byte) error {
-	type Properties AWSIAMInstanceProfile
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIAMInstanceProfile(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIAMInstanceProfileResources retrieves all AWSIAMInstanceProfile items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIAMInstanceProfileResources() map[string]AWSIAMInstanceProfile {
-	results := map[string]AWSIAMInstanceProfile{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIAMInstanceProfile:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::InstanceProfile" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMInstanceProfile
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIAMInstanceProfileWithName retrieves all AWSIAMInstanceProfile items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIAMInstanceProfileWithName(name string) (AWSIAMInstanceProfile, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIAMInstanceProfile:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::InstanceProfile" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMInstanceProfile
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIAMInstanceProfile{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-managedpolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-managedpolicy.go
deleted file mode 100644
index f1d8dfffb2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-managedpolicy.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIAMManagedPolicy AWS CloudFormation Resource (AWS::IAM::ManagedPolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html
-type AWSIAMManagedPolicy struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-iam-managedpolicy-description
-	Description string `json:"Description,omitempty"`
-
-	// Groups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-iam-managedpolicy-groups
-	Groups []string `json:"Groups,omitempty"`
-
-	// ManagedPolicyName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-iam-managedpolicy-managedpolicyname
-	ManagedPolicyName string `json:"ManagedPolicyName,omitempty"`
-
-	// Path AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-ec2-dhcpoptions-path
-	Path string `json:"Path,omitempty"`
-
-	// PolicyDocument AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-iam-managedpolicy-policydocument
-	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
-
-	// Roles AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-iam-managedpolicy-roles
-	Roles []string `json:"Roles,omitempty"`
-
-	// Users AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-iam-managedpolicy-users
-	Users []string `json:"Users,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIAMManagedPolicy) AWSCloudFormationType() string {
-	return "AWS::IAM::ManagedPolicy"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIAMManagedPolicy) MarshalJSON() ([]byte, error) {
-	type Properties AWSIAMManagedPolicy
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIAMManagedPolicy) UnmarshalJSON(b []byte) error {
-	type Properties AWSIAMManagedPolicy
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIAMManagedPolicy(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIAMManagedPolicyResources retrieves all AWSIAMManagedPolicy items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIAMManagedPolicyResources() map[string]AWSIAMManagedPolicy {
-	results := map[string]AWSIAMManagedPolicy{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIAMManagedPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::ManagedPolicy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMManagedPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIAMManagedPolicyWithName retrieves all AWSIAMManagedPolicy items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIAMManagedPolicyWithName(name string) (AWSIAMManagedPolicy, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIAMManagedPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::ManagedPolicy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMManagedPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIAMManagedPolicy{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-policy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-policy.go
deleted file mode 100644
index b14c504545..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-policy.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIAMPolicy AWS CloudFormation Resource (AWS::IAM::Policy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html
-type AWSIAMPolicy struct {
-
-	// Groups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-groups
-	Groups []string `json:"Groups,omitempty"`
-
-	// PolicyDocument AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policydocument
-	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
-
-	// PolicyName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname
-	PolicyName string `json:"PolicyName,omitempty"`
-
-	// Roles AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles
-	Roles []string `json:"Roles,omitempty"`
-
-	// Users AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-users
-	Users []string `json:"Users,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIAMPolicy) AWSCloudFormationType() string {
-	return "AWS::IAM::Policy"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIAMPolicy) MarshalJSON() ([]byte, error) {
-	type Properties AWSIAMPolicy
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIAMPolicy) UnmarshalJSON(b []byte) error {
-	type Properties AWSIAMPolicy
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIAMPolicy(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIAMPolicyResources retrieves all AWSIAMPolicy items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIAMPolicyResources() map[string]AWSIAMPolicy {
-	results := map[string]AWSIAMPolicy{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIAMPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::Policy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIAMPolicyWithName retrieves all AWSIAMPolicy items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIAMPolicyWithName(name string) (AWSIAMPolicy, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIAMPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::Policy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIAMPolicy{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-role.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-role.go
deleted file mode 100644
index 59bfd2943c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-role.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIAMRole AWS CloudFormation Resource (AWS::IAM::Role)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html
-type AWSIAMRole struct {
-
-	// AssumeRolePolicyDocument AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-assumerolepolicydocument
-	AssumeRolePolicyDocument interface{} `json:"AssumeRolePolicyDocument,omitempty"`
-
-	// ManagedPolicyArns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-managepolicyarns
-	ManagedPolicyArns []string `json:"ManagedPolicyArns,omitempty"`
-
-	// Path AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-path
-	Path string `json:"Path,omitempty"`
-
-	// Policies AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-policies
-	Policies []AWSIAMRole_Policy `json:"Policies,omitempty"`
-
-	// RoleName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-rolename
-	RoleName string `json:"RoleName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIAMRole) AWSCloudFormationType() string {
-	return "AWS::IAM::Role"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIAMRole) MarshalJSON() ([]byte, error) {
-	type Properties AWSIAMRole
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIAMRole) UnmarshalJSON(b []byte) error {
-	type Properties AWSIAMRole
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIAMRole(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIAMRoleResources retrieves all AWSIAMRole items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIAMRoleResources() map[string]AWSIAMRole {
-	results := map[string]AWSIAMRole{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIAMRole:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::Role" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMRole
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIAMRoleWithName retrieves all AWSIAMRole items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIAMRoleWithName(name string) (AWSIAMRole, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIAMRole:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::Role" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMRole
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIAMRole{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-role_policy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-role_policy.go
deleted file mode 100644
index 0816e95065..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-role_policy.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSIAMRole_Policy AWS CloudFormation Resource (AWS::IAM::Role.Policy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html
-type AWSIAMRole_Policy struct {
-
-	// PolicyDocument AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policydocument
-	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
-
-	// PolicyName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname
-	PolicyName string `json:"PolicyName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIAMRole_Policy) AWSCloudFormationType() string {
-	return "AWS::IAM::Role.Policy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-user.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-user.go
deleted file mode 100644
index 519e5c2113..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-user.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIAMUser AWS CloudFormation Resource (AWS::IAM::User)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html
-type AWSIAMUser struct {
-
-	// Groups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-groups
-	Groups []string `json:"Groups,omitempty"`
-
-	// LoginProfile AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-loginprofile
-	LoginProfile *AWSIAMUser_LoginProfile `json:"LoginProfile,omitempty"`
-
-	// ManagedPolicyArns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-managepolicyarns
-	ManagedPolicyArns []string `json:"ManagedPolicyArns,omitempty"`
-
-	// Path AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-path
-	Path string `json:"Path,omitempty"`
-
-	// Policies AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-policies
-	Policies []AWSIAMUser_Policy `json:"Policies,omitempty"`
-
-	// UserName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-username
-	UserName string `json:"UserName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIAMUser) AWSCloudFormationType() string {
-	return "AWS::IAM::User"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIAMUser) MarshalJSON() ([]byte, error) {
-	type Properties AWSIAMUser
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIAMUser) UnmarshalJSON(b []byte) error {
-	type Properties AWSIAMUser
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIAMUser(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIAMUserResources retrieves all AWSIAMUser items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIAMUserResources() map[string]AWSIAMUser {
-	results := map[string]AWSIAMUser{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIAMUser:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::User" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMUser
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIAMUserWithName retrieves all AWSIAMUser items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIAMUserWithName(name string) (AWSIAMUser, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIAMUser:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::User" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMUser
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIAMUser{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-user_loginprofile.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-user_loginprofile.go
deleted file mode 100644
index be93b553ef..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-user_loginprofile.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSIAMUser_LoginProfile AWS CloudFormation Resource (AWS::IAM::User.LoginProfile)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user-loginprofile.html
-type AWSIAMUser_LoginProfile struct {
-
-	// Password AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user-loginprofile.html#cfn-iam-user-loginprofile-password
-	Password string `json:"Password,omitempty"`
-
-	// PasswordResetRequired AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user-loginprofile.html#cfn-iam-user-loginprofile-passwordresetrequired
-	PasswordResetRequired bool `json:"PasswordResetRequired,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIAMUser_LoginProfile) AWSCloudFormationType() string {
-	return "AWS::IAM::User.LoginProfile"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-user_policy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-user_policy.go
deleted file mode 100644
index 1b5ea8842e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-user_policy.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSIAMUser_Policy AWS CloudFormation Resource (AWS::IAM::User.Policy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html
-type AWSIAMUser_Policy struct {
-
-	// PolicyDocument AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policydocument
-	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
-
-	// PolicyName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname
-	PolicyName string `json:"PolicyName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIAMUser_Policy) AWSCloudFormationType() string {
-	return "AWS::IAM::User.Policy"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-usertogroupaddition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-usertogroupaddition.go
deleted file mode 100644
index 5d3209cc5e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iam-usertogroupaddition.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIAMUserToGroupAddition AWS CloudFormation Resource (AWS::IAM::UserToGroupAddition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html
-type AWSIAMUserToGroupAddition struct {
-
-	// GroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html#cfn-iam-addusertogroup-groupname
-	GroupName string `json:"GroupName,omitempty"`
-
-	// Users AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html#cfn-iam-addusertogroup-users
-	Users []string `json:"Users,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIAMUserToGroupAddition) AWSCloudFormationType() string {
-	return "AWS::IAM::UserToGroupAddition"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIAMUserToGroupAddition) MarshalJSON() ([]byte, error) {
-	type Properties AWSIAMUserToGroupAddition
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIAMUserToGroupAddition) UnmarshalJSON(b []byte) error {
-	type Properties AWSIAMUserToGroupAddition
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIAMUserToGroupAddition(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIAMUserToGroupAdditionResources retrieves all AWSIAMUserToGroupAddition items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIAMUserToGroupAdditionResources() map[string]AWSIAMUserToGroupAddition {
-	results := map[string]AWSIAMUserToGroupAddition{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIAMUserToGroupAddition:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::UserToGroupAddition" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMUserToGroupAddition
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIAMUserToGroupAdditionWithName retrieves all AWSIAMUserToGroupAddition items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIAMUserToGroupAdditionWithName(name string) (AWSIAMUserToGroupAddition, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIAMUserToGroupAddition:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IAM::UserToGroupAddition" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIAMUserToGroupAddition
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIAMUserToGroupAddition{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-certificate.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-certificate.go
deleted file mode 100644
index 681dae687a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-certificate.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIoTCertificate AWS CloudFormation Resource (AWS::IoT::Certificate)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificate.html
-type AWSIoTCertificate struct {
-
-	// CertificateSigningRequest AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificate.html#cfn-iot-certificate-certificatesigningrequest
-	CertificateSigningRequest string `json:"CertificateSigningRequest,omitempty"`
-
-	// Status AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificate.html#cfn-iot-certificate-status
-	Status string `json:"Status,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTCertificate) AWSCloudFormationType() string {
-	return "AWS::IoT::Certificate"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIoTCertificate) MarshalJSON() ([]byte, error) {
-	type Properties AWSIoTCertificate
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIoTCertificate) UnmarshalJSON(b []byte) error {
-	type Properties AWSIoTCertificate
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIoTCertificate(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIoTCertificateResources retrieves all AWSIoTCertificate items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIoTCertificateResources() map[string]AWSIoTCertificate {
-	results := map[string]AWSIoTCertificate{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIoTCertificate:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IoT::Certificate" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIoTCertificate
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIoTCertificateWithName retrieves all AWSIoTCertificate items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIoTCertificateWithName(name string) (AWSIoTCertificate, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIoTCertificate:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IoT::Certificate" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIoTCertificate
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIoTCertificate{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-policy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-policy.go
deleted file mode 100644
index b23bf8c60a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-policy.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIoTPolicy AWS CloudFormation Resource (AWS::IoT::Policy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policy.html
-type AWSIoTPolicy struct {
-
-	// PolicyDocument AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policy.html#cfn-iot-policy-policydocument
-	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
-
-	// PolicyName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policy.html#cfn-iot-policy-policyname
-	PolicyName string `json:"PolicyName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTPolicy) AWSCloudFormationType() string {
-	return "AWS::IoT::Policy"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIoTPolicy) MarshalJSON() ([]byte, error) {
-	type Properties AWSIoTPolicy
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIoTPolicy) UnmarshalJSON(b []byte) error {
-	type Properties AWSIoTPolicy
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIoTPolicy(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIoTPolicyResources retrieves all AWSIoTPolicy items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIoTPolicyResources() map[string]AWSIoTPolicy {
-	results := map[string]AWSIoTPolicy{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIoTPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IoT::Policy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIoTPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIoTPolicyWithName retrieves all AWSIoTPolicy items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIoTPolicyWithName(name string) (AWSIoTPolicy, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIoTPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IoT::Policy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIoTPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIoTPolicy{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-policyprincipalattachment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-policyprincipalattachment.go
deleted file mode 100644
index 4a5e9d7b66..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-policyprincipalattachment.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIoTPolicyPrincipalAttachment AWS CloudFormation Resource (AWS::IoT::PolicyPrincipalAttachment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policyprincipalattachment.html
-type AWSIoTPolicyPrincipalAttachment struct {
-
-	// PolicyName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policyprincipalattachment.html#cfn-iot-policyprincipalattachment-policyname
-	PolicyName string `json:"PolicyName,omitempty"`
-
-	// Principal AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policyprincipalattachment.html#cfn-iot-policyprincipalattachment-principal
-	Principal string `json:"Principal,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTPolicyPrincipalAttachment) AWSCloudFormationType() string {
-	return "AWS::IoT::PolicyPrincipalAttachment"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIoTPolicyPrincipalAttachment) MarshalJSON() ([]byte, error) {
-	type Properties AWSIoTPolicyPrincipalAttachment
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIoTPolicyPrincipalAttachment) UnmarshalJSON(b []byte) error {
-	type Properties AWSIoTPolicyPrincipalAttachment
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIoTPolicyPrincipalAttachment(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIoTPolicyPrincipalAttachmentResources retrieves all AWSIoTPolicyPrincipalAttachment items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIoTPolicyPrincipalAttachmentResources() map[string]AWSIoTPolicyPrincipalAttachment {
-	results := map[string]AWSIoTPolicyPrincipalAttachment{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIoTPolicyPrincipalAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IoT::PolicyPrincipalAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIoTPolicyPrincipalAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIoTPolicyPrincipalAttachmentWithName retrieves all AWSIoTPolicyPrincipalAttachment items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIoTPolicyPrincipalAttachmentWithName(name string) (AWSIoTPolicyPrincipalAttachment, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIoTPolicyPrincipalAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IoT::PolicyPrincipalAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIoTPolicyPrincipalAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIoTPolicyPrincipalAttachment{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-thing.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-thing.go
deleted file mode 100644
index 70d69ba476..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-thing.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIoTThing AWS CloudFormation Resource (AWS::IoT::Thing)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thing.html
-type AWSIoTThing struct {
-
-	// AttributePayload AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thing.html#cfn-iot-thing-attributepayload
-	AttributePayload *AWSIoTThing_AttributePayload `json:"AttributePayload,omitempty"`
-
-	// ThingName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thing.html#cfn-iot-thing-thingname
-	ThingName string `json:"ThingName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTThing) AWSCloudFormationType() string {
-	return "AWS::IoT::Thing"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIoTThing) MarshalJSON() ([]byte, error) {
-	type Properties AWSIoTThing
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIoTThing) UnmarshalJSON(b []byte) error {
-	type Properties AWSIoTThing
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIoTThing(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIoTThingResources retrieves all AWSIoTThing items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIoTThingResources() map[string]AWSIoTThing {
-	results := map[string]AWSIoTThing{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIoTThing:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IoT::Thing" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIoTThing
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIoTThingWithName retrieves all AWSIoTThing items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIoTThingWithName(name string) (AWSIoTThing, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIoTThing:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IoT::Thing" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIoTThing
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIoTThing{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-thing_attributepayload.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-thing_attributepayload.go
deleted file mode 100644
index 88fcadf5e4..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-thing_attributepayload.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSIoTThing_AttributePayload AWS CloudFormation Resource (AWS::IoT::Thing.AttributePayload)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-thing-attributepayload.html
-type AWSIoTThing_AttributePayload struct {
-
-	// Attributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-thing-attributepayload.html#cfn-iot-thing-attributepayload-attributes
-	Attributes map[string]string `json:"Attributes,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTThing_AttributePayload) AWSCloudFormationType() string {
-	return "AWS::IoT::Thing.AttributePayload"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-thingprincipalattachment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-thingprincipalattachment.go
deleted file mode 100644
index 00cefc497a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-thingprincipalattachment.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIoTThingPrincipalAttachment AWS CloudFormation Resource (AWS::IoT::ThingPrincipalAttachment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thingprincipalattachment.html
-type AWSIoTThingPrincipalAttachment struct {
-
-	// Principal AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thingprincipalattachment.html#cfn-iot-thingprincipalattachment-principal
-	Principal string `json:"Principal,omitempty"`
-
-	// ThingName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thingprincipalattachment.html#cfn-iot-thingprincipalattachment-thingname
-	ThingName string `json:"ThingName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTThingPrincipalAttachment) AWSCloudFormationType() string {
-	return "AWS::IoT::ThingPrincipalAttachment"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIoTThingPrincipalAttachment) MarshalJSON() ([]byte, error) {
-	type Properties AWSIoTThingPrincipalAttachment
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIoTThingPrincipalAttachment) UnmarshalJSON(b []byte) error {
-	type Properties AWSIoTThingPrincipalAttachment
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIoTThingPrincipalAttachment(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIoTThingPrincipalAttachmentResources retrieves all AWSIoTThingPrincipalAttachment items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIoTThingPrincipalAttachmentResources() map[string]AWSIoTThingPrincipalAttachment {
-	results := map[string]AWSIoTThingPrincipalAttachment{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIoTThingPrincipalAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IoT::ThingPrincipalAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIoTThingPrincipalAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIoTThingPrincipalAttachmentWithName retrieves all AWSIoTThingPrincipalAttachment items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIoTThingPrincipalAttachmentWithName(name string) (AWSIoTThingPrincipalAttachment, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIoTThingPrincipalAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IoT::ThingPrincipalAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIoTThingPrincipalAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIoTThingPrincipalAttachment{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule.go
deleted file mode 100644
index 04391314f7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSIoTTopicRule AWS CloudFormation Resource (AWS::IoT::TopicRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicrule.html
-type AWSIoTTopicRule struct {
-
-	// RuleName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicrule.html#cfn-iot-topicrule-rulename
-	RuleName string `json:"RuleName,omitempty"`
-
-	// TopicRulePayload AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicrule.html#cfn-iot-topicrule-topicrulepayload
-	TopicRulePayload *AWSIoTTopicRule_TopicRulePayload `json:"TopicRulePayload,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSIoTTopicRule) MarshalJSON() ([]byte, error) {
-	type Properties AWSIoTTopicRule
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSIoTTopicRule) UnmarshalJSON(b []byte) error {
-	type Properties AWSIoTTopicRule
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSIoTTopicRule(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSIoTTopicRuleResources retrieves all AWSIoTTopicRule items from an AWS CloudFormation template
-func (t *Template) GetAllAWSIoTTopicRuleResources() map[string]AWSIoTTopicRule {
-	results := map[string]AWSIoTTopicRule{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSIoTTopicRule:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IoT::TopicRule" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIoTTopicRule
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSIoTTopicRuleWithName retrieves all AWSIoTTopicRule items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSIoTTopicRuleWithName(name string) (AWSIoTTopicRule, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSIoTTopicRule:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::IoT::TopicRule" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSIoTTopicRule
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSIoTTopicRule{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_action.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_action.go
deleted file mode 100644
index ce19bb73db..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_action.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_Action AWS CloudFormation Resource (AWS::IoT::TopicRule.Action)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html
-type AWSIoTTopicRule_Action struct {
-
-	// CloudwatchAlarm AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-cloudwatchalarm
-	CloudwatchAlarm *AWSIoTTopicRule_CloudwatchAlarmAction `json:"CloudwatchAlarm,omitempty"`
-
-	// CloudwatchMetric AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-cloudwatchmetric
-	CloudwatchMetric *AWSIoTTopicRule_CloudwatchMetricAction `json:"CloudwatchMetric,omitempty"`
-
-	// DynamoDB AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-dynamodb
-	DynamoDB *AWSIoTTopicRule_DynamoDBAction `json:"DynamoDB,omitempty"`
-
-	// DynamoDBv2 AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-dynamodbv2
-	DynamoDBv2 *AWSIoTTopicRule_DynamoDBv2Action `json:"DynamoDBv2,omitempty"`
-
-	// Elasticsearch AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-elasticsearch
-	Elasticsearch *AWSIoTTopicRule_ElasticsearchAction `json:"Elasticsearch,omitempty"`
-
-	// Firehose AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-firehose
-	Firehose *AWSIoTTopicRule_FirehoseAction `json:"Firehose,omitempty"`
-
-	// Kinesis AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-kinesis
-	Kinesis *AWSIoTTopicRule_KinesisAction `json:"Kinesis,omitempty"`
-
-	// Lambda AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-lambda
-	Lambda *AWSIoTTopicRule_LambdaAction `json:"Lambda,omitempty"`
-
-	// Republish AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-republish
-	Republish *AWSIoTTopicRule_RepublishAction `json:"Republish,omitempty"`
-
-	// S3 AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-s3
-	S3 *AWSIoTTopicRule_S3Action `json:"S3,omitempty"`
-
-	// Sns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-sns
-	Sns *AWSIoTTopicRule_SnsAction `json:"Sns,omitempty"`
-
-	// Sqs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-sqs
-	Sqs *AWSIoTTopicRule_SqsAction `json:"Sqs,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_Action) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.Action"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_cloudwatchalarmaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_cloudwatchalarmaction.go
deleted file mode 100644
index 9c8d6c1fb1..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_cloudwatchalarmaction.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_CloudwatchAlarmAction AWS CloudFormation Resource (AWS::IoT::TopicRule.CloudwatchAlarmAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchalarmaction.html
-type AWSIoTTopicRule_CloudwatchAlarmAction struct {
-
-	// AlarmName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchalarmaction.html#cfn-iot-topicrule-cloudwatchalarmaction-alarmname
-	AlarmName string `json:"AlarmName,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchalarmaction.html#cfn-iot-topicrule-cloudwatchalarmaction-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// StateReason AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchalarmaction.html#cfn-iot-topicrule-cloudwatchalarmaction-statereason
-	StateReason string `json:"StateReason,omitempty"`
-
-	// StateValue AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchalarmaction.html#cfn-iot-topicrule-cloudwatchalarmaction-statevalue
-	StateValue string `json:"StateValue,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_CloudwatchAlarmAction) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.CloudwatchAlarmAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_cloudwatchmetricaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_cloudwatchmetricaction.go
deleted file mode 100644
index a35dacdf5e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_cloudwatchmetricaction.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_CloudwatchMetricAction AWS CloudFormation Resource (AWS::IoT::TopicRule.CloudwatchMetricAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html
-type AWSIoTTopicRule_CloudwatchMetricAction struct {
-
-	// MetricName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html#cfn-iot-topicrule-cloudwatchmetricaction-metricname
-	MetricName string `json:"MetricName,omitempty"`
-
-	// MetricNamespace AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html#cfn-iot-topicrule-cloudwatchmetricaction-metricnamespace
-	MetricNamespace string `json:"MetricNamespace,omitempty"`
-
-	// MetricTimestamp AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html#cfn-iot-topicrule-cloudwatchmetricaction-metrictimestamp
-	MetricTimestamp string `json:"MetricTimestamp,omitempty"`
-
-	// MetricUnit AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html#cfn-iot-topicrule-cloudwatchmetricaction-metricunit
-	MetricUnit string `json:"MetricUnit,omitempty"`
-
-	// MetricValue AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html#cfn-iot-topicrule-cloudwatchmetricaction-metricvalue
-	MetricValue string `json:"MetricValue,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html#cfn-iot-topicrule-cloudwatchmetricaction-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_CloudwatchMetricAction) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.CloudwatchMetricAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_dynamodbaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_dynamodbaction.go
deleted file mode 100644
index abb6664035..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_dynamodbaction.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_DynamoDBAction AWS CloudFormation Resource (AWS::IoT::TopicRule.DynamoDBAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html
-type AWSIoTTopicRule_DynamoDBAction struct {
-
-	// HashKeyField AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-hashkeyfield
-	HashKeyField string `json:"HashKeyField,omitempty"`
-
-	// HashKeyType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-hashkeytype
-	HashKeyType string `json:"HashKeyType,omitempty"`
-
-	// HashKeyValue AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-hashkeyvalue
-	HashKeyValue string `json:"HashKeyValue,omitempty"`
-
-	// PayloadField AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-payloadfield
-	PayloadField string `json:"PayloadField,omitempty"`
-
-	// RangeKeyField AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-rangekeyfield
-	RangeKeyField string `json:"RangeKeyField,omitempty"`
-
-	// RangeKeyType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-rangekeytype
-	RangeKeyType string `json:"RangeKeyType,omitempty"`
-
-	// RangeKeyValue AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-rangekeyvalue
-	RangeKeyValue string `json:"RangeKeyValue,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// TableName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-tablename
-	TableName string `json:"TableName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_DynamoDBAction) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.DynamoDBAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_dynamodbv2action.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_dynamodbv2action.go
deleted file mode 100644
index fc4ae52183..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_dynamodbv2action.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_DynamoDBv2Action AWS CloudFormation Resource (AWS::IoT::TopicRule.DynamoDBv2Action)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbv2action.html
-type AWSIoTTopicRule_DynamoDBv2Action struct {
-
-	// PutItem AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbv2action.html#cfn-iot-topicrule-dynamodbv2action-putitem
-	PutItem *AWSIoTTopicRule_PutItemInput `json:"PutItem,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbv2action.html#cfn-iot-topicrule-dynamodbv2action-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_DynamoDBv2Action) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.DynamoDBv2Action"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_elasticsearchaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_elasticsearchaction.go
deleted file mode 100644
index 4e632879a6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_elasticsearchaction.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_ElasticsearchAction AWS CloudFormation Resource (AWS::IoT::TopicRule.ElasticsearchAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-elasticsearchaction.html
-type AWSIoTTopicRule_ElasticsearchAction struct {
-
-	// Endpoint AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-elasticsearchaction.html#cfn-iot-topicrule-elasticsearchaction-endpoint
-	Endpoint string `json:"Endpoint,omitempty"`
-
-	// Id AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-elasticsearchaction.html#cfn-iot-topicrule-elasticsearchaction-id
-	Id string `json:"Id,omitempty"`
-
-	// Index AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-elasticsearchaction.html#cfn-iot-topicrule-elasticsearchaction-index
-	Index string `json:"Index,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-elasticsearchaction.html#cfn-iot-topicrule-elasticsearchaction-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-elasticsearchaction.html#cfn-iot-topicrule-elasticsearchaction-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_ElasticsearchAction) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.ElasticsearchAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_firehoseaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_firehoseaction.go
deleted file mode 100644
index fa07f5aa48..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_firehoseaction.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_FirehoseAction AWS CloudFormation Resource (AWS::IoT::TopicRule.FirehoseAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-firehoseaction.html
-type AWSIoTTopicRule_FirehoseAction struct {
-
-	// DeliveryStreamName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-firehoseaction.html#cfn-iot-topicrule-firehoseaction-deliverystreamname
-	DeliveryStreamName string `json:"DeliveryStreamName,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-firehoseaction.html#cfn-iot-topicrule-firehoseaction-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// Separator AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-firehoseaction.html#cfn-iot-topicrule-firehoseaction-separator
-	Separator string `json:"Separator,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_FirehoseAction) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.FirehoseAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_kinesisaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_kinesisaction.go
deleted file mode 100644
index ec3e7ddbf5..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_kinesisaction.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_KinesisAction AWS CloudFormation Resource (AWS::IoT::TopicRule.KinesisAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kinesisaction.html
-type AWSIoTTopicRule_KinesisAction struct {
-
-	// PartitionKey AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kinesisaction.html#cfn-iot-topicrule-kinesisaction-partitionkey
-	PartitionKey string `json:"PartitionKey,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kinesisaction.html#cfn-iot-topicrule-kinesisaction-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// StreamName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kinesisaction.html#cfn-iot-topicrule-kinesisaction-streamname
-	StreamName string `json:"StreamName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_KinesisAction) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.KinesisAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_lambdaaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_lambdaaction.go
deleted file mode 100644
index f2249ccc8f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_lambdaaction.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_LambdaAction AWS CloudFormation Resource (AWS::IoT::TopicRule.LambdaAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-lambdaaction.html
-type AWSIoTTopicRule_LambdaAction struct {
-
-	// FunctionArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-lambdaaction.html#cfn-iot-topicrule-lambdaaction-functionarn
-	FunctionArn string `json:"FunctionArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_LambdaAction) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.LambdaAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_putiteminput.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_putiteminput.go
deleted file mode 100644
index c3ab888974..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_putiteminput.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_PutItemInput AWS CloudFormation Resource (AWS::IoT::TopicRule.PutItemInput)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-putiteminput.html
-type AWSIoTTopicRule_PutItemInput struct {
-
-	// TableName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-putiteminput.html#cfn-iot-topicrule-putiteminput-tablename
-	TableName string `json:"TableName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_PutItemInput) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.PutItemInput"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_republishaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_republishaction.go
deleted file mode 100644
index 712286464a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_republishaction.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_RepublishAction AWS CloudFormation Resource (AWS::IoT::TopicRule.RepublishAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-republishaction.html
-type AWSIoTTopicRule_RepublishAction struct {
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-republishaction.html#cfn-iot-topicrule-republishaction-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// Topic AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-republishaction.html#cfn-iot-topicrule-republishaction-topic
-	Topic string `json:"Topic,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_RepublishAction) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.RepublishAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_s3action.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_s3action.go
deleted file mode 100644
index 2705131904..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_s3action.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_S3Action AWS CloudFormation Resource (AWS::IoT::TopicRule.S3Action)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-s3action.html
-type AWSIoTTopicRule_S3Action struct {
-
-	// BucketName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-s3action.html#cfn-iot-topicrule-s3action-bucketname
-	BucketName string `json:"BucketName,omitempty"`
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-s3action.html#cfn-iot-topicrule-s3action-key
-	Key string `json:"Key,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-s3action.html#cfn-iot-topicrule-s3action-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_S3Action) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.S3Action"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_snsaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_snsaction.go
deleted file mode 100644
index 1b08360e81..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_snsaction.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_SnsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.SnsAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-snsaction.html
-type AWSIoTTopicRule_SnsAction struct {
-
-	// MessageFormat AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-snsaction.html#cfn-iot-topicrule-snsaction-messageformat
-	MessageFormat string `json:"MessageFormat,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-snsaction.html#cfn-iot-topicrule-snsaction-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// TargetArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-snsaction.html#cfn-iot-topicrule-snsaction-targetarn
-	TargetArn string `json:"TargetArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_SnsAction) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.SnsAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_sqsaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_sqsaction.go
deleted file mode 100644
index a126f591e0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_sqsaction.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_SqsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.SqsAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sqsaction.html
-type AWSIoTTopicRule_SqsAction struct {
-
-	// QueueUrl AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sqsaction.html#cfn-iot-topicrule-sqsaction-queueurl
-	QueueUrl string `json:"QueueUrl,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sqsaction.html#cfn-iot-topicrule-sqsaction-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// UseBase64 AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sqsaction.html#cfn-iot-topicrule-sqsaction-usebase64
-	UseBase64 bool `json:"UseBase64,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_SqsAction) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.SqsAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_topicrulepayload.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_topicrulepayload.go
deleted file mode 100644
index bdde84a383..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-iot-topicrule_topicrulepayload.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSIoTTopicRule_TopicRulePayload AWS CloudFormation Resource (AWS::IoT::TopicRule.TopicRulePayload)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html
-type AWSIoTTopicRule_TopicRulePayload struct {
-
-	// Actions AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html#cfn-iot-topicrule-topicrulepayload-actions
-	Actions []AWSIoTTopicRule_Action `json:"Actions,omitempty"`
-
-	// AwsIotSqlVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html#cfn-iot-topicrule-topicrulepayload-awsiotsqlversion
-	AwsIotSqlVersion string `json:"AwsIotSqlVersion,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html#cfn-iot-topicrule-topicrulepayload-description
-	Description string `json:"Description,omitempty"`
-
-	// RuleDisabled AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html#cfn-iot-topicrule-topicrulepayload-ruledisabled
-	RuleDisabled bool `json:"RuleDisabled,omitempty"`
-
-	// Sql AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html#cfn-iot-topicrule-topicrulepayload-sql
-	Sql string `json:"Sql,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSIoTTopicRule_TopicRulePayload) AWSCloudFormationType() string {
-	return "AWS::IoT::TopicRule.TopicRulePayload"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesis-stream.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesis-stream.go
deleted file mode 100644
index ce4a0c9089..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesis-stream.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSKinesisStream AWS CloudFormation Resource (AWS::Kinesis::Stream)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-stream.html
-type AWSKinesisStream struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-stream.html#cfn-kinesis-stream-name
-	Name string `json:"Name,omitempty"`
-
-	// RetentionPeriodHours AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-stream.html#cfn-kinesis-stream-retentionperiodhours
-	RetentionPeriodHours int `json:"RetentionPeriodHours,omitempty"`
-
-	// ShardCount AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-stream.html#cfn-kinesis-stream-shardcount
-	ShardCount int `json:"ShardCount,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-stream.html#cfn-kinesis-stream-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisStream) AWSCloudFormationType() string {
-	return "AWS::Kinesis::Stream"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSKinesisStream) MarshalJSON() ([]byte, error) {
-	type Properties AWSKinesisStream
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSKinesisStream) UnmarshalJSON(b []byte) error {
-	type Properties AWSKinesisStream
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSKinesisStream(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSKinesisStreamResources retrieves all AWSKinesisStream items from an AWS CloudFormation template
-func (t *Template) GetAllAWSKinesisStreamResources() map[string]AWSKinesisStream {
-	results := map[string]AWSKinesisStream{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSKinesisStream:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Kinesis::Stream" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKinesisStream
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSKinesisStreamWithName retrieves all AWSKinesisStream items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSKinesisStreamWithName(name string) (AWSKinesisStream, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSKinesisStream:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Kinesis::Stream" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKinesisStream
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSKinesisStream{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application.go
deleted file mode 100644
index 672f7d5258..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSKinesisAnalyticsApplication AWS CloudFormation Resource (AWS::KinesisAnalytics::Application)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-application.html
-type AWSKinesisAnalyticsApplication struct {
-
-	// ApplicationCode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-application.html#cfn-kinesisanalytics-application-applicationcode
-	ApplicationCode string `json:"ApplicationCode,omitempty"`
-
-	// ApplicationDescription AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-application.html#cfn-kinesisanalytics-application-applicationdescription
-	ApplicationDescription string `json:"ApplicationDescription,omitempty"`
-
-	// ApplicationName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-application.html#cfn-kinesisanalytics-application-applicationname
-	ApplicationName string `json:"ApplicationName,omitempty"`
-
-	// Inputs AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-application.html#cfn-kinesisanalytics-application-inputs
-	Inputs []AWSKinesisAnalyticsApplication_Input `json:"Inputs,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplication) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::Application"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSKinesisAnalyticsApplication) MarshalJSON() ([]byte, error) {
-	type Properties AWSKinesisAnalyticsApplication
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSKinesisAnalyticsApplication) UnmarshalJSON(b []byte) error {
-	type Properties AWSKinesisAnalyticsApplication
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSKinesisAnalyticsApplication(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSKinesisAnalyticsApplicationResources retrieves all AWSKinesisAnalyticsApplication items from an AWS CloudFormation template
-func (t *Template) GetAllAWSKinesisAnalyticsApplicationResources() map[string]AWSKinesisAnalyticsApplication {
-	results := map[string]AWSKinesisAnalyticsApplication{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSKinesisAnalyticsApplication:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::KinesisAnalytics::Application" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKinesisAnalyticsApplication
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSKinesisAnalyticsApplicationWithName retrieves all AWSKinesisAnalyticsApplication items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSKinesisAnalyticsApplicationWithName(name string) (AWSKinesisAnalyticsApplication, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSKinesisAnalyticsApplication:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::KinesisAnalytics::Application" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKinesisAnalyticsApplication
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSKinesisAnalyticsApplication{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_csvmappingparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_csvmappingparameters.go
deleted file mode 100644
index 1831d2d98d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_csvmappingparameters.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplication_CSVMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.CSVMappingParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-csvmappingparameters.html
-type AWSKinesisAnalyticsApplication_CSVMappingParameters struct {
-
-	// RecordColumnDelimiter AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-csvmappingparameters.html#cfn-kinesisanalytics-application-csvmappingparameters-recordcolumndelimiter
-	RecordColumnDelimiter string `json:"RecordColumnDelimiter,omitempty"`
-
-	// RecordRowDelimiter AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-csvmappingparameters.html#cfn-kinesisanalytics-application-csvmappingparameters-recordrowdelimiter
-	RecordRowDelimiter string `json:"RecordRowDelimiter,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplication_CSVMappingParameters) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::Application.CSVMappingParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_input.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_input.go
deleted file mode 100644
index c10c081562..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_input.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplication_Input AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.Input)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html
-type AWSKinesisAnalyticsApplication_Input struct {
-
-	// InputParallelism AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html#cfn-kinesisanalytics-application-input-inputparallelism
-	InputParallelism *AWSKinesisAnalyticsApplication_InputParallelism `json:"InputParallelism,omitempty"`
-
-	// InputSchema AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html#cfn-kinesisanalytics-application-input-inputschema
-	InputSchema *AWSKinesisAnalyticsApplication_InputSchema `json:"InputSchema,omitempty"`
-
-	// KinesisFirehoseInput AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html#cfn-kinesisanalytics-application-input-kinesisfirehoseinput
-	KinesisFirehoseInput *AWSKinesisAnalyticsApplication_KinesisFirehoseInput `json:"KinesisFirehoseInput,omitempty"`
-
-	// KinesisStreamsInput AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html#cfn-kinesisanalytics-application-input-kinesisstreamsinput
-	KinesisStreamsInput *AWSKinesisAnalyticsApplication_KinesisStreamsInput `json:"KinesisStreamsInput,omitempty"`
-
-	// NamePrefix AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html#cfn-kinesisanalytics-application-input-nameprefix
-	NamePrefix string `json:"NamePrefix,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplication_Input) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::Application.Input"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_inputparallelism.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_inputparallelism.go
deleted file mode 100644
index 3c6c8bc843..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_inputparallelism.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplication_InputParallelism AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.InputParallelism)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputparallelism.html
-type AWSKinesisAnalyticsApplication_InputParallelism struct {
-
-	// Count AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputparallelism.html#cfn-kinesisanalytics-application-inputparallelism-count
-	Count int `json:"Count,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplication_InputParallelism) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::Application.InputParallelism"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_inputschema.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_inputschema.go
deleted file mode 100644
index a6a7a5b69e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_inputschema.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplication_InputSchema AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.InputSchema)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputschema.html
-type AWSKinesisAnalyticsApplication_InputSchema struct {
-
-	// RecordColumns AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputschema.html#cfn-kinesisanalytics-application-inputschema-recordcolumns
-	RecordColumns []AWSKinesisAnalyticsApplication_RecordColumn `json:"RecordColumns,omitempty"`
-
-	// RecordEncoding AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputschema.html#cfn-kinesisanalytics-application-inputschema-recordencoding
-	RecordEncoding string `json:"RecordEncoding,omitempty"`
-
-	// RecordFormat AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputschema.html#cfn-kinesisanalytics-application-inputschema-recordformat
-	RecordFormat *AWSKinesisAnalyticsApplication_RecordFormat `json:"RecordFormat,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplication_InputSchema) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::Application.InputSchema"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_jsonmappingparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_jsonmappingparameters.go
deleted file mode 100644
index ad910e1b06..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_jsonmappingparameters.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplication_JSONMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.JSONMappingParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-jsonmappingparameters.html
-type AWSKinesisAnalyticsApplication_JSONMappingParameters struct {
-
-	// RecordRowPath AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-jsonmappingparameters.html#cfn-kinesisanalytics-application-jsonmappingparameters-recordrowpath
-	RecordRowPath string `json:"RecordRowPath,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplication_JSONMappingParameters) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::Application.JSONMappingParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_kinesisfirehoseinput.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_kinesisfirehoseinput.go
deleted file mode 100644
index 3c92a94487..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_kinesisfirehoseinput.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplication_KinesisFirehoseInput AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.KinesisFirehoseInput)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-kinesisfirehoseinput.html
-type AWSKinesisAnalyticsApplication_KinesisFirehoseInput struct {
-
-	// ResourceARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-kinesisfirehoseinput.html#cfn-kinesisanalytics-application-kinesisfirehoseinput-resourcearn
-	ResourceARN string `json:"ResourceARN,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-kinesisfirehoseinput.html#cfn-kinesisanalytics-application-kinesisfirehoseinput-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplication_KinesisFirehoseInput) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::Application.KinesisFirehoseInput"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_kinesisstreamsinput.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_kinesisstreamsinput.go
deleted file mode 100644
index c945567f70..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_kinesisstreamsinput.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplication_KinesisStreamsInput AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.KinesisStreamsInput)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-kinesisstreamsinput.html
-type AWSKinesisAnalyticsApplication_KinesisStreamsInput struct {
-
-	// ResourceARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-kinesisstreamsinput.html#cfn-kinesisanalytics-application-kinesisstreamsinput-resourcearn
-	ResourceARN string `json:"ResourceARN,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-kinesisstreamsinput.html#cfn-kinesisanalytics-application-kinesisstreamsinput-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplication_KinesisStreamsInput) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::Application.KinesisStreamsInput"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_mappingparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_mappingparameters.go
deleted file mode 100644
index a46e769390..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_mappingparameters.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplication_MappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.MappingParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-mappingparameters.html
-type AWSKinesisAnalyticsApplication_MappingParameters struct {
-
-	// CSVMappingParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-mappingparameters.html#cfn-kinesisanalytics-application-mappingparameters-csvmappingparameters
-	CSVMappingParameters *AWSKinesisAnalyticsApplication_CSVMappingParameters `json:"CSVMappingParameters,omitempty"`
-
-	// JSONMappingParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-mappingparameters.html#cfn-kinesisanalytics-application-mappingparameters-jsonmappingparameters
-	JSONMappingParameters *AWSKinesisAnalyticsApplication_JSONMappingParameters `json:"JSONMappingParameters,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplication_MappingParameters) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::Application.MappingParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_recordcolumn.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_recordcolumn.go
deleted file mode 100644
index 9ce056dac2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_recordcolumn.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplication_RecordColumn AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.RecordColumn)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordcolumn.html
-type AWSKinesisAnalyticsApplication_RecordColumn struct {
-
-	// Mapping AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordcolumn.html#cfn-kinesisanalytics-application-recordcolumn-mapping
-	Mapping string `json:"Mapping,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordcolumn.html#cfn-kinesisanalytics-application-recordcolumn-name
-	Name string `json:"Name,omitempty"`
-
-	// SqlType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordcolumn.html#cfn-kinesisanalytics-application-recordcolumn-sqltype
-	SqlType string `json:"SqlType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplication_RecordColumn) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::Application.RecordColumn"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_recordformat.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_recordformat.go
deleted file mode 100644
index 80f1a9d808..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-application_recordformat.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplication_RecordFormat AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.RecordFormat)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordformat.html
-type AWSKinesisAnalyticsApplication_RecordFormat struct {
-
-	// MappingParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordformat.html#cfn-kinesisanalytics-application-recordformat-mappingparameters
-	MappingParameters *AWSKinesisAnalyticsApplication_MappingParameters `json:"MappingParameters,omitempty"`
-
-	// RecordFormatType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordformat.html#cfn-kinesisanalytics-application-recordformat-recordformattype
-	RecordFormatType string `json:"RecordFormatType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplication_RecordFormat) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::Application.RecordFormat"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput.go
deleted file mode 100644
index 24047cfb76..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSKinesisAnalyticsApplicationOutput AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-applicationoutput.html
-type AWSKinesisAnalyticsApplicationOutput struct {
-
-	// ApplicationName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-applicationoutput.html#cfn-kinesisanalytics-applicationoutput-applicationname
-	ApplicationName string `json:"ApplicationName,omitempty"`
-
-	// Output AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-applicationoutput.html#cfn-kinesisanalytics-applicationoutput-output
-	Output *AWSKinesisAnalyticsApplicationOutput_Output `json:"Output,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationOutput) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationOutput"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSKinesisAnalyticsApplicationOutput) MarshalJSON() ([]byte, error) {
-	type Properties AWSKinesisAnalyticsApplicationOutput
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSKinesisAnalyticsApplicationOutput) UnmarshalJSON(b []byte) error {
-	type Properties AWSKinesisAnalyticsApplicationOutput
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSKinesisAnalyticsApplicationOutput(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSKinesisAnalyticsApplicationOutputResources retrieves all AWSKinesisAnalyticsApplicationOutput items from an AWS CloudFormation template
-func (t *Template) GetAllAWSKinesisAnalyticsApplicationOutputResources() map[string]AWSKinesisAnalyticsApplicationOutput {
-	results := map[string]AWSKinesisAnalyticsApplicationOutput{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSKinesisAnalyticsApplicationOutput:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::KinesisAnalytics::ApplicationOutput" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKinesisAnalyticsApplicationOutput
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSKinesisAnalyticsApplicationOutputWithName retrieves all AWSKinesisAnalyticsApplicationOutput items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSKinesisAnalyticsApplicationOutputWithName(name string) (AWSKinesisAnalyticsApplicationOutput, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSKinesisAnalyticsApplicationOutput:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::KinesisAnalytics::ApplicationOutput" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKinesisAnalyticsApplicationOutput
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSKinesisAnalyticsApplicationOutput{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput_destinationschema.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput_destinationschema.go
deleted file mode 100644
index d48085d269..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput_destinationschema.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplicationOutput_DestinationSchema AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-destinationschema.html
-type AWSKinesisAnalyticsApplicationOutput_DestinationSchema struct {
-
-	// RecordFormatType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-destinationschema.html#cfn-kinesisanalytics-applicationoutput-destinationschema-recordformattype
-	RecordFormatType string `json:"RecordFormatType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationOutput_DestinationSchema) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go
deleted file mode 100644
index 7e239c6f56..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplicationOutput_KinesisFirehoseOutput AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-kinesisfirehoseoutput.html
-type AWSKinesisAnalyticsApplicationOutput_KinesisFirehoseOutput struct {
-
-	// ResourceARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-kinesisfirehoseoutput.html#cfn-kinesisanalytics-applicationoutput-kinesisfirehoseoutput-resourcearn
-	ResourceARN string `json:"ResourceARN,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-kinesisfirehoseoutput.html#cfn-kinesisanalytics-applicationoutput-kinesisfirehoseoutput-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationOutput_KinesisFirehoseOutput) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go
deleted file mode 100644
index bdce055590..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplicationOutput_KinesisStreamsOutput AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-kinesisstreamsoutput.html
-type AWSKinesisAnalyticsApplicationOutput_KinesisStreamsOutput struct {
-
-	// ResourceARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-kinesisstreamsoutput.html#cfn-kinesisanalytics-applicationoutput-kinesisstreamsoutput-resourcearn
-	ResourceARN string `json:"ResourceARN,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-kinesisstreamsoutput.html#cfn-kinesisanalytics-applicationoutput-kinesisstreamsoutput-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationOutput_KinesisStreamsOutput) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput_output.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput_output.go
deleted file mode 100644
index 35611dca20..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationoutput_output.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplicationOutput_Output AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.Output)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-output.html
-type AWSKinesisAnalyticsApplicationOutput_Output struct {
-
-	// DestinationSchema AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-output.html#cfn-kinesisanalytics-applicationoutput-output-destinationschema
-	DestinationSchema *AWSKinesisAnalyticsApplicationOutput_DestinationSchema `json:"DestinationSchema,omitempty"`
-
-	// KinesisFirehoseOutput AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-output.html#cfn-kinesisanalytics-applicationoutput-output-kinesisfirehoseoutput
-	KinesisFirehoseOutput *AWSKinesisAnalyticsApplicationOutput_KinesisFirehoseOutput `json:"KinesisFirehoseOutput,omitempty"`
-
-	// KinesisStreamsOutput AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-output.html#cfn-kinesisanalytics-applicationoutput-output-kinesisstreamsoutput
-	KinesisStreamsOutput *AWSKinesisAnalyticsApplicationOutput_KinesisStreamsOutput `json:"KinesisStreamsOutput,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-output.html#cfn-kinesisanalytics-applicationoutput-output-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationOutput_Output) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationOutput.Output"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource.go
deleted file mode 100644
index 3b1901bd85..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSKinesisAnalyticsApplicationReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-applicationreferencedatasource.html
-type AWSKinesisAnalyticsApplicationReferenceDataSource struct {
-
-	// ApplicationName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-applicationreferencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-applicationname
-	ApplicationName string `json:"ApplicationName,omitempty"`
-
-	// ReferenceDataSource AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-applicationreferencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-referencedatasource
-	ReferenceDataSource *AWSKinesisAnalyticsApplicationReferenceDataSource_ReferenceDataSource `json:"ReferenceDataSource,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationReferenceDataSource) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSKinesisAnalyticsApplicationReferenceDataSource) MarshalJSON() ([]byte, error) {
-	type Properties AWSKinesisAnalyticsApplicationReferenceDataSource
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSKinesisAnalyticsApplicationReferenceDataSource) UnmarshalJSON(b []byte) error {
-	type Properties AWSKinesisAnalyticsApplicationReferenceDataSource
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSKinesisAnalyticsApplicationReferenceDataSource(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSKinesisAnalyticsApplicationReferenceDataSourceResources retrieves all AWSKinesisAnalyticsApplicationReferenceDataSource items from an AWS CloudFormation template
-func (t *Template) GetAllAWSKinesisAnalyticsApplicationReferenceDataSourceResources() map[string]AWSKinesisAnalyticsApplicationReferenceDataSource {
-	results := map[string]AWSKinesisAnalyticsApplicationReferenceDataSource{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSKinesisAnalyticsApplicationReferenceDataSource:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::KinesisAnalytics::ApplicationReferenceDataSource" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKinesisAnalyticsApplicationReferenceDataSource
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSKinesisAnalyticsApplicationReferenceDataSourceWithName retrieves all AWSKinesisAnalyticsApplicationReferenceDataSource items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSKinesisAnalyticsApplicationReferenceDataSourceWithName(name string) (AWSKinesisAnalyticsApplicationReferenceDataSource, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSKinesisAnalyticsApplicationReferenceDataSource:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::KinesisAnalytics::ApplicationReferenceDataSource" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKinesisAnalyticsApplicationReferenceDataSource
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSKinesisAnalyticsApplicationReferenceDataSource{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go
deleted file mode 100644
index 54e9c5e407..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplicationReferenceDataSource_CSVMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-csvmappingparameters.html
-type AWSKinesisAnalyticsApplicationReferenceDataSource_CSVMappingParameters struct {
-
-	// RecordColumnDelimiter AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-csvmappingparameters.html#cfn-kinesisanalytics-applicationreferencedatasource-csvmappingparameters-recordcolumndelimiter
-	RecordColumnDelimiter string `json:"RecordColumnDelimiter,omitempty"`
-
-	// RecordRowDelimiter AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-csvmappingparameters.html#cfn-kinesisanalytics-applicationreferencedatasource-csvmappingparameters-recordrowdelimiter
-	RecordRowDelimiter string `json:"RecordRowDelimiter,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationReferenceDataSource_CSVMappingParameters) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go
deleted file mode 100644
index b102de4db9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplicationReferenceDataSource_JSONMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-jsonmappingparameters.html
-type AWSKinesisAnalyticsApplicationReferenceDataSource_JSONMappingParameters struct {
-
-	// RecordRowPath AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-jsonmappingparameters.html#cfn-kinesisanalytics-applicationreferencedatasource-jsonmappingparameters-recordrowpath
-	RecordRowPath string `json:"RecordRowPath,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationReferenceDataSource_JSONMappingParameters) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go
deleted file mode 100644
index 25e5d9471b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplicationReferenceDataSource_MappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-mappingparameters.html
-type AWSKinesisAnalyticsApplicationReferenceDataSource_MappingParameters struct {
-
-	// CSVMappingParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-mappingparameters.html#cfn-kinesisanalytics-applicationreferencedatasource-mappingparameters-csvmappingparameters
-	CSVMappingParameters *AWSKinesisAnalyticsApplicationReferenceDataSource_CSVMappingParameters `json:"CSVMappingParameters,omitempty"`
-
-	// JSONMappingParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-mappingparameters.html#cfn-kinesisanalytics-applicationreferencedatasource-mappingparameters-jsonmappingparameters
-	JSONMappingParameters *AWSKinesisAnalyticsApplicationReferenceDataSource_JSONMappingParameters `json:"JSONMappingParameters,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationReferenceDataSource_MappingParameters) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go
deleted file mode 100644
index 179cc78e8f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplicationReferenceDataSource_RecordColumn AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordcolumn.html
-type AWSKinesisAnalyticsApplicationReferenceDataSource_RecordColumn struct {
-
-	// Mapping AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordcolumn.html#cfn-kinesisanalytics-applicationreferencedatasource-recordcolumn-mapping
-	Mapping string `json:"Mapping,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordcolumn.html#cfn-kinesisanalytics-applicationreferencedatasource-recordcolumn-name
-	Name string `json:"Name,omitempty"`
-
-	// SqlType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordcolumn.html#cfn-kinesisanalytics-applicationreferencedatasource-recordcolumn-sqltype
-	SqlType string `json:"SqlType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationReferenceDataSource_RecordColumn) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go
deleted file mode 100644
index eb949d8055..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplicationReferenceDataSource_RecordFormat AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordformat.html
-type AWSKinesisAnalyticsApplicationReferenceDataSource_RecordFormat struct {
-
-	// MappingParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordformat.html#cfn-kinesisanalytics-applicationreferencedatasource-recordformat-mappingparameters
-	MappingParameters *AWSKinesisAnalyticsApplicationReferenceDataSource_MappingParameters `json:"MappingParameters,omitempty"`
-
-	// RecordFormatType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordformat.html#cfn-kinesisanalytics-applicationreferencedatasource-recordformat-recordformattype
-	RecordFormatType string `json:"RecordFormatType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationReferenceDataSource_RecordFormat) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go
deleted file mode 100644
index b05cf5f198..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplicationReferenceDataSource_ReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referencedatasource.html
-type AWSKinesisAnalyticsApplicationReferenceDataSource_ReferenceDataSource struct {
-
-	// ReferenceSchema AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-referencedatasource-referenceschema
-	ReferenceSchema *AWSKinesisAnalyticsApplicationReferenceDataSource_ReferenceSchema `json:"ReferenceSchema,omitempty"`
-
-	// S3ReferenceDataSource AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-referencedatasource-s3referencedatasource
-	S3ReferenceDataSource *AWSKinesisAnalyticsApplicationReferenceDataSource_S3ReferenceDataSource `json:"S3ReferenceDataSource,omitempty"`
-
-	// TableName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-referencedatasource-tablename
-	TableName string `json:"TableName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationReferenceDataSource_ReferenceDataSource) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go
deleted file mode 100644
index e1e34d4c14..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplicationReferenceDataSource_ReferenceSchema AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referenceschema.html
-type AWSKinesisAnalyticsApplicationReferenceDataSource_ReferenceSchema struct {
-
-	// RecordColumns AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referenceschema.html#cfn-kinesisanalytics-applicationreferencedatasource-referenceschema-recordcolumns
-	RecordColumns []AWSKinesisAnalyticsApplicationReferenceDataSource_RecordColumn `json:"RecordColumns,omitempty"`
-
-	// RecordEncoding AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referenceschema.html#cfn-kinesisanalytics-applicationreferencedatasource-referenceschema-recordencoding
-	RecordEncoding string `json:"RecordEncoding,omitempty"`
-
-	// RecordFormat AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referenceschema.html#cfn-kinesisanalytics-applicationreferencedatasource-referenceschema-recordformat
-	RecordFormat *AWSKinesisAnalyticsApplicationReferenceDataSource_RecordFormat `json:"RecordFormat,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationReferenceDataSource_ReferenceSchema) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go
deleted file mode 100644
index 5f70ccc2ae..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSKinesisAnalyticsApplicationReferenceDataSource_S3ReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-s3referencedatasource.html
-type AWSKinesisAnalyticsApplicationReferenceDataSource_S3ReferenceDataSource struct {
-
-	// BucketARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-s3referencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-s3referencedatasource-bucketarn
-	BucketARN string `json:"BucketARN,omitempty"`
-
-	// FileKey AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-s3referencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-s3referencedatasource-filekey
-	FileKey string `json:"FileKey,omitempty"`
-
-	// ReferenceRoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-s3referencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-s3referencedatasource-referencerolearn
-	ReferenceRoleARN string `json:"ReferenceRoleARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisAnalyticsApplicationReferenceDataSource_S3ReferenceDataSource) AWSCloudFormationType() string {
-	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream.go
deleted file mode 100644
index 3d2ae1b70b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSKinesisFirehoseDeliveryStream AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html
-type AWSKinesisFirehoseDeliveryStream struct {
-
-	// DeliveryStreamName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-deliverystreamname
-	DeliveryStreamName string `json:"DeliveryStreamName,omitempty"`
-
-	// DeliveryStreamType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-deliverystreamtype
-	DeliveryStreamType string `json:"DeliveryStreamType,omitempty"`
-
-	// ElasticsearchDestinationConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration
-	ElasticsearchDestinationConfiguration *AWSKinesisFirehoseDeliveryStream_ElasticsearchDestinationConfiguration `json:"ElasticsearchDestinationConfiguration,omitempty"`
-
-	// ExtendedS3DestinationConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration
-	ExtendedS3DestinationConfiguration *AWSKinesisFirehoseDeliveryStream_ExtendedS3DestinationConfiguration `json:"ExtendedS3DestinationConfiguration,omitempty"`
-
-	// KinesisStreamSourceConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-kinesisstreamsourceconfiguration
-	KinesisStreamSourceConfiguration *AWSKinesisFirehoseDeliveryStream_KinesisStreamSourceConfiguration `json:"KinesisStreamSourceConfiguration,omitempty"`
-
-	// RedshiftDestinationConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration
-	RedshiftDestinationConfiguration *AWSKinesisFirehoseDeliveryStream_RedshiftDestinationConfiguration `json:"RedshiftDestinationConfiguration,omitempty"`
-
-	// S3DestinationConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration
-	S3DestinationConfiguration *AWSKinesisFirehoseDeliveryStream_S3DestinationConfiguration `json:"S3DestinationConfiguration,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSKinesisFirehoseDeliveryStream) MarshalJSON() ([]byte, error) {
-	type Properties AWSKinesisFirehoseDeliveryStream
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSKinesisFirehoseDeliveryStream) UnmarshalJSON(b []byte) error {
-	type Properties AWSKinesisFirehoseDeliveryStream
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSKinesisFirehoseDeliveryStream(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSKinesisFirehoseDeliveryStreamResources retrieves all AWSKinesisFirehoseDeliveryStream items from an AWS CloudFormation template
-func (t *Template) GetAllAWSKinesisFirehoseDeliveryStreamResources() map[string]AWSKinesisFirehoseDeliveryStream {
-	results := map[string]AWSKinesisFirehoseDeliveryStream{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSKinesisFirehoseDeliveryStream:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::KinesisFirehose::DeliveryStream" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKinesisFirehoseDeliveryStream
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSKinesisFirehoseDeliveryStreamWithName retrieves all AWSKinesisFirehoseDeliveryStream items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSKinesisFirehoseDeliveryStreamWithName(name string) (AWSKinesisFirehoseDeliveryStream, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSKinesisFirehoseDeliveryStream:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::KinesisFirehose::DeliveryStream" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKinesisFirehoseDeliveryStream
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSKinesisFirehoseDeliveryStream{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_bufferinghints.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_bufferinghints.go
deleted file mode 100644
index 383d5b1225..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_bufferinghints.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_BufferingHints AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.BufferingHints)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-bufferinghints.html
-type AWSKinesisFirehoseDeliveryStream_BufferingHints struct {
-
-	// IntervalInSeconds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-bufferinghints.html#cfn-kinesisfirehose-deliverystream-bufferinghints-intervalinseconds
-	IntervalInSeconds int `json:"IntervalInSeconds,omitempty"`
-
-	// SizeInMBs AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-bufferinghints.html#cfn-kinesisfirehose-deliverystream-bufferinghints-sizeinmbs
-	SizeInMBs int `json:"SizeInMBs,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_BufferingHints) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.BufferingHints"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go
deleted file mode 100644
index df879c624b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_CloudWatchLoggingOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-cloudwatchloggingoptions.html
-type AWSKinesisFirehoseDeliveryStream_CloudWatchLoggingOptions struct {
-
-	// Enabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-cloudwatchloggingoptions.html#cfn-kinesisfirehose-deliverystream-cloudwatchloggingoptions-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// LogGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-cloudwatchloggingoptions.html#cfn-kinesisfirehose-deliverystream-cloudwatchloggingoptions-loggroupname
-	LogGroupName string `json:"LogGroupName,omitempty"`
-
-	// LogStreamName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-cloudwatchloggingoptions.html#cfn-kinesisfirehose-deliverystream-cloudwatchloggingoptions-logstreamname
-	LogStreamName string `json:"LogStreamName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_CloudWatchLoggingOptions) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_copycommand.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_copycommand.go
deleted file mode 100644
index 87b06369d4..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_copycommand.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_CopyCommand AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.CopyCommand)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-copycommand.html
-type AWSKinesisFirehoseDeliveryStream_CopyCommand struct {
-
-	// CopyOptions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-copycommand.html#cfn-kinesisfirehose-deliverystream-copycommand-copyoptions
-	CopyOptions string `json:"CopyOptions,omitempty"`
-
-	// DataTableColumns AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-copycommand.html#cfn-kinesisfirehose-deliverystream-copycommand-datatablecolumns
-	DataTableColumns string `json:"DataTableColumns,omitempty"`
-
-	// DataTableName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-copycommand.html#cfn-kinesisfirehose-deliverystream-copycommand-datatablename
-	DataTableName string `json:"DataTableName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_CopyCommand) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.CopyCommand"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go
deleted file mode 100644
index 9587b382ed..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_ElasticsearchBufferingHints AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchbufferinghints.html
-type AWSKinesisFirehoseDeliveryStream_ElasticsearchBufferingHints struct {
-
-	// IntervalInSeconds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchbufferinghints.html#cfn-kinesisfirehose-deliverystream-elasticsearchbufferinghints-intervalinseconds
-	IntervalInSeconds int `json:"IntervalInSeconds,omitempty"`
-
-	// SizeInMBs AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchbufferinghints.html#cfn-kinesisfirehose-deliverystream-elasticsearchbufferinghints-sizeinmbs
-	SizeInMBs int `json:"SizeInMBs,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_ElasticsearchBufferingHints) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go
deleted file mode 100644
index eec3284282..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_ElasticsearchDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html
-type AWSKinesisFirehoseDeliveryStream_ElasticsearchDestinationConfiguration struct {
-
-	// BufferingHints AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-bufferinghints
-	BufferingHints *AWSKinesisFirehoseDeliveryStream_ElasticsearchBufferingHints `json:"BufferingHints,omitempty"`
-
-	// CloudWatchLoggingOptions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-cloudwatchloggingoptions
-	CloudWatchLoggingOptions *AWSKinesisFirehoseDeliveryStream_CloudWatchLoggingOptions `json:"CloudWatchLoggingOptions,omitempty"`
-
-	// DomainARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-domainarn
-	DomainARN string `json:"DomainARN,omitempty"`
-
-	// IndexName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-indexname
-	IndexName string `json:"IndexName,omitempty"`
-
-	// IndexRotationPeriod AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-indexrotationperiod
-	IndexRotationPeriod string `json:"IndexRotationPeriod,omitempty"`
-
-	// ProcessingConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-processingconfiguration
-	ProcessingConfiguration *AWSKinesisFirehoseDeliveryStream_ProcessingConfiguration `json:"ProcessingConfiguration,omitempty"`
-
-	// RetryOptions AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-retryoptions
-	RetryOptions *AWSKinesisFirehoseDeliveryStream_ElasticsearchRetryOptions `json:"RetryOptions,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-
-	// S3BackupMode AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-s3backupmode
-	S3BackupMode string `json:"S3BackupMode,omitempty"`
-
-	// S3Configuration AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-s3configuration
-	S3Configuration *AWSKinesisFirehoseDeliveryStream_S3DestinationConfiguration `json:"S3Configuration,omitempty"`
-
-	// TypeName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-typename
-	TypeName string `json:"TypeName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_ElasticsearchDestinationConfiguration) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go
deleted file mode 100644
index 1dc3a45a2f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_ElasticsearchRetryOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchretryoptions.html
-type AWSKinesisFirehoseDeliveryStream_ElasticsearchRetryOptions struct {
-
-	// DurationInSeconds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchretryoptions.html#cfn-kinesisfirehose-deliverystream-elasticsearchretryoptions-durationinseconds
-	DurationInSeconds int `json:"DurationInSeconds,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_ElasticsearchRetryOptions) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go
deleted file mode 100644
index 0db5294e89..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_EncryptionConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-encryptionconfiguration.html
-type AWSKinesisFirehoseDeliveryStream_EncryptionConfiguration struct {
-
-	// KMSEncryptionConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-encryptionconfiguration.html#cfn-kinesisfirehose-deliverystream-encryptionconfiguration-kmsencryptionconfig
-	KMSEncryptionConfig *AWSKinesisFirehoseDeliveryStream_KMSEncryptionConfig `json:"KMSEncryptionConfig,omitempty"`
-
-	// NoEncryptionConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-encryptionconfiguration.html#cfn-kinesisfirehose-deliverystream-encryptionconfiguration-noencryptionconfig
-	NoEncryptionConfig string `json:"NoEncryptionConfig,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_EncryptionConfiguration) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go
deleted file mode 100644
index c590387e59..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_ExtendedS3DestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html
-type AWSKinesisFirehoseDeliveryStream_ExtendedS3DestinationConfiguration struct {
-
-	// BucketARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-bucketarn
-	BucketARN string `json:"BucketARN,omitempty"`
-
-	// BufferingHints AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-bufferinghints
-	BufferingHints *AWSKinesisFirehoseDeliveryStream_BufferingHints `json:"BufferingHints,omitempty"`
-
-	// CloudWatchLoggingOptions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-cloudwatchloggingoptions
-	CloudWatchLoggingOptions *AWSKinesisFirehoseDeliveryStream_CloudWatchLoggingOptions `json:"CloudWatchLoggingOptions,omitempty"`
-
-	// CompressionFormat AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-compressionformat
-	CompressionFormat string `json:"CompressionFormat,omitempty"`
-
-	// EncryptionConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-encryptionconfiguration
-	EncryptionConfiguration *AWSKinesisFirehoseDeliveryStream_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
-
-	// Prefix AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-prefix
-	Prefix string `json:"Prefix,omitempty"`
-
-	// ProcessingConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-processingconfiguration
-	ProcessingConfiguration *AWSKinesisFirehoseDeliveryStream_ProcessingConfiguration `json:"ProcessingConfiguration,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-
-	// S3BackupConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-s3backupconfiguration
-	S3BackupConfiguration *AWSKinesisFirehoseDeliveryStream_S3DestinationConfiguration `json:"S3BackupConfiguration,omitempty"`
-
-	// S3BackupMode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-s3backupmode
-	S3BackupMode string `json:"S3BackupMode,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_ExtendedS3DestinationConfiguration) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go
deleted file mode 100644
index 5734d9b30d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_KinesisStreamSourceConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-kinesisstreamsourceconfiguration.html
-type AWSKinesisFirehoseDeliveryStream_KinesisStreamSourceConfiguration struct {
-
-	// KinesisStreamARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-kinesisstreamsourceconfiguration.html#cfn-kinesisfirehose-deliverystream-kinesisstreamsourceconfiguration-kinesisstreamarn
-	KinesisStreamARN string `json:"KinesisStreamARN,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-kinesisstreamsourceconfiguration.html#cfn-kinesisfirehose-deliverystream-kinesisstreamsourceconfiguration-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_KinesisStreamSourceConfiguration) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go
deleted file mode 100644
index d0855bb096..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_KMSEncryptionConfig AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-kmsencryptionconfig.html
-type AWSKinesisFirehoseDeliveryStream_KMSEncryptionConfig struct {
-
-	// AWSKMSKeyARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-kmsencryptionconfig.html#cfn-kinesisfirehose-deliverystream-kmsencryptionconfig-awskmskeyarn
-	AWSKMSKeyARN string `json:"AWSKMSKeyARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_KMSEncryptionConfig) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_processingconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_processingconfiguration.go
deleted file mode 100644
index 7d9607ec51..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_processingconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_ProcessingConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processingconfiguration.html
-type AWSKinesisFirehoseDeliveryStream_ProcessingConfiguration struct {
-
-	// Enabled AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processingconfiguration.html#cfn-kinesisfirehose-deliverystream-processingconfiguration-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// Processors AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processingconfiguration.html#cfn-kinesisfirehose-deliverystream-processingconfiguration-processors
-	Processors []AWSKinesisFirehoseDeliveryStream_Processor `json:"Processors,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_ProcessingConfiguration) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_processor.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_processor.go
deleted file mode 100644
index 7109525dab..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_processor.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_Processor AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.Processor)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processor.html
-type AWSKinesisFirehoseDeliveryStream_Processor struct {
-
-	// Parameters AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processor.html#cfn-kinesisfirehose-deliverystream-processor-parameters
-	Parameters []AWSKinesisFirehoseDeliveryStream_ProcessorParameter `json:"Parameters,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processor.html#cfn-kinesisfirehose-deliverystream-processor-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_Processor) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.Processor"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_processorparameter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_processorparameter.go
deleted file mode 100644
index e98dd787c5..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_processorparameter.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_ProcessorParameter AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ProcessorParameter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processorparameter.html
-type AWSKinesisFirehoseDeliveryStream_ProcessorParameter struct {
-
-	// ParameterName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processorparameter.html#cfn-kinesisfirehose-deliverystream-processorparameter-parametername
-	ParameterName string `json:"ParameterName,omitempty"`
-
-	// ParameterValue AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processorparameter.html#cfn-kinesisfirehose-deliverystream-processorparameter-parametervalue
-	ParameterValue string `json:"ParameterValue,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_ProcessorParameter) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.ProcessorParameter"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
deleted file mode 100644
index f67fb098a6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_RedshiftDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html
-type AWSKinesisFirehoseDeliveryStream_RedshiftDestinationConfiguration struct {
-
-	// CloudWatchLoggingOptions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-cloudwatchloggingoptions
-	CloudWatchLoggingOptions *AWSKinesisFirehoseDeliveryStream_CloudWatchLoggingOptions `json:"CloudWatchLoggingOptions,omitempty"`
-
-	// ClusterJDBCURL AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-clusterjdbcurl
-	ClusterJDBCURL string `json:"ClusterJDBCURL,omitempty"`
-
-	// CopyCommand AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-copycommand
-	CopyCommand *AWSKinesisFirehoseDeliveryStream_CopyCommand `json:"CopyCommand,omitempty"`
-
-	// Password AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-password
-	Password string `json:"Password,omitempty"`
-
-	// ProcessingConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-processingconfiguration
-	ProcessingConfiguration *AWSKinesisFirehoseDeliveryStream_ProcessingConfiguration `json:"ProcessingConfiguration,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-
-	// S3Configuration AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-s3configuration
-	S3Configuration *AWSKinesisFirehoseDeliveryStream_S3DestinationConfiguration `json:"S3Configuration,omitempty"`
-
-	// Username AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-username
-	Username string `json:"Username,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_RedshiftDestinationConfiguration) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go
deleted file mode 100644
index 12c0847fdb..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package cloudformation
-
-// AWSKinesisFirehoseDeliveryStream_S3DestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html
-type AWSKinesisFirehoseDeliveryStream_S3DestinationConfiguration struct {
-
-	// BucketARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-bucketarn
-	BucketARN string `json:"BucketARN,omitempty"`
-
-	// BufferingHints AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-bufferinghints
-	BufferingHints *AWSKinesisFirehoseDeliveryStream_BufferingHints `json:"BufferingHints,omitempty"`
-
-	// CloudWatchLoggingOptions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-cloudwatchloggingoptions
-	CloudWatchLoggingOptions *AWSKinesisFirehoseDeliveryStream_CloudWatchLoggingOptions `json:"CloudWatchLoggingOptions,omitempty"`
-
-	// CompressionFormat AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-compressionformat
-	CompressionFormat string `json:"CompressionFormat,omitempty"`
-
-	// EncryptionConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-encryptionconfiguration
-	EncryptionConfiguration *AWSKinesisFirehoseDeliveryStream_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
-
-	// Prefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-prefix
-	Prefix string `json:"Prefix,omitempty"`
-
-	// RoleARN AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-rolearn
-	RoleARN string `json:"RoleARN,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKinesisFirehoseDeliveryStream_S3DestinationConfiguration) AWSCloudFormationType() string {
-	return "AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kms-alias.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kms-alias.go
deleted file mode 100644
index d2a4b3feef..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kms-alias.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSKMSAlias AWS CloudFormation Resource (AWS::KMS::Alias)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-alias.html
-type AWSKMSAlias struct {
-
-	// AliasName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-alias.html#cfn-kms-alias-aliasname
-	AliasName string `json:"AliasName,omitempty"`
-
-	// TargetKeyId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-alias.html#cfn-kms-alias-targetkeyid
-	TargetKeyId string `json:"TargetKeyId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKMSAlias) AWSCloudFormationType() string {
-	return "AWS::KMS::Alias"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSKMSAlias) MarshalJSON() ([]byte, error) {
-	type Properties AWSKMSAlias
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSKMSAlias) UnmarshalJSON(b []byte) error {
-	type Properties AWSKMSAlias
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSKMSAlias(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSKMSAliasResources retrieves all AWSKMSAlias items from an AWS CloudFormation template
-func (t *Template) GetAllAWSKMSAliasResources() map[string]AWSKMSAlias {
-	results := map[string]AWSKMSAlias{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSKMSAlias:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::KMS::Alias" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKMSAlias
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSKMSAliasWithName retrieves all AWSKMSAlias items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSKMSAliasWithName(name string) (AWSKMSAlias, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSKMSAlias:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::KMS::Alias" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKMSAlias
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSKMSAlias{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-kms-key.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-kms-key.go
deleted file mode 100644
index a040b95a2f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-kms-key.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSKMSKey AWS CloudFormation Resource (AWS::KMS::Key)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html
-type AWSKMSKey struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-description
-	Description string `json:"Description,omitempty"`
-
-	// EnableKeyRotation AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-enablekeyrotation
-	EnableKeyRotation bool `json:"EnableKeyRotation,omitempty"`
-
-	// Enabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// KeyPolicy AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-keypolicy
-	KeyPolicy interface{} `json:"KeyPolicy,omitempty"`
-
-	// KeyUsage AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-keyusage
-	KeyUsage string `json:"KeyUsage,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSKMSKey) AWSCloudFormationType() string {
-	return "AWS::KMS::Key"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSKMSKey) MarshalJSON() ([]byte, error) {
-	type Properties AWSKMSKey
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSKMSKey) UnmarshalJSON(b []byte) error {
-	type Properties AWSKMSKey
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSKMSKey(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSKMSKeyResources retrieves all AWSKMSKey items from an AWS CloudFormation template
-func (t *Template) GetAllAWSKMSKeyResources() map[string]AWSKMSKey {
-	results := map[string]AWSKMSKey{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSKMSKey:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::KMS::Key" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKMSKey
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSKMSKeyWithName retrieves all AWSKMSKey items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSKMSKeyWithName(name string) (AWSKMSKey, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSKMSKey:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::KMS::Key" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSKMSKey
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSKMSKey{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-alias.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-alias.go
deleted file mode 100644
index 46a9cb60cf..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-alias.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSLambdaAlias AWS CloudFormation Resource (AWS::Lambda::Alias)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html
-type AWSLambdaAlias struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-description
-	Description string `json:"Description,omitempty"`
-
-	// FunctionName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-functionname
-	FunctionName string `json:"FunctionName,omitempty"`
-
-	// FunctionVersion AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-functionversion
-	FunctionVersion string `json:"FunctionVersion,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-name
-	Name string `json:"Name,omitempty"`
-
-	// RoutingConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-routingconfig
-	RoutingConfig *AWSLambdaAlias_AliasRoutingConfiguration `json:"RoutingConfig,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLambdaAlias) AWSCloudFormationType() string {
-	return "AWS::Lambda::Alias"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSLambdaAlias) MarshalJSON() ([]byte, error) {
-	type Properties AWSLambdaAlias
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSLambdaAlias) UnmarshalJSON(b []byte) error {
-	type Properties AWSLambdaAlias
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSLambdaAlias(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSLambdaAliasResources retrieves all AWSLambdaAlias items from an AWS CloudFormation template
-func (t *Template) GetAllAWSLambdaAliasResources() map[string]AWSLambdaAlias {
-	results := map[string]AWSLambdaAlias{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSLambdaAlias:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Lambda::Alias" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLambdaAlias
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSLambdaAliasWithName retrieves all AWSLambdaAlias items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSLambdaAliasWithName(name string) (AWSLambdaAlias, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSLambdaAlias:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Lambda::Alias" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLambdaAlias
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSLambdaAlias{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-alias_aliasroutingconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-alias_aliasroutingconfiguration.go
deleted file mode 100644
index c7d9d2b96f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-alias_aliasroutingconfiguration.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSLambdaAlias_AliasRoutingConfiguration AWS CloudFormation Resource (AWS::Lambda::Alias.AliasRoutingConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-aliasroutingconfiguration.html
-type AWSLambdaAlias_AliasRoutingConfiguration struct {
-
-	// AdditionalVersionWeights AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-aliasroutingconfiguration.html#cfn-lambda-alias-aliasroutingconfiguration-additionalversionweights
-	AdditionalVersionWeights []AWSLambdaAlias_VersionWeight `json:"AdditionalVersionWeights,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLambdaAlias_AliasRoutingConfiguration) AWSCloudFormationType() string {
-	return "AWS::Lambda::Alias.AliasRoutingConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-alias_versionweight.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-alias_versionweight.go
deleted file mode 100644
index 52055cd478..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-alias_versionweight.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSLambdaAlias_VersionWeight AWS CloudFormation Resource (AWS::Lambda::Alias.VersionWeight)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-versionweight.html
-type AWSLambdaAlias_VersionWeight struct {
-
-	// FunctionVersion AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-versionweight.html#cfn-lambda-alias-versionweight-functionversion
-	FunctionVersion string `json:"FunctionVersion,omitempty"`
-
-	// FunctionWeight AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-versionweight.html#cfn-lambda-alias-versionweight-functionweight
-	FunctionWeight float64 `json:"FunctionWeight,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLambdaAlias_VersionWeight) AWSCloudFormationType() string {
-	return "AWS::Lambda::Alias.VersionWeight"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-eventsourcemapping.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-eventsourcemapping.go
deleted file mode 100644
index 80959a497c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-eventsourcemapping.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSLambdaEventSourceMapping AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html
-type AWSLambdaEventSourceMapping struct {
-
-	// BatchSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-batchsize
-	BatchSize int `json:"BatchSize,omitempty"`
-
-	// Enabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// EventSourceArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-eventsourcearn
-	EventSourceArn string `json:"EventSourceArn,omitempty"`
-
-	// FunctionName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-functionname
-	FunctionName string `json:"FunctionName,omitempty"`
-
-	// StartingPosition AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-startingposition
-	StartingPosition string `json:"StartingPosition,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLambdaEventSourceMapping) AWSCloudFormationType() string {
-	return "AWS::Lambda::EventSourceMapping"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSLambdaEventSourceMapping) MarshalJSON() ([]byte, error) {
-	type Properties AWSLambdaEventSourceMapping
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSLambdaEventSourceMapping) UnmarshalJSON(b []byte) error {
-	type Properties AWSLambdaEventSourceMapping
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSLambdaEventSourceMapping(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSLambdaEventSourceMappingResources retrieves all AWSLambdaEventSourceMapping items from an AWS CloudFormation template
-func (t *Template) GetAllAWSLambdaEventSourceMappingResources() map[string]AWSLambdaEventSourceMapping {
-	results := map[string]AWSLambdaEventSourceMapping{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSLambdaEventSourceMapping:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Lambda::EventSourceMapping" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLambdaEventSourceMapping
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSLambdaEventSourceMappingWithName retrieves all AWSLambdaEventSourceMapping items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSLambdaEventSourceMappingWithName(name string) (AWSLambdaEventSourceMapping, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSLambdaEventSourceMapping:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Lambda::EventSourceMapping" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLambdaEventSourceMapping
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSLambdaEventSourceMapping{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function.go
deleted file mode 100644
index 2fc0b5e2d0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function.go
+++ /dev/null
@@ -1,175 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSLambdaFunction AWS CloudFormation Resource (AWS::Lambda::Function)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html
-type AWSLambdaFunction struct {
-
-	// Code AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-code
-	Code *AWSLambdaFunction_Code `json:"Code,omitempty"`
-
-	// DeadLetterConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-deadletterconfig
-	DeadLetterConfig *AWSLambdaFunction_DeadLetterConfig `json:"DeadLetterConfig,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-description
-	Description string `json:"Description,omitempty"`
-
-	// Environment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-environment
-	Environment *AWSLambdaFunction_Environment `json:"Environment,omitempty"`
-
-	// FunctionName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-functionname
-	FunctionName string `json:"FunctionName,omitempty"`
-
-	// Handler AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-handler
-	Handler string `json:"Handler,omitempty"`
-
-	// KmsKeyArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-kmskeyarn
-	KmsKeyArn string `json:"KmsKeyArn,omitempty"`
-
-	// MemorySize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-memorysize
-	MemorySize int `json:"MemorySize,omitempty"`
-
-	// Role AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-role
-	Role string `json:"Role,omitempty"`
-
-	// Runtime AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-runtime
-	Runtime string `json:"Runtime,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// Timeout AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-timeout
-	Timeout int `json:"Timeout,omitempty"`
-
-	// TracingConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-tracingconfig
-	TracingConfig *AWSLambdaFunction_TracingConfig `json:"TracingConfig,omitempty"`
-
-	// VpcConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-vpcconfig
-	VpcConfig *AWSLambdaFunction_VpcConfig `json:"VpcConfig,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLambdaFunction) AWSCloudFormationType() string {
-	return "AWS::Lambda::Function"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSLambdaFunction) MarshalJSON() ([]byte, error) {
-	type Properties AWSLambdaFunction
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSLambdaFunction) UnmarshalJSON(b []byte) error {
-	type Properties AWSLambdaFunction
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSLambdaFunction(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSLambdaFunctionResources retrieves all AWSLambdaFunction items from an AWS CloudFormation template
-func (t *Template) GetAllAWSLambdaFunctionResources() map[string]AWSLambdaFunction {
-	results := map[string]AWSLambdaFunction{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSLambdaFunction:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Lambda::Function" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLambdaFunction
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSLambdaFunctionWithName retrieves all AWSLambdaFunction items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSLambdaFunctionWithName(name string) (AWSLambdaFunction, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSLambdaFunction:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Lambda::Function" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLambdaFunction
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSLambdaFunction{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_code.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_code.go
deleted file mode 100644
index 5e10d5b03b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_code.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSLambdaFunction_Code AWS CloudFormation Resource (AWS::Lambda::Function.Code)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html
-type AWSLambdaFunction_Code struct {
-
-	// S3Bucket AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-s3bucket
-	S3Bucket string `json:"S3Bucket,omitempty"`
-
-	// S3Key AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-s3key
-	S3Key string `json:"S3Key,omitempty"`
-
-	// S3ObjectVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-s3objectversion
-	S3ObjectVersion string `json:"S3ObjectVersion,omitempty"`
-
-	// ZipFile AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-zipfile
-	ZipFile string `json:"ZipFile,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLambdaFunction_Code) AWSCloudFormationType() string {
-	return "AWS::Lambda::Function.Code"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_deadletterconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_deadletterconfig.go
deleted file mode 100644
index 30b9655a7c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_deadletterconfig.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSLambdaFunction_DeadLetterConfig AWS CloudFormation Resource (AWS::Lambda::Function.DeadLetterConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-deadletterconfig.html
-type AWSLambdaFunction_DeadLetterConfig struct {
-
-	// TargetArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-deadletterconfig.html#cfn-lambda-function-deadletterconfig-targetarn
-	TargetArn string `json:"TargetArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLambdaFunction_DeadLetterConfig) AWSCloudFormationType() string {
-	return "AWS::Lambda::Function.DeadLetterConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_environment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_environment.go
deleted file mode 100644
index 22ba7b5e17..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_environment.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSLambdaFunction_Environment AWS CloudFormation Resource (AWS::Lambda::Function.Environment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-environment.html
-type AWSLambdaFunction_Environment struct {
-
-	// Variables AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-environment.html#cfn-lambda-function-environment-variables
-	Variables map[string]string `json:"Variables,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLambdaFunction_Environment) AWSCloudFormationType() string {
-	return "AWS::Lambda::Function.Environment"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_tracingconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_tracingconfig.go
deleted file mode 100644
index 5be394e38c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_tracingconfig.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSLambdaFunction_TracingConfig AWS CloudFormation Resource (AWS::Lambda::Function.TracingConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-tracingconfig.html
-type AWSLambdaFunction_TracingConfig struct {
-
-	// Mode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-tracingconfig.html#cfn-lambda-function-tracingconfig-mode
-	Mode string `json:"Mode,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLambdaFunction_TracingConfig) AWSCloudFormationType() string {
-	return "AWS::Lambda::Function.TracingConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_vpcconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_vpcconfig.go
deleted file mode 100644
index 3a16ed86a9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-function_vpcconfig.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSLambdaFunction_VpcConfig AWS CloudFormation Resource (AWS::Lambda::Function.VpcConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html
-type AWSLambdaFunction_VpcConfig struct {
-
-	// SecurityGroupIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html#cfn-lambda-function-vpcconfig-securitygroupids
-	SecurityGroupIds []string `json:"SecurityGroupIds,omitempty"`
-
-	// SubnetIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html#cfn-lambda-function-vpcconfig-subnetids
-	SubnetIds []string `json:"SubnetIds,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLambdaFunction_VpcConfig) AWSCloudFormationType() string {
-	return "AWS::Lambda::Function.VpcConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-permission.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-permission.go
deleted file mode 100644
index f8cf6a1b34..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-permission.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSLambdaPermission AWS CloudFormation Resource (AWS::Lambda::Permission)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html
-type AWSLambdaPermission struct {
-
-	// Action AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-action
-	Action string `json:"Action,omitempty"`
-
-	// EventSourceToken AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-eventsourcetoken
-	EventSourceToken string `json:"EventSourceToken,omitempty"`
-
-	// FunctionName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-functionname
-	FunctionName string `json:"FunctionName,omitempty"`
-
-	// Principal AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-principal
-	Principal string `json:"Principal,omitempty"`
-
-	// SourceAccount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-sourceaccount
-	SourceAccount string `json:"SourceAccount,omitempty"`
-
-	// SourceArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-sourcearn
-	SourceArn string `json:"SourceArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLambdaPermission) AWSCloudFormationType() string {
-	return "AWS::Lambda::Permission"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSLambdaPermission) MarshalJSON() ([]byte, error) {
-	type Properties AWSLambdaPermission
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSLambdaPermission) UnmarshalJSON(b []byte) error {
-	type Properties AWSLambdaPermission
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSLambdaPermission(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSLambdaPermissionResources retrieves all AWSLambdaPermission items from an AWS CloudFormation template
-func (t *Template) GetAllAWSLambdaPermissionResources() map[string]AWSLambdaPermission {
-	results := map[string]AWSLambdaPermission{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSLambdaPermission:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Lambda::Permission" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLambdaPermission
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSLambdaPermissionWithName retrieves all AWSLambdaPermission items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSLambdaPermissionWithName(name string) (AWSLambdaPermission, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSLambdaPermission:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Lambda::Permission" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLambdaPermission
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSLambdaPermission{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-version.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-version.go
deleted file mode 100644
index d5f8aa6aed..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-lambda-version.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSLambdaVersion AWS CloudFormation Resource (AWS::Lambda::Version)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html
-type AWSLambdaVersion struct {
-
-	// CodeSha256 AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html#cfn-lambda-version-codesha256
-	CodeSha256 string `json:"CodeSha256,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html#cfn-lambda-version-description
-	Description string `json:"Description,omitempty"`
-
-	// FunctionName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html#cfn-lambda-version-functionname
-	FunctionName string `json:"FunctionName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLambdaVersion) AWSCloudFormationType() string {
-	return "AWS::Lambda::Version"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSLambdaVersion) MarshalJSON() ([]byte, error) {
-	type Properties AWSLambdaVersion
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSLambdaVersion) UnmarshalJSON(b []byte) error {
-	type Properties AWSLambdaVersion
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSLambdaVersion(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSLambdaVersionResources retrieves all AWSLambdaVersion items from an AWS CloudFormation template
-func (t *Template) GetAllAWSLambdaVersionResources() map[string]AWSLambdaVersion {
-	results := map[string]AWSLambdaVersion{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSLambdaVersion:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Lambda::Version" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLambdaVersion
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSLambdaVersionWithName retrieves all AWSLambdaVersion items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSLambdaVersionWithName(name string) (AWSLambdaVersion, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSLambdaVersion:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Lambda::Version" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLambdaVersion
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSLambdaVersion{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-destination.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-destination.go
deleted file mode 100644
index 42e21e3dec..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-destination.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSLogsDestination AWS CloudFormation Resource (AWS::Logs::Destination)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html
-type AWSLogsDestination struct {
-
-	// DestinationName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html#cfn-logs-destination-destinationname
-	DestinationName string `json:"DestinationName,omitempty"`
-
-	// DestinationPolicy AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html#cfn-logs-destination-destinationpolicy
-	DestinationPolicy string `json:"DestinationPolicy,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html#cfn-logs-destination-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-
-	// TargetArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html#cfn-logs-destination-targetarn
-	TargetArn string `json:"TargetArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLogsDestination) AWSCloudFormationType() string {
-	return "AWS::Logs::Destination"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSLogsDestination) MarshalJSON() ([]byte, error) {
-	type Properties AWSLogsDestination
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSLogsDestination) UnmarshalJSON(b []byte) error {
-	type Properties AWSLogsDestination
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSLogsDestination(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSLogsDestinationResources retrieves all AWSLogsDestination items from an AWS CloudFormation template
-func (t *Template) GetAllAWSLogsDestinationResources() map[string]AWSLogsDestination {
-	results := map[string]AWSLogsDestination{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSLogsDestination:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Logs::Destination" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLogsDestination
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSLogsDestinationWithName retrieves all AWSLogsDestination items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSLogsDestinationWithName(name string) (AWSLogsDestination, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSLogsDestination:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Logs::Destination" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLogsDestination
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSLogsDestination{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-loggroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-loggroup.go
deleted file mode 100644
index ee4b644caa..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-loggroup.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSLogsLogGroup AWS CloudFormation Resource (AWS::Logs::LogGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html
-type AWSLogsLogGroup struct {
-
-	// LogGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-cwl-loggroup-loggroupname
-	LogGroupName string `json:"LogGroupName,omitempty"`
-
-	// RetentionInDays AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-cwl-loggroup-retentionindays
-	RetentionInDays int `json:"RetentionInDays,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLogsLogGroup) AWSCloudFormationType() string {
-	return "AWS::Logs::LogGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSLogsLogGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSLogsLogGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSLogsLogGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSLogsLogGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSLogsLogGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSLogsLogGroupResources retrieves all AWSLogsLogGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSLogsLogGroupResources() map[string]AWSLogsLogGroup {
-	results := map[string]AWSLogsLogGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSLogsLogGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Logs::LogGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLogsLogGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSLogsLogGroupWithName retrieves all AWSLogsLogGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSLogsLogGroupWithName(name string) (AWSLogsLogGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSLogsLogGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Logs::LogGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLogsLogGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSLogsLogGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-logstream.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-logstream.go
deleted file mode 100644
index 759df4d289..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-logstream.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSLogsLogStream AWS CloudFormation Resource (AWS::Logs::LogStream)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-logstream.html
-type AWSLogsLogStream struct {
-
-	// LogGroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-logstream.html#cfn-logs-logstream-loggroupname
-	LogGroupName string `json:"LogGroupName,omitempty"`
-
-	// LogStreamName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-logstream.html#cfn-logs-logstream-logstreamname
-	LogStreamName string `json:"LogStreamName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLogsLogStream) AWSCloudFormationType() string {
-	return "AWS::Logs::LogStream"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSLogsLogStream) MarshalJSON() ([]byte, error) {
-	type Properties AWSLogsLogStream
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSLogsLogStream) UnmarshalJSON(b []byte) error {
-	type Properties AWSLogsLogStream
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSLogsLogStream(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSLogsLogStreamResources retrieves all AWSLogsLogStream items from an AWS CloudFormation template
-func (t *Template) GetAllAWSLogsLogStreamResources() map[string]AWSLogsLogStream {
-	results := map[string]AWSLogsLogStream{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSLogsLogStream:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Logs::LogStream" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLogsLogStream
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSLogsLogStreamWithName retrieves all AWSLogsLogStream items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSLogsLogStreamWithName(name string) (AWSLogsLogStream, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSLogsLogStream:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Logs::LogStream" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLogsLogStream
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSLogsLogStream{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-metricfilter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-metricfilter.go
deleted file mode 100644
index 269184afcc..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-metricfilter.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSLogsMetricFilter AWS CloudFormation Resource (AWS::Logs::MetricFilter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-metricfilter.html
-type AWSLogsMetricFilter struct {
-
-	// FilterPattern AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-metricfilter.html#cfn-cwl-metricfilter-filterpattern
-	FilterPattern string `json:"FilterPattern,omitempty"`
-
-	// LogGroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-metricfilter.html#cfn-cwl-metricfilter-loggroupname
-	LogGroupName string `json:"LogGroupName,omitempty"`
-
-	// MetricTransformations AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-metricfilter.html#cfn-cwl-metricfilter-metrictransformations
-	MetricTransformations []AWSLogsMetricFilter_MetricTransformation `json:"MetricTransformations,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLogsMetricFilter) AWSCloudFormationType() string {
-	return "AWS::Logs::MetricFilter"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSLogsMetricFilter) MarshalJSON() ([]byte, error) {
-	type Properties AWSLogsMetricFilter
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSLogsMetricFilter) UnmarshalJSON(b []byte) error {
-	type Properties AWSLogsMetricFilter
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSLogsMetricFilter(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSLogsMetricFilterResources retrieves all AWSLogsMetricFilter items from an AWS CloudFormation template
-func (t *Template) GetAllAWSLogsMetricFilterResources() map[string]AWSLogsMetricFilter {
-	results := map[string]AWSLogsMetricFilter{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSLogsMetricFilter:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Logs::MetricFilter" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLogsMetricFilter
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSLogsMetricFilterWithName retrieves all AWSLogsMetricFilter items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSLogsMetricFilterWithName(name string) (AWSLogsMetricFilter, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSLogsMetricFilter:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Logs::MetricFilter" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLogsMetricFilter
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSLogsMetricFilter{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-metricfilter_metrictransformation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-metricfilter_metrictransformation.go
deleted file mode 100644
index acc893a076..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-metricfilter_metrictransformation.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSLogsMetricFilter_MetricTransformation AWS CloudFormation Resource (AWS::Logs::MetricFilter.MetricTransformation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-logs-metricfilter-metrictransformation.html
-type AWSLogsMetricFilter_MetricTransformation struct {
-
-	// MetricName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-logs-metricfilter-metrictransformation.html#cfn-cwl-metricfilter-metrictransformation-metricname
-	MetricName string `json:"MetricName,omitempty"`
-
-	// MetricNamespace AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-logs-metricfilter-metrictransformation.html#cfn-cwl-metricfilter-metrictransformation-metricnamespace
-	MetricNamespace string `json:"MetricNamespace,omitempty"`
-
-	// MetricValue AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-logs-metricfilter-metrictransformation.html#cfn-cwl-metricfilter-metrictransformation-metricvalue
-	MetricValue string `json:"MetricValue,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLogsMetricFilter_MetricTransformation) AWSCloudFormationType() string {
-	return "AWS::Logs::MetricFilter.MetricTransformation"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-subscriptionfilter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-subscriptionfilter.go
deleted file mode 100644
index 41fb684a39..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-logs-subscriptionfilter.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSLogsSubscriptionFilter AWS CloudFormation Resource (AWS::Logs::SubscriptionFilter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html
-type AWSLogsSubscriptionFilter struct {
-
-	// DestinationArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-cwl-subscriptionfilter-destinationarn
-	DestinationArn string `json:"DestinationArn,omitempty"`
-
-	// FilterPattern AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-cwl-subscriptionfilter-filterpattern
-	FilterPattern string `json:"FilterPattern,omitempty"`
-
-	// LogGroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-cwl-subscriptionfilter-loggroupname
-	LogGroupName string `json:"LogGroupName,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-cwl-subscriptionfilter-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSLogsSubscriptionFilter) AWSCloudFormationType() string {
-	return "AWS::Logs::SubscriptionFilter"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSLogsSubscriptionFilter) MarshalJSON() ([]byte, error) {
-	type Properties AWSLogsSubscriptionFilter
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSLogsSubscriptionFilter) UnmarshalJSON(b []byte) error {
-	type Properties AWSLogsSubscriptionFilter
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSLogsSubscriptionFilter(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSLogsSubscriptionFilterResources retrieves all AWSLogsSubscriptionFilter items from an AWS CloudFormation template
-func (t *Template) GetAllAWSLogsSubscriptionFilterResources() map[string]AWSLogsSubscriptionFilter {
-	results := map[string]AWSLogsSubscriptionFilter{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSLogsSubscriptionFilter:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Logs::SubscriptionFilter" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLogsSubscriptionFilter
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSLogsSubscriptionFilterWithName retrieves all AWSLogsSubscriptionFilter items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSLogsSubscriptionFilterWithName(name string) (AWSLogsSubscriptionFilter, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSLogsSubscriptionFilter:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Logs::SubscriptionFilter" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSLogsSubscriptionFilter
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSLogsSubscriptionFilter{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app.go
deleted file mode 100644
index a5a6772cbe..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSOpsWorksApp AWS CloudFormation Resource (AWS::OpsWorks::App)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html
-type AWSOpsWorksApp struct {
-
-	// AppSource AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-appsource
-	AppSource *AWSOpsWorksApp_Source `json:"AppSource,omitempty"`
-
-	// Attributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-attributes
-	Attributes map[string]string `json:"Attributes,omitempty"`
-
-	// DataSources AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-datasources
-	DataSources []AWSOpsWorksApp_DataSource `json:"DataSources,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-description
-	Description string `json:"Description,omitempty"`
-
-	// Domains AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-domains
-	Domains []string `json:"Domains,omitempty"`
-
-	// EnableSsl AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-enablessl
-	EnableSsl bool `json:"EnableSsl,omitempty"`
-
-	// Environment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-environment
-	Environment []AWSOpsWorksApp_EnvironmentVariable `json:"Environment,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-name
-	Name string `json:"Name,omitempty"`
-
-	// Shortname AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-shortname
-	Shortname string `json:"Shortname,omitempty"`
-
-	// SslConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-sslconfiguration
-	SslConfiguration *AWSOpsWorksApp_SslConfiguration `json:"SslConfiguration,omitempty"`
-
-	// StackId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-stackid
-	StackId string `json:"StackId,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksApp) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::App"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSOpsWorksApp) MarshalJSON() ([]byte, error) {
-	type Properties AWSOpsWorksApp
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSOpsWorksApp) UnmarshalJSON(b []byte) error {
-	type Properties AWSOpsWorksApp
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSOpsWorksApp(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSOpsWorksAppResources retrieves all AWSOpsWorksApp items from an AWS CloudFormation template
-func (t *Template) GetAllAWSOpsWorksAppResources() map[string]AWSOpsWorksApp {
-	results := map[string]AWSOpsWorksApp{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksApp:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::App" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksApp
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSOpsWorksAppWithName retrieves all AWSOpsWorksApp items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSOpsWorksAppWithName(name string) (AWSOpsWorksApp, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksApp:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::App" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksApp
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSOpsWorksApp{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app_datasource.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app_datasource.go
deleted file mode 100644
index 0ab4e17ffd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app_datasource.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksApp_DataSource AWS CloudFormation Resource (AWS::OpsWorks::App.DataSource)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-datasource.html
-type AWSOpsWorksApp_DataSource struct {
-
-	// Arn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-datasource.html#cfn-opsworks-app-datasource-arn
-	Arn string `json:"Arn,omitempty"`
-
-	// DatabaseName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-datasource.html#cfn-opsworks-app-datasource-databasename
-	DatabaseName string `json:"DatabaseName,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-datasource.html#cfn-opsworks-app-datasource-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksApp_DataSource) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::App.DataSource"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app_environmentvariable.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app_environmentvariable.go
deleted file mode 100644
index 80c2a9638f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app_environmentvariable.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksApp_EnvironmentVariable AWS CloudFormation Resource (AWS::OpsWorks::App.EnvironmentVariable)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-environment.html
-type AWSOpsWorksApp_EnvironmentVariable struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-environment.html#cfn-opsworks-app-environment-key
-	Key string `json:"Key,omitempty"`
-
-	// Secure AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-environment.html#cfn-opsworks-app-environment-secure
-	Secure bool `json:"Secure,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-environment.html#value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksApp_EnvironmentVariable) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::App.EnvironmentVariable"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app_source.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app_source.go
deleted file mode 100644
index ac8c74b1da..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app_source.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksApp_Source AWS CloudFormation Resource (AWS::OpsWorks::App.Source)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html
-type AWSOpsWorksApp_Source struct {
-
-	// Password AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-pw
-	Password string `json:"Password,omitempty"`
-
-	// Revision AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-revision
-	Revision string `json:"Revision,omitempty"`
-
-	// SshKey AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-sshkey
-	SshKey string `json:"SshKey,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-type
-	Type string `json:"Type,omitempty"`
-
-	// Url AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-url
-	Url string `json:"Url,omitempty"`
-
-	// Username AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-username
-	Username string `json:"Username,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksApp_Source) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::App.Source"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app_sslconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app_sslconfiguration.go
deleted file mode 100644
index 7ab0ad8704..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-app_sslconfiguration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksApp_SslConfiguration AWS CloudFormation Resource (AWS::OpsWorks::App.SslConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-sslconfiguration.html
-type AWSOpsWorksApp_SslConfiguration struct {
-
-	// Certificate AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-sslconfiguration.html#cfn-opsworks-app-sslconfig-certificate
-	Certificate string `json:"Certificate,omitempty"`
-
-	// Chain AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-sslconfiguration.html#cfn-opsworks-app-sslconfig-chain
-	Chain string `json:"Chain,omitempty"`
-
-	// PrivateKey AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-sslconfiguration.html#cfn-opsworks-app-sslconfig-privatekey
-	PrivateKey string `json:"PrivateKey,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksApp_SslConfiguration) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::App.SslConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-elasticloadbalancerattachment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-elasticloadbalancerattachment.go
deleted file mode 100644
index a3405b2101..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-elasticloadbalancerattachment.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSOpsWorksElasticLoadBalancerAttachment AWS CloudFormation Resource (AWS::OpsWorks::ElasticLoadBalancerAttachment)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-elbattachment.html
-type AWSOpsWorksElasticLoadBalancerAttachment struct {
-
-	// ElasticLoadBalancerName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-elbattachment.html#cfn-opsworks-elbattachment-elbname
-	ElasticLoadBalancerName string `json:"ElasticLoadBalancerName,omitempty"`
-
-	// LayerId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-elbattachment.html#cfn-opsworks-elbattachment-layerid
-	LayerId string `json:"LayerId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksElasticLoadBalancerAttachment) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::ElasticLoadBalancerAttachment"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSOpsWorksElasticLoadBalancerAttachment) MarshalJSON() ([]byte, error) {
-	type Properties AWSOpsWorksElasticLoadBalancerAttachment
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSOpsWorksElasticLoadBalancerAttachment) UnmarshalJSON(b []byte) error {
-	type Properties AWSOpsWorksElasticLoadBalancerAttachment
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSOpsWorksElasticLoadBalancerAttachment(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSOpsWorksElasticLoadBalancerAttachmentResources retrieves all AWSOpsWorksElasticLoadBalancerAttachment items from an AWS CloudFormation template
-func (t *Template) GetAllAWSOpsWorksElasticLoadBalancerAttachmentResources() map[string]AWSOpsWorksElasticLoadBalancerAttachment {
-	results := map[string]AWSOpsWorksElasticLoadBalancerAttachment{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksElasticLoadBalancerAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::ElasticLoadBalancerAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksElasticLoadBalancerAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSOpsWorksElasticLoadBalancerAttachmentWithName retrieves all AWSOpsWorksElasticLoadBalancerAttachment items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSOpsWorksElasticLoadBalancerAttachmentWithName(name string) (AWSOpsWorksElasticLoadBalancerAttachment, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksElasticLoadBalancerAttachment:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::ElasticLoadBalancerAttachment" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksElasticLoadBalancerAttachment
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSOpsWorksElasticLoadBalancerAttachment{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-instance.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-instance.go
deleted file mode 100644
index e8fbef024a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-instance.go
+++ /dev/null
@@ -1,210 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSOpsWorksInstance AWS CloudFormation Resource (AWS::OpsWorks::Instance)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html
-type AWSOpsWorksInstance struct {
-
-	// AgentVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-agentversion
-	AgentVersion string `json:"AgentVersion,omitempty"`
-
-	// AmiId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-amiid
-	AmiId string `json:"AmiId,omitempty"`
-
-	// Architecture AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-architecture
-	Architecture string `json:"Architecture,omitempty"`
-
-	// AutoScalingType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-autoscalingtype
-	AutoScalingType string `json:"AutoScalingType,omitempty"`
-
-	// AvailabilityZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-availabilityzone
-	AvailabilityZone string `json:"AvailabilityZone,omitempty"`
-
-	// BlockDeviceMappings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-blockdevicemappings
-	BlockDeviceMappings []AWSOpsWorksInstance_BlockDeviceMapping `json:"BlockDeviceMappings,omitempty"`
-
-	// EbsOptimized AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-ebsoptimized
-	EbsOptimized bool `json:"EbsOptimized,omitempty"`
-
-	// ElasticIps AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-elasticips
-	ElasticIps []string `json:"ElasticIps,omitempty"`
-
-	// Hostname AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-hostname
-	Hostname string `json:"Hostname,omitempty"`
-
-	// InstallUpdatesOnBoot AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-installupdatesonboot
-	InstallUpdatesOnBoot bool `json:"InstallUpdatesOnBoot,omitempty"`
-
-	// InstanceType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-instancetype
-	InstanceType string `json:"InstanceType,omitempty"`
-
-	// LayerIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-layerids
-	LayerIds []string `json:"LayerIds,omitempty"`
-
-	// Os AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-os
-	Os string `json:"Os,omitempty"`
-
-	// RootDeviceType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-rootdevicetype
-	RootDeviceType string `json:"RootDeviceType,omitempty"`
-
-	// SshKeyName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-sshkeyname
-	SshKeyName string `json:"SshKeyName,omitempty"`
-
-	// StackId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-stackid
-	StackId string `json:"StackId,omitempty"`
-
-	// SubnetId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-subnetid
-	SubnetId string `json:"SubnetId,omitempty"`
-
-	// Tenancy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-tenancy
-	Tenancy string `json:"Tenancy,omitempty"`
-
-	// TimeBasedAutoScaling AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-timebasedautoscaling
-	TimeBasedAutoScaling *AWSOpsWorksInstance_TimeBasedAutoScaling `json:"TimeBasedAutoScaling,omitempty"`
-
-	// VirtualizationType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-virtualizationtype
-	VirtualizationType string `json:"VirtualizationType,omitempty"`
-
-	// Volumes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-volumes
-	Volumes []string `json:"Volumes,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksInstance) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Instance"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSOpsWorksInstance) MarshalJSON() ([]byte, error) {
-	type Properties AWSOpsWorksInstance
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSOpsWorksInstance) UnmarshalJSON(b []byte) error {
-	type Properties AWSOpsWorksInstance
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSOpsWorksInstance(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSOpsWorksInstanceResources retrieves all AWSOpsWorksInstance items from an AWS CloudFormation template
-func (t *Template) GetAllAWSOpsWorksInstanceResources() map[string]AWSOpsWorksInstance {
-	results := map[string]AWSOpsWorksInstance{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksInstance:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::Instance" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksInstance
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSOpsWorksInstanceWithName retrieves all AWSOpsWorksInstance items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSOpsWorksInstanceWithName(name string) (AWSOpsWorksInstance, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksInstance:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::Instance" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksInstance
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSOpsWorksInstance{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-instance_blockdevicemapping.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-instance_blockdevicemapping.go
deleted file mode 100644
index 41505a1bb0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-instance_blockdevicemapping.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksInstance_BlockDeviceMapping AWS CloudFormation Resource (AWS::OpsWorks::Instance.BlockDeviceMapping)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-blockdevicemapping.html
-type AWSOpsWorksInstance_BlockDeviceMapping struct {
-
-	// DeviceName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-blockdevicemapping.html#cfn-opsworks-instance-blockdevicemapping-devicename
-	DeviceName string `json:"DeviceName,omitempty"`
-
-	// Ebs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-blockdevicemapping.html#cfn-opsworks-instance-blockdevicemapping-ebs
-	Ebs *AWSOpsWorksInstance_EbsBlockDevice `json:"Ebs,omitempty"`
-
-	// NoDevice AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-blockdevicemapping.html#cfn-opsworks-instance-blockdevicemapping-nodevice
-	NoDevice string `json:"NoDevice,omitempty"`
-
-	// VirtualName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-blockdevicemapping.html#cfn-opsworks-instance-blockdevicemapping-virtualname
-	VirtualName string `json:"VirtualName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksInstance_BlockDeviceMapping) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Instance.BlockDeviceMapping"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-instance_ebsblockdevice.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-instance_ebsblockdevice.go
deleted file mode 100644
index bc3f2a4c82..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-instance_ebsblockdevice.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksInstance_EbsBlockDevice AWS CloudFormation Resource (AWS::OpsWorks::Instance.EbsBlockDevice)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-ebsblockdevice.html
-type AWSOpsWorksInstance_EbsBlockDevice struct {
-
-	// DeleteOnTermination AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-ebsblockdevice.html#cfn-opsworks-instance-ebsblockdevice-deleteontermination
-	DeleteOnTermination bool `json:"DeleteOnTermination,omitempty"`
-
-	// Iops AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-ebsblockdevice.html#cfn-opsworks-instance-ebsblockdevice-iops
-	Iops int `json:"Iops,omitempty"`
-
-	// SnapshotId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-ebsblockdevice.html#cfn-opsworks-instance-ebsblockdevice-snapshotid
-	SnapshotId string `json:"SnapshotId,omitempty"`
-
-	// VolumeSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-ebsblockdevice.html#cfn-opsworks-instance-ebsblockdevice-volumesize
-	VolumeSize int `json:"VolumeSize,omitempty"`
-
-	// VolumeType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-ebsblockdevice.html#cfn-opsworks-instance-ebsblockdevice-volumetype
-	VolumeType string `json:"VolumeType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksInstance_EbsBlockDevice) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Instance.EbsBlockDevice"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-instance_timebasedautoscaling.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-instance_timebasedautoscaling.go
deleted file mode 100644
index 768e19780c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-instance_timebasedautoscaling.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksInstance_TimeBasedAutoScaling AWS CloudFormation Resource (AWS::OpsWorks::Instance.TimeBasedAutoScaling)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html
-type AWSOpsWorksInstance_TimeBasedAutoScaling struct {
-
-	// Friday AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-friday
-	Friday map[string]string `json:"Friday,omitempty"`
-
-	// Monday AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-monday
-	Monday map[string]string `json:"Monday,omitempty"`
-
-	// Saturday AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-saturday
-	Saturday map[string]string `json:"Saturday,omitempty"`
-
-	// Sunday AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-sunday
-	Sunday map[string]string `json:"Sunday,omitempty"`
-
-	// Thursday AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-thursday
-	Thursday map[string]string `json:"Thursday,omitempty"`
-
-	// Tuesday AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-tuesday
-	Tuesday map[string]string `json:"Tuesday,omitempty"`
-
-	// Wednesday AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-wednesday
-	Wednesday map[string]string `json:"Wednesday,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksInstance_TimeBasedAutoScaling) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Instance.TimeBasedAutoScaling"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer.go
deleted file mode 100644
index 39b425c79a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer.go
+++ /dev/null
@@ -1,200 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSOpsWorksLayer AWS CloudFormation Resource (AWS::OpsWorks::Layer)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html
-type AWSOpsWorksLayer struct {
-
-	// Attributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-attributes
-	Attributes map[string]string `json:"Attributes,omitempty"`
-
-	// AutoAssignElasticIps AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-autoassignelasticips
-	AutoAssignElasticIps bool `json:"AutoAssignElasticIps,omitempty"`
-
-	// AutoAssignPublicIps AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-autoassignpublicips
-	AutoAssignPublicIps bool `json:"AutoAssignPublicIps,omitempty"`
-
-	// CustomInstanceProfileArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-custominstanceprofilearn
-	CustomInstanceProfileArn string `json:"CustomInstanceProfileArn,omitempty"`
-
-	// CustomJson AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-customjson
-	CustomJson interface{} `json:"CustomJson,omitempty"`
-
-	// CustomRecipes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-customrecipes
-	CustomRecipes *AWSOpsWorksLayer_Recipes `json:"CustomRecipes,omitempty"`
-
-	// CustomSecurityGroupIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-customsecuritygroupids
-	CustomSecurityGroupIds []string `json:"CustomSecurityGroupIds,omitempty"`
-
-	// EnableAutoHealing AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-enableautohealing
-	EnableAutoHealing bool `json:"EnableAutoHealing,omitempty"`
-
-	// InstallUpdatesOnBoot AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-installupdatesonboot
-	InstallUpdatesOnBoot bool `json:"InstallUpdatesOnBoot,omitempty"`
-
-	// LifecycleEventConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-lifecycleeventconfiguration
-	LifecycleEventConfiguration *AWSOpsWorksLayer_LifecycleEventConfiguration `json:"LifecycleEventConfiguration,omitempty"`
-
-	// LoadBasedAutoScaling AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-loadbasedautoscaling
-	LoadBasedAutoScaling *AWSOpsWorksLayer_LoadBasedAutoScaling `json:"LoadBasedAutoScaling,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-name
-	Name string `json:"Name,omitempty"`
-
-	// Packages AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-packages
-	Packages []string `json:"Packages,omitempty"`
-
-	// Shortname AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-shortname
-	Shortname string `json:"Shortname,omitempty"`
-
-	// StackId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-stackid
-	StackId string `json:"StackId,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-type
-	Type string `json:"Type,omitempty"`
-
-	// UseEbsOptimizedInstances AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-useebsoptimizedinstances
-	UseEbsOptimizedInstances bool `json:"UseEbsOptimizedInstances,omitempty"`
-
-	// VolumeConfigurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-volumeconfigurations
-	VolumeConfigurations []AWSOpsWorksLayer_VolumeConfiguration `json:"VolumeConfigurations,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksLayer) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Layer"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSOpsWorksLayer) MarshalJSON() ([]byte, error) {
-	type Properties AWSOpsWorksLayer
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSOpsWorksLayer) UnmarshalJSON(b []byte) error {
-	type Properties AWSOpsWorksLayer
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSOpsWorksLayer(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSOpsWorksLayerResources retrieves all AWSOpsWorksLayer items from an AWS CloudFormation template
-func (t *Template) GetAllAWSOpsWorksLayerResources() map[string]AWSOpsWorksLayer {
-	results := map[string]AWSOpsWorksLayer{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksLayer:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::Layer" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksLayer
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSOpsWorksLayerWithName retrieves all AWSOpsWorksLayer items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSOpsWorksLayerWithName(name string) (AWSOpsWorksLayer, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksLayer:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::Layer" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksLayer
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSOpsWorksLayer{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_autoscalingthresholds.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_autoscalingthresholds.go
deleted file mode 100644
index 56b4b9c8c3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_autoscalingthresholds.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksLayer_AutoScalingThresholds AWS CloudFormation Resource (AWS::OpsWorks::Layer.AutoScalingThresholds)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html
-type AWSOpsWorksLayer_AutoScalingThresholds struct {
-
-	// CpuThreshold AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html#cfn-opsworks-layer-loadbasedautoscaling-autoscalingthresholds-cputhreshold
-	CpuThreshold float64 `json:"CpuThreshold,omitempty"`
-
-	// IgnoreMetricsTime AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html#cfn-opsworks-layer-loadbasedautoscaling-autoscalingthresholds-ignoremetricstime
-	IgnoreMetricsTime int `json:"IgnoreMetricsTime,omitempty"`
-
-	// InstanceCount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html#cfn-opsworks-layer-loadbasedautoscaling-autoscalingthresholds-instancecount
-	InstanceCount int `json:"InstanceCount,omitempty"`
-
-	// LoadThreshold AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html#cfn-opsworks-layer-loadbasedautoscaling-autoscalingthresholds-loadthreshold
-	LoadThreshold float64 `json:"LoadThreshold,omitempty"`
-
-	// MemoryThreshold AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html#cfn-opsworks-layer-loadbasedautoscaling-autoscalingthresholds-memorythreshold
-	MemoryThreshold float64 `json:"MemoryThreshold,omitempty"`
-
-	// ThresholdsWaitTime AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html#cfn-opsworks-layer-loadbasedautoscaling-autoscalingthresholds-thresholdwaittime
-	ThresholdsWaitTime int `json:"ThresholdsWaitTime,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksLayer_AutoScalingThresholds) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Layer.AutoScalingThresholds"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_lifecycleeventconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_lifecycleeventconfiguration.go
deleted file mode 100644
index 7468abb96d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_lifecycleeventconfiguration.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksLayer_LifecycleEventConfiguration AWS CloudFormation Resource (AWS::OpsWorks::Layer.LifecycleEventConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-lifecycleeventconfiguration.html
-type AWSOpsWorksLayer_LifecycleEventConfiguration struct {
-
-	// ShutdownEventConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-lifecycleeventconfiguration.html#cfn-opsworks-layer-lifecycleconfiguration-shutdowneventconfiguration
-	ShutdownEventConfiguration *AWSOpsWorksLayer_ShutdownEventConfiguration `json:"ShutdownEventConfiguration,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksLayer_LifecycleEventConfiguration) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Layer.LifecycleEventConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_loadbasedautoscaling.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_loadbasedautoscaling.go
deleted file mode 100644
index f8f071f6af..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_loadbasedautoscaling.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksLayer_LoadBasedAutoScaling AWS CloudFormation Resource (AWS::OpsWorks::Layer.LoadBasedAutoScaling)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling.html
-type AWSOpsWorksLayer_LoadBasedAutoScaling struct {
-
-	// DownScaling AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling.html#cfn-opsworks-layer-loadbasedautoscaling-downscaling
-	DownScaling *AWSOpsWorksLayer_AutoScalingThresholds `json:"DownScaling,omitempty"`
-
-	// Enable AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling.html#cfn-opsworks-layer-loadbasedautoscaling-enable
-	Enable bool `json:"Enable,omitempty"`
-
-	// UpScaling AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling.html#cfn-opsworks-layer-loadbasedautoscaling-upscaling
-	UpScaling *AWSOpsWorksLayer_AutoScalingThresholds `json:"UpScaling,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksLayer_LoadBasedAutoScaling) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Layer.LoadBasedAutoScaling"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_recipes.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_recipes.go
deleted file mode 100644
index 9167aa31b3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_recipes.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksLayer_Recipes AWS CloudFormation Resource (AWS::OpsWorks::Layer.Recipes)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-recipes.html
-type AWSOpsWorksLayer_Recipes struct {
-
-	// Configure AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-recipes.html#cfn-opsworks-layer-customrecipes-configure
-	Configure []string `json:"Configure,omitempty"`
-
-	// Deploy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-recipes.html#cfn-opsworks-layer-customrecipes-deploy
-	Deploy []string `json:"Deploy,omitempty"`
-
-	// Setup AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-recipes.html#cfn-opsworks-layer-customrecipes-setup
-	Setup []string `json:"Setup,omitempty"`
-
-	// Shutdown AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-recipes.html#cfn-opsworks-layer-customrecipes-shutdown
-	Shutdown []string `json:"Shutdown,omitempty"`
-
-	// Undeploy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-recipes.html#cfn-opsworks-layer-customrecipes-undeploy
-	Undeploy []string `json:"Undeploy,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksLayer_Recipes) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Layer.Recipes"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_shutdowneventconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_shutdowneventconfiguration.go
deleted file mode 100644
index 6e4620cea5..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_shutdowneventconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksLayer_ShutdownEventConfiguration AWS CloudFormation Resource (AWS::OpsWorks::Layer.ShutdownEventConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-lifecycleeventconfiguration-shutdowneventconfiguration.html
-type AWSOpsWorksLayer_ShutdownEventConfiguration struct {
-
-	// DelayUntilElbConnectionsDrained AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-lifecycleeventconfiguration-shutdowneventconfiguration.html#cfn-opsworks-layer-lifecycleconfiguration-shutdowneventconfiguration-delayuntilelbconnectionsdrained
-	DelayUntilElbConnectionsDrained bool `json:"DelayUntilElbConnectionsDrained,omitempty"`
-
-	// ExecutionTimeout AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-lifecycleeventconfiguration-shutdowneventconfiguration.html#cfn-opsworks-layer-lifecycleconfiguration-shutdowneventconfiguration-executiontimeout
-	ExecutionTimeout int `json:"ExecutionTimeout,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksLayer_ShutdownEventConfiguration) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Layer.ShutdownEventConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_volumeconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_volumeconfiguration.go
deleted file mode 100644
index 00fed86edb..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-layer_volumeconfiguration.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksLayer_VolumeConfiguration AWS CloudFormation Resource (AWS::OpsWorks::Layer.VolumeConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html
-type AWSOpsWorksLayer_VolumeConfiguration struct {
-
-	// Iops AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volconfig-iops
-	Iops int `json:"Iops,omitempty"`
-
-	// MountPoint AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volconfig-mountpoint
-	MountPoint string `json:"MountPoint,omitempty"`
-
-	// NumberOfDisks AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volconfig-numberofdisks
-	NumberOfDisks int `json:"NumberOfDisks,omitempty"`
-
-	// RaidLevel AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volconfig-raidlevel
-	RaidLevel int `json:"RaidLevel,omitempty"`
-
-	// Size AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volconfig-size
-	Size int `json:"Size,omitempty"`
-
-	// VolumeType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volconfig-volumetype
-	VolumeType string `json:"VolumeType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksLayer_VolumeConfiguration) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Layer.VolumeConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack.go
deleted file mode 100644
index 5711be92d3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack.go
+++ /dev/null
@@ -1,230 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSOpsWorksStack AWS CloudFormation Resource (AWS::OpsWorks::Stack)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html
-type AWSOpsWorksStack struct {
-
-	// AgentVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-agentversion
-	AgentVersion string `json:"AgentVersion,omitempty"`
-
-	// Attributes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-attributes
-	Attributes map[string]string `json:"Attributes,omitempty"`
-
-	// ChefConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-chefconfiguration
-	ChefConfiguration *AWSOpsWorksStack_ChefConfiguration `json:"ChefConfiguration,omitempty"`
-
-	// CloneAppIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-cloneappids
-	CloneAppIds []string `json:"CloneAppIds,omitempty"`
-
-	// ClonePermissions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-clonepermissions
-	ClonePermissions bool `json:"ClonePermissions,omitempty"`
-
-	// ConfigurationManager AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-configmanager
-	ConfigurationManager *AWSOpsWorksStack_StackConfigurationManager `json:"ConfigurationManager,omitempty"`
-
-	// CustomCookbooksSource AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-custcookbooksource
-	CustomCookbooksSource *AWSOpsWorksStack_Source `json:"CustomCookbooksSource,omitempty"`
-
-	// CustomJson AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-custjson
-	CustomJson interface{} `json:"CustomJson,omitempty"`
-
-	// DefaultAvailabilityZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-defaultaz
-	DefaultAvailabilityZone string `json:"DefaultAvailabilityZone,omitempty"`
-
-	// DefaultInstanceProfileArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-defaultinstanceprof
-	DefaultInstanceProfileArn string `json:"DefaultInstanceProfileArn,omitempty"`
-
-	// DefaultOs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-defaultos
-	DefaultOs string `json:"DefaultOs,omitempty"`
-
-	// DefaultRootDeviceType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-defaultrootdevicetype
-	DefaultRootDeviceType string `json:"DefaultRootDeviceType,omitempty"`
-
-	// DefaultSshKeyName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-defaultsshkeyname
-	DefaultSshKeyName string `json:"DefaultSshKeyName,omitempty"`
-
-	// DefaultSubnetId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#defaultsubnet
-	DefaultSubnetId string `json:"DefaultSubnetId,omitempty"`
-
-	// EcsClusterArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-ecsclusterarn
-	EcsClusterArn string `json:"EcsClusterArn,omitempty"`
-
-	// ElasticIps AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-elasticips
-	ElasticIps []AWSOpsWorksStack_ElasticIp `json:"ElasticIps,omitempty"`
-
-	// HostnameTheme AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-hostnametheme
-	HostnameTheme string `json:"HostnameTheme,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-name
-	Name string `json:"Name,omitempty"`
-
-	// RdsDbInstances AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-rdsdbinstances
-	RdsDbInstances []AWSOpsWorksStack_RdsDbInstance `json:"RdsDbInstances,omitempty"`
-
-	// ServiceRoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-servicerolearn
-	ServiceRoleArn string `json:"ServiceRoleArn,omitempty"`
-
-	// SourceStackId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-sourcestackid
-	SourceStackId string `json:"SourceStackId,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// UseCustomCookbooks AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#usecustcookbooks
-	UseCustomCookbooks bool `json:"UseCustomCookbooks,omitempty"`
-
-	// UseOpsworksSecurityGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-useopsworkssecuritygroups
-	UseOpsworksSecurityGroups bool `json:"UseOpsworksSecurityGroups,omitempty"`
-
-	// VpcId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-vpcid
-	VpcId string `json:"VpcId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksStack) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Stack"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSOpsWorksStack) MarshalJSON() ([]byte, error) {
-	type Properties AWSOpsWorksStack
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSOpsWorksStack) UnmarshalJSON(b []byte) error {
-	type Properties AWSOpsWorksStack
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSOpsWorksStack(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSOpsWorksStackResources retrieves all AWSOpsWorksStack items from an AWS CloudFormation template
-func (t *Template) GetAllAWSOpsWorksStackResources() map[string]AWSOpsWorksStack {
-	results := map[string]AWSOpsWorksStack{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksStack:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::Stack" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksStack
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSOpsWorksStackWithName retrieves all AWSOpsWorksStack items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSOpsWorksStackWithName(name string) (AWSOpsWorksStack, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksStack:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::Stack" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksStack
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSOpsWorksStack{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_chefconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_chefconfiguration.go
deleted file mode 100644
index efe39357ad..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_chefconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksStack_ChefConfiguration AWS CloudFormation Resource (AWS::OpsWorks::Stack.ChefConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-chefconfiguration.html
-type AWSOpsWorksStack_ChefConfiguration struct {
-
-	// BerkshelfVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-chefconfiguration.html#cfn-opsworks-chefconfiguration-berkshelfversion
-	BerkshelfVersion string `json:"BerkshelfVersion,omitempty"`
-
-	// ManageBerkshelf AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-chefconfiguration.html#cfn-opsworks-chefconfiguration-berkshelfversion
-	ManageBerkshelf bool `json:"ManageBerkshelf,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksStack_ChefConfiguration) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Stack.ChefConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_elasticip.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_elasticip.go
deleted file mode 100644
index 5959769ca5..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_elasticip.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksStack_ElasticIp AWS CloudFormation Resource (AWS::OpsWorks::Stack.ElasticIp)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-elasticip.html
-type AWSOpsWorksStack_ElasticIp struct {
-
-	// Ip AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-elasticip.html#cfn-opsworks-stack-elasticip-ip
-	Ip string `json:"Ip,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-elasticip.html#cfn-opsworks-stack-elasticip-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksStack_ElasticIp) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Stack.ElasticIp"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_rdsdbinstance.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_rdsdbinstance.go
deleted file mode 100644
index a70f82787e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_rdsdbinstance.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksStack_RdsDbInstance AWS CloudFormation Resource (AWS::OpsWorks::Stack.RdsDbInstance)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-rdsdbinstance.html
-type AWSOpsWorksStack_RdsDbInstance struct {
-
-	// DbPassword AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-rdsdbinstance.html#cfn-opsworks-stack-rdsdbinstance-dbpassword
-	DbPassword string `json:"DbPassword,omitempty"`
-
-	// DbUser AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-rdsdbinstance.html#cfn-opsworks-stack-rdsdbinstance-dbuser
-	DbUser string `json:"DbUser,omitempty"`
-
-	// RdsDbInstanceArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-rdsdbinstance.html#cfn-opsworks-stack-rdsdbinstance-rdsdbinstancearn
-	RdsDbInstanceArn string `json:"RdsDbInstanceArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksStack_RdsDbInstance) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Stack.RdsDbInstance"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_source.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_source.go
deleted file mode 100644
index a1f5d7d24a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_source.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksStack_Source AWS CloudFormation Resource (AWS::OpsWorks::Stack.Source)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html
-type AWSOpsWorksStack_Source struct {
-
-	// Password AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-password
-	Password string `json:"Password,omitempty"`
-
-	// Revision AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-revision
-	Revision string `json:"Revision,omitempty"`
-
-	// SshKey AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-sshkey
-	SshKey string `json:"SshKey,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-type
-	Type string `json:"Type,omitempty"`
-
-	// Url AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-url
-	Url string `json:"Url,omitempty"`
-
-	// Username AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-username
-	Username string `json:"Username,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksStack_Source) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Stack.Source"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_stackconfigurationmanager.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_stackconfigurationmanager.go
deleted file mode 100644
index 057a62d038..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-stack_stackconfigurationmanager.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSOpsWorksStack_StackConfigurationManager AWS CloudFormation Resource (AWS::OpsWorks::Stack.StackConfigurationManager)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-stackconfigmanager.html
-type AWSOpsWorksStack_StackConfigurationManager struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-stackconfigmanager.html#cfn-opsworks-configmanager-name
-	Name string `json:"Name,omitempty"`
-
-	// Version AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-stackconfigmanager.html#cfn-opsworks-configmanager-version
-	Version string `json:"Version,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksStack_StackConfigurationManager) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Stack.StackConfigurationManager"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-userprofile.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-userprofile.go
deleted file mode 100644
index c507542709..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-userprofile.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSOpsWorksUserProfile AWS CloudFormation Resource (AWS::OpsWorks::UserProfile)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-userprofile.html
-type AWSOpsWorksUserProfile struct {
-
-	// AllowSelfManagement AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-userprofile.html#cfn-opsworks-userprofile-allowselfmanagement
-	AllowSelfManagement bool `json:"AllowSelfManagement,omitempty"`
-
-	// IamUserArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-userprofile.html#cfn-opsworks-userprofile-iamuserarn
-	IamUserArn string `json:"IamUserArn,omitempty"`
-
-	// SshPublicKey AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-userprofile.html#cfn-opsworks-userprofile-sshpublickey
-	SshPublicKey string `json:"SshPublicKey,omitempty"`
-
-	// SshUsername AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-userprofile.html#cfn-opsworks-userprofile-sshusername
-	SshUsername string `json:"SshUsername,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksUserProfile) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::UserProfile"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSOpsWorksUserProfile) MarshalJSON() ([]byte, error) {
-	type Properties AWSOpsWorksUserProfile
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSOpsWorksUserProfile) UnmarshalJSON(b []byte) error {
-	type Properties AWSOpsWorksUserProfile
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSOpsWorksUserProfile(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSOpsWorksUserProfileResources retrieves all AWSOpsWorksUserProfile items from an AWS CloudFormation template
-func (t *Template) GetAllAWSOpsWorksUserProfileResources() map[string]AWSOpsWorksUserProfile {
-	results := map[string]AWSOpsWorksUserProfile{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksUserProfile:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::UserProfile" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksUserProfile
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSOpsWorksUserProfileWithName retrieves all AWSOpsWorksUserProfile items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSOpsWorksUserProfileWithName(name string) (AWSOpsWorksUserProfile, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksUserProfile:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::UserProfile" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksUserProfile
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSOpsWorksUserProfile{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-volume.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-volume.go
deleted file mode 100644
index df6f21119f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-opsworks-volume.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSOpsWorksVolume AWS CloudFormation Resource (AWS::OpsWorks::Volume)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-volume.html
-type AWSOpsWorksVolume struct {
-
-	// Ec2VolumeId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-volume.html#cfn-opsworks-volume-ec2volumeid
-	Ec2VolumeId string `json:"Ec2VolumeId,omitempty"`
-
-	// MountPoint AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-volume.html#cfn-opsworks-volume-mountpoint
-	MountPoint string `json:"MountPoint,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-volume.html#cfn-opsworks-volume-name
-	Name string `json:"Name,omitempty"`
-
-	// StackId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-volume.html#cfn-opsworks-volume-stackid
-	StackId string `json:"StackId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSOpsWorksVolume) AWSCloudFormationType() string {
-	return "AWS::OpsWorks::Volume"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSOpsWorksVolume) MarshalJSON() ([]byte, error) {
-	type Properties AWSOpsWorksVolume
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSOpsWorksVolume) UnmarshalJSON(b []byte) error {
-	type Properties AWSOpsWorksVolume
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSOpsWorksVolume(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSOpsWorksVolumeResources retrieves all AWSOpsWorksVolume items from an AWS CloudFormation template
-func (t *Template) GetAllAWSOpsWorksVolumeResources() map[string]AWSOpsWorksVolume {
-	results := map[string]AWSOpsWorksVolume{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksVolume:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::Volume" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksVolume
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSOpsWorksVolumeWithName retrieves all AWSOpsWorksVolume items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSOpsWorksVolumeWithName(name string) (AWSOpsWorksVolume, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSOpsWorksVolume:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::OpsWorks::Volume" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSOpsWorksVolume
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSOpsWorksVolume{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbcluster.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbcluster.go
deleted file mode 100644
index ac51650d59..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbcluster.go
+++ /dev/null
@@ -1,195 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRDSDBCluster AWS CloudFormation Resource (AWS::RDS::DBCluster)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html
-type AWSRDSDBCluster struct {
-
-	// AvailabilityZones AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-availabilityzones
-	AvailabilityZones string `json:"AvailabilityZones,omitempty"`
-
-	// BackupRetentionPeriod AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-backuprententionperiod
-	BackupRetentionPeriod int `json:"BackupRetentionPeriod,omitempty"`
-
-	// DBClusterParameterGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-dbclusterparametergroupname
-	DBClusterParameterGroupName string `json:"DBClusterParameterGroupName,omitempty"`
-
-	// DBSubnetGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-dbsubnetgroupname
-	DBSubnetGroupName string `json:"DBSubnetGroupName,omitempty"`
-
-	// DatabaseName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-databasename
-	DatabaseName string `json:"DatabaseName,omitempty"`
-
-	// Engine AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-engine
-	Engine string `json:"Engine,omitempty"`
-
-	// EngineVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-engineversion
-	EngineVersion string `json:"EngineVersion,omitempty"`
-
-	// KmsKeyId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-kmskeyid
-	KmsKeyId string `json:"KmsKeyId,omitempty"`
-
-	// MasterUserPassword AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-masteruserpassword
-	MasterUserPassword string `json:"MasterUserPassword,omitempty"`
-
-	// MasterUsername AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-masterusername
-	MasterUsername string `json:"MasterUsername,omitempty"`
-
-	// Port AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-port
-	Port int `json:"Port,omitempty"`
-
-	// PreferredBackupWindow AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-preferredbackupwindow
-	PreferredBackupWindow string `json:"PreferredBackupWindow,omitempty"`
-
-	// PreferredMaintenanceWindow AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-preferredmaintenancewindow
-	PreferredMaintenanceWindow string `json:"PreferredMaintenanceWindow,omitempty"`
-
-	// ReplicationSourceIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-replicationsourceidentifier
-	ReplicationSourceIdentifier string `json:"ReplicationSourceIdentifier,omitempty"`
-
-	// SnapshotIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-snapshotidentifier
-	SnapshotIdentifier string `json:"SnapshotIdentifier,omitempty"`
-
-	// StorageEncrypted AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-storageencrypted
-	StorageEncrypted bool `json:"StorageEncrypted,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// VpcSecurityGroupIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-vpcsecuritygroupids
-	VpcSecurityGroupIds []string `json:"VpcSecurityGroupIds,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRDSDBCluster) AWSCloudFormationType() string {
-	return "AWS::RDS::DBCluster"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRDSDBCluster) MarshalJSON() ([]byte, error) {
-	type Properties AWSRDSDBCluster
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRDSDBCluster) UnmarshalJSON(b []byte) error {
-	type Properties AWSRDSDBCluster
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRDSDBCluster(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRDSDBClusterResources retrieves all AWSRDSDBCluster items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRDSDBClusterResources() map[string]AWSRDSDBCluster {
-	results := map[string]AWSRDSDBCluster{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRDSDBCluster:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBCluster" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBCluster
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRDSDBClusterWithName retrieves all AWSRDSDBCluster items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRDSDBClusterWithName(name string) (AWSRDSDBCluster, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRDSDBCluster:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBCluster" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBCluster
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRDSDBCluster{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbclusterparametergroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbclusterparametergroup.go
deleted file mode 100644
index c048a90ae8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbclusterparametergroup.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRDSDBClusterParameterGroup AWS CloudFormation Resource (AWS::RDS::DBClusterParameterGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbclusterparametergroup.html
-type AWSRDSDBClusterParameterGroup struct {
-
-	// Description AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbclusterparametergroup.html#cfn-rds-dbclusterparametergroup-description
-	Description string `json:"Description,omitempty"`
-
-	// Family AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbclusterparametergroup.html#cfn-rds-dbclusterparametergroup-family
-	Family string `json:"Family,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbclusterparametergroup.html#cfn-rds-dbclusterparametergroup-parameters
-	Parameters interface{} `json:"Parameters,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbclusterparametergroup.html#cfn-rds-dbclusterparametergroup-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRDSDBClusterParameterGroup) AWSCloudFormationType() string {
-	return "AWS::RDS::DBClusterParameterGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRDSDBClusterParameterGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSRDSDBClusterParameterGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRDSDBClusterParameterGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSRDSDBClusterParameterGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRDSDBClusterParameterGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRDSDBClusterParameterGroupResources retrieves all AWSRDSDBClusterParameterGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRDSDBClusterParameterGroupResources() map[string]AWSRDSDBClusterParameterGroup {
-	results := map[string]AWSRDSDBClusterParameterGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRDSDBClusterParameterGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBClusterParameterGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBClusterParameterGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRDSDBClusterParameterGroupWithName retrieves all AWSRDSDBClusterParameterGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRDSDBClusterParameterGroupWithName(name string) (AWSRDSDBClusterParameterGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRDSDBClusterParameterGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBClusterParameterGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBClusterParameterGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRDSDBClusterParameterGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbinstance.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbinstance.go
deleted file mode 100644
index 3ac6ddba76..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbinstance.go
+++ /dev/null
@@ -1,295 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRDSDBInstance AWS CloudFormation Resource (AWS::RDS::DBInstance)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html
-type AWSRDSDBInstance struct {
-
-	// AllocatedStorage AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-allocatedstorage
-	AllocatedStorage string `json:"AllocatedStorage,omitempty"`
-
-	// AllowMajorVersionUpgrade AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-allowmajorversionupgrade
-	AllowMajorVersionUpgrade bool `json:"AllowMajorVersionUpgrade,omitempty"`
-
-	// AutoMinorVersionUpgrade AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-autominorversionupgrade
-	AutoMinorVersionUpgrade bool `json:"AutoMinorVersionUpgrade,omitempty"`
-
-	// AvailabilityZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-availabilityzone
-	AvailabilityZone string `json:"AvailabilityZone,omitempty"`
-
-	// BackupRetentionPeriod AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-backupretentionperiod
-	BackupRetentionPeriod string `json:"BackupRetentionPeriod,omitempty"`
-
-	// CharacterSetName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-charactersetname
-	CharacterSetName string `json:"CharacterSetName,omitempty"`
-
-	// CopyTagsToSnapshot AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-copytagstosnapshot
-	CopyTagsToSnapshot bool `json:"CopyTagsToSnapshot,omitempty"`
-
-	// DBClusterIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbclusteridentifier
-	DBClusterIdentifier string `json:"DBClusterIdentifier,omitempty"`
-
-	// DBInstanceClass AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbinstanceclass
-	DBInstanceClass string `json:"DBInstanceClass,omitempty"`
-
-	// DBInstanceIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbinstanceidentifier
-	DBInstanceIdentifier string `json:"DBInstanceIdentifier,omitempty"`
-
-	// DBName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbname
-	DBName string `json:"DBName,omitempty"`
-
-	// DBParameterGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbparametergroupname
-	DBParameterGroupName string `json:"DBParameterGroupName,omitempty"`
-
-	// DBSecurityGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbsecuritygroups
-	DBSecurityGroups []string `json:"DBSecurityGroups,omitempty"`
-
-	// DBSnapshotIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbsnapshotidentifier
-	DBSnapshotIdentifier string `json:"DBSnapshotIdentifier,omitempty"`
-
-	// DBSubnetGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbsubnetgroupname
-	DBSubnetGroupName string `json:"DBSubnetGroupName,omitempty"`
-
-	// Domain AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-domain
-	Domain string `json:"Domain,omitempty"`
-
-	// DomainIAMRoleName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-domainiamrolename
-	DomainIAMRoleName string `json:"DomainIAMRoleName,omitempty"`
-
-	// Engine AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-engine
-	Engine string `json:"Engine,omitempty"`
-
-	// EngineVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-engineversion
-	EngineVersion string `json:"EngineVersion,omitempty"`
-
-	// Iops AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-iops
-	Iops int `json:"Iops,omitempty"`
-
-	// KmsKeyId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-kmskeyid
-	KmsKeyId string `json:"KmsKeyId,omitempty"`
-
-	// LicenseModel AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-licensemodel
-	LicenseModel string `json:"LicenseModel,omitempty"`
-
-	// MasterUserPassword AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-masteruserpassword
-	MasterUserPassword string `json:"MasterUserPassword,omitempty"`
-
-	// MasterUsername AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-masterusername
-	MasterUsername string `json:"MasterUsername,omitempty"`
-
-	// MonitoringInterval AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-monitoringinterval
-	MonitoringInterval int `json:"MonitoringInterval,omitempty"`
-
-	// MonitoringRoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-monitoringrolearn
-	MonitoringRoleArn string `json:"MonitoringRoleArn,omitempty"`
-
-	// MultiAZ AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-multiaz
-	MultiAZ bool `json:"MultiAZ,omitempty"`
-
-	// OptionGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-optiongroupname
-	OptionGroupName string `json:"OptionGroupName,omitempty"`
-
-	// Port AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-port
-	Port string `json:"Port,omitempty"`
-
-	// PreferredBackupWindow AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-preferredbackupwindow
-	PreferredBackupWindow string `json:"PreferredBackupWindow,omitempty"`
-
-	// PreferredMaintenanceWindow AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-preferredmaintenancewindow
-	PreferredMaintenanceWindow string `json:"PreferredMaintenanceWindow,omitempty"`
-
-	// PubliclyAccessible AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-publiclyaccessible
-	PubliclyAccessible bool `json:"PubliclyAccessible,omitempty"`
-
-	// SourceDBInstanceIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-sourcedbinstanceidentifier
-	SourceDBInstanceIdentifier string `json:"SourceDBInstanceIdentifier,omitempty"`
-
-	// StorageEncrypted AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-storageencrypted
-	StorageEncrypted bool `json:"StorageEncrypted,omitempty"`
-
-	// StorageType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-storagetype
-	StorageType string `json:"StorageType,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// Timezone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-timezone
-	Timezone string `json:"Timezone,omitempty"`
-
-	// VPCSecurityGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-vpcsecuritygroups
-	VPCSecurityGroups []string `json:"VPCSecurityGroups,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRDSDBInstance) AWSCloudFormationType() string {
-	return "AWS::RDS::DBInstance"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRDSDBInstance) MarshalJSON() ([]byte, error) {
-	type Properties AWSRDSDBInstance
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRDSDBInstance) UnmarshalJSON(b []byte) error {
-	type Properties AWSRDSDBInstance
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRDSDBInstance(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRDSDBInstanceResources retrieves all AWSRDSDBInstance items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRDSDBInstanceResources() map[string]AWSRDSDBInstance {
-	results := map[string]AWSRDSDBInstance{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRDSDBInstance:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBInstance" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBInstance
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRDSDBInstanceWithName retrieves all AWSRDSDBInstance items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRDSDBInstanceWithName(name string) (AWSRDSDBInstance, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRDSDBInstance:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBInstance" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBInstance
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRDSDBInstance{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbparametergroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbparametergroup.go
deleted file mode 100644
index 75753c8074..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbparametergroup.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRDSDBParameterGroup AWS CloudFormation Resource (AWS::RDS::DBParameterGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html
-type AWSRDSDBParameterGroup struct {
-
-	// Description AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html#cfn-rds-dbparametergroup-description
-	Description string `json:"Description,omitempty"`
-
-	// Family AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html#cfn-rds-dbparametergroup-family
-	Family string `json:"Family,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html#cfn-rds-dbparametergroup-parameters
-	Parameters map[string]string `json:"Parameters,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html#cfn-rds-dbparametergroup-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRDSDBParameterGroup) AWSCloudFormationType() string {
-	return "AWS::RDS::DBParameterGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRDSDBParameterGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSRDSDBParameterGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRDSDBParameterGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSRDSDBParameterGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRDSDBParameterGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRDSDBParameterGroupResources retrieves all AWSRDSDBParameterGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRDSDBParameterGroupResources() map[string]AWSRDSDBParameterGroup {
-	results := map[string]AWSRDSDBParameterGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRDSDBParameterGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBParameterGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBParameterGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRDSDBParameterGroupWithName retrieves all AWSRDSDBParameterGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRDSDBParameterGroupWithName(name string) (AWSRDSDBParameterGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRDSDBParameterGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBParameterGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBParameterGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRDSDBParameterGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbsecuritygroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbsecuritygroup.go
deleted file mode 100644
index 38afa1dcb1..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbsecuritygroup.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRDSDBSecurityGroup AWS CloudFormation Resource (AWS::RDS::DBSecurityGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group.html
-type AWSRDSDBSecurityGroup struct {
-
-	// DBSecurityGroupIngress AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group.html#cfn-rds-dbsecuritygroup-dbsecuritygroupingress
-	DBSecurityGroupIngress []AWSRDSDBSecurityGroup_Ingress `json:"DBSecurityGroupIngress,omitempty"`
-
-	// EC2VpcId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group.html#cfn-rds-dbsecuritygroup-ec2vpcid
-	EC2VpcId string `json:"EC2VpcId,omitempty"`
-
-	// GroupDescription AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group.html#cfn-rds-dbsecuritygroup-groupdescription
-	GroupDescription string `json:"GroupDescription,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group.html#cfn-rds-dbsecuritygroup-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRDSDBSecurityGroup) AWSCloudFormationType() string {
-	return "AWS::RDS::DBSecurityGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRDSDBSecurityGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSRDSDBSecurityGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRDSDBSecurityGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSRDSDBSecurityGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRDSDBSecurityGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRDSDBSecurityGroupResources retrieves all AWSRDSDBSecurityGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRDSDBSecurityGroupResources() map[string]AWSRDSDBSecurityGroup {
-	results := map[string]AWSRDSDBSecurityGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRDSDBSecurityGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBSecurityGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBSecurityGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRDSDBSecurityGroupWithName retrieves all AWSRDSDBSecurityGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRDSDBSecurityGroupWithName(name string) (AWSRDSDBSecurityGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRDSDBSecurityGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBSecurityGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBSecurityGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRDSDBSecurityGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbsecuritygroup_ingress.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbsecuritygroup_ingress.go
deleted file mode 100644
index f957e16992..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbsecuritygroup_ingress.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSRDSDBSecurityGroup_Ingress AWS CloudFormation Resource (AWS::RDS::DBSecurityGroup.Ingress)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group-rule.html
-type AWSRDSDBSecurityGroup_Ingress struct {
-
-	// CIDRIP AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group-rule.html#cfn-rds-securitygroup-cidrip
-	CIDRIP string `json:"CIDRIP,omitempty"`
-
-	// EC2SecurityGroupId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group-rule.html#cfn-rds-securitygroup-ec2securitygroupid
-	EC2SecurityGroupId string `json:"EC2SecurityGroupId,omitempty"`
-
-	// EC2SecurityGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group-rule.html#cfn-rds-securitygroup-ec2securitygroupname
-	EC2SecurityGroupName string `json:"EC2SecurityGroupName,omitempty"`
-
-	// EC2SecurityGroupOwnerId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group-rule.html#cfn-rds-securitygroup-ec2securitygroupownerid
-	EC2SecurityGroupOwnerId string `json:"EC2SecurityGroupOwnerId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRDSDBSecurityGroup_Ingress) AWSCloudFormationType() string {
-	return "AWS::RDS::DBSecurityGroup.Ingress"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbsecuritygroupingress.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbsecuritygroupingress.go
deleted file mode 100644
index 0d8fa2aed8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbsecuritygroupingress.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRDSDBSecurityGroupIngress AWS CloudFormation Resource (AWS::RDS::DBSecurityGroupIngress)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-security-group-ingress.html
-type AWSRDSDBSecurityGroupIngress struct {
-
-	// CIDRIP AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-security-group-ingress.html#cfn-rds-securitygroup-ingress-cidrip
-	CIDRIP string `json:"CIDRIP,omitempty"`
-
-	// DBSecurityGroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-security-group-ingress.html#cfn-rds-securitygroup-ingress-dbsecuritygroupname
-	DBSecurityGroupName string `json:"DBSecurityGroupName,omitempty"`
-
-	// EC2SecurityGroupId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-security-group-ingress.html#cfn-rds-securitygroup-ingress-ec2securitygroupid
-	EC2SecurityGroupId string `json:"EC2SecurityGroupId,omitempty"`
-
-	// EC2SecurityGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-security-group-ingress.html#cfn-rds-securitygroup-ingress-ec2securitygroupname
-	EC2SecurityGroupName string `json:"EC2SecurityGroupName,omitempty"`
-
-	// EC2SecurityGroupOwnerId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-security-group-ingress.html#cfn-rds-securitygroup-ingress-ec2securitygroupownerid
-	EC2SecurityGroupOwnerId string `json:"EC2SecurityGroupOwnerId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRDSDBSecurityGroupIngress) AWSCloudFormationType() string {
-	return "AWS::RDS::DBSecurityGroupIngress"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRDSDBSecurityGroupIngress) MarshalJSON() ([]byte, error) {
-	type Properties AWSRDSDBSecurityGroupIngress
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRDSDBSecurityGroupIngress) UnmarshalJSON(b []byte) error {
-	type Properties AWSRDSDBSecurityGroupIngress
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRDSDBSecurityGroupIngress(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRDSDBSecurityGroupIngressResources retrieves all AWSRDSDBSecurityGroupIngress items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRDSDBSecurityGroupIngressResources() map[string]AWSRDSDBSecurityGroupIngress {
-	results := map[string]AWSRDSDBSecurityGroupIngress{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRDSDBSecurityGroupIngress:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBSecurityGroupIngress" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBSecurityGroupIngress
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRDSDBSecurityGroupIngressWithName retrieves all AWSRDSDBSecurityGroupIngress items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRDSDBSecurityGroupIngressWithName(name string) (AWSRDSDBSecurityGroupIngress, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRDSDBSecurityGroupIngress:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBSecurityGroupIngress" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBSecurityGroupIngress
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRDSDBSecurityGroupIngress{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbsubnetgroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbsubnetgroup.go
deleted file mode 100644
index 4e48036510..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-dbsubnetgroup.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRDSDBSubnetGroup AWS CloudFormation Resource (AWS::RDS::DBSubnetGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnet-group.html
-type AWSRDSDBSubnetGroup struct {
-
-	// DBSubnetGroupDescription AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnet-group.html#cfn-rds-dbsubnetgroup-dbsubnetgroupdescription
-	DBSubnetGroupDescription string `json:"DBSubnetGroupDescription,omitempty"`
-
-	// SubnetIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnet-group.html#cfn-rds-dbsubnetgroup-subnetids
-	SubnetIds []string `json:"SubnetIds,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnet-group.html#cfn-rds-dbsubnetgroup-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRDSDBSubnetGroup) AWSCloudFormationType() string {
-	return "AWS::RDS::DBSubnetGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRDSDBSubnetGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSRDSDBSubnetGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRDSDBSubnetGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSRDSDBSubnetGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRDSDBSubnetGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRDSDBSubnetGroupResources retrieves all AWSRDSDBSubnetGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRDSDBSubnetGroupResources() map[string]AWSRDSDBSubnetGroup {
-	results := map[string]AWSRDSDBSubnetGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRDSDBSubnetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBSubnetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBSubnetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRDSDBSubnetGroupWithName retrieves all AWSRDSDBSubnetGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRDSDBSubnetGroupWithName(name string) (AWSRDSDBSubnetGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRDSDBSubnetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::DBSubnetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSDBSubnetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRDSDBSubnetGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-eventsubscription.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-eventsubscription.go
deleted file mode 100644
index bf24964c58..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-eventsubscription.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRDSEventSubscription AWS CloudFormation Resource (AWS::RDS::EventSubscription)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html
-type AWSRDSEventSubscription struct {
-
-	// Enabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html#cfn-rds-eventsubscription-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// EventCategories AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html#cfn-rds-eventsubscription-eventcategories
-	EventCategories []string `json:"EventCategories,omitempty"`
-
-	// SnsTopicArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html#cfn-rds-eventsubscription-snstopicarn
-	SnsTopicArn string `json:"SnsTopicArn,omitempty"`
-
-	// SourceIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html#cfn-rds-eventsubscription-sourceids
-	SourceIds []string `json:"SourceIds,omitempty"`
-
-	// SourceType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html#cfn-rds-eventsubscription-sourcetype
-	SourceType string `json:"SourceType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRDSEventSubscription) AWSCloudFormationType() string {
-	return "AWS::RDS::EventSubscription"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRDSEventSubscription) MarshalJSON() ([]byte, error) {
-	type Properties AWSRDSEventSubscription
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRDSEventSubscription) UnmarshalJSON(b []byte) error {
-	type Properties AWSRDSEventSubscription
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRDSEventSubscription(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRDSEventSubscriptionResources retrieves all AWSRDSEventSubscription items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRDSEventSubscriptionResources() map[string]AWSRDSEventSubscription {
-	results := map[string]AWSRDSEventSubscription{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRDSEventSubscription:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::EventSubscription" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSEventSubscription
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRDSEventSubscriptionWithName retrieves all AWSRDSEventSubscription items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRDSEventSubscriptionWithName(name string) (AWSRDSEventSubscription, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRDSEventSubscription:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::EventSubscription" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSEventSubscription
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRDSEventSubscription{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-optiongroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-optiongroup.go
deleted file mode 100644
index 65064052f6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-optiongroup.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRDSOptionGroup AWS CloudFormation Resource (AWS::RDS::OptionGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html
-type AWSRDSOptionGroup struct {
-
-	// EngineName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html#cfn-rds-optiongroup-enginename
-	EngineName string `json:"EngineName,omitempty"`
-
-	// MajorEngineVersion AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html#cfn-rds-optiongroup-majorengineversion
-	MajorEngineVersion string `json:"MajorEngineVersion,omitempty"`
-
-	// OptionConfigurations AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html#cfn-rds-optiongroup-optionconfigurations
-	OptionConfigurations []AWSRDSOptionGroup_OptionConfiguration `json:"OptionConfigurations,omitempty"`
-
-	// OptionGroupDescription AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html#cfn-rds-optiongroup-optiongroupdescription
-	OptionGroupDescription string `json:"OptionGroupDescription,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html#cfn-rds-optiongroup-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRDSOptionGroup) AWSCloudFormationType() string {
-	return "AWS::RDS::OptionGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRDSOptionGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSRDSOptionGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRDSOptionGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSRDSOptionGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRDSOptionGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRDSOptionGroupResources retrieves all AWSRDSOptionGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRDSOptionGroupResources() map[string]AWSRDSOptionGroup {
-	results := map[string]AWSRDSOptionGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRDSOptionGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::OptionGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSOptionGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRDSOptionGroupWithName retrieves all AWSRDSOptionGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRDSOptionGroupWithName(name string) (AWSRDSOptionGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRDSOptionGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::RDS::OptionGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRDSOptionGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRDSOptionGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-optiongroup_optionconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-optiongroup_optionconfiguration.go
deleted file mode 100644
index 39a0b29943..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-optiongroup_optionconfiguration.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSRDSOptionGroup_OptionConfiguration AWS CloudFormation Resource (AWS::RDS::OptionGroup.OptionConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html
-type AWSRDSOptionGroup_OptionConfiguration struct {
-
-	// DBSecurityGroupMemberships AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html#cfn-rds-optiongroup-optionconfigurations-dbsecuritygroupmemberships
-	DBSecurityGroupMemberships []string `json:"DBSecurityGroupMemberships,omitempty"`
-
-	// OptionName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html#cfn-rds-optiongroup-optionconfigurations-optionname
-	OptionName string `json:"OptionName,omitempty"`
-
-	// OptionSettings AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html#cfn-rds-optiongroup-optionconfigurations-optionsettings
-	OptionSettings *AWSRDSOptionGroup_OptionSetting `json:"OptionSettings,omitempty"`
-
-	// OptionVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html#cfn-rds-optiongroup-optionconfiguration-optionversion
-	OptionVersion string `json:"OptionVersion,omitempty"`
-
-	// Port AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html#cfn-rds-optiongroup-optionconfigurations-port
-	Port int `json:"Port,omitempty"`
-
-	// VpcSecurityGroupMemberships AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html#cfn-rds-optiongroup-optionconfigurations-vpcsecuritygroupmemberships
-	VpcSecurityGroupMemberships []string `json:"VpcSecurityGroupMemberships,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRDSOptionGroup_OptionConfiguration) AWSCloudFormationType() string {
-	return "AWS::RDS::OptionGroup.OptionConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-optiongroup_optionsetting.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-optiongroup_optionsetting.go
deleted file mode 100644
index 955206139d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-rds-optiongroup_optionsetting.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSRDSOptionGroup_OptionSetting AWS CloudFormation Resource (AWS::RDS::OptionGroup.OptionSetting)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations-optionsettings.html
-type AWSRDSOptionGroup_OptionSetting struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations-optionsettings.html#cfn-rds-optiongroup-optionconfigurations-optionsettings-name
-	Name string `json:"Name,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations-optionsettings.html#cfn-rds-optiongroup-optionconfigurations-optionsettings-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRDSOptionGroup_OptionSetting) AWSCloudFormationType() string {
-	return "AWS::RDS::OptionGroup.OptionSetting"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-cluster.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-cluster.go
deleted file mode 100644
index 083b756484..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-cluster.go
+++ /dev/null
@@ -1,245 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRedshiftCluster AWS CloudFormation Resource (AWS::Redshift::Cluster)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html
-type AWSRedshiftCluster struct {
-
-	// AllowVersionUpgrade AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-allowversionupgrade
-	AllowVersionUpgrade bool `json:"AllowVersionUpgrade,omitempty"`
-
-	// AutomatedSnapshotRetentionPeriod AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-automatedsnapshotretentionperiod
-	AutomatedSnapshotRetentionPeriod int `json:"AutomatedSnapshotRetentionPeriod,omitempty"`
-
-	// AvailabilityZone AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-availabilityzone
-	AvailabilityZone string `json:"AvailabilityZone,omitempty"`
-
-	// ClusterParameterGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-clusterparametergroupname
-	ClusterParameterGroupName string `json:"ClusterParameterGroupName,omitempty"`
-
-	// ClusterSecurityGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-clustersecuritygroups
-	ClusterSecurityGroups []string `json:"ClusterSecurityGroups,omitempty"`
-
-	// ClusterSubnetGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-clustersubnetgroupname
-	ClusterSubnetGroupName string `json:"ClusterSubnetGroupName,omitempty"`
-
-	// ClusterType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-clustertype
-	ClusterType string `json:"ClusterType,omitempty"`
-
-	// ClusterVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-clusterversion
-	ClusterVersion string `json:"ClusterVersion,omitempty"`
-
-	// DBName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-dbname
-	DBName string `json:"DBName,omitempty"`
-
-	// ElasticIp AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-elasticip
-	ElasticIp string `json:"ElasticIp,omitempty"`
-
-	// Encrypted AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-encrypted
-	Encrypted bool `json:"Encrypted,omitempty"`
-
-	// HsmClientCertificateIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-hsmclientcertidentifier
-	HsmClientCertificateIdentifier string `json:"HsmClientCertificateIdentifier,omitempty"`
-
-	// HsmConfigurationIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-HsmConfigurationIdentifier
-	HsmConfigurationIdentifier string `json:"HsmConfigurationIdentifier,omitempty"`
-
-	// IamRoles AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-iamroles
-	IamRoles []string `json:"IamRoles,omitempty"`
-
-	// KmsKeyId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-kmskeyid
-	KmsKeyId string `json:"KmsKeyId,omitempty"`
-
-	// LoggingProperties AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-loggingproperties
-	LoggingProperties *AWSRedshiftCluster_LoggingProperties `json:"LoggingProperties,omitempty"`
-
-	// MasterUserPassword AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-masteruserpassword
-	MasterUserPassword string `json:"MasterUserPassword,omitempty"`
-
-	// MasterUsername AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-masterusername
-	MasterUsername string `json:"MasterUsername,omitempty"`
-
-	// NodeType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-nodetype
-	NodeType string `json:"NodeType,omitempty"`
-
-	// NumberOfNodes AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-nodetype
-	NumberOfNodes int `json:"NumberOfNodes,omitempty"`
-
-	// OwnerAccount AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-owneraccount
-	OwnerAccount string `json:"OwnerAccount,omitempty"`
-
-	// Port AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-port
-	Port int `json:"Port,omitempty"`
-
-	// PreferredMaintenanceWindow AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-preferredmaintenancewindow
-	PreferredMaintenanceWindow string `json:"PreferredMaintenanceWindow,omitempty"`
-
-	// PubliclyAccessible AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-publiclyaccessible
-	PubliclyAccessible bool `json:"PubliclyAccessible,omitempty"`
-
-	// SnapshotClusterIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-snapshotclusteridentifier
-	SnapshotClusterIdentifier string `json:"SnapshotClusterIdentifier,omitempty"`
-
-	// SnapshotIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-snapshotidentifier
-	SnapshotIdentifier string `json:"SnapshotIdentifier,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// VpcSecurityGroupIds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-vpcsecuritygroupids
-	VpcSecurityGroupIds []string `json:"VpcSecurityGroupIds,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRedshiftCluster) AWSCloudFormationType() string {
-	return "AWS::Redshift::Cluster"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRedshiftCluster) MarshalJSON() ([]byte, error) {
-	type Properties AWSRedshiftCluster
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRedshiftCluster) UnmarshalJSON(b []byte) error {
-	type Properties AWSRedshiftCluster
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRedshiftCluster(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRedshiftClusterResources retrieves all AWSRedshiftCluster items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRedshiftClusterResources() map[string]AWSRedshiftCluster {
-	results := map[string]AWSRedshiftCluster{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRedshiftCluster:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Redshift::Cluster" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRedshiftCluster
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRedshiftClusterWithName retrieves all AWSRedshiftCluster items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRedshiftClusterWithName(name string) (AWSRedshiftCluster, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRedshiftCluster:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Redshift::Cluster" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRedshiftCluster
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRedshiftCluster{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-cluster_loggingproperties.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-cluster_loggingproperties.go
deleted file mode 100644
index b08d0c8983..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-cluster_loggingproperties.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSRedshiftCluster_LoggingProperties AWS CloudFormation Resource (AWS::Redshift::Cluster.LoggingProperties)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-loggingproperties.html
-type AWSRedshiftCluster_LoggingProperties struct {
-
-	// BucketName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-loggingproperties.html#cfn-redshift-cluster-loggingproperties-bucketname
-	BucketName string `json:"BucketName,omitempty"`
-
-	// S3KeyPrefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-loggingproperties.html#cfn-redshift-cluster-loggingproperties-s3keyprefix
-	S3KeyPrefix string `json:"S3KeyPrefix,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRedshiftCluster_LoggingProperties) AWSCloudFormationType() string {
-	return "AWS::Redshift::Cluster.LoggingProperties"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clusterparametergroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clusterparametergroup.go
deleted file mode 100644
index 2e3a878089..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clusterparametergroup.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRedshiftClusterParameterGroup AWS CloudFormation Resource (AWS::Redshift::ClusterParameterGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clusterparametergroup.html
-type AWSRedshiftClusterParameterGroup struct {
-
-	// Description AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clusterparametergroup.html#cfn-redshift-clusterparametergroup-description
-	Description string `json:"Description,omitempty"`
-
-	// ParameterGroupFamily AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clusterparametergroup.html#cfn-redshift-clusterparametergroup-parametergroupfamily
-	ParameterGroupFamily string `json:"ParameterGroupFamily,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clusterparametergroup.html#cfn-redshift-clusterparametergroup-parameters
-	Parameters []AWSRedshiftClusterParameterGroup_Parameter `json:"Parameters,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clusterparametergroup.html#cfn-redshift-clusterparametergroup-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRedshiftClusterParameterGroup) AWSCloudFormationType() string {
-	return "AWS::Redshift::ClusterParameterGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRedshiftClusterParameterGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSRedshiftClusterParameterGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRedshiftClusterParameterGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSRedshiftClusterParameterGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRedshiftClusterParameterGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRedshiftClusterParameterGroupResources retrieves all AWSRedshiftClusterParameterGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRedshiftClusterParameterGroupResources() map[string]AWSRedshiftClusterParameterGroup {
-	results := map[string]AWSRedshiftClusterParameterGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRedshiftClusterParameterGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Redshift::ClusterParameterGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRedshiftClusterParameterGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRedshiftClusterParameterGroupWithName retrieves all AWSRedshiftClusterParameterGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRedshiftClusterParameterGroupWithName(name string) (AWSRedshiftClusterParameterGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRedshiftClusterParameterGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Redshift::ClusterParameterGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRedshiftClusterParameterGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRedshiftClusterParameterGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clusterparametergroup_parameter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clusterparametergroup_parameter.go
deleted file mode 100644
index f917f6d042..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clusterparametergroup_parameter.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSRedshiftClusterParameterGroup_Parameter AWS CloudFormation Resource (AWS::Redshift::ClusterParameterGroup.Parameter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-property-redshift-clusterparametergroup-parameter.html
-type AWSRedshiftClusterParameterGroup_Parameter struct {
-
-	// ParameterName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-property-redshift-clusterparametergroup-parameter.html#cfn-redshift-clusterparametergroup-parameter-parametername
-	ParameterName string `json:"ParameterName,omitempty"`
-
-	// ParameterValue AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-property-redshift-clusterparametergroup-parameter.html#cfn-redshift-clusterparametergroup-parameter-parametervalue
-	ParameterValue string `json:"ParameterValue,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRedshiftClusterParameterGroup_Parameter) AWSCloudFormationType() string {
-	return "AWS::Redshift::ClusterParameterGroup.Parameter"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clustersecuritygroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clustersecuritygroup.go
deleted file mode 100644
index 35f327960d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clustersecuritygroup.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRedshiftClusterSecurityGroup AWS CloudFormation Resource (AWS::Redshift::ClusterSecurityGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroup.html
-type AWSRedshiftClusterSecurityGroup struct {
-
-	// Description AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroup.html#cfn-redshift-clustersecuritygroup-description
-	Description string `json:"Description,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroup.html#cfn-redshift-clustersecuritygroup-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRedshiftClusterSecurityGroup) AWSCloudFormationType() string {
-	return "AWS::Redshift::ClusterSecurityGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRedshiftClusterSecurityGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSRedshiftClusterSecurityGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRedshiftClusterSecurityGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSRedshiftClusterSecurityGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRedshiftClusterSecurityGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRedshiftClusterSecurityGroupResources retrieves all AWSRedshiftClusterSecurityGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRedshiftClusterSecurityGroupResources() map[string]AWSRedshiftClusterSecurityGroup {
-	results := map[string]AWSRedshiftClusterSecurityGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRedshiftClusterSecurityGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Redshift::ClusterSecurityGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRedshiftClusterSecurityGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRedshiftClusterSecurityGroupWithName retrieves all AWSRedshiftClusterSecurityGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRedshiftClusterSecurityGroupWithName(name string) (AWSRedshiftClusterSecurityGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRedshiftClusterSecurityGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Redshift::ClusterSecurityGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRedshiftClusterSecurityGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRedshiftClusterSecurityGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clustersecuritygroupingress.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clustersecuritygroupingress.go
deleted file mode 100644
index a5a1dd72ab..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clustersecuritygroupingress.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRedshiftClusterSecurityGroupIngress AWS CloudFormation Resource (AWS::Redshift::ClusterSecurityGroupIngress)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroupingress.html
-type AWSRedshiftClusterSecurityGroupIngress struct {
-
-	// CIDRIP AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroupingress.html#cfn-redshift-clustersecuritygroupingress-cidrip
-	CIDRIP string `json:"CIDRIP,omitempty"`
-
-	// ClusterSecurityGroupName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroupingress.html#cfn-redshift-clustersecuritygroupingress-clustersecuritygroupname
-	ClusterSecurityGroupName string `json:"ClusterSecurityGroupName,omitempty"`
-
-	// EC2SecurityGroupName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroupingress.html#cfn-redshift-clustersecuritygroupingress-ec2securitygroupname
-	EC2SecurityGroupName string `json:"EC2SecurityGroupName,omitempty"`
-
-	// EC2SecurityGroupOwnerId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroupingress.html#cfn-redshift-clustersecuritygroupingress-ec2securitygroupownerid
-	EC2SecurityGroupOwnerId string `json:"EC2SecurityGroupOwnerId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRedshiftClusterSecurityGroupIngress) AWSCloudFormationType() string {
-	return "AWS::Redshift::ClusterSecurityGroupIngress"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRedshiftClusterSecurityGroupIngress) MarshalJSON() ([]byte, error) {
-	type Properties AWSRedshiftClusterSecurityGroupIngress
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRedshiftClusterSecurityGroupIngress) UnmarshalJSON(b []byte) error {
-	type Properties AWSRedshiftClusterSecurityGroupIngress
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRedshiftClusterSecurityGroupIngress(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRedshiftClusterSecurityGroupIngressResources retrieves all AWSRedshiftClusterSecurityGroupIngress items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRedshiftClusterSecurityGroupIngressResources() map[string]AWSRedshiftClusterSecurityGroupIngress {
-	results := map[string]AWSRedshiftClusterSecurityGroupIngress{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRedshiftClusterSecurityGroupIngress:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Redshift::ClusterSecurityGroupIngress" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRedshiftClusterSecurityGroupIngress
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRedshiftClusterSecurityGroupIngressWithName retrieves all AWSRedshiftClusterSecurityGroupIngress items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRedshiftClusterSecurityGroupIngressWithName(name string) (AWSRedshiftClusterSecurityGroupIngress, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRedshiftClusterSecurityGroupIngress:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Redshift::ClusterSecurityGroupIngress" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRedshiftClusterSecurityGroupIngress
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRedshiftClusterSecurityGroupIngress{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clustersubnetgroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clustersubnetgroup.go
deleted file mode 100644
index 66222aabc3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-redshift-clustersubnetgroup.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRedshiftClusterSubnetGroup AWS CloudFormation Resource (AWS::Redshift::ClusterSubnetGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersubnetgroup.html
-type AWSRedshiftClusterSubnetGroup struct {
-
-	// Description AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersubnetgroup.html#cfn-redshift-clustersubnetgroup-description
-	Description string `json:"Description,omitempty"`
-
-	// SubnetIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersubnetgroup.html#cfn-redshift-clustersubnetgroup-subnetids
-	SubnetIds []string `json:"SubnetIds,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersubnetgroup.html#cfn-redshift-clustersubnetgroup-tags
-	Tags []Tag `json:"Tags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRedshiftClusterSubnetGroup) AWSCloudFormationType() string {
-	return "AWS::Redshift::ClusterSubnetGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRedshiftClusterSubnetGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSRedshiftClusterSubnetGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRedshiftClusterSubnetGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSRedshiftClusterSubnetGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRedshiftClusterSubnetGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRedshiftClusterSubnetGroupResources retrieves all AWSRedshiftClusterSubnetGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRedshiftClusterSubnetGroupResources() map[string]AWSRedshiftClusterSubnetGroup {
-	results := map[string]AWSRedshiftClusterSubnetGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRedshiftClusterSubnetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Redshift::ClusterSubnetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRedshiftClusterSubnetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRedshiftClusterSubnetGroupWithName retrieves all AWSRedshiftClusterSubnetGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRedshiftClusterSubnetGroupWithName(name string) (AWSRedshiftClusterSubnetGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRedshiftClusterSubnetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Redshift::ClusterSubnetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRedshiftClusterSubnetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRedshiftClusterSubnetGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-healthcheck.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-healthcheck.go
deleted file mode 100644
index d70a99c15b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-healthcheck.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRoute53HealthCheck AWS CloudFormation Resource (AWS::Route53::HealthCheck)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-healthcheck.html
-type AWSRoute53HealthCheck struct {
-
-	// HealthCheckConfig AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-healthcheck.html#cfn-route53-healthcheck-healthcheckconfig
-	HealthCheckConfig *AWSRoute53HealthCheck_HealthCheckConfig `json:"HealthCheckConfig,omitempty"`
-
-	// HealthCheckTags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-healthcheck.html#cfn-route53-healthcheck-healthchecktags
-	HealthCheckTags []AWSRoute53HealthCheck_HealthCheckTag `json:"HealthCheckTags,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53HealthCheck) AWSCloudFormationType() string {
-	return "AWS::Route53::HealthCheck"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRoute53HealthCheck) MarshalJSON() ([]byte, error) {
-	type Properties AWSRoute53HealthCheck
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRoute53HealthCheck) UnmarshalJSON(b []byte) error {
-	type Properties AWSRoute53HealthCheck
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRoute53HealthCheck(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRoute53HealthCheckResources retrieves all AWSRoute53HealthCheck items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRoute53HealthCheckResources() map[string]AWSRoute53HealthCheck {
-	results := map[string]AWSRoute53HealthCheck{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRoute53HealthCheck:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Route53::HealthCheck" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRoute53HealthCheck
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRoute53HealthCheckWithName retrieves all AWSRoute53HealthCheck items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRoute53HealthCheckWithName(name string) (AWSRoute53HealthCheck, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRoute53HealthCheck:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Route53::HealthCheck" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRoute53HealthCheck
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRoute53HealthCheck{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-healthcheck_alarmidentifier.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-healthcheck_alarmidentifier.go
deleted file mode 100644
index 61beb61341..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-healthcheck_alarmidentifier.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSRoute53HealthCheck_AlarmIdentifier AWS CloudFormation Resource (AWS::Route53::HealthCheck.AlarmIdentifier)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html
-type AWSRoute53HealthCheck_AlarmIdentifier struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html#cfn-route53-healthcheck-alarmidentifier-name
-	Name string `json:"Name,omitempty"`
-
-	// Region AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html#cfn-route53-healthcheck-alarmidentifier-region
-	Region string `json:"Region,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53HealthCheck_AlarmIdentifier) AWSCloudFormationType() string {
-	return "AWS::Route53::HealthCheck.AlarmIdentifier"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-healthcheck_healthcheckconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-healthcheck_healthcheckconfig.go
deleted file mode 100644
index 3cdc6657d0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-healthcheck_healthcheckconfig.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package cloudformation
-
-// AWSRoute53HealthCheck_HealthCheckConfig AWS CloudFormation Resource (AWS::Route53::HealthCheck.HealthCheckConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html
-type AWSRoute53HealthCheck_HealthCheckConfig struct {
-
-	// AlarmIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-alarmidentifier
-	AlarmIdentifier *AWSRoute53HealthCheck_AlarmIdentifier `json:"AlarmIdentifier,omitempty"`
-
-	// ChildHealthChecks AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-childhealthchecks
-	ChildHealthChecks []string `json:"ChildHealthChecks,omitempty"`
-
-	// EnableSNI AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-enablesni
-	EnableSNI bool `json:"EnableSNI,omitempty"`
-
-	// FailureThreshold AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-failurethreshold
-	FailureThreshold int `json:"FailureThreshold,omitempty"`
-
-	// FullyQualifiedDomainName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-fullyqualifieddomainname
-	FullyQualifiedDomainName string `json:"FullyQualifiedDomainName,omitempty"`
-
-	// HealthThreshold AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-healththreshold
-	HealthThreshold int `json:"HealthThreshold,omitempty"`
-
-	// IPAddress AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-ipaddress
-	IPAddress string `json:"IPAddress,omitempty"`
-
-	// InsufficientDataHealthStatus AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-insufficientdatahealthstatus
-	InsufficientDataHealthStatus string `json:"InsufficientDataHealthStatus,omitempty"`
-
-	// Inverted AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-inverted
-	Inverted bool `json:"Inverted,omitempty"`
-
-	// MeasureLatency AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-measurelatency
-	MeasureLatency bool `json:"MeasureLatency,omitempty"`
-
-	// Port AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-port
-	Port int `json:"Port,omitempty"`
-
-	// RequestInterval AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-requestinterval
-	RequestInterval int `json:"RequestInterval,omitempty"`
-
-	// ResourcePath AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-resourcepath
-	ResourcePath string `json:"ResourcePath,omitempty"`
-
-	// SearchString AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-searchstring
-	SearchString string `json:"SearchString,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53HealthCheck_HealthCheckConfig) AWSCloudFormationType() string {
-	return "AWS::Route53::HealthCheck.HealthCheckConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-healthcheck_healthchecktag.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-healthcheck_healthchecktag.go
deleted file mode 100644
index 7ccec326be..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-healthcheck_healthchecktag.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSRoute53HealthCheck_HealthCheckTag AWS CloudFormation Resource (AWS::Route53::HealthCheck.HealthCheckTag)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthchecktag.html
-type AWSRoute53HealthCheck_HealthCheckTag struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthchecktag.html#cfn-route53-healthchecktags-key
-	Key string `json:"Key,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthchecktag.html#cfn-route53-healthchecktags-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53HealthCheck_HealthCheckTag) AWSCloudFormationType() string {
-	return "AWS::Route53::HealthCheck.HealthCheckTag"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-hostedzone.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-hostedzone.go
deleted file mode 100644
index 1036dc5277..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-hostedzone.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRoute53HostedZone AWS CloudFormation Resource (AWS::Route53::HostedZone)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html
-type AWSRoute53HostedZone struct {
-
-	// HostedZoneConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html#cfn-route53-hostedzone-hostedzoneconfig
-	HostedZoneConfig *AWSRoute53HostedZone_HostedZoneConfig `json:"HostedZoneConfig,omitempty"`
-
-	// HostedZoneTags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html#cfn-route53-hostedzone-hostedzonetags
-	HostedZoneTags []AWSRoute53HostedZone_HostedZoneTag `json:"HostedZoneTags,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html#cfn-route53-hostedzone-name
-	Name string `json:"Name,omitempty"`
-
-	// VPCs AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html#cfn-route53-hostedzone-vpcs
-	VPCs []AWSRoute53HostedZone_VPC `json:"VPCs,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53HostedZone) AWSCloudFormationType() string {
-	return "AWS::Route53::HostedZone"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRoute53HostedZone) MarshalJSON() ([]byte, error) {
-	type Properties AWSRoute53HostedZone
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRoute53HostedZone) UnmarshalJSON(b []byte) error {
-	type Properties AWSRoute53HostedZone
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRoute53HostedZone(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRoute53HostedZoneResources retrieves all AWSRoute53HostedZone items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRoute53HostedZoneResources() map[string]AWSRoute53HostedZone {
-	results := map[string]AWSRoute53HostedZone{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRoute53HostedZone:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Route53::HostedZone" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRoute53HostedZone
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRoute53HostedZoneWithName retrieves all AWSRoute53HostedZone items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRoute53HostedZoneWithName(name string) (AWSRoute53HostedZone, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRoute53HostedZone:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Route53::HostedZone" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRoute53HostedZone
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRoute53HostedZone{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-hostedzone_hostedzoneconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-hostedzone_hostedzoneconfig.go
deleted file mode 100644
index a3b82c0f77..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-hostedzone_hostedzoneconfig.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSRoute53HostedZone_HostedZoneConfig AWS CloudFormation Resource (AWS::Route53::HostedZone.HostedZoneConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-hostedzoneconfig.html
-type AWSRoute53HostedZone_HostedZoneConfig struct {
-
-	// Comment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-hostedzoneconfig.html#cfn-route53-hostedzone-hostedzoneconfig-comment
-	Comment string `json:"Comment,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53HostedZone_HostedZoneConfig) AWSCloudFormationType() string {
-	return "AWS::Route53::HostedZone.HostedZoneConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-hostedzone_hostedzonetag.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-hostedzone_hostedzonetag.go
deleted file mode 100644
index 084c111879..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-hostedzone_hostedzonetag.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSRoute53HostedZone_HostedZoneTag AWS CloudFormation Resource (AWS::Route53::HostedZone.HostedZoneTag)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-hostedzonetags.html
-type AWSRoute53HostedZone_HostedZoneTag struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-hostedzonetags.html#cfn-route53-hostedzonetags-key
-	Key string `json:"Key,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-hostedzonetags.html#cfn-route53-hostedzonetags-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53HostedZone_HostedZoneTag) AWSCloudFormationType() string {
-	return "AWS::Route53::HostedZone.HostedZoneTag"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-hostedzone_vpc.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-hostedzone_vpc.go
deleted file mode 100644
index ada44ed7ae..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-hostedzone_vpc.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSRoute53HostedZone_VPC AWS CloudFormation Resource (AWS::Route53::HostedZone.VPC)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone-hostedzonevpcs.html
-type AWSRoute53HostedZone_VPC struct {
-
-	// VPCId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone-hostedzonevpcs.html#cfn-route53-hostedzone-hostedzonevpcs-vpcid
-	VPCId string `json:"VPCId,omitempty"`
-
-	// VPCRegion AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone-hostedzonevpcs.html#cfn-route53-hostedzone-hostedzonevpcs-vpcregion
-	VPCRegion string `json:"VPCRegion,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53HostedZone_VPC) AWSCloudFormationType() string {
-	return "AWS::Route53::HostedZone.VPC"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordset.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordset.go
deleted file mode 100644
index 0acf7b3128..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordset.go
+++ /dev/null
@@ -1,175 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRoute53RecordSet AWS CloudFormation Resource (AWS::Route53::RecordSet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html
-type AWSRoute53RecordSet struct {
-
-	// AliasTarget AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-aliastarget
-	AliasTarget *AWSRoute53RecordSet_AliasTarget `json:"AliasTarget,omitempty"`
-
-	// Comment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-comment
-	Comment string `json:"Comment,omitempty"`
-
-	// Failover AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-failover
-	Failover string `json:"Failover,omitempty"`
-
-	// GeoLocation AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-geolocation
-	GeoLocation *AWSRoute53RecordSet_GeoLocation `json:"GeoLocation,omitempty"`
-
-	// HealthCheckId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-healthcheckid
-	HealthCheckId string `json:"HealthCheckId,omitempty"`
-
-	// HostedZoneId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-hostedzoneid
-	HostedZoneId string `json:"HostedZoneId,omitempty"`
-
-	// HostedZoneName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-hostedzonename
-	HostedZoneName string `json:"HostedZoneName,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-name
-	Name string `json:"Name,omitempty"`
-
-	// Region AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-region
-	Region string `json:"Region,omitempty"`
-
-	// ResourceRecords AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-resourcerecords
-	ResourceRecords []string `json:"ResourceRecords,omitempty"`
-
-	// SetIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-setidentifier
-	SetIdentifier string `json:"SetIdentifier,omitempty"`
-
-	// TTL AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-ttl
-	TTL string `json:"TTL,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-type
-	Type string `json:"Type,omitempty"`
-
-	// Weight AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-weight
-	Weight int `json:"Weight,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53RecordSet) AWSCloudFormationType() string {
-	return "AWS::Route53::RecordSet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRoute53RecordSet) MarshalJSON() ([]byte, error) {
-	type Properties AWSRoute53RecordSet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRoute53RecordSet) UnmarshalJSON(b []byte) error {
-	type Properties AWSRoute53RecordSet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRoute53RecordSet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRoute53RecordSetResources retrieves all AWSRoute53RecordSet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRoute53RecordSetResources() map[string]AWSRoute53RecordSet {
-	results := map[string]AWSRoute53RecordSet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRoute53RecordSet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Route53::RecordSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRoute53RecordSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRoute53RecordSetWithName retrieves all AWSRoute53RecordSet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRoute53RecordSetWithName(name string) (AWSRoute53RecordSet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRoute53RecordSet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Route53::RecordSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRoute53RecordSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRoute53RecordSet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordset_aliastarget.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordset_aliastarget.go
deleted file mode 100644
index 8c0abca629..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordset_aliastarget.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSRoute53RecordSet_AliasTarget AWS CloudFormation Resource (AWS::Route53::RecordSet.AliasTarget)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html
-type AWSRoute53RecordSet_AliasTarget struct {
-
-	// DNSName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html#cfn-route53-aliastarget-dnshostname
-	DNSName string `json:"DNSName,omitempty"`
-
-	// EvaluateTargetHealth AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html#cfn-route53-aliastarget-evaluatetargethealth
-	EvaluateTargetHealth bool `json:"EvaluateTargetHealth,omitempty"`
-
-	// HostedZoneId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html#cfn-route53-aliastarget-hostedzoneid
-	HostedZoneId string `json:"HostedZoneId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53RecordSet_AliasTarget) AWSCloudFormationType() string {
-	return "AWS::Route53::RecordSet.AliasTarget"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordset_geolocation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordset_geolocation.go
deleted file mode 100644
index de96568b17..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordset_geolocation.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSRoute53RecordSet_GeoLocation AWS CloudFormation Resource (AWS::Route53::RecordSet.GeoLocation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html
-type AWSRoute53RecordSet_GeoLocation struct {
-
-	// ContinentCode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html#cfn-route53-recordset-geolocation-continentcode
-	ContinentCode string `json:"ContinentCode,omitempty"`
-
-	// CountryCode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html#cfn-route53-recordset-geolocation-countrycode
-	CountryCode string `json:"CountryCode,omitempty"`
-
-	// SubdivisionCode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html#cfn-route53-recordset-geolocation-subdivisioncode
-	SubdivisionCode string `json:"SubdivisionCode,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53RecordSet_GeoLocation) AWSCloudFormationType() string {
-	return "AWS::Route53::RecordSet.GeoLocation"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordsetgroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordsetgroup.go
deleted file mode 100644
index 86992701e7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordsetgroup.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSRoute53RecordSetGroup AWS CloudFormation Resource (AWS::Route53::RecordSetGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordsetgroup.html
-type AWSRoute53RecordSetGroup struct {
-
-	// Comment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordsetgroup.html#cfn-route53-recordsetgroup-comment
-	Comment string `json:"Comment,omitempty"`
-
-	// HostedZoneId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordsetgroup.html#cfn-route53-recordsetgroup-hostedzoneid
-	HostedZoneId string `json:"HostedZoneId,omitempty"`
-
-	// HostedZoneName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordsetgroup.html#cfn-route53-recordsetgroup-hostedzonename
-	HostedZoneName string `json:"HostedZoneName,omitempty"`
-
-	// RecordSets AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordsetgroup.html#cfn-route53-recordsetgroup-recordsets
-	RecordSets []AWSRoute53RecordSetGroup_RecordSet `json:"RecordSets,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53RecordSetGroup) AWSCloudFormationType() string {
-	return "AWS::Route53::RecordSetGroup"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSRoute53RecordSetGroup) MarshalJSON() ([]byte, error) {
-	type Properties AWSRoute53RecordSetGroup
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSRoute53RecordSetGroup) UnmarshalJSON(b []byte) error {
-	type Properties AWSRoute53RecordSetGroup
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSRoute53RecordSetGroup(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSRoute53RecordSetGroupResources retrieves all AWSRoute53RecordSetGroup items from an AWS CloudFormation template
-func (t *Template) GetAllAWSRoute53RecordSetGroupResources() map[string]AWSRoute53RecordSetGroup {
-	results := map[string]AWSRoute53RecordSetGroup{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSRoute53RecordSetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Route53::RecordSetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRoute53RecordSetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSRoute53RecordSetGroupWithName retrieves all AWSRoute53RecordSetGroup items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSRoute53RecordSetGroupWithName(name string) (AWSRoute53RecordSetGroup, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSRoute53RecordSetGroup:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Route53::RecordSetGroup" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSRoute53RecordSetGroup
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSRoute53RecordSetGroup{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordsetgroup_aliastarget.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordsetgroup_aliastarget.go
deleted file mode 100644
index 39e570418d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordsetgroup_aliastarget.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSRoute53RecordSetGroup_AliasTarget AWS CloudFormation Resource (AWS::Route53::RecordSetGroup.AliasTarget)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html
-type AWSRoute53RecordSetGroup_AliasTarget struct {
-
-	// DNSName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html#cfn-route53-aliastarget-dnshostname
-	DNSName string `json:"DNSName,omitempty"`
-
-	// EvaluateTargetHealth AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html#cfn-route53-aliastarget-evaluatetargethealth
-	EvaluateTargetHealth bool `json:"EvaluateTargetHealth,omitempty"`
-
-	// HostedZoneId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html#cfn-route53-aliastarget-hostedzoneid
-	HostedZoneId string `json:"HostedZoneId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53RecordSetGroup_AliasTarget) AWSCloudFormationType() string {
-	return "AWS::Route53::RecordSetGroup.AliasTarget"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordsetgroup_geolocation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordsetgroup_geolocation.go
deleted file mode 100644
index e7c1b581b3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordsetgroup_geolocation.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSRoute53RecordSetGroup_GeoLocation AWS CloudFormation Resource (AWS::Route53::RecordSetGroup.GeoLocation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html
-type AWSRoute53RecordSetGroup_GeoLocation struct {
-
-	// ContinentCode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html#cfn-route53-recordsetgroup-geolocation-continentcode
-	ContinentCode string `json:"ContinentCode,omitempty"`
-
-	// CountryCode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html#cfn-route53-recordset-geolocation-countrycode
-	CountryCode string `json:"CountryCode,omitempty"`
-
-	// SubdivisionCode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html#cfn-route53-recordset-geolocation-subdivisioncode
-	SubdivisionCode string `json:"SubdivisionCode,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53RecordSetGroup_GeoLocation) AWSCloudFormationType() string {
-	return "AWS::Route53::RecordSetGroup.GeoLocation"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordsetgroup_recordset.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordsetgroup_recordset.go
deleted file mode 100644
index 14981aa79d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-route53-recordsetgroup_recordset.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package cloudformation
-
-// AWSRoute53RecordSetGroup_RecordSet AWS CloudFormation Resource (AWS::Route53::RecordSetGroup.RecordSet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html
-type AWSRoute53RecordSetGroup_RecordSet struct {
-
-	// AliasTarget AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-aliastarget
-	AliasTarget *AWSRoute53RecordSetGroup_AliasTarget `json:"AliasTarget,omitempty"`
-
-	// Comment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-comment
-	Comment string `json:"Comment,omitempty"`
-
-	// Failover AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-failover
-	Failover string `json:"Failover,omitempty"`
-
-	// GeoLocation AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-geolocation
-	GeoLocation *AWSRoute53RecordSetGroup_GeoLocation `json:"GeoLocation,omitempty"`
-
-	// HealthCheckId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-healthcheckid
-	HealthCheckId string `json:"HealthCheckId,omitempty"`
-
-	// HostedZoneId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-hostedzoneid
-	HostedZoneId string `json:"HostedZoneId,omitempty"`
-
-	// HostedZoneName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-hostedzonename
-	HostedZoneName string `json:"HostedZoneName,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-name
-	Name string `json:"Name,omitempty"`
-
-	// Region AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-region
-	Region string `json:"Region,omitempty"`
-
-	// ResourceRecords AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-resourcerecords
-	ResourceRecords []string `json:"ResourceRecords,omitempty"`
-
-	// SetIdentifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-setidentifier
-	SetIdentifier string `json:"SetIdentifier,omitempty"`
-
-	// TTL AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-ttl
-	TTL string `json:"TTL,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-type
-	Type string `json:"Type,omitempty"`
-
-	// Weight AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-weight
-	Weight int `json:"Weight,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSRoute53RecordSetGroup_RecordSet) AWSCloudFormationType() string {
-	return "AWS::Route53::RecordSetGroup.RecordSet"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket.go
deleted file mode 100644
index 6efde767f7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket.go
+++ /dev/null
@@ -1,175 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSS3Bucket AWS CloudFormation Resource (AWS::S3::Bucket)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html
-type AWSS3Bucket struct {
-
-	// AccelerateConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-accelerateconfiguration
-	AccelerateConfiguration *AWSS3Bucket_AccelerateConfiguration `json:"AccelerateConfiguration,omitempty"`
-
-	// AccessControl AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-accesscontrol
-	AccessControl string `json:"AccessControl,omitempty"`
-
-	// AnalyticsConfigurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-analyticsconfigurations
-	AnalyticsConfigurations []AWSS3Bucket_AnalyticsConfiguration `json:"AnalyticsConfigurations,omitempty"`
-
-	// BucketName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-name
-	BucketName string `json:"BucketName,omitempty"`
-
-	// CorsConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-crossoriginconfig
-	CorsConfiguration *AWSS3Bucket_CorsConfiguration `json:"CorsConfiguration,omitempty"`
-
-	// InventoryConfigurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-inventoryconfigurations
-	InventoryConfigurations []AWSS3Bucket_InventoryConfiguration `json:"InventoryConfigurations,omitempty"`
-
-	// LifecycleConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-lifecycleconfig
-	LifecycleConfiguration *AWSS3Bucket_LifecycleConfiguration `json:"LifecycleConfiguration,omitempty"`
-
-	// LoggingConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-loggingconfig
-	LoggingConfiguration *AWSS3Bucket_LoggingConfiguration `json:"LoggingConfiguration,omitempty"`
-
-	// MetricsConfigurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-metricsconfigurations
-	MetricsConfigurations []AWSS3Bucket_MetricsConfiguration `json:"MetricsConfigurations,omitempty"`
-
-	// NotificationConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-notification
-	NotificationConfiguration *AWSS3Bucket_NotificationConfiguration `json:"NotificationConfiguration,omitempty"`
-
-	// ReplicationConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-replicationconfiguration
-	ReplicationConfiguration *AWSS3Bucket_ReplicationConfiguration `json:"ReplicationConfiguration,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-tags
-	Tags []Tag `json:"Tags,omitempty"`
-
-	// VersioningConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-versioning
-	VersioningConfiguration *AWSS3Bucket_VersioningConfiguration `json:"VersioningConfiguration,omitempty"`
-
-	// WebsiteConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-websiteconfiguration
-	WebsiteConfiguration *AWSS3Bucket_WebsiteConfiguration `json:"WebsiteConfiguration,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSS3Bucket) MarshalJSON() ([]byte, error) {
-	type Properties AWSS3Bucket
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSS3Bucket) UnmarshalJSON(b []byte) error {
-	type Properties AWSS3Bucket
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSS3Bucket(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSS3BucketResources retrieves all AWSS3Bucket items from an AWS CloudFormation template
-func (t *Template) GetAllAWSS3BucketResources() map[string]AWSS3Bucket {
-	results := map[string]AWSS3Bucket{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSS3Bucket:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::S3::Bucket" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSS3Bucket
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSS3BucketWithName retrieves all AWSS3Bucket items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSS3BucketWithName(name string) (AWSS3Bucket, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSS3Bucket:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::S3::Bucket" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSS3Bucket
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSS3Bucket{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_abortincompletemultipartupload.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_abortincompletemultipartupload.go
deleted file mode 100644
index 724e760953..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_abortincompletemultipartupload.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_AbortIncompleteMultipartUpload AWS CloudFormation Resource (AWS::S3::Bucket.AbortIncompleteMultipartUpload)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-abortincompletemultipartupload.html
-type AWSS3Bucket_AbortIncompleteMultipartUpload struct {
-
-	// DaysAfterInitiation AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-abortincompletemultipartupload.html#cfn-s3-bucket-abortincompletemultipartupload-daysafterinitiation
-	DaysAfterInitiation int `json:"DaysAfterInitiation,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_AbortIncompleteMultipartUpload) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.AbortIncompleteMultipartUpload"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_accelerateconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_accelerateconfiguration.go
deleted file mode 100644
index d2167e5a24..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_accelerateconfiguration.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_AccelerateConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.AccelerateConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-accelerateconfiguration.html
-type AWSS3Bucket_AccelerateConfiguration struct {
-
-	// AccelerationStatus AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-accelerateconfiguration.html#cfn-s3-bucket-accelerateconfiguration-accelerationstatus
-	AccelerationStatus string `json:"AccelerationStatus,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_AccelerateConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.AccelerateConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_analyticsconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_analyticsconfiguration.go
deleted file mode 100644
index ada22b0106..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_analyticsconfiguration.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_AnalyticsConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.AnalyticsConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-analyticsconfiguration.html
-type AWSS3Bucket_AnalyticsConfiguration struct {
-
-	// Id AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-analyticsconfiguration.html#cfn-s3-bucket-analyticsconfiguration-id
-	Id string `json:"Id,omitempty"`
-
-	// Prefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-analyticsconfiguration.html#cfn-s3-bucket-analyticsconfiguration-prefix
-	Prefix string `json:"Prefix,omitempty"`
-
-	// StorageClassAnalysis AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-analyticsconfiguration.html#cfn-s3-bucket-analyticsconfiguration-storageclassanalysis
-	StorageClassAnalysis *AWSS3Bucket_StorageClassAnalysis `json:"StorageClassAnalysis,omitempty"`
-
-	// TagFilters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-analyticsconfiguration.html#cfn-s3-bucket-analyticsconfiguration-tagfilters
-	TagFilters []AWSS3Bucket_TagFilter `json:"TagFilters,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_AnalyticsConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.AnalyticsConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_corsconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_corsconfiguration.go
deleted file mode 100644
index 0a6699cace..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_corsconfiguration.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_CorsConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.CorsConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors.html
-type AWSS3Bucket_CorsConfiguration struct {
-
-	// CorsRules AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors.html#cfn-s3-bucket-cors-corsrule
-	CorsRules []AWSS3Bucket_CorsRule `json:"CorsRules,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_CorsConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.CorsConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_corsrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_corsrule.go
deleted file mode 100644
index 9ea5b6d670..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_corsrule.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_CorsRule AWS CloudFormation Resource (AWS::S3::Bucket.CorsRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html
-type AWSS3Bucket_CorsRule struct {
-
-	// AllowedHeaders AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html#cfn-s3-bucket-cors-corsrule-allowedheaders
-	AllowedHeaders []string `json:"AllowedHeaders,omitempty"`
-
-	// AllowedMethods AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html#cfn-s3-bucket-cors-corsrule-allowedmethods
-	AllowedMethods []string `json:"AllowedMethods,omitempty"`
-
-	// AllowedOrigins AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html#cfn-s3-bucket-cors-corsrule-allowedorigins
-	AllowedOrigins []string `json:"AllowedOrigins,omitempty"`
-
-	// ExposedHeaders AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html#cfn-s3-bucket-cors-corsrule-exposedheaders
-	ExposedHeaders []string `json:"ExposedHeaders,omitempty"`
-
-	// Id AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html#cfn-s3-bucket-cors-corsrule-id
-	Id string `json:"Id,omitempty"`
-
-	// MaxAge AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html#cfn-s3-bucket-cors-corsrule-maxage
-	MaxAge int `json:"MaxAge,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_CorsRule) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.CorsRule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_dataexport.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_dataexport.go
deleted file mode 100644
index 66fbe3caef..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_dataexport.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_DataExport AWS CloudFormation Resource (AWS::S3::Bucket.DataExport)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-dataexport.html
-type AWSS3Bucket_DataExport struct {
-
-	// Destination AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-dataexport.html#cfn-s3-bucket-dataexport-destination
-	Destination *AWSS3Bucket_Destination `json:"Destination,omitempty"`
-
-	// OutputSchemaVersion AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-dataexport.html#cfn-s3-bucket-dataexport-outputschemaversion
-	OutputSchemaVersion string `json:"OutputSchemaVersion,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_DataExport) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.DataExport"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_destination.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_destination.go
deleted file mode 100644
index ada48703b2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_destination.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_Destination AWS CloudFormation Resource (AWS::S3::Bucket.Destination)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-destination.html
-type AWSS3Bucket_Destination struct {
-
-	// BucketAccountId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-destination.html#cfn-s3-bucket-destination-bucketaccountid
-	BucketAccountId string `json:"BucketAccountId,omitempty"`
-
-	// BucketArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-destination.html#cfn-s3-bucket-destination-bucketarn
-	BucketArn string `json:"BucketArn,omitempty"`
-
-	// Format AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-destination.html#cfn-s3-bucket-destination-format
-	Format string `json:"Format,omitempty"`
-
-	// Prefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-destination.html#cfn-s3-bucket-destination-prefix
-	Prefix string `json:"Prefix,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_Destination) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.Destination"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_filterrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_filterrule.go
deleted file mode 100644
index 451ec289eb..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_filterrule.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_FilterRule AWS CloudFormation Resource (AWS::S3::Bucket.FilterRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key-rules.html
-type AWSS3Bucket_FilterRule struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key-rules.html#cfn-s3-bucket-notificationconfiguraiton-config-filter-s3key-rules-name
-	Name string `json:"Name,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key-rules.html#cfn-s3-bucket-notificationconfiguraiton-config-filter-s3key-rules-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_FilterRule) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.FilterRule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_inventoryconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_inventoryconfiguration.go
deleted file mode 100644
index 2853be67ff..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_inventoryconfiguration.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_InventoryConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.InventoryConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html
-type AWSS3Bucket_InventoryConfiguration struct {
-
-	// Destination AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-destination
-	Destination *AWSS3Bucket_Destination `json:"Destination,omitempty"`
-
-	// Enabled AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-enabled
-	Enabled bool `json:"Enabled,omitempty"`
-
-	// Id AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-id
-	Id string `json:"Id,omitempty"`
-
-	// IncludedObjectVersions AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-includedobjectversions
-	IncludedObjectVersions string `json:"IncludedObjectVersions,omitempty"`
-
-	// OptionalFields AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-optionalfields
-	OptionalFields []string `json:"OptionalFields,omitempty"`
-
-	// Prefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-prefix
-	Prefix string `json:"Prefix,omitempty"`
-
-	// ScheduleFrequency AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-schedulefrequency
-	ScheduleFrequency string `json:"ScheduleFrequency,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_InventoryConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.InventoryConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_lambdaconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_lambdaconfiguration.go
deleted file mode 100644
index c18724661b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_lambdaconfiguration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_LambdaConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.LambdaConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-lambdaconfig.html
-type AWSS3Bucket_LambdaConfiguration struct {
-
-	// Event AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-lambdaconfig.html#cfn-s3-bucket-notificationconfig-lambdaconfig-event
-	Event string `json:"Event,omitempty"`
-
-	// Filter AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-lambdaconfig.html#cfn-s3-bucket-notificationconfig-lambdaconfig-filter
-	Filter *AWSS3Bucket_NotificationFilter `json:"Filter,omitempty"`
-
-	// Function AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-lambdaconfig.html#cfn-s3-bucket-notificationconfig-lambdaconfig-function
-	Function string `json:"Function,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_LambdaConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.LambdaConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_lifecycleconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_lifecycleconfiguration.go
deleted file mode 100644
index d9bb503de3..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_lifecycleconfiguration.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_LifecycleConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.LifecycleConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig.html
-type AWSS3Bucket_LifecycleConfiguration struct {
-
-	// Rules AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig.html#cfn-s3-bucket-lifecycleconfig-rules
-	Rules []AWSS3Bucket_Rule `json:"Rules,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_LifecycleConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.LifecycleConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_loggingconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_loggingconfiguration.go
deleted file mode 100644
index c8e3b61655..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_loggingconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_LoggingConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.LoggingConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-loggingconfig.html
-type AWSS3Bucket_LoggingConfiguration struct {
-
-	// DestinationBucketName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-loggingconfig.html#cfn-s3-bucket-loggingconfig-destinationbucketname
-	DestinationBucketName string `json:"DestinationBucketName,omitempty"`
-
-	// LogFilePrefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-loggingconfig.html#cfn-s3-bucket-loggingconfig-logfileprefix
-	LogFilePrefix string `json:"LogFilePrefix,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_LoggingConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.LoggingConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_metricsconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_metricsconfiguration.go
deleted file mode 100644
index a1197bfbb8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_metricsconfiguration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_MetricsConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.MetricsConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-metricsconfiguration.html
-type AWSS3Bucket_MetricsConfiguration struct {
-
-	// Id AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-metricsconfiguration.html#cfn-s3-bucket-metricsconfiguration-id
-	Id string `json:"Id,omitempty"`
-
-	// Prefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-metricsconfiguration.html#cfn-s3-bucket-metricsconfiguration-prefix
-	Prefix string `json:"Prefix,omitempty"`
-
-	// TagFilters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-metricsconfiguration.html#cfn-s3-bucket-metricsconfiguration-tagfilters
-	TagFilters []AWSS3Bucket_TagFilter `json:"TagFilters,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_MetricsConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.MetricsConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_noncurrentversiontransition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_noncurrentversiontransition.go
deleted file mode 100644
index fd7c988957..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_noncurrentversiontransition.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_NoncurrentVersionTransition AWS CloudFormation Resource (AWS::S3::Bucket.NoncurrentVersionTransition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition.html
-type AWSS3Bucket_NoncurrentVersionTransition struct {
-
-	// StorageClass AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition-storageclass
-	StorageClass string `json:"StorageClass,omitempty"`
-
-	// TransitionInDays AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition-transitionindays
-	TransitionInDays int `json:"TransitionInDays,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_NoncurrentVersionTransition) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.NoncurrentVersionTransition"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_notificationconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_notificationconfiguration.go
deleted file mode 100644
index cf2e8f087f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_notificationconfiguration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_NotificationConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.NotificationConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig.html
-type AWSS3Bucket_NotificationConfiguration struct {
-
-	// LambdaConfigurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig.html#cfn-s3-bucket-notificationconfig-lambdaconfig
-	LambdaConfigurations []AWSS3Bucket_LambdaConfiguration `json:"LambdaConfigurations,omitempty"`
-
-	// QueueConfigurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig.html#cfn-s3-bucket-notificationconfig-queueconfig
-	QueueConfigurations []AWSS3Bucket_QueueConfiguration `json:"QueueConfigurations,omitempty"`
-
-	// TopicConfigurations AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig.html#cfn-s3-bucket-notificationconfig-topicconfig
-	TopicConfigurations []AWSS3Bucket_TopicConfiguration `json:"TopicConfigurations,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_NotificationConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.NotificationConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_notificationfilter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_notificationfilter.go
deleted file mode 100644
index 09ba33412b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_notificationfilter.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_NotificationFilter AWS CloudFormation Resource (AWS::S3::Bucket.NotificationFilter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html
-type AWSS3Bucket_NotificationFilter struct {
-
-	// S3Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html#cfn-s3-bucket-notificationconfiguraiton-config-filter-s3key
-	S3Key *AWSS3Bucket_S3KeyFilter `json:"S3Key,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_NotificationFilter) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.NotificationFilter"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_queueconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_queueconfiguration.go
deleted file mode 100644
index 9f8d865445..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_queueconfiguration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_QueueConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.QueueConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-queueconfig.html
-type AWSS3Bucket_QueueConfiguration struct {
-
-	// Event AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-queueconfig.html#cfn-s3-bucket-notificationconfig-queueconfig-event
-	Event string `json:"Event,omitempty"`
-
-	// Filter AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-queueconfig.html#cfn-s3-bucket-notificationconfig-queueconfig-filter
-	Filter *AWSS3Bucket_NotificationFilter `json:"Filter,omitempty"`
-
-	// Queue AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-queueconfig.html#cfn-s3-bucket-notificationconfig-queueconfig-queue
-	Queue string `json:"Queue,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_QueueConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.QueueConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_redirectallrequeststo.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_redirectallrequeststo.go
deleted file mode 100644
index 37114b7ac9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_redirectallrequeststo.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_RedirectAllRequestsTo AWS CloudFormation Resource (AWS::S3::Bucket.RedirectAllRequestsTo)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-redirectallrequeststo.html
-type AWSS3Bucket_RedirectAllRequestsTo struct {
-
-	// HostName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-redirectallrequeststo.html#cfn-s3-websiteconfiguration-redirectallrequeststo-hostname
-	HostName string `json:"HostName,omitempty"`
-
-	// Protocol AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-redirectallrequeststo.html#cfn-s3-websiteconfiguration-redirectallrequeststo-protocol
-	Protocol string `json:"Protocol,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_RedirectAllRequestsTo) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.RedirectAllRequestsTo"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_redirectrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_redirectrule.go
deleted file mode 100644
index 348e4466d5..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_redirectrule.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_RedirectRule AWS CloudFormation Resource (AWS::S3::Bucket.RedirectRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html
-type AWSS3Bucket_RedirectRule struct {
-
-	// HostName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html#cfn-s3-websiteconfiguration-redirectrule-hostname
-	HostName string `json:"HostName,omitempty"`
-
-	// HttpRedirectCode AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html#cfn-s3-websiteconfiguration-redirectrule-httpredirectcode
-	HttpRedirectCode string `json:"HttpRedirectCode,omitempty"`
-
-	// Protocol AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html#cfn-s3-websiteconfiguration-redirectrule-protocol
-	Protocol string `json:"Protocol,omitempty"`
-
-	// ReplaceKeyPrefixWith AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html#cfn-s3-websiteconfiguration-redirectrule-replacekeyprefixwith
-	ReplaceKeyPrefixWith string `json:"ReplaceKeyPrefixWith,omitempty"`
-
-	// ReplaceKeyWith AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html#cfn-s3-websiteconfiguration-redirectrule-replacekeywith
-	ReplaceKeyWith string `json:"ReplaceKeyWith,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_RedirectRule) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.RedirectRule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_replicationconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_replicationconfiguration.go
deleted file mode 100644
index a15826e27e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_replicationconfiguration.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_ReplicationConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration.html
-type AWSS3Bucket_ReplicationConfiguration struct {
-
-	// Role AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration.html#cfn-s3-bucket-replicationconfiguration-role
-	Role string `json:"Role,omitempty"`
-
-	// Rules AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration.html#cfn-s3-bucket-replicationconfiguration-rules
-	Rules []AWSS3Bucket_ReplicationRule `json:"Rules,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_ReplicationConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.ReplicationConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_replicationdestination.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_replicationdestination.go
deleted file mode 100644
index 8faf383c3c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_replicationdestination.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_ReplicationDestination AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationDestination)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules-destination.html
-type AWSS3Bucket_ReplicationDestination struct {
-
-	// Bucket AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules-destination.html#cfn-s3-bucket-replicationconfiguration-rules-destination-bucket
-	Bucket string `json:"Bucket,omitempty"`
-
-	// StorageClass AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules-destination.html#cfn-s3-bucket-replicationconfiguration-rules-destination-storageclass
-	StorageClass string `json:"StorageClass,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_ReplicationDestination) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.ReplicationDestination"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_replicationrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_replicationrule.go
deleted file mode 100644
index edcbb5e946..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_replicationrule.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_ReplicationRule AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html
-type AWSS3Bucket_ReplicationRule struct {
-
-	// Destination AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html#cfn-s3-bucket-replicationconfiguration-rules-destination
-	Destination *AWSS3Bucket_ReplicationDestination `json:"Destination,omitempty"`
-
-	// Id AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html#cfn-s3-bucket-replicationconfiguration-rules-id
-	Id string `json:"Id,omitempty"`
-
-	// Prefix AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html#cfn-s3-bucket-replicationconfiguration-rules-prefix
-	Prefix string `json:"Prefix,omitempty"`
-
-	// Status AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html#cfn-s3-bucket-replicationconfiguration-rules-status
-	Status string `json:"Status,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_ReplicationRule) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.ReplicationRule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_routingrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_routingrule.go
deleted file mode 100644
index e13b8903d9..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_routingrule.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_RoutingRule AWS CloudFormation Resource (AWS::S3::Bucket.RoutingRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules.html
-type AWSS3Bucket_RoutingRule struct {
-
-	// RedirectRule AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules.html#cfn-s3-websiteconfiguration-routingrules-redirectrule
-	RedirectRule *AWSS3Bucket_RedirectRule `json:"RedirectRule,omitempty"`
-
-	// RoutingRuleCondition AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules.html#cfn-s3-websiteconfiguration-routingrules-routingrulecondition
-	RoutingRuleCondition *AWSS3Bucket_RoutingRuleCondition `json:"RoutingRuleCondition,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_RoutingRule) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.RoutingRule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_routingrulecondition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_routingrulecondition.go
deleted file mode 100644
index ee5d46a76a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_routingrulecondition.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_RoutingRuleCondition AWS CloudFormation Resource (AWS::S3::Bucket.RoutingRuleCondition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-routingrulecondition.html
-type AWSS3Bucket_RoutingRuleCondition struct {
-
-	// HttpErrorCodeReturnedEquals AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-routingrulecondition.html#cfn-s3-websiteconfiguration-routingrules-routingrulecondition-httperrorcodereturnedequals
-	HttpErrorCodeReturnedEquals string `json:"HttpErrorCodeReturnedEquals,omitempty"`
-
-	// KeyPrefixEquals AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-routingrulecondition.html#cfn-s3-websiteconfiguration-routingrules-routingrulecondition-keyprefixequals
-	KeyPrefixEquals string `json:"KeyPrefixEquals,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_RoutingRuleCondition) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.RoutingRuleCondition"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_rule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_rule.go
deleted file mode 100644
index 87e65e9627..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_rule.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_Rule AWS CloudFormation Resource (AWS::S3::Bucket.Rule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html
-type AWSS3Bucket_Rule struct {
-
-	// AbortIncompleteMultipartUpload AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-rule-abortincompletemultipartupload
-	AbortIncompleteMultipartUpload *AWSS3Bucket_AbortIncompleteMultipartUpload `json:"AbortIncompleteMultipartUpload,omitempty"`
-
-	// ExpirationDate AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-expirationdate
-	ExpirationDate string `json:"ExpirationDate,omitempty"`
-
-	// ExpirationInDays AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-expirationindays
-	ExpirationInDays int `json:"ExpirationInDays,omitempty"`
-
-	// Id AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-id
-	Id string `json:"Id,omitempty"`
-
-	// NoncurrentVersionExpirationInDays AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversionexpirationindays
-	NoncurrentVersionExpirationInDays int `json:"NoncurrentVersionExpirationInDays,omitempty"`
-
-	// NoncurrentVersionTransition AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition
-	NoncurrentVersionTransition *AWSS3Bucket_NoncurrentVersionTransition `json:"NoncurrentVersionTransition,omitempty"`
-
-	// NoncurrentVersionTransitions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversiontransitions
-	NoncurrentVersionTransitions []AWSS3Bucket_NoncurrentVersionTransition `json:"NoncurrentVersionTransitions,omitempty"`
-
-	// Prefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-prefix
-	Prefix string `json:"Prefix,omitempty"`
-
-	// Status AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-status
-	Status string `json:"Status,omitempty"`
-
-	// TagFilters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-rule-tagfilters
-	TagFilters []AWSS3Bucket_TagFilter `json:"TagFilters,omitempty"`
-
-	// Transition AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-transition
-	Transition *AWSS3Bucket_Transition `json:"Transition,omitempty"`
-
-	// Transitions AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-transitions
-	Transitions []AWSS3Bucket_Transition `json:"Transitions,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_Rule) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.Rule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_s3keyfilter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_s3keyfilter.go
deleted file mode 100644
index 6716bf3e3a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_s3keyfilter.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_S3KeyFilter AWS CloudFormation Resource (AWS::S3::Bucket.S3KeyFilter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key.html
-type AWSS3Bucket_S3KeyFilter struct {
-
-	// Rules AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key.html#cfn-s3-bucket-notificationconfiguraiton-config-filter-s3key-rules
-	Rules []AWSS3Bucket_FilterRule `json:"Rules,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_S3KeyFilter) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.S3KeyFilter"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_storageclassanalysis.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_storageclassanalysis.go
deleted file mode 100644
index c326fa71d7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_storageclassanalysis.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_StorageClassAnalysis AWS CloudFormation Resource (AWS::S3::Bucket.StorageClassAnalysis)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-storageclassanalysis.html
-type AWSS3Bucket_StorageClassAnalysis struct {
-
-	// DataExport AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-storageclassanalysis.html#cfn-s3-bucket-storageclassanalysis-dataexport
-	DataExport *AWSS3Bucket_DataExport `json:"DataExport,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_StorageClassAnalysis) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.StorageClassAnalysis"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_tagfilter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_tagfilter.go
deleted file mode 100644
index 2d5a758b4c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_tagfilter.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_TagFilter AWS CloudFormation Resource (AWS::S3::Bucket.TagFilter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-tagfilter.html
-type AWSS3Bucket_TagFilter struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-tagfilter.html#cfn-s3-bucket-tagfilter-key
-	Key string `json:"Key,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-tagfilter.html#cfn-s3-bucket-tagfilter-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_TagFilter) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.TagFilter"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_topicconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_topicconfiguration.go
deleted file mode 100644
index f5d90a2ff6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_topicconfiguration.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_TopicConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.TopicConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-topicconfig.html
-type AWSS3Bucket_TopicConfiguration struct {
-
-	// Event AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-topicconfig.html#cfn-s3-bucket-notificationconfig-topicconfig-event
-	Event string `json:"Event,omitempty"`
-
-	// Filter AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-topicconfig.html#cfn-s3-bucket-notificationconfig-topicconfig-filter
-	Filter *AWSS3Bucket_NotificationFilter `json:"Filter,omitempty"`
-
-	// Topic AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-topicconfig.html#cfn-s3-bucket-notificationconfig-topicconfig-topic
-	Topic string `json:"Topic,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_TopicConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.TopicConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_transition.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_transition.go
deleted file mode 100644
index 92d4ef850d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_transition.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_Transition AWS CloudFormation Resource (AWS::S3::Bucket.Transition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-transition.html
-type AWSS3Bucket_Transition struct {
-
-	// StorageClass AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-transition.html#cfn-s3-bucket-lifecycleconfig-rule-transition-storageclass
-	StorageClass string `json:"StorageClass,omitempty"`
-
-	// TransitionDate AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-transition.html#cfn-s3-bucket-lifecycleconfig-rule-transition-transitiondate
-	TransitionDate string `json:"TransitionDate,omitempty"`
-
-	// TransitionInDays AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-transition.html#cfn-s3-bucket-lifecycleconfig-rule-transition-transitionindays
-	TransitionInDays int `json:"TransitionInDays,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_Transition) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.Transition"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_versioningconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_versioningconfiguration.go
deleted file mode 100644
index f8548e3faa..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_versioningconfiguration.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_VersioningConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.VersioningConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-versioningconfig.html
-type AWSS3Bucket_VersioningConfiguration struct {
-
-	// Status AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-versioningconfig.html#cfn-s3-bucket-versioningconfig-status
-	Status string `json:"Status,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_VersioningConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.VersioningConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_websiteconfiguration.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_websiteconfiguration.go
deleted file mode 100644
index 47324e0b5e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucket_websiteconfiguration.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSS3Bucket_WebsiteConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.WebsiteConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration.html
-type AWSS3Bucket_WebsiteConfiguration struct {
-
-	// ErrorDocument AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration.html#cfn-s3-websiteconfiguration-errordocument
-	ErrorDocument string `json:"ErrorDocument,omitempty"`
-
-	// IndexDocument AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration.html#cfn-s3-websiteconfiguration-indexdocument
-	IndexDocument string `json:"IndexDocument,omitempty"`
-
-	// RedirectAllRequestsTo AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration.html#cfn-s3-websiteconfiguration-redirectallrequeststo
-	RedirectAllRequestsTo *AWSS3Bucket_RedirectAllRequestsTo `json:"RedirectAllRequestsTo,omitempty"`
-
-	// RoutingRules AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration.html#cfn-s3-websiteconfiguration-routingrules
-	RoutingRules []AWSS3Bucket_RoutingRule `json:"RoutingRules,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3Bucket_WebsiteConfiguration) AWSCloudFormationType() string {
-	return "AWS::S3::Bucket.WebsiteConfiguration"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucketpolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucketpolicy.go
deleted file mode 100644
index 36d63a734a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-s3-bucketpolicy.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSS3BucketPolicy AWS CloudFormation Resource (AWS::S3::BucketPolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-policy.html
-type AWSS3BucketPolicy struct {
-
-	// Bucket AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-policy.html#aws-properties-s3-policy-bucket
-	Bucket string `json:"Bucket,omitempty"`
-
-	// PolicyDocument AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-policy.html#aws-properties-s3-policy-policydocument
-	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSS3BucketPolicy) AWSCloudFormationType() string {
-	return "AWS::S3::BucketPolicy"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSS3BucketPolicy) MarshalJSON() ([]byte, error) {
-	type Properties AWSS3BucketPolicy
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSS3BucketPolicy) UnmarshalJSON(b []byte) error {
-	type Properties AWSS3BucketPolicy
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSS3BucketPolicy(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSS3BucketPolicyResources retrieves all AWSS3BucketPolicy items from an AWS CloudFormation template
-func (t *Template) GetAllAWSS3BucketPolicyResources() map[string]AWSS3BucketPolicy {
-	results := map[string]AWSS3BucketPolicy{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSS3BucketPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::S3::BucketPolicy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSS3BucketPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSS3BucketPolicyWithName retrieves all AWSS3BucketPolicy items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSS3BucketPolicyWithName(name string) (AWSS3BucketPolicy, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSS3BucketPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::S3::BucketPolicy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSS3BucketPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSS3BucketPolicy{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-sdb-domain.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-sdb-domain.go
deleted file mode 100644
index 7a60001637..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-sdb-domain.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSSDBDomain AWS CloudFormation Resource (AWS::SDB::Domain)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-simpledb.html
-type AWSSDBDomain struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-simpledb.html#cfn-sdb-domain-description
-	Description string `json:"Description,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSDBDomain) AWSCloudFormationType() string {
-	return "AWS::SDB::Domain"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSSDBDomain) MarshalJSON() ([]byte, error) {
-	type Properties AWSSDBDomain
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSSDBDomain) UnmarshalJSON(b []byte) error {
-	type Properties AWSSDBDomain
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSSDBDomain(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSSDBDomainResources retrieves all AWSSDBDomain items from an AWS CloudFormation template
-func (t *Template) GetAllAWSSDBDomainResources() map[string]AWSSDBDomain {
-	results := map[string]AWSSDBDomain{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSSDBDomain:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SDB::Domain" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSDBDomain
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSSDBDomainWithName retrieves all AWSSDBDomain items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSSDBDomainWithName(name string) (AWSSDBDomain, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSSDBDomain:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SDB::Domain" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSDBDomain
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSSDBDomain{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-api.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-api.go
deleted file mode 100644
index 17335679be..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-api.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSServerlessApi AWS CloudFormation Resource (AWS::Serverless::Api)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
-type AWSServerlessApi struct {
-
-	// CacheClusterEnabled AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
-	CacheClusterEnabled bool `json:"CacheClusterEnabled,omitempty"`
-
-	// CacheClusterSize AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
-	CacheClusterSize string `json:"CacheClusterSize,omitempty"`
-
-	// DefinitionBody AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
-	DefinitionBody interface{} `json:"DefinitionBody,omitempty"`
-
-	// DefinitionUri AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
-	DefinitionUri *AWSServerlessApi_DefinitionUri `json:"DefinitionUri,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
-	Name string `json:"Name,omitempty"`
-
-	// StageName AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
-	StageName string `json:"StageName,omitempty"`
-
-	// Variables AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
-	Variables map[string]string `json:"Variables,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessApi) AWSCloudFormationType() string {
-	return "AWS::Serverless::Api"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSServerlessApi) MarshalJSON() ([]byte, error) {
-	type Properties AWSServerlessApi
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSServerlessApi) UnmarshalJSON(b []byte) error {
-	type Properties AWSServerlessApi
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSServerlessApi(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSServerlessApiResources retrieves all AWSServerlessApi items from an AWS CloudFormation template
-func (t *Template) GetAllAWSServerlessApiResources() map[string]AWSServerlessApi {
-	results := map[string]AWSServerlessApi{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSServerlessApi:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Serverless::Api" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSServerlessApi
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSServerlessApiWithName retrieves all AWSServerlessApi items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSServerlessApiWithName(name string) (AWSServerlessApi, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSServerlessApi:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Serverless::Api" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSServerlessApi
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSServerlessApi{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-api_s3location.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-api_s3location.go
deleted file mode 100644
index ae8eaa1e8a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-api_s3location.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSServerlessApi_S3Location AWS CloudFormation Resource (AWS::Serverless::Api.S3Location)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object
-type AWSServerlessApi_S3Location struct {
-
-	// Bucket AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Bucket string `json:"Bucket,omitempty"`
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Key string `json:"Key,omitempty"`
-
-	// Version AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Version int `json:"Version,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessApi_S3Location) AWSCloudFormationType() string {
-	return "AWS::Serverless::Api.S3Location"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function.go
deleted file mode 100644
index f5ae2ba062..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function.go
+++ /dev/null
@@ -1,185 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSServerlessFunction AWS CloudFormation Resource (AWS::Serverless::Function)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-type AWSServerlessFunction struct {
-
-	// CodeUri AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	CodeUri *AWSServerlessFunction_CodeUri `json:"CodeUri,omitempty"`
-
-	// DeadLetterQueue AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	DeadLetterQueue *AWSServerlessFunction_DeadLetterQueue `json:"DeadLetterQueue,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Description string `json:"Description,omitempty"`
-
-	// Environment AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Environment *AWSServerlessFunction_FunctionEnvironment `json:"Environment,omitempty"`
-
-	// Events AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Events map[string]AWSServerlessFunction_EventSource `json:"Events,omitempty"`
-
-	// FunctionName AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	FunctionName string `json:"FunctionName,omitempty"`
-
-	// Handler AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Handler string `json:"Handler,omitempty"`
-
-	// KmsKeyArn AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	KmsKeyArn string `json:"KmsKeyArn,omitempty"`
-
-	// MemorySize AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	MemorySize int `json:"MemorySize,omitempty"`
-
-	// Policies AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Policies *AWSServerlessFunction_Policies `json:"Policies,omitempty"`
-
-	// Role AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Role string `json:"Role,omitempty"`
-
-	// Runtime AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Runtime string `json:"Runtime,omitempty"`
-
-	// Tags AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Tags map[string]string `json:"Tags,omitempty"`
-
-	// Timeout AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Timeout int `json:"Timeout,omitempty"`
-
-	// Tracing AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Tracing string `json:"Tracing,omitempty"`
-
-	// VpcConfig AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	VpcConfig *AWSServerlessFunction_VpcConfig `json:"VpcConfig,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSServerlessFunction) MarshalJSON() ([]byte, error) {
-	type Properties AWSServerlessFunction
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSServerlessFunction) UnmarshalJSON(b []byte) error {
-	type Properties AWSServerlessFunction
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSServerlessFunction(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSServerlessFunctionResources retrieves all AWSServerlessFunction items from an AWS CloudFormation template
-func (t *Template) GetAllAWSServerlessFunctionResources() map[string]AWSServerlessFunction {
-	results := map[string]AWSServerlessFunction{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSServerlessFunction:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Serverless::Function" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSServerlessFunction
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSServerlessFunctionWithName retrieves all AWSServerlessFunction items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSServerlessFunctionWithName(name string) (AWSServerlessFunction, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSServerlessFunction:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Serverless::Function" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSServerlessFunction
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSServerlessFunction{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_alexaskillevent.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_alexaskillevent.go
deleted file mode 100644
index b9a76fa56b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_alexaskillevent.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_AlexaSkillEvent AWS CloudFormation Resource (AWS::Serverless::Function.AlexaSkillEvent)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#alexaskill
-type AWSServerlessFunction_AlexaSkillEvent struct {
-
-	// Variables AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#alexaskill
-	Variables map[string]string `json:"Variables,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_AlexaSkillEvent) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.AlexaSkillEvent"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_apievent.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_apievent.go
deleted file mode 100644
index b8e2d2e231..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_apievent.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_ApiEvent AWS CloudFormation Resource (AWS::Serverless::Function.ApiEvent)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
-type AWSServerlessFunction_ApiEvent struct {
-
-	// Method AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
-	Method string `json:"Method,omitempty"`
-
-	// Path AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
-	Path string `json:"Path,omitempty"`
-
-	// RestApiId AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
-	RestApiId string `json:"RestApiId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_ApiEvent) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.ApiEvent"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_cloudwatcheventevent.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_cloudwatcheventevent.go
deleted file mode 100644
index ef6ff16045..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_cloudwatcheventevent.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_CloudWatchEventEvent AWS CloudFormation Resource (AWS::Serverless::Function.CloudWatchEventEvent)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchevent
-type AWSServerlessFunction_CloudWatchEventEvent struct {
-
-	// Input AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchevent
-	Input string `json:"Input,omitempty"`
-
-	// InputPath AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchevent
-	InputPath string `json:"InputPath,omitempty"`
-
-	// Pattern AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AmazonCloudWatch/latest/events/CloudWatchEventsandEventPatterns.html
-	Pattern interface{} `json:"Pattern,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_CloudWatchEventEvent) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.CloudWatchEventEvent"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_deadletterqueue.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_deadletterqueue.go
deleted file mode 100644
index 16da9e397b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_deadletterqueue.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_DeadLetterQueue AWS CloudFormation Resource (AWS::Serverless::Function.DeadLetterQueue)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deadletterqueue-object
-type AWSServerlessFunction_DeadLetterQueue struct {
-
-	// TargetArn AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	TargetArn string `json:"TargetArn,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_DeadLetterQueue) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.DeadLetterQueue"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_dynamodbevent.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_dynamodbevent.go
deleted file mode 100644
index 6dfab150c1..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_dynamodbevent.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_DynamoDBEvent AWS CloudFormation Resource (AWS::Serverless::Function.DynamoDBEvent)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
-type AWSServerlessFunction_DynamoDBEvent struct {
-
-	// BatchSize AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
-	BatchSize int `json:"BatchSize,omitempty"`
-
-	// StartingPosition AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
-	StartingPosition string `json:"StartingPosition,omitempty"`
-
-	// Stream AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
-	Stream string `json:"Stream,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_DynamoDBEvent) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.DynamoDBEvent"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_eventsource.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_eventsource.go
deleted file mode 100644
index 73f283f06e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_eventsource.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_EventSource AWS CloudFormation Resource (AWS::Serverless::Function.EventSource)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-object
-type AWSServerlessFunction_EventSource struct {
-
-	// Properties AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-types
-	Properties *AWSServerlessFunction_Properties `json:"Properties,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-object
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_EventSource) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.EventSource"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_functionenvironment.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_functionenvironment.go
deleted file mode 100644
index 1975480731..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_functionenvironment.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_FunctionEnvironment AWS CloudFormation Resource (AWS::Serverless::Function.FunctionEnvironment)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
-type AWSServerlessFunction_FunctionEnvironment struct {
-
-	// Variables AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
-	Variables map[string]string `json:"Variables,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_FunctionEnvironment) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.FunctionEnvironment"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_iampolicydocument.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_iampolicydocument.go
deleted file mode 100644
index 57a2044756..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_iampolicydocument.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_IAMPolicyDocument AWS CloudFormation Resource (AWS::Serverless::Function.IAMPolicyDocument)
-// See: http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies.html
-type AWSServerlessFunction_IAMPolicyDocument struct {
-
-	// Statement AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies.html
-	Statement interface{} `json:"Statement,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_IAMPolicyDocument) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.IAMPolicyDocument"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_iotruleevent.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_iotruleevent.go
deleted file mode 100644
index c236f74261..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_iotruleevent.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_IoTRuleEvent AWS CloudFormation Resource (AWS::Serverless::Function.IoTRuleEvent)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#iotrule
-type AWSServerlessFunction_IoTRuleEvent struct {
-
-	// AwsIotSqlVersion AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#iotrule
-	AwsIotSqlVersion string `json:"AwsIotSqlVersion,omitempty"`
-
-	// Sql AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#iotrule
-	Sql string `json:"Sql,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_IoTRuleEvent) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.IoTRuleEvent"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_kinesisevent.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_kinesisevent.go
deleted file mode 100644
index 242c168cf7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_kinesisevent.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_KinesisEvent AWS CloudFormation Resource (AWS::Serverless::Function.KinesisEvent)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis
-type AWSServerlessFunction_KinesisEvent struct {
-
-	// BatchSize AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis
-	BatchSize int `json:"BatchSize,omitempty"`
-
-	// StartingPosition AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis
-	StartingPosition string `json:"StartingPosition,omitempty"`
-
-	// Stream AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis
-	Stream string `json:"Stream,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_KinesisEvent) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.KinesisEvent"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_s3event.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_s3event.go
deleted file mode 100644
index 40bfe64722..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_s3event.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_S3Event AWS CloudFormation Resource (AWS::Serverless::Function.S3Event)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3
-type AWSServerlessFunction_S3Event struct {
-
-	// Bucket AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3
-	Bucket string `json:"Bucket,omitempty"`
-
-	// Events AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3
-	Events *AWSServerlessFunction_Events `json:"Events,omitempty"`
-
-	// Filter AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3
-	Filter *AWSServerlessFunction_S3NotificationFilter `json:"Filter,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_S3Event) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.S3Event"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_s3location.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_s3location.go
deleted file mode 100644
index cf1fdc653d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_s3location.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_S3Location AWS CloudFormation Resource (AWS::Serverless::Function.S3Location)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object
-type AWSServerlessFunction_S3Location struct {
-
-	// Bucket AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Bucket string `json:"Bucket,omitempty"`
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Key string `json:"Key,omitempty"`
-
-	// Version AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-	Version int `json:"Version,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_S3Location) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.S3Location"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_s3notificationfilter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_s3notificationfilter.go
deleted file mode 100644
index 47f8827be7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_s3notificationfilter.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_S3NotificationFilter AWS CloudFormation Resource (AWS::Serverless::Function.S3NotificationFilter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html
-type AWSServerlessFunction_S3NotificationFilter struct {
-
-	// S3Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html
-	S3Key string `json:"S3Key,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_S3NotificationFilter) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.S3NotificationFilter"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_scheduleevent.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_scheduleevent.go
deleted file mode 100644
index d313b33c77..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_scheduleevent.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_ScheduleEvent AWS CloudFormation Resource (AWS::Serverless::Function.ScheduleEvent)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule
-type AWSServerlessFunction_ScheduleEvent struct {
-
-	// Input AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule
-	Input string `json:"Input,omitempty"`
-
-	// Schedule AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule
-	Schedule string `json:"Schedule,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_ScheduleEvent) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.ScheduleEvent"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_snsevent.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_snsevent.go
deleted file mode 100644
index eef66c8b8a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_snsevent.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_SNSEvent AWS CloudFormation Resource (AWS::Serverless::Function.SNSEvent)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sns
-type AWSServerlessFunction_SNSEvent struct {
-
-	// Topic AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sns
-	Topic string `json:"Topic,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_SNSEvent) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.SNSEvent"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_vpcconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_vpcconfig.go
deleted file mode 100644
index a75b050ee0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-function_vpcconfig.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSServerlessFunction_VpcConfig AWS CloudFormation Resource (AWS::Serverless::Function.VpcConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html
-type AWSServerlessFunction_VpcConfig struct {
-
-	// SecurityGroupIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html
-	SecurityGroupIds []string `json:"SecurityGroupIds,omitempty"`
-
-	// SubnetIds AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html
-	SubnetIds []string `json:"SubnetIds,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessFunction_VpcConfig) AWSCloudFormationType() string {
-	return "AWS::Serverless::Function.VpcConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-simpletable.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-simpletable.go
deleted file mode 100644
index 52097c4b9c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-simpletable.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSServerlessSimpleTable AWS CloudFormation Resource (AWS::Serverless::SimpleTable)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesssimpletable
-type AWSServerlessSimpleTable struct {
-
-	// PrimaryKey AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#primary-key-object
-	PrimaryKey *AWSServerlessSimpleTable_PrimaryKey `json:"PrimaryKey,omitempty"`
-
-	// ProvisionedThroughput AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html
-	ProvisionedThroughput *AWSServerlessSimpleTable_ProvisionedThroughput `json:"ProvisionedThroughput,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessSimpleTable) AWSCloudFormationType() string {
-	return "AWS::Serverless::SimpleTable"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSServerlessSimpleTable) MarshalJSON() ([]byte, error) {
-	type Properties AWSServerlessSimpleTable
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSServerlessSimpleTable) UnmarshalJSON(b []byte) error {
-	type Properties AWSServerlessSimpleTable
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSServerlessSimpleTable(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSServerlessSimpleTableResources retrieves all AWSServerlessSimpleTable items from an AWS CloudFormation template
-func (t *Template) GetAllAWSServerlessSimpleTableResources() map[string]AWSServerlessSimpleTable {
-	results := map[string]AWSServerlessSimpleTable{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSServerlessSimpleTable:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Serverless::SimpleTable" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSServerlessSimpleTable
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSServerlessSimpleTableWithName retrieves all AWSServerlessSimpleTable items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSServerlessSimpleTableWithName(name string) (AWSServerlessSimpleTable, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSServerlessSimpleTable:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::Serverless::SimpleTable" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSServerlessSimpleTable
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSServerlessSimpleTable{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-simpletable_primarykey.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-simpletable_primarykey.go
deleted file mode 100644
index c155324425..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-simpletable_primarykey.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSServerlessSimpleTable_PrimaryKey AWS CloudFormation Resource (AWS::Serverless::SimpleTable.PrimaryKey)
-// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#primary-key-object
-type AWSServerlessSimpleTable_PrimaryKey struct {
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#primary-key-object
-	Name string `json:"Name,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#primary-key-object
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessSimpleTable_PrimaryKey) AWSCloudFormationType() string {
-	return "AWS::Serverless::SimpleTable.PrimaryKey"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-simpletable_provisionedthroughput.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-simpletable_provisionedthroughput.go
deleted file mode 100644
index c2ce8e4b39..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-serverless-simpletable_provisionedthroughput.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSServerlessSimpleTable_ProvisionedThroughput AWS CloudFormation Resource (AWS::Serverless::SimpleTable.ProvisionedThroughput)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html
-type AWSServerlessSimpleTable_ProvisionedThroughput struct {
-
-	// ReadCapacityUnits AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html
-	ReadCapacityUnits int `json:"ReadCapacityUnits,omitempty"`
-
-	// WriteCapacityUnits AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html
-	WriteCapacityUnits int `json:"WriteCapacityUnits,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSServerlessSimpleTable_ProvisionedThroughput) AWSCloudFormationType() string {
-	return "AWS::Serverless::SimpleTable.ProvisionedThroughput"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-sns-subscription.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-sns-subscription.go
deleted file mode 100644
index 72342a6605..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-sns-subscription.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSSNSSubscription AWS CloudFormation Resource (AWS::SNS::Subscription)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html
-type AWSSNSSubscription struct {
-
-	// Endpoint AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-endpoint
-	Endpoint string `json:"Endpoint,omitempty"`
-
-	// Protocol AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-protocol
-	Protocol string `json:"Protocol,omitempty"`
-
-	// TopicArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#topicarn
-	TopicArn string `json:"TopicArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSNSSubscription) AWSCloudFormationType() string {
-	return "AWS::SNS::Subscription"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSSNSSubscription) MarshalJSON() ([]byte, error) {
-	type Properties AWSSNSSubscription
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSSNSSubscription) UnmarshalJSON(b []byte) error {
-	type Properties AWSSNSSubscription
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSSNSSubscription(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSSNSSubscriptionResources retrieves all AWSSNSSubscription items from an AWS CloudFormation template
-func (t *Template) GetAllAWSSNSSubscriptionResources() map[string]AWSSNSSubscription {
-	results := map[string]AWSSNSSubscription{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSSNSSubscription:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SNS::Subscription" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSNSSubscription
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSSNSSubscriptionWithName retrieves all AWSSNSSubscription items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSSNSSubscriptionWithName(name string) (AWSSNSSubscription, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSSNSSubscription:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SNS::Subscription" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSNSSubscription
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSSNSSubscription{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-sns-topic.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-sns-topic.go
deleted file mode 100644
index 2b04dfd37d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-sns-topic.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSSNSTopic AWS CloudFormation Resource (AWS::SNS::Topic)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html
-type AWSSNSTopic struct {
-
-	// DisplayName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-displayname
-	DisplayName string `json:"DisplayName,omitempty"`
-
-	// Subscription AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-subscription
-	Subscription []AWSSNSTopic_Subscription `json:"Subscription,omitempty"`
-
-	// TopicName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-topicname
-	TopicName string `json:"TopicName,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSNSTopic) AWSCloudFormationType() string {
-	return "AWS::SNS::Topic"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSSNSTopic) MarshalJSON() ([]byte, error) {
-	type Properties AWSSNSTopic
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSSNSTopic) UnmarshalJSON(b []byte) error {
-	type Properties AWSSNSTopic
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSSNSTopic(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSSNSTopicResources retrieves all AWSSNSTopic items from an AWS CloudFormation template
-func (t *Template) GetAllAWSSNSTopicResources() map[string]AWSSNSTopic {
-	results := map[string]AWSSNSTopic{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSSNSTopic:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SNS::Topic" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSNSTopic
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSSNSTopicWithName retrieves all AWSSNSTopic items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSSNSTopicWithName(name string) (AWSSNSTopic, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSSNSTopic:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SNS::Topic" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSNSTopic
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSSNSTopic{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-sns-topic_subscription.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-sns-topic_subscription.go
deleted file mode 100644
index 2539fbecc1..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-sns-topic_subscription.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSSNSTopic_Subscription AWS CloudFormation Resource (AWS::SNS::Topic.Subscription)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-subscription.html
-type AWSSNSTopic_Subscription struct {
-
-	// Endpoint AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-subscription.html#cfn-sns-topic-subscription-endpoint
-	Endpoint string `json:"Endpoint,omitempty"`
-
-	// Protocol AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-subscription.html#cfn-sns-topic-subscription-protocol
-	Protocol string `json:"Protocol,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSNSTopic_Subscription) AWSCloudFormationType() string {
-	return "AWS::SNS::Topic.Subscription"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-sns-topicpolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-sns-topicpolicy.go
deleted file mode 100644
index 53b4f4262d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-sns-topicpolicy.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSSNSTopicPolicy AWS CloudFormation Resource (AWS::SNS::TopicPolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-policy.html
-type AWSSNSTopicPolicy struct {
-
-	// PolicyDocument AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-policy.html#cfn-sns-topicpolicy-policydocument
-	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
-
-	// Topics AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-policy.html#cfn-sns-topicpolicy-topics
-	Topics []string `json:"Topics,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSNSTopicPolicy) AWSCloudFormationType() string {
-	return "AWS::SNS::TopicPolicy"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSSNSTopicPolicy) MarshalJSON() ([]byte, error) {
-	type Properties AWSSNSTopicPolicy
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSSNSTopicPolicy) UnmarshalJSON(b []byte) error {
-	type Properties AWSSNSTopicPolicy
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSSNSTopicPolicy(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSSNSTopicPolicyResources retrieves all AWSSNSTopicPolicy items from an AWS CloudFormation template
-func (t *Template) GetAllAWSSNSTopicPolicyResources() map[string]AWSSNSTopicPolicy {
-	results := map[string]AWSSNSTopicPolicy{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSSNSTopicPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SNS::TopicPolicy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSNSTopicPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSSNSTopicPolicyWithName retrieves all AWSSNSTopicPolicy items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSSNSTopicPolicyWithName(name string) (AWSSNSTopicPolicy, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSSNSTopicPolicy:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SNS::TopicPolicy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSNSTopicPolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSSNSTopicPolicy{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-sqs-queue.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-sqs-queue.go
deleted file mode 100644
index 95a632dbc2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-sqs-queue.go
+++ /dev/null
@@ -1,160 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSSQSQueue AWS CloudFormation Resource (AWS::SQS::Queue)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html
-type AWSSQSQueue struct {
-
-	// ContentBasedDeduplication AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-contentbaseddeduplication
-	ContentBasedDeduplication bool `json:"ContentBasedDeduplication,omitempty"`
-
-	// DelaySeconds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-delayseconds
-	DelaySeconds int `json:"DelaySeconds,omitempty"`
-
-	// FifoQueue AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-fifoqueue
-	FifoQueue bool `json:"FifoQueue,omitempty"`
-
-	// KmsDataKeyReusePeriodSeconds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-kmsdatakeyreuseperiodseconds
-	KmsDataKeyReusePeriodSeconds int `json:"KmsDataKeyReusePeriodSeconds,omitempty"`
-
-	// KmsMasterKeyId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-kmsmasterkeyid
-	KmsMasterKeyId string `json:"KmsMasterKeyId,omitempty"`
-
-	// MaximumMessageSize AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-maxmesgsize
-	MaximumMessageSize int `json:"MaximumMessageSize,omitempty"`
-
-	// MessageRetentionPeriod AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-msgretentionperiod
-	MessageRetentionPeriod int `json:"MessageRetentionPeriod,omitempty"`
-
-	// QueueName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-name
-	QueueName string `json:"QueueName,omitempty"`
-
-	// ReceiveMessageWaitTimeSeconds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-receivemsgwaittime
-	ReceiveMessageWaitTimeSeconds int `json:"ReceiveMessageWaitTimeSeconds,omitempty"`
-
-	// RedrivePolicy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-redrive
-	RedrivePolicy interface{} `json:"RedrivePolicy,omitempty"`
-
-	// VisibilityTimeout AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-visiblitytimeout
-	VisibilityTimeout int `json:"VisibilityTimeout,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSQSQueue) AWSCloudFormationType() string {
-	return "AWS::SQS::Queue"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSSQSQueue) MarshalJSON() ([]byte, error) {
-	type Properties AWSSQSQueue
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSSQSQueue) UnmarshalJSON(b []byte) error {
-	type Properties AWSSQSQueue
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSSQSQueue(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSSQSQueueResources retrieves all AWSSQSQueue items from an AWS CloudFormation template
-func (t *Template) GetAllAWSSQSQueueResources() map[string]AWSSQSQueue {
-	results := map[string]AWSSQSQueue{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSSQSQueue:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SQS::Queue" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSQSQueue
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSSQSQueueWithName retrieves all AWSSQSQueue items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSSQSQueueWithName(name string) (AWSSQSQueue, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSSQSQueue:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SQS::Queue" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSQSQueue
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSSQSQueue{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-sqs-queuepolicy.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-sqs-queuepolicy.go
deleted file mode 100644
index a46db209d6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-sqs-queuepolicy.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSSQSQueuePolicy AWS CloudFormation Resource (AWS::SQS::QueuePolicy)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-policy.html
-type AWSSQSQueuePolicy struct {
-
-	// PolicyDocument AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-policy.html#cfn-sqs-queuepolicy-policydoc
-	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
-
-	// Queues AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-policy.html#cfn-sqs-queuepolicy-queues
-	Queues []string `json:"Queues,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSQSQueuePolicy) AWSCloudFormationType() string {
-	return "AWS::SQS::QueuePolicy"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSSQSQueuePolicy) MarshalJSON() ([]byte, error) {
-	type Properties AWSSQSQueuePolicy
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSSQSQueuePolicy) UnmarshalJSON(b []byte) error {
-	type Properties AWSSQSQueuePolicy
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSSQSQueuePolicy(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSSQSQueuePolicyResources retrieves all AWSSQSQueuePolicy items from an AWS CloudFormation template
-func (t *Template) GetAllAWSSQSQueuePolicyResources() map[string]AWSSQSQueuePolicy {
-	results := map[string]AWSSQSQueuePolicy{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSSQSQueuePolicy:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SQS::QueuePolicy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSQSQueuePolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSSQSQueuePolicyWithName retrieves all AWSSQSQueuePolicy items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSSQSQueuePolicyWithName(name string) (AWSSQSQueuePolicy, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSSQSQueuePolicy:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SQS::QueuePolicy" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSQSQueuePolicy
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSSQSQueuePolicy{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-association.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-association.go
deleted file mode 100644
index 0daa8c281b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-association.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSSSMAssociation AWS CloudFormation Resource (AWS::SSM::Association)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html
-type AWSSSMAssociation struct {
-
-	// DocumentVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-documentversion
-	DocumentVersion string `json:"DocumentVersion,omitempty"`
-
-	// InstanceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-instanceid
-	InstanceId string `json:"InstanceId,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-name
-	Name string `json:"Name,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-parameters
-	Parameters map[string]AWSSSMAssociation_ParameterValues `json:"Parameters,omitempty"`
-
-	// ScheduleExpression AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-scheduleexpression
-	ScheduleExpression string `json:"ScheduleExpression,omitempty"`
-
-	// Targets AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-targets
-	Targets []AWSSSMAssociation_Target `json:"Targets,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMAssociation) AWSCloudFormationType() string {
-	return "AWS::SSM::Association"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSSSMAssociation) MarshalJSON() ([]byte, error) {
-	type Properties AWSSSMAssociation
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSSSMAssociation) UnmarshalJSON(b []byte) error {
-	type Properties AWSSSMAssociation
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSSSMAssociation(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSSSMAssociationResources retrieves all AWSSSMAssociation items from an AWS CloudFormation template
-func (t *Template) GetAllAWSSSMAssociationResources() map[string]AWSSSMAssociation {
-	results := map[string]AWSSSMAssociation{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSSSMAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SSM::Association" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSSMAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSSSMAssociationWithName retrieves all AWSSSMAssociation items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSSSMAssociationWithName(name string) (AWSSSMAssociation, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSSSMAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SSM::Association" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSSMAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSSSMAssociation{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-association_parametervalues.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-association_parametervalues.go
deleted file mode 100644
index 8040247f95..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-association_parametervalues.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSSSMAssociation_ParameterValues AWS CloudFormation Resource (AWS::SSM::Association.ParameterValues)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-parametervalues.html
-type AWSSSMAssociation_ParameterValues struct {
-
-	// ParameterValues AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-parametervalues.html#cfn-ssm-association-parametervalues-parametervalues
-	ParameterValues []string `json:"ParameterValues,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMAssociation_ParameterValues) AWSCloudFormationType() string {
-	return "AWS::SSM::Association.ParameterValues"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-association_target.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-association_target.go
deleted file mode 100644
index a080a94e25..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-association_target.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSSSMAssociation_Target AWS CloudFormation Resource (AWS::SSM::Association.Target)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-target.html
-type AWSSSMAssociation_Target struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-target.html#cfn-ssm-association-target-key
-	Key string `json:"Key,omitempty"`
-
-	// Values AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-target.html#cfn-ssm-association-target-values
-	Values []string `json:"Values,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMAssociation_Target) AWSCloudFormationType() string {
-	return "AWS::SSM::Association.Target"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-document.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-document.go
deleted file mode 100644
index 0b49ca8c27..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-document.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSSSMDocument AWS CloudFormation Resource (AWS::SSM::Document)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html
-type AWSSSMDocument struct {
-
-	// Content AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html#cfn-ssm-document-content
-	Content interface{} `json:"Content,omitempty"`
-
-	// DocumentType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html#cfn-ssm-document-documenttype
-	DocumentType string `json:"DocumentType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMDocument) AWSCloudFormationType() string {
-	return "AWS::SSM::Document"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSSSMDocument) MarshalJSON() ([]byte, error) {
-	type Properties AWSSSMDocument
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSSSMDocument) UnmarshalJSON(b []byte) error {
-	type Properties AWSSSMDocument
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSSSMDocument(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSSSMDocumentResources retrieves all AWSSSMDocument items from an AWS CloudFormation template
-func (t *Template) GetAllAWSSSMDocumentResources() map[string]AWSSSMDocument {
-	results := map[string]AWSSSMDocument{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSSSMDocument:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SSM::Document" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSSMDocument
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSSSMDocumentWithName retrieves all AWSSSMDocument items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSSSMDocumentWithName(name string) (AWSSSMDocument, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSSSMDocument:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SSM::Document" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSSMDocument
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSSSMDocument{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask.go
deleted file mode 100644
index 8c811dd645..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask.go
+++ /dev/null
@@ -1,170 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSSSMMaintenanceWindowTask AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html
-type AWSSSMMaintenanceWindowTask struct {
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-description
-	Description string `json:"Description,omitempty"`
-
-	// LoggingInfo AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-logginginfo
-	LoggingInfo *AWSSSMMaintenanceWindowTask_LoggingInfo `json:"LoggingInfo,omitempty"`
-
-	// MaxConcurrency AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-maxconcurrency
-	MaxConcurrency string `json:"MaxConcurrency,omitempty"`
-
-	// MaxErrors AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-maxerrors
-	MaxErrors string `json:"MaxErrors,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-name
-	Name string `json:"Name,omitempty"`
-
-	// Priority AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-priority
-	Priority int `json:"Priority,omitempty"`
-
-	// ServiceRoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-servicerolearn
-	ServiceRoleArn string `json:"ServiceRoleArn,omitempty"`
-
-	// Targets AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-targets
-	Targets []AWSSSMMaintenanceWindowTask_Target `json:"Targets,omitempty"`
-
-	// TaskArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-taskarn
-	TaskArn string `json:"TaskArn,omitempty"`
-
-	// TaskInvocationParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-taskinvocationparameters
-	TaskInvocationParameters *AWSSSMMaintenanceWindowTask_TaskInvocationParameters `json:"TaskInvocationParameters,omitempty"`
-
-	// TaskParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-taskparameters
-	TaskParameters interface{} `json:"TaskParameters,omitempty"`
-
-	// TaskType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-tasktype
-	TaskType string `json:"TaskType,omitempty"`
-
-	// WindowId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-windowid
-	WindowId string `json:"WindowId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMMaintenanceWindowTask) AWSCloudFormationType() string {
-	return "AWS::SSM::MaintenanceWindowTask"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSSSMMaintenanceWindowTask) MarshalJSON() ([]byte, error) {
-	type Properties AWSSSMMaintenanceWindowTask
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSSSMMaintenanceWindowTask) UnmarshalJSON(b []byte) error {
-	type Properties AWSSSMMaintenanceWindowTask
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSSSMMaintenanceWindowTask(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSSSMMaintenanceWindowTaskResources retrieves all AWSSSMMaintenanceWindowTask items from an AWS CloudFormation template
-func (t *Template) GetAllAWSSSMMaintenanceWindowTaskResources() map[string]AWSSSMMaintenanceWindowTask {
-	results := map[string]AWSSSMMaintenanceWindowTask{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSSSMMaintenanceWindowTask:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SSM::MaintenanceWindowTask" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSSMMaintenanceWindowTask
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSSSMMaintenanceWindowTaskWithName retrieves all AWSSSMMaintenanceWindowTask items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSSSMMaintenanceWindowTaskWithName(name string) (AWSSSMMaintenanceWindowTask, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSSSMMaintenanceWindowTask:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SSM::MaintenanceWindowTask" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSSMMaintenanceWindowTask
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSSSMMaintenanceWindowTask{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_logginginfo.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_logginginfo.go
deleted file mode 100644
index 6185a9fdf2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_logginginfo.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSSSMMaintenanceWindowTask_LoggingInfo AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.LoggingInfo)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-logginginfo.html
-type AWSSSMMaintenanceWindowTask_LoggingInfo struct {
-
-	// Region AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-logginginfo.html#cfn-ssm-maintenancewindowtask-logginginfo-region
-	Region string `json:"Region,omitempty"`
-
-	// S3Bucket AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-logginginfo.html#cfn-ssm-maintenancewindowtask-logginginfo-s3bucket
-	S3Bucket string `json:"S3Bucket,omitempty"`
-
-	// S3Prefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-logginginfo.html#cfn-ssm-maintenancewindowtask-logginginfo-s3prefix
-	S3Prefix string `json:"S3Prefix,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMMaintenanceWindowTask_LoggingInfo) AWSCloudFormationType() string {
-	return "AWS::SSM::MaintenanceWindowTask.LoggingInfo"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go
deleted file mode 100644
index 2fc3799d12..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSSSMMaintenanceWindowTask_MaintenanceWindowAutomationParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowautomationparameters.html
-type AWSSSMMaintenanceWindowTask_MaintenanceWindowAutomationParameters struct {
-
-	// DocumentVersion AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowautomationparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowautomationparameters-documentversion
-	DocumentVersion string `json:"DocumentVersion,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowautomationparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowautomationparameters-parameters
-	Parameters interface{} `json:"Parameters,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMMaintenanceWindowTask_MaintenanceWindowAutomationParameters) AWSCloudFormationType() string {
-	return "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go
deleted file mode 100644
index 1cfbdad09f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSSSMMaintenanceWindowTask_MaintenanceWindowLambdaParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowlambdaparameters.html
-type AWSSSMMaintenanceWindowTask_MaintenanceWindowLambdaParameters struct {
-
-	// ClientContext AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowlambdaparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowlambdaparameters-clientcontext
-	ClientContext string `json:"ClientContext,omitempty"`
-
-	// Payload AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowlambdaparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowlambdaparameters-payload
-	Payload string `json:"Payload,omitempty"`
-
-	// Qualifier AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowlambdaparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowlambdaparameters-qualifier
-	Qualifier string `json:"Qualifier,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMMaintenanceWindowTask_MaintenanceWindowLambdaParameters) AWSCloudFormationType() string {
-	return "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go
deleted file mode 100644
index 7515a0903a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package cloudformation
-
-// AWSSSMMaintenanceWindowTask_MaintenanceWindowRunCommandParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html
-type AWSSSMMaintenanceWindowTask_MaintenanceWindowRunCommandParameters struct {
-
-	// Comment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-comment
-	Comment string `json:"Comment,omitempty"`
-
-	// DocumentHash AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-documenthash
-	DocumentHash string `json:"DocumentHash,omitempty"`
-
-	// DocumentHashType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-documenthashtype
-	DocumentHashType string `json:"DocumentHashType,omitempty"`
-
-	// NotificationConfig AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-notificationconfig
-	NotificationConfig *AWSSSMMaintenanceWindowTask_NotificationConfig `json:"NotificationConfig,omitempty"`
-
-	// OutputS3BucketName AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-outputs3bucketname
-	OutputS3BucketName string `json:"OutputS3BucketName,omitempty"`
-
-	// OutputS3KeyPrefix AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-outputs3keyprefix
-	OutputS3KeyPrefix string `json:"OutputS3KeyPrefix,omitempty"`
-
-	// Parameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-parameters
-	Parameters interface{} `json:"Parameters,omitempty"`
-
-	// ServiceRoleArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-servicerolearn
-	ServiceRoleArn string `json:"ServiceRoleArn,omitempty"`
-
-	// TimeoutSeconds AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-timeoutseconds
-	TimeoutSeconds int `json:"TimeoutSeconds,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMMaintenanceWindowTask_MaintenanceWindowRunCommandParameters) AWSCloudFormationType() string {
-	return "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go
deleted file mode 100644
index 6ec288595d..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSSSMMaintenanceWindowTask_MaintenanceWindowStepFunctionsParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowstepfunctionsparameters.html
-type AWSSSMMaintenanceWindowTask_MaintenanceWindowStepFunctionsParameters struct {
-
-	// Input AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowstepfunctionsparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowstepfunctionsparameters-input
-	Input string `json:"Input,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowstepfunctionsparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowstepfunctionsparameters-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMMaintenanceWindowTask_MaintenanceWindowStepFunctionsParameters) AWSCloudFormationType() string {
-	return "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_notificationconfig.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_notificationconfig.go
deleted file mode 100644
index 2ca1baeacf..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_notificationconfig.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSSSMMaintenanceWindowTask_NotificationConfig AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.NotificationConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-notificationconfig.html
-type AWSSSMMaintenanceWindowTask_NotificationConfig struct {
-
-	// NotificationArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-notificationconfig.html#cfn-ssm-maintenancewindowtask-notificationconfig-notificationarn
-	NotificationArn string `json:"NotificationArn,omitempty"`
-
-	// NotificationEvents AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-notificationconfig.html#cfn-ssm-maintenancewindowtask-notificationconfig-notificationevents
-	NotificationEvents []string `json:"NotificationEvents,omitempty"`
-
-	// NotificationType AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-notificationconfig.html#cfn-ssm-maintenancewindowtask-notificationconfig-notificationtype
-	NotificationType string `json:"NotificationType,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMMaintenanceWindowTask_NotificationConfig) AWSCloudFormationType() string {
-	return "AWS::SSM::MaintenanceWindowTask.NotificationConfig"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_target.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_target.go
deleted file mode 100644
index 4bf1090d97..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_target.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSSSMMaintenanceWindowTask_Target AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.Target)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-target.html
-type AWSSSMMaintenanceWindowTask_Target struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-target.html#cfn-ssm-maintenancewindowtask-target-key
-	Key string `json:"Key,omitempty"`
-
-	// Values AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-target.html#cfn-ssm-maintenancewindowtask-target-values
-	Values []string `json:"Values,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMMaintenanceWindowTask_Target) AWSCloudFormationType() string {
-	return "AWS::SSM::MaintenanceWindowTask.Target"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_taskinvocationparameters.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_taskinvocationparameters.go
deleted file mode 100644
index 82ac54fffc..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-maintenancewindowtask_taskinvocationparameters.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSSSMMaintenanceWindowTask_TaskInvocationParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-taskinvocationparameters.html
-type AWSSSMMaintenanceWindowTask_TaskInvocationParameters struct {
-
-	// MaintenanceWindowAutomationParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-taskinvocationparameters.html#cfn-ssm-maintenancewindowtask-taskinvocationparameters-maintenancewindowautomationparameters
-	MaintenanceWindowAutomationParameters *AWSSSMMaintenanceWindowTask_MaintenanceWindowAutomationParameters `json:"MaintenanceWindowAutomationParameters,omitempty"`
-
-	// MaintenanceWindowLambdaParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-taskinvocationparameters.html#cfn-ssm-maintenancewindowtask-taskinvocationparameters-maintenancewindowlambdaparameters
-	MaintenanceWindowLambdaParameters *AWSSSMMaintenanceWindowTask_MaintenanceWindowLambdaParameters `json:"MaintenanceWindowLambdaParameters,omitempty"`
-
-	// MaintenanceWindowRunCommandParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-taskinvocationparameters.html#cfn-ssm-maintenancewindowtask-taskinvocationparameters-maintenancewindowruncommandparameters
-	MaintenanceWindowRunCommandParameters *AWSSSMMaintenanceWindowTask_MaintenanceWindowRunCommandParameters `json:"MaintenanceWindowRunCommandParameters,omitempty"`
-
-	// MaintenanceWindowStepFunctionsParameters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-taskinvocationparameters.html#cfn-ssm-maintenancewindowtask-taskinvocationparameters-maintenancewindowstepfunctionsparameters
-	MaintenanceWindowStepFunctionsParameters *AWSSSMMaintenanceWindowTask_MaintenanceWindowStepFunctionsParameters `json:"MaintenanceWindowStepFunctionsParameters,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMMaintenanceWindowTask_TaskInvocationParameters) AWSCloudFormationType() string {
-	return "AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-parameter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-parameter.go
deleted file mode 100644
index a9036d5c89..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-parameter.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSSSMParameter AWS CloudFormation Resource (AWS::SSM::Parameter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html
-type AWSSSMParameter struct {
-
-	// AllowedPattern AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-allowedpattern
-	AllowedPattern string `json:"AllowedPattern,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-description
-	Description string `json:"Description,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-name
-	Name string `json:"Name,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-type
-	Type string `json:"Type,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMParameter) AWSCloudFormationType() string {
-	return "AWS::SSM::Parameter"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSSSMParameter) MarshalJSON() ([]byte, error) {
-	type Properties AWSSSMParameter
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSSSMParameter) UnmarshalJSON(b []byte) error {
-	type Properties AWSSSMParameter
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSSSMParameter(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSSSMParameterResources retrieves all AWSSSMParameter items from an AWS CloudFormation template
-func (t *Template) GetAllAWSSSMParameterResources() map[string]AWSSSMParameter {
-	results := map[string]AWSSSMParameter{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSSSMParameter:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SSM::Parameter" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSSMParameter
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSSSMParameterWithName retrieves all AWSSSMParameter items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSSSMParameterWithName(name string) (AWSSSMParameter, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSSSMParameter:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SSM::Parameter" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSSMParameter
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSSSMParameter{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline.go
deleted file mode 100644
index 5d27930ce0..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSSSMPatchBaseline AWS CloudFormation Resource (AWS::SSM::PatchBaseline)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html
-type AWSSSMPatchBaseline struct {
-
-	// ApprovalRules AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-approvalrules
-	ApprovalRules *AWSSSMPatchBaseline_RuleGroup `json:"ApprovalRules,omitempty"`
-
-	// ApprovedPatches AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-approvedpatches
-	ApprovedPatches []string `json:"ApprovedPatches,omitempty"`
-
-	// ApprovedPatchesComplianceLevel AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-approvedpatchescompliancelevel
-	ApprovedPatchesComplianceLevel string `json:"ApprovedPatchesComplianceLevel,omitempty"`
-
-	// Description AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-description
-	Description string `json:"Description,omitempty"`
-
-	// GlobalFilters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-globalfilters
-	GlobalFilters *AWSSSMPatchBaseline_PatchFilterGroup `json:"GlobalFilters,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-name
-	Name string `json:"Name,omitempty"`
-
-	// OperatingSystem AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-operatingsystem
-	OperatingSystem string `json:"OperatingSystem,omitempty"`
-
-	// PatchGroups AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-patchgroups
-	PatchGroups []AWSSSMPatchBaseline_PatchGroup `json:"PatchGroups,omitempty"`
-
-	// RejectedPatches AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-rejectedpatches
-	RejectedPatches []string `json:"RejectedPatches,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMPatchBaseline) AWSCloudFormationType() string {
-	return "AWS::SSM::PatchBaseline"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSSSMPatchBaseline) MarshalJSON() ([]byte, error) {
-	type Properties AWSSSMPatchBaseline
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSSSMPatchBaseline) UnmarshalJSON(b []byte) error {
-	type Properties AWSSSMPatchBaseline
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSSSMPatchBaseline(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSSSMPatchBaselineResources retrieves all AWSSSMPatchBaseline items from an AWS CloudFormation template
-func (t *Template) GetAllAWSSSMPatchBaselineResources() map[string]AWSSSMPatchBaseline {
-	results := map[string]AWSSSMPatchBaseline{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSSSMPatchBaseline:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SSM::PatchBaseline" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSSMPatchBaseline
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSSSMPatchBaselineWithName retrieves all AWSSSMPatchBaseline items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSSSMPatchBaselineWithName(name string) (AWSSSMPatchBaseline, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSSSMPatchBaseline:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::SSM::PatchBaseline" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSSSMPatchBaseline
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSSSMPatchBaseline{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_patchfilter.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_patchfilter.go
deleted file mode 100644
index 2ff1bb0a34..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_patchfilter.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSSSMPatchBaseline_PatchFilter AWS CloudFormation Resource (AWS::SSM::PatchBaseline.PatchFilter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchfilter.html
-type AWSSSMPatchBaseline_PatchFilter struct {
-
-	// Key AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchfilter.html#cfn-ssm-patchbaseline-patchfilter-key
-	Key string `json:"Key,omitempty"`
-
-	// Values AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchfilter.html#cfn-ssm-patchbaseline-patchfilter-values
-	Values []string `json:"Values,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMPatchBaseline_PatchFilter) AWSCloudFormationType() string {
-	return "AWS::SSM::PatchBaseline.PatchFilter"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_patchfiltergroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_patchfiltergroup.go
deleted file mode 100644
index 13e2509a93..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_patchfiltergroup.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSSSMPatchBaseline_PatchFilterGroup AWS CloudFormation Resource (AWS::SSM::PatchBaseline.PatchFilterGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchfiltergroup.html
-type AWSSSMPatchBaseline_PatchFilterGroup struct {
-
-	// PatchFilters AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchfiltergroup.html#cfn-ssm-patchbaseline-patchfiltergroup-patchfilters
-	PatchFilters []AWSSSMPatchBaseline_PatchFilter `json:"PatchFilters,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMPatchBaseline_PatchFilterGroup) AWSCloudFormationType() string {
-	return "AWS::SSM::PatchBaseline.PatchFilterGroup"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_patchgroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_patchgroup.go
deleted file mode 100644
index 97ee734dd8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_patchgroup.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package cloudformation
-
-// AWSSSMPatchBaseline_PatchGroup AWS CloudFormation Resource (AWS::SSM::PatchBaseline.PatchGroup)
-// See:
-type AWSSSMPatchBaseline_PatchGroup struct {
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMPatchBaseline_PatchGroup) AWSCloudFormationType() string {
-	return "AWS::SSM::PatchBaseline.PatchGroup"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_rule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_rule.go
deleted file mode 100644
index ce9ecb50b2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_rule.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSSSMPatchBaseline_Rule AWS CloudFormation Resource (AWS::SSM::PatchBaseline.Rule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rule.html
-type AWSSSMPatchBaseline_Rule struct {
-
-	// ApproveAfterDays AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rule.html#cfn-ssm-patchbaseline-rule-approveafterdays
-	ApproveAfterDays int `json:"ApproveAfterDays,omitempty"`
-
-	// ComplianceLevel AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rule.html#cfn-ssm-patchbaseline-rule-compliancelevel
-	ComplianceLevel string `json:"ComplianceLevel,omitempty"`
-
-	// PatchFilterGroup AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rule.html#cfn-ssm-patchbaseline-rule-patchfiltergroup
-	PatchFilterGroup *AWSSSMPatchBaseline_PatchFilterGroup `json:"PatchFilterGroup,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMPatchBaseline_Rule) AWSCloudFormationType() string {
-	return "AWS::SSM::PatchBaseline.Rule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_rulegroup.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_rulegroup.go
deleted file mode 100644
index 6680d6b7cc..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-ssm-patchbaseline_rulegroup.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSSSMPatchBaseline_RuleGroup AWS CloudFormation Resource (AWS::SSM::PatchBaseline.RuleGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rulegroup.html
-type AWSSSMPatchBaseline_RuleGroup struct {
-
-	// PatchRules AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rulegroup.html#cfn-ssm-patchbaseline-rulegroup-patchrules
-	PatchRules []AWSSSMPatchBaseline_Rule `json:"PatchRules,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSSSMPatchBaseline_RuleGroup) AWSCloudFormationType() string {
-	return "AWS::SSM::PatchBaseline.RuleGroup"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-stepfunctions-activity.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-stepfunctions-activity.go
deleted file mode 100644
index d2d92416bd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-stepfunctions-activity.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSStepFunctionsActivity AWS CloudFormation Resource (AWS::StepFunctions::Activity)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html
-type AWSStepFunctionsActivity struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSStepFunctionsActivity) AWSCloudFormationType() string {
-	return "AWS::StepFunctions::Activity"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSStepFunctionsActivity) MarshalJSON() ([]byte, error) {
-	type Properties AWSStepFunctionsActivity
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSStepFunctionsActivity) UnmarshalJSON(b []byte) error {
-	type Properties AWSStepFunctionsActivity
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSStepFunctionsActivity(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSStepFunctionsActivityResources retrieves all AWSStepFunctionsActivity items from an AWS CloudFormation template
-func (t *Template) GetAllAWSStepFunctionsActivityResources() map[string]AWSStepFunctionsActivity {
-	results := map[string]AWSStepFunctionsActivity{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSStepFunctionsActivity:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::StepFunctions::Activity" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSStepFunctionsActivity
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSStepFunctionsActivityWithName retrieves all AWSStepFunctionsActivity items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSStepFunctionsActivityWithName(name string) (AWSStepFunctionsActivity, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSStepFunctionsActivity:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::StepFunctions::Activity" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSStepFunctionsActivity
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSStepFunctionsActivity{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-stepfunctions-statemachine.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-stepfunctions-statemachine.go
deleted file mode 100644
index c4dc4ffe02..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-stepfunctions-statemachine.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSStepFunctionsStateMachine AWS CloudFormation Resource (AWS::StepFunctions::StateMachine)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html
-type AWSStepFunctionsStateMachine struct {
-
-	// DefinitionString AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring
-	DefinitionString string `json:"DefinitionString,omitempty"`
-
-	// RoleArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn
-	RoleArn string `json:"RoleArn,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSStepFunctionsStateMachine) AWSCloudFormationType() string {
-	return "AWS::StepFunctions::StateMachine"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSStepFunctionsStateMachine) MarshalJSON() ([]byte, error) {
-	type Properties AWSStepFunctionsStateMachine
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSStepFunctionsStateMachine) UnmarshalJSON(b []byte) error {
-	type Properties AWSStepFunctionsStateMachine
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSStepFunctionsStateMachine(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSStepFunctionsStateMachineResources retrieves all AWSStepFunctionsStateMachine items from an AWS CloudFormation template
-func (t *Template) GetAllAWSStepFunctionsStateMachineResources() map[string]AWSStepFunctionsStateMachine {
-	results := map[string]AWSStepFunctionsStateMachine{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSStepFunctionsStateMachine:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::StepFunctions::StateMachine" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSStepFunctionsStateMachine
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSStepFunctionsStateMachineWithName retrieves all AWSStepFunctionsStateMachine items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSStepFunctionsStateMachineWithName(name string) (AWSStepFunctionsStateMachine, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSStepFunctionsStateMachine:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::StepFunctions::StateMachine" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSStepFunctionsStateMachine
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSStepFunctionsStateMachine{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-bytematchset.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-bytematchset.go
deleted file mode 100644
index fb8bb7863c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-bytematchset.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFByteMatchSet AWS CloudFormation Resource (AWS::WAF::ByteMatchSet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-bytematchset.html
-type AWSWAFByteMatchSet struct {
-
-	// ByteMatchTuples AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-bytematchset.html#cfn-waf-bytematchset-bytematchtuples
-	ByteMatchTuples []AWSWAFByteMatchSet_ByteMatchTuple `json:"ByteMatchTuples,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-bytematchset.html#cfn-waf-bytematchset-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFByteMatchSet) AWSCloudFormationType() string {
-	return "AWS::WAF::ByteMatchSet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFByteMatchSet) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFByteMatchSet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFByteMatchSet) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFByteMatchSet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFByteMatchSet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFByteMatchSetResources retrieves all AWSWAFByteMatchSet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFByteMatchSetResources() map[string]AWSWAFByteMatchSet {
-	results := map[string]AWSWAFByteMatchSet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFByteMatchSet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::ByteMatchSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFByteMatchSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFByteMatchSetWithName retrieves all AWSWAFByteMatchSet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFByteMatchSetWithName(name string) (AWSWAFByteMatchSet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFByteMatchSet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::ByteMatchSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFByteMatchSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFByteMatchSet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-bytematchset_bytematchtuple.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-bytematchset_bytematchtuple.go
deleted file mode 100644
index 2c747d2d77..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-bytematchset_bytematchtuple.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSWAFByteMatchSet_ByteMatchTuple AWS CloudFormation Resource (AWS::WAF::ByteMatchSet.ByteMatchTuple)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html
-type AWSWAFByteMatchSet_ByteMatchTuple struct {
-
-	// FieldToMatch AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html#cfn-waf-bytematchset-bytematchtuples-fieldtomatch
-	FieldToMatch *AWSWAFByteMatchSet_FieldToMatch `json:"FieldToMatch,omitempty"`
-
-	// PositionalConstraint AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html#cfn-waf-bytematchset-bytematchtuples-positionalconstraint
-	PositionalConstraint string `json:"PositionalConstraint,omitempty"`
-
-	// TargetString AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html#cfn-waf-bytematchset-bytematchtuples-targetstring
-	TargetString string `json:"TargetString,omitempty"`
-
-	// TargetStringBase64 AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html#cfn-waf-bytematchset-bytematchtuples-targetstringbase64
-	TargetStringBase64 string `json:"TargetStringBase64,omitempty"`
-
-	// TextTransformation AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html#cfn-waf-bytematchset-bytematchtuples-texttransformation
-	TextTransformation string `json:"TextTransformation,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFByteMatchSet_ByteMatchTuple) AWSCloudFormationType() string {
-	return "AWS::WAF::ByteMatchSet.ByteMatchTuple"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-bytematchset_fieldtomatch.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-bytematchset_fieldtomatch.go
deleted file mode 100644
index 7987f32145..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-bytematchset_fieldtomatch.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFByteMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAF::ByteMatchSet.FieldToMatch)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples-fieldtomatch.html
-type AWSWAFByteMatchSet_FieldToMatch struct {
-
-	// Data AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples-fieldtomatch.html#cfn-waf-bytematchset-bytematchtuples-fieldtomatch-data
-	Data string `json:"Data,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples-fieldtomatch.html#cfn-waf-bytematchset-bytematchtuples-fieldtomatch-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFByteMatchSet_FieldToMatch) AWSCloudFormationType() string {
-	return "AWS::WAF::ByteMatchSet.FieldToMatch"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-ipset.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-ipset.go
deleted file mode 100644
index 9dc7acff1a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-ipset.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFIPSet AWS CloudFormation Resource (AWS::WAF::IPSet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-ipset.html
-type AWSWAFIPSet struct {
-
-	// IPSetDescriptors AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-ipset.html#cfn-waf-ipset-ipsetdescriptors
-	IPSetDescriptors []AWSWAFIPSet_IPSetDescriptor `json:"IPSetDescriptors,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-ipset.html#cfn-waf-ipset-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFIPSet) AWSCloudFormationType() string {
-	return "AWS::WAF::IPSet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFIPSet) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFIPSet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFIPSet) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFIPSet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFIPSet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFIPSetResources retrieves all AWSWAFIPSet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFIPSetResources() map[string]AWSWAFIPSet {
-	results := map[string]AWSWAFIPSet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFIPSet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::IPSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFIPSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFIPSetWithName retrieves all AWSWAFIPSet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFIPSetWithName(name string) (AWSWAFIPSet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFIPSet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::IPSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFIPSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFIPSet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-ipset_ipsetdescriptor.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-ipset_ipsetdescriptor.go
deleted file mode 100644
index 1f189285bd..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-ipset_ipsetdescriptor.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFIPSet_IPSetDescriptor AWS CloudFormation Resource (AWS::WAF::IPSet.IPSetDescriptor)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-ipset-ipsetdescriptors.html
-type AWSWAFIPSet_IPSetDescriptor struct {
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-ipset-ipsetdescriptors.html#cfn-waf-ipset-ipsetdescriptors-type
-	Type string `json:"Type,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-ipset-ipsetdescriptors.html#cfn-waf-ipset-ipsetdescriptors-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFIPSet_IPSetDescriptor) AWSCloudFormationType() string {
-	return "AWS::WAF::IPSet.IPSetDescriptor"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-rule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-rule.go
deleted file mode 100644
index 37cb430d46..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-rule.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFRule AWS CloudFormation Resource (AWS::WAF::Rule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-rule.html
-type AWSWAFRule struct {
-
-	// MetricName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-rule.html#cfn-waf-rule-metricname
-	MetricName string `json:"MetricName,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-rule.html#cfn-waf-rule-name
-	Name string `json:"Name,omitempty"`
-
-	// Predicates AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-rule.html#cfn-waf-rule-predicates
-	Predicates []AWSWAFRule_Predicate `json:"Predicates,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRule) AWSCloudFormationType() string {
-	return "AWS::WAF::Rule"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFRule) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFRule
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFRule) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFRule
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFRule(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFRuleResources retrieves all AWSWAFRule items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFRuleResources() map[string]AWSWAFRule {
-	results := map[string]AWSWAFRule{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFRule:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::Rule" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRule
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFRuleWithName retrieves all AWSWAFRule items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFRuleWithName(name string) (AWSWAFRule, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFRule:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::Rule" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRule
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFRule{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-rule_predicate.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-rule_predicate.go
deleted file mode 100644
index eb2971954c..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-rule_predicate.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSWAFRule_Predicate AWS CloudFormation Resource (AWS::WAF::Rule.Predicate)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-rule-predicates.html
-type AWSWAFRule_Predicate struct {
-
-	// DataId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-rule-predicates.html#cfn-waf-rule-predicates-dataid
-	DataId string `json:"DataId,omitempty"`
-
-	// Negated AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-rule-predicates.html#cfn-waf-rule-predicates-negated
-	Negated bool `json:"Negated,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-rule-predicates.html#cfn-waf-rule-predicates-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRule_Predicate) AWSCloudFormationType() string {
-	return "AWS::WAF::Rule.Predicate"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sizeconstraintset.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sizeconstraintset.go
deleted file mode 100644
index 46b2372bca..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sizeconstraintset.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFSizeConstraintSet AWS CloudFormation Resource (AWS::WAF::SizeConstraintSet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-sizeconstraintset.html
-type AWSWAFSizeConstraintSet struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-sizeconstraintset.html#cfn-waf-sizeconstraintset-name
-	Name string `json:"Name,omitempty"`
-
-	// SizeConstraints AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-sizeconstraintset.html#cfn-waf-sizeconstraintset-sizeconstraints
-	SizeConstraints []AWSWAFSizeConstraintSet_SizeConstraint `json:"SizeConstraints,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFSizeConstraintSet) AWSCloudFormationType() string {
-	return "AWS::WAF::SizeConstraintSet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFSizeConstraintSet) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFSizeConstraintSet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFSizeConstraintSet) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFSizeConstraintSet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFSizeConstraintSet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFSizeConstraintSetResources retrieves all AWSWAFSizeConstraintSet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFSizeConstraintSetResources() map[string]AWSWAFSizeConstraintSet {
-	results := map[string]AWSWAFSizeConstraintSet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFSizeConstraintSet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::SizeConstraintSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFSizeConstraintSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFSizeConstraintSetWithName retrieves all AWSWAFSizeConstraintSet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFSizeConstraintSetWithName(name string) (AWSWAFSizeConstraintSet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFSizeConstraintSet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::SizeConstraintSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFSizeConstraintSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFSizeConstraintSet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sizeconstraintset_fieldtomatch.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sizeconstraintset_fieldtomatch.go
deleted file mode 100644
index 0f617ee354..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sizeconstraintset_fieldtomatch.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFSizeConstraintSet_FieldToMatch AWS CloudFormation Resource (AWS::WAF::SizeConstraintSet.FieldToMatch)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint-fieldtomatch.html
-type AWSWAFSizeConstraintSet_FieldToMatch struct {
-
-	// Data AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint-fieldtomatch.html#cfn-waf-sizeconstraintset-sizeconstraint-fieldtomatch-data
-	Data string `json:"Data,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint-fieldtomatch.html#cfn-waf-sizeconstraintset-sizeconstraint-fieldtomatch-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFSizeConstraintSet_FieldToMatch) AWSCloudFormationType() string {
-	return "AWS::WAF::SizeConstraintSet.FieldToMatch"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sizeconstraintset_sizeconstraint.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sizeconstraintset_sizeconstraint.go
deleted file mode 100644
index f93dfa9a58..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sizeconstraintset_sizeconstraint.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSWAFSizeConstraintSet_SizeConstraint AWS CloudFormation Resource (AWS::WAF::SizeConstraintSet.SizeConstraint)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint.html
-type AWSWAFSizeConstraintSet_SizeConstraint struct {
-
-	// ComparisonOperator AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint.html#cfn-waf-sizeconstraintset-sizeconstraint-comparisonoperator
-	ComparisonOperator string `json:"ComparisonOperator,omitempty"`
-
-	// FieldToMatch AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint.html#cfn-waf-sizeconstraintset-sizeconstraint-fieldtomatch
-	FieldToMatch *AWSWAFSizeConstraintSet_FieldToMatch `json:"FieldToMatch,omitempty"`
-
-	// Size AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint.html#cfn-waf-sizeconstraintset-sizeconstraint-size
-	Size int `json:"Size,omitempty"`
-
-	// TextTransformation AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint.html#cfn-waf-sizeconstraintset-sizeconstraint-texttransformation
-	TextTransformation string `json:"TextTransformation,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFSizeConstraintSet_SizeConstraint) AWSCloudFormationType() string {
-	return "AWS::WAF::SizeConstraintSet.SizeConstraint"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sqlinjectionmatchset.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sqlinjectionmatchset.go
deleted file mode 100644
index 1288c3b7e6..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sqlinjectionmatchset.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFSqlInjectionMatchSet AWS CloudFormation Resource (AWS::WAF::SqlInjectionMatchSet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-sqlinjectionmatchset.html
-type AWSWAFSqlInjectionMatchSet struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-sqlinjectionmatchset.html#cfn-waf-sqlinjectionmatchset-name
-	Name string `json:"Name,omitempty"`
-
-	// SqlInjectionMatchTuples AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-sqlinjectionmatchset.html#cfn-waf-sqlinjectionmatchset-sqlinjectionmatchtuples
-	SqlInjectionMatchTuples []AWSWAFSqlInjectionMatchSet_SqlInjectionMatchTuple `json:"SqlInjectionMatchTuples,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFSqlInjectionMatchSet) AWSCloudFormationType() string {
-	return "AWS::WAF::SqlInjectionMatchSet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFSqlInjectionMatchSet) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFSqlInjectionMatchSet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFSqlInjectionMatchSet) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFSqlInjectionMatchSet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFSqlInjectionMatchSet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFSqlInjectionMatchSetResources retrieves all AWSWAFSqlInjectionMatchSet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFSqlInjectionMatchSetResources() map[string]AWSWAFSqlInjectionMatchSet {
-	results := map[string]AWSWAFSqlInjectionMatchSet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFSqlInjectionMatchSet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::SqlInjectionMatchSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFSqlInjectionMatchSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFSqlInjectionMatchSetWithName retrieves all AWSWAFSqlInjectionMatchSet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFSqlInjectionMatchSetWithName(name string) (AWSWAFSqlInjectionMatchSet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFSqlInjectionMatchSet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::SqlInjectionMatchSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFSqlInjectionMatchSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFSqlInjectionMatchSet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sqlinjectionmatchset_fieldtomatch.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sqlinjectionmatchset_fieldtomatch.go
deleted file mode 100644
index 7e6c0684ac..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sqlinjectionmatchset_fieldtomatch.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFSqlInjectionMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAF::SqlInjectionMatchSet.FieldToMatch)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples-fieldtomatch.html
-type AWSWAFSqlInjectionMatchSet_FieldToMatch struct {
-
-	// Data AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples-fieldtomatch.html#cfn-waf-sizeconstraintset-sizeconstraint-fieldtomatch-data
-	Data string `json:"Data,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples-fieldtomatch.html#cfn-waf-sizeconstraintset-sizeconstraint-fieldtomatch-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFSqlInjectionMatchSet_FieldToMatch) AWSCloudFormationType() string {
-	return "AWS::WAF::SqlInjectionMatchSet.FieldToMatch"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go
deleted file mode 100644
index 12c25c85db..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFSqlInjectionMatchSet_SqlInjectionMatchTuple AWS CloudFormation Resource (AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sqlinjectionmatchset-sqlinjectionmatchtuples.html
-type AWSWAFSqlInjectionMatchSet_SqlInjectionMatchTuple struct {
-
-	// FieldToMatch AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sqlinjectionmatchset-sqlinjectionmatchtuples.html#cfn-waf-sqlinjectionmatchset-sqlinjectionmatchtuples-fieldtomatch
-	FieldToMatch *AWSWAFSqlInjectionMatchSet_FieldToMatch `json:"FieldToMatch,omitempty"`
-
-	// TextTransformation AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sqlinjectionmatchset-sqlinjectionmatchtuples.html#cfn-waf-sqlinjectionmatchset-sqlinjectionmatchtuples-texttransformation
-	TextTransformation string `json:"TextTransformation,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFSqlInjectionMatchSet_SqlInjectionMatchTuple) AWSCloudFormationType() string {
-	return "AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-webacl.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-webacl.go
deleted file mode 100644
index 8f6939ce2e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-webacl.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFWebACL AWS CloudFormation Resource (AWS::WAF::WebACL)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-webacl.html
-type AWSWAFWebACL struct {
-
-	// DefaultAction AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-webacl.html#cfn-waf-webacl-defaultaction
-	DefaultAction *AWSWAFWebACL_WafAction `json:"DefaultAction,omitempty"`
-
-	// MetricName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-webacl.html#cfn-waf-webacl-metricname
-	MetricName string `json:"MetricName,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-webacl.html#cfn-waf-webacl-name
-	Name string `json:"Name,omitempty"`
-
-	// Rules AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-webacl.html#cfn-waf-webacl-rules
-	Rules []AWSWAFWebACL_ActivatedRule `json:"Rules,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFWebACL) AWSCloudFormationType() string {
-	return "AWS::WAF::WebACL"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFWebACL) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFWebACL
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFWebACL) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFWebACL
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFWebACL(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFWebACLResources retrieves all AWSWAFWebACL items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFWebACLResources() map[string]AWSWAFWebACL {
-	results := map[string]AWSWAFWebACL{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFWebACL:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::WebACL" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFWebACL
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFWebACLWithName retrieves all AWSWAFWebACL items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFWebACLWithName(name string) (AWSWAFWebACL, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFWebACL:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::WebACL" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFWebACL
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFWebACL{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-webacl_activatedrule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-webacl_activatedrule.go
deleted file mode 100644
index f5991eaa11..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-webacl_activatedrule.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSWAFWebACL_ActivatedRule AWS CloudFormation Resource (AWS::WAF::WebACL.ActivatedRule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-rules.html
-type AWSWAFWebACL_ActivatedRule struct {
-
-	// Action AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-rules.html#cfn-waf-webacl-rules-action
-	Action *AWSWAFWebACL_WafAction `json:"Action,omitempty"`
-
-	// Priority AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-rules.html#cfn-waf-webacl-rules-priority
-	Priority int `json:"Priority,omitempty"`
-
-	// RuleId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-rules.html#cfn-waf-webacl-rules-ruleid
-	RuleId string `json:"RuleId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFWebACL_ActivatedRule) AWSCloudFormationType() string {
-	return "AWS::WAF::WebACL.ActivatedRule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-webacl_wafaction.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-webacl_wafaction.go
deleted file mode 100644
index aeca85a5b4..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-webacl_wafaction.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSWAFWebACL_WafAction AWS CloudFormation Resource (AWS::WAF::WebACL.WafAction)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-action.html
-type AWSWAFWebACL_WafAction struct {
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-action.html#cfn-waf-webacl-action-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFWebACL_WafAction) AWSCloudFormationType() string {
-	return "AWS::WAF::WebACL.WafAction"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-xssmatchset.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-xssmatchset.go
deleted file mode 100644
index ec2aee4d2b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-xssmatchset.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFXssMatchSet AWS CloudFormation Resource (AWS::WAF::XssMatchSet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-xssmatchset.html
-type AWSWAFXssMatchSet struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-xssmatchset.html#cfn-waf-xssmatchset-name
-	Name string `json:"Name,omitempty"`
-
-	// XssMatchTuples AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-xssmatchset.html#cfn-waf-xssmatchset-xssmatchtuples
-	XssMatchTuples []AWSWAFXssMatchSet_XssMatchTuple `json:"XssMatchTuples,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFXssMatchSet) AWSCloudFormationType() string {
-	return "AWS::WAF::XssMatchSet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFXssMatchSet) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFXssMatchSet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFXssMatchSet) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFXssMatchSet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFXssMatchSet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFXssMatchSetResources retrieves all AWSWAFXssMatchSet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFXssMatchSetResources() map[string]AWSWAFXssMatchSet {
-	results := map[string]AWSWAFXssMatchSet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFXssMatchSet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::XssMatchSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFXssMatchSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFXssMatchSetWithName retrieves all AWSWAFXssMatchSet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFXssMatchSetWithName(name string) (AWSWAFXssMatchSet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFXssMatchSet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAF::XssMatchSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFXssMatchSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFXssMatchSet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-xssmatchset_fieldtomatch.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-xssmatchset_fieldtomatch.go
deleted file mode 100644
index 1fbdd0fc7a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-xssmatchset_fieldtomatch.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFXssMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAF::XssMatchSet.FieldToMatch)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple-fieldtomatch.html
-type AWSWAFXssMatchSet_FieldToMatch struct {
-
-	// Data AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple-fieldtomatch.html#cfn-waf-xssmatchset-xssmatchtuple-fieldtomatch-data
-	Data string `json:"Data,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple-fieldtomatch.html#cfn-waf-xssmatchset-xssmatchtuple-fieldtomatch-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFXssMatchSet_FieldToMatch) AWSCloudFormationType() string {
-	return "AWS::WAF::XssMatchSet.FieldToMatch"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-xssmatchset_xssmatchtuple.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-xssmatchset_xssmatchtuple.go
deleted file mode 100644
index 3f700d0dbf..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-waf-xssmatchset_xssmatchtuple.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFXssMatchSet_XssMatchTuple AWS CloudFormation Resource (AWS::WAF::XssMatchSet.XssMatchTuple)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple.html
-type AWSWAFXssMatchSet_XssMatchTuple struct {
-
-	// FieldToMatch AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple.html#cfn-waf-xssmatchset-xssmatchtuple-fieldtomatch
-	FieldToMatch *AWSWAFXssMatchSet_FieldToMatch `json:"FieldToMatch,omitempty"`
-
-	// TextTransformation AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple.html#cfn-waf-xssmatchset-xssmatchtuple-texttransformation
-	TextTransformation string `json:"TextTransformation,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFXssMatchSet_XssMatchTuple) AWSCloudFormationType() string {
-	return "AWS::WAF::XssMatchSet.XssMatchTuple"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-bytematchset.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-bytematchset.go
deleted file mode 100644
index 44c33e2de2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-bytematchset.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFRegionalByteMatchSet AWS CloudFormation Resource (AWS::WAFRegional::ByteMatchSet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-bytematchset.html
-type AWSWAFRegionalByteMatchSet struct {
-
-	// ByteMatchTuples AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-bytematchset.html#cfn-wafregional-bytematchset-bytematchtuples
-	ByteMatchTuples []AWSWAFRegionalByteMatchSet_ByteMatchTuple `json:"ByteMatchTuples,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-bytematchset.html#cfn-wafregional-bytematchset-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalByteMatchSet) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::ByteMatchSet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFRegionalByteMatchSet) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFRegionalByteMatchSet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFRegionalByteMatchSet) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFRegionalByteMatchSet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFRegionalByteMatchSet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFRegionalByteMatchSetResources retrieves all AWSWAFRegionalByteMatchSet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFRegionalByteMatchSetResources() map[string]AWSWAFRegionalByteMatchSet {
-	results := map[string]AWSWAFRegionalByteMatchSet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalByteMatchSet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::ByteMatchSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalByteMatchSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFRegionalByteMatchSetWithName retrieves all AWSWAFRegionalByteMatchSet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFRegionalByteMatchSetWithName(name string) (AWSWAFRegionalByteMatchSet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalByteMatchSet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::ByteMatchSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalByteMatchSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFRegionalByteMatchSet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-bytematchset_bytematchtuple.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-bytematchset_bytematchtuple.go
deleted file mode 100644
index b25c0a599b..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-bytematchset_bytematchtuple.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cloudformation
-
-// AWSWAFRegionalByteMatchSet_ByteMatchTuple AWS CloudFormation Resource (AWS::WAFRegional::ByteMatchSet.ByteMatchTuple)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html
-type AWSWAFRegionalByteMatchSet_ByteMatchTuple struct {
-
-	// FieldToMatch AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html#cfn-wafregional-bytematchset-bytematchtuple-fieldtomatch
-	FieldToMatch *AWSWAFRegionalByteMatchSet_FieldToMatch `json:"FieldToMatch,omitempty"`
-
-	// PositionalConstraint AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html#cfn-wafregional-bytematchset-bytematchtuple-positionalconstraint
-	PositionalConstraint string `json:"PositionalConstraint,omitempty"`
-
-	// TargetString AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html#cfn-wafregional-bytematchset-bytematchtuple-targetstring
-	TargetString string `json:"TargetString,omitempty"`
-
-	// TargetStringBase64 AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html#cfn-wafregional-bytematchset-bytematchtuple-targetstringbase64
-	TargetStringBase64 string `json:"TargetStringBase64,omitempty"`
-
-	// TextTransformation AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html#cfn-wafregional-bytematchset-bytematchtuple-texttransformation
-	TextTransformation string `json:"TextTransformation,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalByteMatchSet_ByteMatchTuple) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::ByteMatchSet.ByteMatchTuple"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-bytematchset_fieldtomatch.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-bytematchset_fieldtomatch.go
deleted file mode 100644
index 4d4a24cadf..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-bytematchset_fieldtomatch.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFRegionalByteMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAFRegional::ByteMatchSet.FieldToMatch)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-fieldtomatch.html
-type AWSWAFRegionalByteMatchSet_FieldToMatch struct {
-
-	// Data AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-fieldtomatch.html#cfn-wafregional-bytematchset-fieldtomatch-data
-	Data string `json:"Data,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-fieldtomatch.html#cfn-wafregional-bytematchset-fieldtomatch-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalByteMatchSet_FieldToMatch) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::ByteMatchSet.FieldToMatch"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-ipset.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-ipset.go
deleted file mode 100644
index 45b2fa7772..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-ipset.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFRegionalIPSet AWS CloudFormation Resource (AWS::WAFRegional::IPSet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ipset.html
-type AWSWAFRegionalIPSet struct {
-
-	// IPSetDescriptors AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ipset.html#cfn-wafregional-ipset-ipsetdescriptors
-	IPSetDescriptors []AWSWAFRegionalIPSet_IPSetDescriptor `json:"IPSetDescriptors,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ipset.html#cfn-wafregional-ipset-name
-	Name string `json:"Name,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalIPSet) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::IPSet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFRegionalIPSet) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFRegionalIPSet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFRegionalIPSet) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFRegionalIPSet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFRegionalIPSet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFRegionalIPSetResources retrieves all AWSWAFRegionalIPSet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFRegionalIPSetResources() map[string]AWSWAFRegionalIPSet {
-	results := map[string]AWSWAFRegionalIPSet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalIPSet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::IPSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalIPSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFRegionalIPSetWithName retrieves all AWSWAFRegionalIPSet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFRegionalIPSetWithName(name string) (AWSWAFRegionalIPSet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalIPSet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::IPSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalIPSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFRegionalIPSet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-ipset_ipsetdescriptor.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-ipset_ipsetdescriptor.go
deleted file mode 100644
index 6f5af5fe8e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-ipset_ipsetdescriptor.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFRegionalIPSet_IPSetDescriptor AWS CloudFormation Resource (AWS::WAFRegional::IPSet.IPSetDescriptor)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-ipset-ipsetdescriptor.html
-type AWSWAFRegionalIPSet_IPSetDescriptor struct {
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-ipset-ipsetdescriptor.html#cfn-wafregional-ipset-ipsetdescriptor-type
-	Type string `json:"Type,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-ipset-ipsetdescriptor.html#cfn-wafregional-ipset-ipsetdescriptor-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalIPSet_IPSetDescriptor) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::IPSet.IPSetDescriptor"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-rule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-rule.go
deleted file mode 100644
index a1059d4330..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-rule.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFRegionalRule AWS CloudFormation Resource (AWS::WAFRegional::Rule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-rule.html
-type AWSWAFRegionalRule struct {
-
-	// MetricName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-rule.html#cfn-wafregional-rule-metricname
-	MetricName string `json:"MetricName,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-rule.html#cfn-wafregional-rule-name
-	Name string `json:"Name,omitempty"`
-
-	// Predicates AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-rule.html#cfn-wafregional-rule-predicates
-	Predicates []AWSWAFRegionalRule_Predicate `json:"Predicates,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalRule) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::Rule"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFRegionalRule) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFRegionalRule
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFRegionalRule) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFRegionalRule
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFRegionalRule(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFRegionalRuleResources retrieves all AWSWAFRegionalRule items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFRegionalRuleResources() map[string]AWSWAFRegionalRule {
-	results := map[string]AWSWAFRegionalRule{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalRule:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::Rule" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalRule
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFRegionalRuleWithName retrieves all AWSWAFRegionalRule items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFRegionalRuleWithName(name string) (AWSWAFRegionalRule, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalRule:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::Rule" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalRule
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFRegionalRule{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-rule_predicate.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-rule_predicate.go
deleted file mode 100644
index 5fbbb7d0bf..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-rule_predicate.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSWAFRegionalRule_Predicate AWS CloudFormation Resource (AWS::WAFRegional::Rule.Predicate)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-rule-predicate.html
-type AWSWAFRegionalRule_Predicate struct {
-
-	// DataId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-rule-predicate.html#cfn-wafregional-rule-predicate-dataid
-	DataId string `json:"DataId,omitempty"`
-
-	// Negated AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-rule-predicate.html#cfn-wafregional-rule-predicate-negated
-	Negated bool `json:"Negated,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-rule-predicate.html#cfn-wafregional-rule-predicate-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalRule_Predicate) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::Rule.Predicate"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sizeconstraintset.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sizeconstraintset.go
deleted file mode 100644
index 9ed5efc9c2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sizeconstraintset.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFRegionalSizeConstraintSet AWS CloudFormation Resource (AWS::WAFRegional::SizeConstraintSet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-sizeconstraintset.html
-type AWSWAFRegionalSizeConstraintSet struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-sizeconstraintset.html#cfn-wafregional-sizeconstraintset-name
-	Name string `json:"Name,omitempty"`
-
-	// SizeConstraints AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-sizeconstraintset.html#cfn-wafregional-sizeconstraintset-sizeconstraints
-	SizeConstraints []AWSWAFRegionalSizeConstraintSet_SizeConstraint `json:"SizeConstraints,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalSizeConstraintSet) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::SizeConstraintSet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFRegionalSizeConstraintSet) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFRegionalSizeConstraintSet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFRegionalSizeConstraintSet) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFRegionalSizeConstraintSet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFRegionalSizeConstraintSet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFRegionalSizeConstraintSetResources retrieves all AWSWAFRegionalSizeConstraintSet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFRegionalSizeConstraintSetResources() map[string]AWSWAFRegionalSizeConstraintSet {
-	results := map[string]AWSWAFRegionalSizeConstraintSet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalSizeConstraintSet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::SizeConstraintSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalSizeConstraintSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFRegionalSizeConstraintSetWithName retrieves all AWSWAFRegionalSizeConstraintSet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFRegionalSizeConstraintSetWithName(name string) (AWSWAFRegionalSizeConstraintSet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalSizeConstraintSet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::SizeConstraintSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalSizeConstraintSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFRegionalSizeConstraintSet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sizeconstraintset_fieldtomatch.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sizeconstraintset_fieldtomatch.go
deleted file mode 100644
index 20729592b8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sizeconstraintset_fieldtomatch.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFRegionalSizeConstraintSet_FieldToMatch AWS CloudFormation Resource (AWS::WAFRegional::SizeConstraintSet.FieldToMatch)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-fieldtomatch.html
-type AWSWAFRegionalSizeConstraintSet_FieldToMatch struct {
-
-	// Data AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-fieldtomatch.html#cfn-wafregional-sizeconstraintset-fieldtomatch-data
-	Data string `json:"Data,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-fieldtomatch.html#cfn-wafregional-sizeconstraintset-fieldtomatch-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalSizeConstraintSet_FieldToMatch) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::SizeConstraintSet.FieldToMatch"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sizeconstraintset_sizeconstraint.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sizeconstraintset_sizeconstraint.go
deleted file mode 100644
index db8499675a..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sizeconstraintset_sizeconstraint.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package cloudformation
-
-// AWSWAFRegionalSizeConstraintSet_SizeConstraint AWS CloudFormation Resource (AWS::WAFRegional::SizeConstraintSet.SizeConstraint)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-sizeconstraint.html
-type AWSWAFRegionalSizeConstraintSet_SizeConstraint struct {
-
-	// ComparisonOperator AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-sizeconstraint.html#cfn-wafregional-sizeconstraintset-sizeconstraint-comparisonoperator
-	ComparisonOperator string `json:"ComparisonOperator,omitempty"`
-
-	// FieldToMatch AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-sizeconstraint.html#cfn-wafregional-sizeconstraintset-sizeconstraint-fieldtomatch
-	FieldToMatch *AWSWAFRegionalSizeConstraintSet_FieldToMatch `json:"FieldToMatch,omitempty"`
-
-	// Size AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-sizeconstraint.html#cfn-wafregional-sizeconstraintset-sizeconstraint-size
-	Size int `json:"Size,omitempty"`
-
-	// TextTransformation AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-sizeconstraint.html#cfn-wafregional-sizeconstraintset-sizeconstraint-texttransformation
-	TextTransformation string `json:"TextTransformation,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalSizeConstraintSet_SizeConstraint) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::SizeConstraintSet.SizeConstraint"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sqlinjectionmatchset.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sqlinjectionmatchset.go
deleted file mode 100644
index 171efd8e38..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sqlinjectionmatchset.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFRegionalSqlInjectionMatchSet AWS CloudFormation Resource (AWS::WAFRegional::SqlInjectionMatchSet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-sqlinjectionmatchset.html
-type AWSWAFRegionalSqlInjectionMatchSet struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-sqlinjectionmatchset.html#cfn-wafregional-sqlinjectionmatchset-name
-	Name string `json:"Name,omitempty"`
-
-	// SqlInjectionMatchTuples AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-sqlinjectionmatchset.html#cfn-wafregional-sqlinjectionmatchset-sqlinjectionmatchtuples
-	SqlInjectionMatchTuples []AWSWAFRegionalSqlInjectionMatchSet_SqlInjectionMatchTuple `json:"SqlInjectionMatchTuples,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalSqlInjectionMatchSet) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::SqlInjectionMatchSet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFRegionalSqlInjectionMatchSet) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFRegionalSqlInjectionMatchSet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFRegionalSqlInjectionMatchSet) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFRegionalSqlInjectionMatchSet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFRegionalSqlInjectionMatchSet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFRegionalSqlInjectionMatchSetResources retrieves all AWSWAFRegionalSqlInjectionMatchSet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFRegionalSqlInjectionMatchSetResources() map[string]AWSWAFRegionalSqlInjectionMatchSet {
-	results := map[string]AWSWAFRegionalSqlInjectionMatchSet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalSqlInjectionMatchSet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::SqlInjectionMatchSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalSqlInjectionMatchSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFRegionalSqlInjectionMatchSetWithName retrieves all AWSWAFRegionalSqlInjectionMatchSet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFRegionalSqlInjectionMatchSetWithName(name string) (AWSWAFRegionalSqlInjectionMatchSet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalSqlInjectionMatchSet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::SqlInjectionMatchSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalSqlInjectionMatchSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFRegionalSqlInjectionMatchSet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go
deleted file mode 100644
index c36884f72f..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFRegionalSqlInjectionMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sqlinjectionmatchset-fieldtomatch.html
-type AWSWAFRegionalSqlInjectionMatchSet_FieldToMatch struct {
-
-	// Data AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sqlinjectionmatchset-fieldtomatch.html#cfn-wafregional-sqlinjectionmatchset-fieldtomatch-data
-	Data string `json:"Data,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sqlinjectionmatchset-fieldtomatch.html#cfn-wafregional-sqlinjectionmatchset-fieldtomatch-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalSqlInjectionMatchSet_FieldToMatch) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go
deleted file mode 100644
index 45cda15a94..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFRegionalSqlInjectionMatchSet_SqlInjectionMatchTuple AWS CloudFormation Resource (AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sqlinjectionmatchset-sqlinjectionmatchtuple.html
-type AWSWAFRegionalSqlInjectionMatchSet_SqlInjectionMatchTuple struct {
-
-	// FieldToMatch AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sqlinjectionmatchset-sqlinjectionmatchtuple.html#cfn-wafregional-sqlinjectionmatchset-sqlinjectionmatchtuple-fieldtomatch
-	FieldToMatch *AWSWAFRegionalSqlInjectionMatchSet_FieldToMatch `json:"FieldToMatch,omitempty"`
-
-	// TextTransformation AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sqlinjectionmatchset-sqlinjectionmatchtuple.html#cfn-wafregional-sqlinjectionmatchset-sqlinjectionmatchtuple-texttransformation
-	TextTransformation string `json:"TextTransformation,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalSqlInjectionMatchSet_SqlInjectionMatchTuple) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-webacl.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-webacl.go
deleted file mode 100644
index aebee7e2a7..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-webacl.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFRegionalWebACL AWS CloudFormation Resource (AWS::WAFRegional::WebACL)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webacl.html
-type AWSWAFRegionalWebACL struct {
-
-	// DefaultAction AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webacl.html#cfn-wafregional-webacl-defaultaction
-	DefaultAction *AWSWAFRegionalWebACL_Action `json:"DefaultAction,omitempty"`
-
-	// MetricName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webacl.html#cfn-wafregional-webacl-metricname
-	MetricName string `json:"MetricName,omitempty"`
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webacl.html#cfn-wafregional-webacl-name
-	Name string `json:"Name,omitempty"`
-
-	// Rules AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webacl.html#cfn-wafregional-webacl-rules
-	Rules []AWSWAFRegionalWebACL_Rule `json:"Rules,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalWebACL) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::WebACL"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFRegionalWebACL) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFRegionalWebACL
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFRegionalWebACL) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFRegionalWebACL
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFRegionalWebACL(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFRegionalWebACLResources retrieves all AWSWAFRegionalWebACL items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFRegionalWebACLResources() map[string]AWSWAFRegionalWebACL {
-	results := map[string]AWSWAFRegionalWebACL{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalWebACL:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::WebACL" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalWebACL
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFRegionalWebACLWithName retrieves all AWSWAFRegionalWebACL items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFRegionalWebACLWithName(name string) (AWSWAFRegionalWebACL, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalWebACL:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::WebACL" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalWebACL
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFRegionalWebACL{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-webacl_action.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-webacl_action.go
deleted file mode 100644
index c801f9c432..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-webacl_action.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package cloudformation
-
-// AWSWAFRegionalWebACL_Action AWS CloudFormation Resource (AWS::WAFRegional::WebACL.Action)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-webacl-action.html
-type AWSWAFRegionalWebACL_Action struct {
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-webacl-action.html#cfn-wafregional-webacl-action-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalWebACL_Action) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::WebACL.Action"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-webacl_rule.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-webacl_rule.go
deleted file mode 100644
index ca2056942e..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-webacl_rule.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package cloudformation
-
-// AWSWAFRegionalWebACL_Rule AWS CloudFormation Resource (AWS::WAFRegional::WebACL.Rule)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-webacl-rule.html
-type AWSWAFRegionalWebACL_Rule struct {
-
-	// Action AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-webacl-rule.html#cfn-wafregional-webacl-rule-action
-	Action *AWSWAFRegionalWebACL_Action `json:"Action,omitempty"`
-
-	// Priority AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-webacl-rule.html#cfn-wafregional-webacl-rule-priority
-	Priority int `json:"Priority,omitempty"`
-
-	// RuleId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-webacl-rule.html#cfn-wafregional-webacl-rule-ruleid
-	RuleId string `json:"RuleId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalWebACL_Rule) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::WebACL.Rule"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-webaclassociation.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-webaclassociation.go
deleted file mode 100644
index 3c4ce87848..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-webaclassociation.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFRegionalWebACLAssociation AWS CloudFormation Resource (AWS::WAFRegional::WebACLAssociation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webaclassociation.html
-type AWSWAFRegionalWebACLAssociation struct {
-
-	// ResourceArn AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webaclassociation.html#cfn-wafregional-webaclassociation-resourcearn
-	ResourceArn string `json:"ResourceArn,omitempty"`
-
-	// WebACLId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webaclassociation.html#cfn-wafregional-webaclassociation-webaclid
-	WebACLId string `json:"WebACLId,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalWebACLAssociation) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::WebACLAssociation"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFRegionalWebACLAssociation) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFRegionalWebACLAssociation
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFRegionalWebACLAssociation) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFRegionalWebACLAssociation
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFRegionalWebACLAssociation(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFRegionalWebACLAssociationResources retrieves all AWSWAFRegionalWebACLAssociation items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFRegionalWebACLAssociationResources() map[string]AWSWAFRegionalWebACLAssociation {
-	results := map[string]AWSWAFRegionalWebACLAssociation{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalWebACLAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::WebACLAssociation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalWebACLAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFRegionalWebACLAssociationWithName retrieves all AWSWAFRegionalWebACLAssociation items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFRegionalWebACLAssociationWithName(name string) (AWSWAFRegionalWebACLAssociation, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalWebACLAssociation:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::WebACLAssociation" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalWebACLAssociation
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFRegionalWebACLAssociation{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-xssmatchset.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-xssmatchset.go
deleted file mode 100644
index 2e288bee11..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-xssmatchset.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWAFRegionalXssMatchSet AWS CloudFormation Resource (AWS::WAFRegional::XssMatchSet)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-xssmatchset.html
-type AWSWAFRegionalXssMatchSet struct {
-
-	// Name AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-xssmatchset.html#cfn-wafregional-xssmatchset-name
-	Name string `json:"Name,omitempty"`
-
-	// XssMatchTuples AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-xssmatchset.html#cfn-wafregional-xssmatchset-xssmatchtuples
-	XssMatchTuples []AWSWAFRegionalXssMatchSet_XssMatchTuple `json:"XssMatchTuples,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalXssMatchSet) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::XssMatchSet"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWAFRegionalXssMatchSet) MarshalJSON() ([]byte, error) {
-	type Properties AWSWAFRegionalXssMatchSet
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWAFRegionalXssMatchSet) UnmarshalJSON(b []byte) error {
-	type Properties AWSWAFRegionalXssMatchSet
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWAFRegionalXssMatchSet(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWAFRegionalXssMatchSetResources retrieves all AWSWAFRegionalXssMatchSet items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWAFRegionalXssMatchSetResources() map[string]AWSWAFRegionalXssMatchSet {
-	results := map[string]AWSWAFRegionalXssMatchSet{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalXssMatchSet:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::XssMatchSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalXssMatchSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWAFRegionalXssMatchSetWithName retrieves all AWSWAFRegionalXssMatchSet items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWAFRegionalXssMatchSetWithName(name string) (AWSWAFRegionalXssMatchSet, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWAFRegionalXssMatchSet:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WAFRegional::XssMatchSet" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWAFRegionalXssMatchSet
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWAFRegionalXssMatchSet{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-xssmatchset_fieldtomatch.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-xssmatchset_fieldtomatch.go
deleted file mode 100644
index 4cdb38e100..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-xssmatchset_fieldtomatch.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFRegionalXssMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAFRegional::XssMatchSet.FieldToMatch)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-fieldtomatch.html
-type AWSWAFRegionalXssMatchSet_FieldToMatch struct {
-
-	// Data AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-fieldtomatch.html#cfn-wafregional-xssmatchset-fieldtomatch-data
-	Data string `json:"Data,omitempty"`
-
-	// Type AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-fieldtomatch.html#cfn-wafregional-xssmatchset-fieldtomatch-type
-	Type string `json:"Type,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalXssMatchSet_FieldToMatch) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::XssMatchSet.FieldToMatch"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-xssmatchset_xssmatchtuple.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-xssmatchset_xssmatchtuple.go
deleted file mode 100644
index 85fe6ef553..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-wafregional-xssmatchset_xssmatchtuple.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// AWSWAFRegionalXssMatchSet_XssMatchTuple AWS CloudFormation Resource (AWS::WAFRegional::XssMatchSet.XssMatchTuple)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-xssmatchtuple.html
-type AWSWAFRegionalXssMatchSet_XssMatchTuple struct {
-
-	// FieldToMatch AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-xssmatchtuple.html#cfn-wafregional-xssmatchset-xssmatchtuple-fieldtomatch
-	FieldToMatch *AWSWAFRegionalXssMatchSet_FieldToMatch `json:"FieldToMatch,omitempty"`
-
-	// TextTransformation AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-xssmatchtuple.html#cfn-wafregional-xssmatchset-xssmatchtuple-texttransformation
-	TextTransformation string `json:"TextTransformation,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWAFRegionalXssMatchSet_XssMatchTuple) AWSCloudFormationType() string {
-	return "AWS::WAFRegional::XssMatchSet.XssMatchTuple"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/aws-workspaces-workspace.go b/vendor/github.com/awslabs/goformation/cloudformation/aws-workspaces-workspace.go
deleted file mode 100644
index 1f0f8d5892..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/aws-workspaces-workspace.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// AWSWorkSpacesWorkspace AWS CloudFormation Resource (AWS::WorkSpaces::Workspace)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html
-type AWSWorkSpacesWorkspace struct {
-
-	// BundleId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-bundleid
-	BundleId string `json:"BundleId,omitempty"`
-
-	// DirectoryId AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-directoryid
-	DirectoryId string `json:"DirectoryId,omitempty"`
-
-	// RootVolumeEncryptionEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-rootvolumeencryptionenabled
-	RootVolumeEncryptionEnabled bool `json:"RootVolumeEncryptionEnabled,omitempty"`
-
-	// UserName AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-username
-	UserName string `json:"UserName,omitempty"`
-
-	// UserVolumeEncryptionEnabled AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-uservolumeencryptionenabled
-	UserVolumeEncryptionEnabled bool `json:"UserVolumeEncryptionEnabled,omitempty"`
-
-	// VolumeEncryptionKey AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-volumeencryptionkey
-	VolumeEncryptionKey string `json:"VolumeEncryptionKey,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *AWSWorkSpacesWorkspace) AWSCloudFormationType() string {
-	return "AWS::WorkSpaces::Workspace"
-}
-
-// MarshalJSON is a custom JSON marshalling hook that embeds this object into
-// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
-func (r *AWSWorkSpacesWorkspace) MarshalJSON() ([]byte, error) {
-	type Properties AWSWorkSpacesWorkspace
-	return json.Marshal(&struct {
-		Type       string
-		Properties Properties
-	}{
-		Type:       r.AWSCloudFormationType(),
-		Properties: (Properties)(*r),
-	})
-}
-
-// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
-// AWS CloudFormation resource object, and just keeps the 'Properties' field.
-func (r *AWSWorkSpacesWorkspace) UnmarshalJSON(b []byte) error {
-	type Properties AWSWorkSpacesWorkspace
-	res := &struct {
-		Type       string
-		Properties *Properties
-	}{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return err
-	}
-
-	// If the resource has no Properties set, it could be nil
-	if res.Properties != nil {
-		*r = AWSWorkSpacesWorkspace(*res.Properties)
-	}
-
-	return nil
-}
-
-// GetAllAWSWorkSpacesWorkspaceResources retrieves all AWSWorkSpacesWorkspace items from an AWS CloudFormation template
-func (t *Template) GetAllAWSWorkSpacesWorkspaceResources() map[string]AWSWorkSpacesWorkspace {
-	results := map[string]AWSWorkSpacesWorkspace{}
-	for name, untyped := range t.Resources {
-		switch resource := untyped.(type) {
-		case AWSWorkSpacesWorkspace:
-			// We found a strongly typed resource of the correct type; use it
-			results[name] = resource
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WorkSpaces::Workspace" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWorkSpacesWorkspace
-						if err := json.Unmarshal(b, &result); err == nil {
-							results[name] = result
-						}
-					}
-				}
-			}
-		}
-	}
-	return results
-}
-
-// GetAWSWorkSpacesWorkspaceWithName retrieves all AWSWorkSpacesWorkspace items from an AWS CloudFormation template
-// whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetAWSWorkSpacesWorkspaceWithName(name string) (AWSWorkSpacesWorkspace, error) {
-	if untyped, ok := t.Resources[name]; ok {
-		switch resource := untyped.(type) {
-		case AWSWorkSpacesWorkspace:
-			// We found a strongly typed resource of the correct type; use it
-			return resource, nil
-		case map[string]interface{}:
-			// We found an untyped resource (likely from JSON) which *might* be
-			// the correct type, but we need to check it's 'Type' field
-			if resType, ok := resource["Type"]; ok {
-				if resType == "AWS::WorkSpaces::Workspace" {
-					// The resource is correct, unmarshal it into the results
-					if b, err := json.Marshal(resource); err == nil {
-						var result AWSWorkSpacesWorkspace
-						if err := json.Unmarshal(b, &result); err == nil {
-							return result, nil
-						}
-					}
-				}
-			}
-		}
-	}
-	return AWSWorkSpacesWorkspace{}, errors.New("resource not found")
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessapi_definitionuri.go b/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessapi_definitionuri.go
deleted file mode 100644
index 474fd70485..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessapi_definitionuri.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-
-	"github.com/mitchellh/mapstructure"
-)
-
-// AWSServerlessApi_DefinitionUri is a helper struct that can hold either a String or S3Location value
-type AWSServerlessApi_DefinitionUri struct {
-	String *string
-
-	S3Location *AWSServerlessApi_S3Location
-}
-
-func (r AWSServerlessApi_DefinitionUri) value() interface{} {
-
-	if r.String != nil {
-		return r.String
-	}
-
-	if r.S3Location != nil {
-		return r.S3Location
-	}
-
-	return nil
-
-}
-
-func (r *AWSServerlessApi_DefinitionUri) MarshalJSON() ([]byte, error) {
-	return json.Marshal(r.value())
-}
-
-// Hook into the marshaller
-func (r *AWSServerlessApi_DefinitionUri) UnmarshalJSON(b []byte) error {
-
-	// Unmarshal into interface{} to check it's type
-	var typecheck interface{}
-	if err := json.Unmarshal(b, &typecheck); err != nil {
-		return err
-	}
-
-	switch val := typecheck.(type) {
-
-	case string:
-		r.String = &val
-
-	case map[string]interface{}:
-
-		mapstructure.Decode(val, &r.S3Location)
-
-	case []interface{}:
-
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessfunction_codeuri.go b/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessfunction_codeuri.go
deleted file mode 100644
index f522f9f4f2..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessfunction_codeuri.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-
-	"github.com/mitchellh/mapstructure"
-)
-
-// AWSServerlessFunction_CodeUri is a helper struct that can hold either a String or S3Location value
-type AWSServerlessFunction_CodeUri struct {
-	String *string
-
-	S3Location *AWSServerlessFunction_S3Location
-}
-
-func (r AWSServerlessFunction_CodeUri) value() interface{} {
-
-	if r.String != nil {
-		return r.String
-	}
-
-	if r.S3Location != nil {
-		return r.S3Location
-	}
-
-	return nil
-
-}
-
-func (r *AWSServerlessFunction_CodeUri) MarshalJSON() ([]byte, error) {
-	return json.Marshal(r.value())
-}
-
-// Hook into the marshaller
-func (r *AWSServerlessFunction_CodeUri) UnmarshalJSON(b []byte) error {
-
-	// Unmarshal into interface{} to check it's type
-	var typecheck interface{}
-	if err := json.Unmarshal(b, &typecheck); err != nil {
-		return err
-	}
-
-	switch val := typecheck.(type) {
-
-	case string:
-		r.String = &val
-
-	case map[string]interface{}:
-
-		mapstructure.Decode(val, &r.S3Location)
-
-	case []interface{}:
-
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessfunction_events.go b/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessfunction_events.go
deleted file mode 100644
index 399d838e94..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessfunction_events.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-
-	"github.com/mitchellh/mapstructure"
-)
-
-// AWSServerlessFunction_Events is a helper struct that can hold either a String or String value
-type AWSServerlessFunction_Events struct {
-	String *string
-
-	StringArray *[]string
-}
-
-func (r AWSServerlessFunction_Events) value() interface{} {
-
-	if r.String != nil {
-		return r.String
-	}
-
-	if r.StringArray != nil {
-		return r.StringArray
-	}
-
-	return nil
-
-}
-
-func (r *AWSServerlessFunction_Events) MarshalJSON() ([]byte, error) {
-	return json.Marshal(r.value())
-}
-
-// Hook into the marshaller
-func (r *AWSServerlessFunction_Events) UnmarshalJSON(b []byte) error {
-
-	// Unmarshal into interface{} to check it's type
-	var typecheck interface{}
-	if err := json.Unmarshal(b, &typecheck); err != nil {
-		return err
-	}
-
-	switch val := typecheck.(type) {
-
-	case string:
-		r.String = &val
-
-	case []string:
-		r.StringArray = &val
-
-	case map[string]interface{}:
-
-	case []interface{}:
-
-		mapstructure.Decode(val, &r.StringArray)
-
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessfunction_policies.go b/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessfunction_policies.go
deleted file mode 100644
index 73d7b71d87..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessfunction_policies.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-
-	"github.com/mitchellh/mapstructure"
-)
-
-// AWSServerlessFunction_Policies is a helper struct that can hold either a String, String, IAMPolicyDocument, or IAMPolicyDocument value
-type AWSServerlessFunction_Policies struct {
-	String *string
-
-	StringArray *[]string
-
-	IAMPolicyDocument *AWSServerlessFunction_IAMPolicyDocument
-
-	IAMPolicyDocumentArray *[]AWSServerlessFunction_IAMPolicyDocument
-}
-
-func (r AWSServerlessFunction_Policies) value() interface{} {
-
-	if r.String != nil {
-		return r.String
-	}
-
-	if r.StringArray != nil {
-		return r.StringArray
-	}
-
-	if r.IAMPolicyDocument != nil {
-		return r.IAMPolicyDocument
-	}
-
-	if r.IAMPolicyDocumentArray != nil {
-		return r.IAMPolicyDocumentArray
-	}
-
-	return nil
-
-}
-
-func (r *AWSServerlessFunction_Policies) MarshalJSON() ([]byte, error) {
-	return json.Marshal(r.value())
-}
-
-// Hook into the marshaller
-func (r *AWSServerlessFunction_Policies) UnmarshalJSON(b []byte) error {
-
-	// Unmarshal into interface{} to check it's type
-	var typecheck interface{}
-	if err := json.Unmarshal(b, &typecheck); err != nil {
-		return err
-	}
-
-	switch val := typecheck.(type) {
-
-	case string:
-		r.String = &val
-
-	case []string:
-		r.StringArray = &val
-
-	case map[string]interface{}:
-
-		mapstructure.Decode(val, &r.IAMPolicyDocument)
-
-	case []interface{}:
-
-		mapstructure.Decode(val, &r.StringArray)
-
-		mapstructure.Decode(val, &r.IAMPolicyDocumentArray)
-
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessfunction_properties.go b/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessfunction_properties.go
deleted file mode 100644
index 593ac8c478..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/awsserverlessfunction_properties.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-
-	"github.com/mitchellh/mapstructure"
-)
-
-// AWSServerlessFunction_Properties is a helper struct that can hold either a S3Event, SNSEvent, KinesisEvent, DynamoDBEvent, ApiEvent, ScheduleEvent, CloudWatchEventEvent, IoTRuleEvent, or AlexaSkillEvent value
-type AWSServerlessFunction_Properties struct {
-	S3Event              *AWSServerlessFunction_S3Event
-	SNSEvent             *AWSServerlessFunction_SNSEvent
-	KinesisEvent         *AWSServerlessFunction_KinesisEvent
-	DynamoDBEvent        *AWSServerlessFunction_DynamoDBEvent
-	ApiEvent             *AWSServerlessFunction_ApiEvent
-	ScheduleEvent        *AWSServerlessFunction_ScheduleEvent
-	CloudWatchEventEvent *AWSServerlessFunction_CloudWatchEventEvent
-	IoTRuleEvent         *AWSServerlessFunction_IoTRuleEvent
-	AlexaSkillEvent      *AWSServerlessFunction_AlexaSkillEvent
-}
-
-func (r AWSServerlessFunction_Properties) value() interface{} {
-
-	if r.S3Event != nil {
-		return r.S3Event
-	}
-
-	if r.SNSEvent != nil {
-		return r.SNSEvent
-	}
-
-	if r.KinesisEvent != nil {
-		return r.KinesisEvent
-	}
-
-	if r.DynamoDBEvent != nil {
-		return r.DynamoDBEvent
-	}
-
-	if r.ApiEvent != nil {
-		return r.ApiEvent
-	}
-
-	if r.ScheduleEvent != nil {
-		return r.ScheduleEvent
-	}
-
-	if r.CloudWatchEventEvent != nil {
-		return r.CloudWatchEventEvent
-	}
-
-	if r.IoTRuleEvent != nil {
-		return r.IoTRuleEvent
-	}
-
-	if r.AlexaSkillEvent != nil {
-		return r.AlexaSkillEvent
-	}
-
-	return nil
-
-}
-
-func (r *AWSServerlessFunction_Properties) MarshalJSON() ([]byte, error) {
-	return json.Marshal(r.value())
-}
-
-// Hook into the marshaller
-func (r *AWSServerlessFunction_Properties) UnmarshalJSON(b []byte) error {
-
-	// Unmarshal into interface{} to check it's type
-	var typecheck interface{}
-	if err := json.Unmarshal(b, &typecheck); err != nil {
-		return err
-	}
-
-	switch val := typecheck.(type) {
-
-	case map[string]interface{}:
-
-		mapstructure.Decode(val, &r.S3Event)
-
-		mapstructure.Decode(val, &r.SNSEvent)
-
-		mapstructure.Decode(val, &r.KinesisEvent)
-
-		mapstructure.Decode(val, &r.DynamoDBEvent)
-
-		mapstructure.Decode(val, &r.ApiEvent)
-
-		mapstructure.Decode(val, &r.ScheduleEvent)
-
-		mapstructure.Decode(val, &r.CloudWatchEventEvent)
-
-		mapstructure.Decode(val, &r.IoTRuleEvent)
-
-		mapstructure.Decode(val, &r.AlexaSkillEvent)
-
-	case []interface{}:
-
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/tag.go b/vendor/github.com/awslabs/goformation/cloudformation/tag.go
deleted file mode 100644
index 5ea56c85c8..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/tag.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cloudformation
-
-// Tag AWS CloudFormation Resource (Tag)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html
-type Tag struct {
-
-	// Key AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html#cfn-resource-tags-key
-	Key string `json:"Key,omitempty"`
-
-	// Value AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html#cfn-resource-tags-value
-	Value string `json:"Value,omitempty"`
-}
-
-// AWSCloudFormationType returns the AWS CloudFormation resource type
-func (r *Tag) AWSCloudFormationType() string {
-	return "Tag"
-}
diff --git a/vendor/github.com/awslabs/goformation/cloudformation/template.go b/vendor/github.com/awslabs/goformation/cloudformation/template.go
deleted file mode 100644
index 21e3cc0b88..0000000000
--- a/vendor/github.com/awslabs/goformation/cloudformation/template.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package cloudformation
-
-import (
-	"encoding/json"
-
-	"github.com/sanathkr/yaml"
-)
-
-// Template represents an AWS CloudFormation template
-// see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-anatomy.html
-type Template struct {
-	AWSTemplateFormatVersion string                 `json:"AWSTemplateFormatVersion,omitempty"`
-	Description              string                 `json:"Description,omitempty"`
-	Metadata                 map[string]interface{} `json:"Metadata,omitempty"`
-	Parameters               map[string]interface{} `json:"Parameters,omitempty"`
-	Mappings                 map[string]interface{} `json:"Mappings,omitempty"`
-	Conditions               map[string]interface{} `json:"Conditions,omitempty"`
-	Resources                map[string]interface{} `json:"Resources,omitempty"`
-	Outputs                  map[string]interface{} `json:"Outputs,omitempty"`
-}
-
-// NewTemplate creates a new AWS CloudFormation template struct
-func NewTemplate() *Template {
-	return &Template{
-		AWSTemplateFormatVersion: "2010-09-09",
-		Description:              "",
-		Metadata:                 map[string]interface{}{},
-		Parameters:               map[string]interface{}{},
-		Mappings:                 map[string]interface{}{},
-		Conditions:               map[string]interface{}{},
-		Resources:                map[string]interface{}{},
-		Outputs:                  map[string]interface{}{},
-	}
-}
-
-// JSON converts an AWS CloudFormation template object to JSON
-func (t *Template) JSON() ([]byte, error) {
-	return json.Marshal(t)
-}
-
-// YAML converts an AWS CloudFormation template object to YAML
-func (t *Template) YAML() ([]byte, error) {
-	return yaml.Marshal(t)
-}
diff --git a/vendor/github.com/awslabs/goformation/goformation.go b/vendor/github.com/awslabs/goformation/goformation.go
deleted file mode 100644
index 589f31ce08..0000000000
--- a/vendor/github.com/awslabs/goformation/goformation.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package goformation
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"strings"
-
-	"github.com/awslabs/goformation/cloudformation"
-	"github.com/awslabs/goformation/intrinsics"
-)
-
-//go:generate generate/generate.sh
-
-// Open and parse a AWS CloudFormation template from file.
-// Works with either JSON or YAML formatted templates.
-func Open(filename string) (*cloudformation.Template, error) {
-	return OpenWithOptions(filename, nil)
-}
-
-// OpenWithOptions opens and parse a AWS CloudFormation template from file.
-// Works with either JSON or YAML formatted templates.
-// Parsing can be tweaked via the specified options.
-func OpenWithOptions(filename string, options *intrinsics.ProcessorOptions) (*cloudformation.Template, error) {
-
-	data, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	if strings.HasSuffix(filename, ".yaml") || strings.HasSuffix(filename, ".yml") {
-		return ParseYAMLWithOptions(data, options)
-	}
-
-	return ParseJSONWithOptions(data, options)
-
-}
-
-// ParseYAML an AWS CloudFormation template (expects a []byte of valid YAML)
-func ParseYAML(data []byte) (*cloudformation.Template, error) {
-	return ParseYAMLWithOptions(data, nil)
-}
-
-// ParseYAMLWithOptions an AWS CloudFormation template (expects a []byte of valid YAML)
-// Parsing can be tweaked via the specified options.
-func ParseYAMLWithOptions(data []byte, options *intrinsics.ProcessorOptions) (*cloudformation.Template, error) {
-	// Process all AWS CloudFormation intrinsic functions (e.g. Fn::Join)
-	intrinsified, err := intrinsics.ProcessYAML(data, options)
-	if err != nil {
-		return nil, err
-	}
-
-	return unmarshal(intrinsified)
-
-}
-
-// ParseJSON an AWS CloudFormation template (expects a []byte of valid JSON)
-func ParseJSON(data []byte) (*cloudformation.Template, error) {
-	return ParseJSONWithOptions(data, nil)
-}
-
-// ParseJSONWithOptions an AWS CloudFormation template (expects a []byte of valid JSON)
-// Parsing can be tweaked via the specified options.
-func ParseJSONWithOptions(data []byte, options *intrinsics.ProcessorOptions) (*cloudformation.Template, error) {
-
-	// Process all AWS CloudFormation intrinsic functions (e.g. Fn::Join)
-	intrinsified, err := intrinsics.ProcessJSON(data, options)
-	if err != nil {
-		return nil, err
-	}
-
-	return unmarshal(intrinsified)
-
-}
-
-func unmarshal(data []byte) (*cloudformation.Template, error) {
-
-	template := &cloudformation.Template{}
-	if err := json.Unmarshal(data, template); err != nil {
-		return nil, err
-	}
-
-	return template, nil
-
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/conditions.go b/vendor/github.com/awslabs/goformation/intrinsics/conditions.go
deleted file mode 100644
index 65bddfdcbd..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/conditions.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package intrinsics
-
-// condition evaluates a condition
-func condition(name string, input interface{}, template interface{}, options *ProcessorOptions) interface{} {
-	if v, ok := input.(string); ok {
-
-		if v, ok := retrieveCondition(input, template); ok {
-			return v
-		}
-
-		if c := getCondition(v, template); c != nil {
-			res := search(c, template, options)
-			// replace the value in the template so the value can be reused
-			setCondition(v, res, template)
-
-			return res
-		}
-	}
-
-	return nil
-}
-
-func setCondition(name string, val interface{}, template interface{}) {
-	if template, ok := template.(map[string]interface{}); ok {
-		// Check there is a conditions section
-		if uconditions, ok := template["Conditions"]; ok {
-			// Check the conditions section is a map
-			if conditions, ok := uconditions.(map[string]interface{}); ok {
-				// Check there is a condition with the same name as the condition
-				if _, ok := conditions[name]; ok {
-					conditions[name] = val
-				}
-			}
-		}
-	}
-}
-
-func getCondition(name string, template interface{}) interface{} {
-	if template, ok := template.(map[string]interface{}); ok {
-		// Check there is a conditions section
-		if uconditions, ok := template["Conditions"]; ok {
-			// Check the conditions section is a map
-			if conditions, ok := uconditions.(map[string]interface{}); ok {
-				// Check there is a condition with the same name as the condition
-				if ucondition, ok := conditions[name]; ok {
-					return ucondition
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
-func retrieveCondition(cName interface{}, template interface{}) (value bool, found bool) {
-
-	switch v := cName.(type) {
-	case string:
-		value, found = getCondition(v, template).(bool)
-	case bool:
-		value, found = v, true
-	}
-
-	return
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fnand.go b/vendor/github.com/awslabs/goformation/intrinsics/fnand.go
deleted file mode 100644
index cc18ccc52d..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fnand.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package intrinsics
-
-// FnAnd resolves the 'Fn::And' AWS CloudFormation intrinsic function.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-conditions.html#intrinsic-function-reference-conditions-and
-func FnAnd(name string, input interface{}, template interface{}) interface{} {
-	// "Fn::And": [{condition}, ...]
-
-	// Check the input is an array
-	if arr, ok := input.([]interface{}); ok {
-		if len(arr) < 2 || len(arr) > 10 {
-			return nil
-		}
-
-		for _, c := range arr {
-			if value, ok := retrieveCondition(c, template); ok {
-				if !value {
-					return false
-				}
-			} else {
-				return nil
-			}
-		}
-
-		return true
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fnbase64.go b/vendor/github.com/awslabs/goformation/intrinsics/fnbase64.go
deleted file mode 100644
index e24ecc2417..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fnbase64.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package intrinsics
-
-import "encoding/base64"
-
-// FnBase64 resolves the 'Fn::Base64' AWS CloudFormation intrinsic function.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-base64.htmlpackage intrinsics
-func FnBase64(name string, input interface{}, template interface{}) interface{} {
-
-	// { "Fn::Base64" : valueToEncode }
-
-	// Check the input is a string
-	if src, ok := input.(string); ok {
-		return base64.StdEncoding.EncodeToString([]byte(src))
-	}
-
-	return nil
-
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fnequals.go b/vendor/github.com/awslabs/goformation/intrinsics/fnequals.go
deleted file mode 100644
index b3c48455c2..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fnequals.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package intrinsics
-
-import (
-	"reflect"
-)
-
-// FnEquals resolves the 'Fn::Equals' AWS CloudFormation intrinsic function.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-conditions.html#intrinsic-function-reference-conditions-equals
-func FnEquals(name string, input interface{}, template interface{}) interface{} {
-	// "Fn::Equals" : ["value_1", "value_2"]
-
-	// Check the input is an array
-	if arr, ok := input.([]interface{}); ok {
-		if len(arr) != 2 {
-			return nil
-		}
-
-		return reflect.DeepEqual(arr[0], arr[1])
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fnfindinmap.go b/vendor/github.com/awslabs/goformation/intrinsics/fnfindinmap.go
deleted file mode 100644
index 29f98a9f19..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fnfindinmap.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package intrinsics
-
-// FnFindInMap resolves the 'Fn::FindInMap' AWS CloudFormation intrinsic function.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-findinmap.html
-func FnFindInMap(name string, input interface{}, template interface{}) interface{} {
-
-	// { "Fn::FindInMap" : [ "MapName", "TopLevelKey", "SecondLevelKey"] }
-
-	// "Mappings" : {
-	// 	"RegionMap" : {
-	// 		"us-east-1" : { "32" : "ami-6411e20d", "64" : "ami-7a11e213" },
-	// 		"us-west-1" : { "32" : "ami-c9c7978c", "64" : "ami-cfc7978a" },
-	// 		"eu-west-1" : { "32" : "ami-37c2f643", "64" : "ami-31c2f645" },
-	// 		"ap-southeast-1" : { "32" : "ami-66f28c34", "64" : "ami-60f28c32" },
-	// 		"ap-northeast-1" : { "32" : "ami-9c03a89d", "64" : "ami-a003a8a1" }
-	// 	}
-	// }
-
-	// Holy nesting batman! I'm sure there's a better way to do this... :)
-
-	// Check that the input is an array
-	if arr, ok := input.([]interface{}); ok {
-		// The first element should be the map name
-		if mapname, ok := arr[0].(string); ok {
-			// The second element should be the first level map key
-			if key1, ok := arr[1].(string); ok {
-				// The third element should be the second level map key
-				if key2, ok := arr[2].(string); ok {
-					// Check the map exists in the CloudFormation template
-					if tmpl, ok := template.(map[string]interface{}); ok {
-						if mappings, ok := tmpl["Mappings"]; ok {
-							if mapmap, ok := mappings.(map[string]interface{}); ok {
-								if found, ok := mapmap[mapname]; ok {
-									if foundmap, ok := found.(map[string]interface{}); ok {
-										// Ok, we've got the map, check the first key exists
-										if foundkey1, ok := foundmap[key1]; ok {
-											if foundkey1map, ok := foundkey1.(map[string]interface{}); ok {
-												if foundkey2, ok := foundkey1map[key2]; ok {
-													return foundkey2
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return nil
-
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fngetatt.go b/vendor/github.com/awslabs/goformation/intrinsics/fngetatt.go
deleted file mode 100644
index d7f64e00e3..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fngetatt.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package intrinsics
-
-// FnGetAtt is not implemented, and always returns nil.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getatt.html
-func FnGetAtt(name string, input interface{}, template interface{}) interface{} {
-
-	// { "Fn::GetAtt" : [ "logicalNameOfResource", "attributeName" ] }
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fngetazs.go b/vendor/github.com/awslabs/goformation/intrinsics/fngetazs.go
deleted file mode 100644
index 034259fc87..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fngetazs.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package intrinsics
-
-var AZs map[string][]interface{} = make(map[string][]interface{})
-
-func buildAZs(region string, zones ...string) (result []interface{}) {
-	for _, zone := range zones {
-		result = append(result, region+zone)
-	}
-	return
-}
-
-func init() {
-	AZs["us-east-1"] = buildAZs("us-east-1", "a", "b", "c", "d")
-	AZs["us-west-1"] = buildAZs("us-west-1", "a", "b")
-}
-
-// FnGetAZs resolves the 'Fn::GetAZs' AWS CloudFormation intrinsic function.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getavailabilityzones.html
-func FnGetAZs(name string, input interface{}, template interface{}) interface{} {
-
-	// Check the input is a string
-	if region, ok := input.(string); ok {
-		if region == "" {
-			region = "us-east-1"
-		}
-
-		if azs, ok := AZs[region]; ok {
-			return azs
-		} else {
-			//assume 3 AZs per region
-			return buildAZs(region, "a", "b", "c")
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fnif.go b/vendor/github.com/awslabs/goformation/intrinsics/fnif.go
deleted file mode 100644
index 985f0b561d..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fnif.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package intrinsics
-
-// FnIf resolves the 'Fn::If' AWS CloudFormation intrinsic function.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-conditions.html#intrinsic-function-reference-conditions-if
-func FnIf(name string, input interface{}, template interface{}) interface{} {
-
-	// "Fn::If": [condition_name, value_if_true, value_if_false]
-
-	// Check the input is an array
-	if arr, ok := input.([]interface{}); ok {
-		if len(arr) != 3 {
-			return nil
-		}
-
-		if value, ok := retrieveCondition(arr[0], template); ok {
-			if value {
-				return arr[1]
-			} else {
-				return arr[2]
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fnjoin.go b/vendor/github.com/awslabs/goformation/intrinsics/fnjoin.go
deleted file mode 100644
index a063908301..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fnjoin.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package intrinsics
-
-// FnJoin resolves the 'Fn::Join' AWS CloudFormation intrinsic function.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-join.html
-func FnJoin(name string, input interface{}, template interface{}) interface{} {
-
-	result := ""
-
-	// Check the input is an array
-	if arr, ok := input.([]interface{}); ok {
-		for _, value := range arr {
-			if str, ok := value.(string); ok {
-				result += str
-			}
-		}
-	}
-
-	return result
-
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fnnot.go b/vendor/github.com/awslabs/goformation/intrinsics/fnnot.go
deleted file mode 100644
index 78e8e23029..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fnnot.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package intrinsics
-
-// FnNot resolves the 'Fn::Not' AWS CloudFormation intrinsic function.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-conditions.html#intrinsic-function-reference-conditions-not
-func FnNot(name string, input interface{}, template interface{}) interface{} {
-	// "Fn::Not": [{condition}]
-
-	// Check the input is an array
-	if arr, ok := input.([]interface{}); ok {
-		if len(arr) != 1 {
-			return nil
-		}
-
-		if value, ok := retrieveCondition(arr[0], template); ok {
-			return !value
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fnor.go b/vendor/github.com/awslabs/goformation/intrinsics/fnor.go
deleted file mode 100644
index 3b0d505dae..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fnor.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package intrinsics
-
-// FnOr resolves the 'Fn::Or' AWS CloudFormation intrinsic function.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-conditions.html#intrinsic-function-reference-conditions-or
-func FnOr(name string, input interface{}, template interface{}) interface{} {
-	// "Fn::Or": [{condition}, ...]
-
-	// Check the input is an array
-	if arr, ok := input.([]interface{}); ok {
-		if len(arr) < 2 || len(arr) > 10 {
-			return nil
-		}
-
-		for _, c := range arr {
-			if value, ok := retrieveCondition(c, template); ok {
-				if value {
-					return true
-				}
-			} else {
-				return nil
-			}
-		}
-
-		return false
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fnselect.go b/vendor/github.com/awslabs/goformation/intrinsics/fnselect.go
deleted file mode 100644
index b6c56a8db4..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fnselect.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package intrinsics
-
-import "strconv"
-
-// FnSelect resolves the 'Fn::Select' AWS CloudFormation intrinsic function.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-select.html
-func FnSelect(name string, input interface{}, template interface{}) interface{} {
-
-	// { "Fn::Select" : [ index, listOfObjects ] }
-
-	// Check that the input is an array
-	if arr, ok := input.([]interface{}); ok {
-		// The first element should be the index
-		var index int
-		if index64, ok := arr[0].(float64); ok {
-			index = int(index64)
-		} else if indexStr, ok := arr[0].(string); ok {
-			if c, err := strconv.Atoi(indexStr); err == nil {
-				index = c
-			} else {
-				return nil
-			}
-		} else {
-			return nil
-		}
-
-		// The second element is the array of objects to search
-		if objects, ok := arr[1].([]interface{}); ok {
-			// Check the requested element is in bounds
-			if index < len(objects) {
-				return objects[index]
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fnsplit.go b/vendor/github.com/awslabs/goformation/intrinsics/fnsplit.go
deleted file mode 100644
index 64699f8a2c..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fnsplit.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package intrinsics
-
-import "strings"
-
-// FnSplit resolves the 'Fn::Split' AWS CloudFormation intrinsic function.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-split.html
-func FnSplit(name string, input interface{}, template interface{}) interface{} {
-
-	// { "Fn::Split" : [ "delimiter", "source string" ] }
-
-	// Check that the input is an array
-	if arr, ok := input.([]interface{}); ok {
-		// The first element should be a string (the delimiter)
-		if delim, ok := arr[0].(string); ok {
-			// The second element should be a string (the content to join)
-			if str, ok := arr[1].(string); ok {
-				return strings.Split(str, delim)
-			}
-		}
-	}
-
-	return []string{}
-
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/fnsub.go b/vendor/github.com/awslabs/goformation/intrinsics/fnsub.go
deleted file mode 100644
index 70404eb8b3..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/fnsub.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package intrinsics
-
-import (
-	"regexp"
-	"strings"
-)
-
-// FnSub resolves the 'Fn::Sub' AWS CloudFormation intrinsic function.
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-sub.html
-func FnSub(name string, input interface{}, template interface{}) interface{} {
-
-	// Input can either be a string for this type of Fn::Sub call:
-	// { "Fn::Sub": "some-string-with-a-${variable}" }
-
-	// or it will be an array of length two for named replacements
-	// { "Fn::Sub": [ "some ${replaced}", { "replaced": "value" } ] }
-
-	switch val := input.(type) {
-
-	case []interface{}:
-		// Replace each of the variables in element 0 with the items in element 1
-		if src, ok := val[0].(string); ok {
-			// The seconds element is a map of variables to replace
-			if replacements, ok := val[1].(map[string]interface{}); ok {
-				// Loop through the replacements
-				for key, replacement := range replacements {
-					// Check the replacement is a string
-					if value, ok := replacement.(string); ok {
-						src = strings.Replace(src, "${"+key+"}", value, -1)
-					}
-				}
-				return src
-			}
-		}
-
-	case string:
-		// Look up references for each of the variables
-		regex := regexp.MustCompile(`\$\{([\.0-9A-Za-z]+)\}`)
-		variables := regex.FindAllStringSubmatch(val, -1)
-		for _, variable := range variables {
-
-			var resolved interface{}
-			if strings.Contains(variable[1], ".") {
-				// If the variable name has a . in it, use Fn::GetAtt to resolve it
-				resolved = FnGetAtt("Fn::GetAtt", strings.Split(variable[1], "."), template)
-			} else {
-				// The variable name doesn't have a . in it, so use Ref
-				resolved = Ref("Ref", variable[1], template)
-			}
-
-			if resolved != nil {
-				if replacement, ok := resolved.(string); ok {
-					val = strings.Replace(val, variable[0], replacement, -1)
-				}
-			} else {
-				// The reference couldn't be resolved, so just strip the variable
-				val = strings.Replace(val, variable[0], "", -1)
-			}
-
-		}
-		return val
-	}
-
-	return nil
-
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/intrinsics.go b/vendor/github.com/awslabs/goformation/intrinsics/intrinsics.go
deleted file mode 100644
index 4d155670b5..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/intrinsics.go
+++ /dev/null
@@ -1,216 +0,0 @@
-package intrinsics
-
-import (
-	"encoding/json"
-	"fmt"
-
-	yamlwrapper "github.com/sanathkr/yaml"
-)
-
-// IntrinsicHandler is a function that applies an intrinsic function and returns
-// the response that should be placed in it's place. An intrinsic handler function
-// is passed the name of the intrinsic function (e.g. Fn::Join), and the object
-// to apply it to (as an interface{}), and should return the resolved object (as an interface{}).
-type IntrinsicHandler func(string, interface{}, interface{}) interface{}
-
-// IntrinsicFunctionHandlers is a map of all the possible AWS CloudFormation intrinsic
-// functions, and a handler function that is invoked to resolve.
-var defaultIntrinsicHandlers = map[string]IntrinsicHandler{
-	"Fn::Base64":      FnBase64,
-	"Fn::And":         FnAnd,
-	"Fn::Equals":      FnEquals,
-	"Fn::If":          FnIf,
-	"Fn::Not":         FnNot,
-	"Fn::Or":          FnOr,
-	"Fn::FindInMap":   FnFindInMap,
-	"Fn::GetAtt":      nonResolvingHandler,
-	"Fn::GetAZs":      FnGetAZs,
-	"Fn::ImportValue": nonResolvingHandler,
-	"Fn::Join":        FnJoin,
-	"Fn::Select":      FnSelect,
-	"Fn::Split":       FnSplit,
-	"Fn::Sub":         FnSub,
-	"Ref":             Ref,
-}
-
-// ProcessorOptions allows customisation of the intrinsic function processor behaviour.
-// Initially, this only allows overriding of the handlers for each intrinsic function type
-// and overriding template paramters.
-type ProcessorOptions struct {
-	IntrinsicHandlerOverrides map[string]IntrinsicHandler
-	ParameterOverrides        map[string]interface{}
-}
-
-// nonResolvingHandler is a simple example of an intrinsic function handler function
-// that refuses to resolve any intrinsic functions, and just returns a basic string.
-func nonResolvingHandler(name string, input interface{}, template interface{}) interface{} {
-	return nil
-}
-
-// ProcessYAML recursively searches through a byte array of JSON data for all
-// AWS CloudFormation intrinsic functions, resolves them, and then returns
-// the resulting  interface{} object.
-func ProcessYAML(input []byte, options *ProcessorOptions) ([]byte, error) {
-
-	// Convert short form intrinsic functions (e.g. !Sub) to long form
-	registerTagMarshallers()
-
-	data, err := yamlwrapper.YAMLToJSON(input)
-	if err != nil {
-		return nil, fmt.Errorf("invalid YAML template: %s", err)
-	}
-
-	return ProcessJSON(data, options)
-
-}
-
-// ProcessJSON recursively searches through a byte array of JSON data for all
-// AWS CloudFormation intrinsic functions, resolves them, and then returns
-// the resulting  interface{} object.
-func ProcessJSON(input []byte, options *ProcessorOptions) ([]byte, error) {
-
-	// First, unmarshal the JSON to a generic interface{} type
-	var unmarshalled interface{}
-	if err := json.Unmarshal(input, &unmarshalled); err != nil {
-		return nil, fmt.Errorf("invalid JSON: %s", err)
-	}
-
-	overrideParameters(unmarshalled, options)
-
-	evaluateConditions(unmarshalled, options)
-
-	// Process all of the intrinsic functions
-	processed := search(unmarshalled, unmarshalled, options)
-
-	// And return the result back as a []byte of JSON
-	result, err := json.MarshalIndent(processed, "", "  ")
-	if err != nil {
-		return nil, fmt.Errorf("invalid JSON: %s", err)
-	}
-
-	return result, nil
-}
-
-// overrideParameters replaces the default values of Parameters with the specified ones
-func overrideParameters(input interface{}, options *ProcessorOptions) {
-	if options == nil || len(options.ParameterOverrides) == 0 {
-		return
-	}
-
-	// Check the template is a map
-	if template, ok := input.(map[string]interface{}); ok {
-		// Check there is a parameters section
-		if uparameters, ok := template["Parameters"]; ok {
-			// Check the parameters section is a map
-			if parameters, ok := uparameters.(map[string]interface{}); ok {
-				for name, value := range options.ParameterOverrides {
-					// Check there is a parameter with the same name as the Ref
-					if uparameter, ok := parameters[name]; ok {
-						// Check the parameter is a map
-						if parameter, ok := uparameter.(map[string]interface{}); ok {
-							// Set the default value
-							parameter["Default"] = value
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-// evaluateConditions replaces each condition in the template with its corresponding
-// value
-func evaluateConditions(input interface{}, options *ProcessorOptions) {
-	if template, ok := input.(map[string]interface{}); ok {
-		// Check there is a conditions section
-		if uconditions, ok := template["Conditions"]; ok {
-			// Check the conditions section is a map
-			if conditions, ok := uconditions.(map[string]interface{}); ok {
-				for name, expr := range conditions {
-					conditions[name] = search(expr, input, options)
-				}
-			}
-		}
-	}
-}
-
-// Search is a recursive function, that will search through an interface{} looking for
-// an intrinsic function. If it finds one, it calls the provided handler function, passing
-// it the type of intrinsic function (e.g. 'Fn::Join'), and the contents. The intrinsic
-// handler is expected to return the value that is supposed to be there.
-func search(input interface{}, template interface{}, options *ProcessorOptions) interface{} {
-
-	switch value := input.(type) {
-
-	case map[string]interface{}:
-
-		// We've found an object in the JSON, it might be an intrinsic, it might not.
-		// To check, we need to see if it contains a specific key that matches the name
-		// of an intrinsic function. As golang maps do not guarentee ordering, we need
-		// to check every key, not just the first.
-		processed := map[string]interface{}{}
-		for key, val := range value {
-
-			// See if we have an intrinsic handler function for this object key provided in the
-			if h, ok := handler(key, options); ok {
-				// This is an intrinsic function, so replace the intrinsic function object
-				// with the result of calling the intrinsic function handler for this type
-				return h(key, search(val, template, options), template)
-			}
-
-			if key == "Condition" {
-				// This can lead to infinite recursion A -> B; B -> A;
-				// pass state of the conditions that we're evaluating so we can detect cycles
-				// in case of cycle, return nil
-				return condition(key, search(val, template, options), template, options)
-			}
-
-			// This is not an intrinsic function, recurse through it normally
-			processed[key] = search(val, template, options)
-
-		}
-		return processed
-
-	case []interface{}:
-
-		// We found an array in the JSON - recurse through it's elements looking for intrinsic functions
-		processed := []interface{}{}
-		for _, val := range value {
-			processed = append(processed, search(val, template, options))
-		}
-		return processed
-
-	case nil:
-		return value
-	case bool:
-		return value
-	case float64:
-		return value
-	case string:
-		return value
-	default:
-		return nil
-
-	}
-
-}
-
-// handler looks up the correct intrinsic function handler for an object key, if there is one.
-// If not, it returns nil, false.
-func handler(name string, options *ProcessorOptions) (IntrinsicHandler, bool) {
-
-	// Check if we have a handler for this intrinsic type in the instrinsic handler
-	// overrides in the options provided to Process()
-	if options != nil {
-		if h, ok := options.IntrinsicHandlerOverrides[name]; ok {
-			return h, true
-		}
-	}
-
-	if h, ok := defaultIntrinsicHandlers[name]; ok {
-		return h, true
-	}
-
-	return nil, false
-
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/ref.go b/vendor/github.com/awslabs/goformation/intrinsics/ref.go
deleted file mode 100644
index 6310efd99d..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/ref.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package intrinsics
-
-// Ref resolves the 'Ref' AWS CloudFormation intrinsic function.
-// Currently, this only resolves against CloudFormation Parameter default values
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-ref.html
-func Ref(name string, input interface{}, template interface{}) interface{} {
-
-	// Dang son, this has got more nest than a bald eagle
-	// Check the input is a string
-	if name, ok := input.(string); ok {
-
-		switch name {
-
-		case "AWS::AccountId":
-			return "123456789012"
-		case "AWS::NotificationARNs": //
-			return []string{"arn:aws:sns:us-east-1:123456789012:MyTopic"}
-		case "AWS::NoValue":
-			return nil
-		case "AWS::Region":
-			return "us-east-1"
-		case "AWS::StackId":
-			return "arn:aws:cloudformation:us-east-1:123456789012:stack/MyStack/1c2fa620-982a-11e3-aff7-50e2416294e0"
-		case "AWS::StackName":
-			return "goformation-stack"
-
-		default:
-
-			// This isn't a pseudo 'Ref' paramater, so we need to look inside the CloudFormation template
-			// to see if we can resolve the reference. This implementation just looks at the Parameters section
-			// to see if there is a parameter matching the name, and if so, return the default value.
-
-			// Check the template is a map
-			if template, ok := template.(map[string]interface{}); ok {
-				// Check there is a parameters section
-				if uparameters, ok := template["Parameters"]; ok {
-					// Check the parameters section is a map
-					if parameters, ok := uparameters.(map[string]interface{}); ok {
-						// Check there is a parameter with the same name as the Ref
-						if uparameter, ok := parameters[name]; ok {
-							// Check the parameter is a map
-							if parameter, ok := uparameter.(map[string]interface{}); ok {
-								// Check the parameter has a default
-								if def, ok := parameter["Default"]; ok {
-									return def
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-	}
-
-	return nil
-
-}
diff --git a/vendor/github.com/awslabs/goformation/intrinsics/tags.go b/vendor/github.com/awslabs/goformation/intrinsics/tags.go
deleted file mode 100644
index e153b7aca8..0000000000
--- a/vendor/github.com/awslabs/goformation/intrinsics/tags.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package intrinsics
-
-import (
-	"reflect"
-
-	yaml "github.com/sanathkr/go-yaml"
-)
-
-var allTags = []string{"Ref", "GetAtt", "Base64", "FindInMap", "GetAZs",
-	"ImportValue", "Join", "Select", "Split", "Sub",
-}
-
-type tagUnmarshalerType struct {
-}
-
-func (t *tagUnmarshalerType) UnmarshalYAMLTag(tag string, fieldValue reflect.Value) reflect.Value {
-
-	prefix := "Fn::"
-	if tag == "Ref" || tag == "Condition" {
-		prefix = ""
-	}
-
-	tag = prefix + tag
-
-	output := reflect.ValueOf(make(map[string]interface{}))
-	key := reflect.ValueOf(tag)
-
-	output.SetMapIndex(key, fieldValue)
-
-	return output
-}
-
-var tagUnmarshaller = &tagUnmarshalerType{}
-
-func registerTagMarshallers() {
-	for _, tag := range allTags {
-		yaml.RegisterTagUnmarshaler("!"+tag, tagUnmarshaller)
-	}
-}
-
-func unregisterTagMarshallers() {
-	for _, tag := range allTags {
-		yaml.RegisterTagUnmarshaler("!"+tag, tagUnmarshaller)
-	}
-}
diff --git a/vendor/github.com/codegangsta/cli/CHANGELOG.md b/vendor/github.com/codegangsta/cli/CHANGELOG.md
deleted file mode 100644
index 07f75464b4..0000000000
--- a/vendor/github.com/codegangsta/cli/CHANGELOG.md
+++ /dev/null
@@ -1,392 +0,0 @@
-# Change Log
-
-**ATTN**: This project uses [semantic versioning](http://semver.org/).
-
-## [Unreleased]
-
-## [1.19.1] - 2016-11-21
-
-### Fixed
-
-- Fixes regression introduced in 1.19.0 where using an `ActionFunc` as
-  the `Action` for a command would cause it to error rather than calling the
-  function. Should not have a affected declarative cases using `func(c
-  *cli.Context) err)`.
-- Shell completion now handles the case where the user specifies
-  `--generate-bash-completion` immediately after a flag that takes an argument.
-  Previously it call the application with `--generate-bash-completion` as the
-  flag value.
-
-## [1.19.0] - 2016-11-19
-### Added
-- `FlagsByName` was added to make it easy to sort flags (e.g. `sort.Sort(cli.FlagsByName(app.Flags))`)
-- A `Description` field was added to `App` for a more detailed description of
-  the application (similar to the existing `Description` field on `Command`)
-- Flag type code generation via `go generate`
-- Write to stderr and exit 1 if action returns non-nil error
-- Added support for TOML to the `altsrc` loader
-- `SkipArgReorder` was added to allow users to skip the argument reordering.
-  This is useful if you want to consider all "flags" after an argument as
-  arguments rather than flags (the default behavior of the stdlib `flag`
-  library). This is backported functionality from the [removal of the flag
-  reordering](https://github.com/urfave/cli/pull/398) in the unreleased version
-  2
-- For formatted errors (those implementing `ErrorFormatter`), the errors will
-  be formatted during output. Compatible with `pkg/errors`.
-
-### Changed
-- Raise minimum tested/supported Go version to 1.2+
-
-### Fixed
-- Consider empty environment variables as set (previously environment variables
-  with the equivalent of `""` would be skipped rather than their value used).
-- Return an error if the value in a given environment variable cannot be parsed
-  as the flag type. Previously these errors were silently swallowed.
-- Print full error when an invalid flag is specified (which includes the invalid flag)
-- `App.Writer` defaults to `stdout` when `nil`
-- If no action is specified on a command or app, the help is now printed instead of `panic`ing
-- `App.Metadata` is initialized automatically now (previously was `nil` unless initialized)
-- Correctly show help message if `-h` is provided to a subcommand
-- `context.(Global)IsSet` now respects environment variables. Previously it
-  would return `false` if a flag was specified in the environment rather than
-  as an argument
-- Removed deprecation warnings to STDERR to avoid them leaking to the end-user
-- `altsrc`s import paths were updated to use `gopkg.in/urfave/cli.v1`. This
-  fixes issues that occurred when `gopkg.in/urfave/cli.v1` was imported as well
-  as `altsrc` where Go would complain that the types didn't match
-
-## [1.18.1] - 2016-08-28
-### Fixed
-- Removed deprecation warnings to STDERR to avoid them leaking to the end-user (backported)
-
-## [1.18.0] - 2016-06-27
-### Added
-- `./runtests` test runner with coverage tracking by default
-- testing on OS X
-- testing on Windows
-- `UintFlag`, `Uint64Flag`, and `Int64Flag` types and supporting code
-
-### Changed
-- Use spaces for alignment in help/usage output instead of tabs, making the
-  output alignment consistent regardless of tab width
-
-### Fixed
-- Printing of command aliases in help text
-- Printing of visible flags for both struct and struct pointer flags
-- Display the `help` subcommand when using `CommandCategories`
-- No longer swallows `panic`s that occur within the `Action`s themselves when
-  detecting the signature of the `Action` field
-
-## [1.17.1] - 2016-08-28
-### Fixed
-- Removed deprecation warnings to STDERR to avoid them leaking to the end-user
-
-## [1.17.0] - 2016-05-09
-### Added
-- Pluggable flag-level help text rendering via `cli.DefaultFlagStringFunc`
-- `context.GlobalBoolT` was added as an analogue to `context.GlobalBool`
-- Support for hiding commands by setting `Hidden: true` -- this will hide the
-  commands in help output
-
-### Changed
-- `Float64Flag`, `IntFlag`, and `DurationFlag` default values are no longer
-  quoted in help text output.
-- All flag types now include `(default: {value})` strings following usage when a
-  default value can be (reasonably) detected.
-- `IntSliceFlag` and `StringSliceFlag` usage strings are now more consistent
-  with non-slice flag types
-- Apps now exit with a code of 3 if an unknown subcommand is specified
-  (previously they printed "No help topic for...", but still exited 0. This
-  makes it easier to script around apps built using `cli` since they can trust
-  that a 0 exit code indicated a successful execution.
-- cleanups based on [Go Report Card
-  feedback](https://goreportcard.com/report/github.com/urfave/cli)
-
-## [1.16.1] - 2016-08-28
-### Fixed
-- Removed deprecation warnings to STDERR to avoid them leaking to the end-user
-
-## [1.16.0] - 2016-05-02
-### Added
-- `Hidden` field on all flag struct types to omit from generated help text
-
-### Changed
-- `BashCompletionFlag` (`--enable-bash-completion`) is now omitted from
-generated help text via the `Hidden` field
-
-### Fixed
-- handling of error values in `HandleAction` and `HandleExitCoder`
-
-## [1.15.0] - 2016-04-30
-### Added
-- This file!
-- Support for placeholders in flag usage strings
-- `App.Metadata` map for arbitrary data/state management
-- `Set` and `GlobalSet` methods on `*cli.Context` for altering values after
-parsing.
-- Support for nested lookup of dot-delimited keys in structures loaded from
-YAML.
-
-### Changed
-- The `App.Action` and `Command.Action` now prefer a return signature of
-`func(*cli.Context) error`, as defined by `cli.ActionFunc`.  If a non-nil
-`error` is returned, there may be two outcomes:
-    - If the error fulfills `cli.ExitCoder`, then `os.Exit` will be called
-    automatically
-    - Else the error is bubbled up and returned from `App.Run`
-- Specifying an `Action` with the legacy return signature of
-`func(*cli.Context)` will produce a deprecation message to stderr
-- Specifying an `Action` that is not a `func` type will produce a non-zero exit
-from `App.Run`
-- Specifying an `Action` func that has an invalid (input) signature will
-produce a non-zero exit from `App.Run`
-
-### Deprecated
-- <a name="deprecated-cli-app-runandexitonerror"></a>
-`cli.App.RunAndExitOnError`, which should now be done by returning an error
-that fulfills `cli.ExitCoder` to `cli.App.Run`.
-- <a name="deprecated-cli-app-action-signature"></a> the legacy signature for
-`cli.App.Action` of `func(*cli.Context)`, which should now have a return
-signature of `func(*cli.Context) error`, as defined by `cli.ActionFunc`.
-
-### Fixed
-- Added missing `*cli.Context.GlobalFloat64` method
-
-## [1.14.0] - 2016-04-03 (backfilled 2016-04-25)
-### Added
-- Codebeat badge
-- Support for categorization via `CategorizedHelp` and `Categories` on app.
-
-### Changed
-- Use `filepath.Base` instead of `path.Base` in `Name` and `HelpName`.
-
-### Fixed
-- Ensure version is not shown in help text when `HideVersion` set.
-
-## [1.13.0] - 2016-03-06 (backfilled 2016-04-25)
-### Added
-- YAML file input support.
-- `NArg` method on context.
-
-## [1.12.0] - 2016-02-17 (backfilled 2016-04-25)
-### Added
-- Custom usage error handling.
-- Custom text support in `USAGE` section of help output.
-- Improved help messages for empty strings.
-- AppVeyor CI configuration.
-
-### Changed
-- Removed `panic` from default help printer func.
-- De-duping and optimizations.
-
-### Fixed
-- Correctly handle `Before`/`After` at command level when no subcommands.
-- Case of literal `-` argument causing flag reordering.
-- Environment variable hints on Windows.
-- Docs updates.
-
-## [1.11.1] - 2015-12-21 (backfilled 2016-04-25)
-### Changed
-- Use `path.Base` in `Name` and `HelpName`
-- Export `GetName` on flag types.
-
-### Fixed
-- Flag parsing when skipping is enabled.
-- Test output cleanup.
-- Move completion check to account for empty input case.
-
-## [1.11.0] - 2015-11-15 (backfilled 2016-04-25)
-### Added
-- Destination scan support for flags.
-- Testing against `tip` in Travis CI config.
-
-### Changed
-- Go version in Travis CI config.
-
-### Fixed
-- Removed redundant tests.
-- Use correct example naming in tests.
-
-## [1.10.2] - 2015-10-29 (backfilled 2016-04-25)
-### Fixed
-- Remove unused var in bash completion.
-
-## [1.10.1] - 2015-10-21 (backfilled 2016-04-25)
-### Added
-- Coverage and reference logos in README.
-
-### Fixed
-- Use specified values in help and version parsing.
-- Only display app version and help message once.
-
-## [1.10.0] - 2015-10-06 (backfilled 2016-04-25)
-### Added
-- More tests for existing functionality.
-- `ArgsUsage` at app and command level for help text flexibility.
-
-### Fixed
-- Honor `HideHelp` and `HideVersion` in `App.Run`.
-- Remove juvenile word from README.
-
-## [1.9.0] - 2015-09-08 (backfilled 2016-04-25)
-### Added
-- `FullName` on command with accompanying help output update.
-- Set default `$PROG` in bash completion.
-
-### Changed
-- Docs formatting.
-
-### Fixed
-- Removed self-referential imports in tests.
-
-## [1.8.0] - 2015-06-30 (backfilled 2016-04-25)
-### Added
-- Support for `Copyright` at app level.
-- `Parent` func at context level to walk up context lineage.
-
-### Fixed
-- Global flag processing at top level.
-
-## [1.7.1] - 2015-06-11 (backfilled 2016-04-25)
-### Added
-- Aggregate errors from `Before`/`After` funcs.
-- Doc comments on flag structs.
-- Include non-global flags when checking version and help.
-- Travis CI config updates.
-
-### Fixed
-- Ensure slice type flags have non-nil values.
-- Collect global flags from the full command hierarchy.
-- Docs prose.
-
-## [1.7.0] - 2015-05-03 (backfilled 2016-04-25)
-### Changed
-- `HelpPrinter` signature includes output writer.
-
-### Fixed
-- Specify go 1.1+ in docs.
-- Set `Writer` when running command as app.
-
-## [1.6.0] - 2015-03-23 (backfilled 2016-04-25)
-### Added
-- Multiple author support.
-- `NumFlags` at context level.
-- `Aliases` at command level.
-
-### Deprecated
-- `ShortName` at command level.
-
-### Fixed
-- Subcommand help output.
-- Backward compatible support for deprecated `Author` and `Email` fields.
-- Docs regarding `Names`/`Aliases`.
-
-## [1.5.0] - 2015-02-20 (backfilled 2016-04-25)
-### Added
-- `After` hook func support at app and command level.
-
-### Fixed
-- Use parsed context when running command as subcommand.
-- Docs prose.
-
-## [1.4.1] - 2015-01-09 (backfilled 2016-04-25)
-### Added
-- Support for hiding `-h / --help` flags, but not `help` subcommand.
-- Stop flag parsing after `--`.
-
-### Fixed
-- Help text for generic flags to specify single value.
-- Use double quotes in output for defaults.
-- Use `ParseInt` instead of `ParseUint` for int environment var values.
-- Use `0` as base when parsing int environment var values.
-
-## [1.4.0] - 2014-12-12 (backfilled 2016-04-25)
-### Added
-- Support for environment variable lookup "cascade".
-- Support for `Stdout` on app for output redirection.
-
-### Fixed
-- Print command help instead of app help in `ShowCommandHelp`.
-
-## [1.3.1] - 2014-11-13 (backfilled 2016-04-25)
-### Added
-- Docs and example code updates.
-
-### Changed
-- Default `-v / --version` flag made optional.
-
-## [1.3.0] - 2014-08-10 (backfilled 2016-04-25)
-### Added
-- `FlagNames` at context level.
-- Exposed `VersionPrinter` var for more control over version output.
-- Zsh completion hook.
-- `AUTHOR` section in default app help template.
-- Contribution guidelines.
-- `DurationFlag` type.
-
-## [1.2.0] - 2014-08-02
-### Added
-- Support for environment variable defaults on flags plus tests.
-
-## [1.1.0] - 2014-07-15
-### Added
-- Bash completion.
-- Optional hiding of built-in help command.
-- Optional skipping of flag parsing at command level.
-- `Author`, `Email`, and `Compiled` metadata on app.
-- `Before` hook func support at app and command level.
-- `CommandNotFound` func support at app level.
-- Command reference available on context.
-- `GenericFlag` type.
-- `Float64Flag` type.
-- `BoolTFlag` type.
-- `IsSet` flag helper on context.
-- More flag lookup funcs at context level.
-- More tests &amp; docs.
-
-### Changed
-- Help template updates to account for presence/absence of flags.
-- Separated subcommand help template.
-- Exposed `HelpPrinter` var for more control over help output.
-
-## [1.0.0] - 2013-11-01
-### Added
-- `help` flag in default app flag set and each command flag set.
-- Custom handling of argument parsing errors.
-- Command lookup by name at app level.
-- `StringSliceFlag` type and supporting `StringSlice` type.
-- `IntSliceFlag` type and supporting `IntSlice` type.
-- Slice type flag lookups by name at context level.
-- Export of app and command help functions.
-- More tests &amp; docs.
-
-## 0.1.0 - 2013-07-22
-### Added
-- Initial implementation.
-
-[Unreleased]: https://github.com/urfave/cli/compare/v1.18.0...HEAD
-[1.18.0]: https://github.com/urfave/cli/compare/v1.17.0...v1.18.0
-[1.17.0]: https://github.com/urfave/cli/compare/v1.16.0...v1.17.0
-[1.16.0]: https://github.com/urfave/cli/compare/v1.15.0...v1.16.0
-[1.15.0]: https://github.com/urfave/cli/compare/v1.14.0...v1.15.0
-[1.14.0]: https://github.com/urfave/cli/compare/v1.13.0...v1.14.0
-[1.13.0]: https://github.com/urfave/cli/compare/v1.12.0...v1.13.0
-[1.12.0]: https://github.com/urfave/cli/compare/v1.11.1...v1.12.0
-[1.11.1]: https://github.com/urfave/cli/compare/v1.11.0...v1.11.1
-[1.11.0]: https://github.com/urfave/cli/compare/v1.10.2...v1.11.0
-[1.10.2]: https://github.com/urfave/cli/compare/v1.10.1...v1.10.2
-[1.10.1]: https://github.com/urfave/cli/compare/v1.10.0...v1.10.1
-[1.10.0]: https://github.com/urfave/cli/compare/v1.9.0...v1.10.0
-[1.9.0]: https://github.com/urfave/cli/compare/v1.8.0...v1.9.0
-[1.8.0]: https://github.com/urfave/cli/compare/v1.7.1...v1.8.0
-[1.7.1]: https://github.com/urfave/cli/compare/v1.7.0...v1.7.1
-[1.7.0]: https://github.com/urfave/cli/compare/v1.6.0...v1.7.0
-[1.6.0]: https://github.com/urfave/cli/compare/v1.5.0...v1.6.0
-[1.5.0]: https://github.com/urfave/cli/compare/v1.4.1...v1.5.0
-[1.4.1]: https://github.com/urfave/cli/compare/v1.4.0...v1.4.1
-[1.4.0]: https://github.com/urfave/cli/compare/v1.3.1...v1.4.0
-[1.3.1]: https://github.com/urfave/cli/compare/v1.3.0...v1.3.1
-[1.3.0]: https://github.com/urfave/cli/compare/v1.2.0...v1.3.0
-[1.2.0]: https://github.com/urfave/cli/compare/v1.1.0...v1.2.0
-[1.1.0]: https://github.com/urfave/cli/compare/v1.0.0...v1.1.0
-[1.0.0]: https://github.com/urfave/cli/compare/v0.1.0...v1.0.0
diff --git a/vendor/github.com/codegangsta/cli/LICENSE b/vendor/github.com/codegangsta/cli/LICENSE
deleted file mode 100644
index 42a597e29b..0000000000
--- a/vendor/github.com/codegangsta/cli/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2016 Jeremy Saenz & Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/github.com/codegangsta/cli/README.md b/vendor/github.com/codegangsta/cli/README.md
deleted file mode 100644
index 2bbbd8ea97..0000000000
--- a/vendor/github.com/codegangsta/cli/README.md
+++ /dev/null
@@ -1,1381 +0,0 @@
-cli
-===
-
-[![Build Status](https://travis-ci.org/urfave/cli.svg?branch=master)](https://travis-ci.org/urfave/cli)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/rtgk5xufi932pb2v?svg=true)](https://ci.appveyor.com/project/urfave/cli)
-[![GoDoc](https://godoc.org/github.com/urfave/cli?status.svg)](https://godoc.org/github.com/urfave/cli)
-[![codebeat](https://codebeat.co/badges/0a8f30aa-f975-404b-b878-5fab3ae1cc5f)](https://codebeat.co/projects/github-com-urfave-cli)
-[![Go Report Card](https://goreportcard.com/badge/urfave/cli)](https://goreportcard.com/report/urfave/cli)
-[![top level coverage](https://gocover.io/_badge/github.com/urfave/cli?0 "top level coverage")](http://gocover.io/github.com/urfave/cli) /
-[![altsrc coverage](https://gocover.io/_badge/github.com/urfave/cli/altsrc?0 "altsrc coverage")](http://gocover.io/github.com/urfave/cli/altsrc)
-
-**Notice:** This is the library formerly known as
-`github.com/codegangsta/cli` -- Github will automatically redirect requests
-to this repository, but we recommend updating your references for clarity.
-
-cli is a simple, fast, and fun package for building command line apps in Go. The
-goal is to enable developers to write fast and distributable command line
-applications in an expressive way.
-
-<!-- toc -->
-
-- [Overview](#overview)
-- [Installation](#installation)
-  * [Supported platforms](#supported-platforms)
-  * [Using the `v2` branch](#using-the-v2-branch)
-  * [Pinning to the `v1` releases](#pinning-to-the-v1-releases)
-- [Getting Started](#getting-started)
-- [Examples](#examples)
-  * [Arguments](#arguments)
-  * [Flags](#flags)
-    + [Placeholder Values](#placeholder-values)
-    + [Alternate Names](#alternate-names)
-    + [Ordering](#ordering)
-    + [Values from the Environment](#values-from-the-environment)
-    + [Values from alternate input sources (YAML, TOML, and others)](#values-from-alternate-input-sources-yaml-toml-and-others)
-  * [Subcommands](#subcommands)
-  * [Subcommands categories](#subcommands-categories)
-  * [Exit code](#exit-code)
-  * [Bash Completion](#bash-completion)
-    + [Enabling](#enabling)
-    + [Distribution](#distribution)
-    + [Customization](#customization)
-  * [Generated Help Text](#generated-help-text)
-    + [Customization](#customization-1)
-  * [Version Flag](#version-flag)
-    + [Customization](#customization-2)
-    + [Full API Example](#full-api-example)
-- [Contribution Guidelines](#contribution-guidelines)
-
-<!-- tocstop -->
-
-## Overview
-
-Command line apps are usually so tiny that there is absolutely no reason why
-your code should *not* be self-documenting. Things like generating help text and
-parsing command flags/options should not hinder productivity when writing a
-command line app.
-
-**This is where cli comes into play.** cli makes command line programming fun,
-organized, and expressive!
-
-## Installation
-
-Make sure you have a working Go environment.  Go version 1.2+ is supported.  [See
-the install instructions for Go](http://golang.org/doc/install.html).
-
-To install cli, simply run:
-```
-$ go get github.com/urfave/cli
-```
-
-Make sure your `PATH` includes the `$GOPATH/bin` directory so your commands can
-be easily used:
-```
-export PATH=$PATH:$GOPATH/bin
-```
-
-### Supported platforms
-
-cli is tested against multiple versions of Go on Linux, and against the latest
-released version of Go on OS X and Windows.  For full details, see
-[`./.travis.yml`](./.travis.yml) and [`./appveyor.yml`](./appveyor.yml).
-
-### Using the `v2` branch
-
-**Warning**: The `v2` branch is currently unreleased and considered unstable.
-
-There is currently a long-lived branch named `v2` that is intended to land as
-the new `master` branch once development there has settled down.  The current
-`master` branch (mirrored as `v1`) is being manually merged into `v2` on
-an irregular human-based schedule, but generally if one wants to "upgrade" to
-`v2` *now* and accept the volatility (read: "awesomeness") that comes along with
-that, please use whatever version pinning of your preference, such as via
-`gopkg.in`:
-
-```
-$ go get gopkg.in/urfave/cli.v2
-```
-
-``` go
-...
-import (
-  "gopkg.in/urfave/cli.v2" // imports as package "cli"
-)
-...
-```
-
-### Pinning to the `v1` releases
-
-Similarly to the section above describing use of the `v2` branch, if one wants
-to avoid any unexpected compatibility pains once `v2` becomes `master`, then
-pinning to `v1` is an acceptable option, e.g.:
-
-```
-$ go get gopkg.in/urfave/cli.v1
-```
-
-``` go
-...
-import (
-  "gopkg.in/urfave/cli.v1" // imports as package "cli"
-)
-...
-```
-
-This will pull the latest tagged `v1` release (e.g. `v1.18.1` at the time of writing).
-
-## Getting Started
-
-One of the philosophies behind cli is that an API should be playful and full of
-discovery. So a cli app can be as little as one line of code in `main()`.
-
-<!-- {
-  "args": ["&#45;&#45;help"],
-  "output": "A new cli application"
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  cli.NewApp().Run(os.Args)
-}
-```
-
-This app will run and show help text, but is not very useful. Let's give an
-action to execute and some help documentation:
-
-<!-- {
-  "output": "boom! I say!"
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-  app.Name = "boom"
-  app.Usage = "make an explosive entrance"
-  app.Action = func(c *cli.Context) error {
-    fmt.Println("boom! I say!")
-    return nil
-  }
-
-  app.Run(os.Args)
-}
-```
-
-Running this already gives you a ton of functionality, plus support for things
-like subcommands and flags, which are covered below.
-
-## Examples
-
-Being a programmer can be a lonely job. Thankfully by the power of automation
-that is not the case! Let's create a greeter app to fend off our demons of
-loneliness!
-
-Start by creating a directory named `greet`, and within it, add a file,
-`greet.go` with the following code in it:
-
-<!-- {
-  "output": "Hello friend!"
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-  app.Name = "greet"
-  app.Usage = "fight the loneliness!"
-  app.Action = func(c *cli.Context) error {
-    fmt.Println("Hello friend!")
-    return nil
-  }
-
-  app.Run(os.Args)
-}
-```
-
-Install our command to the `$GOPATH/bin` directory:
-
-```
-$ go install
-```
-
-Finally run our new command:
-
-```
-$ greet
-Hello friend!
-```
-
-cli also generates neat help text:
-
-```
-$ greet help
-NAME:
-    greet - fight the loneliness!
-
-USAGE:
-    greet [global options] command [command options] [arguments...]
-
-VERSION:
-    0.0.0
-
-COMMANDS:
-    help, h  Shows a list of commands or help for one command
-
-GLOBAL OPTIONS
-    --version Shows version information
-```
-
-### Arguments
-
-You can lookup arguments by calling the `Args` function on `cli.Context`, e.g.:
-
-<!-- {
-  "output": "Hello \""
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Action = func(c *cli.Context) error {
-    fmt.Printf("Hello %q", c.Args().Get(0))
-    return nil
-  }
-
-  app.Run(os.Args)
-}
-```
-
-### Flags
-
-Setting and querying flags is simple.
-
-<!-- {
-  "output": "Hello Nefertiti"
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag {
-    cli.StringFlag{
-      Name: "lang",
-      Value: "english",
-      Usage: "language for the greeting",
-    },
-  }
-
-  app.Action = func(c *cli.Context) error {
-    name := "Nefertiti"
-    if c.NArg() > 0 {
-      name = c.Args().Get(0)
-    }
-    if c.String("lang") == "spanish" {
-      fmt.Println("Hola", name)
-    } else {
-      fmt.Println("Hello", name)
-    }
-    return nil
-  }
-
-  app.Run(os.Args)
-}
-```
-
-You can also set a destination variable for a flag, to which the content will be
-scanned.
-
-<!-- {
-  "output": "Hello someone"
-} -->
-``` go
-package main
-
-import (
-  "os"
-  "fmt"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  var language string
-
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag {
-    cli.StringFlag{
-      Name:        "lang",
-      Value:       "english",
-      Usage:       "language for the greeting",
-      Destination: &language,
-    },
-  }
-
-  app.Action = func(c *cli.Context) error {
-    name := "someone"
-    if c.NArg() > 0 {
-      name = c.Args()[0]
-    }
-    if language == "spanish" {
-      fmt.Println("Hola", name)
-    } else {
-      fmt.Println("Hello", name)
-    }
-    return nil
-  }
-
-  app.Run(os.Args)
-}
-```
-
-See full list of flags at http://godoc.org/github.com/urfave/cli
-
-#### Placeholder Values
-
-Sometimes it's useful to specify a flag's value within the usage string itself.
-Such placeholders are indicated with back quotes.
-
-For example this:
-
-<!-- {
-  "args": ["&#45;&#45;help"],
-  "output": "&#45;&#45;config FILE, &#45;c FILE"
-} -->
-```go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag{
-    cli.StringFlag{
-      Name:  "config, c",
-      Usage: "Load configuration from `FILE`",
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-Will result in help output like:
-
-```
---config FILE, -c FILE   Load configuration from FILE
-```
-
-Note that only the first placeholder is used. Subsequent back-quoted words will
-be left as-is.
-
-#### Alternate Names
-
-You can set alternate (or short) names for flags by providing a comma-delimited
-list for the `Name`. e.g.
-
-<!-- {
-  "args": ["&#45;&#45;help"],
-  "output": "&#45;&#45;lang value, &#45;l value.*language for the greeting.*default: \"english\""
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag {
-    cli.StringFlag{
-      Name: "lang, l",
-      Value: "english",
-      Usage: "language for the greeting",
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-That flag can then be set with `--lang spanish` or `-l spanish`. Note that
-giving two different forms of the same flag in the same command invocation is an
-error.
-
-#### Ordering
-
-Flags for the application and commands are shown in the order they are defined.
-However, it's possible to sort them from outside this library by using `FlagsByName`
-or `CommandsByName` with `sort`.
-
-For example this:
-
-<!-- {
-  "args": ["&#45;&#45;help"],
-  "output": "add a task to the list\n.*complete a task on the list\n.*\n\n.*\n.*Load configuration from FILE\n.*Language for the greeting.*"
-} -->
-``` go
-package main
-
-import (
-  "os"
-  "sort"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag {
-    cli.StringFlag{
-      Name: "lang, l",
-      Value: "english",
-      Usage: "Language for the greeting",
-    },
-    cli.StringFlag{
-      Name: "config, c",
-      Usage: "Load configuration from `FILE`",
-    },
-  }
-
-  app.Commands = []cli.Command{
-    {
-      Name:    "complete",
-      Aliases: []string{"c"},
-      Usage:   "complete a task on the list",
-      Action:  func(c *cli.Context) error {
-        return nil
-      },
-    },
-    {
-      Name:    "add",
-      Aliases: []string{"a"},
-      Usage:   "add a task to the list",
-      Action:  func(c *cli.Context) error {
-        return nil
-      },
-    },
-  }
-
-  sort.Sort(cli.FlagsByName(app.Flags))
-  sort.Sort(cli.CommandsByName(app.Commands))
-
-  app.Run(os.Args)
-}
-```
-
-Will result in help output like:
-
-```
---config FILE, -c FILE  Load configuration from FILE
---lang value, -l value  Language for the greeting (default: "english")
-```
-
-#### Values from the Environment
-
-You can also have the default value set from the environment via `EnvVar`.  e.g.
-
-<!-- {
-  "args": ["&#45;&#45;help"],
-  "output": "language for the greeting.*APP_LANG"
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag {
-    cli.StringFlag{
-      Name: "lang, l",
-      Value: "english",
-      Usage: "language for the greeting",
-      EnvVar: "APP_LANG",
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-The `EnvVar` may also be given as a comma-delimited "cascade", where the first
-environment variable that resolves is used as the default.
-
-<!-- {
-  "args": ["&#45;&#45;help"],
-  "output": "language for the greeting.*LEGACY_COMPAT_LANG.*APP_LANG.*LANG"
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag {
-    cli.StringFlag{
-      Name: "lang, l",
-      Value: "english",
-      Usage: "language for the greeting",
-      EnvVar: "LEGACY_COMPAT_LANG,APP_LANG,LANG",
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-#### Values from alternate input sources (YAML, TOML, and others)
-
-There is a separate package altsrc that adds support for getting flag values
-from other file input sources.
-
-Currently supported input source formats:
-* YAML
-* TOML
-
-In order to get values for a flag from an alternate input source the following
-code would be added to wrap an existing cli.Flag like below:
-
-``` go
-  altsrc.NewIntFlag(cli.IntFlag{Name: "test"})
-```
-
-Initialization must also occur for these flags. Below is an example initializing
-getting data from a yaml file below.
-
-``` go
-  command.Before = altsrc.InitInputSourceWithContext(command.Flags, NewYamlSourceFromFlagFunc("load"))
-```
-
-The code above will use the "load" string as a flag name to get the file name of
-a yaml file from the cli.Context.  It will then use that file name to initialize
-the yaml input source for any flags that are defined on that command.  As a note
-the "load" flag used would also have to be defined on the command flags in order
-for this code snipped to work.
-
-Currently only the aboved specified formats are supported but developers can
-add support for other input sources by implementing the
-altsrc.InputSourceContext for their given sources.
-
-Here is a more complete sample of a command using YAML support:
-
-<!-- {
-  "args": ["test-cmd", "&#45;&#45;help"],
-  "output": "&#45&#45;test value.*default: 0"
-} -->
-``` go
-package notmain
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-  "github.com/urfave/cli/altsrc"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  flags := []cli.Flag{
-    altsrc.NewIntFlag(cli.IntFlag{Name: "test"}),
-    cli.StringFlag{Name: "load"},
-  }
-
-  app.Action = func(c *cli.Context) error {
-    fmt.Println("yaml ist rad")
-    return nil
-  }
-
-  app.Before = altsrc.InitInputSourceWithContext(flags, altsrc.NewYamlSourceFromFlagFunc("load"))
-  app.Flags = flags
-
-  app.Run(os.Args)
-}
-```
-
-### Subcommands
-
-Subcommands can be defined for a more git-like command line app.
-
-<!-- {
-  "args": ["template", "add"],
-  "output": "new task template: .+"
-} -->
-```go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Commands = []cli.Command{
-    {
-      Name:    "add",
-      Aliases: []string{"a"},
-      Usage:   "add a task to the list",
-      Action:  func(c *cli.Context) error {
-        fmt.Println("added task: ", c.Args().First())
-        return nil
-      },
-    },
-    {
-      Name:    "complete",
-      Aliases: []string{"c"},
-      Usage:   "complete a task on the list",
-      Action:  func(c *cli.Context) error {
-        fmt.Println("completed task: ", c.Args().First())
-        return nil
-      },
-    },
-    {
-      Name:        "template",
-      Aliases:     []string{"t"},
-      Usage:       "options for task templates",
-      Subcommands: []cli.Command{
-        {
-          Name:  "add",
-          Usage: "add a new template",
-          Action: func(c *cli.Context) error {
-            fmt.Println("new task template: ", c.Args().First())
-            return nil
-          },
-        },
-        {
-          Name:  "remove",
-          Usage: "remove an existing template",
-          Action: func(c *cli.Context) error {
-            fmt.Println("removed task template: ", c.Args().First())
-            return nil
-          },
-        },
-      },
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-### Subcommands categories
-
-For additional organization in apps that have many subcommands, you can
-associate a category for each command to group them together in the help
-output.
-
-E.g.
-
-```go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Commands = []cli.Command{
-    {
-      Name: "noop",
-    },
-    {
-      Name:     "add",
-      Category: "template",
-    },
-    {
-      Name:     "remove",
-      Category: "template",
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-Will include:
-
-```
-COMMANDS:
-    noop
-
-  Template actions:
-    add
-    remove
-```
-
-### Exit code
-
-Calling `App.Run` will not automatically call `os.Exit`, which means that by
-default the exit code will "fall through" to being `0`.  An explicit exit code
-may be set by returning a non-nil error that fulfills `cli.ExitCoder`, *or* a
-`cli.MultiError` that includes an error that fulfills `cli.ExitCoder`, e.g.:
-
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-  app.Flags = []cli.Flag{
-    cli.BoolTFlag{
-      Name:  "ginger-crouton",
-      Usage: "is it in the soup?",
-    },
-  }
-  app.Action = func(ctx *cli.Context) error {
-    if !ctx.Bool("ginger-crouton") {
-      return cli.NewExitError("it is not in the soup", 86)
-    }
-    return nil
-  }
-
-  app.Run(os.Args)
-}
-```
-
-### Bash Completion
-
-You can enable completion commands by setting the `EnableBashCompletion`
-flag on the `App` object.  By default, this setting will only auto-complete to
-show an app's subcommands, but you can write your own completion methods for
-the App or its subcommands.
-
-<!-- {
-  "args": ["complete", "&#45;&#45;generate&#45;bash&#45;completion"],
-  "output": "laundry"
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  tasks := []string{"cook", "clean", "laundry", "eat", "sleep", "code"}
-
-  app := cli.NewApp()
-  app.EnableBashCompletion = true
-  app.Commands = []cli.Command{
-    {
-      Name:  "complete",
-      Aliases: []string{"c"},
-      Usage: "complete a task on the list",
-      Action: func(c *cli.Context) error {
-         fmt.Println("completed task: ", c.Args().First())
-         return nil
-      },
-      BashComplete: func(c *cli.Context) {
-        // This will complete if no args are passed
-        if c.NArg() > 0 {
-          return
-        }
-        for _, t := range tasks {
-          fmt.Println(t)
-        }
-      },
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-#### Enabling
-
-Source the `autocomplete/bash_autocomplete` file in your `.bashrc` file while
-setting the `PROG` variable to the name of your program:
-
-`PROG=myprogram source /.../cli/autocomplete/bash_autocomplete`
-
-#### Distribution
-
-Copy `autocomplete/bash_autocomplete` into `/etc/bash_completion.d/` and rename
-it to the name of the program you wish to add autocomplete support for (or
-automatically install it there if you are distributing a package). Don't forget
-to source the file to make it active in the current shell.
-
-```
-sudo cp src/bash_autocomplete /etc/bash_completion.d/<myprogram>
-source /etc/bash_completion.d/<myprogram>
-```
-
-Alternatively, you can just document that users should source the generic
-`autocomplete/bash_autocomplete` in their bash configuration with `$PROG` set
-to the name of their program (as above).
-
-#### Customization
-
-The default bash completion flag (`--generate-bash-completion`) is defined as
-`cli.BashCompletionFlag`, and may be redefined if desired, e.g.:
-
-<!-- {
-  "args": ["&#45;&#45;compgen"],
-  "output": "wat\nhelp\nh"
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  cli.BashCompletionFlag = cli.BoolFlag{
-    Name:   "compgen",
-    Hidden: true,
-  }
-
-  app := cli.NewApp()
-  app.EnableBashCompletion = true
-  app.Commands = []cli.Command{
-    {
-      Name: "wat",
-    },
-  }
-  app.Run(os.Args)
-}
-```
-
-### Generated Help Text
-
-The default help flag (`-h/--help`) is defined as `cli.HelpFlag` and is checked
-by the cli internals in order to print generated help text for the app, command,
-or subcommand, and break execution.
-
-#### Customization
-
-All of the help text generation may be customized, and at multiple levels.  The
-templates are exposed as variables `AppHelpTemplate`, `CommandHelpTemplate`, and
-`SubcommandHelpTemplate` which may be reassigned or augmented, and full override
-is possible by assigning a compatible func to the `cli.HelpPrinter` variable,
-e.g.:
-
-<!-- {
-  "output": "Ha HA.  I pwnd the help!!1"
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "io"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  // EXAMPLE: Append to an existing template
-  cli.AppHelpTemplate = fmt.Sprintf(`%s
-
-WEBSITE: http://awesometown.example.com
-
-SUPPORT: support@awesometown.example.com
-
-`, cli.AppHelpTemplate)
-
-  // EXAMPLE: Override a template
-  cli.AppHelpTemplate = `NAME:
-   {{.Name}} - {{.Usage}}
-USAGE:
-   {{.HelpName}} {{if .VisibleFlags}}[global options]{{end}}{{if .Commands}} command [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}
-   {{if len .Authors}}
-AUTHOR:
-   {{range .Authors}}{{ . }}{{end}}
-   {{end}}{{if .Commands}}
-COMMANDS:
-{{range .Commands}}{{if not .HideHelp}}   {{join .Names ", "}}{{ "\t"}}{{.Usage}}{{ "\n" }}{{end}}{{end}}{{end}}{{if .VisibleFlags}}
-GLOBAL OPTIONS:
-   {{range .VisibleFlags}}{{.}}
-   {{end}}{{end}}{{if .Copyright }}
-COPYRIGHT:
-   {{.Copyright}}
-   {{end}}{{if .Version}}
-VERSION:
-   {{.Version}}
-   {{end}}
-`
-
-  // EXAMPLE: Replace the `HelpPrinter` func
-  cli.HelpPrinter = func(w io.Writer, templ string, data interface{}) {
-    fmt.Println("Ha HA.  I pwnd the help!!1")
-  }
-
-  cli.NewApp().Run(os.Args)
-}
-```
-
-The default flag may be customized to something other than `-h/--help` by
-setting `cli.HelpFlag`, e.g.:
-
-<!-- {
-  "args": ["&#45;&#45halp"],
-  "output": "haaaaalp.*HALP"
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  cli.HelpFlag = cli.BoolFlag{
-    Name: "halp, haaaaalp",
-    Usage: "HALP",
-    EnvVar: "SHOW_HALP,HALPPLZ",
-  }
-
-  cli.NewApp().Run(os.Args)
-}
-```
-
-### Version Flag
-
-The default version flag (`-v/--version`) is defined as `cli.VersionFlag`, which
-is checked by the cli internals in order to print the `App.Version` via
-`cli.VersionPrinter` and break execution.
-
-#### Customization
-
-The default flag may be customized to something other than `-v/--version` by
-setting `cli.VersionFlag`, e.g.:
-
-<!-- {
-  "args": ["&#45;&#45print-version"],
-  "output": "partay version 19\\.99\\.0"
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  cli.VersionFlag = cli.BoolFlag{
-    Name: "print-version, V",
-    Usage: "print only the version",
-  }
-
-  app := cli.NewApp()
-  app.Name = "partay"
-  app.Version = "19.99.0"
-  app.Run(os.Args)
-}
-```
-
-Alternatively, the version printer at `cli.VersionPrinter` may be overridden, e.g.:
-
-<!-- {
-  "args": ["&#45;&#45version"],
-  "output": "version=19\\.99\\.0 revision=fafafaf"
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-var (
-  Revision = "fafafaf"
-)
-
-func main() {
-  cli.VersionPrinter = func(c *cli.Context) {
-    fmt.Printf("version=%s revision=%s\n", c.App.Version, Revision)
-  }
-
-  app := cli.NewApp()
-  app.Name = "partay"
-  app.Version = "19.99.0"
-  app.Run(os.Args)
-}
-```
-
-#### Full API Example
-
-**Notice**: This is a contrived (functioning) example meant strictly for API
-demonstration purposes.  Use of one's imagination is encouraged.
-
-<!-- {
-  "output": "made it!\nPhew!"
-} -->
-``` go
-package main
-
-import (
-  "errors"
-  "flag"
-  "fmt"
-  "io"
-  "io/ioutil"
-  "os"
-  "time"
-
-  "github.com/urfave/cli"
-)
-
-func init() {
-  cli.AppHelpTemplate += "\nCUSTOMIZED: you bet ur muffins\n"
-  cli.CommandHelpTemplate += "\nYMMV\n"
-  cli.SubcommandHelpTemplate += "\nor something\n"
-
-  cli.HelpFlag = cli.BoolFlag{Name: "halp"}
-  cli.BashCompletionFlag = cli.BoolFlag{Name: "compgen", Hidden: true}
-  cli.VersionFlag = cli.BoolFlag{Name: "print-version, V"}
-
-  cli.HelpPrinter = func(w io.Writer, templ string, data interface{}) {
-    fmt.Fprintf(w, "best of luck to you\n")
-  }
-  cli.VersionPrinter = func(c *cli.Context) {
-    fmt.Fprintf(c.App.Writer, "version=%s\n", c.App.Version)
-  }
-  cli.OsExiter = func(c int) {
-    fmt.Fprintf(cli.ErrWriter, "refusing to exit %d\n", c)
-  }
-  cli.ErrWriter = ioutil.Discard
-  cli.FlagStringer = func(fl cli.Flag) string {
-    return fmt.Sprintf("\t\t%s", fl.GetName())
-  }
-}
-
-type hexWriter struct{}
-
-func (w *hexWriter) Write(p []byte) (int, error) {
-  for _, b := range p {
-    fmt.Printf("%x", b)
-  }
-  fmt.Printf("\n")
-
-  return len(p), nil
-}
-
-type genericType struct{
-  s string
-}
-
-func (g *genericType) Set(value string) error {
-  g.s = value
-  return nil
-}
-
-func (g *genericType) String() string {
-  return g.s
-}
-
-func main() {
-  app := cli.NewApp()
-  app.Name = "kənˈtrīv"
-  app.Version = "19.99.0"
-  app.Compiled = time.Now()
-  app.Authors = []cli.Author{
-    cli.Author{
-      Name:  "Example Human",
-      Email: "human@example.com",
-    },
-  }
-  app.Copyright = "(c) 1999 Serious Enterprise"
-  app.HelpName = "contrive"
-  app.Usage = "demonstrate available API"
-  app.UsageText = "contrive - demonstrating the available API"
-  app.ArgsUsage = "[args and such]"
-  app.Commands = []cli.Command{
-    cli.Command{
-      Name:        "doo",
-      Aliases:     []string{"do"},
-      Category:    "motion",
-      Usage:       "do the doo",
-      UsageText:   "doo - does the dooing",
-      Description: "no really, there is a lot of dooing to be done",
-      ArgsUsage:   "[arrgh]",
-      Flags: []cli.Flag{
-        cli.BoolFlag{Name: "forever, forevvarr"},
-      },
-      Subcommands: cli.Commands{
-        cli.Command{
-          Name:   "wop",
-          Action: wopAction,
-        },
-      },
-      SkipFlagParsing: false,
-      HideHelp:        false,
-      Hidden:          false,
-      HelpName:        "doo!",
-      BashComplete: func(c *cli.Context) {
-        fmt.Fprintf(c.App.Writer, "--better\n")
-      },
-      Before: func(c *cli.Context) error {
-        fmt.Fprintf(c.App.Writer, "brace for impact\n")
-        return nil
-      },
-      After: func(c *cli.Context) error {
-        fmt.Fprintf(c.App.Writer, "did we lose anyone?\n")
-        return nil
-      },
-      Action: func(c *cli.Context) error {
-        c.Command.FullName()
-        c.Command.HasName("wop")
-        c.Command.Names()
-        c.Command.VisibleFlags()
-        fmt.Fprintf(c.App.Writer, "dodododododoodododddooooododododooo\n")
-        if c.Bool("forever") {
-          c.Command.Run(c)
-        }
-        return nil
-      },
-      OnUsageError: func(c *cli.Context, err error, isSubcommand bool) error {
-        fmt.Fprintf(c.App.Writer, "for shame\n")
-        return err
-      },
-    },
-  }
-  app.Flags = []cli.Flag{
-    cli.BoolFlag{Name: "fancy"},
-    cli.BoolTFlag{Name: "fancier"},
-    cli.DurationFlag{Name: "howlong, H", Value: time.Second * 3},
-    cli.Float64Flag{Name: "howmuch"},
-    cli.GenericFlag{Name: "wat", Value: &genericType{}},
-    cli.Int64Flag{Name: "longdistance"},
-    cli.Int64SliceFlag{Name: "intervals"},
-    cli.IntFlag{Name: "distance"},
-    cli.IntSliceFlag{Name: "times"},
-    cli.StringFlag{Name: "dance-move, d"},
-    cli.StringSliceFlag{Name: "names, N"},
-    cli.UintFlag{Name: "age"},
-    cli.Uint64Flag{Name: "bigage"},
-  }
-  app.EnableBashCompletion = true
-  app.HideHelp = false
-  app.HideVersion = false
-  app.BashComplete = func(c *cli.Context) {
-    fmt.Fprintf(c.App.Writer, "lipstick\nkiss\nme\nlipstick\nringo\n")
-  }
-  app.Before = func(c *cli.Context) error {
-    fmt.Fprintf(c.App.Writer, "HEEEERE GOES\n")
-    return nil
-  }
-  app.After = func(c *cli.Context) error {
-    fmt.Fprintf(c.App.Writer, "Phew!\n")
-    return nil
-  }
-  app.CommandNotFound = func(c *cli.Context, command string) {
-    fmt.Fprintf(c.App.Writer, "Thar be no %q here.\n", command)
-  }
-  app.OnUsageError = func(c *cli.Context, err error, isSubcommand bool) error {
-    if isSubcommand {
-      return err
-    }
-
-    fmt.Fprintf(c.App.Writer, "WRONG: %#v\n", err)
-    return nil
-  }
-  app.Action = func(c *cli.Context) error {
-    cli.DefaultAppComplete(c)
-    cli.HandleExitCoder(errors.New("not an exit coder, though"))
-    cli.ShowAppHelp(c)
-    cli.ShowCommandCompletions(c, "nope")
-    cli.ShowCommandHelp(c, "also-nope")
-    cli.ShowCompletions(c)
-    cli.ShowSubcommandHelp(c)
-    cli.ShowVersion(c)
-
-    categories := c.App.Categories()
-    categories.AddCommand("sounds", cli.Command{
-      Name: "bloop",
-    })
-
-    for _, category := range c.App.Categories() {
-      fmt.Fprintf(c.App.Writer, "%s\n", category.Name)
-      fmt.Fprintf(c.App.Writer, "%#v\n", category.Commands)
-      fmt.Fprintf(c.App.Writer, "%#v\n", category.VisibleCommands())
-    }
-
-    fmt.Printf("%#v\n", c.App.Command("doo"))
-    if c.Bool("infinite") {
-      c.App.Run([]string{"app", "doo", "wop"})
-    }
-
-    if c.Bool("forevar") {
-      c.App.RunAsSubcommand(c)
-    }
-    c.App.Setup()
-    fmt.Printf("%#v\n", c.App.VisibleCategories())
-    fmt.Printf("%#v\n", c.App.VisibleCommands())
-    fmt.Printf("%#v\n", c.App.VisibleFlags())
-
-    fmt.Printf("%#v\n", c.Args().First())
-    if len(c.Args()) > 0 {
-      fmt.Printf("%#v\n", c.Args()[1])
-    }
-    fmt.Printf("%#v\n", c.Args().Present())
-    fmt.Printf("%#v\n", c.Args().Tail())
-
-    set := flag.NewFlagSet("contrive", 0)
-    nc := cli.NewContext(c.App, set, c)
-
-    fmt.Printf("%#v\n", nc.Args())
-    fmt.Printf("%#v\n", nc.Bool("nope"))
-    fmt.Printf("%#v\n", nc.BoolT("nerp"))
-    fmt.Printf("%#v\n", nc.Duration("howlong"))
-    fmt.Printf("%#v\n", nc.Float64("hay"))
-    fmt.Printf("%#v\n", nc.Generic("bloop"))
-    fmt.Printf("%#v\n", nc.Int64("bonk"))
-    fmt.Printf("%#v\n", nc.Int64Slice("burnks"))
-    fmt.Printf("%#v\n", nc.Int("bips"))
-    fmt.Printf("%#v\n", nc.IntSlice("blups"))
-    fmt.Printf("%#v\n", nc.String("snurt"))
-    fmt.Printf("%#v\n", nc.StringSlice("snurkles"))
-    fmt.Printf("%#v\n", nc.Uint("flub"))
-    fmt.Printf("%#v\n", nc.Uint64("florb"))
-    fmt.Printf("%#v\n", nc.GlobalBool("global-nope"))
-    fmt.Printf("%#v\n", nc.GlobalBoolT("global-nerp"))
-    fmt.Printf("%#v\n", nc.GlobalDuration("global-howlong"))
-    fmt.Printf("%#v\n", nc.GlobalFloat64("global-hay"))
-    fmt.Printf("%#v\n", nc.GlobalGeneric("global-bloop"))
-    fmt.Printf("%#v\n", nc.GlobalInt("global-bips"))
-    fmt.Printf("%#v\n", nc.GlobalIntSlice("global-blups"))
-    fmt.Printf("%#v\n", nc.GlobalString("global-snurt"))
-    fmt.Printf("%#v\n", nc.GlobalStringSlice("global-snurkles"))
-
-    fmt.Printf("%#v\n", nc.FlagNames())
-    fmt.Printf("%#v\n", nc.GlobalFlagNames())
-    fmt.Printf("%#v\n", nc.GlobalIsSet("wat"))
-    fmt.Printf("%#v\n", nc.GlobalSet("wat", "nope"))
-    fmt.Printf("%#v\n", nc.NArg())
-    fmt.Printf("%#v\n", nc.NumFlags())
-    fmt.Printf("%#v\n", nc.Parent())
-
-    nc.Set("wat", "also-nope")
-
-    ec := cli.NewExitError("ohwell", 86)
-    fmt.Fprintf(c.App.Writer, "%d", ec.ExitCode())
-    fmt.Printf("made it!\n")
-    return ec
-  }
-
-  if os.Getenv("HEXY") != "" {
-    app.Writer = &hexWriter{}
-    app.ErrWriter = &hexWriter{}
-  }
-
-  app.Metadata = map[string]interface{}{
-    "layers":     "many",
-    "explicable": false,
-    "whatever-values": 19.99,
-  }
-
-  app.Run(os.Args)
-}
-
-func wopAction(c *cli.Context) error {
-  fmt.Fprintf(c.App.Writer, ":wave: over here, eh\n")
-  return nil
-}
-```
-
-## Contribution Guidelines
-
-Feel free to put up a pull request to fix a bug or maybe add a feature. I will
-give it a code review and make sure that it does not break backwards
-compatibility. If I or any other collaborators agree that it is in line with
-the vision of the project, we will work with you to get the code into
-a mergeable state and merge it into the master branch.
-
-If you have contributed something significant to the project, we will most
-likely add you as a collaborator. As a collaborator you are given the ability
-to merge others pull requests. It is very important that new code does not
-break existing code, so be careful about what code you do choose to merge.
-
-If you feel like you have contributed to the project but have not yet been
-added as a collaborator, we probably forgot to add you, please open an issue.
diff --git a/vendor/github.com/codegangsta/cli/app.go b/vendor/github.com/codegangsta/cli/app.go
deleted file mode 100644
index 95ffc0b976..0000000000
--- a/vendor/github.com/codegangsta/cli/app.go
+++ /dev/null
@@ -1,492 +0,0 @@
-package cli
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sort"
-	"time"
-)
-
-var (
-	changeLogURL                    = "https://github.com/urfave/cli/blob/master/CHANGELOG.md"
-	appActionDeprecationURL         = fmt.Sprintf("%s#deprecated-cli-app-action-signature", changeLogURL)
-	runAndExitOnErrorDeprecationURL = fmt.Sprintf("%s#deprecated-cli-app-runandexitonerror", changeLogURL)
-
-	contactSysadmin = "This is an error in the application.  Please contact the distributor of this application if this is not you."
-
-	errInvalidActionType = NewExitError("ERROR invalid Action type. "+
-		fmt.Sprintf("Must be `func(*Context`)` or `func(*Context) error).  %s", contactSysadmin)+
-		fmt.Sprintf("See %s", appActionDeprecationURL), 2)
-)
-
-// App is the main structure of a cli application. It is recommended that
-// an app be created with the cli.NewApp() function
-type App struct {
-	// The name of the program. Defaults to path.Base(os.Args[0])
-	Name string
-	// Full name of command for help, defaults to Name
-	HelpName string
-	// Description of the program.
-	Usage string
-	// Text to override the USAGE section of help
-	UsageText string
-	// Description of the program argument format.
-	ArgsUsage string
-	// Version of the program
-	Version string
-	// Description of the program
-	Description string
-	// List of commands to execute
-	Commands []Command
-	// List of flags to parse
-	Flags []Flag
-	// Boolean to enable bash completion commands
-	EnableBashCompletion bool
-	// Boolean to hide built-in help command
-	HideHelp bool
-	// Boolean to hide built-in version flag and the VERSION section of help
-	HideVersion bool
-	// Populate on app startup, only gettable through method Categories()
-	categories CommandCategories
-	// An action to execute when the bash-completion flag is set
-	BashComplete BashCompleteFunc
-	// An action to execute before any subcommands are run, but after the context is ready
-	// If a non-nil error is returned, no subcommands are run
-	Before BeforeFunc
-	// An action to execute after any subcommands are run, but after the subcommand has finished
-	// It is run even if Action() panics
-	After AfterFunc
-
-	// The action to execute when no subcommands are specified
-	// Expects a `cli.ActionFunc` but will accept the *deprecated* signature of `func(*cli.Context) {}`
-	// *Note*: support for the deprecated `Action` signature will be removed in a future version
-	Action interface{}
-
-	// Execute this function if the proper command cannot be found
-	CommandNotFound CommandNotFoundFunc
-	// Execute this function if an usage error occurs
-	OnUsageError OnUsageErrorFunc
-	// Compilation date
-	Compiled time.Time
-	// List of all authors who contributed
-	Authors []Author
-	// Copyright of the binary if any
-	Copyright string
-	// Name of Author (Note: Use App.Authors, this is deprecated)
-	Author string
-	// Email of Author (Note: Use App.Authors, this is deprecated)
-	Email string
-	// Writer writer to write output to
-	Writer io.Writer
-	// ErrWriter writes error output
-	ErrWriter io.Writer
-	// Other custom info
-	Metadata map[string]interface{}
-
-	didSetup bool
-}
-
-// Tries to find out when this binary was compiled.
-// Returns the current time if it fails to find it.
-func compileTime() time.Time {
-	info, err := os.Stat(os.Args[0])
-	if err != nil {
-		return time.Now()
-	}
-	return info.ModTime()
-}
-
-// NewApp creates a new cli Application with some reasonable defaults for Name,
-// Usage, Version and Action.
-func NewApp() *App {
-	return &App{
-		Name:         filepath.Base(os.Args[0]),
-		HelpName:     filepath.Base(os.Args[0]),
-		Usage:        "A new cli application",
-		UsageText:    "",
-		Version:      "0.0.0",
-		BashComplete: DefaultAppComplete,
-		Action:       helpCommand.Action,
-		Compiled:     compileTime(),
-		Writer:       os.Stdout,
-	}
-}
-
-// Setup runs initialization code to ensure all data structures are ready for
-// `Run` or inspection prior to `Run`.  It is internally called by `Run`, but
-// will return early if setup has already happened.
-func (a *App) Setup() {
-	if a.didSetup {
-		return
-	}
-
-	a.didSetup = true
-
-	if a.Author != "" || a.Email != "" {
-		a.Authors = append(a.Authors, Author{Name: a.Author, Email: a.Email})
-	}
-
-	newCmds := []Command{}
-	for _, c := range a.Commands {
-		if c.HelpName == "" {
-			c.HelpName = fmt.Sprintf("%s %s", a.HelpName, c.Name)
-		}
-		newCmds = append(newCmds, c)
-	}
-	a.Commands = newCmds
-
-	if a.Command(helpCommand.Name) == nil && !a.HideHelp {
-		a.Commands = append(a.Commands, helpCommand)
-		if (HelpFlag != BoolFlag{}) {
-			a.appendFlag(HelpFlag)
-		}
-	}
-
-	if !a.HideVersion {
-		a.appendFlag(VersionFlag)
-	}
-
-	a.categories = CommandCategories{}
-	for _, command := range a.Commands {
-		a.categories = a.categories.AddCommand(command.Category, command)
-	}
-	sort.Sort(a.categories)
-
-	if a.Metadata == nil {
-		a.Metadata = make(map[string]interface{})
-	}
-
-	if a.Writer == nil {
-		a.Writer = os.Stdout
-	}
-}
-
-// Run is the entry point to the cli app. Parses the arguments slice and routes
-// to the proper flag/args combination
-func (a *App) Run(arguments []string) (err error) {
-	a.Setup()
-
-	// handle the completion flag separately from the flagset since
-	// completion could be attempted after a flag, but before its value was put
-	// on the command line. this causes the flagset to interpret the completion
-	// flag name as the value of the flag before it which is undesirable
-	// note that we can only do this because the shell autocomplete function
-	// always appends the completion flag at the end of the command
-	shellComplete, arguments := checkShellCompleteFlag(a, arguments)
-
-	// parse flags
-	set, err := flagSet(a.Name, a.Flags)
-	if err != nil {
-		return err
-	}
-
-	set.SetOutput(ioutil.Discard)
-	err = set.Parse(arguments[1:])
-	nerr := normalizeFlags(a.Flags, set)
-	context := NewContext(a, set, nil)
-	if nerr != nil {
-		fmt.Fprintln(a.Writer, nerr)
-		ShowAppHelp(context)
-		return nerr
-	}
-	context.shellComplete = shellComplete
-
-	if checkCompletions(context) {
-		return nil
-	}
-
-	if err != nil {
-		if a.OnUsageError != nil {
-			err := a.OnUsageError(context, err, false)
-			HandleExitCoder(err)
-			return err
-		}
-		fmt.Fprintf(a.Writer, "%s %s\n\n", "Incorrect Usage.", err.Error())
-		ShowAppHelp(context)
-		return err
-	}
-
-	if !a.HideHelp && checkHelp(context) {
-		ShowAppHelp(context)
-		return nil
-	}
-
-	if !a.HideVersion && checkVersion(context) {
-		ShowVersion(context)
-		return nil
-	}
-
-	if a.After != nil {
-		defer func() {
-			if afterErr := a.After(context); afterErr != nil {
-				if err != nil {
-					err = NewMultiError(err, afterErr)
-				} else {
-					err = afterErr
-				}
-			}
-		}()
-	}
-
-	if a.Before != nil {
-		beforeErr := a.Before(context)
-		if beforeErr != nil {
-			fmt.Fprintf(a.Writer, "%v\n\n", beforeErr)
-			ShowAppHelp(context)
-			HandleExitCoder(beforeErr)
-			err = beforeErr
-			return err
-		}
-	}
-
-	args := context.Args()
-	if args.Present() {
-		name := args.First()
-		c := a.Command(name)
-		if c != nil {
-			return c.Run(context)
-		}
-	}
-
-	if a.Action == nil {
-		a.Action = helpCommand.Action
-	}
-
-	// Run default Action
-	err = HandleAction(a.Action, context)
-
-	HandleExitCoder(err)
-	return err
-}
-
-// RunAndExitOnError calls .Run() and exits non-zero if an error was returned
-//
-// Deprecated: instead you should return an error that fulfills cli.ExitCoder
-// to cli.App.Run. This will cause the application to exit with the given eror
-// code in the cli.ExitCoder
-func (a *App) RunAndExitOnError() {
-	if err := a.Run(os.Args); err != nil {
-		fmt.Fprintln(a.errWriter(), err)
-		OsExiter(1)
-	}
-}
-
-// RunAsSubcommand invokes the subcommand given the context, parses ctx.Args() to
-// generate command-specific flags
-func (a *App) RunAsSubcommand(ctx *Context) (err error) {
-	// append help to commands
-	if len(a.Commands) > 0 {
-		if a.Command(helpCommand.Name) == nil && !a.HideHelp {
-			a.Commands = append(a.Commands, helpCommand)
-			if (HelpFlag != BoolFlag{}) {
-				a.appendFlag(HelpFlag)
-			}
-		}
-	}
-
-	newCmds := []Command{}
-	for _, c := range a.Commands {
-		if c.HelpName == "" {
-			c.HelpName = fmt.Sprintf("%s %s", a.HelpName, c.Name)
-		}
-		newCmds = append(newCmds, c)
-	}
-	a.Commands = newCmds
-
-	// parse flags
-	set, err := flagSet(a.Name, a.Flags)
-	if err != nil {
-		return err
-	}
-
-	set.SetOutput(ioutil.Discard)
-	err = set.Parse(ctx.Args().Tail())
-	nerr := normalizeFlags(a.Flags, set)
-	context := NewContext(a, set, ctx)
-
-	if nerr != nil {
-		fmt.Fprintln(a.Writer, nerr)
-		fmt.Fprintln(a.Writer)
-		if len(a.Commands) > 0 {
-			ShowSubcommandHelp(context)
-		} else {
-			ShowCommandHelp(ctx, context.Args().First())
-		}
-		return nerr
-	}
-
-	if checkCompletions(context) {
-		return nil
-	}
-
-	if err != nil {
-		if a.OnUsageError != nil {
-			err = a.OnUsageError(context, err, true)
-			HandleExitCoder(err)
-			return err
-		}
-		fmt.Fprintf(a.Writer, "%s %s\n\n", "Incorrect Usage.", err.Error())
-		ShowSubcommandHelp(context)
-		return err
-	}
-
-	if len(a.Commands) > 0 {
-		if checkSubcommandHelp(context) {
-			return nil
-		}
-	} else {
-		if checkCommandHelp(ctx, context.Args().First()) {
-			return nil
-		}
-	}
-
-	if a.After != nil {
-		defer func() {
-			afterErr := a.After(context)
-			if afterErr != nil {
-				HandleExitCoder(err)
-				if err != nil {
-					err = NewMultiError(err, afterErr)
-				} else {
-					err = afterErr
-				}
-			}
-		}()
-	}
-
-	if a.Before != nil {
-		beforeErr := a.Before(context)
-		if beforeErr != nil {
-			HandleExitCoder(beforeErr)
-			err = beforeErr
-			return err
-		}
-	}
-
-	args := context.Args()
-	if args.Present() {
-		name := args.First()
-		c := a.Command(name)
-		if c != nil {
-			return c.Run(context)
-		}
-	}
-
-	// Run default Action
-	err = HandleAction(a.Action, context)
-
-	HandleExitCoder(err)
-	return err
-}
-
-// Command returns the named command on App. Returns nil if the command does not exist
-func (a *App) Command(name string) *Command {
-	for _, c := range a.Commands {
-		if c.HasName(name) {
-			return &c
-		}
-	}
-
-	return nil
-}
-
-// Categories returns a slice containing all the categories with the commands they contain
-func (a *App) Categories() CommandCategories {
-	return a.categories
-}
-
-// VisibleCategories returns a slice of categories and commands that are
-// Hidden=false
-func (a *App) VisibleCategories() []*CommandCategory {
-	ret := []*CommandCategory{}
-	for _, category := range a.categories {
-		if visible := func() *CommandCategory {
-			for _, command := range category.Commands {
-				if !command.Hidden {
-					return category
-				}
-			}
-			return nil
-		}(); visible != nil {
-			ret = append(ret, visible)
-		}
-	}
-	return ret
-}
-
-// VisibleCommands returns a slice of the Commands with Hidden=false
-func (a *App) VisibleCommands() []Command {
-	ret := []Command{}
-	for _, command := range a.Commands {
-		if !command.Hidden {
-			ret = append(ret, command)
-		}
-	}
-	return ret
-}
-
-// VisibleFlags returns a slice of the Flags with Hidden=false
-func (a *App) VisibleFlags() []Flag {
-	return visibleFlags(a.Flags)
-}
-
-func (a *App) hasFlag(flag Flag) bool {
-	for _, f := range a.Flags {
-		if flag == f {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (a *App) errWriter() io.Writer {
-
-	// When the app ErrWriter is nil use the package level one.
-	if a.ErrWriter == nil {
-		return ErrWriter
-	}
-
-	return a.ErrWriter
-}
-
-func (a *App) appendFlag(flag Flag) {
-	if !a.hasFlag(flag) {
-		a.Flags = append(a.Flags, flag)
-	}
-}
-
-// Author represents someone who has contributed to a cli project.
-type Author struct {
-	Name  string // The Authors name
-	Email string // The Authors email
-}
-
-// String makes Author comply to the Stringer interface, to allow an easy print in the templating process
-func (a Author) String() string {
-	e := ""
-	if a.Email != "" {
-		e = " <" + a.Email + ">"
-	}
-
-	return fmt.Sprintf("%v%v", a.Name, e)
-}
-
-// HandleAction attempts to figure out which Action signature was used.  If
-// it's an ActionFunc or a func with the legacy signature for Action, the func
-// is run!
-func HandleAction(action interface{}, context *Context) (err error) {
-	if a, ok := action.(ActionFunc); ok {
-		return a(context)
-	} else if a, ok := action.(func(*Context) error); ok {
-		return a(context)
-	} else if a, ok := action.(func(*Context)); ok { // deprecated function signature
-		a(context)
-		return nil
-	} else {
-		return errInvalidActionType
-	}
-}
diff --git a/vendor/github.com/codegangsta/cli/appveyor.yml b/vendor/github.com/codegangsta/cli/appveyor.yml
deleted file mode 100644
index 698b188e12..0000000000
--- a/vendor/github.com/codegangsta/cli/appveyor.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: "{build}"
-
-os: Windows Server 2012 R2
-
-clone_folder: c:\gopath\src\github.com\urfave\cli
-
-environment:
-  GOPATH: C:\gopath
-  GOVERSION: 1.6
-  PYTHON: C:\Python27-x64
-  PYTHON_VERSION: 2.7.x
-  PYTHON_ARCH: 64
-
-install:
-- set PATH=%GOPATH%\bin;C:\go\bin;%PATH%
-- go version
-- go env
-- go get github.com/urfave/gfmrun/...
-- go get -v -t ./...
-
-build_script:
-- python runtests vet
-- python runtests test
-- python runtests gfmrun
diff --git a/vendor/github.com/codegangsta/cli/category.go b/vendor/github.com/codegangsta/cli/category.go
deleted file mode 100644
index 1a6055023e..0000000000
--- a/vendor/github.com/codegangsta/cli/category.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package cli
-
-// CommandCategories is a slice of *CommandCategory.
-type CommandCategories []*CommandCategory
-
-// CommandCategory is a category containing commands.
-type CommandCategory struct {
-	Name     string
-	Commands Commands
-}
-
-func (c CommandCategories) Less(i, j int) bool {
-	return c[i].Name < c[j].Name
-}
-
-func (c CommandCategories) Len() int {
-	return len(c)
-}
-
-func (c CommandCategories) Swap(i, j int) {
-	c[i], c[j] = c[j], c[i]
-}
-
-// AddCommand adds a command to a category.
-func (c CommandCategories) AddCommand(category string, command Command) CommandCategories {
-	for _, commandCategory := range c {
-		if commandCategory.Name == category {
-			commandCategory.Commands = append(commandCategory.Commands, command)
-			return c
-		}
-	}
-	return append(c, &CommandCategory{Name: category, Commands: []Command{command}})
-}
-
-// VisibleCommands returns a slice of the Commands with Hidden=false
-func (c *CommandCategory) VisibleCommands() []Command {
-	ret := []Command{}
-	for _, command := range c.Commands {
-		if !command.Hidden {
-			ret = append(ret, command)
-		}
-	}
-	return ret
-}
diff --git a/vendor/github.com/codegangsta/cli/cli.go b/vendor/github.com/codegangsta/cli/cli.go
deleted file mode 100644
index 74fd101f45..0000000000
--- a/vendor/github.com/codegangsta/cli/cli.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Package cli provides a minimal framework for creating and organizing command line
-// Go applications. cli is designed to be easy to understand and write, the most simple
-// cli application can be written as follows:
-//   func main() {
-//     cli.NewApp().Run(os.Args)
-//   }
-//
-// Of course this application does not do much, so let's make this an actual application:
-//   func main() {
-//     app := cli.NewApp()
-//     app.Name = "greet"
-//     app.Usage = "say a greeting"
-//     app.Action = func(c *cli.Context) error {
-//       println("Greetings")
-//     }
-//
-//     app.Run(os.Args)
-//   }
-package cli
-
-//go:generate python ./generate-flag-types cli -i flag-types.json -o flag_generated.go
diff --git a/vendor/github.com/codegangsta/cli/command.go b/vendor/github.com/codegangsta/cli/command.go
deleted file mode 100644
index 40ebdb64f3..0000000000
--- a/vendor/github.com/codegangsta/cli/command.go
+++ /dev/null
@@ -1,299 +0,0 @@
-package cli
-
-import (
-	"fmt"
-	"io/ioutil"
-	"sort"
-	"strings"
-)
-
-// Command is a subcommand for a cli.App.
-type Command struct {
-	// The name of the command
-	Name string
-	// short name of the command. Typically one character (deprecated, use `Aliases`)
-	ShortName string
-	// A list of aliases for the command
-	Aliases []string
-	// A short description of the usage of this command
-	Usage string
-	// Custom text to show on USAGE section of help
-	UsageText string
-	// A longer explanation of how the command works
-	Description string
-	// A short description of the arguments of this command
-	ArgsUsage string
-	// The category the command is part of
-	Category string
-	// The function to call when checking for bash command completions
-	BashComplete BashCompleteFunc
-	// An action to execute before any sub-subcommands are run, but after the context is ready
-	// If a non-nil error is returned, no sub-subcommands are run
-	Before BeforeFunc
-	// An action to execute after any subcommands are run, but after the subcommand has finished
-	// It is run even if Action() panics
-	After AfterFunc
-	// The function to call when this command is invoked
-	Action interface{}
-	// TODO: replace `Action: interface{}` with `Action: ActionFunc` once some kind
-	// of deprecation period has passed, maybe?
-
-	// Execute this function if a usage error occurs.
-	OnUsageError OnUsageErrorFunc
-	// List of child commands
-	Subcommands Commands
-	// List of flags to parse
-	Flags []Flag
-	// Treat all flags as normal arguments if true
-	SkipFlagParsing bool
-	// Skip argument reordering which attempts to move flags before arguments,
-	// but only works if all flags appear after all arguments. This behavior was
-	// removed n version 2 since it only works under specific conditions so we
-	// backport here by exposing it as an option for compatibility.
-	SkipArgReorder bool
-	// Boolean to hide built-in help command
-	HideHelp bool
-	// Boolean to hide this command from help or completion
-	Hidden bool
-
-	// Full name of command for help, defaults to full command name, including parent commands.
-	HelpName        string
-	commandNamePath []string
-}
-
-type CommandsByName []Command
-
-func (c CommandsByName) Len() int {
-	return len(c)
-}
-
-func (c CommandsByName) Less(i, j int) bool {
-	return c[i].Name < c[j].Name
-}
-
-func (c CommandsByName) Swap(i, j int) {
-	c[i], c[j] = c[j], c[i]
-}
-
-// FullName returns the full name of the command.
-// For subcommands this ensures that parent commands are part of the command path
-func (c Command) FullName() string {
-	if c.commandNamePath == nil {
-		return c.Name
-	}
-	return strings.Join(c.commandNamePath, " ")
-}
-
-// Commands is a slice of Command
-type Commands []Command
-
-// Run invokes the command given the context, parses ctx.Args() to generate command-specific flags
-func (c Command) Run(ctx *Context) (err error) {
-	if len(c.Subcommands) > 0 {
-		return c.startApp(ctx)
-	}
-
-	if !c.HideHelp && (HelpFlag != BoolFlag{}) {
-		// append help to flags
-		c.Flags = append(
-			c.Flags,
-			HelpFlag,
-		)
-	}
-
-	set, err := flagSet(c.Name, c.Flags)
-	if err != nil {
-		return err
-	}
-	set.SetOutput(ioutil.Discard)
-
-	if c.SkipFlagParsing {
-		err = set.Parse(append([]string{"--"}, ctx.Args().Tail()...))
-	} else if !c.SkipArgReorder {
-		firstFlagIndex := -1
-		terminatorIndex := -1
-		for index, arg := range ctx.Args() {
-			if arg == "--" {
-				terminatorIndex = index
-				break
-			} else if arg == "-" {
-				// Do nothing. A dash alone is not really a flag.
-				continue
-			} else if strings.HasPrefix(arg, "-") && firstFlagIndex == -1 {
-				firstFlagIndex = index
-			}
-		}
-
-		if firstFlagIndex > -1 {
-			args := ctx.Args()
-			regularArgs := make([]string, len(args[1:firstFlagIndex]))
-			copy(regularArgs, args[1:firstFlagIndex])
-
-			var flagArgs []string
-			if terminatorIndex > -1 {
-				flagArgs = args[firstFlagIndex:terminatorIndex]
-				regularArgs = append(regularArgs, args[terminatorIndex:]...)
-			} else {
-				flagArgs = args[firstFlagIndex:]
-			}
-
-			err = set.Parse(append(flagArgs, regularArgs...))
-		} else {
-			err = set.Parse(ctx.Args().Tail())
-		}
-	} else {
-		err = set.Parse(ctx.Args().Tail())
-	}
-
-	nerr := normalizeFlags(c.Flags, set)
-	if nerr != nil {
-		fmt.Fprintln(ctx.App.Writer, nerr)
-		fmt.Fprintln(ctx.App.Writer)
-		ShowCommandHelp(ctx, c.Name)
-		return nerr
-	}
-
-	context := NewContext(ctx.App, set, ctx)
-	if checkCommandCompletions(context, c.Name) {
-		return nil
-	}
-
-	if err != nil {
-		if c.OnUsageError != nil {
-			err := c.OnUsageError(ctx, err, false)
-			HandleExitCoder(err)
-			return err
-		}
-		fmt.Fprintln(ctx.App.Writer, "Incorrect Usage:", err.Error())
-		fmt.Fprintln(ctx.App.Writer)
-		ShowCommandHelp(ctx, c.Name)
-		return err
-	}
-
-	if checkCommandHelp(context, c.Name) {
-		return nil
-	}
-
-	if c.After != nil {
-		defer func() {
-			afterErr := c.After(context)
-			if afterErr != nil {
-				HandleExitCoder(err)
-				if err != nil {
-					err = NewMultiError(err, afterErr)
-				} else {
-					err = afterErr
-				}
-			}
-		}()
-	}
-
-	if c.Before != nil {
-		err = c.Before(context)
-		if err != nil {
-			fmt.Fprintln(ctx.App.Writer, err)
-			fmt.Fprintln(ctx.App.Writer)
-			ShowCommandHelp(ctx, c.Name)
-			HandleExitCoder(err)
-			return err
-		}
-	}
-
-	if c.Action == nil {
-		c.Action = helpSubcommand.Action
-	}
-
-	context.Command = c
-	err = HandleAction(c.Action, context)
-
-	if err != nil {
-		HandleExitCoder(err)
-	}
-	return err
-}
-
-// Names returns the names including short names and aliases.
-func (c Command) Names() []string {
-	names := []string{c.Name}
-
-	if c.ShortName != "" {
-		names = append(names, c.ShortName)
-	}
-
-	return append(names, c.Aliases...)
-}
-
-// HasName returns true if Command.Name or Command.ShortName matches given name
-func (c Command) HasName(name string) bool {
-	for _, n := range c.Names() {
-		if n == name {
-			return true
-		}
-	}
-	return false
-}
-
-func (c Command) startApp(ctx *Context) error {
-	app := NewApp()
-	app.Metadata = ctx.App.Metadata
-	// set the name and usage
-	app.Name = fmt.Sprintf("%s %s", ctx.App.Name, c.Name)
-	if c.HelpName == "" {
-		app.HelpName = c.HelpName
-	} else {
-		app.HelpName = app.Name
-	}
-
-	app.Usage = c.Usage
-	app.Description = c.Description
-	app.ArgsUsage = c.ArgsUsage
-
-	// set CommandNotFound
-	app.CommandNotFound = ctx.App.CommandNotFound
-
-	// set the flags and commands
-	app.Commands = c.Subcommands
-	app.Flags = c.Flags
-	app.HideHelp = c.HideHelp
-
-	app.Version = ctx.App.Version
-	app.HideVersion = ctx.App.HideVersion
-	app.Compiled = ctx.App.Compiled
-	app.Author = ctx.App.Author
-	app.Email = ctx.App.Email
-	app.Writer = ctx.App.Writer
-	app.ErrWriter = ctx.App.ErrWriter
-
-	app.categories = CommandCategories{}
-	for _, command := range c.Subcommands {
-		app.categories = app.categories.AddCommand(command.Category, command)
-	}
-
-	sort.Sort(app.categories)
-
-	// bash completion
-	app.EnableBashCompletion = ctx.App.EnableBashCompletion
-	if c.BashComplete != nil {
-		app.BashComplete = c.BashComplete
-	}
-
-	// set the actions
-	app.Before = c.Before
-	app.After = c.After
-	if c.Action != nil {
-		app.Action = c.Action
-	} else {
-		app.Action = helpSubcommand.Action
-	}
-
-	for index, cc := range app.Commands {
-		app.Commands[index].commandNamePath = []string{c.Name, cc.Name}
-	}
-
-	return app.RunAsSubcommand(ctx)
-}
-
-// VisibleFlags returns a slice of the Flags with Hidden=false
-func (c Command) VisibleFlags() []Flag {
-	return visibleFlags(c.Flags)
-}
diff --git a/vendor/github.com/codegangsta/cli/context.go b/vendor/github.com/codegangsta/cli/context.go
deleted file mode 100644
index cb89e92a08..0000000000
--- a/vendor/github.com/codegangsta/cli/context.go
+++ /dev/null
@@ -1,276 +0,0 @@
-package cli
-
-import (
-	"errors"
-	"flag"
-	"reflect"
-	"strings"
-	"syscall"
-)
-
-// Context is a type that is passed through to
-// each Handler action in a cli application. Context
-// can be used to retrieve context-specific Args and
-// parsed command-line options.
-type Context struct {
-	App           *App
-	Command       Command
-	shellComplete bool
-	flagSet       *flag.FlagSet
-	setFlags      map[string]bool
-	parentContext *Context
-}
-
-// NewContext creates a new context. For use in when invoking an App or Command action.
-func NewContext(app *App, set *flag.FlagSet, parentCtx *Context) *Context {
-	c := &Context{App: app, flagSet: set, parentContext: parentCtx}
-
-	if parentCtx != nil {
-		c.shellComplete = parentCtx.shellComplete
-	}
-
-	return c
-}
-
-// NumFlags returns the number of flags set
-func (c *Context) NumFlags() int {
-	return c.flagSet.NFlag()
-}
-
-// Set sets a context flag to a value.
-func (c *Context) Set(name, value string) error {
-	return c.flagSet.Set(name, value)
-}
-
-// GlobalSet sets a context flag to a value on the global flagset
-func (c *Context) GlobalSet(name, value string) error {
-	return globalContext(c).flagSet.Set(name, value)
-}
-
-// IsSet determines if the flag was actually set
-func (c *Context) IsSet(name string) bool {
-	if c.setFlags == nil {
-		c.setFlags = make(map[string]bool)
-
-		c.flagSet.Visit(func(f *flag.Flag) {
-			c.setFlags[f.Name] = true
-		})
-
-		c.flagSet.VisitAll(func(f *flag.Flag) {
-			if _, ok := c.setFlags[f.Name]; ok {
-				return
-			}
-			c.setFlags[f.Name] = false
-		})
-
-		// XXX hack to support IsSet for flags with EnvVar
-		//
-		// There isn't an easy way to do this with the current implementation since
-		// whether a flag was set via an environment variable is very difficult to
-		// determine here. Instead, we intend to introduce a backwards incompatible
-		// change in version 2 to add `IsSet` to the Flag interface to push the
-		// responsibility closer to where the information required to determine
-		// whether a flag is set by non-standard means such as environment
-		// variables is avaliable.
-		//
-		// See https://github.com/urfave/cli/issues/294 for additional discussion
-		flags := c.Command.Flags
-		if c.Command.Name == "" { // cannot == Command{} since it contains slice types
-			if c.App != nil {
-				flags = c.App.Flags
-			}
-		}
-		for _, f := range flags {
-			eachName(f.GetName(), func(name string) {
-				if isSet, ok := c.setFlags[name]; isSet || !ok {
-					return
-				}
-
-				val := reflect.ValueOf(f)
-				if val.Kind() == reflect.Ptr {
-					val = val.Elem()
-				}
-
-				envVarValue := val.FieldByName("EnvVar")
-				if !envVarValue.IsValid() {
-					return
-				}
-
-				eachName(envVarValue.String(), func(envVar string) {
-					envVar = strings.TrimSpace(envVar)
-					if _, ok := syscall.Getenv(envVar); ok {
-						c.setFlags[name] = true
-						return
-					}
-				})
-			})
-		}
-	}
-
-	return c.setFlags[name]
-}
-
-// GlobalIsSet determines if the global flag was actually set
-func (c *Context) GlobalIsSet(name string) bool {
-	ctx := c
-	if ctx.parentContext != nil {
-		ctx = ctx.parentContext
-	}
-
-	for ; ctx != nil; ctx = ctx.parentContext {
-		if ctx.IsSet(name) {
-			return true
-		}
-	}
-	return false
-}
-
-// FlagNames returns a slice of flag names used in this context.
-func (c *Context) FlagNames() (names []string) {
-	for _, flag := range c.Command.Flags {
-		name := strings.Split(flag.GetName(), ",")[0]
-		if name == "help" {
-			continue
-		}
-		names = append(names, name)
-	}
-	return
-}
-
-// GlobalFlagNames returns a slice of global flag names used by the app.
-func (c *Context) GlobalFlagNames() (names []string) {
-	for _, flag := range c.App.Flags {
-		name := strings.Split(flag.GetName(), ",")[0]
-		if name == "help" || name == "version" {
-			continue
-		}
-		names = append(names, name)
-	}
-	return
-}
-
-// Parent returns the parent context, if any
-func (c *Context) Parent() *Context {
-	return c.parentContext
-}
-
-// value returns the value of the flag coressponding to `name`
-func (c *Context) value(name string) interface{} {
-	return c.flagSet.Lookup(name).Value.(flag.Getter).Get()
-}
-
-// Args contains apps console arguments
-type Args []string
-
-// Args returns the command line arguments associated with the context.
-func (c *Context) Args() Args {
-	args := Args(c.flagSet.Args())
-	return args
-}
-
-// NArg returns the number of the command line arguments.
-func (c *Context) NArg() int {
-	return len(c.Args())
-}
-
-// Get returns the nth argument, or else a blank string
-func (a Args) Get(n int) string {
-	if len(a) > n {
-		return a[n]
-	}
-	return ""
-}
-
-// First returns the first argument, or else a blank string
-func (a Args) First() string {
-	return a.Get(0)
-}
-
-// Tail returns the rest of the arguments (not the first one)
-// or else an empty string slice
-func (a Args) Tail() []string {
-	if len(a) >= 2 {
-		return []string(a)[1:]
-	}
-	return []string{}
-}
-
-// Present checks if there are any arguments present
-func (a Args) Present() bool {
-	return len(a) != 0
-}
-
-// Swap swaps arguments at the given indexes
-func (a Args) Swap(from, to int) error {
-	if from >= len(a) || to >= len(a) {
-		return errors.New("index out of range")
-	}
-	a[from], a[to] = a[to], a[from]
-	return nil
-}
-
-func globalContext(ctx *Context) *Context {
-	if ctx == nil {
-		return nil
-	}
-
-	for {
-		if ctx.parentContext == nil {
-			return ctx
-		}
-		ctx = ctx.parentContext
-	}
-}
-
-func lookupGlobalFlagSet(name string, ctx *Context) *flag.FlagSet {
-	if ctx.parentContext != nil {
-		ctx = ctx.parentContext
-	}
-	for ; ctx != nil; ctx = ctx.parentContext {
-		if f := ctx.flagSet.Lookup(name); f != nil {
-			return ctx.flagSet
-		}
-	}
-	return nil
-}
-
-func copyFlag(name string, ff *flag.Flag, set *flag.FlagSet) {
-	switch ff.Value.(type) {
-	case *StringSlice:
-	default:
-		set.Set(name, ff.Value.String())
-	}
-}
-
-func normalizeFlags(flags []Flag, set *flag.FlagSet) error {
-	visited := make(map[string]bool)
-	set.Visit(func(f *flag.Flag) {
-		visited[f.Name] = true
-	})
-	for _, f := range flags {
-		parts := strings.Split(f.GetName(), ",")
-		if len(parts) == 1 {
-			continue
-		}
-		var ff *flag.Flag
-		for _, name := range parts {
-			name = strings.Trim(name, " ")
-			if visited[name] {
-				if ff != nil {
-					return errors.New("Cannot use two forms of the same flag: " + name + " " + ff.Name)
-				}
-				ff = set.Lookup(name)
-			}
-		}
-		if ff == nil {
-			continue
-		}
-		for _, name := range parts {
-			name = strings.Trim(name, " ")
-			if !visited[name] {
-				copyFlag(name, ff, set)
-			}
-		}
-	}
-	return nil
-}
diff --git a/vendor/github.com/codegangsta/cli/errors.go b/vendor/github.com/codegangsta/cli/errors.go
deleted file mode 100644
index 562b2953cf..0000000000
--- a/vendor/github.com/codegangsta/cli/errors.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cli
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strings"
-)
-
-// OsExiter is the function used when the app exits. If not set defaults to os.Exit.
-var OsExiter = os.Exit
-
-// ErrWriter is used to write errors to the user. This can be anything
-// implementing the io.Writer interface and defaults to os.Stderr.
-var ErrWriter io.Writer = os.Stderr
-
-// MultiError is an error that wraps multiple errors.
-type MultiError struct {
-	Errors []error
-}
-
-// NewMultiError creates a new MultiError. Pass in one or more errors.
-func NewMultiError(err ...error) MultiError {
-	return MultiError{Errors: err}
-}
-
-// Error implements the error interface.
-func (m MultiError) Error() string {
-	errs := make([]string, len(m.Errors))
-	for i, err := range m.Errors {
-		errs[i] = err.Error()
-	}
-
-	return strings.Join(errs, "\n")
-}
-
-type ErrorFormatter interface {
-	Format(s fmt.State, verb rune)
-}
-
-// ExitCoder is the interface checked by `App` and `Command` for a custom exit
-// code
-type ExitCoder interface {
-	error
-	ExitCode() int
-}
-
-// ExitError fulfills both the builtin `error` interface and `ExitCoder`
-type ExitError struct {
-	exitCode int
-	message  interface{}
-}
-
-// NewExitError makes a new *ExitError
-func NewExitError(message interface{}, exitCode int) *ExitError {
-	return &ExitError{
-		exitCode: exitCode,
-		message:  message,
-	}
-}
-
-// Error returns the string message, fulfilling the interface required by
-// `error`
-func (ee *ExitError) Error() string {
-	return fmt.Sprintf("%v", ee.message)
-}
-
-// ExitCode returns the exit code, fulfilling the interface required by
-// `ExitCoder`
-func (ee *ExitError) ExitCode() int {
-	return ee.exitCode
-}
-
-// HandleExitCoder checks if the error fulfills the ExitCoder interface, and if
-// so prints the error to stderr (if it is non-empty) and calls OsExiter with the
-// given exit code.  If the given error is a MultiError, then this func is
-// called on all members of the Errors slice and calls OsExiter with the last exit code.
-func HandleExitCoder(err error) {
-	if err == nil {
-		return
-	}
-
-	if exitErr, ok := err.(ExitCoder); ok {
-		if err.Error() != "" {
-			if _, ok := exitErr.(ErrorFormatter); ok {
-				fmt.Fprintf(ErrWriter, "%+v\n", err)
-			} else {
-				fmt.Fprintln(ErrWriter, err)
-			}
-		}
-		OsExiter(exitErr.ExitCode())
-		return
-	}
-
-	if multiErr, ok := err.(MultiError); ok {
-		code := handleMultiError(multiErr)
-		OsExiter(code)
-		return
-	}
-}
-
-func handleMultiError(multiErr MultiError) int {
-	code := 1
-	for _, merr := range multiErr.Errors {
-		if multiErr2, ok := merr.(MultiError); ok {
-			code = handleMultiError(multiErr2)
-		} else {
-			fmt.Fprintln(ErrWriter, merr)
-			if exitErr, ok := merr.(ExitCoder); ok {
-				code = exitErr.ExitCode()
-			}
-		}
-	}
-	return code
-}
diff --git a/vendor/github.com/codegangsta/cli/flag-types.json b/vendor/github.com/codegangsta/cli/flag-types.json
deleted file mode 100644
index 1223107859..0000000000
--- a/vendor/github.com/codegangsta/cli/flag-types.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "name": "Bool",
-    "type": "bool",
-    "value": false,
-    "context_default": "false",
-    "parser": "strconv.ParseBool(f.Value.String())"
-  },
-  {
-    "name": "BoolT",
-    "type": "bool",
-    "value": false,
-    "doctail": " that is true by default",
-    "context_default": "false",
-    "parser": "strconv.ParseBool(f.Value.String())"
-  },
-  {
-    "name": "Duration",
-    "type": "time.Duration",
-    "doctail": " (see https://golang.org/pkg/time/#ParseDuration)",
-    "context_default": "0",
-    "parser": "time.ParseDuration(f.Value.String())"
-  },
-  {
-    "name": "Float64",
-    "type": "float64",
-    "context_default": "0",
-    "parser": "strconv.ParseFloat(f.Value.String(), 64)"
-  },
-  {
-    "name": "Generic",
-    "type": "Generic",
-    "dest": false,
-    "context_default": "nil",
-    "context_type": "interface{}"
-  },
-  {
-    "name": "Int64",
-    "type": "int64",
-    "context_default": "0",
-    "parser": "strconv.ParseInt(f.Value.String(), 0, 64)"
-  },
-  {
-    "name": "Int",
-    "type": "int",
-    "context_default": "0",
-    "parser": "strconv.ParseInt(f.Value.String(), 0, 64)",
-    "parser_cast": "int(parsed)"
-  },
-  {
-    "name": "IntSlice",
-    "type": "*IntSlice",
-    "dest": false,
-    "context_default": "nil",
-    "context_type": "[]int",
-    "parser": "(f.Value.(*IntSlice)).Value(), error(nil)"
-  },
-  {
-    "name": "Int64Slice",
-    "type": "*Int64Slice",
-    "dest": false,
-    "context_default": "nil",
-    "context_type": "[]int64",
-    "parser": "(f.Value.(*Int64Slice)).Value(), error(nil)"
-  },
-  {
-    "name": "String",
-    "type": "string",
-    "context_default": "\"\"",
-    "parser": "f.Value.String(), error(nil)"
-  },
-  {
-    "name": "StringSlice",
-    "type": "*StringSlice",
-    "dest": false,
-    "context_default": "nil",
-    "context_type": "[]string",
-    "parser": "(f.Value.(*StringSlice)).Value(), error(nil)"
-  },
-  {
-    "name": "Uint64",
-    "type": "uint64",
-    "context_default": "0",
-    "parser": "strconv.ParseUint(f.Value.String(), 0, 64)"
-  },
-  {
-    "name": "Uint",
-    "type": "uint",
-    "context_default": "0",
-    "parser": "strconv.ParseUint(f.Value.String(), 0, 64)",
-    "parser_cast": "uint(parsed)"
-  }
-]
diff --git a/vendor/github.com/codegangsta/cli/flag.go b/vendor/github.com/codegangsta/cli/flag.go
deleted file mode 100644
index 7dd8a2c4ab..0000000000
--- a/vendor/github.com/codegangsta/cli/flag.go
+++ /dev/null
@@ -1,799 +0,0 @@
-package cli
-
-import (
-	"flag"
-	"fmt"
-	"reflect"
-	"runtime"
-	"strconv"
-	"strings"
-	"syscall"
-	"time"
-)
-
-const defaultPlaceholder = "value"
-
-// BashCompletionFlag enables bash-completion for all commands and subcommands
-var BashCompletionFlag = BoolFlag{
-	Name:   "generate-bash-completion",
-	Hidden: true,
-}
-
-// VersionFlag prints the version for the application
-var VersionFlag = BoolFlag{
-	Name:  "version, v",
-	Usage: "print the version",
-}
-
-// HelpFlag prints the help for all commands and subcommands
-// Set to the zero value (BoolFlag{}) to disable flag -- keeps subcommand
-// unless HideHelp is set to true)
-var HelpFlag = BoolFlag{
-	Name:  "help, h",
-	Usage: "show help",
-}
-
-// FlagStringer converts a flag definition to a string. This is used by help
-// to display a flag.
-var FlagStringer FlagStringFunc = stringifyFlag
-
-// FlagsByName is a slice of Flag.
-type FlagsByName []Flag
-
-func (f FlagsByName) Len() int {
-	return len(f)
-}
-
-func (f FlagsByName) Less(i, j int) bool {
-	return f[i].GetName() < f[j].GetName()
-}
-
-func (f FlagsByName) Swap(i, j int) {
-	f[i], f[j] = f[j], f[i]
-}
-
-// Flag is a common interface related to parsing flags in cli.
-// For more advanced flag parsing techniques, it is recommended that
-// this interface be implemented.
-type Flag interface {
-	fmt.Stringer
-	// Apply Flag settings to the given flag set
-	Apply(*flag.FlagSet)
-	GetName() string
-}
-
-// errorableFlag is an interface that allows us to return errors during apply
-// it allows flags defined in this library to return errors in a fashion backwards compatible
-// TODO remove in v2 and modify the existing Flag interface to return errors
-type errorableFlag interface {
-	Flag
-
-	ApplyWithError(*flag.FlagSet) error
-}
-
-func flagSet(name string, flags []Flag) (*flag.FlagSet, error) {
-	set := flag.NewFlagSet(name, flag.ContinueOnError)
-
-	for _, f := range flags {
-		//TODO remove in v2 when errorableFlag is removed
-		if ef, ok := f.(errorableFlag); ok {
-			if err := ef.ApplyWithError(set); err != nil {
-				return nil, err
-			}
-		} else {
-			f.Apply(set)
-		}
-	}
-	return set, nil
-}
-
-func eachName(longName string, fn func(string)) {
-	parts := strings.Split(longName, ",")
-	for _, name := range parts {
-		name = strings.Trim(name, " ")
-		fn(name)
-	}
-}
-
-// Generic is a generic parseable type identified by a specific flag
-type Generic interface {
-	Set(value string) error
-	String() string
-}
-
-// Apply takes the flagset and calls Set on the generic flag with the value
-// provided by the user for parsing by the flag
-// Ignores parsing errors
-func (f GenericFlag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError takes the flagset and calls Set on the generic flag with the value
-// provided by the user for parsing by the flag
-func (f GenericFlag) ApplyWithError(set *flag.FlagSet) error {
-	val := f.Value
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				if err := val.Set(envVal); err != nil {
-					return fmt.Errorf("could not parse %s as value for flag %s: %s", envVal, f.Name, err)
-				}
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		set.Var(f.Value, name, f.Usage)
-	})
-
-	return nil
-}
-
-// StringSlice is an opaque type for []string to satisfy flag.Value and flag.Getter
-type StringSlice []string
-
-// Set appends the string value to the list of values
-func (f *StringSlice) Set(value string) error {
-	*f = append(*f, value)
-	return nil
-}
-
-// String returns a readable representation of this value (for usage defaults)
-func (f *StringSlice) String() string {
-	return fmt.Sprintf("%s", *f)
-}
-
-// Value returns the slice of strings set by this flag
-func (f *StringSlice) Value() []string {
-	return *f
-}
-
-// Get returns the slice of strings set by this flag
-func (f *StringSlice) Get() interface{} {
-	return *f
-}
-
-// Apply populates the flag given the flag set and environment
-// Ignores errors
-func (f StringSliceFlag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError populates the flag given the flag set and environment
-func (f StringSliceFlag) ApplyWithError(set *flag.FlagSet) error {
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				newVal := &StringSlice{}
-				for _, s := range strings.Split(envVal, ",") {
-					s = strings.TrimSpace(s)
-					if err := newVal.Set(s); err != nil {
-						return fmt.Errorf("could not parse %s as string value for flag %s: %s", envVal, f.Name, err)
-					}
-				}
-				f.Value = newVal
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		if f.Value == nil {
-			f.Value = &StringSlice{}
-		}
-		set.Var(f.Value, name, f.Usage)
-	})
-
-	return nil
-}
-
-// IntSlice is an opaque type for []int to satisfy flag.Value and flag.Getter
-type IntSlice []int
-
-// Set parses the value into an integer and appends it to the list of values
-func (f *IntSlice) Set(value string) error {
-	tmp, err := strconv.Atoi(value)
-	if err != nil {
-		return err
-	}
-	*f = append(*f, tmp)
-	return nil
-}
-
-// String returns a readable representation of this value (for usage defaults)
-func (f *IntSlice) String() string {
-	return fmt.Sprintf("%#v", *f)
-}
-
-// Value returns the slice of ints set by this flag
-func (f *IntSlice) Value() []int {
-	return *f
-}
-
-// Get returns the slice of ints set by this flag
-func (f *IntSlice) Get() interface{} {
-	return *f
-}
-
-// Apply populates the flag given the flag set and environment
-// Ignores errors
-func (f IntSliceFlag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError populates the flag given the flag set and environment
-func (f IntSliceFlag) ApplyWithError(set *flag.FlagSet) error {
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				newVal := &IntSlice{}
-				for _, s := range strings.Split(envVal, ",") {
-					s = strings.TrimSpace(s)
-					if err := newVal.Set(s); err != nil {
-						return fmt.Errorf("could not parse %s as int slice value for flag %s: %s", envVal, f.Name, err)
-					}
-				}
-				f.Value = newVal
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		if f.Value == nil {
-			f.Value = &IntSlice{}
-		}
-		set.Var(f.Value, name, f.Usage)
-	})
-
-	return nil
-}
-
-// Int64Slice is an opaque type for []int to satisfy flag.Value and flag.Getter
-type Int64Slice []int64
-
-// Set parses the value into an integer and appends it to the list of values
-func (f *Int64Slice) Set(value string) error {
-	tmp, err := strconv.ParseInt(value, 10, 64)
-	if err != nil {
-		return err
-	}
-	*f = append(*f, tmp)
-	return nil
-}
-
-// String returns a readable representation of this value (for usage defaults)
-func (f *Int64Slice) String() string {
-	return fmt.Sprintf("%#v", *f)
-}
-
-// Value returns the slice of ints set by this flag
-func (f *Int64Slice) Value() []int64 {
-	return *f
-}
-
-// Get returns the slice of ints set by this flag
-func (f *Int64Slice) Get() interface{} {
-	return *f
-}
-
-// Apply populates the flag given the flag set and environment
-// Ignores errors
-func (f Int64SliceFlag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError populates the flag given the flag set and environment
-func (f Int64SliceFlag) ApplyWithError(set *flag.FlagSet) error {
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				newVal := &Int64Slice{}
-				for _, s := range strings.Split(envVal, ",") {
-					s = strings.TrimSpace(s)
-					if err := newVal.Set(s); err != nil {
-						return fmt.Errorf("could not parse %s as int64 slice value for flag %s: %s", envVal, f.Name, err)
-					}
-				}
-				f.Value = newVal
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		if f.Value == nil {
-			f.Value = &Int64Slice{}
-		}
-		set.Var(f.Value, name, f.Usage)
-	})
-	return nil
-}
-
-// Apply populates the flag given the flag set and environment
-// Ignores errors
-func (f BoolFlag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError populates the flag given the flag set and environment
-func (f BoolFlag) ApplyWithError(set *flag.FlagSet) error {
-	val := false
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				if envVal == "" {
-					val = false
-					break
-				}
-
-				envValBool, err := strconv.ParseBool(envVal)
-				if err != nil {
-					return fmt.Errorf("could not parse %s as bool value for flag %s: %s", envVal, f.Name, err)
-				}
-
-				val = envValBool
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		if f.Destination != nil {
-			set.BoolVar(f.Destination, name, val, f.Usage)
-			return
-		}
-		set.Bool(name, val, f.Usage)
-	})
-
-	return nil
-}
-
-// Apply populates the flag given the flag set and environment
-// Ignores errors
-func (f BoolTFlag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError populates the flag given the flag set and environment
-func (f BoolTFlag) ApplyWithError(set *flag.FlagSet) error {
-	val := true
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				if envVal == "" {
-					val = false
-					break
-				}
-
-				envValBool, err := strconv.ParseBool(envVal)
-				if err != nil {
-					return fmt.Errorf("could not parse %s as bool value for flag %s: %s", envVal, f.Name, err)
-				}
-
-				val = envValBool
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		if f.Destination != nil {
-			set.BoolVar(f.Destination, name, val, f.Usage)
-			return
-		}
-		set.Bool(name, val, f.Usage)
-	})
-
-	return nil
-}
-
-// Apply populates the flag given the flag set and environment
-// Ignores errors
-func (f StringFlag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError populates the flag given the flag set and environment
-func (f StringFlag) ApplyWithError(set *flag.FlagSet) error {
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				f.Value = envVal
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		if f.Destination != nil {
-			set.StringVar(f.Destination, name, f.Value, f.Usage)
-			return
-		}
-		set.String(name, f.Value, f.Usage)
-	})
-
-	return nil
-}
-
-// Apply populates the flag given the flag set and environment
-// Ignores errors
-func (f IntFlag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError populates the flag given the flag set and environment
-func (f IntFlag) ApplyWithError(set *flag.FlagSet) error {
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				envValInt, err := strconv.ParseInt(envVal, 0, 64)
-				if err != nil {
-					return fmt.Errorf("could not parse %s as int value for flag %s: %s", envVal, f.Name, err)
-				}
-				f.Value = int(envValInt)
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		if f.Destination != nil {
-			set.IntVar(f.Destination, name, f.Value, f.Usage)
-			return
-		}
-		set.Int(name, f.Value, f.Usage)
-	})
-
-	return nil
-}
-
-// Apply populates the flag given the flag set and environment
-// Ignores errors
-func (f Int64Flag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError populates the flag given the flag set and environment
-func (f Int64Flag) ApplyWithError(set *flag.FlagSet) error {
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				envValInt, err := strconv.ParseInt(envVal, 0, 64)
-				if err != nil {
-					return fmt.Errorf("could not parse %s as int value for flag %s: %s", envVal, f.Name, err)
-				}
-
-				f.Value = envValInt
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		if f.Destination != nil {
-			set.Int64Var(f.Destination, name, f.Value, f.Usage)
-			return
-		}
-		set.Int64(name, f.Value, f.Usage)
-	})
-
-	return nil
-}
-
-// Apply populates the flag given the flag set and environment
-// Ignores errors
-func (f UintFlag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError populates the flag given the flag set and environment
-func (f UintFlag) ApplyWithError(set *flag.FlagSet) error {
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				envValInt, err := strconv.ParseUint(envVal, 0, 64)
-				if err != nil {
-					return fmt.Errorf("could not parse %s as uint value for flag %s: %s", envVal, f.Name, err)
-				}
-
-				f.Value = uint(envValInt)
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		if f.Destination != nil {
-			set.UintVar(f.Destination, name, f.Value, f.Usage)
-			return
-		}
-		set.Uint(name, f.Value, f.Usage)
-	})
-
-	return nil
-}
-
-// Apply populates the flag given the flag set and environment
-// Ignores errors
-func (f Uint64Flag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError populates the flag given the flag set and environment
-func (f Uint64Flag) ApplyWithError(set *flag.FlagSet) error {
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				envValInt, err := strconv.ParseUint(envVal, 0, 64)
-				if err != nil {
-					return fmt.Errorf("could not parse %s as uint64 value for flag %s: %s", envVal, f.Name, err)
-				}
-
-				f.Value = uint64(envValInt)
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		if f.Destination != nil {
-			set.Uint64Var(f.Destination, name, f.Value, f.Usage)
-			return
-		}
-		set.Uint64(name, f.Value, f.Usage)
-	})
-
-	return nil
-}
-
-// Apply populates the flag given the flag set and environment
-// Ignores errors
-func (f DurationFlag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError populates the flag given the flag set and environment
-func (f DurationFlag) ApplyWithError(set *flag.FlagSet) error {
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				envValDuration, err := time.ParseDuration(envVal)
-				if err != nil {
-					return fmt.Errorf("could not parse %s as duration for flag %s: %s", envVal, f.Name, err)
-				}
-
-				f.Value = envValDuration
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		if f.Destination != nil {
-			set.DurationVar(f.Destination, name, f.Value, f.Usage)
-			return
-		}
-		set.Duration(name, f.Value, f.Usage)
-	})
-
-	return nil
-}
-
-// Apply populates the flag given the flag set and environment
-// Ignores errors
-func (f Float64Flag) Apply(set *flag.FlagSet) {
-	f.ApplyWithError(set)
-}
-
-// ApplyWithError populates the flag given the flag set and environment
-func (f Float64Flag) ApplyWithError(set *flag.FlagSet) error {
-	if f.EnvVar != "" {
-		for _, envVar := range strings.Split(f.EnvVar, ",") {
-			envVar = strings.TrimSpace(envVar)
-			if envVal, ok := syscall.Getenv(envVar); ok {
-				envValFloat, err := strconv.ParseFloat(envVal, 10)
-				if err != nil {
-					return fmt.Errorf("could not parse %s as float64 value for flag %s: %s", envVal, f.Name, err)
-				}
-
-				f.Value = float64(envValFloat)
-				break
-			}
-		}
-	}
-
-	eachName(f.Name, func(name string) {
-		if f.Destination != nil {
-			set.Float64Var(f.Destination, name, f.Value, f.Usage)
-			return
-		}
-		set.Float64(name, f.Value, f.Usage)
-	})
-
-	return nil
-}
-
-func visibleFlags(fl []Flag) []Flag {
-	visible := []Flag{}
-	for _, flag := range fl {
-		if !flagValue(flag).FieldByName("Hidden").Bool() {
-			visible = append(visible, flag)
-		}
-	}
-	return visible
-}
-
-func prefixFor(name string) (prefix string) {
-	if len(name) == 1 {
-		prefix = "-"
-	} else {
-		prefix = "--"
-	}
-
-	return
-}
-
-// Returns the placeholder, if any, and the unquoted usage string.
-func unquoteUsage(usage string) (string, string) {
-	for i := 0; i < len(usage); i++ {
-		if usage[i] == '`' {
-			for j := i + 1; j < len(usage); j++ {
-				if usage[j] == '`' {
-					name := usage[i+1 : j]
-					usage = usage[:i] + name + usage[j+1:]
-					return name, usage
-				}
-			}
-			break
-		}
-	}
-	return "", usage
-}
-
-func prefixedNames(fullName, placeholder string) string {
-	var prefixed string
-	parts := strings.Split(fullName, ",")
-	for i, name := range parts {
-		name = strings.Trim(name, " ")
-		prefixed += prefixFor(name) + name
-		if placeholder != "" {
-			prefixed += " " + placeholder
-		}
-		if i < len(parts)-1 {
-			prefixed += ", "
-		}
-	}
-	return prefixed
-}
-
-func withEnvHint(envVar, str string) string {
-	envText := ""
-	if envVar != "" {
-		prefix := "$"
-		suffix := ""
-		sep := ", $"
-		if runtime.GOOS == "windows" {
-			prefix = "%"
-			suffix = "%"
-			sep = "%, %"
-		}
-		envText = fmt.Sprintf(" [%s%s%s]", prefix, strings.Join(strings.Split(envVar, ","), sep), suffix)
-	}
-	return str + envText
-}
-
-func flagValue(f Flag) reflect.Value {
-	fv := reflect.ValueOf(f)
-	for fv.Kind() == reflect.Ptr {
-		fv = reflect.Indirect(fv)
-	}
-	return fv
-}
-
-func stringifyFlag(f Flag) string {
-	fv := flagValue(f)
-
-	switch f.(type) {
-	case IntSliceFlag:
-		return withEnvHint(fv.FieldByName("EnvVar").String(),
-			stringifyIntSliceFlag(f.(IntSliceFlag)))
-	case Int64SliceFlag:
-		return withEnvHint(fv.FieldByName("EnvVar").String(),
-			stringifyInt64SliceFlag(f.(Int64SliceFlag)))
-	case StringSliceFlag:
-		return withEnvHint(fv.FieldByName("EnvVar").String(),
-			stringifyStringSliceFlag(f.(StringSliceFlag)))
-	}
-
-	placeholder, usage := unquoteUsage(fv.FieldByName("Usage").String())
-
-	needsPlaceholder := false
-	defaultValueString := ""
-	val := fv.FieldByName("Value")
-
-	if val.IsValid() {
-		needsPlaceholder = true
-		defaultValueString = fmt.Sprintf(" (default: %v)", val.Interface())
-
-		if val.Kind() == reflect.String && val.String() != "" {
-			defaultValueString = fmt.Sprintf(" (default: %q)", val.String())
-		}
-	}
-
-	if defaultValueString == " (default: )" {
-		defaultValueString = ""
-	}
-
-	if needsPlaceholder && placeholder == "" {
-		placeholder = defaultPlaceholder
-	}
-
-	usageWithDefault := strings.TrimSpace(fmt.Sprintf("%s%s", usage, defaultValueString))
-
-	return withEnvHint(fv.FieldByName("EnvVar").String(),
-		fmt.Sprintf("%s\t%s", prefixedNames(fv.FieldByName("Name").String(), placeholder), usageWithDefault))
-}
-
-func stringifyIntSliceFlag(f IntSliceFlag) string {
-	defaultVals := []string{}
-	if f.Value != nil && len(f.Value.Value()) > 0 {
-		for _, i := range f.Value.Value() {
-			defaultVals = append(defaultVals, fmt.Sprintf("%d", i))
-		}
-	}
-
-	return stringifySliceFlag(f.Usage, f.Name, defaultVals)
-}
-
-func stringifyInt64SliceFlag(f Int64SliceFlag) string {
-	defaultVals := []string{}
-	if f.Value != nil && len(f.Value.Value()) > 0 {
-		for _, i := range f.Value.Value() {
-			defaultVals = append(defaultVals, fmt.Sprintf("%d", i))
-		}
-	}
-
-	return stringifySliceFlag(f.Usage, f.Name, defaultVals)
-}
-
-func stringifyStringSliceFlag(f StringSliceFlag) string {
-	defaultVals := []string{}
-	if f.Value != nil && len(f.Value.Value()) > 0 {
-		for _, s := range f.Value.Value() {
-			if len(s) > 0 {
-				defaultVals = append(defaultVals, fmt.Sprintf("%q", s))
-			}
-		}
-	}
-
-	return stringifySliceFlag(f.Usage, f.Name, defaultVals)
-}
-
-func stringifySliceFlag(usage, name string, defaultVals []string) string {
-	placeholder, usage := unquoteUsage(usage)
-	if placeholder == "" {
-		placeholder = defaultPlaceholder
-	}
-
-	defaultVal := ""
-	if len(defaultVals) > 0 {
-		defaultVal = fmt.Sprintf(" (default: %s)", strings.Join(defaultVals, ", "))
-	}
-
-	usageWithDefault := strings.TrimSpace(fmt.Sprintf("%s%s", usage, defaultVal))
-	return fmt.Sprintf("%s\t%s", prefixedNames(name, placeholder), usageWithDefault)
-}
diff --git a/vendor/github.com/codegangsta/cli/flag_generated.go b/vendor/github.com/codegangsta/cli/flag_generated.go
deleted file mode 100644
index 491b61956c..0000000000
--- a/vendor/github.com/codegangsta/cli/flag_generated.go
+++ /dev/null
@@ -1,627 +0,0 @@
-package cli
-
-import (
-	"flag"
-	"strconv"
-	"time"
-)
-
-// WARNING: This file is generated!
-
-// BoolFlag is a flag with type bool
-type BoolFlag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Destination *bool
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f BoolFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f BoolFlag) GetName() string {
-	return f.Name
-}
-
-// Bool looks up the value of a local BoolFlag, returns
-// false if not found
-func (c *Context) Bool(name string) bool {
-	return lookupBool(name, c.flagSet)
-}
-
-// GlobalBool looks up the value of a global BoolFlag, returns
-// false if not found
-func (c *Context) GlobalBool(name string) bool {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupBool(name, fs)
-	}
-	return false
-}
-
-func lookupBool(name string, set *flag.FlagSet) bool {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseBool(f.Value.String())
-		if err != nil {
-			return false
-		}
-		return parsed
-	}
-	return false
-}
-
-// BoolTFlag is a flag with type bool that is true by default
-type BoolTFlag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Destination *bool
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f BoolTFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f BoolTFlag) GetName() string {
-	return f.Name
-}
-
-// BoolT looks up the value of a local BoolTFlag, returns
-// false if not found
-func (c *Context) BoolT(name string) bool {
-	return lookupBoolT(name, c.flagSet)
-}
-
-// GlobalBoolT looks up the value of a global BoolTFlag, returns
-// false if not found
-func (c *Context) GlobalBoolT(name string) bool {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupBoolT(name, fs)
-	}
-	return false
-}
-
-func lookupBoolT(name string, set *flag.FlagSet) bool {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseBool(f.Value.String())
-		if err != nil {
-			return false
-		}
-		return parsed
-	}
-	return false
-}
-
-// DurationFlag is a flag with type time.Duration (see https://golang.org/pkg/time/#ParseDuration)
-type DurationFlag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       time.Duration
-	Destination *time.Duration
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f DurationFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f DurationFlag) GetName() string {
-	return f.Name
-}
-
-// Duration looks up the value of a local DurationFlag, returns
-// 0 if not found
-func (c *Context) Duration(name string) time.Duration {
-	return lookupDuration(name, c.flagSet)
-}
-
-// GlobalDuration looks up the value of a global DurationFlag, returns
-// 0 if not found
-func (c *Context) GlobalDuration(name string) time.Duration {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupDuration(name, fs)
-	}
-	return 0
-}
-
-func lookupDuration(name string, set *flag.FlagSet) time.Duration {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := time.ParseDuration(f.Value.String())
-		if err != nil {
-			return 0
-		}
-		return parsed
-	}
-	return 0
-}
-
-// Float64Flag is a flag with type float64
-type Float64Flag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       float64
-	Destination *float64
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f Float64Flag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f Float64Flag) GetName() string {
-	return f.Name
-}
-
-// Float64 looks up the value of a local Float64Flag, returns
-// 0 if not found
-func (c *Context) Float64(name string) float64 {
-	return lookupFloat64(name, c.flagSet)
-}
-
-// GlobalFloat64 looks up the value of a global Float64Flag, returns
-// 0 if not found
-func (c *Context) GlobalFloat64(name string) float64 {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupFloat64(name, fs)
-	}
-	return 0
-}
-
-func lookupFloat64(name string, set *flag.FlagSet) float64 {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseFloat(f.Value.String(), 64)
-		if err != nil {
-			return 0
-		}
-		return parsed
-	}
-	return 0
-}
-
-// GenericFlag is a flag with type Generic
-type GenericFlag struct {
-	Name   string
-	Usage  string
-	EnvVar string
-	Hidden bool
-	Value  Generic
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f GenericFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f GenericFlag) GetName() string {
-	return f.Name
-}
-
-// Generic looks up the value of a local GenericFlag, returns
-// nil if not found
-func (c *Context) Generic(name string) interface{} {
-	return lookupGeneric(name, c.flagSet)
-}
-
-// GlobalGeneric looks up the value of a global GenericFlag, returns
-// nil if not found
-func (c *Context) GlobalGeneric(name string) interface{} {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupGeneric(name, fs)
-	}
-	return nil
-}
-
-func lookupGeneric(name string, set *flag.FlagSet) interface{} {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := f.Value, error(nil)
-		if err != nil {
-			return nil
-		}
-		return parsed
-	}
-	return nil
-}
-
-// Int64Flag is a flag with type int64
-type Int64Flag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       int64
-	Destination *int64
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f Int64Flag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f Int64Flag) GetName() string {
-	return f.Name
-}
-
-// Int64 looks up the value of a local Int64Flag, returns
-// 0 if not found
-func (c *Context) Int64(name string) int64 {
-	return lookupInt64(name, c.flagSet)
-}
-
-// GlobalInt64 looks up the value of a global Int64Flag, returns
-// 0 if not found
-func (c *Context) GlobalInt64(name string) int64 {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupInt64(name, fs)
-	}
-	return 0
-}
-
-func lookupInt64(name string, set *flag.FlagSet) int64 {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseInt(f.Value.String(), 0, 64)
-		if err != nil {
-			return 0
-		}
-		return parsed
-	}
-	return 0
-}
-
-// IntFlag is a flag with type int
-type IntFlag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       int
-	Destination *int
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f IntFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f IntFlag) GetName() string {
-	return f.Name
-}
-
-// Int looks up the value of a local IntFlag, returns
-// 0 if not found
-func (c *Context) Int(name string) int {
-	return lookupInt(name, c.flagSet)
-}
-
-// GlobalInt looks up the value of a global IntFlag, returns
-// 0 if not found
-func (c *Context) GlobalInt(name string) int {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupInt(name, fs)
-	}
-	return 0
-}
-
-func lookupInt(name string, set *flag.FlagSet) int {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseInt(f.Value.String(), 0, 64)
-		if err != nil {
-			return 0
-		}
-		return int(parsed)
-	}
-	return 0
-}
-
-// IntSliceFlag is a flag with type *IntSlice
-type IntSliceFlag struct {
-	Name   string
-	Usage  string
-	EnvVar string
-	Hidden bool
-	Value  *IntSlice
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f IntSliceFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f IntSliceFlag) GetName() string {
-	return f.Name
-}
-
-// IntSlice looks up the value of a local IntSliceFlag, returns
-// nil if not found
-func (c *Context) IntSlice(name string) []int {
-	return lookupIntSlice(name, c.flagSet)
-}
-
-// GlobalIntSlice looks up the value of a global IntSliceFlag, returns
-// nil if not found
-func (c *Context) GlobalIntSlice(name string) []int {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupIntSlice(name, fs)
-	}
-	return nil
-}
-
-func lookupIntSlice(name string, set *flag.FlagSet) []int {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := (f.Value.(*IntSlice)).Value(), error(nil)
-		if err != nil {
-			return nil
-		}
-		return parsed
-	}
-	return nil
-}
-
-// Int64SliceFlag is a flag with type *Int64Slice
-type Int64SliceFlag struct {
-	Name   string
-	Usage  string
-	EnvVar string
-	Hidden bool
-	Value  *Int64Slice
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f Int64SliceFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f Int64SliceFlag) GetName() string {
-	return f.Name
-}
-
-// Int64Slice looks up the value of a local Int64SliceFlag, returns
-// nil if not found
-func (c *Context) Int64Slice(name string) []int64 {
-	return lookupInt64Slice(name, c.flagSet)
-}
-
-// GlobalInt64Slice looks up the value of a global Int64SliceFlag, returns
-// nil if not found
-func (c *Context) GlobalInt64Slice(name string) []int64 {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupInt64Slice(name, fs)
-	}
-	return nil
-}
-
-func lookupInt64Slice(name string, set *flag.FlagSet) []int64 {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := (f.Value.(*Int64Slice)).Value(), error(nil)
-		if err != nil {
-			return nil
-		}
-		return parsed
-	}
-	return nil
-}
-
-// StringFlag is a flag with type string
-type StringFlag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       string
-	Destination *string
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f StringFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f StringFlag) GetName() string {
-	return f.Name
-}
-
-// String looks up the value of a local StringFlag, returns
-// "" if not found
-func (c *Context) String(name string) string {
-	return lookupString(name, c.flagSet)
-}
-
-// GlobalString looks up the value of a global StringFlag, returns
-// "" if not found
-func (c *Context) GlobalString(name string) string {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupString(name, fs)
-	}
-	return ""
-}
-
-func lookupString(name string, set *flag.FlagSet) string {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := f.Value.String(), error(nil)
-		if err != nil {
-			return ""
-		}
-		return parsed
-	}
-	return ""
-}
-
-// StringSliceFlag is a flag with type *StringSlice
-type StringSliceFlag struct {
-	Name   string
-	Usage  string
-	EnvVar string
-	Hidden bool
-	Value  *StringSlice
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f StringSliceFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f StringSliceFlag) GetName() string {
-	return f.Name
-}
-
-// StringSlice looks up the value of a local StringSliceFlag, returns
-// nil if not found
-func (c *Context) StringSlice(name string) []string {
-	return lookupStringSlice(name, c.flagSet)
-}
-
-// GlobalStringSlice looks up the value of a global StringSliceFlag, returns
-// nil if not found
-func (c *Context) GlobalStringSlice(name string) []string {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupStringSlice(name, fs)
-	}
-	return nil
-}
-
-func lookupStringSlice(name string, set *flag.FlagSet) []string {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := (f.Value.(*StringSlice)).Value(), error(nil)
-		if err != nil {
-			return nil
-		}
-		return parsed
-	}
-	return nil
-}
-
-// Uint64Flag is a flag with type uint64
-type Uint64Flag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       uint64
-	Destination *uint64
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f Uint64Flag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f Uint64Flag) GetName() string {
-	return f.Name
-}
-
-// Uint64 looks up the value of a local Uint64Flag, returns
-// 0 if not found
-func (c *Context) Uint64(name string) uint64 {
-	return lookupUint64(name, c.flagSet)
-}
-
-// GlobalUint64 looks up the value of a global Uint64Flag, returns
-// 0 if not found
-func (c *Context) GlobalUint64(name string) uint64 {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupUint64(name, fs)
-	}
-	return 0
-}
-
-func lookupUint64(name string, set *flag.FlagSet) uint64 {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseUint(f.Value.String(), 0, 64)
-		if err != nil {
-			return 0
-		}
-		return parsed
-	}
-	return 0
-}
-
-// UintFlag is a flag with type uint
-type UintFlag struct {
-	Name        string
-	Usage       string
-	EnvVar      string
-	Hidden      bool
-	Value       uint
-	Destination *uint
-}
-
-// String returns a readable representation of this value
-// (for usage defaults)
-func (f UintFlag) String() string {
-	return FlagStringer(f)
-}
-
-// GetName returns the name of the flag
-func (f UintFlag) GetName() string {
-	return f.Name
-}
-
-// Uint looks up the value of a local UintFlag, returns
-// 0 if not found
-func (c *Context) Uint(name string) uint {
-	return lookupUint(name, c.flagSet)
-}
-
-// GlobalUint looks up the value of a global UintFlag, returns
-// 0 if not found
-func (c *Context) GlobalUint(name string) uint {
-	if fs := lookupGlobalFlagSet(name, c); fs != nil {
-		return lookupUint(name, fs)
-	}
-	return 0
-}
-
-func lookupUint(name string, set *flag.FlagSet) uint {
-	f := set.Lookup(name)
-	if f != nil {
-		parsed, err := strconv.ParseUint(f.Value.String(), 0, 64)
-		if err != nil {
-			return 0
-		}
-		return uint(parsed)
-	}
-	return 0
-}
diff --git a/vendor/github.com/codegangsta/cli/funcs.go b/vendor/github.com/codegangsta/cli/funcs.go
deleted file mode 100644
index cba5e6cb0c..0000000000
--- a/vendor/github.com/codegangsta/cli/funcs.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package cli
-
-// BashCompleteFunc is an action to execute when the bash-completion flag is set
-type BashCompleteFunc func(*Context)
-
-// BeforeFunc is an action to execute before any subcommands are run, but after
-// the context is ready if a non-nil error is returned, no subcommands are run
-type BeforeFunc func(*Context) error
-
-// AfterFunc is an action to execute after any subcommands are run, but after the
-// subcommand has finished it is run even if Action() panics
-type AfterFunc func(*Context) error
-
-// ActionFunc is the action to execute when no subcommands are specified
-type ActionFunc func(*Context) error
-
-// CommandNotFoundFunc is executed if the proper command cannot be found
-type CommandNotFoundFunc func(*Context, string)
-
-// OnUsageErrorFunc is executed if an usage error occurs. This is useful for displaying
-// customized usage error messages.  This function is able to replace the
-// original error messages.  If this function is not set, the "Incorrect usage"
-// is displayed and the execution is interrupted.
-type OnUsageErrorFunc func(context *Context, err error, isSubcommand bool) error
-
-// FlagStringFunc is used by the help generation to display a flag, which is
-// expected to be a single line.
-type FlagStringFunc func(Flag) string
diff --git a/vendor/github.com/codegangsta/cli/generate-flag-types b/vendor/github.com/codegangsta/cli/generate-flag-types
deleted file mode 100755
index 7147381ce3..0000000000
--- a/vendor/github.com/codegangsta/cli/generate-flag-types
+++ /dev/null
@@ -1,255 +0,0 @@
-#!/usr/bin/env python
-"""
-The flag types that ship with the cli library have many things in common, and
-so we can take advantage of the `go generate` command to create much of the
-source code from a list of definitions.  These definitions attempt to cover
-the parts that vary between flag types, and should evolve as needed.
-
-An example of the minimum definition needed is:
-
-    {
-      "name": "SomeType",
-      "type": "sometype",
-      "context_default": "nil"
-    }
-
-In this example, the code generated for the `cli` package will include a type
-named `SomeTypeFlag` that is expected to wrap a value of type `sometype`.
-Fetching values by name via `*cli.Context` will default to a value of `nil`.
-
-A more complete, albeit somewhat redundant, example showing all available
-definition keys is:
-
-    {
-      "name": "VeryMuchType",
-      "type": "*VeryMuchType",
-      "value": true,
-      "dest": false,
-      "doctail": " which really only wraps a []float64, oh well!",
-      "context_type": "[]float64",
-      "context_default": "nil",
-      "parser": "parseVeryMuchType(f.Value.String())",
-      "parser_cast": "[]float64(parsed)"
-    }
-
-The meaning of each field is as follows:
-
-               name (string) - The type "name", which will be suffixed with
-                               `Flag` when generating the type definition
-                               for `cli` and the wrapper type for `altsrc`
-               type (string) - The type that the generated `Flag` type for `cli`
-                               is expected to "contain" as its `.Value` member
-                value (bool) - Should the generated `cli` type have a `Value`
-                               member?
-                 dest (bool) - Should the generated `cli` type support a
-                               destination pointer?
-            doctail (string) - Additional docs for the `cli` flag type comment
-       context_type (string) - The literal type used in the `*cli.Context`
-                               reader func signature
-    context_default (string) - The literal value used as the default by the
-                               `*cli.Context` reader funcs when no value is
-                               present
-             parser (string) - Literal code used to parse the flag `f`,
-                               expected to have a return signature of
-                               (value, error)
-        parser_cast (string) - Literal code used to cast the `parsed` value
-                               returned from the `parser` code
-"""
-
-from __future__ import print_function, unicode_literals
-
-import argparse
-import json
-import os
-import subprocess
-import sys
-import tempfile
-import textwrap
-
-
-class _FancyFormatter(argparse.ArgumentDefaultsHelpFormatter,
-                      argparse.RawDescriptionHelpFormatter):
-    pass
-
-
-def main(sysargs=sys.argv[:]):
-    parser = argparse.ArgumentParser(
-        description='Generate flag type code!',
-        formatter_class=_FancyFormatter)
-    parser.add_argument(
-        'package',
-        type=str, default='cli', choices=_WRITEFUNCS.keys(),
-        help='Package for which flag types will be generated'
-    )
-    parser.add_argument(
-        '-i', '--in-json',
-        type=argparse.FileType('r'),
-        default=sys.stdin,
-        help='Input JSON file which defines each type to be generated'
-    )
-    parser.add_argument(
-        '-o', '--out-go',
-        type=argparse.FileType('w'),
-        default=sys.stdout,
-        help='Output file/stream to which generated source will be written'
-    )
-    parser.epilog = __doc__
-
-    args = parser.parse_args(sysargs[1:])
-    _generate_flag_types(_WRITEFUNCS[args.package], args.out_go, args.in_json)
-    return 0
-
-
-def _generate_flag_types(writefunc, output_go, input_json):
-    types = json.load(input_json)
-
-    tmp = tempfile.NamedTemporaryFile(suffix='.go', delete=False)
-    writefunc(tmp, types)
-    tmp.close()
-
-    new_content = subprocess.check_output(
-        ['goimports', tmp.name]
-    ).decode('utf-8')
-
-    print(new_content, file=output_go, end='')
-    output_go.flush()
-    os.remove(tmp.name)
-
-
-def _set_typedef_defaults(typedef):
-    typedef.setdefault('doctail', '')
-    typedef.setdefault('context_type', typedef['type'])
-    typedef.setdefault('dest', True)
-    typedef.setdefault('value', True)
-    typedef.setdefault('parser', 'f.Value, error(nil)')
-    typedef.setdefault('parser_cast', 'parsed')
-
-
-def _write_cli_flag_types(outfile, types):
-    _fwrite(outfile, """\
-        package cli
-
-        // WARNING: This file is generated!
-
-        """)
-
-    for typedef in types:
-        _set_typedef_defaults(typedef)
-
-        _fwrite(outfile, """\
-        // {name}Flag is a flag with type {type}{doctail}
-        type {name}Flag struct {{
-            Name string
-            Usage string
-            EnvVar string
-            Hidden bool
-        """.format(**typedef))
-
-        if typedef['value']:
-            _fwrite(outfile, """\
-            Value {type}
-            """.format(**typedef))
-
-        if typedef['dest']:
-            _fwrite(outfile, """\
-            Destination *{type}
-            """.format(**typedef))
-
-        _fwrite(outfile, "\n}\n\n")
-
-        _fwrite(outfile, """\
-            // String returns a readable representation of this value
-            // (for usage defaults)
-            func (f {name}Flag) String() string {{
-                return FlagStringer(f)
-            }}
-
-            // GetName returns the name of the flag
-            func (f {name}Flag) GetName() string {{
-                return f.Name
-            }}
-
-            // {name} looks up the value of a local {name}Flag, returns
-            // {context_default} if not found
-            func (c *Context) {name}(name string) {context_type} {{
-                return lookup{name}(name, c.flagSet)
-            }}
-
-            // Global{name} looks up the value of a global {name}Flag, returns
-            // {context_default} if not found
-            func (c *Context) Global{name}(name string) {context_type} {{
-                if fs := lookupGlobalFlagSet(name, c); fs != nil {{
-                    return lookup{name}(name, fs)
-                }}
-                return {context_default}
-            }}
-
-            func lookup{name}(name string, set *flag.FlagSet) {context_type} {{
-                f := set.Lookup(name)
-                if f != nil {{
-                    parsed, err := {parser}
-                    if err != nil {{
-                        return {context_default}
-                    }}
-                    return {parser_cast}
-                }}
-                return {context_default}
-            }}
-            """.format(**typedef))
-
-
-def _write_altsrc_flag_types(outfile, types):
-    _fwrite(outfile, """\
-        package altsrc
-
-        import (
-            "gopkg.in/urfave/cli.v1"
-        )
-
-        // WARNING: This file is generated!
-
-        """)
-
-    for typedef in types:
-        _set_typedef_defaults(typedef)
-
-        _fwrite(outfile, """\
-        // {name}Flag is the flag type that wraps cli.{name}Flag to allow
-        // for other values to be specified
-        type {name}Flag struct {{
-            cli.{name}Flag
-            set *flag.FlagSet
-        }}
-
-        // New{name}Flag creates a new {name}Flag
-        func New{name}Flag(fl cli.{name}Flag) *{name}Flag {{
-            return &{name}Flag{{{name}Flag: fl, set: nil}}
-        }}
-
-        // Apply saves the flagSet for later usage calls, then calls the
-        // wrapped {name}Flag.Apply
-        func (f *{name}Flag) Apply(set *flag.FlagSet) {{
-            f.set = set
-            f.{name}Flag.Apply(set)
-        }}
-
-        // ApplyWithError saves the flagSet for later usage calls, then calls the
-        // wrapped {name}Flag.ApplyWithError
-        func (f *{name}Flag) ApplyWithError(set *flag.FlagSet) error {{
-            f.set = set
-            return f.{name}Flag.ApplyWithError(set)
-        }}
-        """.format(**typedef))
-
-
-def _fwrite(outfile, text):
-    print(textwrap.dedent(text), end='', file=outfile)
-
-
-_WRITEFUNCS = {
-    'cli': _write_cli_flag_types,
-    'altsrc': _write_altsrc_flag_types
-}
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/vendor/github.com/codegangsta/cli/help.go b/vendor/github.com/codegangsta/cli/help.go
deleted file mode 100644
index d00e4da1b5..0000000000
--- a/vendor/github.com/codegangsta/cli/help.go
+++ /dev/null
@@ -1,294 +0,0 @@
-package cli
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"text/tabwriter"
-	"text/template"
-)
-
-// AppHelpTemplate is the text template for the Default help topic.
-// cli.go uses text/template to render templates. You can
-// render custom help text by setting this variable.
-var AppHelpTemplate = `NAME:
-   {{.Name}}{{if .Usage}} - {{.Usage}}{{end}}
-
-USAGE:
-   {{if .UsageText}}{{.UsageText}}{{else}}{{.HelpName}} {{if .VisibleFlags}}[global options]{{end}}{{if .Commands}} command [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Version}}{{if not .HideVersion}}
-
-VERSION:
-   {{.Version}}{{end}}{{end}}{{if .Description}}
-
-DESCRIPTION:
-   {{.Description}}{{end}}{{if len .Authors}}
-
-AUTHOR{{with $length := len .Authors}}{{if ne 1 $length}}S{{end}}{{end}}:
-   {{range $index, $author := .Authors}}{{if $index}}
-   {{end}}{{$author}}{{end}}{{end}}{{if .VisibleCommands}}
-
-COMMANDS:{{range .VisibleCategories}}{{if .Name}}
-   {{.Name}}:{{end}}{{range .VisibleCommands}}
-     {{join .Names ", "}}{{"\t"}}{{.Usage}}{{end}}{{end}}{{end}}{{if .VisibleFlags}}
-
-GLOBAL OPTIONS:
-   {{range $index, $option := .VisibleFlags}}{{if $index}}
-   {{end}}{{$option}}{{end}}{{end}}{{if .Copyright}}
-
-COPYRIGHT:
-   {{.Copyright}}{{end}}
-`
-
-// CommandHelpTemplate is the text template for the command help topic.
-// cli.go uses text/template to render templates. You can
-// render custom help text by setting this variable.
-var CommandHelpTemplate = `NAME:
-   {{.HelpName}} - {{.Usage}}
-
-USAGE:
-   {{.HelpName}}{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{if .Category}}
-
-CATEGORY:
-   {{.Category}}{{end}}{{if .Description}}
-
-DESCRIPTION:
-   {{.Description}}{{end}}{{if .VisibleFlags}}
-
-OPTIONS:
-   {{range .VisibleFlags}}{{.}}
-   {{end}}{{end}}
-`
-
-// SubcommandHelpTemplate is the text template for the subcommand help topic.
-// cli.go uses text/template to render templates. You can
-// render custom help text by setting this variable.
-var SubcommandHelpTemplate = `NAME:
-   {{.HelpName}} - {{if .Description}}{{.Description}}{{else}}{{.Usage}}{{end}}
-
-USAGE:
-   {{.HelpName}} command{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}
-
-COMMANDS:{{range .VisibleCategories}}{{if .Name}}
-   {{.Name}}:{{end}}{{range .VisibleCommands}}
-     {{join .Names ", "}}{{"\t"}}{{.Usage}}{{end}}
-{{end}}{{if .VisibleFlags}}
-OPTIONS:
-   {{range .VisibleFlags}}{{.}}
-   {{end}}{{end}}
-`
-
-var helpCommand = Command{
-	Name:      "help",
-	Aliases:   []string{"h"},
-	Usage:     "Shows a list of commands or help for one command",
-	ArgsUsage: "[command]",
-	Action: func(c *Context) error {
-		args := c.Args()
-		if args.Present() {
-			return ShowCommandHelp(c, args.First())
-		}
-
-		ShowAppHelp(c)
-		return nil
-	},
-}
-
-var helpSubcommand = Command{
-	Name:      "help",
-	Aliases:   []string{"h"},
-	Usage:     "Shows a list of commands or help for one command",
-	ArgsUsage: "[command]",
-	Action: func(c *Context) error {
-		args := c.Args()
-		if args.Present() {
-			return ShowCommandHelp(c, args.First())
-		}
-
-		return ShowSubcommandHelp(c)
-	},
-}
-
-// Prints help for the App or Command
-type helpPrinter func(w io.Writer, templ string, data interface{})
-
-// HelpPrinter is a function that writes the help output. If not set a default
-// is used. The function signature is:
-// func(w io.Writer, templ string, data interface{})
-var HelpPrinter helpPrinter = printHelp
-
-// VersionPrinter prints the version for the App
-var VersionPrinter = printVersion
-
-// ShowAppHelp is an action that displays the help.
-func ShowAppHelp(c *Context) error {
-	HelpPrinter(c.App.Writer, AppHelpTemplate, c.App)
-	return nil
-}
-
-// DefaultAppComplete prints the list of subcommands as the default app completion method
-func DefaultAppComplete(c *Context) {
-	for _, command := range c.App.Commands {
-		if command.Hidden {
-			continue
-		}
-		for _, name := range command.Names() {
-			fmt.Fprintln(c.App.Writer, name)
-		}
-	}
-}
-
-// ShowCommandHelp prints help for the given command
-func ShowCommandHelp(ctx *Context, command string) error {
-	// show the subcommand help for a command with subcommands
-	if command == "" {
-		HelpPrinter(ctx.App.Writer, SubcommandHelpTemplate, ctx.App)
-		return nil
-	}
-
-	for _, c := range ctx.App.Commands {
-		if c.HasName(command) {
-			HelpPrinter(ctx.App.Writer, CommandHelpTemplate, c)
-			return nil
-		}
-	}
-
-	if ctx.App.CommandNotFound == nil {
-		return NewExitError(fmt.Sprintf("No help topic for '%v'", command), 3)
-	}
-
-	ctx.App.CommandNotFound(ctx, command)
-	return nil
-}
-
-// ShowSubcommandHelp prints help for the given subcommand
-func ShowSubcommandHelp(c *Context) error {
-	return ShowCommandHelp(c, c.Command.Name)
-}
-
-// ShowVersion prints the version number of the App
-func ShowVersion(c *Context) {
-	VersionPrinter(c)
-}
-
-func printVersion(c *Context) {
-	fmt.Fprintf(c.App.Writer, "%v version %v\n", c.App.Name, c.App.Version)
-}
-
-// ShowCompletions prints the lists of commands within a given context
-func ShowCompletions(c *Context) {
-	a := c.App
-	if a != nil && a.BashComplete != nil {
-		a.BashComplete(c)
-	}
-}
-
-// ShowCommandCompletions prints the custom completions for a given command
-func ShowCommandCompletions(ctx *Context, command string) {
-	c := ctx.App.Command(command)
-	if c != nil && c.BashComplete != nil {
-		c.BashComplete(ctx)
-	}
-}
-
-func printHelp(out io.Writer, templ string, data interface{}) {
-	funcMap := template.FuncMap{
-		"join": strings.Join,
-	}
-
-	w := tabwriter.NewWriter(out, 1, 8, 2, ' ', 0)
-	t := template.Must(template.New("help").Funcs(funcMap).Parse(templ))
-	err := t.Execute(w, data)
-	if err != nil {
-		// If the writer is closed, t.Execute will fail, and there's nothing
-		// we can do to recover.
-		if os.Getenv("CLI_TEMPLATE_ERROR_DEBUG") != "" {
-			fmt.Fprintf(ErrWriter, "CLI TEMPLATE ERROR: %#v\n", err)
-		}
-		return
-	}
-	w.Flush()
-}
-
-func checkVersion(c *Context) bool {
-	found := false
-	if VersionFlag.Name != "" {
-		eachName(VersionFlag.Name, func(name string) {
-			if c.GlobalBool(name) || c.Bool(name) {
-				found = true
-			}
-		})
-	}
-	return found
-}
-
-func checkHelp(c *Context) bool {
-	found := false
-	if HelpFlag.Name != "" {
-		eachName(HelpFlag.Name, func(name string) {
-			if c.GlobalBool(name) || c.Bool(name) {
-				found = true
-			}
-		})
-	}
-	return found
-}
-
-func checkCommandHelp(c *Context, name string) bool {
-	if c.Bool("h") || c.Bool("help") {
-		ShowCommandHelp(c, name)
-		return true
-	}
-
-	return false
-}
-
-func checkSubcommandHelp(c *Context) bool {
-	if c.Bool("h") || c.Bool("help") {
-		ShowSubcommandHelp(c)
-		return true
-	}
-
-	return false
-}
-
-func checkShellCompleteFlag(a *App, arguments []string) (bool, []string) {
-	if !a.EnableBashCompletion {
-		return false, arguments
-	}
-
-	pos := len(arguments) - 1
-	lastArg := arguments[pos]
-
-	if lastArg != "--"+BashCompletionFlag.Name {
-		return false, arguments
-	}
-
-	return true, arguments[:pos]
-}
-
-func checkCompletions(c *Context) bool {
-	if !c.shellComplete {
-		return false
-	}
-
-	if args := c.Args(); args.Present() {
-		name := args.First()
-		if cmd := c.App.Command(name); cmd != nil {
-			// let the command handle the completion
-			return false
-		}
-	}
-
-	ShowCompletions(c)
-	return true
-}
-
-func checkCommandCompletions(c *Context, name string) bool {
-	if !c.shellComplete {
-		return false
-	}
-
-	ShowCommandCompletions(c, name)
-	return true
-}
diff --git a/vendor/github.com/codegangsta/cli/runtests b/vendor/github.com/codegangsta/cli/runtests
deleted file mode 100755
index ee22bdeed5..0000000000
--- a/vendor/github.com/codegangsta/cli/runtests
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env python
-from __future__ import print_function
-
-import argparse
-import os
-import sys
-import tempfile
-
-from subprocess import check_call, check_output
-
-
-PACKAGE_NAME = os.environ.get(
-    'CLI_PACKAGE_NAME', 'github.com/urfave/cli'
-)
-
-
-def main(sysargs=sys.argv[:]):
-    targets = {
-        'vet': _vet,
-        'test': _test,
-        'gfmrun': _gfmrun,
-        'toc': _toc,
-        'gen': _gen,
-    }
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        'target', nargs='?', choices=tuple(targets.keys()), default='test'
-    )
-    args = parser.parse_args(sysargs[1:])
-
-    targets[args.target]()
-    return 0
-
-
-def _test():
-    if check_output('go version'.split()).split()[2] < 'go1.2':
-        _run('go test -v .')
-        return
-
-    coverprofiles = []
-    for subpackage in ['', 'altsrc']:
-        coverprofile = 'cli.coverprofile'
-        if subpackage != '':
-            coverprofile = '{}.coverprofile'.format(subpackage)
-
-        coverprofiles.append(coverprofile)
-
-        _run('go test -v'.split() + [
-            '-coverprofile={}'.format(coverprofile),
-            ('{}/{}'.format(PACKAGE_NAME, subpackage)).rstrip('/')
-        ])
-
-    combined_name = _combine_coverprofiles(coverprofiles)
-    _run('go tool cover -func={}'.format(combined_name))
-    os.remove(combined_name)
-
-
-def _gfmrun():
-    go_version = check_output('go version'.split()).split()[2]
-    if go_version < 'go1.3':
-        print('runtests: skip on {}'.format(go_version), file=sys.stderr)
-        return
-    _run(['gfmrun', '-c', str(_gfmrun_count()), '-s', 'README.md'])
-
-
-def _vet():
-    _run('go vet ./...')
-
-
-def _toc():
-    _run('node_modules/.bin/markdown-toc -i README.md')
-    _run('git diff --exit-code')
-
-
-def _gen():
-    go_version = check_output('go version'.split()).split()[2]
-    if go_version < 'go1.5':
-        print('runtests: skip on {}'.format(go_version), file=sys.stderr)
-        return
-
-    _run('go generate ./...')
-    _run('git diff --exit-code')
-
-
-def _run(command):
-    if hasattr(command, 'split'):
-        command = command.split()
-    print('runtests: {}'.format(' '.join(command)), file=sys.stderr)
-    check_call(command)
-
-
-def _gfmrun_count():
-    with open('README.md') as infile:
-        lines = infile.read().splitlines()
-        return len(filter(_is_go_runnable, lines))
-
-
-def _is_go_runnable(line):
-    return line.startswith('package main')
-
-
-def _combine_coverprofiles(coverprofiles):
-    combined = tempfile.NamedTemporaryFile(
-        suffix='.coverprofile', delete=False
-    )
-    combined.write('mode: set\n')
-
-    for coverprofile in coverprofiles:
-        with open(coverprofile, 'r') as infile:
-            for line in infile.readlines():
-                if not line.startswith('mode: '):
-                    combined.write(line)
-
-    combined.flush()
-    name = combined.name
-    combined.close()
-    return name
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/vendor/github.com/docker/distribution/LICENSE b/vendor/github.com/docker/distribution/LICENSE
deleted file mode 100644
index e06d208186..0000000000
--- a/vendor/github.com/docker/distribution/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/vendor/github.com/docker/distribution/digestset/set.go b/vendor/github.com/docker/distribution/digestset/set.go
deleted file mode 100644
index 71327dca72..0000000000
--- a/vendor/github.com/docker/distribution/digestset/set.go
+++ /dev/null
@@ -1,247 +0,0 @@
-package digestset
-
-import (
-	"errors"
-	"sort"
-	"strings"
-	"sync"
-
-	digest "github.com/opencontainers/go-digest"
-)
-
-var (
-	// ErrDigestNotFound is used when a matching digest
-	// could not be found in a set.
-	ErrDigestNotFound = errors.New("digest not found")
-
-	// ErrDigestAmbiguous is used when multiple digests
-	// are found in a set. None of the matching digests
-	// should be considered valid matches.
-	ErrDigestAmbiguous = errors.New("ambiguous digest string")
-)
-
-// Set is used to hold a unique set of digests which
-// may be easily referenced by easily  referenced by a string
-// representation of the digest as well as short representation.
-// The uniqueness of the short representation is based on other
-// digests in the set. If digests are omitted from this set,
-// collisions in a larger set may not be detected, therefore it
-// is important to always do short representation lookups on
-// the complete set of digests. To mitigate collisions, an
-// appropriately long short code should be used.
-type Set struct {
-	mutex   sync.RWMutex
-	entries digestEntries
-}
-
-// NewSet creates an empty set of digests
-// which may have digests added.
-func NewSet() *Set {
-	return &Set{
-		entries: digestEntries{},
-	}
-}
-
-// checkShortMatch checks whether two digests match as either whole
-// values or short values. This function does not test equality,
-// rather whether the second value could match against the first
-// value.
-func checkShortMatch(alg digest.Algorithm, hex, shortAlg, shortHex string) bool {
-	if len(hex) == len(shortHex) {
-		if hex != shortHex {
-			return false
-		}
-		if len(shortAlg) > 0 && string(alg) != shortAlg {
-			return false
-		}
-	} else if !strings.HasPrefix(hex, shortHex) {
-		return false
-	} else if len(shortAlg) > 0 && string(alg) != shortAlg {
-		return false
-	}
-	return true
-}
-
-// Lookup looks for a digest matching the given string representation.
-// If no digests could be found ErrDigestNotFound will be returned
-// with an empty digest value. If multiple matches are found
-// ErrDigestAmbiguous will be returned with an empty digest value.
-func (dst *Set) Lookup(d string) (digest.Digest, error) {
-	dst.mutex.RLock()
-	defer dst.mutex.RUnlock()
-	if len(dst.entries) == 0 {
-		return "", ErrDigestNotFound
-	}
-	var (
-		searchFunc func(int) bool
-		alg        digest.Algorithm
-		hex        string
-	)
-	dgst, err := digest.Parse(d)
-	if err == digest.ErrDigestInvalidFormat {
-		hex = d
-		searchFunc = func(i int) bool {
-			return dst.entries[i].val >= d
-		}
-	} else {
-		hex = dgst.Hex()
-		alg = dgst.Algorithm()
-		searchFunc = func(i int) bool {
-			if dst.entries[i].val == hex {
-				return dst.entries[i].alg >= alg
-			}
-			return dst.entries[i].val >= hex
-		}
-	}
-	idx := sort.Search(len(dst.entries), searchFunc)
-	if idx == len(dst.entries) || !checkShortMatch(dst.entries[idx].alg, dst.entries[idx].val, string(alg), hex) {
-		return "", ErrDigestNotFound
-	}
-	if dst.entries[idx].alg == alg && dst.entries[idx].val == hex {
-		return dst.entries[idx].digest, nil
-	}
-	if idx+1 < len(dst.entries) && checkShortMatch(dst.entries[idx+1].alg, dst.entries[idx+1].val, string(alg), hex) {
-		return "", ErrDigestAmbiguous
-	}
-
-	return dst.entries[idx].digest, nil
-}
-
-// Add adds the given digest to the set. An error will be returned
-// if the given digest is invalid. If the digest already exists in the
-// set, this operation will be a no-op.
-func (dst *Set) Add(d digest.Digest) error {
-	if err := d.Validate(); err != nil {
-		return err
-	}
-	dst.mutex.Lock()
-	defer dst.mutex.Unlock()
-	entry := &digestEntry{alg: d.Algorithm(), val: d.Hex(), digest: d}
-	searchFunc := func(i int) bool {
-		if dst.entries[i].val == entry.val {
-			return dst.entries[i].alg >= entry.alg
-		}
-		return dst.entries[i].val >= entry.val
-	}
-	idx := sort.Search(len(dst.entries), searchFunc)
-	if idx == len(dst.entries) {
-		dst.entries = append(dst.entries, entry)
-		return nil
-	} else if dst.entries[idx].digest == d {
-		return nil
-	}
-
-	entries := append(dst.entries, nil)
-	copy(entries[idx+1:], entries[idx:len(entries)-1])
-	entries[idx] = entry
-	dst.entries = entries
-	return nil
-}
-
-// Remove removes the given digest from the set. An err will be
-// returned if the given digest is invalid. If the digest does
-// not exist in the set, this operation will be a no-op.
-func (dst *Set) Remove(d digest.Digest) error {
-	if err := d.Validate(); err != nil {
-		return err
-	}
-	dst.mutex.Lock()
-	defer dst.mutex.Unlock()
-	entry := &digestEntry{alg: d.Algorithm(), val: d.Hex(), digest: d}
-	searchFunc := func(i int) bool {
-		if dst.entries[i].val == entry.val {
-			return dst.entries[i].alg >= entry.alg
-		}
-		return dst.entries[i].val >= entry.val
-	}
-	idx := sort.Search(len(dst.entries), searchFunc)
-	// Not found if idx is after or value at idx is not digest
-	if idx == len(dst.entries) || dst.entries[idx].digest != d {
-		return nil
-	}
-
-	entries := dst.entries
-	copy(entries[idx:], entries[idx+1:])
-	entries = entries[:len(entries)-1]
-	dst.entries = entries
-
-	return nil
-}
-
-// All returns all the digests in the set
-func (dst *Set) All() []digest.Digest {
-	dst.mutex.RLock()
-	defer dst.mutex.RUnlock()
-	retValues := make([]digest.Digest, len(dst.entries))
-	for i := range dst.entries {
-		retValues[i] = dst.entries[i].digest
-	}
-
-	return retValues
-}
-
-// ShortCodeTable returns a map of Digest to unique short codes. The
-// length represents the minimum value, the maximum length may be the
-// entire value of digest if uniqueness cannot be achieved without the
-// full value. This function will attempt to make short codes as short
-// as possible to be unique.
-func ShortCodeTable(dst *Set, length int) map[digest.Digest]string {
-	dst.mutex.RLock()
-	defer dst.mutex.RUnlock()
-	m := make(map[digest.Digest]string, len(dst.entries))
-	l := length
-	resetIdx := 0
-	for i := 0; i < len(dst.entries); i++ {
-		var short string
-		extended := true
-		for extended {
-			extended = false
-			if len(dst.entries[i].val) <= l {
-				short = dst.entries[i].digest.String()
-			} else {
-				short = dst.entries[i].val[:l]
-				for j := i + 1; j < len(dst.entries); j++ {
-					if checkShortMatch(dst.entries[j].alg, dst.entries[j].val, "", short) {
-						if j > resetIdx {
-							resetIdx = j
-						}
-						extended = true
-					} else {
-						break
-					}
-				}
-				if extended {
-					l++
-				}
-			}
-		}
-		m[dst.entries[i].digest] = short
-		if i >= resetIdx {
-			l = length
-		}
-	}
-	return m
-}
-
-type digestEntry struct {
-	alg    digest.Algorithm
-	val    string
-	digest digest.Digest
-}
-
-type digestEntries []*digestEntry
-
-func (d digestEntries) Len() int {
-	return len(d)
-}
-
-func (d digestEntries) Less(i, j int) bool {
-	if d[i].val != d[j].val {
-		return d[i].val < d[j].val
-	}
-	return d[i].alg < d[j].alg
-}
-
-func (d digestEntries) Swap(i, j int) {
-	d[i], d[j] = d[j], d[i]
-}
diff --git a/vendor/github.com/docker/distribution/reference/helpers.go b/vendor/github.com/docker/distribution/reference/helpers.go
deleted file mode 100644
index 978df7eabb..0000000000
--- a/vendor/github.com/docker/distribution/reference/helpers.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package reference
-
-import "path"
-
-// IsNameOnly returns true if reference only contains a repo name.
-func IsNameOnly(ref Named) bool {
-	if _, ok := ref.(NamedTagged); ok {
-		return false
-	}
-	if _, ok := ref.(Canonical); ok {
-		return false
-	}
-	return true
-}
-
-// FamiliarName returns the familiar name string
-// for the given named, familiarizing if needed.
-func FamiliarName(ref Named) string {
-	if nn, ok := ref.(normalizedNamed); ok {
-		return nn.Familiar().Name()
-	}
-	return ref.Name()
-}
-
-// FamiliarString returns the familiar string representation
-// for the given reference, familiarizing if needed.
-func FamiliarString(ref Reference) string {
-	if nn, ok := ref.(normalizedNamed); ok {
-		return nn.Familiar().String()
-	}
-	return ref.String()
-}
-
-// FamiliarMatch reports whether ref matches the specified pattern.
-// See https://godoc.org/path#Match for supported patterns.
-func FamiliarMatch(pattern string, ref Reference) (bool, error) {
-	matched, err := path.Match(pattern, FamiliarString(ref))
-	if namedRef, isNamed := ref.(Named); isNamed && !matched {
-		matched, _ = path.Match(pattern, FamiliarName(namedRef))
-	}
-	return matched, err
-}
diff --git a/vendor/github.com/docker/distribution/reference/normalize.go b/vendor/github.com/docker/distribution/reference/normalize.go
deleted file mode 100644
index 2d71fc5e9f..0000000000
--- a/vendor/github.com/docker/distribution/reference/normalize.go
+++ /dev/null
@@ -1,170 +0,0 @@
-package reference
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-
-	"github.com/docker/distribution/digestset"
-	"github.com/opencontainers/go-digest"
-)
-
-var (
-	legacyDefaultDomain = "index.docker.io"
-	defaultDomain       = "docker.io"
-	officialRepoName    = "library"
-	defaultTag          = "latest"
-)
-
-// normalizedNamed represents a name which has been
-// normalized and has a familiar form. A familiar name
-// is what is used in Docker UI. An example normalized
-// name is "docker.io/library/ubuntu" and corresponding
-// familiar name of "ubuntu".
-type normalizedNamed interface {
-	Named
-	Familiar() Named
-}
-
-// ParseNormalizedNamed parses a string into a named reference
-// transforming a familiar name from Docker UI to a fully
-// qualified reference. If the value may be an identifier
-// use ParseAnyReference.
-func ParseNormalizedNamed(s string) (Named, error) {
-	if ok := anchoredIdentifierRegexp.MatchString(s); ok {
-		return nil, fmt.Errorf("invalid repository name (%s), cannot specify 64-byte hexadecimal strings", s)
-	}
-	domain, remainder := splitDockerDomain(s)
-	var remoteName string
-	if tagSep := strings.IndexRune(remainder, ':'); tagSep > -1 {
-		remoteName = remainder[:tagSep]
-	} else {
-		remoteName = remainder
-	}
-	if strings.ToLower(remoteName) != remoteName {
-		return nil, errors.New("invalid reference format: repository name must be lowercase")
-	}
-
-	ref, err := Parse(domain + "/" + remainder)
-	if err != nil {
-		return nil, err
-	}
-	named, isNamed := ref.(Named)
-	if !isNamed {
-		return nil, fmt.Errorf("reference %s has no name", ref.String())
-	}
-	return named, nil
-}
-
-// splitDockerDomain splits a repository name to domain and remotename string.
-// If no valid domain is found, the default domain is used. Repository name
-// needs to be already validated before.
-func splitDockerDomain(name string) (domain, remainder string) {
-	i := strings.IndexRune(name, '/')
-	if i == -1 || (!strings.ContainsAny(name[:i], ".:") && name[:i] != "localhost") {
-		domain, remainder = defaultDomain, name
-	} else {
-		domain, remainder = name[:i], name[i+1:]
-	}
-	if domain == legacyDefaultDomain {
-		domain = defaultDomain
-	}
-	if domain == defaultDomain && !strings.ContainsRune(remainder, '/') {
-		remainder = officialRepoName + "/" + remainder
-	}
-	return
-}
-
-// familiarizeName returns a shortened version of the name familiar
-// to to the Docker UI. Familiar names have the default domain
-// "docker.io" and "library/" repository prefix removed.
-// For example, "docker.io/library/redis" will have the familiar
-// name "redis" and "docker.io/dmcgowan/myapp" will be "dmcgowan/myapp".
-// Returns a familiarized named only reference.
-func familiarizeName(named namedRepository) repository {
-	repo := repository{
-		domain: named.Domain(),
-		path:   named.Path(),
-	}
-
-	if repo.domain == defaultDomain {
-		repo.domain = ""
-		// Handle official repositories which have the pattern "library/<official repo name>"
-		if split := strings.Split(repo.path, "/"); len(split) == 2 && split[0] == officialRepoName {
-			repo.path = split[1]
-		}
-	}
-	return repo
-}
-
-func (r reference) Familiar() Named {
-	return reference{
-		namedRepository: familiarizeName(r.namedRepository),
-		tag:             r.tag,
-		digest:          r.digest,
-	}
-}
-
-func (r repository) Familiar() Named {
-	return familiarizeName(r)
-}
-
-func (t taggedReference) Familiar() Named {
-	return taggedReference{
-		namedRepository: familiarizeName(t.namedRepository),
-		tag:             t.tag,
-	}
-}
-
-func (c canonicalReference) Familiar() Named {
-	return canonicalReference{
-		namedRepository: familiarizeName(c.namedRepository),
-		digest:          c.digest,
-	}
-}
-
-// TagNameOnly adds the default tag "latest" to a reference if it only has
-// a repo name.
-func TagNameOnly(ref Named) Named {
-	if IsNameOnly(ref) {
-		namedTagged, err := WithTag(ref, defaultTag)
-		if err != nil {
-			// Default tag must be valid, to create a NamedTagged
-			// type with non-validated input the WithTag function
-			// should be used instead
-			panic(err)
-		}
-		return namedTagged
-	}
-	return ref
-}
-
-// ParseAnyReference parses a reference string as a possible identifier,
-// full digest, or familiar name.
-func ParseAnyReference(ref string) (Reference, error) {
-	if ok := anchoredIdentifierRegexp.MatchString(ref); ok {
-		return digestReference("sha256:" + ref), nil
-	}
-	if dgst, err := digest.Parse(ref); err == nil {
-		return digestReference(dgst), nil
-	}
-
-	return ParseNormalizedNamed(ref)
-}
-
-// ParseAnyReferenceWithSet parses a reference string as a possible short
-// identifier to be matched in a digest set, a full digest, or familiar name.
-func ParseAnyReferenceWithSet(ref string, ds *digestset.Set) (Reference, error) {
-	if ok := anchoredShortIdentifierRegexp.MatchString(ref); ok {
-		dgst, err := ds.Lookup(ref)
-		if err == nil {
-			return digestReference(dgst), nil
-		}
-	} else {
-		if dgst, err := digest.Parse(ref); err == nil {
-			return digestReference(dgst), nil
-		}
-	}
-
-	return ParseNormalizedNamed(ref)
-}
diff --git a/vendor/github.com/docker/distribution/reference/reference.go b/vendor/github.com/docker/distribution/reference/reference.go
deleted file mode 100644
index fd3510e9ee..0000000000
--- a/vendor/github.com/docker/distribution/reference/reference.go
+++ /dev/null
@@ -1,433 +0,0 @@
-// Package reference provides a general type to represent any way of referencing images within the registry.
-// Its main purpose is to abstract tags and digests (content-addressable hash).
-//
-// Grammar
-//
-// 	reference                       := name [ ":" tag ] [ "@" digest ]
-//	name                            := [domain '/'] path-component ['/' path-component]*
-//	domain                          := domain-component ['.' domain-component]* [':' port-number]
-//	domain-component                := /([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])/
-//	port-number                     := /[0-9]+/
-//	path-component                  := alpha-numeric [separator alpha-numeric]*
-// 	alpha-numeric                   := /[a-z0-9]+/
-//	separator                       := /[_.]|__|[-]*/
-//
-//	tag                             := /[\w][\w.-]{0,127}/
-//
-//	digest                          := digest-algorithm ":" digest-hex
-//	digest-algorithm                := digest-algorithm-component [ digest-algorithm-separator digest-algorithm-component ]
-//	digest-algorithm-separator      := /[+.-_]/
-//	digest-algorithm-component      := /[A-Za-z][A-Za-z0-9]*/
-//	digest-hex                      := /[0-9a-fA-F]{32,}/ ; At least 128 bit digest value
-//
-//	identifier                      := /[a-f0-9]{64}/
-//	short-identifier                := /[a-f0-9]{6,64}/
-package reference
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-
-	"github.com/opencontainers/go-digest"
-)
-
-const (
-	// NameTotalLengthMax is the maximum total number of characters in a repository name.
-	NameTotalLengthMax = 255
-)
-
-var (
-	// ErrReferenceInvalidFormat represents an error while trying to parse a string as a reference.
-	ErrReferenceInvalidFormat = errors.New("invalid reference format")
-
-	// ErrTagInvalidFormat represents an error while trying to parse a string as a tag.
-	ErrTagInvalidFormat = errors.New("invalid tag format")
-
-	// ErrDigestInvalidFormat represents an error while trying to parse a string as a tag.
-	ErrDigestInvalidFormat = errors.New("invalid digest format")
-
-	// ErrNameContainsUppercase is returned for invalid repository names that contain uppercase characters.
-	ErrNameContainsUppercase = errors.New("repository name must be lowercase")
-
-	// ErrNameEmpty is returned for empty, invalid repository names.
-	ErrNameEmpty = errors.New("repository name must have at least one component")
-
-	// ErrNameTooLong is returned when a repository name is longer than NameTotalLengthMax.
-	ErrNameTooLong = fmt.Errorf("repository name must not be more than %v characters", NameTotalLengthMax)
-
-	// ErrNameNotCanonical is returned when a name is not canonical.
-	ErrNameNotCanonical = errors.New("repository name must be canonical")
-)
-
-// Reference is an opaque object reference identifier that may include
-// modifiers such as a hostname, name, tag, and digest.
-type Reference interface {
-	// String returns the full reference
-	String() string
-}
-
-// Field provides a wrapper type for resolving correct reference types when
-// working with encoding.
-type Field struct {
-	reference Reference
-}
-
-// AsField wraps a reference in a Field for encoding.
-func AsField(reference Reference) Field {
-	return Field{reference}
-}
-
-// Reference unwraps the reference type from the field to
-// return the Reference object. This object should be
-// of the appropriate type to further check for different
-// reference types.
-func (f Field) Reference() Reference {
-	return f.reference
-}
-
-// MarshalText serializes the field to byte text which
-// is the string of the reference.
-func (f Field) MarshalText() (p []byte, err error) {
-	return []byte(f.reference.String()), nil
-}
-
-// UnmarshalText parses text bytes by invoking the
-// reference parser to ensure the appropriately
-// typed reference object is wrapped by field.
-func (f *Field) UnmarshalText(p []byte) error {
-	r, err := Parse(string(p))
-	if err != nil {
-		return err
-	}
-
-	f.reference = r
-	return nil
-}
-
-// Named is an object with a full name
-type Named interface {
-	Reference
-	Name() string
-}
-
-// Tagged is an object which has a tag
-type Tagged interface {
-	Reference
-	Tag() string
-}
-
-// NamedTagged is an object including a name and tag.
-type NamedTagged interface {
-	Named
-	Tag() string
-}
-
-// Digested is an object which has a digest
-// in which it can be referenced by
-type Digested interface {
-	Reference
-	Digest() digest.Digest
-}
-
-// Canonical reference is an object with a fully unique
-// name including a name with domain and digest
-type Canonical interface {
-	Named
-	Digest() digest.Digest
-}
-
-// namedRepository is a reference to a repository with a name.
-// A namedRepository has both domain and path components.
-type namedRepository interface {
-	Named
-	Domain() string
-	Path() string
-}
-
-// Domain returns the domain part of the Named reference
-func Domain(named Named) string {
-	if r, ok := named.(namedRepository); ok {
-		return r.Domain()
-	}
-	domain, _ := splitDomain(named.Name())
-	return domain
-}
-
-// Path returns the name without the domain part of the Named reference
-func Path(named Named) (name string) {
-	if r, ok := named.(namedRepository); ok {
-		return r.Path()
-	}
-	_, path := splitDomain(named.Name())
-	return path
-}
-
-func splitDomain(name string) (string, string) {
-	match := anchoredNameRegexp.FindStringSubmatch(name)
-	if len(match) != 3 {
-		return "", name
-	}
-	return match[1], match[2]
-}
-
-// SplitHostname splits a named reference into a
-// hostname and name string. If no valid hostname is
-// found, the hostname is empty and the full value
-// is returned as name
-// DEPRECATED: Use Domain or Path
-func SplitHostname(named Named) (string, string) {
-	if r, ok := named.(namedRepository); ok {
-		return r.Domain(), r.Path()
-	}
-	return splitDomain(named.Name())
-}
-
-// Parse parses s and returns a syntactically valid Reference.
-// If an error was encountered it is returned, along with a nil Reference.
-// NOTE: Parse will not handle short digests.
-func Parse(s string) (Reference, error) {
-	matches := ReferenceRegexp.FindStringSubmatch(s)
-	if matches == nil {
-		if s == "" {
-			return nil, ErrNameEmpty
-		}
-		if ReferenceRegexp.FindStringSubmatch(strings.ToLower(s)) != nil {
-			return nil, ErrNameContainsUppercase
-		}
-		return nil, ErrReferenceInvalidFormat
-	}
-
-	if len(matches[1]) > NameTotalLengthMax {
-		return nil, ErrNameTooLong
-	}
-
-	var repo repository
-
-	nameMatch := anchoredNameRegexp.FindStringSubmatch(matches[1])
-	if nameMatch != nil && len(nameMatch) == 3 {
-		repo.domain = nameMatch[1]
-		repo.path = nameMatch[2]
-	} else {
-		repo.domain = ""
-		repo.path = matches[1]
-	}
-
-	ref := reference{
-		namedRepository: repo,
-		tag:             matches[2],
-	}
-	if matches[3] != "" {
-		var err error
-		ref.digest, err = digest.Parse(matches[3])
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	r := getBestReferenceType(ref)
-	if r == nil {
-		return nil, ErrNameEmpty
-	}
-
-	return r, nil
-}
-
-// ParseNamed parses s and returns a syntactically valid reference implementing
-// the Named interface. The reference must have a name and be in the canonical
-// form, otherwise an error is returned.
-// If an error was encountered it is returned, along with a nil Reference.
-// NOTE: ParseNamed will not handle short digests.
-func ParseNamed(s string) (Named, error) {
-	named, err := ParseNormalizedNamed(s)
-	if err != nil {
-		return nil, err
-	}
-	if named.String() != s {
-		return nil, ErrNameNotCanonical
-	}
-	return named, nil
-}
-
-// WithName returns a named object representing the given string. If the input
-// is invalid ErrReferenceInvalidFormat will be returned.
-func WithName(name string) (Named, error) {
-	if len(name) > NameTotalLengthMax {
-		return nil, ErrNameTooLong
-	}
-
-	match := anchoredNameRegexp.FindStringSubmatch(name)
-	if match == nil || len(match) != 3 {
-		return nil, ErrReferenceInvalidFormat
-	}
-	return repository{
-		domain: match[1],
-		path:   match[2],
-	}, nil
-}
-
-// WithTag combines the name from "name" and the tag from "tag" to form a
-// reference incorporating both the name and the tag.
-func WithTag(name Named, tag string) (NamedTagged, error) {
-	if !anchoredTagRegexp.MatchString(tag) {
-		return nil, ErrTagInvalidFormat
-	}
-	var repo repository
-	if r, ok := name.(namedRepository); ok {
-		repo.domain = r.Domain()
-		repo.path = r.Path()
-	} else {
-		repo.path = name.Name()
-	}
-	if canonical, ok := name.(Canonical); ok {
-		return reference{
-			namedRepository: repo,
-			tag:             tag,
-			digest:          canonical.Digest(),
-		}, nil
-	}
-	return taggedReference{
-		namedRepository: repo,
-		tag:             tag,
-	}, nil
-}
-
-// WithDigest combines the name from "name" and the digest from "digest" to form
-// a reference incorporating both the name and the digest.
-func WithDigest(name Named, digest digest.Digest) (Canonical, error) {
-	if !anchoredDigestRegexp.MatchString(digest.String()) {
-		return nil, ErrDigestInvalidFormat
-	}
-	var repo repository
-	if r, ok := name.(namedRepository); ok {
-		repo.domain = r.Domain()
-		repo.path = r.Path()
-	} else {
-		repo.path = name.Name()
-	}
-	if tagged, ok := name.(Tagged); ok {
-		return reference{
-			namedRepository: repo,
-			tag:             tagged.Tag(),
-			digest:          digest,
-		}, nil
-	}
-	return canonicalReference{
-		namedRepository: repo,
-		digest:          digest,
-	}, nil
-}
-
-// TrimNamed removes any tag or digest from the named reference.
-func TrimNamed(ref Named) Named {
-	domain, path := SplitHostname(ref)
-	return repository{
-		domain: domain,
-		path:   path,
-	}
-}
-
-func getBestReferenceType(ref reference) Reference {
-	if ref.Name() == "" {
-		// Allow digest only references
-		if ref.digest != "" {
-			return digestReference(ref.digest)
-		}
-		return nil
-	}
-	if ref.tag == "" {
-		if ref.digest != "" {
-			return canonicalReference{
-				namedRepository: ref.namedRepository,
-				digest:          ref.digest,
-			}
-		}
-		return ref.namedRepository
-	}
-	if ref.digest == "" {
-		return taggedReference{
-			namedRepository: ref.namedRepository,
-			tag:             ref.tag,
-		}
-	}
-
-	return ref
-}
-
-type reference struct {
-	namedRepository
-	tag    string
-	digest digest.Digest
-}
-
-func (r reference) String() string {
-	return r.Name() + ":" + r.tag + "@" + r.digest.String()
-}
-
-func (r reference) Tag() string {
-	return r.tag
-}
-
-func (r reference) Digest() digest.Digest {
-	return r.digest
-}
-
-type repository struct {
-	domain string
-	path   string
-}
-
-func (r repository) String() string {
-	return r.Name()
-}
-
-func (r repository) Name() string {
-	if r.domain == "" {
-		return r.path
-	}
-	return r.domain + "/" + r.path
-}
-
-func (r repository) Domain() string {
-	return r.domain
-}
-
-func (r repository) Path() string {
-	return r.path
-}
-
-type digestReference digest.Digest
-
-func (d digestReference) String() string {
-	return digest.Digest(d).String()
-}
-
-func (d digestReference) Digest() digest.Digest {
-	return digest.Digest(d)
-}
-
-type taggedReference struct {
-	namedRepository
-	tag string
-}
-
-func (t taggedReference) String() string {
-	return t.Name() + ":" + t.tag
-}
-
-func (t taggedReference) Tag() string {
-	return t.tag
-}
-
-type canonicalReference struct {
-	namedRepository
-	digest digest.Digest
-}
-
-func (c canonicalReference) String() string {
-	return c.Name() + "@" + c.digest.String()
-}
-
-func (c canonicalReference) Digest() digest.Digest {
-	return c.digest
-}
diff --git a/vendor/github.com/docker/distribution/reference/regexp.go b/vendor/github.com/docker/distribution/reference/regexp.go
deleted file mode 100644
index 7860349320..0000000000
--- a/vendor/github.com/docker/distribution/reference/regexp.go
+++ /dev/null
@@ -1,143 +0,0 @@
-package reference
-
-import "regexp"
-
-var (
-	// alphaNumericRegexp defines the alpha numeric atom, typically a
-	// component of names. This only allows lower case characters and digits.
-	alphaNumericRegexp = match(`[a-z0-9]+`)
-
-	// separatorRegexp defines the separators allowed to be embedded in name
-	// components. This allow one period, one or two underscore and multiple
-	// dashes.
-	separatorRegexp = match(`(?:[._]|__|[-]*)`)
-
-	// nameComponentRegexp restricts registry path component names to start
-	// with at least one letter or number, with following parts able to be
-	// separated by one period, one or two underscore and multiple dashes.
-	nameComponentRegexp = expression(
-		alphaNumericRegexp,
-		optional(repeated(separatorRegexp, alphaNumericRegexp)))
-
-	// domainComponentRegexp restricts the registry domain component of a
-	// repository name to start with a component as defined by DomainRegexp
-	// and followed by an optional port.
-	domainComponentRegexp = match(`(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])`)
-
-	// DomainRegexp defines the structure of potential domain components
-	// that may be part of image names. This is purposely a subset of what is
-	// allowed by DNS to ensure backwards compatibility with Docker image
-	// names.
-	DomainRegexp = expression(
-		domainComponentRegexp,
-		optional(repeated(literal(`.`), domainComponentRegexp)),
-		optional(literal(`:`), match(`[0-9]+`)))
-
-	// TagRegexp matches valid tag names. From docker/docker:graph/tags.go.
-	TagRegexp = match(`[\w][\w.-]{0,127}`)
-
-	// anchoredTagRegexp matches valid tag names, anchored at the start and
-	// end of the matched string.
-	anchoredTagRegexp = anchored(TagRegexp)
-
-	// DigestRegexp matches valid digests.
-	DigestRegexp = match(`[A-Za-z][A-Za-z0-9]*(?:[-_+.][A-Za-z][A-Za-z0-9]*)*[:][[:xdigit:]]{32,}`)
-
-	// anchoredDigestRegexp matches valid digests, anchored at the start and
-	// end of the matched string.
-	anchoredDigestRegexp = anchored(DigestRegexp)
-
-	// NameRegexp is the format for the name component of references. The
-	// regexp has capturing groups for the domain and name part omitting
-	// the separating forward slash from either.
-	NameRegexp = expression(
-		optional(DomainRegexp, literal(`/`)),
-		nameComponentRegexp,
-		optional(repeated(literal(`/`), nameComponentRegexp)))
-
-	// anchoredNameRegexp is used to parse a name value, capturing the
-	// domain and trailing components.
-	anchoredNameRegexp = anchored(
-		optional(capture(DomainRegexp), literal(`/`)),
-		capture(nameComponentRegexp,
-			optional(repeated(literal(`/`), nameComponentRegexp))))
-
-	// ReferenceRegexp is the full supported format of a reference. The regexp
-	// is anchored and has capturing groups for name, tag, and digest
-	// components.
-	ReferenceRegexp = anchored(capture(NameRegexp),
-		optional(literal(":"), capture(TagRegexp)),
-		optional(literal("@"), capture(DigestRegexp)))
-
-	// IdentifierRegexp is the format for string identifier used as a
-	// content addressable identifier using sha256. These identifiers
-	// are like digests without the algorithm, since sha256 is used.
-	IdentifierRegexp = match(`([a-f0-9]{64})`)
-
-	// ShortIdentifierRegexp is the format used to represent a prefix
-	// of an identifier. A prefix may be used to match a sha256 identifier
-	// within a list of trusted identifiers.
-	ShortIdentifierRegexp = match(`([a-f0-9]{6,64})`)
-
-	// anchoredIdentifierRegexp is used to check or match an
-	// identifier value, anchored at start and end of string.
-	anchoredIdentifierRegexp = anchored(IdentifierRegexp)
-
-	// anchoredShortIdentifierRegexp is used to check if a value
-	// is a possible identifier prefix, anchored at start and end
-	// of string.
-	anchoredShortIdentifierRegexp = anchored(ShortIdentifierRegexp)
-)
-
-// match compiles the string to a regular expression.
-var match = regexp.MustCompile
-
-// literal compiles s into a literal regular expression, escaping any regexp
-// reserved characters.
-func literal(s string) *regexp.Regexp {
-	re := match(regexp.QuoteMeta(s))
-
-	if _, complete := re.LiteralPrefix(); !complete {
-		panic("must be a literal")
-	}
-
-	return re
-}
-
-// expression defines a full expression, where each regular expression must
-// follow the previous.
-func expression(res ...*regexp.Regexp) *regexp.Regexp {
-	var s string
-	for _, re := range res {
-		s += re.String()
-	}
-
-	return match(s)
-}
-
-// optional wraps the expression in a non-capturing group and makes the
-// production optional.
-func optional(res ...*regexp.Regexp) *regexp.Regexp {
-	return match(group(expression(res...)).String() + `?`)
-}
-
-// repeated wraps the regexp in a non-capturing group to get one or more
-// matches.
-func repeated(res ...*regexp.Regexp) *regexp.Regexp {
-	return match(group(expression(res...)).String() + `+`)
-}
-
-// group wraps the regexp in a non-capturing group.
-func group(res ...*regexp.Regexp) *regexp.Regexp {
-	return match(`(?:` + expression(res...).String() + `)`)
-}
-
-// capture wraps the expression in a capturing group.
-func capture(res ...*regexp.Regexp) *regexp.Regexp {
-	return match(`(` + expression(res...).String() + `)`)
-}
-
-// anchored anchors the regular expression by adding start and end delimiters.
-func anchored(res ...*regexp.Regexp) *regexp.Regexp {
-	return match(`^` + expression(res...).String() + `$`)
-}
diff --git a/vendor/github.com/docker/docker/LICENSE b/vendor/github.com/docker/docker/LICENSE
deleted file mode 100644
index 9c8e20ab85..0000000000
--- a/vendor/github.com/docker/docker/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        https://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2013-2017 Docker, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       https://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/docker/docker/NOTICE b/vendor/github.com/docker/docker/NOTICE
deleted file mode 100644
index 0c74e15b05..0000000000
--- a/vendor/github.com/docker/docker/NOTICE
+++ /dev/null
@@ -1,19 +0,0 @@
-Docker
-Copyright 2012-2017 Docker, Inc.
-
-This product includes software developed at Docker, Inc. (https://www.docker.com).
-
-This product contains software (https://github.com/kr/pty) developed
-by Keith Rarick, licensed under the MIT License.
-
-The following is courtesy of our legal counsel:
-
-
-Use and transfer of Docker may be subject to certain restrictions by the
-United States and other governments.
-It is your responsibility to ensure that your use and/or transfer does not
-violate applicable laws.
-
-For more information, please see https://www.bis.doc.gov
-
-See also https://www.apache.org/dev/crypto.html and/or seek legal counsel.
diff --git a/vendor/github.com/docker/docker/api/README.md b/vendor/github.com/docker/docker/api/README.md
deleted file mode 100644
index 8954ed0174..0000000000
--- a/vendor/github.com/docker/docker/api/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Working on the Engine API
-
-The Engine API is an HTTP API used by the command-line client to communicate with the daemon. It can also be used by third-party software to control the daemon.
-
-It consists of various components in this repository:
-
-- `api/swagger.yaml` A Swagger definition of the API.
-- `api/types/` Types shared by both the client and server, representing various objects, options, responses, etc. Most are written manually, but some are automatically generated from the Swagger definition. See [#27919](https://github.com/docker/docker/issues/27919) for progress on this.
-- `cli/` The command-line client.
-- `client/` The Go client used by the command-line client. It can also be used by third-party Go programs.
-- `daemon/` The daemon, which serves the API.
-
-## Swagger definition
-
-The API is defined by the [Swagger](http://swagger.io/specification/) definition in `api/swagger.yaml`. This definition can be used to:
-
-1. To automatically generate documentation.
-2. To automatically generate the Go server and client. (A work-in-progress.)
-3. Provide a machine readable version of the API for introspecting what it can do, automatically generating clients for other languages, etc.
-
-## Updating the API documentation
-
-The API documentation is generated entirely from `api/swagger.yaml`. If you make updates to the API, you'll need to edit this file to represent the change in the documentation.
-
-The file is split into two main sections:
-
-- `definitions`, which defines re-usable objects used in requests and responses
-- `paths`, which defines the API endpoints (and some inline objects which don't need to be reusable)
-
-To make an edit, first look for the endpoint you want to edit under `paths`, then make the required edits. Endpoints may reference reusable objects with `$ref`, which can be found in the `definitions` section.
-
-There is hopefully enough example material in the file for you to copy a similar pattern from elsewhere in the file (e.g. adding new fields or endpoints), but for the full reference, see the [Swagger specification](https://github.com/docker/docker/issues/27919)
-
-`swagger.yaml` is validated by `hack/validate/swagger` to ensure it is a valid Swagger definition. This is useful for when you are making edits to ensure you are doing the right thing.
-
-## Viewing the API documentation
-
-When you make edits to `swagger.yaml`, you may want to check the generated API documentation to ensure it renders correctly.
-
-Run `make swagger-docs` and a preview will be running at `http://localhost`. Some of the styling may be incorrect, but you'll be able to ensure that it is generating the correct documentation.
-
-The production documentation is generated by vendoring `swagger.yaml` into [docker/docker.github.io](https://github.com/docker/docker.github.io).
diff --git a/vendor/github.com/docker/docker/api/common.go b/vendor/github.com/docker/docker/api/common.go
deleted file mode 100644
index 9df6255c08..0000000000
--- a/vendor/github.com/docker/docker/api/common.go
+++ /dev/null
@@ -1,166 +0,0 @@
-package api
-
-import (
-	"encoding/json"
-	"encoding/pem"
-	"fmt"
-	"mime"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/system"
-	"github.com/docker/libtrust"
-)
-
-// Common constants for daemon and client.
-const (
-	// DefaultVersion of Current REST API
-	DefaultVersion string = "1.30"
-
-	// NoBaseImageSpecifier is the symbol used by the FROM
-	// command to specify that no base image is to be used.
-	NoBaseImageSpecifier string = "scratch"
-)
-
-// byPortInfo is a temporary type used to sort types.Port by its fields
-type byPortInfo []types.Port
-
-func (r byPortInfo) Len() int      { return len(r) }
-func (r byPortInfo) Swap(i, j int) { r[i], r[j] = r[j], r[i] }
-func (r byPortInfo) Less(i, j int) bool {
-	if r[i].PrivatePort != r[j].PrivatePort {
-		return r[i].PrivatePort < r[j].PrivatePort
-	}
-
-	if r[i].IP != r[j].IP {
-		return r[i].IP < r[j].IP
-	}
-
-	if r[i].PublicPort != r[j].PublicPort {
-		return r[i].PublicPort < r[j].PublicPort
-	}
-
-	return r[i].Type < r[j].Type
-}
-
-// DisplayablePorts returns formatted string representing open ports of container
-// e.g. "0.0.0.0:80->9090/tcp, 9988/tcp"
-// it's used by command 'docker ps'
-func DisplayablePorts(ports []types.Port) string {
-	type portGroup struct {
-		first uint16
-		last  uint16
-	}
-	groupMap := make(map[string]*portGroup)
-	var result []string
-	var hostMappings []string
-	var groupMapKeys []string
-	sort.Sort(byPortInfo(ports))
-	for _, port := range ports {
-		current := port.PrivatePort
-		portKey := port.Type
-		if port.IP != "" {
-			if port.PublicPort != current {
-				hostMappings = append(hostMappings, fmt.Sprintf("%s:%d->%d/%s", port.IP, port.PublicPort, port.PrivatePort, port.Type))
-				continue
-			}
-			portKey = fmt.Sprintf("%s/%s", port.IP, port.Type)
-		}
-		group := groupMap[portKey]
-
-		if group == nil {
-			groupMap[portKey] = &portGroup{first: current, last: current}
-			// record order that groupMap keys are created
-			groupMapKeys = append(groupMapKeys, portKey)
-			continue
-		}
-		if current == (group.last + 1) {
-			group.last = current
-			continue
-		}
-
-		result = append(result, formGroup(portKey, group.first, group.last))
-		groupMap[portKey] = &portGroup{first: current, last: current}
-	}
-	for _, portKey := range groupMapKeys {
-		g := groupMap[portKey]
-		result = append(result, formGroup(portKey, g.first, g.last))
-	}
-	result = append(result, hostMappings...)
-	return strings.Join(result, ", ")
-}
-
-func formGroup(key string, start, last uint16) string {
-	parts := strings.Split(key, "/")
-	groupType := parts[0]
-	var ip string
-	if len(parts) > 1 {
-		ip = parts[0]
-		groupType = parts[1]
-	}
-	group := strconv.Itoa(int(start))
-	if start != last {
-		group = fmt.Sprintf("%s-%d", group, last)
-	}
-	if ip != "" {
-		group = fmt.Sprintf("%s:%s->%s", ip, group, group)
-	}
-	return fmt.Sprintf("%s/%s", group, groupType)
-}
-
-// MatchesContentType validates the content type against the expected one
-func MatchesContentType(contentType, expectedType string) bool {
-	mimetype, _, err := mime.ParseMediaType(contentType)
-	if err != nil {
-		logrus.Errorf("Error parsing media type: %s error: %v", contentType, err)
-	}
-	return err == nil && mimetype == expectedType
-}
-
-// LoadOrCreateTrustKey attempts to load the libtrust key at the given path,
-// otherwise generates a new one
-func LoadOrCreateTrustKey(trustKeyPath string) (libtrust.PrivateKey, error) {
-	err := system.MkdirAll(filepath.Dir(trustKeyPath), 0700)
-	if err != nil {
-		return nil, err
-	}
-	trustKey, err := libtrust.LoadKeyFile(trustKeyPath)
-	if err == libtrust.ErrKeyFileDoesNotExist {
-		trustKey, err = libtrust.GenerateECP256PrivateKey()
-		if err != nil {
-			return nil, fmt.Errorf("Error generating key: %s", err)
-		}
-		encodedKey, err := serializePrivateKey(trustKey, filepath.Ext(trustKeyPath))
-		if err != nil {
-			return nil, fmt.Errorf("Error serializing key: %s", err)
-		}
-		if err := ioutils.AtomicWriteFile(trustKeyPath, encodedKey, os.FileMode(0600)); err != nil {
-			return nil, fmt.Errorf("Error saving key file: %s", err)
-		}
-	} else if err != nil {
-		return nil, fmt.Errorf("Error loading key file %s: %s", trustKeyPath, err)
-	}
-	return trustKey, nil
-}
-
-func serializePrivateKey(key libtrust.PrivateKey, ext string) (encoded []byte, err error) {
-	if ext == ".json" || ext == ".jwk" {
-		encoded, err = json.Marshal(key)
-		if err != nil {
-			return nil, fmt.Errorf("unable to encode private key JWK: %s", err)
-		}
-	} else {
-		pemBlock, err := key.PEMBlock()
-		if err != nil {
-			return nil, fmt.Errorf("unable to encode private key PEM: %s", err)
-		}
-		encoded = pem.EncodeToMemory(pemBlock)
-	}
-	return
-}
diff --git a/vendor/github.com/docker/docker/api/common_unix.go b/vendor/github.com/docker/docker/api/common_unix.go
deleted file mode 100644
index 081e61c451..0000000000
--- a/vendor/github.com/docker/docker/api/common_unix.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// +build !windows
-
-package api
-
-// MinVersion represents Minimum REST API version supported
-const MinVersion string = "1.12"
diff --git a/vendor/github.com/docker/docker/api/common_windows.go b/vendor/github.com/docker/docker/api/common_windows.go
deleted file mode 100644
index a6268a4ff7..0000000000
--- a/vendor/github.com/docker/docker/api/common_windows.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package api
-
-// MinVersion represents Minimum REST API version supported
-// Technically the first daemon API version released on Windows is v1.25 in
-// engine version 1.13. However, some clients are explicitly using downlevel
-// APIs (e.g. docker-compose v2.1 file format) and that is just too restrictive.
-// Hence also allowing 1.24 on Windows.
-const MinVersion string = "1.24"
diff --git a/vendor/github.com/docker/docker/api/names.go b/vendor/github.com/docker/docker/api/names.go
deleted file mode 100644
index f147d1f4ce..0000000000
--- a/vendor/github.com/docker/docker/api/names.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package api
-
-import "regexp"
-
-// RestrictedNameChars collects the characters allowed to represent a name, normally used to validate container and volume names.
-const RestrictedNameChars = `[a-zA-Z0-9][a-zA-Z0-9_.-]`
-
-// RestrictedNamePattern is a regular expression to validate names against the collection of restricted characters.
-var RestrictedNamePattern = regexp.MustCompile(`^` + RestrictedNameChars + `+$`)
diff --git a/vendor/github.com/docker/docker/api/swagger-gen.yaml b/vendor/github.com/docker/docker/api/swagger-gen.yaml
deleted file mode 100644
index f07a02737f..0000000000
--- a/vendor/github.com/docker/docker/api/swagger-gen.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-layout:
-  models:
-    - name: definition
-      source: asset:model
-      target: "{{ joinFilePath .Target .ModelPackage }}"
-      file_name: "{{ (snakize (pascalize .Name)) }}.go"
-  operations:
-    - name: handler
-      source: asset:serverOperation
-      target: "{{ joinFilePath .Target .APIPackage .Package }}"
-      file_name: "{{ (snakize (pascalize .Name)) }}.go"
diff --git a/vendor/github.com/docker/docker/api/swagger.yaml b/vendor/github.com/docker/docker/api/swagger.yaml
deleted file mode 100644
index 01f9d5d233..0000000000
--- a/vendor/github.com/docker/docker/api/swagger.yaml
+++ /dev/null
@@ -1,8265 +0,0 @@
-# A Swagger 2.0 (a.k.a. OpenAPI) definition of the Engine API.
-#
-# This is used for generating API documentation and the types used by the
-# client/server. See api/README.md for more information.
-#
-# Some style notes:
-# - This file is used by ReDoc, which allows GitHub Flavored Markdown in
-#   descriptions.
-# - There is no maximum line length, for ease of editing and pretty diffs.
-# - operationIds are in the format "NounVerb", with a singular noun.
-
-swagger: "2.0"
-schemes:
-  - "http"
-  - "https"
-produces:
-  - "application/json"
-  - "text/plain"
-consumes:
-  - "application/json"
-  - "text/plain"
-basePath: "/v1.30"
-info:
-  title: "Docker Engine API"
-  version: "1.30"
-  x-logo:
-    url: "https://docs.docker.com/images/logo-docker-main.png"
-  description: |
-    The Engine API is an HTTP API served by Docker Engine. It is the API the Docker client uses to communicate with the Engine, so everything the Docker client can do can be done with the API.
-
-    Most of the client's commands map directly to API endpoints (e.g. `docker ps` is `GET /containers/json`). The notable exception is running containers, which consists of several API calls.
-
-    # Errors
-
-    The API uses standard HTTP status codes to indicate the success or failure of the API call. The body of the response will be JSON in the following format:
-
-    ```
-    {
-      "message": "page not found"
-    }
-    ```
-
-    # Versioning
-
-    The API is usually changed in each release of Docker, so API calls are versioned to ensure that clients don't break.
-
-    For Docker Engine 17.06, the API version is 1.30. To lock to this version, you prefix the URL with `/v1.30`. For example, calling `/info` is the same as calling `/v1.30/info`.
-
-    Engine releases in the near future should support this version of the API, so your client will continue to work even if it is talking to a newer Engine.
-
-    In previous versions of Docker, it was possible to access the API without providing a version. This behaviour is now deprecated will be removed in a future version of Docker.
-
-    The API uses an open schema model, which means server may add extra properties to responses. Likewise, the server will ignore any extra query parameters and request body properties. When you write clients, you need to ignore additional properties in responses to ensure they do not break when talking to newer Docker daemons.
-
-    This documentation is for version 1.30 of the API, which was introduced with Docker 17.06. Use this table to find documentation for previous versions of the API:
-
-    Docker version  | API version | Changes
-    ----------------|-------------|---------
-    17.05.x | [1.29](https://docs.docker.com/engine/api/v1.29/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-29-api-changes)
-    17.04.x | [1.28](https://docs.docker.com/engine/api/v1.28/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-28-api-changes)
-    17.03.1 | [1.27](https://docs.docker.com/engine/api/v1.27/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-27-api-changes)
-    1.13.1 & 17.03.0 | [1.26](https://docs.docker.com/engine/api/v1.26/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-26-api-changes)
-    1.13.0 | [1.25](https://docs.docker.com/engine/api/v1.25/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-25-api-changes)
-    1.12.x | [1.24](https://docs.docker.com/engine/api/v1.24/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-24-api-changes)
-    1.11.x | [1.23](https://docs.docker.com/engine/api/v1.23/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-23-api-changes)
-    1.10.x | [1.22](https://docs.docker.com/engine/api/v1.22/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-22-api-changes)
-    1.9.x | [1.21](https://docs.docker.com/engine/api/v1.21/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-21-api-changes)
-    1.8.x | [1.20](https://docs.docker.com/engine/api/v1.20/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-20-api-changes)
-    1.7.x | [1.19](https://docs.docker.com/engine/api/v1.19/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-19-api-changes)
-    1.6.x | [1.18](https://docs.docker.com/engine/api/v1.18/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-18-api-changes)
-
-    # Authentication
-
-    Authentication for registries is handled client side. The client has to send authentication details to various endpoints that need to communicate with registries, such as `POST /images/(name)/push`. These are sent as `X-Registry-Auth` header as a Base64 encoded (JSON) string with the following structure:
-
-    ```
-    {
-      "username": "string",
-      "password": "string",
-      "email": "string",
-      "serveraddress": "string"
-    }
-    ```
-
-    The `serveraddress` is a domain/IP without a protocol. Throughout this structure, double quotes are required.
-
-    If you have already got an identity token from the [`/auth` endpoint](#operation/SystemAuth), you can just pass this instead of credentials:
-
-    ```
-    {
-      "identitytoken": "9cbaf023786cd7..."
-    }
-    ```
-
-# The tags on paths define the menu sections in the ReDoc documentation, so
-# the usage of tags must make sense for that:
-# - They should be singular, not plural.
-# - There should not be too many tags, or the menu becomes unwieldy. For
-#   example, it is preferable to add a path to the "System" tag instead of
-#   creating a tag with a single path in it.
-# - The order of tags in this list defines the order in the menu.
-tags:
-  # Primary objects
-  - name: "Container"
-    x-displayName: "Containers"
-    description: |
-      Create and manage containers.
-  - name: "Image"
-    x-displayName: "Images"
-  - name: "Network"
-    x-displayName: "Networks"
-    description: |
-      Networks are user-defined networks that containers can be attached to. See the [networking documentation](https://docs.docker.com/engine/userguide/networking/) for more information.
-  - name: "Volume"
-    x-displayName: "Volumes"
-    description: |
-      Create and manage persistent storage that can be attached to containers.
-  - name: "Exec"
-    x-displayName: "Exec"
-    description: |
-      Run new commands inside running containers. See the [command-line reference](https://docs.docker.com/engine/reference/commandline/exec/) for more information.
-
-      To exec a command in a container, you first need to create an exec instance, then start it. These two API endpoints are wrapped up in a single command-line command, `docker exec`.
-  # Swarm things
-  - name: "Swarm"
-    x-displayName: "Swarm"
-    description: |
-      Engines can be clustered together in a swarm. See [the swarm mode documentation](https://docs.docker.com/engine/swarm/) for more information.
-  - name: "Node"
-    x-displayName: "Nodes"
-    description: |
-      Nodes are instances of the Engine participating in a swarm. Swarm mode must be enabled for these endpoints to work.
-  - name: "Service"
-    x-displayName: "Services"
-    description: |
-      Services are the definitions of tasks to run on a swarm. Swarm mode must be enabled for these endpoints to work.
-  - name: "Task"
-    x-displayName: "Tasks"
-    description: |
-      A task is a container running on a swarm. It is the atomic scheduling unit of swarm. Swarm mode must be enabled for these endpoints to work.
-  - name: "Secret"
-    x-displayName: "Secrets"
-    description: |
-      Secrets are sensitive data that can be used by services. Swarm mode must be enabled for these endpoints to work.
-  # System things
-  - name: "Plugin"
-    x-displayName: "Plugins"
-  - name: "System"
-    x-displayName: "System"
-
-definitions:
-  Port:
-    type: "object"
-    description: "An open port on a container"
-    required: [PrivatePort, Type]
-    properties:
-      IP:
-        type: "string"
-        format: "ip-address"
-      PrivatePort:
-        type: "integer"
-        format: "uint16"
-        x-nullable: false
-        description: "Port on the container"
-      PublicPort:
-        type: "integer"
-        format: "uint16"
-        description: "Port exposed on the host"
-      Type:
-        type: "string"
-        x-nullable: false
-        enum: ["tcp", "udp"]
-    example:
-      PrivatePort: 8080
-      PublicPort: 80
-      Type: "tcp"
-
-  MountPoint:
-    type: "object"
-    description: "A mount point inside a container"
-    properties:
-      Type:
-        type: "string"
-      Name:
-        type: "string"
-      Source:
-        type: "string"
-      Destination:
-        type: "string"
-      Driver:
-        type: "string"
-      Mode:
-        type: "string"
-      RW:
-        type: "boolean"
-      Propagation:
-        type: "string"
-
-  DeviceMapping:
-    type: "object"
-    description: "A device mapping between the host and container"
-    properties:
-      PathOnHost:
-        type: "string"
-      PathInContainer:
-        type: "string"
-      CgroupPermissions:
-        type: "string"
-    example:
-      PathOnHost: "/dev/deviceName"
-      PathInContainer: "/dev/deviceName"
-      CgroupPermissions: "mrw"
-
-  ThrottleDevice:
-    type: "object"
-    properties:
-      Path:
-        description: "Device path"
-        type: "string"
-      Rate:
-        description: "Rate"
-        type: "integer"
-        format: "int64"
-        minimum: 0
-
-  Mount:
-    type: "object"
-    properties:
-      Target:
-        description: "Container path."
-        type: "string"
-      Source:
-        description: "Mount source (e.g. a volume name, a host path)."
-      Type:
-        description: |
-          The mount type. Available types:
-
-          - `bind` Mounts a file or directory from the host into the container. Must exist prior to creating the container.
-          - `volume` Creates a volume with the given name and options (or uses a pre-existing volume with the same name and options). These are **not** removed when the container is removed.
-          - `tmpfs` Create a tmpfs with the given options. The mount source cannot be specified for tmpfs.
-        type: "string"
-        enum:
-          - "bind"
-          - "volume"
-          - "tmpfs"
-      ReadOnly:
-        description: "Whether the mount should be read-only."
-        type: "boolean"
-      Consistency:
-        description: "The consistency requirement for the mount: `default`, `consistent`, `cached`, or `delegated`."
-        type: "string"
-      BindOptions:
-        description: "Optional configuration for the `bind` type."
-        type: "object"
-        properties:
-          Propagation:
-            description: "A propagation mode with the value `[r]private`, `[r]shared`, or `[r]slave`."
-            enum:
-              - "private"
-              - "rprivate"
-              - "shared"
-              - "rshared"
-              - "slave"
-              - "rslave"
-      VolumeOptions:
-        description: "Optional configuration for the `volume` type."
-        type: "object"
-        properties:
-          NoCopy:
-            description: "Populate volume with data from the target."
-            type: "boolean"
-            default: false
-          Labels:
-            description: "User-defined key/value metadata."
-            type: "object"
-            additionalProperties:
-              type: "string"
-          DriverConfig:
-            description: "Map of driver specific options"
-            type: "object"
-            properties:
-              Name:
-                description: "Name of the driver to use to create the volume."
-                type: "string"
-              Options:
-                description: "key/value map of driver specific options."
-                type: "object"
-                additionalProperties:
-                  type: "string"
-      TmpfsOptions:
-        description: "Optional configuration for the `tmpfs` type."
-        type: "object"
-        properties:
-          SizeBytes:
-            description: "The size for the tmpfs mount in bytes."
-            type: "integer"
-            format: "int64"
-          Mode:
-            description: "The permission mode for the tmpfs mount in an integer."
-            type: "integer"
-  RestartPolicy:
-    description: |
-      The behavior to apply when the container exits. The default is not to restart.
-
-      An ever increasing delay (double the previous delay, starting at 100ms) is added before each restart to prevent flooding the server.
-    type: "object"
-    properties:
-      Name:
-        type: "string"
-        description: |
-          - `always` Always restart
-          - `unless-stopped` Restart always except when the user has manually stopped the container
-          - `on-failure` Restart only when the container exit code is non-zero
-        enum:
-          - "always"
-          - "unless-stopped"
-          - "on-failure"
-      MaximumRetryCount:
-        type: "integer"
-        description: "If `on-failure` is used, the number of times to retry before giving up"
-    default: {}
-
-  Resources:
-    description: "A container's resources (cgroups config, ulimits, etc)"
-    type: "object"
-    properties:
-      # Applicable to all platforms
-      CpuShares:
-        description: "An integer value representing this container's relative CPU weight versus other containers."
-        type: "integer"
-      Memory:
-        description: "Memory limit in bytes."
-        type: "integer"
-        default: 0
-      # Applicable to UNIX platforms
-      CgroupParent:
-        description: "Path to `cgroups` under which the container's `cgroup` is created. If the path is not absolute, the path is considered to be relative to the `cgroups` path of the init process. Cgroups are created if they do not already exist."
-        type: "string"
-      BlkioWeight:
-        description: "Block IO weight (relative weight)."
-        type: "integer"
-        minimum: 0
-        maximum: 1000
-      BlkioWeightDevice:
-        description: |
-          Block IO weight (relative device weight) in the form `[{"Path": "device_path", "Weight": weight}]`.
-        type: "array"
-        items:
-          type: "object"
-          properties:
-            Path:
-              type: "string"
-            Weight:
-              type: "integer"
-              minimum: 0
-      BlkioDeviceReadBps:
-        description: |
-          Limit read rate (bytes per second) from a device, in the form `[{"Path": "device_path", "Rate": rate}]`.
-        type: "array"
-        items:
-          $ref: "#/definitions/ThrottleDevice"
-      BlkioDeviceWriteBps:
-        description: |
-          Limit write rate (bytes per second) to a device, in the form `[{"Path": "device_path", "Rate": rate}]`.
-        type: "array"
-        items:
-          $ref: "#/definitions/ThrottleDevice"
-      BlkioDeviceReadIOps:
-        description: |
-          Limit read rate (IO per second) from a device, in the form `[{"Path": "device_path", "Rate": rate}]`.
-        type: "array"
-        items:
-          $ref: "#/definitions/ThrottleDevice"
-      BlkioDeviceWriteIOps:
-        description: |
-          Limit write rate (IO per second) to a device, in the form `[{"Path": "device_path", "Rate": rate}]`.
-        type: "array"
-        items:
-          $ref: "#/definitions/ThrottleDevice"
-      CpuPeriod:
-        description: "The length of a CPU period in microseconds."
-        type: "integer"
-        format: "int64"
-      CpuQuota:
-        description: "Microseconds of CPU time that the container can get in a CPU period."
-        type: "integer"
-        format: "int64"
-      CpuRealtimePeriod:
-        description: "The length of a CPU real-time period in microseconds. Set to 0 to allocate no time allocated to real-time tasks."
-        type: "integer"
-        format: "int64"
-      CpuRealtimeRuntime:
-        description: "The length of a CPU real-time runtime in microseconds. Set to 0 to allocate no time allocated to real-time tasks."
-        type: "integer"
-        format: "int64"
-      CpusetCpus:
-        description: "CPUs in which to allow execution (e.g., `0-3`, `0,1`)"
-        type: "string"
-      CpusetMems:
-        description: "Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems."
-        type: "string"
-      Devices:
-        description: "A list of devices to add to the container."
-        type: "array"
-        items:
-          $ref: "#/definitions/DeviceMapping"
-      DeviceCgroupRules:
-        description: "a list of cgroup rules to apply to the container"
-        type: "array"
-        items:
-          type: "string"
-          example: "c 13:* rwm"
-      DiskQuota:
-        description: "Disk limit (in bytes)."
-        type: "integer"
-        format: "int64"
-      KernelMemory:
-        description: "Kernel memory limit in bytes."
-        type: "integer"
-        format: "int64"
-      MemoryReservation:
-        description: "Memory soft limit in bytes."
-        type: "integer"
-        format: "int64"
-      MemorySwap:
-        description: "Total memory limit (memory + swap). Set as `-1` to enable unlimited swap."
-        type: "integer"
-        format: "int64"
-      MemorySwappiness:
-        description: "Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100."
-        type: "integer"
-        format: "int64"
-        minimum: 0
-        maximum: 100
-      NanoCPUs:
-        description: "CPU quota in units of 10<sup>-9</sup> CPUs."
-        type: "integer"
-        format: "int64"
-      OomKillDisable:
-        description: "Disable OOM Killer for the container."
-        type: "boolean"
-      PidsLimit:
-        description: "Tune a container's pids limit. Set -1 for unlimited."
-        type: "integer"
-        format: "int64"
-      Ulimits:
-        description: |
-          A list of resource limits to set in the container. For example: `{"Name": "nofile", "Soft": 1024, "Hard": 2048}`"
-        type: "array"
-        items:
-          type: "object"
-          properties:
-            Name:
-              description: "Name of ulimit"
-              type: "string"
-            Soft:
-              description: "Soft limit"
-              type: "integer"
-            Hard:
-              description: "Hard limit"
-              type: "integer"
-      # Applicable to Windows
-      CpuCount:
-        description: |
-          The number of usable CPUs (Windows only).
-
-          On Windows Server containers, the processor resource controls are mutually exclusive. The order of precedence is `CPUCount` first, then `CPUShares`, and `CPUPercent` last.
-        type: "integer"
-        format: "int64"
-      CpuPercent:
-        description: |
-          The usable percentage of the available CPUs (Windows only).
-
-          On Windows Server containers, the processor resource controls are mutually exclusive. The order of precedence is `CPUCount` first, then `CPUShares`, and `CPUPercent` last.
-        type: "integer"
-        format: "int64"
-      IOMaximumIOps:
-        description: "Maximum IOps for the container system drive (Windows only)"
-        type: "integer"
-        format: "int64"
-      IOMaximumBandwidth:
-        description: "Maximum IO in bytes per second for the container system drive (Windows only)"
-        type: "integer"
-        format: "int64"
-
-  HealthConfig:
-    description: "A test to perform to check that the container is healthy."
-    type: "object"
-    properties:
-      Test:
-        description: |
-          The test to perform. Possible values are:
-
-          - `[]` inherit healthcheck from image or parent image
-          - `["NONE"]` disable healthcheck
-          - `["CMD", args...]` exec arguments directly
-          - `["CMD-SHELL", command]` run command with system's default shell
-        type: "array"
-        items:
-          type: "string"
-      Interval:
-        description: "The time to wait between checks in nanoseconds. It should be 0 or not less than 1000000000(1s). 0 means inherit."
-        type: "integer"
-      Timeout:
-        description: "The time to wait before considering the check to have hung. It should be 0 or not less than 1000000000(1s). 0 means inherit."
-        type: "integer"
-      Retries:
-        description: "The number of consecutive failures needed to consider a container as unhealthy. 0 means inherit."
-        type: "integer"
-      StartPeriod:
-        description: "Start period for the container to initialize before starting health-retries countdown in nanoseconds. 0 means inherit."
-        type: "integer"
-
-  HostConfig:
-    description: "Container configuration that depends on the host we are running on"
-    allOf:
-      - $ref: "#/definitions/Resources"
-      - type: "object"
-        properties:
-          # Applicable to all platforms
-          Binds:
-            type: "array"
-            description: |
-              A list of volume bindings for this container. Each volume binding is a string in one of these forms:
-
-              - `host-src:container-dest` to bind-mount a host path into the container. Both `host-src`, and `container-dest` must be an _absolute_ path.
-              - `host-src:container-dest:ro` to make the bind-mount read-only inside the container. Both `host-src`, and `container-dest` must be an _absolute_ path.
-              - `volume-name:container-dest` to bind-mount a volume managed by a volume driver into the container. `container-dest` must be an _absolute_ path.
-              - `volume-name:container-dest:ro` to mount the volume read-only inside the container.  `container-dest` must be an _absolute_ path.
-            items:
-              type: "string"
-          ContainerIDFile:
-            type: "string"
-            description: "Path to a file where the container ID is written"
-          LogConfig:
-            type: "object"
-            description: "The logging configuration for this container"
-            properties:
-              Type:
-                type: "string"
-                enum:
-                  - "json-file"
-                  - "syslog"
-                  - "journald"
-                  - "gelf"
-                  - "fluentd"
-                  - "awslogs"
-                  - "splunk"
-                  - "etwlogs"
-                  - "none"
-              Config:
-                type: "object"
-                additionalProperties:
-                  type: "string"
-          NetworkMode:
-            type: "string"
-            description: "Network mode to use for this container. Supported standard values are: `bridge`, `host`, `none`, and `container:<name|id>`. Any other value is taken
-              as a custom network's name to which this container should connect to."
-          PortBindings:
-            type: "object"
-            description: "A map of exposed container ports and the host port they should map to."
-            additionalProperties:
-              type: "object"
-              properties:
-                HostIp:
-                  type: "string"
-                  description: "The host IP address"
-                HostPort:
-                  type: "string"
-                  description: "The host port number, as a string"
-          RestartPolicy:
-            $ref: "#/definitions/RestartPolicy"
-          AutoRemove:
-            type: "boolean"
-            description: "Automatically remove the container when the container's process exits. This has no effect if `RestartPolicy` is set."
-          VolumeDriver:
-            type: "string"
-            description: "Driver that this container uses to mount volumes."
-          VolumesFrom:
-            type: "array"
-            description: "A list of volumes to inherit from another container, specified in the form `<container name>[:<ro|rw>]`."
-            items:
-              type: "string"
-          Mounts:
-            description: "Specification for mounts to be added to the container."
-            type: "array"
-            items:
-              $ref: "#/definitions/Mount"
-
-          # Applicable to UNIX platforms
-          CapAdd:
-            type: "array"
-            description: "A list of kernel capabilities to add to the container."
-            items:
-              type: "string"
-          CapDrop:
-            type: "array"
-            description: "A list of kernel capabilities to drop from the container."
-            items:
-              type: "string"
-          Dns:
-            type: "array"
-            description: "A list of DNS servers for the container to use."
-            items:
-              type: "string"
-          DnsOptions:
-            type: "array"
-            description: "A list of DNS options."
-            items:
-              type: "string"
-          DnsSearch:
-            type: "array"
-            description: "A list of DNS search domains."
-            items:
-              type: "string"
-          ExtraHosts:
-            type: "array"
-            description: |
-              A list of hostnames/IP mappings to add to the container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`.
-            items:
-              type: "string"
-          GroupAdd:
-            type: "array"
-            description: "A list of additional groups that the container process will run as."
-            items:
-              type: "string"
-          IpcMode:
-            type: "string"
-            description: "IPC namespace to use for the container."
-          Cgroup:
-            type: "string"
-            description: "Cgroup to use for the container."
-          Links:
-            type: "array"
-            description: "A list of links for the container in the form `container_name:alias`."
-            items:
-              type: "string"
-          OomScoreAdj:
-            type: "integer"
-            description: "An integer value containing the score given to the container in order to tune OOM killer preferences."
-          PidMode:
-            type: "string"
-            description: |
-              Set the PID (Process) Namespace mode for the container. It can be either:
-
-              - `"container:<name|id>"`: joins another container's PID namespace
-              - `"host"`: use the host's PID namespace inside the container
-          Privileged:
-            type: "boolean"
-            description: "Gives the container full access to the host."
-          PublishAllPorts:
-            type: "boolean"
-            description: "Allocates a random host port for all of a container's exposed ports."
-          ReadonlyRootfs:
-            type: "boolean"
-            description: "Mount the container's root filesystem as read only."
-          SecurityOpt:
-            type: "array"
-            description: "A list of string values to customize labels for MLS
-            systems, such as SELinux."
-            items:
-              type: "string"
-          StorageOpt:
-            type: "object"
-            description: |
-              Storage driver options for this container, in the form `{"size": "120G"}`.
-            additionalProperties:
-              type: "string"
-          Tmpfs:
-            type: "object"
-            description: |
-              A map of container directories which should be replaced by tmpfs mounts, and their corresponding mount options. For example: `{ "/run": "rw,noexec,nosuid,size=65536k" }`.
-            additionalProperties:
-              type: "string"
-          UTSMode:
-            type: "string"
-            description: "UTS namespace to use for the container."
-          UsernsMode:
-            type: "string"
-            description: "Sets the usernamespace mode for the container when usernamespace remapping option is enabled."
-          ShmSize:
-            type: "integer"
-            description: "Size of `/dev/shm` in bytes. If omitted, the system uses 64MB."
-            minimum: 0
-          Sysctls:
-            type: "object"
-            description: |
-              A list of kernel parameters (sysctls) to set in the container. For example: `{"net.ipv4.ip_forward": "1"}`
-            additionalProperties:
-              type: "string"
-          Runtime:
-            type: "string"
-            description: "Runtime to use with this container."
-          # Applicable to Windows
-          ConsoleSize:
-            type: "array"
-            description: "Initial console size, as an `[height, width]` array. (Windows only)"
-            minItems: 2
-            maxItems: 2
-            items:
-              type: "integer"
-              minimum: 0
-          Isolation:
-            type: "string"
-            description: "Isolation technology of the container. (Windows only)"
-            enum:
-              - "default"
-              - "process"
-              - "hyperv"
-
-  Config:
-    description: "Configuration for a container that is portable between hosts"
-    type: "object"
-    properties:
-      Hostname:
-        description: "The hostname to use for the container, as a valid RFC 1123 hostname."
-        type: "string"
-      Domainname:
-        description: "The domain name to use for the container."
-        type: "string"
-      User:
-        description: "The user that commands are run as inside the container."
-        type: "string"
-      AttachStdin:
-        description: "Whether to attach to `stdin`."
-        type: "boolean"
-        default: false
-      AttachStdout:
-        description: "Whether to attach to `stdout`."
-        type: "boolean"
-        default: true
-      AttachStderr:
-        description: "Whether to attach to `stderr`."
-        type: "boolean"
-        default: true
-      ExposedPorts:
-        description: |
-          An object mapping ports to an empty object in the form:
-
-          `{"<port>/<tcp|udp>": {}}`
-        type: "object"
-        additionalProperties:
-          type: "object"
-          enum:
-            - {}
-          default: {}
-      Tty:
-        description: "Attach standard streams to a TTY, including `stdin` if it is not closed."
-        type: "boolean"
-        default: false
-      OpenStdin:
-        description: "Open `stdin`"
-        type: "boolean"
-        default: false
-      StdinOnce:
-        description: "Close `stdin` after one attached client disconnects"
-        type: "boolean"
-        default: false
-      Env:
-        description: |
-          A list of environment variables to set inside the container in the form `["VAR=value", ...]`. A variable without `=` is removed from the environment, rather than to have an empty value.
-        type: "array"
-        items:
-          type: "string"
-      Cmd:
-        description: "Command to run specified as a string or an array of strings."
-        type:
-          - "array"
-          - "string"
-        items:
-          type: "string"
-      Healthcheck:
-        $ref: "#/definitions/HealthConfig"
-      ArgsEscaped:
-        description: "Command is already escaped (Windows only)"
-        type: "boolean"
-      Image:
-        description: "The name of the image to use when creating the container"
-        type: "string"
-      Volumes:
-        description: "An object mapping mount point paths inside the container to empty objects."
-        type: "object"
-        properties:
-          additionalProperties:
-            type: "object"
-            enum:
-              - {}
-            default: {}
-      WorkingDir:
-        description: "The working directory for commands to run in."
-        type: "string"
-      Entrypoint:
-        description: |
-          The entry point for the container as a string or an array of strings.
-
-          If the array consists of exactly one empty string (`[""]`) then the entry point is reset to system default (i.e., the entry point used by docker when there is no `ENTRYPOINT` instruction in the `Dockerfile`).
-        type:
-          - "array"
-          - "string"
-        items:
-          type: "string"
-      NetworkDisabled:
-        description: "Disable networking for the container."
-        type: "boolean"
-      MacAddress:
-        description: "MAC address of the container."
-        type: "string"
-      OnBuild:
-        description: "`ONBUILD` metadata that were defined in the image's `Dockerfile`."
-        type: "array"
-        items:
-          type: "string"
-      Labels:
-        description: "User-defined key/value metadata."
-        type: "object"
-        additionalProperties:
-          type: "string"
-      StopSignal:
-        description: "Signal to stop a container as a string or unsigned integer."
-        type: "string"
-        default: "SIGTERM"
-      StopTimeout:
-        description: "Timeout to stop a container in seconds."
-        type: "integer"
-        default: 10
-      Shell:
-        description: "Shell for when `RUN`, `CMD`, and `ENTRYPOINT` uses a shell."
-        type: "array"
-        items:
-          type: "string"
-
-  NetworkConfig:
-    description: "TODO: check is correct"
-    type: "object"
-    properties:
-      Bridge:
-        type: "string"
-      Gateway:
-        type: "string"
-      Address:
-        type: "string"
-      IPPrefixLen:
-        type: "integer"
-      MacAddress:
-        type: "string"
-      PortMapping:
-        type: "string"
-      Ports:
-        type: "array"
-        items:
-          $ref: "#/definitions/Port"
-
-  GraphDriverData:
-    description: "Information about a container's graph driver."
-    type: "object"
-    required: [Name, Data]
-    properties:
-      Name:
-        type: "string"
-        x-nullable: false
-      Data:
-        type: "object"
-        x-nullable: false
-        additionalProperties:
-          type: "string"
-
-  Image:
-    type: "object"
-    required:
-      - Id
-      - Parent
-      - Comment
-      - Created
-      - Container
-      - DockerVersion
-      - Author
-      - Architecture
-      - Os
-      - Size
-      - VirtualSize
-      - GraphDriver
-      - RootFS
-    properties:
-      Id:
-        type: "string"
-        x-nullable: false
-      RepoTags:
-        type: "array"
-        items:
-          type: "string"
-      RepoDigests:
-        type: "array"
-        items:
-          type: "string"
-      Parent:
-        type: "string"
-        x-nullable: false
-      Comment:
-        type: "string"
-        x-nullable: false
-      Created:
-        type: "string"
-        x-nullable: false
-      Container:
-        type: "string"
-        x-nullable: false
-      ContainerConfig:
-        $ref: "#/definitions/Config"
-      DockerVersion:
-        type: "string"
-        x-nullable: false
-      Author:
-        type: "string"
-        x-nullable: false
-      Config:
-        $ref: "#/definitions/Config"
-      Architecture:
-        type: "string"
-        x-nullable: false
-      Os:
-        type: "string"
-        x-nullable: false
-      OsVersion:
-        type: "string"
-      Size:
-        type: "integer"
-        format: "int64"
-        x-nullable: false
-      VirtualSize:
-        type: "integer"
-        format: "int64"
-        x-nullable: false
-      GraphDriver:
-        $ref: "#/definitions/GraphDriverData"
-      RootFS:
-        type: "object"
-        required: [Type]
-        properties:
-          Type:
-            type: "string"
-            x-nullable: false
-          Layers:
-            type: "array"
-            items:
-              type: "string"
-          BaseLayer:
-            type: "string"
-
-  ImageSummary:
-    type: "object"
-    required:
-      - Id
-      - ParentId
-      - RepoTags
-      - RepoDigests
-      - Created
-      - Size
-      - SharedSize
-      - VirtualSize
-      - Labels
-      - Containers
-    properties:
-      Id:
-        type: "string"
-        x-nullable: false
-      ParentId:
-        type: "string"
-        x-nullable: false
-      RepoTags:
-        type: "array"
-        x-nullable: false
-        items:
-          type: "string"
-      RepoDigests:
-        type: "array"
-        x-nullable: false
-        items:
-          type: "string"
-      Created:
-        type: "integer"
-        x-nullable: false
-      Size:
-        type: "integer"
-        x-nullable: false
-      SharedSize:
-        type: "integer"
-        x-nullable: false
-      VirtualSize:
-        type: "integer"
-        x-nullable: false
-      Labels:
-        type: "object"
-        x-nullable: false
-        additionalProperties:
-          type: "string"
-      Containers:
-        x-nullable: false
-        type: "integer"
-
-  AuthConfig:
-    type: "object"
-    properties:
-      username:
-        type: "string"
-      password:
-        type: "string"
-      email:
-        type: "string"
-      serveraddress:
-        type: "string"
-    example:
-      username: "hannibal"
-      password: "xxxx"
-      serveraddress: "https://index.docker.io/v1/"
-
-  ProcessConfig:
-    type: "object"
-    properties:
-      privileged:
-        type: "boolean"
-      user:
-        type: "string"
-      tty:
-        type: "boolean"
-      entrypoint:
-        type: "string"
-      arguments:
-        type: "array"
-        items:
-          type: "string"
-
-  Volume:
-    type: "object"
-    required: [Name, Driver, Mountpoint, Labels, Scope, Options]
-    properties:
-      Name:
-        type: "string"
-        description: "Name of the volume."
-        x-nullable: false
-      Driver:
-        type: "string"
-        description: "Name of the volume driver used by the volume."
-        x-nullable: false
-      Mountpoint:
-        type: "string"
-        description: "Mount path of the volume on the host."
-        x-nullable: false
-      Status:
-        type: "object"
-        description: |
-          Low-level details about the volume, provided by the volume driver.
-          Details are returned as a map with key/value pairs:
-          `{"key":"value","key2":"value2"}`.
-
-          The `Status` field is optional, and is omitted if the volume driver
-          does not support this feature.
-        additionalProperties:
-          type: "object"
-      Labels:
-        type: "object"
-        description: "User-defined key/value metadata."
-        x-nullable: false
-        additionalProperties:
-          type: "string"
-      Scope:
-        type: "string"
-        description: "The level at which the volume exists. Either `global` for cluster-wide, or `local` for machine level."
-        default: "local"
-        x-nullable: false
-        enum: ["local", "global"]
-      Options:
-        type: "object"
-        description: "The driver specific options used when creating the volume."
-        additionalProperties:
-          type: "string"
-      UsageData:
-        type: "object"
-        required: [Size, RefCount]
-        properties:
-          Size:
-            type: "integer"
-            description: "The disk space used by the volume (local driver only)"
-            default: -1
-            x-nullable: false
-          RefCount:
-            type: "integer"
-            default: -1
-            description: "The number of containers referencing this volume."
-            x-nullable: false
-
-    example:
-      Name: "tardis"
-      Driver: "custom"
-      Mountpoint: "/var/lib/docker/volumes/tardis"
-      Status:
-        hello: "world"
-      Labels:
-        com.example.some-label: "some-value"
-        com.example.some-other-label: "some-other-value"
-      Scope: "local"
-
-  Network:
-    type: "object"
-    properties:
-      Name:
-        type: "string"
-      Id:
-        type: "string"
-      Created:
-        type: "string"
-        format: "dateTime"
-      Scope:
-        type: "string"
-      Driver:
-        type: "string"
-      EnableIPv6:
-        type: "boolean"
-      IPAM:
-        $ref: "#/definitions/IPAM"
-      Internal:
-        type: "boolean"
-      Attachable:
-        type: "boolean"
-      Ingress:
-        type: "boolean"
-      Containers:
-        type: "object"
-        additionalProperties:
-          $ref: "#/definitions/NetworkContainer"
-      Options:
-        type: "object"
-        additionalProperties:
-          type: "string"
-      Labels:
-        type: "object"
-        additionalProperties:
-          type: "string"
-    example:
-      Name: "net01"
-      Id: "7d86d31b1478e7cca9ebed7e73aa0fdeec46c5ca29497431d3007d2d9e15ed99"
-      Created: "2016-10-19T04:33:30.360899459Z"
-      Scope: "local"
-      Driver: "bridge"
-      EnableIPv6: false
-      IPAM:
-        Driver: "default"
-        Config:
-          - Subnet: "172.19.0.0/16"
-            Gateway: "172.19.0.1"
-        Options:
-          foo: "bar"
-      Internal: false
-      Attachable: false
-      Ingress: false
-      Containers:
-        19a4d5d687db25203351ed79d478946f861258f018fe384f229f2efa4b23513c:
-          Name: "test"
-          EndpointID: "628cadb8bcb92de107b2a1e516cbffe463e321f548feb37697cce00ad694f21a"
-          MacAddress: "02:42:ac:13:00:02"
-          IPv4Address: "172.19.0.2/16"
-          IPv6Address: ""
-      Options:
-        com.docker.network.bridge.default_bridge: "true"
-        com.docker.network.bridge.enable_icc: "true"
-        com.docker.network.bridge.enable_ip_masquerade: "true"
-        com.docker.network.bridge.host_binding_ipv4: "0.0.0.0"
-        com.docker.network.bridge.name: "docker0"
-        com.docker.network.driver.mtu: "1500"
-      Labels:
-        com.example.some-label: "some-value"
-        com.example.some-other-label: "some-other-value"
-  IPAM:
-    type: "object"
-    properties:
-      Driver:
-        description: "Name of the IPAM driver to use."
-        type: "string"
-        default: "default"
-      Config:
-        description: "List of IPAM configuration options, specified as a map: `{\"Subnet\": <CIDR>, \"IPRange\": <CIDR>, \"Gateway\": <IP address>, \"AuxAddress\": <device_name:IP address>}`"
-        type: "array"
-        items:
-          type: "object"
-          additionalProperties:
-            type: "string"
-      Options:
-        description: "Driver-specific options, specified as a map."
-        type: "array"
-        items:
-          type: "object"
-          additionalProperties:
-            type: "string"
-  NetworkContainer:
-    type: "object"
-    properties:
-      EndpointID:
-        type: "string"
-      MacAddress:
-        type: "string"
-      IPv4Address:
-        type: "string"
-      IPv6Address:
-        type: "string"
-
-  BuildInfo:
-    type: "object"
-    properties:
-      id:
-        type: "string"
-      stream:
-        type: "string"
-      error:
-        type: "string"
-      errorDetail:
-        $ref: "#/definitions/ErrorDetail"
-      status:
-        type: "string"
-      progress:
-        type: "string"
-      progressDetail:
-        $ref: "#/definitions/ProgressDetail"
-
-  CreateImageInfo:
-    type: "object"
-    properties:
-      error:
-        type: "string"
-      status:
-        type: "string"
-      progress:
-        type: "string"
-      progressDetail:
-        $ref: "#/definitions/ProgressDetail"
-
-  PushImageInfo:
-    type: "object"
-    properties:
-      error:
-        type: "string"
-      status:
-        type: "string"
-      progress:
-        type: "string"
-      progressDetail:
-        $ref: "#/definitions/ProgressDetail"
-  ErrorDetail:
-    type: "object"
-    properties:
-      code:
-        type: "integer"
-      message:
-        type: "string"
-  ProgressDetail:
-    type: "object"
-    properties:
-      code:
-        type: "integer"
-      message:
-        type: "integer"
-
-  ErrorResponse:
-    description: "Represents an error."
-    type: "object"
-    required: ["message"]
-    properties:
-      message:
-        description: "The error message."
-        type: "string"
-        x-nullable: false
-    example:
-      message: "Something went wrong."
-
-  IdResponse:
-    description: "Response to an API call that returns just an Id"
-    type: "object"
-    required: ["Id"]
-    properties:
-      Id:
-        description: "The id of the newly created object."
-        type: "string"
-        x-nullable: false
-
-  EndpointSettings:
-    description: "Configuration for a network endpoint."
-    type: "object"
-    properties:
-      IPAMConfig:
-        description: "IPAM configurations for the endpoint"
-        type: "object"
-        properties:
-          IPv4Address:
-            type: "string"
-          IPv6Address:
-            type: "string"
-          LinkLocalIPs:
-            type: "array"
-            items:
-              type: "string"
-      Links:
-        type: "array"
-        items:
-          type: "string"
-      Aliases:
-        type: "array"
-        items:
-          type: "string"
-      NetworkID:
-        type: "string"
-      EndpointID:
-        type: "string"
-      Gateway:
-        type: "string"
-      IPAddress:
-        type: "string"
-      IPPrefixLen:
-        type: "integer"
-      IPv6Gateway:
-        type: "string"
-      GlobalIPv6Address:
-        type: "string"
-      GlobalIPv6PrefixLen:
-        type: "integer"
-        format: "int64"
-      MacAddress:
-        type: "string"
-
-  PluginMount:
-    type: "object"
-    x-nullable: false
-    required: [Name, Description, Settable, Source, Destination, Type, Options]
-    properties:
-      Name:
-        type: "string"
-        x-nullable: false
-      Description:
-        type: "string"
-        x-nullable: false
-      Settable:
-        type: "array"
-        items:
-          type: "string"
-      Source:
-        type: "string"
-      Destination:
-        type: "string"
-        x-nullable: false
-      Type:
-        type: "string"
-        x-nullable: false
-      Options:
-        type: "array"
-        items:
-          type: "string"
-
-  PluginDevice:
-    type: "object"
-    required: [Name, Description, Settable, Path]
-    x-nullable: false
-    properties:
-      Name:
-        type: "string"
-        x-nullable: false
-      Description:
-        type: "string"
-        x-nullable: false
-      Settable:
-        type: "array"
-        items:
-          type: "string"
-      Path:
-        type: "string"
-
-  PluginEnv:
-    type: "object"
-    x-nullable: false
-    required: [Name, Description, Settable, Value]
-    properties:
-      Name:
-        x-nullable: false
-        type: "string"
-      Description:
-        x-nullable: false
-        type: "string"
-      Settable:
-        type: "array"
-        items:
-          type: "string"
-      Value:
-        type: "string"
-
-  PluginInterfaceType:
-    type: "object"
-    x-nullable: false
-    required: [Prefix, Capability, Version]
-    properties:
-      Prefix:
-        type: "string"
-        x-nullable: false
-      Capability:
-        type: "string"
-        x-nullable: false
-      Version:
-        type: "string"
-        x-nullable: false
-
-  Plugin:
-    description: "A plugin for the Engine API"
-    type: "object"
-    required: [Settings, Enabled, Config, Name]
-    properties:
-      Id:
-        type: "string"
-      Name:
-        type: "string"
-        x-nullable: false
-      Enabled:
-        description: "True when the plugin is running. False when the plugin is not running, only installed."
-        type: "boolean"
-        x-nullable: false
-      Settings:
-        description: "Settings that can be modified by users."
-        type: "object"
-        x-nullable: false
-        required: [Args, Devices, Env, Mounts]
-        properties:
-          Mounts:
-            type: "array"
-            items:
-              $ref: "#/definitions/PluginMount"
-          Env:
-            type: "array"
-            items:
-              type: "string"
-          Args:
-            type: "array"
-            items:
-              type: "string"
-          Devices:
-            type: "array"
-            items:
-              $ref: "#/definitions/PluginDevice"
-      PluginReference:
-        description: "plugin remote reference used to push/pull the plugin"
-        type: "string"
-        x-nullable: false
-      Config:
-        description: "The config of a plugin."
-        type: "object"
-        x-nullable: false
-        required:
-          - Description
-          - Documentation
-          - Interface
-          - Entrypoint
-          - WorkDir
-          - Network
-          - Linux
-          - PidHost
-          - PropagatedMount
-          - IpcHost
-          - Mounts
-          - Env
-          - Args
-        properties:
-          DockerVersion:
-            description: "Docker Version used to create the plugin"
-            type: "string"
-            x-nullable: false
-          Description:
-            type: "string"
-            x-nullable: false
-          Documentation:
-            type: "string"
-            x-nullable: false
-          Interface:
-            description: "The interface between Docker and the plugin"
-            x-nullable: false
-            type: "object"
-            required: [Types, Socket]
-            properties:
-              Types:
-                type: "array"
-                items:
-                  $ref: "#/definitions/PluginInterfaceType"
-              Socket:
-                type: "string"
-                x-nullable: false
-          Entrypoint:
-            type: "array"
-            items:
-              type: "string"
-          WorkDir:
-            type: "string"
-            x-nullable: false
-          User:
-            type: "object"
-            x-nullable: false
-            properties:
-              UID:
-                type: "integer"
-                format: "uint32"
-              GID:
-                type: "integer"
-                format: "uint32"
-          Network:
-            type: "object"
-            x-nullable: false
-            required: [Type]
-            properties:
-              Type:
-                x-nullable: false
-                type: "string"
-          Linux:
-            type: "object"
-            x-nullable: false
-            required: [Capabilities, AllowAllDevices, Devices]
-            properties:
-              Capabilities:
-                type: "array"
-                items:
-                  type: "string"
-              AllowAllDevices:
-                type: "boolean"
-                x-nullable: false
-              Devices:
-                type: "array"
-                items:
-                  $ref: "#/definitions/PluginDevice"
-          PropagatedMount:
-            type: "string"
-            x-nullable: false
-          IpcHost:
-            type: "boolean"
-            x-nullable: false
-          PidHost:
-            type: "boolean"
-            x-nullable: false
-          Mounts:
-            type: "array"
-            items:
-              $ref: "#/definitions/PluginMount"
-          Env:
-            type: "array"
-            items:
-              $ref: "#/definitions/PluginEnv"
-          Args:
-            type: "object"
-            x-nullable: false
-            required: [Name, Description, Settable, Value]
-            properties:
-              Name:
-                x-nullable: false
-                type: "string"
-              Description:
-                x-nullable: false
-                type: "string"
-              Settable:
-                type: "array"
-                items:
-                  type: "string"
-              Value:
-                type: "array"
-                items:
-                  type: "string"
-          rootfs:
-            type: "object"
-            properties:
-              type:
-                type: "string"
-              diff_ids:
-                type: "array"
-                items:
-                  type: "string"
-    example:
-      Id: "5724e2c8652da337ab2eedd19fc6fc0ec908e4bd907c7421bf6a8dfc70c4c078"
-      Name: "tiborvass/sample-volume-plugin"
-      Tag: "latest"
-      Active: true
-      Settings:
-        Env:
-          - "DEBUG=0"
-        Args: null
-        Devices: null
-      Config:
-        Description: "A sample volume plugin for Docker"
-        Documentation: "https://docs.docker.com/engine/extend/plugins/"
-        Interface:
-          Types:
-            - "docker.volumedriver/1.0"
-          Socket: "plugins.sock"
-        Entrypoint:
-          - "/usr/bin/sample-volume-plugin"
-          - "/data"
-        WorkDir: ""
-        User: {}
-        Network:
-          Type: ""
-        Linux:
-          Capabilities: null
-          AllowAllDevices: false
-          Devices: null
-        Mounts: null
-        PropagatedMount: "/data"
-        Env:
-          - Name: "DEBUG"
-            Description: "If set, prints debug messages"
-            Settable: null
-            Value: "0"
-        Args:
-          Name: "args"
-          Description: "command line arguments"
-          Settable: null
-          Value: []
-
-  ObjectVersion:
-    description: |
-      The version number of the object such as node, service, etc. This is needed to avoid conflicting writes.
-      The client must send the version number along with the modified specification when updating these objects.
-      This approach ensures safe concurrency and determinism in that the change on the object
-      may not be applied if the version number has changed from the last read. In other words,
-      if two update requests specify the same base version, only one of the requests can succeed.
-      As a result, two separate update requests that happen at the same time will not
-      unintentially overwrite each other.
-    type: "object"
-    properties:
-      Index:
-        type: "integer"
-        format: "int64"
-
-  NodeSpec:
-    type: "object"
-    properties:
-      Name:
-        description: "Name for the node."
-        type: "string"
-      Labels:
-        description: "User-defined key/value metadata."
-        type: "object"
-        additionalProperties:
-          type: "string"
-      Role:
-        description: "Role of the node."
-        type: "string"
-        enum:
-          - "worker"
-          - "manager"
-      Availability:
-        description: "Availability of the node."
-        type: "string"
-        enum:
-          - "active"
-          - "pause"
-          - "drain"
-    example:
-      Availability: "active"
-      Name: "node-name"
-      Role: "manager"
-      Labels:
-        foo: "bar"
-  Node:
-    type: "object"
-    properties:
-      ID:
-        type: "string"
-      Version:
-        $ref: "#/definitions/ObjectVersion"
-      CreatedAt:
-        type: "string"
-        format: "dateTime"
-      UpdatedAt:
-        type: "string"
-        format: "dateTime"
-      Spec:
-        $ref: "#/definitions/NodeSpec"
-      Description:
-        type: "object"
-        properties:
-          Hostname:
-            type: "string"
-          Platform:
-            type: "object"
-            properties:
-              Architecture:
-                type: "string"
-              OS:
-                type: "string"
-          Resources:
-            type: "object"
-            properties:
-              NanoCPUs:
-                type: "integer"
-                format: "int64"
-              MemoryBytes:
-                type: "integer"
-                format: "int64"
-          Engine:
-            type: "object"
-            properties:
-              EngineVersion:
-                type: "string"
-              Labels:
-                type: "object"
-                additionalProperties:
-                  type: "string"
-              Plugins:
-                type: "array"
-                items:
-                  type: "object"
-                  properties:
-                    Type:
-                      type: "string"
-                    Name:
-                      type: "string"
-    example:
-      ID: "24ifsmvkjbyhk"
-      Version:
-        Index: 8
-      CreatedAt: "2016-06-07T20:31:11.853781916Z"
-      UpdatedAt: "2016-06-07T20:31:11.999868824Z"
-      Spec:
-        Name: "my-node"
-        Role: "manager"
-        Availability: "active"
-        Labels:
-          foo: "bar"
-      Description:
-        Hostname: "bf3067039e47"
-        Platform:
-          Architecture: "x86_64"
-          OS: "linux"
-        Resources:
-          NanoCPUs: 4000000000
-          MemoryBytes: 8272408576
-        Engine:
-          EngineVersion: "17.04.0"
-          Labels:
-            foo: "bar"
-          Plugins:
-            - Type: "Volume"
-              Name: "local"
-            - Type: "Network"
-              Name: "bridge"
-            - Type: "Network"
-              Name: "null"
-            - Type: "Network"
-              Name: "overlay"
-      Status:
-        State: "ready"
-        Addr: "172.17.0.2"
-      ManagerStatus:
-        Leader: true
-        Reachability: "reachable"
-        Addr: "172.17.0.2:2377"
-  SwarmSpec:
-    description: "User modifiable swarm configuration."
-    type: "object"
-    properties:
-      Name:
-        description: "Name of the swarm."
-        type: "string"
-      Labels:
-        description: "User-defined key/value metadata."
-        type: "object"
-        additionalProperties:
-          type: "string"
-      Orchestration:
-        description: "Orchestration configuration."
-        type: "object"
-        properties:
-          TaskHistoryRetentionLimit:
-            description: "The number of historic tasks to keep per instance or node. If negative, never remove completed or failed tasks."
-            type: "integer"
-            format: "int64"
-      Raft:
-        description: "Raft configuration."
-        type: "object"
-        properties:
-          SnapshotInterval:
-            description: "The number of log entries between snapshots."
-            type: "integer"
-            format: "int64"
-          KeepOldSnapshots:
-            description: "The number of snapshots to keep beyond the current snapshot."
-            type: "integer"
-            format: "int64"
-          LogEntriesForSlowFollowers:
-            description: "The number of log entries to keep around to sync up slow followers after a snapshot is created."
-            type: "integer"
-            format: "int64"
-          ElectionTick:
-            description: |
-              The number of ticks that a follower will wait for a message from the leader before becoming a candidate and starting an election. `ElectionTick` must be greater than `HeartbeatTick`.
-
-              A tick currently defaults to one second, so these translate directly to seconds currently, but this is NOT guaranteed.
-            type: "integer"
-          HeartbeatTick:
-            description: |
-              The number of ticks between heartbeats. Every HeartbeatTick ticks, the leader will send a heartbeat to the followers.
-
-              A tick currently defaults to one second, so these translate directly to seconds currently, but this is NOT guaranteed.
-            type: "integer"
-      Dispatcher:
-        description: "Dispatcher configuration."
-        type: "object"
-        properties:
-          HeartbeatPeriod:
-            description: "The delay for an agent to send a heartbeat to the dispatcher."
-            type: "integer"
-            format: "int64"
-      CAConfig:
-        description: "CA configuration."
-        type: "object"
-        properties:
-          NodeCertExpiry:
-            description: "The duration node certificates are issued for."
-            type: "integer"
-            format: "int64"
-          ExternalCAs:
-            description: "Configuration for forwarding signing requests to an external certificate authority."
-            type: "array"
-            items:
-              type: "object"
-              properties:
-                Protocol:
-                  description: "Protocol for communication with the external CA (currently only `cfssl` is supported)."
-                  type: "string"
-                  enum:
-                    - "cfssl"
-                  default: "cfssl"
-                URL:
-                  description: "URL where certificate signing requests should be sent."
-                  type: "string"
-                Options:
-                  description: "An object with key/value pairs that are interpreted as protocol-specific options for the external CA driver."
-                  type: "object"
-                  additionalProperties:
-                    type: "string"
-      EncryptionConfig:
-        description: "Parameters related to encryption-at-rest."
-        type: "object"
-        properties:
-          AutoLockManagers:
-            description: "If set, generate a key and use it to lock data stored on the managers."
-            type: "boolean"
-      TaskDefaults:
-        description: "Defaults for creating tasks in this cluster."
-        type: "object"
-        properties:
-          LogDriver:
-            description: |
-              The log driver to use for tasks created in the orchestrator if unspecified by a service.
-
-              Updating this value will only have an affect on new tasks. Old tasks will continue use their previously configured log driver until recreated.
-            type: "object"
-            properties:
-              Name:
-                type: "string"
-              Options:
-                type: "object"
-                additionalProperties:
-                  type: "string"
-    example:
-      Name: "default"
-      Orchestration:
-        TaskHistoryRetentionLimit: 10
-      Raft:
-        SnapshotInterval: 10000
-        LogEntriesForSlowFollowers: 500
-        HeartbeatTick: 1
-        ElectionTick: 3
-      Dispatcher:
-        HeartbeatPeriod: 5000000000
-      CAConfig:
-        NodeCertExpiry: 7776000000000000
-      JoinTokens:
-        Worker: "SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-1awxwuwd3z9j1z3puu7rcgdbx"
-        Manager: "SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-7p73s1dx5in4tatdymyhg9hu2"
-      EncryptionConfig:
-        AutoLockManagers: false
-  # The Swarm information for `GET /info`. It is the same as `GET /swarm`, but
-  # without `JoinTokens`.
-  ClusterInfo:
-    type: "object"
-    properties:
-      ID:
-        description: "The ID of the swarm."
-        type: "string"
-      Version:
-        $ref: "#/definitions/ObjectVersion"
-      CreatedAt:
-        type: "string"
-        format: "dateTime"
-      UpdatedAt:
-        type: "string"
-        format: "dateTime"
-      Spec:
-        $ref: "#/definitions/SwarmSpec"
-  TaskSpec:
-    description: "User modifiable task configuration."
-    type: "object"
-    properties:
-      ContainerSpec:
-        type: "object"
-        properties:
-          Image:
-            description: "The image name to use for the container."
-            type: "string"
-          Labels:
-            description: "User-defined key/value data."
-            type: "object"
-            additionalProperties:
-              type: "string"
-          Command:
-            description: "The command to be run in the image."
-            type: "array"
-            items:
-              type: "string"
-          Args:
-            description: "Arguments to the command."
-            type: "array"
-            items:
-              type: "string"
-          Hostname:
-            description: "The hostname to use for the container, as a valid RFC 1123 hostname."
-            type: "string"
-          Env:
-            description: "A list of environment variables in the form `VAR=value`."
-            type: "array"
-            items:
-              type: "string"
-          Dir:
-            description: "The working directory for commands to run in."
-            type: "string"
-          User:
-            description: "The user inside the container."
-            type: "string"
-          Groups:
-            type: "array"
-            description: "A list of additional groups that the container process will run as."
-            items:
-              type: "string"
-          TTY:
-            description: "Whether a pseudo-TTY should be allocated."
-            type: "boolean"
-          OpenStdin:
-            description: "Open `stdin`"
-            type: "boolean"
-          ReadOnly:
-            description: "Mount the container's root filesystem as read only."
-            type: "boolean"
-          Mounts:
-            description: "Specification for mounts to be added to containers created as part of the service."
-            type: "array"
-            items:
-              $ref: "#/definitions/Mount"
-          StopSignal:
-            description: "Signal to stop the container."
-            type: "string"
-          StopGracePeriod:
-            description: "Amount of time to wait for the container to terminate before forcefully killing it."
-            type: "integer"
-            format: "int64"
-          HealthCheck:
-            $ref: "#/definitions/HealthConfig"
-          Hosts:
-            type: "array"
-            description: |
-              A list of hostnames/IP mappings to add to the container's `/etc/hosts` file.
-              The format of extra hosts on swarmkit is specified in:
-              http://man7.org/linux/man-pages/man5/hosts.5.html
-                IP_address canonical_hostname [aliases...]
-            items:
-              type: "string"
-          DNSConfig:
-            description: "Specification for DNS related configurations in resolver configuration file (`resolv.conf`)."
-            type: "object"
-            properties:
-              Nameservers:
-                description: "The IP addresses of the name servers."
-                type: "array"
-                items:
-                  type: "string"
-              Search:
-                description: "A search list for host-name lookup."
-                type: "array"
-                items:
-                  type: "string"
-              Options:
-                description: "A list of internal resolver variables to be modified (e.g., `debug`, `ndots:3`, etc.)."
-                type: "array"
-                items:
-                  type: "string"
-          Secrets:
-            description: "Secrets contains references to zero or more secrets that will be exposed to the service."
-            type: "array"
-            items:
-              type: "object"
-              properties:
-                File:
-                  description: "File represents a specific target that is backed by a file."
-                  type: "object"
-                  properties:
-                    Name:
-                      description: "Name represents the final filename in the filesystem."
-                      type: "string"
-                    UID:
-                      description: "UID represents the file UID."
-                      type: "string"
-                    GID:
-                      description: "GID represents the file GID."
-                      type: "string"
-                    Mode:
-                      description: "Mode represents the FileMode of the file."
-                      type: "integer"
-                      format: "uint32"
-                SecretID:
-                  description: "SecretID represents the ID of the specific secret that we're referencing."
-                  type: "string"
-                SecretName:
-                  description: |
-                    SecretName is the name of the secret that this references, but this is just provided for
-                    lookup/display purposes. The secret in the reference will be identified by its ID.
-                  type: "string"
-
-      Resources:
-        description: "Resource requirements which apply to each individual container created as part of the service."
-        type: "object"
-        properties:
-          Limits:
-            description: "Define resources limits."
-            type: "object"
-            properties:
-              NanoCPUs:
-                description: "CPU limit in units of 10<sup>-9</sup> CPU shares."
-                type: "integer"
-                format: "int64"
-              MemoryBytes:
-                description: "Memory limit in Bytes."
-                type: "integer"
-                format: "int64"
-          Reservation:
-            description: "Define resources reservation."
-            properties:
-              NanoCPUs:
-                description: "CPU reservation in units of 10<sup>-9</sup> CPU shares."
-                type: "integer"
-                format: "int64"
-              MemoryBytes:
-                description: "Memory reservation in Bytes."
-                type: "integer"
-                format: "int64"
-      RestartPolicy:
-        description: "Specification for the restart policy which applies to containers created as part of this service."
-        type: "object"
-        properties:
-          Condition:
-            description: "Condition for restart."
-            type: "string"
-            enum:
-              - "none"
-              - "on-failure"
-              - "any"
-          Delay:
-            description: "Delay between restart attempts."
-            type: "integer"
-            format: "int64"
-          MaxAttempts:
-            description: "Maximum attempts to restart a given container before giving up (default value is 0, which is ignored)."
-            type: "integer"
-            format: "int64"
-            default: 0
-          Window:
-            description: "Windows is the time window used to evaluate the restart policy (default value is 0, which is unbounded)."
-            type: "integer"
-            format: "int64"
-            default: 0
-      Placement:
-        type: "object"
-        properties:
-          Constraints:
-            description: "An array of constraints."
-            type: "array"
-            items:
-              type: "string"
-          Preferences:
-            description: "Preferences provide a way to make the scheduler aware of factors such as topology. They are provided in order from highest to lowest precedence."
-            type: "array"
-            items:
-              type: "object"
-              properties:
-                Spread:
-                  type: "object"
-                  properties:
-                    SpreadDescriptor:
-                      description: "label descriptor, such as engine.labels.az"
-                      type: "string"
-      ForceUpdate:
-        description: "A counter that triggers an update even if no relevant parameters have been changed."
-        type: "integer"
-      Runtime:
-        description: "Runtime is the type of runtime specified for the task executor."
-        type: "string"
-      RuntimeData:
-        description: "RuntimeData is the payload sent to be used with the runtime for the executor."
-        type: "array"
-      Networks:
-        type: "array"
-        items:
-          type: "object"
-          properties:
-            Target:
-              type: "string"
-            Aliases:
-              type: "array"
-              items:
-                type: "string"
-      LogDriver:
-        description: "Specifies the log driver to use for tasks created from this spec. If not present, the default one for the swarm will be used, finally falling back to the engine default if not specified."
-        type: "object"
-        properties:
-          Name:
-            type: "string"
-          Options:
-            type: "object"
-            additionalProperties:
-              type: "string"
-  TaskState:
-    type: "string"
-    enum:
-      - "new"
-      - "allocated"
-      - "pending"
-      - "assigned"
-      - "accepted"
-      - "preparing"
-      - "ready"
-      - "starting"
-      - "running"
-      - "complete"
-      - "shutdown"
-      - "failed"
-      - "rejected"
-  Task:
-    type: "object"
-    properties:
-      ID:
-        description: "The ID of the task."
-        type: "string"
-      Version:
-        $ref: "#/definitions/ObjectVersion"
-      CreatedAt:
-        type: "string"
-        format: "dateTime"
-      UpdatedAt:
-        type: "string"
-        format: "dateTime"
-      Name:
-        description: "Name of the task."
-        type: "string"
-      Labels:
-        description: "User-defined key/value metadata."
-        type: "object"
-        additionalProperties:
-          type: "string"
-      Spec:
-        $ref: "#/definitions/TaskSpec"
-      ServiceID:
-        description: "The ID of the service this task is part of."
-        type: "string"
-      Slot:
-        type: "integer"
-      NodeID:
-        description: "The ID of the node that this task is on."
-        type: "string"
-      Status:
-        type: "object"
-        properties:
-          Timestamp:
-            type: "string"
-            format: "dateTime"
-          State:
-            $ref: "#/definitions/TaskState"
-          Message:
-            type: "string"
-          Err:
-            type: "string"
-          ContainerStatus:
-            type: "object"
-            properties:
-              ContainerID:
-                type: "string"
-              PID:
-                type: "integer"
-              ExitCode:
-                type: "integer"
-      DesiredState:
-        $ref: "#/definitions/TaskState"
-    example:
-      ID: "0kzzo1i0y4jz6027t0k7aezc7"
-      Version:
-        Index: 71
-      CreatedAt: "2016-06-07T21:07:31.171892745Z"
-      UpdatedAt: "2016-06-07T21:07:31.376370513Z"
-      Spec:
-        ContainerSpec:
-          Image: "redis"
-        Resources:
-          Limits: {}
-          Reservations: {}
-        RestartPolicy:
-          Condition: "any"
-          MaxAttempts: 0
-        Placement: {}
-      ServiceID: "9mnpnzenvg8p8tdbtq4wvbkcz"
-      Slot: 1
-      NodeID: "60gvrl6tm78dmak4yl7srz94v"
-      Status:
-        Timestamp: "2016-06-07T21:07:31.290032978Z"
-        State: "running"
-        Message: "started"
-        ContainerStatus:
-          ContainerID: "e5d62702a1b48d01c3e02ca1e0212a250801fa8d67caca0b6f35919ebc12f035"
-          PID: 677
-      DesiredState: "running"
-      NetworksAttachments:
-        - Network:
-            ID: "4qvuz4ko70xaltuqbt8956gd1"
-            Version:
-              Index: 18
-            CreatedAt: "2016-06-07T20:31:11.912919752Z"
-            UpdatedAt: "2016-06-07T21:07:29.955277358Z"
-            Spec:
-              Name: "ingress"
-              Labels:
-                com.docker.swarm.internal: "true"
-              DriverConfiguration: {}
-              IPAMOptions:
-                Driver: {}
-                Configs:
-                  - Subnet: "10.255.0.0/16"
-                    Gateway: "10.255.0.1"
-            DriverState:
-              Name: "overlay"
-              Options:
-                com.docker.network.driver.overlay.vxlanid_list: "256"
-            IPAMOptions:
-              Driver:
-                Name: "default"
-              Configs:
-                - Subnet: "10.255.0.0/16"
-                  Gateway: "10.255.0.1"
-          Addresses:
-            - "10.255.0.10/16"
-  ServiceSpec:
-    description: "User modifiable configuration for a service."
-    properties:
-      Name:
-        description: "Name of the service."
-        type: "string"
-      Labels:
-        description: "User-defined key/value metadata."
-        type: "object"
-        additionalProperties:
-          type: "string"
-      TaskTemplate:
-        $ref: "#/definitions/TaskSpec"
-      Mode:
-        description: "Scheduling mode for the service."
-        type: "object"
-        properties:
-          Replicated:
-            type: "object"
-            properties:
-              Replicas:
-                type: "integer"
-                format: "int64"
-          Global:
-            type: "object"
-      UpdateConfig:
-        description: "Specification for the update strategy of the service."
-        type: "object"
-        properties:
-          Parallelism:
-            description: "Maximum number of tasks to be updated in one iteration (0 means unlimited parallelism)."
-            type: "integer"
-            format: "int64"
-          Delay:
-            description: "Amount of time between updates, in nanoseconds."
-            type: "integer"
-            format: "int64"
-          FailureAction:
-            description: "Action to take if an updated task fails to run, or stops running during the update."
-            type: "string"
-            enum:
-              - "continue"
-              - "pause"
-              - "rollback"
-          Monitor:
-            description: "Amount of time to monitor each updated task for failures, in nanoseconds."
-            type: "integer"
-            format: "int64"
-          MaxFailureRatio:
-            description: "The fraction of tasks that may fail during an update before the failure action is invoked, specified as a floating point number between 0 and 1."
-            type: "number"
-            default: 0
-          Order:
-            description: "The order of operations when rolling out an updated task. Either the old task is shut down before the new task is started, or the new task is started before the old task is shut down."
-            type: "string"
-            enum:
-              - "stop-first"
-              - "start-first"
-      RollbackConfig:
-        description: "Specification for the rollback strategy of the service."
-        type: "object"
-        properties:
-          Parallelism:
-            description: "Maximum number of tasks to be rolled back in one iteration (0 means unlimited parallelism)."
-            type: "integer"
-            format: "int64"
-          Delay:
-            description: "Amount of time between rollback iterations, in nanoseconds."
-            type: "integer"
-            format: "int64"
-          FailureAction:
-            description: "Action to take if an rolled back task fails to run, or stops running during the rollback."
-            type: "string"
-            enum:
-              - "continue"
-              - "pause"
-          Monitor:
-            description: "Amount of time to monitor each rolled back task for failures, in nanoseconds."
-            type: "integer"
-            format: "int64"
-          MaxFailureRatio:
-            description: "The fraction of tasks that may fail during a rollback before the failure action is invoked, specified as a floating point number between 0 and 1."
-            type: "number"
-            default: 0
-          Order:
-            description: "The order of operations when rolling back a task. Either the old task is shut down before the new task is started, or the new task is started before the old task is shut down."
-            type: "string"
-            enum:
-              - "stop-first"
-              - "start-first"
-      Networks:
-        description: "Array of network names or IDs to attach the service to."
-        type: "array"
-        items:
-          type: "object"
-          properties:
-            Target:
-              type: "string"
-            Aliases:
-              type: "array"
-              items:
-                type: "string"
-      EndpointSpec:
-        $ref: "#/definitions/EndpointSpec"
-  EndpointPortConfig:
-    type: "object"
-    properties:
-      Name:
-        type: "string"
-      Protocol:
-        type: "string"
-        enum:
-          - "tcp"
-          - "udp"
-      TargetPort:
-        description: "The port inside the container."
-        type: "integer"
-      PublishedPort:
-        description: "The port on the swarm hosts."
-        type: "integer"
-  EndpointSpec:
-    description: "Properties that can be configured to access and load balance a service."
-    type: "object"
-    properties:
-      Mode:
-        description: "The mode of resolution to use for internal load balancing
-      between tasks."
-        type: "string"
-        enum:
-          - "vip"
-          - "dnsrr"
-        default: "vip"
-      Ports:
-        description: "List of exposed ports that this service is accessible on from the outside. Ports can only be provided if `vip` resolution mode is used."
-        type: "array"
-        items:
-          $ref: "#/definitions/EndpointPortConfig"
-  Service:
-    type: "object"
-    properties:
-      ID:
-        type: "string"
-      Version:
-        $ref: "#/definitions/ObjectVersion"
-      CreatedAt:
-        type: "string"
-        format: "dateTime"
-      UpdatedAt:
-        type: "string"
-        format: "dateTime"
-      Spec:
-        $ref: "#/definitions/ServiceSpec"
-      Endpoint:
-        type: "object"
-        properties:
-          Spec:
-            $ref: "#/definitions/EndpointSpec"
-          Ports:
-            type: "array"
-            items:
-              $ref: "#/definitions/EndpointPortConfig"
-          VirtualIPs:
-            type: "array"
-            items:
-              type: "object"
-              properties:
-                NetworkID:
-                  type: "string"
-                Addr:
-                  type: "string"
-      UpdateStatus:
-        description: "The status of a service update."
-        type: "object"
-        properties:
-          State:
-            type: "string"
-            enum:
-              - "updating"
-              - "paused"
-              - "completed"
-          StartedAt:
-            type: "string"
-            format: "dateTime"
-          CompletedAt:
-            type: "string"
-            format: "dateTime"
-          Message:
-            type: "string"
-    example:
-      ID: "9mnpnzenvg8p8tdbtq4wvbkcz"
-      Version:
-        Index: 19
-      CreatedAt: "2016-06-07T21:05:51.880065305Z"
-      UpdatedAt: "2016-06-07T21:07:29.962229872Z"
-      Spec:
-        Name: "hopeful_cori"
-        TaskTemplate:
-          ContainerSpec:
-            Image: "redis"
-          Resources:
-            Limits: {}
-            Reservations: {}
-          RestartPolicy:
-            Condition: "any"
-            MaxAttempts: 0
-          Placement: {}
-          ForceUpdate: 0
-        Mode:
-          Replicated:
-            Replicas: 1
-        UpdateConfig:
-          Parallelism: 1
-          Delay: 1000000000
-          FailureAction: "pause"
-          Monitor: 15000000000
-          MaxFailureRatio: 0.15
-        RollbackConfig:
-          Parallelism: 1
-          Delay: 1000000000
-          FailureAction: "pause"
-          Monitor: 15000000000
-          MaxFailureRatio: 0.15
-        EndpointSpec:
-          Mode: "vip"
-          Ports:
-            -
-              Protocol: "tcp"
-              TargetPort: 6379
-              PublishedPort: 30001
-      Endpoint:
-        Spec:
-          Mode: "vip"
-          Ports:
-            -
-              Protocol: "tcp"
-              TargetPort: 6379
-              PublishedPort: 30001
-        Ports:
-          -
-            Protocol: "tcp"
-            TargetPort: 6379
-            PublishedPort: 30001
-        VirtualIPs:
-          -
-            NetworkID: "4qvuz4ko70xaltuqbt8956gd1"
-            Addr: "10.255.0.2/16"
-          -
-            NetworkID: "4qvuz4ko70xaltuqbt8956gd1"
-            Addr: "10.255.0.3/16"
-  ImageDeleteResponseItem:
-    type: "object"
-    properties:
-      Untagged:
-        description: "The image ID of an image that was untagged"
-        type: "string"
-      Deleted:
-        description: "The image ID of an image that was deleted"
-        type: "string"
-  ServiceUpdateResponse:
-    type: "object"
-    properties:
-      Warnings:
-        description: "Optional warning messages"
-        type: "array"
-        items:
-          type: "string"
-    example:
-      Warning: "unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"
-  ContainerSummary:
-    type: "array"
-    items:
-      type: "object"
-      properties:
-        Id:
-          description: "The ID of this container"
-          type: "string"
-          x-go-name: "ID"
-        Names:
-          description: "The names that this container has been given"
-          type: "array"
-          items:
-            type: "string"
-        Image:
-          description: "The name of the image used when creating this container"
-          type: "string"
-        ImageID:
-          description: "The ID of the image that this container was created from"
-          type: "string"
-        Command:
-          description: "Command to run when starting the container"
-          type: "string"
-        Created:
-          description: "When the container was created"
-          type: "integer"
-          format: "int64"
-        Ports:
-          description: "The ports exposed by this container"
-          type: "array"
-          items:
-            $ref: "#/definitions/Port"
-        SizeRw:
-          description: "The size of files that have been created or changed by this container"
-          type: "integer"
-          format: "int64"
-        SizeRootFs:
-          description: "The total size of all the files in this container"
-          type: "integer"
-          format: "int64"
-        Labels:
-          description: "User-defined key/value metadata."
-          type: "object"
-          additionalProperties:
-            type: "string"
-        State:
-          description: "The state of this container (e.g. `Exited`)"
-          type: "string"
-        Status:
-          description: "Additional human-readable status of this container (e.g. `Exit 0`)"
-          type: "string"
-        HostConfig:
-          type: "object"
-          properties:
-            NetworkMode:
-              type: "string"
-        NetworkSettings:
-          description: "A summary of the container's network settings"
-          type: "object"
-          properties:
-            Networks:
-              type: "object"
-              additionalProperties:
-                $ref: "#/definitions/EndpointSettings"
-        Mounts:
-          type: "array"
-          items:
-            $ref: "#/definitions/Mount"
-  SecretSpec:
-    type: "object"
-    properties:
-      Name:
-        description: "User-defined name of the secret."
-        type: "string"
-      Labels:
-        description: "User-defined key/value metadata."
-        type: "object"
-        additionalProperties:
-          type: "string"
-      Data:
-        description: "Base64-url-safe-encoded secret data"
-        type: "array"
-        items:
-          type: "string"
-  Secret:
-    type: "object"
-    properties:
-      ID:
-        type: "string"
-      Version:
-        $ref: "#/definitions/ObjectVersion"
-      CreatedAt:
-        type: "string"
-        format: "dateTime"
-      UpdatedAt:
-        type: "string"
-        format: "dateTime"
-      Spec:
-        $ref: "#/definitions/ServiceSpec"
-paths:
-  /containers/json:
-    get:
-      summary: "List containers"
-      operationId: "ContainerList"
-      produces:
-        - "application/json"
-      parameters:
-        - name: "all"
-          in: "query"
-          description: "Return all containers. By default, only running containers are shown"
-          type: "boolean"
-          default: false
-        - name: "limit"
-          in: "query"
-          description: "Return this number of most recently created containers, including non-running ones."
-          type: "integer"
-        - name: "size"
-          in: "query"
-          description: "Return the size of container as fields `SizeRw` and `SizeRootFs`."
-          type: "boolean"
-          default: false
-        - name: "filters"
-          in: "query"
-          description: |
-            Filters to process on the container list, encoded as JSON (a `map[string][]string`). For example, `{"status": ["paused"]}` will only return paused containers. Available filters:
-
-            - `ancestor`=(`<image-name>[:<tag>]`, `<image id>`, or `<image@digest>`)
-            - `before`=(`<container id>` or `<container name>`)
-            - `expose`=(`<port>[/<proto>]`|`<startport-endport>/[<proto>]`)
-            - `exited=<int>` containers with exit code of `<int>`
-            - `health`=(`starting`|`healthy`|`unhealthy`|`none`)
-            - `id=<ID>` a container's ID
-            - `isolation=`(`default`|`process`|`hyperv`) (Windows daemon only)
-            - `is-task=`(`true`|`false`)
-            - `label=key` or `label="key=value"` of a container label
-            - `name=<name>` a container's name
-            - `network`=(`<network id>` or `<network name>`)
-            - `publish`=(`<port>[/<proto>]`|`<startport-endport>/[<proto>]`)
-            - `since`=(`<container id>` or `<container name>`)
-            - `status=`(`created`|`restarting`|`running`|`removing`|`paused`|`exited`|`dead`)
-            - `volume`=(`<volume name>` or `<mount point destination>`)
-          type: "string"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/ContainerSummary"
-          examples:
-            application/json:
-              - Id: "8dfafdbc3a40"
-                Names:
-                  - "/boring_feynman"
-                Image: "ubuntu:latest"
-                ImageID: "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82"
-                Command: "echo 1"
-                Created: 1367854155
-                State: "Exited"
-                Status: "Exit 0"
-                Ports:
-                  - PrivatePort: 2222
-                    PublicPort: 3333
-                    Type: "tcp"
-                Labels:
-                  com.example.vendor: "Acme"
-                  com.example.license: "GPL"
-                  com.example.version: "1.0"
-                SizeRw: 12288
-                SizeRootFs: 0
-                HostConfig:
-                  NetworkMode: "default"
-                NetworkSettings:
-                  Networks:
-                    bridge:
-                      NetworkID: "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812"
-                      EndpointID: "2cdc4edb1ded3631c81f57966563e5c8525b81121bb3706a9a9a3ae102711f3f"
-                      Gateway: "172.17.0.1"
-                      IPAddress: "172.17.0.2"
-                      IPPrefixLen: 16
-                      IPv6Gateway: ""
-                      GlobalIPv6Address: ""
-                      GlobalIPv6PrefixLen: 0
-                      MacAddress: "02:42:ac:11:00:02"
-                Mounts:
-                  - Name: "fac362...80535"
-                    Source: "/data"
-                    Destination: "/data"
-                    Driver: "local"
-                    Mode: "ro,Z"
-                    RW: false
-                    Propagation: ""
-              - Id: "9cd87474be90"
-                Names:
-                  - "/coolName"
-                Image: "ubuntu:latest"
-                ImageID: "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82"
-                Command: "echo 222222"
-                Created: 1367854155
-                State: "Exited"
-                Status: "Exit 0"
-                Ports: []
-                Labels: {}
-                SizeRw: 12288
-                SizeRootFs: 0
-                HostConfig:
-                  NetworkMode: "default"
-                NetworkSettings:
-                  Networks:
-                    bridge:
-                      NetworkID: "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812"
-                      EndpointID: "88eaed7b37b38c2a3f0c4bc796494fdf51b270c2d22656412a2ca5d559a64d7a"
-                      Gateway: "172.17.0.1"
-                      IPAddress: "172.17.0.8"
-                      IPPrefixLen: 16
-                      IPv6Gateway: ""
-                      GlobalIPv6Address: ""
-                      GlobalIPv6PrefixLen: 0
-                      MacAddress: "02:42:ac:11:00:08"
-                Mounts: []
-              - Id: "3176a2479c92"
-                Names:
-                  - "/sleepy_dog"
-                Image: "ubuntu:latest"
-                ImageID: "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82"
-                Command: "echo 3333333333333333"
-                Created: 1367854154
-                State: "Exited"
-                Status: "Exit 0"
-                Ports: []
-                Labels: {}
-                SizeRw: 12288
-                SizeRootFs: 0
-                HostConfig:
-                  NetworkMode: "default"
-                NetworkSettings:
-                  Networks:
-                    bridge:
-                      NetworkID: "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812"
-                      EndpointID: "8b27c041c30326d59cd6e6f510d4f8d1d570a228466f956edf7815508f78e30d"
-                      Gateway: "172.17.0.1"
-                      IPAddress: "172.17.0.6"
-                      IPPrefixLen: 16
-                      IPv6Gateway: ""
-                      GlobalIPv6Address: ""
-                      GlobalIPv6PrefixLen: 0
-                      MacAddress: "02:42:ac:11:00:06"
-                Mounts: []
-              - Id: "4cb07b47f9fb"
-                Names:
-                  - "/running_cat"
-                Image: "ubuntu:latest"
-                ImageID: "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82"
-                Command: "echo 444444444444444444444444444444444"
-                Created: 1367854152
-                State: "Exited"
-                Status: "Exit 0"
-                Ports: []
-                Labels: {}
-                SizeRw: 12288
-                SizeRootFs: 0
-                HostConfig:
-                  NetworkMode: "default"
-                NetworkSettings:
-                  Networks:
-                    bridge:
-                      NetworkID: "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812"
-                      EndpointID: "d91c7b2f0644403d7ef3095985ea0e2370325cd2332ff3a3225c4247328e66e9"
-                      Gateway: "172.17.0.1"
-                      IPAddress: "172.17.0.5"
-                      IPPrefixLen: 16
-                      IPv6Gateway: ""
-                      GlobalIPv6Address: ""
-                      GlobalIPv6PrefixLen: 0
-                      MacAddress: "02:42:ac:11:00:05"
-                Mounts: []
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Container"]
-  /containers/create:
-    post:
-      summary: "Create a container"
-      operationId: "ContainerCreate"
-      consumes:
-        - "application/json"
-        - "application/octet-stream"
-      produces:
-        - "application/json"
-      parameters:
-        - name: "name"
-          in: "query"
-          description: "Assign the specified name to the container. Must match `/?[a-zA-Z0-9_-]+`."
-          type: "string"
-          pattern: "/?[a-zA-Z0-9_-]+"
-        - name: "body"
-          in: "body"
-          description: "Container to create"
-          schema:
-            allOf:
-              - $ref: "#/definitions/Config"
-              - type: "object"
-                properties:
-                  HostConfig:
-                    $ref: "#/definitions/HostConfig"
-                  NetworkingConfig:
-                    description: "This container's networking configuration."
-                    type: "object"
-                    properties:
-                      EndpointsConfig:
-                        description: "A mapping of network name to endpoint configuration for that network."
-                        type: "object"
-                        additionalProperties:
-                          $ref: "#/definitions/EndpointSettings"
-            example:
-              Hostname: ""
-              Domainname: ""
-              User: ""
-              AttachStdin: false
-              AttachStdout: true
-              AttachStderr: true
-              Tty: false
-              OpenStdin: false
-              StdinOnce: false
-              Env:
-                - "FOO=bar"
-                - "BAZ=quux"
-              Cmd:
-                - "date"
-              Entrypoint: ""
-              Image: "ubuntu"
-              Labels:
-                com.example.vendor: "Acme"
-                com.example.license: "GPL"
-                com.example.version: "1.0"
-              Volumes:
-                /volumes/data: {}
-              WorkingDir: ""
-              NetworkDisabled: false
-              MacAddress: "12:34:56:78:9a:bc"
-              ExposedPorts:
-                22/tcp: {}
-              StopSignal: "SIGTERM"
-              StopTimeout: 10
-              HostConfig:
-                Binds:
-                  - "/tmp:/tmp"
-                Links:
-                  - "redis3:redis"
-                Memory: 0
-                MemorySwap: 0
-                MemoryReservation: 0
-                KernelMemory: 0
-                NanoCPUs: 500000
-                CpuPercent: 80
-                CpuShares: 512
-                CpuPeriod: 100000
-                CpuRealtimePeriod: 1000000
-                CpuRealtimeRuntime: 10000
-                CpuQuota: 50000
-                CpusetCpus: "0,1"
-                CpusetMems: "0,1"
-                MaximumIOps: 0
-                MaximumIOBps: 0
-                BlkioWeight: 300
-                BlkioWeightDevice:
-                  - {}
-                BlkioDeviceReadBps:
-                  - {}
-                BlkioDeviceReadIOps:
-                  - {}
-                BlkioDeviceWriteBps:
-                  - {}
-                BlkioDeviceWriteIOps:
-                  - {}
-                MemorySwappiness: 60
-                OomKillDisable: false
-                OomScoreAdj: 500
-                PidMode: ""
-                PidsLimit: -1
-                PortBindings:
-                  22/tcp:
-                    - HostPort: "11022"
-                PublishAllPorts: false
-                Privileged: false
-                ReadonlyRootfs: false
-                Dns:
-                  - "8.8.8.8"
-                DnsOptions:
-                  - ""
-                DnsSearch:
-                  - ""
-                VolumesFrom:
-                  - "parent"
-                  - "other:ro"
-                CapAdd:
-                  - "NET_ADMIN"
-                CapDrop:
-                  - "MKNOD"
-                GroupAdd:
-                  - "newgroup"
-                RestartPolicy:
-                  Name: ""
-                  MaximumRetryCount: 0
-                AutoRemove: true
-                NetworkMode: "bridge"
-                Devices: []
-                Ulimits:
-                  - {}
-                LogConfig:
-                  Type: "json-file"
-                  Config: {}
-                SecurityOpt: []
-                StorageOpt: {}
-                CgroupParent: ""
-                VolumeDriver: ""
-                ShmSize: 67108864
-              NetworkingConfig:
-                EndpointsConfig:
-                  isolated_nw:
-                    IPAMConfig:
-                      IPv4Address: "172.20.30.33"
-                      IPv6Address: "2001:db8:abcd::3033"
-                      LinkLocalIPs:
-                        - "169.254.34.68"
-                        - "fe80::3468"
-                    Links:
-                      - "container_1"
-                      - "container_2"
-                    Aliases:
-                      - "server_x"
-                      - "server_y"
-
-          required: true
-      responses:
-        201:
-          description: "Container created successfully"
-          schema:
-            type: "object"
-            required: [Id, Warnings]
-            properties:
-              Id:
-                description: "The ID of the created container"
-                type: "string"
-                x-nullable: false
-              Warnings:
-                description: "Warnings encountered when creating the container"
-                type: "array"
-                x-nullable: false
-                items:
-                  type: "string"
-          examples:
-            application/json:
-              Id: "e90e34656806"
-              Warnings: []
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        406:
-          description: "impossible to attach"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "conflict"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Container"]
-  /containers/{id}/json:
-    get:
-      summary: "Inspect a container"
-      description: "Return low-level information about a container."
-      operationId: "ContainerInspect"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              Id:
-                description: "The ID of the container"
-                type: "string"
-              Created:
-                description: "The time the container was created"
-                type: "string"
-              Path:
-                description: "The path to the command being run"
-                type: "string"
-              Args:
-                description: "The arguments to the command being run"
-                type: "array"
-                items:
-                  type: "string"
-              State:
-                description: "The state of the container."
-                type: "object"
-                properties:
-                  Status:
-                    description: "The status of the container. For example, `running` or `exited`."
-                    type: "string"
-                  Running:
-                    description: "Whether this container is running."
-                    type: "boolean"
-                  Paused:
-                    description: "Whether this container is paused."
-                    type: "boolean"
-                  Restarting:
-                    description: "Whether this container is restarting."
-                    type: "boolean"
-                  OOMKilled:
-                    description: "Whether this container has been killed because it ran out of memory."
-                    type: "boolean"
-                  Dead:
-                    type: "boolean"
-                  Pid:
-                    description: "The process ID of this container"
-                    type: "integer"
-                  ExitCode:
-                    description: "The last exit code of this container"
-                    type: "integer"
-                  Error:
-                    type: "string"
-                  StartedAt:
-                    description: "The time when this container was last started."
-                    type: "string"
-                  FinishedAt:
-                    description: "The time when this container last exited."
-                    type: "string"
-              Image:
-                description: "The container's image"
-                type: "string"
-              ResolvConfPath:
-                type: "string"
-              HostnamePath:
-                type: "string"
-              HostsPath:
-                type: "string"
-              LogPath:
-                type: "string"
-              Node:
-                description: "TODO"
-                type: "object"
-              Name:
-                type: "string"
-              RestartCount:
-                type: "integer"
-              Driver:
-                type: "string"
-              MountLabel:
-                type: "string"
-              ProcessLabel:
-                type: "string"
-              AppArmorProfile:
-                type: "string"
-              ExecIDs:
-                type: "string"
-              HostConfig:
-                $ref: "#/definitions/HostConfig"
-              GraphDriver:
-                $ref: "#/definitions/GraphDriverData"
-              SizeRw:
-                description: "The size of files that have been created or changed by this container."
-                type: "integer"
-                format: "int64"
-              SizeRootFs:
-                description: "The total size of all the files in this container."
-                type: "integer"
-                format: "int64"
-              Mounts:
-                type: "array"
-                items:
-                  $ref: "#/definitions/MountPoint"
-              Config:
-                $ref: "#/definitions/Config"
-              NetworkSettings:
-                $ref: "#/definitions/NetworkConfig"
-          examples:
-            application/json:
-              AppArmorProfile: ""
-              Args:
-                - "-c"
-                - "exit 9"
-              Config:
-                AttachStderr: true
-                AttachStdin: false
-                AttachStdout: true
-                Cmd:
-                  - "/bin/sh"
-                  - "-c"
-                  - "exit 9"
-                Domainname: ""
-                Env:
-                  - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-                Hostname: "ba033ac44011"
-                Image: "ubuntu"
-                Labels:
-                  com.example.vendor: "Acme"
-                  com.example.license: "GPL"
-                  com.example.version: "1.0"
-                MacAddress: ""
-                NetworkDisabled: false
-                OpenStdin: false
-                StdinOnce: false
-                Tty: false
-                User: ""
-                Volumes:
-                  /volumes/data: {}
-                WorkingDir: ""
-                StopSignal: "SIGTERM"
-                StopTimeout: 10
-              Created: "2015-01-06T15:47:31.485331387Z"
-              Driver: "devicemapper"
-              HostConfig:
-                MaximumIOps: 0
-                MaximumIOBps: 0
-                BlkioWeight: 0
-                BlkioWeightDevice:
-                  - {}
-                BlkioDeviceReadBps:
-                  - {}
-                BlkioDeviceWriteBps:
-                  - {}
-                BlkioDeviceReadIOps:
-                  - {}
-                BlkioDeviceWriteIOps:
-                  - {}
-                ContainerIDFile: ""
-                CpusetCpus: ""
-                CpusetMems: ""
-                CpuPercent: 80
-                CpuShares: 0
-                CpuPeriod: 100000
-                CpuRealtimePeriod: 1000000
-                CpuRealtimeRuntime: 10000
-                Devices: []
-                IpcMode: ""
-                LxcConf: []
-                Memory: 0
-                MemorySwap: 0
-                MemoryReservation: 0
-                KernelMemory: 0
-                OomKillDisable: false
-                OomScoreAdj: 500
-                NetworkMode: "bridge"
-                PidMode: ""
-                PortBindings: {}
-                Privileged: false
-                ReadonlyRootfs: false
-                PublishAllPorts: false
-                RestartPolicy:
-                  MaximumRetryCount: 2
-                  Name: "on-failure"
-                LogConfig:
-                  Type: "json-file"
-                Sysctls:
-                  net.ipv4.ip_forward: "1"
-                Ulimits:
-                  - {}
-                VolumeDriver: ""
-                ShmSize: 67108864
-              HostnamePath: "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hostname"
-              HostsPath: "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hosts"
-              LogPath: "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log"
-              Id: "ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39"
-              Image: "04c5d3b7b0656168630d3ba35d8889bd0e9caafcaeb3004d2bfbc47e7c5d35d2"
-              MountLabel: ""
-              Name: "/boring_euclid"
-              NetworkSettings:
-                Bridge: ""
-                SandboxID: ""
-                HairpinMode: false
-                LinkLocalIPv6Address: ""
-                LinkLocalIPv6PrefixLen: 0
-                SandboxKey: ""
-                SecondaryIPAddresses: null
-                SecondaryIPv6Addresses: null
-                EndpointID: ""
-                Gateway: ""
-                GlobalIPv6Address: ""
-                GlobalIPv6PrefixLen: 0
-                IPAddress: ""
-                IPPrefixLen: 0
-                IPv6Gateway: ""
-                MacAddress: ""
-                Networks:
-                  bridge:
-                    NetworkID: "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812"
-                    EndpointID: "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d"
-                    Gateway: "172.17.0.1"
-                    IPAddress: "172.17.0.2"
-                    IPPrefixLen: 16
-                    IPv6Gateway: ""
-                    GlobalIPv6Address: ""
-                    GlobalIPv6PrefixLen: 0
-                    MacAddress: "02:42:ac:12:00:02"
-              Path: "/bin/sh"
-              ProcessLabel: ""
-              ResolvConfPath: "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/resolv.conf"
-              RestartCount: 1
-              State:
-                Error: ""
-                ExitCode: 9
-                FinishedAt: "2015-01-06T15:47:32.080254511Z"
-                OOMKilled: false
-                Dead: false
-                Paused: false
-                Pid: 0
-                Restarting: false
-                Running: true
-                StartedAt: "2015-01-06T15:47:32.072697474Z"
-                Status: "running"
-              Mounts:
-                - Name: "fac362...80535"
-                  Source: "/data"
-                  Destination: "/data"
-                  Driver: "local"
-                  Mode: "ro,Z"
-                  RW: false
-                  Propagation: ""
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "size"
-          in: "query"
-          type: "boolean"
-          default: false
-          description: "Return the size of container as fields `SizeRw` and `SizeRootFs`"
-      tags: ["Container"]
-  /containers/{id}/top:
-    get:
-      summary: "List processes running inside a container"
-      description: "On Unix systems, this is done by running the `ps` command. This endpoint is not supported on Windows."
-      operationId: "ContainerTop"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              Titles:
-                description: "The ps column titles"
-                type: "array"
-                items:
-                  type: "string"
-              Processes:
-                description: "Each process running in the container, where each is process is an array of values corresponding to the titles"
-                type: "array"
-                items:
-                  type: "array"
-                  items:
-                    type: "string"
-          examples:
-            application/json:
-              Titles:
-                - "UID"
-                - "PID"
-                - "PPID"
-                - "C"
-                - "STIME"
-                - "TTY"
-                - "TIME"
-                - "CMD"
-              Processes:
-                -
-                  - "root"
-                  - "13642"
-                  - "882"
-                  - "0"
-                  - "17:03"
-                  - "pts/0"
-                  - "00:00:00"
-                  - "/bin/bash"
-                -
-                  - "root"
-                  - "13735"
-                  - "13642"
-                  - "0"
-                  - "17:06"
-                  - "pts/0"
-                  - "00:00:00"
-                  - "sleep 10"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "ps_args"
-          in: "query"
-          description: "The arguments to pass to `ps`. For example, `aux`"
-          type: "string"
-          default: "-ef"
-      tags: ["Container"]
-  /containers/{id}/logs:
-    get:
-      summary: "Get container logs"
-      description: |
-        Get `stdout` and `stderr` logs from a container.
-
-        Note: This endpoint works only for containers with the `json-file` or `journald` logging driver.
-      operationId: "ContainerLogs"
-      responses:
-        101:
-          description: "logs returned as a stream"
-          schema:
-            type: "string"
-            format: "binary"
-        200:
-          description: "logs returned as a string in response body"
-          schema:
-            type: "string"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "follow"
-          in: "query"
-          description: |
-            Return the logs as a stream.
-
-            This will return a `101` HTTP response with a `Connection: upgrade` header, then hijack the HTTP connection to send raw output. For more information about hijacking and the stream format, [see the documentation for the attach endpoint](#operation/ContainerAttach).
-          type: "boolean"
-          default: false
-        - name: "stdout"
-          in: "query"
-          description: "Return logs from `stdout`"
-          type: "boolean"
-          default: false
-        - name: "stderr"
-          in: "query"
-          description: "Return logs from `stderr`"
-          type: "boolean"
-          default: false
-        - name: "since"
-          in: "query"
-          description: "Only return logs since this time, as a UNIX timestamp"
-          type: "integer"
-          default: 0
-        - name: "timestamps"
-          in: "query"
-          description: "Add timestamps to every log line"
-          type: "boolean"
-          default: false
-        - name: "tail"
-          in: "query"
-          description: "Only return this number of log lines from the end of the logs. Specify as an integer or `all` to output all log lines."
-          type: "string"
-          default: "all"
-      tags: ["Container"]
-  /containers/{id}/changes:
-    get:
-      summary: "Get changes on a container’s filesystem"
-      description: |
-        Returns which files in a container's filesystem have been added, deleted,
-        or modified. The `Kind` of modification can be one of:
-
-        - `0`: Modified
-        - `1`: Added
-        - `2`: Deleted
-      operationId: "ContainerChanges"
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "The list of changes"
-          schema:
-            type: "array"
-            items:
-              type: "object"
-              x-go-name: "ContainerChangeResponseItem"
-              required: [Path, Kind]
-              properties:
-                Path:
-                  description: "Path to file that has changed"
-                  type: "string"
-                  x-nullable: false
-                Kind:
-                  description: "Kind of change"
-                  type: "integer"
-                  format: "uint8"
-                  enum: [0, 1, 2]
-                  x-nullable: false
-          examples:
-            application/json:
-              - Path: "/dev"
-                Kind: 0
-              - Path: "/dev/kmsg"
-                Kind: 1
-              - Path: "/test"
-                Kind: 1
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}/export:
-    get:
-      summary: "Export a container"
-      description: "Export the contents of a container as a tarball."
-      operationId: "ContainerExport"
-      produces:
-        - "application/octet-stream"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}/stats:
-    get:
-      summary: "Get container stats based on resource usage"
-      description: |
-        This endpoint returns a live stream of a container’s resource usage
-        statistics.
-
-        The `precpu_stats` is the CPU statistic of last read, which is used
-        for calculating the CPU usage percentage. It is not the same as the
-        `cpu_stats` field.
-
-        If either `precpu_stats.online_cpus` or `cpu_stats.online_cpus` is
-        nil then for compatibility with older daemons the length of the
-        corresponding `cpu_usage.percpu_usage` array should be used.
-      operationId: "ContainerStats"
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-          examples:
-            application/json:
-              read: "2015-01-08T22:57:31.547920715Z"
-              pids_stats:
-                current: 3
-              networks:
-                eth0:
-                  rx_bytes: 5338
-                  rx_dropped: 0
-                  rx_errors: 0
-                  rx_packets: 36
-                  tx_bytes: 648
-                  tx_dropped: 0
-                  tx_errors: 0
-                  tx_packets: 8
-                eth5:
-                  rx_bytes: 4641
-                  rx_dropped: 0
-                  rx_errors: 0
-                  rx_packets: 26
-                  tx_bytes: 690
-                  tx_dropped: 0
-                  tx_errors: 0
-                  tx_packets: 9
-              memory_stats:
-                stats:
-                  total_pgmajfault: 0
-                  cache: 0
-                  mapped_file: 0
-                  total_inactive_file: 0
-                  pgpgout: 414
-                  rss: 6537216
-                  total_mapped_file: 0
-                  writeback: 0
-                  unevictable: 0
-                  pgpgin: 477
-                  total_unevictable: 0
-                  pgmajfault: 0
-                  total_rss: 6537216
-                  total_rss_huge: 6291456
-                  total_writeback: 0
-                  total_inactive_anon: 0
-                  rss_huge: 6291456
-                  hierarchical_memory_limit: 67108864
-                  total_pgfault: 964
-                  total_active_file: 0
-                  active_anon: 6537216
-                  total_active_anon: 6537216
-                  total_pgpgout: 414
-                  total_cache: 0
-                  inactive_anon: 0
-                  active_file: 0
-                  pgfault: 964
-                  inactive_file: 0
-                  total_pgpgin: 477
-                max_usage: 6651904
-                usage: 6537216
-                failcnt: 0
-                limit: 67108864
-              blkio_stats: {}
-              cpu_stats:
-                cpu_usage:
-                  percpu_usage:
-                    - 8646879
-                    - 24472255
-                    - 36438778
-                    - 30657443
-                  usage_in_usermode: 50000000
-                  total_usage: 100215355
-                  usage_in_kernelmode: 30000000
-                system_cpu_usage: 739306590000000
-                online_cpus: 4
-                throttling_data:
-                  periods: 0
-                  throttled_periods: 0
-                  throttled_time: 0
-              precpu_stats:
-                cpu_usage:
-                  percpu_usage:
-                    - 8646879
-                    - 24350896
-                    - 36438778
-                    - 30657443
-                  usage_in_usermode: 50000000
-                  total_usage: 100093996
-                  usage_in_kernelmode: 30000000
-                system_cpu_usage: 9492140000000
-                online_cpus: 4
-                throttling_data:
-                  periods: 0
-                  throttled_periods: 0
-                  throttled_time: 0
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "stream"
-          in: "query"
-          description: "Stream the output. If false, the stats will be output once and then it will disconnect."
-          type: "boolean"
-          default: true
-      tags: ["Container"]
-  /containers/{id}/resize:
-    post:
-      summary: "Resize a container TTY"
-      description: "Resize the TTY for a container. You must restart the container for the resize to take effect."
-      operationId: "ContainerResize"
-      consumes:
-        - "application/octet-stream"
-      produces:
-        - "text/plain"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "cannot resize container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "h"
-          in: "query"
-          description: "Height of the tty session in characters"
-          type: "integer"
-        - name: "w"
-          in: "query"
-          description: "Width of the tty session in characters"
-          type: "integer"
-      tags: ["Container"]
-  /containers/{id}/start:
-    post:
-      summary: "Start a container"
-      operationId: "ContainerStart"
-      responses:
-        204:
-          description: "no error"
-        304:
-          description: "container already started"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "detachKeys"
-          in: "query"
-          description: "Override the key sequence for detaching a container. Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`."
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}/stop:
-    post:
-      summary: "Stop a container"
-      operationId: "ContainerStop"
-      responses:
-        204:
-          description: "no error"
-        304:
-          description: "container already stopped"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "t"
-          in: "query"
-          description: "Number of seconds to wait before killing the container"
-          type: "integer"
-      tags: ["Container"]
-  /containers/{id}/restart:
-    post:
-      summary: "Restart a container"
-      operationId: "ContainerRestart"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "t"
-          in: "query"
-          description: "Number of seconds to wait before killing the container"
-          type: "integer"
-      tags: ["Container"]
-  /containers/{id}/kill:
-    post:
-      summary: "Kill a container"
-      description: "Send a POSIX signal to a container, defaulting to killing to the container."
-      operationId: "ContainerKill"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "signal"
-          in: "query"
-          description: "Signal to send to the container as an integer or string (e.g. `SIGINT`)"
-          type: "string"
-          default: "SIGKILL"
-      tags: ["Container"]
-  /containers/{id}/update:
-    post:
-      summary: "Update a container"
-      description: "Change various configuration options of a container without having to recreate it."
-      operationId: "ContainerUpdate"
-      consumes: ["application/json"]
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "The container has been updated."
-          schema:
-            type: "object"
-            properties:
-              Warnings:
-                type: "array"
-                items:
-                  type: "string"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "update"
-          in: "body"
-          required: true
-          schema:
-            allOf:
-              - $ref: "#/definitions/Resources"
-              - type: "object"
-                properties:
-                  RestartPolicy:
-                    $ref: "#/definitions/RestartPolicy"
-            example:
-              BlkioWeight: 300
-              CpuShares: 512
-              CpuPeriod: 100000
-              CpuQuota: 50000
-              CpuRealtimePeriod: 1000000
-              CpuRealtimeRuntime: 10000
-              CpusetCpus: "0,1"
-              CpusetMems: "0"
-              Memory: 314572800
-              MemorySwap: 514288000
-              MemoryReservation: 209715200
-              KernelMemory: 52428800
-              RestartPolicy:
-                MaximumRetryCount: 4
-                Name: "on-failure"
-      tags: ["Container"]
-  /containers/{id}/rename:
-    post:
-      summary: "Rename a container"
-      operationId: "ContainerRename"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        409:
-          description: "name already in use"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "name"
-          in: "query"
-          required: true
-          description: "New name for the container"
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}/pause:
-    post:
-      summary: "Pause a container"
-      description: |
-        Use the cgroups freezer to suspend all processes in a container.
-
-        Traditionally, when suspending a process the `SIGSTOP` signal is used, which is observable by the process being suspended. With the cgroups freezer the process is unaware, and unable to capture, that it is being suspended, and subsequently resumed.
-      operationId: "ContainerPause"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}/unpause:
-    post:
-      summary: "Unpause a container"
-      description: "Resume a container which has been paused."
-      operationId: "ContainerUnpause"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}/attach:
-    post:
-      summary: "Attach to a container"
-      description: |
-        Attach to a container to read its output or send it input. You can attach to the same container multiple times and you can reattach to containers that have been detached.
-
-        Either the `stream` or `logs` parameter must be `true` for this endpoint to do anything.
-
-        See [the documentation for the `docker attach` command](https://docs.docker.com/engine/reference/commandline/attach/) for more details.
-
-        ### Hijacking
-
-        This endpoint hijacks the HTTP connection to transport `stdin`, `stdout`, and `stderr` on the same socket.
-
-        This is the response from the daemon for an attach request:
-
-        ```
-        HTTP/1.1 200 OK
-        Content-Type: application/vnd.docker.raw-stream
-
-        [STREAM]
-        ```
-
-        After the headers and two new lines, the TCP connection can now be used for raw, bidirectional communication between the client and server.
-
-        To hint potential proxies about connection hijacking, the Docker client can also optionally send connection upgrade headers.
-
-        For example, the client sends this request to upgrade the connection:
-
-        ```
-        POST /containers/16253994b7c4/attach?stream=1&stdout=1 HTTP/1.1
-        Upgrade: tcp
-        Connection: Upgrade
-        ```
-
-        The Docker daemon will respond with a `101 UPGRADED` response, and will similarly follow with the raw stream:
-
-        ```
-        HTTP/1.1 101 UPGRADED
-        Content-Type: application/vnd.docker.raw-stream
-        Connection: Upgrade
-        Upgrade: tcp
-
-        [STREAM]
-        ```
-
-        ### Stream format
-
-        When the TTY setting is disabled in [`POST /containers/create`](#operation/ContainerCreate), the stream over the hijacked connected is multiplexed to separate out `stdout` and `stderr`. The stream consists of a series of frames, each containing a header and a payload.
-
-        The header contains the information which the stream writes (`stdout` or `stderr`). It also contains the size of the associated frame encoded in the last four bytes (`uint32`).
-
-        It is encoded on the first eight bytes like this:
-
-        ```go
-        header := [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}
-        ```
-
-        `STREAM_TYPE` can be:
-
-        - 0: `stdin` (is written on `stdout`)
-        - 1: `stdout`
-        - 2: `stderr`
-
-        `SIZE1, SIZE2, SIZE3, SIZE4` are the four bytes of the `uint32` size encoded as big endian.
-
-        Following the header is the payload, which is the specified number of bytes of `STREAM_TYPE`.
-
-        The simplest way to implement this protocol is the following:
-
-        1. Read 8 bytes.
-        2. Choose `stdout` or `stderr` depending on the first byte.
-        3. Extract the frame size from the last four bytes.
-        4. Read the extracted size and output it on the correct output.
-        5. Goto 1.
-
-        ### Stream format when using a TTY
-
-        When the TTY setting is enabled in [`POST /containers/create`](#operation/ContainerCreate), the stream is not multiplexed. The data exchanged over the hijacked connection is simply the raw data from the process PTY and client's `stdin`.
-
-      operationId: "ContainerAttach"
-      produces:
-        - "application/vnd.docker.raw-stream"
-      responses:
-        101:
-          description: "no error, hints proxy about hijacking"
-        200:
-          description: "no error, no upgrade header found"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "detachKeys"
-          in: "query"
-          description: "Override the key sequence for detaching a container.Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`."
-          type: "string"
-        - name: "logs"
-          in: "query"
-          description: |
-            Replay previous logs from the container.
-
-            This is useful for attaching to a container that has started and you want to output everything since the container started.
-
-            If `stream` is also enabled, once all the previous output has been returned, it will seamlessly transition into streaming current output.
-          type: "boolean"
-          default: false
-        - name: "stream"
-          in: "query"
-          description: "Stream attached streams from the time the request was made onwards"
-          type: "boolean"
-          default: false
-        - name: "stdin"
-          in: "query"
-          description: "Attach to `stdin`"
-          type: "boolean"
-          default: false
-        - name: "stdout"
-          in: "query"
-          description: "Attach to `stdout`"
-          type: "boolean"
-          default: false
-        - name: "stderr"
-          in: "query"
-          description: "Attach to `stderr`"
-          type: "boolean"
-          default: false
-      tags: ["Container"]
-  /containers/{id}/attach/ws:
-    get:
-      summary: "Attach to a container via a websocket"
-      operationId: "ContainerAttachWebsocket"
-      responses:
-        101:
-          description: "no error, hints proxy about hijacking"
-        200:
-          description: "no error, no upgrade header found"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "detachKeys"
-          in: "query"
-          description: "Override the key sequence for detaching a container.Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,`, or `_`."
-          type: "string"
-        - name: "logs"
-          in: "query"
-          description: "Return logs"
-          type: "boolean"
-          default: false
-        - name: "stream"
-          in: "query"
-          description: "Return stream"
-          type: "boolean"
-          default: false
-        - name: "stdin"
-          in: "query"
-          description: "Attach to `stdin`"
-          type: "boolean"
-          default: false
-        - name: "stdout"
-          in: "query"
-          description: "Attach to `stdout`"
-          type: "boolean"
-          default: false
-        - name: "stderr"
-          in: "query"
-          description: "Attach to `stderr`"
-          type: "boolean"
-          default: false
-      tags: ["Container"]
-  /containers/{id}/wait:
-    post:
-      summary: "Wait for a container"
-      description: "Block until a container stops, then returns the exit code."
-      operationId: "ContainerWait"
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "The container has exit."
-          schema:
-            type: "object"
-            required: [StatusCode]
-            properties:
-              StatusCode:
-                description: "Exit code of the container"
-                type: "integer"
-                x-nullable: false
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}:
-    delete:
-      summary: "Remove a container"
-      operationId: "ContainerDelete"
-      responses:
-        204:
-          description: "no error"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        409:
-          description: "conflict"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "You cannot remove a running container: c2ada9df5af8. Stop the container before attempting removal or force remove"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "v"
-          in: "query"
-          description: "Remove the volumes associated with the container."
-          type: "boolean"
-          default: false
-        - name: "force"
-          in: "query"
-          description: "If the container is running, kill it before removing it."
-          type: "boolean"
-          default: false
-        - name: "link"
-          in: "query"
-          description: "Remove the specified link associated with the container."
-          type: "boolean"
-          default: false
-      tags: ["Container"]
-  /containers/{id}/archive:
-    head:
-      summary: "Get information about files in a container"
-      description: "A response header `X-Docker-Container-Path-Stat` is return containing a base64 - encoded JSON object with some filesystem header information about the path."
-      operationId: "ContainerArchiveInfo"
-      responses:
-        200:
-          description: "no error"
-          headers:
-            X-Docker-Container-Path-Stat:
-              type: "string"
-              description: "TODO"
-        400:
-          description: "Bad parameter"
-          schema:
-            allOf:
-              - $ref: "#/definitions/ErrorResponse"
-              - type: "object"
-                properties:
-                  message:
-                    description: "The error message. Either \"must specify path parameter\" (path cannot be empty) or \"not a directory\" (path was asserted to be a directory but exists as a file)."
-                    type: "string"
-                    x-nullable: false
-        404:
-          description: "Container or path does not exist"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "path"
-          in: "query"
-          required: true
-          description: "Resource in the container’s filesystem to archive."
-          type: "string"
-      tags: ["Container"]
-    get:
-      summary: "Get an archive of a filesystem resource in a container"
-      description: "Get a tar archive of a resource in the filesystem of container id."
-      operationId: "ContainerArchive"
-      produces: ["application/x-tar"]
-      responses:
-        200:
-          description: "no error"
-        400:
-          description: "Bad parameter"
-          schema:
-            allOf:
-              - $ref: "#/definitions/ErrorResponse"
-              - type: "object"
-                properties:
-                  message:
-                    description: "The error message. Either \"must specify path parameter\" (path cannot be empty) or \"not a directory\" (path was asserted to be a directory but exists as a file)."
-                    type: "string"
-                    x-nullable: false
-        404:
-          description: "Container or path does not exist"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "path"
-          in: "query"
-          required: true
-          description: "Resource in the container’s filesystem to archive."
-          type: "string"
-      tags: ["Container"]
-    put:
-      summary: "Extract an archive of files or folders to a directory in a container"
-      description: "Upload a tar archive to be extracted to a path in the filesystem of container id."
-      operationId: "PutContainerArchive"
-      consumes: ["application/x-tar", "application/octet-stream"]
-      responses:
-        200:
-          description: "The content was extracted successfully"
-        400:
-          description: "Bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        403:
-          description: "Permission denied, the volume or container rootfs is marked as read-only."
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "No such container or path does not exist inside the container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "path"
-          in: "query"
-          required: true
-          description: "Path to a directory in the container to extract the archive’s contents into. "
-          type: "string"
-        - name: "noOverwriteDirNonDir"
-          in: "query"
-          description: "If “1”, “true”, or “True” then it will be an error if unpacking the given content would cause an existing directory to be replaced with a non-directory and vice versa."
-          type: "string"
-        - name: "inputStream"
-          in: "body"
-          required: true
-          description: "The input stream must be a tar archive compressed with one of the following algorithms: identity (no compression), gzip, bzip2, xz."
-          schema:
-            type: "string"
-      tags: ["Container"]
-  /containers/prune:
-    post:
-      summary: "Delete stopped containers"
-      produces:
-        - "application/json"
-      operationId: "ContainerPrune"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            Filters to process on the prune list, encoded as JSON (a `map[string][]string`).
-
-            Available filters:
-            - `until=<timestamp>` Prune containers created before this timestamp. The `<timestamp>` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time.
-            - `label` (`label=<key>`, `label=<key>=<value>`, `label!=<key>`, or `label!=<key>=<value>`) Prune containers with (or without, in case `label!=...` is used) the specified labels.
-          type: "string"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              ContainersDeleted:
-                description: "Container IDs that were deleted"
-                type: "array"
-                items:
-                  type: "string"
-              SpaceReclaimed:
-                description: "Disk space reclaimed in bytes"
-                type: "integer"
-                format: "int64"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Container"]
-  /images/json:
-    get:
-      summary: "List Images"
-      description: "Returns a list of images on the server. Note that it uses a different, smaller representation of an image than inspecting a single image."
-      operationId: "ImageList"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "Summary image data for the images matching the query"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/ImageSummary"
-          examples:
-            application/json:
-              - Id: "sha256:e216a057b1cb1efc11f8a268f37ef62083e70b1b38323ba252e25ac88904a7e8"
-                ParentId: ""
-                RepoTags:
-                  - "ubuntu:12.04"
-                  - "ubuntu:precise"
-                RepoDigests:
-                  - "ubuntu@sha256:992069aee4016783df6345315302fa59681aae51a8eeb2f889dea59290f21787"
-                Created: 1474925151
-                Size: 103579269
-                VirtualSize: 103579269
-                SharedSize: 0
-                Labels: {}
-                Containers: 2
-              - Id: "sha256:3e314f95dcace0f5e4fd37b10862fe8398e3c60ed36600bc0ca5fda78b087175"
-                ParentId: ""
-                RepoTags:
-                  - "ubuntu:12.10"
-                  - "ubuntu:quantal"
-                RepoDigests:
-                  - "ubuntu@sha256:002fba3e3255af10be97ea26e476692a7ebed0bb074a9ab960b2e7a1526b15d7"
-                  - "ubuntu@sha256:68ea0200f0b90df725d99d823905b04cf844f6039ef60c60bf3e019915017bd3"
-                Created: 1403128455
-                Size: 172064416
-                VirtualSize: 172064416
-                SharedSize: 0
-                Labels: {}
-                Containers: 5
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "all"
-          in: "query"
-          description: "Show all images. Only images from a final layer (no children) are shown by default."
-          type: "boolean"
-          default: false
-        - name: "filters"
-          in: "query"
-          description: |
-            A JSON encoded value of the filters (a `map[string][]string`) to process on the images list. Available filters:
-
-            - `before`=(`<image-name>[:<tag>]`,  `<image id>` or `<image@digest>`)
-            - `dangling=true`
-            - `label=key` or `label="key=value"` of an image label
-            - `reference`=(`<image-name>[:<tag>]`)
-            - `since`=(`<image-name>[:<tag>]`,  `<image id>` or `<image@digest>`)
-          type: "string"
-        - name: "digests"
-          in: "query"
-          description: "Show digest information as a `RepoDigests` field on each image."
-          type: "boolean"
-          default: false
-      tags: ["Image"]
-  /build:
-    post:
-      summary: "Build an image"
-      description: |
-        Build an image from a tar archive with a `Dockerfile` in it.
-
-        The `Dockerfile` specifies how the image is built from the tar archive. It is typically in the archive's root, but can be at a different path or have a different name by specifying the `dockerfile` parameter. [See the `Dockerfile` reference for more information](https://docs.docker.com/engine/reference/builder/).
-
-        The Docker daemon performs a preliminary validation of the `Dockerfile` before starting the build, and returns an error if the syntax is incorrect. After that, each instruction is run one-by-one until the ID of the new image is output.
-
-        The build is canceled if the client drops the connection by quitting or being killed.
-      operationId: "ImageBuild"
-      consumes:
-        - "application/octet-stream"
-      produces:
-        - "application/json"
-      parameters:
-        - name: "inputStream"
-          in: "body"
-          description: "A tar archive compressed with one of the following algorithms: identity (no compression), gzip, bzip2, xz."
-          schema:
-            type: "string"
-            format: "binary"
-        - name: "dockerfile"
-          in: "query"
-          description: "Path within the build context to the `Dockerfile`. This is ignored if `remote` is specified and points to an external `Dockerfile`."
-          type: "string"
-          default: "Dockerfile"
-        - name: "t"
-          in: "query"
-          description: "A name and optional tag to apply to the image in the `name:tag` format. If you omit the tag the default `latest` value is assumed. You can provide several `t` parameters."
-          type: "string"
-        - name: "extrahosts"
-          in: "query"
-          description: "Extra hosts to add to /etc/hosts"
-          type: "string"
-        - name: "remote"
-          in: "query"
-          description: "A Git repository URI or HTTP/HTTPS context URI. If the URI points to a single text file, the file’s contents are placed into a file called `Dockerfile` and the image is built from that file. If the URI points to a tarball, the file is downloaded by the daemon and the contents therein used as the context for the build. If the URI points to a tarball and the `dockerfile` parameter is also specified, there must be a file with the corresponding path inside the tarball."
-          type: "string"
-        - name: "q"
-          in: "query"
-          description: "Suppress verbose build output."
-          type: "boolean"
-          default: false
-        - name: "nocache"
-          in: "query"
-          description: "Do not use the cache when building the image."
-          type: "boolean"
-          default: false
-        - name: "cachefrom"
-          in: "query"
-          description: "JSON array of images used for build cache resolution."
-          type: "string"
-        - name: "pull"
-          in: "query"
-          description: "Attempt to pull the image even if an older image exists locally."
-          type: "string"
-        - name: "rm"
-          in: "query"
-          description: "Remove intermediate containers after a successful build."
-          type: "boolean"
-          default: true
-        - name: "forcerm"
-          in: "query"
-          description: "Always remove intermediate containers, even upon failure."
-          type: "boolean"
-          default: false
-        - name: "memory"
-          in: "query"
-          description: "Set memory limit for build."
-          type: "integer"
-        - name: "memswap"
-          in: "query"
-          description: "Total memory (memory + swap). Set as `-1` to disable swap."
-          type: "integer"
-        - name: "cpushares"
-          in: "query"
-          description: "CPU shares (relative weight)."
-          type: "integer"
-        - name: "cpusetcpus"
-          in: "query"
-          description: "CPUs in which to allow execution (e.g., `0-3`, `0,1`)."
-          type: "string"
-        - name: "cpuperiod"
-          in: "query"
-          description: "The length of a CPU period in microseconds."
-          type: "integer"
-        - name: "cpuquota"
-          in: "query"
-          description: "Microseconds of CPU time that the container can get in a CPU period."
-          type: "integer"
-        - name: "buildargs"
-          in: "query"
-          description: "JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker uses the buildargs as the environment context for commands run via the `Dockerfile` RUN instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for passing secret values. [Read more about the buildargs instruction.](https://docs.docker.com/engine/reference/builder/#arg)"
-          type: "integer"
-        - name: "shmsize"
-          in: "query"
-          description: "Size of `/dev/shm` in bytes. The size must be greater than 0. If omitted the system uses 64MB."
-          type: "integer"
-        - name: "squash"
-          in: "query"
-          description: "Squash the resulting images layers into a single layer. *(Experimental release only.)*"
-          type: "boolean"
-        - name: "labels"
-          in: "query"
-          description: "Arbitrary key/value labels to set on the image, as a JSON map of string pairs."
-          type: "string"
-        - name: "networkmode"
-          in: "query"
-          description: "Sets the networking mode for the run commands during
-        build. Supported standard values are: `bridge`, `host`, `none`, and
-        `container:<name|id>`. Any other value is taken as a custom network's
-        name to which this container should connect to."
-          type: "string"
-        - name: "Content-type"
-          in: "header"
-          type: "string"
-          enum:
-            - "application/x-tar"
-          default: "application/x-tar"
-        - name: "X-Registry-Config"
-          in: "header"
-          description: |
-            This is a base64-encoded JSON object with auth configurations for multiple registries that a build may refer to.
-
-            The key is a registry URL, and the value is an auth configuration object, [as described in the authentication section](#section/Authentication). For example:
-
-            ```
-            {
-              "docker.example.com": {
-                "username": "janedoe",
-                "password": "hunter2"
-              },
-              "https://index.docker.io/v1/": {
-                "username": "mobydock",
-                "password": "conta1n3rize14"
-              }
-            }
-            ```
-
-            Only the registry domain name (and port if not the default 443) are required. However, for legacy reasons, the Docker Hub registry must be specified with both a `https://` prefix and a `/v1/` suffix even though Docker will prefer to use the v2 registry API.
-          type: "string"
-      responses:
-        200:
-          description: "no error"
-        400:
-          description: "Bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Image"]
-  /images/create:
-    post:
-      summary: "Create an image"
-      description: "Create an image by either pulling it from a registry or importing it."
-      operationId: "ImageCreate"
-      consumes:
-        - "text/plain"
-        - "application/octet-stream"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "repository does not exist or no read access"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "fromImage"
-          in: "query"
-          description: "Name of the image to pull. The name may include a tag or digest. This parameter may only be used when pulling an image. The pull is cancelled if the HTTP connection is closed."
-          type: "string"
-        - name: "fromSrc"
-          in: "query"
-          description: "Source to import. The value may be a URL from which the image can be retrieved or `-` to read the image from the request body. This parameter may only be used when importing an image."
-          type: "string"
-        - name: "repo"
-          in: "query"
-          description: "Repository name given to an image when it is imported. The repo may include a tag. This parameter may only be used when importing an image."
-          type: "string"
-        - name: "tag"
-          in: "query"
-          description: "Tag or digest. If empty when pulling an image, this causes all tags for the given image to be pulled."
-          type: "string"
-        - name: "inputImage"
-          in: "body"
-          description: "Image content if the value `-` has been specified in fromSrc query parameter"
-          schema:
-            type: "string"
-          required: false
-        - name: "X-Registry-Auth"
-          in: "header"
-          description: "A base64-encoded auth configuration. [See the authentication section for details.](#section/Authentication)"
-          type: "string"
-      tags: ["Image"]
-  /images/{name}/json:
-    get:
-      summary: "Inspect an image"
-      description: "Return low-level information about an image."
-      operationId: "ImageInspect"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            $ref: "#/definitions/Image"
-          examples:
-            application/json:
-              Id: "sha256:85f05633ddc1c50679be2b16a0479ab6f7637f8884e0cfe0f4d20e1ebb3d6e7c"
-              Container: "cb91e48a60d01f1e27028b4fc6819f4f290b3cf12496c8176ec714d0d390984a"
-              Comment: ""
-              Os: "linux"
-              Architecture: "amd64"
-              Parent: "sha256:91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c"
-              ContainerConfig:
-                Tty: false
-                Hostname: "e611e15f9c9d"
-                Domainname: ""
-                AttachStdout: false
-                PublishService: ""
-                AttachStdin: false
-                OpenStdin: false
-                StdinOnce: false
-                NetworkDisabled: false
-                OnBuild: []
-                Image: "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c"
-                User: ""
-                WorkingDir: ""
-                MacAddress: ""
-                AttachStderr: false
-                Labels:
-                  com.example.license: "GPL"
-                  com.example.version: "1.0"
-                  com.example.vendor: "Acme"
-                Env:
-                  - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-                Cmd:
-                  - "/bin/sh"
-                  - "-c"
-                  - "#(nop) LABEL com.example.vendor=Acme com.example.license=GPL com.example.version=1.0"
-              DockerVersion: "1.9.0-dev"
-              VirtualSize: 188359297
-              Size: 0
-              Author: ""
-              Created: "2015-09-10T08:30:53.26995814Z"
-              GraphDriver:
-                Name: "aufs"
-                Data: {}
-              RepoDigests:
-                - "localhost:5000/test/busybox/example@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-              RepoTags:
-                - "example:1.0"
-                - "example:latest"
-                - "example:stable"
-              Config:
-                Image: "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c"
-                NetworkDisabled: false
-                OnBuild: []
-                StdinOnce: false
-                PublishService: ""
-                AttachStdin: false
-                OpenStdin: false
-                Domainname: ""
-                AttachStdout: false
-                Tty: false
-                Hostname: "e611e15f9c9d"
-                Cmd:
-                  - "/bin/bash"
-                Env:
-                  - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-                Labels:
-                  com.example.vendor: "Acme"
-                  com.example.version: "1.0"
-                  com.example.license: "GPL"
-                MacAddress: ""
-                AttachStderr: false
-                WorkingDir: ""
-                User: ""
-              RootFS:
-                Type: "layers"
-                Layers:
-                  - "sha256:1834950e52ce4d5a88a1bbd131c537f4d0e56d10ff0dd69e66be3b7dfa9df7e6"
-                  - "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
-        404:
-          description: "No such image"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such image: someimage (tag: latest)"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "Image name or id"
-          type: "string"
-          required: true
-      tags: ["Image"]
-  /images/{name}/history:
-    get:
-      summary: "Get the history of an image"
-      description: "Return parent layers of an image."
-      operationId: "ImageHistory"
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "List of image layers"
-          schema:
-            type: "array"
-            items:
-              type: "object"
-              x-go-name: HistoryResponseItem
-              required: [Id, Created, CreatedBy, Tags, Size, Comment]
-              properties:
-                Id:
-                  type: "string"
-                  x-nullable: false
-                Created:
-                  type: "integer"
-                  format: "int64"
-                  x-nullable: false
-                CreatedBy:
-                  type: "string"
-                  x-nullable: false
-                Tags:
-                  type: "array"
-                  items:
-                    type: "string"
-                Size:
-                  type: "integer"
-                  format: "int64"
-                  x-nullable: false
-                Comment:
-                  type: "string"
-                  x-nullable: false
-          examples:
-            application/json:
-              - Id: "3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710"
-                Created: 1398108230
-                CreatedBy: "/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /"
-                Tags:
-                  - "ubuntu:lucid"
-                  - "ubuntu:10.04"
-                Size: 182964289
-                Comment: ""
-              - Id: "6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8"
-                Created: 1398108222
-                CreatedBy: "/bin/sh -c #(nop) MAINTAINER Tianon Gravi <admwiggin@gmail.com> - mkimage-debootstrap.sh -i iproute,iputils-ping,ubuntu-minimal -t lucid.tar.xz lucid http://archive.ubuntu.com/ubuntu/"
-                Tags: []
-                Size: 0
-                Comment: ""
-              - Id: "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158"
-                Created: 1371157430
-                CreatedBy: ""
-                Tags:
-                  - "scratch12:latest"
-                  - "scratch:latest"
-                Size: 0
-                Comment: "Imported from -"
-        404:
-          description: "No such image"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "Image name or ID"
-          type: "string"
-          required: true
-      tags: ["Image"]
-  /images/{name}/push:
-    post:
-      summary: "Push an image"
-      description: |
-        Push an image to a registry.
-
-        If you wish to push an image on to a private registry, that image must already have a tag which references the registry. For example, `registry.example.com/myimage:latest`.
-
-        The push is cancelled if the HTTP connection is closed.
-      operationId: "ImagePush"
-      consumes:
-        - "application/octet-stream"
-      responses:
-        200:
-          description: "No error"
-        404:
-          description: "No such image"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "Image name or ID."
-          type: "string"
-          required: true
-        - name: "tag"
-          in: "query"
-          description: "The tag to associate with the image on the registry."
-          type: "string"
-        - name: "X-Registry-Auth"
-          in: "header"
-          description: "A base64-encoded auth configuration. [See the authentication section for details.](#section/Authentication)"
-          type: "string"
-          required: true
-      tags: ["Image"]
-  /images/{name}/tag:
-    post:
-      summary: "Tag an image"
-      description: "Tag an image so that it becomes part of a repository."
-      operationId: "ImageTag"
-      responses:
-        201:
-          description: "No error"
-        400:
-          description: "Bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "No such image"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "Conflict"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "Image name or ID to tag."
-          type: "string"
-          required: true
-        - name: "repo"
-          in: "query"
-          description: "The repository to tag in. For example, `someuser/someimage`."
-          type: "string"
-        - name: "tag"
-          in: "query"
-          description: "The name of the new tag."
-          type: "string"
-      tags: ["Image"]
-  /images/{name}:
-    delete:
-      summary: "Remove an image"
-      description: |
-        Remove an image, along with any untagged parent images that were
-        referenced by that image.
-
-        Images can't be removed if they have descendant images, are being
-        used by a running container or are being used by a build.
-      operationId: "ImageDelete"
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "The image was deleted successfully"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/ImageDeleteResponseItem"
-          examples:
-            application/json:
-              - Untagged: "3e2f21a89f"
-              - Deleted: "3e2f21a89f"
-              - Deleted: "53b4f83ac9"
-        404:
-          description: "No such image"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "Conflict"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "Image name or ID"
-          type: "string"
-          required: true
-        - name: "force"
-          in: "query"
-          description: "Remove the image even if it is being used by stopped containers or has other tags"
-          type: "boolean"
-          default: false
-        - name: "noprune"
-          in: "query"
-          description: "Do not delete untagged parent images"
-          type: "boolean"
-          default: false
-      tags: ["Image"]
-  /images/search:
-    get:
-      summary: "Search images"
-      description: "Search for an image on Docker Hub."
-      operationId: "ImageSearch"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "array"
-            items:
-              type: "object"
-              properties:
-                description:
-                  type: "string"
-                is_official:
-                  type: "boolean"
-                is_automated:
-                  type: "boolean"
-                name:
-                  type: "string"
-                star_count:
-                  type: "integer"
-          examples:
-            application/json:
-              - description: ""
-                is_official: false
-                is_automated: false
-                name: "wma55/u1210sshd"
-                star_count: 0
-              - description: ""
-                is_official: false
-                is_automated: false
-                name: "jdswinbank/sshd"
-                star_count: 0
-              - description: ""
-                is_official: false
-                is_automated: false
-                name: "vgauthier/sshd"
-                star_count: 0
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "term"
-          in: "query"
-          description: "Term to search"
-          type: "string"
-          required: true
-        - name: "limit"
-          in: "query"
-          description: "Maximum number of results to return"
-          type: "integer"
-        - name: "filters"
-          in: "query"
-          description: |
-            A JSON encoded value of the filters (a `map[string][]string`) to process on the images list. Available filters:
-
-            - `is-automated=(true|false)`
-            - `is-official=(true|false)`
-            - `stars=<number>` Matches images that has at least 'number' stars.
-          type: "string"
-      tags: ["Image"]
-  /images/prune:
-    post:
-      summary: "Delete unused images"
-      produces:
-        - "application/json"
-      operationId: "ImagePrune"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            Filters to process on the prune list, encoded as JSON (a `map[string][]string`). Available filters:
-
-            - `dangling=<boolean>` When set to `true` (or `1`), prune only
-               unused *and* untagged images. When set to `false`
-               (or `0`), all unused images are pruned.
-            - `until=<string>` Prune images created before this timestamp. The `<timestamp>` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time.
-            - `label` (`label=<key>`, `label=<key>=<value>`, `label!=<key>`, or `label!=<key>=<value>`) Prune images with (or without, in case `label!=...` is used) the specified labels.
-          type: "string"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              ImagesDeleted:
-                description: "Images that were deleted"
-                type: "array"
-                items:
-                  $ref: "#/definitions/ImageDeleteResponseItem"
-              SpaceReclaimed:
-                description: "Disk space reclaimed in bytes"
-                type: "integer"
-                format: "int64"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Image"]
-  /auth:
-    post:
-      summary: "Check auth configuration"
-      description: "Validate credentials for a registry and, if available, get an identity token for accessing the registry without password."
-      operationId: "SystemAuth"
-      consumes: ["application/json"]
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "An identity token was generated successfully."
-          schema:
-            type: "object"
-            required: [Status]
-            properties:
-              Status:
-                description: "The status of the authentication"
-                type: "string"
-                x-nullable: false
-              IdentityToken:
-                description: "An opaque token used to authenticate a user after a successful login"
-                type: "string"
-                x-nullable: false
-          examples:
-            application/json:
-              Status: "Login Succeeded"
-              IdentityToken: "9cbaf023786cd7..."
-        204:
-          description: "No error"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "authConfig"
-          in: "body"
-          description: "Authentication to check"
-          schema:
-            $ref: "#/definitions/AuthConfig"
-      tags: ["System"]
-  /info:
-    get:
-      summary: "Get system information"
-      operationId: "SystemInfo"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              Architecture:
-                type: "string"
-              Containers:
-                type: "integer"
-              ContainersRunning:
-                type: "integer"
-              ContainersStopped:
-                type: "integer"
-              ContainersPaused:
-                type: "integer"
-              CpuCfsPeriod:
-                type: "boolean"
-              CpuCfsQuota:
-                type: "boolean"
-              Debug:
-                type: "boolean"
-              DiscoveryBackend:
-                type: "string"
-              DockerRootDir:
-                type: "string"
-              Driver:
-                type: "string"
-              DriverStatus:
-                type: "array"
-                items:
-                  type: "array"
-                  items:
-                    type: "string"
-              SystemStatus:
-                type: "array"
-                items:
-                  type: "array"
-                  items:
-                    type: "string"
-              Plugins:
-                type: "object"
-                properties:
-                  Volume:
-                    type: "array"
-                    items:
-                      type: "string"
-                  Network:
-                    type: "array"
-                    items:
-                      type: "string"
-              ExperimentalBuild:
-                type: "boolean"
-              HttpProxy:
-                type: "string"
-              HttpsProxy:
-                type: "string"
-              ID:
-                type: "string"
-              IPv4Forwarding:
-                type: "boolean"
-              Images:
-                type: "integer"
-              IndexServerAddress:
-                type: "string"
-              InitPath:
-                type: "string"
-              InitSha1:
-                type: "string"
-              KernelVersion:
-                type: "string"
-              Labels:
-                type: "array"
-                items:
-                  type: "string"
-              MemTotal:
-                type: "integer"
-              MemoryLimit:
-                type: "boolean"
-              NCPU:
-                type: "integer"
-              NEventsListener:
-                type: "integer"
-              NFd:
-                type: "integer"
-              NGoroutines:
-                type: "integer"
-              Name:
-                type: "string"
-              NoProxy:
-                type: "string"
-              OomKillDisable:
-                type: "boolean"
-              OSType:
-                type: "string"
-              OomScoreAdj:
-                type: "integer"
-              OperatingSystem:
-                type: "string"
-              RegistryConfig:
-                type: "object"
-                properties:
-                  IndexConfigs:
-                    type: "object"
-                    additionalProperties:
-                      type: "object"
-                      properties:
-                        Mirrors:
-                          type: "array"
-                          items:
-                            type: "string"
-                        Name:
-                          type: "string"
-                        Official:
-                          type: "boolean"
-                        Secure:
-                          type: "boolean"
-                  InsecureRegistryCIDRs:
-                    type: "array"
-                    items:
-                      type: "string"
-              SwapLimit:
-                type: "boolean"
-              SystemTime:
-                type: "string"
-              ServerVersion:
-                type: "string"
-          examples:
-            application/json:
-              Architecture: "x86_64"
-              ClusterStore: "etcd://localhost:2379"
-              CgroupDriver: "cgroupfs"
-              Containers: 11
-              ContainersRunning: 7
-              ContainersStopped: 3
-              ContainersPaused: 1
-              CpuCfsPeriod: true
-              CpuCfsQuota: true
-              Debug: false
-              DockerRootDir: "/var/lib/docker"
-              Driver: "btrfs"
-              DriverStatus:
-                -
-                  - ""
-              ExperimentalBuild: false
-              HttpProxy: "http://test:test@localhost:8080"
-              HttpsProxy: "https://test:test@localhost:8080"
-              ID: "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS"
-              IPv4Forwarding: true
-              Images: 16
-              IndexServerAddress: "https://index.docker.io/v1/"
-              InitPath: "/usr/bin/docker"
-              InitSha1: ""
-              KernelMemory: true
-              KernelVersion: "3.12.0-1-amd64"
-              Labels:
-                - "storage=ssd"
-              MemTotal: 2099236864
-              MemoryLimit: true
-              NCPU: 1
-              NEventsListener: 0
-              NFd: 11
-              NGoroutines: 21
-              Name: "prod-server-42"
-              NoProxy: "9.81.1.160"
-              OomKillDisable: true
-              OSType: "linux"
-              OperatingSystem: "Boot2Docker"
-              Plugins:
-                Volume:
-                  - "local"
-                Network:
-                  - "null"
-                  - "host"
-                  - "bridge"
-              RegistryConfig:
-                IndexConfigs:
-                  docker.io:
-                    Name: "docker.io"
-                    Official: true
-                    Secure: true
-                InsecureRegistryCIDRs:
-                  - "127.0.0.0/8"
-              SecurityOptions:
-                - Key: "Name"
-                  Value: "seccomp"
-                - Key: "Profile"
-                  Value: "default"
-                - Key: "Name"
-                  Value: "apparmor"
-                - Key: "Name"
-                  Value: "selinux"
-                - Key: "Name"
-                  Value: "userns"
-              ServerVersion: "1.9.0"
-              SwapLimit: false
-              SystemStatus:
-                -
-                  - "State"
-                  - "Healthy"
-              SystemTime: "2015-03-10T11:11:23.730591467-07:00"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["System"]
-  /version:
-    get:
-      summary: "Get version"
-      description: "Returns the version of Docker that is running and various information about the system that Docker is running on."
-      operationId: "SystemVersion"
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              Version:
-                type: "string"
-              ApiVersion:
-                type: "string"
-              MinAPIVersion:
-                type: "string"
-              GitCommit:
-                type: "string"
-              GoVersion:
-                type: "string"
-              Os:
-                type: "string"
-              Arch:
-                type: "string"
-              KernelVersion:
-                type: "string"
-              Experimental:
-                type: "boolean"
-              BuildTime:
-                type: "string"
-          examples:
-            application/json:
-              Version: "17.04.0"
-              Os: "linux"
-              KernelVersion: "3.19.0-23-generic"
-              GoVersion: "go1.7.5"
-              GitCommit: "deadbee"
-              Arch: "amd64"
-              ApiVersion: "1.27"
-              MinAPIVersion: "1.12"
-              BuildTime: "2016-06-14T07:09:13.444803460+00:00"
-              Experimental: true
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["System"]
-  /_ping:
-    get:
-      summary: "Ping"
-      description: "This is a dummy endpoint you can use to test if the server is accessible."
-      operationId: "SystemPing"
-      produces: ["text/plain"]
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "string"
-            example: "OK"
-          headers:
-            API-Version:
-              type: "string"
-              description: "Max API Version the server supports"
-            Docker-Experimental:
-              type: "boolean"
-              description: "If the server is running with experimental mode enabled"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["System"]
-  /commit:
-    post:
-      summary: "Create a new image from a container"
-      operationId: "ImageCommit"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      responses:
-        201:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/IdResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "containerConfig"
-          in: "body"
-          description: "The container configuration"
-          schema:
-            $ref: "#/definitions/Config"
-        - name: "container"
-          in: "query"
-          description: "The ID or name of the container to commit"
-          type: "string"
-        - name: "repo"
-          in: "query"
-          description: "Repository name for the created image"
-          type: "string"
-        - name: "tag"
-          in: "query"
-          description: "Tag name for the create image"
-          type: "string"
-        - name: "comment"
-          in: "query"
-          description: "Commit message"
-          type: "string"
-        - name: "author"
-          in: "query"
-          description: "Author of the image (e.g., `John Hannibal Smith <hannibal@a-team.com>`)"
-          type: "string"
-        - name: "pause"
-          in: "query"
-          description: "Whether to pause the container before committing"
-          type: "boolean"
-          default: true
-        - name: "changes"
-          in: "query"
-          description: "`Dockerfile` instructions to apply while committing"
-          type: "string"
-      tags: ["Image"]
-  /events:
-    get:
-      summary: "Monitor events"
-      description: |
-        Stream real-time events from the server.
-
-        Various objects within Docker report events when something happens to them.
-
-        Containers report these events: `attach, commit, copy, create, destroy, detach, die, exec_create, exec_detach, exec_start, export, health_status, kill, oom, pause, rename, resize, restart, start, stop, top, unpause, update`
-
-        Images report these events: `delete, import, load, pull, push, save, tag, untag`
-
-        Volumes report these events: `create, mount, unmount, destroy`
-
-        Networks report these events: `create, connect, disconnect, destroy`
-
-        The Docker daemon reports these events: `reload`
-
-      operationId: "SystemEvents"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              Type:
-                description: "The type of object emitting the event"
-                type: "string"
-              Action:
-                description: "The type of event"
-                type: "string"
-              Actor:
-                type: "object"
-                properties:
-                  ID:
-                    description: "The ID of the object emitting the event"
-                    type: "string"
-                  Attributes:
-                    description: "Various key/value attributes of the object, depending on its type"
-                    type: "object"
-                    additionalProperties:
-                      type: "string"
-              time:
-                description: "Timestamp of event"
-                type: "integer"
-              timeNano:
-                description: "Timestamp of event, with nanosecond accuracy"
-                type: "integer"
-                format: "int64"
-          examples:
-            application/json:
-              Type: "container"
-              Action: "create"
-              Actor:
-                ID: "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743"
-                Attributes:
-                  com.example.some-label: "some-label-value"
-                  image: "alpine"
-                  name: "my-container"
-              time: 1461943101
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "since"
-          in: "query"
-          description: "Show events created since this timestamp then stream new events."
-          type: "string"
-        - name: "until"
-          in: "query"
-          description: "Show events created until this timestamp then stop streaming."
-          type: "string"
-        - name: "filters"
-          in: "query"
-          description: |
-            A JSON encoded value of filters (a `map[string][]string`) to process on the event list. Available filters:
-
-            - `container=<string>` container name or ID
-            - `daemon=<string>` daemon name or ID
-            - `event=<string>` event type
-            - `image=<string>` image name or ID
-            - `label=<string>` image or container label
-            - `network=<string>` network name or ID
-            - `plugin`=<string> plugin name or ID
-            - `type=<string>` object to filter by, one of `container`, `image`, `volume`, `network`, or `daemon`
-            - `volume=<string>` volume name or ID
-          type: "string"
-      tags: ["System"]
-  /system/df:
-    get:
-      summary: "Get data usage information"
-      operationId: "SystemDataUsage"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              LayersSize:
-                type: "integer"
-                format: "int64"
-              Images:
-                type: "array"
-                items:
-                  $ref: "#/definitions/ImageSummary"
-              Containers:
-                type: "array"
-                items:
-                  $ref: "#/definitions/ContainerSummary"
-              Volumes:
-                type: "array"
-                items:
-                  $ref: "#/definitions/Volume"
-            example:
-              LayersSize: 1092588
-              Images:
-                -
-                  Id: "sha256:2b8fd9751c4c0f5dd266fcae00707e67a2545ef34f9a29354585f93dac906749"
-                  ParentId: ""
-                  RepoTags:
-                    - "busybox:latest"
-                  RepoDigests:
-                    - "busybox@sha256:a59906e33509d14c036c8678d687bd4eec81ed7c4b8ce907b888c607f6a1e0e6"
-                  Created: 1466724217
-                  Size: 1092588
-                  SharedSize: 0
-                  VirtualSize: 1092588
-                  Labels: {}
-                  Containers: 1
-              Containers:
-                -
-                  Id: "e575172ed11dc01bfce087fb27bee502db149e1a0fad7c296ad300bbff178148"
-                  Names:
-                    - "/top"
-                  Image: "busybox"
-                  ImageID: "sha256:2b8fd9751c4c0f5dd266fcae00707e67a2545ef34f9a29354585f93dac906749"
-                  Command: "top"
-                  Created: 1472592424
-                  Ports: []
-                  SizeRootFs: 1092588
-                  Labels: {}
-                  State: "exited"
-                  Status: "Exited (0) 56 minutes ago"
-                  HostConfig:
-                    NetworkMode: "default"
-                  NetworkSettings:
-                    Networks:
-                      bridge:
-                        IPAMConfig: null
-                        Links: null
-                        Aliases: null
-                        NetworkID: "d687bc59335f0e5c9ee8193e5612e8aee000c8c62ea170cfb99c098f95899d92"
-                        EndpointID: "8ed5115aeaad9abb174f68dcf135b49f11daf597678315231a32ca28441dec6a"
-                        Gateway: "172.18.0.1"
-                        IPAddress: "172.18.0.2"
-                        IPPrefixLen: 16
-                        IPv6Gateway: ""
-                        GlobalIPv6Address: ""
-                        GlobalIPv6PrefixLen: 0
-                        MacAddress: "02:42:ac:12:00:02"
-                  Mounts: []
-              Volumes:
-                -
-                  Name: "my-volume"
-                  Driver: "local"
-                  Mountpoint: ""
-                  Labels: null
-                  Scope: ""
-                  Options: null
-                  UsageData:
-                    Size: 0
-                    RefCount: 0
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["System"]
-  /images/{name}/get:
-    get:
-      summary: "Export an image"
-      description: |
-        Get a tarball containing all images and metadata for a repository.
-
-        If `name` is a specific name and tag (e.g. `ubuntu:latest`), then only that image (and its parents) are returned. If `name` is an image ID, similarly only that image (and its parents) are returned, but with the exclusion of the `repositories` file in the tarball, as there were no image names referenced.
-
-        ### Image tarball format
-
-        An image tarball contains one directory per image layer (named using its long ID), each containing these files:
-
-        - `VERSION`: currently `1.0` - the file format version
-        - `json`: detailed layer information, similar to `docker inspect layer_id`
-        - `layer.tar`: A tarfile containing the filesystem changes in this layer
-
-        The `layer.tar` file contains `aufs` style `.wh..wh.aufs` files and directories for storing attribute changes and deletions.
-
-        If the tarball defines a repository, the tarball should also include a `repositories` file at the root that contains a list of repository and tag names mapped to layer IDs.
-
-        ```json
-        {
-          "hello-world": {
-            "latest": "565a9d68a73f6706862bfe8409a7f659776d4d60a8d096eb4a3cbce6999cc2a1"
-          }
-        }
-        ```
-      operationId: "ImageGet"
-      produces:
-        - "application/x-tar"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "string"
-            format: "binary"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "Image name or ID"
-          type: "string"
-          required: true
-      tags: ["Image"]
-  /images/get:
-    get:
-      summary: "Export several images"
-      description: |
-        Get a tarball containing all images and metadata for several image repositories.
-
-        For each value of the `names` parameter: if it is a specific name and tag (e.g. `ubuntu:latest`), then only that image (and its parents) are returned; if it is an image ID, similarly only that image (and its parents) are returned and there would be no names referenced in the 'repositories' file for this image ID.
-
-        For details on the format, see [the export image endpoint](#operation/ImageGet).
-      operationId: "ImageGetAll"
-      produces:
-        - "application/x-tar"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "string"
-            format: "binary"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "names"
-          in: "query"
-          description: "Image names to filter by"
-          type: "array"
-          items:
-            type: "string"
-      tags: ["Image"]
-  /images/load:
-    post:
-      summary: "Import images"
-      description: |
-        Load a set of images and tags into a repository.
-
-        For details on the format, see [the export image endpoint](#operation/ImageGet).
-      operationId: "ImageLoad"
-      consumes:
-        - "application/x-tar"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "imagesTarball"
-          in: "body"
-          description: "Tar archive containing images"
-          schema:
-            type: "string"
-            format: "binary"
-        - name: "quiet"
-          in: "query"
-          description: "Suppress progress details during load."
-          type: "boolean"
-          default: false
-      tags: ["Image"]
-  /containers/{id}/exec:
-    post:
-      summary: "Create an exec instance"
-      description: "Run a command inside a running container."
-      operationId: "ContainerExec"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      responses:
-        201:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/IdResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        409:
-          description: "container is paused"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "execConfig"
-          in: "body"
-          description: "Exec configuration"
-          schema:
-            type: "object"
-            properties:
-              AttachStdin:
-                type: "boolean"
-                description: "Attach to `stdin` of the exec command."
-              AttachStdout:
-                type: "boolean"
-                description: "Attach to `stdout` of the exec command."
-              AttachStderr:
-                type: "boolean"
-                description: "Attach to `stderr` of the exec command."
-              DetachKeys:
-                type: "string"
-                description: "Override the key sequence for detaching a container. Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`."
-              Tty:
-                type: "boolean"
-                description: "Allocate a pseudo-TTY."
-              Env:
-                description: "A list of environment variables in the form `[\"VAR=value\", ...]`."
-                type: "array"
-                items:
-                  type: "string"
-              Cmd:
-                type: "array"
-                description: "Command to run, as a string or array of strings."
-                items:
-                  type: "string"
-              Privileged:
-                type: "boolean"
-                description: "Runs the exec process with extended privileges."
-                default: false
-              User:
-                type: "string"
-                description: "The user, and optionally, group to run the exec process inside the container. Format is one of: `user`, `user:group`, `uid`, or `uid:gid`."
-            example:
-              AttachStdin: false
-              AttachStdout: true
-              AttachStderr: true
-              DetachKeys: "ctrl-p,ctrl-q"
-              Tty: false
-              Cmd:
-                - "date"
-              Env:
-                - "FOO=bar"
-                - "BAZ=quux"
-          required: true
-        - name: "id"
-          in: "path"
-          description: "ID or name of container"
-          type: "string"
-          required: true
-      tags: ["Exec"]
-  /exec/{id}/start:
-    post:
-      summary: "Start an exec instance"
-      description: "Starts a previously set up exec instance. If detach is true, this endpoint returns immediately after starting the command. Otherwise, it sets up an interactive session with the command."
-      operationId: "ExecStart"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/vnd.docker.raw-stream"
-      responses:
-        200:
-          description: "No error"
-        404:
-          description: "No such exec instance"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "Container is stopped or paused"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "execStartConfig"
-          in: "body"
-          schema:
-            type: "object"
-            properties:
-              Detach:
-                type: "boolean"
-                description: "Detach from the command."
-              Tty:
-                type: "boolean"
-                description: "Allocate a pseudo-TTY."
-            example:
-              Detach: false
-              Tty: false
-        - name: "id"
-          in: "path"
-          description: "Exec instance ID"
-          required: true
-          type: "string"
-      tags: ["Exec"]
-  /exec/{id}/resize:
-    post:
-      summary: "Resize an exec instance"
-      description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance."
-      operationId: "ExecResize"
-      responses:
-        201:
-          description: "No error"
-        404:
-          description: "No such exec instance"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "Exec instance ID"
-          required: true
-          type: "string"
-        - name: "h"
-          in: "query"
-          description: "Height of the TTY session in characters"
-          type: "integer"
-        - name: "w"
-          in: "query"
-          description: "Width of the TTY session in characters"
-          type: "integer"
-      tags: ["Exec"]
-  /exec/{id}/json:
-    get:
-      summary: "Inspect an exec instance"
-      description: "Return low-level information about an exec instance."
-      operationId: "ExecInspect"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              ID:
-                type: "string"
-              Running:
-                type: "boolean"
-              ExitCode:
-                type: "integer"
-              ProcessConfig:
-                $ref: "#/definitions/ProcessConfig"
-              OpenStdin:
-                type: "boolean"
-              OpenStderr:
-                type: "boolean"
-              OpenStdout:
-                type: "boolean"
-              ContainerID:
-                type: "string"
-              Pid:
-                type: "integer"
-                description: "The system process ID for the exec process."
-          examples:
-            application/json:
-              CanRemove: false
-              ContainerID: "b53ee82b53a40c7dca428523e34f741f3abc51d9f297a14ff874bf761b995126"
-              DetachKeys: ""
-              ExitCode: 2
-              ID: "f33bbfb39f5b142420f4759b2348913bd4a8d1a6d7fd56499cb41a1bb91d7b3b"
-              OpenStderr: true
-              OpenStdin: true
-              OpenStdout: true
-              ProcessConfig:
-                arguments:
-                  - "-c"
-                  - "exit 2"
-                entrypoint: "sh"
-                privileged: false
-                tty: true
-                user: "1000"
-              Running: false
-              Pid: 42000
-        404:
-          description: "No such exec instance"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "Exec instance ID"
-          required: true
-          type: "string"
-      tags: ["Exec"]
-
-  /volumes:
-    get:
-      summary: "List volumes"
-      operationId: "VolumeList"
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "Summary volume data that matches the query"
-          schema:
-            type: "object"
-            required: [Volumes, Warnings]
-            properties:
-              Volumes:
-                type: "array"
-                x-nullable: false
-                description: "List of volumes"
-                items:
-                  $ref: "#/definitions/Volume"
-              Warnings:
-                type: "array"
-                x-nullable: false
-                description: "Warnings that occurred when fetching the list of volumes"
-                items:
-                  type: "string"
-
-          examples:
-            application/json:
-              Volumes:
-                - Name: "tardis"
-                  Driver: "local"
-                  Mountpoint: "/var/lib/docker/volumes/tardis"
-                  Labels:
-                    com.example.some-label: "some-value"
-                    com.example.some-other-label: "some-other-value"
-                  Scope: "local"
-                  Options:
-                    device: "tmpfs"
-                    o: "size=100m,uid=1000"
-                    type: "tmpfs"
-              Warnings: []
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            JSON encoded value of the filters (a `map[string][]string`) to
-            process on the volumes list. Available filters:
-
-            - `dangling=<boolean>` When set to `true` (or `1`), returns all
-               volumes that are not in use by a container. When set to `false`
-               (or `0`), only volumes that are in use by one or more
-               containers are returned.
-            - `driver=<volume-driver-name>` Matches volumes based on their driver.
-            - `label=<key>` or `label=<key>:<value>` Matches volumes based on
-               the presence of a `label` alone or a `label` and a value.
-            - `name=<volume-name>` Matches all or part of a volume name.
-          type: "string"
-          format: "json"
-      tags: ["Volume"]
-
-  /volumes/create:
-    post:
-      summary: "Create a volume"
-      operationId: "VolumeCreate"
-      consumes: ["application/json"]
-      produces: ["application/json"]
-      responses:
-        201:
-          description: "The volume was created successfully"
-          schema:
-            $ref: "#/definitions/Volume"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "volumeConfig"
-          in: "body"
-          required: true
-          description: "Volume configuration"
-          schema:
-            type: "object"
-            properties:
-              Name:
-                description: "The new volume's name. If not specified, Docker generates a name."
-                type: "string"
-                x-nullable: false
-              Driver:
-                description: "Name of the volume driver to use."
-                type: "string"
-                default: "local"
-                x-nullable: false
-              DriverOpts:
-                description: "A mapping of driver options and values. These options are passed directly to the driver and are driver specific."
-                type: "object"
-                additionalProperties:
-                  type: "string"
-              Labels:
-                description: "User-defined key/value metadata."
-                type: "object"
-                additionalProperties:
-                  type: "string"
-            example:
-              Name: "tardis"
-              Labels:
-                com.example.some-label: "some-value"
-                com.example.some-other-label: "some-other-value"
-              Driver: "custom"
-      tags: ["Volume"]
-
-  /volumes/{name}:
-    get:
-      summary: "Inspect a volume"
-      operationId: "VolumeInspect"
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "No error"
-          schema:
-            $ref: "#/definitions/Volume"
-        404:
-          description: "No such volume"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          required: true
-          description: "Volume name or ID"
-          type: "string"
-      tags: ["Volume"]
-
-    delete:
-      summary: "Remove a volume"
-      description: "Instruct the driver to remove the volume."
-      operationId: "VolumeDelete"
-      responses:
-        204:
-          description: "The volume was removed"
-        404:
-          description: "No such volume or volume driver"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "Volume is in use and cannot be removed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          required: true
-          description: "Volume name or ID"
-          type: "string"
-        - name: "force"
-          in: "query"
-          description: "Force the removal of the volume"
-          type: "boolean"
-          default: false
-      tags: ["Volume"]
-  /volumes/prune:
-    post:
-      summary: "Delete unused volumes"
-      produces:
-        - "application/json"
-      operationId: "VolumePrune"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            Filters to process on the prune list, encoded as JSON (a `map[string][]string`).
-
-            Available filters:
-            - `label` (`label=<key>`, `label=<key>=<value>`, `label!=<key>`, or `label!=<key>=<value>`) Prune volumes with (or without, in case `label!=...` is used) the specified labels.
-          type: "string"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              VolumesDeleted:
-                description: "Volumes that were deleted"
-                type: "array"
-                items:
-                  type: "string"
-              SpaceReclaimed:
-                description: "Disk space reclaimed in bytes"
-                type: "integer"
-                format: "int64"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Volume"]
-  /networks:
-    get:
-      summary: "List networks"
-      operationId: "NetworkList"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/Network"
-          examples:
-            application/json:
-              - Name: "bridge"
-                Id: "f2de39df4171b0dc801e8002d1d999b77256983dfc63041c0f34030aa3977566"
-                Created: "2016-10-19T06:21:00.416543526Z"
-                Scope: "local"
-                Driver: "bridge"
-                EnableIPv6: false
-                Internal: false
-                Attachable: false
-                Ingress: false
-                IPAM:
-                  Driver: "default"
-                  Config:
-                    -
-                      Subnet: "172.17.0.0/16"
-                Containers:
-                  39b69226f9d79f5634485fb236a23b2fe4e96a0a94128390a7fbbcc167065867:
-                    EndpointID: "ed2419a97c1d9954d05b46e462e7002ea552f216e9b136b80a7db8d98b442eda"
-                    MacAddress: "02:42:ac:11:00:02"
-                    IPv4Address: "172.17.0.2/16"
-                    IPv6Address: ""
-                Options:
-                  com.docker.network.bridge.default_bridge: "true"
-                  com.docker.network.bridge.enable_icc: "true"
-                  com.docker.network.bridge.enable_ip_masquerade: "true"
-                  com.docker.network.bridge.host_binding_ipv4: "0.0.0.0"
-                  com.docker.network.bridge.name: "docker0"
-                  com.docker.network.driver.mtu: "1500"
-              - Name: "none"
-                Id: "e086a3893b05ab69242d3c44e49483a3bbbd3a26b46baa8f61ab797c1088d794"
-                Created: "0001-01-01T00:00:00Z"
-                Scope: "local"
-                Driver: "null"
-                EnableIPv6: false
-                Internal: false
-                Attachable: false
-                Ingress: false
-                IPAM:
-                  Driver: "default"
-                  Config: []
-                Containers: {}
-                Options: {}
-              - Name: "host"
-                Id: "13e871235c677f196c4e1ecebb9dc733b9b2d2ab589e30c539efeda84a24215e"
-                Created: "0001-01-01T00:00:00Z"
-                Scope: "local"
-                Driver: "host"
-                EnableIPv6: false
-                Internal: false
-                Attachable: false
-                Ingress: false
-                IPAM:
-                  Driver: "default"
-                  Config: []
-                Containers: {}
-                Options: {}
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            JSON encoded value of the filters (a `map[string][]string`) to process on the networks list. Available filters:
-
-            - `driver=<driver-name>` Matches a network's driver.
-            - `id=<network-id>` Matches all or part of a network ID.
-            - `label=<key>` or `label=<key>=<value>` of a network label.
-            - `name=<network-name>` Matches all or part of a network name.
-            - `scope=["swarm"|"global"|"local"]` Filters networks by scope (`swarm`, `global`, or `local`).
-            - `type=["custom"|"builtin"]` Filters networks by type. The `custom` keyword returns all user-defined networks.
-          type: "string"
-      tags: ["Network"]
-
-  /networks/{id}:
-    get:
-      summary: "Inspect a network"
-      operationId: "NetworkInspect"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            $ref: "#/definitions/Network"
-        404:
-          description: "Network not found"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "Network ID or name"
-          required: true
-          type: "string"
-        - name: "verbose"
-          in: "query"
-          description: "Detailed inspect output for troubleshooting"
-          type: "boolean"
-          default: false
-      tags: ["Network"]
-
-    delete:
-      summary: "Remove a network"
-      operationId: "NetworkDelete"
-      responses:
-        204:
-          description: "No error"
-        403:
-          description: "operation not supported for pre-defined networks"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such network"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "Network ID or name"
-          required: true
-          type: "string"
-      tags: ["Network"]
-
-  /networks/create:
-    post:
-      summary: "Create a network"
-      operationId: "NetworkCreate"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      responses:
-        201:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              Id:
-                description: "The ID of the created network."
-                type: "string"
-              Warning:
-                type: "string"
-            example:
-              Id: "22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30"
-              Warning: ""
-        403:
-          description: "operation not supported for pre-defined networks"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "plugin not found"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "networkConfig"
-          in: "body"
-          description: "Network configuration"
-          required: true
-          schema:
-            type: "object"
-            required: ["Name"]
-            properties:
-              Name:
-                description: "The network's name."
-                type: "string"
-              CheckDuplicate:
-                description: "Check for networks with duplicate names. Since Network is primarily keyed based on a random ID and not on the name, and network name is strictly a user-friendly alias to the network which is uniquely identified using ID, there is no guaranteed way to check for duplicates. CheckDuplicate is there to provide a best effort checking of any networks which has the same name but it is not guaranteed to catch all name collisions."
-                type: "boolean"
-              Driver:
-                description: "Name of the network driver plugin to use."
-                type: "string"
-                default: "bridge"
-              Internal:
-                description: "Restrict external access to the network."
-                type: "boolean"
-              Attachable:
-                description: "Globally scoped network is manually attachable by regular containers from workers in swarm mode."
-                type: "boolean"
-              Ingress:
-                description: "Ingress network is the network which provides the routing-mesh in swarm mode."
-                type: "boolean"
-              IPAM:
-                description: "Optional custom IP scheme for the network."
-                $ref: "#/definitions/IPAM"
-              EnableIPv6:
-                description: "Enable IPv6 on the network."
-                type: "boolean"
-              Options:
-                description: "Network specific options to be used by the drivers."
-                type: "object"
-                additionalProperties:
-                  type: "string"
-              Labels:
-                description: "User-defined key/value metadata."
-                type: "object"
-                additionalProperties:
-                  type: "string"
-            example:
-              Name: "isolated_nw"
-              CheckDuplicate: false
-              Driver: "bridge"
-              EnableIPv6: true
-              IPAM:
-                Driver: "default"
-                Config:
-                  - Subnet: "172.20.0.0/16"
-                    IPRange: "172.20.10.0/24"
-                    Gateway: "172.20.10.11"
-                  - Subnet: "2001:db8:abcd::/64"
-                    Gateway: "2001:db8:abcd::1011"
-                Options:
-                  foo: "bar"
-              Internal: true
-              Attachable: false
-              Ingress: false
-              Options:
-                com.docker.network.bridge.default_bridge: "true"
-                com.docker.network.bridge.enable_icc: "true"
-                com.docker.network.bridge.enable_ip_masquerade: "true"
-                com.docker.network.bridge.host_binding_ipv4: "0.0.0.0"
-                com.docker.network.bridge.name: "docker0"
-                com.docker.network.driver.mtu: "1500"
-              Labels:
-                com.example.some-label: "some-value"
-                com.example.some-other-label: "some-other-value"
-      tags: ["Network"]
-
-  /networks/{id}/connect:
-    post:
-      summary: "Connect a container to a network"
-      operationId: "NetworkConnect"
-      consumes:
-        - "application/octet-stream"
-      responses:
-        200:
-          description: "No error"
-        403:
-          description: "Operation not supported for swarm scoped networks"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "Network or container not found"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "Network ID or name"
-          required: true
-          type: "string"
-        - name: "container"
-          in: "body"
-          required: true
-          schema:
-            type: "object"
-            properties:
-              Container:
-                type: "string"
-                description: "The ID or name of the container to connect to the network."
-              EndpointConfig:
-                $ref: "#/definitions/EndpointSettings"
-            example:
-              Container: "3613f73ba0e4"
-              EndpointConfig:
-                IPAMConfig:
-                  IPv4Address: "172.24.56.89"
-                  IPv6Address: "2001:db8::5689"
-      tags: ["Network"]
-
-  /networks/{id}/disconnect:
-    post:
-      summary: "Disconnect a container from a network"
-      operationId: "NetworkDisconnect"
-      consumes:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-        403:
-          description: "Operation not supported for swarm scoped networks"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "Network or container not found"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "Network ID or name"
-          required: true
-          type: "string"
-        - name: "container"
-          in: "body"
-          required: true
-          schema:
-            type: "object"
-            properties:
-              Container:
-                type: "string"
-                description: "The ID or name of the container to disconnect from the network."
-              Force:
-                type: "boolean"
-                description: "Force the container to disconnect from the network."
-      tags: ["Network"]
-  /networks/prune:
-    post:
-      summary: "Delete unused networks"
-      produces:
-        - "application/json"
-      operationId: "NetworkPrune"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            Filters to process on the prune list, encoded as JSON (a `map[string][]string`).
-
-            Available filters:
-            - `until=<timestamp>` Prune networks created before this timestamp. The `<timestamp>` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time.
-            - `label` (`label=<key>`, `label=<key>=<value>`, `label!=<key>`, or `label!=<key>=<value>`) Prune networks with (or without, in case `label!=...` is used) the specified labels.
-          type: "string"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              NetworksDeleted:
-                description: "Networks that were deleted"
-                type: "array"
-                items:
-                  type: "string"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Network"]
-  /plugins:
-    get:
-      summary: "List plugins"
-      operationId: "PluginList"
-      description: "Returns information about installed plugins."
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/Plugin"
-            example:
-              - Id: "5724e2c8652da337ab2eedd19fc6fc0ec908e4bd907c7421bf6a8dfc70c4c078"
-                Name: "tiborvass/sample-volume-plugin"
-                Tag: "latest"
-                Active: true
-                Settings:
-                  Env:
-                    - "DEBUG=0"
-                  Args: null
-                  Devices: null
-                Config:
-                  Description: "A sample volume plugin for Docker"
-                  Documentation: "https://docs.docker.com/engine/extend/plugins/"
-                  Interface:
-                    Types:
-                      - "docker.volumedriver/1.0"
-                    Socket: "plugins.sock"
-                  Entrypoint:
-                    - "/usr/bin/sample-volume-plugin"
-                    - "/data"
-                  WorkDir: ""
-                  User: {}
-                  Network:
-                    Type: ""
-                  Linux:
-                    Capabilities: null
-                    AllowAllDevices: false
-                    Devices: null
-                  Mounts: null
-                  PropagatedMount: "/data"
-                  Env:
-                    - Name: "DEBUG"
-                      Description: "If set, prints debug messages"
-                      Settable: null
-                      Value: "0"
-                  Args:
-                    Name: "args"
-                    Description: "command line arguments"
-                    Settable: null
-                    Value: []
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          type: "string"
-          description: |
-            A JSON encoded value of the filters (a `map[string][]string`) to process on the plugin list. Available filters:
-
-            - `capability=<capability name>`
-            - `enable=<true>|<false>`
-      tags: ["Plugin"]
-
-  /plugins/privileges:
-    get:
-      summary: "Get plugin privileges"
-      operationId: "GetPluginPrivileges"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "array"
-            items:
-              description: "Describes a permission the user has to accept upon installing the plugin."
-              type: "object"
-              properties:
-                Name:
-                  type: "string"
-                Description:
-                  type: "string"
-                Value:
-                  type: "array"
-                  items:
-                    type: "string"
-            example:
-              - Name: "network"
-                Description: ""
-                Value:
-                  - "host"
-              - Name: "mount"
-                Description: ""
-                Value:
-                  - "/data"
-              - Name: "device"
-                Description: ""
-                Value:
-                  - "/dev/cpu_dma_latency"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "remote"
-          in: "query"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-      tags:
-        - "Plugin"
-
-  /plugins/pull:
-    post:
-      summary: "Install a plugin"
-      operationId: "PluginPull"
-      description: |
-        Pulls and installs a plugin. After the plugin is installed, it can be enabled using the [`POST /plugins/{name}/enable` endpoint](#operation/PostPluginsEnable).
-      produces:
-        - "application/json"
-      responses:
-        204:
-          description: "no error"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "remote"
-          in: "query"
-          description: |
-            Remote reference for plugin to install.
-
-            The `:latest` tag is optional, and is used as the default if omitted.
-          required: true
-          type: "string"
-        - name: "name"
-          in: "query"
-          description: |
-            Local name for the pulled plugin.
-
-            The `:latest` tag is optional, and is used as the default if omitted.
-          required: false
-          type: "string"
-        - name: "X-Registry-Auth"
-          in: "header"
-          description: "A base64-encoded auth configuration to use when pulling a plugin from a registry. [See the authentication section for details.](#section/Authentication)"
-          type: "string"
-        - name: "body"
-          in: "body"
-          schema:
-            type: "array"
-            items:
-              description: "Describes a permission accepted by the user upon installing the plugin."
-              type: "object"
-              properties:
-                Name:
-                  type: "string"
-                Description:
-                  type: "string"
-                Value:
-                  type: "array"
-                  items:
-                    type: "string"
-            example:
-              - Name: "network"
-                Description: ""
-                Value:
-                  - "host"
-              - Name: "mount"
-                Description: ""
-                Value:
-                  - "/data"
-              - Name: "device"
-                Description: ""
-                Value:
-                  - "/dev/cpu_dma_latency"
-      tags: ["Plugin"]
-  /plugins/{name}/json:
-    get:
-      summary: "Inspect a plugin"
-      operationId: "PluginInspect"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/Plugin"
-        404:
-          description: "plugin is not installed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-      tags: ["Plugin"]
-  /plugins/{name}:
-    delete:
-      summary: "Remove a plugin"
-      operationId: "PluginDelete"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/Plugin"
-        404:
-          description: "plugin is not installed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-        - name: "force"
-          in: "query"
-          description: "Disable the plugin before removing. This may result in issues if the plugin is in use by a container."
-          type: "boolean"
-          default: false
-      tags: ["Plugin"]
-  /plugins/{name}/enable:
-    post:
-      summary: "Enable a plugin"
-      operationId: "PluginEnable"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "plugin is not installed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-        - name: "timeout"
-          in: "query"
-          description: "Set the HTTP client timeout (in seconds)"
-          type: "integer"
-          default: 0
-      tags: ["Plugin"]
-  /plugins/{name}/disable:
-    post:
-      summary: "Disable a plugin"
-      operationId: "PluginDisable"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "plugin is not installed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-      tags: ["Plugin"]
-  /plugins/{name}/upgrade:
-    post:
-      summary: "Upgrade a plugin"
-      operationId: "PluginUpgrade"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "plugin not installed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-        - name: "remote"
-          in: "query"
-          description: |
-            Remote reference to upgrade to.
-
-            The `:latest` tag is optional, and is used as the default if omitted.
-          required: true
-          type: "string"
-        - name: "X-Registry-Auth"
-          in: "header"
-          description: "A base64-encoded auth configuration to use when pulling a plugin from a registry. [See the authentication section for details.](#section/Authentication)"
-          type: "string"
-        - name: "body"
-          in: "body"
-          schema:
-            type: "array"
-            items:
-              description: "Describes a permission accepted by the user upon installing the plugin."
-              type: "object"
-              properties:
-                Name:
-                  type: "string"
-                Description:
-                  type: "string"
-                Value:
-                  type: "array"
-                  items:
-                    type: "string"
-            example:
-              - Name: "network"
-                Description: ""
-                Value:
-                  - "host"
-              - Name: "mount"
-                Description: ""
-                Value:
-                  - "/data"
-              - Name: "device"
-                Description: ""
-                Value:
-                  - "/dev/cpu_dma_latency"
-      tags: ["Plugin"]
-  /plugins/create:
-    post:
-      summary: "Create a plugin"
-      operationId: "PluginCreate"
-      consumes:
-        - "application/x-tar"
-      responses:
-        204:
-          description: "no error"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "query"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-        - name: "tarContext"
-          in: "body"
-          description: "Path to tar containing plugin rootfs and manifest"
-          schema:
-            type: "string"
-            format: "binary"
-      tags: ["Plugin"]
-  /plugins/{name}/push:
-    post:
-      summary: "Push a plugin"
-      operationId: "PluginPush"
-      description: |
-        Push a plugin to the registry.
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "plugin not installed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Plugin"]
-  /plugins/{name}/set:
-    post:
-      summary: "Configure a plugin"
-      operationId: "PluginSet"
-      consumes:
-        - "application/json"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-        - name: "body"
-          in: "body"
-          schema:
-            type: "array"
-            items:
-              type: "string"
-            example: ["DEBUG=1"]
-      responses:
-        204:
-          description: "No error"
-        404:
-          description: "Plugin not installed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Plugin"]
-  /nodes:
-    get:
-      summary: "List nodes"
-      operationId: "NodeList"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/Node"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            Filters to process on the nodes list, encoded as JSON (a `map[string][]string`).
-
-            Available filters:
-            - `id=<node id>`
-            - `label=<engine label>`
-            - `membership=`(`accepted`|`pending`)`
-            - `name=<node name>`
-            - `role=`(`manager`|`worker`)`
-          type: "string"
-      tags: ["Node"]
-  /nodes/{id}:
-    get:
-      summary: "Inspect a node"
-      operationId: "NodeInspect"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/Node"
-        404:
-          description: "no such node"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "The ID or name of the node"
-          type: "string"
-          required: true
-      tags: ["Node"]
-    delete:
-      summary: "Delete a node"
-      operationId: "NodeDelete"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "no such node"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "The ID or name of the node"
-          type: "string"
-          required: true
-        - name: "force"
-          in: "query"
-          description: "Force remove a node from the swarm"
-          default: false
-          type: "boolean"
-      tags: ["Node"]
-  /nodes/{id}/update:
-    post:
-      summary: "Update a node"
-      operationId: "NodeUpdate"
-      responses:
-        200:
-          description: "no error"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such node"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "The ID of the node"
-          type: "string"
-          required: true
-        - name: "body"
-          in: "body"
-          schema:
-            $ref: "#/definitions/NodeSpec"
-        - name: "version"
-          in: "query"
-          description: "The version number of the node object being updated. This is required to avoid conflicting writes."
-          type: "integer"
-          format: "int64"
-          required: true
-      tags: ["Node"]
-  /swarm:
-    get:
-      summary: "Inspect swarm"
-      operationId: "SwarmInspect"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            allOf:
-              - $ref: "#/definitions/ClusterInfo"
-              - type: "object"
-                properties:
-                  JoinTokens:
-                    description: "The tokens workers and managers need to join the swarm."
-                    type: "object"
-                    properties:
-                      Worker:
-                        description: "The token workers can use to join the swarm."
-                        type: "string"
-                      Manager:
-                        description: "The token managers can use to join the swarm."
-                        type: "string"
-            example:
-              CreatedAt: "2016-08-15T16:00:20.349727406Z"
-              Spec:
-                Dispatcher:
-                  HeartbeatPeriod: 5000000000
-                Orchestration:
-                  TaskHistoryRetentionLimit: 10
-                CAConfig:
-                  NodeCertExpiry: 7776000000000000
-                Raft:
-                  LogEntriesForSlowFollowers: 500
-                  HeartbeatTick: 1
-                  SnapshotInterval: 10000
-                  ElectionTick: 3
-                TaskDefaults: {}
-                EncryptionConfig:
-                  AutoLockManagers: false
-                Name: "default"
-              JoinTokens:
-                Worker: "SWMTKN-1-1h8aps2yszaiqmz2l3oc5392pgk8e49qhx2aj3nyv0ui0hez2a-6qmn92w6bu3jdvnglku58u11a"
-                Manager: "SWMTKN-1-1h8aps2yszaiqmz2l3oc5392pgk8e49qhx2aj3nyv0ui0hez2a-8llk83c4wm9lwioey2s316r9l"
-              ID: "70ilmkj2f6sp2137c753w2nmt"
-              UpdatedAt: "2016-08-15T16:32:09.623207604Z"
-              Version:
-                Index: 51
-        404:
-          description: "no such swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Swarm"]
-  /swarm/init:
-    post:
-      summary: "Initialize a new swarm"
-      operationId: "SwarmInit"
-      produces:
-        - "application/json"
-        - "text/plain"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            description: "The node ID"
-            type: "string"
-            example: "7v2t30z9blmxuhnyo6s4cpenp"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is already part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "body"
-          in: "body"
-          required: true
-          schema:
-            type: "object"
-            properties:
-              ListenAddr:
-                description: "Listen address used for inter-manager communication, as well as determining the networking interface used for the VXLAN Tunnel Endpoint (VTEP). This can either be an address/port combination in the form `192.168.1.1:4567`, or an interface followed by a port number, like `eth0:4567`. If the port number is omitted, the default swarm listening port is used."
-                type: "string"
-              AdvertiseAddr:
-                description: "Externally reachable address advertised to other nodes. This can either be an address/port combination in the form `192.168.1.1:4567`, or an interface followed by a port number, like `eth0:4567`. If the port number is omitted, the port number from the listen address is used. If `AdvertiseAddr` is not specified, it will be automatically detected when possible."
-                type: "string"
-              ForceNewCluster:
-                description: "Force creation of a new swarm."
-                type: "boolean"
-              Spec:
-                $ref: "#/definitions/SwarmSpec"
-            example:
-              ListenAddr: "0.0.0.0:2377"
-              AdvertiseAddr: "192.168.1.1:2377"
-              ForceNewCluster: false
-              Spec:
-                Orchestration: {}
-                Raft: {}
-                Dispatcher: {}
-                CAConfig: {}
-                EncryptionConfig:
-                  AutoLockManagers: false
-      tags: ["Swarm"]
-  /swarm/join:
-    post:
-      summary: "Join an existing swarm"
-      operationId: "SwarmJoin"
-      responses:
-        200:
-          description: "no error"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is already part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "body"
-          in: "body"
-          required: true
-          schema:
-            type: "object"
-            properties:
-              ListenAddr:
-                description: "Listen address used for inter-manager communication if the node gets promoted to manager, as well as determining the networking interface used for the VXLAN Tunnel Endpoint (VTEP)."
-                type: "string"
-              AdvertiseAddr:
-                description: "Externally reachable address advertised to other nodes. This can either be an address/port combination in the form `192.168.1.1:4567`, or an interface followed by a port number, like `eth0:4567`. If the port number is omitted, the port number from the listen address is used. If `AdvertiseAddr` is not specified, it will be automatically detected when possible."
-                type: "string"
-              RemoteAddrs:
-                description: "Addresses of manager nodes already participating in the swarm."
-                type: "string"
-              JoinToken:
-                description: "Secret token for joining this swarm."
-                type: "string"
-            example:
-              ListenAddr: "0.0.0.0:2377"
-              AdvertiseAddr: "192.168.1.1:2377"
-              RemoteAddrs:
-                - "node1:2377"
-              JoinToken: "SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-7p73s1dx5in4tatdymyhg9hu2"
-      tags: ["Swarm"]
-  /swarm/leave:
-    post:
-      summary: "Leave a swarm"
-      operationId: "SwarmLeave"
-      responses:
-        200:
-          description: "no error"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "force"
-          description: "Force leave swarm, even if this is the last manager or that it will break the cluster."
-          in: "query"
-          type: "boolean"
-          default: false
-      tags: ["Swarm"]
-  /swarm/update:
-    post:
-      summary: "Update a swarm"
-      operationId: "SwarmUpdate"
-      responses:
-        200:
-          description: "no error"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "body"
-          in: "body"
-          required: true
-          schema:
-            $ref: "#/definitions/SwarmSpec"
-        - name: "version"
-          in: "query"
-          description: "The version number of the swarm object being updated. This is required to avoid conflicting writes."
-          type: "integer"
-          format: "int64"
-          required: true
-        - name: "rotateWorkerToken"
-          in: "query"
-          description: "Rotate the worker join token."
-          type: "boolean"
-          default: false
-        - name: "rotateManagerToken"
-          in: "query"
-          description: "Rotate the manager join token."
-          type: "boolean"
-          default: false
-        - name: "rotateManagerUnlockKey"
-          in: "query"
-          description: "Rotate the manager unlock key."
-          type: "boolean"
-          default: false
-      tags: ["Swarm"]
-  /swarm/unlockkey:
-    get:
-      summary: "Get the unlock key"
-      operationId: "SwarmUnlockkey"
-      consumes:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              UnlockKey:
-                description: "The swarm's unlock key."
-                type: "string"
-            example:
-              UnlockKey: "SWMKEY-1-7c37Cc8654o6p38HnroywCi19pllOnGtbdZEgtKxZu8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Swarm"]
-  /swarm/unlock:
-    post:
-      summary: "Unlock a locked manager"
-      operationId: "SwarmUnlock"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      parameters:
-        - name: "body"
-          in: "body"
-          required: true
-          schema:
-            type: "object"
-            properties:
-              UnlockKey:
-                description: "The swarm's unlock key."
-                type: "string"
-            example:
-              UnlockKey: "SWMKEY-1-7c37Cc8654o6p38HnroywCi19pllOnGtbdZEgtKxZu8"
-      responses:
-        200:
-          description: "no error"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Swarm"]
-  /services:
-    get:
-      summary: "List services"
-      operationId: "ServiceList"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/Service"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          type: "string"
-          description: |
-            A JSON encoded value of the filters (a `map[string][]string`) to process on the services list. Available filters:
-
-            - `id=<service id>`
-            - `label=<service label>`
-            - `mode=["replicated"|"global"]`
-            - `name=<service name>`
-      tags: ["Service"]
-  /services/create:
-    post:
-      summary: "Create a service"
-      operationId: "ServiceCreate"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      responses:
-        201:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              ID:
-                description: "The ID of the created service."
-                type: "string"
-              Warning:
-                description: "Optional warning message"
-                type: "string"
-            example:
-              ID: "ak7w3gjqoa3kuz8xcpnyy0pvl"
-              Warning: "unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        403:
-          description: "network is not eligible for services"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "name conflicts with an existing service"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "body"
-          in: "body"
-          required: true
-          schema:
-            allOf:
-              - $ref: "#/definitions/ServiceSpec"
-              - type: "object"
-                example:
-                  Name: "web"
-                  TaskTemplate:
-                    ContainerSpec:
-                      Image: "nginx:alpine"
-                      Mounts:
-                        -
-                          ReadOnly: true
-                          Source: "web-data"
-                          Target: "/usr/share/nginx/html"
-                          Type: "volume"
-                          VolumeOptions:
-                            DriverConfig: {}
-                            Labels:
-                              com.example.something: "something-value"
-                      Hosts: ["10.10.10.10 host1", "ABCD:EF01:2345:6789:ABCD:EF01:2345:6789 host2"]
-                      User: "33"
-                      DNSConfig:
-                        Nameservers: ["8.8.8.8"]
-                        Search: ["example.org"]
-                        Options: ["timeout:3"]
-                    LogDriver:
-                      Name: "json-file"
-                      Options:
-                        max-file: "3"
-                        max-size: "10M"
-                    Placement: {}
-                    Resources:
-                      Limits:
-                        MemoryBytes: 104857600
-                      Reservations: {}
-                    RestartPolicy:
-                      Condition: "on-failure"
-                      Delay: 10000000000
-                      MaxAttempts: 10
-                  Mode:
-                    Replicated:
-                      Replicas: 4
-                  UpdateConfig:
-                    Parallelism: 2
-                    Delay: 1000000000
-                    FailureAction: "pause"
-                    Monitor: 15000000000
-                    MaxFailureRatio: 0.15
-                  RollbackConfig:
-                    Parallelism: 1
-                    Delay: 1000000000
-                    FailureAction: "pause"
-                    Monitor: 15000000000
-                    MaxFailureRatio: 0.15
-                  EndpointSpec:
-                    Ports:
-                      -
-                        Protocol: "tcp"
-                        PublishedPort: 8080
-                        TargetPort: 80
-                  Labels:
-                    foo: "bar"
-        - name: "X-Registry-Auth"
-          in: "header"
-          description: "A base64-encoded auth configuration for pulling from private registries. [See the authentication section for details.](#section/Authentication)"
-          type: "string"
-      tags: ["Service"]
-  /services/{id}:
-    get:
-      summary: "Inspect a service"
-      operationId: "ServiceInspect"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/Service"
-        404:
-          description: "no such service"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "ID or name of service."
-          required: true
-          type: "string"
-        - name: "insertDefaults"
-          in: "query"
-          description: "Fill empty fields with default values."
-          type: "boolean"
-          default: false
-      tags: ["Service"]
-    delete:
-      summary: "Delete a service"
-      operationId: "ServiceDelete"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "no such service"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "ID or name of service."
-          required: true
-          type: "string"
-      tags: ["Service"]
-  /services/{id}/update:
-    post:
-      summary: "Update a service"
-      operationId: "ServiceUpdate"
-      consumes: ["application/json"]
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/ServiceUpdateResponse"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such service"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "ID or name of service."
-          required: true
-          type: "string"
-        - name: "body"
-          in: "body"
-          required: true
-          schema:
-            allOf:
-              - $ref: "#/definitions/ServiceSpec"
-              - type: "object"
-                example:
-                  Name: "top"
-                  TaskTemplate:
-                    ContainerSpec:
-                      Image: "busybox"
-                      Args:
-                        - "top"
-                    Resources:
-                      Limits: {}
-                      Reservations: {}
-                    RestartPolicy:
-                      Condition: "any"
-                      MaxAttempts: 0
-                    Placement: {}
-                    ForceUpdate: 0
-                  Mode:
-                    Replicated:
-                      Replicas: 1
-                  UpdateConfig:
-                    Parallelism: 2
-                    Delay: 1000000000
-                    FailureAction: "pause"
-                    Monitor: 15000000000
-                    MaxFailureRatio: 0.15
-                  RollbackConfig:
-                    Parallelism: 1
-                    Delay: 1000000000
-                    FailureAction: "pause"
-                    Monitor: 15000000000
-                    MaxFailureRatio: 0.15
-                  EndpointSpec:
-                    Mode: "vip"
-
-        - name: "version"
-          in: "query"
-          description: "The version number of the service object being updated. This is required to avoid conflicting writes."
-          required: true
-          type: "integer"
-        - name: "registryAuthFrom"
-          in: "query"
-          type: "string"
-          description: "If the X-Registry-Auth header is not specified, this
-  parameter indicates where to find registry authorization credentials. The
-  valid values are `spec` and `previous-spec`."
-          default: "spec"
-        - name: "rollback"
-          in: "query"
-          type: "string"
-          description: "Set to this parameter to `previous` to cause a
-  server-side rollback to the previous service spec. The supplied spec will be
-  ignored in this case."
-        - name: "X-Registry-Auth"
-          in: "header"
-          description: "A base64-encoded auth configuration for pulling from private registries. [See the authentication section for details.](#section/Authentication)"
-          type: "string"
-
-      tags: ["Service"]
-  /services/{id}/logs:
-    get:
-      summary: "Get service logs"
-      description: |
-        Get `stdout` and `stderr` logs from a service.
-
-        **Note**: This endpoint works only for services with the `json-file` or `journald` logging drivers.
-      operationId: "ServiceLogs"
-      produces:
-        - "application/vnd.docker.raw-stream"
-        - "application/json"
-      responses:
-        101:
-          description: "logs returned as a stream"
-          schema:
-            type: "string"
-            format: "binary"
-        200:
-          description: "logs returned as a string in response body"
-          schema:
-            type: "string"
-        404:
-          description: "no such service"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such service: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the service"
-          type: "string"
-        - name: "details"
-          in: "query"
-          description: "Show service context and extra details provided to logs."
-          type: "boolean"
-          default: false
-        - name: "follow"
-          in: "query"
-          description: |
-            Return the logs as a stream.
-
-            This will return a `101` HTTP response with a `Connection: upgrade` header, then hijack the HTTP connection to send raw output. For more information about hijacking and the stream format, [see the documentation for the attach endpoint](#operation/ContainerAttach).
-          type: "boolean"
-          default: false
-        - name: "stdout"
-          in: "query"
-          description: "Return logs from `stdout`"
-          type: "boolean"
-          default: false
-        - name: "stderr"
-          in: "query"
-          description: "Return logs from `stderr`"
-          type: "boolean"
-          default: false
-        - name: "since"
-          in: "query"
-          description: "Only return logs since this time, as a UNIX timestamp"
-          type: "integer"
-          default: 0
-        - name: "timestamps"
-          in: "query"
-          description: "Add timestamps to every log line"
-          type: "boolean"
-          default: false
-        - name: "tail"
-          in: "query"
-          description: "Only return this number of log lines from the end of the logs. Specify as an integer or `all` to output all log lines."
-          type: "string"
-          default: "all"
-      tags: ["Service"]
-  /tasks:
-    get:
-      summary: "List tasks"
-      operationId: "TaskList"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/Task"
-            example:
-              - ID: "0kzzo1i0y4jz6027t0k7aezc7"
-                Version:
-                  Index: 71
-                CreatedAt: "2016-06-07T21:07:31.171892745Z"
-                UpdatedAt: "2016-06-07T21:07:31.376370513Z"
-                Spec:
-                  ContainerSpec:
-                    Image: "redis"
-                  Resources:
-                    Limits: {}
-                    Reservations: {}
-                  RestartPolicy:
-                    Condition: "any"
-                    MaxAttempts: 0
-                  Placement: {}
-                ServiceID: "9mnpnzenvg8p8tdbtq4wvbkcz"
-                Slot: 1
-                NodeID: "60gvrl6tm78dmak4yl7srz94v"
-                Status:
-                  Timestamp: "2016-06-07T21:07:31.290032978Z"
-                  State: "running"
-                  Message: "started"
-                  ContainerStatus:
-                    ContainerID: "e5d62702a1b48d01c3e02ca1e0212a250801fa8d67caca0b6f35919ebc12f035"
-                    PID: 677
-                DesiredState: "running"
-                NetworksAttachments:
-                  - Network:
-                      ID: "4qvuz4ko70xaltuqbt8956gd1"
-                      Version:
-                        Index: 18
-                      CreatedAt: "2016-06-07T20:31:11.912919752Z"
-                      UpdatedAt: "2016-06-07T21:07:29.955277358Z"
-                      Spec:
-                        Name: "ingress"
-                        Labels:
-                          com.docker.swarm.internal: "true"
-                        DriverConfiguration: {}
-                        IPAMOptions:
-                          Driver: {}
-                          Configs:
-                            - Subnet: "10.255.0.0/16"
-                              Gateway: "10.255.0.1"
-                      DriverState:
-                        Name: "overlay"
-                        Options:
-                          com.docker.network.driver.overlay.vxlanid_list: "256"
-                      IPAMOptions:
-                        Driver:
-                          Name: "default"
-                        Configs:
-                          - Subnet: "10.255.0.0/16"
-                            Gateway: "10.255.0.1"
-                    Addresses:
-                      - "10.255.0.10/16"
-              - ID: "1yljwbmlr8er2waf8orvqpwms"
-                Version:
-                  Index: 30
-                CreatedAt: "2016-06-07T21:07:30.019104782Z"
-                UpdatedAt: "2016-06-07T21:07:30.231958098Z"
-                Name: "hopeful_cori"
-                Spec:
-                  ContainerSpec:
-                    Image: "redis"
-                  Resources:
-                    Limits: {}
-                    Reservations: {}
-                  RestartPolicy:
-                    Condition: "any"
-                    MaxAttempts: 0
-                  Placement: {}
-                ServiceID: "9mnpnzenvg8p8tdbtq4wvbkcz"
-                Slot: 1
-                NodeID: "60gvrl6tm78dmak4yl7srz94v"
-                Status:
-                  Timestamp: "2016-06-07T21:07:30.202183143Z"
-                  State: "shutdown"
-                  Message: "shutdown"
-                  ContainerStatus:
-                    ContainerID: "1cf8d63d18e79668b0004a4be4c6ee58cddfad2dae29506d8781581d0688a213"
-                DesiredState: "shutdown"
-                NetworksAttachments:
-                  - Network:
-                      ID: "4qvuz4ko70xaltuqbt8956gd1"
-                      Version:
-                        Index: 18
-                      CreatedAt: "2016-06-07T20:31:11.912919752Z"
-                      UpdatedAt: "2016-06-07T21:07:29.955277358Z"
-                      Spec:
-                        Name: "ingress"
-                        Labels:
-                          com.docker.swarm.internal: "true"
-                        DriverConfiguration: {}
-                        IPAMOptions:
-                          Driver: {}
-                          Configs:
-                            - Subnet: "10.255.0.0/16"
-                              Gateway: "10.255.0.1"
-                      DriverState:
-                        Name: "overlay"
-                        Options:
-                          com.docker.network.driver.overlay.vxlanid_list: "256"
-                      IPAMOptions:
-                        Driver:
-                          Name: "default"
-                        Configs:
-                          - Subnet: "10.255.0.0/16"
-                            Gateway: "10.255.0.1"
-                    Addresses:
-                      - "10.255.0.5/16"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          type: "string"
-          description: |
-            A JSON encoded value of the filters (a `map[string][]string`) to process on the tasks list. Available filters:
-
-            - `desired-state=(running | shutdown | accepted)`
-            - `id=<task id>`
-            - `label=key` or `label="key=value"`
-            - `name=<task name>`
-            - `node=<node id or name>`
-            - `service=<service name>`
-      tags: ["Task"]
-  /tasks/{id}:
-    get:
-      summary: "Inspect a task"
-      operationId: "TaskInspect"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/Task"
-        404:
-          description: "no such task"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "ID of the task"
-          required: true
-          type: "string"
-      tags: ["Task"]
-  /tasks/{id}/logs:
-    get:
-      summary: "Get task logs"
-      description: |
-        Get `stdout` and `stderr` logs from a task.
-
-        **Note**: This endpoint works only for services with the `json-file` or `journald` logging drivers.
-      operationId: "TaskLogs"
-      produces:
-        - "application/vnd.docker.raw-stream"
-        - "application/json"
-      responses:
-        101:
-          description: "logs returned as a stream"
-          schema:
-            type: "string"
-            format: "binary"
-        200:
-          description: "logs returned as a string in response body"
-          schema:
-            type: "string"
-        404:
-          description: "no such task"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such task: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID of the task"
-          type: "string"
-        - name: "details"
-          in: "query"
-          description: "Show task context and extra details provided to logs."
-          type: "boolean"
-          default: false
-        - name: "follow"
-          in: "query"
-          description: |
-            Return the logs as a stream.
-
-            This will return a `101` HTTP response with a `Connection: upgrade` header, then hijack the HTTP connection to send raw output. For more information about hijacking and the stream format, [see the documentation for the attach endpoint](#operation/ContainerAttach).
-          type: "boolean"
-          default: false
-        - name: "stdout"
-          in: "query"
-          description: "Return logs from `stdout`"
-          type: "boolean"
-          default: false
-        - name: "stderr"
-          in: "query"
-          description: "Return logs from `stderr`"
-          type: "boolean"
-          default: false
-        - name: "since"
-          in: "query"
-          description: "Only return logs since this time, as a UNIX timestamp"
-          type: "integer"
-          default: 0
-        - name: "timestamps"
-          in: "query"
-          description: "Add timestamps to every log line"
-          type: "boolean"
-          default: false
-        - name: "tail"
-          in: "query"
-          description: "Only return this number of log lines from the end of the logs. Specify as an integer or `all` to output all log lines."
-          type: "string"
-          default: "all"
-  /secrets:
-    get:
-      summary: "List secrets"
-      operationId: "SecretList"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/Secret"
-            example:
-              - ID: "ktnbjxoalbkvbvedmg1urrz8h"
-                Version:
-                  Index: 11
-                CreatedAt: "2016-11-05T01:20:17.327670065Z"
-                UpdatedAt: "2016-11-05T01:20:17.327670065Z"
-                Spec:
-                  Name: "app-dev.crt"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          type: "string"
-          description: |
-            A JSON encoded value of the filters (a `map[string][]string`) to process on the secrets list. Available filters:
-
-            - `id=<secret id>`
-            - `label=<key> or label=<key>=value`
-            - `name=<secret name>`
-            - `names=<secret name>`
-      tags: ["Secret"]
-  /secrets/create:
-    post:
-      summary: "Create a secret"
-      operationId: "SecretCreate"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      responses:
-        201:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              ID:
-                description: "The ID of the created secret."
-                type: "string"
-            example:
-              ID: "ktnbjxoalbkvbvedmg1urrz8h"
-        409:
-          description: "name conflicts with an existing object"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "body"
-          in: "body"
-          schema:
-            allOf:
-              - $ref: "#/definitions/SecretSpec"
-              - type: "object"
-                example:
-                  Name: "app-key.crt"
-                  Labels:
-                    foo: "bar"
-                  Data: "VEhJUyBJUyBOT1QgQSBSRUFMIENFUlRJRklDQVRFCg=="
-      tags: ["Secret"]
-  /secrets/{id}:
-    get:
-      summary: "Inspect a secret"
-      operationId: "SecretInspect"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/Secret"
-            example:
-              ID: "ktnbjxoalbkvbvedmg1urrz8h"
-              Version:
-                Index: 11
-              CreatedAt: "2016-11-05T01:20:17.327670065Z"
-              UpdatedAt: "2016-11-05T01:20:17.327670065Z"
-              Spec:
-                Name: "app-dev.crt"
-        404:
-          description: "secret not found"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          type: "string"
-          description: "ID of the secret"
-      tags: ["Secret"]
-    delete:
-      summary: "Delete a secret"
-      operationId: "SecretDelete"
-      produces:
-        - "application/json"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "secret not found"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          type: "string"
-          description: "ID of the secret"
-      tags: ["Secret"]
-  /secrets/{id}/update:
-    post:
-      summary: "Update a Secret"
-      operationId: "SecretUpdate"
-      responses:
-        200:
-          description: "no error"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such secret"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "The ID or name of the secret"
-          type: "string"
-          required: true
-        - name: "body"
-          in: "body"
-          schema:
-            $ref: "#/definitions/SecretSpec"
-          description: "The spec of the secret to update. Currently, only the Labels field can be updated. All other fields must remain unchanged from the [SecretInspect endpoint](#operation/SecretInspect) response values."
-        - name: "version"
-          in: "query"
-          description: "The version number of the secret object being updated. This is required to avoid conflicting writes."
-          type: "integer"
-          format: "int64"
-          required: true
-      tags: ["Secret"]
diff --git a/vendor/github.com/docker/docker/api/types/auth.go b/vendor/github.com/docker/docker/api/types/auth.go
deleted file mode 100644
index 056af6b842..0000000000
--- a/vendor/github.com/docker/docker/api/types/auth.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package types
-
-// AuthConfig contains authorization information for connecting to a Registry
-type AuthConfig struct {
-	Username string `json:"username,omitempty"`
-	Password string `json:"password,omitempty"`
-	Auth     string `json:"auth,omitempty"`
-
-	// Email is an optional value associated with the username.
-	// This field is deprecated and will be removed in a later
-	// version of docker.
-	Email string `json:"email,omitempty"`
-
-	ServerAddress string `json:"serveraddress,omitempty"`
-
-	// IdentityToken is used to authenticate the user and get
-	// an access token for the registry.
-	IdentityToken string `json:"identitytoken,omitempty"`
-
-	// RegistryToken is a bearer token to be sent to a registry
-	RegistryToken string `json:"registrytoken,omitempty"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/blkiodev/blkio.go b/vendor/github.com/docker/docker/api/types/blkiodev/blkio.go
deleted file mode 100644
index 931ae10ab1..0000000000
--- a/vendor/github.com/docker/docker/api/types/blkiodev/blkio.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package blkiodev
-
-import "fmt"
-
-// WeightDevice is a structure that holds device:weight pair
-type WeightDevice struct {
-	Path   string
-	Weight uint16
-}
-
-func (w *WeightDevice) String() string {
-	return fmt.Sprintf("%s:%d", w.Path, w.Weight)
-}
-
-// ThrottleDevice is a structure that holds device:rate_per_second pair
-type ThrottleDevice struct {
-	Path string
-	Rate uint64
-}
-
-func (t *ThrottleDevice) String() string {
-	return fmt.Sprintf("%s:%d", t.Path, t.Rate)
-}
diff --git a/vendor/github.com/docker/docker/api/types/client.go b/vendor/github.com/docker/docker/api/types/client.go
deleted file mode 100644
index 00255271b2..0000000000
--- a/vendor/github.com/docker/docker/api/types/client.go
+++ /dev/null
@@ -1,372 +0,0 @@
-package types
-
-import (
-	"bufio"
-	"io"
-	"net"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/go-units"
-)
-
-// CheckpointCreateOptions holds parameters to create a checkpoint from a container
-type CheckpointCreateOptions struct {
-	CheckpointID  string
-	CheckpointDir string
-	Exit          bool
-}
-
-// CheckpointListOptions holds parameters to list checkpoints for a container
-type CheckpointListOptions struct {
-	CheckpointDir string
-}
-
-// CheckpointDeleteOptions holds parameters to delete a checkpoint from a container
-type CheckpointDeleteOptions struct {
-	CheckpointID  string
-	CheckpointDir string
-}
-
-// ContainerAttachOptions holds parameters to attach to a container.
-type ContainerAttachOptions struct {
-	Stream     bool
-	Stdin      bool
-	Stdout     bool
-	Stderr     bool
-	DetachKeys string
-	Logs       bool
-}
-
-// ContainerCommitOptions holds parameters to commit changes into a container.
-type ContainerCommitOptions struct {
-	Reference string
-	Comment   string
-	Author    string
-	Changes   []string
-	Pause     bool
-	Config    *container.Config
-}
-
-// ContainerExecInspect holds information returned by exec inspect.
-type ContainerExecInspect struct {
-	ExecID      string
-	ContainerID string
-	Running     bool
-	ExitCode    int
-	Pid         int
-}
-
-// ContainerListOptions holds parameters to list containers with.
-type ContainerListOptions struct {
-	Quiet   bool
-	Size    bool
-	All     bool
-	Latest  bool
-	Since   string
-	Before  string
-	Limit   int
-	Filters filters.Args
-}
-
-// ContainerLogsOptions holds parameters to filter logs with.
-type ContainerLogsOptions struct {
-	ShowStdout bool
-	ShowStderr bool
-	Since      string
-	Timestamps bool
-	Follow     bool
-	Tail       string
-	Details    bool
-}
-
-// ContainerRemoveOptions holds parameters to remove containers.
-type ContainerRemoveOptions struct {
-	RemoveVolumes bool
-	RemoveLinks   bool
-	Force         bool
-}
-
-// ContainerStartOptions holds parameters to start containers.
-type ContainerStartOptions struct {
-	CheckpointID  string
-	CheckpointDir string
-}
-
-// CopyToContainerOptions holds information
-// about files to copy into a container
-type CopyToContainerOptions struct {
-	AllowOverwriteDirWithFile bool
-	CopyUIDGID                bool
-}
-
-// EventsOptions holds parameters to filter events with.
-type EventsOptions struct {
-	Since   string
-	Until   string
-	Filters filters.Args
-}
-
-// NetworkListOptions holds parameters to filter the list of networks with.
-type NetworkListOptions struct {
-	Filters filters.Args
-}
-
-// HijackedResponse holds connection information for a hijacked request.
-type HijackedResponse struct {
-	Conn   net.Conn
-	Reader *bufio.Reader
-}
-
-// Close closes the hijacked connection and reader.
-func (h *HijackedResponse) Close() {
-	h.Conn.Close()
-}
-
-// CloseWriter is an interface that implements structs
-// that close input streams to prevent from writing.
-type CloseWriter interface {
-	CloseWrite() error
-}
-
-// CloseWrite closes a readWriter for writing.
-func (h *HijackedResponse) CloseWrite() error {
-	if conn, ok := h.Conn.(CloseWriter); ok {
-		return conn.CloseWrite()
-	}
-	return nil
-}
-
-// ImageBuildOptions holds the information
-// necessary to build images.
-type ImageBuildOptions struct {
-	Tags           []string
-	SuppressOutput bool
-	RemoteContext  string
-	NoCache        bool
-	Remove         bool
-	ForceRemove    bool
-	PullParent     bool
-	Isolation      container.Isolation
-	CPUSetCPUs     string
-	CPUSetMems     string
-	CPUShares      int64
-	CPUQuota       int64
-	CPUPeriod      int64
-	Memory         int64
-	MemorySwap     int64
-	CgroupParent   string
-	NetworkMode    string
-	ShmSize        int64
-	Dockerfile     string
-	Ulimits        []*units.Ulimit
-	// BuildArgs needs to be a *string instead of just a string so that
-	// we can tell the difference between "" (empty string) and no value
-	// at all (nil). See the parsing of buildArgs in
-	// api/server/router/build/build_routes.go for even more info.
-	BuildArgs   map[string]*string
-	AuthConfigs map[string]AuthConfig
-	Context     io.Reader
-	Labels      map[string]string
-	// squash the resulting image's layers to the parent
-	// preserves the original image and creates a new one from the parent with all
-	// the changes applied to a single layer
-	Squash bool
-	// CacheFrom specifies images that are used for matching cache. Images
-	// specified here do not need to have a valid parent chain to match cache.
-	CacheFrom   []string
-	SecurityOpt []string
-	ExtraHosts  []string // List of extra hosts
-	Target      string
-}
-
-// ImageBuildResponse holds information
-// returned by a server after building
-// an image.
-type ImageBuildResponse struct {
-	Body   io.ReadCloser
-	OSType string
-}
-
-// ImageCreateOptions holds information to create images.
-type ImageCreateOptions struct {
-	RegistryAuth string // RegistryAuth is the base64 encoded credentials for the registry
-}
-
-// ImageImportSource holds source information for ImageImport
-type ImageImportSource struct {
-	Source     io.Reader // Source is the data to send to the server to create this image from. You must set SourceName to "-" to leverage this.
-	SourceName string    // SourceName is the name of the image to pull. Set to "-" to leverage the Source attribute.
-}
-
-// ImageImportOptions holds information to import images from the client host.
-type ImageImportOptions struct {
-	Tag     string   // Tag is the name to tag this image with. This attribute is deprecated.
-	Message string   // Message is the message to tag the image with
-	Changes []string // Changes are the raw changes to apply to this image
-}
-
-// ImageListOptions holds parameters to filter the list of images with.
-type ImageListOptions struct {
-	All     bool
-	Filters filters.Args
-}
-
-// ImageLoadResponse returns information to the client about a load process.
-type ImageLoadResponse struct {
-	// Body must be closed to avoid a resource leak
-	Body io.ReadCloser
-	JSON bool
-}
-
-// ImagePullOptions holds information to pull images.
-type ImagePullOptions struct {
-	All           bool
-	RegistryAuth  string // RegistryAuth is the base64 encoded credentials for the registry
-	PrivilegeFunc RequestPrivilegeFunc
-}
-
-// RequestPrivilegeFunc is a function interface that
-// clients can supply to retry operations after
-// getting an authorization error.
-// This function returns the registry authentication
-// header value in base 64 format, or an error
-// if the privilege request fails.
-type RequestPrivilegeFunc func() (string, error)
-
-//ImagePushOptions holds information to push images.
-type ImagePushOptions ImagePullOptions
-
-// ImageRemoveOptions holds parameters to remove images.
-type ImageRemoveOptions struct {
-	Force         bool
-	PruneChildren bool
-}
-
-// ImageSearchOptions holds parameters to search images with.
-type ImageSearchOptions struct {
-	RegistryAuth  string
-	PrivilegeFunc RequestPrivilegeFunc
-	Filters       filters.Args
-	Limit         int
-}
-
-// ResizeOptions holds parameters to resize a tty.
-// It can be used to resize container ttys and
-// exec process ttys too.
-type ResizeOptions struct {
-	Height uint
-	Width  uint
-}
-
-// NodeListOptions holds parameters to list nodes with.
-type NodeListOptions struct {
-	Filters filters.Args
-}
-
-// NodeRemoveOptions holds parameters to remove nodes with.
-type NodeRemoveOptions struct {
-	Force bool
-}
-
-// ServiceCreateOptions contains the options to use when creating a service.
-type ServiceCreateOptions struct {
-	// EncodedRegistryAuth is the encoded registry authorization credentials to
-	// use when updating the service.
-	//
-	// This field follows the format of the X-Registry-Auth header.
-	EncodedRegistryAuth string
-}
-
-// ServiceCreateResponse contains the information returned to a client
-// on the creation of a new service.
-type ServiceCreateResponse struct {
-	// ID is the ID of the created service.
-	ID string
-	// Warnings is a set of non-fatal warning messages to pass on to the user.
-	Warnings []string `json:",omitempty"`
-}
-
-// Values for RegistryAuthFrom in ServiceUpdateOptions
-const (
-	RegistryAuthFromSpec         = "spec"
-	RegistryAuthFromPreviousSpec = "previous-spec"
-)
-
-// ServiceUpdateOptions contains the options to be used for updating services.
-type ServiceUpdateOptions struct {
-	// EncodedRegistryAuth is the encoded registry authorization credentials to
-	// use when updating the service.
-	//
-	// This field follows the format of the X-Registry-Auth header.
-	EncodedRegistryAuth string
-
-	// TODO(stevvooe): Consider moving the version parameter of ServiceUpdate
-	// into this field. While it does open API users up to racy writes, most
-	// users may not need that level of consistency in practice.
-
-	// RegistryAuthFrom specifies where to find the registry authorization
-	// credentials if they are not given in EncodedRegistryAuth. Valid
-	// values are "spec" and "previous-spec".
-	RegistryAuthFrom string
-
-	// Rollback indicates whether a server-side rollback should be
-	// performed. When this is set, the provided spec will be ignored.
-	// The valid values are "previous" and "none". An empty value is the
-	// same as "none".
-	Rollback string
-}
-
-// ServiceListOptions holds parameters to list services with.
-type ServiceListOptions struct {
-	Filters filters.Args
-}
-
-// ServiceInspectOptions holds parameters related to the "service inspect"
-// operation.
-type ServiceInspectOptions struct {
-	InsertDefaults bool
-}
-
-// TaskListOptions holds parameters to list tasks with.
-type TaskListOptions struct {
-	Filters filters.Args
-}
-
-// PluginRemoveOptions holds parameters to remove plugins.
-type PluginRemoveOptions struct {
-	Force bool
-}
-
-// PluginEnableOptions holds parameters to enable plugins.
-type PluginEnableOptions struct {
-	Timeout int
-}
-
-// PluginDisableOptions holds parameters to disable plugins.
-type PluginDisableOptions struct {
-	Force bool
-}
-
-// PluginInstallOptions holds parameters to install a plugin.
-type PluginInstallOptions struct {
-	Disabled              bool
-	AcceptAllPermissions  bool
-	RegistryAuth          string // RegistryAuth is the base64 encoded credentials for the registry
-	RemoteRef             string // RemoteRef is the plugin name on the registry
-	PrivilegeFunc         RequestPrivilegeFunc
-	AcceptPermissionsFunc func(PluginPrivileges) (bool, error)
-	Args                  []string
-}
-
-// SwarmUnlockKeyResponse contains the response for Engine API:
-// GET /swarm/unlockkey
-type SwarmUnlockKeyResponse struct {
-	// UnlockKey is the unlock key in ASCII-armored format.
-	UnlockKey string
-}
-
-// PluginCreateOptions hold all options to plugin create.
-type PluginCreateOptions struct {
-	RepoName string
-}
diff --git a/vendor/github.com/docker/docker/api/types/configs.go b/vendor/github.com/docker/docker/api/types/configs.go
deleted file mode 100644
index 20c19f2132..0000000000
--- a/vendor/github.com/docker/docker/api/types/configs.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package types
-
-import (
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
-)
-
-// configs holds structs used for internal communication between the
-// frontend (such as an http server) and the backend (such as the
-// docker daemon).
-
-// ContainerCreateConfig is the parameter set to ContainerCreate()
-type ContainerCreateConfig struct {
-	Name             string
-	Config           *container.Config
-	HostConfig       *container.HostConfig
-	NetworkingConfig *network.NetworkingConfig
-	AdjustCPUShares  bool
-}
-
-// ContainerRmConfig holds arguments for the container remove
-// operation. This struct is used to tell the backend what operations
-// to perform.
-type ContainerRmConfig struct {
-	ForceRemove, RemoveVolume, RemoveLink bool
-}
-
-// ContainerCommitConfig contains build configs for commit operation,
-// and is used when making a commit with the current state of the container.
-type ContainerCommitConfig struct {
-	Pause   bool
-	Repo    string
-	Tag     string
-	Author  string
-	Comment string
-	// merge container config into commit config before commit
-	MergeConfigs bool
-	Config       *container.Config
-}
-
-// ExecConfig is a small subset of the Config struct that holds the configuration
-// for the exec feature of docker.
-type ExecConfig struct {
-	User         string   // User that will run the command
-	Privileged   bool     // Is the container in privileged mode
-	Tty          bool     // Attach standard streams to a tty.
-	AttachStdin  bool     // Attach the standard input, makes possible user interaction
-	AttachStderr bool     // Attach the standard error
-	AttachStdout bool     // Attach the standard output
-	Detach       bool     // Execute in detach mode
-	DetachKeys   string   // Escape keys for detach
-	Env          []string // Environment variables
-	Cmd          []string // Execution commands and args
-}
-
-// PluginRmConfig holds arguments for plugin remove.
-type PluginRmConfig struct {
-	ForceRemove bool
-}
-
-// PluginEnableConfig holds arguments for plugin enable
-type PluginEnableConfig struct {
-	Timeout int
-}
-
-// PluginDisableConfig holds arguments for plugin disable.
-type PluginDisableConfig struct {
-	ForceDisable bool
-}
diff --git a/vendor/github.com/docker/docker/api/types/container/config.go b/vendor/github.com/docker/docker/api/types/container/config.go
deleted file mode 100644
index 02e1b87a78..0000000000
--- a/vendor/github.com/docker/docker/api/types/container/config.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package container
-
-import (
-	"time"
-
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/go-connections/nat"
-)
-
-// HealthConfig holds configuration settings for the HEALTHCHECK feature.
-type HealthConfig struct {
-	// Test is the test to perform to check that the container is healthy.
-	// An empty slice means to inherit the default.
-	// The options are:
-	// {} : inherit healthcheck
-	// {"NONE"} : disable healthcheck
-	// {"CMD", args...} : exec arguments directly
-	// {"CMD-SHELL", command} : run command with system's default shell
-	Test []string `json:",omitempty"`
-
-	// Zero means to inherit. Durations are expressed as integer nanoseconds.
-	Interval    time.Duration `json:",omitempty"` // Interval is the time to wait between checks.
-	Timeout     time.Duration `json:",omitempty"` // Timeout is the time to wait before considering the check to have hung.
-	StartPeriod time.Duration `json:",omitempty"` // The start period for the container to initialize before the retries starts to count down.
-
-	// Retries is the number of consecutive failures needed to consider a container as unhealthy.
-	// Zero means inherit.
-	Retries int `json:",omitempty"`
-}
-
-// Config contains the configuration data about a container.
-// It should hold only portable information about the container.
-// Here, "portable" means "independent from the host we are running on".
-// Non-portable information *should* appear in HostConfig.
-// All fields added to this struct must be marked `omitempty` to keep getting
-// predictable hashes from the old `v1Compatibility` configuration.
-type Config struct {
-	Hostname        string              // Hostname
-	Domainname      string              // Domainname
-	User            string              // User that will run the command(s) inside the container, also support user:group
-	AttachStdin     bool                // Attach the standard input, makes possible user interaction
-	AttachStdout    bool                // Attach the standard output
-	AttachStderr    bool                // Attach the standard error
-	ExposedPorts    nat.PortSet         `json:",omitempty"` // List of exposed ports
-	Tty             bool                // Attach standard streams to a tty, including stdin if it is not closed.
-	OpenStdin       bool                // Open stdin
-	StdinOnce       bool                // If true, close stdin after the 1 attached client disconnects.
-	Env             []string            // List of environment variable to set in the container
-	Cmd             strslice.StrSlice   // Command to run when starting the container
-	Healthcheck     *HealthConfig       `json:",omitempty"` // Healthcheck describes how to check the container is healthy
-	ArgsEscaped     bool                `json:",omitempty"` // True if command is already escaped (Windows specific)
-	Image           string              // Name of the image as it was passed by the operator (e.g. could be symbolic)
-	Volumes         map[string]struct{} // List of volumes (mounts) used for the container
-	WorkingDir      string              // Current directory (PWD) in the command will be launched
-	Entrypoint      strslice.StrSlice   // Entrypoint to run when starting the container
-	NetworkDisabled bool                `json:",omitempty"` // Is network disabled
-	MacAddress      string              `json:",omitempty"` // Mac Address of the container
-	OnBuild         []string            // ONBUILD metadata that were defined on the image Dockerfile
-	Labels          map[string]string   // List of labels set to this container
-	StopSignal      string              `json:",omitempty"` // Signal to stop a container
-	StopTimeout     *int                `json:",omitempty"` // Timeout (in seconds) to stop a container
-	Shell           strslice.StrSlice   `json:",omitempty"` // Shell for shell-form of RUN, CMD, ENTRYPOINT
-}
diff --git a/vendor/github.com/docker/docker/api/types/container/container_changes.go b/vendor/github.com/docker/docker/api/types/container/container_changes.go
deleted file mode 100644
index 767945a532..0000000000
--- a/vendor/github.com/docker/docker/api/types/container/container_changes.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package container
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/generate-swagger-api.sh
-// ----------------------------------------------------------------------------
-
-// ContainerChangeResponseItem container change response item
-// swagger:model ContainerChangeResponseItem
-type ContainerChangeResponseItem struct {
-
-	// Kind of change
-	// Required: true
-	Kind uint8 `json:"Kind"`
-
-	// Path to file that has changed
-	// Required: true
-	Path string `json:"Path"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/container/container_create.go b/vendor/github.com/docker/docker/api/types/container/container_create.go
deleted file mode 100644
index c95023b814..0000000000
--- a/vendor/github.com/docker/docker/api/types/container/container_create.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package container
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/generate-swagger-api.sh
-// ----------------------------------------------------------------------------
-
-// ContainerCreateCreatedBody container create created body
-// swagger:model ContainerCreateCreatedBody
-type ContainerCreateCreatedBody struct {
-
-	// The ID of the created container
-	// Required: true
-	ID string `json:"Id"`
-
-	// Warnings encountered when creating the container
-	// Required: true
-	Warnings []string `json:"Warnings"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/container/container_top.go b/vendor/github.com/docker/docker/api/types/container/container_top.go
deleted file mode 100644
index 78bc37ee5e..0000000000
--- a/vendor/github.com/docker/docker/api/types/container/container_top.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package container
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/generate-swagger-api.sh
-// ----------------------------------------------------------------------------
-
-// ContainerTopOKBody container top o k body
-// swagger:model ContainerTopOKBody
-type ContainerTopOKBody struct {
-
-	// Each process running in the container, where each is process is an array of values corresponding to the titles
-	// Required: true
-	Processes [][]string `json:"Processes"`
-
-	// The ps column titles
-	// Required: true
-	Titles []string `json:"Titles"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/container/container_update.go b/vendor/github.com/docker/docker/api/types/container/container_update.go
deleted file mode 100644
index 2339366fbd..0000000000
--- a/vendor/github.com/docker/docker/api/types/container/container_update.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package container
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/generate-swagger-api.sh
-// ----------------------------------------------------------------------------
-
-// ContainerUpdateOKBody container update o k body
-// swagger:model ContainerUpdateOKBody
-type ContainerUpdateOKBody struct {
-
-	// warnings
-	// Required: true
-	Warnings []string `json:"Warnings"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/container/container_wait.go b/vendor/github.com/docker/docker/api/types/container/container_wait.go
deleted file mode 100644
index 77ecdbaf7a..0000000000
--- a/vendor/github.com/docker/docker/api/types/container/container_wait.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package container
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/generate-swagger-api.sh
-// ----------------------------------------------------------------------------
-
-// ContainerWaitOKBody container wait o k body
-// swagger:model ContainerWaitOKBody
-type ContainerWaitOKBody struct {
-
-	// Exit code of the container
-	// Required: true
-	StatusCode int64 `json:"StatusCode"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/container/host_config.go b/vendor/github.com/docker/docker/api/types/container/host_config.go
deleted file mode 100644
index 9fea9eb04b..0000000000
--- a/vendor/github.com/docker/docker/api/types/container/host_config.go
+++ /dev/null
@@ -1,380 +0,0 @@
-package container
-
-import (
-	"strings"
-
-	"github.com/docker/docker/api/types/blkiodev"
-	"github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/go-connections/nat"
-	"github.com/docker/go-units"
-)
-
-// Isolation represents the isolation technology of a container. The supported
-// values are platform specific
-type Isolation string
-
-// IsDefault indicates the default isolation technology of a container. On Linux this
-// is the native driver. On Windows, this is a Windows Server Container.
-func (i Isolation) IsDefault() bool {
-	return strings.ToLower(string(i)) == "default" || string(i) == ""
-}
-
-// IpcMode represents the container ipc stack.
-type IpcMode string
-
-// IsPrivate indicates whether the container uses its private ipc stack.
-func (n IpcMode) IsPrivate() bool {
-	return !(n.IsHost() || n.IsContainer())
-}
-
-// IsHost indicates whether the container uses the host's ipc stack.
-func (n IpcMode) IsHost() bool {
-	return n == "host"
-}
-
-// IsContainer indicates whether the container uses a container's ipc stack.
-func (n IpcMode) IsContainer() bool {
-	parts := strings.SplitN(string(n), ":", 2)
-	return len(parts) > 1 && parts[0] == "container"
-}
-
-// Valid indicates whether the ipc stack is valid.
-func (n IpcMode) Valid() bool {
-	parts := strings.Split(string(n), ":")
-	switch mode := parts[0]; mode {
-	case "", "host":
-	case "container":
-		if len(parts) != 2 || parts[1] == "" {
-			return false
-		}
-	default:
-		return false
-	}
-	return true
-}
-
-// Container returns the name of the container ipc stack is going to be used.
-func (n IpcMode) Container() string {
-	parts := strings.SplitN(string(n), ":", 2)
-	if len(parts) > 1 {
-		return parts[1]
-	}
-	return ""
-}
-
-// NetworkMode represents the container network stack.
-type NetworkMode string
-
-// IsNone indicates whether container isn't using a network stack.
-func (n NetworkMode) IsNone() bool {
-	return n == "none"
-}
-
-// IsDefault indicates whether container uses the default network stack.
-func (n NetworkMode) IsDefault() bool {
-	return n == "default"
-}
-
-// IsPrivate indicates whether container uses its private network stack.
-func (n NetworkMode) IsPrivate() bool {
-	return !(n.IsHost() || n.IsContainer())
-}
-
-// IsContainer indicates whether container uses a container network stack.
-func (n NetworkMode) IsContainer() bool {
-	parts := strings.SplitN(string(n), ":", 2)
-	return len(parts) > 1 && parts[0] == "container"
-}
-
-// ConnectedContainer is the id of the container which network this container is connected to.
-func (n NetworkMode) ConnectedContainer() string {
-	parts := strings.SplitN(string(n), ":", 2)
-	if len(parts) > 1 {
-		return parts[1]
-	}
-	return ""
-}
-
-//UserDefined indicates user-created network
-func (n NetworkMode) UserDefined() string {
-	if n.IsUserDefined() {
-		return string(n)
-	}
-	return ""
-}
-
-// UsernsMode represents userns mode in the container.
-type UsernsMode string
-
-// IsHost indicates whether the container uses the host's userns.
-func (n UsernsMode) IsHost() bool {
-	return n == "host"
-}
-
-// IsPrivate indicates whether the container uses the a private userns.
-func (n UsernsMode) IsPrivate() bool {
-	return !(n.IsHost())
-}
-
-// Valid indicates whether the userns is valid.
-func (n UsernsMode) Valid() bool {
-	parts := strings.Split(string(n), ":")
-	switch mode := parts[0]; mode {
-	case "", "host":
-	default:
-		return false
-	}
-	return true
-}
-
-// CgroupSpec represents the cgroup to use for the container.
-type CgroupSpec string
-
-// IsContainer indicates whether the container is using another container cgroup
-func (c CgroupSpec) IsContainer() bool {
-	parts := strings.SplitN(string(c), ":", 2)
-	return len(parts) > 1 && parts[0] == "container"
-}
-
-// Valid indicates whether the cgroup spec is valid.
-func (c CgroupSpec) Valid() bool {
-	return c.IsContainer() || c == ""
-}
-
-// Container returns the name of the container whose cgroup will be used.
-func (c CgroupSpec) Container() string {
-	parts := strings.SplitN(string(c), ":", 2)
-	if len(parts) > 1 {
-		return parts[1]
-	}
-	return ""
-}
-
-// UTSMode represents the UTS namespace of the container.
-type UTSMode string
-
-// IsPrivate indicates whether the container uses its private UTS namespace.
-func (n UTSMode) IsPrivate() bool {
-	return !(n.IsHost())
-}
-
-// IsHost indicates whether the container uses the host's UTS namespace.
-func (n UTSMode) IsHost() bool {
-	return n == "host"
-}
-
-// Valid indicates whether the UTS namespace is valid.
-func (n UTSMode) Valid() bool {
-	parts := strings.Split(string(n), ":")
-	switch mode := parts[0]; mode {
-	case "", "host":
-	default:
-		return false
-	}
-	return true
-}
-
-// PidMode represents the pid namespace of the container.
-type PidMode string
-
-// IsPrivate indicates whether the container uses its own new pid namespace.
-func (n PidMode) IsPrivate() bool {
-	return !(n.IsHost() || n.IsContainer())
-}
-
-// IsHost indicates whether the container uses the host's pid namespace.
-func (n PidMode) IsHost() bool {
-	return n == "host"
-}
-
-// IsContainer indicates whether the container uses a container's pid namespace.
-func (n PidMode) IsContainer() bool {
-	parts := strings.SplitN(string(n), ":", 2)
-	return len(parts) > 1 && parts[0] == "container"
-}
-
-// Valid indicates whether the pid namespace is valid.
-func (n PidMode) Valid() bool {
-	parts := strings.Split(string(n), ":")
-	switch mode := parts[0]; mode {
-	case "", "host":
-	case "container":
-		if len(parts) != 2 || parts[1] == "" {
-			return false
-		}
-	default:
-		return false
-	}
-	return true
-}
-
-// Container returns the name of the container whose pid namespace is going to be used.
-func (n PidMode) Container() string {
-	parts := strings.SplitN(string(n), ":", 2)
-	if len(parts) > 1 {
-		return parts[1]
-	}
-	return ""
-}
-
-// DeviceMapping represents the device mapping between the host and the container.
-type DeviceMapping struct {
-	PathOnHost        string
-	PathInContainer   string
-	CgroupPermissions string
-}
-
-// RestartPolicy represents the restart policies of the container.
-type RestartPolicy struct {
-	Name              string
-	MaximumRetryCount int
-}
-
-// IsNone indicates whether the container has the "no" restart policy.
-// This means the container will not automatically restart when exiting.
-func (rp *RestartPolicy) IsNone() bool {
-	return rp.Name == "no" || rp.Name == ""
-}
-
-// IsAlways indicates whether the container has the "always" restart policy.
-// This means the container will automatically restart regardless of the exit status.
-func (rp *RestartPolicy) IsAlways() bool {
-	return rp.Name == "always"
-}
-
-// IsOnFailure indicates whether the container has the "on-failure" restart policy.
-// This means the container will automatically restart of exiting with a non-zero exit status.
-func (rp *RestartPolicy) IsOnFailure() bool {
-	return rp.Name == "on-failure"
-}
-
-// IsUnlessStopped indicates whether the container has the
-// "unless-stopped" restart policy. This means the container will
-// automatically restart unless user has put it to stopped state.
-func (rp *RestartPolicy) IsUnlessStopped() bool {
-	return rp.Name == "unless-stopped"
-}
-
-// IsSame compares two RestartPolicy to see if they are the same
-func (rp *RestartPolicy) IsSame(tp *RestartPolicy) bool {
-	return rp.Name == tp.Name && rp.MaximumRetryCount == tp.MaximumRetryCount
-}
-
-// LogMode is a type to define the available modes for logging
-// These modes affect how logs are handled when log messages start piling up.
-type LogMode string
-
-// Available logging modes
-const (
-	LogModeUnset            = ""
-	LogModeBlocking LogMode = "blocking"
-	LogModeNonBlock LogMode = "non-blocking"
-)
-
-// LogConfig represents the logging configuration of the container.
-type LogConfig struct {
-	Type   string
-	Config map[string]string
-}
-
-// Resources contains container's resources (cgroups config, ulimits...)
-type Resources struct {
-	// Applicable to all platforms
-	CPUShares int64 `json:"CpuShares"` // CPU shares (relative weight vs. other containers)
-	Memory    int64 // Memory limit (in bytes)
-	NanoCPUs  int64 `json:"NanoCpus"` // CPU quota in units of 10<sup>-9</sup> CPUs.
-
-	// Applicable to UNIX platforms
-	CgroupParent         string // Parent cgroup.
-	BlkioWeight          uint16 // Block IO weight (relative weight vs. other containers)
-	BlkioWeightDevice    []*blkiodev.WeightDevice
-	BlkioDeviceReadBps   []*blkiodev.ThrottleDevice
-	BlkioDeviceWriteBps  []*blkiodev.ThrottleDevice
-	BlkioDeviceReadIOps  []*blkiodev.ThrottleDevice
-	BlkioDeviceWriteIOps []*blkiodev.ThrottleDevice
-	CPUPeriod            int64           `json:"CpuPeriod"`          // CPU CFS (Completely Fair Scheduler) period
-	CPUQuota             int64           `json:"CpuQuota"`           // CPU CFS (Completely Fair Scheduler) quota
-	CPURealtimePeriod    int64           `json:"CpuRealtimePeriod"`  // CPU real-time period
-	CPURealtimeRuntime   int64           `json:"CpuRealtimeRuntime"` // CPU real-time runtime
-	CpusetCpus           string          // CpusetCpus 0-2, 0,1
-	CpusetMems           string          // CpusetMems 0-2, 0,1
-	Devices              []DeviceMapping // List of devices to map inside the container
-	DeviceCgroupRules    []string        // List of rule to be added to the device cgroup
-	DiskQuota            int64           // Disk limit (in bytes)
-	KernelMemory         int64           // Kernel memory limit (in bytes)
-	MemoryReservation    int64           // Memory soft limit (in bytes)
-	MemorySwap           int64           // Total memory usage (memory + swap); set `-1` to enable unlimited swap
-	MemorySwappiness     *int64          // Tuning container memory swappiness behaviour
-	OomKillDisable       *bool           // Whether to disable OOM Killer or not
-	PidsLimit            int64           // Setting pids limit for a container
-	Ulimits              []*units.Ulimit // List of ulimits to be set in the container
-
-	// Applicable to Windows
-	CPUCount           int64  `json:"CpuCount"`   // CPU count
-	CPUPercent         int64  `json:"CpuPercent"` // CPU percent
-	IOMaximumIOps      uint64 // Maximum IOps for the container system drive
-	IOMaximumBandwidth uint64 // Maximum IO in bytes per second for the container system drive
-}
-
-// UpdateConfig holds the mutable attributes of a Container.
-// Those attributes can be updated at runtime.
-type UpdateConfig struct {
-	// Contains container's resources (cgroups, ulimits)
-	Resources
-	RestartPolicy RestartPolicy
-}
-
-// HostConfig the non-portable Config structure of a container.
-// Here, "non-portable" means "dependent of the host we are running on".
-// Portable information *should* appear in Config.
-type HostConfig struct {
-	// Applicable to all platforms
-	Binds           []string      // List of volume bindings for this container
-	ContainerIDFile string        // File (path) where the containerId is written
-	LogConfig       LogConfig     // Configuration of the logs for this container
-	NetworkMode     NetworkMode   // Network mode to use for the container
-	PortBindings    nat.PortMap   // Port mapping between the exposed port (container) and the host
-	RestartPolicy   RestartPolicy // Restart policy to be used for the container
-	AutoRemove      bool          // Automatically remove container when it exits
-	VolumeDriver    string        // Name of the volume driver used to mount volumes
-	VolumesFrom     []string      // List of volumes to take from other container
-
-	// Applicable to UNIX platforms
-	CapAdd          strslice.StrSlice // List of kernel capabilities to add to the container
-	CapDrop         strslice.StrSlice // List of kernel capabilities to remove from the container
-	DNS             []string          `json:"Dns"`        // List of DNS server to lookup
-	DNSOptions      []string          `json:"DnsOptions"` // List of DNSOption to look for
-	DNSSearch       []string          `json:"DnsSearch"`  // List of DNSSearch to look for
-	ExtraHosts      []string          // List of extra hosts
-	GroupAdd        []string          // List of additional groups that the container process will run as
-	IpcMode         IpcMode           // IPC namespace to use for the container
-	Cgroup          CgroupSpec        // Cgroup to use for the container
-	Links           []string          // List of links (in the name:alias form)
-	OomScoreAdj     int               // Container preference for OOM-killing
-	PidMode         PidMode           // PID namespace to use for the container
-	Privileged      bool              // Is the container in privileged mode
-	PublishAllPorts bool              // Should docker publish all exposed port for the container
-	ReadonlyRootfs  bool              // Is the container root filesystem in read-only
-	SecurityOpt     []string          // List of string values to customize labels for MLS systems, such as SELinux.
-	StorageOpt      map[string]string `json:",omitempty"` // Storage driver options per container.
-	Tmpfs           map[string]string `json:",omitempty"` // List of tmpfs (mounts) used for the container
-	UTSMode         UTSMode           // UTS namespace to use for the container
-	UsernsMode      UsernsMode        // The user namespace to use for the container
-	ShmSize         int64             // Total shm memory usage
-	Sysctls         map[string]string `json:",omitempty"` // List of Namespaced sysctls used for the container
-	Runtime         string            `json:",omitempty"` // Runtime to use with this container
-
-	// Applicable to Windows
-	ConsoleSize [2]uint   // Initial console size (height,width)
-	Isolation   Isolation // Isolation technology of the container (e.g. default, hyperv)
-
-	// Contains container's resources (cgroups, ulimits)
-	Resources
-
-	// Mounts specs used by the container
-	Mounts []mount.Mount `json:",omitempty"`
-
-	// Run a custom init inside the container, if null, use the daemon's configured settings
-	Init *bool `json:",omitempty"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go b/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go
deleted file mode 100644
index 2d664d1c96..0000000000
--- a/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// +build !windows
-
-package container
-
-// IsValid indicates if an isolation technology is valid
-func (i Isolation) IsValid() bool {
-	return i.IsDefault()
-}
-
-// NetworkName returns the name of the network stack.
-func (n NetworkMode) NetworkName() string {
-	if n.IsBridge() {
-		return "bridge"
-	} else if n.IsHost() {
-		return "host"
-	} else if n.IsContainer() {
-		return "container"
-	} else if n.IsNone() {
-		return "none"
-	} else if n.IsDefault() {
-		return "default"
-	} else if n.IsUserDefined() {
-		return n.UserDefined()
-	}
-	return ""
-}
-
-// IsBridge indicates whether container uses the bridge network stack
-func (n NetworkMode) IsBridge() bool {
-	return n == "bridge"
-}
-
-// IsHost indicates whether container uses the host network stack.
-func (n NetworkMode) IsHost() bool {
-	return n == "host"
-}
-
-// IsUserDefined indicates user-created network
-func (n NetworkMode) IsUserDefined() bool {
-	return !n.IsDefault() && !n.IsBridge() && !n.IsHost() && !n.IsNone() && !n.IsContainer()
-}
diff --git a/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go b/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go
deleted file mode 100644
index 469923f7e9..0000000000
--- a/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package container
-
-import (
-	"strings"
-)
-
-// IsBridge indicates whether container uses the bridge network stack
-// in windows it is given the name NAT
-func (n NetworkMode) IsBridge() bool {
-	return n == "nat"
-}
-
-// IsHost indicates whether container uses the host network stack.
-// returns false as this is not supported by windows
-func (n NetworkMode) IsHost() bool {
-	return false
-}
-
-// IsUserDefined indicates user-created network
-func (n NetworkMode) IsUserDefined() bool {
-	return !n.IsDefault() && !n.IsNone() && !n.IsBridge() && !n.IsContainer()
-}
-
-// IsHyperV indicates the use of a Hyper-V partition for isolation
-func (i Isolation) IsHyperV() bool {
-	return strings.ToLower(string(i)) == "hyperv"
-}
-
-// IsProcess indicates the use of process isolation
-func (i Isolation) IsProcess() bool {
-	return strings.ToLower(string(i)) == "process"
-}
-
-// IsValid indicates if an isolation technology is valid
-func (i Isolation) IsValid() bool {
-	return i.IsDefault() || i.IsHyperV() || i.IsProcess()
-}
-
-// NetworkName returns the name of the network stack.
-func (n NetworkMode) NetworkName() string {
-	if n.IsDefault() {
-		return "default"
-	} else if n.IsBridge() {
-		return "nat"
-	} else if n.IsNone() {
-		return "none"
-	} else if n.IsContainer() {
-		return "container"
-	} else if n.IsUserDefined() {
-		return n.UserDefined()
-	}
-
-	return ""
-}
diff --git a/vendor/github.com/docker/docker/api/types/error_response.go b/vendor/github.com/docker/docker/api/types/error_response.go
deleted file mode 100644
index dc942d9d9e..0000000000
--- a/vendor/github.com/docker/docker/api/types/error_response.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// ErrorResponse Represents an error.
-// swagger:model ErrorResponse
-type ErrorResponse struct {
-
-	// The error message.
-	// Required: true
-	Message string `json:"message"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/events/events.go b/vendor/github.com/docker/docker/api/types/events/events.go
deleted file mode 100644
index 7129a65acf..0000000000
--- a/vendor/github.com/docker/docker/api/types/events/events.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package events
-
-const (
-	// ContainerEventType is the event type that containers generate
-	ContainerEventType = "container"
-	// DaemonEventType is the event type that daemon generate
-	DaemonEventType = "daemon"
-	// ImageEventType is the event type that images generate
-	ImageEventType = "image"
-	// NetworkEventType is the event type that networks generate
-	NetworkEventType = "network"
-	// PluginEventType is the event type that plugins generate
-	PluginEventType = "plugin"
-	// VolumeEventType is the event type that volumes generate
-	VolumeEventType = "volume"
-)
-
-// Actor describes something that generates events,
-// like a container, or a network, or a volume.
-// It has a defined name and a set or attributes.
-// The container attributes are its labels, other actors
-// can generate these attributes from other properties.
-type Actor struct {
-	ID         string
-	Attributes map[string]string
-}
-
-// Message represents the information an event contains
-type Message struct {
-	// Deprecated information from JSONMessage.
-	// With data only in container events.
-	Status string `json:"status,omitempty"`
-	ID     string `json:"id,omitempty"`
-	From   string `json:"from,omitempty"`
-
-	Type   string
-	Action string
-	Actor  Actor
-
-	Time     int64 `json:"time,omitempty"`
-	TimeNano int64 `json:"timeNano,omitempty"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/filters/parse.go b/vendor/github.com/docker/docker/api/types/filters/parse.go
deleted file mode 100644
index beec3d4940..0000000000
--- a/vendor/github.com/docker/docker/api/types/filters/parse.go
+++ /dev/null
@@ -1,310 +0,0 @@
-// Package filters provides helper function to parse and handle command line
-// filter, used for example in docker ps or docker images commands.
-package filters
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"regexp"
-	"strings"
-
-	"github.com/docker/docker/api/types/versions"
-)
-
-// Args stores filter arguments as map key:{map key: bool}.
-// It contains an aggregation of the map of arguments (which are in the form
-// of -f 'key=value') based on the key, and stores values for the same key
-// in a map with string keys and boolean values.
-// e.g given -f 'label=label1=1' -f 'label=label2=2' -f 'image.name=ubuntu'
-// the args will be {"image.name":{"ubuntu":true},"label":{"label1=1":true,"label2=2":true}}
-type Args struct {
-	fields map[string]map[string]bool
-}
-
-// NewArgs initializes a new Args struct.
-func NewArgs() Args {
-	return Args{fields: map[string]map[string]bool{}}
-}
-
-// ParseFlag parses the argument to the filter flag. Like
-//
-//   `docker ps -f 'created=today' -f 'image.name=ubuntu*'`
-//
-// If prev map is provided, then it is appended to, and returned. By default a new
-// map is created.
-func ParseFlag(arg string, prev Args) (Args, error) {
-	filters := prev
-	if len(arg) == 0 {
-		return filters, nil
-	}
-
-	if !strings.Contains(arg, "=") {
-		return filters, ErrBadFormat
-	}
-
-	f := strings.SplitN(arg, "=", 2)
-
-	name := strings.ToLower(strings.TrimSpace(f[0]))
-	value := strings.TrimSpace(f[1])
-
-	filters.Add(name, value)
-
-	return filters, nil
-}
-
-// ErrBadFormat is an error returned in case of bad format for a filter.
-var ErrBadFormat = errors.New("bad format of filter (expected name=value)")
-
-// ToParam packs the Args into a string for easy transport from client to server.
-func ToParam(a Args) (string, error) {
-	// this way we don't URL encode {}, just empty space
-	if a.Len() == 0 {
-		return "", nil
-	}
-
-	buf, err := json.Marshal(a.fields)
-	if err != nil {
-		return "", err
-	}
-	return string(buf), nil
-}
-
-// ToParamWithVersion packs the Args into a string for easy transport from client to server.
-// The generated string will depend on the specified version (corresponding to the API version).
-func ToParamWithVersion(version string, a Args) (string, error) {
-	// this way we don't URL encode {}, just empty space
-	if a.Len() == 0 {
-		return "", nil
-	}
-
-	// for daemons older than v1.10, filter must be of the form map[string][]string
-	var buf []byte
-	var err error
-	if version != "" && versions.LessThan(version, "1.22") {
-		buf, err = json.Marshal(convertArgsToSlice(a.fields))
-	} else {
-		buf, err = json.Marshal(a.fields)
-	}
-	if err != nil {
-		return "", err
-	}
-	return string(buf), nil
-}
-
-// FromParam unpacks the filter Args.
-func FromParam(p string) (Args, error) {
-	if len(p) == 0 {
-		return NewArgs(), nil
-	}
-
-	r := strings.NewReader(p)
-	d := json.NewDecoder(r)
-
-	m := map[string]map[string]bool{}
-	if err := d.Decode(&m); err != nil {
-		r.Seek(0, 0)
-
-		// Allow parsing old arguments in slice format.
-		// Because other libraries might be sending them in this format.
-		deprecated := map[string][]string{}
-		if deprecatedErr := d.Decode(&deprecated); deprecatedErr == nil {
-			m = deprecatedArgs(deprecated)
-		} else {
-			return NewArgs(), err
-		}
-	}
-	return Args{m}, nil
-}
-
-// Get returns the list of values associates with a field.
-// It returns a slice of strings to keep backwards compatibility with old code.
-func (filters Args) Get(field string) []string {
-	values := filters.fields[field]
-	if values == nil {
-		return make([]string, 0)
-	}
-	slice := make([]string, 0, len(values))
-	for key := range values {
-		slice = append(slice, key)
-	}
-	return slice
-}
-
-// Add adds a new value to a filter field.
-func (filters Args) Add(name, value string) {
-	if _, ok := filters.fields[name]; ok {
-		filters.fields[name][value] = true
-	} else {
-		filters.fields[name] = map[string]bool{value: true}
-	}
-}
-
-// Del removes a value from a filter field.
-func (filters Args) Del(name, value string) {
-	if _, ok := filters.fields[name]; ok {
-		delete(filters.fields[name], value)
-		if len(filters.fields[name]) == 0 {
-			delete(filters.fields, name)
-		}
-	}
-}
-
-// Len returns the number of fields in the arguments.
-func (filters Args) Len() int {
-	return len(filters.fields)
-}
-
-// MatchKVList returns true if the values for the specified field matches the ones
-// from the sources.
-// e.g. given Args are {'label': {'label1=1','label2=1'}, 'image.name', {'ubuntu'}},
-//      field is 'label' and sources are {'label1': '1', 'label2': '2'}
-//      it returns true.
-func (filters Args) MatchKVList(field string, sources map[string]string) bool {
-	fieldValues := filters.fields[field]
-
-	//do not filter if there is no filter set or cannot determine filter
-	if len(fieldValues) == 0 {
-		return true
-	}
-
-	if len(sources) == 0 {
-		return false
-	}
-
-	for name2match := range fieldValues {
-		testKV := strings.SplitN(name2match, "=", 2)
-
-		v, ok := sources[testKV[0]]
-		if !ok {
-			return false
-		}
-		if len(testKV) == 2 && testKV[1] != v {
-			return false
-		}
-	}
-
-	return true
-}
-
-// Match returns true if the values for the specified field matches the source string
-// e.g. given Args are {'label': {'label1=1','label2=1'}, 'image.name', {'ubuntu'}},
-//      field is 'image.name' and source is 'ubuntu'
-//      it returns true.
-func (filters Args) Match(field, source string) bool {
-	if filters.ExactMatch(field, source) {
-		return true
-	}
-
-	fieldValues := filters.fields[field]
-	for name2match := range fieldValues {
-		match, err := regexp.MatchString(name2match, source)
-		if err != nil {
-			continue
-		}
-		if match {
-			return true
-		}
-	}
-	return false
-}
-
-// ExactMatch returns true if the source matches exactly one of the filters.
-func (filters Args) ExactMatch(field, source string) bool {
-	fieldValues, ok := filters.fields[field]
-	//do not filter if there is no filter set or cannot determine filter
-	if !ok || len(fieldValues) == 0 {
-		return true
-	}
-
-	// try to match full name value to avoid O(N) regular expression matching
-	return fieldValues[source]
-}
-
-// UniqueExactMatch returns true if there is only one filter and the source matches exactly this one.
-func (filters Args) UniqueExactMatch(field, source string) bool {
-	fieldValues := filters.fields[field]
-	//do not filter if there is no filter set or cannot determine filter
-	if len(fieldValues) == 0 {
-		return true
-	}
-	if len(filters.fields[field]) != 1 {
-		return false
-	}
-
-	// try to match full name value to avoid O(N) regular expression matching
-	return fieldValues[source]
-}
-
-// FuzzyMatch returns true if the source matches exactly one of the filters,
-// or the source has one of the filters as a prefix.
-func (filters Args) FuzzyMatch(field, source string) bool {
-	if filters.ExactMatch(field, source) {
-		return true
-	}
-
-	fieldValues := filters.fields[field]
-	for prefix := range fieldValues {
-		if strings.HasPrefix(source, prefix) {
-			return true
-		}
-	}
-	return false
-}
-
-// Include returns true if the name of the field to filter is in the filters.
-func (filters Args) Include(field string) bool {
-	_, ok := filters.fields[field]
-	return ok
-}
-
-// Validate ensures that all the fields in the filter are valid.
-// It returns an error as soon as it finds an invalid field.
-func (filters Args) Validate(accepted map[string]bool) error {
-	for name := range filters.fields {
-		if !accepted[name] {
-			return fmt.Errorf("Invalid filter '%s'", name)
-		}
-	}
-	return nil
-}
-
-// WalkValues iterates over the list of filtered values for a field.
-// It stops the iteration if it finds an error and it returns that error.
-func (filters Args) WalkValues(field string, op func(value string) error) error {
-	if _, ok := filters.fields[field]; !ok {
-		return nil
-	}
-	for v := range filters.fields[field] {
-		if err := op(v); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func deprecatedArgs(d map[string][]string) map[string]map[string]bool {
-	m := map[string]map[string]bool{}
-	for k, v := range d {
-		values := map[string]bool{}
-		for _, vv := range v {
-			values[vv] = true
-		}
-		m[k] = values
-	}
-	return m
-}
-
-func convertArgsToSlice(f map[string]map[string]bool) map[string][]string {
-	m := map[string][]string{}
-	for k, v := range f {
-		values := []string{}
-		for kk := range v {
-			if v[kk] {
-				values = append(values, kk)
-			}
-		}
-		m[k] = values
-	}
-	return m
-}
diff --git a/vendor/github.com/docker/docker/api/types/graph_driver_data.go b/vendor/github.com/docker/docker/api/types/graph_driver_data.go
deleted file mode 100644
index 4d9bf1c62c..0000000000
--- a/vendor/github.com/docker/docker/api/types/graph_driver_data.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// GraphDriverData Information about a container's graph driver.
-// swagger:model GraphDriverData
-type GraphDriverData struct {
-
-	// data
-	// Required: true
-	Data map[string]string `json:"Data"`
-
-	// name
-	// Required: true
-	Name string `json:"Name"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/id_response.go b/vendor/github.com/docker/docker/api/types/id_response.go
deleted file mode 100644
index 7592d2f8b1..0000000000
--- a/vendor/github.com/docker/docker/api/types/id_response.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// IDResponse Response to an API call that returns just an Id
-// swagger:model IdResponse
-type IDResponse struct {
-
-	// The id of the newly created object.
-	// Required: true
-	ID string `json:"Id"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/image/image_history.go b/vendor/github.com/docker/docker/api/types/image/image_history.go
deleted file mode 100644
index 0dd30c729a..0000000000
--- a/vendor/github.com/docker/docker/api/types/image/image_history.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package image
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/generate-swagger-api.sh
-// ----------------------------------------------------------------------------
-
-// HistoryResponseItem history response item
-// swagger:model HistoryResponseItem
-type HistoryResponseItem struct {
-
-	// comment
-	// Required: true
-	Comment string `json:"Comment"`
-
-	// created
-	// Required: true
-	Created int64 `json:"Created"`
-
-	// created by
-	// Required: true
-	CreatedBy string `json:"CreatedBy"`
-
-	// Id
-	// Required: true
-	ID string `json:"Id"`
-
-	// size
-	// Required: true
-	Size int64 `json:"Size"`
-
-	// tags
-	// Required: true
-	Tags []string `json:"Tags"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/image_delete_response_item.go b/vendor/github.com/docker/docker/api/types/image_delete_response_item.go
deleted file mode 100644
index b9a65a0d8e..0000000000
--- a/vendor/github.com/docker/docker/api/types/image_delete_response_item.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// ImageDeleteResponseItem image delete response item
-// swagger:model ImageDeleteResponseItem
-type ImageDeleteResponseItem struct {
-
-	// The image ID of an image that was deleted
-	Deleted string `json:"Deleted,omitempty"`
-
-	// The image ID of an image that was untagged
-	Untagged string `json:"Untagged,omitempty"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/image_summary.go b/vendor/github.com/docker/docker/api/types/image_summary.go
deleted file mode 100644
index e145b3dcfc..0000000000
--- a/vendor/github.com/docker/docker/api/types/image_summary.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// ImageSummary image summary
-// swagger:model ImageSummary
-type ImageSummary struct {
-
-	// containers
-	// Required: true
-	Containers int64 `json:"Containers"`
-
-	// created
-	// Required: true
-	Created int64 `json:"Created"`
-
-	// Id
-	// Required: true
-	ID string `json:"Id"`
-
-	// labels
-	// Required: true
-	Labels map[string]string `json:"Labels"`
-
-	// parent Id
-	// Required: true
-	ParentID string `json:"ParentId"`
-
-	// repo digests
-	// Required: true
-	RepoDigests []string `json:"RepoDigests"`
-
-	// repo tags
-	// Required: true
-	RepoTags []string `json:"RepoTags"`
-
-	// shared size
-	// Required: true
-	SharedSize int64 `json:"SharedSize"`
-
-	// size
-	// Required: true
-	Size int64 `json:"Size"`
-
-	// virtual size
-	// Required: true
-	VirtualSize int64 `json:"VirtualSize"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/mount/mount.go b/vendor/github.com/docker/docker/api/types/mount/mount.go
deleted file mode 100644
index 2744f85d6d..0000000000
--- a/vendor/github.com/docker/docker/api/types/mount/mount.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package mount
-
-import (
-	"os"
-)
-
-// Type represents the type of a mount.
-type Type string
-
-// Type constants
-const (
-	// TypeBind is the type for mounting host dir
-	TypeBind Type = "bind"
-	// TypeVolume is the type for remote storage volumes
-	TypeVolume Type = "volume"
-	// TypeTmpfs is the type for mounting tmpfs
-	TypeTmpfs Type = "tmpfs"
-)
-
-// Mount represents a mount (volume).
-type Mount struct {
-	Type Type `json:",omitempty"`
-	// Source specifies the name of the mount. Depending on mount type, this
-	// may be a volume name or a host path, or even ignored.
-	// Source is not supported for tmpfs (must be an empty value)
-	Source      string      `json:",omitempty"`
-	Target      string      `json:",omitempty"`
-	ReadOnly    bool        `json:",omitempty"`
-	Consistency Consistency `json:",omitempty"`
-
-	BindOptions   *BindOptions   `json:",omitempty"`
-	VolumeOptions *VolumeOptions `json:",omitempty"`
-	TmpfsOptions  *TmpfsOptions  `json:",omitempty"`
-}
-
-// Propagation represents the propagation of a mount.
-type Propagation string
-
-const (
-	// PropagationRPrivate RPRIVATE
-	PropagationRPrivate Propagation = "rprivate"
-	// PropagationPrivate PRIVATE
-	PropagationPrivate Propagation = "private"
-	// PropagationRShared RSHARED
-	PropagationRShared Propagation = "rshared"
-	// PropagationShared SHARED
-	PropagationShared Propagation = "shared"
-	// PropagationRSlave RSLAVE
-	PropagationRSlave Propagation = "rslave"
-	// PropagationSlave SLAVE
-	PropagationSlave Propagation = "slave"
-)
-
-// Propagations is the list of all valid mount propagations
-var Propagations = []Propagation{
-	PropagationRPrivate,
-	PropagationPrivate,
-	PropagationRShared,
-	PropagationShared,
-	PropagationRSlave,
-	PropagationSlave,
-}
-
-// Consistency represents the consistency requirements of a mount.
-type Consistency string
-
-const (
-	// ConsistencyFull guarantees bind-mount-like consistency
-	ConsistencyFull Consistency = "consistent"
-	// ConsistencyCached mounts can cache read data and FS structure
-	ConsistencyCached Consistency = "cached"
-	// ConsistencyDelegated mounts can cache read and written data and structure
-	ConsistencyDelegated Consistency = "delegated"
-	// ConsistencyDefault provides "consistent" behavior unless overridden
-	ConsistencyDefault Consistency = "default"
-)
-
-// BindOptions defines options specific to mounts of type "bind".
-type BindOptions struct {
-	Propagation Propagation `json:",omitempty"`
-}
-
-// VolumeOptions represents the options for a mount of type volume.
-type VolumeOptions struct {
-	NoCopy       bool              `json:",omitempty"`
-	Labels       map[string]string `json:",omitempty"`
-	DriverConfig *Driver           `json:",omitempty"`
-}
-
-// Driver represents a volume driver.
-type Driver struct {
-	Name    string            `json:",omitempty"`
-	Options map[string]string `json:",omitempty"`
-}
-
-// TmpfsOptions defines options specific to mounts of type "tmpfs".
-type TmpfsOptions struct {
-	// Size sets the size of the tmpfs, in bytes.
-	//
-	// This will be converted to an operating system specific value
-	// depending on the host. For example, on linux, it will be converted to
-	// use a 'k', 'm' or 'g' syntax. BSD, though not widely supported with
-	// docker, uses a straight byte value.
-	//
-	// Percentages are not supported.
-	SizeBytes int64 `json:",omitempty"`
-	// Mode of the tmpfs upon creation
-	Mode os.FileMode `json:",omitempty"`
-
-	// TODO(stevvooe): There are several more tmpfs flags, specified in the
-	// daemon, that are accepted. Only the most basic are added for now.
-	//
-	// From docker/docker/pkg/mount/flags.go:
-	//
-	// var validFlags = map[string]bool{
-	// 	"":          true,
-	// 	"size":      true, X
-	// 	"mode":      true, X
-	// 	"uid":       true,
-	// 	"gid":       true,
-	// 	"nr_inodes": true,
-	// 	"nr_blocks": true,
-	// 	"mpol":      true,
-	// }
-	//
-	// Some of these may be straightforward to add, but others, such as
-	// uid/gid have implications in a clustered system.
-}
diff --git a/vendor/github.com/docker/docker/api/types/network/network.go b/vendor/github.com/docker/docker/api/types/network/network.go
deleted file mode 100644
index 8d15ed21b5..0000000000
--- a/vendor/github.com/docker/docker/api/types/network/network.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package network
-
-// Address represents an IP address
-type Address struct {
-	Addr      string
-	PrefixLen int
-}
-
-// IPAM represents IP Address Management
-type IPAM struct {
-	Driver  string
-	Options map[string]string //Per network IPAM driver options
-	Config  []IPAMConfig
-}
-
-// IPAMConfig represents IPAM configurations
-type IPAMConfig struct {
-	Subnet     string            `json:",omitempty"`
-	IPRange    string            `json:",omitempty"`
-	Gateway    string            `json:",omitempty"`
-	AuxAddress map[string]string `json:"AuxiliaryAddresses,omitempty"`
-}
-
-// EndpointIPAMConfig represents IPAM configurations for the endpoint
-type EndpointIPAMConfig struct {
-	IPv4Address  string   `json:",omitempty"`
-	IPv6Address  string   `json:",omitempty"`
-	LinkLocalIPs []string `json:",omitempty"`
-}
-
-// Copy makes a copy of the endpoint ipam config
-func (cfg *EndpointIPAMConfig) Copy() *EndpointIPAMConfig {
-	cfgCopy := *cfg
-	cfgCopy.LinkLocalIPs = make([]string, 0, len(cfg.LinkLocalIPs))
-	cfgCopy.LinkLocalIPs = append(cfgCopy.LinkLocalIPs, cfg.LinkLocalIPs...)
-	return &cfgCopy
-}
-
-// PeerInfo represents one peer of an overlay network
-type PeerInfo struct {
-	Name string
-	IP   string
-}
-
-// EndpointSettings stores the network endpoint details
-type EndpointSettings struct {
-	// Configurations
-	IPAMConfig *EndpointIPAMConfig
-	Links      []string
-	Aliases    []string
-	// Operational data
-	NetworkID           string
-	EndpointID          string
-	Gateway             string
-	IPAddress           string
-	IPPrefixLen         int
-	IPv6Gateway         string
-	GlobalIPv6Address   string
-	GlobalIPv6PrefixLen int
-	MacAddress          string
-}
-
-// Task carries the information about one backend task
-type Task struct {
-	Name       string
-	EndpointID string
-	EndpointIP string
-	Info       map[string]string
-}
-
-// ServiceInfo represents service parameters with the list of service's tasks
-type ServiceInfo struct {
-	VIP          string
-	Ports        []string
-	LocalLBIndex int
-	Tasks        []Task
-}
-
-// Copy makes a deep copy of `EndpointSettings`
-func (es *EndpointSettings) Copy() *EndpointSettings {
-	epCopy := *es
-	if es.IPAMConfig != nil {
-		epCopy.IPAMConfig = es.IPAMConfig.Copy()
-	}
-
-	if es.Links != nil {
-		links := make([]string, 0, len(es.Links))
-		epCopy.Links = append(links, es.Links...)
-	}
-
-	if es.Aliases != nil {
-		aliases := make([]string, 0, len(es.Aliases))
-		epCopy.Aliases = append(aliases, es.Aliases...)
-	}
-	return &epCopy
-}
-
-// NetworkingConfig represents the container's networking configuration for each of its interfaces
-// Carries the networking configs specified in the `docker run` and `docker network connect` commands
-type NetworkingConfig struct {
-	EndpointsConfig map[string]*EndpointSettings // Endpoint configs for each connecting network
-}
diff --git a/vendor/github.com/docker/docker/api/types/plugin.go b/vendor/github.com/docker/docker/api/types/plugin.go
deleted file mode 100644
index ed3c2c26e4..0000000000
--- a/vendor/github.com/docker/docker/api/types/plugin.go
+++ /dev/null
@@ -1,200 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// Plugin A plugin for the Engine API
-// swagger:model Plugin
-type Plugin struct {
-
-	// config
-	// Required: true
-	Config PluginConfig `json:"Config"`
-
-	// True when the plugin is running. False when the plugin is not running, only installed.
-	// Required: true
-	Enabled bool `json:"Enabled"`
-
-	// Id
-	ID string `json:"Id,omitempty"`
-
-	// name
-	// Required: true
-	Name string `json:"Name"`
-
-	// plugin remote reference used to push/pull the plugin
-	PluginReference string `json:"PluginReference,omitempty"`
-
-	// settings
-	// Required: true
-	Settings PluginSettings `json:"Settings"`
-}
-
-// PluginConfig The config of a plugin.
-// swagger:model PluginConfig
-type PluginConfig struct {
-
-	// args
-	// Required: true
-	Args PluginConfigArgs `json:"Args"`
-
-	// description
-	// Required: true
-	Description string `json:"Description"`
-
-	// Docker Version used to create the plugin
-	DockerVersion string `json:"DockerVersion,omitempty"`
-
-	// documentation
-	// Required: true
-	Documentation string `json:"Documentation"`
-
-	// entrypoint
-	// Required: true
-	Entrypoint []string `json:"Entrypoint"`
-
-	// env
-	// Required: true
-	Env []PluginEnv `json:"Env"`
-
-	// interface
-	// Required: true
-	Interface PluginConfigInterface `json:"Interface"`
-
-	// ipc host
-	// Required: true
-	IpcHost bool `json:"IpcHost"`
-
-	// linux
-	// Required: true
-	Linux PluginConfigLinux `json:"Linux"`
-
-	// mounts
-	// Required: true
-	Mounts []PluginMount `json:"Mounts"`
-
-	// network
-	// Required: true
-	Network PluginConfigNetwork `json:"Network"`
-
-	// pid host
-	// Required: true
-	PidHost bool `json:"PidHost"`
-
-	// propagated mount
-	// Required: true
-	PropagatedMount string `json:"PropagatedMount"`
-
-	// user
-	User PluginConfigUser `json:"User,omitempty"`
-
-	// work dir
-	// Required: true
-	WorkDir string `json:"WorkDir"`
-
-	// rootfs
-	Rootfs *PluginConfigRootfs `json:"rootfs,omitempty"`
-}
-
-// PluginConfigArgs plugin config args
-// swagger:model PluginConfigArgs
-type PluginConfigArgs struct {
-
-	// description
-	// Required: true
-	Description string `json:"Description"`
-
-	// name
-	// Required: true
-	Name string `json:"Name"`
-
-	// settable
-	// Required: true
-	Settable []string `json:"Settable"`
-
-	// value
-	// Required: true
-	Value []string `json:"Value"`
-}
-
-// PluginConfigInterface The interface between Docker and the plugin
-// swagger:model PluginConfigInterface
-type PluginConfigInterface struct {
-
-	// socket
-	// Required: true
-	Socket string `json:"Socket"`
-
-	// types
-	// Required: true
-	Types []PluginInterfaceType `json:"Types"`
-}
-
-// PluginConfigLinux plugin config linux
-// swagger:model PluginConfigLinux
-type PluginConfigLinux struct {
-
-	// allow all devices
-	// Required: true
-	AllowAllDevices bool `json:"AllowAllDevices"`
-
-	// capabilities
-	// Required: true
-	Capabilities []string `json:"Capabilities"`
-
-	// devices
-	// Required: true
-	Devices []PluginDevice `json:"Devices"`
-}
-
-// PluginConfigNetwork plugin config network
-// swagger:model PluginConfigNetwork
-type PluginConfigNetwork struct {
-
-	// type
-	// Required: true
-	Type string `json:"Type"`
-}
-
-// PluginConfigRootfs plugin config rootfs
-// swagger:model PluginConfigRootfs
-type PluginConfigRootfs struct {
-
-	// diff ids
-	DiffIds []string `json:"diff_ids"`
-
-	// type
-	Type string `json:"type,omitempty"`
-}
-
-// PluginConfigUser plugin config user
-// swagger:model PluginConfigUser
-type PluginConfigUser struct {
-
-	// g ID
-	GID uint32 `json:"GID,omitempty"`
-
-	// UID
-	UID uint32 `json:"UID,omitempty"`
-}
-
-// PluginSettings Settings that can be modified by users.
-// swagger:model PluginSettings
-type PluginSettings struct {
-
-	// args
-	// Required: true
-	Args []string `json:"Args"`
-
-	// devices
-	// Required: true
-	Devices []PluginDevice `json:"Devices"`
-
-	// env
-	// Required: true
-	Env []string `json:"Env"`
-
-	// mounts
-	// Required: true
-	Mounts []PluginMount `json:"Mounts"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/plugin_device.go b/vendor/github.com/docker/docker/api/types/plugin_device.go
deleted file mode 100644
index 5699010675..0000000000
--- a/vendor/github.com/docker/docker/api/types/plugin_device.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// PluginDevice plugin device
-// swagger:model PluginDevice
-type PluginDevice struct {
-
-	// description
-	// Required: true
-	Description string `json:"Description"`
-
-	// name
-	// Required: true
-	Name string `json:"Name"`
-
-	// path
-	// Required: true
-	Path *string `json:"Path"`
-
-	// settable
-	// Required: true
-	Settable []string `json:"Settable"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/plugin_env.go b/vendor/github.com/docker/docker/api/types/plugin_env.go
deleted file mode 100644
index 32962dc2eb..0000000000
--- a/vendor/github.com/docker/docker/api/types/plugin_env.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// PluginEnv plugin env
-// swagger:model PluginEnv
-type PluginEnv struct {
-
-	// description
-	// Required: true
-	Description string `json:"Description"`
-
-	// name
-	// Required: true
-	Name string `json:"Name"`
-
-	// settable
-	// Required: true
-	Settable []string `json:"Settable"`
-
-	// value
-	// Required: true
-	Value *string `json:"Value"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/plugin_interface_type.go b/vendor/github.com/docker/docker/api/types/plugin_interface_type.go
deleted file mode 100644
index c82f204e87..0000000000
--- a/vendor/github.com/docker/docker/api/types/plugin_interface_type.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// PluginInterfaceType plugin interface type
-// swagger:model PluginInterfaceType
-type PluginInterfaceType struct {
-
-	// capability
-	// Required: true
-	Capability string `json:"Capability"`
-
-	// prefix
-	// Required: true
-	Prefix string `json:"Prefix"`
-
-	// version
-	// Required: true
-	Version string `json:"Version"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/plugin_mount.go b/vendor/github.com/docker/docker/api/types/plugin_mount.go
deleted file mode 100644
index 5c031cf8b5..0000000000
--- a/vendor/github.com/docker/docker/api/types/plugin_mount.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// PluginMount plugin mount
-// swagger:model PluginMount
-type PluginMount struct {
-
-	// description
-	// Required: true
-	Description string `json:"Description"`
-
-	// destination
-	// Required: true
-	Destination string `json:"Destination"`
-
-	// name
-	// Required: true
-	Name string `json:"Name"`
-
-	// options
-	// Required: true
-	Options []string `json:"Options"`
-
-	// settable
-	// Required: true
-	Settable []string `json:"Settable"`
-
-	// source
-	// Required: true
-	Source *string `json:"Source"`
-
-	// type
-	// Required: true
-	Type string `json:"Type"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/plugin_responses.go b/vendor/github.com/docker/docker/api/types/plugin_responses.go
deleted file mode 100644
index 1c6461f2d9..0000000000
--- a/vendor/github.com/docker/docker/api/types/plugin_responses.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package types
-
-import (
-	"encoding/json"
-	"fmt"
-	"sort"
-)
-
-// PluginsListResponse contains the response for the Engine API
-type PluginsListResponse []*Plugin
-
-const (
-	authzDriver   = "AuthzDriver"
-	graphDriver   = "GraphDriver"
-	ipamDriver    = "IpamDriver"
-	networkDriver = "NetworkDriver"
-	volumeDriver  = "VolumeDriver"
-)
-
-// UnmarshalJSON implements json.Unmarshaler for PluginInterfaceType
-func (t *PluginInterfaceType) UnmarshalJSON(p []byte) error {
-	versionIndex := len(p)
-	prefixIndex := 0
-	if len(p) < 2 || p[0] != '"' || p[len(p)-1] != '"' {
-		return fmt.Errorf("%q is not a plugin interface type", p)
-	}
-	p = p[1 : len(p)-1]
-loop:
-	for i, b := range p {
-		switch b {
-		case '.':
-			prefixIndex = i
-		case '/':
-			versionIndex = i
-			break loop
-		}
-	}
-	t.Prefix = string(p[:prefixIndex])
-	t.Capability = string(p[prefixIndex+1 : versionIndex])
-	if versionIndex < len(p) {
-		t.Version = string(p[versionIndex+1:])
-	}
-	return nil
-}
-
-// MarshalJSON implements json.Marshaler for PluginInterfaceType
-func (t *PluginInterfaceType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(t.String())
-}
-
-// String implements fmt.Stringer for PluginInterfaceType
-func (t PluginInterfaceType) String() string {
-	return fmt.Sprintf("%s.%s/%s", t.Prefix, t.Capability, t.Version)
-}
-
-// PluginPrivilege describes a permission the user has to accept
-// upon installing a plugin.
-type PluginPrivilege struct {
-	Name        string
-	Description string
-	Value       []string
-}
-
-// PluginPrivileges is a list of PluginPrivilege
-type PluginPrivileges []PluginPrivilege
-
-func (s PluginPrivileges) Len() int {
-	return len(s)
-}
-
-func (s PluginPrivileges) Less(i, j int) bool {
-	return s[i].Name < s[j].Name
-}
-
-func (s PluginPrivileges) Swap(i, j int) {
-	sort.Strings(s[i].Value)
-	sort.Strings(s[j].Value)
-	s[i], s[j] = s[j], s[i]
-}
diff --git a/vendor/github.com/docker/docker/api/types/port.go b/vendor/github.com/docker/docker/api/types/port.go
deleted file mode 100644
index ad52d46d56..0000000000
--- a/vendor/github.com/docker/docker/api/types/port.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// Port An open port on a container
-// swagger:model Port
-type Port struct {
-
-	// IP
-	IP string `json:"IP,omitempty"`
-
-	// Port on the container
-	// Required: true
-	PrivatePort uint16 `json:"PrivatePort"`
-
-	// Port exposed on the host
-	PublicPort uint16 `json:"PublicPort,omitempty"`
-
-	// type
-	// Required: true
-	Type string `json:"Type"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/registry/authenticate.go b/vendor/github.com/docker/docker/api/types/registry/authenticate.go
deleted file mode 100644
index 42cac4430a..0000000000
--- a/vendor/github.com/docker/docker/api/types/registry/authenticate.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package registry
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/generate-swagger-api.sh
-// ----------------------------------------------------------------------------
-
-// AuthenticateOKBody authenticate o k body
-// swagger:model AuthenticateOKBody
-type AuthenticateOKBody struct {
-
-	// An opaque token used to authenticate a user after a successful login
-	// Required: true
-	IdentityToken string `json:"IdentityToken"`
-
-	// The status of the authentication
-	// Required: true
-	Status string `json:"Status"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/registry/registry.go b/vendor/github.com/docker/docker/api/types/registry/registry.go
deleted file mode 100644
index 28fafab901..0000000000
--- a/vendor/github.com/docker/docker/api/types/registry/registry.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package registry
-
-import (
-	"encoding/json"
-	"net"
-)
-
-// ServiceConfig stores daemon registry services configuration.
-type ServiceConfig struct {
-	InsecureRegistryCIDRs []*NetIPNet           `json:"InsecureRegistryCIDRs"`
-	IndexConfigs          map[string]*IndexInfo `json:"IndexConfigs"`
-	Mirrors               []string
-}
-
-// NetIPNet is the net.IPNet type, which can be marshalled and
-// unmarshalled to JSON
-type NetIPNet net.IPNet
-
-// String returns the CIDR notation of ipnet
-func (ipnet *NetIPNet) String() string {
-	return (*net.IPNet)(ipnet).String()
-}
-
-// MarshalJSON returns the JSON representation of the IPNet
-func (ipnet *NetIPNet) MarshalJSON() ([]byte, error) {
-	return json.Marshal((*net.IPNet)(ipnet).String())
-}
-
-// UnmarshalJSON sets the IPNet from a byte array of JSON
-func (ipnet *NetIPNet) UnmarshalJSON(b []byte) (err error) {
-	var ipnetStr string
-	if err = json.Unmarshal(b, &ipnetStr); err == nil {
-		var cidr *net.IPNet
-		if _, cidr, err = net.ParseCIDR(ipnetStr); err == nil {
-			*ipnet = NetIPNet(*cidr)
-		}
-	}
-	return
-}
-
-// IndexInfo contains information about a registry
-//
-// RepositoryInfo Examples:
-// {
-//   "Index" : {
-//     "Name" : "docker.io",
-//     "Mirrors" : ["https://registry-2.docker.io/v1/", "https://registry-3.docker.io/v1/"],
-//     "Secure" : true,
-//     "Official" : true,
-//   },
-//   "RemoteName" : "library/debian",
-//   "LocalName" : "debian",
-//   "CanonicalName" : "docker.io/debian"
-//   "Official" : true,
-// }
-//
-// {
-//   "Index" : {
-//     "Name" : "127.0.0.1:5000",
-//     "Mirrors" : [],
-//     "Secure" : false,
-//     "Official" : false,
-//   },
-//   "RemoteName" : "user/repo",
-//   "LocalName" : "127.0.0.1:5000/user/repo",
-//   "CanonicalName" : "127.0.0.1:5000/user/repo",
-//   "Official" : false,
-// }
-type IndexInfo struct {
-	// Name is the name of the registry, such as "docker.io"
-	Name string
-	// Mirrors is a list of mirrors, expressed as URIs
-	Mirrors []string
-	// Secure is set to false if the registry is part of the list of
-	// insecure registries. Insecure registries accept HTTP and/or accept
-	// HTTPS with certificates from unknown CAs.
-	Secure bool
-	// Official indicates whether this is an official registry
-	Official bool
-}
-
-// SearchResult describes a search result returned from a registry
-type SearchResult struct {
-	// StarCount indicates the number of stars this repository has
-	StarCount int `json:"star_count"`
-	// IsOfficial is true if the result is from an official repository.
-	IsOfficial bool `json:"is_official"`
-	// Name is the name of the repository
-	Name string `json:"name"`
-	// IsAutomated indicates whether the result is automated
-	IsAutomated bool `json:"is_automated"`
-	// Description is a textual description of the repository
-	Description string `json:"description"`
-}
-
-// SearchResults lists a collection search results returned from a registry
-type SearchResults struct {
-	// Query contains the query string that generated the search results
-	Query string `json:"query"`
-	// NumResults indicates the number of results the query returned
-	NumResults int `json:"num_results"`
-	// Results is a slice containing the actual results for the search
-	Results []SearchResult `json:"results"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/seccomp.go b/vendor/github.com/docker/docker/api/types/seccomp.go
deleted file mode 100644
index 7d62c9a43f..0000000000
--- a/vendor/github.com/docker/docker/api/types/seccomp.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package types
-
-// Seccomp represents the config for a seccomp profile for syscall restriction.
-type Seccomp struct {
-	DefaultAction Action `json:"defaultAction"`
-	// Architectures is kept to maintain backward compatibility with the old
-	// seccomp profile.
-	Architectures []Arch         `json:"architectures,omitempty"`
-	ArchMap       []Architecture `json:"archMap,omitempty"`
-	Syscalls      []*Syscall     `json:"syscalls"`
-}
-
-// Architecture is used to represent a specific architecture
-// and its sub-architectures
-type Architecture struct {
-	Arch      Arch   `json:"architecture"`
-	SubArches []Arch `json:"subArchitectures"`
-}
-
-// Arch used for architectures
-type Arch string
-
-// Additional architectures permitted to be used for system calls
-// By default only the native architecture of the kernel is permitted
-const (
-	ArchX86         Arch = "SCMP_ARCH_X86"
-	ArchX86_64      Arch = "SCMP_ARCH_X86_64"
-	ArchX32         Arch = "SCMP_ARCH_X32"
-	ArchARM         Arch = "SCMP_ARCH_ARM"
-	ArchAARCH64     Arch = "SCMP_ARCH_AARCH64"
-	ArchMIPS        Arch = "SCMP_ARCH_MIPS"
-	ArchMIPS64      Arch = "SCMP_ARCH_MIPS64"
-	ArchMIPS64N32   Arch = "SCMP_ARCH_MIPS64N32"
-	ArchMIPSEL      Arch = "SCMP_ARCH_MIPSEL"
-	ArchMIPSEL64    Arch = "SCMP_ARCH_MIPSEL64"
-	ArchMIPSEL64N32 Arch = "SCMP_ARCH_MIPSEL64N32"
-	ArchPPC         Arch = "SCMP_ARCH_PPC"
-	ArchPPC64       Arch = "SCMP_ARCH_PPC64"
-	ArchPPC64LE     Arch = "SCMP_ARCH_PPC64LE"
-	ArchS390        Arch = "SCMP_ARCH_S390"
-	ArchS390X       Arch = "SCMP_ARCH_S390X"
-)
-
-// Action taken upon Seccomp rule match
-type Action string
-
-// Define actions for Seccomp rules
-const (
-	ActKill  Action = "SCMP_ACT_KILL"
-	ActTrap  Action = "SCMP_ACT_TRAP"
-	ActErrno Action = "SCMP_ACT_ERRNO"
-	ActTrace Action = "SCMP_ACT_TRACE"
-	ActAllow Action = "SCMP_ACT_ALLOW"
-)
-
-// Operator used to match syscall arguments in Seccomp
-type Operator string
-
-// Define operators for syscall arguments in Seccomp
-const (
-	OpNotEqual     Operator = "SCMP_CMP_NE"
-	OpLessThan     Operator = "SCMP_CMP_LT"
-	OpLessEqual    Operator = "SCMP_CMP_LE"
-	OpEqualTo      Operator = "SCMP_CMP_EQ"
-	OpGreaterEqual Operator = "SCMP_CMP_GE"
-	OpGreaterThan  Operator = "SCMP_CMP_GT"
-	OpMaskedEqual  Operator = "SCMP_CMP_MASKED_EQ"
-)
-
-// Arg used for matching specific syscall arguments in Seccomp
-type Arg struct {
-	Index    uint     `json:"index"`
-	Value    uint64   `json:"value"`
-	ValueTwo uint64   `json:"valueTwo"`
-	Op       Operator `json:"op"`
-}
-
-// Filter is used to conditionally apply Seccomp rules
-type Filter struct {
-	Caps   []string `json:"caps,omitempty"`
-	Arches []string `json:"arches,omitempty"`
-}
-
-// Syscall is used to match a group of syscalls in Seccomp
-type Syscall struct {
-	Name     string   `json:"name,omitempty"`
-	Names    []string `json:"names,omitempty"`
-	Action   Action   `json:"action"`
-	Args     []*Arg   `json:"args"`
-	Comment  string   `json:"comment"`
-	Includes Filter   `json:"includes"`
-	Excludes Filter   `json:"excludes"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/service_update_response.go b/vendor/github.com/docker/docker/api/types/service_update_response.go
deleted file mode 100644
index 74ea64b1bb..0000000000
--- a/vendor/github.com/docker/docker/api/types/service_update_response.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// ServiceUpdateResponse service update response
-// swagger:model ServiceUpdateResponse
-type ServiceUpdateResponse struct {
-
-	// Optional warning messages
-	Warnings []string `json:"Warnings"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/stats.go b/vendor/github.com/docker/docker/api/types/stats.go
deleted file mode 100644
index 7ca76a5b63..0000000000
--- a/vendor/github.com/docker/docker/api/types/stats.go
+++ /dev/null
@@ -1,181 +0,0 @@
-// Package types is used for API stability in the types and response to the
-// consumers of the API stats endpoint.
-package types
-
-import "time"
-
-// ThrottlingData stores CPU throttling stats of one running container.
-// Not used on Windows.
-type ThrottlingData struct {
-	// Number of periods with throttling active
-	Periods uint64 `json:"periods"`
-	// Number of periods when the container hits its throttling limit.
-	ThrottledPeriods uint64 `json:"throttled_periods"`
-	// Aggregate time the container was throttled for in nanoseconds.
-	ThrottledTime uint64 `json:"throttled_time"`
-}
-
-// CPUUsage stores All CPU stats aggregated since container inception.
-type CPUUsage struct {
-	// Total CPU time consumed.
-	// Units: nanoseconds (Linux)
-	// Units: 100's of nanoseconds (Windows)
-	TotalUsage uint64 `json:"total_usage"`
-
-	// Total CPU time consumed per core (Linux). Not used on Windows.
-	// Units: nanoseconds.
-	PercpuUsage []uint64 `json:"percpu_usage,omitempty"`
-
-	// Time spent by tasks of the cgroup in kernel mode (Linux).
-	// Time spent by all container processes in kernel mode (Windows).
-	// Units: nanoseconds (Linux).
-	// Units: 100's of nanoseconds (Windows). Not populated for Hyper-V Containers.
-	UsageInKernelmode uint64 `json:"usage_in_kernelmode"`
-
-	// Time spent by tasks of the cgroup in user mode (Linux).
-	// Time spent by all container processes in user mode (Windows).
-	// Units: nanoseconds (Linux).
-	// Units: 100's of nanoseconds (Windows). Not populated for Hyper-V Containers
-	UsageInUsermode uint64 `json:"usage_in_usermode"`
-}
-
-// CPUStats aggregates and wraps all CPU related info of container
-type CPUStats struct {
-	// CPU Usage. Linux and Windows.
-	CPUUsage CPUUsage `json:"cpu_usage"`
-
-	// System Usage. Linux only.
-	SystemUsage uint64 `json:"system_cpu_usage,omitempty"`
-
-	// Online CPUs. Linux only.
-	OnlineCPUs uint32 `json:"online_cpus,omitempty"`
-
-	// Throttling Data. Linux only.
-	ThrottlingData ThrottlingData `json:"throttling_data,omitempty"`
-}
-
-// MemoryStats aggregates all memory stats since container inception on Linux.
-// Windows returns stats for commit and private working set only.
-type MemoryStats struct {
-	// Linux Memory Stats
-
-	// current res_counter usage for memory
-	Usage uint64 `json:"usage,omitempty"`
-	// maximum usage ever recorded.
-	MaxUsage uint64 `json:"max_usage,omitempty"`
-	// TODO(vishh): Export these as stronger types.
-	// all the stats exported via memory.stat.
-	Stats map[string]uint64 `json:"stats,omitempty"`
-	// number of times memory usage hits limits.
-	Failcnt uint64 `json:"failcnt,omitempty"`
-	Limit   uint64 `json:"limit,omitempty"`
-
-	// Windows Memory Stats
-	// See https://technet.microsoft.com/en-us/magazine/ff382715.aspx
-
-	// committed bytes
-	Commit uint64 `json:"commitbytes,omitempty"`
-	// peak committed bytes
-	CommitPeak uint64 `json:"commitpeakbytes,omitempty"`
-	// private working set
-	PrivateWorkingSet uint64 `json:"privateworkingset,omitempty"`
-}
-
-// BlkioStatEntry is one small entity to store a piece of Blkio stats
-// Not used on Windows.
-type BlkioStatEntry struct {
-	Major uint64 `json:"major"`
-	Minor uint64 `json:"minor"`
-	Op    string `json:"op"`
-	Value uint64 `json:"value"`
-}
-
-// BlkioStats stores All IO service stats for data read and write.
-// This is a Linux specific structure as the differences between expressing
-// block I/O on Windows and Linux are sufficiently significant to make
-// little sense attempting to morph into a combined structure.
-type BlkioStats struct {
-	// number of bytes transferred to and from the block device
-	IoServiceBytesRecursive []BlkioStatEntry `json:"io_service_bytes_recursive"`
-	IoServicedRecursive     []BlkioStatEntry `json:"io_serviced_recursive"`
-	IoQueuedRecursive       []BlkioStatEntry `json:"io_queue_recursive"`
-	IoServiceTimeRecursive  []BlkioStatEntry `json:"io_service_time_recursive"`
-	IoWaitTimeRecursive     []BlkioStatEntry `json:"io_wait_time_recursive"`
-	IoMergedRecursive       []BlkioStatEntry `json:"io_merged_recursive"`
-	IoTimeRecursive         []BlkioStatEntry `json:"io_time_recursive"`
-	SectorsRecursive        []BlkioStatEntry `json:"sectors_recursive"`
-}
-
-// StorageStats is the disk I/O stats for read/write on Windows.
-type StorageStats struct {
-	ReadCountNormalized  uint64 `json:"read_count_normalized,omitempty"`
-	ReadSizeBytes        uint64 `json:"read_size_bytes,omitempty"`
-	WriteCountNormalized uint64 `json:"write_count_normalized,omitempty"`
-	WriteSizeBytes       uint64 `json:"write_size_bytes,omitempty"`
-}
-
-// NetworkStats aggregates the network stats of one container
-type NetworkStats struct {
-	// Bytes received. Windows and Linux.
-	RxBytes uint64 `json:"rx_bytes"`
-	// Packets received. Windows and Linux.
-	RxPackets uint64 `json:"rx_packets"`
-	// Received errors. Not used on Windows. Note that we dont `omitempty` this
-	// field as it is expected in the >=v1.21 API stats structure.
-	RxErrors uint64 `json:"rx_errors"`
-	// Incoming packets dropped. Windows and Linux.
-	RxDropped uint64 `json:"rx_dropped"`
-	// Bytes sent. Windows and Linux.
-	TxBytes uint64 `json:"tx_bytes"`
-	// Packets sent. Windows and Linux.
-	TxPackets uint64 `json:"tx_packets"`
-	// Sent errors. Not used on Windows. Note that we dont `omitempty` this
-	// field as it is expected in the >=v1.21 API stats structure.
-	TxErrors uint64 `json:"tx_errors"`
-	// Outgoing packets dropped. Windows and Linux.
-	TxDropped uint64 `json:"tx_dropped"`
-	// Endpoint ID. Not used on Linux.
-	EndpointID string `json:"endpoint_id,omitempty"`
-	// Instance ID. Not used on Linux.
-	InstanceID string `json:"instance_id,omitempty"`
-}
-
-// PidsStats contains the stats of a container's pids
-type PidsStats struct {
-	// Current is the number of pids in the cgroup
-	Current uint64 `json:"current,omitempty"`
-	// Limit is the hard limit on the number of pids in the cgroup.
-	// A "Limit" of 0 means that there is no limit.
-	Limit uint64 `json:"limit,omitempty"`
-}
-
-// Stats is Ultimate struct aggregating all types of stats of one container
-type Stats struct {
-	// Common stats
-	Read    time.Time `json:"read"`
-	PreRead time.Time `json:"preread"`
-
-	// Linux specific stats, not populated on Windows.
-	PidsStats  PidsStats  `json:"pids_stats,omitempty"`
-	BlkioStats BlkioStats `json:"blkio_stats,omitempty"`
-
-	// Windows specific stats, not populated on Linux.
-	NumProcs     uint32       `json:"num_procs"`
-	StorageStats StorageStats `json:"storage_stats,omitempty"`
-
-	// Shared stats
-	CPUStats    CPUStats    `json:"cpu_stats,omitempty"`
-	PreCPUStats CPUStats    `json:"precpu_stats,omitempty"` // "Pre"="Previous"
-	MemoryStats MemoryStats `json:"memory_stats,omitempty"`
-}
-
-// StatsJSON is newly used Networks
-type StatsJSON struct {
-	Stats
-
-	Name string `json:"name,omitempty"`
-	ID   string `json:"id,omitempty"`
-
-	// Networks request version >=1.21
-	Networks map[string]NetworkStats `json:"networks,omitempty"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/strslice/strslice.go b/vendor/github.com/docker/docker/api/types/strslice/strslice.go
deleted file mode 100644
index bad493fb89..0000000000
--- a/vendor/github.com/docker/docker/api/types/strslice/strslice.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package strslice
-
-import "encoding/json"
-
-// StrSlice represents a string or an array of strings.
-// We need to override the json decoder to accept both options.
-type StrSlice []string
-
-// UnmarshalJSON decodes the byte slice whether it's a string or an array of
-// strings. This method is needed to implement json.Unmarshaler.
-func (e *StrSlice) UnmarshalJSON(b []byte) error {
-	if len(b) == 0 {
-		// With no input, we preserve the existing value by returning nil and
-		// leaving the target alone. This allows defining default values for
-		// the type.
-		return nil
-	}
-
-	p := make([]string, 0, 1)
-	if err := json.Unmarshal(b, &p); err != nil {
-		var s string
-		if err := json.Unmarshal(b, &s); err != nil {
-			return err
-		}
-		p = append(p, s)
-	}
-
-	*e = p
-	return nil
-}
diff --git a/vendor/github.com/docker/docker/api/types/swarm/common.go b/vendor/github.com/docker/docker/api/types/swarm/common.go
deleted file mode 100644
index dc76a146bb..0000000000
--- a/vendor/github.com/docker/docker/api/types/swarm/common.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package swarm
-
-import "time"
-
-// Version represents the internal object version.
-type Version struct {
-	Index uint64 `json:",omitempty"`
-}
-
-// Meta is a base object inherited by most of the other once.
-type Meta struct {
-	Version   Version   `json:",omitempty"`
-	CreatedAt time.Time `json:",omitempty"`
-	UpdatedAt time.Time `json:",omitempty"`
-}
-
-// Annotations represents how to describe an object.
-type Annotations struct {
-	Name   string            `json:",omitempty"`
-	Labels map[string]string `json:"Labels"`
-}
-
-// Driver represents a driver (network, logging).
-type Driver struct {
-	Name    string            `json:",omitempty"`
-	Options map[string]string `json:",omitempty"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/swarm/container.go b/vendor/github.com/docker/docker/api/types/swarm/container.go
deleted file mode 100644
index 135f7cbbfc..0000000000
--- a/vendor/github.com/docker/docker/api/types/swarm/container.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package swarm
-
-import (
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/mount"
-)
-
-// DNSConfig specifies DNS related configurations in resolver configuration file (resolv.conf)
-// Detailed documentation is available in:
-// http://man7.org/linux/man-pages/man5/resolv.conf.5.html
-// `nameserver`, `search`, `options` have been supported.
-// TODO: `domain` is not supported yet.
-type DNSConfig struct {
-	// Nameservers specifies the IP addresses of the name servers
-	Nameservers []string `json:",omitempty"`
-	// Search specifies the search list for host-name lookup
-	Search []string `json:",omitempty"`
-	// Options allows certain internal resolver variables to be modified
-	Options []string `json:",omitempty"`
-}
-
-// SELinuxContext contains the SELinux labels of the container.
-type SELinuxContext struct {
-	Disable bool
-
-	User  string
-	Role  string
-	Type  string
-	Level string
-}
-
-// CredentialSpec for managed service account (Windows only)
-type CredentialSpec struct {
-	File     string
-	Registry string
-}
-
-// Privileges defines the security options for the container.
-type Privileges struct {
-	CredentialSpec *CredentialSpec
-	SELinuxContext *SELinuxContext
-}
-
-// ContainerSpec represents the spec of a container.
-type ContainerSpec struct {
-	Image           string                  `json:",omitempty"`
-	Labels          map[string]string       `json:",omitempty"`
-	Command         []string                `json:",omitempty"`
-	Args            []string                `json:",omitempty"`
-	Hostname        string                  `json:",omitempty"`
-	Env             []string                `json:",omitempty"`
-	Dir             string                  `json:",omitempty"`
-	User            string                  `json:",omitempty"`
-	Groups          []string                `json:",omitempty"`
-	Privileges      *Privileges             `json:",omitempty"`
-	StopSignal      string                  `json:",omitempty"`
-	TTY             bool                    `json:",omitempty"`
-	OpenStdin       bool                    `json:",omitempty"`
-	ReadOnly        bool                    `json:",omitempty"`
-	Mounts          []mount.Mount           `json:",omitempty"`
-	StopGracePeriod *time.Duration          `json:",omitempty"`
-	Healthcheck     *container.HealthConfig `json:",omitempty"`
-	// The format of extra hosts on swarmkit is specified in:
-	// http://man7.org/linux/man-pages/man5/hosts.5.html
-	//    IP_address canonical_hostname [aliases...]
-	Hosts     []string           `json:",omitempty"`
-	DNSConfig *DNSConfig         `json:",omitempty"`
-	Secrets   []*SecretReference `json:",omitempty"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/swarm/network.go b/vendor/github.com/docker/docker/api/types/swarm/network.go
deleted file mode 100644
index 693f85cce1..0000000000
--- a/vendor/github.com/docker/docker/api/types/swarm/network.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package swarm
-
-// Endpoint represents an endpoint.
-type Endpoint struct {
-	Spec       EndpointSpec        `json:",omitempty"`
-	Ports      []PortConfig        `json:",omitempty"`
-	VirtualIPs []EndpointVirtualIP `json:",omitempty"`
-}
-
-// EndpointSpec represents the spec of an endpoint.
-type EndpointSpec struct {
-	Mode  ResolutionMode `json:",omitempty"`
-	Ports []PortConfig   `json:",omitempty"`
-}
-
-// ResolutionMode represents a resolution mode.
-type ResolutionMode string
-
-const (
-	// ResolutionModeVIP VIP
-	ResolutionModeVIP ResolutionMode = "vip"
-	// ResolutionModeDNSRR DNSRR
-	ResolutionModeDNSRR ResolutionMode = "dnsrr"
-)
-
-// PortConfig represents the config of a port.
-type PortConfig struct {
-	Name     string             `json:",omitempty"`
-	Protocol PortConfigProtocol `json:",omitempty"`
-	// TargetPort is the port inside the container
-	TargetPort uint32 `json:",omitempty"`
-	// PublishedPort is the port on the swarm hosts
-	PublishedPort uint32 `json:",omitempty"`
-	// PublishMode is the mode in which port is published
-	PublishMode PortConfigPublishMode `json:",omitempty"`
-}
-
-// PortConfigPublishMode represents the mode in which the port is to
-// be published.
-type PortConfigPublishMode string
-
-const (
-	// PortConfigPublishModeIngress is used for ports published
-	// for ingress load balancing using routing mesh.
-	PortConfigPublishModeIngress PortConfigPublishMode = "ingress"
-	// PortConfigPublishModeHost is used for ports published
-	// for direct host level access on the host where the task is running.
-	PortConfigPublishModeHost PortConfigPublishMode = "host"
-)
-
-// PortConfigProtocol represents the protocol of a port.
-type PortConfigProtocol string
-
-const (
-	// TODO(stevvooe): These should be used generally, not just for PortConfig.
-
-	// PortConfigProtocolTCP TCP
-	PortConfigProtocolTCP PortConfigProtocol = "tcp"
-	// PortConfigProtocolUDP UDP
-	PortConfigProtocolUDP PortConfigProtocol = "udp"
-)
-
-// EndpointVirtualIP represents the virtual ip of a port.
-type EndpointVirtualIP struct {
-	NetworkID string `json:",omitempty"`
-	Addr      string `json:",omitempty"`
-}
-
-// Network represents a network.
-type Network struct {
-	ID string
-	Meta
-	Spec        NetworkSpec  `json:",omitempty"`
-	DriverState Driver       `json:",omitempty"`
-	IPAMOptions *IPAMOptions `json:",omitempty"`
-}
-
-// NetworkSpec represents the spec of a network.
-type NetworkSpec struct {
-	Annotations
-	DriverConfiguration *Driver      `json:",omitempty"`
-	IPv6Enabled         bool         `json:",omitempty"`
-	Internal            bool         `json:",omitempty"`
-	Attachable          bool         `json:",omitempty"`
-	Ingress             bool         `json:",omitempty"`
-	IPAMOptions         *IPAMOptions `json:",omitempty"`
-}
-
-// NetworkAttachmentConfig represents the configuration of a network attachment.
-type NetworkAttachmentConfig struct {
-	Target  string   `json:",omitempty"`
-	Aliases []string `json:",omitempty"`
-}
-
-// NetworkAttachment represents a network attachment.
-type NetworkAttachment struct {
-	Network   Network  `json:",omitempty"`
-	Addresses []string `json:",omitempty"`
-}
-
-// IPAMOptions represents ipam options.
-type IPAMOptions struct {
-	Driver  Driver       `json:",omitempty"`
-	Configs []IPAMConfig `json:",omitempty"`
-}
-
-// IPAMConfig represents ipam configuration.
-type IPAMConfig struct {
-	Subnet  string `json:",omitempty"`
-	Range   string `json:",omitempty"`
-	Gateway string `json:",omitempty"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/swarm/node.go b/vendor/github.com/docker/docker/api/types/swarm/node.go
deleted file mode 100644
index 379e17a779..0000000000
--- a/vendor/github.com/docker/docker/api/types/swarm/node.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package swarm
-
-// Node represents a node.
-type Node struct {
-	ID string
-	Meta
-	// Spec defines the desired state of the node as specified by the user.
-	// The system will honor this and will *never* modify it.
-	Spec NodeSpec `json:",omitempty"`
-	// Description encapsulates the properties of the Node as reported by the
-	// agent.
-	Description NodeDescription `json:",omitempty"`
-	// Status provides the current status of the node, as seen by the manager.
-	Status NodeStatus `json:",omitempty"`
-	// ManagerStatus provides the current status of the node's manager
-	// component, if the node is a manager.
-	ManagerStatus *ManagerStatus `json:",omitempty"`
-}
-
-// NodeSpec represents the spec of a node.
-type NodeSpec struct {
-	Annotations
-	Role         NodeRole         `json:",omitempty"`
-	Availability NodeAvailability `json:",omitempty"`
-}
-
-// NodeRole represents the role of a node.
-type NodeRole string
-
-const (
-	// NodeRoleWorker WORKER
-	NodeRoleWorker NodeRole = "worker"
-	// NodeRoleManager MANAGER
-	NodeRoleManager NodeRole = "manager"
-)
-
-// NodeAvailability represents the availability of a node.
-type NodeAvailability string
-
-const (
-	// NodeAvailabilityActive ACTIVE
-	NodeAvailabilityActive NodeAvailability = "active"
-	// NodeAvailabilityPause PAUSE
-	NodeAvailabilityPause NodeAvailability = "pause"
-	// NodeAvailabilityDrain DRAIN
-	NodeAvailabilityDrain NodeAvailability = "drain"
-)
-
-// NodeDescription represents the description of a node.
-type NodeDescription struct {
-	Hostname  string            `json:",omitempty"`
-	Platform  Platform          `json:",omitempty"`
-	Resources Resources         `json:",omitempty"`
-	Engine    EngineDescription `json:",omitempty"`
-}
-
-// Platform represents the platform (Arch/OS).
-type Platform struct {
-	Architecture string `json:",omitempty"`
-	OS           string `json:",omitempty"`
-}
-
-// EngineDescription represents the description of an engine.
-type EngineDescription struct {
-	EngineVersion string              `json:",omitempty"`
-	Labels        map[string]string   `json:",omitempty"`
-	Plugins       []PluginDescription `json:",omitempty"`
-}
-
-// PluginDescription represents the description of an engine plugin.
-type PluginDescription struct {
-	Type string `json:",omitempty"`
-	Name string `json:",omitempty"`
-}
-
-// NodeStatus represents the status of a node.
-type NodeStatus struct {
-	State   NodeState `json:",omitempty"`
-	Message string    `json:",omitempty"`
-	Addr    string    `json:",omitempty"`
-}
-
-// Reachability represents the reachability of a node.
-type Reachability string
-
-const (
-	// ReachabilityUnknown UNKNOWN
-	ReachabilityUnknown Reachability = "unknown"
-	// ReachabilityUnreachable UNREACHABLE
-	ReachabilityUnreachable Reachability = "unreachable"
-	// ReachabilityReachable REACHABLE
-	ReachabilityReachable Reachability = "reachable"
-)
-
-// ManagerStatus represents the status of a manager.
-type ManagerStatus struct {
-	Leader       bool         `json:",omitempty"`
-	Reachability Reachability `json:",omitempty"`
-	Addr         string       `json:",omitempty"`
-}
-
-// NodeState represents the state of a node.
-type NodeState string
-
-const (
-	// NodeStateUnknown UNKNOWN
-	NodeStateUnknown NodeState = "unknown"
-	// NodeStateDown DOWN
-	NodeStateDown NodeState = "down"
-	// NodeStateReady READY
-	NodeStateReady NodeState = "ready"
-	// NodeStateDisconnected DISCONNECTED
-	NodeStateDisconnected NodeState = "disconnected"
-)
diff --git a/vendor/github.com/docker/docker/api/types/swarm/runtime.go b/vendor/github.com/docker/docker/api/types/swarm/runtime.go
deleted file mode 100644
index c4c731dc82..0000000000
--- a/vendor/github.com/docker/docker/api/types/swarm/runtime.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package swarm
-
-// RuntimeType is the type of runtime used for the TaskSpec
-type RuntimeType string
-
-// RuntimeURL is the proto type url
-type RuntimeURL string
-
-const (
-	// RuntimeContainer is the container based runtime
-	RuntimeContainer RuntimeType = "container"
-	// RuntimePlugin is the plugin based runtime
-	RuntimePlugin RuntimeType = "plugin"
-
-	// RuntimeURLContainer is the proto url for the container type
-	RuntimeURLContainer RuntimeURL = "types.docker.com/RuntimeContainer"
-	// RuntimeURLPlugin is the proto url for the plugin type
-	RuntimeURLPlugin RuntimeURL = "types.docker.com/RuntimePlugin"
-)
diff --git a/vendor/github.com/docker/docker/api/types/swarm/secret.go b/vendor/github.com/docker/docker/api/types/swarm/secret.go
deleted file mode 100644
index fdb2388888..0000000000
--- a/vendor/github.com/docker/docker/api/types/swarm/secret.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package swarm
-
-import "os"
-
-// Secret represents a secret.
-type Secret struct {
-	ID string
-	Meta
-	Spec SecretSpec
-}
-
-// SecretSpec represents a secret specification from a secret in swarm
-type SecretSpec struct {
-	Annotations
-	Data []byte `json:",omitempty"`
-}
-
-// SecretReferenceFileTarget is a file target in a secret reference
-type SecretReferenceFileTarget struct {
-	Name string
-	UID  string
-	GID  string
-	Mode os.FileMode
-}
-
-// SecretReference is a reference to a secret in swarm
-type SecretReference struct {
-	File       *SecretReferenceFileTarget
-	SecretID   string
-	SecretName string
-}
diff --git a/vendor/github.com/docker/docker/api/types/swarm/service.go b/vendor/github.com/docker/docker/api/types/swarm/service.go
deleted file mode 100644
index fa31a7ec86..0000000000
--- a/vendor/github.com/docker/docker/api/types/swarm/service.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package swarm
-
-import "time"
-
-// Service represents a service.
-type Service struct {
-	ID string
-	Meta
-	Spec         ServiceSpec   `json:",omitempty"`
-	PreviousSpec *ServiceSpec  `json:",omitempty"`
-	Endpoint     Endpoint      `json:",omitempty"`
-	UpdateStatus *UpdateStatus `json:",omitempty"`
-}
-
-// ServiceSpec represents the spec of a service.
-type ServiceSpec struct {
-	Annotations
-
-	// TaskTemplate defines how the service should construct new tasks when
-	// orchestrating this service.
-	TaskTemplate   TaskSpec      `json:",omitempty"`
-	Mode           ServiceMode   `json:",omitempty"`
-	UpdateConfig   *UpdateConfig `json:",omitempty"`
-	RollbackConfig *UpdateConfig `json:",omitempty"`
-
-	// Networks field in ServiceSpec is deprecated. The
-	// same field in TaskSpec should be used instead.
-	// This field will be removed in a future release.
-	Networks     []NetworkAttachmentConfig `json:",omitempty"`
-	EndpointSpec *EndpointSpec             `json:",omitempty"`
-}
-
-// ServiceMode represents the mode of a service.
-type ServiceMode struct {
-	Replicated *ReplicatedService `json:",omitempty"`
-	Global     *GlobalService     `json:",omitempty"`
-}
-
-// UpdateState is the state of a service update.
-type UpdateState string
-
-const (
-	// UpdateStateUpdating is the updating state.
-	UpdateStateUpdating UpdateState = "updating"
-	// UpdateStatePaused is the paused state.
-	UpdateStatePaused UpdateState = "paused"
-	// UpdateStateCompleted is the completed state.
-	UpdateStateCompleted UpdateState = "completed"
-	// UpdateStateRollbackStarted is the state with a rollback in progress.
-	UpdateStateRollbackStarted UpdateState = "rollback_started"
-	// UpdateStateRollbackPaused is the state with a rollback in progress.
-	UpdateStateRollbackPaused UpdateState = "rollback_paused"
-	// UpdateStateRollbackCompleted is the state with a rollback in progress.
-	UpdateStateRollbackCompleted UpdateState = "rollback_completed"
-)
-
-// UpdateStatus reports the status of a service update.
-type UpdateStatus struct {
-	State       UpdateState `json:",omitempty"`
-	StartedAt   *time.Time  `json:",omitempty"`
-	CompletedAt *time.Time  `json:",omitempty"`
-	Message     string      `json:",omitempty"`
-}
-
-// ReplicatedService is a kind of ServiceMode.
-type ReplicatedService struct {
-	Replicas *uint64 `json:",omitempty"`
-}
-
-// GlobalService is a kind of ServiceMode.
-type GlobalService struct{}
-
-const (
-	// UpdateFailureActionPause PAUSE
-	UpdateFailureActionPause = "pause"
-	// UpdateFailureActionContinue CONTINUE
-	UpdateFailureActionContinue = "continue"
-	// UpdateFailureActionRollback ROLLBACK
-	UpdateFailureActionRollback = "rollback"
-
-	// UpdateOrderStopFirst STOP_FIRST
-	UpdateOrderStopFirst = "stop-first"
-	// UpdateOrderStartFirst START_FIRST
-	UpdateOrderStartFirst = "start-first"
-)
-
-// UpdateConfig represents the update configuration.
-type UpdateConfig struct {
-	// Maximum number of tasks to be updated in one iteration.
-	// 0 means unlimited parallelism.
-	Parallelism uint64
-
-	// Amount of time between updates.
-	Delay time.Duration `json:",omitempty"`
-
-	// FailureAction is the action to take when an update failures.
-	FailureAction string `json:",omitempty"`
-
-	// Monitor indicates how long to monitor a task for failure after it is
-	// created. If the task fails by ending up in one of the states
-	// REJECTED, COMPLETED, or FAILED, within Monitor from its creation,
-	// this counts as a failure. If it fails after Monitor, it does not
-	// count as a failure. If Monitor is unspecified, a default value will
-	// be used.
-	Monitor time.Duration `json:",omitempty"`
-
-	// MaxFailureRatio is the fraction of tasks that may fail during
-	// an update before the failure action is invoked. Any task created by
-	// the current update which ends up in one of the states REJECTED,
-	// COMPLETED or FAILED within Monitor from its creation counts as a
-	// failure. The number of failures is divided by the number of tasks
-	// being updated, and if this fraction is greater than
-	// MaxFailureRatio, the failure action is invoked.
-	//
-	// If the failure action is CONTINUE, there is no effect.
-	// If the failure action is PAUSE, no more tasks will be updated until
-	// another update is started.
-	MaxFailureRatio float32
-
-	// Order indicates the order of operations when rolling out an updated
-	// task. Either the old task is shut down before the new task is
-	// started, or the new task is started before the old task is shut down.
-	Order string
-}
diff --git a/vendor/github.com/docker/docker/api/types/swarm/swarm.go b/vendor/github.com/docker/docker/api/types/swarm/swarm.go
deleted file mode 100644
index c513274750..0000000000
--- a/vendor/github.com/docker/docker/api/types/swarm/swarm.go
+++ /dev/null
@@ -1,199 +0,0 @@
-package swarm
-
-import "time"
-
-// ClusterInfo represents info about the cluster for outputing in "info"
-// it contains the same information as "Swarm", but without the JoinTokens
-type ClusterInfo struct {
-	ID string
-	Meta
-	Spec Spec
-}
-
-// Swarm represents a swarm.
-type Swarm struct {
-	ClusterInfo
-	JoinTokens JoinTokens
-}
-
-// JoinTokens contains the tokens workers and managers need to join the swarm.
-type JoinTokens struct {
-	// Worker is the join token workers may use to join the swarm.
-	Worker string
-	// Manager is the join token managers may use to join the swarm.
-	Manager string
-}
-
-// Spec represents the spec of a swarm.
-type Spec struct {
-	Annotations
-
-	Orchestration    OrchestrationConfig `json:",omitempty"`
-	Raft             RaftConfig          `json:",omitempty"`
-	Dispatcher       DispatcherConfig    `json:",omitempty"`
-	CAConfig         CAConfig            `json:",omitempty"`
-	TaskDefaults     TaskDefaults        `json:",omitempty"`
-	EncryptionConfig EncryptionConfig    `json:",omitempty"`
-}
-
-// OrchestrationConfig represents orchestration configuration.
-type OrchestrationConfig struct {
-	// TaskHistoryRetentionLimit is the number of historic tasks to keep per instance or
-	// node. If negative, never remove completed or failed tasks.
-	TaskHistoryRetentionLimit *int64 `json:",omitempty"`
-}
-
-// TaskDefaults parameterizes cluster-level task creation with default values.
-type TaskDefaults struct {
-	// LogDriver selects the log driver to use for tasks created in the
-	// orchestrator if unspecified by a service.
-	//
-	// Updating this value will only have an affect on new tasks. Old tasks
-	// will continue use their previously configured log driver until
-	// recreated.
-	LogDriver *Driver `json:",omitempty"`
-}
-
-// EncryptionConfig controls at-rest encryption of data and keys.
-type EncryptionConfig struct {
-	// AutoLockManagers specifies whether or not managers TLS keys and raft data
-	// should be encrypted at rest in such a way that they must be unlocked
-	// before the manager node starts up again.
-	AutoLockManagers bool
-}
-
-// RaftConfig represents raft configuration.
-type RaftConfig struct {
-	// SnapshotInterval is the number of log entries between snapshots.
-	SnapshotInterval uint64 `json:",omitempty"`
-
-	// KeepOldSnapshots is the number of snapshots to keep beyond the
-	// current snapshot.
-	KeepOldSnapshots *uint64 `json:",omitempty"`
-
-	// LogEntriesForSlowFollowers is the number of log entries to keep
-	// around to sync up slow followers after a snapshot is created.
-	LogEntriesForSlowFollowers uint64 `json:",omitempty"`
-
-	// ElectionTick is the number of ticks that a follower will wait for a message
-	// from the leader before becoming a candidate and starting an election.
-	// ElectionTick must be greater than HeartbeatTick.
-	//
-	// A tick currently defaults to one second, so these translate directly to
-	// seconds currently, but this is NOT guaranteed.
-	ElectionTick int
-
-	// HeartbeatTick is the number of ticks between heartbeats. Every
-	// HeartbeatTick ticks, the leader will send a heartbeat to the
-	// followers.
-	//
-	// A tick currently defaults to one second, so these translate directly to
-	// seconds currently, but this is NOT guaranteed.
-	HeartbeatTick int
-}
-
-// DispatcherConfig represents dispatcher configuration.
-type DispatcherConfig struct {
-	// HeartbeatPeriod defines how often agent should send heartbeats to
-	// dispatcher.
-	HeartbeatPeriod time.Duration `json:",omitempty"`
-}
-
-// CAConfig represents CA configuration.
-type CAConfig struct {
-	// NodeCertExpiry is the duration certificates should be issued for
-	NodeCertExpiry time.Duration `json:",omitempty"`
-
-	// ExternalCAs is a list of CAs to which a manager node will make
-	// certificate signing requests for node certificates.
-	ExternalCAs []*ExternalCA `json:",omitempty"`
-}
-
-// ExternalCAProtocol represents type of external CA.
-type ExternalCAProtocol string
-
-// ExternalCAProtocolCFSSL CFSSL
-const ExternalCAProtocolCFSSL ExternalCAProtocol = "cfssl"
-
-// ExternalCA defines external CA to be used by the cluster.
-type ExternalCA struct {
-	// Protocol is the protocol used by this external CA.
-	Protocol ExternalCAProtocol
-
-	// URL is the URL where the external CA can be reached.
-	URL string
-
-	// Options is a set of additional key/value pairs whose interpretation
-	// depends on the specified CA type.
-	Options map[string]string `json:",omitempty"`
-}
-
-// InitRequest is the request used to init a swarm.
-type InitRequest struct {
-	ListenAddr       string
-	AdvertiseAddr    string
-	ForceNewCluster  bool
-	Spec             Spec
-	AutoLockManagers bool
-	Availability     NodeAvailability
-}
-
-// JoinRequest is the request used to join a swarm.
-type JoinRequest struct {
-	ListenAddr    string
-	AdvertiseAddr string
-	RemoteAddrs   []string
-	JoinToken     string // accept by secret
-	Availability  NodeAvailability
-}
-
-// UnlockRequest is the request used to unlock a swarm.
-type UnlockRequest struct {
-	// UnlockKey is the unlock key in ASCII-armored format.
-	UnlockKey string
-}
-
-// LocalNodeState represents the state of the local node.
-type LocalNodeState string
-
-const (
-	// LocalNodeStateInactive INACTIVE
-	LocalNodeStateInactive LocalNodeState = "inactive"
-	// LocalNodeStatePending PENDING
-	LocalNodeStatePending LocalNodeState = "pending"
-	// LocalNodeStateActive ACTIVE
-	LocalNodeStateActive LocalNodeState = "active"
-	// LocalNodeStateError ERROR
-	LocalNodeStateError LocalNodeState = "error"
-	// LocalNodeStateLocked LOCKED
-	LocalNodeStateLocked LocalNodeState = "locked"
-)
-
-// Info represents generic information about swarm.
-type Info struct {
-	NodeID   string
-	NodeAddr string
-
-	LocalNodeState   LocalNodeState
-	ControlAvailable bool
-	Error            string
-
-	RemoteManagers []Peer
-	Nodes          int `json:",omitempty"`
-	Managers       int `json:",omitempty"`
-
-	Cluster *ClusterInfo `json:",omitempty"`
-}
-
-// Peer represents a peer.
-type Peer struct {
-	NodeID string
-	Addr   string
-}
-
-// UpdateFlags contains flags for SwarmUpdate.
-type UpdateFlags struct {
-	RotateWorkerToken      bool
-	RotateManagerToken     bool
-	RotateManagerUnlockKey bool
-}
diff --git a/vendor/github.com/docker/docker/api/types/swarm/task.go b/vendor/github.com/docker/docker/api/types/swarm/task.go
deleted file mode 100644
index 99e9a6d58b..0000000000
--- a/vendor/github.com/docker/docker/api/types/swarm/task.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package swarm
-
-import "time"
-
-// TaskState represents the state of a task.
-type TaskState string
-
-const (
-	// TaskStateNew NEW
-	TaskStateNew TaskState = "new"
-	// TaskStateAllocated ALLOCATED
-	TaskStateAllocated TaskState = "allocated"
-	// TaskStatePending PENDING
-	TaskStatePending TaskState = "pending"
-	// TaskStateAssigned ASSIGNED
-	TaskStateAssigned TaskState = "assigned"
-	// TaskStateAccepted ACCEPTED
-	TaskStateAccepted TaskState = "accepted"
-	// TaskStatePreparing PREPARING
-	TaskStatePreparing TaskState = "preparing"
-	// TaskStateReady READY
-	TaskStateReady TaskState = "ready"
-	// TaskStateStarting STARTING
-	TaskStateStarting TaskState = "starting"
-	// TaskStateRunning RUNNING
-	TaskStateRunning TaskState = "running"
-	// TaskStateComplete COMPLETE
-	TaskStateComplete TaskState = "complete"
-	// TaskStateShutdown SHUTDOWN
-	TaskStateShutdown TaskState = "shutdown"
-	// TaskStateFailed FAILED
-	TaskStateFailed TaskState = "failed"
-	// TaskStateRejected REJECTED
-	TaskStateRejected TaskState = "rejected"
-)
-
-// Task represents a task.
-type Task struct {
-	ID string
-	Meta
-	Annotations
-
-	Spec                TaskSpec            `json:",omitempty"`
-	ServiceID           string              `json:",omitempty"`
-	Slot                int                 `json:",omitempty"`
-	NodeID              string              `json:",omitempty"`
-	Status              TaskStatus          `json:",omitempty"`
-	DesiredState        TaskState           `json:",omitempty"`
-	NetworksAttachments []NetworkAttachment `json:",omitempty"`
-}
-
-// TaskSpec represents the spec of a task.
-type TaskSpec struct {
-	ContainerSpec ContainerSpec             `json:",omitempty"`
-	Resources     *ResourceRequirements     `json:",omitempty"`
-	RestartPolicy *RestartPolicy            `json:",omitempty"`
-	Placement     *Placement                `json:",omitempty"`
-	Networks      []NetworkAttachmentConfig `json:",omitempty"`
-
-	// LogDriver specifies the LogDriver to use for tasks created from this
-	// spec. If not present, the one on cluster default on swarm.Spec will be
-	// used, finally falling back to the engine default if not specified.
-	LogDriver *Driver `json:",omitempty"`
-
-	// ForceUpdate is a counter that triggers an update even if no relevant
-	// parameters have been changed.
-	ForceUpdate uint64
-
-	Runtime RuntimeType `json:",omitempty"`
-	// TODO (ehazlett): this should be removed and instead
-	// use struct tags (proto) for the runtimes
-	RuntimeData []byte `json:",omitempty"`
-}
-
-// Resources represents resources (CPU/Memory).
-type Resources struct {
-	NanoCPUs    int64 `json:",omitempty"`
-	MemoryBytes int64 `json:",omitempty"`
-}
-
-// ResourceRequirements represents resources requirements.
-type ResourceRequirements struct {
-	Limits       *Resources `json:",omitempty"`
-	Reservations *Resources `json:",omitempty"`
-}
-
-// Placement represents orchestration parameters.
-type Placement struct {
-	Constraints []string              `json:",omitempty"`
-	Preferences []PlacementPreference `json:",omitempty"`
-}
-
-// PlacementPreference provides a way to make the scheduler aware of factors
-// such as topology.
-type PlacementPreference struct {
-	Spread *SpreadOver
-}
-
-// SpreadOver is a scheduling preference that instructs the scheduler to spread
-// tasks evenly over groups of nodes identified by labels.
-type SpreadOver struct {
-	// label descriptor, such as engine.labels.az
-	SpreadDescriptor string
-}
-
-// RestartPolicy represents the restart policy.
-type RestartPolicy struct {
-	Condition   RestartPolicyCondition `json:",omitempty"`
-	Delay       *time.Duration         `json:",omitempty"`
-	MaxAttempts *uint64                `json:",omitempty"`
-	Window      *time.Duration         `json:",omitempty"`
-}
-
-// RestartPolicyCondition represents when to restart.
-type RestartPolicyCondition string
-
-const (
-	// RestartPolicyConditionNone NONE
-	RestartPolicyConditionNone RestartPolicyCondition = "none"
-	// RestartPolicyConditionOnFailure ON_FAILURE
-	RestartPolicyConditionOnFailure RestartPolicyCondition = "on-failure"
-	// RestartPolicyConditionAny ANY
-	RestartPolicyConditionAny RestartPolicyCondition = "any"
-)
-
-// TaskStatus represents the status of a task.
-type TaskStatus struct {
-	Timestamp       time.Time       `json:",omitempty"`
-	State           TaskState       `json:",omitempty"`
-	Message         string          `json:",omitempty"`
-	Err             string          `json:",omitempty"`
-	ContainerStatus ContainerStatus `json:",omitempty"`
-	PortStatus      PortStatus      `json:",omitempty"`
-}
-
-// ContainerStatus represents the status of a container.
-type ContainerStatus struct {
-	ContainerID string `json:",omitempty"`
-	PID         int    `json:",omitempty"`
-	ExitCode    int    `json:",omitempty"`
-}
-
-// PortStatus represents the port status of a task's host ports whose
-// service has published host ports
-type PortStatus struct {
-	Ports []PortConfig `json:",omitempty"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/time/duration_convert.go b/vendor/github.com/docker/docker/api/types/time/duration_convert.go
deleted file mode 100644
index 63e1eec19e..0000000000
--- a/vendor/github.com/docker/docker/api/types/time/duration_convert.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package time
-
-import (
-	"strconv"
-	"time"
-)
-
-// DurationToSecondsString converts the specified duration to the number
-// seconds it represents, formatted as a string.
-func DurationToSecondsString(duration time.Duration) string {
-	return strconv.FormatFloat(duration.Seconds(), 'f', 0, 64)
-}
diff --git a/vendor/github.com/docker/docker/api/types/time/timestamp.go b/vendor/github.com/docker/docker/api/types/time/timestamp.go
deleted file mode 100644
index 9aa9702dad..0000000000
--- a/vendor/github.com/docker/docker/api/types/time/timestamp.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package time
-
-import (
-	"fmt"
-	"math"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// These are additional predefined layouts for use in Time.Format and Time.Parse
-// with --since and --until parameters for `docker logs` and `docker events`
-const (
-	rFC3339Local     = "2006-01-02T15:04:05"           // RFC3339 with local timezone
-	rFC3339NanoLocal = "2006-01-02T15:04:05.999999999" // RFC3339Nano with local timezone
-	dateWithZone     = "2006-01-02Z07:00"              // RFC3339 with time at 00:00:00
-	dateLocal        = "2006-01-02"                    // RFC3339 with local timezone and time at 00:00:00
-)
-
-// GetTimestamp tries to parse given string as golang duration,
-// then RFC3339 time and finally as a Unix timestamp. If
-// any of these were successful, it returns a Unix timestamp
-// as string otherwise returns the given value back.
-// In case of duration input, the returned timestamp is computed
-// as the given reference time minus the amount of the duration.
-func GetTimestamp(value string, reference time.Time) (string, error) {
-	if d, err := time.ParseDuration(value); value != "0" && err == nil {
-		return strconv.FormatInt(reference.Add(-d).Unix(), 10), nil
-	}
-
-	var format string
-	var parseInLocation bool
-
-	// if the string has a Z or a + or three dashes use parse otherwise use parseinlocation
-	parseInLocation = !(strings.ContainsAny(value, "zZ+") || strings.Count(value, "-") == 3)
-
-	if strings.Contains(value, ".") {
-		if parseInLocation {
-			format = rFC3339NanoLocal
-		} else {
-			format = time.RFC3339Nano
-		}
-	} else if strings.Contains(value, "T") {
-		// we want the number of colons in the T portion of the timestamp
-		tcolons := strings.Count(value, ":")
-		// if parseInLocation is off and we have a +/- zone offset (not Z) then
-		// there will be an extra colon in the input for the tz offset subtract that
-		// colon from the tcolons count
-		if !parseInLocation && !strings.ContainsAny(value, "zZ") && tcolons > 0 {
-			tcolons--
-		}
-		if parseInLocation {
-			switch tcolons {
-			case 0:
-				format = "2006-01-02T15"
-			case 1:
-				format = "2006-01-02T15:04"
-			default:
-				format = rFC3339Local
-			}
-		} else {
-			switch tcolons {
-			case 0:
-				format = "2006-01-02T15Z07:00"
-			case 1:
-				format = "2006-01-02T15:04Z07:00"
-			default:
-				format = time.RFC3339
-			}
-		}
-	} else if parseInLocation {
-		format = dateLocal
-	} else {
-		format = dateWithZone
-	}
-
-	var t time.Time
-	var err error
-
-	if parseInLocation {
-		t, err = time.ParseInLocation(format, value, time.FixedZone(reference.Zone()))
-	} else {
-		t, err = time.Parse(format, value)
-	}
-
-	if err != nil {
-		// if there is a `-` then it's an RFC3339 like timestamp otherwise assume unixtimestamp
-		if strings.Contains(value, "-") {
-			return "", err // was probably an RFC3339 like timestamp but the parser failed with an error
-		}
-		return value, nil // unixtimestamp in and out case (meaning: the value passed at the command line is already in the right format for passing to the server)
-	}
-
-	return fmt.Sprintf("%d.%09d", t.Unix(), int64(t.Nanosecond())), nil
-}
-
-// ParseTimestamps returns seconds and nanoseconds from a timestamp that has the
-// format "%d.%09d", time.Unix(), int64(time.Nanosecond()))
-// if the incoming nanosecond portion is longer or shorter than 9 digits it is
-// converted to nanoseconds.  The expectation is that the seconds and
-// seconds will be used to create a time variable.  For example:
-//     seconds, nanoseconds, err := ParseTimestamp("1136073600.000000001",0)
-//     if err == nil since := time.Unix(seconds, nanoseconds)
-// returns seconds as def(aultSeconds) if value == ""
-func ParseTimestamps(value string, def int64) (int64, int64, error) {
-	if value == "" {
-		return def, 0, nil
-	}
-	sa := strings.SplitN(value, ".", 2)
-	s, err := strconv.ParseInt(sa[0], 10, 64)
-	if err != nil {
-		return s, 0, err
-	}
-	if len(sa) != 2 {
-		return s, 0, nil
-	}
-	n, err := strconv.ParseInt(sa[1], 10, 64)
-	if err != nil {
-		return s, n, err
-	}
-	// should already be in nanoseconds but just in case convert n to nanoseconds
-	n = int64(float64(n) * math.Pow(float64(10), float64(9-len(sa[1]))))
-	return s, n, nil
-}
diff --git a/vendor/github.com/docker/docker/api/types/types.go b/vendor/github.com/docker/docker/api/types/types.go
deleted file mode 100644
index bbaf2c5531..0000000000
--- a/vendor/github.com/docker/docker/api/types/types.go
+++ /dev/null
@@ -1,530 +0,0 @@
-package types
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/go-connections/nat"
-)
-
-// RootFS returns Image's RootFS description including the layer IDs.
-type RootFS struct {
-	Type      string
-	Layers    []string `json:",omitempty"`
-	BaseLayer string   `json:",omitempty"`
-}
-
-// ImageInspect contains response of Engine API:
-// GET "/images/{name:.*}/json"
-type ImageInspect struct {
-	ID              string `json:"Id"`
-	RepoTags        []string
-	RepoDigests     []string
-	Parent          string
-	Comment         string
-	Created         string
-	Container       string
-	ContainerConfig *container.Config
-	DockerVersion   string
-	Author          string
-	Config          *container.Config
-	Architecture    string
-	Os              string
-	OsVersion       string `json:",omitempty"`
-	Size            int64
-	VirtualSize     int64
-	GraphDriver     GraphDriverData
-	RootFS          RootFS
-}
-
-// Container contains response of Engine API:
-// GET "/containers/json"
-type Container struct {
-	ID         string `json:"Id"`
-	Names      []string
-	Image      string
-	ImageID    string
-	Command    string
-	Created    int64
-	Ports      []Port
-	SizeRw     int64 `json:",omitempty"`
-	SizeRootFs int64 `json:",omitempty"`
-	Labels     map[string]string
-	State      string
-	Status     string
-	HostConfig struct {
-		NetworkMode string `json:",omitempty"`
-	}
-	NetworkSettings *SummaryNetworkSettings
-	Mounts          []MountPoint
-}
-
-// CopyConfig contains request body of Engine API:
-// POST "/containers/"+containerID+"/copy"
-type CopyConfig struct {
-	Resource string
-}
-
-// ContainerPathStat is used to encode the header from
-// GET "/containers/{name:.*}/archive"
-// "Name" is the file or directory name.
-type ContainerPathStat struct {
-	Name       string      `json:"name"`
-	Size       int64       `json:"size"`
-	Mode       os.FileMode `json:"mode"`
-	Mtime      time.Time   `json:"mtime"`
-	LinkTarget string      `json:"linkTarget"`
-}
-
-// ContainerStats contains response of Engine API:
-// GET "/stats"
-type ContainerStats struct {
-	Body   io.ReadCloser `json:"body"`
-	OSType string        `json:"ostype"`
-}
-
-// Ping contains response of Engine API:
-// GET "/_ping"
-type Ping struct {
-	APIVersion   string
-	OSType       string
-	Experimental bool
-}
-
-// Version contains response of Engine API:
-// GET "/version"
-type Version struct {
-	Version       string
-	APIVersion    string `json:"ApiVersion"`
-	MinAPIVersion string `json:"MinAPIVersion,omitempty"`
-	GitCommit     string
-	GoVersion     string
-	Os            string
-	Arch          string
-	KernelVersion string `json:",omitempty"`
-	Experimental  bool   `json:",omitempty"`
-	BuildTime     string `json:",omitempty"`
-}
-
-// Commit holds the Git-commit (SHA1) that a binary was built from, as reported
-// in the version-string of external tools, such as containerd, or runC.
-type Commit struct {
-	ID       string // ID is the actual commit ID of external tool.
-	Expected string // Expected is the commit ID of external tool expected by dockerd as set at build time.
-}
-
-// Info contains response of Engine API:
-// GET "/info"
-type Info struct {
-	ID                 string
-	Containers         int
-	ContainersRunning  int
-	ContainersPaused   int
-	ContainersStopped  int
-	Images             int
-	Driver             string
-	DriverStatus       [][2]string
-	SystemStatus       [][2]string
-	Plugins            PluginsInfo
-	MemoryLimit        bool
-	SwapLimit          bool
-	KernelMemory       bool
-	CPUCfsPeriod       bool `json:"CpuCfsPeriod"`
-	CPUCfsQuota        bool `json:"CpuCfsQuota"`
-	CPUShares          bool
-	CPUSet             bool
-	IPv4Forwarding     bool
-	BridgeNfIptables   bool
-	BridgeNfIP6tables  bool `json:"BridgeNfIp6tables"`
-	Debug              bool
-	NFd                int
-	OomKillDisable     bool
-	NGoroutines        int
-	SystemTime         string
-	LoggingDriver      string
-	CgroupDriver       string
-	NEventsListener    int
-	KernelVersion      string
-	OperatingSystem    string
-	OSType             string
-	Architecture       string
-	IndexServerAddress string
-	RegistryConfig     *registry.ServiceConfig
-	NCPU               int
-	MemTotal           int64
-	DockerRootDir      string
-	HTTPProxy          string `json:"HttpProxy"`
-	HTTPSProxy         string `json:"HttpsProxy"`
-	NoProxy            string
-	Name               string
-	Labels             []string
-	ExperimentalBuild  bool
-	ServerVersion      string
-	ClusterStore       string
-	ClusterAdvertise   string
-	Runtimes           map[string]Runtime
-	DefaultRuntime     string
-	Swarm              swarm.Info
-	// LiveRestoreEnabled determines whether containers should be kept
-	// running when the daemon is shutdown or upon daemon start if
-	// running containers are detected
-	LiveRestoreEnabled bool
-	Isolation          container.Isolation
-	InitBinary         string
-	ContainerdCommit   Commit
-	RuncCommit         Commit
-	InitCommit         Commit
-	SecurityOptions    []string
-}
-
-// KeyValue holds a key/value pair
-type KeyValue struct {
-	Key, Value string
-}
-
-// SecurityOpt contains the name and options of a security option
-type SecurityOpt struct {
-	Name    string
-	Options []KeyValue
-}
-
-// DecodeSecurityOptions decodes a security options string slice to a type safe
-// SecurityOpt
-func DecodeSecurityOptions(opts []string) ([]SecurityOpt, error) {
-	so := []SecurityOpt{}
-	for _, opt := range opts {
-		// support output from a < 1.13 docker daemon
-		if !strings.Contains(opt, "=") {
-			so = append(so, SecurityOpt{Name: opt})
-			continue
-		}
-		secopt := SecurityOpt{}
-		split := strings.Split(opt, ",")
-		for _, s := range split {
-			kv := strings.SplitN(s, "=", 2)
-			if len(kv) != 2 {
-				return nil, fmt.Errorf("invalid security option %q", s)
-			}
-			if kv[0] == "" || kv[1] == "" {
-				return nil, errors.New("invalid empty security option")
-			}
-			if kv[0] == "name" {
-				secopt.Name = kv[1]
-				continue
-			}
-			secopt.Options = append(secopt.Options, KeyValue{Key: kv[0], Value: kv[1]})
-		}
-		so = append(so, secopt)
-	}
-	return so, nil
-}
-
-// PluginsInfo is a temp struct holding Plugins name
-// registered with docker daemon. It is used by Info struct
-type PluginsInfo struct {
-	// List of Volume plugins registered
-	Volume []string
-	// List of Network plugins registered
-	Network []string
-	// List of Authorization plugins registered
-	Authorization []string
-}
-
-// ExecStartCheck is a temp struct used by execStart
-// Config fields is part of ExecConfig in runconfig package
-type ExecStartCheck struct {
-	// ExecStart will first check if it's detached
-	Detach bool
-	// Check if there's a tty
-	Tty bool
-}
-
-// HealthcheckResult stores information about a single run of a healthcheck probe
-type HealthcheckResult struct {
-	Start    time.Time // Start is the time this check started
-	End      time.Time // End is the time this check ended
-	ExitCode int       // ExitCode meanings: 0=healthy, 1=unhealthy, 2=reserved (considered unhealthy), else=error running probe
-	Output   string    // Output from last check
-}
-
-// Health states
-const (
-	NoHealthcheck = "none"      // Indicates there is no healthcheck
-	Starting      = "starting"  // Starting indicates that the container is not yet ready
-	Healthy       = "healthy"   // Healthy indicates that the container is running correctly
-	Unhealthy     = "unhealthy" // Unhealthy indicates that the container has a problem
-)
-
-// Health stores information about the container's healthcheck results
-type Health struct {
-	Status        string               // Status is one of Starting, Healthy or Unhealthy
-	FailingStreak int                  // FailingStreak is the number of consecutive failures
-	Log           []*HealthcheckResult // Log contains the last few results (oldest first)
-}
-
-// ContainerState stores container's running state
-// it's part of ContainerJSONBase and will return by "inspect" command
-type ContainerState struct {
-	Status     string
-	Running    bool
-	Paused     bool
-	Restarting bool
-	OOMKilled  bool
-	Dead       bool
-	Pid        int
-	ExitCode   int
-	Error      string
-	StartedAt  string
-	FinishedAt string
-	Health     *Health `json:",omitempty"`
-}
-
-// ContainerNode stores information about the node that a container
-// is running on.  It's only available in Docker Swarm
-type ContainerNode struct {
-	ID        string
-	IPAddress string `json:"IP"`
-	Addr      string
-	Name      string
-	Cpus      int
-	Memory    int64
-	Labels    map[string]string
-}
-
-// ContainerJSONBase contains response of Engine API:
-// GET "/containers/{name:.*}/json"
-type ContainerJSONBase struct {
-	ID              string `json:"Id"`
-	Created         string
-	Path            string
-	Args            []string
-	State           *ContainerState
-	Image           string
-	ResolvConfPath  string
-	HostnamePath    string
-	HostsPath       string
-	LogPath         string
-	Node            *ContainerNode `json:",omitempty"`
-	Name            string
-	RestartCount    int
-	Driver          string
-	MountLabel      string
-	ProcessLabel    string
-	AppArmorProfile string
-	ExecIDs         []string
-	HostConfig      *container.HostConfig
-	GraphDriver     GraphDriverData
-	SizeRw          *int64 `json:",omitempty"`
-	SizeRootFs      *int64 `json:",omitempty"`
-}
-
-// ContainerJSON is newly used struct along with MountPoint
-type ContainerJSON struct {
-	*ContainerJSONBase
-	Mounts          []MountPoint
-	Config          *container.Config
-	NetworkSettings *NetworkSettings
-}
-
-// NetworkSettings exposes the network settings in the api
-type NetworkSettings struct {
-	NetworkSettingsBase
-	DefaultNetworkSettings
-	Networks map[string]*network.EndpointSettings
-}
-
-// SummaryNetworkSettings provides a summary of container's networks
-// in /containers/json
-type SummaryNetworkSettings struct {
-	Networks map[string]*network.EndpointSettings
-}
-
-// NetworkSettingsBase holds basic information about networks
-type NetworkSettingsBase struct {
-	Bridge                 string      // Bridge is the Bridge name the network uses(e.g. `docker0`)
-	SandboxID              string      // SandboxID uniquely represents a container's network stack
-	HairpinMode            bool        // HairpinMode specifies if hairpin NAT should be enabled on the virtual interface
-	LinkLocalIPv6Address   string      // LinkLocalIPv6Address is an IPv6 unicast address using the link-local prefix
-	LinkLocalIPv6PrefixLen int         // LinkLocalIPv6PrefixLen is the prefix length of an IPv6 unicast address
-	Ports                  nat.PortMap // Ports is a collection of PortBinding indexed by Port
-	SandboxKey             string      // SandboxKey identifies the sandbox
-	SecondaryIPAddresses   []network.Address
-	SecondaryIPv6Addresses []network.Address
-}
-
-// DefaultNetworkSettings holds network information
-// during the 2 release deprecation period.
-// It will be removed in Docker 1.11.
-type DefaultNetworkSettings struct {
-	EndpointID          string // EndpointID uniquely represents a service endpoint in a Sandbox
-	Gateway             string // Gateway holds the gateway address for the network
-	GlobalIPv6Address   string // GlobalIPv6Address holds network's global IPv6 address
-	GlobalIPv6PrefixLen int    // GlobalIPv6PrefixLen represents mask length of network's global IPv6 address
-	IPAddress           string // IPAddress holds the IPv4 address for the network
-	IPPrefixLen         int    // IPPrefixLen represents mask length of network's IPv4 address
-	IPv6Gateway         string // IPv6Gateway holds gateway address specific for IPv6
-	MacAddress          string // MacAddress holds the MAC address for the network
-}
-
-// MountPoint represents a mount point configuration inside the container.
-// This is used for reporting the mountpoints in use by a container.
-type MountPoint struct {
-	Type        mount.Type `json:",omitempty"`
-	Name        string     `json:",omitempty"`
-	Source      string
-	Destination string
-	Driver      string `json:",omitempty"`
-	Mode        string
-	RW          bool
-	Propagation mount.Propagation
-}
-
-// NetworkResource is the body of the "get network" http response message
-type NetworkResource struct {
-	Name       string                         // Name is the requested name of the network
-	ID         string                         `json:"Id"` // ID uniquely identifies a network on a single machine
-	Created    time.Time                      // Created is the time the network created
-	Scope      string                         // Scope describes the level at which the network exists (e.g. `global` for cluster-wide or `local` for machine level)
-	Driver     string                         // Driver is the Driver name used to create the network (e.g. `bridge`, `overlay`)
-	EnableIPv6 bool                           // EnableIPv6 represents whether to enable IPv6
-	IPAM       network.IPAM                   // IPAM is the network's IP Address Management
-	Internal   bool                           // Internal represents if the network is used internal only
-	Attachable bool                           // Attachable represents if the global scope is manually attachable by regular containers from workers in swarm mode.
-	Ingress    bool                           // Ingress indicates the network is providing the routing-mesh for the swarm cluster.
-	Containers map[string]EndpointResource    // Containers contains endpoints belonging to the network
-	Options    map[string]string              // Options holds the network specific options to use for when creating the network
-	Labels     map[string]string              // Labels holds metadata specific to the network being created
-	Peers      []network.PeerInfo             `json:",omitempty"` // List of peer nodes for an overlay network
-	Services   map[string]network.ServiceInfo `json:",omitempty"`
-}
-
-// EndpointResource contains network resources allocated and used for a container in a network
-type EndpointResource struct {
-	Name        string
-	EndpointID  string
-	MacAddress  string
-	IPv4Address string
-	IPv6Address string
-}
-
-// NetworkCreate is the expected body of the "create network" http request message
-type NetworkCreate struct {
-	// Check for networks with duplicate names.
-	// Network is primarily keyed based on a random ID and not on the name.
-	// Network name is strictly a user-friendly alias to the network
-	// which is uniquely identified using ID.
-	// And there is no guaranteed way to check for duplicates.
-	// Option CheckDuplicate is there to provide a best effort checking of any networks
-	// which has the same name but it is not guaranteed to catch all name collisions.
-	CheckDuplicate bool
-	Driver         string
-	EnableIPv6     bool
-	IPAM           *network.IPAM
-	Internal       bool
-	Attachable     bool
-	Ingress        bool
-	Options        map[string]string
-	Labels         map[string]string
-}
-
-// NetworkCreateRequest is the request message sent to the server for network create call.
-type NetworkCreateRequest struct {
-	NetworkCreate
-	Name string
-}
-
-// NetworkCreateResponse is the response message sent by the server for network create call
-type NetworkCreateResponse struct {
-	ID      string `json:"Id"`
-	Warning string
-}
-
-// NetworkConnect represents the data to be used to connect a container to the network
-type NetworkConnect struct {
-	Container      string
-	EndpointConfig *network.EndpointSettings `json:",omitempty"`
-}
-
-// NetworkDisconnect represents the data to be used to disconnect a container from the network
-type NetworkDisconnect struct {
-	Container string
-	Force     bool
-}
-
-// Checkpoint represents the details of a checkpoint
-type Checkpoint struct {
-	Name string // Name is the name of the checkpoint
-}
-
-// Runtime describes an OCI runtime
-type Runtime struct {
-	Path string   `json:"path"`
-	Args []string `json:"runtimeArgs,omitempty"`
-}
-
-// DiskUsage contains response of Engine API:
-// GET "/system/df"
-type DiskUsage struct {
-	LayersSize int64
-	Images     []*ImageSummary
-	Containers []*Container
-	Volumes    []*Volume
-}
-
-// ContainersPruneReport contains the response for Engine API:
-// POST "/containers/prune"
-type ContainersPruneReport struct {
-	ContainersDeleted []string
-	SpaceReclaimed    uint64
-}
-
-// VolumesPruneReport contains the response for Engine API:
-// POST "/volumes/prune"
-type VolumesPruneReport struct {
-	VolumesDeleted []string
-	SpaceReclaimed uint64
-}
-
-// ImagesPruneReport contains the response for Engine API:
-// POST "/images/prune"
-type ImagesPruneReport struct {
-	ImagesDeleted  []ImageDeleteResponseItem
-	SpaceReclaimed uint64
-}
-
-// NetworksPruneReport contains the response for Engine API:
-// POST "/networks/prune"
-type NetworksPruneReport struct {
-	NetworksDeleted []string
-}
-
-// SecretCreateResponse contains the information returned to a client
-// on the creation of a new secret.
-type SecretCreateResponse struct {
-	// ID is the id of the created secret.
-	ID string
-}
-
-// SecretListOptions holds parameters to list secrets
-type SecretListOptions struct {
-	Filters filters.Args
-}
-
-// PushResult contains the tag, manifest digest, and manifest size from the
-// push. It's used to signal this information to the trust code in the client
-// so it can sign the manifest if necessary.
-type PushResult struct {
-	Tag    string
-	Digest string
-	Size   int
-}
diff --git a/vendor/github.com/docker/docker/api/types/versions/README.md b/vendor/github.com/docker/docker/api/types/versions/README.md
deleted file mode 100644
index 1ef911edb0..0000000000
--- a/vendor/github.com/docker/docker/api/types/versions/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Legacy API type versions
-
-This package includes types for legacy API versions. The stable version of the API types live in `api/types/*.go`.
-
-Consider moving a type here when you need to keep backwards compatibility in the API. This legacy types are organized by the latest API version they appear in. For instance, types in the `v1p19` package are valid for API versions below or equal `1.19`. Types in the `v1p20` package are valid for the API version `1.20`, since the versions below that will use the legacy types in `v1p19`.
-
-## Package name conventions
-
-The package name convention is to use `v` as a prefix for the version number and `p`(patch) as a separator. We use this nomenclature due to a few restrictions in the Go package name convention:
-
-1. We cannot use `.` because it's interpreted by the language, think of `v1.20.CallFunction`.
-2. We cannot use `_` because golint complains about it. The code is actually valid, but it looks probably more weird: `v1_20.CallFunction`.
-
-For instance, if you want to modify a type that was available in the version `1.21` of the API but it will have different fields in the version `1.22`, you want to create a new package under `api/types/versions/v1p21`.
diff --git a/vendor/github.com/docker/docker/api/types/versions/compare.go b/vendor/github.com/docker/docker/api/types/versions/compare.go
deleted file mode 100644
index 611d4fed66..0000000000
--- a/vendor/github.com/docker/docker/api/types/versions/compare.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package versions
-
-import (
-	"strconv"
-	"strings"
-)
-
-// compare compares two version strings
-// returns -1 if v1 < v2, 1 if v1 > v2, 0 otherwise.
-func compare(v1, v2 string) int {
-	var (
-		currTab  = strings.Split(v1, ".")
-		otherTab = strings.Split(v2, ".")
-	)
-
-	max := len(currTab)
-	if len(otherTab) > max {
-		max = len(otherTab)
-	}
-	for i := 0; i < max; i++ {
-		var currInt, otherInt int
-
-		if len(currTab) > i {
-			currInt, _ = strconv.Atoi(currTab[i])
-		}
-		if len(otherTab) > i {
-			otherInt, _ = strconv.Atoi(otherTab[i])
-		}
-		if currInt > otherInt {
-			return 1
-		}
-		if otherInt > currInt {
-			return -1
-		}
-	}
-	return 0
-}
-
-// LessThan checks if a version is less than another
-func LessThan(v, other string) bool {
-	return compare(v, other) == -1
-}
-
-// LessThanOrEqualTo checks if a version is less than or equal to another
-func LessThanOrEqualTo(v, other string) bool {
-	return compare(v, other) <= 0
-}
-
-// GreaterThan checks if a version is greater than another
-func GreaterThan(v, other string) bool {
-	return compare(v, other) == 1
-}
-
-// GreaterThanOrEqualTo checks if a version is greater than or equal to another
-func GreaterThanOrEqualTo(v, other string) bool {
-	return compare(v, other) >= 0
-}
-
-// Equal checks if a version is equal to another
-func Equal(v, other string) bool {
-	return compare(v, other) == 0
-}
diff --git a/vendor/github.com/docker/docker/api/types/volume.go b/vendor/github.com/docker/docker/api/types/volume.go
deleted file mode 100644
index da4f8ebd9c..0000000000
--- a/vendor/github.com/docker/docker/api/types/volume.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// Volume volume
-// swagger:model Volume
-type Volume struct {
-
-	// Name of the volume driver used by the volume.
-	// Required: true
-	Driver string `json:"Driver"`
-
-	// User-defined key/value metadata.
-	// Required: true
-	Labels map[string]string `json:"Labels"`
-
-	// Mount path of the volume on the host.
-	// Required: true
-	Mountpoint string `json:"Mountpoint"`
-
-	// Name of the volume.
-	// Required: true
-	Name string `json:"Name"`
-
-	// The driver specific options used when creating the volume.
-	// Required: true
-	Options map[string]string `json:"Options"`
-
-	// The level at which the volume exists. Either `global` for cluster-wide, or `local` for machine level.
-	// Required: true
-	Scope string `json:"Scope"`
-
-	// Low-level details about the volume, provided by the volume driver.
-	// Details are returned as a map with key/value pairs:
-	// `{"key":"value","key2":"value2"}`.
-	//
-	// The `Status` field is optional, and is omitted if the volume driver
-	// does not support this feature.
-	//
-	Status map[string]interface{} `json:"Status,omitempty"`
-
-	// usage data
-	UsageData *VolumeUsageData `json:"UsageData,omitempty"`
-}
-
-// VolumeUsageData volume usage data
-// swagger:model VolumeUsageData
-type VolumeUsageData struct {
-
-	// The number of containers referencing this volume.
-	// Required: true
-	RefCount int64 `json:"RefCount"`
-
-	// The disk space used by the volume (local driver only)
-	// Required: true
-	Size int64 `json:"Size"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/volume/volumes_create.go b/vendor/github.com/docker/docker/api/types/volume/volumes_create.go
deleted file mode 100644
index 9f70e43ca4..0000000000
--- a/vendor/github.com/docker/docker/api/types/volume/volumes_create.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package volume
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/generate-swagger-api.sh
-// ----------------------------------------------------------------------------
-
-// VolumesCreateBody volumes create body
-// swagger:model VolumesCreateBody
-type VolumesCreateBody struct {
-
-	// Name of the volume driver to use.
-	// Required: true
-	Driver string `json:"Driver"`
-
-	// A mapping of driver options and values. These options are passed directly to the driver and are driver specific.
-	// Required: true
-	DriverOpts map[string]string `json:"DriverOpts"`
-
-	// User-defined key/value metadata.
-	// Required: true
-	Labels map[string]string `json:"Labels"`
-
-	// The new volume's name. If not specified, Docker generates a name.
-	// Required: true
-	Name string `json:"Name"`
-}
diff --git a/vendor/github.com/docker/docker/api/types/volume/volumes_list.go b/vendor/github.com/docker/docker/api/types/volume/volumes_list.go
deleted file mode 100644
index 833dad9330..0000000000
--- a/vendor/github.com/docker/docker/api/types/volume/volumes_list.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package volume
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/generate-swagger-api.sh
-// ----------------------------------------------------------------------------
-
-import "github.com/docker/docker/api/types"
-
-// VolumesListOKBody volumes list o k body
-// swagger:model VolumesListOKBody
-type VolumesListOKBody struct {
-
-	// List of volumes
-	// Required: true
-	Volumes []*types.Volume `json:"Volumes"`
-
-	// Warnings that occurred when fetching the list of volumes
-	// Required: true
-	Warnings []string `json:"Warnings"`
-}
diff --git a/vendor/github.com/docker/docker/client/README.md b/vendor/github.com/docker/docker/client/README.md
deleted file mode 100644
index 059dfb3ce7..0000000000
--- a/vendor/github.com/docker/docker/client/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Go client for the Docker Engine API
-
-The `docker` command uses this package to communicate with the daemon. It can also be used by your own Go applications to do anything the command-line interface does – running containers, pulling images, managing swarms, etc.
-
-For example, to list running containers (the equivalent of `docker ps`):
-
-```go
-package main
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/client"
-)
-
-func main() {
-	cli, err := client.NewEnvClient()
-	if err != nil {
-		panic(err)
-	}
-
-	containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{})
-	if err != nil {
-		panic(err)
-	}
-
-	for _, container := range containers {
-		fmt.Printf("%s %s\n", container.ID[:10], container.Image)
-	}
-}
-```
-
-[Full documentation is available on GoDoc.](https://godoc.org/github.com/docker/docker/client)
diff --git a/vendor/github.com/docker/docker/client/checkpoint_create.go b/vendor/github.com/docker/docker/client/checkpoint_create.go
deleted file mode 100644
index 0effe498be..0000000000
--- a/vendor/github.com/docker/docker/client/checkpoint_create.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// CheckpointCreate creates a checkpoint from the given container with the given name
-func (cli *Client) CheckpointCreate(ctx context.Context, container string, options types.CheckpointCreateOptions) error {
-	resp, err := cli.post(ctx, "/containers/"+container+"/checkpoints", nil, options, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/checkpoint_delete.go b/vendor/github.com/docker/docker/client/checkpoint_delete.go
deleted file mode 100644
index e6e75588b1..0000000000
--- a/vendor/github.com/docker/docker/client/checkpoint_delete.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// CheckpointDelete deletes the checkpoint with the given name from the given container
-func (cli *Client) CheckpointDelete(ctx context.Context, containerID string, options types.CheckpointDeleteOptions) error {
-	query := url.Values{}
-	if options.CheckpointDir != "" {
-		query.Set("dir", options.CheckpointDir)
-	}
-
-	resp, err := cli.delete(ctx, "/containers/"+containerID+"/checkpoints/"+options.CheckpointID, query, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/checkpoint_list.go b/vendor/github.com/docker/docker/client/checkpoint_list.go
deleted file mode 100644
index ffe44bc976..0000000000
--- a/vendor/github.com/docker/docker/client/checkpoint_list.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// CheckpointList returns the checkpoints of the given container in the docker host
-func (cli *Client) CheckpointList(ctx context.Context, container string, options types.CheckpointListOptions) ([]types.Checkpoint, error) {
-	var checkpoints []types.Checkpoint
-
-	query := url.Values{}
-	if options.CheckpointDir != "" {
-		query.Set("dir", options.CheckpointDir)
-	}
-
-	resp, err := cli.get(ctx, "/containers/"+container+"/checkpoints", query, nil)
-	if err != nil {
-		if resp.statusCode == http.StatusNotFound {
-			return checkpoints, containerNotFoundError{container}
-		}
-		return checkpoints, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&checkpoints)
-	ensureReaderClosed(resp)
-	return checkpoints, err
-}
diff --git a/vendor/github.com/docker/docker/client/client.go b/vendor/github.com/docker/docker/client/client.go
deleted file mode 100644
index df3698adc6..0000000000
--- a/vendor/github.com/docker/docker/client/client.go
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
-Package client is a Go client for the Docker Engine API.
-
-The "docker" command uses this package to communicate with the daemon. It can also
-be used by your own Go applications to do anything the command-line interface does
-- running containers, pulling images, managing swarms, etc.
-
-For more information about the Engine API, see the documentation:
-https://docs.docker.com/engine/reference/api/
-
-Usage
-
-You use the library by creating a client object and calling methods on it. The
-client can be created either from environment variables with NewEnvClient, or
-configured manually with NewClient.
-
-For example, to list running containers (the equivalent of "docker ps"):
-
-	package main
-
-	import (
-		"context"
-		"fmt"
-
-		"github.com/docker/docker/api/types"
-		"github.com/docker/docker/client"
-	)
-
-	func main() {
-		cli, err := client.NewEnvClient()
-		if err != nil {
-			panic(err)
-		}
-
-		containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{})
-		if err != nil {
-			panic(err)
-		}
-
-		for _, container := range containers {
-			fmt.Printf("%s %s\n", container.ID[:10], container.Image)
-		}
-	}
-
-*/
-package client
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/api"
-	"github.com/docker/go-connections/sockets"
-	"github.com/docker/go-connections/tlsconfig"
-)
-
-// Client is the API client that performs all operations
-// against a docker server.
-type Client struct {
-	// scheme sets the scheme for the client
-	scheme string
-	// host holds the server address to connect to
-	host string
-	// proto holds the client protocol i.e. unix.
-	proto string
-	// addr holds the client address.
-	addr string
-	// basePath holds the path to prepend to the requests.
-	basePath string
-	// client used to send and receive http requests.
-	client *http.Client
-	// version of the server to talk to.
-	version string
-	// custom http headers configured by users.
-	customHTTPHeaders map[string]string
-	// manualOverride is set to true when the version was set by users.
-	manualOverride bool
-}
-
-// NewEnvClient initializes a new API client based on environment variables.
-// Use DOCKER_HOST to set the url to the docker server.
-// Use DOCKER_API_VERSION to set the version of the API to reach, leave empty for latest.
-// Use DOCKER_CERT_PATH to load the TLS certificates from.
-// Use DOCKER_TLS_VERIFY to enable or disable TLS verification, off by default.
-func NewEnvClient() (*Client, error) {
-	var client *http.Client
-	if dockerCertPath := os.Getenv("DOCKER_CERT_PATH"); dockerCertPath != "" {
-		options := tlsconfig.Options{
-			CAFile:             filepath.Join(dockerCertPath, "ca.pem"),
-			CertFile:           filepath.Join(dockerCertPath, "cert.pem"),
-			KeyFile:            filepath.Join(dockerCertPath, "key.pem"),
-			InsecureSkipVerify: os.Getenv("DOCKER_TLS_VERIFY") == "",
-		}
-		tlsc, err := tlsconfig.Client(options)
-		if err != nil {
-			return nil, err
-		}
-
-		client = &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: tlsc,
-			},
-		}
-	}
-
-	host := os.Getenv("DOCKER_HOST")
-	if host == "" {
-		host = DefaultDockerHost
-	}
-	version := os.Getenv("DOCKER_API_VERSION")
-	if version == "" {
-		version = api.DefaultVersion
-	}
-
-	cli, err := NewClient(host, version, client, nil)
-	if err != nil {
-		return cli, err
-	}
-	if os.Getenv("DOCKER_API_VERSION") != "" {
-		cli.manualOverride = true
-	}
-	return cli, nil
-}
-
-// NewClient initializes a new API client for the given host and API version.
-// It uses the given http client as transport.
-// It also initializes the custom http headers to add to each request.
-//
-// It won't send any version information if the version number is empty. It is
-// highly recommended that you set a version or your client may break if the
-// server is upgraded.
-func NewClient(host string, version string, client *http.Client, httpHeaders map[string]string) (*Client, error) {
-	proto, addr, basePath, err := ParseHost(host)
-	if err != nil {
-		return nil, err
-	}
-
-	if client != nil {
-		if _, ok := client.Transport.(*http.Transport); !ok {
-			return nil, fmt.Errorf("unable to verify TLS configuration, invalid transport %v", client.Transport)
-		}
-	} else {
-		transport := new(http.Transport)
-		sockets.ConfigureTransport(transport, proto, addr)
-		client = &http.Client{
-			Transport: transport,
-		}
-	}
-
-	scheme := "http"
-	tlsConfig := resolveTLSConfig(client.Transport)
-	if tlsConfig != nil {
-		// TODO(stevvooe): This isn't really the right way to write clients in Go.
-		// `NewClient` should probably only take an `*http.Client` and work from there.
-		// Unfortunately, the model of having a host-ish/url-thingy as the connection
-		// string has us confusing protocol and transport layers. We continue doing
-		// this to avoid breaking existing clients but this should be addressed.
-		scheme = "https"
-	}
-
-	return &Client{
-		scheme:            scheme,
-		host:              host,
-		proto:             proto,
-		addr:              addr,
-		basePath:          basePath,
-		client:            client,
-		version:           version,
-		customHTTPHeaders: httpHeaders,
-	}, nil
-}
-
-// Close ensures that transport.Client is closed
-// especially needed while using NewClient with *http.Client = nil
-// for example
-// client.NewClient("unix:///var/run/docker.sock", nil, "v1.18", map[string]string{"User-Agent": "engine-api-cli-1.0"})
-func (cli *Client) Close() error {
-
-	if t, ok := cli.client.Transport.(*http.Transport); ok {
-		t.CloseIdleConnections()
-	}
-
-	return nil
-}
-
-// getAPIPath returns the versioned request path to call the api.
-// It appends the query parameters to the path if they are not empty.
-func (cli *Client) getAPIPath(p string, query url.Values) string {
-	var apiPath string
-	if cli.version != "" {
-		v := strings.TrimPrefix(cli.version, "v")
-		apiPath = fmt.Sprintf("%s/v%s%s", cli.basePath, v, p)
-	} else {
-		apiPath = fmt.Sprintf("%s%s", cli.basePath, p)
-	}
-
-	u := &url.URL{
-		Path: apiPath,
-	}
-	if len(query) > 0 {
-		u.RawQuery = query.Encode()
-	}
-	return u.String()
-}
-
-// ClientVersion returns the version string associated with this
-// instance of the Client. Note that this value can be changed
-// via the DOCKER_API_VERSION env var.
-// This operation doesn't acquire a mutex.
-func (cli *Client) ClientVersion() string {
-	return cli.version
-}
-
-// UpdateClientVersion updates the version string associated with this
-// instance of the Client. This operation doesn't acquire a mutex.
-func (cli *Client) UpdateClientVersion(v string) {
-	if !cli.manualOverride {
-		cli.version = v
-	}
-
-}
-
-// ParseHost verifies that the given host strings is valid.
-func ParseHost(host string) (string, string, string, error) {
-	protoAddrParts := strings.SplitN(host, "://", 2)
-	if len(protoAddrParts) == 1 {
-		return "", "", "", fmt.Errorf("unable to parse docker host `%s`", host)
-	}
-
-	var basePath string
-	proto, addr := protoAddrParts[0], protoAddrParts[1]
-	if proto == "tcp" {
-		parsed, err := url.Parse("tcp://" + addr)
-		if err != nil {
-			return "", "", "", err
-		}
-		addr = parsed.Host
-		basePath = parsed.Path
-	}
-	return proto, addr, basePath, nil
-}
-
-// CustomHTTPHeaders returns the custom http headers associated with this
-// instance of the Client. This operation doesn't acquire a mutex.
-func (cli *Client) CustomHTTPHeaders() map[string]string {
-	m := make(map[string]string)
-	for k, v := range cli.customHTTPHeaders {
-		m[k] = v
-	}
-	return m
-}
-
-// SetCustomHTTPHeaders updates the custom http headers associated with this
-// instance of the Client. This operation doesn't acquire a mutex.
-func (cli *Client) SetCustomHTTPHeaders(headers map[string]string) {
-	cli.customHTTPHeaders = headers
-}
diff --git a/vendor/github.com/docker/docker/client/client_unix.go b/vendor/github.com/docker/docker/client/client_unix.go
deleted file mode 100644
index 89de892c85..0000000000
--- a/vendor/github.com/docker/docker/client/client_unix.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// +build linux freebsd solaris openbsd darwin
-
-package client
-
-// DefaultDockerHost defines os specific default if DOCKER_HOST is unset
-const DefaultDockerHost = "unix:///var/run/docker.sock"
diff --git a/vendor/github.com/docker/docker/client/client_windows.go b/vendor/github.com/docker/docker/client/client_windows.go
deleted file mode 100644
index 07c0c7a774..0000000000
--- a/vendor/github.com/docker/docker/client/client_windows.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package client
-
-// DefaultDockerHost defines os specific default if DOCKER_HOST is unset
-const DefaultDockerHost = "npipe:////./pipe/docker_engine"
diff --git a/vendor/github.com/docker/docker/client/container_attach.go b/vendor/github.com/docker/docker/client/container_attach.go
deleted file mode 100644
index eea4682158..0000000000
--- a/vendor/github.com/docker/docker/client/container_attach.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerAttach attaches a connection to a container in the server.
-// It returns a types.HijackedConnection with the hijacked connection
-// and the a reader to get output. It's up to the called to close
-// the hijacked connection by calling types.HijackedResponse.Close.
-func (cli *Client) ContainerAttach(ctx context.Context, container string, options types.ContainerAttachOptions) (types.HijackedResponse, error) {
-	query := url.Values{}
-	if options.Stream {
-		query.Set("stream", "1")
-	}
-	if options.Stdin {
-		query.Set("stdin", "1")
-	}
-	if options.Stdout {
-		query.Set("stdout", "1")
-	}
-	if options.Stderr {
-		query.Set("stderr", "1")
-	}
-	if options.DetachKeys != "" {
-		query.Set("detachKeys", options.DetachKeys)
-	}
-	if options.Logs {
-		query.Set("logs", "1")
-	}
-
-	headers := map[string][]string{"Content-Type": {"text/plain"}}
-	return cli.postHijacked(ctx, "/containers/"+container+"/attach", query, nil, headers)
-}
diff --git a/vendor/github.com/docker/docker/client/container_commit.go b/vendor/github.com/docker/docker/client/container_commit.go
deleted file mode 100644
index 531d796ee7..0000000000
--- a/vendor/github.com/docker/docker/client/container_commit.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"errors"
-	"net/url"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerCommit applies changes into a container and creates a new tagged image.
-func (cli *Client) ContainerCommit(ctx context.Context, container string, options types.ContainerCommitOptions) (types.IDResponse, error) {
-	var repository, tag string
-	if options.Reference != "" {
-		ref, err := reference.ParseNormalizedNamed(options.Reference)
-		if err != nil {
-			return types.IDResponse{}, err
-		}
-
-		if _, isCanonical := ref.(reference.Canonical); isCanonical {
-			return types.IDResponse{}, errors.New("refusing to create a tag with a digest reference")
-		}
-		ref = reference.TagNameOnly(ref)
-
-		if tagged, ok := ref.(reference.Tagged); ok {
-			tag = tagged.Tag()
-		}
-		repository = reference.FamiliarName(ref)
-	}
-
-	query := url.Values{}
-	query.Set("container", container)
-	query.Set("repo", repository)
-	query.Set("tag", tag)
-	query.Set("comment", options.Comment)
-	query.Set("author", options.Author)
-	for _, change := range options.Changes {
-		query.Add("changes", change)
-	}
-	if options.Pause != true {
-		query.Set("pause", "0")
-	}
-
-	var response types.IDResponse
-	resp, err := cli.post(ctx, "/commit", query, options.Config, nil)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/container_copy.go b/vendor/github.com/docker/docker/client/container_copy.go
deleted file mode 100644
index 545aa54383..0000000000
--- a/vendor/github.com/docker/docker/client/container_copy.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package client
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"path/filepath"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-)
-
-// ContainerStatPath returns Stat information about a path inside the container filesystem.
-func (cli *Client) ContainerStatPath(ctx context.Context, containerID, path string) (types.ContainerPathStat, error) {
-	query := url.Values{}
-	query.Set("path", filepath.ToSlash(path)) // Normalize the paths used in the API.
-
-	urlStr := fmt.Sprintf("/containers/%s/archive", containerID)
-	response, err := cli.head(ctx, urlStr, query, nil)
-	if err != nil {
-		return types.ContainerPathStat{}, err
-	}
-	defer ensureReaderClosed(response)
-	return getContainerPathStatFromHeader(response.header)
-}
-
-// CopyToContainer copies content into the container filesystem.
-func (cli *Client) CopyToContainer(ctx context.Context, container, path string, content io.Reader, options types.CopyToContainerOptions) error {
-	query := url.Values{}
-	query.Set("path", filepath.ToSlash(path)) // Normalize the paths used in the API.
-	// Do not allow for an existing directory to be overwritten by a non-directory and vice versa.
-	if !options.AllowOverwriteDirWithFile {
-		query.Set("noOverwriteDirNonDir", "true")
-	}
-
-	if options.CopyUIDGID {
-		query.Set("copyUIDGID", "true")
-	}
-
-	apiPath := fmt.Sprintf("/containers/%s/archive", container)
-
-	response, err := cli.putRaw(ctx, apiPath, query, content, nil)
-	if err != nil {
-		return err
-	}
-	defer ensureReaderClosed(response)
-
-	if response.statusCode != http.StatusOK {
-		return fmt.Errorf("unexpected status code from daemon: %d", response.statusCode)
-	}
-
-	return nil
-}
-
-// CopyFromContainer gets the content from the container and returns it as a Reader
-// to manipulate it in the host. It's up to the caller to close the reader.
-func (cli *Client) CopyFromContainer(ctx context.Context, container, srcPath string) (io.ReadCloser, types.ContainerPathStat, error) {
-	query := make(url.Values, 1)
-	query.Set("path", filepath.ToSlash(srcPath)) // Normalize the paths used in the API.
-
-	apiPath := fmt.Sprintf("/containers/%s/archive", container)
-	response, err := cli.get(ctx, apiPath, query, nil)
-	if err != nil {
-		return nil, types.ContainerPathStat{}, err
-	}
-
-	if response.statusCode != http.StatusOK {
-		return nil, types.ContainerPathStat{}, fmt.Errorf("unexpected status code from daemon: %d", response.statusCode)
-	}
-
-	// In order to get the copy behavior right, we need to know information
-	// about both the source and the destination. The response headers include
-	// stat info about the source that we can use in deciding exactly how to
-	// copy it locally. Along with the stat info about the local destination,
-	// we have everything we need to handle the multiple possibilities there
-	// can be when copying a file/dir from one location to another file/dir.
-	stat, err := getContainerPathStatFromHeader(response.header)
-	if err != nil {
-		return nil, stat, fmt.Errorf("unable to get resource stat from response: %s", err)
-	}
-	return response.body, stat, err
-}
-
-func getContainerPathStatFromHeader(header http.Header) (types.ContainerPathStat, error) {
-	var stat types.ContainerPathStat
-
-	encodedStat := header.Get("X-Docker-Container-Path-Stat")
-	statDecoder := base64.NewDecoder(base64.StdEncoding, strings.NewReader(encodedStat))
-
-	err := json.NewDecoder(statDecoder).Decode(&stat)
-	if err != nil {
-		err = fmt.Errorf("unable to decode container path stat header: %s", err)
-	}
-
-	return stat, err
-}
diff --git a/vendor/github.com/docker/docker/client/container_create.go b/vendor/github.com/docker/docker/client/container_create.go
deleted file mode 100644
index 6841b0b282..0000000000
--- a/vendor/github.com/docker/docker/client/container_create.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-	"strings"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/versions"
-	"golang.org/x/net/context"
-)
-
-type configWrapper struct {
-	*container.Config
-	HostConfig       *container.HostConfig
-	NetworkingConfig *network.NetworkingConfig
-}
-
-// ContainerCreate creates a new container based in the given configuration.
-// It can be associated with a name, but it's not mandatory.
-func (cli *Client) ContainerCreate(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (container.ContainerCreateCreatedBody, error) {
-	var response container.ContainerCreateCreatedBody
-
-	if err := cli.NewVersionError("1.25", "stop timeout"); config != nil && config.StopTimeout != nil && err != nil {
-		return response, err
-	}
-
-	// When using API 1.24 and under, the client is responsible for removing the container
-	if hostConfig != nil && versions.LessThan(cli.ClientVersion(), "1.25") {
-		hostConfig.AutoRemove = false
-	}
-
-	query := url.Values{}
-	if containerName != "" {
-		query.Set("name", containerName)
-	}
-
-	body := configWrapper{
-		Config:           config,
-		HostConfig:       hostConfig,
-		NetworkingConfig: networkingConfig,
-	}
-
-	serverResp, err := cli.post(ctx, "/containers/create", query, body, nil)
-	if err != nil {
-		if serverResp.statusCode == 404 && strings.Contains(err.Error(), "No such image") {
-			return response, imageNotFoundError{config.Image}
-		}
-		return response, err
-	}
-
-	err = json.NewDecoder(serverResp.body).Decode(&response)
-	ensureReaderClosed(serverResp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/container_diff.go b/vendor/github.com/docker/docker/client/container_diff.go
deleted file mode 100644
index 884dc9feef..0000000000
--- a/vendor/github.com/docker/docker/client/container_diff.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types/container"
-	"golang.org/x/net/context"
-)
-
-// ContainerDiff shows differences in a container filesystem since it was started.
-func (cli *Client) ContainerDiff(ctx context.Context, containerID string) ([]container.ContainerChangeResponseItem, error) {
-	var changes []container.ContainerChangeResponseItem
-
-	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/changes", url.Values{}, nil)
-	if err != nil {
-		return changes, err
-	}
-
-	err = json.NewDecoder(serverResp.body).Decode(&changes)
-	ensureReaderClosed(serverResp)
-	return changes, err
-}
diff --git a/vendor/github.com/docker/docker/client/container_exec.go b/vendor/github.com/docker/docker/client/container_exec.go
deleted file mode 100644
index 0665c54fbd..0000000000
--- a/vendor/github.com/docker/docker/client/container_exec.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerExecCreate creates a new exec configuration to run an exec process.
-func (cli *Client) ContainerExecCreate(ctx context.Context, container string, config types.ExecConfig) (types.IDResponse, error) {
-	var response types.IDResponse
-
-	if err := cli.NewVersionError("1.25", "env"); len(config.Env) != 0 && err != nil {
-		return response, err
-	}
-
-	resp, err := cli.post(ctx, "/containers/"+container+"/exec", nil, config, nil)
-	if err != nil {
-		return response, err
-	}
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
-
-// ContainerExecStart starts an exec process already created in the docker host.
-func (cli *Client) ContainerExecStart(ctx context.Context, execID string, config types.ExecStartCheck) error {
-	resp, err := cli.post(ctx, "/exec/"+execID+"/start", nil, config, nil)
-	ensureReaderClosed(resp)
-	return err
-}
-
-// ContainerExecAttach attaches a connection to an exec process in the server.
-// It returns a types.HijackedConnection with the hijacked connection
-// and the a reader to get output. It's up to the called to close
-// the hijacked connection by calling types.HijackedResponse.Close.
-func (cli *Client) ContainerExecAttach(ctx context.Context, execID string, config types.ExecConfig) (types.HijackedResponse, error) {
-	headers := map[string][]string{"Content-Type": {"application/json"}}
-	return cli.postHijacked(ctx, "/exec/"+execID+"/start", nil, config, headers)
-}
-
-// ContainerExecInspect returns information about a specific exec process on the docker host.
-func (cli *Client) ContainerExecInspect(ctx context.Context, execID string) (types.ContainerExecInspect, error) {
-	var response types.ContainerExecInspect
-	resp, err := cli.get(ctx, "/exec/"+execID+"/json", nil, nil)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/container_export.go b/vendor/github.com/docker/docker/client/container_export.go
deleted file mode 100644
index 52194f3d34..0000000000
--- a/vendor/github.com/docker/docker/client/container_export.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-
-	"golang.org/x/net/context"
-)
-
-// ContainerExport retrieves the raw contents of a container
-// and returns them as an io.ReadCloser. It's up to the caller
-// to close the stream.
-func (cli *Client) ContainerExport(ctx context.Context, containerID string) (io.ReadCloser, error) {
-	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/export", url.Values{}, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return serverResp.body, nil
-}
diff --git a/vendor/github.com/docker/docker/client/container_inspect.go b/vendor/github.com/docker/docker/client/container_inspect.go
deleted file mode 100644
index 17f1809747..0000000000
--- a/vendor/github.com/docker/docker/client/container_inspect.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerInspect returns the container information.
-func (cli *Client) ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error) {
-	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/json", nil, nil)
-	if err != nil {
-		if serverResp.statusCode == http.StatusNotFound {
-			return types.ContainerJSON{}, containerNotFoundError{containerID}
-		}
-		return types.ContainerJSON{}, err
-	}
-
-	var response types.ContainerJSON
-	err = json.NewDecoder(serverResp.body).Decode(&response)
-	ensureReaderClosed(serverResp)
-	return response, err
-}
-
-// ContainerInspectWithRaw returns the container information and its raw representation.
-func (cli *Client) ContainerInspectWithRaw(ctx context.Context, containerID string, getSize bool) (types.ContainerJSON, []byte, error) {
-	query := url.Values{}
-	if getSize {
-		query.Set("size", "1")
-	}
-	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/json", query, nil)
-	if err != nil {
-		if serverResp.statusCode == http.StatusNotFound {
-			return types.ContainerJSON{}, nil, containerNotFoundError{containerID}
-		}
-		return types.ContainerJSON{}, nil, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	body, err := ioutil.ReadAll(serverResp.body)
-	if err != nil {
-		return types.ContainerJSON{}, nil, err
-	}
-
-	var response types.ContainerJSON
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&response)
-	return response, body, err
-}
diff --git a/vendor/github.com/docker/docker/client/container_kill.go b/vendor/github.com/docker/docker/client/container_kill.go
deleted file mode 100644
index 29f80c73ad..0000000000
--- a/vendor/github.com/docker/docker/client/container_kill.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"golang.org/x/net/context"
-)
-
-// ContainerKill terminates the container process but does not remove the container from the docker host.
-func (cli *Client) ContainerKill(ctx context.Context, containerID, signal string) error {
-	query := url.Values{}
-	query.Set("signal", signal)
-
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/kill", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/container_list.go b/vendor/github.com/docker/docker/client/container_list.go
deleted file mode 100644
index 4398912197..0000000000
--- a/vendor/github.com/docker/docker/client/container_list.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// ContainerList returns the list of containers in the docker host.
-func (cli *Client) ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
-	query := url.Values{}
-
-	if options.All {
-		query.Set("all", "1")
-	}
-
-	if options.Limit != -1 {
-		query.Set("limit", strconv.Itoa(options.Limit))
-	}
-
-	if options.Since != "" {
-		query.Set("since", options.Since)
-	}
-
-	if options.Before != "" {
-		query.Set("before", options.Before)
-	}
-
-	if options.Size {
-		query.Set("size", "1")
-	}
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParamWithVersion(cli.version, options.Filters)
-
-		if err != nil {
-			return nil, err
-		}
-
-		query.Set("filters", filterJSON)
-	}
-
-	resp, err := cli.get(ctx, "/containers/json", query, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var containers []types.Container
-	err = json.NewDecoder(resp.body).Decode(&containers)
-	ensureReaderClosed(resp)
-	return containers, err
-}
diff --git a/vendor/github.com/docker/docker/client/container_logs.go b/vendor/github.com/docker/docker/client/container_logs.go
deleted file mode 100644
index 69056b6321..0000000000
--- a/vendor/github.com/docker/docker/client/container_logs.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	timetypes "github.com/docker/docker/api/types/time"
-)
-
-// ContainerLogs returns the logs generated by a container in an io.ReadCloser.
-// It's up to the caller to close the stream.
-func (cli *Client) ContainerLogs(ctx context.Context, container string, options types.ContainerLogsOptions) (io.ReadCloser, error) {
-	query := url.Values{}
-	if options.ShowStdout {
-		query.Set("stdout", "1")
-	}
-
-	if options.ShowStderr {
-		query.Set("stderr", "1")
-	}
-
-	if options.Since != "" {
-		ts, err := timetypes.GetTimestamp(options.Since, time.Now())
-		if err != nil {
-			return nil, err
-		}
-		query.Set("since", ts)
-	}
-
-	if options.Timestamps {
-		query.Set("timestamps", "1")
-	}
-
-	if options.Details {
-		query.Set("details", "1")
-	}
-
-	if options.Follow {
-		query.Set("follow", "1")
-	}
-	query.Set("tail", options.Tail)
-
-	resp, err := cli.get(ctx, "/containers/"+container+"/logs", query, nil)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
diff --git a/vendor/github.com/docker/docker/client/container_pause.go b/vendor/github.com/docker/docker/client/container_pause.go
deleted file mode 100644
index 412067a782..0000000000
--- a/vendor/github.com/docker/docker/client/container_pause.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package client
-
-import "golang.org/x/net/context"
-
-// ContainerPause pauses the main process of a given container without terminating it.
-func (cli *Client) ContainerPause(ctx context.Context, containerID string) error {
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/pause", nil, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/container_prune.go b/vendor/github.com/docker/docker/client/container_prune.go
deleted file mode 100644
index b582170867..0000000000
--- a/vendor/github.com/docker/docker/client/container_prune.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// ContainersPrune requests the daemon to delete unused data
-func (cli *Client) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (types.ContainersPruneReport, error) {
-	var report types.ContainersPruneReport
-
-	if err := cli.NewVersionError("1.25", "container prune"); err != nil {
-		return report, err
-	}
-
-	query, err := getFiltersQuery(pruneFilters)
-	if err != nil {
-		return report, err
-	}
-
-	serverResp, err := cli.post(ctx, "/containers/prune", query, nil, nil)
-	if err != nil {
-		return report, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil {
-		return report, fmt.Errorf("Error retrieving disk usage: %v", err)
-	}
-
-	return report, nil
-}
diff --git a/vendor/github.com/docker/docker/client/container_remove.go b/vendor/github.com/docker/docker/client/container_remove.go
deleted file mode 100644
index 3a79590ced..0000000000
--- a/vendor/github.com/docker/docker/client/container_remove.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerRemove kills and removes a container from the docker host.
-func (cli *Client) ContainerRemove(ctx context.Context, containerID string, options types.ContainerRemoveOptions) error {
-	query := url.Values{}
-	if options.RemoveVolumes {
-		query.Set("v", "1")
-	}
-	if options.RemoveLinks {
-		query.Set("link", "1")
-	}
-
-	if options.Force {
-		query.Set("force", "1")
-	}
-
-	resp, err := cli.delete(ctx, "/containers/"+containerID, query, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/container_rename.go b/vendor/github.com/docker/docker/client/container_rename.go
deleted file mode 100644
index 0e718da7c6..0000000000
--- a/vendor/github.com/docker/docker/client/container_rename.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"golang.org/x/net/context"
-)
-
-// ContainerRename changes the name of a given container.
-func (cli *Client) ContainerRename(ctx context.Context, containerID, newContainerName string) error {
-	query := url.Values{}
-	query.Set("name", newContainerName)
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/rename", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/container_resize.go b/vendor/github.com/docker/docker/client/container_resize.go
deleted file mode 100644
index 66c3cc1940..0000000000
--- a/vendor/github.com/docker/docker/client/container_resize.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package client
-
-import (
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerResize changes the size of the tty for a container.
-func (cli *Client) ContainerResize(ctx context.Context, containerID string, options types.ResizeOptions) error {
-	return cli.resize(ctx, "/containers/"+containerID, options.Height, options.Width)
-}
-
-// ContainerExecResize changes the size of the tty for an exec process running inside a container.
-func (cli *Client) ContainerExecResize(ctx context.Context, execID string, options types.ResizeOptions) error {
-	return cli.resize(ctx, "/exec/"+execID, options.Height, options.Width)
-}
-
-func (cli *Client) resize(ctx context.Context, basePath string, height, width uint) error {
-	query := url.Values{}
-	query.Set("h", strconv.Itoa(int(height)))
-	query.Set("w", strconv.Itoa(int(width)))
-
-	resp, err := cli.post(ctx, basePath+"/resize", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/container_restart.go b/vendor/github.com/docker/docker/client/container_restart.go
deleted file mode 100644
index 74d7455f02..0000000000
--- a/vendor/github.com/docker/docker/client/container_restart.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package client
-
-import (
-	"net/url"
-	"time"
-
-	timetypes "github.com/docker/docker/api/types/time"
-	"golang.org/x/net/context"
-)
-
-// ContainerRestart stops and starts a container again.
-// It makes the daemon to wait for the container to be up again for
-// a specific amount of time, given the timeout.
-func (cli *Client) ContainerRestart(ctx context.Context, containerID string, timeout *time.Duration) error {
-	query := url.Values{}
-	if timeout != nil {
-		query.Set("t", timetypes.DurationToSecondsString(*timeout))
-	}
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/restart", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/container_start.go b/vendor/github.com/docker/docker/client/container_start.go
deleted file mode 100644
index b1f08de416..0000000000
--- a/vendor/github.com/docker/docker/client/container_start.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-)
-
-// ContainerStart sends a request to the docker daemon to start a container.
-func (cli *Client) ContainerStart(ctx context.Context, containerID string, options types.ContainerStartOptions) error {
-	query := url.Values{}
-	if len(options.CheckpointID) != 0 {
-		query.Set("checkpoint", options.CheckpointID)
-	}
-	if len(options.CheckpointDir) != 0 {
-		query.Set("checkpoint-dir", options.CheckpointDir)
-	}
-
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/start", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/container_stats.go b/vendor/github.com/docker/docker/client/container_stats.go
deleted file mode 100644
index 4758c66e32..0000000000
--- a/vendor/github.com/docker/docker/client/container_stats.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerStats returns near realtime stats for a given container.
-// It's up to the caller to close the io.ReadCloser returned.
-func (cli *Client) ContainerStats(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error) {
-	query := url.Values{}
-	query.Set("stream", "0")
-	if stream {
-		query.Set("stream", "1")
-	}
-
-	resp, err := cli.get(ctx, "/containers/"+containerID+"/stats", query, nil)
-	if err != nil {
-		return types.ContainerStats{}, err
-	}
-
-	osType := getDockerOS(resp.header.Get("Server"))
-	return types.ContainerStats{Body: resp.body, OSType: osType}, err
-}
diff --git a/vendor/github.com/docker/docker/client/container_stop.go b/vendor/github.com/docker/docker/client/container_stop.go
deleted file mode 100644
index b5418ae8c8..0000000000
--- a/vendor/github.com/docker/docker/client/container_stop.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"net/url"
-	"time"
-
-	timetypes "github.com/docker/docker/api/types/time"
-	"golang.org/x/net/context"
-)
-
-// ContainerStop stops a container without terminating the process.
-// The process is blocked until the container stops or the timeout expires.
-func (cli *Client) ContainerStop(ctx context.Context, containerID string, timeout *time.Duration) error {
-	query := url.Values{}
-	if timeout != nil {
-		query.Set("t", timetypes.DurationToSecondsString(*timeout))
-	}
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/stop", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/container_top.go b/vendor/github.com/docker/docker/client/container_top.go
deleted file mode 100644
index 9689123a40..0000000000
--- a/vendor/github.com/docker/docker/client/container_top.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-	"strings"
-
-	"github.com/docker/docker/api/types/container"
-	"golang.org/x/net/context"
-)
-
-// ContainerTop shows process information from within a container.
-func (cli *Client) ContainerTop(ctx context.Context, containerID string, arguments []string) (container.ContainerTopOKBody, error) {
-	var response container.ContainerTopOKBody
-	query := url.Values{}
-	if len(arguments) > 0 {
-		query.Set("ps_args", strings.Join(arguments, " "))
-	}
-
-	resp, err := cli.get(ctx, "/containers/"+containerID+"/top", query, nil)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/container_unpause.go b/vendor/github.com/docker/docker/client/container_unpause.go
deleted file mode 100644
index 5c76211256..0000000000
--- a/vendor/github.com/docker/docker/client/container_unpause.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package client
-
-import "golang.org/x/net/context"
-
-// ContainerUnpause resumes the process execution within a container
-func (cli *Client) ContainerUnpause(ctx context.Context, containerID string) error {
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/unpause", nil, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/container_update.go b/vendor/github.com/docker/docker/client/container_update.go
deleted file mode 100644
index 5082f22dfa..0000000000
--- a/vendor/github.com/docker/docker/client/container_update.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types/container"
-	"golang.org/x/net/context"
-)
-
-// ContainerUpdate updates resources of a container
-func (cli *Client) ContainerUpdate(ctx context.Context, containerID string, updateConfig container.UpdateConfig) (container.ContainerUpdateOKBody, error) {
-	var response container.ContainerUpdateOKBody
-	serverResp, err := cli.post(ctx, "/containers/"+containerID+"/update", nil, updateConfig, nil)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(serverResp.body).Decode(&response)
-
-	ensureReaderClosed(serverResp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/container_wait.go b/vendor/github.com/docker/docker/client/container_wait.go
deleted file mode 100644
index 93212c70ee..0000000000
--- a/vendor/github.com/docker/docker/client/container_wait.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/container"
-)
-
-// ContainerWait pauses execution until a container exits.
-// It returns the API status code as response of its readiness.
-func (cli *Client) ContainerWait(ctx context.Context, containerID string) (int64, error) {
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/wait", nil, nil, nil)
-	if err != nil {
-		return -1, err
-	}
-	defer ensureReaderClosed(resp)
-
-	var res container.ContainerWaitOKBody
-	if err := json.NewDecoder(resp.body).Decode(&res); err != nil {
-		return -1, err
-	}
-
-	return res.StatusCode, nil
-}
diff --git a/vendor/github.com/docker/docker/client/disk_usage.go b/vendor/github.com/docker/docker/client/disk_usage.go
deleted file mode 100644
index 03c80b39af..0000000000
--- a/vendor/github.com/docker/docker/client/disk_usage.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// DiskUsage requests the current data usage from the daemon
-func (cli *Client) DiskUsage(ctx context.Context) (types.DiskUsage, error) {
-	var du types.DiskUsage
-
-	serverResp, err := cli.get(ctx, "/system/df", nil, nil)
-	if err != nil {
-		return du, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	if err := json.NewDecoder(serverResp.body).Decode(&du); err != nil {
-		return du, fmt.Errorf("Error retrieving disk usage: %v", err)
-	}
-
-	return du, nil
-}
diff --git a/vendor/github.com/docker/docker/client/errors.go b/vendor/github.com/docker/docker/client/errors.go
deleted file mode 100644
index 4f767bd8d3..0000000000
--- a/vendor/github.com/docker/docker/client/errors.go
+++ /dev/null
@@ -1,278 +0,0 @@
-package client
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types/versions"
-	"github.com/pkg/errors"
-)
-
-// errConnectionFailed implements an error returned when connection failed.
-type errConnectionFailed struct {
-	host string
-}
-
-// Error returns a string representation of an errConnectionFailed
-func (err errConnectionFailed) Error() string {
-	if err.host == "" {
-		return "Cannot connect to the Docker daemon. Is the docker daemon running on this host?"
-	}
-	return fmt.Sprintf("Cannot connect to the Docker daemon at %s. Is the docker daemon running?", err.host)
-}
-
-// IsErrConnectionFailed returns true if the error is caused by connection failed.
-func IsErrConnectionFailed(err error) bool {
-	_, ok := errors.Cause(err).(errConnectionFailed)
-	return ok
-}
-
-// ErrorConnectionFailed returns an error with host in the error message when connection to docker daemon failed.
-func ErrorConnectionFailed(host string) error {
-	return errConnectionFailed{host: host}
-}
-
-type notFound interface {
-	error
-	NotFound() bool // Is the error a NotFound error
-}
-
-// IsErrNotFound returns true if the error is caused with an
-// object (image, container, network, volume, …) is not found in the docker host.
-func IsErrNotFound(err error) bool {
-	te, ok := err.(notFound)
-	return ok && te.NotFound()
-}
-
-// imageNotFoundError implements an error returned when an image is not in the docker host.
-type imageNotFoundError struct {
-	imageID string
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e imageNotFoundError) NotFound() bool {
-	return true
-}
-
-// Error returns a string representation of an imageNotFoundError
-func (e imageNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such image: %s", e.imageID)
-}
-
-// IsErrImageNotFound returns true if the error is caused
-// when an image is not found in the docker host.
-func IsErrImageNotFound(err error) bool {
-	return IsErrNotFound(err)
-}
-
-// containerNotFoundError implements an error returned when a container is not in the docker host.
-type containerNotFoundError struct {
-	containerID string
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e containerNotFoundError) NotFound() bool {
-	return true
-}
-
-// Error returns a string representation of a containerNotFoundError
-func (e containerNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such container: %s", e.containerID)
-}
-
-// IsErrContainerNotFound returns true if the error is caused
-// when a container is not found in the docker host.
-func IsErrContainerNotFound(err error) bool {
-	return IsErrNotFound(err)
-}
-
-// networkNotFoundError implements an error returned when a network is not in the docker host.
-type networkNotFoundError struct {
-	networkID string
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e networkNotFoundError) NotFound() bool {
-	return true
-}
-
-// Error returns a string representation of a networkNotFoundError
-func (e networkNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such network: %s", e.networkID)
-}
-
-// IsErrNetworkNotFound returns true if the error is caused
-// when a network is not found in the docker host.
-func IsErrNetworkNotFound(err error) bool {
-	return IsErrNotFound(err)
-}
-
-// volumeNotFoundError implements an error returned when a volume is not in the docker host.
-type volumeNotFoundError struct {
-	volumeID string
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e volumeNotFoundError) NotFound() bool {
-	return true
-}
-
-// Error returns a string representation of a volumeNotFoundError
-func (e volumeNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such volume: %s", e.volumeID)
-}
-
-// IsErrVolumeNotFound returns true if the error is caused
-// when a volume is not found in the docker host.
-func IsErrVolumeNotFound(err error) bool {
-	return IsErrNotFound(err)
-}
-
-// unauthorizedError represents an authorization error in a remote registry.
-type unauthorizedError struct {
-	cause error
-}
-
-// Error returns a string representation of an unauthorizedError
-func (u unauthorizedError) Error() string {
-	return u.cause.Error()
-}
-
-// IsErrUnauthorized returns true if the error is caused
-// when a remote registry authentication fails
-func IsErrUnauthorized(err error) bool {
-	_, ok := err.(unauthorizedError)
-	return ok
-}
-
-// nodeNotFoundError implements an error returned when a node is not found.
-type nodeNotFoundError struct {
-	nodeID string
-}
-
-// Error returns a string representation of a nodeNotFoundError
-func (e nodeNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such node: %s", e.nodeID)
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e nodeNotFoundError) NotFound() bool {
-	return true
-}
-
-// IsErrNodeNotFound returns true if the error is caused
-// when a node is not found.
-func IsErrNodeNotFound(err error) bool {
-	_, ok := err.(nodeNotFoundError)
-	return ok
-}
-
-// serviceNotFoundError implements an error returned when a service is not found.
-type serviceNotFoundError struct {
-	serviceID string
-}
-
-// Error returns a string representation of a serviceNotFoundError
-func (e serviceNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such service: %s", e.serviceID)
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e serviceNotFoundError) NotFound() bool {
-	return true
-}
-
-// IsErrServiceNotFound returns true if the error is caused
-// when a service is not found.
-func IsErrServiceNotFound(err error) bool {
-	_, ok := err.(serviceNotFoundError)
-	return ok
-}
-
-// taskNotFoundError implements an error returned when a task is not found.
-type taskNotFoundError struct {
-	taskID string
-}
-
-// Error returns a string representation of a taskNotFoundError
-func (e taskNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such task: %s", e.taskID)
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e taskNotFoundError) NotFound() bool {
-	return true
-}
-
-// IsErrTaskNotFound returns true if the error is caused
-// when a task is not found.
-func IsErrTaskNotFound(err error) bool {
-	_, ok := err.(taskNotFoundError)
-	return ok
-}
-
-type pluginPermissionDenied struct {
-	name string
-}
-
-func (e pluginPermissionDenied) Error() string {
-	return "Permission denied while installing plugin " + e.name
-}
-
-// IsErrPluginPermissionDenied returns true if the error is caused
-// when a user denies a plugin's permissions
-func IsErrPluginPermissionDenied(err error) bool {
-	_, ok := err.(pluginPermissionDenied)
-	return ok
-}
-
-// NewVersionError returns an error if the APIVersion required
-// if less than the current supported version
-func (cli *Client) NewVersionError(APIrequired, feature string) error {
-	if versions.LessThan(cli.version, APIrequired) {
-		return fmt.Errorf("%q requires API version %s, but the Docker daemon API version is %s", feature, APIrequired, cli.version)
-	}
-	return nil
-}
-
-// secretNotFoundError implements an error returned when a secret is not found.
-type secretNotFoundError struct {
-	name string
-}
-
-// Error returns a string representation of a secretNotFoundError
-func (e secretNotFoundError) Error() string {
-	return fmt.Sprintf("Error: no such secret: %s", e.name)
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e secretNotFoundError) NotFound() bool {
-	return true
-}
-
-// IsErrSecretNotFound returns true if the error is caused
-// when a secret is not found.
-func IsErrSecretNotFound(err error) bool {
-	_, ok := err.(secretNotFoundError)
-	return ok
-}
-
-// pluginNotFoundError implements an error returned when a plugin is not in the docker host.
-type pluginNotFoundError struct {
-	name string
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e pluginNotFoundError) NotFound() bool {
-	return true
-}
-
-// Error returns a string representation of a pluginNotFoundError
-func (e pluginNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such plugin: %s", e.name)
-}
-
-// IsErrPluginNotFound returns true if the error is caused
-// when a plugin is not found in the docker host.
-func IsErrPluginNotFound(err error) bool {
-	return IsErrNotFound(err)
-}
diff --git a/vendor/github.com/docker/docker/client/events.go b/vendor/github.com/docker/docker/client/events.go
deleted file mode 100644
index af47aefa74..0000000000
--- a/vendor/github.com/docker/docker/client/events.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	timetypes "github.com/docker/docker/api/types/time"
-)
-
-// Events returns a stream of events in the daemon. It's up to the caller to close the stream
-// by cancelling the context. Once the stream has been completely read an io.EOF error will
-// be sent over the error channel. If an error is sent all processing will be stopped. It's up
-// to the caller to reopen the stream in the event of an error by reinvoking this method.
-func (cli *Client) Events(ctx context.Context, options types.EventsOptions) (<-chan events.Message, <-chan error) {
-
-	messages := make(chan events.Message)
-	errs := make(chan error, 1)
-
-	started := make(chan struct{})
-	go func() {
-		defer close(errs)
-
-		query, err := buildEventsQueryParams(cli.version, options)
-		if err != nil {
-			close(started)
-			errs <- err
-			return
-		}
-
-		resp, err := cli.get(ctx, "/events", query, nil)
-		if err != nil {
-			close(started)
-			errs <- err
-			return
-		}
-		defer resp.body.Close()
-
-		decoder := json.NewDecoder(resp.body)
-
-		close(started)
-		for {
-			select {
-			case <-ctx.Done():
-				errs <- ctx.Err()
-				return
-			default:
-				var event events.Message
-				if err := decoder.Decode(&event); err != nil {
-					errs <- err
-					return
-				}
-
-				select {
-				case messages <- event:
-				case <-ctx.Done():
-					errs <- ctx.Err()
-					return
-				}
-			}
-		}
-	}()
-	<-started
-
-	return messages, errs
-}
-
-func buildEventsQueryParams(cliVersion string, options types.EventsOptions) (url.Values, error) {
-	query := url.Values{}
-	ref := time.Now()
-
-	if options.Since != "" {
-		ts, err := timetypes.GetTimestamp(options.Since, ref)
-		if err != nil {
-			return nil, err
-		}
-		query.Set("since", ts)
-	}
-
-	if options.Until != "" {
-		ts, err := timetypes.GetTimestamp(options.Until, ref)
-		if err != nil {
-			return nil, err
-		}
-		query.Set("until", ts)
-	}
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParamWithVersion(cliVersion, options.Filters)
-		if err != nil {
-			return nil, err
-		}
-		query.Set("filters", filterJSON)
-	}
-
-	return query, nil
-}
diff --git a/vendor/github.com/docker/docker/client/hijack.go b/vendor/github.com/docker/docker/client/hijack.go
deleted file mode 100644
index 74c53f52b3..0000000000
--- a/vendor/github.com/docker/docker/client/hijack.go
+++ /dev/null
@@ -1,177 +0,0 @@
-package client
-
-import (
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"net"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/tlsconfig"
-	"github.com/docker/go-connections/sockets"
-	"golang.org/x/net/context"
-)
-
-// tlsClientCon holds tls information and a dialed connection.
-type tlsClientCon struct {
-	*tls.Conn
-	rawConn net.Conn
-}
-
-func (c *tlsClientCon) CloseWrite() error {
-	// Go standard tls.Conn doesn't provide the CloseWrite() method so we do it
-	// on its underlying connection.
-	if conn, ok := c.rawConn.(types.CloseWriter); ok {
-		return conn.CloseWrite()
-	}
-	return nil
-}
-
-// postHijacked sends a POST request and hijacks the connection.
-func (cli *Client) postHijacked(ctx context.Context, path string, query url.Values, body interface{}, headers map[string][]string) (types.HijackedResponse, error) {
-	bodyEncoded, err := encodeData(body)
-	if err != nil {
-		return types.HijackedResponse{}, err
-	}
-
-	apiPath := cli.getAPIPath(path, query)
-	req, err := http.NewRequest("POST", apiPath, bodyEncoded)
-	if err != nil {
-		return types.HijackedResponse{}, err
-	}
-	req = cli.addHeaders(req, headers)
-
-	req.Host = cli.addr
-	req.Header.Set("Connection", "Upgrade")
-	req.Header.Set("Upgrade", "tcp")
-
-	conn, err := dial(cli.proto, cli.addr, resolveTLSConfig(cli.client.Transport))
-	if err != nil {
-		if strings.Contains(err.Error(), "connection refused") {
-			return types.HijackedResponse{}, fmt.Errorf("Cannot connect to the Docker daemon. Is 'docker daemon' running on this host?")
-		}
-		return types.HijackedResponse{}, err
-	}
-
-	// When we set up a TCP connection for hijack, there could be long periods
-	// of inactivity (a long running command with no output) that in certain
-	// network setups may cause ECONNTIMEOUT, leaving the client in an unknown
-	// state. Setting TCP KeepAlive on the socket connection will prohibit
-	// ECONNTIMEOUT unless the socket connection truly is broken
-	if tcpConn, ok := conn.(*net.TCPConn); ok {
-		tcpConn.SetKeepAlive(true)
-		tcpConn.SetKeepAlivePeriod(30 * time.Second)
-	}
-
-	clientconn := httputil.NewClientConn(conn, nil)
-	defer clientconn.Close()
-
-	// Server hijacks the connection, error 'connection closed' expected
-	_, err = clientconn.Do(req)
-
-	rwc, br := clientconn.Hijack()
-
-	return types.HijackedResponse{Conn: rwc, Reader: br}, err
-}
-
-func tlsDial(network, addr string, config *tls.Config) (net.Conn, error) {
-	return tlsDialWithDialer(new(net.Dialer), network, addr, config)
-}
-
-// We need to copy Go's implementation of tls.Dial (pkg/cryptor/tls/tls.go) in
-// order to return our custom tlsClientCon struct which holds both the tls.Conn
-// object _and_ its underlying raw connection. The rationale for this is that
-// we need to be able to close the write end of the connection when attaching,
-// which tls.Conn does not provide.
-func tlsDialWithDialer(dialer *net.Dialer, network, addr string, config *tls.Config) (net.Conn, error) {
-	// We want the Timeout and Deadline values from dialer to cover the
-	// whole process: TCP connection and TLS handshake. This means that we
-	// also need to start our own timers now.
-	timeout := dialer.Timeout
-
-	if !dialer.Deadline.IsZero() {
-		deadlineTimeout := dialer.Deadline.Sub(time.Now())
-		if timeout == 0 || deadlineTimeout < timeout {
-			timeout = deadlineTimeout
-		}
-	}
-
-	var errChannel chan error
-
-	if timeout != 0 {
-		errChannel = make(chan error, 2)
-		time.AfterFunc(timeout, func() {
-			errChannel <- errors.New("")
-		})
-	}
-
-	proxyDialer, err := sockets.DialerFromEnvironment(dialer)
-	if err != nil {
-		return nil, err
-	}
-
-	rawConn, err := proxyDialer.Dial(network, addr)
-	if err != nil {
-		return nil, err
-	}
-	// When we set up a TCP connection for hijack, there could be long periods
-	// of inactivity (a long running command with no output) that in certain
-	// network setups may cause ECONNTIMEOUT, leaving the client in an unknown
-	// state. Setting TCP KeepAlive on the socket connection will prohibit
-	// ECONNTIMEOUT unless the socket connection truly is broken
-	if tcpConn, ok := rawConn.(*net.TCPConn); ok {
-		tcpConn.SetKeepAlive(true)
-		tcpConn.SetKeepAlivePeriod(30 * time.Second)
-	}
-
-	colonPos := strings.LastIndex(addr, ":")
-	if colonPos == -1 {
-		colonPos = len(addr)
-	}
-	hostname := addr[:colonPos]
-
-	// If no ServerName is set, infer the ServerName
-	// from the hostname we're connecting to.
-	if config.ServerName == "" {
-		// Make a copy to avoid polluting argument or default.
-		config = tlsconfig.Clone(config)
-		config.ServerName = hostname
-	}
-
-	conn := tls.Client(rawConn, config)
-
-	if timeout == 0 {
-		err = conn.Handshake()
-	} else {
-		go func() {
-			errChannel <- conn.Handshake()
-		}()
-
-		err = <-errChannel
-	}
-
-	if err != nil {
-		rawConn.Close()
-		return nil, err
-	}
-
-	// This is Docker difference with standard's crypto/tls package: returned a
-	// wrapper which holds both the TLS and raw connections.
-	return &tlsClientCon{conn, rawConn}, nil
-}
-
-func dial(proto, addr string, tlsConfig *tls.Config) (net.Conn, error) {
-	if tlsConfig != nil && proto != "unix" && proto != "npipe" {
-		// Notice this isn't Go standard's tls.Dial function
-		return tlsDial(proto, addr, tlsConfig)
-	}
-	if proto == "npipe" {
-		return sockets.DialPipe(addr, 32*time.Second)
-	}
-	return net.Dial(proto, addr)
-}
diff --git a/vendor/github.com/docker/docker/client/image_build.go b/vendor/github.com/docker/docker/client/image_build.go
deleted file mode 100644
index bb69143e99..0000000000
--- a/vendor/github.com/docker/docker/client/image_build.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package client
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-)
-
-// ImageBuild sends request to the daemon to build images.
-// The Body in the response implement an io.ReadCloser and it's up to the caller to
-// close it.
-func (cli *Client) ImageBuild(ctx context.Context, buildContext io.Reader, options types.ImageBuildOptions) (types.ImageBuildResponse, error) {
-	query, err := cli.imageBuildOptionsToQuery(options)
-	if err != nil {
-		return types.ImageBuildResponse{}, err
-	}
-
-	headers := http.Header(make(map[string][]string))
-	buf, err := json.Marshal(options.AuthConfigs)
-	if err != nil {
-		return types.ImageBuildResponse{}, err
-	}
-	headers.Add("X-Registry-Config", base64.URLEncoding.EncodeToString(buf))
-	headers.Set("Content-Type", "application/x-tar")
-
-	serverResp, err := cli.postRaw(ctx, "/build", query, buildContext, headers)
-	if err != nil {
-		return types.ImageBuildResponse{}, err
-	}
-
-	osType := getDockerOS(serverResp.header.Get("Server"))
-
-	return types.ImageBuildResponse{
-		Body:   serverResp.body,
-		OSType: osType,
-	}, nil
-}
-
-func (cli *Client) imageBuildOptionsToQuery(options types.ImageBuildOptions) (url.Values, error) {
-	query := url.Values{
-		"t":           options.Tags,
-		"securityopt": options.SecurityOpt,
-		"extrahosts":  options.ExtraHosts,
-	}
-	if options.SuppressOutput {
-		query.Set("q", "1")
-	}
-	if options.RemoteContext != "" {
-		query.Set("remote", options.RemoteContext)
-	}
-	if options.NoCache {
-		query.Set("nocache", "1")
-	}
-	if options.Remove {
-		query.Set("rm", "1")
-	} else {
-		query.Set("rm", "0")
-	}
-
-	if options.ForceRemove {
-		query.Set("forcerm", "1")
-	}
-
-	if options.PullParent {
-		query.Set("pull", "1")
-	}
-
-	if options.Squash {
-		if err := cli.NewVersionError("1.25", "squash"); err != nil {
-			return query, err
-		}
-		query.Set("squash", "1")
-	}
-
-	if !container.Isolation.IsDefault(options.Isolation) {
-		query.Set("isolation", string(options.Isolation))
-	}
-
-	query.Set("cpusetcpus", options.CPUSetCPUs)
-	query.Set("networkmode", options.NetworkMode)
-	query.Set("cpusetmems", options.CPUSetMems)
-	query.Set("cpushares", strconv.FormatInt(options.CPUShares, 10))
-	query.Set("cpuquota", strconv.FormatInt(options.CPUQuota, 10))
-	query.Set("cpuperiod", strconv.FormatInt(options.CPUPeriod, 10))
-	query.Set("memory", strconv.FormatInt(options.Memory, 10))
-	query.Set("memswap", strconv.FormatInt(options.MemorySwap, 10))
-	query.Set("cgroupparent", options.CgroupParent)
-	query.Set("shmsize", strconv.FormatInt(options.ShmSize, 10))
-	query.Set("dockerfile", options.Dockerfile)
-	query.Set("target", options.Target)
-
-	ulimitsJSON, err := json.Marshal(options.Ulimits)
-	if err != nil {
-		return query, err
-	}
-	query.Set("ulimits", string(ulimitsJSON))
-
-	buildArgsJSON, err := json.Marshal(options.BuildArgs)
-	if err != nil {
-		return query, err
-	}
-	query.Set("buildargs", string(buildArgsJSON))
-
-	labelsJSON, err := json.Marshal(options.Labels)
-	if err != nil {
-		return query, err
-	}
-	query.Set("labels", string(labelsJSON))
-
-	cacheFromJSON, err := json.Marshal(options.CacheFrom)
-	if err != nil {
-		return query, err
-	}
-	query.Set("cachefrom", string(cacheFromJSON))
-
-	return query, nil
-}
diff --git a/vendor/github.com/docker/docker/client/image_create.go b/vendor/github.com/docker/docker/client/image_create.go
deleted file mode 100644
index 4436abb0dd..0000000000
--- a/vendor/github.com/docker/docker/client/image_create.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-)
-
-// ImageCreate creates a new image based in the parent options.
-// It returns the JSON content in the response body.
-func (cli *Client) ImageCreate(ctx context.Context, parentReference string, options types.ImageCreateOptions) (io.ReadCloser, error) {
-	ref, err := reference.ParseNormalizedNamed(parentReference)
-	if err != nil {
-		return nil, err
-	}
-
-	query := url.Values{}
-	query.Set("fromImage", reference.FamiliarName(ref))
-	query.Set("tag", getAPITagFromNamedRef(ref))
-	resp, err := cli.tryImageCreate(ctx, query, options.RegistryAuth)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
-
-func (cli *Client) tryImageCreate(ctx context.Context, query url.Values, registryAuth string) (serverResponse, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	return cli.post(ctx, "/images/create", query, nil, headers)
-}
diff --git a/vendor/github.com/docker/docker/client/image_history.go b/vendor/github.com/docker/docker/client/image_history.go
deleted file mode 100644
index 7b4babcba3..0000000000
--- a/vendor/github.com/docker/docker/client/image_history.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types/image"
-	"golang.org/x/net/context"
-)
-
-// ImageHistory returns the changes in an image in history format.
-func (cli *Client) ImageHistory(ctx context.Context, imageID string) ([]image.HistoryResponseItem, error) {
-	var history []image.HistoryResponseItem
-	serverResp, err := cli.get(ctx, "/images/"+imageID+"/history", url.Values{}, nil)
-	if err != nil {
-		return history, err
-	}
-
-	err = json.NewDecoder(serverResp.body).Decode(&history)
-	ensureReaderClosed(serverResp)
-	return history, err
-}
diff --git a/vendor/github.com/docker/docker/client/image_import.go b/vendor/github.com/docker/docker/client/image_import.go
deleted file mode 100644
index d7dedd8232..0000000000
--- a/vendor/github.com/docker/docker/client/image_import.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-)
-
-// ImageImport creates a new image based in the source options.
-// It returns the JSON content in the response body.
-func (cli *Client) ImageImport(ctx context.Context, source types.ImageImportSource, ref string, options types.ImageImportOptions) (io.ReadCloser, error) {
-	if ref != "" {
-		//Check if the given image name can be resolved
-		if _, err := reference.ParseNormalizedNamed(ref); err != nil {
-			return nil, err
-		}
-	}
-
-	query := url.Values{}
-	query.Set("fromSrc", source.SourceName)
-	query.Set("repo", ref)
-	query.Set("tag", options.Tag)
-	query.Set("message", options.Message)
-	for _, change := range options.Changes {
-		query.Add("changes", change)
-	}
-
-	resp, err := cli.postRaw(ctx, "/images/create", query, source.Source, nil)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
diff --git a/vendor/github.com/docker/docker/client/image_inspect.go b/vendor/github.com/docker/docker/client/image_inspect.go
deleted file mode 100644
index b3a64ce2f8..0000000000
--- a/vendor/github.com/docker/docker/client/image_inspect.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ImageInspectWithRaw returns the image information and its raw representation.
-func (cli *Client) ImageInspectWithRaw(ctx context.Context, imageID string) (types.ImageInspect, []byte, error) {
-	serverResp, err := cli.get(ctx, "/images/"+imageID+"/json", nil, nil)
-	if err != nil {
-		if serverResp.statusCode == http.StatusNotFound {
-			return types.ImageInspect{}, nil, imageNotFoundError{imageID}
-		}
-		return types.ImageInspect{}, nil, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	body, err := ioutil.ReadAll(serverResp.body)
-	if err != nil {
-		return types.ImageInspect{}, nil, err
-	}
-
-	var response types.ImageInspect
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&response)
-	return response, body, err
-}
diff --git a/vendor/github.com/docker/docker/client/image_list.go b/vendor/github.com/docker/docker/client/image_list.go
deleted file mode 100644
index f26464f67c..0000000000
--- a/vendor/github.com/docker/docker/client/image_list.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/versions"
-	"golang.org/x/net/context"
-)
-
-// ImageList returns a list of images in the docker host.
-func (cli *Client) ImageList(ctx context.Context, options types.ImageListOptions) ([]types.ImageSummary, error) {
-	var images []types.ImageSummary
-	query := url.Values{}
-
-	optionFilters := options.Filters
-	referenceFilters := optionFilters.Get("reference")
-	if versions.LessThan(cli.version, "1.25") && len(referenceFilters) > 0 {
-		query.Set("filter", referenceFilters[0])
-		for _, filterValue := range referenceFilters {
-			optionFilters.Del("reference", filterValue)
-		}
-	}
-	if optionFilters.Len() > 0 {
-		filterJSON, err := filters.ToParamWithVersion(cli.version, optionFilters)
-		if err != nil {
-			return images, err
-		}
-		query.Set("filters", filterJSON)
-	}
-	if options.All {
-		query.Set("all", "1")
-	}
-
-	serverResp, err := cli.get(ctx, "/images/json", query, nil)
-	if err != nil {
-		return images, err
-	}
-
-	err = json.NewDecoder(serverResp.body).Decode(&images)
-	ensureReaderClosed(serverResp)
-	return images, err
-}
diff --git a/vendor/github.com/docker/docker/client/image_load.go b/vendor/github.com/docker/docker/client/image_load.go
deleted file mode 100644
index 77aaf1af36..0000000000
--- a/vendor/github.com/docker/docker/client/image_load.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-)
-
-// ImageLoad loads an image in the docker host from the client host.
-// It's up to the caller to close the io.ReadCloser in the
-// ImageLoadResponse returned by this function.
-func (cli *Client) ImageLoad(ctx context.Context, input io.Reader, quiet bool) (types.ImageLoadResponse, error) {
-	v := url.Values{}
-	v.Set("quiet", "0")
-	if quiet {
-		v.Set("quiet", "1")
-	}
-	headers := map[string][]string{"Content-Type": {"application/x-tar"}}
-	resp, err := cli.postRaw(ctx, "/images/load", v, input, headers)
-	if err != nil {
-		return types.ImageLoadResponse{}, err
-	}
-	return types.ImageLoadResponse{
-		Body: resp.body,
-		JSON: resp.header.Get("Content-Type") == "application/json",
-	}, nil
-}
diff --git a/vendor/github.com/docker/docker/client/image_prune.go b/vendor/github.com/docker/docker/client/image_prune.go
deleted file mode 100644
index 5ef98b7f02..0000000000
--- a/vendor/github.com/docker/docker/client/image_prune.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// ImagesPrune requests the daemon to delete unused data
-func (cli *Client) ImagesPrune(ctx context.Context, pruneFilters filters.Args) (types.ImagesPruneReport, error) {
-	var report types.ImagesPruneReport
-
-	if err := cli.NewVersionError("1.25", "image prune"); err != nil {
-		return report, err
-	}
-
-	query, err := getFiltersQuery(pruneFilters)
-	if err != nil {
-		return report, err
-	}
-
-	serverResp, err := cli.post(ctx, "/images/prune", query, nil, nil)
-	if err != nil {
-		return report, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil {
-		return report, fmt.Errorf("Error retrieving disk usage: %v", err)
-	}
-
-	return report, nil
-}
diff --git a/vendor/github.com/docker/docker/client/image_pull.go b/vendor/github.com/docker/docker/client/image_pull.go
deleted file mode 100644
index a72b9bf7fc..0000000000
--- a/vendor/github.com/docker/docker/client/image_pull.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/http"
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-)
-
-// ImagePull requests the docker host to pull an image from a remote registry.
-// It executes the privileged function if the operation is unauthorized
-// and it tries one more time.
-// It's up to the caller to handle the io.ReadCloser and close it properly.
-//
-// FIXME(vdemeester): there is currently used in a few way in docker/docker
-// - if not in trusted content, ref is used to pass the whole reference, and tag is empty
-// - if in trusted content, ref is used to pass the reference name, and tag for the digest
-func (cli *Client) ImagePull(ctx context.Context, refStr string, options types.ImagePullOptions) (io.ReadCloser, error) {
-	ref, err := reference.ParseNormalizedNamed(refStr)
-	if err != nil {
-		return nil, err
-	}
-
-	query := url.Values{}
-	query.Set("fromImage", reference.FamiliarName(ref))
-	if !options.All {
-		query.Set("tag", getAPITagFromNamedRef(ref))
-	}
-
-	resp, err := cli.tryImageCreate(ctx, query, options.RegistryAuth)
-	if resp.statusCode == http.StatusUnauthorized && options.PrivilegeFunc != nil {
-		newAuthHeader, privilegeErr := options.PrivilegeFunc()
-		if privilegeErr != nil {
-			return nil, privilegeErr
-		}
-		resp, err = cli.tryImageCreate(ctx, query, newAuthHeader)
-	}
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
-
-// getAPITagFromNamedRef returns a tag from the specified reference.
-// This function is necessary as long as the docker "server" api expects
-// digests to be sent as tags and makes a distinction between the name
-// and tag/digest part of a reference.
-func getAPITagFromNamedRef(ref reference.Named) string {
-	if digested, ok := ref.(reference.Digested); ok {
-		return digested.Digest().String()
-	}
-	ref = reference.TagNameOnly(ref)
-	if tagged, ok := ref.(reference.Tagged); ok {
-		return tagged.Tag()
-	}
-	return ""
-}
diff --git a/vendor/github.com/docker/docker/client/image_push.go b/vendor/github.com/docker/docker/client/image_push.go
deleted file mode 100644
index 410d2fb91d..0000000000
--- a/vendor/github.com/docker/docker/client/image_push.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package client
-
-import (
-	"errors"
-	"io"
-	"net/http"
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-)
-
-// ImagePush requests the docker host to push an image to a remote registry.
-// It executes the privileged function if the operation is unauthorized
-// and it tries one more time.
-// It's up to the caller to handle the io.ReadCloser and close it properly.
-func (cli *Client) ImagePush(ctx context.Context, image string, options types.ImagePushOptions) (io.ReadCloser, error) {
-	ref, err := reference.ParseNormalizedNamed(image)
-	if err != nil {
-		return nil, err
-	}
-
-	if _, isCanonical := ref.(reference.Canonical); isCanonical {
-		return nil, errors.New("cannot push a digest reference")
-	}
-
-	tag := ""
-	name := reference.FamiliarName(ref)
-
-	if nameTaggedRef, isNamedTagged := ref.(reference.NamedTagged); isNamedTagged {
-		tag = nameTaggedRef.Tag()
-	}
-
-	query := url.Values{}
-	query.Set("tag", tag)
-
-	resp, err := cli.tryImagePush(ctx, name, query, options.RegistryAuth)
-	if resp.statusCode == http.StatusUnauthorized && options.PrivilegeFunc != nil {
-		newAuthHeader, privilegeErr := options.PrivilegeFunc()
-		if privilegeErr != nil {
-			return nil, privilegeErr
-		}
-		resp, err = cli.tryImagePush(ctx, name, query, newAuthHeader)
-	}
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
-
-func (cli *Client) tryImagePush(ctx context.Context, imageID string, query url.Values, registryAuth string) (serverResponse, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	return cli.post(ctx, "/images/"+imageID+"/push", query, nil, headers)
-}
diff --git a/vendor/github.com/docker/docker/client/image_remove.go b/vendor/github.com/docker/docker/client/image_remove.go
deleted file mode 100644
index 6921209ee1..0000000000
--- a/vendor/github.com/docker/docker/client/image_remove.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ImageRemove removes an image from the docker host.
-func (cli *Client) ImageRemove(ctx context.Context, imageID string, options types.ImageRemoveOptions) ([]types.ImageDeleteResponseItem, error) {
-	query := url.Values{}
-
-	if options.Force {
-		query.Set("force", "1")
-	}
-	if !options.PruneChildren {
-		query.Set("noprune", "1")
-	}
-
-	resp, err := cli.delete(ctx, "/images/"+imageID, query, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var dels []types.ImageDeleteResponseItem
-	err = json.NewDecoder(resp.body).Decode(&dels)
-	ensureReaderClosed(resp)
-	return dels, err
-}
diff --git a/vendor/github.com/docker/docker/client/image_save.go b/vendor/github.com/docker/docker/client/image_save.go
deleted file mode 100644
index ecac880a32..0000000000
--- a/vendor/github.com/docker/docker/client/image_save.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-
-	"golang.org/x/net/context"
-)
-
-// ImageSave retrieves one or more images from the docker host as an io.ReadCloser.
-// It's up to the caller to store the images and close the stream.
-func (cli *Client) ImageSave(ctx context.Context, imageIDs []string) (io.ReadCloser, error) {
-	query := url.Values{
-		"names": imageIDs,
-	}
-
-	resp, err := cli.get(ctx, "/images/get", query, nil)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
diff --git a/vendor/github.com/docker/docker/client/image_search.go b/vendor/github.com/docker/docker/client/image_search.go
deleted file mode 100644
index b0fcd5c23d..0000000000
--- a/vendor/github.com/docker/docker/client/image_search.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/registry"
-	"golang.org/x/net/context"
-)
-
-// ImageSearch makes the docker host to search by a term in a remote registry.
-// The list of results is not sorted in any fashion.
-func (cli *Client) ImageSearch(ctx context.Context, term string, options types.ImageSearchOptions) ([]registry.SearchResult, error) {
-	var results []registry.SearchResult
-	query := url.Values{}
-	query.Set("term", term)
-	query.Set("limit", fmt.Sprintf("%d", options.Limit))
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
-		if err != nil {
-			return results, err
-		}
-		query.Set("filters", filterJSON)
-	}
-
-	resp, err := cli.tryImageSearch(ctx, query, options.RegistryAuth)
-	if resp.statusCode == http.StatusUnauthorized && options.PrivilegeFunc != nil {
-		newAuthHeader, privilegeErr := options.PrivilegeFunc()
-		if privilegeErr != nil {
-			return results, privilegeErr
-		}
-		resp, err = cli.tryImageSearch(ctx, query, newAuthHeader)
-	}
-	if err != nil {
-		return results, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&results)
-	ensureReaderClosed(resp)
-	return results, err
-}
-
-func (cli *Client) tryImageSearch(ctx context.Context, query url.Values, registryAuth string) (serverResponse, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	return cli.get(ctx, "/images/search", query, headers)
-}
diff --git a/vendor/github.com/docker/docker/client/image_tag.go b/vendor/github.com/docker/docker/client/image_tag.go
deleted file mode 100644
index 8924f71eb3..0000000000
--- a/vendor/github.com/docker/docker/client/image_tag.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/distribution/reference"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-)
-
-// ImageTag tags an image in the docker host
-func (cli *Client) ImageTag(ctx context.Context, source, target string) error {
-	if _, err := reference.ParseAnyReference(source); err != nil {
-		return errors.Wrapf(err, "Error parsing reference: %q is not a valid repository/tag", source)
-	}
-
-	ref, err := reference.ParseNormalizedNamed(target)
-	if err != nil {
-		return errors.Wrapf(err, "Error parsing reference: %q is not a valid repository/tag", target)
-	}
-
-	if _, isCanonical := ref.(reference.Canonical); isCanonical {
-		return errors.New("refusing to create a tag with a digest reference")
-	}
-
-	ref = reference.TagNameOnly(ref)
-
-	query := url.Values{}
-	query.Set("repo", reference.FamiliarName(ref))
-	if tagged, ok := ref.(reference.Tagged); ok {
-		query.Set("tag", tagged.Tag())
-	}
-
-	resp, err := cli.post(ctx, "/images/"+source+"/tag", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/info.go b/vendor/github.com/docker/docker/client/info.go
deleted file mode 100644
index ac07961224..0000000000
--- a/vendor/github.com/docker/docker/client/info.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// Info returns information about the docker server.
-func (cli *Client) Info(ctx context.Context) (types.Info, error) {
-	var info types.Info
-	serverResp, err := cli.get(ctx, "/info", url.Values{}, nil)
-	if err != nil {
-		return info, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	if err := json.NewDecoder(serverResp.body).Decode(&info); err != nil {
-		return info, fmt.Errorf("Error reading remote info: %v", err)
-	}
-
-	return info, nil
-}
diff --git a/vendor/github.com/docker/docker/client/interface.go b/vendor/github.com/docker/docker/client/interface.go
deleted file mode 100644
index 8dbe4300dc..0000000000
--- a/vendor/github.com/docker/docker/client/interface.go
+++ /dev/null
@@ -1,173 +0,0 @@
-package client
-
-import (
-	"io"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/image"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/api/types/swarm"
-	volumetypes "github.com/docker/docker/api/types/volume"
-	"golang.org/x/net/context"
-)
-
-// CommonAPIClient is the common methods between stable and experimental versions of APIClient.
-type CommonAPIClient interface {
-	ContainerAPIClient
-	ImageAPIClient
-	NodeAPIClient
-	NetworkAPIClient
-	PluginAPIClient
-	ServiceAPIClient
-	SwarmAPIClient
-	SecretAPIClient
-	SystemAPIClient
-	VolumeAPIClient
-	ClientVersion() string
-	ServerVersion(ctx context.Context) (types.Version, error)
-	UpdateClientVersion(v string)
-}
-
-// ContainerAPIClient defines API client methods for the containers
-type ContainerAPIClient interface {
-	ContainerAttach(ctx context.Context, container string, options types.ContainerAttachOptions) (types.HijackedResponse, error)
-	ContainerCommit(ctx context.Context, container string, options types.ContainerCommitOptions) (types.IDResponse, error)
-	ContainerCreate(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (container.ContainerCreateCreatedBody, error)
-	ContainerDiff(ctx context.Context, container string) ([]container.ContainerChangeResponseItem, error)
-	ContainerExecAttach(ctx context.Context, execID string, config types.ExecConfig) (types.HijackedResponse, error)
-	ContainerExecCreate(ctx context.Context, container string, config types.ExecConfig) (types.IDResponse, error)
-	ContainerExecInspect(ctx context.Context, execID string) (types.ContainerExecInspect, error)
-	ContainerExecResize(ctx context.Context, execID string, options types.ResizeOptions) error
-	ContainerExecStart(ctx context.Context, execID string, config types.ExecStartCheck) error
-	ContainerExport(ctx context.Context, container string) (io.ReadCloser, error)
-	ContainerInspect(ctx context.Context, container string) (types.ContainerJSON, error)
-	ContainerInspectWithRaw(ctx context.Context, container string, getSize bool) (types.ContainerJSON, []byte, error)
-	ContainerKill(ctx context.Context, container, signal string) error
-	ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error)
-	ContainerLogs(ctx context.Context, container string, options types.ContainerLogsOptions) (io.ReadCloser, error)
-	ContainerPause(ctx context.Context, container string) error
-	ContainerRemove(ctx context.Context, container string, options types.ContainerRemoveOptions) error
-	ContainerRename(ctx context.Context, container, newContainerName string) error
-	ContainerResize(ctx context.Context, container string, options types.ResizeOptions) error
-	ContainerRestart(ctx context.Context, container string, timeout *time.Duration) error
-	ContainerStatPath(ctx context.Context, container, path string) (types.ContainerPathStat, error)
-	ContainerStats(ctx context.Context, container string, stream bool) (types.ContainerStats, error)
-	ContainerStart(ctx context.Context, container string, options types.ContainerStartOptions) error
-	ContainerStop(ctx context.Context, container string, timeout *time.Duration) error
-	ContainerTop(ctx context.Context, container string, arguments []string) (container.ContainerTopOKBody, error)
-	ContainerUnpause(ctx context.Context, container string) error
-	ContainerUpdate(ctx context.Context, container string, updateConfig container.UpdateConfig) (container.ContainerUpdateOKBody, error)
-	ContainerWait(ctx context.Context, container string) (int64, error)
-	CopyFromContainer(ctx context.Context, container, srcPath string) (io.ReadCloser, types.ContainerPathStat, error)
-	CopyToContainer(ctx context.Context, container, path string, content io.Reader, options types.CopyToContainerOptions) error
-	ContainersPrune(ctx context.Context, pruneFilters filters.Args) (types.ContainersPruneReport, error)
-}
-
-// ImageAPIClient defines API client methods for the images
-type ImageAPIClient interface {
-	ImageBuild(ctx context.Context, context io.Reader, options types.ImageBuildOptions) (types.ImageBuildResponse, error)
-	ImageCreate(ctx context.Context, parentReference string, options types.ImageCreateOptions) (io.ReadCloser, error)
-	ImageHistory(ctx context.Context, image string) ([]image.HistoryResponseItem, error)
-	ImageImport(ctx context.Context, source types.ImageImportSource, ref string, options types.ImageImportOptions) (io.ReadCloser, error)
-	ImageInspectWithRaw(ctx context.Context, image string) (types.ImageInspect, []byte, error)
-	ImageList(ctx context.Context, options types.ImageListOptions) ([]types.ImageSummary, error)
-	ImageLoad(ctx context.Context, input io.Reader, quiet bool) (types.ImageLoadResponse, error)
-	ImagePull(ctx context.Context, ref string, options types.ImagePullOptions) (io.ReadCloser, error)
-	ImagePush(ctx context.Context, ref string, options types.ImagePushOptions) (io.ReadCloser, error)
-	ImageRemove(ctx context.Context, image string, options types.ImageRemoveOptions) ([]types.ImageDeleteResponseItem, error)
-	ImageSearch(ctx context.Context, term string, options types.ImageSearchOptions) ([]registry.SearchResult, error)
-	ImageSave(ctx context.Context, images []string) (io.ReadCloser, error)
-	ImageTag(ctx context.Context, image, ref string) error
-	ImagesPrune(ctx context.Context, pruneFilter filters.Args) (types.ImagesPruneReport, error)
-}
-
-// NetworkAPIClient defines API client methods for the networks
-type NetworkAPIClient interface {
-	NetworkConnect(ctx context.Context, networkID, container string, config *network.EndpointSettings) error
-	NetworkCreate(ctx context.Context, name string, options types.NetworkCreate) (types.NetworkCreateResponse, error)
-	NetworkDisconnect(ctx context.Context, networkID, container string, force bool) error
-	NetworkInspect(ctx context.Context, networkID string, verbose bool) (types.NetworkResource, error)
-	NetworkInspectWithRaw(ctx context.Context, networkID string, verbose bool) (types.NetworkResource, []byte, error)
-	NetworkList(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error)
-	NetworkRemove(ctx context.Context, networkID string) error
-	NetworksPrune(ctx context.Context, pruneFilter filters.Args) (types.NetworksPruneReport, error)
-}
-
-// NodeAPIClient defines API client methods for the nodes
-type NodeAPIClient interface {
-	NodeInspectWithRaw(ctx context.Context, nodeID string) (swarm.Node, []byte, error)
-	NodeList(ctx context.Context, options types.NodeListOptions) ([]swarm.Node, error)
-	NodeRemove(ctx context.Context, nodeID string, options types.NodeRemoveOptions) error
-	NodeUpdate(ctx context.Context, nodeID string, version swarm.Version, node swarm.NodeSpec) error
-}
-
-// PluginAPIClient defines API client methods for the plugins
-type PluginAPIClient interface {
-	PluginList(ctx context.Context, filter filters.Args) (types.PluginsListResponse, error)
-	PluginRemove(ctx context.Context, name string, options types.PluginRemoveOptions) error
-	PluginEnable(ctx context.Context, name string, options types.PluginEnableOptions) error
-	PluginDisable(ctx context.Context, name string, options types.PluginDisableOptions) error
-	PluginInstall(ctx context.Context, name string, options types.PluginInstallOptions) (io.ReadCloser, error)
-	PluginUpgrade(ctx context.Context, name string, options types.PluginInstallOptions) (io.ReadCloser, error)
-	PluginPush(ctx context.Context, name string, registryAuth string) (io.ReadCloser, error)
-	PluginSet(ctx context.Context, name string, args []string) error
-	PluginInspectWithRaw(ctx context.Context, name string) (*types.Plugin, []byte, error)
-	PluginCreate(ctx context.Context, createContext io.Reader, options types.PluginCreateOptions) error
-}
-
-// ServiceAPIClient defines API client methods for the services
-type ServiceAPIClient interface {
-	ServiceCreate(ctx context.Context, service swarm.ServiceSpec, options types.ServiceCreateOptions) (types.ServiceCreateResponse, error)
-	ServiceInspectWithRaw(ctx context.Context, serviceID string, options types.ServiceInspectOptions) (swarm.Service, []byte, error)
-	ServiceList(ctx context.Context, options types.ServiceListOptions) ([]swarm.Service, error)
-	ServiceRemove(ctx context.Context, serviceID string) error
-	ServiceUpdate(ctx context.Context, serviceID string, version swarm.Version, service swarm.ServiceSpec, options types.ServiceUpdateOptions) (types.ServiceUpdateResponse, error)
-	ServiceLogs(ctx context.Context, serviceID string, options types.ContainerLogsOptions) (io.ReadCloser, error)
-	TaskLogs(ctx context.Context, taskID string, options types.ContainerLogsOptions) (io.ReadCloser, error)
-	TaskInspectWithRaw(ctx context.Context, taskID string) (swarm.Task, []byte, error)
-	TaskList(ctx context.Context, options types.TaskListOptions) ([]swarm.Task, error)
-}
-
-// SwarmAPIClient defines API client methods for the swarm
-type SwarmAPIClient interface {
-	SwarmInit(ctx context.Context, req swarm.InitRequest) (string, error)
-	SwarmJoin(ctx context.Context, req swarm.JoinRequest) error
-	SwarmGetUnlockKey(ctx context.Context) (types.SwarmUnlockKeyResponse, error)
-	SwarmUnlock(ctx context.Context, req swarm.UnlockRequest) error
-	SwarmLeave(ctx context.Context, force bool) error
-	SwarmInspect(ctx context.Context) (swarm.Swarm, error)
-	SwarmUpdate(ctx context.Context, version swarm.Version, swarm swarm.Spec, flags swarm.UpdateFlags) error
-}
-
-// SystemAPIClient defines API client methods for the system
-type SystemAPIClient interface {
-	Events(ctx context.Context, options types.EventsOptions) (<-chan events.Message, <-chan error)
-	Info(ctx context.Context) (types.Info, error)
-	RegistryLogin(ctx context.Context, auth types.AuthConfig) (registry.AuthenticateOKBody, error)
-	DiskUsage(ctx context.Context) (types.DiskUsage, error)
-	Ping(ctx context.Context) (types.Ping, error)
-}
-
-// VolumeAPIClient defines API client methods for the volumes
-type VolumeAPIClient interface {
-	VolumeCreate(ctx context.Context, options volumetypes.VolumesCreateBody) (types.Volume, error)
-	VolumeInspect(ctx context.Context, volumeID string) (types.Volume, error)
-	VolumeInspectWithRaw(ctx context.Context, volumeID string) (types.Volume, []byte, error)
-	VolumeList(ctx context.Context, filter filters.Args) (volumetypes.VolumesListOKBody, error)
-	VolumeRemove(ctx context.Context, volumeID string, force bool) error
-	VolumesPrune(ctx context.Context, pruneFilter filters.Args) (types.VolumesPruneReport, error)
-}
-
-// SecretAPIClient defines API client methods for secrets
-type SecretAPIClient interface {
-	SecretList(ctx context.Context, options types.SecretListOptions) ([]swarm.Secret, error)
-	SecretCreate(ctx context.Context, secret swarm.SecretSpec) (types.SecretCreateResponse, error)
-	SecretRemove(ctx context.Context, id string) error
-	SecretInspectWithRaw(ctx context.Context, name string) (swarm.Secret, []byte, error)
-	SecretUpdate(ctx context.Context, id string, version swarm.Version, secret swarm.SecretSpec) error
-}
diff --git a/vendor/github.com/docker/docker/client/interface_experimental.go b/vendor/github.com/docker/docker/client/interface_experimental.go
deleted file mode 100644
index 51da98ecdd..0000000000
--- a/vendor/github.com/docker/docker/client/interface_experimental.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-type apiClientExperimental interface {
-	CheckpointAPIClient
-}
-
-// CheckpointAPIClient defines API client methods for the checkpoints
-type CheckpointAPIClient interface {
-	CheckpointCreate(ctx context.Context, container string, options types.CheckpointCreateOptions) error
-	CheckpointDelete(ctx context.Context, container string, options types.CheckpointDeleteOptions) error
-	CheckpointList(ctx context.Context, container string, options types.CheckpointListOptions) ([]types.Checkpoint, error)
-}
diff --git a/vendor/github.com/docker/docker/client/interface_stable.go b/vendor/github.com/docker/docker/client/interface_stable.go
deleted file mode 100644
index cc90a3cbb9..0000000000
--- a/vendor/github.com/docker/docker/client/interface_stable.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package client
-
-// APIClient is an interface that clients that talk with a docker server must implement.
-type APIClient interface {
-	CommonAPIClient
-	apiClientExperimental
-}
-
-// Ensure that Client always implements APIClient.
-var _ APIClient = &Client{}
diff --git a/vendor/github.com/docker/docker/client/login.go b/vendor/github.com/docker/docker/client/login.go
deleted file mode 100644
index 79219ff59c..0000000000
--- a/vendor/github.com/docker/docker/client/login.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/registry"
-	"golang.org/x/net/context"
-)
-
-// RegistryLogin authenticates the docker server with a given docker registry.
-// It returns unauthorizedError when the authentication fails.
-func (cli *Client) RegistryLogin(ctx context.Context, auth types.AuthConfig) (registry.AuthenticateOKBody, error) {
-	resp, err := cli.post(ctx, "/auth", url.Values{}, auth, nil)
-
-	if resp.statusCode == http.StatusUnauthorized {
-		return registry.AuthenticateOKBody{}, unauthorizedError{err}
-	}
-	if err != nil {
-		return registry.AuthenticateOKBody{}, err
-	}
-
-	var response registry.AuthenticateOKBody
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/network_connect.go b/vendor/github.com/docker/docker/client/network_connect.go
deleted file mode 100644
index c022c17b5b..0000000000
--- a/vendor/github.com/docker/docker/client/network_connect.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/network"
-	"golang.org/x/net/context"
-)
-
-// NetworkConnect connects a container to an existent network in the docker host.
-func (cli *Client) NetworkConnect(ctx context.Context, networkID, containerID string, config *network.EndpointSettings) error {
-	nc := types.NetworkConnect{
-		Container:      containerID,
-		EndpointConfig: config,
-	}
-	resp, err := cli.post(ctx, "/networks/"+networkID+"/connect", nil, nc, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/network_create.go b/vendor/github.com/docker/docker/client/network_create.go
deleted file mode 100644
index 4067a541ff..0000000000
--- a/vendor/github.com/docker/docker/client/network_create.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// NetworkCreate creates a new network in the docker host.
-func (cli *Client) NetworkCreate(ctx context.Context, name string, options types.NetworkCreate) (types.NetworkCreateResponse, error) {
-	networkCreateRequest := types.NetworkCreateRequest{
-		NetworkCreate: options,
-		Name:          name,
-	}
-	var response types.NetworkCreateResponse
-	serverResp, err := cli.post(ctx, "/networks/create", nil, networkCreateRequest, nil)
-	if err != nil {
-		return response, err
-	}
-
-	json.NewDecoder(serverResp.body).Decode(&response)
-	ensureReaderClosed(serverResp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/network_disconnect.go b/vendor/github.com/docker/docker/client/network_disconnect.go
deleted file mode 100644
index 24b58e3c12..0000000000
--- a/vendor/github.com/docker/docker/client/network_disconnect.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// NetworkDisconnect disconnects a container from an existent network in the docker host.
-func (cli *Client) NetworkDisconnect(ctx context.Context, networkID, containerID string, force bool) error {
-	nd := types.NetworkDisconnect{Container: containerID, Force: force}
-	resp, err := cli.post(ctx, "/networks/"+networkID+"/disconnect", nil, nd, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/network_inspect.go b/vendor/github.com/docker/docker/client/network_inspect.go
deleted file mode 100644
index 7242304025..0000000000
--- a/vendor/github.com/docker/docker/client/network_inspect.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// NetworkInspect returns the information for a specific network configured in the docker host.
-func (cli *Client) NetworkInspect(ctx context.Context, networkID string, verbose bool) (types.NetworkResource, error) {
-	networkResource, _, err := cli.NetworkInspectWithRaw(ctx, networkID, verbose)
-	return networkResource, err
-}
-
-// NetworkInspectWithRaw returns the information for a specific network configured in the docker host and its raw representation.
-func (cli *Client) NetworkInspectWithRaw(ctx context.Context, networkID string, verbose bool) (types.NetworkResource, []byte, error) {
-	var (
-		networkResource types.NetworkResource
-		resp            serverResponse
-		err             error
-	)
-	query := url.Values{}
-	if verbose {
-		query.Set("verbose", "true")
-	}
-	resp, err = cli.get(ctx, "/networks/"+networkID, query, nil)
-	if err != nil {
-		if resp.statusCode == http.StatusNotFound {
-			return networkResource, nil, networkNotFoundError{networkID}
-		}
-		return networkResource, nil, err
-	}
-	defer ensureReaderClosed(resp)
-
-	body, err := ioutil.ReadAll(resp.body)
-	if err != nil {
-		return networkResource, nil, err
-	}
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&networkResource)
-	return networkResource, body, err
-}
diff --git a/vendor/github.com/docker/docker/client/network_list.go b/vendor/github.com/docker/docker/client/network_list.go
deleted file mode 100644
index e566a93e23..0000000000
--- a/vendor/github.com/docker/docker/client/network_list.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// NetworkList returns the list of networks configured in the docker host.
-func (cli *Client) NetworkList(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error) {
-	query := url.Values{}
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParamWithVersion(cli.version, options.Filters)
-		if err != nil {
-			return nil, err
-		}
-
-		query.Set("filters", filterJSON)
-	}
-	var networkResources []types.NetworkResource
-	resp, err := cli.get(ctx, "/networks", query, nil)
-	if err != nil {
-		return networkResources, err
-	}
-	err = json.NewDecoder(resp.body).Decode(&networkResources)
-	ensureReaderClosed(resp)
-	return networkResources, err
-}
diff --git a/vendor/github.com/docker/docker/client/network_prune.go b/vendor/github.com/docker/docker/client/network_prune.go
deleted file mode 100644
index 7352a7f0c5..0000000000
--- a/vendor/github.com/docker/docker/client/network_prune.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// NetworksPrune requests the daemon to delete unused networks
-func (cli *Client) NetworksPrune(ctx context.Context, pruneFilters filters.Args) (types.NetworksPruneReport, error) {
-	var report types.NetworksPruneReport
-
-	if err := cli.NewVersionError("1.25", "network prune"); err != nil {
-		return report, err
-	}
-
-	query, err := getFiltersQuery(pruneFilters)
-	if err != nil {
-		return report, err
-	}
-
-	serverResp, err := cli.post(ctx, "/networks/prune", query, nil, nil)
-	if err != nil {
-		return report, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil {
-		return report, fmt.Errorf("Error retrieving network prune report: %v", err)
-	}
-
-	return report, nil
-}
diff --git a/vendor/github.com/docker/docker/client/network_remove.go b/vendor/github.com/docker/docker/client/network_remove.go
deleted file mode 100644
index 6bd6748924..0000000000
--- a/vendor/github.com/docker/docker/client/network_remove.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package client
-
-import "golang.org/x/net/context"
-
-// NetworkRemove removes an existent network from the docker host.
-func (cli *Client) NetworkRemove(ctx context.Context, networkID string) error {
-	resp, err := cli.delete(ctx, "/networks/"+networkID, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/node_inspect.go b/vendor/github.com/docker/docker/client/node_inspect.go
deleted file mode 100644
index abf505d29c..0000000000
--- a/vendor/github.com/docker/docker/client/node_inspect.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// NodeInspectWithRaw returns the node information.
-func (cli *Client) NodeInspectWithRaw(ctx context.Context, nodeID string) (swarm.Node, []byte, error) {
-	serverResp, err := cli.get(ctx, "/nodes/"+nodeID, nil, nil)
-	if err != nil {
-		if serverResp.statusCode == http.StatusNotFound {
-			return swarm.Node{}, nil, nodeNotFoundError{nodeID}
-		}
-		return swarm.Node{}, nil, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	body, err := ioutil.ReadAll(serverResp.body)
-	if err != nil {
-		return swarm.Node{}, nil, err
-	}
-
-	var response swarm.Node
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&response)
-	return response, body, err
-}
diff --git a/vendor/github.com/docker/docker/client/node_list.go b/vendor/github.com/docker/docker/client/node_list.go
deleted file mode 100644
index 3e8440f08e..0000000000
--- a/vendor/github.com/docker/docker/client/node_list.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// NodeList returns the list of nodes.
-func (cli *Client) NodeList(ctx context.Context, options types.NodeListOptions) ([]swarm.Node, error) {
-	query := url.Values{}
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
-
-		if err != nil {
-			return nil, err
-		}
-
-		query.Set("filters", filterJSON)
-	}
-
-	resp, err := cli.get(ctx, "/nodes", query, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var nodes []swarm.Node
-	err = json.NewDecoder(resp.body).Decode(&nodes)
-	ensureReaderClosed(resp)
-	return nodes, err
-}
diff --git a/vendor/github.com/docker/docker/client/node_remove.go b/vendor/github.com/docker/docker/client/node_remove.go
deleted file mode 100644
index 0a77f3d578..0000000000
--- a/vendor/github.com/docker/docker/client/node_remove.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-
-	"golang.org/x/net/context"
-)
-
-// NodeRemove removes a Node.
-func (cli *Client) NodeRemove(ctx context.Context, nodeID string, options types.NodeRemoveOptions) error {
-	query := url.Values{}
-	if options.Force {
-		query.Set("force", "1")
-	}
-
-	resp, err := cli.delete(ctx, "/nodes/"+nodeID, query, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/node_update.go b/vendor/github.com/docker/docker/client/node_update.go
deleted file mode 100644
index 3ca9760282..0000000000
--- a/vendor/github.com/docker/docker/client/node_update.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package client
-
-import (
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// NodeUpdate updates a Node.
-func (cli *Client) NodeUpdate(ctx context.Context, nodeID string, version swarm.Version, node swarm.NodeSpec) error {
-	query := url.Values{}
-	query.Set("version", strconv.FormatUint(version.Index, 10))
-	resp, err := cli.post(ctx, "/nodes/"+nodeID+"/update", query, node, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/ping.go b/vendor/github.com/docker/docker/client/ping.go
deleted file mode 100644
index d6212ef8bb..0000000000
--- a/vendor/github.com/docker/docker/client/ping.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package client
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// Ping pings the server and returns the value of the "Docker-Experimental", "OS-Type" & "API-Version" headers
-func (cli *Client) Ping(ctx context.Context) (types.Ping, error) {
-	var ping types.Ping
-	req, err := cli.buildRequest("GET", fmt.Sprintf("%s/_ping", cli.basePath), nil, nil)
-	if err != nil {
-		return ping, err
-	}
-	serverResp, err := cli.doRequest(ctx, req)
-	if err != nil {
-		return ping, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	ping.APIVersion = serverResp.header.Get("API-Version")
-
-	if serverResp.header.Get("Docker-Experimental") == "true" {
-		ping.Experimental = true
-	}
-
-	ping.OSType = serverResp.header.Get("OSType")
-
-	return ping, nil
-}
diff --git a/vendor/github.com/docker/docker/client/plugin_create.go b/vendor/github.com/docker/docker/client/plugin_create.go
deleted file mode 100644
index 27954aa573..0000000000
--- a/vendor/github.com/docker/docker/client/plugin_create.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// PluginCreate creates a plugin
-func (cli *Client) PluginCreate(ctx context.Context, createContext io.Reader, createOptions types.PluginCreateOptions) error {
-	headers := http.Header(make(map[string][]string))
-	headers.Set("Content-Type", "application/x-tar")
-
-	query := url.Values{}
-	query.Set("name", createOptions.RepoName)
-
-	resp, err := cli.postRaw(ctx, "/plugins/create", query, createContext, headers)
-	if err != nil {
-		return err
-	}
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/plugin_disable.go b/vendor/github.com/docker/docker/client/plugin_disable.go
deleted file mode 100644
index 30467db742..0000000000
--- a/vendor/github.com/docker/docker/client/plugin_disable.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// PluginDisable disables a plugin
-func (cli *Client) PluginDisable(ctx context.Context, name string, options types.PluginDisableOptions) error {
-	query := url.Values{}
-	if options.Force {
-		query.Set("force", "1")
-	}
-	resp, err := cli.post(ctx, "/plugins/"+name+"/disable", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/plugin_enable.go b/vendor/github.com/docker/docker/client/plugin_enable.go
deleted file mode 100644
index 95517c4b80..0000000000
--- a/vendor/github.com/docker/docker/client/plugin_enable.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package client
-
-import (
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// PluginEnable enables a plugin
-func (cli *Client) PluginEnable(ctx context.Context, name string, options types.PluginEnableOptions) error {
-	query := url.Values{}
-	query.Set("timeout", strconv.Itoa(options.Timeout))
-
-	resp, err := cli.post(ctx, "/plugins/"+name+"/enable", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/plugin_inspect.go b/vendor/github.com/docker/docker/client/plugin_inspect.go
deleted file mode 100644
index 89f39ee2c6..0000000000
--- a/vendor/github.com/docker/docker/client/plugin_inspect.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// PluginInspectWithRaw inspects an existing plugin
-func (cli *Client) PluginInspectWithRaw(ctx context.Context, name string) (*types.Plugin, []byte, error) {
-	resp, err := cli.get(ctx, "/plugins/"+name+"/json", nil, nil)
-	if err != nil {
-		if resp.statusCode == http.StatusNotFound {
-			return nil, nil, pluginNotFoundError{name}
-		}
-		return nil, nil, err
-	}
-
-	defer ensureReaderClosed(resp)
-	body, err := ioutil.ReadAll(resp.body)
-	if err != nil {
-		return nil, nil, err
-	}
-	var p types.Plugin
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&p)
-	return &p, body, err
-}
diff --git a/vendor/github.com/docker/docker/client/plugin_install.go b/vendor/github.com/docker/docker/client/plugin_install.go
deleted file mode 100644
index ce3e0506e5..0000000000
--- a/vendor/github.com/docker/docker/client/plugin_install.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-)
-
-// PluginInstall installs a plugin
-func (cli *Client) PluginInstall(ctx context.Context, name string, options types.PluginInstallOptions) (rc io.ReadCloser, err error) {
-	query := url.Values{}
-	if _, err := reference.ParseNormalizedNamed(options.RemoteRef); err != nil {
-		return nil, errors.Wrap(err, "invalid remote reference")
-	}
-	query.Set("remote", options.RemoteRef)
-
-	privileges, err := cli.checkPluginPermissions(ctx, query, options)
-	if err != nil {
-		return nil, err
-	}
-
-	// set name for plugin pull, if empty should default to remote reference
-	query.Set("name", name)
-
-	resp, err := cli.tryPluginPull(ctx, query, privileges, options.RegistryAuth)
-	if err != nil {
-		return nil, err
-	}
-
-	name = resp.header.Get("Docker-Plugin-Name")
-
-	pr, pw := io.Pipe()
-	go func() { // todo: the client should probably be designed more around the actual api
-		_, err := io.Copy(pw, resp.body)
-		if err != nil {
-			pw.CloseWithError(err)
-			return
-		}
-		defer func() {
-			if err != nil {
-				delResp, _ := cli.delete(ctx, "/plugins/"+name, nil, nil)
-				ensureReaderClosed(delResp)
-			}
-		}()
-		if len(options.Args) > 0 {
-			if err := cli.PluginSet(ctx, name, options.Args); err != nil {
-				pw.CloseWithError(err)
-				return
-			}
-		}
-
-		if options.Disabled {
-			pw.Close()
-			return
-		}
-
-		enableErr := cli.PluginEnable(ctx, name, types.PluginEnableOptions{Timeout: 0})
-		pw.CloseWithError(enableErr)
-	}()
-	return pr, nil
-}
-
-func (cli *Client) tryPluginPrivileges(ctx context.Context, query url.Values, registryAuth string) (serverResponse, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	return cli.get(ctx, "/plugins/privileges", query, headers)
-}
-
-func (cli *Client) tryPluginPull(ctx context.Context, query url.Values, privileges types.PluginPrivileges, registryAuth string) (serverResponse, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	return cli.post(ctx, "/plugins/pull", query, privileges, headers)
-}
-
-func (cli *Client) checkPluginPermissions(ctx context.Context, query url.Values, options types.PluginInstallOptions) (types.PluginPrivileges, error) {
-	resp, err := cli.tryPluginPrivileges(ctx, query, options.RegistryAuth)
-	if resp.statusCode == http.StatusUnauthorized && options.PrivilegeFunc != nil {
-		// todo: do inspect before to check existing name before checking privileges
-		newAuthHeader, privilegeErr := options.PrivilegeFunc()
-		if privilegeErr != nil {
-			ensureReaderClosed(resp)
-			return nil, privilegeErr
-		}
-		options.RegistryAuth = newAuthHeader
-		resp, err = cli.tryPluginPrivileges(ctx, query, options.RegistryAuth)
-	}
-	if err != nil {
-		ensureReaderClosed(resp)
-		return nil, err
-	}
-
-	var privileges types.PluginPrivileges
-	if err := json.NewDecoder(resp.body).Decode(&privileges); err != nil {
-		ensureReaderClosed(resp)
-		return nil, err
-	}
-	ensureReaderClosed(resp)
-
-	if !options.AcceptAllPermissions && options.AcceptPermissionsFunc != nil && len(privileges) > 0 {
-		accept, err := options.AcceptPermissionsFunc(privileges)
-		if err != nil {
-			return nil, err
-		}
-		if !accept {
-			return nil, pluginPermissionDenied{options.RemoteRef}
-		}
-	}
-	return privileges, nil
-}
diff --git a/vendor/github.com/docker/docker/client/plugin_list.go b/vendor/github.com/docker/docker/client/plugin_list.go
deleted file mode 100644
index 3acde3b966..0000000000
--- a/vendor/github.com/docker/docker/client/plugin_list.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// PluginList returns the installed plugins
-func (cli *Client) PluginList(ctx context.Context, filter filters.Args) (types.PluginsListResponse, error) {
-	var plugins types.PluginsListResponse
-	query := url.Values{}
-
-	if filter.Len() > 0 {
-		filterJSON, err := filters.ToParamWithVersion(cli.version, filter)
-		if err != nil {
-			return plugins, err
-		}
-		query.Set("filters", filterJSON)
-	}
-	resp, err := cli.get(ctx, "/plugins", query, nil)
-	if err != nil {
-		return plugins, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&plugins)
-	ensureReaderClosed(resp)
-	return plugins, err
-}
diff --git a/vendor/github.com/docker/docker/client/plugin_push.go b/vendor/github.com/docker/docker/client/plugin_push.go
deleted file mode 100644
index 1e5f963251..0000000000
--- a/vendor/github.com/docker/docker/client/plugin_push.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package client
-
-import (
-	"io"
-
-	"golang.org/x/net/context"
-)
-
-// PluginPush pushes a plugin to a registry
-func (cli *Client) PluginPush(ctx context.Context, name string, registryAuth string) (io.ReadCloser, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	resp, err := cli.post(ctx, "/plugins/"+name+"/push", nil, nil, headers)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
diff --git a/vendor/github.com/docker/docker/client/plugin_remove.go b/vendor/github.com/docker/docker/client/plugin_remove.go
deleted file mode 100644
index b017e4d348..0000000000
--- a/vendor/github.com/docker/docker/client/plugin_remove.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// PluginRemove removes a plugin
-func (cli *Client) PluginRemove(ctx context.Context, name string, options types.PluginRemoveOptions) error {
-	query := url.Values{}
-	if options.Force {
-		query.Set("force", "1")
-	}
-
-	resp, err := cli.delete(ctx, "/plugins/"+name, query, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/plugin_set.go b/vendor/github.com/docker/docker/client/plugin_set.go
deleted file mode 100644
index 3260d2a90d..0000000000
--- a/vendor/github.com/docker/docker/client/plugin_set.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package client
-
-import (
-	"golang.org/x/net/context"
-)
-
-// PluginSet modifies settings for an existing plugin
-func (cli *Client) PluginSet(ctx context.Context, name string, args []string) error {
-	resp, err := cli.post(ctx, "/plugins/"+name+"/set", nil, args, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/plugin_upgrade.go b/vendor/github.com/docker/docker/client/plugin_upgrade.go
deleted file mode 100644
index 24293c5073..0000000000
--- a/vendor/github.com/docker/docker/client/plugin_upgrade.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package client
-
-import (
-	"fmt"
-	"io"
-	"net/url"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-)
-
-// PluginUpgrade upgrades a plugin
-func (cli *Client) PluginUpgrade(ctx context.Context, name string, options types.PluginInstallOptions) (rc io.ReadCloser, err error) {
-	query := url.Values{}
-	if _, err := reference.ParseNormalizedNamed(options.RemoteRef); err != nil {
-		return nil, errors.Wrap(err, "invalid remote reference")
-	}
-	query.Set("remote", options.RemoteRef)
-
-	privileges, err := cli.checkPluginPermissions(ctx, query, options)
-	if err != nil {
-		return nil, err
-	}
-
-	resp, err := cli.tryPluginUpgrade(ctx, query, privileges, name, options.RegistryAuth)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
-
-func (cli *Client) tryPluginUpgrade(ctx context.Context, query url.Values, privileges types.PluginPrivileges, name, registryAuth string) (serverResponse, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	return cli.post(ctx, fmt.Sprintf("/plugins/%s/upgrade", name), query, privileges, headers)
-}
diff --git a/vendor/github.com/docker/docker/client/request.go b/vendor/github.com/docker/docker/client/request.go
deleted file mode 100644
index 6457b316a3..0000000000
--- a/vendor/github.com/docker/docker/client/request.go
+++ /dev/null
@@ -1,247 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-	"golang.org/x/net/context/ctxhttp"
-)
-
-// serverResponse is a wrapper for http API responses.
-type serverResponse struct {
-	body       io.ReadCloser
-	header     http.Header
-	statusCode int
-}
-
-// head sends an http request to the docker API using the method HEAD.
-func (cli *Client) head(ctx context.Context, path string, query url.Values, headers map[string][]string) (serverResponse, error) {
-	return cli.sendRequest(ctx, "HEAD", path, query, nil, headers)
-}
-
-// get sends an http request to the docker API using the method GET with a specific Go context.
-func (cli *Client) get(ctx context.Context, path string, query url.Values, headers map[string][]string) (serverResponse, error) {
-	return cli.sendRequest(ctx, "GET", path, query, nil, headers)
-}
-
-// post sends an http request to the docker API using the method POST with a specific Go context.
-func (cli *Client) post(ctx context.Context, path string, query url.Values, obj interface{}, headers map[string][]string) (serverResponse, error) {
-	body, headers, err := encodeBody(obj, headers)
-	if err != nil {
-		return serverResponse{}, err
-	}
-	return cli.sendRequest(ctx, "POST", path, query, body, headers)
-}
-
-func (cli *Client) postRaw(ctx context.Context, path string, query url.Values, body io.Reader, headers map[string][]string) (serverResponse, error) {
-	return cli.sendRequest(ctx, "POST", path, query, body, headers)
-}
-
-// put sends an http request to the docker API using the method PUT.
-func (cli *Client) put(ctx context.Context, path string, query url.Values, obj interface{}, headers map[string][]string) (serverResponse, error) {
-	body, headers, err := encodeBody(obj, headers)
-	if err != nil {
-		return serverResponse{}, err
-	}
-	return cli.sendRequest(ctx, "PUT", path, query, body, headers)
-}
-
-// putRaw sends an http request to the docker API using the method PUT.
-func (cli *Client) putRaw(ctx context.Context, path string, query url.Values, body io.Reader, headers map[string][]string) (serverResponse, error) {
-	return cli.sendRequest(ctx, "PUT", path, query, body, headers)
-}
-
-// delete sends an http request to the docker API using the method DELETE.
-func (cli *Client) delete(ctx context.Context, path string, query url.Values, headers map[string][]string) (serverResponse, error) {
-	return cli.sendRequest(ctx, "DELETE", path, query, nil, headers)
-}
-
-type headers map[string][]string
-
-func encodeBody(obj interface{}, headers headers) (io.Reader, headers, error) {
-	if obj == nil {
-		return nil, headers, nil
-	}
-
-	body, err := encodeData(obj)
-	if err != nil {
-		return nil, headers, err
-	}
-	if headers == nil {
-		headers = make(map[string][]string)
-	}
-	headers["Content-Type"] = []string{"application/json"}
-	return body, headers, nil
-}
-
-func (cli *Client) buildRequest(method, path string, body io.Reader, headers headers) (*http.Request, error) {
-	expectedPayload := (method == "POST" || method == "PUT")
-	if expectedPayload && body == nil {
-		body = bytes.NewReader([]byte{})
-	}
-
-	req, err := http.NewRequest(method, path, body)
-	if err != nil {
-		return nil, err
-	}
-	req = cli.addHeaders(req, headers)
-
-	if cli.proto == "unix" || cli.proto == "npipe" {
-		// For local communications, it doesn't matter what the host is. We just
-		// need a valid and meaningful host name. (See #189)
-		req.Host = "docker"
-	}
-
-	req.URL.Host = cli.addr
-	req.URL.Scheme = cli.scheme
-
-	if expectedPayload && req.Header.Get("Content-Type") == "" {
-		req.Header.Set("Content-Type", "text/plain")
-	}
-	return req, nil
-}
-
-func (cli *Client) sendRequest(ctx context.Context, method, path string, query url.Values, body io.Reader, headers headers) (serverResponse, error) {
-	req, err := cli.buildRequest(method, cli.getAPIPath(path, query), body, headers)
-	if err != nil {
-		return serverResponse{}, err
-	}
-	return cli.doRequest(ctx, req)
-}
-
-func (cli *Client) doRequest(ctx context.Context, req *http.Request) (serverResponse, error) {
-	serverResp := serverResponse{statusCode: -1}
-
-	resp, err := ctxhttp.Do(ctx, cli.client, req)
-	if err != nil {
-		if cli.scheme != "https" && strings.Contains(err.Error(), "malformed HTTP response") {
-			return serverResp, fmt.Errorf("%v.\n* Are you trying to connect to a TLS-enabled daemon without TLS?", err)
-		}
-
-		if cli.scheme == "https" && strings.Contains(err.Error(), "bad certificate") {
-			return serverResp, fmt.Errorf("The server probably has client authentication (--tlsverify) enabled. Please check your TLS client certification settings: %v", err)
-		}
-
-		// Don't decorate context sentinel errors; users may be comparing to
-		// them directly.
-		switch err {
-		case context.Canceled, context.DeadlineExceeded:
-			return serverResp, err
-		}
-
-		if nErr, ok := err.(*url.Error); ok {
-			if nErr, ok := nErr.Err.(*net.OpError); ok {
-				if os.IsPermission(nErr.Err) {
-					return serverResp, errors.Wrapf(err, "Got permission denied while trying to connect to the Docker daemon socket at %v", cli.host)
-				}
-			}
-		}
-
-		if err, ok := err.(net.Error); ok {
-			if err.Timeout() {
-				return serverResp, ErrorConnectionFailed(cli.host)
-			}
-			if !err.Temporary() {
-				if strings.Contains(err.Error(), "connection refused") || strings.Contains(err.Error(), "dial unix") {
-					return serverResp, ErrorConnectionFailed(cli.host)
-				}
-			}
-		}
-
-		// Although there's not a strongly typed error for this in go-winio,
-		// lots of people are using the default configuration for the docker
-		// daemon on Windows where the daemon is listening on a named pipe
-		// `//./pipe/docker_engine, and the client must be running elevated.
-		// Give users a clue rather than the not-overly useful message
-		// such as `error during connect: Get http://%2F%2F.%2Fpipe%2Fdocker_engine/v1.26/info:
-		// open //./pipe/docker_engine: The system cannot find the file specified.`.
-		// Note we can't string compare "The system cannot find the file specified" as
-		// this is localised - for example in French the error would be
-		// `open //./pipe/docker_engine: Le fichier spécifié est introuvable.`
-		if strings.Contains(err.Error(), `open //./pipe/docker_engine`) {
-			err = errors.New(err.Error() + " In the default daemon configuration on Windows, the docker client must be run elevated to connect. This error may also indicate that the docker daemon is not running.")
-		}
-
-		return serverResp, errors.Wrap(err, "error during connect")
-	}
-
-	if resp != nil {
-		serverResp.statusCode = resp.StatusCode
-	}
-
-	if serverResp.statusCode < 200 || serverResp.statusCode >= 400 {
-		body, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return serverResp, err
-		}
-		if len(body) == 0 {
-			return serverResp, fmt.Errorf("Error: request returned %s for API route and version %s, check if the server supports the requested API version", http.StatusText(serverResp.statusCode), req.URL)
-		}
-
-		var errorMessage string
-		if (cli.version == "" || versions.GreaterThan(cli.version, "1.23")) &&
-			resp.Header.Get("Content-Type") == "application/json" {
-			var errorResponse types.ErrorResponse
-			if err := json.Unmarshal(body, &errorResponse); err != nil {
-				return serverResp, fmt.Errorf("Error reading JSON: %v", err)
-			}
-			errorMessage = errorResponse.Message
-		} else {
-			errorMessage = string(body)
-		}
-
-		return serverResp, fmt.Errorf("Error response from daemon: %s", strings.TrimSpace(errorMessage))
-	}
-
-	serverResp.body = resp.Body
-	serverResp.header = resp.Header
-	return serverResp, nil
-}
-
-func (cli *Client) addHeaders(req *http.Request, headers headers) *http.Request {
-	// Add CLI Config's HTTP Headers BEFORE we set the Docker headers
-	// then the user can't change OUR headers
-	for k, v := range cli.customHTTPHeaders {
-		if versions.LessThan(cli.version, "1.25") && k == "User-Agent" {
-			continue
-		}
-		req.Header.Set(k, v)
-	}
-
-	if headers != nil {
-		for k, v := range headers {
-			req.Header[k] = v
-		}
-	}
-	return req
-}
-
-func encodeData(data interface{}) (*bytes.Buffer, error) {
-	params := bytes.NewBuffer(nil)
-	if data != nil {
-		if err := json.NewEncoder(params).Encode(data); err != nil {
-			return nil, err
-		}
-	}
-	return params, nil
-}
-
-func ensureReaderClosed(response serverResponse) {
-	if body := response.body; body != nil {
-		// Drain up to 512 bytes and close the body to let the Transport reuse the connection
-		io.CopyN(ioutil.Discard, body, 512)
-		response.body.Close()
-	}
-}
diff --git a/vendor/github.com/docker/docker/client/secret_create.go b/vendor/github.com/docker/docker/client/secret_create.go
deleted file mode 100644
index b5325a560f..0000000000
--- a/vendor/github.com/docker/docker/client/secret_create.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SecretCreate creates a new Secret.
-func (cli *Client) SecretCreate(ctx context.Context, secret swarm.SecretSpec) (types.SecretCreateResponse, error) {
-	var response types.SecretCreateResponse
-	resp, err := cli.post(ctx, "/secrets/create", nil, secret, nil)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/secret_inspect.go b/vendor/github.com/docker/docker/client/secret_inspect.go
deleted file mode 100644
index f774576118..0000000000
--- a/vendor/github.com/docker/docker/client/secret_inspect.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SecretInspectWithRaw returns the secret information with raw data
-func (cli *Client) SecretInspectWithRaw(ctx context.Context, id string) (swarm.Secret, []byte, error) {
-	resp, err := cli.get(ctx, "/secrets/"+id, nil, nil)
-	if err != nil {
-		if resp.statusCode == http.StatusNotFound {
-			return swarm.Secret{}, nil, secretNotFoundError{id}
-		}
-		return swarm.Secret{}, nil, err
-	}
-	defer ensureReaderClosed(resp)
-
-	body, err := ioutil.ReadAll(resp.body)
-	if err != nil {
-		return swarm.Secret{}, nil, err
-	}
-
-	var secret swarm.Secret
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&secret)
-
-	return secret, body, err
-}
diff --git a/vendor/github.com/docker/docker/client/secret_list.go b/vendor/github.com/docker/docker/client/secret_list.go
deleted file mode 100644
index 7e9d5ec167..0000000000
--- a/vendor/github.com/docker/docker/client/secret_list.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SecretList returns the list of secrets.
-func (cli *Client) SecretList(ctx context.Context, options types.SecretListOptions) ([]swarm.Secret, error) {
-	query := url.Values{}
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
-		if err != nil {
-			return nil, err
-		}
-
-		query.Set("filters", filterJSON)
-	}
-
-	resp, err := cli.get(ctx, "/secrets", query, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var secrets []swarm.Secret
-	err = json.NewDecoder(resp.body).Decode(&secrets)
-	ensureReaderClosed(resp)
-	return secrets, err
-}
diff --git a/vendor/github.com/docker/docker/client/secret_remove.go b/vendor/github.com/docker/docker/client/secret_remove.go
deleted file mode 100644
index 1955b988a9..0000000000
--- a/vendor/github.com/docker/docker/client/secret_remove.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package client
-
-import "golang.org/x/net/context"
-
-// SecretRemove removes a Secret.
-func (cli *Client) SecretRemove(ctx context.Context, id string) error {
-	resp, err := cli.delete(ctx, "/secrets/"+id, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/secret_update.go b/vendor/github.com/docker/docker/client/secret_update.go
deleted file mode 100644
index 42cdbbe176..0000000000
--- a/vendor/github.com/docker/docker/client/secret_update.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package client
-
-import (
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SecretUpdate attempts to updates a Secret
-func (cli *Client) SecretUpdate(ctx context.Context, id string, version swarm.Version, secret swarm.SecretSpec) error {
-	query := url.Values{}
-	query.Set("version", strconv.FormatUint(version.Index, 10))
-	resp, err := cli.post(ctx, "/secrets/"+id+"/update", query, secret, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/service_create.go b/vendor/github.com/docker/docker/client/service_create.go
deleted file mode 100644
index 3d1be225bd..0000000000
--- a/vendor/github.com/docker/docker/client/service_create.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// ServiceCreate creates a new Service.
-func (cli *Client) ServiceCreate(ctx context.Context, service swarm.ServiceSpec, options types.ServiceCreateOptions) (types.ServiceCreateResponse, error) {
-	var headers map[string][]string
-
-	if options.EncodedRegistryAuth != "" {
-		headers = map[string][]string{
-			"X-Registry-Auth": {options.EncodedRegistryAuth},
-		}
-	}
-
-	var response types.ServiceCreateResponse
-	resp, err := cli.post(ctx, "/services/create", nil, service, headers)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/service_inspect.go b/vendor/github.com/docker/docker/client/service_inspect.go
deleted file mode 100644
index d7e051e3a4..0000000000
--- a/vendor/github.com/docker/docker/client/service_inspect.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// ServiceInspectWithRaw returns the service information and the raw data.
-func (cli *Client) ServiceInspectWithRaw(ctx context.Context, serviceID string, opts types.ServiceInspectOptions) (swarm.Service, []byte, error) {
-	query := url.Values{}
-	query.Set("insertDefaults", fmt.Sprintf("%v", opts.InsertDefaults))
-	serverResp, err := cli.get(ctx, "/services/"+serviceID, query, nil)
-	if err != nil {
-		if serverResp.statusCode == http.StatusNotFound {
-			return swarm.Service{}, nil, serviceNotFoundError{serviceID}
-		}
-		return swarm.Service{}, nil, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	body, err := ioutil.ReadAll(serverResp.body)
-	if err != nil {
-		return swarm.Service{}, nil, err
-	}
-
-	var response swarm.Service
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&response)
-	return response, body, err
-}
diff --git a/vendor/github.com/docker/docker/client/service_list.go b/vendor/github.com/docker/docker/client/service_list.go
deleted file mode 100644
index c29e6d407d..0000000000
--- a/vendor/github.com/docker/docker/client/service_list.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// ServiceList returns the list of services.
-func (cli *Client) ServiceList(ctx context.Context, options types.ServiceListOptions) ([]swarm.Service, error) {
-	query := url.Values{}
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
-		if err != nil {
-			return nil, err
-		}
-
-		query.Set("filters", filterJSON)
-	}
-
-	resp, err := cli.get(ctx, "/services", query, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var services []swarm.Service
-	err = json.NewDecoder(resp.body).Decode(&services)
-	ensureReaderClosed(resp)
-	return services, err
-}
diff --git a/vendor/github.com/docker/docker/client/service_logs.go b/vendor/github.com/docker/docker/client/service_logs.go
deleted file mode 100644
index 24384e3ec0..0000000000
--- a/vendor/github.com/docker/docker/client/service_logs.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	timetypes "github.com/docker/docker/api/types/time"
-)
-
-// ServiceLogs returns the logs generated by a service in an io.ReadCloser.
-// It's up to the caller to close the stream.
-func (cli *Client) ServiceLogs(ctx context.Context, serviceID string, options types.ContainerLogsOptions) (io.ReadCloser, error) {
-	query := url.Values{}
-	if options.ShowStdout {
-		query.Set("stdout", "1")
-	}
-
-	if options.ShowStderr {
-		query.Set("stderr", "1")
-	}
-
-	if options.Since != "" {
-		ts, err := timetypes.GetTimestamp(options.Since, time.Now())
-		if err != nil {
-			return nil, err
-		}
-		query.Set("since", ts)
-	}
-
-	if options.Timestamps {
-		query.Set("timestamps", "1")
-	}
-
-	if options.Details {
-		query.Set("details", "1")
-	}
-
-	if options.Follow {
-		query.Set("follow", "1")
-	}
-	query.Set("tail", options.Tail)
-
-	resp, err := cli.get(ctx, "/services/"+serviceID+"/logs", query, nil)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
diff --git a/vendor/github.com/docker/docker/client/service_remove.go b/vendor/github.com/docker/docker/client/service_remove.go
deleted file mode 100644
index a9331f92c2..0000000000
--- a/vendor/github.com/docker/docker/client/service_remove.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package client
-
-import "golang.org/x/net/context"
-
-// ServiceRemove kills and removes a service.
-func (cli *Client) ServiceRemove(ctx context.Context, serviceID string) error {
-	resp, err := cli.delete(ctx, "/services/"+serviceID, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/service_update.go b/vendor/github.com/docker/docker/client/service_update.go
deleted file mode 100644
index 873a1e0556..0000000000
--- a/vendor/github.com/docker/docker/client/service_update.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// ServiceUpdate updates a Service.
-func (cli *Client) ServiceUpdate(ctx context.Context, serviceID string, version swarm.Version, service swarm.ServiceSpec, options types.ServiceUpdateOptions) (types.ServiceUpdateResponse, error) {
-	var (
-		headers map[string][]string
-		query   = url.Values{}
-	)
-
-	if options.EncodedRegistryAuth != "" {
-		headers = map[string][]string{
-			"X-Registry-Auth": {options.EncodedRegistryAuth},
-		}
-	}
-
-	if options.RegistryAuthFrom != "" {
-		query.Set("registryAuthFrom", options.RegistryAuthFrom)
-	}
-
-	if options.Rollback != "" {
-		query.Set("rollback", options.Rollback)
-	}
-
-	query.Set("version", strconv.FormatUint(version.Index, 10))
-
-	var response types.ServiceUpdateResponse
-	resp, err := cli.post(ctx, "/services/"+serviceID+"/update", query, service, headers)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/swarm_get_unlock_key.go b/vendor/github.com/docker/docker/client/swarm_get_unlock_key.go
deleted file mode 100644
index be28d32628..0000000000
--- a/vendor/github.com/docker/docker/client/swarm_get_unlock_key.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// SwarmGetUnlockKey retrieves the swarm's unlock key.
-func (cli *Client) SwarmGetUnlockKey(ctx context.Context) (types.SwarmUnlockKeyResponse, error) {
-	serverResp, err := cli.get(ctx, "/swarm/unlockkey", nil, nil)
-	if err != nil {
-		return types.SwarmUnlockKeyResponse{}, err
-	}
-
-	var response types.SwarmUnlockKeyResponse
-	err = json.NewDecoder(serverResp.body).Decode(&response)
-	ensureReaderClosed(serverResp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/swarm_init.go b/vendor/github.com/docker/docker/client/swarm_init.go
deleted file mode 100644
index 9e65e1cca4..0000000000
--- a/vendor/github.com/docker/docker/client/swarm_init.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SwarmInit initializes the swarm.
-func (cli *Client) SwarmInit(ctx context.Context, req swarm.InitRequest) (string, error) {
-	serverResp, err := cli.post(ctx, "/swarm/init", nil, req, nil)
-	if err != nil {
-		return "", err
-	}
-
-	var response string
-	err = json.NewDecoder(serverResp.body).Decode(&response)
-	ensureReaderClosed(serverResp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/swarm_inspect.go b/vendor/github.com/docker/docker/client/swarm_inspect.go
deleted file mode 100644
index 77e72f8466..0000000000
--- a/vendor/github.com/docker/docker/client/swarm_inspect.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SwarmInspect inspects the swarm.
-func (cli *Client) SwarmInspect(ctx context.Context) (swarm.Swarm, error) {
-	serverResp, err := cli.get(ctx, "/swarm", nil, nil)
-	if err != nil {
-		return swarm.Swarm{}, err
-	}
-
-	var response swarm.Swarm
-	err = json.NewDecoder(serverResp.body).Decode(&response)
-	ensureReaderClosed(serverResp)
-	return response, err
-}
diff --git a/vendor/github.com/docker/docker/client/swarm_join.go b/vendor/github.com/docker/docker/client/swarm_join.go
deleted file mode 100644
index 19e5192b9e..0000000000
--- a/vendor/github.com/docker/docker/client/swarm_join.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SwarmJoin joins the swarm.
-func (cli *Client) SwarmJoin(ctx context.Context, req swarm.JoinRequest) error {
-	resp, err := cli.post(ctx, "/swarm/join", nil, req, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/swarm_leave.go b/vendor/github.com/docker/docker/client/swarm_leave.go
deleted file mode 100644
index 3a205cf3b5..0000000000
--- a/vendor/github.com/docker/docker/client/swarm_leave.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"golang.org/x/net/context"
-)
-
-// SwarmLeave leaves the swarm.
-func (cli *Client) SwarmLeave(ctx context.Context, force bool) error {
-	query := url.Values{}
-	if force {
-		query.Set("force", "1")
-	}
-	resp, err := cli.post(ctx, "/swarm/leave", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/swarm_unlock.go b/vendor/github.com/docker/docker/client/swarm_unlock.go
deleted file mode 100644
index 9ee441fed2..0000000000
--- a/vendor/github.com/docker/docker/client/swarm_unlock.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SwarmUnlock unlocks locked swarm.
-func (cli *Client) SwarmUnlock(ctx context.Context, req swarm.UnlockRequest) error {
-	serverResp, err := cli.post(ctx, "/swarm/unlock", nil, req, nil)
-	ensureReaderClosed(serverResp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/swarm_update.go b/vendor/github.com/docker/docker/client/swarm_update.go
deleted file mode 100644
index 7245fd4e38..0000000000
--- a/vendor/github.com/docker/docker/client/swarm_update.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package client
-
-import (
-	"fmt"
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SwarmUpdate updates the swarm.
-func (cli *Client) SwarmUpdate(ctx context.Context, version swarm.Version, swarm swarm.Spec, flags swarm.UpdateFlags) error {
-	query := url.Values{}
-	query.Set("version", strconv.FormatUint(version.Index, 10))
-	query.Set("rotateWorkerToken", fmt.Sprintf("%v", flags.RotateWorkerToken))
-	query.Set("rotateManagerToken", fmt.Sprintf("%v", flags.RotateManagerToken))
-	query.Set("rotateManagerUnlockKey", fmt.Sprintf("%v", flags.RotateManagerUnlockKey))
-	resp, err := cli.post(ctx, "/swarm/update", query, swarm, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/client/task_inspect.go b/vendor/github.com/docker/docker/client/task_inspect.go
deleted file mode 100644
index bc8058fc32..0000000000
--- a/vendor/github.com/docker/docker/client/task_inspect.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types/swarm"
-
-	"golang.org/x/net/context"
-)
-
-// TaskInspectWithRaw returns the task information and its raw representation..
-func (cli *Client) TaskInspectWithRaw(ctx context.Context, taskID string) (swarm.Task, []byte, error) {
-	serverResp, err := cli.get(ctx, "/tasks/"+taskID, nil, nil)
-	if err != nil {
-		if serverResp.statusCode == http.StatusNotFound {
-			return swarm.Task{}, nil, taskNotFoundError{taskID}
-		}
-		return swarm.Task{}, nil, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	body, err := ioutil.ReadAll(serverResp.body)
-	if err != nil {
-		return swarm.Task{}, nil, err
-	}
-
-	var response swarm.Task
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&response)
-	return response, body, err
-}
diff --git a/vendor/github.com/docker/docker/client/task_list.go b/vendor/github.com/docker/docker/client/task_list.go
deleted file mode 100644
index 66324da959..0000000000
--- a/vendor/github.com/docker/docker/client/task_list.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// TaskList returns the list of tasks.
-func (cli *Client) TaskList(ctx context.Context, options types.TaskListOptions) ([]swarm.Task, error) {
-	query := url.Values{}
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
-		if err != nil {
-			return nil, err
-		}
-
-		query.Set("filters", filterJSON)
-	}
-
-	resp, err := cli.get(ctx, "/tasks", query, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var tasks []swarm.Task
-	err = json.NewDecoder(resp.body).Decode(&tasks)
-	ensureReaderClosed(resp)
-	return tasks, err
-}
diff --git a/vendor/github.com/docker/docker/client/task_logs.go b/vendor/github.com/docker/docker/client/task_logs.go
deleted file mode 100644
index 2ed19543a4..0000000000
--- a/vendor/github.com/docker/docker/client/task_logs.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	timetypes "github.com/docker/docker/api/types/time"
-)
-
-// TaskLogs returns the logs generated by a task in an io.ReadCloser.
-// It's up to the caller to close the stream.
-func (cli *Client) TaskLogs(ctx context.Context, taskID string, options types.ContainerLogsOptions) (io.ReadCloser, error) {
-	query := url.Values{}
-	if options.ShowStdout {
-		query.Set("stdout", "1")
-	}
-
-	if options.ShowStderr {
-		query.Set("stderr", "1")
-	}
-
-	if options.Since != "" {
-		ts, err := timetypes.GetTimestamp(options.Since, time.Now())
-		if err != nil {
-			return nil, err
-		}
-		query.Set("since", ts)
-	}
-
-	if options.Timestamps {
-		query.Set("timestamps", "1")
-	}
-
-	if options.Details {
-		query.Set("details", "1")
-	}
-
-	if options.Follow {
-		query.Set("follow", "1")
-	}
-	query.Set("tail", options.Tail)
-
-	resp, err := cli.get(ctx, "/tasks/"+taskID+"/logs", query, nil)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
diff --git a/vendor/github.com/docker/docker/client/transport.go b/vendor/github.com/docker/docker/client/transport.go
deleted file mode 100644
index 401ab15d30..0000000000
--- a/vendor/github.com/docker/docker/client/transport.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package client
-
-import (
-	"crypto/tls"
-	"net/http"
-)
-
-// transportFunc allows us to inject a mock transport for testing. We define it
-// here so we can detect the tlsconfig and return nil for only this type.
-type transportFunc func(*http.Request) (*http.Response, error)
-
-func (tf transportFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return tf(req)
-}
-
-// resolveTLSConfig attempts to resolve the TLS configuration from the
-// RoundTripper.
-func resolveTLSConfig(transport http.RoundTripper) *tls.Config {
-	switch tr := transport.(type) {
-	case *http.Transport:
-		return tr.TLSClientConfig
-	default:
-		return nil
-	}
-}
diff --git a/vendor/github.com/docker/docker/client/utils.go b/vendor/github.com/docker/docker/client/utils.go
deleted file mode 100644
index 23d520ecb8..0000000000
--- a/vendor/github.com/docker/docker/client/utils.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types/filters"
-	"net/url"
-	"regexp"
-)
-
-var headerRegexp = regexp.MustCompile(`\ADocker/.+\s\((.+)\)\z`)
-
-// getDockerOS returns the operating system based on the server header from the daemon.
-func getDockerOS(serverHeader string) string {
-	var osType string
-	matches := headerRegexp.FindStringSubmatch(serverHeader)
-	if len(matches) > 0 {
-		osType = matches[1]
-	}
-	return osType
-}
-
-// getFiltersQuery returns a url query with "filters" query term, based on the
-// filters provided.
-func getFiltersQuery(f filters.Args) (url.Values, error) {
-	query := url.Values{}
-	if f.Len() > 0 {
-		filterJSON, err := filters.ToParam(f)
-		if err != nil {
-			return query, err
-		}
-		query.Set("filters", filterJSON)
-	}
-	return query, nil
-}
diff --git a/vendor/github.com/docker/docker/client/version.go b/vendor/github.com/docker/docker/client/version.go
deleted file mode 100644
index 933ceb4a49..0000000000
--- a/vendor/github.com/docker/docker/client/version.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ServerVersion returns information of the docker client and server host.
-func (cli *Client) ServerVersion(ctx context.Context) (types.Version, error) {
-	resp, err := cli.get(ctx, "/version", nil, nil)
-	if err != nil {
-		return types.Version{}, err
-	}
-
-	var server types.Version
-	err = json.NewDecoder(resp.body).Decode(&server)
-	ensureReaderClosed(resp)
-	return server, err
-}
diff --git a/vendor/github.com/docker/docker/client/volume_create.go b/vendor/github.com/docker/docker/client/volume_create.go
deleted file mode 100644
index 9620c87cbf..0000000000
--- a/vendor/github.com/docker/docker/client/volume_create.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	volumetypes "github.com/docker/docker/api/types/volume"
-	"golang.org/x/net/context"
-)
-
-// VolumeCreate creates a volume in the docker host.
-func (cli *Client) VolumeCreate(ctx context.Context, options volumetypes.VolumesCreateBody) (types.Volume, error) {
-	var volume types.Volume
-	resp, err := cli.post(ctx, "/volumes/create", nil, options, nil)
-	if err != nil {
-		return volume, err
-	}
-	err = json.NewDecoder(resp.body).Decode(&volume)
-	ensureReaderClosed(resp)
-	return volume, err
-}
diff --git a/vendor/github.com/docker/docker/client/volume_inspect.go b/vendor/github.com/docker/docker/client/volume_inspect.go
deleted file mode 100644
index 3860e9b22c..0000000000
--- a/vendor/github.com/docker/docker/client/volume_inspect.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// VolumeInspect returns the information about a specific volume in the docker host.
-func (cli *Client) VolumeInspect(ctx context.Context, volumeID string) (types.Volume, error) {
-	volume, _, err := cli.VolumeInspectWithRaw(ctx, volumeID)
-	return volume, err
-}
-
-// VolumeInspectWithRaw returns the information about a specific volume in the docker host and its raw representation
-func (cli *Client) VolumeInspectWithRaw(ctx context.Context, volumeID string) (types.Volume, []byte, error) {
-	var volume types.Volume
-	resp, err := cli.get(ctx, "/volumes/"+volumeID, nil, nil)
-	if err != nil {
-		if resp.statusCode == http.StatusNotFound {
-			return volume, nil, volumeNotFoundError{volumeID}
-		}
-		return volume, nil, err
-	}
-	defer ensureReaderClosed(resp)
-
-	body, err := ioutil.ReadAll(resp.body)
-	if err != nil {
-		return volume, nil, err
-	}
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&volume)
-	return volume, body, err
-}
diff --git a/vendor/github.com/docker/docker/client/volume_list.go b/vendor/github.com/docker/docker/client/volume_list.go
deleted file mode 100644
index 32247ce115..0000000000
--- a/vendor/github.com/docker/docker/client/volume_list.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types/filters"
-	volumetypes "github.com/docker/docker/api/types/volume"
-	"golang.org/x/net/context"
-)
-
-// VolumeList returns the volumes configured in the docker host.
-func (cli *Client) VolumeList(ctx context.Context, filter filters.Args) (volumetypes.VolumesListOKBody, error) {
-	var volumes volumetypes.VolumesListOKBody
-	query := url.Values{}
-
-	if filter.Len() > 0 {
-		filterJSON, err := filters.ToParamWithVersion(cli.version, filter)
-		if err != nil {
-			return volumes, err
-		}
-		query.Set("filters", filterJSON)
-	}
-	resp, err := cli.get(ctx, "/volumes", query, nil)
-	if err != nil {
-		return volumes, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&volumes)
-	ensureReaderClosed(resp)
-	return volumes, err
-}
diff --git a/vendor/github.com/docker/docker/client/volume_prune.go b/vendor/github.com/docker/docker/client/volume_prune.go
deleted file mode 100644
index 2e7fea7747..0000000000
--- a/vendor/github.com/docker/docker/client/volume_prune.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// VolumesPrune requests the daemon to delete unused data
-func (cli *Client) VolumesPrune(ctx context.Context, pruneFilters filters.Args) (types.VolumesPruneReport, error) {
-	var report types.VolumesPruneReport
-
-	if err := cli.NewVersionError("1.25", "volume prune"); err != nil {
-		return report, err
-	}
-
-	query, err := getFiltersQuery(pruneFilters)
-	if err != nil {
-		return report, err
-	}
-
-	serverResp, err := cli.post(ctx, "/volumes/prune", query, nil, nil)
-	if err != nil {
-		return report, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil {
-		return report, fmt.Errorf("Error retrieving volume prune report: %v", err)
-	}
-
-	return report, nil
-}
diff --git a/vendor/github.com/docker/docker/client/volume_remove.go b/vendor/github.com/docker/docker/client/volume_remove.go
deleted file mode 100644
index 6c26575b49..0000000000
--- a/vendor/github.com/docker/docker/client/volume_remove.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types/versions"
-	"golang.org/x/net/context"
-)
-
-// VolumeRemove removes a volume from the docker host.
-func (cli *Client) VolumeRemove(ctx context.Context, volumeID string, force bool) error {
-	query := url.Values{}
-	if versions.GreaterThanOrEqualTo(cli.version, "1.25") {
-		if force {
-			query.Set("force", "1")
-		}
-	}
-	resp, err := cli.delete(ctx, "/volumes/"+volumeID, query, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/vendor/github.com/docker/docker/pkg/ioutils/buffer.go b/vendor/github.com/docker/docker/pkg/ioutils/buffer.go
deleted file mode 100644
index 3d737b3e19..0000000000
--- a/vendor/github.com/docker/docker/pkg/ioutils/buffer.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package ioutils
-
-import (
-	"errors"
-	"io"
-)
-
-var errBufferFull = errors.New("buffer is full")
-
-type fixedBuffer struct {
-	buf      []byte
-	pos      int
-	lastRead int
-}
-
-func (b *fixedBuffer) Write(p []byte) (int, error) {
-	n := copy(b.buf[b.pos:cap(b.buf)], p)
-	b.pos += n
-
-	if n < len(p) {
-		if b.pos == cap(b.buf) {
-			return n, errBufferFull
-		}
-		return n, io.ErrShortWrite
-	}
-	return n, nil
-}
-
-func (b *fixedBuffer) Read(p []byte) (int, error) {
-	n := copy(p, b.buf[b.lastRead:b.pos])
-	b.lastRead += n
-	return n, nil
-}
-
-func (b *fixedBuffer) Len() int {
-	return b.pos - b.lastRead
-}
-
-func (b *fixedBuffer) Cap() int {
-	return cap(b.buf)
-}
-
-func (b *fixedBuffer) Reset() {
-	b.pos = 0
-	b.lastRead = 0
-	b.buf = b.buf[:0]
-}
-
-func (b *fixedBuffer) String() string {
-	return string(b.buf[b.lastRead:b.pos])
-}
diff --git a/vendor/github.com/docker/docker/pkg/ioutils/bytespipe.go b/vendor/github.com/docker/docker/pkg/ioutils/bytespipe.go
deleted file mode 100644
index 72a04f3491..0000000000
--- a/vendor/github.com/docker/docker/pkg/ioutils/bytespipe.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package ioutils
-
-import (
-	"errors"
-	"io"
-	"sync"
-)
-
-// maxCap is the highest capacity to use in byte slices that buffer data.
-const maxCap = 1e6
-
-// minCap is the lowest capacity to use in byte slices that buffer data
-const minCap = 64
-
-// blockThreshold is the minimum number of bytes in the buffer which will cause
-// a write to BytesPipe to block when allocating a new slice.
-const blockThreshold = 1e6
-
-var (
-	// ErrClosed is returned when Write is called on a closed BytesPipe.
-	ErrClosed = errors.New("write to closed BytesPipe")
-
-	bufPools     = make(map[int]*sync.Pool)
-	bufPoolsLock sync.Mutex
-)
-
-// BytesPipe is io.ReadWriteCloser which works similarly to pipe(queue).
-// All written data may be read at most once. Also, BytesPipe allocates
-// and releases new byte slices to adjust to current needs, so the buffer
-// won't be overgrown after peak loads.
-type BytesPipe struct {
-	mu       sync.Mutex
-	wait     *sync.Cond
-	buf      []*fixedBuffer
-	bufLen   int
-	closeErr error // error to return from next Read. set to nil if not closed.
-}
-
-// NewBytesPipe creates new BytesPipe, initialized by specified slice.
-// If buf is nil, then it will be initialized with slice which cap is 64.
-// buf will be adjusted in a way that len(buf) == 0, cap(buf) == cap(buf).
-func NewBytesPipe() *BytesPipe {
-	bp := &BytesPipe{}
-	bp.buf = append(bp.buf, getBuffer(minCap))
-	bp.wait = sync.NewCond(&bp.mu)
-	return bp
-}
-
-// Write writes p to BytesPipe.
-// It can allocate new []byte slices in a process of writing.
-func (bp *BytesPipe) Write(p []byte) (int, error) {
-	bp.mu.Lock()
-
-	written := 0
-loop0:
-	for {
-		if bp.closeErr != nil {
-			bp.mu.Unlock()
-			return written, ErrClosed
-		}
-
-		if len(bp.buf) == 0 {
-			bp.buf = append(bp.buf, getBuffer(64))
-		}
-		// get the last buffer
-		b := bp.buf[len(bp.buf)-1]
-
-		n, err := b.Write(p)
-		written += n
-		bp.bufLen += n
-
-		// errBufferFull is an error we expect to get if the buffer is full
-		if err != nil && err != errBufferFull {
-			bp.wait.Broadcast()
-			bp.mu.Unlock()
-			return written, err
-		}
-
-		// if there was enough room to write all then break
-		if len(p) == n {
-			break
-		}
-
-		// more data: write to the next slice
-		p = p[n:]
-
-		// make sure the buffer doesn't grow too big from this write
-		for bp.bufLen >= blockThreshold {
-			bp.wait.Wait()
-			if bp.closeErr != nil {
-				continue loop0
-			}
-		}
-
-		// add new byte slice to the buffers slice and continue writing
-		nextCap := b.Cap() * 2
-		if nextCap > maxCap {
-			nextCap = maxCap
-		}
-		bp.buf = append(bp.buf, getBuffer(nextCap))
-	}
-	bp.wait.Broadcast()
-	bp.mu.Unlock()
-	return written, nil
-}
-
-// CloseWithError causes further reads from a BytesPipe to return immediately.
-func (bp *BytesPipe) CloseWithError(err error) error {
-	bp.mu.Lock()
-	if err != nil {
-		bp.closeErr = err
-	} else {
-		bp.closeErr = io.EOF
-	}
-	bp.wait.Broadcast()
-	bp.mu.Unlock()
-	return nil
-}
-
-// Close causes further reads from a BytesPipe to return immediately.
-func (bp *BytesPipe) Close() error {
-	return bp.CloseWithError(nil)
-}
-
-// Read reads bytes from BytesPipe.
-// Data could be read only once.
-func (bp *BytesPipe) Read(p []byte) (n int, err error) {
-	bp.mu.Lock()
-	if bp.bufLen == 0 {
-		if bp.closeErr != nil {
-			bp.mu.Unlock()
-			return 0, bp.closeErr
-		}
-		bp.wait.Wait()
-		if bp.bufLen == 0 && bp.closeErr != nil {
-			err := bp.closeErr
-			bp.mu.Unlock()
-			return 0, err
-		}
-	}
-
-	for bp.bufLen > 0 {
-		b := bp.buf[0]
-		read, _ := b.Read(p) // ignore error since fixedBuffer doesn't really return an error
-		n += read
-		bp.bufLen -= read
-
-		if b.Len() == 0 {
-			// it's empty so return it to the pool and move to the next one
-			returnBuffer(b)
-			bp.buf[0] = nil
-			bp.buf = bp.buf[1:]
-		}
-
-		if len(p) == read {
-			break
-		}
-
-		p = p[read:]
-	}
-
-	bp.wait.Broadcast()
-	bp.mu.Unlock()
-	return
-}
-
-func returnBuffer(b *fixedBuffer) {
-	b.Reset()
-	bufPoolsLock.Lock()
-	pool := bufPools[b.Cap()]
-	bufPoolsLock.Unlock()
-	if pool != nil {
-		pool.Put(b)
-	}
-}
-
-func getBuffer(size int) *fixedBuffer {
-	bufPoolsLock.Lock()
-	pool, ok := bufPools[size]
-	if !ok {
-		pool = &sync.Pool{New: func() interface{} { return &fixedBuffer{buf: make([]byte, 0, size)} }}
-		bufPools[size] = pool
-	}
-	bufPoolsLock.Unlock()
-	return pool.Get().(*fixedBuffer)
-}
diff --git a/vendor/github.com/docker/docker/pkg/ioutils/fmt.go b/vendor/github.com/docker/docker/pkg/ioutils/fmt.go
deleted file mode 100644
index 0b04b0ba3e..0000000000
--- a/vendor/github.com/docker/docker/pkg/ioutils/fmt.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package ioutils
-
-import (
-	"fmt"
-	"io"
-)
-
-// FprintfIfNotEmpty prints the string value if it's not empty
-func FprintfIfNotEmpty(w io.Writer, format, value string) (int, error) {
-	if value != "" {
-		return fmt.Fprintf(w, format, value)
-	}
-	return 0, nil
-}
-
-// FprintfIfTrue prints the boolean value if it's true
-func FprintfIfTrue(w io.Writer, format string, ok bool) (int, error) {
-	if ok {
-		return fmt.Fprintf(w, format, ok)
-	}
-	return 0, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/ioutils/fswriters.go b/vendor/github.com/docker/docker/pkg/ioutils/fswriters.go
deleted file mode 100644
index a56c462651..0000000000
--- a/vendor/github.com/docker/docker/pkg/ioutils/fswriters.go
+++ /dev/null
@@ -1,162 +0,0 @@
-package ioutils
-
-import (
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-)
-
-// NewAtomicFileWriter returns WriteCloser so that writing to it writes to a
-// temporary file and closing it atomically changes the temporary file to
-// destination path. Writing and closing concurrently is not allowed.
-func NewAtomicFileWriter(filename string, perm os.FileMode) (io.WriteCloser, error) {
-	f, err := ioutil.TempFile(filepath.Dir(filename), ".tmp-"+filepath.Base(filename))
-	if err != nil {
-		return nil, err
-	}
-
-	abspath, err := filepath.Abs(filename)
-	if err != nil {
-		return nil, err
-	}
-	return &atomicFileWriter{
-		f:    f,
-		fn:   abspath,
-		perm: perm,
-	}, nil
-}
-
-// AtomicWriteFile atomically writes data to a file named by filename.
-func AtomicWriteFile(filename string, data []byte, perm os.FileMode) error {
-	f, err := NewAtomicFileWriter(filename, perm)
-	if err != nil {
-		return err
-	}
-	n, err := f.Write(data)
-	if err == nil && n < len(data) {
-		err = io.ErrShortWrite
-		f.(*atomicFileWriter).writeErr = err
-	}
-	if err1 := f.Close(); err == nil {
-		err = err1
-	}
-	return err
-}
-
-type atomicFileWriter struct {
-	f        *os.File
-	fn       string
-	writeErr error
-	perm     os.FileMode
-}
-
-func (w *atomicFileWriter) Write(dt []byte) (int, error) {
-	n, err := w.f.Write(dt)
-	if err != nil {
-		w.writeErr = err
-	}
-	return n, err
-}
-
-func (w *atomicFileWriter) Close() (retErr error) {
-	defer func() {
-		if retErr != nil || w.writeErr != nil {
-			os.Remove(w.f.Name())
-		}
-	}()
-	if err := w.f.Sync(); err != nil {
-		w.f.Close()
-		return err
-	}
-	if err := w.f.Close(); err != nil {
-		return err
-	}
-	if err := os.Chmod(w.f.Name(), w.perm); err != nil {
-		return err
-	}
-	if w.writeErr == nil {
-		return os.Rename(w.f.Name(), w.fn)
-	}
-	return nil
-}
-
-// AtomicWriteSet is used to atomically write a set
-// of files and ensure they are visible at the same time.
-// Must be committed to a new directory.
-type AtomicWriteSet struct {
-	root string
-}
-
-// NewAtomicWriteSet creates a new atomic write set to
-// atomically create a set of files. The given directory
-// is used as the base directory for storing files before
-// commit. If no temporary directory is given the system
-// default is used.
-func NewAtomicWriteSet(tmpDir string) (*AtomicWriteSet, error) {
-	td, err := ioutil.TempDir(tmpDir, "write-set-")
-	if err != nil {
-		return nil, err
-	}
-
-	return &AtomicWriteSet{
-		root: td,
-	}, nil
-}
-
-// WriteFile writes a file to the set, guaranteeing the file
-// has been synced.
-func (ws *AtomicWriteSet) WriteFile(filename string, data []byte, perm os.FileMode) error {
-	f, err := ws.FileWriter(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, perm)
-	if err != nil {
-		return err
-	}
-	n, err := f.Write(data)
-	if err == nil && n < len(data) {
-		err = io.ErrShortWrite
-	}
-	if err1 := f.Close(); err == nil {
-		err = err1
-	}
-	return err
-}
-
-type syncFileCloser struct {
-	*os.File
-}
-
-func (w syncFileCloser) Close() error {
-	err := w.File.Sync()
-	if err1 := w.File.Close(); err == nil {
-		err = err1
-	}
-	return err
-}
-
-// FileWriter opens a file writer inside the set. The file
-// should be synced and closed before calling commit.
-func (ws *AtomicWriteSet) FileWriter(name string, flag int, perm os.FileMode) (io.WriteCloser, error) {
-	f, err := os.OpenFile(filepath.Join(ws.root, name), flag, perm)
-	if err != nil {
-		return nil, err
-	}
-	return syncFileCloser{f}, nil
-}
-
-// Cancel cancels the set and removes all temporary data
-// created in the set.
-func (ws *AtomicWriteSet) Cancel() error {
-	return os.RemoveAll(ws.root)
-}
-
-// Commit moves all created files to the target directory. The
-// target directory must not exist and the parent of the target
-// directory must exist.
-func (ws *AtomicWriteSet) Commit(target string) error {
-	return os.Rename(ws.root, target)
-}
-
-// String returns the location the set is writing to.
-func (ws *AtomicWriteSet) String() string {
-	return ws.root
-}
diff --git a/vendor/github.com/docker/docker/pkg/ioutils/multireader.go b/vendor/github.com/docker/docker/pkg/ioutils/multireader.go
deleted file mode 100644
index edb043ddc3..0000000000
--- a/vendor/github.com/docker/docker/pkg/ioutils/multireader.go
+++ /dev/null
@@ -1,224 +0,0 @@
-package ioutils
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-)
-
-type pos struct {
-	idx    int
-	offset int64
-}
-
-type multiReadSeeker struct {
-	readers []io.ReadSeeker
-	pos     *pos
-	posIdx  map[io.ReadSeeker]int
-}
-
-func (r *multiReadSeeker) Seek(offset int64, whence int) (int64, error) {
-	var tmpOffset int64
-	switch whence {
-	case os.SEEK_SET:
-		for i, rdr := range r.readers {
-			// get size of the current reader
-			s, err := rdr.Seek(0, os.SEEK_END)
-			if err != nil {
-				return -1, err
-			}
-
-			if offset > tmpOffset+s {
-				if i == len(r.readers)-1 {
-					rdrOffset := s + (offset - tmpOffset)
-					if _, err := rdr.Seek(rdrOffset, os.SEEK_SET); err != nil {
-						return -1, err
-					}
-					r.pos = &pos{i, rdrOffset}
-					return offset, nil
-				}
-
-				tmpOffset += s
-				continue
-			}
-
-			rdrOffset := offset - tmpOffset
-			idx := i
-
-			rdr.Seek(rdrOffset, os.SEEK_SET)
-			// make sure all following readers are at 0
-			for _, rdr := range r.readers[i+1:] {
-				rdr.Seek(0, os.SEEK_SET)
-			}
-
-			if rdrOffset == s && i != len(r.readers)-1 {
-				idx++
-				rdrOffset = 0
-			}
-			r.pos = &pos{idx, rdrOffset}
-			return offset, nil
-		}
-	case os.SEEK_END:
-		for _, rdr := range r.readers {
-			s, err := rdr.Seek(0, os.SEEK_END)
-			if err != nil {
-				return -1, err
-			}
-			tmpOffset += s
-		}
-		r.Seek(tmpOffset+offset, os.SEEK_SET)
-		return tmpOffset + offset, nil
-	case os.SEEK_CUR:
-		if r.pos == nil {
-			return r.Seek(offset, os.SEEK_SET)
-		}
-		// Just return the current offset
-		if offset == 0 {
-			return r.getCurOffset()
-		}
-
-		curOffset, err := r.getCurOffset()
-		if err != nil {
-			return -1, err
-		}
-		rdr, rdrOffset, err := r.getReaderForOffset(curOffset + offset)
-		if err != nil {
-			return -1, err
-		}
-
-		r.pos = &pos{r.posIdx[rdr], rdrOffset}
-		return curOffset + offset, nil
-	default:
-		return -1, fmt.Errorf("Invalid whence: %d", whence)
-	}
-
-	return -1, fmt.Errorf("Error seeking for whence: %d, offset: %d", whence, offset)
-}
-
-func (r *multiReadSeeker) getReaderForOffset(offset int64) (io.ReadSeeker, int64, error) {
-
-	var offsetTo int64
-
-	for _, rdr := range r.readers {
-		size, err := getReadSeekerSize(rdr)
-		if err != nil {
-			return nil, -1, err
-		}
-		if offsetTo+size > offset {
-			return rdr, offset - offsetTo, nil
-		}
-		if rdr == r.readers[len(r.readers)-1] {
-			return rdr, offsetTo + offset, nil
-		}
-		offsetTo += size
-	}
-
-	return nil, 0, nil
-}
-
-func (r *multiReadSeeker) getCurOffset() (int64, error) {
-	var totalSize int64
-	for _, rdr := range r.readers[:r.pos.idx+1] {
-		if r.posIdx[rdr] == r.pos.idx {
-			totalSize += r.pos.offset
-			break
-		}
-
-		size, err := getReadSeekerSize(rdr)
-		if err != nil {
-			return -1, fmt.Errorf("error getting seeker size: %v", err)
-		}
-		totalSize += size
-	}
-	return totalSize, nil
-}
-
-func (r *multiReadSeeker) getOffsetToReader(rdr io.ReadSeeker) (int64, error) {
-	var offset int64
-	for _, r := range r.readers {
-		if r == rdr {
-			break
-		}
-
-		size, err := getReadSeekerSize(rdr)
-		if err != nil {
-			return -1, err
-		}
-		offset += size
-	}
-	return offset, nil
-}
-
-func (r *multiReadSeeker) Read(b []byte) (int, error) {
-	if r.pos == nil {
-		// make sure all readers are at 0
-		r.Seek(0, os.SEEK_SET)
-	}
-
-	bLen := int64(len(b))
-	buf := bytes.NewBuffer(nil)
-	var rdr io.ReadSeeker
-
-	for _, rdr = range r.readers[r.pos.idx:] {
-		readBytes, err := io.CopyN(buf, rdr, bLen)
-		if err != nil && err != io.EOF {
-			return -1, err
-		}
-		bLen -= readBytes
-
-		if bLen == 0 {
-			break
-		}
-	}
-
-	rdrPos, err := rdr.Seek(0, os.SEEK_CUR)
-	if err != nil {
-		return -1, err
-	}
-	r.pos = &pos{r.posIdx[rdr], rdrPos}
-	return buf.Read(b)
-}
-
-func getReadSeekerSize(rdr io.ReadSeeker) (int64, error) {
-	// save the current position
-	pos, err := rdr.Seek(0, os.SEEK_CUR)
-	if err != nil {
-		return -1, err
-	}
-
-	// get the size
-	size, err := rdr.Seek(0, os.SEEK_END)
-	if err != nil {
-		return -1, err
-	}
-
-	// reset the position
-	if _, err := rdr.Seek(pos, os.SEEK_SET); err != nil {
-		return -1, err
-	}
-	return size, nil
-}
-
-// MultiReadSeeker returns a ReadSeeker that's the logical concatenation of the provided
-// input readseekers. After calling this method the initial position is set to the
-// beginning of the first ReadSeeker. At the end of a ReadSeeker, Read always advances
-// to the beginning of the next ReadSeeker and returns EOF at the end of the last ReadSeeker.
-// Seek can be used over the sum of lengths of all readseekers.
-//
-// When a MultiReadSeeker is used, no Read and Seek operations should be made on
-// its ReadSeeker components. Also, users should make no assumption on the state
-// of individual readseekers while the MultiReadSeeker is used.
-func MultiReadSeeker(readers ...io.ReadSeeker) io.ReadSeeker {
-	if len(readers) == 1 {
-		return readers[0]
-	}
-	idx := make(map[io.ReadSeeker]int)
-	for i, rdr := range readers {
-		idx[rdr] = i
-	}
-	return &multiReadSeeker{
-		readers: readers,
-		posIdx:  idx,
-	}
-}
diff --git a/vendor/github.com/docker/docker/pkg/ioutils/readers.go b/vendor/github.com/docker/docker/pkg/ioutils/readers.go
deleted file mode 100644
index 63f3c07f46..0000000000
--- a/vendor/github.com/docker/docker/pkg/ioutils/readers.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package ioutils
-
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"io"
-
-	"golang.org/x/net/context"
-)
-
-type readCloserWrapper struct {
-	io.Reader
-	closer func() error
-}
-
-func (r *readCloserWrapper) Close() error {
-	return r.closer()
-}
-
-// NewReadCloserWrapper returns a new io.ReadCloser.
-func NewReadCloserWrapper(r io.Reader, closer func() error) io.ReadCloser {
-	return &readCloserWrapper{
-		Reader: r,
-		closer: closer,
-	}
-}
-
-type readerErrWrapper struct {
-	reader io.Reader
-	closer func()
-}
-
-func (r *readerErrWrapper) Read(p []byte) (int, error) {
-	n, err := r.reader.Read(p)
-	if err != nil {
-		r.closer()
-	}
-	return n, err
-}
-
-// NewReaderErrWrapper returns a new io.Reader.
-func NewReaderErrWrapper(r io.Reader, closer func()) io.Reader {
-	return &readerErrWrapper{
-		reader: r,
-		closer: closer,
-	}
-}
-
-// HashData returns the sha256 sum of src.
-func HashData(src io.Reader) (string, error) {
-	h := sha256.New()
-	if _, err := io.Copy(h, src); err != nil {
-		return "", err
-	}
-	return "sha256:" + hex.EncodeToString(h.Sum(nil)), nil
-}
-
-// OnEOFReader wraps an io.ReadCloser and a function
-// the function will run at the end of file or close the file.
-type OnEOFReader struct {
-	Rc io.ReadCloser
-	Fn func()
-}
-
-func (r *OnEOFReader) Read(p []byte) (n int, err error) {
-	n, err = r.Rc.Read(p)
-	if err == io.EOF {
-		r.runFunc()
-	}
-	return
-}
-
-// Close closes the file and run the function.
-func (r *OnEOFReader) Close() error {
-	err := r.Rc.Close()
-	r.runFunc()
-	return err
-}
-
-func (r *OnEOFReader) runFunc() {
-	if fn := r.Fn; fn != nil {
-		fn()
-		r.Fn = nil
-	}
-}
-
-// cancelReadCloser wraps an io.ReadCloser with a context for cancelling read
-// operations.
-type cancelReadCloser struct {
-	cancel func()
-	pR     *io.PipeReader // Stream to read from
-	pW     *io.PipeWriter
-}
-
-// NewCancelReadCloser creates a wrapper that closes the ReadCloser when the
-// context is cancelled. The returned io.ReadCloser must be closed when it is
-// no longer needed.
-func NewCancelReadCloser(ctx context.Context, in io.ReadCloser) io.ReadCloser {
-	pR, pW := io.Pipe()
-
-	// Create a context used to signal when the pipe is closed
-	doneCtx, cancel := context.WithCancel(context.Background())
-
-	p := &cancelReadCloser{
-		cancel: cancel,
-		pR:     pR,
-		pW:     pW,
-	}
-
-	go func() {
-		_, err := io.Copy(pW, in)
-		select {
-		case <-ctx.Done():
-			// If the context was closed, p.closeWithError
-			// was already called. Calling it again would
-			// change the error that Read returns.
-		default:
-			p.closeWithError(err)
-		}
-		in.Close()
-	}()
-	go func() {
-		for {
-			select {
-			case <-ctx.Done():
-				p.closeWithError(ctx.Err())
-			case <-doneCtx.Done():
-				return
-			}
-		}
-	}()
-
-	return p
-}
-
-// Read wraps the Read method of the pipe that provides data from the wrapped
-// ReadCloser.
-func (p *cancelReadCloser) Read(buf []byte) (n int, err error) {
-	return p.pR.Read(buf)
-}
-
-// closeWithError closes the wrapper and its underlying reader. It will
-// cause future calls to Read to return err.
-func (p *cancelReadCloser) closeWithError(err error) {
-	p.pW.CloseWithError(err)
-	p.cancel()
-}
-
-// Close closes the wrapper its underlying reader. It will cause
-// future calls to Read to return io.EOF.
-func (p *cancelReadCloser) Close() error {
-	p.closeWithError(io.EOF)
-	return nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/ioutils/temp_unix.go b/vendor/github.com/docker/docker/pkg/ioutils/temp_unix.go
deleted file mode 100644
index 1539ad21b5..0000000000
--- a/vendor/github.com/docker/docker/pkg/ioutils/temp_unix.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build !windows
-
-package ioutils
-
-import "io/ioutil"
-
-// TempDir on Unix systems is equivalent to ioutil.TempDir.
-func TempDir(dir, prefix string) (string, error) {
-	return ioutil.TempDir(dir, prefix)
-}
diff --git a/vendor/github.com/docker/docker/pkg/ioutils/temp_windows.go b/vendor/github.com/docker/docker/pkg/ioutils/temp_windows.go
deleted file mode 100644
index c258e5fdd8..0000000000
--- a/vendor/github.com/docker/docker/pkg/ioutils/temp_windows.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build windows
-
-package ioutils
-
-import (
-	"io/ioutil"
-
-	"github.com/docker/docker/pkg/longpath"
-)
-
-// TempDir is the equivalent of ioutil.TempDir, except that the result is in Windows longpath format.
-func TempDir(dir, prefix string) (string, error) {
-	tempDir, err := ioutil.TempDir(dir, prefix)
-	if err != nil {
-		return "", err
-	}
-	return longpath.AddPrefix(tempDir), nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/ioutils/writeflusher.go b/vendor/github.com/docker/docker/pkg/ioutils/writeflusher.go
deleted file mode 100644
index 52a4901ade..0000000000
--- a/vendor/github.com/docker/docker/pkg/ioutils/writeflusher.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package ioutils
-
-import (
-	"io"
-	"sync"
-)
-
-// WriteFlusher wraps the Write and Flush operation ensuring that every write
-// is a flush. In addition, the Close method can be called to intercept
-// Read/Write calls if the targets lifecycle has already ended.
-type WriteFlusher struct {
-	w           io.Writer
-	flusher     flusher
-	flushed     chan struct{}
-	flushedOnce sync.Once
-	closed      chan struct{}
-	closeLock   sync.Mutex
-}
-
-type flusher interface {
-	Flush()
-}
-
-var errWriteFlusherClosed = io.EOF
-
-func (wf *WriteFlusher) Write(b []byte) (n int, err error) {
-	select {
-	case <-wf.closed:
-		return 0, errWriteFlusherClosed
-	default:
-	}
-
-	n, err = wf.w.Write(b)
-	wf.Flush() // every write is a flush.
-	return n, err
-}
-
-// Flush the stream immediately.
-func (wf *WriteFlusher) Flush() {
-	select {
-	case <-wf.closed:
-		return
-	default:
-	}
-
-	wf.flushedOnce.Do(func() {
-		close(wf.flushed)
-	})
-	wf.flusher.Flush()
-}
-
-// Flushed returns the state of flushed.
-// If it's flushed, return true, or else it return false.
-func (wf *WriteFlusher) Flushed() bool {
-	// BUG(stevvooe): Remove this method. Its use is inherently racy. Seems to
-	// be used to detect whether or a response code has been issued or not.
-	// Another hook should be used instead.
-	var flushed bool
-	select {
-	case <-wf.flushed:
-		flushed = true
-	default:
-	}
-	return flushed
-}
-
-// Close closes the write flusher, disallowing any further writes to the
-// target. After the flusher is closed, all calls to write or flush will
-// result in an error.
-func (wf *WriteFlusher) Close() error {
-	wf.closeLock.Lock()
-	defer wf.closeLock.Unlock()
-
-	select {
-	case <-wf.closed:
-		return errWriteFlusherClosed
-	default:
-		close(wf.closed)
-	}
-	return nil
-}
-
-// NewWriteFlusher returns a new WriteFlusher.
-func NewWriteFlusher(w io.Writer) *WriteFlusher {
-	var fl flusher
-	if f, ok := w.(flusher); ok {
-		fl = f
-	} else {
-		fl = &NopFlusher{}
-	}
-	return &WriteFlusher{w: w, flusher: fl, closed: make(chan struct{}), flushed: make(chan struct{})}
-}
diff --git a/vendor/github.com/docker/docker/pkg/ioutils/writers.go b/vendor/github.com/docker/docker/pkg/ioutils/writers.go
deleted file mode 100644
index ccc7f9c23e..0000000000
--- a/vendor/github.com/docker/docker/pkg/ioutils/writers.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package ioutils
-
-import "io"
-
-// NopWriter represents a type which write operation is nop.
-type NopWriter struct{}
-
-func (*NopWriter) Write(buf []byte) (int, error) {
-	return len(buf), nil
-}
-
-type nopWriteCloser struct {
-	io.Writer
-}
-
-func (w *nopWriteCloser) Close() error { return nil }
-
-// NopWriteCloser returns a nopWriteCloser.
-func NopWriteCloser(w io.Writer) io.WriteCloser {
-	return &nopWriteCloser{w}
-}
-
-// NopFlusher represents a type which flush operation is nop.
-type NopFlusher struct{}
-
-// Flush is a nop operation.
-func (f *NopFlusher) Flush() {}
-
-type writeCloserWrapper struct {
-	io.Writer
-	closer func() error
-}
-
-func (r *writeCloserWrapper) Close() error {
-	return r.closer()
-}
-
-// NewWriteCloserWrapper returns a new io.WriteCloser.
-func NewWriteCloserWrapper(r io.Writer, closer func() error) io.WriteCloser {
-	return &writeCloserWrapper{
-		Writer: r,
-		closer: closer,
-	}
-}
-
-// WriteCounter wraps a concrete io.Writer and hold a count of the number
-// of bytes written to the writer during a "session".
-// This can be convenient when write return is masked
-// (e.g., json.Encoder.Encode())
-type WriteCounter struct {
-	Count  int64
-	Writer io.Writer
-}
-
-// NewWriteCounter returns a new WriteCounter.
-func NewWriteCounter(w io.Writer) *WriteCounter {
-	return &WriteCounter{
-		Writer: w,
-	}
-}
-
-func (wc *WriteCounter) Write(p []byte) (count int, err error) {
-	count, err = wc.Writer.Write(p)
-	wc.Count += int64(count)
-	return
-}
diff --git a/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog.go b/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog.go
deleted file mode 100644
index 4734c31119..0000000000
--- a/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package jsonlog
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-)
-
-// JSONLog represents a log message, typically a single entry from a given log stream.
-// JSONLogs can be easily serialized to and from JSON and support custom formatting.
-type JSONLog struct {
-	// Log is the log message
-	Log string `json:"log,omitempty"`
-	// Stream is the log source
-	Stream string `json:"stream,omitempty"`
-	// Created is the created timestamp of log
-	Created time.Time `json:"time"`
-	// Attrs is the list of extra attributes provided by the user
-	Attrs map[string]string `json:"attrs,omitempty"`
-}
-
-// Format returns the log formatted according to format
-// If format is nil, returns the log message
-// If format is json, returns the log marshaled in json format
-// By default, returns the log with the log time formatted according to format.
-func (jl *JSONLog) Format(format string) (string, error) {
-	if format == "" {
-		return jl.Log, nil
-	}
-	if format == "json" {
-		m, err := json.Marshal(jl)
-		return string(m), err
-	}
-	return fmt.Sprintf("%s %s", jl.Created.Format(format), jl.Log), nil
-}
-
-// Reset resets the log to nil.
-func (jl *JSONLog) Reset() {
-	jl.Log = ""
-	jl.Stream = ""
-	jl.Created = time.Time{}
-}
diff --git a/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog_marshalling.go b/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog_marshalling.go
deleted file mode 100644
index 83ce684a8e..0000000000
--- a/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog_marshalling.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// This code was initially generated by ffjson <https://github.com/pquerna/ffjson>
-// This code was generated via the following steps:
-// $ go get -u github.com/pquerna/ffjson
-// $ make BIND_DIR=. shell
-// $ ffjson pkg/jsonlog/jsonlog.go
-// $ mv pkg/jsonglog/jsonlog_ffjson.go pkg/jsonlog/jsonlog_marshalling.go
-//
-// It has been modified to improve the performance of time marshalling to JSON
-// and to clean it up.
-// Should this code need to be regenerated when the JSONLog struct is changed,
-// the relevant changes which have been made are:
-// import (
-//        "bytes"
-//-
-//        "unicode/utf8"
-// )
-//
-// func (mj *JSONLog) MarshalJSON() ([]byte, error) {
-//@@ -20,13 +16,13 @@ func (mj *JSONLog) MarshalJSON() ([]byte, error) {
-//        }
-//        return buf.Bytes(), nil
-// }
-//+
-// func (mj *JSONLog) MarshalJSONBuf(buf *bytes.Buffer) error {
-//-       var err error
-//-       var obj []byte
-//-       var first bool = true
-//-       _ = obj
-//-       _ = err
-//-       _ = first
-//+       var (
-//+               err       error
-//+               timestamp string
-//+               first     bool = true
-//+       )
-//        buf.WriteString(`{`)
-//        if len(mj.Log) != 0 {
-//                if first == true {
-//@@ -52,11 +48,11 @@ func (mj *JSONLog) MarshalJSONBuf(buf *bytes.Buffer) error {
-//                buf.WriteString(`,`)
-//        }
-//        buf.WriteString(`"time":`)
-//-       obj, err = mj.Created.MarshalJSON()
-//+       timestamp, err = FastTimeMarshalJSON(mj.Created)
-//        if err != nil {
-//                return err
-//        }
-//-       buf.Write(obj)
-//+       buf.WriteString(timestamp)
-//        buf.WriteString(`}`)
-//        return nil
-// }
-// @@ -81,9 +81,10 @@ func (mj *JSONLog) MarshalJSONBuf(buf *bytes.Buffer) error {
-//         if len(mj.Log) != 0 {
-// -                if first == true {
-// -                       first = false
-// -               } else {
-// -                       buf.WriteString(`,`)
-// -               }
-// +               first = false
-//                 buf.WriteString(`"log":`)
-//                 ffjsonWriteJSONString(buf, mj.Log)
-//         }
-
-package jsonlog
-
-import (
-	"bytes"
-	"unicode/utf8"
-)
-
-// MarshalJSON marshals the JSONLog.
-func (mj *JSONLog) MarshalJSON() ([]byte, error) {
-	var buf bytes.Buffer
-	buf.Grow(1024)
-	if err := mj.MarshalJSONBuf(&buf); err != nil {
-		return nil, err
-	}
-	return buf.Bytes(), nil
-}
-
-// MarshalJSONBuf marshals the JSONLog and stores the result to a bytes.Buffer.
-func (mj *JSONLog) MarshalJSONBuf(buf *bytes.Buffer) error {
-	var (
-		err       error
-		timestamp string
-		first     = true
-	)
-	buf.WriteString(`{`)
-	if len(mj.Log) != 0 {
-		first = false
-		buf.WriteString(`"log":`)
-		ffjsonWriteJSONString(buf, mj.Log)
-	}
-	if len(mj.Stream) != 0 {
-		if first {
-			first = false
-		} else {
-			buf.WriteString(`,`)
-		}
-		buf.WriteString(`"stream":`)
-		ffjsonWriteJSONString(buf, mj.Stream)
-	}
-	if !first {
-		buf.WriteString(`,`)
-	}
-	buf.WriteString(`"time":`)
-	timestamp, err = FastTimeMarshalJSON(mj.Created)
-	if err != nil {
-		return err
-	}
-	buf.WriteString(timestamp)
-	buf.WriteString(`}`)
-	return nil
-}
-
-func ffjsonWriteJSONString(buf *bytes.Buffer, s string) {
-	const hex = "0123456789abcdef"
-
-	buf.WriteByte('"')
-	start := 0
-	for i := 0; i < len(s); {
-		if b := s[i]; b < utf8.RuneSelf {
-			if 0x20 <= b && b != '\\' && b != '"' && b != '<' && b != '>' && b != '&' {
-				i++
-				continue
-			}
-			if start < i {
-				buf.WriteString(s[start:i])
-			}
-			switch b {
-			case '\\', '"':
-				buf.WriteByte('\\')
-				buf.WriteByte(b)
-			case '\n':
-				buf.WriteByte('\\')
-				buf.WriteByte('n')
-			case '\r':
-				buf.WriteByte('\\')
-				buf.WriteByte('r')
-			default:
-
-				buf.WriteString(`\u00`)
-				buf.WriteByte(hex[b>>4])
-				buf.WriteByte(hex[b&0xF])
-			}
-			i++
-			start = i
-			continue
-		}
-		c, size := utf8.DecodeRuneInString(s[i:])
-		if c == utf8.RuneError && size == 1 {
-			if start < i {
-				buf.WriteString(s[start:i])
-			}
-			buf.WriteString(`\ufffd`)
-			i += size
-			start = i
-			continue
-		}
-
-		if c == '\u2028' || c == '\u2029' {
-			if start < i {
-				buf.WriteString(s[start:i])
-			}
-			buf.WriteString(`\u202`)
-			buf.WriteByte(hex[c&0xF])
-			i += size
-			start = i
-			continue
-		}
-		i += size
-	}
-	if start < len(s) {
-		buf.WriteString(s[start:])
-	}
-	buf.WriteByte('"')
-}
diff --git a/vendor/github.com/docker/docker/pkg/jsonlog/jsonlogbytes.go b/vendor/github.com/docker/docker/pkg/jsonlog/jsonlogbytes.go
deleted file mode 100644
index 0ba716f261..0000000000
--- a/vendor/github.com/docker/docker/pkg/jsonlog/jsonlogbytes.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package jsonlog
-
-import (
-	"bytes"
-	"encoding/json"
-	"unicode/utf8"
-)
-
-// JSONLogs is based on JSONLog.
-// It allows marshalling JSONLog from Log as []byte
-// and an already marshalled Created timestamp.
-type JSONLogs struct {
-	Log     []byte `json:"log,omitempty"`
-	Stream  string `json:"stream,omitempty"`
-	Created string `json:"time"`
-
-	// json-encoded bytes
-	RawAttrs json.RawMessage `json:"attrs,omitempty"`
-}
-
-// MarshalJSONBuf is based on the same method from JSONLog
-// It has been modified to take into account the necessary changes.
-func (mj *JSONLogs) MarshalJSONBuf(buf *bytes.Buffer) error {
-	var first = true
-
-	buf.WriteString(`{`)
-	if len(mj.Log) != 0 {
-		first = false
-		buf.WriteString(`"log":`)
-		ffjsonWriteJSONBytesAsString(buf, mj.Log)
-	}
-	if len(mj.Stream) != 0 {
-		if first {
-			first = false
-		} else {
-			buf.WriteString(`,`)
-		}
-		buf.WriteString(`"stream":`)
-		ffjsonWriteJSONString(buf, mj.Stream)
-	}
-	if len(mj.RawAttrs) > 0 {
-		if first {
-			first = false
-		} else {
-			buf.WriteString(`,`)
-		}
-		buf.WriteString(`"attrs":`)
-		buf.Write(mj.RawAttrs)
-	}
-	if !first {
-		buf.WriteString(`,`)
-	}
-	buf.WriteString(`"time":`)
-	buf.WriteString(mj.Created)
-	buf.WriteString(`}`)
-	return nil
-}
-
-// This is based on ffjsonWriteJSONBytesAsString. It has been changed
-// to accept a string passed as a slice of bytes.
-func ffjsonWriteJSONBytesAsString(buf *bytes.Buffer, s []byte) {
-	const hex = "0123456789abcdef"
-
-	buf.WriteByte('"')
-	start := 0
-	for i := 0; i < len(s); {
-		if b := s[i]; b < utf8.RuneSelf {
-			if 0x20 <= b && b != '\\' && b != '"' && b != '<' && b != '>' && b != '&' {
-				i++
-				continue
-			}
-			if start < i {
-				buf.Write(s[start:i])
-			}
-			switch b {
-			case '\\', '"':
-				buf.WriteByte('\\')
-				buf.WriteByte(b)
-			case '\n':
-				buf.WriteByte('\\')
-				buf.WriteByte('n')
-			case '\r':
-				buf.WriteByte('\\')
-				buf.WriteByte('r')
-			default:
-
-				buf.WriteString(`\u00`)
-				buf.WriteByte(hex[b>>4])
-				buf.WriteByte(hex[b&0xF])
-			}
-			i++
-			start = i
-			continue
-		}
-		c, size := utf8.DecodeRune(s[i:])
-		if c == utf8.RuneError && size == 1 {
-			if start < i {
-				buf.Write(s[start:i])
-			}
-			buf.WriteString(`\ufffd`)
-			i += size
-			start = i
-			continue
-		}
-
-		if c == '\u2028' || c == '\u2029' {
-			if start < i {
-				buf.Write(s[start:i])
-			}
-			buf.WriteString(`\u202`)
-			buf.WriteByte(hex[c&0xF])
-			i += size
-			start = i
-			continue
-		}
-		i += size
-	}
-	if start < len(s) {
-		buf.Write(s[start:])
-	}
-	buf.WriteByte('"')
-}
diff --git a/vendor/github.com/docker/docker/pkg/jsonlog/time_marshalling.go b/vendor/github.com/docker/docker/pkg/jsonlog/time_marshalling.go
deleted file mode 100644
index 2117338149..0000000000
--- a/vendor/github.com/docker/docker/pkg/jsonlog/time_marshalling.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Package jsonlog provides helper functions to parse and print time (time.Time) as JSON.
-package jsonlog
-
-import (
-	"errors"
-	"time"
-)
-
-const (
-	// RFC3339NanoFixed is our own version of RFC339Nano because we want one
-	// that pads the nano seconds part with zeros to ensure
-	// the timestamps are aligned in the logs.
-	RFC3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00"
-	// JSONFormat is the format used by FastMarshalJSON
-	JSONFormat = `"` + time.RFC3339Nano + `"`
-)
-
-// FastTimeMarshalJSON avoids one of the extra allocations that
-// time.MarshalJSON is making.
-func FastTimeMarshalJSON(t time.Time) (string, error) {
-	if y := t.Year(); y < 0 || y >= 10000 {
-		// RFC 3339 is clear that years are 4 digits exactly.
-		// See golang.org/issue/4556#c15 for more discussion.
-		return "", errors.New("time.MarshalJSON: year outside of range [0,9999]")
-	}
-	return t.Format(JSONFormat), nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go b/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
deleted file mode 100644
index 4fb2b62b11..0000000000
--- a/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
+++ /dev/null
@@ -1,296 +0,0 @@
-package jsonmessage
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/Nvveen/Gotty"
-	"github.com/docker/docker/pkg/jsonlog"
-	"github.com/docker/docker/pkg/term"
-	"github.com/docker/go-units"
-)
-
-// JSONError wraps a concrete Code and Message, `Code` is
-// is an integer error code, `Message` is the error message.
-type JSONError struct {
-	Code    int    `json:"code,omitempty"`
-	Message string `json:"message,omitempty"`
-}
-
-func (e *JSONError) Error() string {
-	return e.Message
-}
-
-// JSONProgress describes a Progress. terminalFd is the fd of the current terminal,
-// Start is the initial value for the operation. Current is the current status and
-// value of the progress made towards Total. Total is the end value describing when
-// we made 100% progress for an operation.
-type JSONProgress struct {
-	terminalFd uintptr
-	Current    int64 `json:"current,omitempty"`
-	Total      int64 `json:"total,omitempty"`
-	Start      int64 `json:"start,omitempty"`
-	// If true, don't show xB/yB
-	HideCounts bool `json:"hidecounts,omitempty"`
-}
-
-func (p *JSONProgress) String() string {
-	var (
-		width       = 200
-		pbBox       string
-		numbersBox  string
-		timeLeftBox string
-	)
-
-	ws, err := term.GetWinsize(p.terminalFd)
-	if err == nil {
-		width = int(ws.Width)
-	}
-
-	if p.Current <= 0 && p.Total <= 0 {
-		return ""
-	}
-	current := units.HumanSize(float64(p.Current))
-	if p.Total <= 0 {
-		return fmt.Sprintf("%8v", current)
-	}
-	total := units.HumanSize(float64(p.Total))
-	percentage := int(float64(p.Current)/float64(p.Total)*100) / 2
-	if percentage > 50 {
-		percentage = 50
-	}
-	if width > 110 {
-		// this number can't be negative gh#7136
-		numSpaces := 0
-		if 50-percentage > 0 {
-			numSpaces = 50 - percentage
-		}
-		pbBox = fmt.Sprintf("[%s>%s] ", strings.Repeat("=", percentage), strings.Repeat(" ", numSpaces))
-	}
-
-	if !p.HideCounts {
-		numbersBox = fmt.Sprintf("%8v/%v", current, total)
-
-		if p.Current > p.Total {
-			// remove total display if the reported current is wonky.
-			numbersBox = fmt.Sprintf("%8v", current)
-		}
-	}
-
-	if p.Current > 0 && p.Start > 0 && percentage < 50 {
-		fromStart := time.Now().UTC().Sub(time.Unix(p.Start, 0))
-		perEntry := fromStart / time.Duration(p.Current)
-		left := time.Duration(p.Total-p.Current) * perEntry
-		left = (left / time.Second) * time.Second
-
-		if width > 50 {
-			timeLeftBox = " " + left.String()
-		}
-	}
-	return pbBox + numbersBox + timeLeftBox
-}
-
-// JSONMessage defines a message struct. It describes
-// the created time, where it from, status, ID of the
-// message. It's used for docker events.
-type JSONMessage struct {
-	Stream          string        `json:"stream,omitempty"`
-	Status          string        `json:"status,omitempty"`
-	Progress        *JSONProgress `json:"progressDetail,omitempty"`
-	ProgressMessage string        `json:"progress,omitempty"` //deprecated
-	ID              string        `json:"id,omitempty"`
-	From            string        `json:"from,omitempty"`
-	Time            int64         `json:"time,omitempty"`
-	TimeNano        int64         `json:"timeNano,omitempty"`
-	Error           *JSONError    `json:"errorDetail,omitempty"`
-	ErrorMessage    string        `json:"error,omitempty"` //deprecated
-	// Aux contains out-of-band data, such as digests for push signing.
-	Aux *json.RawMessage `json:"aux,omitempty"`
-}
-
-/* Satisfied by gotty.TermInfo as well as noTermInfo from below */
-type termInfo interface {
-	Parse(attr string, params ...interface{}) (string, error)
-}
-
-type noTermInfo struct{} // canary used when no terminfo.
-
-func (ti *noTermInfo) Parse(attr string, params ...interface{}) (string, error) {
-	return "", fmt.Errorf("noTermInfo")
-}
-
-func clearLine(out io.Writer, ti termInfo) {
-	// el2 (clear whole line) is not exposed by terminfo.
-
-	// First clear line from beginning to cursor
-	if attr, err := ti.Parse("el1"); err == nil {
-		fmt.Fprintf(out, "%s", attr)
-	} else {
-		fmt.Fprintf(out, "\x1b[1K")
-	}
-	// Then clear line from cursor to end
-	if attr, err := ti.Parse("el"); err == nil {
-		fmt.Fprintf(out, "%s", attr)
-	} else {
-		fmt.Fprintf(out, "\x1b[K")
-	}
-}
-
-func cursorUp(out io.Writer, ti termInfo, l int) {
-	if l == 0 { // Should never be the case, but be tolerant
-		return
-	}
-	if attr, err := ti.Parse("cuu", l); err == nil {
-		fmt.Fprintf(out, "%s", attr)
-	} else {
-		fmt.Fprintf(out, "\x1b[%dA", l)
-	}
-}
-
-func cursorDown(out io.Writer, ti termInfo, l int) {
-	if l == 0 { // Should never be the case, but be tolerant
-		return
-	}
-	if attr, err := ti.Parse("cud", l); err == nil {
-		fmt.Fprintf(out, "%s", attr)
-	} else {
-		fmt.Fprintf(out, "\x1b[%dB", l)
-	}
-}
-
-// Display displays the JSONMessage to `out`. `termInfo` is non-nil if `out`
-// is a terminal. If this is the case, it will erase the entire current line
-// when displaying the progressbar.
-func (jm *JSONMessage) Display(out io.Writer, termInfo termInfo) error {
-	if jm.Error != nil {
-		if jm.Error.Code == 401 {
-			return fmt.Errorf("Authentication is required.")
-		}
-		return jm.Error
-	}
-	var endl string
-	if termInfo != nil && jm.Stream == "" && jm.Progress != nil {
-		clearLine(out, termInfo)
-		endl = "\r"
-		fmt.Fprintf(out, endl)
-	} else if jm.Progress != nil && jm.Progress.String() != "" { //disable progressbar in non-terminal
-		return nil
-	}
-	if jm.TimeNano != 0 {
-		fmt.Fprintf(out, "%s ", time.Unix(0, jm.TimeNano).Format(jsonlog.RFC3339NanoFixed))
-	} else if jm.Time != 0 {
-		fmt.Fprintf(out, "%s ", time.Unix(jm.Time, 0).Format(jsonlog.RFC3339NanoFixed))
-	}
-	if jm.ID != "" {
-		fmt.Fprintf(out, "%s: ", jm.ID)
-	}
-	if jm.From != "" {
-		fmt.Fprintf(out, "(from %s) ", jm.From)
-	}
-	if jm.Progress != nil && termInfo != nil {
-		fmt.Fprintf(out, "%s %s%s", jm.Status, jm.Progress.String(), endl)
-	} else if jm.ProgressMessage != "" { //deprecated
-		fmt.Fprintf(out, "%s %s%s", jm.Status, jm.ProgressMessage, endl)
-	} else if jm.Stream != "" {
-		fmt.Fprintf(out, "%s%s", jm.Stream, endl)
-	} else {
-		fmt.Fprintf(out, "%s%s\n", jm.Status, endl)
-	}
-	return nil
-}
-
-// DisplayJSONMessagesStream displays a json message stream from `in` to `out`, `isTerminal`
-// describes if `out` is a terminal. If this is the case, it will print `\n` at the end of
-// each line and move the cursor while displaying.
-func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr, isTerminal bool, auxCallback func(*json.RawMessage)) error {
-	var (
-		dec = json.NewDecoder(in)
-		ids = make(map[string]int)
-	)
-
-	var termInfo termInfo
-
-	if isTerminal {
-		term := os.Getenv("TERM")
-		if term == "" {
-			term = "vt102"
-		}
-
-		var err error
-		if termInfo, err = gotty.OpenTermInfo(term); err != nil {
-			termInfo = &noTermInfo{}
-		}
-	}
-
-	for {
-		diff := 0
-		var jm JSONMessage
-		if err := dec.Decode(&jm); err != nil {
-			if err == io.EOF {
-				break
-			}
-			return err
-		}
-
-		if jm.Aux != nil {
-			if auxCallback != nil {
-				auxCallback(jm.Aux)
-			}
-			continue
-		}
-
-		if jm.Progress != nil {
-			jm.Progress.terminalFd = terminalFd
-		}
-		if jm.ID != "" && (jm.Progress != nil || jm.ProgressMessage != "") {
-			line, ok := ids[jm.ID]
-			if !ok {
-				// NOTE: This approach of using len(id) to
-				// figure out the number of lines of history
-				// only works as long as we clear the history
-				// when we output something that's not
-				// accounted for in the map, such as a line
-				// with no ID.
-				line = len(ids)
-				ids[jm.ID] = line
-				if termInfo != nil {
-					fmt.Fprintf(out, "\n")
-				}
-			}
-			diff = len(ids) - line
-			if termInfo != nil {
-				cursorUp(out, termInfo, diff)
-			}
-		} else {
-			// When outputting something that isn't progress
-			// output, clear the history of previous lines. We
-			// don't want progress entries from some previous
-			// operation to be updated (for example, pull -a
-			// with multiple tags).
-			ids = make(map[string]int)
-		}
-		err := jm.Display(out, termInfo)
-		if jm.ID != "" && termInfo != nil {
-			cursorDown(out, termInfo, diff)
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-type stream interface {
-	io.Writer
-	FD() uintptr
-	IsTerminal() bool
-}
-
-// DisplayJSONMessagesToStream prints json messages to the output stream
-func DisplayJSONMessagesToStream(in io.Reader, stream stream, auxCallback func(*json.RawMessage)) error {
-	return DisplayJSONMessagesStream(in, stream, stream.FD(), stream.IsTerminal(), auxCallback)
-}
diff --git a/vendor/github.com/docker/docker/pkg/longpath/longpath.go b/vendor/github.com/docker/docker/pkg/longpath/longpath.go
deleted file mode 100644
index 9b15bfff4c..0000000000
--- a/vendor/github.com/docker/docker/pkg/longpath/longpath.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// longpath introduces some constants and helper functions for handling long paths
-// in Windows, which are expected to be prepended with `\\?\` and followed by either
-// a drive letter, a UNC server\share, or a volume identifier.
-
-package longpath
-
-import (
-	"strings"
-)
-
-// Prefix is the longpath prefix for Windows file paths.
-const Prefix = `\\?\`
-
-// AddPrefix will add the Windows long path prefix to the path provided if
-// it does not already have it.
-func AddPrefix(path string) string {
-	if !strings.HasPrefix(path, Prefix) {
-		if strings.HasPrefix(path, `\\`) {
-			// This is a UNC path, so we need to add 'UNC' to the path as well.
-			path = Prefix + `UNC` + path[1:]
-		} else {
-			path = Prefix + path
-		}
-	}
-	return path
-}
diff --git a/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go b/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go
deleted file mode 100644
index a018a203f3..0000000000
--- a/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go
+++ /dev/null
@@ -1,190 +0,0 @@
-package stdcopy
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"sync"
-)
-
-// StdType is the type of standard stream
-// a writer can multiplex to.
-type StdType byte
-
-const (
-	// Stdin represents standard input stream type.
-	Stdin StdType = iota
-	// Stdout represents standard output stream type.
-	Stdout
-	// Stderr represents standard error steam type.
-	Stderr
-	// Systemerr represents errors originating from the system that make it
-	// into the the multiplexed stream.
-	Systemerr
-
-	stdWriterPrefixLen = 8
-	stdWriterFdIndex   = 0
-	stdWriterSizeIndex = 4
-
-	startingBufLen = 32*1024 + stdWriterPrefixLen + 1
-)
-
-var bufPool = &sync.Pool{New: func() interface{} { return bytes.NewBuffer(nil) }}
-
-// stdWriter is wrapper of io.Writer with extra customized info.
-type stdWriter struct {
-	io.Writer
-	prefix byte
-}
-
-// Write sends the buffer to the underneath writer.
-// It inserts the prefix header before the buffer,
-// so stdcopy.StdCopy knows where to multiplex the output.
-// It makes stdWriter to implement io.Writer.
-func (w *stdWriter) Write(p []byte) (n int, err error) {
-	if w == nil || w.Writer == nil {
-		return 0, errors.New("Writer not instantiated")
-	}
-	if p == nil {
-		return 0, nil
-	}
-
-	header := [stdWriterPrefixLen]byte{stdWriterFdIndex: w.prefix}
-	binary.BigEndian.PutUint32(header[stdWriterSizeIndex:], uint32(len(p)))
-	buf := bufPool.Get().(*bytes.Buffer)
-	buf.Write(header[:])
-	buf.Write(p)
-
-	n, err = w.Writer.Write(buf.Bytes())
-	n -= stdWriterPrefixLen
-	if n < 0 {
-		n = 0
-	}
-
-	buf.Reset()
-	bufPool.Put(buf)
-	return
-}
-
-// NewStdWriter instantiates a new Writer.
-// Everything written to it will be encapsulated using a custom format,
-// and written to the underlying `w` stream.
-// This allows multiple write streams (e.g. stdout and stderr) to be muxed into a single connection.
-// `t` indicates the id of the stream to encapsulate.
-// It can be stdcopy.Stdin, stdcopy.Stdout, stdcopy.Stderr.
-func NewStdWriter(w io.Writer, t StdType) io.Writer {
-	return &stdWriter{
-		Writer: w,
-		prefix: byte(t),
-	}
-}
-
-// StdCopy is a modified version of io.Copy.
-//
-// StdCopy will demultiplex `src`, assuming that it contains two streams,
-// previously multiplexed together using a StdWriter instance.
-// As it reads from `src`, StdCopy will write to `dstout` and `dsterr`.
-//
-// StdCopy will read until it hits EOF on `src`. It will then return a nil error.
-// In other words: if `err` is non nil, it indicates a real underlying error.
-//
-// `written` will hold the total number of bytes written to `dstout` and `dsterr`.
-func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, err error) {
-	var (
-		buf       = make([]byte, startingBufLen)
-		bufLen    = len(buf)
-		nr, nw    int
-		er, ew    error
-		out       io.Writer
-		frameSize int
-	)
-
-	for {
-		// Make sure we have at least a full header
-		for nr < stdWriterPrefixLen {
-			var nr2 int
-			nr2, er = src.Read(buf[nr:])
-			nr += nr2
-			if er == io.EOF {
-				if nr < stdWriterPrefixLen {
-					return written, nil
-				}
-				break
-			}
-			if er != nil {
-				return 0, er
-			}
-		}
-
-		stream := StdType(buf[stdWriterFdIndex])
-		// Check the first byte to know where to write
-		switch stream {
-		case Stdin:
-			fallthrough
-		case Stdout:
-			// Write on stdout
-			out = dstout
-		case Stderr:
-			// Write on stderr
-			out = dsterr
-		case Systemerr:
-			// If we're on Systemerr, we won't write anywhere.
-			// NB: if this code changes later, make sure you don't try to write
-			// to outstream if Systemerr is the stream
-			out = nil
-		default:
-			return 0, fmt.Errorf("Unrecognized input header: %d", buf[stdWriterFdIndex])
-		}
-
-		// Retrieve the size of the frame
-		frameSize = int(binary.BigEndian.Uint32(buf[stdWriterSizeIndex : stdWriterSizeIndex+4]))
-
-		// Check if the buffer is big enough to read the frame.
-		// Extend it if necessary.
-		if frameSize+stdWriterPrefixLen > bufLen {
-			buf = append(buf, make([]byte, frameSize+stdWriterPrefixLen-bufLen+1)...)
-			bufLen = len(buf)
-		}
-
-		// While the amount of bytes read is less than the size of the frame + header, we keep reading
-		for nr < frameSize+stdWriterPrefixLen {
-			var nr2 int
-			nr2, er = src.Read(buf[nr:])
-			nr += nr2
-			if er == io.EOF {
-				if nr < frameSize+stdWriterPrefixLen {
-					return written, nil
-				}
-				break
-			}
-			if er != nil {
-				return 0, er
-			}
-		}
-
-		// we might have an error from the source mixed up in our multiplexed
-		// stream. if we do, return it.
-		if stream == Systemerr {
-			return written, fmt.Errorf("error from daemon in stream: %s", string(buf[stdWriterPrefixLen:frameSize+stdWriterPrefixLen]))
-		}
-
-		// Write the retrieved frame (without header)
-		nw, ew = out.Write(buf[stdWriterPrefixLen : frameSize+stdWriterPrefixLen])
-		if ew != nil {
-			return 0, ew
-		}
-
-		// If the frame has not been fully written: error
-		if nw != frameSize {
-			return 0, io.ErrShortWrite
-		}
-		written += int64(nw)
-
-		// Move the rest of the buffer to the beginning
-		copy(buf, buf[frameSize+stdWriterPrefixLen:])
-		// Move the index
-		nr -= frameSize + stdWriterPrefixLen
-	}
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/chtimes.go b/vendor/github.com/docker/docker/pkg/system/chtimes.go
deleted file mode 100644
index 7637f12e1a..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/chtimes.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package system
-
-import (
-	"os"
-	"syscall"
-	"time"
-	"unsafe"
-)
-
-var (
-	maxTime time.Time
-)
-
-func init() {
-	if unsafe.Sizeof(syscall.Timespec{}.Nsec) == 8 {
-		// This is a 64 bit timespec
-		// os.Chtimes limits time to the following
-		maxTime = time.Unix(0, 1<<63-1)
-	} else {
-		// This is a 32 bit timespec
-		maxTime = time.Unix(1<<31-1, 0)
-	}
-}
-
-// Chtimes changes the access time and modified time of a file at the given path
-func Chtimes(name string, atime time.Time, mtime time.Time) error {
-	unixMinTime := time.Unix(0, 0)
-	unixMaxTime := maxTime
-
-	// If the modified time is prior to the Unix Epoch, or after the
-	// end of Unix Time, os.Chtimes has undefined behavior
-	// default to Unix Epoch in this case, just in case
-
-	if atime.Before(unixMinTime) || atime.After(unixMaxTime) {
-		atime = unixMinTime
-	}
-
-	if mtime.Before(unixMinTime) || mtime.After(unixMaxTime) {
-		mtime = unixMinTime
-	}
-
-	if err := os.Chtimes(name, atime, mtime); err != nil {
-		return err
-	}
-
-	// Take platform specific action for setting create time.
-	if err := setCTime(name, mtime); err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/chtimes_unix.go b/vendor/github.com/docker/docker/pkg/system/chtimes_unix.go
deleted file mode 100644
index 09d58bcbfd..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/chtimes_unix.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"time"
-)
-
-//setCTime will set the create time on a file. On Unix, the create
-//time is updated as a side effect of setting the modified time, so
-//no action is required.
-func setCTime(path string, ctime time.Time) error {
-	return nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/chtimes_windows.go b/vendor/github.com/docker/docker/pkg/system/chtimes_windows.go
deleted file mode 100644
index 2945868465..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/chtimes_windows.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// +build windows
-
-package system
-
-import (
-	"syscall"
-	"time"
-)
-
-//setCTime will set the create time on a file. On Windows, this requires
-//calling SetFileTime and explicitly including the create time.
-func setCTime(path string, ctime time.Time) error {
-	ctimespec := syscall.NsecToTimespec(ctime.UnixNano())
-	pathp, e := syscall.UTF16PtrFromString(path)
-	if e != nil {
-		return e
-	}
-	h, e := syscall.CreateFile(pathp,
-		syscall.FILE_WRITE_ATTRIBUTES, syscall.FILE_SHARE_WRITE, nil,
-		syscall.OPEN_EXISTING, syscall.FILE_FLAG_BACKUP_SEMANTICS, 0)
-	if e != nil {
-		return e
-	}
-	defer syscall.Close(h)
-	c := syscall.NsecToFiletime(syscall.TimespecToNsec(ctimespec))
-	return syscall.SetFileTime(h, &c, nil, nil)
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/errors.go b/vendor/github.com/docker/docker/pkg/system/errors.go
deleted file mode 100644
index 288318985e..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/errors.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package system
-
-import (
-	"errors"
-)
-
-var (
-	// ErrNotSupportedPlatform means the platform is not supported.
-	ErrNotSupportedPlatform = errors.New("platform and architecture is not supported")
-)
diff --git a/vendor/github.com/docker/docker/pkg/system/events_windows.go b/vendor/github.com/docker/docker/pkg/system/events_windows.go
deleted file mode 100644
index 3ec6d22151..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/events_windows.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package system
-
-// This file implements syscalls for Win32 events which are not implemented
-// in golang.
-
-import (
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-var (
-	procCreateEvent = modkernel32.NewProc("CreateEventW")
-	procOpenEvent   = modkernel32.NewProc("OpenEventW")
-	procSetEvent    = modkernel32.NewProc("SetEvent")
-	procResetEvent  = modkernel32.NewProc("ResetEvent")
-	procPulseEvent  = modkernel32.NewProc("PulseEvent")
-)
-
-// CreateEvent implements win32 CreateEventW func in golang. It will create an event object.
-func CreateEvent(eventAttributes *syscall.SecurityAttributes, manualReset bool, initialState bool, name string) (handle syscall.Handle, err error) {
-	namep, _ := syscall.UTF16PtrFromString(name)
-	var _p1 uint32
-	if manualReset {
-		_p1 = 1
-	}
-	var _p2 uint32
-	if initialState {
-		_p2 = 1
-	}
-	r0, _, e1 := procCreateEvent.Call(uintptr(unsafe.Pointer(eventAttributes)), uintptr(_p1), uintptr(_p2), uintptr(unsafe.Pointer(namep)))
-	use(unsafe.Pointer(namep))
-	handle = syscall.Handle(r0)
-	if handle == syscall.InvalidHandle {
-		err = e1
-	}
-	return
-}
-
-// OpenEvent implements win32 OpenEventW func in golang. It opens an event object.
-func OpenEvent(desiredAccess uint32, inheritHandle bool, name string) (handle syscall.Handle, err error) {
-	namep, _ := syscall.UTF16PtrFromString(name)
-	var _p1 uint32
-	if inheritHandle {
-		_p1 = 1
-	}
-	r0, _, e1 := procOpenEvent.Call(uintptr(desiredAccess), uintptr(_p1), uintptr(unsafe.Pointer(namep)))
-	use(unsafe.Pointer(namep))
-	handle = syscall.Handle(r0)
-	if handle == syscall.InvalidHandle {
-		err = e1
-	}
-	return
-}
-
-// SetEvent implements win32 SetEvent func in golang.
-func SetEvent(handle syscall.Handle) (err error) {
-	return setResetPulse(handle, procSetEvent)
-}
-
-// ResetEvent implements win32 ResetEvent func in golang.
-func ResetEvent(handle syscall.Handle) (err error) {
-	return setResetPulse(handle, procResetEvent)
-}
-
-// PulseEvent implements win32 PulseEvent func in golang.
-func PulseEvent(handle syscall.Handle) (err error) {
-	return setResetPulse(handle, procPulseEvent)
-}
-
-func setResetPulse(handle syscall.Handle, proc *windows.LazyProc) (err error) {
-	r0, _, _ := proc.Call(uintptr(handle))
-	if r0 != 0 {
-		err = syscall.Errno(r0)
-	}
-	return
-}
-
-var temp unsafe.Pointer
-
-// use ensures a variable is kept alive without the GC freeing while still needed
-func use(p unsafe.Pointer) {
-	temp = p
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/exitcode.go b/vendor/github.com/docker/docker/pkg/system/exitcode.go
deleted file mode 100644
index 60f0514b1d..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/exitcode.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package system
-
-import (
-	"fmt"
-	"os/exec"
-	"syscall"
-)
-
-// GetExitCode returns the ExitStatus of the specified error if its type is
-// exec.ExitError, returns 0 and an error otherwise.
-func GetExitCode(err error) (int, error) {
-	exitCode := 0
-	if exiterr, ok := err.(*exec.ExitError); ok {
-		if procExit, ok := exiterr.Sys().(syscall.WaitStatus); ok {
-			return procExit.ExitStatus(), nil
-		}
-	}
-	return exitCode, fmt.Errorf("failed to get exit code")
-}
-
-// ProcessExitCode process the specified error and returns the exit status code
-// if the error was of type exec.ExitError, returns nothing otherwise.
-func ProcessExitCode(err error) (exitCode int) {
-	if err != nil {
-		var exiterr error
-		if exitCode, exiterr = GetExitCode(err); exiterr != nil {
-			// TODO: Fix this so we check the error's text.
-			// we've failed to retrieve exit code, so we set it to 127
-			exitCode = 127
-		}
-	}
-	return
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/filesys.go b/vendor/github.com/docker/docker/pkg/system/filesys.go
deleted file mode 100644
index 7aa920de1a..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/filesys.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-)
-
-// MkdirAllWithACL is a wrapper for MkdirAll that creates a directory
-// ACL'd for Builtin Administrators and Local System.
-func MkdirAllWithACL(path string, perm os.FileMode) error {
-	return MkdirAll(path, perm)
-}
-
-// MkdirAll creates a directory named path along with any necessary parents,
-// with permission specified by attribute perm for all dir created.
-func MkdirAll(path string, perm os.FileMode) error {
-	return os.MkdirAll(path, perm)
-}
-
-// IsAbs is a platform-specific wrapper for filepath.IsAbs.
-func IsAbs(path string) bool {
-	return filepath.IsAbs(path)
-}
-
-// The functions below here are wrappers for the equivalents in the os and ioutils packages.
-// They are passthrough on Unix platforms, and only relevant on Windows.
-
-// CreateSequential creates the named file with mode 0666 (before umask), truncating
-// it if it already exists. If successful, methods on the returned
-// File can be used for I/O; the associated file descriptor has mode
-// O_RDWR.
-// If there is an error, it will be of type *PathError.
-func CreateSequential(name string) (*os.File, error) {
-	return os.Create(name)
-}
-
-// OpenSequential opens the named file for reading. If successful, methods on
-// the returned file can be used for reading; the associated file
-// descriptor has mode O_RDONLY.
-// If there is an error, it will be of type *PathError.
-func OpenSequential(name string) (*os.File, error) {
-	return os.Open(name)
-}
-
-// OpenFileSequential is the generalized open call; most users will use Open
-// or Create instead. It opens the named file with specified flag
-// (O_RDONLY etc.) and perm, (0666 etc.) if applicable. If successful,
-// methods on the returned File can be used for I/O.
-// If there is an error, it will be of type *PathError.
-func OpenFileSequential(name string, flag int, perm os.FileMode) (*os.File, error) {
-	return os.OpenFile(name, flag, perm)
-}
-
-// TempFileSequential creates a new temporary file in the directory dir
-// with a name beginning with prefix, opens the file for reading
-// and writing, and returns the resulting *os.File.
-// If dir is the empty string, TempFile uses the default directory
-// for temporary files (see os.TempDir).
-// Multiple programs calling TempFile simultaneously
-// will not choose the same file. The caller can use f.Name()
-// to find the pathname of the file. It is the caller's responsibility
-// to remove the file when no longer needed.
-func TempFileSequential(dir, prefix string) (f *os.File, err error) {
-	return ioutil.TempFile(dir, prefix)
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/filesys_windows.go b/vendor/github.com/docker/docker/pkg/system/filesys_windows.go
deleted file mode 100644
index 626d2ad886..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/filesys_windows.go
+++ /dev/null
@@ -1,291 +0,0 @@
-// +build windows
-
-package system
-
-import (
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-	"unsafe"
-
-	winio "github.com/Microsoft/go-winio"
-)
-
-// MkdirAllWithACL is a wrapper for MkdirAll that creates a directory
-// ACL'd for Builtin Administrators and Local System.
-func MkdirAllWithACL(path string, perm os.FileMode) error {
-	return mkdirall(path, true)
-}
-
-// MkdirAll implementation that is volume path aware for Windows.
-func MkdirAll(path string, _ os.FileMode) error {
-	return mkdirall(path, false)
-}
-
-// mkdirall is a custom version of os.MkdirAll modified for use on Windows
-// so that it is both volume path aware, and can create a directory with
-// a DACL.
-func mkdirall(path string, adminAndLocalSystem bool) error {
-	if re := regexp.MustCompile(`^\\\\\?\\Volume{[a-z0-9-]+}$`); re.MatchString(path) {
-		return nil
-	}
-
-	// The rest of this method is largely copied from os.MkdirAll and should be kept
-	// as-is to ensure compatibility.
-
-	// Fast path: if we can tell whether path is a directory or file, stop with success or error.
-	dir, err := os.Stat(path)
-	if err == nil {
-		if dir.IsDir() {
-			return nil
-		}
-		return &os.PathError{
-			Op:   "mkdir",
-			Path: path,
-			Err:  syscall.ENOTDIR,
-		}
-	}
-
-	// Slow path: make sure parent exists and then call Mkdir for path.
-	i := len(path)
-	for i > 0 && os.IsPathSeparator(path[i-1]) { // Skip trailing path separator.
-		i--
-	}
-
-	j := i
-	for j > 0 && !os.IsPathSeparator(path[j-1]) { // Scan backward over element.
-		j--
-	}
-
-	if j > 1 {
-		// Create parent
-		err = mkdirall(path[0:j-1], false)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Parent now exists; invoke os.Mkdir or mkdirWithACL and use its result.
-	if adminAndLocalSystem {
-		err = mkdirWithACL(path)
-	} else {
-		err = os.Mkdir(path, 0)
-	}
-
-	if err != nil {
-		// Handle arguments like "foo/." by
-		// double-checking that directory doesn't exist.
-		dir, err1 := os.Lstat(path)
-		if err1 == nil && dir.IsDir() {
-			return nil
-		}
-		return err
-	}
-	return nil
-}
-
-// mkdirWithACL creates a new directory. If there is an error, it will be of
-// type *PathError. .
-//
-// This is a modified and combined version of os.Mkdir and syscall.Mkdir
-// in golang to cater for creating a directory am ACL permitting full
-// access, with inheritance, to any subfolder/file for Built-in Administrators
-// and Local System.
-func mkdirWithACL(name string) error {
-	sa := syscall.SecurityAttributes{Length: 0}
-	sddl := "D:P(A;OICI;GA;;;BA)(A;OICI;GA;;;SY)"
-	sd, err := winio.SddlToSecurityDescriptor(sddl)
-	if err != nil {
-		return &os.PathError{Op: "mkdir", Path: name, Err: err}
-	}
-	sa.Length = uint32(unsafe.Sizeof(sa))
-	sa.InheritHandle = 1
-	sa.SecurityDescriptor = uintptr(unsafe.Pointer(&sd[0]))
-
-	namep, err := syscall.UTF16PtrFromString(name)
-	if err != nil {
-		return &os.PathError{Op: "mkdir", Path: name, Err: err}
-	}
-
-	e := syscall.CreateDirectory(namep, &sa)
-	if e != nil {
-		return &os.PathError{Op: "mkdir", Path: name, Err: e}
-	}
-	return nil
-}
-
-// IsAbs is a platform-specific wrapper for filepath.IsAbs. On Windows,
-// golang filepath.IsAbs does not consider a path \windows\system32 as absolute
-// as it doesn't start with a drive-letter/colon combination. However, in
-// docker we need to verify things such as WORKDIR /windows/system32 in
-// a Dockerfile (which gets translated to \windows\system32 when being processed
-// by the daemon. This SHOULD be treated as absolute from a docker processing
-// perspective.
-func IsAbs(path string) bool {
-	if !filepath.IsAbs(path) {
-		if !strings.HasPrefix(path, string(os.PathSeparator)) {
-			return false
-		}
-	}
-	return true
-}
-
-// The origin of the functions below here are the golang OS and syscall packages,
-// slightly modified to only cope with files, not directories due to the
-// specific use case.
-//
-// The alteration is to allow a file on Windows to be opened with
-// FILE_FLAG_SEQUENTIAL_SCAN (particular for docker load), to avoid eating
-// the standby list, particularly when accessing large files such as layer.tar.
-
-// CreateSequential creates the named file with mode 0666 (before umask), truncating
-// it if it already exists. If successful, methods on the returned
-// File can be used for I/O; the associated file descriptor has mode
-// O_RDWR.
-// If there is an error, it will be of type *PathError.
-func CreateSequential(name string) (*os.File, error) {
-	return OpenFileSequential(name, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0)
-}
-
-// OpenSequential opens the named file for reading. If successful, methods on
-// the returned file can be used for reading; the associated file
-// descriptor has mode O_RDONLY.
-// If there is an error, it will be of type *PathError.
-func OpenSequential(name string) (*os.File, error) {
-	return OpenFileSequential(name, os.O_RDONLY, 0)
-}
-
-// OpenFileSequential is the generalized open call; most users will use Open
-// or Create instead.
-// If there is an error, it will be of type *PathError.
-func OpenFileSequential(name string, flag int, _ os.FileMode) (*os.File, error) {
-	if name == "" {
-		return nil, &os.PathError{Op: "open", Path: name, Err: syscall.ENOENT}
-	}
-	r, errf := syscallOpenFileSequential(name, flag, 0)
-	if errf == nil {
-		return r, nil
-	}
-	return nil, &os.PathError{Op: "open", Path: name, Err: errf}
-}
-
-func syscallOpenFileSequential(name string, flag int, _ os.FileMode) (file *os.File, err error) {
-	r, e := syscallOpenSequential(name, flag|syscall.O_CLOEXEC, 0)
-	if e != nil {
-		return nil, e
-	}
-	return os.NewFile(uintptr(r), name), nil
-}
-
-func makeInheritSa() *syscall.SecurityAttributes {
-	var sa syscall.SecurityAttributes
-	sa.Length = uint32(unsafe.Sizeof(sa))
-	sa.InheritHandle = 1
-	return &sa
-}
-
-func syscallOpenSequential(path string, mode int, _ uint32) (fd syscall.Handle, err error) {
-	if len(path) == 0 {
-		return syscall.InvalidHandle, syscall.ERROR_FILE_NOT_FOUND
-	}
-	pathp, err := syscall.UTF16PtrFromString(path)
-	if err != nil {
-		return syscall.InvalidHandle, err
-	}
-	var access uint32
-	switch mode & (syscall.O_RDONLY | syscall.O_WRONLY | syscall.O_RDWR) {
-	case syscall.O_RDONLY:
-		access = syscall.GENERIC_READ
-	case syscall.O_WRONLY:
-		access = syscall.GENERIC_WRITE
-	case syscall.O_RDWR:
-		access = syscall.GENERIC_READ | syscall.GENERIC_WRITE
-	}
-	if mode&syscall.O_CREAT != 0 {
-		access |= syscall.GENERIC_WRITE
-	}
-	if mode&syscall.O_APPEND != 0 {
-		access &^= syscall.GENERIC_WRITE
-		access |= syscall.FILE_APPEND_DATA
-	}
-	sharemode := uint32(syscall.FILE_SHARE_READ | syscall.FILE_SHARE_WRITE)
-	var sa *syscall.SecurityAttributes
-	if mode&syscall.O_CLOEXEC == 0 {
-		sa = makeInheritSa()
-	}
-	var createmode uint32
-	switch {
-	case mode&(syscall.O_CREAT|syscall.O_EXCL) == (syscall.O_CREAT | syscall.O_EXCL):
-		createmode = syscall.CREATE_NEW
-	case mode&(syscall.O_CREAT|syscall.O_TRUNC) == (syscall.O_CREAT | syscall.O_TRUNC):
-		createmode = syscall.CREATE_ALWAYS
-	case mode&syscall.O_CREAT == syscall.O_CREAT:
-		createmode = syscall.OPEN_ALWAYS
-	case mode&syscall.O_TRUNC == syscall.O_TRUNC:
-		createmode = syscall.TRUNCATE_EXISTING
-	default:
-		createmode = syscall.OPEN_EXISTING
-	}
-	// Use FILE_FLAG_SEQUENTIAL_SCAN rather than FILE_ATTRIBUTE_NORMAL as implemented in golang.
-	//https://msdn.microsoft.com/en-us/library/windows/desktop/aa363858(v=vs.85).aspx
-	const fileFlagSequentialScan = 0x08000000 // FILE_FLAG_SEQUENTIAL_SCAN
-	h, e := syscall.CreateFile(pathp, access, sharemode, sa, createmode, fileFlagSequentialScan, 0)
-	return h, e
-}
-
-// Helpers for TempFileSequential
-var rand uint32
-var randmu sync.Mutex
-
-func reseed() uint32 {
-	return uint32(time.Now().UnixNano() + int64(os.Getpid()))
-}
-func nextSuffix() string {
-	randmu.Lock()
-	r := rand
-	if r == 0 {
-		r = reseed()
-	}
-	r = r*1664525 + 1013904223 // constants from Numerical Recipes
-	rand = r
-	randmu.Unlock()
-	return strconv.Itoa(int(1e9 + r%1e9))[1:]
-}
-
-// TempFileSequential is a copy of ioutil.TempFile, modified to use sequential
-// file access. Below is the original comment from golang:
-// TempFile creates a new temporary file in the directory dir
-// with a name beginning with prefix, opens the file for reading
-// and writing, and returns the resulting *os.File.
-// If dir is the empty string, TempFile uses the default directory
-// for temporary files (see os.TempDir).
-// Multiple programs calling TempFile simultaneously
-// will not choose the same file. The caller can use f.Name()
-// to find the pathname of the file. It is the caller's responsibility
-// to remove the file when no longer needed.
-func TempFileSequential(dir, prefix string) (f *os.File, err error) {
-	if dir == "" {
-		dir = os.TempDir()
-	}
-
-	nconflict := 0
-	for i := 0; i < 10000; i++ {
-		name := filepath.Join(dir, prefix+nextSuffix())
-		f, err = OpenFileSequential(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
-		if os.IsExist(err) {
-			if nconflict++; nconflict > 10 {
-				randmu.Lock()
-				rand = reseed()
-				randmu.Unlock()
-			}
-			continue
-		}
-		break
-	}
-	return
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/lstat_unix.go b/vendor/github.com/docker/docker/pkg/system/lstat_unix.go
deleted file mode 100644
index 62fda5bacf..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/lstat_unix.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build !windows
-
-package system
-
-import "syscall"
-
-// Lstat takes a path to a file and returns
-// a system.StatT type pertaining to that file.
-//
-// Throws an error if the file does not exist
-func Lstat(path string) (*StatT, error) {
-	s := &syscall.Stat_t{}
-	if err := syscall.Lstat(path, s); err != nil {
-		return nil, err
-	}
-	return fromStatT(s)
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/lstat_windows.go b/vendor/github.com/docker/docker/pkg/system/lstat_windows.go
deleted file mode 100644
index e51df0dafe..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/lstat_windows.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package system
-
-import "os"
-
-// Lstat calls os.Lstat to get a fileinfo interface back.
-// This is then copied into our own locally defined structure.
-func Lstat(path string) (*StatT, error) {
-	fi, err := os.Lstat(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return fromStatT(&fi)
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/meminfo.go b/vendor/github.com/docker/docker/pkg/system/meminfo.go
deleted file mode 100644
index 3b6e947e67..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/meminfo.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package system
-
-// MemInfo contains memory statistics of the host system.
-type MemInfo struct {
-	// Total usable RAM (i.e. physical RAM minus a few reserved bits and the
-	// kernel binary code).
-	MemTotal int64
-
-	// Amount of free memory.
-	MemFree int64
-
-	// Total amount of swap space available.
-	SwapTotal int64
-
-	// Amount of swap space that is currently unused.
-	SwapFree int64
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/meminfo_linux.go b/vendor/github.com/docker/docker/pkg/system/meminfo_linux.go
deleted file mode 100644
index 385f1d5e73..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/meminfo_linux.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package system
-
-import (
-	"bufio"
-	"io"
-	"os"
-	"strconv"
-	"strings"
-
-	"github.com/docker/go-units"
-)
-
-// ReadMemInfo retrieves memory statistics of the host system and returns a
-// MemInfo type.
-func ReadMemInfo() (*MemInfo, error) {
-	file, err := os.Open("/proc/meminfo")
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-	return parseMemInfo(file)
-}
-
-// parseMemInfo parses the /proc/meminfo file into
-// a MemInfo object given an io.Reader to the file.
-// Throws error if there are problems reading from the file
-func parseMemInfo(reader io.Reader) (*MemInfo, error) {
-	meminfo := &MemInfo{}
-	scanner := bufio.NewScanner(reader)
-	for scanner.Scan() {
-		// Expected format: ["MemTotal:", "1234", "kB"]
-		parts := strings.Fields(scanner.Text())
-
-		// Sanity checks: Skip malformed entries.
-		if len(parts) < 3 || parts[2] != "kB" {
-			continue
-		}
-
-		// Convert to bytes.
-		size, err := strconv.Atoi(parts[1])
-		if err != nil {
-			continue
-		}
-		bytes := int64(size) * units.KiB
-
-		switch parts[0] {
-		case "MemTotal:":
-			meminfo.MemTotal = bytes
-		case "MemFree:":
-			meminfo.MemFree = bytes
-		case "SwapTotal:":
-			meminfo.SwapTotal = bytes
-		case "SwapFree:":
-			meminfo.SwapFree = bytes
-		}
-
-	}
-
-	// Handle errors that may have occurred during the reading of the file.
-	if err := scanner.Err(); err != nil {
-		return nil, err
-	}
-
-	return meminfo, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/meminfo_solaris.go b/vendor/github.com/docker/docker/pkg/system/meminfo_solaris.go
deleted file mode 100644
index 925776e789..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/meminfo_solaris.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// +build solaris,cgo
-
-package system
-
-import (
-	"fmt"
-	"unsafe"
-)
-
-// #cgo CFLAGS: -std=c99
-// #cgo LDFLAGS: -lkstat
-// #include <unistd.h>
-// #include <stdlib.h>
-// #include <stdio.h>
-// #include <kstat.h>
-// #include <sys/swap.h>
-// #include <sys/param.h>
-// struct swaptable *allocSwaptable(int num) {
-//	struct swaptable *st;
-//	struct swapent *swapent;
-// 	st = (struct swaptable *)malloc(num * sizeof(swapent_t) + sizeof (int));
-//	swapent = st->swt_ent;
-//	for (int i = 0; i < num; i++,swapent++) {
-//		swapent->ste_path = (char *)malloc(MAXPATHLEN * sizeof (char));
-//	}
-//	st->swt_n = num;
-//	return st;
-//}
-// void freeSwaptable (struct swaptable *st) {
-//	struct swapent *swapent = st->swt_ent;
-//	for (int i = 0; i < st->swt_n; i++,swapent++) {
-//		free(swapent->ste_path);
-//	}
-//	free(st);
-// }
-// swapent_t getSwapEnt(swapent_t *ent, int i) {
-//	return ent[i];
-// }
-// int64_t getPpKernel() {
-//	int64_t pp_kernel = 0;
-//	kstat_ctl_t *ksc;
-//	kstat_t *ks;
-//	kstat_named_t *knp;
-//	kid_t kid;
-//
-//	if ((ksc = kstat_open()) == NULL) {
-//		return -1;
-//	}
-//	if ((ks = kstat_lookup(ksc, "unix", 0, "system_pages")) == NULL) {
-//		return -1;
-//	}
-//	if (((kid = kstat_read(ksc, ks, NULL)) == -1) ||
-//	    ((knp = kstat_data_lookup(ks, "pp_kernel")) == NULL)) {
-//		return -1;
-//	}
-//	switch (knp->data_type) {
-//	case KSTAT_DATA_UINT64:
-//		pp_kernel = knp->value.ui64;
-//		break;
-//	case KSTAT_DATA_UINT32:
-//		pp_kernel = knp->value.ui32;
-//		break;
-//	}
-//	pp_kernel *= sysconf(_SC_PAGESIZE);
-//	return (pp_kernel > 0 ? pp_kernel : -1);
-// }
-import "C"
-
-// Get the system memory info using sysconf same as prtconf
-func getTotalMem() int64 {
-	pagesize := C.sysconf(C._SC_PAGESIZE)
-	npages := C.sysconf(C._SC_PHYS_PAGES)
-	return int64(pagesize * npages)
-}
-
-func getFreeMem() int64 {
-	pagesize := C.sysconf(C._SC_PAGESIZE)
-	npages := C.sysconf(C._SC_AVPHYS_PAGES)
-	return int64(pagesize * npages)
-}
-
-// ReadMemInfo retrieves memory statistics of the host system and returns a
-//  MemInfo type.
-func ReadMemInfo() (*MemInfo, error) {
-
-	ppKernel := C.getPpKernel()
-	MemTotal := getTotalMem()
-	MemFree := getFreeMem()
-	SwapTotal, SwapFree, err := getSysSwap()
-
-	if ppKernel < 0 || MemTotal < 0 || MemFree < 0 || SwapTotal < 0 ||
-		SwapFree < 0 {
-		return nil, fmt.Errorf("error getting system memory info %v\n", err)
-	}
-
-	meminfo := &MemInfo{}
-	// Total memory is total physical memory less than memory locked by kernel
-	meminfo.MemTotal = MemTotal - int64(ppKernel)
-	meminfo.MemFree = MemFree
-	meminfo.SwapTotal = SwapTotal
-	meminfo.SwapFree = SwapFree
-
-	return meminfo, nil
-}
-
-func getSysSwap() (int64, int64, error) {
-	var tSwap int64
-	var fSwap int64
-	var diskblksPerPage int64
-	num, err := C.swapctl(C.SC_GETNSWP, nil)
-	if err != nil {
-		return -1, -1, err
-	}
-	st := C.allocSwaptable(num)
-	_, err = C.swapctl(C.SC_LIST, unsafe.Pointer(st))
-	if err != nil {
-		C.freeSwaptable(st)
-		return -1, -1, err
-	}
-
-	diskblksPerPage = int64(C.sysconf(C._SC_PAGESIZE) >> C.DEV_BSHIFT)
-	for i := 0; i < int(num); i++ {
-		swapent := C.getSwapEnt(&st.swt_ent[0], C.int(i))
-		tSwap += int64(swapent.ste_pages) * diskblksPerPage
-		fSwap += int64(swapent.ste_free) * diskblksPerPage
-	}
-	C.freeSwaptable(st)
-	return tSwap, fSwap, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/meminfo_unsupported.go b/vendor/github.com/docker/docker/pkg/system/meminfo_unsupported.go
deleted file mode 100644
index 3ce019dffd..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/meminfo_unsupported.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !linux,!windows,!solaris
-
-package system
-
-// ReadMemInfo is not supported on platforms other than linux and windows.
-func ReadMemInfo() (*MemInfo, error) {
-	return nil, ErrNotSupportedPlatform
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/meminfo_windows.go b/vendor/github.com/docker/docker/pkg/system/meminfo_windows.go
deleted file mode 100644
index 883944a4c5..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/meminfo_windows.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package system
-
-import (
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-var (
-	modkernel32 = windows.NewLazySystemDLL("kernel32.dll")
-
-	procGlobalMemoryStatusEx = modkernel32.NewProc("GlobalMemoryStatusEx")
-)
-
-// https://msdn.microsoft.com/en-us/library/windows/desktop/aa366589(v=vs.85).aspx
-// https://msdn.microsoft.com/en-us/library/windows/desktop/aa366770(v=vs.85).aspx
-type memorystatusex struct {
-	dwLength                uint32
-	dwMemoryLoad            uint32
-	ullTotalPhys            uint64
-	ullAvailPhys            uint64
-	ullTotalPageFile        uint64
-	ullAvailPageFile        uint64
-	ullTotalVirtual         uint64
-	ullAvailVirtual         uint64
-	ullAvailExtendedVirtual uint64
-}
-
-// ReadMemInfo retrieves memory statistics of the host system and returns a
-//  MemInfo type.
-func ReadMemInfo() (*MemInfo, error) {
-	msi := &memorystatusex{
-		dwLength: 64,
-	}
-	r1, _, _ := procGlobalMemoryStatusEx.Call(uintptr(unsafe.Pointer(msi)))
-	if r1 == 0 {
-		return &MemInfo{}, nil
-	}
-	return &MemInfo{
-		MemTotal:  int64(msi.ullTotalPhys),
-		MemFree:   int64(msi.ullAvailPhys),
-		SwapTotal: int64(msi.ullTotalPageFile),
-		SwapFree:  int64(msi.ullAvailPageFile),
-	}, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/mknod.go b/vendor/github.com/docker/docker/pkg/system/mknod.go
deleted file mode 100644
index 73958182b4..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/mknod.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"syscall"
-)
-
-// Mknod creates a filesystem node (file, device special file or named pipe) named path
-// with attributes specified by mode and dev.
-func Mknod(path string, mode uint32, dev int) error {
-	return syscall.Mknod(path, mode, dev)
-}
-
-// Mkdev is used to build the value of linux devices (in /dev/) which specifies major
-// and minor number of the newly created device special file.
-// Linux device nodes are a bit weird due to backwards compat with 16 bit device nodes.
-// They are, from low to high: the lower 8 bits of the minor, then 12 bits of the major,
-// then the top 12 bits of the minor.
-func Mkdev(major int64, minor int64) uint32 {
-	return uint32(((minor & 0xfff00) << 12) | ((major & 0xfff) << 8) | (minor & 0xff))
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/mknod_windows.go b/vendor/github.com/docker/docker/pkg/system/mknod_windows.go
deleted file mode 100644
index 2e863c0215..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/mknod_windows.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build windows
-
-package system
-
-// Mknod is not implemented on Windows.
-func Mknod(path string, mode uint32, dev int) error {
-	return ErrNotSupportedPlatform
-}
-
-// Mkdev is not implemented on Windows.
-func Mkdev(major int64, minor int64) uint32 {
-	panic("Mkdev not implemented on Windows.")
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/path_unix.go b/vendor/github.com/docker/docker/pkg/system/path_unix.go
deleted file mode 100644
index c607c4db09..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/path_unix.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !windows
-
-package system
-
-// DefaultPathEnv is unix style list of directories to search for
-// executables. Each directory is separated from the next by a colon
-// ':' character .
-const DefaultPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-
-// CheckSystemDriveAndRemoveDriveLetter verifies that a path, if it includes a drive letter,
-// is the system drive. This is a no-op on Linux.
-func CheckSystemDriveAndRemoveDriveLetter(path string) (string, error) {
-	return path, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/path_windows.go b/vendor/github.com/docker/docker/pkg/system/path_windows.go
deleted file mode 100644
index cbfe2c1576..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/path_windows.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build windows
-
-package system
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-)
-
-// DefaultPathEnv is deliberately empty on Windows as the default path will be set by
-// the container. Docker has no context of what the default path should be.
-const DefaultPathEnv = ""
-
-// CheckSystemDriveAndRemoveDriveLetter verifies and manipulates a Windows path.
-// This is used, for example, when validating a user provided path in docker cp.
-// If a drive letter is supplied, it must be the system drive. The drive letter
-// is always removed. Also, it translates it to OS semantics (IOW / to \). We
-// need the path in this syntax so that it can ultimately be contatenated with
-// a Windows long-path which doesn't support drive-letters. Examples:
-// C:			--> Fail
-// C:\			--> \
-// a			--> a
-// /a			--> \a
-// d:\			--> Fail
-func CheckSystemDriveAndRemoveDriveLetter(path string) (string, error) {
-	if len(path) == 2 && string(path[1]) == ":" {
-		return "", fmt.Errorf("No relative path specified in %q", path)
-	}
-	if !filepath.IsAbs(path) || len(path) < 2 {
-		return filepath.FromSlash(path), nil
-	}
-	if string(path[1]) == ":" && !strings.EqualFold(string(path[0]), "c") {
-		return "", fmt.Errorf("The specified path is not on the system drive (C:)")
-	}
-	return filepath.FromSlash(path[2:]), nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/process_unix.go b/vendor/github.com/docker/docker/pkg/system/process_unix.go
deleted file mode 100644
index c99d796d13..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/process_unix.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// +build linux freebsd solaris darwin
-
-package system
-
-import (
-	"syscall"
-)
-
-// IsProcessAlive returns true if process with a given pid is running.
-func IsProcessAlive(pid int) bool {
-	err := syscall.Kill(pid, syscall.Signal(0))
-	if err == nil || err == syscall.EPERM {
-		return true
-	}
-
-	return false
-}
-
-// KillProcess force-stops a process.
-func KillProcess(pid int) {
-	syscall.Kill(pid, syscall.SIGKILL)
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/stat_darwin.go b/vendor/github.com/docker/docker/pkg/system/stat_darwin.go
deleted file mode 100644
index 715f05b938..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/stat_darwin.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package system
-
-import "syscall"
-
-// fromStatT converts a syscall.Stat_t type to a system.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: uint32(s.Mode),
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: uint64(s.Rdev),
-		mtim: s.Mtimespec}, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/stat_freebsd.go b/vendor/github.com/docker/docker/pkg/system/stat_freebsd.go
deleted file mode 100644
index 715f05b938..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/stat_freebsd.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package system
-
-import "syscall"
-
-// fromStatT converts a syscall.Stat_t type to a system.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: uint32(s.Mode),
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: uint64(s.Rdev),
-		mtim: s.Mtimespec}, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/stat_linux.go b/vendor/github.com/docker/docker/pkg/system/stat_linux.go
deleted file mode 100644
index 66bf6e28ee..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/stat_linux.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package system
-
-import "syscall"
-
-// fromStatT converts a syscall.Stat_t type to a system.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: uint32(s.Mode),
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: uint64(s.Rdev),
-		mtim: s.Mtim}, nil
-}
-
-// FromStatT converts a syscall.Stat_t type to a system.Stat_t type
-// This is exposed on Linux as pkg/archive/changes uses it.
-func FromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return fromStatT(s)
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/stat_openbsd.go b/vendor/github.com/docker/docker/pkg/system/stat_openbsd.go
deleted file mode 100644
index b607dea946..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/stat_openbsd.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package system
-
-import "syscall"
-
-// fromStatT converts a syscall.Stat_t type to a system.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: uint32(s.Mode),
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: uint64(s.Rdev),
-		mtim: s.Mtim}, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/stat_solaris.go b/vendor/github.com/docker/docker/pkg/system/stat_solaris.go
deleted file mode 100644
index b607dea946..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/stat_solaris.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package system
-
-import "syscall"
-
-// fromStatT converts a syscall.Stat_t type to a system.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: uint32(s.Mode),
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: uint64(s.Rdev),
-		mtim: s.Mtim}, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/stat_unix.go b/vendor/github.com/docker/docker/pkg/system/stat_unix.go
deleted file mode 100644
index 6208e74606..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/stat_unix.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// +build !windows
-
-package system
-
-import "syscall"
-
-// StatT type contains status of a file. It contains metadata
-// like permission, owner, group, size, etc about a file.
-type StatT struct {
-	mode uint32
-	uid  uint32
-	gid  uint32
-	rdev uint64
-	size int64
-	mtim syscall.Timespec
-}
-
-// Mode returns file's permission mode.
-func (s StatT) Mode() uint32 {
-	return s.mode
-}
-
-// UID returns file's user id of owner.
-func (s StatT) UID() uint32 {
-	return s.uid
-}
-
-// GID returns file's group id of owner.
-func (s StatT) GID() uint32 {
-	return s.gid
-}
-
-// Rdev returns file's device ID (if it's special file).
-func (s StatT) Rdev() uint64 {
-	return s.rdev
-}
-
-// Size returns file's size.
-func (s StatT) Size() int64 {
-	return s.size
-}
-
-// Mtim returns file's last modification time.
-func (s StatT) Mtim() syscall.Timespec {
-	return s.mtim
-}
-
-// Stat takes a path to a file and returns
-// a system.StatT type pertaining to that file.
-//
-// Throws an error if the file does not exist
-func Stat(path string) (*StatT, error) {
-	s := &syscall.Stat_t{}
-	if err := syscall.Stat(path, s); err != nil {
-		return nil, err
-	}
-	return fromStatT(s)
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/stat_windows.go b/vendor/github.com/docker/docker/pkg/system/stat_windows.go
deleted file mode 100644
index 6c63972682..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/stat_windows.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package system
-
-import (
-	"os"
-	"time"
-)
-
-// StatT type contains status of a file. It contains metadata
-// like permission, size, etc about a file.
-type StatT struct {
-	mode os.FileMode
-	size int64
-	mtim time.Time
-}
-
-// Size returns file's size.
-func (s StatT) Size() int64 {
-	return s.size
-}
-
-// Mode returns file's permission mode.
-func (s StatT) Mode() os.FileMode {
-	return os.FileMode(s.mode)
-}
-
-// Mtim returns file's last modification time.
-func (s StatT) Mtim() time.Time {
-	return time.Time(s.mtim)
-}
-
-// Stat takes a path to a file and returns
-// a system.StatT type pertaining to that file.
-//
-// Throws an error if the file does not exist
-func Stat(path string) (*StatT, error) {
-	fi, err := os.Stat(path)
-	if err != nil {
-		return nil, err
-	}
-	return fromStatT(&fi)
-}
-
-// fromStatT converts a os.FileInfo type to a system.StatT type
-func fromStatT(fi *os.FileInfo) (*StatT, error) {
-	return &StatT{
-		size: (*fi).Size(),
-		mode: (*fi).Mode(),
-		mtim: (*fi).ModTime()}, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/syscall_unix.go b/vendor/github.com/docker/docker/pkg/system/syscall_unix.go
deleted file mode 100644
index 3ae9128468..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/syscall_unix.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build linux freebsd
-
-package system
-
-import "syscall"
-
-// Unmount is a platform-specific helper function to call
-// the unmount syscall.
-func Unmount(dest string) error {
-	return syscall.Unmount(dest, 0)
-}
-
-// CommandLineToArgv should not be used on Unix.
-// It simply returns commandLine in the only element in the returned array.
-func CommandLineToArgv(commandLine string) ([]string, error) {
-	return []string{commandLine}, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/syscall_windows.go b/vendor/github.com/docker/docker/pkg/system/syscall_windows.go
deleted file mode 100644
index 1f311874f4..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/syscall_windows.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package system
-
-import (
-	"syscall"
-	"unsafe"
-
-	"github.com/Sirupsen/logrus"
-)
-
-var (
-	ntuserApiset      = syscall.NewLazyDLL("ext-ms-win-ntuser-window-l1-1-0")
-	procGetVersionExW = modkernel32.NewProc("GetVersionExW")
-)
-
-// OSVersion is a wrapper for Windows version information
-// https://msdn.microsoft.com/en-us/library/windows/desktop/ms724439(v=vs.85).aspx
-type OSVersion struct {
-	Version      uint32
-	MajorVersion uint8
-	MinorVersion uint8
-	Build        uint16
-}
-
-// https://msdn.microsoft.com/en-us/library/windows/desktop/ms724833(v=vs.85).aspx
-type osVersionInfoEx struct {
-	OSVersionInfoSize uint32
-	MajorVersion      uint32
-	MinorVersion      uint32
-	BuildNumber       uint32
-	PlatformID        uint32
-	CSDVersion        [128]uint16
-	ServicePackMajor  uint16
-	ServicePackMinor  uint16
-	SuiteMask         uint16
-	ProductType       byte
-	Reserve           byte
-}
-
-// GetOSVersion gets the operating system version on Windows. Note that
-// docker.exe must be manifested to get the correct version information.
-func GetOSVersion() OSVersion {
-	var err error
-	osv := OSVersion{}
-	osv.Version, err = syscall.GetVersion()
-	if err != nil {
-		// GetVersion never fails.
-		panic(err)
-	}
-	osv.MajorVersion = uint8(osv.Version & 0xFF)
-	osv.MinorVersion = uint8(osv.Version >> 8 & 0xFF)
-	osv.Build = uint16(osv.Version >> 16)
-	return osv
-}
-
-// IsWindowsClient returns true if the SKU is client
-// @engine maintainers - this function should not be removed or modified as it
-// is used to enforce licensing restrictions on Windows.
-func IsWindowsClient() bool {
-	osviex := &osVersionInfoEx{OSVersionInfoSize: 284}
-	r1, _, err := procGetVersionExW.Call(uintptr(unsafe.Pointer(osviex)))
-	if r1 == 0 {
-		logrus.Warnf("GetVersionExW failed - assuming server SKU: %v", err)
-		return false
-	}
-	const verNTWorkstation = 0x00000001
-	return osviex.ProductType == verNTWorkstation
-}
-
-// Unmount is a platform-specific helper function to call
-// the unmount syscall. Not supported on Windows
-func Unmount(dest string) error {
-	return nil
-}
-
-// CommandLineToArgv wraps the Windows syscall to turn a commandline into an argument array.
-func CommandLineToArgv(commandLine string) ([]string, error) {
-	var argc int32
-
-	argsPtr, err := syscall.UTF16PtrFromString(commandLine)
-	if err != nil {
-		return nil, err
-	}
-
-	argv, err := syscall.CommandLineToArgv(argsPtr, &argc)
-	if err != nil {
-		return nil, err
-	}
-	defer syscall.LocalFree(syscall.Handle(uintptr(unsafe.Pointer(argv))))
-
-	newArgs := make([]string, argc)
-	for i, v := range (*argv)[:argc] {
-		newArgs[i] = string(syscall.UTF16ToString((*v)[:]))
-	}
-
-	return newArgs, nil
-}
-
-// HasWin32KSupport determines whether containers that depend on win32k can
-// run on this machine. Win32k is the driver used to implement windowing.
-func HasWin32KSupport() bool {
-	// For now, check for ntuser API support on the host. In the future, a host
-	// may support win32k in containers even if the host does not support ntuser
-	// APIs.
-	return ntuserApiset.Load() == nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/umask.go b/vendor/github.com/docker/docker/pkg/system/umask.go
deleted file mode 100644
index 3d0146b01a..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/umask.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"syscall"
-)
-
-// Umask sets current process's file mode creation mask to newmask
-// and returns oldmask.
-func Umask(newmask int) (oldmask int, err error) {
-	return syscall.Umask(newmask), nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/umask_windows.go b/vendor/github.com/docker/docker/pkg/system/umask_windows.go
deleted file mode 100644
index 13f1de1769..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/umask_windows.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build windows
-
-package system
-
-// Umask is not supported on the windows platform.
-func Umask(newmask int) (oldmask int, err error) {
-	// should not be called on cli code path
-	return 0, ErrNotSupportedPlatform
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/utimes_freebsd.go b/vendor/github.com/docker/docker/pkg/system/utimes_freebsd.go
deleted file mode 100644
index e2eac3b553..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/utimes_freebsd.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package system
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// LUtimesNano is used to change access and modification time of the specified path.
-// It's used for symbol link file because syscall.UtimesNano doesn't support a NOFOLLOW flag atm.
-func LUtimesNano(path string, ts []syscall.Timespec) error {
-	var _path *byte
-	_path, err := syscall.BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-
-	if _, _, err := syscall.Syscall(syscall.SYS_LUTIMES, uintptr(unsafe.Pointer(_path)), uintptr(unsafe.Pointer(&ts[0])), 0); err != 0 && err != syscall.ENOSYS {
-		return err
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/utimes_linux.go b/vendor/github.com/docker/docker/pkg/system/utimes_linux.go
deleted file mode 100644
index fc8a1aba95..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/utimes_linux.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package system
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// LUtimesNano is used to change access and modification time of the specified path.
-// It's used for symbol link file because syscall.UtimesNano doesn't support a NOFOLLOW flag atm.
-func LUtimesNano(path string, ts []syscall.Timespec) error {
-	// These are not currently available in syscall
-	atFdCwd := -100
-	atSymLinkNoFollow := 0x100
-
-	var _path *byte
-	_path, err := syscall.BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-
-	if _, _, err := syscall.Syscall6(syscall.SYS_UTIMENSAT, uintptr(atFdCwd), uintptr(unsafe.Pointer(_path)), uintptr(unsafe.Pointer(&ts[0])), uintptr(atSymLinkNoFollow), 0, 0); err != 0 && err != syscall.ENOSYS {
-		return err
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/utimes_unsupported.go b/vendor/github.com/docker/docker/pkg/system/utimes_unsupported.go
deleted file mode 100644
index 139714544d..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/utimes_unsupported.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build !linux,!freebsd
-
-package system
-
-import "syscall"
-
-// LUtimesNano is only supported on linux and freebsd.
-func LUtimesNano(path string, ts []syscall.Timespec) error {
-	return ErrNotSupportedPlatform
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/xattrs_linux.go b/vendor/github.com/docker/docker/pkg/system/xattrs_linux.go
deleted file mode 100644
index d2e2c05799..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/xattrs_linux.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package system
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// Lgetxattr retrieves the value of the extended attribute identified by attr
-// and associated with the given path in the file system.
-// It will returns a nil slice and nil error if the xattr is not set.
-func Lgetxattr(path string, attr string) ([]byte, error) {
-	pathBytes, err := syscall.BytePtrFromString(path)
-	if err != nil {
-		return nil, err
-	}
-	attrBytes, err := syscall.BytePtrFromString(attr)
-	if err != nil {
-		return nil, err
-	}
-
-	dest := make([]byte, 128)
-	destBytes := unsafe.Pointer(&dest[0])
-	sz, _, errno := syscall.Syscall6(syscall.SYS_LGETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(destBytes), uintptr(len(dest)), 0, 0)
-	if errno == syscall.ENODATA {
-		return nil, nil
-	}
-	if errno == syscall.ERANGE {
-		dest = make([]byte, sz)
-		destBytes := unsafe.Pointer(&dest[0])
-		sz, _, errno = syscall.Syscall6(syscall.SYS_LGETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(destBytes), uintptr(len(dest)), 0, 0)
-	}
-	if errno != 0 {
-		return nil, errno
-	}
-
-	return dest[:sz], nil
-}
-
-var _zero uintptr
-
-// Lsetxattr sets the value of the extended attribute identified by attr
-// and associated with the given path in the file system.
-func Lsetxattr(path string, attr string, data []byte, flags int) error {
-	pathBytes, err := syscall.BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	attrBytes, err := syscall.BytePtrFromString(attr)
-	if err != nil {
-		return err
-	}
-	var dataBytes unsafe.Pointer
-	if len(data) > 0 {
-		dataBytes = unsafe.Pointer(&data[0])
-	} else {
-		dataBytes = unsafe.Pointer(&_zero)
-	}
-	_, _, errno := syscall.Syscall6(syscall.SYS_LSETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(dataBytes), uintptr(len(data)), uintptr(flags), 0)
-	if errno != 0 {
-		return errno
-	}
-	return nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/system/xattrs_unsupported.go b/vendor/github.com/docker/docker/pkg/system/xattrs_unsupported.go
deleted file mode 100644
index 0114f2227c..0000000000
--- a/vendor/github.com/docker/docker/pkg/system/xattrs_unsupported.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build !linux
-
-package system
-
-// Lgetxattr is not supported on platforms other than linux.
-func Lgetxattr(path string, attr string) ([]byte, error) {
-	return nil, ErrNotSupportedPlatform
-}
-
-// Lsetxattr is not supported on platforms other than linux.
-func Lsetxattr(path string, attr string, data []byte, flags int) error {
-	return ErrNotSupportedPlatform
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/ascii.go b/vendor/github.com/docker/docker/pkg/term/ascii.go
deleted file mode 100644
index f5262bccf5..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/ascii.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package term
-
-import (
-	"fmt"
-	"strings"
-)
-
-// ASCII list the possible supported ASCII key sequence
-var ASCII = []string{
-	"ctrl-@",
-	"ctrl-a",
-	"ctrl-b",
-	"ctrl-c",
-	"ctrl-d",
-	"ctrl-e",
-	"ctrl-f",
-	"ctrl-g",
-	"ctrl-h",
-	"ctrl-i",
-	"ctrl-j",
-	"ctrl-k",
-	"ctrl-l",
-	"ctrl-m",
-	"ctrl-n",
-	"ctrl-o",
-	"ctrl-p",
-	"ctrl-q",
-	"ctrl-r",
-	"ctrl-s",
-	"ctrl-t",
-	"ctrl-u",
-	"ctrl-v",
-	"ctrl-w",
-	"ctrl-x",
-	"ctrl-y",
-	"ctrl-z",
-	"ctrl-[",
-	"ctrl-\\",
-	"ctrl-]",
-	"ctrl-^",
-	"ctrl-_",
-}
-
-// ToBytes converts a string representing a suite of key-sequence to the corresponding ASCII code.
-func ToBytes(keys string) ([]byte, error) {
-	codes := []byte{}
-next:
-	for _, key := range strings.Split(keys, ",") {
-		if len(key) != 1 {
-			for code, ctrl := range ASCII {
-				if ctrl == key {
-					codes = append(codes, byte(code))
-					continue next
-				}
-			}
-			if key == "DEL" {
-				codes = append(codes, 127)
-			} else {
-				return nil, fmt.Errorf("Unknown character: '%s'", key)
-			}
-		} else {
-			codes = append(codes, byte(key[0]))
-		}
-	}
-	return codes, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/tc_linux_cgo.go b/vendor/github.com/docker/docker/pkg/term/tc_linux_cgo.go
deleted file mode 100644
index 59dac5ba8e..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/tc_linux_cgo.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// +build linux,cgo
-
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// #include <termios.h>
-import "C"
-
-// Termios is the Unix API for terminal I/O.
-// It is passthrough for syscall.Termios in order to make it portable with
-// other platforms where it is not available or handled differently.
-type Termios syscall.Termios
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	var oldState State
-	if err := tcget(fd, &oldState.termios); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-
-	C.cfmakeraw((*C.struct_termios)(unsafe.Pointer(&newState)))
-	if err := tcset(fd, &newState); err != 0 {
-		return nil, err
-	}
-	return &oldState, nil
-}
-
-func tcget(fd uintptr, p *Termios) syscall.Errno {
-	ret, err := C.tcgetattr(C.int(fd), (*C.struct_termios)(unsafe.Pointer(p)))
-	if ret != 0 {
-		return err.(syscall.Errno)
-	}
-	return 0
-}
-
-func tcset(fd uintptr, p *Termios) syscall.Errno {
-	ret, err := C.tcsetattr(C.int(fd), C.TCSANOW, (*C.struct_termios)(unsafe.Pointer(p)))
-	if ret != 0 {
-		return err.(syscall.Errno)
-	}
-	return 0
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/tc_other.go b/vendor/github.com/docker/docker/pkg/term/tc_other.go
deleted file mode 100644
index 750d7c3f60..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/tc_other.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// +build !windows
-// +build !linux !cgo
-// +build !solaris !cgo
-
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func tcget(fd uintptr, p *Termios) syscall.Errno {
-	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(getTermios), uintptr(unsafe.Pointer(p)))
-	return err
-}
-
-func tcset(fd uintptr, p *Termios) syscall.Errno {
-	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, setTermios, uintptr(unsafe.Pointer(p)))
-	return err
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/tc_solaris_cgo.go b/vendor/github.com/docker/docker/pkg/term/tc_solaris_cgo.go
deleted file mode 100644
index c9139d0ca8..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/tc_solaris_cgo.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// +build solaris,cgo
-
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// #include <termios.h>
-import "C"
-
-// Termios is the Unix API for terminal I/O.
-// It is passthrough for syscall.Termios in order to make it portable with
-// other platforms where it is not available or handled differently.
-type Termios syscall.Termios
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	var oldState State
-	if err := tcget(fd, &oldState.termios); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-
-	newState.Iflag &^= (syscall.IGNBRK | syscall.BRKINT | syscall.PARMRK | syscall.ISTRIP | syscall.INLCR | syscall.IGNCR | syscall.ICRNL | syscall.IXON | syscall.IXANY)
-	newState.Oflag &^= syscall.OPOST
-	newState.Lflag &^= (syscall.ECHO | syscall.ECHONL | syscall.ICANON | syscall.ISIG | syscall.IEXTEN)
-	newState.Cflag &^= (syscall.CSIZE | syscall.PARENB)
-	newState.Cflag |= syscall.CS8
-
-	/*
-		VMIN is the minimum number of characters that needs to be read in non-canonical mode for it to be returned
-		Since VMIN is overloaded with another element in canonical mode when we switch modes it defaults to 4. It
-		needs to be explicitly set to 1.
-	*/
-	newState.Cc[C.VMIN] = 1
-	newState.Cc[C.VTIME] = 0
-
-	if err := tcset(fd, &newState); err != 0 {
-		return nil, err
-	}
-	return &oldState, nil
-}
-
-func tcget(fd uintptr, p *Termios) syscall.Errno {
-	ret, err := C.tcgetattr(C.int(fd), (*C.struct_termios)(unsafe.Pointer(p)))
-	if ret != 0 {
-		return err.(syscall.Errno)
-	}
-	return 0
-}
-
-func tcset(fd uintptr, p *Termios) syscall.Errno {
-	ret, err := C.tcsetattr(C.int(fd), C.TCSANOW, (*C.struct_termios)(unsafe.Pointer(p)))
-	if ret != 0 {
-		return err.(syscall.Errno)
-	}
-	return 0
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/term.go b/vendor/github.com/docker/docker/pkg/term/term.go
deleted file mode 100644
index 816f8d7524..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/term.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// +build !windows
-
-// Package term provides structures and helper functions to work with
-// terminal (state, sizes).
-package term
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"os/signal"
-	"syscall"
-)
-
-var (
-	// ErrInvalidState is returned if the state of the terminal is invalid.
-	ErrInvalidState = errors.New("Invalid terminal state")
-)
-
-// State represents the state of the terminal.
-type State struct {
-	termios Termios
-}
-
-// Winsize represents the size of the terminal window.
-type Winsize struct {
-	Height uint16
-	Width  uint16
-	x      uint16
-	y      uint16
-}
-
-// StdStreams returns the standard streams (stdin, stdout, stderr).
-func StdStreams() (stdIn io.ReadCloser, stdOut, stdErr io.Writer) {
-	return os.Stdin, os.Stdout, os.Stderr
-}
-
-// GetFdInfo returns the file descriptor for an os.File and indicates whether the file represents a terminal.
-func GetFdInfo(in interface{}) (uintptr, bool) {
-	var inFd uintptr
-	var isTerminalIn bool
-	if file, ok := in.(*os.File); ok {
-		inFd = file.Fd()
-		isTerminalIn = IsTerminal(inFd)
-	}
-	return inFd, isTerminalIn
-}
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal(fd uintptr) bool {
-	var termios Termios
-	return tcget(fd, &termios) == 0
-}
-
-// RestoreTerminal restores the terminal connected to the given file descriptor
-// to a previous state.
-func RestoreTerminal(fd uintptr, state *State) error {
-	if state == nil {
-		return ErrInvalidState
-	}
-	if err := tcset(fd, &state.termios); err != 0 {
-		return err
-	}
-	return nil
-}
-
-// SaveState saves the state of the terminal connected to the given file descriptor.
-func SaveState(fd uintptr) (*State, error) {
-	var oldState State
-	if err := tcget(fd, &oldState.termios); err != 0 {
-		return nil, err
-	}
-
-	return &oldState, nil
-}
-
-// DisableEcho applies the specified state to the terminal connected to the file
-// descriptor, with echo disabled.
-func DisableEcho(fd uintptr, state *State) error {
-	newState := state.termios
-	newState.Lflag &^= syscall.ECHO
-
-	if err := tcset(fd, &newState); err != 0 {
-		return err
-	}
-	handleInterrupt(fd, state)
-	return nil
-}
-
-// SetRawTerminal puts the terminal connected to the given file descriptor into
-// raw mode and returns the previous state. On UNIX, this puts both the input
-// and output into raw mode. On Windows, it only puts the input into raw mode.
-func SetRawTerminal(fd uintptr) (*State, error) {
-	oldState, err := MakeRaw(fd)
-	if err != nil {
-		return nil, err
-	}
-	handleInterrupt(fd, oldState)
-	return oldState, err
-}
-
-// SetRawTerminalOutput puts the output of terminal connected to the given file
-// descriptor into raw mode. On UNIX, this does nothing and returns nil for the
-// state. On Windows, it disables LF -> CRLF translation.
-func SetRawTerminalOutput(fd uintptr) (*State, error) {
-	return nil, nil
-}
-
-func handleInterrupt(fd uintptr, state *State) {
-	sigchan := make(chan os.Signal, 1)
-	signal.Notify(sigchan, os.Interrupt)
-	go func() {
-		for range sigchan {
-			// quit cleanly and the new terminal item is on a new line
-			fmt.Println()
-			signal.Stop(sigchan)
-			close(sigchan)
-			RestoreTerminal(fd, state)
-			os.Exit(1)
-		}
-	}()
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/term_solaris.go b/vendor/github.com/docker/docker/pkg/term/term_solaris.go
deleted file mode 100644
index 112debbec5..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/term_solaris.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// +build solaris
-
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-/*
-#include <unistd.h>
-#include <stropts.h>
-#include <termios.h>
-
-// Small wrapper to get rid of variadic args of ioctl()
-int my_ioctl(int fd, int cmd, struct winsize *ws) {
-	return ioctl(fd, cmd, ws);
-}
-*/
-import "C"
-
-// GetWinsize returns the window size based on the specified file descriptor.
-func GetWinsize(fd uintptr) (*Winsize, error) {
-	ws := &Winsize{}
-	ret, err := C.my_ioctl(C.int(fd), C.int(syscall.TIOCGWINSZ), (*C.struct_winsize)(unsafe.Pointer(ws)))
-	// Skip retval = 0
-	if ret == 0 {
-		return ws, nil
-	}
-	return ws, err
-}
-
-// SetWinsize tries to set the specified window size for the specified file descriptor.
-func SetWinsize(fd uintptr, ws *Winsize) error {
-	ret, err := C.my_ioctl(C.int(fd), C.int(syscall.TIOCSWINSZ), (*C.struct_winsize)(unsafe.Pointer(ws)))
-	// Skip retval = 0
-	if ret == 0 {
-		return nil
-	}
-	return err
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/term_unix.go b/vendor/github.com/docker/docker/pkg/term/term_unix.go
deleted file mode 100644
index ddf87a0e58..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/term_unix.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// +build !solaris,!windows
-
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// GetWinsize returns the window size based on the specified file descriptor.
-func GetWinsize(fd uintptr) (*Winsize, error) {
-	ws := &Winsize{}
-	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(syscall.TIOCGWINSZ), uintptr(unsafe.Pointer(ws)))
-	// Skipp errno = 0
-	if err == 0 {
-		return ws, nil
-	}
-	return ws, err
-}
-
-// SetWinsize tries to set the specified window size for the specified file descriptor.
-func SetWinsize(fd uintptr, ws *Winsize) error {
-	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(syscall.TIOCSWINSZ), uintptr(unsafe.Pointer(ws)))
-	// Skipp errno = 0
-	if err == 0 {
-		return nil
-	}
-	return err
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/term_windows.go b/vendor/github.com/docker/docker/pkg/term/term_windows.go
deleted file mode 100644
index 62e9a9e692..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/term_windows.go
+++ /dev/null
@@ -1,233 +0,0 @@
-// +build windows
-
-package term
-
-import (
-	"io"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/Azure/go-ansiterm/winterm"
-	"github.com/docker/docker/pkg/term/windows"
-)
-
-// State holds the console mode for the terminal.
-type State struct {
-	mode uint32
-}
-
-// Winsize is used for window size.
-type Winsize struct {
-	Height uint16
-	Width  uint16
-}
-
-const (
-	// https://msdn.microsoft.com/en-us/library/windows/desktop/ms683167(v=vs.85).aspx
-	enableVirtualTerminalInput      = 0x0200
-	enableVirtualTerminalProcessing = 0x0004
-	disableNewlineAutoReturn        = 0x0008
-)
-
-// vtInputSupported is true if enableVirtualTerminalInput is supported by the console
-var vtInputSupported bool
-
-// StdStreams returns the standard streams (stdin, stdout, stderr).
-func StdStreams() (stdIn io.ReadCloser, stdOut, stdErr io.Writer) {
-	// Turn on VT handling on all std handles, if possible. This might
-	// fail, in which case we will fall back to terminal emulation.
-	var emulateStdin, emulateStdout, emulateStderr bool
-	fd := os.Stdin.Fd()
-	if mode, err := winterm.GetConsoleMode(fd); err == nil {
-		// Validate that enableVirtualTerminalInput is supported, but do not set it.
-		if err = winterm.SetConsoleMode(fd, mode|enableVirtualTerminalInput); err != nil {
-			emulateStdin = true
-		} else {
-			vtInputSupported = true
-		}
-		// Unconditionally set the console mode back even on failure because SetConsoleMode
-		// remembers invalid bits on input handles.
-		winterm.SetConsoleMode(fd, mode)
-	}
-
-	fd = os.Stdout.Fd()
-	if mode, err := winterm.GetConsoleMode(fd); err == nil {
-		// Validate disableNewlineAutoReturn is supported, but do not set it.
-		if err = winterm.SetConsoleMode(fd, mode|enableVirtualTerminalProcessing|disableNewlineAutoReturn); err != nil {
-			emulateStdout = true
-		} else {
-			winterm.SetConsoleMode(fd, mode|enableVirtualTerminalProcessing)
-		}
-	}
-
-	fd = os.Stderr.Fd()
-	if mode, err := winterm.GetConsoleMode(fd); err == nil {
-		// Validate disableNewlineAutoReturn is supported, but do not set it.
-		if err = winterm.SetConsoleMode(fd, mode|enableVirtualTerminalProcessing|disableNewlineAutoReturn); err != nil {
-			emulateStderr = true
-		} else {
-			winterm.SetConsoleMode(fd, mode|enableVirtualTerminalProcessing)
-		}
-	}
-
-	if os.Getenv("ConEmuANSI") == "ON" || os.Getenv("ConsoleZVersion") != "" {
-		// The ConEmu and ConsoleZ terminals emulate ANSI on output streams well.
-		emulateStdin = true
-		emulateStdout = false
-		emulateStderr = false
-	}
-
-	if emulateStdin {
-		stdIn = windows.NewAnsiReader(syscall.STD_INPUT_HANDLE)
-	} else {
-		stdIn = os.Stdin
-	}
-
-	if emulateStdout {
-		stdOut = windows.NewAnsiWriter(syscall.STD_OUTPUT_HANDLE)
-	} else {
-		stdOut = os.Stdout
-	}
-
-	if emulateStderr {
-		stdErr = windows.NewAnsiWriter(syscall.STD_ERROR_HANDLE)
-	} else {
-		stdErr = os.Stderr
-	}
-
-	return
-}
-
-// GetFdInfo returns the file descriptor for an os.File and indicates whether the file represents a terminal.
-func GetFdInfo(in interface{}) (uintptr, bool) {
-	return windows.GetHandleInfo(in)
-}
-
-// GetWinsize returns the window size based on the specified file descriptor.
-func GetWinsize(fd uintptr) (*Winsize, error) {
-	info, err := winterm.GetConsoleScreenBufferInfo(fd)
-	if err != nil {
-		return nil, err
-	}
-
-	winsize := &Winsize{
-		Width:  uint16(info.Window.Right - info.Window.Left + 1),
-		Height: uint16(info.Window.Bottom - info.Window.Top + 1),
-	}
-
-	return winsize, nil
-}
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal(fd uintptr) bool {
-	return windows.IsConsole(fd)
-}
-
-// RestoreTerminal restores the terminal connected to the given file descriptor
-// to a previous state.
-func RestoreTerminal(fd uintptr, state *State) error {
-	return winterm.SetConsoleMode(fd, state.mode)
-}
-
-// SaveState saves the state of the terminal connected to the given file descriptor.
-func SaveState(fd uintptr) (*State, error) {
-	mode, e := winterm.GetConsoleMode(fd)
-	if e != nil {
-		return nil, e
-	}
-
-	return &State{mode: mode}, nil
-}
-
-// DisableEcho disables echo for the terminal connected to the given file descriptor.
-// -- See https://msdn.microsoft.com/en-us/library/windows/desktop/ms683462(v=vs.85).aspx
-func DisableEcho(fd uintptr, state *State) error {
-	mode := state.mode
-	mode &^= winterm.ENABLE_ECHO_INPUT
-	mode |= winterm.ENABLE_PROCESSED_INPUT | winterm.ENABLE_LINE_INPUT
-	err := winterm.SetConsoleMode(fd, mode)
-	if err != nil {
-		return err
-	}
-
-	// Register an interrupt handler to catch and restore prior state
-	restoreAtInterrupt(fd, state)
-	return nil
-}
-
-// SetRawTerminal puts the terminal connected to the given file descriptor into
-// raw mode and returns the previous state. On UNIX, this puts both the input
-// and output into raw mode. On Windows, it only puts the input into raw mode.
-func SetRawTerminal(fd uintptr) (*State, error) {
-	state, err := MakeRaw(fd)
-	if err != nil {
-		return nil, err
-	}
-
-	// Register an interrupt handler to catch and restore prior state
-	restoreAtInterrupt(fd, state)
-	return state, err
-}
-
-// SetRawTerminalOutput puts the output of terminal connected to the given file
-// descriptor into raw mode. On UNIX, this does nothing and returns nil for the
-// state. On Windows, it disables LF -> CRLF translation.
-func SetRawTerminalOutput(fd uintptr) (*State, error) {
-	state, err := SaveState(fd)
-	if err != nil {
-		return nil, err
-	}
-
-	// Ignore failures, since disableNewlineAutoReturn might not be supported on this
-	// version of Windows.
-	winterm.SetConsoleMode(fd, state.mode|disableNewlineAutoReturn)
-	return state, err
-}
-
-// MakeRaw puts the terminal (Windows Console) connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	state, err := SaveState(fd)
-	if err != nil {
-		return nil, err
-	}
-
-	mode := state.mode
-
-	// See
-	// -- https://msdn.microsoft.com/en-us/library/windows/desktop/ms686033(v=vs.85).aspx
-	// -- https://msdn.microsoft.com/en-us/library/windows/desktop/ms683462(v=vs.85).aspx
-
-	// Disable these modes
-	mode &^= winterm.ENABLE_ECHO_INPUT
-	mode &^= winterm.ENABLE_LINE_INPUT
-	mode &^= winterm.ENABLE_MOUSE_INPUT
-	mode &^= winterm.ENABLE_WINDOW_INPUT
-	mode &^= winterm.ENABLE_PROCESSED_INPUT
-
-	// Enable these modes
-	mode |= winterm.ENABLE_EXTENDED_FLAGS
-	mode |= winterm.ENABLE_INSERT_MODE
-	mode |= winterm.ENABLE_QUICK_EDIT_MODE
-	if vtInputSupported {
-		mode |= enableVirtualTerminalInput
-	}
-
-	err = winterm.SetConsoleMode(fd, mode)
-	if err != nil {
-		return nil, err
-	}
-	return state, nil
-}
-
-func restoreAtInterrupt(fd uintptr, state *State) {
-	sigchan := make(chan os.Signal, 1)
-	signal.Notify(sigchan, os.Interrupt)
-
-	go func() {
-		_ = <-sigchan
-		RestoreTerminal(fd, state)
-		os.Exit(0)
-	}()
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/termios_darwin.go b/vendor/github.com/docker/docker/pkg/term/termios_darwin.go
deleted file mode 100644
index 480db900ac..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/termios_darwin.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	getTermios = syscall.TIOCGETA
-	setTermios = syscall.TIOCSETA
-)
-
-// Termios magic numbers, passthrough to the ones defined in syscall.
-const (
-	IGNBRK = syscall.IGNBRK
-	PARMRK = syscall.PARMRK
-	INLCR  = syscall.INLCR
-	IGNCR  = syscall.IGNCR
-	ECHONL = syscall.ECHONL
-	CSIZE  = syscall.CSIZE
-	ICRNL  = syscall.ICRNL
-	ISTRIP = syscall.ISTRIP
-	PARENB = syscall.PARENB
-	ECHO   = syscall.ECHO
-	ICANON = syscall.ICANON
-	ISIG   = syscall.ISIG
-	IXON   = syscall.IXON
-	BRKINT = syscall.BRKINT
-	INPCK  = syscall.INPCK
-	OPOST  = syscall.OPOST
-	CS8    = syscall.CS8
-	IEXTEN = syscall.IEXTEN
-)
-
-// Termios is the Unix API for terminal I/O.
-type Termios struct {
-	Iflag  uint64
-	Oflag  uint64
-	Cflag  uint64
-	Lflag  uint64
-	Cc     [20]byte
-	Ispeed uint64
-	Ospeed uint64
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	var oldState State
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios))); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-	newState.Iflag &^= (IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON)
-	newState.Oflag &^= OPOST
-	newState.Lflag &^= (ECHO | ECHONL | ICANON | ISIG | IEXTEN)
-	newState.Cflag &^= (CSIZE | PARENB)
-	newState.Cflag |= CS8
-	newState.Cc[syscall.VMIN] = 1
-	newState.Cc[syscall.VTIME] = 0
-
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(setTermios), uintptr(unsafe.Pointer(&newState))); err != 0 {
-		return nil, err
-	}
-
-	return &oldState, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/termios_freebsd.go b/vendor/github.com/docker/docker/pkg/term/termios_freebsd.go
deleted file mode 100644
index ed843ad69c..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/termios_freebsd.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	getTermios = syscall.TIOCGETA
-	setTermios = syscall.TIOCSETA
-)
-
-// Termios magic numbers, passthrough to the ones defined in syscall.
-const (
-	IGNBRK = syscall.IGNBRK
-	PARMRK = syscall.PARMRK
-	INLCR  = syscall.INLCR
-	IGNCR  = syscall.IGNCR
-	ECHONL = syscall.ECHONL
-	CSIZE  = syscall.CSIZE
-	ICRNL  = syscall.ICRNL
-	ISTRIP = syscall.ISTRIP
-	PARENB = syscall.PARENB
-	ECHO   = syscall.ECHO
-	ICANON = syscall.ICANON
-	ISIG   = syscall.ISIG
-	IXON   = syscall.IXON
-	BRKINT = syscall.BRKINT
-	INPCK  = syscall.INPCK
-	OPOST  = syscall.OPOST
-	CS8    = syscall.CS8
-	IEXTEN = syscall.IEXTEN
-)
-
-// Termios is the Unix API for terminal I/O.
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]byte
-	Ispeed uint32
-	Ospeed uint32
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	var oldState State
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios))); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-	newState.Iflag &^= (IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON)
-	newState.Oflag &^= OPOST
-	newState.Lflag &^= (ECHO | ECHONL | ICANON | ISIG | IEXTEN)
-	newState.Cflag &^= (CSIZE | PARENB)
-	newState.Cflag |= CS8
-	newState.Cc[syscall.VMIN] = 1
-	newState.Cc[syscall.VTIME] = 0
-
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(setTermios), uintptr(unsafe.Pointer(&newState))); err != 0 {
-		return nil, err
-	}
-
-	return &oldState, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/termios_linux.go b/vendor/github.com/docker/docker/pkg/term/termios_linux.go
deleted file mode 100644
index 22921b6aef..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/termios_linux.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// +build !cgo
-
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	getTermios = syscall.TCGETS
-	setTermios = syscall.TCSETS
-)
-
-// Termios is the Unix API for terminal I/O.
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]byte
-	Ispeed uint32
-	Ospeed uint32
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	var oldState State
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, getTermios, uintptr(unsafe.Pointer(&oldState.termios))); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-
-	newState.Iflag &^= (syscall.IGNBRK | syscall.BRKINT | syscall.PARMRK | syscall.ISTRIP | syscall.INLCR | syscall.IGNCR | syscall.ICRNL | syscall.IXON)
-	newState.Oflag &^= syscall.OPOST
-	newState.Lflag &^= (syscall.ECHO | syscall.ECHONL | syscall.ICANON | syscall.ISIG | syscall.IEXTEN)
-	newState.Cflag &^= (syscall.CSIZE | syscall.PARENB)
-	newState.Cflag |= syscall.CS8
-
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, setTermios, uintptr(unsafe.Pointer(&newState))); err != 0 {
-		return nil, err
-	}
-	return &oldState, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/termios_openbsd.go b/vendor/github.com/docker/docker/pkg/term/termios_openbsd.go
deleted file mode 100644
index ed843ad69c..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/termios_openbsd.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	getTermios = syscall.TIOCGETA
-	setTermios = syscall.TIOCSETA
-)
-
-// Termios magic numbers, passthrough to the ones defined in syscall.
-const (
-	IGNBRK = syscall.IGNBRK
-	PARMRK = syscall.PARMRK
-	INLCR  = syscall.INLCR
-	IGNCR  = syscall.IGNCR
-	ECHONL = syscall.ECHONL
-	CSIZE  = syscall.CSIZE
-	ICRNL  = syscall.ICRNL
-	ISTRIP = syscall.ISTRIP
-	PARENB = syscall.PARENB
-	ECHO   = syscall.ECHO
-	ICANON = syscall.ICANON
-	ISIG   = syscall.ISIG
-	IXON   = syscall.IXON
-	BRKINT = syscall.BRKINT
-	INPCK  = syscall.INPCK
-	OPOST  = syscall.OPOST
-	CS8    = syscall.CS8
-	IEXTEN = syscall.IEXTEN
-)
-
-// Termios is the Unix API for terminal I/O.
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]byte
-	Ispeed uint32
-	Ospeed uint32
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	var oldState State
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios))); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-	newState.Iflag &^= (IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON)
-	newState.Oflag &^= OPOST
-	newState.Lflag &^= (ECHO | ECHONL | ICANON | ISIG | IEXTEN)
-	newState.Cflag &^= (CSIZE | PARENB)
-	newState.Cflag |= CS8
-	newState.Cc[syscall.VMIN] = 1
-	newState.Cc[syscall.VTIME] = 0
-
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(setTermios), uintptr(unsafe.Pointer(&newState))); err != 0 {
-		return nil, err
-	}
-
-	return &oldState, nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/windows/ansi_reader.go b/vendor/github.com/docker/docker/pkg/term/windows/ansi_reader.go
deleted file mode 100644
index cb0b88356d..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/windows/ansi_reader.go
+++ /dev/null
@@ -1,263 +0,0 @@
-// +build windows
-
-package windows
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"unsafe"
-
-	ansiterm "github.com/Azure/go-ansiterm"
-	"github.com/Azure/go-ansiterm/winterm"
-)
-
-const (
-	escapeSequence = ansiterm.KEY_ESC_CSI
-)
-
-// ansiReader wraps a standard input file (e.g., os.Stdin) providing ANSI sequence translation.
-type ansiReader struct {
-	file     *os.File
-	fd       uintptr
-	buffer   []byte
-	cbBuffer int
-	command  []byte
-}
-
-// NewAnsiReader returns an io.ReadCloser that provides VT100 terminal emulation on top of a
-// Windows console input handle.
-func NewAnsiReader(nFile int) io.ReadCloser {
-	initLogger()
-	file, fd := winterm.GetStdFile(nFile)
-	return &ansiReader{
-		file:    file,
-		fd:      fd,
-		command: make([]byte, 0, ansiterm.ANSI_MAX_CMD_LENGTH),
-		buffer:  make([]byte, 0),
-	}
-}
-
-// Close closes the wrapped file.
-func (ar *ansiReader) Close() (err error) {
-	return ar.file.Close()
-}
-
-// Fd returns the file descriptor of the wrapped file.
-func (ar *ansiReader) Fd() uintptr {
-	return ar.fd
-}
-
-// Read reads up to len(p) bytes of translated input events into p.
-func (ar *ansiReader) Read(p []byte) (int, error) {
-	if len(p) == 0 {
-		return 0, nil
-	}
-
-	// Previously read bytes exist, read as much as we can and return
-	if len(ar.buffer) > 0 {
-		logger.Debugf("Reading previously cached bytes")
-
-		originalLength := len(ar.buffer)
-		copiedLength := copy(p, ar.buffer)
-
-		if copiedLength == originalLength {
-			ar.buffer = make([]byte, 0, len(p))
-		} else {
-			ar.buffer = ar.buffer[copiedLength:]
-		}
-
-		logger.Debugf("Read from cache p[%d]: % x", copiedLength, p)
-		return copiedLength, nil
-	}
-
-	// Read and translate key events
-	events, err := readInputEvents(ar.fd, len(p))
-	if err != nil {
-		return 0, err
-	} else if len(events) == 0 {
-		logger.Debug("No input events detected")
-		return 0, nil
-	}
-
-	keyBytes := translateKeyEvents(events, []byte(escapeSequence))
-
-	// Save excess bytes and right-size keyBytes
-	if len(keyBytes) > len(p) {
-		logger.Debugf("Received %d keyBytes, only room for %d bytes", len(keyBytes), len(p))
-		ar.buffer = keyBytes[len(p):]
-		keyBytes = keyBytes[:len(p)]
-	} else if len(keyBytes) == 0 {
-		logger.Debug("No key bytes returned from the translator")
-		return 0, nil
-	}
-
-	copiedLength := copy(p, keyBytes)
-	if copiedLength != len(keyBytes) {
-		return 0, errors.New("unexpected copy length encountered")
-	}
-
-	logger.Debugf("Read        p[%d]: % x", copiedLength, p)
-	logger.Debugf("Read keyBytes[%d]: % x", copiedLength, keyBytes)
-	return copiedLength, nil
-}
-
-// readInputEvents polls until at least one event is available.
-func readInputEvents(fd uintptr, maxBytes int) ([]winterm.INPUT_RECORD, error) {
-	// Determine the maximum number of records to retrieve
-	// -- Cast around the type system to obtain the size of a single INPUT_RECORD.
-	//    unsafe.Sizeof requires an expression vs. a type-reference; the casting
-	//    tricks the type system into believing it has such an expression.
-	recordSize := int(unsafe.Sizeof(*((*winterm.INPUT_RECORD)(unsafe.Pointer(&maxBytes)))))
-	countRecords := maxBytes / recordSize
-	if countRecords > ansiterm.MAX_INPUT_EVENTS {
-		countRecords = ansiterm.MAX_INPUT_EVENTS
-	} else if countRecords == 0 {
-		countRecords = 1
-	}
-	logger.Debugf("[windows] readInputEvents: Reading %v records (buffer size %v, record size %v)", countRecords, maxBytes, recordSize)
-
-	// Wait for and read input events
-	events := make([]winterm.INPUT_RECORD, countRecords)
-	nEvents := uint32(0)
-	eventsExist, err := winterm.WaitForSingleObject(fd, winterm.WAIT_INFINITE)
-	if err != nil {
-		return nil, err
-	}
-
-	if eventsExist {
-		err = winterm.ReadConsoleInput(fd, events, &nEvents)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// Return a slice restricted to the number of returned records
-	logger.Debugf("[windows] readInputEvents: Read %v events", nEvents)
-	return events[:nEvents], nil
-}
-
-// KeyEvent Translation Helpers
-
-var arrowKeyMapPrefix = map[uint16]string{
-	winterm.VK_UP:    "%s%sA",
-	winterm.VK_DOWN:  "%s%sB",
-	winterm.VK_RIGHT: "%s%sC",
-	winterm.VK_LEFT:  "%s%sD",
-}
-
-var keyMapPrefix = map[uint16]string{
-	winterm.VK_UP:     "\x1B[%sA",
-	winterm.VK_DOWN:   "\x1B[%sB",
-	winterm.VK_RIGHT:  "\x1B[%sC",
-	winterm.VK_LEFT:   "\x1B[%sD",
-	winterm.VK_HOME:   "\x1B[1%s~", // showkey shows ^[[1
-	winterm.VK_END:    "\x1B[4%s~", // showkey shows ^[[4
-	winterm.VK_INSERT: "\x1B[2%s~",
-	winterm.VK_DELETE: "\x1B[3%s~",
-	winterm.VK_PRIOR:  "\x1B[5%s~",
-	winterm.VK_NEXT:   "\x1B[6%s~",
-	winterm.VK_F1:     "",
-	winterm.VK_F2:     "",
-	winterm.VK_F3:     "\x1B[13%s~",
-	winterm.VK_F4:     "\x1B[14%s~",
-	winterm.VK_F5:     "\x1B[15%s~",
-	winterm.VK_F6:     "\x1B[17%s~",
-	winterm.VK_F7:     "\x1B[18%s~",
-	winterm.VK_F8:     "\x1B[19%s~",
-	winterm.VK_F9:     "\x1B[20%s~",
-	winterm.VK_F10:    "\x1B[21%s~",
-	winterm.VK_F11:    "\x1B[23%s~",
-	winterm.VK_F12:    "\x1B[24%s~",
-}
-
-// translateKeyEvents converts the input events into the appropriate ANSI string.
-func translateKeyEvents(events []winterm.INPUT_RECORD, escapeSequence []byte) []byte {
-	var buffer bytes.Buffer
-	for _, event := range events {
-		if event.EventType == winterm.KEY_EVENT && event.KeyEvent.KeyDown != 0 {
-			buffer.WriteString(keyToString(&event.KeyEvent, escapeSequence))
-		}
-	}
-
-	return buffer.Bytes()
-}
-
-// keyToString maps the given input event record to the corresponding string.
-func keyToString(keyEvent *winterm.KEY_EVENT_RECORD, escapeSequence []byte) string {
-	if keyEvent.UnicodeChar == 0 {
-		return formatVirtualKey(keyEvent.VirtualKeyCode, keyEvent.ControlKeyState, escapeSequence)
-	}
-
-	_, alt, control := getControlKeys(keyEvent.ControlKeyState)
-	if control {
-		// TODO(azlinux): Implement following control sequences
-		// <Ctrl>-D  Signals the end of input from the keyboard; also exits current shell.
-		// <Ctrl>-H  Deletes the first character to the left of the cursor. Also called the ERASE key.
-		// <Ctrl>-Q  Restarts printing after it has been stopped with <Ctrl>-s.
-		// <Ctrl>-S  Suspends printing on the screen (does not stop the program).
-		// <Ctrl>-U  Deletes all characters on the current line. Also called the KILL key.
-		// <Ctrl>-E  Quits current command and creates a core
-
-	}
-
-	// <Alt>+Key generates ESC N Key
-	if !control && alt {
-		return ansiterm.KEY_ESC_N + strings.ToLower(string(keyEvent.UnicodeChar))
-	}
-
-	return string(keyEvent.UnicodeChar)
-}
-
-// formatVirtualKey converts a virtual key (e.g., up arrow) into the appropriate ANSI string.
-func formatVirtualKey(key uint16, controlState uint32, escapeSequence []byte) string {
-	shift, alt, control := getControlKeys(controlState)
-	modifier := getControlKeysModifier(shift, alt, control)
-
-	if format, ok := arrowKeyMapPrefix[key]; ok {
-		return fmt.Sprintf(format, escapeSequence, modifier)
-	}
-
-	if format, ok := keyMapPrefix[key]; ok {
-		return fmt.Sprintf(format, modifier)
-	}
-
-	return ""
-}
-
-// getControlKeys extracts the shift, alt, and ctrl key states.
-func getControlKeys(controlState uint32) (shift, alt, control bool) {
-	shift = 0 != (controlState & winterm.SHIFT_PRESSED)
-	alt = 0 != (controlState & (winterm.LEFT_ALT_PRESSED | winterm.RIGHT_ALT_PRESSED))
-	control = 0 != (controlState & (winterm.LEFT_CTRL_PRESSED | winterm.RIGHT_CTRL_PRESSED))
-	return shift, alt, control
-}
-
-// getControlKeysModifier returns the ANSI modifier for the given combination of control keys.
-func getControlKeysModifier(shift, alt, control bool) string {
-	if shift && alt && control {
-		return ansiterm.KEY_CONTROL_PARAM_8
-	}
-	if alt && control {
-		return ansiterm.KEY_CONTROL_PARAM_7
-	}
-	if shift && control {
-		return ansiterm.KEY_CONTROL_PARAM_6
-	}
-	if control {
-		return ansiterm.KEY_CONTROL_PARAM_5
-	}
-	if shift && alt {
-		return ansiterm.KEY_CONTROL_PARAM_4
-	}
-	if alt {
-		return ansiterm.KEY_CONTROL_PARAM_3
-	}
-	if shift {
-		return ansiterm.KEY_CONTROL_PARAM_2
-	}
-	return ""
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/windows/ansi_writer.go b/vendor/github.com/docker/docker/pkg/term/windows/ansi_writer.go
deleted file mode 100644
index a3ce5697d9..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/windows/ansi_writer.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// +build windows
-
-package windows
-
-import (
-	"io"
-	"os"
-
-	ansiterm "github.com/Azure/go-ansiterm"
-	"github.com/Azure/go-ansiterm/winterm"
-)
-
-// ansiWriter wraps a standard output file (e.g., os.Stdout) providing ANSI sequence translation.
-type ansiWriter struct {
-	file           *os.File
-	fd             uintptr
-	infoReset      *winterm.CONSOLE_SCREEN_BUFFER_INFO
-	command        []byte
-	escapeSequence []byte
-	inAnsiSequence bool
-	parser         *ansiterm.AnsiParser
-}
-
-// NewAnsiWriter returns an io.Writer that provides VT100 terminal emulation on top of a
-// Windows console output handle.
-func NewAnsiWriter(nFile int) io.Writer {
-	initLogger()
-	file, fd := winterm.GetStdFile(nFile)
-	info, err := winterm.GetConsoleScreenBufferInfo(fd)
-	if err != nil {
-		return nil
-	}
-
-	parser := ansiterm.CreateParser("Ground", winterm.CreateWinEventHandler(fd, file))
-	logger.Infof("newAnsiWriter: parser %p", parser)
-
-	aw := &ansiWriter{
-		file:           file,
-		fd:             fd,
-		infoReset:      info,
-		command:        make([]byte, 0, ansiterm.ANSI_MAX_CMD_LENGTH),
-		escapeSequence: []byte(ansiterm.KEY_ESC_CSI),
-		parser:         parser,
-	}
-
-	logger.Infof("newAnsiWriter: aw.parser %p", aw.parser)
-	logger.Infof("newAnsiWriter: %v", aw)
-	return aw
-}
-
-func (aw *ansiWriter) Fd() uintptr {
-	return aw.fd
-}
-
-// Write writes len(p) bytes from p to the underlying data stream.
-func (aw *ansiWriter) Write(p []byte) (total int, err error) {
-	if len(p) == 0 {
-		return 0, nil
-	}
-
-	logger.Infof("Write: % x", p)
-	logger.Infof("Write: %s", string(p))
-	return aw.parser.Parse(p)
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/windows/console.go b/vendor/github.com/docker/docker/pkg/term/windows/console.go
deleted file mode 100644
index ca5c3b2e53..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/windows/console.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// +build windows
-
-package windows
-
-import (
-	"os"
-
-	"github.com/Azure/go-ansiterm/winterm"
-)
-
-// GetHandleInfo returns file descriptor and bool indicating whether the file is a console.
-func GetHandleInfo(in interface{}) (uintptr, bool) {
-	switch t := in.(type) {
-	case *ansiReader:
-		return t.Fd(), true
-	case *ansiWriter:
-		return t.Fd(), true
-	}
-
-	var inFd uintptr
-	var isTerminal bool
-
-	if file, ok := in.(*os.File); ok {
-		inFd = file.Fd()
-		isTerminal = IsConsole(inFd)
-	}
-	return inFd, isTerminal
-}
-
-// IsConsole returns true if the given file descriptor is a Windows Console.
-// The code assumes that GetConsoleMode will return an error for file descriptors that are not a console.
-func IsConsole(fd uintptr) bool {
-	_, e := winterm.GetConsoleMode(fd)
-	return e == nil
-}
diff --git a/vendor/github.com/docker/docker/pkg/term/windows/windows.go b/vendor/github.com/docker/docker/pkg/term/windows/windows.go
deleted file mode 100644
index ce4cb5990e..0000000000
--- a/vendor/github.com/docker/docker/pkg/term/windows/windows.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// These files implement ANSI-aware input and output streams for use by the Docker Windows client.
-// When asked for the set of standard streams (e.g., stdin, stdout, stderr), the code will create
-// and return pseudo-streams that convert ANSI sequences to / from Windows Console API calls.
-
-package windows
-
-import (
-	"io/ioutil"
-	"os"
-	"sync"
-
-	ansiterm "github.com/Azure/go-ansiterm"
-	"github.com/Sirupsen/logrus"
-)
-
-var logger *logrus.Logger
-var initOnce sync.Once
-
-func initLogger() {
-	initOnce.Do(func() {
-		logFile := ioutil.Discard
-
-		if isDebugEnv := os.Getenv(ansiterm.LogEnv); isDebugEnv == "1" {
-			logFile, _ = os.Create("ansiReaderWriter.log")
-		}
-
-		logger = &logrus.Logger{
-			Out:       logFile,
-			Formatter: new(logrus.TextFormatter),
-			Level:     logrus.DebugLevel,
-		}
-	})
-}
diff --git a/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone.go b/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone.go
deleted file mode 100644
index e4dec3a5d1..0000000000
--- a/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build go1.8
-
-package tlsconfig
-
-import "crypto/tls"
-
-// Clone returns a clone of tls.Config. This function is provided for
-// compatibility for go1.7 that doesn't include this method in stdlib.
-func Clone(c *tls.Config) *tls.Config {
-	return c.Clone()
-}
diff --git a/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone_go16.go b/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone_go16.go
deleted file mode 100644
index 0b816650ec..0000000000
--- a/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone_go16.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// +build go1.6,!go1.7
-
-package tlsconfig
-
-import "crypto/tls"
-
-// Clone returns a clone of tls.Config. This function is provided for
-// compatibility for go1.6 that doesn't include this method in stdlib.
-func Clone(c *tls.Config) *tls.Config {
-	return &tls.Config{
-		Rand:                     c.Rand,
-		Time:                     c.Time,
-		Certificates:             c.Certificates,
-		NameToCertificate:        c.NameToCertificate,
-		GetCertificate:           c.GetCertificate,
-		RootCAs:                  c.RootCAs,
-		NextProtos:               c.NextProtos,
-		ServerName:               c.ServerName,
-		ClientAuth:               c.ClientAuth,
-		ClientCAs:                c.ClientCAs,
-		InsecureSkipVerify:       c.InsecureSkipVerify,
-		CipherSuites:             c.CipherSuites,
-		PreferServerCipherSuites: c.PreferServerCipherSuites,
-		SessionTicketsDisabled:   c.SessionTicketsDisabled,
-		SessionTicketKey:         c.SessionTicketKey,
-		ClientSessionCache:       c.ClientSessionCache,
-		MinVersion:               c.MinVersion,
-		MaxVersion:               c.MaxVersion,
-		CurvePreferences:         c.CurvePreferences,
-	}
-}
diff --git a/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone_go17.go b/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone_go17.go
deleted file mode 100644
index 0d5b448fec..0000000000
--- a/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone_go17.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// +build go1.7,!go1.8
-
-package tlsconfig
-
-import "crypto/tls"
-
-// Clone returns a clone of tls.Config. This function is provided for
-// compatibility for go1.7 that doesn't include this method in stdlib.
-func Clone(c *tls.Config) *tls.Config {
-	return &tls.Config{
-		Rand:                        c.Rand,
-		Time:                        c.Time,
-		Certificates:                c.Certificates,
-		NameToCertificate:           c.NameToCertificate,
-		GetCertificate:              c.GetCertificate,
-		RootCAs:                     c.RootCAs,
-		NextProtos:                  c.NextProtos,
-		ServerName:                  c.ServerName,
-		ClientAuth:                  c.ClientAuth,
-		ClientCAs:                   c.ClientCAs,
-		InsecureSkipVerify:          c.InsecureSkipVerify,
-		CipherSuites:                c.CipherSuites,
-		PreferServerCipherSuites:    c.PreferServerCipherSuites,
-		SessionTicketsDisabled:      c.SessionTicketsDisabled,
-		SessionTicketKey:            c.SessionTicketKey,
-		ClientSessionCache:          c.ClientSessionCache,
-		MinVersion:                  c.MinVersion,
-		MaxVersion:                  c.MaxVersion,
-		CurvePreferences:            c.CurvePreferences,
-		DynamicRecordSizingDisabled: c.DynamicRecordSizingDisabled,
-		Renegotiation:               c.Renegotiation,
-	}
-}
diff --git a/vendor/github.com/docker/go-connections/LICENSE b/vendor/github.com/docker/go-connections/LICENSE
deleted file mode 100644
index b55b37bc31..0000000000
--- a/vendor/github.com/docker/go-connections/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        https://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2015 Docker, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       https://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/docker/go-connections/nat/nat.go b/vendor/github.com/docker/go-connections/nat/nat.go
deleted file mode 100644
index 4d5f5ae63a..0000000000
--- a/vendor/github.com/docker/go-connections/nat/nat.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Package nat is a convenience package for manipulation of strings describing network ports.
-package nat
-
-import (
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-)
-
-const (
-	// portSpecTemplate is the expected format for port specifications
-	portSpecTemplate = "ip:hostPort:containerPort"
-)
-
-// PortBinding represents a binding between a Host IP address and a Host Port
-type PortBinding struct {
-	// HostIP is the host IP Address
-	HostIP string `json:"HostIp"`
-	// HostPort is the host port number
-	HostPort string
-}
-
-// PortMap is a collection of PortBinding indexed by Port
-type PortMap map[Port][]PortBinding
-
-// PortSet is a collection of structs indexed by Port
-type PortSet map[Port]struct{}
-
-// Port is a string containing port number and protocol in the format "80/tcp"
-type Port string
-
-// NewPort creates a new instance of a Port given a protocol and port number or port range
-func NewPort(proto, port string) (Port, error) {
-	// Check for parsing issues on "port" now so we can avoid having
-	// to check it later on.
-
-	portStartInt, portEndInt, err := ParsePortRangeToInt(port)
-	if err != nil {
-		return "", err
-	}
-
-	if portStartInt == portEndInt {
-		return Port(fmt.Sprintf("%d/%s", portStartInt, proto)), nil
-	}
-	return Port(fmt.Sprintf("%d-%d/%s", portStartInt, portEndInt, proto)), nil
-}
-
-// ParsePort parses the port number string and returns an int
-func ParsePort(rawPort string) (int, error) {
-	if len(rawPort) == 0 {
-		return 0, nil
-	}
-	port, err := strconv.ParseUint(rawPort, 10, 16)
-	if err != nil {
-		return 0, err
-	}
-	return int(port), nil
-}
-
-// ParsePortRangeToInt parses the port range string and returns start/end ints
-func ParsePortRangeToInt(rawPort string) (int, int, error) {
-	if len(rawPort) == 0 {
-		return 0, 0, nil
-	}
-	start, end, err := ParsePortRange(rawPort)
-	if err != nil {
-		return 0, 0, err
-	}
-	return int(start), int(end), nil
-}
-
-// Proto returns the protocol of a Port
-func (p Port) Proto() string {
-	proto, _ := SplitProtoPort(string(p))
-	return proto
-}
-
-// Port returns the port number of a Port
-func (p Port) Port() string {
-	_, port := SplitProtoPort(string(p))
-	return port
-}
-
-// Int returns the port number of a Port as an int
-func (p Port) Int() int {
-	portStr := p.Port()
-	// We don't need to check for an error because we're going to
-	// assume that any error would have been found, and reported, in NewPort()
-	port, _ := ParsePort(portStr)
-	return port
-}
-
-// Range returns the start/end port numbers of a Port range as ints
-func (p Port) Range() (int, int, error) {
-	return ParsePortRangeToInt(p.Port())
-}
-
-// SplitProtoPort splits a port in the format of proto/port
-func SplitProtoPort(rawPort string) (string, string) {
-	parts := strings.Split(rawPort, "/")
-	l := len(parts)
-	if len(rawPort) == 0 || l == 0 || len(parts[0]) == 0 {
-		return "", ""
-	}
-	if l == 1 {
-		return "tcp", rawPort
-	}
-	if len(parts[1]) == 0 {
-		return "tcp", parts[0]
-	}
-	return parts[1], parts[0]
-}
-
-func validateProto(proto string) bool {
-	for _, availableProto := range []string{"tcp", "udp"} {
-		if availableProto == proto {
-			return true
-		}
-	}
-	return false
-}
-
-// ParsePortSpecs receives port specs in the format of ip:public:private/proto and parses
-// these in to the internal types
-func ParsePortSpecs(ports []string) (map[Port]struct{}, map[Port][]PortBinding, error) {
-	var (
-		exposedPorts = make(map[Port]struct{}, len(ports))
-		bindings     = make(map[Port][]PortBinding)
-	)
-	for _, rawPort := range ports {
-		portMappings, err := ParsePortSpec(rawPort)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		for _, portMapping := range portMappings {
-			port := portMapping.Port
-			if _, exists := exposedPorts[port]; !exists {
-				exposedPorts[port] = struct{}{}
-			}
-			bslice, exists := bindings[port]
-			if !exists {
-				bslice = []PortBinding{}
-			}
-			bindings[port] = append(bslice, portMapping.Binding)
-		}
-	}
-	return exposedPorts, bindings, nil
-}
-
-// PortMapping is a data object mapping a Port to a PortBinding
-type PortMapping struct {
-	Port    Port
-	Binding PortBinding
-}
-
-func splitParts(rawport string) (string, string, string) {
-	parts := strings.Split(rawport, ":")
-	n := len(parts)
-	containerport := parts[n-1]
-
-	switch n {
-	case 1:
-		return "", "", containerport
-	case 2:
-		return "", parts[0], containerport
-	case 3:
-		return parts[0], parts[1], containerport
-	default:
-		return strings.Join(parts[:n-2], ":"), parts[n-2], containerport
-	}
-}
-
-// ParsePortSpec parses a port specification string into a slice of PortMappings
-func ParsePortSpec(rawPort string) ([]PortMapping, error) {
-	var proto string
-	rawIP, hostPort, containerPort := splitParts(rawPort)
-	proto, containerPort = SplitProtoPort(containerPort)
-
-	// Strip [] from IPV6 addresses
-	ip, _, err := net.SplitHostPort(rawIP + ":")
-	if err != nil {
-		return nil, fmt.Errorf("Invalid ip address %v: %s", rawIP, err)
-	}
-	if ip != "" && net.ParseIP(ip) == nil {
-		return nil, fmt.Errorf("Invalid ip address: %s", ip)
-	}
-	if containerPort == "" {
-		return nil, fmt.Errorf("No port specified: %s<empty>", rawPort)
-	}
-
-	startPort, endPort, err := ParsePortRange(containerPort)
-	if err != nil {
-		return nil, fmt.Errorf("Invalid containerPort: %s", containerPort)
-	}
-
-	var startHostPort, endHostPort uint64 = 0, 0
-	if len(hostPort) > 0 {
-		startHostPort, endHostPort, err = ParsePortRange(hostPort)
-		if err != nil {
-			return nil, fmt.Errorf("Invalid hostPort: %s", hostPort)
-		}
-	}
-
-	if hostPort != "" && (endPort-startPort) != (endHostPort-startHostPort) {
-		// Allow host port range iff containerPort is not a range.
-		// In this case, use the host port range as the dynamic
-		// host port range to allocate into.
-		if endPort != startPort {
-			return nil, fmt.Errorf("Invalid ranges specified for container and host Ports: %s and %s", containerPort, hostPort)
-		}
-	}
-
-	if !validateProto(strings.ToLower(proto)) {
-		return nil, fmt.Errorf("Invalid proto: %s", proto)
-	}
-
-	ports := []PortMapping{}
-	for i := uint64(0); i <= (endPort - startPort); i++ {
-		containerPort = strconv.FormatUint(startPort+i, 10)
-		if len(hostPort) > 0 {
-			hostPort = strconv.FormatUint(startHostPort+i, 10)
-		}
-		// Set hostPort to a range only if there is a single container port
-		// and a dynamic host port.
-		if startPort == endPort && startHostPort != endHostPort {
-			hostPort = fmt.Sprintf("%s-%s", hostPort, strconv.FormatUint(endHostPort, 10))
-		}
-		port, err := NewPort(strings.ToLower(proto), containerPort)
-		if err != nil {
-			return nil, err
-		}
-
-		binding := PortBinding{
-			HostIP:   ip,
-			HostPort: hostPort,
-		}
-		ports = append(ports, PortMapping{Port: port, Binding: binding})
-	}
-	return ports, nil
-}
diff --git a/vendor/github.com/docker/go-connections/nat/parse.go b/vendor/github.com/docker/go-connections/nat/parse.go
deleted file mode 100644
index 892adf8c66..0000000000
--- a/vendor/github.com/docker/go-connections/nat/parse.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package nat
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-// PartParser parses and validates the specified string (data) using the specified template
-// e.g. ip:public:private -> 192.168.0.1:80:8000
-// DEPRECATED: do not use, this function may be removed in a future version
-func PartParser(template, data string) (map[string]string, error) {
-	// ip:public:private
-	var (
-		templateParts = strings.Split(template, ":")
-		parts         = strings.Split(data, ":")
-		out           = make(map[string]string, len(templateParts))
-	)
-	if len(parts) != len(templateParts) {
-		return nil, fmt.Errorf("Invalid format to parse. %s should match template %s", data, template)
-	}
-
-	for i, t := range templateParts {
-		value := ""
-		if len(parts) > i {
-			value = parts[i]
-		}
-		out[t] = value
-	}
-	return out, nil
-}
-
-// ParsePortRange parses and validates the specified string as a port-range (8000-9000)
-func ParsePortRange(ports string) (uint64, uint64, error) {
-	if ports == "" {
-		return 0, 0, fmt.Errorf("Empty string specified for ports.")
-	}
-	if !strings.Contains(ports, "-") {
-		start, err := strconv.ParseUint(ports, 10, 16)
-		end := start
-		return start, end, err
-	}
-
-	parts := strings.Split(ports, "-")
-	start, err := strconv.ParseUint(parts[0], 10, 16)
-	if err != nil {
-		return 0, 0, err
-	}
-	end, err := strconv.ParseUint(parts[1], 10, 16)
-	if err != nil {
-		return 0, 0, err
-	}
-	if end < start {
-		return 0, 0, fmt.Errorf("Invalid range specified for the Port: %s", ports)
-	}
-	return start, end, nil
-}
diff --git a/vendor/github.com/docker/go-connections/nat/sort.go b/vendor/github.com/docker/go-connections/nat/sort.go
deleted file mode 100644
index ce950171e3..0000000000
--- a/vendor/github.com/docker/go-connections/nat/sort.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package nat
-
-import (
-	"sort"
-	"strings"
-)
-
-type portSorter struct {
-	ports []Port
-	by    func(i, j Port) bool
-}
-
-func (s *portSorter) Len() int {
-	return len(s.ports)
-}
-
-func (s *portSorter) Swap(i, j int) {
-	s.ports[i], s.ports[j] = s.ports[j], s.ports[i]
-}
-
-func (s *portSorter) Less(i, j int) bool {
-	ip := s.ports[i]
-	jp := s.ports[j]
-
-	return s.by(ip, jp)
-}
-
-// Sort sorts a list of ports using the provided predicate
-// This function should compare `i` and `j`, returning true if `i` is
-// considered to be less than `j`
-func Sort(ports []Port, predicate func(i, j Port) bool) {
-	s := &portSorter{ports, predicate}
-	sort.Sort(s)
-}
-
-type portMapEntry struct {
-	port    Port
-	binding PortBinding
-}
-
-type portMapSorter []portMapEntry
-
-func (s portMapSorter) Len() int      { return len(s) }
-func (s portMapSorter) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-
-// sort the port so that the order is:
-// 1. port with larger specified bindings
-// 2. larger port
-// 3. port with tcp protocol
-func (s portMapSorter) Less(i, j int) bool {
-	pi, pj := s[i].port, s[j].port
-	hpi, hpj := toInt(s[i].binding.HostPort), toInt(s[j].binding.HostPort)
-	return hpi > hpj || pi.Int() > pj.Int() || (pi.Int() == pj.Int() && strings.ToLower(pi.Proto()) == "tcp")
-}
-
-// SortPortMap sorts the list of ports and their respected mapping. The ports
-// will explicit HostPort will be placed first.
-func SortPortMap(ports []Port, bindings PortMap) {
-	s := portMapSorter{}
-	for _, p := range ports {
-		if binding, ok := bindings[p]; ok {
-			for _, b := range binding {
-				s = append(s, portMapEntry{port: p, binding: b})
-			}
-			bindings[p] = []PortBinding{}
-		} else {
-			s = append(s, portMapEntry{port: p})
-		}
-	}
-
-	sort.Sort(s)
-	var (
-		i  int
-		pm = make(map[Port]struct{})
-	)
-	// reorder ports
-	for _, entry := range s {
-		if _, ok := pm[entry.port]; !ok {
-			ports[i] = entry.port
-			pm[entry.port] = struct{}{}
-			i++
-		}
-		// reorder bindings for this port
-		if _, ok := bindings[entry.port]; ok {
-			bindings[entry.port] = append(bindings[entry.port], entry.binding)
-		}
-	}
-}
-
-func toInt(s string) uint64 {
-	i, _, err := ParsePortRange(s)
-	if err != nil {
-		i = 0
-	}
-	return i
-}
diff --git a/vendor/github.com/docker/go-connections/sockets/inmem_socket.go b/vendor/github.com/docker/go-connections/sockets/inmem_socket.go
deleted file mode 100644
index 99846ffddb..0000000000
--- a/vendor/github.com/docker/go-connections/sockets/inmem_socket.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package sockets
-
-import (
-	"errors"
-	"net"
-	"sync"
-)
-
-var errClosed = errors.New("use of closed network connection")
-
-// InmemSocket implements net.Listener using in-memory only connections.
-type InmemSocket struct {
-	chConn  chan net.Conn
-	chClose chan struct{}
-	addr    string
-	mu      sync.Mutex
-}
-
-// dummyAddr is used to satisfy net.Addr for the in-mem socket
-// it is just stored as a string and returns the string for all calls
-type dummyAddr string
-
-// NewInmemSocket creates an in-memory only net.Listener
-// The addr argument can be any string, but is used to satisfy the `Addr()` part
-// of the net.Listener interface
-func NewInmemSocket(addr string, bufSize int) *InmemSocket {
-	return &InmemSocket{
-		chConn:  make(chan net.Conn, bufSize),
-		chClose: make(chan struct{}),
-		addr:    addr,
-	}
-}
-
-// Addr returns the socket's addr string to satisfy net.Listener
-func (s *InmemSocket) Addr() net.Addr {
-	return dummyAddr(s.addr)
-}
-
-// Accept implements the Accept method in the Listener interface; it waits for the next call and returns a generic Conn.
-func (s *InmemSocket) Accept() (net.Conn, error) {
-	select {
-	case conn := <-s.chConn:
-		return conn, nil
-	case <-s.chClose:
-		return nil, errClosed
-	}
-}
-
-// Close closes the listener. It will be unavailable for use once closed.
-func (s *InmemSocket) Close() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	select {
-	case <-s.chClose:
-	default:
-		close(s.chClose)
-	}
-	return nil
-}
-
-// Dial is used to establish a connection with the in-mem server
-func (s *InmemSocket) Dial(network, addr string) (net.Conn, error) {
-	srvConn, clientConn := net.Pipe()
-	select {
-	case s.chConn <- srvConn:
-	case <-s.chClose:
-		return nil, errClosed
-	}
-
-	return clientConn, nil
-}
-
-// Network returns the addr string, satisfies net.Addr
-func (a dummyAddr) Network() string {
-	return string(a)
-}
-
-// String returns the string form
-func (a dummyAddr) String() string {
-	return string(a)
-}
diff --git a/vendor/github.com/docker/go-connections/sockets/proxy.go b/vendor/github.com/docker/go-connections/sockets/proxy.go
deleted file mode 100644
index 98e9a1dc61..0000000000
--- a/vendor/github.com/docker/go-connections/sockets/proxy.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package sockets
-
-import (
-	"net"
-	"net/url"
-	"os"
-	"strings"
-
-	"golang.org/x/net/proxy"
-)
-
-// GetProxyEnv allows access to the uppercase and the lowercase forms of
-// proxy-related variables.  See the Go specification for details on these
-// variables. https://golang.org/pkg/net/http/
-func GetProxyEnv(key string) string {
-	proxyValue := os.Getenv(strings.ToUpper(key))
-	if proxyValue == "" {
-		return os.Getenv(strings.ToLower(key))
-	}
-	return proxyValue
-}
-
-// DialerFromEnvironment takes in a "direct" *net.Dialer and returns a
-// proxy.Dialer which will route the connections through the proxy using the
-// given dialer.
-func DialerFromEnvironment(direct *net.Dialer) (proxy.Dialer, error) {
-	allProxy := GetProxyEnv("all_proxy")
-	if len(allProxy) == 0 {
-		return direct, nil
-	}
-
-	proxyURL, err := url.Parse(allProxy)
-	if err != nil {
-		return direct, err
-	}
-
-	proxyFromURL, err := proxy.FromURL(proxyURL, direct)
-	if err != nil {
-		return direct, err
-	}
-
-	noProxy := GetProxyEnv("no_proxy")
-	if len(noProxy) == 0 {
-		return proxyFromURL, nil
-	}
-
-	perHost := proxy.NewPerHost(proxyFromURL, direct)
-	perHost.AddFromString(noProxy)
-
-	return perHost, nil
-}
diff --git a/vendor/github.com/docker/go-connections/sockets/sockets.go b/vendor/github.com/docker/go-connections/sockets/sockets.go
deleted file mode 100644
index a1d7beb4d8..0000000000
--- a/vendor/github.com/docker/go-connections/sockets/sockets.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Package sockets provides helper functions to create and configure Unix or TCP sockets.
-package sockets
-
-import (
-	"errors"
-	"net"
-	"net/http"
-	"time"
-)
-
-// Why 32? See https://github.com/docker/docker/pull/8035.
-const defaultTimeout = 32 * time.Second
-
-// ErrProtocolNotAvailable is returned when a given transport protocol is not provided by the operating system.
-var ErrProtocolNotAvailable = errors.New("protocol not available")
-
-// ConfigureTransport configures the specified Transport according to the
-// specified proto and addr.
-// If the proto is unix (using a unix socket to communicate) or npipe the
-// compression is disabled.
-func ConfigureTransport(tr *http.Transport, proto, addr string) error {
-	switch proto {
-	case "unix":
-		return configureUnixTransport(tr, proto, addr)
-	case "npipe":
-		return configureNpipeTransport(tr, proto, addr)
-	default:
-		tr.Proxy = http.ProxyFromEnvironment
-		dialer, err := DialerFromEnvironment(&net.Dialer{
-			Timeout: defaultTimeout,
-		})
-		if err != nil {
-			return err
-		}
-		tr.Dial = dialer.Dial
-	}
-	return nil
-}
diff --git a/vendor/github.com/docker/go-connections/sockets/sockets_unix.go b/vendor/github.com/docker/go-connections/sockets/sockets_unix.go
deleted file mode 100644
index 386cf0dbbd..0000000000
--- a/vendor/github.com/docker/go-connections/sockets/sockets_unix.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// +build !windows
-
-package sockets
-
-import (
-	"fmt"
-	"net"
-	"net/http"
-	"syscall"
-	"time"
-)
-
-const maxUnixSocketPathSize = len(syscall.RawSockaddrUnix{}.Path)
-
-func configureUnixTransport(tr *http.Transport, proto, addr string) error {
-	if len(addr) > maxUnixSocketPathSize {
-		return fmt.Errorf("Unix socket path %q is too long", addr)
-	}
-	// No need for compression in local communications.
-	tr.DisableCompression = true
-	tr.Dial = func(_, _ string) (net.Conn, error) {
-		return net.DialTimeout(proto, addr, defaultTimeout)
-	}
-	return nil
-}
-
-func configureNpipeTransport(tr *http.Transport, proto, addr string) error {
-	return ErrProtocolNotAvailable
-}
-
-// DialPipe connects to a Windows named pipe.
-// This is not supported on other OSes.
-func DialPipe(_ string, _ time.Duration) (net.Conn, error) {
-	return nil, syscall.EAFNOSUPPORT
-}
diff --git a/vendor/github.com/docker/go-connections/sockets/sockets_windows.go b/vendor/github.com/docker/go-connections/sockets/sockets_windows.go
deleted file mode 100644
index 5c21644e1f..0000000000
--- a/vendor/github.com/docker/go-connections/sockets/sockets_windows.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package sockets
-
-import (
-	"net"
-	"net/http"
-	"time"
-
-	"github.com/Microsoft/go-winio"
-)
-
-func configureUnixTransport(tr *http.Transport, proto, addr string) error {
-	return ErrProtocolNotAvailable
-}
-
-func configureNpipeTransport(tr *http.Transport, proto, addr string) error {
-	// No need for compression in local communications.
-	tr.DisableCompression = true
-	tr.Dial = func(_, _ string) (net.Conn, error) {
-		return DialPipe(addr, defaultTimeout)
-	}
-	return nil
-}
-
-// DialPipe connects to a Windows named pipe.
-func DialPipe(addr string, timeout time.Duration) (net.Conn, error) {
-	return winio.DialPipe(addr, &timeout)
-}
diff --git a/vendor/github.com/docker/go-connections/sockets/tcp_socket.go b/vendor/github.com/docker/go-connections/sockets/tcp_socket.go
deleted file mode 100644
index 53cbb6c79e..0000000000
--- a/vendor/github.com/docker/go-connections/sockets/tcp_socket.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Package sockets provides helper functions to create and configure Unix or TCP sockets.
-package sockets
-
-import (
-	"crypto/tls"
-	"net"
-)
-
-// NewTCPSocket creates a TCP socket listener with the specified address and
-// the specified tls configuration. If TLSConfig is set, will encapsulate the
-// TCP listener inside a TLS one.
-func NewTCPSocket(addr string, tlsConfig *tls.Config) (net.Listener, error) {
-	l, err := net.Listen("tcp", addr)
-	if err != nil {
-		return nil, err
-	}
-	if tlsConfig != nil {
-		tlsConfig.NextProtos = []string{"http/1.1"}
-		l = tls.NewListener(l, tlsConfig)
-	}
-	return l, nil
-}
diff --git a/vendor/github.com/docker/go-connections/sockets/unix_socket.go b/vendor/github.com/docker/go-connections/sockets/unix_socket.go
deleted file mode 100644
index a8b5dbb6fd..0000000000
--- a/vendor/github.com/docker/go-connections/sockets/unix_socket.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// +build !windows
-
-package sockets
-
-import (
-	"net"
-	"os"
-	"syscall"
-)
-
-// NewUnixSocket creates a unix socket with the specified path and group.
-func NewUnixSocket(path string, gid int) (net.Listener, error) {
-	if err := syscall.Unlink(path); err != nil && !os.IsNotExist(err) {
-		return nil, err
-	}
-	mask := syscall.Umask(0777)
-	defer syscall.Umask(mask)
-
-	l, err := net.Listen("unix", path)
-	if err != nil {
-		return nil, err
-	}
-	if err := os.Chown(path, 0, gid); err != nil {
-		l.Close()
-		return nil, err
-	}
-	if err := os.Chmod(path, 0660); err != nil {
-		l.Close()
-		return nil, err
-	}
-	return l, nil
-}
diff --git a/vendor/github.com/docker/go-connections/tlsconfig/certpool_go17.go b/vendor/github.com/docker/go-connections/tlsconfig/certpool_go17.go
deleted file mode 100644
index 1d5fa4c76d..0000000000
--- a/vendor/github.com/docker/go-connections/tlsconfig/certpool_go17.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// +build go1.7
-
-package tlsconfig
-
-import (
-	"crypto/x509"
-	"runtime"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// SystemCertPool returns a copy of the system cert pool,
-// returns an error if failed to load or empty pool on windows.
-func SystemCertPool() (*x509.CertPool, error) {
-	certpool, err := x509.SystemCertPool()
-	if err != nil && runtime.GOOS == "windows" {
-		logrus.Infof("Unable to use system certificate pool: %v", err)
-		return x509.NewCertPool(), nil
-	}
-	return certpool, err
-}
diff --git a/vendor/github.com/docker/go-connections/tlsconfig/certpool_other.go b/vendor/github.com/docker/go-connections/tlsconfig/certpool_other.go
deleted file mode 100644
index 262c95e8cd..0000000000
--- a/vendor/github.com/docker/go-connections/tlsconfig/certpool_other.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build !go1.7
-
-package tlsconfig
-
-import (
-	"crypto/x509"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// SystemCertPool returns an new empty cert pool,
-// accessing system cert pool is supported in go 1.7
-func SystemCertPool() (*x509.CertPool, error) {
-	logrus.Warn("Unable to use system certificate pool: requires building with go 1.7 or later")
-	return x509.NewCertPool(), nil
-}
diff --git a/vendor/github.com/docker/go-connections/tlsconfig/config.go b/vendor/github.com/docker/go-connections/tlsconfig/config.go
deleted file mode 100644
index ad4b112ab3..0000000000
--- a/vendor/github.com/docker/go-connections/tlsconfig/config.go
+++ /dev/null
@@ -1,246 +0,0 @@
-// Package tlsconfig provides primitives to retrieve secure-enough TLS configurations for both clients and servers.
-//
-// As a reminder from https://golang.org/pkg/crypto/tls/#Config:
-//	A Config structure is used to configure a TLS client or server. After one has been passed to a TLS function it must not be modified.
-//	A Config may be reused; the tls package will also not modify it.
-package tlsconfig
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/pem"
-	"fmt"
-	"io/ioutil"
-	"os"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/pkg/errors"
-)
-
-// Options represents the information needed to create client and server TLS configurations.
-type Options struct {
-	CAFile string
-
-	// If either CertFile or KeyFile is empty, Client() will not load them
-	// preventing the client from authenticating to the server.
-	// However, Server() requires them and will error out if they are empty.
-	CertFile string
-	KeyFile  string
-
-	// client-only option
-	InsecureSkipVerify bool
-	// server-only option
-	ClientAuth tls.ClientAuthType
-	// If ExclusiveRootPools is set, then if a CA file is provided, the root pool used for TLS
-	// creds will include exclusively the roots in that CA file.  If no CA file is provided,
-	// the system pool will be used.
-	ExclusiveRootPools bool
-	MinVersion         uint16
-	// If Passphrase is set, it will be used to decrypt a TLS private key
-	// if the key is encrypted
-	Passphrase string
-}
-
-// Extra (server-side) accepted CBC cipher suites - will phase out in the future
-var acceptedCBCCiphers = []uint16{
-	tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-	tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-	tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-	tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-	tls.TLS_RSA_WITH_AES_256_CBC_SHA,
-	tls.TLS_RSA_WITH_AES_128_CBC_SHA,
-}
-
-// DefaultServerAcceptedCiphers should be uses by code which already has a crypto/tls
-// options struct but wants to use a commonly accepted set of TLS cipher suites, with
-// known weak algorithms removed.
-var DefaultServerAcceptedCiphers = append(clientCipherSuites, acceptedCBCCiphers...)
-
-// allTLSVersions lists all the TLS versions and is used by the code that validates
-// a uint16 value as a TLS version.
-var allTLSVersions = map[uint16]struct{}{
-	tls.VersionSSL30: {},
-	tls.VersionTLS10: {},
-	tls.VersionTLS11: {},
-	tls.VersionTLS12: {},
-}
-
-// ServerDefault returns a secure-enough TLS configuration for the server TLS configuration.
-func ServerDefault() *tls.Config {
-	return &tls.Config{
-		// Avoid fallback to SSL protocols < TLS1.0
-		MinVersion:               tls.VersionTLS10,
-		PreferServerCipherSuites: true,
-		CipherSuites:             DefaultServerAcceptedCiphers,
-	}
-}
-
-// ClientDefault returns a secure-enough TLS configuration for the client TLS configuration.
-func ClientDefault() *tls.Config {
-	return &tls.Config{
-		// Prefer TLS1.2 as the client minimum
-		MinVersion:   tls.VersionTLS12,
-		CipherSuites: clientCipherSuites,
-	}
-}
-
-// certPool returns an X.509 certificate pool from `caFile`, the certificate file.
-func certPool(caFile string, exclusivePool bool) (*x509.CertPool, error) {
-	// If we should verify the server, we need to load a trusted ca
-	var (
-		certPool *x509.CertPool
-		err      error
-	)
-	if exclusivePool {
-		certPool = x509.NewCertPool()
-	} else {
-		certPool, err = SystemCertPool()
-		if err != nil {
-			return nil, fmt.Errorf("failed to read system certificates: %v", err)
-		}
-	}
-	pem, err := ioutil.ReadFile(caFile)
-	if err != nil {
-		return nil, fmt.Errorf("could not read CA certificate %q: %v", caFile, err)
-	}
-	if !certPool.AppendCertsFromPEM(pem) {
-		return nil, fmt.Errorf("failed to append certificates from PEM file: %q", caFile)
-	}
-	logrus.Debugf("Trusting %d certs", len(certPool.Subjects()))
-	return certPool, nil
-}
-
-// isValidMinVersion checks that the input value is a valid tls minimum version
-func isValidMinVersion(version uint16) bool {
-	_, ok := allTLSVersions[version]
-	return ok
-}
-
-// adjustMinVersion sets the MinVersion on `config`, the input configuration.
-// It assumes the current MinVersion on the `config` is the lowest allowed.
-func adjustMinVersion(options Options, config *tls.Config) error {
-	if options.MinVersion > 0 {
-		if !isValidMinVersion(options.MinVersion) {
-			return fmt.Errorf("Invalid minimum TLS version: %x", options.MinVersion)
-		}
-		if options.MinVersion < config.MinVersion {
-			return fmt.Errorf("Requested minimum TLS version is too low. Should be at-least: %x", config.MinVersion)
-		}
-		config.MinVersion = options.MinVersion
-	}
-
-	return nil
-}
-
-// IsErrEncryptedKey returns true if the 'err' is an error of incorrect
-// password when tryin to decrypt a TLS private key
-func IsErrEncryptedKey(err error) bool {
-	return errors.Cause(err) == x509.IncorrectPasswordError
-}
-
-// getPrivateKey returns the private key in 'keyBytes', in PEM-encoded format.
-// If the private key is encrypted, 'passphrase' is used to decrypted the
-// private key.
-func getPrivateKey(keyBytes []byte, passphrase string) ([]byte, error) {
-	// this section makes some small changes to code from notary/tuf/utils/x509.go
-	pemBlock, _ := pem.Decode(keyBytes)
-	if pemBlock == nil {
-		return nil, fmt.Errorf("no valid private key found")
-	}
-
-	var err error
-	if x509.IsEncryptedPEMBlock(pemBlock) {
-		keyBytes, err = x509.DecryptPEMBlock(pemBlock, []byte(passphrase))
-		if err != nil {
-			return nil, errors.Wrap(err, "private key is encrypted, but could not decrypt it")
-		}
-		keyBytes = pem.EncodeToMemory(&pem.Block{Type: pemBlock.Type, Bytes: keyBytes})
-	}
-
-	return keyBytes, nil
-}
-
-// getCert returns a Certificate from the CertFile and KeyFile in 'options',
-// if the key is encrypted, the Passphrase in 'options' will be used to
-// decrypt it.
-func getCert(options Options) ([]tls.Certificate, error) {
-	if options.CertFile == "" && options.KeyFile == "" {
-		return nil, nil
-	}
-
-	errMessage := "Could not load X509 key pair"
-
-	cert, err := ioutil.ReadFile(options.CertFile)
-	if err != nil {
-		return nil, errors.Wrap(err, errMessage)
-	}
-
-	prKeyBytes, err := ioutil.ReadFile(options.KeyFile)
-	if err != nil {
-		return nil, errors.Wrap(err, errMessage)
-	}
-
-	prKeyBytes, err = getPrivateKey(prKeyBytes, options.Passphrase)
-	if err != nil {
-		return nil, errors.Wrap(err, errMessage)
-	}
-
-	tlsCert, err := tls.X509KeyPair(cert, prKeyBytes)
-	if err != nil {
-		return nil, errors.Wrap(err, errMessage)
-	}
-
-	return []tls.Certificate{tlsCert}, nil
-}
-
-// Client returns a TLS configuration meant to be used by a client.
-func Client(options Options) (*tls.Config, error) {
-	tlsConfig := ClientDefault()
-	tlsConfig.InsecureSkipVerify = options.InsecureSkipVerify
-	if !options.InsecureSkipVerify && options.CAFile != "" {
-		CAs, err := certPool(options.CAFile, options.ExclusiveRootPools)
-		if err != nil {
-			return nil, err
-		}
-		tlsConfig.RootCAs = CAs
-	}
-
-	tlsCerts, err := getCert(options)
-	if err != nil {
-		return nil, err
-	}
-	tlsConfig.Certificates = tlsCerts
-
-	if err := adjustMinVersion(options, tlsConfig); err != nil {
-		return nil, err
-	}
-
-	return tlsConfig, nil
-}
-
-// Server returns a TLS configuration meant to be used by a server.
-func Server(options Options) (*tls.Config, error) {
-	tlsConfig := ServerDefault()
-	tlsConfig.ClientAuth = options.ClientAuth
-	tlsCert, err := tls.LoadX509KeyPair(options.CertFile, options.KeyFile)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil, fmt.Errorf("Could not load X509 key pair (cert: %q, key: %q): %v", options.CertFile, options.KeyFile, err)
-		}
-		return nil, fmt.Errorf("Error reading X509 key pair (cert: %q, key: %q): %v. Make sure the key is not encrypted.", options.CertFile, options.KeyFile, err)
-	}
-	tlsConfig.Certificates = []tls.Certificate{tlsCert}
-	if options.ClientAuth >= tls.VerifyClientCertIfGiven && options.CAFile != "" {
-		CAs, err := certPool(options.CAFile, options.ExclusiveRootPools)
-		if err != nil {
-			return nil, err
-		}
-		tlsConfig.ClientCAs = CAs
-	}
-
-	if err := adjustMinVersion(options, tlsConfig); err != nil {
-		return nil, err
-	}
-
-	return tlsConfig, nil
-}
diff --git a/vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go b/vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go
deleted file mode 100644
index 6b4c6a7c0d..0000000000
--- a/vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build go1.5
-
-// Package tlsconfig provides primitives to retrieve secure-enough TLS configurations for both clients and servers.
-//
-package tlsconfig
-
-import (
-	"crypto/tls"
-)
-
-// Client TLS cipher suites (dropping CBC ciphers for client preferred suite set)
-var clientCipherSuites = []uint16{
-	tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-	tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-	tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-	tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-}
diff --git a/vendor/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go b/vendor/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go
deleted file mode 100644
index ee22df47cb..0000000000
--- a/vendor/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build !go1.5
-
-// Package tlsconfig provides primitives to retrieve secure-enough TLS configurations for both clients and servers.
-//
-package tlsconfig
-
-import (
-	"crypto/tls"
-)
-
-// Client TLS cipher suites (dropping CBC ciphers for client preferred suite set)
-var clientCipherSuites = []uint16{
-	tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-	tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-}
diff --git a/vendor/github.com/docker/go-units/CONTRIBUTING.md b/vendor/github.com/docker/go-units/CONTRIBUTING.md
deleted file mode 100644
index 9ea86d784e..0000000000
--- a/vendor/github.com/docker/go-units/CONTRIBUTING.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Contributing to go-units
-
-Want to hack on go-units? Awesome! Here are instructions to get you started.
-
-go-units is a part of the [Docker](https://www.docker.com) project, and follows
-the same rules and principles. If you're already familiar with the way
-Docker does things, you'll feel right at home.
-
-Otherwise, go read Docker's
-[contributions guidelines](https://github.com/docker/docker/blob/master/CONTRIBUTING.md),
-[issue triaging](https://github.com/docker/docker/blob/master/project/ISSUE-TRIAGE.md),
-[review process](https://github.com/docker/docker/blob/master/project/REVIEWING.md) and
-[branches and tags](https://github.com/docker/docker/blob/master/project/BRANCHES-AND-TAGS.md).
-
-### Sign your work
-
-The sign-off is a simple line at the end of the explanation for the patch. Your
-signature certifies that you wrote the patch or otherwise have the right to pass
-it on as an open-source patch. The rules are pretty simple: if you can certify
-the below (from [developercertificate.org](http://developercertificate.org/)):
-
-```
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-660 York Street, Suite 102,
-San Francisco, CA 94110 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
-```
-
-Then you just add a line to every git commit message:
-
-    Signed-off-by: Joe Smith <joe.smith@email.com>
-
-Use your real name (sorry, no pseudonyms or anonymous contributions.)
-
-If you set your `user.name` and `user.email` git configs, you can sign your
-commit automatically with `git commit -s`.
diff --git a/vendor/github.com/docker/go-units/LICENSE b/vendor/github.com/docker/go-units/LICENSE
deleted file mode 100644
index b55b37bc31..0000000000
--- a/vendor/github.com/docker/go-units/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        https://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2015 Docker, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       https://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/docker/go-units/MAINTAINERS b/vendor/github.com/docker/go-units/MAINTAINERS
deleted file mode 100644
index 477be8b214..0000000000
--- a/vendor/github.com/docker/go-units/MAINTAINERS
+++ /dev/null
@@ -1,27 +0,0 @@
-# go-connections maintainers file
-#
-# This file describes who runs the docker/go-connections project and how.
-# This is a living document - if you see something out of date or missing, speak up!
-#
-# It is structured to be consumable by both humans and programs.
-# To extract its contents programmatically, use any TOML-compliant parser.
-#
-# This file is compiled into the MAINTAINERS file in docker/opensource.
-#
-[Org]
-	[Org."Core maintainers"]
-		people = [
-			"calavera",
-		]
-
-[people]
-
-# A reference list of all people associated with the project.
-# All other sections should refer to people by their canonical key
-# in the people section.
-
-	# ADD YOURSELF HERE IN ALPHABETICAL ORDER
-	[people.calavera]
-	Name = "David Calavera"
-	Email = "david.calavera@gmail.com"
-	GitHub = "calavera"
diff --git a/vendor/github.com/docker/go-units/README.md b/vendor/github.com/docker/go-units/README.md
deleted file mode 100644
index 4f70a4e134..0000000000
--- a/vendor/github.com/docker/go-units/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-[![GoDoc](https://godoc.org/github.com/docker/go-units?status.svg)](https://godoc.org/github.com/docker/go-units)
-
-# Introduction
-
-go-units is a library to transform human friendly measurements into machine friendly values.
-
-## Usage
-
-See the [docs in godoc](https://godoc.org/github.com/docker/go-units) for examples and documentation.
-
-## Copyright and license
-
-Copyright © 2015 Docker, Inc.
-
-go-units is licensed under the Apache License, Version 2.0.
-See [LICENSE](LICENSE) for the full text of the license.
diff --git a/vendor/github.com/docker/go-units/circle.yml b/vendor/github.com/docker/go-units/circle.yml
deleted file mode 100644
index 9043b35478..0000000000
--- a/vendor/github.com/docker/go-units/circle.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-dependencies:
-  post:
-    # install golint
-    - go get github.com/golang/lint/golint
-
-test:
-  pre:
-    # run analysis before tests
-    - go vet ./...
-    - test -z "$(golint ./... | tee /dev/stderr)"
-    - test -z "$(gofmt -s -l . | tee /dev/stderr)"
diff --git a/vendor/github.com/docker/go-units/duration.go b/vendor/github.com/docker/go-units/duration.go
deleted file mode 100644
index ba02af26dc..0000000000
--- a/vendor/github.com/docker/go-units/duration.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Package units provides helper function to parse and print size and time units
-// in human-readable format.
-package units
-
-import (
-	"fmt"
-	"time"
-)
-
-// HumanDuration returns a human-readable approximation of a duration
-// (eg. "About a minute", "4 hours ago", etc.).
-func HumanDuration(d time.Duration) string {
-	if seconds := int(d.Seconds()); seconds < 1 {
-		return "Less than a second"
-	} else if seconds == 1 {
-		return "1 second"
-	} else if seconds < 60 {
-		return fmt.Sprintf("%d seconds", seconds)
-	} else if minutes := int(d.Minutes()); minutes == 1 {
-		return "About a minute"
-	} else if minutes < 46 {
-		return fmt.Sprintf("%d minutes", minutes)
-	} else if hours := int(d.Hours() + 0.5); hours == 1 {
-		return "About an hour"
-	} else if hours < 48 {
-		return fmt.Sprintf("%d hours", hours)
-	} else if hours < 24*7*2 {
-		return fmt.Sprintf("%d days", hours/24)
-	} else if hours < 24*30*2 {
-		return fmt.Sprintf("%d weeks", hours/24/7)
-	} else if hours < 24*365*2 {
-		return fmt.Sprintf("%d months", hours/24/30)
-	}
-	return fmt.Sprintf("%d years", int(d.Hours())/24/365)
-}
diff --git a/vendor/github.com/docker/go-units/size.go b/vendor/github.com/docker/go-units/size.go
deleted file mode 100644
index 44616c2718..0000000000
--- a/vendor/github.com/docker/go-units/size.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package units
-
-import (
-	"fmt"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-// See: http://en.wikipedia.org/wiki/Binary_prefix
-const (
-	// Decimal
-
-	KB = 1000
-	MB = 1000 * KB
-	GB = 1000 * MB
-	TB = 1000 * GB
-	PB = 1000 * TB
-
-	// Binary
-
-	KiB = 1024
-	MiB = 1024 * KiB
-	GiB = 1024 * MiB
-	TiB = 1024 * GiB
-	PiB = 1024 * TiB
-)
-
-type unitMap map[string]int64
-
-var (
-	decimalMap = unitMap{"k": KB, "m": MB, "g": GB, "t": TB, "p": PB}
-	binaryMap  = unitMap{"k": KiB, "m": MiB, "g": GiB, "t": TiB, "p": PiB}
-	sizeRegex  = regexp.MustCompile(`^(\d+(\.\d+)*) ?([kKmMgGtTpP])?[bB]?$`)
-)
-
-var decimapAbbrs = []string{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"}
-var binaryAbbrs = []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"}
-
-func getSizeAndUnit(size float64, base float64, _map []string) (float64, string) {
-	i := 0
-	unitsLimit := len(_map) - 1
-	for size >= base && i < unitsLimit {
-		size = size / base
-		i++
-	}
-	return size, _map[i]
-}
-
-// CustomSize returns a human-readable approximation of a size
-// using custom format.
-func CustomSize(format string, size float64, base float64, _map []string) string {
-	size, unit := getSizeAndUnit(size, base, _map)
-	return fmt.Sprintf(format, size, unit)
-}
-
-// HumanSizeWithPrecision allows the size to be in any precision,
-// instead of 4 digit precision used in units.HumanSize.
-func HumanSizeWithPrecision(size float64, precision int) string {
-	size, unit := getSizeAndUnit(size, 1000.0, decimapAbbrs)
-	return fmt.Sprintf("%.*g%s", precision, size, unit)
-}
-
-// HumanSize returns a human-readable approximation of a size
-// capped at 4 valid numbers (eg. "2.746 MB", "796 KB").
-func HumanSize(size float64) string {
-	return HumanSizeWithPrecision(size, 4)
-}
-
-// BytesSize returns a human-readable size in bytes, kibibytes,
-// mebibytes, gibibytes, or tebibytes (eg. "44kiB", "17MiB").
-func BytesSize(size float64) string {
-	return CustomSize("%.4g%s", size, 1024.0, binaryAbbrs)
-}
-
-// FromHumanSize returns an integer from a human-readable specification of a
-// size using SI standard (eg. "44kB", "17MB").
-func FromHumanSize(size string) (int64, error) {
-	return parseSize(size, decimalMap)
-}
-
-// RAMInBytes parses a human-readable string representing an amount of RAM
-// in bytes, kibibytes, mebibytes, gibibytes, or tebibytes and
-// returns the number of bytes, or -1 if the string is unparseable.
-// Units are case-insensitive, and the 'b' suffix is optional.
-func RAMInBytes(size string) (int64, error) {
-	return parseSize(size, binaryMap)
-}
-
-// Parses the human-readable size string into the amount it represents.
-func parseSize(sizeStr string, uMap unitMap) (int64, error) {
-	matches := sizeRegex.FindStringSubmatch(sizeStr)
-	if len(matches) != 4 {
-		return -1, fmt.Errorf("invalid size: '%s'", sizeStr)
-	}
-
-	size, err := strconv.ParseFloat(matches[1], 64)
-	if err != nil {
-		return -1, err
-	}
-
-	unitPrefix := strings.ToLower(matches[3])
-	if mul, ok := uMap[unitPrefix]; ok {
-		size *= float64(mul)
-	}
-
-	return int64(size), nil
-}
diff --git a/vendor/github.com/docker/go-units/ulimit.go b/vendor/github.com/docker/go-units/ulimit.go
deleted file mode 100644
index 5ac7fd825f..0000000000
--- a/vendor/github.com/docker/go-units/ulimit.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package units
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-// Ulimit is a human friendly version of Rlimit.
-type Ulimit struct {
-	Name string
-	Hard int64
-	Soft int64
-}
-
-// Rlimit specifies the resource limits, such as max open files.
-type Rlimit struct {
-	Type int    `json:"type,omitempty"`
-	Hard uint64 `json:"hard,omitempty"`
-	Soft uint64 `json:"soft,omitempty"`
-}
-
-const (
-	// magic numbers for making the syscall
-	// some of these are defined in the syscall package, but not all.
-	// Also since Windows client doesn't get access to the syscall package, need to
-	//	define these here
-	rlimitAs         = 9
-	rlimitCore       = 4
-	rlimitCPU        = 0
-	rlimitData       = 2
-	rlimitFsize      = 1
-	rlimitLocks      = 10
-	rlimitMemlock    = 8
-	rlimitMsgqueue   = 12
-	rlimitNice       = 13
-	rlimitNofile     = 7
-	rlimitNproc      = 6
-	rlimitRss        = 5
-	rlimitRtprio     = 14
-	rlimitRttime     = 15
-	rlimitSigpending = 11
-	rlimitStack      = 3
-)
-
-var ulimitNameMapping = map[string]int{
-	//"as":         rlimitAs, // Disabled since this doesn't seem usable with the way Docker inits a container.
-	"core":       rlimitCore,
-	"cpu":        rlimitCPU,
-	"data":       rlimitData,
-	"fsize":      rlimitFsize,
-	"locks":      rlimitLocks,
-	"memlock":    rlimitMemlock,
-	"msgqueue":   rlimitMsgqueue,
-	"nice":       rlimitNice,
-	"nofile":     rlimitNofile,
-	"nproc":      rlimitNproc,
-	"rss":        rlimitRss,
-	"rtprio":     rlimitRtprio,
-	"rttime":     rlimitRttime,
-	"sigpending": rlimitSigpending,
-	"stack":      rlimitStack,
-}
-
-// ParseUlimit parses and returns a Ulimit from the specified string.
-func ParseUlimit(val string) (*Ulimit, error) {
-	parts := strings.SplitN(val, "=", 2)
-	if len(parts) != 2 {
-		return nil, fmt.Errorf("invalid ulimit argument: %s", val)
-	}
-
-	if _, exists := ulimitNameMapping[parts[0]]; !exists {
-		return nil, fmt.Errorf("invalid ulimit type: %s", parts[0])
-	}
-
-	var (
-		soft int64
-		hard = &soft // default to soft in case no hard was set
-		temp int64
-		err  error
-	)
-	switch limitVals := strings.Split(parts[1], ":"); len(limitVals) {
-	case 2:
-		temp, err = strconv.ParseInt(limitVals[1], 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		hard = &temp
-		fallthrough
-	case 1:
-		soft, err = strconv.ParseInt(limitVals[0], 10, 64)
-		if err != nil {
-			return nil, err
-		}
-	default:
-		return nil, fmt.Errorf("too many limit value arguments - %s, can only have up to two, `soft[:hard]`", parts[1])
-	}
-
-	if soft > *hard {
-		return nil, fmt.Errorf("ulimit soft limit must be less than or equal to hard limit: %d > %d", soft, *hard)
-	}
-
-	return &Ulimit{Name: parts[0], Soft: soft, Hard: *hard}, nil
-}
-
-// GetRlimit returns the RLimit corresponding to Ulimit.
-func (u *Ulimit) GetRlimit() (*Rlimit, error) {
-	t, exists := ulimitNameMapping[u.Name]
-	if !exists {
-		return nil, fmt.Errorf("invalid ulimit name %s", u.Name)
-	}
-
-	return &Rlimit{Type: t, Soft: uint64(u.Soft), Hard: uint64(u.Hard)}, nil
-}
-
-func (u *Ulimit) String() string {
-	return fmt.Sprintf("%s=%d:%d", u.Name, u.Soft, u.Hard)
-}
diff --git a/vendor/github.com/docker/libtrust/CONTRIBUTING.md b/vendor/github.com/docker/libtrust/CONTRIBUTING.md
deleted file mode 100644
index 05be0f8ab3..0000000000
--- a/vendor/github.com/docker/libtrust/CONTRIBUTING.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Contributing to libtrust
-
-Want to hack on libtrust? Awesome! Here are instructions to get you
-started.
-
-libtrust is a part of the [Docker](https://www.docker.com) project, and follows
-the same rules and principles. If you're already familiar with the way
-Docker does things, you'll feel right at home.
-
-Otherwise, go read
-[Docker's contributions guidelines](https://github.com/docker/docker/blob/master/CONTRIBUTING.md).
-
-Happy hacking!
diff --git a/vendor/github.com/docker/libtrust/LICENSE b/vendor/github.com/docker/libtrust/LICENSE
deleted file mode 100644
index 27448585ad..0000000000
--- a/vendor/github.com/docker/libtrust/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2014 Docker, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/docker/libtrust/MAINTAINERS b/vendor/github.com/docker/libtrust/MAINTAINERS
deleted file mode 100644
index 9768175feb..0000000000
--- a/vendor/github.com/docker/libtrust/MAINTAINERS
+++ /dev/null
@@ -1,3 +0,0 @@
-Solomon Hykes <solomon@docker.com>
-Josh Hawn <josh@docker.com> (github: jlhawn)
-Derek McGowan <derek@docker.com> (github: dmcgowan)
diff --git a/vendor/github.com/docker/libtrust/README.md b/vendor/github.com/docker/libtrust/README.md
deleted file mode 100644
index dcffb31ae4..0000000000
--- a/vendor/github.com/docker/libtrust/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# libtrust
-
-> **WARNING** this library is no longer actively developed, and will be integrated
-> in the [docker/distribution][https://www.github.com/docker/distribution]
-> repository in future.
-
-Libtrust is library for managing authentication and authorization using public key cryptography.
-
-Authentication is handled using the identity attached to the public key.
-Libtrust provides multiple methods to prove possession of the private key associated with an identity.
- - TLS x509 certificates
- - Signature verification
- - Key Challenge
-
-Authorization and access control is managed through a distributed trust graph.
-Trust servers are used as the authorities of the trust graph and allow caching portions of the graph for faster access.
-
-## Copyright and license
-
-Code and documentation copyright 2014 Docker, inc. Code released under the Apache 2.0 license.
-Docs released under Creative commons.
-
diff --git a/vendor/github.com/docker/libtrust/certificates.go b/vendor/github.com/docker/libtrust/certificates.go
deleted file mode 100644
index 3dcca33cb1..0000000000
--- a/vendor/github.com/docker/libtrust/certificates.go
+++ /dev/null
@@ -1,175 +0,0 @@
-package libtrust
-
-import (
-	"crypto/rand"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/pem"
-	"fmt"
-	"io/ioutil"
-	"math/big"
-	"net"
-	"time"
-)
-
-type certTemplateInfo struct {
-	commonName  string
-	domains     []string
-	ipAddresses []net.IP
-	isCA        bool
-	clientAuth  bool
-	serverAuth  bool
-}
-
-func generateCertTemplate(info *certTemplateInfo) *x509.Certificate {
-	// Generate a certificate template which is valid from the past week to
-	// 10 years from now. The usage of the certificate depends on the
-	// specified fields in the given certTempInfo object.
-	var (
-		keyUsage    x509.KeyUsage
-		extKeyUsage []x509.ExtKeyUsage
-	)
-
-	if info.isCA {
-		keyUsage = x509.KeyUsageCertSign
-	}
-
-	if info.clientAuth {
-		extKeyUsage = append(extKeyUsage, x509.ExtKeyUsageClientAuth)
-	}
-
-	if info.serverAuth {
-		extKeyUsage = append(extKeyUsage, x509.ExtKeyUsageServerAuth)
-	}
-
-	return &x509.Certificate{
-		SerialNumber: big.NewInt(0),
-		Subject: pkix.Name{
-			CommonName: info.commonName,
-		},
-		NotBefore:             time.Now().Add(-time.Hour * 24 * 7),
-		NotAfter:              time.Now().Add(time.Hour * 24 * 365 * 10),
-		DNSNames:              info.domains,
-		IPAddresses:           info.ipAddresses,
-		IsCA:                  info.isCA,
-		KeyUsage:              keyUsage,
-		ExtKeyUsage:           extKeyUsage,
-		BasicConstraintsValid: info.isCA,
-	}
-}
-
-func generateCert(pub PublicKey, priv PrivateKey, subInfo, issInfo *certTemplateInfo) (cert *x509.Certificate, err error) {
-	pubCertTemplate := generateCertTemplate(subInfo)
-	privCertTemplate := generateCertTemplate(issInfo)
-
-	certDER, err := x509.CreateCertificate(
-		rand.Reader, pubCertTemplate, privCertTemplate,
-		pub.CryptoPublicKey(), priv.CryptoPrivateKey(),
-	)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create certificate: %s", err)
-	}
-
-	cert, err = x509.ParseCertificate(certDER)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse certificate: %s", err)
-	}
-
-	return
-}
-
-// GenerateSelfSignedServerCert creates a self-signed certificate for the
-// given key which is to be used for TLS servers with the given domains and
-// IP addresses.
-func GenerateSelfSignedServerCert(key PrivateKey, domains []string, ipAddresses []net.IP) (*x509.Certificate, error) {
-	info := &certTemplateInfo{
-		commonName:  key.KeyID(),
-		domains:     domains,
-		ipAddresses: ipAddresses,
-		serverAuth:  true,
-	}
-
-	return generateCert(key.PublicKey(), key, info, info)
-}
-
-// GenerateSelfSignedClientCert creates a self-signed certificate for the
-// given key which is to be used for TLS clients.
-func GenerateSelfSignedClientCert(key PrivateKey) (*x509.Certificate, error) {
-	info := &certTemplateInfo{
-		commonName: key.KeyID(),
-		clientAuth: true,
-	}
-
-	return generateCert(key.PublicKey(), key, info, info)
-}
-
-// GenerateCACert creates a certificate which can be used as a trusted
-// certificate authority.
-func GenerateCACert(signer PrivateKey, trustedKey PublicKey) (*x509.Certificate, error) {
-	subjectInfo := &certTemplateInfo{
-		commonName: trustedKey.KeyID(),
-		isCA:       true,
-	}
-	issuerInfo := &certTemplateInfo{
-		commonName: signer.KeyID(),
-	}
-
-	return generateCert(trustedKey, signer, subjectInfo, issuerInfo)
-}
-
-// GenerateCACertPool creates a certificate authority pool to be used for a
-// TLS configuration. Any self-signed certificates issued by the specified
-// trusted keys will be verified during a TLS handshake
-func GenerateCACertPool(signer PrivateKey, trustedKeys []PublicKey) (*x509.CertPool, error) {
-	certPool := x509.NewCertPool()
-
-	for _, trustedKey := range trustedKeys {
-		cert, err := GenerateCACert(signer, trustedKey)
-		if err != nil {
-			return nil, fmt.Errorf("failed to generate CA certificate: %s", err)
-		}
-
-		certPool.AddCert(cert)
-	}
-
-	return certPool, nil
-}
-
-// LoadCertificateBundle loads certificates from the given file.  The file should be pem encoded
-// containing one or more certificates.  The expected pem type is "CERTIFICATE".
-func LoadCertificateBundle(filename string) ([]*x509.Certificate, error) {
-	b, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-	certificates := []*x509.Certificate{}
-	var block *pem.Block
-	block, b = pem.Decode(b)
-	for ; block != nil; block, b = pem.Decode(b) {
-		if block.Type == "CERTIFICATE" {
-			cert, err := x509.ParseCertificate(block.Bytes)
-			if err != nil {
-				return nil, err
-			}
-			certificates = append(certificates, cert)
-		} else {
-			return nil, fmt.Errorf("invalid pem block type: %s", block.Type)
-		}
-	}
-
-	return certificates, nil
-}
-
-// LoadCertificatePool loads a CA pool from the given file.  The file should be pem encoded
-// containing one or more certificates. The expected pem type is "CERTIFICATE".
-func LoadCertificatePool(filename string) (*x509.CertPool, error) {
-	certs, err := LoadCertificateBundle(filename)
-	if err != nil {
-		return nil, err
-	}
-	pool := x509.NewCertPool()
-	for _, cert := range certs {
-		pool.AddCert(cert)
-	}
-	return pool, nil
-}
diff --git a/vendor/github.com/docker/libtrust/doc.go b/vendor/github.com/docker/libtrust/doc.go
deleted file mode 100644
index ec5d2159c1..0000000000
--- a/vendor/github.com/docker/libtrust/doc.go
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
-Package libtrust provides an interface for managing authentication and
-authorization using public key cryptography. Authentication is handled
-using the identity attached to the public key and verified through TLS
-x509 certificates, a key challenge, or signature. Authorization and
-access control is managed through a trust graph distributed between
-both remote trust servers and locally cached and managed data.
-*/
-package libtrust
diff --git a/vendor/github.com/docker/libtrust/ec_key.go b/vendor/github.com/docker/libtrust/ec_key.go
deleted file mode 100644
index 00bbe4b3ca..0000000000
--- a/vendor/github.com/docker/libtrust/ec_key.go
+++ /dev/null
@@ -1,428 +0,0 @@
-package libtrust
-
-import (
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/x509"
-	"encoding/json"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"io"
-	"math/big"
-)
-
-/*
- * EC DSA PUBLIC KEY
- */
-
-// ecPublicKey implements a libtrust.PublicKey using elliptic curve digital
-// signature algorithms.
-type ecPublicKey struct {
-	*ecdsa.PublicKey
-	curveName          string
-	signatureAlgorithm *signatureAlgorithm
-	extended           map[string]interface{}
-}
-
-func fromECPublicKey(cryptoPublicKey *ecdsa.PublicKey) (*ecPublicKey, error) {
-	curve := cryptoPublicKey.Curve
-
-	switch {
-	case curve == elliptic.P256():
-		return &ecPublicKey{cryptoPublicKey, "P-256", es256, map[string]interface{}{}}, nil
-	case curve == elliptic.P384():
-		return &ecPublicKey{cryptoPublicKey, "P-384", es384, map[string]interface{}{}}, nil
-	case curve == elliptic.P521():
-		return &ecPublicKey{cryptoPublicKey, "P-521", es512, map[string]interface{}{}}, nil
-	default:
-		return nil, errors.New("unsupported elliptic curve")
-	}
-}
-
-// KeyType returns the key type for elliptic curve keys, i.e., "EC".
-func (k *ecPublicKey) KeyType() string {
-	return "EC"
-}
-
-// CurveName returns the elliptic curve identifier.
-// Possible values are "P-256", "P-384", and "P-521".
-func (k *ecPublicKey) CurveName() string {
-	return k.curveName
-}
-
-// KeyID returns a distinct identifier which is unique to this Public Key.
-func (k *ecPublicKey) KeyID() string {
-	return keyIDFromCryptoKey(k)
-}
-
-func (k *ecPublicKey) String() string {
-	return fmt.Sprintf("EC Public Key <%s>", k.KeyID())
-}
-
-// Verify verifyies the signature of the data in the io.Reader using this
-// PublicKey. The alg parameter should identify the digital signature
-// algorithm which was used to produce the signature and should be supported
-// by this public key. Returns a nil error if the signature is valid.
-func (k *ecPublicKey) Verify(data io.Reader, alg string, signature []byte) error {
-	// For EC keys there is only one supported signature algorithm depending
-	// on the curve parameters.
-	if k.signatureAlgorithm.HeaderParam() != alg {
-		return fmt.Errorf("unable to verify signature: EC Public Key with curve %q does not support signature algorithm %q", k.curveName, alg)
-	}
-
-	// signature is the concatenation of (r, s), base64Url encoded.
-	sigLength := len(signature)
-	expectedOctetLength := 2 * ((k.Params().BitSize + 7) >> 3)
-	if sigLength != expectedOctetLength {
-		return fmt.Errorf("signature length is %d octets long, should be %d", sigLength, expectedOctetLength)
-	}
-
-	rBytes, sBytes := signature[:sigLength/2], signature[sigLength/2:]
-	r := new(big.Int).SetBytes(rBytes)
-	s := new(big.Int).SetBytes(sBytes)
-
-	hasher := k.signatureAlgorithm.HashID().New()
-	_, err := io.Copy(hasher, data)
-	if err != nil {
-		return fmt.Errorf("error reading data to sign: %s", err)
-	}
-	hash := hasher.Sum(nil)
-
-	if !ecdsa.Verify(k.PublicKey, hash, r, s) {
-		return errors.New("invalid signature")
-	}
-
-	return nil
-}
-
-// CryptoPublicKey returns the internal object which can be used as a
-// crypto.PublicKey for use with other standard library operations. The type
-// is either *rsa.PublicKey or *ecdsa.PublicKey
-func (k *ecPublicKey) CryptoPublicKey() crypto.PublicKey {
-	return k.PublicKey
-}
-
-func (k *ecPublicKey) toMap() map[string]interface{} {
-	jwk := make(map[string]interface{})
-	for k, v := range k.extended {
-		jwk[k] = v
-	}
-	jwk["kty"] = k.KeyType()
-	jwk["kid"] = k.KeyID()
-	jwk["crv"] = k.CurveName()
-
-	xBytes := k.X.Bytes()
-	yBytes := k.Y.Bytes()
-	octetLength := (k.Params().BitSize + 7) >> 3
-	// MUST include leading zeros in the output so that x, y are each
-	// *octetLength* bytes long.
-	xBuf := make([]byte, octetLength-len(xBytes), octetLength)
-	yBuf := make([]byte, octetLength-len(yBytes), octetLength)
-	xBuf = append(xBuf, xBytes...)
-	yBuf = append(yBuf, yBytes...)
-
-	jwk["x"] = joseBase64UrlEncode(xBuf)
-	jwk["y"] = joseBase64UrlEncode(yBuf)
-
-	return jwk
-}
-
-// MarshalJSON serializes this Public Key using the JWK JSON serialization format for
-// elliptic curve keys.
-func (k *ecPublicKey) MarshalJSON() (data []byte, err error) {
-	return json.Marshal(k.toMap())
-}
-
-// PEMBlock serializes this Public Key to DER-encoded PKIX format.
-func (k *ecPublicKey) PEMBlock() (*pem.Block, error) {
-	derBytes, err := x509.MarshalPKIXPublicKey(k.PublicKey)
-	if err != nil {
-		return nil, fmt.Errorf("unable to serialize EC PublicKey to DER-encoded PKIX format: %s", err)
-	}
-	k.extended["kid"] = k.KeyID() // For display purposes.
-	return createPemBlock("PUBLIC KEY", derBytes, k.extended)
-}
-
-func (k *ecPublicKey) AddExtendedField(field string, value interface{}) {
-	k.extended[field] = value
-}
-
-func (k *ecPublicKey) GetExtendedField(field string) interface{} {
-	v, ok := k.extended[field]
-	if !ok {
-		return nil
-	}
-	return v
-}
-
-func ecPublicKeyFromMap(jwk map[string]interface{}) (*ecPublicKey, error) {
-	// JWK key type (kty) has already been determined to be "EC".
-	// Need to extract 'crv', 'x', 'y', and 'kid' and check for
-	// consistency.
-
-	// Get the curve identifier value.
-	crv, err := stringFromMap(jwk, "crv")
-	if err != nil {
-		return nil, fmt.Errorf("JWK EC Public Key curve identifier: %s", err)
-	}
-
-	var (
-		curve  elliptic.Curve
-		sigAlg *signatureAlgorithm
-	)
-
-	switch {
-	case crv == "P-256":
-		curve = elliptic.P256()
-		sigAlg = es256
-	case crv == "P-384":
-		curve = elliptic.P384()
-		sigAlg = es384
-	case crv == "P-521":
-		curve = elliptic.P521()
-		sigAlg = es512
-	default:
-		return nil, fmt.Errorf("JWK EC Public Key curve identifier not supported: %q\n", crv)
-	}
-
-	// Get the X and Y coordinates for the public key point.
-	xB64Url, err := stringFromMap(jwk, "x")
-	if err != nil {
-		return nil, fmt.Errorf("JWK EC Public Key x-coordinate: %s", err)
-	}
-	x, err := parseECCoordinate(xB64Url, curve)
-	if err != nil {
-		return nil, fmt.Errorf("JWK EC Public Key x-coordinate: %s", err)
-	}
-
-	yB64Url, err := stringFromMap(jwk, "y")
-	if err != nil {
-		return nil, fmt.Errorf("JWK EC Public Key y-coordinate: %s", err)
-	}
-	y, err := parseECCoordinate(yB64Url, curve)
-	if err != nil {
-		return nil, fmt.Errorf("JWK EC Public Key y-coordinate: %s", err)
-	}
-
-	key := &ecPublicKey{
-		PublicKey: &ecdsa.PublicKey{Curve: curve, X: x, Y: y},
-		curveName: crv, signatureAlgorithm: sigAlg,
-	}
-
-	// Key ID is optional too, but if it exists, it should match the key.
-	_, ok := jwk["kid"]
-	if ok {
-		kid, err := stringFromMap(jwk, "kid")
-		if err != nil {
-			return nil, fmt.Errorf("JWK EC Public Key ID: %s", err)
-		}
-		if kid != key.KeyID() {
-			return nil, fmt.Errorf("JWK EC Public Key ID does not match: %s", kid)
-		}
-	}
-
-	key.extended = jwk
-
-	return key, nil
-}
-
-/*
- * EC DSA PRIVATE KEY
- */
-
-// ecPrivateKey implements a JWK Private Key using elliptic curve digital signature
-// algorithms.
-type ecPrivateKey struct {
-	ecPublicKey
-	*ecdsa.PrivateKey
-}
-
-func fromECPrivateKey(cryptoPrivateKey *ecdsa.PrivateKey) (*ecPrivateKey, error) {
-	publicKey, err := fromECPublicKey(&cryptoPrivateKey.PublicKey)
-	if err != nil {
-		return nil, err
-	}
-
-	return &ecPrivateKey{*publicKey, cryptoPrivateKey}, nil
-}
-
-// PublicKey returns the Public Key data associated with this Private Key.
-func (k *ecPrivateKey) PublicKey() PublicKey {
-	return &k.ecPublicKey
-}
-
-func (k *ecPrivateKey) String() string {
-	return fmt.Sprintf("EC Private Key <%s>", k.KeyID())
-}
-
-// Sign signs the data read from the io.Reader using a signature algorithm supported
-// by the elliptic curve private key. If the specified hashing algorithm is
-// supported by this key, that hash function is used to generate the signature
-// otherwise the the default hashing algorithm for this key is used. Returns
-// the signature and the name of the JWK signature algorithm used, e.g.,
-// "ES256", "ES384", "ES512".
-func (k *ecPrivateKey) Sign(data io.Reader, hashID crypto.Hash) (signature []byte, alg string, err error) {
-	// Generate a signature of the data using the internal alg.
-	// The given hashId is only a suggestion, and since EC keys only support
-	// on signature/hash algorithm given the curve name, we disregard it for
-	// the elliptic curve JWK signature implementation.
-	hasher := k.signatureAlgorithm.HashID().New()
-	_, err = io.Copy(hasher, data)
-	if err != nil {
-		return nil, "", fmt.Errorf("error reading data to sign: %s", err)
-	}
-	hash := hasher.Sum(nil)
-
-	r, s, err := ecdsa.Sign(rand.Reader, k.PrivateKey, hash)
-	if err != nil {
-		return nil, "", fmt.Errorf("error producing signature: %s", err)
-	}
-	rBytes, sBytes := r.Bytes(), s.Bytes()
-	octetLength := (k.ecPublicKey.Params().BitSize + 7) >> 3
-	// MUST include leading zeros in the output
-	rBuf := make([]byte, octetLength-len(rBytes), octetLength)
-	sBuf := make([]byte, octetLength-len(sBytes), octetLength)
-
-	rBuf = append(rBuf, rBytes...)
-	sBuf = append(sBuf, sBytes...)
-
-	signature = append(rBuf, sBuf...)
-	alg = k.signatureAlgorithm.HeaderParam()
-
-	return
-}
-
-// CryptoPrivateKey returns the internal object which can be used as a
-// crypto.PublicKey for use with other standard library operations. The type
-// is either *rsa.PublicKey or *ecdsa.PublicKey
-func (k *ecPrivateKey) CryptoPrivateKey() crypto.PrivateKey {
-	return k.PrivateKey
-}
-
-func (k *ecPrivateKey) toMap() map[string]interface{} {
-	jwk := k.ecPublicKey.toMap()
-
-	dBytes := k.D.Bytes()
-	// The length of this octet string MUST be ceiling(log-base-2(n)/8)
-	// octets (where n is the order of the curve). This is because the private
-	// key d must be in the interval [1, n-1] so the bitlength of d should be
-	// no larger than the bitlength of n-1. The easiest way to find the octet
-	// length is to take bitlength(n-1), add 7 to force a carry, and shift this
-	// bit sequence right by 3, which is essentially dividing by 8 and adding
-	// 1 if there is any remainder. Thus, the private key value d should be
-	// output to (bitlength(n-1)+7)>>3 octets.
-	n := k.ecPublicKey.Params().N
-	octetLength := (new(big.Int).Sub(n, big.NewInt(1)).BitLen() + 7) >> 3
-	// Create a buffer with the necessary zero-padding.
-	dBuf := make([]byte, octetLength-len(dBytes), octetLength)
-	dBuf = append(dBuf, dBytes...)
-
-	jwk["d"] = joseBase64UrlEncode(dBuf)
-
-	return jwk
-}
-
-// MarshalJSON serializes this Private Key using the JWK JSON serialization format for
-// elliptic curve keys.
-func (k *ecPrivateKey) MarshalJSON() (data []byte, err error) {
-	return json.Marshal(k.toMap())
-}
-
-// PEMBlock serializes this Private Key to DER-encoded PKIX format.
-func (k *ecPrivateKey) PEMBlock() (*pem.Block, error) {
-	derBytes, err := x509.MarshalECPrivateKey(k.PrivateKey)
-	if err != nil {
-		return nil, fmt.Errorf("unable to serialize EC PrivateKey to DER-encoded PKIX format: %s", err)
-	}
-	k.extended["keyID"] = k.KeyID() // For display purposes.
-	return createPemBlock("EC PRIVATE KEY", derBytes, k.extended)
-}
-
-func ecPrivateKeyFromMap(jwk map[string]interface{}) (*ecPrivateKey, error) {
-	dB64Url, err := stringFromMap(jwk, "d")
-	if err != nil {
-		return nil, fmt.Errorf("JWK EC Private Key: %s", err)
-	}
-
-	// JWK key type (kty) has already been determined to be "EC".
-	// Need to extract the public key information, then extract the private
-	// key value 'd'.
-	publicKey, err := ecPublicKeyFromMap(jwk)
-	if err != nil {
-		return nil, err
-	}
-
-	d, err := parseECPrivateParam(dB64Url, publicKey.Curve)
-	if err != nil {
-		return nil, fmt.Errorf("JWK EC Private Key d-param: %s", err)
-	}
-
-	key := &ecPrivateKey{
-		ecPublicKey: *publicKey,
-		PrivateKey: &ecdsa.PrivateKey{
-			PublicKey: *publicKey.PublicKey,
-			D:         d,
-		},
-	}
-
-	return key, nil
-}
-
-/*
- *	Key Generation Functions.
- */
-
-func generateECPrivateKey(curve elliptic.Curve) (k *ecPrivateKey, err error) {
-	k = new(ecPrivateKey)
-	k.PrivateKey, err = ecdsa.GenerateKey(curve, rand.Reader)
-	if err != nil {
-		return nil, err
-	}
-
-	k.ecPublicKey.PublicKey = &k.PrivateKey.PublicKey
-	k.extended = make(map[string]interface{})
-
-	return
-}
-
-// GenerateECP256PrivateKey generates a key pair using elliptic curve P-256.
-func GenerateECP256PrivateKey() (PrivateKey, error) {
-	k, err := generateECPrivateKey(elliptic.P256())
-	if err != nil {
-		return nil, fmt.Errorf("error generating EC P-256 key: %s", err)
-	}
-
-	k.curveName = "P-256"
-	k.signatureAlgorithm = es256
-
-	return k, nil
-}
-
-// GenerateECP384PrivateKey generates a key pair using elliptic curve P-384.
-func GenerateECP384PrivateKey() (PrivateKey, error) {
-	k, err := generateECPrivateKey(elliptic.P384())
-	if err != nil {
-		return nil, fmt.Errorf("error generating EC P-384 key: %s", err)
-	}
-
-	k.curveName = "P-384"
-	k.signatureAlgorithm = es384
-
-	return k, nil
-}
-
-// GenerateECP521PrivateKey generates aß key pair using elliptic curve P-521.
-func GenerateECP521PrivateKey() (PrivateKey, error) {
-	k, err := generateECPrivateKey(elliptic.P521())
-	if err != nil {
-		return nil, fmt.Errorf("error generating EC P-521 key: %s", err)
-	}
-
-	k.curveName = "P-521"
-	k.signatureAlgorithm = es512
-
-	return k, nil
-}
diff --git a/vendor/github.com/docker/libtrust/filter.go b/vendor/github.com/docker/libtrust/filter.go
deleted file mode 100644
index 5b2b4fca6f..0000000000
--- a/vendor/github.com/docker/libtrust/filter.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package libtrust
-
-import (
-	"path/filepath"
-)
-
-// FilterByHosts filters the list of PublicKeys to only those which contain a
-// 'hosts' pattern which matches the given host. If *includeEmpty* is true,
-// then keys which do not specify any hosts are also returned.
-func FilterByHosts(keys []PublicKey, host string, includeEmpty bool) ([]PublicKey, error) {
-	filtered := make([]PublicKey, 0, len(keys))
-
-	for _, pubKey := range keys {
-		var hosts []string
-		switch v := pubKey.GetExtendedField("hosts").(type) {
-		case []string:
-			hosts = v
-		case []interface{}:
-			for _, value := range v {
-				h, ok := value.(string)
-				if !ok {
-					continue
-				}
-				hosts = append(hosts, h)
-			}
-		}
-
-		if len(hosts) == 0 {
-			if includeEmpty {
-				filtered = append(filtered, pubKey)
-			}
-			continue
-		}
-
-		// Check if any hosts match pattern
-		for _, hostPattern := range hosts {
-			match, err := filepath.Match(hostPattern, host)
-			if err != nil {
-				return nil, err
-			}
-
-			if match {
-				filtered = append(filtered, pubKey)
-				continue
-			}
-		}
-	}
-
-	return filtered, nil
-}
diff --git a/vendor/github.com/docker/libtrust/hash.go b/vendor/github.com/docker/libtrust/hash.go
deleted file mode 100644
index a2df787dd9..0000000000
--- a/vendor/github.com/docker/libtrust/hash.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package libtrust
-
-import (
-	"crypto"
-	_ "crypto/sha256" // Registrer SHA224 and SHA256
-	_ "crypto/sha512" // Registrer SHA384 and SHA512
-	"fmt"
-)
-
-type signatureAlgorithm struct {
-	algHeaderParam string
-	hashID         crypto.Hash
-}
-
-func (h *signatureAlgorithm) HeaderParam() string {
-	return h.algHeaderParam
-}
-
-func (h *signatureAlgorithm) HashID() crypto.Hash {
-	return h.hashID
-}
-
-var (
-	rs256 = &signatureAlgorithm{"RS256", crypto.SHA256}
-	rs384 = &signatureAlgorithm{"RS384", crypto.SHA384}
-	rs512 = &signatureAlgorithm{"RS512", crypto.SHA512}
-	es256 = &signatureAlgorithm{"ES256", crypto.SHA256}
-	es384 = &signatureAlgorithm{"ES384", crypto.SHA384}
-	es512 = &signatureAlgorithm{"ES512", crypto.SHA512}
-)
-
-func rsaSignatureAlgorithmByName(alg string) (*signatureAlgorithm, error) {
-	switch {
-	case alg == "RS256":
-		return rs256, nil
-	case alg == "RS384":
-		return rs384, nil
-	case alg == "RS512":
-		return rs512, nil
-	default:
-		return nil, fmt.Errorf("RSA Digital Signature Algorithm %q not supported", alg)
-	}
-}
-
-func rsaPKCS1v15SignatureAlgorithmForHashID(hashID crypto.Hash) *signatureAlgorithm {
-	switch {
-	case hashID == crypto.SHA512:
-		return rs512
-	case hashID == crypto.SHA384:
-		return rs384
-	case hashID == crypto.SHA256:
-		fallthrough
-	default:
-		return rs256
-	}
-}
diff --git a/vendor/github.com/docker/libtrust/jsonsign.go b/vendor/github.com/docker/libtrust/jsonsign.go
deleted file mode 100644
index cb2ca9a769..0000000000
--- a/vendor/github.com/docker/libtrust/jsonsign.go
+++ /dev/null
@@ -1,657 +0,0 @@
-package libtrust
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/x509"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"sort"
-	"time"
-	"unicode"
-)
-
-var (
-	// ErrInvalidSignContent is used when the content to be signed is invalid.
-	ErrInvalidSignContent = errors.New("invalid sign content")
-
-	// ErrInvalidJSONContent is used when invalid json is encountered.
-	ErrInvalidJSONContent = errors.New("invalid json content")
-
-	// ErrMissingSignatureKey is used when the specified signature key
-	// does not exist in the JSON content.
-	ErrMissingSignatureKey = errors.New("missing signature key")
-)
-
-type jsHeader struct {
-	JWK       PublicKey `json:"jwk,omitempty"`
-	Algorithm string    `json:"alg"`
-	Chain     []string  `json:"x5c,omitempty"`
-}
-
-type jsSignature struct {
-	Header    jsHeader `json:"header"`
-	Signature string   `json:"signature"`
-	Protected string   `json:"protected,omitempty"`
-}
-
-type jsSignaturesSorted []jsSignature
-
-func (jsbkid jsSignaturesSorted) Swap(i, j int) { jsbkid[i], jsbkid[j] = jsbkid[j], jsbkid[i] }
-func (jsbkid jsSignaturesSorted) Len() int      { return len(jsbkid) }
-
-func (jsbkid jsSignaturesSorted) Less(i, j int) bool {
-	ki, kj := jsbkid[i].Header.JWK.KeyID(), jsbkid[j].Header.JWK.KeyID()
-	si, sj := jsbkid[i].Signature, jsbkid[j].Signature
-
-	if ki == kj {
-		return si < sj
-	}
-
-	return ki < kj
-}
-
-type signKey struct {
-	PrivateKey
-	Chain []*x509.Certificate
-}
-
-// JSONSignature represents a signature of a json object.
-type JSONSignature struct {
-	payload      string
-	signatures   []jsSignature
-	indent       string
-	formatLength int
-	formatTail   []byte
-}
-
-func newJSONSignature() *JSONSignature {
-	return &JSONSignature{
-		signatures: make([]jsSignature, 0, 1),
-	}
-}
-
-// Payload returns the encoded payload of the signature. This
-// payload should not be signed directly
-func (js *JSONSignature) Payload() ([]byte, error) {
-	return joseBase64UrlDecode(js.payload)
-}
-
-func (js *JSONSignature) protectedHeader() (string, error) {
-	protected := map[string]interface{}{
-		"formatLength": js.formatLength,
-		"formatTail":   joseBase64UrlEncode(js.formatTail),
-		"time":         time.Now().UTC().Format(time.RFC3339),
-	}
-	protectedBytes, err := json.Marshal(protected)
-	if err != nil {
-		return "", err
-	}
-
-	return joseBase64UrlEncode(protectedBytes), nil
-}
-
-func (js *JSONSignature) signBytes(protectedHeader string) ([]byte, error) {
-	buf := make([]byte, len(js.payload)+len(protectedHeader)+1)
-	copy(buf, protectedHeader)
-	buf[len(protectedHeader)] = '.'
-	copy(buf[len(protectedHeader)+1:], js.payload)
-	return buf, nil
-}
-
-// Sign adds a signature using the given private key.
-func (js *JSONSignature) Sign(key PrivateKey) error {
-	protected, err := js.protectedHeader()
-	if err != nil {
-		return err
-	}
-	signBytes, err := js.signBytes(protected)
-	if err != nil {
-		return err
-	}
-	sigBytes, algorithm, err := key.Sign(bytes.NewReader(signBytes), crypto.SHA256)
-	if err != nil {
-		return err
-	}
-
-	js.signatures = append(js.signatures, jsSignature{
-		Header: jsHeader{
-			JWK:       key.PublicKey(),
-			Algorithm: algorithm,
-		},
-		Signature: joseBase64UrlEncode(sigBytes),
-		Protected: protected,
-	})
-
-	return nil
-}
-
-// SignWithChain adds a signature using the given private key
-// and setting the x509 chain. The public key of the first element
-// in the chain must be the public key corresponding with the sign key.
-func (js *JSONSignature) SignWithChain(key PrivateKey, chain []*x509.Certificate) error {
-	// Ensure key.Chain[0] is public key for key
-	//key.Chain.PublicKey
-	//key.PublicKey().CryptoPublicKey()
-
-	// Verify chain
-	protected, err := js.protectedHeader()
-	if err != nil {
-		return err
-	}
-	signBytes, err := js.signBytes(protected)
-	if err != nil {
-		return err
-	}
-	sigBytes, algorithm, err := key.Sign(bytes.NewReader(signBytes), crypto.SHA256)
-	if err != nil {
-		return err
-	}
-
-	header := jsHeader{
-		Chain:     make([]string, len(chain)),
-		Algorithm: algorithm,
-	}
-
-	for i, cert := range chain {
-		header.Chain[i] = base64.StdEncoding.EncodeToString(cert.Raw)
-	}
-
-	js.signatures = append(js.signatures, jsSignature{
-		Header:    header,
-		Signature: joseBase64UrlEncode(sigBytes),
-		Protected: protected,
-	})
-
-	return nil
-}
-
-// Verify verifies all the signatures and returns the list of
-// public keys used to sign. Any x509 chains are not checked.
-func (js *JSONSignature) Verify() ([]PublicKey, error) {
-	keys := make([]PublicKey, len(js.signatures))
-	for i, signature := range js.signatures {
-		signBytes, err := js.signBytes(signature.Protected)
-		if err != nil {
-			return nil, err
-		}
-		var publicKey PublicKey
-		if len(signature.Header.Chain) > 0 {
-			certBytes, err := base64.StdEncoding.DecodeString(signature.Header.Chain[0])
-			if err != nil {
-				return nil, err
-			}
-			cert, err := x509.ParseCertificate(certBytes)
-			if err != nil {
-				return nil, err
-			}
-			publicKey, err = FromCryptoPublicKey(cert.PublicKey)
-			if err != nil {
-				return nil, err
-			}
-		} else if signature.Header.JWK != nil {
-			publicKey = signature.Header.JWK
-		} else {
-			return nil, errors.New("missing public key")
-		}
-
-		sigBytes, err := joseBase64UrlDecode(signature.Signature)
-		if err != nil {
-			return nil, err
-		}
-
-		err = publicKey.Verify(bytes.NewReader(signBytes), signature.Header.Algorithm, sigBytes)
-		if err != nil {
-			return nil, err
-		}
-
-		keys[i] = publicKey
-	}
-	return keys, nil
-}
-
-// VerifyChains verifies all the signatures and the chains associated
-// with each signature and returns the list of verified chains.
-// Signatures without an x509 chain are not checked.
-func (js *JSONSignature) VerifyChains(ca *x509.CertPool) ([][]*x509.Certificate, error) {
-	chains := make([][]*x509.Certificate, 0, len(js.signatures))
-	for _, signature := range js.signatures {
-		signBytes, err := js.signBytes(signature.Protected)
-		if err != nil {
-			return nil, err
-		}
-		var publicKey PublicKey
-		if len(signature.Header.Chain) > 0 {
-			certBytes, err := base64.StdEncoding.DecodeString(signature.Header.Chain[0])
-			if err != nil {
-				return nil, err
-			}
-			cert, err := x509.ParseCertificate(certBytes)
-			if err != nil {
-				return nil, err
-			}
-			publicKey, err = FromCryptoPublicKey(cert.PublicKey)
-			if err != nil {
-				return nil, err
-			}
-			intermediates := x509.NewCertPool()
-			if len(signature.Header.Chain) > 1 {
-				intermediateChain := signature.Header.Chain[1:]
-				for i := range intermediateChain {
-					certBytes, err := base64.StdEncoding.DecodeString(intermediateChain[i])
-					if err != nil {
-						return nil, err
-					}
-					intermediate, err := x509.ParseCertificate(certBytes)
-					if err != nil {
-						return nil, err
-					}
-					intermediates.AddCert(intermediate)
-				}
-			}
-
-			verifyOptions := x509.VerifyOptions{
-				Intermediates: intermediates,
-				Roots:         ca,
-			}
-
-			verifiedChains, err := cert.Verify(verifyOptions)
-			if err != nil {
-				return nil, err
-			}
-			chains = append(chains, verifiedChains...)
-
-			sigBytes, err := joseBase64UrlDecode(signature.Signature)
-			if err != nil {
-				return nil, err
-			}
-
-			err = publicKey.Verify(bytes.NewReader(signBytes), signature.Header.Algorithm, sigBytes)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-	}
-	return chains, nil
-}
-
-// JWS returns JSON serialized JWS according to
-// http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-31#section-7.2
-func (js *JSONSignature) JWS() ([]byte, error) {
-	if len(js.signatures) == 0 {
-		return nil, errors.New("missing signature")
-	}
-
-	sort.Sort(jsSignaturesSorted(js.signatures))
-
-	jsonMap := map[string]interface{}{
-		"payload":    js.payload,
-		"signatures": js.signatures,
-	}
-
-	return json.MarshalIndent(jsonMap, "", "   ")
-}
-
-func notSpace(r rune) bool {
-	return !unicode.IsSpace(r)
-}
-
-func detectJSONIndent(jsonContent []byte) (indent string) {
-	if len(jsonContent) > 2 && jsonContent[0] == '{' && jsonContent[1] == '\n' {
-		quoteIndex := bytes.IndexRune(jsonContent[1:], '"')
-		if quoteIndex > 0 {
-			indent = string(jsonContent[2 : quoteIndex+1])
-		}
-	}
-	return
-}
-
-type jsParsedHeader struct {
-	JWK       json.RawMessage `json:"jwk"`
-	Algorithm string          `json:"alg"`
-	Chain     []string        `json:"x5c"`
-}
-
-type jsParsedSignature struct {
-	Header    jsParsedHeader `json:"header"`
-	Signature string         `json:"signature"`
-	Protected string         `json:"protected"`
-}
-
-// ParseJWS parses a JWS serialized JSON object into a Json Signature.
-func ParseJWS(content []byte) (*JSONSignature, error) {
-	type jsParsed struct {
-		Payload    string              `json:"payload"`
-		Signatures []jsParsedSignature `json:"signatures"`
-	}
-	parsed := &jsParsed{}
-	err := json.Unmarshal(content, parsed)
-	if err != nil {
-		return nil, err
-	}
-	if len(parsed.Signatures) == 0 {
-		return nil, errors.New("missing signatures")
-	}
-	payload, err := joseBase64UrlDecode(parsed.Payload)
-	if err != nil {
-		return nil, err
-	}
-
-	js, err := NewJSONSignature(payload)
-	if err != nil {
-		return nil, err
-	}
-	js.signatures = make([]jsSignature, len(parsed.Signatures))
-	for i, signature := range parsed.Signatures {
-		header := jsHeader{
-			Algorithm: signature.Header.Algorithm,
-		}
-		if signature.Header.Chain != nil {
-			header.Chain = signature.Header.Chain
-		}
-		if signature.Header.JWK != nil {
-			publicKey, err := UnmarshalPublicKeyJWK([]byte(signature.Header.JWK))
-			if err != nil {
-				return nil, err
-			}
-			header.JWK = publicKey
-		}
-		js.signatures[i] = jsSignature{
-			Header:    header,
-			Signature: signature.Signature,
-			Protected: signature.Protected,
-		}
-	}
-
-	return js, nil
-}
-
-// NewJSONSignature returns a new unsigned JWS from a json byte array.
-// JSONSignature will need to be signed before serializing or storing.
-// Optionally, one or more signatures can be provided as byte buffers,
-// containing serialized JWS signatures, to assemble a fully signed JWS
-// package. It is the callers responsibility to ensure uniqueness of the
-// provided signatures.
-func NewJSONSignature(content []byte, signatures ...[]byte) (*JSONSignature, error) {
-	var dataMap map[string]interface{}
-	err := json.Unmarshal(content, &dataMap)
-	if err != nil {
-		return nil, err
-	}
-
-	js := newJSONSignature()
-	js.indent = detectJSONIndent(content)
-
-	js.payload = joseBase64UrlEncode(content)
-
-	// Find trailing } and whitespace, put in protected header
-	closeIndex := bytes.LastIndexFunc(content, notSpace)
-	if content[closeIndex] != '}' {
-		return nil, ErrInvalidJSONContent
-	}
-	lastRuneIndex := bytes.LastIndexFunc(content[:closeIndex], notSpace)
-	if content[lastRuneIndex] == ',' {
-		return nil, ErrInvalidJSONContent
-	}
-	js.formatLength = lastRuneIndex + 1
-	js.formatTail = content[js.formatLength:]
-
-	if len(signatures) > 0 {
-		for _, signature := range signatures {
-			var parsedJSig jsParsedSignature
-
-			if err := json.Unmarshal(signature, &parsedJSig); err != nil {
-				return nil, err
-			}
-
-			// TODO(stevvooe): A lot of the code below is repeated in
-			// ParseJWS. It will require more refactoring to fix that.
-			jsig := jsSignature{
-				Header: jsHeader{
-					Algorithm: parsedJSig.Header.Algorithm,
-				},
-				Signature: parsedJSig.Signature,
-				Protected: parsedJSig.Protected,
-			}
-
-			if parsedJSig.Header.Chain != nil {
-				jsig.Header.Chain = parsedJSig.Header.Chain
-			}
-
-			if parsedJSig.Header.JWK != nil {
-				publicKey, err := UnmarshalPublicKeyJWK([]byte(parsedJSig.Header.JWK))
-				if err != nil {
-					return nil, err
-				}
-				jsig.Header.JWK = publicKey
-			}
-
-			js.signatures = append(js.signatures, jsig)
-		}
-	}
-
-	return js, nil
-}
-
-// NewJSONSignatureFromMap returns a new unsigned JSONSignature from a map or
-// struct. JWS will need to be signed before serializing or storing.
-func NewJSONSignatureFromMap(content interface{}) (*JSONSignature, error) {
-	switch content.(type) {
-	case map[string]interface{}:
-	case struct{}:
-	default:
-		return nil, errors.New("invalid data type")
-	}
-
-	js := newJSONSignature()
-	js.indent = "   "
-
-	payload, err := json.MarshalIndent(content, "", js.indent)
-	if err != nil {
-		return nil, err
-	}
-	js.payload = joseBase64UrlEncode(payload)
-
-	// Remove '\n}' from formatted section, put in protected header
-	js.formatLength = len(payload) - 2
-	js.formatTail = payload[js.formatLength:]
-
-	return js, nil
-}
-
-func readIntFromMap(key string, m map[string]interface{}) (int, bool) {
-	value, ok := m[key]
-	if !ok {
-		return 0, false
-	}
-	switch v := value.(type) {
-	case int:
-		return v, true
-	case float64:
-		return int(v), true
-	default:
-		return 0, false
-	}
-}
-
-func readStringFromMap(key string, m map[string]interface{}) (v string, ok bool) {
-	value, ok := m[key]
-	if !ok {
-		return "", false
-	}
-	v, ok = value.(string)
-	return
-}
-
-// ParsePrettySignature parses a formatted signature into a
-// JSON signature. If the signatures are missing the format information
-// an error is thrown. The formatted signature must be created by
-// the same method as format signature.
-func ParsePrettySignature(content []byte, signatureKey string) (*JSONSignature, error) {
-	var contentMap map[string]json.RawMessage
-	err := json.Unmarshal(content, &contentMap)
-	if err != nil {
-		return nil, fmt.Errorf("error unmarshalling content: %s", err)
-	}
-	sigMessage, ok := contentMap[signatureKey]
-	if !ok {
-		return nil, ErrMissingSignatureKey
-	}
-
-	var signatureBlocks []jsParsedSignature
-	err = json.Unmarshal([]byte(sigMessage), &signatureBlocks)
-	if err != nil {
-		return nil, fmt.Errorf("error unmarshalling signatures: %s", err)
-	}
-
-	js := newJSONSignature()
-	js.signatures = make([]jsSignature, len(signatureBlocks))
-
-	for i, signatureBlock := range signatureBlocks {
-		protectedBytes, err := joseBase64UrlDecode(signatureBlock.Protected)
-		if err != nil {
-			return nil, fmt.Errorf("base64 decode error: %s", err)
-		}
-		var protectedHeader map[string]interface{}
-		err = json.Unmarshal(protectedBytes, &protectedHeader)
-		if err != nil {
-			return nil, fmt.Errorf("error unmarshalling protected header: %s", err)
-		}
-
-		formatLength, ok := readIntFromMap("formatLength", protectedHeader)
-		if !ok {
-			return nil, errors.New("missing formatted length")
-		}
-		encodedTail, ok := readStringFromMap("formatTail", protectedHeader)
-		if !ok {
-			return nil, errors.New("missing formatted tail")
-		}
-		formatTail, err := joseBase64UrlDecode(encodedTail)
-		if err != nil {
-			return nil, fmt.Errorf("base64 decode error on tail: %s", err)
-		}
-		if js.formatLength == 0 {
-			js.formatLength = formatLength
-		} else if js.formatLength != formatLength {
-			return nil, errors.New("conflicting format length")
-		}
-		if len(js.formatTail) == 0 {
-			js.formatTail = formatTail
-		} else if bytes.Compare(js.formatTail, formatTail) != 0 {
-			return nil, errors.New("conflicting format tail")
-		}
-
-		header := jsHeader{
-			Algorithm: signatureBlock.Header.Algorithm,
-			Chain:     signatureBlock.Header.Chain,
-		}
-		if signatureBlock.Header.JWK != nil {
-			publicKey, err := UnmarshalPublicKeyJWK([]byte(signatureBlock.Header.JWK))
-			if err != nil {
-				return nil, fmt.Errorf("error unmarshalling public key: %s", err)
-			}
-			header.JWK = publicKey
-		}
-		js.signatures[i] = jsSignature{
-			Header:    header,
-			Signature: signatureBlock.Signature,
-			Protected: signatureBlock.Protected,
-		}
-	}
-	if js.formatLength > len(content) {
-		return nil, errors.New("invalid format length")
-	}
-	formatted := make([]byte, js.formatLength+len(js.formatTail))
-	copy(formatted, content[:js.formatLength])
-	copy(formatted[js.formatLength:], js.formatTail)
-	js.indent = detectJSONIndent(formatted)
-	js.payload = joseBase64UrlEncode(formatted)
-
-	return js, nil
-}
-
-// PrettySignature formats a json signature into an easy to read
-// single json serialized object.
-func (js *JSONSignature) PrettySignature(signatureKey string) ([]byte, error) {
-	if len(js.signatures) == 0 {
-		return nil, errors.New("no signatures")
-	}
-	payload, err := joseBase64UrlDecode(js.payload)
-	if err != nil {
-		return nil, err
-	}
-	payload = payload[:js.formatLength]
-
-	sort.Sort(jsSignaturesSorted(js.signatures))
-
-	var marshalled []byte
-	var marshallErr error
-	if js.indent != "" {
-		marshalled, marshallErr = json.MarshalIndent(js.signatures, js.indent, js.indent)
-	} else {
-		marshalled, marshallErr = json.Marshal(js.signatures)
-	}
-	if marshallErr != nil {
-		return nil, marshallErr
-	}
-
-	buf := bytes.NewBuffer(make([]byte, 0, len(payload)+len(marshalled)+34))
-	buf.Write(payload)
-	buf.WriteByte(',')
-	if js.indent != "" {
-		buf.WriteByte('\n')
-		buf.WriteString(js.indent)
-		buf.WriteByte('"')
-		buf.WriteString(signatureKey)
-		buf.WriteString("\": ")
-		buf.Write(marshalled)
-		buf.WriteByte('\n')
-	} else {
-		buf.WriteByte('"')
-		buf.WriteString(signatureKey)
-		buf.WriteString("\":")
-		buf.Write(marshalled)
-	}
-	buf.WriteByte('}')
-
-	return buf.Bytes(), nil
-}
-
-// Signatures provides the signatures on this JWS as opaque blobs, sorted by
-// keyID. These blobs can be stored and reassembled with payloads. Internally,
-// they are simply marshaled json web signatures but implementations should
-// not rely on this.
-func (js *JSONSignature) Signatures() ([][]byte, error) {
-	sort.Sort(jsSignaturesSorted(js.signatures))
-
-	var sb [][]byte
-	for _, jsig := range js.signatures {
-		p, err := json.Marshal(jsig)
-		if err != nil {
-			return nil, err
-		}
-
-		sb = append(sb, p)
-	}
-
-	return sb, nil
-}
-
-// Merge combines the signatures from one or more other signatures into the
-// method receiver. If the payloads differ for any argument, an error will be
-// returned and the receiver will not be modified.
-func (js *JSONSignature) Merge(others ...*JSONSignature) error {
-	merged := js.signatures
-	for _, other := range others {
-		if js.payload != other.payload {
-			return fmt.Errorf("payloads differ from merge target")
-		}
-		merged = append(merged, other.signatures...)
-	}
-
-	js.signatures = merged
-	return nil
-}
diff --git a/vendor/github.com/docker/libtrust/key.go b/vendor/github.com/docker/libtrust/key.go
deleted file mode 100644
index 73642db2a8..0000000000
--- a/vendor/github.com/docker/libtrust/key.go
+++ /dev/null
@@ -1,253 +0,0 @@
-package libtrust
-
-import (
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/json"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"io"
-)
-
-// PublicKey is a generic interface for a Public Key.
-type PublicKey interface {
-	// KeyType returns the key type for this key. For elliptic curve keys,
-	// this value should be "EC". For RSA keys, this value should be "RSA".
-	KeyType() string
-	// KeyID returns a distinct identifier which is unique to this Public Key.
-	// The format generated by this library is a base32 encoding of a 240 bit
-	// hash of the public key data divided into 12 groups like so:
-	//    ABCD:EFGH:IJKL:MNOP:QRST:UVWX:YZ23:4567:ABCD:EFGH:IJKL:MNOP
-	KeyID() string
-	// Verify verifyies the signature of the data in the io.Reader using this
-	// Public Key. The alg parameter should identify the digital signature
-	// algorithm which was used to produce the signature and should be
-	// supported by this public key. Returns a nil error if the signature
-	// is valid.
-	Verify(data io.Reader, alg string, signature []byte) error
-	// CryptoPublicKey returns the internal object which can be used as a
-	// crypto.PublicKey for use with other standard library operations. The type
-	// is either *rsa.PublicKey or *ecdsa.PublicKey
-	CryptoPublicKey() crypto.PublicKey
-	// These public keys can be serialized to the standard JSON encoding for
-	// JSON Web Keys. See section 6 of the IETF draft RFC for JOSE JSON Web
-	// Algorithms.
-	MarshalJSON() ([]byte, error)
-	// These keys can also be serialized to the standard PEM encoding.
-	PEMBlock() (*pem.Block, error)
-	// The string representation of a key is its key type and ID.
-	String() string
-	AddExtendedField(string, interface{})
-	GetExtendedField(string) interface{}
-}
-
-// PrivateKey is a generic interface for a Private Key.
-type PrivateKey interface {
-	// A PrivateKey contains all fields and methods of a PublicKey of the
-	// same type. The MarshalJSON method also outputs the private key as a
-	// JSON Web Key, and the PEMBlock method outputs the private key as a
-	// PEM block.
-	PublicKey
-	// PublicKey returns the PublicKey associated with this PrivateKey.
-	PublicKey() PublicKey
-	// Sign signs the data read from the io.Reader using a signature algorithm
-	// supported by the private key. If the specified hashing algorithm is
-	// supported by this key, that hash function is used to generate the
-	// signature otherwise the the default hashing algorithm for this key is
-	// used. Returns the signature and identifier of the algorithm used.
-	Sign(data io.Reader, hashID crypto.Hash) (signature []byte, alg string, err error)
-	// CryptoPrivateKey returns the internal object which can be used as a
-	// crypto.PublicKey for use with other standard library operations. The
-	// type is either *rsa.PublicKey or *ecdsa.PublicKey
-	CryptoPrivateKey() crypto.PrivateKey
-}
-
-// FromCryptoPublicKey returns a libtrust PublicKey representation of the given
-// *ecdsa.PublicKey or *rsa.PublicKey. Returns a non-nil error when the given
-// key is of an unsupported type.
-func FromCryptoPublicKey(cryptoPublicKey crypto.PublicKey) (PublicKey, error) {
-	switch cryptoPublicKey := cryptoPublicKey.(type) {
-	case *ecdsa.PublicKey:
-		return fromECPublicKey(cryptoPublicKey)
-	case *rsa.PublicKey:
-		return fromRSAPublicKey(cryptoPublicKey), nil
-	default:
-		return nil, fmt.Errorf("public key type %T is not supported", cryptoPublicKey)
-	}
-}
-
-// FromCryptoPrivateKey returns a libtrust PrivateKey representation of the given
-// *ecdsa.PrivateKey or *rsa.PrivateKey. Returns a non-nil error when the given
-// key is of an unsupported type.
-func FromCryptoPrivateKey(cryptoPrivateKey crypto.PrivateKey) (PrivateKey, error) {
-	switch cryptoPrivateKey := cryptoPrivateKey.(type) {
-	case *ecdsa.PrivateKey:
-		return fromECPrivateKey(cryptoPrivateKey)
-	case *rsa.PrivateKey:
-		return fromRSAPrivateKey(cryptoPrivateKey), nil
-	default:
-		return nil, fmt.Errorf("private key type %T is not supported", cryptoPrivateKey)
-	}
-}
-
-// UnmarshalPublicKeyPEM parses the PEM encoded data and returns a libtrust
-// PublicKey or an error if there is a problem with the encoding.
-func UnmarshalPublicKeyPEM(data []byte) (PublicKey, error) {
-	pemBlock, _ := pem.Decode(data)
-	if pemBlock == nil {
-		return nil, errors.New("unable to find PEM encoded data")
-	} else if pemBlock.Type != "PUBLIC KEY" {
-		return nil, fmt.Errorf("unable to get PublicKey from PEM type: %s", pemBlock.Type)
-	}
-
-	return pubKeyFromPEMBlock(pemBlock)
-}
-
-// UnmarshalPublicKeyPEMBundle parses the PEM encoded data as a bundle of
-// PEM blocks appended one after the other and returns a slice of PublicKey
-// objects that it finds.
-func UnmarshalPublicKeyPEMBundle(data []byte) ([]PublicKey, error) {
-	pubKeys := []PublicKey{}
-
-	for {
-		var pemBlock *pem.Block
-		pemBlock, data = pem.Decode(data)
-		if pemBlock == nil {
-			break
-		} else if pemBlock.Type != "PUBLIC KEY" {
-			return nil, fmt.Errorf("unable to get PublicKey from PEM type: %s", pemBlock.Type)
-		}
-
-		pubKey, err := pubKeyFromPEMBlock(pemBlock)
-		if err != nil {
-			return nil, err
-		}
-
-		pubKeys = append(pubKeys, pubKey)
-	}
-
-	return pubKeys, nil
-}
-
-// UnmarshalPrivateKeyPEM parses the PEM encoded data and returns a libtrust
-// PrivateKey or an error if there is a problem with the encoding.
-func UnmarshalPrivateKeyPEM(data []byte) (PrivateKey, error) {
-	pemBlock, _ := pem.Decode(data)
-	if pemBlock == nil {
-		return nil, errors.New("unable to find PEM encoded data")
-	}
-
-	var key PrivateKey
-
-	switch {
-	case pemBlock.Type == "RSA PRIVATE KEY":
-		rsaPrivateKey, err := x509.ParsePKCS1PrivateKey(pemBlock.Bytes)
-		if err != nil {
-			return nil, fmt.Errorf("unable to decode RSA Private Key PEM data: %s", err)
-		}
-		key = fromRSAPrivateKey(rsaPrivateKey)
-	case pemBlock.Type == "EC PRIVATE KEY":
-		ecPrivateKey, err := x509.ParseECPrivateKey(pemBlock.Bytes)
-		if err != nil {
-			return nil, fmt.Errorf("unable to decode EC Private Key PEM data: %s", err)
-		}
-		key, err = fromECPrivateKey(ecPrivateKey)
-		if err != nil {
-			return nil, err
-		}
-	default:
-		return nil, fmt.Errorf("unable to get PrivateKey from PEM type: %s", pemBlock.Type)
-	}
-
-	addPEMHeadersToKey(pemBlock, key.PublicKey())
-
-	return key, nil
-}
-
-// UnmarshalPublicKeyJWK unmarshals the given JSON Web Key into a generic
-// Public Key to be used with libtrust.
-func UnmarshalPublicKeyJWK(data []byte) (PublicKey, error) {
-	jwk := make(map[string]interface{})
-
-	err := json.Unmarshal(data, &jwk)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"decoding JWK Public Key JSON data: %s\n", err,
-		)
-	}
-
-	// Get the Key Type value.
-	kty, err := stringFromMap(jwk, "kty")
-	if err != nil {
-		return nil, fmt.Errorf("JWK Public Key type: %s", err)
-	}
-
-	switch {
-	case kty == "EC":
-		// Call out to unmarshal EC public key.
-		return ecPublicKeyFromMap(jwk)
-	case kty == "RSA":
-		// Call out to unmarshal RSA public key.
-		return rsaPublicKeyFromMap(jwk)
-	default:
-		return nil, fmt.Errorf(
-			"JWK Public Key type not supported: %q\n", kty,
-		)
-	}
-}
-
-// UnmarshalPublicKeyJWKSet parses the JSON encoded data as a JSON Web Key Set
-// and returns a slice of Public Key objects.
-func UnmarshalPublicKeyJWKSet(data []byte) ([]PublicKey, error) {
-	rawKeys, err := loadJSONKeySetRaw(data)
-	if err != nil {
-		return nil, err
-	}
-
-	pubKeys := make([]PublicKey, 0, len(rawKeys))
-
-	for _, rawKey := range rawKeys {
-		pubKey, err := UnmarshalPublicKeyJWK(rawKey)
-		if err != nil {
-			return nil, err
-		}
-		pubKeys = append(pubKeys, pubKey)
-	}
-
-	return pubKeys, nil
-}
-
-// UnmarshalPrivateKeyJWK unmarshals the given JSON Web Key into a generic
-// Private Key to be used with libtrust.
-func UnmarshalPrivateKeyJWK(data []byte) (PrivateKey, error) {
-	jwk := make(map[string]interface{})
-
-	err := json.Unmarshal(data, &jwk)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"decoding JWK Private Key JSON data: %s\n", err,
-		)
-	}
-
-	// Get the Key Type value.
-	kty, err := stringFromMap(jwk, "kty")
-	if err != nil {
-		return nil, fmt.Errorf("JWK Private Key type: %s", err)
-	}
-
-	switch {
-	case kty == "EC":
-		// Call out to unmarshal EC private key.
-		return ecPrivateKeyFromMap(jwk)
-	case kty == "RSA":
-		// Call out to unmarshal RSA private key.
-		return rsaPrivateKeyFromMap(jwk)
-	default:
-		return nil, fmt.Errorf(
-			"JWK Private Key type not supported: %q\n", kty,
-		)
-	}
-}
diff --git a/vendor/github.com/docker/libtrust/key_files.go b/vendor/github.com/docker/libtrust/key_files.go
deleted file mode 100644
index c526de5455..0000000000
--- a/vendor/github.com/docker/libtrust/key_files.go
+++ /dev/null
@@ -1,255 +0,0 @@
-package libtrust
-
-import (
-	"encoding/json"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"strings"
-)
-
-var (
-	// ErrKeyFileDoesNotExist indicates that the private key file does not exist.
-	ErrKeyFileDoesNotExist = errors.New("key file does not exist")
-)
-
-func readKeyFileBytes(filename string) ([]byte, error) {
-	data, err := ioutil.ReadFile(filename)
-	if err != nil {
-		if os.IsNotExist(err) {
-			err = ErrKeyFileDoesNotExist
-		} else {
-			err = fmt.Errorf("unable to read key file %s: %s", filename, err)
-		}
-
-		return nil, err
-	}
-
-	return data, nil
-}
-
-/*
-	Loading and Saving of Public and Private Keys in either PEM or JWK format.
-*/
-
-// LoadKeyFile opens the given filename and attempts to read a Private Key
-// encoded in either PEM or JWK format (if .json or .jwk file extension).
-func LoadKeyFile(filename string) (PrivateKey, error) {
-	contents, err := readKeyFileBytes(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	var key PrivateKey
-
-	if strings.HasSuffix(filename, ".json") || strings.HasSuffix(filename, ".jwk") {
-		key, err = UnmarshalPrivateKeyJWK(contents)
-		if err != nil {
-			return nil, fmt.Errorf("unable to decode private key JWK: %s", err)
-		}
-	} else {
-		key, err = UnmarshalPrivateKeyPEM(contents)
-		if err != nil {
-			return nil, fmt.Errorf("unable to decode private key PEM: %s", err)
-		}
-	}
-
-	return key, nil
-}
-
-// LoadPublicKeyFile opens the given filename and attempts to read a Public Key
-// encoded in either PEM or JWK format (if .json or .jwk file extension).
-func LoadPublicKeyFile(filename string) (PublicKey, error) {
-	contents, err := readKeyFileBytes(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	var key PublicKey
-
-	if strings.HasSuffix(filename, ".json") || strings.HasSuffix(filename, ".jwk") {
-		key, err = UnmarshalPublicKeyJWK(contents)
-		if err != nil {
-			return nil, fmt.Errorf("unable to decode public key JWK: %s", err)
-		}
-	} else {
-		key, err = UnmarshalPublicKeyPEM(contents)
-		if err != nil {
-			return nil, fmt.Errorf("unable to decode public key PEM: %s", err)
-		}
-	}
-
-	return key, nil
-}
-
-// SaveKey saves the given key to a file using the provided filename.
-// This process will overwrite any existing file at the provided location.
-func SaveKey(filename string, key PrivateKey) error {
-	var encodedKey []byte
-	var err error
-
-	if strings.HasSuffix(filename, ".json") || strings.HasSuffix(filename, ".jwk") {
-		// Encode in JSON Web Key format.
-		encodedKey, err = json.MarshalIndent(key, "", "    ")
-		if err != nil {
-			return fmt.Errorf("unable to encode private key JWK: %s", err)
-		}
-	} else {
-		// Encode in PEM format.
-		pemBlock, err := key.PEMBlock()
-		if err != nil {
-			return fmt.Errorf("unable to encode private key PEM: %s", err)
-		}
-		encodedKey = pem.EncodeToMemory(pemBlock)
-	}
-
-	err = ioutil.WriteFile(filename, encodedKey, os.FileMode(0600))
-	if err != nil {
-		return fmt.Errorf("unable to write private key file %s: %s", filename, err)
-	}
-
-	return nil
-}
-
-// SavePublicKey saves the given public key to the file.
-func SavePublicKey(filename string, key PublicKey) error {
-	var encodedKey []byte
-	var err error
-
-	if strings.HasSuffix(filename, ".json") || strings.HasSuffix(filename, ".jwk") {
-		// Encode in JSON Web Key format.
-		encodedKey, err = json.MarshalIndent(key, "", "    ")
-		if err != nil {
-			return fmt.Errorf("unable to encode public key JWK: %s", err)
-		}
-	} else {
-		// Encode in PEM format.
-		pemBlock, err := key.PEMBlock()
-		if err != nil {
-			return fmt.Errorf("unable to encode public key PEM: %s", err)
-		}
-		encodedKey = pem.EncodeToMemory(pemBlock)
-	}
-
-	err = ioutil.WriteFile(filename, encodedKey, os.FileMode(0644))
-	if err != nil {
-		return fmt.Errorf("unable to write public key file %s: %s", filename, err)
-	}
-
-	return nil
-}
-
-// Public Key Set files
-
-type jwkSet struct {
-	Keys []json.RawMessage `json:"keys"`
-}
-
-// LoadKeySetFile loads a key set
-func LoadKeySetFile(filename string) ([]PublicKey, error) {
-	if strings.HasSuffix(filename, ".json") || strings.HasSuffix(filename, ".jwk") {
-		return loadJSONKeySetFile(filename)
-	}
-
-	// Must be a PEM format file
-	return loadPEMKeySetFile(filename)
-}
-
-func loadJSONKeySetRaw(data []byte) ([]json.RawMessage, error) {
-	if len(data) == 0 {
-		// This is okay, just return an empty slice.
-		return []json.RawMessage{}, nil
-	}
-
-	keySet := jwkSet{}
-
-	err := json.Unmarshal(data, &keySet)
-	if err != nil {
-		return nil, fmt.Errorf("unable to decode JSON Web Key Set: %s", err)
-	}
-
-	return keySet.Keys, nil
-}
-
-func loadJSONKeySetFile(filename string) ([]PublicKey, error) {
-	contents, err := readKeyFileBytes(filename)
-	if err != nil && err != ErrKeyFileDoesNotExist {
-		return nil, err
-	}
-
-	return UnmarshalPublicKeyJWKSet(contents)
-}
-
-func loadPEMKeySetFile(filename string) ([]PublicKey, error) {
-	data, err := readKeyFileBytes(filename)
-	if err != nil && err != ErrKeyFileDoesNotExist {
-		return nil, err
-	}
-
-	return UnmarshalPublicKeyPEMBundle(data)
-}
-
-// AddKeySetFile adds a key to a key set
-func AddKeySetFile(filename string, key PublicKey) error {
-	if strings.HasSuffix(filename, ".json") || strings.HasSuffix(filename, ".jwk") {
-		return addKeySetJSONFile(filename, key)
-	}
-
-	// Must be a PEM format file
-	return addKeySetPEMFile(filename, key)
-}
-
-func addKeySetJSONFile(filename string, key PublicKey) error {
-	encodedKey, err := json.Marshal(key)
-	if err != nil {
-		return fmt.Errorf("unable to encode trusted client key: %s", err)
-	}
-
-	contents, err := readKeyFileBytes(filename)
-	if err != nil && err != ErrKeyFileDoesNotExist {
-		return err
-	}
-
-	rawEntries, err := loadJSONKeySetRaw(contents)
-	if err != nil {
-		return err
-	}
-
-	rawEntries = append(rawEntries, json.RawMessage(encodedKey))
-	entriesWrapper := jwkSet{Keys: rawEntries}
-
-	encodedEntries, err := json.MarshalIndent(entriesWrapper, "", "    ")
-	if err != nil {
-		return fmt.Errorf("unable to encode trusted client keys: %s", err)
-	}
-
-	err = ioutil.WriteFile(filename, encodedEntries, os.FileMode(0644))
-	if err != nil {
-		return fmt.Errorf("unable to write trusted client keys file %s: %s", filename, err)
-	}
-
-	return nil
-}
-
-func addKeySetPEMFile(filename string, key PublicKey) error {
-	// Encode to PEM, open file for appending, write PEM.
-	file, err := os.OpenFile(filename, os.O_CREATE|os.O_APPEND|os.O_RDWR, os.FileMode(0644))
-	if err != nil {
-		return fmt.Errorf("unable to open trusted client keys file %s: %s", filename, err)
-	}
-	defer file.Close()
-
-	pemBlock, err := key.PEMBlock()
-	if err != nil {
-		return fmt.Errorf("unable to encoded trusted key: %s", err)
-	}
-
-	_, err = file.Write(pem.EncodeToMemory(pemBlock))
-	if err != nil {
-		return fmt.Errorf("unable to write trusted keys file: %s", err)
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/docker/libtrust/key_manager.go b/vendor/github.com/docker/libtrust/key_manager.go
deleted file mode 100644
index 9a98ae3574..0000000000
--- a/vendor/github.com/docker/libtrust/key_manager.go
+++ /dev/null
@@ -1,175 +0,0 @@
-package libtrust
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"path"
-	"sync"
-)
-
-// ClientKeyManager manages client keys on the filesystem
-type ClientKeyManager struct {
-	key        PrivateKey
-	clientFile string
-	clientDir  string
-
-	clientLock sync.RWMutex
-	clients    []PublicKey
-
-	configLock sync.Mutex
-	configs    []*tls.Config
-}
-
-// NewClientKeyManager loads a new manager from a set of key files
-// and managed by the given private key.
-func NewClientKeyManager(trustKey PrivateKey, clientFile, clientDir string) (*ClientKeyManager, error) {
-	m := &ClientKeyManager{
-		key:        trustKey,
-		clientFile: clientFile,
-		clientDir:  clientDir,
-	}
-	if err := m.loadKeys(); err != nil {
-		return nil, err
-	}
-	// TODO Start watching file and directory
-
-	return m, nil
-}
-
-func (c *ClientKeyManager) loadKeys() (err error) {
-	// Load authorized keys file
-	var clients []PublicKey
-	if c.clientFile != "" {
-		clients, err = LoadKeySetFile(c.clientFile)
-		if err != nil {
-			return fmt.Errorf("unable to load authorized keys: %s", err)
-		}
-	}
-
-	// Add clients from authorized keys directory
-	files, err := ioutil.ReadDir(c.clientDir)
-	if err != nil && !os.IsNotExist(err) {
-		return fmt.Errorf("unable to open authorized keys directory: %s", err)
-	}
-	for _, f := range files {
-		if !f.IsDir() {
-			publicKey, err := LoadPublicKeyFile(path.Join(c.clientDir, f.Name()))
-			if err != nil {
-				return fmt.Errorf("unable to load authorized key file: %s", err)
-			}
-			clients = append(clients, publicKey)
-		}
-	}
-
-	c.clientLock.Lock()
-	c.clients = clients
-	c.clientLock.Unlock()
-
-	return nil
-}
-
-// RegisterTLSConfig registers a tls configuration to manager
-// such that any changes to the keys may be reflected in
-// the tls client CA pool
-func (c *ClientKeyManager) RegisterTLSConfig(tlsConfig *tls.Config) error {
-	c.clientLock.RLock()
-	certPool, err := GenerateCACertPool(c.key, c.clients)
-	if err != nil {
-		return fmt.Errorf("CA pool generation error: %s", err)
-	}
-	c.clientLock.RUnlock()
-
-	tlsConfig.ClientCAs = certPool
-
-	c.configLock.Lock()
-	c.configs = append(c.configs, tlsConfig)
-	c.configLock.Unlock()
-
-	return nil
-}
-
-// NewIdentityAuthTLSConfig creates a tls.Config for the server to use for
-// libtrust identity authentication for the domain specified
-func NewIdentityAuthTLSConfig(trustKey PrivateKey, clients *ClientKeyManager, addr string, domain string) (*tls.Config, error) {
-	tlsConfig := newTLSConfig()
-
-	tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert
-	if err := clients.RegisterTLSConfig(tlsConfig); err != nil {
-		return nil, err
-	}
-
-	// Generate cert
-	ips, domains, err := parseAddr(addr)
-	if err != nil {
-		return nil, err
-	}
-	// add domain that it expects clients to use
-	domains = append(domains, domain)
-	x509Cert, err := GenerateSelfSignedServerCert(trustKey, domains, ips)
-	if err != nil {
-		return nil, fmt.Errorf("certificate generation error: %s", err)
-	}
-	tlsConfig.Certificates = []tls.Certificate{{
-		Certificate: [][]byte{x509Cert.Raw},
-		PrivateKey:  trustKey.CryptoPrivateKey(),
-		Leaf:        x509Cert,
-	}}
-
-	return tlsConfig, nil
-}
-
-// NewCertAuthTLSConfig creates a tls.Config for the server to use for
-// certificate authentication
-func NewCertAuthTLSConfig(caPath, certPath, keyPath string) (*tls.Config, error) {
-	tlsConfig := newTLSConfig()
-
-	cert, err := tls.LoadX509KeyPair(certPath, keyPath)
-	if err != nil {
-		return nil, fmt.Errorf("Couldn't load X509 key pair (%s, %s): %s. Key encrypted?", certPath, keyPath, err)
-	}
-	tlsConfig.Certificates = []tls.Certificate{cert}
-
-	// Verify client certificates against a CA?
-	if caPath != "" {
-		certPool := x509.NewCertPool()
-		file, err := ioutil.ReadFile(caPath)
-		if err != nil {
-			return nil, fmt.Errorf("Couldn't read CA certificate: %s", err)
-		}
-		certPool.AppendCertsFromPEM(file)
-
-		tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert
-		tlsConfig.ClientCAs = certPool
-	}
-
-	return tlsConfig, nil
-}
-
-func newTLSConfig() *tls.Config {
-	return &tls.Config{
-		NextProtos: []string{"http/1.1"},
-		// Avoid fallback on insecure SSL protocols
-		MinVersion: tls.VersionTLS10,
-	}
-}
-
-// parseAddr parses an address into an array of IPs and domains
-func parseAddr(addr string) ([]net.IP, []string, error) {
-	host, _, err := net.SplitHostPort(addr)
-	if err != nil {
-		return nil, nil, err
-	}
-	var domains []string
-	var ips []net.IP
-	ip := net.ParseIP(host)
-	if ip != nil {
-		ips = []net.IP{ip}
-	} else {
-		domains = []string{host}
-	}
-	return ips, domains, nil
-}
diff --git a/vendor/github.com/docker/libtrust/rsa_key.go b/vendor/github.com/docker/libtrust/rsa_key.go
deleted file mode 100644
index dac4cacf20..0000000000
--- a/vendor/github.com/docker/libtrust/rsa_key.go
+++ /dev/null
@@ -1,427 +0,0 @@
-package libtrust
-
-import (
-	"crypto"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/json"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"io"
-	"math/big"
-)
-
-/*
- * RSA DSA PUBLIC KEY
- */
-
-// rsaPublicKey implements a JWK Public Key using RSA digital signature algorithms.
-type rsaPublicKey struct {
-	*rsa.PublicKey
-	extended map[string]interface{}
-}
-
-func fromRSAPublicKey(cryptoPublicKey *rsa.PublicKey) *rsaPublicKey {
-	return &rsaPublicKey{cryptoPublicKey, map[string]interface{}{}}
-}
-
-// KeyType returns the JWK key type for RSA keys, i.e., "RSA".
-func (k *rsaPublicKey) KeyType() string {
-	return "RSA"
-}
-
-// KeyID returns a distinct identifier which is unique to this Public Key.
-func (k *rsaPublicKey) KeyID() string {
-	return keyIDFromCryptoKey(k)
-}
-
-func (k *rsaPublicKey) String() string {
-	return fmt.Sprintf("RSA Public Key <%s>", k.KeyID())
-}
-
-// Verify verifyies the signature of the data in the io.Reader using this Public Key.
-// The alg parameter should be the name of the JWA digital signature algorithm
-// which was used to produce the signature and should be supported by this
-// public key. Returns a nil error if the signature is valid.
-func (k *rsaPublicKey) Verify(data io.Reader, alg string, signature []byte) error {
-	// Verify the signature of the given date, return non-nil error if valid.
-	sigAlg, err := rsaSignatureAlgorithmByName(alg)
-	if err != nil {
-		return fmt.Errorf("unable to verify Signature: %s", err)
-	}
-
-	hasher := sigAlg.HashID().New()
-	_, err = io.Copy(hasher, data)
-	if err != nil {
-		return fmt.Errorf("error reading data to sign: %s", err)
-	}
-	hash := hasher.Sum(nil)
-
-	err = rsa.VerifyPKCS1v15(k.PublicKey, sigAlg.HashID(), hash, signature)
-	if err != nil {
-		return fmt.Errorf("invalid %s signature: %s", sigAlg.HeaderParam(), err)
-	}
-
-	return nil
-}
-
-// CryptoPublicKey returns the internal object which can be used as a
-// crypto.PublicKey for use with other standard library operations. The type
-// is either *rsa.PublicKey or *ecdsa.PublicKey
-func (k *rsaPublicKey) CryptoPublicKey() crypto.PublicKey {
-	return k.PublicKey
-}
-
-func (k *rsaPublicKey) toMap() map[string]interface{} {
-	jwk := make(map[string]interface{})
-	for k, v := range k.extended {
-		jwk[k] = v
-	}
-	jwk["kty"] = k.KeyType()
-	jwk["kid"] = k.KeyID()
-	jwk["n"] = joseBase64UrlEncode(k.N.Bytes())
-	jwk["e"] = joseBase64UrlEncode(serializeRSAPublicExponentParam(k.E))
-
-	return jwk
-}
-
-// MarshalJSON serializes this Public Key using the JWK JSON serialization format for
-// RSA keys.
-func (k *rsaPublicKey) MarshalJSON() (data []byte, err error) {
-	return json.Marshal(k.toMap())
-}
-
-// PEMBlock serializes this Public Key to DER-encoded PKIX format.
-func (k *rsaPublicKey) PEMBlock() (*pem.Block, error) {
-	derBytes, err := x509.MarshalPKIXPublicKey(k.PublicKey)
-	if err != nil {
-		return nil, fmt.Errorf("unable to serialize RSA PublicKey to DER-encoded PKIX format: %s", err)
-	}
-	k.extended["kid"] = k.KeyID() // For display purposes.
-	return createPemBlock("PUBLIC KEY", derBytes, k.extended)
-}
-
-func (k *rsaPublicKey) AddExtendedField(field string, value interface{}) {
-	k.extended[field] = value
-}
-
-func (k *rsaPublicKey) GetExtendedField(field string) interface{} {
-	v, ok := k.extended[field]
-	if !ok {
-		return nil
-	}
-	return v
-}
-
-func rsaPublicKeyFromMap(jwk map[string]interface{}) (*rsaPublicKey, error) {
-	// JWK key type (kty) has already been determined to be "RSA".
-	// Need to extract 'n', 'e', and 'kid' and check for
-	// consistency.
-
-	// Get the modulus parameter N.
-	nB64Url, err := stringFromMap(jwk, "n")
-	if err != nil {
-		return nil, fmt.Errorf("JWK RSA Public Key modulus: %s", err)
-	}
-
-	n, err := parseRSAModulusParam(nB64Url)
-	if err != nil {
-		return nil, fmt.Errorf("JWK RSA Public Key modulus: %s", err)
-	}
-
-	// Get the public exponent E.
-	eB64Url, err := stringFromMap(jwk, "e")
-	if err != nil {
-		return nil, fmt.Errorf("JWK RSA Public Key exponent: %s", err)
-	}
-
-	e, err := parseRSAPublicExponentParam(eB64Url)
-	if err != nil {
-		return nil, fmt.Errorf("JWK RSA Public Key exponent: %s", err)
-	}
-
-	key := &rsaPublicKey{
-		PublicKey: &rsa.PublicKey{N: n, E: e},
-	}
-
-	// Key ID is optional, but if it exists, it should match the key.
-	_, ok := jwk["kid"]
-	if ok {
-		kid, err := stringFromMap(jwk, "kid")
-		if err != nil {
-			return nil, fmt.Errorf("JWK RSA Public Key ID: %s", err)
-		}
-		if kid != key.KeyID() {
-			return nil, fmt.Errorf("JWK RSA Public Key ID does not match: %s", kid)
-		}
-	}
-
-	if _, ok := jwk["d"]; ok {
-		return nil, fmt.Errorf("JWK RSA Public Key cannot contain private exponent")
-	}
-
-	key.extended = jwk
-
-	return key, nil
-}
-
-/*
- * RSA DSA PRIVATE KEY
- */
-
-// rsaPrivateKey implements a JWK Private Key using RSA digital signature algorithms.
-type rsaPrivateKey struct {
-	rsaPublicKey
-	*rsa.PrivateKey
-}
-
-func fromRSAPrivateKey(cryptoPrivateKey *rsa.PrivateKey) *rsaPrivateKey {
-	return &rsaPrivateKey{
-		*fromRSAPublicKey(&cryptoPrivateKey.PublicKey),
-		cryptoPrivateKey,
-	}
-}
-
-// PublicKey returns the Public Key data associated with this Private Key.
-func (k *rsaPrivateKey) PublicKey() PublicKey {
-	return &k.rsaPublicKey
-}
-
-func (k *rsaPrivateKey) String() string {
-	return fmt.Sprintf("RSA Private Key <%s>", k.KeyID())
-}
-
-// Sign signs the data read from the io.Reader using a signature algorithm supported
-// by the RSA private key. If the specified hashing algorithm is supported by
-// this key, that hash function is used to generate the signature otherwise the
-// the default hashing algorithm for this key is used. Returns the signature
-// and the name of the JWK signature algorithm used, e.g., "RS256", "RS384",
-// "RS512".
-func (k *rsaPrivateKey) Sign(data io.Reader, hashID crypto.Hash) (signature []byte, alg string, err error) {
-	// Generate a signature of the data using the internal alg.
-	sigAlg := rsaPKCS1v15SignatureAlgorithmForHashID(hashID)
-	hasher := sigAlg.HashID().New()
-
-	_, err = io.Copy(hasher, data)
-	if err != nil {
-		return nil, "", fmt.Errorf("error reading data to sign: %s", err)
-	}
-	hash := hasher.Sum(nil)
-
-	signature, err = rsa.SignPKCS1v15(rand.Reader, k.PrivateKey, sigAlg.HashID(), hash)
-	if err != nil {
-		return nil, "", fmt.Errorf("error producing signature: %s", err)
-	}
-
-	alg = sigAlg.HeaderParam()
-
-	return
-}
-
-// CryptoPrivateKey returns the internal object which can be used as a
-// crypto.PublicKey for use with other standard library operations. The type
-// is either *rsa.PublicKey or *ecdsa.PublicKey
-func (k *rsaPrivateKey) CryptoPrivateKey() crypto.PrivateKey {
-	return k.PrivateKey
-}
-
-func (k *rsaPrivateKey) toMap() map[string]interface{} {
-	k.Precompute() // Make sure the precomputed values are stored.
-	jwk := k.rsaPublicKey.toMap()
-
-	jwk["d"] = joseBase64UrlEncode(k.D.Bytes())
-	jwk["p"] = joseBase64UrlEncode(k.Primes[0].Bytes())
-	jwk["q"] = joseBase64UrlEncode(k.Primes[1].Bytes())
-	jwk["dp"] = joseBase64UrlEncode(k.Precomputed.Dp.Bytes())
-	jwk["dq"] = joseBase64UrlEncode(k.Precomputed.Dq.Bytes())
-	jwk["qi"] = joseBase64UrlEncode(k.Precomputed.Qinv.Bytes())
-
-	otherPrimes := k.Primes[2:]
-
-	if len(otherPrimes) > 0 {
-		otherPrimesInfo := make([]interface{}, len(otherPrimes))
-		for i, r := range otherPrimes {
-			otherPrimeInfo := make(map[string]string, 3)
-			otherPrimeInfo["r"] = joseBase64UrlEncode(r.Bytes())
-			crtVal := k.Precomputed.CRTValues[i]
-			otherPrimeInfo["d"] = joseBase64UrlEncode(crtVal.Exp.Bytes())
-			otherPrimeInfo["t"] = joseBase64UrlEncode(crtVal.Coeff.Bytes())
-			otherPrimesInfo[i] = otherPrimeInfo
-		}
-		jwk["oth"] = otherPrimesInfo
-	}
-
-	return jwk
-}
-
-// MarshalJSON serializes this Private Key using the JWK JSON serialization format for
-// RSA keys.
-func (k *rsaPrivateKey) MarshalJSON() (data []byte, err error) {
-	return json.Marshal(k.toMap())
-}
-
-// PEMBlock serializes this Private Key to DER-encoded PKIX format.
-func (k *rsaPrivateKey) PEMBlock() (*pem.Block, error) {
-	derBytes := x509.MarshalPKCS1PrivateKey(k.PrivateKey)
-	k.extended["keyID"] = k.KeyID() // For display purposes.
-	return createPemBlock("RSA PRIVATE KEY", derBytes, k.extended)
-}
-
-func rsaPrivateKeyFromMap(jwk map[string]interface{}) (*rsaPrivateKey, error) {
-	// The JWA spec for RSA Private Keys (draft rfc section 5.3.2) states that
-	// only the private key exponent 'd' is REQUIRED, the others are just for
-	// signature/decryption optimizations and SHOULD be included when the JWK
-	// is produced. We MAY choose to accept a JWK which only includes 'd', but
-	// we're going to go ahead and not choose to accept it without the extra
-	// fields. Only the 'oth' field will be optional (for multi-prime keys).
-	privateExponent, err := parseRSAPrivateKeyParamFromMap(jwk, "d")
-	if err != nil {
-		return nil, fmt.Errorf("JWK RSA Private Key exponent: %s", err)
-	}
-	firstPrimeFactor, err := parseRSAPrivateKeyParamFromMap(jwk, "p")
-	if err != nil {
-		return nil, fmt.Errorf("JWK RSA Private Key prime factor: %s", err)
-	}
-	secondPrimeFactor, err := parseRSAPrivateKeyParamFromMap(jwk, "q")
-	if err != nil {
-		return nil, fmt.Errorf("JWK RSA Private Key prime factor: %s", err)
-	}
-	firstFactorCRT, err := parseRSAPrivateKeyParamFromMap(jwk, "dp")
-	if err != nil {
-		return nil, fmt.Errorf("JWK RSA Private Key CRT exponent: %s", err)
-	}
-	secondFactorCRT, err := parseRSAPrivateKeyParamFromMap(jwk, "dq")
-	if err != nil {
-		return nil, fmt.Errorf("JWK RSA Private Key CRT exponent: %s", err)
-	}
-	crtCoeff, err := parseRSAPrivateKeyParamFromMap(jwk, "qi")
-	if err != nil {
-		return nil, fmt.Errorf("JWK RSA Private Key CRT coefficient: %s", err)
-	}
-
-	var oth interface{}
-	if _, ok := jwk["oth"]; ok {
-		oth = jwk["oth"]
-		delete(jwk, "oth")
-	}
-
-	// JWK key type (kty) has already been determined to be "RSA".
-	// Need to extract the public key information, then extract the private
-	// key values.
-	publicKey, err := rsaPublicKeyFromMap(jwk)
-	if err != nil {
-		return nil, err
-	}
-
-	privateKey := &rsa.PrivateKey{
-		PublicKey: *publicKey.PublicKey,
-		D:         privateExponent,
-		Primes:    []*big.Int{firstPrimeFactor, secondPrimeFactor},
-		Precomputed: rsa.PrecomputedValues{
-			Dp:   firstFactorCRT,
-			Dq:   secondFactorCRT,
-			Qinv: crtCoeff,
-		},
-	}
-
-	if oth != nil {
-		// Should be an array of more JSON objects.
-		otherPrimesInfo, ok := oth.([]interface{})
-		if !ok {
-			return nil, errors.New("JWK RSA Private Key: Invalid other primes info: must be an array")
-		}
-		numOtherPrimeFactors := len(otherPrimesInfo)
-		if numOtherPrimeFactors == 0 {
-			return nil, errors.New("JWK RSA Privake Key: Invalid other primes info: must be absent or non-empty")
-		}
-		otherPrimeFactors := make([]*big.Int, numOtherPrimeFactors)
-		productOfPrimes := new(big.Int).Mul(firstPrimeFactor, secondPrimeFactor)
-		crtValues := make([]rsa.CRTValue, numOtherPrimeFactors)
-
-		for i, val := range otherPrimesInfo {
-			otherPrimeinfo, ok := val.(map[string]interface{})
-			if !ok {
-				return nil, errors.New("JWK RSA Private Key: Invalid other prime info: must be a JSON object")
-			}
-
-			otherPrimeFactor, err := parseRSAPrivateKeyParamFromMap(otherPrimeinfo, "r")
-			if err != nil {
-				return nil, fmt.Errorf("JWK RSA Private Key prime factor: %s", err)
-			}
-			otherFactorCRT, err := parseRSAPrivateKeyParamFromMap(otherPrimeinfo, "d")
-			if err != nil {
-				return nil, fmt.Errorf("JWK RSA Private Key CRT exponent: %s", err)
-			}
-			otherCrtCoeff, err := parseRSAPrivateKeyParamFromMap(otherPrimeinfo, "t")
-			if err != nil {
-				return nil, fmt.Errorf("JWK RSA Private Key CRT coefficient: %s", err)
-			}
-
-			crtValue := crtValues[i]
-			crtValue.Exp = otherFactorCRT
-			crtValue.Coeff = otherCrtCoeff
-			crtValue.R = productOfPrimes
-			otherPrimeFactors[i] = otherPrimeFactor
-			productOfPrimes = new(big.Int).Mul(productOfPrimes, otherPrimeFactor)
-		}
-
-		privateKey.Primes = append(privateKey.Primes, otherPrimeFactors...)
-		privateKey.Precomputed.CRTValues = crtValues
-	}
-
-	key := &rsaPrivateKey{
-		rsaPublicKey: *publicKey,
-		PrivateKey:   privateKey,
-	}
-
-	return key, nil
-}
-
-/*
- *	Key Generation Functions.
- */
-
-func generateRSAPrivateKey(bits int) (k *rsaPrivateKey, err error) {
-	k = new(rsaPrivateKey)
-	k.PrivateKey, err = rsa.GenerateKey(rand.Reader, bits)
-	if err != nil {
-		return nil, err
-	}
-
-	k.rsaPublicKey.PublicKey = &k.PrivateKey.PublicKey
-	k.extended = make(map[string]interface{})
-
-	return
-}
-
-// GenerateRSA2048PrivateKey generates a key pair using 2048-bit RSA.
-func GenerateRSA2048PrivateKey() (PrivateKey, error) {
-	k, err := generateRSAPrivateKey(2048)
-	if err != nil {
-		return nil, fmt.Errorf("error generating RSA 2048-bit key: %s", err)
-	}
-
-	return k, nil
-}
-
-// GenerateRSA3072PrivateKey generates a key pair using 3072-bit RSA.
-func GenerateRSA3072PrivateKey() (PrivateKey, error) {
-	k, err := generateRSAPrivateKey(3072)
-	if err != nil {
-		return nil, fmt.Errorf("error generating RSA 3072-bit key: %s", err)
-	}
-
-	return k, nil
-}
-
-// GenerateRSA4096PrivateKey generates a key pair using 4096-bit RSA.
-func GenerateRSA4096PrivateKey() (PrivateKey, error) {
-	k, err := generateRSAPrivateKey(4096)
-	if err != nil {
-		return nil, fmt.Errorf("error generating RSA 4096-bit key: %s", err)
-	}
-
-	return k, nil
-}
diff --git a/vendor/github.com/docker/libtrust/util.go b/vendor/github.com/docker/libtrust/util.go
deleted file mode 100644
index a5a101d3f1..0000000000
--- a/vendor/github.com/docker/libtrust/util.go
+++ /dev/null
@@ -1,363 +0,0 @@
-package libtrust
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/elliptic"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/base32"
-	"encoding/base64"
-	"encoding/binary"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"math/big"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-// LoadOrCreateTrustKey will load a PrivateKey from the specified path
-func LoadOrCreateTrustKey(trustKeyPath string) (PrivateKey, error) {
-	if err := os.MkdirAll(filepath.Dir(trustKeyPath), 0700); err != nil {
-		return nil, err
-	}
-
-	trustKey, err := LoadKeyFile(trustKeyPath)
-	if err == ErrKeyFileDoesNotExist {
-		trustKey, err = GenerateECP256PrivateKey()
-		if err != nil {
-			return nil, fmt.Errorf("error generating key: %s", err)
-		}
-
-		if err := SaveKey(trustKeyPath, trustKey); err != nil {
-			return nil, fmt.Errorf("error saving key file: %s", err)
-		}
-
-		dir, file := filepath.Split(trustKeyPath)
-		if err := SavePublicKey(filepath.Join(dir, "public-"+file), trustKey.PublicKey()); err != nil {
-			return nil, fmt.Errorf("error saving public key file: %s", err)
-		}
-	} else if err != nil {
-		return nil, fmt.Errorf("error loading key file: %s", err)
-	}
-	return trustKey, nil
-}
-
-// NewIdentityAuthTLSClientConfig returns a tls.Config configured to use identity
-// based authentication from the specified dockerUrl, the rootConfigPath and
-// the server name to which it is connecting.
-// If trustUnknownHosts is true it will automatically add the host to the
-// known-hosts.json in rootConfigPath.
-func NewIdentityAuthTLSClientConfig(dockerUrl string, trustUnknownHosts bool, rootConfigPath string, serverName string) (*tls.Config, error) {
-	tlsConfig := newTLSConfig()
-
-	trustKeyPath := filepath.Join(rootConfigPath, "key.json")
-	knownHostsPath := filepath.Join(rootConfigPath, "known-hosts.json")
-
-	u, err := url.Parse(dockerUrl)
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse machine url")
-	}
-
-	if u.Scheme == "unix" {
-		return nil, nil
-	}
-
-	addr := u.Host
-	proto := "tcp"
-
-	trustKey, err := LoadOrCreateTrustKey(trustKeyPath)
-	if err != nil {
-		return nil, fmt.Errorf("unable to load trust key: %s", err)
-	}
-
-	knownHosts, err := LoadKeySetFile(knownHostsPath)
-	if err != nil {
-		return nil, fmt.Errorf("could not load trusted hosts file: %s", err)
-	}
-
-	allowedHosts, err := FilterByHosts(knownHosts, addr, false)
-	if err != nil {
-		return nil, fmt.Errorf("error filtering hosts: %s", err)
-	}
-
-	certPool, err := GenerateCACertPool(trustKey, allowedHosts)
-	if err != nil {
-		return nil, fmt.Errorf("Could not create CA pool: %s", err)
-	}
-
-	tlsConfig.ServerName = serverName
-	tlsConfig.RootCAs = certPool
-
-	x509Cert, err := GenerateSelfSignedClientCert(trustKey)
-	if err != nil {
-		return nil, fmt.Errorf("certificate generation error: %s", err)
-	}
-
-	tlsConfig.Certificates = []tls.Certificate{{
-		Certificate: [][]byte{x509Cert.Raw},
-		PrivateKey:  trustKey.CryptoPrivateKey(),
-		Leaf:        x509Cert,
-	}}
-
-	tlsConfig.InsecureSkipVerify = true
-
-	testConn, err := tls.Dial(proto, addr, tlsConfig)
-	if err != nil {
-		return nil, fmt.Errorf("tls Handshake error: %s", err)
-	}
-
-	opts := x509.VerifyOptions{
-		Roots:         tlsConfig.RootCAs,
-		CurrentTime:   time.Now(),
-		DNSName:       tlsConfig.ServerName,
-		Intermediates: x509.NewCertPool(),
-	}
-
-	certs := testConn.ConnectionState().PeerCertificates
-	for i, cert := range certs {
-		if i == 0 {
-			continue
-		}
-		opts.Intermediates.AddCert(cert)
-	}
-
-	if _, err := certs[0].Verify(opts); err != nil {
-		if _, ok := err.(x509.UnknownAuthorityError); ok {
-			if trustUnknownHosts {
-				pubKey, err := FromCryptoPublicKey(certs[0].PublicKey)
-				if err != nil {
-					return nil, fmt.Errorf("error extracting public key from cert: %s", err)
-				}
-
-				pubKey.AddExtendedField("hosts", []string{addr})
-
-				if err := AddKeySetFile(knownHostsPath, pubKey); err != nil {
-					return nil, fmt.Errorf("error adding machine to known hosts: %s", err)
-				}
-			} else {
-				return nil, fmt.Errorf("unable to connect.  unknown host: %s", addr)
-			}
-		}
-	}
-
-	testConn.Close()
-	tlsConfig.InsecureSkipVerify = false
-
-	return tlsConfig, nil
-}
-
-// joseBase64UrlEncode encodes the given data using the standard base64 url
-// encoding format but with all trailing '=' characters omitted in accordance
-// with the jose specification.
-// http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-31#section-2
-func joseBase64UrlEncode(b []byte) string {
-	return strings.TrimRight(base64.URLEncoding.EncodeToString(b), "=")
-}
-
-// joseBase64UrlDecode decodes the given string using the standard base64 url
-// decoder but first adds the appropriate number of trailing '=' characters in
-// accordance with the jose specification.
-// http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-31#section-2
-func joseBase64UrlDecode(s string) ([]byte, error) {
-	s = strings.Replace(s, "\n", "", -1)
-	s = strings.Replace(s, " ", "", -1)
-	switch len(s) % 4 {
-	case 0:
-	case 2:
-		s += "=="
-	case 3:
-		s += "="
-	default:
-		return nil, errors.New("illegal base64url string")
-	}
-	return base64.URLEncoding.DecodeString(s)
-}
-
-func keyIDEncode(b []byte) string {
-	s := strings.TrimRight(base32.StdEncoding.EncodeToString(b), "=")
-	var buf bytes.Buffer
-	var i int
-	for i = 0; i < len(s)/4-1; i++ {
-		start := i * 4
-		end := start + 4
-		buf.WriteString(s[start:end] + ":")
-	}
-	buf.WriteString(s[i*4:])
-	return buf.String()
-}
-
-func keyIDFromCryptoKey(pubKey PublicKey) string {
-	// Generate and return a 'libtrust' fingerprint of the public key.
-	// For an RSA key this should be:
-	//   SHA256(DER encoded ASN1)
-	// Then truncated to 240 bits and encoded into 12 base32 groups like so:
-	//   ABCD:EFGH:IJKL:MNOP:QRST:UVWX:YZ23:4567:ABCD:EFGH:IJKL:MNOP
-	derBytes, err := x509.MarshalPKIXPublicKey(pubKey.CryptoPublicKey())
-	if err != nil {
-		return ""
-	}
-	hasher := crypto.SHA256.New()
-	hasher.Write(derBytes)
-	return keyIDEncode(hasher.Sum(nil)[:30])
-}
-
-func stringFromMap(m map[string]interface{}, key string) (string, error) {
-	val, ok := m[key]
-	if !ok {
-		return "", fmt.Errorf("%q value not specified", key)
-	}
-
-	str, ok := val.(string)
-	if !ok {
-		return "", fmt.Errorf("%q value must be a string", key)
-	}
-	delete(m, key)
-
-	return str, nil
-}
-
-func parseECCoordinate(cB64Url string, curve elliptic.Curve) (*big.Int, error) {
-	curveByteLen := (curve.Params().BitSize + 7) >> 3
-
-	cBytes, err := joseBase64UrlDecode(cB64Url)
-	if err != nil {
-		return nil, fmt.Errorf("invalid base64 URL encoding: %s", err)
-	}
-	cByteLength := len(cBytes)
-	if cByteLength != curveByteLen {
-		return nil, fmt.Errorf("invalid number of octets: got %d, should be %d", cByteLength, curveByteLen)
-	}
-	return new(big.Int).SetBytes(cBytes), nil
-}
-
-func parseECPrivateParam(dB64Url string, curve elliptic.Curve) (*big.Int, error) {
-	dBytes, err := joseBase64UrlDecode(dB64Url)
-	if err != nil {
-		return nil, fmt.Errorf("invalid base64 URL encoding: %s", err)
-	}
-
-	// The length of this octet string MUST be ceiling(log-base-2(n)/8)
-	// octets (where n is the order of the curve). This is because the private
-	// key d must be in the interval [1, n-1] so the bitlength of d should be
-	// no larger than the bitlength of n-1. The easiest way to find the octet
-	// length is to take bitlength(n-1), add 7 to force a carry, and shift this
-	// bit sequence right by 3, which is essentially dividing by 8 and adding
-	// 1 if there is any remainder. Thus, the private key value d should be
-	// output to (bitlength(n-1)+7)>>3 octets.
-	n := curve.Params().N
-	octetLength := (new(big.Int).Sub(n, big.NewInt(1)).BitLen() + 7) >> 3
-	dByteLength := len(dBytes)
-
-	if dByteLength != octetLength {
-		return nil, fmt.Errorf("invalid number of octets: got %d, should be %d", dByteLength, octetLength)
-	}
-
-	return new(big.Int).SetBytes(dBytes), nil
-}
-
-func parseRSAModulusParam(nB64Url string) (*big.Int, error) {
-	nBytes, err := joseBase64UrlDecode(nB64Url)
-	if err != nil {
-		return nil, fmt.Errorf("invalid base64 URL encoding: %s", err)
-	}
-
-	return new(big.Int).SetBytes(nBytes), nil
-}
-
-func serializeRSAPublicExponentParam(e int) []byte {
-	// We MUST use the minimum number of octets to represent E.
-	// E is supposed to be 65537 for performance and security reasons
-	// and is what golang's rsa package generates, but it might be
-	// different if imported from some other generator.
-	buf := make([]byte, 4)
-	binary.BigEndian.PutUint32(buf, uint32(e))
-	var i int
-	for i = 0; i < 8; i++ {
-		if buf[i] != 0 {
-			break
-		}
-	}
-	return buf[i:]
-}
-
-func parseRSAPublicExponentParam(eB64Url string) (int, error) {
-	eBytes, err := joseBase64UrlDecode(eB64Url)
-	if err != nil {
-		return 0, fmt.Errorf("invalid base64 URL encoding: %s", err)
-	}
-	// Only the minimum number of bytes were used to represent E, but
-	// binary.BigEndian.Uint32 expects at least 4 bytes, so we need
-	// to add zero padding if necassary.
-	byteLen := len(eBytes)
-	buf := make([]byte, 4-byteLen, 4)
-	eBytes = append(buf, eBytes...)
-
-	return int(binary.BigEndian.Uint32(eBytes)), nil
-}
-
-func parseRSAPrivateKeyParamFromMap(m map[string]interface{}, key string) (*big.Int, error) {
-	b64Url, err := stringFromMap(m, key)
-	if err != nil {
-		return nil, err
-	}
-
-	paramBytes, err := joseBase64UrlDecode(b64Url)
-	if err != nil {
-		return nil, fmt.Errorf("invaled base64 URL encoding: %s", err)
-	}
-
-	return new(big.Int).SetBytes(paramBytes), nil
-}
-
-func createPemBlock(name string, derBytes []byte, headers map[string]interface{}) (*pem.Block, error) {
-	pemBlock := &pem.Block{Type: name, Bytes: derBytes, Headers: map[string]string{}}
-	for k, v := range headers {
-		switch val := v.(type) {
-		case string:
-			pemBlock.Headers[k] = val
-		case []string:
-			if k == "hosts" {
-				pemBlock.Headers[k] = strings.Join(val, ",")
-			} else {
-				// Return error, non-encodable type
-			}
-		default:
-			// Return error, non-encodable type
-		}
-	}
-
-	return pemBlock, nil
-}
-
-func pubKeyFromPEMBlock(pemBlock *pem.Block) (PublicKey, error) {
-	cryptoPublicKey, err := x509.ParsePKIXPublicKey(pemBlock.Bytes)
-	if err != nil {
-		return nil, fmt.Errorf("unable to decode Public Key PEM data: %s", err)
-	}
-
-	pubKey, err := FromCryptoPublicKey(cryptoPublicKey)
-	if err != nil {
-		return nil, err
-	}
-
-	addPEMHeadersToKey(pemBlock, pubKey)
-
-	return pubKey, nil
-}
-
-func addPEMHeadersToKey(pemBlock *pem.Block, pubKey PublicKey) {
-	for key, value := range pemBlock.Headers {
-		var safeVal interface{}
-		if key == "hosts" {
-			safeVal = strings.Split(value, ",")
-		} else {
-			safeVal = value
-		}
-		pubKey.AddExtendedField(key, safeVal)
-	}
-}
diff --git a/vendor/github.com/fatih/color/LICENSE.md b/vendor/github.com/fatih/color/LICENSE.md
deleted file mode 100644
index 25fdaf639d..0000000000
--- a/vendor/github.com/fatih/color/LICENSE.md
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Fatih Arslan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/fatih/color/README.md b/vendor/github.com/fatih/color/README.md
deleted file mode 100644
index 623baf3c39..0000000000
--- a/vendor/github.com/fatih/color/README.md
+++ /dev/null
@@ -1,177 +0,0 @@
-# Color [![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/fatih/color) [![Build Status](http://img.shields.io/travis/fatih/color.svg?style=flat-square)](https://travis-ci.org/fatih/color)
-
-
-
-Color lets you use colorized outputs in terms of [ANSI Escape
-Codes](http://en.wikipedia.org/wiki/ANSI_escape_code#Colors) in Go (Golang). It
-has support for Windows too! The API can be used in several ways, pick one that
-suits you.
-
-
-![Color](http://i.imgur.com/c1JI0lA.png)
-
-
-## Install
-
-```bash
-go get github.com/fatih/color
-```
-
-Note that the `vendor` folder is here for stability. Remove the folder if you
-already have the dependencies in your GOPATH.
-
-## Examples
-
-### Standard colors
-
-```go
-// Print with default helper functions
-color.Cyan("Prints text in cyan.")
-
-// A newline will be appended automatically
-color.Blue("Prints %s in blue.", "text")
-
-// These are using the default foreground colors
-color.Red("We have red")
-color.Magenta("And many others ..")
-
-```
-
-### Mix and reuse colors
-
-```go
-// Create a new color object
-c := color.New(color.FgCyan).Add(color.Underline)
-c.Println("Prints cyan text with an underline.")
-
-// Or just add them to New()
-d := color.New(color.FgCyan, color.Bold)
-d.Printf("This prints bold cyan %s\n", "too!.")
-
-// Mix up foreground and background colors, create new mixes!
-red := color.New(color.FgRed)
-
-boldRed := red.Add(color.Bold)
-boldRed.Println("This will print text in bold red.")
-
-whiteBackground := red.Add(color.BgWhite)
-whiteBackground.Println("Red text with white background.")
-```
-
-### Use your own output (io.Writer)
-
-```go
-// Use your own io.Writer output
-color.New(color.FgBlue).Fprintln(myWriter, "blue color!")
-
-blue := color.New(color.FgBlue)
-blue.Fprint(writer, "This will print text in blue.")
-```
-
-### Custom print functions (PrintFunc)
-
-```go
-// Create a custom print function for convenience
-red := color.New(color.FgRed).PrintfFunc()
-red("Warning")
-red("Error: %s", err)
-
-// Mix up multiple attributes
-notice := color.New(color.Bold, color.FgGreen).PrintlnFunc()
-notice("Don't forget this...")
-```
-
-### Custom fprint functions (FprintFunc)
-
-```go
-blue := color.New(FgBlue).FprintfFunc()
-blue(myWriter, "important notice: %s", stars)
-
-// Mix up with multiple attributes
-success := color.New(color.Bold, color.FgGreen).FprintlnFunc()
-success(myWriter, "Don't forget this...")
-```
-
-### Insert into noncolor strings (SprintFunc)
-
-```go
-// Create SprintXxx functions to mix strings with other non-colorized strings:
-yellow := color.New(color.FgYellow).SprintFunc()
-red := color.New(color.FgRed).SprintFunc()
-fmt.Printf("This is a %s and this is %s.\n", yellow("warning"), red("error"))
-
-info := color.New(color.FgWhite, color.BgGreen).SprintFunc()
-fmt.Printf("This %s rocks!\n", info("package"))
-
-// Use helper functions
-fmt.Println("This", color.RedString("warning"), "should be not neglected.")
-fmt.Printf("%v %v\n", color.GreenString("Info:"), "an important message.")
-
-// Windows supported too! Just don't forget to change the output to color.Output
-fmt.Fprintf(color.Output, "Windows support: %s", color.GreenString("PASS"))
-```
-
-### Plug into existing code
-
-```go
-// Use handy standard colors
-color.Set(color.FgYellow)
-
-fmt.Println("Existing text will now be in yellow")
-fmt.Printf("This one %s\n", "too")
-
-color.Unset() // Don't forget to unset
-
-// You can mix up parameters
-color.Set(color.FgMagenta, color.Bold)
-defer color.Unset() // Use it in your function
-
-fmt.Println("All text will now be bold magenta.")
-```
-
-### Disable color
-
-There might be a case where you want to disable color output (for example to
-pipe the standard output of your app to somewhere else). `Color` has support to
-disable colors both globally and for single color definition. For example
-suppose you have a CLI app and a `--no-color` bool flag. You can easily disable
-the color output with:
-
-```go
-
-var flagNoColor = flag.Bool("no-color", false, "Disable color output")
-
-if *flagNoColor {
-	color.NoColor = true // disables colorized output
-}
-```
-
-It also has support for single color definitions (local). You can
-disable/enable color output on the fly:
-
-```go
-c := color.New(color.FgCyan)
-c.Println("Prints cyan text")
-
-c.DisableColor()
-c.Println("This is printed without any color")
-
-c.EnableColor()
-c.Println("This prints again cyan...")
-```
-
-## Todo
-
-* Save/Return previous values
-* Evaluate fmt.Formatter interface
-
-
-## Credits
-
- * [Fatih Arslan](https://github.com/fatih)
- * Windows support via @mattn: [colorable](https://github.com/mattn/go-colorable)
-
-## License
-
-The MIT License (MIT) - see [`LICENSE.md`](https://github.com/fatih/color/blob/master/LICENSE.md) for more details
-
diff --git a/vendor/github.com/fatih/color/color.go b/vendor/github.com/fatih/color/color.go
deleted file mode 100644
index 7b5f3146d3..0000000000
--- a/vendor/github.com/fatih/color/color.go
+++ /dev/null
@@ -1,600 +0,0 @@
-package color
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-
-	"github.com/mattn/go-colorable"
-	"github.com/mattn/go-isatty"
-)
-
-var (
-	// NoColor defines if the output is colorized or not. It's dynamically set to
-	// false or true based on the stdout's file descriptor referring to a terminal
-	// or not. This is a global option and affects all colors. For more control
-	// over each color block use the methods DisableColor() individually.
-	NoColor = os.Getenv("TERM") == "dumb" ||
-		(!isatty.IsTerminal(os.Stdout.Fd()) && !isatty.IsCygwinTerminal(os.Stdout.Fd()))
-
-	// Output defines the standard output of the print functions. By default
-	// os.Stdout is used.
-	Output = colorable.NewColorableStdout()
-
-	// colorsCache is used to reduce the count of created Color objects and
-	// allows to reuse already created objects with required Attribute.
-	colorsCache   = make(map[Attribute]*Color)
-	colorsCacheMu sync.Mutex // protects colorsCache
-)
-
-// Color defines a custom color object which is defined by SGR parameters.
-type Color struct {
-	params  []Attribute
-	noColor *bool
-}
-
-// Attribute defines a single SGR Code
-type Attribute int
-
-const escape = "\x1b"
-
-// Base attributes
-const (
-	Reset Attribute = iota
-	Bold
-	Faint
-	Italic
-	Underline
-	BlinkSlow
-	BlinkRapid
-	ReverseVideo
-	Concealed
-	CrossedOut
-)
-
-// Foreground text colors
-const (
-	FgBlack Attribute = iota + 30
-	FgRed
-	FgGreen
-	FgYellow
-	FgBlue
-	FgMagenta
-	FgCyan
-	FgWhite
-)
-
-// Foreground Hi-Intensity text colors
-const (
-	FgHiBlack Attribute = iota + 90
-	FgHiRed
-	FgHiGreen
-	FgHiYellow
-	FgHiBlue
-	FgHiMagenta
-	FgHiCyan
-	FgHiWhite
-)
-
-// Background text colors
-const (
-	BgBlack Attribute = iota + 40
-	BgRed
-	BgGreen
-	BgYellow
-	BgBlue
-	BgMagenta
-	BgCyan
-	BgWhite
-)
-
-// Background Hi-Intensity text colors
-const (
-	BgHiBlack Attribute = iota + 100
-	BgHiRed
-	BgHiGreen
-	BgHiYellow
-	BgHiBlue
-	BgHiMagenta
-	BgHiCyan
-	BgHiWhite
-)
-
-// New returns a newly created color object.
-func New(value ...Attribute) *Color {
-	c := &Color{params: make([]Attribute, 0)}
-	c.Add(value...)
-	return c
-}
-
-// Set sets the given parameters immediately. It will change the color of
-// output with the given SGR parameters until color.Unset() is called.
-func Set(p ...Attribute) *Color {
-	c := New(p...)
-	c.Set()
-	return c
-}
-
-// Unset resets all escape attributes and clears the output. Usually should
-// be called after Set().
-func Unset() {
-	if NoColor {
-		return
-	}
-
-	fmt.Fprintf(Output, "%s[%dm", escape, Reset)
-}
-
-// Set sets the SGR sequence.
-func (c *Color) Set() *Color {
-	if c.isNoColorSet() {
-		return c
-	}
-
-	fmt.Fprintf(Output, c.format())
-	return c
-}
-
-func (c *Color) unset() {
-	if c.isNoColorSet() {
-		return
-	}
-
-	Unset()
-}
-
-func (c *Color) setWriter(w io.Writer) *Color {
-	if c.isNoColorSet() {
-		return c
-	}
-
-	fmt.Fprintf(w, c.format())
-	return c
-}
-
-func (c *Color) unsetWriter(w io.Writer) {
-	if c.isNoColorSet() {
-		return
-	}
-
-	if NoColor {
-		return
-	}
-
-	fmt.Fprintf(w, "%s[%dm", escape, Reset)
-}
-
-// Add is used to chain SGR parameters. Use as many as parameters to combine
-// and create custom color objects. Example: Add(color.FgRed, color.Underline).
-func (c *Color) Add(value ...Attribute) *Color {
-	c.params = append(c.params, value...)
-	return c
-}
-
-func (c *Color) prepend(value Attribute) {
-	c.params = append(c.params, 0)
-	copy(c.params[1:], c.params[0:])
-	c.params[0] = value
-}
-
-// Fprint formats using the default formats for its operands and writes to w.
-// Spaces are added between operands when neither is a string.
-// It returns the number of bytes written and any write error encountered.
-// On Windows, users should wrap w with colorable.NewColorable() if w is of
-// type *os.File.
-func (c *Color) Fprint(w io.Writer, a ...interface{}) (n int, err error) {
-	c.setWriter(w)
-	defer c.unsetWriter(w)
-
-	return fmt.Fprint(w, a...)
-}
-
-// Print formats using the default formats for its operands and writes to
-// standard output. Spaces are added between operands when neither is a
-// string. It returns the number of bytes written and any write error
-// encountered. This is the standard fmt.Print() method wrapped with the given
-// color.
-func (c *Color) Print(a ...interface{}) (n int, err error) {
-	c.Set()
-	defer c.unset()
-
-	return fmt.Fprint(Output, a...)
-}
-
-// Fprintf formats according to a format specifier and writes to w.
-// It returns the number of bytes written and any write error encountered.
-// On Windows, users should wrap w with colorable.NewColorable() if w is of
-// type *os.File.
-func (c *Color) Fprintf(w io.Writer, format string, a ...interface{}) (n int, err error) {
-	c.setWriter(w)
-	defer c.unsetWriter(w)
-
-	return fmt.Fprintf(w, format, a...)
-}
-
-// Printf formats according to a format specifier and writes to standard output.
-// It returns the number of bytes written and any write error encountered.
-// This is the standard fmt.Printf() method wrapped with the given color.
-func (c *Color) Printf(format string, a ...interface{}) (n int, err error) {
-	c.Set()
-	defer c.unset()
-
-	return fmt.Fprintf(Output, format, a...)
-}
-
-// Fprintln formats using the default formats for its operands and writes to w.
-// Spaces are always added between operands and a newline is appended.
-// On Windows, users should wrap w with colorable.NewColorable() if w is of
-// type *os.File.
-func (c *Color) Fprintln(w io.Writer, a ...interface{}) (n int, err error) {
-	c.setWriter(w)
-	defer c.unsetWriter(w)
-
-	return fmt.Fprintln(w, a...)
-}
-
-// Println formats using the default formats for its operands and writes to
-// standard output. Spaces are always added between operands and a newline is
-// appended. It returns the number of bytes written and any write error
-// encountered. This is the standard fmt.Print() method wrapped with the given
-// color.
-func (c *Color) Println(a ...interface{}) (n int, err error) {
-	c.Set()
-	defer c.unset()
-
-	return fmt.Fprintln(Output, a...)
-}
-
-// Sprint is just like Print, but returns a string instead of printing it.
-func (c *Color) Sprint(a ...interface{}) string {
-	return c.wrap(fmt.Sprint(a...))
-}
-
-// Sprintln is just like Println, but returns a string instead of printing it.
-func (c *Color) Sprintln(a ...interface{}) string {
-	return c.wrap(fmt.Sprintln(a...))
-}
-
-// Sprintf is just like Printf, but returns a string instead of printing it.
-func (c *Color) Sprintf(format string, a ...interface{}) string {
-	return c.wrap(fmt.Sprintf(format, a...))
-}
-
-// FprintFunc returns a new function that prints the passed arguments as
-// colorized with color.Fprint().
-func (c *Color) FprintFunc() func(w io.Writer, a ...interface{}) {
-	return func(w io.Writer, a ...interface{}) {
-		c.Fprint(w, a...)
-	}
-}
-
-// PrintFunc returns a new function that prints the passed arguments as
-// colorized with color.Print().
-func (c *Color) PrintFunc() func(a ...interface{}) {
-	return func(a ...interface{}) {
-		c.Print(a...)
-	}
-}
-
-// FprintfFunc returns a new function that prints the passed arguments as
-// colorized with color.Fprintf().
-func (c *Color) FprintfFunc() func(w io.Writer, format string, a ...interface{}) {
-	return func(w io.Writer, format string, a ...interface{}) {
-		c.Fprintf(w, format, a...)
-	}
-}
-
-// PrintfFunc returns a new function that prints the passed arguments as
-// colorized with color.Printf().
-func (c *Color) PrintfFunc() func(format string, a ...interface{}) {
-	return func(format string, a ...interface{}) {
-		c.Printf(format, a...)
-	}
-}
-
-// FprintlnFunc returns a new function that prints the passed arguments as
-// colorized with color.Fprintln().
-func (c *Color) FprintlnFunc() func(w io.Writer, a ...interface{}) {
-	return func(w io.Writer, a ...interface{}) {
-		c.Fprintln(w, a...)
-	}
-}
-
-// PrintlnFunc returns a new function that prints the passed arguments as
-// colorized with color.Println().
-func (c *Color) PrintlnFunc() func(a ...interface{}) {
-	return func(a ...interface{}) {
-		c.Println(a...)
-	}
-}
-
-// SprintFunc returns a new function that returns colorized strings for the
-// given arguments with fmt.Sprint(). Useful to put into or mix into other
-// string. Windows users should use this in conjunction with color.Output, example:
-//
-//	put := New(FgYellow).SprintFunc()
-//	fmt.Fprintf(color.Output, "This is a %s", put("warning"))
-func (c *Color) SprintFunc() func(a ...interface{}) string {
-	return func(a ...interface{}) string {
-		return c.wrap(fmt.Sprint(a...))
-	}
-}
-
-// SprintfFunc returns a new function that returns colorized strings for the
-// given arguments with fmt.Sprintf(). Useful to put into or mix into other
-// string. Windows users should use this in conjunction with color.Output.
-func (c *Color) SprintfFunc() func(format string, a ...interface{}) string {
-	return func(format string, a ...interface{}) string {
-		return c.wrap(fmt.Sprintf(format, a...))
-	}
-}
-
-// SprintlnFunc returns a new function that returns colorized strings for the
-// given arguments with fmt.Sprintln(). Useful to put into or mix into other
-// string. Windows users should use this in conjunction with color.Output.
-func (c *Color) SprintlnFunc() func(a ...interface{}) string {
-	return func(a ...interface{}) string {
-		return c.wrap(fmt.Sprintln(a...))
-	}
-}
-
-// sequence returns a formated SGR sequence to be plugged into a "\x1b[...m"
-// an example output might be: "1;36" -> bold cyan
-func (c *Color) sequence() string {
-	format := make([]string, len(c.params))
-	for i, v := range c.params {
-		format[i] = strconv.Itoa(int(v))
-	}
-
-	return strings.Join(format, ";")
-}
-
-// wrap wraps the s string with the colors attributes. The string is ready to
-// be printed.
-func (c *Color) wrap(s string) string {
-	if c.isNoColorSet() {
-		return s
-	}
-
-	return c.format() + s + c.unformat()
-}
-
-func (c *Color) format() string {
-	return fmt.Sprintf("%s[%sm", escape, c.sequence())
-}
-
-func (c *Color) unformat() string {
-	return fmt.Sprintf("%s[%dm", escape, Reset)
-}
-
-// DisableColor disables the color output. Useful to not change any existing
-// code and still being able to output. Can be used for flags like
-// "--no-color". To enable back use EnableColor() method.
-func (c *Color) DisableColor() {
-	c.noColor = boolPtr(true)
-}
-
-// EnableColor enables the color output. Use it in conjunction with
-// DisableColor(). Otherwise this method has no side effects.
-func (c *Color) EnableColor() {
-	c.noColor = boolPtr(false)
-}
-
-func (c *Color) isNoColorSet() bool {
-	// check first if we have user setted action
-	if c.noColor != nil {
-		return *c.noColor
-	}
-
-	// if not return the global option, which is disabled by default
-	return NoColor
-}
-
-// Equals returns a boolean value indicating whether two colors are equal.
-func (c *Color) Equals(c2 *Color) bool {
-	if len(c.params) != len(c2.params) {
-		return false
-	}
-
-	for _, attr := range c.params {
-		if !c2.attrExists(attr) {
-			return false
-		}
-	}
-
-	return true
-}
-
-func (c *Color) attrExists(a Attribute) bool {
-	for _, attr := range c.params {
-		if attr == a {
-			return true
-		}
-	}
-
-	return false
-}
-
-func boolPtr(v bool) *bool {
-	return &v
-}
-
-func getCachedColor(p Attribute) *Color {
-	colorsCacheMu.Lock()
-	defer colorsCacheMu.Unlock()
-
-	c, ok := colorsCache[p]
-	if !ok {
-		c = New(p)
-		colorsCache[p] = c
-	}
-
-	return c
-}
-
-func colorPrint(format string, p Attribute, a ...interface{}) {
-	c := getCachedColor(p)
-
-	if !strings.HasSuffix(format, "\n") {
-		format += "\n"
-	}
-
-	if len(a) == 0 {
-		c.Print(format)
-	} else {
-		c.Printf(format, a...)
-	}
-}
-
-func colorString(format string, p Attribute, a ...interface{}) string {
-	c := getCachedColor(p)
-
-	if len(a) == 0 {
-		return c.SprintFunc()(format)
-	}
-
-	return c.SprintfFunc()(format, a...)
-}
-
-// Black is a convenient helper function to print with black foreground. A
-// newline is appended to format by default.
-func Black(format string, a ...interface{}) { colorPrint(format, FgBlack, a...) }
-
-// Red is a convenient helper function to print with red foreground. A
-// newline is appended to format by default.
-func Red(format string, a ...interface{}) { colorPrint(format, FgRed, a...) }
-
-// Green is a convenient helper function to print with green foreground. A
-// newline is appended to format by default.
-func Green(format string, a ...interface{}) { colorPrint(format, FgGreen, a...) }
-
-// Yellow is a convenient helper function to print with yellow foreground.
-// A newline is appended to format by default.
-func Yellow(format string, a ...interface{}) { colorPrint(format, FgYellow, a...) }
-
-// Blue is a convenient helper function to print with blue foreground. A
-// newline is appended to format by default.
-func Blue(format string, a ...interface{}) { colorPrint(format, FgBlue, a...) }
-
-// Magenta is a convenient helper function to print with magenta foreground.
-// A newline is appended to format by default.
-func Magenta(format string, a ...interface{}) { colorPrint(format, FgMagenta, a...) }
-
-// Cyan is a convenient helper function to print with cyan foreground. A
-// newline is appended to format by default.
-func Cyan(format string, a ...interface{}) { colorPrint(format, FgCyan, a...) }
-
-// White is a convenient helper function to print with white foreground. A
-// newline is appended to format by default.
-func White(format string, a ...interface{}) { colorPrint(format, FgWhite, a...) }
-
-// BlackString is a convenient helper function to return a string with black
-// foreground.
-func BlackString(format string, a ...interface{}) string { return colorString(format, FgBlack, a...) }
-
-// RedString is a convenient helper function to return a string with red
-// foreground.
-func RedString(format string, a ...interface{}) string { return colorString(format, FgRed, a...) }
-
-// GreenString is a convenient helper function to return a string with green
-// foreground.
-func GreenString(format string, a ...interface{}) string { return colorString(format, FgGreen, a...) }
-
-// YellowString is a convenient helper function to return a string with yellow
-// foreground.
-func YellowString(format string, a ...interface{}) string { return colorString(format, FgYellow, a...) }
-
-// BlueString is a convenient helper function to return a string with blue
-// foreground.
-func BlueString(format string, a ...interface{}) string { return colorString(format, FgBlue, a...) }
-
-// MagentaString is a convenient helper function to return a string with magenta
-// foreground.
-func MagentaString(format string, a ...interface{}) string {
-	return colorString(format, FgMagenta, a...)
-}
-
-// CyanString is a convenient helper function to return a string with cyan
-// foreground.
-func CyanString(format string, a ...interface{}) string { return colorString(format, FgCyan, a...) }
-
-// WhiteString is a convenient helper function to return a string with white
-// foreground.
-func WhiteString(format string, a ...interface{}) string { return colorString(format, FgWhite, a...) }
-
-// HiBlack is a convenient helper function to print with hi-intensity black foreground. A
-// newline is appended to format by default.
-func HiBlack(format string, a ...interface{}) { colorPrint(format, FgHiBlack, a...) }
-
-// HiRed is a convenient helper function to print with hi-intensity red foreground. A
-// newline is appended to format by default.
-func HiRed(format string, a ...interface{}) { colorPrint(format, FgHiRed, a...) }
-
-// HiGreen is a convenient helper function to print with hi-intensity green foreground. A
-// newline is appended to format by default.
-func HiGreen(format string, a ...interface{}) { colorPrint(format, FgHiGreen, a...) }
-
-// HiYellow is a convenient helper function to print with hi-intensity yellow foreground.
-// A newline is appended to format by default.
-func HiYellow(format string, a ...interface{}) { colorPrint(format, FgHiYellow, a...) }
-
-// HiBlue is a convenient helper function to print with hi-intensity blue foreground. A
-// newline is appended to format by default.
-func HiBlue(format string, a ...interface{}) { colorPrint(format, FgHiBlue, a...) }
-
-// HiMagenta is a convenient helper function to print with hi-intensity magenta foreground.
-// A newline is appended to format by default.
-func HiMagenta(format string, a ...interface{}) { colorPrint(format, FgHiMagenta, a...) }
-
-// HiCyan is a convenient helper function to print with hi-intensity cyan foreground. A
-// newline is appended to format by default.
-func HiCyan(format string, a ...interface{}) { colorPrint(format, FgHiCyan, a...) }
-
-// HiWhite is a convenient helper function to print with hi-intensity white foreground. A
-// newline is appended to format by default.
-func HiWhite(format string, a ...interface{}) { colorPrint(format, FgHiWhite, a...) }
-
-// HiBlackString is a convenient helper function to return a string with hi-intensity black
-// foreground.
-func HiBlackString(format string, a ...interface{}) string {
-	return colorString(format, FgHiBlack, a...)
-}
-
-// HiRedString is a convenient helper function to return a string with hi-intensity red
-// foreground.
-func HiRedString(format string, a ...interface{}) string { return colorString(format, FgHiRed, a...) }
-
-// HiGreenString is a convenient helper function to return a string with hi-intensity green
-// foreground.
-func HiGreenString(format string, a ...interface{}) string {
-	return colorString(format, FgHiGreen, a...)
-}
-
-// HiYellowString is a convenient helper function to return a string with hi-intensity yellow
-// foreground.
-func HiYellowString(format string, a ...interface{}) string {
-	return colorString(format, FgHiYellow, a...)
-}
-
-// HiBlueString is a convenient helper function to return a string with hi-intensity blue
-// foreground.
-func HiBlueString(format string, a ...interface{}) string { return colorString(format, FgHiBlue, a...) }
-
-// HiMagentaString is a convenient helper function to return a string with hi-intensity magenta
-// foreground.
-func HiMagentaString(format string, a ...interface{}) string {
-	return colorString(format, FgHiMagenta, a...)
-}
-
-// HiCyanString is a convenient helper function to return a string with hi-intensity cyan
-// foreground.
-func HiCyanString(format string, a ...interface{}) string { return colorString(format, FgHiCyan, a...) }
-
-// HiWhiteString is a convenient helper function to return a string with hi-intensity white
-// foreground.
-func HiWhiteString(format string, a ...interface{}) string {
-	return colorString(format, FgHiWhite, a...)
-}
diff --git a/vendor/github.com/fatih/color/doc.go b/vendor/github.com/fatih/color/doc.go
deleted file mode 100644
index cf1e96500f..0000000000
--- a/vendor/github.com/fatih/color/doc.go
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-Package color is an ANSI color package to output colorized or SGR defined
-output to the standard output. The API can be used in several way, pick one
-that suits you.
-
-Use simple and default helper functions with predefined foreground colors:
-
-    color.Cyan("Prints text in cyan.")
-
-    // a newline will be appended automatically
-    color.Blue("Prints %s in blue.", "text")
-
-    // More default foreground colors..
-    color.Red("We have red")
-    color.Yellow("Yellow color too!")
-    color.Magenta("And many others ..")
-
-    // Hi-intensity colors
-    color.HiGreen("Bright green color.")
-    color.HiBlack("Bright black means gray..")
-    color.HiWhite("Shiny white color!")
-
-However there are times where custom color mixes are required. Below are some
-examples to create custom color objects and use the print functions of each
-separate color object.
-
-    // Create a new color object
-    c := color.New(color.FgCyan).Add(color.Underline)
-    c.Println("Prints cyan text with an underline.")
-
-    // Or just add them to New()
-    d := color.New(color.FgCyan, color.Bold)
-    d.Printf("This prints bold cyan %s\n", "too!.")
-
-
-    // Mix up foreground and background colors, create new mixes!
-    red := color.New(color.FgRed)
-
-    boldRed := red.Add(color.Bold)
-    boldRed.Println("This will print text in bold red.")
-
-    whiteBackground := red.Add(color.BgWhite)
-    whiteBackground.Println("Red text with White background.")
-
-    // Use your own io.Writer output
-    color.New(color.FgBlue).Fprintln(myWriter, "blue color!")
-
-    blue := color.New(color.FgBlue)
-    blue.Fprint(myWriter, "This will print text in blue.")
-
-You can create PrintXxx functions to simplify even more:
-
-    // Create a custom print function for convenient
-    red := color.New(color.FgRed).PrintfFunc()
-    red("warning")
-    red("error: %s", err)
-
-    // Mix up multiple attributes
-    notice := color.New(color.Bold, color.FgGreen).PrintlnFunc()
-    notice("don't forget this...")
-
-You can also FprintXxx functions to pass your own io.Writer:
-
-    blue := color.New(FgBlue).FprintfFunc()
-    blue(myWriter, "important notice: %s", stars)
-
-    // Mix up with multiple attributes
-    success := color.New(color.Bold, color.FgGreen).FprintlnFunc()
-    success(myWriter, don't forget this...")
-
-
-Or create SprintXxx functions to mix strings with other non-colorized strings:
-
-    yellow := New(FgYellow).SprintFunc()
-    red := New(FgRed).SprintFunc()
-
-    fmt.Printf("this is a %s and this is %s.\n", yellow("warning"), red("error"))
-
-    info := New(FgWhite, BgGreen).SprintFunc()
-    fmt.Printf("this %s rocks!\n", info("package"))
-
-Windows support is enabled by default. All Print functions work as intended.
-However only for color.SprintXXX functions, user should use fmt.FprintXXX and
-set the output to color.Output:
-
-    fmt.Fprintf(color.Output, "Windows support: %s", color.GreenString("PASS"))
-
-    info := New(FgWhite, BgGreen).SprintFunc()
-    fmt.Fprintf(color.Output, "this %s rocks!\n", info("package"))
-
-Using with existing code is possible. Just use the Set() method to set the
-standard output to the given parameters. That way a rewrite of an existing
-code is not required.
-
-    // Use handy standard colors.
-    color.Set(color.FgYellow)
-
-    fmt.Println("Existing text will be now in Yellow")
-    fmt.Printf("This one %s\n", "too")
-
-    color.Unset() // don't forget to unset
-
-    // You can mix up parameters
-    color.Set(color.FgMagenta, color.Bold)
-    defer color.Unset() // use it in your function
-
-    fmt.Println("All text will be now bold magenta.")
-
-There might be a case where you want to disable color output (for example to
-pipe the standard output of your app to somewhere else). `Color` has support to
-disable colors both globally and for single color definition. For example
-suppose you have a CLI app and a `--no-color` bool flag. You can easily disable
-the color output with:
-
-    var flagNoColor = flag.Bool("no-color", false, "Disable color output")
-
-    if *flagNoColor {
-    	color.NoColor = true // disables colorized output
-    }
-
-It also has support for single color definitions (local). You can
-disable/enable color output on the fly:
-
-     c := color.New(color.FgCyan)
-     c.Println("Prints cyan text")
-
-     c.DisableColor()
-     c.Println("This is printed without any color")
-
-     c.EnableColor()
-     c.Println("This prints again cyan...")
-*/
-package color
diff --git a/vendor/github.com/ghodss/yaml/LICENSE b/vendor/github.com/ghodss/yaml/LICENSE
deleted file mode 100644
index 7805d36de7..0000000000
--- a/vendor/github.com/ghodss/yaml/LICENSE
+++ /dev/null
@@ -1,50 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Sam Ghods
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/ghodss/yaml/README.md b/vendor/github.com/ghodss/yaml/README.md
deleted file mode 100644
index 0200f75b4d..0000000000
--- a/vendor/github.com/ghodss/yaml/README.md
+++ /dev/null
@@ -1,121 +0,0 @@
-# YAML marshaling and unmarshaling support for Go
-
-[![Build Status](https://travis-ci.org/ghodss/yaml.svg)](https://travis-ci.org/ghodss/yaml)
-
-## Introduction
-
-A wrapper around [go-yaml](https://github.com/go-yaml/yaml) designed to enable a better way of handling YAML when marshaling to and from structs.
-
-In short, this library first converts YAML to JSON using go-yaml and then uses `json.Marshal` and `json.Unmarshal` to convert to or from the struct. This means that it effectively reuses the JSON struct tags as well as the custom JSON methods `MarshalJSON` and `UnmarshalJSON` unlike go-yaml. For a detailed overview of the rationale behind this method, [see this blog post](http://ghodss.com/2014/the-right-way-to-handle-yaml-in-golang/).
-
-## Compatibility
-
-This package uses [go-yaml](https://github.com/go-yaml/yaml) and therefore supports [everything go-yaml supports](https://github.com/go-yaml/yaml#compatibility).
-
-## Caveats
-
-**Caveat #1:** When using `yaml.Marshal` and `yaml.Unmarshal`, binary data should NOT be preceded with the `!!binary` YAML tag. If you do, go-yaml will convert the binary data from base64 to native binary data, which is not compatible with JSON. You can still use binary in your YAML files though - just store them without the `!!binary` tag and decode the base64 in your code (e.g. in the custom JSON methods `MarshalJSON` and `UnmarshalJSON`). This also has the benefit that your YAML and your JSON binary data will be decoded exactly the same way. As an example:
-
-```
-BAD:
-	exampleKey: !!binary gIGC
-
-GOOD:
-	exampleKey: gIGC
-... and decode the base64 data in your code.
-```
-
-**Caveat #2:** When using `YAMLToJSON` directly, maps with keys that are maps will result in an error since this is not supported by JSON. This error will occur in `Unmarshal` as well since you can't unmarshal map keys anyways since struct fields can't be keys.
-
-## Installation and usage
-
-To install, run:
-
-```
-$ go get github.com/ghodss/yaml
-```
-
-And import using:
-
-```
-import "github.com/ghodss/yaml"
-```
-
-Usage is very similar to the JSON library:
-
-```go
-package main
-
-import (
-	"fmt"
-
-	"github.com/ghodss/yaml"
-)
-
-type Person struct {
-	Name string `json:"name"` // Affects YAML field names too.
-	Age  int    `json:"age"`
-}
-
-func main() {
-	// Marshal a Person struct to YAML.
-	p := Person{"John", 30}
-	y, err := yaml.Marshal(p)
-	if err != nil {
-		fmt.Printf("err: %v\n", err)
-		return
-	}
-	fmt.Println(string(y))
-	/* Output:
-	age: 30
-	name: John
-	*/
-
-	// Unmarshal the YAML back into a Person struct.
-	var p2 Person
-	err = yaml.Unmarshal(y, &p2)
-	if err != nil {
-		fmt.Printf("err: %v\n", err)
-		return
-	}
-	fmt.Println(p2)
-	/* Output:
-	{John 30}
-	*/
-}
-```
-
-`yaml.YAMLToJSON` and `yaml.JSONToYAML` methods are also available:
-
-```go
-package main
-
-import (
-	"fmt"
-
-	"github.com/ghodss/yaml"
-)
-
-func main() {
-	j := []byte(`{"name": "John", "age": 30}`)
-	y, err := yaml.JSONToYAML(j)
-	if err != nil {
-		fmt.Printf("err: %v\n", err)
-		return
-	}
-	fmt.Println(string(y))
-	/* Output:
-	name: John
-	age: 30
-	*/
-	j2, err := yaml.YAMLToJSON(y)
-	if err != nil {
-		fmt.Printf("err: %v\n", err)
-		return
-	}
-	fmt.Println(string(j2))
-	/* Output:
-	{"age":30,"name":"John"}
-	*/
-}
-```
diff --git a/vendor/github.com/ghodss/yaml/fields.go b/vendor/github.com/ghodss/yaml/fields.go
deleted file mode 100644
index 5860074026..0000000000
--- a/vendor/github.com/ghodss/yaml/fields.go
+++ /dev/null
@@ -1,501 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-package yaml
-
-import (
-	"bytes"
-	"encoding"
-	"encoding/json"
-	"reflect"
-	"sort"
-	"strings"
-	"sync"
-	"unicode"
-	"unicode/utf8"
-)
-
-// indirect walks down v allocating pointers as needed,
-// until it gets to a non-pointer.
-// if it encounters an Unmarshaler, indirect stops and returns that.
-// if decodingNull is true, indirect stops at the last pointer so it can be set to nil.
-func indirect(v reflect.Value, decodingNull bool) (json.Unmarshaler, encoding.TextUnmarshaler, reflect.Value) {
-	// If v is a named type and is addressable,
-	// start with its address, so that if the type has pointer methods,
-	// we find them.
-	if v.Kind() != reflect.Ptr && v.Type().Name() != "" && v.CanAddr() {
-		v = v.Addr()
-	}
-	for {
-		// Load value from interface, but only if the result will be
-		// usefully addressable.
-		if v.Kind() == reflect.Interface && !v.IsNil() {
-			e := v.Elem()
-			if e.Kind() == reflect.Ptr && !e.IsNil() && (!decodingNull || e.Elem().Kind() == reflect.Ptr) {
-				v = e
-				continue
-			}
-		}
-
-		if v.Kind() != reflect.Ptr {
-			break
-		}
-
-		if v.Elem().Kind() != reflect.Ptr && decodingNull && v.CanSet() {
-			break
-		}
-		if v.IsNil() {
-			if v.CanSet() {
-				v.Set(reflect.New(v.Type().Elem()))
-			} else {
-				v = reflect.New(v.Type().Elem())
-			}
-		}
-		if v.Type().NumMethod() > 0 {
-			if u, ok := v.Interface().(json.Unmarshaler); ok {
-				return u, nil, reflect.Value{}
-			}
-			if u, ok := v.Interface().(encoding.TextUnmarshaler); ok {
-				return nil, u, reflect.Value{}
-			}
-		}
-		v = v.Elem()
-	}
-	return nil, nil, v
-}
-
-// A field represents a single field found in a struct.
-type field struct {
-	name      string
-	nameBytes []byte                 // []byte(name)
-	equalFold func(s, t []byte) bool // bytes.EqualFold or equivalent
-
-	tag       bool
-	index     []int
-	typ       reflect.Type
-	omitEmpty bool
-	quoted    bool
-}
-
-func fillField(f field) field {
-	f.nameBytes = []byte(f.name)
-	f.equalFold = foldFunc(f.nameBytes)
-	return f
-}
-
-// byName sorts field by name, breaking ties with depth,
-// then breaking ties with "name came from json tag", then
-// breaking ties with index sequence.
-type byName []field
-
-func (x byName) Len() int { return len(x) }
-
-func (x byName) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-
-func (x byName) Less(i, j int) bool {
-	if x[i].name != x[j].name {
-		return x[i].name < x[j].name
-	}
-	if len(x[i].index) != len(x[j].index) {
-		return len(x[i].index) < len(x[j].index)
-	}
-	if x[i].tag != x[j].tag {
-		return x[i].tag
-	}
-	return byIndex(x).Less(i, j)
-}
-
-// byIndex sorts field by index sequence.
-type byIndex []field
-
-func (x byIndex) Len() int { return len(x) }
-
-func (x byIndex) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-
-func (x byIndex) Less(i, j int) bool {
-	for k, xik := range x[i].index {
-		if k >= len(x[j].index) {
-			return false
-		}
-		if xik != x[j].index[k] {
-			return xik < x[j].index[k]
-		}
-	}
-	return len(x[i].index) < len(x[j].index)
-}
-
-// typeFields returns a list of fields that JSON should recognize for the given type.
-// The algorithm is breadth-first search over the set of structs to include - the top struct
-// and then any reachable anonymous structs.
-func typeFields(t reflect.Type) []field {
-	// Anonymous fields to explore at the current level and the next.
-	current := []field{}
-	next := []field{{typ: t}}
-
-	// Count of queued names for current level and the next.
-	count := map[reflect.Type]int{}
-	nextCount := map[reflect.Type]int{}
-
-	// Types already visited at an earlier level.
-	visited := map[reflect.Type]bool{}
-
-	// Fields found.
-	var fields []field
-
-	for len(next) > 0 {
-		current, next = next, current[:0]
-		count, nextCount = nextCount, map[reflect.Type]int{}
-
-		for _, f := range current {
-			if visited[f.typ] {
-				continue
-			}
-			visited[f.typ] = true
-
-			// Scan f.typ for fields to include.
-			for i := 0; i < f.typ.NumField(); i++ {
-				sf := f.typ.Field(i)
-				if sf.PkgPath != "" { // unexported
-					continue
-				}
-				tag := sf.Tag.Get("json")
-				if tag == "-" {
-					continue
-				}
-				name, opts := parseTag(tag)
-				if !isValidTag(name) {
-					name = ""
-				}
-				index := make([]int, len(f.index)+1)
-				copy(index, f.index)
-				index[len(f.index)] = i
-
-				ft := sf.Type
-				if ft.Name() == "" && ft.Kind() == reflect.Ptr {
-					// Follow pointer.
-					ft = ft.Elem()
-				}
-
-				// Record found field and index sequence.
-				if name != "" || !sf.Anonymous || ft.Kind() != reflect.Struct {
-					tagged := name != ""
-					if name == "" {
-						name = sf.Name
-					}
-					fields = append(fields, fillField(field{
-						name:      name,
-						tag:       tagged,
-						index:     index,
-						typ:       ft,
-						omitEmpty: opts.Contains("omitempty"),
-						quoted:    opts.Contains("string"),
-					}))
-					if count[f.typ] > 1 {
-						// If there were multiple instances, add a second,
-						// so that the annihilation code will see a duplicate.
-						// It only cares about the distinction between 1 or 2,
-						// so don't bother generating any more copies.
-						fields = append(fields, fields[len(fields)-1])
-					}
-					continue
-				}
-
-				// Record new anonymous struct to explore in next round.
-				nextCount[ft]++
-				if nextCount[ft] == 1 {
-					next = append(next, fillField(field{name: ft.Name(), index: index, typ: ft}))
-				}
-			}
-		}
-	}
-
-	sort.Sort(byName(fields))
-
-	// Delete all fields that are hidden by the Go rules for embedded fields,
-	// except that fields with JSON tags are promoted.
-
-	// The fields are sorted in primary order of name, secondary order
-	// of field index length. Loop over names; for each name, delete
-	// hidden fields by choosing the one dominant field that survives.
-	out := fields[:0]
-	for advance, i := 0, 0; i < len(fields); i += advance {
-		// One iteration per name.
-		// Find the sequence of fields with the name of this first field.
-		fi := fields[i]
-		name := fi.name
-		for advance = 1; i+advance < len(fields); advance++ {
-			fj := fields[i+advance]
-			if fj.name != name {
-				break
-			}
-		}
-		if advance == 1 { // Only one field with this name
-			out = append(out, fi)
-			continue
-		}
-		dominant, ok := dominantField(fields[i : i+advance])
-		if ok {
-			out = append(out, dominant)
-		}
-	}
-
-	fields = out
-	sort.Sort(byIndex(fields))
-
-	return fields
-}
-
-// dominantField looks through the fields, all of which are known to
-// have the same name, to find the single field that dominates the
-// others using Go's embedding rules, modified by the presence of
-// JSON tags. If there are multiple top-level fields, the boolean
-// will be false: This condition is an error in Go and we skip all
-// the fields.
-func dominantField(fields []field) (field, bool) {
-	// The fields are sorted in increasing index-length order. The winner
-	// must therefore be one with the shortest index length. Drop all
-	// longer entries, which is easy: just truncate the slice.
-	length := len(fields[0].index)
-	tagged := -1 // Index of first tagged field.
-	for i, f := range fields {
-		if len(f.index) > length {
-			fields = fields[:i]
-			break
-		}
-		if f.tag {
-			if tagged >= 0 {
-				// Multiple tagged fields at the same level: conflict.
-				// Return no field.
-				return field{}, false
-			}
-			tagged = i
-		}
-	}
-	if tagged >= 0 {
-		return fields[tagged], true
-	}
-	// All remaining fields have the same length. If there's more than one,
-	// we have a conflict (two fields named "X" at the same level) and we
-	// return no field.
-	if len(fields) > 1 {
-		return field{}, false
-	}
-	return fields[0], true
-}
-
-var fieldCache struct {
-	sync.RWMutex
-	m map[reflect.Type][]field
-}
-
-// cachedTypeFields is like typeFields but uses a cache to avoid repeated work.
-func cachedTypeFields(t reflect.Type) []field {
-	fieldCache.RLock()
-	f := fieldCache.m[t]
-	fieldCache.RUnlock()
-	if f != nil {
-		return f
-	}
-
-	// Compute fields without lock.
-	// Might duplicate effort but won't hold other computations back.
-	f = typeFields(t)
-	if f == nil {
-		f = []field{}
-	}
-
-	fieldCache.Lock()
-	if fieldCache.m == nil {
-		fieldCache.m = map[reflect.Type][]field{}
-	}
-	fieldCache.m[t] = f
-	fieldCache.Unlock()
-	return f
-}
-
-func isValidTag(s string) bool {
-	if s == "" {
-		return false
-	}
-	for _, c := range s {
-		switch {
-		case strings.ContainsRune("!#$%&()*+-./:<=>?@[]^_{|}~ ", c):
-			// Backslash and quote chars are reserved, but
-			// otherwise any punctuation chars are allowed
-			// in a tag name.
-		default:
-			if !unicode.IsLetter(c) && !unicode.IsDigit(c) {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-const (
-	caseMask     = ^byte(0x20) // Mask to ignore case in ASCII.
-	kelvin       = '\u212a'
-	smallLongEss = '\u017f'
-)
-
-// foldFunc returns one of four different case folding equivalence
-// functions, from most general (and slow) to fastest:
-//
-// 1) bytes.EqualFold, if the key s contains any non-ASCII UTF-8
-// 2) equalFoldRight, if s contains special folding ASCII ('k', 'K', 's', 'S')
-// 3) asciiEqualFold, no special, but includes non-letters (including _)
-// 4) simpleLetterEqualFold, no specials, no non-letters.
-//
-// The letters S and K are special because they map to 3 runes, not just 2:
-//  * S maps to s and to U+017F 'ſ' Latin small letter long s
-//  * k maps to K and to U+212A 'K' Kelvin sign
-// See http://play.golang.org/p/tTxjOc0OGo
-//
-// The returned function is specialized for matching against s and
-// should only be given s. It's not curried for performance reasons.
-func foldFunc(s []byte) func(s, t []byte) bool {
-	nonLetter := false
-	special := false // special letter
-	for _, b := range s {
-		if b >= utf8.RuneSelf {
-			return bytes.EqualFold
-		}
-		upper := b & caseMask
-		if upper < 'A' || upper > 'Z' {
-			nonLetter = true
-		} else if upper == 'K' || upper == 'S' {
-			// See above for why these letters are special.
-			special = true
-		}
-	}
-	if special {
-		return equalFoldRight
-	}
-	if nonLetter {
-		return asciiEqualFold
-	}
-	return simpleLetterEqualFold
-}
-
-// equalFoldRight is a specialization of bytes.EqualFold when s is
-// known to be all ASCII (including punctuation), but contains an 's',
-// 'S', 'k', or 'K', requiring a Unicode fold on the bytes in t.
-// See comments on foldFunc.
-func equalFoldRight(s, t []byte) bool {
-	for _, sb := range s {
-		if len(t) == 0 {
-			return false
-		}
-		tb := t[0]
-		if tb < utf8.RuneSelf {
-			if sb != tb {
-				sbUpper := sb & caseMask
-				if 'A' <= sbUpper && sbUpper <= 'Z' {
-					if sbUpper != tb&caseMask {
-						return false
-					}
-				} else {
-					return false
-				}
-			}
-			t = t[1:]
-			continue
-		}
-		// sb is ASCII and t is not. t must be either kelvin
-		// sign or long s; sb must be s, S, k, or K.
-		tr, size := utf8.DecodeRune(t)
-		switch sb {
-		case 's', 'S':
-			if tr != smallLongEss {
-				return false
-			}
-		case 'k', 'K':
-			if tr != kelvin {
-				return false
-			}
-		default:
-			return false
-		}
-		t = t[size:]
-
-	}
-	if len(t) > 0 {
-		return false
-	}
-	return true
-}
-
-// asciiEqualFold is a specialization of bytes.EqualFold for use when
-// s is all ASCII (but may contain non-letters) and contains no
-// special-folding letters.
-// See comments on foldFunc.
-func asciiEqualFold(s, t []byte) bool {
-	if len(s) != len(t) {
-		return false
-	}
-	for i, sb := range s {
-		tb := t[i]
-		if sb == tb {
-			continue
-		}
-		if ('a' <= sb && sb <= 'z') || ('A' <= sb && sb <= 'Z') {
-			if sb&caseMask != tb&caseMask {
-				return false
-			}
-		} else {
-			return false
-		}
-	}
-	return true
-}
-
-// simpleLetterEqualFold is a specialization of bytes.EqualFold for
-// use when s is all ASCII letters (no underscores, etc) and also
-// doesn't contain 'k', 'K', 's', or 'S'.
-// See comments on foldFunc.
-func simpleLetterEqualFold(s, t []byte) bool {
-	if len(s) != len(t) {
-		return false
-	}
-	for i, b := range s {
-		if b&caseMask != t[i]&caseMask {
-			return false
-		}
-	}
-	return true
-}
-
-// tagOptions is the string following a comma in a struct field's "json"
-// tag, or the empty string. It does not include the leading comma.
-type tagOptions string
-
-// parseTag splits a struct field's json tag into its name and
-// comma-separated options.
-func parseTag(tag string) (string, tagOptions) {
-	if idx := strings.Index(tag, ","); idx != -1 {
-		return tag[:idx], tagOptions(tag[idx+1:])
-	}
-	return tag, tagOptions("")
-}
-
-// Contains reports whether a comma-separated list of options
-// contains a particular substr flag. substr must be surrounded by a
-// string boundary or commas.
-func (o tagOptions) Contains(optionName string) bool {
-	if len(o) == 0 {
-		return false
-	}
-	s := string(o)
-	for s != "" {
-		var next string
-		i := strings.Index(s, ",")
-		if i >= 0 {
-			s, next = s[:i], s[i+1:]
-		}
-		if s == optionName {
-			return true
-		}
-		s = next
-	}
-	return false
-}
diff --git a/vendor/github.com/ghodss/yaml/yaml.go b/vendor/github.com/ghodss/yaml/yaml.go
deleted file mode 100644
index 4fb4054a8b..0000000000
--- a/vendor/github.com/ghodss/yaml/yaml.go
+++ /dev/null
@@ -1,277 +0,0 @@
-package yaml
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"strconv"
-
-	"gopkg.in/yaml.v2"
-)
-
-// Marshals the object into JSON then converts JSON to YAML and returns the
-// YAML.
-func Marshal(o interface{}) ([]byte, error) {
-	j, err := json.Marshal(o)
-	if err != nil {
-		return nil, fmt.Errorf("error marshaling into JSON: %v", err)
-	}
-
-	y, err := JSONToYAML(j)
-	if err != nil {
-		return nil, fmt.Errorf("error converting JSON to YAML: %v", err)
-	}
-
-	return y, nil
-}
-
-// Converts YAML to JSON then uses JSON to unmarshal into an object.
-func Unmarshal(y []byte, o interface{}) error {
-	vo := reflect.ValueOf(o)
-	j, err := yamlToJSON(y, &vo)
-	if err != nil {
-		return fmt.Errorf("error converting YAML to JSON: %v", err)
-	}
-
-	err = json.Unmarshal(j, o)
-	if err != nil {
-		return fmt.Errorf("error unmarshaling JSON: %v", err)
-	}
-
-	return nil
-}
-
-// Convert JSON to YAML.
-func JSONToYAML(j []byte) ([]byte, error) {
-	// Convert the JSON to an object.
-	var jsonObj interface{}
-	// We are using yaml.Unmarshal here (instead of json.Unmarshal) because the
-	// Go JSON library doesn't try to pick the right number type (int, float,
-	// etc.) when unmarshalling to interface{}, it just picks float64
-	// universally. go-yaml does go through the effort of picking the right
-	// number type, so we can preserve number type throughout this process.
-	err := yaml.Unmarshal(j, &jsonObj)
-	if err != nil {
-		return nil, err
-	}
-
-	// Marshal this object into YAML.
-	return yaml.Marshal(jsonObj)
-}
-
-// Convert YAML to JSON. Since JSON is a subset of YAML, passing JSON through
-// this method should be a no-op.
-//
-// Things YAML can do that are not supported by JSON:
-// * In YAML you can have binary and null keys in your maps. These are invalid
-//   in JSON. (int and float keys are converted to strings.)
-// * Binary data in YAML with the !!binary tag is not supported. If you want to
-//   use binary data with this library, encode the data as base64 as usual but do
-//   not use the !!binary tag in your YAML. This will ensure the original base64
-//   encoded data makes it all the way through to the JSON.
-func YAMLToJSON(y []byte) ([]byte, error) {
-	return yamlToJSON(y, nil)
-}
-
-func yamlToJSON(y []byte, jsonTarget *reflect.Value) ([]byte, error) {
-	// Convert the YAML to an object.
-	var yamlObj interface{}
-	err := yaml.Unmarshal(y, &yamlObj)
-	if err != nil {
-		return nil, err
-	}
-
-	// YAML objects are not completely compatible with JSON objects (e.g. you
-	// can have non-string keys in YAML). So, convert the YAML-compatible object
-	// to a JSON-compatible object, failing with an error if irrecoverable
-	// incompatibilties happen along the way.
-	jsonObj, err := convertToJSONableObject(yamlObj, jsonTarget)
-	if err != nil {
-		return nil, err
-	}
-
-	// Convert this object to JSON and return the data.
-	return json.Marshal(jsonObj)
-}
-
-func convertToJSONableObject(yamlObj interface{}, jsonTarget *reflect.Value) (interface{}, error) {
-	var err error
-
-	// Resolve jsonTarget to a concrete value (i.e. not a pointer or an
-	// interface). We pass decodingNull as false because we're not actually
-	// decoding into the value, we're just checking if the ultimate target is a
-	// string.
-	if jsonTarget != nil {
-		ju, tu, pv := indirect(*jsonTarget, false)
-		// We have a JSON or Text Umarshaler at this level, so we can't be trying
-		// to decode into a string.
-		if ju != nil || tu != nil {
-			jsonTarget = nil
-		} else {
-			jsonTarget = &pv
-		}
-	}
-
-	// If yamlObj is a number or a boolean, check if jsonTarget is a string -
-	// if so, coerce.  Else return normal.
-	// If yamlObj is a map or array, find the field that each key is
-	// unmarshaling to, and when you recurse pass the reflect.Value for that
-	// field back into this function.
-	switch typedYAMLObj := yamlObj.(type) {
-	case map[interface{}]interface{}:
-		// JSON does not support arbitrary keys in a map, so we must convert
-		// these keys to strings.
-		//
-		// From my reading of go-yaml v2 (specifically the resolve function),
-		// keys can only have the types string, int, int64, float64, binary
-		// (unsupported), or null (unsupported).
-		strMap := make(map[string]interface{})
-		for k, v := range typedYAMLObj {
-			// Resolve the key to a string first.
-			var keyString string
-			switch typedKey := k.(type) {
-			case string:
-				keyString = typedKey
-			case int:
-				keyString = strconv.Itoa(typedKey)
-			case int64:
-				// go-yaml will only return an int64 as a key if the system
-				// architecture is 32-bit and the key's value is between 32-bit
-				// and 64-bit. Otherwise the key type will simply be int.
-				keyString = strconv.FormatInt(typedKey, 10)
-			case float64:
-				// Stolen from go-yaml to use the same conversion to string as
-				// the go-yaml library uses to convert float to string when
-				// Marshaling.
-				s := strconv.FormatFloat(typedKey, 'g', -1, 32)
-				switch s {
-				case "+Inf":
-					s = ".inf"
-				case "-Inf":
-					s = "-.inf"
-				case "NaN":
-					s = ".nan"
-				}
-				keyString = s
-			case bool:
-				if typedKey {
-					keyString = "true"
-				} else {
-					keyString = "false"
-				}
-			default:
-				return nil, fmt.Errorf("Unsupported map key of type: %s, key: %+#v, value: %+#v",
-					reflect.TypeOf(k), k, v)
-			}
-
-			// jsonTarget should be a struct or a map. If it's a struct, find
-			// the field it's going to map to and pass its reflect.Value. If
-			// it's a map, find the element type of the map and pass the
-			// reflect.Value created from that type. If it's neither, just pass
-			// nil - JSON conversion will error for us if it's a real issue.
-			if jsonTarget != nil {
-				t := *jsonTarget
-				if t.Kind() == reflect.Struct {
-					keyBytes := []byte(keyString)
-					// Find the field that the JSON library would use.
-					var f *field
-					fields := cachedTypeFields(t.Type())
-					for i := range fields {
-						ff := &fields[i]
-						if bytes.Equal(ff.nameBytes, keyBytes) {
-							f = ff
-							break
-						}
-						// Do case-insensitive comparison.
-						if f == nil && ff.equalFold(ff.nameBytes, keyBytes) {
-							f = ff
-						}
-					}
-					if f != nil {
-						// Find the reflect.Value of the most preferential
-						// struct field.
-						jtf := t.Field(f.index[0])
-						strMap[keyString], err = convertToJSONableObject(v, &jtf)
-						if err != nil {
-							return nil, err
-						}
-						continue
-					}
-				} else if t.Kind() == reflect.Map {
-					// Create a zero value of the map's element type to use as
-					// the JSON target.
-					jtv := reflect.Zero(t.Type().Elem())
-					strMap[keyString], err = convertToJSONableObject(v, &jtv)
-					if err != nil {
-						return nil, err
-					}
-					continue
-				}
-			}
-			strMap[keyString], err = convertToJSONableObject(v, nil)
-			if err != nil {
-				return nil, err
-			}
-		}
-		return strMap, nil
-	case []interface{}:
-		// We need to recurse into arrays in case there are any
-		// map[interface{}]interface{}'s inside and to convert any
-		// numbers to strings.
-
-		// If jsonTarget is a slice (which it really should be), find the
-		// thing it's going to map to. If it's not a slice, just pass nil
-		// - JSON conversion will error for us if it's a real issue.
-		var jsonSliceElemValue *reflect.Value
-		if jsonTarget != nil {
-			t := *jsonTarget
-			if t.Kind() == reflect.Slice {
-				// By default slices point to nil, but we need a reflect.Value
-				// pointing to a value of the slice type, so we create one here.
-				ev := reflect.Indirect(reflect.New(t.Type().Elem()))
-				jsonSliceElemValue = &ev
-			}
-		}
-
-		// Make and use a new array.
-		arr := make([]interface{}, len(typedYAMLObj))
-		for i, v := range typedYAMLObj {
-			arr[i], err = convertToJSONableObject(v, jsonSliceElemValue)
-			if err != nil {
-				return nil, err
-			}
-		}
-		return arr, nil
-	default:
-		// If the target type is a string and the YAML type is a number,
-		// convert the YAML type to a string.
-		if jsonTarget != nil && (*jsonTarget).Kind() == reflect.String {
-			// Based on my reading of go-yaml, it may return int, int64,
-			// float64, or uint64.
-			var s string
-			switch typedVal := typedYAMLObj.(type) {
-			case int:
-				s = strconv.FormatInt(int64(typedVal), 10)
-			case int64:
-				s = strconv.FormatInt(typedVal, 10)
-			case float64:
-				s = strconv.FormatFloat(typedVal, 'g', -1, 32)
-			case uint64:
-				s = strconv.FormatUint(typedVal, 10)
-			case bool:
-				if typedVal {
-					s = "true"
-				} else {
-					s = "false"
-				}
-			}
-			if len(s) > 0 {
-				yamlObj = interface{}(s)
-			}
-		}
-		return yamlObj, nil
-	}
-
-	return nil, nil
-}
diff --git a/vendor/github.com/go-ini/ini/LICENSE b/vendor/github.com/go-ini/ini/LICENSE
deleted file mode 100644
index 37ec93a14f..0000000000
--- a/vendor/github.com/go-ini/ini/LICENSE
+++ /dev/null
@@ -1,191 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/go-ini/ini/Makefile b/vendor/github.com/go-ini/ini/Makefile
deleted file mode 100644
index ac034e5258..0000000000
--- a/vendor/github.com/go-ini/ini/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.PHONY: build test bench vet
-
-build: vet bench
-
-test:
-	go test -v -cover -race
-
-bench:
-	go test -v -cover -race -test.bench=. -test.benchmem
-
-vet:
-	go vet
diff --git a/vendor/github.com/go-ini/ini/README.md b/vendor/github.com/go-ini/ini/README.md
deleted file mode 100644
index e67d51f320..0000000000
--- a/vendor/github.com/go-ini/ini/README.md
+++ /dev/null
@@ -1,746 +0,0 @@
-INI [![Build Status](https://travis-ci.org/go-ini/ini.svg?branch=master)](https://travis-ci.org/go-ini/ini) [![Sourcegraph](https://sourcegraph.com/github.com/go-ini/ini/-/badge.svg)](https://sourcegraph.com/github.com/go-ini/ini?badge)
-===
-
-![](https://avatars0.githubusercontent.com/u/10216035?v=3&s=200)
-
-Package ini provides INI file read and write functionality in Go.
-
-[简体中文](README_ZH.md)
-
-## Feature
-
-- Load multiple data sources(`[]byte`, file and `io.ReadCloser`) with overwrites.
-- Read with recursion values.
-- Read with parent-child sections.
-- Read with auto-increment key names.
-- Read with multiple-line values.
-- Read with tons of helper methods.
-- Read and convert values to Go types.
-- Read and **WRITE** comments of sections and keys.
-- Manipulate sections, keys and comments with ease.
-- Keep sections and keys in order as you parse and save.
-
-## Installation
-
-To use a tagged revision:
-
-	go get gopkg.in/ini.v1
-
-To use with latest changes:
-
-	go get github.com/go-ini/ini
-
-Please add `-u` flag to update in the future.
-
-### Testing
-
-If you want to test on your machine, please apply `-t` flag:
-
-	go get -t gopkg.in/ini.v1
-
-Please add `-u` flag to update in the future.
-
-## Getting Started
-
-### Loading from data sources
-
-A **Data Source** is either raw data in type `[]byte`, a file name with type `string` or `io.ReadCloser`. You can load **as many data sources as you want**. Passing other types will simply return an error.
-
-```go
-cfg, err := ini.Load([]byte("raw data"), "filename", ioutil.NopCloser(bytes.NewReader([]byte("some other data"))))
-```
-
-Or start with an empty object:
-
-```go
-cfg := ini.Empty()
-```
-
-When you cannot decide how many data sources to load at the beginning, you will still be able to **Append()** them later.
-
-```go
-err := cfg.Append("other file", []byte("other raw data"))
-```
-
-If you have a list of files with possibilities that some of them may not available at the time, and you don't know exactly which ones, you can use `LooseLoad` to ignore nonexistent files without returning error.
-
-```go
-cfg, err := ini.LooseLoad("filename", "filename_404")
-```
-
-The cool thing is, whenever the file is available to load while you're calling `Reload` method, it will be counted as usual.
-
-#### Ignore cases of key name
-
-When you do not care about cases of section and key names, you can use `InsensitiveLoad` to force all names to be lowercased while parsing.
-
-```go
-cfg, err := ini.InsensitiveLoad("filename")
-//...
-
-// sec1 and sec2 are the exactly same section object
-sec1, err := cfg.GetSection("Section")
-sec2, err := cfg.GetSection("SecTIOn")
-
-// key1 and key2 are the exactly same key object
-key1, err := sec1.GetKey("Key")
-key2, err := sec2.GetKey("KeY")
-```
-
-#### MySQL-like boolean key 
-
-MySQL's configuration allows a key without value as follows:
-
-```ini
-[mysqld]
-...
-skip-host-cache
-skip-name-resolve
-```
-
-By default, this is considered as missing value. But if you know you're going to deal with those cases, you can assign advanced load options:
-
-```go
-cfg, err := LoadSources(LoadOptions{AllowBooleanKeys: true}, "my.cnf"))
-```
-
-The value of those keys are always `true`, and when you save to a file, it will keep in the same foramt as you read.
-
-To generate such keys in your program, you could use `NewBooleanKey`:
-
-```go
-key, err := sec.NewBooleanKey("skip-host-cache")
-```
-
-#### Comment
-
-Take care that following format will be treated as comment:
-
-1. Line begins with `#` or `;`
-2. Words after `#` or `;`
-3. Words after section name (i.e words after `[some section name]`)
-
-If you want to save a value with `#` or `;`, please quote them with ``` ` ``` or ``` """ ```.
-
-Alternatively, you can use following `LoadOptions` to completely ignore inline comments:
-
-```go
-cfg, err := LoadSources(LoadOptions{IgnoreInlineComment: true}, "app.ini"))
-```
-
-### Working with sections
-
-To get a section, you would need to:
-
-```go
-section, err := cfg.GetSection("section name")
-```
-
-For a shortcut for default section, just give an empty string as name:
-
-```go
-section, err := cfg.GetSection("")
-```
-
-When you're pretty sure the section exists, following code could make your life easier:
-
-```go
-section := cfg.Section("section name")
-```
-
-What happens when the section somehow does not exist? Don't panic, it automatically creates and returns a new section to you.
-
-To create a new section:
-
-```go
-err := cfg.NewSection("new section")
-```
-
-To get a list of sections or section names:
-
-```go
-sections := cfg.Sections()
-names := cfg.SectionStrings()
-```
-
-### Working with keys
-
-To get a key under a section:
-
-```go
-key, err := cfg.Section("").GetKey("key name")
-```
-
-Same rule applies to key operations:
-
-```go
-key := cfg.Section("").Key("key name")
-```
-
-To check if a key exists:
-
-```go
-yes := cfg.Section("").HasKey("key name")
-```
-
-To create a new key:
-
-```go
-err := cfg.Section("").NewKey("name", "value")
-```
-
-To get a list of keys or key names:
-
-```go
-keys := cfg.Section("").Keys()
-names := cfg.Section("").KeyStrings()
-```
-
-To get a clone hash of keys and corresponding values:
-
-```go
-hash := cfg.Section("").KeysHash()
-```
-
-### Working with values
-
-To get a string value:
-
-```go
-val := cfg.Section("").Key("key name").String()
-```
-
-To validate key value on the fly:
-
-```go
-val := cfg.Section("").Key("key name").Validate(func(in string) string {
-	if len(in) == 0 {
-		return "default"
-	}
-	return in
-})
-```
-
-If you do not want any auto-transformation (such as recursive read) for the values, you can get raw value directly (this way you get much better performance):
-
-```go
-val := cfg.Section("").Key("key name").Value()
-```
-
-To check if raw value exists:
-
-```go
-yes := cfg.Section("").HasValue("test value")
-```
-
-To get value with types:
-
-```go
-// For boolean values:
-// true when value is: 1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On
-// false when value is: 0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off
-v, err = cfg.Section("").Key("BOOL").Bool()
-v, err = cfg.Section("").Key("FLOAT64").Float64()
-v, err = cfg.Section("").Key("INT").Int()
-v, err = cfg.Section("").Key("INT64").Int64()
-v, err = cfg.Section("").Key("UINT").Uint()
-v, err = cfg.Section("").Key("UINT64").Uint64()
-v, err = cfg.Section("").Key("TIME").TimeFormat(time.RFC3339)
-v, err = cfg.Section("").Key("TIME").Time() // RFC3339
-
-v = cfg.Section("").Key("BOOL").MustBool()
-v = cfg.Section("").Key("FLOAT64").MustFloat64()
-v = cfg.Section("").Key("INT").MustInt()
-v = cfg.Section("").Key("INT64").MustInt64()
-v = cfg.Section("").Key("UINT").MustUint()
-v = cfg.Section("").Key("UINT64").MustUint64()
-v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339)
-v = cfg.Section("").Key("TIME").MustTime() // RFC3339
-
-// Methods start with Must also accept one argument for default value
-// when key not found or fail to parse value to given type.
-// Except method MustString, which you have to pass a default value.
-
-v = cfg.Section("").Key("String").MustString("default")
-v = cfg.Section("").Key("BOOL").MustBool(true)
-v = cfg.Section("").Key("FLOAT64").MustFloat64(1.25)
-v = cfg.Section("").Key("INT").MustInt(10)
-v = cfg.Section("").Key("INT64").MustInt64(99)
-v = cfg.Section("").Key("UINT").MustUint(3)
-v = cfg.Section("").Key("UINT64").MustUint64(6)
-v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339, time.Now())
-v = cfg.Section("").Key("TIME").MustTime(time.Now()) // RFC3339
-```
-
-What if my value is three-line long?
-
-```ini
-[advance]
-ADDRESS = """404 road,
-NotFound, State, 5000
-Earth"""
-```
-
-Not a problem!
-
-```go
-cfg.Section("advance").Key("ADDRESS").String()
-
-/* --- start ---
-404 road,
-NotFound, State, 5000
-Earth
-------  end  --- */
-```
-
-That's cool, how about continuation lines?
-
-```ini
-[advance]
-two_lines = how about \
-	continuation lines?
-lots_of_lines = 1 \
-	2 \
-	3 \
-	4
-```
-
-Piece of cake!
-
-```go
-cfg.Section("advance").Key("two_lines").String() // how about continuation lines?
-cfg.Section("advance").Key("lots_of_lines").String() // 1 2 3 4
-```
-
-Well, I hate continuation lines, how do I disable that?
-
-```go
-cfg, err := ini.LoadSources(ini.LoadOptions{
-	IgnoreContinuation: true,
-}, "filename")
-```
-
-Holy crap! 
-
-Note that single quotes around values will be stripped:
-
-```ini
-foo = "some value" // foo: some value
-bar = 'some value' // bar: some value
-```
-
-That's all? Hmm, no.
-
-#### Helper methods of working with values
-
-To get value with given candidates:
-
-```go
-v = cfg.Section("").Key("STRING").In("default", []string{"str", "arr", "types"})
-v = cfg.Section("").Key("FLOAT64").InFloat64(1.1, []float64{1.25, 2.5, 3.75})
-v = cfg.Section("").Key("INT").InInt(5, []int{10, 20, 30})
-v = cfg.Section("").Key("INT64").InInt64(10, []int64{10, 20, 30})
-v = cfg.Section("").Key("UINT").InUint(4, []int{3, 6, 9})
-v = cfg.Section("").Key("UINT64").InUint64(8, []int64{3, 6, 9})
-v = cfg.Section("").Key("TIME").InTimeFormat(time.RFC3339, time.Now(), []time.Time{time1, time2, time3})
-v = cfg.Section("").Key("TIME").InTime(time.Now(), []time.Time{time1, time2, time3}) // RFC3339
-```
-
-Default value will be presented if value of key is not in candidates you given, and default value does not need be one of candidates.
-
-To validate value in a given range:
-
-```go
-vals = cfg.Section("").Key("FLOAT64").RangeFloat64(0.0, 1.1, 2.2)
-vals = cfg.Section("").Key("INT").RangeInt(0, 10, 20)
-vals = cfg.Section("").Key("INT64").RangeInt64(0, 10, 20)
-vals = cfg.Section("").Key("UINT").RangeUint(0, 3, 9)
-vals = cfg.Section("").Key("UINT64").RangeUint64(0, 3, 9)
-vals = cfg.Section("").Key("TIME").RangeTimeFormat(time.RFC3339, time.Now(), minTime, maxTime)
-vals = cfg.Section("").Key("TIME").RangeTime(time.Now(), minTime, maxTime) // RFC3339
-```
-
-##### Auto-split values into a slice
-
-To use zero value of type for invalid inputs:
-
-```go
-// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
-// Input: how, 2.2, are, you -> [0.0 2.2 0.0 0.0]
-vals = cfg.Section("").Key("STRINGS").Strings(",")
-vals = cfg.Section("").Key("FLOAT64S").Float64s(",")
-vals = cfg.Section("").Key("INTS").Ints(",")
-vals = cfg.Section("").Key("INT64S").Int64s(",")
-vals = cfg.Section("").Key("UINTS").Uints(",")
-vals = cfg.Section("").Key("UINT64S").Uint64s(",")
-vals = cfg.Section("").Key("TIMES").Times(",")
-```
-
-To exclude invalid values out of result slice:
-
-```go
-// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
-// Input: how, 2.2, are, you -> [2.2]
-vals = cfg.Section("").Key("FLOAT64S").ValidFloat64s(",")
-vals = cfg.Section("").Key("INTS").ValidInts(",")
-vals = cfg.Section("").Key("INT64S").ValidInt64s(",")
-vals = cfg.Section("").Key("UINTS").ValidUints(",")
-vals = cfg.Section("").Key("UINT64S").ValidUint64s(",")
-vals = cfg.Section("").Key("TIMES").ValidTimes(",")
-```
-
-Or to return nothing but error when have invalid inputs:
-
-```go
-// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
-// Input: how, 2.2, are, you -> error
-vals = cfg.Section("").Key("FLOAT64S").StrictFloat64s(",")
-vals = cfg.Section("").Key("INTS").StrictInts(",")
-vals = cfg.Section("").Key("INT64S").StrictInt64s(",")
-vals = cfg.Section("").Key("UINTS").StrictUints(",")
-vals = cfg.Section("").Key("UINT64S").StrictUint64s(",")
-vals = cfg.Section("").Key("TIMES").StrictTimes(",")
-```
-
-### Save your configuration
-
-Finally, it's time to save your configuration to somewhere.
-
-A typical way to save configuration is writing it to a file:
-
-```go
-// ...
-err = cfg.SaveTo("my.ini")
-err = cfg.SaveToIndent("my.ini", "\t")
-```
-
-Another way to save is writing to a `io.Writer` interface:
-
-```go
-// ...
-cfg.WriteTo(writer)
-cfg.WriteToIndent(writer, "\t")
-```
-
-By default, spaces are used to align "=" sign between key and values, to disable that:
-
-```go
-ini.PrettyFormat = false
-``` 
-
-## Advanced Usage
-
-### Recursive Values
-
-For all value of keys, there is a special syntax `%(<name>)s`, where `<name>` is the key name in same section or default section, and `%(<name>)s` will be replaced by corresponding value(empty string if key not found). You can use this syntax at most 99 level of recursions.
-
-```ini
-NAME = ini
-
-[author]
-NAME = Unknwon
-GITHUB = https://github.com/%(NAME)s
-
-[package]
-FULL_NAME = github.com/go-ini/%(NAME)s
-```
-
-```go
-cfg.Section("author").Key("GITHUB").String()		// https://github.com/Unknwon
-cfg.Section("package").Key("FULL_NAME").String()	// github.com/go-ini/ini
-```
-
-### Parent-child Sections
-
-You can use `.` in section name to indicate parent-child relationship between two or more sections. If the key not found in the child section, library will try again on its parent section until there is no parent section.
-
-```ini
-NAME = ini
-VERSION = v1
-IMPORT_PATH = gopkg.in/%(NAME)s.%(VERSION)s
-
-[package]
-CLONE_URL = https://%(IMPORT_PATH)s
-
-[package.sub]
-```
-
-```go
-cfg.Section("package.sub").Key("CLONE_URL").String()	// https://gopkg.in/ini.v1
-```
-
-#### Retrieve parent keys available to a child section
-
-```go
-cfg.Section("package.sub").ParentKeys() // ["CLONE_URL"]
-```
-
-### Unparseable Sections
-
-Sometimes, you have sections that do not contain key-value pairs but raw content, to handle such case, you can use `LoadOptions.UnparsableSections`:
-
-```go
-cfg, err := LoadSources(LoadOptions{UnparseableSections: []string{"COMMENTS"}}, `[COMMENTS]
-<1><L.Slide#2> This slide has the fuel listed in the wrong units <e.1>`))
-
-body := cfg.Section("COMMENTS").Body()
-
-/* --- start ---
-<1><L.Slide#2> This slide has the fuel listed in the wrong units <e.1>
-------  end  --- */
-```
-
-### Auto-increment Key Names
-
-If key name is `-` in data source, then it would be seen as special syntax for auto-increment key name start from 1, and every section is independent on counter.
-
-```ini
-[features]
--: Support read/write comments of keys and sections
--: Support auto-increment of key names
--: Support load multiple files to overwrite key values
-```
-
-```go
-cfg.Section("features").KeyStrings()	// []{"#1", "#2", "#3"}
-```
-
-### Map To Struct
-
-Want more objective way to play with INI? Cool.
-
-```ini
-Name = Unknwon
-age = 21
-Male = true
-Born = 1993-01-01T20:17:05Z
-
-[Note]
-Content = Hi is a good man!
-Cities = HangZhou, Boston
-```
-
-```go
-type Note struct {
-	Content string
-	Cities  []string
-}
-
-type Person struct {
-	Name string
-	Age  int `ini:"age"`
-	Male bool
-	Born time.Time
-	Note
-	Created time.Time `ini:"-"`
-}
-
-func main() {
-	cfg, err := ini.Load("path/to/ini")
-	// ...
-	p := new(Person)
-	err = cfg.MapTo(p)
-	// ...
-
-	// Things can be simpler.
-	err = ini.MapTo(p, "path/to/ini")
-	// ...
-
-	// Just map a section? Fine.
-	n := new(Note)
-	err = cfg.Section("Note").MapTo(n)
-	// ...
-}
-```
-
-Can I have default value for field? Absolutely.
-
-Assign it before you map to struct. It will keep the value as it is if the key is not presented or got wrong type.
-
-```go
-// ...
-p := &Person{
-	Name: "Joe",
-}
-// ...
-```
-
-It's really cool, but what's the point if you can't give me my file back from struct?
-
-### Reflect From Struct
-
-Why not?
-
-```go
-type Embeded struct {
-	Dates  []time.Time `delim:"|"`
-	Places []string    `ini:"places,omitempty"`
-	None   []int       `ini:",omitempty"`
-}
-
-type Author struct {
-	Name      string `ini:"NAME"`
-	Male      bool
-	Age       int
-	GPA       float64
-	NeverMind string `ini:"-"`
-	*Embeded
-}
-
-func main() {
-	a := &Author{"Unknwon", true, 21, 2.8, "",
-		&Embeded{
-			[]time.Time{time.Now(), time.Now()},
-			[]string{"HangZhou", "Boston"},
-			[]int{},
-		}}
-	cfg := ini.Empty()
-	err = ini.ReflectFrom(cfg, a)
-	// ...
-}
-```
-
-So, what do I get?
-
-```ini
-NAME = Unknwon
-Male = true
-Age = 21
-GPA = 2.8
-
-[Embeded]
-Dates = 2015-08-07T22:14:22+08:00|2015-08-07T22:14:22+08:00
-places = HangZhou,Boston
-```
-
-#### Name Mapper
-
-To save your time and make your code cleaner, this library supports [`NameMapper`](https://gowalker.org/gopkg.in/ini.v1#NameMapper) between struct field and actual section and key name.
-
-There are 2 built-in name mappers:
-
-- `AllCapsUnderscore`: it converts to format `ALL_CAPS_UNDERSCORE` then match section or key.
-- `TitleUnderscore`: it converts to format `title_underscore` then match section or key.
-
-To use them:
-
-```go
-type Info struct {
-	PackageName string
-}
-
-func main() {
-	err = ini.MapToWithMapper(&Info{}, ini.TitleUnderscore, []byte("package_name=ini"))
-	// ...
-
-	cfg, err := ini.Load([]byte("PACKAGE_NAME=ini"))
-	// ...
-	info := new(Info)
-	cfg.NameMapper = ini.AllCapsUnderscore
-	err = cfg.MapTo(info)
-	// ...
-}
-```
-
-Same rules of name mapper apply to `ini.ReflectFromWithMapper` function.
-
-#### Value Mapper
-
-To expand values (e.g. from environment variables), you can use the `ValueMapper` to transform values:
-
-```go
-type Env struct {
-	Foo string `ini:"foo"`
-}
-
-func main() {
-	cfg, err := ini.Load([]byte("[env]\nfoo = ${MY_VAR}\n")
-	cfg.ValueMapper = os.ExpandEnv
-	// ...
-	env := &Env{}
-	err = cfg.Section("env").MapTo(env)
-}
-```
-
-This would set the value of `env.Foo` to the value of the environment variable `MY_VAR`.
-
-#### Other Notes On Map/Reflect
-
-Any embedded struct is treated as a section by default, and there is no automatic parent-child relations in map/reflect feature:
-
-```go
-type Child struct {
-	Age string
-}
-
-type Parent struct {
-	Name string
-	Child
-}
-
-type Config struct {
-	City string
-	Parent
-}
-```
-
-Example configuration:
-
-```ini
-City = Boston
-
-[Parent]
-Name = Unknwon
-
-[Child]
-Age = 21
-```
-
-What if, yes, I'm paranoid, I want embedded struct to be in the same section. Well, all roads lead to Rome.
-
-```go
-type Child struct {
-	Age string
-}
-
-type Parent struct {
-	Name string
-	Child `ini:"Parent"`
-}
-
-type Config struct {
-	City string
-	Parent
-}
-```
-
-Example configuration:
-
-```ini
-City = Boston
-
-[Parent]
-Name = Unknwon
-Age = 21
-```
-
-## Getting Help
-
-- [API Documentation](https://gowalker.org/gopkg.in/ini.v1)
-- [File An Issue](https://github.com/go-ini/ini/issues/new)
-
-## FAQs
-
-### What does `BlockMode` field do?
-
-By default, library lets you read and write values so we need a locker to make sure your data is safe. But in cases that you are very sure about only reading data through the library, you can set `cfg.BlockMode = false` to speed up read operations about **50-70%** faster.
-
-### Why another INI library?
-
-Many people are using my another INI library [goconfig](https://github.com/Unknwon/goconfig), so the reason for this one is I would like to make more Go style code. Also when you set `cfg.BlockMode = false`, this one is about **10-30%** faster.
-
-To make those changes I have to confirm API broken, so it's safer to keep it in another place and start using `gopkg.in` to version my package at this time.(PS: shorter import path)
-
-## License
-
-This project is under Apache v2 License. See the [LICENSE](LICENSE) file for the full license text.
diff --git a/vendor/github.com/go-ini/ini/README_ZH.md b/vendor/github.com/go-ini/ini/README_ZH.md
deleted file mode 100644
index 0cf4194492..0000000000
--- a/vendor/github.com/go-ini/ini/README_ZH.md
+++ /dev/null
@@ -1,733 +0,0 @@
-本包提供了 Go 语言中读写 INI 文件的功能。
-
-## 功能特性
-
-- 支持覆盖加载多个数据源（`[]byte`、文件和 `io.ReadCloser`）
-- 支持递归读取键值
-- 支持读取父子分区
-- 支持读取自增键名
-- 支持读取多行的键值
-- 支持大量辅助方法
-- 支持在读取时直接转换为 Go 语言类型
-- 支持读取和 **写入** 分区和键的注释
-- 轻松操作分区、键值和注释
-- 在保存文件时分区和键值会保持原有的顺序
-
-## 下载安装
-
-使用一个特定版本：
-
-    go get gopkg.in/ini.v1
-
-使用最新版：
-
-	go get github.com/go-ini/ini
-
-如需更新请添加 `-u` 选项。
-
-### 测试安装
-
-如果您想要在自己的机器上运行测试，请使用 `-t` 标记：
-
-	go get -t gopkg.in/ini.v1
-
-如需更新请添加 `-u` 选项。
-
-## 开始使用
-
-### 从数据源加载
-
-一个 **数据源** 可以是 `[]byte` 类型的原始数据，`string` 类型的文件路径或 `io.ReadCloser`。您可以加载 **任意多个** 数据源。如果您传递其它类型的数据源，则会直接返回错误。
-
-```go
-cfg, err := ini.Load([]byte("raw data"), "filename", ioutil.NopCloser(bytes.NewReader([]byte("some other data"))))
-```
-
-或者从一个空白的文件开始：
-
-```go
-cfg := ini.Empty()
-```
-
-当您在一开始无法决定需要加载哪些数据源时，仍可以使用 **Append()** 在需要的时候加载它们。
-
-```go
-err := cfg.Append("other file", []byte("other raw data"))
-```
-
-当您想要加载一系列文件，但是不能够确定其中哪些文件是不存在的，可以通过调用函数 `LooseLoad` 来忽略它们（`Load` 会因为文件不存在而返回错误）：
-
-```go
-cfg, err := ini.LooseLoad("filename", "filename_404")
-```
-
-更牛逼的是，当那些之前不存在的文件在重新调用 `Reload` 方法的时候突然出现了，那么它们会被正常加载。
-
-#### 忽略键名的大小写
-
-有时候分区和键的名称大小写混合非常烦人，这个时候就可以通过 `InsensitiveLoad` 将所有分区和键名在读取里强制转换为小写：
-
-```go
-cfg, err := ini.InsensitiveLoad("filename")
-//...
-
-// sec1 和 sec2 指向同一个分区对象
-sec1, err := cfg.GetSection("Section")
-sec2, err := cfg.GetSection("SecTIOn")
-
-// key1 和 key2 指向同一个键对象
-key1, err := sec1.GetKey("Key")
-key2, err := sec2.GetKey("KeY")
-```
-
-#### 类似 MySQL 配置中的布尔值键
-
-MySQL 的配置文件中会出现没有具体值的布尔类型的键：
-
-```ini
-[mysqld]
-...
-skip-host-cache
-skip-name-resolve
-```
-
-默认情况下这被认为是缺失值而无法完成解析，但可以通过高级的加载选项对它们进行处理：
-
-```go
-cfg, err := LoadSources(LoadOptions{AllowBooleanKeys: true}, "my.cnf"))
-```
-
-这些键的值永远为 `true`，且在保存到文件时也只会输出键名。
-
-如果您想要通过程序来生成此类键，则可以使用 `NewBooleanKey`：
-
-```go
-key, err := sec.NewBooleanKey("skip-host-cache")
-```
-
-#### 关于注释
-
-下述几种情况的内容将被视为注释：
-
-1. 所有以 `#` 或 `;` 开头的行
-2. 所有在 `#` 或 `;` 之后的内容
-3. 分区标签后的文字 (即 `[分区名]` 之后的内容)
-
-如果你希望使用包含 `#` 或 `;` 的值，请使用 ``` ` ``` 或 ``` """ ``` 进行包覆。
-
-除此之外，您还可以通过 `LoadOptions` 完全忽略行内注释：
-
-```go
-cfg, err := LoadSources(LoadOptions{IgnoreInlineComment: true}, "app.ini"))
-```
-
-### 操作分区（Section）
-
-获取指定分区：
-
-```go
-section, err := cfg.GetSection("section name")
-```
-
-如果您想要获取默认分区，则可以用空字符串代替分区名：
-
-```go
-section, err := cfg.GetSection("")
-```
-
-当您非常确定某个分区是存在的，可以使用以下简便方法：
-
-```go
-section := cfg.Section("section name")
-```
-
-如果不小心判断错了，要获取的分区其实是不存在的，那会发生什么呢？没事的，它会自动创建并返回一个对应的分区对象给您。
-
-创建一个分区：
-
-```go
-err := cfg.NewSection("new section")
-```
-
-获取所有分区对象或名称：
-
-```go
-sections := cfg.Sections()
-names := cfg.SectionStrings()
-```
-
-### 操作键（Key）
-
-获取某个分区下的键：
-
-```go
-key, err := cfg.Section("").GetKey("key name")
-```
-
-和分区一样，您也可以直接获取键而忽略错误处理：
-
-```go
-key := cfg.Section("").Key("key name")
-```
-
-判断某个键是否存在：
-
-```go
-yes := cfg.Section("").HasKey("key name")
-```
-
-创建一个新的键：
-
-```go
-err := cfg.Section("").NewKey("name", "value")
-```
-
-获取分区下的所有键或键名：
-
-```go
-keys := cfg.Section("").Keys()
-names := cfg.Section("").KeyStrings()
-```
-
-获取分区下的所有键值对的克隆：
-
-```go
-hash := cfg.Section("").KeysHash()
-```
-
-### 操作键值（Value）
-
-获取一个类型为字符串（string）的值：
-
-```go
-val := cfg.Section("").Key("key name").String()
-```
-
-获取值的同时通过自定义函数进行处理验证：
-
-```go
-val := cfg.Section("").Key("key name").Validate(func(in string) string {
-	if len(in) == 0 {
-		return "default"
-	}
-	return in
-})
-```
-
-如果您不需要任何对值的自动转变功能（例如递归读取），可以直接获取原值（这种方式性能最佳）：
-
-```go
-val := cfg.Section("").Key("key name").Value()
-```
-
-判断某个原值是否存在：
-
-```go
-yes := cfg.Section("").HasValue("test value")
-```
-
-获取其它类型的值：
-
-```go
-// 布尔值的规则：
-// true 当值为：1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On
-// false 当值为：0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off
-v, err = cfg.Section("").Key("BOOL").Bool()
-v, err = cfg.Section("").Key("FLOAT64").Float64()
-v, err = cfg.Section("").Key("INT").Int()
-v, err = cfg.Section("").Key("INT64").Int64()
-v, err = cfg.Section("").Key("UINT").Uint()
-v, err = cfg.Section("").Key("UINT64").Uint64()
-v, err = cfg.Section("").Key("TIME").TimeFormat(time.RFC3339)
-v, err = cfg.Section("").Key("TIME").Time() // RFC3339
-
-v = cfg.Section("").Key("BOOL").MustBool()
-v = cfg.Section("").Key("FLOAT64").MustFloat64()
-v = cfg.Section("").Key("INT").MustInt()
-v = cfg.Section("").Key("INT64").MustInt64()
-v = cfg.Section("").Key("UINT").MustUint()
-v = cfg.Section("").Key("UINT64").MustUint64()
-v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339)
-v = cfg.Section("").Key("TIME").MustTime() // RFC3339
-
-// 由 Must 开头的方法名允许接收一个相同类型的参数来作为默认值，
-// 当键不存在或者转换失败时，则会直接返回该默认值。
-// 但是，MustString 方法必须传递一个默认值。
-
-v = cfg.Seciont("").Key("String").MustString("default")
-v = cfg.Section("").Key("BOOL").MustBool(true)
-v = cfg.Section("").Key("FLOAT64").MustFloat64(1.25)
-v = cfg.Section("").Key("INT").MustInt(10)
-v = cfg.Section("").Key("INT64").MustInt64(99)
-v = cfg.Section("").Key("UINT").MustUint(3)
-v = cfg.Section("").Key("UINT64").MustUint64(6)
-v = cfg.Section("").Key("TIME").MustTimeFormat(time.RFC3339, time.Now())
-v = cfg.Section("").Key("TIME").MustTime(time.Now()) // RFC3339
-```
-
-如果我的值有好多行怎么办？
-
-```ini
-[advance]
-ADDRESS = """404 road,
-NotFound, State, 5000
-Earth"""
-```
-
-嗯哼？小 case！
-
-```go
-cfg.Section("advance").Key("ADDRESS").String()
-
-/* --- start ---
-404 road,
-NotFound, State, 5000
-Earth
-------  end  --- */
-```
-
-赞爆了！那要是我属于一行的内容写不下想要写到第二行怎么办？
-
-```ini
-[advance]
-two_lines = how about \
-	continuation lines?
-lots_of_lines = 1 \
-	2 \
-	3 \
-	4
-```
-
-简直是小菜一碟！
-
-```go
-cfg.Section("advance").Key("two_lines").String() // how about continuation lines?
-cfg.Section("advance").Key("lots_of_lines").String() // 1 2 3 4
-```
-
-可是我有时候觉得两行连在一起特别没劲，怎么才能不自动连接两行呢？
-
-```go
-cfg, err := ini.LoadSources(ini.LoadOptions{
-	IgnoreContinuation: true,
-}, "filename")
-```
-
-哇靠给力啊！
-
-需要注意的是，值两侧的单引号会被自动剔除：
-
-```ini
-foo = "some value" // foo: some value
-bar = 'some value' // bar: some value
-```
-
-这就是全部了？哈哈，当然不是。
-
-#### 操作键值的辅助方法
-
-获取键值时设定候选值：
-
-```go
-v = cfg.Section("").Key("STRING").In("default", []string{"str", "arr", "types"})
-v = cfg.Section("").Key("FLOAT64").InFloat64(1.1, []float64{1.25, 2.5, 3.75})
-v = cfg.Section("").Key("INT").InInt(5, []int{10, 20, 30})
-v = cfg.Section("").Key("INT64").InInt64(10, []int64{10, 20, 30})
-v = cfg.Section("").Key("UINT").InUint(4, []int{3, 6, 9})
-v = cfg.Section("").Key("UINT64").InUint64(8, []int64{3, 6, 9})
-v = cfg.Section("").Key("TIME").InTimeFormat(time.RFC3339, time.Now(), []time.Time{time1, time2, time3})
-v = cfg.Section("").Key("TIME").InTime(time.Now(), []time.Time{time1, time2, time3}) // RFC3339
-```
-
-如果获取到的值不是候选值的任意一个，则会返回默认值，而默认值不需要是候选值中的一员。
-
-验证获取的值是否在指定范围内：
-
-```go
-vals = cfg.Section("").Key("FLOAT64").RangeFloat64(0.0, 1.1, 2.2)
-vals = cfg.Section("").Key("INT").RangeInt(0, 10, 20)
-vals = cfg.Section("").Key("INT64").RangeInt64(0, 10, 20)
-vals = cfg.Section("").Key("UINT").RangeUint(0, 3, 9)
-vals = cfg.Section("").Key("UINT64").RangeUint64(0, 3, 9)
-vals = cfg.Section("").Key("TIME").RangeTimeFormat(time.RFC3339, time.Now(), minTime, maxTime)
-vals = cfg.Section("").Key("TIME").RangeTime(time.Now(), minTime, maxTime) // RFC3339
-```
-
-##### 自动分割键值到切片（slice）
-
-当存在无效输入时，使用零值代替：
-
-```go
-// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
-// Input: how, 2.2, are, you -> [0.0 2.2 0.0 0.0]
-vals = cfg.Section("").Key("STRINGS").Strings(",")
-vals = cfg.Section("").Key("FLOAT64S").Float64s(",")
-vals = cfg.Section("").Key("INTS").Ints(",")
-vals = cfg.Section("").Key("INT64S").Int64s(",")
-vals = cfg.Section("").Key("UINTS").Uints(",")
-vals = cfg.Section("").Key("UINT64S").Uint64s(",")
-vals = cfg.Section("").Key("TIMES").Times(",")
-```
-
-从结果切片中剔除无效输入：
-
-```go
-// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
-// Input: how, 2.2, are, you -> [2.2]
-vals = cfg.Section("").Key("FLOAT64S").ValidFloat64s(",")
-vals = cfg.Section("").Key("INTS").ValidInts(",")
-vals = cfg.Section("").Key("INT64S").ValidInt64s(",")
-vals = cfg.Section("").Key("UINTS").ValidUints(",")
-vals = cfg.Section("").Key("UINT64S").ValidUint64s(",")
-vals = cfg.Section("").Key("TIMES").ValidTimes(",")
-```
-
-当存在无效输入时，直接返回错误：
-
-```go
-// Input: 1.1, 2.2, 3.3, 4.4 -> [1.1 2.2 3.3 4.4]
-// Input: how, 2.2, are, you -> error
-vals = cfg.Section("").Key("FLOAT64S").StrictFloat64s(",")
-vals = cfg.Section("").Key("INTS").StrictInts(",")
-vals = cfg.Section("").Key("INT64S").StrictInt64s(",")
-vals = cfg.Section("").Key("UINTS").StrictUints(",")
-vals = cfg.Section("").Key("UINT64S").StrictUint64s(",")
-vals = cfg.Section("").Key("TIMES").StrictTimes(",")
-```
-
-### 保存配置
-
-终于到了这个时刻，是时候保存一下配置了。
-
-比较原始的做法是输出配置到某个文件：
-
-```go
-// ...
-err = cfg.SaveTo("my.ini")
-err = cfg.SaveToIndent("my.ini", "\t")
-```
-
-另一个比较高级的做法是写入到任何实现 `io.Writer` 接口的对象中：
-
-```go
-// ...
-cfg.WriteTo(writer)
-cfg.WriteToIndent(writer, "\t")
-```
-
-默认情况下，空格将被用于对齐键值之间的等号以美化输出结果，以下代码可以禁用该功能：
-
-```go
-ini.PrettyFormat = false
-``` 
-
-## 高级用法
-
-### 递归读取键值
-
-在获取所有键值的过程中，特殊语法 `%(<name>)s` 会被应用，其中 `<name>` 可以是相同分区或者默认分区下的键名。字符串 `%(<name>)s` 会被相应的键值所替代，如果指定的键不存在，则会用空字符串替代。您可以最多使用 99 层的递归嵌套。
-
-```ini
-NAME = ini
-
-[author]
-NAME = Unknwon
-GITHUB = https://github.com/%(NAME)s
-
-[package]
-FULL_NAME = github.com/go-ini/%(NAME)s
-```
-
-```go
-cfg.Section("author").Key("GITHUB").String()		// https://github.com/Unknwon
-cfg.Section("package").Key("FULL_NAME").String()	// github.com/go-ini/ini
-```
-
-### 读取父子分区
-
-您可以在分区名称中使用 `.` 来表示两个或多个分区之间的父子关系。如果某个键在子分区中不存在，则会去它的父分区中再次寻找，直到没有父分区为止。
-
-```ini
-NAME = ini
-VERSION = v1
-IMPORT_PATH = gopkg.in/%(NAME)s.%(VERSION)s
-
-[package]
-CLONE_URL = https://%(IMPORT_PATH)s
-
-[package.sub]
-```
-
-```go
-cfg.Section("package.sub").Key("CLONE_URL").String()	// https://gopkg.in/ini.v1
-```
-
-#### 获取上级父分区下的所有键名
-
-```go
-cfg.Section("package.sub").ParentKeys() // ["CLONE_URL"]
-```
-
-### 无法解析的分区
-
-如果遇到一些比较特殊的分区，它们不包含常见的键值对，而是没有固定格式的纯文本，则可以使用 `LoadOptions.UnparsableSections` 进行处理：
-
-```go
-cfg, err := LoadSources(LoadOptions{UnparseableSections: []string{"COMMENTS"}}, `[COMMENTS]
-<1><L.Slide#2> This slide has the fuel listed in the wrong units <e.1>`))
-
-body := cfg.Section("COMMENTS").Body()
-
-/* --- start ---
-<1><L.Slide#2> This slide has the fuel listed in the wrong units <e.1>
-------  end  --- */
-```
-
-### 读取自增键名
-
-如果数据源中的键名为 `-`，则认为该键使用了自增键名的特殊语法。计数器从 1 开始，并且分区之间是相互独立的。
-
-```ini
-[features]
--: Support read/write comments of keys and sections
--: Support auto-increment of key names
--: Support load multiple files to overwrite key values
-```
-
-```go
-cfg.Section("features").KeyStrings()	// []{"#1", "#2", "#3"}
-```
-
-### 映射到结构
-
-想要使用更加面向对象的方式玩转 INI 吗？好主意。
-
-```ini
-Name = Unknwon
-age = 21
-Male = true
-Born = 1993-01-01T20:17:05Z
-
-[Note]
-Content = Hi is a good man!
-Cities = HangZhou, Boston
-```
-
-```go
-type Note struct {
-	Content string
-	Cities  []string
-}
-
-type Person struct {
-	Name string
-	Age  int `ini:"age"`
-	Male bool
-	Born time.Time
-	Note
-	Created time.Time `ini:"-"`
-}
-
-func main() {
-	cfg, err := ini.Load("path/to/ini")
-	// ...
-	p := new(Person)
-	err = cfg.MapTo(p)
-	// ...
-
-	// 一切竟可以如此的简单。
-	err = ini.MapTo(p, "path/to/ini")
-	// ...
-
-	// 嗯哼？只需要映射一个分区吗？
-	n := new(Note)
-	err = cfg.Section("Note").MapTo(n)
-	// ...
-}
-```
-
-结构的字段怎么设置默认值呢？很简单，只要在映射之前对指定字段进行赋值就可以了。如果键未找到或者类型错误，该值不会发生改变。
-
-```go
-// ...
-p := &Person{
-	Name: "Joe",
-}
-// ...
-```
-
-这样玩 INI 真的好酷啊！然而，如果不能还给我原来的配置文件，有什么卵用？
-
-### 从结构反射
-
-可是，我有说不能吗？
-
-```go
-type Embeded struct {
-	Dates  []time.Time `delim:"|"`
-	Places []string    `ini:"places,omitempty"`
-	None   []int       `ini:",omitempty"`
-}
-
-type Author struct {
-	Name      string `ini:"NAME"`
-	Male      bool
-	Age       int
-	GPA       float64
-	NeverMind string `ini:"-"`
-	*Embeded
-}
-
-func main() {
-	a := &Author{"Unknwon", true, 21, 2.8, "",
-		&Embeded{
-			[]time.Time{time.Now(), time.Now()},
-			[]string{"HangZhou", "Boston"},
-			[]int{},
-		}}
-	cfg := ini.Empty()
-	err = ini.ReflectFrom(cfg, a)
-	// ...
-}
-```
-
-瞧瞧，奇迹发生了。
-
-```ini
-NAME = Unknwon
-Male = true
-Age = 21
-GPA = 2.8
-
-[Embeded]
-Dates = 2015-08-07T22:14:22+08:00|2015-08-07T22:14:22+08:00
-places = HangZhou,Boston
-```
-
-#### 名称映射器（Name Mapper）
-
-为了节省您的时间并简化代码，本库支持类型为 [`NameMapper`](https://gowalker.org/gopkg.in/ini.v1#NameMapper) 的名称映射器，该映射器负责结构字段名与分区名和键名之间的映射。
-
-目前有 2 款内置的映射器：
-
-- `AllCapsUnderscore`：该映射器将字段名转换至格式 `ALL_CAPS_UNDERSCORE` 后再去匹配分区名和键名。
-- `TitleUnderscore`：该映射器将字段名转换至格式 `title_underscore` 后再去匹配分区名和键名。
-
-使用方法：
-
-```go
-type Info struct{
-	PackageName string
-}
-
-func main() {
-	err = ini.MapToWithMapper(&Info{}, ini.TitleUnderscore, []byte("package_name=ini"))
-	// ...
-
-	cfg, err := ini.Load([]byte("PACKAGE_NAME=ini"))
-	// ...
-	info := new(Info)
-	cfg.NameMapper = ini.AllCapsUnderscore
-	err = cfg.MapTo(info)
-	// ...
-}
-```
-
-使用函数 `ini.ReflectFromWithMapper` 时也可应用相同的规则。
-
-#### 值映射器（Value Mapper）
-
-值映射器允许使用一个自定义函数自动展开值的具体内容，例如：运行时获取环境变量：
-
-```go
-type Env struct {
-	Foo string `ini:"foo"`
-}
-
-func main() {
-	cfg, err := ini.Load([]byte("[env]\nfoo = ${MY_VAR}\n")
-	cfg.ValueMapper = os.ExpandEnv
-	// ...
-	env := &Env{}
-	err = cfg.Section("env").MapTo(env)
-}
-```
-
-本例中，`env.Foo` 将会是运行时所获取到环境变量 `MY_VAR` 的值。
-
-#### 映射/反射的其它说明
-
-任何嵌入的结构都会被默认认作一个不同的分区，并且不会自动产生所谓的父子分区关联：
-
-```go
-type Child struct {
-	Age string
-}
-
-type Parent struct {
-	Name string
-	Child
-}
-
-type Config struct {
-	City string
-	Parent
-}
-```
-
-示例配置文件：
-
-```ini
-City = Boston
-
-[Parent]
-Name = Unknwon
-
-[Child]
-Age = 21
-```
-
-很好，但是，我就是要嵌入结构也在同一个分区。好吧，你爹是李刚！
-
-```go
-type Child struct {
-	Age string
-}
-
-type Parent struct {
-	Name string
-	Child `ini:"Parent"`
-}
-
-type Config struct {
-	City string
-	Parent
-}
-```
-
-示例配置文件：
-
-```ini
-City = Boston
-
-[Parent]
-Name = Unknwon
-Age = 21
-```
-
-## 获取帮助
-
-- [API 文档](https://gowalker.org/gopkg.in/ini.v1)
-- [创建工单](https://github.com/go-ini/ini/issues/new)
-
-## 常见问题
-
-### 字段 `BlockMode` 是什么？
-
-默认情况下，本库会在您进行读写操作时采用锁机制来确保数据时间。但在某些情况下，您非常确定只进行读操作。此时，您可以通过设置 `cfg.BlockMode = false` 来将读操作提升大约 **50-70%** 的性能。
-
-### 为什么要写另一个 INI 解析库？
-
-许多人都在使用我的 [goconfig](https://github.com/Unknwon/goconfig) 来完成对 INI 文件的操作，但我希望使用更加 Go 风格的代码。并且当您设置 `cfg.BlockMode = false` 时，会有大约 **10-30%** 的性能提升。
-
-为了做出这些改变，我必须对 API 进行破坏，所以新开一个仓库是最安全的做法。除此之外，本库直接使用 `gopkg.in` 来进行版本化发布。（其实真相是导入路径更短了）
diff --git a/vendor/github.com/go-ini/ini/error.go b/vendor/github.com/go-ini/ini/error.go
deleted file mode 100644
index 80afe74315..0000000000
--- a/vendor/github.com/go-ini/ini/error.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016 Unknwon
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-package ini
-
-import (
-	"fmt"
-)
-
-type ErrDelimiterNotFound struct {
-	Line string
-}
-
-func IsErrDelimiterNotFound(err error) bool {
-	_, ok := err.(ErrDelimiterNotFound)
-	return ok
-}
-
-func (err ErrDelimiterNotFound) Error() string {
-	return fmt.Sprintf("key-value delimiter not found: %s", err.Line)
-}
diff --git a/vendor/github.com/go-ini/ini/ini.go b/vendor/github.com/go-ini/ini/ini.go
deleted file mode 100644
index f8827ddd2b..0000000000
--- a/vendor/github.com/go-ini/ini/ini.go
+++ /dev/null
@@ -1,561 +0,0 @@
-// Copyright 2014 Unknwon
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-// Package ini provides INI file read and write functionality in Go.
-package ini
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"regexp"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-)
-
-const (
-	// Name for default section. You can use this constant or the string literal.
-	// In most of cases, an empty string is all you need to access the section.
-	DEFAULT_SECTION = "DEFAULT"
-
-	// Maximum allowed depth when recursively substituing variable names.
-	_DEPTH_VALUES = 99
-	_VERSION      = "1.28.1"
-)
-
-// Version returns current package version literal.
-func Version() string {
-	return _VERSION
-}
-
-var (
-	// Delimiter to determine or compose a new line.
-	// This variable will be changed to "\r\n" automatically on Windows
-	// at package init time.
-	LineBreak = "\n"
-
-	// Variable regexp pattern: %(variable)s
-	varPattern = regexp.MustCompile(`%\(([^\)]+)\)s`)
-
-	// Indicate whether to align "=" sign with spaces to produce pretty output
-	// or reduce all possible spaces for compact format.
-	PrettyFormat = true
-
-	// Explicitly write DEFAULT section header
-	DefaultHeader = false
-
-	// Indicate whether to put a line between sections
-	PrettySection = true
-)
-
-func init() {
-	if runtime.GOOS == "windows" {
-		LineBreak = "\r\n"
-	}
-}
-
-func inSlice(str string, s []string) bool {
-	for _, v := range s {
-		if str == v {
-			return true
-		}
-	}
-	return false
-}
-
-// dataSource is an interface that returns object which can be read and closed.
-type dataSource interface {
-	ReadCloser() (io.ReadCloser, error)
-}
-
-// sourceFile represents an object that contains content on the local file system.
-type sourceFile struct {
-	name string
-}
-
-func (s sourceFile) ReadCloser() (_ io.ReadCloser, err error) {
-	return os.Open(s.name)
-}
-
-type bytesReadCloser struct {
-	reader io.Reader
-}
-
-func (rc *bytesReadCloser) Read(p []byte) (n int, err error) {
-	return rc.reader.Read(p)
-}
-
-func (rc *bytesReadCloser) Close() error {
-	return nil
-}
-
-// sourceData represents an object that contains content in memory.
-type sourceData struct {
-	data []byte
-}
-
-func (s *sourceData) ReadCloser() (io.ReadCloser, error) {
-	return ioutil.NopCloser(bytes.NewReader(s.data)), nil
-}
-
-// sourceReadCloser represents an input stream with Close method.
-type sourceReadCloser struct {
-	reader io.ReadCloser
-}
-
-func (s *sourceReadCloser) ReadCloser() (io.ReadCloser, error) {
-	return s.reader, nil
-}
-
-// File represents a combination of a or more INI file(s) in memory.
-type File struct {
-	// Should make things safe, but sometimes doesn't matter.
-	BlockMode bool
-	// Make sure data is safe in multiple goroutines.
-	lock sync.RWMutex
-
-	// Allow combination of multiple data sources.
-	dataSources []dataSource
-	// Actual data is stored here.
-	sections map[string]*Section
-
-	// To keep data in order.
-	sectionList []string
-
-	options LoadOptions
-
-	NameMapper
-	ValueMapper
-}
-
-// newFile initializes File object with given data sources.
-func newFile(dataSources []dataSource, opts LoadOptions) *File {
-	return &File{
-		BlockMode:   true,
-		dataSources: dataSources,
-		sections:    make(map[string]*Section),
-		sectionList: make([]string, 0, 10),
-		options:     opts,
-	}
-}
-
-func parseDataSource(source interface{}) (dataSource, error) {
-	switch s := source.(type) {
-	case string:
-		return sourceFile{s}, nil
-	case []byte:
-		return &sourceData{s}, nil
-	case io.ReadCloser:
-		return &sourceReadCloser{s}, nil
-	default:
-		return nil, fmt.Errorf("error parsing data source: unknown type '%s'", s)
-	}
-}
-
-type LoadOptions struct {
-	// Loose indicates whether the parser should ignore nonexistent files or return error.
-	Loose bool
-	// Insensitive indicates whether the parser forces all section and key names to lowercase.
-	Insensitive bool
-	// IgnoreContinuation indicates whether to ignore continuation lines while parsing.
-	IgnoreContinuation bool
-	// IgnoreInlineComment indicates whether to ignore comments at the end of value and treat it as part of value.
-	IgnoreInlineComment bool
-	// AllowBooleanKeys indicates whether to allow boolean type keys or treat as value is missing.
-	// This type of keys are mostly used in my.cnf.
-	AllowBooleanKeys bool
-	// AllowShadows indicates whether to keep track of keys with same name under same section.
-	AllowShadows bool
-	// Some INI formats allow group blocks that store a block of raw content that doesn't otherwise
-	// conform to key/value pairs. Specify the names of those blocks here.
-	UnparseableSections []string
-}
-
-func LoadSources(opts LoadOptions, source interface{}, others ...interface{}) (_ *File, err error) {
-	sources := make([]dataSource, len(others)+1)
-	sources[0], err = parseDataSource(source)
-	if err != nil {
-		return nil, err
-	}
-	for i := range others {
-		sources[i+1], err = parseDataSource(others[i])
-		if err != nil {
-			return nil, err
-		}
-	}
-	f := newFile(sources, opts)
-	if err = f.Reload(); err != nil {
-		return nil, err
-	}
-	return f, nil
-}
-
-// Load loads and parses from INI data sources.
-// Arguments can be mixed of file name with string type, or raw data in []byte.
-// It will return error if list contains nonexistent files.
-func Load(source interface{}, others ...interface{}) (*File, error) {
-	return LoadSources(LoadOptions{}, source, others...)
-}
-
-// LooseLoad has exactly same functionality as Load function
-// except it ignores nonexistent files instead of returning error.
-func LooseLoad(source interface{}, others ...interface{}) (*File, error) {
-	return LoadSources(LoadOptions{Loose: true}, source, others...)
-}
-
-// InsensitiveLoad has exactly same functionality as Load function
-// except it forces all section and key names to be lowercased.
-func InsensitiveLoad(source interface{}, others ...interface{}) (*File, error) {
-	return LoadSources(LoadOptions{Insensitive: true}, source, others...)
-}
-
-// InsensitiveLoad has exactly same functionality as Load function
-// except it allows have shadow keys.
-func ShadowLoad(source interface{}, others ...interface{}) (*File, error) {
-	return LoadSources(LoadOptions{AllowShadows: true}, source, others...)
-}
-
-// Empty returns an empty file object.
-func Empty() *File {
-	// Ignore error here, we sure our data is good.
-	f, _ := Load([]byte(""))
-	return f
-}
-
-// NewSection creates a new section.
-func (f *File) NewSection(name string) (*Section, error) {
-	if len(name) == 0 {
-		return nil, errors.New("error creating new section: empty section name")
-	} else if f.options.Insensitive && name != DEFAULT_SECTION {
-		name = strings.ToLower(name)
-	}
-
-	if f.BlockMode {
-		f.lock.Lock()
-		defer f.lock.Unlock()
-	}
-
-	if inSlice(name, f.sectionList) {
-		return f.sections[name], nil
-	}
-
-	f.sectionList = append(f.sectionList, name)
-	f.sections[name] = newSection(f, name)
-	return f.sections[name], nil
-}
-
-// NewRawSection creates a new section with an unparseable body.
-func (f *File) NewRawSection(name, body string) (*Section, error) {
-	section, err := f.NewSection(name)
-	if err != nil {
-		return nil, err
-	}
-
-	section.isRawSection = true
-	section.rawBody = body
-	return section, nil
-}
-
-// NewSections creates a list of sections.
-func (f *File) NewSections(names ...string) (err error) {
-	for _, name := range names {
-		if _, err = f.NewSection(name); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// GetSection returns section by given name.
-func (f *File) GetSection(name string) (*Section, error) {
-	if len(name) == 0 {
-		name = DEFAULT_SECTION
-	} else if f.options.Insensitive {
-		name = strings.ToLower(name)
-	}
-
-	if f.BlockMode {
-		f.lock.RLock()
-		defer f.lock.RUnlock()
-	}
-
-	sec := f.sections[name]
-	if sec == nil {
-		return nil, fmt.Errorf("section '%s' does not exist", name)
-	}
-	return sec, nil
-}
-
-// Section assumes named section exists and returns a zero-value when not.
-func (f *File) Section(name string) *Section {
-	sec, err := f.GetSection(name)
-	if err != nil {
-		// Note: It's OK here because the only possible error is empty section name,
-		// but if it's empty, this piece of code won't be executed.
-		sec, _ = f.NewSection(name)
-		return sec
-	}
-	return sec
-}
-
-// Section returns list of Section.
-func (f *File) Sections() []*Section {
-	sections := make([]*Section, len(f.sectionList))
-	for i := range f.sectionList {
-		sections[i] = f.Section(f.sectionList[i])
-	}
-	return sections
-}
-
-// ChildSections returns a list of child sections of given section name.
-func (f *File) ChildSections(name string) []*Section {
-	return f.Section(name).ChildSections()
-}
-
-// SectionStrings returns list of section names.
-func (f *File) SectionStrings() []string {
-	list := make([]string, len(f.sectionList))
-	copy(list, f.sectionList)
-	return list
-}
-
-// DeleteSection deletes a section.
-func (f *File) DeleteSection(name string) {
-	if f.BlockMode {
-		f.lock.Lock()
-		defer f.lock.Unlock()
-	}
-
-	if len(name) == 0 {
-		name = DEFAULT_SECTION
-	}
-
-	for i, s := range f.sectionList {
-		if s == name {
-			f.sectionList = append(f.sectionList[:i], f.sectionList[i+1:]...)
-			delete(f.sections, name)
-			return
-		}
-	}
-}
-
-func (f *File) reload(s dataSource) error {
-	r, err := s.ReadCloser()
-	if err != nil {
-		return err
-	}
-	defer r.Close()
-
-	return f.parse(r)
-}
-
-// Reload reloads and parses all data sources.
-func (f *File) Reload() (err error) {
-	for _, s := range f.dataSources {
-		if err = f.reload(s); err != nil {
-			// In loose mode, we create an empty default section for nonexistent files.
-			if os.IsNotExist(err) && f.options.Loose {
-				f.parse(bytes.NewBuffer(nil))
-				continue
-			}
-			return err
-		}
-	}
-	return nil
-}
-
-// Append appends one or more data sources and reloads automatically.
-func (f *File) Append(source interface{}, others ...interface{}) error {
-	ds, err := parseDataSource(source)
-	if err != nil {
-		return err
-	}
-	f.dataSources = append(f.dataSources, ds)
-	for _, s := range others {
-		ds, err = parseDataSource(s)
-		if err != nil {
-			return err
-		}
-		f.dataSources = append(f.dataSources, ds)
-	}
-	return f.Reload()
-}
-
-// WriteToIndent writes content into io.Writer with given indention.
-// If PrettyFormat has been set to be true,
-// it will align "=" sign with spaces under each section.
-func (f *File) WriteToIndent(w io.Writer, indent string) (n int64, err error) {
-	equalSign := "="
-	if PrettyFormat {
-		equalSign = " = "
-	}
-
-	// Use buffer to make sure target is safe until finish encoding.
-	buf := bytes.NewBuffer(nil)
-	for i, sname := range f.sectionList {
-		sec := f.Section(sname)
-		if len(sec.Comment) > 0 {
-			if sec.Comment[0] != '#' && sec.Comment[0] != ';' {
-				sec.Comment = "; " + sec.Comment
-			}
-			if _, err = buf.WriteString(sec.Comment + LineBreak); err != nil {
-				return 0, err
-			}
-		}
-
-		if i > 0 || DefaultHeader {
-			if _, err = buf.WriteString("[" + sname + "]" + LineBreak); err != nil {
-				return 0, err
-			}
-		} else {
-			// Write nothing if default section is empty
-			if len(sec.keyList) == 0 {
-				continue
-			}
-		}
-
-		if sec.isRawSection {
-			if _, err = buf.WriteString(sec.rawBody); err != nil {
-				return 0, err
-			}
-			continue
-		}
-
-		// Count and generate alignment length and buffer spaces using the
-		// longest key. Keys may be modifed if they contain certain characters so
-		// we need to take that into account in our calculation.
-		alignLength := 0
-		if PrettyFormat {
-			for _, kname := range sec.keyList {
-				keyLength := len(kname)
-				// First case will surround key by ` and second by """
-				if strings.ContainsAny(kname, "\"=:") {
-					keyLength += 2
-				} else if strings.Contains(kname, "`") {
-					keyLength += 6
-				}
-
-				if keyLength > alignLength {
-					alignLength = keyLength
-				}
-			}
-		}
-		alignSpaces := bytes.Repeat([]byte(" "), alignLength)
-
-	KEY_LIST:
-		for _, kname := range sec.keyList {
-			key := sec.Key(kname)
-			if len(key.Comment) > 0 {
-				if len(indent) > 0 && sname != DEFAULT_SECTION {
-					buf.WriteString(indent)
-				}
-				if key.Comment[0] != '#' && key.Comment[0] != ';' {
-					key.Comment = "; " + key.Comment
-				}
-				if _, err = buf.WriteString(key.Comment + LineBreak); err != nil {
-					return 0, err
-				}
-			}
-
-			if len(indent) > 0 && sname != DEFAULT_SECTION {
-				buf.WriteString(indent)
-			}
-
-			switch {
-			case key.isAutoIncrement:
-				kname = "-"
-			case strings.ContainsAny(kname, "\"=:"):
-				kname = "`" + kname + "`"
-			case strings.Contains(kname, "`"):
-				kname = `"""` + kname + `"""`
-			}
-
-			for _, val := range key.ValueWithShadows() {
-				if _, err = buf.WriteString(kname); err != nil {
-					return 0, err
-				}
-
-				if key.isBooleanType {
-					if kname != sec.keyList[len(sec.keyList)-1] {
-						buf.WriteString(LineBreak)
-					}
-					continue KEY_LIST
-				}
-
-				// Write out alignment spaces before "=" sign
-				if PrettyFormat {
-					buf.Write(alignSpaces[:alignLength-len(kname)])
-				}
-
-				// In case key value contains "\n", "`", "\"", "#" or ";"
-				if strings.ContainsAny(val, "\n`") {
-					val = `"""` + val + `"""`
-				} else if !f.options.IgnoreInlineComment && strings.ContainsAny(val, "#;") {
-					val = "`" + val + "`"
-				}
-				if _, err = buf.WriteString(equalSign + val + LineBreak); err != nil {
-					return 0, err
-				}
-			}
-		}
-
-		if PrettySection {
-			// Put a line between sections
-			if _, err = buf.WriteString(LineBreak); err != nil {
-				return 0, err
-			}
-		}
-	}
-
-	return buf.WriteTo(w)
-}
-
-// WriteTo writes file content into io.Writer.
-func (f *File) WriteTo(w io.Writer) (int64, error) {
-	return f.WriteToIndent(w, "")
-}
-
-// SaveToIndent writes content to file system with given value indention.
-func (f *File) SaveToIndent(filename, indent string) error {
-	// Note: Because we are truncating with os.Create,
-	// 	so it's safer to save to a temporary file location and rename afte done.
-	tmpPath := filename + "." + strconv.Itoa(time.Now().Nanosecond()) + ".tmp"
-	defer os.Remove(tmpPath)
-
-	fw, err := os.Create(tmpPath)
-	if err != nil {
-		return err
-	}
-
-	if _, err = f.WriteToIndent(fw, indent); err != nil {
-		fw.Close()
-		return err
-	}
-	fw.Close()
-
-	// Remove old file and rename the new one.
-	os.Remove(filename)
-	return os.Rename(tmpPath, filename)
-}
-
-// SaveTo writes content to file system.
-func (f *File) SaveTo(filename string) error {
-	return f.SaveToIndent(filename, "")
-}
diff --git a/vendor/github.com/go-ini/ini/key.go b/vendor/github.com/go-ini/ini/key.go
deleted file mode 100644
index 838356af01..0000000000
--- a/vendor/github.com/go-ini/ini/key.go
+++ /dev/null
@@ -1,699 +0,0 @@
-// Copyright 2014 Unknwon
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-package ini
-
-import (
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// Key represents a key under a section.
-type Key struct {
-	s               *Section
-	name            string
-	value           string
-	isAutoIncrement bool
-	isBooleanType   bool
-
-	isShadow bool
-	shadows  []*Key
-
-	Comment string
-}
-
-// newKey simply return a key object with given values.
-func newKey(s *Section, name, val string) *Key {
-	return &Key{
-		s:     s,
-		name:  name,
-		value: val,
-	}
-}
-
-func (k *Key) addShadow(val string) error {
-	if k.isShadow {
-		return errors.New("cannot add shadow to another shadow key")
-	} else if k.isAutoIncrement || k.isBooleanType {
-		return errors.New("cannot add shadow to auto-increment or boolean key")
-	}
-
-	shadow := newKey(k.s, k.name, val)
-	shadow.isShadow = true
-	k.shadows = append(k.shadows, shadow)
-	return nil
-}
-
-// AddShadow adds a new shadow key to itself.
-func (k *Key) AddShadow(val string) error {
-	if !k.s.f.options.AllowShadows {
-		return errors.New("shadow key is not allowed")
-	}
-	return k.addShadow(val)
-}
-
-// ValueMapper represents a mapping function for values, e.g. os.ExpandEnv
-type ValueMapper func(string) string
-
-// Name returns name of key.
-func (k *Key) Name() string {
-	return k.name
-}
-
-// Value returns raw value of key for performance purpose.
-func (k *Key) Value() string {
-	return k.value
-}
-
-// ValueWithShadows returns raw values of key and its shadows if any.
-func (k *Key) ValueWithShadows() []string {
-	if len(k.shadows) == 0 {
-		return []string{k.value}
-	}
-	vals := make([]string, len(k.shadows)+1)
-	vals[0] = k.value
-	for i := range k.shadows {
-		vals[i+1] = k.shadows[i].value
-	}
-	return vals
-}
-
-// transformValue takes a raw value and transforms to its final string.
-func (k *Key) transformValue(val string) string {
-	if k.s.f.ValueMapper != nil {
-		val = k.s.f.ValueMapper(val)
-	}
-
-	// Fail-fast if no indicate char found for recursive value
-	if !strings.Contains(val, "%") {
-		return val
-	}
-	for i := 0; i < _DEPTH_VALUES; i++ {
-		vr := varPattern.FindString(val)
-		if len(vr) == 0 {
-			break
-		}
-
-		// Take off leading '%(' and trailing ')s'.
-		noption := strings.TrimLeft(vr, "%(")
-		noption = strings.TrimRight(noption, ")s")
-
-		// Search in the same section.
-		nk, err := k.s.GetKey(noption)
-		if err != nil {
-			// Search again in default section.
-			nk, _ = k.s.f.Section("").GetKey(noption)
-		}
-
-		// Substitute by new value and take off leading '%(' and trailing ')s'.
-		val = strings.Replace(val, vr, nk.value, -1)
-	}
-	return val
-}
-
-// String returns string representation of value.
-func (k *Key) String() string {
-	return k.transformValue(k.value)
-}
-
-// Validate accepts a validate function which can
-// return modifed result as key value.
-func (k *Key) Validate(fn func(string) string) string {
-	return fn(k.String())
-}
-
-// parseBool returns the boolean value represented by the string.
-//
-// It accepts 1, t, T, TRUE, true, True, YES, yes, Yes, y, ON, on, On,
-// 0, f, F, FALSE, false, False, NO, no, No, n, OFF, off, Off.
-// Any other value returns an error.
-func parseBool(str string) (value bool, err error) {
-	switch str {
-	case "1", "t", "T", "true", "TRUE", "True", "YES", "yes", "Yes", "y", "ON", "on", "On":
-		return true, nil
-	case "0", "f", "F", "false", "FALSE", "False", "NO", "no", "No", "n", "OFF", "off", "Off":
-		return false, nil
-	}
-	return false, fmt.Errorf("parsing \"%s\": invalid syntax", str)
-}
-
-// Bool returns bool type value.
-func (k *Key) Bool() (bool, error) {
-	return parseBool(k.String())
-}
-
-// Float64 returns float64 type value.
-func (k *Key) Float64() (float64, error) {
-	return strconv.ParseFloat(k.String(), 64)
-}
-
-// Int returns int type value.
-func (k *Key) Int() (int, error) {
-	return strconv.Atoi(k.String())
-}
-
-// Int64 returns int64 type value.
-func (k *Key) Int64() (int64, error) {
-	return strconv.ParseInt(k.String(), 10, 64)
-}
-
-// Uint returns uint type valued.
-func (k *Key) Uint() (uint, error) {
-	u, e := strconv.ParseUint(k.String(), 10, 64)
-	return uint(u), e
-}
-
-// Uint64 returns uint64 type value.
-func (k *Key) Uint64() (uint64, error) {
-	return strconv.ParseUint(k.String(), 10, 64)
-}
-
-// Duration returns time.Duration type value.
-func (k *Key) Duration() (time.Duration, error) {
-	return time.ParseDuration(k.String())
-}
-
-// TimeFormat parses with given format and returns time.Time type value.
-func (k *Key) TimeFormat(format string) (time.Time, error) {
-	return time.Parse(format, k.String())
-}
-
-// Time parses with RFC3339 format and returns time.Time type value.
-func (k *Key) Time() (time.Time, error) {
-	return k.TimeFormat(time.RFC3339)
-}
-
-// MustString returns default value if key value is empty.
-func (k *Key) MustString(defaultVal string) string {
-	val := k.String()
-	if len(val) == 0 {
-		k.value = defaultVal
-		return defaultVal
-	}
-	return val
-}
-
-// MustBool always returns value without error,
-// it returns false if error occurs.
-func (k *Key) MustBool(defaultVal ...bool) bool {
-	val, err := k.Bool()
-	if len(defaultVal) > 0 && err != nil {
-		k.value = strconv.FormatBool(defaultVal[0])
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustFloat64 always returns value without error,
-// it returns 0.0 if error occurs.
-func (k *Key) MustFloat64(defaultVal ...float64) float64 {
-	val, err := k.Float64()
-	if len(defaultVal) > 0 && err != nil {
-		k.value = strconv.FormatFloat(defaultVal[0], 'f', -1, 64)
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustInt always returns value without error,
-// it returns 0 if error occurs.
-func (k *Key) MustInt(defaultVal ...int) int {
-	val, err := k.Int()
-	if len(defaultVal) > 0 && err != nil {
-		k.value = strconv.FormatInt(int64(defaultVal[0]), 10)
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustInt64 always returns value without error,
-// it returns 0 if error occurs.
-func (k *Key) MustInt64(defaultVal ...int64) int64 {
-	val, err := k.Int64()
-	if len(defaultVal) > 0 && err != nil {
-		k.value = strconv.FormatInt(defaultVal[0], 10)
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustUint always returns value without error,
-// it returns 0 if error occurs.
-func (k *Key) MustUint(defaultVal ...uint) uint {
-	val, err := k.Uint()
-	if len(defaultVal) > 0 && err != nil {
-		k.value = strconv.FormatUint(uint64(defaultVal[0]), 10)
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustUint64 always returns value without error,
-// it returns 0 if error occurs.
-func (k *Key) MustUint64(defaultVal ...uint64) uint64 {
-	val, err := k.Uint64()
-	if len(defaultVal) > 0 && err != nil {
-		k.value = strconv.FormatUint(defaultVal[0], 10)
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustDuration always returns value without error,
-// it returns zero value if error occurs.
-func (k *Key) MustDuration(defaultVal ...time.Duration) time.Duration {
-	val, err := k.Duration()
-	if len(defaultVal) > 0 && err != nil {
-		k.value = defaultVal[0].String()
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustTimeFormat always parses with given format and returns value without error,
-// it returns zero value if error occurs.
-func (k *Key) MustTimeFormat(format string, defaultVal ...time.Time) time.Time {
-	val, err := k.TimeFormat(format)
-	if len(defaultVal) > 0 && err != nil {
-		k.value = defaultVal[0].Format(format)
-		return defaultVal[0]
-	}
-	return val
-}
-
-// MustTime always parses with RFC3339 format and returns value without error,
-// it returns zero value if error occurs.
-func (k *Key) MustTime(defaultVal ...time.Time) time.Time {
-	return k.MustTimeFormat(time.RFC3339, defaultVal...)
-}
-
-// In always returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) In(defaultVal string, candidates []string) string {
-	val := k.String()
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InFloat64 always returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InFloat64(defaultVal float64, candidates []float64) float64 {
-	val := k.MustFloat64()
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InInt always returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InInt(defaultVal int, candidates []int) int {
-	val := k.MustInt()
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InInt64 always returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InInt64(defaultVal int64, candidates []int64) int64 {
-	val := k.MustInt64()
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InUint always returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InUint(defaultVal uint, candidates []uint) uint {
-	val := k.MustUint()
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InUint64 always returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InUint64(defaultVal uint64, candidates []uint64) uint64 {
-	val := k.MustUint64()
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InTimeFormat always parses with given format and returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InTimeFormat(format string, defaultVal time.Time, candidates []time.Time) time.Time {
-	val := k.MustTimeFormat(format)
-	for _, cand := range candidates {
-		if val == cand {
-			return val
-		}
-	}
-	return defaultVal
-}
-
-// InTime always parses with RFC3339 format and returns value without error,
-// it returns default value if error occurs or doesn't fit into candidates.
-func (k *Key) InTime(defaultVal time.Time, candidates []time.Time) time.Time {
-	return k.InTimeFormat(time.RFC3339, defaultVal, candidates)
-}
-
-// RangeFloat64 checks if value is in given range inclusively,
-// and returns default value if it's not.
-func (k *Key) RangeFloat64(defaultVal, min, max float64) float64 {
-	val := k.MustFloat64()
-	if val < min || val > max {
-		return defaultVal
-	}
-	return val
-}
-
-// RangeInt checks if value is in given range inclusively,
-// and returns default value if it's not.
-func (k *Key) RangeInt(defaultVal, min, max int) int {
-	val := k.MustInt()
-	if val < min || val > max {
-		return defaultVal
-	}
-	return val
-}
-
-// RangeInt64 checks if value is in given range inclusively,
-// and returns default value if it's not.
-func (k *Key) RangeInt64(defaultVal, min, max int64) int64 {
-	val := k.MustInt64()
-	if val < min || val > max {
-		return defaultVal
-	}
-	return val
-}
-
-// RangeTimeFormat checks if value with given format is in given range inclusively,
-// and returns default value if it's not.
-func (k *Key) RangeTimeFormat(format string, defaultVal, min, max time.Time) time.Time {
-	val := k.MustTimeFormat(format)
-	if val.Unix() < min.Unix() || val.Unix() > max.Unix() {
-		return defaultVal
-	}
-	return val
-}
-
-// RangeTime checks if value with RFC3339 format is in given range inclusively,
-// and returns default value if it's not.
-func (k *Key) RangeTime(defaultVal, min, max time.Time) time.Time {
-	return k.RangeTimeFormat(time.RFC3339, defaultVal, min, max)
-}
-
-// Strings returns list of string divided by given delimiter.
-func (k *Key) Strings(delim string) []string {
-	str := k.String()
-	if len(str) == 0 {
-		return []string{}
-	}
-
-	vals := strings.Split(str, delim)
-	for i := range vals {
-		// vals[i] = k.transformValue(strings.TrimSpace(vals[i]))
-		vals[i] = strings.TrimSpace(vals[i])
-	}
-	return vals
-}
-
-// StringsWithShadows returns list of string divided by given delimiter.
-// Shadows will also be appended if any.
-func (k *Key) StringsWithShadows(delim string) []string {
-	vals := k.ValueWithShadows()
-	results := make([]string, 0, len(vals)*2)
-	for i := range vals {
-		if len(vals) == 0 {
-			continue
-		}
-
-		results = append(results, strings.Split(vals[i], delim)...)
-	}
-
-	for i := range results {
-		results[i] = k.transformValue(strings.TrimSpace(results[i]))
-	}
-	return results
-}
-
-// Float64s returns list of float64 divided by given delimiter. Any invalid input will be treated as zero value.
-func (k *Key) Float64s(delim string) []float64 {
-	vals, _ := k.parseFloat64s(k.Strings(delim), true, false)
-	return vals
-}
-
-// Ints returns list of int divided by given delimiter. Any invalid input will be treated as zero value.
-func (k *Key) Ints(delim string) []int {
-	vals, _ := k.parseInts(k.Strings(delim), true, false)
-	return vals
-}
-
-// Int64s returns list of int64 divided by given delimiter. Any invalid input will be treated as zero value.
-func (k *Key) Int64s(delim string) []int64 {
-	vals, _ := k.parseInt64s(k.Strings(delim), true, false)
-	return vals
-}
-
-// Uints returns list of uint divided by given delimiter. Any invalid input will be treated as zero value.
-func (k *Key) Uints(delim string) []uint {
-	vals, _ := k.parseUints(k.Strings(delim), true, false)
-	return vals
-}
-
-// Uint64s returns list of uint64 divided by given delimiter. Any invalid input will be treated as zero value.
-func (k *Key) Uint64s(delim string) []uint64 {
-	vals, _ := k.parseUint64s(k.Strings(delim), true, false)
-	return vals
-}
-
-// TimesFormat parses with given format and returns list of time.Time divided by given delimiter.
-// Any invalid input will be treated as zero value (0001-01-01 00:00:00 +0000 UTC).
-func (k *Key) TimesFormat(format, delim string) []time.Time {
-	vals, _ := k.parseTimesFormat(format, k.Strings(delim), true, false)
-	return vals
-}
-
-// Times parses with RFC3339 format and returns list of time.Time divided by given delimiter.
-// Any invalid input will be treated as zero value (0001-01-01 00:00:00 +0000 UTC).
-func (k *Key) Times(delim string) []time.Time {
-	return k.TimesFormat(time.RFC3339, delim)
-}
-
-// ValidFloat64s returns list of float64 divided by given delimiter. If some value is not float, then
-// it will not be included to result list.
-func (k *Key) ValidFloat64s(delim string) []float64 {
-	vals, _ := k.parseFloat64s(k.Strings(delim), false, false)
-	return vals
-}
-
-// ValidInts returns list of int divided by given delimiter. If some value is not integer, then it will
-// not be included to result list.
-func (k *Key) ValidInts(delim string) []int {
-	vals, _ := k.parseInts(k.Strings(delim), false, false)
-	return vals
-}
-
-// ValidInt64s returns list of int64 divided by given delimiter. If some value is not 64-bit integer,
-// then it will not be included to result list.
-func (k *Key) ValidInt64s(delim string) []int64 {
-	vals, _ := k.parseInt64s(k.Strings(delim), false, false)
-	return vals
-}
-
-// ValidUints returns list of uint divided by given delimiter. If some value is not unsigned integer,
-// then it will not be included to result list.
-func (k *Key) ValidUints(delim string) []uint {
-	vals, _ := k.parseUints(k.Strings(delim), false, false)
-	return vals
-}
-
-// ValidUint64s returns list of uint64 divided by given delimiter. If some value is not 64-bit unsigned
-// integer, then it will not be included to result list.
-func (k *Key) ValidUint64s(delim string) []uint64 {
-	vals, _ := k.parseUint64s(k.Strings(delim), false, false)
-	return vals
-}
-
-// ValidTimesFormat parses with given format and returns list of time.Time divided by given delimiter.
-func (k *Key) ValidTimesFormat(format, delim string) []time.Time {
-	vals, _ := k.parseTimesFormat(format, k.Strings(delim), false, false)
-	return vals
-}
-
-// ValidTimes parses with RFC3339 format and returns list of time.Time divided by given delimiter.
-func (k *Key) ValidTimes(delim string) []time.Time {
-	return k.ValidTimesFormat(time.RFC3339, delim)
-}
-
-// StrictFloat64s returns list of float64 divided by given delimiter or error on first invalid input.
-func (k *Key) StrictFloat64s(delim string) ([]float64, error) {
-	return k.parseFloat64s(k.Strings(delim), false, true)
-}
-
-// StrictInts returns list of int divided by given delimiter or error on first invalid input.
-func (k *Key) StrictInts(delim string) ([]int, error) {
-	return k.parseInts(k.Strings(delim), false, true)
-}
-
-// StrictInt64s returns list of int64 divided by given delimiter or error on first invalid input.
-func (k *Key) StrictInt64s(delim string) ([]int64, error) {
-	return k.parseInt64s(k.Strings(delim), false, true)
-}
-
-// StrictUints returns list of uint divided by given delimiter or error on first invalid input.
-func (k *Key) StrictUints(delim string) ([]uint, error) {
-	return k.parseUints(k.Strings(delim), false, true)
-}
-
-// StrictUint64s returns list of uint64 divided by given delimiter or error on first invalid input.
-func (k *Key) StrictUint64s(delim string) ([]uint64, error) {
-	return k.parseUint64s(k.Strings(delim), false, true)
-}
-
-// StrictTimesFormat parses with given format and returns list of time.Time divided by given delimiter
-// or error on first invalid input.
-func (k *Key) StrictTimesFormat(format, delim string) ([]time.Time, error) {
-	return k.parseTimesFormat(format, k.Strings(delim), false, true)
-}
-
-// StrictTimes parses with RFC3339 format and returns list of time.Time divided by given delimiter
-// or error on first invalid input.
-func (k *Key) StrictTimes(delim string) ([]time.Time, error) {
-	return k.StrictTimesFormat(time.RFC3339, delim)
-}
-
-// parseFloat64s transforms strings to float64s.
-func (k *Key) parseFloat64s(strs []string, addInvalid, returnOnInvalid bool) ([]float64, error) {
-	vals := make([]float64, 0, len(strs))
-	for _, str := range strs {
-		val, err := strconv.ParseFloat(str, 64)
-		if err != nil && returnOnInvalid {
-			return nil, err
-		}
-		if err == nil || addInvalid {
-			vals = append(vals, val)
-		}
-	}
-	return vals, nil
-}
-
-// parseInts transforms strings to ints.
-func (k *Key) parseInts(strs []string, addInvalid, returnOnInvalid bool) ([]int, error) {
-	vals := make([]int, 0, len(strs))
-	for _, str := range strs {
-		val, err := strconv.Atoi(str)
-		if err != nil && returnOnInvalid {
-			return nil, err
-		}
-		if err == nil || addInvalid {
-			vals = append(vals, val)
-		}
-	}
-	return vals, nil
-}
-
-// parseInt64s transforms strings to int64s.
-func (k *Key) parseInt64s(strs []string, addInvalid, returnOnInvalid bool) ([]int64, error) {
-	vals := make([]int64, 0, len(strs))
-	for _, str := range strs {
-		val, err := strconv.ParseInt(str, 10, 64)
-		if err != nil && returnOnInvalid {
-			return nil, err
-		}
-		if err == nil || addInvalid {
-			vals = append(vals, val)
-		}
-	}
-	return vals, nil
-}
-
-// parseUints transforms strings to uints.
-func (k *Key) parseUints(strs []string, addInvalid, returnOnInvalid bool) ([]uint, error) {
-	vals := make([]uint, 0, len(strs))
-	for _, str := range strs {
-		val, err := strconv.ParseUint(str, 10, 0)
-		if err != nil && returnOnInvalid {
-			return nil, err
-		}
-		if err == nil || addInvalid {
-			vals = append(vals, uint(val))
-		}
-	}
-	return vals, nil
-}
-
-// parseUint64s transforms strings to uint64s.
-func (k *Key) parseUint64s(strs []string, addInvalid, returnOnInvalid bool) ([]uint64, error) {
-	vals := make([]uint64, 0, len(strs))
-	for _, str := range strs {
-		val, err := strconv.ParseUint(str, 10, 64)
-		if err != nil && returnOnInvalid {
-			return nil, err
-		}
-		if err == nil || addInvalid {
-			vals = append(vals, val)
-		}
-	}
-	return vals, nil
-}
-
-// parseTimesFormat transforms strings to times in given format.
-func (k *Key) parseTimesFormat(format string, strs []string, addInvalid, returnOnInvalid bool) ([]time.Time, error) {
-	vals := make([]time.Time, 0, len(strs))
-	for _, str := range strs {
-		val, err := time.Parse(format, str)
-		if err != nil && returnOnInvalid {
-			return nil, err
-		}
-		if err == nil || addInvalid {
-			vals = append(vals, val)
-		}
-	}
-	return vals, nil
-}
-
-// SetValue changes key value.
-func (k *Key) SetValue(v string) {
-	if k.s.f.BlockMode {
-		k.s.f.lock.Lock()
-		defer k.s.f.lock.Unlock()
-	}
-
-	k.value = v
-	k.s.keysHash[k.name] = v
-}
diff --git a/vendor/github.com/go-ini/ini/parser.go b/vendor/github.com/go-ini/ini/parser.go
deleted file mode 100644
index 69d5476273..0000000000
--- a/vendor/github.com/go-ini/ini/parser.go
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright 2015 Unknwon
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-package ini
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"unicode"
-)
-
-type tokenType int
-
-const (
-	_TOKEN_INVALID tokenType = iota
-	_TOKEN_COMMENT
-	_TOKEN_SECTION
-	_TOKEN_KEY
-)
-
-type parser struct {
-	buf     *bufio.Reader
-	isEOF   bool
-	count   int
-	comment *bytes.Buffer
-}
-
-func newParser(r io.Reader) *parser {
-	return &parser{
-		buf:     bufio.NewReader(r),
-		count:   1,
-		comment: &bytes.Buffer{},
-	}
-}
-
-// BOM handles header of UTF-8, UTF-16 LE and UTF-16 BE's BOM format.
-// http://en.wikipedia.org/wiki/Byte_order_mark#Representations_of_byte_order_marks_by_encoding
-func (p *parser) BOM() error {
-	mask, err := p.buf.Peek(2)
-	if err != nil && err != io.EOF {
-		return err
-	} else if len(mask) < 2 {
-		return nil
-	}
-
-	switch {
-	case mask[0] == 254 && mask[1] == 255:
-		fallthrough
-	case mask[0] == 255 && mask[1] == 254:
-		p.buf.Read(mask)
-	case mask[0] == 239 && mask[1] == 187:
-		mask, err := p.buf.Peek(3)
-		if err != nil && err != io.EOF {
-			return err
-		} else if len(mask) < 3 {
-			return nil
-		}
-		if mask[2] == 191 {
-			p.buf.Read(mask)
-		}
-	}
-	return nil
-}
-
-func (p *parser) readUntil(delim byte) ([]byte, error) {
-	data, err := p.buf.ReadBytes(delim)
-	if err != nil {
-		if err == io.EOF {
-			p.isEOF = true
-		} else {
-			return nil, err
-		}
-	}
-	return data, nil
-}
-
-func cleanComment(in []byte) ([]byte, bool) {
-	i := bytes.IndexAny(in, "#;")
-	if i == -1 {
-		return nil, false
-	}
-	return in[i:], true
-}
-
-func readKeyName(in []byte) (string, int, error) {
-	line := string(in)
-
-	// Check if key name surrounded by quotes.
-	var keyQuote string
-	if line[0] == '"' {
-		if len(line) > 6 && string(line[0:3]) == `"""` {
-			keyQuote = `"""`
-		} else {
-			keyQuote = `"`
-		}
-	} else if line[0] == '`' {
-		keyQuote = "`"
-	}
-
-	// Get out key name
-	endIdx := -1
-	if len(keyQuote) > 0 {
-		startIdx := len(keyQuote)
-		// FIXME: fail case -> """"""name"""=value
-		pos := strings.Index(line[startIdx:], keyQuote)
-		if pos == -1 {
-			return "", -1, fmt.Errorf("missing closing key quote: %s", line)
-		}
-		pos += startIdx
-
-		// Find key-value delimiter
-		i := strings.IndexAny(line[pos+startIdx:], "=:")
-		if i < 0 {
-			return "", -1, ErrDelimiterNotFound{line}
-		}
-		endIdx = pos + i
-		return strings.TrimSpace(line[startIdx:pos]), endIdx + startIdx + 1, nil
-	}
-
-	endIdx = strings.IndexAny(line, "=:")
-	if endIdx < 0 {
-		return "", -1, ErrDelimiterNotFound{line}
-	}
-	return strings.TrimSpace(line[0:endIdx]), endIdx + 1, nil
-}
-
-func (p *parser) readMultilines(line, val, valQuote string) (string, error) {
-	for {
-		data, err := p.readUntil('\n')
-		if err != nil {
-			return "", err
-		}
-		next := string(data)
-
-		pos := strings.LastIndex(next, valQuote)
-		if pos > -1 {
-			val += next[:pos]
-
-			comment, has := cleanComment([]byte(next[pos:]))
-			if has {
-				p.comment.Write(bytes.TrimSpace(comment))
-			}
-			break
-		}
-		val += next
-		if p.isEOF {
-			return "", fmt.Errorf("missing closing key quote from '%s' to '%s'", line, next)
-		}
-	}
-	return val, nil
-}
-
-func (p *parser) readContinuationLines(val string) (string, error) {
-	for {
-		data, err := p.readUntil('\n')
-		if err != nil {
-			return "", err
-		}
-		next := strings.TrimSpace(string(data))
-
-		if len(next) == 0 {
-			break
-		}
-		val += next
-		if val[len(val)-1] != '\\' {
-			break
-		}
-		val = val[:len(val)-1]
-	}
-	return val, nil
-}
-
-// hasSurroundedQuote check if and only if the first and last characters
-// are quotes \" or \'.
-// It returns false if any other parts also contain same kind of quotes.
-func hasSurroundedQuote(in string, quote byte) bool {
-	return len(in) >= 2 && in[0] == quote && in[len(in)-1] == quote &&
-		strings.IndexByte(in[1:], quote) == len(in)-2
-}
-
-func (p *parser) readValue(in []byte, ignoreContinuation, ignoreInlineComment bool) (string, error) {
-	line := strings.TrimLeftFunc(string(in), unicode.IsSpace)
-	if len(line) == 0 {
-		return "", nil
-	}
-
-	var valQuote string
-	if len(line) > 3 && string(line[0:3]) == `"""` {
-		valQuote = `"""`
-	} else if line[0] == '`' {
-		valQuote = "`"
-	}
-
-	if len(valQuote) > 0 {
-		startIdx := len(valQuote)
-		pos := strings.LastIndex(line[startIdx:], valQuote)
-		// Check for multi-line value
-		if pos == -1 {
-			return p.readMultilines(line, line[startIdx:], valQuote)
-		}
-
-		return line[startIdx : pos+startIdx], nil
-	}
-
-	// Won't be able to reach here if value only contains whitespace
-	line = strings.TrimSpace(line)
-
-	// Check continuation lines when desired
-	if !ignoreContinuation && line[len(line)-1] == '\\' {
-		return p.readContinuationLines(line[:len(line)-1])
-	}
-
-	// Check if ignore inline comment
-	if !ignoreInlineComment {
-		i := strings.IndexAny(line, "#;")
-		if i > -1 {
-			p.comment.WriteString(line[i:])
-			line = strings.TrimSpace(line[:i])
-		}
-	}
-
-	// Trim single quotes
-	if hasSurroundedQuote(line, '\'') ||
-		hasSurroundedQuote(line, '"') {
-		line = line[1 : len(line)-1]
-	}
-	return line, nil
-}
-
-// parse parses data through an io.Reader.
-func (f *File) parse(reader io.Reader) (err error) {
-	p := newParser(reader)
-	if err = p.BOM(); err != nil {
-		return fmt.Errorf("BOM: %v", err)
-	}
-
-	// Ignore error because default section name is never empty string.
-	section, _ := f.NewSection(DEFAULT_SECTION)
-
-	var line []byte
-	var inUnparseableSection bool
-	for !p.isEOF {
-		line, err = p.readUntil('\n')
-		if err != nil {
-			return err
-		}
-
-		line = bytes.TrimLeftFunc(line, unicode.IsSpace)
-		if len(line) == 0 {
-			continue
-		}
-
-		// Comments
-		if line[0] == '#' || line[0] == ';' {
-			// Note: we do not care ending line break,
-			// it is needed for adding second line,
-			// so just clean it once at the end when set to value.
-			p.comment.Write(line)
-			continue
-		}
-
-		// Section
-		if line[0] == '[' {
-			// Read to the next ']' (TODO: support quoted strings)
-			// TODO(unknwon): use LastIndexByte when stop supporting Go1.4
-			closeIdx := bytes.LastIndex(line, []byte("]"))
-			if closeIdx == -1 {
-				return fmt.Errorf("unclosed section: %s", line)
-			}
-
-			name := string(line[1:closeIdx])
-			section, err = f.NewSection(name)
-			if err != nil {
-				return err
-			}
-
-			comment, has := cleanComment(line[closeIdx+1:])
-			if has {
-				p.comment.Write(comment)
-			}
-
-			section.Comment = strings.TrimSpace(p.comment.String())
-
-			// Reset aotu-counter and comments
-			p.comment.Reset()
-			p.count = 1
-
-			inUnparseableSection = false
-			for i := range f.options.UnparseableSections {
-				if f.options.UnparseableSections[i] == name ||
-					(f.options.Insensitive && strings.ToLower(f.options.UnparseableSections[i]) == strings.ToLower(name)) {
-					inUnparseableSection = true
-					continue
-				}
-			}
-			continue
-		}
-
-		if inUnparseableSection {
-			section.isRawSection = true
-			section.rawBody += string(line)
-			continue
-		}
-
-		kname, offset, err := readKeyName(line)
-		if err != nil {
-			// Treat as boolean key when desired, and whole line is key name.
-			if IsErrDelimiterNotFound(err) && f.options.AllowBooleanKeys {
-				kname, err := p.readValue(line, f.options.IgnoreContinuation, f.options.IgnoreInlineComment)
-				if err != nil {
-					return err
-				}
-				key, err := section.NewBooleanKey(kname)
-				if err != nil {
-					return err
-				}
-				key.Comment = strings.TrimSpace(p.comment.String())
-				p.comment.Reset()
-				continue
-			}
-			return err
-		}
-
-		// Auto increment.
-		isAutoIncr := false
-		if kname == "-" {
-			isAutoIncr = true
-			kname = "#" + strconv.Itoa(p.count)
-			p.count++
-		}
-
-		value, err := p.readValue(line[offset:], f.options.IgnoreContinuation, f.options.IgnoreInlineComment)
-		if err != nil {
-			return err
-		}
-
-		key, err := section.NewKey(kname, value)
-		if err != nil {
-			return err
-		}
-		key.isAutoIncrement = isAutoIncr
-		key.Comment = strings.TrimSpace(p.comment.String())
-		p.comment.Reset()
-	}
-	return nil
-}
diff --git a/vendor/github.com/go-ini/ini/section.go b/vendor/github.com/go-ini/ini/section.go
deleted file mode 100644
index 94f7375ed4..0000000000
--- a/vendor/github.com/go-ini/ini/section.go
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright 2014 Unknwon
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-package ini
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-)
-
-// Section represents a config section.
-type Section struct {
-	f        *File
-	Comment  string
-	name     string
-	keys     map[string]*Key
-	keyList  []string
-	keysHash map[string]string
-
-	isRawSection bool
-	rawBody      string
-}
-
-func newSection(f *File, name string) *Section {
-	return &Section{
-		f:        f,
-		name:     name,
-		keys:     make(map[string]*Key),
-		keyList:  make([]string, 0, 10),
-		keysHash: make(map[string]string),
-	}
-}
-
-// Name returns name of Section.
-func (s *Section) Name() string {
-	return s.name
-}
-
-// Body returns rawBody of Section if the section was marked as unparseable.
-// It still follows the other rules of the INI format surrounding leading/trailing whitespace.
-func (s *Section) Body() string {
-	return strings.TrimSpace(s.rawBody)
-}
-
-// NewKey creates a new key to given section.
-func (s *Section) NewKey(name, val string) (*Key, error) {
-	if len(name) == 0 {
-		return nil, errors.New("error creating new key: empty key name")
-	} else if s.f.options.Insensitive {
-		name = strings.ToLower(name)
-	}
-
-	if s.f.BlockMode {
-		s.f.lock.Lock()
-		defer s.f.lock.Unlock()
-	}
-
-	if inSlice(name, s.keyList) {
-		if s.f.options.AllowShadows {
-			if err := s.keys[name].addShadow(val); err != nil {
-				return nil, err
-			}
-		} else {
-			s.keys[name].value = val
-		}
-		return s.keys[name], nil
-	}
-
-	s.keyList = append(s.keyList, name)
-	s.keys[name] = newKey(s, name, val)
-	s.keysHash[name] = val
-	return s.keys[name], nil
-}
-
-// NewBooleanKey creates a new boolean type key to given section.
-func (s *Section) NewBooleanKey(name string) (*Key, error) {
-	key, err := s.NewKey(name, "true")
-	if err != nil {
-		return nil, err
-	}
-
-	key.isBooleanType = true
-	return key, nil
-}
-
-// GetKey returns key in section by given name.
-func (s *Section) GetKey(name string) (*Key, error) {
-	// FIXME: change to section level lock?
-	if s.f.BlockMode {
-		s.f.lock.RLock()
-	}
-	if s.f.options.Insensitive {
-		name = strings.ToLower(name)
-	}
-	key := s.keys[name]
-	if s.f.BlockMode {
-		s.f.lock.RUnlock()
-	}
-
-	if key == nil {
-		// Check if it is a child-section.
-		sname := s.name
-		for {
-			if i := strings.LastIndex(sname, "."); i > -1 {
-				sname = sname[:i]
-				sec, err := s.f.GetSection(sname)
-				if err != nil {
-					continue
-				}
-				return sec.GetKey(name)
-			} else {
-				break
-			}
-		}
-		return nil, fmt.Errorf("error when getting key of section '%s': key '%s' not exists", s.name, name)
-	}
-	return key, nil
-}
-
-// HasKey returns true if section contains a key with given name.
-func (s *Section) HasKey(name string) bool {
-	key, _ := s.GetKey(name)
-	return key != nil
-}
-
-// Haskey is a backwards-compatible name for HasKey.
-func (s *Section) Haskey(name string) bool {
-	return s.HasKey(name)
-}
-
-// HasValue returns true if section contains given raw value.
-func (s *Section) HasValue(value string) bool {
-	if s.f.BlockMode {
-		s.f.lock.RLock()
-		defer s.f.lock.RUnlock()
-	}
-
-	for _, k := range s.keys {
-		if value == k.value {
-			return true
-		}
-	}
-	return false
-}
-
-// Key assumes named Key exists in section and returns a zero-value when not.
-func (s *Section) Key(name string) *Key {
-	key, err := s.GetKey(name)
-	if err != nil {
-		// It's OK here because the only possible error is empty key name,
-		// but if it's empty, this piece of code won't be executed.
-		key, _ = s.NewKey(name, "")
-		return key
-	}
-	return key
-}
-
-// Keys returns list of keys of section.
-func (s *Section) Keys() []*Key {
-	keys := make([]*Key, len(s.keyList))
-	for i := range s.keyList {
-		keys[i] = s.Key(s.keyList[i])
-	}
-	return keys
-}
-
-// ParentKeys returns list of keys of parent section.
-func (s *Section) ParentKeys() []*Key {
-	var parentKeys []*Key
-	sname := s.name
-	for {
-		if i := strings.LastIndex(sname, "."); i > -1 {
-			sname = sname[:i]
-			sec, err := s.f.GetSection(sname)
-			if err != nil {
-				continue
-			}
-			parentKeys = append(parentKeys, sec.Keys()...)
-		} else {
-			break
-		}
-
-	}
-	return parentKeys
-}
-
-// KeyStrings returns list of key names of section.
-func (s *Section) KeyStrings() []string {
-	list := make([]string, len(s.keyList))
-	copy(list, s.keyList)
-	return list
-}
-
-// KeysHash returns keys hash consisting of names and values.
-func (s *Section) KeysHash() map[string]string {
-	if s.f.BlockMode {
-		s.f.lock.RLock()
-		defer s.f.lock.RUnlock()
-	}
-
-	hash := map[string]string{}
-	for key, value := range s.keysHash {
-		hash[key] = value
-	}
-	return hash
-}
-
-// DeleteKey deletes a key from section.
-func (s *Section) DeleteKey(name string) {
-	if s.f.BlockMode {
-		s.f.lock.Lock()
-		defer s.f.lock.Unlock()
-	}
-
-	for i, k := range s.keyList {
-		if k == name {
-			s.keyList = append(s.keyList[:i], s.keyList[i+1:]...)
-			delete(s.keys, name)
-			return
-		}
-	}
-}
-
-// ChildSections returns a list of child sections of current section.
-// For example, "[parent.child1]" and "[parent.child12]" are child sections
-// of section "[parent]".
-func (s *Section) ChildSections() []*Section {
-	prefix := s.name + "."
-	children := make([]*Section, 0, 3)
-	for _, name := range s.f.sectionList {
-		if strings.HasPrefix(name, prefix) {
-			children = append(children, s.f.sections[name])
-		}
-	}
-	return children
-}
diff --git a/vendor/github.com/go-ini/ini/struct.go b/vendor/github.com/go-ini/ini/struct.go
deleted file mode 100644
index eeb8dabaac..0000000000
--- a/vendor/github.com/go-ini/ini/struct.go
+++ /dev/null
@@ -1,500 +0,0 @@
-// Copyright 2014 Unknwon
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-package ini
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-	"time"
-	"unicode"
-)
-
-// NameMapper represents a ini tag name mapper.
-type NameMapper func(string) string
-
-// Built-in name getters.
-var (
-	// AllCapsUnderscore converts to format ALL_CAPS_UNDERSCORE.
-	AllCapsUnderscore NameMapper = func(raw string) string {
-		newstr := make([]rune, 0, len(raw))
-		for i, chr := range raw {
-			if isUpper := 'A' <= chr && chr <= 'Z'; isUpper {
-				if i > 0 {
-					newstr = append(newstr, '_')
-				}
-			}
-			newstr = append(newstr, unicode.ToUpper(chr))
-		}
-		return string(newstr)
-	}
-	// TitleUnderscore converts to format title_underscore.
-	TitleUnderscore NameMapper = func(raw string) string {
-		newstr := make([]rune, 0, len(raw))
-		for i, chr := range raw {
-			if isUpper := 'A' <= chr && chr <= 'Z'; isUpper {
-				if i > 0 {
-					newstr = append(newstr, '_')
-				}
-				chr -= ('A' - 'a')
-			}
-			newstr = append(newstr, chr)
-		}
-		return string(newstr)
-	}
-)
-
-func (s *Section) parseFieldName(raw, actual string) string {
-	if len(actual) > 0 {
-		return actual
-	}
-	if s.f.NameMapper != nil {
-		return s.f.NameMapper(raw)
-	}
-	return raw
-}
-
-func parseDelim(actual string) string {
-	if len(actual) > 0 {
-		return actual
-	}
-	return ","
-}
-
-var reflectTime = reflect.TypeOf(time.Now()).Kind()
-
-// setSliceWithProperType sets proper values to slice based on its type.
-func setSliceWithProperType(key *Key, field reflect.Value, delim string, allowShadow, isStrict bool) error {
-	var strs []string
-	if allowShadow {
-		strs = key.StringsWithShadows(delim)
-	} else {
-		strs = key.Strings(delim)
-	}
-
-	numVals := len(strs)
-	if numVals == 0 {
-		return nil
-	}
-
-	var vals interface{}
-	var err error
-
-	sliceOf := field.Type().Elem().Kind()
-	switch sliceOf {
-	case reflect.String:
-		vals = strs
-	case reflect.Int:
-		vals, err = key.parseInts(strs, true, false)
-	case reflect.Int64:
-		vals, err = key.parseInt64s(strs, true, false)
-	case reflect.Uint:
-		vals, err = key.parseUints(strs, true, false)
-	case reflect.Uint64:
-		vals, err = key.parseUint64s(strs, true, false)
-	case reflect.Float64:
-		vals, err = key.parseFloat64s(strs, true, false)
-	case reflectTime:
-		vals, err = key.parseTimesFormat(time.RFC3339, strs, true, false)
-	default:
-		return fmt.Errorf("unsupported type '[]%s'", sliceOf)
-	}
-	if isStrict {
-		return err
-	}
-
-	slice := reflect.MakeSlice(field.Type(), numVals, numVals)
-	for i := 0; i < numVals; i++ {
-		switch sliceOf {
-		case reflect.String:
-			slice.Index(i).Set(reflect.ValueOf(vals.([]string)[i]))
-		case reflect.Int:
-			slice.Index(i).Set(reflect.ValueOf(vals.([]int)[i]))
-		case reflect.Int64:
-			slice.Index(i).Set(reflect.ValueOf(vals.([]int64)[i]))
-		case reflect.Uint:
-			slice.Index(i).Set(reflect.ValueOf(vals.([]uint)[i]))
-		case reflect.Uint64:
-			slice.Index(i).Set(reflect.ValueOf(vals.([]uint64)[i]))
-		case reflect.Float64:
-			slice.Index(i).Set(reflect.ValueOf(vals.([]float64)[i]))
-		case reflectTime:
-			slice.Index(i).Set(reflect.ValueOf(vals.([]time.Time)[i]))
-		}
-	}
-	field.Set(slice)
-	return nil
-}
-
-func wrapStrictError(err error, isStrict bool) error {
-	if isStrict {
-		return err
-	}
-	return nil
-}
-
-// setWithProperType sets proper value to field based on its type,
-// but it does not return error for failing parsing,
-// because we want to use default value that is already assigned to strcut.
-func setWithProperType(t reflect.Type, key *Key, field reflect.Value, delim string, allowShadow, isStrict bool) error {
-	switch t.Kind() {
-	case reflect.String:
-		if len(key.String()) == 0 {
-			return nil
-		}
-		field.SetString(key.String())
-	case reflect.Bool:
-		boolVal, err := key.Bool()
-		if err != nil {
-			return wrapStrictError(err, isStrict)
-		}
-		field.SetBool(boolVal)
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		durationVal, err := key.Duration()
-		// Skip zero value
-		if err == nil && int(durationVal) > 0 {
-			field.Set(reflect.ValueOf(durationVal))
-			return nil
-		}
-
-		intVal, err := key.Int64()
-		if err != nil {
-			return wrapStrictError(err, isStrict)
-		}
-		field.SetInt(intVal)
-	//	byte is an alias for uint8, so supporting uint8 breaks support for byte
-	case reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		durationVal, err := key.Duration()
-		// Skip zero value
-		if err == nil && int(durationVal) > 0 {
-			field.Set(reflect.ValueOf(durationVal))
-			return nil
-		}
-
-		uintVal, err := key.Uint64()
-		if err != nil {
-			return wrapStrictError(err, isStrict)
-		}
-		field.SetUint(uintVal)
-
-	case reflect.Float32, reflect.Float64:
-		floatVal, err := key.Float64()
-		if err != nil {
-			return wrapStrictError(err, isStrict)
-		}
-		field.SetFloat(floatVal)
-	case reflectTime:
-		timeVal, err := key.Time()
-		if err != nil {
-			return wrapStrictError(err, isStrict)
-		}
-		field.Set(reflect.ValueOf(timeVal))
-	case reflect.Slice:
-		return setSliceWithProperType(key, field, delim, allowShadow, isStrict)
-	default:
-		return fmt.Errorf("unsupported type '%s'", t)
-	}
-	return nil
-}
-
-func parseTagOptions(tag string) (rawName string, omitEmpty bool, allowShadow bool) {
-	opts := strings.SplitN(tag, ",", 3)
-	rawName = opts[0]
-	if len(opts) > 1 {
-		omitEmpty = opts[1] == "omitempty"
-	}
-	if len(opts) > 2 {
-		allowShadow = opts[2] == "allowshadow"
-	}
-	return rawName, omitEmpty, allowShadow
-}
-
-func (s *Section) mapTo(val reflect.Value, isStrict bool) error {
-	if val.Kind() == reflect.Ptr {
-		val = val.Elem()
-	}
-	typ := val.Type()
-
-	for i := 0; i < typ.NumField(); i++ {
-		field := val.Field(i)
-		tpField := typ.Field(i)
-
-		tag := tpField.Tag.Get("ini")
-		if tag == "-" {
-			continue
-		}
-
-		rawName, _, allowShadow := parseTagOptions(tag)
-		fieldName := s.parseFieldName(tpField.Name, rawName)
-		if len(fieldName) == 0 || !field.CanSet() {
-			continue
-		}
-
-		isAnonymous := tpField.Type.Kind() == reflect.Ptr && tpField.Anonymous
-		isStruct := tpField.Type.Kind() == reflect.Struct
-		if isAnonymous {
-			field.Set(reflect.New(tpField.Type.Elem()))
-		}
-
-		if isAnonymous || isStruct {
-			if sec, err := s.f.GetSection(fieldName); err == nil {
-				if err = sec.mapTo(field, isStrict); err != nil {
-					return fmt.Errorf("error mapping field(%s): %v", fieldName, err)
-				}
-				continue
-			}
-		}
-
-		if key, err := s.GetKey(fieldName); err == nil {
-			delim := parseDelim(tpField.Tag.Get("delim"))
-			if err = setWithProperType(tpField.Type, key, field, delim, allowShadow, isStrict); err != nil {
-				return fmt.Errorf("error mapping field(%s): %v", fieldName, err)
-			}
-		}
-	}
-	return nil
-}
-
-// MapTo maps section to given struct.
-func (s *Section) MapTo(v interface{}) error {
-	typ := reflect.TypeOf(v)
-	val := reflect.ValueOf(v)
-	if typ.Kind() == reflect.Ptr {
-		typ = typ.Elem()
-		val = val.Elem()
-	} else {
-		return errors.New("cannot map to non-pointer struct")
-	}
-
-	return s.mapTo(val, false)
-}
-
-// MapTo maps section to given struct in strict mode,
-// which returns all possible error including value parsing error.
-func (s *Section) StrictMapTo(v interface{}) error {
-	typ := reflect.TypeOf(v)
-	val := reflect.ValueOf(v)
-	if typ.Kind() == reflect.Ptr {
-		typ = typ.Elem()
-		val = val.Elem()
-	} else {
-		return errors.New("cannot map to non-pointer struct")
-	}
-
-	return s.mapTo(val, true)
-}
-
-// MapTo maps file to given struct.
-func (f *File) MapTo(v interface{}) error {
-	return f.Section("").MapTo(v)
-}
-
-// MapTo maps file to given struct in strict mode,
-// which returns all possible error including value parsing error.
-func (f *File) StrictMapTo(v interface{}) error {
-	return f.Section("").StrictMapTo(v)
-}
-
-// MapTo maps data sources to given struct with name mapper.
-func MapToWithMapper(v interface{}, mapper NameMapper, source interface{}, others ...interface{}) error {
-	cfg, err := Load(source, others...)
-	if err != nil {
-		return err
-	}
-	cfg.NameMapper = mapper
-	return cfg.MapTo(v)
-}
-
-// StrictMapToWithMapper maps data sources to given struct with name mapper in strict mode,
-// which returns all possible error including value parsing error.
-func StrictMapToWithMapper(v interface{}, mapper NameMapper, source interface{}, others ...interface{}) error {
-	cfg, err := Load(source, others...)
-	if err != nil {
-		return err
-	}
-	cfg.NameMapper = mapper
-	return cfg.StrictMapTo(v)
-}
-
-// MapTo maps data sources to given struct.
-func MapTo(v, source interface{}, others ...interface{}) error {
-	return MapToWithMapper(v, nil, source, others...)
-}
-
-// StrictMapTo maps data sources to given struct in strict mode,
-// which returns all possible error including value parsing error.
-func StrictMapTo(v, source interface{}, others ...interface{}) error {
-	return StrictMapToWithMapper(v, nil, source, others...)
-}
-
-// reflectSliceWithProperType does the opposite thing as setSliceWithProperType.
-func reflectSliceWithProperType(key *Key, field reflect.Value, delim string) error {
-	slice := field.Slice(0, field.Len())
-	if field.Len() == 0 {
-		return nil
-	}
-
-	var buf bytes.Buffer
-	sliceOf := field.Type().Elem().Kind()
-	for i := 0; i < field.Len(); i++ {
-		switch sliceOf {
-		case reflect.String:
-			buf.WriteString(slice.Index(i).String())
-		case reflect.Int, reflect.Int64:
-			buf.WriteString(fmt.Sprint(slice.Index(i).Int()))
-		case reflect.Uint, reflect.Uint64:
-			buf.WriteString(fmt.Sprint(slice.Index(i).Uint()))
-		case reflect.Float64:
-			buf.WriteString(fmt.Sprint(slice.Index(i).Float()))
-		case reflectTime:
-			buf.WriteString(slice.Index(i).Interface().(time.Time).Format(time.RFC3339))
-		default:
-			return fmt.Errorf("unsupported type '[]%s'", sliceOf)
-		}
-		buf.WriteString(delim)
-	}
-	key.SetValue(buf.String()[:buf.Len()-1])
-	return nil
-}
-
-// reflectWithProperType does the opposite thing as setWithProperType.
-func reflectWithProperType(t reflect.Type, key *Key, field reflect.Value, delim string) error {
-	switch t.Kind() {
-	case reflect.String:
-		key.SetValue(field.String())
-	case reflect.Bool:
-		key.SetValue(fmt.Sprint(field.Bool()))
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		key.SetValue(fmt.Sprint(field.Int()))
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		key.SetValue(fmt.Sprint(field.Uint()))
-	case reflect.Float32, reflect.Float64:
-		key.SetValue(fmt.Sprint(field.Float()))
-	case reflectTime:
-		key.SetValue(fmt.Sprint(field.Interface().(time.Time).Format(time.RFC3339)))
-	case reflect.Slice:
-		return reflectSliceWithProperType(key, field, delim)
-	default:
-		return fmt.Errorf("unsupported type '%s'", t)
-	}
-	return nil
-}
-
-// CR: copied from encoding/json/encode.go with modifications of time.Time support.
-// TODO: add more test coverage.
-func isEmptyValue(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
-		return v.Len() == 0
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.Interface, reflect.Ptr:
-		return v.IsNil()
-	case reflectTime:
-		t, ok := v.Interface().(time.Time)
-		return ok && t.IsZero()
-	}
-	return false
-}
-
-func (s *Section) reflectFrom(val reflect.Value) error {
-	if val.Kind() == reflect.Ptr {
-		val = val.Elem()
-	}
-	typ := val.Type()
-
-	for i := 0; i < typ.NumField(); i++ {
-		field := val.Field(i)
-		tpField := typ.Field(i)
-
-		tag := tpField.Tag.Get("ini")
-		if tag == "-" {
-			continue
-		}
-
-		opts := strings.SplitN(tag, ",", 2)
-		if len(opts) == 2 && opts[1] == "omitempty" && isEmptyValue(field) {
-			continue
-		}
-
-		fieldName := s.parseFieldName(tpField.Name, opts[0])
-		if len(fieldName) == 0 || !field.CanSet() {
-			continue
-		}
-
-		if (tpField.Type.Kind() == reflect.Ptr && tpField.Anonymous) ||
-			(tpField.Type.Kind() == reflect.Struct && tpField.Type.Name() != "Time") {
-			// Note: The only error here is section doesn't exist.
-			sec, err := s.f.GetSection(fieldName)
-			if err != nil {
-				// Note: fieldName can never be empty here, ignore error.
-				sec, _ = s.f.NewSection(fieldName)
-			}
-			if err = sec.reflectFrom(field); err != nil {
-				return fmt.Errorf("error reflecting field (%s): %v", fieldName, err)
-			}
-			continue
-		}
-
-		// Note: Same reason as secion.
-		key, err := s.GetKey(fieldName)
-		if err != nil {
-			key, _ = s.NewKey(fieldName, "")
-		}
-		if err = reflectWithProperType(tpField.Type, key, field, parseDelim(tpField.Tag.Get("delim"))); err != nil {
-			return fmt.Errorf("error reflecting field (%s): %v", fieldName, err)
-		}
-
-	}
-	return nil
-}
-
-// ReflectFrom reflects secion from given struct.
-func (s *Section) ReflectFrom(v interface{}) error {
-	typ := reflect.TypeOf(v)
-	val := reflect.ValueOf(v)
-	if typ.Kind() == reflect.Ptr {
-		typ = typ.Elem()
-		val = val.Elem()
-	} else {
-		return errors.New("cannot reflect from non-pointer struct")
-	}
-
-	return s.reflectFrom(val)
-}
-
-// ReflectFrom reflects file from given struct.
-func (f *File) ReflectFrom(v interface{}) error {
-	return f.Section("").ReflectFrom(v)
-}
-
-// ReflectFrom reflects data sources from given struct with name mapper.
-func ReflectFromWithMapper(cfg *File, v interface{}, mapper NameMapper) error {
-	cfg.NameMapper = mapper
-	return cfg.ReflectFrom(v)
-}
-
-// ReflectFrom reflects data sources from given struct.
-func ReflectFrom(cfg *File, v interface{}) error {
-	return ReflectFromWithMapper(cfg, v, nil)
-}
diff --git a/vendor/github.com/go-openapi/jsonpointer/CODE_OF_CONDUCT.md b/vendor/github.com/go-openapi/jsonpointer/CODE_OF_CONDUCT.md
deleted file mode 100644
index 9322b065e3..0000000000
--- a/vendor/github.com/go-openapi/jsonpointer/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at ivan+abuse@flanders.co.nz. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/vendor/github.com/go-openapi/jsonpointer/LICENSE b/vendor/github.com/go-openapi/jsonpointer/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/vendor/github.com/go-openapi/jsonpointer/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/go-openapi/jsonpointer/README.md b/vendor/github.com/go-openapi/jsonpointer/README.md
deleted file mode 100644
index 813788aff1..0000000000
--- a/vendor/github.com/go-openapi/jsonpointer/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# gojsonpointer [![Build Status](https://travis-ci.org/go-openapi/jsonpointer.svg?branch=master)](https://travis-ci.org/go-openapi/jsonpointer) [![codecov](https://codecov.io/gh/go-openapi/jsonpointer/branch/master/graph/badge.svg)](https://codecov.io/gh/go-openapi/jsonpointer) [![Slack Status](https://slackin.goswagger.io/badge.svg)](https://slackin.goswagger.io)
-
-[![license](http://img.shields.io/badge/license-Apache%20v2-orange.svg)](https://raw.githubusercontent.com/go-openapi/jsonpointer/master/LICENSE) [![GoDoc](https://godoc.org/github.com/go-openapi/jsonpointer?status.svg)](http://godoc.org/github.com/go-openapi/jsonpointer)
-An implementation of JSON Pointer - Go language
-
-## Status
-Completed YES
-
-Tested YES
-
-## References
-http://tools.ietf.org/html/draft-ietf-appsawg-json-pointer-07
-
-### Note
-The 4.Evaluation part of the previous reference, starting with 'If the currently referenced value is a JSON array, the reference token MUST contain either...' is not implemented.
diff --git a/vendor/github.com/go-openapi/jsonpointer/pointer.go b/vendor/github.com/go-openapi/jsonpointer/pointer.go
deleted file mode 100644
index fe2d6ee574..0000000000
--- a/vendor/github.com/go-openapi/jsonpointer/pointer.go
+++ /dev/null
@@ -1,390 +0,0 @@
-// Copyright 2013 sigu-399 ( https://github.com/sigu-399 )
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// author       sigu-399
-// author-github  https://github.com/sigu-399
-// author-mail    sigu.399@gmail.com
-//
-// repository-name  jsonpointer
-// repository-desc  An implementation of JSON Pointer - Go language
-//
-// description    Main and unique file.
-//
-// created        25-02-2013
-
-package jsonpointer
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-
-	"github.com/go-openapi/swag"
-)
-
-const (
-	emptyPointer     = ``
-	pointerSeparator = `/`
-
-	invalidStart = `JSON pointer must be empty or start with a "` + pointerSeparator
-)
-
-var jsonPointableType = reflect.TypeOf(new(JSONPointable)).Elem()
-var jsonSetableType = reflect.TypeOf(new(JSONSetable)).Elem()
-
-// JSONPointable is an interface for structs to implement when they need to customize the
-// json pointer process
-type JSONPointable interface {
-	JSONLookup(string) (interface{}, error)
-}
-
-// JSONSetable is an interface for structs to implement when they need to customize the
-// json pointer process
-type JSONSetable interface {
-	JSONSet(string, interface{}) error
-}
-
-// New creates a new json pointer for the given string
-func New(jsonPointerString string) (Pointer, error) {
-
-	var p Pointer
-	err := p.parse(jsonPointerString)
-	return p, err
-
-}
-
-// Pointer the json pointer reprsentation
-type Pointer struct {
-	referenceTokens []string
-}
-
-// "Constructor", parses the given string JSON pointer
-func (p *Pointer) parse(jsonPointerString string) error {
-
-	var err error
-
-	if jsonPointerString != emptyPointer {
-		if !strings.HasPrefix(jsonPointerString, pointerSeparator) {
-			err = errors.New(invalidStart)
-		} else {
-			referenceTokens := strings.Split(jsonPointerString, pointerSeparator)
-			for _, referenceToken := range referenceTokens[1:] {
-				p.referenceTokens = append(p.referenceTokens, referenceToken)
-			}
-		}
-	}
-
-	return err
-}
-
-// Get uses the pointer to retrieve a value from a JSON document
-func (p *Pointer) Get(document interface{}) (interface{}, reflect.Kind, error) {
-	return p.get(document, swag.DefaultJSONNameProvider)
-}
-
-// Set uses the pointer to set a value from a JSON document
-func (p *Pointer) Set(document interface{}, value interface{}) (interface{}, error) {
-	return document, p.set(document, value, swag.DefaultJSONNameProvider)
-}
-
-// GetForToken gets a value for a json pointer token 1 level deep
-func GetForToken(document interface{}, decodedToken string) (interface{}, reflect.Kind, error) {
-	return getSingleImpl(document, decodedToken, swag.DefaultJSONNameProvider)
-}
-
-// SetForToken gets a value for a json pointer token 1 level deep
-func SetForToken(document interface{}, decodedToken string, value interface{}) (interface{}, error) {
-	return document, setSingleImpl(document, value, decodedToken, swag.DefaultJSONNameProvider)
-}
-
-func getSingleImpl(node interface{}, decodedToken string, nameProvider *swag.NameProvider) (interface{}, reflect.Kind, error) {
-	rValue := reflect.Indirect(reflect.ValueOf(node))
-	kind := rValue.Kind()
-
-	switch kind {
-
-	case reflect.Struct:
-		if rValue.Type().Implements(jsonPointableType) {
-			r, err := node.(JSONPointable).JSONLookup(decodedToken)
-			if err != nil {
-				return nil, kind, err
-			}
-			return r, kind, nil
-		}
-		nm, ok := nameProvider.GetGoNameForType(rValue.Type(), decodedToken)
-		if !ok {
-			return nil, kind, fmt.Errorf("object has no field %q", decodedToken)
-		}
-		fld := rValue.FieldByName(nm)
-		return fld.Interface(), kind, nil
-
-	case reflect.Map:
-		kv := reflect.ValueOf(decodedToken)
-		mv := rValue.MapIndex(kv)
-
-		if mv.IsValid() && !swag.IsZero(mv) {
-			return mv.Interface(), kind, nil
-		}
-		return nil, kind, fmt.Errorf("object has no key %q", decodedToken)
-
-	case reflect.Slice:
-		tokenIndex, err := strconv.Atoi(decodedToken)
-		if err != nil {
-			return nil, kind, err
-		}
-		sLength := rValue.Len()
-		if tokenIndex < 0 || tokenIndex >= sLength {
-			return nil, kind, fmt.Errorf("index out of bounds array[0,%d] index '%d'", sLength-1, tokenIndex)
-		}
-
-		elem := rValue.Index(tokenIndex)
-		return elem.Interface(), kind, nil
-
-	default:
-		return nil, kind, fmt.Errorf("invalid token reference %q", decodedToken)
-	}
-
-}
-
-func setSingleImpl(node, data interface{}, decodedToken string, nameProvider *swag.NameProvider) error {
-	rValue := reflect.Indirect(reflect.ValueOf(node))
-	switch rValue.Kind() {
-
-	case reflect.Struct:
-		if ns, ok := node.(JSONSetable); ok { // pointer impl
-			return ns.JSONSet(decodedToken, data)
-		}
-
-		if rValue.Type().Implements(jsonSetableType) {
-			return node.(JSONSetable).JSONSet(decodedToken, data)
-		}
-
-		nm, ok := nameProvider.GetGoNameForType(rValue.Type(), decodedToken)
-		if !ok {
-			return fmt.Errorf("object has no field %q", decodedToken)
-		}
-		fld := rValue.FieldByName(nm)
-		if fld.IsValid() {
-			fld.Set(reflect.ValueOf(data))
-		}
-		return nil
-
-	case reflect.Map:
-		kv := reflect.ValueOf(decodedToken)
-		rValue.SetMapIndex(kv, reflect.ValueOf(data))
-		return nil
-
-	case reflect.Slice:
-		tokenIndex, err := strconv.Atoi(decodedToken)
-		if err != nil {
-			return err
-		}
-		sLength := rValue.Len()
-		if tokenIndex < 0 || tokenIndex >= sLength {
-			return fmt.Errorf("index out of bounds array[0,%d] index '%d'", sLength, tokenIndex)
-		}
-
-		elem := rValue.Index(tokenIndex)
-		if !elem.CanSet() {
-			return fmt.Errorf("can't set slice index %s to %v", decodedToken, data)
-		}
-		elem.Set(reflect.ValueOf(data))
-		return nil
-
-	default:
-		return fmt.Errorf("invalid token reference %q", decodedToken)
-	}
-
-}
-
-func (p *Pointer) get(node interface{}, nameProvider *swag.NameProvider) (interface{}, reflect.Kind, error) {
-
-	if nameProvider == nil {
-		nameProvider = swag.DefaultJSONNameProvider
-	}
-
-	kind := reflect.Invalid
-
-	// Full document when empty
-	if len(p.referenceTokens) == 0 {
-		return node, kind, nil
-	}
-
-	for _, token := range p.referenceTokens {
-
-		decodedToken := Unescape(token)
-
-		r, knd, err := getSingleImpl(node, decodedToken, nameProvider)
-		if err != nil {
-			return nil, knd, err
-		}
-		node, kind = r, knd
-
-	}
-
-	rValue := reflect.ValueOf(node)
-	kind = rValue.Kind()
-
-	return node, kind, nil
-}
-
-func (p *Pointer) set(node, data interface{}, nameProvider *swag.NameProvider) error {
-	knd := reflect.ValueOf(node).Kind()
-
-	if knd != reflect.Ptr && knd != reflect.Struct && knd != reflect.Map && knd != reflect.Slice && knd != reflect.Array {
-		return fmt.Errorf("only structs, pointers, maps and slices are supported for setting values")
-	}
-
-	if nameProvider == nil {
-		nameProvider = swag.DefaultJSONNameProvider
-	}
-
-	// Full document when empty
-	if len(p.referenceTokens) == 0 {
-		return nil
-	}
-
-	lastI := len(p.referenceTokens) - 1
-	for i, token := range p.referenceTokens {
-		isLastToken := i == lastI
-		decodedToken := Unescape(token)
-
-		if isLastToken {
-
-			return setSingleImpl(node, data, decodedToken, nameProvider)
-		}
-
-		rValue := reflect.Indirect(reflect.ValueOf(node))
-		kind := rValue.Kind()
-
-		switch kind {
-
-		case reflect.Struct:
-			if rValue.Type().Implements(jsonPointableType) {
-				r, err := node.(JSONPointable).JSONLookup(decodedToken)
-				if err != nil {
-					return err
-				}
-				fld := reflect.ValueOf(r)
-				if fld.CanAddr() && fld.Kind() != reflect.Interface && fld.Kind() != reflect.Map && fld.Kind() != reflect.Slice && fld.Kind() != reflect.Ptr {
-					node = fld.Addr().Interface()
-					continue
-				}
-				node = r
-				continue
-			}
-			nm, ok := nameProvider.GetGoNameForType(rValue.Type(), decodedToken)
-			if !ok {
-				return fmt.Errorf("object has no field %q", decodedToken)
-			}
-			fld := rValue.FieldByName(nm)
-			if fld.CanAddr() && fld.Kind() != reflect.Interface && fld.Kind() != reflect.Map && fld.Kind() != reflect.Slice && fld.Kind() != reflect.Ptr {
-				node = fld.Addr().Interface()
-				continue
-			}
-			node = fld.Interface()
-
-		case reflect.Map:
-			kv := reflect.ValueOf(decodedToken)
-			mv := rValue.MapIndex(kv)
-
-			if !mv.IsValid() {
-				return fmt.Errorf("object has no key %q", decodedToken)
-			}
-			if mv.CanAddr() && mv.Kind() != reflect.Interface && mv.Kind() != reflect.Map && mv.Kind() != reflect.Slice && mv.Kind() != reflect.Ptr {
-				node = mv.Addr().Interface()
-				continue
-			}
-			node = mv.Interface()
-
-		case reflect.Slice:
-			tokenIndex, err := strconv.Atoi(decodedToken)
-			if err != nil {
-				return err
-			}
-			sLength := rValue.Len()
-			if tokenIndex < 0 || tokenIndex >= sLength {
-				return fmt.Errorf("index out of bounds array[0,%d] index '%d'", sLength, tokenIndex)
-			}
-
-			elem := rValue.Index(tokenIndex)
-			if elem.CanAddr() && elem.Kind() != reflect.Interface && elem.Kind() != reflect.Map && elem.Kind() != reflect.Slice && elem.Kind() != reflect.Ptr {
-				node = elem.Addr().Interface()
-				continue
-			}
-			node = elem.Interface()
-
-		default:
-			return fmt.Errorf("invalid token reference %q", decodedToken)
-		}
-
-	}
-
-	return nil
-}
-
-// DecodedTokens returns the decoded tokens
-func (p *Pointer) DecodedTokens() []string {
-	result := make([]string, 0, len(p.referenceTokens))
-	for _, t := range p.referenceTokens {
-		result = append(result, Unescape(t))
-	}
-	return result
-}
-
-// IsEmpty returns true if this is an empty json pointer
-// this indicates that it points to the root document
-func (p *Pointer) IsEmpty() bool {
-	return len(p.referenceTokens) == 0
-}
-
-// Pointer to string representation function
-func (p *Pointer) String() string {
-
-	if len(p.referenceTokens) == 0 {
-		return emptyPointer
-	}
-
-	pointerString := pointerSeparator + strings.Join(p.referenceTokens, pointerSeparator)
-
-	return pointerString
-}
-
-// Specific JSON pointer encoding here
-// ~0 => ~
-// ~1 => /
-// ... and vice versa
-
-const (
-	encRefTok0 = `~0`
-	encRefTok1 = `~1`
-	decRefTok0 = `~`
-	decRefTok1 = `/`
-)
-
-// Unescape unescapes a json pointer reference token string to the original representation
-func Unescape(token string) string {
-	step1 := strings.Replace(token, encRefTok1, decRefTok1, -1)
-	step2 := strings.Replace(step1, encRefTok0, decRefTok0, -1)
-	return step2
-}
-
-// Escape escapes a pointer reference token string
-func Escape(token string) string {
-	step1 := strings.Replace(token, decRefTok0, encRefTok0, -1)
-	step2 := strings.Replace(step1, decRefTok1, encRefTok1, -1)
-	return step2
-}
diff --git a/vendor/github.com/go-openapi/jsonreference/CODE_OF_CONDUCT.md b/vendor/github.com/go-openapi/jsonreference/CODE_OF_CONDUCT.md
deleted file mode 100644
index 9322b065e3..0000000000
--- a/vendor/github.com/go-openapi/jsonreference/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at ivan+abuse@flanders.co.nz. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/vendor/github.com/go-openapi/jsonreference/LICENSE b/vendor/github.com/go-openapi/jsonreference/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/vendor/github.com/go-openapi/jsonreference/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/go-openapi/jsonreference/README.md b/vendor/github.com/go-openapi/jsonreference/README.md
deleted file mode 100644
index 66345f4c61..0000000000
--- a/vendor/github.com/go-openapi/jsonreference/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# gojsonreference [![Build Status](https://travis-ci.org/go-openapi/jsonreference.svg?branch=master)](https://travis-ci.org/go-openapi/jsonreference) [![codecov](https://codecov.io/gh/go-openapi/jsonreference/branch/master/graph/badge.svg)](https://codecov.io/gh/go-openapi/jsonreference) [![Slack Status](https://slackin.goswagger.io/badge.svg)](https://slackin.goswagger.io)
-
-[![license](http://img.shields.io/badge/license-Apache%20v2-orange.svg)](https://raw.githubusercontent.com/go-openapi/jsonreference/master/LICENSE) [![GoDoc](https://godoc.org/github.com/go-openapi/jsonreference?status.svg)](http://godoc.org/github.com/go-openapi/jsonreference)
-An implementation of JSON Reference - Go language
-
-## Status
-Work in progress ( 90% done )
-
-## Dependencies
-https://github.com/go-openapi/jsonpointer
-
-## References
-http://tools.ietf.org/html/draft-ietf-appsawg-json-pointer-07
-
-http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03
diff --git a/vendor/github.com/go-openapi/jsonreference/reference.go b/vendor/github.com/go-openapi/jsonreference/reference.go
deleted file mode 100644
index 3bc0a6e26f..0000000000
--- a/vendor/github.com/go-openapi/jsonreference/reference.go
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2013 sigu-399 ( https://github.com/sigu-399 )
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// author       sigu-399
-// author-github  https://github.com/sigu-399
-// author-mail    sigu.399@gmail.com
-//
-// repository-name  jsonreference
-// repository-desc  An implementation of JSON Reference - Go language
-//
-// description    Main and unique file.
-//
-// created        26-02-2013
-
-package jsonreference
-
-import (
-	"errors"
-	"net/url"
-	"strings"
-
-	"github.com/PuerkitoBio/purell"
-	"github.com/go-openapi/jsonpointer"
-)
-
-const (
-	fragmentRune = `#`
-)
-
-// New creates a new reference for the given string
-func New(jsonReferenceString string) (Ref, error) {
-
-	var r Ref
-	err := r.parse(jsonReferenceString)
-	return r, err
-
-}
-
-// MustCreateRef parses the ref string and panics when it's invalid.
-// Use the New method for a version that returns an error
-func MustCreateRef(ref string) Ref {
-	r, err := New(ref)
-	if err != nil {
-		panic(err)
-	}
-	return r
-}
-
-// Ref represents a json reference object
-type Ref struct {
-	referenceURL     *url.URL
-	referencePointer jsonpointer.Pointer
-
-	HasFullURL      bool
-	HasURLPathOnly  bool
-	HasFragmentOnly bool
-	HasFileScheme   bool
-	HasFullFilePath bool
-}
-
-// GetURL gets the URL for this reference
-func (r *Ref) GetURL() *url.URL {
-	return r.referenceURL
-}
-
-// GetPointer gets the json pointer for this reference
-func (r *Ref) GetPointer() *jsonpointer.Pointer {
-	return &r.referencePointer
-}
-
-// String returns the best version of the url for this reference
-func (r *Ref) String() string {
-
-	if r.referenceURL != nil {
-		return r.referenceURL.String()
-	}
-
-	if r.HasFragmentOnly {
-		return fragmentRune + r.referencePointer.String()
-	}
-
-	return r.referencePointer.String()
-}
-
-// IsRoot returns true if this reference is a root document
-func (r *Ref) IsRoot() bool {
-	return r.referenceURL != nil &&
-		!r.IsCanonical() &&
-		!r.HasURLPathOnly &&
-		r.referenceURL.Fragment == ""
-}
-
-// IsCanonical returns true when this pointer starts with http(s):// or file://
-func (r *Ref) IsCanonical() bool {
-	return (r.HasFileScheme && r.HasFullFilePath) || (!r.HasFileScheme && r.HasFullURL)
-}
-
-// "Constructor", parses the given string JSON reference
-func (r *Ref) parse(jsonReferenceString string) error {
-
-	parsed, err := url.Parse(jsonReferenceString)
-	if err != nil {
-		return err
-	}
-
-	r.referenceURL, _ = url.Parse(purell.NormalizeURL(parsed, purell.FlagsSafe|purell.FlagRemoveDuplicateSlashes))
-	refURL := r.referenceURL
-
-	if refURL.Scheme != "" && refURL.Host != "" {
-		r.HasFullURL = true
-	} else {
-		if refURL.Path != "" {
-			r.HasURLPathOnly = true
-		} else if refURL.RawQuery == "" && refURL.Fragment != "" {
-			r.HasFragmentOnly = true
-		}
-	}
-
-	r.HasFileScheme = refURL.Scheme == "file"
-	r.HasFullFilePath = strings.HasPrefix(refURL.Path, "/")
-
-	// invalid json-pointer error means url has no json-pointer fragment. simply ignore error
-	r.referencePointer, _ = jsonpointer.New(refURL.Fragment)
-
-	return nil
-}
-
-// Inherits creates a new reference from a parent and a child
-// If the child cannot inherit from the parent, an error is returned
-func (r *Ref) Inherits(child Ref) (*Ref, error) {
-	childURL := child.GetURL()
-	parentURL := r.GetURL()
-	if childURL == nil {
-		return nil, errors.New("child url is nil")
-	}
-	if parentURL == nil {
-		return &child, nil
-	}
-
-	ref, err := New(parentURL.ResolveReference(childURL).String())
-	if err != nil {
-		return nil, err
-	}
-	return &ref, nil
-}
diff --git a/vendor/github.com/go-openapi/spec/CODE_OF_CONDUCT.md b/vendor/github.com/go-openapi/spec/CODE_OF_CONDUCT.md
deleted file mode 100644
index 9322b065e3..0000000000
--- a/vendor/github.com/go-openapi/spec/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at ivan+abuse@flanders.co.nz. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/vendor/github.com/go-openapi/spec/LICENSE b/vendor/github.com/go-openapi/spec/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/vendor/github.com/go-openapi/spec/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/go-openapi/spec/README.md b/vendor/github.com/go-openapi/spec/README.md
deleted file mode 100644
index 1d1622082f..0000000000
--- a/vendor/github.com/go-openapi/spec/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# OAI object model [![Build Status](https://travis-ci.org/go-openapi/spec.svg?branch=master)](https://travis-ci.org/go-openapi/spec) [![codecov](https://codecov.io/gh/go-openapi/spec/branch/master/graph/badge.svg)](https://codecov.io/gh/go-openapi/spec) [![Slack Status](https://slackin.goswagger.io/badge.svg)](https://slackin.goswagger.io)
-
-[![license](http://img.shields.io/badge/license-Apache%20v2-orange.svg)](https://raw.githubusercontent.com/go-openapi/spec/master/LICENSE) [![GoDoc](https://godoc.org/github.com/go-openapi/spec?status.svg)](http://godoc.org/github.com/go-openapi/spec)
-
-The object model for OpenAPI specification documents
diff --git a/vendor/github.com/go-openapi/spec/bindata.go b/vendor/github.com/go-openapi/spec/bindata.go
deleted file mode 100644
index 9afb5df194..0000000000
--- a/vendor/github.com/go-openapi/spec/bindata.go
+++ /dev/null
@@ -1,260 +0,0 @@
-// Code generated by go-bindata.
-// sources:
-// schemas/jsonschema-draft-04.json
-// schemas/v2/schema.json
-// DO NOT EDIT!
-
-package spec
-
-import (
-	"bytes"
-	"compress/gzip"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-func bindataRead(data []byte, name string) ([]byte, error) {
-	gz, err := gzip.NewReader(bytes.NewBuffer(data))
-	if err != nil {
-		return nil, fmt.Errorf("Read %q: %v", name, err)
-	}
-
-	var buf bytes.Buffer
-	_, err = io.Copy(&buf, gz)
-	clErr := gz.Close()
-
-	if err != nil {
-		return nil, fmt.Errorf("Read %q: %v", name, err)
-	}
-	if clErr != nil {
-		return nil, err
-	}
-
-	return buf.Bytes(), nil
-}
-
-type asset struct {
-	bytes []byte
-	info  os.FileInfo
-}
-
-type bindataFileInfo struct {
-	name    string
-	size    int64
-	mode    os.FileMode
-	modTime time.Time
-}
-
-func (fi bindataFileInfo) Name() string {
-	return fi.name
-}
-func (fi bindataFileInfo) Size() int64 {
-	return fi.size
-}
-func (fi bindataFileInfo) Mode() os.FileMode {
-	return fi.mode
-}
-func (fi bindataFileInfo) ModTime() time.Time {
-	return fi.modTime
-}
-func (fi bindataFileInfo) IsDir() bool {
-	return false
-}
-func (fi bindataFileInfo) Sys() interface{} {
-	return nil
-}
-
-var _jsonschemaDraft04JSON = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x57\x3b\x6f\xdb\x3e\x10\xdf\xf3\x29\x08\x26\x63\xf2\x97\xff\x40\x27\x6f\x45\xbb\x18\x68\xd1\x0c\xdd\x0c\x0f\xb4\x75\xb2\x19\x50\xa4\x42\x51\x81\x0d\x43\xdf\xbd\xa0\xa8\x07\x29\x91\x92\x2d\xbb\x8d\x97\x28\xbc\xd7\xef\x8e\xf7\xe2\xf9\x01\x21\x84\x30\x8d\xf1\x12\xe1\x83\x52\xd9\x32\x8a\xde\x72\xc1\x5f\xf2\xdd\x01\x52\xf2\x9f\x90\xfb\x28\x96\x24\x51\x2f\x8b\x2f\x91\x39\x7b\xc4\xcf\x46\xe8\xc9\xfc\x3f\x43\x32\x86\x7c\x27\x69\xa6\xa8\xe0\x5a\xfa\x9b\x90\x80\x0c\x0b\x4a\x41\x91\x5a\x45\xc7\x9d\x50\x4e\x35\x73\x8e\x97\xc8\x20\xae\x08\x86\xed\xab\x94\xe4\xe4\x10\x2a\xa2\x3a\x65\xa0\x95\x93\x8a\xfc\xec\x12\x53\xca\x57\x0a\x52\xad\xef\xff\x1e\x89\xd6\xe7\x67\x84\x9f\x24\x24\x5a\xc5\x23\x46\x65\xcb\x54\x76\xfc\x38\x13\x39\x55\xf4\x03\x56\x5c\xc1\x1e\x64\x18\x04\xad\x19\x86\x30\x68\x5a\xa4\x78\x89\x16\x97\xe8\xff\x0e\x09\x29\x98\x5a\x0c\xed\x10\xc6\x7e\x69\xa8\x6b\x07\x76\x64\x45\x2e\xea\x63\x45\xe5\xb3\x66\x8e\x8d\x4e\x0d\x01\x95\x68\xe3\x85\x91\xd3\x34\x63\xf0\xfb\x94\x41\x3e\x34\x0d\xbc\x72\x60\xdd\x46\x1a\xe1\xad\x10\x0c\x08\xd7\x9f\xad\xe3\x08\xf3\x82\x31\xf3\x37\xdd\x9a\x13\xb1\x7d\x83\x9d\xd2\x5f\xb9\x92\x94\xef\x71\xc8\x7e\x45\x9d\x73\xcf\xd6\x65\x36\x7c\x8d\xa9\xf2\xf2\x94\x28\x38\x7d\x2f\xa0\xa1\x2a\x59\x40\x07\xf3\xc1\x02\xdb\xda\x68\x1c\x33\xa7\x99\x14\x19\x48\x45\x7b\xd1\x33\x45\x17\xf0\xa6\x46\xd9\x03\x92\x08\x99\x12\x7d\x57\xb8\x90\x14\x7b\x63\xd5\x15\xe5\xbd\x35\x2b\xaa\x18\x4c\xea\xf5\x8a\xba\xf5\x3e\x4b\x41\x93\xa5\x67\xfb\x38\x2d\x98\xa2\x19\x83\x2a\xf7\x03\x6a\x9b\x74\x0b\x56\x5e\x8f\x02\xc7\x1d\x2b\x72\xfa\x01\x3f\x5b\x16\xf7\xc6\x6d\xfb\xe4\x58\xb3\x8c\x1b\xf7\x0a\x77\x86\xa6\xb4\xb4\xf5\xe4\x92\xbb\xa0\x24\x84\xe5\x01\x84\xad\x13\x37\x21\x9c\xd2\x72\x0b\x42\x72\xfc\x01\x7c\xaf\x0e\xbd\x9e\x3b\xd5\xbc\x1c\x1f\xaf\xd6\xd0\xb6\x52\xb7\xdf\x12\xa5\x40\x4e\xe7\x68\xb0\x78\x24\xec\xe1\xe8\x0f\x26\x89\xe3\x0a\x0a\x61\x4d\x23\xe9\xf7\x70\x7e\x32\x3d\xdc\x39\xd6\xbf\xf3\x30\xd0\xfd\xf6\x55\xb3\x79\x27\x96\xfe\x6d\x82\x37\x73\xf6\x8f\x36\x3a\x03\xa4\x6d\x7d\x1c\x9e\x73\x35\xf6\x18\xbf\x15\x76\x4a\x8e\x2b\xcf\x00\xbf\x2a\x99\xae\x55\xe0\xcf\x25\x77\x68\xfc\x95\xba\x79\x75\x06\xcb\x5c\x77\x67\x69\xf1\xfb\x2c\xe1\xbd\xa0\x12\xe2\x31\x45\xf6\x30\x0f\x14\xc8\xab\x7f\x60\x4e\x27\xe0\x3f\xaf\x92\xd0\x6a\x8a\x82\xdb\xc0\xa4\xbb\x63\x65\x34\x0d\x28\xb0\x6b\x7c\x1e\x1e\xd3\x51\xc7\x6e\xf4\x33\x60\xc5\x90\x01\x8f\x81\xef\xee\x88\x68\x90\x69\x23\xb9\x8a\x2e\x69\x98\x7d\xa6\x91\x32\x1a\xc8\x6e\x9c\x13\x7f\x10\xea\xcd\xfd\x4e\xef\xa6\xb1\x25\xd9\xde\x22\x8d\xfa\x59\x63\xc5\x0d\x80\xf5\x28\xf1\xd6\xb9\x37\x9e\xa3\xee\xb5\x4c\xbe\x37\xe0\x55\xc6\x27\x82\x75\x49\xd0\xda\xe0\xb9\x1d\xca\xbf\x5b\xd4\xcf\xbf\x0b\x47\xac\x2d\x59\x07\xfe\x7a\x49\xc1\x61\xa6\x24\x17\x2a\xf0\xbe\x2e\xdb\x17\x7f\xa0\x3c\x7d\x4b\xf3\xba\xdb\xc3\xed\x06\xee\xdb\x5e\xd7\xdd\x42\x5c\x47\xb2\xb3\x68\x75\x8c\xf2\xe1\x4f\x00\x00\x00\xff\xff\x4e\x9b\x8d\xdf\x17\x11\x00\x00")
-
-func jsonschemaDraft04JSONBytes() ([]byte, error) {
-	return bindataRead(
-		_jsonschemaDraft04JSON,
-		"jsonschema-draft-04.json",
-	)
-}
-
-func jsonschemaDraft04JSON() (*asset, error) {
-	bytes, err := jsonschemaDraft04JSONBytes()
-	if err != nil {
-		return nil, err
-	}
-
-	info := bindataFileInfo{name: "jsonschema-draft-04.json", size: 4375, mode: os.FileMode(420), modTime: time.Unix(1482389892, 0)}
-	a := &asset{bytes: bytes, info: info}
-	return a, nil
-}
-
-var _v2SchemaJSON = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xec\x5d\x4f\x93\xdb\x36\xb2\xbf\xfb\x53\xa0\x14\x57\xd9\xae\xd8\x92\xe3\xf7\x2e\xcf\x97\xd4\xbc\xd8\x49\x66\x37\x5e\x4f\x79\x26\xbb\x87\x78\x5c\x05\x91\x2d\x09\x09\x09\x30\x00\x38\x33\x5a\xef\x7c\xf7\x2d\xf0\x9f\x08\x02\x20\x41\x8a\xd2\xc8\x0e\x0f\xa9\x78\x28\xa0\xd1\xdd\x68\x34\x7e\xdd\xf8\xf7\xf9\x11\x42\x33\x49\x64\x04\xb3\xd7\x68\x76\x86\xfe\x76\xf9\xfe\x1f\xe8\x32\xd8\x40\x8c\xd1\x8a\x71\x74\x79\x8b\xd7\x6b\xe0\xe8\xd5\xfc\x25\x3a\xbb\x38\x9f\xcf\x9e\xab\x0a\x24\x54\xa5\x37\x52\x26\xaf\x17\x0b\x91\x17\x99\x13\xb6\xb8\x79\xb5\x10\x59\xdd\xf9\xef\x82\xd1\x6f\xf2\xc2\x8f\xf3\x4f\xb5\x1a\xea\xc7\x17\x45\x41\xc6\xd7\x8b\x90\xe3\x95\x7c\xf1\xf2\x7f\x8b\xca\x45\x3d\xb9\x4d\x32\xa6\xd8\xf2\x77\x08\x64\xfe\x8d\xc3\x9f\x29\xe1\xa0\x9a\xff\xed\x11\x42\x08\xcd\x8a\xd6\xb3\x9f\x15\x67\x74\xc5\xca\x7f\x27\x58\x6e\xc4\xec\x11\x42\xd7\x59\x5d\x1c\x86\x44\x12\x46\x71\x74\xc1\x59\x02\x5c\x12\x10\xb3\xd7\x68\x85\x23\x01\x59\x81\x04\x4b\x09\x9c\x6a\xbf\x7e\xce\x49\x7d\xba\x7b\x51\xfd\xa1\x44\xe2\xb0\x52\xac\x7d\xb3\x08\x61\x45\x68\x46\x56\x2c\x6e\x80\x86\x8c\xbf\xbd\x93\x40\x05\x61\x74\x96\x95\xbe\x7f\x84\xd0\x7d\x4e\xde\x42\xb7\xe4\xbe\x46\xbb\x14\x5b\x48\x4e\xe8\xba\x90\x05\xa1\x19\xd0\x34\xae\xc4\xce\xbe\xbc\x9a\xbf\x9c\x15\x7f\x5d\x57\xc5\x42\x10\x01\x27\x89\xe2\x48\x51\xb9\xda\x40\xd5\x87\x37\xc0\x15\x5f\x88\xad\x90\xdc\x10\x81\x42\x16\xa4\x31\x50\x39\x2f\x38\xad\xab\xb0\x53\xd8\xac\x94\x56\x6f\xc3\x84\xf4\x11\xa4\x50\xb3\xfa\xe9\xd3\x6f\x9f\x3e\xdf\x2f\xd0\xeb\x8f\x1f\x3f\x7e\xbc\xfe\xf6\xe9\xf7\xaf\x5f\x7f\xfc\x18\x7e\xfb\xec\xfb\xc7\xb3\x36\x79\x54\x43\xe8\x29\xc5\x31\x20\xc6\x11\x49\x9e\xe5\x12\x41\x66\xa0\xe8\xed\x1d\x8e\x93\x08\x5e\xa3\x27\x3b\xc3\x7c\xa2\x73\xba\xc4\x02\x2e\xb0\xdc\xf4\xe5\x76\xd1\xca\x96\xa2\x8a\x94\xcd\x21\xc9\x6c\xec\x2c\x70\x42\x9e\x34\x74\x9d\x19\x7c\xcd\x20\x9c\xea\x2e\x0a\xfe\x42\x84\xd4\x29\x04\x8c\x8a\xb4\x41\xa2\xc1\xdc\x19\x8a\x88\x90\x4a\x49\xef\xce\xdf\xbd\x45\x4a\x52\x81\x70\x10\x40\x22\x21\x44\xcb\x6d\xc5\xec\x4e\x3c\x1c\x45\xef\x57\x9a\xb5\x7d\xae\xfe\xe5\xe4\x31\x86\x90\xe0\xab\x6d\x02\x3b\x2e\xcb\x11\x90\xd9\xa8\xc6\x77\xc2\x59\x98\x06\xfd\xf9\x2e\x78\x45\x01\xa6\xa8\xa0\x71\x5c\xbe\x33\xa7\xd2\xd9\x5f\x95\xef\xd9\xd5\xac\xfd\xdc\x5d\xbf\x5e\xb8\xd1\x3e\xc7\x31\x48\xe0\x5e\x4c\x14\x65\xdf\xb8\xa8\x71\x10\x09\xa3\xc2\xc7\x02\xcb\xa2\x4e\x5a\x02\x82\x94\x13\xb9\xf5\x30\xe6\xb2\xa4\xb5\xfe\x9b\x3e\x7a\xb2\x55\xd2\xa8\x4a\xbc\x16\xb6\x71\x8e\x39\xc7\xdb\x9d\xe1\x10\x09\x71\xbd\x9c\xb3\x41\x89\xd7\xa5\x89\xdc\x57\xb5\x53\x4a\xfe\x4c\xe1\xbc\xa0\x21\x79\x0a\x1a\x0f\x70\xa7\x5c\x08\x8e\xde\xb0\xc0\x43\x24\xad\x74\x63\x0e\xb1\xd9\x90\xe1\xb0\x2d\x13\xa7\x6d\x78\xfd\x04\x14\x38\x8e\x90\xaa\xce\x63\xac\x3e\x23\xbc\x64\xa9\xb4\xf8\x03\x63\xde\xcd\xbe\x16\x13\x4a\x55\xac\x82\x12\xc6\xac\xd4\x35\xf7\x22\xd4\x3a\xff\x22\x73\x0e\x6e\x51\xa0\x75\x1e\xae\x8f\xe8\x5d\xc7\x59\xe6\xe4\x9a\x18\x8d\xd6\x1c\x53\x84\x4d\xb7\x67\x28\x37\x09\x84\x69\x88\x12\x0e\x01\x11\x80\x32\xa2\xf5\xb9\xaa\xc6\xd9\x73\x53\xab\xfb\xb4\x2e\x20\xc6\x54\x92\xa0\x9a\xf3\x69\x1a\x2f\x81\x77\x37\xae\x53\x1a\xce\x40\xc4\xa8\x82\x1c\xb5\xef\xda\x24\x7d\xb9\x61\x69\x14\xa2\x25\xa0\x90\xac\x56\xc0\x81\x4a\xb4\xe2\x2c\xce\x4a\x64\x7a\x9a\x23\xf4\x13\x91\x3f\xa7\x4b\xf4\x63\x84\x6f\x18\x87\x10\xbd\xc3\xfc\x8f\x90\xdd\x52\x44\x04\xc2\x51\xc4\x6e\x21\x74\x48\x21\x81\xc7\xe2\xfd\xea\x12\xf8\x0d\x09\xf6\xe9\x47\x35\xaf\x67\xc4\x14\xf7\x22\x27\x97\xe1\xe2\x76\x2d\x06\x8c\x4a\x1c\x48\x3f\x73\x2d\x0b\x5b\x29\x45\x24\x00\x2a\x0c\x11\xec\x94\xca\xc2\xa6\xc1\x37\x21\x43\x83\x3b\x5f\x97\xf1\x43\x5e\x53\x73\x19\xa5\x36\xd8\x2d\x05\x2e\x34\x0b\xeb\x39\xfc\x1d\x63\x51\x01\xbd\x3d\xbb\x90\x84\x40\x25\x59\x6d\x09\x5d\xa3\x1c\x37\xe6\x5c\x16\x9a\x40\x09\x70\xc1\xe8\x82\xf1\x35\xa6\xe4\xdf\x99\x5c\x8e\x9e\x4d\x79\xb4\x27\x2f\xbf\x7e\xf8\x05\x25\x8c\x50\xa9\x98\x29\x90\x62\x60\xea\x75\xae\x13\xca\xbf\x2b\x1a\x29\x27\x76\xd6\x20\xc6\x64\x5f\xe6\x32\x1a\x08\x87\x21\x07\x21\xbc\xb4\xe4\xe0\x32\x67\xa6\xcd\xf3\x1e\xcd\xd9\x6b\xb6\x6f\x8e\x27\xa7\xed\xdb\xe7\xbc\xcc\x1a\x07\xce\x6f\x87\x33\xf0\xba\x51\x17\x22\x66\x78\x79\x8e\xce\xe5\x13\x81\x80\x06\x2c\xe5\x78\x0d\xa1\xb2\xb8\x54\xa8\x79\x09\xbd\xbf\x3c\x47\x01\x8b\x13\x2c\xc9\x32\xaa\xaa\x1d\xd5\xee\xab\x36\xbd\x6c\xfd\x54\x6c\xc8\x08\x01\x3c\xbd\xe7\x07\x88\xb0\x24\x37\x79\x90\x28\x4a\x1d\x10\x1a\x92\x1b\x12\xa6\x38\x42\x40\xc3\x4c\x43\x62\x8e\xae\x36\xb0\x45\x71\x2a\xa4\x9a\x23\x79\x59\xb1\xa8\xf2\xa4\x0c\x60\x9f\xcc\x8d\x40\xf5\x80\xca\xa8\x99\xc3\xa7\x85\x1f\x31\x25\xa9\x82\xc5\x6d\xbd\xd8\x36\x76\x7c\x02\x28\x97\xf6\x1d\x74\x3b\x11\x7e\x91\xae\x32\xf8\x6c\xf4\xe6\x7b\x9a\xa5\x1f\x62\xc6\x21\xcf\x9a\xe5\xed\x8b\x02\xf3\x2c\x33\x33\xdf\x00\xca\xc9\x09\xb4\x04\xf5\xa5\x08\xd7\xc3\x02\x18\x66\xf1\xab\x1e\x83\x37\x4c\xcd\x12\xc1\x1d\x50\xf6\xaa\xbd\xfe\xe2\x73\x48\x38\x08\xa0\x32\x9b\x18\x44\x86\x0b\x6a\xc1\xaa\x26\x96\x2d\x96\x3c\xa0\x54\x65\x73\x87\x15\xca\x15\xe5\xf5\x94\x46\x9f\x33\x1a\x0c\x9a\xb1\x5a\xd9\x6a\x95\xcd\xcb\x7e\xec\x9a\xc5\x94\x3b\x37\x26\x31\xd7\xfc\xe4\x1f\x13\x8c\x31\x75\x9c\xba\xf7\x87\x3c\xa1\xb7\x4f\x17\x1b\x09\x82\x98\xc4\x70\x95\xd3\xe8\x4c\x48\x5a\xa6\xd6\x2a\x3d\x56\x42\x80\x9f\xaf\xae\x2e\x50\x0c\x42\xe0\x35\x34\x3c\x8a\x62\x03\x37\xba\xb2\x27\x04\xda\x25\x8d\x06\xe2\xa0\x13\x8a\xf3\xf5\xec\x10\x72\x67\x88\x90\x3d\x4b\x64\xeb\xaa\xda\x8f\xf7\x5a\x75\x47\x9a\xa8\x51\x70\x26\xd2\x38\xc6\x7c\xbb\x57\xfc\xbd\xe4\x04\x56\xa8\xa0\x54\x9a\x45\xd5\xf7\x0f\x16\xfc\x57\x1c\x3c\xdf\x23\xba\x77\x38\xda\x16\x4b\x31\x53\x6a\x4d\x9a\x15\x63\xe7\xe1\x18\x69\x9f\x22\xe0\x24\xbb\x94\x4b\x97\xee\x2d\xf9\x70\x87\x72\x7b\xe6\xc4\x33\x2a\x66\x5e\x1c\x35\x72\xe3\x2d\xda\x73\xe4\xc7\x51\x6d\xa4\xa1\x2a\x4f\xde\x94\xcb\xb2\x3e\x31\x48\xae\x82\xce\xc9\xc8\x65\xcd\xc3\xb7\x34\xb6\x2b\xdf\x58\x65\x78\x6e\x73\xac\x5e\x24\x0d\x3f\xdc\x70\x23\xc6\xda\x52\x0b\x2d\x63\x7d\xa9\x49\x2d\x54\x48\x28\xc0\x12\x9c\xe3\x63\xc9\x58\x04\x98\x36\x07\xc8\x0a\xa7\x91\xd4\xf0\xbc\xc1\xa8\xb9\x70\xd0\xc6\xa9\xb6\x78\x80\x5a\xa3\xb4\x2c\xf4\x18\x0b\x8a\x9d\xd0\xb4\x55\x10\xee\x0d\xc5\xd6\xe0\x99\x93\xdc\xa1\x04\xbb\xf1\xa7\x23\xd1\xd1\x97\x8c\x87\x13\x0a\x21\x02\xe9\x99\x25\xed\x20\xc5\x92\x66\x3c\x32\x9c\xd6\x06\xb0\x31\x5c\x86\x29\x0a\xcb\x60\x33\x12\xa5\x91\xfc\x96\x75\xd0\x59\xd7\x13\xbd\xd3\x23\x79\xdd\x2a\x90\xa6\x38\x06\x91\x39\x7f\x20\x72\x03\x1c\x2d\x01\x61\xba\x45\x37\x38\x22\x61\x8e\x71\x85\xc4\x32\x15\x28\x60\x61\x16\xb8\x3d\x29\xdc\x4d\x3d\x2f\x12\x13\x7d\xc8\x7e\x37\xee\xa8\x7f\xfa\xdb\xcb\x17\xff\x77\xfd\xf9\x7f\xee\x9f\x3d\xfe\xcf\xa7\xa7\x45\xfb\xcf\x1e\xf7\xf3\xe0\xff\xc4\x51\x0a\x8e\x4c\xcb\x01\xdc\x0a\x65\xb2\x01\x83\xed\x3d\xe4\xa9\xa3\x4e\x2d\x59\xc5\xe8\x2f\x48\x7d\x5a\x6e\x37\xbf\x5c\x9f\x35\x13\x64\x14\xfa\xef\x0b\x68\xa6\x0d\xb4\x8e\xf1\xa8\xff\xbb\x60\xf4\x03\x64\xab\x5b\x81\x65\x51\xe6\xda\xca\xfa\xf0\xb0\xac\x3e\x9c\xca\x26\x0e\x1d\xdb\x57\x5b\xbb\xb4\x9a\xa6\xb6\x9b\x1a\x6b\xd1\x9a\x9e\x7e\x33\x9a\xec\x41\x69\x45\x22\xb8\xb4\x51\xeb\x04\x77\xca\x6f\x7b\x7b\xc8\xb2\xb0\x95\x92\x25\x5b\xd0\x42\xaa\x2a\xdd\x32\x78\x4f\x0c\xab\x68\x46\x6c\xea\x6d\xf4\x5c\x5e\xde\xc4\xac\xa5\xf9\xd1\x00\x9f\x7d\x98\x65\x24\xbd\xc7\x97\xd4\xb3\x3a\xa8\x2b\xa0\x34\x76\xf9\x65\x5f\x2d\x25\x95\x1b\xcf\xd6\xf4\x9b\x5f\x09\x95\xb0\x36\x3f\xdb\xd0\x39\x2a\x93\x1c\x9d\x03\xa2\x4a\xca\xf5\xf6\x10\xb6\x94\x89\x0b\x6a\x70\x12\x13\x49\x6e\x40\xe4\x29\x12\x2b\xbd\x80\x45\x11\x04\xaa\xc2\x8f\x56\x9e\x5c\x6b\xec\x8d\x5a\x0e\x14\x59\x06\x2b\x1e\x24\xcb\xc2\x56\x4a\x31\xbe\x23\x71\x1a\xfb\x51\x2a\x0b\x3b\x1c\x48\x10\xa5\x82\xdc\xc0\xbb\x3e\x24\x8d\x5a\x76\x2e\x09\xed\xc1\x65\x51\xb8\x83\xcb\x3e\x24\x8d\x5a\x2e\x5d\xfe\x02\x74\x2d\x3d\xf1\xef\xae\xb8\x4b\xe6\x5e\xd4\xaa\xe2\x2e\x5c\x5e\xec\x0e\xf5\x5b\x0c\xcb\x0a\xbb\xa4\x3c\xf7\x1f\x2a\x55\x69\x97\x8c\x7d\x68\x95\xa5\xad\xb4\xf4\x9c\xa5\x07\xb9\x7a\x05\xbb\xad\x50\x6f\xfb\xa0\x4e\x9b\x48\x23\x49\x92\x28\x87\x19\x3e\x32\xee\xca\x3b\x46\x7e\x7f\x18\x64\xcc\xcc\x0f\x34\xe9\x36\x8b\xb7\x6c\xa8\xa5\x5b\x54\x4c\x54\x5b\x15\x3a\xf1\x6c\x2d\xfe\x96\xc8\x0d\xba\x7b\x81\x88\xc8\x23\xab\xee\x7d\x3b\x92\xa7\x60\x29\xe3\xdc\xff\xb8\x64\xe1\xf6\xa2\x5a\x59\xdc\x6f\xeb\x45\x7d\x6a\xd1\x76\x1e\xea\xb8\xf1\xfa\x14\xd3\x36\x63\xe5\xd7\xf3\xe4\xbe\x25\xbd\x5e\x05\xeb\x73\x74\xb5\x21\x2a\x2e\x4e\xa3\x30\xdf\xbf\x43\x28\x2a\xd1\xa5\x2a\x9d\x8a\xfd\x76\xd8\x8d\xbc\x67\x65\xc7\xb8\x03\x45\xec\xa3\xb0\x37\x8a\x70\x4c\x68\x91\x51\x8e\x58\x80\xed\x4a\xf3\x81\x62\xca\x96\xbb\xf1\x52\xcd\x80\xfb\xe4\x4a\x5d\x6c\xdf\x6e\x20\x4b\x80\x30\x8e\x28\x93\xf9\xe9\x8d\x8a\x6d\xd5\x59\x65\x7b\xaa\x44\x9e\xc0\xc2\xd1\x7c\x40\x26\xd6\x1a\xce\xf9\xc5\x69\x7b\x6c\xec\xc8\x71\x7b\xe5\x21\x2e\xd3\xe5\x65\x93\x91\x53\x0b\x7b\x3a\xc7\xfa\x17\x6a\x01\xa7\x33\xd0\xf4\x40\x0f\x39\x87\xda\xe4\x54\x87\x3a\xd5\xe3\xc7\xa6\x8e\x20\xd4\x11\xb2\x4e\xb1\xe9\x14\x9b\x4e\xb1\xe9\x14\x9b\xfe\x15\x63\xd3\x47\xf5\xff\x97\x38\xe9\xcf\x14\xf8\x76\x82\x49\x13\x4c\xaa\x7d\xcd\x6c\x62\x42\x49\x87\x43\x49\x19\x33\x6f\xe3\x44\x6e\x9b\xab\x8a\x3e\x86\xaa\x99\x52\x1b\x5b\x59\x33\x02\x09\xa0\x21\xa1\x6b\x84\x6b\x66\xbb\xdc\x16\x0c\xd3\x68\xab\xec\x36\x4b\xd8\x60\x8a\x40\x31\x85\x6e\x14\x57\x13\xc2\xfb\x92\x10\xde\xbf\x88\xdc\xbc\x53\x5e\x7f\x82\x7a\x13\xd4\x9b\xa0\xde\x04\xf5\x90\x01\xf5\x94\xcb\x7b\x83\x25\x9e\xd0\xde\x84\xf6\x6a\x5f\x4b\xb3\x98\x00\xdf\x04\xf8\x6c\xbc\x7f\x19\x80\xaf\xf1\x71\x45\x22\x98\x40\xe0\x04\x02\x27\x10\xd8\x29\xf5\x04\x02\xff\x4a\x20\x30\xc1\x72\xf3\x65\x02\x40\xd7\xc1\xd1\xe2\x6b\xf1\xa9\x7b\xfb\xe4\x20\xc0\x68\x9d\xd4\xb4\xd3\x96\xb5\xa6\xd1\x41\x20\xe6\x89\xc3\x48\x65\x58\x13\x84\x9c\x56\x56\x3b\x0c\xe0\x6b\x83\x5c\x13\xd2\x9a\x90\xd6\x84\xb4\x26\xa4\x85\x0c\xa4\x45\x19\xfd\xff\x63\x6c\x52\xb5\x1f\x1e\x19\x74\x3a\xcd\xb9\x69\xce\xa6\x3a\x0f\x7a\x2d\x19\xc7\x81\x14\x5d\xcb\xd5\x03\xc9\x39\xd0\xb0\xd1\xb3\xcd\xfb\x7a\x2d\x5d\x3a\x48\xe1\xfa\x2e\xe6\x81\x42\x18\x86\xd6\xc1\xbe\xb1\x23\xd3\xf7\x34\xed\x19\x0a\x0b\xc4\x48\x44\xfd\x22\x50\xb6\x42\x58\xbb\xe5\x3d\xa7\x73\xd4\x8b\xc4\x8c\x70\x61\xec\x73\xee\xc3\x81\x8b\xf5\xe2\xd7\x52\x3e\xcf\xeb\xeb\x17\x3b\x71\x16\xda\x7d\xb8\xde\xf0\x7a\x8f\x06\x2d\xa7\x40\x7b\xc1\x9d\x41\x4d\xb6\x61\xa2\x4e\x9f\x3d\xa0\xc5\xae\xe3\x1c\x1d\x40\x6c\x48\x8b\x63\xa0\xb5\x01\xed\x8e\x02\xe9\x86\xc8\x3b\x06\xee\xdb\x4b\xde\xbd\xc0\xa1\x6f\xcb\xda\xfc\xc2\x44\x16\x87\x9c\x17\x31\xd3\x30\x20\x39\x42\xcb\x6f\xf2\xf1\xf4\x72\x10\xf8\x1c\xa0\xf3\xbd\x10\xea\x21\x35\x7d\xe8\x86\xdb\x15\xed\x81\x81\x07\x28\xbb\x13\x28\xc7\xf8\xce\x7d\x8d\xc2\x31\xb4\x7e\x94\xd6\xdb\x55\xef\x4a\xfb\xed\xc3\x40\x3e\xeb\x9f\xe9\x99\x0f\xdf\x08\x65\x88\x27\x73\x86\x31\x9d\x47\xdf\x55\x19\xba\x3d\xee\x15\x0a\xcd\x8c\xaa\x5e\xb9\xf6\x57\x33\x73\x5a\xa1\x89\x7b\x3b\xa0\xb2\xa4\xc2\xf6\xc1\x53\xb5\x00\xca\x23\xe5\xf4\x60\x6a\xb4\x2d\x74\xea\x4e\xed\x3b\xe3\x47\xfb\xed\x82\x3d\x19\xd4\x3b\x6b\xaf\xae\x2b\x2f\x57\xb3\x82\x68\xcb\xed\x88\x2e\xe1\x5c\xd7\x26\xfa\x0a\x65\xe7\xce\x11\x33\xb4\xdd\x66\xe3\x37\xf6\xfa\x70\xd6\x4f\xa1\x21\x51\xd8\x3c\x26\x14\x4b\xc6\x87\x44\x27\x1c\x70\xf8\x9e\x46\xce\xab\x21\x07\x5f\xc1\x76\x17\x1b\x77\xb4\xda\x75\xa0\x0a\x3a\x30\xe1\xf8\x97\x32\x16\x2b\x00\x75\x85\xee\x62\x46\xef\xd3\x85\xb5\x6b\x60\xbe\xf2\x30\x7a\x8c\x0b\x4b\xa6\xd0\xf9\x64\x42\xe7\x07\x41\x41\xe3\x2c\x5d\xf9\x6d\xe9\x39\x98\x3b\x3b\x5d\x67\xd4\x5c\xed\xf2\xf0\x48\x7b\xbd\x2d\x31\xdd\x3f\x34\xad\x44\x76\x51\x9a\x56\x22\xa7\x95\xc8\x69\x25\xf2\xe1\x56\x22\x1f\x00\x32\x6a\x73\x92\xed\xe1\xc6\x7d\x9f\x49\x2c\x69\x7e\xc8\x31\x4c\x0c\xb4\xf2\x54\x3b\x79\x3b\x9e\x4d\xb4\xd1\x18\x3e\x5f\x9a\x93\xa2\x11\xc3\xda\x27\x0b\xaf\x37\x2e\x5c\x37\xfb\xeb\x9a\xd6\xc3\xac\xc3\xcc\xf8\x1e\x5b\x9d\xac\x22\x64\xb7\xed\x26\xb8\xf3\xb9\x3c\xbb\x1f\xe2\xb0\x22\x77\x43\x6a\x62\x29\x39\x59\xa6\xe6\xe5\xcd\x7b\x83\xc0\x5b\x8e\x93\x64\xac\xeb\xca\x4f\x65\xac\x4a\xbc\x1e\xcd\x82\xfa\x3c\x70\x36\xb6\xb5\xed\x79\xef\xec\x68\x00\xff\x54\xfa\xb5\xe3\xf1\xdb\xe1\xbe\xce\x76\x17\xaf\x57\xb6\x6b\x89\x05\x09\xce\x52\xb9\x01\x2a\x49\xbe\xd9\xf4\xd2\xb8\x7a\xbf\x91\x02\xf3\x22\x8c\x13\xf2\x77\xd8\x8e\x43\x8b\xe1\x54\x6e\x5e\x9d\xc7\x49\x44\x02\x22\xc7\xa4\x79\x81\x85\xb8\x65\x3c\x1c\x93\xe6\x59\xa2\xf8\x1c\x51\x95\x05\xd9\x20\x00\x21\x7e\x60\x21\x58\xa9\x56\xff\xbe\xb6\x5a\x5e\x5b\x3f\x1f\xd6\xd3\x3c\xc4\x4d\xba\x99\xb4\x63\x6e\x7d\x3e\x3d\x57\xd2\x18\x5f\x47\xe8\xc3\x06\x8a\x68\x6c\x7f\x3b\x72\x0f\xe7\xe2\x77\x77\xf1\xd0\x99\xab\xdf\x2e\xfe\xd6\xbb\xcd\x1a\xb9\x90\xd1\xaf\xf2\x38\x3d\xdb\x74\xf8\xeb\xe3\xda\xe8\x2a\x62\xb7\xda\x1b\x07\xa9\xdc\x30\x5e\xbc\x68\xfb\x6b\x9f\x97\xf1\xc6\xb1\xd8\x5c\x29\x1e\x49\x30\xc5\xf7\xde\xad\x91\x42\xf9\xdd\xed\x89\x80\x25\xbe\x37\xd7\xe7\x32\x5c\xe6\x35\xac\xd4\x0c\x2d\xf7\x90\xc4\xe3\xf5\xe3\x2f\x7f\x54\x18\x88\xe3\x61\x47\x85\x64\x7f\xc0\xd7\x3f\x1a\x92\x42\xe9\xc7\x1e\x0d\x95\x76\xa7\x51\xa0\x8f\x02\x1b\x46\x9e\x06\x42\xd1\xf2\x01\x07\x02\xde\xe9\x7d\x1a\x0b\xa7\x32\x16\xcc\xc0\xee\xc4\x90\xd2\x5f\x6f\x98\x54\x5d\xf2\x95\xe1\xa7\x69\x10\x3a\x06\xe1\x65\xb3\x17\x47\x58\x78\xd0\x45\xd6\x5b\xd5\x5f\x25\x1d\x71\x49\xa6\x7a\x64\xda\xd0\x6f\xc7\x3a\x4c\xe3\x09\xc0\x6e\x96\x2c\xa7\xa7\x77\x34\x10\x05\x08\x21\x44\x92\x65\x77\xdf\x20\x5c\xbc\xe7\x97\x3f\xf4\x1a\x45\xd6\xe7\x27\x4a\xde\x74\x27\x66\x11\x7d\x70\xba\xd3\x78\xf9\x1e\x0d\xca\xc8\x39\xde\x7c\xb3\xa6\xe1\xbc\xd7\xc1\x6a\x6f\xb3\x0e\x52\xbe\xe4\x98\x8a\x15\x70\x94\x70\x26\x59\xc0\xa2\xf2\x1c\xfb\xd9\xc5\xf9\xbc\xd5\x92\x9c\xa3\xdf\xe6\x1e\xb3\x0d\x49\xba\x87\x50\x5f\x84\xfe\xe9\xd6\xf8\xbb\xe6\xf0\x7a\xeb\xa6\x65\x3b\x86\x8b\x79\x93\xf5\x59\x20\x6e\xb4\xa7\x44\xf4\x3f\xa5\xfe\x67\x42\x12\xdb\xd3\xe7\xbb\xa5\xa3\x8c\x5c\x2b\x97\xbb\xbb\x7f\x8e\xc5\x6e\xed\x43\x5c\xbf\x74\xc8\x8f\xff\xe6\xd6\xbe\x91\xb6\xf5\x95\xe4\xed\x93\xc4\xa8\x5b\xf9\x76\x4d\x35\xb7\xd8\x8c\xb6\x7d\xaf\x72\xe0\xb6\xbd\x01\x63\x9e\x76\xab\x1a\x32\x76\xe4\x8c\x76\xc2\xad\x6c\xa2\x65\xf7\xcf\xf8\xa7\xda\x2a\xb9\x8c\x3d\x3c\xa3\x9d\x64\x33\xe5\x1a\xb5\x2d\xfb\x86\xa2\x5a\x7f\x19\x5b\x7f\xc6\x3f\xd1\x53\xd3\xe2\x41\x5b\xd3\x4f\xf0\xec\xb0\x42\x73\x43\xd2\x68\x27\xd3\x6a\x6a\x34\xf6\x4e\x1e\x52\x8b\x87\x6c\xcc\xae\x44\xfb\x9e\xa7\x51\x4f\x9d\x55\x03\x81\x8e\x67\xfc\xb4\x69\xf0\x3a\x18\xf2\x40\xd0\xf6\xa8\x34\xe3\xc9\x98\xaf\xf6\xda\x24\xd3\xeb\x60\xb9\x0e\xd3\x1f\xa9\xff\xee\x1f\xfd\x37\x00\x00\xff\xff\x69\x5d\x0a\x6a\x39\x9d\x00\x00")
-
-func v2SchemaJSONBytes() ([]byte, error) {
-	return bindataRead(
-		_v2SchemaJSON,
-		"v2/schema.json",
-	)
-}
-
-func v2SchemaJSON() (*asset, error) {
-	bytes, err := v2SchemaJSONBytes()
-	if err != nil {
-		return nil, err
-	}
-
-	info := bindataFileInfo{name: "v2/schema.json", size: 40249, mode: os.FileMode(420), modTime: time.Unix(1482389892, 0)}
-	a := &asset{bytes: bytes, info: info}
-	return a, nil
-}
-
-// Asset loads and returns the asset for the given name.
-// It returns an error if the asset could not be found or
-// could not be loaded.
-func Asset(name string) ([]byte, error) {
-	cannonicalName := strings.Replace(name, "\\", "/", -1)
-	if f, ok := _bindata[cannonicalName]; ok {
-		a, err := f()
-		if err != nil {
-			return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
-		}
-		return a.bytes, nil
-	}
-	return nil, fmt.Errorf("Asset %s not found", name)
-}
-
-// MustAsset is like Asset but panics when Asset would return an error.
-// It simplifies safe initialization of global variables.
-func MustAsset(name string) []byte {
-	a, err := Asset(name)
-	if err != nil {
-		panic("asset: Asset(" + name + "): " + err.Error())
-	}
-
-	return a
-}
-
-// AssetInfo loads and returns the asset info for the given name.
-// It returns an error if the asset could not be found or
-// could not be loaded.
-func AssetInfo(name string) (os.FileInfo, error) {
-	cannonicalName := strings.Replace(name, "\\", "/", -1)
-	if f, ok := _bindata[cannonicalName]; ok {
-		a, err := f()
-		if err != nil {
-			return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
-		}
-		return a.info, nil
-	}
-	return nil, fmt.Errorf("AssetInfo %s not found", name)
-}
-
-// AssetNames returns the names of the assets.
-func AssetNames() []string {
-	names := make([]string, 0, len(_bindata))
-	for name := range _bindata {
-		names = append(names, name)
-	}
-	return names
-}
-
-// _bindata is a table, holding each asset generator, mapped to its name.
-var _bindata = map[string]func() (*asset, error){
-	"jsonschema-draft-04.json": jsonschemaDraft04JSON,
-	"v2/schema.json": v2SchemaJSON,
-}
-
-// AssetDir returns the file names below a certain
-// directory embedded in the file by go-bindata.
-// For example if you run go-bindata on data/... and data contains the
-// following hierarchy:
-//     data/
-//       foo.txt
-//       img/
-//         a.png
-//         b.png
-// then AssetDir("data") would return []string{"foo.txt", "img"}
-// AssetDir("data/img") would return []string{"a.png", "b.png"}
-// AssetDir("foo.txt") and AssetDir("notexist") would return an error
-// AssetDir("") will return []string{"data"}.
-func AssetDir(name string) ([]string, error) {
-	node := _bintree
-	if len(name) != 0 {
-		cannonicalName := strings.Replace(name, "\\", "/", -1)
-		pathList := strings.Split(cannonicalName, "/")
-		for _, p := range pathList {
-			node = node.Children[p]
-			if node == nil {
-				return nil, fmt.Errorf("Asset %s not found", name)
-			}
-		}
-	}
-	if node.Func != nil {
-		return nil, fmt.Errorf("Asset %s not found", name)
-	}
-	rv := make([]string, 0, len(node.Children))
-	for childName := range node.Children {
-		rv = append(rv, childName)
-	}
-	return rv, nil
-}
-
-type bintree struct {
-	Func     func() (*asset, error)
-	Children map[string]*bintree
-}
-var _bintree = &bintree{nil, map[string]*bintree{
-	"jsonschema-draft-04.json": &bintree{jsonschemaDraft04JSON, map[string]*bintree{}},
-	"v2": &bintree{nil, map[string]*bintree{
-		"schema.json": &bintree{v2SchemaJSON, map[string]*bintree{}},
-	}},
-}}
-
-// RestoreAsset restores an asset under the given directory
-func RestoreAsset(dir, name string) error {
-	data, err := Asset(name)
-	if err != nil {
-		return err
-	}
-	info, err := AssetInfo(name)
-	if err != nil {
-		return err
-	}
-	err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
-	if err != nil {
-		return err
-	}
-	err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
-	if err != nil {
-		return err
-	}
-	err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// RestoreAssets restores an asset under the given directory recursively
-func RestoreAssets(dir, name string) error {
-	children, err := AssetDir(name)
-	// File
-	if err != nil {
-		return RestoreAsset(dir, name)
-	}
-	// Dir
-	for _, child := range children {
-		err = RestoreAssets(dir, filepath.Join(name, child))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func _filePath(dir, name string) string {
-	cannonicalName := strings.Replace(name, "\\", "/", -1)
-	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
-}
-
diff --git a/vendor/github.com/go-openapi/spec/contact_info.go b/vendor/github.com/go-openapi/spec/contact_info.go
deleted file mode 100644
index f285970aa1..0000000000
--- a/vendor/github.com/go-openapi/spec/contact_info.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-// ContactInfo contact information for the exposed API.
-//
-// For more information: http://goo.gl/8us55a#contactObject
-type ContactInfo struct {
-	Name  string `json:"name,omitempty"`
-	URL   string `json:"url,omitempty"`
-	Email string `json:"email,omitempty"`
-}
diff --git a/vendor/github.com/go-openapi/spec/expander.go b/vendor/github.com/go-openapi/spec/expander.go
deleted file mode 100644
index b4429a21c8..0000000000
--- a/vendor/github.com/go-openapi/spec/expander.go
+++ /dev/null
@@ -1,900 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/url"
-	"os"
-	"path/filepath"
-	"reflect"
-	"strings"
-	"sync"
-
-	"github.com/go-openapi/jsonpointer"
-	"github.com/go-openapi/swag"
-)
-
-var (
-	// Debug enables logging when SWAGGER_DEBUG env var is not empty
-	Debug = os.Getenv("SWAGGER_DEBUG") != ""
-)
-
-// ExpandOptions provides options for expand.
-type ExpandOptions struct {
-	RelativeBase    string
-	SkipSchemas     bool
-	ContinueOnError bool
-}
-
-// ResolutionCache a cache for resolving urls
-type ResolutionCache interface {
-	Get(string) (interface{}, bool)
-	Set(string, interface{})
-}
-
-type simpleCache struct {
-	lock  sync.Mutex
-	store map[string]interface{}
-}
-
-var resCache ResolutionCache
-
-func init() {
-	resCache = initResolutionCache()
-}
-
-func initResolutionCache() ResolutionCache {
-	return &simpleCache{store: map[string]interface{}{
-		"http://swagger.io/v2/schema.json":       MustLoadSwagger20Schema(),
-		"http://json-schema.org/draft-04/schema": MustLoadJSONSchemaDraft04(),
-	}}
-}
-
-func (s *simpleCache) Get(uri string) (interface{}, bool) {
-	debugLog("getting %q from resolution cache", uri)
-	s.lock.Lock()
-	v, ok := s.store[uri]
-	debugLog("got %q from resolution cache: %t", uri, ok)
-
-	s.lock.Unlock()
-	return v, ok
-}
-
-func (s *simpleCache) Set(uri string, data interface{}) {
-	s.lock.Lock()
-	s.store[uri] = data
-	s.lock.Unlock()
-}
-
-// ResolveRefWithBase resolves a reference against a context root with preservation of base path
-func ResolveRefWithBase(root interface{}, ref *Ref, opts *ExpandOptions) (*Schema, error) {
-	resolver, err := defaultSchemaLoader(root, nil, opts, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	result := new(Schema)
-	if err := resolver.Resolve(ref, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// ResolveRef resolves a reference against a context root
-func ResolveRef(root interface{}, ref *Ref) (*Schema, error) {
-	return ResolveRefWithBase(root, ref, nil)
-}
-
-// ResolveParameter resolves a paramter reference against a context root
-func ResolveParameter(root interface{}, ref Ref) (*Parameter, error) {
-	return ResolveParameterWithBase(root, ref, nil)
-}
-
-// ResolveParameterWithBase resolves a paramter reference against a context root and base path
-func ResolveParameterWithBase(root interface{}, ref Ref, opts *ExpandOptions) (*Parameter, error) {
-	resolver, err := defaultSchemaLoader(root, nil, opts, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	result := new(Parameter)
-	if err := resolver.Resolve(&ref, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// ResolveResponse resolves response a reference against a context root
-func ResolveResponse(root interface{}, ref Ref) (*Response, error) {
-	return ResolveResponseWithBase(root, ref, nil)
-}
-
-// ResolveResponseWithBase resolves response a reference against a context root and base path
-func ResolveResponseWithBase(root interface{}, ref Ref, opts *ExpandOptions) (*Response, error) {
-	resolver, err := defaultSchemaLoader(root, nil, opts, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	result := new(Response)
-	if err := resolver.Resolve(&ref, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// ResolveItems resolves header and parameter items reference against a context root and base path
-func ResolveItems(root interface{}, ref Ref, opts *ExpandOptions) (*Items, error) {
-	resolver, err := defaultSchemaLoader(root, nil, opts, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	result := new(Items)
-	if err := resolver.Resolve(&ref, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// ResolvePathItem resolves response a path item against a context root and base path
-func ResolvePathItem(root interface{}, ref Ref, opts *ExpandOptions) (*PathItem, error) {
-	resolver, err := defaultSchemaLoader(root, nil, opts, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	result := new(PathItem)
-	if err := resolver.Resolve(&ref, result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-type schemaLoader struct {
-	loadingRef  *Ref
-	startingRef *Ref
-	currentRef  *Ref
-	root        interface{}
-	options     *ExpandOptions
-	cache       ResolutionCache
-	loadDoc     func(string) (json.RawMessage, error)
-}
-
-var idPtr, _ = jsonpointer.New("/id")
-var refPtr, _ = jsonpointer.New("/$ref")
-
-// PathLoader function to use when loading remote refs
-var PathLoader func(string) (json.RawMessage, error)
-
-func init() {
-	PathLoader = func(path string) (json.RawMessage, error) {
-		data, err := swag.LoadFromFileOrHTTP(path)
-		if err != nil {
-			return nil, err
-		}
-		return json.RawMessage(data), nil
-	}
-}
-
-func defaultSchemaLoader(
-	root interface{},
-	ref *Ref,
-	expandOptions *ExpandOptions,
-	cache ResolutionCache) (*schemaLoader, error) {
-
-	if cache == nil {
-		cache = resCache
-	}
-	if expandOptions == nil {
-		expandOptions = &ExpandOptions{}
-	}
-
-	var ptr *jsonpointer.Pointer
-	if ref != nil {
-		ptr = ref.GetPointer()
-	}
-
-	currentRef := nextRef(root, ref, ptr)
-
-	return &schemaLoader{
-		loadingRef:  ref,
-		startingRef: ref,
-		currentRef:  currentRef,
-		root:        root,
-		options:     expandOptions,
-		cache:       cache,
-		loadDoc: func(path string) (json.RawMessage, error) {
-			debugLog("fetching document at %q", path)
-			return PathLoader(path)
-		},
-	}, nil
-}
-
-func idFromNode(node interface{}) (*Ref, error) {
-	if idValue, _, err := idPtr.Get(node); err == nil {
-		if refStr, ok := idValue.(string); ok && refStr != "" {
-			idRef, err := NewRef(refStr)
-			if err != nil {
-				return nil, err
-			}
-			return &idRef, nil
-		}
-	}
-	return nil, nil
-}
-
-func nextRef(startingNode interface{}, startingRef *Ref, ptr *jsonpointer.Pointer) *Ref {
-	if startingRef == nil {
-		return nil
-	}
-
-	if ptr == nil {
-		return startingRef
-	}
-
-	ret := startingRef
-	var idRef *Ref
-	node := startingNode
-
-	for _, tok := range ptr.DecodedTokens() {
-		node, _, _ = jsonpointer.GetForToken(node, tok)
-		if node == nil {
-			break
-		}
-
-		idRef, _ = idFromNode(node)
-		if idRef != nil {
-			nw, err := ret.Inherits(*idRef)
-			if err != nil {
-				break
-			}
-			ret = nw
-		}
-
-		refRef, _, _ := refPtr.Get(node)
-		if refRef != nil {
-			var rf Ref
-			switch value := refRef.(type) {
-			case string:
-				rf, _ = NewRef(value)
-			}
-			nw, err := ret.Inherits(rf)
-			if err != nil {
-				break
-			}
-			nwURL := nw.GetURL()
-			if nwURL.Scheme == "file" || (nwURL.Scheme == "" && nwURL.Host == "") {
-				nwpt := filepath.ToSlash(nwURL.Path)
-				if filepath.IsAbs(nwpt) {
-					_, err := os.Stat(nwpt)
-					if err != nil {
-						nwURL.Path = filepath.Join(".", nwpt)
-					}
-				}
-			}
-
-			ret = nw
-		}
-
-	}
-
-	return ret
-}
-
-func debugLog(msg string, args ...interface{}) {
-	if Debug {
-		log.Printf(msg, args...)
-	}
-}
-
-func normalizeFileRef(ref *Ref, relativeBase string) *Ref {
-	refURL := ref.GetURL()
-	debugLog("normalizing %s against %s (%s)", ref.String(), relativeBase, refURL.String())
-	if strings.HasPrefix(refURL.String(), "#") {
-		return ref
-	}
-
-	if refURL.Scheme == "file" || (refURL.Scheme == "" && refURL.Host == "") {
-		filePath := refURL.Path
-		debugLog("normalizing file path: %s", filePath)
-
-		if !filepath.IsAbs(filepath.FromSlash(filePath)) && len(relativeBase) != 0 {
-			debugLog("joining %s with %s", relativeBase, filePath)
-			if fi, err := os.Stat(filepath.FromSlash(relativeBase)); err == nil {
-				if !fi.IsDir() {
-					relativeBase = filepath.Dir(filepath.FromSlash(relativeBase))
-				}
-			}
-			filePath = filepath.Join(filepath.FromSlash(relativeBase), filepath.FromSlash(filePath))
-		}
-		if !filepath.IsAbs(filepath.FromSlash(filePath)) {
-			pwd, err := os.Getwd()
-			if err == nil {
-				debugLog("joining cwd %s with %s", pwd, filePath)
-				filePath = filepath.Join(pwd, filepath.FromSlash(filePath))
-			}
-		}
-
-		debugLog("cleaning %s", filePath)
-		filePath = filepath.Clean(filepath.FromSlash(filePath))
-		_, err := os.Stat(filepath.FromSlash(filePath))
-		if err == nil {
-			debugLog("rewriting url %s to scheme \"\" path %s", refURL.String(), filePath)
-			slp := filepath.FromSlash(filePath)
-			if filepath.IsAbs(slp) && filepath.Separator == '\\' && len(slp) > 1 && slp[1] == ':' && ('a' <= slp[0] && slp[0] <= 'z' || 'A' <= slp[0] && slp[0] <= 'Z') {
-				slp = slp[2:]
-			}
-			refURL.Scheme = ""
-			refURL.Path = filepath.ToSlash(slp)
-			debugLog("new url with joined filepath: %s", refURL.String())
-			*ref = MustCreateRef(refURL.String())
-		}
-	}
-
-	debugLog("refurl: %s", ref.GetURL().String())
-	return ref
-}
-
-func (r *schemaLoader) resolveRef(currentRef, ref *Ref, node, target interface{}) error {
-
-	tgt := reflect.ValueOf(target)
-	if tgt.Kind() != reflect.Ptr {
-		return fmt.Errorf("resolve ref: target needs to be a pointer")
-	}
-
-	oldRef := currentRef
-
-	if currentRef != nil {
-		debugLog("resolve ref current %s new %s", currentRef.String(), ref.String())
-		nextRef := nextRef(node, ref, currentRef.GetPointer())
-		if nextRef == nil || nextRef.GetURL() == nil {
-			return nil
-		}
-		var err error
-		currentRef, err = currentRef.Inherits(*nextRef)
-		debugLog("resolved ref current %s", currentRef.String())
-		if err != nil {
-			return err
-		}
-	}
-
-	if currentRef == nil {
-		currentRef = ref
-	}
-
-	refURL := currentRef.GetURL()
-	if refURL == nil {
-		return nil
-	}
-	if currentRef.IsRoot() {
-		nv := reflect.ValueOf(node)
-		reflect.Indirect(tgt).Set(reflect.Indirect(nv))
-		return nil
-	}
-
-	if strings.HasPrefix(refURL.String(), "#") {
-		res, _, err := ref.GetPointer().Get(node)
-		if err != nil {
-			res, _, err = ref.GetPointer().Get(r.root)
-			if err != nil {
-				return err
-			}
-		}
-		rv := reflect.Indirect(reflect.ValueOf(res))
-		tgtType := reflect.Indirect(tgt).Type()
-		if rv.Type().AssignableTo(tgtType) {
-			reflect.Indirect(tgt).Set(reflect.Indirect(reflect.ValueOf(res)))
-		} else {
-			if err := swag.DynamicJSONToStruct(rv.Interface(), target); err != nil {
-				return err
-			}
-		}
-
-		return nil
-	}
-
-	relativeBase := ""
-	if r.options != nil && r.options.RelativeBase != "" {
-		relativeBase = r.options.RelativeBase
-	}
-	normalizeFileRef(currentRef, relativeBase)
-	debugLog("current ref normalized file: %s", currentRef.String())
-	normalizeFileRef(ref, relativeBase)
-	debugLog("ref normalized file: %s", currentRef.String())
-
-	data, _, _, err := r.load(currentRef.GetURL())
-	if err != nil {
-		return err
-	}
-
-	if ((oldRef == nil && currentRef != nil) ||
-		(oldRef != nil && currentRef == nil) ||
-		oldRef.String() != currentRef.String()) &&
-		((oldRef == nil && ref != nil) ||
-			(oldRef != nil && ref == nil) ||
-			(oldRef.String() != ref.String())) {
-
-		return r.resolveRef(currentRef, ref, data, target)
-	}
-
-	var res interface{}
-	if currentRef.String() != "" {
-		res, _, err = currentRef.GetPointer().Get(data)
-		if err != nil {
-			if strings.HasPrefix(ref.String(), "#") {
-				if r.loadingRef != nil {
-					rr, er := r.loadingRef.Inherits(*ref)
-					if er != nil {
-						return er
-					}
-					refURL = rr.GetURL()
-
-					data, _, _, err = r.load(refURL)
-					if err != nil {
-						return err
-					}
-				} else {
-					data = r.root
-				}
-			}
-
-			res, _, err = ref.GetPointer().Get(data)
-			if err != nil {
-				return err
-			}
-		}
-	} else {
-		res = data
-	}
-
-	if err := swag.DynamicJSONToStruct(res, target); err != nil {
-		return err
-	}
-
-	r.currentRef = currentRef
-
-	return nil
-}
-
-func (r *schemaLoader) load(refURL *url.URL) (interface{}, url.URL, bool, error) {
-	debugLog("loading schema from url: %s", refURL)
-	toFetch := *refURL
-	toFetch.Fragment = ""
-
-	data, fromCache := r.cache.Get(toFetch.String())
-	if !fromCache {
-		b, err := r.loadDoc(toFetch.String())
-		if err != nil {
-			return nil, url.URL{}, false, err
-		}
-
-		if err := json.Unmarshal(b, &data); err != nil {
-			return nil, url.URL{}, false, err
-		}
-		r.cache.Set(toFetch.String(), data)
-	}
-
-	return data, toFetch, fromCache, nil
-}
-
-func (r *schemaLoader) Resolve(ref *Ref, target interface{}) error {
-	return r.resolveRef(r.currentRef, ref, r.root, target)
-}
-
-func (r *schemaLoader) reset() {
-	ref := r.startingRef
-
-	var ptr *jsonpointer.Pointer
-	if ref != nil {
-		ptr = ref.GetPointer()
-	}
-
-	r.currentRef = nextRef(r.root, ref, ptr)
-}
-
-// ExpandSpec expands the references in a swagger spec
-func ExpandSpec(spec *Swagger, options *ExpandOptions) error {
-	resolver, err := defaultSchemaLoader(spec, nil, options, nil)
-	// Just in case this ever returns an error.
-	if shouldStopOnError(err, resolver.options) {
-		return err
-	}
-
-	if options == nil || !options.SkipSchemas {
-		for key, definition := range spec.Definitions {
-			var def *Schema
-			var err error
-			if def, err = expandSchema(definition, []string{"#/definitions/" + key}, resolver); shouldStopOnError(err, resolver.options) {
-				return err
-			}
-			resolver.reset()
-			spec.Definitions[key] = *def
-		}
-	}
-
-	for key, parameter := range spec.Parameters {
-		if err := expandParameter(&parameter, resolver); shouldStopOnError(err, resolver.options) {
-			return err
-		}
-		spec.Parameters[key] = parameter
-	}
-
-	for key, response := range spec.Responses {
-		if err := expandResponse(&response, resolver); shouldStopOnError(err, resolver.options) {
-			return err
-		}
-		spec.Responses[key] = response
-	}
-
-	if spec.Paths != nil {
-		for key, path := range spec.Paths.Paths {
-			if err := expandPathItem(&path, resolver); shouldStopOnError(err, resolver.options) {
-				return err
-			}
-			spec.Paths.Paths[key] = path
-		}
-	}
-
-	return nil
-}
-
-func shouldStopOnError(err error, opts *ExpandOptions) bool {
-	if err != nil && !opts.ContinueOnError {
-		return true
-	}
-
-	if err != nil {
-		log.Println(err)
-	}
-
-	return false
-}
-
-// ExpandSchema expands the refs in the schema object
-func ExpandSchema(schema *Schema, root interface{}, cache ResolutionCache) error {
-	return ExpandSchemaWithBasePath(schema, root, cache, nil)
-}
-
-// ExpandSchemaWithBasePath expands the refs in the schema object, base path configured through expand options
-func ExpandSchemaWithBasePath(schema *Schema, root interface{}, cache ResolutionCache, opts *ExpandOptions) error {
-	if schema == nil {
-		return nil
-	}
-	if root == nil {
-		root = schema
-	}
-
-	nrr, _ := NewRef(schema.ID)
-	var rrr *Ref
-	if nrr.String() != "" {
-		switch rt := root.(type) {
-		case *Schema:
-			rid, _ := NewRef(rt.ID)
-			rrr, _ = rid.Inherits(nrr)
-		case *Swagger:
-			rid, _ := NewRef(rt.ID)
-			rrr, _ = rid.Inherits(nrr)
-		}
-	}
-
-	resolver, err := defaultSchemaLoader(root, rrr, opts, cache)
-	if err != nil {
-		return err
-	}
-
-	refs := []string{""}
-	if rrr != nil {
-		refs[0] = rrr.String()
-	}
-	var s *Schema
-	if s, err = expandSchema(*schema, refs, resolver); err != nil {
-		return err
-	}
-	*schema = *s
-	return nil
-}
-
-func expandItems(target Schema, parentRefs []string, resolver *schemaLoader) (*Schema, error) {
-	if target.Items != nil {
-		if target.Items.Schema != nil {
-			t, err := expandSchema(*target.Items.Schema, parentRefs, resolver)
-			if err != nil {
-				if target.Items.Schema.ID == "" {
-					target.Items.Schema.ID = target.ID
-					if err != nil {
-						t, err = expandSchema(*target.Items.Schema, parentRefs, resolver)
-						if err != nil {
-							return nil, err
-						}
-					}
-				}
-			}
-			*target.Items.Schema = *t
-		}
-		for i := range target.Items.Schemas {
-			t, err := expandSchema(target.Items.Schemas[i], parentRefs, resolver)
-			if err != nil {
-				return nil, err
-			}
-			target.Items.Schemas[i] = *t
-		}
-	}
-	return &target, nil
-}
-
-func expandSchema(target Schema, parentRefs []string, resolver *schemaLoader) (*Schema, error) {
-	if target.Ref.String() == "" && target.Ref.IsRoot() {
-		debugLog("skipping expand schema for no ref and root: %v", resolver.root)
-
-		return resolver.root.(*Schema), nil
-	}
-
-	// t is the new expanded schema
-	var t *Schema
-
-	for target.Ref.String() != "" {
-		if swag.ContainsStringsCI(parentRefs, target.Ref.String()) {
-			return &target, nil
-		}
-
-		if err := resolver.Resolve(&target.Ref, &t); shouldStopOnError(err, resolver.options) {
-			return &target, err
-		}
-
-		if swag.ContainsStringsCI(parentRefs, target.Ref.String()) {
-			debugLog("ref already exists in parent")
-			return &target, nil
-		}
-		parentRefs = append(parentRefs, target.Ref.String())
-		if t != nil {
-			target = *t
-		}
-	}
-
-	t, err := expandItems(target, parentRefs, resolver)
-	if shouldStopOnError(err, resolver.options) {
-		return &target, err
-	}
-	if t != nil {
-		target = *t
-	}
-
-	for i := range target.AllOf {
-		t, err := expandSchema(target.AllOf[i], parentRefs, resolver)
-		if shouldStopOnError(err, resolver.options) {
-			return &target, err
-		}
-		if t != nil {
-			target.AllOf[i] = *t
-		}
-	}
-	for i := range target.AnyOf {
-		t, err := expandSchema(target.AnyOf[i], parentRefs, resolver)
-		if shouldStopOnError(err, resolver.options) {
-			return &target, err
-		}
-		target.AnyOf[i] = *t
-	}
-	for i := range target.OneOf {
-		t, err := expandSchema(target.OneOf[i], parentRefs, resolver)
-		if shouldStopOnError(err, resolver.options) {
-			return &target, err
-		}
-		if t != nil {
-			target.OneOf[i] = *t
-		}
-	}
-	if target.Not != nil {
-		t, err := expandSchema(*target.Not, parentRefs, resolver)
-		if shouldStopOnError(err, resolver.options) {
-			return &target, err
-		}
-		if t != nil {
-			*target.Not = *t
-		}
-	}
-	for k := range target.Properties {
-		t, err := expandSchema(target.Properties[k], parentRefs, resolver)
-		if shouldStopOnError(err, resolver.options) {
-			return &target, err
-		}
-		if t != nil {
-			target.Properties[k] = *t
-		}
-	}
-	if target.AdditionalProperties != nil && target.AdditionalProperties.Schema != nil {
-		t, err := expandSchema(*target.AdditionalProperties.Schema, parentRefs, resolver)
-		if shouldStopOnError(err, resolver.options) {
-			return &target, err
-		}
-		if t != nil {
-			*target.AdditionalProperties.Schema = *t
-		}
-	}
-	for k := range target.PatternProperties {
-		t, err := expandSchema(target.PatternProperties[k], parentRefs, resolver)
-		if shouldStopOnError(err, resolver.options) {
-			return &target, err
-		}
-		if t != nil {
-			target.PatternProperties[k] = *t
-		}
-	}
-	for k := range target.Dependencies {
-		if target.Dependencies[k].Schema != nil {
-			t, err := expandSchema(*target.Dependencies[k].Schema, parentRefs, resolver)
-			if shouldStopOnError(err, resolver.options) {
-				return &target, err
-			}
-			if t != nil {
-				*target.Dependencies[k].Schema = *t
-			}
-		}
-	}
-	if target.AdditionalItems != nil && target.AdditionalItems.Schema != nil {
-		t, err := expandSchema(*target.AdditionalItems.Schema, parentRefs, resolver)
-		if shouldStopOnError(err, resolver.options) {
-			return &target, err
-		}
-		if t != nil {
-			*target.AdditionalItems.Schema = *t
-		}
-	}
-	for k := range target.Definitions {
-		t, err := expandSchema(target.Definitions[k], parentRefs, resolver)
-		if shouldStopOnError(err, resolver.options) {
-			return &target, err
-		}
-		if t != nil {
-			target.Definitions[k] = *t
-		}
-	}
-	return &target, nil
-}
-
-func expandPathItem(pathItem *PathItem, resolver *schemaLoader) error {
-	if pathItem == nil {
-		return nil
-	}
-
-	if pathItem.Ref.String() != "" {
-		if err := resolver.Resolve(&pathItem.Ref, &pathItem); err != nil {
-			return err
-		}
-		resolver.reset()
-		pathItem.Ref = Ref{}
-	}
-
-	for idx := range pathItem.Parameters {
-		if err := expandParameter(&(pathItem.Parameters[idx]), resolver); shouldStopOnError(err, resolver.options) {
-			return err
-		}
-	}
-	if err := expandOperation(pathItem.Get, resolver); shouldStopOnError(err, resolver.options) {
-		return err
-	}
-	if err := expandOperation(pathItem.Head, resolver); shouldStopOnError(err, resolver.options) {
-		return err
-	}
-	if err := expandOperation(pathItem.Options, resolver); shouldStopOnError(err, resolver.options) {
-		return err
-	}
-	if err := expandOperation(pathItem.Put, resolver); shouldStopOnError(err, resolver.options) {
-		return err
-	}
-	if err := expandOperation(pathItem.Post, resolver); shouldStopOnError(err, resolver.options) {
-		return err
-	}
-	if err := expandOperation(pathItem.Patch, resolver); shouldStopOnError(err, resolver.options) {
-		return err
-	}
-	if err := expandOperation(pathItem.Delete, resolver); shouldStopOnError(err, resolver.options) {
-		return err
-	}
-	return nil
-}
-
-func expandOperation(op *Operation, resolver *schemaLoader) error {
-	if op == nil {
-		return nil
-	}
-
-	for i, param := range op.Parameters {
-		if err := expandParameter(&param, resolver); shouldStopOnError(err, resolver.options) {
-			return err
-		}
-		op.Parameters[i] = param
-	}
-
-	if op.Responses != nil {
-		responses := op.Responses
-		if err := expandResponse(responses.Default, resolver); shouldStopOnError(err, resolver.options) {
-			return err
-		}
-		for code, response := range responses.StatusCodeResponses {
-			if err := expandResponse(&response, resolver); shouldStopOnError(err, resolver.options) {
-				return err
-			}
-			responses.StatusCodeResponses[code] = response
-		}
-	}
-	return nil
-}
-
-func expandResponse(response *Response, resolver *schemaLoader) error {
-	if response == nil {
-		return nil
-	}
-
-	var parentRefs []string
-
-	if response.Ref.String() != "" {
-		parentRefs = append(parentRefs, response.Ref.String())
-		if err := resolver.Resolve(&response.Ref, response); shouldStopOnError(err, resolver.options) {
-			return err
-		}
-		resolver.reset()
-		response.Ref = Ref{}
-	}
-
-	if !resolver.options.SkipSchemas && response.Schema != nil {
-		parentRefs = append(parentRefs, response.Schema.Ref.String())
-		debugLog("response ref: %s", response.Schema.Ref)
-		if err := resolver.Resolve(&response.Schema.Ref, &response.Schema); shouldStopOnError(err, resolver.options) {
-			return err
-		}
-		s, err := expandSchema(*response.Schema, parentRefs, resolver)
-		if shouldStopOnError(err, resolver.options) {
-			return err
-		}
-		resolver.reset()
-		*response.Schema = *s
-	}
-	return nil
-}
-
-func expandParameter(parameter *Parameter, resolver *schemaLoader) error {
-	if parameter == nil {
-		return nil
-	}
-
-	var parentRefs []string
-
-	if parameter.Ref.String() != "" {
-		parentRefs = append(parentRefs, parameter.Ref.String())
-		if err := resolver.Resolve(&parameter.Ref, parameter); shouldStopOnError(err, resolver.options) {
-			return err
-		}
-		resolver.reset()
-		parameter.Ref = Ref{}
-	}
-	if !resolver.options.SkipSchemas && parameter.Schema != nil {
-		parentRefs = append(parentRefs, parameter.Schema.Ref.String())
-		if err := resolver.Resolve(&parameter.Schema.Ref, &parameter.Schema); shouldStopOnError(err, resolver.options) {
-			return err
-		}
-		s, err := expandSchema(*parameter.Schema, parentRefs, resolver)
-		if shouldStopOnError(err, resolver.options) {
-			return err
-		}
-		resolver.reset()
-		*parameter.Schema = *s
-	}
-	return nil
-}
diff --git a/vendor/github.com/go-openapi/spec/external_docs.go b/vendor/github.com/go-openapi/spec/external_docs.go
deleted file mode 100644
index 88add91b2b..0000000000
--- a/vendor/github.com/go-openapi/spec/external_docs.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-// ExternalDocumentation allows referencing an external resource for
-// extended documentation.
-//
-// For more information: http://goo.gl/8us55a#externalDocumentationObject
-type ExternalDocumentation struct {
-	Description string `json:"description,omitempty"`
-	URL         string `json:"url,omitempty"`
-}
diff --git a/vendor/github.com/go-openapi/spec/header.go b/vendor/github.com/go-openapi/spec/header.go
deleted file mode 100644
index 85c4d454c1..0000000000
--- a/vendor/github.com/go-openapi/spec/header.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-	"strings"
-
-	"github.com/go-openapi/jsonpointer"
-	"github.com/go-openapi/swag"
-)
-
-type HeaderProps struct {
-	Description string `json:"description,omitempty"`
-}
-
-// Header describes a header for a response of the API
-//
-// For more information: http://goo.gl/8us55a#headerObject
-type Header struct {
-	CommonValidations
-	SimpleSchema
-	VendorExtensible
-	HeaderProps
-}
-
-// ResponseHeader creates a new header instance for use in a response
-func ResponseHeader() *Header {
-	return new(Header)
-}
-
-// WithDescription sets the description on this response, allows for chaining
-func (h *Header) WithDescription(description string) *Header {
-	h.Description = description
-	return h
-}
-
-// Typed a fluent builder method for the type of parameter
-func (h *Header) Typed(tpe, format string) *Header {
-	h.Type = tpe
-	h.Format = format
-	return h
-}
-
-// CollectionOf a fluent builder method for an array item
-func (h *Header) CollectionOf(items *Items, format string) *Header {
-	h.Type = "array"
-	h.Items = items
-	h.CollectionFormat = format
-	return h
-}
-
-// WithDefault sets the default value on this item
-func (h *Header) WithDefault(defaultValue interface{}) *Header {
-	h.Default = defaultValue
-	return h
-}
-
-// WithMaxLength sets a max length value
-func (h *Header) WithMaxLength(max int64) *Header {
-	h.MaxLength = &max
-	return h
-}
-
-// WithMinLength sets a min length value
-func (h *Header) WithMinLength(min int64) *Header {
-	h.MinLength = &min
-	return h
-}
-
-// WithPattern sets a pattern value
-func (h *Header) WithPattern(pattern string) *Header {
-	h.Pattern = pattern
-	return h
-}
-
-// WithMultipleOf sets a multiple of value
-func (h *Header) WithMultipleOf(number float64) *Header {
-	h.MultipleOf = &number
-	return h
-}
-
-// WithMaximum sets a maximum number value
-func (h *Header) WithMaximum(max float64, exclusive bool) *Header {
-	h.Maximum = &max
-	h.ExclusiveMaximum = exclusive
-	return h
-}
-
-// WithMinimum sets a minimum number value
-func (h *Header) WithMinimum(min float64, exclusive bool) *Header {
-	h.Minimum = &min
-	h.ExclusiveMinimum = exclusive
-	return h
-}
-
-// WithEnum sets a the enum values (replace)
-func (h *Header) WithEnum(values ...interface{}) *Header {
-	h.Enum = append([]interface{}{}, values...)
-	return h
-}
-
-// WithMaxItems sets the max items
-func (h *Header) WithMaxItems(size int64) *Header {
-	h.MaxItems = &size
-	return h
-}
-
-// WithMinItems sets the min items
-func (h *Header) WithMinItems(size int64) *Header {
-	h.MinItems = &size
-	return h
-}
-
-// UniqueValues dictates that this array can only have unique items
-func (h *Header) UniqueValues() *Header {
-	h.UniqueItems = true
-	return h
-}
-
-// AllowDuplicates this array can have duplicates
-func (h *Header) AllowDuplicates() *Header {
-	h.UniqueItems = false
-	return h
-}
-
-// MarshalJSON marshal this to JSON
-func (h Header) MarshalJSON() ([]byte, error) {
-	b1, err := json.Marshal(h.CommonValidations)
-	if err != nil {
-		return nil, err
-	}
-	b2, err := json.Marshal(h.SimpleSchema)
-	if err != nil {
-		return nil, err
-	}
-	b3, err := json.Marshal(h.HeaderProps)
-	if err != nil {
-		return nil, err
-	}
-	return swag.ConcatJSON(b1, b2, b3), nil
-}
-
-// UnmarshalJSON marshal this from JSON
-func (h *Header) UnmarshalJSON(data []byte) error {
-	if err := json.Unmarshal(data, &h.CommonValidations); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &h.SimpleSchema); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &h.VendorExtensible); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &h.HeaderProps); err != nil {
-		return err
-	}
-	return nil
-}
-
-// JSONLookup look up a value by the json property name
-func (p Header) JSONLookup(token string) (interface{}, error) {
-	if ex, ok := p.Extensions[token]; ok {
-		return &ex, nil
-	}
-
-	r, _, err := jsonpointer.GetForToken(p.CommonValidations, token)
-	if err != nil && !strings.HasPrefix(err.Error(), "object has no field") {
-		return nil, err
-	}
-	if r != nil {
-		return r, nil
-	}
-	r, _, err = jsonpointer.GetForToken(p.SimpleSchema, token)
-	if err != nil && !strings.HasPrefix(err.Error(), "object has no field") {
-		return nil, err
-	}
-	if r != nil {
-		return r, nil
-	}
-	r, _, err = jsonpointer.GetForToken(p.HeaderProps, token)
-	return r, err
-}
diff --git a/vendor/github.com/go-openapi/spec/info.go b/vendor/github.com/go-openapi/spec/info.go
deleted file mode 100644
index fb8b7c4ac5..0000000000
--- a/vendor/github.com/go-openapi/spec/info.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-	"strings"
-
-	"github.com/go-openapi/jsonpointer"
-	"github.com/go-openapi/swag"
-)
-
-// Extensions vendor specific extensions
-type Extensions map[string]interface{}
-
-// Add adds a value to these extensions
-func (e Extensions) Add(key string, value interface{}) {
-	realKey := strings.ToLower(key)
-	e[realKey] = value
-}
-
-// GetString gets a string value from the extensions
-func (e Extensions) GetString(key string) (string, bool) {
-	if v, ok := e[strings.ToLower(key)]; ok {
-		str, ok := v.(string)
-		return str, ok
-	}
-	return "", false
-}
-
-// GetBool gets a string value from the extensions
-func (e Extensions) GetBool(key string) (bool, bool) {
-	if v, ok := e[strings.ToLower(key)]; ok {
-		str, ok := v.(bool)
-		return str, ok
-	}
-	return false, false
-}
-
-// GetStringSlice gets a string value from the extensions
-func (e Extensions) GetStringSlice(key string) ([]string, bool) {
-	if v, ok := e[strings.ToLower(key)]; ok {
-		arr, ok := v.([]interface{})
-		if !ok {
-			return nil, false
-		}
-		var strs []string
-		for _, iface := range arr {
-			str, ok := iface.(string)
-			if !ok {
-				return nil, false
-			}
-			strs = append(strs, str)
-		}
-		return strs, ok
-	}
-	return nil, false
-}
-
-// VendorExtensible composition block.
-type VendorExtensible struct {
-	Extensions Extensions
-}
-
-// AddExtension adds an extension to this extensible object
-func (v *VendorExtensible) AddExtension(key string, value interface{}) {
-	if value == nil {
-		return
-	}
-	if v.Extensions == nil {
-		v.Extensions = make(map[string]interface{})
-	}
-	v.Extensions.Add(key, value)
-}
-
-// MarshalJSON marshals the extensions to json
-func (v VendorExtensible) MarshalJSON() ([]byte, error) {
-	toser := make(map[string]interface{})
-	for k, v := range v.Extensions {
-		lk := strings.ToLower(k)
-		if strings.HasPrefix(lk, "x-") {
-			toser[k] = v
-		}
-	}
-	return json.Marshal(toser)
-}
-
-// UnmarshalJSON for this extensible object
-func (v *VendorExtensible) UnmarshalJSON(data []byte) error {
-	var d map[string]interface{}
-	if err := json.Unmarshal(data, &d); err != nil {
-		return err
-	}
-	for k, vv := range d {
-		lk := strings.ToLower(k)
-		if strings.HasPrefix(lk, "x-") {
-			if v.Extensions == nil {
-				v.Extensions = map[string]interface{}{}
-			}
-			v.Extensions[k] = vv
-		}
-	}
-	return nil
-}
-
-// InfoProps the properties for an info definition
-type InfoProps struct {
-	Description    string       `json:"description,omitempty"`
-	Title          string       `json:"title,omitempty"`
-	TermsOfService string       `json:"termsOfService,omitempty"`
-	Contact        *ContactInfo `json:"contact,omitempty"`
-	License        *License     `json:"license,omitempty"`
-	Version        string       `json:"version,omitempty"`
-}
-
-// Info object provides metadata about the API.
-// The metadata can be used by the clients if needed, and can be presented in the Swagger-UI for convenience.
-//
-// For more information: http://goo.gl/8us55a#infoObject
-type Info struct {
-	VendorExtensible
-	InfoProps
-}
-
-// JSONLookup look up a value by the json property name
-func (i Info) JSONLookup(token string) (interface{}, error) {
-	if ex, ok := i.Extensions[token]; ok {
-		return &ex, nil
-	}
-	r, _, err := jsonpointer.GetForToken(i.InfoProps, token)
-	return r, err
-}
-
-// MarshalJSON marshal this to JSON
-func (i Info) MarshalJSON() ([]byte, error) {
-	b1, err := json.Marshal(i.InfoProps)
-	if err != nil {
-		return nil, err
-	}
-	b2, err := json.Marshal(i.VendorExtensible)
-	if err != nil {
-		return nil, err
-	}
-	return swag.ConcatJSON(b1, b2), nil
-}
-
-// UnmarshalJSON marshal this from JSON
-func (i *Info) UnmarshalJSON(data []byte) error {
-	if err := json.Unmarshal(data, &i.InfoProps); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &i.VendorExtensible); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/vendor/github.com/go-openapi/spec/items.go b/vendor/github.com/go-openapi/spec/items.go
deleted file mode 100644
index 46944fb699..0000000000
--- a/vendor/github.com/go-openapi/spec/items.go
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-	"strings"
-
-	"github.com/go-openapi/jsonpointer"
-	"github.com/go-openapi/swag"
-)
-
-type SimpleSchema struct {
-	Type             string      `json:"type,omitempty"`
-	Format           string      `json:"format,omitempty"`
-	Items            *Items      `json:"items,omitempty"`
-	CollectionFormat string      `json:"collectionFormat,omitempty"`
-	Default          interface{} `json:"default,omitempty"`
-}
-
-func (s *SimpleSchema) TypeName() string {
-	if s.Format != "" {
-		return s.Format
-	}
-	return s.Type
-}
-
-func (s *SimpleSchema) ItemsTypeName() string {
-	if s.Items == nil {
-		return ""
-	}
-	return s.Items.TypeName()
-}
-
-type CommonValidations struct {
-	Maximum          *float64      `json:"maximum,omitempty"`
-	ExclusiveMaximum bool          `json:"exclusiveMaximum,omitempty"`
-	Minimum          *float64      `json:"minimum,omitempty"`
-	ExclusiveMinimum bool          `json:"exclusiveMinimum,omitempty"`
-	MaxLength        *int64        `json:"maxLength,omitempty"`
-	MinLength        *int64        `json:"minLength,omitempty"`
-	Pattern          string        `json:"pattern,omitempty"`
-	MaxItems         *int64        `json:"maxItems,omitempty"`
-	MinItems         *int64        `json:"minItems,omitempty"`
-	UniqueItems      bool          `json:"uniqueItems,omitempty"`
-	MultipleOf       *float64      `json:"multipleOf,omitempty"`
-	Enum             []interface{} `json:"enum,omitempty"`
-}
-
-// Items a limited subset of JSON-Schema's items object.
-// It is used by parameter definitions that are not located in "body".
-//
-// For more information: http://goo.gl/8us55a#items-object
-type Items struct {
-	Refable
-	CommonValidations
-	SimpleSchema
-	VendorExtensible
-}
-
-// NewItems creates a new instance of items
-func NewItems() *Items {
-	return &Items{}
-}
-
-// Typed a fluent builder method for the type of item
-func (i *Items) Typed(tpe, format string) *Items {
-	i.Type = tpe
-	i.Format = format
-	return i
-}
-
-// CollectionOf a fluent builder method for an array item
-func (i *Items) CollectionOf(items *Items, format string) *Items {
-	i.Type = "array"
-	i.Items = items
-	i.CollectionFormat = format
-	return i
-}
-
-// WithDefault sets the default value on this item
-func (i *Items) WithDefault(defaultValue interface{}) *Items {
-	i.Default = defaultValue
-	return i
-}
-
-// WithMaxLength sets a max length value
-func (i *Items) WithMaxLength(max int64) *Items {
-	i.MaxLength = &max
-	return i
-}
-
-// WithMinLength sets a min length value
-func (i *Items) WithMinLength(min int64) *Items {
-	i.MinLength = &min
-	return i
-}
-
-// WithPattern sets a pattern value
-func (i *Items) WithPattern(pattern string) *Items {
-	i.Pattern = pattern
-	return i
-}
-
-// WithMultipleOf sets a multiple of value
-func (i *Items) WithMultipleOf(number float64) *Items {
-	i.MultipleOf = &number
-	return i
-}
-
-// WithMaximum sets a maximum number value
-func (i *Items) WithMaximum(max float64, exclusive bool) *Items {
-	i.Maximum = &max
-	i.ExclusiveMaximum = exclusive
-	return i
-}
-
-// WithMinimum sets a minimum number value
-func (i *Items) WithMinimum(min float64, exclusive bool) *Items {
-	i.Minimum = &min
-	i.ExclusiveMinimum = exclusive
-	return i
-}
-
-// WithEnum sets a the enum values (replace)
-func (i *Items) WithEnum(values ...interface{}) *Items {
-	i.Enum = append([]interface{}{}, values...)
-	return i
-}
-
-// WithMaxItems sets the max items
-func (i *Items) WithMaxItems(size int64) *Items {
-	i.MaxItems = &size
-	return i
-}
-
-// WithMinItems sets the min items
-func (i *Items) WithMinItems(size int64) *Items {
-	i.MinItems = &size
-	return i
-}
-
-// UniqueValues dictates that this array can only have unique items
-func (i *Items) UniqueValues() *Items {
-	i.UniqueItems = true
-	return i
-}
-
-// AllowDuplicates this array can have duplicates
-func (i *Items) AllowDuplicates() *Items {
-	i.UniqueItems = false
-	return i
-}
-
-// UnmarshalJSON hydrates this items instance with the data from JSON
-func (i *Items) UnmarshalJSON(data []byte) error {
-	var validations CommonValidations
-	if err := json.Unmarshal(data, &validations); err != nil {
-		return err
-	}
-	var ref Refable
-	if err := json.Unmarshal(data, &ref); err != nil {
-		return err
-	}
-	var simpleSchema SimpleSchema
-	if err := json.Unmarshal(data, &simpleSchema); err != nil {
-		return err
-	}
-	i.Refable = ref
-	i.CommonValidations = validations
-	i.SimpleSchema = simpleSchema
-	return nil
-}
-
-// MarshalJSON converts this items object to JSON
-func (i Items) MarshalJSON() ([]byte, error) {
-	b1, err := json.Marshal(i.CommonValidations)
-	if err != nil {
-		return nil, err
-	}
-	b2, err := json.Marshal(i.SimpleSchema)
-	if err != nil {
-		return nil, err
-	}
-	b3, err := json.Marshal(i.Refable)
-	if err != nil {
-		return nil, err
-	}
-	return swag.ConcatJSON(b3, b1, b2), nil
-}
-
-// JSONLookup look up a value by the json property name
-func (p Items) JSONLookup(token string) (interface{}, error) {
-	if token == "$ref" {
-		return &p.Ref, nil
-	}
-
-	r, _, err := jsonpointer.GetForToken(p.CommonValidations, token)
-	if err != nil && !strings.HasPrefix(err.Error(), "object has no field") {
-		return nil, err
-	}
-	if r != nil {
-		return r, nil
-	}
-	r, _, err = jsonpointer.GetForToken(p.SimpleSchema, token)
-	return r, err
-}
diff --git a/vendor/github.com/go-openapi/spec/license.go b/vendor/github.com/go-openapi/spec/license.go
deleted file mode 100644
index f20961b4fd..0000000000
--- a/vendor/github.com/go-openapi/spec/license.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-// License information for the exposed API.
-//
-// For more information: http://goo.gl/8us55a#licenseObject
-type License struct {
-	Name string `json:"name,omitempty"`
-	URL  string `json:"url,omitempty"`
-}
diff --git a/vendor/github.com/go-openapi/spec/operation.go b/vendor/github.com/go-openapi/spec/operation.go
deleted file mode 100644
index de1db6f020..0000000000
--- a/vendor/github.com/go-openapi/spec/operation.go
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-
-	"github.com/go-openapi/jsonpointer"
-	"github.com/go-openapi/swag"
-)
-
-type OperationProps struct {
-	Description  string                 `json:"description,omitempty"`
-	Consumes     []string               `json:"consumes,omitempty"`
-	Produces     []string               `json:"produces,omitempty"`
-	Schemes      []string               `json:"schemes,omitempty"` // the scheme, when present must be from [http, https, ws, wss]
-	Tags         []string               `json:"tags,omitempty"`
-	Summary      string                 `json:"summary,omitempty"`
-	ExternalDocs *ExternalDocumentation `json:"externalDocs,omitempty"`
-	ID           string                 `json:"operationId,omitempty"`
-	Deprecated   bool                   `json:"deprecated,omitempty"`
-	Security     []map[string][]string  `json:"security,omitempty"`
-	Parameters   []Parameter            `json:"parameters,omitempty"`
-	Responses    *Responses             `json:"responses,omitempty"`
-}
-
-// Operation describes a single API operation on a path.
-//
-// For more information: http://goo.gl/8us55a#operationObject
-type Operation struct {
-	VendorExtensible
-	OperationProps
-}
-
-// SuccessResponse gets a success response model
-func (o *Operation) SuccessResponse() (*Response, int, bool) {
-	if o.Responses == nil {
-		return nil, 0, false
-	}
-
-	for k, v := range o.Responses.StatusCodeResponses {
-		if k/100 == 2 {
-			return &v, k, true
-		}
-	}
-
-	return o.Responses.Default, 0, false
-}
-
-// JSONLookup look up a value by the json property name
-func (o Operation) JSONLookup(token string) (interface{}, error) {
-	if ex, ok := o.Extensions[token]; ok {
-		return &ex, nil
-	}
-	r, _, err := jsonpointer.GetForToken(o.OperationProps, token)
-	return r, err
-}
-
-// UnmarshalJSON hydrates this items instance with the data from JSON
-func (o *Operation) UnmarshalJSON(data []byte) error {
-	if err := json.Unmarshal(data, &o.OperationProps); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &o.VendorExtensible); err != nil {
-		return err
-	}
-	return nil
-}
-
-// MarshalJSON converts this items object to JSON
-func (o Operation) MarshalJSON() ([]byte, error) {
-	b1, err := json.Marshal(o.OperationProps)
-	if err != nil {
-		return nil, err
-	}
-	b2, err := json.Marshal(o.VendorExtensible)
-	if err != nil {
-		return nil, err
-	}
-	concated := swag.ConcatJSON(b1, b2)
-	return concated, nil
-}
-
-// NewOperation creates a new operation instance.
-// It expects an ID as parameter but not passing an ID is also valid.
-func NewOperation(id string) *Operation {
-	op := new(Operation)
-	op.ID = id
-	return op
-}
-
-// WithID sets the ID property on this operation, allows for chaining.
-func (o *Operation) WithID(id string) *Operation {
-	o.ID = id
-	return o
-}
-
-// WithDescription sets the description on this operation, allows for chaining
-func (o *Operation) WithDescription(description string) *Operation {
-	o.Description = description
-	return o
-}
-
-// WithSummary sets the summary on this operation, allows for chaining
-func (o *Operation) WithSummary(summary string) *Operation {
-	o.Summary = summary
-	return o
-}
-
-// WithExternalDocs sets/removes the external docs for/from this operation.
-// When you pass empty strings as params the external documents will be removed.
-// When you pass non-empty string as one value then those values will be used on the external docs object.
-// So when you pass a non-empty description, you should also pass the url and vice versa.
-func (o *Operation) WithExternalDocs(description, url string) *Operation {
-	if description == "" && url == "" {
-		o.ExternalDocs = nil
-		return o
-	}
-
-	if o.ExternalDocs == nil {
-		o.ExternalDocs = &ExternalDocumentation{}
-	}
-	o.ExternalDocs.Description = description
-	o.ExternalDocs.URL = url
-	return o
-}
-
-// Deprecate marks the operation as deprecated
-func (o *Operation) Deprecate() *Operation {
-	o.Deprecated = true
-	return o
-}
-
-// Undeprecate marks the operation as not deprected
-func (o *Operation) Undeprecate() *Operation {
-	o.Deprecated = false
-	return o
-}
-
-// WithConsumes adds media types for incoming body values
-func (o *Operation) WithConsumes(mediaTypes ...string) *Operation {
-	o.Consumes = append(o.Consumes, mediaTypes...)
-	return o
-}
-
-// WithProduces adds media types for outgoing body values
-func (o *Operation) WithProduces(mediaTypes ...string) *Operation {
-	o.Produces = append(o.Produces, mediaTypes...)
-	return o
-}
-
-// WithTags adds tags for this operation
-func (o *Operation) WithTags(tags ...string) *Operation {
-	o.Tags = append(o.Tags, tags...)
-	return o
-}
-
-// AddParam adds a parameter to this operation, when a parameter for that location
-// and with that name already exists it will be replaced
-func (o *Operation) AddParam(param *Parameter) *Operation {
-	if param == nil {
-		return o
-	}
-
-	for i, p := range o.Parameters {
-		if p.Name == param.Name && p.In == param.In {
-			params := append(o.Parameters[:i], *param)
-			params = append(params, o.Parameters[i+1:]...)
-			o.Parameters = params
-			return o
-		}
-	}
-
-	o.Parameters = append(o.Parameters, *param)
-	return o
-}
-
-// RemoveParam removes a parameter from the operation
-func (o *Operation) RemoveParam(name, in string) *Operation {
-	for i, p := range o.Parameters {
-		if p.Name == name && p.In == name {
-			o.Parameters = append(o.Parameters[:i], o.Parameters[i+1:]...)
-			return o
-		}
-	}
-	return o
-}
-
-// SecuredWith adds a security scope to this operation.
-func (o *Operation) SecuredWith(name string, scopes ...string) *Operation {
-	o.Security = append(o.Security, map[string][]string{name: scopes})
-	return o
-}
-
-// WithDefaultResponse adds a default response to the operation.
-// Passing a nil value will remove the response
-func (o *Operation) WithDefaultResponse(response *Response) *Operation {
-	return o.RespondsWith(0, response)
-}
-
-// RespondsWith adds a status code response to the operation.
-// When the code is 0 the value of the response will be used as default response value.
-// When the value of the response is nil it will be removed from the operation
-func (o *Operation) RespondsWith(code int, response *Response) *Operation {
-	if o.Responses == nil {
-		o.Responses = new(Responses)
-	}
-	if code == 0 {
-		o.Responses.Default = response
-		return o
-	}
-	if response == nil {
-		delete(o.Responses.StatusCodeResponses, code)
-		return o
-	}
-	if o.Responses.StatusCodeResponses == nil {
-		o.Responses.StatusCodeResponses = make(map[int]Response)
-	}
-	o.Responses.StatusCodeResponses[code] = *response
-	return o
-}
diff --git a/vendor/github.com/go-openapi/spec/parameter.go b/vendor/github.com/go-openapi/spec/parameter.go
deleted file mode 100644
index 71aee1e806..0000000000
--- a/vendor/github.com/go-openapi/spec/parameter.go
+++ /dev/null
@@ -1,301 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-	"strings"
-
-	"github.com/go-openapi/jsonpointer"
-	"github.com/go-openapi/swag"
-)
-
-// QueryParam creates a query parameter
-func QueryParam(name string) *Parameter {
-	return &Parameter{ParamProps: ParamProps{Name: name, In: "query"}}
-}
-
-// HeaderParam creates a header parameter, this is always required by default
-func HeaderParam(name string) *Parameter {
-	return &Parameter{ParamProps: ParamProps{Name: name, In: "header", Required: true}}
-}
-
-// PathParam creates a path parameter, this is always required
-func PathParam(name string) *Parameter {
-	return &Parameter{ParamProps: ParamProps{Name: name, In: "path", Required: true}}
-}
-
-// BodyParam creates a body parameter
-func BodyParam(name string, schema *Schema) *Parameter {
-	return &Parameter{ParamProps: ParamProps{Name: name, In: "body", Schema: schema}, SimpleSchema: SimpleSchema{Type: "object"}}
-}
-
-// FormDataParam creates a body parameter
-func FormDataParam(name string) *Parameter {
-	return &Parameter{ParamProps: ParamProps{Name: name, In: "formData"}}
-}
-
-// FileParam creates a body parameter
-func FileParam(name string) *Parameter {
-	return &Parameter{ParamProps: ParamProps{Name: name, In: "formData"}, SimpleSchema: SimpleSchema{Type: "file"}}
-}
-
-// SimpleArrayParam creates a param for a simple array (string, int, date etc)
-func SimpleArrayParam(name, tpe, fmt string) *Parameter {
-	return &Parameter{ParamProps: ParamProps{Name: name}, SimpleSchema: SimpleSchema{Type: "array", CollectionFormat: "csv", Items: &Items{SimpleSchema: SimpleSchema{Type: "string", Format: fmt}}}}
-}
-
-// ParamRef creates a parameter that's a json reference
-func ParamRef(uri string) *Parameter {
-	p := new(Parameter)
-	p.Ref = MustCreateRef(uri)
-	return p
-}
-
-type ParamProps struct {
-	Description     string  `json:"description,omitempty"`
-	Name            string  `json:"name,omitempty"`
-	In              string  `json:"in,omitempty"`
-	Required        bool    `json:"required,omitempty"`
-	Schema          *Schema `json:"schema,omitempty"`          // when in == "body"
-	AllowEmptyValue bool    `json:"allowEmptyValue,omitempty"` // when in == "query" || "formData"
-}
-
-// Parameter a unique parameter is defined by a combination of a [name](#parameterName) and [location](#parameterIn).
-//
-// There are five possible parameter types.
-// * Path - Used together with [Path Templating](#pathTemplating), where the parameter value is actually part of the operation's URL. This does not include the host or base path of the API. For example, in `/items/{itemId}`, the path parameter is `itemId`.
-// * Query - Parameters that are appended to the URL. For example, in `/items?id=###`, the query parameter is `id`.
-// * Header - Custom headers that are expected as part of the request.
-// * Body - The payload that's appended to the HTTP request. Since there can only be one payload, there can only be *one* body parameter. The name of the body parameter has no effect on the parameter itself and is used for documentation purposes only. Since Form parameters are also in the payload, body and form parameters cannot exist together for the same operation.
-// * Form - Used to describe the payload of an HTTP request when either `application/x-www-form-urlencoded` or `multipart/form-data` are used as the content type of the request (in Swagger's definition, the [`consumes`](#operationConsumes) property of an operation). This is the only parameter type that can be used to send files, thus supporting the `file` type. Since form parameters are sent in the payload, they cannot be declared together with a body parameter for the same operation. Form parameters have a different format based on the content-type used (for further details, consult http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4):
-//   * `application/x-www-form-urlencoded` - Similar to the format of Query parameters but as a payload. For example, `foo=1&bar=swagger` - both `foo` and `bar` are form parameters. This is normally used for simple parameters that are being transferred.
-//   * `multipart/form-data` - each parameter takes a section in the payload with an internal header. For example, for the header `Content-Disposition: form-data; name="submit-name"` the name of the parameter is `submit-name`. This type of form parameters is more commonly used for file transfers.
-//
-// For more information: http://goo.gl/8us55a#parameterObject
-type Parameter struct {
-	Refable
-	CommonValidations
-	SimpleSchema
-	VendorExtensible
-	ParamProps
-}
-
-// JSONLookup look up a value by the json property name
-func (p Parameter) JSONLookup(token string) (interface{}, error) {
-	if ex, ok := p.Extensions[token]; ok {
-		return &ex, nil
-	}
-	if token == "$ref" {
-		return &p.Ref, nil
-	}
-
-	r, _, err := jsonpointer.GetForToken(p.CommonValidations, token)
-	if err != nil && !strings.HasPrefix(err.Error(), "object has no field") {
-		return nil, err
-	}
-	if r != nil {
-		return r, nil
-	}
-	r, _, err = jsonpointer.GetForToken(p.SimpleSchema, token)
-	if err != nil && !strings.HasPrefix(err.Error(), "object has no field") {
-		return nil, err
-	}
-	if r != nil {
-		return r, nil
-	}
-	r, _, err = jsonpointer.GetForToken(p.ParamProps, token)
-	return r, err
-}
-
-// WithDescription a fluent builder method for the description of the parameter
-func (p *Parameter) WithDescription(description string) *Parameter {
-	p.Description = description
-	return p
-}
-
-// Named a fluent builder method to override the name of the parameter
-func (p *Parameter) Named(name string) *Parameter {
-	p.Name = name
-	return p
-}
-
-// WithLocation a fluent builder method to override the location of the parameter
-func (p *Parameter) WithLocation(in string) *Parameter {
-	p.In = in
-	return p
-}
-
-// Typed a fluent builder method for the type of the parameter value
-func (p *Parameter) Typed(tpe, format string) *Parameter {
-	p.Type = tpe
-	p.Format = format
-	return p
-}
-
-// CollectionOf a fluent builder method for an array parameter
-func (p *Parameter) CollectionOf(items *Items, format string) *Parameter {
-	p.Type = "array"
-	p.Items = items
-	p.CollectionFormat = format
-	return p
-}
-
-// WithDefault sets the default value on this parameter
-func (p *Parameter) WithDefault(defaultValue interface{}) *Parameter {
-	p.AsOptional() // with default implies optional
-	p.Default = defaultValue
-	return p
-}
-
-// AllowsEmptyValues flags this parameter as being ok with empty values
-func (p *Parameter) AllowsEmptyValues() *Parameter {
-	p.AllowEmptyValue = true
-	return p
-}
-
-// NoEmptyValues flags this parameter as not liking empty values
-func (p *Parameter) NoEmptyValues() *Parameter {
-	p.AllowEmptyValue = false
-	return p
-}
-
-// AsOptional flags this parameter as optional
-func (p *Parameter) AsOptional() *Parameter {
-	p.Required = false
-	return p
-}
-
-// AsRequired flags this parameter as required
-func (p *Parameter) AsRequired() *Parameter {
-	if p.Default != nil { // with a default required makes no sense
-		return p
-	}
-	p.Required = true
-	return p
-}
-
-// WithMaxLength sets a max length value
-func (p *Parameter) WithMaxLength(max int64) *Parameter {
-	p.MaxLength = &max
-	return p
-}
-
-// WithMinLength sets a min length value
-func (p *Parameter) WithMinLength(min int64) *Parameter {
-	p.MinLength = &min
-	return p
-}
-
-// WithPattern sets a pattern value
-func (p *Parameter) WithPattern(pattern string) *Parameter {
-	p.Pattern = pattern
-	return p
-}
-
-// WithMultipleOf sets a multiple of value
-func (p *Parameter) WithMultipleOf(number float64) *Parameter {
-	p.MultipleOf = &number
-	return p
-}
-
-// WithMaximum sets a maximum number value
-func (p *Parameter) WithMaximum(max float64, exclusive bool) *Parameter {
-	p.Maximum = &max
-	p.ExclusiveMaximum = exclusive
-	return p
-}
-
-// WithMinimum sets a minimum number value
-func (p *Parameter) WithMinimum(min float64, exclusive bool) *Parameter {
-	p.Minimum = &min
-	p.ExclusiveMinimum = exclusive
-	return p
-}
-
-// WithEnum sets a the enum values (replace)
-func (p *Parameter) WithEnum(values ...interface{}) *Parameter {
-	p.Enum = append([]interface{}{}, values...)
-	return p
-}
-
-// WithMaxItems sets the max items
-func (p *Parameter) WithMaxItems(size int64) *Parameter {
-	p.MaxItems = &size
-	return p
-}
-
-// WithMinItems sets the min items
-func (p *Parameter) WithMinItems(size int64) *Parameter {
-	p.MinItems = &size
-	return p
-}
-
-// UniqueValues dictates that this array can only have unique items
-func (p *Parameter) UniqueValues() *Parameter {
-	p.UniqueItems = true
-	return p
-}
-
-// AllowDuplicates this array can have duplicates
-func (p *Parameter) AllowDuplicates() *Parameter {
-	p.UniqueItems = false
-	return p
-}
-
-// UnmarshalJSON hydrates this items instance with the data from JSON
-func (p *Parameter) UnmarshalJSON(data []byte) error {
-	if err := json.Unmarshal(data, &p.CommonValidations); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &p.Refable); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &p.SimpleSchema); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &p.VendorExtensible); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &p.ParamProps); err != nil {
-		return err
-	}
-	return nil
-}
-
-// MarshalJSON converts this items object to JSON
-func (p Parameter) MarshalJSON() ([]byte, error) {
-	b1, err := json.Marshal(p.CommonValidations)
-	if err != nil {
-		return nil, err
-	}
-	b2, err := json.Marshal(p.SimpleSchema)
-	if err != nil {
-		return nil, err
-	}
-	b3, err := json.Marshal(p.Refable)
-	if err != nil {
-		return nil, err
-	}
-	b4, err := json.Marshal(p.VendorExtensible)
-	if err != nil {
-		return nil, err
-	}
-	b5, err := json.Marshal(p.ParamProps)
-	if err != nil {
-		return nil, err
-	}
-	return swag.ConcatJSON(b3, b1, b2, b4, b5), nil
-}
diff --git a/vendor/github.com/go-openapi/spec/path_item.go b/vendor/github.com/go-openapi/spec/path_item.go
deleted file mode 100644
index 9ab3ec5383..0000000000
--- a/vendor/github.com/go-openapi/spec/path_item.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-
-	"github.com/go-openapi/jsonpointer"
-	"github.com/go-openapi/swag"
-)
-
-// pathItemProps the path item specific properties
-type PathItemProps struct {
-	Get        *Operation  `json:"get,omitempty"`
-	Put        *Operation  `json:"put,omitempty"`
-	Post       *Operation  `json:"post,omitempty"`
-	Delete     *Operation  `json:"delete,omitempty"`
-	Options    *Operation  `json:"options,omitempty"`
-	Head       *Operation  `json:"head,omitempty"`
-	Patch      *Operation  `json:"patch,omitempty"`
-	Parameters []Parameter `json:"parameters,omitempty"`
-}
-
-// PathItem describes the operations available on a single path.
-// A Path Item may be empty, due to [ACL constraints](http://goo.gl/8us55a#securityFiltering).
-// The path itself is still exposed to the documentation viewer but they will
-// not know which operations and parameters are available.
-//
-// For more information: http://goo.gl/8us55a#pathItemObject
-type PathItem struct {
-	Refable
-	VendorExtensible
-	PathItemProps
-}
-
-// JSONLookup look up a value by the json property name
-func (p PathItem) JSONLookup(token string) (interface{}, error) {
-	if ex, ok := p.Extensions[token]; ok {
-		return &ex, nil
-	}
-	if token == "$ref" {
-		return &p.Ref, nil
-	}
-	r, _, err := jsonpointer.GetForToken(p.PathItemProps, token)
-	return r, err
-}
-
-// UnmarshalJSON hydrates this items instance with the data from JSON
-func (p *PathItem) UnmarshalJSON(data []byte) error {
-	if err := json.Unmarshal(data, &p.Refable); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &p.VendorExtensible); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &p.PathItemProps); err != nil {
-		return err
-	}
-	return nil
-}
-
-// MarshalJSON converts this items object to JSON
-func (p PathItem) MarshalJSON() ([]byte, error) {
-	b3, err := json.Marshal(p.Refable)
-	if err != nil {
-		return nil, err
-	}
-	b4, err := json.Marshal(p.VendorExtensible)
-	if err != nil {
-		return nil, err
-	}
-	b5, err := json.Marshal(p.PathItemProps)
-	if err != nil {
-		return nil, err
-	}
-	concated := swag.ConcatJSON(b3, b4, b5)
-	return concated, nil
-}
diff --git a/vendor/github.com/go-openapi/spec/paths.go b/vendor/github.com/go-openapi/spec/paths.go
deleted file mode 100644
index 9dc82a2901..0000000000
--- a/vendor/github.com/go-openapi/spec/paths.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"github.com/go-openapi/swag"
-)
-
-// Paths holds the relative paths to the individual endpoints.
-// The path is appended to the [`basePath`](http://goo.gl/8us55a#swaggerBasePath) in order
-// to construct the full URL.
-// The Paths may be empty, due to [ACL constraints](http://goo.gl/8us55a#securityFiltering).
-//
-// For more information: http://goo.gl/8us55a#pathsObject
-type Paths struct {
-	VendorExtensible
-	Paths map[string]PathItem `json:"-"` // custom serializer to flatten this, each entry must start with "/"
-}
-
-// JSONLookup look up a value by the json property name
-func (p Paths) JSONLookup(token string) (interface{}, error) {
-	if pi, ok := p.Paths[token]; ok {
-		return &pi, nil
-	}
-	if ex, ok := p.Extensions[token]; ok {
-		return &ex, nil
-	}
-	return nil, fmt.Errorf("object has no field %q", token)
-}
-
-// UnmarshalJSON hydrates this items instance with the data from JSON
-func (p *Paths) UnmarshalJSON(data []byte) error {
-	var res map[string]json.RawMessage
-	if err := json.Unmarshal(data, &res); err != nil {
-		return err
-	}
-	for k, v := range res {
-		if strings.HasPrefix(strings.ToLower(k), "x-") {
-			if p.Extensions == nil {
-				p.Extensions = make(map[string]interface{})
-			}
-			var d interface{}
-			if err := json.Unmarshal(v, &d); err != nil {
-				return err
-			}
-			p.Extensions[k] = d
-		}
-		if strings.HasPrefix(k, "/") {
-			if p.Paths == nil {
-				p.Paths = make(map[string]PathItem)
-			}
-			var pi PathItem
-			if err := json.Unmarshal(v, &pi); err != nil {
-				return err
-			}
-			p.Paths[k] = pi
-		}
-	}
-	return nil
-}
-
-// MarshalJSON converts this items object to JSON
-func (p Paths) MarshalJSON() ([]byte, error) {
-	b1, err := json.Marshal(p.VendorExtensible)
-	if err != nil {
-		return nil, err
-	}
-
-	pths := make(map[string]PathItem)
-	for k, v := range p.Paths {
-		if strings.HasPrefix(k, "/") {
-			pths[k] = v
-		}
-	}
-	b2, err := json.Marshal(pths)
-	if err != nil {
-		return nil, err
-	}
-	concated := swag.ConcatJSON(b1, b2)
-	return concated, nil
-}
diff --git a/vendor/github.com/go-openapi/spec/ref.go b/vendor/github.com/go-openapi/spec/ref.go
deleted file mode 100644
index 4833b87e2f..0000000000
--- a/vendor/github.com/go-openapi/spec/ref.go
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-	"net/http"
-	"os"
-	"path/filepath"
-
-	"github.com/go-openapi/jsonreference"
-)
-
-// Refable is a struct for things that accept a $ref property
-type Refable struct {
-	Ref Ref
-}
-
-// MarshalJSON marshals the ref to json
-func (r Refable) MarshalJSON() ([]byte, error) {
-	return r.Ref.MarshalJSON()
-}
-
-// UnmarshalJSON unmarshalss the ref from json
-func (r *Refable) UnmarshalJSON(d []byte) error {
-	return json.Unmarshal(d, &r.Ref)
-}
-
-// Ref represents a json reference that is potentially resolved
-type Ref struct {
-	jsonreference.Ref
-}
-
-// RemoteURI gets the remote uri part of the ref
-func (r *Ref) RemoteURI() string {
-	if r.String() == "" {
-		return r.String()
-	}
-
-	u := *r.GetURL()
-	u.Fragment = ""
-	return u.String()
-}
-
-// IsValidURI returns true when the url the ref points to can be found
-func (r *Ref) IsValidURI(basepaths ...string) bool {
-	if r.String() == "" {
-		return true
-	}
-
-	v := r.RemoteURI()
-	if v == "" {
-		return true
-	}
-
-	if r.HasFullURL {
-		rr, err := http.Get(v)
-		if err != nil {
-			return false
-		}
-
-		return rr.StatusCode/100 == 2
-	}
-
-	if !(r.HasFileScheme || r.HasFullFilePath || r.HasURLPathOnly) {
-		return false
-	}
-
-	// check for local file
-	pth := v
-	if r.HasURLPathOnly {
-		base := "."
-		if len(basepaths) > 0 {
-			base = filepath.Dir(filepath.Join(basepaths...))
-		}
-		p, e := filepath.Abs(filepath.ToSlash(filepath.Join(base, pth)))
-		if e != nil {
-			return false
-		}
-		pth = p
-	}
-
-	fi, err := os.Stat(filepath.ToSlash(pth))
-	if err != nil {
-		return false
-	}
-
-	return !fi.IsDir()
-}
-
-// Inherits creates a new reference from a parent and a child
-// If the child cannot inherit from the parent, an error is returned
-func (r *Ref) Inherits(child Ref) (*Ref, error) {
-	ref, err := r.Ref.Inherits(child.Ref)
-	if err != nil {
-		return nil, err
-	}
-	return &Ref{Ref: *ref}, nil
-}
-
-// NewRef creates a new instance of a ref object
-// returns an error when the reference uri is an invalid uri
-func NewRef(refURI string) (Ref, error) {
-	ref, err := jsonreference.New(refURI)
-	if err != nil {
-		return Ref{}, err
-	}
-	return Ref{Ref: ref}, nil
-}
-
-// MustCreateRef creates a ref object but panics when refURI is invalid.
-// Use the NewRef method for a version that returns an error.
-func MustCreateRef(refURI string) Ref {
-	return Ref{Ref: jsonreference.MustCreateRef(refURI)}
-}
-
-// MarshalJSON marshals this ref into a JSON object
-func (r Ref) MarshalJSON() ([]byte, error) {
-	str := r.String()
-	if str == "" {
-		if r.IsRoot() {
-			return []byte(`{"$ref":""}`), nil
-		}
-		return []byte("{}"), nil
-	}
-	v := map[string]interface{}{"$ref": str}
-	return json.Marshal(v)
-}
-
-// UnmarshalJSON unmarshals this ref from a JSON object
-func (r *Ref) UnmarshalJSON(d []byte) error {
-	var v map[string]interface{}
-	if err := json.Unmarshal(d, &v); err != nil {
-		return err
-	}
-
-	if v == nil {
-		return nil
-	}
-
-	if vv, ok := v["$ref"]; ok {
-		if str, ok := vv.(string); ok {
-			ref, err := jsonreference.New(str)
-			if err != nil {
-				return err
-			}
-			*r = Ref{Ref: ref}
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/go-openapi/spec/response.go b/vendor/github.com/go-openapi/spec/response.go
deleted file mode 100644
index a32b039eaf..0000000000
--- a/vendor/github.com/go-openapi/spec/response.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-
-	"github.com/go-openapi/jsonpointer"
-	"github.com/go-openapi/swag"
-)
-
-// ResponseProps properties specific to a response
-type ResponseProps struct {
-	Description string                 `json:"description,omitempty"`
-	Schema      *Schema                `json:"schema,omitempty"`
-	Headers     map[string]Header      `json:"headers,omitempty"`
-	Examples    map[string]interface{} `json:"examples,omitempty"`
-}
-
-// Response describes a single response from an API Operation.
-//
-// For more information: http://goo.gl/8us55a#responseObject
-type Response struct {
-	Refable
-	ResponseProps
-	VendorExtensible
-}
-
-// JSONLookup look up a value by the json property name
-func (p Response) JSONLookup(token string) (interface{}, error) {
-	if ex, ok := p.Extensions[token]; ok {
-		return &ex, nil
-	}
-	if token == "$ref" {
-		return &p.Ref, nil
-	}
-	r, _, err := jsonpointer.GetForToken(p.ResponseProps, token)
-	return r, err
-}
-
-// UnmarshalJSON hydrates this items instance with the data from JSON
-func (r *Response) UnmarshalJSON(data []byte) error {
-	if err := json.Unmarshal(data, &r.ResponseProps); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &r.Refable); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &r.VendorExtensible); err != nil {
-		return err
-	}
-	return nil
-}
-
-// MarshalJSON converts this items object to JSON
-func (r Response) MarshalJSON() ([]byte, error) {
-	b1, err := json.Marshal(r.ResponseProps)
-	if err != nil {
-		return nil, err
-	}
-	b2, err := json.Marshal(r.Refable)
-	if err != nil {
-		return nil, err
-	}
-	b3, err := json.Marshal(r.VendorExtensible)
-	if err != nil {
-		return nil, err
-	}
-	return swag.ConcatJSON(b1, b2, b3), nil
-}
-
-// NewResponse creates a new response instance
-func NewResponse() *Response {
-	return new(Response)
-}
-
-// ResponseRef creates a response as a json reference
-func ResponseRef(url string) *Response {
-	resp := NewResponse()
-	resp.Ref = MustCreateRef(url)
-	return resp
-}
-
-// WithDescription sets the description on this response, allows for chaining
-func (r *Response) WithDescription(description string) *Response {
-	r.Description = description
-	return r
-}
-
-// WithSchema sets the schema on this response, allows for chaining.
-// Passing a nil argument removes the schema from this response
-func (r *Response) WithSchema(schema *Schema) *Response {
-	r.Schema = schema
-	return r
-}
-
-// AddHeader adds a header to this response
-func (r *Response) AddHeader(name string, header *Header) *Response {
-	if header == nil {
-		return r.RemoveHeader(name)
-	}
-	if r.Headers == nil {
-		r.Headers = make(map[string]Header)
-	}
-	r.Headers[name] = *header
-	return r
-}
-
-// RemoveHeader removes a header from this response
-func (r *Response) RemoveHeader(name string) *Response {
-	delete(r.Headers, name)
-	return r
-}
-
-// AddExample adds an example to this response
-func (r *Response) AddExample(mediaType string, example interface{}) *Response {
-	if r.Examples == nil {
-		r.Examples = make(map[string]interface{})
-	}
-	r.Examples[mediaType] = example
-	return r
-}
diff --git a/vendor/github.com/go-openapi/spec/responses.go b/vendor/github.com/go-openapi/spec/responses.go
deleted file mode 100644
index 3ab06697f2..0000000000
--- a/vendor/github.com/go-openapi/spec/responses.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"strconv"
-
-	"github.com/go-openapi/swag"
-)
-
-// Responses is a container for the expected responses of an operation.
-// The container maps a HTTP response code to the expected response.
-// It is not expected from the documentation to necessarily cover all possible HTTP response codes,
-// since they may not be known in advance. However, it is expected from the documentation to cover
-// a successful operation response and any known errors.
-//
-// The `default` can be used a default response object for all HTTP codes that are not covered
-// individually by the specification.
-//
-// The `Responses Object` MUST contain at least one response code, and it SHOULD be the response
-// for a successful operation call.
-//
-// For more information: http://goo.gl/8us55a#responsesObject
-type Responses struct {
-	VendorExtensible
-	ResponsesProps
-}
-
-// JSONLookup implements an interface to customize json pointer lookup
-func (r Responses) JSONLookup(token string) (interface{}, error) {
-	if token == "default" {
-		return r.Default, nil
-	}
-	if ex, ok := r.Extensions[token]; ok {
-		return &ex, nil
-	}
-	if i, err := strconv.Atoi(token); err == nil {
-		if scr, ok := r.StatusCodeResponses[i]; ok {
-			return scr, nil
-		}
-	}
-	return nil, fmt.Errorf("object has no field %q", token)
-}
-
-// UnmarshalJSON hydrates this items instance with the data from JSON
-func (r *Responses) UnmarshalJSON(data []byte) error {
-	if err := json.Unmarshal(data, &r.ResponsesProps); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &r.VendorExtensible); err != nil {
-		return err
-	}
-	if reflect.DeepEqual(ResponsesProps{}, r.ResponsesProps) {
-		r.ResponsesProps = ResponsesProps{}
-	}
-	return nil
-}
-
-// MarshalJSON converts this items object to JSON
-func (r Responses) MarshalJSON() ([]byte, error) {
-	b1, err := json.Marshal(r.ResponsesProps)
-	if err != nil {
-		return nil, err
-	}
-	b2, err := json.Marshal(r.VendorExtensible)
-	if err != nil {
-		return nil, err
-	}
-	concated := swag.ConcatJSON(b1, b2)
-	return concated, nil
-}
-
-type ResponsesProps struct {
-	Default             *Response
-	StatusCodeResponses map[int]Response
-}
-
-func (r ResponsesProps) MarshalJSON() ([]byte, error) {
-	toser := map[string]Response{}
-	if r.Default != nil {
-		toser["default"] = *r.Default
-	}
-	for k, v := range r.StatusCodeResponses {
-		toser[strconv.Itoa(k)] = v
-	}
-	return json.Marshal(toser)
-}
-
-func (r *ResponsesProps) UnmarshalJSON(data []byte) error {
-	var res map[string]Response
-	if err := json.Unmarshal(data, &res); err != nil {
-		return nil
-	}
-	if v, ok := res["default"]; ok {
-		r.Default = &v
-		delete(res, "default")
-	}
-	for k, v := range res {
-		if nk, err := strconv.Atoi(k); err == nil {
-			if r.StatusCodeResponses == nil {
-				r.StatusCodeResponses = map[int]Response{}
-			}
-			r.StatusCodeResponses[nk] = v
-		}
-	}
-	return nil
-}
diff --git a/vendor/github.com/go-openapi/spec/schema.go b/vendor/github.com/go-openapi/spec/schema.go
deleted file mode 100644
index 1cdcc163f1..0000000000
--- a/vendor/github.com/go-openapi/spec/schema.go
+++ /dev/null
@@ -1,628 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/url"
-	"strings"
-
-	"github.com/go-openapi/jsonpointer"
-	"github.com/go-openapi/swag"
-)
-
-// BooleanProperty creates a boolean property
-func BooleanProperty() *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"boolean"}}}
-}
-
-// BoolProperty creates a boolean property
-func BoolProperty() *Schema { return BooleanProperty() }
-
-// StringProperty creates a string property
-func StringProperty() *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"string"}}}
-}
-
-// CharProperty creates a string property
-func CharProperty() *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"string"}}}
-}
-
-// Float64Property creates a float64/double property
-func Float64Property() *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"number"}, Format: "double"}}
-}
-
-// Float32Property creates a float32/float property
-func Float32Property() *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"number"}, Format: "float"}}
-}
-
-// Int8Property creates an int8 property
-func Int8Property() *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"integer"}, Format: "int8"}}
-}
-
-// Int16Property creates an int16 property
-func Int16Property() *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"integer"}, Format: "int16"}}
-}
-
-// Int32Property creates an int32 property
-func Int32Property() *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"integer"}, Format: "int32"}}
-}
-
-// Int64Property creates an int64 property
-func Int64Property() *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"integer"}, Format: "int64"}}
-}
-
-// StrFmtProperty creates a property for the named string format
-func StrFmtProperty(format string) *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"string"}, Format: format}}
-}
-
-// DateProperty creates a date property
-func DateProperty() *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"string"}, Format: "date"}}
-}
-
-// DateTimeProperty creates a date time property
-func DateTimeProperty() *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"string"}, Format: "date-time"}}
-}
-
-// MapProperty creates a map property
-func MapProperty(property *Schema) *Schema {
-	return &Schema{SchemaProps: SchemaProps{Type: []string{"object"}, AdditionalProperties: &SchemaOrBool{Allows: true, Schema: property}}}
-}
-
-// RefProperty creates a ref property
-func RefProperty(name string) *Schema {
-	return &Schema{SchemaProps: SchemaProps{Ref: MustCreateRef(name)}}
-}
-
-// RefSchema creates a ref property
-func RefSchema(name string) *Schema {
-	return &Schema{SchemaProps: SchemaProps{Ref: MustCreateRef(name)}}
-}
-
-// ArrayProperty creates an array property
-func ArrayProperty(items *Schema) *Schema {
-	if items == nil {
-		return &Schema{SchemaProps: SchemaProps{Type: []string{"array"}}}
-	}
-	return &Schema{SchemaProps: SchemaProps{Items: &SchemaOrArray{Schema: items}, Type: []string{"array"}}}
-}
-
-// ComposedSchema creates a schema with allOf
-func ComposedSchema(schemas ...Schema) *Schema {
-	s := new(Schema)
-	s.AllOf = schemas
-	return s
-}
-
-// SchemaURL represents a schema url
-type SchemaURL string
-
-// MarshalJSON marshal this to JSON
-func (r SchemaURL) MarshalJSON() ([]byte, error) {
-	if r == "" {
-		return []byte("{}"), nil
-	}
-	v := map[string]interface{}{"$schema": string(r)}
-	return json.Marshal(v)
-}
-
-// UnmarshalJSON unmarshal this from JSON
-func (r *SchemaURL) UnmarshalJSON(data []byte) error {
-	var v map[string]interface{}
-	if err := json.Unmarshal(data, &v); err != nil {
-		return err
-	}
-	if v == nil {
-		return nil
-	}
-	if vv, ok := v["$schema"]; ok {
-		if str, ok := vv.(string); ok {
-			u, err := url.Parse(str)
-			if err != nil {
-				return err
-			}
-
-			*r = SchemaURL(u.String())
-		}
-	}
-	return nil
-}
-
-// type ExtraSchemaProps map[string]interface{}
-
-// // JSONSchema represents a structure that is a json schema draft 04
-// type JSONSchema struct {
-// 	SchemaProps
-// 	ExtraSchemaProps
-// }
-
-// // MarshalJSON marshal this to JSON
-// func (s JSONSchema) MarshalJSON() ([]byte, error) {
-// 	b1, err := json.Marshal(s.SchemaProps)
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	b2, err := s.Ref.MarshalJSON()
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	b3, err := s.Schema.MarshalJSON()
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	b4, err := json.Marshal(s.ExtraSchemaProps)
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	return swag.ConcatJSON(b1, b2, b3, b4), nil
-// }
-
-// // UnmarshalJSON marshal this from JSON
-// func (s *JSONSchema) UnmarshalJSON(data []byte) error {
-// 	var sch JSONSchema
-// 	if err := json.Unmarshal(data, &sch.SchemaProps); err != nil {
-// 		return err
-// 	}
-// 	if err := json.Unmarshal(data, &sch.Ref); err != nil {
-// 		return err
-// 	}
-// 	if err := json.Unmarshal(data, &sch.Schema); err != nil {
-// 		return err
-// 	}
-// 	if err := json.Unmarshal(data, &sch.ExtraSchemaProps); err != nil {
-// 		return err
-// 	}
-// 	*s = sch
-// 	return nil
-// }
-
-type SchemaProps struct {
-	ID                   string            `json:"id,omitempty"`
-	Ref                  Ref               `json:"-"`
-	Schema               SchemaURL         `json:"-"`
-	Description          string            `json:"description,omitempty"`
-	Type                 StringOrArray     `json:"type,omitempty"`
-	Format               string            `json:"format,omitempty"`
-	Title                string            `json:"title,omitempty"`
-	Default              interface{}       `json:"default,omitempty"`
-	Maximum              *float64          `json:"maximum,omitempty"`
-	ExclusiveMaximum     bool              `json:"exclusiveMaximum,omitempty"`
-	Minimum              *float64          `json:"minimum,omitempty"`
-	ExclusiveMinimum     bool              `json:"exclusiveMinimum,omitempty"`
-	MaxLength            *int64            `json:"maxLength,omitempty"`
-	MinLength            *int64            `json:"minLength,omitempty"`
-	Pattern              string            `json:"pattern,omitempty"`
-	MaxItems             *int64            `json:"maxItems,omitempty"`
-	MinItems             *int64            `json:"minItems,omitempty"`
-	UniqueItems          bool              `json:"uniqueItems,omitempty"`
-	MultipleOf           *float64          `json:"multipleOf,omitempty"`
-	Enum                 []interface{}     `json:"enum,omitempty"`
-	MaxProperties        *int64            `json:"maxProperties,omitempty"`
-	MinProperties        *int64            `json:"minProperties,omitempty"`
-	Required             []string          `json:"required,omitempty"`
-	Items                *SchemaOrArray    `json:"items,omitempty"`
-	AllOf                []Schema          `json:"allOf,omitempty"`
-	OneOf                []Schema          `json:"oneOf,omitempty"`
-	AnyOf                []Schema          `json:"anyOf,omitempty"`
-	Not                  *Schema           `json:"not,omitempty"`
-	Properties           map[string]Schema `json:"properties,omitempty"`
-	AdditionalProperties *SchemaOrBool     `json:"additionalProperties,omitempty"`
-	PatternProperties    map[string]Schema `json:"patternProperties,omitempty"`
-	Dependencies         Dependencies      `json:"dependencies,omitempty"`
-	AdditionalItems      *SchemaOrBool     `json:"additionalItems,omitempty"`
-	Definitions          Definitions       `json:"definitions,omitempty"`
-}
-
-type SwaggerSchemaProps struct {
-	Discriminator string                 `json:"discriminator,omitempty"`
-	ReadOnly      bool                   `json:"readOnly,omitempty"`
-	XML           *XMLObject             `json:"xml,omitempty"`
-	ExternalDocs  *ExternalDocumentation `json:"externalDocs,omitempty"`
-	Example       interface{}            `json:"example,omitempty"`
-}
-
-// Schema the schema object allows the definition of input and output data types.
-// These types can be objects, but also primitives and arrays.
-// This object is based on the [JSON Schema Specification Draft 4](http://json-schema.org/)
-// and uses a predefined subset of it.
-// On top of this subset, there are extensions provided by this specification to allow for more complete documentation.
-//
-// For more information: http://goo.gl/8us55a#schemaObject
-type Schema struct {
-	VendorExtensible
-	SchemaProps
-	SwaggerSchemaProps
-	ExtraProps map[string]interface{} `json:"-"`
-}
-
-// JSONLookup implements an interface to customize json pointer lookup
-func (s Schema) JSONLookup(token string) (interface{}, error) {
-	if ex, ok := s.Extensions[token]; ok {
-		return &ex, nil
-	}
-
-	if ex, ok := s.ExtraProps[token]; ok {
-		return &ex, nil
-	}
-
-	r, _, err := jsonpointer.GetForToken(s.SchemaProps, token)
-	if r != nil || (err != nil && !strings.HasPrefix(err.Error(), "object has no field")) {
-		return r, err
-	}
-	r, _, err = jsonpointer.GetForToken(s.SwaggerSchemaProps, token)
-	return r, err
-}
-
-// WithID sets the id for this schema, allows for chaining
-func (s *Schema) WithID(id string) *Schema {
-	s.ID = id
-	return s
-}
-
-// WithTitle sets the title for this schema, allows for chaining
-func (s *Schema) WithTitle(title string) *Schema {
-	s.Title = title
-	return s
-}
-
-// WithDescription sets the description for this schema, allows for chaining
-func (s *Schema) WithDescription(description string) *Schema {
-	s.Description = description
-	return s
-}
-
-// WithProperties sets the properties for this schema
-func (s *Schema) WithProperties(schemas map[string]Schema) *Schema {
-	s.Properties = schemas
-	return s
-}
-
-// SetProperty sets a property on this schema
-func (s *Schema) SetProperty(name string, schema Schema) *Schema {
-	if s.Properties == nil {
-		s.Properties = make(map[string]Schema)
-	}
-	s.Properties[name] = schema
-	return s
-}
-
-// WithAllOf sets the all of property
-func (s *Schema) WithAllOf(schemas ...Schema) *Schema {
-	s.AllOf = schemas
-	return s
-}
-
-// WithMaxProperties sets the max number of properties an object can have
-func (s *Schema) WithMaxProperties(max int64) *Schema {
-	s.MaxProperties = &max
-	return s
-}
-
-// WithMinProperties sets the min number of properties an object must have
-func (s *Schema) WithMinProperties(min int64) *Schema {
-	s.MinProperties = &min
-	return s
-}
-
-// Typed sets the type of this schema for a single value item
-func (s *Schema) Typed(tpe, format string) *Schema {
-	s.Type = []string{tpe}
-	s.Format = format
-	return s
-}
-
-// AddType adds a type with potential format to the types for this schema
-func (s *Schema) AddType(tpe, format string) *Schema {
-	s.Type = append(s.Type, tpe)
-	if format != "" {
-		s.Format = format
-	}
-	return s
-}
-
-// CollectionOf a fluent builder method for an array parameter
-func (s *Schema) CollectionOf(items Schema) *Schema {
-	s.Type = []string{"array"}
-	s.Items = &SchemaOrArray{Schema: &items}
-	return s
-}
-
-// WithDefault sets the default value on this parameter
-func (s *Schema) WithDefault(defaultValue interface{}) *Schema {
-	s.Default = defaultValue
-	return s
-}
-
-// WithRequired flags this parameter as required
-func (s *Schema) WithRequired(items ...string) *Schema {
-	s.Required = items
-	return s
-}
-
-// AddRequired  adds field names to the required properties array
-func (s *Schema) AddRequired(items ...string) *Schema {
-	s.Required = append(s.Required, items...)
-	return s
-}
-
-// WithMaxLength sets a max length value
-func (s *Schema) WithMaxLength(max int64) *Schema {
-	s.MaxLength = &max
-	return s
-}
-
-// WithMinLength sets a min length value
-func (s *Schema) WithMinLength(min int64) *Schema {
-	s.MinLength = &min
-	return s
-}
-
-// WithPattern sets a pattern value
-func (s *Schema) WithPattern(pattern string) *Schema {
-	s.Pattern = pattern
-	return s
-}
-
-// WithMultipleOf sets a multiple of value
-func (s *Schema) WithMultipleOf(number float64) *Schema {
-	s.MultipleOf = &number
-	return s
-}
-
-// WithMaximum sets a maximum number value
-func (s *Schema) WithMaximum(max float64, exclusive bool) *Schema {
-	s.Maximum = &max
-	s.ExclusiveMaximum = exclusive
-	return s
-}
-
-// WithMinimum sets a minimum number value
-func (s *Schema) WithMinimum(min float64, exclusive bool) *Schema {
-	s.Minimum = &min
-	s.ExclusiveMinimum = exclusive
-	return s
-}
-
-// WithEnum sets a the enum values (replace)
-func (s *Schema) WithEnum(values ...interface{}) *Schema {
-	s.Enum = append([]interface{}{}, values...)
-	return s
-}
-
-// WithMaxItems sets the max items
-func (s *Schema) WithMaxItems(size int64) *Schema {
-	s.MaxItems = &size
-	return s
-}
-
-// WithMinItems sets the min items
-func (s *Schema) WithMinItems(size int64) *Schema {
-	s.MinItems = &size
-	return s
-}
-
-// UniqueValues dictates that this array can only have unique items
-func (s *Schema) UniqueValues() *Schema {
-	s.UniqueItems = true
-	return s
-}
-
-// AllowDuplicates this array can have duplicates
-func (s *Schema) AllowDuplicates() *Schema {
-	s.UniqueItems = false
-	return s
-}
-
-// AddToAllOf adds a schema to the allOf property
-func (s *Schema) AddToAllOf(schemas ...Schema) *Schema {
-	s.AllOf = append(s.AllOf, schemas...)
-	return s
-}
-
-// WithDiscriminator sets the name of the discriminator field
-func (s *Schema) WithDiscriminator(discriminator string) *Schema {
-	s.Discriminator = discriminator
-	return s
-}
-
-// AsReadOnly flags this schema as readonly
-func (s *Schema) AsReadOnly() *Schema {
-	s.ReadOnly = true
-	return s
-}
-
-// AsWritable flags this schema as writeable (not read-only)
-func (s *Schema) AsWritable() *Schema {
-	s.ReadOnly = false
-	return s
-}
-
-// WithExample sets the example for this schema
-func (s *Schema) WithExample(example interface{}) *Schema {
-	s.Example = example
-	return s
-}
-
-// WithExternalDocs sets/removes the external docs for/from this schema.
-// When you pass empty strings as params the external documents will be removed.
-// When you pass non-empty string as one value then those values will be used on the external docs object.
-// So when you pass a non-empty description, you should also pass the url and vice versa.
-func (s *Schema) WithExternalDocs(description, url string) *Schema {
-	if description == "" && url == "" {
-		s.ExternalDocs = nil
-		return s
-	}
-
-	if s.ExternalDocs == nil {
-		s.ExternalDocs = &ExternalDocumentation{}
-	}
-	s.ExternalDocs.Description = description
-	s.ExternalDocs.URL = url
-	return s
-}
-
-// WithXMLName sets the xml name for the object
-func (s *Schema) WithXMLName(name string) *Schema {
-	if s.XML == nil {
-		s.XML = new(XMLObject)
-	}
-	s.XML.Name = name
-	return s
-}
-
-// WithXMLNamespace sets the xml namespace for the object
-func (s *Schema) WithXMLNamespace(namespace string) *Schema {
-	if s.XML == nil {
-		s.XML = new(XMLObject)
-	}
-	s.XML.Namespace = namespace
-	return s
-}
-
-// WithXMLPrefix sets the xml prefix for the object
-func (s *Schema) WithXMLPrefix(prefix string) *Schema {
-	if s.XML == nil {
-		s.XML = new(XMLObject)
-	}
-	s.XML.Prefix = prefix
-	return s
-}
-
-// AsXMLAttribute flags this object as xml attribute
-func (s *Schema) AsXMLAttribute() *Schema {
-	if s.XML == nil {
-		s.XML = new(XMLObject)
-	}
-	s.XML.Attribute = true
-	return s
-}
-
-// AsXMLElement flags this object as an xml node
-func (s *Schema) AsXMLElement() *Schema {
-	if s.XML == nil {
-		s.XML = new(XMLObject)
-	}
-	s.XML.Attribute = false
-	return s
-}
-
-// AsWrappedXML flags this object as wrapped, this is mostly useful for array types
-func (s *Schema) AsWrappedXML() *Schema {
-	if s.XML == nil {
-		s.XML = new(XMLObject)
-	}
-	s.XML.Wrapped = true
-	return s
-}
-
-// AsUnwrappedXML flags this object as an xml node
-func (s *Schema) AsUnwrappedXML() *Schema {
-	if s.XML == nil {
-		s.XML = new(XMLObject)
-	}
-	s.XML.Wrapped = false
-	return s
-}
-
-// MarshalJSON marshal this to JSON
-func (s Schema) MarshalJSON() ([]byte, error) {
-	b1, err := json.Marshal(s.SchemaProps)
-	if err != nil {
-		return nil, fmt.Errorf("schema props %v", err)
-	}
-	b2, err := json.Marshal(s.VendorExtensible)
-	if err != nil {
-		return nil, fmt.Errorf("vendor props %v", err)
-	}
-	b3, err := s.Ref.MarshalJSON()
-	if err != nil {
-		return nil, fmt.Errorf("ref prop %v", err)
-	}
-	b4, err := s.Schema.MarshalJSON()
-	if err != nil {
-		return nil, fmt.Errorf("schema prop %v", err)
-	}
-	b5, err := json.Marshal(s.SwaggerSchemaProps)
-	if err != nil {
-		return nil, fmt.Errorf("common validations %v", err)
-	}
-	var b6 []byte
-	if s.ExtraProps != nil {
-		jj, err := json.Marshal(s.ExtraProps)
-		if err != nil {
-			return nil, fmt.Errorf("extra props %v", err)
-		}
-		b6 = jj
-	}
-	return swag.ConcatJSON(b1, b2, b3, b4, b5, b6), nil
-}
-
-// UnmarshalJSON marshal this from JSON
-func (s *Schema) UnmarshalJSON(data []byte) error {
-	var sch Schema
-	if err := json.Unmarshal(data, &sch.SchemaProps); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &sch.Ref); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &sch.Schema); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &sch.SwaggerSchemaProps); err != nil {
-		return err
-	}
-
-	var d map[string]interface{}
-	if err := json.Unmarshal(data, &d); err != nil {
-		return err
-	}
-
-	delete(d, "$ref")
-	delete(d, "$schema")
-	for _, pn := range swag.DefaultJSONNameProvider.GetJSONNames(s) {
-		delete(d, pn)
-	}
-
-	for k, vv := range d {
-		lk := strings.ToLower(k)
-		if strings.HasPrefix(lk, "x-") {
-			if sch.Extensions == nil {
-				sch.Extensions = map[string]interface{}{}
-			}
-			sch.Extensions[k] = vv
-			continue
-		}
-		if sch.ExtraProps == nil {
-			sch.ExtraProps = map[string]interface{}{}
-		}
-		sch.ExtraProps[k] = vv
-	}
-
-	*s = sch
-
-	return nil
-}
diff --git a/vendor/github.com/go-openapi/spec/security_scheme.go b/vendor/github.com/go-openapi/spec/security_scheme.go
deleted file mode 100644
index 22d4f10af2..0000000000
--- a/vendor/github.com/go-openapi/spec/security_scheme.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-
-	"github.com/go-openapi/jsonpointer"
-	"github.com/go-openapi/swag"
-)
-
-const (
-	basic       = "basic"
-	apiKey      = "apiKey"
-	oauth2      = "oauth2"
-	implicit    = "implicit"
-	password    = "password"
-	application = "application"
-	accessCode  = "accessCode"
-)
-
-// BasicAuth creates a basic auth security scheme
-func BasicAuth() *SecurityScheme {
-	return &SecurityScheme{SecuritySchemeProps: SecuritySchemeProps{Type: basic}}
-}
-
-// APIKeyAuth creates an api key auth security scheme
-func APIKeyAuth(fieldName, valueSource string) *SecurityScheme {
-	return &SecurityScheme{SecuritySchemeProps: SecuritySchemeProps{Type: apiKey, Name: fieldName, In: valueSource}}
-}
-
-// OAuth2Implicit creates an implicit flow oauth2 security scheme
-func OAuth2Implicit(authorizationURL string) *SecurityScheme {
-	return &SecurityScheme{SecuritySchemeProps: SecuritySchemeProps{
-		Type:             oauth2,
-		Flow:             implicit,
-		AuthorizationURL: authorizationURL,
-	}}
-}
-
-// OAuth2Password creates a password flow oauth2 security scheme
-func OAuth2Password(tokenURL string) *SecurityScheme {
-	return &SecurityScheme{SecuritySchemeProps: SecuritySchemeProps{
-		Type:     oauth2,
-		Flow:     password,
-		TokenURL: tokenURL,
-	}}
-}
-
-// OAuth2Application creates an application flow oauth2 security scheme
-func OAuth2Application(tokenURL string) *SecurityScheme {
-	return &SecurityScheme{SecuritySchemeProps: SecuritySchemeProps{
-		Type:     oauth2,
-		Flow:     application,
-		TokenURL: tokenURL,
-	}}
-}
-
-// OAuth2AccessToken creates an access token flow oauth2 security scheme
-func OAuth2AccessToken(authorizationURL, tokenURL string) *SecurityScheme {
-	return &SecurityScheme{SecuritySchemeProps: SecuritySchemeProps{
-		Type:             oauth2,
-		Flow:             accessCode,
-		AuthorizationURL: authorizationURL,
-		TokenURL:         tokenURL,
-	}}
-}
-
-type SecuritySchemeProps struct {
-	Description      string            `json:"description,omitempty"`
-	Type             string            `json:"type"`
-	Name             string            `json:"name,omitempty"`             // api key
-	In               string            `json:"in,omitempty"`               // api key
-	Flow             string            `json:"flow,omitempty"`             // oauth2
-	AuthorizationURL string            `json:"authorizationUrl,omitempty"` // oauth2
-	TokenURL         string            `json:"tokenUrl,omitempty"`         // oauth2
-	Scopes           map[string]string `json:"scopes,omitempty"`           // oauth2
-}
-
-// AddScope adds a scope to this security scheme
-func (s *SecuritySchemeProps) AddScope(scope, description string) {
-	if s.Scopes == nil {
-		s.Scopes = make(map[string]string)
-	}
-	s.Scopes[scope] = description
-}
-
-// SecurityScheme allows the definition of a security scheme that can be used by the operations.
-// Supported schemes are basic authentication, an API key (either as a header or as a query parameter)
-// and OAuth2's common flows (implicit, password, application and access code).
-//
-// For more information: http://goo.gl/8us55a#securitySchemeObject
-type SecurityScheme struct {
-	VendorExtensible
-	SecuritySchemeProps
-}
-
-// JSONLookup implements an interface to customize json pointer lookup
-func (s SecurityScheme) JSONLookup(token string) (interface{}, error) {
-	if ex, ok := s.Extensions[token]; ok {
-		return &ex, nil
-	}
-
-	r, _, err := jsonpointer.GetForToken(s.SecuritySchemeProps, token)
-	return r, err
-}
-
-// MarshalJSON marshal this to JSON
-func (s SecurityScheme) MarshalJSON() ([]byte, error) {
-	b1, err := json.Marshal(s.SecuritySchemeProps)
-	if err != nil {
-		return nil, err
-	}
-	b2, err := json.Marshal(s.VendorExtensible)
-	if err != nil {
-		return nil, err
-	}
-	return swag.ConcatJSON(b1, b2), nil
-}
-
-// UnmarshalJSON marshal this from JSON
-func (s *SecurityScheme) UnmarshalJSON(data []byte) error {
-	if err := json.Unmarshal(data, &s.SecuritySchemeProps); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &s.VendorExtensible); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/vendor/github.com/go-openapi/spec/spec.go b/vendor/github.com/go-openapi/spec/spec.go
deleted file mode 100644
index 0bb045bc06..0000000000
--- a/vendor/github.com/go-openapi/spec/spec.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import "encoding/json"
-
-//go:generate curl -L --progress -o ./schemas/v2/schema.json http://swagger.io/v2/schema.json
-//go:generate curl -L --progress  -o ./schemas/jsonschema-draft-04.json http://json-schema.org/draft-04/schema
-//go:generate go-bindata -pkg=spec -prefix=./schemas -ignore=.*\.md ./schemas/...
-//go:generate perl -pi -e s,Json,JSON,g bindata.go
-
-const (
-	// SwaggerSchemaURL the url for the swagger 2.0 schema to validate specs
-	SwaggerSchemaURL = "http://swagger.io/v2/schema.json#"
-	// JSONSchemaURL the url for the json schema schema
-	JSONSchemaURL = "http://json-schema.org/draft-04/schema#"
-)
-
-var (
-	jsonSchema    *Schema
-	swaggerSchema *Schema
-)
-
-func init() {
-	jsonSchema = MustLoadJSONSchemaDraft04()
-	swaggerSchema = MustLoadSwagger20Schema()
-}
-
-// MustLoadJSONSchemaDraft04 panics when Swagger20Schema returns an error
-func MustLoadJSONSchemaDraft04() *Schema {
-	d, e := JSONSchemaDraft04()
-	if e != nil {
-		panic(e)
-	}
-	return d
-}
-
-// JSONSchemaDraft04 loads the json schema document for json shema draft04
-func JSONSchemaDraft04() (*Schema, error) {
-	b, err := Asset("jsonschema-draft-04.json")
-	if err != nil {
-		return nil, err
-	}
-
-	schema := new(Schema)
-	if err := json.Unmarshal(b, schema); err != nil {
-		return nil, err
-	}
-	return schema, nil
-}
-
-// MustLoadSwagger20Schema panics when Swagger20Schema returns an error
-func MustLoadSwagger20Schema() *Schema {
-	d, e := Swagger20Schema()
-	if e != nil {
-		panic(e)
-	}
-	return d
-}
-
-// Swagger20Schema loads the swagger 2.0 schema from the embedded assets
-func Swagger20Schema() (*Schema, error) {
-
-	b, err := Asset("v2/schema.json")
-	if err != nil {
-		return nil, err
-	}
-
-	schema := new(Schema)
-	if err := json.Unmarshal(b, schema); err != nil {
-		return nil, err
-	}
-	return schema, nil
-}
diff --git a/vendor/github.com/go-openapi/spec/swagger.go b/vendor/github.com/go-openapi/spec/swagger.go
deleted file mode 100644
index 393a316778..0000000000
--- a/vendor/github.com/go-openapi/spec/swagger.go
+++ /dev/null
@@ -1,317 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-	"fmt"
-	"strconv"
-
-	"github.com/go-openapi/jsonpointer"
-	"github.com/go-openapi/swag"
-)
-
-// Swagger this is the root document object for the API specification.
-// It combines what previously was the Resource Listing and API Declaration (version 1.2 and earlier) together into one document.
-//
-// For more information: http://goo.gl/8us55a#swagger-object-
-type Swagger struct {
-	VendorExtensible
-	SwaggerProps
-}
-
-// JSONLookup look up a value by the json property name
-func (s Swagger) JSONLookup(token string) (interface{}, error) {
-	if ex, ok := s.Extensions[token]; ok {
-		return &ex, nil
-	}
-	r, _, err := jsonpointer.GetForToken(s.SwaggerProps, token)
-	return r, err
-}
-
-// MarshalJSON marshals this swagger structure to json
-func (s Swagger) MarshalJSON() ([]byte, error) {
-	b1, err := json.Marshal(s.SwaggerProps)
-	if err != nil {
-		return nil, err
-	}
-	b2, err := json.Marshal(s.VendorExtensible)
-	if err != nil {
-		return nil, err
-	}
-	return swag.ConcatJSON(b1, b2), nil
-}
-
-// UnmarshalJSON unmarshals a swagger spec from json
-func (s *Swagger) UnmarshalJSON(data []byte) error {
-	var sw Swagger
-	if err := json.Unmarshal(data, &sw.SwaggerProps); err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &sw.VendorExtensible); err != nil {
-		return err
-	}
-	*s = sw
-	return nil
-}
-
-type SwaggerProps struct {
-	ID                  string                 `json:"id,omitempty"`
-	Consumes            []string               `json:"consumes,omitempty"`
-	Produces            []string               `json:"produces,omitempty"`
-	Schemes             []string               `json:"schemes,omitempty"` // the scheme, when present must be from [http, https, ws, wss]
-	Swagger             string                 `json:"swagger,omitempty"`
-	Info                *Info                  `json:"info,omitempty"`
-	Host                string                 `json:"host,omitempty"`
-	BasePath            string                 `json:"basePath,omitempty"` // must start with a leading "/"
-	Paths               *Paths                 `json:"paths"`              // required
-	Definitions         Definitions            `json:"definitions,omitempty"`
-	Parameters          map[string]Parameter   `json:"parameters,omitempty"`
-	Responses           map[string]Response    `json:"responses,omitempty"`
-	SecurityDefinitions SecurityDefinitions    `json:"securityDefinitions,omitempty"`
-	Security            []map[string][]string  `json:"security,omitempty"`
-	Tags                []Tag                  `json:"tags,omitempty"`
-	ExternalDocs        *ExternalDocumentation `json:"externalDocs,omitempty"`
-}
-
-// Dependencies represent a dependencies property
-type Dependencies map[string]SchemaOrStringArray
-
-// SchemaOrBool represents a schema or boolean value, is biased towards true for the boolean property
-type SchemaOrBool struct {
-	Allows bool
-	Schema *Schema
-}
-
-// JSONLookup implements an interface to customize json pointer lookup
-func (s SchemaOrBool) JSONLookup(token string) (interface{}, error) {
-	if token == "allows" {
-		return s.Allows, nil
-	}
-	r, _, err := jsonpointer.GetForToken(s.Schema, token)
-	return r, err
-}
-
-var jsTrue = []byte("true")
-var jsFalse = []byte("false")
-
-// MarshalJSON convert this object to JSON
-func (s SchemaOrBool) MarshalJSON() ([]byte, error) {
-	if s.Schema != nil {
-		return json.Marshal(s.Schema)
-	}
-
-	if s.Schema == nil && !s.Allows {
-		return jsFalse, nil
-	}
-	return jsTrue, nil
-}
-
-// UnmarshalJSON converts this bool or schema object from a JSON structure
-func (s *SchemaOrBool) UnmarshalJSON(data []byte) error {
-	var nw SchemaOrBool
-	if len(data) >= 4 {
-		if data[0] == '{' {
-			var sch Schema
-			if err := json.Unmarshal(data, &sch); err != nil {
-				return err
-			}
-			nw.Schema = &sch
-		}
-		nw.Allows = !(data[0] == 'f' && data[1] == 'a' && data[2] == 'l' && data[3] == 's' && data[4] == 'e')
-	}
-	*s = nw
-	return nil
-}
-
-// SchemaOrStringArray represents a schema or a string array
-type SchemaOrStringArray struct {
-	Schema   *Schema
-	Property []string
-}
-
-// JSONLookup implements an interface to customize json pointer lookup
-func (s SchemaOrStringArray) JSONLookup(token string) (interface{}, error) {
-	r, _, err := jsonpointer.GetForToken(s.Schema, token)
-	return r, err
-}
-
-// MarshalJSON converts this schema object or array into JSON structure
-func (s SchemaOrStringArray) MarshalJSON() ([]byte, error) {
-	if len(s.Property) > 0 {
-		return json.Marshal(s.Property)
-	}
-	if s.Schema != nil {
-		return json.Marshal(s.Schema)
-	}
-	return nil, nil
-}
-
-// UnmarshalJSON converts this schema object or array from a JSON structure
-func (s *SchemaOrStringArray) UnmarshalJSON(data []byte) error {
-	var first byte
-	if len(data) > 1 {
-		first = data[0]
-	}
-	var nw SchemaOrStringArray
-	if first == '{' {
-		var sch Schema
-		if err := json.Unmarshal(data, &sch); err != nil {
-			return err
-		}
-		nw.Schema = &sch
-	}
-	if first == '[' {
-		if err := json.Unmarshal(data, &nw.Property); err != nil {
-			return err
-		}
-	}
-	*s = nw
-	return nil
-}
-
-// Definitions contains the models explicitly defined in this spec
-// An object to hold data types that can be consumed and produced by operations.
-// These data types can be primitives, arrays or models.
-//
-// For more information: http://goo.gl/8us55a#definitionsObject
-type Definitions map[string]Schema
-
-// SecurityDefinitions a declaration of the security schemes available to be used in the specification.
-// This does not enforce the security schemes on the operations and only serves to provide
-// the relevant details for each scheme.
-//
-// For more information: http://goo.gl/8us55a#securityDefinitionsObject
-type SecurityDefinitions map[string]*SecurityScheme
-
-// StringOrArray represents a value that can either be a string
-// or an array of strings. Mainly here for serialization purposes
-type StringOrArray []string
-
-// Contains returns true when the value is contained in the slice
-func (s StringOrArray) Contains(value string) bool {
-	for _, str := range s {
-		if str == value {
-			return true
-		}
-	}
-	return false
-}
-
-// JSONLookup implements an interface to customize json pointer lookup
-func (s SchemaOrArray) JSONLookup(token string) (interface{}, error) {
-	if _, err := strconv.Atoi(token); err == nil {
-		r, _, err := jsonpointer.GetForToken(s.Schemas, token)
-		return r, err
-	}
-	r, _, err := jsonpointer.GetForToken(s.Schema, token)
-	return r, err
-}
-
-// UnmarshalJSON unmarshals this string or array object from a JSON array or JSON string
-func (s *StringOrArray) UnmarshalJSON(data []byte) error {
-	var first byte
-	if len(data) > 1 {
-		first = data[0]
-	}
-
-	if first == '[' {
-		var parsed []string
-		if err := json.Unmarshal(data, &parsed); err != nil {
-			return err
-		}
-		*s = StringOrArray(parsed)
-		return nil
-	}
-
-	var single interface{}
-	if err := json.Unmarshal(data, &single); err != nil {
-		return err
-	}
-	if single == nil {
-		return nil
-	}
-	switch single.(type) {
-	case string:
-		*s = StringOrArray([]string{single.(string)})
-		return nil
-	default:
-		return fmt.Errorf("only string or array is allowed, not %T", single)
-	}
-}
-
-// MarshalJSON converts this string or array to a JSON array or JSON string
-func (s StringOrArray) MarshalJSON() ([]byte, error) {
-	if len(s) == 1 {
-		return json.Marshal([]string(s)[0])
-	}
-	return json.Marshal([]string(s))
-}
-
-// SchemaOrArray represents a value that can either be a Schema
-// or an array of Schema. Mainly here for serialization purposes
-type SchemaOrArray struct {
-	Schema  *Schema
-	Schemas []Schema
-}
-
-// Len returns the number of schemas in this property
-func (s SchemaOrArray) Len() int {
-	if s.Schema != nil {
-		return 1
-	}
-	return len(s.Schemas)
-}
-
-// ContainsType returns true when one of the schemas is of the specified type
-func (s *SchemaOrArray) ContainsType(name string) bool {
-	if s.Schema != nil {
-		return s.Schema.Type != nil && s.Schema.Type.Contains(name)
-	}
-	return false
-}
-
-// MarshalJSON converts this schema object or array into JSON structure
-func (s SchemaOrArray) MarshalJSON() ([]byte, error) {
-	if len(s.Schemas) > 0 {
-		return json.Marshal(s.Schemas)
-	}
-	return json.Marshal(s.Schema)
-}
-
-// UnmarshalJSON converts this schema object or array from a JSON structure
-func (s *SchemaOrArray) UnmarshalJSON(data []byte) error {
-	var nw SchemaOrArray
-	var first byte
-	if len(data) > 1 {
-		first = data[0]
-	}
-	if first == '{' {
-		var sch Schema
-		if err := json.Unmarshal(data, &sch); err != nil {
-			return err
-		}
-		nw.Schema = &sch
-	}
-	if first == '[' {
-		if err := json.Unmarshal(data, &nw.Schemas); err != nil {
-			return err
-		}
-	}
-	*s = nw
-	return nil
-}
-
-// vim:set ft=go noet sts=2 sw=2 ts=2:
diff --git a/vendor/github.com/go-openapi/spec/tag.go b/vendor/github.com/go-openapi/spec/tag.go
deleted file mode 100644
index 97f555840c..0000000000
--- a/vendor/github.com/go-openapi/spec/tag.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"encoding/json"
-
-	"github.com/go-openapi/jsonpointer"
-	"github.com/go-openapi/swag"
-)
-
-type TagProps struct {
-	Description  string                 `json:"description,omitempty"`
-	Name         string                 `json:"name,omitempty"`
-	ExternalDocs *ExternalDocumentation `json:"externalDocs,omitempty"`
-}
-
-// NewTag creates a new tag
-func NewTag(name, description string, externalDocs *ExternalDocumentation) Tag {
-	return Tag{TagProps: TagProps{description, name, externalDocs}}
-}
-
-// Tag allows adding meta data to a single tag that is used by the [Operation Object](http://goo.gl/8us55a#operationObject).
-// It is not mandatory to have a Tag Object per tag used there.
-//
-// For more information: http://goo.gl/8us55a#tagObject
-type Tag struct {
-	VendorExtensible
-	TagProps
-}
-
-// JSONLookup implements an interface to customize json pointer lookup
-func (t Tag) JSONLookup(token string) (interface{}, error) {
-	if ex, ok := t.Extensions[token]; ok {
-		return &ex, nil
-	}
-
-	r, _, err := jsonpointer.GetForToken(t.TagProps, token)
-	return r, err
-}
-
-// MarshalJSON marshal this to JSON
-func (t Tag) MarshalJSON() ([]byte, error) {
-	b1, err := json.Marshal(t.TagProps)
-	if err != nil {
-		return nil, err
-	}
-	b2, err := json.Marshal(t.VendorExtensible)
-	if err != nil {
-		return nil, err
-	}
-	return swag.ConcatJSON(b1, b2), nil
-}
-
-// UnmarshalJSON marshal this from JSON
-func (t *Tag) UnmarshalJSON(data []byte) error {
-	if err := json.Unmarshal(data, &t.TagProps); err != nil {
-		return err
-	}
-	return json.Unmarshal(data, &t.VendorExtensible)
-}
diff --git a/vendor/github.com/go-openapi/spec/xml_object.go b/vendor/github.com/go-openapi/spec/xml_object.go
deleted file mode 100644
index 945a46703d..0000000000
--- a/vendor/github.com/go-openapi/spec/xml_object.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-// XMLObject a metadata object that allows for more fine-tuned XML model definitions.
-//
-// For more information: http://goo.gl/8us55a#xmlObject
-type XMLObject struct {
-	Name      string `json:"name,omitempty"`
-	Namespace string `json:"namespace,omitempty"`
-	Prefix    string `json:"prefix,omitempty"`
-	Attribute bool   `json:"attribute,omitempty"`
-	Wrapped   bool   `json:"wrapped,omitempty"`
-}
-
-// WithName sets the xml name for the object
-func (x *XMLObject) WithName(name string) *XMLObject {
-	x.Name = name
-	return x
-}
-
-// WithNamespace sets the xml namespace for the object
-func (x *XMLObject) WithNamespace(namespace string) *XMLObject {
-	x.Namespace = namespace
-	return x
-}
-
-// WithPrefix sets the xml prefix for the object
-func (x *XMLObject) WithPrefix(prefix string) *XMLObject {
-	x.Prefix = prefix
-	return x
-}
-
-// AsAttribute flags this object as xml attribute
-func (x *XMLObject) AsAttribute() *XMLObject {
-	x.Attribute = true
-	return x
-}
-
-// AsElement flags this object as an xml node
-func (x *XMLObject) AsElement() *XMLObject {
-	x.Attribute = false
-	return x
-}
-
-// AsWrapped flags this object as wrapped, this is mostly useful for array types
-func (x *XMLObject) AsWrapped() *XMLObject {
-	x.Wrapped = true
-	return x
-}
-
-// AsUnwrapped flags this object as an xml node
-func (x *XMLObject) AsUnwrapped() *XMLObject {
-	x.Wrapped = false
-	return x
-}
diff --git a/vendor/github.com/go-openapi/swag/CODE_OF_CONDUCT.md b/vendor/github.com/go-openapi/swag/CODE_OF_CONDUCT.md
deleted file mode 100644
index 9322b065e3..0000000000
--- a/vendor/github.com/go-openapi/swag/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at ivan+abuse@flanders.co.nz. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/vendor/github.com/go-openapi/swag/LICENSE b/vendor/github.com/go-openapi/swag/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/vendor/github.com/go-openapi/swag/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/go-openapi/swag/README.md b/vendor/github.com/go-openapi/swag/README.md
deleted file mode 100644
index 5d43728e87..0000000000
--- a/vendor/github.com/go-openapi/swag/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Swag [![Build Status](https://travis-ci.org/go-openapi/swag.svg?branch=master)](https://travis-ci.org/go-openapi/swag) [![codecov](https://codecov.io/gh/go-openapi/swag/branch/master/graph/badge.svg)](https://codecov.io/gh/go-openapi/swag) [![Slack Status](https://slackin.goswagger.io/badge.svg)](https://slackin.goswagger.io)
-
-[![license](http://img.shields.io/badge/license-Apache%20v2-orange.svg)](https://raw.githubusercontent.com/go-openapi/swag/master/LICENSE) [![GoDoc](https://godoc.org/github.com/go-openapi/swag?status.svg)](http://godoc.org/github.com/go-openapi/swag)
-
-Contains a bunch of helper functions:
-
-* convert between value and pointers for builtins
-* convert from string to builtin
-* fast json concatenation
-* search in path
-* load from file or http
-* name manglin
\ No newline at end of file
diff --git a/vendor/github.com/go-openapi/swag/convert.go b/vendor/github.com/go-openapi/swag/convert.go
deleted file mode 100644
index 2bf5ecbba2..0000000000
--- a/vendor/github.com/go-openapi/swag/convert.go
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package swag
-
-import (
-	"math"
-	"strconv"
-	"strings"
-)
-
-// same as ECMA Number.MAX_SAFE_INTEGER and Number.MIN_SAFE_INTEGER
-const (
-	maxJSONFloat = float64(1<<53 - 1)  // 9007199254740991.0 	 	 2^53 - 1
-	minJSONFloat = -float64(1<<53 - 1) //-9007199254740991.0	-2^53 - 1
-)
-
-// IsFloat64AJSONInteger allow for integers [-2^53, 2^53-1] inclusive
-func IsFloat64AJSONInteger(f float64) bool {
-	if math.IsNaN(f) || math.IsInf(f, 0) || f < minJSONFloat || f > maxJSONFloat {
-		return false
-	}
-
-	return f == float64(int64(f)) || f == float64(uint64(f))
-}
-
-var evaluatesAsTrue = map[string]struct{}{
-	"true":     struct{}{},
-	"1":        struct{}{},
-	"yes":      struct{}{},
-	"ok":       struct{}{},
-	"y":        struct{}{},
-	"on":       struct{}{},
-	"selected": struct{}{},
-	"checked":  struct{}{},
-	"t":        struct{}{},
-	"enabled":  struct{}{},
-}
-
-// ConvertBool turn a string into a boolean
-func ConvertBool(str string) (bool, error) {
-	_, ok := evaluatesAsTrue[strings.ToLower(str)]
-	return ok, nil
-}
-
-// ConvertFloat32 turn a string into a float32
-func ConvertFloat32(str string) (float32, error) {
-	f, err := strconv.ParseFloat(str, 32)
-	if err != nil {
-		return 0, err
-	}
-	return float32(f), nil
-}
-
-// ConvertFloat64 turn a string into a float64
-func ConvertFloat64(str string) (float64, error) {
-	return strconv.ParseFloat(str, 64)
-}
-
-// ConvertInt8 turn a string into int8 boolean
-func ConvertInt8(str string) (int8, error) {
-	i, err := strconv.ParseInt(str, 10, 8)
-	if err != nil {
-		return 0, err
-	}
-	return int8(i), nil
-}
-
-// ConvertInt16 turn a string into a int16
-func ConvertInt16(str string) (int16, error) {
-	i, err := strconv.ParseInt(str, 10, 16)
-	if err != nil {
-		return 0, err
-	}
-	return int16(i), nil
-}
-
-// ConvertInt32 turn a string into a int32
-func ConvertInt32(str string) (int32, error) {
-	i, err := strconv.ParseInt(str, 10, 32)
-	if err != nil {
-		return 0, err
-	}
-	return int32(i), nil
-}
-
-// ConvertInt64 turn a string into a int64
-func ConvertInt64(str string) (int64, error) {
-	return strconv.ParseInt(str, 10, 64)
-}
-
-// ConvertUint8 turn a string into a uint8
-func ConvertUint8(str string) (uint8, error) {
-	i, err := strconv.ParseUint(str, 10, 8)
-	if err != nil {
-		return 0, err
-	}
-	return uint8(i), nil
-}
-
-// ConvertUint16 turn a string into a uint16
-func ConvertUint16(str string) (uint16, error) {
-	i, err := strconv.ParseUint(str, 10, 16)
-	if err != nil {
-		return 0, err
-	}
-	return uint16(i), nil
-}
-
-// ConvertUint32 turn a string into a uint32
-func ConvertUint32(str string) (uint32, error) {
-	i, err := strconv.ParseUint(str, 10, 32)
-	if err != nil {
-		return 0, err
-	}
-	return uint32(i), nil
-}
-
-// ConvertUint64 turn a string into a uint64
-func ConvertUint64(str string) (uint64, error) {
-	return strconv.ParseUint(str, 10, 64)
-}
-
-// FormatBool turns a boolean into a string
-func FormatBool(value bool) string {
-	return strconv.FormatBool(value)
-}
-
-// FormatFloat32 turns a float32 into a string
-func FormatFloat32(value float32) string {
-	return strconv.FormatFloat(float64(value), 'f', -1, 32)
-}
-
-// FormatFloat64 turns a float64 into a string
-func FormatFloat64(value float64) string {
-	return strconv.FormatFloat(value, 'f', -1, 64)
-}
-
-// FormatInt8 turns an int8 into a string
-func FormatInt8(value int8) string {
-	return strconv.FormatInt(int64(value), 10)
-}
-
-// FormatInt16 turns an int16 into a string
-func FormatInt16(value int16) string {
-	return strconv.FormatInt(int64(value), 10)
-}
-
-// FormatInt32 turns an int32 into a string
-func FormatInt32(value int32) string {
-	return strconv.Itoa(int(value))
-}
-
-// FormatInt64 turns an int64 into a string
-func FormatInt64(value int64) string {
-	return strconv.FormatInt(value, 10)
-}
-
-// FormatUint8 turns an uint8 into a string
-func FormatUint8(value uint8) string {
-	return strconv.FormatUint(uint64(value), 10)
-}
-
-// FormatUint16 turns an uint16 into a string
-func FormatUint16(value uint16) string {
-	return strconv.FormatUint(uint64(value), 10)
-}
-
-// FormatUint32 turns an uint32 into a string
-func FormatUint32(value uint32) string {
-	return strconv.FormatUint(uint64(value), 10)
-}
-
-// FormatUint64 turns an uint64 into a string
-func FormatUint64(value uint64) string {
-	return strconv.FormatUint(value, 10)
-}
diff --git a/vendor/github.com/go-openapi/swag/convert_types.go b/vendor/github.com/go-openapi/swag/convert_types.go
deleted file mode 100644
index c95e4e78bd..0000000000
--- a/vendor/github.com/go-openapi/swag/convert_types.go
+++ /dev/null
@@ -1,595 +0,0 @@
-package swag
-
-import "time"
-
-// This file was taken from the aws go sdk
-
-// String returns a pointer to of the string value passed in.
-func String(v string) *string {
-	return &v
-}
-
-// StringValue returns the value of the string pointer passed in or
-// "" if the pointer is nil.
-func StringValue(v *string) string {
-	if v != nil {
-		return *v
-	}
-	return ""
-}
-
-// StringSlice converts a slice of string values into a slice of
-// string pointers
-func StringSlice(src []string) []*string {
-	dst := make([]*string, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// StringValueSlice converts a slice of string pointers into a slice of
-// string values
-func StringValueSlice(src []*string) []string {
-	dst := make([]string, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// StringMap converts a string map of string values into a string
-// map of string pointers
-func StringMap(src map[string]string) map[string]*string {
-	dst := make(map[string]*string)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// StringValueMap converts a string map of string pointers into a string
-// map of string values
-func StringValueMap(src map[string]*string) map[string]string {
-	dst := make(map[string]string)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Bool returns a pointer to of the bool value passed in.
-func Bool(v bool) *bool {
-	return &v
-}
-
-// BoolValue returns the value of the bool pointer passed in or
-// false if the pointer is nil.
-func BoolValue(v *bool) bool {
-	if v != nil {
-		return *v
-	}
-	return false
-}
-
-// BoolSlice converts a slice of bool values into a slice of
-// bool pointers
-func BoolSlice(src []bool) []*bool {
-	dst := make([]*bool, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// BoolValueSlice converts a slice of bool pointers into a slice of
-// bool values
-func BoolValueSlice(src []*bool) []bool {
-	dst := make([]bool, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// BoolMap converts a string map of bool values into a string
-// map of bool pointers
-func BoolMap(src map[string]bool) map[string]*bool {
-	dst := make(map[string]*bool)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// BoolValueMap converts a string map of bool pointers into a string
-// map of bool values
-func BoolValueMap(src map[string]*bool) map[string]bool {
-	dst := make(map[string]bool)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Int returns a pointer to of the int value passed in.
-func Int(v int) *int {
-	return &v
-}
-
-// IntValue returns the value of the int pointer passed in or
-// 0 if the pointer is nil.
-func IntValue(v *int) int {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// IntSlice converts a slice of int values into a slice of
-// int pointers
-func IntSlice(src []int) []*int {
-	dst := make([]*int, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// IntValueSlice converts a slice of int pointers into a slice of
-// int values
-func IntValueSlice(src []*int) []int {
-	dst := make([]int, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// IntMap converts a string map of int values into a string
-// map of int pointers
-func IntMap(src map[string]int) map[string]*int {
-	dst := make(map[string]*int)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// IntValueMap converts a string map of int pointers into a string
-// map of int values
-func IntValueMap(src map[string]*int) map[string]int {
-	dst := make(map[string]int)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Int32 returns a pointer to of the int64 value passed in.
-func Int32(v int32) *int32 {
-	return &v
-}
-
-// Int32Value returns the value of the int64 pointer passed in or
-// 0 if the pointer is nil.
-func Int32Value(v *int32) int32 {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// Int32Slice converts a slice of int64 values into a slice of
-// int32 pointers
-func Int32Slice(src []int32) []*int32 {
-	dst := make([]*int32, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// Int32ValueSlice converts a slice of int32 pointers into a slice of
-// int32 values
-func Int32ValueSlice(src []*int32) []int32 {
-	dst := make([]int32, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// Int32Map converts a string map of int32 values into a string
-// map of int32 pointers
-func Int32Map(src map[string]int32) map[string]*int32 {
-	dst := make(map[string]*int32)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// Int32ValueMap converts a string map of int32 pointers into a string
-// map of int32 values
-func Int32ValueMap(src map[string]*int32) map[string]int32 {
-	dst := make(map[string]int32)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Int64 returns a pointer to of the int64 value passed in.
-func Int64(v int64) *int64 {
-	return &v
-}
-
-// Int64Value returns the value of the int64 pointer passed in or
-// 0 if the pointer is nil.
-func Int64Value(v *int64) int64 {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// Int64Slice converts a slice of int64 values into a slice of
-// int64 pointers
-func Int64Slice(src []int64) []*int64 {
-	dst := make([]*int64, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// Int64ValueSlice converts a slice of int64 pointers into a slice of
-// int64 values
-func Int64ValueSlice(src []*int64) []int64 {
-	dst := make([]int64, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// Int64Map converts a string map of int64 values into a string
-// map of int64 pointers
-func Int64Map(src map[string]int64) map[string]*int64 {
-	dst := make(map[string]*int64)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// Int64ValueMap converts a string map of int64 pointers into a string
-// map of int64 values
-func Int64ValueMap(src map[string]*int64) map[string]int64 {
-	dst := make(map[string]int64)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Uint returns a pouinter to of the uint value passed in.
-func Uint(v uint) *uint {
-	return &v
-}
-
-// UintValue returns the value of the uint pouinter passed in or
-// 0 if the pouinter is nil.
-func UintValue(v *uint) uint {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// UintSlice converts a slice of uint values uinto a slice of
-// uint pouinters
-func UintSlice(src []uint) []*uint {
-	dst := make([]*uint, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// UintValueSlice converts a slice of uint pouinters uinto a slice of
-// uint values
-func UintValueSlice(src []*uint) []uint {
-	dst := make([]uint, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// UintMap converts a string map of uint values uinto a string
-// map of uint pouinters
-func UintMap(src map[string]uint) map[string]*uint {
-	dst := make(map[string]*uint)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// UintValueMap converts a string map of uint pouinters uinto a string
-// map of uint values
-func UintValueMap(src map[string]*uint) map[string]uint {
-	dst := make(map[string]uint)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Uint32 returns a pouinter to of the uint64 value passed in.
-func Uint32(v uint32) *uint32 {
-	return &v
-}
-
-// Uint32Value returns the value of the uint64 pouinter passed in or
-// 0 if the pouinter is nil.
-func Uint32Value(v *uint32) uint32 {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// Uint32Slice converts a slice of uint64 values uinto a slice of
-// uint32 pouinters
-func Uint32Slice(src []uint32) []*uint32 {
-	dst := make([]*uint32, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// Uint32ValueSlice converts a slice of uint32 pouinters uinto a slice of
-// uint32 values
-func Uint32ValueSlice(src []*uint32) []uint32 {
-	dst := make([]uint32, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// Uint32Map converts a string map of uint32 values uinto a string
-// map of uint32 pouinters
-func Uint32Map(src map[string]uint32) map[string]*uint32 {
-	dst := make(map[string]*uint32)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// Uint32ValueMap converts a string map of uint32 pouinters uinto a string
-// map of uint32 values
-func Uint32ValueMap(src map[string]*uint32) map[string]uint32 {
-	dst := make(map[string]uint32)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Uint64 returns a pouinter to of the uint64 value passed in.
-func Uint64(v uint64) *uint64 {
-	return &v
-}
-
-// Uint64Value returns the value of the uint64 pouinter passed in or
-// 0 if the pouinter is nil.
-func Uint64Value(v *uint64) uint64 {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// Uint64Slice converts a slice of uint64 values uinto a slice of
-// uint64 pouinters
-func Uint64Slice(src []uint64) []*uint64 {
-	dst := make([]*uint64, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// Uint64ValueSlice converts a slice of uint64 pouinters uinto a slice of
-// uint64 values
-func Uint64ValueSlice(src []*uint64) []uint64 {
-	dst := make([]uint64, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// Uint64Map converts a string map of uint64 values uinto a string
-// map of uint64 pouinters
-func Uint64Map(src map[string]uint64) map[string]*uint64 {
-	dst := make(map[string]*uint64)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// Uint64ValueMap converts a string map of uint64 pouinters uinto a string
-// map of uint64 values
-func Uint64ValueMap(src map[string]*uint64) map[string]uint64 {
-	dst := make(map[string]uint64)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Float64 returns a pointer to of the float64 value passed in.
-func Float64(v float64) *float64 {
-	return &v
-}
-
-// Float64Value returns the value of the float64 pointer passed in or
-// 0 if the pointer is nil.
-func Float64Value(v *float64) float64 {
-	if v != nil {
-		return *v
-	}
-	return 0
-}
-
-// Float64Slice converts a slice of float64 values into a slice of
-// float64 pointers
-func Float64Slice(src []float64) []*float64 {
-	dst := make([]*float64, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// Float64ValueSlice converts a slice of float64 pointers into a slice of
-// float64 values
-func Float64ValueSlice(src []*float64) []float64 {
-	dst := make([]float64, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// Float64Map converts a string map of float64 values into a string
-// map of float64 pointers
-func Float64Map(src map[string]float64) map[string]*float64 {
-	dst := make(map[string]*float64)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// Float64ValueMap converts a string map of float64 pointers into a string
-// map of float64 values
-func Float64ValueMap(src map[string]*float64) map[string]float64 {
-	dst := make(map[string]float64)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
-
-// Time returns a pointer to of the time.Time value passed in.
-func Time(v time.Time) *time.Time {
-	return &v
-}
-
-// TimeValue returns the value of the time.Time pointer passed in or
-// time.Time{} if the pointer is nil.
-func TimeValue(v *time.Time) time.Time {
-	if v != nil {
-		return *v
-	}
-	return time.Time{}
-}
-
-// TimeSlice converts a slice of time.Time values into a slice of
-// time.Time pointers
-func TimeSlice(src []time.Time) []*time.Time {
-	dst := make([]*time.Time, len(src))
-	for i := 0; i < len(src); i++ {
-		dst[i] = &(src[i])
-	}
-	return dst
-}
-
-// TimeValueSlice converts a slice of time.Time pointers into a slice of
-// time.Time values
-func TimeValueSlice(src []*time.Time) []time.Time {
-	dst := make([]time.Time, len(src))
-	for i := 0; i < len(src); i++ {
-		if src[i] != nil {
-			dst[i] = *(src[i])
-		}
-	}
-	return dst
-}
-
-// TimeMap converts a string map of time.Time values into a string
-// map of time.Time pointers
-func TimeMap(src map[string]time.Time) map[string]*time.Time {
-	dst := make(map[string]*time.Time)
-	for k, val := range src {
-		v := val
-		dst[k] = &v
-	}
-	return dst
-}
-
-// TimeValueMap converts a string map of time.Time pointers into a string
-// map of time.Time values
-func TimeValueMap(src map[string]*time.Time) map[string]time.Time {
-	dst := make(map[string]time.Time)
-	for k, val := range src {
-		if val != nil {
-			dst[k] = *val
-		}
-	}
-	return dst
-}
diff --git a/vendor/github.com/go-openapi/swag/json.go b/vendor/github.com/go-openapi/swag/json.go
deleted file mode 100644
index cb20a6a0f7..0000000000
--- a/vendor/github.com/go-openapi/swag/json.go
+++ /dev/null
@@ -1,295 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package swag
-
-import (
-	"bytes"
-	"encoding/json"
-	"log"
-	"reflect"
-	"strings"
-	"sync"
-
-	"github.com/mailru/easyjson/jlexer"
-	"github.com/mailru/easyjson/jwriter"
-)
-
-// DefaultJSONNameProvider the default cache for types
-var DefaultJSONNameProvider = NewNameProvider()
-
-const comma = byte(',')
-
-var closers = map[byte]byte{
-	'{': '}',
-	'[': ']',
-}
-
-type ejMarshaler interface {
-	MarshalEasyJSON(w *jwriter.Writer)
-}
-
-type ejUnmarshaler interface {
-	UnmarshalEasyJSON(w *jlexer.Lexer)
-}
-
-// WriteJSON writes json data, prefers finding an appropriate interface to short-circuit the marshaller
-// so it takes the fastest option available.
-func WriteJSON(data interface{}) ([]byte, error) {
-	if d, ok := data.(ejMarshaler); ok {
-		jw := new(jwriter.Writer)
-		d.MarshalEasyJSON(jw)
-		return jw.BuildBytes()
-	}
-	if d, ok := data.(json.Marshaler); ok {
-		return d.MarshalJSON()
-	}
-	return json.Marshal(data)
-}
-
-// ReadJSON reads json data, prefers finding an appropriate interface to short-circuit the unmarshaller
-// so it takes the fastes option available
-func ReadJSON(data []byte, value interface{}) error {
-	if d, ok := value.(ejUnmarshaler); ok {
-		jl := &jlexer.Lexer{Data: data}
-		d.UnmarshalEasyJSON(jl)
-		return jl.Error()
-	}
-	if d, ok := value.(json.Unmarshaler); ok {
-		return d.UnmarshalJSON(data)
-	}
-	return json.Unmarshal(data, value)
-}
-
-// DynamicJSONToStruct converts an untyped json structure into a struct
-func DynamicJSONToStruct(data interface{}, target interface{}) error {
-	// TODO: convert straight to a json typed map  (mergo + iterate?)
-	b, err := WriteJSON(data)
-	if err != nil {
-		return err
-	}
-	if err := ReadJSON(b, target); err != nil {
-		return err
-	}
-	return nil
-}
-
-// ConcatJSON concatenates multiple json objects efficiently
-func ConcatJSON(blobs ...[]byte) []byte {
-	if len(blobs) == 0 {
-		return nil
-	}
-	if len(blobs) == 1 {
-		return blobs[0]
-	}
-
-	last := len(blobs) - 1
-	var opening, closing byte
-	a := 0
-	idx := 0
-	buf := bytes.NewBuffer(nil)
-
-	for i, b := range blobs {
-		if len(b) > 0 && opening == 0 { // is this an array or an object?
-			opening, closing = b[0], closers[b[0]]
-		}
-
-		if opening != '{' && opening != '[' {
-			continue // don't know how to concatenate non container objects
-		}
-
-		if len(b) < 3 { // yep empty but also the last one, so closing this thing
-			if i == last && a > 0 {
-				if err := buf.WriteByte(closing); err != nil {
-					log.Println(err)
-				}
-			}
-			continue
-		}
-
-		idx = 0
-		if a > 0 { // we need to join with a comma for everything beyond the first non-empty item
-			if err := buf.WriteByte(comma); err != nil {
-				log.Println(err)
-			}
-			idx = 1 // this is not the first or the last so we want to drop the leading bracket
-		}
-
-		if i != last { // not the last one, strip brackets
-			if _, err := buf.Write(b[idx : len(b)-1]); err != nil {
-				log.Println(err)
-			}
-		} else { // last one, strip only the leading bracket
-			if _, err := buf.Write(b[idx:]); err != nil {
-				log.Println(err)
-			}
-		}
-		a++
-	}
-	// somehow it ended up being empty, so provide a default value
-	if buf.Len() == 0 {
-		if err := buf.WriteByte(opening); err != nil {
-			log.Println(err)
-		}
-		if err := buf.WriteByte(closing); err != nil {
-			log.Println(err)
-		}
-	}
-	return buf.Bytes()
-}
-
-// ToDynamicJSON turns an object into a properly JSON typed structure
-func ToDynamicJSON(data interface{}) interface{} {
-	// TODO: convert straight to a json typed map (mergo + iterate?)
-	b, err := json.Marshal(data)
-	if err != nil {
-		log.Println(err)
-	}
-	var res interface{}
-	if err := json.Unmarshal(b, &res); err != nil {
-		log.Println(err)
-	}
-	return res
-}
-
-// FromDynamicJSON turns an object into a properly JSON typed structure
-func FromDynamicJSON(data, target interface{}) error {
-	b, err := json.Marshal(data)
-	if err != nil {
-		log.Println(err)
-	}
-	return json.Unmarshal(b, target)
-}
-
-// NameProvider represents an object capabale of translating from go property names
-// to json property names
-// This type is thread-safe.
-type NameProvider struct {
-	lock  *sync.Mutex
-	index map[reflect.Type]nameIndex
-}
-
-type nameIndex struct {
-	jsonNames map[string]string
-	goNames   map[string]string
-}
-
-// NewNameProvider creates a new name provider
-func NewNameProvider() *NameProvider {
-	return &NameProvider{
-		lock:  &sync.Mutex{},
-		index: make(map[reflect.Type]nameIndex),
-	}
-}
-
-func buildnameIndex(tpe reflect.Type, idx, reverseIdx map[string]string) {
-	for i := 0; i < tpe.NumField(); i++ {
-		targetDes := tpe.Field(i)
-
-		if targetDes.PkgPath != "" { // unexported
-			continue
-		}
-
-		if targetDes.Anonymous { // walk embedded structures tree down first
-			buildnameIndex(targetDes.Type, idx, reverseIdx)
-			continue
-		}
-
-		if tag := targetDes.Tag.Get("json"); tag != "" {
-
-			parts := strings.Split(tag, ",")
-			if len(parts) == 0 {
-				continue
-			}
-
-			nm := parts[0]
-			if nm == "-" {
-				continue
-			}
-			if nm == "" { // empty string means we want to use the Go name
-				nm = targetDes.Name
-			}
-
-			idx[nm] = targetDes.Name
-			reverseIdx[targetDes.Name] = nm
-		}
-	}
-}
-
-func newNameIndex(tpe reflect.Type) nameIndex {
-	var idx = make(map[string]string, tpe.NumField())
-	var reverseIdx = make(map[string]string, tpe.NumField())
-
-	buildnameIndex(tpe, idx, reverseIdx)
-	return nameIndex{jsonNames: idx, goNames: reverseIdx}
-}
-
-// GetJSONNames gets all the json property names for a type
-func (n *NameProvider) GetJSONNames(subject interface{}) []string {
-	n.lock.Lock()
-	defer n.lock.Unlock()
-	tpe := reflect.Indirect(reflect.ValueOf(subject)).Type()
-	names, ok := n.index[tpe]
-	if !ok {
-		names = n.makeNameIndex(tpe)
-	}
-
-	var res []string
-	for k := range names.jsonNames {
-		res = append(res, k)
-	}
-	return res
-}
-
-// GetJSONName gets the json name for a go property name
-func (n *NameProvider) GetJSONName(subject interface{}, name string) (string, bool) {
-	tpe := reflect.Indirect(reflect.ValueOf(subject)).Type()
-	return n.GetJSONNameForType(tpe, name)
-}
-
-// GetJSONNameForType gets the json name for a go property name on a given type
-func (n *NameProvider) GetJSONNameForType(tpe reflect.Type, name string) (string, bool) {
-	n.lock.Lock()
-	defer n.lock.Unlock()
-	names, ok := n.index[tpe]
-	if !ok {
-		names = n.makeNameIndex(tpe)
-	}
-	nme, ok := names.goNames[name]
-	return nme, ok
-}
-
-func (n *NameProvider) makeNameIndex(tpe reflect.Type) nameIndex {
-	names := newNameIndex(tpe)
-	n.index[tpe] = names
-	return names
-}
-
-// GetGoName gets the go name for a json property name
-func (n *NameProvider) GetGoName(subject interface{}, name string) (string, bool) {
-	tpe := reflect.Indirect(reflect.ValueOf(subject)).Type()
-	return n.GetGoNameForType(tpe, name)
-}
-
-// GetGoNameForType gets the go name for a given type for a json property name
-func (n *NameProvider) GetGoNameForType(tpe reflect.Type, name string) (string, bool) {
-	n.lock.Lock()
-	defer n.lock.Unlock()
-	names, ok := n.index[tpe]
-	if !ok {
-		names = n.makeNameIndex(tpe)
-	}
-	nme, ok := names.jsonNames[name]
-	return nme, ok
-}
diff --git a/vendor/github.com/go-openapi/swag/loading.go b/vendor/github.com/go-openapi/swag/loading.go
deleted file mode 100644
index 62ed1e80ab..0000000000
--- a/vendor/github.com/go-openapi/swag/loading.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package swag
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-// LoadHTTPTimeout the default timeout for load requests
-var LoadHTTPTimeout = 30 * time.Second
-
-// LoadFromFileOrHTTP loads the bytes from a file or a remote http server based on the path passed in
-func LoadFromFileOrHTTP(path string) ([]byte, error) {
-	return LoadStrategy(path, ioutil.ReadFile, loadHTTPBytes(LoadHTTPTimeout))(path)
-}
-
-// LoadFromFileOrHTTPWithTimeout loads the bytes from a file or a remote http server based on the path passed in
-// timeout arg allows for per request overriding of the request timeout
-func LoadFromFileOrHTTPWithTimeout(path string, timeout time.Duration) ([]byte, error) {
-	return LoadStrategy(path, ioutil.ReadFile, loadHTTPBytes(timeout))(path)
-}
-
-// LoadStrategy returns a loader function for a given path or uri
-func LoadStrategy(path string, local, remote func(string) ([]byte, error)) func(string) ([]byte, error) {
-	if strings.HasPrefix(path, "http") {
-		return remote
-	}
-	return func(pth string) ([]byte, error) { return local(filepath.FromSlash(pth)) }
-}
-
-func loadHTTPBytes(timeout time.Duration) func(path string) ([]byte, error) {
-	return func(path string) ([]byte, error) {
-		client := &http.Client{Timeout: timeout}
-		req, err := http.NewRequest("GET", path, nil)
-		if err != nil {
-			return nil, err
-		}
-		resp, err := client.Do(req)
-		defer func() {
-			if resp != nil {
-				if e := resp.Body.Close(); e != nil {
-					log.Println(e)
-				}
-			}
-		}()
-		if err != nil {
-			return nil, err
-		}
-
-		if resp.StatusCode != http.StatusOK {
-			return nil, fmt.Errorf("could not access document at %q [%s] ", path, resp.Status)
-		}
-
-		return ioutil.ReadAll(resp.Body)
-	}
-}
diff --git a/vendor/github.com/go-openapi/swag/net.go b/vendor/github.com/go-openapi/swag/net.go
deleted file mode 100644
index 8323fa37b6..0000000000
--- a/vendor/github.com/go-openapi/swag/net.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package swag
-
-import (
-	"net"
-	"strconv"
-)
-
-// SplitHostPort splits a network address into a host and a port.
-// The port is -1 when there is no port to be found
-func SplitHostPort(addr string) (host string, port int, err error) {
-	h, p, err := net.SplitHostPort(addr)
-	if err != nil {
-		return "", -1, err
-	}
-	if p == "" {
-		return "", -1, &net.AddrError{Err: "missing port in address", Addr: addr}
-	}
-
-	pi, err := strconv.Atoi(p)
-	if err != nil {
-		return "", -1, err
-	}
-	return h, pi, nil
-}
diff --git a/vendor/github.com/go-openapi/swag/path.go b/vendor/github.com/go-openapi/swag/path.go
deleted file mode 100644
index 941bd0176b..0000000000
--- a/vendor/github.com/go-openapi/swag/path.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package swag
-
-import (
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-)
-
-const (
-	// GOPATHKey represents the env key for gopath
-	GOPATHKey = "GOPATH"
-)
-
-// FindInSearchPath finds a package in a provided lists of paths
-func FindInSearchPath(searchPath, pkg string) string {
-	pathsList := filepath.SplitList(searchPath)
-	for _, path := range pathsList {
-		if evaluatedPath, err := filepath.EvalSymlinks(filepath.Join(path, "src", pkg)); err == nil {
-			if _, err := os.Stat(evaluatedPath); err == nil {
-				return evaluatedPath
-			}
-		}
-	}
-	return ""
-}
-
-// FindInGoSearchPath finds a package in the $GOPATH:$GOROOT
-func FindInGoSearchPath(pkg string) string {
-	return FindInSearchPath(FullGoSearchPath(), pkg)
-}
-
-// FullGoSearchPath gets the search paths for finding packages
-func FullGoSearchPath() string {
-	allPaths := os.Getenv(GOPATHKey)
-	if allPaths == "" {
-		allPaths = filepath.Join(os.Getenv("HOME"), "go")
-	}
-	if allPaths != "" {
-		allPaths = strings.Join([]string{allPaths, runtime.GOROOT()}, ":")
-	} else {
-		allPaths = runtime.GOROOT()
-	}
-	return allPaths
-}
diff --git a/vendor/github.com/go-openapi/swag/util.go b/vendor/github.com/go-openapi/swag/util.go
deleted file mode 100644
index 40751aab44..0000000000
--- a/vendor/github.com/go-openapi/swag/util.go
+++ /dev/null
@@ -1,336 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package swag
-
-import (
-	"math"
-	"reflect"
-	"regexp"
-	"sort"
-	"strings"
-	"unicode"
-)
-
-// Taken from https://github.com/golang/lint/blob/3390df4df2787994aea98de825b964ac7944b817/lint.go#L732-L769
-var commonInitialisms = map[string]bool{
-	"ACL":   true,
-	"API":   true,
-	"ASCII": true,
-	"CPU":   true,
-	"CSS":   true,
-	"DNS":   true,
-	"EOF":   true,
-	"GUID":  true,
-	"HTML":  true,
-	"HTTPS": true,
-	"HTTP":  true,
-	"ID":    true,
-	"IP":    true,
-	"JSON":  true,
-	"LHS":   true,
-	"QPS":   true,
-	"RAM":   true,
-	"RHS":   true,
-	"RPC":   true,
-	"SLA":   true,
-	"SMTP":  true,
-	"SQL":   true,
-	"SSH":   true,
-	"TCP":   true,
-	"TLS":   true,
-	"TTL":   true,
-	"UDP":   true,
-	"UI":    true,
-	"UID":   true,
-	"UUID":  true,
-	"URI":   true,
-	"URL":   true,
-	"UTF8":  true,
-	"VM":    true,
-	"XML":   true,
-	"XMPP":  true,
-	"XSRF":  true,
-	"XSS":   true,
-}
-var initialisms []string
-
-func init() {
-	for k := range commonInitialisms {
-		initialisms = append(initialisms, k)
-	}
-	sort.Sort(sort.Reverse(byLength(initialisms)))
-}
-
-// JoinByFormat joins a string array by a known format:
-//		ssv: space separated value
-//		tsv: tab separated value
-//		pipes: pipe (|) separated value
-//		csv: comma separated value (default)
-func JoinByFormat(data []string, format string) []string {
-	if len(data) == 0 {
-		return data
-	}
-	var sep string
-	switch format {
-	case "ssv":
-		sep = " "
-	case "tsv":
-		sep = "\t"
-	case "pipes":
-		sep = "|"
-	case "multi":
-		return data
-	default:
-		sep = ","
-	}
-	return []string{strings.Join(data, sep)}
-}
-
-// SplitByFormat splits a string by a known format:
-//		ssv: space separated value
-//		tsv: tab separated value
-//		pipes: pipe (|) separated value
-//		csv: comma separated value (default)
-func SplitByFormat(data, format string) []string {
-	if data == "" {
-		return nil
-	}
-	var sep string
-	switch format {
-	case "ssv":
-		sep = " "
-	case "tsv":
-		sep = "\t"
-	case "pipes":
-		sep = "|"
-	case "multi":
-		return nil
-	default:
-		sep = ","
-	}
-	var result []string
-	for _, s := range strings.Split(data, sep) {
-		if ts := strings.TrimSpace(s); ts != "" {
-			result = append(result, ts)
-		}
-	}
-	return result
-}
-
-type byLength []string
-
-func (s byLength) Len() int {
-	return len(s)
-}
-func (s byLength) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-func (s byLength) Less(i, j int) bool {
-	return len(s[i]) < len(s[j])
-}
-
-// Prepares strings by splitting by caps, spaces, dashes, and underscore
-func split(str string) (words []string) {
-	repl := strings.NewReplacer(
-		"@", "At ",
-		"&", "And ",
-		"|", "Pipe ",
-		"$", "Dollar ",
-		"!", "Bang ",
-		"-", " ",
-		"_", " ",
-	)
-
-	rex1 := regexp.MustCompile(`(\p{Lu})`)
-	rex2 := regexp.MustCompile(`(\pL|\pM|\pN|\p{Pc})+`)
-
-	str = trim(str)
-
-	// Convert dash and underscore to spaces
-	str = repl.Replace(str)
-
-	// Split when uppercase is found (needed for Snake)
-	str = rex1.ReplaceAllString(str, " $1")
-	// check if consecutive single char things make up an initialism
-
-	for _, k := range initialisms {
-		str = strings.Replace(str, rex1.ReplaceAllString(k, " $1"), " "+k, -1)
-	}
-	// Get the final list of words
-	words = rex2.FindAllString(str, -1)
-
-	return
-}
-
-// Removes leading whitespaces
-func trim(str string) string {
-	return strings.Trim(str, " ")
-}
-
-// Shortcut to strings.ToUpper()
-func upper(str string) string {
-	return strings.ToUpper(trim(str))
-}
-
-// Shortcut to strings.ToLower()
-func lower(str string) string {
-	return strings.ToLower(trim(str))
-}
-
-// ToFileName lowercases and underscores a go type name
-func ToFileName(name string) string {
-	var out []string
-	for _, w := range split(name) {
-		out = append(out, lower(w))
-	}
-	return strings.Join(out, "_")
-}
-
-// ToCommandName lowercases and underscores a go type name
-func ToCommandName(name string) string {
-	var out []string
-	for _, w := range split(name) {
-		out = append(out, lower(w))
-	}
-	return strings.Join(out, "-")
-}
-
-// ToHumanNameLower represents a code name as a human series of words
-func ToHumanNameLower(name string) string {
-	var out []string
-	for _, w := range split(name) {
-		if !commonInitialisms[upper(w)] {
-			out = append(out, lower(w))
-		} else {
-			out = append(out, w)
-		}
-	}
-	return strings.Join(out, " ")
-}
-
-// ToHumanNameTitle represents a code name as a human series of words with the first letters titleized
-func ToHumanNameTitle(name string) string {
-	var out []string
-	for _, w := range split(name) {
-		uw := upper(w)
-		if !commonInitialisms[uw] {
-			out = append(out, upper(w[:1])+lower(w[1:]))
-		} else {
-			out = append(out, w)
-		}
-	}
-	return strings.Join(out, " ")
-}
-
-// ToJSONName camelcases a name which can be underscored or pascal cased
-func ToJSONName(name string) string {
-	var out []string
-	for i, w := range split(name) {
-		if i == 0 {
-			out = append(out, lower(w))
-			continue
-		}
-		out = append(out, upper(w[:1])+lower(w[1:]))
-	}
-	return strings.Join(out, "")
-}
-
-// ToVarName camelcases a name which can be underscored or pascal cased
-func ToVarName(name string) string {
-	res := ToGoName(name)
-	if _, ok := commonInitialisms[res]; ok {
-		return lower(res)
-	}
-	if len(res) <= 1 {
-		return lower(res)
-	}
-	return lower(res[:1]) + res[1:]
-}
-
-// ToGoName translates a swagger name which can be underscored or camel cased to a name that golint likes
-func ToGoName(name string) string {
-	var out []string
-	for _, w := range split(name) {
-		uw := upper(w)
-		mod := int(math.Min(float64(len(uw)), 2))
-		if !commonInitialisms[uw] && !commonInitialisms[uw[:len(uw)-mod]] {
-			uw = upper(w[:1]) + lower(w[1:])
-		}
-		out = append(out, uw)
-	}
-
-	result := strings.Join(out, "")
-	if len(result) > 0 {
-		ud := upper(result[:1])
-		ru := []rune(ud)
-		if unicode.IsUpper(ru[0]) {
-			result = ud + result[1:]
-		} else {
-			result = "X" + ud + result[1:]
-		}
-	}
-	return result
-}
-
-// ContainsStringsCI searches a slice of strings for a case-insensitive match
-func ContainsStringsCI(coll []string, item string) bool {
-	for _, a := range coll {
-		if strings.EqualFold(a, item) {
-			return true
-		}
-	}
-	return false
-}
-
-type zeroable interface {
-	IsZero() bool
-}
-
-// IsZero returns true when the value passed into the function is a zero value.
-// This allows for safer checking of interface values.
-func IsZero(data interface{}) bool {
-	// check for things that have an IsZero method instead
-	if vv, ok := data.(zeroable); ok {
-		return vv.IsZero()
-	}
-	// continue with slightly more complex reflection
-	v := reflect.ValueOf(data)
-	switch v.Kind() {
-	case reflect.String:
-		return v.Len() == 0
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
-		return v.IsNil()
-	case reflect.Struct, reflect.Array:
-		return reflect.DeepEqual(data, reflect.Zero(v.Type()).Interface())
-	case reflect.Invalid:
-		return true
-	}
-	return false
-}
-
-// CommandLineOptionsGroup represents a group of user-defined command line options
-type CommandLineOptionsGroup struct {
-	ShortDescription string
-	LongDescription  string
-	Options          interface{}
-}
diff --git a/vendor/github.com/go-openapi/swag/yaml.go b/vendor/github.com/go-openapi/swag/yaml.go
deleted file mode 100644
index 26502f21d5..0000000000
--- a/vendor/github.com/go-openapi/swag/yaml.go
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright 2015 go-swagger maintainers
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package swag
-
-import (
-	"encoding/json"
-	"fmt"
-	"path/filepath"
-	"strconv"
-
-	"github.com/mailru/easyjson/jlexer"
-	"github.com/mailru/easyjson/jwriter"
-
-	yaml "gopkg.in/yaml.v2"
-)
-
-// YAMLMatcher matches yaml
-func YAMLMatcher(path string) bool {
-	ext := filepath.Ext(path)
-	return ext == ".yaml" || ext == ".yml"
-}
-
-// YAMLToJSON converts YAML unmarshaled data into json compatible data
-func YAMLToJSON(data interface{}) (json.RawMessage, error) {
-	jm, err := transformData(data)
-	if err != nil {
-		return nil, err
-	}
-	b, err := WriteJSON(jm)
-	return json.RawMessage(b), err
-}
-
-func BytesToYAMLDoc(data []byte) (interface{}, error) {
-	var canary map[interface{}]interface{} // validate this is an object and not a different type
-	if err := yaml.Unmarshal(data, &canary); err != nil {
-		return nil, err
-	}
-
-	var document yaml.MapSlice // preserve order that is present in the document
-	if err := yaml.Unmarshal(data, &document); err != nil {
-		return nil, err
-	}
-	return document, nil
-}
-
-type JSONMapSlice []JSONMapItem
-
-func (s JSONMapSlice) MarshalJSON() ([]byte, error) {
-	w := &jwriter.Writer{Flags: jwriter.NilMapAsEmpty | jwriter.NilSliceAsEmpty}
-	s.MarshalEasyJSON(w)
-	return w.BuildBytes()
-}
-
-func (s JSONMapSlice) MarshalEasyJSON(w *jwriter.Writer) {
-	w.RawByte('{')
-
-	ln := len(s)
-	last := ln - 1
-	for i := 0; i < ln; i++ {
-		s[i].MarshalEasyJSON(w)
-		if i != last { // last item
-			w.RawByte(',')
-		}
-	}
-
-	w.RawByte('}')
-}
-
-func (s *JSONMapSlice) UnmarshalJSON(data []byte) error {
-	l := jlexer.Lexer{Data: data}
-	s.UnmarshalEasyJSON(&l)
-	return l.Error()
-}
-func (s *JSONMapSlice) UnmarshalEasyJSON(in *jlexer.Lexer) {
-	if in.IsNull() {
-		in.Skip()
-		return
-	}
-
-	var result JSONMapSlice
-	in.Delim('{')
-	for !in.IsDelim('}') {
-		var mi JSONMapItem
-		mi.UnmarshalEasyJSON(in)
-		result = append(result, mi)
-	}
-	*s = result
-}
-
-type JSONMapItem struct {
-	Key   string
-	Value interface{}
-}
-
-func (s JSONMapItem) MarshalJSON() ([]byte, error) {
-	w := &jwriter.Writer{Flags: jwriter.NilMapAsEmpty | jwriter.NilSliceAsEmpty}
-	s.MarshalEasyJSON(w)
-	return w.BuildBytes()
-}
-
-func (s JSONMapItem) MarshalEasyJSON(w *jwriter.Writer) {
-	w.String(s.Key)
-	w.RawByte(':')
-	w.Raw(WriteJSON(s.Value))
-}
-
-func (s *JSONMapItem) UnmarshalEasyJSON(in *jlexer.Lexer) {
-	key := in.UnsafeString()
-	in.WantColon()
-	value := in.Interface()
-	in.WantComma()
-	s.Key = key
-	s.Value = value
-}
-func (s *JSONMapItem) UnmarshalJSON(data []byte) error {
-	l := jlexer.Lexer{Data: data}
-	s.UnmarshalEasyJSON(&l)
-	return l.Error()
-}
-
-func transformData(input interface{}) (out interface{}, err error) {
-	switch in := input.(type) {
-	case yaml.MapSlice:
-
-		o := make(JSONMapSlice, len(in))
-		for i, mi := range in {
-			var nmi JSONMapItem
-			switch k := mi.Key.(type) {
-			case string:
-				nmi.Key = k
-			case int:
-				nmi.Key = strconv.Itoa(k)
-			default:
-				return nil, fmt.Errorf("types don't match expect map key string or int got: %T", mi.Key)
-			}
-
-			v, err := transformData(mi.Value)
-			if err != nil {
-				return nil, err
-			}
-			nmi.Value = v
-			o[i] = nmi
-		}
-		return o, nil
-	case map[interface{}]interface{}:
-		o := make(JSONMapSlice, 0, len(in))
-		for ke, va := range in {
-			var nmi JSONMapItem
-			switch k := ke.(type) {
-			case string:
-				nmi.Key = k
-			case int:
-				nmi.Key = strconv.Itoa(k)
-			default:
-				return nil, fmt.Errorf("types don't match expect map key string or int got: %T", ke)
-			}
-
-			v, err := transformData(va)
-			if err != nil {
-				return nil, err
-			}
-			nmi.Value = v
-			o = append(o, nmi)
-		}
-		return o, nil
-	case []interface{}:
-		len1 := len(in)
-		o := make([]interface{}, len1)
-		for i := 0; i < len1; i++ {
-			o[i], err = transformData(in[i])
-			if err != nil {
-				return nil, err
-			}
-		}
-		return o, nil
-	}
-	return input, nil
-}
-
-// YAMLDoc loads a yaml document from either http or a file and converts it to json
-func YAMLDoc(path string) (json.RawMessage, error) {
-	yamlDoc, err := YAMLData(path)
-	if err != nil {
-		return nil, err
-	}
-
-	data, err := YAMLToJSON(yamlDoc)
-	if err != nil {
-		return nil, err
-	}
-
-	return json.RawMessage(data), nil
-}
-
-// YAMLData loads a yaml document from either http or a file
-func YAMLData(path string) (interface{}, error) {
-	data, err := LoadFromFileOrHTTP(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return BytesToYAMLDoc(data)
-}
diff --git a/vendor/github.com/golang/protobuf/LICENSE b/vendor/github.com/golang/protobuf/LICENSE
deleted file mode 100644
index 1b1b1921ef..0000000000
--- a/vendor/github.com/golang/protobuf/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-Go support for Protocol Buffers - Google's data interchange format
-
-Copyright 2010 The Go Authors.  All rights reserved.
-https://github.com/golang/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/vendor/github.com/golang/protobuf/proto/Makefile b/vendor/github.com/golang/protobuf/proto/Makefile
deleted file mode 100644
index e2e0651a93..0000000000
--- a/vendor/github.com/golang/protobuf/proto/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-install:
-	go install
-
-test: install generate-test-pbs
-	go test
-
-
-generate-test-pbs:
-	make install
-	make -C testdata
-	protoc --go_out=Mtestdata/test.proto=github.com/golang/protobuf/proto/testdata,Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any:. proto3_proto/proto3.proto
-	make
diff --git a/vendor/github.com/golang/protobuf/proto/clone.go b/vendor/github.com/golang/protobuf/proto/clone.go
deleted file mode 100644
index e392575b35..0000000000
--- a/vendor/github.com/golang/protobuf/proto/clone.go
+++ /dev/null
@@ -1,229 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Protocol buffer deep copy and merge.
-// TODO: RawMessage.
-
-package proto
-
-import (
-	"log"
-	"reflect"
-	"strings"
-)
-
-// Clone returns a deep copy of a protocol buffer.
-func Clone(pb Message) Message {
-	in := reflect.ValueOf(pb)
-	if in.IsNil() {
-		return pb
-	}
-
-	out := reflect.New(in.Type().Elem())
-	// out is empty so a merge is a deep copy.
-	mergeStruct(out.Elem(), in.Elem())
-	return out.Interface().(Message)
-}
-
-// Merge merges src into dst.
-// Required and optional fields that are set in src will be set to that value in dst.
-// Elements of repeated fields will be appended.
-// Merge panics if src and dst are not the same type, or if dst is nil.
-func Merge(dst, src Message) {
-	in := reflect.ValueOf(src)
-	out := reflect.ValueOf(dst)
-	if out.IsNil() {
-		panic("proto: nil destination")
-	}
-	if in.Type() != out.Type() {
-		// Explicit test prior to mergeStruct so that mistyped nils will fail
-		panic("proto: type mismatch")
-	}
-	if in.IsNil() {
-		// Merging nil into non-nil is a quiet no-op
-		return
-	}
-	mergeStruct(out.Elem(), in.Elem())
-}
-
-func mergeStruct(out, in reflect.Value) {
-	sprop := GetProperties(in.Type())
-	for i := 0; i < in.NumField(); i++ {
-		f := in.Type().Field(i)
-		if strings.HasPrefix(f.Name, "XXX_") {
-			continue
-		}
-		mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
-	}
-
-	if emIn, ok := extendable(in.Addr().Interface()); ok {
-		emOut, _ := extendable(out.Addr().Interface())
-		mIn, muIn := emIn.extensionsRead()
-		if mIn != nil {
-			mOut := emOut.extensionsWrite()
-			muIn.Lock()
-			mergeExtension(mOut, mIn)
-			muIn.Unlock()
-		}
-	}
-
-	uf := in.FieldByName("XXX_unrecognized")
-	if !uf.IsValid() {
-		return
-	}
-	uin := uf.Bytes()
-	if len(uin) > 0 {
-		out.FieldByName("XXX_unrecognized").SetBytes(append([]byte(nil), uin...))
-	}
-}
-
-// mergeAny performs a merge between two values of the same type.
-// viaPtr indicates whether the values were indirected through a pointer (implying proto2).
-// prop is set if this is a struct field (it may be nil).
-func mergeAny(out, in reflect.Value, viaPtr bool, prop *Properties) {
-	if in.Type() == protoMessageType {
-		if !in.IsNil() {
-			if out.IsNil() {
-				out.Set(reflect.ValueOf(Clone(in.Interface().(Message))))
-			} else {
-				Merge(out.Interface().(Message), in.Interface().(Message))
-			}
-		}
-		return
-	}
-	switch in.Kind() {
-	case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
-		reflect.String, reflect.Uint32, reflect.Uint64:
-		if !viaPtr && isProto3Zero(in) {
-			return
-		}
-		out.Set(in)
-	case reflect.Interface:
-		// Probably a oneof field; copy non-nil values.
-		if in.IsNil() {
-			return
-		}
-		// Allocate destination if it is not set, or set to a different type.
-		// Otherwise we will merge as normal.
-		if out.IsNil() || out.Elem().Type() != in.Elem().Type() {
-			out.Set(reflect.New(in.Elem().Elem().Type())) // interface -> *T -> T -> new(T)
-		}
-		mergeAny(out.Elem(), in.Elem(), false, nil)
-	case reflect.Map:
-		if in.Len() == 0 {
-			return
-		}
-		if out.IsNil() {
-			out.Set(reflect.MakeMap(in.Type()))
-		}
-		// For maps with value types of *T or []byte we need to deep copy each value.
-		elemKind := in.Type().Elem().Kind()
-		for _, key := range in.MapKeys() {
-			var val reflect.Value
-			switch elemKind {
-			case reflect.Ptr:
-				val = reflect.New(in.Type().Elem().Elem())
-				mergeAny(val, in.MapIndex(key), false, nil)
-			case reflect.Slice:
-				val = in.MapIndex(key)
-				val = reflect.ValueOf(append([]byte{}, val.Bytes()...))
-			default:
-				val = in.MapIndex(key)
-			}
-			out.SetMapIndex(key, val)
-		}
-	case reflect.Ptr:
-		if in.IsNil() {
-			return
-		}
-		if out.IsNil() {
-			out.Set(reflect.New(in.Elem().Type()))
-		}
-		mergeAny(out.Elem(), in.Elem(), true, nil)
-	case reflect.Slice:
-		if in.IsNil() {
-			return
-		}
-		if in.Type().Elem().Kind() == reflect.Uint8 {
-			// []byte is a scalar bytes field, not a repeated field.
-
-			// Edge case: if this is in a proto3 message, a zero length
-			// bytes field is considered the zero value, and should not
-			// be merged.
-			if prop != nil && prop.proto3 && in.Len() == 0 {
-				return
-			}
-
-			// Make a deep copy.
-			// Append to []byte{} instead of []byte(nil) so that we never end up
-			// with a nil result.
-			out.SetBytes(append([]byte{}, in.Bytes()...))
-			return
-		}
-		n := in.Len()
-		if out.IsNil() {
-			out.Set(reflect.MakeSlice(in.Type(), 0, n))
-		}
-		switch in.Type().Elem().Kind() {
-		case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
-			reflect.String, reflect.Uint32, reflect.Uint64:
-			out.Set(reflect.AppendSlice(out, in))
-		default:
-			for i := 0; i < n; i++ {
-				x := reflect.Indirect(reflect.New(in.Type().Elem()))
-				mergeAny(x, in.Index(i), false, nil)
-				out.Set(reflect.Append(out, x))
-			}
-		}
-	case reflect.Struct:
-		mergeStruct(out, in)
-	default:
-		// unknown type, so not a protocol buffer
-		log.Printf("proto: don't know how to copy %v", in)
-	}
-}
-
-func mergeExtension(out, in map[int32]Extension) {
-	for extNum, eIn := range in {
-		eOut := Extension{desc: eIn.desc}
-		if eIn.value != nil {
-			v := reflect.New(reflect.TypeOf(eIn.value)).Elem()
-			mergeAny(v, reflect.ValueOf(eIn.value), false, nil)
-			eOut.value = v.Interface()
-		}
-		if eIn.enc != nil {
-			eOut.enc = make([]byte, len(eIn.enc))
-			copy(eOut.enc, eIn.enc)
-		}
-
-		out[extNum] = eOut
-	}
-}
diff --git a/vendor/github.com/golang/protobuf/proto/decode.go b/vendor/github.com/golang/protobuf/proto/decode.go
deleted file mode 100644
index aa207298f9..0000000000
--- a/vendor/github.com/golang/protobuf/proto/decode.go
+++ /dev/null
@@ -1,970 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Routines for decoding protocol buffer data to construct in-memory representations.
- */
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"reflect"
-)
-
-// errOverflow is returned when an integer is too large to be represented.
-var errOverflow = errors.New("proto: integer overflow")
-
-// ErrInternalBadWireType is returned by generated code when an incorrect
-// wire type is encountered. It does not get returned to user code.
-var ErrInternalBadWireType = errors.New("proto: internal error: bad wiretype for oneof")
-
-// The fundamental decoders that interpret bytes on the wire.
-// Those that take integer types all return uint64 and are
-// therefore of type valueDecoder.
-
-// DecodeVarint reads a varint-encoded integer from the slice.
-// It returns the integer and the number of bytes consumed, or
-// zero if there is not enough.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func DecodeVarint(buf []byte) (x uint64, n int) {
-	for shift := uint(0); shift < 64; shift += 7 {
-		if n >= len(buf) {
-			return 0, 0
-		}
-		b := uint64(buf[n])
-		n++
-		x |= (b & 0x7F) << shift
-		if (b & 0x80) == 0 {
-			return x, n
-		}
-	}
-
-	// The number is too large to represent in a 64-bit value.
-	return 0, 0
-}
-
-func (p *Buffer) decodeVarintSlow() (x uint64, err error) {
-	i := p.index
-	l := len(p.buf)
-
-	for shift := uint(0); shift < 64; shift += 7 {
-		if i >= l {
-			err = io.ErrUnexpectedEOF
-			return
-		}
-		b := p.buf[i]
-		i++
-		x |= (uint64(b) & 0x7F) << shift
-		if b < 0x80 {
-			p.index = i
-			return
-		}
-	}
-
-	// The number is too large to represent in a 64-bit value.
-	err = errOverflow
-	return
-}
-
-// DecodeVarint reads a varint-encoded integer from the Buffer.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func (p *Buffer) DecodeVarint() (x uint64, err error) {
-	i := p.index
-	buf := p.buf
-
-	if i >= len(buf) {
-		return 0, io.ErrUnexpectedEOF
-	} else if buf[i] < 0x80 {
-		p.index++
-		return uint64(buf[i]), nil
-	} else if len(buf)-i < 10 {
-		return p.decodeVarintSlow()
-	}
-
-	var b uint64
-	// we already checked the first byte
-	x = uint64(buf[i]) - 0x80
-	i++
-
-	b = uint64(buf[i])
-	i++
-	x += b << 7
-	if b&0x80 == 0 {
-		goto done
-	}
-	x -= 0x80 << 7
-
-	b = uint64(buf[i])
-	i++
-	x += b << 14
-	if b&0x80 == 0 {
-		goto done
-	}
-	x -= 0x80 << 14
-
-	b = uint64(buf[i])
-	i++
-	x += b << 21
-	if b&0x80 == 0 {
-		goto done
-	}
-	x -= 0x80 << 21
-
-	b = uint64(buf[i])
-	i++
-	x += b << 28
-	if b&0x80 == 0 {
-		goto done
-	}
-	x -= 0x80 << 28
-
-	b = uint64(buf[i])
-	i++
-	x += b << 35
-	if b&0x80 == 0 {
-		goto done
-	}
-	x -= 0x80 << 35
-
-	b = uint64(buf[i])
-	i++
-	x += b << 42
-	if b&0x80 == 0 {
-		goto done
-	}
-	x -= 0x80 << 42
-
-	b = uint64(buf[i])
-	i++
-	x += b << 49
-	if b&0x80 == 0 {
-		goto done
-	}
-	x -= 0x80 << 49
-
-	b = uint64(buf[i])
-	i++
-	x += b << 56
-	if b&0x80 == 0 {
-		goto done
-	}
-	x -= 0x80 << 56
-
-	b = uint64(buf[i])
-	i++
-	x += b << 63
-	if b&0x80 == 0 {
-		goto done
-	}
-	// x -= 0x80 << 63 // Always zero.
-
-	return 0, errOverflow
-
-done:
-	p.index = i
-	return x, nil
-}
-
-// DecodeFixed64 reads a 64-bit integer from the Buffer.
-// This is the format for the
-// fixed64, sfixed64, and double protocol buffer types.
-func (p *Buffer) DecodeFixed64() (x uint64, err error) {
-	// x, err already 0
-	i := p.index + 8
-	if i < 0 || i > len(p.buf) {
-		err = io.ErrUnexpectedEOF
-		return
-	}
-	p.index = i
-
-	x = uint64(p.buf[i-8])
-	x |= uint64(p.buf[i-7]) << 8
-	x |= uint64(p.buf[i-6]) << 16
-	x |= uint64(p.buf[i-5]) << 24
-	x |= uint64(p.buf[i-4]) << 32
-	x |= uint64(p.buf[i-3]) << 40
-	x |= uint64(p.buf[i-2]) << 48
-	x |= uint64(p.buf[i-1]) << 56
-	return
-}
-
-// DecodeFixed32 reads a 32-bit integer from the Buffer.
-// This is the format for the
-// fixed32, sfixed32, and float protocol buffer types.
-func (p *Buffer) DecodeFixed32() (x uint64, err error) {
-	// x, err already 0
-	i := p.index + 4
-	if i < 0 || i > len(p.buf) {
-		err = io.ErrUnexpectedEOF
-		return
-	}
-	p.index = i
-
-	x = uint64(p.buf[i-4])
-	x |= uint64(p.buf[i-3]) << 8
-	x |= uint64(p.buf[i-2]) << 16
-	x |= uint64(p.buf[i-1]) << 24
-	return
-}
-
-// DecodeZigzag64 reads a zigzag-encoded 64-bit integer
-// from the Buffer.
-// This is the format used for the sint64 protocol buffer type.
-func (p *Buffer) DecodeZigzag64() (x uint64, err error) {
-	x, err = p.DecodeVarint()
-	if err != nil {
-		return
-	}
-	x = (x >> 1) ^ uint64((int64(x&1)<<63)>>63)
-	return
-}
-
-// DecodeZigzag32 reads a zigzag-encoded 32-bit integer
-// from  the Buffer.
-// This is the format used for the sint32 protocol buffer type.
-func (p *Buffer) DecodeZigzag32() (x uint64, err error) {
-	x, err = p.DecodeVarint()
-	if err != nil {
-		return
-	}
-	x = uint64((uint32(x) >> 1) ^ uint32((int32(x&1)<<31)>>31))
-	return
-}
-
-// These are not ValueDecoders: they produce an array of bytes or a string.
-// bytes, embedded messages
-
-// DecodeRawBytes reads a count-delimited byte buffer from the Buffer.
-// This is the format used for the bytes protocol buffer
-// type and for embedded messages.
-func (p *Buffer) DecodeRawBytes(alloc bool) (buf []byte, err error) {
-	n, err := p.DecodeVarint()
-	if err != nil {
-		return nil, err
-	}
-
-	nb := int(n)
-	if nb < 0 {
-		return nil, fmt.Errorf("proto: bad byte length %d", nb)
-	}
-	end := p.index + nb
-	if end < p.index || end > len(p.buf) {
-		return nil, io.ErrUnexpectedEOF
-	}
-
-	if !alloc {
-		// todo: check if can get more uses of alloc=false
-		buf = p.buf[p.index:end]
-		p.index += nb
-		return
-	}
-
-	buf = make([]byte, nb)
-	copy(buf, p.buf[p.index:])
-	p.index += nb
-	return
-}
-
-// DecodeStringBytes reads an encoded string from the Buffer.
-// This is the format used for the proto2 string type.
-func (p *Buffer) DecodeStringBytes() (s string, err error) {
-	buf, err := p.DecodeRawBytes(false)
-	if err != nil {
-		return
-	}
-	return string(buf), nil
-}
-
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-// If the protocol buffer has extensions, and the field matches, add it as an extension.
-// Otherwise, if the XXX_unrecognized field exists, append the skipped data there.
-func (o *Buffer) skipAndSave(t reflect.Type, tag, wire int, base structPointer, unrecField field) error {
-	oi := o.index
-
-	err := o.skip(t, tag, wire)
-	if err != nil {
-		return err
-	}
-
-	if !unrecField.IsValid() {
-		return nil
-	}
-
-	ptr := structPointer_Bytes(base, unrecField)
-
-	// Add the skipped field to struct field
-	obuf := o.buf
-
-	o.buf = *ptr
-	o.EncodeVarint(uint64(tag<<3 | wire))
-	*ptr = append(o.buf, obuf[oi:o.index]...)
-
-	o.buf = obuf
-
-	return nil
-}
-
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-func (o *Buffer) skip(t reflect.Type, tag, wire int) error {
-
-	var u uint64
-	var err error
-
-	switch wire {
-	case WireVarint:
-		_, err = o.DecodeVarint()
-	case WireFixed64:
-		_, err = o.DecodeFixed64()
-	case WireBytes:
-		_, err = o.DecodeRawBytes(false)
-	case WireFixed32:
-		_, err = o.DecodeFixed32()
-	case WireStartGroup:
-		for {
-			u, err = o.DecodeVarint()
-			if err != nil {
-				break
-			}
-			fwire := int(u & 0x7)
-			if fwire == WireEndGroup {
-				break
-			}
-			ftag := int(u >> 3)
-			err = o.skip(t, ftag, fwire)
-			if err != nil {
-				break
-			}
-		}
-	default:
-		err = fmt.Errorf("proto: can't skip unknown wire type %d for %s", wire, t)
-	}
-	return err
-}
-
-// Unmarshaler is the interface representing objects that can
-// unmarshal themselves.  The method should reset the receiver before
-// decoding starts.  The argument points to data that may be
-// overwritten, so implementations should not keep references to the
-// buffer.
-type Unmarshaler interface {
-	Unmarshal([]byte) error
-}
-
-// Unmarshal parses the protocol buffer representation in buf and places the
-// decoded result in pb.  If the struct underlying pb does not match
-// the data in buf, the results can be unpredictable.
-//
-// Unmarshal resets pb before starting to unmarshal, so any
-// existing data in pb is always removed. Use UnmarshalMerge
-// to preserve and append to existing data.
-func Unmarshal(buf []byte, pb Message) error {
-	pb.Reset()
-	return UnmarshalMerge(buf, pb)
-}
-
-// UnmarshalMerge parses the protocol buffer representation in buf and
-// writes the decoded result to pb.  If the struct underlying pb does not match
-// the data in buf, the results can be unpredictable.
-//
-// UnmarshalMerge merges into existing data in pb.
-// Most code should use Unmarshal instead.
-func UnmarshalMerge(buf []byte, pb Message) error {
-	// If the object can unmarshal itself, let it.
-	if u, ok := pb.(Unmarshaler); ok {
-		return u.Unmarshal(buf)
-	}
-	return NewBuffer(buf).Unmarshal(pb)
-}
-
-// DecodeMessage reads a count-delimited message from the Buffer.
-func (p *Buffer) DecodeMessage(pb Message) error {
-	enc, err := p.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-	return NewBuffer(enc).Unmarshal(pb)
-}
-
-// DecodeGroup reads a tag-delimited group from the Buffer.
-func (p *Buffer) DecodeGroup(pb Message) error {
-	typ, base, err := getbase(pb)
-	if err != nil {
-		return err
-	}
-	return p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), true, base)
-}
-
-// Unmarshal parses the protocol buffer representation in the
-// Buffer and places the decoded result in pb.  If the struct
-// underlying pb does not match the data in the buffer, the results can be
-// unpredictable.
-//
-// Unlike proto.Unmarshal, this does not reset pb before starting to unmarshal.
-func (p *Buffer) Unmarshal(pb Message) error {
-	// If the object can unmarshal itself, let it.
-	if u, ok := pb.(Unmarshaler); ok {
-		err := u.Unmarshal(p.buf[p.index:])
-		p.index = len(p.buf)
-		return err
-	}
-
-	typ, base, err := getbase(pb)
-	if err != nil {
-		return err
-	}
-
-	err = p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), false, base)
-
-	if collectStats {
-		stats.Decode++
-	}
-
-	return err
-}
-
-// unmarshalType does the work of unmarshaling a structure.
-func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group bool, base structPointer) error {
-	var state errorState
-	required, reqFields := prop.reqCount, uint64(0)
-
-	var err error
-	for err == nil && o.index < len(o.buf) {
-		oi := o.index
-		var u uint64
-		u, err = o.DecodeVarint()
-		if err != nil {
-			break
-		}
-		wire := int(u & 0x7)
-		if wire == WireEndGroup {
-			if is_group {
-				if required > 0 {
-					// Not enough information to determine the exact field.
-					// (See below.)
-					return &RequiredNotSetError{"{Unknown}"}
-				}
-				return nil // input is satisfied
-			}
-			return fmt.Errorf("proto: %s: wiretype end group for non-group", st)
-		}
-		tag := int(u >> 3)
-		if tag <= 0 {
-			return fmt.Errorf("proto: %s: illegal tag %d (wire type %d)", st, tag, wire)
-		}
-		fieldnum, ok := prop.decoderTags.get(tag)
-		if !ok {
-			// Maybe it's an extension?
-			if prop.extendable {
-				if e, _ := extendable(structPointer_Interface(base, st)); isExtensionField(e, int32(tag)) {
-					if err = o.skip(st, tag, wire); err == nil {
-						extmap := e.extensionsWrite()
-						ext := extmap[int32(tag)] // may be missing
-						ext.enc = append(ext.enc, o.buf[oi:o.index]...)
-						extmap[int32(tag)] = ext
-					}
-					continue
-				}
-			}
-			// Maybe it's a oneof?
-			if prop.oneofUnmarshaler != nil {
-				m := structPointer_Interface(base, st).(Message)
-				// First return value indicates whether tag is a oneof field.
-				ok, err = prop.oneofUnmarshaler(m, tag, wire, o)
-				if err == ErrInternalBadWireType {
-					// Map the error to something more descriptive.
-					// Do the formatting here to save generated code space.
-					err = fmt.Errorf("bad wiretype for oneof field in %T", m)
-				}
-				if ok {
-					continue
-				}
-			}
-			err = o.skipAndSave(st, tag, wire, base, prop.unrecField)
-			continue
-		}
-		p := prop.Prop[fieldnum]
-
-		if p.dec == nil {
-			fmt.Fprintf(os.Stderr, "proto: no protobuf decoder for %s.%s\n", st, st.Field(fieldnum).Name)
-			continue
-		}
-		dec := p.dec
-		if wire != WireStartGroup && wire != p.WireType {
-			if wire == WireBytes && p.packedDec != nil {
-				// a packable field
-				dec = p.packedDec
-			} else {
-				err = fmt.Errorf("proto: bad wiretype for field %s.%s: got wiretype %d, want %d", st, st.Field(fieldnum).Name, wire, p.WireType)
-				continue
-			}
-		}
-		decErr := dec(o, p, base)
-		if decErr != nil && !state.shouldContinue(decErr, p) {
-			err = decErr
-		}
-		if err == nil && p.Required {
-			// Successfully decoded a required field.
-			if tag <= 64 {
-				// use bitmap for fields 1-64 to catch field reuse.
-				var mask uint64 = 1 << uint64(tag-1)
-				if reqFields&mask == 0 {
-					// new required field
-					reqFields |= mask
-					required--
-				}
-			} else {
-				// This is imprecise. It can be fooled by a required field
-				// with a tag > 64 that is encoded twice; that's very rare.
-				// A fully correct implementation would require allocating
-				// a data structure, which we would like to avoid.
-				required--
-			}
-		}
-	}
-	if err == nil {
-		if is_group {
-			return io.ErrUnexpectedEOF
-		}
-		if state.err != nil {
-			return state.err
-		}
-		if required > 0 {
-			// Not enough information to determine the exact field. If we use extra
-			// CPU, we could determine the field only if the missing required field
-			// has a tag <= 64 and we check reqFields.
-			return &RequiredNotSetError{"{Unknown}"}
-		}
-	}
-	return err
-}
-
-// Individual type decoders
-// For each,
-//	u is the decoded value,
-//	v is a pointer to the field (pointer) in the struct
-
-// Sizes of the pools to allocate inside the Buffer.
-// The goal is modest amortization and allocation
-// on at least 16-byte boundaries.
-const (
-	boolPoolSize   = 16
-	uint32PoolSize = 8
-	uint64PoolSize = 4
-)
-
-// Decode a bool.
-func (o *Buffer) dec_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	if len(o.bools) == 0 {
-		o.bools = make([]bool, boolPoolSize)
-	}
-	o.bools[0] = u != 0
-	*structPointer_Bool(base, p.field) = &o.bools[0]
-	o.bools = o.bools[1:]
-	return nil
-}
-
-func (o *Buffer) dec_proto3_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	*structPointer_BoolVal(base, p.field) = u != 0
-	return nil
-}
-
-// Decode an int32.
-func (o *Buffer) dec_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32_Set(structPointer_Word32(base, p.field), o, uint32(u))
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32Val_Set(structPointer_Word32Val(base, p.field), uint32(u))
-	return nil
-}
-
-// Decode an int64.
-func (o *Buffer) dec_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64_Set(structPointer_Word64(base, p.field), o, u)
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64Val_Set(structPointer_Word64Val(base, p.field), o, u)
-	return nil
-}
-
-// Decode a string.
-func (o *Buffer) dec_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_String(base, p.field) = &s
-	return nil
-}
-
-func (o *Buffer) dec_proto3_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_StringVal(base, p.field) = s
-	return nil
-}
-
-// Decode a slice of bytes ([]byte).
-func (o *Buffer) dec_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	*structPointer_Bytes(base, p.field) = b
-	return nil
-}
-
-// Decode a slice of bools ([]bool).
-func (o *Buffer) dec_slice_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BoolSlice(base, p.field)
-	*v = append(*v, u != 0)
-	return nil
-}
-
-// Decode a slice of bools ([]bool) in packed format.
-func (o *Buffer) dec_slice_packed_bool(p *Properties, base structPointer) error {
-	v := structPointer_BoolSlice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded bools
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-
-	y := *v
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		y = append(y, u != 0)
-	}
-
-	*v = y
-	return nil
-}
-
-// Decode a slice of int32s ([]int32).
-func (o *Buffer) dec_slice_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	structPointer_Word32Slice(base, p.field).Append(uint32(u))
-	return nil
-}
-
-// Decode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) dec_slice_packed_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int32s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(uint32(u))
-	}
-	return nil
-}
-
-// Decode a slice of int64s ([]int64).
-func (o *Buffer) dec_slice_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-
-	structPointer_Word64Slice(base, p.field).Append(u)
-	return nil
-}
-
-// Decode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) dec_slice_packed_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int64s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(u)
-	}
-	return nil
-}
-
-// Decode a slice of strings ([]string).
-func (o *Buffer) dec_slice_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	v := structPointer_StringSlice(base, p.field)
-	*v = append(*v, s)
-	return nil
-}
-
-// Decode a slice of slice of bytes ([][]byte).
-func (o *Buffer) dec_slice_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BytesSlice(base, p.field)
-	*v = append(*v, b)
-	return nil
-}
-
-// Decode a map field.
-func (o *Buffer) dec_new_map(p *Properties, base structPointer) error {
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-	oi := o.index       // index at the end of this map entry
-	o.index -= len(raw) // move buffer back to start of map entry
-
-	mptr := structPointer_NewAt(base, p.field, p.mtype) // *map[K]V
-	if mptr.Elem().IsNil() {
-		mptr.Elem().Set(reflect.MakeMap(mptr.Type().Elem()))
-	}
-	v := mptr.Elem() // map[K]V
-
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// See enc_new_map for why.
-	keyptr := reflect.New(reflect.PtrTo(p.mtype.Key())).Elem() // addressable *K
-	keybase := toStructPointer(keyptr.Addr())                  // **K
-
-	var valbase structPointer
-	var valptr reflect.Value
-	switch p.mtype.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valptr = reflect.ValueOf(&dummy)  // *[]byte
-		valbase = toStructPointer(valptr) // *[]byte
-	case reflect.Ptr:
-		// message; valptr is **Msg; need to allocate the intermediate pointer
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valptr.Set(reflect.New(valptr.Type().Elem()))
-		valbase = toStructPointer(valptr)
-	default:
-		// everything else
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valbase = toStructPointer(valptr.Addr())                   // **V
-	}
-
-	// Decode.
-	// This parses a restricted wire format, namely the encoding of a message
-	// with two fields. See enc_new_map for the format.
-	for o.index < oi {
-		// tagcode for key and value properties are always a single byte
-		// because they have tags 1 and 2.
-		tagcode := o.buf[o.index]
-		o.index++
-		switch tagcode {
-		case p.mkeyprop.tagcode[0]:
-			if err := p.mkeyprop.dec(o, p.mkeyprop, keybase); err != nil {
-				return err
-			}
-		case p.mvalprop.tagcode[0]:
-			if err := p.mvalprop.dec(o, p.mvalprop, valbase); err != nil {
-				return err
-			}
-		default:
-			// TODO: Should we silently skip this instead?
-			return fmt.Errorf("proto: bad map data tag %d", raw[0])
-		}
-	}
-	keyelem, valelem := keyptr.Elem(), valptr.Elem()
-	if !keyelem.IsValid() {
-		keyelem = reflect.Zero(p.mtype.Key())
-	}
-	if !valelem.IsValid() {
-		valelem = reflect.Zero(p.mtype.Elem())
-	}
-
-	v.SetMapIndex(keyelem, valelem)
-	return nil
-}
-
-// Decode a group.
-func (o *Buffer) dec_struct_group(p *Properties, base structPointer) error {
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-	return o.unmarshalType(p.stype, p.sprop, true, bas)
-}
-
-// Decode an embedded message.
-func (o *Buffer) dec_struct_message(p *Properties, base structPointer) (err error) {
-	raw, e := o.DecodeRawBytes(false)
-	if e != nil {
-		return e
-	}
-
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := structPointer_Interface(bas, p.stype)
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, false, bas)
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
-
-// Decode a slice of embedded messages.
-func (o *Buffer) dec_slice_struct_message(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, false, base)
-}
-
-// Decode a slice of embedded groups.
-func (o *Buffer) dec_slice_struct_group(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, true, base)
-}
-
-// Decode a slice of structs ([]*struct).
-func (o *Buffer) dec_slice_struct(p *Properties, is_group bool, base structPointer) error {
-	v := reflect.New(p.stype)
-	bas := toStructPointer(v)
-	structPointer_StructPointerSlice(base, p.field).Append(bas)
-
-	if is_group {
-		err := o.unmarshalType(p.stype, p.sprop, is_group, bas)
-		return err
-	}
-
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := v.Interface()
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, is_group, bas)
-
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
diff --git a/vendor/github.com/golang/protobuf/proto/encode.go b/vendor/github.com/golang/protobuf/proto/encode.go
deleted file mode 100644
index 8b84d1b22d..0000000000
--- a/vendor/github.com/golang/protobuf/proto/encode.go
+++ /dev/null
@@ -1,1362 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Routines for encoding data into the wire format for protocol buffers.
- */
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-)
-
-// RequiredNotSetError is the error returned if Marshal is called with
-// a protocol buffer struct whose required fields have not
-// all been initialized. It is also the error returned if Unmarshal is
-// called with an encoded protocol buffer that does not include all the
-// required fields.
-//
-// When printed, RequiredNotSetError reports the first unset required field in a
-// message. If the field cannot be precisely determined, it is reported as
-// "{Unknown}".
-type RequiredNotSetError struct {
-	field string
-}
-
-func (e *RequiredNotSetError) Error() string {
-	return fmt.Sprintf("proto: required field %q not set", e.field)
-}
-
-var (
-	// errRepeatedHasNil is the error returned if Marshal is called with
-	// a struct with a repeated field containing a nil element.
-	errRepeatedHasNil = errors.New("proto: repeated field has nil element")
-
-	// errOneofHasNil is the error returned if Marshal is called with
-	// a struct with a oneof field containing a nil element.
-	errOneofHasNil = errors.New("proto: oneof field has nil value")
-
-	// ErrNil is the error returned if Marshal is called with nil.
-	ErrNil = errors.New("proto: Marshal called with nil")
-
-	// ErrTooLarge is the error returned if Marshal is called with a
-	// message that encodes to >2GB.
-	ErrTooLarge = errors.New("proto: message encodes to over 2 GB")
-)
-
-// The fundamental encoders that put bytes on the wire.
-// Those that take integer types all accept uint64 and are
-// therefore of type valueEncoder.
-
-const maxVarintBytes = 10 // maximum length of a varint
-
-// maxMarshalSize is the largest allowed size of an encoded protobuf,
-// since C++ and Java use signed int32s for the size.
-const maxMarshalSize = 1<<31 - 1
-
-// EncodeVarint returns the varint encoding of x.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-// Not used by the package itself, but helpful to clients
-// wishing to use the same encoding.
-func EncodeVarint(x uint64) []byte {
-	var buf [maxVarintBytes]byte
-	var n int
-	for n = 0; x > 127; n++ {
-		buf[n] = 0x80 | uint8(x&0x7F)
-		x >>= 7
-	}
-	buf[n] = uint8(x)
-	n++
-	return buf[0:n]
-}
-
-// EncodeVarint writes a varint-encoded integer to the Buffer.
-// This is the format for the
-// int32, int64, uint32, uint64, bool, and enum
-// protocol buffer types.
-func (p *Buffer) EncodeVarint(x uint64) error {
-	for x >= 1<<7 {
-		p.buf = append(p.buf, uint8(x&0x7f|0x80))
-		x >>= 7
-	}
-	p.buf = append(p.buf, uint8(x))
-	return nil
-}
-
-// SizeVarint returns the varint encoding size of an integer.
-func SizeVarint(x uint64) int {
-	return sizeVarint(x)
-}
-
-func sizeVarint(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
-}
-
-// EncodeFixed64 writes a 64-bit integer to the Buffer.
-// This is the format for the
-// fixed64, sfixed64, and double protocol buffer types.
-func (p *Buffer) EncodeFixed64(x uint64) error {
-	p.buf = append(p.buf,
-		uint8(x),
-		uint8(x>>8),
-		uint8(x>>16),
-		uint8(x>>24),
-		uint8(x>>32),
-		uint8(x>>40),
-		uint8(x>>48),
-		uint8(x>>56))
-	return nil
-}
-
-func sizeFixed64(x uint64) int {
-	return 8
-}
-
-// EncodeFixed32 writes a 32-bit integer to the Buffer.
-// This is the format for the
-// fixed32, sfixed32, and float protocol buffer types.
-func (p *Buffer) EncodeFixed32(x uint64) error {
-	p.buf = append(p.buf,
-		uint8(x),
-		uint8(x>>8),
-		uint8(x>>16),
-		uint8(x>>24))
-	return nil
-}
-
-func sizeFixed32(x uint64) int {
-	return 4
-}
-
-// EncodeZigzag64 writes a zigzag-encoded 64-bit integer
-// to the Buffer.
-// This is the format used for the sint64 protocol buffer type.
-func (p *Buffer) EncodeZigzag64(x uint64) error {
-	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint((x << 1) ^ uint64((int64(x) >> 63)))
-}
-
-func sizeZigzag64(x uint64) int {
-	return sizeVarint((x << 1) ^ uint64((int64(x) >> 63)))
-}
-
-// EncodeZigzag32 writes a zigzag-encoded 32-bit integer
-// to the Buffer.
-// This is the format used for the sint32 protocol buffer type.
-func (p *Buffer) EncodeZigzag32(x uint64) error {
-	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
-}
-
-func sizeZigzag32(x uint64) int {
-	return sizeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
-}
-
-// EncodeRawBytes writes a count-delimited byte buffer to the Buffer.
-// This is the format used for the bytes protocol buffer
-// type and for embedded messages.
-func (p *Buffer) EncodeRawBytes(b []byte) error {
-	p.EncodeVarint(uint64(len(b)))
-	p.buf = append(p.buf, b...)
-	return nil
-}
-
-func sizeRawBytes(b []byte) int {
-	return sizeVarint(uint64(len(b))) +
-		len(b)
-}
-
-// EncodeStringBytes writes an encoded string to the Buffer.
-// This is the format used for the proto2 string type.
-func (p *Buffer) EncodeStringBytes(s string) error {
-	p.EncodeVarint(uint64(len(s)))
-	p.buf = append(p.buf, s...)
-	return nil
-}
-
-func sizeStringBytes(s string) int {
-	return sizeVarint(uint64(len(s))) +
-		len(s)
-}
-
-// Marshaler is the interface representing objects that can marshal themselves.
-type Marshaler interface {
-	Marshal() ([]byte, error)
-}
-
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, returning the data.
-func Marshal(pb Message) ([]byte, error) {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		return m.Marshal()
-	}
-	p := NewBuffer(nil)
-	err := p.Marshal(pb)
-	if p.buf == nil && err == nil {
-		// Return a non-nil slice on success.
-		return []byte{}, nil
-	}
-	return p.buf, err
-}
-
-// EncodeMessage writes the protocol buffer to the Buffer,
-// prefixed by a varint-encoded length.
-func (p *Buffer) EncodeMessage(pb Message) error {
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return ErrNil
-	}
-	if err == nil {
-		var state errorState
-		err = p.enc_len_struct(GetProperties(t.Elem()), base, &state)
-	}
-	return err
-}
-
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, writing the result to the
-// Buffer.
-func (p *Buffer) Marshal(pb Message) error {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		data, err := m.Marshal()
-		p.buf = append(p.buf, data...)
-		return err
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return ErrNil
-	}
-	if err == nil {
-		err = p.enc_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		(stats).Encode++ // Parens are to work around a goimports bug.
-	}
-
-	if len(p.buf) > maxMarshalSize {
-		return ErrTooLarge
-	}
-	return err
-}
-
-// Size returns the encoded size of a protocol buffer.
-func Size(pb Message) (n int) {
-	// Can the object marshal itself?  If so, Size is slow.
-	// TODO: add Size to Marshaler, or add a Sizer interface.
-	if m, ok := pb.(Marshaler); ok {
-		b, _ := m.Marshal()
-		return len(b)
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return 0
-	}
-	if err == nil {
-		n = size_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		(stats).Size++ // Parens are to work around a goimports bug.
-	}
-
-	return
-}
-
-// Individual type encoders.
-
-// Encode a bool.
-func (o *Buffer) enc_bool(p *Properties, base structPointer) error {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := 0
-	if *v {
-		x = 1
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_bool(p *Properties, base structPointer) error {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, 1)
-	return nil
-}
-
-func size_bool(p *Properties, base structPointer) int {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-func size_proto3_bool(p *Properties, base structPointer) int {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v && !p.oneof {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-// Encode an int32.
-func (o *Buffer) enc_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode a uint32.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := word32_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := word32_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode an int64.
-func (o *Buffer) enc_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return ErrNil
-	}
-	x := word64_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func size_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return 0
-	}
-	x := word64_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-func size_proto3_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-// Encode a string.
-func (o *Buffer) enc_string(p *Properties, base structPointer) error {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := *v
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_string(p *Properties, base structPointer) error {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(v)
-	return nil
-}
-
-func size_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return 0
-	}
-	x := *v
-	n += len(p.tagcode)
-	n += sizeStringBytes(x)
-	return
-}
-
-func size_proto3_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeStringBytes(v)
-	return
-}
-
-// All protocol buffer fields are nillable, but be careful.
-func isNil(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
-		return v.IsNil()
-	}
-	return false
-}
-
-// Encode a message struct.
-func (o *Buffer) enc_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return ErrNil
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, err := m.Marshal()
-		if err != nil && !state.shouldContinue(err, nil) {
-			return err
-		}
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(data)
-		return state.err
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	return o.enc_len_struct(p.sprop, structp, &state)
-}
-
-func size_struct_message(p *Properties, base structPointer) int {
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return 0
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, _ := m.Marshal()
-		n0 := len(p.tagcode)
-		n1 := sizeRawBytes(data)
-		return n0 + n1
-	}
-
-	n0 := len(p.tagcode)
-	n1 := size_struct(p.sprop, structp)
-	n2 := sizeVarint(uint64(n1)) // size of encoded length
-	return n0 + n1 + n2
-}
-
-// Encode a group struct.
-func (o *Buffer) enc_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return ErrNil
-	}
-
-	o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	err := o.enc_struct(p.sprop, b)
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return state.err
-}
-
-func size_struct_group(p *Properties, base structPointer) (n int) {
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return 0
-	}
-
-	n += sizeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	n += size_struct(p.sprop, b)
-	n += sizeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return
-}
-
-// Encode a slice of bools ([]bool).
-func (o *Buffer) enc_slice_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	for _, x := range s {
-		o.buf = append(o.buf, p.tagcode...)
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_bool(p *Properties, base structPointer) int {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	return l * (len(p.tagcode) + 1) // each bool takes exactly one byte
-}
-
-// Encode a slice of bools ([]bool) in packed format.
-func (o *Buffer) enc_slice_packed_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(l)) // each bool takes exactly one byte
-	for _, x := range s {
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_packed_bool(p *Properties, base structPointer) (n int) {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(l))
-	n += l // each bool takes exactly one byte
-	return
-}
-
-// Encode a slice of bytes ([]byte).
-func (o *Buffer) enc_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func size_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-func size_proto3_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-// Encode a slice of int32s ([]int32).
-func (o *Buffer) enc_slice_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) enc_slice_packed_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(buf, uint64(x))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		bufSize += p.valSize(uint64(x))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of uint32s ([]uint32).
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := s.Index(i)
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := s.Index(i)
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of uint32s ([]uint32) in packed format.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_packed_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, uint64(s.Index(i)))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(uint64(s.Index(i)))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of int64s ([]int64).
-func (o *Buffer) enc_slice_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		p.valEnc(o, s.Index(i))
-	}
-	return nil
-}
-
-func size_slice_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		n += p.valSize(s.Index(i))
-	}
-	return
-}
-
-// Encode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) enc_slice_packed_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, s.Index(i))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(s.Index(i))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of slice of bytes ([][]byte).
-func (o *Buffer) enc_slice_slice_byte(p *Properties, base structPointer) error {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_slice_byte(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return 0
-	}
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeRawBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of strings ([]string).
-func (o *Buffer) enc_slice_string(p *Properties, base structPointer) error {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeStringBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_string(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeStringBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of message structs ([]*struct).
-func (o *Buffer) enc_slice_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return errRepeatedHasNil
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, err := m.Marshal()
-			if err != nil && !state.shouldContinue(err, nil) {
-				return err
-			}
-			o.buf = append(o.buf, p.tagcode...)
-			o.EncodeRawBytes(data)
-			continue
-		}
-
-		o.buf = append(o.buf, p.tagcode...)
-		err := o.enc_len_struct(p.sprop, structp, &state)
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-	}
-	return state.err
-}
-
-func size_slice_struct_message(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return // return the size up to this point
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, _ := m.Marshal()
-			n += sizeRawBytes(data)
-			continue
-		}
-
-		n0 := size_struct(p.sprop, structp)
-		n1 := sizeVarint(uint64(n0)) // size of encoded length
-		n += n0 + n1
-	}
-	return
-}
-
-// Encode a slice of group structs ([]*struct).
-func (o *Buffer) enc_slice_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return errRepeatedHasNil
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-
-		err := o.enc_struct(p.sprop, b)
-
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	}
-	return state.err
-}
-
-func size_slice_struct_group(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireStartGroup))
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireEndGroup))
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return // return size up to this point
-		}
-
-		n += size_struct(p.sprop, b)
-	}
-	return
-}
-
-// Encode an extension map.
-func (o *Buffer) enc_map(p *Properties, base structPointer) error {
-	exts := structPointer_ExtMap(base, p.field)
-	if err := encodeExtensionsMap(*exts); err != nil {
-		return err
-	}
-
-	return o.enc_map_body(*exts)
-}
-
-func (o *Buffer) enc_exts(p *Properties, base structPointer) error {
-	exts := structPointer_Extensions(base, p.field)
-
-	v, mu := exts.extensionsRead()
-	if v == nil {
-		return nil
-	}
-
-	mu.Lock()
-	defer mu.Unlock()
-	if err := encodeExtensionsMap(v); err != nil {
-		return err
-	}
-
-	return o.enc_map_body(v)
-}
-
-func (o *Buffer) enc_map_body(v map[int32]Extension) error {
-	// Fast-path for common cases: zero or one extensions.
-	if len(v) <= 1 {
-		for _, e := range v {
-			o.buf = append(o.buf, e.enc...)
-		}
-		return nil
-	}
-
-	// Sort keys to provide a deterministic encoding.
-	keys := make([]int, 0, len(v))
-	for k := range v {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-
-	for _, k := range keys {
-		o.buf = append(o.buf, v[int32(k)].enc...)
-	}
-	return nil
-}
-
-func size_map(p *Properties, base structPointer) int {
-	v := structPointer_ExtMap(base, p.field)
-	return extensionsMapSize(*v)
-}
-
-func size_exts(p *Properties, base structPointer) int {
-	v := structPointer_Extensions(base, p.field)
-	return extensionsSize(v)
-}
-
-// Encode a map field.
-func (o *Buffer) enc_new_map(p *Properties, base structPointer) error {
-	var state errorState // XXX: or do we need to plumb this through?
-
-	/*
-		A map defined as
-			map<key_type, value_type> map_field = N;
-		is encoded in the same way as
-			message MapFieldEntry {
-				key_type key = 1;
-				value_type value = 2;
-			}
-			repeated MapFieldEntry map_field = N;
-	*/
-
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-	if v.Len() == 0 {
-		return nil
-	}
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	enc := func() error {
-		if err := p.mkeyprop.enc(o, p.mkeyprop, keybase); err != nil {
-			return err
-		}
-		if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil && err != ErrNil {
-			return err
-		}
-		return nil
-	}
-
-	// Don't sort map keys. It is not required by the spec, and C++ doesn't do it.
-	for _, key := range v.MapKeys() {
-		val := v.MapIndex(key)
-
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		o.buf = append(o.buf, p.tagcode...)
-		if err := o.enc_len_thing(enc, &state); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func size_new_map(p *Properties, base structPointer) int {
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	n := 0
-	for _, key := range v.MapKeys() {
-		val := v.MapIndex(key)
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		// Tag codes for key and val are the responsibility of the sub-sizer.
-		keysize := p.mkeyprop.size(p.mkeyprop, keybase)
-		valsize := p.mvalprop.size(p.mvalprop, valbase)
-		entry := keysize + valsize
-		// Add on tag code and length of map entry itself.
-		n += len(p.tagcode) + sizeVarint(uint64(entry)) + entry
-	}
-	return n
-}
-
-// mapEncodeScratch returns a new reflect.Value matching the map's value type,
-// and a structPointer suitable for passing to an encoder or sizer.
-func mapEncodeScratch(mapType reflect.Type) (keycopy, valcopy reflect.Value, keybase, valbase structPointer) {
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// This is needed because the element-type encoders expect **T, but the map iteration produces T.
-
-	keycopy = reflect.New(mapType.Key()).Elem()                 // addressable K
-	keyptr := reflect.New(reflect.PtrTo(keycopy.Type())).Elem() // addressable *K
-	keyptr.Set(keycopy.Addr())                                  //
-	keybase = toStructPointer(keyptr.Addr())                    // **K
-
-	// Value types are more varied and require special handling.
-	switch mapType.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valcopy = reflect.ValueOf(&dummy).Elem() // addressable []byte
-		valbase = toStructPointer(valcopy.Addr())
-	case reflect.Ptr:
-		// message; the generated field type is map[K]*Msg (so V is *Msg),
-		// so we only need one level of indirection.
-		valcopy = reflect.New(mapType.Elem()).Elem() // addressable V
-		valbase = toStructPointer(valcopy.Addr())
-	default:
-		// everything else
-		valcopy = reflect.New(mapType.Elem()).Elem()                // addressable V
-		valptr := reflect.New(reflect.PtrTo(valcopy.Type())).Elem() // addressable *V
-		valptr.Set(valcopy.Addr())                                  //
-		valbase = toStructPointer(valptr.Addr())                    // **V
-	}
-	return
-}
-
-// Encode a struct.
-func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
-	var state errorState
-	// Encode fields in tag order so that decoders may use optimizations
-	// that depend on the ordering.
-	// https://developers.google.com/protocol-buffers/docs/encoding#order
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.enc != nil {
-			err := p.enc(o, p, base)
-			if err != nil {
-				if err == ErrNil {
-					if p.Required && state.err == nil {
-						state.err = &RequiredNotSetError{p.Name}
-					}
-				} else if err == errRepeatedHasNil {
-					// Give more context to nil values in repeated fields.
-					return errors.New("repeated field " + p.OrigName + " has nil element")
-				} else if !state.shouldContinue(err, p) {
-					return err
-				}
-			}
-			if len(o.buf) > maxMarshalSize {
-				return ErrTooLarge
-			}
-		}
-	}
-
-	// Do oneof fields.
-	if prop.oneofMarshaler != nil {
-		m := structPointer_Interface(base, prop.stype).(Message)
-		if err := prop.oneofMarshaler(m, o); err == ErrNil {
-			return errOneofHasNil
-		} else if err != nil {
-			return err
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		if len(o.buf)+len(v) > maxMarshalSize {
-			return ErrTooLarge
-		}
-		if len(v) > 0 {
-			o.buf = append(o.buf, v...)
-		}
-	}
-
-	return state.err
-}
-
-func size_struct(prop *StructProperties, base structPointer) (n int) {
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.size != nil {
-			n += p.size(p, base)
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		n += len(v)
-	}
-
-	// Factor in any oneof fields.
-	if prop.oneofSizer != nil {
-		m := structPointer_Interface(base, prop.stype).(Message)
-		n += prop.oneofSizer(m)
-	}
-
-	return
-}
-
-var zeroes [20]byte // longer than any conceivable sizeVarint
-
-// Encode a struct, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_struct(prop *StructProperties, base structPointer, state *errorState) error {
-	return o.enc_len_thing(func() error { return o.enc_struct(prop, base) }, state)
-}
-
-// Encode something, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_thing(enc func() error, state *errorState) error {
-	iLen := len(o.buf)
-	o.buf = append(o.buf, 0, 0, 0, 0) // reserve four bytes for length
-	iMsg := len(o.buf)
-	err := enc()
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	lMsg := len(o.buf) - iMsg
-	lLen := sizeVarint(uint64(lMsg))
-	switch x := lLen - (iMsg - iLen); {
-	case x > 0: // actual length is x bytes larger than the space we reserved
-		// Move msg x bytes right.
-		o.buf = append(o.buf, zeroes[:x]...)
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-	case x < 0: // actual length is x bytes smaller than the space we reserved
-		// Move msg x bytes left.
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-		o.buf = o.buf[:len(o.buf)+x] // x is negative
-	}
-	// Encode the length in the reserved space.
-	o.buf = o.buf[:iLen]
-	o.EncodeVarint(uint64(lMsg))
-	o.buf = o.buf[:len(o.buf)+lMsg]
-	return state.err
-}
-
-// errorState maintains the first error that occurs and updates that error
-// with additional context.
-type errorState struct {
-	err error
-}
-
-// shouldContinue reports whether encoding should continue upon encountering the
-// given error. If the error is RequiredNotSetError, shouldContinue returns true
-// and, if this is the first appearance of that error, remembers it for future
-// reporting.
-//
-// If prop is not nil, it may update any error with additional context about the
-// field with the error.
-func (s *errorState) shouldContinue(err error, prop *Properties) bool {
-	// Ignore unset required fields.
-	reqNotSet, ok := err.(*RequiredNotSetError)
-	if !ok {
-		return false
-	}
-	if s.err == nil {
-		if prop != nil {
-			err = &RequiredNotSetError{prop.Name + "." + reqNotSet.field}
-		}
-		s.err = err
-	}
-	return true
-}
diff --git a/vendor/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go
deleted file mode 100644
index 2ed1cf5966..0000000000
--- a/vendor/github.com/golang/protobuf/proto/equal.go
+++ /dev/null
@@ -1,300 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Protocol buffer comparison.
-
-package proto
-
-import (
-	"bytes"
-	"log"
-	"reflect"
-	"strings"
-)
-
-/*
-Equal returns true iff protocol buffers a and b are equal.
-The arguments must both be pointers to protocol buffer structs.
-
-Equality is defined in this way:
-  - Two messages are equal iff they are the same type,
-    corresponding fields are equal, unknown field sets
-    are equal, and extensions sets are equal.
-  - Two set scalar fields are equal iff their values are equal.
-    If the fields are of a floating-point type, remember that
-    NaN != x for all x, including NaN. If the message is defined
-    in a proto3 .proto file, fields are not "set"; specifically,
-    zero length proto3 "bytes" fields are equal (nil == {}).
-  - Two repeated fields are equal iff their lengths are the same,
-    and their corresponding elements are equal. Note a "bytes" field,
-    although represented by []byte, is not a repeated field and the
-    rule for the scalar fields described above applies.
-  - Two unset fields are equal.
-  - Two unknown field sets are equal if their current
-    encoded state is equal.
-  - Two extension sets are equal iff they have corresponding
-    elements that are pairwise equal.
-  - Two map fields are equal iff their lengths are the same,
-    and they contain the same set of elements. Zero-length map
-    fields are equal.
-  - Every other combination of things are not equal.
-
-The return value is undefined if a and b are not protocol buffers.
-*/
-func Equal(a, b Message) bool {
-	if a == nil || b == nil {
-		return a == b
-	}
-	v1, v2 := reflect.ValueOf(a), reflect.ValueOf(b)
-	if v1.Type() != v2.Type() {
-		return false
-	}
-	if v1.Kind() == reflect.Ptr {
-		if v1.IsNil() {
-			return v2.IsNil()
-		}
-		if v2.IsNil() {
-			return false
-		}
-		v1, v2 = v1.Elem(), v2.Elem()
-	}
-	if v1.Kind() != reflect.Struct {
-		return false
-	}
-	return equalStruct(v1, v2)
-}
-
-// v1 and v2 are known to have the same type.
-func equalStruct(v1, v2 reflect.Value) bool {
-	sprop := GetProperties(v1.Type())
-	for i := 0; i < v1.NumField(); i++ {
-		f := v1.Type().Field(i)
-		if strings.HasPrefix(f.Name, "XXX_") {
-			continue
-		}
-		f1, f2 := v1.Field(i), v2.Field(i)
-		if f.Type.Kind() == reflect.Ptr {
-			if n1, n2 := f1.IsNil(), f2.IsNil(); n1 && n2 {
-				// both unset
-				continue
-			} else if n1 != n2 {
-				// set/unset mismatch
-				return false
-			}
-			b1, ok := f1.Interface().(raw)
-			if ok {
-				b2 := f2.Interface().(raw)
-				// RawMessage
-				if !bytes.Equal(b1.Bytes(), b2.Bytes()) {
-					return false
-				}
-				continue
-			}
-			f1, f2 = f1.Elem(), f2.Elem()
-		}
-		if !equalAny(f1, f2, sprop.Prop[i]) {
-			return false
-		}
-	}
-
-	if em1 := v1.FieldByName("XXX_InternalExtensions"); em1.IsValid() {
-		em2 := v2.FieldByName("XXX_InternalExtensions")
-		if !equalExtensions(v1.Type(), em1.Interface().(XXX_InternalExtensions), em2.Interface().(XXX_InternalExtensions)) {
-			return false
-		}
-	}
-
-	if em1 := v1.FieldByName("XXX_extensions"); em1.IsValid() {
-		em2 := v2.FieldByName("XXX_extensions")
-		if !equalExtMap(v1.Type(), em1.Interface().(map[int32]Extension), em2.Interface().(map[int32]Extension)) {
-			return false
-		}
-	}
-
-	uf := v1.FieldByName("XXX_unrecognized")
-	if !uf.IsValid() {
-		return true
-	}
-
-	u1 := uf.Bytes()
-	u2 := v2.FieldByName("XXX_unrecognized").Bytes()
-	if !bytes.Equal(u1, u2) {
-		return false
-	}
-
-	return true
-}
-
-// v1 and v2 are known to have the same type.
-// prop may be nil.
-func equalAny(v1, v2 reflect.Value, prop *Properties) bool {
-	if v1.Type() == protoMessageType {
-		m1, _ := v1.Interface().(Message)
-		m2, _ := v2.Interface().(Message)
-		return Equal(m1, m2)
-	}
-	switch v1.Kind() {
-	case reflect.Bool:
-		return v1.Bool() == v2.Bool()
-	case reflect.Float32, reflect.Float64:
-		return v1.Float() == v2.Float()
-	case reflect.Int32, reflect.Int64:
-		return v1.Int() == v2.Int()
-	case reflect.Interface:
-		// Probably a oneof field; compare the inner values.
-		n1, n2 := v1.IsNil(), v2.IsNil()
-		if n1 || n2 {
-			return n1 == n2
-		}
-		e1, e2 := v1.Elem(), v2.Elem()
-		if e1.Type() != e2.Type() {
-			return false
-		}
-		return equalAny(e1, e2, nil)
-	case reflect.Map:
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		for _, key := range v1.MapKeys() {
-			val2 := v2.MapIndex(key)
-			if !val2.IsValid() {
-				// This key was not found in the second map.
-				return false
-			}
-			if !equalAny(v1.MapIndex(key), val2, nil) {
-				return false
-			}
-		}
-		return true
-	case reflect.Ptr:
-		// Maps may have nil values in them, so check for nil.
-		if v1.IsNil() && v2.IsNil() {
-			return true
-		}
-		if v1.IsNil() != v2.IsNil() {
-			return false
-		}
-		return equalAny(v1.Elem(), v2.Elem(), prop)
-	case reflect.Slice:
-		if v1.Type().Elem().Kind() == reflect.Uint8 {
-			// short circuit: []byte
-
-			// Edge case: if this is in a proto3 message, a zero length
-			// bytes field is considered the zero value.
-			if prop != nil && prop.proto3 && v1.Len() == 0 && v2.Len() == 0 {
-				return true
-			}
-			if v1.IsNil() != v2.IsNil() {
-				return false
-			}
-			return bytes.Equal(v1.Interface().([]byte), v2.Interface().([]byte))
-		}
-
-		if v1.Len() != v2.Len() {
-			return false
-		}
-		for i := 0; i < v1.Len(); i++ {
-			if !equalAny(v1.Index(i), v2.Index(i), prop) {
-				return false
-			}
-		}
-		return true
-	case reflect.String:
-		return v1.Interface().(string) == v2.Interface().(string)
-	case reflect.Struct:
-		return equalStruct(v1, v2)
-	case reflect.Uint32, reflect.Uint64:
-		return v1.Uint() == v2.Uint()
-	}
-
-	// unknown type, so not a protocol buffer
-	log.Printf("proto: don't know how to compare %v", v1)
-	return false
-}
-
-// base is the struct type that the extensions are based on.
-// x1 and x2 are InternalExtensions.
-func equalExtensions(base reflect.Type, x1, x2 XXX_InternalExtensions) bool {
-	em1, _ := x1.extensionsRead()
-	em2, _ := x2.extensionsRead()
-	return equalExtMap(base, em1, em2)
-}
-
-func equalExtMap(base reflect.Type, em1, em2 map[int32]Extension) bool {
-	if len(em1) != len(em2) {
-		return false
-	}
-
-	for extNum, e1 := range em1 {
-		e2, ok := em2[extNum]
-		if !ok {
-			return false
-		}
-
-		m1, m2 := e1.value, e2.value
-
-		if m1 != nil && m2 != nil {
-			// Both are unencoded.
-			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
-				return false
-			}
-			continue
-		}
-
-		// At least one is encoded. To do a semantically correct comparison
-		// we need to unmarshal them first.
-		var desc *ExtensionDesc
-		if m := extensionMaps[base]; m != nil {
-			desc = m[extNum]
-		}
-		if desc == nil {
-			log.Printf("proto: don't know how to compare extension %d of %v", extNum, base)
-			continue
-		}
-		var err error
-		if m1 == nil {
-			m1, err = decodeExtension(e1.enc, desc)
-		}
-		if m2 == nil && err == nil {
-			m2, err = decodeExtension(e2.enc, desc)
-		}
-		if err != nil {
-			// The encoded form is invalid.
-			log.Printf("proto: badly encoded extension %d of %v: %v", extNum, base, err)
-			return false
-		}
-		if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/vendor/github.com/golang/protobuf/proto/extensions.go b/vendor/github.com/golang/protobuf/proto/extensions.go
deleted file mode 100644
index eaad218312..0000000000
--- a/vendor/github.com/golang/protobuf/proto/extensions.go
+++ /dev/null
@@ -1,587 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Types and routines for supporting protocol buffer extensions.
- */
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"sync"
-)
-
-// ErrMissingExtension is the error returned by GetExtension if the named extension is not in the message.
-var ErrMissingExtension = errors.New("proto: missing extension")
-
-// ExtensionRange represents a range of message extensions for a protocol buffer.
-// Used in code generated by the protocol compiler.
-type ExtensionRange struct {
-	Start, End int32 // both inclusive
-}
-
-// extendableProto is an interface implemented by any protocol buffer generated by the current
-// proto compiler that may be extended.
-type extendableProto interface {
-	Message
-	ExtensionRangeArray() []ExtensionRange
-	extensionsWrite() map[int32]Extension
-	extensionsRead() (map[int32]Extension, sync.Locker)
-}
-
-// extendableProtoV1 is an interface implemented by a protocol buffer generated by the previous
-// version of the proto compiler that may be extended.
-type extendableProtoV1 interface {
-	Message
-	ExtensionRangeArray() []ExtensionRange
-	ExtensionMap() map[int32]Extension
-}
-
-// extensionAdapter is a wrapper around extendableProtoV1 that implements extendableProto.
-type extensionAdapter struct {
-	extendableProtoV1
-}
-
-func (e extensionAdapter) extensionsWrite() map[int32]Extension {
-	return e.ExtensionMap()
-}
-
-func (e extensionAdapter) extensionsRead() (map[int32]Extension, sync.Locker) {
-	return e.ExtensionMap(), notLocker{}
-}
-
-// notLocker is a sync.Locker whose Lock and Unlock methods are nops.
-type notLocker struct{}
-
-func (n notLocker) Lock()   {}
-func (n notLocker) Unlock() {}
-
-// extendable returns the extendableProto interface for the given generated proto message.
-// If the proto message has the old extension format, it returns a wrapper that implements
-// the extendableProto interface.
-func extendable(p interface{}) (extendableProto, bool) {
-	if ep, ok := p.(extendableProto); ok {
-		return ep, ok
-	}
-	if ep, ok := p.(extendableProtoV1); ok {
-		return extensionAdapter{ep}, ok
-	}
-	return nil, false
-}
-
-// XXX_InternalExtensions is an internal representation of proto extensions.
-//
-// Each generated message struct type embeds an anonymous XXX_InternalExtensions field,
-// thus gaining the unexported 'extensions' method, which can be called only from the proto package.
-//
-// The methods of XXX_InternalExtensions are not concurrency safe in general,
-// but calls to logically read-only methods such as has and get may be executed concurrently.
-type XXX_InternalExtensions struct {
-	// The struct must be indirect so that if a user inadvertently copies a
-	// generated message and its embedded XXX_InternalExtensions, they
-	// avoid the mayhem of a copied mutex.
-	//
-	// The mutex serializes all logically read-only operations to p.extensionMap.
-	// It is up to the client to ensure that write operations to p.extensionMap are
-	// mutually exclusive with other accesses.
-	p *struct {
-		mu           sync.Mutex
-		extensionMap map[int32]Extension
-	}
-}
-
-// extensionsWrite returns the extension map, creating it on first use.
-func (e *XXX_InternalExtensions) extensionsWrite() map[int32]Extension {
-	if e.p == nil {
-		e.p = new(struct {
-			mu           sync.Mutex
-			extensionMap map[int32]Extension
-		})
-		e.p.extensionMap = make(map[int32]Extension)
-	}
-	return e.p.extensionMap
-}
-
-// extensionsRead returns the extensions map for read-only use.  It may be nil.
-// The caller must hold the returned mutex's lock when accessing Elements within the map.
-func (e *XXX_InternalExtensions) extensionsRead() (map[int32]Extension, sync.Locker) {
-	if e.p == nil {
-		return nil, nil
-	}
-	return e.p.extensionMap, &e.p.mu
-}
-
-var extendableProtoType = reflect.TypeOf((*extendableProto)(nil)).Elem()
-var extendableProtoV1Type = reflect.TypeOf((*extendableProtoV1)(nil)).Elem()
-
-// ExtensionDesc represents an extension specification.
-// Used in generated code from the protocol compiler.
-type ExtensionDesc struct {
-	ExtendedType  Message     // nil pointer to the type that is being extended
-	ExtensionType interface{} // nil pointer to the extension type
-	Field         int32       // field number
-	Name          string      // fully-qualified name of extension, for text formatting
-	Tag           string      // protobuf tag style
-	Filename      string      // name of the file in which the extension is defined
-}
-
-func (ed *ExtensionDesc) repeated() bool {
-	t := reflect.TypeOf(ed.ExtensionType)
-	return t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8
-}
-
-// Extension represents an extension in a message.
-type Extension struct {
-	// When an extension is stored in a message using SetExtension
-	// only desc and value are set. When the message is marshaled
-	// enc will be set to the encoded form of the message.
-	//
-	// When a message is unmarshaled and contains extensions, each
-	// extension will have only enc set. When such an extension is
-	// accessed using GetExtension (or GetExtensions) desc and value
-	// will be set.
-	desc  *ExtensionDesc
-	value interface{}
-	enc   []byte
-}
-
-// SetRawExtension is for testing only.
-func SetRawExtension(base Message, id int32, b []byte) {
-	epb, ok := extendable(base)
-	if !ok {
-		return
-	}
-	extmap := epb.extensionsWrite()
-	extmap[id] = Extension{enc: b}
-}
-
-// isExtensionField returns true iff the given field number is in an extension range.
-func isExtensionField(pb extendableProto, field int32) bool {
-	for _, er := range pb.ExtensionRangeArray() {
-		if er.Start <= field && field <= er.End {
-			return true
-		}
-	}
-	return false
-}
-
-// checkExtensionTypes checks that the given extension is valid for pb.
-func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
-	var pbi interface{} = pb
-	// Check the extended type.
-	if ea, ok := pbi.(extensionAdapter); ok {
-		pbi = ea.extendableProtoV1
-	}
-	if a, b := reflect.TypeOf(pbi), reflect.TypeOf(extension.ExtendedType); a != b {
-		return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
-	}
-	// Check the range.
-	if !isExtensionField(pb, extension.Field) {
-		return errors.New("proto: bad extension number; not in declared ranges")
-	}
-	return nil
-}
-
-// extPropKey is sufficient to uniquely identify an extension.
-type extPropKey struct {
-	base  reflect.Type
-	field int32
-}
-
-var extProp = struct {
-	sync.RWMutex
-	m map[extPropKey]*Properties
-}{
-	m: make(map[extPropKey]*Properties),
-}
-
-func extensionProperties(ed *ExtensionDesc) *Properties {
-	key := extPropKey{base: reflect.TypeOf(ed.ExtendedType), field: ed.Field}
-
-	extProp.RLock()
-	if prop, ok := extProp.m[key]; ok {
-		extProp.RUnlock()
-		return prop
-	}
-	extProp.RUnlock()
-
-	extProp.Lock()
-	defer extProp.Unlock()
-	// Check again.
-	if prop, ok := extProp.m[key]; ok {
-		return prop
-	}
-
-	prop := new(Properties)
-	prop.Init(reflect.TypeOf(ed.ExtensionType), "unknown_name", ed.Tag, nil)
-	extProp.m[key] = prop
-	return prop
-}
-
-// encode encodes any unmarshaled (unencoded) extensions in e.
-func encodeExtensions(e *XXX_InternalExtensions) error {
-	m, mu := e.extensionsRead()
-	if m == nil {
-		return nil // fast path
-	}
-	mu.Lock()
-	defer mu.Unlock()
-	return encodeExtensionsMap(m)
-}
-
-// encode encodes any unmarshaled (unencoded) extensions in e.
-func encodeExtensionsMap(m map[int32]Extension) error {
-	for k, e := range m {
-		if e.value == nil || e.desc == nil {
-			// Extension is only in its encoded form.
-			continue
-		}
-
-		// We don't skip extensions that have an encoded form set,
-		// because the extension value may have been mutated after
-		// the last time this function was called.
-
-		et := reflect.TypeOf(e.desc.ExtensionType)
-		props := extensionProperties(e.desc)
-
-		p := NewBuffer(nil)
-		// If e.value has type T, the encoder expects a *struct{ X T }.
-		// Pass a *T with a zero field and hope it all works out.
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(e.value))
-		if err := props.enc(p, props, toStructPointer(x)); err != nil {
-			return err
-		}
-		e.enc = p.buf
-		m[k] = e
-	}
-	return nil
-}
-
-func extensionsSize(e *XXX_InternalExtensions) (n int) {
-	m, mu := e.extensionsRead()
-	if m == nil {
-		return 0
-	}
-	mu.Lock()
-	defer mu.Unlock()
-	return extensionsMapSize(m)
-}
-
-func extensionsMapSize(m map[int32]Extension) (n int) {
-	for _, e := range m {
-		if e.value == nil || e.desc == nil {
-			// Extension is only in its encoded form.
-			n += len(e.enc)
-			continue
-		}
-
-		// We don't skip extensions that have an encoded form set,
-		// because the extension value may have been mutated after
-		// the last time this function was called.
-
-		et := reflect.TypeOf(e.desc.ExtensionType)
-		props := extensionProperties(e.desc)
-
-		// If e.value has type T, the encoder expects a *struct{ X T }.
-		// Pass a *T with a zero field and hope it all works out.
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(e.value))
-		n += props.size(props, toStructPointer(x))
-	}
-	return
-}
-
-// HasExtension returns whether the given extension is present in pb.
-func HasExtension(pb Message, extension *ExtensionDesc) bool {
-	// TODO: Check types, field numbers, etc.?
-	epb, ok := extendable(pb)
-	if !ok {
-		return false
-	}
-	extmap, mu := epb.extensionsRead()
-	if extmap == nil {
-		return false
-	}
-	mu.Lock()
-	_, ok = extmap[extension.Field]
-	mu.Unlock()
-	return ok
-}
-
-// ClearExtension removes the given extension from pb.
-func ClearExtension(pb Message, extension *ExtensionDesc) {
-	epb, ok := extendable(pb)
-	if !ok {
-		return
-	}
-	// TODO: Check types, field numbers, etc.?
-	extmap := epb.extensionsWrite()
-	delete(extmap, extension.Field)
-}
-
-// GetExtension parses and returns the given extension of pb.
-// If the extension is not present and has no default value it returns ErrMissingExtension.
-func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
-	epb, ok := extendable(pb)
-	if !ok {
-		return nil, errors.New("proto: not an extendable proto")
-	}
-
-	if err := checkExtensionTypes(epb, extension); err != nil {
-		return nil, err
-	}
-
-	emap, mu := epb.extensionsRead()
-	if emap == nil {
-		return defaultExtensionValue(extension)
-	}
-	mu.Lock()
-	defer mu.Unlock()
-	e, ok := emap[extension.Field]
-	if !ok {
-		// defaultExtensionValue returns the default value or
-		// ErrMissingExtension if there is no default.
-		return defaultExtensionValue(extension)
-	}
-
-	if e.value != nil {
-		// Already decoded. Check the descriptor, though.
-		if e.desc != extension {
-			// This shouldn't happen. If it does, it means that
-			// GetExtension was called twice with two different
-			// descriptors with the same field number.
-			return nil, errors.New("proto: descriptor conflict")
-		}
-		return e.value, nil
-	}
-
-	v, err := decodeExtension(e.enc, extension)
-	if err != nil {
-		return nil, err
-	}
-
-	// Remember the decoded version and drop the encoded version.
-	// That way it is safe to mutate what we return.
-	e.value = v
-	e.desc = extension
-	e.enc = nil
-	emap[extension.Field] = e
-	return e.value, nil
-}
-
-// defaultExtensionValue returns the default value for extension.
-// If no default for an extension is defined ErrMissingExtension is returned.
-func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
-	t := reflect.TypeOf(extension.ExtensionType)
-	props := extensionProperties(extension)
-
-	sf, _, err := fieldDefault(t, props)
-	if err != nil {
-		return nil, err
-	}
-
-	if sf == nil || sf.value == nil {
-		// There is no default value.
-		return nil, ErrMissingExtension
-	}
-
-	if t.Kind() != reflect.Ptr {
-		// We do not need to return a Ptr, we can directly return sf.value.
-		return sf.value, nil
-	}
-
-	// We need to return an interface{} that is a pointer to sf.value.
-	value := reflect.New(t).Elem()
-	value.Set(reflect.New(value.Type().Elem()))
-	if sf.kind == reflect.Int32 {
-		// We may have an int32 or an enum, but the underlying data is int32.
-		// Since we can't set an int32 into a non int32 reflect.value directly
-		// set it as a int32.
-		value.Elem().SetInt(int64(sf.value.(int32)))
-	} else {
-		value.Elem().Set(reflect.ValueOf(sf.value))
-	}
-	return value.Interface(), nil
-}
-
-// decodeExtension decodes an extension encoded in b.
-func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
-	o := NewBuffer(b)
-
-	t := reflect.TypeOf(extension.ExtensionType)
-
-	props := extensionProperties(extension)
-
-	// t is a pointer to a struct, pointer to basic type or a slice.
-	// Allocate a "field" to store the pointer/slice itself; the
-	// pointer/slice will be stored here. We pass
-	// the address of this field to props.dec.
-	// This passes a zero field and a *t and lets props.dec
-	// interpret it as a *struct{ x t }.
-	value := reflect.New(t).Elem()
-
-	for {
-		// Discard wire type and field number varint. It isn't needed.
-		if _, err := o.DecodeVarint(); err != nil {
-			return nil, err
-		}
-
-		if err := props.dec(o, props, toStructPointer(value.Addr())); err != nil {
-			return nil, err
-		}
-
-		if o.index >= len(o.buf) {
-			break
-		}
-	}
-	return value.Interface(), nil
-}
-
-// GetExtensions returns a slice of the extensions present in pb that are also listed in es.
-// The returned slice has the same length as es; missing extensions will appear as nil elements.
-func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
-	epb, ok := extendable(pb)
-	if !ok {
-		return nil, errors.New("proto: not an extendable proto")
-	}
-	extensions = make([]interface{}, len(es))
-	for i, e := range es {
-		extensions[i], err = GetExtension(epb, e)
-		if err == ErrMissingExtension {
-			err = nil
-		}
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// ExtensionDescs returns a new slice containing pb's extension descriptors, in undefined order.
-// For non-registered extensions, ExtensionDescs returns an incomplete descriptor containing
-// just the Field field, which defines the extension's field number.
-func ExtensionDescs(pb Message) ([]*ExtensionDesc, error) {
-	epb, ok := extendable(pb)
-	if !ok {
-		return nil, fmt.Errorf("proto: %T is not an extendable proto.Message", pb)
-	}
-	registeredExtensions := RegisteredExtensions(pb)
-
-	emap, mu := epb.extensionsRead()
-	if emap == nil {
-		return nil, nil
-	}
-	mu.Lock()
-	defer mu.Unlock()
-	extensions := make([]*ExtensionDesc, 0, len(emap))
-	for extid, e := range emap {
-		desc := e.desc
-		if desc == nil {
-			desc = registeredExtensions[extid]
-			if desc == nil {
-				desc = &ExtensionDesc{Field: extid}
-			}
-		}
-
-		extensions = append(extensions, desc)
-	}
-	return extensions, nil
-}
-
-// SetExtension sets the specified extension of pb to the specified value.
-func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error {
-	epb, ok := extendable(pb)
-	if !ok {
-		return errors.New("proto: not an extendable proto")
-	}
-	if err := checkExtensionTypes(epb, extension); err != nil {
-		return err
-	}
-	typ := reflect.TypeOf(extension.ExtensionType)
-	if typ != reflect.TypeOf(value) {
-		return errors.New("proto: bad extension value type")
-	}
-	// nil extension values need to be caught early, because the
-	// encoder can't distinguish an ErrNil due to a nil extension
-	// from an ErrNil due to a missing field. Extensions are
-	// always optional, so the encoder would just swallow the error
-	// and drop all the extensions from the encoded message.
-	if reflect.ValueOf(value).IsNil() {
-		return fmt.Errorf("proto: SetExtension called with nil value of type %T", value)
-	}
-
-	extmap := epb.extensionsWrite()
-	extmap[extension.Field] = Extension{desc: extension, value: value}
-	return nil
-}
-
-// ClearAllExtensions clears all extensions from pb.
-func ClearAllExtensions(pb Message) {
-	epb, ok := extendable(pb)
-	if !ok {
-		return
-	}
-	m := epb.extensionsWrite()
-	for k := range m {
-		delete(m, k)
-	}
-}
-
-// A global registry of extensions.
-// The generated code will register the generated descriptors by calling RegisterExtension.
-
-var extensionMaps = make(map[reflect.Type]map[int32]*ExtensionDesc)
-
-// RegisterExtension is called from the generated code.
-func RegisterExtension(desc *ExtensionDesc) {
-	st := reflect.TypeOf(desc.ExtendedType).Elem()
-	m := extensionMaps[st]
-	if m == nil {
-		m = make(map[int32]*ExtensionDesc)
-		extensionMaps[st] = m
-	}
-	if _, ok := m[desc.Field]; ok {
-		panic("proto: duplicate extension registered: " + st.String() + " " + strconv.Itoa(int(desc.Field)))
-	}
-	m[desc.Field] = desc
-}
-
-// RegisteredExtensions returns a map of the registered extensions of a
-// protocol buffer struct, indexed by the extension number.
-// The argument pb should be a nil pointer to the struct type.
-func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc {
-	return extensionMaps[reflect.TypeOf(pb).Elem()]
-}
diff --git a/vendor/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go
deleted file mode 100644
index 1c225504a0..0000000000
--- a/vendor/github.com/golang/protobuf/proto/lib.go
+++ /dev/null
@@ -1,897 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
-Package proto converts data structures to and from the wire format of
-protocol buffers.  It works in concert with the Go source code generated
-for .proto files by the protocol compiler.
-
-A summary of the properties of the protocol buffer interface
-for a protocol buffer variable v:
-
-  - Names are turned from camel_case to CamelCase for export.
-  - There are no methods on v to set fields; just treat
-	them as structure fields.
-  - There are getters that return a field's value if set,
-	and return the field's default value if unset.
-	The getters work even if the receiver is a nil message.
-  - The zero value for a struct is its correct initialization state.
-	All desired fields must be set before marshaling.
-  - A Reset() method will restore a protobuf struct to its zero state.
-  - Non-repeated fields are pointers to the values; nil means unset.
-	That is, optional or required field int32 f becomes F *int32.
-  - Repeated fields are slices.
-  - Helper functions are available to aid the setting of fields.
-	msg.Foo = proto.String("hello") // set field
-  - Constants are defined to hold the default values of all fields that
-	have them.  They have the form Default_StructName_FieldName.
-	Because the getter methods handle defaulted values,
-	direct use of these constants should be rare.
-  - Enums are given type names and maps from names to values.
-	Enum values are prefixed by the enclosing message's name, or by the
-	enum's type name if it is a top-level enum. Enum types have a String
-	method, and a Enum method to assist in message construction.
-  - Nested messages, groups and enums have type names prefixed with the name of
-	the surrounding message type.
-  - Extensions are given descriptor names that start with E_,
-	followed by an underscore-delimited list of the nested messages
-	that contain it (if any) followed by the CamelCased name of the
-	extension field itself.  HasExtension, ClearExtension, GetExtension
-	and SetExtension are functions for manipulating extensions.
-  - Oneof field sets are given a single field in their message,
-	with distinguished wrapper types for each possible field value.
-  - Marshal and Unmarshal are functions to encode and decode the wire format.
-
-When the .proto file specifies `syntax="proto3"`, there are some differences:
-
-  - Non-repeated fields of non-message type are values instead of pointers.
-  - Enum types do not get an Enum method.
-
-The simplest way to describe this is to see an example.
-Given file test.proto, containing
-
-	package example;
-
-	enum FOO { X = 17; }
-
-	message Test {
-	  required string label = 1;
-	  optional int32 type = 2 [default=77];
-	  repeated int64 reps = 3;
-	  optional group OptionalGroup = 4 {
-	    required string RequiredField = 5;
-	  }
-	  oneof union {
-	    int32 number = 6;
-	    string name = 7;
-	  }
-	}
-
-The resulting file, test.pb.go, is:
-
-	package example
-
-	import proto "github.com/golang/protobuf/proto"
-	import math "math"
-
-	type FOO int32
-	const (
-		FOO_X FOO = 17
-	)
-	var FOO_name = map[int32]string{
-		17: "X",
-	}
-	var FOO_value = map[string]int32{
-		"X": 17,
-	}
-
-	func (x FOO) Enum() *FOO {
-		p := new(FOO)
-		*p = x
-		return p
-	}
-	func (x FOO) String() string {
-		return proto.EnumName(FOO_name, int32(x))
-	}
-	func (x *FOO) UnmarshalJSON(data []byte) error {
-		value, err := proto.UnmarshalJSONEnum(FOO_value, data)
-		if err != nil {
-			return err
-		}
-		*x = FOO(value)
-		return nil
-	}
-
-	type Test struct {
-		Label         *string             `protobuf:"bytes,1,req,name=label" json:"label,omitempty"`
-		Type          *int32              `protobuf:"varint,2,opt,name=type,def=77" json:"type,omitempty"`
-		Reps          []int64             `protobuf:"varint,3,rep,name=reps" json:"reps,omitempty"`
-		Optionalgroup *Test_OptionalGroup `protobuf:"group,4,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
-		// Types that are valid to be assigned to Union:
-		//	*Test_Number
-		//	*Test_Name
-		Union            isTest_Union `protobuf_oneof:"union"`
-		XXX_unrecognized []byte       `json:"-"`
-	}
-	func (m *Test) Reset()         { *m = Test{} }
-	func (m *Test) String() string { return proto.CompactTextString(m) }
-	func (*Test) ProtoMessage() {}
-
-	type isTest_Union interface {
-		isTest_Union()
-	}
-
-	type Test_Number struct {
-		Number int32 `protobuf:"varint,6,opt,name=number"`
-	}
-	type Test_Name struct {
-		Name string `protobuf:"bytes,7,opt,name=name"`
-	}
-
-	func (*Test_Number) isTest_Union() {}
-	func (*Test_Name) isTest_Union()   {}
-
-	func (m *Test) GetUnion() isTest_Union {
-		if m != nil {
-			return m.Union
-		}
-		return nil
-	}
-	const Default_Test_Type int32 = 77
-
-	func (m *Test) GetLabel() string {
-		if m != nil && m.Label != nil {
-			return *m.Label
-		}
-		return ""
-	}
-
-	func (m *Test) GetType() int32 {
-		if m != nil && m.Type != nil {
-			return *m.Type
-		}
-		return Default_Test_Type
-	}
-
-	func (m *Test) GetOptionalgroup() *Test_OptionalGroup {
-		if m != nil {
-			return m.Optionalgroup
-		}
-		return nil
-	}
-
-	type Test_OptionalGroup struct {
-		RequiredField *string `protobuf:"bytes,5,req" json:"RequiredField,omitempty"`
-	}
-	func (m *Test_OptionalGroup) Reset()         { *m = Test_OptionalGroup{} }
-	func (m *Test_OptionalGroup) String() string { return proto.CompactTextString(m) }
-
-	func (m *Test_OptionalGroup) GetRequiredField() string {
-		if m != nil && m.RequiredField != nil {
-			return *m.RequiredField
-		}
-		return ""
-	}
-
-	func (m *Test) GetNumber() int32 {
-		if x, ok := m.GetUnion().(*Test_Number); ok {
-			return x.Number
-		}
-		return 0
-	}
-
-	func (m *Test) GetName() string {
-		if x, ok := m.GetUnion().(*Test_Name); ok {
-			return x.Name
-		}
-		return ""
-	}
-
-	func init() {
-		proto.RegisterEnum("example.FOO", FOO_name, FOO_value)
-	}
-
-To create and play with a Test object:
-
-	package main
-
-	import (
-		"log"
-
-		"github.com/golang/protobuf/proto"
-		pb "./example.pb"
-	)
-
-	func main() {
-		test := &pb.Test{
-			Label: proto.String("hello"),
-			Type:  proto.Int32(17),
-			Reps:  []int64{1, 2, 3},
-			Optionalgroup: &pb.Test_OptionalGroup{
-				RequiredField: proto.String("good bye"),
-			},
-			Union: &pb.Test_Name{"fred"},
-		}
-		data, err := proto.Marshal(test)
-		if err != nil {
-			log.Fatal("marshaling error: ", err)
-		}
-		newTest := &pb.Test{}
-		err = proto.Unmarshal(data, newTest)
-		if err != nil {
-			log.Fatal("unmarshaling error: ", err)
-		}
-		// Now test and newTest contain the same data.
-		if test.GetLabel() != newTest.GetLabel() {
-			log.Fatalf("data mismatch %q != %q", test.GetLabel(), newTest.GetLabel())
-		}
-		// Use a type switch to determine which oneof was set.
-		switch u := test.Union.(type) {
-		case *pb.Test_Number: // u.Number contains the number.
-		case *pb.Test_Name: // u.Name contains the string.
-		}
-		// etc.
-	}
-*/
-package proto
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"reflect"
-	"sort"
-	"strconv"
-	"sync"
-)
-
-// Message is implemented by generated protocol buffer messages.
-type Message interface {
-	Reset()
-	String() string
-	ProtoMessage()
-}
-
-// Stats records allocation details about the protocol buffer encoders
-// and decoders.  Useful for tuning the library itself.
-type Stats struct {
-	Emalloc uint64 // mallocs in encode
-	Dmalloc uint64 // mallocs in decode
-	Encode  uint64 // number of encodes
-	Decode  uint64 // number of decodes
-	Chit    uint64 // number of cache hits
-	Cmiss   uint64 // number of cache misses
-	Size    uint64 // number of sizes
-}
-
-// Set to true to enable stats collection.
-const collectStats = false
-
-var stats Stats
-
-// GetStats returns a copy of the global Stats structure.
-func GetStats() Stats { return stats }
-
-// A Buffer is a buffer manager for marshaling and unmarshaling
-// protocol buffers.  It may be reused between invocations to
-// reduce memory usage.  It is not necessary to use a Buffer;
-// the global functions Marshal and Unmarshal create a
-// temporary Buffer and are fine for most applications.
-type Buffer struct {
-	buf   []byte // encode/decode byte stream
-	index int    // read point
-
-	// pools of basic types to amortize allocation.
-	bools   []bool
-	uint32s []uint32
-	uint64s []uint64
-
-	// extra pools, only used with pointer_reflect.go
-	int32s   []int32
-	int64s   []int64
-	float32s []float32
-	float64s []float64
-}
-
-// NewBuffer allocates a new Buffer and initializes its internal data to
-// the contents of the argument slice.
-func NewBuffer(e []byte) *Buffer {
-	return &Buffer{buf: e}
-}
-
-// Reset resets the Buffer, ready for marshaling a new protocol buffer.
-func (p *Buffer) Reset() {
-	p.buf = p.buf[0:0] // for reading/writing
-	p.index = 0        // for reading
-}
-
-// SetBuf replaces the internal buffer with the slice,
-// ready for unmarshaling the contents of the slice.
-func (p *Buffer) SetBuf(s []byte) {
-	p.buf = s
-	p.index = 0
-}
-
-// Bytes returns the contents of the Buffer.
-func (p *Buffer) Bytes() []byte { return p.buf }
-
-/*
- * Helper routines for simplifying the creation of optional fields of basic type.
- */
-
-// Bool is a helper routine that allocates a new bool value
-// to store v and returns a pointer to it.
-func Bool(v bool) *bool {
-	return &v
-}
-
-// Int32 is a helper routine that allocates a new int32 value
-// to store v and returns a pointer to it.
-func Int32(v int32) *int32 {
-	return &v
-}
-
-// Int is a helper routine that allocates a new int32 value
-// to store v and returns a pointer to it, but unlike Int32
-// its argument value is an int.
-func Int(v int) *int32 {
-	p := new(int32)
-	*p = int32(v)
-	return p
-}
-
-// Int64 is a helper routine that allocates a new int64 value
-// to store v and returns a pointer to it.
-func Int64(v int64) *int64 {
-	return &v
-}
-
-// Float32 is a helper routine that allocates a new float32 value
-// to store v and returns a pointer to it.
-func Float32(v float32) *float32 {
-	return &v
-}
-
-// Float64 is a helper routine that allocates a new float64 value
-// to store v and returns a pointer to it.
-func Float64(v float64) *float64 {
-	return &v
-}
-
-// Uint32 is a helper routine that allocates a new uint32 value
-// to store v and returns a pointer to it.
-func Uint32(v uint32) *uint32 {
-	return &v
-}
-
-// Uint64 is a helper routine that allocates a new uint64 value
-// to store v and returns a pointer to it.
-func Uint64(v uint64) *uint64 {
-	return &v
-}
-
-// String is a helper routine that allocates a new string value
-// to store v and returns a pointer to it.
-func String(v string) *string {
-	return &v
-}
-
-// EnumName is a helper function to simplify printing protocol buffer enums
-// by name.  Given an enum map and a value, it returns a useful string.
-func EnumName(m map[int32]string, v int32) string {
-	s, ok := m[v]
-	if ok {
-		return s
-	}
-	return strconv.Itoa(int(v))
-}
-
-// UnmarshalJSONEnum is a helper function to simplify recovering enum int values
-// from their JSON-encoded representation. Given a map from the enum's symbolic
-// names to its int values, and a byte buffer containing the JSON-encoded
-// value, it returns an int32 that can be cast to the enum type by the caller.
-//
-// The function can deal with both JSON representations, numeric and symbolic.
-func UnmarshalJSONEnum(m map[string]int32, data []byte, enumName string) (int32, error) {
-	if data[0] == '"' {
-		// New style: enums are strings.
-		var repr string
-		if err := json.Unmarshal(data, &repr); err != nil {
-			return -1, err
-		}
-		val, ok := m[repr]
-		if !ok {
-			return 0, fmt.Errorf("unrecognized enum %s value %q", enumName, repr)
-		}
-		return val, nil
-	}
-	// Old style: enums are ints.
-	var val int32
-	if err := json.Unmarshal(data, &val); err != nil {
-		return 0, fmt.Errorf("cannot unmarshal %#q into enum %s", data, enumName)
-	}
-	return val, nil
-}
-
-// DebugPrint dumps the encoded data in b in a debugging format with a header
-// including the string s. Used in testing but made available for general debugging.
-func (p *Buffer) DebugPrint(s string, b []byte) {
-	var u uint64
-
-	obuf := p.buf
-	index := p.index
-	p.buf = b
-	p.index = 0
-	depth := 0
-
-	fmt.Printf("\n--- %s ---\n", s)
-
-out:
-	for {
-		for i := 0; i < depth; i++ {
-			fmt.Print("  ")
-		}
-
-		index := p.index
-		if index == len(p.buf) {
-			break
-		}
-
-		op, err := p.DecodeVarint()
-		if err != nil {
-			fmt.Printf("%3d: fetching op err %v\n", index, err)
-			break out
-		}
-		tag := op >> 3
-		wire := op & 7
-
-		switch wire {
-		default:
-			fmt.Printf("%3d: t=%3d unknown wire=%d\n",
-				index, tag, wire)
-			break out
-
-		case WireBytes:
-			var r []byte
-
-			r, err = p.DecodeRawBytes(false)
-			if err != nil {
-				break out
-			}
-			fmt.Printf("%3d: t=%3d bytes [%d]", index, tag, len(r))
-			if len(r) <= 6 {
-				for i := 0; i < len(r); i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-			} else {
-				for i := 0; i < 3; i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-				fmt.Printf(" ..")
-				for i := len(r) - 3; i < len(r); i++ {
-					fmt.Printf(" %.2x", r[i])
-				}
-			}
-			fmt.Printf("\n")
-
-		case WireFixed32:
-			u, err = p.DecodeFixed32()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d fix32 err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d fix32 %d\n", index, tag, u)
-
-		case WireFixed64:
-			u, err = p.DecodeFixed64()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d fix64 err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d fix64 %d\n", index, tag, u)
-
-		case WireVarint:
-			u, err = p.DecodeVarint()
-			if err != nil {
-				fmt.Printf("%3d: t=%3d varint err %v\n", index, tag, err)
-				break out
-			}
-			fmt.Printf("%3d: t=%3d varint %d\n", index, tag, u)
-
-		case WireStartGroup:
-			fmt.Printf("%3d: t=%3d start\n", index, tag)
-			depth++
-
-		case WireEndGroup:
-			depth--
-			fmt.Printf("%3d: t=%3d end\n", index, tag)
-		}
-	}
-
-	if depth != 0 {
-		fmt.Printf("%3d: start-end not balanced %d\n", p.index, depth)
-	}
-	fmt.Printf("\n")
-
-	p.buf = obuf
-	p.index = index
-}
-
-// SetDefaults sets unset protocol buffer fields to their default values.
-// It only modifies fields that are both unset and have defined defaults.
-// It recursively sets default values in any non-nil sub-messages.
-func SetDefaults(pb Message) {
-	setDefaults(reflect.ValueOf(pb), true, false)
-}
-
-// v is a pointer to a struct.
-func setDefaults(v reflect.Value, recur, zeros bool) {
-	v = v.Elem()
-
-	defaultMu.RLock()
-	dm, ok := defaults[v.Type()]
-	defaultMu.RUnlock()
-	if !ok {
-		dm = buildDefaultMessage(v.Type())
-		defaultMu.Lock()
-		defaults[v.Type()] = dm
-		defaultMu.Unlock()
-	}
-
-	for _, sf := range dm.scalars {
-		f := v.Field(sf.index)
-		if !f.IsNil() {
-			// field already set
-			continue
-		}
-		dv := sf.value
-		if dv == nil && !zeros {
-			// no explicit default, and don't want to set zeros
-			continue
-		}
-		fptr := f.Addr().Interface() // **T
-		// TODO: Consider batching the allocations we do here.
-		switch sf.kind {
-		case reflect.Bool:
-			b := new(bool)
-			if dv != nil {
-				*b = dv.(bool)
-			}
-			*(fptr.(**bool)) = b
-		case reflect.Float32:
-			f := new(float32)
-			if dv != nil {
-				*f = dv.(float32)
-			}
-			*(fptr.(**float32)) = f
-		case reflect.Float64:
-			f := new(float64)
-			if dv != nil {
-				*f = dv.(float64)
-			}
-			*(fptr.(**float64)) = f
-		case reflect.Int32:
-			// might be an enum
-			if ft := f.Type(); ft != int32PtrType {
-				// enum
-				f.Set(reflect.New(ft.Elem()))
-				if dv != nil {
-					f.Elem().SetInt(int64(dv.(int32)))
-				}
-			} else {
-				// int32 field
-				i := new(int32)
-				if dv != nil {
-					*i = dv.(int32)
-				}
-				*(fptr.(**int32)) = i
-			}
-		case reflect.Int64:
-			i := new(int64)
-			if dv != nil {
-				*i = dv.(int64)
-			}
-			*(fptr.(**int64)) = i
-		case reflect.String:
-			s := new(string)
-			if dv != nil {
-				*s = dv.(string)
-			}
-			*(fptr.(**string)) = s
-		case reflect.Uint8:
-			// exceptional case: []byte
-			var b []byte
-			if dv != nil {
-				db := dv.([]byte)
-				b = make([]byte, len(db))
-				copy(b, db)
-			} else {
-				b = []byte{}
-			}
-			*(fptr.(*[]byte)) = b
-		case reflect.Uint32:
-			u := new(uint32)
-			if dv != nil {
-				*u = dv.(uint32)
-			}
-			*(fptr.(**uint32)) = u
-		case reflect.Uint64:
-			u := new(uint64)
-			if dv != nil {
-				*u = dv.(uint64)
-			}
-			*(fptr.(**uint64)) = u
-		default:
-			log.Printf("proto: can't set default for field %v (sf.kind=%v)", f, sf.kind)
-		}
-	}
-
-	for _, ni := range dm.nested {
-		f := v.Field(ni)
-		// f is *T or []*T or map[T]*T
-		switch f.Kind() {
-		case reflect.Ptr:
-			if f.IsNil() {
-				continue
-			}
-			setDefaults(f, recur, zeros)
-
-		case reflect.Slice:
-			for i := 0; i < f.Len(); i++ {
-				e := f.Index(i)
-				if e.IsNil() {
-					continue
-				}
-				setDefaults(e, recur, zeros)
-			}
-
-		case reflect.Map:
-			for _, k := range f.MapKeys() {
-				e := f.MapIndex(k)
-				if e.IsNil() {
-					continue
-				}
-				setDefaults(e, recur, zeros)
-			}
-		}
-	}
-}
-
-var (
-	// defaults maps a protocol buffer struct type to a slice of the fields,
-	// with its scalar fields set to their proto-declared non-zero default values.
-	defaultMu sync.RWMutex
-	defaults  = make(map[reflect.Type]defaultMessage)
-
-	int32PtrType = reflect.TypeOf((*int32)(nil))
-)
-
-// defaultMessage represents information about the default values of a message.
-type defaultMessage struct {
-	scalars []scalarField
-	nested  []int // struct field index of nested messages
-}
-
-type scalarField struct {
-	index int          // struct field index
-	kind  reflect.Kind // element type (the T in *T or []T)
-	value interface{}  // the proto-declared default value, or nil
-}
-
-// t is a struct type.
-func buildDefaultMessage(t reflect.Type) (dm defaultMessage) {
-	sprop := GetProperties(t)
-	for _, prop := range sprop.Prop {
-		fi, ok := sprop.decoderTags.get(prop.Tag)
-		if !ok {
-			// XXX_unrecognized
-			continue
-		}
-		ft := t.Field(fi).Type
-
-		sf, nested, err := fieldDefault(ft, prop)
-		switch {
-		case err != nil:
-			log.Print(err)
-		case nested:
-			dm.nested = append(dm.nested, fi)
-		case sf != nil:
-			sf.index = fi
-			dm.scalars = append(dm.scalars, *sf)
-		}
-	}
-
-	return dm
-}
-
-// fieldDefault returns the scalarField for field type ft.
-// sf will be nil if the field can not have a default.
-// nestedMessage will be true if this is a nested message.
-// Note that sf.index is not set on return.
-func fieldDefault(ft reflect.Type, prop *Properties) (sf *scalarField, nestedMessage bool, err error) {
-	var canHaveDefault bool
-	switch ft.Kind() {
-	case reflect.Ptr:
-		if ft.Elem().Kind() == reflect.Struct {
-			nestedMessage = true
-		} else {
-			canHaveDefault = true // proto2 scalar field
-		}
-
-	case reflect.Slice:
-		switch ft.Elem().Kind() {
-		case reflect.Ptr:
-			nestedMessage = true // repeated message
-		case reflect.Uint8:
-			canHaveDefault = true // bytes field
-		}
-
-	case reflect.Map:
-		if ft.Elem().Kind() == reflect.Ptr {
-			nestedMessage = true // map with message values
-		}
-	}
-
-	if !canHaveDefault {
-		if nestedMessage {
-			return nil, true, nil
-		}
-		return nil, false, nil
-	}
-
-	// We now know that ft is a pointer or slice.
-	sf = &scalarField{kind: ft.Elem().Kind()}
-
-	// scalar fields without defaults
-	if !prop.HasDefault {
-		return sf, false, nil
-	}
-
-	// a scalar field: either *T or []byte
-	switch ft.Elem().Kind() {
-	case reflect.Bool:
-		x, err := strconv.ParseBool(prop.Default)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default bool %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.Float32:
-		x, err := strconv.ParseFloat(prop.Default, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default float32 %q: %v", prop.Default, err)
-		}
-		sf.value = float32(x)
-	case reflect.Float64:
-		x, err := strconv.ParseFloat(prop.Default, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default float64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.Int32:
-		x, err := strconv.ParseInt(prop.Default, 10, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default int32 %q: %v", prop.Default, err)
-		}
-		sf.value = int32(x)
-	case reflect.Int64:
-		x, err := strconv.ParseInt(prop.Default, 10, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default int64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	case reflect.String:
-		sf.value = prop.Default
-	case reflect.Uint8:
-		// []byte (not *uint8)
-		sf.value = []byte(prop.Default)
-	case reflect.Uint32:
-		x, err := strconv.ParseUint(prop.Default, 10, 32)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default uint32 %q: %v", prop.Default, err)
-		}
-		sf.value = uint32(x)
-	case reflect.Uint64:
-		x, err := strconv.ParseUint(prop.Default, 10, 64)
-		if err != nil {
-			return nil, false, fmt.Errorf("proto: bad default uint64 %q: %v", prop.Default, err)
-		}
-		sf.value = x
-	default:
-		return nil, false, fmt.Errorf("proto: unhandled def kind %v", ft.Elem().Kind())
-	}
-
-	return sf, false, nil
-}
-
-// Map fields may have key types of non-float scalars, strings and enums.
-// The easiest way to sort them in some deterministic order is to use fmt.
-// If this turns out to be inefficient we can always consider other options,
-// such as doing a Schwartzian transform.
-
-func mapKeys(vs []reflect.Value) sort.Interface {
-	s := mapKeySorter{
-		vs: vs,
-		// default Less function: textual comparison
-		less: func(a, b reflect.Value) bool {
-			return fmt.Sprint(a.Interface()) < fmt.Sprint(b.Interface())
-		},
-	}
-
-	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps;
-	// numeric keys are sorted numerically.
-	if len(vs) == 0 {
-		return s
-	}
-	switch vs[0].Kind() {
-	case reflect.Int32, reflect.Int64:
-		s.less = func(a, b reflect.Value) bool { return a.Int() < b.Int() }
-	case reflect.Uint32, reflect.Uint64:
-		s.less = func(a, b reflect.Value) bool { return a.Uint() < b.Uint() }
-	}
-
-	return s
-}
-
-type mapKeySorter struct {
-	vs   []reflect.Value
-	less func(a, b reflect.Value) bool
-}
-
-func (s mapKeySorter) Len() int      { return len(s.vs) }
-func (s mapKeySorter) Swap(i, j int) { s.vs[i], s.vs[j] = s.vs[j], s.vs[i] }
-func (s mapKeySorter) Less(i, j int) bool {
-	return s.less(s.vs[i], s.vs[j])
-}
-
-// isProto3Zero reports whether v is a zero proto3 value.
-func isProto3Zero(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint32, reflect.Uint64:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.String:
-		return v.String() == ""
-	}
-	return false
-}
-
-// ProtoPackageIsVersion2 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the proto package.
-const ProtoPackageIsVersion2 = true
-
-// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the proto package.
-const ProtoPackageIsVersion1 = true
diff --git a/vendor/github.com/golang/protobuf/proto/message_set.go b/vendor/github.com/golang/protobuf/proto/message_set.go
deleted file mode 100644
index fd982decd6..0000000000
--- a/vendor/github.com/golang/protobuf/proto/message_set.go
+++ /dev/null
@@ -1,311 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Support for message sets.
- */
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-)
-
-// errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.
-// A message type ID is required for storing a protocol buffer in a message set.
-var errNoMessageTypeID = errors.New("proto does not have a message type ID")
-
-// The first two types (_MessageSet_Item and messageSet)
-// model what the protocol compiler produces for the following protocol message:
-//   message MessageSet {
-//     repeated group Item = 1 {
-//       required int32 type_id = 2;
-//       required string message = 3;
-//     };
-//   }
-// That is the MessageSet wire format. We can't use a proto to generate these
-// because that would introduce a circular dependency between it and this package.
-
-type _MessageSet_Item struct {
-	TypeId  *int32 `protobuf:"varint,2,req,name=type_id"`
-	Message []byte `protobuf:"bytes,3,req,name=message"`
-}
-
-type messageSet struct {
-	Item             []*_MessageSet_Item `protobuf:"group,1,rep"`
-	XXX_unrecognized []byte
-	// TODO: caching?
-}
-
-// Make sure messageSet is a Message.
-var _ Message = (*messageSet)(nil)
-
-// messageTypeIder is an interface satisfied by a protocol buffer type
-// that may be stored in a MessageSet.
-type messageTypeIder interface {
-	MessageTypeId() int32
-}
-
-func (ms *messageSet) find(pb Message) *_MessageSet_Item {
-	mti, ok := pb.(messageTypeIder)
-	if !ok {
-		return nil
-	}
-	id := mti.MessageTypeId()
-	for _, item := range ms.Item {
-		if *item.TypeId == id {
-			return item
-		}
-	}
-	return nil
-}
-
-func (ms *messageSet) Has(pb Message) bool {
-	if ms.find(pb) != nil {
-		return true
-	}
-	return false
-}
-
-func (ms *messageSet) Unmarshal(pb Message) error {
-	if item := ms.find(pb); item != nil {
-		return Unmarshal(item.Message, pb)
-	}
-	if _, ok := pb.(messageTypeIder); !ok {
-		return errNoMessageTypeID
-	}
-	return nil // TODO: return error instead?
-}
-
-func (ms *messageSet) Marshal(pb Message) error {
-	msg, err := Marshal(pb)
-	if err != nil {
-		return err
-	}
-	if item := ms.find(pb); item != nil {
-		// reuse existing item
-		item.Message = msg
-		return nil
-	}
-
-	mti, ok := pb.(messageTypeIder)
-	if !ok {
-		return errNoMessageTypeID
-	}
-
-	mtid := mti.MessageTypeId()
-	ms.Item = append(ms.Item, &_MessageSet_Item{
-		TypeId:  &mtid,
-		Message: msg,
-	})
-	return nil
-}
-
-func (ms *messageSet) Reset()         { *ms = messageSet{} }
-func (ms *messageSet) String() string { return CompactTextString(ms) }
-func (*messageSet) ProtoMessage()     {}
-
-// Support for the message_set_wire_format message option.
-
-func skipVarint(buf []byte) []byte {
-	i := 0
-	for ; buf[i]&0x80 != 0; i++ {
-	}
-	return buf[i+1:]
-}
-
-// MarshalMessageSet encodes the extension map represented by m in the message set wire format.
-// It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSet(exts interface{}) ([]byte, error) {
-	var m map[int32]Extension
-	switch exts := exts.(type) {
-	case *XXX_InternalExtensions:
-		if err := encodeExtensions(exts); err != nil {
-			return nil, err
-		}
-		m, _ = exts.extensionsRead()
-	case map[int32]Extension:
-		if err := encodeExtensionsMap(exts); err != nil {
-			return nil, err
-		}
-		m = exts
-	default:
-		return nil, errors.New("proto: not an extension map")
-	}
-
-	// Sort extension IDs to provide a deterministic encoding.
-	// See also enc_map in encode.go.
-	ids := make([]int, 0, len(m))
-	for id := range m {
-		ids = append(ids, int(id))
-	}
-	sort.Ints(ids)
-
-	ms := &messageSet{Item: make([]*_MessageSet_Item, 0, len(m))}
-	for _, id := range ids {
-		e := m[int32(id)]
-		// Remove the wire type and field number varint, as well as the length varint.
-		msg := skipVarint(skipVarint(e.enc))
-
-		ms.Item = append(ms.Item, &_MessageSet_Item{
-			TypeId:  Int32(int32(id)),
-			Message: msg,
-		})
-	}
-	return Marshal(ms)
-}
-
-// UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
-// It is called by generated Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSet(buf []byte, exts interface{}) error {
-	var m map[int32]Extension
-	switch exts := exts.(type) {
-	case *XXX_InternalExtensions:
-		m = exts.extensionsWrite()
-	case map[int32]Extension:
-		m = exts
-	default:
-		return errors.New("proto: not an extension map")
-	}
-
-	ms := new(messageSet)
-	if err := Unmarshal(buf, ms); err != nil {
-		return err
-	}
-	for _, item := range ms.Item {
-		id := *item.TypeId
-		msg := item.Message
-
-		// Restore wire type and field number varint, plus length varint.
-		// Be careful to preserve duplicate items.
-		b := EncodeVarint(uint64(id)<<3 | WireBytes)
-		if ext, ok := m[id]; ok {
-			// Existing data; rip off the tag and length varint
-			// so we join the new data correctly.
-			// We can assume that ext.enc is set because we are unmarshaling.
-			o := ext.enc[len(b):]   // skip wire type and field number
-			_, n := DecodeVarint(o) // calculate length of length varint
-			o = o[n:]               // skip length varint
-			msg = append(o, msg...) // join old data and new data
-		}
-		b = append(b, EncodeVarint(uint64(len(msg)))...)
-		b = append(b, msg...)
-
-		m[id] = Extension{enc: b}
-	}
-	return nil
-}
-
-// MarshalMessageSetJSON encodes the extension map represented by m in JSON format.
-// It is called by generated MarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func MarshalMessageSetJSON(exts interface{}) ([]byte, error) {
-	var m map[int32]Extension
-	switch exts := exts.(type) {
-	case *XXX_InternalExtensions:
-		m, _ = exts.extensionsRead()
-	case map[int32]Extension:
-		m = exts
-	default:
-		return nil, errors.New("proto: not an extension map")
-	}
-	var b bytes.Buffer
-	b.WriteByte('{')
-
-	// Process the map in key order for deterministic output.
-	ids := make([]int32, 0, len(m))
-	for id := range m {
-		ids = append(ids, id)
-	}
-	sort.Sort(int32Slice(ids)) // int32Slice defined in text.go
-
-	for i, id := range ids {
-		ext := m[id]
-		if i > 0 {
-			b.WriteByte(',')
-		}
-
-		msd, ok := messageSetMap[id]
-		if !ok {
-			// Unknown type; we can't render it, so skip it.
-			continue
-		}
-		fmt.Fprintf(&b, `"[%s]":`, msd.name)
-
-		x := ext.value
-		if x == nil {
-			x = reflect.New(msd.t.Elem()).Interface()
-			if err := Unmarshal(ext.enc, x.(Message)); err != nil {
-				return nil, err
-			}
-		}
-		d, err := json.Marshal(x)
-		if err != nil {
-			return nil, err
-		}
-		b.Write(d)
-	}
-	b.WriteByte('}')
-	return b.Bytes(), nil
-}
-
-// UnmarshalMessageSetJSON decodes the extension map encoded in buf in JSON format.
-// It is called by generated UnmarshalJSON methods on protocol buffer messages with the message_set_wire_format option.
-func UnmarshalMessageSetJSON(buf []byte, exts interface{}) error {
-	// Common-case fast path.
-	if len(buf) == 0 || bytes.Equal(buf, []byte("{}")) {
-		return nil
-	}
-
-	// This is fairly tricky, and it's not clear that it is needed.
-	return errors.New("TODO: UnmarshalMessageSetJSON not yet implemented")
-}
-
-// A global registry of types that can be used in a MessageSet.
-
-var messageSetMap = make(map[int32]messageSetDesc)
-
-type messageSetDesc struct {
-	t    reflect.Type // pointer to struct
-	name string
-}
-
-// RegisterMessageSetType is called from the generated code.
-func RegisterMessageSetType(m Message, fieldNum int32, name string) {
-	messageSetMap[fieldNum] = messageSetDesc{
-		t:    reflect.TypeOf(m),
-		name: name,
-	}
-}
diff --git a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go b/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
deleted file mode 100644
index fb512e2e16..0000000000
--- a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
+++ /dev/null
@@ -1,484 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// +build appengine js
-
-// This file contains an implementation of proto field accesses using package reflect.
-// It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
-// be used on App Engine.
-
-package proto
-
-import (
-	"math"
-	"reflect"
-)
-
-// A structPointer is a pointer to a struct.
-type structPointer struct {
-	v reflect.Value
-}
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-// The reflect value must itself be a pointer to a struct.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer{v}
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p.v.IsNil()
-}
-
-// Interface returns the struct pointer as an interface value.
-func structPointer_Interface(p structPointer, _ reflect.Type) interface{} {
-	return p.v.Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
-// In this implementation, a field is identified by the sequence of field indices
-// passed to reflect's FieldByIndex.
-type field []int
-
-// toField returns a field equivalent to the given reflect field.
-func toField(f *reflect.StructField) field {
-	return f.Index
-}
-
-// invalidField is an invalid field identifier.
-var invalidField = field(nil)
-
-// IsValid reports whether the field identifier is valid.
-func (f field) IsValid() bool { return f != nil }
-
-// field returns the given field in the struct as a reflect value.
-func structPointer_field(p structPointer, f field) reflect.Value {
-	// Special case: an extension map entry with a value of type T
-	// passes a *T to the struct-handling code with a zero field,
-	// expecting that it will be treated as equivalent to *struct{ X T },
-	// which has the same memory layout. We have to handle that case
-	// specially, because reflect will panic if we call FieldByIndex on a
-	// non-struct.
-	if f == nil {
-		return p.v.Elem()
-	}
-
-	return p.v.Elem().FieldByIndex(f)
-}
-
-// ifield returns the given field in the struct as an interface value.
-func structPointer_ifield(p structPointer, f field) interface{} {
-	return structPointer_field(p, f).Addr().Interface()
-}
-
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return structPointer_ifield(p, f).(*[]byte)
-}
-
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return structPointer_ifield(p, f).(*[][]byte)
-}
-
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return structPointer_ifield(p, f).(**bool)
-}
-
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return structPointer_ifield(p, f).(*bool)
-}
-
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return structPointer_ifield(p, f).(*[]bool)
-}
-
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return structPointer_ifield(p, f).(**string)
-}
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return structPointer_ifield(p, f).(*string)
-}
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return structPointer_ifield(p, f).(*[]string)
-}
-
-// Extensions returns the address of an extension map field in the struct.
-func structPointer_Extensions(p structPointer, f field) *XXX_InternalExtensions {
-	return structPointer_ifield(p, f).(*XXX_InternalExtensions)
-}
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return structPointer_ifield(p, f).(*map[int32]Extension)
-}
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return structPointer_field(p, f).Addr()
-}
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	structPointer_field(p, f).Set(q.v)
-}
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return structPointer{structPointer_field(p, f)}
-}
-
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) structPointerSlice {
-	return structPointerSlice{structPointer_field(p, f)}
-}
-
-// A structPointerSlice represents the address of a slice of pointers to structs
-// (themselves messages or groups). That is, v.Type() is *[]*struct{...}.
-type structPointerSlice struct {
-	v reflect.Value
-}
-
-func (p structPointerSlice) Len() int                  { return p.v.Len() }
-func (p structPointerSlice) Index(i int) structPointer { return structPointer{p.v.Index(i)} }
-func (p structPointerSlice) Append(q structPointer) {
-	p.v.Set(reflect.Append(p.v, q.v))
-}
-
-var (
-	int32Type   = reflect.TypeOf(int32(0))
-	uint32Type  = reflect.TypeOf(uint32(0))
-	float32Type = reflect.TypeOf(float32(0))
-	int64Type   = reflect.TypeOf(int64(0))
-	uint64Type  = reflect.TypeOf(uint64(0))
-	float64Type = reflect.TypeOf(float64(0))
-)
-
-// A word32 represents a field of type *int32, *uint32, *float32, or *enum.
-// That is, v.Type() is *int32, *uint32, *float32, or *enum and v is assignable.
-type word32 struct {
-	v reflect.Value
-}
-
-// IsNil reports whether p is nil.
-func word32_IsNil(p word32) bool {
-	return p.v.IsNil()
-}
-
-// Set sets p to point at a newly allocated word with bits set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int32Type:
-		if len(o.int32s) == 0 {
-			o.int32s = make([]int32, uint32PoolSize)
-		}
-		o.int32s[0] = int32(x)
-		p.v.Set(reflect.ValueOf(&o.int32s[0]))
-		o.int32s = o.int32s[1:]
-		return
-	case uint32Type:
-		if len(o.uint32s) == 0 {
-			o.uint32s = make([]uint32, uint32PoolSize)
-		}
-		o.uint32s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint32s[0]))
-		o.uint32s = o.uint32s[1:]
-		return
-	case float32Type:
-		if len(o.float32s) == 0 {
-			o.float32s = make([]float32, uint32PoolSize)
-		}
-		o.float32s[0] = math.Float32frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float32s[0]))
-		o.float32s = o.float32s[1:]
-		return
-	}
-
-	// must be enum
-	p.v.Set(reflect.New(t))
-	p.v.Elem().SetInt(int64(int32(x)))
-}
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32_Get(p word32) uint32 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32 returns a reference to a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32{structPointer_field(p, f)}
-}
-
-// A word32Val represents a field of type int32, uint32, float32, or enum.
-// That is, v.Type() is int32, uint32, float32, or enum and v is assignable.
-type word32Val struct {
-	v reflect.Value
-}
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	switch p.v.Type() {
-	case int32Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint32Type:
-		p.v.SetUint(uint64(x))
-		return
-	case float32Type:
-		p.v.SetFloat(float64(math.Float32frombits(x)))
-		return
-	}
-
-	// must be enum
-	p.v.SetInt(int64(int32(x)))
-}
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32Val_Get(p word32Val) uint32 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32Val returns a reference to a int32, uint32, float32, or enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val{structPointer_field(p, f)}
-}
-
-// A word32Slice is a slice of 32-bit values.
-// That is, v.Type() is []int32, []uint32, []float32, or []enum.
-type word32Slice struct {
-	v reflect.Value
-}
-
-func (p word32Slice) Append(x uint32) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int32:
-		elem.SetInt(int64(int32(x)))
-	case reflect.Uint32:
-		elem.SetUint(uint64(x))
-	case reflect.Float32:
-		elem.SetFloat(float64(math.Float32frombits(x)))
-	}
-}
-
-func (p word32Slice) Len() int {
-	return p.v.Len()
-}
-
-func (p word32Slice) Index(i int) uint32 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-// Word32Slice returns a reference to a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) word32Slice {
-	return word32Slice{structPointer_field(p, f)}
-}
-
-// word64 is like word32 but for 64-bit values.
-type word64 struct {
-	v reflect.Value
-}
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int64Type:
-		if len(o.int64s) == 0 {
-			o.int64s = make([]int64, uint64PoolSize)
-		}
-		o.int64s[0] = int64(x)
-		p.v.Set(reflect.ValueOf(&o.int64s[0]))
-		o.int64s = o.int64s[1:]
-		return
-	case uint64Type:
-		if len(o.uint64s) == 0 {
-			o.uint64s = make([]uint64, uint64PoolSize)
-		}
-		o.uint64s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint64s[0]))
-		o.uint64s = o.uint64s[1:]
-		return
-	case float64Type:
-		if len(o.float64s) == 0 {
-			o.float64s = make([]float64, uint64PoolSize)
-		}
-		o.float64s[0] = math.Float64frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float64s[0]))
-		o.float64s = o.float64s[1:]
-		return
-	}
-	panic("unreachable")
-}
-
-func word64_IsNil(p word64) bool {
-	return p.v.IsNil()
-}
-
-func word64_Get(p word64) uint64 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64{structPointer_field(p, f)}
-}
-
-// word64Val is like word32Val but for 64-bit values.
-type word64Val struct {
-	v reflect.Value
-}
-
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	switch p.v.Type() {
-	case int64Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint64Type:
-		p.v.SetUint(x)
-		return
-	case float64Type:
-		p.v.SetFloat(math.Float64frombits(x))
-		return
-	}
-	panic("unreachable")
-}
-
-func word64Val_Get(p word64Val) uint64 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val{structPointer_field(p, f)}
-}
-
-type word64Slice struct {
-	v reflect.Value
-}
-
-func (p word64Slice) Append(x uint64) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int64:
-		elem.SetInt(int64(int64(x)))
-	case reflect.Uint64:
-		elem.SetUint(uint64(x))
-	case reflect.Float64:
-		elem.SetFloat(float64(math.Float64frombits(x)))
-	}
-}
-
-func (p word64Slice) Len() int {
-	return p.v.Len()
-}
-
-func (p word64Slice) Index(i int) uint64 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return uint64(elem.Uint())
-	case reflect.Float64:
-		return math.Float64bits(float64(elem.Float()))
-	}
-	panic("unreachable")
-}
-
-func structPointer_Word64Slice(p structPointer, f field) word64Slice {
-	return word64Slice{structPointer_field(p, f)}
-}
diff --git a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go b/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
deleted file mode 100644
index 6b5567d47c..0000000000
--- a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
+++ /dev/null
@@ -1,270 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// +build !appengine,!js
-
-// This file contains the implementation of the proto field accesses using package unsafe.
-
-package proto
-
-import (
-	"reflect"
-	"unsafe"
-)
-
-// NOTE: These type_Foo functions would more idiomatically be methods,
-// but Go does not allow methods on pointer types, and we must preserve
-// some pointer type for the garbage collector. We use these
-// funcs with clunky names as our poor approximation to methods.
-//
-// An alternative would be
-//	type structPointer struct { p unsafe.Pointer }
-// but that does not registerize as well.
-
-// A structPointer is a pointer to a struct.
-type structPointer unsafe.Pointer
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer(unsafe.Pointer(v.Pointer()))
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p == nil
-}
-
-// Interface returns the struct pointer, assumed to have element type t,
-// as an interface value.
-func structPointer_Interface(p structPointer, t reflect.Type) interface{} {
-	return reflect.NewAt(t, unsafe.Pointer(p)).Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
-// In this implementation, a field is identified by its byte offset from the start of the struct.
-type field uintptr
-
-// toField returns a field equivalent to the given reflect field.
-func toField(f *reflect.StructField) field {
-	return field(f.Offset)
-}
-
-// invalidField is an invalid field identifier.
-const invalidField = ^field(0)
-
-// IsValid reports whether the field identifier is valid.
-func (f field) IsValid() bool {
-	return f != ^field(0)
-}
-
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return (*[]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return (*[][]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return (**bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return (*bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return (*[]bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return (**string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return (*string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return (*[]string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_Extensions(p structPointer, f field) *XXX_InternalExtensions {
-	return (*XXX_InternalExtensions)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return (*map[int32]Extension)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return reflect.NewAt(typ, unsafe.Pointer(uintptr(p)+uintptr(f)))
-}
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	*(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))) = q
-}
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return *(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) *structPointerSlice {
-	return (*structPointerSlice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// A structPointerSlice represents a slice of pointers to structs (themselves submessages or groups).
-type structPointerSlice []structPointer
-
-func (v *structPointerSlice) Len() int                  { return len(*v) }
-func (v *structPointerSlice) Index(i int) structPointer { return (*v)[i] }
-func (v *structPointerSlice) Append(p structPointer)    { *v = append(*v, p) }
-
-// A word32 is the address of a "pointer to 32-bit value" field.
-type word32 **uint32
-
-// IsNil reports whether *v is nil.
-func word32_IsNil(p word32) bool {
-	return *p == nil
-}
-
-// Set sets *v to point at a newly allocated word set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	if len(o.uint32s) == 0 {
-		o.uint32s = make([]uint32, uint32PoolSize)
-	}
-	o.uint32s[0] = x
-	*p = &o.uint32s[0]
-	o.uint32s = o.uint32s[1:]
-}
-
-// Get gets the value pointed at by *v.
-func word32_Get(p word32) uint32 {
-	return **p
-}
-
-// Word32 returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32((**uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// A word32Val is the address of a 32-bit value field.
-type word32Val *uint32
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	*p = x
-}
-
-// Get gets the value pointed at by p.
-func word32Val_Get(p word32Val) uint32 {
-	return *p
-}
-
-// Word32Val returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val((*uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// A word32Slice is a slice of 32-bit values.
-type word32Slice []uint32
-
-func (v *word32Slice) Append(x uint32)    { *v = append(*v, x) }
-func (v *word32Slice) Len() int           { return len(*v) }
-func (v *word32Slice) Index(i int) uint32 { return (*v)[i] }
-
-// Word32Slice returns the address of a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) *word32Slice {
-	return (*word32Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
-
-// word64 is like word32 but for 64-bit values.
-type word64 **uint64
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	if len(o.uint64s) == 0 {
-		o.uint64s = make([]uint64, uint64PoolSize)
-	}
-	o.uint64s[0] = x
-	*p = &o.uint64s[0]
-	o.uint64s = o.uint64s[1:]
-}
-
-func word64_IsNil(p word64) bool {
-	return *p == nil
-}
-
-func word64_Get(p word64) uint64 {
-	return **p
-}
-
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64((**uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// word64Val is like word32Val but for 64-bit values.
-type word64Val *uint64
-
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	*p = x
-}
-
-func word64Val_Get(p word64Val) uint64 {
-	return *p
-}
-
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val((*uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
-}
-
-// word64Slice is like word32Slice but for 64-bit values.
-type word64Slice []uint64
-
-func (v *word64Slice) Append(x uint64)    { *v = append(*v, x) }
-func (v *word64Slice) Len() int           { return len(*v) }
-func (v *word64Slice) Index(i int) uint64 { return (*v)[i] }
-
-func structPointer_Word64Slice(p structPointer, f field) *word64Slice {
-	return (*word64Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
diff --git a/vendor/github.com/golang/protobuf/proto/properties.go b/vendor/github.com/golang/protobuf/proto/properties.go
deleted file mode 100644
index ec2289c005..0000000000
--- a/vendor/github.com/golang/protobuf/proto/properties.go
+++ /dev/null
@@ -1,872 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-/*
- * Routines for encoding data into the wire format for protocol buffers.
- */
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-)
-
-const debug bool = false
-
-// Constants that identify the encoding of a value on the wire.
-const (
-	WireVarint     = 0
-	WireFixed64    = 1
-	WireBytes      = 2
-	WireStartGroup = 3
-	WireEndGroup   = 4
-	WireFixed32    = 5
-)
-
-const startSize = 10 // initial slice/string sizes
-
-// Encoders are defined in encode.go
-// An encoder outputs the full representation of a field, including its
-// tag and encoder type.
-type encoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueEncoder encodes a single integer in a particular encoding.
-type valueEncoder func(o *Buffer, x uint64) error
-
-// Sizers are defined in encode.go
-// A sizer returns the encoded size of a field, including its tag and encoder
-// type.
-type sizer func(prop *Properties, base structPointer) int
-
-// A valueSizer returns the encoded size of a single integer in a particular
-// encoding.
-type valueSizer func(x uint64) int
-
-// Decoders are defined in decode.go
-// A decoder creates a value from its wire representation.
-// Unrecognized subelements are saved in unrec.
-type decoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueDecoder decodes a single integer in a particular encoding.
-type valueDecoder func(o *Buffer) (x uint64, err error)
-
-// A oneofMarshaler does the marshaling for all oneof fields in a message.
-type oneofMarshaler func(Message, *Buffer) error
-
-// A oneofUnmarshaler does the unmarshaling for a oneof field in a message.
-type oneofUnmarshaler func(Message, int, int, *Buffer) (bool, error)
-
-// A oneofSizer does the sizing for all oneof fields in a message.
-type oneofSizer func(Message) int
-
-// tagMap is an optimization over map[int]int for typical protocol buffer
-// use-cases. Encoded protocol buffers are often in tag order with small tag
-// numbers.
-type tagMap struct {
-	fastTags []int
-	slowTags map[int]int
-}
-
-// tagMapFastLimit is the upper bound on the tag number that will be stored in
-// the tagMap slice rather than its map.
-const tagMapFastLimit = 1024
-
-func (p *tagMap) get(t int) (int, bool) {
-	if t > 0 && t < tagMapFastLimit {
-		if t >= len(p.fastTags) {
-			return 0, false
-		}
-		fi := p.fastTags[t]
-		return fi, fi >= 0
-	}
-	fi, ok := p.slowTags[t]
-	return fi, ok
-}
-
-func (p *tagMap) put(t int, fi int) {
-	if t > 0 && t < tagMapFastLimit {
-		for len(p.fastTags) < t+1 {
-			p.fastTags = append(p.fastTags, -1)
-		}
-		p.fastTags[t] = fi
-		return
-	}
-	if p.slowTags == nil {
-		p.slowTags = make(map[int]int)
-	}
-	p.slowTags[t] = fi
-}
-
-// StructProperties represents properties for all the fields of a struct.
-// decoderTags and decoderOrigNames should only be used by the decoder.
-type StructProperties struct {
-	Prop             []*Properties  // properties for each field
-	reqCount         int            // required count
-	decoderTags      tagMap         // map from proto tag to struct field number
-	decoderOrigNames map[string]int // map from original name to struct field number
-	order            []int          // list of struct field numbers in tag order
-	unrecField       field          // field id of the XXX_unrecognized []byte field
-	extendable       bool           // is this an extendable proto
-
-	oneofMarshaler   oneofMarshaler
-	oneofUnmarshaler oneofUnmarshaler
-	oneofSizer       oneofSizer
-	stype            reflect.Type
-
-	// OneofTypes contains information about the oneof fields in this message.
-	// It is keyed by the original name of a field.
-	OneofTypes map[string]*OneofProperties
-}
-
-// OneofProperties represents information about a specific field in a oneof.
-type OneofProperties struct {
-	Type  reflect.Type // pointer to generated struct type for this oneof field
-	Field int          // struct field number of the containing oneof in the message
-	Prop  *Properties
-}
-
-// Implement the sorting interface so we can sort the fields in tag order, as recommended by the spec.
-// See encode.go, (*Buffer).enc_struct.
-
-func (sp *StructProperties) Len() int { return len(sp.order) }
-func (sp *StructProperties) Less(i, j int) bool {
-	return sp.Prop[sp.order[i]].Tag < sp.Prop[sp.order[j]].Tag
-}
-func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order[j], sp.order[i] }
-
-// Properties represents the protocol-specific behavior of a single struct field.
-type Properties struct {
-	Name     string // name of the field, for error messages
-	OrigName string // original name before protocol compiler (always set)
-	JSONName string // name to use for JSON; determined by protoc
-	Wire     string
-	WireType int
-	Tag      int
-	Required bool
-	Optional bool
-	Repeated bool
-	Packed   bool   // relevant for repeated primitives only
-	Enum     string // set for enum types only
-	proto3   bool   // whether this is known to be a proto3 field; set for []byte only
-	oneof    bool   // whether this is a oneof field
-
-	Default    string // default value
-	HasDefault bool   // whether an explicit default was provided
-	def_uint64 uint64
-
-	enc           encoder
-	valEnc        valueEncoder // set for bool and numeric types only
-	field         field
-	tagcode       []byte // encoding of EncodeVarint((Tag<<3)|WireType)
-	tagbuf        [8]byte
-	stype         reflect.Type      // set for struct types only
-	sprop         *StructProperties // set for struct types only
-	isMarshaler   bool
-	isUnmarshaler bool
-
-	mtype    reflect.Type // set for map types only
-	mkeyprop *Properties  // set for map types only
-	mvalprop *Properties  // set for map types only
-
-	size    sizer
-	valSize valueSizer // set for bool and numeric types only
-
-	dec    decoder
-	valDec valueDecoder // set for bool and numeric types only
-
-	// If this is a packable field, this will be the decoder for the packed version of the field.
-	packedDec decoder
-}
-
-// String formats the properties in the protobuf struct field tag style.
-func (p *Properties) String() string {
-	s := p.Wire
-	s = ","
-	s += strconv.Itoa(p.Tag)
-	if p.Required {
-		s += ",req"
-	}
-	if p.Optional {
-		s += ",opt"
-	}
-	if p.Repeated {
-		s += ",rep"
-	}
-	if p.Packed {
-		s += ",packed"
-	}
-	s += ",name=" + p.OrigName
-	if p.JSONName != p.OrigName {
-		s += ",json=" + p.JSONName
-	}
-	if p.proto3 {
-		s += ",proto3"
-	}
-	if p.oneof {
-		s += ",oneof"
-	}
-	if len(p.Enum) > 0 {
-		s += ",enum=" + p.Enum
-	}
-	if p.HasDefault {
-		s += ",def=" + p.Default
-	}
-	return s
-}
-
-// Parse populates p by parsing a string in the protobuf struct field tag style.
-func (p *Properties) Parse(s string) {
-	// "bytes,49,opt,name=foo,def=hello!"
-	fields := strings.Split(s, ",") // breaks def=, but handled below.
-	if len(fields) < 2 {
-		fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
-		return
-	}
-
-	p.Wire = fields[0]
-	switch p.Wire {
-	case "varint":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeVarint
-		p.valDec = (*Buffer).DecodeVarint
-		p.valSize = sizeVarint
-	case "fixed32":
-		p.WireType = WireFixed32
-		p.valEnc = (*Buffer).EncodeFixed32
-		p.valDec = (*Buffer).DecodeFixed32
-		p.valSize = sizeFixed32
-	case "fixed64":
-		p.WireType = WireFixed64
-		p.valEnc = (*Buffer).EncodeFixed64
-		p.valDec = (*Buffer).DecodeFixed64
-		p.valSize = sizeFixed64
-	case "zigzag32":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag32
-		p.valDec = (*Buffer).DecodeZigzag32
-		p.valSize = sizeZigzag32
-	case "zigzag64":
-		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag64
-		p.valDec = (*Buffer).DecodeZigzag64
-		p.valSize = sizeZigzag64
-	case "bytes", "group":
-		p.WireType = WireBytes
-		// no numeric converter for non-numeric types
-	default:
-		fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
-		return
-	}
-
-	var err error
-	p.Tag, err = strconv.Atoi(fields[1])
-	if err != nil {
-		return
-	}
-
-	for i := 2; i < len(fields); i++ {
-		f := fields[i]
-		switch {
-		case f == "req":
-			p.Required = true
-		case f == "opt":
-			p.Optional = true
-		case f == "rep":
-			p.Repeated = true
-		case f == "packed":
-			p.Packed = true
-		case strings.HasPrefix(f, "name="):
-			p.OrigName = f[5:]
-		case strings.HasPrefix(f, "json="):
-			p.JSONName = f[5:]
-		case strings.HasPrefix(f, "enum="):
-			p.Enum = f[5:]
-		case f == "proto3":
-			p.proto3 = true
-		case f == "oneof":
-			p.oneof = true
-		case strings.HasPrefix(f, "def="):
-			p.HasDefault = true
-			p.Default = f[4:] // rest of string
-			if i+1 < len(fields) {
-				// Commas aren't escaped, and def is always last.
-				p.Default += "," + strings.Join(fields[i+1:], ",")
-				break
-			}
-		}
-	}
-}
-
-func logNoSliceEnc(t1, t2 reflect.Type) {
-	fmt.Fprintf(os.Stderr, "proto: no slice oenc for %T = []%T\n", t1, t2)
-}
-
-var protoMessageType = reflect.TypeOf((*Message)(nil)).Elem()
-
-// Initialize the fields for encoding and decoding.
-func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
-	p.enc = nil
-	p.dec = nil
-	p.size = nil
-
-	switch t1 := typ; t1.Kind() {
-	default:
-		fmt.Fprintf(os.Stderr, "proto: no coders for %v\n", t1)
-
-	// proto3 scalar types
-
-	case reflect.Bool:
-		p.enc = (*Buffer).enc_proto3_bool
-		p.dec = (*Buffer).dec_proto3_bool
-		p.size = size_proto3_bool
-	case reflect.Int32:
-		p.enc = (*Buffer).enc_proto3_int32
-		p.dec = (*Buffer).dec_proto3_int32
-		p.size = size_proto3_int32
-	case reflect.Uint32:
-		p.enc = (*Buffer).enc_proto3_uint32
-		p.dec = (*Buffer).dec_proto3_int32 // can reuse
-		p.size = size_proto3_uint32
-	case reflect.Int64, reflect.Uint64:
-		p.enc = (*Buffer).enc_proto3_int64
-		p.dec = (*Buffer).dec_proto3_int64
-		p.size = size_proto3_int64
-	case reflect.Float32:
-		p.enc = (*Buffer).enc_proto3_uint32 // can just treat them as bits
-		p.dec = (*Buffer).dec_proto3_int32
-		p.size = size_proto3_uint32
-	case reflect.Float64:
-		p.enc = (*Buffer).enc_proto3_int64 // can just treat them as bits
-		p.dec = (*Buffer).dec_proto3_int64
-		p.size = size_proto3_int64
-	case reflect.String:
-		p.enc = (*Buffer).enc_proto3_string
-		p.dec = (*Buffer).dec_proto3_string
-		p.size = size_proto3_string
-
-	case reflect.Ptr:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			fmt.Fprintf(os.Stderr, "proto: no encoder function for %v -> %v\n", t1, t2)
-			break
-		case reflect.Bool:
-			p.enc = (*Buffer).enc_bool
-			p.dec = (*Buffer).dec_bool
-			p.size = size_bool
-		case reflect.Int32:
-			p.enc = (*Buffer).enc_int32
-			p.dec = (*Buffer).dec_int32
-			p.size = size_int32
-		case reflect.Uint32:
-			p.enc = (*Buffer).enc_uint32
-			p.dec = (*Buffer).dec_int32 // can reuse
-			p.size = size_uint32
-		case reflect.Int64, reflect.Uint64:
-			p.enc = (*Buffer).enc_int64
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.Float32:
-			p.enc = (*Buffer).enc_uint32 // can just treat them as bits
-			p.dec = (*Buffer).dec_int32
-			p.size = size_uint32
-		case reflect.Float64:
-			p.enc = (*Buffer).enc_int64 // can just treat them as bits
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.String:
-			p.enc = (*Buffer).enc_string
-			p.dec = (*Buffer).dec_string
-			p.size = size_string
-		case reflect.Struct:
-			p.stype = t1.Elem()
-			p.isMarshaler = isMarshaler(t1)
-			p.isUnmarshaler = isUnmarshaler(t1)
-			if p.Wire == "bytes" {
-				p.enc = (*Buffer).enc_struct_message
-				p.dec = (*Buffer).dec_struct_message
-				p.size = size_struct_message
-			} else {
-				p.enc = (*Buffer).enc_struct_group
-				p.dec = (*Buffer).dec_struct_group
-				p.size = size_struct_group
-			}
-		}
-
-	case reflect.Slice:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			logNoSliceEnc(t1, t2)
-			break
-		case reflect.Bool:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_bool
-				p.size = size_slice_packed_bool
-			} else {
-				p.enc = (*Buffer).enc_slice_bool
-				p.size = size_slice_bool
-			}
-			p.dec = (*Buffer).dec_slice_bool
-			p.packedDec = (*Buffer).dec_slice_packed_bool
-		case reflect.Int32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int32
-				p.size = size_slice_packed_int32
-			} else {
-				p.enc = (*Buffer).enc_slice_int32
-				p.size = size_slice_int32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Uint32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_uint32
-				p.size = size_slice_packed_uint32
-			} else {
-				p.enc = (*Buffer).enc_slice_uint32
-				p.size = size_slice_uint32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Int64, reflect.Uint64:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int64
-				p.size = size_slice_packed_int64
-			} else {
-				p.enc = (*Buffer).enc_slice_int64
-				p.size = size_slice_int64
-			}
-			p.dec = (*Buffer).dec_slice_int64
-			p.packedDec = (*Buffer).dec_slice_packed_int64
-		case reflect.Uint8:
-			p.dec = (*Buffer).dec_slice_byte
-			if p.proto3 {
-				p.enc = (*Buffer).enc_proto3_slice_byte
-				p.size = size_proto3_slice_byte
-			} else {
-				p.enc = (*Buffer).enc_slice_byte
-				p.size = size_slice_byte
-			}
-		case reflect.Float32, reflect.Float64:
-			switch t2.Bits() {
-			case 32:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_uint32
-					p.size = size_slice_packed_uint32
-				} else {
-					p.enc = (*Buffer).enc_slice_uint32
-					p.size = size_slice_uint32
-				}
-				p.dec = (*Buffer).dec_slice_int32
-				p.packedDec = (*Buffer).dec_slice_packed_int32
-			case 64:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_int64
-					p.size = size_slice_packed_int64
-				} else {
-					p.enc = (*Buffer).enc_slice_int64
-					p.size = size_slice_int64
-				}
-				p.dec = (*Buffer).dec_slice_int64
-				p.packedDec = (*Buffer).dec_slice_packed_int64
-			default:
-				logNoSliceEnc(t1, t2)
-				break
-			}
-		case reflect.String:
-			p.enc = (*Buffer).enc_slice_string
-			p.dec = (*Buffer).dec_slice_string
-			p.size = size_slice_string
-		case reflect.Ptr:
-			switch t3 := t2.Elem(); t3.Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T -> %T\n", t1, t2, t3)
-				break
-			case reflect.Struct:
-				p.stype = t2.Elem()
-				p.isMarshaler = isMarshaler(t2)
-				p.isUnmarshaler = isUnmarshaler(t2)
-				if p.Wire == "bytes" {
-					p.enc = (*Buffer).enc_slice_struct_message
-					p.dec = (*Buffer).dec_slice_struct_message
-					p.size = size_slice_struct_message
-				} else {
-					p.enc = (*Buffer).enc_slice_struct_group
-					p.dec = (*Buffer).dec_slice_struct_group
-					p.size = size_slice_struct_group
-				}
-			}
-		case reflect.Slice:
-			switch t2.Elem().Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no slice elem oenc for %T -> %T -> %T\n", t1, t2, t2.Elem())
-				break
-			case reflect.Uint8:
-				p.enc = (*Buffer).enc_slice_slice_byte
-				p.dec = (*Buffer).dec_slice_slice_byte
-				p.size = size_slice_slice_byte
-			}
-		}
-
-	case reflect.Map:
-		p.enc = (*Buffer).enc_new_map
-		p.dec = (*Buffer).dec_new_map
-		p.size = size_new_map
-
-		p.mtype = t1
-		p.mkeyprop = &Properties{}
-		p.mkeyprop.init(reflect.PtrTo(p.mtype.Key()), "Key", f.Tag.Get("protobuf_key"), nil, lockGetProp)
-		p.mvalprop = &Properties{}
-		vtype := p.mtype.Elem()
-		if vtype.Kind() != reflect.Ptr && vtype.Kind() != reflect.Slice {
-			// The value type is not a message (*T) or bytes ([]byte),
-			// so we need encoders for the pointer to this type.
-			vtype = reflect.PtrTo(vtype)
-		}
-		p.mvalprop.init(vtype, "Value", f.Tag.Get("protobuf_val"), nil, lockGetProp)
-	}
-
-	// precalculate tag code
-	wire := p.WireType
-	if p.Packed {
-		wire = WireBytes
-	}
-	x := uint32(p.Tag)<<3 | uint32(wire)
-	i := 0
-	for i = 0; x > 127; i++ {
-		p.tagbuf[i] = 0x80 | uint8(x&0x7F)
-		x >>= 7
-	}
-	p.tagbuf[i] = uint8(x)
-	p.tagcode = p.tagbuf[0 : i+1]
-
-	if p.stype != nil {
-		if lockGetProp {
-			p.sprop = GetProperties(p.stype)
-		} else {
-			p.sprop = getPropertiesLocked(p.stype)
-		}
-	}
-}
-
-var (
-	marshalerType   = reflect.TypeOf((*Marshaler)(nil)).Elem()
-	unmarshalerType = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
-)
-
-// isMarshaler reports whether type t implements Marshaler.
-func isMarshaler(t reflect.Type) bool {
-	// We're checking for (likely) pointer-receiver methods
-	// so if t is not a pointer, something is very wrong.
-	// The calls above only invoke isMarshaler on pointer types.
-	if t.Kind() != reflect.Ptr {
-		panic("proto: misuse of isMarshaler")
-	}
-	return t.Implements(marshalerType)
-}
-
-// isUnmarshaler reports whether type t implements Unmarshaler.
-func isUnmarshaler(t reflect.Type) bool {
-	// We're checking for (likely) pointer-receiver methods
-	// so if t is not a pointer, something is very wrong.
-	// The calls above only invoke isUnmarshaler on pointer types.
-	if t.Kind() != reflect.Ptr {
-		panic("proto: misuse of isUnmarshaler")
-	}
-	return t.Implements(unmarshalerType)
-}
-
-// Init populates the properties from a protocol buffer struct tag.
-func (p *Properties) Init(typ reflect.Type, name, tag string, f *reflect.StructField) {
-	p.init(typ, name, tag, f, true)
-}
-
-func (p *Properties) init(typ reflect.Type, name, tag string, f *reflect.StructField, lockGetProp bool) {
-	// "bytes,49,opt,def=hello!"
-	p.Name = name
-	p.OrigName = name
-	if f != nil {
-		p.field = toField(f)
-	}
-	if tag == "" {
-		return
-	}
-	p.Parse(tag)
-	p.setEncAndDec(typ, f, lockGetProp)
-}
-
-var (
-	propertiesMu  sync.RWMutex
-	propertiesMap = make(map[reflect.Type]*StructProperties)
-)
-
-// GetProperties returns the list of properties for the type represented by t.
-// t must represent a generated struct type of a protocol message.
-func GetProperties(t reflect.Type) *StructProperties {
-	if t.Kind() != reflect.Struct {
-		panic("proto: type must have kind struct")
-	}
-
-	// Most calls to GetProperties in a long-running program will be
-	// retrieving details for types we have seen before.
-	propertiesMu.RLock()
-	sprop, ok := propertiesMap[t]
-	propertiesMu.RUnlock()
-	if ok {
-		if collectStats {
-			stats.Chit++
-		}
-		return sprop
-	}
-
-	propertiesMu.Lock()
-	sprop = getPropertiesLocked(t)
-	propertiesMu.Unlock()
-	return sprop
-}
-
-// getPropertiesLocked requires that propertiesMu is held.
-func getPropertiesLocked(t reflect.Type) *StructProperties {
-	if prop, ok := propertiesMap[t]; ok {
-		if collectStats {
-			stats.Chit++
-		}
-		return prop
-	}
-	if collectStats {
-		stats.Cmiss++
-	}
-
-	prop := new(StructProperties)
-	// in case of recursive protos, fill this in now.
-	propertiesMap[t] = prop
-
-	// build properties
-	prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType) ||
-		reflect.PtrTo(t).Implements(extendableProtoV1Type)
-	prop.unrecField = invalidField
-	prop.Prop = make([]*Properties, t.NumField())
-	prop.order = make([]int, t.NumField())
-
-	for i := 0; i < t.NumField(); i++ {
-		f := t.Field(i)
-		p := new(Properties)
-		name := f.Name
-		p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
-
-		if f.Name == "XXX_InternalExtensions" { // special case
-			p.enc = (*Buffer).enc_exts
-			p.dec = nil // not needed
-			p.size = size_exts
-		} else if f.Name == "XXX_extensions" { // special case
-			p.enc = (*Buffer).enc_map
-			p.dec = nil // not needed
-			p.size = size_map
-		} else if f.Name == "XXX_unrecognized" { // special case
-			prop.unrecField = toField(&f)
-		}
-		oneof := f.Tag.Get("protobuf_oneof") // special case
-		if oneof != "" {
-			// Oneof fields don't use the traditional protobuf tag.
-			p.OrigName = oneof
-		}
-		prop.Prop[i] = p
-		prop.order[i] = i
-		if debug {
-			print(i, " ", f.Name, " ", t.String(), " ")
-			if p.Tag > 0 {
-				print(p.String())
-			}
-			print("\n")
-		}
-		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && oneof == "" {
-			fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
-		}
-	}
-
-	// Re-order prop.order.
-	sort.Sort(prop)
-
-	type oneofMessage interface {
-		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
-	}
-	if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok {
-		var oots []interface{}
-		prop.oneofMarshaler, prop.oneofUnmarshaler, prop.oneofSizer, oots = om.XXX_OneofFuncs()
-		prop.stype = t
-
-		// Interpret oneof metadata.
-		prop.OneofTypes = make(map[string]*OneofProperties)
-		for _, oot := range oots {
-			oop := &OneofProperties{
-				Type: reflect.ValueOf(oot).Type(), // *T
-				Prop: new(Properties),
-			}
-			sft := oop.Type.Elem().Field(0)
-			oop.Prop.Name = sft.Name
-			oop.Prop.Parse(sft.Tag.Get("protobuf"))
-			// There will be exactly one interface field that
-			// this new value is assignable to.
-			for i := 0; i < t.NumField(); i++ {
-				f := t.Field(i)
-				if f.Type.Kind() != reflect.Interface {
-					continue
-				}
-				if !oop.Type.AssignableTo(f.Type) {
-					continue
-				}
-				oop.Field = i
-				break
-			}
-			prop.OneofTypes[oop.Prop.OrigName] = oop
-		}
-	}
-
-	// build required counts
-	// build tags
-	reqCount := 0
-	prop.decoderOrigNames = make(map[string]int)
-	for i, p := range prop.Prop {
-		if strings.HasPrefix(p.Name, "XXX_") {
-			// Internal fields should not appear in tags/origNames maps.
-			// They are handled specially when encoding and decoding.
-			continue
-		}
-		if p.Required {
-			reqCount++
-		}
-		prop.decoderTags.put(p.Tag, i)
-		prop.decoderOrigNames[p.OrigName] = i
-	}
-	prop.reqCount = reqCount
-
-	return prop
-}
-
-// Return the Properties object for the x[0]'th field of the structure.
-func propByIndex(t reflect.Type, x []int) *Properties {
-	if len(x) != 1 {
-		fmt.Fprintf(os.Stderr, "proto: field index dimension %d (not 1) for type %s\n", len(x), t)
-		return nil
-	}
-	prop := GetProperties(t)
-	return prop.Prop[x[0]]
-}
-
-// Get the address and type of a pointer to a struct from an interface.
-func getbase(pb Message) (t reflect.Type, b structPointer, err error) {
-	if pb == nil {
-		err = ErrNil
-		return
-	}
-	// get the reflect type of the pointer to the struct.
-	t = reflect.TypeOf(pb)
-	// get the address of the struct.
-	value := reflect.ValueOf(pb)
-	b = toStructPointer(value)
-	return
-}
-
-// A global registry of enum types.
-// The generated code will register the generated maps by calling RegisterEnum.
-
-var enumValueMaps = make(map[string]map[string]int32)
-
-// RegisterEnum is called from the generated code to install the enum descriptor
-// maps into the global table to aid parsing text format protocol buffers.
-func RegisterEnum(typeName string, unusedNameMap map[int32]string, valueMap map[string]int32) {
-	if _, ok := enumValueMaps[typeName]; ok {
-		panic("proto: duplicate enum registered: " + typeName)
-	}
-	enumValueMaps[typeName] = valueMap
-}
-
-// EnumValueMap returns the mapping from names to integers of the
-// enum type enumType, or a nil if not found.
-func EnumValueMap(enumType string) map[string]int32 {
-	return enumValueMaps[enumType]
-}
-
-// A registry of all linked message types.
-// The string is a fully-qualified proto name ("pkg.Message").
-var (
-	protoTypes    = make(map[string]reflect.Type)
-	revProtoTypes = make(map[reflect.Type]string)
-)
-
-// RegisterType is called from generated code and maps from the fully qualified
-// proto name to the type (pointer to struct) of the protocol buffer.
-func RegisterType(x Message, name string) {
-	if _, ok := protoTypes[name]; ok {
-		// TODO: Some day, make this a panic.
-		log.Printf("proto: duplicate proto type registered: %s", name)
-		return
-	}
-	t := reflect.TypeOf(x)
-	protoTypes[name] = t
-	revProtoTypes[t] = name
-}
-
-// MessageName returns the fully-qualified proto name for the given message type.
-func MessageName(x Message) string {
-	type xname interface {
-		XXX_MessageName() string
-	}
-	if m, ok := x.(xname); ok {
-		return m.XXX_MessageName()
-	}
-	return revProtoTypes[reflect.TypeOf(x)]
-}
-
-// MessageType returns the message type (pointer to struct) for a named message.
-func MessageType(name string) reflect.Type { return protoTypes[name] }
-
-// A registry of all linked proto files.
-var (
-	protoFiles = make(map[string][]byte) // file name => fileDescriptor
-)
-
-// RegisterFile is called from generated code and maps from the
-// full file name of a .proto file to its compressed FileDescriptorProto.
-func RegisterFile(filename string, fileDescriptor []byte) {
-	protoFiles[filename] = fileDescriptor
-}
-
-// FileDescriptor returns the compressed FileDescriptorProto for a .proto file.
-func FileDescriptor(filename string) []byte { return protoFiles[filename] }
diff --git a/vendor/github.com/golang/protobuf/proto/text.go b/vendor/github.com/golang/protobuf/proto/text.go
deleted file mode 100644
index 965876bf03..0000000000
--- a/vendor/github.com/golang/protobuf/proto/text.go
+++ /dev/null
@@ -1,854 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-// Functions for writing the text protocol buffer format.
-
-import (
-	"bufio"
-	"bytes"
-	"encoding"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"math"
-	"reflect"
-	"sort"
-	"strings"
-)
-
-var (
-	newline         = []byte("\n")
-	spaces          = []byte("                                        ")
-	gtNewline       = []byte(">\n")
-	endBraceNewline = []byte("}\n")
-	backslashN      = []byte{'\\', 'n'}
-	backslashR      = []byte{'\\', 'r'}
-	backslashT      = []byte{'\\', 't'}
-	backslashDQ     = []byte{'\\', '"'}
-	backslashBS     = []byte{'\\', '\\'}
-	posInf          = []byte("inf")
-	negInf          = []byte("-inf")
-	nan             = []byte("nan")
-)
-
-type writer interface {
-	io.Writer
-	WriteByte(byte) error
-}
-
-// textWriter is an io.Writer that tracks its indentation level.
-type textWriter struct {
-	ind      int
-	complete bool // if the current position is a complete line
-	compact  bool // whether to write out as a one-liner
-	w        writer
-}
-
-func (w *textWriter) WriteString(s string) (n int, err error) {
-	if !strings.Contains(s, "\n") {
-		if !w.compact && w.complete {
-			w.writeIndent()
-		}
-		w.complete = false
-		return io.WriteString(w.w, s)
-	}
-	// WriteString is typically called without newlines, so this
-	// codepath and its copy are rare.  We copy to avoid
-	// duplicating all of Write's logic here.
-	return w.Write([]byte(s))
-}
-
-func (w *textWriter) Write(p []byte) (n int, err error) {
-	newlines := bytes.Count(p, newline)
-	if newlines == 0 {
-		if !w.compact && w.complete {
-			w.writeIndent()
-		}
-		n, err = w.w.Write(p)
-		w.complete = false
-		return n, err
-	}
-
-	frags := bytes.SplitN(p, newline, newlines+1)
-	if w.compact {
-		for i, frag := range frags {
-			if i > 0 {
-				if err := w.w.WriteByte(' '); err != nil {
-					return n, err
-				}
-				n++
-			}
-			nn, err := w.w.Write(frag)
-			n += nn
-			if err != nil {
-				return n, err
-			}
-		}
-		return n, nil
-	}
-
-	for i, frag := range frags {
-		if w.complete {
-			w.writeIndent()
-		}
-		nn, err := w.w.Write(frag)
-		n += nn
-		if err != nil {
-			return n, err
-		}
-		if i+1 < len(frags) {
-			if err := w.w.WriteByte('\n'); err != nil {
-				return n, err
-			}
-			n++
-		}
-	}
-	w.complete = len(frags[len(frags)-1]) == 0
-	return n, nil
-}
-
-func (w *textWriter) WriteByte(c byte) error {
-	if w.compact && c == '\n' {
-		c = ' '
-	}
-	if !w.compact && w.complete {
-		w.writeIndent()
-	}
-	err := w.w.WriteByte(c)
-	w.complete = c == '\n'
-	return err
-}
-
-func (w *textWriter) indent() { w.ind++ }
-
-func (w *textWriter) unindent() {
-	if w.ind == 0 {
-		log.Print("proto: textWriter unindented too far")
-		return
-	}
-	w.ind--
-}
-
-func writeName(w *textWriter, props *Properties) error {
-	if _, err := w.WriteString(props.OrigName); err != nil {
-		return err
-	}
-	if props.Wire != "group" {
-		return w.WriteByte(':')
-	}
-	return nil
-}
-
-// raw is the interface satisfied by RawMessage.
-type raw interface {
-	Bytes() []byte
-}
-
-func requiresQuotes(u string) bool {
-	// When type URL contains any characters except [0-9A-Za-z./\-]*, it must be quoted.
-	for _, ch := range u {
-		switch {
-		case ch == '.' || ch == '/' || ch == '_':
-			continue
-		case '0' <= ch && ch <= '9':
-			continue
-		case 'A' <= ch && ch <= 'Z':
-			continue
-		case 'a' <= ch && ch <= 'z':
-			continue
-		default:
-			return true
-		}
-	}
-	return false
-}
-
-// isAny reports whether sv is a google.protobuf.Any message
-func isAny(sv reflect.Value) bool {
-	type wkt interface {
-		XXX_WellKnownType() string
-	}
-	t, ok := sv.Addr().Interface().(wkt)
-	return ok && t.XXX_WellKnownType() == "Any"
-}
-
-// writeProto3Any writes an expanded google.protobuf.Any message.
-//
-// It returns (false, nil) if sv value can't be unmarshaled (e.g. because
-// required messages are not linked in).
-//
-// It returns (true, error) when sv was written in expanded format or an error
-// was encountered.
-func (tm *TextMarshaler) writeProto3Any(w *textWriter, sv reflect.Value) (bool, error) {
-	turl := sv.FieldByName("TypeUrl")
-	val := sv.FieldByName("Value")
-	if !turl.IsValid() || !val.IsValid() {
-		return true, errors.New("proto: invalid google.protobuf.Any message")
-	}
-
-	b, ok := val.Interface().([]byte)
-	if !ok {
-		return true, errors.New("proto: invalid google.protobuf.Any message")
-	}
-
-	parts := strings.Split(turl.String(), "/")
-	mt := MessageType(parts[len(parts)-1])
-	if mt == nil {
-		return false, nil
-	}
-	m := reflect.New(mt.Elem())
-	if err := Unmarshal(b, m.Interface().(Message)); err != nil {
-		return false, nil
-	}
-	w.Write([]byte("["))
-	u := turl.String()
-	if requiresQuotes(u) {
-		writeString(w, u)
-	} else {
-		w.Write([]byte(u))
-	}
-	if w.compact {
-		w.Write([]byte("]:<"))
-	} else {
-		w.Write([]byte("]: <\n"))
-		w.ind++
-	}
-	if err := tm.writeStruct(w, m.Elem()); err != nil {
-		return true, err
-	}
-	if w.compact {
-		w.Write([]byte("> "))
-	} else {
-		w.ind--
-		w.Write([]byte(">\n"))
-	}
-	return true, nil
-}
-
-func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
-	if tm.ExpandAny && isAny(sv) {
-		if canExpand, err := tm.writeProto3Any(w, sv); canExpand {
-			return err
-		}
-	}
-	st := sv.Type()
-	sprops := GetProperties(st)
-	for i := 0; i < sv.NumField(); i++ {
-		fv := sv.Field(i)
-		props := sprops.Prop[i]
-		name := st.Field(i).Name
-
-		if strings.HasPrefix(name, "XXX_") {
-			// There are two XXX_ fields:
-			//   XXX_unrecognized []byte
-			//   XXX_extensions   map[int32]proto.Extension
-			// The first is handled here;
-			// the second is handled at the bottom of this function.
-			if name == "XXX_unrecognized" && !fv.IsNil() {
-				if err := writeUnknownStruct(w, fv.Interface().([]byte)); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if fv.Kind() == reflect.Ptr && fv.IsNil() {
-			// Field not filled in. This could be an optional field or
-			// a required field that wasn't filled in. Either way, there
-			// isn't anything we can show for it.
-			continue
-		}
-		if fv.Kind() == reflect.Slice && fv.IsNil() {
-			// Repeated field that is empty, or a bytes field that is unused.
-			continue
-		}
-
-		if props.Repeated && fv.Kind() == reflect.Slice {
-			// Repeated field.
-			for j := 0; j < fv.Len(); j++ {
-				if err := writeName(w, props); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				v := fv.Index(j)
-				if v.Kind() == reflect.Ptr && v.IsNil() {
-					// A nil message in a repeated field is not valid,
-					// but we can handle that more gracefully than panicking.
-					if _, err := w.Write([]byte("<nil>\n")); err != nil {
-						return err
-					}
-					continue
-				}
-				if err := tm.writeAny(w, v, props); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if fv.Kind() == reflect.Map {
-			// Map fields are rendered as a repeated struct with key/value fields.
-			keys := fv.MapKeys()
-			sort.Sort(mapKeys(keys))
-			for _, key := range keys {
-				val := fv.MapIndex(key)
-				if err := writeName(w, props); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				// open struct
-				if err := w.WriteByte('<'); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte('\n'); err != nil {
-						return err
-					}
-				}
-				w.indent()
-				// key
-				if _, err := w.WriteString("key:"); err != nil {
-					return err
-				}
-				if !w.compact {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-				}
-				if err := tm.writeAny(w, key, props.mkeyprop); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-				// nil values aren't legal, but we can avoid panicking because of them.
-				if val.Kind() != reflect.Ptr || !val.IsNil() {
-					// value
-					if _, err := w.WriteString("value:"); err != nil {
-						return err
-					}
-					if !w.compact {
-						if err := w.WriteByte(' '); err != nil {
-							return err
-						}
-					}
-					if err := tm.writeAny(w, val, props.mvalprop); err != nil {
-						return err
-					}
-					if err := w.WriteByte('\n'); err != nil {
-						return err
-					}
-				}
-				// close struct
-				w.unindent()
-				if err := w.WriteByte('>'); err != nil {
-					return err
-				}
-				if err := w.WriteByte('\n'); err != nil {
-					return err
-				}
-			}
-			continue
-		}
-		if props.proto3 && fv.Kind() == reflect.Slice && fv.Len() == 0 {
-			// empty bytes field
-			continue
-		}
-		if fv.Kind() != reflect.Ptr && fv.Kind() != reflect.Slice {
-			// proto3 non-repeated scalar field; skip if zero value
-			if isProto3Zero(fv) {
-				continue
-			}
-		}
-
-		if fv.Kind() == reflect.Interface {
-			// Check if it is a oneof.
-			if st.Field(i).Tag.Get("protobuf_oneof") != "" {
-				// fv is nil, or holds a pointer to generated struct.
-				// That generated struct has exactly one field,
-				// which has a protobuf struct tag.
-				if fv.IsNil() {
-					continue
-				}
-				inner := fv.Elem().Elem() // interface -> *T -> T
-				tag := inner.Type().Field(0).Tag.Get("protobuf")
-				props = new(Properties) // Overwrite the outer props var, but not its pointee.
-				props.Parse(tag)
-				// Write the value in the oneof, not the oneof itself.
-				fv = inner.Field(0)
-
-				// Special case to cope with malformed messages gracefully:
-				// If the value in the oneof is a nil pointer, don't panic
-				// in writeAny.
-				if fv.Kind() == reflect.Ptr && fv.IsNil() {
-					// Use errors.New so writeAny won't render quotes.
-					msg := errors.New("/* nil */")
-					fv = reflect.ValueOf(&msg).Elem()
-				}
-			}
-		}
-
-		if err := writeName(w, props); err != nil {
-			return err
-		}
-		if !w.compact {
-			if err := w.WriteByte(' '); err != nil {
-				return err
-			}
-		}
-		if b, ok := fv.Interface().(raw); ok {
-			if err := writeRaw(w, b.Bytes()); err != nil {
-				return err
-			}
-			continue
-		}
-
-		// Enums have a String method, so writeAny will work fine.
-		if err := tm.writeAny(w, fv, props); err != nil {
-			return err
-		}
-
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-
-	// Extensions (the XXX_extensions field).
-	pv := sv.Addr()
-	if _, ok := extendable(pv.Interface()); ok {
-		if err := tm.writeExtensions(w, pv); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// writeRaw writes an uninterpreted raw message.
-func writeRaw(w *textWriter, b []byte) error {
-	if err := w.WriteByte('<'); err != nil {
-		return err
-	}
-	if !w.compact {
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-	w.indent()
-	if err := writeUnknownStruct(w, b); err != nil {
-		return err
-	}
-	w.unindent()
-	if err := w.WriteByte('>'); err != nil {
-		return err
-	}
-	return nil
-}
-
-// writeAny writes an arbitrary field.
-func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Properties) error {
-	v = reflect.Indirect(v)
-
-	// Floats have special cases.
-	if v.Kind() == reflect.Float32 || v.Kind() == reflect.Float64 {
-		x := v.Float()
-		var b []byte
-		switch {
-		case math.IsInf(x, 1):
-			b = posInf
-		case math.IsInf(x, -1):
-			b = negInf
-		case math.IsNaN(x):
-			b = nan
-		}
-		if b != nil {
-			_, err := w.Write(b)
-			return err
-		}
-		// Other values are handled below.
-	}
-
-	// We don't attempt to serialise every possible value type; only those
-	// that can occur in protocol buffers.
-	switch v.Kind() {
-	case reflect.Slice:
-		// Should only be a []byte; repeated fields are handled in writeStruct.
-		if err := writeString(w, string(v.Bytes())); err != nil {
-			return err
-		}
-	case reflect.String:
-		if err := writeString(w, v.String()); err != nil {
-			return err
-		}
-	case reflect.Struct:
-		// Required/optional group/message.
-		var bra, ket byte = '<', '>'
-		if props != nil && props.Wire == "group" {
-			bra, ket = '{', '}'
-		}
-		if err := w.WriteByte(bra); err != nil {
-			return err
-		}
-		if !w.compact {
-			if err := w.WriteByte('\n'); err != nil {
-				return err
-			}
-		}
-		w.indent()
-		if etm, ok := v.Interface().(encoding.TextMarshaler); ok {
-			text, err := etm.MarshalText()
-			if err != nil {
-				return err
-			}
-			if _, err = w.Write(text); err != nil {
-				return err
-			}
-		} else if err := tm.writeStruct(w, v); err != nil {
-			return err
-		}
-		w.unindent()
-		if err := w.WriteByte(ket); err != nil {
-			return err
-		}
-	default:
-		_, err := fmt.Fprint(w, v.Interface())
-		return err
-	}
-	return nil
-}
-
-// equivalent to C's isprint.
-func isprint(c byte) bool {
-	return c >= 0x20 && c < 0x7f
-}
-
-// writeString writes a string in the protocol buffer text format.
-// It is similar to strconv.Quote except we don't use Go escape sequences,
-// we treat the string as a byte sequence, and we use octal escapes.
-// These differences are to maintain interoperability with the other
-// languages' implementations of the text format.
-func writeString(w *textWriter, s string) error {
-	// use WriteByte here to get any needed indent
-	if err := w.WriteByte('"'); err != nil {
-		return err
-	}
-	// Loop over the bytes, not the runes.
-	for i := 0; i < len(s); i++ {
-		var err error
-		// Divergence from C++: we don't escape apostrophes.
-		// There's no need to escape them, and the C++ parser
-		// copes with a naked apostrophe.
-		switch c := s[i]; c {
-		case '\n':
-			_, err = w.w.Write(backslashN)
-		case '\r':
-			_, err = w.w.Write(backslashR)
-		case '\t':
-			_, err = w.w.Write(backslashT)
-		case '"':
-			_, err = w.w.Write(backslashDQ)
-		case '\\':
-			_, err = w.w.Write(backslashBS)
-		default:
-			if isprint(c) {
-				err = w.w.WriteByte(c)
-			} else {
-				_, err = fmt.Fprintf(w.w, "\\%03o", c)
-			}
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return w.WriteByte('"')
-}
-
-func writeUnknownStruct(w *textWriter, data []byte) (err error) {
-	if !w.compact {
-		if _, err := fmt.Fprintf(w, "/* %d unknown bytes */\n", len(data)); err != nil {
-			return err
-		}
-	}
-	b := NewBuffer(data)
-	for b.index < len(b.buf) {
-		x, err := b.DecodeVarint()
-		if err != nil {
-			_, err := fmt.Fprintf(w, "/* %v */\n", err)
-			return err
-		}
-		wire, tag := x&7, x>>3
-		if wire == WireEndGroup {
-			w.unindent()
-			if _, err := w.Write(endBraceNewline); err != nil {
-				return err
-			}
-			continue
-		}
-		if _, err := fmt.Fprint(w, tag); err != nil {
-			return err
-		}
-		if wire != WireStartGroup {
-			if err := w.WriteByte(':'); err != nil {
-				return err
-			}
-		}
-		if !w.compact || wire == WireStartGroup {
-			if err := w.WriteByte(' '); err != nil {
-				return err
-			}
-		}
-		switch wire {
-		case WireBytes:
-			buf, e := b.DecodeRawBytes(false)
-			if e == nil {
-				_, err = fmt.Fprintf(w, "%q", buf)
-			} else {
-				_, err = fmt.Fprintf(w, "/* %v */", e)
-			}
-		case WireFixed32:
-			x, err = b.DecodeFixed32()
-			err = writeUnknownInt(w, x, err)
-		case WireFixed64:
-			x, err = b.DecodeFixed64()
-			err = writeUnknownInt(w, x, err)
-		case WireStartGroup:
-			err = w.WriteByte('{')
-			w.indent()
-		case WireVarint:
-			x, err = b.DecodeVarint()
-			err = writeUnknownInt(w, x, err)
-		default:
-			_, err = fmt.Fprintf(w, "/* unknown wire type %d */", wire)
-		}
-		if err != nil {
-			return err
-		}
-		if err = w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func writeUnknownInt(w *textWriter, x uint64, err error) error {
-	if err == nil {
-		_, err = fmt.Fprint(w, x)
-	} else {
-		_, err = fmt.Fprintf(w, "/* %v */", err)
-	}
-	return err
-}
-
-type int32Slice []int32
-
-func (s int32Slice) Len() int           { return len(s) }
-func (s int32Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-// writeExtensions writes all the extensions in pv.
-// pv is assumed to be a pointer to a protocol message struct that is extendable.
-func (tm *TextMarshaler) writeExtensions(w *textWriter, pv reflect.Value) error {
-	emap := extensionMaps[pv.Type().Elem()]
-	ep, _ := extendable(pv.Interface())
-
-	// Order the extensions by ID.
-	// This isn't strictly necessary, but it will give us
-	// canonical output, which will also make testing easier.
-	m, mu := ep.extensionsRead()
-	if m == nil {
-		return nil
-	}
-	mu.Lock()
-	ids := make([]int32, 0, len(m))
-	for id := range m {
-		ids = append(ids, id)
-	}
-	sort.Sort(int32Slice(ids))
-	mu.Unlock()
-
-	for _, extNum := range ids {
-		ext := m[extNum]
-		var desc *ExtensionDesc
-		if emap != nil {
-			desc = emap[extNum]
-		}
-		if desc == nil {
-			// Unknown extension.
-			if err := writeUnknownStruct(w, ext.enc); err != nil {
-				return err
-			}
-			continue
-		}
-
-		pb, err := GetExtension(ep, desc)
-		if err != nil {
-			return fmt.Errorf("failed getting extension: %v", err)
-		}
-
-		// Repeated extensions will appear as a slice.
-		if !desc.repeated() {
-			if err := tm.writeExtension(w, desc.Name, pb); err != nil {
-				return err
-			}
-		} else {
-			v := reflect.ValueOf(pb)
-			for i := 0; i < v.Len(); i++ {
-				if err := tm.writeExtension(w, desc.Name, v.Index(i).Interface()); err != nil {
-					return err
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func (tm *TextMarshaler) writeExtension(w *textWriter, name string, pb interface{}) error {
-	if _, err := fmt.Fprintf(w, "[%s]:", name); err != nil {
-		return err
-	}
-	if !w.compact {
-		if err := w.WriteByte(' '); err != nil {
-			return err
-		}
-	}
-	if err := tm.writeAny(w, reflect.ValueOf(pb), nil); err != nil {
-		return err
-	}
-	if err := w.WriteByte('\n'); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (w *textWriter) writeIndent() {
-	if !w.complete {
-		return
-	}
-	remain := w.ind * 2
-	for remain > 0 {
-		n := remain
-		if n > len(spaces) {
-			n = len(spaces)
-		}
-		w.w.Write(spaces[:n])
-		remain -= n
-	}
-	w.complete = false
-}
-
-// TextMarshaler is a configurable text format marshaler.
-type TextMarshaler struct {
-	Compact   bool // use compact text format (one line).
-	ExpandAny bool // expand google.protobuf.Any messages of known types
-}
-
-// Marshal writes a given protocol buffer in text format.
-// The only errors returned are from w.
-func (tm *TextMarshaler) Marshal(w io.Writer, pb Message) error {
-	val := reflect.ValueOf(pb)
-	if pb == nil || val.IsNil() {
-		w.Write([]byte("<nil>"))
-		return nil
-	}
-	var bw *bufio.Writer
-	ww, ok := w.(writer)
-	if !ok {
-		bw = bufio.NewWriter(w)
-		ww = bw
-	}
-	aw := &textWriter{
-		w:        ww,
-		complete: true,
-		compact:  tm.Compact,
-	}
-
-	if etm, ok := pb.(encoding.TextMarshaler); ok {
-		text, err := etm.MarshalText()
-		if err != nil {
-			return err
-		}
-		if _, err = aw.Write(text); err != nil {
-			return err
-		}
-		if bw != nil {
-			return bw.Flush()
-		}
-		return nil
-	}
-	// Dereference the received pointer so we don't have outer < and >.
-	v := reflect.Indirect(val)
-	if err := tm.writeStruct(aw, v); err != nil {
-		return err
-	}
-	if bw != nil {
-		return bw.Flush()
-	}
-	return nil
-}
-
-// Text is the same as Marshal, but returns the string directly.
-func (tm *TextMarshaler) Text(pb Message) string {
-	var buf bytes.Buffer
-	tm.Marshal(&buf, pb)
-	return buf.String()
-}
-
-var (
-	defaultTextMarshaler = TextMarshaler{}
-	compactTextMarshaler = TextMarshaler{Compact: true}
-)
-
-// TODO: consider removing some of the Marshal functions below.
-
-// MarshalText writes a given protocol buffer in text format.
-// The only errors returned are from w.
-func MarshalText(w io.Writer, pb Message) error { return defaultTextMarshaler.Marshal(w, pb) }
-
-// MarshalTextString is the same as MarshalText, but returns the string directly.
-func MarshalTextString(pb Message) string { return defaultTextMarshaler.Text(pb) }
-
-// CompactText writes a given protocol buffer in compact text format (one line).
-func CompactText(w io.Writer, pb Message) error { return compactTextMarshaler.Marshal(w, pb) }
-
-// CompactTextString is the same as CompactText, but returns the string directly.
-func CompactTextString(pb Message) string { return compactTextMarshaler.Text(pb) }
diff --git a/vendor/github.com/golang/protobuf/proto/text_parser.go b/vendor/github.com/golang/protobuf/proto/text_parser.go
deleted file mode 100644
index 5e14513f28..0000000000
--- a/vendor/github.com/golang/protobuf/proto/text_parser.go
+++ /dev/null
@@ -1,895 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-// Functions for parsing the Text protocol buffer format.
-// TODO: message sets.
-
-import (
-	"encoding"
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-// Error string emitted when deserializing Any and fields are already set
-const anyRepeatedlyUnpacked = "Any message unpacked multiple times, or %q already set"
-
-type ParseError struct {
-	Message string
-	Line    int // 1-based line number
-	Offset  int // 0-based byte offset from start of input
-}
-
-func (p *ParseError) Error() string {
-	if p.Line == 1 {
-		// show offset only for first line
-		return fmt.Sprintf("line 1.%d: %v", p.Offset, p.Message)
-	}
-	return fmt.Sprintf("line %d: %v", p.Line, p.Message)
-}
-
-type token struct {
-	value    string
-	err      *ParseError
-	line     int    // line number
-	offset   int    // byte number from start of input, not start of line
-	unquoted string // the unquoted version of value, if it was a quoted string
-}
-
-func (t *token) String() string {
-	if t.err == nil {
-		return fmt.Sprintf("%q (line=%d, offset=%d)", t.value, t.line, t.offset)
-	}
-	return fmt.Sprintf("parse error: %v", t.err)
-}
-
-type textParser struct {
-	s            string // remaining input
-	done         bool   // whether the parsing is finished (success or error)
-	backed       bool   // whether back() was called
-	offset, line int
-	cur          token
-}
-
-func newTextParser(s string) *textParser {
-	p := new(textParser)
-	p.s = s
-	p.line = 1
-	p.cur.line = 1
-	return p
-}
-
-func (p *textParser) errorf(format string, a ...interface{}) *ParseError {
-	pe := &ParseError{fmt.Sprintf(format, a...), p.cur.line, p.cur.offset}
-	p.cur.err = pe
-	p.done = true
-	return pe
-}
-
-// Numbers and identifiers are matched by [-+._A-Za-z0-9]
-func isIdentOrNumberChar(c byte) bool {
-	switch {
-	case 'A' <= c && c <= 'Z', 'a' <= c && c <= 'z':
-		return true
-	case '0' <= c && c <= '9':
-		return true
-	}
-	switch c {
-	case '-', '+', '.', '_':
-		return true
-	}
-	return false
-}
-
-func isWhitespace(c byte) bool {
-	switch c {
-	case ' ', '\t', '\n', '\r':
-		return true
-	}
-	return false
-}
-
-func isQuote(c byte) bool {
-	switch c {
-	case '"', '\'':
-		return true
-	}
-	return false
-}
-
-func (p *textParser) skipWhitespace() {
-	i := 0
-	for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
-		if p.s[i] == '#' {
-			// comment; skip to end of line or input
-			for i < len(p.s) && p.s[i] != '\n' {
-				i++
-			}
-			if i == len(p.s) {
-				break
-			}
-		}
-		if p.s[i] == '\n' {
-			p.line++
-		}
-		i++
-	}
-	p.offset += i
-	p.s = p.s[i:len(p.s)]
-	if len(p.s) == 0 {
-		p.done = true
-	}
-}
-
-func (p *textParser) advance() {
-	// Skip whitespace
-	p.skipWhitespace()
-	if p.done {
-		return
-	}
-
-	// Start of non-whitespace
-	p.cur.err = nil
-	p.cur.offset, p.cur.line = p.offset, p.line
-	p.cur.unquoted = ""
-	switch p.s[0] {
-	case '<', '>', '{', '}', ':', '[', ']', ';', ',', '/':
-		// Single symbol
-		p.cur.value, p.s = p.s[0:1], p.s[1:len(p.s)]
-	case '"', '\'':
-		// Quoted string
-		i := 1
-		for i < len(p.s) && p.s[i] != p.s[0] && p.s[i] != '\n' {
-			if p.s[i] == '\\' && i+1 < len(p.s) {
-				// skip escaped char
-				i++
-			}
-			i++
-		}
-		if i >= len(p.s) || p.s[i] != p.s[0] {
-			p.errorf("unmatched quote")
-			return
-		}
-		unq, err := unquoteC(p.s[1:i], rune(p.s[0]))
-		if err != nil {
-			p.errorf("invalid quoted string %s: %v", p.s[0:i+1], err)
-			return
-		}
-		p.cur.value, p.s = p.s[0:i+1], p.s[i+1:len(p.s)]
-		p.cur.unquoted = unq
-	default:
-		i := 0
-		for i < len(p.s) && isIdentOrNumberChar(p.s[i]) {
-			i++
-		}
-		if i == 0 {
-			p.errorf("unexpected byte %#x", p.s[0])
-			return
-		}
-		p.cur.value, p.s = p.s[0:i], p.s[i:len(p.s)]
-	}
-	p.offset += len(p.cur.value)
-}
-
-var (
-	errBadUTF8 = errors.New("proto: bad UTF-8")
-	errBadHex  = errors.New("proto: bad hexadecimal")
-)
-
-func unquoteC(s string, quote rune) (string, error) {
-	// This is based on C++'s tokenizer.cc.
-	// Despite its name, this is *not* parsing C syntax.
-	// For instance, "\0" is an invalid quoted string.
-
-	// Avoid allocation in trivial cases.
-	simple := true
-	for _, r := range s {
-		if r == '\\' || r == quote {
-			simple = false
-			break
-		}
-	}
-	if simple {
-		return s, nil
-	}
-
-	buf := make([]byte, 0, 3*len(s)/2)
-	for len(s) > 0 {
-		r, n := utf8.DecodeRuneInString(s)
-		if r == utf8.RuneError && n == 1 {
-			return "", errBadUTF8
-		}
-		s = s[n:]
-		if r != '\\' {
-			if r < utf8.RuneSelf {
-				buf = append(buf, byte(r))
-			} else {
-				buf = append(buf, string(r)...)
-			}
-			continue
-		}
-
-		ch, tail, err := unescape(s)
-		if err != nil {
-			return "", err
-		}
-		buf = append(buf, ch...)
-		s = tail
-	}
-	return string(buf), nil
-}
-
-func unescape(s string) (ch string, tail string, err error) {
-	r, n := utf8.DecodeRuneInString(s)
-	if r == utf8.RuneError && n == 1 {
-		return "", "", errBadUTF8
-	}
-	s = s[n:]
-	switch r {
-	case 'a':
-		return "\a", s, nil
-	case 'b':
-		return "\b", s, nil
-	case 'f':
-		return "\f", s, nil
-	case 'n':
-		return "\n", s, nil
-	case 'r':
-		return "\r", s, nil
-	case 't':
-		return "\t", s, nil
-	case 'v':
-		return "\v", s, nil
-	case '?':
-		return "?", s, nil // trigraph workaround
-	case '\'', '"', '\\':
-		return string(r), s, nil
-	case '0', '1', '2', '3', '4', '5', '6', '7', 'x', 'X':
-		if len(s) < 2 {
-			return "", "", fmt.Errorf(`\%c requires 2 following digits`, r)
-		}
-		base := 8
-		ss := s[:2]
-		s = s[2:]
-		if r == 'x' || r == 'X' {
-			base = 16
-		} else {
-			ss = string(r) + ss
-		}
-		i, err := strconv.ParseUint(ss, base, 8)
-		if err != nil {
-			return "", "", err
-		}
-		return string([]byte{byte(i)}), s, nil
-	case 'u', 'U':
-		n := 4
-		if r == 'U' {
-			n = 8
-		}
-		if len(s) < n {
-			return "", "", fmt.Errorf(`\%c requires %d digits`, r, n)
-		}
-
-		bs := make([]byte, n/2)
-		for i := 0; i < n; i += 2 {
-			a, ok1 := unhex(s[i])
-			b, ok2 := unhex(s[i+1])
-			if !ok1 || !ok2 {
-				return "", "", errBadHex
-			}
-			bs[i/2] = a<<4 | b
-		}
-		s = s[n:]
-		return string(bs), s, nil
-	}
-	return "", "", fmt.Errorf(`unknown escape \%c`, r)
-}
-
-// Adapted from src/pkg/strconv/quote.go.
-func unhex(b byte) (v byte, ok bool) {
-	switch {
-	case '0' <= b && b <= '9':
-		return b - '0', true
-	case 'a' <= b && b <= 'f':
-		return b - 'a' + 10, true
-	case 'A' <= b && b <= 'F':
-		return b - 'A' + 10, true
-	}
-	return 0, false
-}
-
-// Back off the parser by one token. Can only be done between calls to next().
-// It makes the next advance() a no-op.
-func (p *textParser) back() { p.backed = true }
-
-// Advances the parser and returns the new current token.
-func (p *textParser) next() *token {
-	if p.backed || p.done {
-		p.backed = false
-		return &p.cur
-	}
-	p.advance()
-	if p.done {
-		p.cur.value = ""
-	} else if len(p.cur.value) > 0 && isQuote(p.cur.value[0]) {
-		// Look for multiple quoted strings separated by whitespace,
-		// and concatenate them.
-		cat := p.cur
-		for {
-			p.skipWhitespace()
-			if p.done || !isQuote(p.s[0]) {
-				break
-			}
-			p.advance()
-			if p.cur.err != nil {
-				return &p.cur
-			}
-			cat.value += " " + p.cur.value
-			cat.unquoted += p.cur.unquoted
-		}
-		p.done = false // parser may have seen EOF, but we want to return cat
-		p.cur = cat
-	}
-	return &p.cur
-}
-
-func (p *textParser) consumeToken(s string) error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != s {
-		p.back()
-		return p.errorf("expected %q, found %q", s, tok.value)
-	}
-	return nil
-}
-
-// Return a RequiredNotSetError indicating which required field was not set.
-func (p *textParser) missingRequiredFieldError(sv reflect.Value) *RequiredNotSetError {
-	st := sv.Type()
-	sprops := GetProperties(st)
-	for i := 0; i < st.NumField(); i++ {
-		if !isNil(sv.Field(i)) {
-			continue
-		}
-
-		props := sprops.Prop[i]
-		if props.Required {
-			return &RequiredNotSetError{fmt.Sprintf("%v.%v", st, props.OrigName)}
-		}
-	}
-	return &RequiredNotSetError{fmt.Sprintf("%v.<unknown field name>", st)} // should not happen
-}
-
-// Returns the index in the struct for the named field, as well as the parsed tag properties.
-func structFieldByName(sprops *StructProperties, name string) (int, *Properties, bool) {
-	i, ok := sprops.decoderOrigNames[name]
-	if ok {
-		return i, sprops.Prop[i], true
-	}
-	return -1, nil, false
-}
-
-// Consume a ':' from the input stream (if the next token is a colon),
-// returning an error if a colon is needed but not present.
-func (p *textParser) checkForColon(props *Properties, typ reflect.Type) *ParseError {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != ":" {
-		// Colon is optional when the field is a group or message.
-		needColon := true
-		switch props.Wire {
-		case "group":
-			needColon = false
-		case "bytes":
-			// A "bytes" field is either a message, a string, or a repeated field;
-			// those three become *T, *string and []T respectively, so we can check for
-			// this field being a pointer to a non-string.
-			if typ.Kind() == reflect.Ptr {
-				// *T or *string
-				if typ.Elem().Kind() == reflect.String {
-					break
-				}
-			} else if typ.Kind() == reflect.Slice {
-				// []T or []*T
-				if typ.Elem().Kind() != reflect.Ptr {
-					break
-				}
-			} else if typ.Kind() == reflect.String {
-				// The proto3 exception is for a string field,
-				// which requires a colon.
-				break
-			}
-			needColon = false
-		}
-		if needColon {
-			return p.errorf("expected ':', found %q", tok.value)
-		}
-		p.back()
-	}
-	return nil
-}
-
-func (p *textParser) readStruct(sv reflect.Value, terminator string) error {
-	st := sv.Type()
-	sprops := GetProperties(st)
-	reqCount := sprops.reqCount
-	var reqFieldErr error
-	fieldSet := make(map[string]bool)
-	// A struct is a sequence of "name: value", terminated by one of
-	// '>' or '}', or the end of the input.  A name may also be
-	// "[extension]" or "[type/url]".
-	//
-	// The whole struct can also be an expanded Any message, like:
-	// [type/url] < ... struct contents ... >
-	for {
-		tok := p.next()
-		if tok.err != nil {
-			return tok.err
-		}
-		if tok.value == terminator {
-			break
-		}
-		if tok.value == "[" {
-			// Looks like an extension or an Any.
-			//
-			// TODO: Check whether we need to handle
-			// namespace rooted names (e.g. ".something.Foo").
-			extName, err := p.consumeExtName()
-			if err != nil {
-				return err
-			}
-
-			if s := strings.LastIndex(extName, "/"); s >= 0 {
-				// If it contains a slash, it's an Any type URL.
-				messageName := extName[s+1:]
-				mt := MessageType(messageName)
-				if mt == nil {
-					return p.errorf("unrecognized message %q in google.protobuf.Any", messageName)
-				}
-				tok = p.next()
-				if tok.err != nil {
-					return tok.err
-				}
-				// consume an optional colon
-				if tok.value == ":" {
-					tok = p.next()
-					if tok.err != nil {
-						return tok.err
-					}
-				}
-				var terminator string
-				switch tok.value {
-				case "<":
-					terminator = ">"
-				case "{":
-					terminator = "}"
-				default:
-					return p.errorf("expected '{' or '<', found %q", tok.value)
-				}
-				v := reflect.New(mt.Elem())
-				if pe := p.readStruct(v.Elem(), terminator); pe != nil {
-					return pe
-				}
-				b, err := Marshal(v.Interface().(Message))
-				if err != nil {
-					return p.errorf("failed to marshal message of type %q: %v", messageName, err)
-				}
-				if fieldSet["type_url"] {
-					return p.errorf(anyRepeatedlyUnpacked, "type_url")
-				}
-				if fieldSet["value"] {
-					return p.errorf(anyRepeatedlyUnpacked, "value")
-				}
-				sv.FieldByName("TypeUrl").SetString(extName)
-				sv.FieldByName("Value").SetBytes(b)
-				fieldSet["type_url"] = true
-				fieldSet["value"] = true
-				continue
-			}
-
-			var desc *ExtensionDesc
-			// This could be faster, but it's functional.
-			// TODO: Do something smarter than a linear scan.
-			for _, d := range RegisteredExtensions(reflect.New(st).Interface().(Message)) {
-				if d.Name == extName {
-					desc = d
-					break
-				}
-			}
-			if desc == nil {
-				return p.errorf("unrecognized extension %q", extName)
-			}
-
-			props := &Properties{}
-			props.Parse(desc.Tag)
-
-			typ := reflect.TypeOf(desc.ExtensionType)
-			if err := p.checkForColon(props, typ); err != nil {
-				return err
-			}
-
-			rep := desc.repeated()
-
-			// Read the extension structure, and set it in
-			// the value we're constructing.
-			var ext reflect.Value
-			if !rep {
-				ext = reflect.New(typ).Elem()
-			} else {
-				ext = reflect.New(typ.Elem()).Elem()
-			}
-			if err := p.readAny(ext, props); err != nil {
-				if _, ok := err.(*RequiredNotSetError); !ok {
-					return err
-				}
-				reqFieldErr = err
-			}
-			ep := sv.Addr().Interface().(Message)
-			if !rep {
-				SetExtension(ep, desc, ext.Interface())
-			} else {
-				old, err := GetExtension(ep, desc)
-				var sl reflect.Value
-				if err == nil {
-					sl = reflect.ValueOf(old) // existing slice
-				} else {
-					sl = reflect.MakeSlice(typ, 0, 1)
-				}
-				sl = reflect.Append(sl, ext)
-				SetExtension(ep, desc, sl.Interface())
-			}
-			if err := p.consumeOptionalSeparator(); err != nil {
-				return err
-			}
-			continue
-		}
-
-		// This is a normal, non-extension field.
-		name := tok.value
-		var dst reflect.Value
-		fi, props, ok := structFieldByName(sprops, name)
-		if ok {
-			dst = sv.Field(fi)
-		} else if oop, ok := sprops.OneofTypes[name]; ok {
-			// It is a oneof.
-			props = oop.Prop
-			nv := reflect.New(oop.Type.Elem())
-			dst = nv.Elem().Field(0)
-			field := sv.Field(oop.Field)
-			if !field.IsNil() {
-				return p.errorf("field '%s' would overwrite already parsed oneof '%s'", name, sv.Type().Field(oop.Field).Name)
-			}
-			field.Set(nv)
-		}
-		if !dst.IsValid() {
-			return p.errorf("unknown field name %q in %v", name, st)
-		}
-
-		if dst.Kind() == reflect.Map {
-			// Consume any colon.
-			if err := p.checkForColon(props, dst.Type()); err != nil {
-				return err
-			}
-
-			// Construct the map if it doesn't already exist.
-			if dst.IsNil() {
-				dst.Set(reflect.MakeMap(dst.Type()))
-			}
-			key := reflect.New(dst.Type().Key()).Elem()
-			val := reflect.New(dst.Type().Elem()).Elem()
-
-			// The map entry should be this sequence of tokens:
-			//	< key : KEY value : VALUE >
-			// However, implementations may omit key or value, and technically
-			// we should support them in any order.  See b/28924776 for a time
-			// this went wrong.
-
-			tok := p.next()
-			var terminator string
-			switch tok.value {
-			case "<":
-				terminator = ">"
-			case "{":
-				terminator = "}"
-			default:
-				return p.errorf("expected '{' or '<', found %q", tok.value)
-			}
-			for {
-				tok := p.next()
-				if tok.err != nil {
-					return tok.err
-				}
-				if tok.value == terminator {
-					break
-				}
-				switch tok.value {
-				case "key":
-					if err := p.consumeToken(":"); err != nil {
-						return err
-					}
-					if err := p.readAny(key, props.mkeyprop); err != nil {
-						return err
-					}
-					if err := p.consumeOptionalSeparator(); err != nil {
-						return err
-					}
-				case "value":
-					if err := p.checkForColon(props.mvalprop, dst.Type().Elem()); err != nil {
-						return err
-					}
-					if err := p.readAny(val, props.mvalprop); err != nil {
-						return err
-					}
-					if err := p.consumeOptionalSeparator(); err != nil {
-						return err
-					}
-				default:
-					p.back()
-					return p.errorf(`expected "key", "value", or %q, found %q`, terminator, tok.value)
-				}
-			}
-
-			dst.SetMapIndex(key, val)
-			continue
-		}
-
-		// Check that it's not already set if it's not a repeated field.
-		if !props.Repeated && fieldSet[name] {
-			return p.errorf("non-repeated field %q was repeated", name)
-		}
-
-		if err := p.checkForColon(props, dst.Type()); err != nil {
-			return err
-		}
-
-		// Parse into the field.
-		fieldSet[name] = true
-		if err := p.readAny(dst, props); err != nil {
-			if _, ok := err.(*RequiredNotSetError); !ok {
-				return err
-			}
-			reqFieldErr = err
-		}
-		if props.Required {
-			reqCount--
-		}
-
-		if err := p.consumeOptionalSeparator(); err != nil {
-			return err
-		}
-
-	}
-
-	if reqCount > 0 {
-		return p.missingRequiredFieldError(sv)
-	}
-	return reqFieldErr
-}
-
-// consumeExtName consumes extension name or expanded Any type URL and the
-// following ']'. It returns the name or URL consumed.
-func (p *textParser) consumeExtName() (string, error) {
-	tok := p.next()
-	if tok.err != nil {
-		return "", tok.err
-	}
-
-	// If extension name or type url is quoted, it's a single token.
-	if len(tok.value) > 2 && isQuote(tok.value[0]) && tok.value[len(tok.value)-1] == tok.value[0] {
-		name, err := unquoteC(tok.value[1:len(tok.value)-1], rune(tok.value[0]))
-		if err != nil {
-			return "", err
-		}
-		return name, p.consumeToken("]")
-	}
-
-	// Consume everything up to "]"
-	var parts []string
-	for tok.value != "]" {
-		parts = append(parts, tok.value)
-		tok = p.next()
-		if tok.err != nil {
-			return "", p.errorf("unrecognized type_url or extension name: %s", tok.err)
-		}
-	}
-	return strings.Join(parts, ""), nil
-}
-
-// consumeOptionalSeparator consumes an optional semicolon or comma.
-// It is used in readStruct to provide backward compatibility.
-func (p *textParser) consumeOptionalSeparator() error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value != ";" && tok.value != "," {
-		p.back()
-	}
-	return nil
-}
-
-func (p *textParser) readAny(v reflect.Value, props *Properties) error {
-	tok := p.next()
-	if tok.err != nil {
-		return tok.err
-	}
-	if tok.value == "" {
-		return p.errorf("unexpected EOF")
-	}
-
-	switch fv := v; fv.Kind() {
-	case reflect.Slice:
-		at := v.Type()
-		if at.Elem().Kind() == reflect.Uint8 {
-			// Special case for []byte
-			if tok.value[0] != '"' && tok.value[0] != '\'' {
-				// Deliberately written out here, as the error after
-				// this switch statement would write "invalid []byte: ...",
-				// which is not as user-friendly.
-				return p.errorf("invalid string: %v", tok.value)
-			}
-			bytes := []byte(tok.unquoted)
-			fv.Set(reflect.ValueOf(bytes))
-			return nil
-		}
-		// Repeated field.
-		if tok.value == "[" {
-			// Repeated field with list notation, like [1,2,3].
-			for {
-				fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
-				err := p.readAny(fv.Index(fv.Len()-1), props)
-				if err != nil {
-					return err
-				}
-				tok := p.next()
-				if tok.err != nil {
-					return tok.err
-				}
-				if tok.value == "]" {
-					break
-				}
-				if tok.value != "," {
-					return p.errorf("Expected ']' or ',' found %q", tok.value)
-				}
-			}
-			return nil
-		}
-		// One value of the repeated field.
-		p.back()
-		fv.Set(reflect.Append(fv, reflect.New(at.Elem()).Elem()))
-		return p.readAny(fv.Index(fv.Len()-1), props)
-	case reflect.Bool:
-		// true/1/t/True or false/f/0/False.
-		switch tok.value {
-		case "true", "1", "t", "True":
-			fv.SetBool(true)
-			return nil
-		case "false", "0", "f", "False":
-			fv.SetBool(false)
-			return nil
-		}
-	case reflect.Float32, reflect.Float64:
-		v := tok.value
-		// Ignore 'f' for compatibility with output generated by C++, but don't
-		// remove 'f' when the value is "-inf" or "inf".
-		if strings.HasSuffix(v, "f") && tok.value != "-inf" && tok.value != "inf" {
-			v = v[:len(v)-1]
-		}
-		if f, err := strconv.ParseFloat(v, fv.Type().Bits()); err == nil {
-			fv.SetFloat(f)
-			return nil
-		}
-	case reflect.Int32:
-		if x, err := strconv.ParseInt(tok.value, 0, 32); err == nil {
-			fv.SetInt(x)
-			return nil
-		}
-
-		if len(props.Enum) == 0 {
-			break
-		}
-		m, ok := enumValueMaps[props.Enum]
-		if !ok {
-			break
-		}
-		x, ok := m[tok.value]
-		if !ok {
-			break
-		}
-		fv.SetInt(int64(x))
-		return nil
-	case reflect.Int64:
-		if x, err := strconv.ParseInt(tok.value, 0, 64); err == nil {
-			fv.SetInt(x)
-			return nil
-		}
-
-	case reflect.Ptr:
-		// A basic field (indirected through pointer), or a repeated message/group
-		p.back()
-		fv.Set(reflect.New(fv.Type().Elem()))
-		return p.readAny(fv.Elem(), props)
-	case reflect.String:
-		if tok.value[0] == '"' || tok.value[0] == '\'' {
-			fv.SetString(tok.unquoted)
-			return nil
-		}
-	case reflect.Struct:
-		var terminator string
-		switch tok.value {
-		case "{":
-			terminator = "}"
-		case "<":
-			terminator = ">"
-		default:
-			return p.errorf("expected '{' or '<', found %q", tok.value)
-		}
-		// TODO: Handle nested messages which implement encoding.TextUnmarshaler.
-		return p.readStruct(fv, terminator)
-	case reflect.Uint32:
-		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
-			fv.SetUint(x)
-			return nil
-		}
-	case reflect.Uint64:
-		if x, err := strconv.ParseUint(tok.value, 0, 64); err == nil {
-			fv.SetUint(x)
-			return nil
-		}
-	}
-	return p.errorf("invalid %v: %v", v.Type(), tok.value)
-}
-
-// UnmarshalText reads a protocol buffer in Text format. UnmarshalText resets pb
-// before starting to unmarshal, so any existing data in pb is always removed.
-// If a required field is not set and no other error occurs,
-// UnmarshalText returns *RequiredNotSetError.
-func UnmarshalText(s string, pb Message) error {
-	if um, ok := pb.(encoding.TextUnmarshaler); ok {
-		err := um.UnmarshalText([]byte(s))
-		return err
-	}
-	pb.Reset()
-	v := reflect.ValueOf(pb)
-	if pe := newTextParser(s).readStruct(v.Elem(), ""); pe != nil {
-		return pe
-	}
-	return nil
-}
diff --git a/vendor/github.com/google/go-github/LICENSE b/vendor/github.com/google/go-github/LICENSE
deleted file mode 100644
index 53d5374a71..0000000000
--- a/vendor/github.com/google/go-github/LICENSE
+++ /dev/null
@@ -1,341 +0,0 @@
-Copyright (c) 2013 The go-github AUTHORS. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------
-
-Some documentation is taken from the GitHub Developer site
-<https://developer.github.com/>, which is available under the following Creative
-Commons Attribution 3.0 License. This applies only to the go-github source
-code and would not apply to any compiled binaries.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
-BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
-CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-CONDITIONS.
-
-1. Definitions
-
- a. "Adaptation" means a work based upon the Work, or upon the Work and
-    other pre-existing works, such as a translation, adaptation,
-    derivative work, arrangement of music or other alterations of a
-    literary or artistic work, or phonogram or performance and includes
-    cinematographic adaptations or any other form in which the Work may be
-    recast, transformed, or adapted including in any form recognizably
-    derived from the original, except that a work that constitutes a
-    Collection will not be considered an Adaptation for the purpose of
-    this License. For the avoidance of doubt, where the Work is a musical
-    work, performance or phonogram, the synchronization of the Work in
-    timed-relation with a moving image ("synching") will be considered an
-    Adaptation for the purpose of this License.
- b. "Collection" means a collection of literary or artistic works, such as
-    encyclopedias and anthologies, or performances, phonograms or
-    broadcasts, or other works or subject matter other than works listed
-    in Section 1(f) below, which, by reason of the selection and
-    arrangement of their contents, constitute intellectual creations, in
-    which the Work is included in its entirety in unmodified form along
-    with one or more other contributions, each constituting separate and
-    independent works in themselves, which together are assembled into a
-    collective whole. A work that constitutes a Collection will not be
-    considered an Adaptation (as defined above) for the purposes of this
-    License.
- c. "Distribute" means to make available to the public the original and
-    copies of the Work or Adaptation, as appropriate, through sale or
-    other transfer of ownership.
- d. "Licensor" means the individual, individuals, entity or entities that
-    offer(s) the Work under the terms of this License.
- e. "Original Author" means, in the case of a literary or artistic work,
-    the individual, individuals, entity or entities who created the Work
-    or if no individual or entity can be identified, the publisher; and in
-    addition (i) in the case of a performance the actors, singers,
-    musicians, dancers, and other persons who act, sing, deliver, declaim,
-    play in, interpret or otherwise perform literary or artistic works or
-    expressions of folklore; (ii) in the case of a phonogram the producer
-    being the person or legal entity who first fixes the sounds of a
-    performance or other sounds; and, (iii) in the case of broadcasts, the
-    organization that transmits the broadcast.
- f. "Work" means the literary and/or artistic work offered under the terms
-    of this License including without limitation any production in the
-    literary, scientific and artistic domain, whatever may be the mode or
-    form of its expression including digital form, such as a book,
-    pamphlet and other writing; a lecture, address, sermon or other work
-    of the same nature; a dramatic or dramatico-musical work; a
-    choreographic work or entertainment in dumb show; a musical
-    composition with or without words; a cinematographic work to which are
-    assimilated works expressed by a process analogous to cinematography;
-    a work of drawing, painting, architecture, sculpture, engraving or
-    lithography; a photographic work to which are assimilated works
-    expressed by a process analogous to photography; a work of applied
-    art; an illustration, map, plan, sketch or three-dimensional work
-    relative to geography, topography, architecture or science; a
-    performance; a broadcast; a phonogram; a compilation of data to the
-    extent it is protected as a copyrightable work; or a work performed by
-    a variety or circus performer to the extent it is not otherwise
-    considered a literary or artistic work.
- g. "You" means an individual or entity exercising rights under this
-    License who has not previously violated the terms of this License with
-    respect to the Work, or who has received express permission from the
-    Licensor to exercise rights under this License despite a previous
-    violation.
- h. "Publicly Perform" means to perform public recitations of the Work and
-    to communicate to the public those public recitations, by any means or
-    process, including by wire or wireless means or public digital
-    performances; to make available to the public Works in such a way that
-    members of the public may access these Works from a place and at a
-    place individually chosen by them; to perform the Work to the public
-    by any means or process and the communication to the public of the
-    performances of the Work, including by public digital performance; to
-    broadcast and rebroadcast the Work by any means including signs,
-    sounds or images.
- i. "Reproduce" means to make copies of the Work by any means including
-    without limitation by sound or visual recordings and the right of
-    fixation and reproducing fixations of the Work, including storage of a
-    protected performance or phonogram in digital form or other electronic
-    medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce,
-limit, or restrict any uses free from copyright or rights arising from
-limitations or exceptions that are provided for in connection with the
-copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License,
-Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-perpetual (for the duration of the applicable copyright) license to
-exercise the rights in the Work as stated below:
-
- a. to Reproduce the Work, to incorporate the Work into one or more
-    Collections, and to Reproduce the Work as incorporated in the
-    Collections;
- b. to create and Reproduce Adaptations provided that any such Adaptation,
-    including any translation in any medium, takes reasonable steps to
-    clearly label, demarcate or otherwise identify that changes were made
-    to the original Work. For example, a translation could be marked "The
-    original work was translated from English to Spanish," or a
-    modification could indicate "The original work has been modified.";
- c. to Distribute and Publicly Perform the Work including as incorporated
-    in Collections; and,
- d. to Distribute and Publicly Perform Adaptations.
- e. For the avoidance of doubt:
-
-     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
-        which the right to collect royalties through any statutory or
-        compulsory licensing scheme cannot be waived, the Licensor
-        reserves the exclusive right to collect such royalties for any
-        exercise by You of the rights granted under this License;
-    ii. Waivable Compulsory License Schemes. In those jurisdictions in
-        which the right to collect royalties through any statutory or
-        compulsory licensing scheme can be waived, the Licensor waives the
-        exclusive right to collect such royalties for any exercise by You
-        of the rights granted under this License; and,
-   iii. Voluntary License Schemes. The Licensor waives the right to
-        collect royalties, whether individually or, in the event that the
-        Licensor is a member of a collecting society that administers
-        voluntary licensing schemes, via that society, from any exercise
-        by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now
-known or hereafter devised. The above rights include the right to make
-such modifications as are technically necessary to exercise the rights in
-other media and formats. Subject to Section 8(f), all rights not expressly
-granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made
-subject to and limited by the following restrictions:
-
- a. You may Distribute or Publicly Perform the Work only under the terms
-    of this License. You must include a copy of, or the Uniform Resource
-    Identifier (URI) for, this License with every copy of the Work You
-    Distribute or Publicly Perform. You may not offer or impose any terms
-    on the Work that restrict the terms of this License or the ability of
-    the recipient of the Work to exercise the rights granted to that
-    recipient under the terms of the License. You may not sublicense the
-    Work. You must keep intact all notices that refer to this License and
-    to the disclaimer of warranties with every copy of the Work You
-    Distribute or Publicly Perform. When You Distribute or Publicly
-    Perform the Work, You may not impose any effective technological
-    measures on the Work that restrict the ability of a recipient of the
-    Work from You to exercise the rights granted to that recipient under
-    the terms of the License. This Section 4(a) applies to the Work as
-    incorporated in a Collection, but this does not require the Collection
-    apart from the Work itself to be made subject to the terms of this
-    License. If You create a Collection, upon notice from any Licensor You
-    must, to the extent practicable, remove from the Collection any credit
-    as required by Section 4(b), as requested. If You create an
-    Adaptation, upon notice from any Licensor You must, to the extent
-    practicable, remove from the Adaptation any credit as required by
-    Section 4(b), as requested.
- b. If You Distribute, or Publicly Perform the Work or any Adaptations or
-    Collections, You must, unless a request has been made pursuant to
-    Section 4(a), keep intact all copyright notices for the Work and
-    provide, reasonable to the medium or means You are utilizing: (i) the
-    name of the Original Author (or pseudonym, if applicable) if supplied,
-    and/or if the Original Author and/or Licensor designate another party
-    or parties (e.g., a sponsor institute, publishing entity, journal) for
-    attribution ("Attribution Parties") in Licensor's copyright notice,
-    terms of service or by other reasonable means, the name of such party
-    or parties; (ii) the title of the Work if supplied; (iii) to the
-    extent reasonably practicable, the URI, if any, that Licensor
-    specifies to be associated with the Work, unless such URI does not
-    refer to the copyright notice or licensing information for the Work;
-    and (iv) , consistent with Section 3(b), in the case of an Adaptation,
-    a credit identifying the use of the Work in the Adaptation (e.g.,
-    "French translation of the Work by Original Author," or "Screenplay
-    based on original Work by Original Author"). The credit required by
-    this Section 4 (b) may be implemented in any reasonable manner;
-    provided, however, that in the case of a Adaptation or Collection, at
-    a minimum such credit will appear, if a credit for all contributing
-    authors of the Adaptation or Collection appears, then as part of these
-    credits and in a manner at least as prominent as the credits for the
-    other contributing authors. For the avoidance of doubt, You may only
-    use the credit required by this Section for the purpose of attribution
-    in the manner set out above and, by exercising Your rights under this
-    License, You may not implicitly or explicitly assert or imply any
-    connection with, sponsorship or endorsement by the Original Author,
-    Licensor and/or Attribution Parties, as appropriate, of You or Your
-    use of the Work, without the separate, express prior written
-    permission of the Original Author, Licensor and/or Attribution
-    Parties.
- c. Except as otherwise agreed in writing by the Licensor or as may be
-    otherwise permitted by applicable law, if You Reproduce, Distribute or
-    Publicly Perform the Work either by itself or as part of any
-    Adaptations or Collections, You must not distort, mutilate, modify or
-    take other derogatory action in relation to the Work which would be
-    prejudicial to the Original Author's honor or reputation. Licensor
-    agrees that in those jurisdictions (e.g. Japan), in which any exercise
-    of the right granted in Section 3(b) of this License (the right to
-    make Adaptations) would be deemed to be a distortion, mutilation,
-    modification or other derogatory action prejudicial to the Original
-    Author's honor and reputation, the Licensor will waive or not assert,
-    as appropriate, this Section, to the fullest extent permitted by the
-    applicable national law, to enable You to reasonably exercise Your
-    right under Section 3(b) of this License (right to make Adaptations)
-    but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
-OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
-KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
-LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
-WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
-OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
-LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
-ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
-ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
- a. This License and the rights granted hereunder will terminate
-    automatically upon any breach by You of the terms of this License.
-    Individuals or entities who have received Adaptations or Collections
-    from You under this License, however, will not have their licenses
-    terminated provided such individuals or entities remain in full
-    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
-    survive any termination of this License.
- b. Subject to the above terms and conditions, the license granted here is
-    perpetual (for the duration of the applicable copyright in the Work).
-    Notwithstanding the above, Licensor reserves the right to release the
-    Work under different license terms or to stop distributing the Work at
-    any time; provided, however that any such election will not serve to
-    withdraw this License (or any other license that has been, or is
-    required to be, granted under the terms of this License), and this
-    License will continue in full force and effect unless terminated as
-    stated above.
-
-8. Miscellaneous
-
- a. Each time You Distribute or Publicly Perform the Work or a Collection,
-    the Licensor offers to the recipient a license to the Work on the same
-    terms and conditions as the license granted to You under this License.
- b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
-    offers to the recipient a license to the original Work on the same
-    terms and conditions as the license granted to You under this License.
- c. If any provision of this License is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this License, and without further action
-    by the parties to this agreement, such provision shall be reformed to
-    the minimum extent necessary to make such provision valid and
-    enforceable.
- d. No term or provision of this License shall be deemed waived and no
-    breach consented to unless such waiver or consent shall be in writing
-    and signed by the party to be charged with such waiver or consent.
- e. This License constitutes the entire agreement between the parties with
-    respect to the Work licensed here. There are no understandings,
-    agreements or representations with respect to the Work not specified
-    here. Licensor shall not be bound by any additional provisions that
-    may appear in any communication from You. This License may not be
-    modified without the mutual written agreement of the Licensor and You.
- f. The rights granted under, and the subject matter referenced, in this
-    License were drafted utilizing the terminology of the Berne Convention
-    for the Protection of Literary and Artistic Works (as amended on
-    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
-    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
-    and the Universal Copyright Convention (as revised on July 24, 1971).
-    These rights and subject matter take effect in the relevant
-    jurisdiction in which the License terms are sought to be enforced
-    according to the corresponding provisions of the implementation of
-    those treaty provisions in the applicable national law. If the
-    standard suite of rights granted under applicable copyright law
-    includes additional rights not granted under this License, such
-    additional rights are deemed to be included in the License; this
-    License is not intended to restrict the license of any rights under
-    applicable law.
-
-
-Creative Commons Notice
-
-    Creative Commons is not a party to this License, and makes no warranty
-    whatsoever in connection with the Work. Creative Commons will not be
-    liable to You or any party on any legal theory for any damages
-    whatsoever, including without limitation any general, special,
-    incidental or consequential damages arising in connection to this
-    license. Notwithstanding the foregoing two (2) sentences, if Creative
-    Commons has expressly identified itself as the Licensor hereunder, it
-    shall have all rights and obligations of Licensor.
-
-    Except for the limited purpose of indicating to the public that the
-    Work is licensed under the CCPL, Creative Commons does not authorize
-    the use by either party of the trademark "Creative Commons" or any
-    related trademark or logo of Creative Commons without the prior
-    written consent of Creative Commons. Any permitted use will be in
-    compliance with Creative Commons' then-current trademark usage
-    guidelines, as may be published on its website or otherwise made
-    available upon request from time to time. For the avoidance of doubt,
-    this trademark restriction does not form part of this License.
-
-    Creative Commons may be contacted at http://creativecommons.org/.
diff --git a/vendor/github.com/google/go-github/github/activity.go b/vendor/github.com/google/go-github/github/activity.go
deleted file mode 100644
index d6c992c7f5..0000000000
--- a/vendor/github.com/google/go-github/github/activity.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import "context"
-
-// ActivityService handles communication with the activity related
-// methods of the GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/
-type ActivityService service
-
-// FeedLink represents a link to a related resource.
-type FeedLink struct {
-	HRef *string `json:"href,omitempty"`
-	Type *string `json:"type,omitempty"`
-}
-
-// Feeds represents timeline resources in Atom format.
-type Feeds struct {
-	TimelineURL                 *string  `json:"timeline_url,omitempty"`
-	UserURL                     *string  `json:"user_url,omitempty"`
-	CurrentUserPublicURL        *string  `json:"current_user_public_url,omitempty"`
-	CurrentUserURL              *string  `json:"current_user_url,omitempty"`
-	CurrentUserActorURL         *string  `json:"current_user_actor_url,omitempty"`
-	CurrentUserOrganizationURL  *string  `json:"current_user_organization_url,omitempty"`
-	CurrentUserOrganizationURLs []string `json:"current_user_organization_urls,omitempty"`
-	Links                       *struct {
-		Timeline                 *FeedLink  `json:"timeline,omitempty"`
-		User                     *FeedLink  `json:"user,omitempty"`
-		CurrentUserPublic        *FeedLink  `json:"current_user_public,omitempty"`
-		CurrentUser              *FeedLink  `json:"current_user,omitempty"`
-		CurrentUserActor         *FeedLink  `json:"current_user_actor,omitempty"`
-		CurrentUserOrganization  *FeedLink  `json:"current_user_organization,omitempty"`
-		CurrentUserOrganizations []FeedLink `json:"current_user_organizations,omitempty"`
-	} `json:"_links,omitempty"`
-}
-
-// ListFeeds lists all the feeds available to the authenticated user.
-//
-// GitHub provides several timeline resources in Atom format:
-//     Timeline: The GitHub global public timeline
-//     User: The public timeline for any user, using URI template
-//     Current user public: The public timeline for the authenticated user
-//     Current user: The private timeline for the authenticated user
-//     Current user actor: The private timeline for activity created by the
-//         authenticated user
-//     Current user organizations: The private timeline for the organizations
-//         the authenticated user is a member of.
-//
-// Note: Private feeds are only returned when authenticating via Basic Auth
-// since current feed URIs use the older, non revocable auth tokens.
-func (s *ActivityService) ListFeeds(ctx context.Context) (*Feeds, *Response, error) {
-	req, err := s.client.NewRequest("GET", "feeds", nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	f := &Feeds{}
-	resp, err := s.client.Do(ctx, req, f)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return f, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/activity_events.go b/vendor/github.com/google/go-github/github/activity_events.go
deleted file mode 100644
index 6b35056f40..0000000000
--- a/vendor/github.com/google/go-github/github/activity_events.go
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"time"
-)
-
-// Event represents a GitHub event.
-type Event struct {
-	Type       *string          `json:"type,omitempty"`
-	Public     *bool            `json:"public"`
-	RawPayload *json.RawMessage `json:"payload,omitempty"`
-	Repo       *Repository      `json:"repo,omitempty"`
-	Actor      *User            `json:"actor,omitempty"`
-	Org        *Organization    `json:"org,omitempty"`
-	CreatedAt  *time.Time       `json:"created_at,omitempty"`
-	ID         *string          `json:"id,omitempty"`
-}
-
-func (e Event) String() string {
-	return Stringify(e)
-}
-
-// ParsePayload parses the event payload. For recognized event types,
-// a value of the corresponding struct type will be returned.
-func (e *Event) ParsePayload() (payload interface{}, err error) {
-	switch *e.Type {
-	case "CommitCommentEvent":
-		payload = &CommitCommentEvent{}
-	case "CreateEvent":
-		payload = &CreateEvent{}
-	case "DeleteEvent":
-		payload = &DeleteEvent{}
-	case "DeploymentEvent":
-		payload = &DeploymentEvent{}
-	case "DeploymentStatusEvent":
-		payload = &DeploymentStatusEvent{}
-	case "ForkEvent":
-		payload = &ForkEvent{}
-	case "GollumEvent":
-		payload = &GollumEvent{}
-	case "InstallationEvent":
-		payload = &InstallationEvent{}
-	case "InstallationRepositoriesEvent":
-		payload = &InstallationRepositoriesEvent{}
-	case "IssueCommentEvent":
-		payload = &IssueCommentEvent{}
-	case "IssuesEvent":
-		payload = &IssuesEvent{}
-	case "LabelEvent":
-		payload = &LabelEvent{}
-	case "MemberEvent":
-		payload = &MemberEvent{}
-	case "MembershipEvent":
-		payload = &MembershipEvent{}
-	case "MilestoneEvent":
-		payload = &MilestoneEvent{}
-	case "OrganizationEvent":
-		payload = &OrganizationEvent{}
-	case "OrgBlockEvent":
-		payload = &OrgBlockEvent{}
-	case "PageBuildEvent":
-		payload = &PageBuildEvent{}
-	case "PingEvent":
-		payload = &PingEvent{}
-	case "ProjectEvent":
-		payload = &ProjectEvent{}
-	case "ProjectCardEvent":
-		payload = &ProjectCardEvent{}
-	case "ProjectColumnEvent":
-		payload = &ProjectColumnEvent{}
-	case "PublicEvent":
-		payload = &PublicEvent{}
-	case "PullRequestEvent":
-		payload = &PullRequestEvent{}
-	case "PullRequestReviewEvent":
-		payload = &PullRequestReviewEvent{}
-	case "PullRequestReviewCommentEvent":
-		payload = &PullRequestReviewCommentEvent{}
-	case "PushEvent":
-		payload = &PushEvent{}
-	case "ReleaseEvent":
-		payload = &ReleaseEvent{}
-	case "RepositoryEvent":
-		payload = &RepositoryEvent{}
-	case "StatusEvent":
-		payload = &StatusEvent{}
-	case "TeamEvent":
-		payload = &TeamEvent{}
-	case "TeamAddEvent":
-		payload = &TeamAddEvent{}
-	case "WatchEvent":
-		payload = &WatchEvent{}
-	}
-	err = json.Unmarshal(*e.RawPayload, &payload)
-	return payload, err
-}
-
-// Payload returns the parsed event payload. For recognized event types,
-// a value of the corresponding struct type will be returned.
-//
-// Deprecated: Use ParsePayload instead, which returns an error
-// rather than panics if JSON unmarshaling raw payload fails.
-func (e *Event) Payload() (payload interface{}) {
-	var err error
-	payload, err = e.ParsePayload()
-	if err != nil {
-		panic(err)
-	}
-	return payload
-}
-
-// ListEvents drinks from the firehose of all public events across GitHub.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/#list-public-events
-func (s *ActivityService) ListEvents(ctx context.Context, opt *ListOptions) ([]*Event, *Response, error) {
-	u, err := addOptions("events", opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var events []*Event
-	resp, err := s.client.Do(ctx, req, &events)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return events, resp, nil
-}
-
-// ListRepositoryEvents lists events for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/#list-repository-events
-func (s *ActivityService) ListRepositoryEvents(ctx context.Context, owner, repo string, opt *ListOptions) ([]*Event, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/events", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var events []*Event
-	resp, err := s.client.Do(ctx, req, &events)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return events, resp, nil
-}
-
-// ListIssueEventsForRepository lists issue events for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/#list-issue-events-for-a-repository
-func (s *ActivityService) ListIssueEventsForRepository(ctx context.Context, owner, repo string, opt *ListOptions) ([]*IssueEvent, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/events", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var events []*IssueEvent
-	resp, err := s.client.Do(ctx, req, &events)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return events, resp, nil
-}
-
-// ListEventsForRepoNetwork lists public events for a network of repositories.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/#list-public-events-for-a-network-of-repositories
-func (s *ActivityService) ListEventsForRepoNetwork(ctx context.Context, owner, repo string, opt *ListOptions) ([]*Event, *Response, error) {
-	u := fmt.Sprintf("networks/%v/%v/events", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var events []*Event
-	resp, err := s.client.Do(ctx, req, &events)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return events, resp, nil
-}
-
-// ListEventsForOrganization lists public events for an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/#list-public-events-for-an-organization
-func (s *ActivityService) ListEventsForOrganization(ctx context.Context, org string, opt *ListOptions) ([]*Event, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/events", org)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var events []*Event
-	resp, err := s.client.Do(ctx, req, &events)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return events, resp, nil
-}
-
-// ListEventsPerformedByUser lists the events performed by a user. If publicOnly is
-// true, only public events will be returned.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/#list-events-performed-by-a-user
-func (s *ActivityService) ListEventsPerformedByUser(ctx context.Context, user string, publicOnly bool, opt *ListOptions) ([]*Event, *Response, error) {
-	var u string
-	if publicOnly {
-		u = fmt.Sprintf("users/%v/events/public", user)
-	} else {
-		u = fmt.Sprintf("users/%v/events", user)
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var events []*Event
-	resp, err := s.client.Do(ctx, req, &events)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return events, resp, nil
-}
-
-// ListEventsReceivedByUser lists the events received by a user. If publicOnly is
-// true, only public events will be returned.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/#list-events-that-a-user-has-received
-func (s *ActivityService) ListEventsReceivedByUser(ctx context.Context, user string, publicOnly bool, opt *ListOptions) ([]*Event, *Response, error) {
-	var u string
-	if publicOnly {
-		u = fmt.Sprintf("users/%v/received_events/public", user)
-	} else {
-		u = fmt.Sprintf("users/%v/received_events", user)
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var events []*Event
-	resp, err := s.client.Do(ctx, req, &events)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return events, resp, nil
-}
-
-// ListUserEventsForOrganization provides the user’s organization dashboard. You
-// must be authenticated as the user to view this.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/#list-events-for-an-organization
-func (s *ActivityService) ListUserEventsForOrganization(ctx context.Context, org, user string, opt *ListOptions) ([]*Event, *Response, error) {
-	u := fmt.Sprintf("users/%v/events/orgs/%v", user, org)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var events []*Event
-	resp, err := s.client.Do(ctx, req, &events)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return events, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/activity_notifications.go b/vendor/github.com/google/go-github/github/activity_notifications.go
deleted file mode 100644
index 45c8b2aece..0000000000
--- a/vendor/github.com/google/go-github/github/activity_notifications.go
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright 2014 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// Notification identifies a GitHub notification for a user.
-type Notification struct {
-	ID         *string              `json:"id,omitempty"`
-	Repository *Repository          `json:"repository,omitempty"`
-	Subject    *NotificationSubject `json:"subject,omitempty"`
-
-	// Reason identifies the event that triggered the notification.
-	//
-	// GitHub API docs: https://developer.github.com/v3/activity/notifications/#notification-reasons
-	Reason *string `json:"reason,omitempty"`
-
-	Unread     *bool      `json:"unread,omitempty"`
-	UpdatedAt  *time.Time `json:"updated_at,omitempty"`
-	LastReadAt *time.Time `json:"last_read_at,omitempty"`
-	URL        *string    `json:"url,omitempty"`
-}
-
-// NotificationSubject identifies the subject of a notification.
-type NotificationSubject struct {
-	Title            *string `json:"title,omitempty"`
-	URL              *string `json:"url,omitempty"`
-	LatestCommentURL *string `json:"latest_comment_url,omitempty"`
-	Type             *string `json:"type,omitempty"`
-}
-
-// NotificationListOptions specifies the optional parameters to the
-// ActivityService.ListNotifications method.
-type NotificationListOptions struct {
-	All           bool      `url:"all,omitempty"`
-	Participating bool      `url:"participating,omitempty"`
-	Since         time.Time `url:"since,omitempty"`
-	Before        time.Time `url:"before,omitempty"`
-
-	ListOptions
-}
-
-// ListNotifications lists all notifications for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/notifications/#list-your-notifications
-func (s *ActivityService) ListNotifications(ctx context.Context, opt *NotificationListOptions) ([]*Notification, *Response, error) {
-	u := fmt.Sprintf("notifications")
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var notifications []*Notification
-	resp, err := s.client.Do(ctx, req, &notifications)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return notifications, resp, nil
-}
-
-// ListRepositoryNotifications lists all notifications in a given repository
-// for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/notifications/#list-your-notifications-in-a-repository
-func (s *ActivityService) ListRepositoryNotifications(ctx context.Context, owner, repo string, opt *NotificationListOptions) ([]*Notification, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/notifications", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var notifications []*Notification
-	resp, err := s.client.Do(ctx, req, &notifications)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return notifications, resp, nil
-}
-
-type markReadOptions struct {
-	LastReadAt time.Time `json:"last_read_at,omitempty"`
-}
-
-// MarkNotificationsRead marks all notifications up to lastRead as read.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/notifications/#mark-as-read
-func (s *ActivityService) MarkNotificationsRead(ctx context.Context, lastRead time.Time) (*Response, error) {
-	opts := &markReadOptions{
-		LastReadAt: lastRead,
-	}
-	req, err := s.client.NewRequest("PUT", "notifications", opts)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// MarkRepositoryNotificationsRead marks all notifications up to lastRead in
-// the specified repository as read.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/notifications/#mark-notifications-as-read-in-a-repository
-func (s *ActivityService) MarkRepositoryNotificationsRead(ctx context.Context, owner, repo string, lastRead time.Time) (*Response, error) {
-	opts := &markReadOptions{
-		LastReadAt: lastRead,
-	}
-	u := fmt.Sprintf("repos/%v/%v/notifications", owner, repo)
-	req, err := s.client.NewRequest("PUT", u, opts)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// GetThread gets the specified notification thread.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/notifications/#view-a-single-thread
-func (s *ActivityService) GetThread(ctx context.Context, id string) (*Notification, *Response, error) {
-	u := fmt.Sprintf("notifications/threads/%v", id)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	notification := new(Notification)
-	resp, err := s.client.Do(ctx, req, notification)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return notification, resp, nil
-}
-
-// MarkThreadRead marks the specified thread as read.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/notifications/#mark-a-thread-as-read
-func (s *ActivityService) MarkThreadRead(ctx context.Context, id string) (*Response, error) {
-	u := fmt.Sprintf("notifications/threads/%v", id)
-
-	req, err := s.client.NewRequest("PATCH", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// GetThreadSubscription checks to see if the authenticated user is subscribed
-// to a thread.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/notifications/#get-a-thread-subscription
-func (s *ActivityService) GetThreadSubscription(ctx context.Context, id string) (*Subscription, *Response, error) {
-	u := fmt.Sprintf("notifications/threads/%v/subscription", id)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	sub := new(Subscription)
-	resp, err := s.client.Do(ctx, req, sub)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return sub, resp, nil
-}
-
-// SetThreadSubscription sets the subscription for the specified thread for the
-// authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/notifications/#set-a-thread-subscription
-func (s *ActivityService) SetThreadSubscription(ctx context.Context, id string, subscription *Subscription) (*Subscription, *Response, error) {
-	u := fmt.Sprintf("notifications/threads/%v/subscription", id)
-
-	req, err := s.client.NewRequest("PUT", u, subscription)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	sub := new(Subscription)
-	resp, err := s.client.Do(ctx, req, sub)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return sub, resp, nil
-}
-
-// DeleteThreadSubscription deletes the subscription for the specified thread
-// for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/notifications/#delete-a-thread-subscription
-func (s *ActivityService) DeleteThreadSubscription(ctx context.Context, id string) (*Response, error) {
-	u := fmt.Sprintf("notifications/threads/%v/subscription", id)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/activity_star.go b/vendor/github.com/google/go-github/github/activity_star.go
deleted file mode 100644
index d5b067127c..0000000000
--- a/vendor/github.com/google/go-github/github/activity_star.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// StarredRepository is returned by ListStarred.
-type StarredRepository struct {
-	StarredAt  *Timestamp  `json:"starred_at,omitempty"`
-	Repository *Repository `json:"repo,omitempty"`
-}
-
-// Stargazer represents a user that has starred a repository.
-type Stargazer struct {
-	StarredAt *Timestamp `json:"starred_at,omitempty"`
-	User      *User      `json:"user,omitempty"`
-}
-
-// ListStargazers lists people who have starred the specified repo.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/starring/#list-stargazers
-func (s *ActivityService) ListStargazers(ctx context.Context, owner, repo string, opt *ListOptions) ([]*Stargazer, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/stargazers", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeStarringPreview)
-
-	var stargazers []*Stargazer
-	resp, err := s.client.Do(ctx, req, &stargazers)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return stargazers, resp, nil
-}
-
-// ActivityListStarredOptions specifies the optional parameters to the
-// ActivityService.ListStarred method.
-type ActivityListStarredOptions struct {
-	// How to sort the repository list. Possible values are: created, updated,
-	// pushed, full_name. Default is "full_name".
-	Sort string `url:"sort,omitempty"`
-
-	// Direction in which to sort repositories. Possible values are: asc, desc.
-	// Default is "asc" when sort is "full_name", otherwise default is "desc".
-	Direction string `url:"direction,omitempty"`
-
-	ListOptions
-}
-
-// ListStarred lists all the repos starred by a user. Passing the empty string
-// will list the starred repositories for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/starring/#list-repositories-being-starred
-func (s *ActivityService) ListStarred(ctx context.Context, user string, opt *ActivityListStarredOptions) ([]*StarredRepository, *Response, error) {
-	var u string
-	if user != "" {
-		u = fmt.Sprintf("users/%v/starred", user)
-	} else {
-		u = "user/starred"
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeStarringPreview)
-
-	var repos []*StarredRepository
-	resp, err := s.client.Do(ctx, req, &repos)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return repos, resp, nil
-}
-
-// IsStarred checks if a repository is starred by authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/starring/#check-if-you-are-starring-a-repository
-func (s *ActivityService) IsStarred(ctx context.Context, owner, repo string) (bool, *Response, error) {
-	u := fmt.Sprintf("user/starred/%v/%v", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return false, nil, err
-	}
-	resp, err := s.client.Do(ctx, req, nil)
-	starred, err := parseBoolResponse(err)
-	return starred, resp, err
-}
-
-// Star a repository as the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/starring/#star-a-repository
-func (s *ActivityService) Star(ctx context.Context, owner, repo string) (*Response, error) {
-	u := fmt.Sprintf("user/starred/%v/%v", owner, repo)
-	req, err := s.client.NewRequest("PUT", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
-
-// Unstar a repository as the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/starring/#unstar-a-repository
-func (s *ActivityService) Unstar(ctx context.Context, owner, repo string) (*Response, error) {
-	u := fmt.Sprintf("user/starred/%v/%v", owner, repo)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/activity_watching.go b/vendor/github.com/google/go-github/github/activity_watching.go
deleted file mode 100644
index c749ca86e7..0000000000
--- a/vendor/github.com/google/go-github/github/activity_watching.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2014 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// Subscription identifies a repository or thread subscription.
-type Subscription struct {
-	Subscribed *bool      `json:"subscribed,omitempty"`
-	Ignored    *bool      `json:"ignored,omitempty"`
-	Reason     *string    `json:"reason,omitempty"`
-	CreatedAt  *Timestamp `json:"created_at,omitempty"`
-	URL        *string    `json:"url,omitempty"`
-
-	// only populated for repository subscriptions
-	RepositoryURL *string `json:"repository_url,omitempty"`
-
-	// only populated for thread subscriptions
-	ThreadURL *string `json:"thread_url,omitempty"`
-}
-
-// ListWatchers lists watchers of a particular repo.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/watching/#list-watchers
-func (s *ActivityService) ListWatchers(ctx context.Context, owner, repo string, opt *ListOptions) ([]*User, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/subscribers", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var watchers []*User
-	resp, err := s.client.Do(ctx, req, &watchers)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return watchers, resp, nil
-}
-
-// ListWatched lists the repositories the specified user is watching. Passing
-// the empty string will fetch watched repos for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/watching/#list-repositories-being-watched
-func (s *ActivityService) ListWatched(ctx context.Context, user string, opt *ListOptions) ([]*Repository, *Response, error) {
-	var u string
-	if user != "" {
-		u = fmt.Sprintf("users/%v/subscriptions", user)
-	} else {
-		u = "user/subscriptions"
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var watched []*Repository
-	resp, err := s.client.Do(ctx, req, &watched)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return watched, resp, nil
-}
-
-// GetRepositorySubscription returns the subscription for the specified
-// repository for the authenticated user. If the authenticated user is not
-// watching the repository, a nil Subscription is returned.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/watching/#get-a-repository-subscription
-func (s *ActivityService) GetRepositorySubscription(ctx context.Context, owner, repo string) (*Subscription, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/subscription", owner, repo)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	sub := new(Subscription)
-	resp, err := s.client.Do(ctx, req, sub)
-	if err != nil {
-		// if it's just a 404, don't return that as an error
-		_, err = parseBoolResponse(err)
-		return nil, resp, err
-	}
-
-	return sub, resp, nil
-}
-
-// SetRepositorySubscription sets the subscription for the specified repository
-// for the authenticated user.
-//
-// To watch a repository, set subscription.Subscribed to true.
-// To ignore notifications made within a repository, set subscription.Ignored to true.
-// To stop watching a repository, use DeleteRepositorySubscription.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/watching/#set-a-repository-subscription
-func (s *ActivityService) SetRepositorySubscription(ctx context.Context, owner, repo string, subscription *Subscription) (*Subscription, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/subscription", owner, repo)
-
-	req, err := s.client.NewRequest("PUT", u, subscription)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	sub := new(Subscription)
-	resp, err := s.client.Do(ctx, req, sub)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return sub, resp, nil
-}
-
-// DeleteRepositorySubscription deletes the subscription for the specified
-// repository for the authenticated user.
-//
-// This is used to stop watching a repository. To control whether or not to
-// receive notifications from a repository, use SetRepositorySubscription.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/watching/#delete-a-repository-subscription
-func (s *ActivityService) DeleteRepositorySubscription(ctx context.Context, owner, repo string) (*Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/subscription", owner, repo)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/admin.go b/vendor/github.com/google/go-github/github/admin.go
deleted file mode 100644
index d0f055bcfa..0000000000
--- a/vendor/github.com/google/go-github/github/admin.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// AdminService handles communication with the admin related methods of the
-// GitHub API. These API routes are normally only accessible for GitHub
-// Enterprise installations.
-//
-// GitHub API docs: https://developer.github.com/v3/enterprise/
-type AdminService service
-
-// TeamLDAPMapping represents the mapping between a GitHub team and an LDAP group.
-type TeamLDAPMapping struct {
-	ID          *int    `json:"id,omitempty"`
-	LDAPDN      *string `json:"ldap_dn,omitempty"`
-	URL         *string `json:"url,omitempty"`
-	Name        *string `json:"name,omitempty"`
-	Slug        *string `json:"slug,omitempty"`
-	Description *string `json:"description,omitempty"`
-	Privacy     *string `json:"privacy,omitempty"`
-	Permission  *string `json:"permission,omitempty"`
-
-	MembersURL      *string `json:"members_url,omitempty"`
-	RepositoriesURL *string `json:"repositories_url,omitempty"`
-}
-
-func (m TeamLDAPMapping) String() string {
-	return Stringify(m)
-}
-
-// UserLDAPMapping represents the mapping between a GitHub user and an LDAP user.
-type UserLDAPMapping struct {
-	ID         *int    `json:"id,omitempty"`
-	LDAPDN     *string `json:"ldap_dn,omitempty"`
-	Login      *string `json:"login,omitempty"`
-	AvatarURL  *string `json:"avatar_url,omitempty"`
-	GravatarID *string `json:"gravatar_id,omitempty"`
-	Type       *string `json:"type,omitempty"`
-	SiteAdmin  *bool   `json:"site_admin,omitempty"`
-
-	URL               *string `json:"url,omitempty"`
-	EventsURL         *string `json:"events_url,omitempty"`
-	FollowingURL      *string `json:"following_url,omitempty"`
-	FollowersURL      *string `json:"followers_url,omitempty"`
-	GistsURL          *string `json:"gists_url,omitempty"`
-	OrganizationsURL  *string `json:"organizations_url,omitempty"`
-	ReceivedEventsURL *string `json:"received_events_url,omitempty"`
-	ReposURL          *string `json:"repos_url,omitempty"`
-	StarredURL        *string `json:"starred_url,omitempty"`
-	SubscriptionsURL  *string `json:"subscriptions_url,omitempty"`
-}
-
-func (m UserLDAPMapping) String() string {
-	return Stringify(m)
-}
-
-// UpdateUserLDAPMapping updates the mapping between a GitHub user and an LDAP user.
-//
-// GitHub API docs: https://developer.github.com/v3/enterprise/ldap/#update-ldap-mapping-for-a-user
-func (s *AdminService) UpdateUserLDAPMapping(ctx context.Context, user string, mapping *UserLDAPMapping) (*UserLDAPMapping, *Response, error) {
-	u := fmt.Sprintf("admin/ldap/users/%v/mapping", user)
-	req, err := s.client.NewRequest("PATCH", u, mapping)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	m := new(UserLDAPMapping)
-	resp, err := s.client.Do(ctx, req, m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// UpdateTeamLDAPMapping updates the mapping between a GitHub team and an LDAP group.
-//
-// GitHub API docs: https://developer.github.com/v3/enterprise/ldap/#update-ldap-mapping-for-a-team
-func (s *AdminService) UpdateTeamLDAPMapping(ctx context.Context, team int, mapping *TeamLDAPMapping) (*TeamLDAPMapping, *Response, error) {
-	u := fmt.Sprintf("admin/ldap/teams/%v/mapping", team)
-	req, err := s.client.NewRequest("PATCH", u, mapping)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	m := new(TeamLDAPMapping)
-	resp, err := s.client.Do(ctx, req, m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/apps.go b/vendor/github.com/google/go-github/github/apps.go
deleted file mode 100644
index ff3389382e..0000000000
--- a/vendor/github.com/google/go-github/github/apps.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import "context"
-
-// AppsService provides access to the installation related functions
-// in the GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/apps/
-type AppsService service
-
-// ListInstallations lists the installations that the current GitHub App has.
-//
-// GitHub API docs: https://developer.github.com/v3/apps/#find-installations
-func (s *AppsService) ListInstallations(ctx context.Context, opt *ListOptions) ([]*Installation, *Response, error) {
-	u, err := addOptions("app/installations", opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeIntegrationPreview)
-
-	var i []*Installation
-	resp, err := s.client.Do(ctx, req, &i)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return i, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/apps_installation.go b/vendor/github.com/google/go-github/github/apps_installation.go
deleted file mode 100644
index 6a27799531..0000000000
--- a/vendor/github.com/google/go-github/github/apps_installation.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import "context"
-
-// Installation represents a GitHub Apps installation.
-type Installation struct {
-	ID              *int    `json:"id,omitempty"`
-	Account         *User   `json:"account,omitempty"`
-	AccessTokensURL *string `json:"access_tokens_url,omitempty"`
-	RepositoriesURL *string `json:"repositories_url,omitempty"`
-	HTMLURL         *string `json:"html_url,omitempty"`
-}
-
-func (i Installation) String() string {
-	return Stringify(i)
-}
-
-// ListRepos lists the repositories that are accessible to the authenticated installation.
-//
-// GitHub API docs: https://developer.github.com/v3/apps/installations/#list-repositories
-func (s *AppsService) ListRepos(ctx context.Context, opt *ListOptions) ([]*Repository, *Response, error) {
-	u, err := addOptions("installation/repositories", opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeIntegrationPreview)
-
-	var r struct {
-		Repositories []*Repository `json:"repositories"`
-	}
-	resp, err := s.client.Do(ctx, req, &r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r.Repositories, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/authorizations.go b/vendor/github.com/google/go-github/github/authorizations.go
deleted file mode 100644
index d87adc0bdc..0000000000
--- a/vendor/github.com/google/go-github/github/authorizations.go
+++ /dev/null
@@ -1,435 +0,0 @@
-// Copyright 2015 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// Scope models a GitHub authorization scope.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth/#scopes
-type Scope string
-
-// This is the set of scopes for GitHub API V3
-const (
-	ScopeNone           Scope = "(no scope)" // REVISIT: is this actually returned, or just a documentation artifact?
-	ScopeUser           Scope = "user"
-	ScopeUserEmail      Scope = "user:email"
-	ScopeUserFollow     Scope = "user:follow"
-	ScopePublicRepo     Scope = "public_repo"
-	ScopeRepo           Scope = "repo"
-	ScopeRepoDeployment Scope = "repo_deployment"
-	ScopeRepoStatus     Scope = "repo:status"
-	ScopeDeleteRepo     Scope = "delete_repo"
-	ScopeNotifications  Scope = "notifications"
-	ScopeGist           Scope = "gist"
-	ScopeReadRepoHook   Scope = "read:repo_hook"
-	ScopeWriteRepoHook  Scope = "write:repo_hook"
-	ScopeAdminRepoHook  Scope = "admin:repo_hook"
-	ScopeAdminOrgHook   Scope = "admin:org_hook"
-	ScopeReadOrg        Scope = "read:org"
-	ScopeWriteOrg       Scope = "write:org"
-	ScopeAdminOrg       Scope = "admin:org"
-	ScopeReadPublicKey  Scope = "read:public_key"
-	ScopeWritePublicKey Scope = "write:public_key"
-	ScopeAdminPublicKey Scope = "admin:public_key"
-	ScopeReadGPGKey     Scope = "read:gpg_key"
-	ScopeWriteGPGKey    Scope = "write:gpg_key"
-	ScopeAdminGPGKey    Scope = "admin:gpg_key"
-)
-
-// AuthorizationsService handles communication with the authorization related
-// methods of the GitHub API.
-//
-// This service requires HTTP Basic Authentication; it cannot be accessed using
-// an OAuth token.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/
-type AuthorizationsService service
-
-// Authorization represents an individual GitHub authorization.
-type Authorization struct {
-	ID             *int              `json:"id,omitempty"`
-	URL            *string           `json:"url,omitempty"`
-	Scopes         []Scope           `json:"scopes,omitempty"`
-	Token          *string           `json:"token,omitempty"`
-	TokenLastEight *string           `json:"token_last_eight,omitempty"`
-	HashedToken    *string           `json:"hashed_token,omitempty"`
-	App            *AuthorizationApp `json:"app,omitempty"`
-	Note           *string           `json:"note,omitempty"`
-	NoteURL        *string           `json:"note_url,omitempty"`
-	UpdateAt       *Timestamp        `json:"updated_at,omitempty"`
-	CreatedAt      *Timestamp        `json:"created_at,omitempty"`
-	Fingerprint    *string           `json:"fingerprint,omitempty"`
-
-	// User is only populated by the Check and Reset methods.
-	User *User `json:"user,omitempty"`
-}
-
-func (a Authorization) String() string {
-	return Stringify(a)
-}
-
-// AuthorizationApp represents an individual GitHub app (in the context of authorization).
-type AuthorizationApp struct {
-	URL      *string `json:"url,omitempty"`
-	Name     *string `json:"name,omitempty"`
-	ClientID *string `json:"client_id,omitempty"`
-}
-
-func (a AuthorizationApp) String() string {
-	return Stringify(a)
-}
-
-// Grant represents an OAuth application that has been granted access to an account.
-type Grant struct {
-	ID        *int              `json:"id,omitempty"`
-	URL       *string           `json:"url,omitempty"`
-	App       *AuthorizationApp `json:"app,omitempty"`
-	CreatedAt *Timestamp        `json:"created_at,omitempty"`
-	UpdatedAt *Timestamp        `json:"updated_at,omitempty"`
-	Scopes    []string          `json:"scopes,omitempty"`
-}
-
-func (g Grant) String() string {
-	return Stringify(g)
-}
-
-// AuthorizationRequest represents a request to create an authorization.
-type AuthorizationRequest struct {
-	Scopes       []Scope `json:"scopes,omitempty"`
-	Note         *string `json:"note,omitempty"`
-	NoteURL      *string `json:"note_url,omitempty"`
-	ClientID     *string `json:"client_id,omitempty"`
-	ClientSecret *string `json:"client_secret,omitempty"`
-	Fingerprint  *string `json:"fingerprint,omitempty"`
-}
-
-func (a AuthorizationRequest) String() string {
-	return Stringify(a)
-}
-
-// AuthorizationUpdateRequest represents a request to update an authorization.
-//
-// Note that for any one update, you must only provide one of the "scopes"
-// fields. That is, you may provide only one of "Scopes", or "AddScopes", or
-// "RemoveScopes".
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/#update-an-existing-authorization
-type AuthorizationUpdateRequest struct {
-	Scopes       []string `json:"scopes,omitempty"`
-	AddScopes    []string `json:"add_scopes,omitempty"`
-	RemoveScopes []string `json:"remove_scopes,omitempty"`
-	Note         *string  `json:"note,omitempty"`
-	NoteURL      *string  `json:"note_url,omitempty"`
-	Fingerprint  *string  `json:"fingerprint,omitempty"`
-}
-
-func (a AuthorizationUpdateRequest) String() string {
-	return Stringify(a)
-}
-
-// List the authorizations for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/#list-your-authorizations
-func (s *AuthorizationsService) List(ctx context.Context, opt *ListOptions) ([]*Authorization, *Response, error) {
-	u := "authorizations"
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var auths []*Authorization
-	resp, err := s.client.Do(ctx, req, &auths)
-	if err != nil {
-		return nil, resp, err
-	}
-	return auths, resp, nil
-}
-
-// Get a single authorization.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/#get-a-single-authorization
-func (s *AuthorizationsService) Get(ctx context.Context, id int) (*Authorization, *Response, error) {
-	u := fmt.Sprintf("authorizations/%d", id)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	a := new(Authorization)
-	resp, err := s.client.Do(ctx, req, a)
-	if err != nil {
-		return nil, resp, err
-	}
-	return a, resp, nil
-}
-
-// Create a new authorization for the specified OAuth application.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/#create-a-new-authorization
-func (s *AuthorizationsService) Create(ctx context.Context, auth *AuthorizationRequest) (*Authorization, *Response, error) {
-	u := "authorizations"
-
-	req, err := s.client.NewRequest("POST", u, auth)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	a := new(Authorization)
-	resp, err := s.client.Do(ctx, req, a)
-	if err != nil {
-		return nil, resp, err
-	}
-	return a, resp, nil
-}
-
-// GetOrCreateForApp creates a new authorization for the specified OAuth
-// application, only if an authorization for that application doesn’t already
-// exist for the user.
-//
-// If a new token is created, the HTTP status code will be "201 Created", and
-// the returned Authorization.Token field will be populated. If an existing
-// token is returned, the status code will be "200 OK" and the
-// Authorization.Token field will be empty.
-//
-// clientID is the OAuth Client ID with which to create the token.
-//
-// GitHub API docs:
-// https://developer.github.com/v3/oauth_authorizations/#get-or-create-an-authorization-for-a-specific-app
-// https://developer.github.com/v3/oauth_authorizations/#get-or-create-an-authorization-for-a-specific-app-and-fingerprint
-func (s *AuthorizationsService) GetOrCreateForApp(ctx context.Context, clientID string, auth *AuthorizationRequest) (*Authorization, *Response, error) {
-	var u string
-	if auth.Fingerprint == nil || *auth.Fingerprint == "" {
-		u = fmt.Sprintf("authorizations/clients/%v", clientID)
-	} else {
-		u = fmt.Sprintf("authorizations/clients/%v/%v", clientID, *auth.Fingerprint)
-	}
-
-	req, err := s.client.NewRequest("PUT", u, auth)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	a := new(Authorization)
-	resp, err := s.client.Do(ctx, req, a)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return a, resp, nil
-}
-
-// Edit a single authorization.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/#update-an-existing-authorization
-func (s *AuthorizationsService) Edit(ctx context.Context, id int, auth *AuthorizationUpdateRequest) (*Authorization, *Response, error) {
-	u := fmt.Sprintf("authorizations/%d", id)
-
-	req, err := s.client.NewRequest("PATCH", u, auth)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	a := new(Authorization)
-	resp, err := s.client.Do(ctx, req, a)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return a, resp, nil
-}
-
-// Delete a single authorization.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/#delete-an-authorization
-func (s *AuthorizationsService) Delete(ctx context.Context, id int) (*Response, error) {
-	u := fmt.Sprintf("authorizations/%d", id)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// Check if an OAuth token is valid for a specific app.
-//
-// Note that this operation requires the use of BasicAuth, but where the
-// username is the OAuth application clientID, and the password is its
-// clientSecret. Invalid tokens will return a 404 Not Found.
-//
-// The returned Authorization.User field will be populated.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/#check-an-authorization
-func (s *AuthorizationsService) Check(ctx context.Context, clientID string, token string) (*Authorization, *Response, error) {
-	u := fmt.Sprintf("applications/%v/tokens/%v", clientID, token)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	a := new(Authorization)
-	resp, err := s.client.Do(ctx, req, a)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return a, resp, nil
-}
-
-// Reset is used to reset a valid OAuth token without end user involvement.
-// Applications must save the "token" property in the response, because changes
-// take effect immediately.
-//
-// Note that this operation requires the use of BasicAuth, but where the
-// username is the OAuth application clientID, and the password is its
-// clientSecret. Invalid tokens will return a 404 Not Found.
-//
-// The returned Authorization.User field will be populated.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/#reset-an-authorization
-func (s *AuthorizationsService) Reset(ctx context.Context, clientID string, token string) (*Authorization, *Response, error) {
-	u := fmt.Sprintf("applications/%v/tokens/%v", clientID, token)
-
-	req, err := s.client.NewRequest("POST", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	a := new(Authorization)
-	resp, err := s.client.Do(ctx, req, a)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return a, resp, nil
-}
-
-// Revoke an authorization for an application.
-//
-// Note that this operation requires the use of BasicAuth, but where the
-// username is the OAuth application clientID, and the password is its
-// clientSecret. Invalid tokens will return a 404 Not Found.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/#revoke-an-authorization-for-an-application
-func (s *AuthorizationsService) Revoke(ctx context.Context, clientID string, token string) (*Response, error) {
-	u := fmt.Sprintf("applications/%v/tokens/%v", clientID, token)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// ListGrants lists the set of OAuth applications that have been granted
-// access to a user's account. This will return one entry for each application
-// that has been granted access to the account, regardless of the number of
-// tokens an application has generated for the user.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/#list-your-grants
-func (s *AuthorizationsService) ListGrants(ctx context.Context, opt *ListOptions) ([]*Grant, *Response, error) {
-	u, err := addOptions("applications/grants", opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	grants := []*Grant{}
-	resp, err := s.client.Do(ctx, req, &grants)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return grants, resp, nil
-}
-
-// GetGrant gets a single OAuth application grant.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/#get-a-single-grant
-func (s *AuthorizationsService) GetGrant(ctx context.Context, id int) (*Grant, *Response, error) {
-	u := fmt.Sprintf("applications/grants/%d", id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	grant := new(Grant)
-	resp, err := s.client.Do(ctx, req, grant)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return grant, resp, nil
-}
-
-// DeleteGrant deletes an OAuth application grant. Deleting an application's
-// grant will also delete all OAuth tokens associated with the application for
-// the user.
-//
-// GitHub API docs: https://developer.github.com/v3/oauth_authorizations/#delete-a-grant
-func (s *AuthorizationsService) DeleteGrant(ctx context.Context, id int) (*Response, error) {
-	u := fmt.Sprintf("applications/grants/%d", id)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// CreateImpersonation creates an impersonation OAuth token.
-//
-// This requires admin permissions. With the returned Authorization.Token
-// you can e.g. create or delete a user's public SSH key. NOTE: creating a
-// new token automatically revokes an existing one.
-//
-// GitHub API docs: https://developer.github.com/enterprise/2.5/v3/users/administration/#create-an-impersonation-oauth-token
-func (s *AuthorizationsService) CreateImpersonation(ctx context.Context, username string, authReq *AuthorizationRequest) (*Authorization, *Response, error) {
-	u := fmt.Sprintf("admin/users/%v/authorizations", username)
-	req, err := s.client.NewRequest("POST", u, authReq)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	a := new(Authorization)
-	resp, err := s.client.Do(ctx, req, a)
-	if err != nil {
-		return nil, resp, err
-	}
-	return a, resp, nil
-}
-
-// DeleteImpersonation deletes an impersonation OAuth token.
-//
-// NOTE: there can be only one at a time.
-//
-// GitHub API docs: https://developer.github.com/enterprise/2.5/v3/users/administration/#delete-an-impersonation-oauth-token
-func (s *AuthorizationsService) DeleteImpersonation(ctx context.Context, username string) (*Response, error) {
-	u := fmt.Sprintf("admin/users/%v/authorizations", username)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/doc.go b/vendor/github.com/google/go-github/github/doc.go
deleted file mode 100644
index abbcf6406f..0000000000
--- a/vendor/github.com/google/go-github/github/doc.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package github provides a client for using the GitHub API.
-
-Usage:
-
-	import "github.com/google/go-github/github"
-
-Construct a new GitHub client, then use the various services on the client to
-access different parts of the GitHub API. For example:
-
-	client := github.NewClient(nil)
-
-	// list all organizations for user "willnorris"
-	orgs, _, err := client.Organizations.List(ctx, "willnorris", nil)
-
-Some API methods have optional parameters that can be passed. For example:
-
-	client := github.NewClient(nil)
-
-	// list public repositories for org "github"
-	opt := &github.RepositoryListByOrgOptions{Type: "public"}
-	repos, _, err := client.Repositories.ListByOrg(ctx, "github", opt)
-
-The services of a client divide the API into logical chunks and correspond to
-the structure of the GitHub API documentation at
-https://developer.github.com/v3/.
-
-Authentication
-
-The go-github library does not directly handle authentication. Instead, when
-creating a new client, pass an http.Client that can handle authentication for
-you. The easiest and recommended way to do this is using the golang.org/x/oauth2
-library, but you can always use any other library that provides an http.Client.
-If you have an OAuth2 access token (for example, a personal API token), you can
-use it with the oauth2 library using:
-
-	import "golang.org/x/oauth2"
-
-	func main() {
-		ctx := context.Background()
-		ts := oauth2.StaticTokenSource(
-			&oauth2.Token{AccessToken: "... your access token ..."},
-		)
-		tc := oauth2.NewClient(ctx, ts)
-
-		client := github.NewClient(tc)
-
-		// list all repositories for the authenticated user
-		repos, _, err := client.Repositories.List(ctx, "", nil)
-	}
-
-Note that when using an authenticated Client, all calls made by the client will
-include the specified OAuth token. Therefore, authenticated clients should
-almost never be shared between different users.
-
-See the oauth2 docs for complete instructions on using that library.
-
-For API methods that require HTTP Basic Authentication, use the
-BasicAuthTransport.
-
-GitHub Apps authentication can be provided by the
-https://github.com/bradleyfalzon/ghinstallation package.
-
-	import "github.com/bradleyfalzon/ghinstallation"
-
-	func main() {
-		// Wrap the shared transport for use with the integration ID 1 authenticating with installation ID 99.
-		itr, err := ghinstallation.NewKeyFromFile(http.DefaultTransport, 1, 99, "2016-10-19.private-key.pem")
-		if err != nil {
-			// Handle error.
-		}
-
-		// Use installation transport with client
-		client := github.NewClient(&http.Client{Transport: itr})
-
-		// Use client...
-	}
-
-Rate Limiting
-
-GitHub imposes a rate limit on all API clients. Unauthenticated clients are
-limited to 60 requests per hour, while authenticated clients can make up to
-5,000 requests per hour. To receive the higher rate limit when making calls
-that are not issued on behalf of a user, use the
-UnauthenticatedRateLimitedTransport.
-
-The returned Response.Rate value contains the rate limit information
-from the most recent API call. If a recent enough response isn't
-available, you can use RateLimits to fetch the most up-to-date rate
-limit data for the client.
-
-To detect an API rate limit error, you can check if its type is *github.RateLimitError:
-
-	repos, _, err := client.Repositories.List(ctx, "", nil)
-	if _, ok := err.(*github.RateLimitError); ok {
-		log.Println("hit rate limit")
-	}
-
-Learn more about GitHub rate limiting at
-https://developer.github.com/v3/#rate-limiting.
-
-Accepted Status
-
-Some endpoints may return a 202 Accepted status code, meaning that the
-information required is not yet ready and was scheduled to be gathered on
-the GitHub side. Methods known to behave like this are documented specifying
-this behavior.
-
-To detect this condition of error, you can check if its type is
-*github.AcceptedError:
-
-	stats, _, err := client.Repositories.ListContributorsStats(ctx, org, repo)
-	if _, ok := err.(*github.AcceptedError); ok {
-		log.Println("scheduled on GitHub side")
-	}
-
-Conditional Requests
-
-The GitHub API has good support for conditional requests which will help
-prevent you from burning through your rate limit, as well as help speed up your
-application. go-github does not handle conditional requests directly, but is
-instead designed to work with a caching http.Transport. We recommend using
-https://github.com/gregjones/httpcache for that.
-
-Learn more about GitHub conditional requests at
-https://developer.github.com/v3/#conditional-requests.
-
-Creating and Updating Resources
-
-All structs for GitHub resources use pointer values for all non-repeated fields.
-This allows distinguishing between unset fields and those set to a zero-value.
-Helper functions have been provided to easily create these pointers for string,
-bool, and int values. For example:
-
-	// create a new private repository named "foo"
-	repo := &github.Repository{
-		Name:    github.String("foo"),
-		Private: github.Bool(true),
-	}
-	client.Repositories.Create(ctx, "", repo)
-
-Users who have worked with protocol buffers should find this pattern familiar.
-
-Pagination
-
-All requests for resource collections (repos, pull requests, issues, etc.)
-support pagination. Pagination options are described in the
-github.ListOptions struct and passed to the list methods directly or as an
-embedded type of a more specific list options struct (for example
-github.PullRequestListOptions). Pages information is available via the
-github.Response struct.
-
-	client := github.NewClient(nil)
-
-	opt := &github.RepositoryListByOrgOptions{
-		ListOptions: github.ListOptions{PerPage: 10},
-	}
-	// get all pages of results
-	var allRepos []*github.Repository
-	for {
-		repos, resp, err := client.Repositories.ListByOrg(ctx, "github", opt)
-		if err != nil {
-			return err
-		}
-		allRepos = append(allRepos, repos...)
-		if resp.NextPage == 0 {
-			break
-		}
-		opt.Page = resp.NextPage
-	}
-
-Google App Engine
-
-Go on App Engine Classic (which as of this writing uses Go 1.6) can not use
-the "context" import and still relies on "golang.org/x/net/context".
-As a result, if you wish to continue to use "go-github" on App Engine Classic,
-you will need to rewrite all the "context" imports using the following command:
-
-    gofmt -w -r '"context" -> "golang.org/x/net/context"' *.go
-
-See "with_appengine.go" for more details.
-
-*/
-package github
diff --git a/vendor/github.com/google/go-github/github/event_types.go b/vendor/github.com/google/go-github/github/event_types.go
deleted file mode 100644
index c6b29b9a24..0000000000
--- a/vendor/github.com/google/go-github/github/event_types.go
+++ /dev/null
@@ -1,728 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// These event types are shared between the Events API and used as Webhook payloads.
-
-package github
-
-// CommitCommentEvent is triggered when a commit comment is created.
-// The Webhook event name is "commit_comment".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#commitcommentevent
-type CommitCommentEvent struct {
-	Comment *RepositoryComment `json:"comment,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Action       *string       `json:"action,omitempty"`
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// CreateEvent represents a created repository, branch, or tag.
-// The Webhook event name is "create".
-//
-// Note: webhooks will not receive this event for created repositories.
-// Additionally, webhooks will not receive this event for tags if more
-// than three tags are pushed at once.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#createevent
-type CreateEvent struct {
-	Ref *string `json:"ref,omitempty"`
-	// RefType is the object that was created. Possible values are: "repository", "branch", "tag".
-	RefType      *string `json:"ref_type,omitempty"`
-	MasterBranch *string `json:"master_branch,omitempty"`
-	Description  *string `json:"description,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	PusherType   *string       `json:"pusher_type,omitempty"`
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// DeleteEvent represents a deleted branch or tag.
-// The Webhook event name is "delete".
-//
-// Note: webhooks will not receive this event for tags if more than three tags
-// are deleted at once.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#deleteevent
-type DeleteEvent struct {
-	Ref *string `json:"ref,omitempty"`
-	// RefType is the object that was deleted. Possible values are: "branch", "tag".
-	RefType *string `json:"ref_type,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	PusherType   *string       `json:"pusher_type,omitempty"`
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// DeploymentEvent represents a deployment.
-// The Webhook event name is "deployment".
-//
-// Events of this type are not visible in timelines, they are only used to trigger hooks.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#deploymentevent
-type DeploymentEvent struct {
-	Deployment *Deployment `json:"deployment,omitempty"`
-	Repo       *Repository `json:"repository,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// DeploymentStatusEvent represents a deployment status.
-// The Webhook event name is "deployment_status".
-//
-// Events of this type are not visible in timelines, they are only used to trigger hooks.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#deploymentstatusevent
-type DeploymentStatusEvent struct {
-	Deployment       *Deployment       `json:"deployment,omitempty"`
-	DeploymentStatus *DeploymentStatus `json:"deployment_status,omitempty"`
-	Repo             *Repository       `json:"repository,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// ForkEvent is triggered when a user forks a repository.
-// The Webhook event name is "fork".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#forkevent
-type ForkEvent struct {
-	// Forkee is the created repository.
-	Forkee *Repository `json:"forkee,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// Page represents a single Wiki page.
-type Page struct {
-	PageName *string `json:"page_name,omitempty"`
-	Title    *string `json:"title,omitempty"`
-	Summary  *string `json:"summary,omitempty"`
-	Action   *string `json:"action,omitempty"`
-	SHA      *string `json:"sha,omitempty"`
-	HTMLURL  *string `json:"html_url,omitempty"`
-}
-
-// GollumEvent is triggered when a Wiki page is created or updated.
-// The Webhook event name is "gollum".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#gollumevent
-type GollumEvent struct {
-	Pages []*Page `json:"pages,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// EditChange represents the changes when an issue, pull request, or comment has
-// been edited.
-type EditChange struct {
-	Title *struct {
-		From *string `json:"from,omitempty"`
-	} `json:"title,omitempty"`
-	Body *struct {
-		From *string `json:"from,omitempty"`
-	} `json:"body,omitempty"`
-}
-
-// ProjectChange represents the changes when a project has been edited.
-type ProjectChange struct {
-	Name *struct {
-		From *string `json:"from,omitempty"`
-	} `json:"name,omitempty"`
-	Body *struct {
-		From *string `json:"from,omitempty"`
-	} `json:"body,omitempty"`
-}
-
-// ProjectCardChange represents the changes when a project card has been edited.
-type ProjectCardChange struct {
-	Note *struct {
-		From *string `json:"from,omitempty"`
-	} `json:"note,omitempty"`
-}
-
-// ProjectColumnChange represents the changes when a project column has been edited.
-type ProjectColumnChange struct {
-	Name *struct {
-		From *string `json:"from,omitempty"`
-	} `json:"name,omitempty"`
-}
-
-// TeamChange represents the changes when a team has been edited.
-type TeamChange struct {
-	Description *struct {
-		From *string `json:"from,omitempty"`
-	} `json:"description,omitempty"`
-	Name *struct {
-		From *string `json:"from,omitempty"`
-	} `json:"name,omitempty"`
-	Privacy *struct {
-		From *string `json:"from,omitempty"`
-	} `json:"privacy,omitempty"`
-	Repository *struct {
-		Permissions *struct {
-			From *struct {
-				Admin *bool `json:"admin,omitempty"`
-				Pull  *bool `json:"pull,omitempty"`
-				Push  *bool `json:"push,omitempty"`
-			} `json:"from,omitempty"`
-		} `json:"permissions,omitempty"`
-	} `json:"repository,omitempty"`
-}
-
-// InstallationEvent is triggered when a GitHub App has been installed or uninstalled.
-// The Webhook event name is "installation".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#installationevent
-type InstallationEvent struct {
-	// The action that was performed. Can be either "created" or "deleted".
-	Action       *string       `json:"action,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// InstallationRepositoriesEvent is triggered when a repository is added or
-// removed from an installation. The Webhook event name is "installation_repositories".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#installationrepositoriesevent
-type InstallationRepositoriesEvent struct {
-	// The action that was performed. Can be either "added" or "removed".
-	Action              *string       `json:"action,omitempty"`
-	RepositoriesAdded   []*Repository `json:"repositories_added,omitempty"`
-	RepositoriesRemoved []*Repository `json:"repositories_removed,omitempty"`
-	RepositorySelection *string       `json:"repository_selection,omitempty"`
-	Sender              *User         `json:"sender,omitempty"`
-	Installation        *Installation `json:"installation,omitempty"`
-}
-
-// IssueCommentEvent is triggered when an issue comment is created on an issue
-// or pull request.
-// The Webhook event name is "issue_comment".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#issuecommentevent
-type IssueCommentEvent struct {
-	// Action is the action that was performed on the comment.
-	// Possible values are: "created", "edited", "deleted".
-	Action  *string       `json:"action,omitempty"`
-	Issue   *Issue        `json:"issue,omitempty"`
-	Comment *IssueComment `json:"comment,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Changes      *EditChange   `json:"changes,omitempty"`
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// IssuesEvent is triggered when an issue is assigned, unassigned, labeled,
-// unlabeled, opened, closed, or reopened.
-// The Webhook event name is "issues".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#issuesevent
-type IssuesEvent struct {
-	// Action is the action that was performed. Possible values are: "assigned",
-	// "unassigned", "labeled", "unlabeled", "opened", "closed", "reopened", "edited".
-	Action   *string `json:"action,omitempty"`
-	Issue    *Issue  `json:"issue,omitempty"`
-	Assignee *User   `json:"assignee,omitempty"`
-	Label    *Label  `json:"label,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Changes      *EditChange   `json:"changes,omitempty"`
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// LabelEvent is triggered when a repository's label is created, edited, or deleted.
-// The Webhook event name is "label"
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#labelevent
-type LabelEvent struct {
-	// Action is the action that was performed. Possible values are:
-	// "created", "edited", "deleted"
-	Action *string `json:"action,omitempty"`
-	Label  *Label  `json:"label,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Changes      *EditChange   `json:"changes,omitempty"`
-	Repo         *Repository   `json:"repository,omitempty"`
-	Org          *Organization `json:"organization,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// MemberEvent is triggered when a user is added as a collaborator to a repository.
-// The Webhook event name is "member".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#memberevent
-type MemberEvent struct {
-	// Action is the action that was performed. Possible value is: "added".
-	Action *string `json:"action,omitempty"`
-	Member *User   `json:"member,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// MembershipEvent is triggered when a user is added or removed from a team.
-// The Webhook event name is "membership".
-//
-// Events of this type are not visible in timelines, they are only used to
-// trigger organization webhooks.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#membershipevent
-type MembershipEvent struct {
-	// Action is the action that was performed. Possible values are: "added", "removed".
-	Action *string `json:"action,omitempty"`
-	// Scope is the scope of the membership. Possible value is: "team".
-	Scope  *string `json:"scope,omitempty"`
-	Member *User   `json:"member,omitempty"`
-	Team   *Team   `json:"team,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Org          *Organization `json:"organization,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// MilestoneEvent is triggered when a milestone is created, closed, opened, edited, or deleted.
-// The Webhook event name is "milestone".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#milestoneevent
-type MilestoneEvent struct {
-	// Action is the action that was performed. Possible values are:
-	// "created", "closed", "opened", "edited", "deleted"
-	Action    *string    `json:"action,omitempty"`
-	Milestone *Milestone `json:"milestone,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Changes      *EditChange   `json:"changes,omitempty"`
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Org          *Organization `json:"organization,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// OrganizationEvent is triggered when a user is added, removed, or invited to an organization.
-// Events of this type are not visible in timelines. These events are only used to trigger organization hooks.
-// Webhook event name is "organization".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#organizationevent
-type OrganizationEvent struct {
-	// Action is the action that was performed.
-	// Can be one of "member_added", "member_removed", or "member_invited".
-	Action *string `json:"action,omitempty"`
-
-	// Invitaion is the invitation for the user or email if the action is "member_invited".
-	Invitation *Invitation `json:"invitation,omitempty"`
-
-	// Membership is the membership between the user and the organization.
-	// Not present when the action is "member_invited".
-	Membership *Membership `json:"membership,omitempty"`
-
-	Organization *Organization `json:"organization,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// OrgBlockEvent is triggered when an organization blocks or unblocks a user.
-// The Webhook event name is "org_block".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#orgblockevent
-type OrgBlockEvent struct {
-	// Action is the action that was performed.
-	// Can be "blocked" or "unblocked".
-	Action       *string       `json:"action,omitempty"`
-	BlockedUser  *User         `json:"blocked_user,omitempty"`
-	Organization *Organization `json:"organization,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// PageBuildEvent represents an attempted build of a GitHub Pages site, whether
-// successful or not.
-// The Webhook event name is "page_build".
-//
-// This event is triggered on push to a GitHub Pages enabled branch (gh-pages
-// for project pages, master for user and organization pages).
-//
-// Events of this type are not visible in timelines, they are only used to trigger hooks.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#pagebuildevent
-type PageBuildEvent struct {
-	Build *PagesBuild `json:"build,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	ID           *int          `json:"id,omitempty"`
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// PingEvent is triggered when a Webhook is added to GitHub.
-//
-// GitHub API docs: https://developer.github.com/webhooks/#ping-event
-type PingEvent struct {
-	// Random string of GitHub zen.
-	Zen *string `json:"zen,omitempty"`
-	// The ID of the webhook that triggered the ping.
-	HookID *int `json:"hook_id,omitempty"`
-	// The webhook configuration.
-	Hook         *Hook         `json:"hook,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// ProjectEvent is triggered when project is created, modified or deleted.
-// The webhook event name is "project".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#projectevent
-type ProjectEvent struct {
-	Action  *string        `json:"action,omitempty"`
-	Changes *ProjectChange `json:"changes,omitempty"`
-	Project *Project       `json:"project,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Repo         *Repository   `json:"repository,omitempty"`
-	Org          *Organization `json:"organization,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// ProjectCardEvent is triggered when a project card is created, updated, moved, converted to an issue, or deleted.
-// The webhook event name is "project_card".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#projectcardevent
-type ProjectCardEvent struct {
-	Action      *string            `json:"action,omitempty"`
-	Changes     *ProjectCardChange `json:"changes,omitempty"`
-	AfterID     *int               `json:"after_id,omitempty"`
-	ProjectCard *ProjectCard       `json:"project_card,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Repo         *Repository   `json:"repository,omitempty"`
-	Org          *Organization `json:"organization,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// ProjectColumnEvent is triggered when a project column is created, updated, moved, or deleted.
-// The webhook event name is "project_column".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#projectcolumnevent
-type ProjectColumnEvent struct {
-	Action        *string              `json:"action,omitempty"`
-	Changes       *ProjectColumnChange `json:"changes,omitempty"`
-	AfterID       *int                 `json:"after_id,omitempty"`
-	ProjectColumn *ProjectColumn       `json:"project_column,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Repo         *Repository   `json:"repository,omitempty"`
-	Org          *Organization `json:"organization,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// PublicEvent is triggered when a private repository is open sourced.
-// According to GitHub: "Without a doubt: the best GitHub event."
-// The Webhook event name is "public".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#publicevent
-type PublicEvent struct {
-	// The following fields are only populated by Webhook events.
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// PullRequestEvent is triggered when a pull request is assigned, unassigned,
-// labeled, unlabeled, opened, closed, reopened, or synchronized.
-// The Webhook event name is "pull_request".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#pullrequestevent
-type PullRequestEvent struct {
-	// Action is the action that was performed. Possible values are: "assigned",
-	// "unassigned", "labeled", "unlabeled", "opened", "closed", or "reopened",
-	// "synchronize", "edited". If the action is "closed" and the merged key is false,
-	// the pull request was closed with unmerged commits. If the action is "closed"
-	// and the merged key is true, the pull request was merged.
-	Action      *string      `json:"action,omitempty"`
-	Number      *int         `json:"number,omitempty"`
-	PullRequest *PullRequest `json:"pull_request,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Changes      *EditChange   `json:"changes,omitempty"`
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// PullRequestReviewEvent is triggered when a review is submitted on a pull
-// request.
-// The Webhook event name is "pull_request_review".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#pullrequestreviewevent
-type PullRequestReviewEvent struct {
-	// Action is always "submitted".
-	Action      *string            `json:"action,omitempty"`
-	Review      *PullRequestReview `json:"review,omitempty"`
-	PullRequest *PullRequest       `json:"pull_request,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-
-	// The following field is only present when the webhook is triggered on
-	// a repository belonging to an organization.
-	Organization *Organization `json:"organization,omitempty"`
-}
-
-// PullRequestReviewCommentEvent is triggered when a comment is created on a
-// portion of the unified diff of a pull request.
-// The Webhook event name is "pull_request_review_comment".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#pullrequestreviewcommentevent
-type PullRequestReviewCommentEvent struct {
-	// Action is the action that was performed on the comment.
-	// Possible values are: "created", "edited", "deleted".
-	Action      *string             `json:"action,omitempty"`
-	PullRequest *PullRequest        `json:"pull_request,omitempty"`
-	Comment     *PullRequestComment `json:"comment,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Changes      *EditChange   `json:"changes,omitempty"`
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// PushEvent represents a git push to a GitHub repository.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#pushevent
-type PushEvent struct {
-	PushID       *int              `json:"push_id,omitempty"`
-	Head         *string           `json:"head,omitempty"`
-	Ref          *string           `json:"ref,omitempty"`
-	Size         *int              `json:"size,omitempty"`
-	Commits      []PushEventCommit `json:"commits,omitempty"`
-	Before       *string           `json:"before,omitempty"`
-	DistinctSize *int              `json:"distinct_size,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	After        *string              `json:"after,omitempty"`
-	Created      *bool                `json:"created,omitempty"`
-	Deleted      *bool                `json:"deleted,omitempty"`
-	Forced       *bool                `json:"forced,omitempty"`
-	BaseRef      *string              `json:"base_ref,omitempty"`
-	Compare      *string              `json:"compare,omitempty"`
-	Repo         *PushEventRepository `json:"repository,omitempty"`
-	HeadCommit   *PushEventCommit     `json:"head_commit,omitempty"`
-	Pusher       *User                `json:"pusher,omitempty"`
-	Sender       *User                `json:"sender,omitempty"`
-	Installation *Installation        `json:"installation,omitempty"`
-}
-
-func (p PushEvent) String() string {
-	return Stringify(p)
-}
-
-// PushEventCommit represents a git commit in a GitHub PushEvent.
-type PushEventCommit struct {
-	Message  *string       `json:"message,omitempty"`
-	Author   *CommitAuthor `json:"author,omitempty"`
-	URL      *string       `json:"url,omitempty"`
-	Distinct *bool         `json:"distinct,omitempty"`
-
-	// The following fields are only populated by Events API.
-	SHA *string `json:"sha,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	ID        *string       `json:"id,omitempty"`
-	TreeID    *string       `json:"tree_id,omitempty"`
-	Timestamp *Timestamp    `json:"timestamp,omitempty"`
-	Committer *CommitAuthor `json:"committer,omitempty"`
-	Added     []string      `json:"added,omitempty"`
-	Removed   []string      `json:"removed,omitempty"`
-	Modified  []string      `json:"modified,omitempty"`
-}
-
-func (p PushEventCommit) String() string {
-	return Stringify(p)
-}
-
-// PushEventRepository represents the repo object in a PushEvent payload.
-type PushEventRepository struct {
-	ID              *int                `json:"id,omitempty"`
-	Name            *string             `json:"name,omitempty"`
-	FullName        *string             `json:"full_name,omitempty"`
-	Owner           *PushEventRepoOwner `json:"owner,omitempty"`
-	Private         *bool               `json:"private,omitempty"`
-	Description     *string             `json:"description,omitempty"`
-	Fork            *bool               `json:"fork,omitempty"`
-	CreatedAt       *Timestamp          `json:"created_at,omitempty"`
-	PushedAt        *Timestamp          `json:"pushed_at,omitempty"`
-	UpdatedAt       *Timestamp          `json:"updated_at,omitempty"`
-	Homepage        *string             `json:"homepage,omitempty"`
-	Size            *int                `json:"size,omitempty"`
-	StargazersCount *int                `json:"stargazers_count,omitempty"`
-	WatchersCount   *int                `json:"watchers_count,omitempty"`
-	Language        *string             `json:"language,omitempty"`
-	HasIssues       *bool               `json:"has_issues,omitempty"`
-	HasDownloads    *bool               `json:"has_downloads,omitempty"`
-	HasWiki         *bool               `json:"has_wiki,omitempty"`
-	HasPages        *bool               `json:"has_pages,omitempty"`
-	ForksCount      *int                `json:"forks_count,omitempty"`
-	OpenIssuesCount *int                `json:"open_issues_count,omitempty"`
-	DefaultBranch   *string             `json:"default_branch,omitempty"`
-	MasterBranch    *string             `json:"master_branch,omitempty"`
-	Organization    *string             `json:"organization,omitempty"`
-	URL             *string             `json:"url,omitempty"`
-	ArchiveURL      *string             `json:"archive_url,omitempty"`
-	HTMLURL         *string             `json:"html_url,omitempty"`
-	StatusesURL     *string             `json:"statuses_url,omitempty"`
-	GitURL          *string             `json:"git_url,omitempty"`
-	SSHURL          *string             `json:"ssh_url,omitempty"`
-	CloneURL        *string             `json:"clone_url,omitempty"`
-	SVNURL          *string             `json:"svn_url,omitempty"`
-}
-
-// PushEventRepoOwner is a basic representation of user/org in a PushEvent payload.
-type PushEventRepoOwner struct {
-	Name  *string `json:"name,omitempty"`
-	Email *string `json:"email,omitempty"`
-}
-
-// ReleaseEvent is triggered when a release is published.
-// The Webhook event name is "release".
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#releaseevent
-type ReleaseEvent struct {
-	// Action is the action that was performed. Possible value is: "published".
-	Action  *string            `json:"action,omitempty"`
-	Release *RepositoryRelease `json:"release,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// RepositoryEvent is triggered when a repository is created.
-// The Webhook event name is "repository".
-//
-// Events of this type are not visible in timelines, they are only used to
-// trigger organization webhooks.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#repositoryevent
-type RepositoryEvent struct {
-	// Action is the action that was performed. Possible values are: "created", "deleted",
-	// "publicized", "privatized".
-	Action *string     `json:"action,omitempty"`
-	Repo   *Repository `json:"repository,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Org          *Organization `json:"organization,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// StatusEvent is triggered when the status of a Git commit changes.
-// The Webhook event name is "status".
-//
-// Events of this type are not visible in timelines, they are only used to
-// trigger hooks.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#statusevent
-type StatusEvent struct {
-	SHA *string `json:"sha,omitempty"`
-	// State is the new state. Possible values are: "pending", "success", "failure", "error".
-	State       *string   `json:"state,omitempty"`
-	Description *string   `json:"description,omitempty"`
-	TargetURL   *string   `json:"target_url,omitempty"`
-	Branches    []*Branch `json:"branches,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	ID           *int              `json:"id,omitempty"`
-	Name         *string           `json:"name,omitempty"`
-	Context      *string           `json:"context,omitempty"`
-	Commit       *RepositoryCommit `json:"commit,omitempty"`
-	CreatedAt    *Timestamp        `json:"created_at,omitempty"`
-	UpdatedAt    *Timestamp        `json:"updated_at,omitempty"`
-	Repo         *Repository       `json:"repository,omitempty"`
-	Sender       *User             `json:"sender,omitempty"`
-	Installation *Installation     `json:"installation,omitempty"`
-}
-
-// TeamEvent is triggered when an organization's team is created, modified or deleted.
-// The Webhook event name is "team".
-//
-// Events of this type are not visible in timelines. These events are only used
-// to trigger hooks.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#teamevent
-type TeamEvent struct {
-	Action  *string     `json:"action,omitempty"`
-	Team    *Team       `json:"team,omitempty"`
-	Changes *TeamChange `json:"changes,omitempty"`
-	Repo    *Repository `json:"repository,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Org          *Organization `json:"organization,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// TeamAddEvent is triggered when a repository is added to a team.
-// The Webhook event name is "team_add".
-//
-// Events of this type are not visible in timelines. These events are only used
-// to trigger hooks.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#teamaddevent
-type TeamAddEvent struct {
-	Team *Team       `json:"team,omitempty"`
-	Repo *Repository `json:"repository,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Org          *Organization `json:"organization,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
-
-// WatchEvent is related to starring a repository, not watching. See this API
-// blog post for an explanation: https://developer.github.com/changes/2012-09-05-watcher-api/
-//
-// The event’s actor is the user who starred a repository, and the event’s
-// repository is the repository that was starred.
-//
-// GitHub API docs: https://developer.github.com/v3/activity/events/types/#watchevent
-type WatchEvent struct {
-	// Action is the action that was performed. Possible value is: "started".
-	Action *string `json:"action,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Repo         *Repository   `json:"repository,omitempty"`
-	Sender       *User         `json:"sender,omitempty"`
-	Installation *Installation `json:"installation,omitempty"`
-}
diff --git a/vendor/github.com/google/go-github/github/gists.go b/vendor/github.com/google/go-github/github/gists.go
deleted file mode 100644
index 15276ea1d7..0000000000
--- a/vendor/github.com/google/go-github/github/gists.go
+++ /dev/null
@@ -1,351 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// GistsService handles communication with the Gist related
-// methods of the GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/
-type GistsService service
-
-// Gist represents a GitHub's gist.
-type Gist struct {
-	ID          *string                   `json:"id,omitempty"`
-	Description *string                   `json:"description,omitempty"`
-	Public      *bool                     `json:"public,omitempty"`
-	Owner       *User                     `json:"owner,omitempty"`
-	Files       map[GistFilename]GistFile `json:"files,omitempty"`
-	Comments    *int                      `json:"comments,omitempty"`
-	HTMLURL     *string                   `json:"html_url,omitempty"`
-	GitPullURL  *string                   `json:"git_pull_url,omitempty"`
-	GitPushURL  *string                   `json:"git_push_url,omitempty"`
-	CreatedAt   *time.Time                `json:"created_at,omitempty"`
-	UpdatedAt   *time.Time                `json:"updated_at,omitempty"`
-}
-
-func (g Gist) String() string {
-	return Stringify(g)
-}
-
-// GistFilename represents filename on a gist.
-type GistFilename string
-
-// GistFile represents a file on a gist.
-type GistFile struct {
-	Size     *int    `json:"size,omitempty"`
-	Filename *string `json:"filename,omitempty"`
-	Language *string `json:"language,omitempty"`
-	Type     *string `json:"type,omitempty"`
-	RawURL   *string `json:"raw_url,omitempty"`
-	Content  *string `json:"content,omitempty"`
-}
-
-func (g GistFile) String() string {
-	return Stringify(g)
-}
-
-// GistCommit represents a commit on a gist.
-type GistCommit struct {
-	URL          *string      `json:"url,omitempty"`
-	Version      *string      `json:"version,omitempty"`
-	User         *User        `json:"user,omitempty"`
-	ChangeStatus *CommitStats `json:"change_status,omitempty"`
-	CommittedAt  *Timestamp   `json:"committed_at,omitempty"`
-}
-
-func (gc GistCommit) String() string {
-	return Stringify(gc)
-}
-
-// GistFork represents a fork of a gist.
-type GistFork struct {
-	URL       *string    `json:"url,omitempty"`
-	User      *User      `json:"user,omitempty"`
-	ID        *string    `json:"id,omitempty"`
-	CreatedAt *Timestamp `json:"created_at,omitempty"`
-	UpdatedAt *Timestamp `json:"updated_at,omitempty"`
-}
-
-func (gf GistFork) String() string {
-	return Stringify(gf)
-}
-
-// GistListOptions specifies the optional parameters to the
-// GistsService.List, GistsService.ListAll, and GistsService.ListStarred methods.
-type GistListOptions struct {
-	// Since filters Gists by time.
-	Since time.Time `url:"since,omitempty"`
-
-	ListOptions
-}
-
-// List gists for a user. Passing the empty string will list
-// all public gists if called anonymously. However, if the call
-// is authenticated, it will returns all gists for the authenticated
-// user.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#list-gists
-func (s *GistsService) List(ctx context.Context, user string, opt *GistListOptions) ([]*Gist, *Response, error) {
-	var u string
-	if user != "" {
-		u = fmt.Sprintf("users/%v/gists", user)
-	} else {
-		u = "gists"
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var gists []*Gist
-	resp, err := s.client.Do(ctx, req, &gists)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return gists, resp, nil
-}
-
-// ListAll lists all public gists.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#list-gists
-func (s *GistsService) ListAll(ctx context.Context, opt *GistListOptions) ([]*Gist, *Response, error) {
-	u, err := addOptions("gists/public", opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var gists []*Gist
-	resp, err := s.client.Do(ctx, req, &gists)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return gists, resp, nil
-}
-
-// ListStarred lists starred gists of authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#list-gists
-func (s *GistsService) ListStarred(ctx context.Context, opt *GistListOptions) ([]*Gist, *Response, error) {
-	u, err := addOptions("gists/starred", opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var gists []*Gist
-	resp, err := s.client.Do(ctx, req, &gists)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return gists, resp, nil
-}
-
-// Get a single gist.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#get-a-single-gist
-func (s *GistsService) Get(ctx context.Context, id string) (*Gist, *Response, error) {
-	u := fmt.Sprintf("gists/%v", id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-	gist := new(Gist)
-	resp, err := s.client.Do(ctx, req, gist)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return gist, resp, nil
-}
-
-// GetRevision gets a specific revision of a gist.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#get-a-specific-revision-of-a-gist
-func (s *GistsService) GetRevision(ctx context.Context, id, sha string) (*Gist, *Response, error) {
-	u := fmt.Sprintf("gists/%v/%v", id, sha)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-	gist := new(Gist)
-	resp, err := s.client.Do(ctx, req, gist)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return gist, resp, nil
-}
-
-// Create a gist for authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#create-a-gist
-func (s *GistsService) Create(ctx context.Context, gist *Gist) (*Gist, *Response, error) {
-	u := "gists"
-	req, err := s.client.NewRequest("POST", u, gist)
-	if err != nil {
-		return nil, nil, err
-	}
-	g := new(Gist)
-	resp, err := s.client.Do(ctx, req, g)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return g, resp, nil
-}
-
-// Edit a gist.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#edit-a-gist
-func (s *GistsService) Edit(ctx context.Context, id string, gist *Gist) (*Gist, *Response, error) {
-	u := fmt.Sprintf("gists/%v", id)
-	req, err := s.client.NewRequest("PATCH", u, gist)
-	if err != nil {
-		return nil, nil, err
-	}
-	g := new(Gist)
-	resp, err := s.client.Do(ctx, req, g)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return g, resp, nil
-}
-
-// ListCommits lists commits of a gist.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#list-gist-commits
-func (s *GistsService) ListCommits(ctx context.Context, id string, opt *ListOptions) ([]*GistCommit, *Response, error) {
-	u := fmt.Sprintf("gists/%v/commits", id)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var gistCommits []*GistCommit
-	resp, err := s.client.Do(ctx, req, &gistCommits)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return gistCommits, resp, nil
-}
-
-// Delete a gist.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#delete-a-gist
-func (s *GistsService) Delete(ctx context.Context, id string) (*Response, error) {
-	u := fmt.Sprintf("gists/%v", id)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
-
-// Star a gist on behalf of authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#star-a-gist
-func (s *GistsService) Star(ctx context.Context, id string) (*Response, error) {
-	u := fmt.Sprintf("gists/%v/star", id)
-	req, err := s.client.NewRequest("PUT", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
-
-// Unstar a gist on a behalf of authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#unstar-a-gist
-func (s *GistsService) Unstar(ctx context.Context, id string) (*Response, error) {
-	u := fmt.Sprintf("gists/%v/star", id)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
-
-// IsStarred checks if a gist is starred by authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#check-if-a-gist-is-starred
-func (s *GistsService) IsStarred(ctx context.Context, id string) (bool, *Response, error) {
-	u := fmt.Sprintf("gists/%v/star", id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return false, nil, err
-	}
-	resp, err := s.client.Do(ctx, req, nil)
-	starred, err := parseBoolResponse(err)
-	return starred, resp, err
-}
-
-// Fork a gist.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#fork-a-gist
-func (s *GistsService) Fork(ctx context.Context, id string) (*Gist, *Response, error) {
-	u := fmt.Sprintf("gists/%v/forks", id)
-	req, err := s.client.NewRequest("POST", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	g := new(Gist)
-	resp, err := s.client.Do(ctx, req, g)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return g, resp, nil
-}
-
-// ListForks lists forks of a gist.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/#list-gist-forks
-func (s *GistsService) ListForks(ctx context.Context, id string) ([]*GistFork, *Response, error) {
-	u := fmt.Sprintf("gists/%v/forks", id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var gistForks []*GistFork
-	resp, err := s.client.Do(ctx, req, &gistForks)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return gistForks, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/gists_comments.go b/vendor/github.com/google/go-github/github/gists_comments.go
deleted file mode 100644
index 2d0722375e..0000000000
--- a/vendor/github.com/google/go-github/github/gists_comments.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// GistComment represents a Gist comment.
-type GistComment struct {
-	ID        *int       `json:"id,omitempty"`
-	URL       *string    `json:"url,omitempty"`
-	Body      *string    `json:"body,omitempty"`
-	User      *User      `json:"user,omitempty"`
-	CreatedAt *time.Time `json:"created_at,omitempty"`
-}
-
-func (g GistComment) String() string {
-	return Stringify(g)
-}
-
-// ListComments lists all comments for a gist.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/comments/#list-comments-on-a-gist
-func (s *GistsService) ListComments(ctx context.Context, gistID string, opt *ListOptions) ([]*GistComment, *Response, error) {
-	u := fmt.Sprintf("gists/%v/comments", gistID)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var comments []*GistComment
-	resp, err := s.client.Do(ctx, req, &comments)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return comments, resp, nil
-}
-
-// GetComment retrieves a single comment from a gist.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/comments/#get-a-single-comment
-func (s *GistsService) GetComment(ctx context.Context, gistID string, commentID int) (*GistComment, *Response, error) {
-	u := fmt.Sprintf("gists/%v/comments/%v", gistID, commentID)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	c := new(GistComment)
-	resp, err := s.client.Do(ctx, req, c)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return c, resp, nil
-}
-
-// CreateComment creates a comment for a gist.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/comments/#create-a-comment
-func (s *GistsService) CreateComment(ctx context.Context, gistID string, comment *GistComment) (*GistComment, *Response, error) {
-	u := fmt.Sprintf("gists/%v/comments", gistID)
-	req, err := s.client.NewRequest("POST", u, comment)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	c := new(GistComment)
-	resp, err := s.client.Do(ctx, req, c)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return c, resp, nil
-}
-
-// EditComment edits an existing gist comment.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/comments/#edit-a-comment
-func (s *GistsService) EditComment(ctx context.Context, gistID string, commentID int, comment *GistComment) (*GistComment, *Response, error) {
-	u := fmt.Sprintf("gists/%v/comments/%v", gistID, commentID)
-	req, err := s.client.NewRequest("PATCH", u, comment)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	c := new(GistComment)
-	resp, err := s.client.Do(ctx, req, c)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return c, resp, nil
-}
-
-// DeleteComment deletes a gist comment.
-//
-// GitHub API docs: https://developer.github.com/v3/gists/comments/#delete-a-comment
-func (s *GistsService) DeleteComment(ctx context.Context, gistID string, commentID int) (*Response, error) {
-	u := fmt.Sprintf("gists/%v/comments/%v", gistID, commentID)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/git.go b/vendor/github.com/google/go-github/github/git.go
deleted file mode 100644
index 1ce47437bd..0000000000
--- a/vendor/github.com/google/go-github/github/git.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-// GitService handles communication with the git data related
-// methods of the GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/git/
-type GitService service
diff --git a/vendor/github.com/google/go-github/github/git_blobs.go b/vendor/github.com/google/go-github/github/git_blobs.go
deleted file mode 100644
index 67ea74a196..0000000000
--- a/vendor/github.com/google/go-github/github/git_blobs.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// Blob represents a blob object.
-type Blob struct {
-	Content  *string `json:"content,omitempty"`
-	Encoding *string `json:"encoding,omitempty"`
-	SHA      *string `json:"sha,omitempty"`
-	Size     *int    `json:"size,omitempty"`
-	URL      *string `json:"url,omitempty"`
-}
-
-// GetBlob fetchs a blob from a repo given a SHA.
-//
-// GitHub API docs: https://developer.github.com/v3/git/blobs/#get-a-blob
-func (s *GitService) GetBlob(ctx context.Context, owner string, repo string, sha string) (*Blob, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/git/blobs/%v", owner, repo, sha)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	blob := new(Blob)
-	resp, err := s.client.Do(ctx, req, blob)
-	return blob, resp, err
-}
-
-// CreateBlob creates a blob object.
-//
-// GitHub API docs: https://developer.github.com/v3/git/blobs/#create-a-blob
-func (s *GitService) CreateBlob(ctx context.Context, owner string, repo string, blob *Blob) (*Blob, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/git/blobs", owner, repo)
-	req, err := s.client.NewRequest("POST", u, blob)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	t := new(Blob)
-	resp, err := s.client.Do(ctx, req, t)
-	return t, resp, err
-}
diff --git a/vendor/github.com/google/go-github/github/git_commits.go b/vendor/github.com/google/go-github/github/git_commits.go
deleted file mode 100644
index 3c49a8a299..0000000000
--- a/vendor/github.com/google/go-github/github/git_commits.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// SignatureVerification represents GPG signature verification.
-type SignatureVerification struct {
-	Verified  *bool   `json:"verified,omitempty"`
-	Reason    *string `json:"reason,omitempty"`
-	Signature *string `json:"signature,omitempty"`
-	Payload   *string `json:"payload,omitempty"`
-}
-
-// Commit represents a GitHub commit.
-type Commit struct {
-	SHA          *string                `json:"sha,omitempty"`
-	Author       *CommitAuthor          `json:"author,omitempty"`
-	Committer    *CommitAuthor          `json:"committer,omitempty"`
-	Message      *string                `json:"message,omitempty"`
-	Tree         *Tree                  `json:"tree,omitempty"`
-	Parents      []Commit               `json:"parents,omitempty"`
-	Stats        *CommitStats           `json:"stats,omitempty"`
-	HTMLURL      *string                `json:"html_url,omitempty"`
-	URL          *string                `json:"url,omitempty"`
-	Verification *SignatureVerification `json:"verification,omitempty"`
-
-	// CommentCount is the number of GitHub comments on the commit. This
-	// is only populated for requests that fetch GitHub data like
-	// Pulls.ListCommits, Repositories.ListCommits, etc.
-	CommentCount *int `json:"comment_count,omitempty"`
-}
-
-func (c Commit) String() string {
-	return Stringify(c)
-}
-
-// CommitAuthor represents the author or committer of a commit. The commit
-// author may not correspond to a GitHub User.
-type CommitAuthor struct {
-	Date  *time.Time `json:"date,omitempty"`
-	Name  *string    `json:"name,omitempty"`
-	Email *string    `json:"email,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	Login *string `json:"username,omitempty"` // Renamed for go-github consistency.
-}
-
-func (c CommitAuthor) String() string {
-	return Stringify(c)
-}
-
-// GetCommit fetchs the Commit object for a given SHA.
-//
-// GitHub API docs: https://developer.github.com/v3/git/commits/#get-a-commit
-func (s *GitService) GetCommit(ctx context.Context, owner string, repo string, sha string) (*Commit, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/git/commits/%v", owner, repo, sha)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeGitSigningPreview)
-
-	c := new(Commit)
-	resp, err := s.client.Do(ctx, req, c)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return c, resp, nil
-}
-
-// createCommit represents the body of a CreateCommit request.
-type createCommit struct {
-	Author    *CommitAuthor `json:"author,omitempty"`
-	Committer *CommitAuthor `json:"committer,omitempty"`
-	Message   *string       `json:"message,omitempty"`
-	Tree      *string       `json:"tree,omitempty"`
-	Parents   []string      `json:"parents,omitempty"`
-}
-
-// CreateCommit creates a new commit in a repository.
-// commit must not be nil.
-//
-// The commit.Committer is optional and will be filled with the commit.Author
-// data if omitted. If the commit.Author is omitted, it will be filled in with
-// the authenticated user’s information and the current date.
-//
-// GitHub API docs: https://developer.github.com/v3/git/commits/#create-a-commit
-func (s *GitService) CreateCommit(ctx context.Context, owner string, repo string, commit *Commit) (*Commit, *Response, error) {
-	if commit == nil {
-		return nil, nil, fmt.Errorf("commit must be provided")
-	}
-
-	u := fmt.Sprintf("repos/%v/%v/git/commits", owner, repo)
-
-	parents := make([]string, len(commit.Parents))
-	for i, parent := range commit.Parents {
-		parents[i] = *parent.SHA
-	}
-
-	body := &createCommit{
-		Author:    commit.Author,
-		Committer: commit.Committer,
-		Message:   commit.Message,
-		Parents:   parents,
-	}
-	if commit.Tree != nil {
-		body.Tree = commit.Tree.SHA
-	}
-
-	req, err := s.client.NewRequest("POST", u, body)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	c := new(Commit)
-	resp, err := s.client.Do(ctx, req, c)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return c, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/git_refs.go b/vendor/github.com/google/go-github/github/git_refs.go
deleted file mode 100644
index e78fdc6c09..0000000000
--- a/vendor/github.com/google/go-github/github/git_refs.go
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strings"
-)
-
-// Reference represents a GitHub reference.
-type Reference struct {
-	Ref    *string    `json:"ref"`
-	URL    *string    `json:"url"`
-	Object *GitObject `json:"object"`
-}
-
-func (r Reference) String() string {
-	return Stringify(r)
-}
-
-// GitObject represents a Git object.
-type GitObject struct {
-	Type *string `json:"type"`
-	SHA  *string `json:"sha"`
-	URL  *string `json:"url"`
-}
-
-func (o GitObject) String() string {
-	return Stringify(o)
-}
-
-// createRefRequest represents the payload for creating a reference.
-type createRefRequest struct {
-	Ref *string `json:"ref"`
-	SHA *string `json:"sha"`
-}
-
-// updateRefRequest represents the payload for updating a reference.
-type updateRefRequest struct {
-	SHA   *string `json:"sha"`
-	Force *bool   `json:"force"`
-}
-
-// GetRef fetches a single Reference object for a given Git ref.
-// If there is no exact match, GetRef will return an error.
-//
-// Note: The GitHub API can return multiple matches.
-// If you wish to use this functionality please use the GetRefs() method.
-//
-// GitHub API docs: https://developer.github.com/v3/git/refs/#get-a-reference
-func (s *GitService) GetRef(ctx context.Context, owner string, repo string, ref string) (*Reference, *Response, error) {
-	ref = strings.TrimPrefix(ref, "refs/")
-	u := fmt.Sprintf("repos/%v/%v/git/refs/%v", owner, repo, ref)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r := new(Reference)
-	resp, err := s.client.Do(ctx, req, r)
-	if _, ok := err.(*json.UnmarshalTypeError); ok {
-		// Multiple refs, means there wasn't an exact match.
-		return nil, resp, errors.New("no exact match found for this ref")
-	} else if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, nil
-}
-
-// GetRefs fetches a slice of Reference objects for a given Git ref.
-// If there is an exact match, only that ref is returned.
-// If there is no exact match, GitHub returns all refs that start with ref.
-// If returned error is nil, there will be at least 1 ref returned.
-// For example:
-//
-// 	"heads/featureA" -> ["refs/heads/featureA"]                         // Exact match, single ref is returned.
-// 	"heads/feature"  -> ["refs/heads/featureA", "refs/heads/featureB"]  // All refs that start with ref.
-// 	"heads/notexist" -> []                                              // Returns an error.
-//
-// GitHub API docs: https://developer.github.com/v3/git/refs/#get-a-reference
-func (s *GitService) GetRefs(ctx context.Context, owner string, repo string, ref string) ([]*Reference, *Response, error) {
-	ref = strings.TrimPrefix(ref, "refs/")
-	u := fmt.Sprintf("repos/%v/%v/git/refs/%v", owner, repo, ref)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var rawJSON json.RawMessage
-	resp, err := s.client.Do(ctx, req, &rawJSON)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	// Prioritize the most common case: a single returned ref.
-	r := new(Reference)
-	singleUnmarshalError := json.Unmarshal(rawJSON, r)
-	if singleUnmarshalError == nil {
-		return []*Reference{r}, resp, nil
-	}
-
-	// Attempt to unmarshal multiple refs.
-	var rs []*Reference
-	multipleUnmarshalError := json.Unmarshal(rawJSON, &rs)
-	if multipleUnmarshalError == nil {
-		if len(rs) == 0 {
-			return nil, resp, fmt.Errorf("unexpected response from GitHub API: an array of refs with length 0")
-		}
-		return rs, resp, nil
-	}
-
-	return nil, resp, fmt.Errorf("unmarshalling failed for both single and multiple refs: %s and %s", singleUnmarshalError, multipleUnmarshalError)
-}
-
-// ReferenceListOptions specifies optional parameters to the
-// GitService.ListRefs method.
-type ReferenceListOptions struct {
-	Type string `url:"-"`
-
-	ListOptions
-}
-
-// ListRefs lists all refs in a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/git/refs/#get-all-references
-func (s *GitService) ListRefs(ctx context.Context, owner, repo string, opt *ReferenceListOptions) ([]*Reference, *Response, error) {
-	var u string
-	if opt != nil && opt.Type != "" {
-		u = fmt.Sprintf("repos/%v/%v/git/refs/%v", owner, repo, opt.Type)
-	} else {
-		u = fmt.Sprintf("repos/%v/%v/git/refs", owner, repo)
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var rs []*Reference
-	resp, err := s.client.Do(ctx, req, &rs)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return rs, resp, nil
-}
-
-// CreateRef creates a new ref in a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/git/refs/#create-a-reference
-func (s *GitService) CreateRef(ctx context.Context, owner string, repo string, ref *Reference) (*Reference, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/git/refs", owner, repo)
-	req, err := s.client.NewRequest("POST", u, &createRefRequest{
-		// back-compat with previous behavior that didn't require 'refs/' prefix
-		Ref: String("refs/" + strings.TrimPrefix(*ref.Ref, "refs/")),
-		SHA: ref.Object.SHA,
-	})
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r := new(Reference)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, nil
-}
-
-// UpdateRef updates an existing ref in a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/git/refs/#update-a-reference
-func (s *GitService) UpdateRef(ctx context.Context, owner string, repo string, ref *Reference, force bool) (*Reference, *Response, error) {
-	refPath := strings.TrimPrefix(*ref.Ref, "refs/")
-	u := fmt.Sprintf("repos/%v/%v/git/refs/%v", owner, repo, refPath)
-	req, err := s.client.NewRequest("PATCH", u, &updateRefRequest{
-		SHA:   ref.Object.SHA,
-		Force: &force,
-	})
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r := new(Reference)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, nil
-}
-
-// DeleteRef deletes a ref from a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/git/refs/#delete-a-reference
-func (s *GitService) DeleteRef(ctx context.Context, owner string, repo string, ref string) (*Response, error) {
-	ref = strings.TrimPrefix(ref, "refs/")
-	u := fmt.Sprintf("repos/%v/%v/git/refs/%v", owner, repo, ref)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/git_tags.go b/vendor/github.com/google/go-github/github/git_tags.go
deleted file mode 100644
index 08df3d3d1b..0000000000
--- a/vendor/github.com/google/go-github/github/git_tags.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// Tag represents a tag object.
-type Tag struct {
-	Tag          *string                `json:"tag,omitempty"`
-	SHA          *string                `json:"sha,omitempty"`
-	URL          *string                `json:"url,omitempty"`
-	Message      *string                `json:"message,omitempty"`
-	Tagger       *CommitAuthor          `json:"tagger,omitempty"`
-	Object       *GitObject             `json:"object,omitempty"`
-	Verification *SignatureVerification `json:"verification,omitempty"`
-}
-
-// createTagRequest represents the body of a CreateTag request. This is mostly
-// identical to Tag with the exception that the object SHA and Type are
-// top-level fields, rather than being nested inside a JSON object.
-type createTagRequest struct {
-	Tag     *string       `json:"tag,omitempty"`
-	Message *string       `json:"message,omitempty"`
-	Object  *string       `json:"object,omitempty"`
-	Type    *string       `json:"type,omitempty"`
-	Tagger  *CommitAuthor `json:"tagger,omitempty"`
-}
-
-// GetTag fetchs a tag from a repo given a SHA.
-//
-// GitHub API docs: https://developer.github.com/v3/git/tags/#get-a-tag
-func (s *GitService) GetTag(ctx context.Context, owner string, repo string, sha string) (*Tag, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/git/tags/%v", owner, repo, sha)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeGitSigningPreview)
-
-	tag := new(Tag)
-	resp, err := s.client.Do(ctx, req, tag)
-	return tag, resp, err
-}
-
-// CreateTag creates a tag object.
-//
-// GitHub API docs: https://developer.github.com/v3/git/tags/#create-a-tag-object
-func (s *GitService) CreateTag(ctx context.Context, owner string, repo string, tag *Tag) (*Tag, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/git/tags", owner, repo)
-
-	// convert Tag into a createTagRequest
-	tagRequest := &createTagRequest{
-		Tag:     tag.Tag,
-		Message: tag.Message,
-		Tagger:  tag.Tagger,
-	}
-	if tag.Object != nil {
-		tagRequest.Object = tag.Object.SHA
-		tagRequest.Type = tag.Object.Type
-	}
-
-	req, err := s.client.NewRequest("POST", u, tagRequest)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	t := new(Tag)
-	resp, err := s.client.Do(ctx, req, t)
-	return t, resp, err
-}
diff --git a/vendor/github.com/google/go-github/github/git_trees.go b/vendor/github.com/google/go-github/github/git_trees.go
deleted file mode 100644
index 4d6809a880..0000000000
--- a/vendor/github.com/google/go-github/github/git_trees.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// Tree represents a GitHub tree.
-type Tree struct {
-	SHA     *string     `json:"sha,omitempty"`
-	Entries []TreeEntry `json:"tree,omitempty"`
-}
-
-func (t Tree) String() string {
-	return Stringify(t)
-}
-
-// TreeEntry represents the contents of a tree structure. TreeEntry can
-// represent either a blob, a commit (in the case of a submodule), or another
-// tree.
-type TreeEntry struct {
-	SHA     *string `json:"sha,omitempty"`
-	Path    *string `json:"path,omitempty"`
-	Mode    *string `json:"mode,omitempty"`
-	Type    *string `json:"type,omitempty"`
-	Size    *int    `json:"size,omitempty"`
-	Content *string `json:"content,omitempty"`
-	URL     *string `json:"url,omitempty"`
-}
-
-func (t TreeEntry) String() string {
-	return Stringify(t)
-}
-
-// GetTree fetches the Tree object for a given sha hash from a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/git/trees/#get-a-tree
-func (s *GitService) GetTree(ctx context.Context, owner string, repo string, sha string, recursive bool) (*Tree, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/git/trees/%v", owner, repo, sha)
-	if recursive {
-		u += "?recursive=1"
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	t := new(Tree)
-	resp, err := s.client.Do(ctx, req, t)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return t, resp, nil
-}
-
-// createTree represents the body of a CreateTree request.
-type createTree struct {
-	BaseTree string      `json:"base_tree,omitempty"`
-	Entries  []TreeEntry `json:"tree"`
-}
-
-// CreateTree creates a new tree in a repository. If both a tree and a nested
-// path modifying that tree are specified, it will overwrite the contents of
-// that tree with the new path contents and write a new tree out.
-//
-// GitHub API docs: https://developer.github.com/v3/git/trees/#create-a-tree
-func (s *GitService) CreateTree(ctx context.Context, owner string, repo string, baseTree string, entries []TreeEntry) (*Tree, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/git/trees", owner, repo)
-
-	body := &createTree{
-		BaseTree: baseTree,
-		Entries:  entries,
-	}
-	req, err := s.client.NewRequest("POST", u, body)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	t := new(Tree)
-	resp, err := s.client.Do(ctx, req, t)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return t, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/github-accessors.go b/vendor/github.com/google/go-github/github/github-accessors.go
deleted file mode 100644
index 5368001033..0000000000
--- a/vendor/github.com/google/go-github/github/github-accessors.go
+++ /dev/null
@@ -1,7469 +0,0 @@
-// Copyright 2017 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by gen-accessors; DO NOT EDIT.
-
-package github
-
-import (
-	"encoding/json"
-	"time"
-)
-
-// GetRetryAfter returns the RetryAfter field if it's non-nil, zero value otherwise.
-func (a *AbuseRateLimitError) GetRetryAfter() time.Duration {
-	if a == nil || a.RetryAfter == nil {
-		return 0
-	}
-	return *a.RetryAfter
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (a *AdminEnforcement) GetURL() string {
-	if a == nil || a.URL == nil {
-		return ""
-	}
-	return *a.URL
-}
-
-// GetVerifiablePasswordAuthentication returns the VerifiablePasswordAuthentication field if it's non-nil, zero value otherwise.
-func (a *APIMeta) GetVerifiablePasswordAuthentication() bool {
-	if a == nil || a.VerifiablePasswordAuthentication == nil {
-		return false
-	}
-	return *a.VerifiablePasswordAuthentication
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (a *Authorization) GetCreatedAt() Timestamp {
-	if a == nil || a.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *a.CreatedAt
-}
-
-// GetFingerprint returns the Fingerprint field if it's non-nil, zero value otherwise.
-func (a *Authorization) GetFingerprint() string {
-	if a == nil || a.Fingerprint == nil {
-		return ""
-	}
-	return *a.Fingerprint
-}
-
-// GetHashedToken returns the HashedToken field if it's non-nil, zero value otherwise.
-func (a *Authorization) GetHashedToken() string {
-	if a == nil || a.HashedToken == nil {
-		return ""
-	}
-	return *a.HashedToken
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (a *Authorization) GetID() int {
-	if a == nil || a.ID == nil {
-		return 0
-	}
-	return *a.ID
-}
-
-// GetNote returns the Note field if it's non-nil, zero value otherwise.
-func (a *Authorization) GetNote() string {
-	if a == nil || a.Note == nil {
-		return ""
-	}
-	return *a.Note
-}
-
-// GetNoteURL returns the NoteURL field if it's non-nil, zero value otherwise.
-func (a *Authorization) GetNoteURL() string {
-	if a == nil || a.NoteURL == nil {
-		return ""
-	}
-	return *a.NoteURL
-}
-
-// GetToken returns the Token field if it's non-nil, zero value otherwise.
-func (a *Authorization) GetToken() string {
-	if a == nil || a.Token == nil {
-		return ""
-	}
-	return *a.Token
-}
-
-// GetTokenLastEight returns the TokenLastEight field if it's non-nil, zero value otherwise.
-func (a *Authorization) GetTokenLastEight() string {
-	if a == nil || a.TokenLastEight == nil {
-		return ""
-	}
-	return *a.TokenLastEight
-}
-
-// GetUpdateAt returns the UpdateAt field if it's non-nil, zero value otherwise.
-func (a *Authorization) GetUpdateAt() Timestamp {
-	if a == nil || a.UpdateAt == nil {
-		return Timestamp{}
-	}
-	return *a.UpdateAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (a *Authorization) GetURL() string {
-	if a == nil || a.URL == nil {
-		return ""
-	}
-	return *a.URL
-}
-
-// GetClientID returns the ClientID field if it's non-nil, zero value otherwise.
-func (a *AuthorizationApp) GetClientID() string {
-	if a == nil || a.ClientID == nil {
-		return ""
-	}
-	return *a.ClientID
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (a *AuthorizationApp) GetName() string {
-	if a == nil || a.Name == nil {
-		return ""
-	}
-	return *a.Name
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (a *AuthorizationApp) GetURL() string {
-	if a == nil || a.URL == nil {
-		return ""
-	}
-	return *a.URL
-}
-
-// GetClientID returns the ClientID field if it's non-nil, zero value otherwise.
-func (a *AuthorizationRequest) GetClientID() string {
-	if a == nil || a.ClientID == nil {
-		return ""
-	}
-	return *a.ClientID
-}
-
-// GetClientSecret returns the ClientSecret field if it's non-nil, zero value otherwise.
-func (a *AuthorizationRequest) GetClientSecret() string {
-	if a == nil || a.ClientSecret == nil {
-		return ""
-	}
-	return *a.ClientSecret
-}
-
-// GetFingerprint returns the Fingerprint field if it's non-nil, zero value otherwise.
-func (a *AuthorizationRequest) GetFingerprint() string {
-	if a == nil || a.Fingerprint == nil {
-		return ""
-	}
-	return *a.Fingerprint
-}
-
-// GetNote returns the Note field if it's non-nil, zero value otherwise.
-func (a *AuthorizationRequest) GetNote() string {
-	if a == nil || a.Note == nil {
-		return ""
-	}
-	return *a.Note
-}
-
-// GetNoteURL returns the NoteURL field if it's non-nil, zero value otherwise.
-func (a *AuthorizationRequest) GetNoteURL() string {
-	if a == nil || a.NoteURL == nil {
-		return ""
-	}
-	return *a.NoteURL
-}
-
-// GetFingerprint returns the Fingerprint field if it's non-nil, zero value otherwise.
-func (a *AuthorizationUpdateRequest) GetFingerprint() string {
-	if a == nil || a.Fingerprint == nil {
-		return ""
-	}
-	return *a.Fingerprint
-}
-
-// GetNote returns the Note field if it's non-nil, zero value otherwise.
-func (a *AuthorizationUpdateRequest) GetNote() string {
-	if a == nil || a.Note == nil {
-		return ""
-	}
-	return *a.Note
-}
-
-// GetNoteURL returns the NoteURL field if it's non-nil, zero value otherwise.
-func (a *AuthorizationUpdateRequest) GetNoteURL() string {
-	if a == nil || a.NoteURL == nil {
-		return ""
-	}
-	return *a.NoteURL
-}
-
-// GetContent returns the Content field if it's non-nil, zero value otherwise.
-func (b *Blob) GetContent() string {
-	if b == nil || b.Content == nil {
-		return ""
-	}
-	return *b.Content
-}
-
-// GetEncoding returns the Encoding field if it's non-nil, zero value otherwise.
-func (b *Blob) GetEncoding() string {
-	if b == nil || b.Encoding == nil {
-		return ""
-	}
-	return *b.Encoding
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (b *Blob) GetSHA() string {
-	if b == nil || b.SHA == nil {
-		return ""
-	}
-	return *b.SHA
-}
-
-// GetSize returns the Size field if it's non-nil, zero value otherwise.
-func (b *Blob) GetSize() int {
-	if b == nil || b.Size == nil {
-		return 0
-	}
-	return *b.Size
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (b *Blob) GetURL() string {
-	if b == nil || b.URL == nil {
-		return ""
-	}
-	return *b.URL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (b *Branch) GetName() string {
-	if b == nil || b.Name == nil {
-		return ""
-	}
-	return *b.Name
-}
-
-// GetProtected returns the Protected field if it's non-nil, zero value otherwise.
-func (b *Branch) GetProtected() bool {
-	if b == nil || b.Protected == nil {
-		return false
-	}
-	return *b.Protected
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (c *CodeOfConduct) GetBody() string {
-	if c == nil || c.Body == nil {
-		return ""
-	}
-	return *c.Body
-}
-
-// GetKey returns the Key field if it's non-nil, zero value otherwise.
-func (c *CodeOfConduct) GetKey() string {
-	if c == nil || c.Key == nil {
-		return ""
-	}
-	return *c.Key
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (c *CodeOfConduct) GetName() string {
-	if c == nil || c.Name == nil {
-		return ""
-	}
-	return *c.Name
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (c *CodeOfConduct) GetURL() string {
-	if c == nil || c.URL == nil {
-		return ""
-	}
-	return *c.URL
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (c *CodeResult) GetHTMLURL() string {
-	if c == nil || c.HTMLURL == nil {
-		return ""
-	}
-	return *c.HTMLURL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (c *CodeResult) GetName() string {
-	if c == nil || c.Name == nil {
-		return ""
-	}
-	return *c.Name
-}
-
-// GetPath returns the Path field if it's non-nil, zero value otherwise.
-func (c *CodeResult) GetPath() string {
-	if c == nil || c.Path == nil {
-		return ""
-	}
-	return *c.Path
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (c *CodeResult) GetSHA() string {
-	if c == nil || c.SHA == nil {
-		return ""
-	}
-	return *c.SHA
-}
-
-// GetIncompleteResults returns the IncompleteResults field if it's non-nil, zero value otherwise.
-func (c *CodeSearchResult) GetIncompleteResults() bool {
-	if c == nil || c.IncompleteResults == nil {
-		return false
-	}
-	return *c.IncompleteResults
-}
-
-// GetTotal returns the Total field if it's non-nil, zero value otherwise.
-func (c *CodeSearchResult) GetTotal() int {
-	if c == nil || c.Total == nil {
-		return 0
-	}
-	return *c.Total
-}
-
-// GetCommitURL returns the CommitURL field if it's non-nil, zero value otherwise.
-func (c *CombinedStatus) GetCommitURL() string {
-	if c == nil || c.CommitURL == nil {
-		return ""
-	}
-	return *c.CommitURL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (c *CombinedStatus) GetName() string {
-	if c == nil || c.Name == nil {
-		return ""
-	}
-	return *c.Name
-}
-
-// GetRepositoryURL returns the RepositoryURL field if it's non-nil, zero value otherwise.
-func (c *CombinedStatus) GetRepositoryURL() string {
-	if c == nil || c.RepositoryURL == nil {
-		return ""
-	}
-	return *c.RepositoryURL
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (c *CombinedStatus) GetSHA() string {
-	if c == nil || c.SHA == nil {
-		return ""
-	}
-	return *c.SHA
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (c *CombinedStatus) GetState() string {
-	if c == nil || c.State == nil {
-		return ""
-	}
-	return *c.State
-}
-
-// GetTotalCount returns the TotalCount field if it's non-nil, zero value otherwise.
-func (c *CombinedStatus) GetTotalCount() int {
-	if c == nil || c.TotalCount == nil {
-		return 0
-	}
-	return *c.TotalCount
-}
-
-// GetCommentCount returns the CommentCount field if it's non-nil, zero value otherwise.
-func (c *Commit) GetCommentCount() int {
-	if c == nil || c.CommentCount == nil {
-		return 0
-	}
-	return *c.CommentCount
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (c *Commit) GetHTMLURL() string {
-	if c == nil || c.HTMLURL == nil {
-		return ""
-	}
-	return *c.HTMLURL
-}
-
-// GetMessage returns the Message field if it's non-nil, zero value otherwise.
-func (c *Commit) GetMessage() string {
-	if c == nil || c.Message == nil {
-		return ""
-	}
-	return *c.Message
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (c *Commit) GetSHA() string {
-	if c == nil || c.SHA == nil {
-		return ""
-	}
-	return *c.SHA
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (c *Commit) GetURL() string {
-	if c == nil || c.URL == nil {
-		return ""
-	}
-	return *c.URL
-}
-
-// GetDate returns the Date field if it's non-nil, zero value otherwise.
-func (c *CommitAuthor) GetDate() time.Time {
-	if c == nil || c.Date == nil {
-		return time.Time{}
-	}
-	return *c.Date
-}
-
-// GetEmail returns the Email field if it's non-nil, zero value otherwise.
-func (c *CommitAuthor) GetEmail() string {
-	if c == nil || c.Email == nil {
-		return ""
-	}
-	return *c.Email
-}
-
-// GetLogin returns the Login field if it's non-nil, zero value otherwise.
-func (c *CommitAuthor) GetLogin() string {
-	if c == nil || c.Login == nil {
-		return ""
-	}
-	return *c.Login
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (c *CommitAuthor) GetName() string {
-	if c == nil || c.Name == nil {
-		return ""
-	}
-	return *c.Name
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (c *CommitCommentEvent) GetAction() string {
-	if c == nil || c.Action == nil {
-		return ""
-	}
-	return *c.Action
-}
-
-// GetAdditions returns the Additions field if it's non-nil, zero value otherwise.
-func (c *CommitFile) GetAdditions() int {
-	if c == nil || c.Additions == nil {
-		return 0
-	}
-	return *c.Additions
-}
-
-// GetBlobURL returns the BlobURL field if it's non-nil, zero value otherwise.
-func (c *CommitFile) GetBlobURL() string {
-	if c == nil || c.BlobURL == nil {
-		return ""
-	}
-	return *c.BlobURL
-}
-
-// GetChanges returns the Changes field if it's non-nil, zero value otherwise.
-func (c *CommitFile) GetChanges() int {
-	if c == nil || c.Changes == nil {
-		return 0
-	}
-	return *c.Changes
-}
-
-// GetContentsURL returns the ContentsURL field if it's non-nil, zero value otherwise.
-func (c *CommitFile) GetContentsURL() string {
-	if c == nil || c.ContentsURL == nil {
-		return ""
-	}
-	return *c.ContentsURL
-}
-
-// GetDeletions returns the Deletions field if it's non-nil, zero value otherwise.
-func (c *CommitFile) GetDeletions() int {
-	if c == nil || c.Deletions == nil {
-		return 0
-	}
-	return *c.Deletions
-}
-
-// GetFilename returns the Filename field if it's non-nil, zero value otherwise.
-func (c *CommitFile) GetFilename() string {
-	if c == nil || c.Filename == nil {
-		return ""
-	}
-	return *c.Filename
-}
-
-// GetPatch returns the Patch field if it's non-nil, zero value otherwise.
-func (c *CommitFile) GetPatch() string {
-	if c == nil || c.Patch == nil {
-		return ""
-	}
-	return *c.Patch
-}
-
-// GetRawURL returns the RawURL field if it's non-nil, zero value otherwise.
-func (c *CommitFile) GetRawURL() string {
-	if c == nil || c.RawURL == nil {
-		return ""
-	}
-	return *c.RawURL
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (c *CommitFile) GetSHA() string {
-	if c == nil || c.SHA == nil {
-		return ""
-	}
-	return *c.SHA
-}
-
-// GetStatus returns the Status field if it's non-nil, zero value otherwise.
-func (c *CommitFile) GetStatus() string {
-	if c == nil || c.Status == nil {
-		return ""
-	}
-	return *c.Status
-}
-
-// GetCommentsURL returns the CommentsURL field if it's non-nil, zero value otherwise.
-func (c *CommitResult) GetCommentsURL() string {
-	if c == nil || c.CommentsURL == nil {
-		return ""
-	}
-	return *c.CommentsURL
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (c *CommitResult) GetHTMLURL() string {
-	if c == nil || c.HTMLURL == nil {
-		return ""
-	}
-	return *c.HTMLURL
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (c *CommitResult) GetSHA() string {
-	if c == nil || c.SHA == nil {
-		return ""
-	}
-	return *c.SHA
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (c *CommitResult) GetURL() string {
-	if c == nil || c.URL == nil {
-		return ""
-	}
-	return *c.URL
-}
-
-// GetAheadBy returns the AheadBy field if it's non-nil, zero value otherwise.
-func (c *CommitsComparison) GetAheadBy() int {
-	if c == nil || c.AheadBy == nil {
-		return 0
-	}
-	return *c.AheadBy
-}
-
-// GetBehindBy returns the BehindBy field if it's non-nil, zero value otherwise.
-func (c *CommitsComparison) GetBehindBy() int {
-	if c == nil || c.BehindBy == nil {
-		return 0
-	}
-	return *c.BehindBy
-}
-
-// GetDiffURL returns the DiffURL field if it's non-nil, zero value otherwise.
-func (c *CommitsComparison) GetDiffURL() string {
-	if c == nil || c.DiffURL == nil {
-		return ""
-	}
-	return *c.DiffURL
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (c *CommitsComparison) GetHTMLURL() string {
-	if c == nil || c.HTMLURL == nil {
-		return ""
-	}
-	return *c.HTMLURL
-}
-
-// GetPatchURL returns the PatchURL field if it's non-nil, zero value otherwise.
-func (c *CommitsComparison) GetPatchURL() string {
-	if c == nil || c.PatchURL == nil {
-		return ""
-	}
-	return *c.PatchURL
-}
-
-// GetPermalinkURL returns the PermalinkURL field if it's non-nil, zero value otherwise.
-func (c *CommitsComparison) GetPermalinkURL() string {
-	if c == nil || c.PermalinkURL == nil {
-		return ""
-	}
-	return *c.PermalinkURL
-}
-
-// GetStatus returns the Status field if it's non-nil, zero value otherwise.
-func (c *CommitsComparison) GetStatus() string {
-	if c == nil || c.Status == nil {
-		return ""
-	}
-	return *c.Status
-}
-
-// GetTotalCommits returns the TotalCommits field if it's non-nil, zero value otherwise.
-func (c *CommitsComparison) GetTotalCommits() int {
-	if c == nil || c.TotalCommits == nil {
-		return 0
-	}
-	return *c.TotalCommits
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (c *CommitsComparison) GetURL() string {
-	if c == nil || c.URL == nil {
-		return ""
-	}
-	return *c.URL
-}
-
-// GetIncompleteResults returns the IncompleteResults field if it's non-nil, zero value otherwise.
-func (c *CommitsSearchResult) GetIncompleteResults() bool {
-	if c == nil || c.IncompleteResults == nil {
-		return false
-	}
-	return *c.IncompleteResults
-}
-
-// GetTotal returns the Total field if it's non-nil, zero value otherwise.
-func (c *CommitsSearchResult) GetTotal() int {
-	if c == nil || c.Total == nil {
-		return 0
-	}
-	return *c.Total
-}
-
-// GetAdditions returns the Additions field if it's non-nil, zero value otherwise.
-func (c *CommitStats) GetAdditions() int {
-	if c == nil || c.Additions == nil {
-		return 0
-	}
-	return *c.Additions
-}
-
-// GetDeletions returns the Deletions field if it's non-nil, zero value otherwise.
-func (c *CommitStats) GetDeletions() int {
-	if c == nil || c.Deletions == nil {
-		return 0
-	}
-	return *c.Deletions
-}
-
-// GetTotal returns the Total field if it's non-nil, zero value otherwise.
-func (c *CommitStats) GetTotal() int {
-	if c == nil || c.Total == nil {
-		return 0
-	}
-	return *c.Total
-}
-
-// GetHealthPercentage returns the HealthPercentage field if it's non-nil, zero value otherwise.
-func (c *CommunityHealthMetrics) GetHealthPercentage() int {
-	if c == nil || c.HealthPercentage == nil {
-		return 0
-	}
-	return *c.HealthPercentage
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (c *CommunityHealthMetrics) GetUpdatedAt() time.Time {
-	if c == nil || c.UpdatedAt == nil {
-		return time.Time{}
-	}
-	return *c.UpdatedAt
-}
-
-// GetAvatarURL returns the AvatarURL field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetAvatarURL() string {
-	if c == nil || c.AvatarURL == nil {
-		return ""
-	}
-	return *c.AvatarURL
-}
-
-// GetContributions returns the Contributions field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetContributions() int {
-	if c == nil || c.Contributions == nil {
-		return 0
-	}
-	return *c.Contributions
-}
-
-// GetEventsURL returns the EventsURL field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetEventsURL() string {
-	if c == nil || c.EventsURL == nil {
-		return ""
-	}
-	return *c.EventsURL
-}
-
-// GetFollowersURL returns the FollowersURL field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetFollowersURL() string {
-	if c == nil || c.FollowersURL == nil {
-		return ""
-	}
-	return *c.FollowersURL
-}
-
-// GetFollowingURL returns the FollowingURL field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetFollowingURL() string {
-	if c == nil || c.FollowingURL == nil {
-		return ""
-	}
-	return *c.FollowingURL
-}
-
-// GetGistsURL returns the GistsURL field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetGistsURL() string {
-	if c == nil || c.GistsURL == nil {
-		return ""
-	}
-	return *c.GistsURL
-}
-
-// GetGravatarID returns the GravatarID field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetGravatarID() string {
-	if c == nil || c.GravatarID == nil {
-		return ""
-	}
-	return *c.GravatarID
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetHTMLURL() string {
-	if c == nil || c.HTMLURL == nil {
-		return ""
-	}
-	return *c.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetID() int {
-	if c == nil || c.ID == nil {
-		return 0
-	}
-	return *c.ID
-}
-
-// GetLogin returns the Login field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetLogin() string {
-	if c == nil || c.Login == nil {
-		return ""
-	}
-	return *c.Login
-}
-
-// GetOrganizationsURL returns the OrganizationsURL field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetOrganizationsURL() string {
-	if c == nil || c.OrganizationsURL == nil {
-		return ""
-	}
-	return *c.OrganizationsURL
-}
-
-// GetReceivedEventsURL returns the ReceivedEventsURL field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetReceivedEventsURL() string {
-	if c == nil || c.ReceivedEventsURL == nil {
-		return ""
-	}
-	return *c.ReceivedEventsURL
-}
-
-// GetReposURL returns the ReposURL field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetReposURL() string {
-	if c == nil || c.ReposURL == nil {
-		return ""
-	}
-	return *c.ReposURL
-}
-
-// GetSiteAdmin returns the SiteAdmin field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetSiteAdmin() bool {
-	if c == nil || c.SiteAdmin == nil {
-		return false
-	}
-	return *c.SiteAdmin
-}
-
-// GetStarredURL returns the StarredURL field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetStarredURL() string {
-	if c == nil || c.StarredURL == nil {
-		return ""
-	}
-	return *c.StarredURL
-}
-
-// GetSubscriptionsURL returns the SubscriptionsURL field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetSubscriptionsURL() string {
-	if c == nil || c.SubscriptionsURL == nil {
-		return ""
-	}
-	return *c.SubscriptionsURL
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetType() string {
-	if c == nil || c.Type == nil {
-		return ""
-	}
-	return *c.Type
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (c *Contributor) GetURL() string {
-	if c == nil || c.URL == nil {
-		return ""
-	}
-	return *c.URL
-}
-
-// GetTotal returns the Total field if it's non-nil, zero value otherwise.
-func (c *ContributorStats) GetTotal() int {
-	if c == nil || c.Total == nil {
-		return 0
-	}
-	return *c.Total
-}
-
-// GetMessage returns the Message field if it's non-nil, zero value otherwise.
-func (c *createCommit) GetMessage() string {
-	if c == nil || c.Message == nil {
-		return ""
-	}
-	return *c.Message
-}
-
-// GetTree returns the Tree field if it's non-nil, zero value otherwise.
-func (c *createCommit) GetTree() string {
-	if c == nil || c.Tree == nil {
-		return ""
-	}
-	return *c.Tree
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (c *CreateEvent) GetDescription() string {
-	if c == nil || c.Description == nil {
-		return ""
-	}
-	return *c.Description
-}
-
-// GetMasterBranch returns the MasterBranch field if it's non-nil, zero value otherwise.
-func (c *CreateEvent) GetMasterBranch() string {
-	if c == nil || c.MasterBranch == nil {
-		return ""
-	}
-	return *c.MasterBranch
-}
-
-// GetPusherType returns the PusherType field if it's non-nil, zero value otherwise.
-func (c *CreateEvent) GetPusherType() string {
-	if c == nil || c.PusherType == nil {
-		return ""
-	}
-	return *c.PusherType
-}
-
-// GetRef returns the Ref field if it's non-nil, zero value otherwise.
-func (c *CreateEvent) GetRef() string {
-	if c == nil || c.Ref == nil {
-		return ""
-	}
-	return *c.Ref
-}
-
-// GetRefType returns the RefType field if it's non-nil, zero value otherwise.
-func (c *CreateEvent) GetRefType() string {
-	if c == nil || c.RefType == nil {
-		return ""
-	}
-	return *c.RefType
-}
-
-// GetRef returns the Ref field if it's non-nil, zero value otherwise.
-func (c *createRefRequest) GetRef() string {
-	if c == nil || c.Ref == nil {
-		return ""
-	}
-	return *c.Ref
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (c *createRefRequest) GetSHA() string {
-	if c == nil || c.SHA == nil {
-		return ""
-	}
-	return *c.SHA
-}
-
-// GetMessage returns the Message field if it's non-nil, zero value otherwise.
-func (c *createTagRequest) GetMessage() string {
-	if c == nil || c.Message == nil {
-		return ""
-	}
-	return *c.Message
-}
-
-// GetObject returns the Object field if it's non-nil, zero value otherwise.
-func (c *createTagRequest) GetObject() string {
-	if c == nil || c.Object == nil {
-		return ""
-	}
-	return *c.Object
-}
-
-// GetTag returns the Tag field if it's non-nil, zero value otherwise.
-func (c *createTagRequest) GetTag() string {
-	if c == nil || c.Tag == nil {
-		return ""
-	}
-	return *c.Tag
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (c *createTagRequest) GetType() string {
-	if c == nil || c.Type == nil {
-		return ""
-	}
-	return *c.Type
-}
-
-// GetPusherType returns the PusherType field if it's non-nil, zero value otherwise.
-func (d *DeleteEvent) GetPusherType() string {
-	if d == nil || d.PusherType == nil {
-		return ""
-	}
-	return *d.PusherType
-}
-
-// GetRef returns the Ref field if it's non-nil, zero value otherwise.
-func (d *DeleteEvent) GetRef() string {
-	if d == nil || d.Ref == nil {
-		return ""
-	}
-	return *d.Ref
-}
-
-// GetRefType returns the RefType field if it's non-nil, zero value otherwise.
-func (d *DeleteEvent) GetRefType() string {
-	if d == nil || d.RefType == nil {
-		return ""
-	}
-	return *d.RefType
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (d *Deployment) GetCreatedAt() Timestamp {
-	if d == nil || d.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *d.CreatedAt
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (d *Deployment) GetDescription() string {
-	if d == nil || d.Description == nil {
-		return ""
-	}
-	return *d.Description
-}
-
-// GetEnvironment returns the Environment field if it's non-nil, zero value otherwise.
-func (d *Deployment) GetEnvironment() string {
-	if d == nil || d.Environment == nil {
-		return ""
-	}
-	return *d.Environment
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (d *Deployment) GetID() int {
-	if d == nil || d.ID == nil {
-		return 0
-	}
-	return *d.ID
-}
-
-// GetRef returns the Ref field if it's non-nil, zero value otherwise.
-func (d *Deployment) GetRef() string {
-	if d == nil || d.Ref == nil {
-		return ""
-	}
-	return *d.Ref
-}
-
-// GetRepositoryURL returns the RepositoryURL field if it's non-nil, zero value otherwise.
-func (d *Deployment) GetRepositoryURL() string {
-	if d == nil || d.RepositoryURL == nil {
-		return ""
-	}
-	return *d.RepositoryURL
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (d *Deployment) GetSHA() string {
-	if d == nil || d.SHA == nil {
-		return ""
-	}
-	return *d.SHA
-}
-
-// GetStatusesURL returns the StatusesURL field if it's non-nil, zero value otherwise.
-func (d *Deployment) GetStatusesURL() string {
-	if d == nil || d.StatusesURL == nil {
-		return ""
-	}
-	return *d.StatusesURL
-}
-
-// GetTask returns the Task field if it's non-nil, zero value otherwise.
-func (d *Deployment) GetTask() string {
-	if d == nil || d.Task == nil {
-		return ""
-	}
-	return *d.Task
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (d *Deployment) GetUpdatedAt() Timestamp {
-	if d == nil || d.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *d.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (d *Deployment) GetURL() string {
-	if d == nil || d.URL == nil {
-		return ""
-	}
-	return *d.URL
-}
-
-// GetAutoMerge returns the AutoMerge field if it's non-nil, zero value otherwise.
-func (d *DeploymentRequest) GetAutoMerge() bool {
-	if d == nil || d.AutoMerge == nil {
-		return false
-	}
-	return *d.AutoMerge
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (d *DeploymentRequest) GetDescription() string {
-	if d == nil || d.Description == nil {
-		return ""
-	}
-	return *d.Description
-}
-
-// GetEnvironment returns the Environment field if it's non-nil, zero value otherwise.
-func (d *DeploymentRequest) GetEnvironment() string {
-	if d == nil || d.Environment == nil {
-		return ""
-	}
-	return *d.Environment
-}
-
-// GetPayload returns the Payload field if it's non-nil, zero value otherwise.
-func (d *DeploymentRequest) GetPayload() string {
-	if d == nil || d.Payload == nil {
-		return ""
-	}
-	return *d.Payload
-}
-
-// GetProductionEnvironment returns the ProductionEnvironment field if it's non-nil, zero value otherwise.
-func (d *DeploymentRequest) GetProductionEnvironment() bool {
-	if d == nil || d.ProductionEnvironment == nil {
-		return false
-	}
-	return *d.ProductionEnvironment
-}
-
-// GetRef returns the Ref field if it's non-nil, zero value otherwise.
-func (d *DeploymentRequest) GetRef() string {
-	if d == nil || d.Ref == nil {
-		return ""
-	}
-	return *d.Ref
-}
-
-// GetRequiredContexts returns the RequiredContexts field if it's non-nil, zero value otherwise.
-func (d *DeploymentRequest) GetRequiredContexts() []string {
-	if d == nil || d.RequiredContexts == nil {
-		return nil
-	}
-	return *d.RequiredContexts
-}
-
-// GetTask returns the Task field if it's non-nil, zero value otherwise.
-func (d *DeploymentRequest) GetTask() string {
-	if d == nil || d.Task == nil {
-		return ""
-	}
-	return *d.Task
-}
-
-// GetTransientEnvironment returns the TransientEnvironment field if it's non-nil, zero value otherwise.
-func (d *DeploymentRequest) GetTransientEnvironment() bool {
-	if d == nil || d.TransientEnvironment == nil {
-		return false
-	}
-	return *d.TransientEnvironment
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatus) GetCreatedAt() Timestamp {
-	if d == nil || d.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *d.CreatedAt
-}
-
-// GetDeploymentURL returns the DeploymentURL field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatus) GetDeploymentURL() string {
-	if d == nil || d.DeploymentURL == nil {
-		return ""
-	}
-	return *d.DeploymentURL
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatus) GetDescription() string {
-	if d == nil || d.Description == nil {
-		return ""
-	}
-	return *d.Description
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatus) GetID() int {
-	if d == nil || d.ID == nil {
-		return 0
-	}
-	return *d.ID
-}
-
-// GetRepositoryURL returns the RepositoryURL field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatus) GetRepositoryURL() string {
-	if d == nil || d.RepositoryURL == nil {
-		return ""
-	}
-	return *d.RepositoryURL
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatus) GetState() string {
-	if d == nil || d.State == nil {
-		return ""
-	}
-	return *d.State
-}
-
-// GetTargetURL returns the TargetURL field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatus) GetTargetURL() string {
-	if d == nil || d.TargetURL == nil {
-		return ""
-	}
-	return *d.TargetURL
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatus) GetUpdatedAt() Timestamp {
-	if d == nil || d.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *d.UpdatedAt
-}
-
-// GetAutoInactive returns the AutoInactive field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatusRequest) GetAutoInactive() bool {
-	if d == nil || d.AutoInactive == nil {
-		return false
-	}
-	return *d.AutoInactive
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatusRequest) GetDescription() string {
-	if d == nil || d.Description == nil {
-		return ""
-	}
-	return *d.Description
-}
-
-// GetEnvironmentURL returns the EnvironmentURL field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatusRequest) GetEnvironmentURL() string {
-	if d == nil || d.EnvironmentURL == nil {
-		return ""
-	}
-	return *d.EnvironmentURL
-}
-
-// GetLogURL returns the LogURL field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatusRequest) GetLogURL() string {
-	if d == nil || d.LogURL == nil {
-		return ""
-	}
-	return *d.LogURL
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (d *DeploymentStatusRequest) GetState() string {
-	if d == nil || d.State == nil {
-		return ""
-	}
-	return *d.State
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (d *DraftReviewComment) GetBody() string {
-	if d == nil || d.Body == nil {
-		return ""
-	}
-	return *d.Body
-}
-
-// GetPath returns the Path field if it's non-nil, zero value otherwise.
-func (d *DraftReviewComment) GetPath() string {
-	if d == nil || d.Path == nil {
-		return ""
-	}
-	return *d.Path
-}
-
-// GetPosition returns the Position field if it's non-nil, zero value otherwise.
-func (d *DraftReviewComment) GetPosition() int {
-	if d == nil || d.Position == nil {
-		return 0
-	}
-	return *d.Position
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (e *Event) GetCreatedAt() time.Time {
-	if e == nil || e.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *e.CreatedAt
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (e *Event) GetID() string {
-	if e == nil || e.ID == nil {
-		return ""
-	}
-	return *e.ID
-}
-
-// GetPublic returns the Public field if it's non-nil, zero value otherwise.
-func (e *Event) GetPublic() bool {
-	if e == nil || e.Public == nil {
-		return false
-	}
-	return *e.Public
-}
-
-// GetRawPayload returns the RawPayload field if it's non-nil, zero value otherwise.
-func (e *Event) GetRawPayload() json.RawMessage {
-	if e == nil || e.RawPayload == nil {
-		return json.RawMessage{}
-	}
-	return *e.RawPayload
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (e *Event) GetType() string {
-	if e == nil || e.Type == nil {
-		return ""
-	}
-	return *e.Type
-}
-
-// GetHRef returns the HRef field if it's non-nil, zero value otherwise.
-func (f *FeedLink) GetHRef() string {
-	if f == nil || f.HRef == nil {
-		return ""
-	}
-	return *f.HRef
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (f *FeedLink) GetType() string {
-	if f == nil || f.Type == nil {
-		return ""
-	}
-	return *f.Type
-}
-
-// GetCurrentUserActorURL returns the CurrentUserActorURL field if it's non-nil, zero value otherwise.
-func (f *Feeds) GetCurrentUserActorURL() string {
-	if f == nil || f.CurrentUserActorURL == nil {
-		return ""
-	}
-	return *f.CurrentUserActorURL
-}
-
-// GetCurrentUserOrganizationURL returns the CurrentUserOrganizationURL field if it's non-nil, zero value otherwise.
-func (f *Feeds) GetCurrentUserOrganizationURL() string {
-	if f == nil || f.CurrentUserOrganizationURL == nil {
-		return ""
-	}
-	return *f.CurrentUserOrganizationURL
-}
-
-// GetCurrentUserPublicURL returns the CurrentUserPublicURL field if it's non-nil, zero value otherwise.
-func (f *Feeds) GetCurrentUserPublicURL() string {
-	if f == nil || f.CurrentUserPublicURL == nil {
-		return ""
-	}
-	return *f.CurrentUserPublicURL
-}
-
-// GetCurrentUserURL returns the CurrentUserURL field if it's non-nil, zero value otherwise.
-func (f *Feeds) GetCurrentUserURL() string {
-	if f == nil || f.CurrentUserURL == nil {
-		return ""
-	}
-	return *f.CurrentUserURL
-}
-
-// GetTimelineURL returns the TimelineURL field if it's non-nil, zero value otherwise.
-func (f *Feeds) GetTimelineURL() string {
-	if f == nil || f.TimelineURL == nil {
-		return ""
-	}
-	return *f.TimelineURL
-}
-
-// GetUserURL returns the UserURL field if it's non-nil, zero value otherwise.
-func (f *Feeds) GetUserURL() string {
-	if f == nil || f.UserURL == nil {
-		return ""
-	}
-	return *f.UserURL
-}
-
-// GetComments returns the Comments field if it's non-nil, zero value otherwise.
-func (g *Gist) GetComments() int {
-	if g == nil || g.Comments == nil {
-		return 0
-	}
-	return *g.Comments
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (g *Gist) GetCreatedAt() time.Time {
-	if g == nil || g.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *g.CreatedAt
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (g *Gist) GetDescription() string {
-	if g == nil || g.Description == nil {
-		return ""
-	}
-	return *g.Description
-}
-
-// GetGitPullURL returns the GitPullURL field if it's non-nil, zero value otherwise.
-func (g *Gist) GetGitPullURL() string {
-	if g == nil || g.GitPullURL == nil {
-		return ""
-	}
-	return *g.GitPullURL
-}
-
-// GetGitPushURL returns the GitPushURL field if it's non-nil, zero value otherwise.
-func (g *Gist) GetGitPushURL() string {
-	if g == nil || g.GitPushURL == nil {
-		return ""
-	}
-	return *g.GitPushURL
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (g *Gist) GetHTMLURL() string {
-	if g == nil || g.HTMLURL == nil {
-		return ""
-	}
-	return *g.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (g *Gist) GetID() string {
-	if g == nil || g.ID == nil {
-		return ""
-	}
-	return *g.ID
-}
-
-// GetPublic returns the Public field if it's non-nil, zero value otherwise.
-func (g *Gist) GetPublic() bool {
-	if g == nil || g.Public == nil {
-		return false
-	}
-	return *g.Public
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (g *Gist) GetUpdatedAt() time.Time {
-	if g == nil || g.UpdatedAt == nil {
-		return time.Time{}
-	}
-	return *g.UpdatedAt
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (g *GistComment) GetBody() string {
-	if g == nil || g.Body == nil {
-		return ""
-	}
-	return *g.Body
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (g *GistComment) GetCreatedAt() time.Time {
-	if g == nil || g.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *g.CreatedAt
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (g *GistComment) GetID() int {
-	if g == nil || g.ID == nil {
-		return 0
-	}
-	return *g.ID
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (g *GistComment) GetURL() string {
-	if g == nil || g.URL == nil {
-		return ""
-	}
-	return *g.URL
-}
-
-// GetCommittedAt returns the CommittedAt field if it's non-nil, zero value otherwise.
-func (g *GistCommit) GetCommittedAt() Timestamp {
-	if g == nil || g.CommittedAt == nil {
-		return Timestamp{}
-	}
-	return *g.CommittedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (g *GistCommit) GetURL() string {
-	if g == nil || g.URL == nil {
-		return ""
-	}
-	return *g.URL
-}
-
-// GetVersion returns the Version field if it's non-nil, zero value otherwise.
-func (g *GistCommit) GetVersion() string {
-	if g == nil || g.Version == nil {
-		return ""
-	}
-	return *g.Version
-}
-
-// GetContent returns the Content field if it's non-nil, zero value otherwise.
-func (g *GistFile) GetContent() string {
-	if g == nil || g.Content == nil {
-		return ""
-	}
-	return *g.Content
-}
-
-// GetFilename returns the Filename field if it's non-nil, zero value otherwise.
-func (g *GistFile) GetFilename() string {
-	if g == nil || g.Filename == nil {
-		return ""
-	}
-	return *g.Filename
-}
-
-// GetLanguage returns the Language field if it's non-nil, zero value otherwise.
-func (g *GistFile) GetLanguage() string {
-	if g == nil || g.Language == nil {
-		return ""
-	}
-	return *g.Language
-}
-
-// GetRawURL returns the RawURL field if it's non-nil, zero value otherwise.
-func (g *GistFile) GetRawURL() string {
-	if g == nil || g.RawURL == nil {
-		return ""
-	}
-	return *g.RawURL
-}
-
-// GetSize returns the Size field if it's non-nil, zero value otherwise.
-func (g *GistFile) GetSize() int {
-	if g == nil || g.Size == nil {
-		return 0
-	}
-	return *g.Size
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (g *GistFile) GetType() string {
-	if g == nil || g.Type == nil {
-		return ""
-	}
-	return *g.Type
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (g *GistFork) GetCreatedAt() Timestamp {
-	if g == nil || g.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *g.CreatedAt
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (g *GistFork) GetID() string {
-	if g == nil || g.ID == nil {
-		return ""
-	}
-	return *g.ID
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (g *GistFork) GetUpdatedAt() Timestamp {
-	if g == nil || g.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *g.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (g *GistFork) GetURL() string {
-	if g == nil || g.URL == nil {
-		return ""
-	}
-	return *g.URL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (g *Gitignore) GetName() string {
-	if g == nil || g.Name == nil {
-		return ""
-	}
-	return *g.Name
-}
-
-// GetSource returns the Source field if it's non-nil, zero value otherwise.
-func (g *Gitignore) GetSource() string {
-	if g == nil || g.Source == nil {
-		return ""
-	}
-	return *g.Source
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (g *GitObject) GetSHA() string {
-	if g == nil || g.SHA == nil {
-		return ""
-	}
-	return *g.SHA
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (g *GitObject) GetType() string {
-	if g == nil || g.Type == nil {
-		return ""
-	}
-	return *g.Type
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (g *GitObject) GetURL() string {
-	if g == nil || g.URL == nil {
-		return ""
-	}
-	return *g.URL
-}
-
-// GetEmail returns the Email field if it's non-nil, zero value otherwise.
-func (g *GPGEmail) GetEmail() string {
-	if g == nil || g.Email == nil {
-		return ""
-	}
-	return *g.Email
-}
-
-// GetVerified returns the Verified field if it's non-nil, zero value otherwise.
-func (g *GPGEmail) GetVerified() bool {
-	if g == nil || g.Verified == nil {
-		return false
-	}
-	return *g.Verified
-}
-
-// GetCanCertify returns the CanCertify field if it's non-nil, zero value otherwise.
-func (g *GPGKey) GetCanCertify() bool {
-	if g == nil || g.CanCertify == nil {
-		return false
-	}
-	return *g.CanCertify
-}
-
-// GetCanEncryptComms returns the CanEncryptComms field if it's non-nil, zero value otherwise.
-func (g *GPGKey) GetCanEncryptComms() bool {
-	if g == nil || g.CanEncryptComms == nil {
-		return false
-	}
-	return *g.CanEncryptComms
-}
-
-// GetCanEncryptStorage returns the CanEncryptStorage field if it's non-nil, zero value otherwise.
-func (g *GPGKey) GetCanEncryptStorage() bool {
-	if g == nil || g.CanEncryptStorage == nil {
-		return false
-	}
-	return *g.CanEncryptStorage
-}
-
-// GetCanSign returns the CanSign field if it's non-nil, zero value otherwise.
-func (g *GPGKey) GetCanSign() bool {
-	if g == nil || g.CanSign == nil {
-		return false
-	}
-	return *g.CanSign
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (g *GPGKey) GetCreatedAt() time.Time {
-	if g == nil || g.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *g.CreatedAt
-}
-
-// GetExpiresAt returns the ExpiresAt field if it's non-nil, zero value otherwise.
-func (g *GPGKey) GetExpiresAt() time.Time {
-	if g == nil || g.ExpiresAt == nil {
-		return time.Time{}
-	}
-	return *g.ExpiresAt
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (g *GPGKey) GetID() int {
-	if g == nil || g.ID == nil {
-		return 0
-	}
-	return *g.ID
-}
-
-// GetKeyID returns the KeyID field if it's non-nil, zero value otherwise.
-func (g *GPGKey) GetKeyID() string {
-	if g == nil || g.KeyID == nil {
-		return ""
-	}
-	return *g.KeyID
-}
-
-// GetPrimaryKeyID returns the PrimaryKeyID field if it's non-nil, zero value otherwise.
-func (g *GPGKey) GetPrimaryKeyID() int {
-	if g == nil || g.PrimaryKeyID == nil {
-		return 0
-	}
-	return *g.PrimaryKeyID
-}
-
-// GetPublicKey returns the PublicKey field if it's non-nil, zero value otherwise.
-func (g *GPGKey) GetPublicKey() string {
-	if g == nil || g.PublicKey == nil {
-		return ""
-	}
-	return *g.PublicKey
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (g *Grant) GetCreatedAt() Timestamp {
-	if g == nil || g.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *g.CreatedAt
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (g *Grant) GetID() int {
-	if g == nil || g.ID == nil {
-		return 0
-	}
-	return *g.ID
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (g *Grant) GetUpdatedAt() Timestamp {
-	if g == nil || g.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *g.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (g *Grant) GetURL() string {
-	if g == nil || g.URL == nil {
-		return ""
-	}
-	return *g.URL
-}
-
-// GetActive returns the Active field if it's non-nil, zero value otherwise.
-func (h *Hook) GetActive() bool {
-	if h == nil || h.Active == nil {
-		return false
-	}
-	return *h.Active
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (h *Hook) GetCreatedAt() time.Time {
-	if h == nil || h.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *h.CreatedAt
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (h *Hook) GetID() int {
-	if h == nil || h.ID == nil {
-		return 0
-	}
-	return *h.ID
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (h *Hook) GetName() string {
-	if h == nil || h.Name == nil {
-		return ""
-	}
-	return *h.Name
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (h *Hook) GetUpdatedAt() time.Time {
-	if h == nil || h.UpdatedAt == nil {
-		return time.Time{}
-	}
-	return *h.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (h *Hook) GetURL() string {
-	if h == nil || h.URL == nil {
-		return ""
-	}
-	return *h.URL
-}
-
-// GetAuthorsCount returns the AuthorsCount field if it's non-nil, zero value otherwise.
-func (i *Import) GetAuthorsCount() int {
-	if i == nil || i.AuthorsCount == nil {
-		return 0
-	}
-	return *i.AuthorsCount
-}
-
-// GetAuthorsURL returns the AuthorsURL field if it's non-nil, zero value otherwise.
-func (i *Import) GetAuthorsURL() string {
-	if i == nil || i.AuthorsURL == nil {
-		return ""
-	}
-	return *i.AuthorsURL
-}
-
-// GetCommitCount returns the CommitCount field if it's non-nil, zero value otherwise.
-func (i *Import) GetCommitCount() int {
-	if i == nil || i.CommitCount == nil {
-		return 0
-	}
-	return *i.CommitCount
-}
-
-// GetFailedStep returns the FailedStep field if it's non-nil, zero value otherwise.
-func (i *Import) GetFailedStep() string {
-	if i == nil || i.FailedStep == nil {
-		return ""
-	}
-	return *i.FailedStep
-}
-
-// GetHasLargeFiles returns the HasLargeFiles field if it's non-nil, zero value otherwise.
-func (i *Import) GetHasLargeFiles() bool {
-	if i == nil || i.HasLargeFiles == nil {
-		return false
-	}
-	return *i.HasLargeFiles
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (i *Import) GetHTMLURL() string {
-	if i == nil || i.HTMLURL == nil {
-		return ""
-	}
-	return *i.HTMLURL
-}
-
-// GetHumanName returns the HumanName field if it's non-nil, zero value otherwise.
-func (i *Import) GetHumanName() string {
-	if i == nil || i.HumanName == nil {
-		return ""
-	}
-	return *i.HumanName
-}
-
-// GetLargeFilesCount returns the LargeFilesCount field if it's non-nil, zero value otherwise.
-func (i *Import) GetLargeFilesCount() int {
-	if i == nil || i.LargeFilesCount == nil {
-		return 0
-	}
-	return *i.LargeFilesCount
-}
-
-// GetLargeFilesSize returns the LargeFilesSize field if it's non-nil, zero value otherwise.
-func (i *Import) GetLargeFilesSize() int {
-	if i == nil || i.LargeFilesSize == nil {
-		return 0
-	}
-	return *i.LargeFilesSize
-}
-
-// GetMessage returns the Message field if it's non-nil, zero value otherwise.
-func (i *Import) GetMessage() string {
-	if i == nil || i.Message == nil {
-		return ""
-	}
-	return *i.Message
-}
-
-// GetPercent returns the Percent field if it's non-nil, zero value otherwise.
-func (i *Import) GetPercent() int {
-	if i == nil || i.Percent == nil {
-		return 0
-	}
-	return *i.Percent
-}
-
-// GetPushPercent returns the PushPercent field if it's non-nil, zero value otherwise.
-func (i *Import) GetPushPercent() int {
-	if i == nil || i.PushPercent == nil {
-		return 0
-	}
-	return *i.PushPercent
-}
-
-// GetRepositoryURL returns the RepositoryURL field if it's non-nil, zero value otherwise.
-func (i *Import) GetRepositoryURL() string {
-	if i == nil || i.RepositoryURL == nil {
-		return ""
-	}
-	return *i.RepositoryURL
-}
-
-// GetStatus returns the Status field if it's non-nil, zero value otherwise.
-func (i *Import) GetStatus() string {
-	if i == nil || i.Status == nil {
-		return ""
-	}
-	return *i.Status
-}
-
-// GetStatusText returns the StatusText field if it's non-nil, zero value otherwise.
-func (i *Import) GetStatusText() string {
-	if i == nil || i.StatusText == nil {
-		return ""
-	}
-	return *i.StatusText
-}
-
-// GetTFVCProject returns the TFVCProject field if it's non-nil, zero value otherwise.
-func (i *Import) GetTFVCProject() string {
-	if i == nil || i.TFVCProject == nil {
-		return ""
-	}
-	return *i.TFVCProject
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (i *Import) GetURL() string {
-	if i == nil || i.URL == nil {
-		return ""
-	}
-	return *i.URL
-}
-
-// GetUseLFS returns the UseLFS field if it's non-nil, zero value otherwise.
-func (i *Import) GetUseLFS() string {
-	if i == nil || i.UseLFS == nil {
-		return ""
-	}
-	return *i.UseLFS
-}
-
-// GetVCS returns the VCS field if it's non-nil, zero value otherwise.
-func (i *Import) GetVCS() string {
-	if i == nil || i.VCS == nil {
-		return ""
-	}
-	return *i.VCS
-}
-
-// GetVCSPassword returns the VCSPassword field if it's non-nil, zero value otherwise.
-func (i *Import) GetVCSPassword() string {
-	if i == nil || i.VCSPassword == nil {
-		return ""
-	}
-	return *i.VCSPassword
-}
-
-// GetVCSURL returns the VCSURL field if it's non-nil, zero value otherwise.
-func (i *Import) GetVCSURL() string {
-	if i == nil || i.VCSURL == nil {
-		return ""
-	}
-	return *i.VCSURL
-}
-
-// GetVCSUsername returns the VCSUsername field if it's non-nil, zero value otherwise.
-func (i *Import) GetVCSUsername() string {
-	if i == nil || i.VCSUsername == nil {
-		return ""
-	}
-	return *i.VCSUsername
-}
-
-// GetAccessTokensURL returns the AccessTokensURL field if it's non-nil, zero value otherwise.
-func (i *Installation) GetAccessTokensURL() string {
-	if i == nil || i.AccessTokensURL == nil {
-		return ""
-	}
-	return *i.AccessTokensURL
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (i *Installation) GetHTMLURL() string {
-	if i == nil || i.HTMLURL == nil {
-		return ""
-	}
-	return *i.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (i *Installation) GetID() int {
-	if i == nil || i.ID == nil {
-		return 0
-	}
-	return *i.ID
-}
-
-// GetRepositoriesURL returns the RepositoriesURL field if it's non-nil, zero value otherwise.
-func (i *Installation) GetRepositoriesURL() string {
-	if i == nil || i.RepositoriesURL == nil {
-		return ""
-	}
-	return *i.RepositoriesURL
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (i *InstallationEvent) GetAction() string {
-	if i == nil || i.Action == nil {
-		return ""
-	}
-	return *i.Action
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (i *InstallationRepositoriesEvent) GetAction() string {
-	if i == nil || i.Action == nil {
-		return ""
-	}
-	return *i.Action
-}
-
-// GetRepositorySelection returns the RepositorySelection field if it's non-nil, zero value otherwise.
-func (i *InstallationRepositoriesEvent) GetRepositorySelection() string {
-	if i == nil || i.RepositorySelection == nil {
-		return ""
-	}
-	return *i.RepositorySelection
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (i *Invitation) GetCreatedAt() time.Time {
-	if i == nil || i.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *i.CreatedAt
-}
-
-// GetEmail returns the Email field if it's non-nil, zero value otherwise.
-func (i *Invitation) GetEmail() string {
-	if i == nil || i.Email == nil {
-		return ""
-	}
-	return *i.Email
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (i *Invitation) GetID() int {
-	if i == nil || i.ID == nil {
-		return 0
-	}
-	return *i.ID
-}
-
-// GetLogin returns the Login field if it's non-nil, zero value otherwise.
-func (i *Invitation) GetLogin() string {
-	if i == nil || i.Login == nil {
-		return ""
-	}
-	return *i.Login
-}
-
-// GetRole returns the Role field if it's non-nil, zero value otherwise.
-func (i *Invitation) GetRole() string {
-	if i == nil || i.Role == nil {
-		return ""
-	}
-	return *i.Role
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (i *Issue) GetBody() string {
-	if i == nil || i.Body == nil {
-		return ""
-	}
-	return *i.Body
-}
-
-// GetClosedAt returns the ClosedAt field if it's non-nil, zero value otherwise.
-func (i *Issue) GetClosedAt() time.Time {
-	if i == nil || i.ClosedAt == nil {
-		return time.Time{}
-	}
-	return *i.ClosedAt
-}
-
-// GetComments returns the Comments field if it's non-nil, zero value otherwise.
-func (i *Issue) GetComments() int {
-	if i == nil || i.Comments == nil {
-		return 0
-	}
-	return *i.Comments
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (i *Issue) GetCreatedAt() time.Time {
-	if i == nil || i.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *i.CreatedAt
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (i *Issue) GetHTMLURL() string {
-	if i == nil || i.HTMLURL == nil {
-		return ""
-	}
-	return *i.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (i *Issue) GetID() int {
-	if i == nil || i.ID == nil {
-		return 0
-	}
-	return *i.ID
-}
-
-// GetLocked returns the Locked field if it's non-nil, zero value otherwise.
-func (i *Issue) GetLocked() bool {
-	if i == nil || i.Locked == nil {
-		return false
-	}
-	return *i.Locked
-}
-
-// GetNumber returns the Number field if it's non-nil, zero value otherwise.
-func (i *Issue) GetNumber() int {
-	if i == nil || i.Number == nil {
-		return 0
-	}
-	return *i.Number
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (i *Issue) GetState() string {
-	if i == nil || i.State == nil {
-		return ""
-	}
-	return *i.State
-}
-
-// GetTitle returns the Title field if it's non-nil, zero value otherwise.
-func (i *Issue) GetTitle() string {
-	if i == nil || i.Title == nil {
-		return ""
-	}
-	return *i.Title
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (i *Issue) GetUpdatedAt() time.Time {
-	if i == nil || i.UpdatedAt == nil {
-		return time.Time{}
-	}
-	return *i.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (i *Issue) GetURL() string {
-	if i == nil || i.URL == nil {
-		return ""
-	}
-	return *i.URL
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (i *IssueComment) GetBody() string {
-	if i == nil || i.Body == nil {
-		return ""
-	}
-	return *i.Body
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (i *IssueComment) GetCreatedAt() time.Time {
-	if i == nil || i.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *i.CreatedAt
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (i *IssueComment) GetHTMLURL() string {
-	if i == nil || i.HTMLURL == nil {
-		return ""
-	}
-	return *i.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (i *IssueComment) GetID() int {
-	if i == nil || i.ID == nil {
-		return 0
-	}
-	return *i.ID
-}
-
-// GetIssueURL returns the IssueURL field if it's non-nil, zero value otherwise.
-func (i *IssueComment) GetIssueURL() string {
-	if i == nil || i.IssueURL == nil {
-		return ""
-	}
-	return *i.IssueURL
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (i *IssueComment) GetUpdatedAt() time.Time {
-	if i == nil || i.UpdatedAt == nil {
-		return time.Time{}
-	}
-	return *i.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (i *IssueComment) GetURL() string {
-	if i == nil || i.URL == nil {
-		return ""
-	}
-	return *i.URL
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (i *IssueCommentEvent) GetAction() string {
-	if i == nil || i.Action == nil {
-		return ""
-	}
-	return *i.Action
-}
-
-// GetCommitID returns the CommitID field if it's non-nil, zero value otherwise.
-func (i *IssueEvent) GetCommitID() string {
-	if i == nil || i.CommitID == nil {
-		return ""
-	}
-	return *i.CommitID
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (i *IssueEvent) GetCreatedAt() time.Time {
-	if i == nil || i.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *i.CreatedAt
-}
-
-// GetEvent returns the Event field if it's non-nil, zero value otherwise.
-func (i *IssueEvent) GetEvent() string {
-	if i == nil || i.Event == nil {
-		return ""
-	}
-	return *i.Event
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (i *IssueEvent) GetID() int {
-	if i == nil || i.ID == nil {
-		return 0
-	}
-	return *i.ID
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (i *IssueEvent) GetURL() string {
-	if i == nil || i.URL == nil {
-		return ""
-	}
-	return *i.URL
-}
-
-// GetAssignee returns the Assignee field if it's non-nil, zero value otherwise.
-func (i *IssueRequest) GetAssignee() string {
-	if i == nil || i.Assignee == nil {
-		return ""
-	}
-	return *i.Assignee
-}
-
-// GetAssignees returns the Assignees field if it's non-nil, zero value otherwise.
-func (i *IssueRequest) GetAssignees() []string {
-	if i == nil || i.Assignees == nil {
-		return nil
-	}
-	return *i.Assignees
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (i *IssueRequest) GetBody() string {
-	if i == nil || i.Body == nil {
-		return ""
-	}
-	return *i.Body
-}
-
-// GetLabels returns the Labels field if it's non-nil, zero value otherwise.
-func (i *IssueRequest) GetLabels() []string {
-	if i == nil || i.Labels == nil {
-		return nil
-	}
-	return *i.Labels
-}
-
-// GetMilestone returns the Milestone field if it's non-nil, zero value otherwise.
-func (i *IssueRequest) GetMilestone() int {
-	if i == nil || i.Milestone == nil {
-		return 0
-	}
-	return *i.Milestone
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (i *IssueRequest) GetState() string {
-	if i == nil || i.State == nil {
-		return ""
-	}
-	return *i.State
-}
-
-// GetTitle returns the Title field if it's non-nil, zero value otherwise.
-func (i *IssueRequest) GetTitle() string {
-	if i == nil || i.Title == nil {
-		return ""
-	}
-	return *i.Title
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (i *IssuesEvent) GetAction() string {
-	if i == nil || i.Action == nil {
-		return ""
-	}
-	return *i.Action
-}
-
-// GetIncompleteResults returns the IncompleteResults field if it's non-nil, zero value otherwise.
-func (i *IssuesSearchResult) GetIncompleteResults() bool {
-	if i == nil || i.IncompleteResults == nil {
-		return false
-	}
-	return *i.IncompleteResults
-}
-
-// GetTotal returns the Total field if it's non-nil, zero value otherwise.
-func (i *IssuesSearchResult) GetTotal() int {
-	if i == nil || i.Total == nil {
-		return 0
-	}
-	return *i.Total
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (k *Key) GetID() int {
-	if k == nil || k.ID == nil {
-		return 0
-	}
-	return *k.ID
-}
-
-// GetKey returns the Key field if it's non-nil, zero value otherwise.
-func (k *Key) GetKey() string {
-	if k == nil || k.Key == nil {
-		return ""
-	}
-	return *k.Key
-}
-
-// GetReadOnly returns the ReadOnly field if it's non-nil, zero value otherwise.
-func (k *Key) GetReadOnly() bool {
-	if k == nil || k.ReadOnly == nil {
-		return false
-	}
-	return *k.ReadOnly
-}
-
-// GetTitle returns the Title field if it's non-nil, zero value otherwise.
-func (k *Key) GetTitle() string {
-	if k == nil || k.Title == nil {
-		return ""
-	}
-	return *k.Title
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (k *Key) GetURL() string {
-	if k == nil || k.URL == nil {
-		return ""
-	}
-	return *k.URL
-}
-
-// GetColor returns the Color field if it's non-nil, zero value otherwise.
-func (l *Label) GetColor() string {
-	if l == nil || l.Color == nil {
-		return ""
-	}
-	return *l.Color
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (l *Label) GetID() int {
-	if l == nil || l.ID == nil {
-		return 0
-	}
-	return *l.ID
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (l *Label) GetName() string {
-	if l == nil || l.Name == nil {
-		return ""
-	}
-	return *l.Name
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (l *Label) GetURL() string {
-	if l == nil || l.URL == nil {
-		return ""
-	}
-	return *l.URL
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (l *LabelEvent) GetAction() string {
-	if l == nil || l.Action == nil {
-		return ""
-	}
-	return *l.Action
-}
-
-// GetOID returns the OID field if it's non-nil, zero value otherwise.
-func (l *LargeFile) GetOID() string {
-	if l == nil || l.OID == nil {
-		return ""
-	}
-	return *l.OID
-}
-
-// GetPath returns the Path field if it's non-nil, zero value otherwise.
-func (l *LargeFile) GetPath() string {
-	if l == nil || l.Path == nil {
-		return ""
-	}
-	return *l.Path
-}
-
-// GetRefName returns the RefName field if it's non-nil, zero value otherwise.
-func (l *LargeFile) GetRefName() string {
-	if l == nil || l.RefName == nil {
-		return ""
-	}
-	return *l.RefName
-}
-
-// GetSize returns the Size field if it's non-nil, zero value otherwise.
-func (l *LargeFile) GetSize() int {
-	if l == nil || l.Size == nil {
-		return 0
-	}
-	return *l.Size
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (l *License) GetBody() string {
-	if l == nil || l.Body == nil {
-		return ""
-	}
-	return *l.Body
-}
-
-// GetConditions returns the Conditions field if it's non-nil, zero value otherwise.
-func (l *License) GetConditions() []string {
-	if l == nil || l.Conditions == nil {
-		return nil
-	}
-	return *l.Conditions
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (l *License) GetDescription() string {
-	if l == nil || l.Description == nil {
-		return ""
-	}
-	return *l.Description
-}
-
-// GetFeatured returns the Featured field if it's non-nil, zero value otherwise.
-func (l *License) GetFeatured() bool {
-	if l == nil || l.Featured == nil {
-		return false
-	}
-	return *l.Featured
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (l *License) GetHTMLURL() string {
-	if l == nil || l.HTMLURL == nil {
-		return ""
-	}
-	return *l.HTMLURL
-}
-
-// GetImplementation returns the Implementation field if it's non-nil, zero value otherwise.
-func (l *License) GetImplementation() string {
-	if l == nil || l.Implementation == nil {
-		return ""
-	}
-	return *l.Implementation
-}
-
-// GetKey returns the Key field if it's non-nil, zero value otherwise.
-func (l *License) GetKey() string {
-	if l == nil || l.Key == nil {
-		return ""
-	}
-	return *l.Key
-}
-
-// GetLimitations returns the Limitations field if it's non-nil, zero value otherwise.
-func (l *License) GetLimitations() []string {
-	if l == nil || l.Limitations == nil {
-		return nil
-	}
-	return *l.Limitations
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (l *License) GetName() string {
-	if l == nil || l.Name == nil {
-		return ""
-	}
-	return *l.Name
-}
-
-// GetPermissions returns the Permissions field if it's non-nil, zero value otherwise.
-func (l *License) GetPermissions() []string {
-	if l == nil || l.Permissions == nil {
-		return nil
-	}
-	return *l.Permissions
-}
-
-// GetSPDXID returns the SPDXID field if it's non-nil, zero value otherwise.
-func (l *License) GetSPDXID() string {
-	if l == nil || l.SPDXID == nil {
-		return ""
-	}
-	return *l.SPDXID
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (l *License) GetURL() string {
-	if l == nil || l.URL == nil {
-		return ""
-	}
-	return *l.URL
-}
-
-// GetContext returns the Context field if it's non-nil, zero value otherwise.
-func (m *markdownRequest) GetContext() string {
-	if m == nil || m.Context == nil {
-		return ""
-	}
-	return *m.Context
-}
-
-// GetMode returns the Mode field if it's non-nil, zero value otherwise.
-func (m *markdownRequest) GetMode() string {
-	if m == nil || m.Mode == nil {
-		return ""
-	}
-	return *m.Mode
-}
-
-// GetText returns the Text field if it's non-nil, zero value otherwise.
-func (m *markdownRequest) GetText() string {
-	if m == nil || m.Text == nil {
-		return ""
-	}
-	return *m.Text
-}
-
-// GetText returns the Text field if it's non-nil, zero value otherwise.
-func (m *Match) GetText() string {
-	if m == nil || m.Text == nil {
-		return ""
-	}
-	return *m.Text
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (m *MemberEvent) GetAction() string {
-	if m == nil || m.Action == nil {
-		return ""
-	}
-	return *m.Action
-}
-
-// GetOrganizationURL returns the OrganizationURL field if it's non-nil, zero value otherwise.
-func (m *Membership) GetOrganizationURL() string {
-	if m == nil || m.OrganizationURL == nil {
-		return ""
-	}
-	return *m.OrganizationURL
-}
-
-// GetRole returns the Role field if it's non-nil, zero value otherwise.
-func (m *Membership) GetRole() string {
-	if m == nil || m.Role == nil {
-		return ""
-	}
-	return *m.Role
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (m *Membership) GetState() string {
-	if m == nil || m.State == nil {
-		return ""
-	}
-	return *m.State
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (m *Membership) GetURL() string {
-	if m == nil || m.URL == nil {
-		return ""
-	}
-	return *m.URL
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (m *MembershipEvent) GetAction() string {
-	if m == nil || m.Action == nil {
-		return ""
-	}
-	return *m.Action
-}
-
-// GetScope returns the Scope field if it's non-nil, zero value otherwise.
-func (m *MembershipEvent) GetScope() string {
-	if m == nil || m.Scope == nil {
-		return ""
-	}
-	return *m.Scope
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (m *Metric) GetHTMLURL() string {
-	if m == nil || m.HTMLURL == nil {
-		return ""
-	}
-	return *m.HTMLURL
-}
-
-// GetKey returns the Key field if it's non-nil, zero value otherwise.
-func (m *Metric) GetKey() string {
-	if m == nil || m.Key == nil {
-		return ""
-	}
-	return *m.Key
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (m *Metric) GetName() string {
-	if m == nil || m.Name == nil {
-		return ""
-	}
-	return *m.Name
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (m *Metric) GetURL() string {
-	if m == nil || m.URL == nil {
-		return ""
-	}
-	return *m.URL
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (m *Migration) GetCreatedAt() string {
-	if m == nil || m.CreatedAt == nil {
-		return ""
-	}
-	return *m.CreatedAt
-}
-
-// GetExcludeAttachments returns the ExcludeAttachments field if it's non-nil, zero value otherwise.
-func (m *Migration) GetExcludeAttachments() bool {
-	if m == nil || m.ExcludeAttachments == nil {
-		return false
-	}
-	return *m.ExcludeAttachments
-}
-
-// GetGUID returns the GUID field if it's non-nil, zero value otherwise.
-func (m *Migration) GetGUID() string {
-	if m == nil || m.GUID == nil {
-		return ""
-	}
-	return *m.GUID
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (m *Migration) GetID() int {
-	if m == nil || m.ID == nil {
-		return 0
-	}
-	return *m.ID
-}
-
-// GetLockRepositories returns the LockRepositories field if it's non-nil, zero value otherwise.
-func (m *Migration) GetLockRepositories() bool {
-	if m == nil || m.LockRepositories == nil {
-		return false
-	}
-	return *m.LockRepositories
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (m *Migration) GetState() string {
-	if m == nil || m.State == nil {
-		return ""
-	}
-	return *m.State
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (m *Migration) GetUpdatedAt() string {
-	if m == nil || m.UpdatedAt == nil {
-		return ""
-	}
-	return *m.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (m *Migration) GetURL() string {
-	if m == nil || m.URL == nil {
-		return ""
-	}
-	return *m.URL
-}
-
-// GetClosedAt returns the ClosedAt field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetClosedAt() time.Time {
-	if m == nil || m.ClosedAt == nil {
-		return time.Time{}
-	}
-	return *m.ClosedAt
-}
-
-// GetClosedIssues returns the ClosedIssues field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetClosedIssues() int {
-	if m == nil || m.ClosedIssues == nil {
-		return 0
-	}
-	return *m.ClosedIssues
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetCreatedAt() time.Time {
-	if m == nil || m.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *m.CreatedAt
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetDescription() string {
-	if m == nil || m.Description == nil {
-		return ""
-	}
-	return *m.Description
-}
-
-// GetDueOn returns the DueOn field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetDueOn() time.Time {
-	if m == nil || m.DueOn == nil {
-		return time.Time{}
-	}
-	return *m.DueOn
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetHTMLURL() string {
-	if m == nil || m.HTMLURL == nil {
-		return ""
-	}
-	return *m.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetID() int {
-	if m == nil || m.ID == nil {
-		return 0
-	}
-	return *m.ID
-}
-
-// GetLabelsURL returns the LabelsURL field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetLabelsURL() string {
-	if m == nil || m.LabelsURL == nil {
-		return ""
-	}
-	return *m.LabelsURL
-}
-
-// GetNumber returns the Number field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetNumber() int {
-	if m == nil || m.Number == nil {
-		return 0
-	}
-	return *m.Number
-}
-
-// GetOpenIssues returns the OpenIssues field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetOpenIssues() int {
-	if m == nil || m.OpenIssues == nil {
-		return 0
-	}
-	return *m.OpenIssues
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetState() string {
-	if m == nil || m.State == nil {
-		return ""
-	}
-	return *m.State
-}
-
-// GetTitle returns the Title field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetTitle() string {
-	if m == nil || m.Title == nil {
-		return ""
-	}
-	return *m.Title
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetUpdatedAt() time.Time {
-	if m == nil || m.UpdatedAt == nil {
-		return time.Time{}
-	}
-	return *m.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (m *Milestone) GetURL() string {
-	if m == nil || m.URL == nil {
-		return ""
-	}
-	return *m.URL
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (m *MilestoneEvent) GetAction() string {
-	if m == nil || m.Action == nil {
-		return ""
-	}
-	return *m.Action
-}
-
-// GetBase returns the Base field if it's non-nil, zero value otherwise.
-func (n *NewPullRequest) GetBase() string {
-	if n == nil || n.Base == nil {
-		return ""
-	}
-	return *n.Base
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (n *NewPullRequest) GetBody() string {
-	if n == nil || n.Body == nil {
-		return ""
-	}
-	return *n.Body
-}
-
-// GetHead returns the Head field if it's non-nil, zero value otherwise.
-func (n *NewPullRequest) GetHead() string {
-	if n == nil || n.Head == nil {
-		return ""
-	}
-	return *n.Head
-}
-
-// GetIssue returns the Issue field if it's non-nil, zero value otherwise.
-func (n *NewPullRequest) GetIssue() int {
-	if n == nil || n.Issue == nil {
-		return 0
-	}
-	return *n.Issue
-}
-
-// GetMaintainerCanModify returns the MaintainerCanModify field if it's non-nil, zero value otherwise.
-func (n *NewPullRequest) GetMaintainerCanModify() bool {
-	if n == nil || n.MaintainerCanModify == nil {
-		return false
-	}
-	return *n.MaintainerCanModify
-}
-
-// GetTitle returns the Title field if it's non-nil, zero value otherwise.
-func (n *NewPullRequest) GetTitle() string {
-	if n == nil || n.Title == nil {
-		return ""
-	}
-	return *n.Title
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (n *Notification) GetID() string {
-	if n == nil || n.ID == nil {
-		return ""
-	}
-	return *n.ID
-}
-
-// GetLastReadAt returns the LastReadAt field if it's non-nil, zero value otherwise.
-func (n *Notification) GetLastReadAt() time.Time {
-	if n == nil || n.LastReadAt == nil {
-		return time.Time{}
-	}
-	return *n.LastReadAt
-}
-
-// GetReason returns the Reason field if it's non-nil, zero value otherwise.
-func (n *Notification) GetReason() string {
-	if n == nil || n.Reason == nil {
-		return ""
-	}
-	return *n.Reason
-}
-
-// GetUnread returns the Unread field if it's non-nil, zero value otherwise.
-func (n *Notification) GetUnread() bool {
-	if n == nil || n.Unread == nil {
-		return false
-	}
-	return *n.Unread
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (n *Notification) GetUpdatedAt() time.Time {
-	if n == nil || n.UpdatedAt == nil {
-		return time.Time{}
-	}
-	return *n.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (n *Notification) GetURL() string {
-	if n == nil || n.URL == nil {
-		return ""
-	}
-	return *n.URL
-}
-
-// GetLatestCommentURL returns the LatestCommentURL field if it's non-nil, zero value otherwise.
-func (n *NotificationSubject) GetLatestCommentURL() string {
-	if n == nil || n.LatestCommentURL == nil {
-		return ""
-	}
-	return *n.LatestCommentURL
-}
-
-// GetTitle returns the Title field if it's non-nil, zero value otherwise.
-func (n *NotificationSubject) GetTitle() string {
-	if n == nil || n.Title == nil {
-		return ""
-	}
-	return *n.Title
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (n *NotificationSubject) GetType() string {
-	if n == nil || n.Type == nil {
-		return ""
-	}
-	return *n.Type
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (n *NotificationSubject) GetURL() string {
-	if n == nil || n.URL == nil {
-		return ""
-	}
-	return *n.URL
-}
-
-// GetAvatarURL returns the AvatarURL field if it's non-nil, zero value otherwise.
-func (o *Organization) GetAvatarURL() string {
-	if o == nil || o.AvatarURL == nil {
-		return ""
-	}
-	return *o.AvatarURL
-}
-
-// GetBillingEmail returns the BillingEmail field if it's non-nil, zero value otherwise.
-func (o *Organization) GetBillingEmail() string {
-	if o == nil || o.BillingEmail == nil {
-		return ""
-	}
-	return *o.BillingEmail
-}
-
-// GetBlog returns the Blog field if it's non-nil, zero value otherwise.
-func (o *Organization) GetBlog() string {
-	if o == nil || o.Blog == nil {
-		return ""
-	}
-	return *o.Blog
-}
-
-// GetCollaborators returns the Collaborators field if it's non-nil, zero value otherwise.
-func (o *Organization) GetCollaborators() int {
-	if o == nil || o.Collaborators == nil {
-		return 0
-	}
-	return *o.Collaborators
-}
-
-// GetCompany returns the Company field if it's non-nil, zero value otherwise.
-func (o *Organization) GetCompany() string {
-	if o == nil || o.Company == nil {
-		return ""
-	}
-	return *o.Company
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (o *Organization) GetCreatedAt() time.Time {
-	if o == nil || o.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *o.CreatedAt
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (o *Organization) GetDescription() string {
-	if o == nil || o.Description == nil {
-		return ""
-	}
-	return *o.Description
-}
-
-// GetDiskUsage returns the DiskUsage field if it's non-nil, zero value otherwise.
-func (o *Organization) GetDiskUsage() int {
-	if o == nil || o.DiskUsage == nil {
-		return 0
-	}
-	return *o.DiskUsage
-}
-
-// GetEmail returns the Email field if it's non-nil, zero value otherwise.
-func (o *Organization) GetEmail() string {
-	if o == nil || o.Email == nil {
-		return ""
-	}
-	return *o.Email
-}
-
-// GetEventsURL returns the EventsURL field if it's non-nil, zero value otherwise.
-func (o *Organization) GetEventsURL() string {
-	if o == nil || o.EventsURL == nil {
-		return ""
-	}
-	return *o.EventsURL
-}
-
-// GetFollowers returns the Followers field if it's non-nil, zero value otherwise.
-func (o *Organization) GetFollowers() int {
-	if o == nil || o.Followers == nil {
-		return 0
-	}
-	return *o.Followers
-}
-
-// GetFollowing returns the Following field if it's non-nil, zero value otherwise.
-func (o *Organization) GetFollowing() int {
-	if o == nil || o.Following == nil {
-		return 0
-	}
-	return *o.Following
-}
-
-// GetHooksURL returns the HooksURL field if it's non-nil, zero value otherwise.
-func (o *Organization) GetHooksURL() string {
-	if o == nil || o.HooksURL == nil {
-		return ""
-	}
-	return *o.HooksURL
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (o *Organization) GetHTMLURL() string {
-	if o == nil || o.HTMLURL == nil {
-		return ""
-	}
-	return *o.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (o *Organization) GetID() int {
-	if o == nil || o.ID == nil {
-		return 0
-	}
-	return *o.ID
-}
-
-// GetIssuesURL returns the IssuesURL field if it's non-nil, zero value otherwise.
-func (o *Organization) GetIssuesURL() string {
-	if o == nil || o.IssuesURL == nil {
-		return ""
-	}
-	return *o.IssuesURL
-}
-
-// GetLocation returns the Location field if it's non-nil, zero value otherwise.
-func (o *Organization) GetLocation() string {
-	if o == nil || o.Location == nil {
-		return ""
-	}
-	return *o.Location
-}
-
-// GetLogin returns the Login field if it's non-nil, zero value otherwise.
-func (o *Organization) GetLogin() string {
-	if o == nil || o.Login == nil {
-		return ""
-	}
-	return *o.Login
-}
-
-// GetMembersURL returns the MembersURL field if it's non-nil, zero value otherwise.
-func (o *Organization) GetMembersURL() string {
-	if o == nil || o.MembersURL == nil {
-		return ""
-	}
-	return *o.MembersURL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (o *Organization) GetName() string {
-	if o == nil || o.Name == nil {
-		return ""
-	}
-	return *o.Name
-}
-
-// GetOwnedPrivateRepos returns the OwnedPrivateRepos field if it's non-nil, zero value otherwise.
-func (o *Organization) GetOwnedPrivateRepos() int {
-	if o == nil || o.OwnedPrivateRepos == nil {
-		return 0
-	}
-	return *o.OwnedPrivateRepos
-}
-
-// GetPrivateGists returns the PrivateGists field if it's non-nil, zero value otherwise.
-func (o *Organization) GetPrivateGists() int {
-	if o == nil || o.PrivateGists == nil {
-		return 0
-	}
-	return *o.PrivateGists
-}
-
-// GetPublicGists returns the PublicGists field if it's non-nil, zero value otherwise.
-func (o *Organization) GetPublicGists() int {
-	if o == nil || o.PublicGists == nil {
-		return 0
-	}
-	return *o.PublicGists
-}
-
-// GetPublicMembersURL returns the PublicMembersURL field if it's non-nil, zero value otherwise.
-func (o *Organization) GetPublicMembersURL() string {
-	if o == nil || o.PublicMembersURL == nil {
-		return ""
-	}
-	return *o.PublicMembersURL
-}
-
-// GetPublicRepos returns the PublicRepos field if it's non-nil, zero value otherwise.
-func (o *Organization) GetPublicRepos() int {
-	if o == nil || o.PublicRepos == nil {
-		return 0
-	}
-	return *o.PublicRepos
-}
-
-// GetReposURL returns the ReposURL field if it's non-nil, zero value otherwise.
-func (o *Organization) GetReposURL() string {
-	if o == nil || o.ReposURL == nil {
-		return ""
-	}
-	return *o.ReposURL
-}
-
-// GetTotalPrivateRepos returns the TotalPrivateRepos field if it's non-nil, zero value otherwise.
-func (o *Organization) GetTotalPrivateRepos() int {
-	if o == nil || o.TotalPrivateRepos == nil {
-		return 0
-	}
-	return *o.TotalPrivateRepos
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (o *Organization) GetType() string {
-	if o == nil || o.Type == nil {
-		return ""
-	}
-	return *o.Type
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (o *Organization) GetUpdatedAt() time.Time {
-	if o == nil || o.UpdatedAt == nil {
-		return time.Time{}
-	}
-	return *o.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (o *Organization) GetURL() string {
-	if o == nil || o.URL == nil {
-		return ""
-	}
-	return *o.URL
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (o *OrganizationEvent) GetAction() string {
-	if o == nil || o.Action == nil {
-		return ""
-	}
-	return *o.Action
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (o *OrgBlockEvent) GetAction() string {
-	if o == nil || o.Action == nil {
-		return ""
-	}
-	return *o.Action
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (p *Page) GetAction() string {
-	if p == nil || p.Action == nil {
-		return ""
-	}
-	return *p.Action
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (p *Page) GetHTMLURL() string {
-	if p == nil || p.HTMLURL == nil {
-		return ""
-	}
-	return *p.HTMLURL
-}
-
-// GetPageName returns the PageName field if it's non-nil, zero value otherwise.
-func (p *Page) GetPageName() string {
-	if p == nil || p.PageName == nil {
-		return ""
-	}
-	return *p.PageName
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (p *Page) GetSHA() string {
-	if p == nil || p.SHA == nil {
-		return ""
-	}
-	return *p.SHA
-}
-
-// GetSummary returns the Summary field if it's non-nil, zero value otherwise.
-func (p *Page) GetSummary() string {
-	if p == nil || p.Summary == nil {
-		return ""
-	}
-	return *p.Summary
-}
-
-// GetTitle returns the Title field if it's non-nil, zero value otherwise.
-func (p *Page) GetTitle() string {
-	if p == nil || p.Title == nil {
-		return ""
-	}
-	return *p.Title
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (p *PageBuildEvent) GetID() int {
-	if p == nil || p.ID == nil {
-		return 0
-	}
-	return *p.ID
-}
-
-// GetCNAME returns the CNAME field if it's non-nil, zero value otherwise.
-func (p *Pages) GetCNAME() string {
-	if p == nil || p.CNAME == nil {
-		return ""
-	}
-	return *p.CNAME
-}
-
-// GetCustom404 returns the Custom404 field if it's non-nil, zero value otherwise.
-func (p *Pages) GetCustom404() bool {
-	if p == nil || p.Custom404 == nil {
-		return false
-	}
-	return *p.Custom404
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (p *Pages) GetHTMLURL() string {
-	if p == nil || p.HTMLURL == nil {
-		return ""
-	}
-	return *p.HTMLURL
-}
-
-// GetStatus returns the Status field if it's non-nil, zero value otherwise.
-func (p *Pages) GetStatus() string {
-	if p == nil || p.Status == nil {
-		return ""
-	}
-	return *p.Status
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (p *Pages) GetURL() string {
-	if p == nil || p.URL == nil {
-		return ""
-	}
-	return *p.URL
-}
-
-// GetCommit returns the Commit field if it's non-nil, zero value otherwise.
-func (p *PagesBuild) GetCommit() string {
-	if p == nil || p.Commit == nil {
-		return ""
-	}
-	return *p.Commit
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (p *PagesBuild) GetCreatedAt() Timestamp {
-	if p == nil || p.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *p.CreatedAt
-}
-
-// GetDuration returns the Duration field if it's non-nil, zero value otherwise.
-func (p *PagesBuild) GetDuration() int {
-	if p == nil || p.Duration == nil {
-		return 0
-	}
-	return *p.Duration
-}
-
-// GetStatus returns the Status field if it's non-nil, zero value otherwise.
-func (p *PagesBuild) GetStatus() string {
-	if p == nil || p.Status == nil {
-		return ""
-	}
-	return *p.Status
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (p *PagesBuild) GetUpdatedAt() Timestamp {
-	if p == nil || p.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *p.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (p *PagesBuild) GetURL() string {
-	if p == nil || p.URL == nil {
-		return ""
-	}
-	return *p.URL
-}
-
-// GetMessage returns the Message field if it's non-nil, zero value otherwise.
-func (p *PagesError) GetMessage() string {
-	if p == nil || p.Message == nil {
-		return ""
-	}
-	return *p.Message
-}
-
-// GetHookID returns the HookID field if it's non-nil, zero value otherwise.
-func (p *PingEvent) GetHookID() int {
-	if p == nil || p.HookID == nil {
-		return 0
-	}
-	return *p.HookID
-}
-
-// GetZen returns the Zen field if it's non-nil, zero value otherwise.
-func (p *PingEvent) GetZen() string {
-	if p == nil || p.Zen == nil {
-		return ""
-	}
-	return *p.Zen
-}
-
-// GetCollaborators returns the Collaborators field if it's non-nil, zero value otherwise.
-func (p *Plan) GetCollaborators() int {
-	if p == nil || p.Collaborators == nil {
-		return 0
-	}
-	return *p.Collaborators
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (p *Plan) GetName() string {
-	if p == nil || p.Name == nil {
-		return ""
-	}
-	return *p.Name
-}
-
-// GetPrivateRepos returns the PrivateRepos field if it's non-nil, zero value otherwise.
-func (p *Plan) GetPrivateRepos() int {
-	if p == nil || p.PrivateRepos == nil {
-		return 0
-	}
-	return *p.PrivateRepos
-}
-
-// GetSpace returns the Space field if it's non-nil, zero value otherwise.
-func (p *Plan) GetSpace() int {
-	if p == nil || p.Space == nil {
-		return 0
-	}
-	return *p.Space
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (p *Project) GetBody() string {
-	if p == nil || p.Body == nil {
-		return ""
-	}
-	return *p.Body
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (p *Project) GetCreatedAt() Timestamp {
-	if p == nil || p.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *p.CreatedAt
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (p *Project) GetID() int {
-	if p == nil || p.ID == nil {
-		return 0
-	}
-	return *p.ID
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (p *Project) GetName() string {
-	if p == nil || p.Name == nil {
-		return ""
-	}
-	return *p.Name
-}
-
-// GetNumber returns the Number field if it's non-nil, zero value otherwise.
-func (p *Project) GetNumber() int {
-	if p == nil || p.Number == nil {
-		return 0
-	}
-	return *p.Number
-}
-
-// GetOwnerURL returns the OwnerURL field if it's non-nil, zero value otherwise.
-func (p *Project) GetOwnerURL() string {
-	if p == nil || p.OwnerURL == nil {
-		return ""
-	}
-	return *p.OwnerURL
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (p *Project) GetUpdatedAt() Timestamp {
-	if p == nil || p.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *p.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (p *Project) GetURL() string {
-	if p == nil || p.URL == nil {
-		return ""
-	}
-	return *p.URL
-}
-
-// GetColumnID returns the ColumnID field if it's non-nil, zero value otherwise.
-func (p *ProjectCard) GetColumnID() int {
-	if p == nil || p.ColumnID == nil {
-		return 0
-	}
-	return *p.ColumnID
-}
-
-// GetColumnURL returns the ColumnURL field if it's non-nil, zero value otherwise.
-func (p *ProjectCard) GetColumnURL() string {
-	if p == nil || p.ColumnURL == nil {
-		return ""
-	}
-	return *p.ColumnURL
-}
-
-// GetContentURL returns the ContentURL field if it's non-nil, zero value otherwise.
-func (p *ProjectCard) GetContentURL() string {
-	if p == nil || p.ContentURL == nil {
-		return ""
-	}
-	return *p.ContentURL
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (p *ProjectCard) GetCreatedAt() Timestamp {
-	if p == nil || p.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *p.CreatedAt
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (p *ProjectCard) GetID() int {
-	if p == nil || p.ID == nil {
-		return 0
-	}
-	return *p.ID
-}
-
-// GetNote returns the Note field if it's non-nil, zero value otherwise.
-func (p *ProjectCard) GetNote() string {
-	if p == nil || p.Note == nil {
-		return ""
-	}
-	return *p.Note
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (p *ProjectCard) GetUpdatedAt() Timestamp {
-	if p == nil || p.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *p.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (p *ProjectCard) GetURL() string {
-	if p == nil || p.URL == nil {
-		return ""
-	}
-	return *p.URL
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (p *ProjectCardEvent) GetAction() string {
-	if p == nil || p.Action == nil {
-		return ""
-	}
-	return *p.Action
-}
-
-// GetAfterID returns the AfterID field if it's non-nil, zero value otherwise.
-func (p *ProjectCardEvent) GetAfterID() int {
-	if p == nil || p.AfterID == nil {
-		return 0
-	}
-	return *p.AfterID
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (p *ProjectColumn) GetCreatedAt() Timestamp {
-	if p == nil || p.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *p.CreatedAt
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (p *ProjectColumn) GetID() int {
-	if p == nil || p.ID == nil {
-		return 0
-	}
-	return *p.ID
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (p *ProjectColumn) GetName() string {
-	if p == nil || p.Name == nil {
-		return ""
-	}
-	return *p.Name
-}
-
-// GetProjectURL returns the ProjectURL field if it's non-nil, zero value otherwise.
-func (p *ProjectColumn) GetProjectURL() string {
-	if p == nil || p.ProjectURL == nil {
-		return ""
-	}
-	return *p.ProjectURL
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (p *ProjectColumn) GetUpdatedAt() Timestamp {
-	if p == nil || p.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *p.UpdatedAt
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (p *ProjectColumnEvent) GetAction() string {
-	if p == nil || p.Action == nil {
-		return ""
-	}
-	return *p.Action
-}
-
-// GetAfterID returns the AfterID field if it's non-nil, zero value otherwise.
-func (p *ProjectColumnEvent) GetAfterID() int {
-	if p == nil || p.AfterID == nil {
-		return 0
-	}
-	return *p.AfterID
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (p *ProjectEvent) GetAction() string {
-	if p == nil || p.Action == nil {
-		return ""
-	}
-	return *p.Action
-}
-
-// GetAdditions returns the Additions field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetAdditions() int {
-	if p == nil || p.Additions == nil {
-		return 0
-	}
-	return *p.Additions
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetBody() string {
-	if p == nil || p.Body == nil {
-		return ""
-	}
-	return *p.Body
-}
-
-// GetChangedFiles returns the ChangedFiles field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetChangedFiles() int {
-	if p == nil || p.ChangedFiles == nil {
-		return 0
-	}
-	return *p.ChangedFiles
-}
-
-// GetClosedAt returns the ClosedAt field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetClosedAt() time.Time {
-	if p == nil || p.ClosedAt == nil {
-		return time.Time{}
-	}
-	return *p.ClosedAt
-}
-
-// GetComments returns the Comments field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetComments() int {
-	if p == nil || p.Comments == nil {
-		return 0
-	}
-	return *p.Comments
-}
-
-// GetCommits returns the Commits field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetCommits() int {
-	if p == nil || p.Commits == nil {
-		return 0
-	}
-	return *p.Commits
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetCreatedAt() time.Time {
-	if p == nil || p.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *p.CreatedAt
-}
-
-// GetDeletions returns the Deletions field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetDeletions() int {
-	if p == nil || p.Deletions == nil {
-		return 0
-	}
-	return *p.Deletions
-}
-
-// GetDiffURL returns the DiffURL field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetDiffURL() string {
-	if p == nil || p.DiffURL == nil {
-		return ""
-	}
-	return *p.DiffURL
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetHTMLURL() string {
-	if p == nil || p.HTMLURL == nil {
-		return ""
-	}
-	return *p.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetID() int {
-	if p == nil || p.ID == nil {
-		return 0
-	}
-	return *p.ID
-}
-
-// GetIssueURL returns the IssueURL field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetIssueURL() string {
-	if p == nil || p.IssueURL == nil {
-		return ""
-	}
-	return *p.IssueURL
-}
-
-// GetMaintainerCanModify returns the MaintainerCanModify field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetMaintainerCanModify() bool {
-	if p == nil || p.MaintainerCanModify == nil {
-		return false
-	}
-	return *p.MaintainerCanModify
-}
-
-// GetMergeable returns the Mergeable field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetMergeable() bool {
-	if p == nil || p.Mergeable == nil {
-		return false
-	}
-	return *p.Mergeable
-}
-
-// GetMergeCommitSHA returns the MergeCommitSHA field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetMergeCommitSHA() string {
-	if p == nil || p.MergeCommitSHA == nil {
-		return ""
-	}
-	return *p.MergeCommitSHA
-}
-
-// GetMerged returns the Merged field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetMerged() bool {
-	if p == nil || p.Merged == nil {
-		return false
-	}
-	return *p.Merged
-}
-
-// GetMergedAt returns the MergedAt field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetMergedAt() time.Time {
-	if p == nil || p.MergedAt == nil {
-		return time.Time{}
-	}
-	return *p.MergedAt
-}
-
-// GetNumber returns the Number field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetNumber() int {
-	if p == nil || p.Number == nil {
-		return 0
-	}
-	return *p.Number
-}
-
-// GetPatchURL returns the PatchURL field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetPatchURL() string {
-	if p == nil || p.PatchURL == nil {
-		return ""
-	}
-	return *p.PatchURL
-}
-
-// GetReviewCommentsURL returns the ReviewCommentsURL field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetReviewCommentsURL() string {
-	if p == nil || p.ReviewCommentsURL == nil {
-		return ""
-	}
-	return *p.ReviewCommentsURL
-}
-
-// GetReviewCommentURL returns the ReviewCommentURL field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetReviewCommentURL() string {
-	if p == nil || p.ReviewCommentURL == nil {
-		return ""
-	}
-	return *p.ReviewCommentURL
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetState() string {
-	if p == nil || p.State == nil {
-		return ""
-	}
-	return *p.State
-}
-
-// GetStatusesURL returns the StatusesURL field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetStatusesURL() string {
-	if p == nil || p.StatusesURL == nil {
-		return ""
-	}
-	return *p.StatusesURL
-}
-
-// GetTitle returns the Title field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetTitle() string {
-	if p == nil || p.Title == nil {
-		return ""
-	}
-	return *p.Title
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetUpdatedAt() time.Time {
-	if p == nil || p.UpdatedAt == nil {
-		return time.Time{}
-	}
-	return *p.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (p *PullRequest) GetURL() string {
-	if p == nil || p.URL == nil {
-		return ""
-	}
-	return *p.URL
-}
-
-// GetLabel returns the Label field if it's non-nil, zero value otherwise.
-func (p *PullRequestBranch) GetLabel() string {
-	if p == nil || p.Label == nil {
-		return ""
-	}
-	return *p.Label
-}
-
-// GetRef returns the Ref field if it's non-nil, zero value otherwise.
-func (p *PullRequestBranch) GetRef() string {
-	if p == nil || p.Ref == nil {
-		return ""
-	}
-	return *p.Ref
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (p *PullRequestBranch) GetSHA() string {
-	if p == nil || p.SHA == nil {
-		return ""
-	}
-	return *p.SHA
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetBody() string {
-	if p == nil || p.Body == nil {
-		return ""
-	}
-	return *p.Body
-}
-
-// GetCommitID returns the CommitID field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetCommitID() string {
-	if p == nil || p.CommitID == nil {
-		return ""
-	}
-	return *p.CommitID
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetCreatedAt() time.Time {
-	if p == nil || p.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *p.CreatedAt
-}
-
-// GetDiffHunk returns the DiffHunk field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetDiffHunk() string {
-	if p == nil || p.DiffHunk == nil {
-		return ""
-	}
-	return *p.DiffHunk
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetHTMLURL() string {
-	if p == nil || p.HTMLURL == nil {
-		return ""
-	}
-	return *p.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetID() int {
-	if p == nil || p.ID == nil {
-		return 0
-	}
-	return *p.ID
-}
-
-// GetInReplyTo returns the InReplyTo field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetInReplyTo() int {
-	if p == nil || p.InReplyTo == nil {
-		return 0
-	}
-	return *p.InReplyTo
-}
-
-// GetOriginalCommitID returns the OriginalCommitID field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetOriginalCommitID() string {
-	if p == nil || p.OriginalCommitID == nil {
-		return ""
-	}
-	return *p.OriginalCommitID
-}
-
-// GetOriginalPosition returns the OriginalPosition field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetOriginalPosition() int {
-	if p == nil || p.OriginalPosition == nil {
-		return 0
-	}
-	return *p.OriginalPosition
-}
-
-// GetPath returns the Path field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetPath() string {
-	if p == nil || p.Path == nil {
-		return ""
-	}
-	return *p.Path
-}
-
-// GetPosition returns the Position field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetPosition() int {
-	if p == nil || p.Position == nil {
-		return 0
-	}
-	return *p.Position
-}
-
-// GetPullRequestURL returns the PullRequestURL field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetPullRequestURL() string {
-	if p == nil || p.PullRequestURL == nil {
-		return ""
-	}
-	return *p.PullRequestURL
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetUpdatedAt() time.Time {
-	if p == nil || p.UpdatedAt == nil {
-		return time.Time{}
-	}
-	return *p.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (p *PullRequestComment) GetURL() string {
-	if p == nil || p.URL == nil {
-		return ""
-	}
-	return *p.URL
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (p *PullRequestEvent) GetAction() string {
-	if p == nil || p.Action == nil {
-		return ""
-	}
-	return *p.Action
-}
-
-// GetNumber returns the Number field if it's non-nil, zero value otherwise.
-func (p *PullRequestEvent) GetNumber() int {
-	if p == nil || p.Number == nil {
-		return 0
-	}
-	return *p.Number
-}
-
-// GetDiffURL returns the DiffURL field if it's non-nil, zero value otherwise.
-func (p *PullRequestLinks) GetDiffURL() string {
-	if p == nil || p.DiffURL == nil {
-		return ""
-	}
-	return *p.DiffURL
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (p *PullRequestLinks) GetHTMLURL() string {
-	if p == nil || p.HTMLURL == nil {
-		return ""
-	}
-	return *p.HTMLURL
-}
-
-// GetPatchURL returns the PatchURL field if it's non-nil, zero value otherwise.
-func (p *PullRequestLinks) GetPatchURL() string {
-	if p == nil || p.PatchURL == nil {
-		return ""
-	}
-	return *p.PatchURL
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (p *PullRequestLinks) GetURL() string {
-	if p == nil || p.URL == nil {
-		return ""
-	}
-	return *p.URL
-}
-
-// GetMerged returns the Merged field if it's non-nil, zero value otherwise.
-func (p *PullRequestMergeResult) GetMerged() bool {
-	if p == nil || p.Merged == nil {
-		return false
-	}
-	return *p.Merged
-}
-
-// GetMessage returns the Message field if it's non-nil, zero value otherwise.
-func (p *PullRequestMergeResult) GetMessage() string {
-	if p == nil || p.Message == nil {
-		return ""
-	}
-	return *p.Message
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (p *PullRequestMergeResult) GetSHA() string {
-	if p == nil || p.SHA == nil {
-		return ""
-	}
-	return *p.SHA
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (p *PullRequestReview) GetBody() string {
-	if p == nil || p.Body == nil {
-		return ""
-	}
-	return *p.Body
-}
-
-// GetCommitID returns the CommitID field if it's non-nil, zero value otherwise.
-func (p *PullRequestReview) GetCommitID() string {
-	if p == nil || p.CommitID == nil {
-		return ""
-	}
-	return *p.CommitID
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (p *PullRequestReview) GetHTMLURL() string {
-	if p == nil || p.HTMLURL == nil {
-		return ""
-	}
-	return *p.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (p *PullRequestReview) GetID() int {
-	if p == nil || p.ID == nil {
-		return 0
-	}
-	return *p.ID
-}
-
-// GetPullRequestURL returns the PullRequestURL field if it's non-nil, zero value otherwise.
-func (p *PullRequestReview) GetPullRequestURL() string {
-	if p == nil || p.PullRequestURL == nil {
-		return ""
-	}
-	return *p.PullRequestURL
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (p *PullRequestReview) GetState() string {
-	if p == nil || p.State == nil {
-		return ""
-	}
-	return *p.State
-}
-
-// GetSubmittedAt returns the SubmittedAt field if it's non-nil, zero value otherwise.
-func (p *PullRequestReview) GetSubmittedAt() time.Time {
-	if p == nil || p.SubmittedAt == nil {
-		return time.Time{}
-	}
-	return *p.SubmittedAt
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (p *PullRequestReviewCommentEvent) GetAction() string {
-	if p == nil || p.Action == nil {
-		return ""
-	}
-	return *p.Action
-}
-
-// GetMessage returns the Message field if it's non-nil, zero value otherwise.
-func (p *PullRequestReviewDismissalRequest) GetMessage() string {
-	if p == nil || p.Message == nil {
-		return ""
-	}
-	return *p.Message
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (p *PullRequestReviewEvent) GetAction() string {
-	if p == nil || p.Action == nil {
-		return ""
-	}
-	return *p.Action
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (p *PullRequestReviewRequest) GetBody() string {
-	if p == nil || p.Body == nil {
-		return ""
-	}
-	return *p.Body
-}
-
-// GetEvent returns the Event field if it's non-nil, zero value otherwise.
-func (p *PullRequestReviewRequest) GetEvent() string {
-	if p == nil || p.Event == nil {
-		return ""
-	}
-	return *p.Event
-}
-
-// GetDismissStaleReviews returns the DismissStaleReviews field if it's non-nil, zero value otherwise.
-func (p *PullRequestReviewsEnforcementUpdate) GetDismissStaleReviews() bool {
-	if p == nil || p.DismissStaleReviews == nil {
-		return false
-	}
-	return *p.DismissStaleReviews
-}
-
-// GetBase returns the Base field if it's non-nil, zero value otherwise.
-func (p *pullRequestUpdate) GetBase() string {
-	if p == nil || p.Base == nil {
-		return ""
-	}
-	return *p.Base
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (p *pullRequestUpdate) GetBody() string {
-	if p == nil || p.Body == nil {
-		return ""
-	}
-	return *p.Body
-}
-
-// GetMaintainerCanModify returns the MaintainerCanModify field if it's non-nil, zero value otherwise.
-func (p *pullRequestUpdate) GetMaintainerCanModify() bool {
-	if p == nil || p.MaintainerCanModify == nil {
-		return false
-	}
-	return *p.MaintainerCanModify
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (p *pullRequestUpdate) GetState() string {
-	if p == nil || p.State == nil {
-		return ""
-	}
-	return *p.State
-}
-
-// GetTitle returns the Title field if it's non-nil, zero value otherwise.
-func (p *pullRequestUpdate) GetTitle() string {
-	if p == nil || p.Title == nil {
-		return ""
-	}
-	return *p.Title
-}
-
-// GetCommits returns the Commits field if it's non-nil, zero value otherwise.
-func (p *PunchCard) GetCommits() int {
-	if p == nil || p.Commits == nil {
-		return 0
-	}
-	return *p.Commits
-}
-
-// GetDay returns the Day field if it's non-nil, zero value otherwise.
-func (p *PunchCard) GetDay() int {
-	if p == nil || p.Day == nil {
-		return 0
-	}
-	return *p.Day
-}
-
-// GetHour returns the Hour field if it's non-nil, zero value otherwise.
-func (p *PunchCard) GetHour() int {
-	if p == nil || p.Hour == nil {
-		return 0
-	}
-	return *p.Hour
-}
-
-// GetAfter returns the After field if it's non-nil, zero value otherwise.
-func (p *PushEvent) GetAfter() string {
-	if p == nil || p.After == nil {
-		return ""
-	}
-	return *p.After
-}
-
-// GetBaseRef returns the BaseRef field if it's non-nil, zero value otherwise.
-func (p *PushEvent) GetBaseRef() string {
-	if p == nil || p.BaseRef == nil {
-		return ""
-	}
-	return *p.BaseRef
-}
-
-// GetBefore returns the Before field if it's non-nil, zero value otherwise.
-func (p *PushEvent) GetBefore() string {
-	if p == nil || p.Before == nil {
-		return ""
-	}
-	return *p.Before
-}
-
-// GetCompare returns the Compare field if it's non-nil, zero value otherwise.
-func (p *PushEvent) GetCompare() string {
-	if p == nil || p.Compare == nil {
-		return ""
-	}
-	return *p.Compare
-}
-
-// GetCreated returns the Created field if it's non-nil, zero value otherwise.
-func (p *PushEvent) GetCreated() bool {
-	if p == nil || p.Created == nil {
-		return false
-	}
-	return *p.Created
-}
-
-// GetDeleted returns the Deleted field if it's non-nil, zero value otherwise.
-func (p *PushEvent) GetDeleted() bool {
-	if p == nil || p.Deleted == nil {
-		return false
-	}
-	return *p.Deleted
-}
-
-// GetDistinctSize returns the DistinctSize field if it's non-nil, zero value otherwise.
-func (p *PushEvent) GetDistinctSize() int {
-	if p == nil || p.DistinctSize == nil {
-		return 0
-	}
-	return *p.DistinctSize
-}
-
-// GetForced returns the Forced field if it's non-nil, zero value otherwise.
-func (p *PushEvent) GetForced() bool {
-	if p == nil || p.Forced == nil {
-		return false
-	}
-	return *p.Forced
-}
-
-// GetHead returns the Head field if it's non-nil, zero value otherwise.
-func (p *PushEvent) GetHead() string {
-	if p == nil || p.Head == nil {
-		return ""
-	}
-	return *p.Head
-}
-
-// GetPushID returns the PushID field if it's non-nil, zero value otherwise.
-func (p *PushEvent) GetPushID() int {
-	if p == nil || p.PushID == nil {
-		return 0
-	}
-	return *p.PushID
-}
-
-// GetRef returns the Ref field if it's non-nil, zero value otherwise.
-func (p *PushEvent) GetRef() string {
-	if p == nil || p.Ref == nil {
-		return ""
-	}
-	return *p.Ref
-}
-
-// GetSize returns the Size field if it's non-nil, zero value otherwise.
-func (p *PushEvent) GetSize() int {
-	if p == nil || p.Size == nil {
-		return 0
-	}
-	return *p.Size
-}
-
-// GetDistinct returns the Distinct field if it's non-nil, zero value otherwise.
-func (p *PushEventCommit) GetDistinct() bool {
-	if p == nil || p.Distinct == nil {
-		return false
-	}
-	return *p.Distinct
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (p *PushEventCommit) GetID() string {
-	if p == nil || p.ID == nil {
-		return ""
-	}
-	return *p.ID
-}
-
-// GetMessage returns the Message field if it's non-nil, zero value otherwise.
-func (p *PushEventCommit) GetMessage() string {
-	if p == nil || p.Message == nil {
-		return ""
-	}
-	return *p.Message
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (p *PushEventCommit) GetSHA() string {
-	if p == nil || p.SHA == nil {
-		return ""
-	}
-	return *p.SHA
-}
-
-// GetTimestamp returns the Timestamp field if it's non-nil, zero value otherwise.
-func (p *PushEventCommit) GetTimestamp() Timestamp {
-	if p == nil || p.Timestamp == nil {
-		return Timestamp{}
-	}
-	return *p.Timestamp
-}
-
-// GetTreeID returns the TreeID field if it's non-nil, zero value otherwise.
-func (p *PushEventCommit) GetTreeID() string {
-	if p == nil || p.TreeID == nil {
-		return ""
-	}
-	return *p.TreeID
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (p *PushEventCommit) GetURL() string {
-	if p == nil || p.URL == nil {
-		return ""
-	}
-	return *p.URL
-}
-
-// GetEmail returns the Email field if it's non-nil, zero value otherwise.
-func (p *PushEventRepoOwner) GetEmail() string {
-	if p == nil || p.Email == nil {
-		return ""
-	}
-	return *p.Email
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (p *PushEventRepoOwner) GetName() string {
-	if p == nil || p.Name == nil {
-		return ""
-	}
-	return *p.Name
-}
-
-// GetArchiveURL returns the ArchiveURL field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetArchiveURL() string {
-	if p == nil || p.ArchiveURL == nil {
-		return ""
-	}
-	return *p.ArchiveURL
-}
-
-// GetCloneURL returns the CloneURL field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetCloneURL() string {
-	if p == nil || p.CloneURL == nil {
-		return ""
-	}
-	return *p.CloneURL
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetCreatedAt() Timestamp {
-	if p == nil || p.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *p.CreatedAt
-}
-
-// GetDefaultBranch returns the DefaultBranch field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetDefaultBranch() string {
-	if p == nil || p.DefaultBranch == nil {
-		return ""
-	}
-	return *p.DefaultBranch
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetDescription() string {
-	if p == nil || p.Description == nil {
-		return ""
-	}
-	return *p.Description
-}
-
-// GetFork returns the Fork field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetFork() bool {
-	if p == nil || p.Fork == nil {
-		return false
-	}
-	return *p.Fork
-}
-
-// GetForksCount returns the ForksCount field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetForksCount() int {
-	if p == nil || p.ForksCount == nil {
-		return 0
-	}
-	return *p.ForksCount
-}
-
-// GetFullName returns the FullName field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetFullName() string {
-	if p == nil || p.FullName == nil {
-		return ""
-	}
-	return *p.FullName
-}
-
-// GetGitURL returns the GitURL field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetGitURL() string {
-	if p == nil || p.GitURL == nil {
-		return ""
-	}
-	return *p.GitURL
-}
-
-// GetHasDownloads returns the HasDownloads field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetHasDownloads() bool {
-	if p == nil || p.HasDownloads == nil {
-		return false
-	}
-	return *p.HasDownloads
-}
-
-// GetHasIssues returns the HasIssues field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetHasIssues() bool {
-	if p == nil || p.HasIssues == nil {
-		return false
-	}
-	return *p.HasIssues
-}
-
-// GetHasPages returns the HasPages field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetHasPages() bool {
-	if p == nil || p.HasPages == nil {
-		return false
-	}
-	return *p.HasPages
-}
-
-// GetHasWiki returns the HasWiki field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetHasWiki() bool {
-	if p == nil || p.HasWiki == nil {
-		return false
-	}
-	return *p.HasWiki
-}
-
-// GetHomepage returns the Homepage field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetHomepage() string {
-	if p == nil || p.Homepage == nil {
-		return ""
-	}
-	return *p.Homepage
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetHTMLURL() string {
-	if p == nil || p.HTMLURL == nil {
-		return ""
-	}
-	return *p.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetID() int {
-	if p == nil || p.ID == nil {
-		return 0
-	}
-	return *p.ID
-}
-
-// GetLanguage returns the Language field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetLanguage() string {
-	if p == nil || p.Language == nil {
-		return ""
-	}
-	return *p.Language
-}
-
-// GetMasterBranch returns the MasterBranch field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetMasterBranch() string {
-	if p == nil || p.MasterBranch == nil {
-		return ""
-	}
-	return *p.MasterBranch
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetName() string {
-	if p == nil || p.Name == nil {
-		return ""
-	}
-	return *p.Name
-}
-
-// GetOpenIssuesCount returns the OpenIssuesCount field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetOpenIssuesCount() int {
-	if p == nil || p.OpenIssuesCount == nil {
-		return 0
-	}
-	return *p.OpenIssuesCount
-}
-
-// GetOrganization returns the Organization field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetOrganization() string {
-	if p == nil || p.Organization == nil {
-		return ""
-	}
-	return *p.Organization
-}
-
-// GetPrivate returns the Private field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetPrivate() bool {
-	if p == nil || p.Private == nil {
-		return false
-	}
-	return *p.Private
-}
-
-// GetPushedAt returns the PushedAt field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetPushedAt() Timestamp {
-	if p == nil || p.PushedAt == nil {
-		return Timestamp{}
-	}
-	return *p.PushedAt
-}
-
-// GetSize returns the Size field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetSize() int {
-	if p == nil || p.Size == nil {
-		return 0
-	}
-	return *p.Size
-}
-
-// GetSSHURL returns the SSHURL field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetSSHURL() string {
-	if p == nil || p.SSHURL == nil {
-		return ""
-	}
-	return *p.SSHURL
-}
-
-// GetStargazersCount returns the StargazersCount field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetStargazersCount() int {
-	if p == nil || p.StargazersCount == nil {
-		return 0
-	}
-	return *p.StargazersCount
-}
-
-// GetStatusesURL returns the StatusesURL field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetStatusesURL() string {
-	if p == nil || p.StatusesURL == nil {
-		return ""
-	}
-	return *p.StatusesURL
-}
-
-// GetSVNURL returns the SVNURL field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetSVNURL() string {
-	if p == nil || p.SVNURL == nil {
-		return ""
-	}
-	return *p.SVNURL
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetUpdatedAt() Timestamp {
-	if p == nil || p.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *p.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetURL() string {
-	if p == nil || p.URL == nil {
-		return ""
-	}
-	return *p.URL
-}
-
-// GetWatchersCount returns the WatchersCount field if it's non-nil, zero value otherwise.
-func (p *PushEventRepository) GetWatchersCount() int {
-	if p == nil || p.WatchersCount == nil {
-		return 0
-	}
-	return *p.WatchersCount
-}
-
-// GetContent returns the Content field if it's non-nil, zero value otherwise.
-func (r *Reaction) GetContent() string {
-	if r == nil || r.Content == nil {
-		return ""
-	}
-	return *r.Content
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (r *Reaction) GetID() int {
-	if r == nil || r.ID == nil {
-		return 0
-	}
-	return *r.ID
-}
-
-// GetConfused returns the Confused field if it's non-nil, zero value otherwise.
-func (r *Reactions) GetConfused() int {
-	if r == nil || r.Confused == nil {
-		return 0
-	}
-	return *r.Confused
-}
-
-// GetHeart returns the Heart field if it's non-nil, zero value otherwise.
-func (r *Reactions) GetHeart() int {
-	if r == nil || r.Heart == nil {
-		return 0
-	}
-	return *r.Heart
-}
-
-// GetHooray returns the Hooray field if it's non-nil, zero value otherwise.
-func (r *Reactions) GetHooray() int {
-	if r == nil || r.Hooray == nil {
-		return 0
-	}
-	return *r.Hooray
-}
-
-// GetLaugh returns the Laugh field if it's non-nil, zero value otherwise.
-func (r *Reactions) GetLaugh() int {
-	if r == nil || r.Laugh == nil {
-		return 0
-	}
-	return *r.Laugh
-}
-
-// GetMinusOne returns the MinusOne field if it's non-nil, zero value otherwise.
-func (r *Reactions) GetMinusOne() int {
-	if r == nil || r.MinusOne == nil {
-		return 0
-	}
-	return *r.MinusOne
-}
-
-// GetPlusOne returns the PlusOne field if it's non-nil, zero value otherwise.
-func (r *Reactions) GetPlusOne() int {
-	if r == nil || r.PlusOne == nil {
-		return 0
-	}
-	return *r.PlusOne
-}
-
-// GetTotalCount returns the TotalCount field if it's non-nil, zero value otherwise.
-func (r *Reactions) GetTotalCount() int {
-	if r == nil || r.TotalCount == nil {
-		return 0
-	}
-	return *r.TotalCount
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (r *Reactions) GetURL() string {
-	if r == nil || r.URL == nil {
-		return ""
-	}
-	return *r.URL
-}
-
-// GetRef returns the Ref field if it's non-nil, zero value otherwise.
-func (r *Reference) GetRef() string {
-	if r == nil || r.Ref == nil {
-		return ""
-	}
-	return *r.Ref
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (r *Reference) GetURL() string {
-	if r == nil || r.URL == nil {
-		return ""
-	}
-	return *r.URL
-}
-
-// GetBrowserDownloadURL returns the BrowserDownloadURL field if it's non-nil, zero value otherwise.
-func (r *ReleaseAsset) GetBrowserDownloadURL() string {
-	if r == nil || r.BrowserDownloadURL == nil {
-		return ""
-	}
-	return *r.BrowserDownloadURL
-}
-
-// GetContentType returns the ContentType field if it's non-nil, zero value otherwise.
-func (r *ReleaseAsset) GetContentType() string {
-	if r == nil || r.ContentType == nil {
-		return ""
-	}
-	return *r.ContentType
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (r *ReleaseAsset) GetCreatedAt() Timestamp {
-	if r == nil || r.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *r.CreatedAt
-}
-
-// GetDownloadCount returns the DownloadCount field if it's non-nil, zero value otherwise.
-func (r *ReleaseAsset) GetDownloadCount() int {
-	if r == nil || r.DownloadCount == nil {
-		return 0
-	}
-	return *r.DownloadCount
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (r *ReleaseAsset) GetID() int {
-	if r == nil || r.ID == nil {
-		return 0
-	}
-	return *r.ID
-}
-
-// GetLabel returns the Label field if it's non-nil, zero value otherwise.
-func (r *ReleaseAsset) GetLabel() string {
-	if r == nil || r.Label == nil {
-		return ""
-	}
-	return *r.Label
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (r *ReleaseAsset) GetName() string {
-	if r == nil || r.Name == nil {
-		return ""
-	}
-	return *r.Name
-}
-
-// GetSize returns the Size field if it's non-nil, zero value otherwise.
-func (r *ReleaseAsset) GetSize() int {
-	if r == nil || r.Size == nil {
-		return 0
-	}
-	return *r.Size
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (r *ReleaseAsset) GetState() string {
-	if r == nil || r.State == nil {
-		return ""
-	}
-	return *r.State
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (r *ReleaseAsset) GetUpdatedAt() Timestamp {
-	if r == nil || r.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *r.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (r *ReleaseAsset) GetURL() string {
-	if r == nil || r.URL == nil {
-		return ""
-	}
-	return *r.URL
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (r *ReleaseEvent) GetAction() string {
-	if r == nil || r.Action == nil {
-		return ""
-	}
-	return *r.Action
-}
-
-// GetFrom returns the From field if it's non-nil, zero value otherwise.
-func (r *Rename) GetFrom() string {
-	if r == nil || r.From == nil {
-		return ""
-	}
-	return *r.From
-}
-
-// GetTo returns the To field if it's non-nil, zero value otherwise.
-func (r *Rename) GetTo() string {
-	if r == nil || r.To == nil {
-		return ""
-	}
-	return *r.To
-}
-
-// GetIncompleteResults returns the IncompleteResults field if it's non-nil, zero value otherwise.
-func (r *RepositoriesSearchResult) GetIncompleteResults() bool {
-	if r == nil || r.IncompleteResults == nil {
-		return false
-	}
-	return *r.IncompleteResults
-}
-
-// GetTotal returns the Total field if it's non-nil, zero value otherwise.
-func (r *RepositoriesSearchResult) GetTotal() int {
-	if r == nil || r.Total == nil {
-		return 0
-	}
-	return *r.Total
-}
-
-// GetAllowMergeCommit returns the AllowMergeCommit field if it's non-nil, zero value otherwise.
-func (r *Repository) GetAllowMergeCommit() bool {
-	if r == nil || r.AllowMergeCommit == nil {
-		return false
-	}
-	return *r.AllowMergeCommit
-}
-
-// GetAllowRebaseMerge returns the AllowRebaseMerge field if it's non-nil, zero value otherwise.
-func (r *Repository) GetAllowRebaseMerge() bool {
-	if r == nil || r.AllowRebaseMerge == nil {
-		return false
-	}
-	return *r.AllowRebaseMerge
-}
-
-// GetAllowSquashMerge returns the AllowSquashMerge field if it's non-nil, zero value otherwise.
-func (r *Repository) GetAllowSquashMerge() bool {
-	if r == nil || r.AllowSquashMerge == nil {
-		return false
-	}
-	return *r.AllowSquashMerge
-}
-
-// GetArchiveURL returns the ArchiveURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetArchiveURL() string {
-	if r == nil || r.ArchiveURL == nil {
-		return ""
-	}
-	return *r.ArchiveURL
-}
-
-// GetAssigneesURL returns the AssigneesURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetAssigneesURL() string {
-	if r == nil || r.AssigneesURL == nil {
-		return ""
-	}
-	return *r.AssigneesURL
-}
-
-// GetAutoInit returns the AutoInit field if it's non-nil, zero value otherwise.
-func (r *Repository) GetAutoInit() bool {
-	if r == nil || r.AutoInit == nil {
-		return false
-	}
-	return *r.AutoInit
-}
-
-// GetBlobsURL returns the BlobsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetBlobsURL() string {
-	if r == nil || r.BlobsURL == nil {
-		return ""
-	}
-	return *r.BlobsURL
-}
-
-// GetBranchesURL returns the BranchesURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetBranchesURL() string {
-	if r == nil || r.BranchesURL == nil {
-		return ""
-	}
-	return *r.BranchesURL
-}
-
-// GetCloneURL returns the CloneURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetCloneURL() string {
-	if r == nil || r.CloneURL == nil {
-		return ""
-	}
-	return *r.CloneURL
-}
-
-// GetCollaboratorsURL returns the CollaboratorsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetCollaboratorsURL() string {
-	if r == nil || r.CollaboratorsURL == nil {
-		return ""
-	}
-	return *r.CollaboratorsURL
-}
-
-// GetCommentsURL returns the CommentsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetCommentsURL() string {
-	if r == nil || r.CommentsURL == nil {
-		return ""
-	}
-	return *r.CommentsURL
-}
-
-// GetCommitsURL returns the CommitsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetCommitsURL() string {
-	if r == nil || r.CommitsURL == nil {
-		return ""
-	}
-	return *r.CommitsURL
-}
-
-// GetCompareURL returns the CompareURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetCompareURL() string {
-	if r == nil || r.CompareURL == nil {
-		return ""
-	}
-	return *r.CompareURL
-}
-
-// GetContentsURL returns the ContentsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetContentsURL() string {
-	if r == nil || r.ContentsURL == nil {
-		return ""
-	}
-	return *r.ContentsURL
-}
-
-// GetContributorsURL returns the ContributorsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetContributorsURL() string {
-	if r == nil || r.ContributorsURL == nil {
-		return ""
-	}
-	return *r.ContributorsURL
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (r *Repository) GetCreatedAt() Timestamp {
-	if r == nil || r.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *r.CreatedAt
-}
-
-// GetDefaultBranch returns the DefaultBranch field if it's non-nil, zero value otherwise.
-func (r *Repository) GetDefaultBranch() string {
-	if r == nil || r.DefaultBranch == nil {
-		return ""
-	}
-	return *r.DefaultBranch
-}
-
-// GetDeploymentsURL returns the DeploymentsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetDeploymentsURL() string {
-	if r == nil || r.DeploymentsURL == nil {
-		return ""
-	}
-	return *r.DeploymentsURL
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (r *Repository) GetDescription() string {
-	if r == nil || r.Description == nil {
-		return ""
-	}
-	return *r.Description
-}
-
-// GetDownloadsURL returns the DownloadsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetDownloadsURL() string {
-	if r == nil || r.DownloadsURL == nil {
-		return ""
-	}
-	return *r.DownloadsURL
-}
-
-// GetEventsURL returns the EventsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetEventsURL() string {
-	if r == nil || r.EventsURL == nil {
-		return ""
-	}
-	return *r.EventsURL
-}
-
-// GetFork returns the Fork field if it's non-nil, zero value otherwise.
-func (r *Repository) GetFork() bool {
-	if r == nil || r.Fork == nil {
-		return false
-	}
-	return *r.Fork
-}
-
-// GetForksCount returns the ForksCount field if it's non-nil, zero value otherwise.
-func (r *Repository) GetForksCount() int {
-	if r == nil || r.ForksCount == nil {
-		return 0
-	}
-	return *r.ForksCount
-}
-
-// GetForksURL returns the ForksURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetForksURL() string {
-	if r == nil || r.ForksURL == nil {
-		return ""
-	}
-	return *r.ForksURL
-}
-
-// GetFullName returns the FullName field if it's non-nil, zero value otherwise.
-func (r *Repository) GetFullName() string {
-	if r == nil || r.FullName == nil {
-		return ""
-	}
-	return *r.FullName
-}
-
-// GetGitCommitsURL returns the GitCommitsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetGitCommitsURL() string {
-	if r == nil || r.GitCommitsURL == nil {
-		return ""
-	}
-	return *r.GitCommitsURL
-}
-
-// GetGitignoreTemplate returns the GitignoreTemplate field if it's non-nil, zero value otherwise.
-func (r *Repository) GetGitignoreTemplate() string {
-	if r == nil || r.GitignoreTemplate == nil {
-		return ""
-	}
-	return *r.GitignoreTemplate
-}
-
-// GetGitRefsURL returns the GitRefsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetGitRefsURL() string {
-	if r == nil || r.GitRefsURL == nil {
-		return ""
-	}
-	return *r.GitRefsURL
-}
-
-// GetGitTagsURL returns the GitTagsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetGitTagsURL() string {
-	if r == nil || r.GitTagsURL == nil {
-		return ""
-	}
-	return *r.GitTagsURL
-}
-
-// GetGitURL returns the GitURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetGitURL() string {
-	if r == nil || r.GitURL == nil {
-		return ""
-	}
-	return *r.GitURL
-}
-
-// GetHasDownloads returns the HasDownloads field if it's non-nil, zero value otherwise.
-func (r *Repository) GetHasDownloads() bool {
-	if r == nil || r.HasDownloads == nil {
-		return false
-	}
-	return *r.HasDownloads
-}
-
-// GetHasIssues returns the HasIssues field if it's non-nil, zero value otherwise.
-func (r *Repository) GetHasIssues() bool {
-	if r == nil || r.HasIssues == nil {
-		return false
-	}
-	return *r.HasIssues
-}
-
-// GetHasPages returns the HasPages field if it's non-nil, zero value otherwise.
-func (r *Repository) GetHasPages() bool {
-	if r == nil || r.HasPages == nil {
-		return false
-	}
-	return *r.HasPages
-}
-
-// GetHasWiki returns the HasWiki field if it's non-nil, zero value otherwise.
-func (r *Repository) GetHasWiki() bool {
-	if r == nil || r.HasWiki == nil {
-		return false
-	}
-	return *r.HasWiki
-}
-
-// GetHomepage returns the Homepage field if it's non-nil, zero value otherwise.
-func (r *Repository) GetHomepage() string {
-	if r == nil || r.Homepage == nil {
-		return ""
-	}
-	return *r.Homepage
-}
-
-// GetHooksURL returns the HooksURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetHooksURL() string {
-	if r == nil || r.HooksURL == nil {
-		return ""
-	}
-	return *r.HooksURL
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetHTMLURL() string {
-	if r == nil || r.HTMLURL == nil {
-		return ""
-	}
-	return *r.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (r *Repository) GetID() int {
-	if r == nil || r.ID == nil {
-		return 0
-	}
-	return *r.ID
-}
-
-// GetIssueCommentURL returns the IssueCommentURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetIssueCommentURL() string {
-	if r == nil || r.IssueCommentURL == nil {
-		return ""
-	}
-	return *r.IssueCommentURL
-}
-
-// GetIssueEventsURL returns the IssueEventsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetIssueEventsURL() string {
-	if r == nil || r.IssueEventsURL == nil {
-		return ""
-	}
-	return *r.IssueEventsURL
-}
-
-// GetIssuesURL returns the IssuesURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetIssuesURL() string {
-	if r == nil || r.IssuesURL == nil {
-		return ""
-	}
-	return *r.IssuesURL
-}
-
-// GetKeysURL returns the KeysURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetKeysURL() string {
-	if r == nil || r.KeysURL == nil {
-		return ""
-	}
-	return *r.KeysURL
-}
-
-// GetLabelsURL returns the LabelsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetLabelsURL() string {
-	if r == nil || r.LabelsURL == nil {
-		return ""
-	}
-	return *r.LabelsURL
-}
-
-// GetLanguage returns the Language field if it's non-nil, zero value otherwise.
-func (r *Repository) GetLanguage() string {
-	if r == nil || r.Language == nil {
-		return ""
-	}
-	return *r.Language
-}
-
-// GetLanguagesURL returns the LanguagesURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetLanguagesURL() string {
-	if r == nil || r.LanguagesURL == nil {
-		return ""
-	}
-	return *r.LanguagesURL
-}
-
-// GetLicenseTemplate returns the LicenseTemplate field if it's non-nil, zero value otherwise.
-func (r *Repository) GetLicenseTemplate() string {
-	if r == nil || r.LicenseTemplate == nil {
-		return ""
-	}
-	return *r.LicenseTemplate
-}
-
-// GetMasterBranch returns the MasterBranch field if it's non-nil, zero value otherwise.
-func (r *Repository) GetMasterBranch() string {
-	if r == nil || r.MasterBranch == nil {
-		return ""
-	}
-	return *r.MasterBranch
-}
-
-// GetMergesURL returns the MergesURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetMergesURL() string {
-	if r == nil || r.MergesURL == nil {
-		return ""
-	}
-	return *r.MergesURL
-}
-
-// GetMilestonesURL returns the MilestonesURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetMilestonesURL() string {
-	if r == nil || r.MilestonesURL == nil {
-		return ""
-	}
-	return *r.MilestonesURL
-}
-
-// GetMirrorURL returns the MirrorURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetMirrorURL() string {
-	if r == nil || r.MirrorURL == nil {
-		return ""
-	}
-	return *r.MirrorURL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (r *Repository) GetName() string {
-	if r == nil || r.Name == nil {
-		return ""
-	}
-	return *r.Name
-}
-
-// GetNetworkCount returns the NetworkCount field if it's non-nil, zero value otherwise.
-func (r *Repository) GetNetworkCount() int {
-	if r == nil || r.NetworkCount == nil {
-		return 0
-	}
-	return *r.NetworkCount
-}
-
-// GetNotificationsURL returns the NotificationsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetNotificationsURL() string {
-	if r == nil || r.NotificationsURL == nil {
-		return ""
-	}
-	return *r.NotificationsURL
-}
-
-// GetOpenIssuesCount returns the OpenIssuesCount field if it's non-nil, zero value otherwise.
-func (r *Repository) GetOpenIssuesCount() int {
-	if r == nil || r.OpenIssuesCount == nil {
-		return 0
-	}
-	return *r.OpenIssuesCount
-}
-
-// GetPermissions returns the Permissions field if it's non-nil, zero value otherwise.
-func (r *Repository) GetPermissions() map[string]bool {
-	if r == nil || r.Permissions == nil {
-		return map[string]bool{}
-	}
-	return *r.Permissions
-}
-
-// GetPrivate returns the Private field if it's non-nil, zero value otherwise.
-func (r *Repository) GetPrivate() bool {
-	if r == nil || r.Private == nil {
-		return false
-	}
-	return *r.Private
-}
-
-// GetPullsURL returns the PullsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetPullsURL() string {
-	if r == nil || r.PullsURL == nil {
-		return ""
-	}
-	return *r.PullsURL
-}
-
-// GetPushedAt returns the PushedAt field if it's non-nil, zero value otherwise.
-func (r *Repository) GetPushedAt() Timestamp {
-	if r == nil || r.PushedAt == nil {
-		return Timestamp{}
-	}
-	return *r.PushedAt
-}
-
-// GetReleasesURL returns the ReleasesURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetReleasesURL() string {
-	if r == nil || r.ReleasesURL == nil {
-		return ""
-	}
-	return *r.ReleasesURL
-}
-
-// GetSize returns the Size field if it's non-nil, zero value otherwise.
-func (r *Repository) GetSize() int {
-	if r == nil || r.Size == nil {
-		return 0
-	}
-	return *r.Size
-}
-
-// GetSSHURL returns the SSHURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetSSHURL() string {
-	if r == nil || r.SSHURL == nil {
-		return ""
-	}
-	return *r.SSHURL
-}
-
-// GetStargazersCount returns the StargazersCount field if it's non-nil, zero value otherwise.
-func (r *Repository) GetStargazersCount() int {
-	if r == nil || r.StargazersCount == nil {
-		return 0
-	}
-	return *r.StargazersCount
-}
-
-// GetStargazersURL returns the StargazersURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetStargazersURL() string {
-	if r == nil || r.StargazersURL == nil {
-		return ""
-	}
-	return *r.StargazersURL
-}
-
-// GetStatusesURL returns the StatusesURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetStatusesURL() string {
-	if r == nil || r.StatusesURL == nil {
-		return ""
-	}
-	return *r.StatusesURL
-}
-
-// GetSubscribersCount returns the SubscribersCount field if it's non-nil, zero value otherwise.
-func (r *Repository) GetSubscribersCount() int {
-	if r == nil || r.SubscribersCount == nil {
-		return 0
-	}
-	return *r.SubscribersCount
-}
-
-// GetSubscribersURL returns the SubscribersURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetSubscribersURL() string {
-	if r == nil || r.SubscribersURL == nil {
-		return ""
-	}
-	return *r.SubscribersURL
-}
-
-// GetSubscriptionURL returns the SubscriptionURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetSubscriptionURL() string {
-	if r == nil || r.SubscriptionURL == nil {
-		return ""
-	}
-	return *r.SubscriptionURL
-}
-
-// GetSVNURL returns the SVNURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetSVNURL() string {
-	if r == nil || r.SVNURL == nil {
-		return ""
-	}
-	return *r.SVNURL
-}
-
-// GetTagsURL returns the TagsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetTagsURL() string {
-	if r == nil || r.TagsURL == nil {
-		return ""
-	}
-	return *r.TagsURL
-}
-
-// GetTeamID returns the TeamID field if it's non-nil, zero value otherwise.
-func (r *Repository) GetTeamID() int {
-	if r == nil || r.TeamID == nil {
-		return 0
-	}
-	return *r.TeamID
-}
-
-// GetTeamsURL returns the TeamsURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetTeamsURL() string {
-	if r == nil || r.TeamsURL == nil {
-		return ""
-	}
-	return *r.TeamsURL
-}
-
-// GetTreesURL returns the TreesURL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetTreesURL() string {
-	if r == nil || r.TreesURL == nil {
-		return ""
-	}
-	return *r.TreesURL
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (r *Repository) GetUpdatedAt() Timestamp {
-	if r == nil || r.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *r.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (r *Repository) GetURL() string {
-	if r == nil || r.URL == nil {
-		return ""
-	}
-	return *r.URL
-}
-
-// GetWatchersCount returns the WatchersCount field if it's non-nil, zero value otherwise.
-func (r *Repository) GetWatchersCount() int {
-	if r == nil || r.WatchersCount == nil {
-		return 0
-	}
-	return *r.WatchersCount
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (r *RepositoryComment) GetBody() string {
-	if r == nil || r.Body == nil {
-		return ""
-	}
-	return *r.Body
-}
-
-// GetCommitID returns the CommitID field if it's non-nil, zero value otherwise.
-func (r *RepositoryComment) GetCommitID() string {
-	if r == nil || r.CommitID == nil {
-		return ""
-	}
-	return *r.CommitID
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (r *RepositoryComment) GetCreatedAt() time.Time {
-	if r == nil || r.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *r.CreatedAt
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryComment) GetHTMLURL() string {
-	if r == nil || r.HTMLURL == nil {
-		return ""
-	}
-	return *r.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (r *RepositoryComment) GetID() int {
-	if r == nil || r.ID == nil {
-		return 0
-	}
-	return *r.ID
-}
-
-// GetPath returns the Path field if it's non-nil, zero value otherwise.
-func (r *RepositoryComment) GetPath() string {
-	if r == nil || r.Path == nil {
-		return ""
-	}
-	return *r.Path
-}
-
-// GetPosition returns the Position field if it's non-nil, zero value otherwise.
-func (r *RepositoryComment) GetPosition() int {
-	if r == nil || r.Position == nil {
-		return 0
-	}
-	return *r.Position
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (r *RepositoryComment) GetUpdatedAt() time.Time {
-	if r == nil || r.UpdatedAt == nil {
-		return time.Time{}
-	}
-	return *r.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (r *RepositoryComment) GetURL() string {
-	if r == nil || r.URL == nil {
-		return ""
-	}
-	return *r.URL
-}
-
-// GetCommentsURL returns the CommentsURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryCommit) GetCommentsURL() string {
-	if r == nil || r.CommentsURL == nil {
-		return ""
-	}
-	return *r.CommentsURL
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryCommit) GetHTMLURL() string {
-	if r == nil || r.HTMLURL == nil {
-		return ""
-	}
-	return *r.HTMLURL
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (r *RepositoryCommit) GetSHA() string {
-	if r == nil || r.SHA == nil {
-		return ""
-	}
-	return *r.SHA
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (r *RepositoryCommit) GetURL() string {
-	if r == nil || r.URL == nil {
-		return ""
-	}
-	return *r.URL
-}
-
-// GetDownloadURL returns the DownloadURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryContent) GetDownloadURL() string {
-	if r == nil || r.DownloadURL == nil {
-		return ""
-	}
-	return *r.DownloadURL
-}
-
-// GetEncoding returns the Encoding field if it's non-nil, zero value otherwise.
-func (r *RepositoryContent) GetEncoding() string {
-	if r == nil || r.Encoding == nil {
-		return ""
-	}
-	return *r.Encoding
-}
-
-// GetGitURL returns the GitURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryContent) GetGitURL() string {
-	if r == nil || r.GitURL == nil {
-		return ""
-	}
-	return *r.GitURL
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryContent) GetHTMLURL() string {
-	if r == nil || r.HTMLURL == nil {
-		return ""
-	}
-	return *r.HTMLURL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (r *RepositoryContent) GetName() string {
-	if r == nil || r.Name == nil {
-		return ""
-	}
-	return *r.Name
-}
-
-// GetPath returns the Path field if it's non-nil, zero value otherwise.
-func (r *RepositoryContent) GetPath() string {
-	if r == nil || r.Path == nil {
-		return ""
-	}
-	return *r.Path
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (r *RepositoryContent) GetSHA() string {
-	if r == nil || r.SHA == nil {
-		return ""
-	}
-	return *r.SHA
-}
-
-// GetSize returns the Size field if it's non-nil, zero value otherwise.
-func (r *RepositoryContent) GetSize() int {
-	if r == nil || r.Size == nil {
-		return 0
-	}
-	return *r.Size
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (r *RepositoryContent) GetType() string {
-	if r == nil || r.Type == nil {
-		return ""
-	}
-	return *r.Type
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (r *RepositoryContent) GetURL() string {
-	if r == nil || r.URL == nil {
-		return ""
-	}
-	return *r.URL
-}
-
-// GetBranch returns the Branch field if it's non-nil, zero value otherwise.
-func (r *RepositoryContentFileOptions) GetBranch() string {
-	if r == nil || r.Branch == nil {
-		return ""
-	}
-	return *r.Branch
-}
-
-// GetMessage returns the Message field if it's non-nil, zero value otherwise.
-func (r *RepositoryContentFileOptions) GetMessage() string {
-	if r == nil || r.Message == nil {
-		return ""
-	}
-	return *r.Message
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (r *RepositoryContentFileOptions) GetSHA() string {
-	if r == nil || r.SHA == nil {
-		return ""
-	}
-	return *r.SHA
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (r *RepositoryEvent) GetAction() string {
-	if r == nil || r.Action == nil {
-		return ""
-	}
-	return *r.Action
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (r *RepositoryInvitation) GetCreatedAt() Timestamp {
-	if r == nil || r.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *r.CreatedAt
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryInvitation) GetHTMLURL() string {
-	if r == nil || r.HTMLURL == nil {
-		return ""
-	}
-	return *r.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (r *RepositoryInvitation) GetID() int {
-	if r == nil || r.ID == nil {
-		return 0
-	}
-	return *r.ID
-}
-
-// GetPermissions returns the Permissions field if it's non-nil, zero value otherwise.
-func (r *RepositoryInvitation) GetPermissions() string {
-	if r == nil || r.Permissions == nil {
-		return ""
-	}
-	return *r.Permissions
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (r *RepositoryInvitation) GetURL() string {
-	if r == nil || r.URL == nil {
-		return ""
-	}
-	return *r.URL
-}
-
-// GetContent returns the Content field if it's non-nil, zero value otherwise.
-func (r *RepositoryLicense) GetContent() string {
-	if r == nil || r.Content == nil {
-		return ""
-	}
-	return *r.Content
-}
-
-// GetDownloadURL returns the DownloadURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryLicense) GetDownloadURL() string {
-	if r == nil || r.DownloadURL == nil {
-		return ""
-	}
-	return *r.DownloadURL
-}
-
-// GetEncoding returns the Encoding field if it's non-nil, zero value otherwise.
-func (r *RepositoryLicense) GetEncoding() string {
-	if r == nil || r.Encoding == nil {
-		return ""
-	}
-	return *r.Encoding
-}
-
-// GetGitURL returns the GitURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryLicense) GetGitURL() string {
-	if r == nil || r.GitURL == nil {
-		return ""
-	}
-	return *r.GitURL
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryLicense) GetHTMLURL() string {
-	if r == nil || r.HTMLURL == nil {
-		return ""
-	}
-	return *r.HTMLURL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (r *RepositoryLicense) GetName() string {
-	if r == nil || r.Name == nil {
-		return ""
-	}
-	return *r.Name
-}
-
-// GetPath returns the Path field if it's non-nil, zero value otherwise.
-func (r *RepositoryLicense) GetPath() string {
-	if r == nil || r.Path == nil {
-		return ""
-	}
-	return *r.Path
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (r *RepositoryLicense) GetSHA() string {
-	if r == nil || r.SHA == nil {
-		return ""
-	}
-	return *r.SHA
-}
-
-// GetSize returns the Size field if it's non-nil, zero value otherwise.
-func (r *RepositoryLicense) GetSize() int {
-	if r == nil || r.Size == nil {
-		return 0
-	}
-	return *r.Size
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (r *RepositoryLicense) GetType() string {
-	if r == nil || r.Type == nil {
-		return ""
-	}
-	return *r.Type
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (r *RepositoryLicense) GetURL() string {
-	if r == nil || r.URL == nil {
-		return ""
-	}
-	return *r.URL
-}
-
-// GetBase returns the Base field if it's non-nil, zero value otherwise.
-func (r *RepositoryMergeRequest) GetBase() string {
-	if r == nil || r.Base == nil {
-		return ""
-	}
-	return *r.Base
-}
-
-// GetCommitMessage returns the CommitMessage field if it's non-nil, zero value otherwise.
-func (r *RepositoryMergeRequest) GetCommitMessage() string {
-	if r == nil || r.CommitMessage == nil {
-		return ""
-	}
-	return *r.CommitMessage
-}
-
-// GetHead returns the Head field if it's non-nil, zero value otherwise.
-func (r *RepositoryMergeRequest) GetHead() string {
-	if r == nil || r.Head == nil {
-		return ""
-	}
-	return *r.Head
-}
-
-// GetPermission returns the Permission field if it's non-nil, zero value otherwise.
-func (r *RepositoryPermissionLevel) GetPermission() string {
-	if r == nil || r.Permission == nil {
-		return ""
-	}
-	return *r.Permission
-}
-
-// GetAssetsURL returns the AssetsURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetAssetsURL() string {
-	if r == nil || r.AssetsURL == nil {
-		return ""
-	}
-	return *r.AssetsURL
-}
-
-// GetBody returns the Body field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetBody() string {
-	if r == nil || r.Body == nil {
-		return ""
-	}
-	return *r.Body
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetCreatedAt() Timestamp {
-	if r == nil || r.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *r.CreatedAt
-}
-
-// GetDraft returns the Draft field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetDraft() bool {
-	if r == nil || r.Draft == nil {
-		return false
-	}
-	return *r.Draft
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetHTMLURL() string {
-	if r == nil || r.HTMLURL == nil {
-		return ""
-	}
-	return *r.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetID() int {
-	if r == nil || r.ID == nil {
-		return 0
-	}
-	return *r.ID
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetName() string {
-	if r == nil || r.Name == nil {
-		return ""
-	}
-	return *r.Name
-}
-
-// GetPrerelease returns the Prerelease field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetPrerelease() bool {
-	if r == nil || r.Prerelease == nil {
-		return false
-	}
-	return *r.Prerelease
-}
-
-// GetPublishedAt returns the PublishedAt field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetPublishedAt() Timestamp {
-	if r == nil || r.PublishedAt == nil {
-		return Timestamp{}
-	}
-	return *r.PublishedAt
-}
-
-// GetTagName returns the TagName field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetTagName() string {
-	if r == nil || r.TagName == nil {
-		return ""
-	}
-	return *r.TagName
-}
-
-// GetTarballURL returns the TarballURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetTarballURL() string {
-	if r == nil || r.TarballURL == nil {
-		return ""
-	}
-	return *r.TarballURL
-}
-
-// GetTargetCommitish returns the TargetCommitish field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetTargetCommitish() string {
-	if r == nil || r.TargetCommitish == nil {
-		return ""
-	}
-	return *r.TargetCommitish
-}
-
-// GetUploadURL returns the UploadURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetUploadURL() string {
-	if r == nil || r.UploadURL == nil {
-		return ""
-	}
-	return *r.UploadURL
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetURL() string {
-	if r == nil || r.URL == nil {
-		return ""
-	}
-	return *r.URL
-}
-
-// GetZipballURL returns the ZipballURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryRelease) GetZipballURL() string {
-	if r == nil || r.ZipballURL == nil {
-		return ""
-	}
-	return *r.ZipballURL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (r *RepositoryTag) GetName() string {
-	if r == nil || r.Name == nil {
-		return ""
-	}
-	return *r.Name
-}
-
-// GetTarballURL returns the TarballURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryTag) GetTarballURL() string {
-	if r == nil || r.TarballURL == nil {
-		return ""
-	}
-	return *r.TarballURL
-}
-
-// GetZipballURL returns the ZipballURL field if it's non-nil, zero value otherwise.
-func (r *RepositoryTag) GetZipballURL() string {
-	if r == nil || r.ZipballURL == nil {
-		return ""
-	}
-	return *r.ZipballURL
-}
-
-// GetContext returns the Context field if it's non-nil, zero value otherwise.
-func (r *RepoStatus) GetContext() string {
-	if r == nil || r.Context == nil {
-		return ""
-	}
-	return *r.Context
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (r *RepoStatus) GetCreatedAt() time.Time {
-	if r == nil || r.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *r.CreatedAt
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (r *RepoStatus) GetDescription() string {
-	if r == nil || r.Description == nil {
-		return ""
-	}
-	return *r.Description
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (r *RepoStatus) GetID() int {
-	if r == nil || r.ID == nil {
-		return 0
-	}
-	return *r.ID
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (r *RepoStatus) GetState() string {
-	if r == nil || r.State == nil {
-		return ""
-	}
-	return *r.State
-}
-
-// GetTargetURL returns the TargetURL field if it's non-nil, zero value otherwise.
-func (r *RepoStatus) GetTargetURL() string {
-	if r == nil || r.TargetURL == nil {
-		return ""
-	}
-	return *r.TargetURL
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (r *RepoStatus) GetUpdatedAt() time.Time {
-	if r == nil || r.UpdatedAt == nil {
-		return time.Time{}
-	}
-	return *r.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (r *RepoStatus) GetURL() string {
-	if r == nil || r.URL == nil {
-		return ""
-	}
-	return *r.URL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (s *ServiceHook) GetName() string {
-	if s == nil || s.Name == nil {
-		return ""
-	}
-	return *s.Name
-}
-
-// GetPayload returns the Payload field if it's non-nil, zero value otherwise.
-func (s *SignatureVerification) GetPayload() string {
-	if s == nil || s.Payload == nil {
-		return ""
-	}
-	return *s.Payload
-}
-
-// GetReason returns the Reason field if it's non-nil, zero value otherwise.
-func (s *SignatureVerification) GetReason() string {
-	if s == nil || s.Reason == nil {
-		return ""
-	}
-	return *s.Reason
-}
-
-// GetSignature returns the Signature field if it's non-nil, zero value otherwise.
-func (s *SignatureVerification) GetSignature() string {
-	if s == nil || s.Signature == nil {
-		return ""
-	}
-	return *s.Signature
-}
-
-// GetVerified returns the Verified field if it's non-nil, zero value otherwise.
-func (s *SignatureVerification) GetVerified() bool {
-	if s == nil || s.Verified == nil {
-		return false
-	}
-	return *s.Verified
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (s *Source) GetID() int {
-	if s == nil || s.ID == nil {
-		return 0
-	}
-	return *s.ID
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (s *Source) GetURL() string {
-	if s == nil || s.URL == nil {
-		return ""
-	}
-	return *s.URL
-}
-
-// GetEmail returns the Email field if it's non-nil, zero value otherwise.
-func (s *SourceImportAuthor) GetEmail() string {
-	if s == nil || s.Email == nil {
-		return ""
-	}
-	return *s.Email
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (s *SourceImportAuthor) GetID() int {
-	if s == nil || s.ID == nil {
-		return 0
-	}
-	return *s.ID
-}
-
-// GetImportURL returns the ImportURL field if it's non-nil, zero value otherwise.
-func (s *SourceImportAuthor) GetImportURL() string {
-	if s == nil || s.ImportURL == nil {
-		return ""
-	}
-	return *s.ImportURL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (s *SourceImportAuthor) GetName() string {
-	if s == nil || s.Name == nil {
-		return ""
-	}
-	return *s.Name
-}
-
-// GetRemoteID returns the RemoteID field if it's non-nil, zero value otherwise.
-func (s *SourceImportAuthor) GetRemoteID() string {
-	if s == nil || s.RemoteID == nil {
-		return ""
-	}
-	return *s.RemoteID
-}
-
-// GetRemoteName returns the RemoteName field if it's non-nil, zero value otherwise.
-func (s *SourceImportAuthor) GetRemoteName() string {
-	if s == nil || s.RemoteName == nil {
-		return ""
-	}
-	return *s.RemoteName
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (s *SourceImportAuthor) GetURL() string {
-	if s == nil || s.URL == nil {
-		return ""
-	}
-	return *s.URL
-}
-
-// GetStarredAt returns the StarredAt field if it's non-nil, zero value otherwise.
-func (s *Stargazer) GetStarredAt() Timestamp {
-	if s == nil || s.StarredAt == nil {
-		return Timestamp{}
-	}
-	return *s.StarredAt
-}
-
-// GetStarredAt returns the StarredAt field if it's non-nil, zero value otherwise.
-func (s *StarredRepository) GetStarredAt() Timestamp {
-	if s == nil || s.StarredAt == nil {
-		return Timestamp{}
-	}
-	return *s.StarredAt
-}
-
-// GetExcludeAttachments returns the ExcludeAttachments field if it's non-nil, zero value otherwise.
-func (s *startMigration) GetExcludeAttachments() bool {
-	if s == nil || s.ExcludeAttachments == nil {
-		return false
-	}
-	return *s.ExcludeAttachments
-}
-
-// GetLockRepositories returns the LockRepositories field if it's non-nil, zero value otherwise.
-func (s *startMigration) GetLockRepositories() bool {
-	if s == nil || s.LockRepositories == nil {
-		return false
-	}
-	return *s.LockRepositories
-}
-
-// GetContext returns the Context field if it's non-nil, zero value otherwise.
-func (s *StatusEvent) GetContext() string {
-	if s == nil || s.Context == nil {
-		return ""
-	}
-	return *s.Context
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (s *StatusEvent) GetCreatedAt() Timestamp {
-	if s == nil || s.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *s.CreatedAt
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (s *StatusEvent) GetDescription() string {
-	if s == nil || s.Description == nil {
-		return ""
-	}
-	return *s.Description
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (s *StatusEvent) GetID() int {
-	if s == nil || s.ID == nil {
-		return 0
-	}
-	return *s.ID
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (s *StatusEvent) GetName() string {
-	if s == nil || s.Name == nil {
-		return ""
-	}
-	return *s.Name
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (s *StatusEvent) GetSHA() string {
-	if s == nil || s.SHA == nil {
-		return ""
-	}
-	return *s.SHA
-}
-
-// GetState returns the State field if it's non-nil, zero value otherwise.
-func (s *StatusEvent) GetState() string {
-	if s == nil || s.State == nil {
-		return ""
-	}
-	return *s.State
-}
-
-// GetTargetURL returns the TargetURL field if it's non-nil, zero value otherwise.
-func (s *StatusEvent) GetTargetURL() string {
-	if s == nil || s.TargetURL == nil {
-		return ""
-	}
-	return *s.TargetURL
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (s *StatusEvent) GetUpdatedAt() Timestamp {
-	if s == nil || s.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *s.UpdatedAt
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (s *Subscription) GetCreatedAt() Timestamp {
-	if s == nil || s.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *s.CreatedAt
-}
-
-// GetIgnored returns the Ignored field if it's non-nil, zero value otherwise.
-func (s *Subscription) GetIgnored() bool {
-	if s == nil || s.Ignored == nil {
-		return false
-	}
-	return *s.Ignored
-}
-
-// GetReason returns the Reason field if it's non-nil, zero value otherwise.
-func (s *Subscription) GetReason() string {
-	if s == nil || s.Reason == nil {
-		return ""
-	}
-	return *s.Reason
-}
-
-// GetRepositoryURL returns the RepositoryURL field if it's non-nil, zero value otherwise.
-func (s *Subscription) GetRepositoryURL() string {
-	if s == nil || s.RepositoryURL == nil {
-		return ""
-	}
-	return *s.RepositoryURL
-}
-
-// GetSubscribed returns the Subscribed field if it's non-nil, zero value otherwise.
-func (s *Subscription) GetSubscribed() bool {
-	if s == nil || s.Subscribed == nil {
-		return false
-	}
-	return *s.Subscribed
-}
-
-// GetThreadURL returns the ThreadURL field if it's non-nil, zero value otherwise.
-func (s *Subscription) GetThreadURL() string {
-	if s == nil || s.ThreadURL == nil {
-		return ""
-	}
-	return *s.ThreadURL
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (s *Subscription) GetURL() string {
-	if s == nil || s.URL == nil {
-		return ""
-	}
-	return *s.URL
-}
-
-// GetMessage returns the Message field if it's non-nil, zero value otherwise.
-func (t *Tag) GetMessage() string {
-	if t == nil || t.Message == nil {
-		return ""
-	}
-	return *t.Message
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (t *Tag) GetSHA() string {
-	if t == nil || t.SHA == nil {
-		return ""
-	}
-	return *t.SHA
-}
-
-// GetTag returns the Tag field if it's non-nil, zero value otherwise.
-func (t *Tag) GetTag() string {
-	if t == nil || t.Tag == nil {
-		return ""
-	}
-	return *t.Tag
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (t *Tag) GetURL() string {
-	if t == nil || t.URL == nil {
-		return ""
-	}
-	return *t.URL
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (t *Team) GetDescription() string {
-	if t == nil || t.Description == nil {
-		return ""
-	}
-	return *t.Description
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (t *Team) GetID() int {
-	if t == nil || t.ID == nil {
-		return 0
-	}
-	return *t.ID
-}
-
-// GetLDAPDN returns the LDAPDN field if it's non-nil, zero value otherwise.
-func (t *Team) GetLDAPDN() string {
-	if t == nil || t.LDAPDN == nil {
-		return ""
-	}
-	return *t.LDAPDN
-}
-
-// GetMembersCount returns the MembersCount field if it's non-nil, zero value otherwise.
-func (t *Team) GetMembersCount() int {
-	if t == nil || t.MembersCount == nil {
-		return 0
-	}
-	return *t.MembersCount
-}
-
-// GetMembersURL returns the MembersURL field if it's non-nil, zero value otherwise.
-func (t *Team) GetMembersURL() string {
-	if t == nil || t.MembersURL == nil {
-		return ""
-	}
-	return *t.MembersURL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (t *Team) GetName() string {
-	if t == nil || t.Name == nil {
-		return ""
-	}
-	return *t.Name
-}
-
-// GetPermission returns the Permission field if it's non-nil, zero value otherwise.
-func (t *Team) GetPermission() string {
-	if t == nil || t.Permission == nil {
-		return ""
-	}
-	return *t.Permission
-}
-
-// GetPrivacy returns the Privacy field if it's non-nil, zero value otherwise.
-func (t *Team) GetPrivacy() string {
-	if t == nil || t.Privacy == nil {
-		return ""
-	}
-	return *t.Privacy
-}
-
-// GetReposCount returns the ReposCount field if it's non-nil, zero value otherwise.
-func (t *Team) GetReposCount() int {
-	if t == nil || t.ReposCount == nil {
-		return 0
-	}
-	return *t.ReposCount
-}
-
-// GetRepositoriesURL returns the RepositoriesURL field if it's non-nil, zero value otherwise.
-func (t *Team) GetRepositoriesURL() string {
-	if t == nil || t.RepositoriesURL == nil {
-		return ""
-	}
-	return *t.RepositoriesURL
-}
-
-// GetSlug returns the Slug field if it's non-nil, zero value otherwise.
-func (t *Team) GetSlug() string {
-	if t == nil || t.Slug == nil {
-		return ""
-	}
-	return *t.Slug
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (t *Team) GetURL() string {
-	if t == nil || t.URL == nil {
-		return ""
-	}
-	return *t.URL
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (t *TeamEvent) GetAction() string {
-	if t == nil || t.Action == nil {
-		return ""
-	}
-	return *t.Action
-}
-
-// GetDescription returns the Description field if it's non-nil, zero value otherwise.
-func (t *TeamLDAPMapping) GetDescription() string {
-	if t == nil || t.Description == nil {
-		return ""
-	}
-	return *t.Description
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (t *TeamLDAPMapping) GetID() int {
-	if t == nil || t.ID == nil {
-		return 0
-	}
-	return *t.ID
-}
-
-// GetLDAPDN returns the LDAPDN field if it's non-nil, zero value otherwise.
-func (t *TeamLDAPMapping) GetLDAPDN() string {
-	if t == nil || t.LDAPDN == nil {
-		return ""
-	}
-	return *t.LDAPDN
-}
-
-// GetMembersURL returns the MembersURL field if it's non-nil, zero value otherwise.
-func (t *TeamLDAPMapping) GetMembersURL() string {
-	if t == nil || t.MembersURL == nil {
-		return ""
-	}
-	return *t.MembersURL
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (t *TeamLDAPMapping) GetName() string {
-	if t == nil || t.Name == nil {
-		return ""
-	}
-	return *t.Name
-}
-
-// GetPermission returns the Permission field if it's non-nil, zero value otherwise.
-func (t *TeamLDAPMapping) GetPermission() string {
-	if t == nil || t.Permission == nil {
-		return ""
-	}
-	return *t.Permission
-}
-
-// GetPrivacy returns the Privacy field if it's non-nil, zero value otherwise.
-func (t *TeamLDAPMapping) GetPrivacy() string {
-	if t == nil || t.Privacy == nil {
-		return ""
-	}
-	return *t.Privacy
-}
-
-// GetRepositoriesURL returns the RepositoriesURL field if it's non-nil, zero value otherwise.
-func (t *TeamLDAPMapping) GetRepositoriesURL() string {
-	if t == nil || t.RepositoriesURL == nil {
-		return ""
-	}
-	return *t.RepositoriesURL
-}
-
-// GetSlug returns the Slug field if it's non-nil, zero value otherwise.
-func (t *TeamLDAPMapping) GetSlug() string {
-	if t == nil || t.Slug == nil {
-		return ""
-	}
-	return *t.Slug
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (t *TeamLDAPMapping) GetURL() string {
-	if t == nil || t.URL == nil {
-		return ""
-	}
-	return *t.URL
-}
-
-// GetFragment returns the Fragment field if it's non-nil, zero value otherwise.
-func (t *TextMatch) GetFragment() string {
-	if t == nil || t.Fragment == nil {
-		return ""
-	}
-	return *t.Fragment
-}
-
-// GetObjectType returns the ObjectType field if it's non-nil, zero value otherwise.
-func (t *TextMatch) GetObjectType() string {
-	if t == nil || t.ObjectType == nil {
-		return ""
-	}
-	return *t.ObjectType
-}
-
-// GetObjectURL returns the ObjectURL field if it's non-nil, zero value otherwise.
-func (t *TextMatch) GetObjectURL() string {
-	if t == nil || t.ObjectURL == nil {
-		return ""
-	}
-	return *t.ObjectURL
-}
-
-// GetProperty returns the Property field if it's non-nil, zero value otherwise.
-func (t *TextMatch) GetProperty() string {
-	if t == nil || t.Property == nil {
-		return ""
-	}
-	return *t.Property
-}
-
-// GetCommitID returns the CommitID field if it's non-nil, zero value otherwise.
-func (t *Timeline) GetCommitID() string {
-	if t == nil || t.CommitID == nil {
-		return ""
-	}
-	return *t.CommitID
-}
-
-// GetCommitURL returns the CommitURL field if it's non-nil, zero value otherwise.
-func (t *Timeline) GetCommitURL() string {
-	if t == nil || t.CommitURL == nil {
-		return ""
-	}
-	return *t.CommitURL
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (t *Timeline) GetCreatedAt() time.Time {
-	if t == nil || t.CreatedAt == nil {
-		return time.Time{}
-	}
-	return *t.CreatedAt
-}
-
-// GetEvent returns the Event field if it's non-nil, zero value otherwise.
-func (t *Timeline) GetEvent() string {
-	if t == nil || t.Event == nil {
-		return ""
-	}
-	return *t.Event
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (t *Timeline) GetID() int {
-	if t == nil || t.ID == nil {
-		return 0
-	}
-	return *t.ID
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (t *Timeline) GetURL() string {
-	if t == nil || t.URL == nil {
-		return ""
-	}
-	return *t.URL
-}
-
-// GetCount returns the Count field if it's non-nil, zero value otherwise.
-func (t *TrafficClones) GetCount() int {
-	if t == nil || t.Count == nil {
-		return 0
-	}
-	return *t.Count
-}
-
-// GetUniques returns the Uniques field if it's non-nil, zero value otherwise.
-func (t *TrafficClones) GetUniques() int {
-	if t == nil || t.Uniques == nil {
-		return 0
-	}
-	return *t.Uniques
-}
-
-// GetCount returns the Count field if it's non-nil, zero value otherwise.
-func (t *TrafficData) GetCount() int {
-	if t == nil || t.Count == nil {
-		return 0
-	}
-	return *t.Count
-}
-
-// GetTimestamp returns the Timestamp field if it's non-nil, zero value otherwise.
-func (t *TrafficData) GetTimestamp() Timestamp {
-	if t == nil || t.Timestamp == nil {
-		return Timestamp{}
-	}
-	return *t.Timestamp
-}
-
-// GetUniques returns the Uniques field if it's non-nil, zero value otherwise.
-func (t *TrafficData) GetUniques() int {
-	if t == nil || t.Uniques == nil {
-		return 0
-	}
-	return *t.Uniques
-}
-
-// GetCount returns the Count field if it's non-nil, zero value otherwise.
-func (t *TrafficPath) GetCount() int {
-	if t == nil || t.Count == nil {
-		return 0
-	}
-	return *t.Count
-}
-
-// GetPath returns the Path field if it's non-nil, zero value otherwise.
-func (t *TrafficPath) GetPath() string {
-	if t == nil || t.Path == nil {
-		return ""
-	}
-	return *t.Path
-}
-
-// GetTitle returns the Title field if it's non-nil, zero value otherwise.
-func (t *TrafficPath) GetTitle() string {
-	if t == nil || t.Title == nil {
-		return ""
-	}
-	return *t.Title
-}
-
-// GetUniques returns the Uniques field if it's non-nil, zero value otherwise.
-func (t *TrafficPath) GetUniques() int {
-	if t == nil || t.Uniques == nil {
-		return 0
-	}
-	return *t.Uniques
-}
-
-// GetCount returns the Count field if it's non-nil, zero value otherwise.
-func (t *TrafficReferrer) GetCount() int {
-	if t == nil || t.Count == nil {
-		return 0
-	}
-	return *t.Count
-}
-
-// GetReferrer returns the Referrer field if it's non-nil, zero value otherwise.
-func (t *TrafficReferrer) GetReferrer() string {
-	if t == nil || t.Referrer == nil {
-		return ""
-	}
-	return *t.Referrer
-}
-
-// GetUniques returns the Uniques field if it's non-nil, zero value otherwise.
-func (t *TrafficReferrer) GetUniques() int {
-	if t == nil || t.Uniques == nil {
-		return 0
-	}
-	return *t.Uniques
-}
-
-// GetCount returns the Count field if it's non-nil, zero value otherwise.
-func (t *TrafficViews) GetCount() int {
-	if t == nil || t.Count == nil {
-		return 0
-	}
-	return *t.Count
-}
-
-// GetUniques returns the Uniques field if it's non-nil, zero value otherwise.
-func (t *TrafficViews) GetUniques() int {
-	if t == nil || t.Uniques == nil {
-		return 0
-	}
-	return *t.Uniques
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (t *Tree) GetSHA() string {
-	if t == nil || t.SHA == nil {
-		return ""
-	}
-	return *t.SHA
-}
-
-// GetContent returns the Content field if it's non-nil, zero value otherwise.
-func (t *TreeEntry) GetContent() string {
-	if t == nil || t.Content == nil {
-		return ""
-	}
-	return *t.Content
-}
-
-// GetMode returns the Mode field if it's non-nil, zero value otherwise.
-func (t *TreeEntry) GetMode() string {
-	if t == nil || t.Mode == nil {
-		return ""
-	}
-	return *t.Mode
-}
-
-// GetPath returns the Path field if it's non-nil, zero value otherwise.
-func (t *TreeEntry) GetPath() string {
-	if t == nil || t.Path == nil {
-		return ""
-	}
-	return *t.Path
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (t *TreeEntry) GetSHA() string {
-	if t == nil || t.SHA == nil {
-		return ""
-	}
-	return *t.SHA
-}
-
-// GetSize returns the Size field if it's non-nil, zero value otherwise.
-func (t *TreeEntry) GetSize() int {
-	if t == nil || t.Size == nil {
-		return 0
-	}
-	return *t.Size
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (t *TreeEntry) GetType() string {
-	if t == nil || t.Type == nil {
-		return ""
-	}
-	return *t.Type
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (t *TreeEntry) GetURL() string {
-	if t == nil || t.URL == nil {
-		return ""
-	}
-	return *t.URL
-}
-
-// GetForce returns the Force field if it's non-nil, zero value otherwise.
-func (u *updateRefRequest) GetForce() bool {
-	if u == nil || u.Force == nil {
-		return false
-	}
-	return *u.Force
-}
-
-// GetSHA returns the SHA field if it's non-nil, zero value otherwise.
-func (u *updateRefRequest) GetSHA() string {
-	if u == nil || u.SHA == nil {
-		return ""
-	}
-	return *u.SHA
-}
-
-// GetAvatarURL returns the AvatarURL field if it's non-nil, zero value otherwise.
-func (u *User) GetAvatarURL() string {
-	if u == nil || u.AvatarURL == nil {
-		return ""
-	}
-	return *u.AvatarURL
-}
-
-// GetBio returns the Bio field if it's non-nil, zero value otherwise.
-func (u *User) GetBio() string {
-	if u == nil || u.Bio == nil {
-		return ""
-	}
-	return *u.Bio
-}
-
-// GetBlog returns the Blog field if it's non-nil, zero value otherwise.
-func (u *User) GetBlog() string {
-	if u == nil || u.Blog == nil {
-		return ""
-	}
-	return *u.Blog
-}
-
-// GetCollaborators returns the Collaborators field if it's non-nil, zero value otherwise.
-func (u *User) GetCollaborators() int {
-	if u == nil || u.Collaborators == nil {
-		return 0
-	}
-	return *u.Collaborators
-}
-
-// GetCompany returns the Company field if it's non-nil, zero value otherwise.
-func (u *User) GetCompany() string {
-	if u == nil || u.Company == nil {
-		return ""
-	}
-	return *u.Company
-}
-
-// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise.
-func (u *User) GetCreatedAt() Timestamp {
-	if u == nil || u.CreatedAt == nil {
-		return Timestamp{}
-	}
-	return *u.CreatedAt
-}
-
-// GetDiskUsage returns the DiskUsage field if it's non-nil, zero value otherwise.
-func (u *User) GetDiskUsage() int {
-	if u == nil || u.DiskUsage == nil {
-		return 0
-	}
-	return *u.DiskUsage
-}
-
-// GetEmail returns the Email field if it's non-nil, zero value otherwise.
-func (u *User) GetEmail() string {
-	if u == nil || u.Email == nil {
-		return ""
-	}
-	return *u.Email
-}
-
-// GetEventsURL returns the EventsURL field if it's non-nil, zero value otherwise.
-func (u *User) GetEventsURL() string {
-	if u == nil || u.EventsURL == nil {
-		return ""
-	}
-	return *u.EventsURL
-}
-
-// GetFollowers returns the Followers field if it's non-nil, zero value otherwise.
-func (u *User) GetFollowers() int {
-	if u == nil || u.Followers == nil {
-		return 0
-	}
-	return *u.Followers
-}
-
-// GetFollowersURL returns the FollowersURL field if it's non-nil, zero value otherwise.
-func (u *User) GetFollowersURL() string {
-	if u == nil || u.FollowersURL == nil {
-		return ""
-	}
-	return *u.FollowersURL
-}
-
-// GetFollowing returns the Following field if it's non-nil, zero value otherwise.
-func (u *User) GetFollowing() int {
-	if u == nil || u.Following == nil {
-		return 0
-	}
-	return *u.Following
-}
-
-// GetFollowingURL returns the FollowingURL field if it's non-nil, zero value otherwise.
-func (u *User) GetFollowingURL() string {
-	if u == nil || u.FollowingURL == nil {
-		return ""
-	}
-	return *u.FollowingURL
-}
-
-// GetGistsURL returns the GistsURL field if it's non-nil, zero value otherwise.
-func (u *User) GetGistsURL() string {
-	if u == nil || u.GistsURL == nil {
-		return ""
-	}
-	return *u.GistsURL
-}
-
-// GetGravatarID returns the GravatarID field if it's non-nil, zero value otherwise.
-func (u *User) GetGravatarID() string {
-	if u == nil || u.GravatarID == nil {
-		return ""
-	}
-	return *u.GravatarID
-}
-
-// GetHireable returns the Hireable field if it's non-nil, zero value otherwise.
-func (u *User) GetHireable() bool {
-	if u == nil || u.Hireable == nil {
-		return false
-	}
-	return *u.Hireable
-}
-
-// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise.
-func (u *User) GetHTMLURL() string {
-	if u == nil || u.HTMLURL == nil {
-		return ""
-	}
-	return *u.HTMLURL
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (u *User) GetID() int {
-	if u == nil || u.ID == nil {
-		return 0
-	}
-	return *u.ID
-}
-
-// GetLocation returns the Location field if it's non-nil, zero value otherwise.
-func (u *User) GetLocation() string {
-	if u == nil || u.Location == nil {
-		return ""
-	}
-	return *u.Location
-}
-
-// GetLogin returns the Login field if it's non-nil, zero value otherwise.
-func (u *User) GetLogin() string {
-	if u == nil || u.Login == nil {
-		return ""
-	}
-	return *u.Login
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (u *User) GetName() string {
-	if u == nil || u.Name == nil {
-		return ""
-	}
-	return *u.Name
-}
-
-// GetOrganizationsURL returns the OrganizationsURL field if it's non-nil, zero value otherwise.
-func (u *User) GetOrganizationsURL() string {
-	if u == nil || u.OrganizationsURL == nil {
-		return ""
-	}
-	return *u.OrganizationsURL
-}
-
-// GetOwnedPrivateRepos returns the OwnedPrivateRepos field if it's non-nil, zero value otherwise.
-func (u *User) GetOwnedPrivateRepos() int {
-	if u == nil || u.OwnedPrivateRepos == nil {
-		return 0
-	}
-	return *u.OwnedPrivateRepos
-}
-
-// GetPermissions returns the Permissions field if it's non-nil, zero value otherwise.
-func (u *User) GetPermissions() map[string]bool {
-	if u == nil || u.Permissions == nil {
-		return map[string]bool{}
-	}
-	return *u.Permissions
-}
-
-// GetPrivateGists returns the PrivateGists field if it's non-nil, zero value otherwise.
-func (u *User) GetPrivateGists() int {
-	if u == nil || u.PrivateGists == nil {
-		return 0
-	}
-	return *u.PrivateGists
-}
-
-// GetPublicGists returns the PublicGists field if it's non-nil, zero value otherwise.
-func (u *User) GetPublicGists() int {
-	if u == nil || u.PublicGists == nil {
-		return 0
-	}
-	return *u.PublicGists
-}
-
-// GetPublicRepos returns the PublicRepos field if it's non-nil, zero value otherwise.
-func (u *User) GetPublicRepos() int {
-	if u == nil || u.PublicRepos == nil {
-		return 0
-	}
-	return *u.PublicRepos
-}
-
-// GetReceivedEventsURL returns the ReceivedEventsURL field if it's non-nil, zero value otherwise.
-func (u *User) GetReceivedEventsURL() string {
-	if u == nil || u.ReceivedEventsURL == nil {
-		return ""
-	}
-	return *u.ReceivedEventsURL
-}
-
-// GetReposURL returns the ReposURL field if it's non-nil, zero value otherwise.
-func (u *User) GetReposURL() string {
-	if u == nil || u.ReposURL == nil {
-		return ""
-	}
-	return *u.ReposURL
-}
-
-// GetSiteAdmin returns the SiteAdmin field if it's non-nil, zero value otherwise.
-func (u *User) GetSiteAdmin() bool {
-	if u == nil || u.SiteAdmin == nil {
-		return false
-	}
-	return *u.SiteAdmin
-}
-
-// GetStarredURL returns the StarredURL field if it's non-nil, zero value otherwise.
-func (u *User) GetStarredURL() string {
-	if u == nil || u.StarredURL == nil {
-		return ""
-	}
-	return *u.StarredURL
-}
-
-// GetSubscriptionsURL returns the SubscriptionsURL field if it's non-nil, zero value otherwise.
-func (u *User) GetSubscriptionsURL() string {
-	if u == nil || u.SubscriptionsURL == nil {
-		return ""
-	}
-	return *u.SubscriptionsURL
-}
-
-// GetSuspendedAt returns the SuspendedAt field if it's non-nil, zero value otherwise.
-func (u *User) GetSuspendedAt() Timestamp {
-	if u == nil || u.SuspendedAt == nil {
-		return Timestamp{}
-	}
-	return *u.SuspendedAt
-}
-
-// GetTotalPrivateRepos returns the TotalPrivateRepos field if it's non-nil, zero value otherwise.
-func (u *User) GetTotalPrivateRepos() int {
-	if u == nil || u.TotalPrivateRepos == nil {
-		return 0
-	}
-	return *u.TotalPrivateRepos
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (u *User) GetType() string {
-	if u == nil || u.Type == nil {
-		return ""
-	}
-	return *u.Type
-}
-
-// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise.
-func (u *User) GetUpdatedAt() Timestamp {
-	if u == nil || u.UpdatedAt == nil {
-		return Timestamp{}
-	}
-	return *u.UpdatedAt
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (u *User) GetURL() string {
-	if u == nil || u.URL == nil {
-		return ""
-	}
-	return *u.URL
-}
-
-// GetEmail returns the Email field if it's non-nil, zero value otherwise.
-func (u *UserEmail) GetEmail() string {
-	if u == nil || u.Email == nil {
-		return ""
-	}
-	return *u.Email
-}
-
-// GetPrimary returns the Primary field if it's non-nil, zero value otherwise.
-func (u *UserEmail) GetPrimary() bool {
-	if u == nil || u.Primary == nil {
-		return false
-	}
-	return *u.Primary
-}
-
-// GetVerified returns the Verified field if it's non-nil, zero value otherwise.
-func (u *UserEmail) GetVerified() bool {
-	if u == nil || u.Verified == nil {
-		return false
-	}
-	return *u.Verified
-}
-
-// GetAvatarURL returns the AvatarURL field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetAvatarURL() string {
-	if u == nil || u.AvatarURL == nil {
-		return ""
-	}
-	return *u.AvatarURL
-}
-
-// GetEventsURL returns the EventsURL field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetEventsURL() string {
-	if u == nil || u.EventsURL == nil {
-		return ""
-	}
-	return *u.EventsURL
-}
-
-// GetFollowersURL returns the FollowersURL field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetFollowersURL() string {
-	if u == nil || u.FollowersURL == nil {
-		return ""
-	}
-	return *u.FollowersURL
-}
-
-// GetFollowingURL returns the FollowingURL field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetFollowingURL() string {
-	if u == nil || u.FollowingURL == nil {
-		return ""
-	}
-	return *u.FollowingURL
-}
-
-// GetGistsURL returns the GistsURL field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetGistsURL() string {
-	if u == nil || u.GistsURL == nil {
-		return ""
-	}
-	return *u.GistsURL
-}
-
-// GetGravatarID returns the GravatarID field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetGravatarID() string {
-	if u == nil || u.GravatarID == nil {
-		return ""
-	}
-	return *u.GravatarID
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetID() int {
-	if u == nil || u.ID == nil {
-		return 0
-	}
-	return *u.ID
-}
-
-// GetLDAPDN returns the LDAPDN field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetLDAPDN() string {
-	if u == nil || u.LDAPDN == nil {
-		return ""
-	}
-	return *u.LDAPDN
-}
-
-// GetLogin returns the Login field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetLogin() string {
-	if u == nil || u.Login == nil {
-		return ""
-	}
-	return *u.Login
-}
-
-// GetOrganizationsURL returns the OrganizationsURL field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetOrganizationsURL() string {
-	if u == nil || u.OrganizationsURL == nil {
-		return ""
-	}
-	return *u.OrganizationsURL
-}
-
-// GetReceivedEventsURL returns the ReceivedEventsURL field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetReceivedEventsURL() string {
-	if u == nil || u.ReceivedEventsURL == nil {
-		return ""
-	}
-	return *u.ReceivedEventsURL
-}
-
-// GetReposURL returns the ReposURL field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetReposURL() string {
-	if u == nil || u.ReposURL == nil {
-		return ""
-	}
-	return *u.ReposURL
-}
-
-// GetSiteAdmin returns the SiteAdmin field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetSiteAdmin() bool {
-	if u == nil || u.SiteAdmin == nil {
-		return false
-	}
-	return *u.SiteAdmin
-}
-
-// GetStarredURL returns the StarredURL field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetStarredURL() string {
-	if u == nil || u.StarredURL == nil {
-		return ""
-	}
-	return *u.StarredURL
-}
-
-// GetSubscriptionsURL returns the SubscriptionsURL field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetSubscriptionsURL() string {
-	if u == nil || u.SubscriptionsURL == nil {
-		return ""
-	}
-	return *u.SubscriptionsURL
-}
-
-// GetType returns the Type field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetType() string {
-	if u == nil || u.Type == nil {
-		return ""
-	}
-	return *u.Type
-}
-
-// GetURL returns the URL field if it's non-nil, zero value otherwise.
-func (u *UserLDAPMapping) GetURL() string {
-	if u == nil || u.URL == nil {
-		return ""
-	}
-	return *u.URL
-}
-
-// GetIncompleteResults returns the IncompleteResults field if it's non-nil, zero value otherwise.
-func (u *UsersSearchResult) GetIncompleteResults() bool {
-	if u == nil || u.IncompleteResults == nil {
-		return false
-	}
-	return *u.IncompleteResults
-}
-
-// GetTotal returns the Total field if it's non-nil, zero value otherwise.
-func (u *UsersSearchResult) GetTotal() int {
-	if u == nil || u.Total == nil {
-		return 0
-	}
-	return *u.Total
-}
-
-// GetAction returns the Action field if it's non-nil, zero value otherwise.
-func (w *WatchEvent) GetAction() string {
-	if w == nil || w.Action == nil {
-		return ""
-	}
-	return *w.Action
-}
-
-// GetEmail returns the Email field if it's non-nil, zero value otherwise.
-func (w *WebHookAuthor) GetEmail() string {
-	if w == nil || w.Email == nil {
-		return ""
-	}
-	return *w.Email
-}
-
-// GetName returns the Name field if it's non-nil, zero value otherwise.
-func (w *WebHookAuthor) GetName() string {
-	if w == nil || w.Name == nil {
-		return ""
-	}
-	return *w.Name
-}
-
-// GetUsername returns the Username field if it's non-nil, zero value otherwise.
-func (w *WebHookAuthor) GetUsername() string {
-	if w == nil || w.Username == nil {
-		return ""
-	}
-	return *w.Username
-}
-
-// GetDistinct returns the Distinct field if it's non-nil, zero value otherwise.
-func (w *WebHookCommit) GetDistinct() bool {
-	if w == nil || w.Distinct == nil {
-		return false
-	}
-	return *w.Distinct
-}
-
-// GetID returns the ID field if it's non-nil, zero value otherwise.
-func (w *WebHookCommit) GetID() string {
-	if w == nil || w.ID == nil {
-		return ""
-	}
-	return *w.ID
-}
-
-// GetMessage returns the Message field if it's non-nil, zero value otherwise.
-func (w *WebHookCommit) GetMessage() string {
-	if w == nil || w.Message == nil {
-		return ""
-	}
-	return *w.Message
-}
-
-// GetTimestamp returns the Timestamp field if it's non-nil, zero value otherwise.
-func (w *WebHookCommit) GetTimestamp() time.Time {
-	if w == nil || w.Timestamp == nil {
-		return time.Time{}
-	}
-	return *w.Timestamp
-}
-
-// GetAfter returns the After field if it's non-nil, zero value otherwise.
-func (w *WebHookPayload) GetAfter() string {
-	if w == nil || w.After == nil {
-		return ""
-	}
-	return *w.After
-}
-
-// GetBefore returns the Before field if it's non-nil, zero value otherwise.
-func (w *WebHookPayload) GetBefore() string {
-	if w == nil || w.Before == nil {
-		return ""
-	}
-	return *w.Before
-}
-
-// GetCompare returns the Compare field if it's non-nil, zero value otherwise.
-func (w *WebHookPayload) GetCompare() string {
-	if w == nil || w.Compare == nil {
-		return ""
-	}
-	return *w.Compare
-}
-
-// GetCreated returns the Created field if it's non-nil, zero value otherwise.
-func (w *WebHookPayload) GetCreated() bool {
-	if w == nil || w.Created == nil {
-		return false
-	}
-	return *w.Created
-}
-
-// GetDeleted returns the Deleted field if it's non-nil, zero value otherwise.
-func (w *WebHookPayload) GetDeleted() bool {
-	if w == nil || w.Deleted == nil {
-		return false
-	}
-	return *w.Deleted
-}
-
-// GetForced returns the Forced field if it's non-nil, zero value otherwise.
-func (w *WebHookPayload) GetForced() bool {
-	if w == nil || w.Forced == nil {
-		return false
-	}
-	return *w.Forced
-}
-
-// GetRef returns the Ref field if it's non-nil, zero value otherwise.
-func (w *WebHookPayload) GetRef() string {
-	if w == nil || w.Ref == nil {
-		return ""
-	}
-	return *w.Ref
-}
-
-// GetTotal returns the Total field if it's non-nil, zero value otherwise.
-func (w *WeeklyCommitActivity) GetTotal() int {
-	if w == nil || w.Total == nil {
-		return 0
-	}
-	return *w.Total
-}
-
-// GetWeek returns the Week field if it's non-nil, zero value otherwise.
-func (w *WeeklyCommitActivity) GetWeek() Timestamp {
-	if w == nil || w.Week == nil {
-		return Timestamp{}
-	}
-	return *w.Week
-}
-
-// GetAdditions returns the Additions field if it's non-nil, zero value otherwise.
-func (w *WeeklyStats) GetAdditions() int {
-	if w == nil || w.Additions == nil {
-		return 0
-	}
-	return *w.Additions
-}
-
-// GetCommits returns the Commits field if it's non-nil, zero value otherwise.
-func (w *WeeklyStats) GetCommits() int {
-	if w == nil || w.Commits == nil {
-		return 0
-	}
-	return *w.Commits
-}
-
-// GetDeletions returns the Deletions field if it's non-nil, zero value otherwise.
-func (w *WeeklyStats) GetDeletions() int {
-	if w == nil || w.Deletions == nil {
-		return 0
-	}
-	return *w.Deletions
-}
-
-// GetWeek returns the Week field if it's non-nil, zero value otherwise.
-func (w *WeeklyStats) GetWeek() Timestamp {
-	if w == nil || w.Week == nil {
-		return Timestamp{}
-	}
-	return *w.Week
-}
diff --git a/vendor/github.com/google/go-github/github/github.go b/vendor/github.com/google/go-github/github/github.go
deleted file mode 100644
index e86a0ebf00..0000000000
--- a/vendor/github.com/google/go-github/github/github.go
+++ /dev/null
@@ -1,918 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate go run gen-accessors.go
-
-package github
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"reflect"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/google/go-querystring/query"
-)
-
-const (
-	libraryVersion = "8"
-	defaultBaseURL = "https://api.github.com/"
-	uploadBaseURL  = "https://uploads.github.com/"
-	userAgent      = "go-github/" + libraryVersion
-
-	headerRateLimit     = "X-RateLimit-Limit"
-	headerRateRemaining = "X-RateLimit-Remaining"
-	headerRateReset     = "X-RateLimit-Reset"
-	headerOTP           = "X-GitHub-OTP"
-
-	mediaTypeV3                = "application/vnd.github.v3+json"
-	defaultMediaType           = "application/octet-stream"
-	mediaTypeV3SHA             = "application/vnd.github.v3.sha"
-	mediaTypeV3Diff            = "application/vnd.github.v3.diff"
-	mediaTypeV3Patch           = "application/vnd.github.v3.patch"
-	mediaTypeOrgPermissionRepo = "application/vnd.github.v3.repository+json"
-
-	// Media Type values to access preview APIs
-
-	// https://developer.github.com/changes/2015-03-09-licenses-api/
-	mediaTypeLicensesPreview = "application/vnd.github.drax-preview+json"
-
-	// https://developer.github.com/changes/2014-12-09-new-attributes-for-stars-api/
-	mediaTypeStarringPreview = "application/vnd.github.v3.star+json"
-
-	// https://developer.github.com/changes/2015-11-11-protected-branches-api/
-	mediaTypeProtectedBranchesPreview = "application/vnd.github.loki-preview+json"
-
-	// https://help.github.com/enterprise/2.4/admin/guides/migrations/exporting-the-github-com-organization-s-repositories/
-	mediaTypeMigrationsPreview = "application/vnd.github.wyandotte-preview+json"
-
-	// https://developer.github.com/changes/2016-04-06-deployment-and-deployment-status-enhancements/
-	mediaTypeDeploymentStatusPreview = "application/vnd.github.ant-man-preview+json"
-
-	// https://developer.github.com/changes/2016-02-19-source-import-preview-api/
-	mediaTypeImportPreview = "application/vnd.github.barred-rock-preview"
-
-	// https://developer.github.com/changes/2016-05-12-reactions-api-preview/
-	mediaTypeReactionsPreview = "application/vnd.github.squirrel-girl-preview"
-
-	// https://developer.github.com/changes/2016-04-04-git-signing-api-preview/
-	mediaTypeGitSigningPreview = "application/vnd.github.cryptographer-preview+json"
-
-	// https://developer.github.com/changes/2016-05-23-timeline-preview-api/
-	mediaTypeTimelinePreview = "application/vnd.github.mockingbird-preview+json"
-
-	// https://developer.github.com/changes/2016-06-14-repository-invitations/
-	mediaTypeRepositoryInvitationsPreview = "application/vnd.github.swamp-thing-preview+json"
-
-	// https://developer.github.com/changes/2016-07-06-github-pages-preiew-api/
-	mediaTypePagesPreview = "application/vnd.github.mister-fantastic-preview+json"
-
-	// https://developer.github.com/changes/2016-09-14-projects-api/
-	mediaTypeProjectsPreview = "application/vnd.github.inertia-preview+json"
-
-	// https://developer.github.com/changes/2016-09-14-Integrations-Early-Access/
-	mediaTypeIntegrationPreview = "application/vnd.github.machine-man-preview+json"
-
-	// https://developer.github.com/changes/2017-01-05-commit-search-api/
-	mediaTypeCommitSearchPreview = "application/vnd.github.cloak-preview+json"
-
-	// https://developer.github.com/changes/2017-02-28-user-blocking-apis-and-webhook/
-	mediaTypeBlockUsersPreview = "application/vnd.github.giant-sentry-fist-preview+json"
-
-	// https://developer.github.com/changes/2017-02-09-community-health/
-	mediaTypeRepositoryCommunityHealthMetricsPreview = "application/vnd.github.black-panther-preview+json"
-
-	// https://developer.github.com/changes/2017-05-23-coc-api/
-	mediaTypeCodesOfConductPreview = "application/vnd.github.scarlet-witch-preview+json"
-
-	// https://developer.github.com/changes/2017-07-17-update-topics-on-repositories/
-	mediaTypeTopicsPreview = "application/vnd.github.mercy-preview+json"
-)
-
-// A Client manages communication with the GitHub API.
-type Client struct {
-	clientMu sync.Mutex   // clientMu protects the client during calls that modify the CheckRedirect func.
-	client   *http.Client // HTTP client used to communicate with the API.
-
-	// Base URL for API requests. Defaults to the public GitHub API, but can be
-	// set to a domain endpoint to use with GitHub Enterprise. BaseURL should
-	// always be specified with a trailing slash.
-	BaseURL *url.URL
-
-	// Base URL for uploading files.
-	UploadURL *url.URL
-
-	// User agent used when communicating with the GitHub API.
-	UserAgent string
-
-	rateMu     sync.Mutex
-	rateLimits [categories]Rate // Rate limits for the client as determined by the most recent API calls.
-
-	common service // Reuse a single struct instead of allocating one for each service on the heap.
-
-	// Services used for talking to different parts of the GitHub API.
-	Activity       *ActivityService
-	Admin          *AdminService
-	Apps           *AppsService
-	Authorizations *AuthorizationsService
-	Gists          *GistsService
-	Git            *GitService
-	Gitignores     *GitignoresService
-	Issues         *IssuesService
-	Organizations  *OrganizationsService
-	Projects       *ProjectsService
-	PullRequests   *PullRequestsService
-	Repositories   *RepositoriesService
-	Search         *SearchService
-	Users          *UsersService
-	Licenses       *LicensesService
-	Migrations     *MigrationService
-	Reactions      *ReactionsService
-}
-
-type service struct {
-	client *Client
-}
-
-// ListOptions specifies the optional parameters to various List methods that
-// support pagination.
-type ListOptions struct {
-	// For paginated result sets, page of results to retrieve.
-	Page int `url:"page,omitempty"`
-
-	// For paginated result sets, the number of results to include per page.
-	PerPage int `url:"per_page,omitempty"`
-}
-
-// UploadOptions specifies the parameters to methods that support uploads.
-type UploadOptions struct {
-	Name string `url:"name,omitempty"`
-}
-
-// RawType represents type of raw format of a request instead of JSON.
-type RawType uint8
-
-const (
-	// Diff format.
-	Diff RawType = 1 + iota
-	// Patch format.
-	Patch
-)
-
-// RawOptions specifies parameters when user wants to get raw format of
-// a response instead of JSON.
-type RawOptions struct {
-	Type RawType
-}
-
-// addOptions adds the parameters in opt as URL query parameters to s. opt
-// must be a struct whose fields may contain "url" tags.
-func addOptions(s string, opt interface{}) (string, error) {
-	v := reflect.ValueOf(opt)
-	if v.Kind() == reflect.Ptr && v.IsNil() {
-		return s, nil
-	}
-
-	u, err := url.Parse(s)
-	if err != nil {
-		return s, err
-	}
-
-	qs, err := query.Values(opt)
-	if err != nil {
-		return s, err
-	}
-
-	u.RawQuery = qs.Encode()
-	return u.String(), nil
-}
-
-// NewClient returns a new GitHub API client. If a nil httpClient is
-// provided, http.DefaultClient will be used. To use API methods which require
-// authentication, provide an http.Client that will perform the authentication
-// for you (such as that provided by the golang.org/x/oauth2 library).
-func NewClient(httpClient *http.Client) *Client {
-	if httpClient == nil {
-		httpClient = http.DefaultClient
-	}
-	baseURL, _ := url.Parse(defaultBaseURL)
-	uploadURL, _ := url.Parse(uploadBaseURL)
-
-	c := &Client{client: httpClient, BaseURL: baseURL, UserAgent: userAgent, UploadURL: uploadURL}
-	c.common.client = c
-	c.Activity = (*ActivityService)(&c.common)
-	c.Admin = (*AdminService)(&c.common)
-	c.Apps = (*AppsService)(&c.common)
-	c.Authorizations = (*AuthorizationsService)(&c.common)
-	c.Gists = (*GistsService)(&c.common)
-	c.Git = (*GitService)(&c.common)
-	c.Gitignores = (*GitignoresService)(&c.common)
-	c.Issues = (*IssuesService)(&c.common)
-	c.Licenses = (*LicensesService)(&c.common)
-	c.Migrations = (*MigrationService)(&c.common)
-	c.Organizations = (*OrganizationsService)(&c.common)
-	c.Projects = (*ProjectsService)(&c.common)
-	c.PullRequests = (*PullRequestsService)(&c.common)
-	c.Reactions = (*ReactionsService)(&c.common)
-	c.Repositories = (*RepositoriesService)(&c.common)
-	c.Search = (*SearchService)(&c.common)
-	c.Users = (*UsersService)(&c.common)
-	return c
-}
-
-// NewRequest creates an API request. A relative URL can be provided in urlStr,
-// in which case it is resolved relative to the BaseURL of the Client.
-// Relative URLs should always be specified without a preceding slash. If
-// specified, the value pointed to by body is JSON encoded and included as the
-// request body.
-func (c *Client) NewRequest(method, urlStr string, body interface{}) (*http.Request, error) {
-	rel, err := url.Parse(urlStr)
-	if err != nil {
-		return nil, err
-	}
-
-	u := c.BaseURL.ResolveReference(rel)
-
-	var buf io.ReadWriter
-	if body != nil {
-		buf = new(bytes.Buffer)
-		err := json.NewEncoder(buf).Encode(body)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	req, err := http.NewRequest(method, u.String(), buf)
-	if err != nil {
-		return nil, err
-	}
-
-	if body != nil {
-		req.Header.Set("Content-Type", "application/json")
-	}
-	req.Header.Set("Accept", mediaTypeV3)
-	if c.UserAgent != "" {
-		req.Header.Set("User-Agent", c.UserAgent)
-	}
-	return req, nil
-}
-
-// NewUploadRequest creates an upload request. A relative URL can be provided in
-// urlStr, in which case it is resolved relative to the UploadURL of the Client.
-// Relative URLs should always be specified without a preceding slash.
-func (c *Client) NewUploadRequest(urlStr string, reader io.Reader, size int64, mediaType string) (*http.Request, error) {
-	rel, err := url.Parse(urlStr)
-	if err != nil {
-		return nil, err
-	}
-
-	u := c.UploadURL.ResolveReference(rel)
-	req, err := http.NewRequest("POST", u.String(), reader)
-	if err != nil {
-		return nil, err
-	}
-	req.ContentLength = size
-
-	if mediaType == "" {
-		mediaType = defaultMediaType
-	}
-	req.Header.Set("Content-Type", mediaType)
-	req.Header.Set("Accept", mediaTypeV3)
-	req.Header.Set("User-Agent", c.UserAgent)
-	return req, nil
-}
-
-// Response is a GitHub API response. This wraps the standard http.Response
-// returned from GitHub and provides convenient access to things like
-// pagination links.
-type Response struct {
-	*http.Response
-
-	// These fields provide the page values for paginating through a set of
-	// results. Any or all of these may be set to the zero value for
-	// responses that are not part of a paginated set, or for which there
-	// are no additional pages.
-
-	NextPage  int
-	PrevPage  int
-	FirstPage int
-	LastPage  int
-
-	Rate
-}
-
-// newResponse creates a new Response for the provided http.Response.
-// r must not be nil.
-func newResponse(r *http.Response) *Response {
-	response := &Response{Response: r}
-	response.populatePageValues()
-	response.Rate = parseRate(r)
-	return response
-}
-
-// populatePageValues parses the HTTP Link response headers and populates the
-// various pagination link values in the Response.
-func (r *Response) populatePageValues() {
-	if links, ok := r.Response.Header["Link"]; ok && len(links) > 0 {
-		for _, link := range strings.Split(links[0], ",") {
-			segments := strings.Split(strings.TrimSpace(link), ";")
-
-			// link must at least have href and rel
-			if len(segments) < 2 {
-				continue
-			}
-
-			// ensure href is properly formatted
-			if !strings.HasPrefix(segments[0], "<") || !strings.HasSuffix(segments[0], ">") {
-				continue
-			}
-
-			// try to pull out page parameter
-			url, err := url.Parse(segments[0][1 : len(segments[0])-1])
-			if err != nil {
-				continue
-			}
-			page := url.Query().Get("page")
-			if page == "" {
-				continue
-			}
-
-			for _, segment := range segments[1:] {
-				switch strings.TrimSpace(segment) {
-				case `rel="next"`:
-					r.NextPage, _ = strconv.Atoi(page)
-				case `rel="prev"`:
-					r.PrevPage, _ = strconv.Atoi(page)
-				case `rel="first"`:
-					r.FirstPage, _ = strconv.Atoi(page)
-				case `rel="last"`:
-					r.LastPage, _ = strconv.Atoi(page)
-				}
-
-			}
-		}
-	}
-}
-
-// parseRate parses the rate related headers.
-func parseRate(r *http.Response) Rate {
-	var rate Rate
-	if limit := r.Header.Get(headerRateLimit); limit != "" {
-		rate.Limit, _ = strconv.Atoi(limit)
-	}
-	if remaining := r.Header.Get(headerRateRemaining); remaining != "" {
-		rate.Remaining, _ = strconv.Atoi(remaining)
-	}
-	if reset := r.Header.Get(headerRateReset); reset != "" {
-		if v, _ := strconv.ParseInt(reset, 10, 64); v != 0 {
-			rate.Reset = Timestamp{time.Unix(v, 0)}
-		}
-	}
-	return rate
-}
-
-// Do sends an API request and returns the API response. The API response is
-// JSON decoded and stored in the value pointed to by v, or returned as an
-// error if an API error has occurred. If v implements the io.Writer
-// interface, the raw response body will be written to v, without attempting to
-// first decode it. If rate limit is exceeded and reset time is in the future,
-// Do returns *RateLimitError immediately without making a network API call.
-//
-// The provided ctx must be non-nil. If it is canceled or times out,
-// ctx.Err() will be returned.
-func (c *Client) Do(ctx context.Context, req *http.Request, v interface{}) (*Response, error) {
-	ctx, req = withContext(ctx, req)
-
-	rateLimitCategory := category(req.URL.Path)
-
-	// If we've hit rate limit, don't make further requests before Reset time.
-	if err := c.checkRateLimitBeforeDo(req, rateLimitCategory); err != nil {
-		return &Response{
-			Response: err.Response,
-			Rate:     err.Rate,
-		}, err
-	}
-
-	resp, err := c.client.Do(req)
-	if err != nil {
-		// If we got an error, and the context has been canceled,
-		// the context's error is probably more useful.
-		select {
-		case <-ctx.Done():
-			return nil, ctx.Err()
-		default:
-		}
-
-		// If the error type is *url.Error, sanitize its URL before returning.
-		if e, ok := err.(*url.Error); ok {
-			if url, err := url.Parse(e.URL); err == nil {
-				e.URL = sanitizeURL(url).String()
-				return nil, e
-			}
-		}
-
-		return nil, err
-	}
-
-	defer func() {
-		// Drain up to 512 bytes and close the body to let the Transport reuse the connection
-		io.CopyN(ioutil.Discard, resp.Body, 512)
-		resp.Body.Close()
-	}()
-
-	response := newResponse(resp)
-
-	c.rateMu.Lock()
-	c.rateLimits[rateLimitCategory] = response.Rate
-	c.rateMu.Unlock()
-
-	err = CheckResponse(resp)
-	if err != nil {
-		// even though there was an error, we still return the response
-		// in case the caller wants to inspect it further
-		return response, err
-	}
-
-	if v != nil {
-		if w, ok := v.(io.Writer); ok {
-			io.Copy(w, resp.Body)
-		} else {
-			err = json.NewDecoder(resp.Body).Decode(v)
-			if err == io.EOF {
-				err = nil // ignore EOF errors caused by empty response body
-			}
-		}
-	}
-
-	return response, err
-}
-
-// checkRateLimitBeforeDo does not make any network calls, but uses existing knowledge from
-// current client state in order to quickly check if *RateLimitError can be immediately returned
-// from Client.Do, and if so, returns it so that Client.Do can skip making a network API call unnecessarily.
-// Otherwise it returns nil, and Client.Do should proceed normally.
-func (c *Client) checkRateLimitBeforeDo(req *http.Request, rateLimitCategory rateLimitCategory) *RateLimitError {
-	c.rateMu.Lock()
-	rate := c.rateLimits[rateLimitCategory]
-	c.rateMu.Unlock()
-	if !rate.Reset.Time.IsZero() && rate.Remaining == 0 && time.Now().Before(rate.Reset.Time) {
-		// Create a fake response.
-		resp := &http.Response{
-			Status:     http.StatusText(http.StatusForbidden),
-			StatusCode: http.StatusForbidden,
-			Request:    req,
-			Header:     make(http.Header),
-			Body:       ioutil.NopCloser(strings.NewReader("")),
-		}
-		return &RateLimitError{
-			Rate:     rate,
-			Response: resp,
-			Message:  fmt.Sprintf("API rate limit of %v still exceeded until %v, not making remote request.", rate.Limit, rate.Reset.Time),
-		}
-	}
-
-	return nil
-}
-
-/*
-An ErrorResponse reports one or more errors caused by an API request.
-
-GitHub API docs: https://developer.github.com/v3/#client-errors
-*/
-type ErrorResponse struct {
-	Response *http.Response // HTTP response that caused this error
-	Message  string         `json:"message"` // error message
-	Errors   []Error        `json:"errors"`  // more detail on individual errors
-	// Block is only populated on certain types of errors such as code 451.
-	// See https://developer.github.com/changes/2016-03-17-the-451-status-code-is-now-supported/
-	// for more information.
-	Block *struct {
-		Reason    string     `json:"reason,omitempty"`
-		CreatedAt *Timestamp `json:"created_at,omitempty"`
-	} `json:"block,omitempty"`
-	// Most errors will also include a documentation_url field pointing
-	// to some content that might help you resolve the error, see
-	// https://developer.github.com/v3/#client-errors
-	DocumentationURL string `json:"documentation_url,omitempty"`
-}
-
-func (r *ErrorResponse) Error() string {
-	return fmt.Sprintf("%v %v: %d %v %+v",
-		r.Response.Request.Method, sanitizeURL(r.Response.Request.URL),
-		r.Response.StatusCode, r.Message, r.Errors)
-}
-
-// TwoFactorAuthError occurs when using HTTP Basic Authentication for a user
-// that has two-factor authentication enabled. The request can be reattempted
-// by providing a one-time password in the request.
-type TwoFactorAuthError ErrorResponse
-
-func (r *TwoFactorAuthError) Error() string { return (*ErrorResponse)(r).Error() }
-
-// RateLimitError occurs when GitHub returns 403 Forbidden response with a rate limit
-// remaining value of 0, and error message starts with "API rate limit exceeded for ".
-type RateLimitError struct {
-	Rate     Rate           // Rate specifies last known rate limit for the client
-	Response *http.Response // HTTP response that caused this error
-	Message  string         `json:"message"` // error message
-}
-
-func (r *RateLimitError) Error() string {
-	return fmt.Sprintf("%v %v: %d %v %v",
-		r.Response.Request.Method, sanitizeURL(r.Response.Request.URL),
-		r.Response.StatusCode, r.Message, formatRateReset(r.Rate.Reset.Time.Sub(time.Now())))
-}
-
-// AcceptedError occurs when GitHub returns 202 Accepted response with an
-// empty body, which means a job was scheduled on the GitHub side to process
-// the information needed and cache it.
-// Technically, 202 Accepted is not a real error, it's just used to
-// indicate that results are not ready yet, but should be available soon.
-// The request can be repeated after some time.
-type AcceptedError struct{}
-
-func (*AcceptedError) Error() string {
-	return "job scheduled on GitHub side; try again later"
-}
-
-// AbuseRateLimitError occurs when GitHub returns 403 Forbidden response with the
-// "documentation_url" field value equal to "https://developer.github.com/v3#abuse-rate-limits".
-type AbuseRateLimitError struct {
-	Response *http.Response // HTTP response that caused this error
-	Message  string         `json:"message"` // error message
-
-	// RetryAfter is provided with some abuse rate limit errors. If present,
-	// it is the amount of time that the client should wait before retrying.
-	// Otherwise, the client should try again later (after an unspecified amount of time).
-	RetryAfter *time.Duration
-}
-
-func (r *AbuseRateLimitError) Error() string {
-	return fmt.Sprintf("%v %v: %d %v",
-		r.Response.Request.Method, sanitizeURL(r.Response.Request.URL),
-		r.Response.StatusCode, r.Message)
-}
-
-// sanitizeURL redacts the client_secret parameter from the URL which may be
-// exposed to the user.
-func sanitizeURL(uri *url.URL) *url.URL {
-	if uri == nil {
-		return nil
-	}
-	params := uri.Query()
-	if len(params.Get("client_secret")) > 0 {
-		params.Set("client_secret", "REDACTED")
-		uri.RawQuery = params.Encode()
-	}
-	return uri
-}
-
-/*
-An Error reports more details on an individual error in an ErrorResponse.
-These are the possible validation error codes:
-
-    missing:
-        resource does not exist
-    missing_field:
-        a required field on a resource has not been set
-    invalid:
-        the formatting of a field is invalid
-    already_exists:
-        another resource has the same valid as this field
-    custom:
-        some resources return this (e.g. github.User.CreateKey()), additional
-        information is set in the Message field of the Error
-
-GitHub API docs: https://developer.github.com/v3/#client-errors
-*/
-type Error struct {
-	Resource string `json:"resource"` // resource on which the error occurred
-	Field    string `json:"field"`    // field on which the error occurred
-	Code     string `json:"code"`     // validation error code
-	Message  string `json:"message"`  // Message describing the error. Errors with Code == "custom" will always have this set.
-}
-
-func (e *Error) Error() string {
-	return fmt.Sprintf("%v error caused by %v field on %v resource",
-		e.Code, e.Field, e.Resource)
-}
-
-// CheckResponse checks the API response for errors, and returns them if
-// present. A response is considered an error if it has a status code outside
-// the 200 range or equal to 202 Accepted.
-// API error responses are expected to have either no response
-// body, or a JSON response body that maps to ErrorResponse. Any other
-// response body will be silently ignored.
-//
-// The error type will be *RateLimitError for rate limit exceeded errors,
-// *AcceptedError for 202 Accepted status codes,
-// and *TwoFactorAuthError for two-factor authentication errors.
-func CheckResponse(r *http.Response) error {
-	if r.StatusCode == http.StatusAccepted {
-		return &AcceptedError{}
-	}
-	if c := r.StatusCode; 200 <= c && c <= 299 {
-		return nil
-	}
-	errorResponse := &ErrorResponse{Response: r}
-	data, err := ioutil.ReadAll(r.Body)
-	if err == nil && data != nil {
-		json.Unmarshal(data, errorResponse)
-	}
-	switch {
-	case r.StatusCode == http.StatusUnauthorized && strings.HasPrefix(r.Header.Get(headerOTP), "required"):
-		return (*TwoFactorAuthError)(errorResponse)
-	case r.StatusCode == http.StatusForbidden && r.Header.Get(headerRateRemaining) == "0" && strings.HasPrefix(errorResponse.Message, "API rate limit exceeded for "):
-		return &RateLimitError{
-			Rate:     parseRate(r),
-			Response: errorResponse.Response,
-			Message:  errorResponse.Message,
-		}
-	case r.StatusCode == http.StatusForbidden && errorResponse.DocumentationURL == "https://developer.github.com/v3#abuse-rate-limits":
-		abuseRateLimitError := &AbuseRateLimitError{
-			Response: errorResponse.Response,
-			Message:  errorResponse.Message,
-		}
-		if v := r.Header["Retry-After"]; len(v) > 0 {
-			// According to GitHub support, the "Retry-After" header value will be
-			// an integer which represents the number of seconds that one should
-			// wait before resuming making requests.
-			retryAfterSeconds, _ := strconv.ParseInt(v[0], 10, 64) // Error handling is noop.
-			retryAfter := time.Duration(retryAfterSeconds) * time.Second
-			abuseRateLimitError.RetryAfter = &retryAfter
-		}
-		return abuseRateLimitError
-	default:
-		return errorResponse
-	}
-}
-
-// parseBoolResponse determines the boolean result from a GitHub API response.
-// Several GitHub API methods return boolean responses indicated by the HTTP
-// status code in the response (true indicated by a 204, false indicated by a
-// 404). This helper function will determine that result and hide the 404
-// error if present. Any other error will be returned through as-is.
-func parseBoolResponse(err error) (bool, error) {
-	if err == nil {
-		return true, nil
-	}
-
-	if err, ok := err.(*ErrorResponse); ok && err.Response.StatusCode == http.StatusNotFound {
-		// Simply false. In this one case, we do not pass the error through.
-		return false, nil
-	}
-
-	// some other real error occurred
-	return false, err
-}
-
-// Rate represents the rate limit for the current client.
-type Rate struct {
-	// The number of requests per hour the client is currently limited to.
-	Limit int `json:"limit"`
-
-	// The number of remaining requests the client can make this hour.
-	Remaining int `json:"remaining"`
-
-	// The time at which the current rate limit will reset.
-	Reset Timestamp `json:"reset"`
-}
-
-func (r Rate) String() string {
-	return Stringify(r)
-}
-
-// RateLimits represents the rate limits for the current client.
-type RateLimits struct {
-	// The rate limit for non-search API requests. Unauthenticated
-	// requests are limited to 60 per hour. Authenticated requests are
-	// limited to 5,000 per hour.
-	//
-	// GitHub API docs: https://developer.github.com/v3/#rate-limiting
-	Core *Rate `json:"core"`
-
-	// The rate limit for search API requests. Unauthenticated requests
-	// are limited to 10 requests per minutes. Authenticated requests are
-	// limited to 30 per minute.
-	//
-	// GitHub API docs: https://developer.github.com/v3/search/#rate-limit
-	Search *Rate `json:"search"`
-}
-
-func (r RateLimits) String() string {
-	return Stringify(r)
-}
-
-type rateLimitCategory uint8
-
-const (
-	coreCategory rateLimitCategory = iota
-	searchCategory
-
-	categories // An array of this length will be able to contain all rate limit categories.
-)
-
-// category returns the rate limit category of the endpoint, determined by Request.URL.Path.
-func category(path string) rateLimitCategory {
-	switch {
-	default:
-		return coreCategory
-	case strings.HasPrefix(path, "/search/"):
-		return searchCategory
-	}
-}
-
-// RateLimits returns the rate limits for the current client.
-func (c *Client) RateLimits(ctx context.Context) (*RateLimits, *Response, error) {
-	req, err := c.NewRequest("GET", "rate_limit", nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	response := new(struct {
-		Resources *RateLimits `json:"resources"`
-	})
-	resp, err := c.Do(ctx, req, response)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if response.Resources != nil {
-		c.rateMu.Lock()
-		if response.Resources.Core != nil {
-			c.rateLimits[coreCategory] = *response.Resources.Core
-		}
-		if response.Resources.Search != nil {
-			c.rateLimits[searchCategory] = *response.Resources.Search
-		}
-		c.rateMu.Unlock()
-	}
-
-	return response.Resources, resp, nil
-}
-
-/*
-UnauthenticatedRateLimitedTransport allows you to make unauthenticated calls
-that need to use a higher rate limit associated with your OAuth application.
-
-	t := &github.UnauthenticatedRateLimitedTransport{
-		ClientID:     "your app's client ID",
-		ClientSecret: "your app's client secret",
-	}
-	client := github.NewClient(t.Client())
-
-This will append the querystring params client_id=xxx&client_secret=yyy to all
-requests.
-
-See https://developer.github.com/v3/#unauthenticated-rate-limited-requests for
-more information.
-*/
-type UnauthenticatedRateLimitedTransport struct {
-	// ClientID is the GitHub OAuth client ID of the current application, which
-	// can be found by selecting its entry in the list at
-	// https://github.com/settings/applications.
-	ClientID string
-
-	// ClientSecret is the GitHub OAuth client secret of the current
-	// application.
-	ClientSecret string
-
-	// Transport is the underlying HTTP transport to use when making requests.
-	// It will default to http.DefaultTransport if nil.
-	Transport http.RoundTripper
-}
-
-// RoundTrip implements the RoundTripper interface.
-func (t *UnauthenticatedRateLimitedTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	if t.ClientID == "" {
-		return nil, errors.New("t.ClientID is empty")
-	}
-	if t.ClientSecret == "" {
-		return nil, errors.New("t.ClientSecret is empty")
-	}
-
-	// To set extra querystring params, we must make a copy of the Request so
-	// that we don't modify the Request we were given. This is required by the
-	// specification of http.RoundTripper.
-	req = cloneRequest(req)
-	q := req.URL.Query()
-	q.Set("client_id", t.ClientID)
-	q.Set("client_secret", t.ClientSecret)
-	req.URL.RawQuery = q.Encode()
-
-	// Make the HTTP request.
-	return t.transport().RoundTrip(req)
-}
-
-// Client returns an *http.Client that makes requests which are subject to the
-// rate limit of your OAuth application.
-func (t *UnauthenticatedRateLimitedTransport) Client() *http.Client {
-	return &http.Client{Transport: t}
-}
-
-func (t *UnauthenticatedRateLimitedTransport) transport() http.RoundTripper {
-	if t.Transport != nil {
-		return t.Transport
-	}
-	return http.DefaultTransport
-}
-
-// BasicAuthTransport is an http.RoundTripper that authenticates all requests
-// using HTTP Basic Authentication with the provided username and password. It
-// additionally supports users who have two-factor authentication enabled on
-// their GitHub account.
-type BasicAuthTransport struct {
-	Username string // GitHub username
-	Password string // GitHub password
-	OTP      string // one-time password for users with two-factor auth enabled
-
-	// Transport is the underlying HTTP transport to use when making requests.
-	// It will default to http.DefaultTransport if nil.
-	Transport http.RoundTripper
-}
-
-// RoundTrip implements the RoundTripper interface.
-func (t *BasicAuthTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	req = cloneRequest(req) // per RoundTrip contract
-	req.SetBasicAuth(t.Username, t.Password)
-	if t.OTP != "" {
-		req.Header.Set(headerOTP, t.OTP)
-	}
-	return t.transport().RoundTrip(req)
-}
-
-// Client returns an *http.Client that makes requests that are authenticated
-// using HTTP Basic Authentication.
-func (t *BasicAuthTransport) Client() *http.Client {
-	return &http.Client{Transport: t}
-}
-
-func (t *BasicAuthTransport) transport() http.RoundTripper {
-	if t.Transport != nil {
-		return t.Transport
-	}
-	return http.DefaultTransport
-}
-
-// cloneRequest returns a clone of the provided *http.Request. The clone is a
-// shallow copy of the struct and its Header map.
-func cloneRequest(r *http.Request) *http.Request {
-	// shallow copy of the struct
-	r2 := new(http.Request)
-	*r2 = *r
-	// deep copy of the Header
-	r2.Header = make(http.Header, len(r.Header))
-	for k, s := range r.Header {
-		r2.Header[k] = append([]string(nil), s...)
-	}
-	return r2
-}
-
-// formatRateReset formats d to look like "[rate reset in 2s]" or
-// "[rate reset in 87m02s]" for the positive durations. And like "[rate limit was reset 87m02s ago]"
-// for the negative cases.
-func formatRateReset(d time.Duration) string {
-	isNegative := d < 0
-	if isNegative {
-		d *= -1
-	}
-	secondsTotal := int(0.5 + d.Seconds())
-	minutes := secondsTotal / 60
-	seconds := secondsTotal - minutes*60
-
-	var timeString string
-	if minutes > 0 {
-		timeString = fmt.Sprintf("%dm%02ds", minutes, seconds)
-	} else {
-		timeString = fmt.Sprintf("%ds", seconds)
-	}
-
-	if isNegative {
-		return fmt.Sprintf("[rate limit was reset %v ago]", timeString)
-	}
-	return fmt.Sprintf("[rate reset in %v]", timeString)
-}
-
-// Bool is a helper routine that allocates a new bool value
-// to store v and returns a pointer to it.
-func Bool(v bool) *bool { return &v }
-
-// Int is a helper routine that allocates a new int value
-// to store v and returns a pointer to it.
-func Int(v int) *int { return &v }
-
-// String is a helper routine that allocates a new string value
-// to store v and returns a pointer to it.
-func String(v string) *string { return &v }
diff --git a/vendor/github.com/google/go-github/github/gitignore.go b/vendor/github.com/google/go-github/github/gitignore.go
deleted file mode 100644
index 2f691bc323..0000000000
--- a/vendor/github.com/google/go-github/github/gitignore.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// GitignoresService provides access to the gitignore related functions in the
-// GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/gitignore/
-type GitignoresService service
-
-// Gitignore represents a .gitignore file as returned by the GitHub API.
-type Gitignore struct {
-	Name   *string `json:"name,omitempty"`
-	Source *string `json:"source,omitempty"`
-}
-
-func (g Gitignore) String() string {
-	return Stringify(g)
-}
-
-// List all available Gitignore templates.
-//
-// GitHub API docs: https://developer.github.com/v3/gitignore/#listing-available-templates
-func (s GitignoresService) List(ctx context.Context) ([]string, *Response, error) {
-	req, err := s.client.NewRequest("GET", "gitignore/templates", nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var availableTemplates []string
-	resp, err := s.client.Do(ctx, req, &availableTemplates)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return availableTemplates, resp, nil
-}
-
-// Get a Gitignore by name.
-//
-// GitHub API docs: https://developer.github.com/v3/gitignore/#get-a-single-template
-func (s GitignoresService) Get(ctx context.Context, name string) (*Gitignore, *Response, error) {
-	u := fmt.Sprintf("gitignore/templates/%v", name)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	gitignore := new(Gitignore)
-	resp, err := s.client.Do(ctx, req, gitignore)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return gitignore, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/issues.go b/vendor/github.com/google/go-github/github/issues.go
deleted file mode 100644
index b437d5063a..0000000000
--- a/vendor/github.com/google/go-github/github/issues.go
+++ /dev/null
@@ -1,307 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// IssuesService handles communication with the issue related
-// methods of the GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/
-type IssuesService service
-
-// Issue represents a GitHub issue on a repository.
-//
-// Note: As far as the GitHub API is concerned, every pull request is an issue,
-// but not every issue is a pull request. Some endpoints, events, and webhooks
-// may also return pull requests via this struct. If PullRequestLinks is nil,
-// this is an issue, and if PullRequestLinks is not nil, this is a pull request.
-type Issue struct {
-	ID               *int              `json:"id,omitempty"`
-	Number           *int              `json:"number,omitempty"`
-	State            *string           `json:"state,omitempty"`
-	Locked           *bool             `json:"locked,omitempty"`
-	Title            *string           `json:"title,omitempty"`
-	Body             *string           `json:"body,omitempty"`
-	User             *User             `json:"user,omitempty"`
-	Labels           []Label           `json:"labels,omitempty"`
-	Assignee         *User             `json:"assignee,omitempty"`
-	Comments         *int              `json:"comments,omitempty"`
-	ClosedAt         *time.Time        `json:"closed_at,omitempty"`
-	CreatedAt        *time.Time        `json:"created_at,omitempty"`
-	UpdatedAt        *time.Time        `json:"updated_at,omitempty"`
-	ClosedBy         *User             `json:"closed_by,omitempty"`
-	URL              *string           `json:"url,omitempty"`
-	HTMLURL          *string           `json:"html_url,omitempty"`
-	Milestone        *Milestone        `json:"milestone,omitempty"`
-	PullRequestLinks *PullRequestLinks `json:"pull_request,omitempty"`
-	Repository       *Repository       `json:"repository,omitempty"`
-	Reactions        *Reactions        `json:"reactions,omitempty"`
-	Assignees        []*User           `json:"assignees,omitempty"`
-
-	// TextMatches is only populated from search results that request text matches
-	// See: search.go and https://developer.github.com/v3/search/#text-match-metadata
-	TextMatches []TextMatch `json:"text_matches,omitempty"`
-}
-
-func (i Issue) String() string {
-	return Stringify(i)
-}
-
-// IssueRequest represents a request to create/edit an issue.
-// It is separate from Issue above because otherwise Labels
-// and Assignee fail to serialize to the correct JSON.
-type IssueRequest struct {
-	Title     *string   `json:"title,omitempty"`
-	Body      *string   `json:"body,omitempty"`
-	Labels    *[]string `json:"labels,omitempty"`
-	Assignee  *string   `json:"assignee,omitempty"`
-	State     *string   `json:"state,omitempty"`
-	Milestone *int      `json:"milestone,omitempty"`
-	Assignees *[]string `json:"assignees,omitempty"`
-}
-
-// IssueListOptions specifies the optional parameters to the IssuesService.List
-// and IssuesService.ListByOrg methods.
-type IssueListOptions struct {
-	// Filter specifies which issues to list. Possible values are: assigned,
-	// created, mentioned, subscribed, all. Default is "assigned".
-	Filter string `url:"filter,omitempty"`
-
-	// State filters issues based on their state. Possible values are: open,
-	// closed, all. Default is "open".
-	State string `url:"state,omitempty"`
-
-	// Labels filters issues based on their label.
-	Labels []string `url:"labels,comma,omitempty"`
-
-	// Sort specifies how to sort issues. Possible values are: created, updated,
-	// and comments. Default value is "created".
-	Sort string `url:"sort,omitempty"`
-
-	// Direction in which to sort issues. Possible values are: asc, desc.
-	// Default is "desc".
-	Direction string `url:"direction,omitempty"`
-
-	// Since filters issues by time.
-	Since time.Time `url:"since,omitempty"`
-
-	ListOptions
-}
-
-// PullRequestLinks object is added to the Issue object when it's an issue included
-// in the IssueCommentEvent webhook payload, if the webhooks is fired by a comment on a PR
-type PullRequestLinks struct {
-	URL      *string `json:"url,omitempty"`
-	HTMLURL  *string `json:"html_url,omitempty"`
-	DiffURL  *string `json:"diff_url,omitempty"`
-	PatchURL *string `json:"patch_url,omitempty"`
-}
-
-// List the issues for the authenticated user. If all is true, list issues
-// across all the user's visible repositories including owned, member, and
-// organization repositories; if false, list only owned and member
-// repositories.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/#list-issues
-func (s *IssuesService) List(ctx context.Context, all bool, opt *IssueListOptions) ([]*Issue, *Response, error) {
-	var u string
-	if all {
-		u = "issues"
-	} else {
-		u = "user/issues"
-	}
-	return s.listIssues(ctx, u, opt)
-}
-
-// ListByOrg fetches the issues in the specified organization for the
-// authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/#list-issues
-func (s *IssuesService) ListByOrg(ctx context.Context, org string, opt *IssueListOptions) ([]*Issue, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/issues", org)
-	return s.listIssues(ctx, u, opt)
-}
-
-func (s *IssuesService) listIssues(ctx context.Context, u string, opt *IssueListOptions) ([]*Issue, *Response, error) {
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	var issues []*Issue
-	resp, err := s.client.Do(ctx, req, &issues)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return issues, resp, nil
-}
-
-// IssueListByRepoOptions specifies the optional parameters to the
-// IssuesService.ListByRepo method.
-type IssueListByRepoOptions struct {
-	// Milestone limits issues for the specified milestone. Possible values are
-	// a milestone number, "none" for issues with no milestone, "*" for issues
-	// with any milestone.
-	Milestone string `url:"milestone,omitempty"`
-
-	// State filters issues based on their state. Possible values are: open,
-	// closed, all. Default is "open".
-	State string `url:"state,omitempty"`
-
-	// Assignee filters issues based on their assignee. Possible values are a
-	// user name, "none" for issues that are not assigned, "*" for issues with
-	// any assigned user.
-	Assignee string `url:"assignee,omitempty"`
-
-	// Creator filters issues based on their creator.
-	Creator string `url:"creator,omitempty"`
-
-	// Mentioned filters issues to those mentioned a specific user.
-	Mentioned string `url:"mentioned,omitempty"`
-
-	// Labels filters issues based on their label.
-	Labels []string `url:"labels,omitempty,comma"`
-
-	// Sort specifies how to sort issues. Possible values are: created, updated,
-	// and comments. Default value is "created".
-	Sort string `url:"sort,omitempty"`
-
-	// Direction in which to sort issues. Possible values are: asc, desc.
-	// Default is "desc".
-	Direction string `url:"direction,omitempty"`
-
-	// Since filters issues by time.
-	Since time.Time `url:"since,omitempty"`
-
-	ListOptions
-}
-
-// ListByRepo lists the issues for the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/#list-issues-for-a-repository
-func (s *IssuesService) ListByRepo(ctx context.Context, owner string, repo string, opt *IssueListByRepoOptions) ([]*Issue, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	var issues []*Issue
-	resp, err := s.client.Do(ctx, req, &issues)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return issues, resp, nil
-}
-
-// Get a single issue.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/#get-a-single-issue
-func (s *IssuesService) Get(ctx context.Context, owner string, repo string, number int) (*Issue, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%d", owner, repo, number)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	issue := new(Issue)
-	resp, err := s.client.Do(ctx, req, issue)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return issue, resp, nil
-}
-
-// Create a new issue on the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/#create-an-issue
-func (s *IssuesService) Create(ctx context.Context, owner string, repo string, issue *IssueRequest) (*Issue, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues", owner, repo)
-	req, err := s.client.NewRequest("POST", u, issue)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	i := new(Issue)
-	resp, err := s.client.Do(ctx, req, i)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return i, resp, nil
-}
-
-// Edit an issue.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/#edit-an-issue
-func (s *IssuesService) Edit(ctx context.Context, owner string, repo string, number int, issue *IssueRequest) (*Issue, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%d", owner, repo, number)
-	req, err := s.client.NewRequest("PATCH", u, issue)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	i := new(Issue)
-	resp, err := s.client.Do(ctx, req, i)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return i, resp, nil
-}
-
-// Lock an issue's conversation.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/#lock-an-issue
-func (s *IssuesService) Lock(ctx context.Context, owner string, repo string, number int) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%d/lock", owner, repo, number)
-	req, err := s.client.NewRequest("PUT", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// Unlock an issue's conversation.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/#unlock-an-issue
-func (s *IssuesService) Unlock(ctx context.Context, owner string, repo string, number int) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%d/lock", owner, repo, number)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/issues_assignees.go b/vendor/github.com/google/go-github/github/issues_assignees.go
deleted file mode 100644
index 9cb366f50a..0000000000
--- a/vendor/github.com/google/go-github/github/issues_assignees.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// ListAssignees fetches all available assignees (owners and collaborators) to
-// which issues may be assigned.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/assignees/#list-assignees
-func (s *IssuesService) ListAssignees(ctx context.Context, owner, repo string, opt *ListOptions) ([]*User, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/assignees", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-	var assignees []*User
-	resp, err := s.client.Do(ctx, req, &assignees)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return assignees, resp, nil
-}
-
-// IsAssignee checks if a user is an assignee for the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/assignees/#check-assignee
-func (s *IssuesService) IsAssignee(ctx context.Context, owner, repo, user string) (bool, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/assignees/%v", owner, repo, user)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return false, nil, err
-	}
-	resp, err := s.client.Do(ctx, req, nil)
-	assignee, err := parseBoolResponse(err)
-	return assignee, resp, err
-}
-
-// AddAssignees adds the provided GitHub users as assignees to the issue.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/assignees/#add-assignees-to-an-issue
-func (s *IssuesService) AddAssignees(ctx context.Context, owner, repo string, number int, assignees []string) (*Issue, *Response, error) {
-	users := &struct {
-		Assignees []string `json:"assignees,omitempty"`
-	}{Assignees: assignees}
-	u := fmt.Sprintf("repos/%v/%v/issues/%v/assignees", owner, repo, number)
-	req, err := s.client.NewRequest("POST", u, users)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	issue := &Issue{}
-	resp, err := s.client.Do(ctx, req, issue)
-	return issue, resp, err
-}
-
-// RemoveAssignees removes the provided GitHub users as assignees from the issue.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/assignees/#remove-assignees-from-an-issue
-func (s *IssuesService) RemoveAssignees(ctx context.Context, owner, repo string, number int, assignees []string) (*Issue, *Response, error) {
-	users := &struct {
-		Assignees []string `json:"assignees,omitempty"`
-	}{Assignees: assignees}
-	u := fmt.Sprintf("repos/%v/%v/issues/%v/assignees", owner, repo, number)
-	req, err := s.client.NewRequest("DELETE", u, users)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	issue := &Issue{}
-	resp, err := s.client.Do(ctx, req, issue)
-	return issue, resp, err
-}
diff --git a/vendor/github.com/google/go-github/github/issues_comments.go b/vendor/github.com/google/go-github/github/issues_comments.go
deleted file mode 100644
index fd72657cd4..0000000000
--- a/vendor/github.com/google/go-github/github/issues_comments.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// IssueComment represents a comment left on an issue.
-type IssueComment struct {
-	ID        *int       `json:"id,omitempty"`
-	Body      *string    `json:"body,omitempty"`
-	User      *User      `json:"user,omitempty"`
-	Reactions *Reactions `json:"reactions,omitempty"`
-	CreatedAt *time.Time `json:"created_at,omitempty"`
-	UpdatedAt *time.Time `json:"updated_at,omitempty"`
-	URL       *string    `json:"url,omitempty"`
-	HTMLURL   *string    `json:"html_url,omitempty"`
-	IssueURL  *string    `json:"issue_url,omitempty"`
-}
-
-func (i IssueComment) String() string {
-	return Stringify(i)
-}
-
-// IssueListCommentsOptions specifies the optional parameters to the
-// IssuesService.ListComments method.
-type IssueListCommentsOptions struct {
-	// Sort specifies how to sort comments. Possible values are: created, updated.
-	Sort string `url:"sort,omitempty"`
-
-	// Direction in which to sort comments. Possible values are: asc, desc.
-	Direction string `url:"direction,omitempty"`
-
-	// Since filters comments by time.
-	Since time.Time `url:"since,omitempty"`
-
-	ListOptions
-}
-
-// ListComments lists all comments on the specified issue. Specifying an issue
-// number of 0 will return all comments on all issues for the repository.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/comments/#list-comments-on-an-issue
-func (s *IssuesService) ListComments(ctx context.Context, owner string, repo string, number int, opt *IssueListCommentsOptions) ([]*IssueComment, *Response, error) {
-	var u string
-	if number == 0 {
-		u = fmt.Sprintf("repos/%v/%v/issues/comments", owner, repo)
-	} else {
-		u = fmt.Sprintf("repos/%v/%v/issues/%d/comments", owner, repo, number)
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	var comments []*IssueComment
-	resp, err := s.client.Do(ctx, req, &comments)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return comments, resp, nil
-}
-
-// GetComment fetches the specified issue comment.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/comments/#get-a-single-comment
-func (s *IssuesService) GetComment(ctx context.Context, owner string, repo string, id int) (*IssueComment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/comments/%d", owner, repo, id)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	comment := new(IssueComment)
-	resp, err := s.client.Do(ctx, req, comment)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return comment, resp, nil
-}
-
-// CreateComment creates a new comment on the specified issue.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/comments/#create-a-comment
-func (s *IssuesService) CreateComment(ctx context.Context, owner string, repo string, number int, comment *IssueComment) (*IssueComment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%d/comments", owner, repo, number)
-	req, err := s.client.NewRequest("POST", u, comment)
-	if err != nil {
-		return nil, nil, err
-	}
-	c := new(IssueComment)
-	resp, err := s.client.Do(ctx, req, c)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return c, resp, nil
-}
-
-// EditComment updates an issue comment.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/comments/#edit-a-comment
-func (s *IssuesService) EditComment(ctx context.Context, owner string, repo string, id int, comment *IssueComment) (*IssueComment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/comments/%d", owner, repo, id)
-	req, err := s.client.NewRequest("PATCH", u, comment)
-	if err != nil {
-		return nil, nil, err
-	}
-	c := new(IssueComment)
-	resp, err := s.client.Do(ctx, req, c)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return c, resp, nil
-}
-
-// DeleteComment deletes an issue comment.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/comments/#delete-a-comment
-func (s *IssuesService) DeleteComment(ctx context.Context, owner string, repo string, id int) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/comments/%d", owner, repo, id)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/issues_events.go b/vendor/github.com/google/go-github/github/issues_events.go
deleted file mode 100644
index 93e5d66fb4..0000000000
--- a/vendor/github.com/google/go-github/github/issues_events.go
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2014 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// IssueEvent represents an event that occurred around an Issue or Pull Request.
-type IssueEvent struct {
-	ID  *int    `json:"id,omitempty"`
-	URL *string `json:"url,omitempty"`
-
-	// The User that generated this event.
-	Actor *User `json:"actor,omitempty"`
-
-	// Event identifies the actual type of Event that occurred. Possible
-	// values are:
-	//
-	//     closed
-	//       The Actor closed the issue.
-	//       If the issue was closed by commit message, CommitID holds the SHA1 hash of the commit.
-	//
-	//     merged
-	//       The Actor merged into master a branch containing a commit mentioning the issue.
-	//       CommitID holds the SHA1 of the merge commit.
-	//
-	//     referenced
-	//       The Actor committed to master a commit mentioning the issue in its commit message.
-	//       CommitID holds the SHA1 of the commit.
-	//
-	//     reopened, locked, unlocked
-	//       The Actor did that to the issue.
-	//
-	//     renamed
-	//       The Actor changed the issue title from Rename.From to Rename.To.
-	//
-	//     mentioned
-	//       Someone unspecified @mentioned the Actor [sic] in an issue comment body.
-	//
-	//     assigned, unassigned
-	//       The Assigner assigned the issue to or removed the assignment from the Assignee.
-	//
-	//     labeled, unlabeled
-	//       The Actor added or removed the Label from the issue.
-	//
-	//     milestoned, demilestoned
-	//       The Actor added or removed the issue from the Milestone.
-	//
-	//     subscribed, unsubscribed
-	//       The Actor subscribed to or unsubscribed from notifications for an issue.
-	//
-	//     head_ref_deleted, head_ref_restored
-	//       The pull request’s branch was deleted or restored.
-	//
-	Event *string `json:"event,omitempty"`
-
-	CreatedAt *time.Time `json:"created_at,omitempty"`
-	Issue     *Issue     `json:"issue,omitempty"`
-
-	// Only present on certain events; see above.
-	Assignee  *User      `json:"assignee,omitempty"`
-	Assigner  *User      `json:"assigner,omitempty"`
-	CommitID  *string    `json:"commit_id,omitempty"`
-	Milestone *Milestone `json:"milestone,omitempty"`
-	Label     *Label     `json:"label,omitempty"`
-	Rename    *Rename    `json:"rename,omitempty"`
-}
-
-// ListIssueEvents lists events for the specified issue.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/events/#list-events-for-an-issue
-func (s *IssuesService) ListIssueEvents(ctx context.Context, owner, repo string, number int, opt *ListOptions) ([]*IssueEvent, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%v/events", owner, repo, number)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var events []*IssueEvent
-	resp, err := s.client.Do(ctx, req, &events)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return events, resp, nil
-}
-
-// ListRepositoryEvents lists events for the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/events/#list-events-for-a-repository
-func (s *IssuesService) ListRepositoryEvents(ctx context.Context, owner, repo string, opt *ListOptions) ([]*IssueEvent, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/events", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var events []*IssueEvent
-	resp, err := s.client.Do(ctx, req, &events)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return events, resp, nil
-}
-
-// GetEvent returns the specified issue event.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/events/#get-a-single-event
-func (s *IssuesService) GetEvent(ctx context.Context, owner, repo string, id int) (*IssueEvent, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/events/%v", owner, repo, id)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	event := new(IssueEvent)
-	resp, err := s.client.Do(ctx, req, event)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return event, resp, nil
-}
-
-// Rename contains details for 'renamed' events.
-type Rename struct {
-	From *string `json:"from,omitempty"`
-	To   *string `json:"to,omitempty"`
-}
-
-func (r Rename) String() string {
-	return Stringify(r)
-}
diff --git a/vendor/github.com/google/go-github/github/issues_labels.go b/vendor/github.com/google/go-github/github/issues_labels.go
deleted file mode 100644
index b0e34c40f2..0000000000
--- a/vendor/github.com/google/go-github/github/issues_labels.go
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// Label represents a GitHub label on an Issue
-type Label struct {
-	ID    *int    `json:"id,omitempty"`
-	URL   *string `json:"url,omitempty"`
-	Name  *string `json:"name,omitempty"`
-	Color *string `json:"color,omitempty"`
-}
-
-func (l Label) String() string {
-	return Stringify(l)
-}
-
-// ListLabels lists all labels for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/labels/#list-all-labels-for-this-repository
-func (s *IssuesService) ListLabels(ctx context.Context, owner string, repo string, opt *ListOptions) ([]*Label, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/labels", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var labels []*Label
-	resp, err := s.client.Do(ctx, req, &labels)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return labels, resp, nil
-}
-
-// GetLabel gets a single label.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/labels/#get-a-single-label
-func (s *IssuesService) GetLabel(ctx context.Context, owner string, repo string, name string) (*Label, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/labels/%v", owner, repo, name)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	label := new(Label)
-	resp, err := s.client.Do(ctx, req, label)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return label, resp, nil
-}
-
-// CreateLabel creates a new label on the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/labels/#create-a-label
-func (s *IssuesService) CreateLabel(ctx context.Context, owner string, repo string, label *Label) (*Label, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/labels", owner, repo)
-	req, err := s.client.NewRequest("POST", u, label)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	l := new(Label)
-	resp, err := s.client.Do(ctx, req, l)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return l, resp, nil
-}
-
-// EditLabel edits a label.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/labels/#update-a-label
-func (s *IssuesService) EditLabel(ctx context.Context, owner string, repo string, name string, label *Label) (*Label, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/labels/%v", owner, repo, name)
-	req, err := s.client.NewRequest("PATCH", u, label)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	l := new(Label)
-	resp, err := s.client.Do(ctx, req, l)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return l, resp, nil
-}
-
-// DeleteLabel deletes a label.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/labels/#delete-a-label
-func (s *IssuesService) DeleteLabel(ctx context.Context, owner string, repo string, name string) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/labels/%v", owner, repo, name)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
-
-// ListLabelsByIssue lists all labels for an issue.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/labels/#list-labels-on-an-issue
-func (s *IssuesService) ListLabelsByIssue(ctx context.Context, owner string, repo string, number int, opt *ListOptions) ([]*Label, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%d/labels", owner, repo, number)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var labels []*Label
-	resp, err := s.client.Do(ctx, req, &labels)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return labels, resp, nil
-}
-
-// AddLabelsToIssue adds labels to an issue.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/labels/#add-labels-to-an-issue
-func (s *IssuesService) AddLabelsToIssue(ctx context.Context, owner string, repo string, number int, labels []string) ([]*Label, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%d/labels", owner, repo, number)
-	req, err := s.client.NewRequest("POST", u, labels)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var l []*Label
-	resp, err := s.client.Do(ctx, req, &l)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return l, resp, nil
-}
-
-// RemoveLabelForIssue removes a label for an issue.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/labels/#remove-a-label-from-an-issue
-func (s *IssuesService) RemoveLabelForIssue(ctx context.Context, owner string, repo string, number int, label string) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%d/labels/%v", owner, repo, number, label)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
-
-// ReplaceLabelsForIssue replaces all labels for an issue.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/labels/#replace-all-labels-for-an-issue
-func (s *IssuesService) ReplaceLabelsForIssue(ctx context.Context, owner string, repo string, number int, labels []string) ([]*Label, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%d/labels", owner, repo, number)
-	req, err := s.client.NewRequest("PUT", u, labels)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var l []*Label
-	resp, err := s.client.Do(ctx, req, &l)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return l, resp, nil
-}
-
-// RemoveLabelsForIssue removes all labels for an issue.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/labels/#remove-all-labels-from-an-issue
-func (s *IssuesService) RemoveLabelsForIssue(ctx context.Context, owner string, repo string, number int) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%d/labels", owner, repo, number)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
-
-// ListLabelsForMilestone lists labels for every issue in a milestone.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/labels/#get-labels-for-every-issue-in-a-milestone
-func (s *IssuesService) ListLabelsForMilestone(ctx context.Context, owner string, repo string, number int, opt *ListOptions) ([]*Label, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/milestones/%d/labels", owner, repo, number)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var labels []*Label
-	resp, err := s.client.Do(ctx, req, &labels)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return labels, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/issues_milestones.go b/vendor/github.com/google/go-github/github/issues_milestones.go
deleted file mode 100644
index e6e882d144..0000000000
--- a/vendor/github.com/google/go-github/github/issues_milestones.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2014 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// Milestone represents a GitHub repository milestone.
-type Milestone struct {
-	URL          *string    `json:"url,omitempty"`
-	HTMLURL      *string    `json:"html_url,omitempty"`
-	LabelsURL    *string    `json:"labels_url,omitempty"`
-	ID           *int       `json:"id,omitempty"`
-	Number       *int       `json:"number,omitempty"`
-	State        *string    `json:"state,omitempty"`
-	Title        *string    `json:"title,omitempty"`
-	Description  *string    `json:"description,omitempty"`
-	Creator      *User      `json:"creator,omitempty"`
-	OpenIssues   *int       `json:"open_issues,omitempty"`
-	ClosedIssues *int       `json:"closed_issues,omitempty"`
-	CreatedAt    *time.Time `json:"created_at,omitempty"`
-	UpdatedAt    *time.Time `json:"updated_at,omitempty"`
-	ClosedAt     *time.Time `json:"closed_at,omitempty"`
-	DueOn        *time.Time `json:"due_on,omitempty"`
-}
-
-func (m Milestone) String() string {
-	return Stringify(m)
-}
-
-// MilestoneListOptions specifies the optional parameters to the
-// IssuesService.ListMilestones method.
-type MilestoneListOptions struct {
-	// State filters milestones based on their state. Possible values are:
-	// open, closed, all. Default is "open".
-	State string `url:"state,omitempty"`
-
-	// Sort specifies how to sort milestones. Possible values are: due_on, completeness.
-	// Default value is "due_on".
-	Sort string `url:"sort,omitempty"`
-
-	// Direction in which to sort milestones. Possible values are: asc, desc.
-	// Default is "asc".
-	Direction string `url:"direction,omitempty"`
-
-	ListOptions
-}
-
-// ListMilestones lists all milestones for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/milestones/#list-milestones-for-a-repository
-func (s *IssuesService) ListMilestones(ctx context.Context, owner string, repo string, opt *MilestoneListOptions) ([]*Milestone, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/milestones", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var milestones []*Milestone
-	resp, err := s.client.Do(ctx, req, &milestones)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return milestones, resp, nil
-}
-
-// GetMilestone gets a single milestone.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/milestones/#get-a-single-milestone
-func (s *IssuesService) GetMilestone(ctx context.Context, owner string, repo string, number int) (*Milestone, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/milestones/%d", owner, repo, number)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	milestone := new(Milestone)
-	resp, err := s.client.Do(ctx, req, milestone)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return milestone, resp, nil
-}
-
-// CreateMilestone creates a new milestone on the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/milestones/#create-a-milestone
-func (s *IssuesService) CreateMilestone(ctx context.Context, owner string, repo string, milestone *Milestone) (*Milestone, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/milestones", owner, repo)
-	req, err := s.client.NewRequest("POST", u, milestone)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	m := new(Milestone)
-	resp, err := s.client.Do(ctx, req, m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// EditMilestone edits a milestone.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/milestones/#update-a-milestone
-func (s *IssuesService) EditMilestone(ctx context.Context, owner string, repo string, number int, milestone *Milestone) (*Milestone, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/milestones/%d", owner, repo, number)
-	req, err := s.client.NewRequest("PATCH", u, milestone)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	m := new(Milestone)
-	resp, err := s.client.Do(ctx, req, m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// DeleteMilestone deletes a milestone.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/milestones/#delete-a-milestone
-func (s *IssuesService) DeleteMilestone(ctx context.Context, owner string, repo string, number int) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/milestones/%d", owner, repo, number)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/issues_timeline.go b/vendor/github.com/google/go-github/github/issues_timeline.go
deleted file mode 100644
index bc0b108990..0000000000
--- a/vendor/github.com/google/go-github/github/issues_timeline.go
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// Timeline represents an event that occurred around an Issue or Pull Request.
-//
-// It is similar to an IssueEvent but may contain more information.
-// GitHub API docs: https://developer.github.com/v3/issues/timeline/
-type Timeline struct {
-	ID        *int    `json:"id,omitempty"`
-	URL       *string `json:"url,omitempty"`
-	CommitURL *string `json:"commit_url,omitempty"`
-
-	// The User object that generated the event.
-	Actor *User `json:"actor,omitempty"`
-
-	// Event identifies the actual type of Event that occurred. Possible values
-	// are:
-	//
-	//     assigned
-	//       The issue was assigned to the assignee.
-	//
-	//     closed
-	//       The issue was closed by the actor. When the commit_id is present, it
-	//       identifies the commit that closed the issue using "closes / fixes #NN"
-	//       syntax.
-	//
-	//     commented
-	//       A comment was added to the issue.
-	//
-	//     committed
-	//       A commit was added to the pull request's 'HEAD' branch. Only provided
-	//       for pull requests.
-	//
-	//     cross-referenced
-	//       The issue was referenced from another issue. The 'source' attribute
-	//       contains the 'id', 'actor', and 'url' of the reference's source.
-	//
-	//     demilestoned
-	//       The issue was removed from a milestone.
-	//
-	//     head_ref_deleted
-	//       The pull request's branch was deleted.
-	//
-	//     head_ref_restored
-	//       The pull request's branch was restored.
-	//
-	//     labeled
-	//       A label was added to the issue.
-	//
-	//     locked
-	//       The issue was locked by the actor.
-	//
-	//     mentioned
-	//       The actor was @mentioned in an issue body.
-	//
-	//     merged
-	//       The issue was merged by the actor. The 'commit_id' attribute is the
-	//       SHA1 of the HEAD commit that was merged.
-	//
-	//     milestoned
-	//       The issue was added to a milestone.
-	//
-	//     referenced
-	//       The issue was referenced from a commit message. The 'commit_id'
-	//       attribute is the commit SHA1 of where that happened.
-	//
-	//     renamed
-	//       The issue title was changed.
-	//
-	//     reopened
-	//       The issue was reopened by the actor.
-	//
-	//     subscribed
-	//       The actor subscribed to receive notifications for an issue.
-	//
-	//     unassigned
-	//       The assignee was unassigned from the issue.
-	//
-	//     unlabeled
-	//       A label was removed from the issue.
-	//
-	//     unlocked
-	//       The issue was unlocked by the actor.
-	//
-	//     unsubscribed
-	//       The actor unsubscribed to stop receiving notifications for an issue.
-	//
-	Event *string `json:"event,omitempty"`
-
-	// The string SHA of a commit that referenced this Issue or Pull Request.
-	CommitID *string `json:"commit_id,omitempty"`
-	// The timestamp indicating when the event occurred.
-	CreatedAt *time.Time `json:"created_at,omitempty"`
-	// The Label object including `name` and `color` attributes. Only provided for
-	// 'labeled' and 'unlabeled' events.
-	Label *Label `json:"label,omitempty"`
-	// The User object which was assigned to (or unassigned from) this Issue or
-	// Pull Request. Only provided for 'assigned' and 'unassigned' events.
-	Assignee *User `json:"assignee,omitempty"`
-	// The Milestone object including a 'title' attribute.
-	// Only provided for 'milestoned' and 'demilestoned' events.
-	Milestone *Milestone `json:"milestone,omitempty"`
-	// The 'id', 'actor', and 'url' for the source of a reference from another issue.
-	// Only provided for 'cross-referenced' events.
-	Source *Source `json:"source,omitempty"`
-	// An object containing rename details including 'from' and 'to' attributes.
-	// Only provided for 'renamed' events.
-	Rename *Rename `json:"rename,omitempty"`
-}
-
-// Source represents a reference's source.
-type Source struct {
-	ID    *int    `json:"id,omitempty"`
-	URL   *string `json:"url,omitempty"`
-	Actor *User   `json:"actor,omitempty"`
-}
-
-// ListIssueTimeline lists events for the specified issue.
-//
-// GitHub API docs: https://developer.github.com/v3/issues/timeline/#list-events-for-an-issue
-func (s *IssuesService) ListIssueTimeline(ctx context.Context, owner, repo string, number int, opt *ListOptions) ([]*Timeline, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%v/timeline", owner, repo, number)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeTimelinePreview)
-
-	var events []*Timeline
-	resp, err := s.client.Do(ctx, req, &events)
-	return events, resp, err
-}
diff --git a/vendor/github.com/google/go-github/github/licenses.go b/vendor/github.com/google/go-github/github/licenses.go
deleted file mode 100644
index e9cd1777af..0000000000
--- a/vendor/github.com/google/go-github/github/licenses.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// LicensesService handles communication with the license related
-// methods of the GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/licenses/
-type LicensesService service
-
-// RepositoryLicense represents the license for a repository.
-type RepositoryLicense struct {
-	Name *string `json:"name,omitempty"`
-	Path *string `json:"path,omitempty"`
-
-	SHA         *string  `json:"sha,omitempty"`
-	Size        *int     `json:"size,omitempty"`
-	URL         *string  `json:"url,omitempty"`
-	HTMLURL     *string  `json:"html_url,omitempty"`
-	GitURL      *string  `json:"git_url,omitempty"`
-	DownloadURL *string  `json:"download_url,omitempty"`
-	Type        *string  `json:"type,omitempty"`
-	Content     *string  `json:"content,omitempty"`
-	Encoding    *string  `json:"encoding,omitempty"`
-	License     *License `json:"license,omitempty"`
-}
-
-func (l RepositoryLicense) String() string {
-	return Stringify(l)
-}
-
-// License represents an open source license.
-type License struct {
-	Key  *string `json:"key,omitempty"`
-	Name *string `json:"name,omitempty"`
-	URL  *string `json:"url,omitempty"`
-
-	SPDXID         *string   `json:"spdx_id,omitempty"`
-	HTMLURL        *string   `json:"html_url,omitempty"`
-	Featured       *bool     `json:"featured,omitempty"`
-	Description    *string   `json:"description,omitempty"`
-	Implementation *string   `json:"implementation,omitempty"`
-	Permissions    *[]string `json:"permissions,omitempty"`
-	Conditions     *[]string `json:"conditions,omitempty"`
-	Limitations    *[]string `json:"limitations,omitempty"`
-	Body           *string   `json:"body,omitempty"`
-}
-
-func (l License) String() string {
-	return Stringify(l)
-}
-
-// List popular open source licenses.
-//
-// GitHub API docs: https://developer.github.com/v3/licenses/#list-all-licenses
-func (s *LicensesService) List(ctx context.Context) ([]*License, *Response, error) {
-	req, err := s.client.NewRequest("GET", "licenses", nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeLicensesPreview)
-
-	var licenses []*License
-	resp, err := s.client.Do(ctx, req, &licenses)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return licenses, resp, nil
-}
-
-// Get extended metadata for one license.
-//
-// GitHub API docs: https://developer.github.com/v3/licenses/#get-an-individual-license
-func (s *LicensesService) Get(ctx context.Context, licenseName string) (*License, *Response, error) {
-	u := fmt.Sprintf("licenses/%s", licenseName)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeLicensesPreview)
-
-	license := new(License)
-	resp, err := s.client.Do(ctx, req, license)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return license, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/messages.go b/vendor/github.com/google/go-github/github/messages.go
deleted file mode 100644
index c0f315a778..0000000000
--- a/vendor/github.com/google/go-github/github/messages.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file provides functions for validating payloads from GitHub Webhooks.
-// GitHub API docs: https://developer.github.com/webhooks/securing/#validating-payloads-from-github
-
-package github
-
-import (
-	"crypto/hmac"
-	"crypto/sha1"
-	"crypto/sha256"
-	"crypto/sha512"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"hash"
-	"io/ioutil"
-	"net/http"
-	"strings"
-)
-
-const (
-	// sha1Prefix is the prefix used by GitHub before the HMAC hexdigest.
-	sha1Prefix = "sha1"
-	// sha256Prefix and sha512Prefix are provided for future compatibility.
-	sha256Prefix = "sha256"
-	sha512Prefix = "sha512"
-	// signatureHeader is the GitHub header key used to pass the HMAC hexdigest.
-	signatureHeader = "X-Hub-Signature"
-	// eventTypeHeader is the GitHub header key used to pass the event type.
-	eventTypeHeader = "X-Github-Event"
-	// deliveryIDHeader is the GitHub header key used to pass the unique ID for the webhook event.
-	deliveryIDHeader = "X-Github-Delivery"
-)
-
-var (
-	// eventTypeMapping maps webhooks types to their corresponding go-github struct types.
-	eventTypeMapping = map[string]string{
-		"commit_comment":              "CommitCommentEvent",
-		"create":                      "CreateEvent",
-		"delete":                      "DeleteEvent",
-		"deployment":                  "DeploymentEvent",
-		"deployment_status":           "DeploymentStatusEvent",
-		"fork":                        "ForkEvent",
-		"gollum":                      "GollumEvent",
-		"installation":                "InstallationEvent",
-		"installation_repositories":   "InstallationRepositoriesEvent",
-		"issue_comment":               "IssueCommentEvent",
-		"issues":                      "IssuesEvent",
-		"label":                       "LabelEvent",
-		"member":                      "MemberEvent",
-		"membership":                  "MembershipEvent",
-		"milestone":                   "MilestoneEvent",
-		"organization":                "OrganizationEvent",
-		"org_block":                   "OrgBlockEvent",
-		"page_build":                  "PageBuildEvent",
-		"ping":                        "PingEvent",
-		"project":                     "ProjectEvent",
-		"project_card":                "ProjectCardEvent",
-		"project_column":              "ProjectColumnEvent",
-		"public":                      "PublicEvent",
-		"pull_request_review":         "PullRequestReviewEvent",
-		"pull_request_review_comment": "PullRequestReviewCommentEvent",
-		"pull_request":                "PullRequestEvent",
-		"push":                        "PushEvent",
-		"repository":                  "RepositoryEvent",
-		"release":                     "ReleaseEvent",
-		"status":                      "StatusEvent",
-		"team":                        "TeamEvent",
-		"team_add":                    "TeamAddEvent",
-		"watch":                       "WatchEvent",
-	}
-)
-
-// genMAC generates the HMAC signature for a message provided the secret key
-// and hashFunc.
-func genMAC(message, key []byte, hashFunc func() hash.Hash) []byte {
-	mac := hmac.New(hashFunc, key)
-	mac.Write(message)
-	return mac.Sum(nil)
-}
-
-// checkMAC reports whether messageMAC is a valid HMAC tag for message.
-func checkMAC(message, messageMAC, key []byte, hashFunc func() hash.Hash) bool {
-	expectedMAC := genMAC(message, key, hashFunc)
-	return hmac.Equal(messageMAC, expectedMAC)
-}
-
-// messageMAC returns the hex-decoded HMAC tag from the signature and its
-// corresponding hash function.
-func messageMAC(signature string) ([]byte, func() hash.Hash, error) {
-	if signature == "" {
-		return nil, nil, errors.New("missing signature")
-	}
-	sigParts := strings.SplitN(signature, "=", 2)
-	if len(sigParts) != 2 {
-		return nil, nil, fmt.Errorf("error parsing signature %q", signature)
-	}
-
-	var hashFunc func() hash.Hash
-	switch sigParts[0] {
-	case sha1Prefix:
-		hashFunc = sha1.New
-	case sha256Prefix:
-		hashFunc = sha256.New
-	case sha512Prefix:
-		hashFunc = sha512.New
-	default:
-		return nil, nil, fmt.Errorf("unknown hash type prefix: %q", sigParts[0])
-	}
-
-	buf, err := hex.DecodeString(sigParts[1])
-	if err != nil {
-		return nil, nil, fmt.Errorf("error decoding signature %q: %v", signature, err)
-	}
-	return buf, hashFunc, nil
-}
-
-// ValidatePayload validates an incoming GitHub Webhook event request
-// and returns the (JSON) payload.
-// secretKey is the GitHub Webhook secret message.
-//
-// Example usage:
-//
-//     func (s *GitHubEventMonitor) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-//       payload, err := github.ValidatePayload(r, s.webhookSecretKey)
-//       if err != nil { ... }
-//       // Process payload...
-//     }
-//
-func ValidatePayload(r *http.Request, secretKey []byte) (payload []byte, err error) {
-	payload, err = ioutil.ReadAll(r.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	sig := r.Header.Get(signatureHeader)
-	if err := validateSignature(sig, payload, secretKey); err != nil {
-		return nil, err
-	}
-	return payload, nil
-}
-
-// validateSignature validates the signature for the given payload.
-// signature is the GitHub hash signature delivered in the X-Hub-Signature header.
-// payload is the JSON payload sent by GitHub Webhooks.
-// secretKey is the GitHub Webhook secret message.
-//
-// GitHub API docs: https://developer.github.com/webhooks/securing/#validating-payloads-from-github
-func validateSignature(signature string, payload, secretKey []byte) error {
-	messageMAC, hashFunc, err := messageMAC(signature)
-	if err != nil {
-		return err
-	}
-	if !checkMAC(payload, messageMAC, secretKey, hashFunc) {
-		return errors.New("payload signature check failed")
-	}
-	return nil
-}
-
-// WebHookType returns the event type of webhook request r.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/hooks/#webhook-headers
-func WebHookType(r *http.Request) string {
-	return r.Header.Get(eventTypeHeader)
-}
-
-// DeliveryID returns the unique delivery ID of webhook request r.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/hooks/#webhook-headers
-func DeliveryID(r *http.Request) string {
-	return r.Header.Get(deliveryIDHeader)
-}
-
-// ParseWebHook parses the event payload. For recognized event types, a
-// value of the corresponding struct type will be returned (as returned
-// by Event.ParsePayload()). An error will be returned for unrecognized event
-// types.
-//
-// Example usage:
-//
-//     func (s *GitHubEventMonitor) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-//       payload, err := github.ValidatePayload(r, s.webhookSecretKey)
-//       if err != nil { ... }
-//       event, err := github.ParseWebHook(github.WebHookType(r), payload)
-//       if err != nil { ... }
-//       switch event := event.(type) {
-//       case *github.CommitCommentEvent:
-//           processCommitCommentEvent(event)
-//       case *github.CreateEvent:
-//           processCreateEvent(event)
-//       ...
-//       }
-//     }
-//
-func ParseWebHook(messageType string, payload []byte) (interface{}, error) {
-	eventType, ok := eventTypeMapping[messageType]
-	if !ok {
-		return nil, fmt.Errorf("unknown X-Github-Event in message: %v", messageType)
-	}
-
-	event := Event{
-		Type:       &eventType,
-		RawPayload: (*json.RawMessage)(&payload),
-	}
-	return event.ParsePayload()
-}
diff --git a/vendor/github.com/google/go-github/github/migrations.go b/vendor/github.com/google/go-github/github/migrations.go
deleted file mode 100644
index 6793269cd3..0000000000
--- a/vendor/github.com/google/go-github/github/migrations.go
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-	"strings"
-)
-
-// MigrationService provides access to the migration related functions
-// in the GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/
-type MigrationService service
-
-// Migration represents a GitHub migration (archival).
-type Migration struct {
-	ID   *int    `json:"id,omitempty"`
-	GUID *string `json:"guid,omitempty"`
-	// State is the current state of a migration.
-	// Possible values are:
-	//     "pending" which means the migration hasn't started yet,
-	//     "exporting" which means the migration is in progress,
-	//     "exported" which means the migration finished successfully, or
-	//     "failed" which means the migration failed.
-	State *string `json:"state,omitempty"`
-	// LockRepositories indicates whether repositories are locked (to prevent
-	// manipulation) while migrating data.
-	LockRepositories *bool `json:"lock_repositories,omitempty"`
-	// ExcludeAttachments indicates whether attachments should be excluded from
-	// the migration (to reduce migration archive file size).
-	ExcludeAttachments *bool         `json:"exclude_attachments,omitempty"`
-	URL                *string       `json:"url,omitempty"`
-	CreatedAt          *string       `json:"created_at,omitempty"`
-	UpdatedAt          *string       `json:"updated_at,omitempty"`
-	Repositories       []*Repository `json:"repositories,omitempty"`
-}
-
-func (m Migration) String() string {
-	return Stringify(m)
-}
-
-// MigrationOptions specifies the optional parameters to Migration methods.
-type MigrationOptions struct {
-	// LockRepositories indicates whether repositories should be locked (to prevent
-	// manipulation) while migrating data.
-	LockRepositories bool
-
-	// ExcludeAttachments indicates whether attachments should be excluded from
-	// the migration (to reduce migration archive file size).
-	ExcludeAttachments bool
-}
-
-// startMigration represents the body of a StartMigration request.
-type startMigration struct {
-	// Repositories is a slice of repository names to migrate.
-	Repositories []string `json:"repositories,omitempty"`
-
-	// LockRepositories indicates whether repositories should be locked (to prevent
-	// manipulation) while migrating data.
-	LockRepositories *bool `json:"lock_repositories,omitempty"`
-
-	// ExcludeAttachments indicates whether attachments should be excluded from
-	// the migration (to reduce migration archive file size).
-	ExcludeAttachments *bool `json:"exclude_attachments,omitempty"`
-}
-
-// StartMigration starts the generation of a migration archive.
-// repos is a slice of repository names to migrate.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/migrations/#start-a-migration
-func (s *MigrationService) StartMigration(ctx context.Context, org string, repos []string, opt *MigrationOptions) (*Migration, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/migrations", org)
-
-	body := &startMigration{Repositories: repos}
-	if opt != nil {
-		body.LockRepositories = Bool(opt.LockRepositories)
-		body.ExcludeAttachments = Bool(opt.ExcludeAttachments)
-	}
-
-	req, err := s.client.NewRequest("POST", u, body)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeMigrationsPreview)
-
-	m := &Migration{}
-	resp, err := s.client.Do(ctx, req, m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// ListMigrations lists the most recent migrations.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/migrations/#get-a-list-of-migrations
-func (s *MigrationService) ListMigrations(ctx context.Context, org string) ([]*Migration, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/migrations", org)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeMigrationsPreview)
-
-	var m []*Migration
-	resp, err := s.client.Do(ctx, req, &m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// MigrationStatus gets the status of a specific migration archive.
-// id is the migration ID.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/migrations/#get-the-status-of-a-migration
-func (s *MigrationService) MigrationStatus(ctx context.Context, org string, id int) (*Migration, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/migrations/%v", org, id)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeMigrationsPreview)
-
-	m := &Migration{}
-	resp, err := s.client.Do(ctx, req, m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// MigrationArchiveURL fetches a migration archive URL.
-// id is the migration ID.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/migrations/#download-a-migration-archive
-func (s *MigrationService) MigrationArchiveURL(ctx context.Context, org string, id int) (url string, err error) {
-	u := fmt.Sprintf("orgs/%v/migrations/%v/archive", org, id)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return "", err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeMigrationsPreview)
-
-	s.client.clientMu.Lock()
-	defer s.client.clientMu.Unlock()
-
-	// Disable the redirect mechanism because AWS fails if the GitHub auth token is provided.
-	var loc string
-	saveRedirect := s.client.client.CheckRedirect
-	s.client.client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
-		loc = req.URL.String()
-		return errors.New("disable redirect")
-	}
-	defer func() { s.client.client.CheckRedirect = saveRedirect }()
-
-	_, err = s.client.Do(ctx, req, nil) // expect error from disable redirect
-	if err == nil {
-		return "", errors.New("expected redirect, none provided")
-	}
-	if !strings.Contains(err.Error(), "disable redirect") {
-		return "", err
-	}
-	return loc, nil
-}
-
-// DeleteMigration deletes a previous migration archive.
-// id is the migration ID.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/migrations/#delete-a-migration-archive
-func (s *MigrationService) DeleteMigration(ctx context.Context, org string, id int) (*Response, error) {
-	u := fmt.Sprintf("orgs/%v/migrations/%v/archive", org, id)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeMigrationsPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// UnlockRepo unlocks a repository that was locked for migration.
-// id is the migration ID.
-// You should unlock each migrated repository and delete them when the migration
-// is complete and you no longer need the source data.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/migrations/#unlock-a-repository
-func (s *MigrationService) UnlockRepo(ctx context.Context, org string, id int, repo string) (*Response, error) {
-	u := fmt.Sprintf("orgs/%v/migrations/%v/repos/%v/lock", org, id, repo)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeMigrationsPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/migrations_source_import.go b/vendor/github.com/google/go-github/github/migrations_source_import.go
deleted file mode 100644
index aa45a5a364..0000000000
--- a/vendor/github.com/google/go-github/github/migrations_source_import.go
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// Import represents a repository import request.
-type Import struct {
-	// The URL of the originating repository.
-	VCSURL *string `json:"vcs_url,omitempty"`
-	// The originating VCS type. Can be one of 'subversion', 'git',
-	// 'mercurial', or 'tfvc'. Without this parameter, the import job will
-	// take additional time to detect the VCS type before beginning the
-	// import. This detection step will be reflected in the response.
-	VCS *string `json:"vcs,omitempty"`
-	// VCSUsername and VCSPassword are only used for StartImport calls that
-	// are importing a password-protected repository.
-	VCSUsername *string `json:"vcs_username,omitempty"`
-	VCSPassword *string `json:"vcs_password,omitempty"`
-	// For a tfvc import, the name of the project that is being imported.
-	TFVCProject *string `json:"tfvc_project,omitempty"`
-
-	// LFS related fields that may be preset in the Import Progress response
-
-	// Describes whether the import has been opted in or out of using Git
-	// LFS. The value can be 'opt_in', 'opt_out', or 'undecided' if no
-	// action has been taken.
-	UseLFS *string `json:"use_lfs,omitempty"`
-	// Describes whether files larger than 100MB were found during the
-	// importing step.
-	HasLargeFiles *bool `json:"has_large_files,omitempty"`
-	// The total size in gigabytes of files larger than 100MB found in the
-	// originating repository.
-	LargeFilesSize *int `json:"large_files_size,omitempty"`
-	// The total number of files larger than 100MB found in the originating
-	// repository. To see a list of these files, call LargeFiles.
-	LargeFilesCount *int `json:"large_files_count,omitempty"`
-
-	// Identifies the current status of an import. An import that does not
-	// have errors will progress through these steps:
-	//
-	//     detecting - the "detection" step of the import is in progress
-	//         because the request did not include a VCS parameter. The
-	//         import is identifying the type of source control present at
-	//         the URL.
-	//     importing - the "raw" step of the import is in progress. This is
-	//         where commit data is fetched from the original repository.
-	//         The import progress response will include CommitCount (the
-	//         total number of raw commits that will be imported) and
-	//         Percent (0 - 100, the current progress through the import).
-	//     mapping - the "rewrite" step of the import is in progress. This
-	//         is where SVN branches are converted to Git branches, and
-	//         where author updates are applied. The import progress
-	//         response does not include progress information.
-	//     pushing - the "push" step of the import is in progress. This is
-	//         where the importer updates the repository on GitHub. The
-	//         import progress response will include PushPercent, which is
-	//         the percent value reported by git push when it is "Writing
-	//         objects".
-	//     complete - the import is complete, and the repository is ready
-	//         on GitHub.
-	//
-	// If there are problems, you will see one of these in the status field:
-	//
-	//     auth_failed - the import requires authentication in order to
-	//         connect to the original repository. Make an UpdateImport
-	//         request, and include VCSUsername and VCSPassword.
-	//     error - the import encountered an error. The import progress
-	//         response will include the FailedStep and an error message.
-	//         Contact GitHub support for more information.
-	//     detection_needs_auth - the importer requires authentication for
-	//         the originating repository to continue detection. Make an
-	//         UpdatImport request, and include VCSUsername and
-	//         VCSPassword.
-	//     detection_found_nothing - the importer didn't recognize any
-	//         source control at the URL.
-	//     detection_found_multiple - the importer found several projects
-	//         or repositories at the provided URL. When this is the case,
-	//         the Import Progress response will also include a
-	//         ProjectChoices field with the possible project choices as
-	//         values. Make an UpdateImport request, and include VCS and
-	//         (if applicable) TFVCProject.
-	Status        *string `json:"status,omitempty"`
-	CommitCount   *int    `json:"commit_count,omitempty"`
-	StatusText    *string `json:"status_text,omitempty"`
-	AuthorsCount  *int    `json:"authors_count,omitempty"`
-	Percent       *int    `json:"percent,omitempty"`
-	PushPercent   *int    `json:"push_percent,omitempty"`
-	URL           *string `json:"url,omitempty"`
-	HTMLURL       *string `json:"html_url,omitempty"`
-	AuthorsURL    *string `json:"authors_url,omitempty"`
-	RepositoryURL *string `json:"repository_url,omitempty"`
-	Message       *string `json:"message,omitempty"`
-	FailedStep    *string `json:"failed_step,omitempty"`
-
-	// Human readable display name, provided when the Import appears as
-	// part of ProjectChoices.
-	HumanName *string `json:"human_name,omitempty"`
-
-	// When the importer finds several projects or repositories at the
-	// provided URLs, this will identify the available choices. Call
-	// UpdateImport with the selected Import value.
-	ProjectChoices []Import `json:"project_choices,omitempty"`
-}
-
-func (i Import) String() string {
-	return Stringify(i)
-}
-
-// SourceImportAuthor identifies an author imported from a source repository.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/source_imports/#get-commit-authors
-type SourceImportAuthor struct {
-	ID         *int    `json:"id,omitempty"`
-	RemoteID   *string `json:"remote_id,omitempty"`
-	RemoteName *string `json:"remote_name,omitempty"`
-	Email      *string `json:"email,omitempty"`
-	Name       *string `json:"name,omitempty"`
-	URL        *string `json:"url,omitempty"`
-	ImportURL  *string `json:"import_url,omitempty"`
-}
-
-func (a SourceImportAuthor) String() string {
-	return Stringify(a)
-}
-
-// LargeFile identifies a file larger than 100MB found during a repository import.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/source_imports/#get-large-files
-type LargeFile struct {
-	RefName *string `json:"ref_name,omitempty"`
-	Path    *string `json:"path,omitempty"`
-	OID     *string `json:"oid,omitempty"`
-	Size    *int    `json:"size,omitempty"`
-}
-
-func (f LargeFile) String() string {
-	return Stringify(f)
-}
-
-// StartImport initiates a repository import.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/source_imports/#start-an-import
-func (s *MigrationService) StartImport(ctx context.Context, owner, repo string, in *Import) (*Import, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/import", owner, repo)
-	req, err := s.client.NewRequest("PUT", u, in)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeImportPreview)
-
-	out := new(Import)
-	resp, err := s.client.Do(ctx, req, out)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return out, resp, nil
-}
-
-// ImportProgress queries for the status and progress of an ongoing repository import.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/source_imports/#get-import-progress
-func (s *MigrationService) ImportProgress(ctx context.Context, owner, repo string) (*Import, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/import", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeImportPreview)
-
-	out := new(Import)
-	resp, err := s.client.Do(ctx, req, out)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return out, resp, nil
-}
-
-// UpdateImport initiates a repository import.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/source_imports/#update-existing-import
-func (s *MigrationService) UpdateImport(ctx context.Context, owner, repo string, in *Import) (*Import, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/import", owner, repo)
-	req, err := s.client.NewRequest("PATCH", u, in)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeImportPreview)
-
-	out := new(Import)
-	resp, err := s.client.Do(ctx, req, out)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return out, resp, nil
-}
-
-// CommitAuthors gets the authors mapped from the original repository.
-//
-// Each type of source control system represents authors in a different way.
-// For example, a Git commit author has a display name and an email address,
-// but a Subversion commit author just has a username. The GitHub Importer will
-// make the author information valid, but the author might not be correct. For
-// example, it will change the bare Subversion username "hubot" into something
-// like "hubot <hubot@12341234-abab-fefe-8787-fedcba987654>".
-//
-// This method and MapCommitAuthor allow you to provide correct Git author
-// information.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/source_imports/#get-commit-authors
-func (s *MigrationService) CommitAuthors(ctx context.Context, owner, repo string) ([]*SourceImportAuthor, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/import/authors", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeImportPreview)
-
-	var authors []*SourceImportAuthor
-	resp, err := s.client.Do(ctx, req, &authors)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return authors, resp, nil
-}
-
-// MapCommitAuthor updates an author's identity for the import. Your
-// application can continue updating authors any time before you push new
-// commits to the repository.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/source_imports/#map-a-commit-author
-func (s *MigrationService) MapCommitAuthor(ctx context.Context, owner, repo string, id int, author *SourceImportAuthor) (*SourceImportAuthor, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/import/authors/%v", owner, repo, id)
-	req, err := s.client.NewRequest("PATCH", u, author)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeImportPreview)
-
-	out := new(SourceImportAuthor)
-	resp, err := s.client.Do(ctx, req, out)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return out, resp, nil
-}
-
-// SetLFSPreference sets whether imported repositories should use Git LFS for
-// files larger than 100MB. Only the UseLFS field on the provided Import is
-// used.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/source_imports/#set-git-lfs-preference
-func (s *MigrationService) SetLFSPreference(ctx context.Context, owner, repo string, in *Import) (*Import, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/import/lfs", owner, repo)
-	req, err := s.client.NewRequest("PATCH", u, in)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeImportPreview)
-
-	out := new(Import)
-	resp, err := s.client.Do(ctx, req, out)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return out, resp, nil
-}
-
-// LargeFiles lists files larger than 100MB found during the import.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/source_imports/#get-large-files
-func (s *MigrationService) LargeFiles(ctx context.Context, owner, repo string) ([]*LargeFile, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/import/large_files", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeImportPreview)
-
-	var files []*LargeFile
-	resp, err := s.client.Do(ctx, req, &files)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return files, resp, nil
-}
-
-// CancelImport stops an import for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/migration/source_imports/#cancel-an-import
-func (s *MigrationService) CancelImport(ctx context.Context, owner, repo string) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/import", owner, repo)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeImportPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/misc.go b/vendor/github.com/google/go-github/github/misc.go
deleted file mode 100644
index 5b8082d3ce..0000000000
--- a/vendor/github.com/google/go-github/github/misc.go
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2014 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"net/url"
-)
-
-// MarkdownOptions specifies optional parameters to the Markdown method.
-type MarkdownOptions struct {
-	// Mode identifies the rendering mode. Possible values are:
-	//   markdown - render a document as plain Markdown, just like
-	//   README files are rendered.
-	//
-	//   gfm - to render a document as user-content, e.g. like user
-	//   comments or issues are rendered. In GFM mode, hard line breaks are
-	//   always taken into account, and issue and user mentions are linked
-	//   accordingly.
-	//
-	// Default is "markdown".
-	Mode string
-
-	// Context identifies the repository context. Only taken into account
-	// when rendering as "gfm".
-	Context string
-}
-
-type markdownRequest struct {
-	Text    *string `json:"text,omitempty"`
-	Mode    *string `json:"mode,omitempty"`
-	Context *string `json:"context,omitempty"`
-}
-
-// Markdown renders an arbitrary Markdown document.
-//
-// GitHub API docs: https://developer.github.com/v3/markdown/
-func (c *Client) Markdown(ctx context.Context, text string, opt *MarkdownOptions) (string, *Response, error) {
-	request := &markdownRequest{Text: String(text)}
-	if opt != nil {
-		if opt.Mode != "" {
-			request.Mode = String(opt.Mode)
-		}
-		if opt.Context != "" {
-			request.Context = String(opt.Context)
-		}
-	}
-
-	req, err := c.NewRequest("POST", "markdown", request)
-	if err != nil {
-		return "", nil, err
-	}
-
-	buf := new(bytes.Buffer)
-	resp, err := c.Do(ctx, req, buf)
-	if err != nil {
-		return "", resp, err
-	}
-
-	return buf.String(), resp, nil
-}
-
-// ListEmojis returns the emojis available to use on GitHub.
-//
-// GitHub API docs: https://developer.github.com/v3/emojis/
-func (c *Client) ListEmojis(ctx context.Context) (map[string]string, *Response, error) {
-	req, err := c.NewRequest("GET", "emojis", nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var emoji map[string]string
-	resp, err := c.Do(ctx, req, &emoji)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return emoji, resp, nil
-}
-
-// CodeOfConduct represents a code of conduct.
-type CodeOfConduct struct {
-	Name *string `json:"name,omitempty"`
-	Key  *string `json:"key,omitempty"`
-	URL  *string `json:"url,omitempty"`
-	Body *string `json:"body,omitempty"`
-}
-
-func (c *CodeOfConduct) String() string {
-	return Stringify(c)
-}
-
-// ListCodesOfConduct returns all codes of conduct.
-//
-// GitHub API docs: https://developer.github.com/v3/codes_of_conduct/#list-all-codes-of-conduct
-func (c *Client) ListCodesOfConduct(ctx context.Context) ([]*CodeOfConduct, *Response, error) {
-	req, err := c.NewRequest("GET", "codes_of_conduct", nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeCodesOfConductPreview)
-
-	var cs []*CodeOfConduct
-	resp, err := c.Do(ctx, req, &cs)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return cs, resp, nil
-}
-
-// GetCodeOfConduct returns an individual code of conduct.
-//
-// https://developer.github.com/v3/codes_of_conduct/#get-an-individual-code-of-conduct
-func (c *Client) GetCodeOfConduct(ctx context.Context, key string) (*CodeOfConduct, *Response, error) {
-	u := fmt.Sprintf("codes_of_conduct/%s", key)
-	req, err := c.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeCodesOfConductPreview)
-
-	coc := new(CodeOfConduct)
-	resp, err := c.Do(ctx, req, coc)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return coc, resp, nil
-}
-
-// APIMeta represents metadata about the GitHub API.
-type APIMeta struct {
-	// An Array of IP addresses in CIDR format specifying the addresses
-	// that incoming service hooks will originate from on GitHub.com.
-	Hooks []string `json:"hooks,omitempty"`
-
-	// An Array of IP addresses in CIDR format specifying the Git servers
-	// for GitHub.com.
-	Git []string `json:"git,omitempty"`
-
-	// Whether authentication with username and password is supported.
-	// (GitHub Enterprise instances using CAS or OAuth for authentication
-	// will return false. Features like Basic Authentication with a
-	// username and password, sudo mode, and two-factor authentication are
-	// not supported on these servers.)
-	VerifiablePasswordAuthentication *bool `json:"verifiable_password_authentication,omitempty"`
-
-	// An array of IP addresses in CIDR format specifying the addresses
-	// which serve GitHub Pages websites.
-	Pages []string `json:"pages,omitempty"`
-}
-
-// APIMeta returns information about GitHub.com, the service. Or, if you access
-// this endpoint on your organization’s GitHub Enterprise installation, this
-// endpoint provides information about that installation.
-//
-// GitHub API docs: https://developer.github.com/v3/meta/
-func (c *Client) APIMeta(ctx context.Context) (*APIMeta, *Response, error) {
-	req, err := c.NewRequest("GET", "meta", nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	meta := new(APIMeta)
-	resp, err := c.Do(ctx, req, meta)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return meta, resp, nil
-}
-
-// Octocat returns an ASCII art octocat with the specified message in a speech
-// bubble. If message is empty, a random zen phrase is used.
-func (c *Client) Octocat(ctx context.Context, message string) (string, *Response, error) {
-	u := "octocat"
-	if message != "" {
-		u = fmt.Sprintf("%s?s=%s", u, url.QueryEscape(message))
-	}
-
-	req, err := c.NewRequest("GET", u, nil)
-	if err != nil {
-		return "", nil, err
-	}
-
-	buf := new(bytes.Buffer)
-	resp, err := c.Do(ctx, req, buf)
-	if err != nil {
-		return "", resp, err
-	}
-
-	return buf.String(), resp, nil
-}
-
-// Zen returns a random line from The Zen of GitHub.
-//
-// see also: http://warpspire.com/posts/taste/
-func (c *Client) Zen(ctx context.Context) (string, *Response, error) {
-	req, err := c.NewRequest("GET", "zen", nil)
-	if err != nil {
-		return "", nil, err
-	}
-
-	buf := new(bytes.Buffer)
-	resp, err := c.Do(ctx, req, buf)
-	if err != nil {
-		return "", resp, err
-	}
-
-	return buf.String(), resp, nil
-}
-
-// ServiceHook represents a hook that has configuration settings, a list of
-// available events, and default events.
-type ServiceHook struct {
-	Name            *string    `json:"name,omitempty"`
-	Events          []string   `json:"events,omitempty"`
-	SupportedEvents []string   `json:"supported_events,omitempty"`
-	Schema          [][]string `json:"schema,omitempty"`
-}
-
-func (s *ServiceHook) String() string {
-	return Stringify(s)
-}
-
-// ListServiceHooks lists all of the available service hooks.
-//
-// GitHub API docs: https://developer.github.com/webhooks/#services
-func (c *Client) ListServiceHooks(ctx context.Context) ([]*ServiceHook, *Response, error) {
-	u := "hooks"
-	req, err := c.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var hooks []*ServiceHook
-	resp, err := c.Do(ctx, req, &hooks)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return hooks, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/orgs.go b/vendor/github.com/google/go-github/github/orgs.go
deleted file mode 100644
index e6947c96cf..0000000000
--- a/vendor/github.com/google/go-github/github/orgs.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// OrganizationsService provides access to the organization related functions
-// in the GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/
-type OrganizationsService service
-
-// Organization represents a GitHub organization account.
-type Organization struct {
-	Login             *string    `json:"login,omitempty"`
-	ID                *int       `json:"id,omitempty"`
-	AvatarURL         *string    `json:"avatar_url,omitempty"`
-	HTMLURL           *string    `json:"html_url,omitempty"`
-	Name              *string    `json:"name,omitempty"`
-	Company           *string    `json:"company,omitempty"`
-	Blog              *string    `json:"blog,omitempty"`
-	Location          *string    `json:"location,omitempty"`
-	Email             *string    `json:"email,omitempty"`
-	Description       *string    `json:"description,omitempty"`
-	PublicRepos       *int       `json:"public_repos,omitempty"`
-	PublicGists       *int       `json:"public_gists,omitempty"`
-	Followers         *int       `json:"followers,omitempty"`
-	Following         *int       `json:"following,omitempty"`
-	CreatedAt         *time.Time `json:"created_at,omitempty"`
-	UpdatedAt         *time.Time `json:"updated_at,omitempty"`
-	TotalPrivateRepos *int       `json:"total_private_repos,omitempty"`
-	OwnedPrivateRepos *int       `json:"owned_private_repos,omitempty"`
-	PrivateGists      *int       `json:"private_gists,omitempty"`
-	DiskUsage         *int       `json:"disk_usage,omitempty"`
-	Collaborators     *int       `json:"collaborators,omitempty"`
-	BillingEmail      *string    `json:"billing_email,omitempty"`
-	Type              *string    `json:"type,omitempty"`
-	Plan              *Plan      `json:"plan,omitempty"`
-
-	// API URLs
-	URL              *string `json:"url,omitempty"`
-	EventsURL        *string `json:"events_url,omitempty"`
-	HooksURL         *string `json:"hooks_url,omitempty"`
-	IssuesURL        *string `json:"issues_url,omitempty"`
-	MembersURL       *string `json:"members_url,omitempty"`
-	PublicMembersURL *string `json:"public_members_url,omitempty"`
-	ReposURL         *string `json:"repos_url,omitempty"`
-}
-
-func (o Organization) String() string {
-	return Stringify(o)
-}
-
-// Plan represents the payment plan for an account. See plans at https://github.com/plans.
-type Plan struct {
-	Name          *string `json:"name,omitempty"`
-	Space         *int    `json:"space,omitempty"`
-	Collaborators *int    `json:"collaborators,omitempty"`
-	PrivateRepos  *int    `json:"private_repos,omitempty"`
-}
-
-func (p Plan) String() string {
-	return Stringify(p)
-}
-
-// OrganizationsListOptions specifies the optional parameters to the
-// OrganizationsService.ListAll method.
-type OrganizationsListOptions struct {
-	// Since filters Organizations by ID.
-	Since int `url:"since,omitempty"`
-
-	ListOptions
-}
-
-// ListAll lists all organizations, in the order that they were created on GitHub.
-//
-// Note: Pagination is powered exclusively by the since parameter. To continue
-// listing the next set of organizations, use the ID of the last-returned organization
-// as the opts.Since parameter for the next call.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/#list-all-organizations
-func (s *OrganizationsService) ListAll(ctx context.Context, opt *OrganizationsListOptions) ([]*Organization, *Response, error) {
-	u, err := addOptions("organizations", opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	orgs := []*Organization{}
-	resp, err := s.client.Do(ctx, req, &orgs)
-	if err != nil {
-		return nil, resp, err
-	}
-	return orgs, resp, nil
-}
-
-// List the organizations for a user. Passing the empty string will list
-// organizations for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/#list-user-organizations
-func (s *OrganizationsService) List(ctx context.Context, user string, opt *ListOptions) ([]*Organization, *Response, error) {
-	var u string
-	if user != "" {
-		u = fmt.Sprintf("users/%v/orgs", user)
-	} else {
-		u = "user/orgs"
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var orgs []*Organization
-	resp, err := s.client.Do(ctx, req, &orgs)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return orgs, resp, nil
-}
-
-// Get fetches an organization by name.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/#get-an-organization
-func (s *OrganizationsService) Get(ctx context.Context, org string) (*Organization, *Response, error) {
-	u := fmt.Sprintf("orgs/%v", org)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	organization := new(Organization)
-	resp, err := s.client.Do(ctx, req, organization)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return organization, resp, nil
-}
-
-// GetByID fetches an organization.
-//
-// Note: GetByID uses the undocumented GitHub API endpoint /organizations/:id.
-func (s *OrganizationsService) GetByID(ctx context.Context, id int) (*Organization, *Response, error) {
-	u := fmt.Sprintf("organizations/%d", id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	organization := new(Organization)
-	resp, err := s.client.Do(ctx, req, organization)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return organization, resp, nil
-}
-
-// Edit an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/#edit-an-organization
-func (s *OrganizationsService) Edit(ctx context.Context, name string, org *Organization) (*Organization, *Response, error) {
-	u := fmt.Sprintf("orgs/%v", name)
-	req, err := s.client.NewRequest("PATCH", u, org)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	o := new(Organization)
-	resp, err := s.client.Do(ctx, req, o)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return o, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/orgs_hooks.go b/vendor/github.com/google/go-github/github/orgs_hooks.go
deleted file mode 100644
index 4fc692e0f6..0000000000
--- a/vendor/github.com/google/go-github/github/orgs_hooks.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2015 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// ListHooks lists all Hooks for the specified organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/hooks/#list-hooks
-func (s *OrganizationsService) ListHooks(ctx context.Context, org string, opt *ListOptions) ([]*Hook, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/hooks", org)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var hooks []*Hook
-	resp, err := s.client.Do(ctx, req, &hooks)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return hooks, resp, nil
-}
-
-// GetHook returns a single specified Hook.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/hooks/#get-single-hook
-func (s *OrganizationsService) GetHook(ctx context.Context, org string, id int) (*Hook, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/hooks/%d", org, id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-	hook := new(Hook)
-	resp, err := s.client.Do(ctx, req, hook)
-	return hook, resp, err
-}
-
-// CreateHook creates a Hook for the specified org.
-// Name and Config are required fields.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/hooks/#create-a-hook
-func (s *OrganizationsService) CreateHook(ctx context.Context, org string, hook *Hook) (*Hook, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/hooks", org)
-	req, err := s.client.NewRequest("POST", u, hook)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	h := new(Hook)
-	resp, err := s.client.Do(ctx, req, h)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return h, resp, nil
-}
-
-// EditHook updates a specified Hook.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/hooks/#edit-a-hook
-func (s *OrganizationsService) EditHook(ctx context.Context, org string, id int, hook *Hook) (*Hook, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/hooks/%d", org, id)
-	req, err := s.client.NewRequest("PATCH", u, hook)
-	if err != nil {
-		return nil, nil, err
-	}
-	h := new(Hook)
-	resp, err := s.client.Do(ctx, req, h)
-	return h, resp, err
-}
-
-// PingHook triggers a 'ping' event to be sent to the Hook.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/hooks/#ping-a-hook
-func (s *OrganizationsService) PingHook(ctx context.Context, org string, id int) (*Response, error) {
-	u := fmt.Sprintf("orgs/%v/hooks/%d/pings", org, id)
-	req, err := s.client.NewRequest("POST", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
-
-// DeleteHook deletes a specified Hook.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/hooks/#delete-a-hook
-func (s *OrganizationsService) DeleteHook(ctx context.Context, org string, id int) (*Response, error) {
-	u := fmt.Sprintf("orgs/%v/hooks/%d", org, id)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/orgs_members.go b/vendor/github.com/google/go-github/github/orgs_members.go
deleted file mode 100644
index f1209c7c41..0000000000
--- a/vendor/github.com/google/go-github/github/orgs_members.go
+++ /dev/null
@@ -1,299 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// Membership represents the status of a user's membership in an organization or team.
-type Membership struct {
-	URL *string `json:"url,omitempty"`
-
-	// State is the user's status within the organization or team.
-	// Possible values are: "active", "pending"
-	State *string `json:"state,omitempty"`
-
-	// Role identifies the user's role within the organization or team.
-	// Possible values for organization membership:
-	//     member - non-owner organization member
-	//     admin - organization owner
-	//
-	// Possible values for team membership are:
-	//     member - a normal member of the team
-	//     maintainer - a team maintainer. Able to add/remove other team
-	//                  members, promote other team members to team
-	//                  maintainer, and edit the team’s name and description
-	Role *string `json:"role,omitempty"`
-
-	// For organization membership, the API URL of the organization.
-	OrganizationURL *string `json:"organization_url,omitempty"`
-
-	// For organization membership, the organization the membership is for.
-	Organization *Organization `json:"organization,omitempty"`
-
-	// For organization membership, the user the membership is for.
-	User *User `json:"user,omitempty"`
-}
-
-func (m Membership) String() string {
-	return Stringify(m)
-}
-
-// ListMembersOptions specifies optional parameters to the
-// OrganizationsService.ListMembers method.
-type ListMembersOptions struct {
-	// If true (or if the authenticated user is not an owner of the
-	// organization), list only publicly visible members.
-	PublicOnly bool `url:"-"`
-
-	// Filter members returned in the list. Possible values are:
-	// 2fa_disabled, all. Default is "all".
-	Filter string `url:"filter,omitempty"`
-
-	// Role filters members returned by their role in the organization.
-	// Possible values are:
-	//     all - all members of the organization, regardless of role
-	//     admin - organization owners
-	//     member - non-organization members
-	//
-	// Default is "all".
-	Role string `url:"role,omitempty"`
-
-	ListOptions
-}
-
-// ListMembers lists the members for an organization. If the authenticated
-// user is an owner of the organization, this will return both concealed and
-// public members, otherwise it will only return public members.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/members/#members-list
-func (s *OrganizationsService) ListMembers(ctx context.Context, org string, opt *ListMembersOptions) ([]*User, *Response, error) {
-	var u string
-	if opt != nil && opt.PublicOnly {
-		u = fmt.Sprintf("orgs/%v/public_members", org)
-	} else {
-		u = fmt.Sprintf("orgs/%v/members", org)
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var members []*User
-	resp, err := s.client.Do(ctx, req, &members)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return members, resp, nil
-}
-
-// IsMember checks if a user is a member of an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/members/#check-membership
-func (s *OrganizationsService) IsMember(ctx context.Context, org, user string) (bool, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/members/%v", org, user)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return false, nil, err
-	}
-
-	resp, err := s.client.Do(ctx, req, nil)
-	member, err := parseBoolResponse(err)
-	return member, resp, err
-}
-
-// IsPublicMember checks if a user is a public member of an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/members/#check-public-membership
-func (s *OrganizationsService) IsPublicMember(ctx context.Context, org, user string) (bool, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/public_members/%v", org, user)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return false, nil, err
-	}
-
-	resp, err := s.client.Do(ctx, req, nil)
-	member, err := parseBoolResponse(err)
-	return member, resp, err
-}
-
-// RemoveMember removes a user from all teams of an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/members/#remove-a-member
-func (s *OrganizationsService) RemoveMember(ctx context.Context, org, user string) (*Response, error) {
-	u := fmt.Sprintf("orgs/%v/members/%v", org, user)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// PublicizeMembership publicizes a user's membership in an organization. (A
-// user cannot publicize the membership for another user.)
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/members/#publicize-a-users-membership
-func (s *OrganizationsService) PublicizeMembership(ctx context.Context, org, user string) (*Response, error) {
-	u := fmt.Sprintf("orgs/%v/public_members/%v", org, user)
-	req, err := s.client.NewRequest("PUT", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// ConcealMembership conceals a user's membership in an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/members/#conceal-a-users-membership
-func (s *OrganizationsService) ConcealMembership(ctx context.Context, org, user string) (*Response, error) {
-	u := fmt.Sprintf("orgs/%v/public_members/%v", org, user)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// ListOrgMembershipsOptions specifies optional parameters to the
-// OrganizationsService.ListOrgMemberships method.
-type ListOrgMembershipsOptions struct {
-	// Filter memberships to include only those with the specified state.
-	// Possible values are: "active", "pending".
-	State string `url:"state,omitempty"`
-
-	ListOptions
-}
-
-// ListOrgMemberships lists the organization memberships for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/members/#list-your-organization-memberships
-func (s *OrganizationsService) ListOrgMemberships(ctx context.Context, opt *ListOrgMembershipsOptions) ([]*Membership, *Response, error) {
-	u := "user/memberships/orgs"
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var memberships []*Membership
-	resp, err := s.client.Do(ctx, req, &memberships)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return memberships, resp, nil
-}
-
-// GetOrgMembership gets the membership for a user in a specified organization.
-// Passing an empty string for user will get the membership for the
-// authenticated user.
-//
-// GitHub API docs:
-// https://developer.github.com/v3/orgs/members/#get-organization-membership
-// https://developer.github.com/v3/orgs/members/#get-your-organization-membership
-func (s *OrganizationsService) GetOrgMembership(ctx context.Context, user, org string) (*Membership, *Response, error) {
-	var u string
-	if user != "" {
-		u = fmt.Sprintf("orgs/%v/memberships/%v", org, user)
-	} else {
-		u = fmt.Sprintf("user/memberships/orgs/%v", org)
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	membership := new(Membership)
-	resp, err := s.client.Do(ctx, req, membership)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return membership, resp, nil
-}
-
-// EditOrgMembership edits the membership for user in specified organization.
-// Passing an empty string for user will edit the membership for the
-// authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/members/#add-or-update-organization-membership
-// GitHub API docs: https://developer.github.com/v3/orgs/members/#edit-your-organization-membership
-func (s *OrganizationsService) EditOrgMembership(ctx context.Context, user, org string, membership *Membership) (*Membership, *Response, error) {
-	var u, method string
-	if user != "" {
-		u = fmt.Sprintf("orgs/%v/memberships/%v", org, user)
-		method = "PUT"
-	} else {
-		u = fmt.Sprintf("user/memberships/orgs/%v", org)
-		method = "PATCH"
-	}
-
-	req, err := s.client.NewRequest(method, u, membership)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	m := new(Membership)
-	resp, err := s.client.Do(ctx, req, m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// RemoveOrgMembership removes user from the specified organization. If the
-// user has been invited to the organization, this will cancel their invitation.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/members/#remove-organization-membership
-func (s *OrganizationsService) RemoveOrgMembership(ctx context.Context, user, org string) (*Response, error) {
-	u := fmt.Sprintf("orgs/%v/memberships/%v", org, user)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// ListPendingOrgInvitations returns a list of pending invitations.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/members/#list-pending-organization-invitations
-func (s *OrganizationsService) ListPendingOrgInvitations(ctx context.Context, org int, opt *ListOptions) ([]*Invitation, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/invitations", org)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var pendingInvitations []*Invitation
-	resp, err := s.client.Do(ctx, req, &pendingInvitations)
-	if err != nil {
-		return nil, resp, err
-	}
-	return pendingInvitations, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/orgs_outside_collaborators.go b/vendor/github.com/google/go-github/github/orgs_outside_collaborators.go
deleted file mode 100644
index e34f8653b5..0000000000
--- a/vendor/github.com/google/go-github/github/orgs_outside_collaborators.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2017 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// ListOutsideCollaboratorsOptions specifies optional parameters to the
-// OrganizationsService.ListOutsideCollaborators method.
-type ListOutsideCollaboratorsOptions struct {
-	// Filter outside collaborators returned in the list. Possible values are:
-	// 2fa_disabled, all.  Default is "all".
-	Filter string `url:"filter,omitempty"`
-
-	ListOptions
-}
-
-// ListOutsideCollaborators lists outside collaborators of organization's repositories.
-// This will only work if the authenticated
-// user is an owner of the organization.
-//
-// Warning: The API may change without advance notice during the preview period.
-// Preview features are not supported for production use.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/outside_collaborators/#list-outside-collaborators
-func (s *OrganizationsService) ListOutsideCollaborators(ctx context.Context, org string, opt *ListOutsideCollaboratorsOptions) ([]*User, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/outside_collaborators", org)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var members []*User
-	resp, err := s.client.Do(ctx, req, &members)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return members, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/orgs_projects.go b/vendor/github.com/google/go-github/github/orgs_projects.go
deleted file mode 100644
index e57cba9782..0000000000
--- a/vendor/github.com/google/go-github/github/orgs_projects.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2017 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// ListProjects lists the projects for an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/#list-organization-projects
-func (s *OrganizationsService) ListProjects(ctx context.Context, org string, opt *ProjectListOptions) ([]*Project, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/projects", org)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	var projects []*Project
-	resp, err := s.client.Do(ctx, req, &projects)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return projects, resp, nil
-}
-
-// CreateProject creates a GitHub Project for the specified organization.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/#create-an-organization-project
-func (s *OrganizationsService) CreateProject(ctx context.Context, org string, opt *ProjectOptions) (*Project, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/projects", org)
-	req, err := s.client.NewRequest("POST", u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	project := &Project{}
-	resp, err := s.client.Do(ctx, req, project)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return project, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/orgs_teams.go b/vendor/github.com/google/go-github/github/orgs_teams.go
deleted file mode 100644
index 684e2dafff..0000000000
--- a/vendor/github.com/google/go-github/github/orgs_teams.go
+++ /dev/null
@@ -1,431 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// Team represents a team within a GitHub organization. Teams are used to
-// manage access to an organization's repositories.
-type Team struct {
-	ID          *int    `json:"id,omitempty"`
-	Name        *string `json:"name,omitempty"`
-	Description *string `json:"description,omitempty"`
-	URL         *string `json:"url,omitempty"`
-	Slug        *string `json:"slug,omitempty"`
-
-	// Permission is deprecated when creating or editing a team in an org
-	// using the new GitHub permission model. It no longer identifies the
-	// permission a team has on its repos, but only specifies the default
-	// permission a repo is initially added with. Avoid confusion by
-	// specifying a permission value when calling AddTeamRepo.
-	Permission *string `json:"permission,omitempty"`
-
-	// Privacy identifies the level of privacy this team should have.
-	// Possible values are:
-	//     secret - only visible to organization owners and members of this team
-	//     closed - visible to all members of this organization
-	// Default is "secret".
-	Privacy *string `json:"privacy,omitempty"`
-
-	MembersCount    *int          `json:"members_count,omitempty"`
-	ReposCount      *int          `json:"repos_count,omitempty"`
-	Organization    *Organization `json:"organization,omitempty"`
-	MembersURL      *string       `json:"members_url,omitempty"`
-	RepositoriesURL *string       `json:"repositories_url,omitempty"`
-
-	// LDAPDN is only available in GitHub Enterprise and when the team
-	// membership is synchronized with LDAP.
-	LDAPDN *string `json:"ldap_dn,omitempty"`
-}
-
-func (t Team) String() string {
-	return Stringify(t)
-}
-
-// Invitation represents a team member's invitation status.
-type Invitation struct {
-	ID    *int    `json:"id,omitempty"`
-	Login *string `json:"login,omitempty"`
-	Email *string `json:"email,omitempty"`
-	// Role can be one of the values - 'direct_member', 'admin', 'billing_manager', 'hiring_manager', or 'reinstate'.
-	Role      *string    `json:"role,omitempty"`
-	CreatedAt *time.Time `json:"created_at,omitempty"`
-	Inviter   *User      `json:"inviter,omitempty"`
-}
-
-func (i Invitation) String() string {
-	return Stringify(i)
-}
-
-// ListTeams lists all of the teams for an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#list-teams
-func (s *OrganizationsService) ListTeams(ctx context.Context, org string, opt *ListOptions) ([]*Team, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/teams", org)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var teams []*Team
-	resp, err := s.client.Do(ctx, req, &teams)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return teams, resp, nil
-}
-
-// GetTeam fetches a team by ID.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#get-team
-func (s *OrganizationsService) GetTeam(ctx context.Context, team int) (*Team, *Response, error) {
-	u := fmt.Sprintf("teams/%v", team)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	t := new(Team)
-	resp, err := s.client.Do(ctx, req, t)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return t, resp, nil
-}
-
-// CreateTeam creates a new team within an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#create-team
-func (s *OrganizationsService) CreateTeam(ctx context.Context, org string, team *Team) (*Team, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/teams", org)
-	req, err := s.client.NewRequest("POST", u, team)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	t := new(Team)
-	resp, err := s.client.Do(ctx, req, t)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return t, resp, nil
-}
-
-// EditTeam edits a team.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#edit-team
-func (s *OrganizationsService) EditTeam(ctx context.Context, id int, team *Team) (*Team, *Response, error) {
-	u := fmt.Sprintf("teams/%v", id)
-	req, err := s.client.NewRequest("PATCH", u, team)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	t := new(Team)
-	resp, err := s.client.Do(ctx, req, t)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return t, resp, nil
-}
-
-// DeleteTeam deletes a team.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#delete-team
-func (s *OrganizationsService) DeleteTeam(ctx context.Context, team int) (*Response, error) {
-	u := fmt.Sprintf("teams/%v", team)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// OrganizationListTeamMembersOptions specifies the optional parameters to the
-// OrganizationsService.ListTeamMembers method.
-type OrganizationListTeamMembersOptions struct {
-	// Role filters members returned by their role in the team. Possible
-	// values are "all", "member", "maintainer". Default is "all".
-	Role string `url:"role,omitempty"`
-
-	ListOptions
-}
-
-// ListTeamMembers lists all of the users who are members of the specified
-// team.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#list-team-members
-func (s *OrganizationsService) ListTeamMembers(ctx context.Context, team int, opt *OrganizationListTeamMembersOptions) ([]*User, *Response, error) {
-	u := fmt.Sprintf("teams/%v/members", team)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var members []*User
-	resp, err := s.client.Do(ctx, req, &members)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return members, resp, nil
-}
-
-// IsTeamMember checks if a user is a member of the specified team.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#get-team-member
-func (s *OrganizationsService) IsTeamMember(ctx context.Context, team int, user string) (bool, *Response, error) {
-	u := fmt.Sprintf("teams/%v/members/%v", team, user)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return false, nil, err
-	}
-
-	resp, err := s.client.Do(ctx, req, nil)
-	member, err := parseBoolResponse(err)
-	return member, resp, err
-}
-
-// ListTeamRepos lists the repositories that the specified team has access to.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#list-team-repos
-func (s *OrganizationsService) ListTeamRepos(ctx context.Context, team int, opt *ListOptions) ([]*Repository, *Response, error) {
-	u := fmt.Sprintf("teams/%v/repos", team)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when topics API fully launches.
-	req.Header.Set("Accept", mediaTypeTopicsPreview)
-
-	var repos []*Repository
-	resp, err := s.client.Do(ctx, req, &repos)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return repos, resp, nil
-}
-
-// IsTeamRepo checks if a team manages the specified repository. If the
-// repository is managed by team, a Repository is returned which includes the
-// permissions team has for that repo.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#check-if-a-team-manages-a-repository
-func (s *OrganizationsService) IsTeamRepo(ctx context.Context, team int, owner string, repo string) (*Repository, *Response, error) {
-	u := fmt.Sprintf("teams/%v/repos/%v/%v", team, owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req.Header.Set("Accept", mediaTypeOrgPermissionRepo)
-
-	repository := new(Repository)
-	resp, err := s.client.Do(ctx, req, repository)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return repository, resp, nil
-}
-
-// OrganizationAddTeamRepoOptions specifies the optional parameters to the
-// OrganizationsService.AddTeamRepo method.
-type OrganizationAddTeamRepoOptions struct {
-	// Permission specifies the permission to grant the team on this repository.
-	// Possible values are:
-	//     pull - team members can pull, but not push to or administer this repository
-	//     push - team members can pull and push, but not administer this repository
-	//     admin - team members can pull, push and administer this repository
-	//
-	// If not specified, the team's permission attribute will be used.
-	Permission string `json:"permission,omitempty"`
-}
-
-// AddTeamRepo adds a repository to be managed by the specified team. The
-// specified repository must be owned by the organization to which the team
-// belongs, or a direct fork of a repository owned by the organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#add-team-repo
-func (s *OrganizationsService) AddTeamRepo(ctx context.Context, team int, owner string, repo string, opt *OrganizationAddTeamRepoOptions) (*Response, error) {
-	u := fmt.Sprintf("teams/%v/repos/%v/%v", team, owner, repo)
-	req, err := s.client.NewRequest("PUT", u, opt)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// RemoveTeamRepo removes a repository from being managed by the specified
-// team. Note that this does not delete the repository, it just removes it
-// from the team.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#remove-team-repo
-func (s *OrganizationsService) RemoveTeamRepo(ctx context.Context, team int, owner string, repo string) (*Response, error) {
-	u := fmt.Sprintf("teams/%v/repos/%v/%v", team, owner, repo)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// ListUserTeams lists a user's teams
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#list-user-teams
-func (s *OrganizationsService) ListUserTeams(ctx context.Context, opt *ListOptions) ([]*Team, *Response, error) {
-	u := "user/teams"
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var teams []*Team
-	resp, err := s.client.Do(ctx, req, &teams)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return teams, resp, nil
-}
-
-// GetTeamMembership returns the membership status for a user in a team.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#get-team-membership
-func (s *OrganizationsService) GetTeamMembership(ctx context.Context, team int, user string) (*Membership, *Response, error) {
-	u := fmt.Sprintf("teams/%v/memberships/%v", team, user)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	t := new(Membership)
-	resp, err := s.client.Do(ctx, req, t)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return t, resp, nil
-}
-
-// OrganizationAddTeamMembershipOptions does stuff specifies the optional
-// parameters to the OrganizationsService.AddTeamMembership method.
-type OrganizationAddTeamMembershipOptions struct {
-	// Role specifies the role the user should have in the team. Possible
-	// values are:
-	//     member - a normal member of the team
-	//     maintainer - a team maintainer. Able to add/remove other team
-	//                  members, promote other team members to team
-	//                  maintainer, and edit the team’s name and description
-	//
-	// Default value is "member".
-	Role string `json:"role,omitempty"`
-}
-
-// AddTeamMembership adds or invites a user to a team.
-//
-// In order to add a membership between a user and a team, the authenticated
-// user must have 'admin' permissions to the team or be an owner of the
-// organization that the team is associated with.
-//
-// If the user is already a part of the team's organization (meaning they're on
-// at least one other team in the organization), this endpoint will add the
-// user to the team.
-//
-// If the user is completely unaffiliated with the team's organization (meaning
-// they're on none of the organization's teams), this endpoint will send an
-// invitation to the user via email. This newly-created membership will be in
-// the "pending" state until the user accepts the invitation, at which point
-// the membership will transition to the "active" state and the user will be
-// added as a member of the team.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#add-team-membership
-func (s *OrganizationsService) AddTeamMembership(ctx context.Context, team int, user string, opt *OrganizationAddTeamMembershipOptions) (*Membership, *Response, error) {
-	u := fmt.Sprintf("teams/%v/memberships/%v", team, user)
-	req, err := s.client.NewRequest("PUT", u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	t := new(Membership)
-	resp, err := s.client.Do(ctx, req, t)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return t, resp, nil
-}
-
-// RemoveTeamMembership removes a user from a team.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#remove-team-membership
-func (s *OrganizationsService) RemoveTeamMembership(ctx context.Context, team int, user string) (*Response, error) {
-	u := fmt.Sprintf("teams/%v/memberships/%v", team, user)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// ListPendingTeamInvitations get pending invitaion list in team.
-// Warning: The API may change without advance notice during the preview period.
-// Preview features are not supported for production use.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/teams/#list-pending-team-invitations
-func (s *OrganizationsService) ListPendingTeamInvitations(ctx context.Context, team int, opt *ListOptions) ([]*Invitation, *Response, error) {
-	u := fmt.Sprintf("teams/%v/invitations", team)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var pendingInvitations []*Invitation
-	resp, err := s.client.Do(ctx, req, &pendingInvitations)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return pendingInvitations, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/orgs_users_blocking.go b/vendor/github.com/google/go-github/github/orgs_users_blocking.go
deleted file mode 100644
index b1aecf4453..0000000000
--- a/vendor/github.com/google/go-github/github/orgs_users_blocking.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2017 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// ListBlockedUsers lists all the users blocked by an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/blocking/#list-blocked-users
-func (s *OrganizationsService) ListBlockedUsers(ctx context.Context, org string, opt *ListOptions) ([]*User, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/blocks", org)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeBlockUsersPreview)
-
-	var blockedUsers []*User
-	resp, err := s.client.Do(ctx, req, &blockedUsers)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return blockedUsers, resp, nil
-}
-
-// IsBlocked reports whether specified user is blocked from an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/blocking/#check-whether-a-user-is-blocked-from-an-organization
-func (s *OrganizationsService) IsBlocked(ctx context.Context, org string, user string) (bool, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/blocks/%v", org, user)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return false, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeBlockUsersPreview)
-
-	resp, err := s.client.Do(ctx, req, nil)
-	isBlocked, err := parseBoolResponse(err)
-	return isBlocked, resp, err
-}
-
-// BlockUser blocks specified user from an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/blocking/#block-a-user
-func (s *OrganizationsService) BlockUser(ctx context.Context, org string, user string) (*Response, error) {
-	u := fmt.Sprintf("orgs/%v/blocks/%v", org, user)
-
-	req, err := s.client.NewRequest("PUT", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeBlockUsersPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// UnblockUser unblocks specified user from an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/orgs/blocking/#unblock-a-user
-func (s *OrganizationsService) UnblockUser(ctx context.Context, org string, user string) (*Response, error) {
-	u := fmt.Sprintf("orgs/%v/blocks/%v", org, user)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeBlockUsersPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/projects.go b/vendor/github.com/google/go-github/github/projects.go
deleted file mode 100644
index 11c885f99d..0000000000
--- a/vendor/github.com/google/go-github/github/projects.go
+++ /dev/null
@@ -1,425 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// ProjectsService provides access to the projects functions in the
-// GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/
-type ProjectsService service
-
-// Project represents a GitHub Project.
-type Project struct {
-	ID        *int       `json:"id,omitempty"`
-	URL       *string    `json:"url,omitempty"`
-	OwnerURL  *string    `json:"owner_url,omitempty"`
-	Name      *string    `json:"name,omitempty"`
-	Body      *string    `json:"body,omitempty"`
-	Number    *int       `json:"number,omitempty"`
-	CreatedAt *Timestamp `json:"created_at,omitempty"`
-	UpdatedAt *Timestamp `json:"updated_at,omitempty"`
-
-	// The User object that generated the project.
-	Creator *User `json:"creator,omitempty"`
-}
-
-func (p Project) String() string {
-	return Stringify(p)
-}
-
-// GetProject gets a GitHub Project for a repo.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/#get-a-project
-func (s *ProjectsService) GetProject(ctx context.Context, id int) (*Project, *Response, error) {
-	u := fmt.Sprintf("projects/%v", id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	project := &Project{}
-	resp, err := s.client.Do(ctx, req, project)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return project, resp, nil
-}
-
-// ProjectOptions specifies the parameters to the
-// RepositoriesService.CreateProject and
-// ProjectsService.UpdateProject methods.
-type ProjectOptions struct {
-	// The name of the project. (Required for creation; optional for update.)
-	Name string `json:"name,omitempty"`
-	// The body of the project. (Optional.)
-	Body string `json:"body,omitempty"`
-}
-
-// UpdateProject updates a repository project.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/#update-a-project
-func (s *ProjectsService) UpdateProject(ctx context.Context, id int, opt *ProjectOptions) (*Project, *Response, error) {
-	u := fmt.Sprintf("projects/%v", id)
-	req, err := s.client.NewRequest("PATCH", u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	project := &Project{}
-	resp, err := s.client.Do(ctx, req, project)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return project, resp, nil
-}
-
-// DeleteProject deletes a GitHub Project from a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/#delete-a-project
-func (s *ProjectsService) DeleteProject(ctx context.Context, id int) (*Response, error) {
-	u := fmt.Sprintf("projects/%v", id)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// ProjectColumn represents a column of a GitHub Project.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/projects/
-type ProjectColumn struct {
-	ID         *int       `json:"id,omitempty"`
-	Name       *string    `json:"name,omitempty"`
-	ProjectURL *string    `json:"project_url,omitempty"`
-	CreatedAt  *Timestamp `json:"created_at,omitempty"`
-	UpdatedAt  *Timestamp `json:"updated_at,omitempty"`
-}
-
-// ListProjectColumns lists the columns of a GitHub Project for a repo.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/columns/#list-project-columns
-func (s *ProjectsService) ListProjectColumns(ctx context.Context, projectID int, opt *ListOptions) ([]*ProjectColumn, *Response, error) {
-	u := fmt.Sprintf("projects/%v/columns", projectID)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	columns := []*ProjectColumn{}
-	resp, err := s.client.Do(ctx, req, &columns)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return columns, resp, nil
-}
-
-// GetProjectColumn gets a column of a GitHub Project for a repo.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/columns/#get-a-project-column
-func (s *ProjectsService) GetProjectColumn(ctx context.Context, id int) (*ProjectColumn, *Response, error) {
-	u := fmt.Sprintf("projects/columns/%v", id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	column := &ProjectColumn{}
-	resp, err := s.client.Do(ctx, req, column)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return column, resp, nil
-}
-
-// ProjectColumnOptions specifies the parameters to the
-// ProjectsService.CreateProjectColumn and
-// ProjectsService.UpdateProjectColumn methods.
-type ProjectColumnOptions struct {
-	// The name of the project column. (Required for creation and update.)
-	Name string `json:"name"`
-}
-
-// CreateProjectColumn creates a column for the specified (by number) project.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/columns/#create-a-project-column
-func (s *ProjectsService) CreateProjectColumn(ctx context.Context, projectID int, opt *ProjectColumnOptions) (*ProjectColumn, *Response, error) {
-	u := fmt.Sprintf("projects/%v/columns", projectID)
-	req, err := s.client.NewRequest("POST", u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	column := &ProjectColumn{}
-	resp, err := s.client.Do(ctx, req, column)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return column, resp, nil
-}
-
-// UpdateProjectColumn updates a column of a GitHub Project.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/columns/#update-a-project-column
-func (s *ProjectsService) UpdateProjectColumn(ctx context.Context, columnID int, opt *ProjectColumnOptions) (*ProjectColumn, *Response, error) {
-	u := fmt.Sprintf("projects/columns/%v", columnID)
-	req, err := s.client.NewRequest("PATCH", u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	column := &ProjectColumn{}
-	resp, err := s.client.Do(ctx, req, column)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return column, resp, nil
-}
-
-// DeleteProjectColumn deletes a column from a GitHub Project.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/columns/#delete-a-project-column
-func (s *ProjectsService) DeleteProjectColumn(ctx context.Context, columnID int) (*Response, error) {
-	u := fmt.Sprintf("projects/columns/%v", columnID)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// ProjectColumnMoveOptions specifies the parameters to the
-// ProjectsService.MoveProjectColumn method.
-type ProjectColumnMoveOptions struct {
-	// Position can be one of "first", "last", or "after:<column-id>", where
-	// <column-id> is the ID of a column in the same project. (Required.)
-	Position string `json:"position"`
-}
-
-// MoveProjectColumn moves a column within a GitHub Project.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/columns/#move-a-project-column
-func (s *ProjectsService) MoveProjectColumn(ctx context.Context, columnID int, opt *ProjectColumnMoveOptions) (*Response, error) {
-	u := fmt.Sprintf("projects/columns/%v/moves", columnID)
-	req, err := s.client.NewRequest("POST", u, opt)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// ProjectCard represents a card in a column of a GitHub Project.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/cards/#get-a-project-card
-type ProjectCard struct {
-	URL        *string    `json:"url,omitempty"`
-	ColumnURL  *string    `json:"column_url,omitempty"`
-	ContentURL *string    `json:"content_url,omitempty"`
-	ID         *int       `json:"id,omitempty"`
-	Note       *string    `json:"note,omitempty"`
-	Creator    *User      `json:"creator,omitempty"`
-	CreatedAt  *Timestamp `json:"created_at,omitempty"`
-	UpdatedAt  *Timestamp `json:"updated_at,omitempty"`
-
-	// The following fields are only populated by Webhook events.
-	ColumnID *int `json:"column_id,omitempty"`
-}
-
-// ListProjectCards lists the cards in a column of a GitHub Project.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/cards/#list-project-cards
-func (s *ProjectsService) ListProjectCards(ctx context.Context, columnID int, opt *ListOptions) ([]*ProjectCard, *Response, error) {
-	u := fmt.Sprintf("projects/columns/%v/cards", columnID)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	cards := []*ProjectCard{}
-	resp, err := s.client.Do(ctx, req, &cards)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return cards, resp, nil
-}
-
-// GetProjectCard gets a card in a column of a GitHub Project.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/cards/#get-a-project-card
-func (s *ProjectsService) GetProjectCard(ctx context.Context, columnID int) (*ProjectCard, *Response, error) {
-	u := fmt.Sprintf("projects/columns/cards/%v", columnID)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	card := &ProjectCard{}
-	resp, err := s.client.Do(ctx, req, card)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return card, resp, nil
-}
-
-// ProjectCardOptions specifies the parameters to the
-// ProjectsService.CreateProjectCard and
-// ProjectsService.UpdateProjectCard methods.
-type ProjectCardOptions struct {
-	// The note of the card. Note and ContentID are mutually exclusive.
-	Note string `json:"note,omitempty"`
-	// The ID (not Number) of the Issue or Pull Request to associate with this card.
-	// Note and ContentID are mutually exclusive.
-	ContentID int `json:"content_id,omitempty"`
-	// The type of content to associate with this card. Possible values are: "Issue", "PullRequest".
-	ContentType string `json:"content_type,omitempty"`
-}
-
-// CreateProjectCard creates a card in the specified column of a GitHub Project.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/cards/#create-a-project-card
-func (s *ProjectsService) CreateProjectCard(ctx context.Context, columnID int, opt *ProjectCardOptions) (*ProjectCard, *Response, error) {
-	u := fmt.Sprintf("projects/columns/%v/cards", columnID)
-	req, err := s.client.NewRequest("POST", u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	card := &ProjectCard{}
-	resp, err := s.client.Do(ctx, req, card)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return card, resp, nil
-}
-
-// UpdateProjectCard updates a card of a GitHub Project.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/cards/#update-a-project-card
-func (s *ProjectsService) UpdateProjectCard(ctx context.Context, cardID int, opt *ProjectCardOptions) (*ProjectCard, *Response, error) {
-	u := fmt.Sprintf("projects/columns/cards/%v", cardID)
-	req, err := s.client.NewRequest("PATCH", u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	card := &ProjectCard{}
-	resp, err := s.client.Do(ctx, req, card)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return card, resp, nil
-}
-
-// DeleteProjectCard deletes a card from a GitHub Project.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/cards/#delete-a-project-card
-func (s *ProjectsService) DeleteProjectCard(ctx context.Context, cardID int) (*Response, error) {
-	u := fmt.Sprintf("projects/columns/cards/%v", cardID)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// ProjectCardMoveOptions specifies the parameters to the
-// ProjectsService.MoveProjectCard method.
-type ProjectCardMoveOptions struct {
-	// Position can be one of "top", "bottom", or "after:<card-id>", where
-	// <card-id> is the ID of a card in the same project.
-	Position string `json:"position"`
-	// ColumnID is the ID of a column in the same project. Note that ColumnID
-	// is required when using Position "after:<card-id>" when that card is in
-	// another column; otherwise it is optional.
-	ColumnID int `json:"column_id,omitempty"`
-}
-
-// MoveProjectCard moves a card within a GitHub Project.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/cards/#move-a-project-card
-func (s *ProjectsService) MoveProjectCard(ctx context.Context, cardID int, opt *ProjectCardMoveOptions) (*Response, error) {
-	u := fmt.Sprintf("projects/columns/cards/%v/moves", cardID)
-	req, err := s.client.NewRequest("POST", u, opt)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/pulls.go b/vendor/github.com/google/go-github/github/pulls.go
deleted file mode 100644
index b5a611b0be..0000000000
--- a/vendor/github.com/google/go-github/github/pulls.go
+++ /dev/null
@@ -1,353 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"time"
-)
-
-// PullRequestsService handles communication with the pull request related
-// methods of the GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/
-type PullRequestsService service
-
-// PullRequest represents a GitHub pull request on a repository.
-type PullRequest struct {
-	ID                  *int       `json:"id,omitempty"`
-	Number              *int       `json:"number,omitempty"`
-	State               *string    `json:"state,omitempty"`
-	Title               *string    `json:"title,omitempty"`
-	Body                *string    `json:"body,omitempty"`
-	CreatedAt           *time.Time `json:"created_at,omitempty"`
-	UpdatedAt           *time.Time `json:"updated_at,omitempty"`
-	ClosedAt            *time.Time `json:"closed_at,omitempty"`
-	MergedAt            *time.Time `json:"merged_at,omitempty"`
-	User                *User      `json:"user,omitempty"`
-	Merged              *bool      `json:"merged,omitempty"`
-	Mergeable           *bool      `json:"mergeable,omitempty"`
-	MergedBy            *User      `json:"merged_by,omitempty"`
-	MergeCommitSHA      *string    `json:"merge_commit_sha,omitempty"`
-	Comments            *int       `json:"comments,omitempty"`
-	Commits             *int       `json:"commits,omitempty"`
-	Additions           *int       `json:"additions,omitempty"`
-	Deletions           *int       `json:"deletions,omitempty"`
-	ChangedFiles        *int       `json:"changed_files,omitempty"`
-	URL                 *string    `json:"url,omitempty"`
-	HTMLURL             *string    `json:"html_url,omitempty"`
-	IssueURL            *string    `json:"issue_url,omitempty"`
-	StatusesURL         *string    `json:"statuses_url,omitempty"`
-	DiffURL             *string    `json:"diff_url,omitempty"`
-	PatchURL            *string    `json:"patch_url,omitempty"`
-	ReviewCommentsURL   *string    `json:"review_comments_url,omitempty"`
-	ReviewCommentURL    *string    `json:"review_comment_url,omitempty"`
-	Assignee            *User      `json:"assignee,omitempty"`
-	Assignees           []*User    `json:"assignees,omitempty"`
-	Milestone           *Milestone `json:"milestone,omitempty"`
-	MaintainerCanModify *bool      `json:"maintainer_can_modify,omitempty"`
-
-	Head *PullRequestBranch `json:"head,omitempty"`
-	Base *PullRequestBranch `json:"base,omitempty"`
-}
-
-func (p PullRequest) String() string {
-	return Stringify(p)
-}
-
-// PullRequestBranch represents a base or head branch in a GitHub pull request.
-type PullRequestBranch struct {
-	Label *string     `json:"label,omitempty"`
-	Ref   *string     `json:"ref,omitempty"`
-	SHA   *string     `json:"sha,omitempty"`
-	Repo  *Repository `json:"repo,omitempty"`
-	User  *User       `json:"user,omitempty"`
-}
-
-// PullRequestListOptions specifies the optional parameters to the
-// PullRequestsService.List method.
-type PullRequestListOptions struct {
-	// State filters pull requests based on their state. Possible values are:
-	// open, closed. Default is "open".
-	State string `url:"state,omitempty"`
-
-	// Head filters pull requests by head user and branch name in the format of:
-	// "user:ref-name".
-	Head string `url:"head,omitempty"`
-
-	// Base filters pull requests by base branch name.
-	Base string `url:"base,omitempty"`
-
-	// Sort specifies how to sort pull requests. Possible values are: created,
-	// updated, popularity, long-running. Default is "created".
-	Sort string `url:"sort,omitempty"`
-
-	// Direction in which to sort pull requests. Possible values are: asc, desc.
-	// If Sort is "created" or not specified, Default is "desc", otherwise Default
-	// is "asc"
-	Direction string `url:"direction,omitempty"`
-
-	ListOptions
-}
-
-// List the pull requests for the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/#list-pull-requests
-func (s *PullRequestsService) List(ctx context.Context, owner string, repo string, opt *PullRequestListOptions) ([]*PullRequest, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var pulls []*PullRequest
-	resp, err := s.client.Do(ctx, req, &pulls)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return pulls, resp, nil
-}
-
-// Get a single pull request.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/#get-a-single-pull-request
-func (s *PullRequestsService) Get(ctx context.Context, owner string, repo string, number int) (*PullRequest, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d", owner, repo, number)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	pull := new(PullRequest)
-	resp, err := s.client.Do(ctx, req, pull)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return pull, resp, nil
-}
-
-// GetRaw gets raw (diff or patch) format of a pull request.
-func (s *PullRequestsService) GetRaw(ctx context.Context, owner string, repo string, number int, opt RawOptions) (string, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d", owner, repo, number)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return "", nil, err
-	}
-
-	switch opt.Type {
-	case Diff:
-		req.Header.Set("Accept", mediaTypeV3Diff)
-	case Patch:
-		req.Header.Set("Accept", mediaTypeV3Patch)
-	default:
-		return "", nil, fmt.Errorf("unsupported raw type %d", opt.Type)
-	}
-
-	ret := new(bytes.Buffer)
-	resp, err := s.client.Do(ctx, req, ret)
-	if err != nil {
-		return "", resp, err
-	}
-
-	return ret.String(), resp, nil
-}
-
-// NewPullRequest represents a new pull request to be created.
-type NewPullRequest struct {
-	Title               *string `json:"title,omitempty"`
-	Head                *string `json:"head,omitempty"`
-	Base                *string `json:"base,omitempty"`
-	Body                *string `json:"body,omitempty"`
-	Issue               *int    `json:"issue,omitempty"`
-	MaintainerCanModify *bool   `json:"maintainer_can_modify,omitempty"`
-}
-
-// Create a new pull request on the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/#create-a-pull-request
-func (s *PullRequestsService) Create(ctx context.Context, owner string, repo string, pull *NewPullRequest) (*PullRequest, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls", owner, repo)
-	req, err := s.client.NewRequest("POST", u, pull)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	p := new(PullRequest)
-	resp, err := s.client.Do(ctx, req, p)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return p, resp, nil
-}
-
-type pullRequestUpdate struct {
-	Title               *string `json:"title,omitempty"`
-	Body                *string `json:"body,omitempty"`
-	State               *string `json:"state,omitempty"`
-	Base                *string `json:"base,omitempty"`
-	MaintainerCanModify *bool   `json:"maintainer_can_modify,omitempty"`
-}
-
-// Edit a pull request.
-// pull must not be nil.
-//
-// The following fields are editable: Title, Body, State, Base.Ref and MaintainerCanModify.
-// Base.Ref updates the base branch of the pull request.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/#update-a-pull-request
-func (s *PullRequestsService) Edit(ctx context.Context, owner string, repo string, number int, pull *PullRequest) (*PullRequest, *Response, error) {
-	if pull == nil {
-		return nil, nil, fmt.Errorf("pull must be provided")
-	}
-
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d", owner, repo, number)
-
-	update := &pullRequestUpdate{
-		Title:               pull.Title,
-		Body:                pull.Body,
-		State:               pull.State,
-		MaintainerCanModify: pull.MaintainerCanModify,
-	}
-	if pull.Base != nil {
-		update.Base = pull.Base.Ref
-	}
-
-	req, err := s.client.NewRequest("PATCH", u, update)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	p := new(PullRequest)
-	resp, err := s.client.Do(ctx, req, p)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return p, resp, nil
-}
-
-// ListCommits lists the commits in a pull request.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/#list-commits-on-a-pull-request
-func (s *PullRequestsService) ListCommits(ctx context.Context, owner string, repo string, number int, opt *ListOptions) ([]*RepositoryCommit, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/commits", owner, repo, number)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var commits []*RepositoryCommit
-	resp, err := s.client.Do(ctx, req, &commits)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return commits, resp, nil
-}
-
-// ListFiles lists the files in a pull request.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/#list-pull-requests-files
-func (s *PullRequestsService) ListFiles(ctx context.Context, owner string, repo string, number int, opt *ListOptions) ([]*CommitFile, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/files", owner, repo, number)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var commitFiles []*CommitFile
-	resp, err := s.client.Do(ctx, req, &commitFiles)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return commitFiles, resp, nil
-}
-
-// IsMerged checks if a pull request has been merged.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/#get-if-a-pull-request-has-been-merged
-func (s *PullRequestsService) IsMerged(ctx context.Context, owner string, repo string, number int) (bool, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/merge", owner, repo, number)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return false, nil, err
-	}
-
-	resp, err := s.client.Do(ctx, req, nil)
-	merged, err := parseBoolResponse(err)
-	return merged, resp, err
-}
-
-// PullRequestMergeResult represents the result of merging a pull request.
-type PullRequestMergeResult struct {
-	SHA     *string `json:"sha,omitempty"`
-	Merged  *bool   `json:"merged,omitempty"`
-	Message *string `json:"message,omitempty"`
-}
-
-// PullRequestOptions lets you define how a pull request will be merged.
-type PullRequestOptions struct {
-	CommitTitle string // Extra detail to append to automatic commit message. (Optional.)
-	SHA         string // SHA that pull request head must match to allow merge. (Optional.)
-
-	// The merge method to use. Possible values include: "merge", "squash", and "rebase" with the default being merge. (Optional.)
-	MergeMethod string
-}
-
-type pullRequestMergeRequest struct {
-	CommitMessage string `json:"commit_message"`
-	CommitTitle   string `json:"commit_title,omitempty"`
-	MergeMethod   string `json:"merge_method,omitempty"`
-	SHA           string `json:"sha,omitempty"`
-}
-
-// Merge a pull request (Merge Button™).
-// commitMessage is the title for the automatic commit message.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-buttontrade
-func (s *PullRequestsService) Merge(ctx context.Context, owner string, repo string, number int, commitMessage string, options *PullRequestOptions) (*PullRequestMergeResult, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/merge", owner, repo, number)
-
-	pullRequestBody := &pullRequestMergeRequest{CommitMessage: commitMessage}
-	if options != nil {
-		pullRequestBody.CommitTitle = options.CommitTitle
-		pullRequestBody.MergeMethod = options.MergeMethod
-		pullRequestBody.SHA = options.SHA
-	}
-	req, err := s.client.NewRequest("PUT", u, pullRequestBody)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	mergeResult := new(PullRequestMergeResult)
-	resp, err := s.client.Do(ctx, req, mergeResult)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return mergeResult, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/pulls_comments.go b/vendor/github.com/google/go-github/github/pulls_comments.go
deleted file mode 100644
index bc0bc2d4a2..0000000000
--- a/vendor/github.com/google/go-github/github/pulls_comments.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// PullRequestComment represents a comment left on a pull request.
-type PullRequestComment struct {
-	ID               *int       `json:"id,omitempty"`
-	InReplyTo        *int       `json:"in_reply_to,omitempty"`
-	Body             *string    `json:"body,omitempty"`
-	Path             *string    `json:"path,omitempty"`
-	DiffHunk         *string    `json:"diff_hunk,omitempty"`
-	Position         *int       `json:"position,omitempty"`
-	OriginalPosition *int       `json:"original_position,omitempty"`
-	CommitID         *string    `json:"commit_id,omitempty"`
-	OriginalCommitID *string    `json:"original_commit_id,omitempty"`
-	User             *User      `json:"user,omitempty"`
-	Reactions        *Reactions `json:"reactions,omitempty"`
-	CreatedAt        *time.Time `json:"created_at,omitempty"`
-	UpdatedAt        *time.Time `json:"updated_at,omitempty"`
-	URL              *string    `json:"url,omitempty"`
-	HTMLURL          *string    `json:"html_url,omitempty"`
-	PullRequestURL   *string    `json:"pull_request_url,omitempty"`
-}
-
-func (p PullRequestComment) String() string {
-	return Stringify(p)
-}
-
-// PullRequestListCommentsOptions specifies the optional parameters to the
-// PullRequestsService.ListComments method.
-type PullRequestListCommentsOptions struct {
-	// Sort specifies how to sort comments. Possible values are: created, updated.
-	Sort string `url:"sort,omitempty"`
-
-	// Direction in which to sort comments. Possible values are: asc, desc.
-	Direction string `url:"direction,omitempty"`
-
-	// Since filters comments by time.
-	Since time.Time `url:"since,omitempty"`
-
-	ListOptions
-}
-
-// ListComments lists all comments on the specified pull request. Specifying a
-// pull request number of 0 will return all comments on all pull requests for
-// the repository.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/comments/#list-comments-on-a-pull-request
-func (s *PullRequestsService) ListComments(ctx context.Context, owner string, repo string, number int, opt *PullRequestListCommentsOptions) ([]*PullRequestComment, *Response, error) {
-	var u string
-	if number == 0 {
-		u = fmt.Sprintf("repos/%v/%v/pulls/comments", owner, repo)
-	} else {
-		u = fmt.Sprintf("repos/%v/%v/pulls/%d/comments", owner, repo, number)
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	var comments []*PullRequestComment
-	resp, err := s.client.Do(ctx, req, &comments)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return comments, resp, nil
-}
-
-// GetComment fetches the specified pull request comment.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/comments/#get-a-single-comment
-func (s *PullRequestsService) GetComment(ctx context.Context, owner string, repo string, number int) (*PullRequestComment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/comments/%d", owner, repo, number)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	comment := new(PullRequestComment)
-	resp, err := s.client.Do(ctx, req, comment)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return comment, resp, nil
-}
-
-// CreateComment creates a new comment on the specified pull request.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/comments/#create-a-comment
-func (s *PullRequestsService) CreateComment(ctx context.Context, owner string, repo string, number int, comment *PullRequestComment) (*PullRequestComment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/comments", owner, repo, number)
-	req, err := s.client.NewRequest("POST", u, comment)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	c := new(PullRequestComment)
-	resp, err := s.client.Do(ctx, req, c)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return c, resp, nil
-}
-
-// EditComment updates a pull request comment.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/comments/#edit-a-comment
-func (s *PullRequestsService) EditComment(ctx context.Context, owner string, repo string, number int, comment *PullRequestComment) (*PullRequestComment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/comments/%d", owner, repo, number)
-	req, err := s.client.NewRequest("PATCH", u, comment)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	c := new(PullRequestComment)
-	resp, err := s.client.Do(ctx, req, c)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return c, resp, nil
-}
-
-// DeleteComment deletes a pull request comment.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/comments/#delete-a-comment
-func (s *PullRequestsService) DeleteComment(ctx context.Context, owner string, repo string, number int) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/comments/%d", owner, repo, number)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/pulls_reviewers.go b/vendor/github.com/google/go-github/github/pulls_reviewers.go
deleted file mode 100644
index bd94a6599b..0000000000
--- a/vendor/github.com/google/go-github/github/pulls_reviewers.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2017 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// RequestReviewers creates a review request for the provided GitHub users for the specified pull request.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/review_requests/#create-a-review-request
-func (s *PullRequestsService) RequestReviewers(ctx context.Context, owner, repo string, number int, logins []string) (*PullRequest, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/pulls/%d/requested_reviewers", owner, repo, number)
-
-	reviewers := struct {
-		Reviewers []string `json:"reviewers,omitempty"`
-	}{
-		Reviewers: logins,
-	}
-	req, err := s.client.NewRequest("POST", u, &reviewers)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r := new(PullRequest)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, nil
-}
-
-// ListReviewers lists users whose reviews have been requested on the specified pull request.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/review_requests/#list-review-requests
-func (s *PullRequestsService) ListReviewers(ctx context.Context, owner, repo string, number int, opt *ListOptions) ([]*User, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/requested_reviewers", owner, repo, number)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var users []*User
-	resp, err := s.client.Do(ctx, req, &users)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return users, resp, nil
-}
-
-// RemoveReviewers removes the review request for the provided GitHub users for the specified pull request.
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/review_requests/#delete-a-review-request
-func (s *PullRequestsService) RemoveReviewers(ctx context.Context, owner, repo string, number int, logins []string) (*Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/pulls/%d/requested_reviewers", owner, repo, number)
-
-	reviewers := struct {
-		Reviewers []string `json:"reviewers,omitempty"`
-	}{
-		Reviewers: logins,
-	}
-	req, err := s.client.NewRequest("DELETE", u, &reviewers)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, reviewers)
-}
diff --git a/vendor/github.com/google/go-github/github/pulls_reviews.go b/vendor/github.com/google/go-github/github/pulls_reviews.go
deleted file mode 100644
index c071338dab..0000000000
--- a/vendor/github.com/google/go-github/github/pulls_reviews.go
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// PullRequestReview represents a review of a pull request.
-type PullRequestReview struct {
-	ID             *int       `json:"id,omitempty"`
-	User           *User      `json:"user,omitempty"`
-	Body           *string    `json:"body,omitempty"`
-	SubmittedAt    *time.Time `json:"submitted_at,omitempty"`
-	CommitID       *string    `json:"commit_id,omitempty"`
-	HTMLURL        *string    `json:"html_url,omitempty"`
-	PullRequestURL *string    `json:"pull_request_url,omitempty"`
-	State          *string    `json:"state,omitempty"`
-}
-
-func (p PullRequestReview) String() string {
-	return Stringify(p)
-}
-
-// DraftReviewComment represents a comment part of the review.
-type DraftReviewComment struct {
-	Path     *string `json:"path,omitempty"`
-	Position *int    `json:"position,omitempty"`
-	Body     *string `json:"body,omitempty"`
-}
-
-func (c DraftReviewComment) String() string {
-	return Stringify(c)
-}
-
-// PullRequestReviewRequest represents a request to create a review.
-type PullRequestReviewRequest struct {
-	Body     *string               `json:"body,omitempty"`
-	Event    *string               `json:"event,omitempty"`
-	Comments []*DraftReviewComment `json:"comments,omitempty"`
-}
-
-func (r PullRequestReviewRequest) String() string {
-	return Stringify(r)
-}
-
-// PullRequestReviewDismissalRequest represents a request to dismiss a review.
-type PullRequestReviewDismissalRequest struct {
-	Message *string `json:"message,omitempty"`
-}
-
-func (r PullRequestReviewDismissalRequest) String() string {
-	return Stringify(r)
-}
-
-// ListReviews lists all reviews on the specified pull request.
-//
-// TODO: Follow up with GitHub support about an issue with this method's
-// returned error format and remove this comment once it's fixed.
-// Read more about it here - https://github.com/google/go-github/issues/540
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/reviews/#list-reviews-on-a-pull-request
-func (s *PullRequestsService) ListReviews(ctx context.Context, owner, repo string, number int, opt *ListOptions) ([]*PullRequestReview, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/reviews", owner, repo, number)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var reviews []*PullRequestReview
-	resp, err := s.client.Do(ctx, req, &reviews)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return reviews, resp, nil
-}
-
-// GetReview fetches the specified pull request review.
-//
-// TODO: Follow up with GitHub support about an issue with this method's
-// returned error format and remove this comment once it's fixed.
-// Read more about it here - https://github.com/google/go-github/issues/540
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/reviews/#get-a-single-review
-func (s *PullRequestsService) GetReview(ctx context.Context, owner, repo string, number, reviewID int) (*PullRequestReview, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/reviews/%d", owner, repo, number, reviewID)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	review := new(PullRequestReview)
-	resp, err := s.client.Do(ctx, req, review)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return review, resp, nil
-}
-
-// DeletePendingReview deletes the specified pull request pending review.
-//
-// TODO: Follow up with GitHub support about an issue with this method's
-// returned error format and remove this comment once it's fixed.
-// Read more about it here - https://github.com/google/go-github/issues/540
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/reviews/#delete-a-pending-review
-func (s *PullRequestsService) DeletePendingReview(ctx context.Context, owner, repo string, number, reviewID int) (*PullRequestReview, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/reviews/%d", owner, repo, number, reviewID)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	review := new(PullRequestReview)
-	resp, err := s.client.Do(ctx, req, review)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return review, resp, nil
-}
-
-// ListReviewComments lists all the comments for the specified review.
-//
-// TODO: Follow up with GitHub support about an issue with this method's
-// returned error format and remove this comment once it's fixed.
-// Read more about it here - https://github.com/google/go-github/issues/540
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/reviews/#get-comments-for-a-single-review
-func (s *PullRequestsService) ListReviewComments(ctx context.Context, owner, repo string, number, reviewID int, opt *ListOptions) ([]*PullRequestComment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/reviews/%d/comments", owner, repo, number, reviewID)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var comments []*PullRequestComment
-	resp, err := s.client.Do(ctx, req, &comments)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return comments, resp, nil
-}
-
-// CreateReview creates a new review on the specified pull request.
-//
-// TODO: Follow up with GitHub support about an issue with this method's
-// returned error format and remove this comment once it's fixed.
-// Read more about it here - https://github.com/google/go-github/issues/540
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/reviews/#create-a-pull-request-review
-func (s *PullRequestsService) CreateReview(ctx context.Context, owner, repo string, number int, review *PullRequestReviewRequest) (*PullRequestReview, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/reviews", owner, repo, number)
-
-	req, err := s.client.NewRequest("POST", u, review)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r := new(PullRequestReview)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, nil
-}
-
-// SubmitReview submits a specified review on the specified pull request.
-//
-// TODO: Follow up with GitHub support about an issue with this method's
-// returned error format and remove this comment once it's fixed.
-// Read more about it here - https://github.com/google/go-github/issues/540
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/reviews/#submit-a-pull-request-review
-func (s *PullRequestsService) SubmitReview(ctx context.Context, owner, repo string, number, reviewID int, review *PullRequestReviewRequest) (*PullRequestReview, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/reviews/%d/events", owner, repo, number, reviewID)
-
-	req, err := s.client.NewRequest("POST", u, review)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r := new(PullRequestReview)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, nil
-}
-
-// DismissReview dismisses a specified review on the specified pull request.
-//
-// TODO: Follow up with GitHub support about an issue with this method's
-// returned error format and remove this comment once it's fixed.
-// Read more about it here - https://github.com/google/go-github/issues/540
-//
-// GitHub API docs: https://developer.github.com/v3/pulls/reviews/#dismiss-a-pull-request-review
-func (s *PullRequestsService) DismissReview(ctx context.Context, owner, repo string, number, reviewID int, review *PullRequestReviewDismissalRequest) (*PullRequestReview, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/%d/reviews/%d/dismissals", owner, repo, number, reviewID)
-
-	req, err := s.client.NewRequest("PUT", u, review)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r := new(PullRequestReview)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/reactions.go b/vendor/github.com/google/go-github/github/reactions.go
deleted file mode 100644
index 739413d716..0000000000
--- a/vendor/github.com/google/go-github/github/reactions.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// ReactionsService provides access to the reactions-related functions in the
-// GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/reactions/
-type ReactionsService service
-
-// Reaction represents a GitHub reaction.
-type Reaction struct {
-	// ID is the Reaction ID.
-	ID   *int  `json:"id,omitempty"`
-	User *User `json:"user,omitempty"`
-	// Content is the type of reaction.
-	// Possible values are:
-	//     "+1", "-1", "laugh", "confused", "heart", "hooray".
-	Content *string `json:"content,omitempty"`
-}
-
-// Reactions represents a summary of GitHub reactions.
-type Reactions struct {
-	TotalCount *int    `json:"total_count,omitempty"`
-	PlusOne    *int    `json:"+1,omitempty"`
-	MinusOne   *int    `json:"-1,omitempty"`
-	Laugh      *int    `json:"laugh,omitempty"`
-	Confused   *int    `json:"confused,omitempty"`
-	Heart      *int    `json:"heart,omitempty"`
-	Hooray     *int    `json:"hooray,omitempty"`
-	URL        *string `json:"url,omitempty"`
-}
-
-func (r Reaction) String() string {
-	return Stringify(r)
-}
-
-// ListCommentReactions lists the reactions for a commit comment.
-//
-// GitHub API docs: https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment
-func (s *ReactionsService) ListCommentReactions(ctx context.Context, owner, repo string, id int, opt *ListOptions) ([]*Reaction, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/comments/%v/reactions", owner, repo, id)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	var m []*Reaction
-	resp, err := s.client.Do(ctx, req, &m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// CreateCommentReaction creates a reaction for a commit comment.
-// Note that if you have already created a reaction of type content, the
-// previously created reaction will be returned with Status: 200 OK.
-//
-// GitHub API docs: https://developer.github.com/v3/reactions/#create-reaction-for-a-commit-comment
-func (s ReactionsService) CreateCommentReaction(ctx context.Context, owner, repo string, id int, content string) (*Reaction, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/comments/%v/reactions", owner, repo, id)
-
-	body := &Reaction{Content: String(content)}
-	req, err := s.client.NewRequest("POST", u, body)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	m := &Reaction{}
-	resp, err := s.client.Do(ctx, req, m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// ListIssueReactions lists the reactions for an issue.
-//
-// GitHub API docs: https://developer.github.com/v3/reactions/#list-reactions-for-an-issue
-func (s *ReactionsService) ListIssueReactions(ctx context.Context, owner, repo string, number int, opt *ListOptions) ([]*Reaction, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%v/reactions", owner, repo, number)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	var m []*Reaction
-	resp, err := s.client.Do(ctx, req, &m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// CreateIssueReaction creates a reaction for an issue.
-// Note that if you have already created a reaction of type content, the
-// previously created reaction will be returned with Status: 200 OK.
-//
-// GitHub API docs: https://developer.github.com/v3/reactions/#create-reaction-for-an-issue
-func (s ReactionsService) CreateIssueReaction(ctx context.Context, owner, repo string, number int, content string) (*Reaction, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/%v/reactions", owner, repo, number)
-
-	body := &Reaction{Content: String(content)}
-	req, err := s.client.NewRequest("POST", u, body)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	m := &Reaction{}
-	resp, err := s.client.Do(ctx, req, m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// ListIssueCommentReactions lists the reactions for an issue comment.
-//
-// GitHub API docs: https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment
-func (s *ReactionsService) ListIssueCommentReactions(ctx context.Context, owner, repo string, id int, opt *ListOptions) ([]*Reaction, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/comments/%v/reactions", owner, repo, id)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	var m []*Reaction
-	resp, err := s.client.Do(ctx, req, &m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// CreateIssueCommentReaction creates a reaction for an issue comment.
-// Note that if you have already created a reaction of type content, the
-// previously created reaction will be returned with Status: 200 OK.
-//
-// GitHub API docs: https://developer.github.com/v3/reactions/#create-reaction-for-an-issue-comment
-func (s ReactionsService) CreateIssueCommentReaction(ctx context.Context, owner, repo string, id int, content string) (*Reaction, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/issues/comments/%v/reactions", owner, repo, id)
-
-	body := &Reaction{Content: String(content)}
-	req, err := s.client.NewRequest("POST", u, body)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	m := &Reaction{}
-	resp, err := s.client.Do(ctx, req, m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// ListPullRequestCommentReactions lists the reactions for a pull request review comment.
-//
-// GitHub API docs: https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment
-func (s *ReactionsService) ListPullRequestCommentReactions(ctx context.Context, owner, repo string, id int, opt *ListOptions) ([]*Reaction, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/comments/%v/reactions", owner, repo, id)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	var m []*Reaction
-	resp, err := s.client.Do(ctx, req, &m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// CreatePullRequestCommentReaction creates a reaction for a pull request review comment.
-// Note that if you have already created a reaction of type content, the
-// previously created reaction will be returned with Status: 200 OK.
-//
-// GitHub API docs: https://developer.github.com/v3/reactions/#create-reaction-for-an-issue-comment
-func (s ReactionsService) CreatePullRequestCommentReaction(ctx context.Context, owner, repo string, id int, content string) (*Reaction, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pulls/comments/%v/reactions", owner, repo, id)
-
-	body := &Reaction{Content: String(content)}
-	req, err := s.client.NewRequest("POST", u, body)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	m := &Reaction{}
-	resp, err := s.client.Do(ctx, req, m)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return m, resp, nil
-}
-
-// DeleteReaction deletes a reaction.
-//
-// GitHub API docs: https://developer.github.com/v3/reaction/reactions/#delete-a-reaction-archive
-func (s *ReactionsService) DeleteReaction(ctx context.Context, id int) (*Response, error) {
-	u := fmt.Sprintf("reactions/%v", id)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/repos.go b/vendor/github.com/google/go-github/github/repos.go
deleted file mode 100644
index 10e46f42d9..0000000000
--- a/vendor/github.com/google/go-github/github/repos.go
+++ /dev/null
@@ -1,1023 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"strings"
-)
-
-// RepositoriesService handles communication with the repository related
-// methods of the GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/
-type RepositoriesService service
-
-// Repository represents a GitHub repository.
-type Repository struct {
-	ID               *int             `json:"id,omitempty"`
-	Owner            *User            `json:"owner,omitempty"`
-	Name             *string          `json:"name,omitempty"`
-	FullName         *string          `json:"full_name,omitempty"`
-	Description      *string          `json:"description,omitempty"`
-	Homepage         *string          `json:"homepage,omitempty"`
-	CodeOfConduct    *CodeOfConduct   `json:"code_of_conduct,omitempty"`
-	DefaultBranch    *string          `json:"default_branch,omitempty"`
-	MasterBranch     *string          `json:"master_branch,omitempty"`
-	CreatedAt        *Timestamp       `json:"created_at,omitempty"`
-	PushedAt         *Timestamp       `json:"pushed_at,omitempty"`
-	UpdatedAt        *Timestamp       `json:"updated_at,omitempty"`
-	HTMLURL          *string          `json:"html_url,omitempty"`
-	CloneURL         *string          `json:"clone_url,omitempty"`
-	GitURL           *string          `json:"git_url,omitempty"`
-	MirrorURL        *string          `json:"mirror_url,omitempty"`
-	SSHURL           *string          `json:"ssh_url,omitempty"`
-	SVNURL           *string          `json:"svn_url,omitempty"`
-	Language         *string          `json:"language,omitempty"`
-	Fork             *bool            `json:"fork"`
-	ForksCount       *int             `json:"forks_count,omitempty"`
-	NetworkCount     *int             `json:"network_count,omitempty"`
-	OpenIssuesCount  *int             `json:"open_issues_count,omitempty"`
-	StargazersCount  *int             `json:"stargazers_count,omitempty"`
-	SubscribersCount *int             `json:"subscribers_count,omitempty"`
-	WatchersCount    *int             `json:"watchers_count,omitempty"`
-	Size             *int             `json:"size,omitempty"`
-	AutoInit         *bool            `json:"auto_init,omitempty"`
-	Parent           *Repository      `json:"parent,omitempty"`
-	Source           *Repository      `json:"source,omitempty"`
-	Organization     *Organization    `json:"organization,omitempty"`
-	Permissions      *map[string]bool `json:"permissions,omitempty"`
-	AllowRebaseMerge *bool            `json:"allow_rebase_merge,omitempty"`
-	AllowSquashMerge *bool            `json:"allow_squash_merge,omitempty"`
-	AllowMergeCommit *bool            `json:"allow_merge_commit,omitempty"`
-	Topics           []string         `json:"topics,omitempty"`
-
-	// Only provided when using RepositoriesService.Get while in preview
-	License *License `json:"license,omitempty"`
-
-	// Additional mutable fields when creating and editing a repository
-	Private           *bool   `json:"private"`
-	HasIssues         *bool   `json:"has_issues"`
-	HasWiki           *bool   `json:"has_wiki"`
-	HasPages          *bool   `json:"has_pages"`
-	HasDownloads      *bool   `json:"has_downloads"`
-	LicenseTemplate   *string `json:"license_template,omitempty"`
-	GitignoreTemplate *string `json:"gitignore_template,omitempty"`
-
-	// Creating an organization repository. Required for non-owners.
-	TeamID *int `json:"team_id"`
-
-	// API URLs
-	URL              *string `json:"url,omitempty"`
-	ArchiveURL       *string `json:"archive_url,omitempty"`
-	AssigneesURL     *string `json:"assignees_url,omitempty"`
-	BlobsURL         *string `json:"blobs_url,omitempty"`
-	BranchesURL      *string `json:"branches_url,omitempty"`
-	CollaboratorsURL *string `json:"collaborators_url,omitempty"`
-	CommentsURL      *string `json:"comments_url,omitempty"`
-	CommitsURL       *string `json:"commits_url,omitempty"`
-	CompareURL       *string `json:"compare_url,omitempty"`
-	ContentsURL      *string `json:"contents_url,omitempty"`
-	ContributorsURL  *string `json:"contributors_url,omitempty"`
-	DeploymentsURL   *string `json:"deployments_url,omitempty"`
-	DownloadsURL     *string `json:"downloads_url,omitempty"`
-	EventsURL        *string `json:"events_url,omitempty"`
-	ForksURL         *string `json:"forks_url,omitempty"`
-	GitCommitsURL    *string `json:"git_commits_url,omitempty"`
-	GitRefsURL       *string `json:"git_refs_url,omitempty"`
-	GitTagsURL       *string `json:"git_tags_url,omitempty"`
-	HooksURL         *string `json:"hooks_url,omitempty"`
-	IssueCommentURL  *string `json:"issue_comment_url,omitempty"`
-	IssueEventsURL   *string `json:"issue_events_url,omitempty"`
-	IssuesURL        *string `json:"issues_url,omitempty"`
-	KeysURL          *string `json:"keys_url,omitempty"`
-	LabelsURL        *string `json:"labels_url,omitempty"`
-	LanguagesURL     *string `json:"languages_url,omitempty"`
-	MergesURL        *string `json:"merges_url,omitempty"`
-	MilestonesURL    *string `json:"milestones_url,omitempty"`
-	NotificationsURL *string `json:"notifications_url,omitempty"`
-	PullsURL         *string `json:"pulls_url,omitempty"`
-	ReleasesURL      *string `json:"releases_url,omitempty"`
-	StargazersURL    *string `json:"stargazers_url,omitempty"`
-	StatusesURL      *string `json:"statuses_url,omitempty"`
-	SubscribersURL   *string `json:"subscribers_url,omitempty"`
-	SubscriptionURL  *string `json:"subscription_url,omitempty"`
-	TagsURL          *string `json:"tags_url,omitempty"`
-	TreesURL         *string `json:"trees_url,omitempty"`
-	TeamsURL         *string `json:"teams_url,omitempty"`
-
-	// TextMatches is only populated from search results that request text matches
-	// See: search.go and https://developer.github.com/v3/search/#text-match-metadata
-	TextMatches []TextMatch `json:"text_matches,omitempty"`
-}
-
-func (r Repository) String() string {
-	return Stringify(r)
-}
-
-// RepositoryListOptions specifies the optional parameters to the
-// RepositoriesService.List method.
-type RepositoryListOptions struct {
-	// Visibility of repositories to list. Can be one of all, public, or private.
-	// Default: all
-	Visibility string `url:"visibility,omitempty"`
-
-	// List repos of given affiliation[s].
-	// Comma-separated list of values. Can include:
-	// * owner: Repositories that are owned by the authenticated user.
-	// * collaborator: Repositories that the user has been added to as a
-	//   collaborator.
-	// * organization_member: Repositories that the user has access to through
-	//   being a member of an organization. This includes every repository on
-	//   every team that the user is on.
-	// Default: owner,collaborator,organization_member
-	Affiliation string `url:"affiliation,omitempty"`
-
-	// Type of repositories to list.
-	// Can be one of all, owner, public, private, member. Default: all
-	// Will cause a 422 error if used in the same request as visibility or
-	// affiliation.
-	Type string `url:"type,omitempty"`
-
-	// How to sort the repository list. Can be one of created, updated, pushed,
-	// full_name. Default: full_name
-	Sort string `url:"sort,omitempty"`
-
-	// Direction in which to sort repositories. Can be one of asc or desc.
-	// Default: when using full_name: asc; otherwise desc
-	Direction string `url:"direction,omitempty"`
-
-	ListOptions
-}
-
-// List the repositories for a user. Passing the empty string will list
-// repositories for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#list-user-repositories
-func (s *RepositoriesService) List(ctx context.Context, user string, opt *RepositoryListOptions) ([]*Repository, *Response, error) {
-	var u string
-	if user != "" {
-		u = fmt.Sprintf("users/%v/repos", user)
-	} else {
-		u = "user/repos"
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept headers when APIs fully launch.
-	acceptHeaders := []string{mediaTypeLicensesPreview, mediaTypeTopicsPreview}
-	req.Header.Set("Accept", strings.Join(acceptHeaders, ", "))
-
-	var repos []*Repository
-	resp, err := s.client.Do(ctx, req, &repos)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return repos, resp, nil
-}
-
-// RepositoryListByOrgOptions specifies the optional parameters to the
-// RepositoriesService.ListByOrg method.
-type RepositoryListByOrgOptions struct {
-	// Type of repositories to list. Possible values are: all, public, private,
-	// forks, sources, member. Default is "all".
-	Type string `url:"type,omitempty"`
-
-	ListOptions
-}
-
-// ListByOrg lists the repositories for an organization.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#list-organization-repositories
-func (s *RepositoriesService) ListByOrg(ctx context.Context, org string, opt *RepositoryListByOrgOptions) ([]*Repository, *Response, error) {
-	u := fmt.Sprintf("orgs/%v/repos", org)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept headers when APIs fully launch.
-	acceptHeaders := []string{mediaTypeLicensesPreview, mediaTypeTopicsPreview}
-	req.Header.Set("Accept", strings.Join(acceptHeaders, ", "))
-
-	var repos []*Repository
-	resp, err := s.client.Do(ctx, req, &repos)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return repos, resp, nil
-}
-
-// RepositoryListAllOptions specifies the optional parameters to the
-// RepositoriesService.ListAll method.
-type RepositoryListAllOptions struct {
-	// ID of the last repository seen
-	Since int `url:"since,omitempty"`
-
-	ListOptions
-}
-
-// ListAll lists all GitHub repositories in the order that they were created.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#list-all-public-repositories
-func (s *RepositoriesService) ListAll(ctx context.Context, opt *RepositoryListAllOptions) ([]*Repository, *Response, error) {
-	u, err := addOptions("repositories", opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var repos []*Repository
-	resp, err := s.client.Do(ctx, req, &repos)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return repos, resp, nil
-}
-
-// Create a new repository. If an organization is specified, the new
-// repository will be created under that org. If the empty string is
-// specified, it will be created for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#create
-func (s *RepositoriesService) Create(ctx context.Context, org string, repo *Repository) (*Repository, *Response, error) {
-	var u string
-	if org != "" {
-		u = fmt.Sprintf("orgs/%v/repos", org)
-	} else {
-		u = "user/repos"
-	}
-
-	req, err := s.client.NewRequest("POST", u, repo)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r := new(Repository)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, nil
-}
-
-// Get fetches a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#get
-func (s *RepositoriesService) Get(ctx context.Context, owner, repo string) (*Repository, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when the license support fully launches
-	// https://developer.github.com/v3/licenses/#get-a-repositorys-license
-	acceptHeaders := []string{mediaTypeLicensesPreview, mediaTypeCodesOfConductPreview, mediaTypeTopicsPreview}
-	req.Header.Set("Accept", strings.Join(acceptHeaders, ", "))
-
-	repository := new(Repository)
-	resp, err := s.client.Do(ctx, req, repository)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return repository, resp, nil
-}
-
-// GetCodeOfConduct gets the contents of a repository's code of conduct.
-//
-// GitHub API docs: https://developer.github.com/v3/codes_of_conduct/#get-the-contents-of-a-repositorys-code-of-conduct
-func (s *RepositoriesService) GetCodeOfConduct(ctx context.Context, owner, repo string) (*CodeOfConduct, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/community/code_of_conduct", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeCodesOfConductPreview)
-
-	coc := new(CodeOfConduct)
-	resp, err := s.client.Do(ctx, req, coc)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return coc, resp, nil
-}
-
-// GetByID fetches a repository.
-//
-// Note: GetByID uses the undocumented GitHub API endpoint /repositories/:id.
-func (s *RepositoriesService) GetByID(ctx context.Context, id int) (*Repository, *Response, error) {
-	u := fmt.Sprintf("repositories/%d", id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when the license support fully launches
-	// https://developer.github.com/v3/licenses/#get-a-repositorys-license
-	req.Header.Set("Accept", mediaTypeLicensesPreview)
-
-	repository := new(Repository)
-	resp, err := s.client.Do(ctx, req, repository)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return repository, resp, nil
-}
-
-// Edit updates a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#edit
-func (s *RepositoriesService) Edit(ctx context.Context, owner, repo string, repository *Repository) (*Repository, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v", owner, repo)
-	req, err := s.client.NewRequest("PATCH", u, repository)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r := new(Repository)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, nil
-}
-
-// Delete a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#delete-a-repository
-func (s *RepositoriesService) Delete(ctx context.Context, owner, repo string) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v", owner, repo)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// Contributor represents a repository contributor
-type Contributor struct {
-	Login             *string `json:"login,omitempty"`
-	ID                *int    `json:"id,omitempty"`
-	AvatarURL         *string `json:"avatar_url,omitempty"`
-	GravatarID        *string `json:"gravatar_id,omitempty"`
-	URL               *string `json:"url,omitempty"`
-	HTMLURL           *string `json:"html_url,omitempty"`
-	FollowersURL      *string `json:"followers_url,omitempty"`
-	FollowingURL      *string `json:"following_url,omitempty"`
-	GistsURL          *string `json:"gists_url,omitempty"`
-	StarredURL        *string `json:"starred_url,omitempty"`
-	SubscriptionsURL  *string `json:"subscriptions_url,omitempty"`
-	OrganizationsURL  *string `json:"organizations_url,omitempty"`
-	ReposURL          *string `json:"repos_url,omitempty"`
-	EventsURL         *string `json:"events_url,omitempty"`
-	ReceivedEventsURL *string `json:"received_events_url,omitempty"`
-	Type              *string `json:"type,omitempty"`
-	SiteAdmin         *bool   `json:"site_admin"`
-	Contributions     *int    `json:"contributions,omitempty"`
-}
-
-// ListContributorsOptions specifies the optional parameters to the
-// RepositoriesService.ListContributors method.
-type ListContributorsOptions struct {
-	// Include anonymous contributors in results or not
-	Anon string `url:"anon,omitempty"`
-
-	ListOptions
-}
-
-// ListContributors lists contributors for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#list-contributors
-func (s *RepositoriesService) ListContributors(ctx context.Context, owner string, repository string, opt *ListContributorsOptions) ([]*Contributor, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/contributors", owner, repository)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var contributor []*Contributor
-	resp, err := s.client.Do(ctx, req, &contributor)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return contributor, resp, nil
-}
-
-// ListLanguages lists languages for the specified repository. The returned map
-// specifies the languages and the number of bytes of code written in that
-// language. For example:
-//
-//     {
-//       "C": 78769,
-//       "Python": 7769
-//     }
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#list-languages
-func (s *RepositoriesService) ListLanguages(ctx context.Context, owner string, repo string) (map[string]int, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/languages", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	languages := make(map[string]int)
-	resp, err := s.client.Do(ctx, req, &languages)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return languages, resp, nil
-}
-
-// ListTeams lists the teams for the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#list-teams
-func (s *RepositoriesService) ListTeams(ctx context.Context, owner string, repo string, opt *ListOptions) ([]*Team, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/teams", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var teams []*Team
-	resp, err := s.client.Do(ctx, req, &teams)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return teams, resp, nil
-}
-
-// RepositoryTag represents a repository tag.
-type RepositoryTag struct {
-	Name       *string `json:"name,omitempty"`
-	Commit     *Commit `json:"commit,omitempty"`
-	ZipballURL *string `json:"zipball_url,omitempty"`
-	TarballURL *string `json:"tarball_url,omitempty"`
-}
-
-// ListTags lists tags for the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#list-tags
-func (s *RepositoriesService) ListTags(ctx context.Context, owner string, repo string, opt *ListOptions) ([]*RepositoryTag, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/tags", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var tags []*RepositoryTag
-	resp, err := s.client.Do(ctx, req, &tags)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return tags, resp, nil
-}
-
-// Branch represents a repository branch
-type Branch struct {
-	Name      *string           `json:"name,omitempty"`
-	Commit    *RepositoryCommit `json:"commit,omitempty"`
-	Protected *bool             `json:"protected,omitempty"`
-}
-
-// Protection represents a repository branch's protection.
-type Protection struct {
-	RequiredStatusChecks       *RequiredStatusChecks          `json:"required_status_checks"`
-	RequiredPullRequestReviews *PullRequestReviewsEnforcement `json:"required_pull_request_reviews"`
-	EnforceAdmins              *AdminEnforcement              `json:"enforce_admins"`
-	Restrictions               *BranchRestrictions            `json:"restrictions"`
-}
-
-// ProtectionRequest represents a request to create/edit a branch's protection.
-type ProtectionRequest struct {
-	RequiredStatusChecks       *RequiredStatusChecks                 `json:"required_status_checks"`
-	RequiredPullRequestReviews *PullRequestReviewsEnforcementRequest `json:"required_pull_request_reviews"`
-	EnforceAdmins              bool                                  `json:"enforce_admins"`
-	Restrictions               *BranchRestrictionsRequest            `json:"restrictions"`
-}
-
-// RequiredStatusChecks represents the protection status of a individual branch.
-type RequiredStatusChecks struct {
-	// Require branches to be up to date before merging. (Required.)
-	Strict bool `json:"strict"`
-	// The list of status checks to require in order to merge into this
-	// branch. (Required; use []string{} instead of nil for empty list.)
-	Contexts []string `json:"contexts"`
-}
-
-// PullRequestReviewsEnforcement represents the pull request reviews enforcement of a protected branch.
-type PullRequestReviewsEnforcement struct {
-	// Specifies which users and teams can dismiss pull requets reviews.
-	DismissalRestrictions DismissalRestrictions `json:"dismissal_restrictions"`
-	// Specifies if approved reviews are dismissed automatically, when a new commit is pushed.
-	DismissStaleReviews bool `json:"dismiss_stale_reviews"`
-}
-
-// PullRequestReviewsEnforcementRequest represents request to set the pull request review
-// enforcement of a protected branch. It is separate from PullRequestReviewsEnforcement above
-// because the request structure is different from the response structure.
-type PullRequestReviewsEnforcementRequest struct {
-	// Specifies which users and teams should be allowed to dismiss pull requets reviews. Can be nil to disable the restrictions.
-	DismissalRestrictionsRequest *DismissalRestrictionsRequest `json:"dismissal_restrictions"`
-	// Specifies if approved reviews can be dismissed automatically, when a new commit is pushed. (Required)
-	DismissStaleReviews bool `json:"dismiss_stale_reviews"`
-}
-
-// MarshalJSON implements the json.Marshaler interface.
-// Converts nil value of PullRequestReviewsEnforcementRequest.DismissalRestrictionsRequest to empty array
-func (req PullRequestReviewsEnforcementRequest) MarshalJSON() ([]byte, error) {
-	if req.DismissalRestrictionsRequest == nil {
-		newReq := struct {
-			R []interface{} `json:"dismissal_restrictions"`
-			D bool          `json:"dismiss_stale_reviews"`
-		}{
-			R: []interface{}{},
-			D: req.DismissStaleReviews,
-		}
-		return json.Marshal(newReq)
-	}
-	newReq := struct {
-		R *DismissalRestrictionsRequest `json:"dismissal_restrictions"`
-		D bool                          `json:"dismiss_stale_reviews"`
-	}{
-		R: req.DismissalRestrictionsRequest,
-		D: req.DismissStaleReviews,
-	}
-	return json.Marshal(newReq)
-}
-
-// PullRequestReviewsEnforcementUpdate represents request to patch the pull request review
-// enforcement of a protected branch. It is separate from PullRequestReviewsEnforcementRequest above
-// because the patch request does not require all fields to be initialized.
-type PullRequestReviewsEnforcementUpdate struct {
-	// Specifies which users and teams can dismiss pull requets reviews. Can be ommitted.
-	DismissalRestrictionsRequest *DismissalRestrictionsRequest `json:"dismissal_restrictions,omitempty"`
-	// Specifies if approved reviews can be dismissed automatically, when a new commit is pushed. Can be ommited.
-	DismissStaleReviews *bool `json:"dismiss_stale_reviews,omitempty"`
-}
-
-// AdminEnforcement represents the configuration to enforce required status checks for repository administrators.
-type AdminEnforcement struct {
-	URL     *string `json:"url,omitempty"`
-	Enabled bool    `json:"enabled"`
-}
-
-// BranchRestrictions represents the restriction that only certain users or
-// teams may push to a branch.
-type BranchRestrictions struct {
-	// The list of user logins with push access.
-	Users []*User `json:"users"`
-	// The list of team slugs with push access.
-	Teams []*Team `json:"teams"`
-}
-
-// BranchRestrictionsRequest represents the request to create/edit the
-// restriction that only certain users or teams may push to a branch. It is
-// separate from BranchRestrictions above because the request structure is
-// different from the response structure.
-type BranchRestrictionsRequest struct {
-	// The list of user logins with push access. (Required; use []string{} instead of nil for empty list.)
-	Users []string `json:"users"`
-	// The list of team slugs with push access. (Required; use []string{} instead of nil for empty list.)
-	Teams []string `json:"teams"`
-}
-
-// DismissalRestrictions specifies which users and teams can dismiss pull request reviews.
-type DismissalRestrictions struct {
-	// The list of users who can dimiss pull request reviews.
-	Users []*User `json:"users"`
-	// The list of teams which can dismiss pull request reviews.
-	Teams []*Team `json:"teams"`
-}
-
-// DismissalRestrictionsRequest represents the request to create/edit the
-// restriction to allows only specific users or teams to dimiss pull request reviews. It is
-// separate from DismissalRestrictions above because the request structure is
-// different from the response structure.
-type DismissalRestrictionsRequest struct {
-	// The list of user logins who can dismiss pull request reviews. (Required; use []string{} instead of nil for empty list.)
-	Users []string `json:"users"`
-	// The list of team slugs which can dismiss pull request reviews. (Required; use []string{} instead of nil for empty list.)
-	Teams []string `json:"teams"`
-}
-
-// ListBranches lists branches for the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#list-branches
-func (s *RepositoriesService) ListBranches(ctx context.Context, owner string, repo string, opt *ListOptions) ([]*Branch, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	var branches []*Branch
-	resp, err := s.client.Do(ctx, req, &branches)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return branches, resp, nil
-}
-
-// GetBranch gets the specified branch for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#get-branch
-func (s *RepositoriesService) GetBranch(ctx context.Context, owner, repo, branch string) (*Branch, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v", owner, repo, branch)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	b := new(Branch)
-	resp, err := s.client.Do(ctx, req, b)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return b, resp, nil
-}
-
-// GetBranchProtection gets the protection of a given branch.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/branches/#get-branch-protection
-func (s *RepositoriesService) GetBranchProtection(ctx context.Context, owner, repo, branch string) (*Protection, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v/protection", owner, repo, branch)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	p := new(Protection)
-	resp, err := s.client.Do(ctx, req, p)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return p, resp, nil
-}
-
-// GetRequiredStatusChecks gets the required status checks for a given protected branch.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/branches/#get-required-status-checks-of-protected-branch
-func (s *RepositoriesService) GetRequiredStatusChecks(ctx context.Context, owner, repo, branch string) (*RequiredStatusChecks, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v/protection/required_status_checks", owner, repo, branch)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	p := new(RequiredStatusChecks)
-	resp, err := s.client.Do(ctx, req, p)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return p, resp, nil
-}
-
-// ListRequiredStatusChecksContexts lists the required status checks contexts for a given protected branch.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/branches/#list-required-status-checks-contexts-of-protected-branch
-func (s *RepositoriesService) ListRequiredStatusChecksContexts(ctx context.Context, owner, repo, branch string) (contexts []string, resp *Response, err error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v/protection/required_status_checks/contexts", owner, repo, branch)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	resp, err = s.client.Do(ctx, req, &contexts)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return contexts, resp, nil
-}
-
-// UpdateBranchProtection updates the protection of a given branch.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/branches/#update-branch-protection
-func (s *RepositoriesService) UpdateBranchProtection(ctx context.Context, owner, repo, branch string, preq *ProtectionRequest) (*Protection, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v/protection", owner, repo, branch)
-	req, err := s.client.NewRequest("PUT", u, preq)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	p := new(Protection)
-	resp, err := s.client.Do(ctx, req, p)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return p, resp, nil
-}
-
-// RemoveBranchProtection removes the protection of a given branch.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/branches/#remove-branch-protection
-func (s *RepositoriesService) RemoveBranchProtection(ctx context.Context, owner, repo, branch string) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v/protection", owner, repo, branch)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// License gets the contents of a repository's license if one is detected.
-//
-// GitHub API docs: https://developer.github.com/v3/licenses/#get-the-contents-of-a-repositorys-license
-func (s *RepositoriesService) License(ctx context.Context, owner, repo string) (*RepositoryLicense, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/license", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r := &RepositoryLicense{}
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, nil
-}
-
-// GetPullRequestReviewEnforcement gets pull request review enforcement of a protected branch.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/branches/#get-pull-request-review-enforcement-of-protected-branch
-func (s *RepositoriesService) GetPullRequestReviewEnforcement(ctx context.Context, owner, repo, branch string) (*PullRequestReviewsEnforcement, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v/protection/required_pull_request_reviews", owner, repo, branch)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	r := new(PullRequestReviewsEnforcement)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, nil
-}
-
-// UpdatePullRequestReviewEnforcement patches pull request review enforcement of a protected branch.
-// It requires admin access and branch protection to be enabled.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/branches/#update-pull-request-review-enforcement-of-protected-branch
-func (s *RepositoriesService) UpdatePullRequestReviewEnforcement(ctx context.Context, owner, repo, branch string, patch *PullRequestReviewsEnforcementUpdate) (*PullRequestReviewsEnforcement, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v/protection/required_pull_request_reviews", owner, repo, branch)
-	req, err := s.client.NewRequest("PATCH", u, patch)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	r := new(PullRequestReviewsEnforcement)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, err
-}
-
-// DisableDismissalRestrictions disables dismissal restrictions of a protected branch.
-// It requires admin access and branch protection to be enabled.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/branches/#update-pull-request-review-enforcement-of-protected-branch
-func (s *RepositoriesService) DisableDismissalRestrictions(ctx context.Context, owner, repo, branch string) (*PullRequestReviewsEnforcement, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v/protection/required_pull_request_reviews", owner, repo, branch)
-
-	data := struct {
-		R []interface{} `json:"dismissal_restrictions"`
-	}{[]interface{}{}}
-
-	req, err := s.client.NewRequest("PATCH", u, data)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	r := new(PullRequestReviewsEnforcement)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, err
-}
-
-// RemovePullRequestReviewEnforcement removes pull request enforcement of a protected branch.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/branches/#remove-pull-request-review-enforcement-of-protected-branch
-func (s *RepositoriesService) RemovePullRequestReviewEnforcement(ctx context.Context, owner, repo, branch string) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v/protection/required_pull_request_reviews", owner, repo, branch)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// GetAdminEnforcement gets admin enforcement information of a protected branch.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/branches/#get-admin-enforcement-of-protected-branch
-func (s *RepositoriesService) GetAdminEnforcement(ctx context.Context, owner, repo, branch string) (*AdminEnforcement, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v/protection/enforce_admins", owner, repo, branch)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	r := new(AdminEnforcement)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, nil
-}
-
-// AddAdminEnforcement adds admin enforcement to a protected branch.
-// It requires admin access and branch protection to be enabled.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/branches/#add-admin-enforcement-of-protected-branch
-func (s *RepositoriesService) AddAdminEnforcement(ctx context.Context, owner, repo, branch string) (*AdminEnforcement, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v/protection/enforce_admins", owner, repo, branch)
-	req, err := s.client.NewRequest("POST", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	r := new(AdminEnforcement)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return r, resp, err
-}
-
-// RemoveAdminEnforcement removes admin enforcement from a protected branch.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/branches/#remove-admin-enforcement-of-protected-branch
-func (s *RepositoriesService) RemoveAdminEnforcement(ctx context.Context, owner, repo, branch string) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/branches/%v/protection/enforce_admins", owner, repo, branch)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches
-	req.Header.Set("Accept", mediaTypeProtectedBranchesPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// Topics represents a collection of repository topics.
-type Topics struct {
-	Names []string `json:"names,omitempty"`
-}
-
-// ListAllTopics lists topics for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#list-all-topics-for-a-repository
-func (s *RepositoriesService) ListAllTopics(ctx context.Context, owner, repo string) (*Topics, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/topics", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeTopicsPreview)
-
-	topics := new(Topics)
-	resp, err := s.client.Do(ctx, req, topics)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return topics, resp, nil
-}
-
-// ReplaceAllTopics replaces topics for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/#replace-all-topics-for-a-repository
-func (s *RepositoriesService) ReplaceAllTopics(ctx context.Context, owner, repo string, topics *Topics) (*Topics, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/topics", owner, repo)
-	req, err := s.client.NewRequest("PUT", u, topics)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeTopicsPreview)
-
-	t := new(Topics)
-	resp, err := s.client.Do(ctx, req, t)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return t, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/repos_collaborators.go b/vendor/github.com/google/go-github/github/repos_collaborators.go
deleted file mode 100644
index 61b63318f4..0000000000
--- a/vendor/github.com/google/go-github/github/repos_collaborators.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// ListCollaborators lists the GitHub users that have access to the repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/collaborators/#list
-func (s *RepositoriesService) ListCollaborators(ctx context.Context, owner, repo string, opt *ListOptions) ([]*User, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/collaborators", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var users []*User
-	resp, err := s.client.Do(ctx, req, &users)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return users, resp, nil
-}
-
-// IsCollaborator checks whether the specified GitHub user has collaborator
-// access to the given repo.
-// Note: This will return false if the user is not a collaborator OR the user
-// is not a GitHub user.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/collaborators/#get
-func (s *RepositoriesService) IsCollaborator(ctx context.Context, owner, repo, user string) (bool, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/collaborators/%v", owner, repo, user)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return false, nil, err
-	}
-
-	resp, err := s.client.Do(ctx, req, nil)
-	isCollab, err := parseBoolResponse(err)
-	return isCollab, resp, err
-}
-
-// RepositoryPermissionLevel represents the permission level an organization
-// member has for a given repository.
-type RepositoryPermissionLevel struct {
-	// Possible values: "admin", "write", "read", "none"
-	Permission *string `json:"permission,omitempty"`
-
-	User *User `json:"user,omitempty"`
-}
-
-// GetPermissionLevel retrieves the specific permission level a collaborator has for a given repository.
-// GitHub API docs: https://developer.github.com/v3/repos/collaborators/#review-a-users-permission-level
-func (s *RepositoriesService) GetPermissionLevel(ctx context.Context, owner, repo, user string) (*RepositoryPermissionLevel, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/collaborators/%v/permission", owner, repo, user)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	rpl := new(RepositoryPermissionLevel)
-	resp, err := s.client.Do(ctx, req, rpl)
-	if err != nil {
-		return nil, resp, err
-	}
-	return rpl, resp, nil
-}
-
-// RepositoryAddCollaboratorOptions specifies the optional parameters to the
-// RepositoriesService.AddCollaborator method.
-type RepositoryAddCollaboratorOptions struct {
-	// Permission specifies the permission to grant the user on this repository.
-	// Possible values are:
-	//     pull - team members can pull, but not push to or administer this repository
-	//     push - team members can pull and push, but not administer this repository
-	//     admin - team members can pull, push and administer this repository
-	//
-	// Default value is "push". This option is only valid for organization-owned repositories.
-	Permission string `json:"permission,omitempty"`
-}
-
-// AddCollaborator sends an invitation to the specified GitHub user
-// to become a collaborator to the given repo.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/collaborators/#add-user-as-a-collaborator
-func (s *RepositoriesService) AddCollaborator(ctx context.Context, owner, repo, user string, opt *RepositoryAddCollaboratorOptions) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/collaborators/%v", owner, repo, user)
-	req, err := s.client.NewRequest("PUT", u, opt)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeRepositoryInvitationsPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// RemoveCollaborator removes the specified GitHub user as collaborator from the given repo.
-// Note: Does not return error if a valid user that is not a collaborator is removed.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/collaborators/#remove-collaborator
-func (s *RepositoriesService) RemoveCollaborator(ctx context.Context, owner, repo, user string) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/collaborators/%v", owner, repo, user)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/repos_comments.go b/vendor/github.com/google/go-github/github/repos_comments.go
deleted file mode 100644
index 4830ee2206..0000000000
--- a/vendor/github.com/google/go-github/github/repos_comments.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// RepositoryComment represents a comment for a commit, file, or line in a repository.
-type RepositoryComment struct {
-	HTMLURL   *string    `json:"html_url,omitempty"`
-	URL       *string    `json:"url,omitempty"`
-	ID        *int       `json:"id,omitempty"`
-	CommitID  *string    `json:"commit_id,omitempty"`
-	User      *User      `json:"user,omitempty"`
-	Reactions *Reactions `json:"reactions,omitempty"`
-	CreatedAt *time.Time `json:"created_at,omitempty"`
-	UpdatedAt *time.Time `json:"updated_at,omitempty"`
-
-	// User-mutable fields
-	Body *string `json:"body"`
-	// User-initialized fields
-	Path     *string `json:"path,omitempty"`
-	Position *int    `json:"position,omitempty"`
-}
-
-func (r RepositoryComment) String() string {
-	return Stringify(r)
-}
-
-// ListComments lists all the comments for the repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/comments/#list-commit-comments-for-a-repository
-func (s *RepositoriesService) ListComments(ctx context.Context, owner, repo string, opt *ListOptions) ([]*RepositoryComment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/comments", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	var comments []*RepositoryComment
-	resp, err := s.client.Do(ctx, req, &comments)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return comments, resp, nil
-}
-
-// ListCommitComments lists all the comments for a given commit SHA.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/comments/#list-comments-for-a-single-commit
-func (s *RepositoriesService) ListCommitComments(ctx context.Context, owner, repo, sha string, opt *ListOptions) ([]*RepositoryComment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/commits/%v/comments", owner, repo, sha)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	var comments []*RepositoryComment
-	resp, err := s.client.Do(ctx, req, &comments)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return comments, resp, nil
-}
-
-// CreateComment creates a comment for the given commit.
-// Note: GitHub allows for comments to be created for non-existing files and positions.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/comments/#create-a-commit-comment
-func (s *RepositoriesService) CreateComment(ctx context.Context, owner, repo, sha string, comment *RepositoryComment) (*RepositoryComment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/commits/%v/comments", owner, repo, sha)
-	req, err := s.client.NewRequest("POST", u, comment)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	c := new(RepositoryComment)
-	resp, err := s.client.Do(ctx, req, c)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return c, resp, nil
-}
-
-// GetComment gets a single comment from a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/comments/#get-a-single-commit-comment
-func (s *RepositoriesService) GetComment(ctx context.Context, owner, repo string, id int) (*RepositoryComment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/comments/%v", owner, repo, id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeReactionsPreview)
-
-	c := new(RepositoryComment)
-	resp, err := s.client.Do(ctx, req, c)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return c, resp, nil
-}
-
-// UpdateComment updates the body of a single comment.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/comments/#update-a-commit-comment
-func (s *RepositoriesService) UpdateComment(ctx context.Context, owner, repo string, id int, comment *RepositoryComment) (*RepositoryComment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/comments/%v", owner, repo, id)
-	req, err := s.client.NewRequest("PATCH", u, comment)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	c := new(RepositoryComment)
-	resp, err := s.client.Do(ctx, req, c)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return c, resp, nil
-}
-
-// DeleteComment deletes a single comment from a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/comments/#delete-a-commit-comment
-func (s *RepositoriesService) DeleteComment(ctx context.Context, owner, repo string, id int) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/comments/%v", owner, repo, id)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/repos_commits.go b/vendor/github.com/google/go-github/github/repos_commits.go
deleted file mode 100644
index 7ecf531046..0000000000
--- a/vendor/github.com/google/go-github/github/repos_commits.go
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"time"
-)
-
-// RepositoryCommit represents a commit in a repo.
-// Note that it's wrapping a Commit, so author/committer information is in two places,
-// but contain different details about them: in RepositoryCommit "github details", in Commit - "git details".
-type RepositoryCommit struct {
-	SHA         *string  `json:"sha,omitempty"`
-	Commit      *Commit  `json:"commit,omitempty"`
-	Author      *User    `json:"author,omitempty"`
-	Committer   *User    `json:"committer,omitempty"`
-	Parents     []Commit `json:"parents,omitempty"`
-	HTMLURL     *string  `json:"html_url,omitempty"`
-	URL         *string  `json:"url,omitempty"`
-	CommentsURL *string  `json:"comments_url,omitempty"`
-
-	// Details about how many changes were made in this commit. Only filled in during GetCommit!
-	Stats *CommitStats `json:"stats,omitempty"`
-	// Details about which files, and how this commit touched. Only filled in during GetCommit!
-	Files []CommitFile `json:"files,omitempty"`
-}
-
-func (r RepositoryCommit) String() string {
-	return Stringify(r)
-}
-
-// CommitStats represents the number of additions / deletions from a file in a given RepositoryCommit or GistCommit.
-type CommitStats struct {
-	Additions *int `json:"additions,omitempty"`
-	Deletions *int `json:"deletions,omitempty"`
-	Total     *int `json:"total,omitempty"`
-}
-
-func (c CommitStats) String() string {
-	return Stringify(c)
-}
-
-// CommitFile represents a file modified in a commit.
-type CommitFile struct {
-	SHA         *string `json:"sha,omitempty"`
-	Filename    *string `json:"filename,omitempty"`
-	Additions   *int    `json:"additions,omitempty"`
-	Deletions   *int    `json:"deletions,omitempty"`
-	Changes     *int    `json:"changes,omitempty"`
-	Status      *string `json:"status,omitempty"`
-	Patch       *string `json:"patch,omitempty"`
-	BlobURL     *string `json:"blob_url,omitempty"`
-	RawURL      *string `json:"raw_url,omitempty"`
-	ContentsURL *string `json:"contents_url,omitempty"`
-}
-
-func (c CommitFile) String() string {
-	return Stringify(c)
-}
-
-// CommitsComparison is the result of comparing two commits.
-// See CompareCommits() for details.
-type CommitsComparison struct {
-	BaseCommit      *RepositoryCommit `json:"base_commit,omitempty"`
-	MergeBaseCommit *RepositoryCommit `json:"merge_base_commit,omitempty"`
-
-	// Head can be 'behind' or 'ahead'
-	Status       *string `json:"status,omitempty"`
-	AheadBy      *int    `json:"ahead_by,omitempty"`
-	BehindBy     *int    `json:"behind_by,omitempty"`
-	TotalCommits *int    `json:"total_commits,omitempty"`
-
-	Commits []RepositoryCommit `json:"commits,omitempty"`
-
-	Files []CommitFile `json:"files,omitempty"`
-
-	HTMLURL      *string `json:"html_url,omitempty"`
-	PermalinkURL *string `json:"permalink_url,omitempty"`
-	DiffURL      *string `json:"diff_url,omitempty"`
-	PatchURL     *string `json:"patch_url,omitempty"`
-	URL          *string `json:"url,omitempty"` // API URL.
-}
-
-func (c CommitsComparison) String() string {
-	return Stringify(c)
-}
-
-// CommitsListOptions specifies the optional parameters to the
-// RepositoriesService.ListCommits method.
-type CommitsListOptions struct {
-	// SHA or branch to start listing Commits from.
-	SHA string `url:"sha,omitempty"`
-
-	// Path that should be touched by the returned Commits.
-	Path string `url:"path,omitempty"`
-
-	// Author of by which to filter Commits.
-	Author string `url:"author,omitempty"`
-
-	// Since when should Commits be included in the response.
-	Since time.Time `url:"since,omitempty"`
-
-	// Until when should Commits be included in the response.
-	Until time.Time `url:"until,omitempty"`
-
-	ListOptions
-}
-
-// ListCommits lists the commits of a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/commits/#list
-func (s *RepositoriesService) ListCommits(ctx context.Context, owner, repo string, opt *CommitsListOptions) ([]*RepositoryCommit, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/commits", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var commits []*RepositoryCommit
-	resp, err := s.client.Do(ctx, req, &commits)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return commits, resp, nil
-}
-
-// GetCommit fetches the specified commit, including all details about it.
-// todo: support media formats - https://github.com/google/go-github/issues/6
-//
-// GitHub API docs: https://developer.github.com/v3/repos/commits/#get-a-single-commit
-// See also: https://developer.github.com//v3/git/commits/#get-a-single-commit provides the same functionality
-func (s *RepositoriesService) GetCommit(ctx context.Context, owner, repo, sha string) (*RepositoryCommit, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/commits/%v", owner, repo, sha)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeGitSigningPreview)
-
-	commit := new(RepositoryCommit)
-	resp, err := s.client.Do(ctx, req, commit)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return commit, resp, nil
-}
-
-// GetCommitSHA1 gets the SHA-1 of a commit reference. If a last-known SHA1 is
-// supplied and no new commits have occurred, a 304 Unmodified response is returned.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/commits/#get-the-sha-1-of-a-commit-reference
-func (s *RepositoriesService) GetCommitSHA1(ctx context.Context, owner, repo, ref, lastSHA string) (string, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/commits/%v", owner, repo, ref)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return "", nil, err
-	}
-	if lastSHA != "" {
-		req.Header.Set("If-None-Match", `"`+lastSHA+`"`)
-	}
-
-	req.Header.Set("Accept", mediaTypeV3SHA)
-
-	var buf bytes.Buffer
-	resp, err := s.client.Do(ctx, req, &buf)
-	if err != nil {
-		return "", resp, err
-	}
-
-	return buf.String(), resp, nil
-}
-
-// CompareCommits compares a range of commits with each other.
-// todo: support media formats - https://github.com/google/go-github/issues/6
-//
-// GitHub API docs: https://developer.github.com/v3/repos/commits/index.html#compare-two-commits
-func (s *RepositoriesService) CompareCommits(ctx context.Context, owner, repo string, base, head string) (*CommitsComparison, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/compare/%v...%v", owner, repo, base, head)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	comp := new(CommitsComparison)
-	resp, err := s.client.Do(ctx, req, comp)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return comp, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/repos_community_health.go b/vendor/github.com/google/go-github/github/repos_community_health.go
deleted file mode 100644
index b5c75d6f56..0000000000
--- a/vendor/github.com/google/go-github/github/repos_community_health.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2017 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// Metric represents the different fields for one file in community health files.
-type Metric struct {
-	Name    *string `json:"name"`
-	Key     *string `json:"key"`
-	URL     *string `json:"url"`
-	HTMLURL *string `json:"html_url"`
-}
-
-// CommunityHealthFiles represents the different files in the community health metrics response.
-type CommunityHealthFiles struct {
-	CodeOfConduct *Metric `json:"code_of_conduct"`
-	Contributing  *Metric `json:"contributing"`
-	License       *Metric `json:"license"`
-	Readme        *Metric `json:"readme"`
-}
-
-// CommunityHealthMetrics represents a response containing the community metrics of a repository.
-type CommunityHealthMetrics struct {
-	HealthPercentage *int                  `json:"health_percentage"`
-	Files            *CommunityHealthFiles `json:"files"`
-	UpdatedAt        *time.Time            `json:"updated_at"`
-}
-
-// GetCommunityHealthMetrics retrieves all the community health  metrics for a  repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/community/#retrieve-community-health-metrics
-func (s *RepositoriesService) GetCommunityHealthMetrics(ctx context.Context, owner, repo string) (*CommunityHealthMetrics, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/community/profile", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeRepositoryCommunityHealthMetricsPreview)
-
-	metrics := &CommunityHealthMetrics{}
-	resp, err := s.client.Do(ctx, req, metrics)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return metrics, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/repos_contents.go b/vendor/github.com/google/go-github/github/repos_contents.go
deleted file mode 100644
index f9adaf7a03..0000000000
--- a/vendor/github.com/google/go-github/github/repos_contents.go
+++ /dev/null
@@ -1,266 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Repository contents API methods.
-// GitHub API docs: https://developer.github.com/v3/repos/contents/
-
-package github
-
-import (
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"path"
-)
-
-// RepositoryContent represents a file or directory in a github repository.
-type RepositoryContent struct {
-	Type     *string `json:"type,omitempty"`
-	Encoding *string `json:"encoding,omitempty"`
-	Size     *int    `json:"size,omitempty"`
-	Name     *string `json:"name,omitempty"`
-	Path     *string `json:"path,omitempty"`
-	// Content contains the actual file content, which may be encoded.
-	// Callers should call GetContent which will decode the content if
-	// necessary.
-	Content     *string `json:"content,omitempty"`
-	SHA         *string `json:"sha,omitempty"`
-	URL         *string `json:"url,omitempty"`
-	GitURL      *string `json:"git_url,omitempty"`
-	HTMLURL     *string `json:"html_url,omitempty"`
-	DownloadURL *string `json:"download_url,omitempty"`
-}
-
-// RepositoryContentResponse holds the parsed response from CreateFile, UpdateFile, and DeleteFile.
-type RepositoryContentResponse struct {
-	Content *RepositoryContent `json:"content,omitempty"`
-	Commit  `json:"commit,omitempty"`
-}
-
-// RepositoryContentFileOptions specifies optional parameters for CreateFile, UpdateFile, and DeleteFile.
-type RepositoryContentFileOptions struct {
-	Message   *string       `json:"message,omitempty"`
-	Content   []byte        `json:"content,omitempty"` // unencoded
-	SHA       *string       `json:"sha,omitempty"`
-	Branch    *string       `json:"branch,omitempty"`
-	Author    *CommitAuthor `json:"author,omitempty"`
-	Committer *CommitAuthor `json:"committer,omitempty"`
-}
-
-// RepositoryContentGetOptions represents an optional ref parameter, which can be a SHA,
-// branch, or tag
-type RepositoryContentGetOptions struct {
-	Ref string `url:"ref,omitempty"`
-}
-
-// String converts RepositoryContent to a string. It's primarily for testing.
-func (r RepositoryContent) String() string {
-	return Stringify(r)
-}
-
-// GetContent returns the content of r, decoding it if necessary.
-func (r *RepositoryContent) GetContent() (string, error) {
-	var encoding string
-	if r.Encoding != nil {
-		encoding = *r.Encoding
-	}
-
-	switch encoding {
-	case "base64":
-		c, err := base64.StdEncoding.DecodeString(*r.Content)
-		return string(c), err
-	case "":
-		if r.Content == nil {
-			return "", nil
-		}
-		return *r.Content, nil
-	default:
-		return "", fmt.Errorf("unsupported content encoding: %v", encoding)
-	}
-}
-
-// GetReadme gets the Readme file for the repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/contents/#get-the-readme
-func (s *RepositoriesService) GetReadme(ctx context.Context, owner, repo string, opt *RepositoryContentGetOptions) (*RepositoryContent, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/readme", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-	readme := new(RepositoryContent)
-	resp, err := s.client.Do(ctx, req, readme)
-	if err != nil {
-		return nil, resp, err
-	}
-	return readme, resp, nil
-}
-
-// DownloadContents returns an io.ReadCloser that reads the contents of the
-// specified file. This function will work with files of any size, as opposed
-// to GetContents which is limited to 1 Mb files. It is the caller's
-// responsibility to close the ReadCloser.
-func (s *RepositoriesService) DownloadContents(ctx context.Context, owner, repo, filepath string, opt *RepositoryContentGetOptions) (io.ReadCloser, error) {
-	dir := path.Dir(filepath)
-	filename := path.Base(filepath)
-	_, dirContents, _, err := s.GetContents(ctx, owner, repo, dir, opt)
-	if err != nil {
-		return nil, err
-	}
-	for _, contents := range dirContents {
-		if *contents.Name == filename {
-			if contents.DownloadURL == nil || *contents.DownloadURL == "" {
-				return nil, fmt.Errorf("No download link found for %s", filepath)
-			}
-			resp, err := s.client.client.Get(*contents.DownloadURL)
-			if err != nil {
-				return nil, err
-			}
-			return resp.Body, nil
-		}
-	}
-	return nil, fmt.Errorf("No file named %s found in %s", filename, dir)
-}
-
-// GetContents can return either the metadata and content of a single file
-// (when path references a file) or the metadata of all the files and/or
-// subdirectories of a directory (when path references a directory). To make it
-// easy to distinguish between both result types and to mimic the API as much
-// as possible, both result types will be returned but only one will contain a
-// value and the other will be nil.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/contents/#get-contents
-func (s *RepositoriesService) GetContents(ctx context.Context, owner, repo, path string, opt *RepositoryContentGetOptions) (fileContent *RepositoryContent, directoryContent []*RepositoryContent, resp *Response, err error) {
-	escapedPath := (&url.URL{Path: path}).String()
-	u := fmt.Sprintf("repos/%s/%s/contents/%s", owner, repo, escapedPath)
-	u, err = addOptions(u, opt)
-	if err != nil {
-		return nil, nil, nil, err
-	}
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, nil, err
-	}
-	var rawJSON json.RawMessage
-	resp, err = s.client.Do(ctx, req, &rawJSON)
-	if err != nil {
-		return nil, nil, resp, err
-	}
-	fileUnmarshalError := json.Unmarshal(rawJSON, &fileContent)
-	if fileUnmarshalError == nil {
-		return fileContent, nil, resp, nil
-	}
-	directoryUnmarshalError := json.Unmarshal(rawJSON, &directoryContent)
-	if directoryUnmarshalError == nil {
-		return nil, directoryContent, resp, nil
-	}
-	return nil, nil, resp, fmt.Errorf("unmarshalling failed for both file and directory content: %s and %s", fileUnmarshalError, directoryUnmarshalError)
-}
-
-// CreateFile creates a new file in a repository at the given path and returns
-// the commit and file metadata.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/contents/#create-a-file
-func (s *RepositoriesService) CreateFile(ctx context.Context, owner, repo, path string, opt *RepositoryContentFileOptions) (*RepositoryContentResponse, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/contents/%s", owner, repo, path)
-	req, err := s.client.NewRequest("PUT", u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-	createResponse := new(RepositoryContentResponse)
-	resp, err := s.client.Do(ctx, req, createResponse)
-	if err != nil {
-		return nil, resp, err
-	}
-	return createResponse, resp, nil
-}
-
-// UpdateFile updates a file in a repository at the given path and returns the
-// commit and file metadata. Requires the blob SHA of the file being updated.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/contents/#update-a-file
-func (s *RepositoriesService) UpdateFile(ctx context.Context, owner, repo, path string, opt *RepositoryContentFileOptions) (*RepositoryContentResponse, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/contents/%s", owner, repo, path)
-	req, err := s.client.NewRequest("PUT", u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-	updateResponse := new(RepositoryContentResponse)
-	resp, err := s.client.Do(ctx, req, updateResponse)
-	if err != nil {
-		return nil, resp, err
-	}
-	return updateResponse, resp, nil
-}
-
-// DeleteFile deletes a file from a repository and returns the commit.
-// Requires the blob SHA of the file to be deleted.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/contents/#delete-a-file
-func (s *RepositoriesService) DeleteFile(ctx context.Context, owner, repo, path string, opt *RepositoryContentFileOptions) (*RepositoryContentResponse, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/contents/%s", owner, repo, path)
-	req, err := s.client.NewRequest("DELETE", u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-	deleteResponse := new(RepositoryContentResponse)
-	resp, err := s.client.Do(ctx, req, deleteResponse)
-	if err != nil {
-		return nil, resp, err
-	}
-	return deleteResponse, resp, nil
-}
-
-// archiveFormat is used to define the archive type when calling GetArchiveLink.
-type archiveFormat string
-
-const (
-	// Tarball specifies an archive in gzipped tar format.
-	Tarball archiveFormat = "tarball"
-
-	// Zipball specifies an archive in zip format.
-	Zipball archiveFormat = "zipball"
-)
-
-// GetArchiveLink returns an URL to download a tarball or zipball archive for a
-// repository. The archiveFormat can be specified by either the github.Tarball
-// or github.Zipball constant.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/contents/#get-archive-link
-func (s *RepositoriesService) GetArchiveLink(ctx context.Context, owner, repo string, archiveformat archiveFormat, opt *RepositoryContentGetOptions) (*url.URL, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/%s", owner, repo, archiveformat)
-	if opt != nil && opt.Ref != "" {
-		u += fmt.Sprintf("/%s", opt.Ref)
-	}
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-	var resp *http.Response
-	// Use http.DefaultTransport if no custom Transport is configured
-	ctx, req = withContext(ctx, req)
-	if s.client.client.Transport == nil {
-		resp, err = http.DefaultTransport.RoundTrip(req)
-	} else {
-		resp, err = s.client.client.Transport.RoundTrip(req)
-	}
-	if err != nil {
-		return nil, nil, err
-	}
-	resp.Body.Close()
-	if resp.StatusCode != http.StatusFound {
-		return nil, newResponse(resp), fmt.Errorf("unexpected status code: %s", resp.Status)
-	}
-	parsedURL, err := url.Parse(resp.Header.Get("Location"))
-	return parsedURL, newResponse(resp), err
-}
diff --git a/vendor/github.com/google/go-github/github/repos_deployments.go b/vendor/github.com/google/go-github/github/repos_deployments.go
deleted file mode 100644
index 9054ca9472..0000000000
--- a/vendor/github.com/google/go-github/github/repos_deployments.go
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright 2014 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-)
-
-// Deployment represents a deployment in a repo
-type Deployment struct {
-	URL           *string         `json:"url,omitempty"`
-	ID            *int            `json:"id,omitempty"`
-	SHA           *string         `json:"sha,omitempty"`
-	Ref           *string         `json:"ref,omitempty"`
-	Task          *string         `json:"task,omitempty"`
-	Payload       json.RawMessage `json:"payload,omitempty"`
-	Environment   *string         `json:"environment,omitempty"`
-	Description   *string         `json:"description,omitempty"`
-	Creator       *User           `json:"creator,omitempty"`
-	CreatedAt     *Timestamp      `json:"created_at,omitempty"`
-	UpdatedAt     *Timestamp      `json:"pushed_at,omitempty"`
-	StatusesURL   *string         `json:"statuses_url,omitempty"`
-	RepositoryURL *string         `json:"repository_url,omitempty"`
-}
-
-// DeploymentRequest represents a deployment request
-type DeploymentRequest struct {
-	Ref                   *string   `json:"ref,omitempty"`
-	Task                  *string   `json:"task,omitempty"`
-	AutoMerge             *bool     `json:"auto_merge,omitempty"`
-	RequiredContexts      *[]string `json:"required_contexts,omitempty"`
-	Payload               *string   `json:"payload,omitempty"`
-	Environment           *string   `json:"environment,omitempty"`
-	Description           *string   `json:"description,omitempty"`
-	TransientEnvironment  *bool     `json:"transient_environment,omitempty"`
-	ProductionEnvironment *bool     `json:"production_environment,omitempty"`
-}
-
-// DeploymentsListOptions specifies the optional parameters to the
-// RepositoriesService.ListDeployments method.
-type DeploymentsListOptions struct {
-	// SHA of the Deployment.
-	SHA string `url:"sha,omitempty"`
-
-	// List deployments for a given ref.
-	Ref string `url:"ref,omitempty"`
-
-	// List deployments for a given task.
-	Task string `url:"task,omitempty"`
-
-	// List deployments for a given environment.
-	Environment string `url:"environment,omitempty"`
-
-	ListOptions
-}
-
-// ListDeployments lists the deployments of a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/deployments/#list-deployments
-func (s *RepositoriesService) ListDeployments(ctx context.Context, owner, repo string, opt *DeploymentsListOptions) ([]*Deployment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/deployments", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var deployments []*Deployment
-	resp, err := s.client.Do(ctx, req, &deployments)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return deployments, resp, nil
-}
-
-// GetDeployment returns a single deployment of a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/deployments/#get-a-single-deployment
-func (s *RepositoriesService) GetDeployment(ctx context.Context, owner, repo string, deploymentID int) (*Deployment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/deployments/%v", owner, repo, deploymentID)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	deployment := new(Deployment)
-	resp, err := s.client.Do(ctx, req, deployment)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return deployment, resp, nil
-}
-
-// CreateDeployment creates a new deployment for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/deployments/#create-a-deployment
-func (s *RepositoriesService) CreateDeployment(ctx context.Context, owner, repo string, request *DeploymentRequest) (*Deployment, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/deployments", owner, repo)
-
-	req, err := s.client.NewRequest("POST", u, request)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when deployment support fully launches
-	req.Header.Set("Accept", mediaTypeDeploymentStatusPreview)
-
-	d := new(Deployment)
-	resp, err := s.client.Do(ctx, req, d)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return d, resp, nil
-}
-
-// DeploymentStatus represents the status of a
-// particular deployment.
-type DeploymentStatus struct {
-	ID *int `json:"id,omitempty"`
-	// State is the deployment state.
-	// Possible values are: "pending", "success", "failure", "error", "inactive".
-	State         *string    `json:"state,omitempty"`
-	Creator       *User      `json:"creator,omitempty"`
-	Description   *string    `json:"description,omitempty"`
-	TargetURL     *string    `json:"target_url,omitempty"`
-	CreatedAt     *Timestamp `json:"created_at,omitempty"`
-	UpdatedAt     *Timestamp `json:"pushed_at,omitempty"`
-	DeploymentURL *string    `json:"deployment_url,omitempty"`
-	RepositoryURL *string    `json:"repository_url,omitempty"`
-}
-
-// DeploymentStatusRequest represents a deployment request
-type DeploymentStatusRequest struct {
-	State          *string `json:"state,omitempty"`
-	LogURL         *string `json:"log_url,omitempty"`
-	Description    *string `json:"description,omitempty"`
-	EnvironmentURL *string `json:"environment_url,omitempty"`
-	AutoInactive   *bool   `json:"auto_inactive,omitempty"`
-}
-
-// ListDeploymentStatuses lists the statuses of a given deployment of a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/deployments/#list-deployment-statuses
-func (s *RepositoriesService) ListDeploymentStatuses(ctx context.Context, owner, repo string, deployment int, opt *ListOptions) ([]*DeploymentStatus, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/deployments/%v/statuses", owner, repo, deployment)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var statuses []*DeploymentStatus
-	resp, err := s.client.Do(ctx, req, &statuses)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return statuses, resp, nil
-}
-
-// GetDeploymentStatus returns a single deployment status of a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/deployments/#get-a-single-deployment-status
-func (s *RepositoriesService) GetDeploymentStatus(ctx context.Context, owner, repo string, deploymentID, deploymentStatusID int) (*DeploymentStatus, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/deployments/%v/statuses/%v", owner, repo, deploymentID, deploymentStatusID)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when deployment support fully launches
-	req.Header.Set("Accept", mediaTypeDeploymentStatusPreview)
-
-	d := new(DeploymentStatus)
-	resp, err := s.client.Do(ctx, req, d)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return d, resp, nil
-}
-
-// CreateDeploymentStatus creates a new status for a deployment.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/deployments/#create-a-deployment-status
-func (s *RepositoriesService) CreateDeploymentStatus(ctx context.Context, owner, repo string, deployment int, request *DeploymentStatusRequest) (*DeploymentStatus, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/deployments/%v/statuses", owner, repo, deployment)
-
-	req, err := s.client.NewRequest("POST", u, request)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when deployment support fully launches
-	req.Header.Set("Accept", mediaTypeDeploymentStatusPreview)
-
-	d := new(DeploymentStatus)
-	resp, err := s.client.Do(ctx, req, d)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return d, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/repos_forks.go b/vendor/github.com/google/go-github/github/repos_forks.go
deleted file mode 100644
index 4ca19a42dc..0000000000
--- a/vendor/github.com/google/go-github/github/repos_forks.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// RepositoryListForksOptions specifies the optional parameters to the
-// RepositoriesService.ListForks method.
-type RepositoryListForksOptions struct {
-	// How to sort the forks list. Possible values are: newest, oldest,
-	// watchers. Default is "newest".
-	Sort string `url:"sort,omitempty"`
-
-	ListOptions
-}
-
-// ListForks lists the forks of the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/forks/#list-forks
-func (s *RepositoriesService) ListForks(ctx context.Context, owner, repo string, opt *RepositoryListForksOptions) ([]*Repository, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/forks", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when topics API fully launches.
-	req.Header.Set("Accept", mediaTypeTopicsPreview)
-
-	var repos []*Repository
-	resp, err := s.client.Do(ctx, req, &repos)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return repos, resp, nil
-}
-
-// RepositoryCreateForkOptions specifies the optional parameters to the
-// RepositoriesService.CreateFork method.
-type RepositoryCreateForkOptions struct {
-	// The organization to fork the repository into.
-	Organization string `url:"organization,omitempty"`
-}
-
-// CreateFork creates a fork of the specified repository.
-//
-// This method might return an *AcceptedError and a status code of
-// 202. This is because this is the status that GitHub returns to signify that
-// it is now computing creating the fork in a background task.
-// A follow up request, after a delay of a second or so, should result
-// in a successful request.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/forks/#create-a-fork
-func (s *RepositoriesService) CreateFork(ctx context.Context, owner, repo string, opt *RepositoryCreateForkOptions) (*Repository, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/forks", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("POST", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	fork := new(Repository)
-	resp, err := s.client.Do(ctx, req, fork)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return fork, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/repos_hooks.go b/vendor/github.com/google/go-github/github/repos_hooks.go
deleted file mode 100644
index 67ce96ac34..0000000000
--- a/vendor/github.com/google/go-github/github/repos_hooks.go
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// WebHookPayload represents the data that is received from GitHub when a push
-// event hook is triggered. The format of these payloads pre-date most of the
-// GitHub v3 API, so there are lots of minor incompatibilities with the types
-// defined in the rest of the API. Therefore, several types are duplicated
-// here to account for these differences.
-//
-// GitHub API docs: https://help.github.com/articles/post-receive-hooks
-type WebHookPayload struct {
-	After      *string         `json:"after,omitempty"`
-	Before     *string         `json:"before,omitempty"`
-	Commits    []WebHookCommit `json:"commits,omitempty"`
-	Compare    *string         `json:"compare,omitempty"`
-	Created    *bool           `json:"created,omitempty"`
-	Deleted    *bool           `json:"deleted,omitempty"`
-	Forced     *bool           `json:"forced,omitempty"`
-	HeadCommit *WebHookCommit  `json:"head_commit,omitempty"`
-	Pusher     *User           `json:"pusher,omitempty"`
-	Ref        *string         `json:"ref,omitempty"`
-	Repo       *Repository     `json:"repository,omitempty"`
-	Sender     *User           `json:"sender,omitempty"`
-}
-
-func (w WebHookPayload) String() string {
-	return Stringify(w)
-}
-
-// WebHookCommit represents the commit variant we receive from GitHub in a
-// WebHookPayload.
-type WebHookCommit struct {
-	Added     []string       `json:"added,omitempty"`
-	Author    *WebHookAuthor `json:"author,omitempty"`
-	Committer *WebHookAuthor `json:"committer,omitempty"`
-	Distinct  *bool          `json:"distinct,omitempty"`
-	ID        *string        `json:"id,omitempty"`
-	Message   *string        `json:"message,omitempty"`
-	Modified  []string       `json:"modified,omitempty"`
-	Removed   []string       `json:"removed,omitempty"`
-	Timestamp *time.Time     `json:"timestamp,omitempty"`
-}
-
-func (w WebHookCommit) String() string {
-	return Stringify(w)
-}
-
-// WebHookAuthor represents the author or committer of a commit, as specified
-// in a WebHookCommit. The commit author may not correspond to a GitHub User.
-type WebHookAuthor struct {
-	Email    *string `json:"email,omitempty"`
-	Name     *string `json:"name,omitempty"`
-	Username *string `json:"username,omitempty"`
-}
-
-func (w WebHookAuthor) String() string {
-	return Stringify(w)
-}
-
-// Hook represents a GitHub (web and service) hook for a repository.
-type Hook struct {
-	CreatedAt *time.Time             `json:"created_at,omitempty"`
-	UpdatedAt *time.Time             `json:"updated_at,omitempty"`
-	Name      *string                `json:"name,omitempty"`
-	URL       *string                `json:"url,omitempty"`
-	Events    []string               `json:"events,omitempty"`
-	Active    *bool                  `json:"active,omitempty"`
-	Config    map[string]interface{} `json:"config,omitempty"`
-	ID        *int                   `json:"id,omitempty"`
-}
-
-func (h Hook) String() string {
-	return Stringify(h)
-}
-
-// CreateHook creates a Hook for the specified repository.
-// Name and Config are required fields.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/hooks/#create-a-hook
-func (s *RepositoriesService) CreateHook(ctx context.Context, owner, repo string, hook *Hook) (*Hook, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/hooks", owner, repo)
-	req, err := s.client.NewRequest("POST", u, hook)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	h := new(Hook)
-	resp, err := s.client.Do(ctx, req, h)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return h, resp, nil
-}
-
-// ListHooks lists all Hooks for the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/hooks/#list
-func (s *RepositoriesService) ListHooks(ctx context.Context, owner, repo string, opt *ListOptions) ([]*Hook, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/hooks", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var hooks []*Hook
-	resp, err := s.client.Do(ctx, req, &hooks)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return hooks, resp, nil
-}
-
-// GetHook returns a single specified Hook.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/hooks/#get-single-hook
-func (s *RepositoriesService) GetHook(ctx context.Context, owner, repo string, id int) (*Hook, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/hooks/%d", owner, repo, id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-	hook := new(Hook)
-	resp, err := s.client.Do(ctx, req, hook)
-	return hook, resp, err
-}
-
-// EditHook updates a specified Hook.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/hooks/#edit-a-hook
-func (s *RepositoriesService) EditHook(ctx context.Context, owner, repo string, id int, hook *Hook) (*Hook, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/hooks/%d", owner, repo, id)
-	req, err := s.client.NewRequest("PATCH", u, hook)
-	if err != nil {
-		return nil, nil, err
-	}
-	h := new(Hook)
-	resp, err := s.client.Do(ctx, req, h)
-	return h, resp, err
-}
-
-// DeleteHook deletes a specified Hook.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/hooks/#delete-a-hook
-func (s *RepositoriesService) DeleteHook(ctx context.Context, owner, repo string, id int) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/hooks/%d", owner, repo, id)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
-
-// PingHook triggers a 'ping' event to be sent to the Hook.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/hooks/#ping-a-hook
-func (s *RepositoriesService) PingHook(ctx context.Context, owner, repo string, id int) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/hooks/%d/pings", owner, repo, id)
-	req, err := s.client.NewRequest("POST", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
-
-// TestHook triggers a test Hook by github.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/hooks/#test-a-push-hook
-func (s *RepositoriesService) TestHook(ctx context.Context, owner, repo string, id int) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/hooks/%d/tests", owner, repo, id)
-	req, err := s.client.NewRequest("POST", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/repos_invitations.go b/vendor/github.com/google/go-github/github/repos_invitations.go
deleted file mode 100644
index 0a2b7c1987..0000000000
--- a/vendor/github.com/google/go-github/github/repos_invitations.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// RepositoryInvitation represents an invitation to collaborate on a repo.
-type RepositoryInvitation struct {
-	ID      *int        `json:"id,omitempty"`
-	Repo    *Repository `json:"repository,omitempty"`
-	Invitee *User       `json:"invitee,omitempty"`
-	Inviter *User       `json:"inviter,omitempty"`
-
-	// Permissions represents the permissions that the associated user will have
-	// on the repository. Possible values are: "read", "write", "admin".
-	Permissions *string    `json:"permissions,omitempty"`
-	CreatedAt   *Timestamp `json:"created_at,omitempty"`
-	URL         *string    `json:"url,omitempty"`
-	HTMLURL     *string    `json:"html_url,omitempty"`
-}
-
-// ListInvitations lists all currently-open repository invitations.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/invitations/#list-invitations-for-a-repository
-func (s *RepositoriesService) ListInvitations(ctx context.Context, owner, repo string, opt *ListOptions) ([]*RepositoryInvitation, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/invitations", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeRepositoryInvitationsPreview)
-
-	invites := []*RepositoryInvitation{}
-	resp, err := s.client.Do(ctx, req, &invites)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return invites, resp, nil
-}
-
-// DeleteInvitation deletes a repository invitation.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/invitations/#delete-a-repository-invitation
-func (s *RepositoriesService) DeleteInvitation(ctx context.Context, owner, repo string, invitationID int) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/invitations/%v", owner, repo, invitationID)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeRepositoryInvitationsPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// UpdateInvitation updates the permissions associated with a repository
-// invitation.
-//
-// permissions represents the permissions that the associated user will have
-// on the repository. Possible values are: "read", "write", "admin".
-//
-// GitHub API docs: https://developer.github.com/v3/repos/invitations/#update-a-repository-invitation
-func (s *RepositoriesService) UpdateInvitation(ctx context.Context, owner, repo string, invitationID int, permissions string) (*RepositoryInvitation, *Response, error) {
-	opts := &struct {
-		Permissions string `json:"permissions"`
-	}{Permissions: permissions}
-	u := fmt.Sprintf("repos/%v/%v/invitations/%v", owner, repo, invitationID)
-	req, err := s.client.NewRequest("PATCH", u, opts)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeRepositoryInvitationsPreview)
-
-	invite := &RepositoryInvitation{}
-	resp, err := s.client.Do(ctx, req, invite)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return invite, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/repos_keys.go b/vendor/github.com/google/go-github/github/repos_keys.go
deleted file mode 100644
index f5a865813a..0000000000
--- a/vendor/github.com/google/go-github/github/repos_keys.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// The Key type is defined in users_keys.go
-
-// ListKeys lists the deploy keys for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/keys/#list
-func (s *RepositoriesService) ListKeys(ctx context.Context, owner string, repo string, opt *ListOptions) ([]*Key, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/keys", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var keys []*Key
-	resp, err := s.client.Do(ctx, req, &keys)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return keys, resp, nil
-}
-
-// GetKey fetches a single deploy key.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/keys/#get
-func (s *RepositoriesService) GetKey(ctx context.Context, owner string, repo string, id int) (*Key, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/keys/%v", owner, repo, id)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	key := new(Key)
-	resp, err := s.client.Do(ctx, req, key)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return key, resp, nil
-}
-
-// CreateKey adds a deploy key for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/keys/#create
-func (s *RepositoriesService) CreateKey(ctx context.Context, owner string, repo string, key *Key) (*Key, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/keys", owner, repo)
-
-	req, err := s.client.NewRequest("POST", u, key)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	k := new(Key)
-	resp, err := s.client.Do(ctx, req, k)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return k, resp, nil
-}
-
-// EditKey edits a deploy key.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/keys/#edit
-func (s *RepositoriesService) EditKey(ctx context.Context, owner string, repo string, id int, key *Key) (*Key, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/keys/%v", owner, repo, id)
-
-	req, err := s.client.NewRequest("PATCH", u, key)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	k := new(Key)
-	resp, err := s.client.Do(ctx, req, k)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return k, resp, nil
-}
-
-// DeleteKey deletes a deploy key.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/keys/#delete
-func (s *RepositoriesService) DeleteKey(ctx context.Context, owner string, repo string, id int) (*Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/keys/%v", owner, repo, id)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/repos_merging.go b/vendor/github.com/google/go-github/github/repos_merging.go
deleted file mode 100644
index 04383c1ae3..0000000000
--- a/vendor/github.com/google/go-github/github/repos_merging.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2014 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// RepositoryMergeRequest represents a request to merge a branch in a
-// repository.
-type RepositoryMergeRequest struct {
-	Base          *string `json:"base,omitempty"`
-	Head          *string `json:"head,omitempty"`
-	CommitMessage *string `json:"commit_message,omitempty"`
-}
-
-// Merge a branch in the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/merging/#perform-a-merge
-func (s *RepositoriesService) Merge(ctx context.Context, owner, repo string, request *RepositoryMergeRequest) (*RepositoryCommit, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/merges", owner, repo)
-	req, err := s.client.NewRequest("POST", u, request)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	commit := new(RepositoryCommit)
-	resp, err := s.client.Do(ctx, req, commit)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return commit, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/repos_pages.go b/vendor/github.com/google/go-github/github/repos_pages.go
deleted file mode 100644
index 075f5742d1..0000000000
--- a/vendor/github.com/google/go-github/github/repos_pages.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2014 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// Pages represents a GitHub Pages site configuration.
-type Pages struct {
-	URL       *string `json:"url,omitempty"`
-	Status    *string `json:"status,omitempty"`
-	CNAME     *string `json:"cname,omitempty"`
-	Custom404 *bool   `json:"custom_404,omitempty"`
-	HTMLURL   *string `json:"html_url,omitempty"`
-}
-
-// PagesError represents a build error for a GitHub Pages site.
-type PagesError struct {
-	Message *string `json:"message,omitempty"`
-}
-
-// PagesBuild represents the build information for a GitHub Pages site.
-type PagesBuild struct {
-	URL       *string     `json:"url,omitempty"`
-	Status    *string     `json:"status,omitempty"`
-	Error     *PagesError `json:"error,omitempty"`
-	Pusher    *User       `json:"pusher,omitempty"`
-	Commit    *string     `json:"commit,omitempty"`
-	Duration  *int        `json:"duration,omitempty"`
-	CreatedAt *Timestamp  `json:"created_at,omitempty"`
-	UpdatedAt *Timestamp  `json:"updated_at,omitempty"`
-}
-
-// GetPagesInfo fetches information about a GitHub Pages site.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/pages/#get-information-about-a-pages-site
-func (s *RepositoriesService) GetPagesInfo(ctx context.Context, owner, repo string) (*Pages, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pages", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypePagesPreview)
-
-	site := new(Pages)
-	resp, err := s.client.Do(ctx, req, site)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return site, resp, nil
-}
-
-// ListPagesBuilds lists the builds for a GitHub Pages site.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/pages/#list-pages-builds
-func (s *RepositoriesService) ListPagesBuilds(ctx context.Context, owner, repo string, opt *ListOptions) ([]*PagesBuild, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pages/builds", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var pages []*PagesBuild
-	resp, err := s.client.Do(ctx, req, &pages)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return pages, resp, nil
-}
-
-// GetLatestPagesBuild fetches the latest build information for a GitHub pages site.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/pages/#list-latest-pages-build
-func (s *RepositoriesService) GetLatestPagesBuild(ctx context.Context, owner, repo string) (*PagesBuild, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pages/builds/latest", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	build := new(PagesBuild)
-	resp, err := s.client.Do(ctx, req, build)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return build, resp, nil
-}
-
-// GetPageBuild fetches the specific build information for a GitHub pages site.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/pages/#list-a-specific-pages-build
-func (s *RepositoriesService) GetPageBuild(ctx context.Context, owner, repo string, id int) (*PagesBuild, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pages/builds/%v", owner, repo, id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	build := new(PagesBuild)
-	resp, err := s.client.Do(ctx, req, build)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return build, resp, nil
-}
-
-// RequestPageBuild requests a build of a GitHub Pages site without needing to push new commit.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/pages/#request-a-page-build
-func (s *RepositoriesService) RequestPageBuild(ctx context.Context, owner, repo string) (*PagesBuild, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/pages/builds", owner, repo)
-	req, err := s.client.NewRequest("POST", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypePagesPreview)
-
-	build := new(PagesBuild)
-	resp, err := s.client.Do(ctx, req, build)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return build, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/repos_projects.go b/vendor/github.com/google/go-github/github/repos_projects.go
deleted file mode 100644
index 770ffc76fa..0000000000
--- a/vendor/github.com/google/go-github/github/repos_projects.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2017 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// ProjectListOptions specifies the optional parameters to the
-// OrganizationsService.ListProjects and RepositoriesService.ListProjects methods.
-type ProjectListOptions struct {
-	// Indicates the state of the projects to return. Can be either open, closed, or all. Default: open
-	State string `url:"state,omitempty"`
-
-	ListOptions
-}
-
-// ListProjects lists the projects for a repo.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/#list-repository-projects
-func (s *RepositoriesService) ListProjects(ctx context.Context, owner, repo string, opt *ProjectListOptions) ([]*Project, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/projects", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	var projects []*Project
-	resp, err := s.client.Do(ctx, req, &projects)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return projects, resp, nil
-}
-
-// CreateProject creates a GitHub Project for the specified repository.
-//
-// GitHub API docs: https://developer.github.com/v3/projects/#create-a-repository-project
-func (s *RepositoriesService) CreateProject(ctx context.Context, owner, repo string, opt *ProjectOptions) (*Project, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/projects", owner, repo)
-	req, err := s.client.NewRequest("POST", u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeProjectsPreview)
-
-	project := &Project{}
-	resp, err := s.client.Do(ctx, req, project)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return project, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/repos_releases.go b/vendor/github.com/google/go-github/github/repos_releases.go
deleted file mode 100644
index 5c27565510..0000000000
--- a/vendor/github.com/google/go-github/github/repos_releases.go
+++ /dev/null
@@ -1,327 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"mime"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-// RepositoryRelease represents a GitHub release in a repository.
-type RepositoryRelease struct {
-	ID              *int           `json:"id,omitempty"`
-	TagName         *string        `json:"tag_name,omitempty"`
-	TargetCommitish *string        `json:"target_commitish,omitempty"`
-	Name            *string        `json:"name,omitempty"`
-	Body            *string        `json:"body,omitempty"`
-	Draft           *bool          `json:"draft,omitempty"`
-	Prerelease      *bool          `json:"prerelease,omitempty"`
-	CreatedAt       *Timestamp     `json:"created_at,omitempty"`
-	PublishedAt     *Timestamp     `json:"published_at,omitempty"`
-	URL             *string        `json:"url,omitempty"`
-	HTMLURL         *string        `json:"html_url,omitempty"`
-	AssetsURL       *string        `json:"assets_url,omitempty"`
-	Assets          []ReleaseAsset `json:"assets,omitempty"`
-	UploadURL       *string        `json:"upload_url,omitempty"`
-	ZipballURL      *string        `json:"zipball_url,omitempty"`
-	TarballURL      *string        `json:"tarball_url,omitempty"`
-	Author          *User          `json:"author,omitempty"`
-}
-
-func (r RepositoryRelease) String() string {
-	return Stringify(r)
-}
-
-// ReleaseAsset represents a GitHub release asset in a repository.
-type ReleaseAsset struct {
-	ID                 *int       `json:"id,omitempty"`
-	URL                *string    `json:"url,omitempty"`
-	Name               *string    `json:"name,omitempty"`
-	Label              *string    `json:"label,omitempty"`
-	State              *string    `json:"state,omitempty"`
-	ContentType        *string    `json:"content_type,omitempty"`
-	Size               *int       `json:"size,omitempty"`
-	DownloadCount      *int       `json:"download_count,omitempty"`
-	CreatedAt          *Timestamp `json:"created_at,omitempty"`
-	UpdatedAt          *Timestamp `json:"updated_at,omitempty"`
-	BrowserDownloadURL *string    `json:"browser_download_url,omitempty"`
-	Uploader           *User      `json:"uploader,omitempty"`
-}
-
-func (r ReleaseAsset) String() string {
-	return Stringify(r)
-}
-
-// ListReleases lists the releases for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#list-releases-for-a-repository
-func (s *RepositoriesService) ListReleases(ctx context.Context, owner, repo string, opt *ListOptions) ([]*RepositoryRelease, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/releases", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var releases []*RepositoryRelease
-	resp, err := s.client.Do(ctx, req, &releases)
-	if err != nil {
-		return nil, resp, err
-	}
-	return releases, resp, nil
-}
-
-// GetRelease fetches a single release.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#get-a-single-release
-func (s *RepositoriesService) GetRelease(ctx context.Context, owner, repo string, id int) (*RepositoryRelease, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/releases/%d", owner, repo, id)
-	return s.getSingleRelease(ctx, u)
-}
-
-// GetLatestRelease fetches the latest published release for the repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#get-the-latest-release
-func (s *RepositoriesService) GetLatestRelease(ctx context.Context, owner, repo string) (*RepositoryRelease, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/releases/latest", owner, repo)
-	return s.getSingleRelease(ctx, u)
-}
-
-// GetReleaseByTag fetches a release with the specified tag.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#get-a-release-by-tag-name
-func (s *RepositoriesService) GetReleaseByTag(ctx context.Context, owner, repo, tag string) (*RepositoryRelease, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/releases/tags/%s", owner, repo, tag)
-	return s.getSingleRelease(ctx, u)
-}
-
-func (s *RepositoriesService) getSingleRelease(ctx context.Context, url string) (*RepositoryRelease, *Response, error) {
-	req, err := s.client.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	release := new(RepositoryRelease)
-	resp, err := s.client.Do(ctx, req, release)
-	if err != nil {
-		return nil, resp, err
-	}
-	return release, resp, nil
-}
-
-// CreateRelease adds a new release for a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#create-a-release
-func (s *RepositoriesService) CreateRelease(ctx context.Context, owner, repo string, release *RepositoryRelease) (*RepositoryRelease, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/releases", owner, repo)
-
-	req, err := s.client.NewRequest("POST", u, release)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r := new(RepositoryRelease)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-	return r, resp, nil
-}
-
-// EditRelease edits a repository release.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#edit-a-release
-func (s *RepositoriesService) EditRelease(ctx context.Context, owner, repo string, id int, release *RepositoryRelease) (*RepositoryRelease, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/releases/%d", owner, repo, id)
-
-	req, err := s.client.NewRequest("PATCH", u, release)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r := new(RepositoryRelease)
-	resp, err := s.client.Do(ctx, req, r)
-	if err != nil {
-		return nil, resp, err
-	}
-	return r, resp, nil
-}
-
-// DeleteRelease delete a single release from a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#delete-a-release
-func (s *RepositoriesService) DeleteRelease(ctx context.Context, owner, repo string, id int) (*Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/releases/%d", owner, repo, id)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
-
-// ListReleaseAssets lists the release's assets.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#list-assets-for-a-release
-func (s *RepositoriesService) ListReleaseAssets(ctx context.Context, owner, repo string, id int, opt *ListOptions) ([]*ReleaseAsset, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/releases/%d/assets", owner, repo, id)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var assets []*ReleaseAsset
-	resp, err := s.client.Do(ctx, req, &assets)
-	if err != nil {
-		return nil, resp, err
-	}
-	return assets, resp, nil
-}
-
-// GetReleaseAsset fetches a single release asset.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#get-a-single-release-asset
-func (s *RepositoriesService) GetReleaseAsset(ctx context.Context, owner, repo string, id int) (*ReleaseAsset, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/releases/assets/%d", owner, repo, id)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	asset := new(ReleaseAsset)
-	resp, err := s.client.Do(ctx, req, asset)
-	if err != nil {
-		return nil, resp, err
-	}
-	return asset, resp, nil
-}
-
-// DownloadReleaseAsset downloads a release asset or returns a redirect URL.
-//
-// DownloadReleaseAsset returns an io.ReadCloser that reads the contents of the
-// specified release asset. It is the caller's responsibility to close the ReadCloser.
-// If a redirect is returned, the redirect URL will be returned as a string instead
-// of the io.ReadCloser. Exactly one of rc and redirectURL will be zero.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#get-a-single-release-asset
-func (s *RepositoriesService) DownloadReleaseAsset(ctx context.Context, owner, repo string, id int) (rc io.ReadCloser, redirectURL string, err error) {
-	u := fmt.Sprintf("repos/%s/%s/releases/assets/%d", owner, repo, id)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, "", err
-	}
-	req.Header.Set("Accept", defaultMediaType)
-
-	s.client.clientMu.Lock()
-	defer s.client.clientMu.Unlock()
-
-	var loc string
-	saveRedirect := s.client.client.CheckRedirect
-	s.client.client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
-		loc = req.URL.String()
-		return errors.New("disable redirect")
-	}
-	defer func() { s.client.client.CheckRedirect = saveRedirect }()
-
-	ctx, req = withContext(ctx, req)
-	resp, err := s.client.client.Do(req)
-	if err != nil {
-		if !strings.Contains(err.Error(), "disable redirect") {
-			return nil, "", err
-		}
-		return nil, loc, nil // Intentionally return no error with valid redirect URL.
-	}
-
-	if err := CheckResponse(resp); err != nil {
-		resp.Body.Close()
-		return nil, "", err
-	}
-
-	return resp.Body, "", nil
-}
-
-// EditReleaseAsset edits a repository release asset.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#edit-a-release-asset
-func (s *RepositoriesService) EditReleaseAsset(ctx context.Context, owner, repo string, id int, release *ReleaseAsset) (*ReleaseAsset, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/releases/assets/%d", owner, repo, id)
-
-	req, err := s.client.NewRequest("PATCH", u, release)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	asset := new(ReleaseAsset)
-	resp, err := s.client.Do(ctx, req, asset)
-	if err != nil {
-		return nil, resp, err
-	}
-	return asset, resp, nil
-}
-
-// DeleteReleaseAsset delete a single release asset from a repository.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#delete-a-release-asset
-func (s *RepositoriesService) DeleteReleaseAsset(ctx context.Context, owner, repo string, id int) (*Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/releases/assets/%d", owner, repo, id)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-	return s.client.Do(ctx, req, nil)
-}
-
-// UploadReleaseAsset creates an asset by uploading a file into a release repository.
-// To upload assets that cannot be represented by an os.File, call NewUploadRequest directly.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/releases/#upload-a-release-asset
-func (s *RepositoriesService) UploadReleaseAsset(ctx context.Context, owner, repo string, id int, opt *UploadOptions, file *os.File) (*ReleaseAsset, *Response, error) {
-	u := fmt.Sprintf("repos/%s/%s/releases/%d/assets", owner, repo, id)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	stat, err := file.Stat()
-	if err != nil {
-		return nil, nil, err
-	}
-	if stat.IsDir() {
-		return nil, nil, errors.New("the asset to upload can't be a directory")
-	}
-
-	mediaType := mime.TypeByExtension(filepath.Ext(file.Name()))
-	req, err := s.client.NewUploadRequest(u, file, stat.Size(), mediaType)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	asset := new(ReleaseAsset)
-	resp, err := s.client.Do(ctx, req, asset)
-	if err != nil {
-		return nil, resp, err
-	}
-	return asset, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/repos_stats.go b/vendor/github.com/google/go-github/github/repos_stats.go
deleted file mode 100644
index 30fc7bd340..0000000000
--- a/vendor/github.com/google/go-github/github/repos_stats.go
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright 2014 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// ContributorStats represents a contributor to a repository and their
-// weekly contributions to a given repo.
-type ContributorStats struct {
-	Author *Contributor  `json:"author,omitempty"`
-	Total  *int          `json:"total,omitempty"`
-	Weeks  []WeeklyStats `json:"weeks,omitempty"`
-}
-
-func (c ContributorStats) String() string {
-	return Stringify(c)
-}
-
-// WeeklyStats represents the number of additions, deletions and commits
-// a Contributor made in a given week.
-type WeeklyStats struct {
-	Week      *Timestamp `json:"w,omitempty"`
-	Additions *int       `json:"a,omitempty"`
-	Deletions *int       `json:"d,omitempty"`
-	Commits   *int       `json:"c,omitempty"`
-}
-
-func (w WeeklyStats) String() string {
-	return Stringify(w)
-}
-
-// ListContributorsStats gets a repo's contributor list with additions,
-// deletions and commit counts.
-//
-// If this is the first time these statistics are requested for the given
-// repository, this method will return an *AcceptedError and a status code of
-// 202. This is because this is the status that GitHub returns to signify that
-// it is now computing the requested statistics. A follow up request, after a
-// delay of a second or so, should result in a successful request.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/statistics/#contributors
-func (s *RepositoriesService) ListContributorsStats(ctx context.Context, owner, repo string) ([]*ContributorStats, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/stats/contributors", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var contributorStats []*ContributorStats
-	resp, err := s.client.Do(ctx, req, &contributorStats)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return contributorStats, resp, nil
-}
-
-// WeeklyCommitActivity represents the weekly commit activity for a repository.
-// The days array is a group of commits per day, starting on Sunday.
-type WeeklyCommitActivity struct {
-	Days  []int      `json:"days,omitempty"`
-	Total *int       `json:"total,omitempty"`
-	Week  *Timestamp `json:"week,omitempty"`
-}
-
-func (w WeeklyCommitActivity) String() string {
-	return Stringify(w)
-}
-
-// ListCommitActivity returns the last year of commit activity
-// grouped by week. The days array is a group of commits per day,
-// starting on Sunday.
-//
-// If this is the first time these statistics are requested for the given
-// repository, this method will return an *AcceptedError and a status code of
-// 202. This is because this is the status that GitHub returns to signify that
-// it is now computing the requested statistics. A follow up request, after a
-// delay of a second or so, should result in a successful request.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/statistics/#commit-activity
-func (s *RepositoriesService) ListCommitActivity(ctx context.Context, owner, repo string) ([]*WeeklyCommitActivity, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/stats/commit_activity", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var weeklyCommitActivity []*WeeklyCommitActivity
-	resp, err := s.client.Do(ctx, req, &weeklyCommitActivity)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return weeklyCommitActivity, resp, nil
-}
-
-// ListCodeFrequency returns a weekly aggregate of the number of additions and
-// deletions pushed to a repository. Returned WeeklyStats will contain
-// additions and deletions, but not total commits.
-//
-// If this is the first time these statistics are requested for the given
-// repository, this method will return an *AcceptedError and a status code of
-// 202. This is because this is the status that GitHub returns to signify that
-// it is now computing the requested statistics. A follow up request, after a
-// delay of a second or so, should result in a successful request.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/statistics/#code-frequency
-func (s *RepositoriesService) ListCodeFrequency(ctx context.Context, owner, repo string) ([]*WeeklyStats, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/stats/code_frequency", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var weeks [][]int
-	resp, err := s.client.Do(ctx, req, &weeks)
-
-	// convert int slices into WeeklyStats
-	var stats []*WeeklyStats
-	for _, week := range weeks {
-		if len(week) != 3 {
-			continue
-		}
-		stat := &WeeklyStats{
-			Week:      &Timestamp{time.Unix(int64(week[0]), 0)},
-			Additions: Int(week[1]),
-			Deletions: Int(week[2]),
-		}
-		stats = append(stats, stat)
-	}
-
-	return stats, resp, err
-}
-
-// RepositoryParticipation is the number of commits by everyone
-// who has contributed to the repository (including the owner)
-// as well as the number of commits by the owner themself.
-type RepositoryParticipation struct {
-	All   []int `json:"all,omitempty"`
-	Owner []int `json:"owner,omitempty"`
-}
-
-func (r RepositoryParticipation) String() string {
-	return Stringify(r)
-}
-
-// ListParticipation returns the total commit counts for the 'owner'
-// and total commit counts in 'all'. 'all' is everyone combined,
-// including the 'owner' in the last 52 weeks. If you’d like to get
-// the commit counts for non-owners, you can subtract 'all' from 'owner'.
-//
-// The array order is oldest week (index 0) to most recent week.
-//
-// If this is the first time these statistics are requested for the given
-// repository, this method will return an *AcceptedError and a status code of
-// 202. This is because this is the status that GitHub returns to signify that
-// it is now computing the requested statistics. A follow up request, after a
-// delay of a second or so, should result in a successful request.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/statistics/#participation
-func (s *RepositoriesService) ListParticipation(ctx context.Context, owner, repo string) (*RepositoryParticipation, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/stats/participation", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	participation := new(RepositoryParticipation)
-	resp, err := s.client.Do(ctx, req, participation)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return participation, resp, nil
-}
-
-// PunchCard represents the number of commits made during a given hour of a
-// day of thew eek.
-type PunchCard struct {
-	Day     *int // Day of the week (0-6: =Sunday - Saturday).
-	Hour    *int // Hour of day (0-23).
-	Commits *int // Number of commits.
-}
-
-// ListPunchCard returns the number of commits per hour in each day.
-//
-// If this is the first time these statistics are requested for the given
-// repository, this method will return an *AcceptedError and a status code of
-// 202. This is because this is the status that GitHub returns to signify that
-// it is now computing the requested statistics. A follow up request, after a
-// delay of a second or so, should result in a successful request.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/statistics/#punch-card
-func (s *RepositoriesService) ListPunchCard(ctx context.Context, owner, repo string) ([]*PunchCard, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/stats/punch_card", owner, repo)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var results [][]int
-	resp, err := s.client.Do(ctx, req, &results)
-
-	// convert int slices into Punchcards
-	var cards []*PunchCard
-	for _, result := range results {
-		if len(result) != 3 {
-			continue
-		}
-		card := &PunchCard{
-			Day:     Int(result[0]),
-			Hour:    Int(result[1]),
-			Commits: Int(result[2]),
-		}
-		cards = append(cards, card)
-	}
-
-	return cards, resp, err
-}
diff --git a/vendor/github.com/google/go-github/github/repos_statuses.go b/vendor/github.com/google/go-github/github/repos_statuses.go
deleted file mode 100644
index 6db501076c..0000000000
--- a/vendor/github.com/google/go-github/github/repos_statuses.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// RepoStatus represents the status of a repository at a particular reference.
-type RepoStatus struct {
-	ID  *int    `json:"id,omitempty"`
-	URL *string `json:"url,omitempty"`
-
-	// State is the current state of the repository. Possible values are:
-	// pending, success, error, or failure.
-	State *string `json:"state,omitempty"`
-
-	// TargetURL is the URL of the page representing this status. It will be
-	// linked from the GitHub UI to allow users to see the source of the status.
-	TargetURL *string `json:"target_url,omitempty"`
-
-	// Description is a short high level summary of the status.
-	Description *string `json:"description,omitempty"`
-
-	// A string label to differentiate this status from the statuses of other systems.
-	Context *string `json:"context,omitempty"`
-
-	Creator   *User      `json:"creator,omitempty"`
-	CreatedAt *time.Time `json:"created_at,omitempty"`
-	UpdatedAt *time.Time `json:"updated_at,omitempty"`
-}
-
-func (r RepoStatus) String() string {
-	return Stringify(r)
-}
-
-// ListStatuses lists the statuses of a repository at the specified
-// reference. ref can be a SHA, a branch name, or a tag name.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/statuses/#list-statuses-for-a-specific-ref
-func (s *RepositoriesService) ListStatuses(ctx context.Context, owner, repo, ref string, opt *ListOptions) ([]*RepoStatus, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/commits/%v/statuses", owner, repo, ref)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var statuses []*RepoStatus
-	resp, err := s.client.Do(ctx, req, &statuses)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return statuses, resp, nil
-}
-
-// CreateStatus creates a new status for a repository at the specified
-// reference. Ref can be a SHA, a branch name, or a tag name.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/statuses/#create-a-status
-func (s *RepositoriesService) CreateStatus(ctx context.Context, owner, repo, ref string, status *RepoStatus) (*RepoStatus, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/statuses/%v", owner, repo, ref)
-	req, err := s.client.NewRequest("POST", u, status)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	repoStatus := new(RepoStatus)
-	resp, err := s.client.Do(ctx, req, repoStatus)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return repoStatus, resp, nil
-}
-
-// CombinedStatus represents the combined status of a repository at a particular reference.
-type CombinedStatus struct {
-	// State is the combined state of the repository. Possible values are:
-	// failure, pending, or success.
-	State *string `json:"state,omitempty"`
-
-	Name       *string      `json:"name,omitempty"`
-	SHA        *string      `json:"sha,omitempty"`
-	TotalCount *int         `json:"total_count,omitempty"`
-	Statuses   []RepoStatus `json:"statuses,omitempty"`
-
-	CommitURL     *string `json:"commit_url,omitempty"`
-	RepositoryURL *string `json:"repository_url,omitempty"`
-}
-
-func (s CombinedStatus) String() string {
-	return Stringify(s)
-}
-
-// GetCombinedStatus returns the combined status of a repository at the specified
-// reference. ref can be a SHA, a branch name, or a tag name.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
-func (s *RepositoriesService) GetCombinedStatus(ctx context.Context, owner, repo, ref string, opt *ListOptions) (*CombinedStatus, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/commits/%v/status", owner, repo, ref)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	status := new(CombinedStatus)
-	resp, err := s.client.Do(ctx, req, status)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return status, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/repos_traffic.go b/vendor/github.com/google/go-github/github/repos_traffic.go
deleted file mode 100644
index fb1c97648a..0000000000
--- a/vendor/github.com/google/go-github/github/repos_traffic.go
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// TrafficReferrer represent information about traffic from a referrer .
-type TrafficReferrer struct {
-	Referrer *string `json:"referrer,omitempty"`
-	Count    *int    `json:"count,omitempty"`
-	Uniques  *int    `json:"uniques,omitempty"`
-}
-
-// TrafficPath represent information about the traffic on a path of the repo.
-type TrafficPath struct {
-	Path    *string `json:"path,omitempty"`
-	Title   *string `json:"title,omitempty"`
-	Count   *int    `json:"count,omitempty"`
-	Uniques *int    `json:"uniques,omitempty"`
-}
-
-// TrafficData represent information about a specific timestamp in views or clones list.
-type TrafficData struct {
-	Timestamp *Timestamp `json:"timestamp,omitempty"`
-	Count     *int       `json:"count,omitempty"`
-	Uniques   *int       `json:"uniques,omitempty"`
-}
-
-// TrafficViews represent information about the number of views in the last 14 days.
-type TrafficViews struct {
-	Views   []*TrafficData `json:"views,omitempty"`
-	Count   *int           `json:"count,omitempty"`
-	Uniques *int           `json:"uniques,omitempty"`
-}
-
-// TrafficClones represent information about the number of clones in the last 14 days.
-type TrafficClones struct {
-	Clones  []*TrafficData `json:"clones,omitempty"`
-	Count   *int           `json:"count,omitempty"`
-	Uniques *int           `json:"uniques,omitempty"`
-}
-
-// TrafficBreakdownOptions specifies the parameters to methods that support breakdown per day or week.
-// Can be one of: day, week. Default: day.
-type TrafficBreakdownOptions struct {
-	Per string `url:"per,omitempty"`
-}
-
-// ListTrafficReferrers list the top 10 referrers over the last 14 days.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/traffic/#list-referrers
-func (s *RepositoriesService) ListTrafficReferrers(ctx context.Context, owner, repo string) ([]*TrafficReferrer, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/traffic/popular/referrers", owner, repo)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var trafficReferrers []*TrafficReferrer
-	resp, err := s.client.Do(ctx, req, &trafficReferrers)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return trafficReferrers, resp, nil
-}
-
-// ListTrafficPaths list the top 10 popular content over the last 14 days.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/traffic/#list-paths
-func (s *RepositoriesService) ListTrafficPaths(ctx context.Context, owner, repo string) ([]*TrafficPath, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/traffic/popular/paths", owner, repo)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var paths []*TrafficPath
-	resp, err := s.client.Do(ctx, req, &paths)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return paths, resp, nil
-}
-
-// ListTrafficViews get total number of views for the last 14 days and breaks it down either per day or week.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/traffic/#views
-func (s *RepositoriesService) ListTrafficViews(ctx context.Context, owner, repo string, opt *TrafficBreakdownOptions) (*TrafficViews, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/traffic/views", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	trafficViews := new(TrafficViews)
-	resp, err := s.client.Do(ctx, req, &trafficViews)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return trafficViews, resp, nil
-}
-
-// ListTrafficClones get total number of clones for the last 14 days and breaks it down either per day or week for the last 14 days.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/traffic/#views
-func (s *RepositoriesService) ListTrafficClones(ctx context.Context, owner, repo string, opt *TrafficBreakdownOptions) (*TrafficClones, *Response, error) {
-	u := fmt.Sprintf("repos/%v/%v/traffic/clones", owner, repo)
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	trafficClones := new(TrafficClones)
-	resp, err := s.client.Do(ctx, req, &trafficClones)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return trafficClones, resp, nil
-}
diff --git a/vendor/github.com/google/go-github/github/search.go b/vendor/github.com/google/go-github/github/search.go
deleted file mode 100644
index cc7c45cf39..0000000000
--- a/vendor/github.com/google/go-github/github/search.go
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-
-	qs "github.com/google/go-querystring/query"
-)
-
-// SearchService provides access to the search related functions
-// in the GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/search/
-type SearchService service
-
-// SearchOptions specifies optional parameters to the SearchService methods.
-type SearchOptions struct {
-	// How to sort the search results. Possible values are:
-	//   - for repositories: stars, fork, updated
-	//   - for commits: author-date, committer-date
-	//   - for code: indexed
-	//   - for issues: comments, created, updated
-	//   - for users: followers, repositories, joined
-	//
-	// Default is to sort by best match.
-	Sort string `url:"sort,omitempty"`
-
-	// Sort order if sort parameter is provided. Possible values are: asc,
-	// desc. Default is desc.
-	Order string `url:"order,omitempty"`
-
-	// Whether to retrieve text match metadata with a query
-	TextMatch bool `url:"-"`
-
-	ListOptions
-}
-
-// RepositoriesSearchResult represents the result of a repositories search.
-type RepositoriesSearchResult struct {
-	Total             *int         `json:"total_count,omitempty"`
-	IncompleteResults *bool        `json:"incomplete_results,omitempty"`
-	Repositories      []Repository `json:"items,omitempty"`
-}
-
-// Repositories searches repositories via various criteria.
-//
-// GitHub API docs: https://developer.github.com/v3/search/#search-repositories
-func (s *SearchService) Repositories(ctx context.Context, query string, opt *SearchOptions) (*RepositoriesSearchResult, *Response, error) {
-	result := new(RepositoriesSearchResult)
-	resp, err := s.search(ctx, "repositories", query, opt, result)
-	return result, resp, err
-}
-
-// CommitsSearchResult represents the result of a commits search.
-type CommitsSearchResult struct {
-	Total             *int            `json:"total_count,omitempty"`
-	IncompleteResults *bool           `json:"incomplete_results,omitempty"`
-	Commits           []*CommitResult `json:"items,omitempty"`
-}
-
-// CommitResult represents a commit object as returned in commit search endpoint response.
-type CommitResult struct {
-	SHA         *string   `json:"sha,omitempty"`
-	Commit      *Commit   `json:"commit,omitempty"`
-	Author      *User     `json:"author,omitempty"`
-	Committer   *User     `json:"committer,omitempty"`
-	Parents     []*Commit `json:"parents,omitempty"`
-	HTMLURL     *string   `json:"html_url,omitempty"`
-	URL         *string   `json:"url,omitempty"`
-	CommentsURL *string   `json:"comments_url,omitempty"`
-
-	Repository *Repository `json:"repository,omitempty"`
-	Score      *float64    `json:"score,omitempty"`
-}
-
-// Commits searches commits via various criteria.
-//
-// GitHub API docs: https://developer.github.com/v3/search/#search-commits
-func (s *SearchService) Commits(ctx context.Context, query string, opt *SearchOptions) (*CommitsSearchResult, *Response, error) {
-	result := new(CommitsSearchResult)
-	resp, err := s.search(ctx, "commits", query, opt, result)
-	return result, resp, err
-}
-
-// IssuesSearchResult represents the result of an issues search.
-type IssuesSearchResult struct {
-	Total             *int    `json:"total_count,omitempty"`
-	IncompleteResults *bool   `json:"incomplete_results,omitempty"`
-	Issues            []Issue `json:"items,omitempty"`
-}
-
-// Issues searches issues via various criteria.
-//
-// GitHub API docs: https://developer.github.com/v3/search/#search-issues
-func (s *SearchService) Issues(ctx context.Context, query string, opt *SearchOptions) (*IssuesSearchResult, *Response, error) {
-	result := new(IssuesSearchResult)
-	resp, err := s.search(ctx, "issues", query, opt, result)
-	return result, resp, err
-}
-
-// UsersSearchResult represents the result of a users search.
-type UsersSearchResult struct {
-	Total             *int   `json:"total_count,omitempty"`
-	IncompleteResults *bool  `json:"incomplete_results,omitempty"`
-	Users             []User `json:"items,omitempty"`
-}
-
-// Users searches users via various criteria.
-//
-// GitHub API docs: https://developer.github.com/v3/search/#search-users
-func (s *SearchService) Users(ctx context.Context, query string, opt *SearchOptions) (*UsersSearchResult, *Response, error) {
-	result := new(UsersSearchResult)
-	resp, err := s.search(ctx, "users", query, opt, result)
-	return result, resp, err
-}
-
-// Match represents a single text match.
-type Match struct {
-	Text    *string `json:"text,omitempty"`
-	Indices []int   `json:"indices,omitempty"`
-}
-
-// TextMatch represents a text match for a SearchResult
-type TextMatch struct {
-	ObjectURL  *string `json:"object_url,omitempty"`
-	ObjectType *string `json:"object_type,omitempty"`
-	Property   *string `json:"property,omitempty"`
-	Fragment   *string `json:"fragment,omitempty"`
-	Matches    []Match `json:"matches,omitempty"`
-}
-
-func (tm TextMatch) String() string {
-	return Stringify(tm)
-}
-
-// CodeSearchResult represents the result of a code search.
-type CodeSearchResult struct {
-	Total             *int         `json:"total_count,omitempty"`
-	IncompleteResults *bool        `json:"incomplete_results,omitempty"`
-	CodeResults       []CodeResult `json:"items,omitempty"`
-}
-
-// CodeResult represents a single search result.
-type CodeResult struct {
-	Name        *string     `json:"name,omitempty"`
-	Path        *string     `json:"path,omitempty"`
-	SHA         *string     `json:"sha,omitempty"`
-	HTMLURL     *string     `json:"html_url,omitempty"`
-	Repository  *Repository `json:"repository,omitempty"`
-	TextMatches []TextMatch `json:"text_matches,omitempty"`
-}
-
-func (c CodeResult) String() string {
-	return Stringify(c)
-}
-
-// Code searches code via various criteria.
-//
-// GitHub API docs: https://developer.github.com/v3/search/#search-code
-func (s *SearchService) Code(ctx context.Context, query string, opt *SearchOptions) (*CodeSearchResult, *Response, error) {
-	result := new(CodeSearchResult)
-	resp, err := s.search(ctx, "code", query, opt, result)
-	return result, resp, err
-}
-
-// Helper function that executes search queries against different
-// GitHub search types (repositories, commits, code, issues, users)
-func (s *SearchService) search(ctx context.Context, searchType string, query string, opt *SearchOptions, result interface{}) (*Response, error) {
-	params, err := qs.Values(opt)
-	if err != nil {
-		return nil, err
-	}
-	params.Set("q", query)
-	u := fmt.Sprintf("search/%s?%s", searchType, params.Encode())
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	switch {
-	case searchType == "commits":
-		// Accept header for search commits preview endpoint
-		// TODO: remove custom Accept header when this API fully launches.
-		req.Header.Set("Accept", mediaTypeCommitSearchPreview)
-	case searchType == "repositories":
-		// Accept header for search repositories based on topics preview endpoint
-		// TODO: remove custom Accept header when this API fully launches.
-		req.Header.Set("Accept", mediaTypeTopicsPreview)
-	case opt != nil && opt.TextMatch:
-		// Accept header defaults to "application/vnd.github.v3+json"
-		// We change it here to fetch back text-match metadata
-		req.Header.Set("Accept", "application/vnd.github.v3.text-match+json")
-	}
-
-	return s.client.Do(ctx, req, result)
-}
diff --git a/vendor/github.com/google/go-github/github/strings.go b/vendor/github.com/google/go-github/github/strings.go
deleted file mode 100644
index 431e1cc6c1..0000000000
--- a/vendor/github.com/google/go-github/github/strings.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-
-	"reflect"
-)
-
-var timestampType = reflect.TypeOf(Timestamp{})
-
-// Stringify attempts to create a reasonable string representation of types in
-// the GitHub library. It does things like resolve pointers to their values
-// and omits struct fields with nil values.
-func Stringify(message interface{}) string {
-	var buf bytes.Buffer
-	v := reflect.ValueOf(message)
-	stringifyValue(&buf, v)
-	return buf.String()
-}
-
-// stringifyValue was heavily inspired by the goprotobuf library.
-
-func stringifyValue(w io.Writer, val reflect.Value) {
-	if val.Kind() == reflect.Ptr && val.IsNil() {
-		w.Write([]byte("<nil>"))
-		return
-	}
-
-	v := reflect.Indirect(val)
-
-	switch v.Kind() {
-	case reflect.String:
-		fmt.Fprintf(w, `"%s"`, v)
-	case reflect.Slice:
-		w.Write([]byte{'['})
-		for i := 0; i < v.Len(); i++ {
-			if i > 0 {
-				w.Write([]byte{' '})
-			}
-
-			stringifyValue(w, v.Index(i))
-		}
-
-		w.Write([]byte{']'})
-		return
-	case reflect.Struct:
-		if v.Type().Name() != "" {
-			w.Write([]byte(v.Type().String()))
-		}
-
-		// special handling of Timestamp values
-		if v.Type() == timestampType {
-			fmt.Fprintf(w, "{%s}", v.Interface())
-			return
-		}
-
-		w.Write([]byte{'{'})
-
-		var sep bool
-		for i := 0; i < v.NumField(); i++ {
-			fv := v.Field(i)
-			if fv.Kind() == reflect.Ptr && fv.IsNil() {
-				continue
-			}
-			if fv.Kind() == reflect.Slice && fv.IsNil() {
-				continue
-			}
-
-			if sep {
-				w.Write([]byte(", "))
-			} else {
-				sep = true
-			}
-
-			w.Write([]byte(v.Type().Field(i).Name))
-			w.Write([]byte{':'})
-			stringifyValue(w, fv)
-		}
-
-		w.Write([]byte{'}'})
-	default:
-		if v.CanInterface() {
-			fmt.Fprint(w, v.Interface())
-		}
-	}
-}
diff --git a/vendor/github.com/google/go-github/github/timestamp.go b/vendor/github.com/google/go-github/github/timestamp.go
deleted file mode 100644
index a1c1554a30..0000000000
--- a/vendor/github.com/google/go-github/github/timestamp.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"strconv"
-	"time"
-)
-
-// Timestamp represents a time that can be unmarshalled from a JSON string
-// formatted as either an RFC3339 or Unix timestamp. This is necessary for some
-// fields since the GitHub API is inconsistent in how it represents times. All
-// exported methods of time.Time can be called on Timestamp.
-type Timestamp struct {
-	time.Time
-}
-
-func (t Timestamp) String() string {
-	return t.Time.String()
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface.
-// Time is expected in RFC3339 or Unix format.
-func (t *Timestamp) UnmarshalJSON(data []byte) (err error) {
-	str := string(data)
-	i, err := strconv.ParseInt(str, 10, 64)
-	if err == nil {
-		(*t).Time = time.Unix(i, 0)
-	} else {
-		(*t).Time, err = time.Parse(`"`+time.RFC3339+`"`, str)
-	}
-	return
-}
-
-// Equal reports whether t and u are equal based on time.Equal
-func (t Timestamp) Equal(u Timestamp) bool {
-	return t.Time.Equal(u.Time)
-}
diff --git a/vendor/github.com/google/go-github/github/users.go b/vendor/github.com/google/go-github/github/users.go
deleted file mode 100644
index 83cfb45b5a..0000000000
--- a/vendor/github.com/google/go-github/github/users.go
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// UsersService handles communication with the user related
-// methods of the GitHub API.
-//
-// GitHub API docs: https://developer.github.com/v3/users/
-type UsersService service
-
-// User represents a GitHub user.
-type User struct {
-	Login             *string    `json:"login,omitempty"`
-	ID                *int       `json:"id,omitempty"`
-	AvatarURL         *string    `json:"avatar_url,omitempty"`
-	HTMLURL           *string    `json:"html_url,omitempty"`
-	GravatarID        *string    `json:"gravatar_id,omitempty"`
-	Name              *string    `json:"name,omitempty"`
-	Company           *string    `json:"company,omitempty"`
-	Blog              *string    `json:"blog,omitempty"`
-	Location          *string    `json:"location,omitempty"`
-	Email             *string    `json:"email,omitempty"`
-	Hireable          *bool      `json:"hireable,omitempty"`
-	Bio               *string    `json:"bio,omitempty"`
-	PublicRepos       *int       `json:"public_repos,omitempty"`
-	PublicGists       *int       `json:"public_gists,omitempty"`
-	Followers         *int       `json:"followers,omitempty"`
-	Following         *int       `json:"following,omitempty"`
-	CreatedAt         *Timestamp `json:"created_at,omitempty"`
-	UpdatedAt         *Timestamp `json:"updated_at,omitempty"`
-	SuspendedAt       *Timestamp `json:"suspended_at,omitempty"`
-	Type              *string    `json:"type,omitempty"`
-	SiteAdmin         *bool      `json:"site_admin,omitempty"`
-	TotalPrivateRepos *int       `json:"total_private_repos,omitempty"`
-	OwnedPrivateRepos *int       `json:"owned_private_repos,omitempty"`
-	PrivateGists      *int       `json:"private_gists,omitempty"`
-	DiskUsage         *int       `json:"disk_usage,omitempty"`
-	Collaborators     *int       `json:"collaborators,omitempty"`
-	Plan              *Plan      `json:"plan,omitempty"`
-
-	// API URLs
-	URL               *string `json:"url,omitempty"`
-	EventsURL         *string `json:"events_url,omitempty"`
-	FollowingURL      *string `json:"following_url,omitempty"`
-	FollowersURL      *string `json:"followers_url,omitempty"`
-	GistsURL          *string `json:"gists_url,omitempty"`
-	OrganizationsURL  *string `json:"organizations_url,omitempty"`
-	ReceivedEventsURL *string `json:"received_events_url,omitempty"`
-	ReposURL          *string `json:"repos_url,omitempty"`
-	StarredURL        *string `json:"starred_url,omitempty"`
-	SubscriptionsURL  *string `json:"subscriptions_url,omitempty"`
-
-	// TextMatches is only populated from search results that request text matches
-	// See: search.go and https://developer.github.com/v3/search/#text-match-metadata
-	TextMatches []TextMatch `json:"text_matches,omitempty"`
-
-	// Permissions identifies the permissions that a user has on a given
-	// repository. This is only populated when calling Repositories.ListCollaborators.
-	Permissions *map[string]bool `json:"permissions,omitempty"`
-}
-
-func (u User) String() string {
-	return Stringify(u)
-}
-
-// Get fetches a user. Passing the empty string will fetch the authenticated
-// user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/#get-a-single-user
-func (s *UsersService) Get(ctx context.Context, user string) (*User, *Response, error) {
-	var u string
-	if user != "" {
-		u = fmt.Sprintf("users/%v", user)
-	} else {
-		u = "user"
-	}
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	uResp := new(User)
-	resp, err := s.client.Do(ctx, req, uResp)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return uResp, resp, nil
-}
-
-// GetByID fetches a user.
-//
-// Note: GetByID uses the undocumented GitHub API endpoint /user/:id.
-func (s *UsersService) GetByID(ctx context.Context, id int) (*User, *Response, error) {
-	u := fmt.Sprintf("user/%d", id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	user := new(User)
-	resp, err := s.client.Do(ctx, req, user)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return user, resp, nil
-}
-
-// Edit the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/#update-the-authenticated-user
-func (s *UsersService) Edit(ctx context.Context, user *User) (*User, *Response, error) {
-	u := "user"
-	req, err := s.client.NewRequest("PATCH", u, user)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	uResp := new(User)
-	resp, err := s.client.Do(ctx, req, uResp)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return uResp, resp, nil
-}
-
-// UserListOptions specifies optional parameters to the UsersService.ListAll
-// method.
-type UserListOptions struct {
-	// ID of the last user seen
-	Since int `url:"since,omitempty"`
-
-	ListOptions
-}
-
-// ListAll lists all GitHub users.
-//
-// To paginate through all users, populate 'Since' with the ID of the last user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/#get-all-users
-func (s *UsersService) ListAll(ctx context.Context, opt *UserListOptions) ([]*User, *Response, error) {
-	u, err := addOptions("users", opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var users []*User
-	resp, err := s.client.Do(ctx, req, &users)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return users, resp, nil
-}
-
-// ListInvitations lists all currently-open repository invitations for the
-// authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/invitations/#list-a-users-repository-invitations
-func (s *UsersService) ListInvitations(ctx context.Context, opt *ListOptions) ([]*RepositoryInvitation, *Response, error) {
-	u, err := addOptions("user/repository_invitations", opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeRepositoryInvitationsPreview)
-
-	invites := []*RepositoryInvitation{}
-	resp, err := s.client.Do(ctx, req, &invites)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return invites, resp, nil
-}
-
-// AcceptInvitation accepts the currently-open repository invitation for the
-// authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/invitations/#accept-a-repository-invitation
-func (s *UsersService) AcceptInvitation(ctx context.Context, invitationID int) (*Response, error) {
-	u := fmt.Sprintf("user/repository_invitations/%v", invitationID)
-	req, err := s.client.NewRequest("PATCH", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeRepositoryInvitationsPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// DeclineInvitation declines the currently-open repository invitation for the
-// authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/repos/invitations/#decline-a-repository-invitation
-func (s *UsersService) DeclineInvitation(ctx context.Context, invitationID int) (*Response, error) {
-	u := fmt.Sprintf("user/repository_invitations/%v", invitationID)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeRepositoryInvitationsPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/users_administration.go b/vendor/github.com/google/go-github/github/users_administration.go
deleted file mode 100644
index e042398d8c..0000000000
--- a/vendor/github.com/google/go-github/github/users_administration.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2014 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// PromoteSiteAdmin promotes a user to a site administrator of a GitHub Enterprise instance.
-//
-// GitHub API docs: https://developer.github.com/v3/users/administration/#promote-an-ordinary-user-to-a-site-administrator
-func (s *UsersService) PromoteSiteAdmin(ctx context.Context, user string) (*Response, error) {
-	u := fmt.Sprintf("users/%v/site_admin", user)
-
-	req, err := s.client.NewRequest("PUT", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// DemoteSiteAdmin demotes a user from site administrator of a GitHub Enterprise instance.
-//
-// GitHub API docs: https://developer.github.com/v3/users/administration/#demote-a-site-administrator-to-an-ordinary-user
-func (s *UsersService) DemoteSiteAdmin(ctx context.Context, user string) (*Response, error) {
-	u := fmt.Sprintf("users/%v/site_admin", user)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// Suspend a user on a GitHub Enterprise instance.
-//
-// GitHub API docs: https://developer.github.com/v3/users/administration/#suspend-a-user
-func (s *UsersService) Suspend(ctx context.Context, user string) (*Response, error) {
-	u := fmt.Sprintf("users/%v/suspended", user)
-
-	req, err := s.client.NewRequest("PUT", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// Unsuspend a user on a GitHub Enterprise instance.
-//
-// GitHub API docs: https://developer.github.com/v3/users/administration/#unsuspend-a-user
-func (s *UsersService) Unsuspend(ctx context.Context, user string) (*Response, error) {
-	u := fmt.Sprintf("users/%v/suspended", user)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/users_blocking.go b/vendor/github.com/google/go-github/github/users_blocking.go
deleted file mode 100644
index 39e45601cc..0000000000
--- a/vendor/github.com/google/go-github/github/users_blocking.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2017 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// ListBlockedUsers lists all the blocked users by the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/blocking/#list-blocked-users
-func (s *UsersService) ListBlockedUsers(ctx context.Context, opt *ListOptions) ([]*User, *Response, error) {
-	u := "user/blocks"
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeBlockUsersPreview)
-
-	var blockedUsers []*User
-	resp, err := s.client.Do(ctx, req, &blockedUsers)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return blockedUsers, resp, nil
-}
-
-// IsBlocked reports whether specified user is blocked by the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/blocking/#check-whether-youve-blocked-a-user
-func (s *UsersService) IsBlocked(ctx context.Context, user string) (bool, *Response, error) {
-	u := fmt.Sprintf("user/blocks/%v", user)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return false, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeBlockUsersPreview)
-
-	resp, err := s.client.Do(ctx, req, nil)
-	isBlocked, err := parseBoolResponse(err)
-	return isBlocked, resp, err
-}
-
-// BlockUser blocks specified user for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/blocking/#block-a-user
-func (s *UsersService) BlockUser(ctx context.Context, user string) (*Response, error) {
-	u := fmt.Sprintf("user/blocks/%v", user)
-
-	req, err := s.client.NewRequest("PUT", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeBlockUsersPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// UnblockUser unblocks specified user for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/blocking/#unblock-a-user
-func (s *UsersService) UnblockUser(ctx context.Context, user string) (*Response, error) {
-	u := fmt.Sprintf("user/blocks/%v", user)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeBlockUsersPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/users_emails.go b/vendor/github.com/google/go-github/github/users_emails.go
deleted file mode 100644
index 0bbd4627e3..0000000000
--- a/vendor/github.com/google/go-github/github/users_emails.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import "context"
-
-// UserEmail represents user's email address
-type UserEmail struct {
-	Email    *string `json:"email,omitempty"`
-	Primary  *bool   `json:"primary,omitempty"`
-	Verified *bool   `json:"verified,omitempty"`
-}
-
-// ListEmails lists all email addresses for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/emails/#list-email-addresses-for-a-user
-func (s *UsersService) ListEmails(ctx context.Context, opt *ListOptions) ([]*UserEmail, *Response, error) {
-	u := "user/emails"
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var emails []*UserEmail
-	resp, err := s.client.Do(ctx, req, &emails)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return emails, resp, nil
-}
-
-// AddEmails adds email addresses of the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/emails/#add-email-addresses
-func (s *UsersService) AddEmails(ctx context.Context, emails []string) ([]*UserEmail, *Response, error) {
-	u := "user/emails"
-	req, err := s.client.NewRequest("POST", u, emails)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var e []*UserEmail
-	resp, err := s.client.Do(ctx, req, &e)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return e, resp, nil
-}
-
-// DeleteEmails deletes email addresses from authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/emails/#delete-email-addresses
-func (s *UsersService) DeleteEmails(ctx context.Context, emails []string) (*Response, error) {
-	u := "user/emails"
-	req, err := s.client.NewRequest("DELETE", u, emails)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/users_followers.go b/vendor/github.com/google/go-github/github/users_followers.go
deleted file mode 100644
index c2224096a6..0000000000
--- a/vendor/github.com/google/go-github/github/users_followers.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// ListFollowers lists the followers for a user. Passing the empty string will
-// fetch followers for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/followers/#list-followers-of-a-user
-func (s *UsersService) ListFollowers(ctx context.Context, user string, opt *ListOptions) ([]*User, *Response, error) {
-	var u string
-	if user != "" {
-		u = fmt.Sprintf("users/%v/followers", user)
-	} else {
-		u = "user/followers"
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var users []*User
-	resp, err := s.client.Do(ctx, req, &users)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return users, resp, nil
-}
-
-// ListFollowing lists the people that a user is following. Passing the empty
-// string will list people the authenticated user is following.
-//
-// GitHub API docs: https://developer.github.com/v3/users/followers/#list-users-followed-by-another-user
-func (s *UsersService) ListFollowing(ctx context.Context, user string, opt *ListOptions) ([]*User, *Response, error) {
-	var u string
-	if user != "" {
-		u = fmt.Sprintf("users/%v/following", user)
-	} else {
-		u = "user/following"
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var users []*User
-	resp, err := s.client.Do(ctx, req, &users)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return users, resp, nil
-}
-
-// IsFollowing checks if "user" is following "target". Passing the empty
-// string for "user" will check if the authenticated user is following "target".
-//
-// GitHub API docs: https://developer.github.com/v3/users/followers/#check-if-you-are-following-a-user
-func (s *UsersService) IsFollowing(ctx context.Context, user, target string) (bool, *Response, error) {
-	var u string
-	if user != "" {
-		u = fmt.Sprintf("users/%v/following/%v", user, target)
-	} else {
-		u = fmt.Sprintf("user/following/%v", target)
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return false, nil, err
-	}
-
-	resp, err := s.client.Do(ctx, req, nil)
-	following, err := parseBoolResponse(err)
-	return following, resp, err
-}
-
-// Follow will cause the authenticated user to follow the specified user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/followers/#follow-a-user
-func (s *UsersService) Follow(ctx context.Context, user string) (*Response, error) {
-	u := fmt.Sprintf("user/following/%v", user)
-	req, err := s.client.NewRequest("PUT", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
-
-// Unfollow will cause the authenticated user to unfollow the specified user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/followers/#unfollow-a-user
-func (s *UsersService) Unfollow(ctx context.Context, user string) (*Response, error) {
-	u := fmt.Sprintf("user/following/%v", user)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/users_gpg_keys.go b/vendor/github.com/google/go-github/github/users_gpg_keys.go
deleted file mode 100644
index 3e95fb4460..0000000000
--- a/vendor/github.com/google/go-github/github/users_gpg_keys.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2016 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-	"time"
-)
-
-// GPGKey represents a GitHub user's public GPG key used to verify GPG signed commits and tags.
-//
-// https://developer.github.com/changes/2016-04-04-git-signing-api-preview/
-type GPGKey struct {
-	ID                *int       `json:"id,omitempty"`
-	PrimaryKeyID      *int       `json:"primary_key_id,omitempty"`
-	KeyID             *string    `json:"key_id,omitempty"`
-	PublicKey         *string    `json:"public_key,omitempty"`
-	Emails            []GPGEmail `json:"emails,omitempty"`
-	Subkeys           []GPGKey   `json:"subkeys,omitempty"`
-	CanSign           *bool      `json:"can_sign,omitempty"`
-	CanEncryptComms   *bool      `json:"can_encrypt_comms,omitempty"`
-	CanEncryptStorage *bool      `json:"can_encrypt_storage,omitempty"`
-	CanCertify        *bool      `json:"can_certify,omitempty"`
-	CreatedAt         *time.Time `json:"created_at,omitempty"`
-	ExpiresAt         *time.Time `json:"expires_at,omitempty"`
-}
-
-// String stringifies a GPGKey.
-func (k GPGKey) String() string {
-	return Stringify(k)
-}
-
-// GPGEmail represents an email address associated to a GPG key.
-type GPGEmail struct {
-	Email    *string `json:"email,omitempty"`
-	Verified *bool   `json:"verified,omitempty"`
-}
-
-// ListGPGKeys lists the public GPG keys for a user. Passing the empty
-// string will fetch keys for the authenticated user. It requires authentication
-// via Basic Auth or via OAuth with at least read:gpg_key scope.
-//
-// GitHub API docs: https://developer.github.com/v3/users/gpg_keys/#list-gpg-keys-for-a-user
-func (s *UsersService) ListGPGKeys(ctx context.Context, user string, opt *ListOptions) ([]*GPGKey, *Response, error) {
-	var u string
-	if user != "" {
-		u = fmt.Sprintf("users/%v/gpg_keys", user)
-	} else {
-		u = "user/gpg_keys"
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeGitSigningPreview)
-
-	var keys []*GPGKey
-	resp, err := s.client.Do(ctx, req, &keys)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return keys, resp, nil
-}
-
-// GetGPGKey gets extended details for a single GPG key. It requires authentication
-// via Basic Auth or via OAuth with at least read:gpg_key scope.
-//
-// GitHub API docs: https://developer.github.com/v3/users/gpg_keys/#get-a-single-gpg-key
-func (s *UsersService) GetGPGKey(ctx context.Context, id int) (*GPGKey, *Response, error) {
-	u := fmt.Sprintf("user/gpg_keys/%v", id)
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeGitSigningPreview)
-
-	key := &GPGKey{}
-	resp, err := s.client.Do(ctx, req, key)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return key, resp, nil
-}
-
-// CreateGPGKey creates a GPG key. It requires authenticatation via Basic Auth
-// or OAuth with at least write:gpg_key scope.
-//
-// GitHub API docs: https://developer.github.com/v3/users/gpg_keys/#create-a-gpg-key
-func (s *UsersService) CreateGPGKey(ctx context.Context, armoredPublicKey string) (*GPGKey, *Response, error) {
-	gpgKey := &struct {
-		ArmoredPublicKey string `json:"armored_public_key"`
-	}{ArmoredPublicKey: armoredPublicKey}
-	req, err := s.client.NewRequest("POST", "user/gpg_keys", gpgKey)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeGitSigningPreview)
-
-	key := &GPGKey{}
-	resp, err := s.client.Do(ctx, req, key)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return key, resp, nil
-}
-
-// DeleteGPGKey deletes a GPG key. It requires authentication via Basic Auth or
-// via OAuth with at least admin:gpg_key scope.
-//
-// GitHub API docs: https://developer.github.com/v3/users/gpg_keys/#delete-a-gpg-key
-func (s *UsersService) DeleteGPGKey(ctx context.Context, id int) (*Response, error) {
-	u := fmt.Sprintf("user/gpg_keys/%v", id)
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: remove custom Accept header when this API fully launches.
-	req.Header.Set("Accept", mediaTypeGitSigningPreview)
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/users_keys.go b/vendor/github.com/google/go-github/github/users_keys.go
deleted file mode 100644
index 97ed4b8611..0000000000
--- a/vendor/github.com/google/go-github/github/users_keys.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2013 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package github
-
-import (
-	"context"
-	"fmt"
-)
-
-// Key represents a public SSH key used to authenticate a user or deploy script.
-type Key struct {
-	ID       *int    `json:"id,omitempty"`
-	Key      *string `json:"key,omitempty"`
-	URL      *string `json:"url,omitempty"`
-	Title    *string `json:"title,omitempty"`
-	ReadOnly *bool   `json:"read_only,omitempty"`
-}
-
-func (k Key) String() string {
-	return Stringify(k)
-}
-
-// ListKeys lists the verified public keys for a user. Passing the empty
-// string will fetch keys for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/keys/#list-public-keys-for-a-user
-func (s *UsersService) ListKeys(ctx context.Context, user string, opt *ListOptions) ([]*Key, *Response, error) {
-	var u string
-	if user != "" {
-		u = fmt.Sprintf("users/%v/keys", user)
-	} else {
-		u = "user/keys"
-	}
-	u, err := addOptions(u, opt)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var keys []*Key
-	resp, err := s.client.Do(ctx, req, &keys)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return keys, resp, nil
-}
-
-// GetKey fetches a single public key.
-//
-// GitHub API docs: https://developer.github.com/v3/users/keys/#get-a-single-public-key
-func (s *UsersService) GetKey(ctx context.Context, id int) (*Key, *Response, error) {
-	u := fmt.Sprintf("user/keys/%v", id)
-
-	req, err := s.client.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	key := new(Key)
-	resp, err := s.client.Do(ctx, req, key)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return key, resp, nil
-}
-
-// CreateKey adds a public key for the authenticated user.
-//
-// GitHub API docs: https://developer.github.com/v3/users/keys/#create-a-public-key
-func (s *UsersService) CreateKey(ctx context.Context, key *Key) (*Key, *Response, error) {
-	u := "user/keys"
-
-	req, err := s.client.NewRequest("POST", u, key)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	k := new(Key)
-	resp, err := s.client.Do(ctx, req, k)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	return k, resp, nil
-}
-
-// DeleteKey deletes a public key.
-//
-// GitHub API docs: https://developer.github.com/v3/users/keys/#delete-a-public-key
-func (s *UsersService) DeleteKey(ctx context.Context, id int) (*Response, error) {
-	u := fmt.Sprintf("user/keys/%v", id)
-
-	req, err := s.client.NewRequest("DELETE", u, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.client.Do(ctx, req, nil)
-}
diff --git a/vendor/github.com/google/go-github/github/with_appengine.go b/vendor/github.com/google/go-github/github/with_appengine.go
deleted file mode 100644
index 957c4d3079..0000000000
--- a/vendor/github.com/google/go-github/github/with_appengine.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-// This file provides glue for making github work on App Engine.
-// In order to get the entire github package to compile with
-// Go 1.6, you will need to rewrite all the import "context" lines.
-// Fortunately, this is easy with "gofmt":
-//
-//     gofmt -w -r '"context" -> "golang.org/x/net/context"' *.go
-
-package github
-
-import (
-	"context"
-	"net/http"
-
-	"google.golang.org/appengine"
-)
-
-func withContext(ctx context.Context, req *http.Request) (context.Context, *http.Request) {
-	return appengine.WithContext(ctx, req), req
-}
diff --git a/vendor/github.com/google/go-github/github/without_appengine.go b/vendor/github.com/google/go-github/github/without_appengine.go
deleted file mode 100644
index b0edc04db1..0000000000
--- a/vendor/github.com/google/go-github/github/without_appengine.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The go-github AUTHORS. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !appengine
-
-// This file provides glue for making github work without App Engine.
-
-package github
-
-import (
-	"context"
-	"net/http"
-)
-
-func withContext(ctx context.Context, req *http.Request) (context.Context, *http.Request) {
-	return ctx, req.WithContext(ctx)
-}
diff --git a/vendor/github.com/google/go-querystring/LICENSE b/vendor/github.com/google/go-querystring/LICENSE
deleted file mode 100644
index ae121a1e46..0000000000
--- a/vendor/github.com/google/go-querystring/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2013 Google. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/google/go-querystring/query/encode.go b/vendor/github.com/google/go-querystring/query/encode.go
deleted file mode 100644
index 37080b19b5..0000000000
--- a/vendor/github.com/google/go-querystring/query/encode.go
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package query implements encoding of structs into URL query parameters.
-//
-// As a simple example:
-//
-// 	type Options struct {
-// 		Query   string `url:"q"`
-// 		ShowAll bool   `url:"all"`
-// 		Page    int    `url:"page"`
-// 	}
-//
-// 	opt := Options{ "foo", true, 2 }
-// 	v, _ := query.Values(opt)
-// 	fmt.Print(v.Encode()) // will output: "q=foo&all=true&page=2"
-//
-// The exact mapping between Go values and url.Values is described in the
-// documentation for the Values() function.
-package query
-
-import (
-	"bytes"
-	"fmt"
-	"net/url"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-)
-
-var timeType = reflect.TypeOf(time.Time{})
-
-var encoderType = reflect.TypeOf(new(Encoder)).Elem()
-
-// Encoder is an interface implemented by any type that wishes to encode
-// itself into URL values in a non-standard way.
-type Encoder interface {
-	EncodeValues(key string, v *url.Values) error
-}
-
-// Values returns the url.Values encoding of v.
-//
-// Values expects to be passed a struct, and traverses it recursively using the
-// following encoding rules.
-//
-// Each exported struct field is encoded as a URL parameter unless
-//
-//	- the field's tag is "-", or
-//	- the field is empty and its tag specifies the "omitempty" option
-//
-// The empty values are false, 0, any nil pointer or interface value, any array
-// slice, map, or string of length zero, and any time.Time that returns true
-// for IsZero().
-//
-// The URL parameter name defaults to the struct field name but can be
-// specified in the struct field's tag value.  The "url" key in the struct
-// field's tag value is the key name, followed by an optional comma and
-// options.  For example:
-//
-// 	// Field is ignored by this package.
-// 	Field int `url:"-"`
-//
-// 	// Field appears as URL parameter "myName".
-// 	Field int `url:"myName"`
-//
-// 	// Field appears as URL parameter "myName" and the field is omitted if
-// 	// its value is empty
-// 	Field int `url:"myName,omitempty"`
-//
-// 	// Field appears as URL parameter "Field" (the default), but the field
-// 	// is skipped if empty.  Note the leading comma.
-// 	Field int `url:",omitempty"`
-//
-// For encoding individual field values, the following type-dependent rules
-// apply:
-//
-// Boolean values default to encoding as the strings "true" or "false".
-// Including the "int" option signals that the field should be encoded as the
-// strings "1" or "0".
-//
-// time.Time values default to encoding as RFC3339 timestamps.  Including the
-// "unix" option signals that the field should be encoded as a Unix time (see
-// time.Unix())
-//
-// Slice and Array values default to encoding as multiple URL values of the
-// same name.  Including the "comma" option signals that the field should be
-// encoded as a single comma-delimited value.  Including the "space" option
-// similarly encodes the value as a single space-delimited string. Including
-// the "semicolon" option will encode the value as a semicolon-delimited string.
-// Including the "brackets" option signals that the multiple URL values should
-// have "[]" appended to the value name. "numbered" will append a number to
-// the end of each incidence of the value name, example:
-// name0=value0&name1=value1, etc.
-//
-// Anonymous struct fields are usually encoded as if their inner exported
-// fields were fields in the outer struct, subject to the standard Go
-// visibility rules.  An anonymous struct field with a name given in its URL
-// tag is treated as having that name, rather than being anonymous.
-//
-// Non-nil pointer values are encoded as the value pointed to.
-//
-// Nested structs are encoded including parent fields in value names for
-// scoping. e.g:
-//
-// 	"user[name]=acme&user[addr][postcode]=1234&user[addr][city]=SFO"
-//
-// All other values are encoded using their default string representation.
-//
-// Multiple fields that encode to the same URL parameter name will be included
-// as multiple URL values of the same name.
-func Values(v interface{}) (url.Values, error) {
-	values := make(url.Values)
-	val := reflect.ValueOf(v)
-	for val.Kind() == reflect.Ptr {
-		if val.IsNil() {
-			return values, nil
-		}
-		val = val.Elem()
-	}
-
-	if v == nil {
-		return values, nil
-	}
-
-	if val.Kind() != reflect.Struct {
-		return nil, fmt.Errorf("query: Values() expects struct input. Got %v", val.Kind())
-	}
-
-	err := reflectValue(values, val, "")
-	return values, err
-}
-
-// reflectValue populates the values parameter from the struct fields in val.
-// Embedded structs are followed recursively (using the rules defined in the
-// Values function documentation) breadth-first.
-func reflectValue(values url.Values, val reflect.Value, scope string) error {
-	var embedded []reflect.Value
-
-	typ := val.Type()
-	for i := 0; i < typ.NumField(); i++ {
-		sf := typ.Field(i)
-		if sf.PkgPath != "" && !sf.Anonymous { // unexported
-			continue
-		}
-
-		sv := val.Field(i)
-		tag := sf.Tag.Get("url")
-		if tag == "-" {
-			continue
-		}
-		name, opts := parseTag(tag)
-		if name == "" {
-			if sf.Anonymous && sv.Kind() == reflect.Struct {
-				// save embedded struct for later processing
-				embedded = append(embedded, sv)
-				continue
-			}
-
-			name = sf.Name
-		}
-
-		if scope != "" {
-			name = scope + "[" + name + "]"
-		}
-
-		if opts.Contains("omitempty") && isEmptyValue(sv) {
-			continue
-		}
-
-		if sv.Type().Implements(encoderType) {
-			if !reflect.Indirect(sv).IsValid() {
-				sv = reflect.New(sv.Type().Elem())
-			}
-
-			m := sv.Interface().(Encoder)
-			if err := m.EncodeValues(name, &values); err != nil {
-				return err
-			}
-			continue
-		}
-
-		if sv.Kind() == reflect.Slice || sv.Kind() == reflect.Array {
-			var del byte
-			if opts.Contains("comma") {
-				del = ','
-			} else if opts.Contains("space") {
-				del = ' '
-			} else if opts.Contains("semicolon") {
-				del = ';'
-			} else if opts.Contains("brackets") {
-				name = name + "[]"
-			}
-
-			if del != 0 {
-				s := new(bytes.Buffer)
-				first := true
-				for i := 0; i < sv.Len(); i++ {
-					if first {
-						first = false
-					} else {
-						s.WriteByte(del)
-					}
-					s.WriteString(valueString(sv.Index(i), opts))
-				}
-				values.Add(name, s.String())
-			} else {
-				for i := 0; i < sv.Len(); i++ {
-					k := name
-					if opts.Contains("numbered") {
-						k = fmt.Sprintf("%s%d", name, i)
-					}
-					values.Add(k, valueString(sv.Index(i), opts))
-				}
-			}
-			continue
-		}
-
-		for sv.Kind() == reflect.Ptr {
-			if sv.IsNil() {
-				break
-			}
-			sv = sv.Elem()
-		}
-
-		if sv.Type() == timeType {
-			values.Add(name, valueString(sv, opts))
-			continue
-		}
-
-		if sv.Kind() == reflect.Struct {
-			reflectValue(values, sv, name)
-			continue
-		}
-
-		values.Add(name, valueString(sv, opts))
-	}
-
-	for _, f := range embedded {
-		if err := reflectValue(values, f, scope); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// valueString returns the string representation of a value.
-func valueString(v reflect.Value, opts tagOptions) string {
-	for v.Kind() == reflect.Ptr {
-		if v.IsNil() {
-			return ""
-		}
-		v = v.Elem()
-	}
-
-	if v.Kind() == reflect.Bool && opts.Contains("int") {
-		if v.Bool() {
-			return "1"
-		}
-		return "0"
-	}
-
-	if v.Type() == timeType {
-		t := v.Interface().(time.Time)
-		if opts.Contains("unix") {
-			return strconv.FormatInt(t.Unix(), 10)
-		}
-		return t.Format(time.RFC3339)
-	}
-
-	return fmt.Sprint(v.Interface())
-}
-
-// isEmptyValue checks if a value should be considered empty for the purposes
-// of omitting fields with the "omitempty" option.
-func isEmptyValue(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
-		return v.Len() == 0
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.Interface, reflect.Ptr:
-		return v.IsNil()
-	}
-
-	if v.Type() == timeType {
-		return v.Interface().(time.Time).IsZero()
-	}
-
-	return false
-}
-
-// tagOptions is the string following a comma in a struct field's "url" tag, or
-// the empty string. It does not include the leading comma.
-type tagOptions []string
-
-// parseTag splits a struct field's url tag into its name and comma-separated
-// options.
-func parseTag(tag string) (string, tagOptions) {
-	s := strings.Split(tag, ",")
-	return s[0], s[1:]
-}
-
-// Contains checks whether the tagOptions contains the specified option.
-func (o tagOptions) Contains(option string) bool {
-	for _, s := range o {
-		if s == option {
-			return true
-		}
-	}
-	return false
-}
diff --git a/vendor/github.com/gorilla/context/LICENSE b/vendor/github.com/gorilla/context/LICENSE
deleted file mode 100644
index 0e5fb87280..0000000000
--- a/vendor/github.com/gorilla/context/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-	 * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-	 * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-	 * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/gorilla/context/README.md b/vendor/github.com/gorilla/context/README.md
deleted file mode 100644
index 08f86693bc..0000000000
--- a/vendor/github.com/gorilla/context/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-context
-=======
-[![Build Status](https://travis-ci.org/gorilla/context.png?branch=master)](https://travis-ci.org/gorilla/context)
-
-gorilla/context is a general purpose registry for global request variables.
-
-> Note: gorilla/context, having been born well before `context.Context` existed, does not play well
-> with the shallow copying of the request that [`http.Request.WithContext`](https://golang.org/pkg/net/http/#Request.WithContext) (added to net/http Go 1.7 onwards) performs. You should either use *just* gorilla/context, or moving forward, the new `http.Request.Context()`.
-
-Read the full documentation here: http://www.gorillatoolkit.org/pkg/context
diff --git a/vendor/github.com/gorilla/context/context.go b/vendor/github.com/gorilla/context/context.go
deleted file mode 100644
index 81cb128b19..0000000000
--- a/vendor/github.com/gorilla/context/context.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package context
-
-import (
-	"net/http"
-	"sync"
-	"time"
-)
-
-var (
-	mutex sync.RWMutex
-	data  = make(map[*http.Request]map[interface{}]interface{})
-	datat = make(map[*http.Request]int64)
-)
-
-// Set stores a value for a given key in a given request.
-func Set(r *http.Request, key, val interface{}) {
-	mutex.Lock()
-	if data[r] == nil {
-		data[r] = make(map[interface{}]interface{})
-		datat[r] = time.Now().Unix()
-	}
-	data[r][key] = val
-	mutex.Unlock()
-}
-
-// Get returns a value stored for a given key in a given request.
-func Get(r *http.Request, key interface{}) interface{} {
-	mutex.RLock()
-	if ctx := data[r]; ctx != nil {
-		value := ctx[key]
-		mutex.RUnlock()
-		return value
-	}
-	mutex.RUnlock()
-	return nil
-}
-
-// GetOk returns stored value and presence state like multi-value return of map access.
-func GetOk(r *http.Request, key interface{}) (interface{}, bool) {
-	mutex.RLock()
-	if _, ok := data[r]; ok {
-		value, ok := data[r][key]
-		mutex.RUnlock()
-		return value, ok
-	}
-	mutex.RUnlock()
-	return nil, false
-}
-
-// GetAll returns all stored values for the request as a map. Nil is returned for invalid requests.
-func GetAll(r *http.Request) map[interface{}]interface{} {
-	mutex.RLock()
-	if context, ok := data[r]; ok {
-		result := make(map[interface{}]interface{}, len(context))
-		for k, v := range context {
-			result[k] = v
-		}
-		mutex.RUnlock()
-		return result
-	}
-	mutex.RUnlock()
-	return nil
-}
-
-// GetAllOk returns all stored values for the request as a map and a boolean value that indicates if
-// the request was registered.
-func GetAllOk(r *http.Request) (map[interface{}]interface{}, bool) {
-	mutex.RLock()
-	context, ok := data[r]
-	result := make(map[interface{}]interface{}, len(context))
-	for k, v := range context {
-		result[k] = v
-	}
-	mutex.RUnlock()
-	return result, ok
-}
-
-// Delete removes a value stored for a given key in a given request.
-func Delete(r *http.Request, key interface{}) {
-	mutex.Lock()
-	if data[r] != nil {
-		delete(data[r], key)
-	}
-	mutex.Unlock()
-}
-
-// Clear removes all values stored for a given request.
-//
-// This is usually called by a handler wrapper to clean up request
-// variables at the end of a request lifetime. See ClearHandler().
-func Clear(r *http.Request) {
-	mutex.Lock()
-	clear(r)
-	mutex.Unlock()
-}
-
-// clear is Clear without the lock.
-func clear(r *http.Request) {
-	delete(data, r)
-	delete(datat, r)
-}
-
-// Purge removes request data stored for longer than maxAge, in seconds.
-// It returns the amount of requests removed.
-//
-// If maxAge <= 0, all request data is removed.
-//
-// This is only used for sanity check: in case context cleaning was not
-// properly set some request data can be kept forever, consuming an increasing
-// amount of memory. In case this is detected, Purge() must be called
-// periodically until the problem is fixed.
-func Purge(maxAge int) int {
-	mutex.Lock()
-	count := 0
-	if maxAge <= 0 {
-		count = len(data)
-		data = make(map[*http.Request]map[interface{}]interface{})
-		datat = make(map[*http.Request]int64)
-	} else {
-		min := time.Now().Unix() - int64(maxAge)
-		for r := range data {
-			if datat[r] < min {
-				clear(r)
-				count++
-			}
-		}
-	}
-	mutex.Unlock()
-	return count
-}
-
-// ClearHandler wraps an http.Handler and clears request values at the end
-// of a request lifetime.
-func ClearHandler(h http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		defer Clear(r)
-		h.ServeHTTP(w, r)
-	})
-}
diff --git a/vendor/github.com/gorilla/context/doc.go b/vendor/github.com/gorilla/context/doc.go
deleted file mode 100644
index 448d1bfcac..0000000000
--- a/vendor/github.com/gorilla/context/doc.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package context stores values shared during a request lifetime.
-
-Note: gorilla/context, having been born well before `context.Context` existed,
-does not play well > with the shallow copying of the request that
-[`http.Request.WithContext`](https://golang.org/pkg/net/http/#Request.WithContext)
-(added to net/http Go 1.7 onwards) performs. You should either use *just*
-gorilla/context, or moving forward, the new `http.Request.Context()`.
-
-For example, a router can set variables extracted from the URL and later
-application handlers can access those values, or it can be used to store
-sessions values to be saved at the end of a request. There are several
-others common uses.
-
-The idea was posted by Brad Fitzpatrick to the go-nuts mailing list:
-
-	http://groups.google.com/group/golang-nuts/msg/e2d679d303aa5d53
-
-Here's the basic usage: first define the keys that you will need. The key
-type is interface{} so a key can be of any type that supports equality.
-Here we define a key using a custom int type to avoid name collisions:
-
-	package foo
-
-	import (
-		"github.com/gorilla/context"
-	)
-
-	type key int
-
-	const MyKey key = 0
-
-Then set a variable. Variables are bound to an http.Request object, so you
-need a request instance to set a value:
-
-	context.Set(r, MyKey, "bar")
-
-The application can later access the variable using the same key you provided:
-
-	func MyHandler(w http.ResponseWriter, r *http.Request) {
-		// val is "bar".
-		val := context.Get(r, foo.MyKey)
-
-		// returns ("bar", true)
-		val, ok := context.GetOk(r, foo.MyKey)
-		// ...
-	}
-
-And that's all about the basic usage. We discuss some other ideas below.
-
-Any type can be stored in the context. To enforce a given type, make the key
-private and wrap Get() and Set() to accept and return values of a specific
-type:
-
-	type key int
-
-	const mykey key = 0
-
-	// GetMyKey returns a value for this package from the request values.
-	func GetMyKey(r *http.Request) SomeType {
-		if rv := context.Get(r, mykey); rv != nil {
-			return rv.(SomeType)
-		}
-		return nil
-	}
-
-	// SetMyKey sets a value for this package in the request values.
-	func SetMyKey(r *http.Request, val SomeType) {
-		context.Set(r, mykey, val)
-	}
-
-Variables must be cleared at the end of a request, to remove all values
-that were stored. This can be done in an http.Handler, after a request was
-served. Just call Clear() passing the request:
-
-	context.Clear(r)
-
-...or use ClearHandler(), which conveniently wraps an http.Handler to clear
-variables at the end of a request lifetime.
-
-The Routers from the packages gorilla/mux and gorilla/pat call Clear()
-so if you are using either of them you don't need to clear the context manually.
-*/
-package context
diff --git a/vendor/github.com/gorilla/mux/LICENSE b/vendor/github.com/gorilla/mux/LICENSE
deleted file mode 100644
index 0e5fb87280..0000000000
--- a/vendor/github.com/gorilla/mux/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-	 * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-	 * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-	 * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/gorilla/mux/README.md b/vendor/github.com/gorilla/mux/README.md
deleted file mode 100644
index cdab8784d1..0000000000
--- a/vendor/github.com/gorilla/mux/README.md
+++ /dev/null
@@ -1,340 +0,0 @@
-gorilla/mux
-===
-[![GoDoc](https://godoc.org/github.com/gorilla/mux?status.svg)](https://godoc.org/github.com/gorilla/mux)
-[![Build Status](https://travis-ci.org/gorilla/mux.svg?branch=master)](https://travis-ci.org/gorilla/mux)
-[![Sourcegraph](https://sourcegraph.com/github.com/gorilla/mux/-/badge.svg)](https://sourcegraph.com/github.com/gorilla/mux?badge)
-
-![Gorilla Logo](http://www.gorillatoolkit.org/static/images/gorilla-icon-64.png)
-
-http://www.gorillatoolkit.org/pkg/mux
-
-Package `gorilla/mux` implements a request router and dispatcher for matching incoming requests to
-their respective handler.
-
-The name mux stands for "HTTP request multiplexer". Like the standard `http.ServeMux`, `mux.Router` matches incoming requests against a list of registered routes and calls a handler for the route that matches the URL or other conditions. The main features are:
-
-* It implements the `http.Handler` interface so it is compatible with the standard `http.ServeMux`.
-* Requests can be matched based on URL host, path, path prefix, schemes, header and query values, HTTP methods or using custom matchers.
-* URL hosts and paths can have variables with an optional regular expression.
-* Registered URLs can be built, or "reversed", which helps maintaining references to resources.
-* Routes can be used as subrouters: nested routes are only tested if the parent route matches. This is useful to define groups of routes that share common conditions like a host, a path prefix or other repeated attributes. As a bonus, this optimizes request matching.
-
----
-
-* [Install](#install)
-* [Examples](#examples)
-* [Matching Routes](#matching-routes)
-* [Listing Routes](#listing-routes)
-* [Static Files](#static-files)
-* [Registered URLs](#registered-urls)
-* [Full Example](#full-example)
-
----
-
-## Install
-
-With a [correctly configured](https://golang.org/doc/install#testing) Go toolchain:
-
-```sh
-go get -u github.com/gorilla/mux
-```
-
-## Examples
-
-Let's start registering a couple of URL paths and handlers:
-
-```go
-func main() {
-	r := mux.NewRouter()
-	r.HandleFunc("/", HomeHandler)
-	r.HandleFunc("/products", ProductsHandler)
-	r.HandleFunc("/articles", ArticlesHandler)
-	http.Handle("/", r)
-}
-```
-
-Here we register three routes mapping URL paths to handlers. This is equivalent to how `http.HandleFunc()` works: if an incoming request URL matches one of the paths, the corresponding handler is called passing (`http.ResponseWriter`, `*http.Request`) as parameters.
-
-Paths can have variables. They are defined using the format `{name}` or `{name:pattern}`. If a regular expression pattern is not defined, the matched variable will be anything until the next slash. For example:
-
-```go
-r := mux.NewRouter()
-r.HandleFunc("/products/{key}", ProductHandler)
-r.HandleFunc("/articles/{category}/", ArticlesCategoryHandler)
-r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler)
-```
-
-The names are used to create a map of route variables which can be retrieved calling `mux.Vars()`:
-
-```go
-func ArticlesCategoryHandler(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	w.WriteHeader(http.StatusOK)
-	fmt.Fprintf(w, "Category: %v\n", vars["category"])
-}
-```
-
-And this is all you need to know about the basic usage. More advanced options are explained below.
-
-### Matching Routes
-
-Routes can also be restricted to a domain or subdomain. Just define a host pattern to be matched. They can also have variables:
-
-```go
-r := mux.NewRouter()
-// Only matches if domain is "www.example.com".
-r.Host("www.example.com")
-// Matches a dynamic subdomain.
-r.Host("{subdomain:[a-z]+}.domain.com")
-```
-
-There are several other matchers that can be added. To match path prefixes:
-
-```go
-r.PathPrefix("/products/")
-```
-
-...or HTTP methods:
-
-```go
-r.Methods("GET", "POST")
-```
-
-...or URL schemes:
-
-```go
-r.Schemes("https")
-```
-
-...or header values:
-
-```go
-r.Headers("X-Requested-With", "XMLHttpRequest")
-```
-
-...or query values:
-
-```go
-r.Queries("key", "value")
-```
-
-...or to use a custom matcher function:
-
-```go
-r.MatcherFunc(func(r *http.Request, rm *RouteMatch) bool {
-	return r.ProtoMajor == 0
-})
-```
-
-...and finally, it is possible to combine several matchers in a single route:
-
-```go
-r.HandleFunc("/products", ProductsHandler).
-  Host("www.example.com").
-  Methods("GET").
-  Schemes("http")
-```
-
-Setting the same matching conditions again and again can be boring, so we have a way to group several routes that share the same requirements. We call it "subrouting".
-
-For example, let's say we have several URLs that should only match when the host is `www.example.com`. Create a route for that host and get a "subrouter" from it:
-
-```go
-r := mux.NewRouter()
-s := r.Host("www.example.com").Subrouter()
-```
-
-Then register routes in the subrouter:
-
-```go
-s.HandleFunc("/products/", ProductsHandler)
-s.HandleFunc("/products/{key}", ProductHandler)
-s.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler)
-```
-
-The three URL paths we registered above will only be tested if the domain is `www.example.com`, because the subrouter is tested first. This is not only convenient, but also optimizes request matching. You can create subrouters combining any attribute matchers accepted by a route.
-
-Subrouters can be used to create domain or path "namespaces": you define subrouters in a central place and then parts of the app can register its paths relatively to a given subrouter.
-
-There's one more thing about subroutes. When a subrouter has a path prefix, the inner routes use it as base for their paths:
-
-```go
-r := mux.NewRouter()
-s := r.PathPrefix("/products").Subrouter()
-// "/products/"
-s.HandleFunc("/", ProductsHandler)
-// "/products/{key}/"
-s.HandleFunc("/{key}/", ProductHandler)
-// "/products/{key}/details"
-s.HandleFunc("/{key}/details", ProductDetailsHandler)
-```
-
-### Listing Routes
-
-Routes on a mux can be listed using the Router.Walk method—useful for generating documentation:
-
-```go
-package main
-
-import (
-    "fmt"
-    "net/http"
-
-    "github.com/gorilla/mux"
-)
-
-func handler(w http.ResponseWriter, r *http.Request) {
-    return
-}
-
-func main() {
-    r := mux.NewRouter()
-    r.HandleFunc("/", handler)
-    r.HandleFunc("/products", handler)
-    r.HandleFunc("/articles", handler)
-    r.HandleFunc("/articles/{id}", handler)
-    r.Walk(func(route *mux.Route, router *mux.Router, ancestors []*mux.Route) error {
-        t, err := route.GetPathTemplate()
-        if err != nil {
-            return err
-        }
-        fmt.Println(t)
-        return nil
-    })
-    http.Handle("/", r)
-}
-```
-
-### Static Files
-
-Note that the path provided to `PathPrefix()` represents a "wildcard": calling
-`PathPrefix("/static/").Handler(...)` means that the handler will be passed any
-request that matches "/static/*". This makes it easy to serve static files with mux:
-
-```go
-func main() {
-	var dir string
-
-	flag.StringVar(&dir, "dir", ".", "the directory to serve files from. Defaults to the current dir")
-	flag.Parse()
-	r := mux.NewRouter()
-
-	// This will serve files under http://localhost:8000/static/<filename>
-	r.PathPrefix("/static/").Handler(http.StripPrefix("/static/", http.FileServer(http.Dir(dir))))
-
-	srv := &http.Server{
-		Handler:      r,
-		Addr:         "127.0.0.1:8000",
-		// Good practice: enforce timeouts for servers you create!
-		WriteTimeout: 15 * time.Second,
-		ReadTimeout:  15 * time.Second,
-	}
-
-	log.Fatal(srv.ListenAndServe())
-}
-```
-
-### Registered URLs
-
-Now let's see how to build registered URLs.
-
-Routes can be named. All routes that define a name can have their URLs built, or "reversed". We define a name calling `Name()` on a route. For example:
-
-```go
-r := mux.NewRouter()
-r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-  Name("article")
-```
-
-To build a URL, get the route and call the `URL()` method, passing a sequence of key/value pairs for the route variables. For the previous route, we would do:
-
-```go
-url, err := r.Get("article").URL("category", "technology", "id", "42")
-```
-
-...and the result will be a `url.URL` with the following path:
-
-```
-"/articles/technology/42"
-```
-
-This also works for host variables:
-
-```go
-r := mux.NewRouter()
-r.Host("{subdomain}.domain.com").
-  Path("/articles/{category}/{id:[0-9]+}").
-  HandlerFunc(ArticleHandler).
-  Name("article")
-
-// url.String() will be "http://news.domain.com/articles/technology/42"
-url, err := r.Get("article").URL("subdomain", "news",
-                                 "category", "technology",
-                                 "id", "42")
-```
-
-All variables defined in the route are required, and their values must conform to the corresponding patterns. These requirements guarantee that a generated URL will always match a registered route -- the only exception is for explicitly defined "build-only" routes which never match.
-
-Regex support also exists for matching Headers within a route. For example, we could do:
-
-```go
-r.HeadersRegexp("Content-Type", "application/(text|json)")
-```
-
-...and the route will match both requests with a Content-Type of `application/json` as well as `application/text`
-
-There's also a way to build only the URL host or path for a route: use the methods `URLHost()` or `URLPath()` instead. For the previous route, we would do:
-
-```go
-// "http://news.domain.com/"
-host, err := r.Get("article").URLHost("subdomain", "news")
-
-// "/articles/technology/42"
-path, err := r.Get("article").URLPath("category", "technology", "id", "42")
-```
-
-And if you use subrouters, host and path defined separately can be built as well:
-
-```go
-r := mux.NewRouter()
-s := r.Host("{subdomain}.domain.com").Subrouter()
-s.Path("/articles/{category}/{id:[0-9]+}").
-  HandlerFunc(ArticleHandler).
-  Name("article")
-
-// "http://news.domain.com/articles/technology/42"
-url, err := r.Get("article").URL("subdomain", "news",
-                                 "category", "technology",
-                                 "id", "42")
-```
-
-## Full Example
-
-Here's a complete, runnable example of a small `mux` based server:
-
-```go
-package main
-
-import (
-	"net/http"
-	"log"
-	"github.com/gorilla/mux"
-)
-
-func YourHandler(w http.ResponseWriter, r *http.Request) {
-	w.Write([]byte("Gorilla!\n"))
-}
-
-func main() {
-	r := mux.NewRouter()
-	// Routes consist of a path and a handler function.
-	r.HandleFunc("/", YourHandler)
-
-	// Bind to a port and pass our router in
-	log.Fatal(http.ListenAndServe(":8000", r))
-}
-```
-
-## License
-
-BSD licensed. See the LICENSE file for details.
diff --git a/vendor/github.com/gorilla/mux/context_gorilla.go b/vendor/github.com/gorilla/mux/context_gorilla.go
deleted file mode 100644
index d7adaa8fad..0000000000
--- a/vendor/github.com/gorilla/mux/context_gorilla.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// +build !go1.7
-
-package mux
-
-import (
-	"net/http"
-
-	"github.com/gorilla/context"
-)
-
-func contextGet(r *http.Request, key interface{}) interface{} {
-	return context.Get(r, key)
-}
-
-func contextSet(r *http.Request, key, val interface{}) *http.Request {
-	if val == nil {
-		return r
-	}
-
-	context.Set(r, key, val)
-	return r
-}
-
-func contextClear(r *http.Request) {
-	context.Clear(r)
-}
diff --git a/vendor/github.com/gorilla/mux/context_native.go b/vendor/github.com/gorilla/mux/context_native.go
deleted file mode 100644
index 209cbea7d6..0000000000
--- a/vendor/github.com/gorilla/mux/context_native.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// +build go1.7
-
-package mux
-
-import (
-	"context"
-	"net/http"
-)
-
-func contextGet(r *http.Request, key interface{}) interface{} {
-	return r.Context().Value(key)
-}
-
-func contextSet(r *http.Request, key, val interface{}) *http.Request {
-	if val == nil {
-		return r
-	}
-
-	return r.WithContext(context.WithValue(r.Context(), key, val))
-}
-
-func contextClear(r *http.Request) {
-	return
-}
diff --git a/vendor/github.com/gorilla/mux/doc.go b/vendor/github.com/gorilla/mux/doc.go
deleted file mode 100644
index 00daf4a721..0000000000
--- a/vendor/github.com/gorilla/mux/doc.go
+++ /dev/null
@@ -1,240 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package mux implements a request router and dispatcher.
-
-The name mux stands for "HTTP request multiplexer". Like the standard
-http.ServeMux, mux.Router matches incoming requests against a list of
-registered routes and calls a handler for the route that matches the URL
-or other conditions. The main features are:
-
-	* Requests can be matched based on URL host, path, path prefix, schemes,
-	  header and query values, HTTP methods or using custom matchers.
-	* URL hosts and paths can have variables with an optional regular
-	  expression.
-	* Registered URLs can be built, or "reversed", which helps maintaining
-	  references to resources.
-	* Routes can be used as subrouters: nested routes are only tested if the
-	  parent route matches. This is useful to define groups of routes that
-	  share common conditions like a host, a path prefix or other repeated
-	  attributes. As a bonus, this optimizes request matching.
-	* It implements the http.Handler interface so it is compatible with the
-	  standard http.ServeMux.
-
-Let's start registering a couple of URL paths and handlers:
-
-	func main() {
-		r := mux.NewRouter()
-		r.HandleFunc("/", HomeHandler)
-		r.HandleFunc("/products", ProductsHandler)
-		r.HandleFunc("/articles", ArticlesHandler)
-		http.Handle("/", r)
-	}
-
-Here we register three routes mapping URL paths to handlers. This is
-equivalent to how http.HandleFunc() works: if an incoming request URL matches
-one of the paths, the corresponding handler is called passing
-(http.ResponseWriter, *http.Request) as parameters.
-
-Paths can have variables. They are defined using the format {name} or
-{name:pattern}. If a regular expression pattern is not defined, the matched
-variable will be anything until the next slash. For example:
-
-	r := mux.NewRouter()
-	r.HandleFunc("/products/{key}", ProductHandler)
-	r.HandleFunc("/articles/{category}/", ArticlesCategoryHandler)
-	r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler)
-
-Groups can be used inside patterns, as long as they are non-capturing (?:re). For example:
-
-	r.HandleFunc("/articles/{category}/{sort:(?:asc|desc|new)}", ArticlesCategoryHandler)
-
-The names are used to create a map of route variables which can be retrieved
-calling mux.Vars():
-
-	vars := mux.Vars(request)
-	category := vars["category"]
-
-Note that if any capturing groups are present, mux will panic() during parsing. To prevent
-this, convert any capturing groups to non-capturing, e.g. change "/{sort:(asc|desc)}" to
-"/{sort:(?:asc|desc)}". This is a change from prior versions which behaved unpredictably
-when capturing groups were present.
-
-And this is all you need to know about the basic usage. More advanced options
-are explained below.
-
-Routes can also be restricted to a domain or subdomain. Just define a host
-pattern to be matched. They can also have variables:
-
-	r := mux.NewRouter()
-	// Only matches if domain is "www.example.com".
-	r.Host("www.example.com")
-	// Matches a dynamic subdomain.
-	r.Host("{subdomain:[a-z]+}.domain.com")
-
-There are several other matchers that can be added. To match path prefixes:
-
-	r.PathPrefix("/products/")
-
-...or HTTP methods:
-
-	r.Methods("GET", "POST")
-
-...or URL schemes:
-
-	r.Schemes("https")
-
-...or header values:
-
-	r.Headers("X-Requested-With", "XMLHttpRequest")
-
-...or query values:
-
-	r.Queries("key", "value")
-
-...or to use a custom matcher function:
-
-	r.MatcherFunc(func(r *http.Request, rm *RouteMatch) bool {
-		return r.ProtoMajor == 0
-	})
-
-...and finally, it is possible to combine several matchers in a single route:
-
-	r.HandleFunc("/products", ProductsHandler).
-	  Host("www.example.com").
-	  Methods("GET").
-	  Schemes("http")
-
-Setting the same matching conditions again and again can be boring, so we have
-a way to group several routes that share the same requirements.
-We call it "subrouting".
-
-For example, let's say we have several URLs that should only match when the
-host is "www.example.com". Create a route for that host and get a "subrouter"
-from it:
-
-	r := mux.NewRouter()
-	s := r.Host("www.example.com").Subrouter()
-
-Then register routes in the subrouter:
-
-	s.HandleFunc("/products/", ProductsHandler)
-	s.HandleFunc("/products/{key}", ProductHandler)
-	s.HandleFunc("/articles/{category}/{id:[0-9]+}"), ArticleHandler)
-
-The three URL paths we registered above will only be tested if the domain is
-"www.example.com", because the subrouter is tested first. This is not
-only convenient, but also optimizes request matching. You can create
-subrouters combining any attribute matchers accepted by a route.
-
-Subrouters can be used to create domain or path "namespaces": you define
-subrouters in a central place and then parts of the app can register its
-paths relatively to a given subrouter.
-
-There's one more thing about subroutes. When a subrouter has a path prefix,
-the inner routes use it as base for their paths:
-
-	r := mux.NewRouter()
-	s := r.PathPrefix("/products").Subrouter()
-	// "/products/"
-	s.HandleFunc("/", ProductsHandler)
-	// "/products/{key}/"
-	s.HandleFunc("/{key}/", ProductHandler)
-	// "/products/{key}/details"
-	s.HandleFunc("/{key}/details", ProductDetailsHandler)
-
-Note that the path provided to PathPrefix() represents a "wildcard": calling
-PathPrefix("/static/").Handler(...) means that the handler will be passed any
-request that matches "/static/*". This makes it easy to serve static files with mux:
-
-	func main() {
-		var dir string
-
-		flag.StringVar(&dir, "dir", ".", "the directory to serve files from. Defaults to the current dir")
-		flag.Parse()
-		r := mux.NewRouter()
-
-		// This will serve files under http://localhost:8000/static/<filename>
-		r.PathPrefix("/static/").Handler(http.StripPrefix("/static/", http.FileServer(http.Dir(dir))))
-
-		srv := &http.Server{
-			Handler:      r,
-			Addr:         "127.0.0.1:8000",
-			// Good practice: enforce timeouts for servers you create!
-			WriteTimeout: 15 * time.Second,
-			ReadTimeout:  15 * time.Second,
-		}
-
-		log.Fatal(srv.ListenAndServe())
-	}
-
-Now let's see how to build registered URLs.
-
-Routes can be named. All routes that define a name can have their URLs built,
-or "reversed". We define a name calling Name() on a route. For example:
-
-	r := mux.NewRouter()
-	r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-	  Name("article")
-
-To build a URL, get the route and call the URL() method, passing a sequence of
-key/value pairs for the route variables. For the previous route, we would do:
-
-	url, err := r.Get("article").URL("category", "technology", "id", "42")
-
-...and the result will be a url.URL with the following path:
-
-	"/articles/technology/42"
-
-This also works for host variables:
-
-	r := mux.NewRouter()
-	r.Host("{subdomain}.domain.com").
-	  Path("/articles/{category}/{id:[0-9]+}").
-	  HandlerFunc(ArticleHandler).
-	  Name("article")
-
-	// url.String() will be "http://news.domain.com/articles/technology/42"
-	url, err := r.Get("article").URL("subdomain", "news",
-	                                 "category", "technology",
-	                                 "id", "42")
-
-All variables defined in the route are required, and their values must
-conform to the corresponding patterns. These requirements guarantee that a
-generated URL will always match a registered route -- the only exception is
-for explicitly defined "build-only" routes which never match.
-
-Regex support also exists for matching Headers within a route. For example, we could do:
-
-	r.HeadersRegexp("Content-Type", "application/(text|json)")
-
-...and the route will match both requests with a Content-Type of `application/json` as well as
-`application/text`
-
-There's also a way to build only the URL host or path for a route:
-use the methods URLHost() or URLPath() instead. For the previous route,
-we would do:
-
-	// "http://news.domain.com/"
-	host, err := r.Get("article").URLHost("subdomain", "news")
-
-	// "/articles/technology/42"
-	path, err := r.Get("article").URLPath("category", "technology", "id", "42")
-
-And if you use subrouters, host and path defined separately can be built
-as well:
-
-	r := mux.NewRouter()
-	s := r.Host("{subdomain}.domain.com").Subrouter()
-	s.Path("/articles/{category}/{id:[0-9]+}").
-	  HandlerFunc(ArticleHandler).
-	  Name("article")
-
-	// "http://news.domain.com/articles/technology/42"
-	url, err := r.Get("article").URL("subdomain", "news",
-	                                 "category", "technology",
-	                                 "id", "42")
-*/
-package mux
diff --git a/vendor/github.com/gorilla/mux/mux.go b/vendor/github.com/gorilla/mux/mux.go
deleted file mode 100644
index d66ec38415..0000000000
--- a/vendor/github.com/gorilla/mux/mux.go
+++ /dev/null
@@ -1,542 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mux
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"path"
-	"regexp"
-	"strings"
-)
-
-// NewRouter returns a new router instance.
-func NewRouter() *Router {
-	return &Router{namedRoutes: make(map[string]*Route), KeepContext: false}
-}
-
-// Router registers routes to be matched and dispatches a handler.
-//
-// It implements the http.Handler interface, so it can be registered to serve
-// requests:
-//
-//     var router = mux.NewRouter()
-//
-//     func main() {
-//         http.Handle("/", router)
-//     }
-//
-// Or, for Google App Engine, register it in a init() function:
-//
-//     func init() {
-//         http.Handle("/", router)
-//     }
-//
-// This will send all incoming requests to the router.
-type Router struct {
-	// Configurable Handler to be used when no route matches.
-	NotFoundHandler http.Handler
-	// Parent route, if this is a subrouter.
-	parent parentRoute
-	// Routes to be matched, in order.
-	routes []*Route
-	// Routes by name for URL building.
-	namedRoutes map[string]*Route
-	// See Router.StrictSlash(). This defines the flag for new routes.
-	strictSlash bool
-	// See Router.SkipClean(). This defines the flag for new routes.
-	skipClean bool
-	// If true, do not clear the request context after handling the request.
-	// This has no effect when go1.7+ is used, since the context is stored
-	// on the request itself.
-	KeepContext bool
-	// see Router.UseEncodedPath(). This defines a flag for all routes.
-	useEncodedPath bool
-}
-
-// Match matches registered routes against the request.
-func (r *Router) Match(req *http.Request, match *RouteMatch) bool {
-	for _, route := range r.routes {
-		if route.Match(req, match) {
-			return true
-		}
-	}
-
-	// Closest match for a router (includes sub-routers)
-	if r.NotFoundHandler != nil {
-		match.Handler = r.NotFoundHandler
-		return true
-	}
-	return false
-}
-
-// ServeHTTP dispatches the handler registered in the matched route.
-//
-// When there is a match, the route variables can be retrieved calling
-// mux.Vars(request).
-func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	if !r.skipClean {
-		path := req.URL.Path
-		if r.useEncodedPath {
-			path = getPath(req)
-		}
-		// Clean path to canonical form and redirect.
-		if p := cleanPath(path); p != path {
-
-			// Added 3 lines (Philip Schlump) - It was dropping the query string and #whatever from query.
-			// This matches with fix in go 1.2 r.c. 4 for same problem.  Go Issue:
-			// http://code.google.com/p/go/issues/detail?id=5252
-			url := *req.URL
-			url.Path = p
-			p = url.String()
-
-			w.Header().Set("Location", p)
-			w.WriteHeader(http.StatusMovedPermanently)
-			return
-		}
-	}
-	var match RouteMatch
-	var handler http.Handler
-	if r.Match(req, &match) {
-		handler = match.Handler
-		req = setVars(req, match.Vars)
-		req = setCurrentRoute(req, match.Route)
-	}
-	if handler == nil {
-		handler = http.NotFoundHandler()
-	}
-	if !r.KeepContext {
-		defer contextClear(req)
-	}
-	handler.ServeHTTP(w, req)
-}
-
-// Get returns a route registered with the given name.
-func (r *Router) Get(name string) *Route {
-	return r.getNamedRoutes()[name]
-}
-
-// GetRoute returns a route registered with the given name. This method
-// was renamed to Get() and remains here for backwards compatibility.
-func (r *Router) GetRoute(name string) *Route {
-	return r.getNamedRoutes()[name]
-}
-
-// StrictSlash defines the trailing slash behavior for new routes. The initial
-// value is false.
-//
-// When true, if the route path is "/path/", accessing "/path" will redirect
-// to the former and vice versa. In other words, your application will always
-// see the path as specified in the route.
-//
-// When false, if the route path is "/path", accessing "/path/" will not match
-// this route and vice versa.
-//
-// Special case: when a route sets a path prefix using the PathPrefix() method,
-// strict slash is ignored for that route because the redirect behavior can't
-// be determined from a prefix alone. However, any subrouters created from that
-// route inherit the original StrictSlash setting.
-func (r *Router) StrictSlash(value bool) *Router {
-	r.strictSlash = value
-	return r
-}
-
-// SkipClean defines the path cleaning behaviour for new routes. The initial
-// value is false. Users should be careful about which routes are not cleaned
-//
-// When true, if the route path is "/path//to", it will remain with the double
-// slash. This is helpful if you have a route like: /fetch/http://xkcd.com/534/
-//
-// When false, the path will be cleaned, so /fetch/http://xkcd.com/534/ will
-// become /fetch/http/xkcd.com/534
-func (r *Router) SkipClean(value bool) *Router {
-	r.skipClean = value
-	return r
-}
-
-// UseEncodedPath tells the router to match the encoded original path
-// to the routes.
-// For eg. "/path/foo%2Fbar/to" will match the path "/path/{var}/to".
-// This behavior has the drawback of needing to match routes against
-// r.RequestURI instead of r.URL.Path. Any modifications (such as http.StripPrefix)
-// to r.URL.Path will not affect routing when this flag is on and thus may
-// induce unintended behavior.
-//
-// If not called, the router will match the unencoded path to the routes.
-// For eg. "/path/foo%2Fbar/to" will match the path "/path/foo/bar/to"
-func (r *Router) UseEncodedPath() *Router {
-	r.useEncodedPath = true
-	return r
-}
-
-// ----------------------------------------------------------------------------
-// parentRoute
-// ----------------------------------------------------------------------------
-
-// getNamedRoutes returns the map where named routes are registered.
-func (r *Router) getNamedRoutes() map[string]*Route {
-	if r.namedRoutes == nil {
-		if r.parent != nil {
-			r.namedRoutes = r.parent.getNamedRoutes()
-		} else {
-			r.namedRoutes = make(map[string]*Route)
-		}
-	}
-	return r.namedRoutes
-}
-
-// getRegexpGroup returns regexp definitions from the parent route, if any.
-func (r *Router) getRegexpGroup() *routeRegexpGroup {
-	if r.parent != nil {
-		return r.parent.getRegexpGroup()
-	}
-	return nil
-}
-
-func (r *Router) buildVars(m map[string]string) map[string]string {
-	if r.parent != nil {
-		m = r.parent.buildVars(m)
-	}
-	return m
-}
-
-// ----------------------------------------------------------------------------
-// Route factories
-// ----------------------------------------------------------------------------
-
-// NewRoute registers an empty route.
-func (r *Router) NewRoute() *Route {
-	route := &Route{parent: r, strictSlash: r.strictSlash, skipClean: r.skipClean, useEncodedPath: r.useEncodedPath}
-	r.routes = append(r.routes, route)
-	return route
-}
-
-// Handle registers a new route with a matcher for the URL path.
-// See Route.Path() and Route.Handler().
-func (r *Router) Handle(path string, handler http.Handler) *Route {
-	return r.NewRoute().Path(path).Handler(handler)
-}
-
-// HandleFunc registers a new route with a matcher for the URL path.
-// See Route.Path() and Route.HandlerFunc().
-func (r *Router) HandleFunc(path string, f func(http.ResponseWriter,
-	*http.Request)) *Route {
-	return r.NewRoute().Path(path).HandlerFunc(f)
-}
-
-// Headers registers a new route with a matcher for request header values.
-// See Route.Headers().
-func (r *Router) Headers(pairs ...string) *Route {
-	return r.NewRoute().Headers(pairs...)
-}
-
-// Host registers a new route with a matcher for the URL host.
-// See Route.Host().
-func (r *Router) Host(tpl string) *Route {
-	return r.NewRoute().Host(tpl)
-}
-
-// MatcherFunc registers a new route with a custom matcher function.
-// See Route.MatcherFunc().
-func (r *Router) MatcherFunc(f MatcherFunc) *Route {
-	return r.NewRoute().MatcherFunc(f)
-}
-
-// Methods registers a new route with a matcher for HTTP methods.
-// See Route.Methods().
-func (r *Router) Methods(methods ...string) *Route {
-	return r.NewRoute().Methods(methods...)
-}
-
-// Path registers a new route with a matcher for the URL path.
-// See Route.Path().
-func (r *Router) Path(tpl string) *Route {
-	return r.NewRoute().Path(tpl)
-}
-
-// PathPrefix registers a new route with a matcher for the URL path prefix.
-// See Route.PathPrefix().
-func (r *Router) PathPrefix(tpl string) *Route {
-	return r.NewRoute().PathPrefix(tpl)
-}
-
-// Queries registers a new route with a matcher for URL query values.
-// See Route.Queries().
-func (r *Router) Queries(pairs ...string) *Route {
-	return r.NewRoute().Queries(pairs...)
-}
-
-// Schemes registers a new route with a matcher for URL schemes.
-// See Route.Schemes().
-func (r *Router) Schemes(schemes ...string) *Route {
-	return r.NewRoute().Schemes(schemes...)
-}
-
-// BuildVarsFunc registers a new route with a custom function for modifying
-// route variables before building a URL.
-func (r *Router) BuildVarsFunc(f BuildVarsFunc) *Route {
-	return r.NewRoute().BuildVarsFunc(f)
-}
-
-// Walk walks the router and all its sub-routers, calling walkFn for each route
-// in the tree. The routes are walked in the order they were added. Sub-routers
-// are explored depth-first.
-func (r *Router) Walk(walkFn WalkFunc) error {
-	return r.walk(walkFn, []*Route{})
-}
-
-// SkipRouter is used as a return value from WalkFuncs to indicate that the
-// router that walk is about to descend down to should be skipped.
-var SkipRouter = errors.New("skip this router")
-
-// WalkFunc is the type of the function called for each route visited by Walk.
-// At every invocation, it is given the current route, and the current router,
-// and a list of ancestor routes that lead to the current route.
-type WalkFunc func(route *Route, router *Router, ancestors []*Route) error
-
-func (r *Router) walk(walkFn WalkFunc, ancestors []*Route) error {
-	for _, t := range r.routes {
-		if t.regexp == nil || t.regexp.path == nil || t.regexp.path.template == "" {
-			continue
-		}
-
-		err := walkFn(t, r, ancestors)
-		if err == SkipRouter {
-			continue
-		}
-		if err != nil {
-			return err
-		}
-		for _, sr := range t.matchers {
-			if h, ok := sr.(*Router); ok {
-				err := h.walk(walkFn, ancestors)
-				if err != nil {
-					return err
-				}
-			}
-		}
-		if h, ok := t.handler.(*Router); ok {
-			ancestors = append(ancestors, t)
-			err := h.walk(walkFn, ancestors)
-			if err != nil {
-				return err
-			}
-			ancestors = ancestors[:len(ancestors)-1]
-		}
-	}
-	return nil
-}
-
-// ----------------------------------------------------------------------------
-// Context
-// ----------------------------------------------------------------------------
-
-// RouteMatch stores information about a matched route.
-type RouteMatch struct {
-	Route   *Route
-	Handler http.Handler
-	Vars    map[string]string
-}
-
-type contextKey int
-
-const (
-	varsKey contextKey = iota
-	routeKey
-)
-
-// Vars returns the route variables for the current request, if any.
-func Vars(r *http.Request) map[string]string {
-	if rv := contextGet(r, varsKey); rv != nil {
-		return rv.(map[string]string)
-	}
-	return nil
-}
-
-// CurrentRoute returns the matched route for the current request, if any.
-// This only works when called inside the handler of the matched route
-// because the matched route is stored in the request context which is cleared
-// after the handler returns, unless the KeepContext option is set on the
-// Router.
-func CurrentRoute(r *http.Request) *Route {
-	if rv := contextGet(r, routeKey); rv != nil {
-		return rv.(*Route)
-	}
-	return nil
-}
-
-func setVars(r *http.Request, val interface{}) *http.Request {
-	return contextSet(r, varsKey, val)
-}
-
-func setCurrentRoute(r *http.Request, val interface{}) *http.Request {
-	return contextSet(r, routeKey, val)
-}
-
-// ----------------------------------------------------------------------------
-// Helpers
-// ----------------------------------------------------------------------------
-
-// getPath returns the escaped path if possible; doing what URL.EscapedPath()
-// which was added in go1.5 does
-func getPath(req *http.Request) string {
-	if req.RequestURI != "" {
-		// Extract the path from RequestURI (which is escaped unlike URL.Path)
-		// as detailed here as detailed in https://golang.org/pkg/net/url/#URL
-		// for < 1.5 server side workaround
-		// http://localhost/path/here?v=1 -> /path/here
-		path := req.RequestURI
-		path = strings.TrimPrefix(path, req.URL.Scheme+`://`)
-		path = strings.TrimPrefix(path, req.URL.Host)
-		if i := strings.LastIndex(path, "?"); i > -1 {
-			path = path[:i]
-		}
-		if i := strings.LastIndex(path, "#"); i > -1 {
-			path = path[:i]
-		}
-		return path
-	}
-	return req.URL.Path
-}
-
-// cleanPath returns the canonical path for p, eliminating . and .. elements.
-// Borrowed from the net/http package.
-func cleanPath(p string) string {
-	if p == "" {
-		return "/"
-	}
-	if p[0] != '/' {
-		p = "/" + p
-	}
-	np := path.Clean(p)
-	// path.Clean removes trailing slash except for root;
-	// put the trailing slash back if necessary.
-	if p[len(p)-1] == '/' && np != "/" {
-		np += "/"
-	}
-
-	return np
-}
-
-// uniqueVars returns an error if two slices contain duplicated strings.
-func uniqueVars(s1, s2 []string) error {
-	for _, v1 := range s1 {
-		for _, v2 := range s2 {
-			if v1 == v2 {
-				return fmt.Errorf("mux: duplicated route variable %q", v2)
-			}
-		}
-	}
-	return nil
-}
-
-// checkPairs returns the count of strings passed in, and an error if
-// the count is not an even number.
-func checkPairs(pairs ...string) (int, error) {
-	length := len(pairs)
-	if length%2 != 0 {
-		return length, fmt.Errorf(
-			"mux: number of parameters must be multiple of 2, got %v", pairs)
-	}
-	return length, nil
-}
-
-// mapFromPairsToString converts variadic string parameters to a
-// string to string map.
-func mapFromPairsToString(pairs ...string) (map[string]string, error) {
-	length, err := checkPairs(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	m := make(map[string]string, length/2)
-	for i := 0; i < length; i += 2 {
-		m[pairs[i]] = pairs[i+1]
-	}
-	return m, nil
-}
-
-// mapFromPairsToRegex converts variadic string paramers to a
-// string to regex map.
-func mapFromPairsToRegex(pairs ...string) (map[string]*regexp.Regexp, error) {
-	length, err := checkPairs(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	m := make(map[string]*regexp.Regexp, length/2)
-	for i := 0; i < length; i += 2 {
-		regex, err := regexp.Compile(pairs[i+1])
-		if err != nil {
-			return nil, err
-		}
-		m[pairs[i]] = regex
-	}
-	return m, nil
-}
-
-// matchInArray returns true if the given string value is in the array.
-func matchInArray(arr []string, value string) bool {
-	for _, v := range arr {
-		if v == value {
-			return true
-		}
-	}
-	return false
-}
-
-// matchMapWithString returns true if the given key/value pairs exist in a given map.
-func matchMapWithString(toCheck map[string]string, toMatch map[string][]string, canonicalKey bool) bool {
-	for k, v := range toCheck {
-		// Check if key exists.
-		if canonicalKey {
-			k = http.CanonicalHeaderKey(k)
-		}
-		if values := toMatch[k]; values == nil {
-			return false
-		} else if v != "" {
-			// If value was defined as an empty string we only check that the
-			// key exists. Otherwise we also check for equality.
-			valueExists := false
-			for _, value := range values {
-				if v == value {
-					valueExists = true
-					break
-				}
-			}
-			if !valueExists {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-// matchMapWithRegex returns true if the given key/value pairs exist in a given map compiled against
-// the given regex
-func matchMapWithRegex(toCheck map[string]*regexp.Regexp, toMatch map[string][]string, canonicalKey bool) bool {
-	for k, v := range toCheck {
-		// Check if key exists.
-		if canonicalKey {
-			k = http.CanonicalHeaderKey(k)
-		}
-		if values := toMatch[k]; values == nil {
-			return false
-		} else if v != nil {
-			// If value was defined as an empty string we only check that the
-			// key exists. Otherwise we also check for equality.
-			valueExists := false
-			for _, value := range values {
-				if v.MatchString(value) {
-					valueExists = true
-					break
-				}
-			}
-			if !valueExists {
-				return false
-			}
-		}
-	}
-	return true
-}
diff --git a/vendor/github.com/gorilla/mux/regexp.go b/vendor/github.com/gorilla/mux/regexp.go
deleted file mode 100644
index 0189ad346f..0000000000
--- a/vendor/github.com/gorilla/mux/regexp.go
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mux
-
-import (
-	"bytes"
-	"fmt"
-	"net/http"
-	"net/url"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-// newRouteRegexp parses a route template and returns a routeRegexp,
-// used to match a host, a path or a query string.
-//
-// It will extract named variables, assemble a regexp to be matched, create
-// a "reverse" template to build URLs and compile regexps to validate variable
-// values used in URL building.
-//
-// Previously we accepted only Python-like identifiers for variable
-// names ([a-zA-Z_][a-zA-Z0-9_]*), but currently the only restriction is that
-// name and pattern can't be empty, and names can't contain a colon.
-func newRouteRegexp(tpl string, matchHost, matchPrefix, matchQuery, strictSlash, useEncodedPath bool) (*routeRegexp, error) {
-	// Check if it is well-formed.
-	idxs, errBraces := braceIndices(tpl)
-	if errBraces != nil {
-		return nil, errBraces
-	}
-	// Backup the original.
-	template := tpl
-	// Now let's parse it.
-	defaultPattern := "[^/]+"
-	if matchQuery {
-		defaultPattern = "[^?&]*"
-	} else if matchHost {
-		defaultPattern = "[^.]+"
-		matchPrefix = false
-	}
-	// Only match strict slash if not matching
-	if matchPrefix || matchHost || matchQuery {
-		strictSlash = false
-	}
-	// Set a flag for strictSlash.
-	endSlash := false
-	if strictSlash && strings.HasSuffix(tpl, "/") {
-		tpl = tpl[:len(tpl)-1]
-		endSlash = true
-	}
-	varsN := make([]string, len(idxs)/2)
-	varsR := make([]*regexp.Regexp, len(idxs)/2)
-	pattern := bytes.NewBufferString("")
-	pattern.WriteByte('^')
-	reverse := bytes.NewBufferString("")
-	var end int
-	var err error
-	for i := 0; i < len(idxs); i += 2 {
-		// Set all values we are interested in.
-		raw := tpl[end:idxs[i]]
-		end = idxs[i+1]
-		parts := strings.SplitN(tpl[idxs[i]+1:end-1], ":", 2)
-		name := parts[0]
-		patt := defaultPattern
-		if len(parts) == 2 {
-			patt = parts[1]
-		}
-		// Name or pattern can't be empty.
-		if name == "" || patt == "" {
-			return nil, fmt.Errorf("mux: missing name or pattern in %q",
-				tpl[idxs[i]:end])
-		}
-		// Build the regexp pattern.
-		fmt.Fprintf(pattern, "%s(?P<%s>%s)", regexp.QuoteMeta(raw), varGroupName(i/2), patt)
-
-		// Build the reverse template.
-		fmt.Fprintf(reverse, "%s%%s", raw)
-
-		// Append variable name and compiled pattern.
-		varsN[i/2] = name
-		varsR[i/2], err = regexp.Compile(fmt.Sprintf("^%s$", patt))
-		if err != nil {
-			return nil, err
-		}
-	}
-	// Add the remaining.
-	raw := tpl[end:]
-	pattern.WriteString(regexp.QuoteMeta(raw))
-	if strictSlash {
-		pattern.WriteString("[/]?")
-	}
-	if matchQuery {
-		// Add the default pattern if the query value is empty
-		if queryVal := strings.SplitN(template, "=", 2)[1]; queryVal == "" {
-			pattern.WriteString(defaultPattern)
-		}
-	}
-	if !matchPrefix {
-		pattern.WriteByte('$')
-	}
-	reverse.WriteString(raw)
-	if endSlash {
-		reverse.WriteByte('/')
-	}
-	// Compile full regexp.
-	reg, errCompile := regexp.Compile(pattern.String())
-	if errCompile != nil {
-		return nil, errCompile
-	}
-
-	// Check for capturing groups which used to work in older versions
-	if reg.NumSubexp() != len(idxs)/2 {
-		panic(fmt.Sprintf("route %s contains capture groups in its regexp. ", template) +
-			"Only non-capturing groups are accepted: e.g. (?:pattern) instead of (pattern)")
-	}
-
-	// Done!
-	return &routeRegexp{
-		template:       template,
-		matchHost:      matchHost,
-		matchQuery:     matchQuery,
-		strictSlash:    strictSlash,
-		useEncodedPath: useEncodedPath,
-		regexp:         reg,
-		reverse:        reverse.String(),
-		varsN:          varsN,
-		varsR:          varsR,
-	}, nil
-}
-
-// routeRegexp stores a regexp to match a host or path and information to
-// collect and validate route variables.
-type routeRegexp struct {
-	// The unmodified template.
-	template string
-	// True for host match, false for path or query string match.
-	matchHost bool
-	// True for query string match, false for path and host match.
-	matchQuery bool
-	// The strictSlash value defined on the route, but disabled if PathPrefix was used.
-	strictSlash bool
-	// Determines whether to use encoded path from getPath function or unencoded
-	// req.URL.Path for path matching
-	useEncodedPath bool
-	// Expanded regexp.
-	regexp *regexp.Regexp
-	// Reverse template.
-	reverse string
-	// Variable names.
-	varsN []string
-	// Variable regexps (validators).
-	varsR []*regexp.Regexp
-}
-
-// Match matches the regexp against the URL host or path.
-func (r *routeRegexp) Match(req *http.Request, match *RouteMatch) bool {
-	if !r.matchHost {
-		if r.matchQuery {
-			return r.matchQueryString(req)
-		}
-		path := req.URL.Path
-		if r.useEncodedPath {
-			path = getPath(req)
-		}
-		return r.regexp.MatchString(path)
-	}
-
-	return r.regexp.MatchString(getHost(req))
-}
-
-// url builds a URL part using the given values.
-func (r *routeRegexp) url(values map[string]string) (string, error) {
-	urlValues := make([]interface{}, len(r.varsN))
-	for k, v := range r.varsN {
-		value, ok := values[v]
-		if !ok {
-			return "", fmt.Errorf("mux: missing route variable %q", v)
-		}
-		urlValues[k] = value
-	}
-	rv := fmt.Sprintf(r.reverse, urlValues...)
-	if !r.regexp.MatchString(rv) {
-		// The URL is checked against the full regexp, instead of checking
-		// individual variables. This is faster but to provide a good error
-		// message, we check individual regexps if the URL doesn't match.
-		for k, v := range r.varsN {
-			if !r.varsR[k].MatchString(values[v]) {
-				return "", fmt.Errorf(
-					"mux: variable %q doesn't match, expected %q", values[v],
-					r.varsR[k].String())
-			}
-		}
-	}
-	return rv, nil
-}
-
-// getURLQuery returns a single query parameter from a request URL.
-// For a URL with foo=bar&baz=ding, we return only the relevant key
-// value pair for the routeRegexp.
-func (r *routeRegexp) getURLQuery(req *http.Request) string {
-	if !r.matchQuery {
-		return ""
-	}
-	templateKey := strings.SplitN(r.template, "=", 2)[0]
-	for key, vals := range req.URL.Query() {
-		if key == templateKey && len(vals) > 0 {
-			return key + "=" + vals[0]
-		}
-	}
-	return ""
-}
-
-func (r *routeRegexp) matchQueryString(req *http.Request) bool {
-	return r.regexp.MatchString(r.getURLQuery(req))
-}
-
-// braceIndices returns the first level curly brace indices from a string.
-// It returns an error in case of unbalanced braces.
-func braceIndices(s string) ([]int, error) {
-	var level, idx int
-	var idxs []int
-	for i := 0; i < len(s); i++ {
-		switch s[i] {
-		case '{':
-			if level++; level == 1 {
-				idx = i
-			}
-		case '}':
-			if level--; level == 0 {
-				idxs = append(idxs, idx, i+1)
-			} else if level < 0 {
-				return nil, fmt.Errorf("mux: unbalanced braces in %q", s)
-			}
-		}
-	}
-	if level != 0 {
-		return nil, fmt.Errorf("mux: unbalanced braces in %q", s)
-	}
-	return idxs, nil
-}
-
-// varGroupName builds a capturing group name for the indexed variable.
-func varGroupName(idx int) string {
-	return "v" + strconv.Itoa(idx)
-}
-
-// ----------------------------------------------------------------------------
-// routeRegexpGroup
-// ----------------------------------------------------------------------------
-
-// routeRegexpGroup groups the route matchers that carry variables.
-type routeRegexpGroup struct {
-	host    *routeRegexp
-	path    *routeRegexp
-	queries []*routeRegexp
-}
-
-// setMatch extracts the variables from the URL once a route matches.
-func (v *routeRegexpGroup) setMatch(req *http.Request, m *RouteMatch, r *Route) {
-	// Store host variables.
-	if v.host != nil {
-		host := getHost(req)
-		matches := v.host.regexp.FindStringSubmatchIndex(host)
-		if len(matches) > 0 {
-			extractVars(host, matches, v.host.varsN, m.Vars)
-		}
-	}
-	path := req.URL.Path
-	if r.useEncodedPath {
-		path = getPath(req)
-	}
-	// Store path variables.
-	if v.path != nil {
-		matches := v.path.regexp.FindStringSubmatchIndex(path)
-		if len(matches) > 0 {
-			extractVars(path, matches, v.path.varsN, m.Vars)
-			// Check if we should redirect.
-			if v.path.strictSlash {
-				p1 := strings.HasSuffix(path, "/")
-				p2 := strings.HasSuffix(v.path.template, "/")
-				if p1 != p2 {
-					u, _ := url.Parse(req.URL.String())
-					if p1 {
-						u.Path = u.Path[:len(u.Path)-1]
-					} else {
-						u.Path += "/"
-					}
-					m.Handler = http.RedirectHandler(u.String(), 301)
-				}
-			}
-		}
-	}
-	// Store query string variables.
-	for _, q := range v.queries {
-		queryURL := q.getURLQuery(req)
-		matches := q.regexp.FindStringSubmatchIndex(queryURL)
-		if len(matches) > 0 {
-			extractVars(queryURL, matches, q.varsN, m.Vars)
-		}
-	}
-}
-
-// getHost tries its best to return the request host.
-func getHost(r *http.Request) string {
-	if r.URL.IsAbs() {
-		return r.URL.Host
-	}
-	host := r.Host
-	// Slice off any port information.
-	if i := strings.Index(host, ":"); i != -1 {
-		host = host[:i]
-	}
-	return host
-
-}
-
-func extractVars(input string, matches []int, names []string, output map[string]string) {
-	for i, name := range names {
-		output[name] = input[matches[2*i+2]:matches[2*i+3]]
-	}
-}
diff --git a/vendor/github.com/gorilla/mux/route.go b/vendor/github.com/gorilla/mux/route.go
deleted file mode 100644
index 5544c1fd6b..0000000000
--- a/vendor/github.com/gorilla/mux/route.go
+++ /dev/null
@@ -1,636 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mux
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"net/url"
-	"regexp"
-	"strings"
-)
-
-// Route stores information to match a request and build URLs.
-type Route struct {
-	// Parent where the route was registered (a Router).
-	parent parentRoute
-	// Request handler for the route.
-	handler http.Handler
-	// List of matchers.
-	matchers []matcher
-	// Manager for the variables from host and path.
-	regexp *routeRegexpGroup
-	// If true, when the path pattern is "/path/", accessing "/path" will
-	// redirect to the former and vice versa.
-	strictSlash bool
-	// If true, when the path pattern is "/path//to", accessing "/path//to"
-	// will not redirect
-	skipClean bool
-	// If true, "/path/foo%2Fbar/to" will match the path "/path/{var}/to"
-	useEncodedPath bool
-	// If true, this route never matches: it is only used to build URLs.
-	buildOnly bool
-	// The name used to build URLs.
-	name string
-	// Error resulted from building a route.
-	err error
-
-	buildVarsFunc BuildVarsFunc
-}
-
-func (r *Route) SkipClean() bool {
-	return r.skipClean
-}
-
-// Match matches the route against the request.
-func (r *Route) Match(req *http.Request, match *RouteMatch) bool {
-	if r.buildOnly || r.err != nil {
-		return false
-	}
-	// Match everything.
-	for _, m := range r.matchers {
-		if matched := m.Match(req, match); !matched {
-			return false
-		}
-	}
-	// Yay, we have a match. Let's collect some info about it.
-	if match.Route == nil {
-		match.Route = r
-	}
-	if match.Handler == nil {
-		match.Handler = r.handler
-	}
-	if match.Vars == nil {
-		match.Vars = make(map[string]string)
-	}
-	// Set variables.
-	if r.regexp != nil {
-		r.regexp.setMatch(req, match, r)
-	}
-	return true
-}
-
-// ----------------------------------------------------------------------------
-// Route attributes
-// ----------------------------------------------------------------------------
-
-// GetError returns an error resulted from building the route, if any.
-func (r *Route) GetError() error {
-	return r.err
-}
-
-// BuildOnly sets the route to never match: it is only used to build URLs.
-func (r *Route) BuildOnly() *Route {
-	r.buildOnly = true
-	return r
-}
-
-// Handler --------------------------------------------------------------------
-
-// Handler sets a handler for the route.
-func (r *Route) Handler(handler http.Handler) *Route {
-	if r.err == nil {
-		r.handler = handler
-	}
-	return r
-}
-
-// HandlerFunc sets a handler function for the route.
-func (r *Route) HandlerFunc(f func(http.ResponseWriter, *http.Request)) *Route {
-	return r.Handler(http.HandlerFunc(f))
-}
-
-// GetHandler returns the handler for the route, if any.
-func (r *Route) GetHandler() http.Handler {
-	return r.handler
-}
-
-// Name -----------------------------------------------------------------------
-
-// Name sets the name for the route, used to build URLs.
-// If the name was registered already it will be overwritten.
-func (r *Route) Name(name string) *Route {
-	if r.name != "" {
-		r.err = fmt.Errorf("mux: route already has name %q, can't set %q",
-			r.name, name)
-	}
-	if r.err == nil {
-		r.name = name
-		r.getNamedRoutes()[name] = r
-	}
-	return r
-}
-
-// GetName returns the name for the route, if any.
-func (r *Route) GetName() string {
-	return r.name
-}
-
-// ----------------------------------------------------------------------------
-// Matchers
-// ----------------------------------------------------------------------------
-
-// matcher types try to match a request.
-type matcher interface {
-	Match(*http.Request, *RouteMatch) bool
-}
-
-// addMatcher adds a matcher to the route.
-func (r *Route) addMatcher(m matcher) *Route {
-	if r.err == nil {
-		r.matchers = append(r.matchers, m)
-	}
-	return r
-}
-
-// addRegexpMatcher adds a host or path matcher and builder to a route.
-func (r *Route) addRegexpMatcher(tpl string, matchHost, matchPrefix, matchQuery bool) error {
-	if r.err != nil {
-		return r.err
-	}
-	r.regexp = r.getRegexpGroup()
-	if !matchHost && !matchQuery {
-		if len(tpl) > 0 && tpl[0] != '/' {
-			return fmt.Errorf("mux: path must start with a slash, got %q", tpl)
-		}
-		if r.regexp.path != nil {
-			tpl = strings.TrimRight(r.regexp.path.template, "/") + tpl
-		}
-	}
-	rr, err := newRouteRegexp(tpl, matchHost, matchPrefix, matchQuery, r.strictSlash, r.useEncodedPath)
-	if err != nil {
-		return err
-	}
-	for _, q := range r.regexp.queries {
-		if err = uniqueVars(rr.varsN, q.varsN); err != nil {
-			return err
-		}
-	}
-	if matchHost {
-		if r.regexp.path != nil {
-			if err = uniqueVars(rr.varsN, r.regexp.path.varsN); err != nil {
-				return err
-			}
-		}
-		r.regexp.host = rr
-	} else {
-		if r.regexp.host != nil {
-			if err = uniqueVars(rr.varsN, r.regexp.host.varsN); err != nil {
-				return err
-			}
-		}
-		if matchQuery {
-			r.regexp.queries = append(r.regexp.queries, rr)
-		} else {
-			r.regexp.path = rr
-		}
-	}
-	r.addMatcher(rr)
-	return nil
-}
-
-// Headers --------------------------------------------------------------------
-
-// headerMatcher matches the request against header values.
-type headerMatcher map[string]string
-
-func (m headerMatcher) Match(r *http.Request, match *RouteMatch) bool {
-	return matchMapWithString(m, r.Header, true)
-}
-
-// Headers adds a matcher for request header values.
-// It accepts a sequence of key/value pairs to be matched. For example:
-//
-//     r := mux.NewRouter()
-//     r.Headers("Content-Type", "application/json",
-//               "X-Requested-With", "XMLHttpRequest")
-//
-// The above route will only match if both request header values match.
-// If the value is an empty string, it will match any value if the key is set.
-func (r *Route) Headers(pairs ...string) *Route {
-	if r.err == nil {
-		var headers map[string]string
-		headers, r.err = mapFromPairsToString(pairs...)
-		return r.addMatcher(headerMatcher(headers))
-	}
-	return r
-}
-
-// headerRegexMatcher matches the request against the route given a regex for the header
-type headerRegexMatcher map[string]*regexp.Regexp
-
-func (m headerRegexMatcher) Match(r *http.Request, match *RouteMatch) bool {
-	return matchMapWithRegex(m, r.Header, true)
-}
-
-// HeadersRegexp accepts a sequence of key/value pairs, where the value has regex
-// support. For example:
-//
-//     r := mux.NewRouter()
-//     r.HeadersRegexp("Content-Type", "application/(text|json)",
-//               "X-Requested-With", "XMLHttpRequest")
-//
-// The above route will only match if both the request header matches both regular expressions.
-// It the value is an empty string, it will match any value if the key is set.
-func (r *Route) HeadersRegexp(pairs ...string) *Route {
-	if r.err == nil {
-		var headers map[string]*regexp.Regexp
-		headers, r.err = mapFromPairsToRegex(pairs...)
-		return r.addMatcher(headerRegexMatcher(headers))
-	}
-	return r
-}
-
-// Host -----------------------------------------------------------------------
-
-// Host adds a matcher for the URL host.
-// It accepts a template with zero or more URL variables enclosed by {}.
-// Variables can define an optional regexp pattern to be matched:
-//
-// - {name} matches anything until the next dot.
-//
-// - {name:pattern} matches the given regexp pattern.
-//
-// For example:
-//
-//     r := mux.NewRouter()
-//     r.Host("www.example.com")
-//     r.Host("{subdomain}.domain.com")
-//     r.Host("{subdomain:[a-z]+}.domain.com")
-//
-// Variable names must be unique in a given route. They can be retrieved
-// calling mux.Vars(request).
-func (r *Route) Host(tpl string) *Route {
-	r.err = r.addRegexpMatcher(tpl, true, false, false)
-	return r
-}
-
-// MatcherFunc ----------------------------------------------------------------
-
-// MatcherFunc is the function signature used by custom matchers.
-type MatcherFunc func(*http.Request, *RouteMatch) bool
-
-// Match returns the match for a given request.
-func (m MatcherFunc) Match(r *http.Request, match *RouteMatch) bool {
-	return m(r, match)
-}
-
-// MatcherFunc adds a custom function to be used as request matcher.
-func (r *Route) MatcherFunc(f MatcherFunc) *Route {
-	return r.addMatcher(f)
-}
-
-// Methods --------------------------------------------------------------------
-
-// methodMatcher matches the request against HTTP methods.
-type methodMatcher []string
-
-func (m methodMatcher) Match(r *http.Request, match *RouteMatch) bool {
-	return matchInArray(m, r.Method)
-}
-
-// Methods adds a matcher for HTTP methods.
-// It accepts a sequence of one or more methods to be matched, e.g.:
-// "GET", "POST", "PUT".
-func (r *Route) Methods(methods ...string) *Route {
-	for k, v := range methods {
-		methods[k] = strings.ToUpper(v)
-	}
-	return r.addMatcher(methodMatcher(methods))
-}
-
-// Path -----------------------------------------------------------------------
-
-// Path adds a matcher for the URL path.
-// It accepts a template with zero or more URL variables enclosed by {}. The
-// template must start with a "/".
-// Variables can define an optional regexp pattern to be matched:
-//
-// - {name} matches anything until the next slash.
-//
-// - {name:pattern} matches the given regexp pattern.
-//
-// For example:
-//
-//     r := mux.NewRouter()
-//     r.Path("/products/").Handler(ProductsHandler)
-//     r.Path("/products/{key}").Handler(ProductsHandler)
-//     r.Path("/articles/{category}/{id:[0-9]+}").
-//       Handler(ArticleHandler)
-//
-// Variable names must be unique in a given route. They can be retrieved
-// calling mux.Vars(request).
-func (r *Route) Path(tpl string) *Route {
-	r.err = r.addRegexpMatcher(tpl, false, false, false)
-	return r
-}
-
-// PathPrefix -----------------------------------------------------------------
-
-// PathPrefix adds a matcher for the URL path prefix. This matches if the given
-// template is a prefix of the full URL path. See Route.Path() for details on
-// the tpl argument.
-//
-// Note that it does not treat slashes specially ("/foobar/" will be matched by
-// the prefix "/foo") so you may want to use a trailing slash here.
-//
-// Also note that the setting of Router.StrictSlash() has no effect on routes
-// with a PathPrefix matcher.
-func (r *Route) PathPrefix(tpl string) *Route {
-	r.err = r.addRegexpMatcher(tpl, false, true, false)
-	return r
-}
-
-// Query ----------------------------------------------------------------------
-
-// Queries adds a matcher for URL query values.
-// It accepts a sequence of key/value pairs. Values may define variables.
-// For example:
-//
-//     r := mux.NewRouter()
-//     r.Queries("foo", "bar", "id", "{id:[0-9]+}")
-//
-// The above route will only match if the URL contains the defined queries
-// values, e.g.: ?foo=bar&id=42.
-//
-// It the value is an empty string, it will match any value if the key is set.
-//
-// Variables can define an optional regexp pattern to be matched:
-//
-// - {name} matches anything until the next slash.
-//
-// - {name:pattern} matches the given regexp pattern.
-func (r *Route) Queries(pairs ...string) *Route {
-	length := len(pairs)
-	if length%2 != 0 {
-		r.err = fmt.Errorf(
-			"mux: number of parameters must be multiple of 2, got %v", pairs)
-		return nil
-	}
-	for i := 0; i < length; i += 2 {
-		if r.err = r.addRegexpMatcher(pairs[i]+"="+pairs[i+1], false, false, true); r.err != nil {
-			return r
-		}
-	}
-
-	return r
-}
-
-// Schemes --------------------------------------------------------------------
-
-// schemeMatcher matches the request against URL schemes.
-type schemeMatcher []string
-
-func (m schemeMatcher) Match(r *http.Request, match *RouteMatch) bool {
-	return matchInArray(m, r.URL.Scheme)
-}
-
-// Schemes adds a matcher for URL schemes.
-// It accepts a sequence of schemes to be matched, e.g.: "http", "https".
-func (r *Route) Schemes(schemes ...string) *Route {
-	for k, v := range schemes {
-		schemes[k] = strings.ToLower(v)
-	}
-	return r.addMatcher(schemeMatcher(schemes))
-}
-
-// BuildVarsFunc --------------------------------------------------------------
-
-// BuildVarsFunc is the function signature used by custom build variable
-// functions (which can modify route variables before a route's URL is built).
-type BuildVarsFunc func(map[string]string) map[string]string
-
-// BuildVarsFunc adds a custom function to be used to modify build variables
-// before a route's URL is built.
-func (r *Route) BuildVarsFunc(f BuildVarsFunc) *Route {
-	r.buildVarsFunc = f
-	return r
-}
-
-// Subrouter ------------------------------------------------------------------
-
-// Subrouter creates a subrouter for the route.
-//
-// It will test the inner routes only if the parent route matched. For example:
-//
-//     r := mux.NewRouter()
-//     s := r.Host("www.example.com").Subrouter()
-//     s.HandleFunc("/products/", ProductsHandler)
-//     s.HandleFunc("/products/{key}", ProductHandler)
-//     s.HandleFunc("/articles/{category}/{id:[0-9]+}"), ArticleHandler)
-//
-// Here, the routes registered in the subrouter won't be tested if the host
-// doesn't match.
-func (r *Route) Subrouter() *Router {
-	router := &Router{parent: r, strictSlash: r.strictSlash}
-	r.addMatcher(router)
-	return router
-}
-
-// ----------------------------------------------------------------------------
-// URL building
-// ----------------------------------------------------------------------------
-
-// URL builds a URL for the route.
-//
-// It accepts a sequence of key/value pairs for the route variables. For
-// example, given this route:
-//
-//     r := mux.NewRouter()
-//     r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-//       Name("article")
-//
-// ...a URL for it can be built using:
-//
-//     url, err := r.Get("article").URL("category", "technology", "id", "42")
-//
-// ...which will return an url.URL with the following path:
-//
-//     "/articles/technology/42"
-//
-// This also works for host variables:
-//
-//     r := mux.NewRouter()
-//     r.Host("{subdomain}.domain.com").
-//       HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-//       Name("article")
-//
-//     // url.String() will be "http://news.domain.com/articles/technology/42"
-//     url, err := r.Get("article").URL("subdomain", "news",
-//                                      "category", "technology",
-//                                      "id", "42")
-//
-// All variables defined in the route are required, and their values must
-// conform to the corresponding patterns.
-func (r *Route) URL(pairs ...string) (*url.URL, error) {
-	if r.err != nil {
-		return nil, r.err
-	}
-	if r.regexp == nil {
-		return nil, errors.New("mux: route doesn't have a host or path")
-	}
-	values, err := r.prepareVars(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	var scheme, host, path string
-	if r.regexp.host != nil {
-		// Set a default scheme.
-		scheme = "http"
-		if host, err = r.regexp.host.url(values); err != nil {
-			return nil, err
-		}
-	}
-	if r.regexp.path != nil {
-		if path, err = r.regexp.path.url(values); err != nil {
-			return nil, err
-		}
-	}
-	return &url.URL{
-		Scheme: scheme,
-		Host:   host,
-		Path:   path,
-	}, nil
-}
-
-// URLHost builds the host part of the URL for a route. See Route.URL().
-//
-// The route must have a host defined.
-func (r *Route) URLHost(pairs ...string) (*url.URL, error) {
-	if r.err != nil {
-		return nil, r.err
-	}
-	if r.regexp == nil || r.regexp.host == nil {
-		return nil, errors.New("mux: route doesn't have a host")
-	}
-	values, err := r.prepareVars(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	host, err := r.regexp.host.url(values)
-	if err != nil {
-		return nil, err
-	}
-	return &url.URL{
-		Scheme: "http",
-		Host:   host,
-	}, nil
-}
-
-// URLPath builds the path part of the URL for a route. See Route.URL().
-//
-// The route must have a path defined.
-func (r *Route) URLPath(pairs ...string) (*url.URL, error) {
-	if r.err != nil {
-		return nil, r.err
-	}
-	if r.regexp == nil || r.regexp.path == nil {
-		return nil, errors.New("mux: route doesn't have a path")
-	}
-	values, err := r.prepareVars(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	path, err := r.regexp.path.url(values)
-	if err != nil {
-		return nil, err
-	}
-	return &url.URL{
-		Path: path,
-	}, nil
-}
-
-// GetPathTemplate returns the template used to build the
-// route match.
-// This is useful for building simple REST API documentation and for instrumentation
-// against third-party services.
-// An error will be returned if the route does not define a path.
-func (r *Route) GetPathTemplate() (string, error) {
-	if r.err != nil {
-		return "", r.err
-	}
-	if r.regexp == nil || r.regexp.path == nil {
-		return "", errors.New("mux: route doesn't have a path")
-	}
-	return r.regexp.path.template, nil
-}
-
-// GetHostTemplate returns the template used to build the
-// route match.
-// This is useful for building simple REST API documentation and for instrumentation
-// against third-party services.
-// An error will be returned if the route does not define a host.
-func (r *Route) GetHostTemplate() (string, error) {
-	if r.err != nil {
-		return "", r.err
-	}
-	if r.regexp == nil || r.regexp.host == nil {
-		return "", errors.New("mux: route doesn't have a host")
-	}
-	return r.regexp.host.template, nil
-}
-
-// prepareVars converts the route variable pairs into a map. If the route has a
-// BuildVarsFunc, it is invoked.
-func (r *Route) prepareVars(pairs ...string) (map[string]string, error) {
-	m, err := mapFromPairsToString(pairs...)
-	if err != nil {
-		return nil, err
-	}
-	return r.buildVars(m), nil
-}
-
-func (r *Route) buildVars(m map[string]string) map[string]string {
-	if r.parent != nil {
-		m = r.parent.buildVars(m)
-	}
-	if r.buildVarsFunc != nil {
-		m = r.buildVarsFunc(m)
-	}
-	return m
-}
-
-// ----------------------------------------------------------------------------
-// parentRoute
-// ----------------------------------------------------------------------------
-
-// parentRoute allows routes to know about parent host and path definitions.
-type parentRoute interface {
-	getNamedRoutes() map[string]*Route
-	getRegexpGroup() *routeRegexpGroup
-	buildVars(map[string]string) map[string]string
-}
-
-// getNamedRoutes returns the map where named routes are registered.
-func (r *Route) getNamedRoutes() map[string]*Route {
-	if r.parent == nil {
-		// During tests router is not always set.
-		r.parent = NewRouter()
-	}
-	return r.parent.getNamedRoutes()
-}
-
-// getRegexpGroup returns regexp definitions from this route.
-func (r *Route) getRegexpGroup() *routeRegexpGroup {
-	if r.regexp == nil {
-		if r.parent == nil {
-			// During tests router is not always set.
-			r.parent = NewRouter()
-		}
-		regexp := r.parent.getRegexpGroup()
-		if regexp == nil {
-			r.regexp = new(routeRegexpGroup)
-		} else {
-			// Copy.
-			r.regexp = &routeRegexpGroup{
-				host:    regexp.host,
-				path:    regexp.path,
-				queries: regexp.queries,
-			}
-		}
-	}
-	return r.regexp
-}
diff --git a/vendor/github.com/imdario/mergo/CODE_OF_CONDUCT.md b/vendor/github.com/imdario/mergo/CODE_OF_CONDUCT.md
deleted file mode 100644
index 469b44907a..0000000000
--- a/vendor/github.com/imdario/mergo/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at i@dario.im. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/vendor/github.com/imdario/mergo/LICENSE b/vendor/github.com/imdario/mergo/LICENSE
deleted file mode 100644
index 686680298d..0000000000
--- a/vendor/github.com/imdario/mergo/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2013 Dario Castañé. All rights reserved.
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/imdario/mergo/README.md b/vendor/github.com/imdario/mergo/README.md
deleted file mode 100644
index b131069799..0000000000
--- a/vendor/github.com/imdario/mergo/README.md
+++ /dev/null
@@ -1,141 +0,0 @@
-# Mergo
-
-A helper to merge structs and maps in Golang. Useful for configuration default values, avoiding messy if-statements.
-
-Also a lovely [comune](http://en.wikipedia.org/wiki/Mergo) (municipality) in the Province of Ancona in the Italian region Marche.
-
-![Mergo dall'alto](http://www.comune.mergo.an.it/Siti/Mergo/Immagini/Foto/mergo_dall_alto.jpg)
-
-## Status
-
-It is ready for production use. It works fine after extensive use in the wild.
-
-[![Build Status][1]][2]
-[![GoDoc][3]][4]
-[![GoCard][5]][6]
-
-[1]: https://travis-ci.org/imdario/mergo.png
-[2]: https://travis-ci.org/imdario/mergo
-[3]: https://godoc.org/github.com/imdario/mergo?status.svg
-[4]: https://godoc.org/github.com/imdario/mergo
-[5]: https://goreportcard.com/badge/imdario/mergo
-[6]: https://goreportcard.com/report/github.com/imdario/mergo
-
-### Important note
-
-Mergo is intended to assign **only** zero value fields on destination with source value. Since April 6th it works like this. Before it didn't work properly, causing some random overwrites. After some issues and PRs I found it didn't merge as I designed it. Thanks to [imdario/mergo#8](https://github.com/imdario/mergo/pull/8) overwriting functions were added and the wrong behavior was clearly detected.
-
-If you were using Mergo **before** April 6th 2015, please check your project works as intended after updating your local copy with ```go get -u github.com/imdario/mergo```. I apologize for any issue caused by its previous behavior and any future bug that Mergo could cause (I hope it won't!) in existing projects after the change (release 0.2.0).
-
-### Mergo in the wild
-
-- [docker/docker](https://github.com/docker/docker/)
-- [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes)
-- [imdario/zas](https://github.com/imdario/zas)
-- [soniah/dnsmadeeasy](https://github.com/soniah/dnsmadeeasy)
-- [EagerIO/Stout](https://github.com/EagerIO/Stout)
-- [lynndylanhurley/defsynth-api](https://github.com/lynndylanhurley/defsynth-api)
-- [russross/canvasassignments](https://github.com/russross/canvasassignments)
-- [rdegges/cryptly-api](https://github.com/rdegges/cryptly-api)
-- [casualjim/exeggutor](https://github.com/casualjim/exeggutor)
-- [divshot/gitling](https://github.com/divshot/gitling)
-- [RWJMurphy/gorl](https://github.com/RWJMurphy/gorl)
-- [andrerocker/deploy42](https://github.com/andrerocker/deploy42)
-- [elwinar/rambler](https://github.com/elwinar/rambler)
-- [tmaiaroto/gopartman](https://github.com/tmaiaroto/gopartman)
-- [jfbus/impressionist](https://github.com/jfbus/impressionist)
-- [Jmeyering/zealot](https://github.com/Jmeyering/zealot)
-- [godep-migrator/rigger-host](https://github.com/godep-migrator/rigger-host)
-- [Dronevery/MultiwaySwitch-Go](https://github.com/Dronevery/MultiwaySwitch-Go)
-- [thoas/picfit](https://github.com/thoas/picfit)
-- [mantasmatelis/whooplist-server](https://github.com/mantasmatelis/whooplist-server)
-- [jnuthong/item_search](https://github.com/jnuthong/item_search)
-- [Iris Web Framework](https://github.com/kataras/iris)
-
-## Installation
-
-    go get github.com/imdario/mergo
-
-    // use in your .go code
-    import (
-        "github.com/imdario/mergo"
-    )
-
-## Usage
-
-You can only merge same-type structs with exported fields initialized as zero value of their type and same-types maps. Mergo won't merge unexported (private) fields but will do recursively any exported one. Also maps will be merged recursively except for structs inside maps (because they are not addressable using Go reflection).
-
-```go
-if err := mergo.Merge(&dst, src); err != nil {
-    // ...
-}
-```
-
-Also, you can merge overwriting values using MergeWithOverwrite.
-
-```go
-if err := mergo.MergeWithOverwrite(&dst, src); err != nil {
-    // ...
-}
-```
-
-Additionally, you can map a map[string]interface{} to a struct (and otherwise, from struct to map), following the same restrictions as in Merge(). Keys are capitalized to find each corresponding exported field.
-
-```go
-if err := mergo.Map(&dst, srcMap); err != nil {
-    // ...
-}
-```
-
-Warning: if you map a struct to map, it won't do it recursively. Don't expect Mergo to map struct members of your struct as map[string]interface{}. They will be just assigned as values.
-
-More information and examples in [godoc documentation](http://godoc.org/github.com/imdario/mergo).
-
-### Nice example
-
-```go
-package main
-
-import (
-	"fmt"
-	"github.com/imdario/mergo"
-)
-
-type Foo struct {
-	A string
-	B int64
-}
-
-func main() {
-	src := Foo{
-		A: "one",
-		B: 2,
-	}
-
-	dest := Foo{
-		A: "two",
-	}
-
-	mergo.Merge(&dest, src)
-
-	fmt.Println(dest)
-	// Will print
-	// {two 2}
-}
-```
-
-Note: if test are failing due missing package, please execute:
-
-    go get gopkg.in/yaml.v1
-
-## Contact me
-
-If I can help you, you have an idea or you are using Mergo in your projects, don't hesitate to drop me a line (or a pull request): [@im_dario](https://twitter.com/im_dario)
-
-## About
-
-Written by [Dario Castañé](http://dario.im).
-
-## License
-
-[BSD 3-Clause](http://opensource.org/licenses/BSD-3-Clause) license, as [Go language](http://golang.org/LICENSE).
diff --git a/vendor/github.com/imdario/mergo/doc.go b/vendor/github.com/imdario/mergo/doc.go
deleted file mode 100644
index 6e9aa7baf3..0000000000
--- a/vendor/github.com/imdario/mergo/doc.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2013 Dario Castañé. All rights reserved.
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package mergo merges same-type structs and maps by setting default values in zero-value fields.
-
-Mergo won't merge unexported (private) fields but will do recursively any exported one. It also won't merge structs inside maps (because they are not addressable using Go reflection).
-
-Usage
-
-From my own work-in-progress project:
-
-	type networkConfig struct {
-		Protocol string
-		Address string
-		ServerType string `json: "server_type"`
-		Port uint16
-	}
-
-	type FssnConfig struct {
-		Network networkConfig
-	}
-
-	var fssnDefault = FssnConfig {
-		networkConfig {
-			"tcp",
-			"127.0.0.1",
-			"http",
-			31560,
-		},
-	}
-
-	// Inside a function [...]
-
-	if err := mergo.Merge(&config, fssnDefault); err != nil {
-		log.Fatal(err)
-	}
-
-	// More code [...]
-
-*/
-package mergo
diff --git a/vendor/github.com/imdario/mergo/issue17_test.go b/vendor/github.com/imdario/mergo/issue17_test.go
deleted file mode 100644
index 0ee96f3771..0000000000
--- a/vendor/github.com/imdario/mergo/issue17_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package mergo
-
-import (
-	"encoding/json"
-	"testing"
-)
-
-var (
-	request    = `{"timestamp":null, "name": "foo"}`
-	maprequest = map[string]interface{}{
-		"timestamp": nil,
-		"name":      "foo",
-		"newStuff":  "foo",
-	}
-)
-
-func TestIssue17MergeWithOverwrite(t *testing.T) {
-	var something map[string]interface{}
-	if err := json.Unmarshal([]byte(request), &something); err != nil {
-		t.Errorf("Error while Unmarshalling maprequest %s", err)
-	}
-	if err := MergeWithOverwrite(&something, maprequest); err != nil {
-		t.Errorf("Error while merging %s", err)
-	}
-}
diff --git a/vendor/github.com/imdario/mergo/issue23_test.go b/vendor/github.com/imdario/mergo/issue23_test.go
deleted file mode 100644
index 9c32584131..0000000000
--- a/vendor/github.com/imdario/mergo/issue23_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package mergo
-
-import (
-	"testing"
-	"time"
-)
-
-type document struct {
-	Created *time.Time
-}
-
-func TestIssue23MergeWithOverwrite(t *testing.T) {
-	now := time.Now()
-	dst := document{
-		&now,
-	}
-	expected := time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC)
-	src := document{
-		&expected,
-	}
-	if err := MergeWithOverwrite(&dst, src); err != nil {
-		t.Errorf("Error while merging %s", err)
-	}
-	if dst.Created != src.Created {
-		t.Fatalf("Created not merged in properly: dst.Created(%v) != src.Created(%v)", dst.Created, src.Created)
-	}
-}
diff --git a/vendor/github.com/imdario/mergo/map.go b/vendor/github.com/imdario/mergo/map.go
deleted file mode 100644
index 8e8c4ba8eb..0000000000
--- a/vendor/github.com/imdario/mergo/map.go
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2014 Dario Castañé. All rights reserved.
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Based on src/pkg/reflect/deepequal.go from official
-// golang's stdlib.
-
-package mergo
-
-import (
-	"fmt"
-	"reflect"
-	"unicode"
-	"unicode/utf8"
-)
-
-func changeInitialCase(s string, mapper func(rune) rune) string {
-	if s == "" {
-		return s
-	}
-	r, n := utf8.DecodeRuneInString(s)
-	return string(mapper(r)) + s[n:]
-}
-
-func isExported(field reflect.StructField) bool {
-	r, _ := utf8.DecodeRuneInString(field.Name)
-	return r >= 'A' && r <= 'Z'
-}
-
-// Traverses recursively both values, assigning src's fields values to dst.
-// The map argument tracks comparisons that have already been seen, which allows
-// short circuiting on recursive types.
-func deepMap(dst, src reflect.Value, visited map[uintptr]*visit, depth int, overwrite bool) (err error) {
-	if dst.CanAddr() {
-		addr := dst.UnsafeAddr()
-		h := 17 * addr
-		seen := visited[h]
-		typ := dst.Type()
-		for p := seen; p != nil; p = p.next {
-			if p.ptr == addr && p.typ == typ {
-				return nil
-			}
-		}
-		// Remember, remember...
-		visited[h] = &visit{addr, typ, seen}
-	}
-	zeroValue := reflect.Value{}
-	switch dst.Kind() {
-	case reflect.Map:
-		dstMap := dst.Interface().(map[string]interface{})
-		for i, n := 0, src.NumField(); i < n; i++ {
-			srcType := src.Type()
-			field := srcType.Field(i)
-			if !isExported(field) {
-				continue
-			}
-			fieldName := field.Name
-			fieldName = changeInitialCase(fieldName, unicode.ToLower)
-			if v, ok := dstMap[fieldName]; !ok || (isEmptyValue(reflect.ValueOf(v)) || overwrite) {
-				dstMap[fieldName] = src.Field(i).Interface()
-			}
-		}
-	case reflect.Struct:
-		srcMap := src.Interface().(map[string]interface{})
-		for key := range srcMap {
-			srcValue := srcMap[key]
-			fieldName := changeInitialCase(key, unicode.ToUpper)
-			dstElement := dst.FieldByName(fieldName)
-			if dstElement == zeroValue {
-				// We discard it because the field doesn't exist.
-				continue
-			}
-			srcElement := reflect.ValueOf(srcValue)
-			dstKind := dstElement.Kind()
-			srcKind := srcElement.Kind()
-			if srcKind == reflect.Ptr && dstKind != reflect.Ptr {
-				srcElement = srcElement.Elem()
-				srcKind = reflect.TypeOf(srcElement.Interface()).Kind()
-			} else if dstKind == reflect.Ptr {
-				// Can this work? I guess it can't.
-				if srcKind != reflect.Ptr && srcElement.CanAddr() {
-					srcPtr := srcElement.Addr()
-					srcElement = reflect.ValueOf(srcPtr)
-					srcKind = reflect.Ptr
-				}
-			}
-			if !srcElement.IsValid() {
-				continue
-			}
-			if srcKind == dstKind {
-				if err = deepMerge(dstElement, srcElement, visited, depth+1, overwrite); err != nil {
-					return
-				}
-			} else {
-				if srcKind == reflect.Map {
-					if err = deepMap(dstElement, srcElement, visited, depth+1, overwrite); err != nil {
-						return
-					}
-				} else {
-					return fmt.Errorf("type mismatch on %s field: found %v, expected %v", fieldName, srcKind, dstKind)
-				}
-			}
-		}
-	}
-	return
-}
-
-// Map sets fields' values in dst from src.
-// src can be a map with string keys or a struct. dst must be the opposite:
-// if src is a map, dst must be a valid pointer to struct. If src is a struct,
-// dst must be map[string]interface{}.
-// It won't merge unexported (private) fields and will do recursively
-// any exported field.
-// If dst is a map, keys will be src fields' names in lower camel case.
-// Missing key in src that doesn't match a field in dst will be skipped. This
-// doesn't apply if dst is a map.
-// This is separated method from Merge because it is cleaner and it keeps sane
-// semantics: merging equal types, mapping different (restricted) types.
-func Map(dst, src interface{}) error {
-	return _map(dst, src, false)
-}
-
-// MapWithOverwrite will do the same as Map except that non-empty dst attributes will be overriden by
-// non-empty src attribute values.
-func MapWithOverwrite(dst, src interface{}) error {
-	return _map(dst, src, true)
-}
-
-func _map(dst, src interface{}, overwrite bool) error {
-	var (
-		vDst, vSrc reflect.Value
-		err        error
-	)
-	if vDst, vSrc, err = resolveValues(dst, src); err != nil {
-		return err
-	}
-	// To be friction-less, we redirect equal-type arguments
-	// to deepMerge. Only because arguments can be anything.
-	if vSrc.Kind() == vDst.Kind() {
-		return deepMerge(vDst, vSrc, make(map[uintptr]*visit), 0, overwrite)
-	}
-	switch vSrc.Kind() {
-	case reflect.Struct:
-		if vDst.Kind() != reflect.Map {
-			return ErrExpectedMapAsDestination
-		}
-	case reflect.Map:
-		if vDst.Kind() != reflect.Struct {
-			return ErrExpectedStructAsDestination
-		}
-	default:
-		return ErrNotSupported
-	}
-	return deepMap(vDst, vSrc, make(map[uintptr]*visit), 0, overwrite)
-}
diff --git a/vendor/github.com/imdario/mergo/merge.go b/vendor/github.com/imdario/mergo/merge.go
deleted file mode 100644
index 513774f4c7..0000000000
--- a/vendor/github.com/imdario/mergo/merge.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2013 Dario Castañé. All rights reserved.
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Based on src/pkg/reflect/deepequal.go from official
-// golang's stdlib.
-
-package mergo
-
-import (
-	"reflect"
-)
-
-// Traverses recursively both values, assigning src's fields values to dst.
-// The map argument tracks comparisons that have already been seen, which allows
-// short circuiting on recursive types.
-func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, overwrite bool) (err error) {
-	if !src.IsValid() {
-		return
-	}
-	if dst.CanAddr() {
-		addr := dst.UnsafeAddr()
-		h := 17 * addr
-		seen := visited[h]
-		typ := dst.Type()
-		for p := seen; p != nil; p = p.next {
-			if p.ptr == addr && p.typ == typ {
-				return nil
-			}
-		}
-		// Remember, remember...
-		visited[h] = &visit{addr, typ, seen}
-	}
-	switch dst.Kind() {
-	case reflect.Struct:
-		for i, n := 0, dst.NumField(); i < n; i++ {
-			if err = deepMerge(dst.Field(i), src.Field(i), visited, depth+1, overwrite); err != nil {
-				return
-			}
-		}
-	case reflect.Map:
-		for _, key := range src.MapKeys() {
-			srcElement := src.MapIndex(key)
-			if !srcElement.IsValid() {
-				continue
-			}
-			dstElement := dst.MapIndex(key)
-			switch srcElement.Kind() {
-			case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.Interface, reflect.Slice:
-				if srcElement.IsNil() {
-					continue
-				}
-				fallthrough
-			default:
-				if !srcElement.CanInterface() {
-					continue
-				}
-				switch reflect.TypeOf(srcElement.Interface()).Kind() {
-				case reflect.Struct:
-					fallthrough
-				case reflect.Ptr:
-					fallthrough
-				case reflect.Map:
-					if err = deepMerge(dstElement, srcElement, visited, depth+1, overwrite); err != nil {
-						return
-					}
-				}
-			}
-			if !isEmptyValue(srcElement) && (overwrite || (!dstElement.IsValid() || isEmptyValue(dst))) {
-				if dst.IsNil() {
-					dst.Set(reflect.MakeMap(dst.Type()))
-				}
-				dst.SetMapIndex(key, srcElement)
-			}
-		}
-	case reflect.Ptr:
-		fallthrough
-	case reflect.Interface:
-		if src.IsNil() {
-			break
-		} else if dst.IsNil() || overwrite {
-			if dst.CanSet() && (overwrite || isEmptyValue(dst)) {
-				dst.Set(src)
-			}
-		} else if err = deepMerge(dst.Elem(), src.Elem(), visited, depth+1, overwrite); err != nil {
-			return
-		}
-	default:
-		if dst.CanSet() && !isEmptyValue(src) && (overwrite || isEmptyValue(dst)) {
-			dst.Set(src)
-		}
-	}
-	return
-}
-
-// Merge will fill any empty for value type attributes on the dst struct using corresponding
-// src attributes if they themselves are not empty. dst and src must be valid same-type structs
-// and dst must be a pointer to struct.
-// It won't merge unexported (private) fields and will do recursively any exported field.
-func Merge(dst, src interface{}) error {
-	return merge(dst, src, false)
-}
-
-// MergeWithOverwrite will do the same as Merge except that non-empty dst attributes will be overriden by
-// non-empty src attribute values.
-func MergeWithOverwrite(dst, src interface{}) error {
-	return merge(dst, src, true)
-}
-
-func merge(dst, src interface{}, overwrite bool) error {
-	var (
-		vDst, vSrc reflect.Value
-		err        error
-	)
-	if vDst, vSrc, err = resolveValues(dst, src); err != nil {
-		return err
-	}
-	if vDst.Type() != vSrc.Type() {
-		return ErrDifferentArgumentsTypes
-	}
-	return deepMerge(vDst, vSrc, make(map[uintptr]*visit), 0, overwrite)
-}
diff --git a/vendor/github.com/imdario/mergo/mergo.go b/vendor/github.com/imdario/mergo/mergo.go
deleted file mode 100644
index f8a0991ec6..0000000000
--- a/vendor/github.com/imdario/mergo/mergo.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2013 Dario Castañé. All rights reserved.
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Based on src/pkg/reflect/deepequal.go from official
-// golang's stdlib.
-
-package mergo
-
-import (
-	"errors"
-	"reflect"
-)
-
-// Errors reported by Mergo when it finds invalid arguments.
-var (
-	ErrNilArguments                = errors.New("src and dst must not be nil")
-	ErrDifferentArgumentsTypes     = errors.New("src and dst must be of same type")
-	ErrNotSupported                = errors.New("only structs and maps are supported")
-	ErrExpectedMapAsDestination    = errors.New("dst was expected to be a map")
-	ErrExpectedStructAsDestination = errors.New("dst was expected to be a struct")
-)
-
-// During deepMerge, must keep track of checks that are
-// in progress.  The comparison algorithm assumes that all
-// checks in progress are true when it reencounters them.
-// Visited are stored in a map indexed by 17 * a1 + a2;
-type visit struct {
-	ptr  uintptr
-	typ  reflect.Type
-	next *visit
-}
-
-// From src/pkg/encoding/json.
-func isEmptyValue(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
-		return v.Len() == 0
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.Interface, reflect.Ptr:
-		return v.IsNil()
-	}
-	return false
-}
-
-func resolveValues(dst, src interface{}) (vDst, vSrc reflect.Value, err error) {
-	if dst == nil || src == nil {
-		err = ErrNilArguments
-		return
-	}
-	vDst = reflect.ValueOf(dst).Elem()
-	if vDst.Kind() != reflect.Struct && vDst.Kind() != reflect.Map {
-		err = ErrNotSupported
-		return
-	}
-	vSrc = reflect.ValueOf(src)
-	// We check if vSrc is a pointer to dereference it.
-	if vSrc.Kind() == reflect.Ptr {
-		vSrc = vSrc.Elem()
-	}
-	return
-}
-
-// Traverses recursively both values, assigning src's fields values to dst.
-// The map argument tracks comparisons that have already been seen, which allows
-// short circuiting on recursive types.
-func deeper(dst, src reflect.Value, visited map[uintptr]*visit, depth int) (err error) {
-	if dst.CanAddr() {
-		addr := dst.UnsafeAddr()
-		h := 17 * addr
-		seen := visited[h]
-		typ := dst.Type()
-		for p := seen; p != nil; p = p.next {
-			if p.ptr == addr && p.typ == typ {
-				return nil
-			}
-		}
-		// Remember, remember...
-		visited[h] = &visit{addr, typ, seen}
-	}
-	return // TODO refactor
-}
diff --git a/vendor/github.com/imdario/mergo/mergo_test.go b/vendor/github.com/imdario/mergo/mergo_test.go
deleted file mode 100644
index 1b7b4a6682..0000000000
--- a/vendor/github.com/imdario/mergo/mergo_test.go
+++ /dev/null
@@ -1,547 +0,0 @@
-// Copyright 2013 Dario Castañé. All rights reserved.
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mergo
-
-import (
-	"io/ioutil"
-	"reflect"
-	"testing"
-	"time"
-	"gopkg.in/yaml.v2"
-)
-
-type simpleTest struct {
-	Value int
-}
-
-type complexTest struct {
-	St simpleTest
-	sz int
-	ID string
-}
-
-type moreComplextText struct {
-	Ct complexTest
-	St simpleTest
-	Nt simpleTest
-}
-
-type pointerTest struct {
-	C *simpleTest
-}
-
-type sliceTest struct {
-	S []int
-}
-
-func TestKb(t *testing.T) {
-	type testStruct struct {
-		Name     string
-		KeyValue map[string]interface{}
-	}
-
-	akv := make(map[string]interface{})
-	akv["Key1"] = "not value 1"
-	akv["Key2"] = "value2"
-	a := testStruct{}
-	a.Name = "A"
-	a.KeyValue = akv
-
-	bkv := make(map[string]interface{})
-	bkv["Key1"] = "value1"
-	bkv["Key3"] = "value3"
-	b := testStruct{}
-	b.Name = "B"
-	b.KeyValue = bkv
-
-	ekv := make(map[string]interface{})
-	ekv["Key1"] = "value1"
-	ekv["Key2"] = "value2"
-	ekv["Key3"] = "value3"
-	expected := testStruct{}
-	expected.Name = "B"
-	expected.KeyValue = ekv
-
-	Merge(&b, a)
-
-	if !reflect.DeepEqual(b, expected) {
-		t.Errorf("Actual: %#v did not match \nExpected: %#v", b, expected)
-	}
-}
-
-func TestNil(t *testing.T) {
-	if err := Merge(nil, nil); err != ErrNilArguments {
-		t.Fail()
-	}
-}
-
-func TestDifferentTypes(t *testing.T) {
-	a := simpleTest{42}
-	b := 42
-	if err := Merge(&a, b); err != ErrDifferentArgumentsTypes {
-		t.Fail()
-	}
-}
-
-func TestSimpleStruct(t *testing.T) {
-	a := simpleTest{}
-	b := simpleTest{42}
-	if err := Merge(&a, b); err != nil {
-		t.FailNow()
-	}
-	if a.Value != 42 {
-		t.Fatalf("b not merged in properly: a.Value(%d) != b.Value(%d)", a.Value, b.Value)
-	}
-	if !reflect.DeepEqual(a, b) {
-		t.FailNow()
-	}
-}
-
-func TestComplexStruct(t *testing.T) {
-	a := complexTest{}
-	a.ID = "athing"
-	b := complexTest{simpleTest{42}, 1, "bthing"}
-	if err := Merge(&a, b); err != nil {
-		t.FailNow()
-	}
-	if a.St.Value != 42 {
-		t.Fatalf("b not merged in properly: a.St.Value(%d) != b.St.Value(%d)", a.St.Value, b.St.Value)
-	}
-	if a.sz == 1 {
-		t.Fatalf("a's private field sz not preserved from merge: a.sz(%d) == b.sz(%d)", a.sz, b.sz)
-	}
-	if a.ID == b.ID {
-		t.Fatalf("a's field ID merged unexpectedly: a.ID(%s) == b.ID(%s)", a.ID, b.ID)
-	}
-}
-
-func TestComplexStructWithOverwrite(t *testing.T) {
-	a := complexTest{simpleTest{1}, 1, "do-not-overwrite-with-empty-value"}
-	b := complexTest{simpleTest{42}, 2, ""}
-
-	expect := complexTest{simpleTest{42}, 1, "do-not-overwrite-with-empty-value"}
-	if err := MergeWithOverwrite(&a, b); err != nil {
-		t.FailNow()
-	}
-
-	if !reflect.DeepEqual(a, expect) {
-		t.Fatalf("Test failed:\ngot  :\n%#v\n\nwant :\n%#v\n\n", a, expect)
-	}
-}
-
-func TestPointerStruct(t *testing.T) {
-	s1 := simpleTest{}
-	s2 := simpleTest{19}
-	a := pointerTest{&s1}
-	b := pointerTest{&s2}
-	if err := Merge(&a, b); err != nil {
-		t.FailNow()
-	}
-	if a.C.Value != b.C.Value {
-		t.Fatalf("b not merged in properly: a.C.Value(%d) != b.C.Value(%d)", a.C.Value, b.C.Value)
-	}
-}
-
-type embeddingStruct struct {
-	embeddedStruct
-}
-
-type embeddedStruct struct {
-	A string
-}
-
-func TestEmbeddedStruct(t *testing.T) {
-	tests := []struct {
-		src      embeddingStruct
-		dst      embeddingStruct
-		expected embeddingStruct
-	}{
-		{
-			src: embeddingStruct{
-				embeddedStruct{"foo"},
-			},
-			dst: embeddingStruct{
-				embeddedStruct{""},
-			},
-			expected: embeddingStruct{
-				embeddedStruct{"foo"},
-			},
-		},
-		{
-			src: embeddingStruct{
-				embeddedStruct{""},
-			},
-			dst: embeddingStruct{
-				embeddedStruct{"bar"},
-			},
-			expected: embeddingStruct{
-				embeddedStruct{"bar"},
-			},
-		},
-		{
-			src: embeddingStruct{
-				embeddedStruct{"foo"},
-			},
-			dst: embeddingStruct{
-				embeddedStruct{"bar"},
-			},
-			expected: embeddingStruct{
-				embeddedStruct{"bar"},
-			},
-		},
-	}
-
-	for _, test := range tests {
-		err := Merge(&test.dst, test.src)
-		if err != nil {
-			t.Errorf("unexpected error: %v", err)
-			continue
-		}
-		if !reflect.DeepEqual(test.dst, test.expected) {
-			t.Errorf("unexpected output\nexpected:\n%+v\nsaw:\n%+v\n", test.expected, test.dst)
-		}
-	}
-}
-
-func TestPointerStructNil(t *testing.T) {
-	a := pointerTest{nil}
-	b := pointerTest{&simpleTest{19}}
-	if err := Merge(&a, b); err != nil {
-		t.FailNow()
-	}
-	if a.C.Value != b.C.Value {
-		t.Fatalf("b not merged in a properly: a.C.Value(%d) != b.C.Value(%d)", a.C.Value, b.C.Value)
-	}
-}
-
-func TestSliceStruct(t *testing.T) {
-	a := sliceTest{}
-	b := sliceTest{[]int{1, 2, 3}}
-	if err := Merge(&a, b); err != nil {
-		t.FailNow()
-	}
-	if len(b.S) != 3 {
-		t.FailNow()
-	}
-	if len(a.S) != len(b.S) {
-		t.Fatalf("b not merged in a proper way %d != %d", len(a.S), len(b.S))
-	}
-
-	a = sliceTest{[]int{1}}
-	b = sliceTest{[]int{1, 2, 3}}
-	if err := Merge(&a, b); err != nil {
-		t.FailNow()
-	}
-	if len(a.S) != 1 {
-		t.FailNow()
-	}
-	if len(a.S) == len(b.S) {
-		t.Fatalf("b merged unexpectedly %d != %d", len(a.S), len(b.S))
-	}
-}
-
-func TestMapsWithOverwrite(t *testing.T) {
-	m := map[string]simpleTest{
-		"a": {},   // overwritten by 16
-		"b": {42}, // not overwritten by empty value
-		"c": {13}, // overwritten by 12
-		"d": {61},
-	}
-	n := map[string]simpleTest{
-		"a": {16},
-		"b": {},
-		"c": {12},
-		"e": {14},
-	}
-	expect := map[string]simpleTest{
-		"a": {16},
-		"b": {},
-		"c": {12},
-		"d": {61},
-		"e": {14},
-	}
-
-	if err := MergeWithOverwrite(&m, n); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	if !reflect.DeepEqual(m, expect) {
-		t.Fatalf("Test failed:\ngot  :\n%#v\n\nwant :\n%#v\n\n", m, expect)
-	}
-}
-
-func TestMaps(t *testing.T) {
-	m := map[string]simpleTest{
-		"a": {},
-		"b": {42},
-		"c": {13},
-		"d": {61},
-	}
-	n := map[string]simpleTest{
-		"a": {16},
-		"b": {},
-		"c": {12},
-		"e": {14},
-	}
-	expect := map[string]simpleTest{
-		"a": {0},
-		"b": {42},
-		"c": {13},
-		"d": {61},
-		"e": {14},
-	}
-
-	if err := Merge(&m, n); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	if !reflect.DeepEqual(m, expect) {
-		t.Fatalf("Test failed:\ngot  :\n%#v\n\nwant :\n%#v\n\n", m, expect)
-	}
-	if m["a"].Value != 0 {
-		t.Fatalf(`n merged in m because I solved non-addressable map values TODO: m["a"].Value(%d) != n["a"].Value(%d)`, m["a"].Value, n["a"].Value)
-	}
-	if m["b"].Value != 42 {
-		t.Fatalf(`n wrongly merged in m: m["b"].Value(%d) != n["b"].Value(%d)`, m["b"].Value, n["b"].Value)
-	}
-	if m["c"].Value != 13 {
-		t.Fatalf(`n overwritten in m: m["c"].Value(%d) != n["c"].Value(%d)`, m["c"].Value, n["c"].Value)
-	}
-}
-
-func TestYAMLMaps(t *testing.T) {
-	thing := loadYAML("testdata/thing.yml")
-	license := loadYAML("testdata/license.yml")
-	ft := thing["fields"].(map[interface{}]interface{})
-	fl := license["fields"].(map[interface{}]interface{})
-	expectedLength := len(ft) + len(fl)
-	if err := Merge(&license, thing); err != nil {
-		t.Fatal(err.Error())
-	}
-	currentLength := len(license["fields"].(map[interface{}]interface{}))
-	if currentLength != expectedLength {
-		t.Fatalf(`thing not merged in license properly, license must have %d elements instead of %d`, expectedLength, currentLength)
-	}
-	fields := license["fields"].(map[interface{}]interface{})
-	if _, ok := fields["id"]; !ok {
-		t.Fatalf(`thing not merged in license properly, license must have a new id field from thing`)
-	}
-}
-
-func TestTwoPointerValues(t *testing.T) {
-	a := &simpleTest{}
-	b := &simpleTest{42}
-	if err := Merge(a, b); err != nil {
-		t.Fatalf(`Boom. You crossed the streams: %s`, err)
-	}
-}
-
-func TestMap(t *testing.T) {
-	a := complexTest{}
-	a.ID = "athing"
-	c := moreComplextText{a, simpleTest{}, simpleTest{}}
-	b := map[string]interface{}{
-		"ct": map[string]interface{}{
-			"st": map[string]interface{}{
-				"value": 42,
-			},
-			"sz": 1,
-			"id": "bthing",
-		},
-		"st": &simpleTest{144}, // Mapping a reference
-		"zt": simpleTest{299},  // Mapping a missing field (zt doesn't exist)
-		"nt": simpleTest{3},
-	}
-	if err := Map(&c, b); err != nil {
-		t.FailNow()
-	}
-	m := b["ct"].(map[string]interface{})
-	n := m["st"].(map[string]interface{})
-	o := b["st"].(*simpleTest)
-	p := b["nt"].(simpleTest)
-	if c.Ct.St.Value != 42 {
-		t.Fatalf("b not merged in properly: c.Ct.St.Value(%d) != b.Ct.St.Value(%d)", c.Ct.St.Value, n["value"])
-	}
-	if c.St.Value != 144 {
-		t.Fatalf("b not merged in properly: c.St.Value(%d) != b.St.Value(%d)", c.St.Value, o.Value)
-	}
-	if c.Nt.Value != 3 {
-		t.Fatalf("b not merged in properly: c.Nt.Value(%d) != b.Nt.Value(%d)", c.St.Value, p.Value)
-	}
-	if c.Ct.sz == 1 {
-		t.Fatalf("a's private field sz not preserved from merge: c.Ct.sz(%d) == b.Ct.sz(%d)", c.Ct.sz, m["sz"])
-	}
-	if c.Ct.ID == m["id"] {
-		t.Fatalf("a's field ID merged unexpectedly: c.Ct.ID(%s) == b.Ct.ID(%s)", c.Ct.ID, m["id"])
-	}
-}
-
-func TestSimpleMap(t *testing.T) {
-	a := simpleTest{}
-	b := map[string]interface{}{
-		"value": 42,
-	}
-	if err := Map(&a, b); err != nil {
-		t.FailNow()
-	}
-	if a.Value != 42 {
-		t.Fatalf("b not merged in properly: a.Value(%d) != b.Value(%v)", a.Value, b["value"])
-	}
-}
-
-type pointerMapTest struct {
-	A      int
-	hidden int
-	B      *simpleTest
-}
-
-func TestBackAndForth(t *testing.T) {
-	pt := pointerMapTest{42, 1, &simpleTest{66}}
-	m := make(map[string]interface{})
-	if err := Map(&m, pt); err != nil {
-		t.FailNow()
-	}
-	var (
-		v  interface{}
-		ok bool
-	)
-	if v, ok = m["a"]; v.(int) != pt.A || !ok {
-		t.Fatalf("pt not merged in properly: m[`a`](%d) != pt.A(%d)", v, pt.A)
-	}
-	if v, ok = m["b"]; !ok {
-		t.Fatalf("pt not merged in properly: B is missing in m")
-	}
-	var st *simpleTest
-	if st = v.(*simpleTest); st.Value != 66 {
-		t.Fatalf("something went wrong while mapping pt on m, B wasn't copied")
-	}
-	bpt := pointerMapTest{}
-	if err := Map(&bpt, m); err != nil {
-		t.Fatal(err)
-	}
-	if bpt.A != pt.A {
-		t.Fatalf("pt not merged in properly: bpt.A(%d) != pt.A(%d)", bpt.A, pt.A)
-	}
-	if bpt.hidden == pt.hidden {
-		t.Fatalf("pt unexpectedly merged: bpt.hidden(%d) == pt.hidden(%d)", bpt.hidden, pt.hidden)
-	}
-	if bpt.B.Value != pt.B.Value {
-		t.Fatalf("pt not merged in properly: bpt.B.Value(%d) != pt.B.Value(%d)", bpt.B.Value, pt.B.Value)
-	}
-}
-
-type structWithTimePointer struct {
-	Birth *time.Time
-}
-
-func TestTime(t *testing.T) {
-	now := time.Now()
-	dataStruct := structWithTimePointer{
-		Birth: &now,
-	}
-	dataMap := map[string]interface{}{
-		"Birth": &now,
-	}
-	b := structWithTimePointer{}
-	if err := Merge(&b, dataStruct); err != nil {
-		t.FailNow()
-	}
-	if b.Birth.IsZero() {
-		t.Fatalf("time.Time not merged in properly: b.Birth(%v) != dataStruct['Birth'](%v)", b.Birth, dataStruct.Birth)
-	}
-	if b.Birth != dataStruct.Birth {
-		t.Fatalf("time.Time not merged in properly: b.Birth(%v) != dataStruct['Birth'](%v)", b.Birth, dataStruct.Birth)
-	}
-	b = structWithTimePointer{}
-	if err := Map(&b, dataMap); err != nil {
-		t.FailNow()
-	}
-	if b.Birth.IsZero() {
-		t.Fatalf("time.Time not merged in properly: b.Birth(%v) != dataMap['Birth'](%v)", b.Birth, dataMap["Birth"])
-	}
-}
-
-type simpleNested struct {
-	A int
-}
-
-type structWithNestedPtrValueMap struct {
-	NestedPtrValue map[string]*simpleNested
-}
-
-func TestNestedPtrValueInMap(t *testing.T) {
-	src := &structWithNestedPtrValueMap{
-		NestedPtrValue: map[string]*simpleNested{
-			"x": {
-				A: 1,
-			},
-		},
-	}
-	dst := &structWithNestedPtrValueMap{
-		NestedPtrValue: map[string]*simpleNested{
-			"x": {},
-		},
-	}
-	if err := Map(dst, src); err != nil {
-		t.FailNow()
-	}
-	if dst.NestedPtrValue["x"].A == 0 {
-		t.Fatalf("Nested Ptr value not merged in properly: dst.NestedPtrValue[\"x\"].A(%v) != src.NestedPtrValue[\"x\"].A(%v)", dst.NestedPtrValue["x"].A, src.NestedPtrValue["x"].A)
-	}
-}
-
-func loadYAML(path string) (m map[string]interface{}) {
-	m = make(map[string]interface{})
-	raw, _ := ioutil.ReadFile(path)
-	_ = yaml.Unmarshal(raw, &m)
-	return
-}
-
-type structWithMap struct {
-	m map[string]structWithUnexportedProperty
-}
-
-type structWithUnexportedProperty struct {
-	s string
-}
-
-func TestUnexportedProperty(t *testing.T) {
-	a := structWithMap{map[string]structWithUnexportedProperty{
-		"key": structWithUnexportedProperty{"hello"},
-	}}
-	b := structWithMap{map[string]structWithUnexportedProperty{
-		"key": structWithUnexportedProperty{"hi"},
-	}}
-	defer func() {
-		if r := recover(); r != nil {
-			t.Errorf("Should not have panicked")
-		}
-	}()
-	Merge(&a, b)
-}
-
-type structWithBoolPointer struct {
-	C *bool
-}
-
-func TestBooleanPointer(t *testing.T) {
-	bt, bf := true, false
-	src := structWithBoolPointer{
-		&bt,
-	}
-	dst := structWithBoolPointer{
-		&bf,
-	}
-	if err := Merge(&dst, src); err != nil {
-		t.FailNow()
-	}
-	if dst.C == src.C {
-		t.Fatalf("dst.C should be a different pointer than src.C")
-	}
-	if *dst.C != *src.C {
-		t.Fatalf("dst.C should be true")
-	}
-}
diff --git a/vendor/github.com/imdario/mergo/testdata/license.yml b/vendor/github.com/imdario/mergo/testdata/license.yml
deleted file mode 100644
index 62fdb61ec3..0000000000
--- a/vendor/github.com/imdario/mergo/testdata/license.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-import: ../../../../fossene/db/schema/thing.yml
-fields:
-    site: string
diff --git a/vendor/github.com/imdario/mergo/testdata/thing.yml b/vendor/github.com/imdario/mergo/testdata/thing.yml
deleted file mode 100644
index c28eab0d05..0000000000
--- a/vendor/github.com/imdario/mergo/testdata/thing.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fields:
-    id: int
-    name: string
-    parent: ref "datu:thing"
-    status: enum(draft, public, private)
diff --git a/vendor/github.com/jmespath/go-jmespath/LICENSE b/vendor/github.com/jmespath/go-jmespath/LICENSE
deleted file mode 100644
index b03310a91f..0000000000
--- a/vendor/github.com/jmespath/go-jmespath/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2015 James Saryerwinnie
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/vendor/github.com/jmespath/go-jmespath/Makefile b/vendor/github.com/jmespath/go-jmespath/Makefile
deleted file mode 100644
index a828d2848f..0000000000
--- a/vendor/github.com/jmespath/go-jmespath/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-CMD = jpgo
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  test                    to run all the tests"
-	@echo "  build                   to build the library and jp executable"
-	@echo "  generate                to run codegen"
-
-
-generate:
-	go generate ./...
-
-build:
-	rm -f $(CMD)
-	go build ./...
-	rm -f cmd/$(CMD)/$(CMD) && cd cmd/$(CMD)/ && go build ./...
-	mv cmd/$(CMD)/$(CMD) .
-
-test:
-	go test -v ./...
-
-check:
-	go vet ./...
-	@echo "golint ./..."
-	@lint=`golint ./...`; \
-	lint=`echo "$$lint" | grep -v "astnodetype_string.go" | grep -v "toktype_string.go"`; \
-	echo "$$lint"; \
-	if [ "$$lint" != "" ]; then exit 1; fi
-
-htmlc:
-	go test -coverprofile="/tmp/jpcov"  && go tool cover -html="/tmp/jpcov" && unlink /tmp/jpcov
-
-buildfuzz:
-	go-fuzz-build github.com/jmespath/go-jmespath/fuzz
-
-fuzz: buildfuzz
-	go-fuzz -bin=./jmespath-fuzz.zip -workdir=fuzz/testdata
-
-bench:
-	go test -bench . -cpuprofile cpu.out
-
-pprof-cpu:
-	go tool pprof ./go-jmespath.test ./cpu.out
diff --git a/vendor/github.com/jmespath/go-jmespath/README.md b/vendor/github.com/jmespath/go-jmespath/README.md
deleted file mode 100644
index 187ef676dc..0000000000
--- a/vendor/github.com/jmespath/go-jmespath/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# go-jmespath - A JMESPath implementation in Go
-
-[![Build Status](https://img.shields.io/travis/jmespath/go-jmespath.svg)](https://travis-ci.org/jmespath/go-jmespath)
-
-
-
-See http://jmespath.org for more info.
diff --git a/vendor/github.com/jmespath/go-jmespath/api.go b/vendor/github.com/jmespath/go-jmespath/api.go
deleted file mode 100644
index 9cfa988bc5..0000000000
--- a/vendor/github.com/jmespath/go-jmespath/api.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package jmespath
-
-import "strconv"
-
-// JmesPath is the epresentation of a compiled JMES path query. A JmesPath is
-// safe for concurrent use by multiple goroutines.
-type JMESPath struct {
-	ast  ASTNode
-	intr *treeInterpreter
-}
-
-// Compile parses a JMESPath expression and returns, if successful, a JMESPath
-// object that can be used to match against data.
-func Compile(expression string) (*JMESPath, error) {
-	parser := NewParser()
-	ast, err := parser.Parse(expression)
-	if err != nil {
-		return nil, err
-	}
-	jmespath := &JMESPath{ast: ast, intr: newInterpreter()}
-	return jmespath, nil
-}
-
-// MustCompile is like Compile but panics if the expression cannot be parsed.
-// It simplifies safe initialization of global variables holding compiled
-// JMESPaths.
-func MustCompile(expression string) *JMESPath {
-	jmespath, err := Compile(expression)
-	if err != nil {
-		panic(`jmespath: Compile(` + strconv.Quote(expression) + `): ` + err.Error())
-	}
-	return jmespath
-}
-
-// Search evaluates a JMESPath expression against input data and returns the result.
-func (jp *JMESPath) Search(data interface{}) (interface{}, error) {
-	return jp.intr.Execute(jp.ast, data)
-}
-
-// Search evaluates a JMESPath expression against input data and returns the result.
-func Search(expression string, data interface{}) (interface{}, error) {
-	intr := newInterpreter()
-	parser := NewParser()
-	ast, err := parser.Parse(expression)
-	if err != nil {
-		return nil, err
-	}
-	return intr.Execute(ast, data)
-}
diff --git a/vendor/github.com/jmespath/go-jmespath/astnodetype_string.go b/vendor/github.com/jmespath/go-jmespath/astnodetype_string.go
deleted file mode 100644
index 1cd2d239c9..0000000000
--- a/vendor/github.com/jmespath/go-jmespath/astnodetype_string.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by stringer -type astNodeType; DO NOT EDIT
-
-package jmespath
-
-import "fmt"
-
-const _astNodeType_name = "ASTEmptyASTComparatorASTCurrentNodeASTExpRefASTFunctionExpressionASTFieldASTFilterProjectionASTFlattenASTIdentityASTIndexASTIndexExpressionASTKeyValPairASTLiteralASTMultiSelectHashASTMultiSelectListASTOrExpressionASTAndExpressionASTNotExpressionASTPipeASTProjectionASTSubexpressionASTSliceASTValueProjection"
-
-var _astNodeType_index = [...]uint16{0, 8, 21, 35, 44, 65, 73, 92, 102, 113, 121, 139, 152, 162, 180, 198, 213, 229, 245, 252, 265, 281, 289, 307}
-
-func (i astNodeType) String() string {
-	if i < 0 || i >= astNodeType(len(_astNodeType_index)-1) {
-		return fmt.Sprintf("astNodeType(%d)", i)
-	}
-	return _astNodeType_name[_astNodeType_index[i]:_astNodeType_index[i+1]]
-}
diff --git a/vendor/github.com/jmespath/go-jmespath/functions.go b/vendor/github.com/jmespath/go-jmespath/functions.go
deleted file mode 100644
index 9b7cd89b4b..0000000000
--- a/vendor/github.com/jmespath/go-jmespath/functions.go
+++ /dev/null
@@ -1,842 +0,0 @@
-package jmespath
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"math"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-type jpFunction func(arguments []interface{}) (interface{}, error)
-
-type jpType string
-
-const (
-	jpUnknown     jpType = "unknown"
-	jpNumber      jpType = "number"
-	jpString      jpType = "string"
-	jpArray       jpType = "array"
-	jpObject      jpType = "object"
-	jpArrayNumber jpType = "array[number]"
-	jpArrayString jpType = "array[string]"
-	jpExpref      jpType = "expref"
-	jpAny         jpType = "any"
-)
-
-type functionEntry struct {
-	name      string
-	arguments []argSpec
-	handler   jpFunction
-	hasExpRef bool
-}
-
-type argSpec struct {
-	types    []jpType
-	variadic bool
-}
-
-type byExprString struct {
-	intr     *treeInterpreter
-	node     ASTNode
-	items    []interface{}
-	hasError bool
-}
-
-func (a *byExprString) Len() int {
-	return len(a.items)
-}
-func (a *byExprString) Swap(i, j int) {
-	a.items[i], a.items[j] = a.items[j], a.items[i]
-}
-func (a *byExprString) Less(i, j int) bool {
-	first, err := a.intr.Execute(a.node, a.items[i])
-	if err != nil {
-		a.hasError = true
-		// Return a dummy value.
-		return true
-	}
-	ith, ok := first.(string)
-	if !ok {
-		a.hasError = true
-		return true
-	}
-	second, err := a.intr.Execute(a.node, a.items[j])
-	if err != nil {
-		a.hasError = true
-		// Return a dummy value.
-		return true
-	}
-	jth, ok := second.(string)
-	if !ok {
-		a.hasError = true
-		return true
-	}
-	return ith < jth
-}
-
-type byExprFloat struct {
-	intr     *treeInterpreter
-	node     ASTNode
-	items    []interface{}
-	hasError bool
-}
-
-func (a *byExprFloat) Len() int {
-	return len(a.items)
-}
-func (a *byExprFloat) Swap(i, j int) {
-	a.items[i], a.items[j] = a.items[j], a.items[i]
-}
-func (a *byExprFloat) Less(i, j int) bool {
-	first, err := a.intr.Execute(a.node, a.items[i])
-	if err != nil {
-		a.hasError = true
-		// Return a dummy value.
-		return true
-	}
-	ith, ok := first.(float64)
-	if !ok {
-		a.hasError = true
-		return true
-	}
-	second, err := a.intr.Execute(a.node, a.items[j])
-	if err != nil {
-		a.hasError = true
-		// Return a dummy value.
-		return true
-	}
-	jth, ok := second.(float64)
-	if !ok {
-		a.hasError = true
-		return true
-	}
-	return ith < jth
-}
-
-type functionCaller struct {
-	functionTable map[string]functionEntry
-}
-
-func newFunctionCaller() *functionCaller {
-	caller := &functionCaller{}
-	caller.functionTable = map[string]functionEntry{
-		"length": {
-			name: "length",
-			arguments: []argSpec{
-				{types: []jpType{jpString, jpArray, jpObject}},
-			},
-			handler: jpfLength,
-		},
-		"starts_with": {
-			name: "starts_with",
-			arguments: []argSpec{
-				{types: []jpType{jpString}},
-				{types: []jpType{jpString}},
-			},
-			handler: jpfStartsWith,
-		},
-		"abs": {
-			name: "abs",
-			arguments: []argSpec{
-				{types: []jpType{jpNumber}},
-			},
-			handler: jpfAbs,
-		},
-		"avg": {
-			name: "avg",
-			arguments: []argSpec{
-				{types: []jpType{jpArrayNumber}},
-			},
-			handler: jpfAvg,
-		},
-		"ceil": {
-			name: "ceil",
-			arguments: []argSpec{
-				{types: []jpType{jpNumber}},
-			},
-			handler: jpfCeil,
-		},
-		"contains": {
-			name: "contains",
-			arguments: []argSpec{
-				{types: []jpType{jpArray, jpString}},
-				{types: []jpType{jpAny}},
-			},
-			handler: jpfContains,
-		},
-		"ends_with": {
-			name: "ends_with",
-			arguments: []argSpec{
-				{types: []jpType{jpString}},
-				{types: []jpType{jpString}},
-			},
-			handler: jpfEndsWith,
-		},
-		"floor": {
-			name: "floor",
-			arguments: []argSpec{
-				{types: []jpType{jpNumber}},
-			},
-			handler: jpfFloor,
-		},
-		"map": {
-			name: "amp",
-			arguments: []argSpec{
-				{types: []jpType{jpExpref}},
-				{types: []jpType{jpArray}},
-			},
-			handler:   jpfMap,
-			hasExpRef: true,
-		},
-		"max": {
-			name: "max",
-			arguments: []argSpec{
-				{types: []jpType{jpArrayNumber, jpArrayString}},
-			},
-			handler: jpfMax,
-		},
-		"merge": {
-			name: "merge",
-			arguments: []argSpec{
-				{types: []jpType{jpObject}, variadic: true},
-			},
-			handler: jpfMerge,
-		},
-		"max_by": {
-			name: "max_by",
-			arguments: []argSpec{
-				{types: []jpType{jpArray}},
-				{types: []jpType{jpExpref}},
-			},
-			handler:   jpfMaxBy,
-			hasExpRef: true,
-		},
-		"sum": {
-			name: "sum",
-			arguments: []argSpec{
-				{types: []jpType{jpArrayNumber}},
-			},
-			handler: jpfSum,
-		},
-		"min": {
-			name: "min",
-			arguments: []argSpec{
-				{types: []jpType{jpArrayNumber, jpArrayString}},
-			},
-			handler: jpfMin,
-		},
-		"min_by": {
-			name: "min_by",
-			arguments: []argSpec{
-				{types: []jpType{jpArray}},
-				{types: []jpType{jpExpref}},
-			},
-			handler:   jpfMinBy,
-			hasExpRef: true,
-		},
-		"type": {
-			name: "type",
-			arguments: []argSpec{
-				{types: []jpType{jpAny}},
-			},
-			handler: jpfType,
-		},
-		"keys": {
-			name: "keys",
-			arguments: []argSpec{
-				{types: []jpType{jpObject}},
-			},
-			handler: jpfKeys,
-		},
-		"values": {
-			name: "values",
-			arguments: []argSpec{
-				{types: []jpType{jpObject}},
-			},
-			handler: jpfValues,
-		},
-		"sort": {
-			name: "sort",
-			arguments: []argSpec{
-				{types: []jpType{jpArrayString, jpArrayNumber}},
-			},
-			handler: jpfSort,
-		},
-		"sort_by": {
-			name: "sort_by",
-			arguments: []argSpec{
-				{types: []jpType{jpArray}},
-				{types: []jpType{jpExpref}},
-			},
-			handler:   jpfSortBy,
-			hasExpRef: true,
-		},
-		"join": {
-			name: "join",
-			arguments: []argSpec{
-				{types: []jpType{jpString}},
-				{types: []jpType{jpArrayString}},
-			},
-			handler: jpfJoin,
-		},
-		"reverse": {
-			name: "reverse",
-			arguments: []argSpec{
-				{types: []jpType{jpArray, jpString}},
-			},
-			handler: jpfReverse,
-		},
-		"to_array": {
-			name: "to_array",
-			arguments: []argSpec{
-				{types: []jpType{jpAny}},
-			},
-			handler: jpfToArray,
-		},
-		"to_string": {
-			name: "to_string",
-			arguments: []argSpec{
-				{types: []jpType{jpAny}},
-			},
-			handler: jpfToString,
-		},
-		"to_number": {
-			name: "to_number",
-			arguments: []argSpec{
-				{types: []jpType{jpAny}},
-			},
-			handler: jpfToNumber,
-		},
-		"not_null": {
-			name: "not_null",
-			arguments: []argSpec{
-				{types: []jpType{jpAny}, variadic: true},
-			},
-			handler: jpfNotNull,
-		},
-	}
-	return caller
-}
-
-func (e *functionEntry) resolveArgs(arguments []interface{}) ([]interface{}, error) {
-	if len(e.arguments) == 0 {
-		return arguments, nil
-	}
-	if !e.arguments[len(e.arguments)-1].variadic {
-		if len(e.arguments) != len(arguments) {
-			return nil, errors.New("incorrect number of args")
-		}
-		for i, spec := range e.arguments {
-			userArg := arguments[i]
-			err := spec.typeCheck(userArg)
-			if err != nil {
-				return nil, err
-			}
-		}
-		return arguments, nil
-	}
-	if len(arguments) < len(e.arguments) {
-		return nil, errors.New("Invalid arity.")
-	}
-	return arguments, nil
-}
-
-func (a *argSpec) typeCheck(arg interface{}) error {
-	for _, t := range a.types {
-		switch t {
-		case jpNumber:
-			if _, ok := arg.(float64); ok {
-				return nil
-			}
-		case jpString:
-			if _, ok := arg.(string); ok {
-				return nil
-			}
-		case jpArray:
-			if isSliceType(arg) {
-				return nil
-			}
-		case jpObject:
-			if _, ok := arg.(map[string]interface{}); ok {
-				return nil
-			}
-		case jpArrayNumber:
-			if _, ok := toArrayNum(arg); ok {
-				return nil
-			}
-		case jpArrayString:
-			if _, ok := toArrayStr(arg); ok {
-				return nil
-			}
-		case jpAny:
-			return nil
-		case jpExpref:
-			if _, ok := arg.(expRef); ok {
-				return nil
-			}
-		}
-	}
-	return fmt.Errorf("Invalid type for: %v, expected: %#v", arg, a.types)
-}
-
-func (f *functionCaller) CallFunction(name string, arguments []interface{}, intr *treeInterpreter) (interface{}, error) {
-	entry, ok := f.functionTable[name]
-	if !ok {
-		return nil, errors.New("unknown function: " + name)
-	}
-	resolvedArgs, err := entry.resolveArgs(arguments)
-	if err != nil {
-		return nil, err
-	}
-	if entry.hasExpRef {
-		var extra []interface{}
-		extra = append(extra, intr)
-		resolvedArgs = append(extra, resolvedArgs...)
-	}
-	return entry.handler(resolvedArgs)
-}
-
-func jpfAbs(arguments []interface{}) (interface{}, error) {
-	num := arguments[0].(float64)
-	return math.Abs(num), nil
-}
-
-func jpfLength(arguments []interface{}) (interface{}, error) {
-	arg := arguments[0]
-	if c, ok := arg.(string); ok {
-		return float64(utf8.RuneCountInString(c)), nil
-	} else if isSliceType(arg) {
-		v := reflect.ValueOf(arg)
-		return float64(v.Len()), nil
-	} else if c, ok := arg.(map[string]interface{}); ok {
-		return float64(len(c)), nil
-	}
-	return nil, errors.New("could not compute length()")
-}
-
-func jpfStartsWith(arguments []interface{}) (interface{}, error) {
-	search := arguments[0].(string)
-	prefix := arguments[1].(string)
-	return strings.HasPrefix(search, prefix), nil
-}
-
-func jpfAvg(arguments []interface{}) (interface{}, error) {
-	// We've already type checked the value so we can safely use
-	// type assertions.
-	args := arguments[0].([]interface{})
-	length := float64(len(args))
-	numerator := 0.0
-	for _, n := range args {
-		numerator += n.(float64)
-	}
-	return numerator / length, nil
-}
-func jpfCeil(arguments []interface{}) (interface{}, error) {
-	val := arguments[0].(float64)
-	return math.Ceil(val), nil
-}
-func jpfContains(arguments []interface{}) (interface{}, error) {
-	search := arguments[0]
-	el := arguments[1]
-	if searchStr, ok := search.(string); ok {
-		if elStr, ok := el.(string); ok {
-			return strings.Index(searchStr, elStr) != -1, nil
-		}
-		return false, nil
-	}
-	// Otherwise this is a generic contains for []interface{}
-	general := search.([]interface{})
-	for _, item := range general {
-		if item == el {
-			return true, nil
-		}
-	}
-	return false, nil
-}
-func jpfEndsWith(arguments []interface{}) (interface{}, error) {
-	search := arguments[0].(string)
-	suffix := arguments[1].(string)
-	return strings.HasSuffix(search, suffix), nil
-}
-func jpfFloor(arguments []interface{}) (interface{}, error) {
-	val := arguments[0].(float64)
-	return math.Floor(val), nil
-}
-func jpfMap(arguments []interface{}) (interface{}, error) {
-	intr := arguments[0].(*treeInterpreter)
-	exp := arguments[1].(expRef)
-	node := exp.ref
-	arr := arguments[2].([]interface{})
-	mapped := make([]interface{}, 0, len(arr))
-	for _, value := range arr {
-		current, err := intr.Execute(node, value)
-		if err != nil {
-			return nil, err
-		}
-		mapped = append(mapped, current)
-	}
-	return mapped, nil
-}
-func jpfMax(arguments []interface{}) (interface{}, error) {
-	if items, ok := toArrayNum(arguments[0]); ok {
-		if len(items) == 0 {
-			return nil, nil
-		}
-		if len(items) == 1 {
-			return items[0], nil
-		}
-		best := items[0]
-		for _, item := range items[1:] {
-			if item > best {
-				best = item
-			}
-		}
-		return best, nil
-	}
-	// Otherwise we're dealing with a max() of strings.
-	items, _ := toArrayStr(arguments[0])
-	if len(items) == 0 {
-		return nil, nil
-	}
-	if len(items) == 1 {
-		return items[0], nil
-	}
-	best := items[0]
-	for _, item := range items[1:] {
-		if item > best {
-			best = item
-		}
-	}
-	return best, nil
-}
-func jpfMerge(arguments []interface{}) (interface{}, error) {
-	final := make(map[string]interface{})
-	for _, m := range arguments {
-		mapped := m.(map[string]interface{})
-		for key, value := range mapped {
-			final[key] = value
-		}
-	}
-	return final, nil
-}
-func jpfMaxBy(arguments []interface{}) (interface{}, error) {
-	intr := arguments[0].(*treeInterpreter)
-	arr := arguments[1].([]interface{})
-	exp := arguments[2].(expRef)
-	node := exp.ref
-	if len(arr) == 0 {
-		return nil, nil
-	} else if len(arr) == 1 {
-		return arr[0], nil
-	}
-	start, err := intr.Execute(node, arr[0])
-	if err != nil {
-		return nil, err
-	}
-	switch t := start.(type) {
-	case float64:
-		bestVal := t
-		bestItem := arr[0]
-		for _, item := range arr[1:] {
-			result, err := intr.Execute(node, item)
-			if err != nil {
-				return nil, err
-			}
-			current, ok := result.(float64)
-			if !ok {
-				return nil, errors.New("invalid type, must be number")
-			}
-			if current > bestVal {
-				bestVal = current
-				bestItem = item
-			}
-		}
-		return bestItem, nil
-	case string:
-		bestVal := t
-		bestItem := arr[0]
-		for _, item := range arr[1:] {
-			result, err := intr.Execute(node, item)
-			if err != nil {
-				return nil, err
-			}
-			current, ok := result.(string)
-			if !ok {
-				return nil, errors.New("invalid type, must be string")
-			}
-			if current > bestVal {
-				bestVal = current
-				bestItem = item
-			}
-		}
-		return bestItem, nil
-	default:
-		return nil, errors.New("invalid type, must be number of string")
-	}
-}
-func jpfSum(arguments []interface{}) (interface{}, error) {
-	items, _ := toArrayNum(arguments[0])
-	sum := 0.0
-	for _, item := range items {
-		sum += item
-	}
-	return sum, nil
-}
-
-func jpfMin(arguments []interface{}) (interface{}, error) {
-	if items, ok := toArrayNum(arguments[0]); ok {
-		if len(items) == 0 {
-			return nil, nil
-		}
-		if len(items) == 1 {
-			return items[0], nil
-		}
-		best := items[0]
-		for _, item := range items[1:] {
-			if item < best {
-				best = item
-			}
-		}
-		return best, nil
-	}
-	items, _ := toArrayStr(arguments[0])
-	if len(items) == 0 {
-		return nil, nil
-	}
-	if len(items) == 1 {
-		return items[0], nil
-	}
-	best := items[0]
-	for _, item := range items[1:] {
-		if item < best {
-			best = item
-		}
-	}
-	return best, nil
-}
-
-func jpfMinBy(arguments []interface{}) (interface{}, error) {
-	intr := arguments[0].(*treeInterpreter)
-	arr := arguments[1].([]interface{})
-	exp := arguments[2].(expRef)
-	node := exp.ref
-	if len(arr) == 0 {
-		return nil, nil
-	} else if len(arr) == 1 {
-		return arr[0], nil
-	}
-	start, err := intr.Execute(node, arr[0])
-	if err != nil {
-		return nil, err
-	}
-	if t, ok := start.(float64); ok {
-		bestVal := t
-		bestItem := arr[0]
-		for _, item := range arr[1:] {
-			result, err := intr.Execute(node, item)
-			if err != nil {
-				return nil, err
-			}
-			current, ok := result.(float64)
-			if !ok {
-				return nil, errors.New("invalid type, must be number")
-			}
-			if current < bestVal {
-				bestVal = current
-				bestItem = item
-			}
-		}
-		return bestItem, nil
-	} else if t, ok := start.(string); ok {
-		bestVal := t
-		bestItem := arr[0]
-		for _, item := range arr[1:] {
-			result, err := intr.Execute(node, item)
-			if err != nil {
-				return nil, err
-			}
-			current, ok := result.(string)
-			if !ok {
-				return nil, errors.New("invalid type, must be string")
-			}
-			if current < bestVal {
-				bestVal = current
-				bestItem = item
-			}
-		}
-		return bestItem, nil
-	} else {
-		return nil, errors.New("invalid type, must be number of string")
-	}
-}
-func jpfType(arguments []interface{}) (interface{}, error) {
-	arg := arguments[0]
-	if _, ok := arg.(float64); ok {
-		return "number", nil
-	}
-	if _, ok := arg.(string); ok {
-		return "string", nil
-	}
-	if _, ok := arg.([]interface{}); ok {
-		return "array", nil
-	}
-	if _, ok := arg.(map[string]interface{}); ok {
-		return "object", nil
-	}
-	if arg == nil {
-		return "null", nil
-	}
-	if arg == true || arg == false {
-		return "boolean", nil
-	}
-	return nil, errors.New("unknown type")
-}
-func jpfKeys(arguments []interface{}) (interface{}, error) {
-	arg := arguments[0].(map[string]interface{})
-	collected := make([]interface{}, 0, len(arg))
-	for key := range arg {
-		collected = append(collected, key)
-	}
-	return collected, nil
-}
-func jpfValues(arguments []interface{}) (interface{}, error) {
-	arg := arguments[0].(map[string]interface{})
-	collected := make([]interface{}, 0, len(arg))
-	for _, value := range arg {
-		collected = append(collected, value)
-	}
-	return collected, nil
-}
-func jpfSort(arguments []interface{}) (interface{}, error) {
-	if items, ok := toArrayNum(arguments[0]); ok {
-		d := sort.Float64Slice(items)
-		sort.Stable(d)
-		final := make([]interface{}, len(d))
-		for i, val := range d {
-			final[i] = val
-		}
-		return final, nil
-	}
-	// Otherwise we're dealing with sort()'ing strings.
-	items, _ := toArrayStr(arguments[0])
-	d := sort.StringSlice(items)
-	sort.Stable(d)
-	final := make([]interface{}, len(d))
-	for i, val := range d {
-		final[i] = val
-	}
-	return final, nil
-}
-func jpfSortBy(arguments []interface{}) (interface{}, error) {
-	intr := arguments[0].(*treeInterpreter)
-	arr := arguments[1].([]interface{})
-	exp := arguments[2].(expRef)
-	node := exp.ref
-	if len(arr) == 0 {
-		return arr, nil
-	} else if len(arr) == 1 {
-		return arr, nil
-	}
-	start, err := intr.Execute(node, arr[0])
-	if err != nil {
-		return nil, err
-	}
-	if _, ok := start.(float64); ok {
-		sortable := &byExprFloat{intr, node, arr, false}
-		sort.Stable(sortable)
-		if sortable.hasError {
-			return nil, errors.New("error in sort_by comparison")
-		}
-		return arr, nil
-	} else if _, ok := start.(string); ok {
-		sortable := &byExprString{intr, node, arr, false}
-		sort.Stable(sortable)
-		if sortable.hasError {
-			return nil, errors.New("error in sort_by comparison")
-		}
-		return arr, nil
-	} else {
-		return nil, errors.New("invalid type, must be number of string")
-	}
-}
-func jpfJoin(arguments []interface{}) (interface{}, error) {
-	sep := arguments[0].(string)
-	// We can't just do arguments[1].([]string), we have to
-	// manually convert each item to a string.
-	arrayStr := []string{}
-	for _, item := range arguments[1].([]interface{}) {
-		arrayStr = append(arrayStr, item.(string))
-	}
-	return strings.Join(arrayStr, sep), nil
-}
-func jpfReverse(arguments []interface{}) (interface{}, error) {
-	if s, ok := arguments[0].(string); ok {
-		r := []rune(s)
-		for i, j := 0, len(r)-1; i < len(r)/2; i, j = i+1, j-1 {
-			r[i], r[j] = r[j], r[i]
-		}
-		return string(r), nil
-	}
-	items := arguments[0].([]interface{})
-	length := len(items)
-	reversed := make([]interface{}, length)
-	for i, item := range items {
-		reversed[length-(i+1)] = item
-	}
-	return reversed, nil
-}
-func jpfToArray(arguments []interface{}) (interface{}, error) {
-	if _, ok := arguments[0].([]interface{}); ok {
-		return arguments[0], nil
-	}
-	return arguments[:1:1], nil
-}
-func jpfToString(arguments []interface{}) (interface{}, error) {
-	if v, ok := arguments[0].(string); ok {
-		return v, nil
-	}
-	result, err := json.Marshal(arguments[0])
-	if err != nil {
-		return nil, err
-	}
-	return string(result), nil
-}
-func jpfToNumber(arguments []interface{}) (interface{}, error) {
-	arg := arguments[0]
-	if v, ok := arg.(float64); ok {
-		return v, nil
-	}
-	if v, ok := arg.(string); ok {
-		conv, err := strconv.ParseFloat(v, 64)
-		if err != nil {
-			return nil, nil
-		}
-		return conv, nil
-	}
-	if _, ok := arg.([]interface{}); ok {
-		return nil, nil
-	}
-	if _, ok := arg.(map[string]interface{}); ok {
-		return nil, nil
-	}
-	if arg == nil {
-		return nil, nil
-	}
-	if arg == true || arg == false {
-		return nil, nil
-	}
-	return nil, errors.New("unknown type")
-}
-func jpfNotNull(arguments []interface{}) (interface{}, error) {
-	for _, arg := range arguments {
-		if arg != nil {
-			return arg, nil
-		}
-	}
-	return nil, nil
-}
diff --git a/vendor/github.com/jmespath/go-jmespath/interpreter.go b/vendor/github.com/jmespath/go-jmespath/interpreter.go
deleted file mode 100644
index 13c74604c2..0000000000
--- a/vendor/github.com/jmespath/go-jmespath/interpreter.go
+++ /dev/null
@@ -1,418 +0,0 @@
-package jmespath
-
-import (
-	"errors"
-	"reflect"
-	"unicode"
-	"unicode/utf8"
-)
-
-/* This is a tree based interpreter.  It walks the AST and directly
-   interprets the AST to search through a JSON document.
-*/
-
-type treeInterpreter struct {
-	fCall *functionCaller
-}
-
-func newInterpreter() *treeInterpreter {
-	interpreter := treeInterpreter{}
-	interpreter.fCall = newFunctionCaller()
-	return &interpreter
-}
-
-type expRef struct {
-	ref ASTNode
-}
-
-// Execute takes an ASTNode and input data and interprets the AST directly.
-// It will produce the result of applying the JMESPath expression associated
-// with the ASTNode to the input data "value".
-func (intr *treeInterpreter) Execute(node ASTNode, value interface{}) (interface{}, error) {
-	switch node.nodeType {
-	case ASTComparator:
-		left, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, err
-		}
-		right, err := intr.Execute(node.children[1], value)
-		if err != nil {
-			return nil, err
-		}
-		switch node.value {
-		case tEQ:
-			return objsEqual(left, right), nil
-		case tNE:
-			return !objsEqual(left, right), nil
-		}
-		leftNum, ok := left.(float64)
-		if !ok {
-			return nil, nil
-		}
-		rightNum, ok := right.(float64)
-		if !ok {
-			return nil, nil
-		}
-		switch node.value {
-		case tGT:
-			return leftNum > rightNum, nil
-		case tGTE:
-			return leftNum >= rightNum, nil
-		case tLT:
-			return leftNum < rightNum, nil
-		case tLTE:
-			return leftNum <= rightNum, nil
-		}
-	case ASTExpRef:
-		return expRef{ref: node.children[0]}, nil
-	case ASTFunctionExpression:
-		resolvedArgs := []interface{}{}
-		for _, arg := range node.children {
-			current, err := intr.Execute(arg, value)
-			if err != nil {
-				return nil, err
-			}
-			resolvedArgs = append(resolvedArgs, current)
-		}
-		return intr.fCall.CallFunction(node.value.(string), resolvedArgs, intr)
-	case ASTField:
-		if m, ok := value.(map[string]interface{}); ok {
-			key := node.value.(string)
-			return m[key], nil
-		}
-		return intr.fieldFromStruct(node.value.(string), value)
-	case ASTFilterProjection:
-		left, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, nil
-		}
-		sliceType, ok := left.([]interface{})
-		if !ok {
-			if isSliceType(left) {
-				return intr.filterProjectionWithReflection(node, left)
-			}
-			return nil, nil
-		}
-		compareNode := node.children[2]
-		collected := []interface{}{}
-		for _, element := range sliceType {
-			result, err := intr.Execute(compareNode, element)
-			if err != nil {
-				return nil, err
-			}
-			if !isFalse(result) {
-				current, err := intr.Execute(node.children[1], element)
-				if err != nil {
-					return nil, err
-				}
-				if current != nil {
-					collected = append(collected, current)
-				}
-			}
-		}
-		return collected, nil
-	case ASTFlatten:
-		left, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, nil
-		}
-		sliceType, ok := left.([]interface{})
-		if !ok {
-			// If we can't type convert to []interface{}, there's
-			// a chance this could still work via reflection if we're
-			// dealing with user provided types.
-			if isSliceType(left) {
-				return intr.flattenWithReflection(left)
-			}
-			return nil, nil
-		}
-		flattened := []interface{}{}
-		for _, element := range sliceType {
-			if elementSlice, ok := element.([]interface{}); ok {
-				flattened = append(flattened, elementSlice...)
-			} else if isSliceType(element) {
-				reflectFlat := []interface{}{}
-				v := reflect.ValueOf(element)
-				for i := 0; i < v.Len(); i++ {
-					reflectFlat = append(reflectFlat, v.Index(i).Interface())
-				}
-				flattened = append(flattened, reflectFlat...)
-			} else {
-				flattened = append(flattened, element)
-			}
-		}
-		return flattened, nil
-	case ASTIdentity, ASTCurrentNode:
-		return value, nil
-	case ASTIndex:
-		if sliceType, ok := value.([]interface{}); ok {
-			index := node.value.(int)
-			if index < 0 {
-				index += len(sliceType)
-			}
-			if index < len(sliceType) && index >= 0 {
-				return sliceType[index], nil
-			}
-			return nil, nil
-		}
-		// Otherwise try via reflection.
-		rv := reflect.ValueOf(value)
-		if rv.Kind() == reflect.Slice {
-			index := node.value.(int)
-			if index < 0 {
-				index += rv.Len()
-			}
-			if index < rv.Len() && index >= 0 {
-				v := rv.Index(index)
-				return v.Interface(), nil
-			}
-		}
-		return nil, nil
-	case ASTKeyValPair:
-		return intr.Execute(node.children[0], value)
-	case ASTLiteral:
-		return node.value, nil
-	case ASTMultiSelectHash:
-		if value == nil {
-			return nil, nil
-		}
-		collected := make(map[string]interface{})
-		for _, child := range node.children {
-			current, err := intr.Execute(child, value)
-			if err != nil {
-				return nil, err
-			}
-			key := child.value.(string)
-			collected[key] = current
-		}
-		return collected, nil
-	case ASTMultiSelectList:
-		if value == nil {
-			return nil, nil
-		}
-		collected := []interface{}{}
-		for _, child := range node.children {
-			current, err := intr.Execute(child, value)
-			if err != nil {
-				return nil, err
-			}
-			collected = append(collected, current)
-		}
-		return collected, nil
-	case ASTOrExpression:
-		matched, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, err
-		}
-		if isFalse(matched) {
-			matched, err = intr.Execute(node.children[1], value)
-			if err != nil {
-				return nil, err
-			}
-		}
-		return matched, nil
-	case ASTAndExpression:
-		matched, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, err
-		}
-		if isFalse(matched) {
-			return matched, nil
-		}
-		return intr.Execute(node.children[1], value)
-	case ASTNotExpression:
-		matched, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, err
-		}
-		if isFalse(matched) {
-			return true, nil
-		}
-		return false, nil
-	case ASTPipe:
-		result := value
-		var err error
-		for _, child := range node.children {
-			result, err = intr.Execute(child, result)
-			if err != nil {
-				return nil, err
-			}
-		}
-		return result, nil
-	case ASTProjection:
-		left, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, err
-		}
-		sliceType, ok := left.([]interface{})
-		if !ok {
-			if isSliceType(left) {
-				return intr.projectWithReflection(node, left)
-			}
-			return nil, nil
-		}
-		collected := []interface{}{}
-		var current interface{}
-		for _, element := range sliceType {
-			current, err = intr.Execute(node.children[1], element)
-			if err != nil {
-				return nil, err
-			}
-			if current != nil {
-				collected = append(collected, current)
-			}
-		}
-		return collected, nil
-	case ASTSubexpression, ASTIndexExpression:
-		left, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, err
-		}
-		return intr.Execute(node.children[1], left)
-	case ASTSlice:
-		sliceType, ok := value.([]interface{})
-		if !ok {
-			if isSliceType(value) {
-				return intr.sliceWithReflection(node, value)
-			}
-			return nil, nil
-		}
-		parts := node.value.([]*int)
-		sliceParams := make([]sliceParam, 3)
-		for i, part := range parts {
-			if part != nil {
-				sliceParams[i].Specified = true
-				sliceParams[i].N = *part
-			}
-		}
-		return slice(sliceType, sliceParams)
-	case ASTValueProjection:
-		left, err := intr.Execute(node.children[0], value)
-		if err != nil {
-			return nil, nil
-		}
-		mapType, ok := left.(map[string]interface{})
-		if !ok {
-			return nil, nil
-		}
-		values := make([]interface{}, len(mapType))
-		for _, value := range mapType {
-			values = append(values, value)
-		}
-		collected := []interface{}{}
-		for _, element := range values {
-			current, err := intr.Execute(node.children[1], element)
-			if err != nil {
-				return nil, err
-			}
-			if current != nil {
-				collected = append(collected, current)
-			}
-		}
-		return collected, nil
-	}
-	return nil, errors.New("Unknown AST node: " + node.nodeType.String())
-}
-
-func (intr *treeInterpreter) fieldFromStruct(key string, value interface{}) (interface{}, error) {
-	rv := reflect.ValueOf(value)
-	first, n := utf8.DecodeRuneInString(key)
-	fieldName := string(unicode.ToUpper(first)) + key[n:]
-	if rv.Kind() == reflect.Struct {
-		v := rv.FieldByName(fieldName)
-		if !v.IsValid() {
-			return nil, nil
-		}
-		return v.Interface(), nil
-	} else if rv.Kind() == reflect.Ptr {
-		// Handle multiple levels of indirection?
-		if rv.IsNil() {
-			return nil, nil
-		}
-		rv = rv.Elem()
-		v := rv.FieldByName(fieldName)
-		if !v.IsValid() {
-			return nil, nil
-		}
-		return v.Interface(), nil
-	}
-	return nil, nil
-}
-
-func (intr *treeInterpreter) flattenWithReflection(value interface{}) (interface{}, error) {
-	v := reflect.ValueOf(value)
-	flattened := []interface{}{}
-	for i := 0; i < v.Len(); i++ {
-		element := v.Index(i).Interface()
-		if reflect.TypeOf(element).Kind() == reflect.Slice {
-			// Then insert the contents of the element
-			// slice into the flattened slice,
-			// i.e flattened = append(flattened, mySlice...)
-			elementV := reflect.ValueOf(element)
-			for j := 0; j < elementV.Len(); j++ {
-				flattened = append(
-					flattened, elementV.Index(j).Interface())
-			}
-		} else {
-			flattened = append(flattened, element)
-		}
-	}
-	return flattened, nil
-}
-
-func (intr *treeInterpreter) sliceWithReflection(node ASTNode, value interface{}) (interface{}, error) {
-	v := reflect.ValueOf(value)
-	parts := node.value.([]*int)
-	sliceParams := make([]sliceParam, 3)
-	for i, part := range parts {
-		if part != nil {
-			sliceParams[i].Specified = true
-			sliceParams[i].N = *part
-		}
-	}
-	final := []interface{}{}
-	for i := 0; i < v.Len(); i++ {
-		element := v.Index(i).Interface()
-		final = append(final, element)
-	}
-	return slice(final, sliceParams)
-}
-
-func (intr *treeInterpreter) filterProjectionWithReflection(node ASTNode, value interface{}) (interface{}, error) {
-	compareNode := node.children[2]
-	collected := []interface{}{}
-	v := reflect.ValueOf(value)
-	for i := 0; i < v.Len(); i++ {
-		element := v.Index(i).Interface()
-		result, err := intr.Execute(compareNode, element)
-		if err != nil {
-			return nil, err
-		}
-		if !isFalse(result) {
-			current, err := intr.Execute(node.children[1], element)
-			if err != nil {
-				return nil, err
-			}
-			if current != nil {
-				collected = append(collected, current)
-			}
-		}
-	}
-	return collected, nil
-}
-
-func (intr *treeInterpreter) projectWithReflection(node ASTNode, value interface{}) (interface{}, error) {
-	collected := []interface{}{}
-	v := reflect.ValueOf(value)
-	for i := 0; i < v.Len(); i++ {
-		element := v.Index(i).Interface()
-		result, err := intr.Execute(node.children[1], element)
-		if err != nil {
-			return nil, err
-		}
-		if result != nil {
-			collected = append(collected, result)
-		}
-	}
-	return collected, nil
-}
diff --git a/vendor/github.com/jmespath/go-jmespath/lexer.go b/vendor/github.com/jmespath/go-jmespath/lexer.go
deleted file mode 100644
index 817900c8f5..0000000000
--- a/vendor/github.com/jmespath/go-jmespath/lexer.go
+++ /dev/null
@@ -1,420 +0,0 @@
-package jmespath
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-type token struct {
-	tokenType tokType
-	value     string
-	position  int
-	length    int
-}
-
-type tokType int
-
-const eof = -1
-
-// Lexer contains information about the expression being tokenized.
-type Lexer struct {
-	expression string       // The expression provided by the user.
-	currentPos int          // The current position in the string.
-	lastWidth  int          // The width of the current rune.  This
-	buf        bytes.Buffer // Internal buffer used for building up values.
-}
-
-// SyntaxError is the main error used whenever a lexing or parsing error occurs.
-type SyntaxError struct {
-	msg        string // Error message displayed to user
-	Expression string // Expression that generated a SyntaxError
-	Offset     int    // The location in the string where the error occurred
-}
-
-func (e SyntaxError) Error() string {
-	// In the future, it would be good to underline the specific
-	// location where the error occurred.
-	return "SyntaxError: " + e.msg
-}
-
-// HighlightLocation will show where the syntax error occurred.
-// It will place a "^" character on a line below the expression
-// at the point where the syntax error occurred.
-func (e SyntaxError) HighlightLocation() string {
-	return e.Expression + "\n" + strings.Repeat(" ", e.Offset) + "^"
-}
-
-//go:generate stringer -type=tokType
-const (
-	tUnknown tokType = iota
-	tStar
-	tDot
-	tFilter
-	tFlatten
-	tLparen
-	tRparen
-	tLbracket
-	tRbracket
-	tLbrace
-	tRbrace
-	tOr
-	tPipe
-	tNumber
-	tUnquotedIdentifier
-	tQuotedIdentifier
-	tComma
-	tColon
-	tLT
-	tLTE
-	tGT
-	tGTE
-	tEQ
-	tNE
-	tJSONLiteral
-	tStringLiteral
-	tCurrent
-	tExpref
-	tAnd
-	tNot
-	tEOF
-)
-
-var basicTokens = map[rune]tokType{
-	'.': tDot,
-	'*': tStar,
-	',': tComma,
-	':': tColon,
-	'{': tLbrace,
-	'}': tRbrace,
-	']': tRbracket, // tLbracket not included because it could be "[]"
-	'(': tLparen,
-	')': tRparen,
-	'@': tCurrent,
-}
-
-// Bit mask for [a-zA-Z_] shifted down 64 bits to fit in a single uint64.
-// When using this bitmask just be sure to shift the rune down 64 bits
-// before checking against identifierStartBits.
-const identifierStartBits uint64 = 576460745995190270
-
-// Bit mask for [a-zA-Z0-9], 128 bits -> 2 uint64s.
-var identifierTrailingBits = [2]uint64{287948901175001088, 576460745995190270}
-
-var whiteSpace = map[rune]bool{
-	' ': true, '\t': true, '\n': true, '\r': true,
-}
-
-func (t token) String() string {
-	return fmt.Sprintf("Token{%+v, %s, %d, %d}",
-		t.tokenType, t.value, t.position, t.length)
-}
-
-// NewLexer creates a new JMESPath lexer.
-func NewLexer() *Lexer {
-	lexer := Lexer{}
-	return &lexer
-}
-
-func (lexer *Lexer) next() rune {
-	if lexer.currentPos >= len(lexer.expression) {
-		lexer.lastWidth = 0
-		return eof
-	}
-	r, w := utf8.DecodeRuneInString(lexer.expression[lexer.currentPos:])
-	lexer.lastWidth = w
-	lexer.currentPos += w
-	return r
-}
-
-func (lexer *Lexer) back() {
-	lexer.currentPos -= lexer.lastWidth
-}
-
-func (lexer *Lexer) peek() rune {
-	t := lexer.next()
-	lexer.back()
-	return t
-}
-
-// tokenize takes an expression and returns corresponding tokens.
-func (lexer *Lexer) tokenize(expression string) ([]token, error) {
-	var tokens []token
-	lexer.expression = expression
-	lexer.currentPos = 0
-	lexer.lastWidth = 0
-loop:
-	for {
-		r := lexer.next()
-		if identifierStartBits&(1<<(uint64(r)-64)) > 0 {
-			t := lexer.consumeUnquotedIdentifier()
-			tokens = append(tokens, t)
-		} else if val, ok := basicTokens[r]; ok {
-			// Basic single char token.
-			t := token{
-				tokenType: val,
-				value:     string(r),
-				position:  lexer.currentPos - lexer.lastWidth,
-				length:    1,
-			}
-			tokens = append(tokens, t)
-		} else if r == '-' || (r >= '0' && r <= '9') {
-			t := lexer.consumeNumber()
-			tokens = append(tokens, t)
-		} else if r == '[' {
-			t := lexer.consumeLBracket()
-			tokens = append(tokens, t)
-		} else if r == '"' {
-			t, err := lexer.consumeQuotedIdentifier()
-			if err != nil {
-				return tokens, err
-			}
-			tokens = append(tokens, t)
-		} else if r == '\'' {
-			t, err := lexer.consumeRawStringLiteral()
-			if err != nil {
-				return tokens, err
-			}
-			tokens = append(tokens, t)
-		} else if r == '`' {
-			t, err := lexer.consumeLiteral()
-			if err != nil {
-				return tokens, err
-			}
-			tokens = append(tokens, t)
-		} else if r == '|' {
-			t := lexer.matchOrElse(r, '|', tOr, tPipe)
-			tokens = append(tokens, t)
-		} else if r == '<' {
-			t := lexer.matchOrElse(r, '=', tLTE, tLT)
-			tokens = append(tokens, t)
-		} else if r == '>' {
-			t := lexer.matchOrElse(r, '=', tGTE, tGT)
-			tokens = append(tokens, t)
-		} else if r == '!' {
-			t := lexer.matchOrElse(r, '=', tNE, tNot)
-			tokens = append(tokens, t)
-		} else if r == '=' {
-			t := lexer.matchOrElse(r, '=', tEQ, tUnknown)
-			tokens = append(tokens, t)
-		} else if r == '&' {
-			t := lexer.matchOrElse(r, '&', tAnd, tExpref)
-			tokens = append(tokens, t)
-		} else if r == eof {
-			break loop
-		} else if _, ok := whiteSpace[r]; ok {
-			// Ignore whitespace
-		} else {
-			return tokens, lexer.syntaxError(fmt.Sprintf("Unknown char: %s", strconv.QuoteRuneToASCII(r)))
-		}
-	}
-	tokens = append(tokens, token{tEOF, "", len(lexer.expression), 0})
-	return tokens, nil
-}
-
-// Consume characters until the ending rune "r" is reached.
-// If the end of the expression is reached before seeing the
-// terminating rune "r", then an error is returned.
-// If no error occurs then the matching substring is returned.
-// The returned string will not include the ending rune.
-func (lexer *Lexer) consumeUntil(end rune) (string, error) {
-	start := lexer.currentPos
-	current := lexer.next()
-	for current != end && current != eof {
-		if current == '\\' && lexer.peek() != eof {
-			lexer.next()
-		}
-		current = lexer.next()
-	}
-	if lexer.lastWidth == 0 {
-		// Then we hit an EOF so we never reached the closing
-		// delimiter.
-		return "", SyntaxError{
-			msg:        "Unclosed delimiter: " + string(end),
-			Expression: lexer.expression,
-			Offset:     len(lexer.expression),
-		}
-	}
-	return lexer.expression[start : lexer.currentPos-lexer.lastWidth], nil
-}
-
-func (lexer *Lexer) consumeLiteral() (token, error) {
-	start := lexer.currentPos
-	value, err := lexer.consumeUntil('`')
-	if err != nil {
-		return token{}, err
-	}
-	value = strings.Replace(value, "\\`", "`", -1)
-	return token{
-		tokenType: tJSONLiteral,
-		value:     value,
-		position:  start,
-		length:    len(value),
-	}, nil
-}
-
-func (lexer *Lexer) consumeRawStringLiteral() (token, error) {
-	start := lexer.currentPos
-	currentIndex := start
-	current := lexer.next()
-	for current != '\'' && lexer.peek() != eof {
-		if current == '\\' && lexer.peek() == '\'' {
-			chunk := lexer.expression[currentIndex : lexer.currentPos-1]
-			lexer.buf.WriteString(chunk)
-			lexer.buf.WriteString("'")
-			lexer.next()
-			currentIndex = lexer.currentPos
-		}
-		current = lexer.next()
-	}
-	if lexer.lastWidth == 0 {
-		// Then we hit an EOF so we never reached the closing
-		// delimiter.
-		return token{}, SyntaxError{
-			msg:        "Unclosed delimiter: '",
-			Expression: lexer.expression,
-			Offset:     len(lexer.expression),
-		}
-	}
-	if currentIndex < lexer.currentPos {
-		lexer.buf.WriteString(lexer.expression[currentIndex : lexer.currentPos-1])
-	}
-	value := lexer.buf.String()
-	// Reset the buffer so it can reused again.
-	lexer.buf.Reset()
-	return token{
-		tokenType: tStringLiteral,
-		value:     value,
-		position:  start,
-		length:    len(value),
-	}, nil
-}
-
-func (lexer *Lexer) syntaxError(msg string) SyntaxError {
-	return SyntaxError{
-		msg:        msg,
-		Expression: lexer.expression,
-		Offset:     lexer.currentPos - 1,
-	}
-}
-
-// Checks for a two char token, otherwise matches a single character
-// token. This is used whenever a two char token overlaps a single
-// char token, e.g. "||" -> tPipe, "|" -> tOr.
-func (lexer *Lexer) matchOrElse(first rune, second rune, matchedType tokType, singleCharType tokType) token {
-	start := lexer.currentPos - lexer.lastWidth
-	nextRune := lexer.next()
-	var t token
-	if nextRune == second {
-		t = token{
-			tokenType: matchedType,
-			value:     string(first) + string(second),
-			position:  start,
-			length:    2,
-		}
-	} else {
-		lexer.back()
-		t = token{
-			tokenType: singleCharType,
-			value:     string(first),
-			position:  start,
-			length:    1,
-		}
-	}
-	return t
-}
-
-func (lexer *Lexer) consumeLBracket() token {
-	// There's three options here:
-	// 1. A filter expression "[?"
-	// 2. A flatten operator "[]"
-	// 3. A bare rbracket "["
-	start := lexer.currentPos - lexer.lastWidth
-	nextRune := lexer.next()
-	var t token
-	if nextRune == '?' {
-		t = token{
-			tokenType: tFilter,
-			value:     "[?",
-			position:  start,
-			length:    2,
-		}
-	} else if nextRune == ']' {
-		t = token{
-			tokenType: tFlatten,
-			value:     "[]",
-			position:  start,
-			length:    2,
-		}
-	} else {
-		t = token{
-			tokenType: tLbracket,
-			value:     "[",
-			position:  start,
-			length:    1,
-		}
-		lexer.back()
-	}
-	return t
-}
-
-func (lexer *Lexer) consumeQuotedIdentifier() (token, error) {
-	start := lexer.currentPos
-	value, err := lexer.consumeUntil('"')
-	if err != nil {
-		return token{}, err
-	}
-	var decoded string
-	asJSON := []byte("\"" + value + "\"")
-	if err := json.Unmarshal([]byte(asJSON), &decoded); err != nil {
-		return token{}, err
-	}
-	return token{
-		tokenType: tQuotedIdentifier,
-		value:     decoded,
-		position:  start - 1,
-		length:    len(decoded),
-	}, nil
-}
-
-func (lexer *Lexer) consumeUnquotedIdentifier() token {
-	// Consume runes until we reach the end of an unquoted
-	// identifier.
-	start := lexer.currentPos - lexer.lastWidth
-	for {
-		r := lexer.next()
-		if r < 0 || r > 128 || identifierTrailingBits[uint64(r)/64]&(1<<(uint64(r)%64)) == 0 {
-			lexer.back()
-			break
-		}
-	}
-	value := lexer.expression[start:lexer.currentPos]
-	return token{
-		tokenType: tUnquotedIdentifier,
-		value:     value,
-		position:  start,
-		length:    lexer.currentPos - start,
-	}
-}
-
-func (lexer *Lexer) consumeNumber() token {
-	// Consume runes until we reach something that's not a number.
-	start := lexer.currentPos - lexer.lastWidth
-	for {
-		r := lexer.next()
-		if r < '0' || r > '9' {
-			lexer.back()
-			break
-		}
-	}
-	value := lexer.expression[start:lexer.currentPos]
-	return token{
-		tokenType: tNumber,
-		value:     value,
-		position:  start,
-		length:    lexer.currentPos - start,
-	}
-}
diff --git a/vendor/github.com/jmespath/go-jmespath/parser.go b/vendor/github.com/jmespath/go-jmespath/parser.go
deleted file mode 100644
index 1240a17552..0000000000
--- a/vendor/github.com/jmespath/go-jmespath/parser.go
+++ /dev/null
@@ -1,603 +0,0 @@
-package jmespath
-
-import (
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-type astNodeType int
-
-//go:generate stringer -type astNodeType
-const (
-	ASTEmpty astNodeType = iota
-	ASTComparator
-	ASTCurrentNode
-	ASTExpRef
-	ASTFunctionExpression
-	ASTField
-	ASTFilterProjection
-	ASTFlatten
-	ASTIdentity
-	ASTIndex
-	ASTIndexExpression
-	ASTKeyValPair
-	ASTLiteral
-	ASTMultiSelectHash
-	ASTMultiSelectList
-	ASTOrExpression
-	ASTAndExpression
-	ASTNotExpression
-	ASTPipe
-	ASTProjection
-	ASTSubexpression
-	ASTSlice
-	ASTValueProjection
-)
-
-// ASTNode represents the abstract syntax tree of a JMESPath expression.
-type ASTNode struct {
-	nodeType astNodeType
-	value    interface{}
-	children []ASTNode
-}
-
-func (node ASTNode) String() string {
-	return node.PrettyPrint(0)
-}
-
-// PrettyPrint will pretty print the parsed AST.
-// The AST is an implementation detail and this pretty print
-// function is provided as a convenience method to help with
-// debugging.  You should not rely on its output as the internal
-// structure of the AST may change at any time.
-func (node ASTNode) PrettyPrint(indent int) string {
-	spaces := strings.Repeat(" ", indent)
-	output := fmt.Sprintf("%s%s {\n", spaces, node.nodeType)
-	nextIndent := indent + 2
-	if node.value != nil {
-		if converted, ok := node.value.(fmt.Stringer); ok {
-			// Account for things like comparator nodes
-			// that are enums with a String() method.
-			output += fmt.Sprintf("%svalue: %s\n", strings.Repeat(" ", nextIndent), converted.String())
-		} else {
-			output += fmt.Sprintf("%svalue: %#v\n", strings.Repeat(" ", nextIndent), node.value)
-		}
-	}
-	lastIndex := len(node.children)
-	if lastIndex > 0 {
-		output += fmt.Sprintf("%schildren: {\n", strings.Repeat(" ", nextIndent))
-		childIndent := nextIndent + 2
-		for _, elem := range node.children {
-			output += elem.PrettyPrint(childIndent)
-		}
-	}
-	output += fmt.Sprintf("%s}\n", spaces)
-	return output
-}
-
-var bindingPowers = map[tokType]int{
-	tEOF:                0,
-	tUnquotedIdentifier: 0,
-	tQuotedIdentifier:   0,
-	tRbracket:           0,
-	tRparen:             0,
-	tComma:              0,
-	tRbrace:             0,
-	tNumber:             0,
-	tCurrent:            0,
-	tExpref:             0,
-	tColon:              0,
-	tPipe:               1,
-	tOr:                 2,
-	tAnd:                3,
-	tEQ:                 5,
-	tLT:                 5,
-	tLTE:                5,
-	tGT:                 5,
-	tGTE:                5,
-	tNE:                 5,
-	tFlatten:            9,
-	tStar:               20,
-	tFilter:             21,
-	tDot:                40,
-	tNot:                45,
-	tLbrace:             50,
-	tLbracket:           55,
-	tLparen:             60,
-}
-
-// Parser holds state about the current expression being parsed.
-type Parser struct {
-	expression string
-	tokens     []token
-	index      int
-}
-
-// NewParser creates a new JMESPath parser.
-func NewParser() *Parser {
-	p := Parser{}
-	return &p
-}
-
-// Parse will compile a JMESPath expression.
-func (p *Parser) Parse(expression string) (ASTNode, error) {
-	lexer := NewLexer()
-	p.expression = expression
-	p.index = 0
-	tokens, err := lexer.tokenize(expression)
-	if err != nil {
-		return ASTNode{}, err
-	}
-	p.tokens = tokens
-	parsed, err := p.parseExpression(0)
-	if err != nil {
-		return ASTNode{}, err
-	}
-	if p.current() != tEOF {
-		return ASTNode{}, p.syntaxError(fmt.Sprintf(
-			"Unexpected token at the end of the expresssion: %s", p.current()))
-	}
-	return parsed, nil
-}
-
-func (p *Parser) parseExpression(bindingPower int) (ASTNode, error) {
-	var err error
-	leftToken := p.lookaheadToken(0)
-	p.advance()
-	leftNode, err := p.nud(leftToken)
-	if err != nil {
-		return ASTNode{}, err
-	}
-	currentToken := p.current()
-	for bindingPower < bindingPowers[currentToken] {
-		p.advance()
-		leftNode, err = p.led(currentToken, leftNode)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		currentToken = p.current()
-	}
-	return leftNode, nil
-}
-
-func (p *Parser) parseIndexExpression() (ASTNode, error) {
-	if p.lookahead(0) == tColon || p.lookahead(1) == tColon {
-		return p.parseSliceExpression()
-	}
-	indexStr := p.lookaheadToken(0).value
-	parsedInt, err := strconv.Atoi(indexStr)
-	if err != nil {
-		return ASTNode{}, err
-	}
-	indexNode := ASTNode{nodeType: ASTIndex, value: parsedInt}
-	p.advance()
-	if err := p.match(tRbracket); err != nil {
-		return ASTNode{}, err
-	}
-	return indexNode, nil
-}
-
-func (p *Parser) parseSliceExpression() (ASTNode, error) {
-	parts := []*int{nil, nil, nil}
-	index := 0
-	current := p.current()
-	for current != tRbracket && index < 3 {
-		if current == tColon {
-			index++
-			p.advance()
-		} else if current == tNumber {
-			parsedInt, err := strconv.Atoi(p.lookaheadToken(0).value)
-			if err != nil {
-				return ASTNode{}, err
-			}
-			parts[index] = &parsedInt
-			p.advance()
-		} else {
-			return ASTNode{}, p.syntaxError(
-				"Expected tColon or tNumber" + ", received: " + p.current().String())
-		}
-		current = p.current()
-	}
-	if err := p.match(tRbracket); err != nil {
-		return ASTNode{}, err
-	}
-	return ASTNode{
-		nodeType: ASTSlice,
-		value:    parts,
-	}, nil
-}
-
-func (p *Parser) match(tokenType tokType) error {
-	if p.current() == tokenType {
-		p.advance()
-		return nil
-	}
-	return p.syntaxError("Expected " + tokenType.String() + ", received: " + p.current().String())
-}
-
-func (p *Parser) led(tokenType tokType, node ASTNode) (ASTNode, error) {
-	switch tokenType {
-	case tDot:
-		if p.current() != tStar {
-			right, err := p.parseDotRHS(bindingPowers[tDot])
-			return ASTNode{
-				nodeType: ASTSubexpression,
-				children: []ASTNode{node, right},
-			}, err
-		}
-		p.advance()
-		right, err := p.parseProjectionRHS(bindingPowers[tDot])
-		return ASTNode{
-			nodeType: ASTValueProjection,
-			children: []ASTNode{node, right},
-		}, err
-	case tPipe:
-		right, err := p.parseExpression(bindingPowers[tPipe])
-		return ASTNode{nodeType: ASTPipe, children: []ASTNode{node, right}}, err
-	case tOr:
-		right, err := p.parseExpression(bindingPowers[tOr])
-		return ASTNode{nodeType: ASTOrExpression, children: []ASTNode{node, right}}, err
-	case tAnd:
-		right, err := p.parseExpression(bindingPowers[tAnd])
-		return ASTNode{nodeType: ASTAndExpression, children: []ASTNode{node, right}}, err
-	case tLparen:
-		name := node.value
-		var args []ASTNode
-		for p.current() != tRparen {
-			expression, err := p.parseExpression(0)
-			if err != nil {
-				return ASTNode{}, err
-			}
-			if p.current() == tComma {
-				if err := p.match(tComma); err != nil {
-					return ASTNode{}, err
-				}
-			}
-			args = append(args, expression)
-		}
-		if err := p.match(tRparen); err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{
-			nodeType: ASTFunctionExpression,
-			value:    name,
-			children: args,
-		}, nil
-	case tFilter:
-		return p.parseFilter(node)
-	case tFlatten:
-		left := ASTNode{nodeType: ASTFlatten, children: []ASTNode{node}}
-		right, err := p.parseProjectionRHS(bindingPowers[tFlatten])
-		return ASTNode{
-			nodeType: ASTProjection,
-			children: []ASTNode{left, right},
-		}, err
-	case tEQ, tNE, tGT, tGTE, tLT, tLTE:
-		right, err := p.parseExpression(bindingPowers[tokenType])
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{
-			nodeType: ASTComparator,
-			value:    tokenType,
-			children: []ASTNode{node, right},
-		}, nil
-	case tLbracket:
-		tokenType := p.current()
-		var right ASTNode
-		var err error
-		if tokenType == tNumber || tokenType == tColon {
-			right, err = p.parseIndexExpression()
-			if err != nil {
-				return ASTNode{}, err
-			}
-			return p.projectIfSlice(node, right)
-		}
-		// Otherwise this is a projection.
-		if err := p.match(tStar); err != nil {
-			return ASTNode{}, err
-		}
-		if err := p.match(tRbracket); err != nil {
-			return ASTNode{}, err
-		}
-		right, err = p.parseProjectionRHS(bindingPowers[tStar])
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{
-			nodeType: ASTProjection,
-			children: []ASTNode{node, right},
-		}, nil
-	}
-	return ASTNode{}, p.syntaxError("Unexpected token: " + tokenType.String())
-}
-
-func (p *Parser) nud(token token) (ASTNode, error) {
-	switch token.tokenType {
-	case tJSONLiteral:
-		var parsed interface{}
-		err := json.Unmarshal([]byte(token.value), &parsed)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{nodeType: ASTLiteral, value: parsed}, nil
-	case tStringLiteral:
-		return ASTNode{nodeType: ASTLiteral, value: token.value}, nil
-	case tUnquotedIdentifier:
-		return ASTNode{
-			nodeType: ASTField,
-			value:    token.value,
-		}, nil
-	case tQuotedIdentifier:
-		node := ASTNode{nodeType: ASTField, value: token.value}
-		if p.current() == tLparen {
-			return ASTNode{}, p.syntaxErrorToken("Can't have quoted identifier as function name.", token)
-		}
-		return node, nil
-	case tStar:
-		left := ASTNode{nodeType: ASTIdentity}
-		var right ASTNode
-		var err error
-		if p.current() == tRbracket {
-			right = ASTNode{nodeType: ASTIdentity}
-		} else {
-			right, err = p.parseProjectionRHS(bindingPowers[tStar])
-		}
-		return ASTNode{nodeType: ASTValueProjection, children: []ASTNode{left, right}}, err
-	case tFilter:
-		return p.parseFilter(ASTNode{nodeType: ASTIdentity})
-	case tLbrace:
-		return p.parseMultiSelectHash()
-	case tFlatten:
-		left := ASTNode{
-			nodeType: ASTFlatten,
-			children: []ASTNode{{nodeType: ASTIdentity}},
-		}
-		right, err := p.parseProjectionRHS(bindingPowers[tFlatten])
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{nodeType: ASTProjection, children: []ASTNode{left, right}}, nil
-	case tLbracket:
-		tokenType := p.current()
-		//var right ASTNode
-		if tokenType == tNumber || tokenType == tColon {
-			right, err := p.parseIndexExpression()
-			if err != nil {
-				return ASTNode{}, nil
-			}
-			return p.projectIfSlice(ASTNode{nodeType: ASTIdentity}, right)
-		} else if tokenType == tStar && p.lookahead(1) == tRbracket {
-			p.advance()
-			p.advance()
-			right, err := p.parseProjectionRHS(bindingPowers[tStar])
-			if err != nil {
-				return ASTNode{}, err
-			}
-			return ASTNode{
-				nodeType: ASTProjection,
-				children: []ASTNode{{nodeType: ASTIdentity}, right},
-			}, nil
-		} else {
-			return p.parseMultiSelectList()
-		}
-	case tCurrent:
-		return ASTNode{nodeType: ASTCurrentNode}, nil
-	case tExpref:
-		expression, err := p.parseExpression(bindingPowers[tExpref])
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{nodeType: ASTExpRef, children: []ASTNode{expression}}, nil
-	case tNot:
-		expression, err := p.parseExpression(bindingPowers[tNot])
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return ASTNode{nodeType: ASTNotExpression, children: []ASTNode{expression}}, nil
-	case tLparen:
-		expression, err := p.parseExpression(0)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		if err := p.match(tRparen); err != nil {
-			return ASTNode{}, err
-		}
-		return expression, nil
-	case tEOF:
-		return ASTNode{}, p.syntaxErrorToken("Incomplete expression", token)
-	}
-
-	return ASTNode{}, p.syntaxErrorToken("Invalid token: "+token.tokenType.String(), token)
-}
-
-func (p *Parser) parseMultiSelectList() (ASTNode, error) {
-	var expressions []ASTNode
-	for {
-		expression, err := p.parseExpression(0)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		expressions = append(expressions, expression)
-		if p.current() == tRbracket {
-			break
-		}
-		err = p.match(tComma)
-		if err != nil {
-			return ASTNode{}, err
-		}
-	}
-	err := p.match(tRbracket)
-	if err != nil {
-		return ASTNode{}, err
-	}
-	return ASTNode{
-		nodeType: ASTMultiSelectList,
-		children: expressions,
-	}, nil
-}
-
-func (p *Parser) parseMultiSelectHash() (ASTNode, error) {
-	var children []ASTNode
-	for {
-		keyToken := p.lookaheadToken(0)
-		if err := p.match(tUnquotedIdentifier); err != nil {
-			if err := p.match(tQuotedIdentifier); err != nil {
-				return ASTNode{}, p.syntaxError("Expected tQuotedIdentifier or tUnquotedIdentifier")
-			}
-		}
-		keyName := keyToken.value
-		err := p.match(tColon)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		value, err := p.parseExpression(0)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		node := ASTNode{
-			nodeType: ASTKeyValPair,
-			value:    keyName,
-			children: []ASTNode{value},
-		}
-		children = append(children, node)
-		if p.current() == tComma {
-			err := p.match(tComma)
-			if err != nil {
-				return ASTNode{}, nil
-			}
-		} else if p.current() == tRbrace {
-			err := p.match(tRbrace)
-			if err != nil {
-				return ASTNode{}, nil
-			}
-			break
-		}
-	}
-	return ASTNode{
-		nodeType: ASTMultiSelectHash,
-		children: children,
-	}, nil
-}
-
-func (p *Parser) projectIfSlice(left ASTNode, right ASTNode) (ASTNode, error) {
-	indexExpr := ASTNode{
-		nodeType: ASTIndexExpression,
-		children: []ASTNode{left, right},
-	}
-	if right.nodeType == ASTSlice {
-		right, err := p.parseProjectionRHS(bindingPowers[tStar])
-		return ASTNode{
-			nodeType: ASTProjection,
-			children: []ASTNode{indexExpr, right},
-		}, err
-	}
-	return indexExpr, nil
-}
-func (p *Parser) parseFilter(node ASTNode) (ASTNode, error) {
-	var right, condition ASTNode
-	var err error
-	condition, err = p.parseExpression(0)
-	if err != nil {
-		return ASTNode{}, err
-	}
-	if err := p.match(tRbracket); err != nil {
-		return ASTNode{}, err
-	}
-	if p.current() == tFlatten {
-		right = ASTNode{nodeType: ASTIdentity}
-	} else {
-		right, err = p.parseProjectionRHS(bindingPowers[tFilter])
-		if err != nil {
-			return ASTNode{}, err
-		}
-	}
-
-	return ASTNode{
-		nodeType: ASTFilterProjection,
-		children: []ASTNode{node, right, condition},
-	}, nil
-}
-
-func (p *Parser) parseDotRHS(bindingPower int) (ASTNode, error) {
-	lookahead := p.current()
-	if tokensOneOf([]tokType{tQuotedIdentifier, tUnquotedIdentifier, tStar}, lookahead) {
-		return p.parseExpression(bindingPower)
-	} else if lookahead == tLbracket {
-		if err := p.match(tLbracket); err != nil {
-			return ASTNode{}, err
-		}
-		return p.parseMultiSelectList()
-	} else if lookahead == tLbrace {
-		if err := p.match(tLbrace); err != nil {
-			return ASTNode{}, err
-		}
-		return p.parseMultiSelectHash()
-	}
-	return ASTNode{}, p.syntaxError("Expected identifier, lbracket, or lbrace")
-}
-
-func (p *Parser) parseProjectionRHS(bindingPower int) (ASTNode, error) {
-	current := p.current()
-	if bindingPowers[current] < 10 {
-		return ASTNode{nodeType: ASTIdentity}, nil
-	} else if current == tLbracket {
-		return p.parseExpression(bindingPower)
-	} else if current == tFilter {
-		return p.parseExpression(bindingPower)
-	} else if current == tDot {
-		err := p.match(tDot)
-		if err != nil {
-			return ASTNode{}, err
-		}
-		return p.parseDotRHS(bindingPower)
-	} else {
-		return ASTNode{}, p.syntaxError("Error")
-	}
-}
-
-func (p *Parser) lookahead(number int) tokType {
-	return p.lookaheadToken(number).tokenType
-}
-
-func (p *Parser) current() tokType {
-	return p.lookahead(0)
-}
-
-func (p *Parser) lookaheadToken(number int) token {
-	return p.tokens[p.index+number]
-}
-
-func (p *Parser) advance() {
-	p.index++
-}
-
-func tokensOneOf(elements []tokType, token tokType) bool {
-	for _, elem := range elements {
-		if elem == token {
-			return true
-		}
-	}
-	return false
-}
-
-func (p *Parser) syntaxError(msg string) SyntaxError {
-	return SyntaxError{
-		msg:        msg,
-		Expression: p.expression,
-		Offset:     p.lookaheadToken(0).position,
-	}
-}
-
-// Create a SyntaxError based on the provided token.
-// This differs from syntaxError() which creates a SyntaxError
-// based on the current lookahead token.
-func (p *Parser) syntaxErrorToken(msg string, t token) SyntaxError {
-	return SyntaxError{
-		msg:        msg,
-		Expression: p.expression,
-		Offset:     t.position,
-	}
-}
diff --git a/vendor/github.com/jmespath/go-jmespath/toktype_string.go b/vendor/github.com/jmespath/go-jmespath/toktype_string.go
deleted file mode 100644
index dae79cbdf3..0000000000
--- a/vendor/github.com/jmespath/go-jmespath/toktype_string.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by stringer -type=tokType; DO NOT EDIT
-
-package jmespath
-
-import "fmt"
-
-const _tokType_name = "tUnknowntStartDottFiltertFlattentLparentRparentLbrackettRbrackettLbracetRbracetOrtPipetNumbertUnquotedIdentifiertQuotedIdentifiertCommatColontLTtLTEtGTtGTEtEQtNEtJSONLiteraltStringLiteraltCurrenttExpreftAndtNottEOF"
-
-var _tokType_index = [...]uint8{0, 8, 13, 17, 24, 32, 39, 46, 55, 64, 71, 78, 81, 86, 93, 112, 129, 135, 141, 144, 148, 151, 155, 158, 161, 173, 187, 195, 202, 206, 210, 214}
-
-func (i tokType) String() string {
-	if i < 0 || i >= tokType(len(_tokType_index)-1) {
-		return fmt.Sprintf("tokType(%d)", i)
-	}
-	return _tokType_name[_tokType_index[i]:_tokType_index[i+1]]
-}
diff --git a/vendor/github.com/jmespath/go-jmespath/util.go b/vendor/github.com/jmespath/go-jmespath/util.go
deleted file mode 100644
index ddc1b7d7d4..0000000000
--- a/vendor/github.com/jmespath/go-jmespath/util.go
+++ /dev/null
@@ -1,185 +0,0 @@
-package jmespath
-
-import (
-	"errors"
-	"reflect"
-)
-
-// IsFalse determines if an object is false based on the JMESPath spec.
-// JMESPath defines false values to be any of:
-// - An empty string array, or hash.
-// - The boolean value false.
-// - nil
-func isFalse(value interface{}) bool {
-	switch v := value.(type) {
-	case bool:
-		return !v
-	case []interface{}:
-		return len(v) == 0
-	case map[string]interface{}:
-		return len(v) == 0
-	case string:
-		return len(v) == 0
-	case nil:
-		return true
-	}
-	// Try the reflection cases before returning false.
-	rv := reflect.ValueOf(value)
-	switch rv.Kind() {
-	case reflect.Struct:
-		// A struct type will never be false, even if
-		// all of its values are the zero type.
-		return false
-	case reflect.Slice, reflect.Map:
-		return rv.Len() == 0
-	case reflect.Ptr:
-		if rv.IsNil() {
-			return true
-		}
-		// If it's a pointer type, we'll try to deref the pointer
-		// and evaluate the pointer value for isFalse.
-		element := rv.Elem()
-		return isFalse(element.Interface())
-	}
-	return false
-}
-
-// ObjsEqual is a generic object equality check.
-// It will take two arbitrary objects and recursively determine
-// if they are equal.
-func objsEqual(left interface{}, right interface{}) bool {
-	return reflect.DeepEqual(left, right)
-}
-
-// SliceParam refers to a single part of a slice.
-// A slice consists of a start, a stop, and a step, similar to
-// python slices.
-type sliceParam struct {
-	N         int
-	Specified bool
-}
-
-// Slice supports [start:stop:step] style slicing that's supported in JMESPath.
-func slice(slice []interface{}, parts []sliceParam) ([]interface{}, error) {
-	computed, err := computeSliceParams(len(slice), parts)
-	if err != nil {
-		return nil, err
-	}
-	start, stop, step := computed[0], computed[1], computed[2]
-	result := []interface{}{}
-	if step > 0 {
-		for i := start; i < stop; i += step {
-			result = append(result, slice[i])
-		}
-	} else {
-		for i := start; i > stop; i += step {
-			result = append(result, slice[i])
-		}
-	}
-	return result, nil
-}
-
-func computeSliceParams(length int, parts []sliceParam) ([]int, error) {
-	var start, stop, step int
-	if !parts[2].Specified {
-		step = 1
-	} else if parts[2].N == 0 {
-		return nil, errors.New("Invalid slice, step cannot be 0")
-	} else {
-		step = parts[2].N
-	}
-	var stepValueNegative bool
-	if step < 0 {
-		stepValueNegative = true
-	} else {
-		stepValueNegative = false
-	}
-
-	if !parts[0].Specified {
-		if stepValueNegative {
-			start = length - 1
-		} else {
-			start = 0
-		}
-	} else {
-		start = capSlice(length, parts[0].N, step)
-	}
-
-	if !parts[1].Specified {
-		if stepValueNegative {
-			stop = -1
-		} else {
-			stop = length
-		}
-	} else {
-		stop = capSlice(length, parts[1].N, step)
-	}
-	return []int{start, stop, step}, nil
-}
-
-func capSlice(length int, actual int, step int) int {
-	if actual < 0 {
-		actual += length
-		if actual < 0 {
-			if step < 0 {
-				actual = -1
-			} else {
-				actual = 0
-			}
-		}
-	} else if actual >= length {
-		if step < 0 {
-			actual = length - 1
-		} else {
-			actual = length
-		}
-	}
-	return actual
-}
-
-// ToArrayNum converts an empty interface type to a slice of float64.
-// If any element in the array cannot be converted, then nil is returned
-// along with a second value of false.
-func toArrayNum(data interface{}) ([]float64, bool) {
-	// Is there a better way to do this with reflect?
-	if d, ok := data.([]interface{}); ok {
-		result := make([]float64, len(d))
-		for i, el := range d {
-			item, ok := el.(float64)
-			if !ok {
-				return nil, false
-			}
-			result[i] = item
-		}
-		return result, true
-	}
-	return nil, false
-}
-
-// ToArrayStr converts an empty interface type to a slice of strings.
-// If any element in the array cannot be converted, then nil is returned
-// along with a second value of false.  If the input data could be entirely
-// converted, then the converted data, along with a second value of true,
-// will be returned.
-func toArrayStr(data interface{}) ([]string, bool) {
-	// Is there a better way to do this with reflect?
-	if d, ok := data.([]interface{}); ok {
-		result := make([]string, len(d))
-		for i, el := range d {
-			item, ok := el.(string)
-			if !ok {
-				return nil, false
-			}
-			result[i] = item
-		}
-		return result, true
-	}
-	return nil, false
-}
-
-func isSliceType(v interface{}) bool {
-	if v == nil {
-		return false
-	}
-	return reflect.TypeOf(v).Kind() == reflect.Slice
-}
diff --git a/vendor/github.com/mailru/easyjson/LICENSE b/vendor/github.com/mailru/easyjson/LICENSE
deleted file mode 100644
index fbff658f70..0000000000
--- a/vendor/github.com/mailru/easyjson/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2016 Mail.Ru Group
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/mailru/easyjson/buffer/pool.go b/vendor/github.com/mailru/easyjson/buffer/pool.go
deleted file mode 100644
index 07fb4bc1f7..0000000000
--- a/vendor/github.com/mailru/easyjson/buffer/pool.go
+++ /dev/null
@@ -1,270 +0,0 @@
-// Package buffer implements a buffer for serialization, consisting of a chain of []byte-s to
-// reduce copying and to allow reuse of individual chunks.
-package buffer
-
-import (
-	"io"
-	"sync"
-)
-
-// PoolConfig contains configuration for the allocation and reuse strategy.
-type PoolConfig struct {
-	StartSize  int // Minimum chunk size that is allocated.
-	PooledSize int // Minimum chunk size that is reused, reusing chunks too small will result in overhead.
-	MaxSize    int // Maximum chunk size that will be allocated.
-}
-
-var config = PoolConfig{
-	StartSize:  128,
-	PooledSize: 512,
-	MaxSize:    32768,
-}
-
-// Reuse pool: chunk size -> pool.
-var buffers = map[int]*sync.Pool{}
-
-func initBuffers() {
-	for l := config.PooledSize; l <= config.MaxSize; l *= 2 {
-		buffers[l] = new(sync.Pool)
-	}
-}
-
-func init() {
-	initBuffers()
-}
-
-// Init sets up a non-default pooling and allocation strategy. Should be run before serialization is done.
-func Init(cfg PoolConfig) {
-	config = cfg
-	initBuffers()
-}
-
-// putBuf puts a chunk to reuse pool if it can be reused.
-func putBuf(buf []byte) {
-	size := cap(buf)
-	if size < config.PooledSize {
-		return
-	}
-	if c := buffers[size]; c != nil {
-		c.Put(buf[:0])
-	}
-}
-
-// getBuf gets a chunk from reuse pool or creates a new one if reuse failed.
-func getBuf(size int) []byte {
-	if size < config.PooledSize {
-		return make([]byte, 0, size)
-	}
-
-	if c := buffers[size]; c != nil {
-		v := c.Get()
-		if v != nil {
-			return v.([]byte)
-		}
-	}
-	return make([]byte, 0, size)
-}
-
-// Buffer is a buffer optimized for serialization without extra copying.
-type Buffer struct {
-
-	// Buf is the current chunk that can be used for serialization.
-	Buf []byte
-
-	toPool []byte
-	bufs   [][]byte
-}
-
-// EnsureSpace makes sure that the current chunk contains at least s free bytes,
-// possibly creating a new chunk.
-func (b *Buffer) EnsureSpace(s int) {
-	if cap(b.Buf)-len(b.Buf) >= s {
-		return
-	}
-	l := len(b.Buf)
-	if l > 0 {
-		if cap(b.toPool) != cap(b.Buf) {
-			// Chunk was reallocated, toPool can be pooled.
-			putBuf(b.toPool)
-		}
-		if cap(b.bufs) == 0 {
-			b.bufs = make([][]byte, 0, 8)
-		}
-		b.bufs = append(b.bufs, b.Buf)
-		l = cap(b.toPool) * 2
-	} else {
-		l = config.StartSize
-	}
-
-	if l > config.MaxSize {
-		l = config.MaxSize
-	}
-	b.Buf = getBuf(l)
-	b.toPool = b.Buf
-}
-
-// AppendByte appends a single byte to buffer.
-func (b *Buffer) AppendByte(data byte) {
-	if cap(b.Buf) == len(b.Buf) { // EnsureSpace won't be inlined.
-		b.EnsureSpace(1)
-	}
-	b.Buf = append(b.Buf, data)
-}
-
-// AppendBytes appends a byte slice to buffer.
-func (b *Buffer) AppendBytes(data []byte) {
-	for len(data) > 0 {
-		if cap(b.Buf) == len(b.Buf) { // EnsureSpace won't be inlined.
-			b.EnsureSpace(1)
-		}
-
-		sz := cap(b.Buf) - len(b.Buf)
-		if sz > len(data) {
-			sz = len(data)
-		}
-
-		b.Buf = append(b.Buf, data[:sz]...)
-		data = data[sz:]
-	}
-}
-
-// AppendBytes appends a string to buffer.
-func (b *Buffer) AppendString(data string) {
-	for len(data) > 0 {
-		if cap(b.Buf) == len(b.Buf) { // EnsureSpace won't be inlined.
-			b.EnsureSpace(1)
-		}
-
-		sz := cap(b.Buf) - len(b.Buf)
-		if sz > len(data) {
-			sz = len(data)
-		}
-
-		b.Buf = append(b.Buf, data[:sz]...)
-		data = data[sz:]
-	}
-}
-
-// Size computes the size of a buffer by adding sizes of every chunk.
-func (b *Buffer) Size() int {
-	size := len(b.Buf)
-	for _, buf := range b.bufs {
-		size += len(buf)
-	}
-	return size
-}
-
-// DumpTo outputs the contents of a buffer to a writer and resets the buffer.
-func (b *Buffer) DumpTo(w io.Writer) (written int, err error) {
-	var n int
-	for _, buf := range b.bufs {
-		if err == nil {
-			n, err = w.Write(buf)
-			written += n
-		}
-		putBuf(buf)
-	}
-
-	if err == nil {
-		n, err = w.Write(b.Buf)
-		written += n
-	}
-	putBuf(b.toPool)
-
-	b.bufs = nil
-	b.Buf = nil
-	b.toPool = nil
-
-	return
-}
-
-// BuildBytes creates a single byte slice with all the contents of the buffer. Data is
-// copied if it does not fit in a single chunk. You can optionally provide one byte
-// slice as argument that it will try to reuse.
-func (b *Buffer) BuildBytes(reuse ...[]byte) []byte {
-	if len(b.bufs) == 0 {
-		ret := b.Buf
-		b.toPool = nil
-		b.Buf = nil
-		return ret
-	}
-
-	var ret []byte
-	size := b.Size()
-
-	// If we got a buffer as argument and it is big enought, reuse it.
-	if len(reuse) == 1 && cap(reuse[0]) >= size {
-		ret = reuse[0][:0]
-	} else {
-		ret = make([]byte, 0, size)
-	}
-	for _, buf := range b.bufs {
-		ret = append(ret, buf...)
-		putBuf(buf)
-	}
-
-	ret = append(ret, b.Buf...)
-	putBuf(b.toPool)
-
-	b.bufs = nil
-	b.toPool = nil
-	b.Buf = nil
-
-	return ret
-}
-
-type readCloser struct {
-	offset int
-	bufs   [][]byte
-}
-
-func (r *readCloser) Read(p []byte) (n int, err error) {
-	for _, buf := range r.bufs {
-		// Copy as much as we can.
-		x := copy(p[n:], buf[r.offset:])
-		n += x // Increment how much we filled.
-
-		// Did we empty the whole buffer?
-		if r.offset+x == len(buf) {
-			// On to the next buffer.
-			r.offset = 0
-			r.bufs = r.bufs[1:]
-
-			// We can release this buffer.
-			putBuf(buf)
-		} else {
-			r.offset += x
-		}
-
-		if n == len(p) {
-			break
-		}
-	}
-	// No buffers left or nothing read?
-	if len(r.bufs) == 0 {
-		err = io.EOF
-	}
-	return
-}
-
-func (r *readCloser) Close() error {
-	// Release all remaining buffers.
-	for _, buf := range r.bufs {
-		putBuf(buf)
-	}
-	// In case Close gets called multiple times.
-	r.bufs = nil
-
-	return nil
-}
-
-// ReadCloser creates an io.ReadCloser with all the contents of the buffer.
-func (b *Buffer) ReadCloser() io.ReadCloser {
-	ret := &readCloser{0, append(b.bufs, b.Buf)}
-
-	b.bufs = nil
-	b.toPool = nil
-	b.Buf = nil
-
-	return ret
-}
diff --git a/vendor/github.com/mailru/easyjson/jlexer/bytestostr.go b/vendor/github.com/mailru/easyjson/jlexer/bytestostr.go
deleted file mode 100644
index ff7b27c5b2..0000000000
--- a/vendor/github.com/mailru/easyjson/jlexer/bytestostr.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// This file will only be included to the build if neither
-// easyjson_nounsafe nor appengine build tag is set. See README notes
-// for more details.
-
-//+build !easyjson_nounsafe
-//+build !appengine
-
-package jlexer
-
-import (
-	"reflect"
-	"unsafe"
-)
-
-// bytesToStr creates a string pointing at the slice to avoid copying.
-//
-// Warning: the string returned by the function should be used with care, as the whole input data
-// chunk may be either blocked from being freed by GC because of a single string or the buffer.Data
-// may be garbage-collected even when the string exists.
-func bytesToStr(data []byte) string {
-	h := (*reflect.SliceHeader)(unsafe.Pointer(&data))
-	shdr := reflect.StringHeader{Data: h.Data, Len: h.Len}
-	return *(*string)(unsafe.Pointer(&shdr))
-}
diff --git a/vendor/github.com/mailru/easyjson/jlexer/bytestostr_nounsafe.go b/vendor/github.com/mailru/easyjson/jlexer/bytestostr_nounsafe.go
deleted file mode 100644
index 864d1be676..0000000000
--- a/vendor/github.com/mailru/easyjson/jlexer/bytestostr_nounsafe.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// This file is included to the build if any of the buildtags below
-// are defined. Refer to README notes for more details.
-
-//+build easyjson_nounsafe appengine
-
-package jlexer
-
-// bytesToStr creates a string normally from []byte
-//
-// Note that this method is roughly 1.5x slower than using the 'unsafe' method.
-func bytesToStr(data []byte) string {
-	return string(data)
-}
diff --git a/vendor/github.com/mailru/easyjson/jlexer/error.go b/vendor/github.com/mailru/easyjson/jlexer/error.go
deleted file mode 100644
index e90ec40d05..0000000000
--- a/vendor/github.com/mailru/easyjson/jlexer/error.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package jlexer
-
-import "fmt"
-
-// LexerError implements the error interface and represents all possible errors that can be
-// generated during parsing the JSON data.
-type LexerError struct {
-	Reason string
-	Offset int
-	Data   string
-}
-
-func (l *LexerError) Error() string {
-	return fmt.Sprintf("parse error: %s near offset %d of '%s'", l.Reason, l.Offset, l.Data)
-}
diff --git a/vendor/github.com/mailru/easyjson/jlexer/lexer.go b/vendor/github.com/mailru/easyjson/jlexer/lexer.go
deleted file mode 100644
index e81f1031b0..0000000000
--- a/vendor/github.com/mailru/easyjson/jlexer/lexer.go
+++ /dev/null
@@ -1,1114 +0,0 @@
-// Package jlexer contains a JSON lexer implementation.
-//
-// It is expected that it is mostly used with generated parser code, so the interface is tuned
-// for a parser that knows what kind of data is expected.
-package jlexer
-
-import (
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"io"
-	"strconv"
-	"unicode"
-	"unicode/utf16"
-	"unicode/utf8"
-)
-
-// tokenKind determines type of a token.
-type tokenKind byte
-
-const (
-	tokenUndef  tokenKind = iota // No token.
-	tokenDelim                   // Delimiter: one of '{', '}', '[' or ']'.
-	tokenString                  // A string literal, e.g. "abc\u1234"
-	tokenNumber                  // Number literal, e.g. 1.5e5
-	tokenBool                    // Boolean literal: true or false.
-	tokenNull                    // null keyword.
-)
-
-// token describes a single token: type, position in the input and value.
-type token struct {
-	kind tokenKind // Type of a token.
-
-	boolValue  bool   // Value if a boolean literal token.
-	byteValue  []byte // Raw value of a token.
-	delimValue byte
-}
-
-// Lexer is a JSON lexer: it iterates over JSON tokens in a byte slice.
-type Lexer struct {
-	Data []byte // Input data given to the lexer.
-
-	start int   // Start of the current token.
-	pos   int   // Current unscanned position in the input stream.
-	token token // Last scanned token, if token.kind != tokenUndef.
-
-	firstElement bool // Whether current element is the first in array or an object.
-	wantSep      byte // A comma or a colon character, which need to occur before a token.
-
-	UseMultipleErrors bool          // If we want to use multiple errors.
-	fatalError        error         // Fatal error occurred during lexing. It is usually a syntax error.
-	multipleErrors    []*LexerError // Semantic errors occurred during lexing. Marshalling will be continued after finding this errors.
-}
-
-// FetchToken scans the input for the next token.
-func (r *Lexer) FetchToken() {
-	r.token.kind = tokenUndef
-	r.start = r.pos
-
-	// Check if r.Data has r.pos element
-	// If it doesn't, it mean corrupted input data
-	if len(r.Data) < r.pos {
-		r.errParse("Unexpected end of data")
-		return
-	}
-	// Determine the type of a token by skipping whitespace and reading the
-	// first character.
-	for _, c := range r.Data[r.pos:] {
-		switch c {
-		case ':', ',':
-			if r.wantSep == c {
-				r.pos++
-				r.start++
-				r.wantSep = 0
-			} else {
-				r.errSyntax()
-			}
-
-		case ' ', '\t', '\r', '\n':
-			r.pos++
-			r.start++
-
-		case '"':
-			if r.wantSep != 0 {
-				r.errSyntax()
-			}
-
-			r.token.kind = tokenString
-			r.fetchString()
-			return
-
-		case '{', '[':
-			if r.wantSep != 0 {
-				r.errSyntax()
-			}
-			r.firstElement = true
-			r.token.kind = tokenDelim
-			r.token.delimValue = r.Data[r.pos]
-			r.pos++
-			return
-
-		case '}', ']':
-			if !r.firstElement && (r.wantSep != ',') {
-				r.errSyntax()
-			}
-			r.wantSep = 0
-			r.token.kind = tokenDelim
-			r.token.delimValue = r.Data[r.pos]
-			r.pos++
-			return
-
-		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-':
-			if r.wantSep != 0 {
-				r.errSyntax()
-			}
-			r.token.kind = tokenNumber
-			r.fetchNumber()
-			return
-
-		case 'n':
-			if r.wantSep != 0 {
-				r.errSyntax()
-			}
-
-			r.token.kind = tokenNull
-			r.fetchNull()
-			return
-
-		case 't':
-			if r.wantSep != 0 {
-				r.errSyntax()
-			}
-
-			r.token.kind = tokenBool
-			r.token.boolValue = true
-			r.fetchTrue()
-			return
-
-		case 'f':
-			if r.wantSep != 0 {
-				r.errSyntax()
-			}
-
-			r.token.kind = tokenBool
-			r.token.boolValue = false
-			r.fetchFalse()
-			return
-
-		default:
-			r.errSyntax()
-			return
-		}
-	}
-	r.fatalError = io.EOF
-	return
-}
-
-// isTokenEnd returns true if the char can follow a non-delimiter token
-func isTokenEnd(c byte) bool {
-	return c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '[' || c == ']' || c == '{' || c == '}' || c == ',' || c == ':'
-}
-
-// fetchNull fetches and checks remaining bytes of null keyword.
-func (r *Lexer) fetchNull() {
-	r.pos += 4
-	if r.pos > len(r.Data) ||
-		r.Data[r.pos-3] != 'u' ||
-		r.Data[r.pos-2] != 'l' ||
-		r.Data[r.pos-1] != 'l' ||
-		(r.pos != len(r.Data) && !isTokenEnd(r.Data[r.pos])) {
-
-		r.pos -= 4
-		r.errSyntax()
-	}
-}
-
-// fetchTrue fetches and checks remaining bytes of true keyword.
-func (r *Lexer) fetchTrue() {
-	r.pos += 4
-	if r.pos > len(r.Data) ||
-		r.Data[r.pos-3] != 'r' ||
-		r.Data[r.pos-2] != 'u' ||
-		r.Data[r.pos-1] != 'e' ||
-		(r.pos != len(r.Data) && !isTokenEnd(r.Data[r.pos])) {
-
-		r.pos -= 4
-		r.errSyntax()
-	}
-}
-
-// fetchFalse fetches and checks remaining bytes of false keyword.
-func (r *Lexer) fetchFalse() {
-	r.pos += 5
-	if r.pos > len(r.Data) ||
-		r.Data[r.pos-4] != 'a' ||
-		r.Data[r.pos-3] != 'l' ||
-		r.Data[r.pos-2] != 's' ||
-		r.Data[r.pos-1] != 'e' ||
-		(r.pos != len(r.Data) && !isTokenEnd(r.Data[r.pos])) {
-
-		r.pos -= 5
-		r.errSyntax()
-	}
-}
-
-// fetchNumber scans a number literal token.
-func (r *Lexer) fetchNumber() {
-	hasE := false
-	afterE := false
-	hasDot := false
-
-	r.pos++
-	for i, c := range r.Data[r.pos:] {
-		switch {
-		case c >= '0' && c <= '9':
-			afterE = false
-		case c == '.' && !hasDot:
-			hasDot = true
-		case (c == 'e' || c == 'E') && !hasE:
-			hasE = true
-			hasDot = true
-			afterE = true
-		case (c == '+' || c == '-') && afterE:
-			afterE = false
-		default:
-			r.pos += i
-			if !isTokenEnd(c) {
-				r.errSyntax()
-			} else {
-				r.token.byteValue = r.Data[r.start:r.pos]
-			}
-			return
-		}
-	}
-
-	r.pos = len(r.Data)
-	r.token.byteValue = r.Data[r.start:]
-}
-
-// findStringLen tries to scan into the string literal for ending quote char to determine required size.
-// The size will be exact if no escapes are present and may be inexact if there are escaped chars.
-func findStringLen(data []byte) (hasEscapes bool, length int) {
-	delta := 0
-
-	for i := 0; i < len(data); i++ {
-		switch data[i] {
-		case '\\':
-			i++
-			delta++
-			if i < len(data) && data[i] == 'u' {
-				delta++
-			}
-		case '"':
-			return (delta > 0), (i - delta)
-		}
-	}
-
-	return false, len(data)
-}
-
-// getu4 decodes \uXXXX from the beginning of s, returning the hex value,
-// or it returns -1.
-func getu4(s []byte) rune {
-	if len(s) < 6 || s[0] != '\\' || s[1] != 'u' {
-		return -1
-	}
-	var val rune
-	for i := 2; i < len(s) && i < 6; i++ {
-		var v byte
-		c := s[i]
-		switch c {
-		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-			v = c - '0'
-		case 'a', 'b', 'c', 'd', 'e', 'f':
-			v = c - 'a' + 10
-		case 'A', 'B', 'C', 'D', 'E', 'F':
-			v = c - 'A' + 10
-		default:
-			return -1
-		}
-
-		val <<= 4
-		val |= rune(v)
-	}
-	return val
-}
-
-// processEscape processes a single escape sequence and returns number of bytes processed.
-func (r *Lexer) processEscape(data []byte) (int, error) {
-	if len(data) < 2 {
-		return 0, fmt.Errorf("syntax error at %v", string(data))
-	}
-
-	c := data[1]
-	switch c {
-	case '"', '/', '\\':
-		r.token.byteValue = append(r.token.byteValue, c)
-		return 2, nil
-	case 'b':
-		r.token.byteValue = append(r.token.byteValue, '\b')
-		return 2, nil
-	case 'f':
-		r.token.byteValue = append(r.token.byteValue, '\f')
-		return 2, nil
-	case 'n':
-		r.token.byteValue = append(r.token.byteValue, '\n')
-		return 2, nil
-	case 'r':
-		r.token.byteValue = append(r.token.byteValue, '\r')
-		return 2, nil
-	case 't':
-		r.token.byteValue = append(r.token.byteValue, '\t')
-		return 2, nil
-	case 'u':
-		rr := getu4(data)
-		if rr < 0 {
-			return 0, errors.New("syntax error")
-		}
-
-		read := 6
-		if utf16.IsSurrogate(rr) {
-			rr1 := getu4(data[read:])
-			if dec := utf16.DecodeRune(rr, rr1); dec != unicode.ReplacementChar {
-				read += 6
-				rr = dec
-			} else {
-				rr = unicode.ReplacementChar
-			}
-		}
-		var d [4]byte
-		s := utf8.EncodeRune(d[:], rr)
-		r.token.byteValue = append(r.token.byteValue, d[:s]...)
-		return read, nil
-	}
-
-	return 0, errors.New("syntax error")
-}
-
-// fetchString scans a string literal token.
-func (r *Lexer) fetchString() {
-	r.pos++
-	data := r.Data[r.pos:]
-
-	hasEscapes, length := findStringLen(data)
-	if !hasEscapes {
-		r.token.byteValue = data[:length]
-		r.pos += length + 1
-		return
-	}
-
-	r.token.byteValue = make([]byte, 0, length)
-	p := 0
-	for i := 0; i < len(data); {
-		switch data[i] {
-		case '"':
-			r.pos += i + 1
-			r.token.byteValue = append(r.token.byteValue, data[p:i]...)
-			i++
-			return
-
-		case '\\':
-			r.token.byteValue = append(r.token.byteValue, data[p:i]...)
-			off, err := r.processEscape(data[i:])
-			if err != nil {
-				r.errParse(err.Error())
-				return
-			}
-			i += off
-			p = i
-
-		default:
-			i++
-		}
-	}
-	r.errParse("unterminated string literal")
-}
-
-// scanToken scans the next token if no token is currently available in the lexer.
-func (r *Lexer) scanToken() {
-	if r.token.kind != tokenUndef || r.fatalError != nil {
-		return
-	}
-
-	r.FetchToken()
-}
-
-// consume resets the current token to allow scanning the next one.
-func (r *Lexer) consume() {
-	r.token.kind = tokenUndef
-	r.token.delimValue = 0
-}
-
-// Ok returns true if no error (including io.EOF) was encountered during scanning.
-func (r *Lexer) Ok() bool {
-	return r.fatalError == nil
-}
-
-const maxErrorContextLen = 13
-
-func (r *Lexer) errParse(what string) {
-	if r.fatalError == nil {
-		var str string
-		if len(r.Data)-r.pos <= maxErrorContextLen {
-			str = string(r.Data)
-		} else {
-			str = string(r.Data[r.pos:r.pos+maxErrorContextLen-3]) + "..."
-		}
-		r.fatalError = &LexerError{
-			Reason: what,
-			Offset: r.pos,
-			Data:   str,
-		}
-	}
-}
-
-func (r *Lexer) errSyntax() {
-	r.errParse("syntax error")
-}
-
-func (r *Lexer) errInvalidToken(expected string) {
-	if r.fatalError != nil {
-		return
-	}
-	if r.UseMultipleErrors {
-		r.pos = r.start
-		r.consume()
-		r.SkipRecursive()
-		switch expected {
-		case "[":
-			r.token.delimValue = ']'
-			r.token.kind = tokenDelim
-		case "{":
-			r.token.delimValue = '}'
-			r.token.kind = tokenDelim
-		}
-		r.addNonfatalError(&LexerError{
-			Reason: fmt.Sprintf("expected %s", expected),
-			Offset: r.start,
-			Data:   string(r.Data[r.start:r.pos]),
-		})
-		return
-	}
-
-	var str string
-	if len(r.token.byteValue) <= maxErrorContextLen {
-		str = string(r.token.byteValue)
-	} else {
-		str = string(r.token.byteValue[:maxErrorContextLen-3]) + "..."
-	}
-	r.fatalError = &LexerError{
-		Reason: fmt.Sprintf("expected %s", expected),
-		Offset: r.pos,
-		Data:   str,
-	}
-}
-
-func (r *Lexer) GetPos() int {
-	return r.pos
-}
-
-// Delim consumes a token and verifies that it is the given delimiter.
-func (r *Lexer) Delim(c byte) {
-	if r.token.kind == tokenUndef && r.Ok() {
-		r.FetchToken()
-	}
-
-	if !r.Ok() || r.token.delimValue != c {
-		r.consume() // errInvalidToken can change token if UseMultipleErrors is enabled.
-		r.errInvalidToken(string([]byte{c}))
-	} else {
-		r.consume()
-	}
-}
-
-// IsDelim returns true if there was no scanning error and next token is the given delimiter.
-func (r *Lexer) IsDelim(c byte) bool {
-	if r.token.kind == tokenUndef && r.Ok() {
-		r.FetchToken()
-	}
-	return !r.Ok() || r.token.delimValue == c
-}
-
-// Null verifies that the next token is null and consumes it.
-func (r *Lexer) Null() {
-	if r.token.kind == tokenUndef && r.Ok() {
-		r.FetchToken()
-	}
-	if !r.Ok() || r.token.kind != tokenNull {
-		r.errInvalidToken("null")
-	}
-	r.consume()
-}
-
-// IsNull returns true if the next token is a null keyword.
-func (r *Lexer) IsNull() bool {
-	if r.token.kind == tokenUndef && r.Ok() {
-		r.FetchToken()
-	}
-	return r.Ok() && r.token.kind == tokenNull
-}
-
-// Skip skips a single token.
-func (r *Lexer) Skip() {
-	if r.token.kind == tokenUndef && r.Ok() {
-		r.FetchToken()
-	}
-	r.consume()
-}
-
-// SkipRecursive skips next array or object completely, or just skips a single token if not
-// an array/object.
-//
-// Note: no syntax validation is performed on the skipped data.
-func (r *Lexer) SkipRecursive() {
-	r.scanToken()
-	var start, end byte
-
-	if r.token.delimValue == '{' {
-		start, end = '{', '}'
-	} else if r.token.delimValue == '[' {
-		start, end = '[', ']'
-	} else {
-		r.consume()
-		return
-	}
-
-	r.consume()
-
-	level := 1
-	inQuotes := false
-	wasEscape := false
-
-	for i, c := range r.Data[r.pos:] {
-		switch {
-		case c == start && !inQuotes:
-			level++
-		case c == end && !inQuotes:
-			level--
-			if level == 0 {
-				r.pos += i + 1
-				return
-			}
-		case c == '\\' && inQuotes:
-			wasEscape = !wasEscape
-			continue
-		case c == '"' && inQuotes:
-			inQuotes = wasEscape
-		case c == '"':
-			inQuotes = true
-		}
-		wasEscape = false
-	}
-	r.pos = len(r.Data)
-	r.fatalError = &LexerError{
-		Reason: "EOF reached while skipping array/object or token",
-		Offset: r.pos,
-		Data:   string(r.Data[r.pos:]),
-	}
-}
-
-// Raw fetches the next item recursively as a data slice
-func (r *Lexer) Raw() []byte {
-	r.SkipRecursive()
-	if !r.Ok() {
-		return nil
-	}
-	return r.Data[r.start:r.pos]
-}
-
-// IsStart returns whether the lexer is positioned at the start
-// of an input string.
-func (r *Lexer) IsStart() bool {
-	return r.pos == 0
-}
-
-// Consumed reads all remaining bytes from the input, publishing an error if
-// there is anything but whitespace remaining.
-func (r *Lexer) Consumed() {
-	if r.pos > len(r.Data) || !r.Ok() {
-		return
-	}
-
-	for _, c := range r.Data[r.pos:] {
-		if c != ' ' && c != '\t' && c != '\r' && c != '\n' {
-			r.AddError(&LexerError{
-				Reason: "invalid character '" + string(c) + "' after top-level value",
-				Offset: r.pos,
-				Data:   string(r.Data[r.pos:]),
-			})
-			return
-		}
-
-		r.pos++
-		r.start++
-	}
-}
-
-func (r *Lexer) unsafeString() (string, []byte) {
-	if r.token.kind == tokenUndef && r.Ok() {
-		r.FetchToken()
-	}
-	if !r.Ok() || r.token.kind != tokenString {
-		r.errInvalidToken("string")
-		return "", nil
-	}
-	bytes := r.token.byteValue
-	ret := bytesToStr(r.token.byteValue)
-	r.consume()
-	return ret, bytes
-}
-
-// UnsafeString returns the string value if the token is a string literal.
-//
-// Warning: returned string may point to the input buffer, so the string should not outlive
-// the input buffer. Intended pattern of usage is as an argument to a switch statement.
-func (r *Lexer) UnsafeString() string {
-	ret, _ := r.unsafeString()
-	return ret
-}
-
-// UnsafeBytes returns the byte slice if the token is a string literal.
-func (r *Lexer) UnsafeBytes() []byte {
-	_, ret := r.unsafeString()
-	return ret
-}
-
-// String reads a string literal.
-func (r *Lexer) String() string {
-	if r.token.kind == tokenUndef && r.Ok() {
-		r.FetchToken()
-	}
-	if !r.Ok() || r.token.kind != tokenString {
-		r.errInvalidToken("string")
-		return ""
-	}
-	ret := string(r.token.byteValue)
-	r.consume()
-	return ret
-}
-
-// Bytes reads a string literal and base64 decodes it into a byte slice.
-func (r *Lexer) Bytes() []byte {
-	if r.token.kind == tokenUndef && r.Ok() {
-		r.FetchToken()
-	}
-	if !r.Ok() || r.token.kind != tokenString {
-		r.errInvalidToken("string")
-		return nil
-	}
-	ret := make([]byte, base64.StdEncoding.DecodedLen(len(r.token.byteValue)))
-	len, err := base64.StdEncoding.Decode(ret, r.token.byteValue)
-	if err != nil {
-		r.fatalError = &LexerError{
-			Reason: err.Error(),
-		}
-		return nil
-	}
-
-	r.consume()
-	return ret[:len]
-}
-
-// Bool reads a true or false boolean keyword.
-func (r *Lexer) Bool() bool {
-	if r.token.kind == tokenUndef && r.Ok() {
-		r.FetchToken()
-	}
-	if !r.Ok() || r.token.kind != tokenBool {
-		r.errInvalidToken("bool")
-		return false
-	}
-	ret := r.token.boolValue
-	r.consume()
-	return ret
-}
-
-func (r *Lexer) number() string {
-	if r.token.kind == tokenUndef && r.Ok() {
-		r.FetchToken()
-	}
-	if !r.Ok() || r.token.kind != tokenNumber {
-		r.errInvalidToken("number")
-		return ""
-	}
-	ret := bytesToStr(r.token.byteValue)
-	r.consume()
-	return ret
-}
-
-func (r *Lexer) Uint8() uint8 {
-	s := r.number()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseUint(s, 10, 8)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   s,
-		})
-	}
-	return uint8(n)
-}
-
-func (r *Lexer) Uint16() uint16 {
-	s := r.number()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseUint(s, 10, 16)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   s,
-		})
-	}
-	return uint16(n)
-}
-
-func (r *Lexer) Uint32() uint32 {
-	s := r.number()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseUint(s, 10, 32)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   s,
-		})
-	}
-	return uint32(n)
-}
-
-func (r *Lexer) Uint64() uint64 {
-	s := r.number()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseUint(s, 10, 64)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   s,
-		})
-	}
-	return n
-}
-
-func (r *Lexer) Uint() uint {
-	return uint(r.Uint64())
-}
-
-func (r *Lexer) Int8() int8 {
-	s := r.number()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseInt(s, 10, 8)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   s,
-		})
-	}
-	return int8(n)
-}
-
-func (r *Lexer) Int16() int16 {
-	s := r.number()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseInt(s, 10, 16)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   s,
-		})
-	}
-	return int16(n)
-}
-
-func (r *Lexer) Int32() int32 {
-	s := r.number()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseInt(s, 10, 32)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   s,
-		})
-	}
-	return int32(n)
-}
-
-func (r *Lexer) Int64() int64 {
-	s := r.number()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseInt(s, 10, 64)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   s,
-		})
-	}
-	return n
-}
-
-func (r *Lexer) Int() int {
-	return int(r.Int64())
-}
-
-func (r *Lexer) Uint8Str() uint8 {
-	s, b := r.unsafeString()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseUint(s, 10, 8)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   string(b),
-		})
-	}
-	return uint8(n)
-}
-
-func (r *Lexer) Uint16Str() uint16 {
-	s, b := r.unsafeString()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseUint(s, 10, 16)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   string(b),
-		})
-	}
-	return uint16(n)
-}
-
-func (r *Lexer) Uint32Str() uint32 {
-	s, b := r.unsafeString()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseUint(s, 10, 32)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   string(b),
-		})
-	}
-	return uint32(n)
-}
-
-func (r *Lexer) Uint64Str() uint64 {
-	s, b := r.unsafeString()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseUint(s, 10, 64)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   string(b),
-		})
-	}
-	return n
-}
-
-func (r *Lexer) UintStr() uint {
-	return uint(r.Uint64Str())
-}
-
-func (r *Lexer) Int8Str() int8 {
-	s, b := r.unsafeString()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseInt(s, 10, 8)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   string(b),
-		})
-	}
-	return int8(n)
-}
-
-func (r *Lexer) Int16Str() int16 {
-	s, b := r.unsafeString()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseInt(s, 10, 16)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   string(b),
-		})
-	}
-	return int16(n)
-}
-
-func (r *Lexer) Int32Str() int32 {
-	s, b := r.unsafeString()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseInt(s, 10, 32)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   string(b),
-		})
-	}
-	return int32(n)
-}
-
-func (r *Lexer) Int64Str() int64 {
-	s, b := r.unsafeString()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseInt(s, 10, 64)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   string(b),
-		})
-	}
-	return n
-}
-
-func (r *Lexer) IntStr() int {
-	return int(r.Int64Str())
-}
-
-func (r *Lexer) Float32() float32 {
-	s := r.number()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseFloat(s, 32)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   s,
-		})
-	}
-	return float32(n)
-}
-
-func (r *Lexer) Float64() float64 {
-	s := r.number()
-	if !r.Ok() {
-		return 0
-	}
-
-	n, err := strconv.ParseFloat(s, 64)
-	if err != nil {
-		r.addNonfatalError(&LexerError{
-			Offset: r.start,
-			Reason: err.Error(),
-			Data:   s,
-		})
-	}
-	return n
-}
-
-func (r *Lexer) Error() error {
-	return r.fatalError
-}
-
-func (r *Lexer) AddError(e error) {
-	if r.fatalError == nil {
-		r.fatalError = e
-	}
-}
-
-func (r *Lexer) AddNonFatalError(e error) {
-	r.addNonfatalError(&LexerError{
-		Offset: r.start,
-		Data:   string(r.Data[r.start:r.pos]),
-		Reason: e.Error(),
-	})
-}
-
-func (r *Lexer) addNonfatalError(err *LexerError) {
-	if r.UseMultipleErrors {
-		// We don't want to add errors with the same offset.
-		if len(r.multipleErrors) != 0 && r.multipleErrors[len(r.multipleErrors)-1].Offset == err.Offset {
-			return
-		}
-		r.multipleErrors = append(r.multipleErrors, err)
-		return
-	}
-	r.fatalError = err
-}
-
-func (r *Lexer) GetNonFatalErrors() []*LexerError {
-	return r.multipleErrors
-}
-
-// Interface fetches an interface{} analogous to the 'encoding/json' package.
-func (r *Lexer) Interface() interface{} {
-	if r.token.kind == tokenUndef && r.Ok() {
-		r.FetchToken()
-	}
-
-	if !r.Ok() {
-		return nil
-	}
-	switch r.token.kind {
-	case tokenString:
-		return r.String()
-	case tokenNumber:
-		return r.Float64()
-	case tokenBool:
-		return r.Bool()
-	case tokenNull:
-		r.Null()
-		return nil
-	}
-
-	if r.token.delimValue == '{' {
-		r.consume()
-
-		ret := map[string]interface{}{}
-		for !r.IsDelim('}') {
-			key := r.String()
-			r.WantColon()
-			ret[key] = r.Interface()
-			r.WantComma()
-		}
-		r.Delim('}')
-
-		if r.Ok() {
-			return ret
-		} else {
-			return nil
-		}
-	} else if r.token.delimValue == '[' {
-		r.consume()
-
-		var ret []interface{}
-		for !r.IsDelim(']') {
-			ret = append(ret, r.Interface())
-			r.WantComma()
-		}
-		r.Delim(']')
-
-		if r.Ok() {
-			return ret
-		} else {
-			return nil
-		}
-	}
-	r.errSyntax()
-	return nil
-}
-
-// WantComma requires a comma to be present before fetching next token.
-func (r *Lexer) WantComma() {
-	r.wantSep = ','
-	r.firstElement = false
-}
-
-// WantColon requires a colon to be present before fetching next token.
-func (r *Lexer) WantColon() {
-	r.wantSep = ':'
-	r.firstElement = false
-}
diff --git a/vendor/github.com/mailru/easyjson/jwriter/writer.go b/vendor/github.com/mailru/easyjson/jwriter/writer.go
deleted file mode 100644
index 7b55293a0f..0000000000
--- a/vendor/github.com/mailru/easyjson/jwriter/writer.go
+++ /dev/null
@@ -1,328 +0,0 @@
-// Package jwriter contains a JSON writer.
-package jwriter
-
-import (
-	"encoding/base64"
-	"io"
-	"strconv"
-	"unicode/utf8"
-
-	"github.com/mailru/easyjson/buffer"
-)
-
-// Flags describe various encoding options. The behavior may be actually implemented in the encoder, but
-// Flags field in Writer is used to set and pass them around.
-type Flags int
-
-const (
-	NilMapAsEmpty   Flags = 1 << iota // Encode nil map as '{}' rather than 'null'.
-	NilSliceAsEmpty                   // Encode nil slice as '[]' rather than 'null'.
-)
-
-// Writer is a JSON writer.
-type Writer struct {
-	Flags Flags
-
-	Error        error
-	Buffer       buffer.Buffer
-	NoEscapeHTML bool
-}
-
-// Size returns the size of the data that was written out.
-func (w *Writer) Size() int {
-	return w.Buffer.Size()
-}
-
-// DumpTo outputs the data to given io.Writer, resetting the buffer.
-func (w *Writer) DumpTo(out io.Writer) (written int, err error) {
-	return w.Buffer.DumpTo(out)
-}
-
-// BuildBytes returns writer data as a single byte slice. You can optionally provide one byte slice
-// as argument that it will try to reuse.
-func (w *Writer) BuildBytes(reuse ...[]byte) ([]byte, error) {
-	if w.Error != nil {
-		return nil, w.Error
-	}
-
-	return w.Buffer.BuildBytes(reuse...), nil
-}
-
-// ReadCloser returns an io.ReadCloser that can be used to read the data.
-// ReadCloser also resets the buffer.
-func (w *Writer) ReadCloser() (io.ReadCloser, error) {
-	if w.Error != nil {
-		return nil, w.Error
-	}
-
-	return w.Buffer.ReadCloser(), nil
-}
-
-// RawByte appends raw binary data to the buffer.
-func (w *Writer) RawByte(c byte) {
-	w.Buffer.AppendByte(c)
-}
-
-// RawByte appends raw binary data to the buffer.
-func (w *Writer) RawString(s string) {
-	w.Buffer.AppendString(s)
-}
-
-// Raw appends raw binary data to the buffer or sets the error if it is given. Useful for
-// calling with results of MarshalJSON-like functions.
-func (w *Writer) Raw(data []byte, err error) {
-	switch {
-	case w.Error != nil:
-		return
-	case err != nil:
-		w.Error = err
-	case len(data) > 0:
-		w.Buffer.AppendBytes(data)
-	default:
-		w.RawString("null")
-	}
-}
-
-// RawText encloses raw binary data in quotes and appends in to the buffer.
-// Useful for calling with results of MarshalText-like functions.
-func (w *Writer) RawText(data []byte, err error) {
-	switch {
-	case w.Error != nil:
-		return
-	case err != nil:
-		w.Error = err
-	case len(data) > 0:
-		w.String(string(data))
-	default:
-		w.RawString("null")
-	}
-}
-
-// Base64Bytes appends data to the buffer after base64 encoding it
-func (w *Writer) Base64Bytes(data []byte) {
-	if data == nil {
-		w.Buffer.AppendString("null")
-		return
-	}
-	w.Buffer.AppendByte('"')
-	dst := make([]byte, base64.StdEncoding.EncodedLen(len(data)))
-	base64.StdEncoding.Encode(dst, data)
-	w.Buffer.AppendBytes(dst)
-	w.Buffer.AppendByte('"')
-}
-
-func (w *Writer) Uint8(n uint8) {
-	w.Buffer.EnsureSpace(3)
-	w.Buffer.Buf = strconv.AppendUint(w.Buffer.Buf, uint64(n), 10)
-}
-
-func (w *Writer) Uint16(n uint16) {
-	w.Buffer.EnsureSpace(5)
-	w.Buffer.Buf = strconv.AppendUint(w.Buffer.Buf, uint64(n), 10)
-}
-
-func (w *Writer) Uint32(n uint32) {
-	w.Buffer.EnsureSpace(10)
-	w.Buffer.Buf = strconv.AppendUint(w.Buffer.Buf, uint64(n), 10)
-}
-
-func (w *Writer) Uint(n uint) {
-	w.Buffer.EnsureSpace(20)
-	w.Buffer.Buf = strconv.AppendUint(w.Buffer.Buf, uint64(n), 10)
-}
-
-func (w *Writer) Uint64(n uint64) {
-	w.Buffer.EnsureSpace(20)
-	w.Buffer.Buf = strconv.AppendUint(w.Buffer.Buf, n, 10)
-}
-
-func (w *Writer) Int8(n int8) {
-	w.Buffer.EnsureSpace(4)
-	w.Buffer.Buf = strconv.AppendInt(w.Buffer.Buf, int64(n), 10)
-}
-
-func (w *Writer) Int16(n int16) {
-	w.Buffer.EnsureSpace(6)
-	w.Buffer.Buf = strconv.AppendInt(w.Buffer.Buf, int64(n), 10)
-}
-
-func (w *Writer) Int32(n int32) {
-	w.Buffer.EnsureSpace(11)
-	w.Buffer.Buf = strconv.AppendInt(w.Buffer.Buf, int64(n), 10)
-}
-
-func (w *Writer) Int(n int) {
-	w.Buffer.EnsureSpace(21)
-	w.Buffer.Buf = strconv.AppendInt(w.Buffer.Buf, int64(n), 10)
-}
-
-func (w *Writer) Int64(n int64) {
-	w.Buffer.EnsureSpace(21)
-	w.Buffer.Buf = strconv.AppendInt(w.Buffer.Buf, n, 10)
-}
-
-func (w *Writer) Uint8Str(n uint8) {
-	w.Buffer.EnsureSpace(3)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-	w.Buffer.Buf = strconv.AppendUint(w.Buffer.Buf, uint64(n), 10)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-}
-
-func (w *Writer) Uint16Str(n uint16) {
-	w.Buffer.EnsureSpace(5)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-	w.Buffer.Buf = strconv.AppendUint(w.Buffer.Buf, uint64(n), 10)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-}
-
-func (w *Writer) Uint32Str(n uint32) {
-	w.Buffer.EnsureSpace(10)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-	w.Buffer.Buf = strconv.AppendUint(w.Buffer.Buf, uint64(n), 10)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-}
-
-func (w *Writer) UintStr(n uint) {
-	w.Buffer.EnsureSpace(20)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-	w.Buffer.Buf = strconv.AppendUint(w.Buffer.Buf, uint64(n), 10)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-}
-
-func (w *Writer) Uint64Str(n uint64) {
-	w.Buffer.EnsureSpace(20)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-	w.Buffer.Buf = strconv.AppendUint(w.Buffer.Buf, n, 10)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-}
-
-func (w *Writer) Int8Str(n int8) {
-	w.Buffer.EnsureSpace(4)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-	w.Buffer.Buf = strconv.AppendInt(w.Buffer.Buf, int64(n), 10)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-}
-
-func (w *Writer) Int16Str(n int16) {
-	w.Buffer.EnsureSpace(6)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-	w.Buffer.Buf = strconv.AppendInt(w.Buffer.Buf, int64(n), 10)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-}
-
-func (w *Writer) Int32Str(n int32) {
-	w.Buffer.EnsureSpace(11)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-	w.Buffer.Buf = strconv.AppendInt(w.Buffer.Buf, int64(n), 10)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-}
-
-func (w *Writer) IntStr(n int) {
-	w.Buffer.EnsureSpace(21)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-	w.Buffer.Buf = strconv.AppendInt(w.Buffer.Buf, int64(n), 10)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-}
-
-func (w *Writer) Int64Str(n int64) {
-	w.Buffer.EnsureSpace(21)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-	w.Buffer.Buf = strconv.AppendInt(w.Buffer.Buf, n, 10)
-	w.Buffer.Buf = append(w.Buffer.Buf, '"')
-}
-
-func (w *Writer) Float32(n float32) {
-	w.Buffer.EnsureSpace(20)
-	w.Buffer.Buf = strconv.AppendFloat(w.Buffer.Buf, float64(n), 'g', -1, 32)
-}
-
-func (w *Writer) Float64(n float64) {
-	w.Buffer.EnsureSpace(20)
-	w.Buffer.Buf = strconv.AppendFloat(w.Buffer.Buf, n, 'g', -1, 64)
-}
-
-func (w *Writer) Bool(v bool) {
-	w.Buffer.EnsureSpace(5)
-	if v {
-		w.Buffer.Buf = append(w.Buffer.Buf, "true"...)
-	} else {
-		w.Buffer.Buf = append(w.Buffer.Buf, "false"...)
-	}
-}
-
-const chars = "0123456789abcdef"
-
-func isNotEscapedSingleChar(c byte, escapeHTML bool) bool {
-	// Note: might make sense to use a table if there are more chars to escape. With 4 chars
-	// it benchmarks the same.
-	if escapeHTML {
-		return c != '<' && c != '>' && c != '&' && c != '\\' && c != '"' && c >= 0x20 && c < utf8.RuneSelf
-	} else {
-		return c != '\\' && c != '"' && c >= 0x20 && c < utf8.RuneSelf
-	}
-}
-
-func (w *Writer) String(s string) {
-	w.Buffer.AppendByte('"')
-
-	// Portions of the string that contain no escapes are appended as
-	// byte slices.
-
-	p := 0 // last non-escape symbol
-
-	for i := 0; i < len(s); {
-		c := s[i]
-
-		if isNotEscapedSingleChar(c, !w.NoEscapeHTML) {
-			// single-width character, no escaping is required
-			i++
-			continue
-		} else if c < utf8.RuneSelf {
-			// single-with character, need to escape
-			w.Buffer.AppendString(s[p:i])
-			switch c {
-			case '\t':
-				w.Buffer.AppendString(`\t`)
-			case '\r':
-				w.Buffer.AppendString(`\r`)
-			case '\n':
-				w.Buffer.AppendString(`\n`)
-			case '\\':
-				w.Buffer.AppendString(`\\`)
-			case '"':
-				w.Buffer.AppendString(`\"`)
-			default:
-				w.Buffer.AppendString(`\u00`)
-				w.Buffer.AppendByte(chars[c>>4])
-				w.Buffer.AppendByte(chars[c&0xf])
-			}
-
-			i++
-			p = i
-			continue
-		}
-
-		// broken utf
-		runeValue, runeWidth := utf8.DecodeRuneInString(s[i:])
-		if runeValue == utf8.RuneError && runeWidth == 1 {
-			w.Buffer.AppendString(s[p:i])
-			w.Buffer.AppendString(`\ufffd`)
-			i++
-			p = i
-			continue
-		}
-
-		// jsonp stuff - tab separator and line separator
-		if runeValue == '\u2028' || runeValue == '\u2029' {
-			w.Buffer.AppendString(s[p:i])
-			w.Buffer.AppendString(`\u202`)
-			w.Buffer.AppendByte(chars[runeValue&0xf])
-			i += runeWidth
-			p = i
-			continue
-		}
-		i += runeWidth
-	}
-	w.Buffer.AppendString(s[p:])
-	w.Buffer.AppendByte('"')
-}
diff --git a/vendor/github.com/mattn/go-colorable/LICENSE b/vendor/github.com/mattn/go-colorable/LICENSE
deleted file mode 100644
index 91b5cef30e..0000000000
--- a/vendor/github.com/mattn/go-colorable/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Yasuhiro Matsumoto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/github.com/mattn/go-colorable/README.md b/vendor/github.com/mattn/go-colorable/README.md
deleted file mode 100644
index 56729a92ca..0000000000
--- a/vendor/github.com/mattn/go-colorable/README.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# go-colorable
-
-[![Godoc Reference](https://godoc.org/github.com/mattn/go-colorable?status.svg)](http://godoc.org/github.com/mattn/go-colorable)
-[![Build Status](https://travis-ci.org/mattn/go-colorable.svg?branch=master)](https://travis-ci.org/mattn/go-colorable)
-[![Coverage Status](https://coveralls.io/repos/github/mattn/go-colorable/badge.svg?branch=master)](https://coveralls.io/github/mattn/go-colorable?branch=master)
-[![Go Report Card](https://goreportcard.com/badge/mattn/go-colorable)](https://goreportcard.com/report/mattn/go-colorable)
-
-Colorable writer for windows.
-
-For example, most of logger packages doesn't show colors on windows. (I know we can do it with ansicon. But I don't want.)
-This package is possible to handle escape sequence for ansi color on windows.
-
-## Too Bad!
-
-![](https://raw.githubusercontent.com/mattn/go-colorable/gh-pages/bad.png)
-
-
-## So Good!
-
-![](https://raw.githubusercontent.com/mattn/go-colorable/gh-pages/good.png)
-
-## Usage
-
-```go
-logrus.SetFormatter(&logrus.TextFormatter{ForceColors: true})
-logrus.SetOutput(colorable.NewColorableStdout())
-
-logrus.Info("succeeded")
-logrus.Warn("not correct")
-logrus.Error("something error")
-logrus.Fatal("panic")
-```
-
-You can compile above code on non-windows OSs.
-
-## Installation
-
-```
-$ go get github.com/mattn/go-colorable
-```
-
-# License
-
-MIT
-
-# Author
-
-Yasuhiro Matsumoto (a.k.a mattn)
diff --git a/vendor/github.com/mattn/go-colorable/colorable_appengine.go b/vendor/github.com/mattn/go-colorable/colorable_appengine.go
deleted file mode 100644
index 1f28d773d7..0000000000
--- a/vendor/github.com/mattn/go-colorable/colorable_appengine.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// +build appengine
-
-package colorable
-
-import (
-	"io"
-	"os"
-
-	_ "github.com/mattn/go-isatty"
-)
-
-// NewColorable return new instance of Writer which handle escape sequence.
-func NewColorable(file *os.File) io.Writer {
-	if file == nil {
-		panic("nil passed instead of *os.File to NewColorable()")
-	}
-
-	return file
-}
-
-// NewColorableStdout return new instance of Writer which handle escape sequence for stdout.
-func NewColorableStdout() io.Writer {
-	return os.Stdout
-}
-
-// NewColorableStderr return new instance of Writer which handle escape sequence for stderr.
-func NewColorableStderr() io.Writer {
-	return os.Stderr
-}
diff --git a/vendor/github.com/mattn/go-colorable/colorable_others.go b/vendor/github.com/mattn/go-colorable/colorable_others.go
deleted file mode 100644
index 887f203dc7..0000000000
--- a/vendor/github.com/mattn/go-colorable/colorable_others.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// +build !windows
-// +build !appengine
-
-package colorable
-
-import (
-	"io"
-	"os"
-
-	_ "github.com/mattn/go-isatty"
-)
-
-// NewColorable return new instance of Writer which handle escape sequence.
-func NewColorable(file *os.File) io.Writer {
-	if file == nil {
-		panic("nil passed instead of *os.File to NewColorable()")
-	}
-
-	return file
-}
-
-// NewColorableStdout return new instance of Writer which handle escape sequence for stdout.
-func NewColorableStdout() io.Writer {
-	return os.Stdout
-}
-
-// NewColorableStderr return new instance of Writer which handle escape sequence for stderr.
-func NewColorableStderr() io.Writer {
-	return os.Stderr
-}
diff --git a/vendor/github.com/mattn/go-colorable/colorable_windows.go b/vendor/github.com/mattn/go-colorable/colorable_windows.go
deleted file mode 100644
index 575a1343cd..0000000000
--- a/vendor/github.com/mattn/go-colorable/colorable_windows.go
+++ /dev/null
@@ -1,874 +0,0 @@
-// +build windows
-// +build !appengine
-
-package colorable
-
-import (
-	"bytes"
-	"io"
-	"math"
-	"os"
-	"strconv"
-	"strings"
-	"syscall"
-	"unsafe"
-
-	"github.com/mattn/go-isatty"
-)
-
-const (
-	foregroundBlue      = 0x1
-	foregroundGreen     = 0x2
-	foregroundRed       = 0x4
-	foregroundIntensity = 0x8
-	foregroundMask      = (foregroundRed | foregroundBlue | foregroundGreen | foregroundIntensity)
-	backgroundBlue      = 0x10
-	backgroundGreen     = 0x20
-	backgroundRed       = 0x40
-	backgroundIntensity = 0x80
-	backgroundMask      = (backgroundRed | backgroundBlue | backgroundGreen | backgroundIntensity)
-)
-
-type wchar uint16
-type short int16
-type dword uint32
-type word uint16
-
-type coord struct {
-	x short
-	y short
-}
-
-type smallRect struct {
-	left   short
-	top    short
-	right  short
-	bottom short
-}
-
-type consoleScreenBufferInfo struct {
-	size              coord
-	cursorPosition    coord
-	attributes        word
-	window            smallRect
-	maximumWindowSize coord
-}
-
-type consoleCursorInfo struct {
-	size    dword
-	visible int32
-}
-
-var (
-	kernel32                       = syscall.NewLazyDLL("kernel32.dll")
-	procGetConsoleScreenBufferInfo = kernel32.NewProc("GetConsoleScreenBufferInfo")
-	procSetConsoleTextAttribute    = kernel32.NewProc("SetConsoleTextAttribute")
-	procSetConsoleCursorPosition   = kernel32.NewProc("SetConsoleCursorPosition")
-	procFillConsoleOutputCharacter = kernel32.NewProc("FillConsoleOutputCharacterW")
-	procFillConsoleOutputAttribute = kernel32.NewProc("FillConsoleOutputAttribute")
-	procGetConsoleCursorInfo       = kernel32.NewProc("GetConsoleCursorInfo")
-	procSetConsoleCursorInfo       = kernel32.NewProc("SetConsoleCursorInfo")
-	procSetConsoleTitle            = kernel32.NewProc("SetConsoleTitleW")
-)
-
-// Writer provide colorable Writer to the console
-type Writer struct {
-	out     io.Writer
-	handle  syscall.Handle
-	oldattr word
-	oldpos  coord
-}
-
-// NewColorable return new instance of Writer which handle escape sequence from File.
-func NewColorable(file *os.File) io.Writer {
-	if file == nil {
-		panic("nil passed instead of *os.File to NewColorable()")
-	}
-
-	if isatty.IsTerminal(file.Fd()) {
-		var csbi consoleScreenBufferInfo
-		handle := syscall.Handle(file.Fd())
-		procGetConsoleScreenBufferInfo.Call(uintptr(handle), uintptr(unsafe.Pointer(&csbi)))
-		return &Writer{out: file, handle: handle, oldattr: csbi.attributes, oldpos: coord{0, 0}}
-	}
-	return file
-}
-
-// NewColorableStdout return new instance of Writer which handle escape sequence for stdout.
-func NewColorableStdout() io.Writer {
-	return NewColorable(os.Stdout)
-}
-
-// NewColorableStderr return new instance of Writer which handle escape sequence for stderr.
-func NewColorableStderr() io.Writer {
-	return NewColorable(os.Stderr)
-}
-
-var color256 = map[int]int{
-	0:   0x000000,
-	1:   0x800000,
-	2:   0x008000,
-	3:   0x808000,
-	4:   0x000080,
-	5:   0x800080,
-	6:   0x008080,
-	7:   0xc0c0c0,
-	8:   0x808080,
-	9:   0xff0000,
-	10:  0x00ff00,
-	11:  0xffff00,
-	12:  0x0000ff,
-	13:  0xff00ff,
-	14:  0x00ffff,
-	15:  0xffffff,
-	16:  0x000000,
-	17:  0x00005f,
-	18:  0x000087,
-	19:  0x0000af,
-	20:  0x0000d7,
-	21:  0x0000ff,
-	22:  0x005f00,
-	23:  0x005f5f,
-	24:  0x005f87,
-	25:  0x005faf,
-	26:  0x005fd7,
-	27:  0x005fff,
-	28:  0x008700,
-	29:  0x00875f,
-	30:  0x008787,
-	31:  0x0087af,
-	32:  0x0087d7,
-	33:  0x0087ff,
-	34:  0x00af00,
-	35:  0x00af5f,
-	36:  0x00af87,
-	37:  0x00afaf,
-	38:  0x00afd7,
-	39:  0x00afff,
-	40:  0x00d700,
-	41:  0x00d75f,
-	42:  0x00d787,
-	43:  0x00d7af,
-	44:  0x00d7d7,
-	45:  0x00d7ff,
-	46:  0x00ff00,
-	47:  0x00ff5f,
-	48:  0x00ff87,
-	49:  0x00ffaf,
-	50:  0x00ffd7,
-	51:  0x00ffff,
-	52:  0x5f0000,
-	53:  0x5f005f,
-	54:  0x5f0087,
-	55:  0x5f00af,
-	56:  0x5f00d7,
-	57:  0x5f00ff,
-	58:  0x5f5f00,
-	59:  0x5f5f5f,
-	60:  0x5f5f87,
-	61:  0x5f5faf,
-	62:  0x5f5fd7,
-	63:  0x5f5fff,
-	64:  0x5f8700,
-	65:  0x5f875f,
-	66:  0x5f8787,
-	67:  0x5f87af,
-	68:  0x5f87d7,
-	69:  0x5f87ff,
-	70:  0x5faf00,
-	71:  0x5faf5f,
-	72:  0x5faf87,
-	73:  0x5fafaf,
-	74:  0x5fafd7,
-	75:  0x5fafff,
-	76:  0x5fd700,
-	77:  0x5fd75f,
-	78:  0x5fd787,
-	79:  0x5fd7af,
-	80:  0x5fd7d7,
-	81:  0x5fd7ff,
-	82:  0x5fff00,
-	83:  0x5fff5f,
-	84:  0x5fff87,
-	85:  0x5fffaf,
-	86:  0x5fffd7,
-	87:  0x5fffff,
-	88:  0x870000,
-	89:  0x87005f,
-	90:  0x870087,
-	91:  0x8700af,
-	92:  0x8700d7,
-	93:  0x8700ff,
-	94:  0x875f00,
-	95:  0x875f5f,
-	96:  0x875f87,
-	97:  0x875faf,
-	98:  0x875fd7,
-	99:  0x875fff,
-	100: 0x878700,
-	101: 0x87875f,
-	102: 0x878787,
-	103: 0x8787af,
-	104: 0x8787d7,
-	105: 0x8787ff,
-	106: 0x87af00,
-	107: 0x87af5f,
-	108: 0x87af87,
-	109: 0x87afaf,
-	110: 0x87afd7,
-	111: 0x87afff,
-	112: 0x87d700,
-	113: 0x87d75f,
-	114: 0x87d787,
-	115: 0x87d7af,
-	116: 0x87d7d7,
-	117: 0x87d7ff,
-	118: 0x87ff00,
-	119: 0x87ff5f,
-	120: 0x87ff87,
-	121: 0x87ffaf,
-	122: 0x87ffd7,
-	123: 0x87ffff,
-	124: 0xaf0000,
-	125: 0xaf005f,
-	126: 0xaf0087,
-	127: 0xaf00af,
-	128: 0xaf00d7,
-	129: 0xaf00ff,
-	130: 0xaf5f00,
-	131: 0xaf5f5f,
-	132: 0xaf5f87,
-	133: 0xaf5faf,
-	134: 0xaf5fd7,
-	135: 0xaf5fff,
-	136: 0xaf8700,
-	137: 0xaf875f,
-	138: 0xaf8787,
-	139: 0xaf87af,
-	140: 0xaf87d7,
-	141: 0xaf87ff,
-	142: 0xafaf00,
-	143: 0xafaf5f,
-	144: 0xafaf87,
-	145: 0xafafaf,
-	146: 0xafafd7,
-	147: 0xafafff,
-	148: 0xafd700,
-	149: 0xafd75f,
-	150: 0xafd787,
-	151: 0xafd7af,
-	152: 0xafd7d7,
-	153: 0xafd7ff,
-	154: 0xafff00,
-	155: 0xafff5f,
-	156: 0xafff87,
-	157: 0xafffaf,
-	158: 0xafffd7,
-	159: 0xafffff,
-	160: 0xd70000,
-	161: 0xd7005f,
-	162: 0xd70087,
-	163: 0xd700af,
-	164: 0xd700d7,
-	165: 0xd700ff,
-	166: 0xd75f00,
-	167: 0xd75f5f,
-	168: 0xd75f87,
-	169: 0xd75faf,
-	170: 0xd75fd7,
-	171: 0xd75fff,
-	172: 0xd78700,
-	173: 0xd7875f,
-	174: 0xd78787,
-	175: 0xd787af,
-	176: 0xd787d7,
-	177: 0xd787ff,
-	178: 0xd7af00,
-	179: 0xd7af5f,
-	180: 0xd7af87,
-	181: 0xd7afaf,
-	182: 0xd7afd7,
-	183: 0xd7afff,
-	184: 0xd7d700,
-	185: 0xd7d75f,
-	186: 0xd7d787,
-	187: 0xd7d7af,
-	188: 0xd7d7d7,
-	189: 0xd7d7ff,
-	190: 0xd7ff00,
-	191: 0xd7ff5f,
-	192: 0xd7ff87,
-	193: 0xd7ffaf,
-	194: 0xd7ffd7,
-	195: 0xd7ffff,
-	196: 0xff0000,
-	197: 0xff005f,
-	198: 0xff0087,
-	199: 0xff00af,
-	200: 0xff00d7,
-	201: 0xff00ff,
-	202: 0xff5f00,
-	203: 0xff5f5f,
-	204: 0xff5f87,
-	205: 0xff5faf,
-	206: 0xff5fd7,
-	207: 0xff5fff,
-	208: 0xff8700,
-	209: 0xff875f,
-	210: 0xff8787,
-	211: 0xff87af,
-	212: 0xff87d7,
-	213: 0xff87ff,
-	214: 0xffaf00,
-	215: 0xffaf5f,
-	216: 0xffaf87,
-	217: 0xffafaf,
-	218: 0xffafd7,
-	219: 0xffafff,
-	220: 0xffd700,
-	221: 0xffd75f,
-	222: 0xffd787,
-	223: 0xffd7af,
-	224: 0xffd7d7,
-	225: 0xffd7ff,
-	226: 0xffff00,
-	227: 0xffff5f,
-	228: 0xffff87,
-	229: 0xffffaf,
-	230: 0xffffd7,
-	231: 0xffffff,
-	232: 0x080808,
-	233: 0x121212,
-	234: 0x1c1c1c,
-	235: 0x262626,
-	236: 0x303030,
-	237: 0x3a3a3a,
-	238: 0x444444,
-	239: 0x4e4e4e,
-	240: 0x585858,
-	241: 0x626262,
-	242: 0x6c6c6c,
-	243: 0x767676,
-	244: 0x808080,
-	245: 0x8a8a8a,
-	246: 0x949494,
-	247: 0x9e9e9e,
-	248: 0xa8a8a8,
-	249: 0xb2b2b2,
-	250: 0xbcbcbc,
-	251: 0xc6c6c6,
-	252: 0xd0d0d0,
-	253: 0xdadada,
-	254: 0xe4e4e4,
-	255: 0xeeeeee,
-}
-
-// `\033]0;TITLESTR\007`
-func doTitleSequence(er *bytes.Reader) error {
-	var c byte
-	var err error
-
-	c, err = er.ReadByte()
-	if err != nil {
-		return err
-	}
-	if c != '0' && c != '2' {
-		return nil
-	}
-	c, err = er.ReadByte()
-	if err != nil {
-		return err
-	}
-	if c != ';' {
-		return nil
-	}
-	title := make([]byte, 0, 80)
-	for {
-		c, err = er.ReadByte()
-		if err != nil {
-			return err
-		}
-		if c == 0x07 || c == '\n' {
-			break
-		}
-		title = append(title, c)
-	}
-	if len(title) > 0 {
-		title8, err := syscall.UTF16PtrFromString(string(title))
-		if err == nil {
-			procSetConsoleTitle.Call(uintptr(unsafe.Pointer(title8)))
-		}
-	}
-	return nil
-}
-
-// Write write data on console
-func (w *Writer) Write(data []byte) (n int, err error) {
-	var csbi consoleScreenBufferInfo
-	procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-
-	er := bytes.NewReader(data)
-	var bw [1]byte
-loop:
-	for {
-		c1, err := er.ReadByte()
-		if err != nil {
-			break loop
-		}
-		if c1 != 0x1b {
-			bw[0] = c1
-			w.out.Write(bw[:])
-			continue
-		}
-		c2, err := er.ReadByte()
-		if err != nil {
-			break loop
-		}
-
-		if c2 == ']' {
-			if err := doTitleSequence(er); err != nil {
-				break loop
-			}
-			continue
-		}
-		if c2 != 0x5b {
-			continue
-		}
-
-		var buf bytes.Buffer
-		var m byte
-		for {
-			c, err := er.ReadByte()
-			if err != nil {
-				break loop
-			}
-			if ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '@' {
-				m = c
-				break
-			}
-			buf.Write([]byte(string(c)))
-		}
-
-		switch m {
-		case 'A':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.y -= short(n)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'B':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.y += short(n)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'C':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.x += short(n)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'D':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.x -= short(n)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'E':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.x = 0
-			csbi.cursorPosition.y += short(n)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'F':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.x = 0
-			csbi.cursorPosition.y -= short(n)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'G':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.x = short(n - 1)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'H':
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			if buf.Len() > 0 {
-				token := strings.Split(buf.String(), ";")
-				switch len(token) {
-				case 1:
-					n1, err := strconv.Atoi(token[0])
-					if err != nil {
-						continue
-					}
-					csbi.cursorPosition.y = short(n1 - 1)
-				case 2:
-					n1, err := strconv.Atoi(token[0])
-					if err != nil {
-						continue
-					}
-					n2, err := strconv.Atoi(token[1])
-					if err != nil {
-						continue
-					}
-					csbi.cursorPosition.x = short(n2 - 1)
-					csbi.cursorPosition.y = short(n1 - 1)
-				}
-			} else {
-				csbi.cursorPosition.y = 0
-			}
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'J':
-			n := 0
-			if buf.Len() > 0 {
-				n, err = strconv.Atoi(buf.String())
-				if err != nil {
-					continue
-				}
-			}
-			var count, written dword
-			var cursor coord
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			switch n {
-			case 0:
-				cursor = coord{x: csbi.cursorPosition.x, y: csbi.cursorPosition.y}
-				count = dword(csbi.size.x - csbi.cursorPosition.x + (csbi.size.y-csbi.cursorPosition.y)*csbi.size.x)
-			case 1:
-				cursor = coord{x: csbi.window.left, y: csbi.window.top}
-				count = dword(csbi.size.x - csbi.cursorPosition.x + (csbi.window.top-csbi.cursorPosition.y)*csbi.size.x)
-			case 2:
-				cursor = coord{x: csbi.window.left, y: csbi.window.top}
-				count = dword(csbi.size.x - csbi.cursorPosition.x + (csbi.size.y-csbi.cursorPosition.y)*csbi.size.x)
-			}
-			procFillConsoleOutputCharacter.Call(uintptr(w.handle), uintptr(' '), uintptr(count), *(*uintptr)(unsafe.Pointer(&cursor)), uintptr(unsafe.Pointer(&written)))
-			procFillConsoleOutputAttribute.Call(uintptr(w.handle), uintptr(csbi.attributes), uintptr(count), *(*uintptr)(unsafe.Pointer(&cursor)), uintptr(unsafe.Pointer(&written)))
-		case 'K':
-			n := 0
-			if buf.Len() > 0 {
-				n, err = strconv.Atoi(buf.String())
-				if err != nil {
-					continue
-				}
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			var cursor coord
-			switch n {
-			case 0:
-				cursor = coord{x: csbi.cursorPosition.x, y: csbi.cursorPosition.y}
-			case 1:
-				cursor = coord{x: csbi.window.left, y: csbi.window.top + csbi.cursorPosition.y}
-			case 2:
-				cursor = coord{x: csbi.window.left, y: csbi.window.top + csbi.cursorPosition.y}
-			}
-			var count, written dword
-			count = dword(csbi.size.x - csbi.cursorPosition.x)
-			procFillConsoleOutputCharacter.Call(uintptr(w.handle), uintptr(' '), uintptr(count), *(*uintptr)(unsafe.Pointer(&cursor)), uintptr(unsafe.Pointer(&written)))
-			procFillConsoleOutputAttribute.Call(uintptr(w.handle), uintptr(csbi.attributes), uintptr(count), *(*uintptr)(unsafe.Pointer(&cursor)), uintptr(unsafe.Pointer(&written)))
-		case 'm':
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			attr := csbi.attributes
-			cs := buf.String()
-			if cs == "" {
-				procSetConsoleTextAttribute.Call(uintptr(w.handle), uintptr(w.oldattr))
-				continue
-			}
-			token := strings.Split(cs, ";")
-			for i := 0; i < len(token); i++ {
-				ns := token[i]
-				if n, err = strconv.Atoi(ns); err == nil {
-					switch {
-					case n == 0 || n == 100:
-						attr = w.oldattr
-					case 1 <= n && n <= 5:
-						attr |= foregroundIntensity
-					case n == 7:
-						attr = ((attr & foregroundMask) << 4) | ((attr & backgroundMask) >> 4)
-					case n == 22 || n == 25:
-						attr |= foregroundIntensity
-					case n == 27:
-						attr = ((attr & foregroundMask) << 4) | ((attr & backgroundMask) >> 4)
-					case 30 <= n && n <= 37:
-						attr &= backgroundMask
-						if (n-30)&1 != 0 {
-							attr |= foregroundRed
-						}
-						if (n-30)&2 != 0 {
-							attr |= foregroundGreen
-						}
-						if (n-30)&4 != 0 {
-							attr |= foregroundBlue
-						}
-					case n == 38: // set foreground color.
-						if i < len(token)-2 && (token[i+1] == "5" || token[i+1] == "05") {
-							if n256, err := strconv.Atoi(token[i+2]); err == nil {
-								if n256foreAttr == nil {
-									n256setup()
-								}
-								attr &= backgroundMask
-								attr |= n256foreAttr[n256]
-								i += 2
-							}
-						} else {
-							attr = attr & (w.oldattr & backgroundMask)
-						}
-					case n == 39: // reset foreground color.
-						attr &= backgroundMask
-						attr |= w.oldattr & foregroundMask
-					case 40 <= n && n <= 47:
-						attr &= foregroundMask
-						if (n-40)&1 != 0 {
-							attr |= backgroundRed
-						}
-						if (n-40)&2 != 0 {
-							attr |= backgroundGreen
-						}
-						if (n-40)&4 != 0 {
-							attr |= backgroundBlue
-						}
-					case n == 48: // set background color.
-						if i < len(token)-2 && token[i+1] == "5" {
-							if n256, err := strconv.Atoi(token[i+2]); err == nil {
-								if n256backAttr == nil {
-									n256setup()
-								}
-								attr &= foregroundMask
-								attr |= n256backAttr[n256]
-								i += 2
-							}
-						} else {
-							attr = attr & (w.oldattr & foregroundMask)
-						}
-					case n == 49: // reset foreground color.
-						attr &= foregroundMask
-						attr |= w.oldattr & backgroundMask
-					case 90 <= n && n <= 97:
-						attr = (attr & backgroundMask)
-						attr |= foregroundIntensity
-						if (n-90)&1 != 0 {
-							attr |= foregroundRed
-						}
-						if (n-90)&2 != 0 {
-							attr |= foregroundGreen
-						}
-						if (n-90)&4 != 0 {
-							attr |= foregroundBlue
-						}
-					case 100 <= n && n <= 107:
-						attr = (attr & foregroundMask)
-						attr |= backgroundIntensity
-						if (n-100)&1 != 0 {
-							attr |= backgroundRed
-						}
-						if (n-100)&2 != 0 {
-							attr |= backgroundGreen
-						}
-						if (n-100)&4 != 0 {
-							attr |= backgroundBlue
-						}
-					}
-					procSetConsoleTextAttribute.Call(uintptr(w.handle), uintptr(attr))
-				}
-			}
-		case 'h':
-			cs := buf.String()
-			if cs == "?25" {
-				var ci consoleCursorInfo
-				procGetConsoleCursorInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&ci)))
-				ci.visible = 1
-				procSetConsoleCursorInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&ci)))
-			}
-		case 'l':
-			cs := buf.String()
-			if cs == "?25" {
-				var ci consoleCursorInfo
-				procGetConsoleCursorInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&ci)))
-				ci.visible = 0
-				procSetConsoleCursorInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&ci)))
-			}
-		case 's':
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			w.oldpos = csbi.cursorPosition
-		case 'u':
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&w.oldpos)))
-		}
-	}
-
-	return len(data), nil
-}
-
-type consoleColor struct {
-	rgb       int
-	red       bool
-	green     bool
-	blue      bool
-	intensity bool
-}
-
-func (c consoleColor) foregroundAttr() (attr word) {
-	if c.red {
-		attr |= foregroundRed
-	}
-	if c.green {
-		attr |= foregroundGreen
-	}
-	if c.blue {
-		attr |= foregroundBlue
-	}
-	if c.intensity {
-		attr |= foregroundIntensity
-	}
-	return
-}
-
-func (c consoleColor) backgroundAttr() (attr word) {
-	if c.red {
-		attr |= backgroundRed
-	}
-	if c.green {
-		attr |= backgroundGreen
-	}
-	if c.blue {
-		attr |= backgroundBlue
-	}
-	if c.intensity {
-		attr |= backgroundIntensity
-	}
-	return
-}
-
-var color16 = []consoleColor{
-	{0x000000, false, false, false, false},
-	{0x000080, false, false, true, false},
-	{0x008000, false, true, false, false},
-	{0x008080, false, true, true, false},
-	{0x800000, true, false, false, false},
-	{0x800080, true, false, true, false},
-	{0x808000, true, true, false, false},
-	{0xc0c0c0, true, true, true, false},
-	{0x808080, false, false, false, true},
-	{0x0000ff, false, false, true, true},
-	{0x00ff00, false, true, false, true},
-	{0x00ffff, false, true, true, true},
-	{0xff0000, true, false, false, true},
-	{0xff00ff, true, false, true, true},
-	{0xffff00, true, true, false, true},
-	{0xffffff, true, true, true, true},
-}
-
-type hsv struct {
-	h, s, v float32
-}
-
-func (a hsv) dist(b hsv) float32 {
-	dh := a.h - b.h
-	switch {
-	case dh > 0.5:
-		dh = 1 - dh
-	case dh < -0.5:
-		dh = -1 - dh
-	}
-	ds := a.s - b.s
-	dv := a.v - b.v
-	return float32(math.Sqrt(float64(dh*dh + ds*ds + dv*dv)))
-}
-
-func toHSV(rgb int) hsv {
-	r, g, b := float32((rgb&0xFF0000)>>16)/256.0,
-		float32((rgb&0x00FF00)>>8)/256.0,
-		float32(rgb&0x0000FF)/256.0
-	min, max := minmax3f(r, g, b)
-	h := max - min
-	if h > 0 {
-		if max == r {
-			h = (g - b) / h
-			if h < 0 {
-				h += 6
-			}
-		} else if max == g {
-			h = 2 + (b-r)/h
-		} else {
-			h = 4 + (r-g)/h
-		}
-	}
-	h /= 6.0
-	s := max - min
-	if max != 0 {
-		s /= max
-	}
-	v := max
-	return hsv{h: h, s: s, v: v}
-}
-
-type hsvTable []hsv
-
-func toHSVTable(rgbTable []consoleColor) hsvTable {
-	t := make(hsvTable, len(rgbTable))
-	for i, c := range rgbTable {
-		t[i] = toHSV(c.rgb)
-	}
-	return t
-}
-
-func (t hsvTable) find(rgb int) consoleColor {
-	hsv := toHSV(rgb)
-	n := 7
-	l := float32(5.0)
-	for i, p := range t {
-		d := hsv.dist(p)
-		if d < l {
-			l, n = d, i
-		}
-	}
-	return color16[n]
-}
-
-func minmax3f(a, b, c float32) (min, max float32) {
-	if a < b {
-		if b < c {
-			return a, c
-		} else if a < c {
-			return a, b
-		} else {
-			return c, b
-		}
-	} else {
-		if a < c {
-			return b, c
-		} else if b < c {
-			return b, a
-		} else {
-			return c, a
-		}
-	}
-}
-
-var n256foreAttr []word
-var n256backAttr []word
-
-func n256setup() {
-	n256foreAttr = make([]word, 256)
-	n256backAttr = make([]word, 256)
-	t := toHSVTable(color16)
-	for i, rgb := range color256 {
-		c := t.find(rgb)
-		n256foreAttr[i] = c.foregroundAttr()
-		n256backAttr[i] = c.backgroundAttr()
-	}
-}
diff --git a/vendor/github.com/mattn/go-colorable/noncolorable.go b/vendor/github.com/mattn/go-colorable/noncolorable.go
deleted file mode 100644
index 9721e16f4b..0000000000
--- a/vendor/github.com/mattn/go-colorable/noncolorable.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package colorable
-
-import (
-	"bytes"
-	"io"
-)
-
-// NonColorable hold writer but remove escape sequence.
-type NonColorable struct {
-	out io.Writer
-}
-
-// NewNonColorable return new instance of Writer which remove escape sequence from Writer.
-func NewNonColorable(w io.Writer) io.Writer {
-	return &NonColorable{out: w}
-}
-
-// Write write data on console
-func (w *NonColorable) Write(data []byte) (n int, err error) {
-	er := bytes.NewReader(data)
-	var bw [1]byte
-loop:
-	for {
-		c1, err := er.ReadByte()
-		if err != nil {
-			break loop
-		}
-		if c1 != 0x1b {
-			bw[0] = c1
-			w.out.Write(bw[:])
-			continue
-		}
-		c2, err := er.ReadByte()
-		if err != nil {
-			break loop
-		}
-		if c2 != 0x5b {
-			continue
-		}
-
-		var buf bytes.Buffer
-		for {
-			c, err := er.ReadByte()
-			if err != nil {
-				break loop
-			}
-			if ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '@' {
-				break
-			}
-			buf.Write([]byte(string(c)))
-		}
-	}
-
-	return len(data), nil
-}
diff --git a/vendor/github.com/mattn/go-isatty/LICENSE b/vendor/github.com/mattn/go-isatty/LICENSE
deleted file mode 100644
index 65dc692b6b..0000000000
--- a/vendor/github.com/mattn/go-isatty/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (c) Yasuhiro MATSUMOTO <mattn.jp@gmail.com>
-
-MIT License (Expat)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/mattn/go-isatty/README.md b/vendor/github.com/mattn/go-isatty/README.md
deleted file mode 100644
index 1e69004bb0..0000000000
--- a/vendor/github.com/mattn/go-isatty/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# go-isatty
-
-[![Godoc Reference](https://godoc.org/github.com/mattn/go-isatty?status.svg)](http://godoc.org/github.com/mattn/go-isatty)
-[![Build Status](https://travis-ci.org/mattn/go-isatty.svg?branch=master)](https://travis-ci.org/mattn/go-isatty)
-[![Coverage Status](https://coveralls.io/repos/github/mattn/go-isatty/badge.svg?branch=master)](https://coveralls.io/github/mattn/go-isatty?branch=master)
-[![Go Report Card](https://goreportcard.com/badge/mattn/go-isatty)](https://goreportcard.com/report/mattn/go-isatty)
-
-isatty for golang
-
-## Usage
-
-```go
-package main
-
-import (
-	"fmt"
-	"github.com/mattn/go-isatty"
-	"os"
-)
-
-func main() {
-	if isatty.IsTerminal(os.Stdout.Fd()) {
-		fmt.Println("Is Terminal")
-	} else if isatty.IsCygwinTerminal(os.Stdout.Fd()) {
-		fmt.Println("Is Cygwin/MSYS2 Terminal")
-	} else {
-		fmt.Println("Is Not Terminal")
-	}
-}
-```
-
-## Installation
-
-```
-$ go get github.com/mattn/go-isatty
-```
-
-## License
-
-MIT
-
-## Author
-
-Yasuhiro Matsumoto (a.k.a mattn)
-
-## Thanks
-
-* k-takata: base idea for IsCygwinTerminal
-
-    https://github.com/k-takata/go-iscygpty
diff --git a/vendor/github.com/mattn/go-isatty/doc.go b/vendor/github.com/mattn/go-isatty/doc.go
deleted file mode 100644
index 17d4f90ebc..0000000000
--- a/vendor/github.com/mattn/go-isatty/doc.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// Package isatty implements interface to isatty
-package isatty
diff --git a/vendor/github.com/mattn/go-isatty/isatty_appengine.go b/vendor/github.com/mattn/go-isatty/isatty_appengine.go
deleted file mode 100644
index 9584a98842..0000000000
--- a/vendor/github.com/mattn/go-isatty/isatty_appengine.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build appengine
-
-package isatty
-
-// IsTerminal returns true if the file descriptor is terminal which
-// is always false on on appengine classic which is a sandboxed PaaS.
-func IsTerminal(fd uintptr) bool {
-	return false
-}
-
-// IsCygwinTerminal() return true if the file descriptor is a cygwin or msys2
-// terminal. This is also always false on this environment.
-func IsCygwinTerminal(fd uintptr) bool {
-	return false
-}
diff --git a/vendor/github.com/mattn/go-isatty/isatty_bsd.go b/vendor/github.com/mattn/go-isatty/isatty_bsd.go
deleted file mode 100644
index 42f2514d13..0000000000
--- a/vendor/github.com/mattn/go-isatty/isatty_bsd.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build darwin freebsd openbsd netbsd dragonfly
-// +build !appengine
-
-package isatty
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const ioctlReadTermios = syscall.TIOCGETA
-
-// IsTerminal return true if the file descriptor is terminal.
-func IsTerminal(fd uintptr) bool {
-	var termios syscall.Termios
-	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-	return err == 0
-}
diff --git a/vendor/github.com/mattn/go-isatty/isatty_linux.go b/vendor/github.com/mattn/go-isatty/isatty_linux.go
deleted file mode 100644
index 9d24bac1db..0000000000
--- a/vendor/github.com/mattn/go-isatty/isatty_linux.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build linux
-// +build !appengine
-
-package isatty
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const ioctlReadTermios = syscall.TCGETS
-
-// IsTerminal return true if the file descriptor is terminal.
-func IsTerminal(fd uintptr) bool {
-	var termios syscall.Termios
-	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-	return err == 0
-}
diff --git a/vendor/github.com/mattn/go-isatty/isatty_others.go b/vendor/github.com/mattn/go-isatty/isatty_others.go
deleted file mode 100644
index ff4de3d9a5..0000000000
--- a/vendor/github.com/mattn/go-isatty/isatty_others.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build !windows
-// +build !appengine
-
-package isatty
-
-// IsCygwinTerminal() return true if the file descriptor is a cygwin or msys2
-// terminal. This is also always false on this environment.
-func IsCygwinTerminal(fd uintptr) bool {
-	return false
-}
diff --git a/vendor/github.com/mattn/go-isatty/isatty_solaris.go b/vendor/github.com/mattn/go-isatty/isatty_solaris.go
deleted file mode 100644
index 1f0c6bf53d..0000000000
--- a/vendor/github.com/mattn/go-isatty/isatty_solaris.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build solaris
-// +build !appengine
-
-package isatty
-
-import (
-	"golang.org/x/sys/unix"
-)
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-// see: http://src.illumos.org/source/xref/illumos-gate/usr/src/lib/libbc/libc/gen/common/isatty.c
-func IsTerminal(fd uintptr) bool {
-	var termio unix.Termio
-	err := unix.IoctlSetTermio(int(fd), unix.TCGETA, &termio)
-	return err == nil
-}
diff --git a/vendor/github.com/mattn/go-isatty/isatty_windows.go b/vendor/github.com/mattn/go-isatty/isatty_windows.go
deleted file mode 100644
index af51cbcaa4..0000000000
--- a/vendor/github.com/mattn/go-isatty/isatty_windows.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// +build windows
-// +build !appengine
-
-package isatty
-
-import (
-	"strings"
-	"syscall"
-	"unicode/utf16"
-	"unsafe"
-)
-
-const (
-	fileNameInfo uintptr = 2
-	fileTypePipe         = 3
-)
-
-var (
-	kernel32                         = syscall.NewLazyDLL("kernel32.dll")
-	procGetConsoleMode               = kernel32.NewProc("GetConsoleMode")
-	procGetFileInformationByHandleEx = kernel32.NewProc("GetFileInformationByHandleEx")
-	procGetFileType                  = kernel32.NewProc("GetFileType")
-)
-
-func init() {
-	// Check if GetFileInformationByHandleEx is available.
-	if procGetFileInformationByHandleEx.Find() != nil {
-		procGetFileInformationByHandleEx = nil
-	}
-}
-
-// IsTerminal return true if the file descriptor is terminal.
-func IsTerminal(fd uintptr) bool {
-	var st uint32
-	r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, fd, uintptr(unsafe.Pointer(&st)), 0)
-	return r != 0 && e == 0
-}
-
-// Check pipe name is used for cygwin/msys2 pty.
-// Cygwin/MSYS2 PTY has a name like:
-//   \{cygwin,msys}-XXXXXXXXXXXXXXXX-ptyN-{from,to}-master
-func isCygwinPipeName(name string) bool {
-	token := strings.Split(name, "-")
-	if len(token) < 5 {
-		return false
-	}
-
-	if token[0] != `\msys` && token[0] != `\cygwin` {
-		return false
-	}
-
-	if token[1] == "" {
-		return false
-	}
-
-	if !strings.HasPrefix(token[2], "pty") {
-		return false
-	}
-
-	if token[3] != `from` && token[3] != `to` {
-		return false
-	}
-
-	if token[4] != "master" {
-		return false
-	}
-
-	return true
-}
-
-// IsCygwinTerminal() return true if the file descriptor is a cygwin or msys2
-// terminal.
-func IsCygwinTerminal(fd uintptr) bool {
-	if procGetFileInformationByHandleEx == nil {
-		return false
-	}
-
-	// Cygwin/msys's pty is a pipe.
-	ft, _, e := syscall.Syscall(procGetFileType.Addr(), 1, fd, 0, 0)
-	if ft != fileTypePipe || e != 0 {
-		return false
-	}
-
-	var buf [2 + syscall.MAX_PATH]uint16
-	r, _, e := syscall.Syscall6(procGetFileInformationByHandleEx.Addr(),
-		4, fd, fileNameInfo, uintptr(unsafe.Pointer(&buf)),
-		uintptr(len(buf)*2), 0, 0)
-	if r == 0 || e != 0 {
-		return false
-	}
-
-	l := *(*uint32)(unsafe.Pointer(&buf))
-	return isCygwinPipeName(string(utf16.Decode(buf[2 : 2+l/2])))
-}
diff --git a/vendor/github.com/mitchellh/mapstructure/LICENSE b/vendor/github.com/mitchellh/mapstructure/LICENSE
deleted file mode 100644
index f9c841a51e..0000000000
--- a/vendor/github.com/mitchellh/mapstructure/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Mitchell Hashimoto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/github.com/mitchellh/mapstructure/README.md b/vendor/github.com/mitchellh/mapstructure/README.md
deleted file mode 100644
index 659d6885fc..0000000000
--- a/vendor/github.com/mitchellh/mapstructure/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# mapstructure
-
-mapstructure is a Go library for decoding generic map values to structures
-and vice versa, while providing helpful error handling.
-
-This library is most useful when decoding values from some data stream (JSON,
-Gob, etc.) where you don't _quite_ know the structure of the underlying data
-until you read a part of it. You can therefore read a `map[string]interface{}`
-and use this library to decode it into the proper underlying native Go
-structure.
-
-## Installation
-
-Standard `go get`:
-
-```
-$ go get github.com/mitchellh/mapstructure
-```
-
-## Usage & Example
-
-For usage and examples see the [Godoc](http://godoc.org/github.com/mitchellh/mapstructure).
-
-The `Decode` function has examples associated with it there.
-
-## But Why?!
-
-Go offers fantastic standard libraries for decoding formats such as JSON.
-The standard method is to have a struct pre-created, and populate that struct
-from the bytes of the encoded format. This is great, but the problem is if
-you have configuration or an encoding that changes slightly depending on
-specific fields. For example, consider this JSON:
-
-```json
-{
-  "type": "person",
-  "name": "Mitchell"
-}
-```
-
-Perhaps we can't populate a specific structure without first reading
-the "type" field from the JSON. We could always do two passes over the
-decoding of the JSON (reading the "type" first, and the rest later).
-However, it is much simpler to just decode this into a `map[string]interface{}`
-structure, read the "type" key, then use something like this library
-to decode it into the proper structure.
diff --git a/vendor/github.com/mitchellh/mapstructure/decode_hooks.go b/vendor/github.com/mitchellh/mapstructure/decode_hooks.go
deleted file mode 100644
index afcfd5eed6..0000000000
--- a/vendor/github.com/mitchellh/mapstructure/decode_hooks.go
+++ /dev/null
@@ -1,152 +0,0 @@
-package mapstructure
-
-import (
-	"errors"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// typedDecodeHook takes a raw DecodeHookFunc (an interface{}) and turns
-// it into the proper DecodeHookFunc type, such as DecodeHookFuncType.
-func typedDecodeHook(h DecodeHookFunc) DecodeHookFunc {
-	// Create variables here so we can reference them with the reflect pkg
-	var f1 DecodeHookFuncType
-	var f2 DecodeHookFuncKind
-
-	// Fill in the variables into this interface and the rest is done
-	// automatically using the reflect package.
-	potential := []interface{}{f1, f2}
-
-	v := reflect.ValueOf(h)
-	vt := v.Type()
-	for _, raw := range potential {
-		pt := reflect.ValueOf(raw).Type()
-		if vt.ConvertibleTo(pt) {
-			return v.Convert(pt).Interface()
-		}
-	}
-
-	return nil
-}
-
-// DecodeHookExec executes the given decode hook. This should be used
-// since it'll naturally degrade to the older backwards compatible DecodeHookFunc
-// that took reflect.Kind instead of reflect.Type.
-func DecodeHookExec(
-	raw DecodeHookFunc,
-	from reflect.Type, to reflect.Type,
-	data interface{}) (interface{}, error) {
-	switch f := typedDecodeHook(raw).(type) {
-	case DecodeHookFuncType:
-		return f(from, to, data)
-	case DecodeHookFuncKind:
-		return f(from.Kind(), to.Kind(), data)
-	default:
-		return nil, errors.New("invalid decode hook signature")
-	}
-}
-
-// ComposeDecodeHookFunc creates a single DecodeHookFunc that
-// automatically composes multiple DecodeHookFuncs.
-//
-// The composed funcs are called in order, with the result of the
-// previous transformation.
-func ComposeDecodeHookFunc(fs ...DecodeHookFunc) DecodeHookFunc {
-	return func(
-		f reflect.Type,
-		t reflect.Type,
-		data interface{}) (interface{}, error) {
-		var err error
-		for _, f1 := range fs {
-			data, err = DecodeHookExec(f1, f, t, data)
-			if err != nil {
-				return nil, err
-			}
-
-			// Modify the from kind to be correct with the new data
-			f = nil
-			if val := reflect.ValueOf(data); val.IsValid() {
-				f = val.Type()
-			}
-		}
-
-		return data, nil
-	}
-}
-
-// StringToSliceHookFunc returns a DecodeHookFunc that converts
-// string to []string by splitting on the given sep.
-func StringToSliceHookFunc(sep string) DecodeHookFunc {
-	return func(
-		f reflect.Kind,
-		t reflect.Kind,
-		data interface{}) (interface{}, error) {
-		if f != reflect.String || t != reflect.Slice {
-			return data, nil
-		}
-
-		raw := data.(string)
-		if raw == "" {
-			return []string{}, nil
-		}
-
-		return strings.Split(raw, sep), nil
-	}
-}
-
-// StringToTimeDurationHookFunc returns a DecodeHookFunc that converts
-// strings to time.Duration.
-func StringToTimeDurationHookFunc() DecodeHookFunc {
-	return func(
-		f reflect.Type,
-		t reflect.Type,
-		data interface{}) (interface{}, error) {
-		if f.Kind() != reflect.String {
-			return data, nil
-		}
-		if t != reflect.TypeOf(time.Duration(5)) {
-			return data, nil
-		}
-
-		// Convert it by parsing
-		return time.ParseDuration(data.(string))
-	}
-}
-
-// WeaklyTypedHook is a DecodeHookFunc which adds support for weak typing to
-// the decoder.
-//
-// Note that this is significantly different from the WeaklyTypedInput option
-// of the DecoderConfig.
-func WeaklyTypedHook(
-	f reflect.Kind,
-	t reflect.Kind,
-	data interface{}) (interface{}, error) {
-	dataVal := reflect.ValueOf(data)
-	switch t {
-	case reflect.String:
-		switch f {
-		case reflect.Bool:
-			if dataVal.Bool() {
-				return "1", nil
-			}
-			return "0", nil
-		case reflect.Float32:
-			return strconv.FormatFloat(dataVal.Float(), 'f', -1, 64), nil
-		case reflect.Int:
-			return strconv.FormatInt(dataVal.Int(), 10), nil
-		case reflect.Slice:
-			dataType := dataVal.Type()
-			elemKind := dataType.Elem().Kind()
-			if elemKind == reflect.Uint8 {
-				return string(dataVal.Interface().([]uint8)), nil
-			}
-		case reflect.Uint:
-			return strconv.FormatUint(dataVal.Uint(), 10), nil
-		}
-	}
-
-	return data, nil
-}
diff --git a/vendor/github.com/mitchellh/mapstructure/error.go b/vendor/github.com/mitchellh/mapstructure/error.go
deleted file mode 100644
index 47a99e5af3..0000000000
--- a/vendor/github.com/mitchellh/mapstructure/error.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package mapstructure
-
-import (
-	"errors"
-	"fmt"
-	"sort"
-	"strings"
-)
-
-// Error implements the error interface and can represents multiple
-// errors that occur in the course of a single decode.
-type Error struct {
-	Errors []string
-}
-
-func (e *Error) Error() string {
-	points := make([]string, len(e.Errors))
-	for i, err := range e.Errors {
-		points[i] = fmt.Sprintf("* %s", err)
-	}
-
-	sort.Strings(points)
-	return fmt.Sprintf(
-		"%d error(s) decoding:\n\n%s",
-		len(e.Errors), strings.Join(points, "\n"))
-}
-
-// WrappedErrors implements the errwrap.Wrapper interface to make this
-// return value more useful with the errwrap and go-multierror libraries.
-func (e *Error) WrappedErrors() []error {
-	if e == nil {
-		return nil
-	}
-
-	result := make([]error, len(e.Errors))
-	for i, e := range e.Errors {
-		result[i] = errors.New(e)
-	}
-
-	return result
-}
-
-func appendErrors(errors []string, err error) []string {
-	switch e := err.(type) {
-	case *Error:
-		return append(errors, e.Errors...)
-	default:
-		return append(errors, e.Error())
-	}
-}
diff --git a/vendor/github.com/mitchellh/mapstructure/mapstructure.go b/vendor/github.com/mitchellh/mapstructure/mapstructure.go
deleted file mode 100644
index 6ec5c33357..0000000000
--- a/vendor/github.com/mitchellh/mapstructure/mapstructure.go
+++ /dev/null
@@ -1,828 +0,0 @@
-// Package mapstructure exposes functionality to convert an arbitrary
-// map[string]interface{} into a native Go structure.
-//
-// The Go structure can be arbitrarily complex, containing slices,
-// other structs, etc. and the decoder will properly decode nested
-// maps and so on into the proper structures in the native Go struct.
-// See the examples to see what the decoder is capable of.
-package mapstructure
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-)
-
-// DecodeHookFunc is the callback function that can be used for
-// data transformations. See "DecodeHook" in the DecoderConfig
-// struct.
-//
-// The type should be DecodeHookFuncType or DecodeHookFuncKind.
-// Either is accepted. Types are a superset of Kinds (Types can return
-// Kinds) and are generally a richer thing to use, but Kinds are simpler
-// if you only need those.
-//
-// The reason DecodeHookFunc is multi-typed is for backwards compatibility:
-// we started with Kinds and then realized Types were the better solution,
-// but have a promise to not break backwards compat so we now support
-// both.
-type DecodeHookFunc interface{}
-
-// DecodeHookFuncType is a DecodeHookFunc which has complete information about
-// the source and target types.
-type DecodeHookFuncType func(reflect.Type, reflect.Type, interface{}) (interface{}, error)
-
-// DecodeHookFuncKind is a DecodeHookFunc which knows only the Kinds of the
-// source and target types.
-type DecodeHookFuncKind func(reflect.Kind, reflect.Kind, interface{}) (interface{}, error)
-
-// DecoderConfig is the configuration that is used to create a new decoder
-// and allows customization of various aspects of decoding.
-type DecoderConfig struct {
-	// DecodeHook, if set, will be called before any decoding and any
-	// type conversion (if WeaklyTypedInput is on). This lets you modify
-	// the values before they're set down onto the resulting struct.
-	//
-	// If an error is returned, the entire decode will fail with that
-	// error.
-	DecodeHook DecodeHookFunc
-
-	// If ErrorUnused is true, then it is an error for there to exist
-	// keys in the original map that were unused in the decoding process
-	// (extra keys).
-	ErrorUnused bool
-
-	// ZeroFields, if set to true, will zero fields before writing them.
-	// For example, a map will be emptied before decoded values are put in
-	// it. If this is false, a map will be merged.
-	ZeroFields bool
-
-	// If WeaklyTypedInput is true, the decoder will make the following
-	// "weak" conversions:
-	//
-	//   - bools to string (true = "1", false = "0")
-	//   - numbers to string (base 10)
-	//   - bools to int/uint (true = 1, false = 0)
-	//   - strings to int/uint (base implied by prefix)
-	//   - int to bool (true if value != 0)
-	//   - string to bool (accepts: 1, t, T, TRUE, true, True, 0, f, F,
-	//     FALSE, false, False. Anything else is an error)
-	//   - empty array = empty map and vice versa
-	//   - negative numbers to overflowed uint values (base 10)
-	//   - slice of maps to a merged map
-	//   - single values are converted to slices if required. Each
-	//     element is weakly decoded. For example: "4" can become []int{4}
-	//     if the target type is an int slice.
-	//
-	WeaklyTypedInput bool
-
-	// Metadata is the struct that will contain extra metadata about
-	// the decoding. If this is nil, then no metadata will be tracked.
-	Metadata *Metadata
-
-	// Result is a pointer to the struct that will contain the decoded
-	// value.
-	Result interface{}
-
-	// The tag name that mapstructure reads for field names. This
-	// defaults to "mapstructure"
-	TagName string
-}
-
-// A Decoder takes a raw interface value and turns it into structured
-// data, keeping track of rich error information along the way in case
-// anything goes wrong. Unlike the basic top-level Decode method, you can
-// more finely control how the Decoder behaves using the DecoderConfig
-// structure. The top-level Decode method is just a convenience that sets
-// up the most basic Decoder.
-type Decoder struct {
-	config *DecoderConfig
-}
-
-// Metadata contains information about decoding a structure that
-// is tedious or difficult to get otherwise.
-type Metadata struct {
-	// Keys are the keys of the structure which were successfully decoded
-	Keys []string
-
-	// Unused is a slice of keys that were found in the raw value but
-	// weren't decoded since there was no matching field in the result interface
-	Unused []string
-}
-
-// Decode takes a map and uses reflection to convert it into the
-// given Go native structure. val must be a pointer to a struct.
-func Decode(m interface{}, rawVal interface{}) error {
-	config := &DecoderConfig{
-		Metadata: nil,
-		Result:   rawVal,
-	}
-
-	decoder, err := NewDecoder(config)
-	if err != nil {
-		return err
-	}
-
-	return decoder.Decode(m)
-}
-
-// WeakDecode is the same as Decode but is shorthand to enable
-// WeaklyTypedInput. See DecoderConfig for more info.
-func WeakDecode(input, output interface{}) error {
-	config := &DecoderConfig{
-		Metadata:         nil,
-		Result:           output,
-		WeaklyTypedInput: true,
-	}
-
-	decoder, err := NewDecoder(config)
-	if err != nil {
-		return err
-	}
-
-	return decoder.Decode(input)
-}
-
-// NewDecoder returns a new decoder for the given configuration. Once
-// a decoder has been returned, the same configuration must not be used
-// again.
-func NewDecoder(config *DecoderConfig) (*Decoder, error) {
-	val := reflect.ValueOf(config.Result)
-	if val.Kind() != reflect.Ptr {
-		return nil, errors.New("result must be a pointer")
-	}
-
-	val = val.Elem()
-	if !val.CanAddr() {
-		return nil, errors.New("result must be addressable (a pointer)")
-	}
-
-	if config.Metadata != nil {
-		if config.Metadata.Keys == nil {
-			config.Metadata.Keys = make([]string, 0)
-		}
-
-		if config.Metadata.Unused == nil {
-			config.Metadata.Unused = make([]string, 0)
-		}
-	}
-
-	if config.TagName == "" {
-		config.TagName = "mapstructure"
-	}
-
-	result := &Decoder{
-		config: config,
-	}
-
-	return result, nil
-}
-
-// Decode decodes the given raw interface to the target pointer specified
-// by the configuration.
-func (d *Decoder) Decode(raw interface{}) error {
-	return d.decode("", raw, reflect.ValueOf(d.config.Result).Elem())
-}
-
-// Decodes an unknown data type into a specific reflection value.
-func (d *Decoder) decode(name string, data interface{}, val reflect.Value) error {
-	if data == nil {
-		// If the data is nil, then we don't set anything.
-		return nil
-	}
-
-	dataVal := reflect.ValueOf(data)
-	if !dataVal.IsValid() {
-		// If the data value is invalid, then we just set the value
-		// to be the zero value.
-		val.Set(reflect.Zero(val.Type()))
-		return nil
-	}
-
-	if d.config.DecodeHook != nil {
-		// We have a DecodeHook, so let's pre-process the data.
-		var err error
-		data, err = DecodeHookExec(
-			d.config.DecodeHook,
-			dataVal.Type(), val.Type(), data)
-		if err != nil {
-			return fmt.Errorf("error decoding '%s': %s", name, err)
-		}
-	}
-
-	var err error
-	dataKind := getKind(val)
-	switch dataKind {
-	case reflect.Bool:
-		err = d.decodeBool(name, data, val)
-	case reflect.Interface:
-		err = d.decodeBasic(name, data, val)
-	case reflect.String:
-		err = d.decodeString(name, data, val)
-	case reflect.Int:
-		err = d.decodeInt(name, data, val)
-	case reflect.Uint:
-		err = d.decodeUint(name, data, val)
-	case reflect.Float32:
-		err = d.decodeFloat(name, data, val)
-	case reflect.Struct:
-		err = d.decodeStruct(name, data, val)
-	case reflect.Map:
-		err = d.decodeMap(name, data, val)
-	case reflect.Ptr:
-		err = d.decodePtr(name, data, val)
-	case reflect.Slice:
-		err = d.decodeSlice(name, data, val)
-	case reflect.Func:
-		err = d.decodeFunc(name, data, val)
-	default:
-		// If we reached this point then we weren't able to decode it
-		return fmt.Errorf("%s: unsupported type: %s", name, dataKind)
-	}
-
-	// If we reached here, then we successfully decoded SOMETHING, so
-	// mark the key as used if we're tracking metadata.
-	if d.config.Metadata != nil && name != "" {
-		d.config.Metadata.Keys = append(d.config.Metadata.Keys, name)
-	}
-
-	return err
-}
-
-// This decodes a basic type (bool, int, string, etc.) and sets the
-// value to "data" of that type.
-func (d *Decoder) decodeBasic(name string, data interface{}, val reflect.Value) error {
-	dataVal := reflect.ValueOf(data)
-	if !dataVal.IsValid() {
-		dataVal = reflect.Zero(val.Type())
-	}
-
-	dataValType := dataVal.Type()
-	if !dataValType.AssignableTo(val.Type()) {
-		return fmt.Errorf(
-			"'%s' expected type '%s', got '%s'",
-			name, val.Type(), dataValType)
-	}
-
-	val.Set(dataVal)
-	return nil
-}
-
-func (d *Decoder) decodeString(name string, data interface{}, val reflect.Value) error {
-	dataVal := reflect.ValueOf(data)
-	dataKind := getKind(dataVal)
-
-	converted := true
-	switch {
-	case dataKind == reflect.String:
-		val.SetString(dataVal.String())
-	case dataKind == reflect.Bool && d.config.WeaklyTypedInput:
-		if dataVal.Bool() {
-			val.SetString("1")
-		} else {
-			val.SetString("0")
-		}
-	case dataKind == reflect.Int && d.config.WeaklyTypedInput:
-		val.SetString(strconv.FormatInt(dataVal.Int(), 10))
-	case dataKind == reflect.Uint && d.config.WeaklyTypedInput:
-		val.SetString(strconv.FormatUint(dataVal.Uint(), 10))
-	case dataKind == reflect.Float32 && d.config.WeaklyTypedInput:
-		val.SetString(strconv.FormatFloat(dataVal.Float(), 'f', -1, 64))
-	case dataKind == reflect.Slice && d.config.WeaklyTypedInput:
-		dataType := dataVal.Type()
-		elemKind := dataType.Elem().Kind()
-		switch {
-		case elemKind == reflect.Uint8:
-			val.SetString(string(dataVal.Interface().([]uint8)))
-		default:
-			converted = false
-		}
-	default:
-		converted = false
-	}
-
-	if !converted {
-		return fmt.Errorf(
-			"'%s' expected type '%s', got unconvertible type '%s'",
-			name, val.Type(), dataVal.Type())
-	}
-
-	return nil
-}
-
-func (d *Decoder) decodeInt(name string, data interface{}, val reflect.Value) error {
-	dataVal := reflect.ValueOf(data)
-	dataKind := getKind(dataVal)
-	dataType := dataVal.Type()
-
-	switch {
-	case dataKind == reflect.Int:
-		val.SetInt(dataVal.Int())
-	case dataKind == reflect.Uint:
-		val.SetInt(int64(dataVal.Uint()))
-	case dataKind == reflect.Float32:
-		val.SetInt(int64(dataVal.Float()))
-	case dataKind == reflect.Bool && d.config.WeaklyTypedInput:
-		if dataVal.Bool() {
-			val.SetInt(1)
-		} else {
-			val.SetInt(0)
-		}
-	case dataKind == reflect.String && d.config.WeaklyTypedInput:
-		i, err := strconv.ParseInt(dataVal.String(), 0, val.Type().Bits())
-		if err == nil {
-			val.SetInt(i)
-		} else {
-			return fmt.Errorf("cannot parse '%s' as int: %s", name, err)
-		}
-	case dataType.PkgPath() == "encoding/json" && dataType.Name() == "Number":
-		jn := data.(json.Number)
-		i, err := jn.Int64()
-		if err != nil {
-			return fmt.Errorf(
-				"error decoding json.Number into %s: %s", name, err)
-		}
-		val.SetInt(i)
-	default:
-		return fmt.Errorf(
-			"'%s' expected type '%s', got unconvertible type '%s'",
-			name, val.Type(), dataVal.Type())
-	}
-
-	return nil
-}
-
-func (d *Decoder) decodeUint(name string, data interface{}, val reflect.Value) error {
-	dataVal := reflect.ValueOf(data)
-	dataKind := getKind(dataVal)
-
-	switch {
-	case dataKind == reflect.Int:
-		i := dataVal.Int()
-		if i < 0 && !d.config.WeaklyTypedInput {
-			return fmt.Errorf("cannot parse '%s', %d overflows uint",
-				name, i)
-		}
-		val.SetUint(uint64(i))
-	case dataKind == reflect.Uint:
-		val.SetUint(dataVal.Uint())
-	case dataKind == reflect.Float32:
-		f := dataVal.Float()
-		if f < 0 && !d.config.WeaklyTypedInput {
-			return fmt.Errorf("cannot parse '%s', %f overflows uint",
-				name, f)
-		}
-		val.SetUint(uint64(f))
-	case dataKind == reflect.Bool && d.config.WeaklyTypedInput:
-		if dataVal.Bool() {
-			val.SetUint(1)
-		} else {
-			val.SetUint(0)
-		}
-	case dataKind == reflect.String && d.config.WeaklyTypedInput:
-		i, err := strconv.ParseUint(dataVal.String(), 0, val.Type().Bits())
-		if err == nil {
-			val.SetUint(i)
-		} else {
-			return fmt.Errorf("cannot parse '%s' as uint: %s", name, err)
-		}
-	default:
-		return fmt.Errorf(
-			"'%s' expected type '%s', got unconvertible type '%s'",
-			name, val.Type(), dataVal.Type())
-	}
-
-	return nil
-}
-
-func (d *Decoder) decodeBool(name string, data interface{}, val reflect.Value) error {
-	dataVal := reflect.ValueOf(data)
-	dataKind := getKind(dataVal)
-
-	switch {
-	case dataKind == reflect.Bool:
-		val.SetBool(dataVal.Bool())
-	case dataKind == reflect.Int && d.config.WeaklyTypedInput:
-		val.SetBool(dataVal.Int() != 0)
-	case dataKind == reflect.Uint && d.config.WeaklyTypedInput:
-		val.SetBool(dataVal.Uint() != 0)
-	case dataKind == reflect.Float32 && d.config.WeaklyTypedInput:
-		val.SetBool(dataVal.Float() != 0)
-	case dataKind == reflect.String && d.config.WeaklyTypedInput:
-		b, err := strconv.ParseBool(dataVal.String())
-		if err == nil {
-			val.SetBool(b)
-		} else if dataVal.String() == "" {
-			val.SetBool(false)
-		} else {
-			return fmt.Errorf("cannot parse '%s' as bool: %s", name, err)
-		}
-	default:
-		return fmt.Errorf(
-			"'%s' expected type '%s', got unconvertible type '%s'",
-			name, val.Type(), dataVal.Type())
-	}
-
-	return nil
-}
-
-func (d *Decoder) decodeFloat(name string, data interface{}, val reflect.Value) error {
-	dataVal := reflect.ValueOf(data)
-	dataKind := getKind(dataVal)
-	dataType := dataVal.Type()
-
-	switch {
-	case dataKind == reflect.Int:
-		val.SetFloat(float64(dataVal.Int()))
-	case dataKind == reflect.Uint:
-		val.SetFloat(float64(dataVal.Uint()))
-	case dataKind == reflect.Float32:
-		val.SetFloat(dataVal.Float())
-	case dataKind == reflect.Bool && d.config.WeaklyTypedInput:
-		if dataVal.Bool() {
-			val.SetFloat(1)
-		} else {
-			val.SetFloat(0)
-		}
-	case dataKind == reflect.String && d.config.WeaklyTypedInput:
-		f, err := strconv.ParseFloat(dataVal.String(), val.Type().Bits())
-		if err == nil {
-			val.SetFloat(f)
-		} else {
-			return fmt.Errorf("cannot parse '%s' as float: %s", name, err)
-		}
-	case dataType.PkgPath() == "encoding/json" && dataType.Name() == "Number":
-		jn := data.(json.Number)
-		i, err := jn.Float64()
-		if err != nil {
-			return fmt.Errorf(
-				"error decoding json.Number into %s: %s", name, err)
-		}
-		val.SetFloat(i)
-	default:
-		return fmt.Errorf(
-			"'%s' expected type '%s', got unconvertible type '%s'",
-			name, val.Type(), dataVal.Type())
-	}
-
-	return nil
-}
-
-func (d *Decoder) decodeMap(name string, data interface{}, val reflect.Value) error {
-	valType := val.Type()
-	valKeyType := valType.Key()
-	valElemType := valType.Elem()
-
-	// By default we overwrite keys in the current map
-	valMap := val
-
-	// If the map is nil or we're purposely zeroing fields, make a new map
-	if valMap.IsNil() || d.config.ZeroFields {
-		// Make a new map to hold our result
-		mapType := reflect.MapOf(valKeyType, valElemType)
-		valMap = reflect.MakeMap(mapType)
-	}
-
-	// Check input type
-	dataVal := reflect.Indirect(reflect.ValueOf(data))
-	if dataVal.Kind() != reflect.Map {
-		// In weak mode, we accept a slice of maps as an input...
-		if d.config.WeaklyTypedInput {
-			switch dataVal.Kind() {
-			case reflect.Array, reflect.Slice:
-				// Special case for BC reasons (covered by tests)
-				if dataVal.Len() == 0 {
-					val.Set(valMap)
-					return nil
-				}
-
-				for i := 0; i < dataVal.Len(); i++ {
-					err := d.decode(
-						fmt.Sprintf("%s[%d]", name, i),
-						dataVal.Index(i).Interface(), val)
-					if err != nil {
-						return err
-					}
-				}
-
-				return nil
-			}
-		}
-
-		return fmt.Errorf("'%s' expected a map, got '%s'", name, dataVal.Kind())
-	}
-
-	// Accumulate errors
-	errors := make([]string, 0)
-
-	for _, k := range dataVal.MapKeys() {
-		fieldName := fmt.Sprintf("%s[%s]", name, k)
-
-		// First decode the key into the proper type
-		currentKey := reflect.Indirect(reflect.New(valKeyType))
-		if err := d.decode(fieldName, k.Interface(), currentKey); err != nil {
-			errors = appendErrors(errors, err)
-			continue
-		}
-
-		// Next decode the data into the proper type
-		v := dataVal.MapIndex(k).Interface()
-		currentVal := reflect.Indirect(reflect.New(valElemType))
-		if err := d.decode(fieldName, v, currentVal); err != nil {
-			errors = appendErrors(errors, err)
-			continue
-		}
-
-		valMap.SetMapIndex(currentKey, currentVal)
-	}
-
-	// Set the built up map to the value
-	val.Set(valMap)
-
-	// If we had errors, return those
-	if len(errors) > 0 {
-		return &Error{errors}
-	}
-
-	return nil
-}
-
-func (d *Decoder) decodePtr(name string, data interface{}, val reflect.Value) error {
-	// Create an element of the concrete (non pointer) type and decode
-	// into that. Then set the value of the pointer to this type.
-	valType := val.Type()
-	valElemType := valType.Elem()
-
-	realVal := val
-	if realVal.IsNil() || d.config.ZeroFields {
-		realVal = reflect.New(valElemType)
-	}
-
-	if err := d.decode(name, data, reflect.Indirect(realVal)); err != nil {
-		return err
-	}
-
-	val.Set(realVal)
-	return nil
-}
-
-func (d *Decoder) decodeFunc(name string, data interface{}, val reflect.Value) error {
-	// Create an element of the concrete (non pointer) type and decode
-	// into that. Then set the value of the pointer to this type.
-	dataVal := reflect.Indirect(reflect.ValueOf(data))
-	if val.Type() != dataVal.Type() {
-		return fmt.Errorf(
-			"'%s' expected type '%s', got unconvertible type '%s'",
-			name, val.Type(), dataVal.Type())
-	}
-	val.Set(dataVal)
-	return nil
-}
-
-func (d *Decoder) decodeSlice(name string, data interface{}, val reflect.Value) error {
-	dataVal := reflect.Indirect(reflect.ValueOf(data))
-	dataValKind := dataVal.Kind()
-	valType := val.Type()
-	valElemType := valType.Elem()
-	sliceType := reflect.SliceOf(valElemType)
-
-	valSlice := val
-	if valSlice.IsNil() || d.config.ZeroFields {
-		// Check input type
-		if dataValKind != reflect.Array && dataValKind != reflect.Slice {
-			if d.config.WeaklyTypedInput {
-				switch {
-				// Empty maps turn into empty slices
-				case dataValKind == reflect.Map:
-					if dataVal.Len() == 0 {
-						val.Set(reflect.MakeSlice(sliceType, 0, 0))
-						return nil
-					}
-
-				// All other types we try to convert to the slice type
-				// and "lift" it into it. i.e. a string becomes a string slice.
-				default:
-					// Just re-try this function with data as a slice.
-					return d.decodeSlice(name, []interface{}{data}, val)
-				}
-			}
-
-			return fmt.Errorf(
-				"'%s': source data must be an array or slice, got %s", name, dataValKind)
-
-		}
-
-		// Make a new slice to hold our result, same size as the original data.
-		valSlice = reflect.MakeSlice(sliceType, dataVal.Len(), dataVal.Len())
-	}
-
-	// Accumulate any errors
-	errors := make([]string, 0)
-
-	for i := 0; i < dataVal.Len(); i++ {
-		currentData := dataVal.Index(i).Interface()
-		for valSlice.Len() <= i {
-			valSlice = reflect.Append(valSlice, reflect.Zero(valElemType))
-		}
-		currentField := valSlice.Index(i)
-
-		fieldName := fmt.Sprintf("%s[%d]", name, i)
-		if err := d.decode(fieldName, currentData, currentField); err != nil {
-			errors = appendErrors(errors, err)
-		}
-	}
-
-	// Finally, set the value to the slice we built up
-	val.Set(valSlice)
-
-	// If there were errors, we return those
-	if len(errors) > 0 {
-		return &Error{errors}
-	}
-
-	return nil
-}
-
-func (d *Decoder) decodeStruct(name string, data interface{}, val reflect.Value) error {
-	dataVal := reflect.Indirect(reflect.ValueOf(data))
-
-	// If the type of the value to write to and the data match directly,
-	// then we just set it directly instead of recursing into the structure.
-	if dataVal.Type() == val.Type() {
-		val.Set(dataVal)
-		return nil
-	}
-
-	dataValKind := dataVal.Kind()
-	if dataValKind != reflect.Map {
-		return fmt.Errorf("'%s' expected a map, got '%s'", name, dataValKind)
-	}
-
-	dataValType := dataVal.Type()
-	if kind := dataValType.Key().Kind(); kind != reflect.String && kind != reflect.Interface {
-		return fmt.Errorf(
-			"'%s' needs a map with string keys, has '%s' keys",
-			name, dataValType.Key().Kind())
-	}
-
-	dataValKeys := make(map[reflect.Value]struct{})
-	dataValKeysUnused := make(map[interface{}]struct{})
-	for _, dataValKey := range dataVal.MapKeys() {
-		dataValKeys[dataValKey] = struct{}{}
-		dataValKeysUnused[dataValKey.Interface()] = struct{}{}
-	}
-
-	errors := make([]string, 0)
-
-	// This slice will keep track of all the structs we'll be decoding.
-	// There can be more than one struct if there are embedded structs
-	// that are squashed.
-	structs := make([]reflect.Value, 1, 5)
-	structs[0] = val
-
-	// Compile the list of all the fields that we're going to be decoding
-	// from all the structs.
-	fields := make(map[*reflect.StructField]reflect.Value)
-	for len(structs) > 0 {
-		structVal := structs[0]
-		structs = structs[1:]
-
-		structType := structVal.Type()
-
-		for i := 0; i < structType.NumField(); i++ {
-			fieldType := structType.Field(i)
-			fieldKind := fieldType.Type.Kind()
-
-			// If "squash" is specified in the tag, we squash the field down.
-			squash := false
-			tagParts := strings.Split(fieldType.Tag.Get(d.config.TagName), ",")
-			for _, tag := range tagParts[1:] {
-				if tag == "squash" {
-					squash = true
-					break
-				}
-			}
-
-			if squash {
-				if fieldKind != reflect.Struct {
-					errors = appendErrors(errors,
-						fmt.Errorf("%s: unsupported type for squash: %s", fieldType.Name, fieldKind))
-				} else {
-					structs = append(structs, val.FieldByName(fieldType.Name))
-				}
-				continue
-			}
-
-			// Normal struct field, store it away
-			fields[&fieldType] = structVal.Field(i)
-		}
-	}
-
-	for fieldType, field := range fields {
-		fieldName := fieldType.Name
-
-		tagValue := fieldType.Tag.Get(d.config.TagName)
-		tagValue = strings.SplitN(tagValue, ",", 2)[0]
-		if tagValue != "" {
-			fieldName = tagValue
-		}
-
-		rawMapKey := reflect.ValueOf(fieldName)
-		rawMapVal := dataVal.MapIndex(rawMapKey)
-		if !rawMapVal.IsValid() {
-			// Do a slower search by iterating over each key and
-			// doing case-insensitive search.
-			for dataValKey := range dataValKeys {
-				mK, ok := dataValKey.Interface().(string)
-				if !ok {
-					// Not a string key
-					continue
-				}
-
-				if strings.EqualFold(mK, fieldName) {
-					rawMapKey = dataValKey
-					rawMapVal = dataVal.MapIndex(dataValKey)
-					break
-				}
-			}
-
-			if !rawMapVal.IsValid() {
-				// There was no matching key in the map for the value in
-				// the struct. Just ignore.
-				continue
-			}
-		}
-
-		// Delete the key we're using from the unused map so we stop tracking
-		delete(dataValKeysUnused, rawMapKey.Interface())
-
-		if !field.IsValid() {
-			// This should never happen
-			panic("field is not valid")
-		}
-
-		// If we can't set the field, then it is unexported or something,
-		// and we just continue onwards.
-		if !field.CanSet() {
-			continue
-		}
-
-		// If the name is empty string, then we're at the root, and we
-		// don't dot-join the fields.
-		if name != "" {
-			fieldName = fmt.Sprintf("%s.%s", name, fieldName)
-		}
-
-		if err := d.decode(fieldName, rawMapVal.Interface(), field); err != nil {
-			errors = appendErrors(errors, err)
-		}
-	}
-
-	if d.config.ErrorUnused && len(dataValKeysUnused) > 0 {
-		keys := make([]string, 0, len(dataValKeysUnused))
-		for rawKey := range dataValKeysUnused {
-			keys = append(keys, rawKey.(string))
-		}
-		sort.Strings(keys)
-
-		err := fmt.Errorf("'%s' has invalid keys: %s", name, strings.Join(keys, ", "))
-		errors = appendErrors(errors, err)
-	}
-
-	if len(errors) > 0 {
-		return &Error{errors}
-	}
-
-	// Add the unused keys to the list of unused keys if we're tracking metadata
-	if d.config.Metadata != nil {
-		for rawKey := range dataValKeysUnused {
-			key := rawKey.(string)
-			if name != "" {
-				key = fmt.Sprintf("%s.%s", name, key)
-			}
-
-			d.config.Metadata.Unused = append(d.config.Metadata.Unused, key)
-		}
-	}
-
-	return nil
-}
-
-func getKind(val reflect.Value) reflect.Kind {
-	kind := val.Kind()
-
-	switch {
-	case kind >= reflect.Int && kind <= reflect.Int64:
-		return reflect.Int
-	case kind >= reflect.Uint && kind <= reflect.Uint64:
-		return reflect.Uint
-	case kind >= reflect.Float32 && kind <= reflect.Float64:
-		return reflect.Float32
-	default:
-		return kind
-	}
-}
diff --git a/vendor/github.com/onsi/ginkgo/CHANGELOG.md b/vendor/github.com/onsi/ginkgo/CHANGELOG.md
deleted file mode 100644
index 6a4ab3f14b..0000000000
--- a/vendor/github.com/onsi/ginkgo/CHANGELOG.md
+++ /dev/null
@@ -1,156 +0,0 @@
-## HEAD
-
-- When using custom reporters register the custom reporters *before* the default reporter.  This allows users to see the output of any print statements in their customer reporters. [#365]
-
-## 1.4.0 7/16/2017
-
-- `ginkgo` now provides a hint if you accidentally forget to run `ginkgo bootstrap` to generate a `*_suite_test.go` file that actually invokes the Ginkgo test runner. [#345](https://github.com/onsi/ginkgo/pull/345)
-- thanks to improvements in `go test -c` `ginkgo` no longer needs to fix Go's compilation output to ensure compilation errors are expressed relative to the CWD. [#357]
-- `ginkgo watch -watchRegExp=...` allows you to specify a custom regular expression to watch.  Only files matching the regular expression are watched for changes (the default is `\.go$`) [#356]
-- `ginkgo` now always emits compilation output.  Previously, only failed compilation output was printed out. [#277]
-- `ginkgo -requireSuite` now fails the test run if there are `*_test.go` files but `go test` fails to detect any tests.  Typically this means you forgot to run `ginkgo bootstrap` to generate a suite file. [#344]
-- `ginkgo -timeout=DURATION` allows you to adjust the timeout for the entire test suite (default is 24 hours) [#248]
-
-## 1.3.0 3/28/2017
-
-Improvements:
-
-- Significantly improved parallel test distribution.  Now instead of pre-sharding test cases across workers (which can result in idle workers and poor test performance) Ginkgo uses a shared queue to keep all workers busy until all tests are complete.  This improves test-time performance and consistency.
-- `Skip(message)` can be used to skip the current test.
-- Added `extensions/table` - a Ginkgo DSL for [Table Driven Tests](http://onsi.github.io/ginkgo/#table-driven-tests)
-- Add `GinkgoRandomSeed()` - shorthand for `config.GinkgoConfig.RandomSeed`
-- Support for retrying flaky tests with `--flakeAttempts`
-- `ginkgo ./...` now recurses as you'd expect
-- Added `Specify` a synonym for `It`
-- Support colorise on Windows
-- Broader support for various go compilation flags in the `ginkgo` CLI
-
-Bug Fixes:
-
-- Ginkgo tests now fail when you `panic(nil)` (#167)
-
-## 1.2.0 5/31/2015
-
-Improvements
-
-- `ginkgo -coverpkg` calls down to `go test -coverpkg` (#160)
-- `ginkgo -afterSuiteHook COMMAND` invokes the passed-in `COMMAND` after a test suite completes (#152)
-- Relaxed requirement for Go 1.4+.  `ginkgo` now works with Go v1.3+ (#166)
-
-## 1.2.0-beta
-
-Ginkgo now requires Go 1.4+
-
-Improvements:
-
-- Call reporters in reverse order when announcing spec completion -- allows custom reporters to emit output before the default reporter does.
-- Improved focus behavior.  Now, this:
-
-    ```golang
-    FDescribe("Some describe", func() {
-        It("A", func() {})
-
-        FIt("B", func() {})
-    })
-    ```
-
-  will run `B` but *not* `A`.  This tends to be a common usage pattern when in the thick of writing and debugging tests.
-- When `SIGINT` is received, Ginkgo will emit the contents of the `GinkgoWriter` before running the `AfterSuite`.  Useful for debugging stuck tests.
-- When `--progress` is set, Ginkgo will write test progress (in particular, Ginkgo will say when it is about to run a BeforeEach, AfterEach, It, etc...) to the `GinkgoWriter`.  This is useful for debugging stuck tests and tests that generate many logs.
-- Improved output when an error occurs in a setup or teardown block.
-- When `--dryRun` is set, Ginkgo will walk the spec tree and emit to its reporter *without* actually running anything.  Best paired with `-v` to understand which specs will run in which order.
-- Add `By` to help document long `It`s.  `By` simply writes to the `GinkgoWriter`.
-- Add support for precompiled tests:
-    - `ginkgo build <path-to-package>` will now compile the package, producing a file named `package.test`
-    - The compiled `package.test` file can be run directly.  This runs the tests in series.
-    - To run precompiled tests in parallel, you can run: `ginkgo -p package.test`
-- Support `bootstrap`ping and `generate`ing [Agouti](http://agouti.org) specs.
-- `ginkgo generate` and `ginkgo bootstrap` now honor the package name already defined in a given directory
-- The `ginkgo` CLI ignores `SIGQUIT`.  Prevents its stack dump from interlacing with the underlying test suite's stack dump.
-- The `ginkgo` CLI now compiles tests into a temporary directory instead of the package directory.  This necessitates upgrading to Go v1.4+.
-- `ginkgo -notify` now works on Linux
-
-Bug Fixes:
-
-- If --skipPackages is used and all packages are skipped, Ginkgo should exit 0.
-- Fix tempfile leak when running in parallel
-- Fix incorrect failure message when a panic occurs during a parallel test run
-- Fixed an issue where a pending test within a focused context (or a focused test within a pending context) would skip all other tests.
-- Be more consistent about handling SIGTERM as well as SIGINT
-- When interupted while concurrently compiling test suites in the background, Ginkgo now cleans up the compiled artifacts.
-- Fixed a long standing bug where `ginkgo -p` would hang if a process spawned by one of the Ginkgo parallel nodes does not exit. (Hooray!)
-
-## 1.1.0 (8/2/2014)
-
-No changes, just dropping the beta.
-
-## 1.1.0-beta (7/22/2014)
-New Features:
-
-- `ginkgo watch` now monitors packages *and their dependencies* for changes.  The depth of the dependency tree can be modified with the `-depth` flag.
-- Test suites with a programmatic focus (`FIt`, `FDescribe`, etc...) exit with non-zero status code, even when they pass.  This allows CI systems to detect accidental commits of focused test suites.
-- `ginkgo -p` runs the testsuite in parallel with an auto-detected number of nodes.
-- `ginkgo -tags=TAG_LIST` passes a list of tags down to the `go build` command.
-- `ginkgo --failFast` aborts the test suite after the first failure.
-- `ginkgo generate file_1 file_2` can take multiple file arguments.
-- Ginkgo now summarizes any spec failures that occured at the end of the test run. 
-- `ginkgo --randomizeSuites` will run tests *suites* in random order using the generated/passed-in seed.
-
-Improvements:
-
-- `ginkgo -skipPackage` now takes a comma-separated list of strings.  If the *relative path* to a package matches one of the entries in the comma-separated list, that package is skipped.
-- `ginkgo --untilItFails` no longer recompiles between attempts.
-- Ginkgo now panics when a runnable node (`It`, `BeforeEach`, `JustBeforeEach`, `AfterEach`, `Measure`) is nested within another runnable node.  This is always a mistake.  Any test suites that panic because of this change should be fixed.
-
-Bug Fixes:
-
-- `ginkgo boostrap` and `ginkgo generate` no longer fail when dealing with `hyphen-separated-packages`.
-- parallel specs are now better distributed across nodes - fixed a crashing bug where (for example) distributing 11 tests across 7 nodes would panic
-
-## 1.0.0 (5/24/2014)
-New Features:
-
-- Add `GinkgoParallelNode()` - shorthand for `config.GinkgoConfig.ParallelNode`
-
-Improvements:
-
-- When compilation fails, the compilation output is rewritten to present a correct *relative* path.  Allows ⌘-clicking in iTerm open the file in your text editor.
-- `--untilItFails` and `ginkgo watch` now generate new random seeds between test runs, unless a particular random seed is specified.
-
-Bug Fixes:
-
-- `-cover` now generates a correctly combined coverprofile when running with in parallel with multiple `-node`s.
-- Print out the contents of the `GinkgoWriter` when `BeforeSuite` or `AfterSuite` fail.
-- Fix all remaining race conditions in Ginkgo's test suite.
-
-## 1.0.0-beta (4/14/2014)
-Breaking changes:
-
-- `thirdparty/gomocktestreporter` is gone.  Use `GinkgoT()` instead
-- Modified the Reporter interface 
-- `watch` is now a subcommand, not a flag.
-
-DSL changes:
-
-- `BeforeSuite` and `AfterSuite` for setting up and tearing down test suites.
-- `AfterSuite` is triggered on interrupt (`^C`) as well as exit.
-- `SynchronizedBeforeSuite` and `SynchronizedAfterSuite` for setting up and tearing down singleton resources across parallel nodes.
-
-CLI changes:
-
-- `watch` is now a subcommand, not a flag
-- `--nodot` flag can be passed to `ginkgo generate` and `ginkgo bootstrap` to avoid dot imports.  This explicitly imports all exported identifiers in Ginkgo and Gomega.  Refreshing this list can be done by running `ginkgo nodot`
-- Additional arguments can be passed to specs.  Pass them after the `--` separator
-- `--skipPackage` flag takes a regexp and ignores any packages with package names passing said regexp.
-- `--trace` flag prints out full stack traces when errors occur, not just the line at which the error occurs.
-
-Misc:
-
-- Start using semantic versioning
-- Start maintaining changelog
-
-Major refactor:
-
-- Pull out Ginkgo's internal to `internal`
-- Rename `example` everywhere to `spec`
-- Much more!
diff --git a/vendor/github.com/onsi/ginkgo/CONTRIBUTING.md b/vendor/github.com/onsi/ginkgo/CONTRIBUTING.md
deleted file mode 100644
index bc0c54fe2b..0000000000
--- a/vendor/github.com/onsi/ginkgo/CONTRIBUTING.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Contributing to Ginkgo
-
-Your contributions to Ginkgo are essential for its long-term maintenance and improvement.  To make a contribution:
-
-- Please **open an issue first** - describe what problem you are trying to solve and give the community a forum for input and feedback ahead of investing time in writing code!
-- Ensure adequate test coverage:
-    - If you're adding functionality to the Ginkgo library, make sure to add appropriate unit and/or integration tests (under the `integration` folder).
-    - If you're adding functionality to the Ginkgo CLI note that there are very few unit tests.  Please add an integration test.
-    - Please run all tests locally (`ginkgo -r -p`) and make sure they go green before submitting the PR
-- Update the documentation.  In addition to standard `godoc` comments Ginkgo has extensive documentation on the `gh-pages` branch.  If relevant, please submit a docs PR to that branch alongside your code PR.
-
-Thanks for supporting Ginkgo!
\ No newline at end of file
diff --git a/vendor/github.com/onsi/ginkgo/LICENSE b/vendor/github.com/onsi/ginkgo/LICENSE
deleted file mode 100644
index 9415ee72c1..0000000000
--- a/vendor/github.com/onsi/ginkgo/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2013-2014 Onsi Fakhouri
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/onsi/ginkgo/README.md b/vendor/github.com/onsi/ginkgo/README.md
deleted file mode 100644
index 97e9cdc426..0000000000
--- a/vendor/github.com/onsi/ginkgo/README.md
+++ /dev/null
@@ -1,123 +0,0 @@
-![Ginkgo: A Golang BDD Testing Framework](http://onsi.github.io/ginkgo/images/ginkgo.png)
-
-[![Build Status](https://travis-ci.org/onsi/ginkgo.svg)](https://travis-ci.org/onsi/ginkgo)
-
-Jump to the [docs](http://onsi.github.io/ginkgo/) to learn more.  To start rolling your Ginkgo tests *now* [keep reading](#set-me-up)!
-
-If you have a question, comment, bug report, feature request, etc. please open a GitHub issue.
-
-## Feature List
-
-- Ginkgo uses Go's `testing` package and can live alongside your existing `testing` tests.  It's easy to [bootstrap](http://onsi.github.io/ginkgo/#bootstrapping-a-suite) and start writing your [first tests](http://onsi.github.io/ginkgo/#adding-specs-to-a-suite)
-
-- Structure your BDD-style tests expressively:
-    - Nestable [`Describe` and `Context` container blocks](http://onsi.github.io/ginkgo/#organizing-specs-with-containers-describe-and-context)
-    - [`BeforeEach` and `AfterEach` blocks](http://onsi.github.io/ginkgo/#extracting-common-setup-beforeeach) for setup and teardown
-    - [`It` blocks](http://onsi.github.io/ginkgo/#individual-specs-) that hold your assertions
-    - [`JustBeforeEach` blocks](http://onsi.github.io/ginkgo/#separating-creation-and-configuration-justbeforeeach) that separate creation from configuration (also known as the subject action pattern).
-    - [`BeforeSuite` and `AfterSuite` blocks](http://onsi.github.io/ginkgo/#global-setup-and-teardown-beforesuite-and-aftersuite) to prep for and cleanup after a suite.
-
-- A comprehensive test runner that lets you:
-    - Mark specs as [pending](http://onsi.github.io/ginkgo/#pending-specs)
-    - [Focus](http://onsi.github.io/ginkgo/#focused-specs) individual specs, and groups of specs, either programmatically or on the command line
-    - Run your tests in [random order](http://onsi.github.io/ginkgo/#spec-permutation), and then reuse random seeds to replicate the same order.
-    - Break up your test suite into parallel processes for straightforward [test parallelization](http://onsi.github.io/ginkgo/#parallel-specs)
-
-- `ginkgo`: a command line interface with plenty of handy command line arguments for [running your tests](http://onsi.github.io/ginkgo/#running-tests) and [generating](http://onsi.github.io/ginkgo/#generators) test files.  Here are a few choice examples:
-    - `ginkgo -nodes=N` runs your tests in `N` parallel processes and print out coherent output in realtime
-    - `ginkgo -cover` runs your tests using Golang's code coverage tool
-    - `ginkgo convert` converts an XUnit-style `testing` package to a Ginkgo-style package
-    - `ginkgo -focus="REGEXP"` and `ginkgo -skip="REGEXP"` allow you to specify a subset of tests to run via regular expression
-    - `ginkgo -r` runs all tests suites under the current directory
-    - `ginkgo -v` prints out identifying information for each tests just before it runs
-
-    And much more: run `ginkgo help` for details!
-
-    The `ginkgo` CLI is convenient, but purely optional -- Ginkgo works just fine with `go test`
-
-- `ginkgo watch` [watches](https://onsi.github.io/ginkgo/#watching-for-changes) packages *and their dependencies* for changes, then reruns tests.  Run tests immediately as you develop!
-
-- Built-in support for testing [asynchronicity](http://onsi.github.io/ginkgo/#asynchronous-tests)
-
-- Built-in support for [benchmarking](http://onsi.github.io/ginkgo/#benchmark-tests) your code.  Control the number of benchmark samples as you gather runtimes and other, arbitrary, bits of numerical information about your code. 
-
-- [Completions for Sublime Text](https://github.com/onsi/ginkgo-sublime-completions): just use [Package Control](https://sublime.wbond.net/) to install `Ginkgo Completions`.
-
-- [Completions for VSCode](https://github.com/onsi/vscode-ginkgo): just use VSCode's extension installer to install `vscode-ginkgo`.
-
-- Straightforward support for third-party testing libraries such as [Gomock](https://code.google.com/p/gomock/) and [Testify](https://github.com/stretchr/testify).  Check out the [docs](http://onsi.github.io/ginkgo/#third-party-integrations) for details.
-
-- A modular architecture that lets you easily:
-    - Write [custom reporters](http://onsi.github.io/ginkgo/#writing-custom-reporters) (for example, Ginkgo comes with a [JUnit XML reporter](http://onsi.github.io/ginkgo/#generating-junit-xml-output) and a TeamCity reporter).
-    - [Adapt an existing matcher library (or write your own!)](http://onsi.github.io/ginkgo/#using-other-matcher-libraries) to work with Ginkgo
-
-## [Gomega](http://github.com/onsi/gomega): Ginkgo's Preferred Matcher Library
-
-Ginkgo is best paired with Gomega.  Learn more about Gomega [here](http://onsi.github.io/gomega/)
-
-## [Agouti](http://github.com/sclevine/agouti): A Golang Acceptance Testing Framework
-
-Agouti allows you run WebDriver integration tests.  Learn more about Agouti [here](http://agouti.org)
-
-## Set Me Up!
-
-You'll need Golang v1.3+ (Ubuntu users: you probably have Golang v1.0 -- you'll need to upgrade!)
-
-```bash
-
-go get github.com/onsi/ginkgo/ginkgo  # installs the ginkgo CLI
-go get github.com/onsi/gomega         # fetches the matcher library
-
-cd path/to/package/you/want/to/test
-
-ginkgo bootstrap # set up a new ginkgo suite
-ginkgo generate  # will create a sample test file.  edit this file and add your tests then...
-
-go test # to run your tests
-
-ginkgo  # also runs your tests
-
-```
-
-## I'm new to Go: What are my testing options?
-
-Of course, I heartily recommend [Ginkgo](https://github.com/onsi/ginkgo) and [Gomega](https://github.com/onsi/gomega).  Both packages are seeing heavy, daily, production use on a number of projects and boast a mature and comprehensive feature-set.
-
-With that said, it's great to know what your options are :)
-
-### What Golang gives you out of the box
-
-Testing is a first class citizen in Golang, however Go's built-in testing primitives are somewhat limited: The [testing](http://golang.org/pkg/testing) package provides basic XUnit style tests and no assertion library.
-
-### Matcher libraries for Golang's XUnit style tests
-
-A number of matcher libraries have been written to augment Go's built-in XUnit style tests.  Here are two that have gained traction:
-
-- [testify](https://github.com/stretchr/testify)
-- [gocheck](http://labix.org/gocheck)
-
-You can also use Ginkgo's matcher library [Gomega](https://github.com/onsi/gomega) in [XUnit style tests](http://onsi.github.io/gomega/#using-gomega-with-golangs-xunitstyle-tests)
-
-### BDD style testing frameworks
-
-There are a handful of BDD-style testing frameworks written for Golang.  Here are a few:
-
-- [Ginkgo](https://github.com/onsi/ginkgo) ;)
-- [GoConvey](https://github.com/smartystreets/goconvey) 
-- [Goblin](https://github.com/franela/goblin)
-- [Mao](https://github.com/azer/mao)
-- [Zen](https://github.com/pranavraja/zen)
-
-Finally, @shageman has [put together](https://github.com/shageman/gotestit) a comprehensive comparison of golang testing libraries.
-
-Go explore!
-
-## License
-
-Ginkgo is MIT-Licensed
-
-## Contributing
-
-Since Ginkgo tests also internal packages, when you fork, you'll have to replace imports with your repository.<br />
-Use `before_pr.sh` for that<br />
-After you finished your changes and before you push your pull request, use `after_pr.sh` to revert those changes
\ No newline at end of file
diff --git a/vendor/github.com/onsi/ginkgo/before_pr.sh b/vendor/github.com/onsi/ginkgo/before_pr.sh
deleted file mode 100755
index 3cf262f388..0000000000
--- a/vendor/github.com/onsi/ginkgo/before_pr.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Take current path
-path=$(pwd)
-
-# Split it
-IFS='\/'; arrIN=($path); unset IFS;
-
-# Find directory before ginkgo
-len=${#arrIN[@]}
-
-userDir=${arrIN[$len-2]}
-
-# Replace onsi with userdir
-find . -type f -name '*.go' -exec sed -i '' s/github.com\\/onsi\\/ginkgo\\/internal/github.com\\/$userDir\\/ginkgo\\/internal/ {} +
\ No newline at end of file
diff --git a/vendor/github.com/onsi/ginkgo/config/config.go b/vendor/github.com/onsi/ginkgo/config/config.go
deleted file mode 100644
index 60d5ea22e8..0000000000
--- a/vendor/github.com/onsi/ginkgo/config/config.go
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-Ginkgo accepts a number of configuration options.
-
-These are documented [here](http://onsi.github.io/ginkgo/#the_ginkgo_cli)
-
-You can also learn more via
-
-	ginkgo help
-
-or (I kid you not):
-
-	go test -asdf
-*/
-package config
-
-import (
-	"flag"
-	"time"
-
-	"fmt"
-)
-
-const VERSION = "1.4.0"
-
-type GinkgoConfigType struct {
-	RandomSeed         int64
-	RandomizeAllSpecs  bool
-	RegexScansFilePath bool
-	FocusString        string
-	SkipString         string
-	SkipMeasurements   bool
-	FailOnPending      bool
-	FailFast           bool
-	FlakeAttempts      int
-	EmitSpecProgress   bool
-	DryRun             bool
-
-	ParallelNode  int
-	ParallelTotal int
-	SyncHost      string
-	StreamHost    string
-}
-
-var GinkgoConfig = GinkgoConfigType{}
-
-type DefaultReporterConfigType struct {
-	NoColor           bool
-	SlowSpecThreshold float64
-	NoisyPendings     bool
-	Succinct          bool
-	Verbose           bool
-	FullTrace         bool
-}
-
-var DefaultReporterConfig = DefaultReporterConfigType{}
-
-func processPrefix(prefix string) string {
-	if prefix != "" {
-		prefix = prefix + "."
-	}
-	return prefix
-}
-
-func Flags(flagSet *flag.FlagSet, prefix string, includeParallelFlags bool) {
-	prefix = processPrefix(prefix)
-	flagSet.Int64Var(&(GinkgoConfig.RandomSeed), prefix+"seed", time.Now().Unix(), "The seed used to randomize the spec suite.")
-	flagSet.BoolVar(&(GinkgoConfig.RandomizeAllSpecs), prefix+"randomizeAllSpecs", false, "If set, ginkgo will randomize all specs together.  By default, ginkgo only randomizes the top level Describe/Context groups.")
-	flagSet.BoolVar(&(GinkgoConfig.SkipMeasurements), prefix+"skipMeasurements", false, "If set, ginkgo will skip any measurement specs.")
-	flagSet.BoolVar(&(GinkgoConfig.FailOnPending), prefix+"failOnPending", false, "If set, ginkgo will mark the test suite as failed if any specs are pending.")
-	flagSet.BoolVar(&(GinkgoConfig.FailFast), prefix+"failFast", false, "If set, ginkgo will stop running a test suite after a failure occurs.")
-
-	flagSet.BoolVar(&(GinkgoConfig.DryRun), prefix+"dryRun", false, "If set, ginkgo will walk the test hierarchy without actually running anything.  Best paired with -v.")
-
-	flagSet.StringVar(&(GinkgoConfig.FocusString), prefix+"focus", "", "If set, ginkgo will only run specs that match this regular expression.")
-	flagSet.StringVar(&(GinkgoConfig.SkipString), prefix+"skip", "", "If set, ginkgo will only run specs that do not match this regular expression.")
-
-	flagSet.BoolVar(&(GinkgoConfig.RegexScansFilePath), prefix+"regexScansFilePath", false, "If set, ginkgo regex matching also will look at the file path (code location).")
-
-	flagSet.IntVar(&(GinkgoConfig.FlakeAttempts), prefix+"flakeAttempts", 1, "Make up to this many attempts to run each spec. Please note that if any of the attempts succeed, the suite will not be failed. But any failures will still be recorded.")
-
-	flagSet.BoolVar(&(GinkgoConfig.EmitSpecProgress), prefix+"progress", false, "If set, ginkgo will emit progress information as each spec runs to the GinkgoWriter.")
-
-	if includeParallelFlags {
-		flagSet.IntVar(&(GinkgoConfig.ParallelNode), prefix+"parallel.node", 1, "This worker node's (one-indexed) node number.  For running specs in parallel.")
-		flagSet.IntVar(&(GinkgoConfig.ParallelTotal), prefix+"parallel.total", 1, "The total number of worker nodes.  For running specs in parallel.")
-		flagSet.StringVar(&(GinkgoConfig.SyncHost), prefix+"parallel.synchost", "", "The address for the server that will synchronize the running nodes.")
-		flagSet.StringVar(&(GinkgoConfig.StreamHost), prefix+"parallel.streamhost", "", "The address for the server that the running nodes should stream data to.")
-	}
-
-	flagSet.BoolVar(&(DefaultReporterConfig.NoColor), prefix+"noColor", false, "If set, suppress color output in default reporter.")
-	flagSet.Float64Var(&(DefaultReporterConfig.SlowSpecThreshold), prefix+"slowSpecThreshold", 5.0, "(in seconds) Specs that take longer to run than this threshold are flagged as slow by the default reporter.")
-	flagSet.BoolVar(&(DefaultReporterConfig.NoisyPendings), prefix+"noisyPendings", true, "If set, default reporter will shout about pending tests.")
-	flagSet.BoolVar(&(DefaultReporterConfig.Verbose), prefix+"v", false, "If set, default reporter print out all specs as they begin.")
-	flagSet.BoolVar(&(DefaultReporterConfig.Succinct), prefix+"succinct", false, "If set, default reporter prints out a very succinct report")
-	flagSet.BoolVar(&(DefaultReporterConfig.FullTrace), prefix+"trace", false, "If set, default reporter prints out the full stack trace when a failure occurs")
-}
-
-func BuildFlagArgs(prefix string, ginkgo GinkgoConfigType, reporter DefaultReporterConfigType) []string {
-	prefix = processPrefix(prefix)
-	result := make([]string, 0)
-
-	if ginkgo.RandomSeed > 0 {
-		result = append(result, fmt.Sprintf("--%sseed=%d", prefix, ginkgo.RandomSeed))
-	}
-
-	if ginkgo.RandomizeAllSpecs {
-		result = append(result, fmt.Sprintf("--%srandomizeAllSpecs", prefix))
-	}
-
-	if ginkgo.SkipMeasurements {
-		result = append(result, fmt.Sprintf("--%sskipMeasurements", prefix))
-	}
-
-	if ginkgo.FailOnPending {
-		result = append(result, fmt.Sprintf("--%sfailOnPending", prefix))
-	}
-
-	if ginkgo.FailFast {
-		result = append(result, fmt.Sprintf("--%sfailFast", prefix))
-	}
-
-	if ginkgo.DryRun {
-		result = append(result, fmt.Sprintf("--%sdryRun", prefix))
-	}
-
-	if ginkgo.FocusString != "" {
-		result = append(result, fmt.Sprintf("--%sfocus=%s", prefix, ginkgo.FocusString))
-	}
-
-	if ginkgo.SkipString != "" {
-		result = append(result, fmt.Sprintf("--%sskip=%s", prefix, ginkgo.SkipString))
-	}
-
-	if ginkgo.FlakeAttempts > 1 {
-		result = append(result, fmt.Sprintf("--%sflakeAttempts=%d", prefix, ginkgo.FlakeAttempts))
-	}
-
-	if ginkgo.EmitSpecProgress {
-		result = append(result, fmt.Sprintf("--%sprogress", prefix))
-	}
-
-	if ginkgo.ParallelNode != 0 {
-		result = append(result, fmt.Sprintf("--%sparallel.node=%d", prefix, ginkgo.ParallelNode))
-	}
-
-	if ginkgo.ParallelTotal != 0 {
-		result = append(result, fmt.Sprintf("--%sparallel.total=%d", prefix, ginkgo.ParallelTotal))
-	}
-
-	if ginkgo.StreamHost != "" {
-		result = append(result, fmt.Sprintf("--%sparallel.streamhost=%s", prefix, ginkgo.StreamHost))
-	}
-
-	if ginkgo.SyncHost != "" {
-		result = append(result, fmt.Sprintf("--%sparallel.synchost=%s", prefix, ginkgo.SyncHost))
-	}
-
-	if ginkgo.RegexScansFilePath {
-		result = append(result, fmt.Sprintf("--%sregexScansFilePath", prefix))
-	}
-
-	if reporter.NoColor {
-		result = append(result, fmt.Sprintf("--%snoColor", prefix))
-	}
-
-	if reporter.SlowSpecThreshold > 0 {
-		result = append(result, fmt.Sprintf("--%sslowSpecThreshold=%.5f", prefix, reporter.SlowSpecThreshold))
-	}
-
-	if !reporter.NoisyPendings {
-		result = append(result, fmt.Sprintf("--%snoisyPendings=false", prefix))
-	}
-
-	if reporter.Verbose {
-		result = append(result, fmt.Sprintf("--%sv", prefix))
-	}
-
-	if reporter.Succinct {
-		result = append(result, fmt.Sprintf("--%ssuccinct", prefix))
-	}
-
-	if reporter.FullTrace {
-		result = append(result, fmt.Sprintf("--%strace", prefix))
-	}
-
-	return result
-}
diff --git a/vendor/github.com/onsi/ginkgo/ginkgo_dsl.go b/vendor/github.com/onsi/ginkgo/ginkgo_dsl.go
deleted file mode 100644
index de6757c9f6..0000000000
--- a/vendor/github.com/onsi/ginkgo/ginkgo_dsl.go
+++ /dev/null
@@ -1,569 +0,0 @@
-/*
-Ginkgo is a BDD-style testing framework for Golang
-
-The godoc documentation describes Ginkgo's API.  More comprehensive documentation (with examples!) is available at http://onsi.github.io/ginkgo/
-
-Ginkgo's preferred matcher library is [Gomega](http://github.com/onsi/gomega)
-
-Ginkgo on Github: http://github.com/onsi/ginkgo
-
-Ginkgo is MIT-Licensed
-*/
-package ginkgo
-
-import (
-	"flag"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/internal/codelocation"
-	"github.com/onsi/ginkgo/internal/failer"
-	"github.com/onsi/ginkgo/internal/remote"
-	"github.com/onsi/ginkgo/internal/suite"
-	"github.com/onsi/ginkgo/internal/testingtproxy"
-	"github.com/onsi/ginkgo/internal/writer"
-	"github.com/onsi/ginkgo/reporters"
-	"github.com/onsi/ginkgo/reporters/stenographer"
-	"github.com/onsi/ginkgo/types"
-)
-
-const GINKGO_VERSION = config.VERSION
-const GINKGO_PANIC = `
-Your test failed.
-Ginkgo panics to prevent subsequent assertions from running.
-Normally Ginkgo rescues this panic so you shouldn't see it.
-
-But, if you make an assertion in a goroutine, Ginkgo can't capture the panic.
-To circumvent this, you should call
-
-	defer GinkgoRecover()
-
-at the top of the goroutine that caused this panic.
-`
-const defaultTimeout = 1
-
-var globalSuite *suite.Suite
-var globalFailer *failer.Failer
-
-func init() {
-	config.Flags(flag.CommandLine, "ginkgo", true)
-	GinkgoWriter = writer.New(os.Stdout)
-	globalFailer = failer.New()
-	globalSuite = suite.New(globalFailer)
-}
-
-//GinkgoWriter implements an io.Writer
-//When running in verbose mode any writes to GinkgoWriter will be immediately printed
-//to stdout.  Otherwise, GinkgoWriter will buffer any writes produced during the current test and flush them to screen
-//only if the current test fails.
-var GinkgoWriter io.Writer
-
-//The interface by which Ginkgo receives *testing.T
-type GinkgoTestingT interface {
-	Fail()
-}
-
-//GinkgoRandomSeed returns the seed used to randomize spec execution order.  It is
-//useful for seeding your own pseudorandom number generators (PRNGs) to ensure
-//consistent executions from run to run, where your tests contain variability (for
-//example, when selecting random test data).
-func GinkgoRandomSeed() int64 {
-	return config.GinkgoConfig.RandomSeed
-}
-
-//GinkgoParallelNode returns the parallel node number for the current ginkgo process
-//The node number is 1-indexed
-func GinkgoParallelNode() int {
-	return config.GinkgoConfig.ParallelNode
-}
-
-//Some matcher libraries or legacy codebases require a *testing.T
-//GinkgoT implements an interface analogous to *testing.T and can be used if
-//the library in question accepts *testing.T through an interface
-//
-// For example, with testify:
-// assert.Equal(GinkgoT(), 123, 123, "they should be equal")
-//
-// Or with gomock:
-// gomock.NewController(GinkgoT())
-//
-// GinkgoT() takes an optional offset argument that can be used to get the
-// correct line number associated with the failure.
-func GinkgoT(optionalOffset ...int) GinkgoTInterface {
-	offset := 3
-	if len(optionalOffset) > 0 {
-		offset = optionalOffset[0]
-	}
-	return testingtproxy.New(GinkgoWriter, Fail, offset)
-}
-
-//The interface returned by GinkgoT().  This covers most of the methods
-//in the testing package's T.
-type GinkgoTInterface interface {
-	Fail()
-	Error(args ...interface{})
-	Errorf(format string, args ...interface{})
-	FailNow()
-	Fatal(args ...interface{})
-	Fatalf(format string, args ...interface{})
-	Log(args ...interface{})
-	Logf(format string, args ...interface{})
-	Failed() bool
-	Parallel()
-	Skip(args ...interface{})
-	Skipf(format string, args ...interface{})
-	SkipNow()
-	Skipped() bool
-}
-
-//Custom Ginkgo test reporters must implement the Reporter interface.
-//
-//The custom reporter is passed in a SuiteSummary when the suite begins and ends,
-//and a SpecSummary just before a spec begins and just after a spec ends
-type Reporter reporters.Reporter
-
-//Asynchronous specs are given a channel of the Done type.  You must close or write to the channel
-//to tell Ginkgo that your async test is done.
-type Done chan<- interface{}
-
-//GinkgoTestDescription represents the information about the current running test returned by CurrentGinkgoTestDescription
-//	FullTestText: a concatenation of ComponentTexts and the TestText
-//	ComponentTexts: a list of all texts for the Describes & Contexts leading up to the current test
-//	TestText: the text in the actual It or Measure node
-//	IsMeasurement: true if the current test is a measurement
-//	FileName: the name of the file containing the current test
-//	LineNumber: the line number for the current test
-//	Failed: if the current test has failed, this will be true (useful in an AfterEach)
-type GinkgoTestDescription struct {
-	FullTestText   string
-	ComponentTexts []string
-	TestText       string
-
-	IsMeasurement bool
-
-	FileName   string
-	LineNumber int
-
-	Failed bool
-}
-
-//CurrentGinkgoTestDescripton returns information about the current running test.
-func CurrentGinkgoTestDescription() GinkgoTestDescription {
-	summary, ok := globalSuite.CurrentRunningSpecSummary()
-	if !ok {
-		return GinkgoTestDescription{}
-	}
-
-	subjectCodeLocation := summary.ComponentCodeLocations[len(summary.ComponentCodeLocations)-1]
-
-	return GinkgoTestDescription{
-		ComponentTexts: summary.ComponentTexts[1:],
-		FullTestText:   strings.Join(summary.ComponentTexts[1:], " "),
-		TestText:       summary.ComponentTexts[len(summary.ComponentTexts)-1],
-		IsMeasurement:  summary.IsMeasurement,
-		FileName:       subjectCodeLocation.FileName,
-		LineNumber:     subjectCodeLocation.LineNumber,
-		Failed:         summary.HasFailureState(),
-	}
-}
-
-//Measurement tests receive a Benchmarker.
-//
-//You use the Time() function to time how long the passed in body function takes to run
-//You use the RecordValue() function to track arbitrary numerical measurements.
-//The RecordValueWithPrecision() function can be used alternatively to provide the unit
-//and resolution of the numeric measurement.
-//The optional info argument is passed to the test reporter and can be used to
-// provide the measurement data to a custom reporter with context.
-//
-//See http://onsi.github.io/ginkgo/#benchmark_tests for more details
-type Benchmarker interface {
-	Time(name string, body func(), info ...interface{}) (elapsedTime time.Duration)
-	RecordValue(name string, value float64, info ...interface{})
-	RecordValueWithPrecision(name string, value float64, units string, precision int, info ...interface{})
-}
-
-//RunSpecs is the entry point for the Ginkgo test runner.
-//You must call this within a Golang testing TestX(t *testing.T) function.
-//
-//To bootstrap a test suite you can use the Ginkgo CLI:
-//
-//	ginkgo bootstrap
-func RunSpecs(t GinkgoTestingT, description string) bool {
-	specReporters := []Reporter{buildDefaultReporter()}
-	return RunSpecsWithCustomReporters(t, description, specReporters)
-}
-
-//To run your tests with Ginkgo's default reporter and your custom reporter(s), replace
-//RunSpecs() with this method.
-func RunSpecsWithDefaultAndCustomReporters(t GinkgoTestingT, description string, specReporters []Reporter) bool {
-	specReporters = append(specReporters, buildDefaultReporter())
-	return RunSpecsWithCustomReporters(t, description, specReporters)
-}
-
-//To run your tests with your custom reporter(s) (and *not* Ginkgo's default reporter), replace
-//RunSpecs() with this method.  Note that parallel tests will not work correctly without the default reporter
-func RunSpecsWithCustomReporters(t GinkgoTestingT, description string, specReporters []Reporter) bool {
-	writer := GinkgoWriter.(*writer.Writer)
-	writer.SetStream(config.DefaultReporterConfig.Verbose)
-	reporters := make([]reporters.Reporter, len(specReporters))
-	for i, reporter := range specReporters {
-		reporters[i] = reporter
-	}
-	passed, hasFocusedTests := globalSuite.Run(t, description, reporters, writer, config.GinkgoConfig)
-	if passed && hasFocusedTests {
-		fmt.Println("PASS | FOCUSED")
-		os.Exit(types.GINKGO_FOCUS_EXIT_CODE)
-	}
-	return passed
-}
-
-func buildDefaultReporter() Reporter {
-	remoteReportingServer := config.GinkgoConfig.StreamHost
-	if remoteReportingServer == "" {
-		stenographer := stenographer.New(!config.DefaultReporterConfig.NoColor, config.GinkgoConfig.FlakeAttempts > 1)
-		return reporters.NewDefaultReporter(config.DefaultReporterConfig, stenographer)
-	} else {
-		return remote.NewForwardingReporter(remoteReportingServer, &http.Client{}, remote.NewOutputInterceptor())
-	}
-}
-
-//Skip notifies Ginkgo that the current spec should be skipped.
-func Skip(message string, callerSkip ...int) {
-	skip := 0
-	if len(callerSkip) > 0 {
-		skip = callerSkip[0]
-	}
-
-	globalFailer.Skip(message, codelocation.New(skip+1))
-	panic(GINKGO_PANIC)
-}
-
-//Fail notifies Ginkgo that the current spec has failed. (Gomega will call Fail for you automatically when an assertion fails.)
-func Fail(message string, callerSkip ...int) {
-	skip := 0
-	if len(callerSkip) > 0 {
-		skip = callerSkip[0]
-	}
-
-	globalFailer.Fail(message, codelocation.New(skip+1))
-	panic(GINKGO_PANIC)
-}
-
-//GinkgoRecover should be deferred at the top of any spawned goroutine that (may) call `Fail`
-//Since Gomega assertions call fail, you should throw a `defer GinkgoRecover()` at the top of any goroutine that
-//calls out to Gomega
-//
-//Here's why: Ginkgo's `Fail` method records the failure and then panics to prevent
-//further assertions from running.  This panic must be recovered.  Ginkgo does this for you
-//if the panic originates in a Ginkgo node (an It, BeforeEach, etc...)
-//
-//Unfortunately, if a panic originates on a goroutine *launched* from one of these nodes there's no
-//way for Ginkgo to rescue the panic.  To do this, you must remember to `defer GinkgoRecover()` at the top of such a goroutine.
-func GinkgoRecover() {
-	e := recover()
-	if e != nil {
-		globalFailer.Panic(codelocation.New(1), e)
-	}
-}
-
-//Describe blocks allow you to organize your specs.  A Describe block can contain any number of
-//BeforeEach, AfterEach, JustBeforeEach, It, and Measurement blocks.
-//
-//In addition you can nest Describe and Context blocks.  Describe and Context blocks are functionally
-//equivalent.  The difference is purely semantic -- you typical Describe the behavior of an object
-//or method and, within that Describe, outline a number of Contexts.
-func Describe(text string, body func()) bool {
-	globalSuite.PushContainerNode(text, body, types.FlagTypeNone, codelocation.New(1))
-	return true
-}
-
-//You can focus the tests within a describe block using FDescribe
-func FDescribe(text string, body func()) bool {
-	globalSuite.PushContainerNode(text, body, types.FlagTypeFocused, codelocation.New(1))
-	return true
-}
-
-//You can mark the tests within a describe block as pending using PDescribe
-func PDescribe(text string, body func()) bool {
-	globalSuite.PushContainerNode(text, body, types.FlagTypePending, codelocation.New(1))
-	return true
-}
-
-//You can mark the tests within a describe block as pending using XDescribe
-func XDescribe(text string, body func()) bool {
-	globalSuite.PushContainerNode(text, body, types.FlagTypePending, codelocation.New(1))
-	return true
-}
-
-//Context blocks allow you to organize your specs.  A Context block can contain any number of
-//BeforeEach, AfterEach, JustBeforeEach, It, and Measurement blocks.
-//
-//In addition you can nest Describe and Context blocks.  Describe and Context blocks are functionally
-//equivalent.  The difference is purely semantic -- you typical Describe the behavior of an object
-//or method and, within that Describe, outline a number of Contexts.
-func Context(text string, body func()) bool {
-	globalSuite.PushContainerNode(text, body, types.FlagTypeNone, codelocation.New(1))
-	return true
-}
-
-//You can focus the tests within a describe block using FContext
-func FContext(text string, body func()) bool {
-	globalSuite.PushContainerNode(text, body, types.FlagTypeFocused, codelocation.New(1))
-	return true
-}
-
-//You can mark the tests within a describe block as pending using PContext
-func PContext(text string, body func()) bool {
-	globalSuite.PushContainerNode(text, body, types.FlagTypePending, codelocation.New(1))
-	return true
-}
-
-//You can mark the tests within a describe block as pending using XContext
-func XContext(text string, body func()) bool {
-	globalSuite.PushContainerNode(text, body, types.FlagTypePending, codelocation.New(1))
-	return true
-}
-
-//It blocks contain your test code and assertions.  You cannot nest any other Ginkgo blocks
-//within an It block.
-//
-//Ginkgo will normally run It blocks synchronously.  To perform asynchronous tests, pass a
-//function that accepts a Done channel.  When you do this, you can also provide an optional timeout.
-func It(text string, body interface{}, timeout ...float64) bool {
-	globalSuite.PushItNode(text, body, types.FlagTypeNone, codelocation.New(1), parseTimeout(timeout...))
-	return true
-}
-
-//You can focus individual Its using FIt
-func FIt(text string, body interface{}, timeout ...float64) bool {
-	globalSuite.PushItNode(text, body, types.FlagTypeFocused, codelocation.New(1), parseTimeout(timeout...))
-	return true
-}
-
-//You can mark Its as pending using PIt
-func PIt(text string, _ ...interface{}) bool {
-	globalSuite.PushItNode(text, func() {}, types.FlagTypePending, codelocation.New(1), 0)
-	return true
-}
-
-//You can mark Its as pending using XIt
-func XIt(text string, _ ...interface{}) bool {
-	globalSuite.PushItNode(text, func() {}, types.FlagTypePending, codelocation.New(1), 0)
-	return true
-}
-
-//Specify blocks are aliases for It blocks and allow for more natural wording in situations
-//which "It" does not fit into a natural sentence flow. All the same protocols apply for Specify blocks
-//which apply to It blocks.
-func Specify(text string, body interface{}, timeout ...float64) bool {
-	return It(text, body, timeout...)
-}
-
-//You can focus individual Specifys using FSpecify
-func FSpecify(text string, body interface{}, timeout ...float64) bool {
-	return FIt(text, body, timeout...)
-}
-
-//You can mark Specifys as pending using PSpecify
-func PSpecify(text string, is ...interface{}) bool {
-	return PIt(text, is...)
-}
-
-//You can mark Specifys as pending using XSpecify
-func XSpecify(text string, is ...interface{}) bool {
-	return XIt(text, is...)
-}
-
-//By allows you to better document large Its.
-//
-//Generally you should try to keep your Its short and to the point.  This is not always possible, however,
-//especially in the context of integration tests that capture a particular workflow.
-//
-//By allows you to document such flows.  By must be called within a runnable node (It, BeforeEach, Measure, etc...)
-//By will simply log the passed in text to the GinkgoWriter.  If By is handed a function it will immediately run the function.
-func By(text string, callbacks ...func()) {
-	preamble := "\x1b[1mSTEP\x1b[0m"
-	if config.DefaultReporterConfig.NoColor {
-		preamble = "STEP"
-	}
-	fmt.Fprintln(GinkgoWriter, preamble+": "+text)
-	if len(callbacks) == 1 {
-		callbacks[0]()
-	}
-	if len(callbacks) > 1 {
-		panic("just one callback per By, please")
-	}
-}
-
-//Measure blocks run the passed in body function repeatedly (determined by the samples argument)
-//and accumulate metrics provided to the Benchmarker by the body function.
-//
-//The body function must have the signature:
-//	func(b Benchmarker)
-func Measure(text string, body interface{}, samples int) bool {
-	globalSuite.PushMeasureNode(text, body, types.FlagTypeNone, codelocation.New(1), samples)
-	return true
-}
-
-//You can focus individual Measures using FMeasure
-func FMeasure(text string, body interface{}, samples int) bool {
-	globalSuite.PushMeasureNode(text, body, types.FlagTypeFocused, codelocation.New(1), samples)
-	return true
-}
-
-//You can mark Maeasurements as pending using PMeasure
-func PMeasure(text string, _ ...interface{}) bool {
-	globalSuite.PushMeasureNode(text, func(b Benchmarker) {}, types.FlagTypePending, codelocation.New(1), 0)
-	return true
-}
-
-//You can mark Maeasurements as pending using XMeasure
-func XMeasure(text string, _ ...interface{}) bool {
-	globalSuite.PushMeasureNode(text, func(b Benchmarker) {}, types.FlagTypePending, codelocation.New(1), 0)
-	return true
-}
-
-//BeforeSuite blocks are run just once before any specs are run.  When running in parallel, each
-//parallel node process will call BeforeSuite.
-//
-//BeforeSuite blocks can be made asynchronous by providing a body function that accepts a Done channel
-//
-//You may only register *one* BeforeSuite handler per test suite.  You typically do so in your bootstrap file at the top level.
-func BeforeSuite(body interface{}, timeout ...float64) bool {
-	globalSuite.SetBeforeSuiteNode(body, codelocation.New(1), parseTimeout(timeout...))
-	return true
-}
-
-//AfterSuite blocks are *always* run after all the specs regardless of whether specs have passed or failed.
-//Moreover, if Ginkgo receives an interrupt signal (^C) it will attempt to run the AfterSuite before exiting.
-//
-//When running in parallel, each parallel node process will call AfterSuite.
-//
-//AfterSuite blocks can be made asynchronous by providing a body function that accepts a Done channel
-//
-//You may only register *one* AfterSuite handler per test suite.  You typically do so in your bootstrap file at the top level.
-func AfterSuite(body interface{}, timeout ...float64) bool {
-	globalSuite.SetAfterSuiteNode(body, codelocation.New(1), parseTimeout(timeout...))
-	return true
-}
-
-//SynchronizedBeforeSuite blocks are primarily meant to solve the problem of setting up singleton external resources shared across
-//nodes when running tests in parallel.  For example, say you have a shared database that you can only start one instance of that
-//must be used in your tests.  When running in parallel, only one node should set up the database and all other nodes should wait
-//until that node is done before running.
-//
-//SynchronizedBeforeSuite accomplishes this by taking *two* function arguments.  The first is only run on parallel node #1.  The second is
-//run on all nodes, but *only* after the first function completes succesfully.  Ginkgo also makes it possible to send data from the first function (on Node 1)
-//to the second function (on all the other nodes).
-//
-//The functions have the following signatures.  The first function (which only runs on node 1) has the signature:
-//
-//	func() []byte
-//
-//or, to run asynchronously:
-//
-//	func(done Done) []byte
-//
-//The byte array returned by the first function is then passed to the second function, which has the signature:
-//
-//	func(data []byte)
-//
-//or, to run asynchronously:
-//
-//	func(data []byte, done Done)
-//
-//Here's a simple pseudo-code example that starts a shared database on Node 1 and shares the database's address with the other nodes:
-//
-//	var dbClient db.Client
-//	var dbRunner db.Runner
-//
-//	var _ = SynchronizedBeforeSuite(func() []byte {
-//		dbRunner = db.NewRunner()
-//		err := dbRunner.Start()
-//		Ω(err).ShouldNot(HaveOccurred())
-//		return []byte(dbRunner.URL)
-//	}, func(data []byte) {
-//		dbClient = db.NewClient()
-//		err := dbClient.Connect(string(data))
-//		Ω(err).ShouldNot(HaveOccurred())
-//	})
-func SynchronizedBeforeSuite(node1Body interface{}, allNodesBody interface{}, timeout ...float64) bool {
-	globalSuite.SetSynchronizedBeforeSuiteNode(
-		node1Body,
-		allNodesBody,
-		codelocation.New(1),
-		parseTimeout(timeout...),
-	)
-	return true
-}
-
-//SynchronizedAfterSuite blocks complement the SynchronizedBeforeSuite blocks in solving the problem of setting up
-//external singleton resources shared across nodes when running tests in parallel.
-//
-//SynchronizedAfterSuite accomplishes this by taking *two* function arguments.  The first runs on all nodes.  The second runs only on parallel node #1
-//and *only* after all other nodes have finished and exited.  This ensures that node 1, and any resources it is running, remain alive until
-//all other nodes are finished.
-//
-//Both functions have the same signature: either func() or func(done Done) to run asynchronously.
-//
-//Here's a pseudo-code example that complements that given in SynchronizedBeforeSuite.  Here, SynchronizedAfterSuite is used to tear down the shared database
-//only after all nodes have finished:
-//
-//	var _ = SynchronizedAfterSuite(func() {
-//		dbClient.Cleanup()
-//	}, func() {
-//		dbRunner.Stop()
-//	})
-func SynchronizedAfterSuite(allNodesBody interface{}, node1Body interface{}, timeout ...float64) bool {
-	globalSuite.SetSynchronizedAfterSuiteNode(
-		allNodesBody,
-		node1Body,
-		codelocation.New(1),
-		parseTimeout(timeout...),
-	)
-	return true
-}
-
-//BeforeEach blocks are run before It blocks.  When multiple BeforeEach blocks are defined in nested
-//Describe and Context blocks the outermost BeforeEach blocks are run first.
-//
-//Like It blocks, BeforeEach blocks can be made asynchronous by providing a body function that accepts
-//a Done channel
-func BeforeEach(body interface{}, timeout ...float64) bool {
-	globalSuite.PushBeforeEachNode(body, codelocation.New(1), parseTimeout(timeout...))
-	return true
-}
-
-//JustBeforeEach blocks are run before It blocks but *after* all BeforeEach blocks.  For more details,
-//read the [documentation](http://onsi.github.io/ginkgo/#separating_creation_and_configuration_)
-//
-//Like It blocks, BeforeEach blocks can be made asynchronous by providing a body function that accepts
-//a Done channel
-func JustBeforeEach(body interface{}, timeout ...float64) bool {
-	globalSuite.PushJustBeforeEachNode(body, codelocation.New(1), parseTimeout(timeout...))
-	return true
-}
-
-//AfterEach blocks are run after It blocks.   When multiple AfterEach blocks are defined in nested
-//Describe and Context blocks the innermost AfterEach blocks are run first.
-//
-//Like It blocks, AfterEach blocks can be made asynchronous by providing a body function that accepts
-//a Done channel
-func AfterEach(body interface{}, timeout ...float64) bool {
-	globalSuite.PushAfterEachNode(body, codelocation.New(1), parseTimeout(timeout...))
-	return true
-}
-
-func parseTimeout(timeout ...float64) time.Duration {
-	if len(timeout) == 0 {
-		return time.Duration(defaultTimeout * int64(time.Second))
-	} else {
-		return time.Duration(timeout[0] * float64(time.Second))
-	}
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/codelocation/code_location.go b/vendor/github.com/onsi/ginkgo/internal/codelocation/code_location.go
deleted file mode 100644
index fa2f0bf730..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/codelocation/code_location.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package codelocation
-
-import (
-	"regexp"
-	"runtime"
-	"runtime/debug"
-	"strings"
-
-	"github.com/onsi/ginkgo/types"
-)
-
-func New(skip int) types.CodeLocation {
-	_, file, line, _ := runtime.Caller(skip + 1)
-	stackTrace := PruneStack(string(debug.Stack()), skip)
-	return types.CodeLocation{FileName: file, LineNumber: line, FullStackTrace: stackTrace}
-}
-
-func PruneStack(fullStackTrace string, skip int) string {
-	stack := strings.Split(fullStackTrace, "\n")
-	if len(stack) > 2*(skip+1) {
-		stack = stack[2*(skip+1):]
-	}
-	prunedStack := []string{}
-	re := regexp.MustCompile(`\/ginkgo\/|\/pkg\/testing\/|\/pkg\/runtime\/`)
-	for i := 0; i < len(stack)/2; i++ {
-		if !re.Match([]byte(stack[i*2])) {
-			prunedStack = append(prunedStack, stack[i*2])
-			prunedStack = append(prunedStack, stack[i*2+1])
-		}
-	}
-	return strings.Join(prunedStack, "\n")
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/containernode/container_node.go b/vendor/github.com/onsi/ginkgo/internal/containernode/container_node.go
deleted file mode 100644
index 0737746dcf..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/containernode/container_node.go
+++ /dev/null
@@ -1,151 +0,0 @@
-package containernode
-
-import (
-	"math/rand"
-	"sort"
-
-	"github.com/onsi/ginkgo/internal/leafnodes"
-	"github.com/onsi/ginkgo/types"
-)
-
-type subjectOrContainerNode struct {
-	containerNode *ContainerNode
-	subjectNode   leafnodes.SubjectNode
-}
-
-func (n subjectOrContainerNode) text() string {
-	if n.containerNode != nil {
-		return n.containerNode.Text()
-	} else {
-		return n.subjectNode.Text()
-	}
-}
-
-type CollatedNodes struct {
-	Containers []*ContainerNode
-	Subject    leafnodes.SubjectNode
-}
-
-type ContainerNode struct {
-	text         string
-	flag         types.FlagType
-	codeLocation types.CodeLocation
-
-	setupNodes               []leafnodes.BasicNode
-	subjectAndContainerNodes []subjectOrContainerNode
-}
-
-func New(text string, flag types.FlagType, codeLocation types.CodeLocation) *ContainerNode {
-	return &ContainerNode{
-		text:         text,
-		flag:         flag,
-		codeLocation: codeLocation,
-	}
-}
-
-func (container *ContainerNode) Shuffle(r *rand.Rand) {
-	sort.Sort(container)
-	permutation := r.Perm(len(container.subjectAndContainerNodes))
-	shuffledNodes := make([]subjectOrContainerNode, len(container.subjectAndContainerNodes))
-	for i, j := range permutation {
-		shuffledNodes[i] = container.subjectAndContainerNodes[j]
-	}
-	container.subjectAndContainerNodes = shuffledNodes
-}
-
-func (node *ContainerNode) BackPropagateProgrammaticFocus() bool {
-	if node.flag == types.FlagTypePending {
-		return false
-	}
-
-	shouldUnfocus := false
-	for _, subjectOrContainerNode := range node.subjectAndContainerNodes {
-		if subjectOrContainerNode.containerNode != nil {
-			shouldUnfocus = subjectOrContainerNode.containerNode.BackPropagateProgrammaticFocus() || shouldUnfocus
-		} else {
-			shouldUnfocus = (subjectOrContainerNode.subjectNode.Flag() == types.FlagTypeFocused) || shouldUnfocus
-		}
-	}
-
-	if shouldUnfocus {
-		if node.flag == types.FlagTypeFocused {
-			node.flag = types.FlagTypeNone
-		}
-		return true
-	}
-
-	return node.flag == types.FlagTypeFocused
-}
-
-func (node *ContainerNode) Collate() []CollatedNodes {
-	return node.collate([]*ContainerNode{})
-}
-
-func (node *ContainerNode) collate(enclosingContainers []*ContainerNode) []CollatedNodes {
-	collated := make([]CollatedNodes, 0)
-
-	containers := make([]*ContainerNode, len(enclosingContainers))
-	copy(containers, enclosingContainers)
-	containers = append(containers, node)
-
-	for _, subjectOrContainer := range node.subjectAndContainerNodes {
-		if subjectOrContainer.containerNode != nil {
-			collated = append(collated, subjectOrContainer.containerNode.collate(containers)...)
-		} else {
-			collated = append(collated, CollatedNodes{
-				Containers: containers,
-				Subject:    subjectOrContainer.subjectNode,
-			})
-		}
-	}
-
-	return collated
-}
-
-func (node *ContainerNode) PushContainerNode(container *ContainerNode) {
-	node.subjectAndContainerNodes = append(node.subjectAndContainerNodes, subjectOrContainerNode{containerNode: container})
-}
-
-func (node *ContainerNode) PushSubjectNode(subject leafnodes.SubjectNode) {
-	node.subjectAndContainerNodes = append(node.subjectAndContainerNodes, subjectOrContainerNode{subjectNode: subject})
-}
-
-func (node *ContainerNode) PushSetupNode(setupNode leafnodes.BasicNode) {
-	node.setupNodes = append(node.setupNodes, setupNode)
-}
-
-func (node *ContainerNode) SetupNodesOfType(nodeType types.SpecComponentType) []leafnodes.BasicNode {
-	nodes := []leafnodes.BasicNode{}
-	for _, setupNode := range node.setupNodes {
-		if setupNode.Type() == nodeType {
-			nodes = append(nodes, setupNode)
-		}
-	}
-	return nodes
-}
-
-func (node *ContainerNode) Text() string {
-	return node.text
-}
-
-func (node *ContainerNode) CodeLocation() types.CodeLocation {
-	return node.codeLocation
-}
-
-func (node *ContainerNode) Flag() types.FlagType {
-	return node.flag
-}
-
-//sort.Interface
-
-func (node *ContainerNode) Len() int {
-	return len(node.subjectAndContainerNodes)
-}
-
-func (node *ContainerNode) Less(i, j int) bool {
-	return node.subjectAndContainerNodes[i].text() < node.subjectAndContainerNodes[j].text()
-}
-
-func (node *ContainerNode) Swap(i, j int) {
-	node.subjectAndContainerNodes[i], node.subjectAndContainerNodes[j] = node.subjectAndContainerNodes[j], node.subjectAndContainerNodes[i]
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/failer/failer.go b/vendor/github.com/onsi/ginkgo/internal/failer/failer.go
deleted file mode 100644
index 678ea2514a..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/failer/failer.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package failer
-
-import (
-	"fmt"
-	"sync"
-
-	"github.com/onsi/ginkgo/types"
-)
-
-type Failer struct {
-	lock    *sync.Mutex
-	failure types.SpecFailure
-	state   types.SpecState
-}
-
-func New() *Failer {
-	return &Failer{
-		lock:  &sync.Mutex{},
-		state: types.SpecStatePassed,
-	}
-}
-
-func (f *Failer) Panic(location types.CodeLocation, forwardedPanic interface{}) {
-	f.lock.Lock()
-	defer f.lock.Unlock()
-
-	if f.state == types.SpecStatePassed {
-		f.state = types.SpecStatePanicked
-		f.failure = types.SpecFailure{
-			Message:        "Test Panicked",
-			Location:       location,
-			ForwardedPanic: fmt.Sprintf("%v", forwardedPanic),
-		}
-	}
-}
-
-func (f *Failer) Timeout(location types.CodeLocation) {
-	f.lock.Lock()
-	defer f.lock.Unlock()
-
-	if f.state == types.SpecStatePassed {
-		f.state = types.SpecStateTimedOut
-		f.failure = types.SpecFailure{
-			Message:  "Timed out",
-			Location: location,
-		}
-	}
-}
-
-func (f *Failer) Fail(message string, location types.CodeLocation) {
-	f.lock.Lock()
-	defer f.lock.Unlock()
-
-	if f.state == types.SpecStatePassed {
-		f.state = types.SpecStateFailed
-		f.failure = types.SpecFailure{
-			Message:  message,
-			Location: location,
-		}
-	}
-}
-
-func (f *Failer) Drain(componentType types.SpecComponentType, componentIndex int, componentCodeLocation types.CodeLocation) (types.SpecFailure, types.SpecState) {
-	f.lock.Lock()
-	defer f.lock.Unlock()
-
-	failure := f.failure
-	outcome := f.state
-	if outcome != types.SpecStatePassed {
-		failure.ComponentType = componentType
-		failure.ComponentIndex = componentIndex
-		failure.ComponentCodeLocation = componentCodeLocation
-	}
-
-	f.state = types.SpecStatePassed
-	f.failure = types.SpecFailure{}
-
-	return failure, outcome
-}
-
-func (f *Failer) Skip(message string, location types.CodeLocation) {
-	f.lock.Lock()
-	defer f.lock.Unlock()
-
-	if f.state == types.SpecStatePassed {
-		f.state = types.SpecStateSkipped
-		f.failure = types.SpecFailure{
-			Message:  message,
-			Location: location,
-		}
-	}
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/leafnodes/benchmarker.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/benchmarker.go
deleted file mode 100644
index 9c3eed2b6f..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/leafnodes/benchmarker.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package leafnodes
-
-import (
-	"math"
-	"time"
-
-	"sync"
-
-	"github.com/onsi/ginkgo/types"
-)
-
-type benchmarker struct {
-	mu           sync.Mutex
-	measurements map[string]*types.SpecMeasurement
-	orderCounter int
-}
-
-func newBenchmarker() *benchmarker {
-	return &benchmarker{
-		measurements: make(map[string]*types.SpecMeasurement, 0),
-	}
-}
-
-func (b *benchmarker) Time(name string, body func(), info ...interface{}) (elapsedTime time.Duration) {
-	t := time.Now()
-	body()
-	elapsedTime = time.Since(t)
-
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	measurement := b.getMeasurement(name, "Fastest Time", "Slowest Time", "Average Time", "s", 3, info...)
-	measurement.Results = append(measurement.Results, elapsedTime.Seconds())
-
-	return
-}
-
-func (b *benchmarker) RecordValue(name string, value float64, info ...interface{}) {
-	measurement := b.getMeasurement(name, "Smallest", " Largest", " Average", "", 3, info...)
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	measurement.Results = append(measurement.Results, value)
-}
-
-func (b *benchmarker) RecordValueWithPrecision(name string, value float64, units string, precision int, info ...interface{}) {
-	measurement := b.getMeasurement(name, "Smallest", " Largest", " Average", units, precision, info...)
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	measurement.Results = append(measurement.Results, value)
-}
-
-func (b *benchmarker) getMeasurement(name string, smallestLabel string, largestLabel string, averageLabel string, units string, precision int, info ...interface{}) *types.SpecMeasurement {
-	measurement, ok := b.measurements[name]
-	if !ok {
-		var computedInfo interface{}
-		computedInfo = nil
-		if len(info) > 0 {
-			computedInfo = info[0]
-		}
-		measurement = &types.SpecMeasurement{
-			Name:          name,
-			Info:          computedInfo,
-			Order:         b.orderCounter,
-			SmallestLabel: smallestLabel,
-			LargestLabel:  largestLabel,
-			AverageLabel:  averageLabel,
-			Units:         units,
-			Precision:     precision,
-			Results:       make([]float64, 0),
-		}
-		b.measurements[name] = measurement
-		b.orderCounter++
-	}
-
-	return measurement
-}
-
-func (b *benchmarker) measurementsReport() map[string]*types.SpecMeasurement {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	for _, measurement := range b.measurements {
-		measurement.Smallest = math.MaxFloat64
-		measurement.Largest = -math.MaxFloat64
-		sum := float64(0)
-		sumOfSquares := float64(0)
-
-		for _, result := range measurement.Results {
-			if result > measurement.Largest {
-				measurement.Largest = result
-			}
-			if result < measurement.Smallest {
-				measurement.Smallest = result
-			}
-			sum += result
-			sumOfSquares += result * result
-		}
-
-		n := float64(len(measurement.Results))
-		measurement.Average = sum / n
-		measurement.StdDeviation = math.Sqrt(sumOfSquares/n - (sum/n)*(sum/n))
-	}
-
-	return b.measurements
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/leafnodes/interfaces.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/interfaces.go
deleted file mode 100644
index 8c3902d601..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/leafnodes/interfaces.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package leafnodes
-
-import (
-	"github.com/onsi/ginkgo/types"
-)
-
-type BasicNode interface {
-	Type() types.SpecComponentType
-	Run() (types.SpecState, types.SpecFailure)
-	CodeLocation() types.CodeLocation
-}
-
-type SubjectNode interface {
-	BasicNode
-
-	Text() string
-	Flag() types.FlagType
-	Samples() int
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/leafnodes/it_node.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/it_node.go
deleted file mode 100644
index c76fe3a451..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/leafnodes/it_node.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package leafnodes
-
-import (
-	"github.com/onsi/ginkgo/internal/failer"
-	"github.com/onsi/ginkgo/types"
-	"time"
-)
-
-type ItNode struct {
-	runner *runner
-
-	flag types.FlagType
-	text string
-}
-
-func NewItNode(text string, body interface{}, flag types.FlagType, codeLocation types.CodeLocation, timeout time.Duration, failer *failer.Failer, componentIndex int) *ItNode {
-	return &ItNode{
-		runner: newRunner(body, codeLocation, timeout, failer, types.SpecComponentTypeIt, componentIndex),
-		flag:   flag,
-		text:   text,
-	}
-}
-
-func (node *ItNode) Run() (outcome types.SpecState, failure types.SpecFailure) {
-	return node.runner.run()
-}
-
-func (node *ItNode) Type() types.SpecComponentType {
-	return types.SpecComponentTypeIt
-}
-
-func (node *ItNode) Text() string {
-	return node.text
-}
-
-func (node *ItNode) Flag() types.FlagType {
-	return node.flag
-}
-
-func (node *ItNode) CodeLocation() types.CodeLocation {
-	return node.runner.codeLocation
-}
-
-func (node *ItNode) Samples() int {
-	return 1
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/leafnodes/measure_node.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/measure_node.go
deleted file mode 100644
index efc3348c1b..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/leafnodes/measure_node.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package leafnodes
-
-import (
-	"github.com/onsi/ginkgo/internal/failer"
-	"github.com/onsi/ginkgo/types"
-	"reflect"
-)
-
-type MeasureNode struct {
-	runner *runner
-
-	text        string
-	flag        types.FlagType
-	samples     int
-	benchmarker *benchmarker
-}
-
-func NewMeasureNode(text string, body interface{}, flag types.FlagType, codeLocation types.CodeLocation, samples int, failer *failer.Failer, componentIndex int) *MeasureNode {
-	benchmarker := newBenchmarker()
-
-	wrappedBody := func() {
-		reflect.ValueOf(body).Call([]reflect.Value{reflect.ValueOf(benchmarker)})
-	}
-
-	return &MeasureNode{
-		runner: newRunner(wrappedBody, codeLocation, 0, failer, types.SpecComponentTypeMeasure, componentIndex),
-
-		text:        text,
-		flag:        flag,
-		samples:     samples,
-		benchmarker: benchmarker,
-	}
-}
-
-func (node *MeasureNode) Run() (outcome types.SpecState, failure types.SpecFailure) {
-	return node.runner.run()
-}
-
-func (node *MeasureNode) MeasurementsReport() map[string]*types.SpecMeasurement {
-	return node.benchmarker.measurementsReport()
-}
-
-func (node *MeasureNode) Type() types.SpecComponentType {
-	return types.SpecComponentTypeMeasure
-}
-
-func (node *MeasureNode) Text() string {
-	return node.text
-}
-
-func (node *MeasureNode) Flag() types.FlagType {
-	return node.flag
-}
-
-func (node *MeasureNode) CodeLocation() types.CodeLocation {
-	return node.runner.codeLocation
-}
-
-func (node *MeasureNode) Samples() int {
-	return node.samples
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/leafnodes/runner.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/runner.go
deleted file mode 100644
index 870ad826da..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/leafnodes/runner.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package leafnodes
-
-import (
-	"fmt"
-	"github.com/onsi/ginkgo/internal/codelocation"
-	"github.com/onsi/ginkgo/internal/failer"
-	"github.com/onsi/ginkgo/types"
-	"reflect"
-	"time"
-)
-
-type runner struct {
-	isAsync          bool
-	asyncFunc        func(chan<- interface{})
-	syncFunc         func()
-	codeLocation     types.CodeLocation
-	timeoutThreshold time.Duration
-	nodeType         types.SpecComponentType
-	componentIndex   int
-	failer           *failer.Failer
-}
-
-func newRunner(body interface{}, codeLocation types.CodeLocation, timeout time.Duration, failer *failer.Failer, nodeType types.SpecComponentType, componentIndex int) *runner {
-	bodyType := reflect.TypeOf(body)
-	if bodyType.Kind() != reflect.Func {
-		panic(fmt.Sprintf("Expected a function but got something else at %v", codeLocation))
-	}
-
-	runner := &runner{
-		codeLocation:     codeLocation,
-		timeoutThreshold: timeout,
-		failer:           failer,
-		nodeType:         nodeType,
-		componentIndex:   componentIndex,
-	}
-
-	switch bodyType.NumIn() {
-	case 0:
-		runner.syncFunc = body.(func())
-		return runner
-	case 1:
-		if !(bodyType.In(0).Kind() == reflect.Chan && bodyType.In(0).Elem().Kind() == reflect.Interface) {
-			panic(fmt.Sprintf("Must pass a Done channel to function at %v", codeLocation))
-		}
-
-		wrappedBody := func(done chan<- interface{}) {
-			bodyValue := reflect.ValueOf(body)
-			bodyValue.Call([]reflect.Value{reflect.ValueOf(done)})
-		}
-
-		runner.isAsync = true
-		runner.asyncFunc = wrappedBody
-		return runner
-	}
-
-	panic(fmt.Sprintf("Too many arguments to function at %v", codeLocation))
-}
-
-func (r *runner) run() (outcome types.SpecState, failure types.SpecFailure) {
-	if r.isAsync {
-		return r.runAsync()
-	} else {
-		return r.runSync()
-	}
-}
-
-func (r *runner) runAsync() (outcome types.SpecState, failure types.SpecFailure) {
-	done := make(chan interface{}, 1)
-
-	go func() {
-		finished := false
-
-		defer func() {
-			if e := recover(); e != nil || !finished {
-				r.failer.Panic(codelocation.New(2), e)
-				select {
-				case <-done:
-					break
-				default:
-					close(done)
-				}
-			}
-		}()
-
-		r.asyncFunc(done)
-		finished = true
-	}()
-
-	select {
-	case <-done:
-	case <-time.After(r.timeoutThreshold):
-		r.failer.Timeout(r.codeLocation)
-	}
-
-	failure, outcome = r.failer.Drain(r.nodeType, r.componentIndex, r.codeLocation)
-	return
-}
-func (r *runner) runSync() (outcome types.SpecState, failure types.SpecFailure) {
-	finished := false
-
-	defer func() {
-		if e := recover(); e != nil || !finished {
-			r.failer.Panic(codelocation.New(2), e)
-		}
-
-		failure, outcome = r.failer.Drain(r.nodeType, r.componentIndex, r.codeLocation)
-	}()
-
-	r.syncFunc()
-	finished = true
-
-	return
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/leafnodes/setup_nodes.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/setup_nodes.go
deleted file mode 100644
index 6b725a6315..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/leafnodes/setup_nodes.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package leafnodes
-
-import (
-	"github.com/onsi/ginkgo/internal/failer"
-	"github.com/onsi/ginkgo/types"
-	"time"
-)
-
-type SetupNode struct {
-	runner *runner
-}
-
-func (node *SetupNode) Run() (outcome types.SpecState, failure types.SpecFailure) {
-	return node.runner.run()
-}
-
-func (node *SetupNode) Type() types.SpecComponentType {
-	return node.runner.nodeType
-}
-
-func (node *SetupNode) CodeLocation() types.CodeLocation {
-	return node.runner.codeLocation
-}
-
-func NewBeforeEachNode(body interface{}, codeLocation types.CodeLocation, timeout time.Duration, failer *failer.Failer, componentIndex int) *SetupNode {
-	return &SetupNode{
-		runner: newRunner(body, codeLocation, timeout, failer, types.SpecComponentTypeBeforeEach, componentIndex),
-	}
-}
-
-func NewAfterEachNode(body interface{}, codeLocation types.CodeLocation, timeout time.Duration, failer *failer.Failer, componentIndex int) *SetupNode {
-	return &SetupNode{
-		runner: newRunner(body, codeLocation, timeout, failer, types.SpecComponentTypeAfterEach, componentIndex),
-	}
-}
-
-func NewJustBeforeEachNode(body interface{}, codeLocation types.CodeLocation, timeout time.Duration, failer *failer.Failer, componentIndex int) *SetupNode {
-	return &SetupNode{
-		runner: newRunner(body, codeLocation, timeout, failer, types.SpecComponentTypeJustBeforeEach, componentIndex),
-	}
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/leafnodes/suite_nodes.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/suite_nodes.go
deleted file mode 100644
index 2ccc7dc0fb..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/leafnodes/suite_nodes.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package leafnodes
-
-import (
-	"github.com/onsi/ginkgo/internal/failer"
-	"github.com/onsi/ginkgo/types"
-	"time"
-)
-
-type SuiteNode interface {
-	Run(parallelNode int, parallelTotal int, syncHost string) bool
-	Passed() bool
-	Summary() *types.SetupSummary
-}
-
-type simpleSuiteNode struct {
-	runner  *runner
-	outcome types.SpecState
-	failure types.SpecFailure
-	runTime time.Duration
-}
-
-func (node *simpleSuiteNode) Run(parallelNode int, parallelTotal int, syncHost string) bool {
-	t := time.Now()
-	node.outcome, node.failure = node.runner.run()
-	node.runTime = time.Since(t)
-
-	return node.outcome == types.SpecStatePassed
-}
-
-func (node *simpleSuiteNode) Passed() bool {
-	return node.outcome == types.SpecStatePassed
-}
-
-func (node *simpleSuiteNode) Summary() *types.SetupSummary {
-	return &types.SetupSummary{
-		ComponentType: node.runner.nodeType,
-		CodeLocation:  node.runner.codeLocation,
-		State:         node.outcome,
-		RunTime:       node.runTime,
-		Failure:       node.failure,
-	}
-}
-
-func NewBeforeSuiteNode(body interface{}, codeLocation types.CodeLocation, timeout time.Duration, failer *failer.Failer) SuiteNode {
-	return &simpleSuiteNode{
-		runner: newRunner(body, codeLocation, timeout, failer, types.SpecComponentTypeBeforeSuite, 0),
-	}
-}
-
-func NewAfterSuiteNode(body interface{}, codeLocation types.CodeLocation, timeout time.Duration, failer *failer.Failer) SuiteNode {
-	return &simpleSuiteNode{
-		runner: newRunner(body, codeLocation, timeout, failer, types.SpecComponentTypeAfterSuite, 0),
-	}
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/leafnodes/synchronized_after_suite_node.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/synchronized_after_suite_node.go
deleted file mode 100644
index e7030d9149..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/leafnodes/synchronized_after_suite_node.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package leafnodes
-
-import (
-	"encoding/json"
-	"github.com/onsi/ginkgo/internal/failer"
-	"github.com/onsi/ginkgo/types"
-	"io/ioutil"
-	"net/http"
-	"time"
-)
-
-type synchronizedAfterSuiteNode struct {
-	runnerA *runner
-	runnerB *runner
-
-	outcome types.SpecState
-	failure types.SpecFailure
-	runTime time.Duration
-}
-
-func NewSynchronizedAfterSuiteNode(bodyA interface{}, bodyB interface{}, codeLocation types.CodeLocation, timeout time.Duration, failer *failer.Failer) SuiteNode {
-	return &synchronizedAfterSuiteNode{
-		runnerA: newRunner(bodyA, codeLocation, timeout, failer, types.SpecComponentTypeAfterSuite, 0),
-		runnerB: newRunner(bodyB, codeLocation, timeout, failer, types.SpecComponentTypeAfterSuite, 0),
-	}
-}
-
-func (node *synchronizedAfterSuiteNode) Run(parallelNode int, parallelTotal int, syncHost string) bool {
-	node.outcome, node.failure = node.runnerA.run()
-
-	if parallelNode == 1 {
-		if parallelTotal > 1 {
-			node.waitUntilOtherNodesAreDone(syncHost)
-		}
-
-		outcome, failure := node.runnerB.run()
-
-		if node.outcome == types.SpecStatePassed {
-			node.outcome, node.failure = outcome, failure
-		}
-	}
-
-	return node.outcome == types.SpecStatePassed
-}
-
-func (node *synchronizedAfterSuiteNode) Passed() bool {
-	return node.outcome == types.SpecStatePassed
-}
-
-func (node *synchronizedAfterSuiteNode) Summary() *types.SetupSummary {
-	return &types.SetupSummary{
-		ComponentType: node.runnerA.nodeType,
-		CodeLocation:  node.runnerA.codeLocation,
-		State:         node.outcome,
-		RunTime:       node.runTime,
-		Failure:       node.failure,
-	}
-}
-
-func (node *synchronizedAfterSuiteNode) waitUntilOtherNodesAreDone(syncHost string) {
-	for {
-		if node.canRun(syncHost) {
-			return
-		}
-
-		time.Sleep(50 * time.Millisecond)
-	}
-}
-
-func (node *synchronizedAfterSuiteNode) canRun(syncHost string) bool {
-	resp, err := http.Get(syncHost + "/RemoteAfterSuiteData")
-	if err != nil || resp.StatusCode != http.StatusOK {
-		return false
-	}
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return false
-	}
-	resp.Body.Close()
-
-	afterSuiteData := types.RemoteAfterSuiteData{}
-	err = json.Unmarshal(body, &afterSuiteData)
-	if err != nil {
-		return false
-	}
-
-	return afterSuiteData.CanRun
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/leafnodes/synchronized_before_suite_node.go b/vendor/github.com/onsi/ginkgo/internal/leafnodes/synchronized_before_suite_node.go
deleted file mode 100644
index 76a9679813..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/leafnodes/synchronized_before_suite_node.go
+++ /dev/null
@@ -1,182 +0,0 @@
-package leafnodes
-
-import (
-	"bytes"
-	"encoding/json"
-	"github.com/onsi/ginkgo/internal/failer"
-	"github.com/onsi/ginkgo/types"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"time"
-)
-
-type synchronizedBeforeSuiteNode struct {
-	runnerA *runner
-	runnerB *runner
-
-	data []byte
-
-	outcome types.SpecState
-	failure types.SpecFailure
-	runTime time.Duration
-}
-
-func NewSynchronizedBeforeSuiteNode(bodyA interface{}, bodyB interface{}, codeLocation types.CodeLocation, timeout time.Duration, failer *failer.Failer) SuiteNode {
-	node := &synchronizedBeforeSuiteNode{}
-
-	node.runnerA = newRunner(node.wrapA(bodyA), codeLocation, timeout, failer, types.SpecComponentTypeBeforeSuite, 0)
-	node.runnerB = newRunner(node.wrapB(bodyB), codeLocation, timeout, failer, types.SpecComponentTypeBeforeSuite, 0)
-
-	return node
-}
-
-func (node *synchronizedBeforeSuiteNode) Run(parallelNode int, parallelTotal int, syncHost string) bool {
-	t := time.Now()
-	defer func() {
-		node.runTime = time.Since(t)
-	}()
-
-	if parallelNode == 1 {
-		node.outcome, node.failure = node.runA(parallelTotal, syncHost)
-	} else {
-		node.outcome, node.failure = node.waitForA(syncHost)
-	}
-
-	if node.outcome != types.SpecStatePassed {
-		return false
-	}
-	node.outcome, node.failure = node.runnerB.run()
-
-	return node.outcome == types.SpecStatePassed
-}
-
-func (node *synchronizedBeforeSuiteNode) runA(parallelTotal int, syncHost string) (types.SpecState, types.SpecFailure) {
-	outcome, failure := node.runnerA.run()
-
-	if parallelTotal > 1 {
-		state := types.RemoteBeforeSuiteStatePassed
-		if outcome != types.SpecStatePassed {
-			state = types.RemoteBeforeSuiteStateFailed
-		}
-		json := (types.RemoteBeforeSuiteData{
-			Data:  node.data,
-			State: state,
-		}).ToJSON()
-		http.Post(syncHost+"/BeforeSuiteState", "application/json", bytes.NewBuffer(json))
-	}
-
-	return outcome, failure
-}
-
-func (node *synchronizedBeforeSuiteNode) waitForA(syncHost string) (types.SpecState, types.SpecFailure) {
-	failure := func(message string) types.SpecFailure {
-		return types.SpecFailure{
-			Message:               message,
-			Location:              node.runnerA.codeLocation,
-			ComponentType:         node.runnerA.nodeType,
-			ComponentIndex:        node.runnerA.componentIndex,
-			ComponentCodeLocation: node.runnerA.codeLocation,
-		}
-	}
-	for {
-		resp, err := http.Get(syncHost + "/BeforeSuiteState")
-		if err != nil || resp.StatusCode != http.StatusOK {
-			return types.SpecStateFailed, failure("Failed to fetch BeforeSuite state")
-		}
-
-		body, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return types.SpecStateFailed, failure("Failed to read BeforeSuite state")
-		}
-		resp.Body.Close()
-
-		beforeSuiteData := types.RemoteBeforeSuiteData{}
-		err = json.Unmarshal(body, &beforeSuiteData)
-		if err != nil {
-			return types.SpecStateFailed, failure("Failed to decode BeforeSuite state")
-		}
-
-		switch beforeSuiteData.State {
-		case types.RemoteBeforeSuiteStatePassed:
-			node.data = beforeSuiteData.Data
-			return types.SpecStatePassed, types.SpecFailure{}
-		case types.RemoteBeforeSuiteStateFailed:
-			return types.SpecStateFailed, failure("BeforeSuite on Node 1 failed")
-		case types.RemoteBeforeSuiteStateDisappeared:
-			return types.SpecStateFailed, failure("Node 1 disappeared before completing BeforeSuite")
-		}
-
-		time.Sleep(50 * time.Millisecond)
-	}
-
-	return types.SpecStateFailed, failure("Shouldn't get here!")
-}
-
-func (node *synchronizedBeforeSuiteNode) Passed() bool {
-	return node.outcome == types.SpecStatePassed
-}
-
-func (node *synchronizedBeforeSuiteNode) Summary() *types.SetupSummary {
-	return &types.SetupSummary{
-		ComponentType: node.runnerA.nodeType,
-		CodeLocation:  node.runnerA.codeLocation,
-		State:         node.outcome,
-		RunTime:       node.runTime,
-		Failure:       node.failure,
-	}
-}
-
-func (node *synchronizedBeforeSuiteNode) wrapA(bodyA interface{}) interface{} {
-	typeA := reflect.TypeOf(bodyA)
-	if typeA.Kind() != reflect.Func {
-		panic("SynchronizedBeforeSuite expects a function as its first argument")
-	}
-
-	takesNothing := typeA.NumIn() == 0
-	takesADoneChannel := typeA.NumIn() == 1 && typeA.In(0).Kind() == reflect.Chan && typeA.In(0).Elem().Kind() == reflect.Interface
-	returnsBytes := typeA.NumOut() == 1 && typeA.Out(0).Kind() == reflect.Slice && typeA.Out(0).Elem().Kind() == reflect.Uint8
-
-	if !((takesNothing || takesADoneChannel) && returnsBytes) {
-		panic("SynchronizedBeforeSuite's first argument should be a function that returns []byte and either takes no arguments or takes a Done channel.")
-	}
-
-	if takesADoneChannel {
-		return func(done chan<- interface{}) {
-			out := reflect.ValueOf(bodyA).Call([]reflect.Value{reflect.ValueOf(done)})
-			node.data = out[0].Interface().([]byte)
-		}
-	}
-
-	return func() {
-		out := reflect.ValueOf(bodyA).Call([]reflect.Value{})
-		node.data = out[0].Interface().([]byte)
-	}
-}
-
-func (node *synchronizedBeforeSuiteNode) wrapB(bodyB interface{}) interface{} {
-	typeB := reflect.TypeOf(bodyB)
-	if typeB.Kind() != reflect.Func {
-		panic("SynchronizedBeforeSuite expects a function as its second argument")
-	}
-
-	returnsNothing := typeB.NumOut() == 0
-	takesBytesOnly := typeB.NumIn() == 1 && typeB.In(0).Kind() == reflect.Slice && typeB.In(0).Elem().Kind() == reflect.Uint8
-	takesBytesAndDone := typeB.NumIn() == 2 &&
-		typeB.In(0).Kind() == reflect.Slice && typeB.In(0).Elem().Kind() == reflect.Uint8 &&
-		typeB.In(1).Kind() == reflect.Chan && typeB.In(1).Elem().Kind() == reflect.Interface
-
-	if !((takesBytesOnly || takesBytesAndDone) && returnsNothing) {
-		panic("SynchronizedBeforeSuite's second argument should be a function that returns nothing and either takes []byte or ([]byte, Done)")
-	}
-
-	if takesBytesAndDone {
-		return func(done chan<- interface{}) {
-			reflect.ValueOf(bodyB).Call([]reflect.Value{reflect.ValueOf(node.data), reflect.ValueOf(done)})
-		}
-	}
-
-	return func() {
-		reflect.ValueOf(bodyB).Call([]reflect.Value{reflect.ValueOf(node.data)})
-	}
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/aggregator.go b/vendor/github.com/onsi/ginkgo/internal/remote/aggregator.go
deleted file mode 100644
index 522d44e357..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/remote/aggregator.go
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
-
-Aggregator is a reporter used by the Ginkgo CLI to aggregate and present parallel test output
-coherently as tests complete.  You shouldn't need to use this in your code.  To run tests in parallel:
-
-	ginkgo -nodes=N
-
-where N is the number of nodes you desire.
-*/
-package remote
-
-import (
-	"time"
-
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/reporters/stenographer"
-	"github.com/onsi/ginkgo/types"
-)
-
-type configAndSuite struct {
-	config  config.GinkgoConfigType
-	summary *types.SuiteSummary
-}
-
-type Aggregator struct {
-	nodeCount    int
-	config       config.DefaultReporterConfigType
-	stenographer stenographer.Stenographer
-	result       chan bool
-
-	suiteBeginnings           chan configAndSuite
-	aggregatedSuiteBeginnings []configAndSuite
-
-	beforeSuites           chan *types.SetupSummary
-	aggregatedBeforeSuites []*types.SetupSummary
-
-	afterSuites           chan *types.SetupSummary
-	aggregatedAfterSuites []*types.SetupSummary
-
-	specCompletions chan *types.SpecSummary
-	completedSpecs  []*types.SpecSummary
-
-	suiteEndings           chan *types.SuiteSummary
-	aggregatedSuiteEndings []*types.SuiteSummary
-	specs                  []*types.SpecSummary
-
-	startTime time.Time
-}
-
-func NewAggregator(nodeCount int, result chan bool, config config.DefaultReporterConfigType, stenographer stenographer.Stenographer) *Aggregator {
-	aggregator := &Aggregator{
-		nodeCount:    nodeCount,
-		result:       result,
-		config:       config,
-		stenographer: stenographer,
-
-		suiteBeginnings: make(chan configAndSuite, 0),
-		beforeSuites:    make(chan *types.SetupSummary, 0),
-		afterSuites:     make(chan *types.SetupSummary, 0),
-		specCompletions: make(chan *types.SpecSummary, 0),
-		suiteEndings:    make(chan *types.SuiteSummary, 0),
-	}
-
-	go aggregator.mux()
-
-	return aggregator
-}
-
-func (aggregator *Aggregator) SpecSuiteWillBegin(config config.GinkgoConfigType, summary *types.SuiteSummary) {
-	aggregator.suiteBeginnings <- configAndSuite{config, summary}
-}
-
-func (aggregator *Aggregator) BeforeSuiteDidRun(setupSummary *types.SetupSummary) {
-	aggregator.beforeSuites <- setupSummary
-}
-
-func (aggregator *Aggregator) AfterSuiteDidRun(setupSummary *types.SetupSummary) {
-	aggregator.afterSuites <- setupSummary
-}
-
-func (aggregator *Aggregator) SpecWillRun(specSummary *types.SpecSummary) {
-	//noop
-}
-
-func (aggregator *Aggregator) SpecDidComplete(specSummary *types.SpecSummary) {
-	aggregator.specCompletions <- specSummary
-}
-
-func (aggregator *Aggregator) SpecSuiteDidEnd(summary *types.SuiteSummary) {
-	aggregator.suiteEndings <- summary
-}
-
-func (aggregator *Aggregator) mux() {
-loop:
-	for {
-		select {
-		case configAndSuite := <-aggregator.suiteBeginnings:
-			aggregator.registerSuiteBeginning(configAndSuite)
-		case setupSummary := <-aggregator.beforeSuites:
-			aggregator.registerBeforeSuite(setupSummary)
-		case setupSummary := <-aggregator.afterSuites:
-			aggregator.registerAfterSuite(setupSummary)
-		case specSummary := <-aggregator.specCompletions:
-			aggregator.registerSpecCompletion(specSummary)
-		case suite := <-aggregator.suiteEndings:
-			finished, passed := aggregator.registerSuiteEnding(suite)
-			if finished {
-				aggregator.result <- passed
-				break loop
-			}
-		}
-	}
-}
-
-func (aggregator *Aggregator) registerSuiteBeginning(configAndSuite configAndSuite) {
-	aggregator.aggregatedSuiteBeginnings = append(aggregator.aggregatedSuiteBeginnings, configAndSuite)
-
-	if len(aggregator.aggregatedSuiteBeginnings) == 1 {
-		aggregator.startTime = time.Now()
-	}
-
-	if len(aggregator.aggregatedSuiteBeginnings) != aggregator.nodeCount {
-		return
-	}
-
-	aggregator.stenographer.AnnounceSuite(configAndSuite.summary.SuiteDescription, configAndSuite.config.RandomSeed, configAndSuite.config.RandomizeAllSpecs, aggregator.config.Succinct)
-
-	totalNumberOfSpecs := 0
-	if len(aggregator.aggregatedSuiteBeginnings) > 0 {
-		totalNumberOfSpecs = configAndSuite.summary.NumberOfSpecsBeforeParallelization
-	}
-
-	aggregator.stenographer.AnnounceTotalNumberOfSpecs(totalNumberOfSpecs, aggregator.config.Succinct)
-	aggregator.stenographer.AnnounceAggregatedParallelRun(aggregator.nodeCount, aggregator.config.Succinct)
-	aggregator.flushCompletedSpecs()
-}
-
-func (aggregator *Aggregator) registerBeforeSuite(setupSummary *types.SetupSummary) {
-	aggregator.aggregatedBeforeSuites = append(aggregator.aggregatedBeforeSuites, setupSummary)
-	aggregator.flushCompletedSpecs()
-}
-
-func (aggregator *Aggregator) registerAfterSuite(setupSummary *types.SetupSummary) {
-	aggregator.aggregatedAfterSuites = append(aggregator.aggregatedAfterSuites, setupSummary)
-	aggregator.flushCompletedSpecs()
-}
-
-func (aggregator *Aggregator) registerSpecCompletion(specSummary *types.SpecSummary) {
-	aggregator.completedSpecs = append(aggregator.completedSpecs, specSummary)
-	aggregator.specs = append(aggregator.specs, specSummary)
-	aggregator.flushCompletedSpecs()
-}
-
-func (aggregator *Aggregator) flushCompletedSpecs() {
-	if len(aggregator.aggregatedSuiteBeginnings) != aggregator.nodeCount {
-		return
-	}
-
-	for _, setupSummary := range aggregator.aggregatedBeforeSuites {
-		aggregator.announceBeforeSuite(setupSummary)
-	}
-
-	for _, specSummary := range aggregator.completedSpecs {
-		aggregator.announceSpec(specSummary)
-	}
-
-	for _, setupSummary := range aggregator.aggregatedAfterSuites {
-		aggregator.announceAfterSuite(setupSummary)
-	}
-
-	aggregator.aggregatedBeforeSuites = []*types.SetupSummary{}
-	aggregator.completedSpecs = []*types.SpecSummary{}
-	aggregator.aggregatedAfterSuites = []*types.SetupSummary{}
-}
-
-func (aggregator *Aggregator) announceBeforeSuite(setupSummary *types.SetupSummary) {
-	aggregator.stenographer.AnnounceCapturedOutput(setupSummary.CapturedOutput)
-	if setupSummary.State != types.SpecStatePassed {
-		aggregator.stenographer.AnnounceBeforeSuiteFailure(setupSummary, aggregator.config.Succinct, aggregator.config.FullTrace)
-	}
-}
-
-func (aggregator *Aggregator) announceAfterSuite(setupSummary *types.SetupSummary) {
-	aggregator.stenographer.AnnounceCapturedOutput(setupSummary.CapturedOutput)
-	if setupSummary.State != types.SpecStatePassed {
-		aggregator.stenographer.AnnounceAfterSuiteFailure(setupSummary, aggregator.config.Succinct, aggregator.config.FullTrace)
-	}
-}
-
-func (aggregator *Aggregator) announceSpec(specSummary *types.SpecSummary) {
-	if aggregator.config.Verbose && specSummary.State != types.SpecStatePending && specSummary.State != types.SpecStateSkipped {
-		aggregator.stenographer.AnnounceSpecWillRun(specSummary)
-	}
-
-	aggregator.stenographer.AnnounceCapturedOutput(specSummary.CapturedOutput)
-
-	switch specSummary.State {
-	case types.SpecStatePassed:
-		if specSummary.IsMeasurement {
-			aggregator.stenographer.AnnounceSuccesfulMeasurement(specSummary, aggregator.config.Succinct)
-		} else if specSummary.RunTime.Seconds() >= aggregator.config.SlowSpecThreshold {
-			aggregator.stenographer.AnnounceSuccesfulSlowSpec(specSummary, aggregator.config.Succinct)
-		} else {
-			aggregator.stenographer.AnnounceSuccesfulSpec(specSummary)
-		}
-
-	case types.SpecStatePending:
-		aggregator.stenographer.AnnouncePendingSpec(specSummary, aggregator.config.NoisyPendings && !aggregator.config.Succinct)
-	case types.SpecStateSkipped:
-		aggregator.stenographer.AnnounceSkippedSpec(specSummary, aggregator.config.Succinct, aggregator.config.FullTrace)
-	case types.SpecStateTimedOut:
-		aggregator.stenographer.AnnounceSpecTimedOut(specSummary, aggregator.config.Succinct, aggregator.config.FullTrace)
-	case types.SpecStatePanicked:
-		aggregator.stenographer.AnnounceSpecPanicked(specSummary, aggregator.config.Succinct, aggregator.config.FullTrace)
-	case types.SpecStateFailed:
-		aggregator.stenographer.AnnounceSpecFailed(specSummary, aggregator.config.Succinct, aggregator.config.FullTrace)
-	}
-}
-
-func (aggregator *Aggregator) registerSuiteEnding(suite *types.SuiteSummary) (finished bool, passed bool) {
-	aggregator.aggregatedSuiteEndings = append(aggregator.aggregatedSuiteEndings, suite)
-	if len(aggregator.aggregatedSuiteEndings) < aggregator.nodeCount {
-		return false, false
-	}
-
-	aggregatedSuiteSummary := &types.SuiteSummary{}
-	aggregatedSuiteSummary.SuiteSucceeded = true
-
-	for _, suiteSummary := range aggregator.aggregatedSuiteEndings {
-		if suiteSummary.SuiteSucceeded == false {
-			aggregatedSuiteSummary.SuiteSucceeded = false
-		}
-
-		aggregatedSuiteSummary.NumberOfSpecsThatWillBeRun += suiteSummary.NumberOfSpecsThatWillBeRun
-		aggregatedSuiteSummary.NumberOfTotalSpecs += suiteSummary.NumberOfTotalSpecs
-		aggregatedSuiteSummary.NumberOfPassedSpecs += suiteSummary.NumberOfPassedSpecs
-		aggregatedSuiteSummary.NumberOfFailedSpecs += suiteSummary.NumberOfFailedSpecs
-		aggregatedSuiteSummary.NumberOfPendingSpecs += suiteSummary.NumberOfPendingSpecs
-		aggregatedSuiteSummary.NumberOfSkippedSpecs += suiteSummary.NumberOfSkippedSpecs
-		aggregatedSuiteSummary.NumberOfFlakedSpecs += suiteSummary.NumberOfFlakedSpecs
-	}
-
-	aggregatedSuiteSummary.RunTime = time.Since(aggregator.startTime)
-
-	aggregator.stenographer.SummarizeFailures(aggregator.specs)
-	aggregator.stenographer.AnnounceSpecRunCompletion(aggregatedSuiteSummary, aggregator.config.Succinct)
-
-	return true, aggregatedSuiteSummary.SuiteSucceeded
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/forwarding_reporter.go b/vendor/github.com/onsi/ginkgo/internal/remote/forwarding_reporter.go
deleted file mode 100644
index 025eb50644..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/remote/forwarding_reporter.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package remote
-
-import (
-	"bytes"
-	"encoding/json"
-	"io"
-	"net/http"
-
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/types"
-)
-
-//An interface to net/http's client to allow the injection of fakes under test
-type Poster interface {
-	Post(url string, bodyType string, body io.Reader) (resp *http.Response, err error)
-}
-
-/*
-The ForwardingReporter is a Ginkgo reporter that forwards information to
-a Ginkgo remote server.
-
-When streaming parallel test output, this repoter is automatically installed by Ginkgo.
-
-This is accomplished by passing in the GINKGO_REMOTE_REPORTING_SERVER environment variable to `go test`, the Ginkgo test runner
-detects this environment variable (which should contain the host of the server) and automatically installs a ForwardingReporter
-in place of Ginkgo's DefaultReporter.
-*/
-
-type ForwardingReporter struct {
-	serverHost        string
-	poster            Poster
-	outputInterceptor OutputInterceptor
-}
-
-func NewForwardingReporter(serverHost string, poster Poster, outputInterceptor OutputInterceptor) *ForwardingReporter {
-	return &ForwardingReporter{
-		serverHost:        serverHost,
-		poster:            poster,
-		outputInterceptor: outputInterceptor,
-	}
-}
-
-func (reporter *ForwardingReporter) post(path string, data interface{}) {
-	encoded, _ := json.Marshal(data)
-	buffer := bytes.NewBuffer(encoded)
-	reporter.poster.Post(reporter.serverHost+path, "application/json", buffer)
-}
-
-func (reporter *ForwardingReporter) SpecSuiteWillBegin(conf config.GinkgoConfigType, summary *types.SuiteSummary) {
-	data := struct {
-		Config  config.GinkgoConfigType `json:"config"`
-		Summary *types.SuiteSummary     `json:"suite-summary"`
-	}{
-		conf,
-		summary,
-	}
-
-	reporter.outputInterceptor.StartInterceptingOutput()
-	reporter.post("/SpecSuiteWillBegin", data)
-}
-
-func (reporter *ForwardingReporter) BeforeSuiteDidRun(setupSummary *types.SetupSummary) {
-	output, _ := reporter.outputInterceptor.StopInterceptingAndReturnOutput()
-	reporter.outputInterceptor.StartInterceptingOutput()
-	setupSummary.CapturedOutput = output
-	reporter.post("/BeforeSuiteDidRun", setupSummary)
-}
-
-func (reporter *ForwardingReporter) SpecWillRun(specSummary *types.SpecSummary) {
-	reporter.post("/SpecWillRun", specSummary)
-}
-
-func (reporter *ForwardingReporter) SpecDidComplete(specSummary *types.SpecSummary) {
-	output, _ := reporter.outputInterceptor.StopInterceptingAndReturnOutput()
-	reporter.outputInterceptor.StartInterceptingOutput()
-	specSummary.CapturedOutput = output
-	reporter.post("/SpecDidComplete", specSummary)
-}
-
-func (reporter *ForwardingReporter) AfterSuiteDidRun(setupSummary *types.SetupSummary) {
-	output, _ := reporter.outputInterceptor.StopInterceptingAndReturnOutput()
-	reporter.outputInterceptor.StartInterceptingOutput()
-	setupSummary.CapturedOutput = output
-	reporter.post("/AfterSuiteDidRun", setupSummary)
-}
-
-func (reporter *ForwardingReporter) SpecSuiteDidEnd(summary *types.SuiteSummary) {
-	reporter.outputInterceptor.StopInterceptingAndReturnOutput()
-	reporter.post("/SpecSuiteDidEnd", summary)
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor.go
deleted file mode 100644
index 093f4513c0..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package remote
-
-/*
-The OutputInterceptor is used by the ForwardingReporter to
-intercept and capture all stdin and stderr output during a test run.
-*/
-type OutputInterceptor interface {
-	StartInterceptingOutput() error
-	StopInterceptingAndReturnOutput() (string, error)
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go
deleted file mode 100644
index 980065da57..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// +build freebsd openbsd netbsd dragonfly darwin linux solaris
-
-package remote
-
-import (
-	"errors"
-	"io/ioutil"
-	"os"
-)
-
-func NewOutputInterceptor() OutputInterceptor {
-	return &outputInterceptor{}
-}
-
-type outputInterceptor struct {
-	redirectFile *os.File
-	intercepting bool
-}
-
-func (interceptor *outputInterceptor) StartInterceptingOutput() error {
-	if interceptor.intercepting {
-		return errors.New("Already intercepting output!")
-	}
-	interceptor.intercepting = true
-
-	var err error
-
-	interceptor.redirectFile, err = ioutil.TempFile("", "ginkgo-output")
-	if err != nil {
-		return err
-	}
-
-	// Call a function in ./syscall_dup_*.go
-	// If building for everything other than linux_arm64,
-	// use a "normal" syscall.Dup2(oldfd, newfd) call. If building for linux_arm64 (which doesn't have syscall.Dup2)
-	// call syscall.Dup3(oldfd, newfd, 0). They are nearly identical, see: http://linux.die.net/man/2/dup3
-	syscallDup(int(interceptor.redirectFile.Fd()), 1)
-	syscallDup(int(interceptor.redirectFile.Fd()), 2)
-
-	return nil
-}
-
-func (interceptor *outputInterceptor) StopInterceptingAndReturnOutput() (string, error) {
-	if !interceptor.intercepting {
-		return "", errors.New("Not intercepting output!")
-	}
-
-	interceptor.redirectFile.Close()
-	output, err := ioutil.ReadFile(interceptor.redirectFile.Name())
-	os.Remove(interceptor.redirectFile.Name())
-
-	interceptor.intercepting = false
-
-	return string(output), err
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_win.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_win.go
deleted file mode 100644
index c8f97d97f0..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_win.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// +build windows
-
-package remote
-
-import (
-	"errors"
-)
-
-func NewOutputInterceptor() OutputInterceptor {
-	return &outputInterceptor{}
-}
-
-type outputInterceptor struct {
-	intercepting bool
-}
-
-func (interceptor *outputInterceptor) StartInterceptingOutput() error {
-	if interceptor.intercepting {
-		return errors.New("Already intercepting output!")
-	}
-	interceptor.intercepting = true
-
-	// not working on windows...
-
-	return nil
-}
-
-func (interceptor *outputInterceptor) StopInterceptingAndReturnOutput() (string, error) {
-	// not working on windows...
-	interceptor.intercepting = false
-
-	return "", nil
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/server.go b/vendor/github.com/onsi/ginkgo/internal/remote/server.go
deleted file mode 100644
index 297af2ebff..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/remote/server.go
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-
-The remote package provides the pieces to allow Ginkgo test suites to report to remote listeners.
-This is used, primarily, to enable streaming parallel test output but has, in principal, broader applications (e.g. streaming test output to a browser).
-
-*/
-
-package remote
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"sync"
-
-	"github.com/onsi/ginkgo/internal/spec_iterator"
-
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/reporters"
-	"github.com/onsi/ginkgo/types"
-)
-
-/*
-Server spins up on an automatically selected port and listens for communication from the forwarding reporter.
-It then forwards that communication to attached reporters.
-*/
-type Server struct {
-	listener        net.Listener
-	reporters       []reporters.Reporter
-	alives          []func() bool
-	lock            *sync.Mutex
-	beforeSuiteData types.RemoteBeforeSuiteData
-	parallelTotal   int
-	counter         int
-}
-
-//Create a new server, automatically selecting a port
-func NewServer(parallelTotal int) (*Server, error) {
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		return nil, err
-	}
-	return &Server{
-		listener:        listener,
-		lock:            &sync.Mutex{},
-		alives:          make([]func() bool, parallelTotal),
-		beforeSuiteData: types.RemoteBeforeSuiteData{nil, types.RemoteBeforeSuiteStatePending},
-		parallelTotal:   parallelTotal,
-	}, nil
-}
-
-//Start the server.  You don't need to `go s.Start()`, just `s.Start()`
-func (server *Server) Start() {
-	httpServer := &http.Server{}
-	mux := http.NewServeMux()
-	httpServer.Handler = mux
-
-	//streaming endpoints
-	mux.HandleFunc("/SpecSuiteWillBegin", server.specSuiteWillBegin)
-	mux.HandleFunc("/BeforeSuiteDidRun", server.beforeSuiteDidRun)
-	mux.HandleFunc("/AfterSuiteDidRun", server.afterSuiteDidRun)
-	mux.HandleFunc("/SpecWillRun", server.specWillRun)
-	mux.HandleFunc("/SpecDidComplete", server.specDidComplete)
-	mux.HandleFunc("/SpecSuiteDidEnd", server.specSuiteDidEnd)
-
-	//synchronization endpoints
-	mux.HandleFunc("/BeforeSuiteState", server.handleBeforeSuiteState)
-	mux.HandleFunc("/RemoteAfterSuiteData", server.handleRemoteAfterSuiteData)
-	mux.HandleFunc("/counter", server.handleCounter)
-	mux.HandleFunc("/has-counter", server.handleHasCounter) //for backward compatibility
-
-	go httpServer.Serve(server.listener)
-}
-
-//Stop the server
-func (server *Server) Close() {
-	server.listener.Close()
-}
-
-//The address the server can be reached it.  Pass this into the `ForwardingReporter`.
-func (server *Server) Address() string {
-	return "http://" + server.listener.Addr().String()
-}
-
-//
-// Streaming Endpoints
-//
-
-//The server will forward all received messages to Ginkgo reporters registered with `RegisterReporters`
-func (server *Server) readAll(request *http.Request) []byte {
-	defer request.Body.Close()
-	body, _ := ioutil.ReadAll(request.Body)
-	return body
-}
-
-func (server *Server) RegisterReporters(reporters ...reporters.Reporter) {
-	server.reporters = reporters
-}
-
-func (server *Server) specSuiteWillBegin(writer http.ResponseWriter, request *http.Request) {
-	body := server.readAll(request)
-
-	var data struct {
-		Config  config.GinkgoConfigType `json:"config"`
-		Summary *types.SuiteSummary     `json:"suite-summary"`
-	}
-
-	json.Unmarshal(body, &data)
-
-	for _, reporter := range server.reporters {
-		reporter.SpecSuiteWillBegin(data.Config, data.Summary)
-	}
-}
-
-func (server *Server) beforeSuiteDidRun(writer http.ResponseWriter, request *http.Request) {
-	body := server.readAll(request)
-	var setupSummary *types.SetupSummary
-	json.Unmarshal(body, &setupSummary)
-
-	for _, reporter := range server.reporters {
-		reporter.BeforeSuiteDidRun(setupSummary)
-	}
-}
-
-func (server *Server) afterSuiteDidRun(writer http.ResponseWriter, request *http.Request) {
-	body := server.readAll(request)
-	var setupSummary *types.SetupSummary
-	json.Unmarshal(body, &setupSummary)
-
-	for _, reporter := range server.reporters {
-		reporter.AfterSuiteDidRun(setupSummary)
-	}
-}
-
-func (server *Server) specWillRun(writer http.ResponseWriter, request *http.Request) {
-	body := server.readAll(request)
-	var specSummary *types.SpecSummary
-	json.Unmarshal(body, &specSummary)
-
-	for _, reporter := range server.reporters {
-		reporter.SpecWillRun(specSummary)
-	}
-}
-
-func (server *Server) specDidComplete(writer http.ResponseWriter, request *http.Request) {
-	body := server.readAll(request)
-	var specSummary *types.SpecSummary
-	json.Unmarshal(body, &specSummary)
-
-	for _, reporter := range server.reporters {
-		reporter.SpecDidComplete(specSummary)
-	}
-}
-
-func (server *Server) specSuiteDidEnd(writer http.ResponseWriter, request *http.Request) {
-	body := server.readAll(request)
-	var suiteSummary *types.SuiteSummary
-	json.Unmarshal(body, &suiteSummary)
-
-	for _, reporter := range server.reporters {
-		reporter.SpecSuiteDidEnd(suiteSummary)
-	}
-}
-
-//
-// Synchronization Endpoints
-//
-
-func (server *Server) RegisterAlive(node int, alive func() bool) {
-	server.lock.Lock()
-	defer server.lock.Unlock()
-	server.alives[node-1] = alive
-}
-
-func (server *Server) nodeIsAlive(node int) bool {
-	server.lock.Lock()
-	defer server.lock.Unlock()
-	alive := server.alives[node-1]
-	if alive == nil {
-		return true
-	}
-	return alive()
-}
-
-func (server *Server) handleBeforeSuiteState(writer http.ResponseWriter, request *http.Request) {
-	if request.Method == "POST" {
-		dec := json.NewDecoder(request.Body)
-		dec.Decode(&(server.beforeSuiteData))
-	} else {
-		beforeSuiteData := server.beforeSuiteData
-		if beforeSuiteData.State == types.RemoteBeforeSuiteStatePending && !server.nodeIsAlive(1) {
-			beforeSuiteData.State = types.RemoteBeforeSuiteStateDisappeared
-		}
-		enc := json.NewEncoder(writer)
-		enc.Encode(beforeSuiteData)
-	}
-}
-
-func (server *Server) handleRemoteAfterSuiteData(writer http.ResponseWriter, request *http.Request) {
-	afterSuiteData := types.RemoteAfterSuiteData{
-		CanRun: true,
-	}
-	for i := 2; i <= server.parallelTotal; i++ {
-		afterSuiteData.CanRun = afterSuiteData.CanRun && !server.nodeIsAlive(i)
-	}
-
-	enc := json.NewEncoder(writer)
-	enc.Encode(afterSuiteData)
-}
-
-func (server *Server) handleCounter(writer http.ResponseWriter, request *http.Request) {
-	c := spec_iterator.Counter{}
-	server.lock.Lock()
-	c.Index = server.counter
-	server.counter = server.counter + 1
-	server.lock.Unlock()
-
-	json.NewEncoder(writer).Encode(c)
-}
-
-func (server *Server) handleHasCounter(writer http.ResponseWriter, request *http.Request) {
-	writer.Write([]byte(""))
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_linux_arm64.go b/vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_linux_arm64.go
deleted file mode 100644
index 5c59728ea9..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_linux_arm64.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build linux,arm64
-
-package remote
-
-import "syscall"
-
-// linux_arm64 doesn't have syscall.Dup2 which ginkgo uses, so
-// use the nearly identical syscall.Dup3 instead
-func syscallDup(oldfd int, newfd int) (err error) {
-	return syscall.Dup3(oldfd, newfd, 0)
-}
\ No newline at end of file
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_solaris.go b/vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_solaris.go
deleted file mode 100644
index ecf9cafb66..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_solaris.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build solaris
-
-package remote
-
-import "golang.org/x/sys/unix"
-
-func syscallDup(oldfd int, newfd int) (err error) {
-	return unix.Dup2(oldfd, newfd)
-}
\ No newline at end of file
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_unix.go b/vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_unix.go
deleted file mode 100644
index cacdd0e649..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/remote/syscall_dup_unix.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build !linux !arm64
-// +build !windows
-// +build !solaris
-
-package remote
-
-import "syscall"
-
-func syscallDup(oldfd int, newfd int) (err error) {
-	return syscall.Dup2(oldfd, newfd)
-}
\ No newline at end of file
diff --git a/vendor/github.com/onsi/ginkgo/internal/spec/spec.go b/vendor/github.com/onsi/ginkgo/internal/spec/spec.go
deleted file mode 100644
index d32dec6997..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/spec/spec.go
+++ /dev/null
@@ -1,206 +0,0 @@
-package spec
-
-import (
-	"fmt"
-	"io"
-	"time"
-
-	"github.com/onsi/ginkgo/internal/containernode"
-	"github.com/onsi/ginkgo/internal/leafnodes"
-	"github.com/onsi/ginkgo/types"
-)
-
-type Spec struct {
-	subject          leafnodes.SubjectNode
-	focused          bool
-	announceProgress bool
-
-	containers []*containernode.ContainerNode
-
-	state            types.SpecState
-	runTime          time.Duration
-	failure          types.SpecFailure
-	previousFailures bool
-}
-
-func New(subject leafnodes.SubjectNode, containers []*containernode.ContainerNode, announceProgress bool) *Spec {
-	spec := &Spec{
-		subject:          subject,
-		containers:       containers,
-		focused:          subject.Flag() == types.FlagTypeFocused,
-		announceProgress: announceProgress,
-	}
-
-	spec.processFlag(subject.Flag())
-	for i := len(containers) - 1; i >= 0; i-- {
-		spec.processFlag(containers[i].Flag())
-	}
-
-	return spec
-}
-
-func (spec *Spec) processFlag(flag types.FlagType) {
-	if flag == types.FlagTypeFocused {
-		spec.focused = true
-	} else if flag == types.FlagTypePending {
-		spec.state = types.SpecStatePending
-	}
-}
-
-func (spec *Spec) Skip() {
-	spec.state = types.SpecStateSkipped
-}
-
-func (spec *Spec) Failed() bool {
-	return spec.state == types.SpecStateFailed || spec.state == types.SpecStatePanicked || spec.state == types.SpecStateTimedOut
-}
-
-func (spec *Spec) Passed() bool {
-	return spec.state == types.SpecStatePassed
-}
-
-func (spec *Spec) Flaked() bool {
-	return spec.state == types.SpecStatePassed && spec.previousFailures
-}
-
-func (spec *Spec) Pending() bool {
-	return spec.state == types.SpecStatePending
-}
-
-func (spec *Spec) Skipped() bool {
-	return spec.state == types.SpecStateSkipped
-}
-
-func (spec *Spec) Focused() bool {
-	return spec.focused
-}
-
-func (spec *Spec) IsMeasurement() bool {
-	return spec.subject.Type() == types.SpecComponentTypeMeasure
-}
-
-func (spec *Spec) Summary(suiteID string) *types.SpecSummary {
-	componentTexts := make([]string, len(spec.containers)+1)
-	componentCodeLocations := make([]types.CodeLocation, len(spec.containers)+1)
-
-	for i, container := range spec.containers {
-		componentTexts[i] = container.Text()
-		componentCodeLocations[i] = container.CodeLocation()
-	}
-
-	componentTexts[len(spec.containers)] = spec.subject.Text()
-	componentCodeLocations[len(spec.containers)] = spec.subject.CodeLocation()
-
-	return &types.SpecSummary{
-		IsMeasurement:          spec.IsMeasurement(),
-		NumberOfSamples:        spec.subject.Samples(),
-		ComponentTexts:         componentTexts,
-		ComponentCodeLocations: componentCodeLocations,
-		State:        spec.state,
-		RunTime:      spec.runTime,
-		Failure:      spec.failure,
-		Measurements: spec.measurementsReport(),
-		SuiteID:      suiteID,
-	}
-}
-
-func (spec *Spec) ConcatenatedString() string {
-	s := ""
-	for _, container := range spec.containers {
-		s += container.Text() + " "
-	}
-
-	return s + spec.subject.Text()
-}
-
-func (spec *Spec) Run(writer io.Writer) {
-	if spec.state == types.SpecStateFailed {
-		spec.previousFailures = true
-	}
-
-	startTime := time.Now()
-	defer func() {
-		spec.runTime = time.Since(startTime)
-	}()
-
-	for sample := 0; sample < spec.subject.Samples(); sample++ {
-		spec.runSample(sample, writer)
-
-		if spec.state != types.SpecStatePassed {
-			return
-		}
-	}
-}
-
-func (spec *Spec) runSample(sample int, writer io.Writer) {
-	spec.state = types.SpecStatePassed
-	spec.failure = types.SpecFailure{}
-	innerMostContainerIndexToUnwind := -1
-
-	defer func() {
-		for i := innerMostContainerIndexToUnwind; i >= 0; i-- {
-			container := spec.containers[i]
-			for _, afterEach := range container.SetupNodesOfType(types.SpecComponentTypeAfterEach) {
-				spec.announceSetupNode(writer, "AfterEach", container, afterEach)
-				afterEachState, afterEachFailure := afterEach.Run()
-				if afterEachState != types.SpecStatePassed && spec.state == types.SpecStatePassed {
-					spec.state = afterEachState
-					spec.failure = afterEachFailure
-				}
-			}
-		}
-	}()
-
-	for i, container := range spec.containers {
-		innerMostContainerIndexToUnwind = i
-		for _, beforeEach := range container.SetupNodesOfType(types.SpecComponentTypeBeforeEach) {
-			spec.announceSetupNode(writer, "BeforeEach", container, beforeEach)
-			spec.state, spec.failure = beforeEach.Run()
-			if spec.state != types.SpecStatePassed {
-				return
-			}
-		}
-	}
-
-	for _, container := range spec.containers {
-		for _, justBeforeEach := range container.SetupNodesOfType(types.SpecComponentTypeJustBeforeEach) {
-			spec.announceSetupNode(writer, "JustBeforeEach", container, justBeforeEach)
-			spec.state, spec.failure = justBeforeEach.Run()
-			if spec.state != types.SpecStatePassed {
-				return
-			}
-		}
-	}
-
-	spec.announceSubject(writer, spec.subject)
-	spec.state, spec.failure = spec.subject.Run()
-}
-
-func (spec *Spec) announceSetupNode(writer io.Writer, nodeType string, container *containernode.ContainerNode, setupNode leafnodes.BasicNode) {
-	if spec.announceProgress {
-		s := fmt.Sprintf("[%s] %s\n  %s\n", nodeType, container.Text(), setupNode.CodeLocation().String())
-		writer.Write([]byte(s))
-	}
-}
-
-func (spec *Spec) announceSubject(writer io.Writer, subject leafnodes.SubjectNode) {
-	if spec.announceProgress {
-		nodeType := ""
-		switch subject.Type() {
-		case types.SpecComponentTypeIt:
-			nodeType = "It"
-		case types.SpecComponentTypeMeasure:
-			nodeType = "Measure"
-		}
-		s := fmt.Sprintf("[%s] %s\n  %s\n", nodeType, subject.Text(), subject.CodeLocation().String())
-		writer.Write([]byte(s))
-	}
-}
-
-func (spec *Spec) measurementsReport() map[string]*types.SpecMeasurement {
-	if !spec.IsMeasurement() || spec.Failed() {
-		return map[string]*types.SpecMeasurement{}
-	}
-
-	return spec.subject.(*leafnodes.MeasureNode).MeasurementsReport()
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/spec/specs.go b/vendor/github.com/onsi/ginkgo/internal/spec/specs.go
deleted file mode 100644
index 006185ab5d..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/spec/specs.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package spec
-
-import (
-	"math/rand"
-	"regexp"
-	"sort"
-)
-
-type Specs struct {
-	specs                []*Spec
-	hasProgrammaticFocus bool
-	RegexScansFilePath   bool
-}
-
-func NewSpecs(specs []*Spec) *Specs {
-	return &Specs{
-		specs: specs,
-	}
-}
-
-func (e *Specs) Specs() []*Spec {
-	return e.specs
-}
-
-func (e *Specs) HasProgrammaticFocus() bool {
-	return e.hasProgrammaticFocus
-}
-
-func (e *Specs) Shuffle(r *rand.Rand) {
-	sort.Sort(e)
-	permutation := r.Perm(len(e.specs))
-	shuffledSpecs := make([]*Spec, len(e.specs))
-	for i, j := range permutation {
-		shuffledSpecs[i] = e.specs[j]
-	}
-	e.specs = shuffledSpecs
-}
-
-func (e *Specs) ApplyFocus(description string, focusString string, skipString string) {
-	if focusString == "" && skipString == "" {
-		e.applyProgrammaticFocus()
-	} else {
-		e.applyRegExpFocusAndSkip(description, focusString, skipString)
-	}
-}
-
-func (e *Specs) applyProgrammaticFocus() {
-	e.hasProgrammaticFocus = false
-	for _, spec := range e.specs {
-		if spec.Focused() && !spec.Pending() {
-			e.hasProgrammaticFocus = true
-			break
-		}
-	}
-
-	if e.hasProgrammaticFocus {
-		for _, spec := range e.specs {
-			if !spec.Focused() {
-				spec.Skip()
-			}
-		}
-	}
-}
-
-// toMatch returns a byte[] to be used by regex matchers.  When adding new behaviours to the matching function,
-// this is the place which we append to.
-func (e *Specs) toMatch(description string, spec *Spec) []byte {
-	if e.RegexScansFilePath {
-		return []byte(
-			description + " " +
-				spec.ConcatenatedString() + " " +
-				spec.subject.CodeLocation().FileName)
-	} else {
-		return []byte(
-			description + " " +
-				spec.ConcatenatedString())
-	}
-}
-
-func (e *Specs) applyRegExpFocusAndSkip(description string, focusString string, skipString string) {
-	for _, spec := range e.specs {
-		matchesFocus := true
-		matchesSkip := false
-
-		toMatch := e.toMatch(description, spec)
-
-		if focusString != "" {
-			focusFilter := regexp.MustCompile(focusString)
-			matchesFocus = focusFilter.Match([]byte(toMatch))
-		}
-
-		if skipString != "" {
-			skipFilter := regexp.MustCompile(skipString)
-			matchesSkip = skipFilter.Match([]byte(toMatch))
-		}
-
-		if !matchesFocus || matchesSkip {
-			spec.Skip()
-		}
-	}
-}
-
-func (e *Specs) SkipMeasurements() {
-	for _, spec := range e.specs {
-		if spec.IsMeasurement() {
-			spec.Skip()
-		}
-	}
-}
-
-//sort.Interface
-
-func (e *Specs) Len() int {
-	return len(e.specs)
-}
-
-func (e *Specs) Less(i, j int) bool {
-	return e.specs[i].ConcatenatedString() < e.specs[j].ConcatenatedString()
-}
-
-func (e *Specs) Swap(i, j int) {
-	e.specs[i], e.specs[j] = e.specs[j], e.specs[i]
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/spec_iterator/index_computer.go b/vendor/github.com/onsi/ginkgo/internal/spec_iterator/index_computer.go
deleted file mode 100644
index 82272554aa..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/spec_iterator/index_computer.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package spec_iterator
-
-func ParallelizedIndexRange(length int, parallelTotal int, parallelNode int) (startIndex int, count int) {
-	if length == 0 {
-		return 0, 0
-	}
-
-	// We have more nodes than tests. Trivial case.
-	if parallelTotal >= length {
-		if parallelNode > length {
-			return 0, 0
-		} else {
-			return parallelNode - 1, 1
-		}
-	}
-
-	// This is the minimum amount of tests that a node will be required to run
-	minTestsPerNode := length / parallelTotal
-
-	// This is the maximum amount of tests that a node will be required to run
-	// The algorithm guarantees that this would be equal to at least the minimum amount
-	// and at most one more
-	maxTestsPerNode := minTestsPerNode
-	if length%parallelTotal != 0 {
-		maxTestsPerNode++
-	}
-
-	// Number of nodes that will have to run the maximum amount of tests per node
-	numMaxLoadNodes := length % parallelTotal
-
-	// Number of nodes that precede the current node and will have to run the maximum amount of tests per node
-	var numPrecedingMaxLoadNodes int
-	if parallelNode > numMaxLoadNodes {
-		numPrecedingMaxLoadNodes = numMaxLoadNodes
-	} else {
-		numPrecedingMaxLoadNodes = parallelNode - 1
-	}
-
-	// Number of nodes that precede the current node and will have to run the minimum amount of tests per node
-	var numPrecedingMinLoadNodes int
-	if parallelNode <= numMaxLoadNodes {
-		numPrecedingMinLoadNodes = 0
-	} else {
-		numPrecedingMinLoadNodes = parallelNode - numMaxLoadNodes - 1
-	}
-
-	// Evaluate the test start index and number of tests to run
-	startIndex = numPrecedingMaxLoadNodes*maxTestsPerNode + numPrecedingMinLoadNodes*minTestsPerNode
-	if parallelNode > numMaxLoadNodes {
-		count = minTestsPerNode
-	} else {
-		count = maxTestsPerNode
-	}
-	return
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/spec_iterator/parallel_spec_iterator.go b/vendor/github.com/onsi/ginkgo/internal/spec_iterator/parallel_spec_iterator.go
deleted file mode 100644
index 54e61ecb46..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/spec_iterator/parallel_spec_iterator.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package spec_iterator
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-
-	"github.com/onsi/ginkgo/internal/spec"
-)
-
-type ParallelIterator struct {
-	specs  []*spec.Spec
-	host   string
-	client *http.Client
-}
-
-func NewParallelIterator(specs []*spec.Spec, host string) *ParallelIterator {
-	return &ParallelIterator{
-		specs:  specs,
-		host:   host,
-		client: &http.Client{},
-	}
-}
-
-func (s *ParallelIterator) Next() (*spec.Spec, error) {
-	resp, err := s.client.Get(s.host + "/counter")
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return nil, errors.New(fmt.Sprintf("unexpected status code %d", resp.StatusCode))
-	}
-
-	var counter Counter
-	err = json.NewDecoder(resp.Body).Decode(&counter)
-	if err != nil {
-		return nil, err
-	}
-
-	if counter.Index >= len(s.specs) {
-		return nil, ErrClosed
-	}
-
-	return s.specs[counter.Index], nil
-}
-
-func (s *ParallelIterator) NumberOfSpecsPriorToIteration() int {
-	return len(s.specs)
-}
-
-func (s *ParallelIterator) NumberOfSpecsToProcessIfKnown() (int, bool) {
-	return -1, false
-}
-
-func (s *ParallelIterator) NumberOfSpecsThatWillBeRunIfKnown() (int, bool) {
-	return -1, false
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/spec_iterator/serial_spec_iterator.go b/vendor/github.com/onsi/ginkgo/internal/spec_iterator/serial_spec_iterator.go
deleted file mode 100644
index a51c93b8b6..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/spec_iterator/serial_spec_iterator.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package spec_iterator
-
-import (
-	"github.com/onsi/ginkgo/internal/spec"
-)
-
-type SerialIterator struct {
-	specs []*spec.Spec
-	index int
-}
-
-func NewSerialIterator(specs []*spec.Spec) *SerialIterator {
-	return &SerialIterator{
-		specs: specs,
-		index: 0,
-	}
-}
-
-func (s *SerialIterator) Next() (*spec.Spec, error) {
-	if s.index >= len(s.specs) {
-		return nil, ErrClosed
-	}
-
-	spec := s.specs[s.index]
-	s.index += 1
-	return spec, nil
-}
-
-func (s *SerialIterator) NumberOfSpecsPriorToIteration() int {
-	return len(s.specs)
-}
-
-func (s *SerialIterator) NumberOfSpecsToProcessIfKnown() (int, bool) {
-	return len(s.specs), true
-}
-
-func (s *SerialIterator) NumberOfSpecsThatWillBeRunIfKnown() (int, bool) {
-	count := 0
-	for _, s := range s.specs {
-		if !s.Skipped() && !s.Pending() {
-			count += 1
-		}
-	}
-	return count, true
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/spec_iterator/sharded_parallel_spec_iterator.go b/vendor/github.com/onsi/ginkgo/internal/spec_iterator/sharded_parallel_spec_iterator.go
deleted file mode 100644
index ad4a3ea3c6..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/spec_iterator/sharded_parallel_spec_iterator.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package spec_iterator
-
-import "github.com/onsi/ginkgo/internal/spec"
-
-type ShardedParallelIterator struct {
-	specs    []*spec.Spec
-	index    int
-	maxIndex int
-}
-
-func NewShardedParallelIterator(specs []*spec.Spec, total int, node int) *ShardedParallelIterator {
-	startIndex, count := ParallelizedIndexRange(len(specs), total, node)
-
-	return &ShardedParallelIterator{
-		specs:    specs,
-		index:    startIndex,
-		maxIndex: startIndex + count,
-	}
-}
-
-func (s *ShardedParallelIterator) Next() (*spec.Spec, error) {
-	if s.index >= s.maxIndex {
-		return nil, ErrClosed
-	}
-
-	spec := s.specs[s.index]
-	s.index += 1
-	return spec, nil
-}
-
-func (s *ShardedParallelIterator) NumberOfSpecsPriorToIteration() int {
-	return len(s.specs)
-}
-
-func (s *ShardedParallelIterator) NumberOfSpecsToProcessIfKnown() (int, bool) {
-	return s.maxIndex - s.index, true
-}
-
-func (s *ShardedParallelIterator) NumberOfSpecsThatWillBeRunIfKnown() (int, bool) {
-	count := 0
-	for i := s.index; i < s.maxIndex; i += 1 {
-		if !s.specs[i].Skipped() && !s.specs[i].Pending() {
-			count += 1
-		}
-	}
-	return count, true
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/spec_iterator/spec_iterator.go b/vendor/github.com/onsi/ginkgo/internal/spec_iterator/spec_iterator.go
deleted file mode 100644
index 74bffad646..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/spec_iterator/spec_iterator.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package spec_iterator
-
-import (
-	"errors"
-
-	"github.com/onsi/ginkgo/internal/spec"
-)
-
-var ErrClosed = errors.New("no more specs to run")
-
-type SpecIterator interface {
-	Next() (*spec.Spec, error)
-	NumberOfSpecsPriorToIteration() int
-	NumberOfSpecsToProcessIfKnown() (int, bool)
-	NumberOfSpecsThatWillBeRunIfKnown() (int, bool)
-}
-
-type Counter struct {
-	Index int `json:"index"`
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/specrunner/random_id.go b/vendor/github.com/onsi/ginkgo/internal/specrunner/random_id.go
deleted file mode 100644
index a0b8b62d52..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/specrunner/random_id.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package specrunner
-
-import (
-	"crypto/rand"
-	"fmt"
-)
-
-func randomID() string {
-	b := make([]byte, 8)
-	_, err := rand.Read(b)
-	if err != nil {
-		return ""
-	}
-	return fmt.Sprintf("%x-%x-%x-%x", b[0:2], b[2:4], b[4:6], b[6:8])
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/specrunner/spec_runner.go b/vendor/github.com/onsi/ginkgo/internal/specrunner/spec_runner.go
deleted file mode 100644
index d4dd909ecf..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/specrunner/spec_runner.go
+++ /dev/null
@@ -1,408 +0,0 @@
-package specrunner
-
-import (
-	"fmt"
-	"os"
-	"os/signal"
-	"sync"
-	"syscall"
-
-	"github.com/onsi/ginkgo/internal/spec_iterator"
-
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/internal/leafnodes"
-	"github.com/onsi/ginkgo/internal/spec"
-	Writer "github.com/onsi/ginkgo/internal/writer"
-	"github.com/onsi/ginkgo/reporters"
-	"github.com/onsi/ginkgo/types"
-
-	"time"
-)
-
-type SpecRunner struct {
-	description     string
-	beforeSuiteNode leafnodes.SuiteNode
-	iterator        spec_iterator.SpecIterator
-	afterSuiteNode  leafnodes.SuiteNode
-	reporters       []reporters.Reporter
-	startTime       time.Time
-	suiteID         string
-	runningSpec     *spec.Spec
-	writer          Writer.WriterInterface
-	config          config.GinkgoConfigType
-	interrupted     bool
-	processedSpecs  []*spec.Spec
-	lock            *sync.Mutex
-}
-
-func New(description string, beforeSuiteNode leafnodes.SuiteNode, iterator spec_iterator.SpecIterator, afterSuiteNode leafnodes.SuiteNode, reporters []reporters.Reporter, writer Writer.WriterInterface, config config.GinkgoConfigType) *SpecRunner {
-	return &SpecRunner{
-		description:     description,
-		beforeSuiteNode: beforeSuiteNode,
-		iterator:        iterator,
-		afterSuiteNode:  afterSuiteNode,
-		reporters:       reporters,
-		writer:          writer,
-		config:          config,
-		suiteID:         randomID(),
-		lock:            &sync.Mutex{},
-	}
-}
-
-func (runner *SpecRunner) Run() bool {
-	if runner.config.DryRun {
-		runner.performDryRun()
-		return true
-	}
-
-	runner.reportSuiteWillBegin()
-	go runner.registerForInterrupts()
-
-	suitePassed := runner.runBeforeSuite()
-
-	if suitePassed {
-		suitePassed = runner.runSpecs()
-	}
-
-	runner.blockForeverIfInterrupted()
-
-	suitePassed = runner.runAfterSuite() && suitePassed
-
-	runner.reportSuiteDidEnd(suitePassed)
-
-	return suitePassed
-}
-
-func (runner *SpecRunner) performDryRun() {
-	runner.reportSuiteWillBegin()
-
-	if runner.beforeSuiteNode != nil {
-		summary := runner.beforeSuiteNode.Summary()
-		summary.State = types.SpecStatePassed
-		runner.reportBeforeSuite(summary)
-	}
-
-	for {
-		spec, err := runner.iterator.Next()
-		if err == spec_iterator.ErrClosed {
-			break
-		}
-		if err != nil {
-			fmt.Println("failed to iterate over tests:\n" + err.Error())
-			break
-		}
-
-		runner.processedSpecs = append(runner.processedSpecs, spec)
-
-		summary := spec.Summary(runner.suiteID)
-		runner.reportSpecWillRun(summary)
-		if summary.State == types.SpecStateInvalid {
-			summary.State = types.SpecStatePassed
-		}
-		runner.reportSpecDidComplete(summary, false)
-	}
-
-	if runner.afterSuiteNode != nil {
-		summary := runner.afterSuiteNode.Summary()
-		summary.State = types.SpecStatePassed
-		runner.reportAfterSuite(summary)
-	}
-
-	runner.reportSuiteDidEnd(true)
-}
-
-func (runner *SpecRunner) runBeforeSuite() bool {
-	if runner.beforeSuiteNode == nil || runner.wasInterrupted() {
-		return true
-	}
-
-	runner.writer.Truncate()
-	conf := runner.config
-	passed := runner.beforeSuiteNode.Run(conf.ParallelNode, conf.ParallelTotal, conf.SyncHost)
-	if !passed {
-		runner.writer.DumpOut()
-	}
-	runner.reportBeforeSuite(runner.beforeSuiteNode.Summary())
-	return passed
-}
-
-func (runner *SpecRunner) runAfterSuite() bool {
-	if runner.afterSuiteNode == nil {
-		return true
-	}
-
-	runner.writer.Truncate()
-	conf := runner.config
-	passed := runner.afterSuiteNode.Run(conf.ParallelNode, conf.ParallelTotal, conf.SyncHost)
-	if !passed {
-		runner.writer.DumpOut()
-	}
-	runner.reportAfterSuite(runner.afterSuiteNode.Summary())
-	return passed
-}
-
-func (runner *SpecRunner) runSpecs() bool {
-	suiteFailed := false
-	skipRemainingSpecs := false
-	for {
-		spec, err := runner.iterator.Next()
-		if err == spec_iterator.ErrClosed {
-			break
-		}
-		if err != nil {
-			fmt.Println("failed to iterate over tests:\n" + err.Error())
-			suiteFailed = true
-			break
-		}
-
-		runner.processedSpecs = append(runner.processedSpecs, spec)
-
-		if runner.wasInterrupted() {
-			break
-		}
-		if skipRemainingSpecs {
-			spec.Skip()
-		}
-
-		if !spec.Skipped() && !spec.Pending() {
-			if passed := runner.runSpec(spec); !passed {
-				suiteFailed = true
-			}
-		} else if spec.Pending() && runner.config.FailOnPending {
-			runner.reportSpecWillRun(spec.Summary(runner.suiteID))
-			suiteFailed = true
-			runner.reportSpecDidComplete(spec.Summary(runner.suiteID), spec.Failed())
-		} else {
-			runner.reportSpecWillRun(spec.Summary(runner.suiteID))
-			runner.reportSpecDidComplete(spec.Summary(runner.suiteID), spec.Failed())
-		}
-
-		if spec.Failed() && runner.config.FailFast {
-			skipRemainingSpecs = true
-		}
-	}
-
-	return !suiteFailed
-}
-
-func (runner *SpecRunner) runSpec(spec *spec.Spec) (passed bool) {
-	maxAttempts := 1
-	if runner.config.FlakeAttempts > 0 {
-		// uninitialized configs count as 1
-		maxAttempts = runner.config.FlakeAttempts
-	}
-
-	for i := 0; i < maxAttempts; i++ {
-		runner.reportSpecWillRun(spec.Summary(runner.suiteID))
-		runner.runningSpec = spec
-		spec.Run(runner.writer)
-		runner.runningSpec = nil
-		runner.reportSpecDidComplete(spec.Summary(runner.suiteID), spec.Failed())
-		if !spec.Failed() {
-			return true
-		}
-	}
-	return false
-}
-
-func (runner *SpecRunner) CurrentSpecSummary() (*types.SpecSummary, bool) {
-	if runner.runningSpec == nil {
-		return nil, false
-	}
-
-	return runner.runningSpec.Summary(runner.suiteID), true
-}
-
-func (runner *SpecRunner) registerForInterrupts() {
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-
-	<-c
-	signal.Stop(c)
-	runner.markInterrupted()
-	go runner.registerForHardInterrupts()
-	runner.writer.DumpOutWithHeader(`
-Received interrupt.  Emitting contents of GinkgoWriter...
----------------------------------------------------------
-`)
-	if runner.afterSuiteNode != nil {
-		fmt.Fprint(os.Stderr, `
----------------------------------------------------------
-Received interrupt.  Running AfterSuite...
-^C again to terminate immediately
-`)
-		runner.runAfterSuite()
-	}
-	runner.reportSuiteDidEnd(false)
-	os.Exit(1)
-}
-
-func (runner *SpecRunner) registerForHardInterrupts() {
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-
-	<-c
-	fmt.Fprintln(os.Stderr, "\nReceived second interrupt.  Shutting down.")
-	os.Exit(1)
-}
-
-func (runner *SpecRunner) blockForeverIfInterrupted() {
-	runner.lock.Lock()
-	interrupted := runner.interrupted
-	runner.lock.Unlock()
-
-	if interrupted {
-		select {}
-	}
-}
-
-func (runner *SpecRunner) markInterrupted() {
-	runner.lock.Lock()
-	defer runner.lock.Unlock()
-	runner.interrupted = true
-}
-
-func (runner *SpecRunner) wasInterrupted() bool {
-	runner.lock.Lock()
-	defer runner.lock.Unlock()
-	return runner.interrupted
-}
-
-func (runner *SpecRunner) reportSuiteWillBegin() {
-	runner.startTime = time.Now()
-	summary := runner.suiteWillBeginSummary()
-	for _, reporter := range runner.reporters {
-		reporter.SpecSuiteWillBegin(runner.config, summary)
-	}
-}
-
-func (runner *SpecRunner) reportBeforeSuite(summary *types.SetupSummary) {
-	for _, reporter := range runner.reporters {
-		reporter.BeforeSuiteDidRun(summary)
-	}
-}
-
-func (runner *SpecRunner) reportAfterSuite(summary *types.SetupSummary) {
-	for _, reporter := range runner.reporters {
-		reporter.AfterSuiteDidRun(summary)
-	}
-}
-
-func (runner *SpecRunner) reportSpecWillRun(summary *types.SpecSummary) {
-	runner.writer.Truncate()
-
-	for _, reporter := range runner.reporters {
-		reporter.SpecWillRun(summary)
-	}
-}
-
-func (runner *SpecRunner) reportSpecDidComplete(summary *types.SpecSummary, failed bool) {
-	if failed && len(summary.CapturedOutput) == 0 {
-		summary.CapturedOutput = string(runner.writer.Bytes())
-	}
-	for i := len(runner.reporters) - 1; i >= 1; i-- {
-		runner.reporters[i].SpecDidComplete(summary)
-	}
-
-	if failed {
-		runner.writer.DumpOut()
-	}
-
-	runner.reporters[0].SpecDidComplete(summary)
-}
-
-func (runner *SpecRunner) reportSuiteDidEnd(success bool) {
-	summary := runner.suiteDidEndSummary(success)
-	summary.RunTime = time.Since(runner.startTime)
-	for _, reporter := range runner.reporters {
-		reporter.SpecSuiteDidEnd(summary)
-	}
-}
-
-func (runner *SpecRunner) countSpecsThatRanSatisfying(filter func(ex *spec.Spec) bool) (count int) {
-	count = 0
-
-	for _, spec := range runner.processedSpecs {
-		if filter(spec) {
-			count++
-		}
-	}
-
-	return count
-}
-
-func (runner *SpecRunner) suiteDidEndSummary(success bool) *types.SuiteSummary {
-	numberOfSpecsThatWillBeRun := runner.countSpecsThatRanSatisfying(func(ex *spec.Spec) bool {
-		return !ex.Skipped() && !ex.Pending()
-	})
-
-	numberOfPendingSpecs := runner.countSpecsThatRanSatisfying(func(ex *spec.Spec) bool {
-		return ex.Pending()
-	})
-
-	numberOfSkippedSpecs := runner.countSpecsThatRanSatisfying(func(ex *spec.Spec) bool {
-		return ex.Skipped()
-	})
-
-	numberOfPassedSpecs := runner.countSpecsThatRanSatisfying(func(ex *spec.Spec) bool {
-		return ex.Passed()
-	})
-
-	numberOfFlakedSpecs := runner.countSpecsThatRanSatisfying(func(ex *spec.Spec) bool {
-		return ex.Flaked()
-	})
-
-	numberOfFailedSpecs := runner.countSpecsThatRanSatisfying(func(ex *spec.Spec) bool {
-		return ex.Failed()
-	})
-
-	if runner.beforeSuiteNode != nil && !runner.beforeSuiteNode.Passed() && !runner.config.DryRun {
-		var known bool
-		numberOfSpecsThatWillBeRun, known = runner.iterator.NumberOfSpecsThatWillBeRunIfKnown()
-		if !known {
-			numberOfSpecsThatWillBeRun = runner.iterator.NumberOfSpecsPriorToIteration()
-		}
-		numberOfFailedSpecs = numberOfSpecsThatWillBeRun
-	}
-
-	return &types.SuiteSummary{
-		SuiteDescription: runner.description,
-		SuiteSucceeded:   success,
-		SuiteID:          runner.suiteID,
-
-		NumberOfSpecsBeforeParallelization: runner.iterator.NumberOfSpecsPriorToIteration(),
-		NumberOfTotalSpecs:                 len(runner.processedSpecs),
-		NumberOfSpecsThatWillBeRun:         numberOfSpecsThatWillBeRun,
-		NumberOfPendingSpecs:               numberOfPendingSpecs,
-		NumberOfSkippedSpecs:               numberOfSkippedSpecs,
-		NumberOfPassedSpecs:                numberOfPassedSpecs,
-		NumberOfFailedSpecs:                numberOfFailedSpecs,
-		NumberOfFlakedSpecs:                numberOfFlakedSpecs,
-	}
-}
-
-func (runner *SpecRunner) suiteWillBeginSummary() *types.SuiteSummary {
-	numTotal, known := runner.iterator.NumberOfSpecsToProcessIfKnown()
-	if !known {
-		numTotal = -1
-	}
-
-	numToRun, known := runner.iterator.NumberOfSpecsThatWillBeRunIfKnown()
-	if !known {
-		numToRun = -1
-	}
-
-	return &types.SuiteSummary{
-		SuiteDescription: runner.description,
-		SuiteID:          runner.suiteID,
-
-		NumberOfSpecsBeforeParallelization: runner.iterator.NumberOfSpecsPriorToIteration(),
-		NumberOfTotalSpecs:                 numTotal,
-		NumberOfSpecsThatWillBeRun:         numToRun,
-		NumberOfPendingSpecs:               -1,
-		NumberOfSkippedSpecs:               -1,
-		NumberOfPassedSpecs:                -1,
-		NumberOfFailedSpecs:                -1,
-		NumberOfFlakedSpecs:                -1,
-	}
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/suite/suite.go b/vendor/github.com/onsi/ginkgo/internal/suite/suite.go
deleted file mode 100644
index 698a6e5689..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/suite/suite.go
+++ /dev/null
@@ -1,183 +0,0 @@
-package suite
-
-import (
-	"math/rand"
-	"net/http"
-	"time"
-
-	"github.com/onsi/ginkgo/internal/spec_iterator"
-
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/internal/containernode"
-	"github.com/onsi/ginkgo/internal/failer"
-	"github.com/onsi/ginkgo/internal/leafnodes"
-	"github.com/onsi/ginkgo/internal/spec"
-	"github.com/onsi/ginkgo/internal/specrunner"
-	"github.com/onsi/ginkgo/internal/writer"
-	"github.com/onsi/ginkgo/reporters"
-	"github.com/onsi/ginkgo/types"
-)
-
-type ginkgoTestingT interface {
-	Fail()
-}
-
-type Suite struct {
-	topLevelContainer *containernode.ContainerNode
-	currentContainer  *containernode.ContainerNode
-	containerIndex    int
-	beforeSuiteNode   leafnodes.SuiteNode
-	afterSuiteNode    leafnodes.SuiteNode
-	runner            *specrunner.SpecRunner
-	failer            *failer.Failer
-	running           bool
-}
-
-func New(failer *failer.Failer) *Suite {
-	topLevelContainer := containernode.New("[Top Level]", types.FlagTypeNone, types.CodeLocation{})
-
-	return &Suite{
-		topLevelContainer: topLevelContainer,
-		currentContainer:  topLevelContainer,
-		failer:            failer,
-		containerIndex:    1,
-	}
-}
-
-func (suite *Suite) Run(t ginkgoTestingT, description string, reporters []reporters.Reporter, writer writer.WriterInterface, config config.GinkgoConfigType) (bool, bool) {
-	if config.ParallelTotal < 1 {
-		panic("ginkgo.parallel.total must be >= 1")
-	}
-
-	if config.ParallelNode > config.ParallelTotal || config.ParallelNode < 1 {
-		panic("ginkgo.parallel.node is one-indexed and must be <= ginkgo.parallel.total")
-	}
-
-	r := rand.New(rand.NewSource(config.RandomSeed))
-	suite.topLevelContainer.Shuffle(r)
-	iterator, hasProgrammaticFocus := suite.generateSpecsIterator(description, config)
-	suite.runner = specrunner.New(description, suite.beforeSuiteNode, iterator, suite.afterSuiteNode, reporters, writer, config)
-
-	suite.running = true
-	success := suite.runner.Run()
-	if !success {
-		t.Fail()
-	}
-	return success, hasProgrammaticFocus
-}
-
-func (suite *Suite) generateSpecsIterator(description string, config config.GinkgoConfigType) (spec_iterator.SpecIterator, bool) {
-	specsSlice := []*spec.Spec{}
-	suite.topLevelContainer.BackPropagateProgrammaticFocus()
-	for _, collatedNodes := range suite.topLevelContainer.Collate() {
-		specsSlice = append(specsSlice, spec.New(collatedNodes.Subject, collatedNodes.Containers, config.EmitSpecProgress))
-	}
-
-	specs := spec.NewSpecs(specsSlice)
-	specs.RegexScansFilePath = config.RegexScansFilePath
-
-	if config.RandomizeAllSpecs {
-		specs.Shuffle(rand.New(rand.NewSource(config.RandomSeed)))
-	}
-
-	specs.ApplyFocus(description, config.FocusString, config.SkipString)
-
-	if config.SkipMeasurements {
-		specs.SkipMeasurements()
-	}
-
-	var iterator spec_iterator.SpecIterator
-
-	if config.ParallelTotal > 1 {
-		iterator = spec_iterator.NewParallelIterator(specs.Specs(), config.SyncHost)
-		resp, err := http.Get(config.SyncHost + "/has-counter")
-		if err != nil || resp.StatusCode != http.StatusOK {
-			iterator = spec_iterator.NewShardedParallelIterator(specs.Specs(), config.ParallelTotal, config.ParallelNode)
-		}
-	} else {
-		iterator = spec_iterator.NewSerialIterator(specs.Specs())
-	}
-
-	return iterator, specs.HasProgrammaticFocus()
-}
-
-func (suite *Suite) CurrentRunningSpecSummary() (*types.SpecSummary, bool) {
-	return suite.runner.CurrentSpecSummary()
-}
-
-func (suite *Suite) SetBeforeSuiteNode(body interface{}, codeLocation types.CodeLocation, timeout time.Duration) {
-	if suite.beforeSuiteNode != nil {
-		panic("You may only call BeforeSuite once!")
-	}
-	suite.beforeSuiteNode = leafnodes.NewBeforeSuiteNode(body, codeLocation, timeout, suite.failer)
-}
-
-func (suite *Suite) SetAfterSuiteNode(body interface{}, codeLocation types.CodeLocation, timeout time.Duration) {
-	if suite.afterSuiteNode != nil {
-		panic("You may only call AfterSuite once!")
-	}
-	suite.afterSuiteNode = leafnodes.NewAfterSuiteNode(body, codeLocation, timeout, suite.failer)
-}
-
-func (suite *Suite) SetSynchronizedBeforeSuiteNode(bodyA interface{}, bodyB interface{}, codeLocation types.CodeLocation, timeout time.Duration) {
-	if suite.beforeSuiteNode != nil {
-		panic("You may only call BeforeSuite once!")
-	}
-	suite.beforeSuiteNode = leafnodes.NewSynchronizedBeforeSuiteNode(bodyA, bodyB, codeLocation, timeout, suite.failer)
-}
-
-func (suite *Suite) SetSynchronizedAfterSuiteNode(bodyA interface{}, bodyB interface{}, codeLocation types.CodeLocation, timeout time.Duration) {
-	if suite.afterSuiteNode != nil {
-		panic("You may only call AfterSuite once!")
-	}
-	suite.afterSuiteNode = leafnodes.NewSynchronizedAfterSuiteNode(bodyA, bodyB, codeLocation, timeout, suite.failer)
-}
-
-func (suite *Suite) PushContainerNode(text string, body func(), flag types.FlagType, codeLocation types.CodeLocation) {
-	container := containernode.New(text, flag, codeLocation)
-	suite.currentContainer.PushContainerNode(container)
-
-	previousContainer := suite.currentContainer
-	suite.currentContainer = container
-	suite.containerIndex++
-
-	body()
-
-	suite.containerIndex--
-	suite.currentContainer = previousContainer
-}
-
-func (suite *Suite) PushItNode(text string, body interface{}, flag types.FlagType, codeLocation types.CodeLocation, timeout time.Duration) {
-	if suite.running {
-		suite.failer.Fail("You may only call It from within a Describe or Context", codeLocation)
-	}
-	suite.currentContainer.PushSubjectNode(leafnodes.NewItNode(text, body, flag, codeLocation, timeout, suite.failer, suite.containerIndex))
-}
-
-func (suite *Suite) PushMeasureNode(text string, body interface{}, flag types.FlagType, codeLocation types.CodeLocation, samples int) {
-	if suite.running {
-		suite.failer.Fail("You may only call Measure from within a Describe or Context", codeLocation)
-	}
-	suite.currentContainer.PushSubjectNode(leafnodes.NewMeasureNode(text, body, flag, codeLocation, samples, suite.failer, suite.containerIndex))
-}
-
-func (suite *Suite) PushBeforeEachNode(body interface{}, codeLocation types.CodeLocation, timeout time.Duration) {
-	if suite.running {
-		suite.failer.Fail("You may only call BeforeEach from within a Describe or Context", codeLocation)
-	}
-	suite.currentContainer.PushSetupNode(leafnodes.NewBeforeEachNode(body, codeLocation, timeout, suite.failer, suite.containerIndex))
-}
-
-func (suite *Suite) PushJustBeforeEachNode(body interface{}, codeLocation types.CodeLocation, timeout time.Duration) {
-	if suite.running {
-		suite.failer.Fail("You may only call JustBeforeEach from within a Describe or Context", codeLocation)
-	}
-	suite.currentContainer.PushSetupNode(leafnodes.NewJustBeforeEachNode(body, codeLocation, timeout, suite.failer, suite.containerIndex))
-}
-
-func (suite *Suite) PushAfterEachNode(body interface{}, codeLocation types.CodeLocation, timeout time.Duration) {
-	if suite.running {
-		suite.failer.Fail("You may only call AfterEach from within a Describe or Context", codeLocation)
-	}
-	suite.currentContainer.PushSetupNode(leafnodes.NewAfterEachNode(body, codeLocation, timeout, suite.failer, suite.containerIndex))
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/testingtproxy/testing_t_proxy.go b/vendor/github.com/onsi/ginkgo/internal/testingtproxy/testing_t_proxy.go
deleted file mode 100644
index 090445d084..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/testingtproxy/testing_t_proxy.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package testingtproxy
-
-import (
-	"fmt"
-	"io"
-)
-
-type failFunc func(message string, callerSkip ...int)
-
-func New(writer io.Writer, fail failFunc, offset int) *ginkgoTestingTProxy {
-	return &ginkgoTestingTProxy{
-		fail:   fail,
-		offset: offset,
-		writer: writer,
-	}
-}
-
-type ginkgoTestingTProxy struct {
-	fail   failFunc
-	offset int
-	writer io.Writer
-}
-
-func (t *ginkgoTestingTProxy) Error(args ...interface{}) {
-	t.fail(fmt.Sprintln(args...), t.offset)
-}
-
-func (t *ginkgoTestingTProxy) Errorf(format string, args ...interface{}) {
-	t.fail(fmt.Sprintf(format, args...), t.offset)
-}
-
-func (t *ginkgoTestingTProxy) Fail() {
-	t.fail("failed", t.offset)
-}
-
-func (t *ginkgoTestingTProxy) FailNow() {
-	t.fail("failed", t.offset)
-}
-
-func (t *ginkgoTestingTProxy) Fatal(args ...interface{}) {
-	t.fail(fmt.Sprintln(args...), t.offset)
-}
-
-func (t *ginkgoTestingTProxy) Fatalf(format string, args ...interface{}) {
-	t.fail(fmt.Sprintf(format, args...), t.offset)
-}
-
-func (t *ginkgoTestingTProxy) Log(args ...interface{}) {
-	fmt.Fprintln(t.writer, args...)
-}
-
-func (t *ginkgoTestingTProxy) Logf(format string, args ...interface{}) {
-	t.Log(fmt.Sprintf(format, args...))
-}
-
-func (t *ginkgoTestingTProxy) Failed() bool {
-	return false
-}
-
-func (t *ginkgoTestingTProxy) Parallel() {
-}
-
-func (t *ginkgoTestingTProxy) Skip(args ...interface{}) {
-	fmt.Println(args...)
-}
-
-func (t *ginkgoTestingTProxy) Skipf(format string, args ...interface{}) {
-	t.Skip(fmt.Sprintf(format, args...))
-}
-
-func (t *ginkgoTestingTProxy) SkipNow() {
-}
-
-func (t *ginkgoTestingTProxy) Skipped() bool {
-	return false
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/writer/fake_writer.go b/vendor/github.com/onsi/ginkgo/internal/writer/fake_writer.go
deleted file mode 100644
index 6739c3f605..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/writer/fake_writer.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package writer
-
-type FakeGinkgoWriter struct {
-	EventStream []string
-}
-
-func NewFake() *FakeGinkgoWriter {
-	return &FakeGinkgoWriter{
-		EventStream: []string{},
-	}
-}
-
-func (writer *FakeGinkgoWriter) AddEvent(event string) {
-	writer.EventStream = append(writer.EventStream, event)
-}
-
-func (writer *FakeGinkgoWriter) Truncate() {
-	writer.EventStream = append(writer.EventStream, "TRUNCATE")
-}
-
-func (writer *FakeGinkgoWriter) DumpOut() {
-	writer.EventStream = append(writer.EventStream, "DUMP")
-}
-
-func (writer *FakeGinkgoWriter) DumpOutWithHeader(header string) {
-	writer.EventStream = append(writer.EventStream, "DUMP_WITH_HEADER: "+header)
-}
-
-func (writer *FakeGinkgoWriter) Bytes() []byte {
-	writer.EventStream = append(writer.EventStream, "BYTES")
-	return nil
-}
-
-func (writer *FakeGinkgoWriter) Write(data []byte) (n int, err error) {
-	return 0, nil
-}
diff --git a/vendor/github.com/onsi/ginkgo/internal/writer/writer.go b/vendor/github.com/onsi/ginkgo/internal/writer/writer.go
deleted file mode 100644
index 6b23b1a648..0000000000
--- a/vendor/github.com/onsi/ginkgo/internal/writer/writer.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package writer
-
-import (
-	"bytes"
-	"io"
-	"sync"
-)
-
-type WriterInterface interface {
-	io.Writer
-
-	Truncate()
-	DumpOut()
-	DumpOutWithHeader(header string)
-	Bytes() []byte
-}
-
-type Writer struct {
-	buffer    *bytes.Buffer
-	outWriter io.Writer
-	lock      *sync.Mutex
-	stream    bool
-}
-
-func New(outWriter io.Writer) *Writer {
-	return &Writer{
-		buffer:    &bytes.Buffer{},
-		lock:      &sync.Mutex{},
-		outWriter: outWriter,
-		stream:    true,
-	}
-}
-
-func (w *Writer) SetStream(stream bool) {
-	w.lock.Lock()
-	defer w.lock.Unlock()
-	w.stream = stream
-}
-
-func (w *Writer) Write(b []byte) (n int, err error) {
-	w.lock.Lock()
-	defer w.lock.Unlock()
-
-	n, err = w.buffer.Write(b)
-	if w.stream {
-		return w.outWriter.Write(b)
-	}
-	return n, err
-}
-
-func (w *Writer) Truncate() {
-	w.lock.Lock()
-	defer w.lock.Unlock()
-	w.buffer.Reset()
-}
-
-func (w *Writer) DumpOut() {
-	w.lock.Lock()
-	defer w.lock.Unlock()
-	if !w.stream {
-		w.buffer.WriteTo(w.outWriter)
-	}
-}
-
-func (w *Writer) Bytes() []byte {
-	w.lock.Lock()
-	defer w.lock.Unlock()
-	b := w.buffer.Bytes()
-	copied := make([]byte, len(b))
-	copy(copied, b)
-	return copied
-}
-
-func (w *Writer) DumpOutWithHeader(header string) {
-	w.lock.Lock()
-	defer w.lock.Unlock()
-	if !w.stream && w.buffer.Len() > 0 {
-		w.outWriter.Write([]byte(header))
-		w.buffer.WriteTo(w.outWriter)
-	}
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/default_reporter.go b/vendor/github.com/onsi/ginkgo/reporters/default_reporter.go
deleted file mode 100644
index fb82f70a6d..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/default_reporter.go
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-Ginkgo's Default Reporter
-
-A number of command line flags are available to tweak Ginkgo's default output.
-
-These are documented [here](http://onsi.github.io/ginkgo/#running_tests)
-*/
-package reporters
-
-import (
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/reporters/stenographer"
-	"github.com/onsi/ginkgo/types"
-)
-
-type DefaultReporter struct {
-	config        config.DefaultReporterConfigType
-	stenographer  stenographer.Stenographer
-	specSummaries []*types.SpecSummary
-}
-
-func NewDefaultReporter(config config.DefaultReporterConfigType, stenographer stenographer.Stenographer) *DefaultReporter {
-	return &DefaultReporter{
-		config:       config,
-		stenographer: stenographer,
-	}
-}
-
-func (reporter *DefaultReporter) SpecSuiteWillBegin(config config.GinkgoConfigType, summary *types.SuiteSummary) {
-	reporter.stenographer.AnnounceSuite(summary.SuiteDescription, config.RandomSeed, config.RandomizeAllSpecs, reporter.config.Succinct)
-	if config.ParallelTotal > 1 {
-		reporter.stenographer.AnnounceParallelRun(config.ParallelNode, config.ParallelTotal, reporter.config.Succinct)
-	} else {
-		reporter.stenographer.AnnounceNumberOfSpecs(summary.NumberOfSpecsThatWillBeRun, summary.NumberOfTotalSpecs, reporter.config.Succinct)
-	}
-}
-
-func (reporter *DefaultReporter) BeforeSuiteDidRun(setupSummary *types.SetupSummary) {
-	if setupSummary.State != types.SpecStatePassed {
-		reporter.stenographer.AnnounceBeforeSuiteFailure(setupSummary, reporter.config.Succinct, reporter.config.FullTrace)
-	}
-}
-
-func (reporter *DefaultReporter) AfterSuiteDidRun(setupSummary *types.SetupSummary) {
-	if setupSummary.State != types.SpecStatePassed {
-		reporter.stenographer.AnnounceAfterSuiteFailure(setupSummary, reporter.config.Succinct, reporter.config.FullTrace)
-	}
-}
-
-func (reporter *DefaultReporter) SpecWillRun(specSummary *types.SpecSummary) {
-	if reporter.config.Verbose && !reporter.config.Succinct && specSummary.State != types.SpecStatePending && specSummary.State != types.SpecStateSkipped {
-		reporter.stenographer.AnnounceSpecWillRun(specSummary)
-	}
-}
-
-func (reporter *DefaultReporter) SpecDidComplete(specSummary *types.SpecSummary) {
-	switch specSummary.State {
-	case types.SpecStatePassed:
-		if specSummary.IsMeasurement {
-			reporter.stenographer.AnnounceSuccesfulMeasurement(specSummary, reporter.config.Succinct)
-		} else if specSummary.RunTime.Seconds() >= reporter.config.SlowSpecThreshold {
-			reporter.stenographer.AnnounceSuccesfulSlowSpec(specSummary, reporter.config.Succinct)
-		} else {
-			reporter.stenographer.AnnounceSuccesfulSpec(specSummary)
-		}
-	case types.SpecStatePending:
-		reporter.stenographer.AnnouncePendingSpec(specSummary, reporter.config.NoisyPendings && !reporter.config.Succinct)
-	case types.SpecStateSkipped:
-		reporter.stenographer.AnnounceSkippedSpec(specSummary, reporter.config.Succinct, reporter.config.FullTrace)
-	case types.SpecStateTimedOut:
-		reporter.stenographer.AnnounceSpecTimedOut(specSummary, reporter.config.Succinct, reporter.config.FullTrace)
-	case types.SpecStatePanicked:
-		reporter.stenographer.AnnounceSpecPanicked(specSummary, reporter.config.Succinct, reporter.config.FullTrace)
-	case types.SpecStateFailed:
-		reporter.stenographer.AnnounceSpecFailed(specSummary, reporter.config.Succinct, reporter.config.FullTrace)
-	}
-
-	reporter.specSummaries = append(reporter.specSummaries, specSummary)
-}
-
-func (reporter *DefaultReporter) SpecSuiteDidEnd(summary *types.SuiteSummary) {
-	reporter.stenographer.SummarizeFailures(reporter.specSummaries)
-	reporter.stenographer.AnnounceSpecRunCompletion(summary, reporter.config.Succinct)
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/fake_reporter.go b/vendor/github.com/onsi/ginkgo/reporters/fake_reporter.go
deleted file mode 100644
index 27db479490..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/fake_reporter.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package reporters
-
-import (
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/types"
-)
-
-//FakeReporter is useful for testing purposes
-type FakeReporter struct {
-	Config config.GinkgoConfigType
-
-	BeginSummary         *types.SuiteSummary
-	BeforeSuiteSummary   *types.SetupSummary
-	SpecWillRunSummaries []*types.SpecSummary
-	SpecSummaries        []*types.SpecSummary
-	AfterSuiteSummary    *types.SetupSummary
-	EndSummary           *types.SuiteSummary
-
-	SpecWillRunStub     func(specSummary *types.SpecSummary)
-	SpecDidCompleteStub func(specSummary *types.SpecSummary)
-}
-
-func NewFakeReporter() *FakeReporter {
-	return &FakeReporter{
-		SpecWillRunSummaries: make([]*types.SpecSummary, 0),
-		SpecSummaries:        make([]*types.SpecSummary, 0),
-	}
-}
-
-func (fakeR *FakeReporter) SpecSuiteWillBegin(config config.GinkgoConfigType, summary *types.SuiteSummary) {
-	fakeR.Config = config
-	fakeR.BeginSummary = summary
-}
-
-func (fakeR *FakeReporter) BeforeSuiteDidRun(setupSummary *types.SetupSummary) {
-	fakeR.BeforeSuiteSummary = setupSummary
-}
-
-func (fakeR *FakeReporter) SpecWillRun(specSummary *types.SpecSummary) {
-	if fakeR.SpecWillRunStub != nil {
-		fakeR.SpecWillRunStub(specSummary)
-	}
-	fakeR.SpecWillRunSummaries = append(fakeR.SpecWillRunSummaries, specSummary)
-}
-
-func (fakeR *FakeReporter) SpecDidComplete(specSummary *types.SpecSummary) {
-	if fakeR.SpecDidCompleteStub != nil {
-		fakeR.SpecDidCompleteStub(specSummary)
-	}
-	fakeR.SpecSummaries = append(fakeR.SpecSummaries, specSummary)
-}
-
-func (fakeR *FakeReporter) AfterSuiteDidRun(setupSummary *types.SetupSummary) {
-	fakeR.AfterSuiteSummary = setupSummary
-}
-
-func (fakeR *FakeReporter) SpecSuiteDidEnd(summary *types.SuiteSummary) {
-	fakeR.EndSummary = summary
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/junit_reporter.go b/vendor/github.com/onsi/ginkgo/reporters/junit_reporter.go
deleted file mode 100644
index 89b03513fd..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/junit_reporter.go
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-
-JUnit XML Reporter for Ginkgo
-
-For usage instructions: http://onsi.github.io/ginkgo/#generating_junit_xml_output
-
-*/
-
-package reporters
-
-import (
-	"encoding/xml"
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/types"
-)
-
-type JUnitTestSuite struct {
-	XMLName   xml.Name        `xml:"testsuite"`
-	TestCases []JUnitTestCase `xml:"testcase"`
-	Tests     int             `xml:"tests,attr"`
-	Failures  int             `xml:"failures,attr"`
-	Time      float64         `xml:"time,attr"`
-}
-
-type JUnitTestCase struct {
-	Name           string               `xml:"name,attr"`
-	ClassName      string               `xml:"classname,attr"`
-	FailureMessage *JUnitFailureMessage `xml:"failure,omitempty"`
-	Skipped        *JUnitSkipped        `xml:"skipped,omitempty"`
-	Time           float64              `xml:"time,attr"`
-	SystemOut      string               `xml:"system-out,omitempty"`
-}
-
-type JUnitFailureMessage struct {
-	Type    string `xml:"type,attr"`
-	Message string `xml:",chardata"`
-}
-
-type JUnitSkipped struct {
-	XMLName xml.Name `xml:"skipped"`
-}
-
-type JUnitReporter struct {
-	suite         JUnitTestSuite
-	filename      string
-	testSuiteName string
-}
-
-//NewJUnitReporter creates a new JUnit XML reporter.  The XML will be stored in the passed in filename.
-func NewJUnitReporter(filename string) *JUnitReporter {
-	return &JUnitReporter{
-		filename: filename,
-	}
-}
-
-func (reporter *JUnitReporter) SpecSuiteWillBegin(config config.GinkgoConfigType, summary *types.SuiteSummary) {
-	reporter.suite = JUnitTestSuite{
-		TestCases: []JUnitTestCase{},
-	}
-	reporter.testSuiteName = summary.SuiteDescription
-}
-
-func (reporter *JUnitReporter) SpecWillRun(specSummary *types.SpecSummary) {
-}
-
-func (reporter *JUnitReporter) BeforeSuiteDidRun(setupSummary *types.SetupSummary) {
-	reporter.handleSetupSummary("BeforeSuite", setupSummary)
-}
-
-func (reporter *JUnitReporter) AfterSuiteDidRun(setupSummary *types.SetupSummary) {
-	reporter.handleSetupSummary("AfterSuite", setupSummary)
-}
-
-func failureMessage(failure types.SpecFailure) string {
-	return fmt.Sprintf("%s\n%s\n%s", failure.ComponentCodeLocation.String(), failure.Message, failure.Location.String())
-}
-
-func (reporter *JUnitReporter) handleSetupSummary(name string, setupSummary *types.SetupSummary) {
-	if setupSummary.State != types.SpecStatePassed {
-		testCase := JUnitTestCase{
-			Name:      name,
-			ClassName: reporter.testSuiteName,
-		}
-
-		testCase.FailureMessage = &JUnitFailureMessage{
-			Type:    reporter.failureTypeForState(setupSummary.State),
-			Message: failureMessage(setupSummary.Failure),
-		}
-		testCase.SystemOut = setupSummary.CapturedOutput
-		testCase.Time = setupSummary.RunTime.Seconds()
-		reporter.suite.TestCases = append(reporter.suite.TestCases, testCase)
-	}
-}
-
-func (reporter *JUnitReporter) SpecDidComplete(specSummary *types.SpecSummary) {
-	testCase := JUnitTestCase{
-		Name:      strings.Join(specSummary.ComponentTexts[1:], " "),
-		ClassName: reporter.testSuiteName,
-	}
-	if specSummary.State == types.SpecStateFailed || specSummary.State == types.SpecStateTimedOut || specSummary.State == types.SpecStatePanicked {
-		testCase.FailureMessage = &JUnitFailureMessage{
-			Type:    reporter.failureTypeForState(specSummary.State),
-			Message: failureMessage(specSummary.Failure),
-		}
-		testCase.SystemOut = specSummary.CapturedOutput
-	}
-	if specSummary.State == types.SpecStateSkipped || specSummary.State == types.SpecStatePending {
-		testCase.Skipped = &JUnitSkipped{}
-	}
-	testCase.Time = specSummary.RunTime.Seconds()
-	reporter.suite.TestCases = append(reporter.suite.TestCases, testCase)
-}
-
-func (reporter *JUnitReporter) SpecSuiteDidEnd(summary *types.SuiteSummary) {
-	reporter.suite.Tests = summary.NumberOfSpecsThatWillBeRun
-	reporter.suite.Time = summary.RunTime.Seconds()
-	reporter.suite.Failures = summary.NumberOfFailedSpecs
-	file, err := os.Create(reporter.filename)
-	if err != nil {
-		fmt.Printf("Failed to create JUnit report file: %s\n\t%s", reporter.filename, err.Error())
-	}
-	defer file.Close()
-	file.WriteString(xml.Header)
-	encoder := xml.NewEncoder(file)
-	encoder.Indent("  ", "    ")
-	err = encoder.Encode(reporter.suite)
-	if err != nil {
-		fmt.Printf("Failed to generate JUnit report\n\t%s", err.Error())
-	}
-}
-
-func (reporter *JUnitReporter) failureTypeForState(state types.SpecState) string {
-	switch state {
-	case types.SpecStateFailed:
-		return "Failure"
-	case types.SpecStateTimedOut:
-		return "Timeout"
-	case types.SpecStatePanicked:
-		return "Panic"
-	default:
-		return ""
-	}
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/reporter.go b/vendor/github.com/onsi/ginkgo/reporters/reporter.go
deleted file mode 100644
index 348b9dfce1..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/reporter.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package reporters
-
-import (
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/types"
-)
-
-type Reporter interface {
-	SpecSuiteWillBegin(config config.GinkgoConfigType, summary *types.SuiteSummary)
-	BeforeSuiteDidRun(setupSummary *types.SetupSummary)
-	SpecWillRun(specSummary *types.SpecSummary)
-	SpecDidComplete(specSummary *types.SpecSummary)
-	AfterSuiteDidRun(setupSummary *types.SetupSummary)
-	SpecSuiteDidEnd(summary *types.SuiteSummary)
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/console_logging.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/console_logging.go
deleted file mode 100644
index 45b8f88690..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/console_logging.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package stenographer
-
-import (
-	"fmt"
-	"strings"
-)
-
-func (s *consoleStenographer) colorize(colorCode string, format string, args ...interface{}) string {
-	var out string
-
-	if len(args) > 0 {
-		out = fmt.Sprintf(format, args...)
-	} else {
-		out = format
-	}
-
-	if s.color {
-		return fmt.Sprintf("%s%s%s", colorCode, out, defaultStyle)
-	} else {
-		return out
-	}
-}
-
-func (s *consoleStenographer) printBanner(text string, bannerCharacter string) {
-	fmt.Fprintln(s.w, text)
-	fmt.Fprintln(s.w, strings.Repeat(bannerCharacter, len(text)))
-}
-
-func (s *consoleStenographer) printNewLine() {
-	fmt.Fprintln(s.w, "")
-}
-
-func (s *consoleStenographer) printDelimiter() {
-	fmt.Fprintln(s.w, s.colorize(grayColor, "%s", strings.Repeat("-", 30)))
-}
-
-func (s *consoleStenographer) print(indentation int, format string, args ...interface{}) {
-	fmt.Fprint(s.w, s.indent(indentation, format, args...))
-}
-
-func (s *consoleStenographer) println(indentation int, format string, args ...interface{}) {
-	fmt.Fprintln(s.w, s.indent(indentation, format, args...))
-}
-
-func (s *consoleStenographer) indent(indentation int, format string, args ...interface{}) string {
-	var text string
-
-	if len(args) > 0 {
-		text = fmt.Sprintf(format, args...)
-	} else {
-		text = format
-	}
-
-	stringArray := strings.Split(text, "\n")
-	padding := ""
-	if indentation >= 0 {
-		padding = strings.Repeat("  ", indentation)
-	}
-	for i, s := range stringArray {
-		stringArray[i] = fmt.Sprintf("%s%s", padding, s)
-	}
-
-	return strings.Join(stringArray, "\n")
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/fake_stenographer.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/fake_stenographer.go
deleted file mode 100644
index 98854e7d9a..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/fake_stenographer.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package stenographer
-
-import (
-	"sync"
-
-	"github.com/onsi/ginkgo/types"
-)
-
-func NewFakeStenographerCall(method string, args ...interface{}) FakeStenographerCall {
-	return FakeStenographerCall{
-		Method: method,
-		Args:   args,
-	}
-}
-
-type FakeStenographer struct {
-	calls []FakeStenographerCall
-	lock  *sync.Mutex
-}
-
-type FakeStenographerCall struct {
-	Method string
-	Args   []interface{}
-}
-
-func NewFakeStenographer() *FakeStenographer {
-	stenographer := &FakeStenographer{
-		lock: &sync.Mutex{},
-	}
-	stenographer.Reset()
-	return stenographer
-}
-
-func (stenographer *FakeStenographer) Calls() []FakeStenographerCall {
-	stenographer.lock.Lock()
-	defer stenographer.lock.Unlock()
-
-	return stenographer.calls
-}
-
-func (stenographer *FakeStenographer) Reset() {
-	stenographer.lock.Lock()
-	defer stenographer.lock.Unlock()
-
-	stenographer.calls = make([]FakeStenographerCall, 0)
-}
-
-func (stenographer *FakeStenographer) CallsTo(method string) []FakeStenographerCall {
-	stenographer.lock.Lock()
-	defer stenographer.lock.Unlock()
-
-	results := make([]FakeStenographerCall, 0)
-	for _, call := range stenographer.calls {
-		if call.Method == method {
-			results = append(results, call)
-		}
-	}
-
-	return results
-}
-
-func (stenographer *FakeStenographer) registerCall(method string, args ...interface{}) {
-	stenographer.lock.Lock()
-	defer stenographer.lock.Unlock()
-
-	stenographer.calls = append(stenographer.calls, NewFakeStenographerCall(method, args...))
-}
-
-func (stenographer *FakeStenographer) AnnounceSuite(description string, randomSeed int64, randomizingAll bool, succinct bool) {
-	stenographer.registerCall("AnnounceSuite", description, randomSeed, randomizingAll, succinct)
-}
-
-func (stenographer *FakeStenographer) AnnounceAggregatedParallelRun(nodes int, succinct bool) {
-	stenographer.registerCall("AnnounceAggregatedParallelRun", nodes, succinct)
-}
-
-func (stenographer *FakeStenographer) AnnounceParallelRun(node int, nodes int, succinct bool) {
-	stenographer.registerCall("AnnounceParallelRun", node, nodes, succinct)
-}
-
-func (stenographer *FakeStenographer) AnnounceNumberOfSpecs(specsToRun int, total int, succinct bool) {
-	stenographer.registerCall("AnnounceNumberOfSpecs", specsToRun, total, succinct)
-}
-
-func (stenographer *FakeStenographer) AnnounceTotalNumberOfSpecs(total int, succinct bool) {
-	stenographer.registerCall("AnnounceTotalNumberOfSpecs", total, succinct)
-}
-
-func (stenographer *FakeStenographer) AnnounceSpecRunCompletion(summary *types.SuiteSummary, succinct bool) {
-	stenographer.registerCall("AnnounceSpecRunCompletion", summary, succinct)
-}
-
-func (stenographer *FakeStenographer) AnnounceSpecWillRun(spec *types.SpecSummary) {
-	stenographer.registerCall("AnnounceSpecWillRun", spec)
-}
-
-func (stenographer *FakeStenographer) AnnounceBeforeSuiteFailure(summary *types.SetupSummary, succinct bool, fullTrace bool) {
-	stenographer.registerCall("AnnounceBeforeSuiteFailure", summary, succinct, fullTrace)
-}
-
-func (stenographer *FakeStenographer) AnnounceAfterSuiteFailure(summary *types.SetupSummary, succinct bool, fullTrace bool) {
-	stenographer.registerCall("AnnounceAfterSuiteFailure", summary, succinct, fullTrace)
-}
-func (stenographer *FakeStenographer) AnnounceCapturedOutput(output string) {
-	stenographer.registerCall("AnnounceCapturedOutput", output)
-}
-
-func (stenographer *FakeStenographer) AnnounceSuccesfulSpec(spec *types.SpecSummary) {
-	stenographer.registerCall("AnnounceSuccesfulSpec", spec)
-}
-
-func (stenographer *FakeStenographer) AnnounceSuccesfulSlowSpec(spec *types.SpecSummary, succinct bool) {
-	stenographer.registerCall("AnnounceSuccesfulSlowSpec", spec, succinct)
-}
-
-func (stenographer *FakeStenographer) AnnounceSuccesfulMeasurement(spec *types.SpecSummary, succinct bool) {
-	stenographer.registerCall("AnnounceSuccesfulMeasurement", spec, succinct)
-}
-
-func (stenographer *FakeStenographer) AnnouncePendingSpec(spec *types.SpecSummary, noisy bool) {
-	stenographer.registerCall("AnnouncePendingSpec", spec, noisy)
-}
-
-func (stenographer *FakeStenographer) AnnounceSkippedSpec(spec *types.SpecSummary, succinct bool, fullTrace bool) {
-	stenographer.registerCall("AnnounceSkippedSpec", spec, succinct, fullTrace)
-}
-
-func (stenographer *FakeStenographer) AnnounceSpecTimedOut(spec *types.SpecSummary, succinct bool, fullTrace bool) {
-	stenographer.registerCall("AnnounceSpecTimedOut", spec, succinct, fullTrace)
-}
-
-func (stenographer *FakeStenographer) AnnounceSpecPanicked(spec *types.SpecSummary, succinct bool, fullTrace bool) {
-	stenographer.registerCall("AnnounceSpecPanicked", spec, succinct, fullTrace)
-}
-
-func (stenographer *FakeStenographer) AnnounceSpecFailed(spec *types.SpecSummary, succinct bool, fullTrace bool) {
-	stenographer.registerCall("AnnounceSpecFailed", spec, succinct, fullTrace)
-}
-
-func (stenographer *FakeStenographer) SummarizeFailures(summaries []*types.SpecSummary) {
-	stenographer.registerCall("SummarizeFailures", summaries)
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/stenographer.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/stenographer.go
deleted file mode 100644
index fefd3e182f..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/stenographer.go
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
-The stenographer is used by Ginkgo's reporters to generate output.
-
-Move along, nothing to see here.
-*/
-
-package stenographer
-
-import (
-	"fmt"
-	"io"
-	"runtime"
-	"strings"
-
-	"github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable"
-	"github.com/onsi/ginkgo/types"
-)
-
-const defaultStyle = "\x1b[0m"
-const boldStyle = "\x1b[1m"
-const redColor = "\x1b[91m"
-const greenColor = "\x1b[32m"
-const yellowColor = "\x1b[33m"
-const cyanColor = "\x1b[36m"
-const grayColor = "\x1b[90m"
-const lightGrayColor = "\x1b[37m"
-
-type cursorStateType int
-
-const (
-	cursorStateTop cursorStateType = iota
-	cursorStateStreaming
-	cursorStateMidBlock
-	cursorStateEndBlock
-)
-
-type Stenographer interface {
-	AnnounceSuite(description string, randomSeed int64, randomizingAll bool, succinct bool)
-	AnnounceAggregatedParallelRun(nodes int, succinct bool)
-	AnnounceParallelRun(node int, nodes int, succinct bool)
-	AnnounceTotalNumberOfSpecs(total int, succinct bool)
-	AnnounceNumberOfSpecs(specsToRun int, total int, succinct bool)
-	AnnounceSpecRunCompletion(summary *types.SuiteSummary, succinct bool)
-
-	AnnounceSpecWillRun(spec *types.SpecSummary)
-	AnnounceBeforeSuiteFailure(summary *types.SetupSummary, succinct bool, fullTrace bool)
-	AnnounceAfterSuiteFailure(summary *types.SetupSummary, succinct bool, fullTrace bool)
-
-	AnnounceCapturedOutput(output string)
-
-	AnnounceSuccesfulSpec(spec *types.SpecSummary)
-	AnnounceSuccesfulSlowSpec(spec *types.SpecSummary, succinct bool)
-	AnnounceSuccesfulMeasurement(spec *types.SpecSummary, succinct bool)
-
-	AnnouncePendingSpec(spec *types.SpecSummary, noisy bool)
-	AnnounceSkippedSpec(spec *types.SpecSummary, succinct bool, fullTrace bool)
-
-	AnnounceSpecTimedOut(spec *types.SpecSummary, succinct bool, fullTrace bool)
-	AnnounceSpecPanicked(spec *types.SpecSummary, succinct bool, fullTrace bool)
-	AnnounceSpecFailed(spec *types.SpecSummary, succinct bool, fullTrace bool)
-
-	SummarizeFailures(summaries []*types.SpecSummary)
-}
-
-func New(color bool, enableFlakes bool) Stenographer {
-	denoter := "•"
-	if runtime.GOOS == "windows" {
-		denoter = "+"
-	}
-	return &consoleStenographer{
-		color:        color,
-		denoter:      denoter,
-		cursorState:  cursorStateTop,
-		enableFlakes: enableFlakes,
-		w:            colorable.NewColorableStdout(),
-	}
-}
-
-type consoleStenographer struct {
-	color        bool
-	denoter      string
-	cursorState  cursorStateType
-	enableFlakes bool
-	w            io.Writer
-}
-
-var alternatingColors = []string{defaultStyle, grayColor}
-
-func (s *consoleStenographer) AnnounceSuite(description string, randomSeed int64, randomizingAll bool, succinct bool) {
-	if succinct {
-		s.print(0, "[%d] %s ", randomSeed, s.colorize(boldStyle, description))
-		return
-	}
-	s.printBanner(fmt.Sprintf("Running Suite: %s", description), "=")
-	s.print(0, "Random Seed: %s", s.colorize(boldStyle, "%d", randomSeed))
-	if randomizingAll {
-		s.print(0, " - Will randomize all specs")
-	}
-	s.printNewLine()
-}
-
-func (s *consoleStenographer) AnnounceParallelRun(node int, nodes int, succinct bool) {
-	if succinct {
-		s.print(0, "- node #%d ", node)
-		return
-	}
-	s.println(0,
-		"Parallel test node %s/%s.",
-		s.colorize(boldStyle, "%d", node),
-		s.colorize(boldStyle, "%d", nodes),
-	)
-	s.printNewLine()
-}
-
-func (s *consoleStenographer) AnnounceAggregatedParallelRun(nodes int, succinct bool) {
-	if succinct {
-		s.print(0, "- %d nodes ", nodes)
-		return
-	}
-	s.println(0,
-		"Running in parallel across %s nodes",
-		s.colorize(boldStyle, "%d", nodes),
-	)
-	s.printNewLine()
-}
-
-func (s *consoleStenographer) AnnounceNumberOfSpecs(specsToRun int, total int, succinct bool) {
-	if succinct {
-		s.print(0, "- %d/%d specs ", specsToRun, total)
-		s.stream()
-		return
-	}
-	s.println(0,
-		"Will run %s of %s specs",
-		s.colorize(boldStyle, "%d", specsToRun),
-		s.colorize(boldStyle, "%d", total),
-	)
-
-	s.printNewLine()
-}
-
-func (s *consoleStenographer) AnnounceTotalNumberOfSpecs(total int, succinct bool) {
-	if succinct {
-		s.print(0, "- %d specs ", total)
-		s.stream()
-		return
-	}
-	s.println(0,
-		"Will run %s specs",
-		s.colorize(boldStyle, "%d", total),
-	)
-
-	s.printNewLine()
-}
-
-func (s *consoleStenographer) AnnounceSpecRunCompletion(summary *types.SuiteSummary, succinct bool) {
-	if succinct && summary.SuiteSucceeded {
-		s.print(0, " %s %s ", s.colorize(greenColor, "SUCCESS!"), summary.RunTime)
-		return
-	}
-	s.printNewLine()
-	color := greenColor
-	if !summary.SuiteSucceeded {
-		color = redColor
-	}
-	s.println(0, s.colorize(boldStyle+color, "Ran %d of %d Specs in %.3f seconds", summary.NumberOfSpecsThatWillBeRun, summary.NumberOfTotalSpecs, summary.RunTime.Seconds()))
-
-	status := ""
-	if summary.SuiteSucceeded {
-		status = s.colorize(boldStyle+greenColor, "SUCCESS!")
-	} else {
-		status = s.colorize(boldStyle+redColor, "FAIL!")
-	}
-
-	flakes := ""
-	if s.enableFlakes {
-		flakes = " | " + s.colorize(yellowColor+boldStyle, "%d Flaked", summary.NumberOfFlakedSpecs)
-	}
-
-	s.print(0,
-		"%s -- %s | %s | %s | %s ",
-		status,
-		s.colorize(greenColor+boldStyle, "%d Passed", summary.NumberOfPassedSpecs),
-		s.colorize(redColor+boldStyle, "%d Failed", summary.NumberOfFailedSpecs)+flakes,
-		s.colorize(yellowColor+boldStyle, "%d Pending", summary.NumberOfPendingSpecs),
-		s.colorize(cyanColor+boldStyle, "%d Skipped", summary.NumberOfSkippedSpecs),
-	)
-}
-
-func (s *consoleStenographer) AnnounceSpecWillRun(spec *types.SpecSummary) {
-	s.startBlock()
-	for i, text := range spec.ComponentTexts[1 : len(spec.ComponentTexts)-1] {
-		s.print(0, s.colorize(alternatingColors[i%2], text)+" ")
-	}
-
-	indentation := 0
-	if len(spec.ComponentTexts) > 2 {
-		indentation = 1
-		s.printNewLine()
-	}
-	index := len(spec.ComponentTexts) - 1
-	s.print(indentation, s.colorize(boldStyle, spec.ComponentTexts[index]))
-	s.printNewLine()
-	s.print(indentation, s.colorize(lightGrayColor, spec.ComponentCodeLocations[index].String()))
-	s.printNewLine()
-	s.midBlock()
-}
-
-func (s *consoleStenographer) AnnounceBeforeSuiteFailure(summary *types.SetupSummary, succinct bool, fullTrace bool) {
-	s.announceSetupFailure("BeforeSuite", summary, succinct, fullTrace)
-}
-
-func (s *consoleStenographer) AnnounceAfterSuiteFailure(summary *types.SetupSummary, succinct bool, fullTrace bool) {
-	s.announceSetupFailure("AfterSuite", summary, succinct, fullTrace)
-}
-
-func (s *consoleStenographer) announceSetupFailure(name string, summary *types.SetupSummary, succinct bool, fullTrace bool) {
-	s.startBlock()
-	var message string
-	switch summary.State {
-	case types.SpecStateFailed:
-		message = "Failure"
-	case types.SpecStatePanicked:
-		message = "Panic"
-	case types.SpecStateTimedOut:
-		message = "Timeout"
-	}
-
-	s.println(0, s.colorize(redColor+boldStyle, "%s [%.3f seconds]", message, summary.RunTime.Seconds()))
-
-	indentation := s.printCodeLocationBlock([]string{name}, []types.CodeLocation{summary.CodeLocation}, summary.ComponentType, 0, summary.State, true)
-
-	s.printNewLine()
-	s.printFailure(indentation, summary.State, summary.Failure, fullTrace)
-
-	s.endBlock()
-}
-
-func (s *consoleStenographer) AnnounceCapturedOutput(output string) {
-	if output == "" {
-		return
-	}
-
-	s.startBlock()
-	s.println(0, output)
-	s.midBlock()
-}
-
-func (s *consoleStenographer) AnnounceSuccesfulSpec(spec *types.SpecSummary) {
-	s.print(0, s.colorize(greenColor, s.denoter))
-	s.stream()
-}
-
-func (s *consoleStenographer) AnnounceSuccesfulSlowSpec(spec *types.SpecSummary, succinct bool) {
-	s.printBlockWithMessage(
-		s.colorize(greenColor, "%s [SLOW TEST:%.3f seconds]", s.denoter, spec.RunTime.Seconds()),
-		"",
-		spec,
-		succinct,
-	)
-}
-
-func (s *consoleStenographer) AnnounceSuccesfulMeasurement(spec *types.SpecSummary, succinct bool) {
-	s.printBlockWithMessage(
-		s.colorize(greenColor, "%s [MEASUREMENT]", s.denoter),
-		s.measurementReport(spec, succinct),
-		spec,
-		succinct,
-	)
-}
-
-func (s *consoleStenographer) AnnouncePendingSpec(spec *types.SpecSummary, noisy bool) {
-	if noisy {
-		s.printBlockWithMessage(
-			s.colorize(yellowColor, "P [PENDING]"),
-			"",
-			spec,
-			false,
-		)
-	} else {
-		s.print(0, s.colorize(yellowColor, "P"))
-		s.stream()
-	}
-}
-
-func (s *consoleStenographer) AnnounceSkippedSpec(spec *types.SpecSummary, succinct bool, fullTrace bool) {
-	// Skips at runtime will have a non-empty spec.Failure. All others should be succinct.
-	if succinct || spec.Failure == (types.SpecFailure{}) {
-		s.print(0, s.colorize(cyanColor, "S"))
-		s.stream()
-	} else {
-		s.startBlock()
-		s.println(0, s.colorize(cyanColor+boldStyle, "S [SKIPPING]%s [%.3f seconds]", s.failureContext(spec.Failure.ComponentType), spec.RunTime.Seconds()))
-
-		indentation := s.printCodeLocationBlock(spec.ComponentTexts, spec.ComponentCodeLocations, spec.Failure.ComponentType, spec.Failure.ComponentIndex, spec.State, succinct)
-
-		s.printNewLine()
-		s.printSkip(indentation, spec.Failure)
-		s.endBlock()
-	}
-}
-
-func (s *consoleStenographer) AnnounceSpecTimedOut(spec *types.SpecSummary, succinct bool, fullTrace bool) {
-	s.printSpecFailure(fmt.Sprintf("%s... Timeout", s.denoter), spec, succinct, fullTrace)
-}
-
-func (s *consoleStenographer) AnnounceSpecPanicked(spec *types.SpecSummary, succinct bool, fullTrace bool) {
-	s.printSpecFailure(fmt.Sprintf("%s! Panic", s.denoter), spec, succinct, fullTrace)
-}
-
-func (s *consoleStenographer) AnnounceSpecFailed(spec *types.SpecSummary, succinct bool, fullTrace bool) {
-	s.printSpecFailure(fmt.Sprintf("%s Failure", s.denoter), spec, succinct, fullTrace)
-}
-
-func (s *consoleStenographer) SummarizeFailures(summaries []*types.SpecSummary) {
-	failingSpecs := []*types.SpecSummary{}
-
-	for _, summary := range summaries {
-		if summary.HasFailureState() {
-			failingSpecs = append(failingSpecs, summary)
-		}
-	}
-
-	if len(failingSpecs) == 0 {
-		return
-	}
-
-	s.printNewLine()
-	s.printNewLine()
-	plural := "s"
-	if len(failingSpecs) == 1 {
-		plural = ""
-	}
-	s.println(0, s.colorize(redColor+boldStyle, "Summarizing %d Failure%s:", len(failingSpecs), plural))
-	for _, summary := range failingSpecs {
-		s.printNewLine()
-		if summary.HasFailureState() {
-			if summary.TimedOut() {
-				s.print(0, s.colorize(redColor+boldStyle, "[Timeout...] "))
-			} else if summary.Panicked() {
-				s.print(0, s.colorize(redColor+boldStyle, "[Panic!] "))
-			} else if summary.Failed() {
-				s.print(0, s.colorize(redColor+boldStyle, "[Fail] "))
-			}
-			s.printSpecContext(summary.ComponentTexts, summary.ComponentCodeLocations, summary.Failure.ComponentType, summary.Failure.ComponentIndex, summary.State, true)
-			s.printNewLine()
-			s.println(0, s.colorize(lightGrayColor, summary.Failure.Location.String()))
-		}
-	}
-}
-
-func (s *consoleStenographer) startBlock() {
-	if s.cursorState == cursorStateStreaming {
-		s.printNewLine()
-		s.printDelimiter()
-	} else if s.cursorState == cursorStateMidBlock {
-		s.printNewLine()
-	}
-}
-
-func (s *consoleStenographer) midBlock() {
-	s.cursorState = cursorStateMidBlock
-}
-
-func (s *consoleStenographer) endBlock() {
-	s.printDelimiter()
-	s.cursorState = cursorStateEndBlock
-}
-
-func (s *consoleStenographer) stream() {
-	s.cursorState = cursorStateStreaming
-}
-
-func (s *consoleStenographer) printBlockWithMessage(header string, message string, spec *types.SpecSummary, succinct bool) {
-	s.startBlock()
-	s.println(0, header)
-
-	indentation := s.printCodeLocationBlock(spec.ComponentTexts, spec.ComponentCodeLocations, types.SpecComponentTypeInvalid, 0, spec.State, succinct)
-
-	if message != "" {
-		s.printNewLine()
-		s.println(indentation, message)
-	}
-
-	s.endBlock()
-}
-
-func (s *consoleStenographer) printSpecFailure(message string, spec *types.SpecSummary, succinct bool, fullTrace bool) {
-	s.startBlock()
-	s.println(0, s.colorize(redColor+boldStyle, "%s%s [%.3f seconds]", message, s.failureContext(spec.Failure.ComponentType), spec.RunTime.Seconds()))
-
-	indentation := s.printCodeLocationBlock(spec.ComponentTexts, spec.ComponentCodeLocations, spec.Failure.ComponentType, spec.Failure.ComponentIndex, spec.State, succinct)
-
-	s.printNewLine()
-	s.printFailure(indentation, spec.State, spec.Failure, fullTrace)
-	s.endBlock()
-}
-
-func (s *consoleStenographer) failureContext(failedComponentType types.SpecComponentType) string {
-	switch failedComponentType {
-	case types.SpecComponentTypeBeforeSuite:
-		return " in Suite Setup (BeforeSuite)"
-	case types.SpecComponentTypeAfterSuite:
-		return " in Suite Teardown (AfterSuite)"
-	case types.SpecComponentTypeBeforeEach:
-		return " in Spec Setup (BeforeEach)"
-	case types.SpecComponentTypeJustBeforeEach:
-		return " in Spec Setup (JustBeforeEach)"
-	case types.SpecComponentTypeAfterEach:
-		return " in Spec Teardown (AfterEach)"
-	}
-
-	return ""
-}
-
-func (s *consoleStenographer) printSkip(indentation int, spec types.SpecFailure) {
-	s.println(indentation, s.colorize(cyanColor, spec.Message))
-	s.printNewLine()
-	s.println(indentation, spec.Location.String())
-}
-
-func (s *consoleStenographer) printFailure(indentation int, state types.SpecState, failure types.SpecFailure, fullTrace bool) {
-	if state == types.SpecStatePanicked {
-		s.println(indentation, s.colorize(redColor+boldStyle, failure.Message))
-		s.println(indentation, s.colorize(redColor, failure.ForwardedPanic))
-		s.println(indentation, failure.Location.String())
-		s.printNewLine()
-		s.println(indentation, s.colorize(redColor, "Full Stack Trace"))
-		s.println(indentation, failure.Location.FullStackTrace)
-	} else {
-		s.println(indentation, s.colorize(redColor, failure.Message))
-		s.printNewLine()
-		s.println(indentation, failure.Location.String())
-		if fullTrace {
-			s.printNewLine()
-			s.println(indentation, s.colorize(redColor, "Full Stack Trace"))
-			s.println(indentation, failure.Location.FullStackTrace)
-		}
-	}
-}
-
-func (s *consoleStenographer) printSpecContext(componentTexts []string, componentCodeLocations []types.CodeLocation, failedComponentType types.SpecComponentType, failedComponentIndex int, state types.SpecState, succinct bool) int {
-	startIndex := 1
-	indentation := 0
-
-	if len(componentTexts) == 1 {
-		startIndex = 0
-	}
-
-	for i := startIndex; i < len(componentTexts); i++ {
-		if (state.IsFailure() || state == types.SpecStateSkipped) && i == failedComponentIndex {
-			color := redColor
-			if state == types.SpecStateSkipped {
-				color = cyanColor
-			}
-			blockType := ""
-			switch failedComponentType {
-			case types.SpecComponentTypeBeforeSuite:
-				blockType = "BeforeSuite"
-			case types.SpecComponentTypeAfterSuite:
-				blockType = "AfterSuite"
-			case types.SpecComponentTypeBeforeEach:
-				blockType = "BeforeEach"
-			case types.SpecComponentTypeJustBeforeEach:
-				blockType = "JustBeforeEach"
-			case types.SpecComponentTypeAfterEach:
-				blockType = "AfterEach"
-			case types.SpecComponentTypeIt:
-				blockType = "It"
-			case types.SpecComponentTypeMeasure:
-				blockType = "Measurement"
-			}
-			if succinct {
-				s.print(0, s.colorize(color+boldStyle, "[%s] %s ", blockType, componentTexts[i]))
-			} else {
-				s.println(indentation, s.colorize(color+boldStyle, "%s [%s]", componentTexts[i], blockType))
-				s.println(indentation, s.colorize(grayColor, "%s", componentCodeLocations[i]))
-			}
-		} else {
-			if succinct {
-				s.print(0, s.colorize(alternatingColors[i%2], "%s ", componentTexts[i]))
-			} else {
-				s.println(indentation, componentTexts[i])
-				s.println(indentation, s.colorize(grayColor, "%s", componentCodeLocations[i]))
-			}
-		}
-		indentation++
-	}
-
-	return indentation
-}
-
-func (s *consoleStenographer) printCodeLocationBlock(componentTexts []string, componentCodeLocations []types.CodeLocation, failedComponentType types.SpecComponentType, failedComponentIndex int, state types.SpecState, succinct bool) int {
-	indentation := s.printSpecContext(componentTexts, componentCodeLocations, failedComponentType, failedComponentIndex, state, succinct)
-
-	if succinct {
-		if len(componentTexts) > 0 {
-			s.printNewLine()
-			s.print(0, s.colorize(lightGrayColor, "%s", componentCodeLocations[len(componentCodeLocations)-1]))
-		}
-		s.printNewLine()
-		indentation = 1
-	} else {
-		indentation--
-	}
-
-	return indentation
-}
-
-func (s *consoleStenographer) orderedMeasurementKeys(measurements map[string]*types.SpecMeasurement) []string {
-	orderedKeys := make([]string, len(measurements))
-	for key, measurement := range measurements {
-		orderedKeys[measurement.Order] = key
-	}
-	return orderedKeys
-}
-
-func (s *consoleStenographer) measurementReport(spec *types.SpecSummary, succinct bool) string {
-	if len(spec.Measurements) == 0 {
-		return "Found no measurements"
-	}
-
-	message := []string{}
-	orderedKeys := s.orderedMeasurementKeys(spec.Measurements)
-
-	if succinct {
-		message = append(message, fmt.Sprintf("%s samples:", s.colorize(boldStyle, "%d", spec.NumberOfSamples)))
-		for _, key := range orderedKeys {
-			measurement := spec.Measurements[key]
-			message = append(message, fmt.Sprintf("  %s - %s: %s%s, %s: %s%s ± %s%s, %s: %s%s",
-				s.colorize(boldStyle, "%s", measurement.Name),
-				measurement.SmallestLabel,
-				s.colorize(greenColor, measurement.PrecisionFmt(), measurement.Smallest),
-				measurement.Units,
-				measurement.AverageLabel,
-				s.colorize(cyanColor, measurement.PrecisionFmt(), measurement.Average),
-				measurement.Units,
-				s.colorize(cyanColor, measurement.PrecisionFmt(), measurement.StdDeviation),
-				measurement.Units,
-				measurement.LargestLabel,
-				s.colorize(redColor, measurement.PrecisionFmt(), measurement.Largest),
-				measurement.Units,
-			))
-		}
-	} else {
-		message = append(message, fmt.Sprintf("Ran %s samples:", s.colorize(boldStyle, "%d", spec.NumberOfSamples)))
-		for _, key := range orderedKeys {
-			measurement := spec.Measurements[key]
-			info := ""
-			if measurement.Info != nil {
-				message = append(message, fmt.Sprintf("%v", measurement.Info))
-			}
-
-			message = append(message, fmt.Sprintf("%s:\n%s  %s: %s%s\n  %s: %s%s\n  %s: %s%s ± %s%s",
-				s.colorize(boldStyle, "%s", measurement.Name),
-				info,
-				measurement.SmallestLabel,
-				s.colorize(greenColor, measurement.PrecisionFmt(), measurement.Smallest),
-				measurement.Units,
-				measurement.LargestLabel,
-				s.colorize(redColor, measurement.PrecisionFmt(), measurement.Largest),
-				measurement.Units,
-				measurement.AverageLabel,
-				s.colorize(cyanColor, measurement.PrecisionFmt(), measurement.Average),
-				measurement.Units,
-				s.colorize(cyanColor, measurement.PrecisionFmt(), measurement.StdDeviation),
-				measurement.Units,
-			))
-		}
-	}
-
-	return strings.Join(message, "\n")
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/LICENSE b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/LICENSE
deleted file mode 100644
index 91b5cef30e..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Yasuhiro Matsumoto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/README.md b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/README.md
deleted file mode 100644
index e84226a735..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# go-colorable
-
-Colorable writer for windows.
-
-For example, most of logger packages doesn't show colors on windows. (I know we can do it with ansicon. But I don't want.)
-This package is possible to handle escape sequence for ansi color on windows.
-
-## Too Bad!
-
-![](https://raw.githubusercontent.com/mattn/go-colorable/gh-pages/bad.png)
-
-
-## So Good!
-
-![](https://raw.githubusercontent.com/mattn/go-colorable/gh-pages/good.png)
-
-## Usage
-
-```go
-logrus.SetFormatter(&logrus.TextFormatter{ForceColors: true})
-logrus.SetOutput(colorable.NewColorableStdout())
-
-logrus.Info("succeeded")
-logrus.Warn("not correct")
-logrus.Error("something error")
-logrus.Fatal("panic")
-```
-
-You can compile above code on non-windows OSs.
-
-## Installation
-
-```
-$ go get github.com/mattn/go-colorable
-```
-
-# License
-
-MIT
-
-# Author
-
-Yasuhiro Matsumoto (a.k.a mattn)
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/colorable_others.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/colorable_others.go
deleted file mode 100644
index 52d6653b34..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/colorable_others.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// +build !windows
-
-package colorable
-
-import (
-	"io"
-	"os"
-)
-
-func NewColorable(file *os.File) io.Writer {
-	if file == nil {
-		panic("nil passed instead of *os.File to NewColorable()")
-	}
-
-	return file
-}
-
-func NewColorableStdout() io.Writer {
-	return os.Stdout
-}
-
-func NewColorableStderr() io.Writer {
-	return os.Stderr
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/colorable_windows.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/colorable_windows.go
deleted file mode 100644
index 1088009230..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/colorable_windows.go
+++ /dev/null
@@ -1,783 +0,0 @@
-package colorable
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"math"
-	"os"
-	"strconv"
-	"strings"
-	"syscall"
-	"unsafe"
-
-	"github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty"
-)
-
-const (
-	foregroundBlue      = 0x1
-	foregroundGreen     = 0x2
-	foregroundRed       = 0x4
-	foregroundIntensity = 0x8
-	foregroundMask      = (foregroundRed | foregroundBlue | foregroundGreen | foregroundIntensity)
-	backgroundBlue      = 0x10
-	backgroundGreen     = 0x20
-	backgroundRed       = 0x40
-	backgroundIntensity = 0x80
-	backgroundMask      = (backgroundRed | backgroundBlue | backgroundGreen | backgroundIntensity)
-)
-
-type wchar uint16
-type short int16
-type dword uint32
-type word uint16
-
-type coord struct {
-	x short
-	y short
-}
-
-type smallRect struct {
-	left   short
-	top    short
-	right  short
-	bottom short
-}
-
-type consoleScreenBufferInfo struct {
-	size              coord
-	cursorPosition    coord
-	attributes        word
-	window            smallRect
-	maximumWindowSize coord
-}
-
-var (
-	kernel32                       = syscall.NewLazyDLL("kernel32.dll")
-	procGetConsoleScreenBufferInfo = kernel32.NewProc("GetConsoleScreenBufferInfo")
-	procSetConsoleTextAttribute    = kernel32.NewProc("SetConsoleTextAttribute")
-	procSetConsoleCursorPosition   = kernel32.NewProc("SetConsoleCursorPosition")
-	procFillConsoleOutputCharacter = kernel32.NewProc("FillConsoleOutputCharacterW")
-	procFillConsoleOutputAttribute = kernel32.NewProc("FillConsoleOutputAttribute")
-)
-
-type Writer struct {
-	out     io.Writer
-	handle  syscall.Handle
-	lastbuf bytes.Buffer
-	oldattr word
-}
-
-func NewColorable(file *os.File) io.Writer {
-	if file == nil {
-		panic("nil passed instead of *os.File to NewColorable()")
-	}
-
-	if isatty.IsTerminal(file.Fd()) {
-		var csbi consoleScreenBufferInfo
-		handle := syscall.Handle(file.Fd())
-		procGetConsoleScreenBufferInfo.Call(uintptr(handle), uintptr(unsafe.Pointer(&csbi)))
-		return &Writer{out: file, handle: handle, oldattr: csbi.attributes}
-	} else {
-		return file
-	}
-}
-
-func NewColorableStdout() io.Writer {
-	return NewColorable(os.Stdout)
-}
-
-func NewColorableStderr() io.Writer {
-	return NewColorable(os.Stderr)
-}
-
-var color256 = map[int]int{
-	0:   0x000000,
-	1:   0x800000,
-	2:   0x008000,
-	3:   0x808000,
-	4:   0x000080,
-	5:   0x800080,
-	6:   0x008080,
-	7:   0xc0c0c0,
-	8:   0x808080,
-	9:   0xff0000,
-	10:  0x00ff00,
-	11:  0xffff00,
-	12:  0x0000ff,
-	13:  0xff00ff,
-	14:  0x00ffff,
-	15:  0xffffff,
-	16:  0x000000,
-	17:  0x00005f,
-	18:  0x000087,
-	19:  0x0000af,
-	20:  0x0000d7,
-	21:  0x0000ff,
-	22:  0x005f00,
-	23:  0x005f5f,
-	24:  0x005f87,
-	25:  0x005faf,
-	26:  0x005fd7,
-	27:  0x005fff,
-	28:  0x008700,
-	29:  0x00875f,
-	30:  0x008787,
-	31:  0x0087af,
-	32:  0x0087d7,
-	33:  0x0087ff,
-	34:  0x00af00,
-	35:  0x00af5f,
-	36:  0x00af87,
-	37:  0x00afaf,
-	38:  0x00afd7,
-	39:  0x00afff,
-	40:  0x00d700,
-	41:  0x00d75f,
-	42:  0x00d787,
-	43:  0x00d7af,
-	44:  0x00d7d7,
-	45:  0x00d7ff,
-	46:  0x00ff00,
-	47:  0x00ff5f,
-	48:  0x00ff87,
-	49:  0x00ffaf,
-	50:  0x00ffd7,
-	51:  0x00ffff,
-	52:  0x5f0000,
-	53:  0x5f005f,
-	54:  0x5f0087,
-	55:  0x5f00af,
-	56:  0x5f00d7,
-	57:  0x5f00ff,
-	58:  0x5f5f00,
-	59:  0x5f5f5f,
-	60:  0x5f5f87,
-	61:  0x5f5faf,
-	62:  0x5f5fd7,
-	63:  0x5f5fff,
-	64:  0x5f8700,
-	65:  0x5f875f,
-	66:  0x5f8787,
-	67:  0x5f87af,
-	68:  0x5f87d7,
-	69:  0x5f87ff,
-	70:  0x5faf00,
-	71:  0x5faf5f,
-	72:  0x5faf87,
-	73:  0x5fafaf,
-	74:  0x5fafd7,
-	75:  0x5fafff,
-	76:  0x5fd700,
-	77:  0x5fd75f,
-	78:  0x5fd787,
-	79:  0x5fd7af,
-	80:  0x5fd7d7,
-	81:  0x5fd7ff,
-	82:  0x5fff00,
-	83:  0x5fff5f,
-	84:  0x5fff87,
-	85:  0x5fffaf,
-	86:  0x5fffd7,
-	87:  0x5fffff,
-	88:  0x870000,
-	89:  0x87005f,
-	90:  0x870087,
-	91:  0x8700af,
-	92:  0x8700d7,
-	93:  0x8700ff,
-	94:  0x875f00,
-	95:  0x875f5f,
-	96:  0x875f87,
-	97:  0x875faf,
-	98:  0x875fd7,
-	99:  0x875fff,
-	100: 0x878700,
-	101: 0x87875f,
-	102: 0x878787,
-	103: 0x8787af,
-	104: 0x8787d7,
-	105: 0x8787ff,
-	106: 0x87af00,
-	107: 0x87af5f,
-	108: 0x87af87,
-	109: 0x87afaf,
-	110: 0x87afd7,
-	111: 0x87afff,
-	112: 0x87d700,
-	113: 0x87d75f,
-	114: 0x87d787,
-	115: 0x87d7af,
-	116: 0x87d7d7,
-	117: 0x87d7ff,
-	118: 0x87ff00,
-	119: 0x87ff5f,
-	120: 0x87ff87,
-	121: 0x87ffaf,
-	122: 0x87ffd7,
-	123: 0x87ffff,
-	124: 0xaf0000,
-	125: 0xaf005f,
-	126: 0xaf0087,
-	127: 0xaf00af,
-	128: 0xaf00d7,
-	129: 0xaf00ff,
-	130: 0xaf5f00,
-	131: 0xaf5f5f,
-	132: 0xaf5f87,
-	133: 0xaf5faf,
-	134: 0xaf5fd7,
-	135: 0xaf5fff,
-	136: 0xaf8700,
-	137: 0xaf875f,
-	138: 0xaf8787,
-	139: 0xaf87af,
-	140: 0xaf87d7,
-	141: 0xaf87ff,
-	142: 0xafaf00,
-	143: 0xafaf5f,
-	144: 0xafaf87,
-	145: 0xafafaf,
-	146: 0xafafd7,
-	147: 0xafafff,
-	148: 0xafd700,
-	149: 0xafd75f,
-	150: 0xafd787,
-	151: 0xafd7af,
-	152: 0xafd7d7,
-	153: 0xafd7ff,
-	154: 0xafff00,
-	155: 0xafff5f,
-	156: 0xafff87,
-	157: 0xafffaf,
-	158: 0xafffd7,
-	159: 0xafffff,
-	160: 0xd70000,
-	161: 0xd7005f,
-	162: 0xd70087,
-	163: 0xd700af,
-	164: 0xd700d7,
-	165: 0xd700ff,
-	166: 0xd75f00,
-	167: 0xd75f5f,
-	168: 0xd75f87,
-	169: 0xd75faf,
-	170: 0xd75fd7,
-	171: 0xd75fff,
-	172: 0xd78700,
-	173: 0xd7875f,
-	174: 0xd78787,
-	175: 0xd787af,
-	176: 0xd787d7,
-	177: 0xd787ff,
-	178: 0xd7af00,
-	179: 0xd7af5f,
-	180: 0xd7af87,
-	181: 0xd7afaf,
-	182: 0xd7afd7,
-	183: 0xd7afff,
-	184: 0xd7d700,
-	185: 0xd7d75f,
-	186: 0xd7d787,
-	187: 0xd7d7af,
-	188: 0xd7d7d7,
-	189: 0xd7d7ff,
-	190: 0xd7ff00,
-	191: 0xd7ff5f,
-	192: 0xd7ff87,
-	193: 0xd7ffaf,
-	194: 0xd7ffd7,
-	195: 0xd7ffff,
-	196: 0xff0000,
-	197: 0xff005f,
-	198: 0xff0087,
-	199: 0xff00af,
-	200: 0xff00d7,
-	201: 0xff00ff,
-	202: 0xff5f00,
-	203: 0xff5f5f,
-	204: 0xff5f87,
-	205: 0xff5faf,
-	206: 0xff5fd7,
-	207: 0xff5fff,
-	208: 0xff8700,
-	209: 0xff875f,
-	210: 0xff8787,
-	211: 0xff87af,
-	212: 0xff87d7,
-	213: 0xff87ff,
-	214: 0xffaf00,
-	215: 0xffaf5f,
-	216: 0xffaf87,
-	217: 0xffafaf,
-	218: 0xffafd7,
-	219: 0xffafff,
-	220: 0xffd700,
-	221: 0xffd75f,
-	222: 0xffd787,
-	223: 0xffd7af,
-	224: 0xffd7d7,
-	225: 0xffd7ff,
-	226: 0xffff00,
-	227: 0xffff5f,
-	228: 0xffff87,
-	229: 0xffffaf,
-	230: 0xffffd7,
-	231: 0xffffff,
-	232: 0x080808,
-	233: 0x121212,
-	234: 0x1c1c1c,
-	235: 0x262626,
-	236: 0x303030,
-	237: 0x3a3a3a,
-	238: 0x444444,
-	239: 0x4e4e4e,
-	240: 0x585858,
-	241: 0x626262,
-	242: 0x6c6c6c,
-	243: 0x767676,
-	244: 0x808080,
-	245: 0x8a8a8a,
-	246: 0x949494,
-	247: 0x9e9e9e,
-	248: 0xa8a8a8,
-	249: 0xb2b2b2,
-	250: 0xbcbcbc,
-	251: 0xc6c6c6,
-	252: 0xd0d0d0,
-	253: 0xdadada,
-	254: 0xe4e4e4,
-	255: 0xeeeeee,
-}
-
-func (w *Writer) Write(data []byte) (n int, err error) {
-	var csbi consoleScreenBufferInfo
-	procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-
-	er := bytes.NewBuffer(data)
-loop:
-	for {
-		r1, _, err := procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-		if r1 == 0 {
-			break loop
-		}
-
-		c1, _, err := er.ReadRune()
-		if err != nil {
-			break loop
-		}
-		if c1 != 0x1b {
-			fmt.Fprint(w.out, string(c1))
-			continue
-		}
-		c2, _, err := er.ReadRune()
-		if err != nil {
-			w.lastbuf.WriteRune(c1)
-			break loop
-		}
-		if c2 != 0x5b {
-			w.lastbuf.WriteRune(c1)
-			w.lastbuf.WriteRune(c2)
-			continue
-		}
-
-		var buf bytes.Buffer
-		var m rune
-		for {
-			c, _, err := er.ReadRune()
-			if err != nil {
-				w.lastbuf.WriteRune(c1)
-				w.lastbuf.WriteRune(c2)
-				w.lastbuf.Write(buf.Bytes())
-				break loop
-			}
-			if ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '@' {
-				m = c
-				break
-			}
-			buf.Write([]byte(string(c)))
-		}
-
-		var csbi consoleScreenBufferInfo
-		switch m {
-		case 'A':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.y -= short(n)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'B':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.y += short(n)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'C':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.x -= short(n)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'D':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			if n, err = strconv.Atoi(buf.String()); err == nil {
-				var csbi consoleScreenBufferInfo
-				procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-				csbi.cursorPosition.x += short(n)
-				procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-			}
-		case 'E':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.x = 0
-			csbi.cursorPosition.y += short(n)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'F':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.x = 0
-			csbi.cursorPosition.y -= short(n)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'G':
-			n, err = strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
-			csbi.cursorPosition.x = short(n)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'H':
-			token := strings.Split(buf.String(), ";")
-			if len(token) != 2 {
-				continue
-			}
-			n1, err := strconv.Atoi(token[0])
-			if err != nil {
-				continue
-			}
-			n2, err := strconv.Atoi(token[1])
-			if err != nil {
-				continue
-			}
-			csbi.cursorPosition.x = short(n2)
-			csbi.cursorPosition.x = short(n1)
-			procSetConsoleCursorPosition.Call(uintptr(w.handle), *(*uintptr)(unsafe.Pointer(&csbi.cursorPosition)))
-		case 'J':
-			n, err := strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			var cursor coord
-			switch n {
-			case 0:
-				cursor = coord{x: csbi.cursorPosition.x, y: csbi.cursorPosition.y}
-			case 1:
-				cursor = coord{x: csbi.window.left, y: csbi.window.top}
-			case 2:
-				cursor = coord{x: csbi.window.left, y: csbi.window.top}
-			}
-			var count, written dword
-			count = dword(csbi.size.x - csbi.cursorPosition.x + (csbi.size.y-csbi.cursorPosition.y)*csbi.size.x)
-			procFillConsoleOutputCharacter.Call(uintptr(w.handle), uintptr(' '), uintptr(count), *(*uintptr)(unsafe.Pointer(&cursor)), uintptr(unsafe.Pointer(&written)))
-			procFillConsoleOutputAttribute.Call(uintptr(w.handle), uintptr(csbi.attributes), uintptr(count), *(*uintptr)(unsafe.Pointer(&cursor)), uintptr(unsafe.Pointer(&written)))
-		case 'K':
-			n, err := strconv.Atoi(buf.String())
-			if err != nil {
-				continue
-			}
-			var cursor coord
-			switch n {
-			case 0:
-				cursor = coord{x: csbi.cursorPosition.x, y: csbi.cursorPosition.y}
-			case 1:
-				cursor = coord{x: csbi.window.left, y: csbi.window.top + csbi.cursorPosition.y}
-			case 2:
-				cursor = coord{x: csbi.window.left, y: csbi.window.top + csbi.cursorPosition.y}
-			}
-			var count, written dword
-			count = dword(csbi.size.x - csbi.cursorPosition.x)
-			procFillConsoleOutputCharacter.Call(uintptr(w.handle), uintptr(' '), uintptr(count), *(*uintptr)(unsafe.Pointer(&cursor)), uintptr(unsafe.Pointer(&written)))
-			procFillConsoleOutputAttribute.Call(uintptr(w.handle), uintptr(csbi.attributes), uintptr(count), *(*uintptr)(unsafe.Pointer(&cursor)), uintptr(unsafe.Pointer(&written)))
-		case 'm':
-			attr := csbi.attributes
-			cs := buf.String()
-			if cs == "" {
-				procSetConsoleTextAttribute.Call(uintptr(w.handle), uintptr(w.oldattr))
-				continue
-			}
-			token := strings.Split(cs, ";")
-			for i := 0; i < len(token); i += 1 {
-				ns := token[i]
-				if n, err = strconv.Atoi(ns); err == nil {
-					switch {
-					case n == 0 || n == 100:
-						attr = w.oldattr
-					case 1 <= n && n <= 5:
-						attr |= foregroundIntensity
-					case n == 7:
-						attr = ((attr & foregroundMask) << 4) | ((attr & backgroundMask) >> 4)
-					case 22 == n || n == 25 || n == 25:
-						attr |= foregroundIntensity
-					case n == 27:
-						attr = ((attr & foregroundMask) << 4) | ((attr & backgroundMask) >> 4)
-					case 30 <= n && n <= 37:
-						attr = (attr & backgroundMask)
-						if (n-30)&1 != 0 {
-							attr |= foregroundRed
-						}
-						if (n-30)&2 != 0 {
-							attr |= foregroundGreen
-						}
-						if (n-30)&4 != 0 {
-							attr |= foregroundBlue
-						}
-					case n == 38: // set foreground color.
-						if i < len(token)-2 && (token[i+1] == "5" || token[i+1] == "05") {
-							if n256, err := strconv.Atoi(token[i+2]); err == nil {
-								if n256foreAttr == nil {
-									n256setup()
-								}
-								attr &= backgroundMask
-								attr |= n256foreAttr[n256]
-								i += 2
-							}
-						} else {
-							attr = attr & (w.oldattr & backgroundMask)
-						}
-					case n == 39: // reset foreground color.
-						attr &= backgroundMask
-						attr |= w.oldattr & foregroundMask
-					case 40 <= n && n <= 47:
-						attr = (attr & foregroundMask)
-						if (n-40)&1 != 0 {
-							attr |= backgroundRed
-						}
-						if (n-40)&2 != 0 {
-							attr |= backgroundGreen
-						}
-						if (n-40)&4 != 0 {
-							attr |= backgroundBlue
-						}
-					case n == 48: // set background color.
-						if i < len(token)-2 && token[i+1] == "5" {
-							if n256, err := strconv.Atoi(token[i+2]); err == nil {
-								if n256backAttr == nil {
-									n256setup()
-								}
-								attr &= foregroundMask
-								attr |= n256backAttr[n256]
-								i += 2
-							}
-						} else {
-							attr = attr & (w.oldattr & foregroundMask)
-						}
-					case n == 49: // reset foreground color.
-						attr &= foregroundMask
-						attr |= w.oldattr & backgroundMask
-					case 90 <= n && n <= 97:
-						attr = (attr & backgroundMask)
-						attr |= foregroundIntensity
-						if (n-90)&1 != 0 {
-							attr |= foregroundRed
-						}
-						if (n-90)&2 != 0 {
-							attr |= foregroundGreen
-						}
-						if (n-90)&4 != 0 {
-							attr |= foregroundBlue
-						}
-					case 100 <= n && n <= 107:
-						attr = (attr & foregroundMask)
-						attr |= backgroundIntensity
-						if (n-100)&1 != 0 {
-							attr |= backgroundRed
-						}
-						if (n-100)&2 != 0 {
-							attr |= backgroundGreen
-						}
-						if (n-100)&4 != 0 {
-							attr |= backgroundBlue
-						}
-					}
-					procSetConsoleTextAttribute.Call(uintptr(w.handle), uintptr(attr))
-				}
-			}
-		}
-	}
-	return len(data) - w.lastbuf.Len(), nil
-}
-
-type consoleColor struct {
-	rgb       int
-	red       bool
-	green     bool
-	blue      bool
-	intensity bool
-}
-
-func (c consoleColor) foregroundAttr() (attr word) {
-	if c.red {
-		attr |= foregroundRed
-	}
-	if c.green {
-		attr |= foregroundGreen
-	}
-	if c.blue {
-		attr |= foregroundBlue
-	}
-	if c.intensity {
-		attr |= foregroundIntensity
-	}
-	return
-}
-
-func (c consoleColor) backgroundAttr() (attr word) {
-	if c.red {
-		attr |= backgroundRed
-	}
-	if c.green {
-		attr |= backgroundGreen
-	}
-	if c.blue {
-		attr |= backgroundBlue
-	}
-	if c.intensity {
-		attr |= backgroundIntensity
-	}
-	return
-}
-
-var color16 = []consoleColor{
-	consoleColor{0x000000, false, false, false, false},
-	consoleColor{0x000080, false, false, true, false},
-	consoleColor{0x008000, false, true, false, false},
-	consoleColor{0x008080, false, true, true, false},
-	consoleColor{0x800000, true, false, false, false},
-	consoleColor{0x800080, true, false, true, false},
-	consoleColor{0x808000, true, true, false, false},
-	consoleColor{0xc0c0c0, true, true, true, false},
-	consoleColor{0x808080, false, false, false, true},
-	consoleColor{0x0000ff, false, false, true, true},
-	consoleColor{0x00ff00, false, true, false, true},
-	consoleColor{0x00ffff, false, true, true, true},
-	consoleColor{0xff0000, true, false, false, true},
-	consoleColor{0xff00ff, true, false, true, true},
-	consoleColor{0xffff00, true, true, false, true},
-	consoleColor{0xffffff, true, true, true, true},
-}
-
-type hsv struct {
-	h, s, v float32
-}
-
-func (a hsv) dist(b hsv) float32 {
-	dh := a.h - b.h
-	switch {
-	case dh > 0.5:
-		dh = 1 - dh
-	case dh < -0.5:
-		dh = -1 - dh
-	}
-	ds := a.s - b.s
-	dv := a.v - b.v
-	return float32(math.Sqrt(float64(dh*dh + ds*ds + dv*dv)))
-}
-
-func toHSV(rgb int) hsv {
-	r, g, b := float32((rgb&0xFF0000)>>16)/256.0,
-		float32((rgb&0x00FF00)>>8)/256.0,
-		float32(rgb&0x0000FF)/256.0
-	min, max := minmax3f(r, g, b)
-	h := max - min
-	if h > 0 {
-		if max == r {
-			h = (g - b) / h
-			if h < 0 {
-				h += 6
-			}
-		} else if max == g {
-			h = 2 + (b-r)/h
-		} else {
-			h = 4 + (r-g)/h
-		}
-	}
-	h /= 6.0
-	s := max - min
-	if max != 0 {
-		s /= max
-	}
-	v := max
-	return hsv{h: h, s: s, v: v}
-}
-
-type hsvTable []hsv
-
-func toHSVTable(rgbTable []consoleColor) hsvTable {
-	t := make(hsvTable, len(rgbTable))
-	for i, c := range rgbTable {
-		t[i] = toHSV(c.rgb)
-	}
-	return t
-}
-
-func (t hsvTable) find(rgb int) consoleColor {
-	hsv := toHSV(rgb)
-	n := 7
-	l := float32(5.0)
-	for i, p := range t {
-		d := hsv.dist(p)
-		if d < l {
-			l, n = d, i
-		}
-	}
-	return color16[n]
-}
-
-func minmax3f(a, b, c float32) (min, max float32) {
-	if a < b {
-		if b < c {
-			return a, c
-		} else if a < c {
-			return a, b
-		} else {
-			return c, b
-		}
-	} else {
-		if a < c {
-			return b, c
-		} else if b < c {
-			return b, a
-		} else {
-			return c, a
-		}
-	}
-}
-
-var n256foreAttr []word
-var n256backAttr []word
-
-func n256setup() {
-	n256foreAttr = make([]word, 256)
-	n256backAttr = make([]word, 256)
-	t := toHSVTable(color16)
-	for i, rgb := range color256 {
-		c := t.find(rgb)
-		n256foreAttr[i] = c.foregroundAttr()
-		n256backAttr[i] = c.backgroundAttr()
-	}
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/noncolorable.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/noncolorable.go
deleted file mode 100644
index fb976dbd8b..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable/noncolorable.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package colorable
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-)
-
-type NonColorable struct {
-	out     io.Writer
-	lastbuf bytes.Buffer
-}
-
-func NewNonColorable(w io.Writer) io.Writer {
-	return &NonColorable{out: w}
-}
-
-func (w *NonColorable) Write(data []byte) (n int, err error) {
-	er := bytes.NewBuffer(data)
-loop:
-	for {
-		c1, _, err := er.ReadRune()
-		if err != nil {
-			break loop
-		}
-		if c1 != 0x1b {
-			fmt.Fprint(w.out, string(c1))
-			continue
-		}
-		c2, _, err := er.ReadRune()
-		if err != nil {
-			w.lastbuf.WriteRune(c1)
-			break loop
-		}
-		if c2 != 0x5b {
-			w.lastbuf.WriteRune(c1)
-			w.lastbuf.WriteRune(c2)
-			continue
-		}
-
-		var buf bytes.Buffer
-		for {
-			c, _, err := er.ReadRune()
-			if err != nil {
-				w.lastbuf.WriteRune(c1)
-				w.lastbuf.WriteRune(c2)
-				w.lastbuf.Write(buf.Bytes())
-				break loop
-			}
-			if ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || c == '@' {
-				break
-			}
-			buf.Write([]byte(string(c)))
-		}
-	}
-	return len(data) - w.lastbuf.Len(), nil
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/LICENSE b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/LICENSE
deleted file mode 100644
index 65dc692b6b..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (c) Yasuhiro MATSUMOTO <mattn.jp@gmail.com>
-
-MIT License (Expat)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/README.md b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/README.md
deleted file mode 100644
index 74845de4a2..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# go-isatty
-
-isatty for golang
-
-## Usage
-
-```go
-package main
-
-import (
-	"fmt"
-	"github.com/mattn/go-isatty"
-	"os"
-)
-
-func main() {
-	if isatty.IsTerminal(os.Stdout.Fd()) {
-		fmt.Println("Is Terminal")
-	} else {
-		fmt.Println("Is Not Terminal")
-	}
-}
-```
-
-## Installation
-
-```
-$ go get github.com/mattn/go-isatty
-```
-
-# License
-
-MIT
-
-# Author
-
-Yasuhiro Matsumoto (a.k.a mattn)
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/doc.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/doc.go
deleted file mode 100644
index 17d4f90ebc..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/doc.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// Package isatty implements interface to isatty
-package isatty
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_appengine.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_appengine.go
deleted file mode 100644
index 83c588773c..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_appengine.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build appengine
-
-package isatty
-
-// IsTerminal returns true if the file descriptor is terminal which
-// is always false on on appengine classic which is a sandboxed PaaS.
-func IsTerminal(fd uintptr) bool {
-	return false
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_bsd.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_bsd.go
deleted file mode 100644
index 98ffe86a4b..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_bsd.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build darwin freebsd openbsd netbsd
-// +build !appengine
-
-package isatty
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const ioctlReadTermios = syscall.TIOCGETA
-
-// IsTerminal return true if the file descriptor is terminal.
-func IsTerminal(fd uintptr) bool {
-	var termios syscall.Termios
-	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-	return err == 0
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_linux.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_linux.go
deleted file mode 100644
index 9d24bac1db..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_linux.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build linux
-// +build !appengine
-
-package isatty
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const ioctlReadTermios = syscall.TCGETS
-
-// IsTerminal return true if the file descriptor is terminal.
-func IsTerminal(fd uintptr) bool {
-	var termios syscall.Termios
-	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-	return err == 0
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_solaris.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_solaris.go
deleted file mode 100644
index 1f0c6bf53d..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_solaris.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build solaris
-// +build !appengine
-
-package isatty
-
-import (
-	"golang.org/x/sys/unix"
-)
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-// see: http://src.illumos.org/source/xref/illumos-gate/usr/src/lib/libbc/libc/gen/common/isatty.c
-func IsTerminal(fd uintptr) bool {
-	var termio unix.Termio
-	err := unix.IoctlSetTermio(int(fd), unix.TCGETA, &termio)
-	return err == nil
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_windows.go b/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_windows.go
deleted file mode 100644
index 83c398b16d..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty/isatty_windows.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build windows
-// +build !appengine
-
-package isatty
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var kernel32 = syscall.NewLazyDLL("kernel32.dll")
-var procGetConsoleMode = kernel32.NewProc("GetConsoleMode")
-
-// IsTerminal return true if the file descriptor is terminal.
-func IsTerminal(fd uintptr) bool {
-	var st uint32
-	r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, fd, uintptr(unsafe.Pointer(&st)), 0)
-	return r != 0 && e == 0
-}
diff --git a/vendor/github.com/onsi/ginkgo/reporters/teamcity_reporter.go b/vendor/github.com/onsi/ginkgo/reporters/teamcity_reporter.go
deleted file mode 100644
index 657dfe726e..0000000000
--- a/vendor/github.com/onsi/ginkgo/reporters/teamcity_reporter.go
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-
-TeamCity Reporter for Ginkgo
-
-Makes use of TeamCity's support for Service Messages
-http://confluence.jetbrains.com/display/TCD7/Build+Script+Interaction+with+TeamCity#BuildScriptInteractionwithTeamCity-ReportingTests
-*/
-
-package reporters
-
-import (
-	"fmt"
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/ginkgo/types"
-	"io"
-	"strings"
-)
-
-const (
-	messageId = "##teamcity"
-)
-
-type TeamCityReporter struct {
-	writer        io.Writer
-	testSuiteName string
-}
-
-func NewTeamCityReporter(writer io.Writer) *TeamCityReporter {
-	return &TeamCityReporter{
-		writer: writer,
-	}
-}
-
-func (reporter *TeamCityReporter) SpecSuiteWillBegin(config config.GinkgoConfigType, summary *types.SuiteSummary) {
-	reporter.testSuiteName = escape(summary.SuiteDescription)
-	fmt.Fprintf(reporter.writer, "%s[testSuiteStarted name='%s']", messageId, reporter.testSuiteName)
-}
-
-func (reporter *TeamCityReporter) BeforeSuiteDidRun(setupSummary *types.SetupSummary) {
-	reporter.handleSetupSummary("BeforeSuite", setupSummary)
-}
-
-func (reporter *TeamCityReporter) AfterSuiteDidRun(setupSummary *types.SetupSummary) {
-	reporter.handleSetupSummary("AfterSuite", setupSummary)
-}
-
-func (reporter *TeamCityReporter) handleSetupSummary(name string, setupSummary *types.SetupSummary) {
-	if setupSummary.State != types.SpecStatePassed {
-		testName := escape(name)
-		fmt.Fprintf(reporter.writer, "%s[testStarted name='%s']", messageId, testName)
-		message := escape(setupSummary.Failure.ComponentCodeLocation.String())
-		details := escape(setupSummary.Failure.Message)
-		fmt.Fprintf(reporter.writer, "%s[testFailed name='%s' message='%s' details='%s']", messageId, testName, message, details)
-		durationInMilliseconds := setupSummary.RunTime.Seconds() * 1000
-		fmt.Fprintf(reporter.writer, "%s[testFinished name='%s' duration='%v']", messageId, testName, durationInMilliseconds)
-	}
-}
-
-func (reporter *TeamCityReporter) SpecWillRun(specSummary *types.SpecSummary) {
-	testName := escape(strings.Join(specSummary.ComponentTexts[1:], " "))
-	fmt.Fprintf(reporter.writer, "%s[testStarted name='%s']", messageId, testName)
-}
-
-func (reporter *TeamCityReporter) SpecDidComplete(specSummary *types.SpecSummary) {
-	testName := escape(strings.Join(specSummary.ComponentTexts[1:], " "))
-
-	if specSummary.State == types.SpecStateFailed || specSummary.State == types.SpecStateTimedOut || specSummary.State == types.SpecStatePanicked {
-		message := escape(specSummary.Failure.ComponentCodeLocation.String())
-		details := escape(specSummary.Failure.Message)
-		fmt.Fprintf(reporter.writer, "%s[testFailed name='%s' message='%s' details='%s']", messageId, testName, message, details)
-	}
-	if specSummary.State == types.SpecStateSkipped || specSummary.State == types.SpecStatePending {
-		fmt.Fprintf(reporter.writer, "%s[testIgnored name='%s']", messageId, testName)
-	}
-
-	durationInMilliseconds := specSummary.RunTime.Seconds() * 1000
-	fmt.Fprintf(reporter.writer, "%s[testFinished name='%s' duration='%v']", messageId, testName, durationInMilliseconds)
-}
-
-func (reporter *TeamCityReporter) SpecSuiteDidEnd(summary *types.SuiteSummary) {
-	fmt.Fprintf(reporter.writer, "%s[testSuiteFinished name='%s']", messageId, reporter.testSuiteName)
-}
-
-func escape(output string) string {
-	output = strings.Replace(output, "|", "||", -1)
-	output = strings.Replace(output, "'", "|'", -1)
-	output = strings.Replace(output, "\n", "|n", -1)
-	output = strings.Replace(output, "\r", "|r", -1)
-	output = strings.Replace(output, "[", "|[", -1)
-	output = strings.Replace(output, "]", "|]", -1)
-	return output
-}
diff --git a/vendor/github.com/onsi/ginkgo/types/code_location.go b/vendor/github.com/onsi/ginkgo/types/code_location.go
deleted file mode 100644
index 935a89e136..0000000000
--- a/vendor/github.com/onsi/ginkgo/types/code_location.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package types
-
-import (
-	"fmt"
-)
-
-type CodeLocation struct {
-	FileName       string
-	LineNumber     int
-	FullStackTrace string
-}
-
-func (codeLocation CodeLocation) String() string {
-	return fmt.Sprintf("%s:%d", codeLocation.FileName, codeLocation.LineNumber)
-}
diff --git a/vendor/github.com/onsi/ginkgo/types/synchronization.go b/vendor/github.com/onsi/ginkgo/types/synchronization.go
deleted file mode 100644
index fdd6ed5bdf..0000000000
--- a/vendor/github.com/onsi/ginkgo/types/synchronization.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package types
-
-import (
-	"encoding/json"
-)
-
-type RemoteBeforeSuiteState int
-
-const (
-	RemoteBeforeSuiteStateInvalid RemoteBeforeSuiteState = iota
-
-	RemoteBeforeSuiteStatePending
-	RemoteBeforeSuiteStatePassed
-	RemoteBeforeSuiteStateFailed
-	RemoteBeforeSuiteStateDisappeared
-)
-
-type RemoteBeforeSuiteData struct {
-	Data  []byte
-	State RemoteBeforeSuiteState
-}
-
-func (r RemoteBeforeSuiteData) ToJSON() []byte {
-	data, _ := json.Marshal(r)
-	return data
-}
-
-type RemoteAfterSuiteData struct {
-	CanRun bool
-}
diff --git a/vendor/github.com/onsi/ginkgo/types/types.go b/vendor/github.com/onsi/ginkgo/types/types.go
deleted file mode 100644
index baf1bd1c47..0000000000
--- a/vendor/github.com/onsi/ginkgo/types/types.go
+++ /dev/null
@@ -1,173 +0,0 @@
-package types
-
-import (
-	"strconv"
-	"time"
-)
-
-const GINKGO_FOCUS_EXIT_CODE = 197
-
-/*
-SuiteSummary represents the a summary of the test suite and is passed to both
-Reporter.SpecSuiteWillBegin
-Reporter.SpecSuiteDidEnd
-
-this is unfortunate as these two methods should receive different objects.  When running in parallel
-each node does not deterministically know how many specs it will end up running.
-
-Unfortunately making such a change would break backward compatibility.
-
-Until Ginkgo 2.0 comes out we will continue to reuse this struct but populate unkown fields
-with -1.
-*/
-type SuiteSummary struct {
-	SuiteDescription string
-	SuiteSucceeded   bool
-	SuiteID          string
-
-	NumberOfSpecsBeforeParallelization int
-	NumberOfTotalSpecs                 int
-	NumberOfSpecsThatWillBeRun         int
-	NumberOfPendingSpecs               int
-	NumberOfSkippedSpecs               int
-	NumberOfPassedSpecs                int
-	NumberOfFailedSpecs                int
-	// Flaked specs are those that failed initially, but then passed on a
-	// subsequent try.
-	NumberOfFlakedSpecs int
-	RunTime             time.Duration
-}
-
-type SpecSummary struct {
-	ComponentTexts         []string
-	ComponentCodeLocations []CodeLocation
-
-	State           SpecState
-	RunTime         time.Duration
-	Failure         SpecFailure
-	IsMeasurement   bool
-	NumberOfSamples int
-	Measurements    map[string]*SpecMeasurement
-
-	CapturedOutput string
-	SuiteID        string
-}
-
-func (s SpecSummary) HasFailureState() bool {
-	return s.State.IsFailure()
-}
-
-func (s SpecSummary) TimedOut() bool {
-	return s.State == SpecStateTimedOut
-}
-
-func (s SpecSummary) Panicked() bool {
-	return s.State == SpecStatePanicked
-}
-
-func (s SpecSummary) Failed() bool {
-	return s.State == SpecStateFailed
-}
-
-func (s SpecSummary) Passed() bool {
-	return s.State == SpecStatePassed
-}
-
-func (s SpecSummary) Skipped() bool {
-	return s.State == SpecStateSkipped
-}
-
-func (s SpecSummary) Pending() bool {
-	return s.State == SpecStatePending
-}
-
-type SetupSummary struct {
-	ComponentType SpecComponentType
-	CodeLocation  CodeLocation
-
-	State   SpecState
-	RunTime time.Duration
-	Failure SpecFailure
-
-	CapturedOutput string
-	SuiteID        string
-}
-
-type SpecFailure struct {
-	Message        string
-	Location       CodeLocation
-	ForwardedPanic string
-
-	ComponentIndex        int
-	ComponentType         SpecComponentType
-	ComponentCodeLocation CodeLocation
-}
-
-type SpecMeasurement struct {
-	Name  string
-	Info  interface{}
-	Order int
-
-	Results []float64
-
-	Smallest     float64
-	Largest      float64
-	Average      float64
-	StdDeviation float64
-
-	SmallestLabel string
-	LargestLabel  string
-	AverageLabel  string
-	Units         string
-	Precision     int
-}
-
-func (s SpecMeasurement) PrecisionFmt() string {
-	if s.Precision == 0 {
-		return "%f"
-	}
-
-	str := strconv.Itoa(s.Precision)
-
-	return "%." + str + "f"
-}
-
-type SpecState uint
-
-const (
-	SpecStateInvalid SpecState = iota
-
-	SpecStatePending
-	SpecStateSkipped
-	SpecStatePassed
-	SpecStateFailed
-	SpecStatePanicked
-	SpecStateTimedOut
-)
-
-func (state SpecState) IsFailure() bool {
-	return state == SpecStateTimedOut || state == SpecStatePanicked || state == SpecStateFailed
-}
-
-type SpecComponentType uint
-
-const (
-	SpecComponentTypeInvalid SpecComponentType = iota
-
-	SpecComponentTypeContainer
-	SpecComponentTypeBeforeSuite
-	SpecComponentTypeAfterSuite
-	SpecComponentTypeBeforeEach
-	SpecComponentTypeJustBeforeEach
-	SpecComponentTypeAfterEach
-	SpecComponentTypeIt
-	SpecComponentTypeMeasure
-)
-
-type FlagType uint
-
-const (
-	FlagTypeNone FlagType = iota
-	FlagTypeFocused
-	FlagTypePending
-)
diff --git a/vendor/github.com/onsi/gomega/CHANGELOG.md b/vendor/github.com/onsi/gomega/CHANGELOG.md
deleted file mode 100644
index a3e8ee4447..0000000000
--- a/vendor/github.com/onsi/gomega/CHANGELOG.md
+++ /dev/null
@@ -1,74 +0,0 @@
-## HEAD
-
-## 1.2.0
-
-Improvements:
-
-- Added `BeSent` which attempts to send a value down a channel and fails if the attempt blocks.  Can be paired with `Eventually` to safely send a value down a channel with a timeout.
-- `Ω`, `Expect`, `Eventually`, and `Consistently` now immediately `panic` if there is no registered fail handler.  This is always a mistake that can hide failing tests.
-- `Receive()` no longer errors when passed a closed channel, it's perfectly fine to attempt to read from a closed channel so Ω(c).Should(Receive()) always fails and Ω(c).ShoudlNot(Receive()) always passes with a closed channel.
-- Added `HavePrefix` and `HaveSuffix` matchers.
-- `ghttp` can now handle concurrent requests.
-- Added `Succeed` which allows one to write `Ω(MyFunction()).Should(Succeed())`.
-- Improved `ghttp`'s behavior around failing assertions and panics:
-    - If a registered handler makes a failing assertion `ghttp` will return `500`.
-    - If a registered handler panics, `ghttp` will return `500` *and* fail the test.  This is new behavior that may cause existing code to break.  This code is almost certainly incorrect and creating a false positive.
-- `ghttp` servers can take an `io.Writer`.  `ghttp` will write a line to the writer when each request arrives.
-- Added `WithTransform` matcher to allow munging input data before feeding into the relevant matcher
-- Added boolean `And`, `Or`, and `Not` matchers to allow creating composite matchers
-- Added `gbytes.TimeoutCloser`, `gbytes.TimeoutReader`, and `gbytes.TimeoutWriter` - these are convenience wrappers that timeout if the underlying Closer/Reader/Writer does not return within the alloted time.
-- Added `gbytes.BufferReader` - this constructs a `gbytes.Buffer` that asynchronously reads the passed-in `io.Reader` into its buffer.
-
-Bug Fixes:
-- gexec: `session.Wait` now uses `EventuallyWithOffset` to get the right line number in the failure.
-- `ContainElement` no longer bails if a passed-in matcher errors.
-
-## 1.0 (8/2/2014)
-
-No changes. Dropping "beta" from the version number.
-
-## 1.0.0-beta (7/8/2014)
-Breaking Changes:
-
-- Changed OmegaMatcher interface.  Instead of having `Match` return failure messages, two new methods `FailureMessage` and `NegatedFailureMessage` are called instead.
-- Moved and renamed OmegaFailHandler to types.GomegaFailHandler and OmegaMatcher to types.GomegaMatcher.  Any references to OmegaMatcher in any custom matchers will need to be changed to point to types.GomegaMatcher
-
-New Test-Support Features:
-
-- `ghttp`: supports testing http clients
-    - Provides a flexible fake http server
-    - Provides a collection of chainable http handlers that perform assertions.
-- `gbytes`: supports making ordered assertions against streams of data
-    - Provides a `gbytes.Buffer`
-    - Provides a `Say` matcher to perform ordered assertions against output data
-- `gexec`: supports testing external processes
-    - Provides support for building Go binaries
-    - Wraps and starts `exec.Cmd` commands
-    - Makes it easy to assert against stdout and stderr
-    - Makes it easy to send signals and wait for processes to exit
-    - Provides an `Exit` matcher to assert against exit code.
-
-DSL Changes:
-
-- `Eventually` and `Consistently` can accept `time.Duration` interval and polling inputs.
-- The default timeouts for `Eventually` and `Consistently` are now configurable.
-
-New Matchers:
-
-- `ConsistOf`: order-independent assertion against the elements of an array/slice or keys of a map.
-- `BeTemporally`: like `BeNumerically` but for `time.Time`
-- `HaveKeyWithValue`: asserts a map has a given key with the given value.
-
-Updated Matchers:
-
-- `Receive` matcher can take a matcher as an argument and passes only if the channel under test receives an objet that satisfies the passed-in matcher.
-- Matchers that implement `MatchMayChangeInTheFuture(actual interface{}) bool` can inform `Eventually` and/or `Consistently` when a match has no chance of changing status in the future.  For example, `Receive` returns `false` when a channel is closed.
-
-Misc:
-
-- Start using semantic versioning
-- Start maintaining changelog
-
-Major refactor:
-
-- Pull out Gomega's internal to `internal`
diff --git a/vendor/github.com/onsi/gomega/CONTRIBUTING.md b/vendor/github.com/onsi/gomega/CONTRIBUTING.md
deleted file mode 100644
index 73d4020e6b..0000000000
--- a/vendor/github.com/onsi/gomega/CONTRIBUTING.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Contributing to Gomega
-
-Your contributions to Gomega are essential for its long-term maintenance and improvement.  To make a contribution:
-
-- Please **open an issue first** - describe what problem you are trying to solve and give the community a forum for input and feedback ahead of investing time in writing code!
-- Ensure adequate test coverage:
-    - Make sure to add appropriate unit tests
-    - Please run all tests locally (`ginkgo -r -p`) and make sure they go green before submitting the PR
-- Update the documentation.  In addition to standard `godoc` comments Gomega has extensive documentation on the `gh-pages` branch.  If relevant, please submit a docs PR to that branch alongside your code PR.
-
-Thanks for supporting Gomega!
\ No newline at end of file
diff --git a/vendor/github.com/onsi/gomega/LICENSE b/vendor/github.com/onsi/gomega/LICENSE
deleted file mode 100644
index 9415ee72c1..0000000000
--- a/vendor/github.com/onsi/gomega/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2013-2014 Onsi Fakhouri
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/onsi/gomega/README.md b/vendor/github.com/onsi/gomega/README.md
deleted file mode 100644
index 159be35907..0000000000
--- a/vendor/github.com/onsi/gomega/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-![Gomega: Ginkgo's Preferred Matcher Library](http://onsi.github.io/gomega/images/gomega.png)
-
-[![Build Status](https://travis-ci.org/onsi/gomega.svg)](https://travis-ci.org/onsi/gomega)
-
-Jump straight to the [docs](http://onsi.github.io/gomega/) to learn about Gomega, including a list of [all available matchers](http://onsi.github.io/gomega/#provided-matchers).
-
-If you have a question, comment, bug report, feature request, etc. please open a GitHub issue.
-
-## [Ginkgo](http://github.com/onsi/ginkgo): a BDD Testing Framework for Golang
-
-Learn more about Ginkgo [here](http://onsi.github.io/ginkgo/)
-
-## Community Matchers
-
-A collection of community matchers is available on the [wiki](https://github.com/onsi/gomega/wiki).
-
-## License
-
-Gomega is MIT-Licensed
-
-The `ConsistOf` matcher uses [goraph](https://github.com/amitkgupta/goraph) which is embedded in the source to simplify distribution.  goraph has an MIT license.
diff --git a/vendor/github.com/onsi/gomega/format/format.go b/vendor/github.com/onsi/gomega/format/format.go
deleted file mode 100644
index e206ee59a4..0000000000
--- a/vendor/github.com/onsi/gomega/format/format.go
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
-Gomega's format package pretty-prints objects.  It explores input objects recursively and generates formatted, indented output with type information.
-*/
-package format
-
-import (
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// Use MaxDepth to set the maximum recursion depth when printing deeply nested objects
-var MaxDepth = uint(10)
-
-/*
-By default, all objects (even those that implement fmt.Stringer and fmt.GoStringer) are recursively inspected to generate output.
-
-Set UseStringerRepresentation = true to use GoString (for fmt.GoStringers) or String (for fmt.Stringer) instead.
-
-Note that GoString and String don't always have all the information you need to understand why a test failed!
-*/
-var UseStringerRepresentation = false
-
-/*
-Print the content of context objects. By default it will be suppressed.
-
-Set PrintContextObjects = true to enable printing of the context internals.
-*/
-var PrintContextObjects = false
-
-// Ctx interface defined here to keep backwards compatability with go < 1.7
-// It matches the context.Context interface
-type Ctx interface {
-	Deadline() (deadline time.Time, ok bool)
-	Done() <-chan struct{}
-	Err() error
-	Value(key interface{}) interface{}
-}
-
-var contextType = reflect.TypeOf((*Ctx)(nil)).Elem()
-var timeType = reflect.TypeOf(time.Time{})
-
-//The default indentation string emitted by the format package
-var Indent = "    "
-
-var longFormThreshold = 20
-
-/*
-Generates a formatted matcher success/failure message of the form:
-
-	Expected
-		<pretty printed actual>
-	<message>
-		<pretty printed expected>
-
-If expected is omited, then the message looks like:
-
-	Expected
-		<pretty printed actual>
-	<message>
-*/
-func Message(actual interface{}, message string, expected ...interface{}) string {
-	if len(expected) == 0 {
-		return fmt.Sprintf("Expected\n%s\n%s", Object(actual, 1), message)
-	}
-	return fmt.Sprintf("Expected\n%s\n%s\n%s", Object(actual, 1), message, Object(expected[0], 1))
-}
-
-/*
-
-Generates a nicely formatted matcher success / failure message
-
-Much like Message(...), but it attempts to pretty print diffs in strings
-
-Expected
-    <string>: "...aaaaabaaaaa..."
-to equal               |
-    <string>: "...aaaaazaaaaa..."
-
-*/
-
-func MessageWithDiff(actual, message, expected string) string {
-	if len(actual) >= truncateThreshold && len(expected) >= truncateThreshold {
-		diffPoint := findFirstMismatch(actual, expected)
-		formattedActual := truncateAndFormat(actual, diffPoint)
-		formattedExpected := truncateAndFormat(expected, diffPoint)
-
-		spacesBeforeFormattedMismatch := findFirstMismatch(formattedActual, formattedExpected)
-
-		tabLength := 4
-		spaceFromMessageToActual := tabLength + len("<string>: ") - len(message)
-		padding := strings.Repeat(" ", spaceFromMessageToActual+spacesBeforeFormattedMismatch) + "|"
-		return Message(formattedActual, message+padding, formattedExpected)
-	}
-	return Message(actual, message, expected)
-}
-
-func truncateAndFormat(str string, index int) string {
-	leftPadding := `...`
-	rightPadding := `...`
-
-	start := index - charactersAroundMismatchToInclude
-	if start < 0 {
-		start = 0
-		leftPadding = ""
-	}
-
-	// slice index must include the mis-matched character
-	lengthOfMismatchedCharacter := 1
-	end := index + charactersAroundMismatchToInclude + lengthOfMismatchedCharacter
-	if end > len(str) {
-		end = len(str)
-		rightPadding = ""
-
-	}
-	return fmt.Sprintf("\"%s\"", leftPadding+str[start:end]+rightPadding)
-}
-
-func findFirstMismatch(a, b string) int {
-	aSlice := strings.Split(a, "")
-	bSlice := strings.Split(b, "")
-
-	for index, str := range aSlice {
-		if index > len(b) - 1 {
-			return index
-		}
-		if str != bSlice[index] {
-			return index
-		}
-	}
-
-	if len(b) > len(a) {
-		return len(a) + 1
-	}
-
-	return 0
-}
-
-const (
-	truncateThreshold                 = 50
-	charactersAroundMismatchToInclude = 5
-)
-
-/*
-Pretty prints the passed in object at the passed in indentation level.
-
-Object recurses into deeply nested objects emitting pretty-printed representations of their components.
-
-Modify format.MaxDepth to control how deep the recursion is allowed to go
-Set format.UseStringerRepresentation to true to return object.GoString() or object.String() when available instead of
-recursing into the object.
-
-Set PrintContextObjects to true to print the content of objects implementing context.Context
-*/
-func Object(object interface{}, indentation uint) string {
-	indent := strings.Repeat(Indent, int(indentation))
-	value := reflect.ValueOf(object)
-	return fmt.Sprintf("%s<%s>: %s", indent, formatType(object), formatValue(value, indentation))
-}
-
-/*
-IndentString takes a string and indents each line by the specified amount.
-*/
-func IndentString(s string, indentation uint) string {
-	components := strings.Split(s, "\n")
-	result := ""
-	indent := strings.Repeat(Indent, int(indentation))
-	for i, component := range components {
-		result += indent + component
-		if i < len(components)-1 {
-			result += "\n"
-		}
-	}
-
-	return result
-}
-
-func formatType(object interface{}) string {
-	t := reflect.TypeOf(object)
-	if t == nil {
-		return "nil"
-	}
-	switch t.Kind() {
-	case reflect.Chan:
-		v := reflect.ValueOf(object)
-		return fmt.Sprintf("%T | len:%d, cap:%d", object, v.Len(), v.Cap())
-	case reflect.Ptr:
-		return fmt.Sprintf("%T | %p", object, object)
-	case reflect.Slice:
-		v := reflect.ValueOf(object)
-		return fmt.Sprintf("%T | len:%d, cap:%d", object, v.Len(), v.Cap())
-	case reflect.Map:
-		v := reflect.ValueOf(object)
-		return fmt.Sprintf("%T | len:%d", object, v.Len())
-	default:
-		return fmt.Sprintf("%T", object)
-	}
-}
-
-func formatValue(value reflect.Value, indentation uint) string {
-	if indentation > MaxDepth {
-		return "..."
-	}
-
-	if isNilValue(value) {
-		return "nil"
-	}
-
-	if UseStringerRepresentation {
-		if value.CanInterface() {
-			obj := value.Interface()
-			switch x := obj.(type) {
-			case fmt.GoStringer:
-				return x.GoString()
-			case fmt.Stringer:
-				return x.String()
-			}
-		}
-	}
-
-	if !PrintContextObjects {
-		if value.Type().Implements(contextType) && indentation > 1 {
-			return "<suppressed context>"
-		}
-	}
-
-	switch value.Kind() {
-	case reflect.Bool:
-		return fmt.Sprintf("%v", value.Bool())
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return fmt.Sprintf("%v", value.Int())
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		return fmt.Sprintf("%v", value.Uint())
-	case reflect.Uintptr:
-		return fmt.Sprintf("0x%x", value.Uint())
-	case reflect.Float32, reflect.Float64:
-		return fmt.Sprintf("%v", value.Float())
-	case reflect.Complex64, reflect.Complex128:
-		return fmt.Sprintf("%v", value.Complex())
-	case reflect.Chan:
-		return fmt.Sprintf("0x%x", value.Pointer())
-	case reflect.Func:
-		return fmt.Sprintf("0x%x", value.Pointer())
-	case reflect.Ptr:
-		return formatValue(value.Elem(), indentation)
-	case reflect.Slice:
-		return formatSlice(value, indentation)
-	case reflect.String:
-		return formatString(value.String(), indentation)
-	case reflect.Array:
-		return formatSlice(value, indentation)
-	case reflect.Map:
-		return formatMap(value, indentation)
-	case reflect.Struct:
-		if value.Type() == timeType && value.CanInterface() {
-			t, _ := value.Interface().(time.Time)
-			return t.Format(time.RFC3339Nano)
-		}
-		return formatStruct(value, indentation)
-	case reflect.Interface:
-		return formatValue(value.Elem(), indentation)
-	default:
-		if value.CanInterface() {
-			return fmt.Sprintf("%#v", value.Interface())
-		}
-		return fmt.Sprintf("%#v", value)
-	}
-}
-
-func formatString(object interface{}, indentation uint) string {
-	if indentation == 1 {
-		s := fmt.Sprintf("%s", object)
-		components := strings.Split(s, "\n")
-		result := ""
-		for i, component := range components {
-			if i == 0 {
-				result += component
-			} else {
-				result += Indent + component
-			}
-			if i < len(components)-1 {
-				result += "\n"
-			}
-		}
-
-		return fmt.Sprintf("%s", result)
-	} else {
-		return fmt.Sprintf("%q", object)
-	}
-}
-
-func formatSlice(v reflect.Value, indentation uint) string {
-	if v.Kind() == reflect.Slice && v.Type().Elem().Kind() == reflect.Uint8 && isPrintableString(string(v.Bytes())) {
-		return formatString(v.Bytes(), indentation)
-	}
-
-	l := v.Len()
-	result := make([]string, l)
-	longest := 0
-	for i := 0; i < l; i++ {
-		result[i] = formatValue(v.Index(i), indentation+1)
-		if len(result[i]) > longest {
-			longest = len(result[i])
-		}
-	}
-
-	if longest > longFormThreshold {
-		indenter := strings.Repeat(Indent, int(indentation))
-		return fmt.Sprintf("[\n%s%s,\n%s]", indenter+Indent, strings.Join(result, ",\n"+indenter+Indent), indenter)
-	}
-	return fmt.Sprintf("[%s]", strings.Join(result, ", "))
-}
-
-func formatMap(v reflect.Value, indentation uint) string {
-	l := v.Len()
-	result := make([]string, l)
-
-	longest := 0
-	for i, key := range v.MapKeys() {
-		value := v.MapIndex(key)
-		result[i] = fmt.Sprintf("%s: %s", formatValue(key, indentation+1), formatValue(value, indentation+1))
-		if len(result[i]) > longest {
-			longest = len(result[i])
-		}
-	}
-
-	if longest > longFormThreshold {
-		indenter := strings.Repeat(Indent, int(indentation))
-		return fmt.Sprintf("{\n%s%s,\n%s}", indenter+Indent, strings.Join(result, ",\n"+indenter+Indent), indenter)
-	}
-	return fmt.Sprintf("{%s}", strings.Join(result, ", "))
-}
-
-func formatStruct(v reflect.Value, indentation uint) string {
-	t := v.Type()
-
-	l := v.NumField()
-	result := []string{}
-	longest := 0
-	for i := 0; i < l; i++ {
-		structField := t.Field(i)
-		fieldEntry := v.Field(i)
-		representation := fmt.Sprintf("%s: %s", structField.Name, formatValue(fieldEntry, indentation+1))
-		result = append(result, representation)
-		if len(representation) > longest {
-			longest = len(representation)
-		}
-	}
-	if longest > longFormThreshold {
-		indenter := strings.Repeat(Indent, int(indentation))
-		return fmt.Sprintf("{\n%s%s,\n%s}", indenter+Indent, strings.Join(result, ",\n"+indenter+Indent), indenter)
-	}
-	return fmt.Sprintf("{%s}", strings.Join(result, ", "))
-}
-
-func isNilValue(a reflect.Value) bool {
-	switch a.Kind() {
-	case reflect.Invalid:
-		return true
-	case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
-		return a.IsNil()
-	}
-
-	return false
-}
-
-/*
-Returns true when the string is entirely made of printable runes, false otherwise.
-*/
-func isPrintableString(str string) bool {
-	for _, runeValue := range str {
-		if !strconv.IsPrint(runeValue) {
-			return false
-		}
-	}
-	return true
-}
diff --git a/vendor/github.com/onsi/gomega/gomega_dsl.go b/vendor/github.com/onsi/gomega/gomega_dsl.go
deleted file mode 100644
index 0d0f563a14..0000000000
--- a/vendor/github.com/onsi/gomega/gomega_dsl.go
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-Gomega is the Ginkgo BDD-style testing framework's preferred matcher library.
-
-The godoc documentation describes Gomega's API.  More comprehensive documentation (with examples!) is available at http://onsi.github.io/gomega/
-
-Gomega on Github: http://github.com/onsi/gomega
-
-Learn more about Ginkgo online: http://onsi.github.io/ginkgo
-
-Ginkgo on Github: http://github.com/onsi/ginkgo
-
-Gomega is MIT-Licensed
-*/
-package gomega
-
-import (
-	"fmt"
-	"reflect"
-	"time"
-
-	"github.com/onsi/gomega/internal/assertion"
-	"github.com/onsi/gomega/internal/asyncassertion"
-	"github.com/onsi/gomega/internal/testingtsupport"
-	"github.com/onsi/gomega/types"
-)
-
-const GOMEGA_VERSION = "1.2.0"
-
-const nilFailHandlerPanic = `You are trying to make an assertion, but Gomega's fail handler is nil.
-If you're using Ginkgo then you probably forgot to put your assertion in an It().
-Alternatively, you may have forgotten to register a fail handler with RegisterFailHandler() or RegisterTestingT().
-`
-
-var globalFailHandler types.GomegaFailHandler
-
-var defaultEventuallyTimeout = time.Second
-var defaultEventuallyPollingInterval = 10 * time.Millisecond
-var defaultConsistentlyDuration = 100 * time.Millisecond
-var defaultConsistentlyPollingInterval = 10 * time.Millisecond
-
-//RegisterFailHandler connects Ginkgo to Gomega.  When a matcher fails
-//the fail handler passed into RegisterFailHandler is called.
-func RegisterFailHandler(handler types.GomegaFailHandler) {
-	globalFailHandler = handler
-}
-
-//RegisterTestingT connects Gomega to Golang's XUnit style
-//Testing.T tests.  You'll need to call this at the top of each XUnit style test:
-//
-// func TestFarmHasCow(t *testing.T) {
-//     RegisterTestingT(t)
-//
-//	   f := farm.New([]string{"Cow", "Horse"})
-//     Expect(f.HasCow()).To(BeTrue(), "Farm should have cow")
-// }
-//
-// Note that this *testing.T is registered *globally* by Gomega (this is why you don't have to
-// pass `t` down to the matcher itself).  This means that you cannot run the XUnit style tests
-// in parallel as the global fail handler cannot point to more than one testing.T at a time.
-//
-// (As an aside: Ginkgo gets around this limitation by running parallel tests in different *processes*).
-func RegisterTestingT(t types.GomegaTestingT) {
-	RegisterFailHandler(testingtsupport.BuildTestingTGomegaFailHandler(t))
-}
-
-//InterceptGomegaHandlers runs a given callback and returns an array of
-//failure messages generated by any Gomega assertions within the callback.
-//
-//This is accomplished by temporarily replacing the *global* fail handler
-//with a fail handler that simply annotates failures.  The original fail handler
-//is reset when InterceptGomegaFailures returns.
-//
-//This is most useful when testing custom matchers, but can also be used to check
-//on a value using a Gomega assertion without causing a test failure.
-func InterceptGomegaFailures(f func()) []string {
-	originalHandler := globalFailHandler
-	failures := []string{}
-	RegisterFailHandler(func(message string, callerSkip ...int) {
-		failures = append(failures, message)
-	})
-	f()
-	RegisterFailHandler(originalHandler)
-	return failures
-}
-
-//Ω wraps an actual value allowing assertions to be made on it:
-//	Ω("foo").Should(Equal("foo"))
-//
-//If Ω is passed more than one argument it will pass the *first* argument to the matcher.
-//All subsequent arguments will be required to be nil/zero.
-//
-//This is convenient if you want to make an assertion on a method/function that returns
-//a value and an error - a common patter in Go.
-//
-//For example, given a function with signature:
-//  func MyAmazingThing() (int, error)
-//
-//Then:
-//    Ω(MyAmazingThing()).Should(Equal(3))
-//Will succeed only if `MyAmazingThing()` returns `(3, nil)`
-//
-//Ω and Expect are identical
-func Ω(actual interface{}, extra ...interface{}) GomegaAssertion {
-	return ExpectWithOffset(0, actual, extra...)
-}
-
-//Expect wraps an actual value allowing assertions to be made on it:
-//	Expect("foo").To(Equal("foo"))
-//
-//If Expect is passed more than one argument it will pass the *first* argument to the matcher.
-//All subsequent arguments will be required to be nil/zero.
-//
-//This is convenient if you want to make an assertion on a method/function that returns
-//a value and an error - a common patter in Go.
-//
-//For example, given a function with signature:
-//  func MyAmazingThing() (int, error)
-//
-//Then:
-//    Expect(MyAmazingThing()).Should(Equal(3))
-//Will succeed only if `MyAmazingThing()` returns `(3, nil)`
-//
-//Expect and Ω are identical
-func Expect(actual interface{}, extra ...interface{}) GomegaAssertion {
-	return ExpectWithOffset(0, actual, extra...)
-}
-
-//ExpectWithOffset wraps an actual value allowing assertions to be made on it:
-//    ExpectWithOffset(1, "foo").To(Equal("foo"))
-//
-//Unlike `Expect` and `Ω`, `ExpectWithOffset` takes an additional integer argument
-//this is used to modify the call-stack offset when computing line numbers.
-//
-//This is most useful in helper functions that make assertions.  If you want Gomega's
-//error message to refer to the calling line in the test (as opposed to the line in the helper function)
-//set the first argument of `ExpectWithOffset` appropriately.
-func ExpectWithOffset(offset int, actual interface{}, extra ...interface{}) GomegaAssertion {
-	if globalFailHandler == nil {
-		panic(nilFailHandlerPanic)
-	}
-	return assertion.New(actual, globalFailHandler, offset, extra...)
-}
-
-//Eventually wraps an actual value allowing assertions to be made on it.
-//The assertion is tried periodically until it passes or a timeout occurs.
-//
-//Both the timeout and polling interval are configurable as optional arguments:
-//The first optional argument is the timeout
-//The second optional argument is the polling interval
-//
-//Both intervals can either be specified as time.Duration, parsable duration strings or as floats/integers.  In the
-//last case they are interpreted as seconds.
-//
-//If Eventually is passed an actual that is a function taking no arguments and returning at least one value,
-//then Eventually will call the function periodically and try the matcher against the function's first return value.
-//
-//Example:
-//
-//    Eventually(func() int {
-//        return thingImPolling.Count()
-//    }).Should(BeNumerically(">=", 17))
-//
-//Note that this example could be rewritten:
-//
-//    Eventually(thingImPolling.Count).Should(BeNumerically(">=", 17))
-//
-//If the function returns more than one value, then Eventually will pass the first value to the matcher and
-//assert that all other values are nil/zero.
-//This allows you to pass Eventually a function that returns a value and an error - a common pattern in Go.
-//
-//For example, consider a method that returns a value and an error:
-//    func FetchFromDB() (string, error)
-//
-//Then
-//    Eventually(FetchFromDB).Should(Equal("hasselhoff"))
-//
-//Will pass only if the the returned error is nil and the returned string passes the matcher.
-//
-//Eventually's default timeout is 1 second, and its default polling interval is 10ms
-func Eventually(actual interface{}, intervals ...interface{}) GomegaAsyncAssertion {
-	return EventuallyWithOffset(0, actual, intervals...)
-}
-
-//EventuallyWithOffset operates like Eventually but takes an additional
-//initial argument to indicate an offset in the call stack.  This is useful when building helper
-//functions that contain matchers.  To learn more, read about `ExpectWithOffset`.
-func EventuallyWithOffset(offset int, actual interface{}, intervals ...interface{}) GomegaAsyncAssertion {
-	if globalFailHandler == nil {
-		panic(nilFailHandlerPanic)
-	}
-	timeoutInterval := defaultEventuallyTimeout
-	pollingInterval := defaultEventuallyPollingInterval
-	if len(intervals) > 0 {
-		timeoutInterval = toDuration(intervals[0])
-	}
-	if len(intervals) > 1 {
-		pollingInterval = toDuration(intervals[1])
-	}
-	return asyncassertion.New(asyncassertion.AsyncAssertionTypeEventually, actual, globalFailHandler, timeoutInterval, pollingInterval, offset)
-}
-
-//Consistently wraps an actual value allowing assertions to be made on it.
-//The assertion is tried periodically and is required to pass for a period of time.
-//
-//Both the total time and polling interval are configurable as optional arguments:
-//The first optional argument is the duration that Consistently will run for
-//The second optional argument is the polling interval
-//
-//Both intervals can either be specified as time.Duration, parsable duration strings or as floats/integers.  In the
-//last case they are interpreted as seconds.
-//
-//If Consistently is passed an actual that is a function taking no arguments and returning at least one value,
-//then Consistently will call the function periodically and try the matcher against the function's first return value.
-//
-//If the function returns more than one value, then Consistently will pass the first value to the matcher and
-//assert that all other values are nil/zero.
-//This allows you to pass Consistently a function that returns a value and an error - a common pattern in Go.
-//
-//Consistently is useful in cases where you want to assert that something *does not happen* over a period of tiem.
-//For example, you want to assert that a goroutine does *not* send data down a channel.  In this case, you could:
-//
-//  Consistently(channel).ShouldNot(Receive())
-//
-//Consistently's default duration is 100ms, and its default polling interval is 10ms
-func Consistently(actual interface{}, intervals ...interface{}) GomegaAsyncAssertion {
-	return ConsistentlyWithOffset(0, actual, intervals...)
-}
-
-//ConsistentlyWithOffset operates like Consistnetly but takes an additional
-//initial argument to indicate an offset in the call stack.  This is useful when building helper
-//functions that contain matchers.  To learn more, read about `ExpectWithOffset`.
-func ConsistentlyWithOffset(offset int, actual interface{}, intervals ...interface{}) GomegaAsyncAssertion {
-	if globalFailHandler == nil {
-		panic(nilFailHandlerPanic)
-	}
-	timeoutInterval := defaultConsistentlyDuration
-	pollingInterval := defaultConsistentlyPollingInterval
-	if len(intervals) > 0 {
-		timeoutInterval = toDuration(intervals[0])
-	}
-	if len(intervals) > 1 {
-		pollingInterval = toDuration(intervals[1])
-	}
-	return asyncassertion.New(asyncassertion.AsyncAssertionTypeConsistently, actual, globalFailHandler, timeoutInterval, pollingInterval, offset)
-}
-
-//Set the default timeout duration for Eventually.  Eventually will repeatedly poll your condition until it succeeds, or until this timeout elapses.
-func SetDefaultEventuallyTimeout(t time.Duration) {
-	defaultEventuallyTimeout = t
-}
-
-//Set the default polling interval for Eventually.
-func SetDefaultEventuallyPollingInterval(t time.Duration) {
-	defaultEventuallyPollingInterval = t
-}
-
-//Set the default duration for Consistently.  Consistently will verify that your condition is satsified for this long.
-func SetDefaultConsistentlyDuration(t time.Duration) {
-	defaultConsistentlyDuration = t
-}
-
-//Set the default polling interval for Consistently.
-func SetDefaultConsistentlyPollingInterval(t time.Duration) {
-	defaultConsistentlyPollingInterval = t
-}
-
-//GomegaAsyncAssertion is returned by Eventually and Consistently and polls the actual value passed into Eventually against
-//the matcher passed to the Should and ShouldNot methods.
-//
-//Both Should and ShouldNot take a variadic optionalDescription argument.  This is passed on to
-//fmt.Sprintf() and is used to annotate failure messages.  This allows you to make your failure messages more
-//descriptive
-//
-//Both Should and ShouldNot return a boolean that is true if the assertion passed and false if it failed.
-//
-//Example:
-//
-//  Eventually(myChannel).Should(Receive(), "Something should have come down the pipe.")
-//  Consistently(myChannel).ShouldNot(Receive(), "Nothing should have come down the pipe.")
-type GomegaAsyncAssertion interface {
-	Should(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool
-	ShouldNot(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool
-}
-
-//GomegaAssertion is returned by Ω and Expect and compares the actual value to the matcher
-//passed to the Should/ShouldNot and To/ToNot/NotTo methods.
-//
-//Typically Should/ShouldNot are used with Ω and To/ToNot/NotTo are used with Expect
-//though this is not enforced.
-//
-//All methods take a variadic optionalDescription argument.  This is passed on to fmt.Sprintf()
-//and is used to annotate failure messages.
-//
-//All methods return a bool that is true if hte assertion passed and false if it failed.
-//
-//Example:
-//
-//   Ω(farm.HasCow()).Should(BeTrue(), "Farm %v should have a cow", farm)
-type GomegaAssertion interface {
-	Should(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool
-	ShouldNot(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool
-
-	To(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool
-	ToNot(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool
-	NotTo(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool
-}
-
-//OmegaMatcher is deprecated in favor of the better-named and better-organized types.GomegaMatcher but sticks around to support existing code that uses it
-type OmegaMatcher types.GomegaMatcher
-
-func toDuration(input interface{}) time.Duration {
-	duration, ok := input.(time.Duration)
-	if ok {
-		return duration
-	}
-
-	value := reflect.ValueOf(input)
-	kind := reflect.TypeOf(input).Kind()
-
-	if reflect.Int <= kind && kind <= reflect.Int64 {
-		return time.Duration(value.Int()) * time.Second
-	} else if reflect.Uint <= kind && kind <= reflect.Uint64 {
-		return time.Duration(value.Uint()) * time.Second
-	} else if reflect.Float32 <= kind && kind <= reflect.Float64 {
-		return time.Duration(value.Float() * float64(time.Second))
-	} else if reflect.String == kind {
-		duration, err := time.ParseDuration(value.String())
-		if err != nil {
-			panic(fmt.Sprintf("%#v is not a valid parsable duration string.", input))
-		}
-		return duration
-	}
-
-	panic(fmt.Sprintf("%v is not a valid interval.  Must be time.Duration, parsable duration string or a number.", input))
-}
diff --git a/vendor/github.com/onsi/gomega/gstruct/elements.go b/vendor/github.com/onsi/gomega/gstruct/elements.go
deleted file mode 100644
index a315fa139f..0000000000
--- a/vendor/github.com/onsi/gomega/gstruct/elements.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package gstruct
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"runtime/debug"
-
-	"github.com/onsi/gomega/format"
-	errorsutil "github.com/onsi/gomega/gstruct/errors"
-	"github.com/onsi/gomega/types"
-)
-
-//MatchAllElements succeeds if every element of a slice matches the element matcher it maps to
-//through the id function, and every element matcher is matched.
-//  Expect([]string{"a", "b"}).To(MatchAllElements(idFn, matchers.Elements{
-//      "a": BeEqual("a"),
-//      "b": BeEqual("b"),
-//  })
-func MatchAllElements(identifier Identifier, elements Elements) types.GomegaMatcher {
-	return &ElementsMatcher{
-		Identifier: identifier,
-		Elements:   elements,
-	}
-}
-
-//MatchElements succeeds if each element of a slice matches the element matcher it maps to
-//through the id function. It can ignore extra elements and/or missing elements.
-//  Expect([]string{"a", "c"}).To(MatchElements(idFn, IgnoreMissing|IgnoreExtra, matchers.Elements{
-//      "a": BeEqual("a")
-//      "b": BeEqual("b"),
-//  })
-func MatchElements(identifier Identifier, options Options, elements Elements) types.GomegaMatcher {
-	return &ElementsMatcher{
-		Identifier:      identifier,
-		Elements:        elements,
-		IgnoreExtras:    options&IgnoreExtras != 0,
-		IgnoreMissing:   options&IgnoreMissing != 0,
-		AllowDuplicates: options&AllowDuplicates != 0,
-	}
-}
-
-// ElementsMatcher is a NestingMatcher that applies custom matchers to each element of a slice mapped
-// by the Identifier function.
-// TODO: Extend this to work with arrays & maps (map the key) as well.
-type ElementsMatcher struct {
-	// Matchers for each element.
-	Elements Elements
-	// Function mapping an element to the string key identifying its matcher.
-	Identifier Identifier
-
-	// Whether to ignore extra elements or consider it an error.
-	IgnoreExtras bool
-	// Whether to ignore missing elements or consider it an error.
-	IgnoreMissing bool
-	// Whether to key duplicates when matching IDs.
-	AllowDuplicates bool
-
-	// State.
-	failures []error
-}
-
-// Element ID to matcher.
-type Elements map[string]types.GomegaMatcher
-
-// Function for identifying (mapping) elements.
-type Identifier func(element interface{}) string
-
-func (m *ElementsMatcher) Match(actual interface{}) (success bool, err error) {
-	if reflect.TypeOf(actual).Kind() != reflect.Slice {
-		return false, fmt.Errorf("%v is type %T, expected slice", actual, actual)
-	}
-
-	m.failures = m.matchElements(actual)
-	if len(m.failures) > 0 {
-		return false, nil
-	}
-	return true, nil
-}
-
-func (m *ElementsMatcher) matchElements(actual interface{}) (errs []error) {
-	// Provide more useful error messages in the case of a panic.
-	defer func() {
-		if err := recover(); err != nil {
-			errs = append(errs, fmt.Errorf("panic checking %+v: %v\n%s", actual, err, debug.Stack()))
-		}
-	}()
-
-	val := reflect.ValueOf(actual)
-	elements := map[string]bool{}
-	for i := 0; i < val.Len(); i++ {
-		element := val.Index(i).Interface()
-		id := m.Identifier(element)
-		if elements[id] {
-			if !m.AllowDuplicates {
-				errs = append(errs, fmt.Errorf("found duplicate element ID %s", id))
-				continue
-			}
-		}
-		elements[id] = true
-
-		matcher, expected := m.Elements[id]
-		if !expected {
-			if !m.IgnoreExtras {
-				errs = append(errs, fmt.Errorf("unexpected element %s", id))
-			}
-			continue
-		}
-
-		match, err := matcher.Match(element)
-		if match {
-			continue
-		}
-
-		if err == nil {
-			if nesting, ok := matcher.(errorsutil.NestingMatcher); ok {
-				err = errorsutil.AggregateError(nesting.Failures())
-			} else {
-				err = errors.New(matcher.FailureMessage(element))
-			}
-		}
-		errs = append(errs, errorsutil.Nest(fmt.Sprintf("[%s]", id), err))
-	}
-
-	for id := range m.Elements {
-		if !elements[id] && !m.IgnoreMissing {
-			errs = append(errs, fmt.Errorf("missing expected element %s", id))
-		}
-	}
-
-	return errs
-}
-
-func (m *ElementsMatcher) FailureMessage(actual interface{}) (message string) {
-	failure := errorsutil.AggregateError(m.failures)
-	return format.Message(actual, fmt.Sprintf("to match elements: %v", failure))
-}
-
-func (m *ElementsMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to match elements")
-}
-
-func (m *ElementsMatcher) Failures() []error {
-	return m.failures
-}
diff --git a/vendor/github.com/onsi/gomega/gstruct/errors/nested_types.go b/vendor/github.com/onsi/gomega/gstruct/errors/nested_types.go
deleted file mode 100644
index 188492b212..0000000000
--- a/vendor/github.com/onsi/gomega/gstruct/errors/nested_types.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package errors
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/onsi/gomega/types"
-)
-
-// A stateful matcher that nests other matchers within it and preserves the error types of the
-// nested matcher failures.
-type NestingMatcher interface {
-	types.GomegaMatcher
-
-	// Returns the failures of nested matchers.
-	Failures() []error
-}
-
-// An error type for labeling errors on deeply nested matchers.
-type NestedError struct {
-	Path string
-	Err  error
-}
-
-func (e *NestedError) Error() string {
-	// Indent Errors.
-	indented := strings.Replace(e.Err.Error(), "\n", "\n\t", -1)
-	return fmt.Sprintf("%s:\n\t%v", e.Path, indented)
-}
-
-// Create a NestedError with the given path.
-// If err is a NestedError, prepend the path to it.
-// If err is an AggregateError, recursively Nest each error.
-func Nest(path string, err error) error {
-	if ag, ok := err.(AggregateError); ok {
-		var errs AggregateError
-		for _, e := range ag {
-			errs = append(errs, Nest(path, e))
-		}
-		return errs
-	}
-	if ne, ok := err.(*NestedError); ok {
-		return &NestedError{
-			Path: path + ne.Path,
-			Err:  ne.Err,
-		}
-	}
-	return &NestedError{
-		Path: path,
-		Err:  err,
-	}
-}
-
-// An error type for treating multiple errors as a single error.
-type AggregateError []error
-
-// Error is part of the error interface.
-func (err AggregateError) Error() string {
-	if len(err) == 0 {
-		// This should never happen, really.
-		return ""
-	}
-	if len(err) == 1 {
-		return err[0].Error()
-	}
-	result := fmt.Sprintf("[%s", err[0].Error())
-	for i := 1; i < len(err); i++ {
-		result += fmt.Sprintf(", %s", err[i].Error())
-	}
-	result += "]"
-	return result
-}
diff --git a/vendor/github.com/onsi/gomega/gstruct/fields.go b/vendor/github.com/onsi/gomega/gstruct/fields.go
deleted file mode 100644
index 0020b873d3..0000000000
--- a/vendor/github.com/onsi/gomega/gstruct/fields.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package gstruct
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"runtime/debug"
-	"strings"
-
-	"github.com/onsi/gomega/format"
-	errorsutil "github.com/onsi/gomega/gstruct/errors"
-	"github.com/onsi/gomega/types"
-)
-
-//MatchAllFields succeeds if every field of a struct matches the field matcher associated with
-//it, and every element matcher is matched.
-//  Expect([]string{"a", "b"}).To(MatchAllFields(gstruct.Fields{
-//      "a": BeEqual("a"),
-//      "b": BeEqual("b"),
-//  })
-func MatchAllFields(fields Fields) types.GomegaMatcher {
-	return &FieldsMatcher{
-		Fields: fields,
-	}
-}
-
-//MatchFields succeeds if each element of a struct matches the field matcher associated with
-//it. It can ignore extra fields and/or missing fields.
-//  Expect([]string{"a", "c"}).To(MatchFields(IgnoreMissing|IgnoreExtra, gstruct.Fields{
-//      "a": BeEqual("a")
-//      "b": BeEqual("b"),
-//  })
-func MatchFields(options Options, fields Fields) types.GomegaMatcher {
-	return &FieldsMatcher{
-		Fields:        fields,
-		IgnoreExtras:  options&IgnoreExtras != 0,
-		IgnoreMissing: options&IgnoreMissing != 0,
-	}
-}
-
-type FieldsMatcher struct {
-	// Matchers for each field.
-	Fields Fields
-
-	// Whether to ignore extra elements or consider it an error.
-	IgnoreExtras bool
-	// Whether to ignore missing elements or consider it an error.
-	IgnoreMissing bool
-
-	// State.
-	failures []error
-}
-
-// Field name to matcher.
-type Fields map[string]types.GomegaMatcher
-
-func (m *FieldsMatcher) Match(actual interface{}) (success bool, err error) {
-	if reflect.TypeOf(actual).Kind() != reflect.Struct {
-		return false, fmt.Errorf("%v is type %T, expected struct", actual, actual)
-	}
-
-	m.failures = m.matchFields(actual)
-	if len(m.failures) > 0 {
-		return false, nil
-	}
-	return true, nil
-}
-
-func (m *FieldsMatcher) matchFields(actual interface{}) (errs []error) {
-	val := reflect.ValueOf(actual)
-	typ := val.Type()
-	fields := map[string]bool{}
-	for i := 0; i < val.NumField(); i++ {
-		fieldName := typ.Field(i).Name
-		fields[fieldName] = true
-
-		err := func() (err error) {
-			// This test relies heavily on reflect, which tends to panic.
-			// Recover here to provide more useful error messages in that case.
-			defer func() {
-				if r := recover(); r != nil {
-					err = fmt.Errorf("panic checking %+v: %v\n%s", actual, r, debug.Stack())
-				}
-			}()
-
-			matcher, expected := m.Fields[fieldName]
-			if !expected {
-				if !m.IgnoreExtras {
-					return fmt.Errorf("unexpected field %s: %+v", fieldName, actual)
-				}
-				return nil
-			}
-
-			var field interface{}
-			if val.Field(i).IsValid() {
-				field = val.Field(i).Interface()
-			} else {
-				field = reflect.Zero(typ.Field(i).Type)
-			}
-
-			match, err := matcher.Match(field)
-			if err != nil {
-				return err
-			} else if !match {
-				if nesting, ok := matcher.(errorsutil.NestingMatcher); ok {
-					return errorsutil.AggregateError(nesting.Failures())
-				}
-				return errors.New(matcher.FailureMessage(field))
-			}
-			return nil
-		}()
-		if err != nil {
-			errs = append(errs, errorsutil.Nest("."+fieldName, err))
-		}
-	}
-
-	for field := range m.Fields {
-		if !fields[field] && !m.IgnoreMissing {
-			errs = append(errs, fmt.Errorf("missing expected field %s", field))
-		}
-	}
-
-	return errs
-}
-
-func (m *FieldsMatcher) FailureMessage(actual interface{}) (message string) {
-	failures := make([]string, len(m.failures))
-	for i := range m.failures {
-		failures[i] = m.failures[i].Error()
-	}
-	return format.Message(reflect.TypeOf(actual).Name(),
-		fmt.Sprintf("to match fields: {\n%v\n}\n", strings.Join(failures, "\n")))
-}
-
-func (m *FieldsMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to match fields")
-}
-
-func (m *FieldsMatcher) Failures() []error {
-	return m.failures
-}
diff --git a/vendor/github.com/onsi/gomega/gstruct/ignore.go b/vendor/github.com/onsi/gomega/gstruct/ignore.go
deleted file mode 100644
index 0365f32ad1..0000000000
--- a/vendor/github.com/onsi/gomega/gstruct/ignore.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package gstruct
-
-import (
-	"github.com/onsi/gomega/types"
-)
-
-//Ignore ignores the actual value and always succeeds.
-//  Expect(nil).To(Ignore())
-//  Expect(true).To(Ignore())
-func Ignore() types.GomegaMatcher {
-	return &IgnoreMatcher{true}
-}
-
-//Reject ignores the actual value and always fails. It can be used in conjunction with IgnoreMissing
-//to catch problematic elements, or to verify tests are running.
-//  Expect(nil).NotTo(Reject())
-//  Expect(true).NotTo(Reject())
-func Reject() types.GomegaMatcher {
-	return &IgnoreMatcher{false}
-}
-
-// A matcher that either always succeeds or always fails.
-type IgnoreMatcher struct {
-	Succeed bool
-}
-
-func (m *IgnoreMatcher) Match(actual interface{}) (bool, error) {
-	return m.Succeed, nil
-}
-
-func (m *IgnoreMatcher) FailureMessage(_ interface{}) (message string) {
-	return "Unconditional failure"
-}
-
-func (m *IgnoreMatcher) NegatedFailureMessage(_ interface{}) (message string) {
-	return "Unconditional success"
-}
diff --git a/vendor/github.com/onsi/gomega/gstruct/pointer.go b/vendor/github.com/onsi/gomega/gstruct/pointer.go
deleted file mode 100644
index 0a2f35de31..0000000000
--- a/vendor/github.com/onsi/gomega/gstruct/pointer.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package gstruct
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/onsi/gomega/format"
-	"github.com/onsi/gomega/types"
-)
-
-//PointTo applies the given matcher to the value pointed to by actual. It fails if the pointer is
-//nil.
-//  actual := 5
-//  Expect(&actual).To(PointTo(Equal(5)))
-func PointTo(matcher types.GomegaMatcher) types.GomegaMatcher {
-	return &PointerMatcher{
-		Matcher: matcher,
-	}
-}
-
-type PointerMatcher struct {
-	Matcher types.GomegaMatcher
-
-	// Failure message.
-	failure string
-}
-
-func (m *PointerMatcher) Match(actual interface{}) (bool, error) {
-	val := reflect.ValueOf(actual)
-
-	// return error if actual type is not a pointer
-	if val.Kind() != reflect.Ptr {
-		return false, fmt.Errorf("PointerMatcher expects a pointer but we have '%s'", val.Kind())
-	}
-
-	if !val.IsValid() || val.IsNil() {
-		m.failure = format.Message(actual, "not to be <nil>")
-		return false, nil
-	}
-
-	// Forward the value.
-	elem := val.Elem().Interface()
-	match, err := m.Matcher.Match(elem)
-	if !match {
-		m.failure = m.Matcher.FailureMessage(elem)
-	}
-	return match, err
-}
-
-func (m *PointerMatcher) FailureMessage(_ interface{}) (message string) {
-	return m.failure
-}
-
-func (m *PointerMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return m.Matcher.NegatedFailureMessage(actual)
-}
diff --git a/vendor/github.com/onsi/gomega/gstruct/types.go b/vendor/github.com/onsi/gomega/gstruct/types.go
deleted file mode 100644
index 48cbbe8f66..0000000000
--- a/vendor/github.com/onsi/gomega/gstruct/types.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package gstruct
-
-//Options is the type for options passed to some matchers.
-type Options int
-
-const (
-	//IgnoreExtras tells the matcher to ignore extra elements or fields, rather than triggering a failure.
-	IgnoreExtras Options = 1 << iota
-	//IgnoreMissing tells the matcher to ignore missing elements or fields, rather than triggering a failure.
-	IgnoreMissing
-	//AllowDuplicates tells the matcher to permit multiple members of the slice to produce the same ID when
-	//considered by the indentifier function. All members that map to a given key must still match successfully
-	//with the matcher that is provided for that key.
-	AllowDuplicates
-)
diff --git a/vendor/github.com/onsi/gomega/internal/assertion/assertion.go b/vendor/github.com/onsi/gomega/internal/assertion/assertion.go
deleted file mode 100644
index b73673f21e..0000000000
--- a/vendor/github.com/onsi/gomega/internal/assertion/assertion.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package assertion
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/onsi/gomega/types"
-)
-
-type Assertion struct {
-	actualInput interface{}
-	fail        types.GomegaFailHandler
-	offset      int
-	extra       []interface{}
-}
-
-func New(actualInput interface{}, fail types.GomegaFailHandler, offset int, extra ...interface{}) *Assertion {
-	return &Assertion{
-		actualInput: actualInput,
-		fail:        fail,
-		offset:      offset,
-		extra:       extra,
-	}
-}
-
-func (assertion *Assertion) Should(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool {
-	return assertion.vetExtras(optionalDescription...) && assertion.match(matcher, true, optionalDescription...)
-}
-
-func (assertion *Assertion) ShouldNot(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool {
-	return assertion.vetExtras(optionalDescription...) && assertion.match(matcher, false, optionalDescription...)
-}
-
-func (assertion *Assertion) To(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool {
-	return assertion.vetExtras(optionalDescription...) && assertion.match(matcher, true, optionalDescription...)
-}
-
-func (assertion *Assertion) ToNot(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool {
-	return assertion.vetExtras(optionalDescription...) && assertion.match(matcher, false, optionalDescription...)
-}
-
-func (assertion *Assertion) NotTo(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool {
-	return assertion.vetExtras(optionalDescription...) && assertion.match(matcher, false, optionalDescription...)
-}
-
-func (assertion *Assertion) buildDescription(optionalDescription ...interface{}) string {
-	switch len(optionalDescription) {
-	case 0:
-		return ""
-	default:
-		return fmt.Sprintf(optionalDescription[0].(string), optionalDescription[1:]...) + "\n"
-	}
-}
-
-func (assertion *Assertion) match(matcher types.GomegaMatcher, desiredMatch bool, optionalDescription ...interface{}) bool {
-	matches, err := matcher.Match(assertion.actualInput)
-	description := assertion.buildDescription(optionalDescription...)
-	if err != nil {
-		assertion.fail(description+err.Error(), 2+assertion.offset)
-		return false
-	}
-	if matches != desiredMatch {
-		var message string
-		if desiredMatch {
-			message = matcher.FailureMessage(assertion.actualInput)
-		} else {
-			message = matcher.NegatedFailureMessage(assertion.actualInput)
-		}
-		assertion.fail(description+message, 2+assertion.offset)
-		return false
-	}
-
-	return true
-}
-
-func (assertion *Assertion) vetExtras(optionalDescription ...interface{}) bool {
-	success, message := vetExtras(assertion.extra)
-	if success {
-		return true
-	}
-
-	description := assertion.buildDescription(optionalDescription...)
-	assertion.fail(description+message, 2+assertion.offset)
-	return false
-}
-
-func vetExtras(extras []interface{}) (bool, string) {
-	for i, extra := range extras {
-		if extra != nil {
-			zeroValue := reflect.Zero(reflect.TypeOf(extra)).Interface()
-			if !reflect.DeepEqual(zeroValue, extra) {
-				message := fmt.Sprintf("Unexpected non-nil/non-zero extra argument at index %d:\n\t<%T>: %#v", i+1, extra, extra)
-				return false, message
-			}
-		}
-	}
-	return true, ""
-}
diff --git a/vendor/github.com/onsi/gomega/internal/asyncassertion/async_assertion.go b/vendor/github.com/onsi/gomega/internal/asyncassertion/async_assertion.go
deleted file mode 100644
index bce0853006..0000000000
--- a/vendor/github.com/onsi/gomega/internal/asyncassertion/async_assertion.go
+++ /dev/null
@@ -1,189 +0,0 @@
-package asyncassertion
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"time"
-
-	"github.com/onsi/gomega/internal/oraclematcher"
-	"github.com/onsi/gomega/types"
-)
-
-type AsyncAssertionType uint
-
-const (
-	AsyncAssertionTypeEventually AsyncAssertionType = iota
-	AsyncAssertionTypeConsistently
-)
-
-type AsyncAssertion struct {
-	asyncType       AsyncAssertionType
-	actualInput     interface{}
-	timeoutInterval time.Duration
-	pollingInterval time.Duration
-	fail            types.GomegaFailHandler
-	offset          int
-}
-
-func New(asyncType AsyncAssertionType, actualInput interface{}, fail types.GomegaFailHandler, timeoutInterval time.Duration, pollingInterval time.Duration, offset int) *AsyncAssertion {
-	actualType := reflect.TypeOf(actualInput)
-	if actualType.Kind() == reflect.Func {
-		if actualType.NumIn() != 0 || actualType.NumOut() == 0 {
-			panic("Expected a function with no arguments and one or more return values.")
-		}
-	}
-
-	return &AsyncAssertion{
-		asyncType:       asyncType,
-		actualInput:     actualInput,
-		fail:            fail,
-		timeoutInterval: timeoutInterval,
-		pollingInterval: pollingInterval,
-		offset:          offset,
-	}
-}
-
-func (assertion *AsyncAssertion) Should(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool {
-	return assertion.match(matcher, true, optionalDescription...)
-}
-
-func (assertion *AsyncAssertion) ShouldNot(matcher types.GomegaMatcher, optionalDescription ...interface{}) bool {
-	return assertion.match(matcher, false, optionalDescription...)
-}
-
-func (assertion *AsyncAssertion) buildDescription(optionalDescription ...interface{}) string {
-	switch len(optionalDescription) {
-	case 0:
-		return ""
-	default:
-		return fmt.Sprintf(optionalDescription[0].(string), optionalDescription[1:]...) + "\n"
-	}
-}
-
-func (assertion *AsyncAssertion) actualInputIsAFunction() bool {
-	actualType := reflect.TypeOf(assertion.actualInput)
-	return actualType.Kind() == reflect.Func && actualType.NumIn() == 0 && actualType.NumOut() > 0
-}
-
-func (assertion *AsyncAssertion) pollActual() (interface{}, error) {
-	if assertion.actualInputIsAFunction() {
-		values := reflect.ValueOf(assertion.actualInput).Call([]reflect.Value{})
-
-		extras := []interface{}{}
-		for _, value := range values[1:] {
-			extras = append(extras, value.Interface())
-		}
-
-		success, message := vetExtras(extras)
-
-		if !success {
-			return nil, errors.New(message)
-		}
-
-		return values[0].Interface(), nil
-	}
-
-	return assertion.actualInput, nil
-}
-
-func (assertion *AsyncAssertion) matcherMayChange(matcher types.GomegaMatcher, value interface{}) bool {
-	if assertion.actualInputIsAFunction() {
-		return true
-	}
-
-	return oraclematcher.MatchMayChangeInTheFuture(matcher, value)
-}
-
-func (assertion *AsyncAssertion) match(matcher types.GomegaMatcher, desiredMatch bool, optionalDescription ...interface{}) bool {
-	timer := time.Now()
-	timeout := time.After(assertion.timeoutInterval)
-
-	description := assertion.buildDescription(optionalDescription...)
-
-	var matches bool
-	var err error
-	mayChange := true
-	value, err := assertion.pollActual()
-	if err == nil {
-		mayChange = assertion.matcherMayChange(matcher, value)
-		matches, err = matcher.Match(value)
-	}
-
-	fail := func(preamble string) {
-		errMsg := ""
-		message := ""
-		if err != nil {
-			errMsg = "Error: " + err.Error()
-		} else {
-			if desiredMatch {
-				message = matcher.FailureMessage(value)
-			} else {
-				message = matcher.NegatedFailureMessage(value)
-			}
-		}
-		assertion.fail(fmt.Sprintf("%s after %.3fs.\n%s%s%s", preamble, time.Since(timer).Seconds(), description, message, errMsg), 3+assertion.offset)
-	}
-
-	if assertion.asyncType == AsyncAssertionTypeEventually {
-		for {
-			if err == nil && matches == desiredMatch {
-				return true
-			}
-
-			if !mayChange {
-				fail("No future change is possible.  Bailing out early")
-				return false
-			}
-
-			select {
-			case <-time.After(assertion.pollingInterval):
-				value, err = assertion.pollActual()
-				if err == nil {
-					mayChange = assertion.matcherMayChange(matcher, value)
-					matches, err = matcher.Match(value)
-				}
-			case <-timeout:
-				fail("Timed out")
-				return false
-			}
-		}
-	} else if assertion.asyncType == AsyncAssertionTypeConsistently {
-		for {
-			if !(err == nil && matches == desiredMatch) {
-				fail("Failed")
-				return false
-			}
-
-			if !mayChange {
-				return true
-			}
-
-			select {
-			case <-time.After(assertion.pollingInterval):
-				value, err = assertion.pollActual()
-				if err == nil {
-					mayChange = assertion.matcherMayChange(matcher, value)
-					matches, err = matcher.Match(value)
-				}
-			case <-timeout:
-				return true
-			}
-		}
-	}
-
-	return false
-}
-
-func vetExtras(extras []interface{}) (bool, string) {
-	for i, extra := range extras {
-		if extra != nil {
-			zeroValue := reflect.Zero(reflect.TypeOf(extra)).Interface()
-			if !reflect.DeepEqual(zeroValue, extra) {
-				message := fmt.Sprintf("Unexpected non-nil/non-zero extra argument at index %d:\n\t<%T>: %#v", i+1, extra, extra)
-				return false, message
-			}
-		}
-	}
-	return true, ""
-}
diff --git a/vendor/github.com/onsi/gomega/internal/oraclematcher/oracle_matcher.go b/vendor/github.com/onsi/gomega/internal/oraclematcher/oracle_matcher.go
deleted file mode 100644
index 66cad88a1f..0000000000
--- a/vendor/github.com/onsi/gomega/internal/oraclematcher/oracle_matcher.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package oraclematcher
-
-import "github.com/onsi/gomega/types"
-
-/*
-GomegaMatchers that also match the OracleMatcher interface can convey information about
-whether or not their result will change upon future attempts.
-
-This allows `Eventually` and `Consistently` to short circuit if success becomes impossible.
-
-For example, a process' exit code can never change.  So, gexec's Exit matcher returns `true`
-for `MatchMayChangeInTheFuture` until the process exits, at which point it returns `false` forevermore.
-*/
-type OracleMatcher interface {
-	MatchMayChangeInTheFuture(actual interface{}) bool
-}
-
-func MatchMayChangeInTheFuture(matcher types.GomegaMatcher, value interface{}) bool {
-	oracleMatcher, ok := matcher.(OracleMatcher)
-	if !ok {
-		return true
-	}
-
-	return oracleMatcher.MatchMayChangeInTheFuture(value)
-}
diff --git a/vendor/github.com/onsi/gomega/internal/testingtsupport/testing_t_support.go b/vendor/github.com/onsi/gomega/internal/testingtsupport/testing_t_support.go
deleted file mode 100644
index ac8912525a..0000000000
--- a/vendor/github.com/onsi/gomega/internal/testingtsupport/testing_t_support.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package testingtsupport
-
-import (
-	"regexp"
-	"runtime/debug"
-	"strings"
-
-	"github.com/onsi/gomega/types"
-)
-
-type gomegaTestingT interface {
-	Fatalf(format string, args ...interface{})
-}
-
-func BuildTestingTGomegaFailHandler(t gomegaTestingT) types.GomegaFailHandler {
-	return func(message string, callerSkip ...int) {
-		skip := 1
-		if len(callerSkip) > 0 {
-			skip = callerSkip[0]
-		}
-		stackTrace := pruneStack(string(debug.Stack()), skip)
-		t.Fatalf("\n%s\n%s", stackTrace, message)
-	}
-}
-
-func pruneStack(fullStackTrace string, skip int) string {
-	stack := strings.Split(fullStackTrace, "\n")
-	if len(stack) > 2*(skip+1) {
-		stack = stack[2*(skip+1):]
-	}
-	prunedStack := []string{}
-	re := regexp.MustCompile(`\/ginkgo\/|\/pkg\/testing\/|\/pkg\/runtime\/`)
-	for i := 0; i < len(stack)/2; i++ {
-		if !re.Match([]byte(stack[i*2])) {
-			prunedStack = append(prunedStack, stack[i*2])
-			prunedStack = append(prunedStack, stack[i*2+1])
-		}
-	}
-	return strings.Join(prunedStack, "\n")
-}
diff --git a/vendor/github.com/onsi/gomega/matchers.go b/vendor/github.com/onsi/gomega/matchers.go
deleted file mode 100644
index e6e85d070d..0000000000
--- a/vendor/github.com/onsi/gomega/matchers.go
+++ /dev/null
@@ -1,427 +0,0 @@
-package gomega
-
-import (
-	"time"
-
-	"github.com/onsi/gomega/matchers"
-	"github.com/onsi/gomega/types"
-)
-
-//Equal uses reflect.DeepEqual to compare actual with expected.  Equal is strict about
-//types when performing comparisons.
-//It is an error for both actual and expected to be nil.  Use BeNil() instead.
-func Equal(expected interface{}) types.GomegaMatcher {
-	return &matchers.EqualMatcher{
-		Expected: expected,
-	}
-}
-
-//BeEquivalentTo is more lax than Equal, allowing equality between different types.
-//This is done by converting actual to have the type of expected before
-//attempting equality with reflect.DeepEqual.
-//It is an error for actual and expected to be nil.  Use BeNil() instead.
-func BeEquivalentTo(expected interface{}) types.GomegaMatcher {
-	return &matchers.BeEquivalentToMatcher{
-		Expected: expected,
-	}
-}
-
-//BeIdenticalTo uses the == operator to compare actual with expected.
-//BeIdenticalTo is strict about types when performing comparisons.
-//It is an error for both actual and expected to be nil.  Use BeNil() instead.
-func BeIdenticalTo(expected interface{}) types.GomegaMatcher {
-	return &matchers.BeIdenticalToMatcher{
-		Expected: expected,
-	}
-}
-
-//BeNil succeeds if actual is nil
-func BeNil() types.GomegaMatcher {
-	return &matchers.BeNilMatcher{}
-}
-
-//BeTrue succeeds if actual is true
-func BeTrue() types.GomegaMatcher {
-	return &matchers.BeTrueMatcher{}
-}
-
-//BeFalse succeeds if actual is false
-func BeFalse() types.GomegaMatcher {
-	return &matchers.BeFalseMatcher{}
-}
-
-//HaveOccurred succeeds if actual is a non-nil error
-//The typical Go error checking pattern looks like:
-//    err := SomethingThatMightFail()
-//    Ω(err).ShouldNot(HaveOccurred())
-func HaveOccurred() types.GomegaMatcher {
-	return &matchers.HaveOccurredMatcher{}
-}
-
-//Succeed passes if actual is a nil error
-//Succeed is intended to be used with functions that return a single error value. Instead of
-//    err := SomethingThatMightFail()
-//    Ω(err).ShouldNot(HaveOccurred())
-//
-//You can write:
-//    Ω(SomethingThatMightFail()).Should(Succeed())
-//
-//It is a mistake to use Succeed with a function that has multiple return values.  Gomega's Ω and Expect
-//functions automatically trigger failure if any return values after the first return value are non-zero/non-nil.
-//This means that Ω(MultiReturnFunc()).ShouldNot(Succeed()) can never pass.
-func Succeed() types.GomegaMatcher {
-	return &matchers.SucceedMatcher{}
-}
-
-//MatchError succeeds if actual is a non-nil error that matches the passed in string/error.
-//
-//These are valid use-cases:
-//  Ω(err).Should(MatchError("an error")) //asserts that err.Error() == "an error"
-//  Ω(err).Should(MatchError(SomeError)) //asserts that err == SomeError (via reflect.DeepEqual)
-//
-//It is an error for err to be nil or an object that does not implement the Error interface
-func MatchError(expected interface{}) types.GomegaMatcher {
-	return &matchers.MatchErrorMatcher{
-		Expected: expected,
-	}
-}
-
-//BeClosed succeeds if actual is a closed channel.
-//It is an error to pass a non-channel to BeClosed, it is also an error to pass nil
-//
-//In order to check whether or not the channel is closed, Gomega must try to read from the channel
-//(even in the `ShouldNot(BeClosed())` case).  You should keep this in mind if you wish to make subsequent assertions about
-//values coming down the channel.
-//
-//Also, if you are testing that a *buffered* channel is closed you must first read all values out of the channel before
-//asserting that it is closed (it is not possible to detect that a buffered-channel has been closed until all its buffered values are read).
-//
-//Finally, as a corollary: it is an error to check whether or not a send-only channel is closed.
-func BeClosed() types.GomegaMatcher {
-	return &matchers.BeClosedMatcher{}
-}
-
-//Receive succeeds if there is a value to be received on actual.
-//Actual must be a channel (and cannot be a send-only channel) -- anything else is an error.
-//
-//Receive returns immediately and never blocks:
-//
-//- If there is nothing on the channel `c` then Ω(c).Should(Receive()) will fail and Ω(c).ShouldNot(Receive()) will pass.
-//
-//- If the channel `c` is closed then Ω(c).Should(Receive()) will fail and Ω(c).ShouldNot(Receive()) will pass.
-//
-//- If there is something on the channel `c` ready to be read, then Ω(c).Should(Receive()) will pass and Ω(c).ShouldNot(Receive()) will fail.
-//
-//If you have a go-routine running in the background that will write to channel `c` you can:
-//    Eventually(c).Should(Receive())
-//
-//This will timeout if nothing gets sent to `c` (you can modify the timeout interval as you normally do with `Eventually`)
-//
-//A similar use-case is to assert that no go-routine writes to a channel (for a period of time).  You can do this with `Consistently`:
-//    Consistently(c).ShouldNot(Receive())
-//
-//You can pass `Receive` a matcher.  If you do so, it will match the received object against the matcher.  For example:
-//    Ω(c).Should(Receive(Equal("foo")))
-//
-//When given a matcher, `Receive` will always fail if there is nothing to be received on the channel.
-//
-//Passing Receive a matcher is especially useful when paired with Eventually:
-//
-//    Eventually(c).Should(Receive(ContainSubstring("bar")))
-//
-//will repeatedly attempt to pull values out of `c` until a value matching "bar" is received.
-//
-//Finally, if you want to have a reference to the value *sent* to the channel you can pass the `Receive` matcher a pointer to a variable of the appropriate type:
-//    var myThing thing
-//    Eventually(thingChan).Should(Receive(&myThing))
-//    Ω(myThing.Sprocket).Should(Equal("foo"))
-//    Ω(myThing.IsValid()).Should(BeTrue())
-func Receive(args ...interface{}) types.GomegaMatcher {
-	var arg interface{}
-	if len(args) > 0 {
-		arg = args[0]
-	}
-
-	return &matchers.ReceiveMatcher{
-		Arg: arg,
-	}
-}
-
-//BeSent succeeds if a value can be sent to actual.
-//Actual must be a channel (and cannot be a receive-only channel) that can sent the type of the value passed into BeSent -- anything else is an error.
-//In addition, actual must not be closed.
-//
-//BeSent never blocks:
-//
-//- If the channel `c` is not ready to receive then Ω(c).Should(BeSent("foo")) will fail immediately
-//- If the channel `c` is eventually ready to receive then Eventually(c).Should(BeSent("foo")) will succeed.. presuming the channel becomes ready to receive  before Eventually's timeout
-//- If the channel `c` is closed then Ω(c).Should(BeSent("foo")) and Ω(c).ShouldNot(BeSent("foo")) will both fail immediately
-//
-//Of course, the value is actually sent to the channel.  The point of `BeSent` is less to make an assertion about the availability of the channel (which is typically an implementation detail that your test should not be concerned with).
-//Rather, the point of `BeSent` is to make it possible to easily and expressively write tests that can timeout on blocked channel sends.
-func BeSent(arg interface{}) types.GomegaMatcher {
-	return &matchers.BeSentMatcher{
-		Arg: arg,
-	}
-}
-
-//MatchRegexp succeeds if actual is a string or stringer that matches the
-//passed-in regexp.  Optional arguments can be provided to construct a regexp
-//via fmt.Sprintf().
-func MatchRegexp(regexp string, args ...interface{}) types.GomegaMatcher {
-	return &matchers.MatchRegexpMatcher{
-		Regexp: regexp,
-		Args:   args,
-	}
-}
-
-//ContainSubstring succeeds if actual is a string or stringer that contains the
-//passed-in substring.  Optional arguments can be provided to construct the substring
-//via fmt.Sprintf().
-func ContainSubstring(substr string, args ...interface{}) types.GomegaMatcher {
-	return &matchers.ContainSubstringMatcher{
-		Substr: substr,
-		Args:   args,
-	}
-}
-
-//HavePrefix succeeds if actual is a string or stringer that contains the
-//passed-in string as a prefix.  Optional arguments can be provided to construct
-//via fmt.Sprintf().
-func HavePrefix(prefix string, args ...interface{}) types.GomegaMatcher {
-	return &matchers.HavePrefixMatcher{
-		Prefix: prefix,
-		Args:   args,
-	}
-}
-
-//HaveSuffix succeeds if actual is a string or stringer that contains the
-//passed-in string as a suffix.  Optional arguments can be provided to construct
-//via fmt.Sprintf().
-func HaveSuffix(suffix string, args ...interface{}) types.GomegaMatcher {
-	return &matchers.HaveSuffixMatcher{
-		Suffix: suffix,
-		Args:   args,
-	}
-}
-
-//MatchJSON succeeds if actual is a string or stringer of JSON that matches
-//the expected JSON.  The JSONs are decoded and the resulting objects are compared via
-//reflect.DeepEqual so things like key-ordering and whitespace shouldn't matter.
-func MatchJSON(json interface{}) types.GomegaMatcher {
-	return &matchers.MatchJSONMatcher{
-		JSONToMatch: json,
-	}
-}
-
-//MatchXML succeeds if actual is a string or stringer of XML that matches
-//the expected XML.  The XMLs are decoded and the resulting objects are compared via
-//reflect.DeepEqual so things like whitespaces shouldn't matter.
-func MatchXML(xml interface{}) types.GomegaMatcher {
-	return &matchers.MatchXMLMatcher{
-		XMLToMatch: xml,
-	}
-}
-
-//MatchYAML succeeds if actual is a string or stringer of YAML that matches
-//the expected YAML.  The YAML's are decoded and the resulting objects are compared via
-//reflect.DeepEqual so things like key-ordering and whitespace shouldn't matter.
-func MatchYAML(yaml interface{}) types.GomegaMatcher {
-	return &matchers.MatchYAMLMatcher{
-		YAMLToMatch: yaml,
-	}
-}
-
-//BeEmpty succeeds if actual is empty.  Actual must be of type string, array, map, chan, or slice.
-func BeEmpty() types.GomegaMatcher {
-	return &matchers.BeEmptyMatcher{}
-}
-
-//HaveLen succeeds if actual has the passed-in length.  Actual must be of type string, array, map, chan, or slice.
-func HaveLen(count int) types.GomegaMatcher {
-	return &matchers.HaveLenMatcher{
-		Count: count,
-	}
-}
-
-//HaveCap succeeds if actual has the passed-in capacity.  Actual must be of type array, chan, or slice.
-func HaveCap(count int) types.GomegaMatcher {
-	return &matchers.HaveCapMatcher{
-		Count: count,
-	}
-}
-
-//BeZero succeeds if actual is the zero value for its type or if actual is nil.
-func BeZero() types.GomegaMatcher {
-	return &matchers.BeZeroMatcher{}
-}
-
-//ContainElement succeeds if actual contains the passed in element.
-//By default ContainElement() uses Equal() to perform the match, however a
-//matcher can be passed in instead:
-//    Ω([]string{"Foo", "FooBar"}).Should(ContainElement(ContainSubstring("Bar")))
-//
-//Actual must be an array, slice or map.
-//For maps, ContainElement searches through the map's values.
-func ContainElement(element interface{}) types.GomegaMatcher {
-	return &matchers.ContainElementMatcher{
-		Element: element,
-	}
-}
-
-//ConsistOf succeeds if actual contains preciely the elements passed into the matcher.  The ordering of the elements does not matter.
-//By default ConsistOf() uses Equal() to match the elements, however custom matchers can be passed in instead.  Here are some examples:
-//
-//    Ω([]string{"Foo", "FooBar"}).Should(ConsistOf("FooBar", "Foo"))
-//    Ω([]string{"Foo", "FooBar"}).Should(ConsistOf(ContainSubstring("Bar"), "Foo"))
-//    Ω([]string{"Foo", "FooBar"}).Should(ConsistOf(ContainSubstring("Foo"), ContainSubstring("Foo")))
-//
-//Actual must be an array, slice or map.  For maps, ConsistOf matches against the map's values.
-//
-//You typically pass variadic arguments to ConsistOf (as in the examples above).  However, if you need to pass in a slice you can provided that it
-//is the only element passed in to ConsistOf:
-//
-//    Ω([]string{"Foo", "FooBar"}).Should(ConsistOf([]string{"FooBar", "Foo"}))
-//
-//Note that Go's type system does not allow you to write this as ConsistOf([]string{"FooBar", "Foo"}...) as []string and []interface{} are different types - hence the need for this special rule.
-func ConsistOf(elements ...interface{}) types.GomegaMatcher {
-	return &matchers.ConsistOfMatcher{
-		Elements: elements,
-	}
-}
-
-//HaveKey succeeds if actual is a map with the passed in key.
-//By default HaveKey uses Equal() to perform the match, however a
-//matcher can be passed in instead:
-//    Ω(map[string]string{"Foo": "Bar", "BazFoo": "Duck"}).Should(HaveKey(MatchRegexp(`.+Foo$`)))
-func HaveKey(key interface{}) types.GomegaMatcher {
-	return &matchers.HaveKeyMatcher{
-		Key: key,
-	}
-}
-
-//HaveKeyWithValue succeeds if actual is a map with the passed in key and value.
-//By default HaveKeyWithValue uses Equal() to perform the match, however a
-//matcher can be passed in instead:
-//    Ω(map[string]string{"Foo": "Bar", "BazFoo": "Duck"}).Should(HaveKeyWithValue("Foo", "Bar"))
-//    Ω(map[string]string{"Foo": "Bar", "BazFoo": "Duck"}).Should(HaveKeyWithValue(MatchRegexp(`.+Foo$`), "Bar"))
-func HaveKeyWithValue(key interface{}, value interface{}) types.GomegaMatcher {
-	return &matchers.HaveKeyWithValueMatcher{
-		Key:   key,
-		Value: value,
-	}
-}
-
-//BeNumerically performs numerical assertions in a type-agnostic way.
-//Actual and expected should be numbers, though the specific type of
-//number is irrelevant (floa32, float64, uint8, etc...).
-//
-//There are six, self-explanatory, supported comparators:
-//    Ω(1.0).Should(BeNumerically("==", 1))
-//    Ω(1.0).Should(BeNumerically("~", 0.999, 0.01))
-//    Ω(1.0).Should(BeNumerically(">", 0.9))
-//    Ω(1.0).Should(BeNumerically(">=", 1.0))
-//    Ω(1.0).Should(BeNumerically("<", 3))
-//    Ω(1.0).Should(BeNumerically("<=", 1.0))
-func BeNumerically(comparator string, compareTo ...interface{}) types.GomegaMatcher {
-	return &matchers.BeNumericallyMatcher{
-		Comparator: comparator,
-		CompareTo:  compareTo,
-	}
-}
-
-//BeTemporally compares time.Time's like BeNumerically
-//Actual and expected must be time.Time. The comparators are the same as for BeNumerically
-//    Ω(time.Now()).Should(BeTemporally(">", time.Time{}))
-//    Ω(time.Now()).Should(BeTemporally("~", time.Now(), time.Second))
-func BeTemporally(comparator string, compareTo time.Time, threshold ...time.Duration) types.GomegaMatcher {
-	return &matchers.BeTemporallyMatcher{
-		Comparator: comparator,
-		CompareTo:  compareTo,
-		Threshold:  threshold,
-	}
-}
-
-//BeAssignableToTypeOf succeeds if actual is assignable to the type of expected.
-//It will return an error when one of the values is nil.
-//	  Ω(0).Should(BeAssignableToTypeOf(0))         // Same values
-//	  Ω(5).Should(BeAssignableToTypeOf(-1))        // different values same type
-//	  Ω("foo").Should(BeAssignableToTypeOf("bar")) // different values same type
-//    Ω(struct{ Foo string }{}).Should(BeAssignableToTypeOf(struct{ Foo string }{}))
-func BeAssignableToTypeOf(expected interface{}) types.GomegaMatcher {
-	return &matchers.AssignableToTypeOfMatcher{
-		Expected: expected,
-	}
-}
-
-//Panic succeeds if actual is a function that, when invoked, panics.
-//Actual must be a function that takes no arguments and returns no results.
-func Panic() types.GomegaMatcher {
-	return &matchers.PanicMatcher{}
-}
-
-//BeAnExistingFile succeeds if a file exists.
-//Actual must be a string representing the abs path to the file being checked.
-func BeAnExistingFile() types.GomegaMatcher {
-	return &matchers.BeAnExistingFileMatcher{}
-}
-
-//BeARegularFile succeeds iff a file exists and is a regular file.
-//Actual must be a string representing the abs path to the file being checked.
-func BeARegularFile() types.GomegaMatcher {
-	return &matchers.BeARegularFileMatcher{}
-}
-
-//BeADirectory succeeds iff a file exists and is a directory.
-//Actual must be a string representing the abs path to the file being checked.
-func BeADirectory() types.GomegaMatcher {
-	return &matchers.BeADirectoryMatcher{}
-}
-
-//And succeeds only if all of the given matchers succeed.
-//The matchers are tried in order, and will fail-fast if one doesn't succeed.
-//  Expect("hi").To(And(HaveLen(2), Equal("hi"))
-//
-//And(), Or(), Not() and WithTransform() allow matchers to be composed into complex expressions.
-func And(ms ...types.GomegaMatcher) types.GomegaMatcher {
-	return &matchers.AndMatcher{Matchers: ms}
-}
-
-//SatisfyAll is an alias for And().
-//  Ω("hi").Should(SatisfyAll(HaveLen(2), Equal("hi")))
-func SatisfyAll(matchers ...types.GomegaMatcher) types.GomegaMatcher {
-	return And(matchers...)
-}
-
-//Or succeeds if any of the given matchers succeed.
-//The matchers are tried in order and will return immediately upon the first successful match.
-//  Expect("hi").To(Or(HaveLen(3), HaveLen(2))
-//
-//And(), Or(), Not() and WithTransform() allow matchers to be composed into complex expressions.
-func Or(ms ...types.GomegaMatcher) types.GomegaMatcher {
-	return &matchers.OrMatcher{Matchers: ms}
-}
-
-//SatisfyAny is an alias for Or().
-//  Expect("hi").SatisfyAny(Or(HaveLen(3), HaveLen(2))
-func SatisfyAny(matchers ...types.GomegaMatcher) types.GomegaMatcher {
-	return Or(matchers...)
-}
-
-//Not negates the given matcher; it succeeds if the given matcher fails.
-//  Expect(1).To(Not(Equal(2))
-//
-//And(), Or(), Not() and WithTransform() allow matchers to be composed into complex expressions.
-func Not(matcher types.GomegaMatcher) types.GomegaMatcher {
-	return &matchers.NotMatcher{Matcher: matcher}
-}
-
-//WithTransform applies the `transform` to the actual value and matches it against `matcher`.
-//The given transform must be a function of one parameter that returns one value.
-//  var plus1 = func(i int) int { return i + 1 }
-//  Expect(1).To(WithTransform(plus1, Equal(2))
-//
-//And(), Or(), Not() and WithTransform() allow matchers to be composed into complex expressions.
-func WithTransform(transform interface{}, matcher types.GomegaMatcher) types.GomegaMatcher {
-	return matchers.NewWithTransformMatcher(transform, matcher)
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/and.go b/vendor/github.com/onsi/gomega/matchers/and.go
deleted file mode 100644
index d83a29164c..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/and.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-
-	"github.com/onsi/gomega/format"
-	"github.com/onsi/gomega/internal/oraclematcher"
-	"github.com/onsi/gomega/types"
-)
-
-type AndMatcher struct {
-	Matchers []types.GomegaMatcher
-
-	// state
-	firstFailedMatcher types.GomegaMatcher
-}
-
-func (m *AndMatcher) Match(actual interface{}) (success bool, err error) {
-	m.firstFailedMatcher = nil
-	for _, matcher := range m.Matchers {
-		success, err := matcher.Match(actual)
-		if !success || err != nil {
-			m.firstFailedMatcher = matcher
-			return false, err
-		}
-	}
-	return true, nil
-}
-
-func (m *AndMatcher) FailureMessage(actual interface{}) (message string) {
-	return m.firstFailedMatcher.FailureMessage(actual)
-}
-
-func (m *AndMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	// not the most beautiful list of matchers, but not bad either...
-	return format.Message(actual, fmt.Sprintf("To not satisfy all of these matchers: %s", m.Matchers))
-}
-
-func (m *AndMatcher) MatchMayChangeInTheFuture(actual interface{}) bool {
-	/*
-		Example with 3 matchers: A, B, C
-
-		Match evaluates them: T, F, <?>  => F
-		So match is currently F, what should MatchMayChangeInTheFuture() return?
-		Seems like it only depends on B, since currently B MUST change to allow the result to become T
-
-		Match eval: T, T, T  => T
-		So match is currently T, what should MatchMayChangeInTheFuture() return?
-		Seems to depend on ANY of them being able to change to F.
-	*/
-
-	if m.firstFailedMatcher == nil {
-		// so all matchers succeeded.. Any one of them changing would change the result.
-		for _, matcher := range m.Matchers {
-			if oraclematcher.MatchMayChangeInTheFuture(matcher, actual) {
-				return true
-			}
-		}
-		return false // none of were going to change
-	}
-	// one of the matchers failed.. it must be able to change in order to affect the result
-	return oraclematcher.MatchMayChangeInTheFuture(m.firstFailedMatcher, actual)
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/assignable_to_type_of_matcher.go b/vendor/github.com/onsi/gomega/matchers/assignable_to_type_of_matcher.go
deleted file mode 100644
index 89a1fc2116..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/assignable_to_type_of_matcher.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/onsi/gomega/format"
-)
-
-type AssignableToTypeOfMatcher struct {
-	Expected interface{}
-}
-
-func (matcher *AssignableToTypeOfMatcher) Match(actual interface{}) (success bool, err error) {
-	if actual == nil || matcher.Expected == nil {
-		return false, fmt.Errorf("Refusing to compare <nil> to <nil>.\nBe explicit and use BeNil() instead.  This is to avoid mistakes where both sides of an assertion are erroneously uninitialized.")
-	}
-
-	actualType := reflect.TypeOf(actual)
-	expectedType := reflect.TypeOf(matcher.Expected)
-
-	return actualType.AssignableTo(expectedType), nil
-}
-
-func (matcher *AssignableToTypeOfMatcher) FailureMessage(actual interface{}) string {
-	return format.Message(actual, fmt.Sprintf("to be assignable to the type: %T", matcher.Expected))
-}
-
-func (matcher *AssignableToTypeOfMatcher) NegatedFailureMessage(actual interface{}) string {
-	return format.Message(actual, fmt.Sprintf("not to be assignable to the type: %T", matcher.Expected))
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_a_directory.go b/vendor/github.com/onsi/gomega/matchers/be_a_directory.go
deleted file mode 100644
index 7b6975e41e..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_a_directory.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/onsi/gomega/format"
-)
-
-type notADirectoryError struct {
-	os.FileInfo
-}
-
-func (t notADirectoryError) Error() string {
-	fileInfo := os.FileInfo(t)
-	switch {
-	case fileInfo.Mode().IsRegular():
-		return "file is a regular file"
-	default:
-		return fmt.Sprintf("file mode is: %s", fileInfo.Mode().String())
-	}
-}
-
-type BeADirectoryMatcher struct {
-	expected interface{}
-	err      error
-}
-
-func (matcher *BeADirectoryMatcher) Match(actual interface{}) (success bool, err error) {
-	actualFilename, ok := actual.(string)
-	if !ok {
-		return false, fmt.Errorf("BeADirectoryMatcher matcher expects a file path")
-	}
-
-	fileInfo, err := os.Stat(actualFilename)
-	if err != nil {
-		matcher.err = err
-		return false, nil
-	}
-
-	if !fileInfo.Mode().IsDir() {
-		matcher.err = notADirectoryError{fileInfo}
-		return false, nil
-	}
-	return true, nil
-}
-
-func (matcher *BeADirectoryMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, fmt.Sprintf("to be a directory: %s", matcher.err))
-}
-
-func (matcher *BeADirectoryMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, fmt.Sprintf("not be a directory"))
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_a_regular_file.go b/vendor/github.com/onsi/gomega/matchers/be_a_regular_file.go
deleted file mode 100644
index e239131fb6..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_a_regular_file.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/onsi/gomega/format"
-)
-
-type notARegularFileError struct {
-	os.FileInfo
-}
-
-func (t notARegularFileError) Error() string {
-	fileInfo := os.FileInfo(t)
-	switch {
-	case fileInfo.IsDir():
-		return "file is a directory"
-	default:
-		return fmt.Sprintf("file mode is: %s", fileInfo.Mode().String())
-	}
-}
-
-type BeARegularFileMatcher struct {
-	expected interface{}
-	err      error
-}
-
-func (matcher *BeARegularFileMatcher) Match(actual interface{}) (success bool, err error) {
-	actualFilename, ok := actual.(string)
-	if !ok {
-		return false, fmt.Errorf("BeARegularFileMatcher matcher expects a file path")
-	}
-
-	fileInfo, err := os.Stat(actualFilename)
-	if err != nil {
-		matcher.err = err
-		return false, nil
-	}
-
-	if !fileInfo.Mode().IsRegular() {
-		matcher.err = notARegularFileError{fileInfo}
-		return false, nil
-	}
-	return true, nil
-}
-
-func (matcher *BeARegularFileMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, fmt.Sprintf("to be a regular file: %s", matcher.err))
-}
-
-func (matcher *BeARegularFileMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, fmt.Sprintf("not be a regular file"))
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_an_existing_file.go b/vendor/github.com/onsi/gomega/matchers/be_an_existing_file.go
deleted file mode 100644
index d42eba2234..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_an_existing_file.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/onsi/gomega/format"
-)
-
-type BeAnExistingFileMatcher struct {
-	expected interface{}
-}
-
-func (matcher *BeAnExistingFileMatcher) Match(actual interface{}) (success bool, err error) {
-	actualFilename, ok := actual.(string)
-	if !ok {
-		return false, fmt.Errorf("BeAnExistingFileMatcher matcher expects a file path")
-	}
-
-	if _, err = os.Stat(actualFilename); err != nil {
-		switch {
-		case os.IsNotExist(err):
-			return false, nil
-		default:
-			return false, err
-		}
-	}
-
-	return true, nil
-}
-
-func (matcher *BeAnExistingFileMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, fmt.Sprintf("to exist"))
-}
-
-func (matcher *BeAnExistingFileMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, fmt.Sprintf("not to exist"))
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_closed_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_closed_matcher.go
deleted file mode 100644
index c1b499597d..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_closed_matcher.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-	"reflect"
-)
-
-type BeClosedMatcher struct {
-}
-
-func (matcher *BeClosedMatcher) Match(actual interface{}) (success bool, err error) {
-	if !isChan(actual) {
-		return false, fmt.Errorf("BeClosed matcher expects a channel.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	channelType := reflect.TypeOf(actual)
-	channelValue := reflect.ValueOf(actual)
-
-	if channelType.ChanDir() == reflect.SendDir {
-		return false, fmt.Errorf("BeClosed matcher cannot determine if a send-only channel is closed or open.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	winnerIndex, _, open := reflect.Select([]reflect.SelectCase{
-		reflect.SelectCase{Dir: reflect.SelectRecv, Chan: channelValue},
-		reflect.SelectCase{Dir: reflect.SelectDefault},
-	})
-
-	var closed bool
-	if winnerIndex == 0 {
-		closed = !open
-	} else if winnerIndex == 1 {
-		closed = false
-	}
-
-	return closed, nil
-}
-
-func (matcher *BeClosedMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to be closed")
-}
-
-func (matcher *BeClosedMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to be open")
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_empty_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_empty_matcher.go
deleted file mode 100644
index 55bdd7d15d..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_empty_matcher.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-)
-
-type BeEmptyMatcher struct {
-}
-
-func (matcher *BeEmptyMatcher) Match(actual interface{}) (success bool, err error) {
-	length, ok := lengthOf(actual)
-	if !ok {
-		return false, fmt.Errorf("BeEmpty matcher expects a string/array/map/channel/slice.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	return length == 0, nil
-}
-
-func (matcher *BeEmptyMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to be empty")
-}
-
-func (matcher *BeEmptyMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to be empty")
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_equivalent_to_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_equivalent_to_matcher.go
deleted file mode 100644
index 32a0c3108a..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_equivalent_to_matcher.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-	"reflect"
-)
-
-type BeEquivalentToMatcher struct {
-	Expected interface{}
-}
-
-func (matcher *BeEquivalentToMatcher) Match(actual interface{}) (success bool, err error) {
-	if actual == nil && matcher.Expected == nil {
-		return false, fmt.Errorf("Both actual and expected must not be nil.")
-	}
-
-	convertedActual := actual
-
-	if actual != nil && matcher.Expected != nil && reflect.TypeOf(actual).ConvertibleTo(reflect.TypeOf(matcher.Expected)) {
-		convertedActual = reflect.ValueOf(actual).Convert(reflect.TypeOf(matcher.Expected)).Interface()
-	}
-
-	return reflect.DeepEqual(convertedActual, matcher.Expected), nil
-}
-
-func (matcher *BeEquivalentToMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to be equivalent to", matcher.Expected)
-}
-
-func (matcher *BeEquivalentToMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to be equivalent to", matcher.Expected)
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_false_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_false_matcher.go
deleted file mode 100644
index 0b224cbbc6..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_false_matcher.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-)
-
-type BeFalseMatcher struct {
-}
-
-func (matcher *BeFalseMatcher) Match(actual interface{}) (success bool, err error) {
-	if !isBool(actual) {
-		return false, fmt.Errorf("Expected a boolean.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	return actual == false, nil
-}
-
-func (matcher *BeFalseMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to be false")
-}
-
-func (matcher *BeFalseMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to be false")
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_identical_to.go b/vendor/github.com/onsi/gomega/matchers/be_identical_to.go
deleted file mode 100644
index fdcda4d1fb..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_identical_to.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"runtime"
-
-	"github.com/onsi/gomega/format"
-)
-
-type BeIdenticalToMatcher struct {
-	Expected interface{}
-}
-
-func (matcher *BeIdenticalToMatcher) Match(actual interface{}) (success bool, matchErr error) {
-	if actual == nil && matcher.Expected == nil {
-		return false, fmt.Errorf("Refusing to compare <nil> to <nil>.\nBe explicit and use BeNil() instead.  This is to avoid mistakes where both sides of an assertion are erroneously uninitialized.")
-	}
-
-	defer func() {
-		if r := recover(); r != nil {
-			if _, ok := r.(runtime.Error); ok {
-				success = false
-				matchErr = nil
-			}
-		}
-	}()
-
-	return actual == matcher.Expected, nil
-}
-
-func (matcher *BeIdenticalToMatcher) FailureMessage(actual interface{}) string {
-	return format.Message(actual, "to be identical to", matcher.Expected)
-}
-
-func (matcher *BeIdenticalToMatcher) NegatedFailureMessage(actual interface{}) string {
-	return format.Message(actual, "not to be identical to", matcher.Expected)
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_nil_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_nil_matcher.go
deleted file mode 100644
index 7ee84fe1bc..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_nil_matcher.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package matchers
-
-import "github.com/onsi/gomega/format"
-
-type BeNilMatcher struct {
-}
-
-func (matcher *BeNilMatcher) Match(actual interface{}) (success bool, err error) {
-	return isNil(actual), nil
-}
-
-func (matcher *BeNilMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to be nil")
-}
-
-func (matcher *BeNilMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to be nil")
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_numerically_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_numerically_matcher.go
deleted file mode 100644
index 0c157f61b9..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_numerically_matcher.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"math"
-
-	"github.com/onsi/gomega/format"
-)
-
-type BeNumericallyMatcher struct {
-	Comparator string
-	CompareTo  []interface{}
-}
-
-func (matcher *BeNumericallyMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, fmt.Sprintf("to be %s", matcher.Comparator), matcher.CompareTo[0])
-}
-
-func (matcher *BeNumericallyMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, fmt.Sprintf("not to be %s", matcher.Comparator), matcher.CompareTo[0])
-}
-
-func (matcher *BeNumericallyMatcher) Match(actual interface{}) (success bool, err error) {
-	if len(matcher.CompareTo) == 0 || len(matcher.CompareTo) > 2 {
-		return false, fmt.Errorf("BeNumerically requires 1 or 2 CompareTo arguments.  Got:\n%s", format.Object(matcher.CompareTo, 1))
-	}
-	if !isNumber(actual) {
-		return false, fmt.Errorf("Expected a number.  Got:\n%s", format.Object(actual, 1))
-	}
-	if !isNumber(matcher.CompareTo[0]) {
-		return false, fmt.Errorf("Expected a number.  Got:\n%s", format.Object(matcher.CompareTo[0], 1))
-	}
-	if len(matcher.CompareTo) == 2 && !isNumber(matcher.CompareTo[1]) {
-		return false, fmt.Errorf("Expected a number.  Got:\n%s", format.Object(matcher.CompareTo[0], 1))
-	}
-
-	switch matcher.Comparator {
-	case "==", "~", ">", ">=", "<", "<=":
-	default:
-		return false, fmt.Errorf("Unknown comparator: %s", matcher.Comparator)
-	}
-
-	if isFloat(actual) || isFloat(matcher.CompareTo[0]) {
-		var secondOperand float64 = 1e-8
-		if len(matcher.CompareTo) == 2 {
-			secondOperand = toFloat(matcher.CompareTo[1])
-		}
-		success = matcher.matchFloats(toFloat(actual), toFloat(matcher.CompareTo[0]), secondOperand)
-	} else if isInteger(actual) {
-		var secondOperand int64 = 0
-		if len(matcher.CompareTo) == 2 {
-			secondOperand = toInteger(matcher.CompareTo[1])
-		}
-		success = matcher.matchIntegers(toInteger(actual), toInteger(matcher.CompareTo[0]), secondOperand)
-	} else if isUnsignedInteger(actual) {
-		var secondOperand uint64 = 0
-		if len(matcher.CompareTo) == 2 {
-			secondOperand = toUnsignedInteger(matcher.CompareTo[1])
-		}
-		success = matcher.matchUnsignedIntegers(toUnsignedInteger(actual), toUnsignedInteger(matcher.CompareTo[0]), secondOperand)
-	} else {
-		return false, fmt.Errorf("Failed to compare:\n%s\n%s:\n%s", format.Object(actual, 1), matcher.Comparator, format.Object(matcher.CompareTo[0], 1))
-	}
-
-	return success, nil
-}
-
-func (matcher *BeNumericallyMatcher) matchIntegers(actual, compareTo, threshold int64) (success bool) {
-	switch matcher.Comparator {
-	case "==", "~":
-		diff := actual - compareTo
-		return -threshold <= diff && diff <= threshold
-	case ">":
-		return (actual > compareTo)
-	case ">=":
-		return (actual >= compareTo)
-	case "<":
-		return (actual < compareTo)
-	case "<=":
-		return (actual <= compareTo)
-	}
-	return false
-}
-
-func (matcher *BeNumericallyMatcher) matchUnsignedIntegers(actual, compareTo, threshold uint64) (success bool) {
-	switch matcher.Comparator {
-	case "==", "~":
-		if actual < compareTo {
-			actual, compareTo = compareTo, actual
-		}
-		return actual-compareTo <= threshold
-	case ">":
-		return (actual > compareTo)
-	case ">=":
-		return (actual >= compareTo)
-	case "<":
-		return (actual < compareTo)
-	case "<=":
-		return (actual <= compareTo)
-	}
-	return false
-}
-
-func (matcher *BeNumericallyMatcher) matchFloats(actual, compareTo, threshold float64) (success bool) {
-	switch matcher.Comparator {
-	case "~":
-		return math.Abs(actual-compareTo) <= threshold
-	case "==":
-		return (actual == compareTo)
-	case ">":
-		return (actual > compareTo)
-	case ">=":
-		return (actual >= compareTo)
-	case "<":
-		return (actual < compareTo)
-	case "<=":
-		return (actual <= compareTo)
-	}
-	return false
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_sent_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_sent_matcher.go
deleted file mode 100644
index d7c32233ec..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_sent_matcher.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/onsi/gomega/format"
-)
-
-type BeSentMatcher struct {
-	Arg           interface{}
-	channelClosed bool
-}
-
-func (matcher *BeSentMatcher) Match(actual interface{}) (success bool, err error) {
-	if !isChan(actual) {
-		return false, fmt.Errorf("BeSent expects a channel.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	channelType := reflect.TypeOf(actual)
-	channelValue := reflect.ValueOf(actual)
-
-	if channelType.ChanDir() == reflect.RecvDir {
-		return false, fmt.Errorf("BeSent matcher cannot be passed a receive-only channel.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	argType := reflect.TypeOf(matcher.Arg)
-	assignable := argType.AssignableTo(channelType.Elem())
-
-	if !assignable {
-		return false, fmt.Errorf("Cannot pass:\n%s to the channel:\n%s\nThe types don't match.", format.Object(matcher.Arg, 1), format.Object(actual, 1))
-	}
-
-	argValue := reflect.ValueOf(matcher.Arg)
-
-	defer func() {
-		if e := recover(); e != nil {
-			success = false
-			err = fmt.Errorf("Cannot send to a closed channel")
-			matcher.channelClosed = true
-		}
-	}()
-
-	winnerIndex, _, _ := reflect.Select([]reflect.SelectCase{
-		reflect.SelectCase{Dir: reflect.SelectSend, Chan: channelValue, Send: argValue},
-		reflect.SelectCase{Dir: reflect.SelectDefault},
-	})
-
-	var didSend bool
-	if winnerIndex == 0 {
-		didSend = true
-	}
-
-	return didSend, nil
-}
-
-func (matcher *BeSentMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to send:", matcher.Arg)
-}
-
-func (matcher *BeSentMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to send:", matcher.Arg)
-}
-
-func (matcher *BeSentMatcher) MatchMayChangeInTheFuture(actual interface{}) bool {
-	if !isChan(actual) {
-		return false
-	}
-
-	return !matcher.channelClosed
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_temporally_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_temporally_matcher.go
deleted file mode 100644
index abda4eb1e7..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_temporally_matcher.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-	"time"
-)
-
-type BeTemporallyMatcher struct {
-	Comparator string
-	CompareTo  time.Time
-	Threshold  []time.Duration
-}
-
-func (matcher *BeTemporallyMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, fmt.Sprintf("to be %s", matcher.Comparator), matcher.CompareTo)
-}
-
-func (matcher *BeTemporallyMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, fmt.Sprintf("not to be %s", matcher.Comparator), matcher.CompareTo)
-}
-
-func (matcher *BeTemporallyMatcher) Match(actual interface{}) (bool, error) {
-	// predicate to test for time.Time type
-	isTime := func(t interface{}) bool {
-		_, ok := t.(time.Time)
-		return ok
-	}
-
-	if !isTime(actual) {
-		return false, fmt.Errorf("Expected a time.Time.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	switch matcher.Comparator {
-	case "==", "~", ">", ">=", "<", "<=":
-	default:
-		return false, fmt.Errorf("Unknown comparator: %s", matcher.Comparator)
-	}
-
-	var threshold = time.Millisecond
-	if len(matcher.Threshold) == 1 {
-		threshold = matcher.Threshold[0]
-	}
-
-	return matcher.matchTimes(actual.(time.Time), matcher.CompareTo, threshold), nil
-}
-
-func (matcher *BeTemporallyMatcher) matchTimes(actual, compareTo time.Time, threshold time.Duration) (success bool) {
-	switch matcher.Comparator {
-	case "==":
-		return actual.Equal(compareTo)
-	case "~":
-		diff := actual.Sub(compareTo)
-		return -threshold <= diff && diff <= threshold
-	case ">":
-		return actual.After(compareTo)
-	case ">=":
-		return !actual.Before(compareTo)
-	case "<":
-		return actual.Before(compareTo)
-	case "<=":
-		return !actual.After(compareTo)
-	}
-	return false
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_true_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_true_matcher.go
deleted file mode 100644
index 1275e5fc9d..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_true_matcher.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-)
-
-type BeTrueMatcher struct {
-}
-
-func (matcher *BeTrueMatcher) Match(actual interface{}) (success bool, err error) {
-	if !isBool(actual) {
-		return false, fmt.Errorf("Expected a boolean.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	return actual.(bool), nil
-}
-
-func (matcher *BeTrueMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to be true")
-}
-
-func (matcher *BeTrueMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to be true")
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/be_zero_matcher.go b/vendor/github.com/onsi/gomega/matchers/be_zero_matcher.go
deleted file mode 100644
index b39c9144be..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/be_zero_matcher.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package matchers
-
-import (
-	"github.com/onsi/gomega/format"
-	"reflect"
-)
-
-type BeZeroMatcher struct {
-}
-
-func (matcher *BeZeroMatcher) Match(actual interface{}) (success bool, err error) {
-	if actual == nil {
-		return true, nil
-	}
-	zeroValue := reflect.Zero(reflect.TypeOf(actual)).Interface()
-
-	return reflect.DeepEqual(zeroValue, actual), nil
-
-}
-
-func (matcher *BeZeroMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to be zero-valued")
-}
-
-func (matcher *BeZeroMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to be zero-valued")
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/consist_of.go b/vendor/github.com/onsi/gomega/matchers/consist_of.go
deleted file mode 100644
index 7b0e088684..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/consist_of.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/onsi/gomega/format"
-	"github.com/onsi/gomega/matchers/support/goraph/bipartitegraph"
-)
-
-type ConsistOfMatcher struct {
-	Elements []interface{}
-}
-
-func (matcher *ConsistOfMatcher) Match(actual interface{}) (success bool, err error) {
-	if !isArrayOrSlice(actual) && !isMap(actual) {
-		return false, fmt.Errorf("ConsistOf matcher expects an array/slice/map.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	elements := matcher.Elements
-	if len(matcher.Elements) == 1 && isArrayOrSlice(matcher.Elements[0]) {
-		elements = []interface{}{}
-		value := reflect.ValueOf(matcher.Elements[0])
-		for i := 0; i < value.Len(); i++ {
-			elements = append(elements, value.Index(i).Interface())
-		}
-	}
-
-	matchers := []interface{}{}
-	for _, element := range elements {
-		matcher, isMatcher := element.(omegaMatcher)
-		if !isMatcher {
-			matcher = &EqualMatcher{Expected: element}
-		}
-		matchers = append(matchers, matcher)
-	}
-
-	values := matcher.valuesOf(actual)
-
-	if len(values) != len(matchers) {
-		return false, nil
-	}
-
-	neighbours := func(v, m interface{}) (bool, error) {
-		match, err := m.(omegaMatcher).Match(v)
-		return match && err == nil, nil
-	}
-
-	bipartiteGraph, err := bipartitegraph.NewBipartiteGraph(values, matchers, neighbours)
-	if err != nil {
-		return false, err
-	}
-
-	return len(bipartiteGraph.LargestMatching()) == len(values), nil
-}
-
-func (matcher *ConsistOfMatcher) valuesOf(actual interface{}) []interface{} {
-	value := reflect.ValueOf(actual)
-	values := []interface{}{}
-	if isMap(actual) {
-		keys := value.MapKeys()
-		for i := 0; i < value.Len(); i++ {
-			values = append(values, value.MapIndex(keys[i]).Interface())
-		}
-	} else {
-		for i := 0; i < value.Len(); i++ {
-			values = append(values, value.Index(i).Interface())
-		}
-	}
-
-	return values
-}
-
-func (matcher *ConsistOfMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to consist of", matcher.Elements)
-}
-
-func (matcher *ConsistOfMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to consist of", matcher.Elements)
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/contain_element_matcher.go b/vendor/github.com/onsi/gomega/matchers/contain_element_matcher.go
deleted file mode 100644
index 4159335d0d..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/contain_element_matcher.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/onsi/gomega/format"
-)
-
-type ContainElementMatcher struct {
-	Element interface{}
-}
-
-func (matcher *ContainElementMatcher) Match(actual interface{}) (success bool, err error) {
-	if !isArrayOrSlice(actual) && !isMap(actual) {
-		return false, fmt.Errorf("ContainElement matcher expects an array/slice/map.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	elemMatcher, elementIsMatcher := matcher.Element.(omegaMatcher)
-	if !elementIsMatcher {
-		elemMatcher = &EqualMatcher{Expected: matcher.Element}
-	}
-
-	value := reflect.ValueOf(actual)
-	var keys []reflect.Value
-	if isMap(actual) {
-		keys = value.MapKeys()
-	}
-	var lastError error
-	for i := 0; i < value.Len(); i++ {
-		var success bool
-		var err error
-		if isMap(actual) {
-			success, err = elemMatcher.Match(value.MapIndex(keys[i]).Interface())
-		} else {
-			success, err = elemMatcher.Match(value.Index(i).Interface())
-		}
-		if err != nil {
-			lastError = err
-			continue
-		}
-		if success {
-			return true, nil
-		}
-	}
-
-	return false, lastError
-}
-
-func (matcher *ContainElementMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to contain element matching", matcher.Element)
-}
-
-func (matcher *ContainElementMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to contain element matching", matcher.Element)
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/contain_substring_matcher.go b/vendor/github.com/onsi/gomega/matchers/contain_substring_matcher.go
deleted file mode 100644
index 2e7608921a..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/contain_substring_matcher.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-	"strings"
-)
-
-type ContainSubstringMatcher struct {
-	Substr string
-	Args   []interface{}
-}
-
-func (matcher *ContainSubstringMatcher) Match(actual interface{}) (success bool, err error) {
-	actualString, ok := toString(actual)
-	if !ok {
-		return false, fmt.Errorf("ContainSubstring matcher requires a string or stringer.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	return strings.Contains(actualString, matcher.stringToMatch()), nil
-}
-
-func (matcher *ContainSubstringMatcher) stringToMatch() string {
-	stringToMatch := matcher.Substr
-	if len(matcher.Args) > 0 {
-		stringToMatch = fmt.Sprintf(matcher.Substr, matcher.Args...)
-	}
-	return stringToMatch
-}
-
-func (matcher *ContainSubstringMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to contain substring", matcher.stringToMatch())
-}
-
-func (matcher *ContainSubstringMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to contain substring", matcher.stringToMatch())
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/equal_matcher.go b/vendor/github.com/onsi/gomega/matchers/equal_matcher.go
deleted file mode 100644
index 874e6a6229..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/equal_matcher.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/onsi/gomega/format"
-)
-
-type EqualMatcher struct {
-	Expected interface{}
-}
-
-func (matcher *EqualMatcher) Match(actual interface{}) (success bool, err error) {
-	if actual == nil && matcher.Expected == nil {
-		return false, fmt.Errorf("Refusing to compare <nil> to <nil>.\nBe explicit and use BeNil() instead.  This is to avoid mistakes where both sides of an assertion are erroneously uninitialized.")
-	}
-	return reflect.DeepEqual(actual, matcher.Expected), nil
-}
-
-func (matcher *EqualMatcher) FailureMessage(actual interface{}) (message string) {
-	actualString, actualOK := actual.(string)
-	expectedString, expectedOK := matcher.Expected.(string)
-	if actualOK && expectedOK {
-		return format.MessageWithDiff(actualString, "to equal", expectedString)
-	}
-
-	return format.Message(actual, "to equal", matcher.Expected)
-}
-
-func (matcher *EqualMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to equal", matcher.Expected)
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/have_cap_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_cap_matcher.go
deleted file mode 100644
index 7ace93dc36..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/have_cap_matcher.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-
-	"github.com/onsi/gomega/format"
-)
-
-type HaveCapMatcher struct {
-	Count int
-}
-
-func (matcher *HaveCapMatcher) Match(actual interface{}) (success bool, err error) {
-	length, ok := capOf(actual)
-	if !ok {
-		return false, fmt.Errorf("HaveCap matcher expects a array/channel/slice.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	return length == matcher.Count, nil
-}
-
-func (matcher *HaveCapMatcher) FailureMessage(actual interface{}) (message string) {
-	return fmt.Sprintf("Expected\n%s\nto have capacity %d", format.Object(actual, 1), matcher.Count)
-}
-
-func (matcher *HaveCapMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return fmt.Sprintf("Expected\n%s\nnot to have capacity %d", format.Object(actual, 1), matcher.Count)
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/have_key_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_key_matcher.go
deleted file mode 100644
index 5701ba6e24..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/have_key_matcher.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-	"reflect"
-)
-
-type HaveKeyMatcher struct {
-	Key interface{}
-}
-
-func (matcher *HaveKeyMatcher) Match(actual interface{}) (success bool, err error) {
-	if !isMap(actual) {
-		return false, fmt.Errorf("HaveKey matcher expects a map.  Got:%s", format.Object(actual, 1))
-	}
-
-	keyMatcher, keyIsMatcher := matcher.Key.(omegaMatcher)
-	if !keyIsMatcher {
-		keyMatcher = &EqualMatcher{Expected: matcher.Key}
-	}
-
-	keys := reflect.ValueOf(actual).MapKeys()
-	for i := 0; i < len(keys); i++ {
-		success, err := keyMatcher.Match(keys[i].Interface())
-		if err != nil {
-			return false, fmt.Errorf("HaveKey's key matcher failed with:\n%s%s", format.Indent, err.Error())
-		}
-		if success {
-			return true, nil
-		}
-	}
-
-	return false, nil
-}
-
-func (matcher *HaveKeyMatcher) FailureMessage(actual interface{}) (message string) {
-	switch matcher.Key.(type) {
-	case omegaMatcher:
-		return format.Message(actual, "to have key matching", matcher.Key)
-	default:
-		return format.Message(actual, "to have key", matcher.Key)
-	}
-}
-
-func (matcher *HaveKeyMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	switch matcher.Key.(type) {
-	case omegaMatcher:
-		return format.Message(actual, "not to have key matching", matcher.Key)
-	default:
-		return format.Message(actual, "not to have key", matcher.Key)
-	}
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/have_key_with_value_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_key_with_value_matcher.go
deleted file mode 100644
index 464ac187e9..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/have_key_with_value_matcher.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-	"reflect"
-)
-
-type HaveKeyWithValueMatcher struct {
-	Key   interface{}
-	Value interface{}
-}
-
-func (matcher *HaveKeyWithValueMatcher) Match(actual interface{}) (success bool, err error) {
-	if !isMap(actual) {
-		return false, fmt.Errorf("HaveKeyWithValue matcher expects a map.  Got:%s", format.Object(actual, 1))
-	}
-
-	keyMatcher, keyIsMatcher := matcher.Key.(omegaMatcher)
-	if !keyIsMatcher {
-		keyMatcher = &EqualMatcher{Expected: matcher.Key}
-	}
-
-	valueMatcher, valueIsMatcher := matcher.Value.(omegaMatcher)
-	if !valueIsMatcher {
-		valueMatcher = &EqualMatcher{Expected: matcher.Value}
-	}
-
-	keys := reflect.ValueOf(actual).MapKeys()
-	for i := 0; i < len(keys); i++ {
-		success, err := keyMatcher.Match(keys[i].Interface())
-		if err != nil {
-			return false, fmt.Errorf("HaveKeyWithValue's key matcher failed with:\n%s%s", format.Indent, err.Error())
-		}
-		if success {
-			actualValue := reflect.ValueOf(actual).MapIndex(keys[i])
-			success, err := valueMatcher.Match(actualValue.Interface())
-			if err != nil {
-				return false, fmt.Errorf("HaveKeyWithValue's value matcher failed with:\n%s%s", format.Indent, err.Error())
-			}
-			return success, nil
-		}
-	}
-
-	return false, nil
-}
-
-func (matcher *HaveKeyWithValueMatcher) FailureMessage(actual interface{}) (message string) {
-	str := "to have {key: value}"
-	if _, ok := matcher.Key.(omegaMatcher); ok {
-		str += " matching"
-	} else if _, ok := matcher.Value.(omegaMatcher); ok {
-		str += " matching"
-	}
-
-	expect := make(map[interface{}]interface{}, 1)
-	expect[matcher.Key] = matcher.Value
-	return format.Message(actual, str, expect)
-}
-
-func (matcher *HaveKeyWithValueMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	kStr := "not to have key"
-	if _, ok := matcher.Key.(omegaMatcher); ok {
-		kStr = "not to have key matching"
-	}
-
-	vStr := "or that key's value not be"
-	if _, ok := matcher.Value.(omegaMatcher); ok {
-		vStr = "or to have that key's value not matching"
-	}
-
-	return format.Message(actual, kStr, matcher.Key, vStr, matcher.Value)
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/have_len_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_len_matcher.go
deleted file mode 100644
index a183775570..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/have_len_matcher.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-)
-
-type HaveLenMatcher struct {
-	Count int
-}
-
-func (matcher *HaveLenMatcher) Match(actual interface{}) (success bool, err error) {
-	length, ok := lengthOf(actual)
-	if !ok {
-		return false, fmt.Errorf("HaveLen matcher expects a string/array/map/channel/slice.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	return length == matcher.Count, nil
-}
-
-func (matcher *HaveLenMatcher) FailureMessage(actual interface{}) (message string) {
-	return fmt.Sprintf("Expected\n%s\nto have length %d", format.Object(actual, 1), matcher.Count)
-}
-
-func (matcher *HaveLenMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return fmt.Sprintf("Expected\n%s\nnot to have length %d", format.Object(actual, 1), matcher.Count)
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/have_occurred_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_occurred_matcher.go
deleted file mode 100644
index ebdd71786d..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/have_occurred_matcher.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-
-	"github.com/onsi/gomega/format"
-)
-
-type HaveOccurredMatcher struct {
-}
-
-func (matcher *HaveOccurredMatcher) Match(actual interface{}) (success bool, err error) {
-	// is purely nil?
-	if actual == nil {
-		return false, nil
-	}
-
-	// must be an 'error' type
-	if !isError(actual) {
-		return false, fmt.Errorf("Expected an error-type.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	// must be non-nil (or a pointer to a non-nil)
-	return !isNil(actual), nil
-}
-
-func (matcher *HaveOccurredMatcher) FailureMessage(actual interface{}) (message string) {
-	return fmt.Sprintf("Expected an error to have occurred.  Got:\n%s", format.Object(actual, 1))
-}
-
-func (matcher *HaveOccurredMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return fmt.Sprintf("Expected error:\n%s\n%s\n%s", format.Object(actual, 1), format.IndentString(actual.(error).Error(), 1), "not to have occurred")
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/have_prefix_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_prefix_matcher.go
deleted file mode 100644
index 8b63a89997..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/have_prefix_matcher.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-)
-
-type HavePrefixMatcher struct {
-	Prefix string
-	Args   []interface{}
-}
-
-func (matcher *HavePrefixMatcher) Match(actual interface{}) (success bool, err error) {
-	actualString, ok := toString(actual)
-	if !ok {
-		return false, fmt.Errorf("HavePrefix matcher requires a string or stringer.  Got:\n%s", format.Object(actual, 1))
-	}
-	prefix := matcher.prefix()
-	return len(actualString) >= len(prefix) && actualString[0:len(prefix)] == prefix, nil
-}
-
-func (matcher *HavePrefixMatcher) prefix() string {
-	if len(matcher.Args) > 0 {
-		return fmt.Sprintf(matcher.Prefix, matcher.Args...)
-	}
-	return matcher.Prefix
-}
-
-func (matcher *HavePrefixMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to have prefix", matcher.prefix())
-}
-
-func (matcher *HavePrefixMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to have prefix", matcher.prefix())
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/have_suffix_matcher.go b/vendor/github.com/onsi/gomega/matchers/have_suffix_matcher.go
deleted file mode 100644
index afc78fc901..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/have_suffix_matcher.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-)
-
-type HaveSuffixMatcher struct {
-	Suffix string
-	Args   []interface{}
-}
-
-func (matcher *HaveSuffixMatcher) Match(actual interface{}) (success bool, err error) {
-	actualString, ok := toString(actual)
-	if !ok {
-		return false, fmt.Errorf("HaveSuffix matcher requires a string or stringer.  Got:\n%s", format.Object(actual, 1))
-	}
-	suffix := matcher.suffix()
-	return len(actualString) >= len(suffix) && actualString[len(actualString)-len(suffix):] == suffix, nil
-}
-
-func (matcher *HaveSuffixMatcher) suffix() string {
-	if len(matcher.Args) > 0 {
-		return fmt.Sprintf(matcher.Suffix, matcher.Args...)
-	}
-	return matcher.Suffix
-}
-
-func (matcher *HaveSuffixMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to have suffix", matcher.suffix())
-}
-
-func (matcher *HaveSuffixMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to have suffix", matcher.suffix())
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/match_error_matcher.go b/vendor/github.com/onsi/gomega/matchers/match_error_matcher.go
deleted file mode 100644
index 03cdf04588..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/match_error_matcher.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-	"reflect"
-)
-
-type MatchErrorMatcher struct {
-	Expected interface{}
-}
-
-func (matcher *MatchErrorMatcher) Match(actual interface{}) (success bool, err error) {
-	if isNil(actual) {
-		return false, fmt.Errorf("Expected an error, got nil")
-	}
-
-	if !isError(actual) {
-		return false, fmt.Errorf("Expected an error.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	actualErr := actual.(error)
-
-	if isString(matcher.Expected) {
-		return reflect.DeepEqual(actualErr.Error(), matcher.Expected), nil
-	}
-
-	if isError(matcher.Expected) {
-		return reflect.DeepEqual(actualErr, matcher.Expected), nil
-	}
-
-	var subMatcher omegaMatcher
-	var hasSubMatcher bool
-	if matcher.Expected != nil {
-		subMatcher, hasSubMatcher = (matcher.Expected).(omegaMatcher)
-		if hasSubMatcher {
-			return subMatcher.Match(actualErr.Error())
-		}
-	}
-
-	return false, fmt.Errorf("MatchError must be passed an error, string, or Matcher that can match on strings.  Got:\n%s", format.Object(matcher.Expected, 1))
-}
-
-func (matcher *MatchErrorMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to match error", matcher.Expected)
-}
-
-func (matcher *MatchErrorMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to match error", matcher.Expected)
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/match_json_matcher.go b/vendor/github.com/onsi/gomega/matchers/match_json_matcher.go
deleted file mode 100644
index 499bb58301..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/match_json_matcher.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package matchers
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"strings"
-
-	"github.com/onsi/gomega/format"
-)
-
-type MatchJSONMatcher struct {
-	JSONToMatch      interface{}
-	firstFailurePath []interface{}
-}
-
-func (matcher *MatchJSONMatcher) Match(actual interface{}) (success bool, err error) {
-	actualString, expectedString, err := matcher.prettyPrint(actual)
-	if err != nil {
-		return false, err
-	}
-
-	var aval interface{}
-	var eval interface{}
-
-	// this is guarded by prettyPrint
-	json.Unmarshal([]byte(actualString), &aval)
-	json.Unmarshal([]byte(expectedString), &eval)
-	var equal bool
-	equal, matcher.firstFailurePath = deepEqual(aval, eval)
-	return equal, nil
-}
-
-func (matcher *MatchJSONMatcher) FailureMessage(actual interface{}) (message string) {
-	actualString, expectedString, _ := matcher.prettyPrint(actual)
-	return formattedMessage(format.Message(actualString, "to match JSON of", expectedString), matcher.firstFailurePath)
-}
-
-func (matcher *MatchJSONMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	actualString, expectedString, _ := matcher.prettyPrint(actual)
-	return formattedMessage(format.Message(actualString, "not to match JSON of", expectedString), matcher.firstFailurePath)
-}
-
-func formattedMessage(comparisonMessage string, failurePath []interface{}) string {
-	var diffMessage string
-	if len(failurePath) == 0 {
-		diffMessage = ""
-	} else {
-		diffMessage = fmt.Sprintf("\n\nfirst mismatched key: %s", formattedFailurePath(failurePath))
-	}
-	return fmt.Sprintf("%s%s", comparisonMessage, diffMessage)
-}
-
-func formattedFailurePath(failurePath []interface{}) string {
-	formattedPaths := []string{}
-	for i := len(failurePath) - 1; i >= 0; i-- {
-		switch p := failurePath[i].(type) {
-		case int:
-			formattedPaths = append(formattedPaths, fmt.Sprintf(`[%d]`, p))
-		default:
-			if i != len(failurePath)-1 {
-				formattedPaths = append(formattedPaths, ".")
-			}
-			formattedPaths = append(formattedPaths, fmt.Sprintf(`"%s"`, p))
-		}
-	}
-	return strings.Join(formattedPaths, "")
-}
-
-func (matcher *MatchJSONMatcher) prettyPrint(actual interface{}) (actualFormatted, expectedFormatted string, err error) {
-	actualString, ok := toString(actual)
-	if !ok {
-		return "", "", fmt.Errorf("MatchJSONMatcher matcher requires a string, stringer, or []byte.  Got actual:\n%s", format.Object(actual, 1))
-	}
-	expectedString, ok := toString(matcher.JSONToMatch)
-	if !ok {
-		return "", "", fmt.Errorf("MatchJSONMatcher matcher requires a string, stringer, or []byte.  Got expected:\n%s", format.Object(matcher.JSONToMatch, 1))
-	}
-
-	abuf := new(bytes.Buffer)
-	ebuf := new(bytes.Buffer)
-
-	if err := json.Indent(abuf, []byte(actualString), "", "  "); err != nil {
-		return "", "", fmt.Errorf("Actual '%s' should be valid JSON, but it is not.\nUnderlying error:%s", actualString, err)
-	}
-
-	if err := json.Indent(ebuf, []byte(expectedString), "", "  "); err != nil {
-		return "", "", fmt.Errorf("Expected '%s' should be valid JSON, but it is not.\nUnderlying error:%s", expectedString, err)
-	}
-
-	return abuf.String(), ebuf.String(), nil
-}
-
-func deepEqual(a interface{}, b interface{}) (bool, []interface{}) {
-	var errorPath []interface{}
-	if reflect.TypeOf(a) != reflect.TypeOf(b) {
-		return false, errorPath
-	}
-
-	switch a.(type) {
-	case []interface{}:
-		if len(a.([]interface{})) != len(b.([]interface{})) {
-			return false, errorPath
-		}
-
-		for i, v := range a.([]interface{}) {
-			elementEqual, keyPath := deepEqual(v, b.([]interface{})[i])
-			if !elementEqual {
-				return false, append(keyPath, i)
-			}
-		}
-		return true, errorPath
-
-	case map[string]interface{}:
-		if len(a.(map[string]interface{})) != len(b.(map[string]interface{})) {
-			return false, errorPath
-		}
-
-		for k, v1 := range a.(map[string]interface{}) {
-			v2, ok := b.(map[string]interface{})[k]
-			if !ok {
-				return false, errorPath
-			}
-			elementEqual, keyPath := deepEqual(v1, v2)
-			if !elementEqual {
-				return false, append(keyPath, k)
-			}
-		}
-		return true, errorPath
-
-	default:
-		return a == b, errorPath
-	}
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/match_regexp_matcher.go b/vendor/github.com/onsi/gomega/matchers/match_regexp_matcher.go
deleted file mode 100644
index 7ca79a15be..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/match_regexp_matcher.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"github.com/onsi/gomega/format"
-	"regexp"
-)
-
-type MatchRegexpMatcher struct {
-	Regexp string
-	Args   []interface{}
-}
-
-func (matcher *MatchRegexpMatcher) Match(actual interface{}) (success bool, err error) {
-	actualString, ok := toString(actual)
-	if !ok {
-		return false, fmt.Errorf("RegExp matcher requires a string or stringer.\nGot:%s", format.Object(actual, 1))
-	}
-
-	match, err := regexp.Match(matcher.regexp(), []byte(actualString))
-	if err != nil {
-		return false, fmt.Errorf("RegExp match failed to compile with error:\n\t%s", err.Error())
-	}
-
-	return match, nil
-}
-
-func (matcher *MatchRegexpMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to match regular expression", matcher.regexp())
-}
-
-func (matcher *MatchRegexpMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "not to match regular expression", matcher.regexp())
-}
-
-func (matcher *MatchRegexpMatcher) regexp() string {
-	re := matcher.Regexp
-	if len(matcher.Args) > 0 {
-		re = fmt.Sprintf(matcher.Regexp, matcher.Args...)
-	}
-	return re
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/match_xml_matcher.go b/vendor/github.com/onsi/gomega/matchers/match_xml_matcher.go
deleted file mode 100644
index da26562902..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/match_xml_matcher.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package matchers
-
-import (
-	"bytes"
-	"encoding/xml"
-	"errors"
-	"fmt"
-	"io"
-	"reflect"
-	"strings"
-
-	"github.com/onsi/gomega/format"
-	"golang.org/x/net/html/charset"
-)
-
-type MatchXMLMatcher struct {
-	XMLToMatch interface{}
-}
-
-func (matcher *MatchXMLMatcher) Match(actual interface{}) (success bool, err error) {
-	actualString, expectedString, err := matcher.formattedPrint(actual)
-	if err != nil {
-		return false, err
-	}
-
-	aval, err := parseXmlContent(actualString)
-	if err != nil {
-		return false, fmt.Errorf("Actual '%s' should be valid XML, but it is not.\nUnderlying error:%s", actualString, err)
-	}
-
-	eval, err := parseXmlContent(expectedString)
-	if err != nil {
-		return false, fmt.Errorf("Expected '%s' should be valid XML, but it is not.\nUnderlying error:%s", expectedString, err)
-	}
-
-	return reflect.DeepEqual(aval, eval), nil
-}
-
-func (matcher *MatchXMLMatcher) FailureMessage(actual interface{}) (message string) {
-	actualString, expectedString, _ := matcher.formattedPrint(actual)
-	return fmt.Sprintf("Expected\n%s\nto match XML of\n%s", actualString, expectedString)
-}
-
-func (matcher *MatchXMLMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	actualString, expectedString, _ := matcher.formattedPrint(actual)
-	return fmt.Sprintf("Expected\n%s\nnot to match XML of\n%s", actualString, expectedString)
-}
-
-func (matcher *MatchXMLMatcher) formattedPrint(actual interface{}) (actualString, expectedString string, err error) {
-	var ok bool
-	actualString, ok = toString(actual)
-	if !ok {
-		return "", "", fmt.Errorf("MatchXMLMatcher matcher requires a string, stringer, or []byte.  Got actual:\n%s", format.Object(actual, 1))
-	}
-	expectedString, ok = toString(matcher.XMLToMatch)
-	if !ok {
-		return "", "", fmt.Errorf("MatchXMLMatcher matcher requires a string, stringer, or []byte.  Got expected:\n%s", format.Object(matcher.XMLToMatch, 1))
-	}
-	return actualString, expectedString, nil
-}
-
-func parseXmlContent(content string) (*xmlNode, error) {
-	allNodes := []*xmlNode{}
-
-	dec := newXmlDecoder(strings.NewReader(content))
-	for {
-		tok, err := dec.Token()
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			return nil, fmt.Errorf("failed to decode next token: %v", err)
-		}
-
-		lastNodeIndex := len(allNodes) - 1
-		var lastNode *xmlNode
-		if len(allNodes) > 0 {
-			lastNode = allNodes[lastNodeIndex]
-		} else {
-			lastNode = &xmlNode{}
-		}
-
-		switch tok := tok.(type) {
-		case xml.StartElement:
-			allNodes = append(allNodes, &xmlNode{XMLName: tok.Name, XMLAttr: tok.Attr})
-		case xml.EndElement:
-			if len(allNodes) > 1 {
-				allNodes[lastNodeIndex-1].Nodes = append(allNodes[lastNodeIndex-1].Nodes, lastNode)
-				allNodes = allNodes[:lastNodeIndex]
-			}
-		case xml.CharData:
-			lastNode.Content = append(lastNode.Content, tok.Copy()...)
-		case xml.Comment:
-			lastNode.Comments = append(lastNode.Comments, tok.Copy())
-		case xml.ProcInst:
-			lastNode.ProcInsts = append(lastNode.ProcInsts, tok.Copy())
-		}
-	}
-
-	if len(allNodes) == 0 {
-		return nil, errors.New("found no nodes")
-	}
-	firstNode := allNodes[0]
-	trimParentNodesContentSpaces(firstNode)
-
-	return firstNode, nil
-}
-
-func newXmlDecoder(reader io.Reader) *xml.Decoder {
-	dec := xml.NewDecoder(reader)
-	dec.CharsetReader = charset.NewReaderLabel
-	return dec
-}
-
-func trimParentNodesContentSpaces(node *xmlNode) {
-	if len(node.Nodes) > 0 {
-		node.Content = bytes.TrimSpace(node.Content)
-		for _, childNode := range node.Nodes {
-			trimParentNodesContentSpaces(childNode)
-		}
-	}
-}
-
-type xmlNode struct {
-	XMLName   xml.Name
-	Comments  []xml.Comment
-	ProcInsts []xml.ProcInst
-	XMLAttr   []xml.Attr
-	Content   []byte
-	Nodes     []*xmlNode
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/match_yaml_matcher.go b/vendor/github.com/onsi/gomega/matchers/match_yaml_matcher.go
deleted file mode 100644
index 69fb51a859..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/match_yaml_matcher.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-
-	"github.com/onsi/gomega/format"
-	"gopkg.in/yaml.v2"
-)
-
-type MatchYAMLMatcher struct {
-	YAMLToMatch interface{}
-}
-
-func (matcher *MatchYAMLMatcher) Match(actual interface{}) (success bool, err error) {
-	actualString, expectedString, err := matcher.toStrings(actual)
-	if err != nil {
-		return false, err
-	}
-
-	var aval interface{}
-	var eval interface{}
-
-	if err := yaml.Unmarshal([]byte(actualString), &aval); err != nil {
-		return false, fmt.Errorf("Actual '%s' should be valid YAML, but it is not.\nUnderlying error:%s", actualString, err)
-	}
-	if err := yaml.Unmarshal([]byte(expectedString), &eval); err != nil {
-		return false, fmt.Errorf("Expected '%s' should be valid YAML, but it is not.\nUnderlying error:%s", expectedString, err)
-	}
-
-	return reflect.DeepEqual(aval, eval), nil
-}
-
-func (matcher *MatchYAMLMatcher) FailureMessage(actual interface{}) (message string) {
-	actualString, expectedString, _ := matcher.toNormalisedStrings(actual)
-	return format.Message(actualString, "to match YAML of", expectedString)
-}
-
-func (matcher *MatchYAMLMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	actualString, expectedString, _ := matcher.toNormalisedStrings(actual)
-	return format.Message(actualString, "not to match YAML of", expectedString)
-}
-
-func (matcher *MatchYAMLMatcher) toNormalisedStrings(actual interface{}) (actualFormatted, expectedFormatted string, err error) {
-	actualString, expectedString, err := matcher.toStrings(actual)
-	return normalise(actualString), normalise(expectedString), err
-}
-
-func normalise(input string) string {
-	var val interface{}
-	err := yaml.Unmarshal([]byte(input), &val)
-	if err != nil {
-		panic(err) // guarded by Match
-	}
-	output, err := yaml.Marshal(val)
-	if err != nil {
-		panic(err) // guarded by Unmarshal
-	}
-	return strings.TrimSpace(string(output))
-}
-
-func (matcher *MatchYAMLMatcher) toStrings(actual interface{}) (actualFormatted, expectedFormatted string, err error) {
-	actualString, ok := toString(actual)
-	if !ok {
-		return "", "", fmt.Errorf("MatchYAMLMatcher matcher requires a string, stringer, or []byte.  Got actual:\n%s", format.Object(actual, 1))
-	}
-	expectedString, ok := toString(matcher.YAMLToMatch)
-	if !ok {
-		return "", "", fmt.Errorf("MatchYAMLMatcher matcher requires a string, stringer, or []byte.  Got expected:\n%s", format.Object(matcher.YAMLToMatch, 1))
-	}
-
-	return actualString, expectedString, nil
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/not.go b/vendor/github.com/onsi/gomega/matchers/not.go
deleted file mode 100644
index 2c91670bd9..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/not.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package matchers
-
-import (
-	"github.com/onsi/gomega/internal/oraclematcher"
-	"github.com/onsi/gomega/types"
-)
-
-type NotMatcher struct {
-	Matcher types.GomegaMatcher
-}
-
-func (m *NotMatcher) Match(actual interface{}) (bool, error) {
-	success, err := m.Matcher.Match(actual)
-	if err != nil {
-		return false, err
-	}
-	return !success, nil
-}
-
-func (m *NotMatcher) FailureMessage(actual interface{}) (message string) {
-	return m.Matcher.NegatedFailureMessage(actual) // works beautifully
-}
-
-func (m *NotMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return m.Matcher.FailureMessage(actual) // works beautifully
-}
-
-func (m *NotMatcher) MatchMayChangeInTheFuture(actual interface{}) bool {
-	return oraclematcher.MatchMayChangeInTheFuture(m.Matcher, actual) // just return m.Matcher's value
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/or.go b/vendor/github.com/onsi/gomega/matchers/or.go
deleted file mode 100644
index 3bf7998001..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/or.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-
-	"github.com/onsi/gomega/format"
-	"github.com/onsi/gomega/internal/oraclematcher"
-	"github.com/onsi/gomega/types"
-)
-
-type OrMatcher struct {
-	Matchers []types.GomegaMatcher
-
-	// state
-	firstSuccessfulMatcher types.GomegaMatcher
-}
-
-func (m *OrMatcher) Match(actual interface{}) (success bool, err error) {
-	m.firstSuccessfulMatcher = nil
-	for _, matcher := range m.Matchers {
-		success, err := matcher.Match(actual)
-		if err != nil {
-			return false, err
-		}
-		if success {
-			m.firstSuccessfulMatcher = matcher
-			return true, nil
-		}
-	}
-	return false, nil
-}
-
-func (m *OrMatcher) FailureMessage(actual interface{}) (message string) {
-	// not the most beautiful list of matchers, but not bad either...
-	return format.Message(actual, fmt.Sprintf("To satisfy at least one of these matchers: %s", m.Matchers))
-}
-
-func (m *OrMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return m.firstSuccessfulMatcher.NegatedFailureMessage(actual)
-}
-
-func (m *OrMatcher) MatchMayChangeInTheFuture(actual interface{}) bool {
-	/*
-		Example with 3 matchers: A, B, C
-
-		Match evaluates them: F, T, <?>  => T
-		So match is currently T, what should MatchMayChangeInTheFuture() return?
-		Seems like it only depends on B, since currently B MUST change to allow the result to become F
-
-		Match eval: F, F, F  => F
-		So match is currently F, what should MatchMayChangeInTheFuture() return?
-		Seems to depend on ANY of them being able to change to T.
-	*/
-
-	if m.firstSuccessfulMatcher != nil {
-		// one of the matchers succeeded.. it must be able to change in order to affect the result
-		return oraclematcher.MatchMayChangeInTheFuture(m.firstSuccessfulMatcher, actual)
-	} else {
-		// so all matchers failed.. Any one of them changing would change the result.
-		for _, matcher := range m.Matchers {
-			if oraclematcher.MatchMayChangeInTheFuture(matcher, actual) {
-				return true
-			}
-		}
-		return false // none of were going to change
-	}
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/panic_matcher.go b/vendor/github.com/onsi/gomega/matchers/panic_matcher.go
deleted file mode 100644
index 640f4db1a3..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/panic_matcher.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/onsi/gomega/format"
-)
-
-type PanicMatcher struct {
-	object interface{}
-}
-
-func (matcher *PanicMatcher) Match(actual interface{}) (success bool, err error) {
-	if actual == nil {
-		return false, fmt.Errorf("PanicMatcher expects a non-nil actual.")
-	}
-
-	actualType := reflect.TypeOf(actual)
-	if actualType.Kind() != reflect.Func {
-		return false, fmt.Errorf("PanicMatcher expects a function.  Got:\n%s", format.Object(actual, 1))
-	}
-	if !(actualType.NumIn() == 0 && actualType.NumOut() == 0) {
-		return false, fmt.Errorf("PanicMatcher expects a function with no arguments and no return value.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	success = false
-	defer func() {
-		if e := recover(); e != nil {
-			matcher.object = e
-			success = true
-		}
-	}()
-
-	reflect.ValueOf(actual).Call([]reflect.Value{})
-
-	return
-}
-
-func (matcher *PanicMatcher) FailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, "to panic")
-}
-
-func (matcher *PanicMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return format.Message(actual, fmt.Sprintf("not to panic, but panicked with\n%s", format.Object(matcher.object, 1)))
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/receive_matcher.go b/vendor/github.com/onsi/gomega/matchers/receive_matcher.go
deleted file mode 100644
index 74e9e7ebe1..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/receive_matcher.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/onsi/gomega/format"
-)
-
-type ReceiveMatcher struct {
-	Arg           interface{}
-	receivedValue reflect.Value
-	channelClosed bool
-}
-
-func (matcher *ReceiveMatcher) Match(actual interface{}) (success bool, err error) {
-	if !isChan(actual) {
-		return false, fmt.Errorf("ReceiveMatcher expects a channel.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	channelType := reflect.TypeOf(actual)
-	channelValue := reflect.ValueOf(actual)
-
-	if channelType.ChanDir() == reflect.SendDir {
-		return false, fmt.Errorf("ReceiveMatcher matcher cannot be passed a send-only channel.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	var subMatcher omegaMatcher
-	var hasSubMatcher bool
-
-	if matcher.Arg != nil {
-		subMatcher, hasSubMatcher = (matcher.Arg).(omegaMatcher)
-		if !hasSubMatcher {
-			argType := reflect.TypeOf(matcher.Arg)
-			if argType.Kind() != reflect.Ptr {
-				return false, fmt.Errorf("Cannot assign a value from the channel:\n%s\nTo:\n%s\nYou need to pass a pointer!", format.Object(actual, 1), format.Object(matcher.Arg, 1))
-			}
-
-			assignable := channelType.Elem().AssignableTo(argType.Elem())
-			if !assignable {
-				return false, fmt.Errorf("Cannot assign a value from the channel:\n%s\nTo:\n%s", format.Object(actual, 1), format.Object(matcher.Arg, 1))
-			}
-		}
-	}
-
-	winnerIndex, value, open := reflect.Select([]reflect.SelectCase{
-		reflect.SelectCase{Dir: reflect.SelectRecv, Chan: channelValue},
-		reflect.SelectCase{Dir: reflect.SelectDefault},
-	})
-
-	var closed bool
-	var didReceive bool
-	if winnerIndex == 0 {
-		closed = !open
-		didReceive = open
-	}
-	matcher.channelClosed = closed
-
-	if closed {
-		return false, nil
-	}
-
-	if hasSubMatcher {
-		if didReceive {
-			matcher.receivedValue = value
-			return subMatcher.Match(matcher.receivedValue.Interface())
-		}
-		return false, nil
-	}
-
-	if didReceive {
-		if matcher.Arg != nil {
-			outValue := reflect.ValueOf(matcher.Arg)
-			reflect.Indirect(outValue).Set(value)
-		}
-
-		return true, nil
-	}
-	return false, nil
-}
-
-func (matcher *ReceiveMatcher) FailureMessage(actual interface{}) (message string) {
-	subMatcher, hasSubMatcher := (matcher.Arg).(omegaMatcher)
-
-	closedAddendum := ""
-	if matcher.channelClosed {
-		closedAddendum = " The channel is closed."
-	}
-
-	if hasSubMatcher {
-		if matcher.receivedValue.IsValid() {
-			return subMatcher.FailureMessage(matcher.receivedValue.Interface())
-		}
-		return "When passed a matcher, ReceiveMatcher's channel *must* receive something."
-	}
-	return format.Message(actual, "to receive something."+closedAddendum)
-}
-
-func (matcher *ReceiveMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	subMatcher, hasSubMatcher := (matcher.Arg).(omegaMatcher)
-
-	closedAddendum := ""
-	if matcher.channelClosed {
-		closedAddendum = " The channel is closed."
-	}
-
-	if hasSubMatcher {
-		if matcher.receivedValue.IsValid() {
-			return subMatcher.NegatedFailureMessage(matcher.receivedValue.Interface())
-		}
-		return "When passed a matcher, ReceiveMatcher's channel *must* receive something."
-	}
-	return format.Message(actual, "not to receive anything."+closedAddendum)
-}
-
-func (matcher *ReceiveMatcher) MatchMayChangeInTheFuture(actual interface{}) bool {
-	if !isChan(actual) {
-		return false
-	}
-
-	return !matcher.channelClosed
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/succeed_matcher.go b/vendor/github.com/onsi/gomega/matchers/succeed_matcher.go
deleted file mode 100644
index 721ed5529b..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/succeed_matcher.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-
-	"github.com/onsi/gomega/format"
-)
-
-type SucceedMatcher struct {
-}
-
-func (matcher *SucceedMatcher) Match(actual interface{}) (success bool, err error) {
-	// is purely nil?
-	if actual == nil {
-		return true, nil
-	}
-
-	// must be an 'error' type
-	if !isError(actual) {
-		return false, fmt.Errorf("Expected an error-type.  Got:\n%s", format.Object(actual, 1))
-	}
-
-	// must be nil (or a pointer to a nil)
-	return isNil(actual), nil
-}
-
-func (matcher *SucceedMatcher) FailureMessage(actual interface{}) (message string) {
-	return fmt.Sprintf("Expected success, but got an error:\n%s\n%s", format.Object(actual, 1), format.IndentString(actual.(error).Error(), 1))
-}
-
-func (matcher *SucceedMatcher) NegatedFailureMessage(actual interface{}) (message string) {
-	return "Expected failure, but got no error."
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraph.go b/vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraph.go
deleted file mode 100644
index 119d21ef31..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraph.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package bipartitegraph
-
-import "errors"
-import "fmt"
-
-import . "github.com/onsi/gomega/matchers/support/goraph/node"
-import . "github.com/onsi/gomega/matchers/support/goraph/edge"
-
-type BipartiteGraph struct {
-	Left  NodeOrderedSet
-	Right NodeOrderedSet
-	Edges EdgeSet
-}
-
-func NewBipartiteGraph(leftValues, rightValues []interface{}, neighbours func(interface{}, interface{}) (bool, error)) (*BipartiteGraph, error) {
-	left := NodeOrderedSet{}
-	for i, _ := range leftValues {
-		left = append(left, Node{i})
-	}
-
-	right := NodeOrderedSet{}
-	for j, _ := range rightValues {
-		right = append(right, Node{j + len(left)})
-	}
-
-	edges := EdgeSet{}
-	for i, leftValue := range leftValues {
-		for j, rightValue := range rightValues {
-			neighbours, err := neighbours(leftValue, rightValue)
-			if err != nil {
-				return nil, errors.New(fmt.Sprintf("error determining adjacency for %v and %v: %s", leftValue, rightValue, err.Error()))
-			}
-
-			if neighbours {
-				edges = append(edges, Edge{left[i], right[j]})
-			}
-		}
-	}
-
-	return &BipartiteGraph{left, right, edges}, nil
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraphmatching.go b/vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraphmatching.go
deleted file mode 100644
index 8181f43a40..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/support/goraph/bipartitegraph/bipartitegraphmatching.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package bipartitegraph
-
-import . "github.com/onsi/gomega/matchers/support/goraph/node"
-import . "github.com/onsi/gomega/matchers/support/goraph/edge"
-import "github.com/onsi/gomega/matchers/support/goraph/util"
-
-func (bg *BipartiteGraph) LargestMatching() (matching EdgeSet) {
-	paths := bg.maximalDisjointSLAPCollection(matching)
-
-	for len(paths) > 0 {
-		for _, path := range paths {
-			matching = matching.SymmetricDifference(path)
-		}
-		paths = bg.maximalDisjointSLAPCollection(matching)
-	}
-
-	return
-}
-
-func (bg *BipartiteGraph) maximalDisjointSLAPCollection(matching EdgeSet) (result []EdgeSet) {
-	guideLayers := bg.createSLAPGuideLayers(matching)
-	if len(guideLayers) == 0 {
-		return
-	}
-
-	used := make(map[Node]bool)
-
-	for _, u := range guideLayers[len(guideLayers)-1] {
-		slap, found := bg.findDisjointSLAP(u, matching, guideLayers, used)
-		if found {
-			for _, edge := range slap {
-				used[edge.Node1] = true
-				used[edge.Node2] = true
-			}
-			result = append(result, slap)
-		}
-	}
-
-	return
-}
-
-func (bg *BipartiteGraph) findDisjointSLAP(
-	start Node,
-	matching EdgeSet,
-	guideLayers []NodeOrderedSet,
-	used map[Node]bool,
-) ([]Edge, bool) {
-	return bg.findDisjointSLAPHelper(start, EdgeSet{}, len(guideLayers)-1, matching, guideLayers, used)
-}
-
-func (bg *BipartiteGraph) findDisjointSLAPHelper(
-	currentNode Node,
-	currentSLAP EdgeSet,
-	currentLevel int,
-	matching EdgeSet,
-	guideLayers []NodeOrderedSet,
-	used map[Node]bool,
-) (EdgeSet, bool) {
-	used[currentNode] = true
-
-	if currentLevel == 0 {
-		return currentSLAP, true
-	}
-
-	for _, nextNode := range guideLayers[currentLevel-1] {
-		if used[nextNode] {
-			continue
-		}
-
-		edge, found := bg.Edges.FindByNodes(currentNode, nextNode)
-		if !found {
-			continue
-		}
-
-		if matching.Contains(edge) == util.Odd(currentLevel) {
-			continue
-		}
-
-		currentSLAP = append(currentSLAP, edge)
-		slap, found := bg.findDisjointSLAPHelper(nextNode, currentSLAP, currentLevel-1, matching, guideLayers, used)
-		if found {
-			return slap, true
-		}
-		currentSLAP = currentSLAP[:len(currentSLAP)-1]
-	}
-
-	used[currentNode] = false
-	return nil, false
-}
-
-func (bg *BipartiteGraph) createSLAPGuideLayers(matching EdgeSet) (guideLayers []NodeOrderedSet) {
-	used := make(map[Node]bool)
-	currentLayer := NodeOrderedSet{}
-
-	for _, node := range bg.Left {
-		if matching.Free(node) {
-			used[node] = true
-			currentLayer = append(currentLayer, node)
-		}
-	}
-
-	if len(currentLayer) == 0 {
-		return []NodeOrderedSet{}
-	}
-	guideLayers = append(guideLayers, currentLayer)
-
-	done := false
-
-	for !done {
-		lastLayer := currentLayer
-		currentLayer = NodeOrderedSet{}
-
-		if util.Odd(len(guideLayers)) {
-			for _, leftNode := range lastLayer {
-				for _, rightNode := range bg.Right {
-					if used[rightNode] {
-						continue
-					}
-
-					edge, found := bg.Edges.FindByNodes(leftNode, rightNode)
-					if !found || matching.Contains(edge) {
-						continue
-					}
-
-					currentLayer = append(currentLayer, rightNode)
-					used[rightNode] = true
-
-					if matching.Free(rightNode) {
-						done = true
-					}
-				}
-			}
-		} else {
-			for _, rightNode := range lastLayer {
-				for _, leftNode := range bg.Left {
-					if used[leftNode] {
-						continue
-					}
-
-					edge, found := bg.Edges.FindByNodes(leftNode, rightNode)
-					if !found || !matching.Contains(edge) {
-						continue
-					}
-
-					currentLayer = append(currentLayer, leftNode)
-					used[leftNode] = true
-				}
-			}
-
-		}
-
-		if len(currentLayer) == 0 {
-			return []NodeOrderedSet{}
-		}
-		guideLayers = append(guideLayers, currentLayer)
-	}
-
-	return
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/support/goraph/edge/edge.go b/vendor/github.com/onsi/gomega/matchers/support/goraph/edge/edge.go
deleted file mode 100644
index 4fd15cc069..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/support/goraph/edge/edge.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package edge
-
-import . "github.com/onsi/gomega/matchers/support/goraph/node"
-
-type Edge struct {
-	Node1 Node
-	Node2 Node
-}
-
-type EdgeSet []Edge
-
-func (ec EdgeSet) Free(node Node) bool {
-	for _, e := range ec {
-		if e.Node1 == node || e.Node2 == node {
-			return false
-		}
-	}
-
-	return true
-}
-
-func (ec EdgeSet) Contains(edge Edge) bool {
-	for _, e := range ec {
-		if e == edge {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (ec EdgeSet) FindByNodes(node1, node2 Node) (Edge, bool) {
-	for _, e := range ec {
-		if (e.Node1 == node1 && e.Node2 == node2) || (e.Node1 == node2 && e.Node2 == node1) {
-			return e, true
-		}
-	}
-
-	return Edge{}, false
-}
-
-func (ec EdgeSet) SymmetricDifference(ec2 EdgeSet) EdgeSet {
-	edgesToInclude := make(map[Edge]bool)
-
-	for _, e := range ec {
-		edgesToInclude[e] = true
-	}
-
-	for _, e := range ec2 {
-		edgesToInclude[e] = !edgesToInclude[e]
-	}
-
-	result := EdgeSet{}
-	for e, include := range edgesToInclude {
-		if include {
-			result = append(result, e)
-		}
-	}
-
-	return result
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/support/goraph/node/node.go b/vendor/github.com/onsi/gomega/matchers/support/goraph/node/node.go
deleted file mode 100644
index 800c2ea8ca..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/support/goraph/node/node.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package node
-
-type Node struct {
-	Id int
-}
-
-type NodeOrderedSet []Node
diff --git a/vendor/github.com/onsi/gomega/matchers/support/goraph/util/util.go b/vendor/github.com/onsi/gomega/matchers/support/goraph/util/util.go
deleted file mode 100644
index d76a1ee00a..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/support/goraph/util/util.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package util
-
-import "math"
-
-func Odd(n int) bool {
-	return math.Mod(float64(n), 2.0) == 1.0
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/type_support.go b/vendor/github.com/onsi/gomega/matchers/type_support.go
deleted file mode 100644
index b05a5e75d4..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/type_support.go
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-Gomega matchers
-
-This package implements the Gomega matchers and does not typically need to be imported.
-See the docs for Gomega for documentation on the matchers
-
-http://onsi.github.io/gomega/
-*/
-package matchers
-
-import (
-	"fmt"
-	"reflect"
-)
-
-type omegaMatcher interface {
-	Match(actual interface{}) (success bool, err error)
-	FailureMessage(actual interface{}) (message string)
-	NegatedFailureMessage(actual interface{}) (message string)
-}
-
-func isBool(a interface{}) bool {
-	return reflect.TypeOf(a).Kind() == reflect.Bool
-}
-
-func isNumber(a interface{}) bool {
-	if a == nil {
-		return false
-	}
-	kind := reflect.TypeOf(a).Kind()
-	return reflect.Int <= kind && kind <= reflect.Float64
-}
-
-func isInteger(a interface{}) bool {
-	kind := reflect.TypeOf(a).Kind()
-	return reflect.Int <= kind && kind <= reflect.Int64
-}
-
-func isUnsignedInteger(a interface{}) bool {
-	kind := reflect.TypeOf(a).Kind()
-	return reflect.Uint <= kind && kind <= reflect.Uint64
-}
-
-func isFloat(a interface{}) bool {
-	kind := reflect.TypeOf(a).Kind()
-	return reflect.Float32 <= kind && kind <= reflect.Float64
-}
-
-func toInteger(a interface{}) int64 {
-	if isInteger(a) {
-		return reflect.ValueOf(a).Int()
-	} else if isUnsignedInteger(a) {
-		return int64(reflect.ValueOf(a).Uint())
-	} else if isFloat(a) {
-		return int64(reflect.ValueOf(a).Float())
-	}
-	panic(fmt.Sprintf("Expected a number!  Got <%T> %#v", a, a))
-}
-
-func toUnsignedInteger(a interface{}) uint64 {
-	if isInteger(a) {
-		return uint64(reflect.ValueOf(a).Int())
-	} else if isUnsignedInteger(a) {
-		return reflect.ValueOf(a).Uint()
-	} else if isFloat(a) {
-		return uint64(reflect.ValueOf(a).Float())
-	}
-	panic(fmt.Sprintf("Expected a number!  Got <%T> %#v", a, a))
-}
-
-func toFloat(a interface{}) float64 {
-	if isInteger(a) {
-		return float64(reflect.ValueOf(a).Int())
-	} else if isUnsignedInteger(a) {
-		return float64(reflect.ValueOf(a).Uint())
-	} else if isFloat(a) {
-		return reflect.ValueOf(a).Float()
-	}
-	panic(fmt.Sprintf("Expected a number!  Got <%T> %#v", a, a))
-}
-
-func isError(a interface{}) bool {
-	_, ok := a.(error)
-	return ok
-}
-
-func isChan(a interface{}) bool {
-	if isNil(a) {
-		return false
-	}
-	return reflect.TypeOf(a).Kind() == reflect.Chan
-}
-
-func isMap(a interface{}) bool {
-	if a == nil {
-		return false
-	}
-	return reflect.TypeOf(a).Kind() == reflect.Map
-}
-
-func isArrayOrSlice(a interface{}) bool {
-	if a == nil {
-		return false
-	}
-	switch reflect.TypeOf(a).Kind() {
-	case reflect.Array, reflect.Slice:
-		return true
-	default:
-		return false
-	}
-}
-
-func isString(a interface{}) bool {
-	if a == nil {
-		return false
-	}
-	return reflect.TypeOf(a).Kind() == reflect.String
-}
-
-func toString(a interface{}) (string, bool) {
-	aString, isString := a.(string)
-	if isString {
-		return aString, true
-	}
-
-	aBytes, isBytes := a.([]byte)
-	if isBytes {
-		return string(aBytes), true
-	}
-
-	aStringer, isStringer := a.(fmt.Stringer)
-	if isStringer {
-		return aStringer.String(), true
-	}
-
-	return "", false
-}
-
-func lengthOf(a interface{}) (int, bool) {
-	if a == nil {
-		return 0, false
-	}
-	switch reflect.TypeOf(a).Kind() {
-	case reflect.Map, reflect.Array, reflect.String, reflect.Chan, reflect.Slice:
-		return reflect.ValueOf(a).Len(), true
-	default:
-		return 0, false
-	}
-}
-func capOf(a interface{}) (int, bool) {
-	if a == nil {
-		return 0, false
-	}
-	switch reflect.TypeOf(a).Kind() {
-	case reflect.Array, reflect.Chan, reflect.Slice:
-		return reflect.ValueOf(a).Cap(), true
-	default:
-		return 0, false
-	}
-}
-
-func isNil(a interface{}) bool {
-	if a == nil {
-		return true
-	}
-
-	switch reflect.TypeOf(a).Kind() {
-	case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
-		return reflect.ValueOf(a).IsNil()
-	}
-
-	return false
-}
diff --git a/vendor/github.com/onsi/gomega/matchers/with_transform.go b/vendor/github.com/onsi/gomega/matchers/with_transform.go
deleted file mode 100644
index 8e58d8a0fb..0000000000
--- a/vendor/github.com/onsi/gomega/matchers/with_transform.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package matchers
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/onsi/gomega/internal/oraclematcher"
-	"github.com/onsi/gomega/types"
-)
-
-type WithTransformMatcher struct {
-	// input
-	Transform interface{} // must be a function of one parameter that returns one value
-	Matcher   types.GomegaMatcher
-
-	// cached value
-	transformArgType reflect.Type
-
-	// state
-	transformedValue interface{}
-}
-
-func NewWithTransformMatcher(transform interface{}, matcher types.GomegaMatcher) *WithTransformMatcher {
-	if transform == nil {
-		panic("transform function cannot be nil")
-	}
-	txType := reflect.TypeOf(transform)
-	if txType.NumIn() != 1 {
-		panic("transform function must have 1 argument")
-	}
-	if txType.NumOut() != 1 {
-		panic("transform function must have 1 return value")
-	}
-
-	return &WithTransformMatcher{
-		Transform:        transform,
-		Matcher:          matcher,
-		transformArgType: reflect.TypeOf(transform).In(0),
-	}
-}
-
-func (m *WithTransformMatcher) Match(actual interface{}) (bool, error) {
-	// return error if actual's type is incompatible with Transform function's argument type
-	actualType := reflect.TypeOf(actual)
-	if !actualType.AssignableTo(m.transformArgType) {
-		return false, fmt.Errorf("Transform function expects '%s' but we have '%s'", m.transformArgType, actualType)
-	}
-
-	// call the Transform function with `actual`
-	fn := reflect.ValueOf(m.Transform)
-	result := fn.Call([]reflect.Value{reflect.ValueOf(actual)})
-	m.transformedValue = result[0].Interface() // expect exactly one value
-
-	return m.Matcher.Match(m.transformedValue)
-}
-
-func (m *WithTransformMatcher) FailureMessage(_ interface{}) (message string) {
-	return m.Matcher.FailureMessage(m.transformedValue)
-}
-
-func (m *WithTransformMatcher) NegatedFailureMessage(_ interface{}) (message string) {
-	return m.Matcher.NegatedFailureMessage(m.transformedValue)
-}
-
-func (m *WithTransformMatcher) MatchMayChangeInTheFuture(_ interface{}) bool {
-	// TODO: Maybe this should always just return true? (Only an issue for non-deterministic transformers.)
-	//
-	// Querying the next matcher is fine if the transformer always will return the same value.
-	// But if the transformer is non-deterministic and returns a different value each time, then there
-	// is no point in querying the next matcher, since it can only comment on the last transformed value.
-	return oraclematcher.MatchMayChangeInTheFuture(m.Matcher, m.transformedValue)
-}
diff --git a/vendor/github.com/onsi/gomega/types/types.go b/vendor/github.com/onsi/gomega/types/types.go
deleted file mode 100644
index a83b40110c..0000000000
--- a/vendor/github.com/onsi/gomega/types/types.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package types
-
-type GomegaFailHandler func(message string, callerSkip ...int)
-
-//A simple *testing.T interface wrapper
-type GomegaTestingT interface {
-	Fatalf(format string, args ...interface{})
-}
-
-//All Gomega matchers must implement the GomegaMatcher interface
-//
-//For details on writing custom matchers, check out: http://onsi.github.io/gomega/#adding_your_own_matchers
-type GomegaMatcher interface {
-	Match(actual interface{}) (success bool, err error)
-	FailureMessage(actual interface{}) (message string)
-	NegatedFailureMessage(actual interface{}) (message string)
-}
diff --git a/vendor/github.com/opencontainers/go-digest/CONTRIBUTING.md b/vendor/github.com/opencontainers/go-digest/CONTRIBUTING.md
deleted file mode 100644
index e4d962ac16..0000000000
--- a/vendor/github.com/opencontainers/go-digest/CONTRIBUTING.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# Contributing to Docker open source projects
-
-Want to hack on this project? Awesome! Here are instructions to get you started.
-
-This project is a part of the [Docker](https://www.docker.com) project, and follows
-the same rules and principles. If you're already familiar with the way
-Docker does things, you'll feel right at home.
-
-Otherwise, go read Docker's
-[contributions guidelines](https://github.com/docker/docker/blob/master/CONTRIBUTING.md),
-[issue triaging](https://github.com/docker/docker/blob/master/project/ISSUE-TRIAGE.md),
-[review process](https://github.com/docker/docker/blob/master/project/REVIEWING.md) and
-[branches and tags](https://github.com/docker/docker/blob/master/project/BRANCHES-AND-TAGS.md).
-
-For an in-depth description of our contribution process, visit the
-contributors guide: [Understand how to contribute](https://docs.docker.com/opensource/workflow/make-a-contribution/)
-
-### Sign your work
-
-The sign-off is a simple line at the end of the explanation for the patch. Your
-signature certifies that you wrote the patch or otherwise have the right to pass
-it on as an open-source patch. The rules are pretty simple: if you can certify
-the below (from [developercertificate.org](http://developercertificate.org/)):
-
-```
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-1 Letterman Drive
-Suite D4700
-San Francisco, CA, 94129
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
-```
-
-Then you just add a line to every git commit message:
-
-    Signed-off-by: Joe Smith <joe.smith@email.com>
-
-Use your real name (sorry, no pseudonyms or anonymous contributions.)
-
-If you set your `user.name` and `user.email` git configs, you can sign your
-commit automatically with `git commit -s`.
diff --git a/vendor/github.com/opencontainers/go-digest/LICENSE.code b/vendor/github.com/opencontainers/go-digest/LICENSE.code
deleted file mode 100644
index 0ea3ff81e3..0000000000
--- a/vendor/github.com/opencontainers/go-digest/LICENSE.code
+++ /dev/null
@@ -1,191 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        https://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2016 Docker, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       https://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/opencontainers/go-digest/LICENSE.docs b/vendor/github.com/opencontainers/go-digest/LICENSE.docs
deleted file mode 100644
index e26cd4fc8e..0000000000
--- a/vendor/github.com/opencontainers/go-digest/LICENSE.docs
+++ /dev/null
@@ -1,425 +0,0 @@
-Attribution-ShareAlike 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-	wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More_considerations
-     for the public:
-	wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution-ShareAlike 4.0 International Public
-License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution-ShareAlike 4.0 International Public License ("Public
-License"). To the extent this Public License may be interpreted as a
-contract, You are granted the Licensed Rights in consideration of Your
-acceptance of these terms and conditions, and the Licensor grants You
-such rights in consideration of benefits the Licensor receives from
-making the Licensed Material available under these terms and
-conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. BY-SA Compatible License means a license listed at
-     creativecommons.org/compatiblelicenses, approved by Creative
-     Commons as essentially the equivalent of this Public License.
-
-  d. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  e. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  f. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  g. License Elements means the license attributes listed in the name
-     of a Creative Commons Public License. The License Elements of this
-     Public License are Attribution and ShareAlike.
-
-  h. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  i. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  j. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  k. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  l. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  m. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part; and
-
-            b. produce, reproduce, and Share Adapted Material.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. Additional offer from the Licensor -- Adapted Material.
-               Every recipient of Adapted Material from You
-               automatically receives an offer from the Licensor to
-               exercise the Licensed Rights in the Adapted Material
-               under the conditions of the Adapter's License You apply.
-
-            c. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-  b. ShareAlike.
-
-     In addition to the conditions in Section 3(a), if You Share
-     Adapted Material You produce, the following conditions also apply.
-
-       1. The Adapter's License You apply must be a Creative Commons
-          license with the same License Elements, this version or
-          later, or a BY-SA Compatible License.
-
-       2. You must include the text of, or the URI or hyperlink to, the
-          Adapter's License You apply. You may satisfy this condition
-          in any reasonable manner based on the medium, means, and
-          context in which You Share Adapted Material.
-
-       3. You may not offer or impose any additional or different terms
-          or conditions on, or apply any Effective Technological
-          Measures to, Adapted Material that restrict exercise of the
-          rights granted under the Adapter's License You apply.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material,
-
-     including for purposes of Section 3(b); and
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
-
-=======================================================================
-
-Creative Commons is not a party to its public licenses.
-Notwithstanding, Creative Commons may elect to apply one of its public
-licenses to material it publishes and in those instances will be
-considered the "Licensor." Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the public
-licenses.
-
-Creative Commons may be contacted at creativecommons.org.
diff --git a/vendor/github.com/opencontainers/go-digest/MAINTAINERS b/vendor/github.com/opencontainers/go-digest/MAINTAINERS
deleted file mode 100644
index 42a29795d7..0000000000
--- a/vendor/github.com/opencontainers/go-digest/MAINTAINERS
+++ /dev/null
@@ -1,9 +0,0 @@
-Aaron Lehmann <aaron.lehmann@docker.com> (@aaronlehmann)
-Brandon Philips <brandon.philips@coreos.com> (@philips)
-Brendan Burns <bburns@microsoft.com> (@brendandburns)
-Derek McGowan <derek@mcgstyle.net> (@dmcgowan)
-Jason Bouzane <jbouzane@google.com> (@jbouzane)
-John Starks <jostarks@microsoft.com> (@jstarks)
-Jonathan Boulle <jon.boulle@coreos.com> (@jonboulle)
-Stephen Day <stephen.day@docker.com> (@stevvooe)
-Vincent Batts <vbatts@redhat.com> (@vbatts)
diff --git a/vendor/github.com/opencontainers/go-digest/README.md b/vendor/github.com/opencontainers/go-digest/README.md
deleted file mode 100644
index 0f5a04092c..0000000000
--- a/vendor/github.com/opencontainers/go-digest/README.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# go-digest
-
-[![GoDoc](https://godoc.org/github.com/opencontainers/go-digest?status.svg)](https://godoc.org/github.com/opencontainers/go-digest) [![Go Report Card](https://goreportcard.com/badge/github.com/opencontainers/go-digest)](https://goreportcard.com/report/github.com/opencontainers/go-digest) [![Build Status](https://travis-ci.org/opencontainers/go-digest.svg?branch=master)](https://travis-ci.org/opencontainers/go-digest)
-
-Common digest package used across the container ecosystem.
-
-Please see the [godoc](https://godoc.org/github.com/opencontainers/go-digest) for more information.
-
-# What is a digest?
-
-A digest is just a hash.
-
-The most common use case for a digest is to create a content
-identifier for use in [Content Addressable Storage](https://en.wikipedia.org/wiki/Content-addressable_storage)
-systems:
-
-```go
-id := digest.FromBytes([]byte("my content"))
-```
-
-In the example above, the id can be used to uniquely identify 
-the byte slice "my content". This allows two disparate applications
-to agree on a verifiable identifier without having to trust one
-another.
-
-An identifying digest can be verified, as follows:
-
-```go
-if id != digest.FromBytes([]byte("my content")) {
-  return errors.New("the content has changed!")
-}
-```
-
-A `Verifier` type can be used to handle cases where an `io.Reader`
-makes more sense:
-
-```go
-rd := getContent()
-verifier := id.Verifier()
-io.Copy(verifier, rd)
-
-if !verifier.Verified() {
-  return errors.New("the content has changed!")
-}
-```
-
-Using [Merkle DAGs](https://en.wikipedia.org/wiki/Merkle_tree), this
-can power a rich, safe, content distribution system.
-
-# Usage
-
-While the [godoc](https://godoc.org/github.com/opencontainers/go-digest) is
-considered the best resource, a few important items need to be called 
-out when using this package.
-
-1. Make sure to import the hash implementations into your application
-    or the package will panic. You should have something like the 
-    following in the main (or other entrypoint) of your application:
-   
-    ```go
-    import (
-        _ "crypto/sha256"
-   	    _ "crypto/sha512"
-    )
-    ```
-    This may seem inconvenient but it allows you replace the hash 
-    implementations with others, such as https://github.com/stevvooe/resumable.
- 
-2. Even though `digest.Digest` may be assemable as a string, _always_ 
-    verify your input with `digest.Parse` or use `Digest.Validate`
-    when accepting untrusted input. While there are measures to 
-    avoid common problems, this will ensure you have valid digests
-    in the rest of your application.
-
-# Stability
-
-The Go API, at this stage, is considered stable, unless otherwise noted.
-
-As always, before using a package export, read the [godoc](https://godoc.org/github.com/opencontainers/go-digest).
-
-# Contributing
-
-This package is considered fairly complete. It has been in production
-in thousands (millions?) of deployments and is fairly battle-hardened.
-New additions will be met with skepticism. If you think there is a 
-missing feature, please file a bug clearly describing the problem and 
-the alternatives you tried before submitting a PR.
-
-# Reporting security issues
-
-Please DO NOT file a public issue, instead send your report privately to
-security@opencontainers.org.
-
-The maintainers take security seriously. If you discover a security issue,
-please bring it to their attention right away!
-
-If you are reporting a security issue, do not create an issue or file a pull
-request on GitHub. Instead, disclose the issue responsibly by sending an email
-to security@opencontainers.org (which is inhabited only by the maintainers of
-the various OCI projects).
-
-# Copyright and license
-
-Copyright © 2016 Docker, Inc. All rights reserved, except as follows. Code is released under the [Apache 2.0 license](LICENSE.code). This `README.md` file and the [`CONTRIBUTING.md`](CONTRIBUTING.md) file are licensed under the Creative Commons Attribution 4.0 International License under the terms and conditions set forth in the file [`LICENSE.docs`](LICENSE.docs). You may obtain a duplicate copy of the same license, titled CC BY-SA 4.0, at http://creativecommons.org/licenses/by-sa/4.0/.
diff --git a/vendor/github.com/opencontainers/go-digest/algorithm.go b/vendor/github.com/opencontainers/go-digest/algorithm.go
deleted file mode 100644
index bdff42d929..0000000000
--- a/vendor/github.com/opencontainers/go-digest/algorithm.go
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright 2017 Docker, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package digest
-
-import (
-	"crypto"
-	"fmt"
-	"hash"
-	"io"
-)
-
-// Algorithm identifies and implementation of a digester by an identifier.
-// Note the that this defines both the hash algorithm used and the string
-// encoding.
-type Algorithm string
-
-// supported digest types
-const (
-	SHA256 Algorithm = "sha256" // sha256 with hex encoding
-	SHA384 Algorithm = "sha384" // sha384 with hex encoding
-	SHA512 Algorithm = "sha512" // sha512 with hex encoding
-
-	// Canonical is the primary digest algorithm used with the distribution
-	// project. Other digests may be used but this one is the primary storage
-	// digest.
-	Canonical = SHA256
-)
-
-var (
-	// TODO(stevvooe): Follow the pattern of the standard crypto package for
-	// registration of digests. Effectively, we are a registerable set and
-	// common symbol access.
-
-	// algorithms maps values to hash.Hash implementations. Other algorithms
-	// may be available but they cannot be calculated by the digest package.
-	algorithms = map[Algorithm]crypto.Hash{
-		SHA256: crypto.SHA256,
-		SHA384: crypto.SHA384,
-		SHA512: crypto.SHA512,
-	}
-)
-
-// Available returns true if the digest type is available for use. If this
-// returns false, Digester and Hash will return nil.
-func (a Algorithm) Available() bool {
-	h, ok := algorithms[a]
-	if !ok {
-		return false
-	}
-
-	// check availability of the hash, as well
-	return h.Available()
-}
-
-func (a Algorithm) String() string {
-	return string(a)
-}
-
-// Size returns number of bytes returned by the hash.
-func (a Algorithm) Size() int {
-	h, ok := algorithms[a]
-	if !ok {
-		return 0
-	}
-	return h.Size()
-}
-
-// Set implemented to allow use of Algorithm as a command line flag.
-func (a *Algorithm) Set(value string) error {
-	if value == "" {
-		*a = Canonical
-	} else {
-		// just do a type conversion, support is queried with Available.
-		*a = Algorithm(value)
-	}
-
-	if !a.Available() {
-		return ErrDigestUnsupported
-	}
-
-	return nil
-}
-
-// Digester returns a new digester for the specified algorithm. If the algorithm
-// does not have a digester implementation, nil will be returned. This can be
-// checked by calling Available before calling Digester.
-func (a Algorithm) Digester() Digester {
-	return &digester{
-		alg:  a,
-		hash: a.Hash(),
-	}
-}
-
-// Hash returns a new hash as used by the algorithm. If not available, the
-// method will panic. Check Algorithm.Available() before calling.
-func (a Algorithm) Hash() hash.Hash {
-	if !a.Available() {
-		// Empty algorithm string is invalid
-		if a == "" {
-			panic(fmt.Sprintf("empty digest algorithm, validate before calling Algorithm.Hash()"))
-		}
-
-		// NOTE(stevvooe): A missing hash is usually a programming error that
-		// must be resolved at compile time. We don't import in the digest
-		// package to allow users to choose their hash implementation (such as
-		// when using stevvooe/resumable or a hardware accelerated package).
-		//
-		// Applications that may want to resolve the hash at runtime should
-		// call Algorithm.Available before call Algorithm.Hash().
-		panic(fmt.Sprintf("%v not available (make sure it is imported)", a))
-	}
-
-	return algorithms[a].New()
-}
-
-// FromReader returns the digest of the reader using the algorithm.
-func (a Algorithm) FromReader(rd io.Reader) (Digest, error) {
-	digester := a.Digester()
-
-	if _, err := io.Copy(digester.Hash(), rd); err != nil {
-		return "", err
-	}
-
-	return digester.Digest(), nil
-}
-
-// FromBytes digests the input and returns a Digest.
-func (a Algorithm) FromBytes(p []byte) Digest {
-	digester := a.Digester()
-
-	if _, err := digester.Hash().Write(p); err != nil {
-		// Writes to a Hash should never fail. None of the existing
-		// hash implementations in the stdlib or hashes vendored
-		// here can return errors from Write. Having a panic in this
-		// condition instead of having FromBytes return an error value
-		// avoids unnecessary error handling paths in all callers.
-		panic("write to hash function returned error: " + err.Error())
-	}
-
-	return digester.Digest()
-}
-
-// FromString digests the string input and returns a Digest.
-func (a Algorithm) FromString(s string) Digest {
-	return a.FromBytes([]byte(s))
-}
diff --git a/vendor/github.com/opencontainers/go-digest/digest.go b/vendor/github.com/opencontainers/go-digest/digest.go
deleted file mode 100644
index 69e1d2b542..0000000000
--- a/vendor/github.com/opencontainers/go-digest/digest.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2017 Docker, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package digest
-
-import (
-	"fmt"
-	"hash"
-	"io"
-	"regexp"
-	"strings"
-)
-
-// Digest allows simple protection of hex formatted digest strings, prefixed
-// by their algorithm. Strings of type Digest have some guarantee of being in
-// the correct format and it provides quick access to the components of a
-// digest string.
-//
-// The following is an example of the contents of Digest types:
-//
-// 	sha256:7173b809ca12ec5dee4506cd86be934c4596dd234ee82c0662eac04a8c2c71dc
-//
-// This allows to abstract the digest behind this type and work only in those
-// terms.
-type Digest string
-
-// NewDigest returns a Digest from alg and a hash.Hash object.
-func NewDigest(alg Algorithm, h hash.Hash) Digest {
-	return NewDigestFromBytes(alg, h.Sum(nil))
-}
-
-// NewDigestFromBytes returns a new digest from the byte contents of p.
-// Typically, this can come from hash.Hash.Sum(...) or xxx.SumXXX(...)
-// functions. This is also useful for rebuilding digests from binary
-// serializations.
-func NewDigestFromBytes(alg Algorithm, p []byte) Digest {
-	return Digest(fmt.Sprintf("%s:%x", alg, p))
-}
-
-// NewDigestFromHex returns a Digest from alg and a the hex encoded digest.
-func NewDigestFromHex(alg, hex string) Digest {
-	return Digest(fmt.Sprintf("%s:%s", alg, hex))
-}
-
-// DigestRegexp matches valid digest types.
-var DigestRegexp = regexp.MustCompile(`[a-zA-Z0-9-_+.]+:[a-fA-F0-9]+`)
-
-// DigestRegexpAnchored matches valid digest types, anchored to the start and end of the match.
-var DigestRegexpAnchored = regexp.MustCompile(`^` + DigestRegexp.String() + `$`)
-
-var (
-	// ErrDigestInvalidFormat returned when digest format invalid.
-	ErrDigestInvalidFormat = fmt.Errorf("invalid checksum digest format")
-
-	// ErrDigestInvalidLength returned when digest has invalid length.
-	ErrDigestInvalidLength = fmt.Errorf("invalid checksum digest length")
-
-	// ErrDigestUnsupported returned when the digest algorithm is unsupported.
-	ErrDigestUnsupported = fmt.Errorf("unsupported digest algorithm")
-)
-
-// Parse parses s and returns the validated digest object. An error will
-// be returned if the format is invalid.
-func Parse(s string) (Digest, error) {
-	d := Digest(s)
-	return d, d.Validate()
-}
-
-// FromReader consumes the content of rd until io.EOF, returning canonical digest.
-func FromReader(rd io.Reader) (Digest, error) {
-	return Canonical.FromReader(rd)
-}
-
-// FromBytes digests the input and returns a Digest.
-func FromBytes(p []byte) Digest {
-	return Canonical.FromBytes(p)
-}
-
-// FromString digests the input and returns a Digest.
-func FromString(s string) Digest {
-	return Canonical.FromString(s)
-}
-
-// Validate checks that the contents of d is a valid digest, returning an
-// error if not.
-func (d Digest) Validate() error {
-	s := string(d)
-
-	i := strings.Index(s, ":")
-
-	// validate i then run through regexp
-	if i < 0 || i+1 == len(s) || !DigestRegexpAnchored.MatchString(s) {
-		return ErrDigestInvalidFormat
-	}
-
-	algorithm := Algorithm(s[:i])
-	if !algorithm.Available() {
-		return ErrDigestUnsupported
-	}
-
-	// Digests much always be hex-encoded, ensuring that their hex portion will
-	// always be size*2
-	if algorithm.Size()*2 != len(s[i+1:]) {
-		return ErrDigestInvalidLength
-	}
-
-	return nil
-}
-
-// Algorithm returns the algorithm portion of the digest. This will panic if
-// the underlying digest is not in a valid format.
-func (d Digest) Algorithm() Algorithm {
-	return Algorithm(d[:d.sepIndex()])
-}
-
-// Verifier returns a writer object that can be used to verify a stream of
-// content against the digest. If the digest is invalid, the method will panic.
-func (d Digest) Verifier() Verifier {
-	return hashVerifier{
-		hash:   d.Algorithm().Hash(),
-		digest: d,
-	}
-}
-
-// Hex returns the hex digest portion of the digest. This will panic if the
-// underlying digest is not in a valid format.
-func (d Digest) Hex() string {
-	return string(d[d.sepIndex()+1:])
-}
-
-func (d Digest) String() string {
-	return string(d)
-}
-
-func (d Digest) sepIndex() int {
-	i := strings.Index(string(d), ":")
-
-	if i < 0 {
-		panic(fmt.Sprintf("no ':' separator in digest %q", d))
-	}
-
-	return i
-}
diff --git a/vendor/github.com/opencontainers/go-digest/digester.go b/vendor/github.com/opencontainers/go-digest/digester.go
deleted file mode 100644
index 36fa2728ef..0000000000
--- a/vendor/github.com/opencontainers/go-digest/digester.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2017 Docker, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package digest
-
-import "hash"
-
-// Digester calculates the digest of written data. Writes should go directly
-// to the return value of Hash, while calling Digest will return the current
-// value of the digest.
-type Digester interface {
-	Hash() hash.Hash // provides direct access to underlying hash instance.
-	Digest() Digest
-}
-
-// digester provides a simple digester definition that embeds a hasher.
-type digester struct {
-	alg  Algorithm
-	hash hash.Hash
-}
-
-func (d *digester) Hash() hash.Hash {
-	return d.hash
-}
-
-func (d *digester) Digest() Digest {
-	return NewDigest(d.alg, d.hash)
-}
diff --git a/vendor/github.com/opencontainers/go-digest/doc.go b/vendor/github.com/opencontainers/go-digest/doc.go
deleted file mode 100644
index 491ea1ef1f..0000000000
--- a/vendor/github.com/opencontainers/go-digest/doc.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2017 Docker, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package digest provides a generalized type to opaquely represent message
-// digests and their operations within the registry. The Digest type is
-// designed to serve as a flexible identifier in a content-addressable system.
-// More importantly, it provides tools and wrappers to work with
-// hash.Hash-based digests with little effort.
-//
-// Basics
-//
-// The format of a digest is simply a string with two parts, dubbed the
-// "algorithm" and the "digest", separated by a colon:
-//
-// 	<algorithm>:<digest>
-//
-// An example of a sha256 digest representation follows:
-//
-// 	sha256:7173b809ca12ec5dee4506cd86be934c4596dd234ee82c0662eac04a8c2c71dc
-//
-// In this case, the string "sha256" is the algorithm and the hex bytes are
-// the "digest".
-//
-// Because the Digest type is simply a string, once a valid Digest is
-// obtained, comparisons are cheap, quick and simple to express with the
-// standard equality operator.
-//
-// Verification
-//
-// The main benefit of using the Digest type is simple verification against a
-// given digest. The Verifier interface, modeled after the stdlib hash.Hash
-// interface, provides a common write sink for digest verification. After
-// writing is complete, calling the Verifier.Verified method will indicate
-// whether or not the stream of bytes matches the target digest.
-//
-// Missing Features
-//
-// In addition to the above, we intend to add the following features to this
-// package:
-//
-// 1. A Digester type that supports write sink digest calculation.
-//
-// 2. Suspend and resume of ongoing digest calculations to support efficient digest verification in the registry.
-//
-package digest
diff --git a/vendor/github.com/opencontainers/go-digest/verifiers.go b/vendor/github.com/opencontainers/go-digest/verifiers.go
deleted file mode 100644
index 32125e9187..0000000000
--- a/vendor/github.com/opencontainers/go-digest/verifiers.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2017 Docker, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package digest
-
-import (
-	"hash"
-	"io"
-)
-
-// Verifier presents a general verification interface to be used with message
-// digests and other byte stream verifications. Users instantiate a Verifier
-// from one of the various methods, write the data under test to it then check
-// the result with the Verified method.
-type Verifier interface {
-	io.Writer
-
-	// Verified will return true if the content written to Verifier matches
-	// the digest.
-	Verified() bool
-}
-
-type hashVerifier struct {
-	digest Digest
-	hash   hash.Hash
-}
-
-func (hv hashVerifier) Write(p []byte) (n int, err error) {
-	return hv.hash.Write(p)
-}
-
-func (hv hashVerifier) Verified() bool {
-	return hv.digest == NewDigest(hv.digest.Algorithm(), hv.hash)
-}
diff --git a/vendor/github.com/pkg/errors/LICENSE b/vendor/github.com/pkg/errors/LICENSE
deleted file mode 100644
index 835ba3e755..0000000000
--- a/vendor/github.com/pkg/errors/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2015, Dave Cheney <dave@cheney.net>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/pkg/errors/README.md b/vendor/github.com/pkg/errors/README.md
deleted file mode 100644
index 273db3c98a..0000000000
--- a/vendor/github.com/pkg/errors/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# errors [![Travis-CI](https://travis-ci.org/pkg/errors.svg)](https://travis-ci.org/pkg/errors) [![AppVeyor](https://ci.appveyor.com/api/projects/status/b98mptawhudj53ep/branch/master?svg=true)](https://ci.appveyor.com/project/davecheney/errors/branch/master) [![GoDoc](https://godoc.org/github.com/pkg/errors?status.svg)](http://godoc.org/github.com/pkg/errors) [![Report card](https://goreportcard.com/badge/github.com/pkg/errors)](https://goreportcard.com/report/github.com/pkg/errors)
-
-Package errors provides simple error handling primitives.
-
-`go get github.com/pkg/errors`
-
-The traditional error handling idiom in Go is roughly akin to
-```go
-if err != nil {
-        return err
-}
-```
-which applied recursively up the call stack results in error reports without context or debugging information. The errors package allows programmers to add context to the failure path in their code in a way that does not destroy the original value of the error.
-
-## Adding context to an error
-
-The errors.Wrap function returns a new error that adds context to the original error. For example
-```go
-_, err := ioutil.ReadAll(r)
-if err != nil {
-        return errors.Wrap(err, "read failed")
-}
-```
-## Retrieving the cause of an error
-
-Using `errors.Wrap` constructs a stack of errors, adding context to the preceding error. Depending on the nature of the error it may be necessary to reverse the operation of errors.Wrap to retrieve the original error for inspection. Any error value which implements this interface can be inspected by `errors.Cause`.
-```go
-type causer interface {
-        Cause() error
-}
-```
-`errors.Cause` will recursively retrieve the topmost error which does not implement `causer`, which is assumed to be the original cause. For example:
-```go
-switch err := errors.Cause(err).(type) {
-case *MyError:
-        // handle specifically
-default:
-        // unknown error
-}
-```
-
-[Read the package documentation for more information](https://godoc.org/github.com/pkg/errors).
-
-## Contributing
-
-We welcome pull requests, bug fixes and issue reports. With that said, the bar for adding new symbols to this package is intentionally set high.
-
-Before proposing a change, please discuss your change by raising an issue.
-
-## Licence
-
-BSD-2-Clause
diff --git a/vendor/github.com/pkg/errors/appveyor.yml b/vendor/github.com/pkg/errors/appveyor.yml
deleted file mode 100644
index a932eade02..0000000000
--- a/vendor/github.com/pkg/errors/appveyor.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-version: build-{build}.{branch}
-
-clone_folder: C:\gopath\src\github.com\pkg\errors
-shallow_clone: true # for startup speed
-
-environment:
-  GOPATH: C:\gopath
-
-platform:
-  - x64
-
-# http://www.appveyor.com/docs/installed-software
-install:
-  # some helpful output for debugging builds
-  - go version
-  - go env
-  # pre-installed MinGW at C:\MinGW is 32bit only
-  # but MSYS2 at C:\msys64 has mingw64
-  - set PATH=C:\msys64\mingw64\bin;%PATH%
-  - gcc --version
-  - g++ --version
-
-build_script:
-  - go install -v ./...
-
-test_script:
-  - set PATH=C:\gopath\bin;%PATH%
-  - go test -v ./...
-
-#artifacts:
-#  - path: '%GOPATH%\bin\*.exe'
-deploy: off
diff --git a/vendor/github.com/pkg/errors/errors.go b/vendor/github.com/pkg/errors/errors.go
deleted file mode 100644
index 842ee80456..0000000000
--- a/vendor/github.com/pkg/errors/errors.go
+++ /dev/null
@@ -1,269 +0,0 @@
-// Package errors provides simple error handling primitives.
-//
-// The traditional error handling idiom in Go is roughly akin to
-//
-//     if err != nil {
-//             return err
-//     }
-//
-// which applied recursively up the call stack results in error reports
-// without context or debugging information. The errors package allows
-// programmers to add context to the failure path in their code in a way
-// that does not destroy the original value of the error.
-//
-// Adding context to an error
-//
-// The errors.Wrap function returns a new error that adds context to the
-// original error by recording a stack trace at the point Wrap is called,
-// and the supplied message. For example
-//
-//     _, err := ioutil.ReadAll(r)
-//     if err != nil {
-//             return errors.Wrap(err, "read failed")
-//     }
-//
-// If additional control is required the errors.WithStack and errors.WithMessage
-// functions destructure errors.Wrap into its component operations of annotating
-// an error with a stack trace and an a message, respectively.
-//
-// Retrieving the cause of an error
-//
-// Using errors.Wrap constructs a stack of errors, adding context to the
-// preceding error. Depending on the nature of the error it may be necessary
-// to reverse the operation of errors.Wrap to retrieve the original error
-// for inspection. Any error value which implements this interface
-//
-//     type causer interface {
-//             Cause() error
-//     }
-//
-// can be inspected by errors.Cause. errors.Cause will recursively retrieve
-// the topmost error which does not implement causer, which is assumed to be
-// the original cause. For example:
-//
-//     switch err := errors.Cause(err).(type) {
-//     case *MyError:
-//             // handle specifically
-//     default:
-//             // unknown error
-//     }
-//
-// causer interface is not exported by this package, but is considered a part
-// of stable public API.
-//
-// Formatted printing of errors
-//
-// All error values returned from this package implement fmt.Formatter and can
-// be formatted by the fmt package. The following verbs are supported
-//
-//     %s    print the error. If the error has a Cause it will be
-//           printed recursively
-//     %v    see %s
-//     %+v   extended format. Each Frame of the error's StackTrace will
-//           be printed in detail.
-//
-// Retrieving the stack trace of an error or wrapper
-//
-// New, Errorf, Wrap, and Wrapf record a stack trace at the point they are
-// invoked. This information can be retrieved with the following interface.
-//
-//     type stackTracer interface {
-//             StackTrace() errors.StackTrace
-//     }
-//
-// Where errors.StackTrace is defined as
-//
-//     type StackTrace []Frame
-//
-// The Frame type represents a call site in the stack trace. Frame supports
-// the fmt.Formatter interface that can be used for printing information about
-// the stack trace of this error. For example:
-//
-//     if err, ok := err.(stackTracer); ok {
-//             for _, f := range err.StackTrace() {
-//                     fmt.Printf("%+s:%d", f)
-//             }
-//     }
-//
-// stackTracer interface is not exported by this package, but is considered a part
-// of stable public API.
-//
-// See the documentation for Frame.Format for more details.
-package errors
-
-import (
-	"fmt"
-	"io"
-)
-
-// New returns an error with the supplied message.
-// New also records the stack trace at the point it was called.
-func New(message string) error {
-	return &fundamental{
-		msg:   message,
-		stack: callers(),
-	}
-}
-
-// Errorf formats according to a format specifier and returns the string
-// as a value that satisfies error.
-// Errorf also records the stack trace at the point it was called.
-func Errorf(format string, args ...interface{}) error {
-	return &fundamental{
-		msg:   fmt.Sprintf(format, args...),
-		stack: callers(),
-	}
-}
-
-// fundamental is an error that has a message and a stack, but no caller.
-type fundamental struct {
-	msg string
-	*stack
-}
-
-func (f *fundamental) Error() string { return f.msg }
-
-func (f *fundamental) Format(s fmt.State, verb rune) {
-	switch verb {
-	case 'v':
-		if s.Flag('+') {
-			io.WriteString(s, f.msg)
-			f.stack.Format(s, verb)
-			return
-		}
-		fallthrough
-	case 's':
-		io.WriteString(s, f.msg)
-	case 'q':
-		fmt.Fprintf(s, "%q", f.msg)
-	}
-}
-
-// WithStack annotates err with a stack trace at the point WithStack was called.
-// If err is nil, WithStack returns nil.
-func WithStack(err error) error {
-	if err == nil {
-		return nil
-	}
-	return &withStack{
-		err,
-		callers(),
-	}
-}
-
-type withStack struct {
-	error
-	*stack
-}
-
-func (w *withStack) Cause() error { return w.error }
-
-func (w *withStack) Format(s fmt.State, verb rune) {
-	switch verb {
-	case 'v':
-		if s.Flag('+') {
-			fmt.Fprintf(s, "%+v", w.Cause())
-			w.stack.Format(s, verb)
-			return
-		}
-		fallthrough
-	case 's':
-		io.WriteString(s, w.Error())
-	case 'q':
-		fmt.Fprintf(s, "%q", w.Error())
-	}
-}
-
-// Wrap returns an error annotating err with a stack trace
-// at the point Wrap is called, and the supplied message.
-// If err is nil, Wrap returns nil.
-func Wrap(err error, message string) error {
-	if err == nil {
-		return nil
-	}
-	err = &withMessage{
-		cause: err,
-		msg:   message,
-	}
-	return &withStack{
-		err,
-		callers(),
-	}
-}
-
-// Wrapf returns an error annotating err with a stack trace
-// at the point Wrapf is call, and the format specifier.
-// If err is nil, Wrapf returns nil.
-func Wrapf(err error, format string, args ...interface{}) error {
-	if err == nil {
-		return nil
-	}
-	err = &withMessage{
-		cause: err,
-		msg:   fmt.Sprintf(format, args...),
-	}
-	return &withStack{
-		err,
-		callers(),
-	}
-}
-
-// WithMessage annotates err with a new message.
-// If err is nil, WithMessage returns nil.
-func WithMessage(err error, message string) error {
-	if err == nil {
-		return nil
-	}
-	return &withMessage{
-		cause: err,
-		msg:   message,
-	}
-}
-
-type withMessage struct {
-	cause error
-	msg   string
-}
-
-func (w *withMessage) Error() string { return w.msg + ": " + w.cause.Error() }
-func (w *withMessage) Cause() error  { return w.cause }
-
-func (w *withMessage) Format(s fmt.State, verb rune) {
-	switch verb {
-	case 'v':
-		if s.Flag('+') {
-			fmt.Fprintf(s, "%+v\n", w.Cause())
-			io.WriteString(s, w.msg)
-			return
-		}
-		fallthrough
-	case 's', 'q':
-		io.WriteString(s, w.Error())
-	}
-}
-
-// Cause returns the underlying cause of the error, if possible.
-// An error value has a cause if it implements the following
-// interface:
-//
-//     type causer interface {
-//            Cause() error
-//     }
-//
-// If the error does not implement Cause, the original error will
-// be returned. If the error is nil, nil will be returned without further
-// investigation.
-func Cause(err error) error {
-	type causer interface {
-		Cause() error
-	}
-
-	for err != nil {
-		cause, ok := err.(causer)
-		if !ok {
-			break
-		}
-		err = cause.Cause()
-	}
-	return err
-}
diff --git a/vendor/github.com/pkg/errors/stack.go b/vendor/github.com/pkg/errors/stack.go
deleted file mode 100644
index 6b1f2891a5..0000000000
--- a/vendor/github.com/pkg/errors/stack.go
+++ /dev/null
@@ -1,178 +0,0 @@
-package errors
-
-import (
-	"fmt"
-	"io"
-	"path"
-	"runtime"
-	"strings"
-)
-
-// Frame represents a program counter inside a stack frame.
-type Frame uintptr
-
-// pc returns the program counter for this frame;
-// multiple frames may have the same PC value.
-func (f Frame) pc() uintptr { return uintptr(f) - 1 }
-
-// file returns the full path to the file that contains the
-// function for this Frame's pc.
-func (f Frame) file() string {
-	fn := runtime.FuncForPC(f.pc())
-	if fn == nil {
-		return "unknown"
-	}
-	file, _ := fn.FileLine(f.pc())
-	return file
-}
-
-// line returns the line number of source code of the
-// function for this Frame's pc.
-func (f Frame) line() int {
-	fn := runtime.FuncForPC(f.pc())
-	if fn == nil {
-		return 0
-	}
-	_, line := fn.FileLine(f.pc())
-	return line
-}
-
-// Format formats the frame according to the fmt.Formatter interface.
-//
-//    %s    source file
-//    %d    source line
-//    %n    function name
-//    %v    equivalent to %s:%d
-//
-// Format accepts flags that alter the printing of some verbs, as follows:
-//
-//    %+s   path of source file relative to the compile time GOPATH
-//    %+v   equivalent to %+s:%d
-func (f Frame) Format(s fmt.State, verb rune) {
-	switch verb {
-	case 's':
-		switch {
-		case s.Flag('+'):
-			pc := f.pc()
-			fn := runtime.FuncForPC(pc)
-			if fn == nil {
-				io.WriteString(s, "unknown")
-			} else {
-				file, _ := fn.FileLine(pc)
-				fmt.Fprintf(s, "%s\n\t%s", fn.Name(), file)
-			}
-		default:
-			io.WriteString(s, path.Base(f.file()))
-		}
-	case 'd':
-		fmt.Fprintf(s, "%d", f.line())
-	case 'n':
-		name := runtime.FuncForPC(f.pc()).Name()
-		io.WriteString(s, funcname(name))
-	case 'v':
-		f.Format(s, 's')
-		io.WriteString(s, ":")
-		f.Format(s, 'd')
-	}
-}
-
-// StackTrace is stack of Frames from innermost (newest) to outermost (oldest).
-type StackTrace []Frame
-
-func (st StackTrace) Format(s fmt.State, verb rune) {
-	switch verb {
-	case 'v':
-		switch {
-		case s.Flag('+'):
-			for _, f := range st {
-				fmt.Fprintf(s, "\n%+v", f)
-			}
-		case s.Flag('#'):
-			fmt.Fprintf(s, "%#v", []Frame(st))
-		default:
-			fmt.Fprintf(s, "%v", []Frame(st))
-		}
-	case 's':
-		fmt.Fprintf(s, "%s", []Frame(st))
-	}
-}
-
-// stack represents a stack of program counters.
-type stack []uintptr
-
-func (s *stack) Format(st fmt.State, verb rune) {
-	switch verb {
-	case 'v':
-		switch {
-		case st.Flag('+'):
-			for _, pc := range *s {
-				f := Frame(pc)
-				fmt.Fprintf(st, "\n%+v", f)
-			}
-		}
-	}
-}
-
-func (s *stack) StackTrace() StackTrace {
-	f := make([]Frame, len(*s))
-	for i := 0; i < len(f); i++ {
-		f[i] = Frame((*s)[i])
-	}
-	return f
-}
-
-func callers() *stack {
-	const depth = 32
-	var pcs [depth]uintptr
-	n := runtime.Callers(3, pcs[:])
-	var st stack = pcs[0:n]
-	return &st
-}
-
-// funcname removes the path prefix component of a function's name reported by func.Name().
-func funcname(name string) string {
-	i := strings.LastIndex(name, "/")
-	name = name[i+1:]
-	i = strings.Index(name, ".")
-	return name[i+1:]
-}
-
-func trimGOPATH(name, file string) string {
-	// Here we want to get the source file path relative to the compile time
-	// GOPATH. As of Go 1.6.x there is no direct way to know the compiled
-	// GOPATH at runtime, but we can infer the number of path segments in the
-	// GOPATH. We note that fn.Name() returns the function name qualified by
-	// the import path, which does not include the GOPATH. Thus we can trim
-	// segments from the beginning of the file path until the number of path
-	// separators remaining is one more than the number of path separators in
-	// the function name. For example, given:
-	//
-	//    GOPATH     /home/user
-	//    file       /home/user/src/pkg/sub/file.go
-	//    fn.Name()  pkg/sub.Type.Method
-	//
-	// We want to produce:
-	//
-	//    pkg/sub/file.go
-	//
-	// From this we can easily see that fn.Name() has one less path separator
-	// than our desired output. We count separators from the end of the file
-	// path until it finds two more than in the function name and then move
-	// one character forward to preserve the initial path segment without a
-	// leading separator.
-	const sep = "/"
-	goal := strings.Count(name, sep) + 2
-	i := len(file)
-	for n := 0; n < goal; n++ {
-		i = strings.LastIndex(file[:i], sep)
-		if i == -1 {
-			// not enough separators found, set i so that the slice expression
-			// below leaves file unmodified
-			i = -len(sep)
-			break
-		}
-	}
-	// get back to 0 or trim the leading separator
-	file = file[i+len(sep):]
-	return file
-}
diff --git a/vendor/github.com/sanathkr/go-yaml/LICENSE b/vendor/github.com/sanathkr/go-yaml/LICENSE
deleted file mode 100644
index 8dada3edaf..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/sanathkr/go-yaml/LICENSE.libyaml b/vendor/github.com/sanathkr/go-yaml/LICENSE.libyaml
deleted file mode 100644
index 8da58fbf6f..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/LICENSE.libyaml
+++ /dev/null
@@ -1,31 +0,0 @@
-The following files were ported to Go from C files of libyaml, and thus
-are still covered by their original copyright and license:
-
-    apic.go
-    emitterc.go
-    parserc.go
-    readerc.go
-    scannerc.go
-    writerc.go
-    yamlh.go
-    yamlprivateh.go
-
-Copyright (c) 2006 Kirill Simonov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/github.com/sanathkr/go-yaml/README.md b/vendor/github.com/sanathkr/go-yaml/README.md
deleted file mode 100644
index 7a512d67c2..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/README.md
+++ /dev/null
@@ -1,133 +0,0 @@
-# YAML support for the Go language
-
-Introduction
-------------
-
-The yaml package enables Go programs to comfortably encode and decode YAML
-values. It was developed within [Canonical](https://www.canonical.com) as
-part of the [juju](https://juju.ubuntu.com) project, and is based on a
-pure Go port of the well-known [libyaml](http://pyyaml.org/wiki/LibYAML)
-C library to parse and generate YAML data quickly and reliably.
-
-Compatibility
--------------
-
-The yaml package supports most of YAML 1.1 and 1.2, including support for
-anchors, tags, map merging, etc. Multi-document unmarshalling is not yet
-implemented, and base-60 floats from YAML 1.1 are purposefully not
-supported since they're a poor design and are gone in YAML 1.2.
-
-Installation and usage
-----------------------
-
-The import path for the package is *gopkg.in/yaml.v2*.
-
-To install it, run:
-
-    go get gopkg.in/yaml.v2
-
-API documentation
------------------
-
-If opened in a browser, the import path itself leads to the API documentation:
-
-  * [https://gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)
-
-API stability
--------------
-
-The package API for yaml v2 will remain stable as described in [gopkg.in](https://gopkg.in).
-
-
-License
--------
-
-The yaml package is licensed under the Apache License 2.0. Please see the LICENSE file for details.
-
-
-Example
--------
-
-Some more examples can be found in the "examples" folder.
-
-```Go
-package main
-
-import (
-        "fmt"
-        "log"
-
-        "gopkg.in/yaml.v2"
-)
-
-var data = `
-a: Easy!
-b:
-  c: 2
-  d: [3, 4]
-`
-
-type T struct {
-        A string
-        B struct {
-                RenamedC int   `yaml:"c"`
-                D        []int `yaml:",flow"`
-        }
-}
-
-func main() {
-        t := T{}
-    
-        err := yaml.Unmarshal([]byte(data), &t)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- t:\n%v\n\n", t)
-    
-        d, err := yaml.Marshal(&t)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- t dump:\n%s\n\n", string(d))
-    
-        m := make(map[interface{}]interface{})
-    
-        err = yaml.Unmarshal([]byte(data), &m)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- m:\n%v\n\n", m)
-    
-        d, err = yaml.Marshal(&m)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- m dump:\n%s\n\n", string(d))
-}
-```
-
-This example will generate the following output:
-
-```
---- t:
-{Easy! {2 [3 4]}}
-
---- t dump:
-a: Easy!
-b:
-  c: 2
-  d: [3, 4]
-
-
---- m:
-map[a:Easy! b:map[c:2 d:[3 4]]]
-
---- m dump:
-a: Easy!
-b:
-  c: 2
-  d:
-  - 3
-  - 4
-```
-
diff --git a/vendor/github.com/sanathkr/go-yaml/apic.go b/vendor/github.com/sanathkr/go-yaml/apic.go
deleted file mode 100644
index 95ec014e8c..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/apic.go
+++ /dev/null
@@ -1,742 +0,0 @@
-package yaml
-
-import (
-	"io"
-	"os"
-)
-
-func yaml_insert_token(parser *yaml_parser_t, pos int, token *yaml_token_t) {
-	//fmt.Println("yaml_insert_token", "pos:", pos, "typ:", token.typ, "head:", parser.tokens_head, "len:", len(parser.tokens))
-
-	// Check if we can move the queue at the beginning of the buffer.
-	if parser.tokens_head > 0 && len(parser.tokens) == cap(parser.tokens) {
-		if parser.tokens_head != len(parser.tokens) {
-			copy(parser.tokens, parser.tokens[parser.tokens_head:])
-		}
-		parser.tokens = parser.tokens[:len(parser.tokens)-parser.tokens_head]
-		parser.tokens_head = 0
-	}
-	parser.tokens = append(parser.tokens, *token)
-	if pos < 0 {
-		return
-	}
-	copy(parser.tokens[parser.tokens_head+pos+1:], parser.tokens[parser.tokens_head+pos:])
-	parser.tokens[parser.tokens_head+pos] = *token
-}
-
-// Create a new parser object.
-func yaml_parser_initialize(parser *yaml_parser_t) bool {
-	*parser = yaml_parser_t{
-		raw_buffer: make([]byte, 0, input_raw_buffer_size),
-		buffer:     make([]byte, 0, input_buffer_size),
-	}
-	return true
-}
-
-// Destroy a parser object.
-func yaml_parser_delete(parser *yaml_parser_t) {
-	*parser = yaml_parser_t{}
-}
-
-// String read handler.
-func yaml_string_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) {
-	if parser.input_pos == len(parser.input) {
-		return 0, io.EOF
-	}
-	n = copy(buffer, parser.input[parser.input_pos:])
-	parser.input_pos += n
-	return n, nil
-}
-
-// File read handler.
-func yaml_file_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) {
-	return parser.input_file.Read(buffer)
-}
-
-// Set a string input.
-func yaml_parser_set_input_string(parser *yaml_parser_t, input []byte) {
-	if parser.read_handler != nil {
-		panic("must set the input source only once")
-	}
-	parser.read_handler = yaml_string_read_handler
-	parser.input = input
-	parser.input_pos = 0
-}
-
-// Set a file input.
-func yaml_parser_set_input_file(parser *yaml_parser_t, file *os.File) {
-	if parser.read_handler != nil {
-		panic("must set the input source only once")
-	}
-	parser.read_handler = yaml_file_read_handler
-	parser.input_file = file
-}
-
-// Set the source encoding.
-func yaml_parser_set_encoding(parser *yaml_parser_t, encoding yaml_encoding_t) {
-	if parser.encoding != yaml_ANY_ENCODING {
-		panic("must set the encoding only once")
-	}
-	parser.encoding = encoding
-}
-
-// Create a new emitter object.
-func yaml_emitter_initialize(emitter *yaml_emitter_t) bool {
-	*emitter = yaml_emitter_t{
-		buffer:     make([]byte, output_buffer_size),
-		raw_buffer: make([]byte, 0, output_raw_buffer_size),
-		states:     make([]yaml_emitter_state_t, 0, initial_stack_size),
-		events:     make([]yaml_event_t, 0, initial_queue_size),
-	}
-	return true
-}
-
-// Destroy an emitter object.
-func yaml_emitter_delete(emitter *yaml_emitter_t) {
-	*emitter = yaml_emitter_t{}
-}
-
-// String write handler.
-func yaml_string_write_handler(emitter *yaml_emitter_t, buffer []byte) error {
-	*emitter.output_buffer = append(*emitter.output_buffer, buffer...)
-	return nil
-}
-
-// File write handler.
-func yaml_file_write_handler(emitter *yaml_emitter_t, buffer []byte) error {
-	_, err := emitter.output_file.Write(buffer)
-	return err
-}
-
-// Set a string output.
-func yaml_emitter_set_output_string(emitter *yaml_emitter_t, output_buffer *[]byte) {
-	if emitter.write_handler != nil {
-		panic("must set the output target only once")
-	}
-	emitter.write_handler = yaml_string_write_handler
-	emitter.output_buffer = output_buffer
-}
-
-// Set a file output.
-func yaml_emitter_set_output_file(emitter *yaml_emitter_t, file io.Writer) {
-	if emitter.write_handler != nil {
-		panic("must set the output target only once")
-	}
-	emitter.write_handler = yaml_file_write_handler
-	emitter.output_file = file
-}
-
-// Set the output encoding.
-func yaml_emitter_set_encoding(emitter *yaml_emitter_t, encoding yaml_encoding_t) {
-	if emitter.encoding != yaml_ANY_ENCODING {
-		panic("must set the output encoding only once")
-	}
-	emitter.encoding = encoding
-}
-
-// Set the canonical output style.
-func yaml_emitter_set_canonical(emitter *yaml_emitter_t, canonical bool) {
-	emitter.canonical = canonical
-}
-
-//// Set the indentation increment.
-func yaml_emitter_set_indent(emitter *yaml_emitter_t, indent int) {
-	if indent < 2 || indent > 9 {
-		indent = 2
-	}
-	emitter.best_indent = indent
-}
-
-// Set the preferred line width.
-func yaml_emitter_set_width(emitter *yaml_emitter_t, width int) {
-	if width < 0 {
-		width = -1
-	}
-	emitter.best_width = width
-}
-
-// Set if unescaped non-ASCII characters are allowed.
-func yaml_emitter_set_unicode(emitter *yaml_emitter_t, unicode bool) {
-	emitter.unicode = unicode
-}
-
-// Set the preferred line break character.
-func yaml_emitter_set_break(emitter *yaml_emitter_t, line_break yaml_break_t) {
-	emitter.line_break = line_break
-}
-
-///*
-// * Destroy a token object.
-// */
-//
-//YAML_DECLARE(void)
-//yaml_token_delete(yaml_token_t *token)
-//{
-//    assert(token);  // Non-NULL token object expected.
-//
-//    switch (token.type)
-//    {
-//        case YAML_TAG_DIRECTIVE_TOKEN:
-//            yaml_free(token.data.tag_directive.handle);
-//            yaml_free(token.data.tag_directive.prefix);
-//            break;
-//
-//        case YAML_ALIAS_TOKEN:
-//            yaml_free(token.data.alias.value);
-//            break;
-//
-//        case YAML_ANCHOR_TOKEN:
-//            yaml_free(token.data.anchor.value);
-//            break;
-//
-//        case YAML_TAG_TOKEN:
-//            yaml_free(token.data.tag.handle);
-//            yaml_free(token.data.tag.suffix);
-//            break;
-//
-//        case YAML_SCALAR_TOKEN:
-//            yaml_free(token.data.scalar.value);
-//            break;
-//
-//        default:
-//            break;
-//    }
-//
-//    memset(token, 0, sizeof(yaml_token_t));
-//}
-//
-///*
-// * Check if a string is a valid UTF-8 sequence.
-// *
-// * Check 'reader.c' for more details on UTF-8 encoding.
-// */
-//
-//static int
-//yaml_check_utf8(yaml_char_t *start, size_t length)
-//{
-//    yaml_char_t *end = start+length;
-//    yaml_char_t *pointer = start;
-//
-//    while (pointer < end) {
-//        unsigned char octet;
-//        unsigned int width;
-//        unsigned int value;
-//        size_t k;
-//
-//        octet = pointer[0];
-//        width = (octet & 0x80) == 0x00 ? 1 :
-//                (octet & 0xE0) == 0xC0 ? 2 :
-//                (octet & 0xF0) == 0xE0 ? 3 :
-//                (octet & 0xF8) == 0xF0 ? 4 : 0;
-//        value = (octet & 0x80) == 0x00 ? octet & 0x7F :
-//                (octet & 0xE0) == 0xC0 ? octet & 0x1F :
-//                (octet & 0xF0) == 0xE0 ? octet & 0x0F :
-//                (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
-//        if (!width) return 0;
-//        if (pointer+width > end) return 0;
-//        for (k = 1; k < width; k ++) {
-//            octet = pointer[k];
-//            if ((octet & 0xC0) != 0x80) return 0;
-//            value = (value << 6) + (octet & 0x3F);
-//        }
-//        if (!((width == 1) ||
-//            (width == 2 && value >= 0x80) ||
-//            (width == 3 && value >= 0x800) ||
-//            (width == 4 && value >= 0x10000))) return 0;
-//
-//        pointer += width;
-//    }
-//
-//    return 1;
-//}
-//
-
-// Create STREAM-START.
-func yaml_stream_start_event_initialize(event *yaml_event_t, encoding yaml_encoding_t) bool {
-	*event = yaml_event_t{
-		typ:      yaml_STREAM_START_EVENT,
-		encoding: encoding,
-	}
-	return true
-}
-
-// Create STREAM-END.
-func yaml_stream_end_event_initialize(event *yaml_event_t) bool {
-	*event = yaml_event_t{
-		typ: yaml_STREAM_END_EVENT,
-	}
-	return true
-}
-
-// Create DOCUMENT-START.
-func yaml_document_start_event_initialize(event *yaml_event_t, version_directive *yaml_version_directive_t,
-	tag_directives []yaml_tag_directive_t, implicit bool) bool {
-	*event = yaml_event_t{
-		typ:               yaml_DOCUMENT_START_EVENT,
-		version_directive: version_directive,
-		tag_directives:    tag_directives,
-		implicit:          implicit,
-	}
-	return true
-}
-
-// Create DOCUMENT-END.
-func yaml_document_end_event_initialize(event *yaml_event_t, implicit bool) bool {
-	*event = yaml_event_t{
-		typ:      yaml_DOCUMENT_END_EVENT,
-		implicit: implicit,
-	}
-	return true
-}
-
-///*
-// * Create ALIAS.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_alias_event_initialize(event *yaml_event_t, anchor *yaml_char_t)
-//{
-//    mark yaml_mark_t = { 0, 0, 0 }
-//    anchor_copy *yaml_char_t = NULL
-//
-//    assert(event) // Non-NULL event object is expected.
-//    assert(anchor) // Non-NULL anchor is expected.
-//
-//    if (!yaml_check_utf8(anchor, strlen((char *)anchor))) return 0
-//
-//    anchor_copy = yaml_strdup(anchor)
-//    if (!anchor_copy)
-//        return 0
-//
-//    ALIAS_EVENT_INIT(*event, anchor_copy, mark, mark)
-//
-//    return 1
-//}
-
-// Create SCALAR.
-func yaml_scalar_event_initialize(event *yaml_event_t, anchor, tag, value []byte, plain_implicit, quoted_implicit bool, style yaml_scalar_style_t) bool {
-	*event = yaml_event_t{
-		typ:             yaml_SCALAR_EVENT,
-		anchor:          anchor,
-		tag:             tag,
-		value:           value,
-		implicit:        plain_implicit,
-		quoted_implicit: quoted_implicit,
-		style:           yaml_style_t(style),
-	}
-	return true
-}
-
-// Create SEQUENCE-START.
-func yaml_sequence_start_event_initialize(event *yaml_event_t, anchor, tag []byte, implicit bool, style yaml_sequence_style_t) bool {
-	*event = yaml_event_t{
-		typ:      yaml_SEQUENCE_START_EVENT,
-		anchor:   anchor,
-		tag:      tag,
-		implicit: implicit,
-		style:    yaml_style_t(style),
-	}
-	return true
-}
-
-// Create SEQUENCE-END.
-func yaml_sequence_end_event_initialize(event *yaml_event_t) bool {
-	*event = yaml_event_t{
-		typ: yaml_SEQUENCE_END_EVENT,
-	}
-	return true
-}
-
-// Create MAPPING-START.
-func yaml_mapping_start_event_initialize(event *yaml_event_t, anchor, tag []byte, implicit bool, style yaml_mapping_style_t) bool {
-	*event = yaml_event_t{
-		typ:      yaml_MAPPING_START_EVENT,
-		anchor:   anchor,
-		tag:      tag,
-		implicit: implicit,
-		style:    yaml_style_t(style),
-	}
-	return true
-}
-
-// Create MAPPING-END.
-func yaml_mapping_end_event_initialize(event *yaml_event_t) bool {
-	*event = yaml_event_t{
-		typ: yaml_MAPPING_END_EVENT,
-	}
-	return true
-}
-
-// Destroy an event object.
-func yaml_event_delete(event *yaml_event_t) {
-	*event = yaml_event_t{}
-}
-
-///*
-// * Create a document object.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_initialize(document *yaml_document_t,
-//        version_directive *yaml_version_directive_t,
-//        tag_directives_start *yaml_tag_directive_t,
-//        tag_directives_end *yaml_tag_directive_t,
-//        start_implicit int, end_implicit int)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    struct {
-//        start *yaml_node_t
-//        end *yaml_node_t
-//        top *yaml_node_t
-//    } nodes = { NULL, NULL, NULL }
-//    version_directive_copy *yaml_version_directive_t = NULL
-//    struct {
-//        start *yaml_tag_directive_t
-//        end *yaml_tag_directive_t
-//        top *yaml_tag_directive_t
-//    } tag_directives_copy = { NULL, NULL, NULL }
-//    value yaml_tag_directive_t = { NULL, NULL }
-//    mark yaml_mark_t = { 0, 0, 0 }
-//
-//    assert(document) // Non-NULL document object is expected.
-//    assert((tag_directives_start && tag_directives_end) ||
-//            (tag_directives_start == tag_directives_end))
-//                            // Valid tag directives are expected.
-//
-//    if (!STACK_INIT(&context, nodes, INITIAL_STACK_SIZE)) goto error
-//
-//    if (version_directive) {
-//        version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t))
-//        if (!version_directive_copy) goto error
-//        version_directive_copy.major = version_directive.major
-//        version_directive_copy.minor = version_directive.minor
-//    }
-//
-//    if (tag_directives_start != tag_directives_end) {
-//        tag_directive *yaml_tag_directive_t
-//        if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
-//            goto error
-//        for (tag_directive = tag_directives_start
-//                tag_directive != tag_directives_end; tag_directive ++) {
-//            assert(tag_directive.handle)
-//            assert(tag_directive.prefix)
-//            if (!yaml_check_utf8(tag_directive.handle,
-//                        strlen((char *)tag_directive.handle)))
-//                goto error
-//            if (!yaml_check_utf8(tag_directive.prefix,
-//                        strlen((char *)tag_directive.prefix)))
-//                goto error
-//            value.handle = yaml_strdup(tag_directive.handle)
-//            value.prefix = yaml_strdup(tag_directive.prefix)
-//            if (!value.handle || !value.prefix) goto error
-//            if (!PUSH(&context, tag_directives_copy, value))
-//                goto error
-//            value.handle = NULL
-//            value.prefix = NULL
-//        }
-//    }
-//
-//    DOCUMENT_INIT(*document, nodes.start, nodes.end, version_directive_copy,
-//            tag_directives_copy.start, tag_directives_copy.top,
-//            start_implicit, end_implicit, mark, mark)
-//
-//    return 1
-//
-//error:
-//    STACK_DEL(&context, nodes)
-//    yaml_free(version_directive_copy)
-//    while (!STACK_EMPTY(&context, tag_directives_copy)) {
-//        value yaml_tag_directive_t = POP(&context, tag_directives_copy)
-//        yaml_free(value.handle)
-//        yaml_free(value.prefix)
-//    }
-//    STACK_DEL(&context, tag_directives_copy)
-//    yaml_free(value.handle)
-//    yaml_free(value.prefix)
-//
-//    return 0
-//}
-//
-///*
-// * Destroy a document object.
-// */
-//
-//YAML_DECLARE(void)
-//yaml_document_delete(document *yaml_document_t)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    tag_directive *yaml_tag_directive_t
-//
-//    context.error = YAML_NO_ERROR // Eliminate a compliler warning.
-//
-//    assert(document) // Non-NULL document object is expected.
-//
-//    while (!STACK_EMPTY(&context, document.nodes)) {
-//        node yaml_node_t = POP(&context, document.nodes)
-//        yaml_free(node.tag)
-//        switch (node.type) {
-//            case YAML_SCALAR_NODE:
-//                yaml_free(node.data.scalar.value)
-//                break
-//            case YAML_SEQUENCE_NODE:
-//                STACK_DEL(&context, node.data.sequence.items)
-//                break
-//            case YAML_MAPPING_NODE:
-//                STACK_DEL(&context, node.data.mapping.pairs)
-//                break
-//            default:
-//                assert(0) // Should not happen.
-//        }
-//    }
-//    STACK_DEL(&context, document.nodes)
-//
-//    yaml_free(document.version_directive)
-//    for (tag_directive = document.tag_directives.start
-//            tag_directive != document.tag_directives.end
-//            tag_directive++) {
-//        yaml_free(tag_directive.handle)
-//        yaml_free(tag_directive.prefix)
-//    }
-//    yaml_free(document.tag_directives.start)
-//
-//    memset(document, 0, sizeof(yaml_document_t))
-//}
-//
-///**
-// * Get a document node.
-// */
-//
-//YAML_DECLARE(yaml_node_t *)
-//yaml_document_get_node(document *yaml_document_t, index int)
-//{
-//    assert(document) // Non-NULL document object is expected.
-//
-//    if (index > 0 && document.nodes.start + index <= document.nodes.top) {
-//        return document.nodes.start + index - 1
-//    }
-//    return NULL
-//}
-//
-///**
-// * Get the root object.
-// */
-//
-//YAML_DECLARE(yaml_node_t *)
-//yaml_document_get_root_node(document *yaml_document_t)
-//{
-//    assert(document) // Non-NULL document object is expected.
-//
-//    if (document.nodes.top != document.nodes.start) {
-//        return document.nodes.start
-//    }
-//    return NULL
-//}
-//
-///*
-// * Add a scalar node to a document.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_add_scalar(document *yaml_document_t,
-//        tag *yaml_char_t, value *yaml_char_t, length int,
-//        style yaml_scalar_style_t)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    mark yaml_mark_t = { 0, 0, 0 }
-//    tag_copy *yaml_char_t = NULL
-//    value_copy *yaml_char_t = NULL
-//    node yaml_node_t
-//
-//    assert(document) // Non-NULL document object is expected.
-//    assert(value) // Non-NULL value is expected.
-//
-//    if (!tag) {
-//        tag = (yaml_char_t *)YAML_DEFAULT_SCALAR_TAG
-//    }
-//
-//    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error
-//    tag_copy = yaml_strdup(tag)
-//    if (!tag_copy) goto error
-//
-//    if (length < 0) {
-//        length = strlen((char *)value)
-//    }
-//
-//    if (!yaml_check_utf8(value, length)) goto error
-//    value_copy = yaml_malloc(length+1)
-//    if (!value_copy) goto error
-//    memcpy(value_copy, value, length)
-//    value_copy[length] = '\0'
-//
-//    SCALAR_NODE_INIT(node, tag_copy, value_copy, length, style, mark, mark)
-//    if (!PUSH(&context, document.nodes, node)) goto error
-//
-//    return document.nodes.top - document.nodes.start
-//
-//error:
-//    yaml_free(tag_copy)
-//    yaml_free(value_copy)
-//
-//    return 0
-//}
-//
-///*
-// * Add a sequence node to a document.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_add_sequence(document *yaml_document_t,
-//        tag *yaml_char_t, style yaml_sequence_style_t)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    mark yaml_mark_t = { 0, 0, 0 }
-//    tag_copy *yaml_char_t = NULL
-//    struct {
-//        start *yaml_node_item_t
-//        end *yaml_node_item_t
-//        top *yaml_node_item_t
-//    } items = { NULL, NULL, NULL }
-//    node yaml_node_t
-//
-//    assert(document) // Non-NULL document object is expected.
-//
-//    if (!tag) {
-//        tag = (yaml_char_t *)YAML_DEFAULT_SEQUENCE_TAG
-//    }
-//
-//    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error
-//    tag_copy = yaml_strdup(tag)
-//    if (!tag_copy) goto error
-//
-//    if (!STACK_INIT(&context, items, INITIAL_STACK_SIZE)) goto error
-//
-//    SEQUENCE_NODE_INIT(node, tag_copy, items.start, items.end,
-//            style, mark, mark)
-//    if (!PUSH(&context, document.nodes, node)) goto error
-//
-//    return document.nodes.top - document.nodes.start
-//
-//error:
-//    STACK_DEL(&context, items)
-//    yaml_free(tag_copy)
-//
-//    return 0
-//}
-//
-///*
-// * Add a mapping node to a document.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_add_mapping(document *yaml_document_t,
-//        tag *yaml_char_t, style yaml_mapping_style_t)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    mark yaml_mark_t = { 0, 0, 0 }
-//    tag_copy *yaml_char_t = NULL
-//    struct {
-//        start *yaml_node_pair_t
-//        end *yaml_node_pair_t
-//        top *yaml_node_pair_t
-//    } pairs = { NULL, NULL, NULL }
-//    node yaml_node_t
-//
-//    assert(document) // Non-NULL document object is expected.
-//
-//    if (!tag) {
-//        tag = (yaml_char_t *)YAML_DEFAULT_MAPPING_TAG
-//    }
-//
-//    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error
-//    tag_copy = yaml_strdup(tag)
-//    if (!tag_copy) goto error
-//
-//    if (!STACK_INIT(&context, pairs, INITIAL_STACK_SIZE)) goto error
-//
-//    MAPPING_NODE_INIT(node, tag_copy, pairs.start, pairs.end,
-//            style, mark, mark)
-//    if (!PUSH(&context, document.nodes, node)) goto error
-//
-//    return document.nodes.top - document.nodes.start
-//
-//error:
-//    STACK_DEL(&context, pairs)
-//    yaml_free(tag_copy)
-//
-//    return 0
-//}
-//
-///*
-// * Append an item to a sequence node.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_append_sequence_item(document *yaml_document_t,
-//        sequence int, item int)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//
-//    assert(document) // Non-NULL document is required.
-//    assert(sequence > 0
-//            && document.nodes.start + sequence <= document.nodes.top)
-//                            // Valid sequence id is required.
-//    assert(document.nodes.start[sequence-1].type == YAML_SEQUENCE_NODE)
-//                            // A sequence node is required.
-//    assert(item > 0 && document.nodes.start + item <= document.nodes.top)
-//                            // Valid item id is required.
-//
-//    if (!PUSH(&context,
-//                document.nodes.start[sequence-1].data.sequence.items, item))
-//        return 0
-//
-//    return 1
-//}
-//
-///*
-// * Append a pair of a key and a value to a mapping node.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_append_mapping_pair(document *yaml_document_t,
-//        mapping int, key int, value int)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//
-//    pair yaml_node_pair_t
-//
-//    assert(document) // Non-NULL document is required.
-//    assert(mapping > 0
-//            && document.nodes.start + mapping <= document.nodes.top)
-//                            // Valid mapping id is required.
-//    assert(document.nodes.start[mapping-1].type == YAML_MAPPING_NODE)
-//                            // A mapping node is required.
-//    assert(key > 0 && document.nodes.start + key <= document.nodes.top)
-//                            // Valid key id is required.
-//    assert(value > 0 && document.nodes.start + value <= document.nodes.top)
-//                            // Valid value id is required.
-//
-//    pair.key = key
-//    pair.value = value
-//
-//    if (!PUSH(&context,
-//                document.nodes.start[mapping-1].data.mapping.pairs, pair))
-//        return 0
-//
-//    return 1
-//}
-//
-//
diff --git a/vendor/github.com/sanathkr/go-yaml/decode.go b/vendor/github.com/sanathkr/go-yaml/decode.go
deleted file mode 100644
index c359328459..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/decode.go
+++ /dev/null
@@ -1,709 +0,0 @@
-package yaml
-
-import (
-	"encoding"
-	"encoding/base64"
-	"fmt"
-	"math"
-	"reflect"
-	"strconv"
-	"time"
-)
-
-const (
-	documentNode = 1 << iota
-	mappingNode
-	sequenceNode
-	scalarNode
-	aliasNode
-)
-
-type node struct {
-	kind         int
-	line, column int
-	tag          string
-	value        string
-	implicit     bool
-	children     []*node
-	anchors      map[string]*node
-}
-
-// ----------------------------------------------------------------------------
-// Parser, produces a node tree out of a libyaml event stream.
-
-type parser struct {
-	parser yaml_parser_t
-	event  yaml_event_t
-	doc    *node
-}
-
-func newParser(b []byte) *parser {
-	p := parser{}
-	if !yaml_parser_initialize(&p.parser) {
-		panic("failed to initialize YAML emitter")
-	}
-
-	if len(b) == 0 {
-		b = []byte{'\n'}
-	}
-
-	yaml_parser_set_input_string(&p.parser, b)
-
-	p.skip()
-	if p.event.typ != yaml_STREAM_START_EVENT {
-		panic("expected stream start event, got " + strconv.Itoa(int(p.event.typ)))
-	}
-	p.skip()
-	return &p
-}
-
-func (p *parser) destroy() {
-	if p.event.typ != yaml_NO_EVENT {
-		yaml_event_delete(&p.event)
-	}
-	yaml_parser_delete(&p.parser)
-}
-
-func (p *parser) skip() {
-	if p.event.typ != yaml_NO_EVENT {
-		if p.event.typ == yaml_STREAM_END_EVENT {
-			failf("attempted to go past the end of stream; corrupted value?")
-		}
-		yaml_event_delete(&p.event)
-	}
-	if !yaml_parser_parse(&p.parser, &p.event) {
-		p.fail()
-	}
-}
-
-func (p *parser) fail() {
-	var where string
-	var line int
-	if p.parser.problem_mark.line != 0 {
-		line = p.parser.problem_mark.line
-	} else if p.parser.context_mark.line != 0 {
-		line = p.parser.context_mark.line
-	}
-	if line != 0 {
-		where = "line " + strconv.Itoa(line) + ": "
-	}
-	var msg string
-	if len(p.parser.problem) > 0 {
-		msg = p.parser.problem
-	} else {
-		msg = "unknown problem parsing YAML content"
-	}
-	failf("%s%s", where, msg)
-}
-
-func (p *parser) anchor(n *node, anchor []byte) {
-	if anchor != nil {
-		p.doc.anchors[string(anchor)] = n
-	}
-}
-
-func (p *parser) parse() *node {
-	switch p.event.typ {
-	case yaml_SCALAR_EVENT:
-		return p.scalar()
-	case yaml_ALIAS_EVENT:
-		return p.alias()
-	case yaml_MAPPING_START_EVENT:
-		return p.mapping()
-	case yaml_SEQUENCE_START_EVENT:
-		return p.sequence()
-	case yaml_DOCUMENT_START_EVENT:
-		return p.document()
-	case yaml_STREAM_END_EVENT:
-		// Happens when attempting to decode an empty buffer.
-		return nil
-	default:
-		panic("attempted to parse unknown event: " + strconv.Itoa(int(p.event.typ)))
-	}
-}
-
-func (p *parser) node(kind int) *node {
-	return &node{
-		kind:   kind,
-		line:   p.event.start_mark.line,
-		column: p.event.start_mark.column,
-	}
-}
-
-func (p *parser) document() *node {
-	n := p.node(documentNode)
-	n.anchors = make(map[string]*node)
-	p.doc = n
-	p.skip()
-	n.children = append(n.children, p.parse())
-	if p.event.typ != yaml_DOCUMENT_END_EVENT {
-		panic("expected end of document event but got " + strconv.Itoa(int(p.event.typ)))
-	}
-	p.skip()
-	return n
-}
-
-func (p *parser) alias() *node {
-	n := p.node(aliasNode)
-	n.value = string(p.event.anchor)
-	p.skip()
-	return n
-}
-
-func (p *parser) scalar() *node {
-	n := p.node(scalarNode)
-	n.value = string(p.event.value)
-	n.tag = string(p.event.tag)
-	n.implicit = p.event.implicit
-	p.anchor(n, p.event.anchor)
-	p.skip()
-	return n
-}
-
-func (p *parser) sequence() *node {
-	n := p.node(sequenceNode)
-	n.tag = string(p.event.tag)
-	p.anchor(n, p.event.anchor)
-	p.skip()
-	for p.event.typ != yaml_SEQUENCE_END_EVENT {
-		n.children = append(n.children, p.parse())
-	}
-	p.skip()
-	return n
-}
-
-func (p *parser) mapping() *node {
-	n := p.node(mappingNode)
-	n.tag = string(p.event.tag)
-	p.anchor(n, p.event.anchor)
-	p.skip()
-	for p.event.typ != yaml_MAPPING_END_EVENT {
-		n.children = append(n.children, p.parse(), p.parse())
-	}
-	p.skip()
-	return n
-}
-
-// ----------------------------------------------------------------------------
-// Decoder, unmarshals a node into a provided value.
-
-type decoder struct {
-	doc     *node
-	aliases map[string]bool
-	mapType reflect.Type
-	terrors []string
-	strict  bool
-}
-
-var (
-	mapItemType     = reflect.TypeOf(MapItem{})
-	durationType    = reflect.TypeOf(time.Duration(0))
-	defaultMapType  = reflect.TypeOf(map[interface{}]interface{}{})
-	ifaceType       = defaultMapType.Elem()
-	tagUnmarshalers = map[string]TagUnmarshaler{}
-)
-
-func newDecoder(strict bool) *decoder {
-	d := &decoder{mapType: defaultMapType, strict: strict}
-	d.aliases = make(map[string]bool)
-	return d
-}
-
-func registerCustomTagUnmarshaler(tag string, unmarshaler TagUnmarshaler) {
-	tagUnmarshalers[tag] = unmarshaler
-}
-
-func unregisterCustomTagUnmarshaler(tag string) {
-	if _, ok := tagUnmarshalers[tag]; ok {
-		delete(tagUnmarshalers, tag)
-	}
-}
-
-func (d *decoder) terror(n *node, tag string, out reflect.Value) {
-	if n.tag != "" {
-		tag = n.tag
-	}
-	value := n.value
-	if tag != yaml_SEQ_TAG && tag != yaml_MAP_TAG {
-		if len(value) > 10 {
-			value = " `" + value[:7] + "...`"
-		} else {
-			value = " `" + value + "`"
-		}
-	}
-	d.terrors = append(d.terrors, fmt.Sprintf("line %d: cannot unmarshal %s%s into %s", n.line+1, shortTag(tag), value, out.Type()))
-}
-
-func (d *decoder) callUnmarshaler(n *node, u Unmarshaler) (good bool) {
-	terrlen := len(d.terrors)
-	err := u.UnmarshalYAML(func(v interface{}) (err error) {
-		defer handleErr(&err)
-		d.unmarshal(n, reflect.ValueOf(v))
-		if len(d.terrors) > terrlen {
-			issues := d.terrors[terrlen:]
-			d.terrors = d.terrors[:terrlen]
-			return &TypeError{issues}
-		}
-		return nil
-	})
-	if e, ok := err.(*TypeError); ok {
-		d.terrors = append(d.terrors, e.Errors...)
-		return false
-	}
-	if err != nil {
-		fail(err)
-	}
-	return true
-}
-
-// d.prepare initializes and dereferences pointers and calls UnmarshalYAML
-// if a value is found to implement it.
-// It returns the initialized and dereferenced out value, whether
-// unmarshalling was already done by UnmarshalYAML, and if so whether
-// its types unmarshalled appropriately.
-//
-// If n holds a null value, prepare returns before doing anything.
-func (d *decoder) prepare(n *node, out reflect.Value) (newout reflect.Value, unmarshaled, good bool) {
-	if n.tag == yaml_NULL_TAG || n.kind == scalarNode && n.tag == "" && (n.value == "null" || n.value == "" && n.implicit) {
-		return out, false, false
-	}
-	again := true
-	for again {
-		again = false
-		if out.Kind() == reflect.Ptr {
-			if out.IsNil() {
-				out.Set(reflect.New(out.Type().Elem()))
-			}
-			out = out.Elem()
-			again = true
-		}
-		if out.CanAddr() {
-			if u, ok := out.Addr().Interface().(Unmarshaler); ok {
-				good = d.callUnmarshaler(n, u)
-				return out, true, good
-			}
-		}
-	}
-	return out, false, false
-}
-
-func (d *decoder) unmarshal(n *node, out reflect.Value) (good bool) {
-	switch n.kind {
-	case documentNode:
-		return d.document(n, out)
-	case aliasNode:
-		return d.alias(n, out)
-	}
-	out, unmarshaled, good := d.prepare(n, out)
-	if unmarshaled {
-		return good
-	}
-	switch n.kind {
-	case scalarNode:
-		good = d.scalar(n, out)
-	case mappingNode:
-		good = d.mapping(n, out)
-	case sequenceNode:
-		good = d.sequence(n, out)
-	default:
-		panic("internal error: unknown node kind: " + strconv.Itoa(n.kind))
-	}
-
-	// If the node has a tag, and a custom tag unmarshaler is registered,
-	// then call it to unmarshal rest of the tree
-	if good && len(n.tag) > 0 {
-		if unmarshaller, found := tagUnmarshalers[n.tag]; found {
-			tagSuffix := n.tag[1:]  // Remove starting ! from tag
-			newOutput := unmarshaller.UnmarshalYAMLTag(tagSuffix, out)
-			out.Set(newOutput)
-		}
-	}
-
-	return good
-}
-
-func (d *decoder) document(n *node, out reflect.Value) (good bool) {
-	if len(n.children) == 1 {
-		d.doc = n
-		d.unmarshal(n.children[0], out)
-		return true
-	}
-	return false
-}
-
-func (d *decoder) alias(n *node, out reflect.Value) (good bool) {
-	an, ok := d.doc.anchors[n.value]
-	if !ok {
-		failf("unknown anchor '%s' referenced", n.value)
-	}
-	if d.aliases[n.value] {
-		failf("anchor '%s' value contains itself", n.value)
-	}
-	d.aliases[n.value] = true
-	good = d.unmarshal(an, out)
-	delete(d.aliases, n.value)
-	return good
-}
-
-var zeroValue reflect.Value
-
-func resetMap(out reflect.Value) {
-	for _, k := range out.MapKeys() {
-		out.SetMapIndex(k, zeroValue)
-	}
-}
-
-func (d *decoder) scalar(n *node, out reflect.Value) (good bool) {
-	var tag string
-	var resolved interface{}
-	if n.tag == "" && !n.implicit {
-		tag = yaml_STR_TAG
-		resolved = n.value
-	} else {
-		tag, resolved = resolve(n.tag, n.value)
-		if tag == yaml_BINARY_TAG {
-			data, err := base64.StdEncoding.DecodeString(resolved.(string))
-			if err != nil {
-				failf("!!binary value contains invalid base64 data")
-			}
-			resolved = string(data)
-		}
-	}
-	if resolved == nil {
-		if out.Kind() == reflect.Map && !out.CanAddr() {
-			resetMap(out)
-		} else {
-			out.Set(reflect.Zero(out.Type()))
-		}
-		return true
-	}
-	if s, ok := resolved.(string); ok && out.CanAddr() {
-		if u, ok := out.Addr().Interface().(encoding.TextUnmarshaler); ok {
-			err := u.UnmarshalText([]byte(s))
-			if err != nil {
-				fail(err)
-			}
-			return true
-		}
-	}
-	switch out.Kind() {
-	case reflect.String:
-		if tag == yaml_BINARY_TAG {
-			out.SetString(resolved.(string))
-			good = true
-		} else if resolved != nil {
-			out.SetString(n.value)
-			good = true
-		}
-	case reflect.Interface:
-		if resolved == nil {
-			out.Set(reflect.Zero(out.Type()))
-		} else {
-			out.Set(reflect.ValueOf(resolved))
-		}
-		good = true
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		switch resolved := resolved.(type) {
-		case int:
-			if !out.OverflowInt(int64(resolved)) {
-				out.SetInt(int64(resolved))
-				good = true
-			}
-		case int64:
-			if !out.OverflowInt(resolved) {
-				out.SetInt(resolved)
-				good = true
-			}
-		case uint64:
-			if resolved <= math.MaxInt64 && !out.OverflowInt(int64(resolved)) {
-				out.SetInt(int64(resolved))
-				good = true
-			}
-		case float64:
-			if resolved <= math.MaxInt64 && !out.OverflowInt(int64(resolved)) {
-				out.SetInt(int64(resolved))
-				good = true
-			}
-		case string:
-			if out.Type() == durationType {
-				d, err := time.ParseDuration(resolved)
-				if err == nil {
-					out.SetInt(int64(d))
-					good = true
-				}
-			}
-		}
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		switch resolved := resolved.(type) {
-		case int:
-			if resolved >= 0 && !out.OverflowUint(uint64(resolved)) {
-				out.SetUint(uint64(resolved))
-				good = true
-			}
-		case int64:
-			if resolved >= 0 && !out.OverflowUint(uint64(resolved)) {
-				out.SetUint(uint64(resolved))
-				good = true
-			}
-		case uint64:
-			if !out.OverflowUint(uint64(resolved)) {
-				out.SetUint(uint64(resolved))
-				good = true
-			}
-		case float64:
-			if resolved <= math.MaxUint64 && !out.OverflowUint(uint64(resolved)) {
-				out.SetUint(uint64(resolved))
-				good = true
-			}
-		}
-	case reflect.Bool:
-		switch resolved := resolved.(type) {
-		case bool:
-			out.SetBool(resolved)
-			good = true
-		}
-	case reflect.Float32, reflect.Float64:
-		switch resolved := resolved.(type) {
-		case int:
-			out.SetFloat(float64(resolved))
-			good = true
-		case int64:
-			out.SetFloat(float64(resolved))
-			good = true
-		case uint64:
-			out.SetFloat(float64(resolved))
-			good = true
-		case float64:
-			out.SetFloat(resolved)
-			good = true
-		}
-	case reflect.Ptr:
-		if out.Type().Elem() == reflect.TypeOf(resolved) {
-			// TODO DOes this make sense? When is out a Ptr except when decoding a nil value?
-			elem := reflect.New(out.Type().Elem())
-			elem.Elem().Set(reflect.ValueOf(resolved))
-			out.Set(elem)
-			good = true
-		}
-	}
-	if !good {
-		d.terror(n, tag, out)
-	}
-	return good
-}
-
-func settableValueOf(i interface{}) reflect.Value {
-	v := reflect.ValueOf(i)
-	sv := reflect.New(v.Type()).Elem()
-	sv.Set(v)
-	return sv
-}
-
-func (d *decoder) sequence(n *node, out reflect.Value) (good bool) {
-	l := len(n.children)
-
-	var iface reflect.Value
-	switch out.Kind() {
-	case reflect.Slice:
-		out.Set(reflect.MakeSlice(out.Type(), l, l))
-	case reflect.Interface:
-		// No type hints. Will have to use a generic sequence.
-		iface = out
-		out = settableValueOf(make([]interface{}, l))
-	default:
-		d.terror(n, yaml_SEQ_TAG, out)
-		return false
-	}
-	et := out.Type().Elem()
-
-	j := 0
-	for i := 0; i < l; i++ {
-		e := reflect.New(et).Elem()
-		if ok := d.unmarshal(n.children[i], e); ok {
-			out.Index(j).Set(e)
-			j++
-		}
-	}
-	out.Set(out.Slice(0, j))
-	if iface.IsValid() {
-		iface.Set(out)
-	}
-	return true
-}
-
-func (d *decoder) mapping(n *node, out reflect.Value) (good bool) {
-	switch out.Kind() {
-	case reflect.Struct:
-		return d.mappingStruct(n, out)
-	case reflect.Slice:
-		return d.mappingSlice(n, out)
-	case reflect.Map:
-		// okay
-	case reflect.Interface:
-		if d.mapType.Kind() == reflect.Map {
-			iface := out
-			out = reflect.MakeMap(d.mapType)
-			iface.Set(out)
-		} else {
-			slicev := reflect.New(d.mapType).Elem()
-			if !d.mappingSlice(n, slicev) {
-				return false
-			}
-			out.Set(slicev)
-			return true
-		}
-	default:
-		d.terror(n, yaml_MAP_TAG, out)
-		return false
-	}
-	outt := out.Type()
-	kt := outt.Key()
-	et := outt.Elem()
-
-	mapType := d.mapType
-	if outt.Key() == ifaceType && outt.Elem() == ifaceType {
-		d.mapType = outt
-	}
-
-	if out.IsNil() {
-		out.Set(reflect.MakeMap(outt))
-	}
-	l := len(n.children)
-	for i := 0; i < l; i += 2 {
-		if isMerge(n.children[i]) {
-			d.merge(n.children[i+1], out)
-			continue
-		}
-		k := reflect.New(kt).Elem()
-		if d.unmarshal(n.children[i], k) {
-			kkind := k.Kind()
-			if kkind == reflect.Interface {
-				kkind = k.Elem().Kind()
-			}
-			if kkind == reflect.Map || kkind == reflect.Slice {
-				failf("invalid map key: %#v", k.Interface())
-			}
-			e := reflect.New(et).Elem()
-			if d.unmarshal(n.children[i+1], e) {
-				out.SetMapIndex(k, e)
-			}
-		}
-	}
-	d.mapType = mapType
-	return true
-}
-
-func (d *decoder) mappingSlice(n *node, out reflect.Value) (good bool) {
-	outt := out.Type()
-	if outt.Elem() != mapItemType {
-		d.terror(n, yaml_MAP_TAG, out)
-		return false
-	}
-
-	mapType := d.mapType
-	d.mapType = outt
-
-	var slice []MapItem
-	var l = len(n.children)
-	for i := 0; i < l; i += 2 {
-		if isMerge(n.children[i]) {
-			d.merge(n.children[i+1], out)
-			continue
-		}
-		item := MapItem{}
-		k := reflect.ValueOf(&item.Key).Elem()
-		if d.unmarshal(n.children[i], k) {
-			v := reflect.ValueOf(&item.Value).Elem()
-			if d.unmarshal(n.children[i+1], v) {
-				slice = append(slice, item)
-			}
-		}
-	}
-	out.Set(reflect.ValueOf(slice))
-	d.mapType = mapType
-	return true
-}
-
-func (d *decoder) mappingStruct(n *node, out reflect.Value) (good bool) {
-	sinfo, err := getStructInfo(out.Type())
-	if err != nil {
-		panic(err)
-	}
-	name := settableValueOf("")
-	l := len(n.children)
-
-	var inlineMap reflect.Value
-	var elemType reflect.Type
-	if sinfo.InlineMap != -1 {
-		inlineMap = out.Field(sinfo.InlineMap)
-		inlineMap.Set(reflect.New(inlineMap.Type()).Elem())
-		elemType = inlineMap.Type().Elem()
-	}
-
-	for i := 0; i < l; i += 2 {
-		ni := n.children[i]
-		if isMerge(ni) {
-			d.merge(n.children[i+1], out)
-			continue
-		}
-		if !d.unmarshal(ni, name) {
-			continue
-		}
-		if info, ok := sinfo.FieldsMap[name.String()]; ok {
-			var field reflect.Value
-			if info.Inline == nil {
-				field = out.Field(info.Num)
-			} else {
-				field = out.FieldByIndex(info.Inline)
-			}
-			d.unmarshal(n.children[i+1], field)
-		} else if sinfo.InlineMap != -1 {
-			if inlineMap.IsNil() {
-				inlineMap.Set(reflect.MakeMap(inlineMap.Type()))
-			}
-			value := reflect.New(elemType).Elem()
-			d.unmarshal(n.children[i+1], value)
-			inlineMap.SetMapIndex(name, value)
-		} else if d.strict {
-			d.terrors = append(d.terrors, fmt.Sprintf("line %d: field %s not found in struct %s", n.line+1, name.String(), out.Type()))
-		}
-	}
-	return true
-}
-
-func failWantMap() {
-	failf("map merge requires map or sequence of maps as the value")
-}
-
-func (d *decoder) merge(n *node, out reflect.Value) {
-	switch n.kind {
-	case mappingNode:
-		d.unmarshal(n, out)
-	case aliasNode:
-		an, ok := d.doc.anchors[n.value]
-		if ok && an.kind != mappingNode {
-			failWantMap()
-		}
-		d.unmarshal(n, out)
-	case sequenceNode:
-		// Step backwards as earlier nodes take precedence.
-		for i := len(n.children) - 1; i >= 0; i-- {
-			ni := n.children[i]
-			if ni.kind == aliasNode {
-				an, ok := d.doc.anchors[ni.value]
-				if ok && an.kind != mappingNode {
-					failWantMap()
-				}
-			} else if ni.kind != mappingNode {
-				failWantMap()
-			}
-			d.unmarshal(ni, out)
-		}
-	default:
-		failWantMap()
-	}
-}
-
-func isMerge(n *node) bool {
-	return n.kind == scalarNode && n.value == "<<" && (n.implicit == true || n.tag == yaml_MERGE_TAG)
-}
diff --git a/vendor/github.com/sanathkr/go-yaml/emitterc.go b/vendor/github.com/sanathkr/go-yaml/emitterc.go
deleted file mode 100644
index 41de8b856c..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/emitterc.go
+++ /dev/null
@@ -1,1684 +0,0 @@
-package yaml
-
-import (
-	"bytes"
-)
-
-// Flush the buffer if needed.
-func flush(emitter *yaml_emitter_t) bool {
-	if emitter.buffer_pos+5 >= len(emitter.buffer) {
-		return yaml_emitter_flush(emitter)
-	}
-	return true
-}
-
-// Put a character to the output buffer.
-func put(emitter *yaml_emitter_t, value byte) bool {
-	if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) {
-		return false
-	}
-	emitter.buffer[emitter.buffer_pos] = value
-	emitter.buffer_pos++
-	emitter.column++
-	return true
-}
-
-// Put a line break to the output buffer.
-func put_break(emitter *yaml_emitter_t) bool {
-	if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) {
-		return false
-	}
-	switch emitter.line_break {
-	case yaml_CR_BREAK:
-		emitter.buffer[emitter.buffer_pos] = '\r'
-		emitter.buffer_pos += 1
-	case yaml_LN_BREAK:
-		emitter.buffer[emitter.buffer_pos] = '\n'
-		emitter.buffer_pos += 1
-	case yaml_CRLN_BREAK:
-		emitter.buffer[emitter.buffer_pos+0] = '\r'
-		emitter.buffer[emitter.buffer_pos+1] = '\n'
-		emitter.buffer_pos += 2
-	default:
-		panic("unknown line break setting")
-	}
-	emitter.column = 0
-	emitter.line++
-	return true
-}
-
-// Copy a character from a string into buffer.
-func write(emitter *yaml_emitter_t, s []byte, i *int) bool {
-	if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) {
-		return false
-	}
-	p := emitter.buffer_pos
-	w := width(s[*i])
-	switch w {
-	case 4:
-		emitter.buffer[p+3] = s[*i+3]
-		fallthrough
-	case 3:
-		emitter.buffer[p+2] = s[*i+2]
-		fallthrough
-	case 2:
-		emitter.buffer[p+1] = s[*i+1]
-		fallthrough
-	case 1:
-		emitter.buffer[p+0] = s[*i+0]
-	default:
-		panic("unknown character width")
-	}
-	emitter.column++
-	emitter.buffer_pos += w
-	*i += w
-	return true
-}
-
-// Write a whole string into buffer.
-func write_all(emitter *yaml_emitter_t, s []byte) bool {
-	for i := 0; i < len(s); {
-		if !write(emitter, s, &i) {
-			return false
-		}
-	}
-	return true
-}
-
-// Copy a line break character from a string into buffer.
-func write_break(emitter *yaml_emitter_t, s []byte, i *int) bool {
-	if s[*i] == '\n' {
-		if !put_break(emitter) {
-			return false
-		}
-		*i++
-	} else {
-		if !write(emitter, s, i) {
-			return false
-		}
-		emitter.column = 0
-		emitter.line++
-	}
-	return true
-}
-
-// Set an emitter error and return false.
-func yaml_emitter_set_emitter_error(emitter *yaml_emitter_t, problem string) bool {
-	emitter.error = yaml_EMITTER_ERROR
-	emitter.problem = problem
-	return false
-}
-
-// Emit an event.
-func yaml_emitter_emit(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	emitter.events = append(emitter.events, *event)
-	for !yaml_emitter_need_more_events(emitter) {
-		event := &emitter.events[emitter.events_head]
-		if !yaml_emitter_analyze_event(emitter, event) {
-			return false
-		}
-		if !yaml_emitter_state_machine(emitter, event) {
-			return false
-		}
-		yaml_event_delete(event)
-		emitter.events_head++
-	}
-	return true
-}
-
-// Check if we need to accumulate more events before emitting.
-//
-// We accumulate extra
-//  - 1 event for DOCUMENT-START
-//  - 2 events for SEQUENCE-START
-//  - 3 events for MAPPING-START
-//
-func yaml_emitter_need_more_events(emitter *yaml_emitter_t) bool {
-	if emitter.events_head == len(emitter.events) {
-		return true
-	}
-	var accumulate int
-	switch emitter.events[emitter.events_head].typ {
-	case yaml_DOCUMENT_START_EVENT:
-		accumulate = 1
-		break
-	case yaml_SEQUENCE_START_EVENT:
-		accumulate = 2
-		break
-	case yaml_MAPPING_START_EVENT:
-		accumulate = 3
-		break
-	default:
-		return false
-	}
-	if len(emitter.events)-emitter.events_head > accumulate {
-		return false
-	}
-	var level int
-	for i := emitter.events_head; i < len(emitter.events); i++ {
-		switch emitter.events[i].typ {
-		case yaml_STREAM_START_EVENT, yaml_DOCUMENT_START_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT:
-			level++
-		case yaml_STREAM_END_EVENT, yaml_DOCUMENT_END_EVENT, yaml_SEQUENCE_END_EVENT, yaml_MAPPING_END_EVENT:
-			level--
-		}
-		if level == 0 {
-			return false
-		}
-	}
-	return true
-}
-
-// Append a directive to the directives stack.
-func yaml_emitter_append_tag_directive(emitter *yaml_emitter_t, value *yaml_tag_directive_t, allow_duplicates bool) bool {
-	for i := 0; i < len(emitter.tag_directives); i++ {
-		if bytes.Equal(value.handle, emitter.tag_directives[i].handle) {
-			if allow_duplicates {
-				return true
-			}
-			return yaml_emitter_set_emitter_error(emitter, "duplicate %TAG directive")
-		}
-	}
-
-	// [Go] Do we actually need to copy this given garbage collection
-	// and the lack of deallocating destructors?
-	tag_copy := yaml_tag_directive_t{
-		handle: make([]byte, len(value.handle)),
-		prefix: make([]byte, len(value.prefix)),
-	}
-	copy(tag_copy.handle, value.handle)
-	copy(tag_copy.prefix, value.prefix)
-	emitter.tag_directives = append(emitter.tag_directives, tag_copy)
-	return true
-}
-
-// Increase the indentation level.
-func yaml_emitter_increase_indent(emitter *yaml_emitter_t, flow, indentless bool) bool {
-	emitter.indents = append(emitter.indents, emitter.indent)
-	if emitter.indent < 0 {
-		if flow {
-			emitter.indent = emitter.best_indent
-		} else {
-			emitter.indent = 0
-		}
-	} else if !indentless {
-		emitter.indent += emitter.best_indent
-	}
-	return true
-}
-
-// State dispatcher.
-func yaml_emitter_state_machine(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	switch emitter.state {
-	default:
-	case yaml_EMIT_STREAM_START_STATE:
-		return yaml_emitter_emit_stream_start(emitter, event)
-
-	case yaml_EMIT_FIRST_DOCUMENT_START_STATE:
-		return yaml_emitter_emit_document_start(emitter, event, true)
-
-	case yaml_EMIT_DOCUMENT_START_STATE:
-		return yaml_emitter_emit_document_start(emitter, event, false)
-
-	case yaml_EMIT_DOCUMENT_CONTENT_STATE:
-		return yaml_emitter_emit_document_content(emitter, event)
-
-	case yaml_EMIT_DOCUMENT_END_STATE:
-		return yaml_emitter_emit_document_end(emitter, event)
-
-	case yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE:
-		return yaml_emitter_emit_flow_sequence_item(emitter, event, true)
-
-	case yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE:
-		return yaml_emitter_emit_flow_sequence_item(emitter, event, false)
-
-	case yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE:
-		return yaml_emitter_emit_flow_mapping_key(emitter, event, true)
-
-	case yaml_EMIT_FLOW_MAPPING_KEY_STATE:
-		return yaml_emitter_emit_flow_mapping_key(emitter, event, false)
-
-	case yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE:
-		return yaml_emitter_emit_flow_mapping_value(emitter, event, true)
-
-	case yaml_EMIT_FLOW_MAPPING_VALUE_STATE:
-		return yaml_emitter_emit_flow_mapping_value(emitter, event, false)
-
-	case yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE:
-		return yaml_emitter_emit_block_sequence_item(emitter, event, true)
-
-	case yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE:
-		return yaml_emitter_emit_block_sequence_item(emitter, event, false)
-
-	case yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE:
-		return yaml_emitter_emit_block_mapping_key(emitter, event, true)
-
-	case yaml_EMIT_BLOCK_MAPPING_KEY_STATE:
-		return yaml_emitter_emit_block_mapping_key(emitter, event, false)
-
-	case yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE:
-		return yaml_emitter_emit_block_mapping_value(emitter, event, true)
-
-	case yaml_EMIT_BLOCK_MAPPING_VALUE_STATE:
-		return yaml_emitter_emit_block_mapping_value(emitter, event, false)
-
-	case yaml_EMIT_END_STATE:
-		return yaml_emitter_set_emitter_error(emitter, "expected nothing after STREAM-END")
-	}
-	panic("invalid emitter state")
-}
-
-// Expect STREAM-START.
-func yaml_emitter_emit_stream_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if event.typ != yaml_STREAM_START_EVENT {
-		return yaml_emitter_set_emitter_error(emitter, "expected STREAM-START")
-	}
-	if emitter.encoding == yaml_ANY_ENCODING {
-		emitter.encoding = event.encoding
-		if emitter.encoding == yaml_ANY_ENCODING {
-			emitter.encoding = yaml_UTF8_ENCODING
-		}
-	}
-	if emitter.best_indent < 2 || emitter.best_indent > 9 {
-		emitter.best_indent = 2
-	}
-	if emitter.best_width >= 0 && emitter.best_width <= emitter.best_indent*2 {
-		emitter.best_width = 80
-	}
-	if emitter.best_width < 0 {
-		emitter.best_width = 1<<31 - 1
-	}
-	if emitter.line_break == yaml_ANY_BREAK {
-		emitter.line_break = yaml_LN_BREAK
-	}
-
-	emitter.indent = -1
-	emitter.line = 0
-	emitter.column = 0
-	emitter.whitespace = true
-	emitter.indention = true
-
-	if emitter.encoding != yaml_UTF8_ENCODING {
-		if !yaml_emitter_write_bom(emitter) {
-			return false
-		}
-	}
-	emitter.state = yaml_EMIT_FIRST_DOCUMENT_START_STATE
-	return true
-}
-
-// Expect DOCUMENT-START or STREAM-END.
-func yaml_emitter_emit_document_start(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-
-	if event.typ == yaml_DOCUMENT_START_EVENT {
-
-		if event.version_directive != nil {
-			if !yaml_emitter_analyze_version_directive(emitter, event.version_directive) {
-				return false
-			}
-		}
-
-		for i := 0; i < len(event.tag_directives); i++ {
-			tag_directive := &event.tag_directives[i]
-			if !yaml_emitter_analyze_tag_directive(emitter, tag_directive) {
-				return false
-			}
-			if !yaml_emitter_append_tag_directive(emitter, tag_directive, false) {
-				return false
-			}
-		}
-
-		for i := 0; i < len(default_tag_directives); i++ {
-			tag_directive := &default_tag_directives[i]
-			if !yaml_emitter_append_tag_directive(emitter, tag_directive, true) {
-				return false
-			}
-		}
-
-		implicit := event.implicit
-		if !first || emitter.canonical {
-			implicit = false
-		}
-
-		if emitter.open_ended && (event.version_directive != nil || len(event.tag_directives) > 0) {
-			if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-
-		if event.version_directive != nil {
-			implicit = false
-			if !yaml_emitter_write_indicator(emitter, []byte("%YAML"), true, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indicator(emitter, []byte("1.1"), true, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-
-		if len(event.tag_directives) > 0 {
-			implicit = false
-			for i := 0; i < len(event.tag_directives); i++ {
-				tag_directive := &event.tag_directives[i]
-				if !yaml_emitter_write_indicator(emitter, []byte("%TAG"), true, false, false) {
-					return false
-				}
-				if !yaml_emitter_write_tag_handle(emitter, tag_directive.handle) {
-					return false
-				}
-				if !yaml_emitter_write_tag_content(emitter, tag_directive.prefix, true) {
-					return false
-				}
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-		}
-
-		if yaml_emitter_check_empty_document(emitter) {
-			implicit = false
-		}
-		if !implicit {
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-			if !yaml_emitter_write_indicator(emitter, []byte("---"), true, false, false) {
-				return false
-			}
-			if emitter.canonical {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-		}
-
-		emitter.state = yaml_EMIT_DOCUMENT_CONTENT_STATE
-		return true
-	}
-
-	if event.typ == yaml_STREAM_END_EVENT {
-		if emitter.open_ended {
-			if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-		if !yaml_emitter_flush(emitter) {
-			return false
-		}
-		emitter.state = yaml_EMIT_END_STATE
-		return true
-	}
-
-	return yaml_emitter_set_emitter_error(emitter, "expected DOCUMENT-START or STREAM-END")
-}
-
-// Expect the root node.
-func yaml_emitter_emit_document_content(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	emitter.states = append(emitter.states, yaml_EMIT_DOCUMENT_END_STATE)
-	return yaml_emitter_emit_node(emitter, event, true, false, false, false)
-}
-
-// Expect DOCUMENT-END.
-func yaml_emitter_emit_document_end(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if event.typ != yaml_DOCUMENT_END_EVENT {
-		return yaml_emitter_set_emitter_error(emitter, "expected DOCUMENT-END")
-	}
-	if !yaml_emitter_write_indent(emitter) {
-		return false
-	}
-	if !event.implicit {
-		// [Go] Allocate the slice elsewhere.
-		if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) {
-			return false
-		}
-		if !yaml_emitter_write_indent(emitter) {
-			return false
-		}
-	}
-	if !yaml_emitter_flush(emitter) {
-		return false
-	}
-	emitter.state = yaml_EMIT_DOCUMENT_START_STATE
-	emitter.tag_directives = emitter.tag_directives[:0]
-	return true
-}
-
-// Expect a flow item node.
-func yaml_emitter_emit_flow_sequence_item(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_write_indicator(emitter, []byte{'['}, true, true, false) {
-			return false
-		}
-		if !yaml_emitter_increase_indent(emitter, true, false) {
-			return false
-		}
-		emitter.flow_level++
-	}
-
-	if event.typ == yaml_SEQUENCE_END_EVENT {
-		emitter.flow_level--
-		emitter.indent = emitter.indents[len(emitter.indents)-1]
-		emitter.indents = emitter.indents[:len(emitter.indents)-1]
-		if emitter.canonical && !first {
-			if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{']'}, false, false, false) {
-			return false
-		}
-		emitter.state = emitter.states[len(emitter.states)-1]
-		emitter.states = emitter.states[:len(emitter.states)-1]
-
-		return true
-	}
-
-	if !first {
-		if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
-			return false
-		}
-	}
-
-	if emitter.canonical || emitter.column > emitter.best_width {
-		if !yaml_emitter_write_indent(emitter) {
-			return false
-		}
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, true, false, false)
-}
-
-// Expect a flow key node.
-func yaml_emitter_emit_flow_mapping_key(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_write_indicator(emitter, []byte{'{'}, true, true, false) {
-			return false
-		}
-		if !yaml_emitter_increase_indent(emitter, true, false) {
-			return false
-		}
-		emitter.flow_level++
-	}
-
-	if event.typ == yaml_MAPPING_END_EVENT {
-		emitter.flow_level--
-		emitter.indent = emitter.indents[len(emitter.indents)-1]
-		emitter.indents = emitter.indents[:len(emitter.indents)-1]
-		if emitter.canonical && !first {
-			if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{'}'}, false, false, false) {
-			return false
-		}
-		emitter.state = emitter.states[len(emitter.states)-1]
-		emitter.states = emitter.states[:len(emitter.states)-1]
-		return true
-	}
-
-	if !first {
-		if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
-			return false
-		}
-	}
-	if emitter.canonical || emitter.column > emitter.best_width {
-		if !yaml_emitter_write_indent(emitter) {
-			return false
-		}
-	}
-
-	if !emitter.canonical && yaml_emitter_check_simple_key(emitter) {
-		emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE)
-		return yaml_emitter_emit_node(emitter, event, false, false, true, true)
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'?'}, true, false, false) {
-		return false
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_VALUE_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
-}
-
-// Expect a flow value node.
-func yaml_emitter_emit_flow_mapping_value(emitter *yaml_emitter_t, event *yaml_event_t, simple bool) bool {
-	if simple {
-		if !yaml_emitter_write_indicator(emitter, []byte{':'}, false, false, false) {
-			return false
-		}
-	} else {
-		if emitter.canonical || emitter.column > emitter.best_width {
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{':'}, true, false, false) {
-			return false
-		}
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_KEY_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
-}
-
-// Expect a block item node.
-func yaml_emitter_emit_block_sequence_item(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_increase_indent(emitter, false, emitter.mapping_context && !emitter.indention) {
-			return false
-		}
-	}
-	if event.typ == yaml_SEQUENCE_END_EVENT {
-		emitter.indent = emitter.indents[len(emitter.indents)-1]
-		emitter.indents = emitter.indents[:len(emitter.indents)-1]
-		emitter.state = emitter.states[len(emitter.states)-1]
-		emitter.states = emitter.states[:len(emitter.states)-1]
-		return true
-	}
-	if !yaml_emitter_write_indent(emitter) {
-		return false
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'-'}, true, false, true) {
-		return false
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, true, false, false)
-}
-
-// Expect a block key node.
-func yaml_emitter_emit_block_mapping_key(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_increase_indent(emitter, false, false) {
-			return false
-		}
-	}
-	if event.typ == yaml_MAPPING_END_EVENT {
-		emitter.indent = emitter.indents[len(emitter.indents)-1]
-		emitter.indents = emitter.indents[:len(emitter.indents)-1]
-		emitter.state = emitter.states[len(emitter.states)-1]
-		emitter.states = emitter.states[:len(emitter.states)-1]
-		return true
-	}
-	if !yaml_emitter_write_indent(emitter) {
-		return false
-	}
-	if yaml_emitter_check_simple_key(emitter) {
-		emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE)
-		return yaml_emitter_emit_node(emitter, event, false, false, true, true)
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'?'}, true, false, true) {
-		return false
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_VALUE_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
-}
-
-// Expect a block value node.
-func yaml_emitter_emit_block_mapping_value(emitter *yaml_emitter_t, event *yaml_event_t, simple bool) bool {
-	if simple {
-		if !yaml_emitter_write_indicator(emitter, []byte{':'}, false, false, false) {
-			return false
-		}
-	} else {
-		if !yaml_emitter_write_indent(emitter) {
-			return false
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{':'}, true, false, true) {
-			return false
-		}
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_KEY_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
-}
-
-// Expect a node.
-func yaml_emitter_emit_node(emitter *yaml_emitter_t, event *yaml_event_t,
-	root bool, sequence bool, mapping bool, simple_key bool) bool {
-
-	emitter.root_context = root
-	emitter.sequence_context = sequence
-	emitter.mapping_context = mapping
-	emitter.simple_key_context = simple_key
-
-	switch event.typ {
-	case yaml_ALIAS_EVENT:
-		return yaml_emitter_emit_alias(emitter, event)
-	case yaml_SCALAR_EVENT:
-		return yaml_emitter_emit_scalar(emitter, event)
-	case yaml_SEQUENCE_START_EVENT:
-		return yaml_emitter_emit_sequence_start(emitter, event)
-	case yaml_MAPPING_START_EVENT:
-		return yaml_emitter_emit_mapping_start(emitter, event)
-	default:
-		return yaml_emitter_set_emitter_error(emitter,
-			"expected SCALAR, SEQUENCE-START, MAPPING-START, or ALIAS")
-	}
-}
-
-// Expect ALIAS.
-func yaml_emitter_emit_alias(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	emitter.state = emitter.states[len(emitter.states)-1]
-	emitter.states = emitter.states[:len(emitter.states)-1]
-	return true
-}
-
-// Expect SCALAR.
-func yaml_emitter_emit_scalar(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_select_scalar_style(emitter, event) {
-		return false
-	}
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	if !yaml_emitter_process_tag(emitter) {
-		return false
-	}
-	if !yaml_emitter_increase_indent(emitter, true, false) {
-		return false
-	}
-	if !yaml_emitter_process_scalar(emitter) {
-		return false
-	}
-	emitter.indent = emitter.indents[len(emitter.indents)-1]
-	emitter.indents = emitter.indents[:len(emitter.indents)-1]
-	emitter.state = emitter.states[len(emitter.states)-1]
-	emitter.states = emitter.states[:len(emitter.states)-1]
-	return true
-}
-
-// Expect SEQUENCE-START.
-func yaml_emitter_emit_sequence_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	if !yaml_emitter_process_tag(emitter) {
-		return false
-	}
-	if emitter.flow_level > 0 || emitter.canonical || event.sequence_style() == yaml_FLOW_SEQUENCE_STYLE ||
-		yaml_emitter_check_empty_sequence(emitter) {
-		emitter.state = yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE
-	} else {
-		emitter.state = yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE
-	}
-	return true
-}
-
-// Expect MAPPING-START.
-func yaml_emitter_emit_mapping_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	if !yaml_emitter_process_tag(emitter) {
-		return false
-	}
-	if emitter.flow_level > 0 || emitter.canonical || event.mapping_style() == yaml_FLOW_MAPPING_STYLE ||
-		yaml_emitter_check_empty_mapping(emitter) {
-		emitter.state = yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE
-	} else {
-		emitter.state = yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE
-	}
-	return true
-}
-
-// Check if the document content is an empty scalar.
-func yaml_emitter_check_empty_document(emitter *yaml_emitter_t) bool {
-	return false // [Go] Huh?
-}
-
-// Check if the next events represent an empty sequence.
-func yaml_emitter_check_empty_sequence(emitter *yaml_emitter_t) bool {
-	if len(emitter.events)-emitter.events_head < 2 {
-		return false
-	}
-	return emitter.events[emitter.events_head].typ == yaml_SEQUENCE_START_EVENT &&
-		emitter.events[emitter.events_head+1].typ == yaml_SEQUENCE_END_EVENT
-}
-
-// Check if the next events represent an empty mapping.
-func yaml_emitter_check_empty_mapping(emitter *yaml_emitter_t) bool {
-	if len(emitter.events)-emitter.events_head < 2 {
-		return false
-	}
-	return emitter.events[emitter.events_head].typ == yaml_MAPPING_START_EVENT &&
-		emitter.events[emitter.events_head+1].typ == yaml_MAPPING_END_EVENT
-}
-
-// Check if the next node can be expressed as a simple key.
-func yaml_emitter_check_simple_key(emitter *yaml_emitter_t) bool {
-	length := 0
-	switch emitter.events[emitter.events_head].typ {
-	case yaml_ALIAS_EVENT:
-		length += len(emitter.anchor_data.anchor)
-	case yaml_SCALAR_EVENT:
-		if emitter.scalar_data.multiline {
-			return false
-		}
-		length += len(emitter.anchor_data.anchor) +
-			len(emitter.tag_data.handle) +
-			len(emitter.tag_data.suffix) +
-			len(emitter.scalar_data.value)
-	case yaml_SEQUENCE_START_EVENT:
-		if !yaml_emitter_check_empty_sequence(emitter) {
-			return false
-		}
-		length += len(emitter.anchor_data.anchor) +
-			len(emitter.tag_data.handle) +
-			len(emitter.tag_data.suffix)
-	case yaml_MAPPING_START_EVENT:
-		if !yaml_emitter_check_empty_mapping(emitter) {
-			return false
-		}
-		length += len(emitter.anchor_data.anchor) +
-			len(emitter.tag_data.handle) +
-			len(emitter.tag_data.suffix)
-	default:
-		return false
-	}
-	return length <= 128
-}
-
-// Determine an acceptable scalar style.
-func yaml_emitter_select_scalar_style(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-
-	no_tag := len(emitter.tag_data.handle) == 0 && len(emitter.tag_data.suffix) == 0
-	if no_tag && !event.implicit && !event.quoted_implicit {
-		return yaml_emitter_set_emitter_error(emitter, "neither tag nor implicit flags are specified")
-	}
-
-	style := event.scalar_style()
-	if style == yaml_ANY_SCALAR_STYLE {
-		style = yaml_PLAIN_SCALAR_STYLE
-	}
-	if emitter.canonical {
-		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	}
-	if emitter.simple_key_context && emitter.scalar_data.multiline {
-		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	}
-
-	if style == yaml_PLAIN_SCALAR_STYLE {
-		if emitter.flow_level > 0 && !emitter.scalar_data.flow_plain_allowed ||
-			emitter.flow_level == 0 && !emitter.scalar_data.block_plain_allowed {
-			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
-		}
-		if len(emitter.scalar_data.value) == 0 && (emitter.flow_level > 0 || emitter.simple_key_context) {
-			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
-		}
-		if no_tag && !event.implicit {
-			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
-		}
-	}
-	if style == yaml_SINGLE_QUOTED_SCALAR_STYLE {
-		if !emitter.scalar_data.single_quoted_allowed {
-			style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-		}
-	}
-	if style == yaml_LITERAL_SCALAR_STYLE || style == yaml_FOLDED_SCALAR_STYLE {
-		if !emitter.scalar_data.block_allowed || emitter.flow_level > 0 || emitter.simple_key_context {
-			style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-		}
-	}
-
-	if no_tag && !event.quoted_implicit && style != yaml_PLAIN_SCALAR_STYLE {
-		emitter.tag_data.handle = []byte{'!'}
-	}
-	emitter.scalar_data.style = style
-	return true
-}
-
-// Write an achor.
-func yaml_emitter_process_anchor(emitter *yaml_emitter_t) bool {
-	if emitter.anchor_data.anchor == nil {
-		return true
-	}
-	c := []byte{'&'}
-	if emitter.anchor_data.alias {
-		c[0] = '*'
-	}
-	if !yaml_emitter_write_indicator(emitter, c, true, false, false) {
-		return false
-	}
-	return yaml_emitter_write_anchor(emitter, emitter.anchor_data.anchor)
-}
-
-// Write a tag.
-func yaml_emitter_process_tag(emitter *yaml_emitter_t) bool {
-	if len(emitter.tag_data.handle) == 0 && len(emitter.tag_data.suffix) == 0 {
-		return true
-	}
-	if len(emitter.tag_data.handle) > 0 {
-		if !yaml_emitter_write_tag_handle(emitter, emitter.tag_data.handle) {
-			return false
-		}
-		if len(emitter.tag_data.suffix) > 0 {
-			if !yaml_emitter_write_tag_content(emitter, emitter.tag_data.suffix, false) {
-				return false
-			}
-		}
-	} else {
-		// [Go] Allocate these slices elsewhere.
-		if !yaml_emitter_write_indicator(emitter, []byte("!<"), true, false, false) {
-			return false
-		}
-		if !yaml_emitter_write_tag_content(emitter, emitter.tag_data.suffix, false) {
-			return false
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{'>'}, false, false, false) {
-			return false
-		}
-	}
-	return true
-}
-
-// Write a scalar.
-func yaml_emitter_process_scalar(emitter *yaml_emitter_t) bool {
-	switch emitter.scalar_data.style {
-	case yaml_PLAIN_SCALAR_STYLE:
-		return yaml_emitter_write_plain_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context)
-
-	case yaml_SINGLE_QUOTED_SCALAR_STYLE:
-		return yaml_emitter_write_single_quoted_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context)
-
-	case yaml_DOUBLE_QUOTED_SCALAR_STYLE:
-		return yaml_emitter_write_double_quoted_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context)
-
-	case yaml_LITERAL_SCALAR_STYLE:
-		return yaml_emitter_write_literal_scalar(emitter, emitter.scalar_data.value)
-
-	case yaml_FOLDED_SCALAR_STYLE:
-		return yaml_emitter_write_folded_scalar(emitter, emitter.scalar_data.value)
-	}
-	panic("unknown scalar style")
-}
-
-// Check if a %YAML directive is valid.
-func yaml_emitter_analyze_version_directive(emitter *yaml_emitter_t, version_directive *yaml_version_directive_t) bool {
-	if version_directive.major != 1 || version_directive.minor != 1 {
-		return yaml_emitter_set_emitter_error(emitter, "incompatible %YAML directive")
-	}
-	return true
-}
-
-// Check if a %TAG directive is valid.
-func yaml_emitter_analyze_tag_directive(emitter *yaml_emitter_t, tag_directive *yaml_tag_directive_t) bool {
-	handle := tag_directive.handle
-	prefix := tag_directive.prefix
-	if len(handle) == 0 {
-		return yaml_emitter_set_emitter_error(emitter, "tag handle must not be empty")
-	}
-	if handle[0] != '!' {
-		return yaml_emitter_set_emitter_error(emitter, "tag handle must start with '!'")
-	}
-	if handle[len(handle)-1] != '!' {
-		return yaml_emitter_set_emitter_error(emitter, "tag handle must end with '!'")
-	}
-	for i := 1; i < len(handle)-1; i += width(handle[i]) {
-		if !is_alpha(handle, i) {
-			return yaml_emitter_set_emitter_error(emitter, "tag handle must contain alphanumerical characters only")
-		}
-	}
-	if len(prefix) == 0 {
-		return yaml_emitter_set_emitter_error(emitter, "tag prefix must not be empty")
-	}
-	return true
-}
-
-// Check if an anchor is valid.
-func yaml_emitter_analyze_anchor(emitter *yaml_emitter_t, anchor []byte, alias bool) bool {
-	if len(anchor) == 0 {
-		problem := "anchor value must not be empty"
-		if alias {
-			problem = "alias value must not be empty"
-		}
-		return yaml_emitter_set_emitter_error(emitter, problem)
-	}
-	for i := 0; i < len(anchor); i += width(anchor[i]) {
-		if !is_alpha(anchor, i) {
-			problem := "anchor value must contain alphanumerical characters only"
-			if alias {
-				problem = "alias value must contain alphanumerical characters only"
-			}
-			return yaml_emitter_set_emitter_error(emitter, problem)
-		}
-	}
-	emitter.anchor_data.anchor = anchor
-	emitter.anchor_data.alias = alias
-	return true
-}
-
-// Check if a tag is valid.
-func yaml_emitter_analyze_tag(emitter *yaml_emitter_t, tag []byte) bool {
-	if len(tag) == 0 {
-		return yaml_emitter_set_emitter_error(emitter, "tag value must not be empty")
-	}
-	for i := 0; i < len(emitter.tag_directives); i++ {
-		tag_directive := &emitter.tag_directives[i]
-		if bytes.HasPrefix(tag, tag_directive.prefix) {
-			emitter.tag_data.handle = tag_directive.handle
-			emitter.tag_data.suffix = tag[len(tag_directive.prefix):]
-			return true
-		}
-	}
-	emitter.tag_data.suffix = tag
-	return true
-}
-
-// Check if a scalar is valid.
-func yaml_emitter_analyze_scalar(emitter *yaml_emitter_t, value []byte) bool {
-	var (
-		block_indicators   = false
-		flow_indicators    = false
-		line_breaks        = false
-		special_characters = false
-
-		leading_space  = false
-		leading_break  = false
-		trailing_space = false
-		trailing_break = false
-		break_space    = false
-		space_break    = false
-
-		preceded_by_whitespace = false
-		followed_by_whitespace  = false
-		previous_space          = false
-		previous_break          = false
-	)
-
-	emitter.scalar_data.value = value
-
-	if len(value) == 0 {
-		emitter.scalar_data.multiline = false
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = true
-		emitter.scalar_data.single_quoted_allowed = true
-		emitter.scalar_data.block_allowed = false
-		return true
-	}
-
-	if len(value) >= 3 && ((value[0] == '-' && value[1] == '-' && value[2] == '-') || (value[0] == '.' && value[1] == '.' && value[2] == '.')) {
-		block_indicators = true
-		flow_indicators = true
-	}
-
-	preceded_by_whitespace = true
-	for i, w := 0, 0; i < len(value); i += w {
-		w = width(value[i])
-		followed_by_whitespace = i+w >= len(value) || is_blank(value, i+w)
-
-		if i == 0 {
-			switch value[i] {
-			case '#', ',', '[', ']', '{', '}', '&', '*', '!', '|', '>', '\'', '"', '%', '@', '`':
-				flow_indicators = true
-				block_indicators = true
-			case '?', ':':
-				flow_indicators = true
-				if followed_by_whitespace {
-					block_indicators = true
-				}
-			case '-':
-				if followed_by_whitespace {
-					flow_indicators = true
-					block_indicators = true
-				}
-			}
-		} else {
-			switch value[i] {
-			case ',', '?', '[', ']', '{', '}':
-				flow_indicators = true
-			case ':':
-				flow_indicators = true
-				if followed_by_whitespace {
-					block_indicators = true
-				}
-			case '#':
-				if preceded_by_whitespace {
-					flow_indicators = true
-					block_indicators = true
-				}
-			}
-		}
-
-		if !is_printable(value, i) || !is_ascii(value, i) && !emitter.unicode {
-			special_characters = true
-		}
-		if is_space(value, i) {
-			if i == 0 {
-				leading_space = true
-			}
-			if i+width(value[i]) == len(value) {
-				trailing_space = true
-			}
-			if previous_break {
-				break_space = true
-			}
-			previous_space = true
-			previous_break = false
-		} else if is_break(value, i) {
-			line_breaks = true
-			if i == 0 {
-				leading_break = true
-			}
-			if i+width(value[i]) == len(value) {
-				trailing_break = true
-			}
-			if previous_space {
-				space_break = true
-			}
-			previous_space = false
-			previous_break = true
-		} else {
-			previous_space = false
-			previous_break = false
-		}
-
-		// [Go]: Why 'z'? Couldn't be the end of the string as that's the loop condition.
-		preceded_by_whitespace = is_blankz(value, i)
-	}
-
-	emitter.scalar_data.multiline = line_breaks
-	emitter.scalar_data.flow_plain_allowed = true
-	emitter.scalar_data.block_plain_allowed = true
-	emitter.scalar_data.single_quoted_allowed = true
-	emitter.scalar_data.block_allowed = true
-
-	if leading_space || leading_break || trailing_space || trailing_break {
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = false
-	}
-	if trailing_space {
-		emitter.scalar_data.block_allowed = false
-	}
-	if break_space {
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = false
-		emitter.scalar_data.single_quoted_allowed = false
-	}
-	if space_break || special_characters {
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = false
-		emitter.scalar_data.single_quoted_allowed = false
-		emitter.scalar_data.block_allowed = false
-	}
-	if line_breaks {
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = false
-	}
-	if flow_indicators {
-		emitter.scalar_data.flow_plain_allowed = false
-	}
-	if block_indicators {
-		emitter.scalar_data.block_plain_allowed = false
-	}
-	return true
-}
-
-// Check if the event data is valid.
-func yaml_emitter_analyze_event(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-
-	emitter.anchor_data.anchor = nil
-	emitter.tag_data.handle = nil
-	emitter.tag_data.suffix = nil
-	emitter.scalar_data.value = nil
-
-	switch event.typ {
-	case yaml_ALIAS_EVENT:
-		if !yaml_emitter_analyze_anchor(emitter, event.anchor, true) {
-			return false
-		}
-
-	case yaml_SCALAR_EVENT:
-		if len(event.anchor) > 0 {
-			if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) {
-				return false
-			}
-		}
-		if len(event.tag) > 0 && (emitter.canonical || (!event.implicit && !event.quoted_implicit)) {
-			if !yaml_emitter_analyze_tag(emitter, event.tag) {
-				return false
-			}
-		}
-		if !yaml_emitter_analyze_scalar(emitter, event.value) {
-			return false
-		}
-
-	case yaml_SEQUENCE_START_EVENT:
-		if len(event.anchor) > 0 {
-			if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) {
-				return false
-			}
-		}
-		if len(event.tag) > 0 && (emitter.canonical || !event.implicit) {
-			if !yaml_emitter_analyze_tag(emitter, event.tag) {
-				return false
-			}
-		}
-
-	case yaml_MAPPING_START_EVENT:
-		if len(event.anchor) > 0 {
-			if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) {
-				return false
-			}
-		}
-		if len(event.tag) > 0 && (emitter.canonical || !event.implicit) {
-			if !yaml_emitter_analyze_tag(emitter, event.tag) {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-// Write the BOM character.
-func yaml_emitter_write_bom(emitter *yaml_emitter_t) bool {
-	if !flush(emitter) {
-		return false
-	}
-	pos := emitter.buffer_pos
-	emitter.buffer[pos+0] = '\xEF'
-	emitter.buffer[pos+1] = '\xBB'
-	emitter.buffer[pos+2] = '\xBF'
-	emitter.buffer_pos += 3
-	return true
-}
-
-func yaml_emitter_write_indent(emitter *yaml_emitter_t) bool {
-	indent := emitter.indent
-	if indent < 0 {
-		indent = 0
-	}
-	if !emitter.indention || emitter.column > indent || (emitter.column == indent && !emitter.whitespace) {
-		if !put_break(emitter) {
-			return false
-		}
-	}
-	for emitter.column < indent {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-	emitter.whitespace = true
-	emitter.indention = true
-	return true
-}
-
-func yaml_emitter_write_indicator(emitter *yaml_emitter_t, indicator []byte, need_whitespace, is_whitespace, is_indention bool) bool {
-	if need_whitespace && !emitter.whitespace {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-	if !write_all(emitter, indicator) {
-		return false
-	}
-	emitter.whitespace = is_whitespace
-	emitter.indention = (emitter.indention && is_indention)
-	emitter.open_ended = false
-	return true
-}
-
-func yaml_emitter_write_anchor(emitter *yaml_emitter_t, value []byte) bool {
-	if !write_all(emitter, value) {
-		return false
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_tag_handle(emitter *yaml_emitter_t, value []byte) bool {
-	if !emitter.whitespace {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-	if !write_all(emitter, value) {
-		return false
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_tag_content(emitter *yaml_emitter_t, value []byte, need_whitespace bool) bool {
-	if need_whitespace && !emitter.whitespace {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-	for i := 0; i < len(value); {
-		var must_write bool
-		switch value[i] {
-		case ';', '/', '?', ':', '@', '&', '=', '+', '$', ',', '_', '.', '~', '*', '\'', '(', ')', '[', ']':
-			must_write = true
-		default:
-			must_write = is_alpha(value, i)
-		}
-		if must_write {
-			if !write(emitter, value, &i) {
-				return false
-			}
-		} else {
-			w := width(value[i])
-			for k := 0; k < w; k++ {
-				octet := value[i]
-				i++
-				if !put(emitter, '%') {
-					return false
-				}
-
-				c := octet >> 4
-				if c < 10 {
-					c += '0'
-				} else {
-					c += 'A' - 10
-				}
-				if !put(emitter, c) {
-					return false
-				}
-
-				c = octet & 0x0f
-				if c < 10 {
-					c += '0'
-				} else {
-					c += 'A' - 10
-				}
-				if !put(emitter, c) {
-					return false
-				}
-			}
-		}
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_plain_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool {
-	if !emitter.whitespace {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-
-	spaces := false
-	breaks := false
-	for i := 0; i < len(value); {
-		if is_space(value, i) {
-			if allow_breaks && !spaces && emitter.column > emitter.best_width && !is_space(value, i+1) {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				i += width(value[i])
-			} else {
-				if !write(emitter, value, &i) {
-					return false
-				}
-			}
-			spaces = true
-		} else if is_break(value, i) {
-			if !breaks && value[i] == '\n' {
-				if !put_break(emitter) {
-					return false
-				}
-			}
-			if !write_break(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = true
-			breaks = true
-		} else {
-			if breaks {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-			if !write(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = false
-			spaces = false
-			breaks = false
-		}
-	}
-
-	emitter.whitespace = false
-	emitter.indention = false
-	if emitter.root_context {
-		emitter.open_ended = true
-	}
-
-	return true
-}
-
-func yaml_emitter_write_single_quoted_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool {
-
-	if !yaml_emitter_write_indicator(emitter, []byte{'\''}, true, false, false) {
-		return false
-	}
-
-	spaces := false
-	breaks := false
-	for i := 0; i < len(value); {
-		if is_space(value, i) {
-			if allow_breaks && !spaces && emitter.column > emitter.best_width && i > 0 && i < len(value)-1 && !is_space(value, i+1) {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				i += width(value[i])
-			} else {
-				if !write(emitter, value, &i) {
-					return false
-				}
-			}
-			spaces = true
-		} else if is_break(value, i) {
-			if !breaks && value[i] == '\n' {
-				if !put_break(emitter) {
-					return false
-				}
-			}
-			if !write_break(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = true
-			breaks = true
-		} else {
-			if breaks {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-			if value[i] == '\'' {
-				if !put(emitter, '\'') {
-					return false
-				}
-			}
-			if !write(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = false
-			spaces = false
-			breaks = false
-		}
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'\''}, false, false, false) {
-		return false
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_double_quoted_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool {
-	spaces := false
-	if !yaml_emitter_write_indicator(emitter, []byte{'"'}, true, false, false) {
-		return false
-	}
-
-	for i := 0; i < len(value); {
-		if !is_printable(value, i) || (!emitter.unicode && !is_ascii(value, i)) ||
-			is_bom(value, i) || is_break(value, i) ||
-			value[i] == '"' || value[i] == '\\' {
-
-			octet := value[i]
-
-			var w int
-			var v rune
-			switch {
-			case octet&0x80 == 0x00:
-				w, v = 1, rune(octet&0x7F)
-			case octet&0xE0 == 0xC0:
-				w, v = 2, rune(octet&0x1F)
-			case octet&0xF0 == 0xE0:
-				w, v = 3, rune(octet&0x0F)
-			case octet&0xF8 == 0xF0:
-				w, v = 4, rune(octet&0x07)
-			}
-			for k := 1; k < w; k++ {
-				octet = value[i+k]
-				v = (v << 6) + (rune(octet) & 0x3F)
-			}
-			i += w
-
-			if !put(emitter, '\\') {
-				return false
-			}
-
-			var ok bool
-			switch v {
-			case 0x00:
-				ok = put(emitter, '0')
-			case 0x07:
-				ok = put(emitter, 'a')
-			case 0x08:
-				ok = put(emitter, 'b')
-			case 0x09:
-				ok = put(emitter, 't')
-			case 0x0A:
-				ok = put(emitter, 'n')
-			case 0x0b:
-				ok = put(emitter, 'v')
-			case 0x0c:
-				ok = put(emitter, 'f')
-			case 0x0d:
-				ok = put(emitter, 'r')
-			case 0x1b:
-				ok = put(emitter, 'e')
-			case 0x22:
-				ok = put(emitter, '"')
-			case 0x5c:
-				ok = put(emitter, '\\')
-			case 0x85:
-				ok = put(emitter, 'N')
-			case 0xA0:
-				ok = put(emitter, '_')
-			case 0x2028:
-				ok = put(emitter, 'L')
-			case 0x2029:
-				ok = put(emitter, 'P')
-			default:
-				if v <= 0xFF {
-					ok = put(emitter, 'x')
-					w = 2
-				} else if v <= 0xFFFF {
-					ok = put(emitter, 'u')
-					w = 4
-				} else {
-					ok = put(emitter, 'U')
-					w = 8
-				}
-				for k := (w - 1) * 4; ok && k >= 0; k -= 4 {
-					digit := byte((v >> uint(k)) & 0x0F)
-					if digit < 10 {
-						ok = put(emitter, digit+'0')
-					} else {
-						ok = put(emitter, digit+'A'-10)
-					}
-				}
-			}
-			if !ok {
-				return false
-			}
-			spaces = false
-		} else if is_space(value, i) {
-			if allow_breaks && !spaces && emitter.column > emitter.best_width && i > 0 && i < len(value)-1 {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				if is_space(value, i+1) {
-					if !put(emitter, '\\') {
-						return false
-					}
-				}
-				i += width(value[i])
-			} else if !write(emitter, value, &i) {
-				return false
-			}
-			spaces = true
-		} else {
-			if !write(emitter, value, &i) {
-				return false
-			}
-			spaces = false
-		}
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'"'}, false, false, false) {
-		return false
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_block_scalar_hints(emitter *yaml_emitter_t, value []byte) bool {
-	if is_space(value, 0) || is_break(value, 0) {
-		indent_hint := []byte{'0' + byte(emitter.best_indent)}
-		if !yaml_emitter_write_indicator(emitter, indent_hint, false, false, false) {
-			return false
-		}
-	}
-
-	emitter.open_ended = false
-
-	var chomp_hint [1]byte
-	if len(value) == 0 {
-		chomp_hint[0] = '-'
-	} else {
-		i := len(value) - 1
-		for value[i]&0xC0 == 0x80 {
-			i--
-		}
-		if !is_break(value, i) {
-			chomp_hint[0] = '-'
-		} else if i == 0 {
-			chomp_hint[0] = '+'
-			emitter.open_ended = true
-		} else {
-			i--
-			for value[i]&0xC0 == 0x80 {
-				i--
-			}
-			if is_break(value, i) {
-				chomp_hint[0] = '+'
-				emitter.open_ended = true
-			}
-		}
-	}
-	if chomp_hint[0] != 0 {
-		if !yaml_emitter_write_indicator(emitter, chomp_hint[:], false, false, false) {
-			return false
-		}
-	}
-	return true
-}
-
-func yaml_emitter_write_literal_scalar(emitter *yaml_emitter_t, value []byte) bool {
-	if !yaml_emitter_write_indicator(emitter, []byte{'|'}, true, false, false) {
-		return false
-	}
-	if !yaml_emitter_write_block_scalar_hints(emitter, value) {
-		return false
-	}
-	if !put_break(emitter) {
-		return false
-	}
-	emitter.indention = true
-	emitter.whitespace = true
-	breaks := true
-	for i := 0; i < len(value); {
-		if is_break(value, i) {
-			if !write_break(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = true
-			breaks = true
-		} else {
-			if breaks {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-			if !write(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = false
-			breaks = false
-		}
-	}
-
-	return true
-}
-
-func yaml_emitter_write_folded_scalar(emitter *yaml_emitter_t, value []byte) bool {
-	if !yaml_emitter_write_indicator(emitter, []byte{'>'}, true, false, false) {
-		return false
-	}
-	if !yaml_emitter_write_block_scalar_hints(emitter, value) {
-		return false
-	}
-
-	if !put_break(emitter) {
-		return false
-	}
-	emitter.indention = true
-	emitter.whitespace = true
-
-	breaks := true
-	leading_spaces := true
-	for i := 0; i < len(value); {
-		if is_break(value, i) {
-			if !breaks && !leading_spaces && value[i] == '\n' {
-				k := 0
-				for is_break(value, k) {
-					k += width(value[k])
-				}
-				if !is_blankz(value, k) {
-					if !put_break(emitter) {
-						return false
-					}
-				}
-			}
-			if !write_break(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = true
-			breaks = true
-		} else {
-			if breaks {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				leading_spaces = is_blank(value, i)
-			}
-			if !breaks && is_space(value, i) && !is_space(value, i+1) && emitter.column > emitter.best_width {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				i += width(value[i])
-			} else {
-				if !write(emitter, value, &i) {
-					return false
-				}
-			}
-			emitter.indention = false
-			breaks = false
-		}
-	}
-	return true
-}
diff --git a/vendor/github.com/sanathkr/go-yaml/encode.go b/vendor/github.com/sanathkr/go-yaml/encode.go
deleted file mode 100644
index 84f8499551..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/encode.go
+++ /dev/null
@@ -1,306 +0,0 @@
-package yaml
-
-import (
-	"encoding"
-	"fmt"
-	"reflect"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type encoder struct {
-	emitter yaml_emitter_t
-	event   yaml_event_t
-	out     []byte
-	flow    bool
-}
-
-func newEncoder() (e *encoder) {
-	e = &encoder{}
-	e.must(yaml_emitter_initialize(&e.emitter))
-	yaml_emitter_set_output_string(&e.emitter, &e.out)
-	yaml_emitter_set_unicode(&e.emitter, true)
-	e.must(yaml_stream_start_event_initialize(&e.event, yaml_UTF8_ENCODING))
-	e.emit()
-	e.must(yaml_document_start_event_initialize(&e.event, nil, nil, true))
-	e.emit()
-	return e
-}
-
-func (e *encoder) finish() {
-	e.must(yaml_document_end_event_initialize(&e.event, true))
-	e.emit()
-	e.emitter.open_ended = false
-	e.must(yaml_stream_end_event_initialize(&e.event))
-	e.emit()
-}
-
-func (e *encoder) destroy() {
-	yaml_emitter_delete(&e.emitter)
-}
-
-func (e *encoder) emit() {
-	// This will internally delete the e.event value.
-	if !yaml_emitter_emit(&e.emitter, &e.event) && e.event.typ != yaml_DOCUMENT_END_EVENT && e.event.typ != yaml_STREAM_END_EVENT {
-		e.must(false)
-	}
-}
-
-func (e *encoder) must(ok bool) {
-	if !ok {
-		msg := e.emitter.problem
-		if msg == "" {
-			msg = "unknown problem generating YAML content"
-		}
-		failf("%s", msg)
-	}
-}
-
-func (e *encoder) marshal(tag string, in reflect.Value) {
-	if !in.IsValid() {
-		e.nilv()
-		return
-	}
-	iface := in.Interface()
-	if m, ok := iface.(Marshaler); ok {
-		v, err := m.MarshalYAML()
-		if err != nil {
-			fail(err)
-		}
-		if v == nil {
-			e.nilv()
-			return
-		}
-		in = reflect.ValueOf(v)
-	} else if m, ok := iface.(encoding.TextMarshaler); ok {
-		text, err := m.MarshalText()
-		if err != nil {
-			fail(err)
-		}
-		in = reflect.ValueOf(string(text))
-	}
-	switch in.Kind() {
-	case reflect.Interface:
-		if in.IsNil() {
-			e.nilv()
-		} else {
-			e.marshal(tag, in.Elem())
-		}
-	case reflect.Map:
-		e.mapv(tag, in)
-	case reflect.Ptr:
-		if in.IsNil() {
-			e.nilv()
-		} else {
-			e.marshal(tag, in.Elem())
-		}
-	case reflect.Struct:
-		e.structv(tag, in)
-	case reflect.Slice:
-		if in.Type().Elem() == mapItemType {
-			e.itemsv(tag, in)
-		} else {
-			e.slicev(tag, in)
-		}
-	case reflect.String:
-		e.stringv(tag, in)
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		if in.Type() == durationType {
-			e.stringv(tag, reflect.ValueOf(iface.(time.Duration).String()))
-		} else {
-			e.intv(tag, in)
-		}
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		e.uintv(tag, in)
-	case reflect.Float32, reflect.Float64:
-		e.floatv(tag, in)
-	case reflect.Bool:
-		e.boolv(tag, in)
-	default:
-		panic("cannot marshal type: " + in.Type().String())
-	}
-}
-
-func (e *encoder) mapv(tag string, in reflect.Value) {
-	e.mappingv(tag, func() {
-		keys := keyList(in.MapKeys())
-		sort.Sort(keys)
-		for _, k := range keys {
-			e.marshal("", k)
-			e.marshal("", in.MapIndex(k))
-		}
-	})
-}
-
-func (e *encoder) itemsv(tag string, in reflect.Value) {
-	e.mappingv(tag, func() {
-		slice := in.Convert(reflect.TypeOf([]MapItem{})).Interface().([]MapItem)
-		for _, item := range slice {
-			e.marshal("", reflect.ValueOf(item.Key))
-			e.marshal("", reflect.ValueOf(item.Value))
-		}
-	})
-}
-
-func (e *encoder) structv(tag string, in reflect.Value) {
-	sinfo, err := getStructInfo(in.Type())
-	if err != nil {
-		panic(err)
-	}
-	e.mappingv(tag, func() {
-		for _, info := range sinfo.FieldsList {
-			var value reflect.Value
-			if info.Inline == nil {
-				value = in.Field(info.Num)
-			} else {
-				value = in.FieldByIndex(info.Inline)
-			}
-			if info.OmitEmpty && isZero(value) {
-				continue
-			}
-			e.marshal("", reflect.ValueOf(info.Key))
-			e.flow = info.Flow
-			e.marshal("", value)
-		}
-		if sinfo.InlineMap >= 0 {
-			m := in.Field(sinfo.InlineMap)
-			if m.Len() > 0 {
-				e.flow = false
-				keys := keyList(m.MapKeys())
-				sort.Sort(keys)
-				for _, k := range keys {
-					if _, found := sinfo.FieldsMap[k.String()]; found {
-						panic(fmt.Sprintf("Can't have key %q in inlined map; conflicts with struct field", k.String()))
-					}
-					e.marshal("", k)
-					e.flow = false
-					e.marshal("", m.MapIndex(k))
-				}
-			}
-		}
-	})
-}
-
-func (e *encoder) mappingv(tag string, f func()) {
-	implicit := tag == ""
-	style := yaml_BLOCK_MAPPING_STYLE
-	if e.flow {
-		e.flow = false
-		style = yaml_FLOW_MAPPING_STYLE
-	}
-	e.must(yaml_mapping_start_event_initialize(&e.event, nil, []byte(tag), implicit, style))
-	e.emit()
-	f()
-	e.must(yaml_mapping_end_event_initialize(&e.event))
-	e.emit()
-}
-
-func (e *encoder) slicev(tag string, in reflect.Value) {
-	implicit := tag == ""
-	style := yaml_BLOCK_SEQUENCE_STYLE
-	if e.flow {
-		e.flow = false
-		style = yaml_FLOW_SEQUENCE_STYLE
-	}
-	e.must(yaml_sequence_start_event_initialize(&e.event, nil, []byte(tag), implicit, style))
-	e.emit()
-	n := in.Len()
-	for i := 0; i < n; i++ {
-		e.marshal("", in.Index(i))
-	}
-	e.must(yaml_sequence_end_event_initialize(&e.event))
-	e.emit()
-}
-
-// isBase60 returns whether s is in base 60 notation as defined in YAML 1.1.
-//
-// The base 60 float notation in YAML 1.1 is a terrible idea and is unsupported
-// in YAML 1.2 and by this package, but these should be marshalled quoted for
-// the time being for compatibility with other parsers.
-func isBase60Float(s string) (result bool) {
-	// Fast path.
-	if s == "" {
-		return false
-	}
-	c := s[0]
-	if !(c == '+' || c == '-' || c >= '0' && c <= '9') || strings.IndexByte(s, ':') < 0 {
-		return false
-	}
-	// Do the full match.
-	return base60float.MatchString(s)
-}
-
-// From http://yaml.org/type/float.html, except the regular expression there
-// is bogus. In practice parsers do not enforce the "\.[0-9_]*" suffix.
-var base60float = regexp.MustCompile(`^[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+(?:\.[0-9_]*)?$`)
-
-func (e *encoder) stringv(tag string, in reflect.Value) {
-	var style yaml_scalar_style_t
-	s := in.String()
-	rtag, rs := resolve("", s)
-	if rtag == yaml_BINARY_TAG {
-		if tag == "" || tag == yaml_STR_TAG {
-			tag = rtag
-			s = rs.(string)
-		} else if tag == yaml_BINARY_TAG {
-			failf("explicitly tagged !!binary data must be base64-encoded")
-		} else {
-			failf("cannot marshal invalid UTF-8 data as %s", shortTag(tag))
-		}
-	}
-	if tag == "" && (rtag != yaml_STR_TAG || isBase60Float(s)) {
-		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	} else if strings.Contains(s, "\n") {
-		style = yaml_LITERAL_SCALAR_STYLE
-	} else {
-		style = yaml_PLAIN_SCALAR_STYLE
-	}
-	e.emitScalar(s, "", tag, style)
-}
-
-func (e *encoder) boolv(tag string, in reflect.Value) {
-	var s string
-	if in.Bool() {
-		s = "true"
-	} else {
-		s = "false"
-	}
-	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) intv(tag string, in reflect.Value) {
-	s := strconv.FormatInt(in.Int(), 10)
-	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) uintv(tag string, in reflect.Value) {
-	s := strconv.FormatUint(in.Uint(), 10)
-	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) floatv(tag string, in reflect.Value) {
-	// FIXME: Handle 64 bits here.
-	s := strconv.FormatFloat(float64(in.Float()), 'g', -1, 32)
-	switch s {
-	case "+Inf":
-		s = ".inf"
-	case "-Inf":
-		s = "-.inf"
-	case "NaN":
-		s = ".nan"
-	}
-	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) nilv() {
-	e.emitScalar("null", "", "", yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) emitScalar(value, anchor, tag string, style yaml_scalar_style_t) {
-	implicit := tag == ""
-	e.must(yaml_scalar_event_initialize(&e.event, []byte(anchor), []byte(tag), []byte(value), implicit, implicit, style))
-	e.emit()
-}
diff --git a/vendor/github.com/sanathkr/go-yaml/parserc.go b/vendor/github.com/sanathkr/go-yaml/parserc.go
deleted file mode 100644
index 81d05dfe57..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/parserc.go
+++ /dev/null
@@ -1,1095 +0,0 @@
-package yaml
-
-import (
-	"bytes"
-)
-
-// The parser implements the following grammar:
-//
-// stream               ::= STREAM-START implicit_document? explicit_document* STREAM-END
-// implicit_document    ::= block_node DOCUMENT-END*
-// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
-// block_node_or_indentless_sequence    ::=
-//                          ALIAS
-//                          | properties (block_content | indentless_block_sequence)?
-//                          | block_content
-//                          | indentless_block_sequence
-// block_node           ::= ALIAS
-//                          | properties block_content?
-//                          | block_content
-// flow_node            ::= ALIAS
-//                          | properties flow_content?
-//                          | flow_content
-// properties           ::= TAG ANCHOR? | ANCHOR TAG?
-// block_content        ::= block_collection | flow_collection | SCALAR
-// flow_content         ::= flow_collection | SCALAR
-// block_collection     ::= block_sequence | block_mapping
-// flow_collection      ::= flow_sequence | flow_mapping
-// block_sequence       ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
-// indentless_sequence  ::= (BLOCK-ENTRY block_node?)+
-// block_mapping        ::= BLOCK-MAPPING_START
-//                          ((KEY block_node_or_indentless_sequence?)?
-//                          (VALUE block_node_or_indentless_sequence?)?)*
-//                          BLOCK-END
-// flow_sequence        ::= FLOW-SEQUENCE-START
-//                          (flow_sequence_entry FLOW-ENTRY)*
-//                          flow_sequence_entry?
-//                          FLOW-SEQUENCE-END
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-// flow_mapping         ::= FLOW-MAPPING-START
-//                          (flow_mapping_entry FLOW-ENTRY)*
-//                          flow_mapping_entry?
-//                          FLOW-MAPPING-END
-// flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-
-// Peek the next token in the token queue.
-func peek_token(parser *yaml_parser_t) *yaml_token_t {
-	if parser.token_available || yaml_parser_fetch_more_tokens(parser) {
-		return &parser.tokens[parser.tokens_head]
-	}
-	return nil
-}
-
-// Remove the next token from the queue (must be called after peek_token).
-func skip_token(parser *yaml_parser_t) {
-	parser.token_available = false
-	parser.tokens_parsed++
-	parser.stream_end_produced = parser.tokens[parser.tokens_head].typ == yaml_STREAM_END_TOKEN
-	parser.tokens_head++
-}
-
-// Get the next event.
-func yaml_parser_parse(parser *yaml_parser_t, event *yaml_event_t) bool {
-	// Erase the event object.
-	*event = yaml_event_t{}
-
-	// No events after the end of the stream or error.
-	if parser.stream_end_produced || parser.error != yaml_NO_ERROR || parser.state == yaml_PARSE_END_STATE {
-		return true
-	}
-
-	// Generate the next event.
-	return yaml_parser_state_machine(parser, event)
-}
-
-// Set parser error.
-func yaml_parser_set_parser_error(parser *yaml_parser_t, problem string, problem_mark yaml_mark_t) bool {
-	parser.error = yaml_PARSER_ERROR
-	parser.problem = problem
-	parser.problem_mark = problem_mark
-	return false
-}
-
-func yaml_parser_set_parser_error_context(parser *yaml_parser_t, context string, context_mark yaml_mark_t, problem string, problem_mark yaml_mark_t) bool {
-	parser.error = yaml_PARSER_ERROR
-	parser.context = context
-	parser.context_mark = context_mark
-	parser.problem = problem
-	parser.problem_mark = problem_mark
-	return false
-}
-
-// State dispatcher.
-func yaml_parser_state_machine(parser *yaml_parser_t, event *yaml_event_t) bool {
-	//trace("yaml_parser_state_machine", "state:", parser.state.String())
-
-	switch parser.state {
-	case yaml_PARSE_STREAM_START_STATE:
-		return yaml_parser_parse_stream_start(parser, event)
-
-	case yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE:
-		return yaml_parser_parse_document_start(parser, event, true)
-
-	case yaml_PARSE_DOCUMENT_START_STATE:
-		return yaml_parser_parse_document_start(parser, event, false)
-
-	case yaml_PARSE_DOCUMENT_CONTENT_STATE:
-		return yaml_parser_parse_document_content(parser, event)
-
-	case yaml_PARSE_DOCUMENT_END_STATE:
-		return yaml_parser_parse_document_end(parser, event)
-
-	case yaml_PARSE_BLOCK_NODE_STATE:
-		return yaml_parser_parse_node(parser, event, true, false)
-
-	case yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE:
-		return yaml_parser_parse_node(parser, event, true, true)
-
-	case yaml_PARSE_FLOW_NODE_STATE:
-		return yaml_parser_parse_node(parser, event, false, false)
-
-	case yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE:
-		return yaml_parser_parse_block_sequence_entry(parser, event, true)
-
-	case yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE:
-		return yaml_parser_parse_block_sequence_entry(parser, event, false)
-
-	case yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE:
-		return yaml_parser_parse_indentless_sequence_entry(parser, event)
-
-	case yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE:
-		return yaml_parser_parse_block_mapping_key(parser, event, true)
-
-	case yaml_PARSE_BLOCK_MAPPING_KEY_STATE:
-		return yaml_parser_parse_block_mapping_key(parser, event, false)
-
-	case yaml_PARSE_BLOCK_MAPPING_VALUE_STATE:
-		return yaml_parser_parse_block_mapping_value(parser, event)
-
-	case yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE:
-		return yaml_parser_parse_flow_sequence_entry(parser, event, true)
-
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE:
-		return yaml_parser_parse_flow_sequence_entry(parser, event, false)
-
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE:
-		return yaml_parser_parse_flow_sequence_entry_mapping_key(parser, event)
-
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE:
-		return yaml_parser_parse_flow_sequence_entry_mapping_value(parser, event)
-
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE:
-		return yaml_parser_parse_flow_sequence_entry_mapping_end(parser, event)
-
-	case yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE:
-		return yaml_parser_parse_flow_mapping_key(parser, event, true)
-
-	case yaml_PARSE_FLOW_MAPPING_KEY_STATE:
-		return yaml_parser_parse_flow_mapping_key(parser, event, false)
-
-	case yaml_PARSE_FLOW_MAPPING_VALUE_STATE:
-		return yaml_parser_parse_flow_mapping_value(parser, event, false)
-
-	case yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE:
-		return yaml_parser_parse_flow_mapping_value(parser, event, true)
-
-	default:
-		panic("invalid parser state")
-	}
-}
-
-// Parse the production:
-// stream   ::= STREAM-START implicit_document? explicit_document* STREAM-END
-//              ************
-func yaml_parser_parse_stream_start(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ != yaml_STREAM_START_TOKEN {
-		return yaml_parser_set_parser_error(parser, "did not find expected <stream-start>", token.start_mark)
-	}
-	parser.state = yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE
-	*event = yaml_event_t{
-		typ:        yaml_STREAM_START_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.end_mark,
-		encoding:   token.encoding,
-	}
-	skip_token(parser)
-	return true
-}
-
-// Parse the productions:
-// implicit_document    ::= block_node DOCUMENT-END*
-//                          *
-// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
-//                          *************************
-func yaml_parser_parse_document_start(parser *yaml_parser_t, event *yaml_event_t, implicit bool) bool {
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	// Parse extra document end indicators.
-	if !implicit {
-		for token.typ == yaml_DOCUMENT_END_TOKEN {
-			skip_token(parser)
-			token = peek_token(parser)
-			if token == nil {
-				return false
-			}
-		}
-	}
-
-	if implicit && token.typ != yaml_VERSION_DIRECTIVE_TOKEN &&
-		token.typ != yaml_TAG_DIRECTIVE_TOKEN &&
-		token.typ != yaml_DOCUMENT_START_TOKEN &&
-		token.typ != yaml_STREAM_END_TOKEN {
-		// Parse an implicit document.
-		if !yaml_parser_process_directives(parser, nil, nil) {
-			return false
-		}
-		parser.states = append(parser.states, yaml_PARSE_DOCUMENT_END_STATE)
-		parser.state = yaml_PARSE_BLOCK_NODE_STATE
-
-		*event = yaml_event_t{
-			typ:        yaml_DOCUMENT_START_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-		}
-
-	} else if token.typ != yaml_STREAM_END_TOKEN {
-		// Parse an explicit document.
-		var version_directive *yaml_version_directive_t
-		var tag_directives []yaml_tag_directive_t
-		start_mark := token.start_mark
-		if !yaml_parser_process_directives(parser, &version_directive, &tag_directives) {
-			return false
-		}
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_DOCUMENT_START_TOKEN {
-			yaml_parser_set_parser_error(parser,
-				"did not find expected <document start>", token.start_mark)
-			return false
-		}
-		parser.states = append(parser.states, yaml_PARSE_DOCUMENT_END_STATE)
-		parser.state = yaml_PARSE_DOCUMENT_CONTENT_STATE
-		end_mark := token.end_mark
-
-		*event = yaml_event_t{
-			typ:               yaml_DOCUMENT_START_EVENT,
-			start_mark:        start_mark,
-			end_mark:          end_mark,
-			version_directive: version_directive,
-			tag_directives:    tag_directives,
-			implicit:          false,
-		}
-		skip_token(parser)
-
-	} else {
-		// Parse the stream end.
-		parser.state = yaml_PARSE_END_STATE
-		*event = yaml_event_t{
-			typ:        yaml_STREAM_END_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-		}
-		skip_token(parser)
-	}
-
-	return true
-}
-
-// Parse the productions:
-// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
-//                                                    ***********
-//
-func yaml_parser_parse_document_content(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ == yaml_VERSION_DIRECTIVE_TOKEN ||
-		token.typ == yaml_TAG_DIRECTIVE_TOKEN ||
-		token.typ == yaml_DOCUMENT_START_TOKEN ||
-		token.typ == yaml_DOCUMENT_END_TOKEN ||
-		token.typ == yaml_STREAM_END_TOKEN {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-		return yaml_parser_process_empty_scalar(parser, event,
-			token.start_mark)
-	}
-	return yaml_parser_parse_node(parser, event, true, false)
-}
-
-// Parse the productions:
-// implicit_document    ::= block_node DOCUMENT-END*
-//                                     *************
-// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
-//
-func yaml_parser_parse_document_end(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	start_mark := token.start_mark
-	end_mark := token.start_mark
-
-	implicit := true
-	if token.typ == yaml_DOCUMENT_END_TOKEN {
-		end_mark = token.end_mark
-		skip_token(parser)
-		implicit = false
-	}
-
-	parser.tag_directives = parser.tag_directives[:0]
-
-	parser.state = yaml_PARSE_DOCUMENT_START_STATE
-	*event = yaml_event_t{
-		typ:        yaml_DOCUMENT_END_EVENT,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		implicit:   implicit,
-	}
-	return true
-}
-
-// Parse the productions:
-// block_node_or_indentless_sequence    ::=
-//                          ALIAS
-//                          *****
-//                          | properties (block_content | indentless_block_sequence)?
-//                            **********  *
-//                          | block_content | indentless_block_sequence
-//                            *
-// block_node           ::= ALIAS
-//                          *****
-//                          | properties block_content?
-//                            ********** *
-//                          | block_content
-//                            *
-// flow_node            ::= ALIAS
-//                          *****
-//                          | properties flow_content?
-//                            ********** *
-//                          | flow_content
-//                            *
-// properties           ::= TAG ANCHOR? | ANCHOR TAG?
-//                          *************************
-// block_content        ::= block_collection | flow_collection | SCALAR
-//                                                               ******
-// flow_content         ::= flow_collection | SCALAR
-//                                            ******
-func yaml_parser_parse_node(parser *yaml_parser_t, event *yaml_event_t, block, indentless_sequence bool) bool {
-	//defer trace("yaml_parser_parse_node", "block:", block, "indentless_sequence:", indentless_sequence)()
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ == yaml_ALIAS_TOKEN {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-		*event = yaml_event_t{
-			typ:        yaml_ALIAS_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-			anchor:     token.value,
-		}
-		skip_token(parser)
-		return true
-	}
-
-	start_mark := token.start_mark
-	end_mark := token.start_mark
-
-	var tag_token bool
-	var tag_handle, tag_suffix, anchor []byte
-	var tag_mark yaml_mark_t
-	if token.typ == yaml_ANCHOR_TOKEN {
-		anchor = token.value
-		start_mark = token.start_mark
-		end_mark = token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ == yaml_TAG_TOKEN {
-			tag_token = true
-			tag_handle = token.value
-			tag_suffix = token.suffix
-			tag_mark = token.start_mark
-			end_mark = token.end_mark
-			skip_token(parser)
-			token = peek_token(parser)
-			if token == nil {
-				return false
-			}
-		}
-	} else if token.typ == yaml_TAG_TOKEN {
-		tag_token = true
-		tag_handle = token.value
-		tag_suffix = token.suffix
-		start_mark = token.start_mark
-		tag_mark = token.start_mark
-		end_mark = token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ == yaml_ANCHOR_TOKEN {
-			anchor = token.value
-			end_mark = token.end_mark
-			skip_token(parser)
-			token = peek_token(parser)
-			if token == nil {
-				return false
-			}
-		}
-	}
-
-	var tag []byte
-	if tag_token {
-		if len(tag_handle) == 0 {
-			tag = tag_suffix
-			tag_suffix = nil
-		} else {
-			for i := range parser.tag_directives {
-				if bytes.Equal(parser.tag_directives[i].handle, tag_handle) {
-					tag = append([]byte(nil), parser.tag_directives[i].prefix...)
-					tag = append(tag, tag_suffix...)
-					break
-				}
-			}
-			if len(tag) == 0 {
-				yaml_parser_set_parser_error_context(parser,
-					"while parsing a node", start_mark,
-					"found undefined tag handle", tag_mark)
-				return false
-			}
-		}
-	}
-
-	implicit := len(tag) == 0
-	if indentless_sequence && token.typ == yaml_BLOCK_ENTRY_TOKEN {
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_SEQUENCE_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_BLOCK_SEQUENCE_STYLE),
-		}
-		return true
-	}
-	if token.typ == yaml_SCALAR_TOKEN {
-		var plain_implicit, quoted_implicit bool
-		end_mark = token.end_mark
-		if (len(tag) == 0 && token.style == yaml_PLAIN_SCALAR_STYLE) || (len(tag) == 1 && tag[0] == '!') {
-			plain_implicit = true
-		} else if len(tag) == 0 {
-			quoted_implicit = true
-		}
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-
-		*event = yaml_event_t{
-			typ:             yaml_SCALAR_EVENT,
-			start_mark:      start_mark,
-			end_mark:        end_mark,
-			anchor:          anchor,
-			tag:             tag,
-			value:           token.value,
-			implicit:        plain_implicit,
-			quoted_implicit: quoted_implicit,
-			style:           yaml_style_t(token.style),
-		}
-		skip_token(parser)
-		return true
-	}
-	if token.typ == yaml_FLOW_SEQUENCE_START_TOKEN {
-		// [Go] Some of the events below can be merged as they differ only on style.
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_SEQUENCE_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_FLOW_SEQUENCE_STYLE),
-		}
-		return true
-	}
-	if token.typ == yaml_FLOW_MAPPING_START_TOKEN {
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_MAPPING_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_FLOW_MAPPING_STYLE),
-		}
-		return true
-	}
-	if block && token.typ == yaml_BLOCK_SEQUENCE_START_TOKEN {
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_SEQUENCE_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_BLOCK_SEQUENCE_STYLE),
-		}
-		return true
-	}
-	if block && token.typ == yaml_BLOCK_MAPPING_START_TOKEN {
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_MAPPING_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_BLOCK_MAPPING_STYLE),
-		}
-		return true
-	}
-	if len(anchor) > 0 || len(tag) > 0 {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-
-		*event = yaml_event_t{
-			typ:             yaml_SCALAR_EVENT,
-			start_mark:      start_mark,
-			end_mark:        end_mark,
-			anchor:          anchor,
-			tag:             tag,
-			implicit:        implicit,
-			quoted_implicit: false,
-			style:           yaml_style_t(yaml_PLAIN_SCALAR_STYLE),
-		}
-		return true
-	}
-
-	context := "while parsing a flow node"
-	if block {
-		context = "while parsing a block node"
-	}
-	yaml_parser_set_parser_error_context(parser, context, start_mark,
-		"did not find expected node content", token.start_mark)
-	return false
-}
-
-// Parse the productions:
-// block_sequence ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
-//                    ********************  *********** *             *********
-//
-func yaml_parser_parse_block_sequence_entry(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
-	if first {
-		token := peek_token(parser)
-		parser.marks = append(parser.marks, token.start_mark)
-		skip_token(parser)
-	}
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ == yaml_BLOCK_ENTRY_TOKEN {
-		mark := token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_BLOCK_ENTRY_TOKEN && token.typ != yaml_BLOCK_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE)
-			return yaml_parser_parse_node(parser, event, true, false)
-		} else {
-			parser.state = yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE
-			return yaml_parser_process_empty_scalar(parser, event, mark)
-		}
-	}
-	if token.typ == yaml_BLOCK_END_TOKEN {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-		parser.marks = parser.marks[:len(parser.marks)-1]
-
-		*event = yaml_event_t{
-			typ:        yaml_SEQUENCE_END_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-		}
-
-		skip_token(parser)
-		return true
-	}
-
-	context_mark := parser.marks[len(parser.marks)-1]
-	parser.marks = parser.marks[:len(parser.marks)-1]
-	return yaml_parser_set_parser_error_context(parser,
-		"while parsing a block collection", context_mark,
-		"did not find expected '-' indicator", token.start_mark)
-}
-
-// Parse the productions:
-// indentless_sequence  ::= (BLOCK-ENTRY block_node?)+
-//                           *********** *
-func yaml_parser_parse_indentless_sequence_entry(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ == yaml_BLOCK_ENTRY_TOKEN {
-		mark := token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_BLOCK_ENTRY_TOKEN &&
-			token.typ != yaml_KEY_TOKEN &&
-			token.typ != yaml_VALUE_TOKEN &&
-			token.typ != yaml_BLOCK_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE)
-			return yaml_parser_parse_node(parser, event, true, false)
-		}
-		parser.state = yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE
-		return yaml_parser_process_empty_scalar(parser, event, mark)
-	}
-	parser.state = parser.states[len(parser.states)-1]
-	parser.states = parser.states[:len(parser.states)-1]
-
-	*event = yaml_event_t{
-		typ:        yaml_SEQUENCE_END_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.start_mark, // [Go] Shouldn't this be token.end_mark?
-	}
-	return true
-}
-
-// Parse the productions:
-// block_mapping        ::= BLOCK-MAPPING_START
-//                          *******************
-//                          ((KEY block_node_or_indentless_sequence?)?
-//                            *** *
-//                          (VALUE block_node_or_indentless_sequence?)?)*
-//
-//                          BLOCK-END
-//                          *********
-//
-func yaml_parser_parse_block_mapping_key(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
-	if first {
-		token := peek_token(parser)
-		parser.marks = append(parser.marks, token.start_mark)
-		skip_token(parser)
-	}
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ == yaml_KEY_TOKEN {
-		mark := token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_KEY_TOKEN &&
-			token.typ != yaml_VALUE_TOKEN &&
-			token.typ != yaml_BLOCK_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_BLOCK_MAPPING_VALUE_STATE)
-			return yaml_parser_parse_node(parser, event, true, true)
-		} else {
-			parser.state = yaml_PARSE_BLOCK_MAPPING_VALUE_STATE
-			return yaml_parser_process_empty_scalar(parser, event, mark)
-		}
-	} else if token.typ == yaml_BLOCK_END_TOKEN {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-		parser.marks = parser.marks[:len(parser.marks)-1]
-		*event = yaml_event_t{
-			typ:        yaml_MAPPING_END_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-		}
-		skip_token(parser)
-		return true
-	}
-
-	context_mark := parser.marks[len(parser.marks)-1]
-	parser.marks = parser.marks[:len(parser.marks)-1]
-	return yaml_parser_set_parser_error_context(parser,
-		"while parsing a block mapping", context_mark,
-		"did not find expected key", token.start_mark)
-}
-
-// Parse the productions:
-// block_mapping        ::= BLOCK-MAPPING_START
-//
-//                          ((KEY block_node_or_indentless_sequence?)?
-//
-//                          (VALUE block_node_or_indentless_sequence?)?)*
-//                           ***** *
-//                          BLOCK-END
-//
-//
-func yaml_parser_parse_block_mapping_value(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ == yaml_VALUE_TOKEN {
-		mark := token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_KEY_TOKEN &&
-			token.typ != yaml_VALUE_TOKEN &&
-			token.typ != yaml_BLOCK_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_BLOCK_MAPPING_KEY_STATE)
-			return yaml_parser_parse_node(parser, event, true, true)
-		}
-		parser.state = yaml_PARSE_BLOCK_MAPPING_KEY_STATE
-		return yaml_parser_process_empty_scalar(parser, event, mark)
-	}
-	parser.state = yaml_PARSE_BLOCK_MAPPING_KEY_STATE
-	return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-}
-
-// Parse the productions:
-// flow_sequence        ::= FLOW-SEQUENCE-START
-//                          *******************
-//                          (flow_sequence_entry FLOW-ENTRY)*
-//                           *                   **********
-//                          flow_sequence_entry?
-//                          *
-//                          FLOW-SEQUENCE-END
-//                          *****************
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                          *
-//
-func yaml_parser_parse_flow_sequence_entry(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
-	if first {
-		token := peek_token(parser)
-		parser.marks = append(parser.marks, token.start_mark)
-		skip_token(parser)
-	}
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
-		if !first {
-			if token.typ == yaml_FLOW_ENTRY_TOKEN {
-				skip_token(parser)
-				token = peek_token(parser)
-				if token == nil {
-					return false
-				}
-			} else {
-				context_mark := parser.marks[len(parser.marks)-1]
-				parser.marks = parser.marks[:len(parser.marks)-1]
-				return yaml_parser_set_parser_error_context(parser,
-					"while parsing a flow sequence", context_mark,
-					"did not find expected ',' or ']'", token.start_mark)
-			}
-		}
-
-		if token.typ == yaml_KEY_TOKEN {
-			parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE
-			*event = yaml_event_t{
-				typ:        yaml_MAPPING_START_EVENT,
-				start_mark: token.start_mark,
-				end_mark:   token.end_mark,
-				implicit:   true,
-				style:      yaml_style_t(yaml_FLOW_MAPPING_STYLE),
-			}
-			skip_token(parser)
-			return true
-		} else if token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE)
-			return yaml_parser_parse_node(parser, event, false, false)
-		}
-	}
-
-	parser.state = parser.states[len(parser.states)-1]
-	parser.states = parser.states[:len(parser.states)-1]
-	parser.marks = parser.marks[:len(parser.marks)-1]
-
-	*event = yaml_event_t{
-		typ:        yaml_SEQUENCE_END_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.end_mark,
-	}
-
-	skip_token(parser)
-	return true
-}
-
-//
-// Parse the productions:
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                                      *** *
-//
-func yaml_parser_parse_flow_sequence_entry_mapping_key(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ != yaml_VALUE_TOKEN &&
-		token.typ != yaml_FLOW_ENTRY_TOKEN &&
-		token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
-		parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE)
-		return yaml_parser_parse_node(parser, event, false, false)
-	}
-	mark := token.end_mark
-	skip_token(parser)
-	parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE
-	return yaml_parser_process_empty_scalar(parser, event, mark)
-}
-
-// Parse the productions:
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                                                      ***** *
-//
-func yaml_parser_parse_flow_sequence_entry_mapping_value(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ == yaml_VALUE_TOKEN {
-		skip_token(parser)
-		token := peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_FLOW_ENTRY_TOKEN && token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE)
-			return yaml_parser_parse_node(parser, event, false, false)
-		}
-	}
-	parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE
-	return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-}
-
-// Parse the productions:
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                                                                      *
-//
-func yaml_parser_parse_flow_sequence_entry_mapping_end(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE
-	*event = yaml_event_t{
-		typ:        yaml_MAPPING_END_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.start_mark, // [Go] Shouldn't this be end_mark?
-	}
-	return true
-}
-
-// Parse the productions:
-// flow_mapping         ::= FLOW-MAPPING-START
-//                          ******************
-//                          (flow_mapping_entry FLOW-ENTRY)*
-//                           *                  **********
-//                          flow_mapping_entry?
-//                          ******************
-//                          FLOW-MAPPING-END
-//                          ****************
-// flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                          *           *** *
-//
-func yaml_parser_parse_flow_mapping_key(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
-	if first {
-		token := peek_token(parser)
-		parser.marks = append(parser.marks, token.start_mark)
-		skip_token(parser)
-	}
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ != yaml_FLOW_MAPPING_END_TOKEN {
-		if !first {
-			if token.typ == yaml_FLOW_ENTRY_TOKEN {
-				skip_token(parser)
-				token = peek_token(parser)
-				if token == nil {
-					return false
-				}
-			} else {
-				context_mark := parser.marks[len(parser.marks)-1]
-				parser.marks = parser.marks[:len(parser.marks)-1]
-				return yaml_parser_set_parser_error_context(parser,
-					"while parsing a flow mapping", context_mark,
-					"did not find expected ',' or '}'", token.start_mark)
-			}
-		}
-
-		if token.typ == yaml_KEY_TOKEN {
-			skip_token(parser)
-			token = peek_token(parser)
-			if token == nil {
-				return false
-			}
-			if token.typ != yaml_VALUE_TOKEN &&
-				token.typ != yaml_FLOW_ENTRY_TOKEN &&
-				token.typ != yaml_FLOW_MAPPING_END_TOKEN {
-				parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_VALUE_STATE)
-				return yaml_parser_parse_node(parser, event, false, false)
-			} else {
-				parser.state = yaml_PARSE_FLOW_MAPPING_VALUE_STATE
-				return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-			}
-		} else if token.typ != yaml_FLOW_MAPPING_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE)
-			return yaml_parser_parse_node(parser, event, false, false)
-		}
-	}
-
-	parser.state = parser.states[len(parser.states)-1]
-	parser.states = parser.states[:len(parser.states)-1]
-	parser.marks = parser.marks[:len(parser.marks)-1]
-	*event = yaml_event_t{
-		typ:        yaml_MAPPING_END_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.end_mark,
-	}
-	skip_token(parser)
-	return true
-}
-
-// Parse the productions:
-// flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                                   *                  ***** *
-//
-func yaml_parser_parse_flow_mapping_value(parser *yaml_parser_t, event *yaml_event_t, empty bool) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if empty {
-		parser.state = yaml_PARSE_FLOW_MAPPING_KEY_STATE
-		return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-	}
-	if token.typ == yaml_VALUE_TOKEN {
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_FLOW_ENTRY_TOKEN && token.typ != yaml_FLOW_MAPPING_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_KEY_STATE)
-			return yaml_parser_parse_node(parser, event, false, false)
-		}
-	}
-	parser.state = yaml_PARSE_FLOW_MAPPING_KEY_STATE
-	return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-}
-
-// Generate an empty scalar event.
-func yaml_parser_process_empty_scalar(parser *yaml_parser_t, event *yaml_event_t, mark yaml_mark_t) bool {
-	*event = yaml_event_t{
-		typ:        yaml_SCALAR_EVENT,
-		start_mark: mark,
-		end_mark:   mark,
-		value:      nil, // Empty
-		implicit:   true,
-		style:      yaml_style_t(yaml_PLAIN_SCALAR_STYLE),
-	}
-	return true
-}
-
-var default_tag_directives = []yaml_tag_directive_t{
-	{[]byte("!"), []byte("!")},
-	{[]byte("!!"), []byte("tag:yaml.org,2002:")},
-}
-
-// Parse directives.
-func yaml_parser_process_directives(parser *yaml_parser_t,
-	version_directive_ref **yaml_version_directive_t,
-	tag_directives_ref *[]yaml_tag_directive_t) bool {
-
-	var version_directive *yaml_version_directive_t
-	var tag_directives []yaml_tag_directive_t
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	for token.typ == yaml_VERSION_DIRECTIVE_TOKEN || token.typ == yaml_TAG_DIRECTIVE_TOKEN {
-		if token.typ == yaml_VERSION_DIRECTIVE_TOKEN {
-			if version_directive != nil {
-				yaml_parser_set_parser_error(parser,
-					"found duplicate %YAML directive", token.start_mark)
-				return false
-			}
-			if token.major != 1 || token.minor != 1 {
-				yaml_parser_set_parser_error(parser,
-					"found incompatible YAML document", token.start_mark)
-				return false
-			}
-			version_directive = &yaml_version_directive_t{
-				major: token.major,
-				minor: token.minor,
-			}
-		} else if token.typ == yaml_TAG_DIRECTIVE_TOKEN {
-			value := yaml_tag_directive_t{
-				handle: token.value,
-				prefix: token.prefix,
-			}
-			if !yaml_parser_append_tag_directive(parser, value, false, token.start_mark) {
-				return false
-			}
-			tag_directives = append(tag_directives, value)
-		}
-
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-	}
-
-	for i := range default_tag_directives {
-		if !yaml_parser_append_tag_directive(parser, default_tag_directives[i], true, token.start_mark) {
-			return false
-		}
-	}
-
-	if version_directive_ref != nil {
-		*version_directive_ref = version_directive
-	}
-	if tag_directives_ref != nil {
-		*tag_directives_ref = tag_directives
-	}
-	return true
-}
-
-// Append a tag directive to the directives stack.
-func yaml_parser_append_tag_directive(parser *yaml_parser_t, value yaml_tag_directive_t, allow_duplicates bool, mark yaml_mark_t) bool {
-	for i := range parser.tag_directives {
-		if bytes.Equal(value.handle, parser.tag_directives[i].handle) {
-			if allow_duplicates {
-				return true
-			}
-			return yaml_parser_set_parser_error(parser, "found duplicate %TAG directive", mark)
-		}
-	}
-
-	// [Go] I suspect the copy is unnecessary. This was likely done
-	// because there was no way to track ownership of the data.
-	value_copy := yaml_tag_directive_t{
-		handle: make([]byte, len(value.handle)),
-		prefix: make([]byte, len(value.prefix)),
-	}
-	copy(value_copy.handle, value.handle)
-	copy(value_copy.prefix, value.prefix)
-	parser.tag_directives = append(parser.tag_directives, value_copy)
-	return true
-}
diff --git a/vendor/github.com/sanathkr/go-yaml/readerc.go b/vendor/github.com/sanathkr/go-yaml/readerc.go
deleted file mode 100644
index f450791717..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/readerc.go
+++ /dev/null
@@ -1,394 +0,0 @@
-package yaml
-
-import (
-	"io"
-)
-
-// Set the reader error and return 0.
-func yaml_parser_set_reader_error(parser *yaml_parser_t, problem string, offset int, value int) bool {
-	parser.error = yaml_READER_ERROR
-	parser.problem = problem
-	parser.problem_offset = offset
-	parser.problem_value = value
-	return false
-}
-
-// Byte order marks.
-const (
-	bom_UTF8    = "\xef\xbb\xbf"
-	bom_UTF16LE = "\xff\xfe"
-	bom_UTF16BE = "\xfe\xff"
-)
-
-// Determine the input stream encoding by checking the BOM symbol. If no BOM is
-// found, the UTF-8 encoding is assumed. Return 1 on success, 0 on failure.
-func yaml_parser_determine_encoding(parser *yaml_parser_t) bool {
-	// Ensure that we had enough bytes in the raw buffer.
-	for !parser.eof && len(parser.raw_buffer)-parser.raw_buffer_pos < 3 {
-		if !yaml_parser_update_raw_buffer(parser) {
-			return false
-		}
-	}
-
-	// Determine the encoding.
-	buf := parser.raw_buffer
-	pos := parser.raw_buffer_pos
-	avail := len(buf) - pos
-	if avail >= 2 && buf[pos] == bom_UTF16LE[0] && buf[pos+1] == bom_UTF16LE[1] {
-		parser.encoding = yaml_UTF16LE_ENCODING
-		parser.raw_buffer_pos += 2
-		parser.offset += 2
-	} else if avail >= 2 && buf[pos] == bom_UTF16BE[0] && buf[pos+1] == bom_UTF16BE[1] {
-		parser.encoding = yaml_UTF16BE_ENCODING
-		parser.raw_buffer_pos += 2
-		parser.offset += 2
-	} else if avail >= 3 && buf[pos] == bom_UTF8[0] && buf[pos+1] == bom_UTF8[1] && buf[pos+2] == bom_UTF8[2] {
-		parser.encoding = yaml_UTF8_ENCODING
-		parser.raw_buffer_pos += 3
-		parser.offset += 3
-	} else {
-		parser.encoding = yaml_UTF8_ENCODING
-	}
-	return true
-}
-
-// Update the raw buffer.
-func yaml_parser_update_raw_buffer(parser *yaml_parser_t) bool {
-	size_read := 0
-
-	// Return if the raw buffer is full.
-	if parser.raw_buffer_pos == 0 && len(parser.raw_buffer) == cap(parser.raw_buffer) {
-		return true
-	}
-
-	// Return on EOF.
-	if parser.eof {
-		return true
-	}
-
-	// Move the remaining bytes in the raw buffer to the beginning.
-	if parser.raw_buffer_pos > 0 && parser.raw_buffer_pos < len(parser.raw_buffer) {
-		copy(parser.raw_buffer, parser.raw_buffer[parser.raw_buffer_pos:])
-	}
-	parser.raw_buffer = parser.raw_buffer[:len(parser.raw_buffer)-parser.raw_buffer_pos]
-	parser.raw_buffer_pos = 0
-
-	// Call the read handler to fill the buffer.
-	size_read, err := parser.read_handler(parser, parser.raw_buffer[len(parser.raw_buffer):cap(parser.raw_buffer)])
-	parser.raw_buffer = parser.raw_buffer[:len(parser.raw_buffer)+size_read]
-	if err == io.EOF {
-		parser.eof = true
-	} else if err != nil {
-		return yaml_parser_set_reader_error(parser, "input error: "+err.Error(), parser.offset, -1)
-	}
-	return true
-}
-
-// Ensure that the buffer contains at least `length` characters.
-// Return true on success, false on failure.
-//
-// The length is supposed to be significantly less that the buffer size.
-func yaml_parser_update_buffer(parser *yaml_parser_t, length int) bool {
-	if parser.read_handler == nil {
-		panic("read handler must be set")
-	}
-
-	// If the EOF flag is set and the raw buffer is empty, do nothing.
-	if parser.eof && parser.raw_buffer_pos == len(parser.raw_buffer) {
-		return true
-	}
-
-	// Return if the buffer contains enough characters.
-	if parser.unread >= length {
-		return true
-	}
-
-	// Determine the input encoding if it is not known yet.
-	if parser.encoding == yaml_ANY_ENCODING {
-		if !yaml_parser_determine_encoding(parser) {
-			return false
-		}
-	}
-
-	// Move the unread characters to the beginning of the buffer.
-	buffer_len := len(parser.buffer)
-	if parser.buffer_pos > 0 && parser.buffer_pos < buffer_len {
-		copy(parser.buffer, parser.buffer[parser.buffer_pos:])
-		buffer_len -= parser.buffer_pos
-		parser.buffer_pos = 0
-	} else if parser.buffer_pos == buffer_len {
-		buffer_len = 0
-		parser.buffer_pos = 0
-	}
-
-	// Open the whole buffer for writing, and cut it before returning.
-	parser.buffer = parser.buffer[:cap(parser.buffer)]
-
-	// Fill the buffer until it has enough characters.
-	first := true
-	for parser.unread < length {
-
-		// Fill the raw buffer if necessary.
-		if !first || parser.raw_buffer_pos == len(parser.raw_buffer) {
-			if !yaml_parser_update_raw_buffer(parser) {
-				parser.buffer = parser.buffer[:buffer_len]
-				return false
-			}
-		}
-		first = false
-
-		// Decode the raw buffer.
-	inner:
-		for parser.raw_buffer_pos != len(parser.raw_buffer) {
-			var value rune
-			var width int
-
-			raw_unread := len(parser.raw_buffer) - parser.raw_buffer_pos
-
-			// Decode the next character.
-			switch parser.encoding {
-			case yaml_UTF8_ENCODING:
-				// Decode a UTF-8 character.  Check RFC 3629
-				// (http://www.ietf.org/rfc/rfc3629.txt) for more details.
-				//
-				// The following table (taken from the RFC) is used for
-				// decoding.
-				//
-				//    Char. number range |        UTF-8 octet sequence
-				//      (hexadecimal)    |              (binary)
-				//   --------------------+------------------------------------
-				//   0000 0000-0000 007F | 0xxxxxxx
-				//   0000 0080-0000 07FF | 110xxxxx 10xxxxxx
-				//   0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
-				//   0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-				//
-				// Additionally, the characters in the range 0xD800-0xDFFF
-				// are prohibited as they are reserved for use with UTF-16
-				// surrogate pairs.
-
-				// Determine the length of the UTF-8 sequence.
-				octet := parser.raw_buffer[parser.raw_buffer_pos]
-				switch {
-				case octet&0x80 == 0x00:
-					width = 1
-				case octet&0xE0 == 0xC0:
-					width = 2
-				case octet&0xF0 == 0xE0:
-					width = 3
-				case octet&0xF8 == 0xF0:
-					width = 4
-				default:
-					// The leading octet is invalid.
-					return yaml_parser_set_reader_error(parser,
-						"invalid leading UTF-8 octet",
-						parser.offset, int(octet))
-				}
-
-				// Check if the raw buffer contains an incomplete character.
-				if width > raw_unread {
-					if parser.eof {
-						return yaml_parser_set_reader_error(parser,
-							"incomplete UTF-8 octet sequence",
-							parser.offset, -1)
-					}
-					break inner
-				}
-
-				// Decode the leading octet.
-				switch {
-				case octet&0x80 == 0x00:
-					value = rune(octet & 0x7F)
-				case octet&0xE0 == 0xC0:
-					value = rune(octet & 0x1F)
-				case octet&0xF0 == 0xE0:
-					value = rune(octet & 0x0F)
-				case octet&0xF8 == 0xF0:
-					value = rune(octet & 0x07)
-				default:
-					value = 0
-				}
-
-				// Check and decode the trailing octets.
-				for k := 1; k < width; k++ {
-					octet = parser.raw_buffer[parser.raw_buffer_pos+k]
-
-					// Check if the octet is valid.
-					if (octet & 0xC0) != 0x80 {
-						return yaml_parser_set_reader_error(parser,
-							"invalid trailing UTF-8 octet",
-							parser.offset+k, int(octet))
-					}
-
-					// Decode the octet.
-					value = (value << 6) + rune(octet&0x3F)
-				}
-
-				// Check the length of the sequence against the value.
-				switch {
-				case width == 1:
-				case width == 2 && value >= 0x80:
-				case width == 3 && value >= 0x800:
-				case width == 4 && value >= 0x10000:
-				default:
-					return yaml_parser_set_reader_error(parser,
-						"invalid length of a UTF-8 sequence",
-						parser.offset, -1)
-				}
-
-				// Check the range of the value.
-				if value >= 0xD800 && value <= 0xDFFF || value > 0x10FFFF {
-					return yaml_parser_set_reader_error(parser,
-						"invalid Unicode character",
-						parser.offset, int(value))
-				}
-
-			case yaml_UTF16LE_ENCODING, yaml_UTF16BE_ENCODING:
-				var low, high int
-				if parser.encoding == yaml_UTF16LE_ENCODING {
-					low, high = 0, 1
-				} else {
-					low, high = 1, 0
-				}
-
-				// The UTF-16 encoding is not as simple as one might
-				// naively think.  Check RFC 2781
-				// (http://www.ietf.org/rfc/rfc2781.txt).
-				//
-				// Normally, two subsequent bytes describe a Unicode
-				// character.  However a special technique (called a
-				// surrogate pair) is used for specifying character
-				// values larger than 0xFFFF.
-				//
-				// A surrogate pair consists of two pseudo-characters:
-				//      high surrogate area (0xD800-0xDBFF)
-				//      low surrogate area (0xDC00-0xDFFF)
-				//
-				// The following formulas are used for decoding
-				// and encoding characters using surrogate pairs:
-				//
-				//  U  = U' + 0x10000   (0x01 00 00 <= U <= 0x10 FF FF)
-				//  U' = yyyyyyyyyyxxxxxxxxxx   (0 <= U' <= 0x0F FF FF)
-				//  W1 = 110110yyyyyyyyyy
-				//  W2 = 110111xxxxxxxxxx
-				//
-				// where U is the character value, W1 is the high surrogate
-				// area, W2 is the low surrogate area.
-
-				// Check for incomplete UTF-16 character.
-				if raw_unread < 2 {
-					if parser.eof {
-						return yaml_parser_set_reader_error(parser,
-							"incomplete UTF-16 character",
-							parser.offset, -1)
-					}
-					break inner
-				}
-
-				// Get the character.
-				value = rune(parser.raw_buffer[parser.raw_buffer_pos+low]) +
-					(rune(parser.raw_buffer[parser.raw_buffer_pos+high]) << 8)
-
-				// Check for unexpected low surrogate area.
-				if value&0xFC00 == 0xDC00 {
-					return yaml_parser_set_reader_error(parser,
-						"unexpected low surrogate area",
-						parser.offset, int(value))
-				}
-
-				// Check for a high surrogate area.
-				if value&0xFC00 == 0xD800 {
-					width = 4
-
-					// Check for incomplete surrogate pair.
-					if raw_unread < 4 {
-						if parser.eof {
-							return yaml_parser_set_reader_error(parser,
-								"incomplete UTF-16 surrogate pair",
-								parser.offset, -1)
-						}
-						break inner
-					}
-
-					// Get the next character.
-					value2 := rune(parser.raw_buffer[parser.raw_buffer_pos+low+2]) +
-						(rune(parser.raw_buffer[parser.raw_buffer_pos+high+2]) << 8)
-
-					// Check for a low surrogate area.
-					if value2&0xFC00 != 0xDC00 {
-						return yaml_parser_set_reader_error(parser,
-							"expected low surrogate area",
-							parser.offset+2, int(value2))
-					}
-
-					// Generate the value of the surrogate pair.
-					value = 0x10000 + ((value & 0x3FF) << 10) + (value2 & 0x3FF)
-				} else {
-					width = 2
-				}
-
-			default:
-				panic("impossible")
-			}
-
-			// Check if the character is in the allowed range:
-			//      #x9 | #xA | #xD | [#x20-#x7E]               (8 bit)
-			//      | #x85 | [#xA0-#xD7FF] | [#xE000-#xFFFD]    (16 bit)
-			//      | [#x10000-#x10FFFF]                        (32 bit)
-			switch {
-			case value == 0x09:
-			case value == 0x0A:
-			case value == 0x0D:
-			case value >= 0x20 && value <= 0x7E:
-			case value == 0x85:
-			case value >= 0xA0 && value <= 0xD7FF:
-			case value >= 0xE000 && value <= 0xFFFD:
-			case value >= 0x10000 && value <= 0x10FFFF:
-			default:
-				return yaml_parser_set_reader_error(parser,
-					"control characters are not allowed",
-					parser.offset, int(value))
-			}
-
-			// Move the raw pointers.
-			parser.raw_buffer_pos += width
-			parser.offset += width
-
-			// Finally put the character into the buffer.
-			if value <= 0x7F {
-				// 0000 0000-0000 007F . 0xxxxxxx
-				parser.buffer[buffer_len+0] = byte(value)
-				buffer_len += 1
-			} else if value <= 0x7FF {
-				// 0000 0080-0000 07FF . 110xxxxx 10xxxxxx
-				parser.buffer[buffer_len+0] = byte(0xC0 + (value >> 6))
-				parser.buffer[buffer_len+1] = byte(0x80 + (value & 0x3F))
-				buffer_len += 2
-			} else if value <= 0xFFFF {
-				// 0000 0800-0000 FFFF . 1110xxxx 10xxxxxx 10xxxxxx
-				parser.buffer[buffer_len+0] = byte(0xE0 + (value >> 12))
-				parser.buffer[buffer_len+1] = byte(0x80 + ((value >> 6) & 0x3F))
-				parser.buffer[buffer_len+2] = byte(0x80 + (value & 0x3F))
-				buffer_len += 3
-			} else {
-				// 0001 0000-0010 FFFF . 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-				parser.buffer[buffer_len+0] = byte(0xF0 + (value >> 18))
-				parser.buffer[buffer_len+1] = byte(0x80 + ((value >> 12) & 0x3F))
-				parser.buffer[buffer_len+2] = byte(0x80 + ((value >> 6) & 0x3F))
-				parser.buffer[buffer_len+3] = byte(0x80 + (value & 0x3F))
-				buffer_len += 4
-			}
-
-			parser.unread++
-		}
-
-		// On EOF, put NUL into the buffer and return.
-		if parser.eof {
-			parser.buffer[buffer_len] = 0
-			buffer_len++
-			parser.unread++
-			break
-		}
-	}
-	parser.buffer = parser.buffer[:buffer_len]
-	return true
-}
diff --git a/vendor/github.com/sanathkr/go-yaml/resolve.go b/vendor/github.com/sanathkr/go-yaml/resolve.go
deleted file mode 100644
index 232313cc08..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/resolve.go
+++ /dev/null
@@ -1,208 +0,0 @@
-package yaml
-
-import (
-	"encoding/base64"
-	"math"
-	"regexp"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-type resolveMapItem struct {
-	value interface{}
-	tag   string
-}
-
-var resolveTable = make([]byte, 256)
-var resolveMap = make(map[string]resolveMapItem)
-
-func init() {
-	t := resolveTable
-	t[int('+')] = 'S' // Sign
-	t[int('-')] = 'S'
-	for _, c := range "0123456789" {
-		t[int(c)] = 'D' // Digit
-	}
-	for _, c := range "yYnNtTfFoO~" {
-		t[int(c)] = 'M' // In map
-	}
-	t[int('.')] = '.' // Float (potentially in map)
-
-	var resolveMapList = []struct {
-		v   interface{}
-		tag string
-		l   []string
-	}{
-		{true, yaml_BOOL_TAG, []string{"y", "Y", "yes", "Yes", "YES"}},
-		{true, yaml_BOOL_TAG, []string{"true", "True", "TRUE"}},
-		{true, yaml_BOOL_TAG, []string{"on", "On", "ON"}},
-		{false, yaml_BOOL_TAG, []string{"n", "N", "no", "No", "NO"}},
-		{false, yaml_BOOL_TAG, []string{"false", "False", "FALSE"}},
-		{false, yaml_BOOL_TAG, []string{"off", "Off", "OFF"}},
-		{nil, yaml_NULL_TAG, []string{"", "~", "null", "Null", "NULL"}},
-		{math.NaN(), yaml_FLOAT_TAG, []string{".nan", ".NaN", ".NAN"}},
-		{math.Inf(+1), yaml_FLOAT_TAG, []string{".inf", ".Inf", ".INF"}},
-		{math.Inf(+1), yaml_FLOAT_TAG, []string{"+.inf", "+.Inf", "+.INF"}},
-		{math.Inf(-1), yaml_FLOAT_TAG, []string{"-.inf", "-.Inf", "-.INF"}},
-		{"<<", yaml_MERGE_TAG, []string{"<<"}},
-	}
-
-	m := resolveMap
-	for _, item := range resolveMapList {
-		for _, s := range item.l {
-			m[s] = resolveMapItem{item.v, item.tag}
-		}
-	}
-}
-
-const longTagPrefix = "tag:yaml.org,2002:"
-
-func shortTag(tag string) string {
-	// TODO This can easily be made faster and produce less garbage.
-	if strings.HasPrefix(tag, longTagPrefix) {
-		return "!!" + tag[len(longTagPrefix):]
-	}
-	return tag
-}
-
-func longTag(tag string) string {
-	if strings.HasPrefix(tag, "!!") {
-		return longTagPrefix + tag[2:]
-	}
-	return tag
-}
-
-func resolvableTag(tag string) bool {
-	switch tag {
-	case "", yaml_STR_TAG, yaml_BOOL_TAG, yaml_INT_TAG, yaml_FLOAT_TAG, yaml_NULL_TAG:
-		return true
-	}
-	return false
-}
-
-var yamlStyleFloat = regexp.MustCompile(`^[-+]?[0-9]*\.?[0-9]+([eE][-+][0-9]+)?$`)
-
-func resolve(tag string, in string) (rtag string, out interface{}) {
-	if !resolvableTag(tag) {
-		return tag, in
-	}
-
-	defer func() {
-		switch tag {
-		case "", rtag, yaml_STR_TAG, yaml_BINARY_TAG:
-			return
-		}
-		failf("cannot decode %s `%s` as a %s", shortTag(rtag), in, shortTag(tag))
-	}()
-
-	// Any data is accepted as a !!str or !!binary.
-	// Otherwise, the prefix is enough of a hint about what it might be.
-	hint := byte('N')
-	if in != "" {
-		hint = resolveTable[in[0]]
-	}
-	if hint != 0 && tag != yaml_STR_TAG && tag != yaml_BINARY_TAG {
-		// Handle things we can lookup in a map.
-		if item, ok := resolveMap[in]; ok {
-			return item.tag, item.value
-		}
-
-		// Base 60 floats are a bad idea, were dropped in YAML 1.2, and
-		// are purposefully unsupported here. They're still quoted on
-		// the way out for compatibility with other parser, though.
-
-		switch hint {
-		case 'M':
-			// We've already checked the map above.
-
-		case '.':
-			// Not in the map, so maybe a normal float.
-			floatv, err := strconv.ParseFloat(in, 64)
-			if err == nil {
-				return yaml_FLOAT_TAG, floatv
-			}
-
-		case 'D', 'S':
-			// Int, float, or timestamp.
-			plain := strings.Replace(in, "_", "", -1)
-			intv, err := strconv.ParseInt(plain, 0, 64)
-			if err == nil {
-				if intv == int64(int(intv)) {
-					return yaml_INT_TAG, int(intv)
-				} else {
-					return yaml_INT_TAG, intv
-				}
-			}
-			uintv, err := strconv.ParseUint(plain, 0, 64)
-			if err == nil {
-				return yaml_INT_TAG, uintv
-			}
-			if yamlStyleFloat.MatchString(plain) {
-				floatv, err := strconv.ParseFloat(plain, 64)
-				if err == nil {
-					return yaml_FLOAT_TAG, floatv
-				}
-			}
-			if strings.HasPrefix(plain, "0b") {
-				intv, err := strconv.ParseInt(plain[2:], 2, 64)
-				if err == nil {
-					if intv == int64(int(intv)) {
-						return yaml_INT_TAG, int(intv)
-					} else {
-						return yaml_INT_TAG, intv
-					}
-				}
-				uintv, err := strconv.ParseUint(plain[2:], 2, 64)
-				if err == nil {
-					return yaml_INT_TAG, uintv
-				}
-			} else if strings.HasPrefix(plain, "-0b") {
-				intv, err := strconv.ParseInt(plain[3:], 2, 64)
-				if err == nil {
-					if intv == int64(int(intv)) {
-						return yaml_INT_TAG, -int(intv)
-					} else {
-						return yaml_INT_TAG, -intv
-					}
-				}
-			}
-			// XXX Handle timestamps here.
-
-		default:
-			panic("resolveTable item not yet handled: " + string(rune(hint)) + " (with " + in + ")")
-		}
-	}
-	if tag == yaml_BINARY_TAG {
-		return yaml_BINARY_TAG, in
-	}
-	if utf8.ValidString(in) {
-		return yaml_STR_TAG, in
-	}
-	return yaml_BINARY_TAG, encodeBase64(in)
-}
-
-// encodeBase64 encodes s as base64 that is broken up into multiple lines
-// as appropriate for the resulting length.
-func encodeBase64(s string) string {
-	const lineLen = 70
-	encLen := base64.StdEncoding.EncodedLen(len(s))
-	lines := encLen/lineLen + 1
-	buf := make([]byte, encLen*2+lines)
-	in := buf[0:encLen]
-	out := buf[encLen:]
-	base64.StdEncoding.Encode(in, []byte(s))
-	k := 0
-	for i := 0; i < len(in); i += lineLen {
-		j := i + lineLen
-		if j > len(in) {
-			j = len(in)
-		}
-		k += copy(out[k:], in[i:j])
-		if lines > 1 {
-			out[k] = '\n'
-			k++
-		}
-	}
-	return string(out[:k])
-}
diff --git a/vendor/github.com/sanathkr/go-yaml/scannerc.go b/vendor/github.com/sanathkr/go-yaml/scannerc.go
deleted file mode 100644
index 0744844558..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/scannerc.go
+++ /dev/null
@@ -1,2711 +0,0 @@
-package yaml
-
-import (
-	"bytes"
-	"fmt"
-)
-
-// Introduction
-// ************
-//
-// The following notes assume that you are familiar with the YAML specification
-// (http://yaml.org/spec/1.2/spec.html).  We mostly follow it, although in
-// some cases we are less restrictive that it requires.
-//
-// The process of transforming a YAML stream into a sequence of events is
-// divided on two steps: Scanning and Parsing.
-//
-// The Scanner transforms the input stream into a sequence of tokens, while the
-// parser transform the sequence of tokens produced by the Scanner into a
-// sequence of parsing events.
-//
-// The Scanner is rather clever and complicated. The Parser, on the contrary,
-// is a straightforward implementation of a recursive-descendant parser (or,
-// LL(1) parser, as it is usually called).
-//
-// Actually there are two issues of Scanning that might be called "clever", the
-// rest is quite straightforward.  The issues are "block collection start" and
-// "simple keys".  Both issues are explained below in details.
-//
-// Here the Scanning step is explained and implemented.  We start with the list
-// of all the tokens produced by the Scanner together with short descriptions.
-//
-// Now, tokens:
-//
-//      STREAM-START(encoding)          # The stream start.
-//      STREAM-END                      # The stream end.
-//      VERSION-DIRECTIVE(major,minor)  # The '%YAML' directive.
-//      TAG-DIRECTIVE(handle,prefix)    # The '%TAG' directive.
-//      DOCUMENT-START                  # '---'
-//      DOCUMENT-END                    # '...'
-//      BLOCK-SEQUENCE-START            # Indentation increase denoting a block
-//      BLOCK-MAPPING-START             # sequence or a block mapping.
-//      BLOCK-END                       # Indentation decrease.
-//      FLOW-SEQUENCE-START             # '['
-//      FLOW-SEQUENCE-END               # ']'
-//      BLOCK-SEQUENCE-START            # '{'
-//      BLOCK-SEQUENCE-END              # '}'
-//      BLOCK-ENTRY                     # '-'
-//      FLOW-ENTRY                      # ','
-//      KEY                             # '?' or nothing (simple keys).
-//      VALUE                           # ':'
-//      ALIAS(anchor)                   # '*anchor'
-//      ANCHOR(anchor)                  # '&anchor'
-//      TAG(handle,suffix)              # '!handle!suffix'
-//      SCALAR(value,style)             # A scalar.
-//
-// The following two tokens are "virtual" tokens denoting the beginning and the
-// end of the stream:
-//
-//      STREAM-START(encoding)
-//      STREAM-END
-//
-// We pass the information about the input stream encoding with the
-// STREAM-START token.
-//
-// The next two tokens are responsible for tags:
-//
-//      VERSION-DIRECTIVE(major,minor)
-//      TAG-DIRECTIVE(handle,prefix)
-//
-// Example:
-//
-//      %YAML   1.1
-//      %TAG    !   !foo
-//      %TAG    !yaml!  tag:yaml.org,2002:
-//      ---
-//
-// The correspoding sequence of tokens:
-//
-//      STREAM-START(utf-8)
-//      VERSION-DIRECTIVE(1,1)
-//      TAG-DIRECTIVE("!","!foo")
-//      TAG-DIRECTIVE("!yaml","tag:yaml.org,2002:")
-//      DOCUMENT-START
-//      STREAM-END
-//
-// Note that the VERSION-DIRECTIVE and TAG-DIRECTIVE tokens occupy a whole
-// line.
-//
-// The document start and end indicators are represented by:
-//
-//      DOCUMENT-START
-//      DOCUMENT-END
-//
-// Note that if a YAML stream contains an implicit document (without '---'
-// and '...' indicators), no DOCUMENT-START and DOCUMENT-END tokens will be
-// produced.
-//
-// In the following examples, we present whole documents together with the
-// produced tokens.
-//
-//      1. An implicit document:
-//
-//          'a scalar'
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          SCALAR("a scalar",single-quoted)
-//          STREAM-END
-//
-//      2. An explicit document:
-//
-//          ---
-//          'a scalar'
-//          ...
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          DOCUMENT-START
-//          SCALAR("a scalar",single-quoted)
-//          DOCUMENT-END
-//          STREAM-END
-//
-//      3. Several documents in a stream:
-//
-//          'a scalar'
-//          ---
-//          'another scalar'
-//          ---
-//          'yet another scalar'
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          SCALAR("a scalar",single-quoted)
-//          DOCUMENT-START
-//          SCALAR("another scalar",single-quoted)
-//          DOCUMENT-START
-//          SCALAR("yet another scalar",single-quoted)
-//          STREAM-END
-//
-// We have already introduced the SCALAR token above.  The following tokens are
-// used to describe aliases, anchors, tag, and scalars:
-//
-//      ALIAS(anchor)
-//      ANCHOR(anchor)
-//      TAG(handle,suffix)
-//      SCALAR(value,style)
-//
-// The following series of examples illustrate the usage of these tokens:
-//
-//      1. A recursive sequence:
-//
-//          &A [ *A ]
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          ANCHOR("A")
-//          FLOW-SEQUENCE-START
-//          ALIAS("A")
-//          FLOW-SEQUENCE-END
-//          STREAM-END
-//
-//      2. A tagged scalar:
-//
-//          !!float "3.14"  # A good approximation.
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          TAG("!!","float")
-//          SCALAR("3.14",double-quoted)
-//          STREAM-END
-//
-//      3. Various scalar styles:
-//
-//          --- # Implicit empty plain scalars do not produce tokens.
-//          --- a plain scalar
-//          --- 'a single-quoted scalar'
-//          --- "a double-quoted scalar"
-//          --- |-
-//            a literal scalar
-//          --- >-
-//            a folded
-//            scalar
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          DOCUMENT-START
-//          DOCUMENT-START
-//          SCALAR("a plain scalar",plain)
-//          DOCUMENT-START
-//          SCALAR("a single-quoted scalar",single-quoted)
-//          DOCUMENT-START
-//          SCALAR("a double-quoted scalar",double-quoted)
-//          DOCUMENT-START
-//          SCALAR("a literal scalar",literal)
-//          DOCUMENT-START
-//          SCALAR("a folded scalar",folded)
-//          STREAM-END
-//
-// Now it's time to review collection-related tokens. We will start with
-// flow collections:
-//
-//      FLOW-SEQUENCE-START
-//      FLOW-SEQUENCE-END
-//      FLOW-MAPPING-START
-//      FLOW-MAPPING-END
-//      FLOW-ENTRY
-//      KEY
-//      VALUE
-//
-// The tokens FLOW-SEQUENCE-START, FLOW-SEQUENCE-END, FLOW-MAPPING-START, and
-// FLOW-MAPPING-END represent the indicators '[', ']', '{', and '}'
-// correspondingly.  FLOW-ENTRY represent the ',' indicator.  Finally the
-// indicators '?' and ':', which are used for denoting mapping keys and values,
-// are represented by the KEY and VALUE tokens.
-//
-// The following examples show flow collections:
-//
-//      1. A flow sequence:
-//
-//          [item 1, item 2, item 3]
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          FLOW-SEQUENCE-START
-//          SCALAR("item 1",plain)
-//          FLOW-ENTRY
-//          SCALAR("item 2",plain)
-//          FLOW-ENTRY
-//          SCALAR("item 3",plain)
-//          FLOW-SEQUENCE-END
-//          STREAM-END
-//
-//      2. A flow mapping:
-//
-//          {
-//              a simple key: a value,  # Note that the KEY token is produced.
-//              ? a complex key: another value,
-//          }
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          FLOW-MAPPING-START
-//          KEY
-//          SCALAR("a simple key",plain)
-//          VALUE
-//          SCALAR("a value",plain)
-//          FLOW-ENTRY
-//          KEY
-//          SCALAR("a complex key",plain)
-//          VALUE
-//          SCALAR("another value",plain)
-//          FLOW-ENTRY
-//          FLOW-MAPPING-END
-//          STREAM-END
-//
-// A simple key is a key which is not denoted by the '?' indicator.  Note that
-// the Scanner still produce the KEY token whenever it encounters a simple key.
-//
-// For scanning block collections, the following tokens are used (note that we
-// repeat KEY and VALUE here):
-//
-//      BLOCK-SEQUENCE-START
-//      BLOCK-MAPPING-START
-//      BLOCK-END
-//      BLOCK-ENTRY
-//      KEY
-//      VALUE
-//
-// The tokens BLOCK-SEQUENCE-START and BLOCK-MAPPING-START denote indentation
-// increase that precedes a block collection (cf. the INDENT token in Python).
-// The token BLOCK-END denote indentation decrease that ends a block collection
-// (cf. the DEDENT token in Python).  However YAML has some syntax pecularities
-// that makes detections of these tokens more complex.
-//
-// The tokens BLOCK-ENTRY, KEY, and VALUE are used to represent the indicators
-// '-', '?', and ':' correspondingly.
-//
-// The following examples show how the tokens BLOCK-SEQUENCE-START,
-// BLOCK-MAPPING-START, and BLOCK-END are emitted by the Scanner:
-//
-//      1. Block sequences:
-//
-//          - item 1
-//          - item 2
-//          -
-//            - item 3.1
-//            - item 3.2
-//          -
-//            key 1: value 1
-//            key 2: value 2
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 2",plain)
-//          BLOCK-ENTRY
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 3.1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 3.2",plain)
-//          BLOCK-END
-//          BLOCK-ENTRY
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("key 1",plain)
-//          VALUE
-//          SCALAR("value 1",plain)
-//          KEY
-//          SCALAR("key 2",plain)
-//          VALUE
-//          SCALAR("value 2",plain)
-//          BLOCK-END
-//          BLOCK-END
-//          STREAM-END
-//
-//      2. Block mappings:
-//
-//          a simple key: a value   # The KEY token is produced here.
-//          ? a complex key
-//          : another value
-//          a mapping:
-//            key 1: value 1
-//            key 2: value 2
-//          a sequence:
-//            - item 1
-//            - item 2
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("a simple key",plain)
-//          VALUE
-//          SCALAR("a value",plain)
-//          KEY
-//          SCALAR("a complex key",plain)
-//          VALUE
-//          SCALAR("another value",plain)
-//          KEY
-//          SCALAR("a mapping",plain)
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("key 1",plain)
-//          VALUE
-//          SCALAR("value 1",plain)
-//          KEY
-//          SCALAR("key 2",plain)
-//          VALUE
-//          SCALAR("value 2",plain)
-//          BLOCK-END
-//          KEY
-//          SCALAR("a sequence",plain)
-//          VALUE
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 2",plain)
-//          BLOCK-END
-//          BLOCK-END
-//          STREAM-END
-//
-// YAML does not always require to start a new block collection from a new
-// line.  If the current line contains only '-', '?', and ':' indicators, a new
-// block collection may start at the current line.  The following examples
-// illustrate this case:
-//
-//      1. Collections in a sequence:
-//
-//          - - item 1
-//            - item 2
-//          - key 1: value 1
-//            key 2: value 2
-//          - ? complex key
-//            : complex value
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 2",plain)
-//          BLOCK-END
-//          BLOCK-ENTRY
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("key 1",plain)
-//          VALUE
-//          SCALAR("value 1",plain)
-//          KEY
-//          SCALAR("key 2",plain)
-//          VALUE
-//          SCALAR("value 2",plain)
-//          BLOCK-END
-//          BLOCK-ENTRY
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("complex key")
-//          VALUE
-//          SCALAR("complex value")
-//          BLOCK-END
-//          BLOCK-END
-//          STREAM-END
-//
-//      2. Collections in a mapping:
-//
-//          ? a sequence
-//          : - item 1
-//            - item 2
-//          ? a mapping
-//          : key 1: value 1
-//            key 2: value 2
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("a sequence",plain)
-//          VALUE
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 2",plain)
-//          BLOCK-END
-//          KEY
-//          SCALAR("a mapping",plain)
-//          VALUE
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("key 1",plain)
-//          VALUE
-//          SCALAR("value 1",plain)
-//          KEY
-//          SCALAR("key 2",plain)
-//          VALUE
-//          SCALAR("value 2",plain)
-//          BLOCK-END
-//          BLOCK-END
-//          STREAM-END
-//
-// YAML also permits non-indented sequences if they are included into a block
-// mapping.  In this case, the token BLOCK-SEQUENCE-START is not produced:
-//
-//      key:
-//      - item 1    # BLOCK-SEQUENCE-START is NOT produced here.
-//      - item 2
-//
-// Tokens:
-//
-//      STREAM-START(utf-8)
-//      BLOCK-MAPPING-START
-//      KEY
-//      SCALAR("key",plain)
-//      VALUE
-//      BLOCK-ENTRY
-//      SCALAR("item 1",plain)
-//      BLOCK-ENTRY
-//      SCALAR("item 2",plain)
-//      BLOCK-END
-//
-
-// Ensure that the buffer contains the required number of characters.
-// Return true on success, false on failure (reader error or memory error).
-func cache(parser *yaml_parser_t, length int) bool {
-	// [Go] This was inlined: !cache(A, B) -> unread < B && !update(A, B)
-	return parser.unread >= length || yaml_parser_update_buffer(parser, length)
-}
-
-// Advance the buffer pointer.
-func skip(parser *yaml_parser_t) {
-	parser.mark.index++
-	parser.mark.column++
-	parser.unread--
-	parser.buffer_pos += width(parser.buffer[parser.buffer_pos])
-}
-
-func skip_line(parser *yaml_parser_t) {
-	if is_crlf(parser.buffer, parser.buffer_pos) {
-		parser.mark.index += 2
-		parser.mark.column = 0
-		parser.mark.line++
-		parser.unread -= 2
-		parser.buffer_pos += 2
-	} else if is_break(parser.buffer, parser.buffer_pos) {
-		parser.mark.index++
-		parser.mark.column = 0
-		parser.mark.line++
-		parser.unread--
-		parser.buffer_pos += width(parser.buffer[parser.buffer_pos])
-	}
-}
-
-// Copy a character to a string buffer and advance pointers.
-func read(parser *yaml_parser_t, s []byte) []byte {
-	w := width(parser.buffer[parser.buffer_pos])
-	if w == 0 {
-		panic("invalid character sequence")
-	}
-	if len(s) == 0 {
-		s = make([]byte, 0, 32)
-	}
-	if w == 1 && len(s)+w <= cap(s) {
-		s = s[:len(s)+1]
-		s[len(s)-1] = parser.buffer[parser.buffer_pos]
-		parser.buffer_pos++
-	} else {
-		s = append(s, parser.buffer[parser.buffer_pos:parser.buffer_pos+w]...)
-		parser.buffer_pos += w
-	}
-	parser.mark.index++
-	parser.mark.column++
-	parser.unread--
-	return s
-}
-
-// Copy a line break character to a string buffer and advance pointers.
-func read_line(parser *yaml_parser_t, s []byte) []byte {
-	buf := parser.buffer
-	pos := parser.buffer_pos
-	switch {
-	case buf[pos] == '\r' && buf[pos+1] == '\n':
-		// CR LF . LF
-		s = append(s, '\n')
-		parser.buffer_pos += 2
-		parser.mark.index++
-		parser.unread--
-	case buf[pos] == '\r' || buf[pos] == '\n':
-		// CR|LF . LF
-		s = append(s, '\n')
-		parser.buffer_pos += 1
-	case buf[pos] == '\xC2' && buf[pos+1] == '\x85':
-		// NEL . LF
-		s = append(s, '\n')
-		parser.buffer_pos += 2
-	case buf[pos] == '\xE2' && buf[pos+1] == '\x80' && (buf[pos+2] == '\xA8' || buf[pos+2] == '\xA9'):
-		// LS|PS . LS|PS
-		s = append(s, buf[parser.buffer_pos:pos+3]...)
-		parser.buffer_pos += 3
-	default:
-		return s
-	}
-	parser.mark.index++
-	parser.mark.column = 0
-	parser.mark.line++
-	parser.unread--
-	return s
-}
-
-// Get the next token.
-func yaml_parser_scan(parser *yaml_parser_t, token *yaml_token_t) bool {
-	// Erase the token object.
-	*token = yaml_token_t{} // [Go] Is this necessary?
-
-	// No tokens after STREAM-END or error.
-	if parser.stream_end_produced || parser.error != yaml_NO_ERROR {
-		return true
-	}
-
-	// Ensure that the tokens queue contains enough tokens.
-	if !parser.token_available {
-		if !yaml_parser_fetch_more_tokens(parser) {
-			return false
-		}
-	}
-
-	// Fetch the next token from the queue.
-	*token = parser.tokens[parser.tokens_head]
-	parser.tokens_head++
-	parser.tokens_parsed++
-	parser.token_available = false
-
-	if token.typ == yaml_STREAM_END_TOKEN {
-		parser.stream_end_produced = true
-	}
-	return true
-}
-
-// Set the scanner error and return false.
-func yaml_parser_set_scanner_error(parser *yaml_parser_t, context string, context_mark yaml_mark_t, problem string) bool {
-	parser.error = yaml_SCANNER_ERROR
-	parser.context = context
-	parser.context_mark = context_mark
-	parser.problem = problem
-	parser.problem_mark = parser.mark
-	return false
-}
-
-func yaml_parser_set_scanner_tag_error(parser *yaml_parser_t, directive bool, context_mark yaml_mark_t, problem string) bool {
-	context := "while parsing a tag"
-	if directive {
-		context = "while parsing a %TAG directive"
-	}
-	return yaml_parser_set_scanner_error(parser, context, context_mark, problem)
-}
-
-func trace(args ...interface{}) func() {
-	pargs := append([]interface{}{"+++"}, args...)
-	fmt.Println(pargs...)
-	pargs = append([]interface{}{"---"}, args...)
-	return func() { fmt.Println(pargs...) }
-}
-
-// Ensure that the tokens queue contains at least one token which can be
-// returned to the Parser.
-func yaml_parser_fetch_more_tokens(parser *yaml_parser_t) bool {
-	// While we need more tokens to fetch, do it.
-	for {
-		// Check if we really need to fetch more tokens.
-		need_more_tokens := false
-
-		if parser.tokens_head == len(parser.tokens) {
-			// Queue is empty.
-			need_more_tokens = true
-		} else {
-			// Check if any potential simple key may occupy the head position.
-			if !yaml_parser_stale_simple_keys(parser) {
-				return false
-			}
-
-			for i := range parser.simple_keys {
-				simple_key := &parser.simple_keys[i]
-				if simple_key.possible && simple_key.token_number == parser.tokens_parsed {
-					need_more_tokens = true
-					break
-				}
-			}
-		}
-
-		// We are finished.
-		if !need_more_tokens {
-			break
-		}
-		// Fetch the next token.
-		if !yaml_parser_fetch_next_token(parser) {
-			return false
-		}
-	}
-
-	parser.token_available = true
-	return true
-}
-
-// The dispatcher for token fetchers.
-func yaml_parser_fetch_next_token(parser *yaml_parser_t) bool {
-	// Ensure that the buffer is initialized.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	// Check if we just started scanning.  Fetch STREAM-START then.
-	if !parser.stream_start_produced {
-		return yaml_parser_fetch_stream_start(parser)
-	}
-
-	// Eat whitespaces and comments until we reach the next token.
-	if !yaml_parser_scan_to_next_token(parser) {
-		return false
-	}
-
-	// Remove obsolete potential simple keys.
-	if !yaml_parser_stale_simple_keys(parser) {
-		return false
-	}
-
-	// Check the indentation level against the current column.
-	if !yaml_parser_unroll_indent(parser, parser.mark.column) {
-		return false
-	}
-
-	// Ensure that the buffer contains at least 4 characters.  4 is the length
-	// of the longest indicators ('--- ' and '... ').
-	if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) {
-		return false
-	}
-
-	// Is it the end of the stream?
-	if is_z(parser.buffer, parser.buffer_pos) {
-		return yaml_parser_fetch_stream_end(parser)
-	}
-
-	// Is it a directive?
-	if parser.mark.column == 0 && parser.buffer[parser.buffer_pos] == '%' {
-		return yaml_parser_fetch_directive(parser)
-	}
-
-	buf := parser.buffer
-	pos := parser.buffer_pos
-
-	// Is it the document start indicator?
-	if parser.mark.column == 0 && buf[pos] == '-' && buf[pos+1] == '-' && buf[pos+2] == '-' && is_blankz(buf, pos+3) {
-		return yaml_parser_fetch_document_indicator(parser, yaml_DOCUMENT_START_TOKEN)
-	}
-
-	// Is it the document end indicator?
-	if parser.mark.column == 0 && buf[pos] == '.' && buf[pos+1] == '.' && buf[pos+2] == '.' && is_blankz(buf, pos+3) {
-		return yaml_parser_fetch_document_indicator(parser, yaml_DOCUMENT_END_TOKEN)
-	}
-
-	// Is it the flow sequence start indicator?
-	if buf[pos] == '[' {
-		return yaml_parser_fetch_flow_collection_start(parser, yaml_FLOW_SEQUENCE_START_TOKEN)
-	}
-
-	// Is it the flow mapping start indicator?
-	if parser.buffer[parser.buffer_pos] == '{' {
-		return yaml_parser_fetch_flow_collection_start(parser, yaml_FLOW_MAPPING_START_TOKEN)
-	}
-
-	// Is it the flow sequence end indicator?
-	if parser.buffer[parser.buffer_pos] == ']' {
-		return yaml_parser_fetch_flow_collection_end(parser,
-			yaml_FLOW_SEQUENCE_END_TOKEN)
-	}
-
-	// Is it the flow mapping end indicator?
-	if parser.buffer[parser.buffer_pos] == '}' {
-		return yaml_parser_fetch_flow_collection_end(parser,
-			yaml_FLOW_MAPPING_END_TOKEN)
-	}
-
-	// Is it the flow entry indicator?
-	if parser.buffer[parser.buffer_pos] == ',' {
-		return yaml_parser_fetch_flow_entry(parser)
-	}
-
-	// Is it the block entry indicator?
-	if parser.buffer[parser.buffer_pos] == '-' && is_blankz(parser.buffer, parser.buffer_pos+1) {
-		return yaml_parser_fetch_block_entry(parser)
-	}
-
-	// Is it the key indicator?
-	if parser.buffer[parser.buffer_pos] == '?' && (parser.flow_level > 0 || is_blankz(parser.buffer, parser.buffer_pos+1)) {
-		return yaml_parser_fetch_key(parser)
-	}
-
-	// Is it the value indicator?
-	if parser.buffer[parser.buffer_pos] == ':' && (parser.flow_level > 0 || is_blankz(parser.buffer, parser.buffer_pos+1)) {
-		return yaml_parser_fetch_value(parser)
-	}
-
-	// Is it an alias?
-	if parser.buffer[parser.buffer_pos] == '*' {
-		return yaml_parser_fetch_anchor(parser, yaml_ALIAS_TOKEN)
-	}
-
-	// Is it an anchor?
-	if parser.buffer[parser.buffer_pos] == '&' {
-		return yaml_parser_fetch_anchor(parser, yaml_ANCHOR_TOKEN)
-	}
-
-	// Is it a tag?
-	if parser.buffer[parser.buffer_pos] == '!' {
-		return yaml_parser_fetch_tag(parser)
-	}
-
-	// Is it a literal scalar?
-	if parser.buffer[parser.buffer_pos] == '|' && parser.flow_level == 0 {
-		return yaml_parser_fetch_block_scalar(parser, true)
-	}
-
-	// Is it a folded scalar?
-	if parser.buffer[parser.buffer_pos] == '>' && parser.flow_level == 0 {
-		return yaml_parser_fetch_block_scalar(parser, false)
-	}
-
-	// Is it a single-quoted scalar?
-	if parser.buffer[parser.buffer_pos] == '\'' {
-		return yaml_parser_fetch_flow_scalar(parser, true)
-	}
-
-	// Is it a double-quoted scalar?
-	if parser.buffer[parser.buffer_pos] == '"' {
-		return yaml_parser_fetch_flow_scalar(parser, false)
-	}
-
-	// Is it a plain scalar?
-	//
-	// A plain scalar may start with any non-blank characters except
-	//
-	//      '-', '?', ':', ',', '[', ']', '{', '}',
-	//      '#', '&', '*', '!', '|', '>', '\'', '\"',
-	//      '%', '@', '`'.
-	//
-	// In the block context (and, for the '-' indicator, in the flow context
-	// too), it may also start with the characters
-	//
-	//      '-', '?', ':'
-	//
-	// if it is followed by a non-space character.
-	//
-	// The last rule is more restrictive than the specification requires.
-	// [Go] Make this logic more reasonable.
-	//switch parser.buffer[parser.buffer_pos] {
-	//case '-', '?', ':', ',', '?', '-', ',', ':', ']', '[', '}', '{', '&', '#', '!', '*', '>', '|', '"', '\'', '@', '%', '-', '`':
-	//}
-	if !(is_blankz(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == '-' ||
-		parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == ':' ||
-		parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == '[' ||
-		parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '{' ||
-		parser.buffer[parser.buffer_pos] == '}' || parser.buffer[parser.buffer_pos] == '#' ||
-		parser.buffer[parser.buffer_pos] == '&' || parser.buffer[parser.buffer_pos] == '*' ||
-		parser.buffer[parser.buffer_pos] == '!' || parser.buffer[parser.buffer_pos] == '|' ||
-		parser.buffer[parser.buffer_pos] == '>' || parser.buffer[parser.buffer_pos] == '\'' ||
-		parser.buffer[parser.buffer_pos] == '"' || parser.buffer[parser.buffer_pos] == '%' ||
-		parser.buffer[parser.buffer_pos] == '@' || parser.buffer[parser.buffer_pos] == '`') ||
-		(parser.buffer[parser.buffer_pos] == '-' && !is_blank(parser.buffer, parser.buffer_pos+1)) ||
-		(parser.flow_level == 0 &&
-			(parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == ':') &&
-			!is_blankz(parser.buffer, parser.buffer_pos+1)) {
-		return yaml_parser_fetch_plain_scalar(parser)
-	}
-
-	// If we don't determine the token type so far, it is an error.
-	return yaml_parser_set_scanner_error(parser,
-		"while scanning for the next token", parser.mark,
-		"found character that cannot start any token")
-}
-
-// Check the list of potential simple keys and remove the positions that
-// cannot contain simple keys anymore.
-func yaml_parser_stale_simple_keys(parser *yaml_parser_t) bool {
-	// Check for a potential simple key for each flow level.
-	for i := range parser.simple_keys {
-		simple_key := &parser.simple_keys[i]
-
-		// The specification requires that a simple key
-		//
-		//  - is limited to a single line,
-		//  - is shorter than 1024 characters.
-		if simple_key.possible && (simple_key.mark.line < parser.mark.line || simple_key.mark.index+1024 < parser.mark.index) {
-
-			// Check if the potential simple key to be removed is required.
-			if simple_key.required {
-				return yaml_parser_set_scanner_error(parser,
-					"while scanning a simple key", simple_key.mark,
-					"could not find expected ':'")
-			}
-			simple_key.possible = false
-		}
-	}
-	return true
-}
-
-// Check if a simple key may start at the current position and add it if
-// needed.
-func yaml_parser_save_simple_key(parser *yaml_parser_t) bool {
-	// A simple key is required at the current position if the scanner is in
-	// the block context and the current column coincides with the indentation
-	// level.
-
-	required := parser.flow_level == 0 && parser.indent == parser.mark.column
-
-	// A simple key is required only when it is the first token in the current
-	// line.  Therefore it is always allowed.  But we add a check anyway.
-	if required && !parser.simple_key_allowed {
-		panic("should not happen")
-	}
-
-	//
-	// If the current position may start a simple key, save it.
-	//
-	if parser.simple_key_allowed {
-		simple_key := yaml_simple_key_t{
-			possible:     true,
-			required:     required,
-			token_number: parser.tokens_parsed + (len(parser.tokens) - parser.tokens_head),
-		}
-		simple_key.mark = parser.mark
-
-		if !yaml_parser_remove_simple_key(parser) {
-			return false
-		}
-		parser.simple_keys[len(parser.simple_keys)-1] = simple_key
-	}
-	return true
-}
-
-// Remove a potential simple key at the current flow level.
-func yaml_parser_remove_simple_key(parser *yaml_parser_t) bool {
-	i := len(parser.simple_keys) - 1
-	if parser.simple_keys[i].possible {
-		// If the key is required, it is an error.
-		if parser.simple_keys[i].required {
-			return yaml_parser_set_scanner_error(parser,
-				"while scanning a simple key", parser.simple_keys[i].mark,
-				"could not find expected ':'")
-		}
-	}
-	// Remove the key from the stack.
-	parser.simple_keys[i].possible = false
-	return true
-}
-
-// Increase the flow level and resize the simple key list if needed.
-func yaml_parser_increase_flow_level(parser *yaml_parser_t) bool {
-	// Reset the simple key on the next level.
-	parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{})
-
-	// Increase the flow level.
-	parser.flow_level++
-	return true
-}
-
-// Decrease the flow level.
-func yaml_parser_decrease_flow_level(parser *yaml_parser_t) bool {
-	if parser.flow_level > 0 {
-		parser.flow_level--
-		parser.simple_keys = parser.simple_keys[:len(parser.simple_keys)-1]
-	}
-	return true
-}
-
-// Push the current indentation level to the stack and set the new level
-// the current column is greater than the indentation level.  In this case,
-// append or insert the specified token into the token queue.
-func yaml_parser_roll_indent(parser *yaml_parser_t, column, number int, typ yaml_token_type_t, mark yaml_mark_t) bool {
-	// In the flow context, do nothing.
-	if parser.flow_level > 0 {
-		return true
-	}
-
-	if parser.indent < column {
-		// Push the current indentation level to the stack and set the new
-		// indentation level.
-		parser.indents = append(parser.indents, parser.indent)
-		parser.indent = column
-
-		// Create a token and insert it into the queue.
-		token := yaml_token_t{
-			typ:        typ,
-			start_mark: mark,
-			end_mark:   mark,
-		}
-		if number > -1 {
-			number -= parser.tokens_parsed
-		}
-		yaml_insert_token(parser, number, &token)
-	}
-	return true
-}
-
-// Pop indentation levels from the indents stack until the current level
-// becomes less or equal to the column.  For each indentation level, append
-// the BLOCK-END token.
-func yaml_parser_unroll_indent(parser *yaml_parser_t, column int) bool {
-	// In the flow context, do nothing.
-	if parser.flow_level > 0 {
-		return true
-	}
-
-	// Loop through the indentation levels in the stack.
-	for parser.indent > column {
-		// Create a token and append it to the queue.
-		token := yaml_token_t{
-			typ:        yaml_BLOCK_END_TOKEN,
-			start_mark: parser.mark,
-			end_mark:   parser.mark,
-		}
-		yaml_insert_token(parser, -1, &token)
-
-		// Pop the indentation level.
-		parser.indent = parser.indents[len(parser.indents)-1]
-		parser.indents = parser.indents[:len(parser.indents)-1]
-	}
-	return true
-}
-
-// Initialize the scanner and produce the STREAM-START token.
-func yaml_parser_fetch_stream_start(parser *yaml_parser_t) bool {
-
-	// Set the initial indentation.
-	parser.indent = -1
-
-	// Initialize the simple key stack.
-	parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{})
-
-	// A simple key is allowed at the beginning of the stream.
-	parser.simple_key_allowed = true
-
-	// We have started.
-	parser.stream_start_produced = true
-
-	// Create the STREAM-START token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_STREAM_START_TOKEN,
-		start_mark: parser.mark,
-		end_mark:   parser.mark,
-		encoding:   parser.encoding,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the STREAM-END token and shut down the scanner.
-func yaml_parser_fetch_stream_end(parser *yaml_parser_t) bool {
-
-	// Force new line.
-	if parser.mark.column != 0 {
-		parser.mark.column = 0
-		parser.mark.line++
-	}
-
-	// Reset the indentation level.
-	if !yaml_parser_unroll_indent(parser, -1) {
-		return false
-	}
-
-	// Reset simple keys.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	parser.simple_key_allowed = false
-
-	// Create the STREAM-END token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_STREAM_END_TOKEN,
-		start_mark: parser.mark,
-		end_mark:   parser.mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce a VERSION-DIRECTIVE or TAG-DIRECTIVE token.
-func yaml_parser_fetch_directive(parser *yaml_parser_t) bool {
-	// Reset the indentation level.
-	if !yaml_parser_unroll_indent(parser, -1) {
-		return false
-	}
-
-	// Reset simple keys.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	parser.simple_key_allowed = false
-
-	// Create the YAML-DIRECTIVE or TAG-DIRECTIVE token.
-	token := yaml_token_t{}
-	if !yaml_parser_scan_directive(parser, &token) {
-		return false
-	}
-	// Append the token to the queue.
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the DOCUMENT-START or DOCUMENT-END token.
-func yaml_parser_fetch_document_indicator(parser *yaml_parser_t, typ yaml_token_type_t) bool {
-	// Reset the indentation level.
-	if !yaml_parser_unroll_indent(parser, -1) {
-		return false
-	}
-
-	// Reset simple keys.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	parser.simple_key_allowed = false
-
-	// Consume the token.
-	start_mark := parser.mark
-
-	skip(parser)
-	skip(parser)
-	skip(parser)
-
-	end_mark := parser.mark
-
-	// Create the DOCUMENT-START or DOCUMENT-END token.
-	token := yaml_token_t{
-		typ:        typ,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	// Append the token to the queue.
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the FLOW-SEQUENCE-START or FLOW-MAPPING-START token.
-func yaml_parser_fetch_flow_collection_start(parser *yaml_parser_t, typ yaml_token_type_t) bool {
-	// The indicators '[' and '{' may start a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// Increase the flow level.
-	if !yaml_parser_increase_flow_level(parser) {
-		return false
-	}
-
-	// A simple key may follow the indicators '[' and '{'.
-	parser.simple_key_allowed = true
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the FLOW-SEQUENCE-START of FLOW-MAPPING-START token.
-	token := yaml_token_t{
-		typ:        typ,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	// Append the token to the queue.
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the FLOW-SEQUENCE-END or FLOW-MAPPING-END token.
-func yaml_parser_fetch_flow_collection_end(parser *yaml_parser_t, typ yaml_token_type_t) bool {
-	// Reset any potential simple key on the current flow level.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// Decrease the flow level.
-	if !yaml_parser_decrease_flow_level(parser) {
-		return false
-	}
-
-	// No simple keys after the indicators ']' and '}'.
-	parser.simple_key_allowed = false
-
-	// Consume the token.
-
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the FLOW-SEQUENCE-END of FLOW-MAPPING-END token.
-	token := yaml_token_t{
-		typ:        typ,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	// Append the token to the queue.
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the FLOW-ENTRY token.
-func yaml_parser_fetch_flow_entry(parser *yaml_parser_t) bool {
-	// Reset any potential simple keys on the current flow level.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// Simple keys are allowed after ','.
-	parser.simple_key_allowed = true
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the FLOW-ENTRY token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_FLOW_ENTRY_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the BLOCK-ENTRY token.
-func yaml_parser_fetch_block_entry(parser *yaml_parser_t) bool {
-	// Check if the scanner is in the block context.
-	if parser.flow_level == 0 {
-		// Check if we are allowed to start a new entry.
-		if !parser.simple_key_allowed {
-			return yaml_parser_set_scanner_error(parser, "", parser.mark,
-				"block sequence entries are not allowed in this context")
-		}
-		// Add the BLOCK-SEQUENCE-START token if needed.
-		if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_SEQUENCE_START_TOKEN, parser.mark) {
-			return false
-		}
-	} else {
-		// It is an error for the '-' indicator to occur in the flow context,
-		// but we let the Parser detect and report about it because the Parser
-		// is able to point to the context.
-	}
-
-	// Reset any potential simple keys on the current flow level.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// Simple keys are allowed after '-'.
-	parser.simple_key_allowed = true
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the BLOCK-ENTRY token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_BLOCK_ENTRY_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the KEY token.
-func yaml_parser_fetch_key(parser *yaml_parser_t) bool {
-
-	// In the block context, additional checks are required.
-	if parser.flow_level == 0 {
-		// Check if we are allowed to start a new key (not nessesary simple).
-		if !parser.simple_key_allowed {
-			return yaml_parser_set_scanner_error(parser, "", parser.mark,
-				"mapping keys are not allowed in this context")
-		}
-		// Add the BLOCK-MAPPING-START token if needed.
-		if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_MAPPING_START_TOKEN, parser.mark) {
-			return false
-		}
-	}
-
-	// Reset any potential simple keys on the current flow level.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// Simple keys are allowed after '?' in the block context.
-	parser.simple_key_allowed = parser.flow_level == 0
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the KEY token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_KEY_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the VALUE token.
-func yaml_parser_fetch_value(parser *yaml_parser_t) bool {
-
-	simple_key := &parser.simple_keys[len(parser.simple_keys)-1]
-
-	// Have we found a simple key?
-	if simple_key.possible {
-		// Create the KEY token and insert it into the queue.
-		token := yaml_token_t{
-			typ:        yaml_KEY_TOKEN,
-			start_mark: simple_key.mark,
-			end_mark:   simple_key.mark,
-		}
-		yaml_insert_token(parser, simple_key.token_number-parser.tokens_parsed, &token)
-
-		// In the block context, we may need to add the BLOCK-MAPPING-START token.
-		if !yaml_parser_roll_indent(parser, simple_key.mark.column,
-			simple_key.token_number,
-			yaml_BLOCK_MAPPING_START_TOKEN, simple_key.mark) {
-			return false
-		}
-
-		// Remove the simple key.
-		simple_key.possible = false
-
-		// A simple key cannot follow another simple key.
-		parser.simple_key_allowed = false
-
-	} else {
-		// The ':' indicator follows a complex key.
-
-		// In the block context, extra checks are required.
-		if parser.flow_level == 0 {
-
-			// Check if we are allowed to start a complex value.
-			if !parser.simple_key_allowed {
-				return yaml_parser_set_scanner_error(parser, "", parser.mark,
-					"mapping values are not allowed in this context")
-			}
-
-			// Add the BLOCK-MAPPING-START token if needed.
-			if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_MAPPING_START_TOKEN, parser.mark) {
-				return false
-			}
-		}
-
-		// Simple keys after ':' are allowed in the block context.
-		parser.simple_key_allowed = parser.flow_level == 0
-	}
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the VALUE token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_VALUE_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the ALIAS or ANCHOR token.
-func yaml_parser_fetch_anchor(parser *yaml_parser_t, typ yaml_token_type_t) bool {
-	// An anchor or an alias could be a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// A simple key cannot follow an anchor or an alias.
-	parser.simple_key_allowed = false
-
-	// Create the ALIAS or ANCHOR token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_anchor(parser, &token, typ) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the TAG token.
-func yaml_parser_fetch_tag(parser *yaml_parser_t) bool {
-	// A tag could be a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// A simple key cannot follow a tag.
-	parser.simple_key_allowed = false
-
-	// Create the TAG token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_tag(parser, &token) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the SCALAR(...,literal) or SCALAR(...,folded) tokens.
-func yaml_parser_fetch_block_scalar(parser *yaml_parser_t, literal bool) bool {
-	// Remove any potential simple keys.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// A simple key may follow a block scalar.
-	parser.simple_key_allowed = true
-
-	// Create the SCALAR token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_block_scalar(parser, &token, literal) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the SCALAR(...,single-quoted) or SCALAR(...,double-quoted) tokens.
-func yaml_parser_fetch_flow_scalar(parser *yaml_parser_t, single bool) bool {
-	// A plain scalar could be a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// A simple key cannot follow a flow scalar.
-	parser.simple_key_allowed = false
-
-	// Create the SCALAR token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_flow_scalar(parser, &token, single) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the SCALAR(...,plain) token.
-func yaml_parser_fetch_plain_scalar(parser *yaml_parser_t) bool {
-	// A plain scalar could be a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// A simple key cannot follow a flow scalar.
-	parser.simple_key_allowed = false
-
-	// Create the SCALAR token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_plain_scalar(parser, &token) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Eat whitespaces and comments until the next token is found.
-func yaml_parser_scan_to_next_token(parser *yaml_parser_t) bool {
-
-	// Until the next token is not found.
-	for {
-		// Allow the BOM mark to start a line.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		if parser.mark.column == 0 && is_bom(parser.buffer, parser.buffer_pos) {
-			skip(parser)
-		}
-
-		// Eat whitespaces.
-		// Tabs are allowed:
-		//  - in the flow context
-		//  - in the block context, but not at the beginning of the line or
-		//  after '-', '?', or ':' (complex value).
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-
-		for parser.buffer[parser.buffer_pos] == ' ' || ((parser.flow_level > 0 || !parser.simple_key_allowed) && parser.buffer[parser.buffer_pos] == '\t') {
-			skip(parser)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-
-		// Eat a comment until a line break.
-		if parser.buffer[parser.buffer_pos] == '#' {
-			for !is_breakz(parser.buffer, parser.buffer_pos) {
-				skip(parser)
-				if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-					return false
-				}
-			}
-		}
-
-		// If it is a line break, eat it.
-		if is_break(parser.buffer, parser.buffer_pos) {
-			if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-				return false
-			}
-			skip_line(parser)
-
-			// In the block context, a new line may start a simple key.
-			if parser.flow_level == 0 {
-				parser.simple_key_allowed = true
-			}
-		} else {
-			break // We have found a token.
-		}
-	}
-
-	return true
-}
-
-// Scan a YAML-DIRECTIVE or TAG-DIRECTIVE token.
-//
-// Scope:
-//      %YAML    1.1    # a comment \n
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-//      %TAG    !yaml!  tag:yaml.org,2002:  \n
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-//
-func yaml_parser_scan_directive(parser *yaml_parser_t, token *yaml_token_t) bool {
-	// Eat '%'.
-	start_mark := parser.mark
-	skip(parser)
-
-	// Scan the directive name.
-	var name []byte
-	if !yaml_parser_scan_directive_name(parser, start_mark, &name) {
-		return false
-	}
-
-	// Is it a YAML directive?
-	if bytes.Equal(name, []byte("YAML")) {
-		// Scan the VERSION directive value.
-		var major, minor int8
-		if !yaml_parser_scan_version_directive_value(parser, start_mark, &major, &minor) {
-			return false
-		}
-		end_mark := parser.mark
-
-		// Create a VERSION-DIRECTIVE token.
-		*token = yaml_token_t{
-			typ:        yaml_VERSION_DIRECTIVE_TOKEN,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			major:      major,
-			minor:      minor,
-		}
-
-		// Is it a TAG directive?
-	} else if bytes.Equal(name, []byte("TAG")) {
-		// Scan the TAG directive value.
-		var handle, prefix []byte
-		if !yaml_parser_scan_tag_directive_value(parser, start_mark, &handle, &prefix) {
-			return false
-		}
-		end_mark := parser.mark
-
-		// Create a TAG-DIRECTIVE token.
-		*token = yaml_token_t{
-			typ:        yaml_TAG_DIRECTIVE_TOKEN,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			value:      handle,
-			prefix:     prefix,
-		}
-
-		// Unknown directive.
-	} else {
-		yaml_parser_set_scanner_error(parser, "while scanning a directive",
-			start_mark, "found unknown directive name")
-		return false
-	}
-
-	// Eat the rest of the line including any comments.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	if parser.buffer[parser.buffer_pos] == '#' {
-		for !is_breakz(parser.buffer, parser.buffer_pos) {
-			skip(parser)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-	}
-
-	// Check if we are at the end of the line.
-	if !is_breakz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a directive",
-			start_mark, "did not find expected comment or line break")
-		return false
-	}
-
-	// Eat a line break.
-	if is_break(parser.buffer, parser.buffer_pos) {
-		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-			return false
-		}
-		skip_line(parser)
-	}
-
-	return true
-}
-
-// Scan the directive name.
-//
-// Scope:
-//      %YAML   1.1     # a comment \n
-//       ^^^^
-//      %TAG    !yaml!  tag:yaml.org,2002:  \n
-//       ^^^
-//
-func yaml_parser_scan_directive_name(parser *yaml_parser_t, start_mark yaml_mark_t, name *[]byte) bool {
-	// Consume the directive name.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	var s []byte
-	for is_alpha(parser.buffer, parser.buffer_pos) {
-		s = read(parser, s)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Check if the name is empty.
-	if len(s) == 0 {
-		yaml_parser_set_scanner_error(parser, "while scanning a directive",
-			start_mark, "could not find expected directive name")
-		return false
-	}
-
-	// Check for an blank character after the name.
-	if !is_blankz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a directive",
-			start_mark, "found unexpected non-alphabetical character")
-		return false
-	}
-	*name = s
-	return true
-}
-
-// Scan the value of VERSION-DIRECTIVE.
-//
-// Scope:
-//      %YAML   1.1     # a comment \n
-//           ^^^^^^
-func yaml_parser_scan_version_directive_value(parser *yaml_parser_t, start_mark yaml_mark_t, major, minor *int8) bool {
-	// Eat whitespaces.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Consume the major version number.
-	if !yaml_parser_scan_version_directive_number(parser, start_mark, major) {
-		return false
-	}
-
-	// Eat '.'.
-	if parser.buffer[parser.buffer_pos] != '.' {
-		return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
-			start_mark, "did not find expected digit or '.' character")
-	}
-
-	skip(parser)
-
-	// Consume the minor version number.
-	if !yaml_parser_scan_version_directive_number(parser, start_mark, minor) {
-		return false
-	}
-	return true
-}
-
-const max_number_length = 2
-
-// Scan the version number of VERSION-DIRECTIVE.
-//
-// Scope:
-//      %YAML   1.1     # a comment \n
-//              ^
-//      %YAML   1.1     # a comment \n
-//                ^
-func yaml_parser_scan_version_directive_number(parser *yaml_parser_t, start_mark yaml_mark_t, number *int8) bool {
-
-	// Repeat while the next character is digit.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	var value, length int8
-	for is_digit(parser.buffer, parser.buffer_pos) {
-		// Check if the number is too long.
-		length++
-		if length > max_number_length {
-			return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
-				start_mark, "found extremely long version number")
-		}
-		value = value*10 + int8(as_digit(parser.buffer, parser.buffer_pos))
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Check if the number was present.
-	if length == 0 {
-		return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
-			start_mark, "did not find expected version number")
-	}
-	*number = value
-	return true
-}
-
-// Scan the value of a TAG-DIRECTIVE token.
-//
-// Scope:
-//      %TAG    !yaml!  tag:yaml.org,2002:  \n
-//          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-//
-func yaml_parser_scan_tag_directive_value(parser *yaml_parser_t, start_mark yaml_mark_t, handle, prefix *[]byte) bool {
-	var handle_value, prefix_value []byte
-
-	// Eat whitespaces.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Scan a handle.
-	if !yaml_parser_scan_tag_handle(parser, true, start_mark, &handle_value) {
-		return false
-	}
-
-	// Expect a whitespace.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	if !is_blank(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive",
-			start_mark, "did not find expected whitespace")
-		return false
-	}
-
-	// Eat whitespaces.
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Scan a prefix.
-	if !yaml_parser_scan_tag_uri(parser, true, nil, start_mark, &prefix_value) {
-		return false
-	}
-
-	// Expect a whitespace or line break.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	if !is_blankz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive",
-			start_mark, "did not find expected whitespace or line break")
-		return false
-	}
-
-	*handle = handle_value
-	*prefix = prefix_value
-	return true
-}
-
-func yaml_parser_scan_anchor(parser *yaml_parser_t, token *yaml_token_t, typ yaml_token_type_t) bool {
-	var s []byte
-
-	// Eat the indicator character.
-	start_mark := parser.mark
-	skip(parser)
-
-	// Consume the value.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	for is_alpha(parser.buffer, parser.buffer_pos) {
-		s = read(parser, s)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	end_mark := parser.mark
-
-	/*
-	 * Check if length of the anchor is greater than 0 and it is followed by
-	 * a whitespace character or one of the indicators:
-	 *
-	 *      '?', ':', ',', ']', '}', '%', '@', '`'.
-	 */
-
-	if len(s) == 0 ||
-		!(is_blankz(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == '?' ||
-			parser.buffer[parser.buffer_pos] == ':' || parser.buffer[parser.buffer_pos] == ',' ||
-			parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '}' ||
-			parser.buffer[parser.buffer_pos] == '%' || parser.buffer[parser.buffer_pos] == '@' ||
-			parser.buffer[parser.buffer_pos] == '`') {
-		context := "while scanning an alias"
-		if typ == yaml_ANCHOR_TOKEN {
-			context = "while scanning an anchor"
-		}
-		yaml_parser_set_scanner_error(parser, context, start_mark,
-			"did not find expected alphabetic or numeric character")
-		return false
-	}
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        typ,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      s,
-	}
-
-	return true
-}
-
-/*
- * Scan a TAG token.
- */
-
-func yaml_parser_scan_tag(parser *yaml_parser_t, token *yaml_token_t) bool {
-	var handle, suffix []byte
-
-	start_mark := parser.mark
-
-	// Check if the tag is in the canonical form.
-	if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-		return false
-	}
-
-	if parser.buffer[parser.buffer_pos+1] == '<' {
-		// Keep the handle as ''
-
-		// Eat '!<'
-		skip(parser)
-		skip(parser)
-
-		// Consume the tag value.
-		if !yaml_parser_scan_tag_uri(parser, false, nil, start_mark, &suffix) {
-			return false
-		}
-
-		// Check for '>' and eat it.
-		if parser.buffer[parser.buffer_pos] != '>' {
-			yaml_parser_set_scanner_error(parser, "while scanning a tag",
-				start_mark, "did not find the expected '>'")
-			return false
-		}
-
-		skip(parser)
-	} else {
-		// The tag has either the '!suffix' or the '!handle!suffix' form.
-
-		// First, try to scan a handle.
-		if !yaml_parser_scan_tag_handle(parser, false, start_mark, &handle) {
-			return false
-		}
-
-		// Check if it is, indeed, handle.
-		if handle[0] == '!' && len(handle) > 1 && handle[len(handle)-1] == '!' {
-			// Scan the suffix now.
-			if !yaml_parser_scan_tag_uri(parser, false, nil, start_mark, &suffix) {
-				return false
-			}
-		} else {
-			// It wasn't a handle after all.  Scan the rest of the tag.
-			if !yaml_parser_scan_tag_uri(parser, false, handle, start_mark, &suffix) {
-				return false
-			}
-
-			// Set the handle to '!'.
-			handle = []byte{'!'}
-
-			// A special case: the '!' tag.  Set the handle to '' and the
-			// suffix to '!'.
-			if len(suffix) == 0 {
-				handle, suffix = suffix, handle
-			}
-		}
-	}
-
-	// Check the character which ends the tag.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	if !is_blankz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a tag",
-			start_mark, "did not find expected whitespace or line break")
-		return false
-	}
-
-	end_mark := parser.mark
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        yaml_TAG_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      handle,
-		suffix:     suffix,
-	}
-	return true
-}
-
-// Scan a tag handle.
-func yaml_parser_scan_tag_handle(parser *yaml_parser_t, directive bool, start_mark yaml_mark_t, handle *[]byte) bool {
-	// Check the initial '!' character.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	if parser.buffer[parser.buffer_pos] != '!' {
-		yaml_parser_set_scanner_tag_error(parser, directive,
-			start_mark, "did not find expected '!'")
-		return false
-	}
-
-	var s []byte
-
-	// Copy the '!' character.
-	s = read(parser, s)
-
-	// Copy all subsequent alphabetical and numerical characters.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	for is_alpha(parser.buffer, parser.buffer_pos) {
-		s = read(parser, s)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Check if the trailing character is '!' and copy it.
-	if parser.buffer[parser.buffer_pos] == '!' {
-		s = read(parser, s)
-	} else {
-		// It's either the '!' tag or not really a tag handle.  If it's a %TAG
-		// directive, it's an error.  If it's a tag token, it must be a part of URI.
-		if directive && string(s) != "!" {
-			yaml_parser_set_scanner_tag_error(parser, directive,
-				start_mark, "did not find expected '!'")
-			return false
-		}
-	}
-
-	*handle = s
-	return true
-}
-
-// Scan a tag.
-func yaml_parser_scan_tag_uri(parser *yaml_parser_t, directive bool, head []byte, start_mark yaml_mark_t, uri *[]byte) bool {
-	//size_t length = head ? strlen((char *)head) : 0
-	var s []byte
-	hasTag := len(head) > 0
-
-	// Copy the head if needed.
-	//
-	// Note that we don't copy the leading '!' character.
-	if len(head) > 1 {
-		s = append(s, head[1:]...)
-	}
-
-	// Scan the tag.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	// The set of characters that may appear in URI is as follows:
-	//
-	//      '0'-'9', 'A'-'Z', 'a'-'z', '_', '-', ';', '/', '?', ':', '@', '&',
-	//      '=', '+', '$', ',', '.', '!', '~', '*', '\'', '(', ')', '[', ']',
-	//      '%'.
-	// [Go] Convert this into more reasonable logic.
-	for is_alpha(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == ';' ||
-		parser.buffer[parser.buffer_pos] == '/' || parser.buffer[parser.buffer_pos] == '?' ||
-		parser.buffer[parser.buffer_pos] == ':' || parser.buffer[parser.buffer_pos] == '@' ||
-		parser.buffer[parser.buffer_pos] == '&' || parser.buffer[parser.buffer_pos] == '=' ||
-		parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '$' ||
-		parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == '.' ||
-		parser.buffer[parser.buffer_pos] == '!' || parser.buffer[parser.buffer_pos] == '~' ||
-		parser.buffer[parser.buffer_pos] == '*' || parser.buffer[parser.buffer_pos] == '\'' ||
-		parser.buffer[parser.buffer_pos] == '(' || parser.buffer[parser.buffer_pos] == ')' ||
-		parser.buffer[parser.buffer_pos] == '[' || parser.buffer[parser.buffer_pos] == ']' ||
-		parser.buffer[parser.buffer_pos] == '%' {
-		// Check if it is a URI-escape sequence.
-		if parser.buffer[parser.buffer_pos] == '%' {
-			if !yaml_parser_scan_uri_escapes(parser, directive, start_mark, &s) {
-				return false
-			}
-		} else {
-			s = read(parser, s)
-		}
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		hasTag = true
-	}
-
-	if !hasTag {
-		yaml_parser_set_scanner_tag_error(parser, directive,
-			start_mark, "did not find expected tag URI")
-		return false
-	}
-	*uri = s
-	return true
-}
-
-// Decode an URI-escape sequence corresponding to a single UTF-8 character.
-func yaml_parser_scan_uri_escapes(parser *yaml_parser_t, directive bool, start_mark yaml_mark_t, s *[]byte) bool {
-
-	// Decode the required number of characters.
-	w := 1024
-	for w > 0 {
-		// Check for a URI-escaped octet.
-		if parser.unread < 3 && !yaml_parser_update_buffer(parser, 3) {
-			return false
-		}
-
-		if !(parser.buffer[parser.buffer_pos] == '%' &&
-			is_hex(parser.buffer, parser.buffer_pos+1) &&
-			is_hex(parser.buffer, parser.buffer_pos+2)) {
-			return yaml_parser_set_scanner_tag_error(parser, directive,
-				start_mark, "did not find URI escaped octet")
-		}
-
-		// Get the octet.
-		octet := byte((as_hex(parser.buffer, parser.buffer_pos+1) << 4) + as_hex(parser.buffer, parser.buffer_pos+2))
-
-		// If it is the leading octet, determine the length of the UTF-8 sequence.
-		if w == 1024 {
-			w = width(octet)
-			if w == 0 {
-				return yaml_parser_set_scanner_tag_error(parser, directive,
-					start_mark, "found an incorrect leading UTF-8 octet")
-			}
-		} else {
-			// Check if the trailing octet is correct.
-			if octet&0xC0 != 0x80 {
-				return yaml_parser_set_scanner_tag_error(parser, directive,
-					start_mark, "found an incorrect trailing UTF-8 octet")
-			}
-		}
-
-		// Copy the octet and move the pointers.
-		*s = append(*s, octet)
-		skip(parser)
-		skip(parser)
-		skip(parser)
-		w--
-	}
-	return true
-}
-
-// Scan a block scalar.
-func yaml_parser_scan_block_scalar(parser *yaml_parser_t, token *yaml_token_t, literal bool) bool {
-	// Eat the indicator '|' or '>'.
-	start_mark := parser.mark
-	skip(parser)
-
-	// Scan the additional block scalar indicators.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	// Check for a chomping indicator.
-	var chomping, increment int
-	if parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '-' {
-		// Set the chomping method and eat the indicator.
-		if parser.buffer[parser.buffer_pos] == '+' {
-			chomping = +1
-		} else {
-			chomping = -1
-		}
-		skip(parser)
-
-		// Check for an indentation indicator.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		if is_digit(parser.buffer, parser.buffer_pos) {
-			// Check that the indentation is greater than 0.
-			if parser.buffer[parser.buffer_pos] == '0' {
-				yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-					start_mark, "found an indentation indicator equal to 0")
-				return false
-			}
-
-			// Get the indentation level and eat the indicator.
-			increment = as_digit(parser.buffer, parser.buffer_pos)
-			skip(parser)
-		}
-
-	} else if is_digit(parser.buffer, parser.buffer_pos) {
-		// Do the same as above, but in the opposite order.
-
-		if parser.buffer[parser.buffer_pos] == '0' {
-			yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-				start_mark, "found an indentation indicator equal to 0")
-			return false
-		}
-		increment = as_digit(parser.buffer, parser.buffer_pos)
-		skip(parser)
-
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		if parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '-' {
-			if parser.buffer[parser.buffer_pos] == '+' {
-				chomping = +1
-			} else {
-				chomping = -1
-			}
-			skip(parser)
-		}
-	}
-
-	// Eat whitespaces and comments to the end of the line.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-	if parser.buffer[parser.buffer_pos] == '#' {
-		for !is_breakz(parser.buffer, parser.buffer_pos) {
-			skip(parser)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-	}
-
-	// Check if we are at the end of the line.
-	if !is_breakz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-			start_mark, "did not find expected comment or line break")
-		return false
-	}
-
-	// Eat a line break.
-	if is_break(parser.buffer, parser.buffer_pos) {
-		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-			return false
-		}
-		skip_line(parser)
-	}
-
-	end_mark := parser.mark
-
-	// Set the indentation level if it was specified.
-	var indent int
-	if increment > 0 {
-		if parser.indent >= 0 {
-			indent = parser.indent + increment
-		} else {
-			indent = increment
-		}
-	}
-
-	// Scan the leading line breaks and determine the indentation level if needed.
-	var s, leading_break, trailing_breaks []byte
-	if !yaml_parser_scan_block_scalar_breaks(parser, &indent, &trailing_breaks, start_mark, &end_mark) {
-		return false
-	}
-
-	// Scan the block scalar content.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	var leading_blank, trailing_blank bool
-	for parser.mark.column == indent && !is_z(parser.buffer, parser.buffer_pos) {
-		// We are at the beginning of a non-empty line.
-
-		// Is it a trailing whitespace?
-		trailing_blank = is_blank(parser.buffer, parser.buffer_pos)
-
-		// Check if we need to fold the leading line break.
-		if !literal && !leading_blank && !trailing_blank && len(leading_break) > 0 && leading_break[0] == '\n' {
-			// Do we need to join the lines by space?
-			if len(trailing_breaks) == 0 {
-				s = append(s, ' ')
-			}
-		} else {
-			s = append(s, leading_break...)
-		}
-		leading_break = leading_break[:0]
-
-		// Append the remaining line breaks.
-		s = append(s, trailing_breaks...)
-		trailing_breaks = trailing_breaks[:0]
-
-		// Is it a leading whitespace?
-		leading_blank = is_blank(parser.buffer, parser.buffer_pos)
-
-		// Consume the current line.
-		for !is_breakz(parser.buffer, parser.buffer_pos) {
-			s = read(parser, s)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-
-		// Consume the line break.
-		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-			return false
-		}
-
-		leading_break = read_line(parser, leading_break)
-
-		// Eat the following indentation spaces and line breaks.
-		if !yaml_parser_scan_block_scalar_breaks(parser, &indent, &trailing_breaks, start_mark, &end_mark) {
-			return false
-		}
-	}
-
-	// Chomp the tail.
-	if chomping != -1 {
-		s = append(s, leading_break...)
-	}
-	if chomping == 1 {
-		s = append(s, trailing_breaks...)
-	}
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        yaml_SCALAR_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      s,
-		style:      yaml_LITERAL_SCALAR_STYLE,
-	}
-	if !literal {
-		token.style = yaml_FOLDED_SCALAR_STYLE
-	}
-	return true
-}
-
-// Scan indentation spaces and line breaks for a block scalar.  Determine the
-// indentation level if needed.
-func yaml_parser_scan_block_scalar_breaks(parser *yaml_parser_t, indent *int, breaks *[]byte, start_mark yaml_mark_t, end_mark *yaml_mark_t) bool {
-	*end_mark = parser.mark
-
-	// Eat the indentation spaces and line breaks.
-	max_indent := 0
-	for {
-		// Eat the indentation spaces.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		for (*indent == 0 || parser.mark.column < *indent) && is_space(parser.buffer, parser.buffer_pos) {
-			skip(parser)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-		if parser.mark.column > max_indent {
-			max_indent = parser.mark.column
-		}
-
-		// Check for a tab character messing the indentation.
-		if (*indent == 0 || parser.mark.column < *indent) && is_tab(parser.buffer, parser.buffer_pos) {
-			return yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-				start_mark, "found a tab character where an indentation space is expected")
-		}
-
-		// Have we found a non-empty line?
-		if !is_break(parser.buffer, parser.buffer_pos) {
-			break
-		}
-
-		// Consume the line break.
-		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-			return false
-		}
-		// [Go] Should really be returning breaks instead.
-		*breaks = read_line(parser, *breaks)
-		*end_mark = parser.mark
-	}
-
-	// Determine the indentation level if needed.
-	if *indent == 0 {
-		*indent = max_indent
-		if *indent < parser.indent+1 {
-			*indent = parser.indent + 1
-		}
-		if *indent < 1 {
-			*indent = 1
-		}
-	}
-	return true
-}
-
-// Scan a quoted scalar.
-func yaml_parser_scan_flow_scalar(parser *yaml_parser_t, token *yaml_token_t, single bool) bool {
-	// Eat the left quote.
-	start_mark := parser.mark
-	skip(parser)
-
-	// Consume the content of the quoted scalar.
-	var s, leading_break, trailing_breaks, whitespaces []byte
-	for {
-		// Check that there are no document indicators at the beginning of the line.
-		if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) {
-			return false
-		}
-
-		if parser.mark.column == 0 &&
-			((parser.buffer[parser.buffer_pos+0] == '-' &&
-				parser.buffer[parser.buffer_pos+1] == '-' &&
-				parser.buffer[parser.buffer_pos+2] == '-') ||
-				(parser.buffer[parser.buffer_pos+0] == '.' &&
-					parser.buffer[parser.buffer_pos+1] == '.' &&
-					parser.buffer[parser.buffer_pos+2] == '.')) &&
-			is_blankz(parser.buffer, parser.buffer_pos+3) {
-			yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar",
-				start_mark, "found unexpected document indicator")
-			return false
-		}
-
-		// Check for EOF.
-		if is_z(parser.buffer, parser.buffer_pos) {
-			yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar",
-				start_mark, "found unexpected end of stream")
-			return false
-		}
-
-		// Consume non-blank characters.
-		leading_blanks := false
-		for !is_blankz(parser.buffer, parser.buffer_pos) {
-			if single && parser.buffer[parser.buffer_pos] == '\'' && parser.buffer[parser.buffer_pos+1] == '\'' {
-				// Is is an escaped single quote.
-				s = append(s, '\'')
-				skip(parser)
-				skip(parser)
-
-			} else if single && parser.buffer[parser.buffer_pos] == '\'' {
-				// It is a right single quote.
-				break
-			} else if !single && parser.buffer[parser.buffer_pos] == '"' {
-				// It is a right double quote.
-				break
-
-			} else if !single && parser.buffer[parser.buffer_pos] == '\\' && is_break(parser.buffer, parser.buffer_pos+1) {
-				// It is an escaped line break.
-				if parser.unread < 3 && !yaml_parser_update_buffer(parser, 3) {
-					return false
-				}
-				skip(parser)
-				skip_line(parser)
-				leading_blanks = true
-				break
-
-			} else if !single && parser.buffer[parser.buffer_pos] == '\\' {
-				// It is an escape sequence.
-				code_length := 0
-
-				// Check the escape character.
-				switch parser.buffer[parser.buffer_pos+1] {
-				case '0':
-					s = append(s, 0)
-				case 'a':
-					s = append(s, '\x07')
-				case 'b':
-					s = append(s, '\x08')
-				case 't', '\t':
-					s = append(s, '\x09')
-				case 'n':
-					s = append(s, '\x0A')
-				case 'v':
-					s = append(s, '\x0B')
-				case 'f':
-					s = append(s, '\x0C')
-				case 'r':
-					s = append(s, '\x0D')
-				case 'e':
-					s = append(s, '\x1B')
-				case ' ':
-					s = append(s, '\x20')
-				case '"':
-					s = append(s, '"')
-				case '\'':
-					s = append(s, '\'')
-				case '\\':
-					s = append(s, '\\')
-				case 'N': // NEL (#x85)
-					s = append(s, '\xC2')
-					s = append(s, '\x85')
-				case '_': // #xA0
-					s = append(s, '\xC2')
-					s = append(s, '\xA0')
-				case 'L': // LS (#x2028)
-					s = append(s, '\xE2')
-					s = append(s, '\x80')
-					s = append(s, '\xA8')
-				case 'P': // PS (#x2029)
-					s = append(s, '\xE2')
-					s = append(s, '\x80')
-					s = append(s, '\xA9')
-				case 'x':
-					code_length = 2
-				case 'u':
-					code_length = 4
-				case 'U':
-					code_length = 8
-				default:
-					yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
-						start_mark, "found unknown escape character")
-					return false
-				}
-
-				skip(parser)
-				skip(parser)
-
-				// Consume an arbitrary escape code.
-				if code_length > 0 {
-					var value int
-
-					// Scan the character value.
-					if parser.unread < code_length && !yaml_parser_update_buffer(parser, code_length) {
-						return false
-					}
-					for k := 0; k < code_length; k++ {
-						if !is_hex(parser.buffer, parser.buffer_pos+k) {
-							yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
-								start_mark, "did not find expected hexdecimal number")
-							return false
-						}
-						value = (value << 4) + as_hex(parser.buffer, parser.buffer_pos+k)
-					}
-
-					// Check the value and write the character.
-					if (value >= 0xD800 && value <= 0xDFFF) || value > 0x10FFFF {
-						yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
-							start_mark, "found invalid Unicode character escape code")
-						return false
-					}
-					if value <= 0x7F {
-						s = append(s, byte(value))
-					} else if value <= 0x7FF {
-						s = append(s, byte(0xC0+(value>>6)))
-						s = append(s, byte(0x80+(value&0x3F)))
-					} else if value <= 0xFFFF {
-						s = append(s, byte(0xE0+(value>>12)))
-						s = append(s, byte(0x80+((value>>6)&0x3F)))
-						s = append(s, byte(0x80+(value&0x3F)))
-					} else {
-						s = append(s, byte(0xF0+(value>>18)))
-						s = append(s, byte(0x80+((value>>12)&0x3F)))
-						s = append(s, byte(0x80+((value>>6)&0x3F)))
-						s = append(s, byte(0x80+(value&0x3F)))
-					}
-
-					// Advance the pointer.
-					for k := 0; k < code_length; k++ {
-						skip(parser)
-					}
-				}
-			} else {
-				// It is a non-escaped non-blank character.
-				s = read(parser, s)
-			}
-			if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-				return false
-			}
-		}
-
-		// Check if we are at the end of the scalar.
-		if single {
-			if parser.buffer[parser.buffer_pos] == '\'' {
-				break
-			}
-		} else {
-			if parser.buffer[parser.buffer_pos] == '"' {
-				break
-			}
-		}
-
-		// Consume blank characters.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-
-		for is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos) {
-			if is_blank(parser.buffer, parser.buffer_pos) {
-				// Consume a space or a tab character.
-				if !leading_blanks {
-					whitespaces = read(parser, whitespaces)
-				} else {
-					skip(parser)
-				}
-			} else {
-				if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-					return false
-				}
-
-				// Check if it is a first line break.
-				if !leading_blanks {
-					whitespaces = whitespaces[:0]
-					leading_break = read_line(parser, leading_break)
-					leading_blanks = true
-				} else {
-					trailing_breaks = read_line(parser, trailing_breaks)
-				}
-			}
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-
-		// Join the whitespaces or fold line breaks.
-		if leading_blanks {
-			// Do we need to fold line breaks?
-			if len(leading_break) > 0 && leading_break[0] == '\n' {
-				if len(trailing_breaks) == 0 {
-					s = append(s, ' ')
-				} else {
-					s = append(s, trailing_breaks...)
-				}
-			} else {
-				s = append(s, leading_break...)
-				s = append(s, trailing_breaks...)
-			}
-			trailing_breaks = trailing_breaks[:0]
-			leading_break = leading_break[:0]
-		} else {
-			s = append(s, whitespaces...)
-			whitespaces = whitespaces[:0]
-		}
-	}
-
-	// Eat the right quote.
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        yaml_SCALAR_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      s,
-		style:      yaml_SINGLE_QUOTED_SCALAR_STYLE,
-	}
-	if !single {
-		token.style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	}
-	return true
-}
-
-// Scan a plain scalar.
-func yaml_parser_scan_plain_scalar(parser *yaml_parser_t, token *yaml_token_t) bool {
-
-	var s, leading_break, trailing_breaks, whitespaces []byte
-	var leading_blanks bool
-	var indent = parser.indent + 1
-
-	start_mark := parser.mark
-	end_mark := parser.mark
-
-	// Consume the content of the plain scalar.
-	for {
-		// Check for a document indicator.
-		if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) {
-			return false
-		}
-		if parser.mark.column == 0 &&
-			((parser.buffer[parser.buffer_pos+0] == '-' &&
-				parser.buffer[parser.buffer_pos+1] == '-' &&
-				parser.buffer[parser.buffer_pos+2] == '-') ||
-				(parser.buffer[parser.buffer_pos+0] == '.' &&
-					parser.buffer[parser.buffer_pos+1] == '.' &&
-					parser.buffer[parser.buffer_pos+2] == '.')) &&
-			is_blankz(parser.buffer, parser.buffer_pos+3) {
-			break
-		}
-
-		// Check for a comment.
-		if parser.buffer[parser.buffer_pos] == '#' {
-			break
-		}
-
-		// Consume non-blank characters.
-		for !is_blankz(parser.buffer, parser.buffer_pos) {
-
-			// Check for 'x:x' in the flow context. TODO: Fix the test "spec-08-13".
-			if parser.flow_level > 0 &&
-				parser.buffer[parser.buffer_pos] == ':' &&
-				!is_blankz(parser.buffer, parser.buffer_pos+1) {
-				yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-					start_mark, "found unexpected ':'")
-				return false
-			}
-
-			// Check for indicators that may end a plain scalar.
-			if (parser.buffer[parser.buffer_pos] == ':' && is_blankz(parser.buffer, parser.buffer_pos+1)) ||
-				(parser.flow_level > 0 &&
-					(parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == ':' ||
-						parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == '[' ||
-						parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '{' ||
-						parser.buffer[parser.buffer_pos] == '}')) {
-				break
-			}
-
-			// Check if we need to join whitespaces and breaks.
-			if leading_blanks || len(whitespaces) > 0 {
-				if leading_blanks {
-					// Do we need to fold line breaks?
-					if leading_break[0] == '\n' {
-						if len(trailing_breaks) == 0 {
-							s = append(s, ' ')
-						} else {
-							s = append(s, trailing_breaks...)
-						}
-					} else {
-						s = append(s, leading_break...)
-						s = append(s, trailing_breaks...)
-					}
-					trailing_breaks = trailing_breaks[:0]
-					leading_break = leading_break[:0]
-					leading_blanks = false
-				} else {
-					s = append(s, whitespaces...)
-					whitespaces = whitespaces[:0]
-				}
-			}
-
-			// Copy the character.
-			s = read(parser, s)
-
-			end_mark = parser.mark
-			if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-				return false
-			}
-		}
-
-		// Is it the end?
-		if !(is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos)) {
-			break
-		}
-
-		// Consume blank characters.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-
-		for is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos) {
-			if is_blank(parser.buffer, parser.buffer_pos) {
-
-				// Check for tab character that abuse indentation.
-				if leading_blanks && parser.mark.column < indent && is_tab(parser.buffer, parser.buffer_pos) {
-					yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-						start_mark, "found a tab character that violate indentation")
-					return false
-				}
-
-				// Consume a space or a tab character.
-				if !leading_blanks {
-					whitespaces = read(parser, whitespaces)
-				} else {
-					skip(parser)
-				}
-			} else {
-				if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-					return false
-				}
-
-				// Check if it is a first line break.
-				if !leading_blanks {
-					whitespaces = whitespaces[:0]
-					leading_break = read_line(parser, leading_break)
-					leading_blanks = true
-				} else {
-					trailing_breaks = read_line(parser, trailing_breaks)
-				}
-			}
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-
-		// Check indentation level.
-		if parser.flow_level == 0 && parser.mark.column < indent {
-			break
-		}
-	}
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        yaml_SCALAR_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      s,
-		style:      yaml_PLAIN_SCALAR_STYLE,
-	}
-
-	// Note that we change the 'simple_key_allowed' flag.
-	if leading_blanks {
-		parser.simple_key_allowed = true
-	}
-	return true
-}
diff --git a/vendor/github.com/sanathkr/go-yaml/sorter.go b/vendor/github.com/sanathkr/go-yaml/sorter.go
deleted file mode 100644
index 5958822f9c..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/sorter.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package yaml
-
-import (
-	"reflect"
-	"unicode"
-)
-
-type keyList []reflect.Value
-
-func (l keyList) Len() int      { return len(l) }
-func (l keyList) Swap(i, j int) { l[i], l[j] = l[j], l[i] }
-func (l keyList) Less(i, j int) bool {
-	a := l[i]
-	b := l[j]
-	ak := a.Kind()
-	bk := b.Kind()
-	for (ak == reflect.Interface || ak == reflect.Ptr) && !a.IsNil() {
-		a = a.Elem()
-		ak = a.Kind()
-	}
-	for (bk == reflect.Interface || bk == reflect.Ptr) && !b.IsNil() {
-		b = b.Elem()
-		bk = b.Kind()
-	}
-	af, aok := keyFloat(a)
-	bf, bok := keyFloat(b)
-	if aok && bok {
-		if af != bf {
-			return af < bf
-		}
-		if ak != bk {
-			return ak < bk
-		}
-		return numLess(a, b)
-	}
-	if ak != reflect.String || bk != reflect.String {
-		return ak < bk
-	}
-	ar, br := []rune(a.String()), []rune(b.String())
-	for i := 0; i < len(ar) && i < len(br); i++ {
-		if ar[i] == br[i] {
-			continue
-		}
-		al := unicode.IsLetter(ar[i])
-		bl := unicode.IsLetter(br[i])
-		if al && bl {
-			return ar[i] < br[i]
-		}
-		if al || bl {
-			return bl
-		}
-		var ai, bi int
-		var an, bn int64
-		for ai = i; ai < len(ar) && unicode.IsDigit(ar[ai]); ai++ {
-			an = an*10 + int64(ar[ai]-'0')
-		}
-		for bi = i; bi < len(br) && unicode.IsDigit(br[bi]); bi++ {
-			bn = bn*10 + int64(br[bi]-'0')
-		}
-		if an != bn {
-			return an < bn
-		}
-		if ai != bi {
-			return ai < bi
-		}
-		return ar[i] < br[i]
-	}
-	return len(ar) < len(br)
-}
-
-// keyFloat returns a float value for v if it is a number/bool
-// and whether it is a number/bool or not.
-func keyFloat(v reflect.Value) (f float64, ok bool) {
-	switch v.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return float64(v.Int()), true
-	case reflect.Float32, reflect.Float64:
-		return v.Float(), true
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return float64(v.Uint()), true
-	case reflect.Bool:
-		if v.Bool() {
-			return 1, true
-		}
-		return 0, true
-	}
-	return 0, false
-}
-
-// numLess returns whether a < b.
-// a and b must necessarily have the same kind.
-func numLess(a, b reflect.Value) bool {
-	switch a.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return a.Int() < b.Int()
-	case reflect.Float32, reflect.Float64:
-		return a.Float() < b.Float()
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return a.Uint() < b.Uint()
-	case reflect.Bool:
-		return !a.Bool() && b.Bool()
-	}
-	panic("not a number")
-}
diff --git a/vendor/github.com/sanathkr/go-yaml/writerc.go b/vendor/github.com/sanathkr/go-yaml/writerc.go
deleted file mode 100644
index 190362f25d..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/writerc.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package yaml
-
-// Set the writer error and return false.
-func yaml_emitter_set_writer_error(emitter *yaml_emitter_t, problem string) bool {
-	emitter.error = yaml_WRITER_ERROR
-	emitter.problem = problem
-	return false
-}
-
-// Flush the output buffer.
-func yaml_emitter_flush(emitter *yaml_emitter_t) bool {
-	if emitter.write_handler == nil {
-		panic("write handler not set")
-	}
-
-	// Check if the buffer is empty.
-	if emitter.buffer_pos == 0 {
-		return true
-	}
-
-	// If the output encoding is UTF-8, we don't need to recode the buffer.
-	if emitter.encoding == yaml_UTF8_ENCODING {
-		if err := emitter.write_handler(emitter, emitter.buffer[:emitter.buffer_pos]); err != nil {
-			return yaml_emitter_set_writer_error(emitter, "write error: "+err.Error())
-		}
-		emitter.buffer_pos = 0
-		return true
-	}
-
-	// Recode the buffer into the raw buffer.
-	var low, high int
-	if emitter.encoding == yaml_UTF16LE_ENCODING {
-		low, high = 0, 1
-	} else {
-		high, low = 1, 0
-	}
-
-	pos := 0
-	for pos < emitter.buffer_pos {
-		// See the "reader.c" code for more details on UTF-8 encoding.  Note
-		// that we assume that the buffer contains a valid UTF-8 sequence.
-
-		// Read the next UTF-8 character.
-		octet := emitter.buffer[pos]
-
-		var w int
-		var value rune
-		switch {
-		case octet&0x80 == 0x00:
-			w, value = 1, rune(octet&0x7F)
-		case octet&0xE0 == 0xC0:
-			w, value = 2, rune(octet&0x1F)
-		case octet&0xF0 == 0xE0:
-			w, value = 3, rune(octet&0x0F)
-		case octet&0xF8 == 0xF0:
-			w, value = 4, rune(octet&0x07)
-		}
-		for k := 1; k < w; k++ {
-			octet = emitter.buffer[pos+k]
-			value = (value << 6) + (rune(octet) & 0x3F)
-		}
-		pos += w
-
-		// Write the character.
-		if value < 0x10000 {
-			var b [2]byte
-			b[high] = byte(value >> 8)
-			b[low] = byte(value & 0xFF)
-			emitter.raw_buffer = append(emitter.raw_buffer, b[0], b[1])
-		} else {
-			// Write the character using a surrogate pair (check "reader.c").
-			var b [4]byte
-			value -= 0x10000
-			b[high] = byte(0xD8 + (value >> 18))
-			b[low] = byte((value >> 10) & 0xFF)
-			b[high+2] = byte(0xDC + ((value >> 8) & 0xFF))
-			b[low+2] = byte(value & 0xFF)
-			emitter.raw_buffer = append(emitter.raw_buffer, b[0], b[1], b[2], b[3])
-		}
-	}
-
-	// Write the raw buffer.
-	if err := emitter.write_handler(emitter, emitter.raw_buffer); err != nil {
-		return yaml_emitter_set_writer_error(emitter, "write error: "+err.Error())
-	}
-	emitter.buffer_pos = 0
-	emitter.raw_buffer = emitter.raw_buffer[:0]
-	return true
-}
diff --git a/vendor/github.com/sanathkr/go-yaml/yaml.go b/vendor/github.com/sanathkr/go-yaml/yaml.go
deleted file mode 100644
index ed487525cf..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/yaml.go
+++ /dev/null
@@ -1,374 +0,0 @@
-// Package yaml implements YAML support for the Go language.
-//
-// Source code and other details for the project are available at GitHub:
-//
-//   https://github.com/go-yaml/yaml
-//
-package yaml
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-	"sync"
-)
-
-// MapSlice encodes and decodes as a YAML map.
-// The order of keys is preserved when encoding and decoding.
-type MapSlice []MapItem
-
-// MapItem is an item in a MapSlice.
-type MapItem struct {
-	Key, Value interface{}
-}
-
-// The Unmarshaler interface may be implemented by types to customize their
-// behavior when being unmarshaled from a YAML document. The UnmarshalYAML
-// method receives a function that may be called to unmarshal the original
-// YAML value into a field or variable. It is safe to call the unmarshal
-// function parameter more than once if necessary.
-type Unmarshaler interface {
-	UnmarshalYAML(unmarshal func(interface{}) error) error
-}
-
-type TagUnmarshallerDecoder struct {
-	d *decoder
-}
-
-// The Tag Unmarshaler interface
-type TagUnmarshaler interface {
-	UnmarshalYAMLTag(tag string, out reflect.Value) reflect.Value
-}
-
-// The Marshaler interface may be implemented by types to customize their
-// behavior when being marshaled into a YAML document. The returned value
-// is marshaled in place of the original value implementing Marshaler.
-//
-// If an error is returned by MarshalYAML, the marshaling procedure stops
-// and returns with the provided error.
-type Marshaler interface {
-	MarshalYAML() (interface{}, error)
-}
-
-// Unmarshal decodes the first document found within the in byte slice
-// and assigns decoded values into the out value.
-//
-// Maps and pointers (to a struct, string, int, etc) are accepted as out
-// values. If an internal pointer within a struct is not initialized,
-// the yaml package will initialize it if necessary for unmarshalling
-// the provided data. The out parameter must not be nil.
-//
-// The type of the decoded values should be compatible with the respective
-// values in out. If one or more values cannot be decoded due to a type
-// mismatches, decoding continues partially until the end of the YAML
-// content, and a *yaml.TypeError is returned with details for all
-// missed values.
-//
-// Struct fields are only unmarshalled if they are exported (have an
-// upper case first letter), and are unmarshalled using the field name
-// lowercased as the default key. Custom keys may be defined via the
-// "yaml" name in the field tag: the content preceding the first comma
-// is used as the key, and the following comma-separated options are
-// used to tweak the marshalling process (see Marshal).
-// Conflicting names result in a runtime error.
-//
-// For example:
-//
-//     type T struct {
-//         F int `yaml:"a,omitempty"`
-//         B int
-//     }
-//     var t T
-//     yaml.Unmarshal([]byte("a: 1\nb: 2"), &t)
-//
-// See the documentation of Marshal for the format of tags and a list of
-// supported tag options.
-//
-func Unmarshal(in []byte, out interface{}) (err error) {
-	return unmarshal(in, out, false)
-}
-
-// UnmarshalStrict is like Unmarshal except that any fields that are found
-// in the data that do not have corresponding struct members will result in
-// an error.
-func UnmarshalStrict(in []byte, out interface{}) (err error) {
-	return unmarshal(in, out, true)
-}
-
-func unmarshal(in []byte, out interface{}, strict bool) (err error) {
-	defer handleErr(&err)
-	d := newDecoder(strict)
-	p := newParser(in)
-	defer p.destroy()
-	node := p.parse()
-	if node != nil {
-		v := reflect.ValueOf(out)
-		if v.Kind() == reflect.Ptr && !v.IsNil() {
-			v = v.Elem()
-		}
-		d.unmarshal(node, v)
-	}
-	if len(d.terrors) > 0 {
-		return &TypeError{d.terrors}
-	}
-	return nil
-}
-
-// Marshal serializes the value provided into a YAML document. The structure
-// of the generated document will reflect the structure of the value itself.
-// Maps and pointers (to struct, string, int, etc) are accepted as the in value.
-//
-// Struct fields are only unmarshalled if they are exported (have an upper case
-// first letter), and are unmarshalled using the field name lowercased as the
-// default key. Custom keys may be defined via the "yaml" name in the field
-// tag: the content preceding the first comma is used as the key, and the
-// following comma-separated options are used to tweak the marshalling process.
-// Conflicting names result in a runtime error.
-//
-// The field tag format accepted is:
-//
-//     `(...) yaml:"[<key>][,<flag1>[,<flag2>]]" (...)`
-//
-// The following flags are currently supported:
-//
-//     omitempty    Only include the field if it's not set to the zero
-//                  value for the type or to empty slices or maps.
-//                  Does not apply to zero valued structs.
-//
-//     flow         Marshal using a flow style (useful for structs,
-//                  sequences and maps).
-//
-//     inline       Inline the field, which must be a struct or a map,
-//                  causing all of its fields or keys to be processed as if
-//                  they were part of the outer struct. For maps, keys must
-//                  not conflict with the yaml keys of other struct fields.
-//
-// In addition, if the key is "-", the field is ignored.
-//
-// For example:
-//
-//     type T struct {
-//         F int "a,omitempty"
-//         B int
-//     }
-//     yaml.Marshal(&T{B: 2}) // Returns "b: 2\n"
-//     yaml.Marshal(&T{F: 1}} // Returns "a: 1\nb: 0\n"
-//
-func Marshal(in interface{}) (out []byte, err error) {
-	defer handleErr(&err)
-	e := newEncoder()
-	defer e.destroy()
-	e.marshal("", reflect.ValueOf(in))
-	e.finish()
-	out = e.out
-	return
-}
-
-func RegisterTagUnmarshaler(tag string, unmarshaler TagUnmarshaler) {
-	registerCustomTagUnmarshaler(tag, unmarshaler)
-}
-
-func UnRegisterTagUnmarshaler(tag string) {
-	unregisterCustomTagUnmarshaler(tag)
-}
-
-func handleErr(err *error) {
-	if v := recover(); v != nil {
-		if e, ok := v.(yamlError); ok {
-			*err = e.err
-		} else {
-			panic(v)
-		}
-	}
-}
-
-type yamlError struct {
-	err error
-}
-
-func fail(err error) {
-	panic(yamlError{err})
-}
-
-func failf(format string, args ...interface{}) {
-	panic(yamlError{fmt.Errorf("yaml: "+format, args...)})
-}
-
-// A TypeError is returned by Unmarshal when one or more fields in
-// the YAML document cannot be properly decoded into the requested
-// types. When this error is returned, the value is still
-// unmarshaled partially.
-type TypeError struct {
-	Errors []string
-}
-
-func (e *TypeError) Error() string {
-	return fmt.Sprintf("yaml: unmarshal errors:\n  %s", strings.Join(e.Errors, "\n  "))
-}
-
-// --------------------------------------------------------------------------
-// Maintain a mapping of keys to structure field indexes
-
-// The code in this section was copied from mgo/bson.
-
-// structInfo holds details for the serialization of fields of
-// a given struct.
-type structInfo struct {
-	FieldsMap  map[string]fieldInfo
-	FieldsList []fieldInfo
-
-	// InlineMap is the number of the field in the struct that
-	// contains an ,inline map, or -1 if there's none.
-	InlineMap int
-}
-
-type fieldInfo struct {
-	Key       string
-	Num       int
-	OmitEmpty bool
-	Flow      bool
-
-	// Inline holds the field index if the field is part of an inlined struct.
-	Inline []int
-}
-
-var structMap = make(map[reflect.Type]*structInfo)
-var fieldMapMutex sync.RWMutex
-
-func getStructInfo(st reflect.Type) (*structInfo, error) {
-	fieldMapMutex.RLock()
-	sinfo, found := structMap[st]
-	fieldMapMutex.RUnlock()
-	if found {
-		return sinfo, nil
-	}
-
-	n := st.NumField()
-	fieldsMap := make(map[string]fieldInfo)
-	fieldsList := make([]fieldInfo, 0, n)
-	inlineMap := -1
-	for i := 0; i != n; i++ {
-		field := st.Field(i)
-		if field.PkgPath != "" && !field.Anonymous {
-			continue // Private field
-		}
-
-		info := fieldInfo{Num: i}
-
-		tag := field.Tag.Get("yaml")
-		if tag == "" && strings.Index(string(field.Tag), ":") < 0 {
-			tag = string(field.Tag)
-		}
-		if tag == "-" {
-			continue
-		}
-
-		inline := false
-		fields := strings.Split(tag, ",")
-		if len(fields) > 1 {
-			for _, flag := range fields[1:] {
-				switch flag {
-				case "omitempty":
-					info.OmitEmpty = true
-				case "flow":
-					info.Flow = true
-				case "inline":
-					inline = true
-				default:
-					return nil, errors.New(fmt.Sprintf("Unsupported flag %q in tag %q of type %s", flag, tag, st))
-				}
-			}
-			tag = fields[0]
-		}
-
-		if inline {
-			switch field.Type.Kind() {
-			case reflect.Map:
-				if inlineMap >= 0 {
-					return nil, errors.New("Multiple ,inline maps in struct " + st.String())
-				}
-				if field.Type.Key() != reflect.TypeOf("") {
-					return nil, errors.New("Option ,inline needs a map with string keys in struct " + st.String())
-				}
-				inlineMap = info.Num
-			case reflect.Struct:
-				sinfo, err := getStructInfo(field.Type)
-				if err != nil {
-					return nil, err
-				}
-				for _, finfo := range sinfo.FieldsList {
-					if _, found := fieldsMap[finfo.Key]; found {
-						msg := "Duplicated key '" + finfo.Key + "' in struct " + st.String()
-						return nil, errors.New(msg)
-					}
-					if finfo.Inline == nil {
-						finfo.Inline = []int{i, finfo.Num}
-					} else {
-						finfo.Inline = append([]int{i}, finfo.Inline...)
-					}
-					fieldsMap[finfo.Key] = finfo
-					fieldsList = append(fieldsList, finfo)
-				}
-			default:
-				//return nil, errors.New("Option ,inline needs a struct value or map field")
-				return nil, errors.New("Option ,inline needs a struct value field")
-			}
-			continue
-		}
-
-		if tag != "" {
-			info.Key = tag
-		} else {
-			info.Key = strings.ToLower(field.Name)
-		}
-
-		if _, found = fieldsMap[info.Key]; found {
-			msg := "Duplicated key '" + info.Key + "' in struct " + st.String()
-			return nil, errors.New(msg)
-		}
-
-		fieldsList = append(fieldsList, info)
-		fieldsMap[info.Key] = info
-	}
-
-	sinfo = &structInfo{fieldsMap, fieldsList, inlineMap}
-
-	fieldMapMutex.Lock()
-	structMap[st] = sinfo
-	fieldMapMutex.Unlock()
-	return sinfo, nil
-}
-
-func isZero(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.String:
-		return len(v.String()) == 0
-	case reflect.Interface, reflect.Ptr:
-		return v.IsNil()
-	case reflect.Slice:
-		return v.Len() == 0
-	case reflect.Map:
-		return v.Len() == 0
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Struct:
-		vt := v.Type()
-		for i := v.NumField() - 1; i >= 0; i-- {
-			if vt.Field(i).PkgPath != "" {
-				continue // Private field
-			}
-			if !isZero(v.Field(i)) {
-				return false
-			}
-		}
-		return true
-	}
-	return false
-}
diff --git a/vendor/github.com/sanathkr/go-yaml/yamlh.go b/vendor/github.com/sanathkr/go-yaml/yamlh.go
deleted file mode 100644
index 3caeca0491..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/yamlh.go
+++ /dev/null
@@ -1,716 +0,0 @@
-package yaml
-
-import (
-	"io"
-)
-
-// The version directive data.
-type yaml_version_directive_t struct {
-	major int8 // The major version number.
-	minor int8 // The minor version number.
-}
-
-// The tag directive data.
-type yaml_tag_directive_t struct {
-	handle []byte // The tag handle.
-	prefix []byte // The tag prefix.
-}
-
-type yaml_encoding_t int
-
-// The stream encoding.
-const (
-	// Let the parser choose the encoding.
-	yaml_ANY_ENCODING yaml_encoding_t = iota
-
-	yaml_UTF8_ENCODING    // The default UTF-8 encoding.
-	yaml_UTF16LE_ENCODING // The UTF-16-LE encoding with BOM.
-	yaml_UTF16BE_ENCODING // The UTF-16-BE encoding with BOM.
-)
-
-type yaml_break_t int
-
-// Line break types.
-const (
-	// Let the parser choose the break type.
-	yaml_ANY_BREAK yaml_break_t = iota
-
-	yaml_CR_BREAK   // Use CR for line breaks (Mac style).
-	yaml_LN_BREAK   // Use LN for line breaks (Unix style).
-	yaml_CRLN_BREAK // Use CR LN for line breaks (DOS style).
-)
-
-type yaml_error_type_t int
-
-// Many bad things could happen with the parser and emitter.
-const (
-	// No error is produced.
-	yaml_NO_ERROR yaml_error_type_t = iota
-
-	yaml_MEMORY_ERROR   // Cannot allocate or reallocate a block of memory.
-	yaml_READER_ERROR   // Cannot read or decode the input stream.
-	yaml_SCANNER_ERROR  // Cannot scan the input stream.
-	yaml_PARSER_ERROR   // Cannot parse the input stream.
-	yaml_COMPOSER_ERROR // Cannot compose a YAML document.
-	yaml_WRITER_ERROR   // Cannot write to the output stream.
-	yaml_EMITTER_ERROR  // Cannot emit a YAML stream.
-)
-
-// The pointer position.
-type yaml_mark_t struct {
-	index  int // The position index.
-	line   int // The position line.
-	column int // The position column.
-}
-
-// Node Styles
-
-type yaml_style_t int8
-
-type yaml_scalar_style_t yaml_style_t
-
-// Scalar styles.
-const (
-	// Let the emitter choose the style.
-	yaml_ANY_SCALAR_STYLE yaml_scalar_style_t = iota
-
-	yaml_PLAIN_SCALAR_STYLE         // The plain scalar style.
-	yaml_SINGLE_QUOTED_SCALAR_STYLE // The single-quoted scalar style.
-	yaml_DOUBLE_QUOTED_SCALAR_STYLE // The double-quoted scalar style.
-	yaml_LITERAL_SCALAR_STYLE       // The literal scalar style.
-	yaml_FOLDED_SCALAR_STYLE        // The folded scalar style.
-)
-
-type yaml_sequence_style_t yaml_style_t
-
-// Sequence styles.
-const (
-	// Let the emitter choose the style.
-	yaml_ANY_SEQUENCE_STYLE yaml_sequence_style_t = iota
-
-	yaml_BLOCK_SEQUENCE_STYLE // The block sequence style.
-	yaml_FLOW_SEQUENCE_STYLE  // The flow sequence style.
-)
-
-type yaml_mapping_style_t yaml_style_t
-
-// Mapping styles.
-const (
-	// Let the emitter choose the style.
-	yaml_ANY_MAPPING_STYLE yaml_mapping_style_t = iota
-
-	yaml_BLOCK_MAPPING_STYLE // The block mapping style.
-	yaml_FLOW_MAPPING_STYLE  // The flow mapping style.
-)
-
-// Tokens
-
-type yaml_token_type_t int
-
-// Token types.
-const (
-	// An empty token.
-	yaml_NO_TOKEN yaml_token_type_t = iota
-
-	yaml_STREAM_START_TOKEN // A STREAM-START token.
-	yaml_STREAM_END_TOKEN   // A STREAM-END token.
-
-	yaml_VERSION_DIRECTIVE_TOKEN // A VERSION-DIRECTIVE token.
-	yaml_TAG_DIRECTIVE_TOKEN     // A TAG-DIRECTIVE token.
-	yaml_DOCUMENT_START_TOKEN    // A DOCUMENT-START token.
-	yaml_DOCUMENT_END_TOKEN      // A DOCUMENT-END token.
-
-	yaml_BLOCK_SEQUENCE_START_TOKEN // A BLOCK-SEQUENCE-START token.
-	yaml_BLOCK_MAPPING_START_TOKEN  // A BLOCK-SEQUENCE-END token.
-	yaml_BLOCK_END_TOKEN            // A BLOCK-END token.
-
-	yaml_FLOW_SEQUENCE_START_TOKEN // A FLOW-SEQUENCE-START token.
-	yaml_FLOW_SEQUENCE_END_TOKEN   // A FLOW-SEQUENCE-END token.
-	yaml_FLOW_MAPPING_START_TOKEN  // A FLOW-MAPPING-START token.
-	yaml_FLOW_MAPPING_END_TOKEN    // A FLOW-MAPPING-END token.
-
-	yaml_BLOCK_ENTRY_TOKEN // A BLOCK-ENTRY token.
-	yaml_FLOW_ENTRY_TOKEN  // A FLOW-ENTRY token.
-	yaml_KEY_TOKEN         // A KEY token.
-	yaml_VALUE_TOKEN       // A VALUE token.
-
-	yaml_ALIAS_TOKEN  // An ALIAS token.
-	yaml_ANCHOR_TOKEN // An ANCHOR token.
-	yaml_TAG_TOKEN    // A TAG token.
-	yaml_SCALAR_TOKEN // A SCALAR token.
-)
-
-func (tt yaml_token_type_t) String() string {
-	switch tt {
-	case yaml_NO_TOKEN:
-		return "yaml_NO_TOKEN"
-	case yaml_STREAM_START_TOKEN:
-		return "yaml_STREAM_START_TOKEN"
-	case yaml_STREAM_END_TOKEN:
-		return "yaml_STREAM_END_TOKEN"
-	case yaml_VERSION_DIRECTIVE_TOKEN:
-		return "yaml_VERSION_DIRECTIVE_TOKEN"
-	case yaml_TAG_DIRECTIVE_TOKEN:
-		return "yaml_TAG_DIRECTIVE_TOKEN"
-	case yaml_DOCUMENT_START_TOKEN:
-		return "yaml_DOCUMENT_START_TOKEN"
-	case yaml_DOCUMENT_END_TOKEN:
-		return "yaml_DOCUMENT_END_TOKEN"
-	case yaml_BLOCK_SEQUENCE_START_TOKEN:
-		return "yaml_BLOCK_SEQUENCE_START_TOKEN"
-	case yaml_BLOCK_MAPPING_START_TOKEN:
-		return "yaml_BLOCK_MAPPING_START_TOKEN"
-	case yaml_BLOCK_END_TOKEN:
-		return "yaml_BLOCK_END_TOKEN"
-	case yaml_FLOW_SEQUENCE_START_TOKEN:
-		return "yaml_FLOW_SEQUENCE_START_TOKEN"
-	case yaml_FLOW_SEQUENCE_END_TOKEN:
-		return "yaml_FLOW_SEQUENCE_END_TOKEN"
-	case yaml_FLOW_MAPPING_START_TOKEN:
-		return "yaml_FLOW_MAPPING_START_TOKEN"
-	case yaml_FLOW_MAPPING_END_TOKEN:
-		return "yaml_FLOW_MAPPING_END_TOKEN"
-	case yaml_BLOCK_ENTRY_TOKEN:
-		return "yaml_BLOCK_ENTRY_TOKEN"
-	case yaml_FLOW_ENTRY_TOKEN:
-		return "yaml_FLOW_ENTRY_TOKEN"
-	case yaml_KEY_TOKEN:
-		return "yaml_KEY_TOKEN"
-	case yaml_VALUE_TOKEN:
-		return "yaml_VALUE_TOKEN"
-	case yaml_ALIAS_TOKEN:
-		return "yaml_ALIAS_TOKEN"
-	case yaml_ANCHOR_TOKEN:
-		return "yaml_ANCHOR_TOKEN"
-	case yaml_TAG_TOKEN:
-		return "yaml_TAG_TOKEN"
-	case yaml_SCALAR_TOKEN:
-		return "yaml_SCALAR_TOKEN"
-	}
-	return "<unknown token>"
-}
-
-// The token structure.
-type yaml_token_t struct {
-	// The token type.
-	typ yaml_token_type_t
-
-	// The start/end of the token.
-	start_mark, end_mark yaml_mark_t
-
-	// The stream encoding (for yaml_STREAM_START_TOKEN).
-	encoding yaml_encoding_t
-
-	// The alias/anchor/scalar value or tag/tag directive handle
-	// (for yaml_ALIAS_TOKEN, yaml_ANCHOR_TOKEN, yaml_SCALAR_TOKEN, yaml_TAG_TOKEN, yaml_TAG_DIRECTIVE_TOKEN).
-	value []byte
-
-	// The tag suffix (for yaml_TAG_TOKEN).
-	suffix []byte
-
-	// The tag directive prefix (for yaml_TAG_DIRECTIVE_TOKEN).
-	prefix []byte
-
-	// The scalar style (for yaml_SCALAR_TOKEN).
-	style yaml_scalar_style_t
-
-	// The version directive major/minor (for yaml_VERSION_DIRECTIVE_TOKEN).
-	major, minor int8
-}
-
-// Events
-
-type yaml_event_type_t int8
-
-// Event types.
-const (
-	// An empty event.
-	yaml_NO_EVENT yaml_event_type_t = iota
-
-	yaml_STREAM_START_EVENT   // A STREAM-START event.
-	yaml_STREAM_END_EVENT     // A STREAM-END event.
-	yaml_DOCUMENT_START_EVENT // A DOCUMENT-START event.
-	yaml_DOCUMENT_END_EVENT   // A DOCUMENT-END event.
-	yaml_ALIAS_EVENT          // An ALIAS event.
-	yaml_SCALAR_EVENT         // A SCALAR event.
-	yaml_SEQUENCE_START_EVENT // A SEQUENCE-START event.
-	yaml_SEQUENCE_END_EVENT   // A SEQUENCE-END event.
-	yaml_MAPPING_START_EVENT  // A MAPPING-START event.
-	yaml_MAPPING_END_EVENT    // A MAPPING-END event.
-)
-
-// The event structure.
-type yaml_event_t struct {
-
-	// The event type.
-	typ yaml_event_type_t
-
-	// The start and end of the event.
-	start_mark, end_mark yaml_mark_t
-
-	// The document encoding (for yaml_STREAM_START_EVENT).
-	encoding yaml_encoding_t
-
-	// The version directive (for yaml_DOCUMENT_START_EVENT).
-	version_directive *yaml_version_directive_t
-
-	// The list of tag directives (for yaml_DOCUMENT_START_EVENT).
-	tag_directives []yaml_tag_directive_t
-
-	// The anchor (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT, yaml_ALIAS_EVENT).
-	anchor []byte
-
-	// The tag (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT).
-	tag []byte
-
-	// The scalar value (for yaml_SCALAR_EVENT).
-	value []byte
-
-	// Is the document start/end indicator implicit, or the tag optional?
-	// (for yaml_DOCUMENT_START_EVENT, yaml_DOCUMENT_END_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT, yaml_SCALAR_EVENT).
-	implicit bool
-
-	// Is the tag optional for any non-plain style? (for yaml_SCALAR_EVENT).
-	quoted_implicit bool
-
-	// The style (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT).
-	style yaml_style_t
-}
-
-func (e *yaml_event_t) scalar_style() yaml_scalar_style_t     { return yaml_scalar_style_t(e.style) }
-func (e *yaml_event_t) sequence_style() yaml_sequence_style_t { return yaml_sequence_style_t(e.style) }
-func (e *yaml_event_t) mapping_style() yaml_mapping_style_t   { return yaml_mapping_style_t(e.style) }
-
-// Nodes
-
-const (
-	yaml_NULL_TAG      = "tag:yaml.org,2002:null"      // The tag !!null with the only possible value: null.
-	yaml_BOOL_TAG      = "tag:yaml.org,2002:bool"      // The tag !!bool with the values: true and false.
-	yaml_STR_TAG       = "tag:yaml.org,2002:str"       // The tag !!str for string values.
-	yaml_INT_TAG       = "tag:yaml.org,2002:int"       // The tag !!int for integer values.
-	yaml_FLOAT_TAG     = "tag:yaml.org,2002:float"     // The tag !!float for float values.
-	yaml_TIMESTAMP_TAG = "tag:yaml.org,2002:timestamp" // The tag !!timestamp for date and time values.
-
-	yaml_SEQ_TAG = "tag:yaml.org,2002:seq" // The tag !!seq is used to denote sequences.
-	yaml_MAP_TAG = "tag:yaml.org,2002:map" // The tag !!map is used to denote mapping.
-
-	// Not in original libyaml.
-	yaml_BINARY_TAG = "tag:yaml.org,2002:binary"
-	yaml_MERGE_TAG  = "tag:yaml.org,2002:merge"
-
-	yaml_DEFAULT_SCALAR_TAG   = yaml_STR_TAG // The default scalar tag is !!str.
-	yaml_DEFAULT_SEQUENCE_TAG = yaml_SEQ_TAG // The default sequence tag is !!seq.
-	yaml_DEFAULT_MAPPING_TAG  = yaml_MAP_TAG // The default mapping tag is !!map.
-)
-
-type yaml_node_type_t int
-
-// Node types.
-const (
-	// An empty node.
-	yaml_NO_NODE yaml_node_type_t = iota
-
-	yaml_SCALAR_NODE   // A scalar node.
-	yaml_SEQUENCE_NODE // A sequence node.
-	yaml_MAPPING_NODE  // A mapping node.
-)
-
-// An element of a sequence node.
-type yaml_node_item_t int
-
-// An element of a mapping node.
-type yaml_node_pair_t struct {
-	key   int // The key of the element.
-	value int // The value of the element.
-}
-
-// The node structure.
-type yaml_node_t struct {
-	typ yaml_node_type_t // The node type.
-	tag []byte           // The node tag.
-
-	// The node data.
-
-	// The scalar parameters (for yaml_SCALAR_NODE).
-	scalar struct {
-		value  []byte              // The scalar value.
-		length int                 // The length of the scalar value.
-		style  yaml_scalar_style_t // The scalar style.
-	}
-
-	// The sequence parameters (for YAML_SEQUENCE_NODE).
-	sequence struct {
-		items_data []yaml_node_item_t    // The stack of sequence items.
-		style      yaml_sequence_style_t // The sequence style.
-	}
-
-	// The mapping parameters (for yaml_MAPPING_NODE).
-	mapping struct {
-		pairs_data  []yaml_node_pair_t   // The stack of mapping pairs (key, value).
-		pairs_start *yaml_node_pair_t    // The beginning of the stack.
-		pairs_end   *yaml_node_pair_t    // The end of the stack.
-		pairs_top   *yaml_node_pair_t    // The top of the stack.
-		style       yaml_mapping_style_t // The mapping style.
-	}
-
-	start_mark yaml_mark_t // The beginning of the node.
-	end_mark   yaml_mark_t // The end of the node.
-
-}
-
-// The document structure.
-type yaml_document_t struct {
-
-	// The document nodes.
-	nodes []yaml_node_t
-
-	// The version directive.
-	version_directive *yaml_version_directive_t
-
-	// The list of tag directives.
-	tag_directives_data  []yaml_tag_directive_t
-	tag_directives_start int // The beginning of the tag directives list.
-	tag_directives_end   int // The end of the tag directives list.
-
-	start_implicit int // Is the document start indicator implicit?
-	end_implicit   int // Is the document end indicator implicit?
-
-	// The start/end of the document.
-	start_mark, end_mark yaml_mark_t
-}
-
-// The prototype of a read handler.
-//
-// The read handler is called when the parser needs to read more bytes from the
-// source. The handler should write not more than size bytes to the buffer.
-// The number of written bytes should be set to the size_read variable.
-//
-// [in,out]   data        A pointer to an application data specified by
-//                        yaml_parser_set_input().
-// [out]      buffer      The buffer to write the data from the source.
-// [in]       size        The size of the buffer.
-// [out]      size_read   The actual number of bytes read from the source.
-//
-// On success, the handler should return 1.  If the handler failed,
-// the returned value should be 0. On EOF, the handler should set the
-// size_read to 0 and return 1.
-type yaml_read_handler_t func(parser *yaml_parser_t, buffer []byte) (n int, err error)
-
-// This structure holds information about a potential simple key.
-type yaml_simple_key_t struct {
-	possible     bool        // Is a simple key possible?
-	required     bool        // Is a simple key required?
-	token_number int         // The number of the token.
-	mark         yaml_mark_t // The position mark.
-}
-
-// The states of the parser.
-type yaml_parser_state_t int
-
-const (
-	yaml_PARSE_STREAM_START_STATE yaml_parser_state_t = iota
-
-	yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE           // Expect the beginning of an implicit document.
-	yaml_PARSE_DOCUMENT_START_STATE                    // Expect DOCUMENT-START.
-	yaml_PARSE_DOCUMENT_CONTENT_STATE                  // Expect the content of a document.
-	yaml_PARSE_DOCUMENT_END_STATE                      // Expect DOCUMENT-END.
-	yaml_PARSE_BLOCK_NODE_STATE                        // Expect a block node.
-	yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE // Expect a block node or indentless sequence.
-	yaml_PARSE_FLOW_NODE_STATE                         // Expect a flow node.
-	yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE        // Expect the first entry of a block sequence.
-	yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE              // Expect an entry of a block sequence.
-	yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE         // Expect an entry of an indentless sequence.
-	yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE           // Expect the first key of a block mapping.
-	yaml_PARSE_BLOCK_MAPPING_KEY_STATE                 // Expect a block mapping key.
-	yaml_PARSE_BLOCK_MAPPING_VALUE_STATE               // Expect a block mapping value.
-	yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE         // Expect the first entry of a flow sequence.
-	yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE               // Expect an entry of a flow sequence.
-	yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE   // Expect a key of an ordered mapping.
-	yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE // Expect a value of an ordered mapping.
-	yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE   // Expect the and of an ordered mapping entry.
-	yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE            // Expect the first key of a flow mapping.
-	yaml_PARSE_FLOW_MAPPING_KEY_STATE                  // Expect a key of a flow mapping.
-	yaml_PARSE_FLOW_MAPPING_VALUE_STATE                // Expect a value of a flow mapping.
-	yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE          // Expect an empty value of a flow mapping.
-	yaml_PARSE_END_STATE                               // Expect nothing.
-)
-
-func (ps yaml_parser_state_t) String() string {
-	switch ps {
-	case yaml_PARSE_STREAM_START_STATE:
-		return "yaml_PARSE_STREAM_START_STATE"
-	case yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE:
-		return "yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE"
-	case yaml_PARSE_DOCUMENT_START_STATE:
-		return "yaml_PARSE_DOCUMENT_START_STATE"
-	case yaml_PARSE_DOCUMENT_CONTENT_STATE:
-		return "yaml_PARSE_DOCUMENT_CONTENT_STATE"
-	case yaml_PARSE_DOCUMENT_END_STATE:
-		return "yaml_PARSE_DOCUMENT_END_STATE"
-	case yaml_PARSE_BLOCK_NODE_STATE:
-		return "yaml_PARSE_BLOCK_NODE_STATE"
-	case yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE:
-		return "yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE"
-	case yaml_PARSE_FLOW_NODE_STATE:
-		return "yaml_PARSE_FLOW_NODE_STATE"
-	case yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE:
-		return "yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE"
-	case yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE:
-		return "yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE"
-	case yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE:
-		return "yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE"
-	case yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE:
-		return "yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE"
-	case yaml_PARSE_BLOCK_MAPPING_KEY_STATE:
-		return "yaml_PARSE_BLOCK_MAPPING_KEY_STATE"
-	case yaml_PARSE_BLOCK_MAPPING_VALUE_STATE:
-		return "yaml_PARSE_BLOCK_MAPPING_VALUE_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE"
-	case yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE:
-		return "yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE"
-	case yaml_PARSE_FLOW_MAPPING_KEY_STATE:
-		return "yaml_PARSE_FLOW_MAPPING_KEY_STATE"
-	case yaml_PARSE_FLOW_MAPPING_VALUE_STATE:
-		return "yaml_PARSE_FLOW_MAPPING_VALUE_STATE"
-	case yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE:
-		return "yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE"
-	case yaml_PARSE_END_STATE:
-		return "yaml_PARSE_END_STATE"
-	}
-	return "<unknown parser state>"
-}
-
-// This structure holds aliases data.
-type yaml_alias_data_t struct {
-	anchor []byte      // The anchor.
-	index  int         // The node id.
-	mark   yaml_mark_t // The anchor mark.
-}
-
-// The parser structure.
-//
-// All members are internal. Manage the structure using the
-// yaml_parser_ family of functions.
-type yaml_parser_t struct {
-
-	// Error handling
-
-	error yaml_error_type_t // Error type.
-
-	problem string // Error description.
-
-	// The byte about which the problem occurred.
-	problem_offset int
-	problem_value  int
-	problem_mark   yaml_mark_t
-
-	// The error context.
-	context      string
-	context_mark yaml_mark_t
-
-	// Reader stuff
-
-	read_handler yaml_read_handler_t // Read handler.
-
-	input_file io.Reader // File input data.
-	input      []byte    // String input data.
-	input_pos  int
-
-	eof bool // EOF flag
-
-	buffer     []byte // The working buffer.
-	buffer_pos int    // The current position of the buffer.
-
-	unread int // The number of unread characters in the buffer.
-
-	raw_buffer     []byte // The raw buffer.
-	raw_buffer_pos int    // The current position of the buffer.
-
-	encoding yaml_encoding_t // The input encoding.
-
-	offset int         // The offset of the current position (in bytes).
-	mark   yaml_mark_t // The mark of the current position.
-
-	// Scanner stuff
-
-	stream_start_produced bool // Have we started to scan the input stream?
-	stream_end_produced   bool // Have we reached the end of the input stream?
-
-	flow_level int // The number of unclosed '[' and '{' indicators.
-
-	tokens          []yaml_token_t // The tokens queue.
-	tokens_head     int            // The head of the tokens queue.
-	tokens_parsed   int            // The number of tokens fetched from the queue.
-	token_available bool           // Does the tokens queue contain a token ready for dequeueing.
-
-	indent  int   // The current indentation level.
-	indents []int // The indentation levels stack.
-
-	simple_key_allowed bool                // May a simple key occur at the current position?
-	simple_keys        []yaml_simple_key_t // The stack of simple keys.
-
-	// Parser stuff
-
-	state          yaml_parser_state_t    // The current parser state.
-	states         []yaml_parser_state_t  // The parser states stack.
-	marks          []yaml_mark_t          // The stack of marks.
-	tag_directives []yaml_tag_directive_t // The list of TAG directives.
-
-	// Dumper stuff
-
-	aliases []yaml_alias_data_t // The alias data.
-
-	document *yaml_document_t // The currently parsed document.
-}
-
-// Emitter Definitions
-
-// The prototype of a write handler.
-//
-// The write handler is called when the emitter needs to flush the accumulated
-// characters to the output.  The handler should write @a size bytes of the
-// @a buffer to the output.
-//
-// @param[in,out]   data        A pointer to an application data specified by
-//                              yaml_emitter_set_output().
-// @param[in]       buffer      The buffer with bytes to be written.
-// @param[in]       size        The size of the buffer.
-//
-// @returns On success, the handler should return @c 1.  If the handler failed,
-// the returned value should be @c 0.
-//
-type yaml_write_handler_t func(emitter *yaml_emitter_t, buffer []byte) error
-
-type yaml_emitter_state_t int
-
-// The emitter states.
-const (
-	// Expect STREAM-START.
-	yaml_EMIT_STREAM_START_STATE yaml_emitter_state_t = iota
-
-	yaml_EMIT_FIRST_DOCUMENT_START_STATE       // Expect the first DOCUMENT-START or STREAM-END.
-	yaml_EMIT_DOCUMENT_START_STATE             // Expect DOCUMENT-START or STREAM-END.
-	yaml_EMIT_DOCUMENT_CONTENT_STATE           // Expect the content of a document.
-	yaml_EMIT_DOCUMENT_END_STATE               // Expect DOCUMENT-END.
-	yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE   // Expect the first item of a flow sequence.
-	yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE         // Expect an item of a flow sequence.
-	yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE     // Expect the first key of a flow mapping.
-	yaml_EMIT_FLOW_MAPPING_KEY_STATE           // Expect a key of a flow mapping.
-	yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE  // Expect a value for a simple key of a flow mapping.
-	yaml_EMIT_FLOW_MAPPING_VALUE_STATE         // Expect a value of a flow mapping.
-	yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE  // Expect the first item of a block sequence.
-	yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE        // Expect an item of a block sequence.
-	yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE    // Expect the first key of a block mapping.
-	yaml_EMIT_BLOCK_MAPPING_KEY_STATE          // Expect the key of a block mapping.
-	yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE // Expect a value for a simple key of a block mapping.
-	yaml_EMIT_BLOCK_MAPPING_VALUE_STATE        // Expect a value of a block mapping.
-	yaml_EMIT_END_STATE                        // Expect nothing.
-)
-
-// The emitter structure.
-//
-// All members are internal.  Manage the structure using the @c yaml_emitter_
-// family of functions.
-type yaml_emitter_t struct {
-
-	// Error handling
-
-	error   yaml_error_type_t // Error type.
-	problem string            // Error description.
-
-	// Writer stuff
-
-	write_handler yaml_write_handler_t // Write handler.
-
-	output_buffer *[]byte   // String output data.
-	output_file   io.Writer // File output data.
-
-	buffer     []byte // The working buffer.
-	buffer_pos int    // The current position of the buffer.
-
-	raw_buffer     []byte // The raw buffer.
-	raw_buffer_pos int    // The current position of the buffer.
-
-	encoding yaml_encoding_t // The stream encoding.
-
-	// Emitter stuff
-
-	canonical   bool         // If the output is in the canonical style?
-	best_indent int          // The number of indentation spaces.
-	best_width  int          // The preferred width of the output lines.
-	unicode     bool         // Allow unescaped non-ASCII characters?
-	line_break  yaml_break_t // The preferred line break.
-
-	state  yaml_emitter_state_t   // The current emitter state.
-	states []yaml_emitter_state_t // The stack of states.
-
-	events      []yaml_event_t // The event queue.
-	events_head int            // The head of the event queue.
-
-	indents []int // The stack of indentation levels.
-
-	tag_directives []yaml_tag_directive_t // The list of tag directives.
-
-	indent int // The current indentation level.
-
-	flow_level int // The current flow level.
-
-	root_context       bool // Is it the document root context?
-	sequence_context   bool // Is it a sequence context?
-	mapping_context    bool // Is it a mapping context?
-	simple_key_context bool // Is it a simple mapping key context?
-
-	line       int  // The current line.
-	column     int  // The current column.
-	whitespace bool // If the last character was a whitespace?
-	indention  bool // If the last character was an indentation character (' ', '-', '?', ':')?
-	open_ended bool // If an explicit document end is required?
-
-	// Anchor analysis.
-	anchor_data struct {
-		anchor []byte // The anchor value.
-		alias  bool   // Is it an alias?
-	}
-
-	// Tag analysis.
-	tag_data struct {
-		handle []byte // The tag handle.
-		suffix []byte // The tag suffix.
-	}
-
-	// Scalar analysis.
-	scalar_data struct {
-		value                 []byte              // The scalar value.
-		multiline             bool                // Does the scalar contain line breaks?
-		flow_plain_allowed    bool                // Can the scalar be expessed in the flow plain style?
-		block_plain_allowed   bool                // Can the scalar be expressed in the block plain style?
-		single_quoted_allowed bool                // Can the scalar be expressed in the single quoted style?
-		block_allowed         bool                // Can the scalar be expressed in the literal or folded styles?
-		style                 yaml_scalar_style_t // The output style.
-	}
-
-	// Dumper stuff
-
-	opened bool // If the stream was already opened?
-	closed bool // If the stream was already closed?
-
-	// The information associated with the document nodes.
-	anchors *struct {
-		references int  // The number of references.
-		anchor     int  // The anchor id.
-		serialized bool // If the node has been emitted?
-	}
-
-	last_anchor_id int // The last assigned anchor id.
-
-	document *yaml_document_t // The currently emitted document.
-}
diff --git a/vendor/github.com/sanathkr/go-yaml/yamlprivateh.go b/vendor/github.com/sanathkr/go-yaml/yamlprivateh.go
deleted file mode 100644
index 8110ce3c37..0000000000
--- a/vendor/github.com/sanathkr/go-yaml/yamlprivateh.go
+++ /dev/null
@@ -1,173 +0,0 @@
-package yaml
-
-const (
-	// The size of the input raw buffer.
-	input_raw_buffer_size = 512
-
-	// The size of the input buffer.
-	// It should be possible to decode the whole raw buffer.
-	input_buffer_size = input_raw_buffer_size * 3
-
-	// The size of the output buffer.
-	output_buffer_size = 128
-
-	// The size of the output raw buffer.
-	// It should be possible to encode the whole output buffer.
-	output_raw_buffer_size = (output_buffer_size*2 + 2)
-
-	// The size of other stacks and queues.
-	initial_stack_size  = 16
-	initial_queue_size  = 16
-	initial_string_size = 16
-)
-
-// Check if the character at the specified position is an alphabetical
-// character, a digit, '_', or '-'.
-func is_alpha(b []byte, i int) bool {
-	return b[i] >= '0' && b[i] <= '9' || b[i] >= 'A' && b[i] <= 'Z' || b[i] >= 'a' && b[i] <= 'z' || b[i] == '_' || b[i] == '-'
-}
-
-// Check if the character at the specified position is a digit.
-func is_digit(b []byte, i int) bool {
-	return b[i] >= '0' && b[i] <= '9'
-}
-
-// Get the value of a digit.
-func as_digit(b []byte, i int) int {
-	return int(b[i]) - '0'
-}
-
-// Check if the character at the specified position is a hex-digit.
-func is_hex(b []byte, i int) bool {
-	return b[i] >= '0' && b[i] <= '9' || b[i] >= 'A' && b[i] <= 'F' || b[i] >= 'a' && b[i] <= 'f'
-}
-
-// Get the value of a hex-digit.
-func as_hex(b []byte, i int) int {
-	bi := b[i]
-	if bi >= 'A' && bi <= 'F' {
-		return int(bi) - 'A' + 10
-	}
-	if bi >= 'a' && bi <= 'f' {
-		return int(bi) - 'a' + 10
-	}
-	return int(bi) - '0'
-}
-
-// Check if the character is ASCII.
-func is_ascii(b []byte, i int) bool {
-	return b[i] <= 0x7F
-}
-
-// Check if the character at the start of the buffer can be printed unescaped.
-func is_printable(b []byte, i int) bool {
-	return ((b[i] == 0x0A) || // . == #x0A
-		(b[i] >= 0x20 && b[i] <= 0x7E) || // #x20 <= . <= #x7E
-		(b[i] == 0xC2 && b[i+1] >= 0xA0) || // #0xA0 <= . <= #xD7FF
-		(b[i] > 0xC2 && b[i] < 0xED) ||
-		(b[i] == 0xED && b[i+1] < 0xA0) ||
-		(b[i] == 0xEE) ||
-		(b[i] == 0xEF && // #xE000 <= . <= #xFFFD
-			!(b[i+1] == 0xBB && b[i+2] == 0xBF) && // && . != #xFEFF
-			!(b[i+1] == 0xBF && (b[i+2] == 0xBE || b[i+2] == 0xBF))))
-}
-
-// Check if the character at the specified position is NUL.
-func is_z(b []byte, i int) bool {
-	return b[i] == 0x00
-}
-
-// Check if the beginning of the buffer is a BOM.
-func is_bom(b []byte, i int) bool {
-	return b[0] == 0xEF && b[1] == 0xBB && b[2] == 0xBF
-}
-
-// Check if the character at the specified position is space.
-func is_space(b []byte, i int) bool {
-	return b[i] == ' '
-}
-
-// Check if the character at the specified position is tab.
-func is_tab(b []byte, i int) bool {
-	return b[i] == '\t'
-}
-
-// Check if the character at the specified position is blank (space or tab).
-func is_blank(b []byte, i int) bool {
-	//return is_space(b, i) || is_tab(b, i)
-	return b[i] == ' ' || b[i] == '\t'
-}
-
-// Check if the character at the specified position is a line break.
-func is_break(b []byte, i int) bool {
-	return (b[i] == '\r' || // CR (#xD)
-		b[i] == '\n' || // LF (#xA)
-		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9) // PS (#x2029)
-}
-
-func is_crlf(b []byte, i int) bool {
-	return b[i] == '\r' && b[i+1] == '\n'
-}
-
-// Check if the character is a line break or NUL.
-func is_breakz(b []byte, i int) bool {
-	//return is_break(b, i) || is_z(b, i)
-	return (        // is_break:
-	b[i] == '\r' || // CR (#xD)
-		b[i] == '\n' || // LF (#xA)
-		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029)
-		// is_z:
-		b[i] == 0)
-}
-
-// Check if the character is a line break, space, or NUL.
-func is_spacez(b []byte, i int) bool {
-	//return is_space(b, i) || is_breakz(b, i)
-	return ( // is_space:
-	b[i] == ' ' ||
-		// is_breakz:
-		b[i] == '\r' || // CR (#xD)
-		b[i] == '\n' || // LF (#xA)
-		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029)
-		b[i] == 0)
-}
-
-// Check if the character is a line break, space, tab, or NUL.
-func is_blankz(b []byte, i int) bool {
-	//return is_blank(b, i) || is_breakz(b, i)
-	return ( // is_blank:
-	b[i] == ' ' || b[i] == '\t' ||
-		// is_breakz:
-		b[i] == '\r' || // CR (#xD)
-		b[i] == '\n' || // LF (#xA)
-		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029)
-		b[i] == 0)
-}
-
-// Determine the width of the character.
-func width(b byte) int {
-	// Don't replace these by a switch without first
-	// confirming that it is being inlined.
-	if b&0x80 == 0x00 {
-		return 1
-	}
-	if b&0xE0 == 0xC0 {
-		return 2
-	}
-	if b&0xF0 == 0xE0 {
-		return 3
-	}
-	if b&0xF8 == 0xF0 {
-		return 4
-	}
-	return 0
-
-}
diff --git a/vendor/github.com/sanathkr/yaml/LICENSE b/vendor/github.com/sanathkr/yaml/LICENSE
deleted file mode 100644
index 7805d36de7..0000000000
--- a/vendor/github.com/sanathkr/yaml/LICENSE
+++ /dev/null
@@ -1,50 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Sam Ghods
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/sanathkr/yaml/README.md b/vendor/github.com/sanathkr/yaml/README.md
deleted file mode 100644
index 0200f75b4d..0000000000
--- a/vendor/github.com/sanathkr/yaml/README.md
+++ /dev/null
@@ -1,121 +0,0 @@
-# YAML marshaling and unmarshaling support for Go
-
-[![Build Status](https://travis-ci.org/ghodss/yaml.svg)](https://travis-ci.org/ghodss/yaml)
-
-## Introduction
-
-A wrapper around [go-yaml](https://github.com/go-yaml/yaml) designed to enable a better way of handling YAML when marshaling to and from structs.
-
-In short, this library first converts YAML to JSON using go-yaml and then uses `json.Marshal` and `json.Unmarshal` to convert to or from the struct. This means that it effectively reuses the JSON struct tags as well as the custom JSON methods `MarshalJSON` and `UnmarshalJSON` unlike go-yaml. For a detailed overview of the rationale behind this method, [see this blog post](http://ghodss.com/2014/the-right-way-to-handle-yaml-in-golang/).
-
-## Compatibility
-
-This package uses [go-yaml](https://github.com/go-yaml/yaml) and therefore supports [everything go-yaml supports](https://github.com/go-yaml/yaml#compatibility).
-
-## Caveats
-
-**Caveat #1:** When using `yaml.Marshal` and `yaml.Unmarshal`, binary data should NOT be preceded with the `!!binary` YAML tag. If you do, go-yaml will convert the binary data from base64 to native binary data, which is not compatible with JSON. You can still use binary in your YAML files though - just store them without the `!!binary` tag and decode the base64 in your code (e.g. in the custom JSON methods `MarshalJSON` and `UnmarshalJSON`). This also has the benefit that your YAML and your JSON binary data will be decoded exactly the same way. As an example:
-
-```
-BAD:
-	exampleKey: !!binary gIGC
-
-GOOD:
-	exampleKey: gIGC
-... and decode the base64 data in your code.
-```
-
-**Caveat #2:** When using `YAMLToJSON` directly, maps with keys that are maps will result in an error since this is not supported by JSON. This error will occur in `Unmarshal` as well since you can't unmarshal map keys anyways since struct fields can't be keys.
-
-## Installation and usage
-
-To install, run:
-
-```
-$ go get github.com/ghodss/yaml
-```
-
-And import using:
-
-```
-import "github.com/ghodss/yaml"
-```
-
-Usage is very similar to the JSON library:
-
-```go
-package main
-
-import (
-	"fmt"
-
-	"github.com/ghodss/yaml"
-)
-
-type Person struct {
-	Name string `json:"name"` // Affects YAML field names too.
-	Age  int    `json:"age"`
-}
-
-func main() {
-	// Marshal a Person struct to YAML.
-	p := Person{"John", 30}
-	y, err := yaml.Marshal(p)
-	if err != nil {
-		fmt.Printf("err: %v\n", err)
-		return
-	}
-	fmt.Println(string(y))
-	/* Output:
-	age: 30
-	name: John
-	*/
-
-	// Unmarshal the YAML back into a Person struct.
-	var p2 Person
-	err = yaml.Unmarshal(y, &p2)
-	if err != nil {
-		fmt.Printf("err: %v\n", err)
-		return
-	}
-	fmt.Println(p2)
-	/* Output:
-	{John 30}
-	*/
-}
-```
-
-`yaml.YAMLToJSON` and `yaml.JSONToYAML` methods are also available:
-
-```go
-package main
-
-import (
-	"fmt"
-
-	"github.com/ghodss/yaml"
-)
-
-func main() {
-	j := []byte(`{"name": "John", "age": 30}`)
-	y, err := yaml.JSONToYAML(j)
-	if err != nil {
-		fmt.Printf("err: %v\n", err)
-		return
-	}
-	fmt.Println(string(y))
-	/* Output:
-	name: John
-	age: 30
-	*/
-	j2, err := yaml.YAMLToJSON(y)
-	if err != nil {
-		fmt.Printf("err: %v\n", err)
-		return
-	}
-	fmt.Println(string(j2))
-	/* Output:
-	{"age":30,"name":"John"}
-	*/
-}
-```
diff --git a/vendor/github.com/sanathkr/yaml/fields.go b/vendor/github.com/sanathkr/yaml/fields.go
deleted file mode 100644
index 5860074026..0000000000
--- a/vendor/github.com/sanathkr/yaml/fields.go
+++ /dev/null
@@ -1,501 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-package yaml
-
-import (
-	"bytes"
-	"encoding"
-	"encoding/json"
-	"reflect"
-	"sort"
-	"strings"
-	"sync"
-	"unicode"
-	"unicode/utf8"
-)
-
-// indirect walks down v allocating pointers as needed,
-// until it gets to a non-pointer.
-// if it encounters an Unmarshaler, indirect stops and returns that.
-// if decodingNull is true, indirect stops at the last pointer so it can be set to nil.
-func indirect(v reflect.Value, decodingNull bool) (json.Unmarshaler, encoding.TextUnmarshaler, reflect.Value) {
-	// If v is a named type and is addressable,
-	// start with its address, so that if the type has pointer methods,
-	// we find them.
-	if v.Kind() != reflect.Ptr && v.Type().Name() != "" && v.CanAddr() {
-		v = v.Addr()
-	}
-	for {
-		// Load value from interface, but only if the result will be
-		// usefully addressable.
-		if v.Kind() == reflect.Interface && !v.IsNil() {
-			e := v.Elem()
-			if e.Kind() == reflect.Ptr && !e.IsNil() && (!decodingNull || e.Elem().Kind() == reflect.Ptr) {
-				v = e
-				continue
-			}
-		}
-
-		if v.Kind() != reflect.Ptr {
-			break
-		}
-
-		if v.Elem().Kind() != reflect.Ptr && decodingNull && v.CanSet() {
-			break
-		}
-		if v.IsNil() {
-			if v.CanSet() {
-				v.Set(reflect.New(v.Type().Elem()))
-			} else {
-				v = reflect.New(v.Type().Elem())
-			}
-		}
-		if v.Type().NumMethod() > 0 {
-			if u, ok := v.Interface().(json.Unmarshaler); ok {
-				return u, nil, reflect.Value{}
-			}
-			if u, ok := v.Interface().(encoding.TextUnmarshaler); ok {
-				return nil, u, reflect.Value{}
-			}
-		}
-		v = v.Elem()
-	}
-	return nil, nil, v
-}
-
-// A field represents a single field found in a struct.
-type field struct {
-	name      string
-	nameBytes []byte                 // []byte(name)
-	equalFold func(s, t []byte) bool // bytes.EqualFold or equivalent
-
-	tag       bool
-	index     []int
-	typ       reflect.Type
-	omitEmpty bool
-	quoted    bool
-}
-
-func fillField(f field) field {
-	f.nameBytes = []byte(f.name)
-	f.equalFold = foldFunc(f.nameBytes)
-	return f
-}
-
-// byName sorts field by name, breaking ties with depth,
-// then breaking ties with "name came from json tag", then
-// breaking ties with index sequence.
-type byName []field
-
-func (x byName) Len() int { return len(x) }
-
-func (x byName) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-
-func (x byName) Less(i, j int) bool {
-	if x[i].name != x[j].name {
-		return x[i].name < x[j].name
-	}
-	if len(x[i].index) != len(x[j].index) {
-		return len(x[i].index) < len(x[j].index)
-	}
-	if x[i].tag != x[j].tag {
-		return x[i].tag
-	}
-	return byIndex(x).Less(i, j)
-}
-
-// byIndex sorts field by index sequence.
-type byIndex []field
-
-func (x byIndex) Len() int { return len(x) }
-
-func (x byIndex) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-
-func (x byIndex) Less(i, j int) bool {
-	for k, xik := range x[i].index {
-		if k >= len(x[j].index) {
-			return false
-		}
-		if xik != x[j].index[k] {
-			return xik < x[j].index[k]
-		}
-	}
-	return len(x[i].index) < len(x[j].index)
-}
-
-// typeFields returns a list of fields that JSON should recognize for the given type.
-// The algorithm is breadth-first search over the set of structs to include - the top struct
-// and then any reachable anonymous structs.
-func typeFields(t reflect.Type) []field {
-	// Anonymous fields to explore at the current level and the next.
-	current := []field{}
-	next := []field{{typ: t}}
-
-	// Count of queued names for current level and the next.
-	count := map[reflect.Type]int{}
-	nextCount := map[reflect.Type]int{}
-
-	// Types already visited at an earlier level.
-	visited := map[reflect.Type]bool{}
-
-	// Fields found.
-	var fields []field
-
-	for len(next) > 0 {
-		current, next = next, current[:0]
-		count, nextCount = nextCount, map[reflect.Type]int{}
-
-		for _, f := range current {
-			if visited[f.typ] {
-				continue
-			}
-			visited[f.typ] = true
-
-			// Scan f.typ for fields to include.
-			for i := 0; i < f.typ.NumField(); i++ {
-				sf := f.typ.Field(i)
-				if sf.PkgPath != "" { // unexported
-					continue
-				}
-				tag := sf.Tag.Get("json")
-				if tag == "-" {
-					continue
-				}
-				name, opts := parseTag(tag)
-				if !isValidTag(name) {
-					name = ""
-				}
-				index := make([]int, len(f.index)+1)
-				copy(index, f.index)
-				index[len(f.index)] = i
-
-				ft := sf.Type
-				if ft.Name() == "" && ft.Kind() == reflect.Ptr {
-					// Follow pointer.
-					ft = ft.Elem()
-				}
-
-				// Record found field and index sequence.
-				if name != "" || !sf.Anonymous || ft.Kind() != reflect.Struct {
-					tagged := name != ""
-					if name == "" {
-						name = sf.Name
-					}
-					fields = append(fields, fillField(field{
-						name:      name,
-						tag:       tagged,
-						index:     index,
-						typ:       ft,
-						omitEmpty: opts.Contains("omitempty"),
-						quoted:    opts.Contains("string"),
-					}))
-					if count[f.typ] > 1 {
-						// If there were multiple instances, add a second,
-						// so that the annihilation code will see a duplicate.
-						// It only cares about the distinction between 1 or 2,
-						// so don't bother generating any more copies.
-						fields = append(fields, fields[len(fields)-1])
-					}
-					continue
-				}
-
-				// Record new anonymous struct to explore in next round.
-				nextCount[ft]++
-				if nextCount[ft] == 1 {
-					next = append(next, fillField(field{name: ft.Name(), index: index, typ: ft}))
-				}
-			}
-		}
-	}
-
-	sort.Sort(byName(fields))
-
-	// Delete all fields that are hidden by the Go rules for embedded fields,
-	// except that fields with JSON tags are promoted.
-
-	// The fields are sorted in primary order of name, secondary order
-	// of field index length. Loop over names; for each name, delete
-	// hidden fields by choosing the one dominant field that survives.
-	out := fields[:0]
-	for advance, i := 0, 0; i < len(fields); i += advance {
-		// One iteration per name.
-		// Find the sequence of fields with the name of this first field.
-		fi := fields[i]
-		name := fi.name
-		for advance = 1; i+advance < len(fields); advance++ {
-			fj := fields[i+advance]
-			if fj.name != name {
-				break
-			}
-		}
-		if advance == 1 { // Only one field with this name
-			out = append(out, fi)
-			continue
-		}
-		dominant, ok := dominantField(fields[i : i+advance])
-		if ok {
-			out = append(out, dominant)
-		}
-	}
-
-	fields = out
-	sort.Sort(byIndex(fields))
-
-	return fields
-}
-
-// dominantField looks through the fields, all of which are known to
-// have the same name, to find the single field that dominates the
-// others using Go's embedding rules, modified by the presence of
-// JSON tags. If there are multiple top-level fields, the boolean
-// will be false: This condition is an error in Go and we skip all
-// the fields.
-func dominantField(fields []field) (field, bool) {
-	// The fields are sorted in increasing index-length order. The winner
-	// must therefore be one with the shortest index length. Drop all
-	// longer entries, which is easy: just truncate the slice.
-	length := len(fields[0].index)
-	tagged := -1 // Index of first tagged field.
-	for i, f := range fields {
-		if len(f.index) > length {
-			fields = fields[:i]
-			break
-		}
-		if f.tag {
-			if tagged >= 0 {
-				// Multiple tagged fields at the same level: conflict.
-				// Return no field.
-				return field{}, false
-			}
-			tagged = i
-		}
-	}
-	if tagged >= 0 {
-		return fields[tagged], true
-	}
-	// All remaining fields have the same length. If there's more than one,
-	// we have a conflict (two fields named "X" at the same level) and we
-	// return no field.
-	if len(fields) > 1 {
-		return field{}, false
-	}
-	return fields[0], true
-}
-
-var fieldCache struct {
-	sync.RWMutex
-	m map[reflect.Type][]field
-}
-
-// cachedTypeFields is like typeFields but uses a cache to avoid repeated work.
-func cachedTypeFields(t reflect.Type) []field {
-	fieldCache.RLock()
-	f := fieldCache.m[t]
-	fieldCache.RUnlock()
-	if f != nil {
-		return f
-	}
-
-	// Compute fields without lock.
-	// Might duplicate effort but won't hold other computations back.
-	f = typeFields(t)
-	if f == nil {
-		f = []field{}
-	}
-
-	fieldCache.Lock()
-	if fieldCache.m == nil {
-		fieldCache.m = map[reflect.Type][]field{}
-	}
-	fieldCache.m[t] = f
-	fieldCache.Unlock()
-	return f
-}
-
-func isValidTag(s string) bool {
-	if s == "" {
-		return false
-	}
-	for _, c := range s {
-		switch {
-		case strings.ContainsRune("!#$%&()*+-./:<=>?@[]^_{|}~ ", c):
-			// Backslash and quote chars are reserved, but
-			// otherwise any punctuation chars are allowed
-			// in a tag name.
-		default:
-			if !unicode.IsLetter(c) && !unicode.IsDigit(c) {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-const (
-	caseMask     = ^byte(0x20) // Mask to ignore case in ASCII.
-	kelvin       = '\u212a'
-	smallLongEss = '\u017f'
-)
-
-// foldFunc returns one of four different case folding equivalence
-// functions, from most general (and slow) to fastest:
-//
-// 1) bytes.EqualFold, if the key s contains any non-ASCII UTF-8
-// 2) equalFoldRight, if s contains special folding ASCII ('k', 'K', 's', 'S')
-// 3) asciiEqualFold, no special, but includes non-letters (including _)
-// 4) simpleLetterEqualFold, no specials, no non-letters.
-//
-// The letters S and K are special because they map to 3 runes, not just 2:
-//  * S maps to s and to U+017F 'ſ' Latin small letter long s
-//  * k maps to K and to U+212A 'K' Kelvin sign
-// See http://play.golang.org/p/tTxjOc0OGo
-//
-// The returned function is specialized for matching against s and
-// should only be given s. It's not curried for performance reasons.
-func foldFunc(s []byte) func(s, t []byte) bool {
-	nonLetter := false
-	special := false // special letter
-	for _, b := range s {
-		if b >= utf8.RuneSelf {
-			return bytes.EqualFold
-		}
-		upper := b & caseMask
-		if upper < 'A' || upper > 'Z' {
-			nonLetter = true
-		} else if upper == 'K' || upper == 'S' {
-			// See above for why these letters are special.
-			special = true
-		}
-	}
-	if special {
-		return equalFoldRight
-	}
-	if nonLetter {
-		return asciiEqualFold
-	}
-	return simpleLetterEqualFold
-}
-
-// equalFoldRight is a specialization of bytes.EqualFold when s is
-// known to be all ASCII (including punctuation), but contains an 's',
-// 'S', 'k', or 'K', requiring a Unicode fold on the bytes in t.
-// See comments on foldFunc.
-func equalFoldRight(s, t []byte) bool {
-	for _, sb := range s {
-		if len(t) == 0 {
-			return false
-		}
-		tb := t[0]
-		if tb < utf8.RuneSelf {
-			if sb != tb {
-				sbUpper := sb & caseMask
-				if 'A' <= sbUpper && sbUpper <= 'Z' {
-					if sbUpper != tb&caseMask {
-						return false
-					}
-				} else {
-					return false
-				}
-			}
-			t = t[1:]
-			continue
-		}
-		// sb is ASCII and t is not. t must be either kelvin
-		// sign or long s; sb must be s, S, k, or K.
-		tr, size := utf8.DecodeRune(t)
-		switch sb {
-		case 's', 'S':
-			if tr != smallLongEss {
-				return false
-			}
-		case 'k', 'K':
-			if tr != kelvin {
-				return false
-			}
-		default:
-			return false
-		}
-		t = t[size:]
-
-	}
-	if len(t) > 0 {
-		return false
-	}
-	return true
-}
-
-// asciiEqualFold is a specialization of bytes.EqualFold for use when
-// s is all ASCII (but may contain non-letters) and contains no
-// special-folding letters.
-// See comments on foldFunc.
-func asciiEqualFold(s, t []byte) bool {
-	if len(s) != len(t) {
-		return false
-	}
-	for i, sb := range s {
-		tb := t[i]
-		if sb == tb {
-			continue
-		}
-		if ('a' <= sb && sb <= 'z') || ('A' <= sb && sb <= 'Z') {
-			if sb&caseMask != tb&caseMask {
-				return false
-			}
-		} else {
-			return false
-		}
-	}
-	return true
-}
-
-// simpleLetterEqualFold is a specialization of bytes.EqualFold for
-// use when s is all ASCII letters (no underscores, etc) and also
-// doesn't contain 'k', 'K', 's', or 'S'.
-// See comments on foldFunc.
-func simpleLetterEqualFold(s, t []byte) bool {
-	if len(s) != len(t) {
-		return false
-	}
-	for i, b := range s {
-		if b&caseMask != t[i]&caseMask {
-			return false
-		}
-	}
-	return true
-}
-
-// tagOptions is the string following a comma in a struct field's "json"
-// tag, or the empty string. It does not include the leading comma.
-type tagOptions string
-
-// parseTag splits a struct field's json tag into its name and
-// comma-separated options.
-func parseTag(tag string) (string, tagOptions) {
-	if idx := strings.Index(tag, ","); idx != -1 {
-		return tag[:idx], tagOptions(tag[idx+1:])
-	}
-	return tag, tagOptions("")
-}
-
-// Contains reports whether a comma-separated list of options
-// contains a particular substr flag. substr must be surrounded by a
-// string boundary or commas.
-func (o tagOptions) Contains(optionName string) bool {
-	if len(o) == 0 {
-		return false
-	}
-	s := string(o)
-	for s != "" {
-		var next string
-		i := strings.Index(s, ",")
-		if i >= 0 {
-			s, next = s[:i], s[i+1:]
-		}
-		if s == optionName {
-			return true
-		}
-		s = next
-	}
-	return false
-}
diff --git a/vendor/github.com/sanathkr/yaml/yaml.go b/vendor/github.com/sanathkr/yaml/yaml.go
deleted file mode 100644
index 132a8fe88f..0000000000
--- a/vendor/github.com/sanathkr/yaml/yaml.go
+++ /dev/null
@@ -1,277 +0,0 @@
-package yaml
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"strconv"
-
-	"github.com/sanathkr/go-yaml"
-)
-
-// Marshals the object into JSON then converts JSON to YAML and returns the
-// YAML.
-func Marshal(o interface{}) ([]byte, error) {
-	j, err := json.Marshal(o)
-	if err != nil {
-		return nil, fmt.Errorf("error marshaling into JSON: %v", err)
-	}
-
-	y, err := JSONToYAML(j)
-	if err != nil {
-		return nil, fmt.Errorf("error converting JSON to YAML: %v", err)
-	}
-
-	return y, nil
-}
-
-// Converts YAML to JSON then uses JSON to unmarshal into an object.
-func Unmarshal(y []byte, o interface{}) error {
-	vo := reflect.ValueOf(o)
-	j, err := yamlToJSON(y, &vo)
-	if err != nil {
-		return fmt.Errorf("error converting YAML to JSON: %v", err)
-	}
-
-	err = json.Unmarshal(j, o)
-	if err != nil {
-		return fmt.Errorf("error unmarshaling JSON: %v", err)
-	}
-
-	return nil
-}
-
-// Convert JSON to YAML.
-func JSONToYAML(j []byte) ([]byte, error) {
-	// Convert the JSON to an object.
-	var jsonObj interface{}
-	// We are using yaml.Unmarshal here (instead of json.Unmarshal) because the
-	// Go JSON library doesn't try to pick the right number type (int, float,
-	// etc.) when unmarshalling to interface{}, it just picks float64
-	// universally. go-yaml does go through the effort of picking the right
-	// number type, so we can preserve number type throughout this process.
-	err := yaml.Unmarshal(j, &jsonObj)
-	if err != nil {
-		return nil, err
-	}
-
-	// Marshal this object into YAML.
-	return yaml.Marshal(jsonObj)
-}
-
-// Convert YAML to JSON. Since JSON is a subset of YAML, passing JSON through
-// this method should be a no-op.
-//
-// Things YAML can do that are not supported by JSON:
-// * In YAML you can have binary and null keys in your maps. These are invalid
-//   in JSON. (int and float keys are converted to strings.)
-// * Binary data in YAML with the !!binary tag is not supported. If you want to
-//   use binary data with this library, encode the data as base64 as usual but do
-//   not use the !!binary tag in your YAML. This will ensure the original base64
-//   encoded data makes it all the way through to the JSON.
-func YAMLToJSON(y []byte) ([]byte, error) {
-	return yamlToJSON(y, nil)
-}
-
-func yamlToJSON(y []byte, jsonTarget *reflect.Value) ([]byte, error) {
-	// Convert the YAML to an object.
-	var yamlObj interface{}
-	err := yaml.Unmarshal(y, &yamlObj)
-	if err != nil {
-		return nil, err
-	}
-
-	// YAML objects are not completely compatible with JSON objects (e.g. you
-	// can have non-string keys in YAML). So, convert the YAML-compatible object
-	// to a JSON-compatible object, failing with an error if irrecoverable
-	// incompatibilties happen along the way.
-	jsonObj, err := convertToJSONableObject(yamlObj, jsonTarget)
-	if err != nil {
-		return nil, err
-	}
-
-	// Convert this object to JSON and return the data.
-	return json.Marshal(jsonObj)
-}
-
-func convertToJSONableObject(yamlObj interface{}, jsonTarget *reflect.Value) (interface{}, error) {
-	var err error
-
-	// Resolve jsonTarget to a concrete value (i.e. not a pointer or an
-	// interface). We pass decodingNull as false because we're not actually
-	// decoding into the value, we're just checking if the ultimate target is a
-	// string.
-	if jsonTarget != nil {
-		ju, tu, pv := indirect(*jsonTarget, false)
-		// We have a JSON or Text Umarshaler at this level, so we can't be trying
-		// to decode into a string.
-		if ju != nil || tu != nil {
-			jsonTarget = nil
-		} else {
-			jsonTarget = &pv
-		}
-	}
-
-	// If yamlObj is a number or a boolean, check if jsonTarget is a string -
-	// if so, coerce.  Else return normal.
-	// If yamlObj is a map or array, find the field that each key is
-	// unmarshaling to, and when you recurse pass the reflect.Value for that
-	// field back into this function.
-	switch typedYAMLObj := yamlObj.(type) {
-	case map[interface{}]interface{}:
-		// JSON does not support arbitrary keys in a map, so we must convert
-		// these keys to strings.
-		//
-		// From my reading of go-yaml v2 (specifically the resolve function),
-		// keys can only have the types string, int, int64, float64, binary
-		// (unsupported), or null (unsupported).
-		strMap := make(map[string]interface{})
-		for k, v := range typedYAMLObj {
-			// Resolve the key to a string first.
-			var keyString string
-			switch typedKey := k.(type) {
-			case string:
-				keyString = typedKey
-			case int:
-				keyString = strconv.Itoa(typedKey)
-			case int64:
-				// go-yaml will only return an int64 as a key if the system
-				// architecture is 32-bit and the key's value is between 32-bit
-				// and 64-bit. Otherwise the key type will simply be int.
-				keyString = strconv.FormatInt(typedKey, 10)
-			case float64:
-				// Stolen from go-yaml to use the same conversion to string as
-				// the go-yaml library uses to convert float to string when
-				// Marshaling.
-				s := strconv.FormatFloat(typedKey, 'g', -1, 32)
-				switch s {
-				case "+Inf":
-					s = ".inf"
-				case "-Inf":
-					s = "-.inf"
-				case "NaN":
-					s = ".nan"
-				}
-				keyString = s
-			case bool:
-				if typedKey {
-					keyString = "true"
-				} else {
-					keyString = "false"
-				}
-			default:
-				return nil, fmt.Errorf("Unsupported map key of type: %s, key: %+#v, value: %+#v",
-					reflect.TypeOf(k), k, v)
-			}
-
-			// jsonTarget should be a struct or a map. If it's a struct, find
-			// the field it's going to map to and pass its reflect.Value. If
-			// it's a map, find the element type of the map and pass the
-			// reflect.Value created from that type. If it's neither, just pass
-			// nil - JSON conversion will error for us if it's a real issue.
-			if jsonTarget != nil {
-				t := *jsonTarget
-				if t.Kind() == reflect.Struct {
-					keyBytes := []byte(keyString)
-					// Find the field that the JSON library would use.
-					var f *field
-					fields := cachedTypeFields(t.Type())
-					for i := range fields {
-						ff := &fields[i]
-						if bytes.Equal(ff.nameBytes, keyBytes) {
-							f = ff
-							break
-						}
-						// Do case-insensitive comparison.
-						if f == nil && ff.equalFold(ff.nameBytes, keyBytes) {
-							f = ff
-						}
-					}
-					if f != nil {
-						// Find the reflect.Value of the most preferential
-						// struct field.
-						jtf := t.Field(f.index[0])
-						strMap[keyString], err = convertToJSONableObject(v, &jtf)
-						if err != nil {
-							return nil, err
-						}
-						continue
-					}
-				} else if t.Kind() == reflect.Map {
-					// Create a zero value of the map's element type to use as
-					// the JSON target.
-					jtv := reflect.Zero(t.Type().Elem())
-					strMap[keyString], err = convertToJSONableObject(v, &jtv)
-					if err != nil {
-						return nil, err
-					}
-					continue
-				}
-			}
-			strMap[keyString], err = convertToJSONableObject(v, nil)
-			if err != nil {
-				return nil, err
-			}
-		}
-		return strMap, nil
-	case []interface{}:
-		// We need to recurse into arrays in case there are any
-		// map[interface{}]interface{}'s inside and to convert any
-		// numbers to strings.
-
-		// If jsonTarget is a slice (which it really should be), find the
-		// thing it's going to map to. If it's not a slice, just pass nil
-		// - JSON conversion will error for us if it's a real issue.
-		var jsonSliceElemValue *reflect.Value
-		if jsonTarget != nil {
-			t := *jsonTarget
-			if t.Kind() == reflect.Slice {
-				// By default slices point to nil, but we need a reflect.Value
-				// pointing to a value of the slice type, so we create one here.
-				ev := reflect.Indirect(reflect.New(t.Type().Elem()))
-				jsonSliceElemValue = &ev
-			}
-		}
-
-		// Make and use a new array.
-		arr := make([]interface{}, len(typedYAMLObj))
-		for i, v := range typedYAMLObj {
-			arr[i], err = convertToJSONableObject(v, jsonSliceElemValue)
-			if err != nil {
-				return nil, err
-			}
-		}
-		return arr, nil
-	default:
-		// If the target type is a string and the YAML type is a number,
-		// convert the YAML type to a string.
-		if jsonTarget != nil && (*jsonTarget).Kind() == reflect.String {
-			// Based on my reading of go-yaml, it may return int, int64,
-			// float64, or uint64.
-			var s string
-			switch typedVal := typedYAMLObj.(type) {
-			case int:
-				s = strconv.FormatInt(int64(typedVal), 10)
-			case int64:
-				s = strconv.FormatInt(typedVal, 10)
-			case float64:
-				s = strconv.FormatFloat(typedVal, 'g', -1, 32)
-			case uint64:
-				s = strconv.FormatUint(typedVal, 10)
-			case bool:
-				if typedVal {
-					s = "true"
-				} else {
-					s = "false"
-				}
-			}
-			if len(s) > 0 {
-				yamlObj = interface{}(s)
-			}
-		}
-		return yamlObj, nil
-	}
-
-	return nil, nil
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/LICENSE b/vendor/github.com/yvasiyarov/swagger/LICENSE
deleted file mode 100644
index e8b1c40752..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2014, Yuriy Vasiyarov
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the {organization} nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/yvasiyarov/swagger/README.md b/vendor/github.com/yvasiyarov/swagger/README.md
deleted file mode 100644
index 8a71a68b86..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-
-![alt text]( https://s3.amazonaws.com/tw-chat/attach/579528d6e2f2c2aebfe7f957e4572ca0/1.png  "Logo Title Text 1")
-
-
-##Swagger UI Generator for Go
-
-
-
-###About
-
-This is a utility for automatically generating API documentation from annotations in Go code. It generates the documentation as JSON, according to the [Swagger Spec](https://github.com/wordnik/swagger-spec), and then displays it using [Swagger UI](https://github.com/swagger-api/swagger-ui).
-
-This tool was inspired by [Beego](http://beego.me/docs/advantage/docs.md), and follows the same annotation standards set by Beego.
-The main difference between this tool and Beego is that this generator doesn't depend on the Beego framework. You can use any framework to implement your API (or don't use a framework at all). You just add declarative comments to your API controllers, then run this generator and your documentation is ready! For an example of what such documentation looks like when presented via Swagger UI, see the Swagger [pet store example](http://petstore.swagger.wordnik.com/).
-
-<br>
-
-
-####Project Status : [Alpha](https://github.com/yvasiyarov/swagger/wiki/Declarative-Comments-Format)
-####Declarative Comments Format : [Read more ](https://github.com/yvasiyarov/swagger/wiki/Declarative-Comments-Format)
-####Technical Notes : [Read More ](https://github.com/yvasiyarov/swagger/wiki/Technical-Notes)
-####Known Limitations : [Read More ](https://github.com/yvasiyarov/swagger/wiki/Known-Limitations)
-
-<br>
-#### Quick Start Guide
-
-
-1. Add comments to your API source code, [see Declarative Comments Format ](https://github.com/yvasiyarov/swagger/wiki/Declarative-Comments-Format)
-
-2. Download Swagger for Go by using ````go get github.com/yvasiyarov/swagger````
-
-3. Or, compile the Swagger generator from sources.
-    `go install`
-
-    This will create a binary in your $GOPATH/bin folder called swagger (Mac/Unix) or swagger.exe (Windows).
-
-3. Run the Swagger generator.
-    Be in the folder with your annotated API source code and run the swagger binary:
-
-    `./$GOPATH/bin/swagger -apiPackage="my_cool_api" -mainApiFile="my_cool_api/web/main.go"`
-
-    Command line switches are:
-    * **-apiPackage**  - package with API controllers implementation
-    * **-mainApiFile** - main API file. We will look for "General API info" in this file. If the mainApiFile command-line switch is left blank, then main.go is assumed (in the location specified by apiPackage).
-    * **-format**       - One of: go|swagger|asciidoc|markdown|confluence. Default is -format="go". See below.
-    * **-output**       - Output specification. Default varies according to -format. See below.
-    * **-controllerClass**  - Speed up parsing by specifying which receiver objects have the controller methods. The default is to search all methods. The argument can be a regular expression. For example, `-controllerClass="(Context|Controller)$"` means the receiver name must end in Context or Controller.
-    * **-contentsTable**       - Generate 'Table of Contents' section, default value is true, if set '-contentsTable=false' it will not generate the section.
-    * **-models**       - Generate 'Models' section, default value is true, if set '-models=false' it will not generate the section.
-    * **-vendoringPath** - Specify the vendoring directory instead of using current working directory
-
- [**You can Generate different formats** ](https://github.com/yvasiyarov/swagger/wiki/Generate-Different-Formats)
-
-   <br>
-
-4. To run the generated swagger UI (assuming you used -format="go"), copy/move the generated docs.go file to a new folder under GOPATH/src. Also bring in the web.go-example file, renaming it to web.go. Then: **go run web.go docs.go**
-
-5. Enjoy it :-)
diff --git a/vendor/github.com/yvasiyarov/swagger/generate_markdown_doc.sh b/vendor/github.com/yvasiyarov/swagger/generate_markdown_doc.sh
deleted file mode 100644
index 9b05439789..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/generate_markdown_doc.sh
+++ /dev/null
@@ -1 +0,0 @@
-$GOPATH/bin/swagger -apiPackage="github.com/yvasiyarov/swagger/example" -mainApiFile="github.com/yvasiyarov/swagger/example/web/main.go" -format="markdown" -output="API.md" -basePath="http://127.0.0.1:8080"
diff --git a/vendor/github.com/yvasiyarov/swagger/generate_swagger_doc.sh b/vendor/github.com/yvasiyarov/swagger/generate_swagger_doc.sh
deleted file mode 100755
index 5dbddca951..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/generate_swagger_doc.sh
+++ /dev/null
@@ -1 +0,0 @@
-go run generator.go -apiPackage="github.com/yvasiyarov/swagger/example" -mainApiFile="github.com/yvasiyarov/swagger/example/web/main.go" -format="swagger"
diff --git a/vendor/github.com/yvasiyarov/swagger/generator/generator.go b/vendor/github.com/yvasiyarov/swagger/generator/generator.go
deleted file mode 100644
index 4c8e16ef83..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/generator/generator.go
+++ /dev/null
@@ -1,214 +0,0 @@
-package generator
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"go/ast"
-	"log"
-	"os"
-	"path"
-	"regexp"
-	"runtime"
-	"strings"
-
-	"github.com/yvasiyarov/swagger/markup"
-	"github.com/yvasiyarov/swagger/parser"
-)
-
-const (
-	AVAILABLE_FORMATS = "go|gopkg|swagger|asciidoc|markdown|confluence"
-)
-
-var generatedFileTemplate = `
-package main
-//This file is generated automatically. Do not try to edit it manually.
-
-var resourceListingJson = {{resourceListing}}
-var apiDescriptionsJson = {{apiDescriptions}}
-`
-
-var generatedPkgTemplate = `
-package {{packageName}}
-//This file is generated automatically. Do not try to edit it manually.
-
-var ResourceListingJson = {{resourceListing}}
-var ApiDescriptionsJson = {{apiDescriptions}}
-`
-
-// It must return true if funcDeclaration is controller. We will try to parse only comments before controllers
-func IsController(funcDeclaration *ast.FuncDecl, controllerClass string) bool {
-	if len(controllerClass) == 0 {
-		// Search every method
-		return true
-	}
-	if funcDeclaration.Recv != nil && len(funcDeclaration.Recv.List) > 0 {
-		if starExpression, ok := funcDeclaration.Recv.List[0].Type.(*ast.StarExpr); ok {
-			receiverName := fmt.Sprint(starExpression.X)
-			matched, err := regexp.MatchString(string(controllerClass), receiverName)
-			if err != nil {
-				log.Fatalf("The -controllerClass argument is not a valid regular expression: %v\n", err)
-			}
-			return matched
-		}
-	}
-	return false
-}
-
-func generateSwaggerDocs(parser *parser.Parser, outputSpec string, pkg bool) error {
-	fd, err := os.Create(path.Join(outputSpec, "docs.go"))
-	if err != nil {
-		return fmt.Errorf("Can not create document file: %v\n", err)
-	}
-	defer fd.Close()
-
-	var apiDescriptions bytes.Buffer
-	for apiKey, apiDescription := range parser.TopLevelApis {
-		apiDescriptions.WriteString("\"" + apiKey + "\":")
-
-		apiDescriptions.WriteString("`")
-		json, err := json.MarshalIndent(apiDescription, "", "    ")
-		if err != nil {
-			return fmt.Errorf("Can not serialise []ApiDescription to JSON: %v\n", err)
-		}
-		apiDescriptions.Write(json)
-		apiDescriptions.WriteString("`,")
-	}
-
-	var doc string
-	if pkg {
-		doc = strings.Replace(generatedPkgTemplate, "{{resourceListing}}", "`"+string(parser.GetResourceListingJson())+"`", -1)
-		doc = strings.Replace(doc, "{{apiDescriptions}}", "map[string]string{"+apiDescriptions.String()+"}", -1)
-		packageName := strings.Split(outputSpec, "/")
-		doc = strings.Replace(doc, "{{packageName}}", packageName[len(packageName)-1], -1)
-	} else {
-		doc = strings.Replace(generatedFileTemplate, "{{resourceListing}}", "`"+string(parser.GetResourceListingJson())+"`", -1)
-		doc = strings.Replace(doc, "{{apiDescriptions}}", "map[string]string{"+apiDescriptions.String()+"}", -1)
-	}
-
-	fd.WriteString(doc)
-
-	return nil
-}
-
-func generateSwaggerUiFiles(parser *parser.Parser, outputSpec string) error {
-	fd, err := os.Create(path.Join(outputSpec, "index.json"))
-	if err != nil {
-		return fmt.Errorf("Can not create the master index.json file: %v\n", err)
-	}
-	defer fd.Close()
-	fd.WriteString(string(parser.GetResourceListingJson()))
-
-	for apiKey, apiDescription := range parser.TopLevelApis {
-		err = os.MkdirAll(path.Join(outputSpec, apiKey), 0777)
-		if err != nil {
-			return err
-		}
-
-		fd, err = os.Create(path.Join(outputSpec, apiKey, "index.json"))
-		if err != nil {
-			return fmt.Errorf("Can not create the %s/index.json file: %v\n", apiKey, err)
-		}
-		defer fd.Close()
-
-		json, err := json.MarshalIndent(apiDescription, "", "    ")
-		if err != nil {
-			return fmt.Errorf("Can not serialise []ApiDescription to JSON: %v\n", err)
-		}
-
-		fd.Write(json)
-		log.Printf("Wrote %v/index.json", apiKey)
-	}
-
-	return nil
-}
-
-func InitParser(controllerClass, ignore string) *parser.Parser {
-	parser := parser.NewParser()
-
-	parser.ControllerClass = controllerClass
-	parser.IsController = IsController
-	parser.Ignore = ignore
-
-	parser.TypesImplementingMarshalInterface["NullString"] = "string"
-	parser.TypesImplementingMarshalInterface["NullInt64"] = "int"
-	parser.TypesImplementingMarshalInterface["NullFloat64"] = "float"
-	parser.TypesImplementingMarshalInterface["NullBool"] = "bool"
-
-	return parser
-}
-
-type Params struct {
-	ApiPackage, MainApiFile, OutputFormat, OutputSpec, ControllerClass, Ignore, VendoringPath string
-	ContentsTable, Models                                                      bool
-}
-
-func Run(params Params) error {
-	parser := InitParser(params.ControllerClass, params.Ignore)
-	gopath := os.Getenv("GOPATH")
-	if gopath == "" {
-		return errors.New("Please, set $GOPATH environment variable\n")
-	}
-
-	log.Println("Start parsing")
-
-	//Support gopaths with multiple directories
-	dirs := strings.Split(gopath, ":")
-	if runtime.GOOS == "windows" {
-		dirs = strings.Split(gopath, ";")
-	}
-	found := false
-	for _, d := range dirs {
-		apifile := path.Join(d, "src", params.MainApiFile)
-		if _, err := os.Stat(apifile); err == nil {
-			parser.ParseGeneralApiInfo(apifile)
-			found = true
-			break // file found, exit the loop
-		}
-	}
-	if found == false {
-		if _, err := os.Stat(params.MainApiFile); err == nil {
-			parser.ParseGeneralApiInfo(params.MainApiFile)
-		} else {
-			apifile := path.Join(gopath, "src", params.MainApiFile)
-			return fmt.Errorf("Could not find apifile %s to parse\n", apifile)
-		}
-	}
-
-	parser.ParseApi(params.ApiPackage, params.VendoringPath)
-	log.Println("Finish parsing")
-
-	var err error
-	confirmMsg := ""
-	format := strings.ToLower(params.OutputFormat)
-	switch format {
-	case "go":
-		err = generateSwaggerDocs(parser, params.OutputSpec, false)
-		confirmMsg = "Doc file generated"
-	case "gopkg":
-		err = generateSwaggerDocs(parser, params.OutputSpec, true)
-		confirmMsg = "Doc package generated"
-	case "asciidoc":
-		err = markup.GenerateMarkup(parser, new(markup.MarkupAsciiDoc), &params.OutputSpec, ".adoc", params.ContentsTable, params.Models)
-		confirmMsg = "AsciiDoc file generated"
-	case "markdown":
-		err = markup.GenerateMarkup(parser, new(markup.MarkupMarkDown), &params.OutputSpec, ".md", params.ContentsTable, params.Models)
-		confirmMsg = "MarkDown file generated"
-	case "confluence":
-		err = markup.GenerateMarkup(parser, new(markup.MarkupConfluence), &params.OutputSpec, ".confluence", params.ContentsTable, params.Models)
-		confirmMsg = "Confluence file generated"
-	case "swagger":
-		err = generateSwaggerUiFiles(parser, params.OutputSpec)
-		confirmMsg = "Swagger UI files generated"
-	default:
-		err = fmt.Errorf("Invalid -format specified. Must be one of %v.", AVAILABLE_FORMATS)
-	}
-
-	if err != nil {
-		return err
-	}
-	log.Println(confirmMsg)
-
-	return nil
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/main.go b/vendor/github.com/yvasiyarov/swagger/main.go
deleted file mode 100644
index ad394da3e7..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/main.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package main
-
-import (
-	"flag"
-	"log"
-
-	"github.com/yvasiyarov/swagger/generator"
-)
-
-var apiPackage = flag.String("apiPackage", "", "The package that implements the API controllers, relative to $GOPATH/src")
-var mainApiFile = flag.String("mainApiFile", "", "The file that contains the general API annotations, relative to $GOPATH/src")
-var outputFormat = flag.String("format", "go", "Output format type for the generated files: "+generator.AVAILABLE_FORMATS)
-var outputSpec = flag.String("output", "", "Output (path) for the generated file(s)")
-var controllerClass = flag.String("controllerClass", "", "Speed up parsing by specifying which receiver objects have the controller methods")
-var ignore = flag.String("ignore", "^$", "Ignore packages that satisfy this match")
-var contentsTable = flag.Bool("contentsTable", true, "Generate the section Table of Contents")
-var models = flag.Bool("models", true, "Generate the section models if any defined")
-var vendoringPath = flag.String("vendoringPath", "", "Directory of vendoring if used")
-
-func main() {
-	flag.Parse()
-
-	if *mainApiFile == "" {
-		*mainApiFile = *apiPackage + "/main.go"
-	}
-
-	if *apiPackage == "" {
-		flag.PrintDefaults()
-		return
-	}
-
-	params := generator.Params{
-		ApiPackage:      *apiPackage,
-		MainApiFile:     *mainApiFile,
-		OutputFormat:    *outputFormat,
-		OutputSpec:      *outputSpec,
-		ControllerClass: *controllerClass,
-		Ignore:          *ignore,
-		ContentsTable:   *contentsTable,
-		Models:          *models,
-		VendoringPath:	 *vendoringPath,
-	}
-
-	err := generator.Run(params)
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/markup/markup.go b/vendor/github.com/yvasiyarov/swagger/markup/markup.go
deleted file mode 100644
index 9b05a66588..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/markup/markup.go
+++ /dev/null
@@ -1,250 +0,0 @@
-package markup
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"path"
-	"sort"
-	"strings"
-
-	"github.com/yvasiyarov/swagger/parser"
-)
-
-const (
-	color_NORMAL_TEXT             = "black"
-	color_API_SECTION_HEADER_TEXT = "red"
-	color_MODEL_TEXT              = "orange"
-	color_NORMAL_BACKGROUND       = "white"
-	color_GET                     = "cyan"
-	color_POST                    = "green"
-	color_PUT                     = "orange"
-	color_DELETE                  = "cyan"
-	color_PATCH                   = "purple"
-	color_DEFAULT                 = "yellow"
-)
-
-type Markup interface {
-	sectionHeader(level int, text string) string
-	bulletedItem(level int, text string) string
-	numberedItem(level int, text string) string
-	anchor(anchorName string) string
-	link(anchorName, linkText string) string
-	tableHeader(tableTitle string) string
-	tableHeaderRow(args ...string) string
-	tableRow(args ...string) string
-	tableFooter() string
-	colorSpan(content, foregroundColor, backgroundColor string) string
-}
-
-func GenerateMarkup(parser *parser.Parser, markup Markup, outputSpec *string, defaultFileExtension string, tableContents bool, models bool) error {
-	var filename string
-	if *outputSpec == "" {
-		filename = path.Join("./", "API") + defaultFileExtension
-	} else {
-		filename = path.Join(*outputSpec)
-	}
-	fd, err := os.Create(filename)
-	if err != nil {
-		return fmt.Errorf("Can not create document file: %v\n", err)
-	}
-	defer fd.Close()
-
-	var buf bytes.Buffer
-
-	/***************************************************************
-	* Overall API
-	***************************************************************/
-	buf.WriteString(markup.sectionHeader(1, parser.Listing.Infos.Title))
-	buf.WriteString(fmt.Sprintf("%s\n\n", parser.Listing.Infos.Description))
-
-	/***************************************************************
-	* Table of Contents (List of Sub-APIs)
-	***************************************************************/
-	if tableContents {
-		buf.WriteString("Table of Contents\n\n")
-		subApiKeys, subApiKeyIndex := alphabeticalKeysOfSubApis(parser.Listing.Apis)
-		for _, subApiKey := range subApiKeys {
-			buf.WriteString(markup.numberedItem(1, markup.link(subApiKey, parser.Listing.Apis[subApiKeyIndex[subApiKey]].Description)))
-		}
-		buf.WriteString("\n")
-	}
-
-	for _, apiKey := range alphabeticalKeysOfApiDeclaration(parser.TopLevelApis) {
-
-		apiDescription := parser.TopLevelApis[apiKey]
-		/***************************************************************
-		* Sub-API Specifications
-		***************************************************************/
-		if tableContents {
-			buf.WriteString(markup.anchor(apiKey))
-		}
-		buf.WriteString(markup.sectionHeader(2, markup.colorSpan(apiKey, color_API_SECTION_HEADER_TEXT, color_NORMAL_BACKGROUND)))
-
-		buf.WriteString(markup.tableHeader(""))
-		buf.WriteString(markup.tableHeaderRow("Specification", "Value"))
-		buf.WriteString(markup.tableRow("Resource Path", apiDescription.ResourcePath))
-		buf.WriteString(markup.tableRow("API Version", apiDescription.ApiVersion))
-		buf.WriteString(markup.tableRow("BasePath for the API", apiDescription.BasePath))
-		buf.WriteString(markup.tableRow("Consumes", strings.Join(apiDescription.Consumes, ", ")))
-		buf.WriteString(markup.tableRow("Produces", strings.Join(apiDescription.Produces, ", ")))
-		buf.WriteString(markup.tableFooter())
-
-		/***************************************************************
-		* Sub-API Operations (Summary)
-		***************************************************************/
-		buf.WriteString("\n")
-		buf.WriteString(markup.sectionHeader(3, "Operations"))
-		buf.WriteString("\n")
-
-		buf.WriteString(markup.tableHeader(""))
-		buf.WriteString(markup.tableHeaderRow("Resource Path", "Operation", "Description"))
-		for _, subapi := range apiDescription.Apis {
-			for _, op := range subapi.Operations {
-				pathString := strings.Replace(strings.Replace(subapi.Path, "{", "\\{", -1), "}", "\\}", -1)
-				buf.WriteString(markup.tableRow(pathString, markup.link(op.Nickname, op.HttpMethod), op.Summary))
-			}
-		}
-		buf.WriteString(markup.tableFooter())
-		buf.WriteString("\n")
-
-		/***************************************************************
-		* Sub-API Operations (Details)
-		***************************************************************/
-		for _, subapi := range apiDescription.Apis {
-			for _, op := range subapi.Operations {
-				buf.WriteString("\n")
-				operationString := fmt.Sprintf("%s (%s)", strings.Replace(strings.Replace(subapi.Path, "{", "\\{", -1), "}", "\\}", -1), op.HttpMethod)
-				if tableContents {
-					buf.WriteString(markup.anchor(op.Nickname))
-				}
-				buf.WriteString(markup.sectionHeader(4, markup.colorSpan("API: "+operationString, color_NORMAL_TEXT, operationColor(op.HttpMethod))))
-				buf.WriteString("\n\n" + op.Summary + "\n\n\n")
-
-				if len(op.Parameters) > 0 {
-					buf.WriteString(markup.tableHeader(""))
-					buf.WriteString(markup.tableHeaderRow("Param Name", "Param Type", "Data Type", "Description", "Required?"))
-					for _, param := range op.Parameters {
-						isRequired := ""
-						if param.Required {
-							isRequired = "Yes"
-						}
-						buf.WriteString(markup.tableRow(param.Name, param.ParamType, modelText(markup, param.DataType), param.Description, isRequired))
-					}
-					buf.WriteString(markup.tableFooter())
-				}
-
-				if len(op.ResponseMessages) > 0 {
-					buf.WriteString(markup.tableHeader(""))
-					buf.WriteString(markup.tableHeaderRow("Code", "Type", "Model", "Message"))
-					for _, msg := range op.ResponseMessages {
-						buf.WriteString(markup.tableRow(fmt.Sprintf("%v", msg.Code), msg.ResponseType, modelText(markup, msg.ResponseModel), msg.Message))
-					}
-					buf.WriteString(markup.tableFooter())
-				}
-			}
-		}
-		buf.WriteString("\n")
-
-		/***************************************************************
-		* Models
-		***************************************************************/
-		if len(apiDescription.Models) > 0 && models {
-			buf.WriteString("\n")
-			buf.WriteString(markup.sectionHeader(3, "Models"))
-			buf.WriteString("\n")
-			for _, modelKey := range alphabeticalKeysOfModels(apiDescription.Models) {
-				model := apiDescription.Models[modelKey]
-				if tableContents {
-					buf.WriteString(markup.anchor(modelKey))
-				}
-				buf.WriteString(markup.sectionHeader(4, markup.colorSpan(shortModelName(modelKey), color_MODEL_TEXT, color_NORMAL_BACKGROUND)))
-				buf.WriteString(markup.tableHeader(""))
-				buf.WriteString(markup.tableHeaderRow("Field Name (alphabetical)", "Field Type", "Description"))
-				for _, fieldName := range alphabeticalKeysOfFields(model.Properties) {
-					fieldProps := model.Properties[fieldName]
-					buf.WriteString(markup.tableRow(fieldName, fieldProps.Type, fieldProps.Description))
-				}
-				buf.WriteString(markup.tableFooter())
-			}
-			buf.WriteString("\n")
-		}
-	}
-
-	fd.WriteString(buf.String())
-
-	return nil
-}
-
-func shortModelName(longModelName string) string {
-	parts := strings.Split(longModelName, ".")
-	return parts[len(parts)-1]
-}
-
-func modelText(markup Markup, fullyQualifiedModelName string) string {
-	shortName := shortModelName(fullyQualifiedModelName)
-	result := shortName
-	if fullyQualifiedModelName != shortName {
-		result = markup.link(fullyQualifiedModelName, shortName)
-	}
-	return result
-}
-
-func alphabeticalKeysOfSubApis(refs []*parser.ApiRef) ([]string, map[string]int) {
-	index := map[string]int{}
-	keys := make([]string, len(refs))
-	for i, ref := range refs {
-		subApiKey := ref.Path[1:]
-		keys[i] = subApiKey
-		index[subApiKey] = i
-	}
-	sort.Strings(keys)
-	return keys, index
-}
-func alphabeticalKeysOfApiDeclaration(m map[string]*parser.ApiDeclaration) []string {
-	keys := make([]string, len(m))
-	i := 0
-	for key, _ := range m {
-		keys[i] = key
-		i++
-	}
-	sort.Strings(keys)
-	return keys
-}
-func alphabeticalKeysOfModels(m map[string]*parser.Model) []string {
-	keys := make([]string, len(m))
-	i := 0
-	for key, _ := range m {
-		keys[i] = key
-		i++
-	}
-	sort.Strings(keys)
-	return keys
-}
-func alphabeticalKeysOfFields(m map[string]*parser.ModelProperty) []string {
-	keys := make([]string, len(m))
-	i := 0
-	for key, _ := range m {
-		keys[i] = key
-		i++
-	}
-	sort.Strings(keys)
-	return keys
-}
-
-func operationColor(methodName string) string {
-	switch methodName {
-	case "GET":
-		return color_GET
-	case "POST":
-		return color_POST
-	case "PUT":
-		return color_PUT
-	case "DELETE":
-		return color_DELETE
-	case "PATCH":
-		return color_PATCH
-	default:
-		return color_DEFAULT
-	}
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/markup/markup_asciidoc.go b/vendor/github.com/yvasiyarov/swagger/markup/markup_asciidoc.go
deleted file mode 100644
index ad31ef1f2a..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/markup/markup_asciidoc.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package markup
-
-import (
-	"fmt"
-	"strings"
-)
-
-type MarkupAsciiDoc struct {
-}
-
-// anchor renders a title (level 1) or subtitle (level 2..5)
-func (this *MarkupAsciiDoc) anchor(anchorName string) string {
-	return fmt.Sprintf("[[%s]]\n", anchorName)
-}
-
-// sectionHeader renders a title (level 1) or subtitle (level 2..5)
-func (this *MarkupAsciiDoc) sectionHeader(level int, text string) string {
-	return fmt.Sprintf("%s %s\n", strings.Repeat("=", level), text)
-}
-
-// bullet renders a bulleted item at the given level
-func (this *MarkupAsciiDoc) numberedItem(level int, text string) string {
-	return fmt.Sprintf("%s %s\n", strings.Repeat(".", level), text)
-}
-
-// bullet renders a bulleted item at the given level
-func (this *MarkupAsciiDoc) bulletedItem(level int, text string) string {
-	return fmt.Sprintf("%s %s\n", strings.Repeat("*", level), text)
-}
-
-// link renders the linkText as a link to the specified anchorName. If linktext is "", then anchorName is used as the linkText.
-func (this *MarkupAsciiDoc) link(anchorName, linkText string) string {
-	if linkText == "" {
-		return fmt.Sprintf("<<%s,%s>>", anchorName, anchorName)
-	}
-	return fmt.Sprintf("<<%s,%s>>", anchorName, linkText)
-}
-
-// tableHeader starts a table
-func (this *MarkupAsciiDoc) tableHeader(tableTitle string) string {
-	retval := "\n"
-	if tableTitle != "" {
-		retval += fmt.Sprintf(".%s\n", tableTitle)
-	}
-	return retval + "[width=\"60%\",options=\"header\"]\n|==========\n"
-}
-
-// tableHeader ends a table
-func (this *MarkupAsciiDoc) tableFooter() string {
-	return "|==========\n\n"
-}
-
-// tableRow issues a table header row
-func (this *MarkupAsciiDoc) tableHeaderRow(args ...string) string {
-	var retval string
-	for _, arg := range args {
-		retval += fmt.Sprintf("|%s ", arg)
-	}
-	return retval + "\n"
-}
-
-// tableRow issues a single table data row
-func (this *MarkupAsciiDoc) tableRow(args ...string) string {
-	var retval string
-	for _, arg := range args {
-		retval += fmt.Sprintf("|%s ", arg)
-	}
-	return retval + "\n"
-}
-
-func (this *MarkupAsciiDoc) colorSpan(content, foregroundColor, backgroundColor string) string {
-	return fmt.Sprintf("[%s,%s-background]#%s#", foregroundColor, backgroundColor, content)
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/markup/markup_confluence.go b/vendor/github.com/yvasiyarov/swagger/markup/markup_confluence.go
deleted file mode 100644
index 54fa7a9c90..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/markup/markup_confluence.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package markup
-
-import (
-	"fmt"
-	"strings"
-)
-
-type MarkupConfluence struct {
-}
-
-// anchor renders a title (level 1) or subtitle (level 2..5)
-func (this *MarkupConfluence) anchor(anchorName string) string {
-	return fmt.Sprintf("{anchor:%s}\n", anchorName)
-}
-
-// sectionHeader renders a title (level 1) or subtitle (level 2..5)
-func (this *MarkupConfluence) sectionHeader(level int, text string) string {
-	return fmt.Sprintf("\nh%v. %s\n", level, text)
-}
-
-// bullet renders a bulleted item at the given level
-func (this *MarkupConfluence) numberedItem(level int, text string) string {
-	return fmt.Sprintf("%s %s\n", strings.Repeat("#", level), text)
-}
-
-// bullet renders a bulleted item at the given level
-func (this *MarkupConfluence) bulletedItem(level int, text string) string {
-	return fmt.Sprintf("%s %s\n", strings.Repeat("*", level), text)
-}
-
-// link renders the linkText as a link to the specified anchorName. If linktext is "", then anchorName is used as the linkText.
-func (this *MarkupConfluence) link(anchorName, linkText string) string {
-	if linkText == "" {
-		return fmt.Sprintf("[#%s]", anchorName)
-	}
-	return fmt.Sprintf("[%s|#%s]", linkText, anchorName)
-}
-
-// tableHeader starts a table
-func (this *MarkupConfluence) tableHeader(tableTitle string) string {
-	return "\n"
-}
-
-// tableHeader ends a table
-func (this *MarkupConfluence) tableFooter() string {
-	return "\n"
-}
-
-// tableRow issues a table header row
-func (this *MarkupConfluence) tableHeaderRow(args ...string) string {
-	var retval string = ""
-	for _, arg := range args {
-		retval += fmt.Sprintf("||%s ", arg)
-	}
-	return retval + "||\n"
-}
-
-// tableRow issues a single table data row
-func (this *MarkupConfluence) tableRow(args ...string) string {
-	var retval string = ""
-	for _, arg := range args {
-		retval += fmt.Sprintf("|%s ", arg)
-	}
-	return retval + "|\n"
-}
-
-func (this *MarkupConfluence) colorSpan(content, foregroundColor, backgroundColor string) string {
-	if foregroundColor == "black" && backgroundColor == "white" {
-		return content
-	}
-	if foregroundColor == "black" {
-		return fmt.Sprintf("{bgcolor:%s}%s{bgcolor}", backgroundColor, content)
-	}
-	if backgroundColor == "white" {
-		return fmt.Sprintf("{color:%s}%s{color}", foregroundColor, content)
-	}
-	return fmt.Sprintf("{color:%s}{bgcolor:%s}%s{bgcolor}{color}", foregroundColor, backgroundColor, content)
-
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/markup/markup_markdown.go b/vendor/github.com/yvasiyarov/swagger/markup/markup_markdown.go
deleted file mode 100644
index 927184d533..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/markup/markup_markdown.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package markup
-
-import (
-	"fmt"
-	"strings"
-)
-
-type MarkupMarkDown struct {
-}
-
-// sectionHeader renders a title (level 1) or subtitle (level 2..5)
-func (this *MarkupMarkDown) sectionHeader(level int, text string) string {
-	return fmt.Sprintf("\n%s %s\n", strings.Repeat("#", level), text)
-}
-
-// numberedItem renders a bulleted item at the given level
-func (this *MarkupMarkDown) numberedItem(level int, text string) string {
-	return fmt.Sprintf("%s1. %s\n", strings.Repeat("    ", level-1), text)
-}
-
-// bulletedItem renders a bulleted item at the given level
-func (this *MarkupMarkDown) bulletedItem(level int, text string) string {
-	return fmt.Sprintf("%s* %s\n", strings.Repeat("    ", level-1), text)
-}
-
-// anchor renders a title (level 1) or subtitle (level 2..5)
-func (this *MarkupMarkDown) anchor(anchorName string) string {
-	return fmt.Sprintf("<a name=\"%s\"></a>\n", anchorName)
-}
-
-// link renders the linkText as a link to the specified anchorName. If linktext is "", then anchorName is used as the linkText.
-func (this *MarkupMarkDown) link(anchorName, linkText string) string {
-	if linkText == "" {
-		return fmt.Sprintf("[%s](#%s)", anchorName, anchorName)
-	}
-	return fmt.Sprintf("[%s](#%s)", linkText, anchorName)
-}
-
-// tableHeader starts a table
-func (this *MarkupMarkDown) tableHeader(tableTitle string) string {
-	return "\n"
-}
-
-// tableHeaderRow issues a table header row
-func (this *MarkupMarkDown) tableHeaderRow(args ...string) string {
-	var retval string = ""
-	var separator string = ""
-	for _, arg := range args {
-		retval += fmt.Sprintf("| %s ", arg)
-		separator += "|-----"
-	}
-	return retval + "|\n" + separator + "|\n"
-}
-
-// tableRow issues a single table data row
-func (this *MarkupMarkDown) tableRow(args ...string) string {
-	var retval string = ""
-	for _, arg := range args {
-		retval += fmt.Sprintf("| %s ", arg)
-	}
-	return retval + "|\n"
-}
-
-// tableFooter ends a table
-func (this *MarkupMarkDown) tableFooter() string {
-	return "\n"
-}
-
-// Note: Github flavored markdown does not support colorization
-func (this *MarkupMarkDown) colorSpan(content, foregroundColor, backgroundColor string) string {
-	return content
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/parser/api_declaration.go b/vendor/github.com/yvasiyarov/swagger/parser/api_declaration.go
deleted file mode 100644
index 7429e7e652..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/parser/api_declaration.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package parser
-
-// https://github.com/wordnik/swagger-core/blob/scala_2.10-1.3-RC3/schemas/api-declaration-schema.json
-type ApiDeclaration struct {
-	ApiVersion     string            `json:"apiVersion"`
-	SwaggerVersion string            `json:"swaggerVersion"`
-	BasePath       string            `json:"basePath"`
-	ResourcePath   string            `json:"resourcePath"` // must start with /
-	Consumes       []string          `json:"-"`
-	Produces       []string          `json:"produces,omitempty"`
-	Apis           []*Api            `json:"apis,omitempty"`
-	Models         map[string]*Model `json:"models,omitempty"`
-}
-
-func NewApiDeclaration() *ApiDeclaration {
-	return &ApiDeclaration{
-		Apis:     make([]*Api, 0),
-		Models:   make(map[string]*Model),
-		Consumes: make([]string, 0),
-		Produces: make([]string, 0),
-	}
-}
-
-func (api *ApiDeclaration) AddConsumedTypes(op *Operation) {
-	for _, contextType := range op.Consumes {
-		isExists := false
-		for _, existType := range api.Consumes {
-			if existType == contextType {
-				isExists = true
-				break
-			}
-		}
-		if !isExists {
-			api.Consumes = append(api.Consumes, contextType)
-		}
-	}
-}
-
-func (api *ApiDeclaration) AddProducesTypes(op *Operation) {
-	for _, contextType := range op.Produces {
-		isExists := false
-		for _, existType := range api.Produces {
-			if existType == contextType {
-				isExists = true
-				break
-			}
-		}
-		if !isExists {
-			api.Produces = append(api.Produces, contextType)
-		}
-	}
-}
-func (api *ApiDeclaration) AddModels(op *Operation) {
-	for _, m := range op.Models {
-		if m != nil {
-			if _, ok := api.Models[m.Id]; !ok {
-				api.Models[m.Id] = m
-			}
-		}
-	}
-}
-
-func (api *ApiDeclaration) AddSubApi(op *Operation) {
-	var subApi *Api
-	for _, existsSubApi := range api.Apis {
-		if existsSubApi.Path == op.Path {
-			subApi = existsSubApi
-			break
-		}
-	}
-	if subApi == nil {
-		subApi = NewApi()
-		subApi.Path = op.Path
-		subApi.Description = op.Summary
-
-		api.Apis = append(api.Apis, subApi)
-	}
-	subApi.Operations = append(subApi.Operations, op)
-}
-
-func (api *ApiDeclaration) AddOperation(op *Operation) {
-	api.AddProducesTypes(op)
-	api.AddConsumedTypes(op)
-	api.AddModels(op)
-	api.AddSubApi(op)
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/parser/model.go b/vendor/github.com/yvasiyarov/swagger/parser/model.go
deleted file mode 100644
index f6f1582e18..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/parser/model.go
+++ /dev/null
@@ -1,290 +0,0 @@
-package parser
-
-import (
-	"fmt"
-	"go/ast"
-	"log"
-	"reflect"
-	"regexp"
-	"strings"
-)
-
-type Model struct {
-	Id         string                    `json:"id"`
-	Required   []string                  `json:"required,omitempty"`
-	Properties map[string]*ModelProperty `json:"properties"`
-	parser     *Parser
-}
-
-func NewModel(p *Parser) *Model {
-	return &Model{
-		parser: p,
-	}
-}
-
-// modelName is something like package.subpackage.SomeModel or just "subpackage.SomeModel"
-func (m *Model) ParseModel(modelName string, currentPackage string, knownModelNames map[string]bool) (error, []*Model) {
-	knownModelNames[modelName] = true
-	//log.Printf("Before parse model |%s|, package: |%s|\n", modelName, currentPackage)
-
-	astTypeSpec, modelPackage := m.parser.FindModelDefinition(modelName, currentPackage)
-
-	modelNameParts := strings.Split(modelName, ".")
-	m.Id = strings.Join(append(strings.Split(modelPackage, "/"), modelNameParts[len(modelNameParts)-1]), ".")
-
-	var innerModelList []*Model
-	if astTypeDef, ok := astTypeSpec.Type.(*ast.Ident); ok {
-		typeDefTranslations[astTypeSpec.Name.String()] = astTypeDef.Name
-	} else if astStructType, ok := astTypeSpec.Type.(*ast.StructType); ok {
-		m.ParseFieldList(astStructType.Fields.List, modelPackage)
-		usedTypes := make(map[string]bool)
-
-		for _, property := range m.Properties {
-			typeName := property.Type
-			if typeName == "array" {
-				if property.Items.Type != "" {
-					typeName = property.Items.Type
-				} else {
-					typeName = property.Items.Ref
-				}
-			}
-			if translation, ok := typeDefTranslations[typeName]; ok {
-				typeName = translation
-			}
-			if IsBasicType(typeName) || m.parser.IsImplementMarshalInterface(typeName) {
-				continue
-			}
-			if _, exists := knownModelNames[typeName]; exists {
-				continue
-			}
-
-			usedTypes[typeName] = true
-		}
-
-		//log.Printf("Before parse inner model list: %#v\n (%s)", usedTypes, modelName)
-		innerModelList = make([]*Model, 0, len(usedTypes))
-
-		for typeName, _ := range usedTypes {
-			typeModel := NewModel(m.parser)
-			if err, typeInnerModels := typeModel.ParseModel(typeName, modelPackage, knownModelNames); err != nil {
-				//log.Printf("Parse Inner Model error %#v \n", err)
-				return err, nil
-			} else {
-				for _, property := range m.Properties {
-					if property.Type == "array" {
-						if property.Items.Ref == typeName {
-							property.Items.Ref = typeModel.Id
-						}
-					} else {
-						if property.Type == typeName {
-							property.Type = typeModel.Id
-						}
-					}
-				}
-				//log.Printf("Inner model %v parsed, parsing %s \n", typeName, modelName)
-				if typeModel != nil {
-					innerModelList = append(innerModelList, typeModel)
-				}
-				if typeInnerModels != nil && len(typeInnerModels) > 0 {
-					innerModelList = append(innerModelList, typeInnerModels...)
-				}
-				//log.Printf("innerModelList: %#v\n, typeInnerModels: %#v, usedTypes: %#v \n", innerModelList, typeInnerModels, usedTypes)
-			}
-		}
-		//log.Printf("After parse inner model list: %#v\n (%s)", usedTypes, modelName)
-		// log.Fatalf("Inner model list: %#v\n", innerModelList)
-
-	}
-
-	//log.Printf("ParseModel finished %s \n", modelName)
-	return nil, innerModelList
-}
-
-func (m *Model) ParseFieldList(fieldList []*ast.Field, modelPackage string) {
-	if fieldList == nil {
-		return
-	}
-	//log.Printf("ParseFieldList\n")
-
-	m.Properties = make(map[string]*ModelProperty)
-	for _, field := range fieldList {
-		m.ParseModelProperty(field, modelPackage)
-	}
-}
-
-func (m *Model) ParseModelProperty(field *ast.Field, modelPackage string) {
-	var name string
-	var innerModel *Model
-
-	property := NewModelProperty()
-
-	typeAsString := property.GetTypeAsString(field.Type)
-	//log.Printf("Get type as string %s \n", typeAsString)
-
-	// Sometimes reflection reports an object as "&{foo Bar}" rather than just "foo.Bar"
-	// The next 2 lines of code normalize them to foo.Bar
-	reInternalRepresentation := regexp.MustCompile("&\\{(\\w*) (\\w*)\\}")
-	typeAsString = string(reInternalRepresentation.ReplaceAll([]byte(typeAsString), []byte("$1.$2")))
-
-	if strings.HasPrefix(typeAsString, "[]") {
-		property.Type = "array"
-		property.SetItemType(typeAsString[2:])
-	} else if typeAsString == "time.Time" {
-		property.Type = "Time"
-	} else {
-		property.Type = typeAsString
-	}
-
-	if len(field.Names) == 0 {
-
-		if astSelectorExpr, ok := field.Type.(*ast.SelectorExpr); ok {
-			packageName := modelPackage
-			if astTypeIdent, ok := astSelectorExpr.X.(*ast.Ident); ok {
-				packageName = astTypeIdent.Name
-			}
-
-			name = packageName + "." + strings.TrimPrefix(astSelectorExpr.Sel.Name, "*")
-		} else if astTypeIdent, ok := field.Type.(*ast.Ident); ok {
-			name = astTypeIdent.Name
-		} else if astStarExpr, ok := field.Type.(*ast.StarExpr); ok {
-			if astIdent, ok := astStarExpr.X.(*ast.Ident); ok {
-				name = astIdent.Name
-			}
-		} else {
-			log.Fatalf("Something goes wrong: %#v", field.Type)
-		}
-		innerModel = NewModel(m.parser)
-		//log.Printf("Try to parse embeded type %s \n", name)
-		//log.Fatalf("DEBUG: field: %#v\n, selector.X: %#v\n selector.Sel: %#v\n", field, astSelectorExpr.X, astSelectorExpr.Sel)
-		knownModelNames := map[string]bool{}
-		innerModel.ParseModel(name, modelPackage, knownModelNames)
-
-		for innerFieldName, innerField := range innerModel.Properties {
-			m.Properties[innerFieldName] = innerField
-		}
-
-		//log.Fatalf("Here %#v\n", field.Type)
-		return
-	} else {
-		name = field.Names[0].Name
-	}
-
-	//log.Printf("ParseModelProperty: %s, CurrentPackage %s, type: %s \n", name, modelPackage, property.Type)
-	//Analyse struct fields annotations
-	if field.Tag != nil {
-		structTag := reflect.StructTag(strings.Trim(field.Tag.Value, "`"))
-		var tagText string
-		if thriftTag := structTag.Get("thrift"); thriftTag != "" {
-			tagText = thriftTag
-		}
-		if tag := structTag.Get("json"); tag != "" {
-			tagText = tag
-		}
-
-		tagValues := strings.Split(tagText, ",")
-		var isRequired = false
-
-		for _, v := range tagValues {
-			if v != "" && v != "required" && v != "omitempty" {
-				name = v
-			}
-			if v == "required" {
-				isRequired = true
-			}
-			// We will not document at all any fields with a json tag of "-"
-			if v == "-" {
-				return
-			}
-		}
-		if required := structTag.Get("required"); required != "" || isRequired {
-			m.Required = append(m.Required, name)
-		}
-		if desc := structTag.Get("description"); desc != "" {
-			property.Description = desc
-		}
-	}
-	m.Properties[name] = property
-}
-
-type ModelProperty struct {
-	Type        string             `json:"type"`
-	Description string             `json:"description"`
-	Items       ModelPropertyItems `json:"items,omitempty"`
-	Format      string             `json:"format"`
-}
-type ModelPropertyItems struct {
-	Ref  string `json:"$ref,omitempty"`
-	Type string `json:"type,omitempty"`
-}
-
-func NewModelProperty() *ModelProperty {
-	return &ModelProperty{}
-}
-
-// refer to builtin.go
-var basicTypes = map[string]bool{
-	"bool":       true,
-	"uint":       true,
-	"uint8":      true,
-	"uint16":     true,
-	"uint32":     true,
-	"uint64":     true,
-	"int":        true,
-	"int8":       true,
-	"int16":      true,
-	"int32":      true,
-	"int64":      true,
-	"float32":    true,
-	"float64":    true,
-	"string":     true,
-	"complex64":  true,
-	"complex128": true,
-	"byte":       true,
-	"rune":       true,
-	"uintptr":    true,
-	"error":      true,
-	"Time":       true,
-	"file":       true,
-}
-
-var typeDefTranslations = map[string]string{}
-
-func IsBasicType(typeName string) bool {
-	_, ok := basicTypes[typeName]
-	return ok || strings.Contains(typeName, "interface")
-}
-
-func (p *ModelProperty) SetItemType(itemType string) {
-	p.Items = ModelPropertyItems{}
-	if IsBasicType(itemType) {
-		p.Items.Type = itemType
-	} else {
-		p.Items.Ref = itemType
-	}
-}
-func (p *ModelProperty) GetTypeAsString(fieldType interface{}) string {
-	var realType string
-	if astArrayType, ok := fieldType.(*ast.ArrayType); ok {
-		//		log.Printf("arrayType: %#v\n", astArrayType)
-		realType = fmt.Sprintf("[]%v", p.GetTypeAsString(astArrayType.Elt))
-	} else if astMapType, ok := fieldType.(*ast.MapType); ok {
-		//		log.Printf("arrayType: %#v\n", astArrayType)
-		realType = fmt.Sprintf("[]%v", p.GetTypeAsString(astMapType.Value))
-	} else if _, ok := fieldType.(*ast.InterfaceType); ok {
-		realType = "interface"
-	} else {
-		if astStarExpr, ok := fieldType.(*ast.StarExpr); ok {
-			realType = fmt.Sprint(astStarExpr.X)
-			//			log.Printf("Get type as string (star expression)! %#v, type: %s\n", astStarExpr.X, fmt.Sprint(astStarExpr.X))
-		} else if astSelectorExpr, ok := fieldType.(*ast.SelectorExpr); ok {
-			packageNameIdent, _ := astSelectorExpr.X.(*ast.Ident)
-			realType = packageNameIdent.Name + "." + astSelectorExpr.Sel.Name
-
-			//			log.Printf("Get type as string(selector expression)! X: %#v , Sel: %#v, type %s\n", astSelectorExpr.X, astSelectorExpr.Sel, realType)
-		} else {
-			//			log.Printf("Get type as string(no star expression)! %#v , type: %s\n", fieldType, fmt.Sprint(fieldType))
-			realType = fmt.Sprint(fieldType)
-		}
-	}
-	return realType
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/parser/operation.go b/vendor/github.com/yvasiyarov/swagger/parser/operation.go
deleted file mode 100644
index dc4faab180..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/parser/operation.go
+++ /dev/null
@@ -1,264 +0,0 @@
-package parser
-
-import (
-	"errors"
-	"fmt"
-	//"go/ast"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-type Operation struct {
-	HttpMethod       string            `json:"httpMethod"`
-	Nickname         string            `json:"nickname"`
-	Type             string            `json:"type"`
-	Items            OperationItems    `json:"items,omitempty"`
-	Summary          string            `json:"summary,omitempty"`
-	Notes            string            `json:"notes,omitempty"`
-	Parameters       []Parameter       `json:"parameters,omitempty"`
-	ResponseMessages []ResponseMessage `json:"responseMessages,omitempty"`
-	Consumes         []string          `json:"-"`
-	Produces         []string          `json:"produces,omitempty"`
-	Authorizations   []Authorization   `json:"authorizations,omitempty"`
-	Protocols        []Protocol        `json:"protocols,omitempty"`
-	Path             string            `json:"-"`
-	ForceResource    string            `json:"-"`
-	parser           *Parser
-	Models           []*Model `json:"-"`
-	packageName      string
-}
-type OperationItems struct {
-	Ref  string `json:"$ref,omitempty"`
-	Type string `json:"type,omitempty"`
-}
-
-func NewOperation(p *Parser, packageName string) *Operation {
-	return &Operation{
-		parser:      p,
-		Models:      make([]*Model, 0),
-		packageName: packageName,
-	}
-}
-
-func (operation *Operation) SetItemsType(itemsType string) {
-	operation.Items = OperationItems{}
-	if IsBasicType(itemsType) {
-		operation.Items.Type = itemsType
-	} else {
-		operation.Items.Ref = itemsType
-	}
-}
-
-func (operation *Operation) ParseComment(comment string) error {
-	commentLine := strings.TrimSpace(strings.TrimLeft(comment, "//"))
-	if len(commentLine) == 0 {
-		return nil
-	}
-	attribute := strings.Fields(commentLine)[0]
-	switch strings.ToLower(attribute) {
-	case "@router":
-		if err := operation.ParseRouterComment(commentLine); err != nil {
-			return err
-		}
-	case "@resource":
-		resource := strings.TrimSpace(commentLine[len(attribute):])
-		if resource[0:1] == "/" {
-			resource = resource[1:]
-		}
-		operation.ForceResource = resource
-	case "@title":
-		operation.Nickname = strings.TrimSpace(commentLine[len(attribute):])
-	case "@description":
-		operation.Summary = strings.TrimSpace(commentLine[len(attribute):])
-	case "@success", "@failure":
-		if err := operation.ParseResponseComment(strings.TrimSpace(commentLine[len(attribute):])); err != nil {
-			return err
-		}
-	case "@param":
-		if err := operation.ParseParamComment(strings.TrimSpace(commentLine[len(attribute):])); err != nil {
-			return err
-		}
-	case "@accept", "@consume":
-		if err := operation.ParseAcceptComment(strings.TrimSpace(commentLine[len(attribute):])); err != nil {
-			return err
-		}
-	case "@produce":
-		if err := operation.ParseProduceComment(strings.TrimSpace(commentLine[len(attribute):])); err != nil {
-			return err
-		}
-	}
-
-	operation.Models = operation.getUniqueModels()
-
-	return nil
-}
-
-func (operation *Operation) getUniqueModels() []*Model {
-
-	uniqueModels := make([]*Model, 0, len(operation.Models))
-	modelIds := map[string]bool{}
-
-	for _, model := range operation.Models {
-		if _, exists := modelIds[model.Id]; exists {
-			continue
-		}
-		uniqueModels = append(uniqueModels, model)
-		modelIds[model.Id] = true
-	}
-
-	return uniqueModels
-}
-
-func (operation *Operation) registerType(typeName string) (string, error) {
-	registerType := ""
-
-	if translation, ok := typeDefTranslations[typeName]; ok {
-		registerType = translation
-	} else if IsBasicType(typeName) {
-		registerType = typeName
-	} else {
-		model := NewModel(operation.parser)
-		knownModelNames := map[string]bool{}
-
-		err, innerModels := model.ParseModel(typeName, operation.parser.CurrentPackage, knownModelNames)
-		if err != nil {
-			return registerType, err
-		}
-		if translation, ok := typeDefTranslations[typeName]; ok {
-			registerType = translation
-		} else {
-			registerType = model.Id
-
-			operation.Models = append(operation.Models, model)
-			operation.Models = append(operation.Models, innerModels...)
-		}
-	}
-
-	return registerType, nil
-}
-
-// Parse params return []string of param properties
-// @Param	queryText		form	      string	  true		        "The email for login"
-// 			[param name]    [param type] [data type]  [is mandatory?]   [Comment]
-func (operation *Operation) ParseParamComment(commentLine string) error {
-	swaggerParameter := Parameter{}
-	paramString := commentLine
-
-	re := regexp.MustCompile(`([-\w]+)[\s]+([\w]+)[\s]+([\S.]+)[\s]+([\w]+)[\s]+"([^"]+)"`)
-
-	if matches := re.FindStringSubmatch(paramString); len(matches) != 6 {
-		return fmt.Errorf("Can not parse param comment \"%s\", skipped.", paramString)
-	} else {
-		typeName, err := operation.registerType(matches[3])
-		if err != nil {
-			return err
-		}
-
-		swaggerParameter.Name = matches[1]
-		swaggerParameter.ParamType = matches[2]
-		swaggerParameter.Type = typeName
-		swaggerParameter.DataType = typeName
-		requiredText := strings.ToLower(matches[4])
-		swaggerParameter.Required = (requiredText == "true" || requiredText == "required")
-		swaggerParameter.Description = matches[5]
-
-		operation.Parameters = append(operation.Parameters, swaggerParameter)
-	}
-
-	return nil
-}
-
-// @Accept  json
-func (operation *Operation) ParseAcceptComment(commentLine string) error {
-	accepts := strings.Split(commentLine, ",")
-	for _, a := range accepts {
-		switch a {
-		case "json", "application/json":
-			operation.Consumes = append(operation.Consumes, ContentTypeJson)
-		case "xml", "text/xml":
-			operation.Consumes = append(operation.Consumes, ContentTypeXml)
-		case "plain", "text/plain":
-			operation.Consumes = append(operation.Consumes, ContentTypePlain)
-		case "html", "text/html":
-			operation.Consumes = append(operation.Consumes, ContentTypeHtml)
-		case "mpfd", "multipart/form-data":
-			operation.Consumes = append(operation.Consumes, ContentTypeMultiPartFormData)
-		}
-	}
-	return nil
-}
-
-// @Produce  json
-func (operation *Operation) ParseProduceComment(commentLine string) error {
-	produces := strings.Split(commentLine, ",")
-	for _, a := range produces {
-		switch a {
-		case "json", "application/json":
-			operation.Produces = append(operation.Produces, ContentTypeJson)
-		case "xml", "text/xml":
-			operation.Produces = append(operation.Produces, ContentTypeXml)
-		case "plain", "text/plain":
-			operation.Produces = append(operation.Produces, ContentTypePlain)
-		case "html", "text/html":
-			operation.Produces = append(operation.Produces, ContentTypeHtml)
-		case "mpfd", "multipart/form-data":
-			operation.Produces = append(operation.Produces, ContentTypeMultiPartFormData)
-		}
-	}
-	return nil
-}
-
-// @Router /customer/get-wishlist/{wishlist_id} [get]
-func (operation *Operation) ParseRouterComment(commentLine string) error {
-	sourceString := strings.TrimSpace(commentLine[len("@Router"):])
-
-	re := regexp.MustCompile(`([\w\.\/\-{}]+)[^\[]+\[([^\]]+)`)
-	var matches []string
-
-	if matches = re.FindStringSubmatch(sourceString); len(matches) != 3 {
-		return fmt.Errorf("Can not parse router comment \"%s\", skipped.", commentLine)
-	}
-
-	operation.Path = matches[1]
-	operation.HttpMethod = strings.ToUpper(matches[2])
-	return nil
-}
-
-// @Success 200 {object} model.OrderRow "Error message, if code != 200"
-func (operation *Operation) ParseResponseComment(commentLine string) error {
-	re := regexp.MustCompile(`([\d]+)[\s]+([\w\{\}]+)[\s]+([\w\-\.\/]+)[^"]*(.*)?`)
-	var matches []string
-
-	if matches = re.FindStringSubmatch(commentLine); len(matches) != 5 {
-		return fmt.Errorf("Can not parse response comment \"%s\", skipped.", commentLine)
-	}
-
-	response := ResponseMessage{}
-	if code, err := strconv.Atoi(matches[1]); err != nil {
-		return errors.New("Success http code must be int")
-	} else {
-		response.Code = code
-	}
-	response.Message = strings.Trim(matches[4], "\"")
-
-	typeName, err := operation.registerType(matches[3])
-	if err != nil {
-		return err
-	}
-
-	response.ResponseType = strings.Trim(matches[2], "{}")
-
-	response.ResponseModel = typeName
-	if response.Code == 200 {
-		if matches[2] == "{array}" {
-			operation.SetItemsType(typeName)
-			operation.Type = "array"
-		} else {
-			operation.Type = typeName
-		}
-	}
-
-	operation.ResponseMessages = append(operation.ResponseMessages, response)
-	return nil
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/parser/parser.go b/vendor/github.com/yvasiyarov/swagger/parser/parser.go
deleted file mode 100644
index f75ef8f95e..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/parser/parser.go
+++ /dev/null
@@ -1,519 +0,0 @@
-package parser
-
-import (
-	"encoding/json"
-	"go/ast"
-	goparser "go/parser"
-	"go/token"
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"strings"
-	"fmt"
-)
-
-var vendoringPath string
-
-type Parser struct {
-	Listing                           *ResourceListing
-	TopLevelApis                      map[string]*ApiDeclaration
-	PackagesCache                     map[string]map[string]*ast.Package
-	CurrentPackage                    string
-	TypeDefinitions                   map[string]map[string]*ast.TypeSpec
-	PackagePathCache                  map[string]string
-	PackageImports                    map[string]map[string][]string
-	BasePath, ControllerClass, Ignore string
-	IsController                      func(*ast.FuncDecl, string) bool
-	TypesImplementingMarshalInterface map[string]string
-}
-
-func NewParser() *Parser {
-	return &Parser{
-		Listing: &ResourceListing{
-			Infos: Infomation{},
-			Apis:  make([]*ApiRef, 0),
-		},
-		PackagesCache:                     make(map[string]map[string]*ast.Package),
-		TopLevelApis:                      make(map[string]*ApiDeclaration),
-		TypeDefinitions:                   make(map[string]map[string]*ast.TypeSpec),
-		PackagePathCache:                  make(map[string]string),
-		PackageImports:                    make(map[string]map[string][]string),
-		TypesImplementingMarshalInterface: make(map[string]string),
-	}
-}
-
-func (parser *Parser) IsImplementMarshalInterface(typeName string) bool {
-	_, ok := parser.TypesImplementingMarshalInterface[typeName]
-	return ok
-}
-
-//Read web/main.go to get General info
-func (parser *Parser) ParseGeneralApiInfo(mainApiFile string) {
-
-	fileSet := token.NewFileSet()
-	fileTree, err := goparser.ParseFile(fileSet, mainApiFile, nil, goparser.ParseComments)
-	if err != nil {
-		log.Fatalf("Can not parse general API information: %v\n", err)
-	}
-
-	parser.Listing.BasePath = "{{.}}"
-	parser.Listing.SwaggerVersion = SwaggerVersion
-	if fileTree.Comments != nil {
-		for _, comment := range fileTree.Comments {
-			for _, commentLine := range strings.Split(comment.Text(), "\n") {
-				attribute := strings.ToLower(strings.Split(commentLine, " ")[0])
-				switch attribute {
-				case "@apiversion":
-					parser.Listing.ApiVersion = strings.TrimSpace(commentLine[len(attribute):])
-				case "@apititle":
-					parser.Listing.Infos.Title = strings.TrimSpace(commentLine[len(attribute):])
-				case "@apidescription":
-					parser.Listing.Infos.Description = strings.TrimSpace(commentLine[len(attribute):])
-				case "@termsofserviceurl":
-					parser.Listing.Infos.TermsOfServiceUrl = strings.TrimSpace(commentLine[len(attribute):])
-				case "@contact":
-					parser.Listing.Infos.Contact = strings.TrimSpace(commentLine[len(attribute):])
-				case "@licenseurl":
-					parser.Listing.Infos.LicenseUrl = strings.TrimSpace(commentLine[len(attribute):])
-				case "@license":
-					parser.Listing.Infos.License = strings.TrimSpace(commentLine[len(attribute):])
-				case "@basepath":
-					parser.Listing.BasePath = strings.TrimSpace(commentLine[len(attribute):])
-				}
-			}
-		}
-	}
-}
-
-func (parser *Parser) GetResourceListingJson() []byte {
-	json, err := json.MarshalIndent(parser.Listing, "", "    ")
-	if err != nil {
-		log.Fatalf("Can not serialise ResourceListing to JSON: %v\n", err)
-	}
-	return json
-}
-
-func (parser *Parser) GetApiDescriptionJson() []byte {
-	json, err := json.MarshalIndent(parser.TopLevelApis, "", "    ")
-	if err != nil {
-		log.Fatalf("Can not serialise []ApiDescription to JSON: %v\n", err)
-	}
-	return json
-}
-
-func (parser *Parser) CheckRealPackagePath(packagePath string) string {
-	packagePath = strings.Trim(packagePath, "\"")
-
-	if cachedResult, ok := parser.PackagePathCache[packagePath]; ok {
-		return cachedResult
-	}
-
-	// Hack vendoring of 'golang.org/x' by the standard library
-	if strings.HasPrefix(packagePath, "golang_org/x/") {
-		packagePath = filepath.Join("vendor", packagePath)
-	}
-
-	pkgRealpath := ""
-	goVersion := runtime.Version()
-	// check if vendor is enabled for version GO 1.5 or 1.6
-	vendorEnable := true
-	if goVersion == "go1.5" || goVersion == "go1.6" {
-		if os.Getenv("GO15VENDOREXPERIMENT") == "0" {
-			vendorEnable = false
-		}
-	}
-
-
-	// first check vendor folder, vendoring in GO 1.7 and greater is officially supported
-	// evaluate if the user specified a different vendor directory rather
-	// than using current working directory to find vendor
-	if vendorEnable {
-		var vendorPath string
-		if vendoringPath == "" {
-			vendorPath = filepath.Join("vendor", packagePath)
-		} else {
-			vendorPath = fmt.Sprintf("%s/%s", vendoringPath, packagePath)
-		}
-
-		if evalutedPath, err := filepath.EvalSymlinks(vendorPath); err == nil {
-			if _, err := os.Stat(evalutedPath); err == nil {
-				pkgRealpath = evalutedPath
-			}
-		}
-	}
-
-	// next, check GOPATH
-	if pkgRealpath == "" {
-		gopath := os.Getenv("GOPATH")
-		if gopath == "" {
-			log.Fatalf("Please, set $GOPATH environment variable\n")
-		}
-
-		gopathsList := filepath.SplitList(gopath)
-		for _, path := range gopathsList {
-			if evalutedPath, err := filepath.EvalSymlinks(filepath.Join(path, "src", packagePath)); err == nil {
-				if _, err := os.Stat(evalutedPath); err == nil {
-					pkgRealpath = evalutedPath
-					break
-				}
-			}
-		}
-	}
-
-	// next, check GOROOT (/src)
-	if pkgRealpath == "" {
-		goroot := filepath.Clean(runtime.GOROOT())
-		if goroot == "" {
-			log.Fatalf("Please, set $GOROOT environment variable\n")
-		}
-		if evalutedPath, err := filepath.EvalSymlinks(filepath.Join(goroot, "src", packagePath)); err == nil {
-			if _, err := os.Stat(evalutedPath); err == nil {
-				pkgRealpath = evalutedPath
-			}
-		}
-
-		// next, check GOROOT (/src/pkg) (for golang < v1.4)
-		if pkgRealpath == "" {
-			if evalutedPath, err := filepath.EvalSymlinks(filepath.Join(goroot, "src", "pkg", packagePath)); err == nil {
-				if _, err := os.Stat(evalutedPath); err == nil {
-					pkgRealpath = evalutedPath
-				}
-			}
-		}
-	}
-
-	parser.PackagePathCache[packagePath] = pkgRealpath
-	return pkgRealpath
-}
-
-func (parser *Parser) GetRealPackagePath(packagePath string) string {
-	pkgRealpath := parser.CheckRealPackagePath(packagePath)
-	if pkgRealpath == "" {
-		log.Fatalf("Can not find package %s \n", packagePath)
-	}
-
-	return pkgRealpath
-}
-
-func (parser *Parser) GetPackageAst(packagePath string) map[string]*ast.Package {
-	//log.Printf("Parse %s package\n", packagePath)
-	if cache, ok := parser.PackagesCache[packagePath]; ok {
-		return cache
-	} else {
-		fileSet := token.NewFileSet()
-
-		astPackages, err := goparser.ParseDir(fileSet, packagePath, ParserFileFilter, goparser.ParseComments)
-		if err != nil {
-			log.Fatalf("Parse of %s pkg cause error: %s\n", packagePath, err)
-		}
-		parser.PackagesCache[packagePath] = astPackages
-		return astPackages
-	}
-}
-
-func (parser *Parser) AddOperation(op *Operation) {
-	path := []string{}
-	for _, pathPart := range strings.Split(op.Path, "/") {
-		if pathPart = strings.TrimSpace(pathPart); pathPart != "" {
-			path = append(path, pathPart)
-		}
-	}
-
-	resource := path[0]
-	if op.ForceResource != "" {
-		resource = op.ForceResource
-	}
-
-	api, ok := parser.TopLevelApis[resource]
-	if !ok {
-		api = NewApiDeclaration()
-
-		api.ApiVersion = parser.Listing.ApiVersion
-		api.SwaggerVersion = SwaggerVersion
-		api.ResourcePath = "/" + resource
-		api.BasePath = parser.Listing.BasePath
-
-		parser.TopLevelApis[resource] = api
-	}
-
-	found := false
-	for _, apiRef := range parser.Listing.Apis {
-		if apiRef.Path == api.ResourcePath {
-			found = true
-		}
-	}
-	if !found {
-		apiRef := &ApiRef{
-			Path:        api.ResourcePath,
-			Description: op.Summary,
-		}
-		parser.Listing.Apis = append(parser.Listing.Apis, apiRef)
-	}
-
-	api.AddOperation(op)
-}
-
-func (parser *Parser) ParseApi(packageNames, vendorPath string) {
-	vendoringPath = vendorPath
-	packages := parser.ScanPackages(strings.Split(packageNames, ","))
-	for _, packageName := range packages {
-		parser.ParseTypeDefinitions(packageName)
-	}
-	for _, packageName := range packages {
-		parser.ParseApiDescription(packageName)
-	}
-}
-
-func (parser *Parser) ScanPackages(packages []string) []string {
-	res := make([]string, len(packages))
-	existsPackages := make(map[string]bool)
-
-	for _, packageName := range packages {
-		if v, ok := existsPackages[packageName]; !ok || v == false {
-			// Add package
-			existsPackages[packageName] = true
-			res = append(res, packageName)
-			// get it's real path
-			pkgRealPath := parser.GetRealPackagePath(packageName)
-			// Then walk
-			var walker filepath.WalkFunc = func(path string, info os.FileInfo, err error) error {
-				// avoid listing hidden directories with initial "_" names and vendor dir
-				if info.IsDir() && !strings.Contains(path, "/_") && !strings.Contains(path, "/vendor") {
-					if idx := strings.Index(path, packageName); idx != -1 {
-						pack := path[idx:]
-						if v, ok := existsPackages[pack]; !ok || v == false {
-							existsPackages[pack] = true
-							res = append(res, pack)
-						}
-					}
-				}
-				return nil
-			}
-			filepath.Walk(pkgRealPath, walker)
-		}
-	}
-	return res
-}
-
-func (parser *Parser) ParseTypeDefinitions(packageName string) {
-	parser.CurrentPackage = packageName
-	pkgRealPath := parser.GetRealPackagePath(packageName)
-	//	log.Printf("Parse type definition of %#v\n", packageName)
-
-	if _, ok := parser.TypeDefinitions[pkgRealPath]; !ok {
-		parser.TypeDefinitions[pkgRealPath] = make(map[string]*ast.TypeSpec)
-	}
-
-	astPackages := parser.GetPackageAst(pkgRealPath)
-	for _, astPackage := range astPackages {
-		for _, astFile := range astPackage.Files {
-			for _, astDeclaration := range astFile.Decls {
-				if generalDeclaration, ok := astDeclaration.(*ast.GenDecl); ok && generalDeclaration.Tok == token.TYPE {
-					for _, astSpec := range generalDeclaration.Specs {
-						if typeSpec, ok := astSpec.(*ast.TypeSpec); ok {
-							parser.TypeDefinitions[pkgRealPath][typeSpec.Name.String()] = typeSpec
-						}
-					}
-				}
-			}
-		}
-	}
-
-	//log.Fatalf("Type definition parsed %#v\n", parser.ParseImportStatements(packageName))
-
-	for importedPackage, _ := range parser.ParseImportStatements(packageName) {
-		//log.Printf("Import: %v, %v\n", importedPackage, v)
-		parser.ParseTypeDefinitions(importedPackage)
-	}
-}
-
-func (parser *Parser) ParseImportStatements(packageName string) map[string]bool {
-
-	parser.CurrentPackage = packageName
-	pkgRealPath := parser.GetRealPackagePath(packageName)
-
-	imports := make(map[string]bool)
-	astPackages := parser.GetPackageAst(pkgRealPath)
-
-	parser.PackageImports[pkgRealPath] = make(map[string][]string)
-	for _, astPackage := range astPackages {
-		for _, astFile := range astPackage.Files {
-			for _, astImport := range astFile.Imports {
-				importedPackageName := strings.Trim(astImport.Path.Value, "\"")
-				if !parser.isIgnoredPackage(importedPackageName) {
-					realPath := parser.GetRealPackagePath(importedPackageName)
-					//log.Printf("path: %#v, original path: %#v", realPath, astImport.Path.Value)
-					if _, ok := parser.TypeDefinitions[realPath]; !ok {
-						imports[importedPackageName] = true
-						//log.Printf("Parse %s, Add new import definition:%s\n", packageName, astImport.Path.Value)
-					}
-
-					var importedPackageAlias string
-					if astImport.Name != nil && astImport.Name.Name != "." && astImport.Name.Name != "_" {
-						importedPackageAlias = astImport.Name.Name
-					} else {
-						importPath := strings.Split(importedPackageName, "/")
-						importedPackageAlias = importPath[len(importPath)-1]
-					}
-
-					isExists := false
-					for _, v := range parser.PackageImports[pkgRealPath][importedPackageAlias] {
-						if v == importedPackageName {
-							isExists = true
-						}
-					}
-
-					if !isExists {
-						parser.PackageImports[pkgRealPath][importedPackageAlias] = append(parser.PackageImports[pkgRealPath][importedPackageAlias], importedPackageName)
-					}
-				}
-			}
-		}
-	}
-	return imports
-}
-
-func (parser *Parser) GetModelDefinition(model string, packageName string) *ast.TypeSpec {
-	pkgRealPath := parser.CheckRealPackagePath(packageName)
-	if pkgRealPath == "" {
-		return nil
-	}
-
-	packageModels, ok := parser.TypeDefinitions[pkgRealPath]
-	if !ok {
-		return nil
-	}
-	astTypeSpec, _ := packageModels[model]
-	return astTypeSpec
-}
-
-func (parser *Parser) FindModelDefinition(modelName string, currentPackage string) (*ast.TypeSpec, string) {
-	var model *ast.TypeSpec
-	var modelPackage string
-
-	modelNameParts := strings.Split(modelName, ".")
-
-	//if no dot in name - it can be only model from current package
-	if len(modelNameParts) == 1 {
-		modelPackage = currentPackage
-		if model = parser.GetModelDefinition(modelName, currentPackage); model == nil {
-			log.Fatalf("Can not find definition of %s model. Current package %s", modelName, currentPackage)
-		}
-	} else {
-		//first try to assume what name is absolute
-		absolutePackageName := strings.Join(modelNameParts[:len(modelNameParts)-1], "/")
-		modelNameFromPath := modelNameParts[len(modelNameParts)-1]
-
-		modelPackage = absolutePackageName
-		if model = parser.GetModelDefinition(modelNameFromPath, absolutePackageName); model == nil {
-
-			//can not get model by absolute name.
-			if len(modelNameParts) > 2 {
-				log.Fatalf("Can not find definition of %s model. Name looks like absolute, but model not found in %s package", modelNameFromPath, absolutePackageName)
-			}
-
-			// lets try to find it in imported packages
-			pkgRealPath := parser.CheckRealPackagePath(currentPackage)
-			if imports, ok := parser.PackageImports[pkgRealPath]; !ok {
-				log.Fatalf("Can not find definition of %s model. Package %s dont import anything", modelNameFromPath, pkgRealPath)
-			} else if relativePackage, ok := imports[modelNameParts[0]]; !ok {
-				log.Fatalf("Package %s is not imported to %s, Imported: %#v\n", modelNameParts[0], currentPackage, imports)
-			} else {
-				var modelFound bool
-
-				for _, packageName := range relativePackage {
-					if model = parser.GetModelDefinition(modelNameFromPath, packageName); model != nil {
-						modelPackage = packageName
-						modelFound = true
-
-						break
-					}
-				}
-
-				if !modelFound {
-					log.Fatalf("Can not find definition of %s model in package %s", modelNameFromPath, relativePackage)
-				}
-			}
-		}
-	}
-	return model, modelPackage
-}
-
-func (parser *Parser) ParseApiDescription(packageName string) {
-	parser.CurrentPackage = packageName
-	pkgRealPath := parser.GetRealPackagePath(packageName)
-
-	astPackages := parser.GetPackageAst(pkgRealPath)
-	for _, astPackage := range astPackages {
-		for _, astFile := range astPackage.Files {
-			for _, astDescription := range astFile.Decls {
-				switch astDeclaration := astDescription.(type) {
-				case *ast.FuncDecl:
-					if parser.IsController(astDeclaration, parser.ControllerClass) {
-						operation := NewOperation(parser, packageName)
-						if astDeclaration.Doc != nil && astDeclaration.Doc.List != nil {
-							for _, comment := range astDeclaration.Doc.List {
-								if err := operation.ParseComment(comment.Text); err != nil {
-									log.Printf("Can not parse comment for function: %v, package: %v, got error: %v\n", astDeclaration.Name.String(), packageName, err)
-								}
-							}
-						}
-						if operation.Path != "" {
-							parser.AddOperation(operation)
-						}
-					}
-				}
-			}
-			for _, astComment := range astFile.Comments {
-				for _, commentLine := range strings.Split(astComment.Text(), "\n") {
-					parser.ParseSubApiDescription(commentLine)
-				}
-			}
-		}
-	}
-}
-
-// Parse sub api declaration
-// @SubApi Very fancy API [/fancy-api]
-func (parser *Parser) ParseSubApiDescription(commentLine string) {
-	if !strings.HasPrefix(commentLine, "@SubApi") {
-		return
-	} else {
-		commentLine = strings.TrimSpace(commentLine[len("@SubApi"):])
-	}
-	re := regexp.MustCompile(`([^\[]+)\[{1}([\w\_\-/]+)`)
-
-	if matches := re.FindStringSubmatch(commentLine); len(matches) != 3 {
-		log.Printf("Can not parse sub api description %s, skipped", commentLine)
-	} else {
-		found := false
-		for _, ref := range parser.Listing.Apis {
-			if ref.Path == matches[2] {
-				found = true
-				ref.Description = strings.TrimSpace(matches[1])
-			}
-		}
-		if !found {
-			subApi := &ApiRef{Path: matches[2],
-				Description: strings.TrimSpace(matches[1]),
-			}
-			parser.Listing.Apis = append(parser.Listing.Apis, subApi)
-		}
-	}
-}
-
-func (parser *Parser) isIgnoredPackage(packageName string) bool {
-	r, _ := regexp.Compile("appengine+")
-	matched, err := regexp.MatchString(parser.Ignore, packageName)
-	if err != nil {
-		log.Fatalf("The -ignore argument is not a valid regular expression: %v\n", err)
-	}
-	return packageName == "C" || r.MatchString(packageName) || matched
-}
-
-func ParserFileFilter(info os.FileInfo) bool {
-	name := info.Name()
-	return !info.IsDir() && !strings.HasPrefix(name, ".") && strings.HasSuffix(name, ".go") && !strings.HasSuffix(name, "_test.go")
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/parser/structs.go b/vendor/github.com/yvasiyarov/swagger/parser/structs.go
deleted file mode 100644
index 079a07d05e..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/parser/structs.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package parser
-
-import (
-	"errors"
-)
-
-const SwaggerVersion = "1.2"
-const (
-	ContentTypeJson              = "application/json"
-	ContentTypeXml               = "application/xml"
-	ContentTypePlain             = "text/plain"
-	ContentTypeHtml              = "text/html"
-	ContentTypeMultiPartFormData = "multipart/form-data"
-)
-
-var CommentIsEmptyError = errors.New("Comment is empty")
-
-type ResourceListing struct {
-	ApiVersion     string     `json:"apiVersion"`
-	SwaggerVersion string     `json:"swaggerVersion"`
-	BasePath       string     `json:"basePath,omitempty"`
-	Apis           []*ApiRef  `json:"apis"`
-	Infos          Infomation `json:"info"`
-}
-
-type ApiRef struct {
-	Path        string `json:"path"` // relative or absolute, must start with /
-	Description string `json:"description"`
-}
-
-type Infomation struct {
-	Title             string `json:"title,omitempty"`
-	Description       string `json:"description,omitempty"`
-	Contact           string `json:"contact,omitempty"`
-	TermsOfServiceUrl string `json:"termsOfServiceUrl,omitempty"`
-	License           string `json:"license,omitempty"`
-	LicenseUrl        string `json:"licenseUrl,omitempty"`
-}
-
-type Api struct {
-	Path        string       `json:"path"` // relative or absolute, must start with /
-	Description string       `json:"description"`
-	Operations  []*Operation `json:"operations,omitempty"`
-}
-
-func NewApi() *Api {
-	return &Api{
-		Operations: make([]*Operation, 0),
-	}
-}
-
-type Protocol struct {
-}
-
-type ResponseMessage struct {
-	Code          int    `json:"code"`
-	Message       string `json:"message"`
-	ResponseType  string `json:"responseType"`
-	ResponseModel string `json:"responseModel"`
-}
-
-type Parameter struct {
-	ParamType     string `json:"paramType"` // path,query,body,header,form
-	Name          string `json:"name"`
-	Description   string `json:"description"`
-	DataType      string `json:"dataType"` // 1.2 needed?
-	Type          string `json:"type"`     // integer
-	Format        string `json:"format"`   // int64
-	AllowMultiple bool   `json:"allowMultiple"`
-	Required      bool   `json:"required"`
-	Minimum       int    `json:"minimum"`
-	Maximum       int    `json:"maximum"`
-}
-
-type ErrorResponse struct {
-	Code   int    `json:"code"`
-	Reason string `json:"reason"`
-}
-
-// https://github.com/wordnik/swagger-core/wiki/authorizations
-type Authorization struct {
-	LocalOAuth OAuth  `json:"local-oauth"`
-	ApiKey     ApiKey `json:"apiKey"`
-}
-
-// https://github.com/wordnik/swagger-core/wiki/authorizations
-type OAuth struct {
-	Type       string               `json:"type"`   // e.g. oauth2
-	Scopes     []string             `json:"scopes"` // e.g. PUBLIC
-	GrantTypes map[string]GrantType `json:"grantTypes"`
-}
-
-// https://github.com/wordnik/swagger-core/wiki/authorizations
-type GrantType struct {
-	LoginEndpoint        Endpoint `json:"loginEndpoint"`
-	TokenName            string   `json:"tokenName"` // e.g. access_code
-	TokenRequestEndpoint Endpoint `json:"tokenRequestEndpoint"`
-	TokenEndpoint        Endpoint `json:"tokenEndpoint"`
-}
-
-// https://github.com/wordnik/swagger-core/wiki/authorizations
-type Endpoint struct {
-	Url              string `json:"url"`
-	ClientIdName     string `json:"clientIdName"`
-	ClientSecretName string `json:"clientSecretName"`
-	TokenName        string `json:"tokenName"`
-}
-
-// https://github.com/wordnik/swagger-core/wiki/authorizations
-type ApiKey struct {
-	Type   string `json:"type"`   // e.g. apiKey
-	PassAs string `json:"passAs"` // e.g. header
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/web.go-example b/vendor/github.com/yvasiyarov/swagger/web.go-example
deleted file mode 100644
index 2ca9a43d74..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/web.go-example
+++ /dev/null
@@ -1,75 +0,0 @@
-package main
-
-import (
-	"flag"
-	"os"
-	"net/http"
-	"strings"
-	"text/template"
-
-	"github.com/fvbock/endless"
-	log "github.com/mgutz/logxi/v1"
-)
-
-var host = flag.String("host", "0.0.0.0", "Host")
-var port = flag.String("port", "8080", "Port")
-var staticContent = flag.String("staticPath", "./swagger-ui", "Path to folder with Swagger UI")
-var apiurl = flag.String("api", "http://127.0.0.1", "The base path URI of the API service")
-
-func IndexHandler(w http.ResponseWriter, r *http.Request) {
-	isJsonRequest := false
-
-	if acceptHeaders, ok := r.Header["Accept"]; ok {
-		for _, acceptHeader := range acceptHeaders {
-			if strings.Contains(acceptHeader, "json") {
-				isJsonRequest = true
-				break
-			}
-		}
-	}
-
-	if isJsonRequest {
-		w.Write([]byte(resourceListingJson))
-	} else {
-		http.Redirect(w, r, "/swagger-ui/", http.StatusFound)
-	}
-}
-
-func ApiDescriptionHandler(w http.ResponseWriter, r *http.Request) {
-	apiKey := strings.Trim(r.RequestURI, "/")
-
-	if json, ok := apiDescriptionsJson[apiKey]; ok {
-		t, e := template.New("desc").Parse(json)
-		if e != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-		t.Execute(w, *apiurl)
-	} else {
-		w.WriteHeader(http.StatusNotFound)
-	}
-}
-
-func main() {
-	flag.Parse()
-
-	// To serve a directory on disk (/tmp) under an alternate URL
-	// path (/tmpfiles/), use StripPrefix to modify the request
-	// URL's path before the FileServer sees it:
-	http.HandleFunc("/", IndexHandler)
-	http.Handle("/swagger-ui/", http.StripPrefix("/swagger-ui/", http.FileServer(http.Dir(*staticContent))))
-
-	for apiKey, _ := range apiDescriptionsJson {
-		http.HandleFunc("/"+apiKey+"/", ApiDescriptionHandler)
-	}
-
-	listenTo := *host + ":" + *port
-	log.Info("Star listen to %s", listenTo)
-
-	err := endless.ListenAndServe(listenTo, http.DefaultServeMux)
-	if err != nil {
-		log.Error(err.Error())
-	}
-	log.Info("Server on %s stopped", listenTo)
-	os.Exit(0)
-}
diff --git a/vendor/github.com/yvasiyarov/swagger/web.go-example-cors b/vendor/github.com/yvasiyarov/swagger/web.go-example-cors
deleted file mode 100644
index 0059652a2c..0000000000
--- a/vendor/github.com/yvasiyarov/swagger/web.go-example-cors
+++ /dev/null
@@ -1,68 +0,0 @@
-package main
-
-import (
-	"flag"
-	//	"fmt"
-	"log"
-	"net/http"
-	"strings"
-	"github.com/rs/cors"
-)
-
-var host = flag.String("host", "0.0.0.0", "Host")
-var port = flag.String("port", "8080", "Port")
-var staticContent = flag.String("staticPath", "./swagger-ui", "Path to folder with Swagger UI")
-
-func IndexHandler(w http.ResponseWriter, r *http.Request) {
-	isJsonRequest := false
-
-	if acceptHeaders, ok := r.Header["Accept"]; ok {
-		for _, acceptHeader := range acceptHeaders {
-			if strings.Contains(acceptHeader, "json") {
-				isJsonRequest = true
-				break
-			}
-		}
-	}
-
-	if isJsonRequest {
-		w.Write([]byte(resourceListingJson))
-	} else {
-		http.Redirect(w, r, "/swagger-ui/", http.StatusFound)
-	}
-}
-
-func ApiDescriptionHandler(w http.ResponseWriter, r *http.Request) {
-	apiKey := strings.Trim(r.RequestURI, "/")
-
-	if json, ok := apiDescriptionsJson[apiKey]; ok {
-		w.Write([]byte(json))
-	} else {
-		w.WriteHeader(http.StatusNotFound)
-	}
-}
-
-func main() {
-	flag.Parse()
-
-	//Add the url orgins to access from
-	c := cors.New(cors.Options{
-		AllowedOrigins: []string{"http://www.example.com/"},
-	})
-	// To serve a directory on disk (/tmp) under an alternate URL
-	// path (/tmpfiles/), use StripPrefix to modify the request
-	// URL's path before the FileServer sees it:
-	http.HandleFunc("/", IndexHandler)
-	http.Handle("/swagger-ui/", http.StripPrefix("/swagger-ui/", http.FileServer(http.Dir(*staticContent))))
-
-	for apiKey, _ := range apiDescriptionsJson {
-		http.HandleFunc("/"+apiKey+"/", ApiDescriptionHandler)
-	}
-
-	listenTo := *host + ":" + *port
-	log.Printf("Star listen to %s", listenTo)
-
-	http.ListenAndServe(listenTo, http.DefaultServeMux)
-	//http.ListenAndServe(listenTo, c.Handler(http.DefaultServeMux)) Allows cors to be used.
-	//http.ListenAndServe(":8080", http.StripPrefix("/swagger-ui/", http.FileServer(http.Dir("./swagger-ui")) )
-}
diff --git a/vendor/golang.org/x/net/LICENSE b/vendor/golang.org/x/net/LICENSE
deleted file mode 100644
index 6a66aea5ea..0000000000
--- a/vendor/golang.org/x/net/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/net/PATENTS b/vendor/golang.org/x/net/PATENTS
deleted file mode 100644
index 733099041f..0000000000
--- a/vendor/golang.org/x/net/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go
deleted file mode 100644
index f143ed6a1e..0000000000
--- a/vendor/golang.org/x/net/context/context.go
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package context defines the Context type, which carries deadlines,
-// cancelation signals, and other request-scoped values across API boundaries
-// and between processes.
-//
-// Incoming requests to a server should create a Context, and outgoing calls to
-// servers should accept a Context. The chain of function calls between must
-// propagate the Context, optionally replacing it with a modified copy created
-// using WithDeadline, WithTimeout, WithCancel, or WithValue.
-//
-// Programs that use Contexts should follow these rules to keep interfaces
-// consistent across packages and enable static analysis tools to check context
-// propagation:
-//
-// Do not store Contexts inside a struct type; instead, pass a Context
-// explicitly to each function that needs it. The Context should be the first
-// parameter, typically named ctx:
-//
-// 	func DoSomething(ctx context.Context, arg Arg) error {
-// 		// ... use ctx ...
-// 	}
-//
-// Do not pass a nil Context, even if a function permits it. Pass context.TODO
-// if you are unsure about which Context to use.
-//
-// Use context Values only for request-scoped data that transits processes and
-// APIs, not for passing optional parameters to functions.
-//
-// The same Context may be passed to functions running in different goroutines;
-// Contexts are safe for simultaneous use by multiple goroutines.
-//
-// See http://blog.golang.org/context for example code for a server that uses
-// Contexts.
-package context // import "golang.org/x/net/context"
-
-import "time"
-
-// A Context carries a deadline, a cancelation signal, and other values across
-// API boundaries.
-//
-// Context's methods may be called by multiple goroutines simultaneously.
-type Context interface {
-	// Deadline returns the time when work done on behalf of this context
-	// should be canceled. Deadline returns ok==false when no deadline is
-	// set. Successive calls to Deadline return the same results.
-	Deadline() (deadline time.Time, ok bool)
-
-	// Done returns a channel that's closed when work done on behalf of this
-	// context should be canceled. Done may return nil if this context can
-	// never be canceled. Successive calls to Done return the same value.
-	//
-	// WithCancel arranges for Done to be closed when cancel is called;
-	// WithDeadline arranges for Done to be closed when the deadline
-	// expires; WithTimeout arranges for Done to be closed when the timeout
-	// elapses.
-	//
-	// Done is provided for use in select statements:
-	//
-	//  // Stream generates values with DoSomething and sends them to out
-	//  // until DoSomething returns an error or ctx.Done is closed.
-	//  func Stream(ctx context.Context, out chan<- Value) error {
-	//  	for {
-	//  		v, err := DoSomething(ctx)
-	//  		if err != nil {
-	//  			return err
-	//  		}
-	//  		select {
-	//  		case <-ctx.Done():
-	//  			return ctx.Err()
-	//  		case out <- v:
-	//  		}
-	//  	}
-	//  }
-	//
-	// See http://blog.golang.org/pipelines for more examples of how to use
-	// a Done channel for cancelation.
-	Done() <-chan struct{}
-
-	// Err returns a non-nil error value after Done is closed. Err returns
-	// Canceled if the context was canceled or DeadlineExceeded if the
-	// context's deadline passed. No other values for Err are defined.
-	// After Done is closed, successive calls to Err return the same value.
-	Err() error
-
-	// Value returns the value associated with this context for key, or nil
-	// if no value is associated with key. Successive calls to Value with
-	// the same key returns the same result.
-	//
-	// Use context values only for request-scoped data that transits
-	// processes and API boundaries, not for passing optional parameters to
-	// functions.
-	//
-	// A key identifies a specific value in a Context. Functions that wish
-	// to store values in Context typically allocate a key in a global
-	// variable then use that key as the argument to context.WithValue and
-	// Context.Value. A key can be any type that supports equality;
-	// packages should define keys as an unexported type to avoid
-	// collisions.
-	//
-	// Packages that define a Context key should provide type-safe accessors
-	// for the values stores using that key:
-	//
-	// 	// Package user defines a User type that's stored in Contexts.
-	// 	package user
-	//
-	// 	import "golang.org/x/net/context"
-	//
-	// 	// User is the type of value stored in the Contexts.
-	// 	type User struct {...}
-	//
-	// 	// key is an unexported type for keys defined in this package.
-	// 	// This prevents collisions with keys defined in other packages.
-	// 	type key int
-	//
-	// 	// userKey is the key for user.User values in Contexts. It is
-	// 	// unexported; clients use user.NewContext and user.FromContext
-	// 	// instead of using this key directly.
-	// 	var userKey key = 0
-	//
-	// 	// NewContext returns a new Context that carries value u.
-	// 	func NewContext(ctx context.Context, u *User) context.Context {
-	// 		return context.WithValue(ctx, userKey, u)
-	// 	}
-	//
-	// 	// FromContext returns the User value stored in ctx, if any.
-	// 	func FromContext(ctx context.Context) (*User, bool) {
-	// 		u, ok := ctx.Value(userKey).(*User)
-	// 		return u, ok
-	// 	}
-	Value(key interface{}) interface{}
-}
-
-// Background returns a non-nil, empty Context. It is never canceled, has no
-// values, and has no deadline. It is typically used by the main function,
-// initialization, and tests, and as the top-level Context for incoming
-// requests.
-func Background() Context {
-	return background
-}
-
-// TODO returns a non-nil, empty Context. Code should use context.TODO when
-// it's unclear which Context to use or it is not yet available (because the
-// surrounding function has not yet been extended to accept a Context
-// parameter).  TODO is recognized by static analysis tools that determine
-// whether Contexts are propagated correctly in a program.
-func TODO() Context {
-	return todo
-}
-
-// A CancelFunc tells an operation to abandon its work.
-// A CancelFunc does not wait for the work to stop.
-// After the first call, subsequent calls to a CancelFunc do nothing.
-type CancelFunc func()
diff --git a/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go b/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go
deleted file mode 100644
index 606cf1f972..0000000000
--- a/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7
-
-// Package ctxhttp provides helper functions for performing context-aware HTTP requests.
-package ctxhttp // import "golang.org/x/net/context/ctxhttp"
-
-import (
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-
-	"golang.org/x/net/context"
-)
-
-// Do sends an HTTP request with the provided http.Client and returns
-// an HTTP response.
-//
-// If the client is nil, http.DefaultClient is used.
-//
-// The provided ctx must be non-nil. If it is canceled or times out,
-// ctx.Err() will be returned.
-func Do(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) {
-	if client == nil {
-		client = http.DefaultClient
-	}
-	resp, err := client.Do(req.WithContext(ctx))
-	// If we got an error, and the context has been canceled,
-	// the context's error is probably more useful.
-	if err != nil {
-		select {
-		case <-ctx.Done():
-			err = ctx.Err()
-		default:
-		}
-	}
-	return resp, err
-}
-
-// Get issues a GET request via the Do function.
-func Get(ctx context.Context, client *http.Client, url string) (*http.Response, error) {
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, err
-	}
-	return Do(ctx, client, req)
-}
-
-// Head issues a HEAD request via the Do function.
-func Head(ctx context.Context, client *http.Client, url string) (*http.Response, error) {
-	req, err := http.NewRequest("HEAD", url, nil)
-	if err != nil {
-		return nil, err
-	}
-	return Do(ctx, client, req)
-}
-
-// Post issues a POST request via the Do function.
-func Post(ctx context.Context, client *http.Client, url string, bodyType string, body io.Reader) (*http.Response, error) {
-	req, err := http.NewRequest("POST", url, body)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", bodyType)
-	return Do(ctx, client, req)
-}
-
-// PostForm issues a POST request via the Do function.
-func PostForm(ctx context.Context, client *http.Client, url string, data url.Values) (*http.Response, error) {
-	return Post(ctx, client, url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
-}
diff --git a/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_pre17.go b/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_pre17.go
deleted file mode 100644
index 926870cc23..0000000000
--- a/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_pre17.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.7
-
-package ctxhttp // import "golang.org/x/net/context/ctxhttp"
-
-import (
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-
-	"golang.org/x/net/context"
-)
-
-func nop() {}
-
-var (
-	testHookContextDoneBeforeHeaders = nop
-	testHookDoReturned               = nop
-	testHookDidBodyClose             = nop
-)
-
-// Do sends an HTTP request with the provided http.Client and returns an HTTP response.
-// If the client is nil, http.DefaultClient is used.
-// If the context is canceled or times out, ctx.Err() will be returned.
-func Do(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) {
-	if client == nil {
-		client = http.DefaultClient
-	}
-
-	// TODO(djd): Respect any existing value of req.Cancel.
-	cancel := make(chan struct{})
-	req.Cancel = cancel
-
-	type responseAndError struct {
-		resp *http.Response
-		err  error
-	}
-	result := make(chan responseAndError, 1)
-
-	// Make local copies of test hooks closed over by goroutines below.
-	// Prevents data races in tests.
-	testHookDoReturned := testHookDoReturned
-	testHookDidBodyClose := testHookDidBodyClose
-
-	go func() {
-		resp, err := client.Do(req)
-		testHookDoReturned()
-		result <- responseAndError{resp, err}
-	}()
-
-	var resp *http.Response
-
-	select {
-	case <-ctx.Done():
-		testHookContextDoneBeforeHeaders()
-		close(cancel)
-		// Clean up after the goroutine calling client.Do:
-		go func() {
-			if r := <-result; r.resp != nil {
-				testHookDidBodyClose()
-				r.resp.Body.Close()
-			}
-		}()
-		return nil, ctx.Err()
-	case r := <-result:
-		var err error
-		resp, err = r.resp, r.err
-		if err != nil {
-			return resp, err
-		}
-	}
-
-	c := make(chan struct{})
-	go func() {
-		select {
-		case <-ctx.Done():
-			close(cancel)
-		case <-c:
-			// The response's Body is closed.
-		}
-	}()
-	resp.Body = &notifyingReader{resp.Body, c}
-
-	return resp, nil
-}
-
-// Get issues a GET request via the Do function.
-func Get(ctx context.Context, client *http.Client, url string) (*http.Response, error) {
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, err
-	}
-	return Do(ctx, client, req)
-}
-
-// Head issues a HEAD request via the Do function.
-func Head(ctx context.Context, client *http.Client, url string) (*http.Response, error) {
-	req, err := http.NewRequest("HEAD", url, nil)
-	if err != nil {
-		return nil, err
-	}
-	return Do(ctx, client, req)
-}
-
-// Post issues a POST request via the Do function.
-func Post(ctx context.Context, client *http.Client, url string, bodyType string, body io.Reader) (*http.Response, error) {
-	req, err := http.NewRequest("POST", url, body)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", bodyType)
-	return Do(ctx, client, req)
-}
-
-// PostForm issues a POST request via the Do function.
-func PostForm(ctx context.Context, client *http.Client, url string, data url.Values) (*http.Response, error) {
-	return Post(ctx, client, url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
-}
-
-// notifyingReader is an io.ReadCloser that closes the notify channel after
-// Close is called or a Read fails on the underlying ReadCloser.
-type notifyingReader struct {
-	io.ReadCloser
-	notify chan<- struct{}
-}
-
-func (r *notifyingReader) Read(p []byte) (int, error) {
-	n, err := r.ReadCloser.Read(p)
-	if err != nil && r.notify != nil {
-		close(r.notify)
-		r.notify = nil
-	}
-	return n, err
-}
-
-func (r *notifyingReader) Close() error {
-	err := r.ReadCloser.Close()
-	if r.notify != nil {
-		close(r.notify)
-		r.notify = nil
-	}
-	return err
-}
diff --git a/vendor/golang.org/x/net/context/go17.go b/vendor/golang.org/x/net/context/go17.go
deleted file mode 100644
index d20f52b7de..0000000000
--- a/vendor/golang.org/x/net/context/go17.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7
-
-package context
-
-import (
-	"context" // standard library's context, as of Go 1.7
-	"time"
-)
-
-var (
-	todo       = context.TODO()
-	background = context.Background()
-)
-
-// Canceled is the error returned by Context.Err when the context is canceled.
-var Canceled = context.Canceled
-
-// DeadlineExceeded is the error returned by Context.Err when the context's
-// deadline passes.
-var DeadlineExceeded = context.DeadlineExceeded
-
-// WithCancel returns a copy of parent with a new Done channel. The returned
-// context's Done channel is closed when the returned cancel function is called
-// or when the parent context's Done channel is closed, whichever happens first.
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this Context complete.
-func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
-	ctx, f := context.WithCancel(parent)
-	return ctx, CancelFunc(f)
-}
-
-// WithDeadline returns a copy of the parent context with the deadline adjusted
-// to be no later than d. If the parent's deadline is already earlier than d,
-// WithDeadline(parent, d) is semantically equivalent to parent. The returned
-// context's Done channel is closed when the deadline expires, when the returned
-// cancel function is called, or when the parent context's Done channel is
-// closed, whichever happens first.
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this Context complete.
-func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) {
-	ctx, f := context.WithDeadline(parent, deadline)
-	return ctx, CancelFunc(f)
-}
-
-// WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this Context complete:
-//
-// 	func slowOperationWithTimeout(ctx context.Context) (Result, error) {
-// 		ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
-// 		defer cancel()  // releases resources if slowOperation completes before timeout elapses
-// 		return slowOperation(ctx)
-// 	}
-func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
-	return WithDeadline(parent, time.Now().Add(timeout))
-}
-
-// WithValue returns a copy of parent in which the value associated with key is
-// val.
-//
-// Use context Values only for request-scoped data that transits processes and
-// APIs, not for passing optional parameters to functions.
-func WithValue(parent Context, key interface{}, val interface{}) Context {
-	return context.WithValue(parent, key, val)
-}
diff --git a/vendor/golang.org/x/net/context/pre_go17.go b/vendor/golang.org/x/net/context/pre_go17.go
deleted file mode 100644
index 0f35592df5..0000000000
--- a/vendor/golang.org/x/net/context/pre_go17.go
+++ /dev/null
@@ -1,300 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.7
-
-package context
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-)
-
-// An emptyCtx is never canceled, has no values, and has no deadline. It is not
-// struct{}, since vars of this type must have distinct addresses.
-type emptyCtx int
-
-func (*emptyCtx) Deadline() (deadline time.Time, ok bool) {
-	return
-}
-
-func (*emptyCtx) Done() <-chan struct{} {
-	return nil
-}
-
-func (*emptyCtx) Err() error {
-	return nil
-}
-
-func (*emptyCtx) Value(key interface{}) interface{} {
-	return nil
-}
-
-func (e *emptyCtx) String() string {
-	switch e {
-	case background:
-		return "context.Background"
-	case todo:
-		return "context.TODO"
-	}
-	return "unknown empty Context"
-}
-
-var (
-	background = new(emptyCtx)
-	todo       = new(emptyCtx)
-)
-
-// Canceled is the error returned by Context.Err when the context is canceled.
-var Canceled = errors.New("context canceled")
-
-// DeadlineExceeded is the error returned by Context.Err when the context's
-// deadline passes.
-var DeadlineExceeded = errors.New("context deadline exceeded")
-
-// WithCancel returns a copy of parent with a new Done channel. The returned
-// context's Done channel is closed when the returned cancel function is called
-// or when the parent context's Done channel is closed, whichever happens first.
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this Context complete.
-func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
-	c := newCancelCtx(parent)
-	propagateCancel(parent, c)
-	return c, func() { c.cancel(true, Canceled) }
-}
-
-// newCancelCtx returns an initialized cancelCtx.
-func newCancelCtx(parent Context) *cancelCtx {
-	return &cancelCtx{
-		Context: parent,
-		done:    make(chan struct{}),
-	}
-}
-
-// propagateCancel arranges for child to be canceled when parent is.
-func propagateCancel(parent Context, child canceler) {
-	if parent.Done() == nil {
-		return // parent is never canceled
-	}
-	if p, ok := parentCancelCtx(parent); ok {
-		p.mu.Lock()
-		if p.err != nil {
-			// parent has already been canceled
-			child.cancel(false, p.err)
-		} else {
-			if p.children == nil {
-				p.children = make(map[canceler]bool)
-			}
-			p.children[child] = true
-		}
-		p.mu.Unlock()
-	} else {
-		go func() {
-			select {
-			case <-parent.Done():
-				child.cancel(false, parent.Err())
-			case <-child.Done():
-			}
-		}()
-	}
-}
-
-// parentCancelCtx follows a chain of parent references until it finds a
-// *cancelCtx. This function understands how each of the concrete types in this
-// package represents its parent.
-func parentCancelCtx(parent Context) (*cancelCtx, bool) {
-	for {
-		switch c := parent.(type) {
-		case *cancelCtx:
-			return c, true
-		case *timerCtx:
-			return c.cancelCtx, true
-		case *valueCtx:
-			parent = c.Context
-		default:
-			return nil, false
-		}
-	}
-}
-
-// removeChild removes a context from its parent.
-func removeChild(parent Context, child canceler) {
-	p, ok := parentCancelCtx(parent)
-	if !ok {
-		return
-	}
-	p.mu.Lock()
-	if p.children != nil {
-		delete(p.children, child)
-	}
-	p.mu.Unlock()
-}
-
-// A canceler is a context type that can be canceled directly. The
-// implementations are *cancelCtx and *timerCtx.
-type canceler interface {
-	cancel(removeFromParent bool, err error)
-	Done() <-chan struct{}
-}
-
-// A cancelCtx can be canceled. When canceled, it also cancels any children
-// that implement canceler.
-type cancelCtx struct {
-	Context
-
-	done chan struct{} // closed by the first cancel call.
-
-	mu       sync.Mutex
-	children map[canceler]bool // set to nil by the first cancel call
-	err      error             // set to non-nil by the first cancel call
-}
-
-func (c *cancelCtx) Done() <-chan struct{} {
-	return c.done
-}
-
-func (c *cancelCtx) Err() error {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	return c.err
-}
-
-func (c *cancelCtx) String() string {
-	return fmt.Sprintf("%v.WithCancel", c.Context)
-}
-
-// cancel closes c.done, cancels each of c's children, and, if
-// removeFromParent is true, removes c from its parent's children.
-func (c *cancelCtx) cancel(removeFromParent bool, err error) {
-	if err == nil {
-		panic("context: internal error: missing cancel error")
-	}
-	c.mu.Lock()
-	if c.err != nil {
-		c.mu.Unlock()
-		return // already canceled
-	}
-	c.err = err
-	close(c.done)
-	for child := range c.children {
-		// NOTE: acquiring the child's lock while holding parent's lock.
-		child.cancel(false, err)
-	}
-	c.children = nil
-	c.mu.Unlock()
-
-	if removeFromParent {
-		removeChild(c.Context, c)
-	}
-}
-
-// WithDeadline returns a copy of the parent context with the deadline adjusted
-// to be no later than d. If the parent's deadline is already earlier than d,
-// WithDeadline(parent, d) is semantically equivalent to parent. The returned
-// context's Done channel is closed when the deadline expires, when the returned
-// cancel function is called, or when the parent context's Done channel is
-// closed, whichever happens first.
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this Context complete.
-func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) {
-	if cur, ok := parent.Deadline(); ok && cur.Before(deadline) {
-		// The current deadline is already sooner than the new one.
-		return WithCancel(parent)
-	}
-	c := &timerCtx{
-		cancelCtx: newCancelCtx(parent),
-		deadline:  deadline,
-	}
-	propagateCancel(parent, c)
-	d := deadline.Sub(time.Now())
-	if d <= 0 {
-		c.cancel(true, DeadlineExceeded) // deadline has already passed
-		return c, func() { c.cancel(true, Canceled) }
-	}
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	if c.err == nil {
-		c.timer = time.AfterFunc(d, func() {
-			c.cancel(true, DeadlineExceeded)
-		})
-	}
-	return c, func() { c.cancel(true, Canceled) }
-}
-
-// A timerCtx carries a timer and a deadline. It embeds a cancelCtx to
-// implement Done and Err. It implements cancel by stopping its timer then
-// delegating to cancelCtx.cancel.
-type timerCtx struct {
-	*cancelCtx
-	timer *time.Timer // Under cancelCtx.mu.
-
-	deadline time.Time
-}
-
-func (c *timerCtx) Deadline() (deadline time.Time, ok bool) {
-	return c.deadline, true
-}
-
-func (c *timerCtx) String() string {
-	return fmt.Sprintf("%v.WithDeadline(%s [%s])", c.cancelCtx.Context, c.deadline, c.deadline.Sub(time.Now()))
-}
-
-func (c *timerCtx) cancel(removeFromParent bool, err error) {
-	c.cancelCtx.cancel(false, err)
-	if removeFromParent {
-		// Remove this timerCtx from its parent cancelCtx's children.
-		removeChild(c.cancelCtx.Context, c)
-	}
-	c.mu.Lock()
-	if c.timer != nil {
-		c.timer.Stop()
-		c.timer = nil
-	}
-	c.mu.Unlock()
-}
-
-// WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).
-//
-// Canceling this context releases resources associated with it, so code should
-// call cancel as soon as the operations running in this Context complete:
-//
-// 	func slowOperationWithTimeout(ctx context.Context) (Result, error) {
-// 		ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
-// 		defer cancel()  // releases resources if slowOperation completes before timeout elapses
-// 		return slowOperation(ctx)
-// 	}
-func WithTimeout(parent Context, timeout time.Duration) (Context, CancelFunc) {
-	return WithDeadline(parent, time.Now().Add(timeout))
-}
-
-// WithValue returns a copy of parent in which the value associated with key is
-// val.
-//
-// Use context Values only for request-scoped data that transits processes and
-// APIs, not for passing optional parameters to functions.
-func WithValue(parent Context, key interface{}, val interface{}) Context {
-	return &valueCtx{parent, key, val}
-}
-
-// A valueCtx carries a key-value pair. It implements Value for that key and
-// delegates all other calls to the embedded Context.
-type valueCtx struct {
-	Context
-	key, val interface{}
-}
-
-func (c *valueCtx) String() string {
-	return fmt.Sprintf("%v.WithValue(%#v, %#v)", c.Context, c.key, c.val)
-}
-
-func (c *valueCtx) Value(key interface{}) interface{} {
-	if c.key == key {
-		return c.val
-	}
-	return c.Context.Value(key)
-}
diff --git a/vendor/golang.org/x/net/html/atom/atom.go b/vendor/golang.org/x/net/html/atom/atom.go
deleted file mode 100644
index cd0a8ac154..0000000000
--- a/vendor/golang.org/x/net/html/atom/atom.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package atom provides integer codes (also known as atoms) for a fixed set of
-// frequently occurring HTML strings: tag names and attribute keys such as "p"
-// and "id".
-//
-// Sharing an atom's name between all elements with the same tag can result in
-// fewer string allocations when tokenizing and parsing HTML. Integer
-// comparisons are also generally faster than string comparisons.
-//
-// The value of an atom's particular code is not guaranteed to stay the same
-// between versions of this package. Neither is any ordering guaranteed:
-// whether atom.H1 < atom.H2 may also change. The codes are not guaranteed to
-// be dense. The only guarantees are that e.g. looking up "div" will yield
-// atom.Div, calling atom.Div.String will return "div", and atom.Div != 0.
-package atom // import "golang.org/x/net/html/atom"
-
-// Atom is an integer code for a string. The zero value maps to "".
-type Atom uint32
-
-// String returns the atom's name.
-func (a Atom) String() string {
-	start := uint32(a >> 8)
-	n := uint32(a & 0xff)
-	if start+n > uint32(len(atomText)) {
-		return ""
-	}
-	return atomText[start : start+n]
-}
-
-func (a Atom) string() string {
-	return atomText[a>>8 : a>>8+a&0xff]
-}
-
-// fnv computes the FNV hash with an arbitrary starting value h.
-func fnv(h uint32, s []byte) uint32 {
-	for i := range s {
-		h ^= uint32(s[i])
-		h *= 16777619
-	}
-	return h
-}
-
-func match(s string, t []byte) bool {
-	for i, c := range t {
-		if s[i] != c {
-			return false
-		}
-	}
-	return true
-}
-
-// Lookup returns the atom whose name is s. It returns zero if there is no
-// such atom. The lookup is case sensitive.
-func Lookup(s []byte) Atom {
-	if len(s) == 0 || len(s) > maxAtomLen {
-		return 0
-	}
-	h := fnv(hash0, s)
-	if a := table[h&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
-		return a
-	}
-	if a := table[(h>>16)&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
-		return a
-	}
-	return 0
-}
-
-// String returns a string whose contents are equal to s. In that sense, it is
-// equivalent to string(s) but may be more efficient.
-func String(s []byte) string {
-	if a := Lookup(s); a != 0 {
-		return a.String()
-	}
-	return string(s)
-}
diff --git a/vendor/golang.org/x/net/html/atom/table.go b/vendor/golang.org/x/net/html/atom/table.go
deleted file mode 100644
index 2605ba3102..0000000000
--- a/vendor/golang.org/x/net/html/atom/table.go
+++ /dev/null
@@ -1,713 +0,0 @@
-// generated by go run gen.go; DO NOT EDIT
-
-package atom
-
-const (
-	A                   Atom = 0x1
-	Abbr                Atom = 0x4
-	Accept              Atom = 0x2106
-	AcceptCharset       Atom = 0x210e
-	Accesskey           Atom = 0x3309
-	Action              Atom = 0x1f606
-	Address             Atom = 0x4f307
-	Align               Atom = 0x1105
-	Alt                 Atom = 0x4503
-	Annotation          Atom = 0x1670a
-	AnnotationXml       Atom = 0x1670e
-	Applet              Atom = 0x2b306
-	Area                Atom = 0x2fa04
-	Article             Atom = 0x38807
-	Aside               Atom = 0x8305
-	Async               Atom = 0x7b05
-	Audio               Atom = 0xa605
-	Autocomplete        Atom = 0x1fc0c
-	Autofocus           Atom = 0xb309
-	Autoplay            Atom = 0xce08
-	B                   Atom = 0x101
-	Base                Atom = 0xd604
-	Basefont            Atom = 0xd608
-	Bdi                 Atom = 0x1a03
-	Bdo                 Atom = 0xe703
-	Bgsound             Atom = 0x11807
-	Big                 Atom = 0x12403
-	Blink               Atom = 0x12705
-	Blockquote          Atom = 0x12c0a
-	Body                Atom = 0x2f04
-	Br                  Atom = 0x202
-	Button              Atom = 0x13606
-	Canvas              Atom = 0x7f06
-	Caption             Atom = 0x1bb07
-	Center              Atom = 0x5b506
-	Challenge           Atom = 0x21f09
-	Charset             Atom = 0x2807
-	Checked             Atom = 0x32807
-	Cite                Atom = 0x3c804
-	Class               Atom = 0x4de05
-	Code                Atom = 0x14904
-	Col                 Atom = 0x15003
-	Colgroup            Atom = 0x15008
-	Color               Atom = 0x15d05
-	Cols                Atom = 0x16204
-	Colspan             Atom = 0x16207
-	Command             Atom = 0x17507
-	Content             Atom = 0x42307
-	Contenteditable     Atom = 0x4230f
-	Contextmenu         Atom = 0x3310b
-	Controls            Atom = 0x18808
-	Coords              Atom = 0x19406
-	Crossorigin         Atom = 0x19f0b
-	Data                Atom = 0x44a04
-	Datalist            Atom = 0x44a08
-	Datetime            Atom = 0x23c08
-	Dd                  Atom = 0x26702
-	Default             Atom = 0x8607
-	Defer               Atom = 0x14b05
-	Del                 Atom = 0x3ef03
-	Desc                Atom = 0x4db04
-	Details             Atom = 0x4807
-	Dfn                 Atom = 0x6103
-	Dialog              Atom = 0x1b06
-	Dir                 Atom = 0x6903
-	Dirname             Atom = 0x6907
-	Disabled            Atom = 0x10c08
-	Div                 Atom = 0x11303
-	Dl                  Atom = 0x11e02
-	Download            Atom = 0x40008
-	Draggable           Atom = 0x17b09
-	Dropzone            Atom = 0x39108
-	Dt                  Atom = 0x50902
-	Em                  Atom = 0x6502
-	Embed               Atom = 0x6505
-	Enctype             Atom = 0x21107
-	Face                Atom = 0x5b304
-	Fieldset            Atom = 0x1b008
-	Figcaption          Atom = 0x1b80a
-	Figure              Atom = 0x1cc06
-	Font                Atom = 0xda04
-	Footer              Atom = 0x8d06
-	For                 Atom = 0x1d803
-	ForeignObject       Atom = 0x1d80d
-	Foreignobject       Atom = 0x1e50d
-	Form                Atom = 0x1f204
-	Formaction          Atom = 0x1f20a
-	Formenctype         Atom = 0x20d0b
-	Formmethod          Atom = 0x2280a
-	Formnovalidate      Atom = 0x2320e
-	Formtarget          Atom = 0x2470a
-	Frame               Atom = 0x9a05
-	Frameset            Atom = 0x9a08
-	H1                  Atom = 0x26e02
-	H2                  Atom = 0x29402
-	H3                  Atom = 0x2a702
-	H4                  Atom = 0x2e902
-	H5                  Atom = 0x2f302
-	H6                  Atom = 0x50b02
-	Head                Atom = 0x2d504
-	Header              Atom = 0x2d506
-	Headers             Atom = 0x2d507
-	Height              Atom = 0x25106
-	Hgroup              Atom = 0x25906
-	Hidden              Atom = 0x26506
-	High                Atom = 0x26b04
-	Hr                  Atom = 0x27002
-	Href                Atom = 0x27004
-	Hreflang            Atom = 0x27008
-	Html                Atom = 0x25504
-	HttpEquiv           Atom = 0x2780a
-	I                   Atom = 0x601
-	Icon                Atom = 0x42204
-	Id                  Atom = 0x8502
-	Iframe              Atom = 0x29606
-	Image               Atom = 0x29c05
-	Img                 Atom = 0x2a103
-	Input               Atom = 0x3e805
-	Inputmode           Atom = 0x3e809
-	Ins                 Atom = 0x1a803
-	Isindex             Atom = 0x2a907
-	Ismap               Atom = 0x2b005
-	Itemid              Atom = 0x33c06
-	Itemprop            Atom = 0x3c908
-	Itemref             Atom = 0x5ad07
-	Itemscope           Atom = 0x2b909
-	Itemtype            Atom = 0x2c308
-	Kbd                 Atom = 0x1903
-	Keygen              Atom = 0x3906
-	Keytype             Atom = 0x53707
-	Kind                Atom = 0x10904
-	Label               Atom = 0xf005
-	Lang                Atom = 0x27404
-	Legend              Atom = 0x18206
-	Li                  Atom = 0x1202
-	Link                Atom = 0x12804
-	List                Atom = 0x44e04
-	Listing             Atom = 0x44e07
-	Loop                Atom = 0xf404
-	Low                 Atom = 0x11f03
-	Malignmark          Atom = 0x100a
-	Manifest            Atom = 0x5f108
-	Map                 Atom = 0x2b203
-	Mark                Atom = 0x1604
-	Marquee             Atom = 0x2cb07
-	Math                Atom = 0x2d204
-	Max                 Atom = 0x2e103
-	Maxlength           Atom = 0x2e109
-	Media               Atom = 0x6e05
-	Mediagroup          Atom = 0x6e0a
-	Menu                Atom = 0x33804
-	Menuitem            Atom = 0x33808
-	Meta                Atom = 0x45d04
-	Meter               Atom = 0x24205
-	Method              Atom = 0x22c06
-	Mglyph              Atom = 0x2a206
-	Mi                  Atom = 0x2eb02
-	Min                 Atom = 0x2eb03
-	Minlength           Atom = 0x2eb09
-	Mn                  Atom = 0x23502
-	Mo                  Atom = 0x3ed02
-	Ms                  Atom = 0x2bc02
-	Mtext               Atom = 0x2f505
-	Multiple            Atom = 0x30308
-	Muted               Atom = 0x30b05
-	Name                Atom = 0x6c04
-	Nav                 Atom = 0x3e03
-	Nobr                Atom = 0x5704
-	Noembed             Atom = 0x6307
-	Noframes            Atom = 0x9808
-	Noscript            Atom = 0x3d208
-	Novalidate          Atom = 0x2360a
-	Object              Atom = 0x1ec06
-	Ol                  Atom = 0xc902
-	Onabort             Atom = 0x13a07
-	Onafterprint        Atom = 0x1c00c
-	Onautocomplete      Atom = 0x1fa0e
-	Onautocompleteerror Atom = 0x1fa13
-	Onbeforeprint       Atom = 0x6040d
-	Onbeforeunload      Atom = 0x4e70e
-	Onblur              Atom = 0xaa06
-	Oncancel            Atom = 0xe908
-	Oncanplay           Atom = 0x28509
-	Oncanplaythrough    Atom = 0x28510
-	Onchange            Atom = 0x3a708
-	Onclick             Atom = 0x31007
-	Onclose             Atom = 0x31707
-	Oncontextmenu       Atom = 0x32f0d
-	Oncuechange         Atom = 0x3420b
-	Ondblclick          Atom = 0x34d0a
-	Ondrag              Atom = 0x35706
-	Ondragend           Atom = 0x35709
-	Ondragenter         Atom = 0x3600b
-	Ondragleave         Atom = 0x36b0b
-	Ondragover          Atom = 0x3760a
-	Ondragstart         Atom = 0x3800b
-	Ondrop              Atom = 0x38f06
-	Ondurationchange    Atom = 0x39f10
-	Onemptied           Atom = 0x39609
-	Onended             Atom = 0x3af07
-	Onerror             Atom = 0x3b607
-	Onfocus             Atom = 0x3bd07
-	Onhashchange        Atom = 0x3da0c
-	Oninput             Atom = 0x3e607
-	Oninvalid           Atom = 0x3f209
-	Onkeydown           Atom = 0x3fb09
-	Onkeypress          Atom = 0x4080a
-	Onkeyup             Atom = 0x41807
-	Onlanguagechange    Atom = 0x43210
-	Onload              Atom = 0x44206
-	Onloadeddata        Atom = 0x4420c
-	Onloadedmetadata    Atom = 0x45510
-	Onloadstart         Atom = 0x46b0b
-	Onmessage           Atom = 0x47609
-	Onmousedown         Atom = 0x47f0b
-	Onmousemove         Atom = 0x48a0b
-	Onmouseout          Atom = 0x4950a
-	Onmouseover         Atom = 0x4a20b
-	Onmouseup           Atom = 0x4ad09
-	Onmousewheel        Atom = 0x4b60c
-	Onoffline           Atom = 0x4c209
-	Ononline            Atom = 0x4cb08
-	Onpagehide          Atom = 0x4d30a
-	Onpageshow          Atom = 0x4fe0a
-	Onpause             Atom = 0x50d07
-	Onplay              Atom = 0x51706
-	Onplaying           Atom = 0x51709
-	Onpopstate          Atom = 0x5200a
-	Onprogress          Atom = 0x52a0a
-	Onratechange        Atom = 0x53e0c
-	Onreset             Atom = 0x54a07
-	Onresize            Atom = 0x55108
-	Onscroll            Atom = 0x55f08
-	Onseeked            Atom = 0x56708
-	Onseeking           Atom = 0x56f09
-	Onselect            Atom = 0x57808
-	Onshow              Atom = 0x58206
-	Onsort              Atom = 0x58b06
-	Onstalled           Atom = 0x59509
-	Onstorage           Atom = 0x59e09
-	Onsubmit            Atom = 0x5a708
-	Onsuspend           Atom = 0x5bb09
-	Ontimeupdate        Atom = 0xdb0c
-	Ontoggle            Atom = 0x5c408
-	Onunload            Atom = 0x5cc08
-	Onvolumechange      Atom = 0x5d40e
-	Onwaiting           Atom = 0x5e209
-	Open                Atom = 0x3cf04
-	Optgroup            Atom = 0xf608
-	Optimum             Atom = 0x5eb07
-	Option              Atom = 0x60006
-	Output              Atom = 0x49c06
-	P                   Atom = 0xc01
-	Param               Atom = 0xc05
-	Pattern             Atom = 0x5107
-	Ping                Atom = 0x7704
-	Placeholder         Atom = 0xc30b
-	Plaintext           Atom = 0xfd09
-	Poster              Atom = 0x15706
-	Pre                 Atom = 0x25e03
-	Preload             Atom = 0x25e07
-	Progress            Atom = 0x52c08
-	Prompt              Atom = 0x5fa06
-	Public              Atom = 0x41e06
-	Q                   Atom = 0x13101
-	Radiogroup          Atom = 0x30a
-	Readonly            Atom = 0x2fb08
-	Rel                 Atom = 0x25f03
-	Required            Atom = 0x1d008
-	Reversed            Atom = 0x5a08
-	Rows                Atom = 0x9204
-	Rowspan             Atom = 0x9207
-	Rp                  Atom = 0x1c602
-	Rt                  Atom = 0x13f02
-	Ruby                Atom = 0xaf04
-	S                   Atom = 0x2c01
-	Samp                Atom = 0x4e04
-	Sandbox             Atom = 0xbb07
-	Scope               Atom = 0x2bd05
-	Scoped              Atom = 0x2bd06
-	Script              Atom = 0x3d406
-	Seamless            Atom = 0x31c08
-	Section             Atom = 0x4e207
-	Select              Atom = 0x57a06
-	Selected            Atom = 0x57a08
-	Shape               Atom = 0x4f905
-	Size                Atom = 0x55504
-	Sizes               Atom = 0x55505
-	Small               Atom = 0x18f05
-	Sortable            Atom = 0x58d08
-	Sorted              Atom = 0x19906
-	Source              Atom = 0x1aa06
-	Spacer              Atom = 0x2db06
-	Span                Atom = 0x9504
-	Spellcheck          Atom = 0x3230a
-	Src                 Atom = 0x3c303
-	Srcdoc              Atom = 0x3c306
-	Srclang             Atom = 0x41107
-	Start               Atom = 0x38605
-	Step                Atom = 0x5f704
-	Strike              Atom = 0x53306
-	Strong              Atom = 0x55906
-	Style               Atom = 0x61105
-	Sub                 Atom = 0x5a903
-	Summary             Atom = 0x61607
-	Sup                 Atom = 0x61d03
-	Svg                 Atom = 0x62003
-	System              Atom = 0x62306
-	Tabindex            Atom = 0x46308
-	Table               Atom = 0x42d05
-	Target              Atom = 0x24b06
-	Tbody               Atom = 0x2e05
-	Td                  Atom = 0x4702
-	Template            Atom = 0x62608
-	Textarea            Atom = 0x2f608
-	Tfoot               Atom = 0x8c05
-	Th                  Atom = 0x22e02
-	Thead               Atom = 0x2d405
-	Time                Atom = 0xdd04
-	Title               Atom = 0xa105
-	Tr                  Atom = 0x10502
-	Track               Atom = 0x10505
-	Translate           Atom = 0x14009
-	Tt                  Atom = 0x5302
-	Type                Atom = 0x21404
-	Typemustmatch       Atom = 0x2140d
-	U                   Atom = 0xb01
-	Ul                  Atom = 0x8a02
-	Usemap              Atom = 0x51106
-	Value               Atom = 0x4005
-	Var                 Atom = 0x11503
-	Video               Atom = 0x28105
-	Wbr                 Atom = 0x12103
-	Width               Atom = 0x50705
-	Wrap                Atom = 0x58704
-	Xmp                 Atom = 0xc103
-)
-
-const hash0 = 0xc17da63e
-
-const maxAtomLen = 19
-
-var table = [1 << 9]Atom{
-	0x1:   0x48a0b, // onmousemove
-	0x2:   0x5e209, // onwaiting
-	0x3:   0x1fa13, // onautocompleteerror
-	0x4:   0x5fa06, // prompt
-	0x7:   0x5eb07, // optimum
-	0x8:   0x1604,  // mark
-	0xa:   0x5ad07, // itemref
-	0xb:   0x4fe0a, // onpageshow
-	0xc:   0x57a06, // select
-	0xd:   0x17b09, // draggable
-	0xe:   0x3e03,  // nav
-	0xf:   0x17507, // command
-	0x11:  0xb01,   // u
-	0x14:  0x2d507, // headers
-	0x15:  0x44a08, // datalist
-	0x17:  0x4e04,  // samp
-	0x1a:  0x3fb09, // onkeydown
-	0x1b:  0x55f08, // onscroll
-	0x1c:  0x15003, // col
-	0x20:  0x3c908, // itemprop
-	0x21:  0x2780a, // http-equiv
-	0x22:  0x61d03, // sup
-	0x24:  0x1d008, // required
-	0x2b:  0x25e07, // preload
-	0x2c:  0x6040d, // onbeforeprint
-	0x2d:  0x3600b, // ondragenter
-	0x2e:  0x50902, // dt
-	0x2f:  0x5a708, // onsubmit
-	0x30:  0x27002, // hr
-	0x31:  0x32f0d, // oncontextmenu
-	0x33:  0x29c05, // image
-	0x34:  0x50d07, // onpause
-	0x35:  0x25906, // hgroup
-	0x36:  0x7704,  // ping
-	0x37:  0x57808, // onselect
-	0x3a:  0x11303, // div
-	0x3b:  0x1fa0e, // onautocomplete
-	0x40:  0x2eb02, // mi
-	0x41:  0x31c08, // seamless
-	0x42:  0x2807,  // charset
-	0x43:  0x8502,  // id
-	0x44:  0x5200a, // onpopstate
-	0x45:  0x3ef03, // del
-	0x46:  0x2cb07, // marquee
-	0x47:  0x3309,  // accesskey
-	0x49:  0x8d06,  // footer
-	0x4a:  0x44e04, // list
-	0x4b:  0x2b005, // ismap
-	0x51:  0x33804, // menu
-	0x52:  0x2f04,  // body
-	0x55:  0x9a08,  // frameset
-	0x56:  0x54a07, // onreset
-	0x57:  0x12705, // blink
-	0x58:  0xa105,  // title
-	0x59:  0x38807, // article
-	0x5b:  0x22e02, // th
-	0x5d:  0x13101, // q
-	0x5e:  0x3cf04, // open
-	0x5f:  0x2fa04, // area
-	0x61:  0x44206, // onload
-	0x62:  0xda04,  // font
-	0x63:  0xd604,  // base
-	0x64:  0x16207, // colspan
-	0x65:  0x53707, // keytype
-	0x66:  0x11e02, // dl
-	0x68:  0x1b008, // fieldset
-	0x6a:  0x2eb03, // min
-	0x6b:  0x11503, // var
-	0x6f:  0x2d506, // header
-	0x70:  0x13f02, // rt
-	0x71:  0x15008, // colgroup
-	0x72:  0x23502, // mn
-	0x74:  0x13a07, // onabort
-	0x75:  0x3906,  // keygen
-	0x76:  0x4c209, // onoffline
-	0x77:  0x21f09, // challenge
-	0x78:  0x2b203, // map
-	0x7a:  0x2e902, // h4
-	0x7b:  0x3b607, // onerror
-	0x7c:  0x2e109, // maxlength
-	0x7d:  0x2f505, // mtext
-	0x7e:  0xbb07,  // sandbox
-	0x7f:  0x58b06, // onsort
-	0x80:  0x100a,  // malignmark
-	0x81:  0x45d04, // meta
-	0x82:  0x7b05,  // async
-	0x83:  0x2a702, // h3
-	0x84:  0x26702, // dd
-	0x85:  0x27004, // href
-	0x86:  0x6e0a,  // mediagroup
-	0x87:  0x19406, // coords
-	0x88:  0x41107, // srclang
-	0x89:  0x34d0a, // ondblclick
-	0x8a:  0x4005,  // value
-	0x8c:  0xe908,  // oncancel
-	0x8e:  0x3230a, // spellcheck
-	0x8f:  0x9a05,  // frame
-	0x91:  0x12403, // big
-	0x94:  0x1f606, // action
-	0x95:  0x6903,  // dir
-	0x97:  0x2fb08, // readonly
-	0x99:  0x42d05, // table
-	0x9a:  0x61607, // summary
-	0x9b:  0x12103, // wbr
-	0x9c:  0x30a,   // radiogroup
-	0x9d:  0x6c04,  // name
-	0x9f:  0x62306, // system
-	0xa1:  0x15d05, // color
-	0xa2:  0x7f06,  // canvas
-	0xa3:  0x25504, // html
-	0xa5:  0x56f09, // onseeking
-	0xac:  0x4f905, // shape
-	0xad:  0x25f03, // rel
-	0xae:  0x28510, // oncanplaythrough
-	0xaf:  0x3760a, // ondragover
-	0xb0:  0x62608, // template
-	0xb1:  0x1d80d, // foreignObject
-	0xb3:  0x9204,  // rows
-	0xb6:  0x44e07, // listing
-	0xb7:  0x49c06, // output
-	0xb9:  0x3310b, // contextmenu
-	0xbb:  0x11f03, // low
-	0xbc:  0x1c602, // rp
-	0xbd:  0x5bb09, // onsuspend
-	0xbe:  0x13606, // button
-	0xbf:  0x4db04, // desc
-	0xc1:  0x4e207, // section
-	0xc2:  0x52a0a, // onprogress
-	0xc3:  0x59e09, // onstorage
-	0xc4:  0x2d204, // math
-	0xc5:  0x4503,  // alt
-	0xc7:  0x8a02,  // ul
-	0xc8:  0x5107,  // pattern
-	0xc9:  0x4b60c, // onmousewheel
-	0xca:  0x35709, // ondragend
-	0xcb:  0xaf04,  // ruby
-	0xcc:  0xc01,   // p
-	0xcd:  0x31707, // onclose
-	0xce:  0x24205, // meter
-	0xcf:  0x11807, // bgsound
-	0xd2:  0x25106, // height
-	0xd4:  0x101,   // b
-	0xd5:  0x2c308, // itemtype
-	0xd8:  0x1bb07, // caption
-	0xd9:  0x10c08, // disabled
-	0xdb:  0x33808, // menuitem
-	0xdc:  0x62003, // svg
-	0xdd:  0x18f05, // small
-	0xde:  0x44a04, // data
-	0xe0:  0x4cb08, // ononline
-	0xe1:  0x2a206, // mglyph
-	0xe3:  0x6505,  // embed
-	0xe4:  0x10502, // tr
-	0xe5:  0x46b0b, // onloadstart
-	0xe7:  0x3c306, // srcdoc
-	0xeb:  0x5c408, // ontoggle
-	0xed:  0xe703,  // bdo
-	0xee:  0x4702,  // td
-	0xef:  0x8305,  // aside
-	0xf0:  0x29402, // h2
-	0xf1:  0x52c08, // progress
-	0xf2:  0x12c0a, // blockquote
-	0xf4:  0xf005,  // label
-	0xf5:  0x601,   // i
-	0xf7:  0x9207,  // rowspan
-	0xfb:  0x51709, // onplaying
-	0xfd:  0x2a103, // img
-	0xfe:  0xf608,  // optgroup
-	0xff:  0x42307, // content
-	0x101: 0x53e0c, // onratechange
-	0x103: 0x3da0c, // onhashchange
-	0x104: 0x4807,  // details
-	0x106: 0x40008, // download
-	0x109: 0x14009, // translate
-	0x10b: 0x4230f, // contenteditable
-	0x10d: 0x36b0b, // ondragleave
-	0x10e: 0x2106,  // accept
-	0x10f: 0x57a08, // selected
-	0x112: 0x1f20a, // formaction
-	0x113: 0x5b506, // center
-	0x115: 0x45510, // onloadedmetadata
-	0x116: 0x12804, // link
-	0x117: 0xdd04,  // time
-	0x118: 0x19f0b, // crossorigin
-	0x119: 0x3bd07, // onfocus
-	0x11a: 0x58704, // wrap
-	0x11b: 0x42204, // icon
-	0x11d: 0x28105, // video
-	0x11e: 0x4de05, // class
-	0x121: 0x5d40e, // onvolumechange
-	0x122: 0xaa06,  // onblur
-	0x123: 0x2b909, // itemscope
-	0x124: 0x61105, // style
-	0x127: 0x41e06, // public
-	0x129: 0x2320e, // formnovalidate
-	0x12a: 0x58206, // onshow
-	0x12c: 0x51706, // onplay
-	0x12d: 0x3c804, // cite
-	0x12e: 0x2bc02, // ms
-	0x12f: 0xdb0c,  // ontimeupdate
-	0x130: 0x10904, // kind
-	0x131: 0x2470a, // formtarget
-	0x135: 0x3af07, // onended
-	0x136: 0x26506, // hidden
-	0x137: 0x2c01,  // s
-	0x139: 0x2280a, // formmethod
-	0x13a: 0x3e805, // input
-	0x13c: 0x50b02, // h6
-	0x13d: 0xc902,  // ol
-	0x13e: 0x3420b, // oncuechange
-	0x13f: 0x1e50d, // foreignobject
-	0x143: 0x4e70e, // onbeforeunload
-	0x144: 0x2bd05, // scope
-	0x145: 0x39609, // onemptied
-	0x146: 0x14b05, // defer
-	0x147: 0xc103,  // xmp
-	0x148: 0x39f10, // ondurationchange
-	0x149: 0x1903,  // kbd
-	0x14c: 0x47609, // onmessage
-	0x14d: 0x60006, // option
-	0x14e: 0x2eb09, // minlength
-	0x14f: 0x32807, // checked
-	0x150: 0xce08,  // autoplay
-	0x152: 0x202,   // br
-	0x153: 0x2360a, // novalidate
-	0x156: 0x6307,  // noembed
-	0x159: 0x31007, // onclick
-	0x15a: 0x47f0b, // onmousedown
-	0x15b: 0x3a708, // onchange
-	0x15e: 0x3f209, // oninvalid
-	0x15f: 0x2bd06, // scoped
-	0x160: 0x18808, // controls
-	0x161: 0x30b05, // muted
-	0x162: 0x58d08, // sortable
-	0x163: 0x51106, // usemap
-	0x164: 0x1b80a, // figcaption
-	0x165: 0x35706, // ondrag
-	0x166: 0x26b04, // high
-	0x168: 0x3c303, // src
-	0x169: 0x15706, // poster
-	0x16b: 0x1670e, // annotation-xml
-	0x16c: 0x5f704, // step
-	0x16d: 0x4,     // abbr
-	0x16e: 0x1b06,  // dialog
-	0x170: 0x1202,  // li
-	0x172: 0x3ed02, // mo
-	0x175: 0x1d803, // for
-	0x176: 0x1a803, // ins
-	0x178: 0x55504, // size
-	0x179: 0x43210, // onlanguagechange
-	0x17a: 0x8607,  // default
-	0x17b: 0x1a03,  // bdi
-	0x17c: 0x4d30a, // onpagehide
-	0x17d: 0x6907,  // dirname
-	0x17e: 0x21404, // type
-	0x17f: 0x1f204, // form
-	0x181: 0x28509, // oncanplay
-	0x182: 0x6103,  // dfn
-	0x183: 0x46308, // tabindex
-	0x186: 0x6502,  // em
-	0x187: 0x27404, // lang
-	0x189: 0x39108, // dropzone
-	0x18a: 0x4080a, // onkeypress
-	0x18b: 0x23c08, // datetime
-	0x18c: 0x16204, // cols
-	0x18d: 0x1,     // a
-	0x18e: 0x4420c, // onloadeddata
-	0x190: 0xa605,  // audio
-	0x192: 0x2e05,  // tbody
-	0x193: 0x22c06, // method
-	0x195: 0xf404,  // loop
-	0x196: 0x29606, // iframe
-	0x198: 0x2d504, // head
-	0x19e: 0x5f108, // manifest
-	0x19f: 0xb309,  // autofocus
-	0x1a0: 0x14904, // code
-	0x1a1: 0x55906, // strong
-	0x1a2: 0x30308, // multiple
-	0x1a3: 0xc05,   // param
-	0x1a6: 0x21107, // enctype
-	0x1a7: 0x5b304, // face
-	0x1a8: 0xfd09,  // plaintext
-	0x1a9: 0x26e02, // h1
-	0x1aa: 0x59509, // onstalled
-	0x1ad: 0x3d406, // script
-	0x1ae: 0x2db06, // spacer
-	0x1af: 0x55108, // onresize
-	0x1b0: 0x4a20b, // onmouseover
-	0x1b1: 0x5cc08, // onunload
-	0x1b2: 0x56708, // onseeked
-	0x1b4: 0x2140d, // typemustmatch
-	0x1b5: 0x1cc06, // figure
-	0x1b6: 0x4950a, // onmouseout
-	0x1b7: 0x25e03, // pre
-	0x1b8: 0x50705, // width
-	0x1b9: 0x19906, // sorted
-	0x1bb: 0x5704,  // nobr
-	0x1be: 0x5302,  // tt
-	0x1bf: 0x1105,  // align
-	0x1c0: 0x3e607, // oninput
-	0x1c3: 0x41807, // onkeyup
-	0x1c6: 0x1c00c, // onafterprint
-	0x1c7: 0x210e,  // accept-charset
-	0x1c8: 0x33c06, // itemid
-	0x1c9: 0x3e809, // inputmode
-	0x1cb: 0x53306, // strike
-	0x1cc: 0x5a903, // sub
-	0x1cd: 0x10505, // track
-	0x1ce: 0x38605, // start
-	0x1d0: 0xd608,  // basefont
-	0x1d6: 0x1aa06, // source
-	0x1d7: 0x18206, // legend
-	0x1d8: 0x2d405, // thead
-	0x1da: 0x8c05,  // tfoot
-	0x1dd: 0x1ec06, // object
-	0x1de: 0x6e05,  // media
-	0x1df: 0x1670a, // annotation
-	0x1e0: 0x20d0b, // formenctype
-	0x1e2: 0x3d208, // noscript
-	0x1e4: 0x55505, // sizes
-	0x1e5: 0x1fc0c, // autocomplete
-	0x1e6: 0x9504,  // span
-	0x1e7: 0x9808,  // noframes
-	0x1e8: 0x24b06, // target
-	0x1e9: 0x38f06, // ondrop
-	0x1ea: 0x2b306, // applet
-	0x1ec: 0x5a08,  // reversed
-	0x1f0: 0x2a907, // isindex
-	0x1f3: 0x27008, // hreflang
-	0x1f5: 0x2f302, // h5
-	0x1f6: 0x4f307, // address
-	0x1fa: 0x2e103, // max
-	0x1fb: 0xc30b,  // placeholder
-	0x1fc: 0x2f608, // textarea
-	0x1fe: 0x4ad09, // onmouseup
-	0x1ff: 0x3800b, // ondragstart
-}
-
-const atomText = "abbradiogrouparamalignmarkbdialogaccept-charsetbodyaccesskey" +
-	"genavaluealtdetailsampatternobreversedfnoembedirnamediagroup" +
-	"ingasyncanvasidefaultfooterowspanoframesetitleaudionblurubya" +
-	"utofocusandboxmplaceholderautoplaybasefontimeupdatebdoncance" +
-	"labelooptgrouplaintextrackindisabledivarbgsoundlowbrbigblink" +
-	"blockquotebuttonabortranslatecodefercolgroupostercolorcolspa" +
-	"nnotation-xmlcommandraggablegendcontrolsmallcoordsortedcross" +
-	"originsourcefieldsetfigcaptionafterprintfigurequiredforeignO" +
-	"bjectforeignobjectformactionautocompleteerrorformenctypemust" +
-	"matchallengeformmethodformnovalidatetimeterformtargetheightm" +
-	"lhgroupreloadhiddenhigh1hreflanghttp-equivideoncanplaythroug" +
-	"h2iframeimageimglyph3isindexismappletitemscopeditemtypemarqu" +
-	"eematheaderspacermaxlength4minlength5mtextareadonlymultiplem" +
-	"utedonclickoncloseamlesspellcheckedoncontextmenuitemidoncuec" +
-	"hangeondblclickondragendondragenterondragleaveondragoverondr" +
-	"agstarticleondropzonemptiedondurationchangeonendedonerroronf" +
-	"ocusrcdocitempropenoscriptonhashchangeoninputmodeloninvalido" +
-	"nkeydownloadonkeypressrclangonkeyupublicontenteditableonlang" +
-	"uagechangeonloadeddatalistingonloadedmetadatabindexonloadsta" +
-	"rtonmessageonmousedownonmousemoveonmouseoutputonmouseoveronm" +
-	"ouseuponmousewheelonofflineononlineonpagehidesclassectionbef" +
-	"oreunloaddresshapeonpageshowidth6onpausemaponplayingonpopsta" +
-	"teonprogresstrikeytypeonratechangeonresetonresizestrongonscr" +
-	"ollonseekedonseekingonselectedonshowraponsortableonstalledon" +
-	"storageonsubmitemrefacenteronsuspendontoggleonunloadonvolume" +
-	"changeonwaitingoptimumanifestepromptoptionbeforeprintstylesu" +
-	"mmarysupsvgsystemplate"
diff --git a/vendor/golang.org/x/net/html/charset/charset.go b/vendor/golang.org/x/net/html/charset/charset.go
deleted file mode 100644
index 13bed1599f..0000000000
--- a/vendor/golang.org/x/net/html/charset/charset.go
+++ /dev/null
@@ -1,257 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package charset provides common text encodings for HTML documents.
-//
-// The mapping from encoding labels to encodings is defined at
-// https://encoding.spec.whatwg.org/.
-package charset // import "golang.org/x/net/html/charset"
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"mime"
-	"strings"
-	"unicode/utf8"
-
-	"golang.org/x/net/html"
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/charmap"
-	"golang.org/x/text/encoding/htmlindex"
-	"golang.org/x/text/transform"
-)
-
-// Lookup returns the encoding with the specified label, and its canonical
-// name. It returns nil and the empty string if label is not one of the
-// standard encodings for HTML. Matching is case-insensitive and ignores
-// leading and trailing whitespace. Encoders will use HTML escape sequences for
-// runes that are not supported by the character set.
-func Lookup(label string) (e encoding.Encoding, name string) {
-	e, err := htmlindex.Get(label)
-	if err != nil {
-		return nil, ""
-	}
-	name, _ = htmlindex.Name(e)
-	return &htmlEncoding{e}, name
-}
-
-type htmlEncoding struct{ encoding.Encoding }
-
-func (h *htmlEncoding) NewEncoder() *encoding.Encoder {
-	// HTML requires a non-terminating legacy encoder. We use HTML escapes to
-	// substitute unsupported code points.
-	return encoding.HTMLEscapeUnsupported(h.Encoding.NewEncoder())
-}
-
-// DetermineEncoding determines the encoding of an HTML document by examining
-// up to the first 1024 bytes of content and the declared Content-Type.
-//
-// See http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#determining-the-character-encoding
-func DetermineEncoding(content []byte, contentType string) (e encoding.Encoding, name string, certain bool) {
-	if len(content) > 1024 {
-		content = content[:1024]
-	}
-
-	for _, b := range boms {
-		if bytes.HasPrefix(content, b.bom) {
-			e, name = Lookup(b.enc)
-			return e, name, true
-		}
-	}
-
-	if _, params, err := mime.ParseMediaType(contentType); err == nil {
-		if cs, ok := params["charset"]; ok {
-			if e, name = Lookup(cs); e != nil {
-				return e, name, true
-			}
-		}
-	}
-
-	if len(content) > 0 {
-		e, name = prescan(content)
-		if e != nil {
-			return e, name, false
-		}
-	}
-
-	// Try to detect UTF-8.
-	// First eliminate any partial rune at the end.
-	for i := len(content) - 1; i >= 0 && i > len(content)-4; i-- {
-		b := content[i]
-		if b < 0x80 {
-			break
-		}
-		if utf8.RuneStart(b) {
-			content = content[:i]
-			break
-		}
-	}
-	hasHighBit := false
-	for _, c := range content {
-		if c >= 0x80 {
-			hasHighBit = true
-			break
-		}
-	}
-	if hasHighBit && utf8.Valid(content) {
-		return encoding.Nop, "utf-8", false
-	}
-
-	// TODO: change default depending on user's locale?
-	return charmap.Windows1252, "windows-1252", false
-}
-
-// NewReader returns an io.Reader that converts the content of r to UTF-8.
-// It calls DetermineEncoding to find out what r's encoding is.
-func NewReader(r io.Reader, contentType string) (io.Reader, error) {
-	preview := make([]byte, 1024)
-	n, err := io.ReadFull(r, preview)
-	switch {
-	case err == io.ErrUnexpectedEOF:
-		preview = preview[:n]
-		r = bytes.NewReader(preview)
-	case err != nil:
-		return nil, err
-	default:
-		r = io.MultiReader(bytes.NewReader(preview), r)
-	}
-
-	if e, _, _ := DetermineEncoding(preview, contentType); e != encoding.Nop {
-		r = transform.NewReader(r, e.NewDecoder())
-	}
-	return r, nil
-}
-
-// NewReaderLabel returns a reader that converts from the specified charset to
-// UTF-8. It uses Lookup to find the encoding that corresponds to label, and
-// returns an error if Lookup returns nil. It is suitable for use as
-// encoding/xml.Decoder's CharsetReader function.
-func NewReaderLabel(label string, input io.Reader) (io.Reader, error) {
-	e, _ := Lookup(label)
-	if e == nil {
-		return nil, fmt.Errorf("unsupported charset: %q", label)
-	}
-	return transform.NewReader(input, e.NewDecoder()), nil
-}
-
-func prescan(content []byte) (e encoding.Encoding, name string) {
-	z := html.NewTokenizer(bytes.NewReader(content))
-	for {
-		switch z.Next() {
-		case html.ErrorToken:
-			return nil, ""
-
-		case html.StartTagToken, html.SelfClosingTagToken:
-			tagName, hasAttr := z.TagName()
-			if !bytes.Equal(tagName, []byte("meta")) {
-				continue
-			}
-			attrList := make(map[string]bool)
-			gotPragma := false
-
-			const (
-				dontKnow = iota
-				doNeedPragma
-				doNotNeedPragma
-			)
-			needPragma := dontKnow
-
-			name = ""
-			e = nil
-			for hasAttr {
-				var key, val []byte
-				key, val, hasAttr = z.TagAttr()
-				ks := string(key)
-				if attrList[ks] {
-					continue
-				}
-				attrList[ks] = true
-				for i, c := range val {
-					if 'A' <= c && c <= 'Z' {
-						val[i] = c + 0x20
-					}
-				}
-
-				switch ks {
-				case "http-equiv":
-					if bytes.Equal(val, []byte("content-type")) {
-						gotPragma = true
-					}
-
-				case "content":
-					if e == nil {
-						name = fromMetaElement(string(val))
-						if name != "" {
-							e, name = Lookup(name)
-							if e != nil {
-								needPragma = doNeedPragma
-							}
-						}
-					}
-
-				case "charset":
-					e, name = Lookup(string(val))
-					needPragma = doNotNeedPragma
-				}
-			}
-
-			if needPragma == dontKnow || needPragma == doNeedPragma && !gotPragma {
-				continue
-			}
-
-			if strings.HasPrefix(name, "utf-16") {
-				name = "utf-8"
-				e = encoding.Nop
-			}
-
-			if e != nil {
-				return e, name
-			}
-		}
-	}
-}
-
-func fromMetaElement(s string) string {
-	for s != "" {
-		csLoc := strings.Index(s, "charset")
-		if csLoc == -1 {
-			return ""
-		}
-		s = s[csLoc+len("charset"):]
-		s = strings.TrimLeft(s, " \t\n\f\r")
-		if !strings.HasPrefix(s, "=") {
-			continue
-		}
-		s = s[1:]
-		s = strings.TrimLeft(s, " \t\n\f\r")
-		if s == "" {
-			return ""
-		}
-		if q := s[0]; q == '"' || q == '\'' {
-			s = s[1:]
-			closeQuote := strings.IndexRune(s, rune(q))
-			if closeQuote == -1 {
-				return ""
-			}
-			return s[:closeQuote]
-		}
-
-		end := strings.IndexAny(s, "; \t\n\f\r")
-		if end == -1 {
-			end = len(s)
-		}
-		return s[:end]
-	}
-	return ""
-}
-
-var boms = []struct {
-	bom []byte
-	enc string
-}{
-	{[]byte{0xfe, 0xff}, "utf-16be"},
-	{[]byte{0xff, 0xfe}, "utf-16le"},
-	{[]byte{0xef, 0xbb, 0xbf}, "utf-8"},
-}
diff --git a/vendor/golang.org/x/net/html/const.go b/vendor/golang.org/x/net/html/const.go
deleted file mode 100644
index 52f651ff6d..0000000000
--- a/vendor/golang.org/x/net/html/const.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-// Section 12.2.3.2 of the HTML5 specification says "The following elements
-// have varying levels of special parsing rules".
-// https://html.spec.whatwg.org/multipage/syntax.html#the-stack-of-open-elements
-var isSpecialElementMap = map[string]bool{
-	"address":    true,
-	"applet":     true,
-	"area":       true,
-	"article":    true,
-	"aside":      true,
-	"base":       true,
-	"basefont":   true,
-	"bgsound":    true,
-	"blockquote": true,
-	"body":       true,
-	"br":         true,
-	"button":     true,
-	"caption":    true,
-	"center":     true,
-	"col":        true,
-	"colgroup":   true,
-	"dd":         true,
-	"details":    true,
-	"dir":        true,
-	"div":        true,
-	"dl":         true,
-	"dt":         true,
-	"embed":      true,
-	"fieldset":   true,
-	"figcaption": true,
-	"figure":     true,
-	"footer":     true,
-	"form":       true,
-	"frame":      true,
-	"frameset":   true,
-	"h1":         true,
-	"h2":         true,
-	"h3":         true,
-	"h4":         true,
-	"h5":         true,
-	"h6":         true,
-	"head":       true,
-	"header":     true,
-	"hgroup":     true,
-	"hr":         true,
-	"html":       true,
-	"iframe":     true,
-	"img":        true,
-	"input":      true,
-	"isindex":    true,
-	"li":         true,
-	"link":       true,
-	"listing":    true,
-	"marquee":    true,
-	"menu":       true,
-	"meta":       true,
-	"nav":        true,
-	"noembed":    true,
-	"noframes":   true,
-	"noscript":   true,
-	"object":     true,
-	"ol":         true,
-	"p":          true,
-	"param":      true,
-	"plaintext":  true,
-	"pre":        true,
-	"script":     true,
-	"section":    true,
-	"select":     true,
-	"source":     true,
-	"style":      true,
-	"summary":    true,
-	"table":      true,
-	"tbody":      true,
-	"td":         true,
-	"template":   true,
-	"textarea":   true,
-	"tfoot":      true,
-	"th":         true,
-	"thead":      true,
-	"title":      true,
-	"tr":         true,
-	"track":      true,
-	"ul":         true,
-	"wbr":        true,
-	"xmp":        true,
-}
-
-func isSpecialElement(element *Node) bool {
-	switch element.Namespace {
-	case "", "html":
-		return isSpecialElementMap[element.Data]
-	case "svg":
-		return element.Data == "foreignObject"
-	}
-	return false
-}
diff --git a/vendor/golang.org/x/net/html/doc.go b/vendor/golang.org/x/net/html/doc.go
deleted file mode 100644
index 94f496874a..0000000000
--- a/vendor/golang.org/x/net/html/doc.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package html implements an HTML5-compliant tokenizer and parser.
-
-Tokenization is done by creating a Tokenizer for an io.Reader r. It is the
-caller's responsibility to ensure that r provides UTF-8 encoded HTML.
-
-	z := html.NewTokenizer(r)
-
-Given a Tokenizer z, the HTML is tokenized by repeatedly calling z.Next(),
-which parses the next token and returns its type, or an error:
-
-	for {
-		tt := z.Next()
-		if tt == html.ErrorToken {
-			// ...
-			return ...
-		}
-		// Process the current token.
-	}
-
-There are two APIs for retrieving the current token. The high-level API is to
-call Token; the low-level API is to call Text or TagName / TagAttr. Both APIs
-allow optionally calling Raw after Next but before Token, Text, TagName, or
-TagAttr. In EBNF notation, the valid call sequence per token is:
-
-	Next {Raw} [ Token | Text | TagName {TagAttr} ]
-
-Token returns an independent data structure that completely describes a token.
-Entities (such as "&lt;") are unescaped, tag names and attribute keys are
-lower-cased, and attributes are collected into a []Attribute. For example:
-
-	for {
-		if z.Next() == html.ErrorToken {
-			// Returning io.EOF indicates success.
-			return z.Err()
-		}
-		emitToken(z.Token())
-	}
-
-The low-level API performs fewer allocations and copies, but the contents of
-the []byte values returned by Text, TagName and TagAttr may change on the next
-call to Next. For example, to extract an HTML page's anchor text:
-
-	depth := 0
-	for {
-		tt := z.Next()
-		switch tt {
-		case ErrorToken:
-			return z.Err()
-		case TextToken:
-			if depth > 0 {
-				// emitBytes should copy the []byte it receives,
-				// if it doesn't process it immediately.
-				emitBytes(z.Text())
-			}
-		case StartTagToken, EndTagToken:
-			tn, _ := z.TagName()
-			if len(tn) == 1 && tn[0] == 'a' {
-				if tt == StartTagToken {
-					depth++
-				} else {
-					depth--
-				}
-			}
-		}
-	}
-
-Parsing is done by calling Parse with an io.Reader, which returns the root of
-the parse tree (the document element) as a *Node. It is the caller's
-responsibility to ensure that the Reader provides UTF-8 encoded HTML. For
-example, to process each anchor node in depth-first order:
-
-	doc, err := html.Parse(r)
-	if err != nil {
-		// ...
-	}
-	var f func(*html.Node)
-	f = func(n *html.Node) {
-		if n.Type == html.ElementNode && n.Data == "a" {
-			// Do something with n...
-		}
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			f(c)
-		}
-	}
-	f(doc)
-
-The relevant specifications include:
-https://html.spec.whatwg.org/multipage/syntax.html and
-https://html.spec.whatwg.org/multipage/syntax.html#tokenization
-*/
-package html // import "golang.org/x/net/html"
-
-// The tokenization algorithm implemented by this package is not a line-by-line
-// transliteration of the relatively verbose state-machine in the WHATWG
-// specification. A more direct approach is used instead, where the program
-// counter implies the state, such as whether it is tokenizing a tag or a text
-// node. Specification compliance is verified by checking expected and actual
-// outputs over a test suite rather than aiming for algorithmic fidelity.
-
-// TODO(nigeltao): Does a DOM API belong in this package or a separate one?
-// TODO(nigeltao): How does parsing interact with a JavaScript engine?
diff --git a/vendor/golang.org/x/net/html/doctype.go b/vendor/golang.org/x/net/html/doctype.go
deleted file mode 100644
index c484e5a94f..0000000000
--- a/vendor/golang.org/x/net/html/doctype.go
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"strings"
-)
-
-// parseDoctype parses the data from a DoctypeToken into a name,
-// public identifier, and system identifier. It returns a Node whose Type
-// is DoctypeNode, whose Data is the name, and which has attributes
-// named "system" and "public" for the two identifiers if they were present.
-// quirks is whether the document should be parsed in "quirks mode".
-func parseDoctype(s string) (n *Node, quirks bool) {
-	n = &Node{Type: DoctypeNode}
-
-	// Find the name.
-	space := strings.IndexAny(s, whitespace)
-	if space == -1 {
-		space = len(s)
-	}
-	n.Data = s[:space]
-	// The comparison to "html" is case-sensitive.
-	if n.Data != "html" {
-		quirks = true
-	}
-	n.Data = strings.ToLower(n.Data)
-	s = strings.TrimLeft(s[space:], whitespace)
-
-	if len(s) < 6 {
-		// It can't start with "PUBLIC" or "SYSTEM".
-		// Ignore the rest of the string.
-		return n, quirks || s != ""
-	}
-
-	key := strings.ToLower(s[:6])
-	s = s[6:]
-	for key == "public" || key == "system" {
-		s = strings.TrimLeft(s, whitespace)
-		if s == "" {
-			break
-		}
-		quote := s[0]
-		if quote != '"' && quote != '\'' {
-			break
-		}
-		s = s[1:]
-		q := strings.IndexRune(s, rune(quote))
-		var id string
-		if q == -1 {
-			id = s
-			s = ""
-		} else {
-			id = s[:q]
-			s = s[q+1:]
-		}
-		n.Attr = append(n.Attr, Attribute{Key: key, Val: id})
-		if key == "public" {
-			key = "system"
-		} else {
-			key = ""
-		}
-	}
-
-	if key != "" || s != "" {
-		quirks = true
-	} else if len(n.Attr) > 0 {
-		if n.Attr[0].Key == "public" {
-			public := strings.ToLower(n.Attr[0].Val)
-			switch public {
-			case "-//w3o//dtd w3 html strict 3.0//en//", "-/w3d/dtd html 4.0 transitional/en", "html":
-				quirks = true
-			default:
-				for _, q := range quirkyIDs {
-					if strings.HasPrefix(public, q) {
-						quirks = true
-						break
-					}
-				}
-			}
-			// The following two public IDs only cause quirks mode if there is no system ID.
-			if len(n.Attr) == 1 && (strings.HasPrefix(public, "-//w3c//dtd html 4.01 frameset//") ||
-				strings.HasPrefix(public, "-//w3c//dtd html 4.01 transitional//")) {
-				quirks = true
-			}
-		}
-		if lastAttr := n.Attr[len(n.Attr)-1]; lastAttr.Key == "system" &&
-			strings.ToLower(lastAttr.Val) == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd" {
-			quirks = true
-		}
-	}
-
-	return n, quirks
-}
-
-// quirkyIDs is a list of public doctype identifiers that cause a document
-// to be interpreted in quirks mode. The identifiers should be in lower case.
-var quirkyIDs = []string{
-	"+//silmaril//dtd html pro v0r11 19970101//",
-	"-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
-	"-//as//dtd html 3.0 aswedit + extensions//",
-	"-//ietf//dtd html 2.0 level 1//",
-	"-//ietf//dtd html 2.0 level 2//",
-	"-//ietf//dtd html 2.0 strict level 1//",
-	"-//ietf//dtd html 2.0 strict level 2//",
-	"-//ietf//dtd html 2.0 strict//",
-	"-//ietf//dtd html 2.0//",
-	"-//ietf//dtd html 2.1e//",
-	"-//ietf//dtd html 3.0//",
-	"-//ietf//dtd html 3.2 final//",
-	"-//ietf//dtd html 3.2//",
-	"-//ietf//dtd html 3//",
-	"-//ietf//dtd html level 0//",
-	"-//ietf//dtd html level 1//",
-	"-//ietf//dtd html level 2//",
-	"-//ietf//dtd html level 3//",
-	"-//ietf//dtd html strict level 0//",
-	"-//ietf//dtd html strict level 1//",
-	"-//ietf//dtd html strict level 2//",
-	"-//ietf//dtd html strict level 3//",
-	"-//ietf//dtd html strict//",
-	"-//ietf//dtd html//",
-	"-//metrius//dtd metrius presentational//",
-	"-//microsoft//dtd internet explorer 2.0 html strict//",
-	"-//microsoft//dtd internet explorer 2.0 html//",
-	"-//microsoft//dtd internet explorer 2.0 tables//",
-	"-//microsoft//dtd internet explorer 3.0 html strict//",
-	"-//microsoft//dtd internet explorer 3.0 html//",
-	"-//microsoft//dtd internet explorer 3.0 tables//",
-	"-//netscape comm. corp.//dtd html//",
-	"-//netscape comm. corp.//dtd strict html//",
-	"-//o'reilly and associates//dtd html 2.0//",
-	"-//o'reilly and associates//dtd html extended 1.0//",
-	"-//o'reilly and associates//dtd html extended relaxed 1.0//",
-	"-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//",
-	"-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//",
-	"-//spyglass//dtd html 2.0 extended//",
-	"-//sq//dtd html 2.0 hotmetal + extensions//",
-	"-//sun microsystems corp.//dtd hotjava html//",
-	"-//sun microsystems corp.//dtd hotjava strict html//",
-	"-//w3c//dtd html 3 1995-03-24//",
-	"-//w3c//dtd html 3.2 draft//",
-	"-//w3c//dtd html 3.2 final//",
-	"-//w3c//dtd html 3.2//",
-	"-//w3c//dtd html 3.2s draft//",
-	"-//w3c//dtd html 4.0 frameset//",
-	"-//w3c//dtd html 4.0 transitional//",
-	"-//w3c//dtd html experimental 19960712//",
-	"-//w3c//dtd html experimental 970421//",
-	"-//w3c//dtd w3 html//",
-	"-//w3o//dtd w3 html 3.0//",
-	"-//webtechs//dtd mozilla html 2.0//",
-	"-//webtechs//dtd mozilla html//",
-}
diff --git a/vendor/golang.org/x/net/html/entity.go b/vendor/golang.org/x/net/html/entity.go
deleted file mode 100644
index a50c04c60e..0000000000
--- a/vendor/golang.org/x/net/html/entity.go
+++ /dev/null
@@ -1,2253 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-// All entities that do not end with ';' are 6 or fewer bytes long.
-const longestEntityWithoutSemicolon = 6
-
-// entity is a map from HTML entity names to their values. The semicolon matters:
-// https://html.spec.whatwg.org/multipage/syntax.html#named-character-references
-// lists both "amp" and "amp;" as two separate entries.
-//
-// Note that the HTML5 list is larger than the HTML4 list at
-// http://www.w3.org/TR/html4/sgml/entities.html
-var entity = map[string]rune{
-	"AElig;":                           '\U000000C6',
-	"AMP;":                             '\U00000026',
-	"Aacute;":                          '\U000000C1',
-	"Abreve;":                          '\U00000102',
-	"Acirc;":                           '\U000000C2',
-	"Acy;":                             '\U00000410',
-	"Afr;":                             '\U0001D504',
-	"Agrave;":                          '\U000000C0',
-	"Alpha;":                           '\U00000391',
-	"Amacr;":                           '\U00000100',
-	"And;":                             '\U00002A53',
-	"Aogon;":                           '\U00000104',
-	"Aopf;":                            '\U0001D538',
-	"ApplyFunction;":                   '\U00002061',
-	"Aring;":                           '\U000000C5',
-	"Ascr;":                            '\U0001D49C',
-	"Assign;":                          '\U00002254',
-	"Atilde;":                          '\U000000C3',
-	"Auml;":                            '\U000000C4',
-	"Backslash;":                       '\U00002216',
-	"Barv;":                            '\U00002AE7',
-	"Barwed;":                          '\U00002306',
-	"Bcy;":                             '\U00000411',
-	"Because;":                         '\U00002235',
-	"Bernoullis;":                      '\U0000212C',
-	"Beta;":                            '\U00000392',
-	"Bfr;":                             '\U0001D505',
-	"Bopf;":                            '\U0001D539',
-	"Breve;":                           '\U000002D8',
-	"Bscr;":                            '\U0000212C',
-	"Bumpeq;":                          '\U0000224E',
-	"CHcy;":                            '\U00000427',
-	"COPY;":                            '\U000000A9',
-	"Cacute;":                          '\U00000106',
-	"Cap;":                             '\U000022D2',
-	"CapitalDifferentialD;":            '\U00002145',
-	"Cayleys;":                         '\U0000212D',
-	"Ccaron;":                          '\U0000010C',
-	"Ccedil;":                          '\U000000C7',
-	"Ccirc;":                           '\U00000108',
-	"Cconint;":                         '\U00002230',
-	"Cdot;":                            '\U0000010A',
-	"Cedilla;":                         '\U000000B8',
-	"CenterDot;":                       '\U000000B7',
-	"Cfr;":                             '\U0000212D',
-	"Chi;":                             '\U000003A7',
-	"CircleDot;":                       '\U00002299',
-	"CircleMinus;":                     '\U00002296',
-	"CirclePlus;":                      '\U00002295',
-	"CircleTimes;":                     '\U00002297',
-	"ClockwiseContourIntegral;":        '\U00002232',
-	"CloseCurlyDoubleQuote;":           '\U0000201D',
-	"CloseCurlyQuote;":                 '\U00002019',
-	"Colon;":                           '\U00002237',
-	"Colone;":                          '\U00002A74',
-	"Congruent;":                       '\U00002261',
-	"Conint;":                          '\U0000222F',
-	"ContourIntegral;":                 '\U0000222E',
-	"Copf;":                            '\U00002102',
-	"Coproduct;":                       '\U00002210',
-	"CounterClockwiseContourIntegral;": '\U00002233',
-	"Cross;":                    '\U00002A2F',
-	"Cscr;":                     '\U0001D49E',
-	"Cup;":                      '\U000022D3',
-	"CupCap;":                   '\U0000224D',
-	"DD;":                       '\U00002145',
-	"DDotrahd;":                 '\U00002911',
-	"DJcy;":                     '\U00000402',
-	"DScy;":                     '\U00000405',
-	"DZcy;":                     '\U0000040F',
-	"Dagger;":                   '\U00002021',
-	"Darr;":                     '\U000021A1',
-	"Dashv;":                    '\U00002AE4',
-	"Dcaron;":                   '\U0000010E',
-	"Dcy;":                      '\U00000414',
-	"Del;":                      '\U00002207',
-	"Delta;":                    '\U00000394',
-	"Dfr;":                      '\U0001D507',
-	"DiacriticalAcute;":         '\U000000B4',
-	"DiacriticalDot;":           '\U000002D9',
-	"DiacriticalDoubleAcute;":   '\U000002DD',
-	"DiacriticalGrave;":         '\U00000060',
-	"DiacriticalTilde;":         '\U000002DC',
-	"Diamond;":                  '\U000022C4',
-	"DifferentialD;":            '\U00002146',
-	"Dopf;":                     '\U0001D53B',
-	"Dot;":                      '\U000000A8',
-	"DotDot;":                   '\U000020DC',
-	"DotEqual;":                 '\U00002250',
-	"DoubleContourIntegral;":    '\U0000222F',
-	"DoubleDot;":                '\U000000A8',
-	"DoubleDownArrow;":          '\U000021D3',
-	"DoubleLeftArrow;":          '\U000021D0',
-	"DoubleLeftRightArrow;":     '\U000021D4',
-	"DoubleLeftTee;":            '\U00002AE4',
-	"DoubleLongLeftArrow;":      '\U000027F8',
-	"DoubleLongLeftRightArrow;": '\U000027FA',
-	"DoubleLongRightArrow;":     '\U000027F9',
-	"DoubleRightArrow;":         '\U000021D2',
-	"DoubleRightTee;":           '\U000022A8',
-	"DoubleUpArrow;":            '\U000021D1',
-	"DoubleUpDownArrow;":        '\U000021D5',
-	"DoubleVerticalBar;":        '\U00002225',
-	"DownArrow;":                '\U00002193',
-	"DownArrowBar;":             '\U00002913',
-	"DownArrowUpArrow;":         '\U000021F5',
-	"DownBreve;":                '\U00000311',
-	"DownLeftRightVector;":      '\U00002950',
-	"DownLeftTeeVector;":        '\U0000295E',
-	"DownLeftVector;":           '\U000021BD',
-	"DownLeftVectorBar;":        '\U00002956',
-	"DownRightTeeVector;":       '\U0000295F',
-	"DownRightVector;":          '\U000021C1',
-	"DownRightVectorBar;":       '\U00002957',
-	"DownTee;":                  '\U000022A4',
-	"DownTeeArrow;":             '\U000021A7',
-	"Downarrow;":                '\U000021D3',
-	"Dscr;":                     '\U0001D49F',
-	"Dstrok;":                   '\U00000110',
-	"ENG;":                      '\U0000014A',
-	"ETH;":                      '\U000000D0',
-	"Eacute;":                   '\U000000C9',
-	"Ecaron;":                   '\U0000011A',
-	"Ecirc;":                    '\U000000CA',
-	"Ecy;":                      '\U0000042D',
-	"Edot;":                     '\U00000116',
-	"Efr;":                      '\U0001D508',
-	"Egrave;":                   '\U000000C8',
-	"Element;":                  '\U00002208',
-	"Emacr;":                    '\U00000112',
-	"EmptySmallSquare;":         '\U000025FB',
-	"EmptyVerySmallSquare;":     '\U000025AB',
-	"Eogon;":                    '\U00000118',
-	"Eopf;":                     '\U0001D53C',
-	"Epsilon;":                  '\U00000395',
-	"Equal;":                    '\U00002A75',
-	"EqualTilde;":               '\U00002242',
-	"Equilibrium;":              '\U000021CC',
-	"Escr;":                     '\U00002130',
-	"Esim;":                     '\U00002A73',
-	"Eta;":                      '\U00000397',
-	"Euml;":                     '\U000000CB',
-	"Exists;":                   '\U00002203',
-	"ExponentialE;":             '\U00002147',
-	"Fcy;":                      '\U00000424',
-	"Ffr;":                      '\U0001D509',
-	"FilledSmallSquare;":        '\U000025FC',
-	"FilledVerySmallSquare;":    '\U000025AA',
-	"Fopf;":                     '\U0001D53D',
-	"ForAll;":                   '\U00002200',
-	"Fouriertrf;":               '\U00002131',
-	"Fscr;":                     '\U00002131',
-	"GJcy;":                     '\U00000403',
-	"GT;":                       '\U0000003E',
-	"Gamma;":                    '\U00000393',
-	"Gammad;":                   '\U000003DC',
-	"Gbreve;":                   '\U0000011E',
-	"Gcedil;":                   '\U00000122',
-	"Gcirc;":                    '\U0000011C',
-	"Gcy;":                      '\U00000413',
-	"Gdot;":                     '\U00000120',
-	"Gfr;":                      '\U0001D50A',
-	"Gg;":                       '\U000022D9',
-	"Gopf;":                     '\U0001D53E',
-	"GreaterEqual;":             '\U00002265',
-	"GreaterEqualLess;":         '\U000022DB',
-	"GreaterFullEqual;":         '\U00002267',
-	"GreaterGreater;":           '\U00002AA2',
-	"GreaterLess;":              '\U00002277',
-	"GreaterSlantEqual;":        '\U00002A7E',
-	"GreaterTilde;":             '\U00002273',
-	"Gscr;":                     '\U0001D4A2',
-	"Gt;":                       '\U0000226B',
-	"HARDcy;":                   '\U0000042A',
-	"Hacek;":                    '\U000002C7',
-	"Hat;":                      '\U0000005E',
-	"Hcirc;":                    '\U00000124',
-	"Hfr;":                      '\U0000210C',
-	"HilbertSpace;":             '\U0000210B',
-	"Hopf;":                     '\U0000210D',
-	"HorizontalLine;":           '\U00002500',
-	"Hscr;":                     '\U0000210B',
-	"Hstrok;":                   '\U00000126',
-	"HumpDownHump;":             '\U0000224E',
-	"HumpEqual;":                '\U0000224F',
-	"IEcy;":                     '\U00000415',
-	"IJlig;":                    '\U00000132',
-	"IOcy;":                     '\U00000401',
-	"Iacute;":                   '\U000000CD',
-	"Icirc;":                    '\U000000CE',
-	"Icy;":                      '\U00000418',
-	"Idot;":                     '\U00000130',
-	"Ifr;":                      '\U00002111',
-	"Igrave;":                   '\U000000CC',
-	"Im;":                       '\U00002111',
-	"Imacr;":                    '\U0000012A',
-	"ImaginaryI;":               '\U00002148',
-	"Implies;":                  '\U000021D2',
-	"Int;":                      '\U0000222C',
-	"Integral;":                 '\U0000222B',
-	"Intersection;":             '\U000022C2',
-	"InvisibleComma;":           '\U00002063',
-	"InvisibleTimes;":           '\U00002062',
-	"Iogon;":                    '\U0000012E',
-	"Iopf;":                     '\U0001D540',
-	"Iota;":                     '\U00000399',
-	"Iscr;":                     '\U00002110',
-	"Itilde;":                   '\U00000128',
-	"Iukcy;":                    '\U00000406',
-	"Iuml;":                     '\U000000CF',
-	"Jcirc;":                    '\U00000134',
-	"Jcy;":                      '\U00000419',
-	"Jfr;":                      '\U0001D50D',
-	"Jopf;":                     '\U0001D541',
-	"Jscr;":                     '\U0001D4A5',
-	"Jsercy;":                   '\U00000408',
-	"Jukcy;":                    '\U00000404',
-	"KHcy;":                     '\U00000425',
-	"KJcy;":                     '\U0000040C',
-	"Kappa;":                    '\U0000039A',
-	"Kcedil;":                   '\U00000136',
-	"Kcy;":                      '\U0000041A',
-	"Kfr;":                      '\U0001D50E',
-	"Kopf;":                     '\U0001D542',
-	"Kscr;":                     '\U0001D4A6',
-	"LJcy;":                     '\U00000409',
-	"LT;":                       '\U0000003C',
-	"Lacute;":                   '\U00000139',
-	"Lambda;":                   '\U0000039B',
-	"Lang;":                     '\U000027EA',
-	"Laplacetrf;":               '\U00002112',
-	"Larr;":                     '\U0000219E',
-	"Lcaron;":                   '\U0000013D',
-	"Lcedil;":                   '\U0000013B',
-	"Lcy;":                      '\U0000041B',
-	"LeftAngleBracket;":         '\U000027E8',
-	"LeftArrow;":                '\U00002190',
-	"LeftArrowBar;":             '\U000021E4',
-	"LeftArrowRightArrow;":      '\U000021C6',
-	"LeftCeiling;":              '\U00002308',
-	"LeftDoubleBracket;":        '\U000027E6',
-	"LeftDownTeeVector;":        '\U00002961',
-	"LeftDownVector;":           '\U000021C3',
-	"LeftDownVectorBar;":        '\U00002959',
-	"LeftFloor;":                '\U0000230A',
-	"LeftRightArrow;":           '\U00002194',
-	"LeftRightVector;":          '\U0000294E',
-	"LeftTee;":                  '\U000022A3',
-	"LeftTeeArrow;":             '\U000021A4',
-	"LeftTeeVector;":            '\U0000295A',
-	"LeftTriangle;":             '\U000022B2',
-	"LeftTriangleBar;":          '\U000029CF',
-	"LeftTriangleEqual;":        '\U000022B4',
-	"LeftUpDownVector;":         '\U00002951',
-	"LeftUpTeeVector;":          '\U00002960',
-	"LeftUpVector;":             '\U000021BF',
-	"LeftUpVectorBar;":          '\U00002958',
-	"LeftVector;":               '\U000021BC',
-	"LeftVectorBar;":            '\U00002952',
-	"Leftarrow;":                '\U000021D0',
-	"Leftrightarrow;":           '\U000021D4',
-	"LessEqualGreater;":         '\U000022DA',
-	"LessFullEqual;":            '\U00002266',
-	"LessGreater;":              '\U00002276',
-	"LessLess;":                 '\U00002AA1',
-	"LessSlantEqual;":           '\U00002A7D',
-	"LessTilde;":                '\U00002272',
-	"Lfr;":                      '\U0001D50F',
-	"Ll;":                       '\U000022D8',
-	"Lleftarrow;":               '\U000021DA',
-	"Lmidot;":                   '\U0000013F',
-	"LongLeftArrow;":            '\U000027F5',
-	"LongLeftRightArrow;":       '\U000027F7',
-	"LongRightArrow;":           '\U000027F6',
-	"Longleftarrow;":            '\U000027F8',
-	"Longleftrightarrow;":       '\U000027FA',
-	"Longrightarrow;":           '\U000027F9',
-	"Lopf;":                     '\U0001D543',
-	"LowerLeftArrow;":           '\U00002199',
-	"LowerRightArrow;":          '\U00002198',
-	"Lscr;":                     '\U00002112',
-	"Lsh;":                      '\U000021B0',
-	"Lstrok;":                   '\U00000141',
-	"Lt;":                       '\U0000226A',
-	"Map;":                      '\U00002905',
-	"Mcy;":                      '\U0000041C',
-	"MediumSpace;":              '\U0000205F',
-	"Mellintrf;":                '\U00002133',
-	"Mfr;":                      '\U0001D510',
-	"MinusPlus;":                '\U00002213',
-	"Mopf;":                     '\U0001D544',
-	"Mscr;":                     '\U00002133',
-	"Mu;":                       '\U0000039C',
-	"NJcy;":                     '\U0000040A',
-	"Nacute;":                   '\U00000143',
-	"Ncaron;":                   '\U00000147',
-	"Ncedil;":                   '\U00000145',
-	"Ncy;":                      '\U0000041D',
-	"NegativeMediumSpace;":      '\U0000200B',
-	"NegativeThickSpace;":       '\U0000200B',
-	"NegativeThinSpace;":        '\U0000200B',
-	"NegativeVeryThinSpace;":    '\U0000200B',
-	"NestedGreaterGreater;":     '\U0000226B',
-	"NestedLessLess;":           '\U0000226A',
-	"NewLine;":                  '\U0000000A',
-	"Nfr;":                      '\U0001D511',
-	"NoBreak;":                  '\U00002060',
-	"NonBreakingSpace;":         '\U000000A0',
-	"Nopf;":                     '\U00002115',
-	"Not;":                      '\U00002AEC',
-	"NotCongruent;":             '\U00002262',
-	"NotCupCap;":                '\U0000226D',
-	"NotDoubleVerticalBar;":     '\U00002226',
-	"NotElement;":               '\U00002209',
-	"NotEqual;":                 '\U00002260',
-	"NotExists;":                '\U00002204',
-	"NotGreater;":               '\U0000226F',
-	"NotGreaterEqual;":          '\U00002271',
-	"NotGreaterLess;":           '\U00002279',
-	"NotGreaterTilde;":          '\U00002275',
-	"NotLeftTriangle;":          '\U000022EA',
-	"NotLeftTriangleEqual;":     '\U000022EC',
-	"NotLess;":                  '\U0000226E',
-	"NotLessEqual;":             '\U00002270',
-	"NotLessGreater;":           '\U00002278',
-	"NotLessTilde;":             '\U00002274',
-	"NotPrecedes;":              '\U00002280',
-	"NotPrecedesSlantEqual;":    '\U000022E0',
-	"NotReverseElement;":        '\U0000220C',
-	"NotRightTriangle;":         '\U000022EB',
-	"NotRightTriangleEqual;":    '\U000022ED',
-	"NotSquareSubsetEqual;":     '\U000022E2',
-	"NotSquareSupersetEqual;":   '\U000022E3',
-	"NotSubsetEqual;":           '\U00002288',
-	"NotSucceeds;":              '\U00002281',
-	"NotSucceedsSlantEqual;":    '\U000022E1',
-	"NotSupersetEqual;":         '\U00002289',
-	"NotTilde;":                 '\U00002241',
-	"NotTildeEqual;":            '\U00002244',
-	"NotTildeFullEqual;":        '\U00002247',
-	"NotTildeTilde;":            '\U00002249',
-	"NotVerticalBar;":           '\U00002224',
-	"Nscr;":                     '\U0001D4A9',
-	"Ntilde;":                   '\U000000D1',
-	"Nu;":                       '\U0000039D',
-	"OElig;":                    '\U00000152',
-	"Oacute;":                   '\U000000D3',
-	"Ocirc;":                    '\U000000D4',
-	"Ocy;":                      '\U0000041E',
-	"Odblac;":                   '\U00000150',
-	"Ofr;":                      '\U0001D512',
-	"Ograve;":                   '\U000000D2',
-	"Omacr;":                    '\U0000014C',
-	"Omega;":                    '\U000003A9',
-	"Omicron;":                  '\U0000039F',
-	"Oopf;":                     '\U0001D546',
-	"OpenCurlyDoubleQuote;":     '\U0000201C',
-	"OpenCurlyQuote;":           '\U00002018',
-	"Or;":                       '\U00002A54',
-	"Oscr;":                     '\U0001D4AA',
-	"Oslash;":                   '\U000000D8',
-	"Otilde;":                   '\U000000D5',
-	"Otimes;":                   '\U00002A37',
-	"Ouml;":                     '\U000000D6',
-	"OverBar;":                  '\U0000203E',
-	"OverBrace;":                '\U000023DE',
-	"OverBracket;":              '\U000023B4',
-	"OverParenthesis;":          '\U000023DC',
-	"PartialD;":                 '\U00002202',
-	"Pcy;":                      '\U0000041F',
-	"Pfr;":                      '\U0001D513',
-	"Phi;":                      '\U000003A6',
-	"Pi;":                       '\U000003A0',
-	"PlusMinus;":                '\U000000B1',
-	"Poincareplane;":            '\U0000210C',
-	"Popf;":                     '\U00002119',
-	"Pr;":                       '\U00002ABB',
-	"Precedes;":                 '\U0000227A',
-	"PrecedesEqual;":            '\U00002AAF',
-	"PrecedesSlantEqual;":       '\U0000227C',
-	"PrecedesTilde;":            '\U0000227E',
-	"Prime;":                    '\U00002033',
-	"Product;":                  '\U0000220F',
-	"Proportion;":               '\U00002237',
-	"Proportional;":             '\U0000221D',
-	"Pscr;":                     '\U0001D4AB',
-	"Psi;":                      '\U000003A8',
-	"QUOT;":                     '\U00000022',
-	"Qfr;":                      '\U0001D514',
-	"Qopf;":                     '\U0000211A',
-	"Qscr;":                     '\U0001D4AC',
-	"RBarr;":                    '\U00002910',
-	"REG;":                      '\U000000AE',
-	"Racute;":                   '\U00000154',
-	"Rang;":                     '\U000027EB',
-	"Rarr;":                     '\U000021A0',
-	"Rarrtl;":                   '\U00002916',
-	"Rcaron;":                   '\U00000158',
-	"Rcedil;":                   '\U00000156',
-	"Rcy;":                      '\U00000420',
-	"Re;":                       '\U0000211C',
-	"ReverseElement;":           '\U0000220B',
-	"ReverseEquilibrium;":       '\U000021CB',
-	"ReverseUpEquilibrium;":     '\U0000296F',
-	"Rfr;":                      '\U0000211C',
-	"Rho;":                      '\U000003A1',
-	"RightAngleBracket;":        '\U000027E9',
-	"RightArrow;":               '\U00002192',
-	"RightArrowBar;":            '\U000021E5',
-	"RightArrowLeftArrow;":      '\U000021C4',
-	"RightCeiling;":             '\U00002309',
-	"RightDoubleBracket;":       '\U000027E7',
-	"RightDownTeeVector;":       '\U0000295D',
-	"RightDownVector;":          '\U000021C2',
-	"RightDownVectorBar;":       '\U00002955',
-	"RightFloor;":               '\U0000230B',
-	"RightTee;":                 '\U000022A2',
-	"RightTeeArrow;":            '\U000021A6',
-	"RightTeeVector;":           '\U0000295B',
-	"RightTriangle;":            '\U000022B3',
-	"RightTriangleBar;":         '\U000029D0',
-	"RightTriangleEqual;":       '\U000022B5',
-	"RightUpDownVector;":        '\U0000294F',
-	"RightUpTeeVector;":         '\U0000295C',
-	"RightUpVector;":            '\U000021BE',
-	"RightUpVectorBar;":         '\U00002954',
-	"RightVector;":              '\U000021C0',
-	"RightVectorBar;":           '\U00002953',
-	"Rightarrow;":               '\U000021D2',
-	"Ropf;":                     '\U0000211D',
-	"RoundImplies;":             '\U00002970',
-	"Rrightarrow;":              '\U000021DB',
-	"Rscr;":                     '\U0000211B',
-	"Rsh;":                      '\U000021B1',
-	"RuleDelayed;":              '\U000029F4',
-	"SHCHcy;":                   '\U00000429',
-	"SHcy;":                     '\U00000428',
-	"SOFTcy;":                   '\U0000042C',
-	"Sacute;":                   '\U0000015A',
-	"Sc;":                       '\U00002ABC',
-	"Scaron;":                   '\U00000160',
-	"Scedil;":                   '\U0000015E',
-	"Scirc;":                    '\U0000015C',
-	"Scy;":                      '\U00000421',
-	"Sfr;":                      '\U0001D516',
-	"ShortDownArrow;":           '\U00002193',
-	"ShortLeftArrow;":           '\U00002190',
-	"ShortRightArrow;":          '\U00002192',
-	"ShortUpArrow;":             '\U00002191',
-	"Sigma;":                    '\U000003A3',
-	"SmallCircle;":              '\U00002218',
-	"Sopf;":                     '\U0001D54A',
-	"Sqrt;":                     '\U0000221A',
-	"Square;":                   '\U000025A1',
-	"SquareIntersection;":       '\U00002293',
-	"SquareSubset;":             '\U0000228F',
-	"SquareSubsetEqual;":        '\U00002291',
-	"SquareSuperset;":           '\U00002290',
-	"SquareSupersetEqual;":      '\U00002292',
-	"SquareUnion;":              '\U00002294',
-	"Sscr;":                     '\U0001D4AE',
-	"Star;":                     '\U000022C6',
-	"Sub;":                      '\U000022D0',
-	"Subset;":                   '\U000022D0',
-	"SubsetEqual;":              '\U00002286',
-	"Succeeds;":                 '\U0000227B',
-	"SucceedsEqual;":            '\U00002AB0',
-	"SucceedsSlantEqual;":       '\U0000227D',
-	"SucceedsTilde;":            '\U0000227F',
-	"SuchThat;":                 '\U0000220B',
-	"Sum;":                      '\U00002211',
-	"Sup;":                      '\U000022D1',
-	"Superset;":                 '\U00002283',
-	"SupersetEqual;":            '\U00002287',
-	"Supset;":                   '\U000022D1',
-	"THORN;":                    '\U000000DE',
-	"TRADE;":                    '\U00002122',
-	"TSHcy;":                    '\U0000040B',
-	"TScy;":                     '\U00000426',
-	"Tab;":                      '\U00000009',
-	"Tau;":                      '\U000003A4',
-	"Tcaron;":                   '\U00000164',
-	"Tcedil;":                   '\U00000162',
-	"Tcy;":                      '\U00000422',
-	"Tfr;":                      '\U0001D517',
-	"Therefore;":                '\U00002234',
-	"Theta;":                    '\U00000398',
-	"ThinSpace;":                '\U00002009',
-	"Tilde;":                    '\U0000223C',
-	"TildeEqual;":               '\U00002243',
-	"TildeFullEqual;":           '\U00002245',
-	"TildeTilde;":               '\U00002248',
-	"Topf;":                     '\U0001D54B',
-	"TripleDot;":                '\U000020DB',
-	"Tscr;":                     '\U0001D4AF',
-	"Tstrok;":                   '\U00000166',
-	"Uacute;":                   '\U000000DA',
-	"Uarr;":                     '\U0000219F',
-	"Uarrocir;":                 '\U00002949',
-	"Ubrcy;":                    '\U0000040E',
-	"Ubreve;":                   '\U0000016C',
-	"Ucirc;":                    '\U000000DB',
-	"Ucy;":                      '\U00000423',
-	"Udblac;":                   '\U00000170',
-	"Ufr;":                      '\U0001D518',
-	"Ugrave;":                   '\U000000D9',
-	"Umacr;":                    '\U0000016A',
-	"UnderBar;":                 '\U0000005F',
-	"UnderBrace;":               '\U000023DF',
-	"UnderBracket;":             '\U000023B5',
-	"UnderParenthesis;":         '\U000023DD',
-	"Union;":                    '\U000022C3',
-	"UnionPlus;":                '\U0000228E',
-	"Uogon;":                    '\U00000172',
-	"Uopf;":                     '\U0001D54C',
-	"UpArrow;":                  '\U00002191',
-	"UpArrowBar;":               '\U00002912',
-	"UpArrowDownArrow;":         '\U000021C5',
-	"UpDownArrow;":              '\U00002195',
-	"UpEquilibrium;":            '\U0000296E',
-	"UpTee;":                    '\U000022A5',
-	"UpTeeArrow;":               '\U000021A5',
-	"Uparrow;":                  '\U000021D1',
-	"Updownarrow;":              '\U000021D5',
-	"UpperLeftArrow;":           '\U00002196',
-	"UpperRightArrow;":          '\U00002197',
-	"Upsi;":                     '\U000003D2',
-	"Upsilon;":                  '\U000003A5',
-	"Uring;":                    '\U0000016E',
-	"Uscr;":                     '\U0001D4B0',
-	"Utilde;":                   '\U00000168',
-	"Uuml;":                     '\U000000DC',
-	"VDash;":                    '\U000022AB',
-	"Vbar;":                     '\U00002AEB',
-	"Vcy;":                      '\U00000412',
-	"Vdash;":                    '\U000022A9',
-	"Vdashl;":                   '\U00002AE6',
-	"Vee;":                      '\U000022C1',
-	"Verbar;":                   '\U00002016',
-	"Vert;":                     '\U00002016',
-	"VerticalBar;":              '\U00002223',
-	"VerticalLine;":             '\U0000007C',
-	"VerticalSeparator;":        '\U00002758',
-	"VerticalTilde;":            '\U00002240',
-	"VeryThinSpace;":            '\U0000200A',
-	"Vfr;":                      '\U0001D519',
-	"Vopf;":                     '\U0001D54D',
-	"Vscr;":                     '\U0001D4B1',
-	"Vvdash;":                   '\U000022AA',
-	"Wcirc;":                    '\U00000174',
-	"Wedge;":                    '\U000022C0',
-	"Wfr;":                      '\U0001D51A',
-	"Wopf;":                     '\U0001D54E',
-	"Wscr;":                     '\U0001D4B2',
-	"Xfr;":                      '\U0001D51B',
-	"Xi;":                       '\U0000039E',
-	"Xopf;":                     '\U0001D54F',
-	"Xscr;":                     '\U0001D4B3',
-	"YAcy;":                     '\U0000042F',
-	"YIcy;":                     '\U00000407',
-	"YUcy;":                     '\U0000042E',
-	"Yacute;":                   '\U000000DD',
-	"Ycirc;":                    '\U00000176',
-	"Ycy;":                      '\U0000042B',
-	"Yfr;":                      '\U0001D51C',
-	"Yopf;":                     '\U0001D550',
-	"Yscr;":                     '\U0001D4B4',
-	"Yuml;":                     '\U00000178',
-	"ZHcy;":                     '\U00000416',
-	"Zacute;":                   '\U00000179',
-	"Zcaron;":                   '\U0000017D',
-	"Zcy;":                      '\U00000417',
-	"Zdot;":                     '\U0000017B',
-	"ZeroWidthSpace;":           '\U0000200B',
-	"Zeta;":                     '\U00000396',
-	"Zfr;":                      '\U00002128',
-	"Zopf;":                     '\U00002124',
-	"Zscr;":                     '\U0001D4B5',
-	"aacute;":                   '\U000000E1',
-	"abreve;":                   '\U00000103',
-	"ac;":                       '\U0000223E',
-	"acd;":                      '\U0000223F',
-	"acirc;":                    '\U000000E2',
-	"acute;":                    '\U000000B4',
-	"acy;":                      '\U00000430',
-	"aelig;":                    '\U000000E6',
-	"af;":                       '\U00002061',
-	"afr;":                      '\U0001D51E',
-	"agrave;":                   '\U000000E0',
-	"alefsym;":                  '\U00002135',
-	"aleph;":                    '\U00002135',
-	"alpha;":                    '\U000003B1',
-	"amacr;":                    '\U00000101',
-	"amalg;":                    '\U00002A3F',
-	"amp;":                      '\U00000026',
-	"and;":                      '\U00002227',
-	"andand;":                   '\U00002A55',
-	"andd;":                     '\U00002A5C',
-	"andslope;":                 '\U00002A58',
-	"andv;":                     '\U00002A5A',
-	"ang;":                      '\U00002220',
-	"ange;":                     '\U000029A4',
-	"angle;":                    '\U00002220',
-	"angmsd;":                   '\U00002221',
-	"angmsdaa;":                 '\U000029A8',
-	"angmsdab;":                 '\U000029A9',
-	"angmsdac;":                 '\U000029AA',
-	"angmsdad;":                 '\U000029AB',
-	"angmsdae;":                 '\U000029AC',
-	"angmsdaf;":                 '\U000029AD',
-	"angmsdag;":                 '\U000029AE',
-	"angmsdah;":                 '\U000029AF',
-	"angrt;":                    '\U0000221F',
-	"angrtvb;":                  '\U000022BE',
-	"angrtvbd;":                 '\U0000299D',
-	"angsph;":                   '\U00002222',
-	"angst;":                    '\U000000C5',
-	"angzarr;":                  '\U0000237C',
-	"aogon;":                    '\U00000105',
-	"aopf;":                     '\U0001D552',
-	"ap;":                       '\U00002248',
-	"apE;":                      '\U00002A70',
-	"apacir;":                   '\U00002A6F',
-	"ape;":                      '\U0000224A',
-	"apid;":                     '\U0000224B',
-	"apos;":                     '\U00000027',
-	"approx;":                   '\U00002248',
-	"approxeq;":                 '\U0000224A',
-	"aring;":                    '\U000000E5',
-	"ascr;":                     '\U0001D4B6',
-	"ast;":                      '\U0000002A',
-	"asymp;":                    '\U00002248',
-	"asympeq;":                  '\U0000224D',
-	"atilde;":                   '\U000000E3',
-	"auml;":                     '\U000000E4',
-	"awconint;":                 '\U00002233',
-	"awint;":                    '\U00002A11',
-	"bNot;":                     '\U00002AED',
-	"backcong;":                 '\U0000224C',
-	"backepsilon;":              '\U000003F6',
-	"backprime;":                '\U00002035',
-	"backsim;":                  '\U0000223D',
-	"backsimeq;":                '\U000022CD',
-	"barvee;":                   '\U000022BD',
-	"barwed;":                   '\U00002305',
-	"barwedge;":                 '\U00002305',
-	"bbrk;":                     '\U000023B5',
-	"bbrktbrk;":                 '\U000023B6',
-	"bcong;":                    '\U0000224C',
-	"bcy;":                      '\U00000431',
-	"bdquo;":                    '\U0000201E',
-	"becaus;":                   '\U00002235',
-	"because;":                  '\U00002235',
-	"bemptyv;":                  '\U000029B0',
-	"bepsi;":                    '\U000003F6',
-	"bernou;":                   '\U0000212C',
-	"beta;":                     '\U000003B2',
-	"beth;":                     '\U00002136',
-	"between;":                  '\U0000226C',
-	"bfr;":                      '\U0001D51F',
-	"bigcap;":                   '\U000022C2',
-	"bigcirc;":                  '\U000025EF',
-	"bigcup;":                   '\U000022C3',
-	"bigodot;":                  '\U00002A00',
-	"bigoplus;":                 '\U00002A01',
-	"bigotimes;":                '\U00002A02',
-	"bigsqcup;":                 '\U00002A06',
-	"bigstar;":                  '\U00002605',
-	"bigtriangledown;":          '\U000025BD',
-	"bigtriangleup;":            '\U000025B3',
-	"biguplus;":                 '\U00002A04',
-	"bigvee;":                   '\U000022C1',
-	"bigwedge;":                 '\U000022C0',
-	"bkarow;":                   '\U0000290D',
-	"blacklozenge;":             '\U000029EB',
-	"blacksquare;":              '\U000025AA',
-	"blacktriangle;":            '\U000025B4',
-	"blacktriangledown;":        '\U000025BE',
-	"blacktriangleleft;":        '\U000025C2',
-	"blacktriangleright;":       '\U000025B8',
-	"blank;":                    '\U00002423',
-	"blk12;":                    '\U00002592',
-	"blk14;":                    '\U00002591',
-	"blk34;":                    '\U00002593',
-	"block;":                    '\U00002588',
-	"bnot;":                     '\U00002310',
-	"bopf;":                     '\U0001D553',
-	"bot;":                      '\U000022A5',
-	"bottom;":                   '\U000022A5',
-	"bowtie;":                   '\U000022C8',
-	"boxDL;":                    '\U00002557',
-	"boxDR;":                    '\U00002554',
-	"boxDl;":                    '\U00002556',
-	"boxDr;":                    '\U00002553',
-	"boxH;":                     '\U00002550',
-	"boxHD;":                    '\U00002566',
-	"boxHU;":                    '\U00002569',
-	"boxHd;":                    '\U00002564',
-	"boxHu;":                    '\U00002567',
-	"boxUL;":                    '\U0000255D',
-	"boxUR;":                    '\U0000255A',
-	"boxUl;":                    '\U0000255C',
-	"boxUr;":                    '\U00002559',
-	"boxV;":                     '\U00002551',
-	"boxVH;":                    '\U0000256C',
-	"boxVL;":                    '\U00002563',
-	"boxVR;":                    '\U00002560',
-	"boxVh;":                    '\U0000256B',
-	"boxVl;":                    '\U00002562',
-	"boxVr;":                    '\U0000255F',
-	"boxbox;":                   '\U000029C9',
-	"boxdL;":                    '\U00002555',
-	"boxdR;":                    '\U00002552',
-	"boxdl;":                    '\U00002510',
-	"boxdr;":                    '\U0000250C',
-	"boxh;":                     '\U00002500',
-	"boxhD;":                    '\U00002565',
-	"boxhU;":                    '\U00002568',
-	"boxhd;":                    '\U0000252C',
-	"boxhu;":                    '\U00002534',
-	"boxminus;":                 '\U0000229F',
-	"boxplus;":                  '\U0000229E',
-	"boxtimes;":                 '\U000022A0',
-	"boxuL;":                    '\U0000255B',
-	"boxuR;":                    '\U00002558',
-	"boxul;":                    '\U00002518',
-	"boxur;":                    '\U00002514',
-	"boxv;":                     '\U00002502',
-	"boxvH;":                    '\U0000256A',
-	"boxvL;":                    '\U00002561',
-	"boxvR;":                    '\U0000255E',
-	"boxvh;":                    '\U0000253C',
-	"boxvl;":                    '\U00002524',
-	"boxvr;":                    '\U0000251C',
-	"bprime;":                   '\U00002035',
-	"breve;":                    '\U000002D8',
-	"brvbar;":                   '\U000000A6',
-	"bscr;":                     '\U0001D4B7',
-	"bsemi;":                    '\U0000204F',
-	"bsim;":                     '\U0000223D',
-	"bsime;":                    '\U000022CD',
-	"bsol;":                     '\U0000005C',
-	"bsolb;":                    '\U000029C5',
-	"bsolhsub;":                 '\U000027C8',
-	"bull;":                     '\U00002022',
-	"bullet;":                   '\U00002022',
-	"bump;":                     '\U0000224E',
-	"bumpE;":                    '\U00002AAE',
-	"bumpe;":                    '\U0000224F',
-	"bumpeq;":                   '\U0000224F',
-	"cacute;":                   '\U00000107',
-	"cap;":                      '\U00002229',
-	"capand;":                   '\U00002A44',
-	"capbrcup;":                 '\U00002A49',
-	"capcap;":                   '\U00002A4B',
-	"capcup;":                   '\U00002A47',
-	"capdot;":                   '\U00002A40',
-	"caret;":                    '\U00002041',
-	"caron;":                    '\U000002C7',
-	"ccaps;":                    '\U00002A4D',
-	"ccaron;":                   '\U0000010D',
-	"ccedil;":                   '\U000000E7',
-	"ccirc;":                    '\U00000109',
-	"ccups;":                    '\U00002A4C',
-	"ccupssm;":                  '\U00002A50',
-	"cdot;":                     '\U0000010B',
-	"cedil;":                    '\U000000B8',
-	"cemptyv;":                  '\U000029B2',
-	"cent;":                     '\U000000A2',
-	"centerdot;":                '\U000000B7',
-	"cfr;":                      '\U0001D520',
-	"chcy;":                     '\U00000447',
-	"check;":                    '\U00002713',
-	"checkmark;":                '\U00002713',
-	"chi;":                      '\U000003C7',
-	"cir;":                      '\U000025CB',
-	"cirE;":                     '\U000029C3',
-	"circ;":                     '\U000002C6',
-	"circeq;":                   '\U00002257',
-	"circlearrowleft;":          '\U000021BA',
-	"circlearrowright;":         '\U000021BB',
-	"circledR;":                 '\U000000AE',
-	"circledS;":                 '\U000024C8',
-	"circledast;":               '\U0000229B',
-	"circledcirc;":              '\U0000229A',
-	"circleddash;":              '\U0000229D',
-	"cire;":                     '\U00002257',
-	"cirfnint;":                 '\U00002A10',
-	"cirmid;":                   '\U00002AEF',
-	"cirscir;":                  '\U000029C2',
-	"clubs;":                    '\U00002663',
-	"clubsuit;":                 '\U00002663',
-	"colon;":                    '\U0000003A',
-	"colone;":                   '\U00002254',
-	"coloneq;":                  '\U00002254',
-	"comma;":                    '\U0000002C',
-	"commat;":                   '\U00000040',
-	"comp;":                     '\U00002201',
-	"compfn;":                   '\U00002218',
-	"complement;":               '\U00002201',
-	"complexes;":                '\U00002102',
-	"cong;":                     '\U00002245',
-	"congdot;":                  '\U00002A6D',
-	"conint;":                   '\U0000222E',
-	"copf;":                     '\U0001D554',
-	"coprod;":                   '\U00002210',
-	"copy;":                     '\U000000A9',
-	"copysr;":                   '\U00002117',
-	"crarr;":                    '\U000021B5',
-	"cross;":                    '\U00002717',
-	"cscr;":                     '\U0001D4B8',
-	"csub;":                     '\U00002ACF',
-	"csube;":                    '\U00002AD1',
-	"csup;":                     '\U00002AD0',
-	"csupe;":                    '\U00002AD2',
-	"ctdot;":                    '\U000022EF',
-	"cudarrl;":                  '\U00002938',
-	"cudarrr;":                  '\U00002935',
-	"cuepr;":                    '\U000022DE',
-	"cuesc;":                    '\U000022DF',
-	"cularr;":                   '\U000021B6',
-	"cularrp;":                  '\U0000293D',
-	"cup;":                      '\U0000222A',
-	"cupbrcap;":                 '\U00002A48',
-	"cupcap;":                   '\U00002A46',
-	"cupcup;":                   '\U00002A4A',
-	"cupdot;":                   '\U0000228D',
-	"cupor;":                    '\U00002A45',
-	"curarr;":                   '\U000021B7',
-	"curarrm;":                  '\U0000293C',
-	"curlyeqprec;":              '\U000022DE',
-	"curlyeqsucc;":              '\U000022DF',
-	"curlyvee;":                 '\U000022CE',
-	"curlywedge;":               '\U000022CF',
-	"curren;":                   '\U000000A4',
-	"curvearrowleft;":           '\U000021B6',
-	"curvearrowright;":          '\U000021B7',
-	"cuvee;":                    '\U000022CE',
-	"cuwed;":                    '\U000022CF',
-	"cwconint;":                 '\U00002232',
-	"cwint;":                    '\U00002231',
-	"cylcty;":                   '\U0000232D',
-	"dArr;":                     '\U000021D3',
-	"dHar;":                     '\U00002965',
-	"dagger;":                   '\U00002020',
-	"daleth;":                   '\U00002138',
-	"darr;":                     '\U00002193',
-	"dash;":                     '\U00002010',
-	"dashv;":                    '\U000022A3',
-	"dbkarow;":                  '\U0000290F',
-	"dblac;":                    '\U000002DD',
-	"dcaron;":                   '\U0000010F',
-	"dcy;":                      '\U00000434',
-	"dd;":                       '\U00002146',
-	"ddagger;":                  '\U00002021',
-	"ddarr;":                    '\U000021CA',
-	"ddotseq;":                  '\U00002A77',
-	"deg;":                      '\U000000B0',
-	"delta;":                    '\U000003B4',
-	"demptyv;":                  '\U000029B1',
-	"dfisht;":                   '\U0000297F',
-	"dfr;":                      '\U0001D521',
-	"dharl;":                    '\U000021C3',
-	"dharr;":                    '\U000021C2',
-	"diam;":                     '\U000022C4',
-	"diamond;":                  '\U000022C4',
-	"diamondsuit;":              '\U00002666',
-	"diams;":                    '\U00002666',
-	"die;":                      '\U000000A8',
-	"digamma;":                  '\U000003DD',
-	"disin;":                    '\U000022F2',
-	"div;":                      '\U000000F7',
-	"divide;":                   '\U000000F7',
-	"divideontimes;":            '\U000022C7',
-	"divonx;":                   '\U000022C7',
-	"djcy;":                     '\U00000452',
-	"dlcorn;":                   '\U0000231E',
-	"dlcrop;":                   '\U0000230D',
-	"dollar;":                   '\U00000024',
-	"dopf;":                     '\U0001D555',
-	"dot;":                      '\U000002D9',
-	"doteq;":                    '\U00002250',
-	"doteqdot;":                 '\U00002251',
-	"dotminus;":                 '\U00002238',
-	"dotplus;":                  '\U00002214',
-	"dotsquare;":                '\U000022A1',
-	"doublebarwedge;":           '\U00002306',
-	"downarrow;":                '\U00002193',
-	"downdownarrows;":           '\U000021CA',
-	"downharpoonleft;":          '\U000021C3',
-	"downharpoonright;":         '\U000021C2',
-	"drbkarow;":                 '\U00002910',
-	"drcorn;":                   '\U0000231F',
-	"drcrop;":                   '\U0000230C',
-	"dscr;":                     '\U0001D4B9',
-	"dscy;":                     '\U00000455',
-	"dsol;":                     '\U000029F6',
-	"dstrok;":                   '\U00000111',
-	"dtdot;":                    '\U000022F1',
-	"dtri;":                     '\U000025BF',
-	"dtrif;":                    '\U000025BE',
-	"duarr;":                    '\U000021F5',
-	"duhar;":                    '\U0000296F',
-	"dwangle;":                  '\U000029A6',
-	"dzcy;":                     '\U0000045F',
-	"dzigrarr;":                 '\U000027FF',
-	"eDDot;":                    '\U00002A77',
-	"eDot;":                     '\U00002251',
-	"eacute;":                   '\U000000E9',
-	"easter;":                   '\U00002A6E',
-	"ecaron;":                   '\U0000011B',
-	"ecir;":                     '\U00002256',
-	"ecirc;":                    '\U000000EA',
-	"ecolon;":                   '\U00002255',
-	"ecy;":                      '\U0000044D',
-	"edot;":                     '\U00000117',
-	"ee;":                       '\U00002147',
-	"efDot;":                    '\U00002252',
-	"efr;":                      '\U0001D522',
-	"eg;":                       '\U00002A9A',
-	"egrave;":                   '\U000000E8',
-	"egs;":                      '\U00002A96',
-	"egsdot;":                   '\U00002A98',
-	"el;":                       '\U00002A99',
-	"elinters;":                 '\U000023E7',
-	"ell;":                      '\U00002113',
-	"els;":                      '\U00002A95',
-	"elsdot;":                   '\U00002A97',
-	"emacr;":                    '\U00000113',
-	"empty;":                    '\U00002205',
-	"emptyset;":                 '\U00002205',
-	"emptyv;":                   '\U00002205',
-	"emsp;":                     '\U00002003',
-	"emsp13;":                   '\U00002004',
-	"emsp14;":                   '\U00002005',
-	"eng;":                      '\U0000014B',
-	"ensp;":                     '\U00002002',
-	"eogon;":                    '\U00000119',
-	"eopf;":                     '\U0001D556',
-	"epar;":                     '\U000022D5',
-	"eparsl;":                   '\U000029E3',
-	"eplus;":                    '\U00002A71',
-	"epsi;":                     '\U000003B5',
-	"epsilon;":                  '\U000003B5',
-	"epsiv;":                    '\U000003F5',
-	"eqcirc;":                   '\U00002256',
-	"eqcolon;":                  '\U00002255',
-	"eqsim;":                    '\U00002242',
-	"eqslantgtr;":               '\U00002A96',
-	"eqslantless;":              '\U00002A95',
-	"equals;":                   '\U0000003D',
-	"equest;":                   '\U0000225F',
-	"equiv;":                    '\U00002261',
-	"equivDD;":                  '\U00002A78',
-	"eqvparsl;":                 '\U000029E5',
-	"erDot;":                    '\U00002253',
-	"erarr;":                    '\U00002971',
-	"escr;":                     '\U0000212F',
-	"esdot;":                    '\U00002250',
-	"esim;":                     '\U00002242',
-	"eta;":                      '\U000003B7',
-	"eth;":                      '\U000000F0',
-	"euml;":                     '\U000000EB',
-	"euro;":                     '\U000020AC',
-	"excl;":                     '\U00000021',
-	"exist;":                    '\U00002203',
-	"expectation;":              '\U00002130',
-	"exponentiale;":             '\U00002147',
-	"fallingdotseq;":            '\U00002252',
-	"fcy;":                      '\U00000444',
-	"female;":                   '\U00002640',
-	"ffilig;":                   '\U0000FB03',
-	"fflig;":                    '\U0000FB00',
-	"ffllig;":                   '\U0000FB04',
-	"ffr;":                      '\U0001D523',
-	"filig;":                    '\U0000FB01',
-	"flat;":                     '\U0000266D',
-	"fllig;":                    '\U0000FB02',
-	"fltns;":                    '\U000025B1',
-	"fnof;":                     '\U00000192',
-	"fopf;":                     '\U0001D557',
-	"forall;":                   '\U00002200',
-	"fork;":                     '\U000022D4',
-	"forkv;":                    '\U00002AD9',
-	"fpartint;":                 '\U00002A0D',
-	"frac12;":                   '\U000000BD',
-	"frac13;":                   '\U00002153',
-	"frac14;":                   '\U000000BC',
-	"frac15;":                   '\U00002155',
-	"frac16;":                   '\U00002159',
-	"frac18;":                   '\U0000215B',
-	"frac23;":                   '\U00002154',
-	"frac25;":                   '\U00002156',
-	"frac34;":                   '\U000000BE',
-	"frac35;":                   '\U00002157',
-	"frac38;":                   '\U0000215C',
-	"frac45;":                   '\U00002158',
-	"frac56;":                   '\U0000215A',
-	"frac58;":                   '\U0000215D',
-	"frac78;":                   '\U0000215E',
-	"frasl;":                    '\U00002044',
-	"frown;":                    '\U00002322',
-	"fscr;":                     '\U0001D4BB',
-	"gE;":                       '\U00002267',
-	"gEl;":                      '\U00002A8C',
-	"gacute;":                   '\U000001F5',
-	"gamma;":                    '\U000003B3',
-	"gammad;":                   '\U000003DD',
-	"gap;":                      '\U00002A86',
-	"gbreve;":                   '\U0000011F',
-	"gcirc;":                    '\U0000011D',
-	"gcy;":                      '\U00000433',
-	"gdot;":                     '\U00000121',
-	"ge;":                       '\U00002265',
-	"gel;":                      '\U000022DB',
-	"geq;":                      '\U00002265',
-	"geqq;":                     '\U00002267',
-	"geqslant;":                 '\U00002A7E',
-	"ges;":                      '\U00002A7E',
-	"gescc;":                    '\U00002AA9',
-	"gesdot;":                   '\U00002A80',
-	"gesdoto;":                  '\U00002A82',
-	"gesdotol;":                 '\U00002A84',
-	"gesles;":                   '\U00002A94',
-	"gfr;":                      '\U0001D524',
-	"gg;":                       '\U0000226B',
-	"ggg;":                      '\U000022D9',
-	"gimel;":                    '\U00002137',
-	"gjcy;":                     '\U00000453',
-	"gl;":                       '\U00002277',
-	"glE;":                      '\U00002A92',
-	"gla;":                      '\U00002AA5',
-	"glj;":                      '\U00002AA4',
-	"gnE;":                      '\U00002269',
-	"gnap;":                     '\U00002A8A',
-	"gnapprox;":                 '\U00002A8A',
-	"gne;":                      '\U00002A88',
-	"gneq;":                     '\U00002A88',
-	"gneqq;":                    '\U00002269',
-	"gnsim;":                    '\U000022E7',
-	"gopf;":                     '\U0001D558',
-	"grave;":                    '\U00000060',
-	"gscr;":                     '\U0000210A',
-	"gsim;":                     '\U00002273',
-	"gsime;":                    '\U00002A8E',
-	"gsiml;":                    '\U00002A90',
-	"gt;":                       '\U0000003E',
-	"gtcc;":                     '\U00002AA7',
-	"gtcir;":                    '\U00002A7A',
-	"gtdot;":                    '\U000022D7',
-	"gtlPar;":                   '\U00002995',
-	"gtquest;":                  '\U00002A7C',
-	"gtrapprox;":                '\U00002A86',
-	"gtrarr;":                   '\U00002978',
-	"gtrdot;":                   '\U000022D7',
-	"gtreqless;":                '\U000022DB',
-	"gtreqqless;":               '\U00002A8C',
-	"gtrless;":                  '\U00002277',
-	"gtrsim;":                   '\U00002273',
-	"hArr;":                     '\U000021D4',
-	"hairsp;":                   '\U0000200A',
-	"half;":                     '\U000000BD',
-	"hamilt;":                   '\U0000210B',
-	"hardcy;":                   '\U0000044A',
-	"harr;":                     '\U00002194',
-	"harrcir;":                  '\U00002948',
-	"harrw;":                    '\U000021AD',
-	"hbar;":                     '\U0000210F',
-	"hcirc;":                    '\U00000125',
-	"hearts;":                   '\U00002665',
-	"heartsuit;":                '\U00002665',
-	"hellip;":                   '\U00002026',
-	"hercon;":                   '\U000022B9',
-	"hfr;":                      '\U0001D525',
-	"hksearow;":                 '\U00002925',
-	"hkswarow;":                 '\U00002926',
-	"hoarr;":                    '\U000021FF',
-	"homtht;":                   '\U0000223B',
-	"hookleftarrow;":            '\U000021A9',
-	"hookrightarrow;":           '\U000021AA',
-	"hopf;":                     '\U0001D559',
-	"horbar;":                   '\U00002015',
-	"hscr;":                     '\U0001D4BD',
-	"hslash;":                   '\U0000210F',
-	"hstrok;":                   '\U00000127',
-	"hybull;":                   '\U00002043',
-	"hyphen;":                   '\U00002010',
-	"iacute;":                   '\U000000ED',
-	"ic;":                       '\U00002063',
-	"icirc;":                    '\U000000EE',
-	"icy;":                      '\U00000438',
-	"iecy;":                     '\U00000435',
-	"iexcl;":                    '\U000000A1',
-	"iff;":                      '\U000021D4',
-	"ifr;":                      '\U0001D526',
-	"igrave;":                   '\U000000EC',
-	"ii;":                       '\U00002148',
-	"iiiint;":                   '\U00002A0C',
-	"iiint;":                    '\U0000222D',
-	"iinfin;":                   '\U000029DC',
-	"iiota;":                    '\U00002129',
-	"ijlig;":                    '\U00000133',
-	"imacr;":                    '\U0000012B',
-	"image;":                    '\U00002111',
-	"imagline;":                 '\U00002110',
-	"imagpart;":                 '\U00002111',
-	"imath;":                    '\U00000131',
-	"imof;":                     '\U000022B7',
-	"imped;":                    '\U000001B5',
-	"in;":                       '\U00002208',
-	"incare;":                   '\U00002105',
-	"infin;":                    '\U0000221E',
-	"infintie;":                 '\U000029DD',
-	"inodot;":                   '\U00000131',
-	"int;":                      '\U0000222B',
-	"intcal;":                   '\U000022BA',
-	"integers;":                 '\U00002124',
-	"intercal;":                 '\U000022BA',
-	"intlarhk;":                 '\U00002A17',
-	"intprod;":                  '\U00002A3C',
-	"iocy;":                     '\U00000451',
-	"iogon;":                    '\U0000012F',
-	"iopf;":                     '\U0001D55A',
-	"iota;":                     '\U000003B9',
-	"iprod;":                    '\U00002A3C',
-	"iquest;":                   '\U000000BF',
-	"iscr;":                     '\U0001D4BE',
-	"isin;":                     '\U00002208',
-	"isinE;":                    '\U000022F9',
-	"isindot;":                  '\U000022F5',
-	"isins;":                    '\U000022F4',
-	"isinsv;":                   '\U000022F3',
-	"isinv;":                    '\U00002208',
-	"it;":                       '\U00002062',
-	"itilde;":                   '\U00000129',
-	"iukcy;":                    '\U00000456',
-	"iuml;":                     '\U000000EF',
-	"jcirc;":                    '\U00000135',
-	"jcy;":                      '\U00000439',
-	"jfr;":                      '\U0001D527',
-	"jmath;":                    '\U00000237',
-	"jopf;":                     '\U0001D55B',
-	"jscr;":                     '\U0001D4BF',
-	"jsercy;":                   '\U00000458',
-	"jukcy;":                    '\U00000454',
-	"kappa;":                    '\U000003BA',
-	"kappav;":                   '\U000003F0',
-	"kcedil;":                   '\U00000137',
-	"kcy;":                      '\U0000043A',
-	"kfr;":                      '\U0001D528',
-	"kgreen;":                   '\U00000138',
-	"khcy;":                     '\U00000445',
-	"kjcy;":                     '\U0000045C',
-	"kopf;":                     '\U0001D55C',
-	"kscr;":                     '\U0001D4C0',
-	"lAarr;":                    '\U000021DA',
-	"lArr;":                     '\U000021D0',
-	"lAtail;":                   '\U0000291B',
-	"lBarr;":                    '\U0000290E',
-	"lE;":                       '\U00002266',
-	"lEg;":                      '\U00002A8B',
-	"lHar;":                     '\U00002962',
-	"lacute;":                   '\U0000013A',
-	"laemptyv;":                 '\U000029B4',
-	"lagran;":                   '\U00002112',
-	"lambda;":                   '\U000003BB',
-	"lang;":                     '\U000027E8',
-	"langd;":                    '\U00002991',
-	"langle;":                   '\U000027E8',
-	"lap;":                      '\U00002A85',
-	"laquo;":                    '\U000000AB',
-	"larr;":                     '\U00002190',
-	"larrb;":                    '\U000021E4',
-	"larrbfs;":                  '\U0000291F',
-	"larrfs;":                   '\U0000291D',
-	"larrhk;":                   '\U000021A9',
-	"larrlp;":                   '\U000021AB',
-	"larrpl;":                   '\U00002939',
-	"larrsim;":                  '\U00002973',
-	"larrtl;":                   '\U000021A2',
-	"lat;":                      '\U00002AAB',
-	"latail;":                   '\U00002919',
-	"late;":                     '\U00002AAD',
-	"lbarr;":                    '\U0000290C',
-	"lbbrk;":                    '\U00002772',
-	"lbrace;":                   '\U0000007B',
-	"lbrack;":                   '\U0000005B',
-	"lbrke;":                    '\U0000298B',
-	"lbrksld;":                  '\U0000298F',
-	"lbrkslu;":                  '\U0000298D',
-	"lcaron;":                   '\U0000013E',
-	"lcedil;":                   '\U0000013C',
-	"lceil;":                    '\U00002308',
-	"lcub;":                     '\U0000007B',
-	"lcy;":                      '\U0000043B',
-	"ldca;":                     '\U00002936',
-	"ldquo;":                    '\U0000201C',
-	"ldquor;":                   '\U0000201E',
-	"ldrdhar;":                  '\U00002967',
-	"ldrushar;":                 '\U0000294B',
-	"ldsh;":                     '\U000021B2',
-	"le;":                       '\U00002264',
-	"leftarrow;":                '\U00002190',
-	"leftarrowtail;":            '\U000021A2',
-	"leftharpoondown;":          '\U000021BD',
-	"leftharpoonup;":            '\U000021BC',
-	"leftleftarrows;":           '\U000021C7',
-	"leftrightarrow;":           '\U00002194',
-	"leftrightarrows;":          '\U000021C6',
-	"leftrightharpoons;":        '\U000021CB',
-	"leftrightsquigarrow;":      '\U000021AD',
-	"leftthreetimes;":           '\U000022CB',
-	"leg;":                      '\U000022DA',
-	"leq;":                      '\U00002264',
-	"leqq;":                     '\U00002266',
-	"leqslant;":                 '\U00002A7D',
-	"les;":                      '\U00002A7D',
-	"lescc;":                    '\U00002AA8',
-	"lesdot;":                   '\U00002A7F',
-	"lesdoto;":                  '\U00002A81',
-	"lesdotor;":                 '\U00002A83',
-	"lesges;":                   '\U00002A93',
-	"lessapprox;":               '\U00002A85',
-	"lessdot;":                  '\U000022D6',
-	"lesseqgtr;":                '\U000022DA',
-	"lesseqqgtr;":               '\U00002A8B',
-	"lessgtr;":                  '\U00002276',
-	"lesssim;":                  '\U00002272',
-	"lfisht;":                   '\U0000297C',
-	"lfloor;":                   '\U0000230A',
-	"lfr;":                      '\U0001D529',
-	"lg;":                       '\U00002276',
-	"lgE;":                      '\U00002A91',
-	"lhard;":                    '\U000021BD',
-	"lharu;":                    '\U000021BC',
-	"lharul;":                   '\U0000296A',
-	"lhblk;":                    '\U00002584',
-	"ljcy;":                     '\U00000459',
-	"ll;":                       '\U0000226A',
-	"llarr;":                    '\U000021C7',
-	"llcorner;":                 '\U0000231E',
-	"llhard;":                   '\U0000296B',
-	"lltri;":                    '\U000025FA',
-	"lmidot;":                   '\U00000140',
-	"lmoust;":                   '\U000023B0',
-	"lmoustache;":               '\U000023B0',
-	"lnE;":                      '\U00002268',
-	"lnap;":                     '\U00002A89',
-	"lnapprox;":                 '\U00002A89',
-	"lne;":                      '\U00002A87',
-	"lneq;":                     '\U00002A87',
-	"lneqq;":                    '\U00002268',
-	"lnsim;":                    '\U000022E6',
-	"loang;":                    '\U000027EC',
-	"loarr;":                    '\U000021FD',
-	"lobrk;":                    '\U000027E6',
-	"longleftarrow;":            '\U000027F5',
-	"longleftrightarrow;":       '\U000027F7',
-	"longmapsto;":               '\U000027FC',
-	"longrightarrow;":           '\U000027F6',
-	"looparrowleft;":            '\U000021AB',
-	"looparrowright;":           '\U000021AC',
-	"lopar;":                    '\U00002985',
-	"lopf;":                     '\U0001D55D',
-	"loplus;":                   '\U00002A2D',
-	"lotimes;":                  '\U00002A34',
-	"lowast;":                   '\U00002217',
-	"lowbar;":                   '\U0000005F',
-	"loz;":                      '\U000025CA',
-	"lozenge;":                  '\U000025CA',
-	"lozf;":                     '\U000029EB',
-	"lpar;":                     '\U00000028',
-	"lparlt;":                   '\U00002993',
-	"lrarr;":                    '\U000021C6',
-	"lrcorner;":                 '\U0000231F',
-	"lrhar;":                    '\U000021CB',
-	"lrhard;":                   '\U0000296D',
-	"lrm;":                      '\U0000200E',
-	"lrtri;":                    '\U000022BF',
-	"lsaquo;":                   '\U00002039',
-	"lscr;":                     '\U0001D4C1',
-	"lsh;":                      '\U000021B0',
-	"lsim;":                     '\U00002272',
-	"lsime;":                    '\U00002A8D',
-	"lsimg;":                    '\U00002A8F',
-	"lsqb;":                     '\U0000005B',
-	"lsquo;":                    '\U00002018',
-	"lsquor;":                   '\U0000201A',
-	"lstrok;":                   '\U00000142',
-	"lt;":                       '\U0000003C',
-	"ltcc;":                     '\U00002AA6',
-	"ltcir;":                    '\U00002A79',
-	"ltdot;":                    '\U000022D6',
-	"lthree;":                   '\U000022CB',
-	"ltimes;":                   '\U000022C9',
-	"ltlarr;":                   '\U00002976',
-	"ltquest;":                  '\U00002A7B',
-	"ltrPar;":                   '\U00002996',
-	"ltri;":                     '\U000025C3',
-	"ltrie;":                    '\U000022B4',
-	"ltrif;":                    '\U000025C2',
-	"lurdshar;":                 '\U0000294A',
-	"luruhar;":                  '\U00002966',
-	"mDDot;":                    '\U0000223A',
-	"macr;":                     '\U000000AF',
-	"male;":                     '\U00002642',
-	"malt;":                     '\U00002720',
-	"maltese;":                  '\U00002720',
-	"map;":                      '\U000021A6',
-	"mapsto;":                   '\U000021A6',
-	"mapstodown;":               '\U000021A7',
-	"mapstoleft;":               '\U000021A4',
-	"mapstoup;":                 '\U000021A5',
-	"marker;":                   '\U000025AE',
-	"mcomma;":                   '\U00002A29',
-	"mcy;":                      '\U0000043C',
-	"mdash;":                    '\U00002014',
-	"measuredangle;":            '\U00002221',
-	"mfr;":                      '\U0001D52A',
-	"mho;":                      '\U00002127',
-	"micro;":                    '\U000000B5',
-	"mid;":                      '\U00002223',
-	"midast;":                   '\U0000002A',
-	"midcir;":                   '\U00002AF0',
-	"middot;":                   '\U000000B7',
-	"minus;":                    '\U00002212',
-	"minusb;":                   '\U0000229F',
-	"minusd;":                   '\U00002238',
-	"minusdu;":                  '\U00002A2A',
-	"mlcp;":                     '\U00002ADB',
-	"mldr;":                     '\U00002026',
-	"mnplus;":                   '\U00002213',
-	"models;":                   '\U000022A7',
-	"mopf;":                     '\U0001D55E',
-	"mp;":                       '\U00002213',
-	"mscr;":                     '\U0001D4C2',
-	"mstpos;":                   '\U0000223E',
-	"mu;":                       '\U000003BC',
-	"multimap;":                 '\U000022B8',
-	"mumap;":                    '\U000022B8',
-	"nLeftarrow;":               '\U000021CD',
-	"nLeftrightarrow;":          '\U000021CE',
-	"nRightarrow;":              '\U000021CF',
-	"nVDash;":                   '\U000022AF',
-	"nVdash;":                   '\U000022AE',
-	"nabla;":                    '\U00002207',
-	"nacute;":                   '\U00000144',
-	"nap;":                      '\U00002249',
-	"napos;":                    '\U00000149',
-	"napprox;":                  '\U00002249',
-	"natur;":                    '\U0000266E',
-	"natural;":                  '\U0000266E',
-	"naturals;":                 '\U00002115',
-	"nbsp;":                     '\U000000A0',
-	"ncap;":                     '\U00002A43',
-	"ncaron;":                   '\U00000148',
-	"ncedil;":                   '\U00000146',
-	"ncong;":                    '\U00002247',
-	"ncup;":                     '\U00002A42',
-	"ncy;":                      '\U0000043D',
-	"ndash;":                    '\U00002013',
-	"ne;":                       '\U00002260',
-	"neArr;":                    '\U000021D7',
-	"nearhk;":                   '\U00002924',
-	"nearr;":                    '\U00002197',
-	"nearrow;":                  '\U00002197',
-	"nequiv;":                   '\U00002262',
-	"nesear;":                   '\U00002928',
-	"nexist;":                   '\U00002204',
-	"nexists;":                  '\U00002204',
-	"nfr;":                      '\U0001D52B',
-	"nge;":                      '\U00002271',
-	"ngeq;":                     '\U00002271',
-	"ngsim;":                    '\U00002275',
-	"ngt;":                      '\U0000226F',
-	"ngtr;":                     '\U0000226F',
-	"nhArr;":                    '\U000021CE',
-	"nharr;":                    '\U000021AE',
-	"nhpar;":                    '\U00002AF2',
-	"ni;":                       '\U0000220B',
-	"nis;":                      '\U000022FC',
-	"nisd;":                     '\U000022FA',
-	"niv;":                      '\U0000220B',
-	"njcy;":                     '\U0000045A',
-	"nlArr;":                    '\U000021CD',
-	"nlarr;":                    '\U0000219A',
-	"nldr;":                     '\U00002025',
-	"nle;":                      '\U00002270',
-	"nleftarrow;":               '\U0000219A',
-	"nleftrightarrow;":          '\U000021AE',
-	"nleq;":                     '\U00002270',
-	"nless;":                    '\U0000226E',
-	"nlsim;":                    '\U00002274',
-	"nlt;":                      '\U0000226E',
-	"nltri;":                    '\U000022EA',
-	"nltrie;":                   '\U000022EC',
-	"nmid;":                     '\U00002224',
-	"nopf;":                     '\U0001D55F',
-	"not;":                      '\U000000AC',
-	"notin;":                    '\U00002209',
-	"notinva;":                  '\U00002209',
-	"notinvb;":                  '\U000022F7',
-	"notinvc;":                  '\U000022F6',
-	"notni;":                    '\U0000220C',
-	"notniva;":                  '\U0000220C',
-	"notnivb;":                  '\U000022FE',
-	"notnivc;":                  '\U000022FD',
-	"npar;":                     '\U00002226',
-	"nparallel;":                '\U00002226',
-	"npolint;":                  '\U00002A14',
-	"npr;":                      '\U00002280',
-	"nprcue;":                   '\U000022E0',
-	"nprec;":                    '\U00002280',
-	"nrArr;":                    '\U000021CF',
-	"nrarr;":                    '\U0000219B',
-	"nrightarrow;":              '\U0000219B',
-	"nrtri;":                    '\U000022EB',
-	"nrtrie;":                   '\U000022ED',
-	"nsc;":                      '\U00002281',
-	"nsccue;":                   '\U000022E1',
-	"nscr;":                     '\U0001D4C3',
-	"nshortmid;":                '\U00002224',
-	"nshortparallel;":           '\U00002226',
-	"nsim;":                     '\U00002241',
-	"nsime;":                    '\U00002244',
-	"nsimeq;":                   '\U00002244',
-	"nsmid;":                    '\U00002224',
-	"nspar;":                    '\U00002226',
-	"nsqsube;":                  '\U000022E2',
-	"nsqsupe;":                  '\U000022E3',
-	"nsub;":                     '\U00002284',
-	"nsube;":                    '\U00002288',
-	"nsubseteq;":                '\U00002288',
-	"nsucc;":                    '\U00002281',
-	"nsup;":                     '\U00002285',
-	"nsupe;":                    '\U00002289',
-	"nsupseteq;":                '\U00002289',
-	"ntgl;":                     '\U00002279',
-	"ntilde;":                   '\U000000F1',
-	"ntlg;":                     '\U00002278',
-	"ntriangleleft;":            '\U000022EA',
-	"ntrianglelefteq;":          '\U000022EC',
-	"ntriangleright;":           '\U000022EB',
-	"ntrianglerighteq;":         '\U000022ED',
-	"nu;":                       '\U000003BD',
-	"num;":                      '\U00000023',
-	"numero;":                   '\U00002116',
-	"numsp;":                    '\U00002007',
-	"nvDash;":                   '\U000022AD',
-	"nvHarr;":                   '\U00002904',
-	"nvdash;":                   '\U000022AC',
-	"nvinfin;":                  '\U000029DE',
-	"nvlArr;":                   '\U00002902',
-	"nvrArr;":                   '\U00002903',
-	"nwArr;":                    '\U000021D6',
-	"nwarhk;":                   '\U00002923',
-	"nwarr;":                    '\U00002196',
-	"nwarrow;":                  '\U00002196',
-	"nwnear;":                   '\U00002927',
-	"oS;":                       '\U000024C8',
-	"oacute;":                   '\U000000F3',
-	"oast;":                     '\U0000229B',
-	"ocir;":                     '\U0000229A',
-	"ocirc;":                    '\U000000F4',
-	"ocy;":                      '\U0000043E',
-	"odash;":                    '\U0000229D',
-	"odblac;":                   '\U00000151',
-	"odiv;":                     '\U00002A38',
-	"odot;":                     '\U00002299',
-	"odsold;":                   '\U000029BC',
-	"oelig;":                    '\U00000153',
-	"ofcir;":                    '\U000029BF',
-	"ofr;":                      '\U0001D52C',
-	"ogon;":                     '\U000002DB',
-	"ograve;":                   '\U000000F2',
-	"ogt;":                      '\U000029C1',
-	"ohbar;":                    '\U000029B5',
-	"ohm;":                      '\U000003A9',
-	"oint;":                     '\U0000222E',
-	"olarr;":                    '\U000021BA',
-	"olcir;":                    '\U000029BE',
-	"olcross;":                  '\U000029BB',
-	"oline;":                    '\U0000203E',
-	"olt;":                      '\U000029C0',
-	"omacr;":                    '\U0000014D',
-	"omega;":                    '\U000003C9',
-	"omicron;":                  '\U000003BF',
-	"omid;":                     '\U000029B6',
-	"ominus;":                   '\U00002296',
-	"oopf;":                     '\U0001D560',
-	"opar;":                     '\U000029B7',
-	"operp;":                    '\U000029B9',
-	"oplus;":                    '\U00002295',
-	"or;":                       '\U00002228',
-	"orarr;":                    '\U000021BB',
-	"ord;":                      '\U00002A5D',
-	"order;":                    '\U00002134',
-	"orderof;":                  '\U00002134',
-	"ordf;":                     '\U000000AA',
-	"ordm;":                     '\U000000BA',
-	"origof;":                   '\U000022B6',
-	"oror;":                     '\U00002A56',
-	"orslope;":                  '\U00002A57',
-	"orv;":                      '\U00002A5B',
-	"oscr;":                     '\U00002134',
-	"oslash;":                   '\U000000F8',
-	"osol;":                     '\U00002298',
-	"otilde;":                   '\U000000F5',
-	"otimes;":                   '\U00002297',
-	"otimesas;":                 '\U00002A36',
-	"ouml;":                     '\U000000F6',
-	"ovbar;":                    '\U0000233D',
-	"par;":                      '\U00002225',
-	"para;":                     '\U000000B6',
-	"parallel;":                 '\U00002225',
-	"parsim;":                   '\U00002AF3',
-	"parsl;":                    '\U00002AFD',
-	"part;":                     '\U00002202',
-	"pcy;":                      '\U0000043F',
-	"percnt;":                   '\U00000025',
-	"period;":                   '\U0000002E',
-	"permil;":                   '\U00002030',
-	"perp;":                     '\U000022A5',
-	"pertenk;":                  '\U00002031',
-	"pfr;":                      '\U0001D52D',
-	"phi;":                      '\U000003C6',
-	"phiv;":                     '\U000003D5',
-	"phmmat;":                   '\U00002133',
-	"phone;":                    '\U0000260E',
-	"pi;":                       '\U000003C0',
-	"pitchfork;":                '\U000022D4',
-	"piv;":                      '\U000003D6',
-	"planck;":                   '\U0000210F',
-	"planckh;":                  '\U0000210E',
-	"plankv;":                   '\U0000210F',
-	"plus;":                     '\U0000002B',
-	"plusacir;":                 '\U00002A23',
-	"plusb;":                    '\U0000229E',
-	"pluscir;":                  '\U00002A22',
-	"plusdo;":                   '\U00002214',
-	"plusdu;":                   '\U00002A25',
-	"pluse;":                    '\U00002A72',
-	"plusmn;":                   '\U000000B1',
-	"plussim;":                  '\U00002A26',
-	"plustwo;":                  '\U00002A27',
-	"pm;":                       '\U000000B1',
-	"pointint;":                 '\U00002A15',
-	"popf;":                     '\U0001D561',
-	"pound;":                    '\U000000A3',
-	"pr;":                       '\U0000227A',
-	"prE;":                      '\U00002AB3',
-	"prap;":                     '\U00002AB7',
-	"prcue;":                    '\U0000227C',
-	"pre;":                      '\U00002AAF',
-	"prec;":                     '\U0000227A',
-	"precapprox;":               '\U00002AB7',
-	"preccurlyeq;":              '\U0000227C',
-	"preceq;":                   '\U00002AAF',
-	"precnapprox;":              '\U00002AB9',
-	"precneqq;":                 '\U00002AB5',
-	"precnsim;":                 '\U000022E8',
-	"precsim;":                  '\U0000227E',
-	"prime;":                    '\U00002032',
-	"primes;":                   '\U00002119',
-	"prnE;":                     '\U00002AB5',
-	"prnap;":                    '\U00002AB9',
-	"prnsim;":                   '\U000022E8',
-	"prod;":                     '\U0000220F',
-	"profalar;":                 '\U0000232E',
-	"profline;":                 '\U00002312',
-	"profsurf;":                 '\U00002313',
-	"prop;":                     '\U0000221D',
-	"propto;":                   '\U0000221D',
-	"prsim;":                    '\U0000227E',
-	"prurel;":                   '\U000022B0',
-	"pscr;":                     '\U0001D4C5',
-	"psi;":                      '\U000003C8',
-	"puncsp;":                   '\U00002008',
-	"qfr;":                      '\U0001D52E',
-	"qint;":                     '\U00002A0C',
-	"qopf;":                     '\U0001D562',
-	"qprime;":                   '\U00002057',
-	"qscr;":                     '\U0001D4C6',
-	"quaternions;":              '\U0000210D',
-	"quatint;":                  '\U00002A16',
-	"quest;":                    '\U0000003F',
-	"questeq;":                  '\U0000225F',
-	"quot;":                     '\U00000022',
-	"rAarr;":                    '\U000021DB',
-	"rArr;":                     '\U000021D2',
-	"rAtail;":                   '\U0000291C',
-	"rBarr;":                    '\U0000290F',
-	"rHar;":                     '\U00002964',
-	"racute;":                   '\U00000155',
-	"radic;":                    '\U0000221A',
-	"raemptyv;":                 '\U000029B3',
-	"rang;":                     '\U000027E9',
-	"rangd;":                    '\U00002992',
-	"range;":                    '\U000029A5',
-	"rangle;":                   '\U000027E9',
-	"raquo;":                    '\U000000BB',
-	"rarr;":                     '\U00002192',
-	"rarrap;":                   '\U00002975',
-	"rarrb;":                    '\U000021E5',
-	"rarrbfs;":                  '\U00002920',
-	"rarrc;":                    '\U00002933',
-	"rarrfs;":                   '\U0000291E',
-	"rarrhk;":                   '\U000021AA',
-	"rarrlp;":                   '\U000021AC',
-	"rarrpl;":                   '\U00002945',
-	"rarrsim;":                  '\U00002974',
-	"rarrtl;":                   '\U000021A3',
-	"rarrw;":                    '\U0000219D',
-	"ratail;":                   '\U0000291A',
-	"ratio;":                    '\U00002236',
-	"rationals;":                '\U0000211A',
-	"rbarr;":                    '\U0000290D',
-	"rbbrk;":                    '\U00002773',
-	"rbrace;":                   '\U0000007D',
-	"rbrack;":                   '\U0000005D',
-	"rbrke;":                    '\U0000298C',
-	"rbrksld;":                  '\U0000298E',
-	"rbrkslu;":                  '\U00002990',
-	"rcaron;":                   '\U00000159',
-	"rcedil;":                   '\U00000157',
-	"rceil;":                    '\U00002309',
-	"rcub;":                     '\U0000007D',
-	"rcy;":                      '\U00000440',
-	"rdca;":                     '\U00002937',
-	"rdldhar;":                  '\U00002969',
-	"rdquo;":                    '\U0000201D',
-	"rdquor;":                   '\U0000201D',
-	"rdsh;":                     '\U000021B3',
-	"real;":                     '\U0000211C',
-	"realine;":                  '\U0000211B',
-	"realpart;":                 '\U0000211C',
-	"reals;":                    '\U0000211D',
-	"rect;":                     '\U000025AD',
-	"reg;":                      '\U000000AE',
-	"rfisht;":                   '\U0000297D',
-	"rfloor;":                   '\U0000230B',
-	"rfr;":                      '\U0001D52F',
-	"rhard;":                    '\U000021C1',
-	"rharu;":                    '\U000021C0',
-	"rharul;":                   '\U0000296C',
-	"rho;":                      '\U000003C1',
-	"rhov;":                     '\U000003F1',
-	"rightarrow;":               '\U00002192',
-	"rightarrowtail;":           '\U000021A3',
-	"rightharpoondown;":         '\U000021C1',
-	"rightharpoonup;":           '\U000021C0',
-	"rightleftarrows;":          '\U000021C4',
-	"rightleftharpoons;":        '\U000021CC',
-	"rightrightarrows;":         '\U000021C9',
-	"rightsquigarrow;":          '\U0000219D',
-	"rightthreetimes;":          '\U000022CC',
-	"ring;":                     '\U000002DA',
-	"risingdotseq;":             '\U00002253',
-	"rlarr;":                    '\U000021C4',
-	"rlhar;":                    '\U000021CC',
-	"rlm;":                      '\U0000200F',
-	"rmoust;":                   '\U000023B1',
-	"rmoustache;":               '\U000023B1',
-	"rnmid;":                    '\U00002AEE',
-	"roang;":                    '\U000027ED',
-	"roarr;":                    '\U000021FE',
-	"robrk;":                    '\U000027E7',
-	"ropar;":                    '\U00002986',
-	"ropf;":                     '\U0001D563',
-	"roplus;":                   '\U00002A2E',
-	"rotimes;":                  '\U00002A35',
-	"rpar;":                     '\U00000029',
-	"rpargt;":                   '\U00002994',
-	"rppolint;":                 '\U00002A12',
-	"rrarr;":                    '\U000021C9',
-	"rsaquo;":                   '\U0000203A',
-	"rscr;":                     '\U0001D4C7',
-	"rsh;":                      '\U000021B1',
-	"rsqb;":                     '\U0000005D',
-	"rsquo;":                    '\U00002019',
-	"rsquor;":                   '\U00002019',
-	"rthree;":                   '\U000022CC',
-	"rtimes;":                   '\U000022CA',
-	"rtri;":                     '\U000025B9',
-	"rtrie;":                    '\U000022B5',
-	"rtrif;":                    '\U000025B8',
-	"rtriltri;":                 '\U000029CE',
-	"ruluhar;":                  '\U00002968',
-	"rx;":                       '\U0000211E',
-	"sacute;":                   '\U0000015B',
-	"sbquo;":                    '\U0000201A',
-	"sc;":                       '\U0000227B',
-	"scE;":                      '\U00002AB4',
-	"scap;":                     '\U00002AB8',
-	"scaron;":                   '\U00000161',
-	"sccue;":                    '\U0000227D',
-	"sce;":                      '\U00002AB0',
-	"scedil;":                   '\U0000015F',
-	"scirc;":                    '\U0000015D',
-	"scnE;":                     '\U00002AB6',
-	"scnap;":                    '\U00002ABA',
-	"scnsim;":                   '\U000022E9',
-	"scpolint;":                 '\U00002A13',
-	"scsim;":                    '\U0000227F',
-	"scy;":                      '\U00000441',
-	"sdot;":                     '\U000022C5',
-	"sdotb;":                    '\U000022A1',
-	"sdote;":                    '\U00002A66',
-	"seArr;":                    '\U000021D8',
-	"searhk;":                   '\U00002925',
-	"searr;":                    '\U00002198',
-	"searrow;":                  '\U00002198',
-	"sect;":                     '\U000000A7',
-	"semi;":                     '\U0000003B',
-	"seswar;":                   '\U00002929',
-	"setminus;":                 '\U00002216',
-	"setmn;":                    '\U00002216',
-	"sext;":                     '\U00002736',
-	"sfr;":                      '\U0001D530',
-	"sfrown;":                   '\U00002322',
-	"sharp;":                    '\U0000266F',
-	"shchcy;":                   '\U00000449',
-	"shcy;":                     '\U00000448',
-	"shortmid;":                 '\U00002223',
-	"shortparallel;":            '\U00002225',
-	"shy;":                      '\U000000AD',
-	"sigma;":                    '\U000003C3',
-	"sigmaf;":                   '\U000003C2',
-	"sigmav;":                   '\U000003C2',
-	"sim;":                      '\U0000223C',
-	"simdot;":                   '\U00002A6A',
-	"sime;":                     '\U00002243',
-	"simeq;":                    '\U00002243',
-	"simg;":                     '\U00002A9E',
-	"simgE;":                    '\U00002AA0',
-	"siml;":                     '\U00002A9D',
-	"simlE;":                    '\U00002A9F',
-	"simne;":                    '\U00002246',
-	"simplus;":                  '\U00002A24',
-	"simrarr;":                  '\U00002972',
-	"slarr;":                    '\U00002190',
-	"smallsetminus;":            '\U00002216',
-	"smashp;":                   '\U00002A33',
-	"smeparsl;":                 '\U000029E4',
-	"smid;":                     '\U00002223',
-	"smile;":                    '\U00002323',
-	"smt;":                      '\U00002AAA',
-	"smte;":                     '\U00002AAC',
-	"softcy;":                   '\U0000044C',
-	"sol;":                      '\U0000002F',
-	"solb;":                     '\U000029C4',
-	"solbar;":                   '\U0000233F',
-	"sopf;":                     '\U0001D564',
-	"spades;":                   '\U00002660',
-	"spadesuit;":                '\U00002660',
-	"spar;":                     '\U00002225',
-	"sqcap;":                    '\U00002293',
-	"sqcup;":                    '\U00002294',
-	"sqsub;":                    '\U0000228F',
-	"sqsube;":                   '\U00002291',
-	"sqsubset;":                 '\U0000228F',
-	"sqsubseteq;":               '\U00002291',
-	"sqsup;":                    '\U00002290',
-	"sqsupe;":                   '\U00002292',
-	"sqsupset;":                 '\U00002290',
-	"sqsupseteq;":               '\U00002292',
-	"squ;":                      '\U000025A1',
-	"square;":                   '\U000025A1',
-	"squarf;":                   '\U000025AA',
-	"squf;":                     '\U000025AA',
-	"srarr;":                    '\U00002192',
-	"sscr;":                     '\U0001D4C8',
-	"ssetmn;":                   '\U00002216',
-	"ssmile;":                   '\U00002323',
-	"sstarf;":                   '\U000022C6',
-	"star;":                     '\U00002606',
-	"starf;":                    '\U00002605',
-	"straightepsilon;":          '\U000003F5',
-	"straightphi;":              '\U000003D5',
-	"strns;":                    '\U000000AF',
-	"sub;":                      '\U00002282',
-	"subE;":                     '\U00002AC5',
-	"subdot;":                   '\U00002ABD',
-	"sube;":                     '\U00002286',
-	"subedot;":                  '\U00002AC3',
-	"submult;":                  '\U00002AC1',
-	"subnE;":                    '\U00002ACB',
-	"subne;":                    '\U0000228A',
-	"subplus;":                  '\U00002ABF',
-	"subrarr;":                  '\U00002979',
-	"subset;":                   '\U00002282',
-	"subseteq;":                 '\U00002286',
-	"subseteqq;":                '\U00002AC5',
-	"subsetneq;":                '\U0000228A',
-	"subsetneqq;":               '\U00002ACB',
-	"subsim;":                   '\U00002AC7',
-	"subsub;":                   '\U00002AD5',
-	"subsup;":                   '\U00002AD3',
-	"succ;":                     '\U0000227B',
-	"succapprox;":               '\U00002AB8',
-	"succcurlyeq;":              '\U0000227D',
-	"succeq;":                   '\U00002AB0',
-	"succnapprox;":              '\U00002ABA',
-	"succneqq;":                 '\U00002AB6',
-	"succnsim;":                 '\U000022E9',
-	"succsim;":                  '\U0000227F',
-	"sum;":                      '\U00002211',
-	"sung;":                     '\U0000266A',
-	"sup;":                      '\U00002283',
-	"sup1;":                     '\U000000B9',
-	"sup2;":                     '\U000000B2',
-	"sup3;":                     '\U000000B3',
-	"supE;":                     '\U00002AC6',
-	"supdot;":                   '\U00002ABE',
-	"supdsub;":                  '\U00002AD8',
-	"supe;":                     '\U00002287',
-	"supedot;":                  '\U00002AC4',
-	"suphsol;":                  '\U000027C9',
-	"suphsub;":                  '\U00002AD7',
-	"suplarr;":                  '\U0000297B',
-	"supmult;":                  '\U00002AC2',
-	"supnE;":                    '\U00002ACC',
-	"supne;":                    '\U0000228B',
-	"supplus;":                  '\U00002AC0',
-	"supset;":                   '\U00002283',
-	"supseteq;":                 '\U00002287',
-	"supseteqq;":                '\U00002AC6',
-	"supsetneq;":                '\U0000228B',
-	"supsetneqq;":               '\U00002ACC',
-	"supsim;":                   '\U00002AC8',
-	"supsub;":                   '\U00002AD4',
-	"supsup;":                   '\U00002AD6',
-	"swArr;":                    '\U000021D9',
-	"swarhk;":                   '\U00002926',
-	"swarr;":                    '\U00002199',
-	"swarrow;":                  '\U00002199',
-	"swnwar;":                   '\U0000292A',
-	"szlig;":                    '\U000000DF',
-	"target;":                   '\U00002316',
-	"tau;":                      '\U000003C4',
-	"tbrk;":                     '\U000023B4',
-	"tcaron;":                   '\U00000165',
-	"tcedil;":                   '\U00000163',
-	"tcy;":                      '\U00000442',
-	"tdot;":                     '\U000020DB',
-	"telrec;":                   '\U00002315',
-	"tfr;":                      '\U0001D531',
-	"there4;":                   '\U00002234',
-	"therefore;":                '\U00002234',
-	"theta;":                    '\U000003B8',
-	"thetasym;":                 '\U000003D1',
-	"thetav;":                   '\U000003D1',
-	"thickapprox;":              '\U00002248',
-	"thicksim;":                 '\U0000223C',
-	"thinsp;":                   '\U00002009',
-	"thkap;":                    '\U00002248',
-	"thksim;":                   '\U0000223C',
-	"thorn;":                    '\U000000FE',
-	"tilde;":                    '\U000002DC',
-	"times;":                    '\U000000D7',
-	"timesb;":                   '\U000022A0',
-	"timesbar;":                 '\U00002A31',
-	"timesd;":                   '\U00002A30',
-	"tint;":                     '\U0000222D',
-	"toea;":                     '\U00002928',
-	"top;":                      '\U000022A4',
-	"topbot;":                   '\U00002336',
-	"topcir;":                   '\U00002AF1',
-	"topf;":                     '\U0001D565',
-	"topfork;":                  '\U00002ADA',
-	"tosa;":                     '\U00002929',
-	"tprime;":                   '\U00002034',
-	"trade;":                    '\U00002122',
-	"triangle;":                 '\U000025B5',
-	"triangledown;":             '\U000025BF',
-	"triangleleft;":             '\U000025C3',
-	"trianglelefteq;":           '\U000022B4',
-	"triangleq;":                '\U0000225C',
-	"triangleright;":            '\U000025B9',
-	"trianglerighteq;":          '\U000022B5',
-	"tridot;":                   '\U000025EC',
-	"trie;":                     '\U0000225C',
-	"triminus;":                 '\U00002A3A',
-	"triplus;":                  '\U00002A39',
-	"trisb;":                    '\U000029CD',
-	"tritime;":                  '\U00002A3B',
-	"trpezium;":                 '\U000023E2',
-	"tscr;":                     '\U0001D4C9',
-	"tscy;":                     '\U00000446',
-	"tshcy;":                    '\U0000045B',
-	"tstrok;":                   '\U00000167',
-	"twixt;":                    '\U0000226C',
-	"twoheadleftarrow;":         '\U0000219E',
-	"twoheadrightarrow;":        '\U000021A0',
-	"uArr;":                     '\U000021D1',
-	"uHar;":                     '\U00002963',
-	"uacute;":                   '\U000000FA',
-	"uarr;":                     '\U00002191',
-	"ubrcy;":                    '\U0000045E',
-	"ubreve;":                   '\U0000016D',
-	"ucirc;":                    '\U000000FB',
-	"ucy;":                      '\U00000443',
-	"udarr;":                    '\U000021C5',
-	"udblac;":                   '\U00000171',
-	"udhar;":                    '\U0000296E',
-	"ufisht;":                   '\U0000297E',
-	"ufr;":                      '\U0001D532',
-	"ugrave;":                   '\U000000F9',
-	"uharl;":                    '\U000021BF',
-	"uharr;":                    '\U000021BE',
-	"uhblk;":                    '\U00002580',
-	"ulcorn;":                   '\U0000231C',
-	"ulcorner;":                 '\U0000231C',
-	"ulcrop;":                   '\U0000230F',
-	"ultri;":                    '\U000025F8',
-	"umacr;":                    '\U0000016B',
-	"uml;":                      '\U000000A8',
-	"uogon;":                    '\U00000173',
-	"uopf;":                     '\U0001D566',
-	"uparrow;":                  '\U00002191',
-	"updownarrow;":              '\U00002195',
-	"upharpoonleft;":            '\U000021BF',
-	"upharpoonright;":           '\U000021BE',
-	"uplus;":                    '\U0000228E',
-	"upsi;":                     '\U000003C5',
-	"upsih;":                    '\U000003D2',
-	"upsilon;":                  '\U000003C5',
-	"upuparrows;":               '\U000021C8',
-	"urcorn;":                   '\U0000231D',
-	"urcorner;":                 '\U0000231D',
-	"urcrop;":                   '\U0000230E',
-	"uring;":                    '\U0000016F',
-	"urtri;":                    '\U000025F9',
-	"uscr;":                     '\U0001D4CA',
-	"utdot;":                    '\U000022F0',
-	"utilde;":                   '\U00000169',
-	"utri;":                     '\U000025B5',
-	"utrif;":                    '\U000025B4',
-	"uuarr;":                    '\U000021C8',
-	"uuml;":                     '\U000000FC',
-	"uwangle;":                  '\U000029A7',
-	"vArr;":                     '\U000021D5',
-	"vBar;":                     '\U00002AE8',
-	"vBarv;":                    '\U00002AE9',
-	"vDash;":                    '\U000022A8',
-	"vangrt;":                   '\U0000299C',
-	"varepsilon;":               '\U000003F5',
-	"varkappa;":                 '\U000003F0',
-	"varnothing;":               '\U00002205',
-	"varphi;":                   '\U000003D5',
-	"varpi;":                    '\U000003D6',
-	"varpropto;":                '\U0000221D',
-	"varr;":                     '\U00002195',
-	"varrho;":                   '\U000003F1',
-	"varsigma;":                 '\U000003C2',
-	"vartheta;":                 '\U000003D1',
-	"vartriangleleft;":          '\U000022B2',
-	"vartriangleright;":         '\U000022B3',
-	"vcy;":                      '\U00000432',
-	"vdash;":                    '\U000022A2',
-	"vee;":                      '\U00002228',
-	"veebar;":                   '\U000022BB',
-	"veeeq;":                    '\U0000225A',
-	"vellip;":                   '\U000022EE',
-	"verbar;":                   '\U0000007C',
-	"vert;":                     '\U0000007C',
-	"vfr;":                      '\U0001D533',
-	"vltri;":                    '\U000022B2',
-	"vopf;":                     '\U0001D567',
-	"vprop;":                    '\U0000221D',
-	"vrtri;":                    '\U000022B3',
-	"vscr;":                     '\U0001D4CB',
-	"vzigzag;":                  '\U0000299A',
-	"wcirc;":                    '\U00000175',
-	"wedbar;":                   '\U00002A5F',
-	"wedge;":                    '\U00002227',
-	"wedgeq;":                   '\U00002259',
-	"weierp;":                   '\U00002118',
-	"wfr;":                      '\U0001D534',
-	"wopf;":                     '\U0001D568',
-	"wp;":                       '\U00002118',
-	"wr;":                       '\U00002240',
-	"wreath;":                   '\U00002240',
-	"wscr;":                     '\U0001D4CC',
-	"xcap;":                     '\U000022C2',
-	"xcirc;":                    '\U000025EF',
-	"xcup;":                     '\U000022C3',
-	"xdtri;":                    '\U000025BD',
-	"xfr;":                      '\U0001D535',
-	"xhArr;":                    '\U000027FA',
-	"xharr;":                    '\U000027F7',
-	"xi;":                       '\U000003BE',
-	"xlArr;":                    '\U000027F8',
-	"xlarr;":                    '\U000027F5',
-	"xmap;":                     '\U000027FC',
-	"xnis;":                     '\U000022FB',
-	"xodot;":                    '\U00002A00',
-	"xopf;":                     '\U0001D569',
-	"xoplus;":                   '\U00002A01',
-	"xotime;":                   '\U00002A02',
-	"xrArr;":                    '\U000027F9',
-	"xrarr;":                    '\U000027F6',
-	"xscr;":                     '\U0001D4CD',
-	"xsqcup;":                   '\U00002A06',
-	"xuplus;":                   '\U00002A04',
-	"xutri;":                    '\U000025B3',
-	"xvee;":                     '\U000022C1',
-	"xwedge;":                   '\U000022C0',
-	"yacute;":                   '\U000000FD',
-	"yacy;":                     '\U0000044F',
-	"ycirc;":                    '\U00000177',
-	"ycy;":                      '\U0000044B',
-	"yen;":                      '\U000000A5',
-	"yfr;":                      '\U0001D536',
-	"yicy;":                     '\U00000457',
-	"yopf;":                     '\U0001D56A',
-	"yscr;":                     '\U0001D4CE',
-	"yucy;":                     '\U0000044E',
-	"yuml;":                     '\U000000FF',
-	"zacute;":                   '\U0000017A',
-	"zcaron;":                   '\U0000017E',
-	"zcy;":                      '\U00000437',
-	"zdot;":                     '\U0000017C',
-	"zeetrf;":                   '\U00002128',
-	"zeta;":                     '\U000003B6',
-	"zfr;":                      '\U0001D537',
-	"zhcy;":                     '\U00000436',
-	"zigrarr;":                  '\U000021DD',
-	"zopf;":                     '\U0001D56B',
-	"zscr;":                     '\U0001D4CF',
-	"zwj;":                      '\U0000200D',
-	"zwnj;":                     '\U0000200C',
-	"AElig":                     '\U000000C6',
-	"AMP":                       '\U00000026',
-	"Aacute":                    '\U000000C1',
-	"Acirc":                     '\U000000C2',
-	"Agrave":                    '\U000000C0',
-	"Aring":                     '\U000000C5',
-	"Atilde":                    '\U000000C3',
-	"Auml":                      '\U000000C4',
-	"COPY":                      '\U000000A9',
-	"Ccedil":                    '\U000000C7',
-	"ETH":                       '\U000000D0',
-	"Eacute":                    '\U000000C9',
-	"Ecirc":                     '\U000000CA',
-	"Egrave":                    '\U000000C8',
-	"Euml":                      '\U000000CB',
-	"GT":                        '\U0000003E',
-	"Iacute":                    '\U000000CD',
-	"Icirc":                     '\U000000CE',
-	"Igrave":                    '\U000000CC',
-	"Iuml":                      '\U000000CF',
-	"LT":                        '\U0000003C',
-	"Ntilde":                    '\U000000D1',
-	"Oacute":                    '\U000000D3',
-	"Ocirc":                     '\U000000D4',
-	"Ograve":                    '\U000000D2',
-	"Oslash":                    '\U000000D8',
-	"Otilde":                    '\U000000D5',
-	"Ouml":                      '\U000000D6',
-	"QUOT":                      '\U00000022',
-	"REG":                       '\U000000AE',
-	"THORN":                     '\U000000DE',
-	"Uacute":                    '\U000000DA',
-	"Ucirc":                     '\U000000DB',
-	"Ugrave":                    '\U000000D9',
-	"Uuml":                      '\U000000DC',
-	"Yacute":                    '\U000000DD',
-	"aacute":                    '\U000000E1',
-	"acirc":                     '\U000000E2',
-	"acute":                     '\U000000B4',
-	"aelig":                     '\U000000E6',
-	"agrave":                    '\U000000E0',
-	"amp":                       '\U00000026',
-	"aring":                     '\U000000E5',
-	"atilde":                    '\U000000E3',
-	"auml":                      '\U000000E4',
-	"brvbar":                    '\U000000A6',
-	"ccedil":                    '\U000000E7',
-	"cedil":                     '\U000000B8',
-	"cent":                      '\U000000A2',
-	"copy":                      '\U000000A9',
-	"curren":                    '\U000000A4',
-	"deg":                       '\U000000B0',
-	"divide":                    '\U000000F7',
-	"eacute":                    '\U000000E9',
-	"ecirc":                     '\U000000EA',
-	"egrave":                    '\U000000E8',
-	"eth":                       '\U000000F0',
-	"euml":                      '\U000000EB',
-	"frac12":                    '\U000000BD',
-	"frac14":                    '\U000000BC',
-	"frac34":                    '\U000000BE',
-	"gt":                        '\U0000003E',
-	"iacute":                    '\U000000ED',
-	"icirc":                     '\U000000EE',
-	"iexcl":                     '\U000000A1',
-	"igrave":                    '\U000000EC',
-	"iquest":                    '\U000000BF',
-	"iuml":                      '\U000000EF',
-	"laquo":                     '\U000000AB',
-	"lt":                        '\U0000003C',
-	"macr":                      '\U000000AF',
-	"micro":                     '\U000000B5',
-	"middot":                    '\U000000B7',
-	"nbsp":                      '\U000000A0',
-	"not":                       '\U000000AC',
-	"ntilde":                    '\U000000F1',
-	"oacute":                    '\U000000F3',
-	"ocirc":                     '\U000000F4',
-	"ograve":                    '\U000000F2',
-	"ordf":                      '\U000000AA',
-	"ordm":                      '\U000000BA',
-	"oslash":                    '\U000000F8',
-	"otilde":                    '\U000000F5',
-	"ouml":                      '\U000000F6',
-	"para":                      '\U000000B6',
-	"plusmn":                    '\U000000B1',
-	"pound":                     '\U000000A3',
-	"quot":                      '\U00000022',
-	"raquo":                     '\U000000BB',
-	"reg":                       '\U000000AE',
-	"sect":                      '\U000000A7',
-	"shy":                       '\U000000AD',
-	"sup1":                      '\U000000B9',
-	"sup2":                      '\U000000B2',
-	"sup3":                      '\U000000B3',
-	"szlig":                     '\U000000DF',
-	"thorn":                     '\U000000FE',
-	"times":                     '\U000000D7',
-	"uacute":                    '\U000000FA',
-	"ucirc":                     '\U000000FB',
-	"ugrave":                    '\U000000F9',
-	"uml":                       '\U000000A8',
-	"uuml":                      '\U000000FC',
-	"yacute":                    '\U000000FD',
-	"yen":                       '\U000000A5',
-	"yuml":                      '\U000000FF',
-}
-
-// HTML entities that are two unicode codepoints.
-var entity2 = map[string][2]rune{
-	// TODO(nigeltao): Handle replacements that are wider than their names.
-	// "nLt;":                     {'\u226A', '\u20D2'},
-	// "nGt;":                     {'\u226B', '\u20D2'},
-	"NotEqualTilde;":           {'\u2242', '\u0338'},
-	"NotGreaterFullEqual;":     {'\u2267', '\u0338'},
-	"NotGreaterGreater;":       {'\u226B', '\u0338'},
-	"NotGreaterSlantEqual;":    {'\u2A7E', '\u0338'},
-	"NotHumpDownHump;":         {'\u224E', '\u0338'},
-	"NotHumpEqual;":            {'\u224F', '\u0338'},
-	"NotLeftTriangleBar;":      {'\u29CF', '\u0338'},
-	"NotLessLess;":             {'\u226A', '\u0338'},
-	"NotLessSlantEqual;":       {'\u2A7D', '\u0338'},
-	"NotNestedGreaterGreater;": {'\u2AA2', '\u0338'},
-	"NotNestedLessLess;":       {'\u2AA1', '\u0338'},
-	"NotPrecedesEqual;":        {'\u2AAF', '\u0338'},
-	"NotRightTriangleBar;":     {'\u29D0', '\u0338'},
-	"NotSquareSubset;":         {'\u228F', '\u0338'},
-	"NotSquareSuperset;":       {'\u2290', '\u0338'},
-	"NotSubset;":               {'\u2282', '\u20D2'},
-	"NotSucceedsEqual;":        {'\u2AB0', '\u0338'},
-	"NotSucceedsTilde;":        {'\u227F', '\u0338'},
-	"NotSuperset;":             {'\u2283', '\u20D2'},
-	"ThickSpace;":              {'\u205F', '\u200A'},
-	"acE;":                     {'\u223E', '\u0333'},
-	"bne;":                     {'\u003D', '\u20E5'},
-	"bnequiv;":                 {'\u2261', '\u20E5'},
-	"caps;":                    {'\u2229', '\uFE00'},
-	"cups;":                    {'\u222A', '\uFE00'},
-	"fjlig;":                   {'\u0066', '\u006A'},
-	"gesl;":                    {'\u22DB', '\uFE00'},
-	"gvertneqq;":               {'\u2269', '\uFE00'},
-	"gvnE;":                    {'\u2269', '\uFE00'},
-	"lates;":                   {'\u2AAD', '\uFE00'},
-	"lesg;":                    {'\u22DA', '\uFE00'},
-	"lvertneqq;":               {'\u2268', '\uFE00'},
-	"lvnE;":                    {'\u2268', '\uFE00'},
-	"nGg;":                     {'\u22D9', '\u0338'},
-	"nGtv;":                    {'\u226B', '\u0338'},
-	"nLl;":                     {'\u22D8', '\u0338'},
-	"nLtv;":                    {'\u226A', '\u0338'},
-	"nang;":                    {'\u2220', '\u20D2'},
-	"napE;":                    {'\u2A70', '\u0338'},
-	"napid;":                   {'\u224B', '\u0338'},
-	"nbump;":                   {'\u224E', '\u0338'},
-	"nbumpe;":                  {'\u224F', '\u0338'},
-	"ncongdot;":                {'\u2A6D', '\u0338'},
-	"nedot;":                   {'\u2250', '\u0338'},
-	"nesim;":                   {'\u2242', '\u0338'},
-	"ngE;":                     {'\u2267', '\u0338'},
-	"ngeqq;":                   {'\u2267', '\u0338'},
-	"ngeqslant;":               {'\u2A7E', '\u0338'},
-	"nges;":                    {'\u2A7E', '\u0338'},
-	"nlE;":                     {'\u2266', '\u0338'},
-	"nleqq;":                   {'\u2266', '\u0338'},
-	"nleqslant;":               {'\u2A7D', '\u0338'},
-	"nles;":                    {'\u2A7D', '\u0338'},
-	"notinE;":                  {'\u22F9', '\u0338'},
-	"notindot;":                {'\u22F5', '\u0338'},
-	"nparsl;":                  {'\u2AFD', '\u20E5'},
-	"npart;":                   {'\u2202', '\u0338'},
-	"npre;":                    {'\u2AAF', '\u0338'},
-	"npreceq;":                 {'\u2AAF', '\u0338'},
-	"nrarrc;":                  {'\u2933', '\u0338'},
-	"nrarrw;":                  {'\u219D', '\u0338'},
-	"nsce;":                    {'\u2AB0', '\u0338'},
-	"nsubE;":                   {'\u2AC5', '\u0338'},
-	"nsubset;":                 {'\u2282', '\u20D2'},
-	"nsubseteqq;":              {'\u2AC5', '\u0338'},
-	"nsucceq;":                 {'\u2AB0', '\u0338'},
-	"nsupE;":                   {'\u2AC6', '\u0338'},
-	"nsupset;":                 {'\u2283', '\u20D2'},
-	"nsupseteqq;":              {'\u2AC6', '\u0338'},
-	"nvap;":                    {'\u224D', '\u20D2'},
-	"nvge;":                    {'\u2265', '\u20D2'},
-	"nvgt;":                    {'\u003E', '\u20D2'},
-	"nvle;":                    {'\u2264', '\u20D2'},
-	"nvlt;":                    {'\u003C', '\u20D2'},
-	"nvltrie;":                 {'\u22B4', '\u20D2'},
-	"nvrtrie;":                 {'\u22B5', '\u20D2'},
-	"nvsim;":                   {'\u223C', '\u20D2'},
-	"race;":                    {'\u223D', '\u0331'},
-	"smtes;":                   {'\u2AAC', '\uFE00'},
-	"sqcaps;":                  {'\u2293', '\uFE00'},
-	"sqcups;":                  {'\u2294', '\uFE00'},
-	"varsubsetneq;":            {'\u228A', '\uFE00'},
-	"varsubsetneqq;":           {'\u2ACB', '\uFE00'},
-	"varsupsetneq;":            {'\u228B', '\uFE00'},
-	"varsupsetneqq;":           {'\u2ACC', '\uFE00'},
-	"vnsub;":                   {'\u2282', '\u20D2'},
-	"vnsup;":                   {'\u2283', '\u20D2'},
-	"vsubnE;":                  {'\u2ACB', '\uFE00'},
-	"vsubne;":                  {'\u228A', '\uFE00'},
-	"vsupnE;":                  {'\u2ACC', '\uFE00'},
-	"vsupne;":                  {'\u228B', '\uFE00'},
-}
diff --git a/vendor/golang.org/x/net/html/escape.go b/vendor/golang.org/x/net/html/escape.go
deleted file mode 100644
index d856139620..0000000000
--- a/vendor/golang.org/x/net/html/escape.go
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"bytes"
-	"strings"
-	"unicode/utf8"
-)
-
-// These replacements permit compatibility with old numeric entities that
-// assumed Windows-1252 encoding.
-// https://html.spec.whatwg.org/multipage/syntax.html#consume-a-character-reference
-var replacementTable = [...]rune{
-	'\u20AC', // First entry is what 0x80 should be replaced with.
-	'\u0081',
-	'\u201A',
-	'\u0192',
-	'\u201E',
-	'\u2026',
-	'\u2020',
-	'\u2021',
-	'\u02C6',
-	'\u2030',
-	'\u0160',
-	'\u2039',
-	'\u0152',
-	'\u008D',
-	'\u017D',
-	'\u008F',
-	'\u0090',
-	'\u2018',
-	'\u2019',
-	'\u201C',
-	'\u201D',
-	'\u2022',
-	'\u2013',
-	'\u2014',
-	'\u02DC',
-	'\u2122',
-	'\u0161',
-	'\u203A',
-	'\u0153',
-	'\u009D',
-	'\u017E',
-	'\u0178', // Last entry is 0x9F.
-	// 0x00->'\uFFFD' is handled programmatically.
-	// 0x0D->'\u000D' is a no-op.
-}
-
-// unescapeEntity reads an entity like "&lt;" from b[src:] and writes the
-// corresponding "<" to b[dst:], returning the incremented dst and src cursors.
-// Precondition: b[src] == '&' && dst <= src.
-// attribute should be true if parsing an attribute value.
-func unescapeEntity(b []byte, dst, src int, attribute bool) (dst1, src1 int) {
-	// https://html.spec.whatwg.org/multipage/syntax.html#consume-a-character-reference
-
-	// i starts at 1 because we already know that s[0] == '&'.
-	i, s := 1, b[src:]
-
-	if len(s) <= 1 {
-		b[dst] = b[src]
-		return dst + 1, src + 1
-	}
-
-	if s[i] == '#' {
-		if len(s) <= 3 { // We need to have at least "&#.".
-			b[dst] = b[src]
-			return dst + 1, src + 1
-		}
-		i++
-		c := s[i]
-		hex := false
-		if c == 'x' || c == 'X' {
-			hex = true
-			i++
-		}
-
-		x := '\x00'
-		for i < len(s) {
-			c = s[i]
-			i++
-			if hex {
-				if '0' <= c && c <= '9' {
-					x = 16*x + rune(c) - '0'
-					continue
-				} else if 'a' <= c && c <= 'f' {
-					x = 16*x + rune(c) - 'a' + 10
-					continue
-				} else if 'A' <= c && c <= 'F' {
-					x = 16*x + rune(c) - 'A' + 10
-					continue
-				}
-			} else if '0' <= c && c <= '9' {
-				x = 10*x + rune(c) - '0'
-				continue
-			}
-			if c != ';' {
-				i--
-			}
-			break
-		}
-
-		if i <= 3 { // No characters matched.
-			b[dst] = b[src]
-			return dst + 1, src + 1
-		}
-
-		if 0x80 <= x && x <= 0x9F {
-			// Replace characters from Windows-1252 with UTF-8 equivalents.
-			x = replacementTable[x-0x80]
-		} else if x == 0 || (0xD800 <= x && x <= 0xDFFF) || x > 0x10FFFF {
-			// Replace invalid characters with the replacement character.
-			x = '\uFFFD'
-		}
-
-		return dst + utf8.EncodeRune(b[dst:], x), src + i
-	}
-
-	// Consume the maximum number of characters possible, with the
-	// consumed characters matching one of the named references.
-
-	for i < len(s) {
-		c := s[i]
-		i++
-		// Lower-cased characters are more common in entities, so we check for them first.
-		if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' {
-			continue
-		}
-		if c != ';' {
-			i--
-		}
-		break
-	}
-
-	entityName := string(s[1:i])
-	if entityName == "" {
-		// No-op.
-	} else if attribute && entityName[len(entityName)-1] != ';' && len(s) > i && s[i] == '=' {
-		// No-op.
-	} else if x := entity[entityName]; x != 0 {
-		return dst + utf8.EncodeRune(b[dst:], x), src + i
-	} else if x := entity2[entityName]; x[0] != 0 {
-		dst1 := dst + utf8.EncodeRune(b[dst:], x[0])
-		return dst1 + utf8.EncodeRune(b[dst1:], x[1]), src + i
-	} else if !attribute {
-		maxLen := len(entityName) - 1
-		if maxLen > longestEntityWithoutSemicolon {
-			maxLen = longestEntityWithoutSemicolon
-		}
-		for j := maxLen; j > 1; j-- {
-			if x := entity[entityName[:j]]; x != 0 {
-				return dst + utf8.EncodeRune(b[dst:], x), src + j + 1
-			}
-		}
-	}
-
-	dst1, src1 = dst+i, src+i
-	copy(b[dst:dst1], b[src:src1])
-	return dst1, src1
-}
-
-// unescape unescapes b's entities in-place, so that "a&lt;b" becomes "a<b".
-// attribute should be true if parsing an attribute value.
-func unescape(b []byte, attribute bool) []byte {
-	for i, c := range b {
-		if c == '&' {
-			dst, src := unescapeEntity(b, i, i, attribute)
-			for src < len(b) {
-				c := b[src]
-				if c == '&' {
-					dst, src = unescapeEntity(b, dst, src, attribute)
-				} else {
-					b[dst] = c
-					dst, src = dst+1, src+1
-				}
-			}
-			return b[0:dst]
-		}
-	}
-	return b
-}
-
-// lower lower-cases the A-Z bytes in b in-place, so that "aBc" becomes "abc".
-func lower(b []byte) []byte {
-	for i, c := range b {
-		if 'A' <= c && c <= 'Z' {
-			b[i] = c + 'a' - 'A'
-		}
-	}
-	return b
-}
-
-const escapedChars = "&'<>\"\r"
-
-func escape(w writer, s string) error {
-	i := strings.IndexAny(s, escapedChars)
-	for i != -1 {
-		if _, err := w.WriteString(s[:i]); err != nil {
-			return err
-		}
-		var esc string
-		switch s[i] {
-		case '&':
-			esc = "&amp;"
-		case '\'':
-			// "&#39;" is shorter than "&apos;" and apos was not in HTML until HTML5.
-			esc = "&#39;"
-		case '<':
-			esc = "&lt;"
-		case '>':
-			esc = "&gt;"
-		case '"':
-			// "&#34;" is shorter than "&quot;".
-			esc = "&#34;"
-		case '\r':
-			esc = "&#13;"
-		default:
-			panic("unrecognized escape character")
-		}
-		s = s[i+1:]
-		if _, err := w.WriteString(esc); err != nil {
-			return err
-		}
-		i = strings.IndexAny(s, escapedChars)
-	}
-	_, err := w.WriteString(s)
-	return err
-}
-
-// EscapeString escapes special characters like "<" to become "&lt;". It
-// escapes only five such characters: <, >, &, ' and ".
-// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
-// always true.
-func EscapeString(s string) string {
-	if strings.IndexAny(s, escapedChars) == -1 {
-		return s
-	}
-	var buf bytes.Buffer
-	escape(&buf, s)
-	return buf.String()
-}
-
-// UnescapeString unescapes entities like "&lt;" to become "<". It unescapes a
-// larger range of entities than EscapeString escapes. For example, "&aacute;"
-// unescapes to "á", as does "&#225;" and "&xE1;".
-// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
-// always true.
-func UnescapeString(s string) string {
-	for _, c := range s {
-		if c == '&' {
-			return string(unescape([]byte(s), false))
-		}
-	}
-	return s
-}
diff --git a/vendor/golang.org/x/net/html/foreign.go b/vendor/golang.org/x/net/html/foreign.go
deleted file mode 100644
index d3b3844099..0000000000
--- a/vendor/golang.org/x/net/html/foreign.go
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"strings"
-)
-
-func adjustAttributeNames(aa []Attribute, nameMap map[string]string) {
-	for i := range aa {
-		if newName, ok := nameMap[aa[i].Key]; ok {
-			aa[i].Key = newName
-		}
-	}
-}
-
-func adjustForeignAttributes(aa []Attribute) {
-	for i, a := range aa {
-		if a.Key == "" || a.Key[0] != 'x' {
-			continue
-		}
-		switch a.Key {
-		case "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show",
-			"xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "xmlns:xlink":
-			j := strings.Index(a.Key, ":")
-			aa[i].Namespace = a.Key[:j]
-			aa[i].Key = a.Key[j+1:]
-		}
-	}
-}
-
-func htmlIntegrationPoint(n *Node) bool {
-	if n.Type != ElementNode {
-		return false
-	}
-	switch n.Namespace {
-	case "math":
-		if n.Data == "annotation-xml" {
-			for _, a := range n.Attr {
-				if a.Key == "encoding" {
-					val := strings.ToLower(a.Val)
-					if val == "text/html" || val == "application/xhtml+xml" {
-						return true
-					}
-				}
-			}
-		}
-	case "svg":
-		switch n.Data {
-		case "desc", "foreignObject", "title":
-			return true
-		}
-	}
-	return false
-}
-
-func mathMLTextIntegrationPoint(n *Node) bool {
-	if n.Namespace != "math" {
-		return false
-	}
-	switch n.Data {
-	case "mi", "mo", "mn", "ms", "mtext":
-		return true
-	}
-	return false
-}
-
-// Section 12.2.5.5.
-var breakout = map[string]bool{
-	"b":          true,
-	"big":        true,
-	"blockquote": true,
-	"body":       true,
-	"br":         true,
-	"center":     true,
-	"code":       true,
-	"dd":         true,
-	"div":        true,
-	"dl":         true,
-	"dt":         true,
-	"em":         true,
-	"embed":      true,
-	"h1":         true,
-	"h2":         true,
-	"h3":         true,
-	"h4":         true,
-	"h5":         true,
-	"h6":         true,
-	"head":       true,
-	"hr":         true,
-	"i":          true,
-	"img":        true,
-	"li":         true,
-	"listing":    true,
-	"menu":       true,
-	"meta":       true,
-	"nobr":       true,
-	"ol":         true,
-	"p":          true,
-	"pre":        true,
-	"ruby":       true,
-	"s":          true,
-	"small":      true,
-	"span":       true,
-	"strong":     true,
-	"strike":     true,
-	"sub":        true,
-	"sup":        true,
-	"table":      true,
-	"tt":         true,
-	"u":          true,
-	"ul":         true,
-	"var":        true,
-}
-
-// Section 12.2.5.5.
-var svgTagNameAdjustments = map[string]string{
-	"altglyph":            "altGlyph",
-	"altglyphdef":         "altGlyphDef",
-	"altglyphitem":        "altGlyphItem",
-	"animatecolor":        "animateColor",
-	"animatemotion":       "animateMotion",
-	"animatetransform":    "animateTransform",
-	"clippath":            "clipPath",
-	"feblend":             "feBlend",
-	"fecolormatrix":       "feColorMatrix",
-	"fecomponenttransfer": "feComponentTransfer",
-	"fecomposite":         "feComposite",
-	"feconvolvematrix":    "feConvolveMatrix",
-	"fediffuselighting":   "feDiffuseLighting",
-	"fedisplacementmap":   "feDisplacementMap",
-	"fedistantlight":      "feDistantLight",
-	"feflood":             "feFlood",
-	"fefunca":             "feFuncA",
-	"fefuncb":             "feFuncB",
-	"fefuncg":             "feFuncG",
-	"fefuncr":             "feFuncR",
-	"fegaussianblur":      "feGaussianBlur",
-	"feimage":             "feImage",
-	"femerge":             "feMerge",
-	"femergenode":         "feMergeNode",
-	"femorphology":        "feMorphology",
-	"feoffset":            "feOffset",
-	"fepointlight":        "fePointLight",
-	"fespecularlighting":  "feSpecularLighting",
-	"fespotlight":         "feSpotLight",
-	"fetile":              "feTile",
-	"feturbulence":        "feTurbulence",
-	"foreignobject":       "foreignObject",
-	"glyphref":            "glyphRef",
-	"lineargradient":      "linearGradient",
-	"radialgradient":      "radialGradient",
-	"textpath":            "textPath",
-}
-
-// Section 12.2.5.1
-var mathMLAttributeAdjustments = map[string]string{
-	"definitionurl": "definitionURL",
-}
-
-var svgAttributeAdjustments = map[string]string{
-	"attributename":             "attributeName",
-	"attributetype":             "attributeType",
-	"basefrequency":             "baseFrequency",
-	"baseprofile":               "baseProfile",
-	"calcmode":                  "calcMode",
-	"clippathunits":             "clipPathUnits",
-	"contentscripttype":         "contentScriptType",
-	"contentstyletype":          "contentStyleType",
-	"diffuseconstant":           "diffuseConstant",
-	"edgemode":                  "edgeMode",
-	"externalresourcesrequired": "externalResourcesRequired",
-	"filterres":                 "filterRes",
-	"filterunits":               "filterUnits",
-	"glyphref":                  "glyphRef",
-	"gradienttransform":         "gradientTransform",
-	"gradientunits":             "gradientUnits",
-	"kernelmatrix":              "kernelMatrix",
-	"kernelunitlength":          "kernelUnitLength",
-	"keypoints":                 "keyPoints",
-	"keysplines":                "keySplines",
-	"keytimes":                  "keyTimes",
-	"lengthadjust":              "lengthAdjust",
-	"limitingconeangle":         "limitingConeAngle",
-	"markerheight":              "markerHeight",
-	"markerunits":               "markerUnits",
-	"markerwidth":               "markerWidth",
-	"maskcontentunits":          "maskContentUnits",
-	"maskunits":                 "maskUnits",
-	"numoctaves":                "numOctaves",
-	"pathlength":                "pathLength",
-	"patterncontentunits":       "patternContentUnits",
-	"patterntransform":          "patternTransform",
-	"patternunits":              "patternUnits",
-	"pointsatx":                 "pointsAtX",
-	"pointsaty":                 "pointsAtY",
-	"pointsatz":                 "pointsAtZ",
-	"preservealpha":             "preserveAlpha",
-	"preserveaspectratio":       "preserveAspectRatio",
-	"primitiveunits":            "primitiveUnits",
-	"refx":                      "refX",
-	"refy":                      "refY",
-	"repeatcount":               "repeatCount",
-	"repeatdur":                 "repeatDur",
-	"requiredextensions":        "requiredExtensions",
-	"requiredfeatures":          "requiredFeatures",
-	"specularconstant":          "specularConstant",
-	"specularexponent":          "specularExponent",
-	"spreadmethod":              "spreadMethod",
-	"startoffset":               "startOffset",
-	"stddeviation":              "stdDeviation",
-	"stitchtiles":               "stitchTiles",
-	"surfacescale":              "surfaceScale",
-	"systemlanguage":            "systemLanguage",
-	"tablevalues":               "tableValues",
-	"targetx":                   "targetX",
-	"targety":                   "targetY",
-	"textlength":                "textLength",
-	"viewbox":                   "viewBox",
-	"viewtarget":                "viewTarget",
-	"xchannelselector":          "xChannelSelector",
-	"ychannelselector":          "yChannelSelector",
-	"zoomandpan":                "zoomAndPan",
-}
diff --git a/vendor/golang.org/x/net/html/node.go b/vendor/golang.org/x/net/html/node.go
deleted file mode 100644
index 26b657aec8..0000000000
--- a/vendor/golang.org/x/net/html/node.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"golang.org/x/net/html/atom"
-)
-
-// A NodeType is the type of a Node.
-type NodeType uint32
-
-const (
-	ErrorNode NodeType = iota
-	TextNode
-	DocumentNode
-	ElementNode
-	CommentNode
-	DoctypeNode
-	scopeMarkerNode
-)
-
-// Section 12.2.3.3 says "scope markers are inserted when entering applet
-// elements, buttons, object elements, marquees, table cells, and table
-// captions, and are used to prevent formatting from 'leaking'".
-var scopeMarker = Node{Type: scopeMarkerNode}
-
-// A Node consists of a NodeType and some Data (tag name for element nodes,
-// content for text) and are part of a tree of Nodes. Element nodes may also
-// have a Namespace and contain a slice of Attributes. Data is unescaped, so
-// that it looks like "a<b" rather than "a&lt;b". For element nodes, DataAtom
-// is the atom for Data, or zero if Data is not a known tag name.
-//
-// An empty Namespace implies a "http://www.w3.org/1999/xhtml" namespace.
-// Similarly, "math" is short for "http://www.w3.org/1998/Math/MathML", and
-// "svg" is short for "http://www.w3.org/2000/svg".
-type Node struct {
-	Parent, FirstChild, LastChild, PrevSibling, NextSibling *Node
-
-	Type      NodeType
-	DataAtom  atom.Atom
-	Data      string
-	Namespace string
-	Attr      []Attribute
-}
-
-// InsertBefore inserts newChild as a child of n, immediately before oldChild
-// in the sequence of n's children. oldChild may be nil, in which case newChild
-// is appended to the end of n's children.
-//
-// It will panic if newChild already has a parent or siblings.
-func (n *Node) InsertBefore(newChild, oldChild *Node) {
-	if newChild.Parent != nil || newChild.PrevSibling != nil || newChild.NextSibling != nil {
-		panic("html: InsertBefore called for an attached child Node")
-	}
-	var prev, next *Node
-	if oldChild != nil {
-		prev, next = oldChild.PrevSibling, oldChild
-	} else {
-		prev = n.LastChild
-	}
-	if prev != nil {
-		prev.NextSibling = newChild
-	} else {
-		n.FirstChild = newChild
-	}
-	if next != nil {
-		next.PrevSibling = newChild
-	} else {
-		n.LastChild = newChild
-	}
-	newChild.Parent = n
-	newChild.PrevSibling = prev
-	newChild.NextSibling = next
-}
-
-// AppendChild adds a node c as a child of n.
-//
-// It will panic if c already has a parent or siblings.
-func (n *Node) AppendChild(c *Node) {
-	if c.Parent != nil || c.PrevSibling != nil || c.NextSibling != nil {
-		panic("html: AppendChild called for an attached child Node")
-	}
-	last := n.LastChild
-	if last != nil {
-		last.NextSibling = c
-	} else {
-		n.FirstChild = c
-	}
-	n.LastChild = c
-	c.Parent = n
-	c.PrevSibling = last
-}
-
-// RemoveChild removes a node c that is a child of n. Afterwards, c will have
-// no parent and no siblings.
-//
-// It will panic if c's parent is not n.
-func (n *Node) RemoveChild(c *Node) {
-	if c.Parent != n {
-		panic("html: RemoveChild called for a non-child Node")
-	}
-	if n.FirstChild == c {
-		n.FirstChild = c.NextSibling
-	}
-	if c.NextSibling != nil {
-		c.NextSibling.PrevSibling = c.PrevSibling
-	}
-	if n.LastChild == c {
-		n.LastChild = c.PrevSibling
-	}
-	if c.PrevSibling != nil {
-		c.PrevSibling.NextSibling = c.NextSibling
-	}
-	c.Parent = nil
-	c.PrevSibling = nil
-	c.NextSibling = nil
-}
-
-// reparentChildren reparents all of src's child nodes to dst.
-func reparentChildren(dst, src *Node) {
-	for {
-		child := src.FirstChild
-		if child == nil {
-			break
-		}
-		src.RemoveChild(child)
-		dst.AppendChild(child)
-	}
-}
-
-// clone returns a new node with the same type, data and attributes.
-// The clone has no parent, no siblings and no children.
-func (n *Node) clone() *Node {
-	m := &Node{
-		Type:     n.Type,
-		DataAtom: n.DataAtom,
-		Data:     n.Data,
-		Attr:     make([]Attribute, len(n.Attr)),
-	}
-	copy(m.Attr, n.Attr)
-	return m
-}
-
-// nodeStack is a stack of nodes.
-type nodeStack []*Node
-
-// pop pops the stack. It will panic if s is empty.
-func (s *nodeStack) pop() *Node {
-	i := len(*s)
-	n := (*s)[i-1]
-	*s = (*s)[:i-1]
-	return n
-}
-
-// top returns the most recently pushed node, or nil if s is empty.
-func (s *nodeStack) top() *Node {
-	if i := len(*s); i > 0 {
-		return (*s)[i-1]
-	}
-	return nil
-}
-
-// index returns the index of the top-most occurrence of n in the stack, or -1
-// if n is not present.
-func (s *nodeStack) index(n *Node) int {
-	for i := len(*s) - 1; i >= 0; i-- {
-		if (*s)[i] == n {
-			return i
-		}
-	}
-	return -1
-}
-
-// insert inserts a node at the given index.
-func (s *nodeStack) insert(i int, n *Node) {
-	(*s) = append(*s, nil)
-	copy((*s)[i+1:], (*s)[i:])
-	(*s)[i] = n
-}
-
-// remove removes a node from the stack. It is a no-op if n is not present.
-func (s *nodeStack) remove(n *Node) {
-	i := s.index(n)
-	if i == -1 {
-		return
-	}
-	copy((*s)[i:], (*s)[i+1:])
-	j := len(*s) - 1
-	(*s)[j] = nil
-	*s = (*s)[:j]
-}
diff --git a/vendor/golang.org/x/net/html/parse.go b/vendor/golang.org/x/net/html/parse.go
deleted file mode 100644
index be4b2bf5aa..0000000000
--- a/vendor/golang.org/x/net/html/parse.go
+++ /dev/null
@@ -1,2094 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-
-	a "golang.org/x/net/html/atom"
-)
-
-// A parser implements the HTML5 parsing algorithm:
-// https://html.spec.whatwg.org/multipage/syntax.html#tree-construction
-type parser struct {
-	// tokenizer provides the tokens for the parser.
-	tokenizer *Tokenizer
-	// tok is the most recently read token.
-	tok Token
-	// Self-closing tags like <hr/> are treated as start tags, except that
-	// hasSelfClosingToken is set while they are being processed.
-	hasSelfClosingToken bool
-	// doc is the document root element.
-	doc *Node
-	// The stack of open elements (section 12.2.3.2) and active formatting
-	// elements (section 12.2.3.3).
-	oe, afe nodeStack
-	// Element pointers (section 12.2.3.4).
-	head, form *Node
-	// Other parsing state flags (section 12.2.3.5).
-	scripting, framesetOK bool
-	// im is the current insertion mode.
-	im insertionMode
-	// originalIM is the insertion mode to go back to after completing a text
-	// or inTableText insertion mode.
-	originalIM insertionMode
-	// fosterParenting is whether new elements should be inserted according to
-	// the foster parenting rules (section 12.2.5.3).
-	fosterParenting bool
-	// quirks is whether the parser is operating in "quirks mode."
-	quirks bool
-	// fragment is whether the parser is parsing an HTML fragment.
-	fragment bool
-	// context is the context element when parsing an HTML fragment
-	// (section 12.4).
-	context *Node
-}
-
-func (p *parser) top() *Node {
-	if n := p.oe.top(); n != nil {
-		return n
-	}
-	return p.doc
-}
-
-// Stop tags for use in popUntil. These come from section 12.2.3.2.
-var (
-	defaultScopeStopTags = map[string][]a.Atom{
-		"":     {a.Applet, a.Caption, a.Html, a.Table, a.Td, a.Th, a.Marquee, a.Object, a.Template},
-		"math": {a.AnnotationXml, a.Mi, a.Mn, a.Mo, a.Ms, a.Mtext},
-		"svg":  {a.Desc, a.ForeignObject, a.Title},
-	}
-)
-
-type scope int
-
-const (
-	defaultScope scope = iota
-	listItemScope
-	buttonScope
-	tableScope
-	tableRowScope
-	tableBodyScope
-	selectScope
-)
-
-// popUntil pops the stack of open elements at the highest element whose tag
-// is in matchTags, provided there is no higher element in the scope's stop
-// tags (as defined in section 12.2.3.2). It returns whether or not there was
-// such an element. If there was not, popUntil leaves the stack unchanged.
-//
-// For example, the set of stop tags for table scope is: "html", "table". If
-// the stack was:
-// ["html", "body", "font", "table", "b", "i", "u"]
-// then popUntil(tableScope, "font") would return false, but
-// popUntil(tableScope, "i") would return true and the stack would become:
-// ["html", "body", "font", "table", "b"]
-//
-// If an element's tag is in both the stop tags and matchTags, then the stack
-// will be popped and the function returns true (provided, of course, there was
-// no higher element in the stack that was also in the stop tags). For example,
-// popUntil(tableScope, "table") returns true and leaves:
-// ["html", "body", "font"]
-func (p *parser) popUntil(s scope, matchTags ...a.Atom) bool {
-	if i := p.indexOfElementInScope(s, matchTags...); i != -1 {
-		p.oe = p.oe[:i]
-		return true
-	}
-	return false
-}
-
-// indexOfElementInScope returns the index in p.oe of the highest element whose
-// tag is in matchTags that is in scope. If no matching element is in scope, it
-// returns -1.
-func (p *parser) indexOfElementInScope(s scope, matchTags ...a.Atom) int {
-	for i := len(p.oe) - 1; i >= 0; i-- {
-		tagAtom := p.oe[i].DataAtom
-		if p.oe[i].Namespace == "" {
-			for _, t := range matchTags {
-				if t == tagAtom {
-					return i
-				}
-			}
-			switch s {
-			case defaultScope:
-				// No-op.
-			case listItemScope:
-				if tagAtom == a.Ol || tagAtom == a.Ul {
-					return -1
-				}
-			case buttonScope:
-				if tagAtom == a.Button {
-					return -1
-				}
-			case tableScope:
-				if tagAtom == a.Html || tagAtom == a.Table {
-					return -1
-				}
-			case selectScope:
-				if tagAtom != a.Optgroup && tagAtom != a.Option {
-					return -1
-				}
-			default:
-				panic("unreachable")
-			}
-		}
-		switch s {
-		case defaultScope, listItemScope, buttonScope:
-			for _, t := range defaultScopeStopTags[p.oe[i].Namespace] {
-				if t == tagAtom {
-					return -1
-				}
-			}
-		}
-	}
-	return -1
-}
-
-// elementInScope is like popUntil, except that it doesn't modify the stack of
-// open elements.
-func (p *parser) elementInScope(s scope, matchTags ...a.Atom) bool {
-	return p.indexOfElementInScope(s, matchTags...) != -1
-}
-
-// clearStackToContext pops elements off the stack of open elements until a
-// scope-defined element is found.
-func (p *parser) clearStackToContext(s scope) {
-	for i := len(p.oe) - 1; i >= 0; i-- {
-		tagAtom := p.oe[i].DataAtom
-		switch s {
-		case tableScope:
-			if tagAtom == a.Html || tagAtom == a.Table {
-				p.oe = p.oe[:i+1]
-				return
-			}
-		case tableRowScope:
-			if tagAtom == a.Html || tagAtom == a.Tr {
-				p.oe = p.oe[:i+1]
-				return
-			}
-		case tableBodyScope:
-			if tagAtom == a.Html || tagAtom == a.Tbody || tagAtom == a.Tfoot || tagAtom == a.Thead {
-				p.oe = p.oe[:i+1]
-				return
-			}
-		default:
-			panic("unreachable")
-		}
-	}
-}
-
-// generateImpliedEndTags pops nodes off the stack of open elements as long as
-// the top node has a tag name of dd, dt, li, option, optgroup, p, rp, or rt.
-// If exceptions are specified, nodes with that name will not be popped off.
-func (p *parser) generateImpliedEndTags(exceptions ...string) {
-	var i int
-loop:
-	for i = len(p.oe) - 1; i >= 0; i-- {
-		n := p.oe[i]
-		if n.Type == ElementNode {
-			switch n.DataAtom {
-			case a.Dd, a.Dt, a.Li, a.Option, a.Optgroup, a.P, a.Rp, a.Rt:
-				for _, except := range exceptions {
-					if n.Data == except {
-						break loop
-					}
-				}
-				continue
-			}
-		}
-		break
-	}
-
-	p.oe = p.oe[:i+1]
-}
-
-// addChild adds a child node n to the top element, and pushes n onto the stack
-// of open elements if it is an element node.
-func (p *parser) addChild(n *Node) {
-	if p.shouldFosterParent() {
-		p.fosterParent(n)
-	} else {
-		p.top().AppendChild(n)
-	}
-
-	if n.Type == ElementNode {
-		p.oe = append(p.oe, n)
-	}
-}
-
-// shouldFosterParent returns whether the next node to be added should be
-// foster parented.
-func (p *parser) shouldFosterParent() bool {
-	if p.fosterParenting {
-		switch p.top().DataAtom {
-		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			return true
-		}
-	}
-	return false
-}
-
-// fosterParent adds a child node according to the foster parenting rules.
-// Section 12.2.5.3, "foster parenting".
-func (p *parser) fosterParent(n *Node) {
-	var table, parent, prev *Node
-	var i int
-	for i = len(p.oe) - 1; i >= 0; i-- {
-		if p.oe[i].DataAtom == a.Table {
-			table = p.oe[i]
-			break
-		}
-	}
-
-	if table == nil {
-		// The foster parent is the html element.
-		parent = p.oe[0]
-	} else {
-		parent = table.Parent
-	}
-	if parent == nil {
-		parent = p.oe[i-1]
-	}
-
-	if table != nil {
-		prev = table.PrevSibling
-	} else {
-		prev = parent.LastChild
-	}
-	if prev != nil && prev.Type == TextNode && n.Type == TextNode {
-		prev.Data += n.Data
-		return
-	}
-
-	parent.InsertBefore(n, table)
-}
-
-// addText adds text to the preceding node if it is a text node, or else it
-// calls addChild with a new text node.
-func (p *parser) addText(text string) {
-	if text == "" {
-		return
-	}
-
-	if p.shouldFosterParent() {
-		p.fosterParent(&Node{
-			Type: TextNode,
-			Data: text,
-		})
-		return
-	}
-
-	t := p.top()
-	if n := t.LastChild; n != nil && n.Type == TextNode {
-		n.Data += text
-		return
-	}
-	p.addChild(&Node{
-		Type: TextNode,
-		Data: text,
-	})
-}
-
-// addElement adds a child element based on the current token.
-func (p *parser) addElement() {
-	p.addChild(&Node{
-		Type:     ElementNode,
-		DataAtom: p.tok.DataAtom,
-		Data:     p.tok.Data,
-		Attr:     p.tok.Attr,
-	})
-}
-
-// Section 12.2.3.3.
-func (p *parser) addFormattingElement() {
-	tagAtom, attr := p.tok.DataAtom, p.tok.Attr
-	p.addElement()
-
-	// Implement the Noah's Ark clause, but with three per family instead of two.
-	identicalElements := 0
-findIdenticalElements:
-	for i := len(p.afe) - 1; i >= 0; i-- {
-		n := p.afe[i]
-		if n.Type == scopeMarkerNode {
-			break
-		}
-		if n.Type != ElementNode {
-			continue
-		}
-		if n.Namespace != "" {
-			continue
-		}
-		if n.DataAtom != tagAtom {
-			continue
-		}
-		if len(n.Attr) != len(attr) {
-			continue
-		}
-	compareAttributes:
-		for _, t0 := range n.Attr {
-			for _, t1 := range attr {
-				if t0.Key == t1.Key && t0.Namespace == t1.Namespace && t0.Val == t1.Val {
-					// Found a match for this attribute, continue with the next attribute.
-					continue compareAttributes
-				}
-			}
-			// If we get here, there is no attribute that matches a.
-			// Therefore the element is not identical to the new one.
-			continue findIdenticalElements
-		}
-
-		identicalElements++
-		if identicalElements >= 3 {
-			p.afe.remove(n)
-		}
-	}
-
-	p.afe = append(p.afe, p.top())
-}
-
-// Section 12.2.3.3.
-func (p *parser) clearActiveFormattingElements() {
-	for {
-		n := p.afe.pop()
-		if len(p.afe) == 0 || n.Type == scopeMarkerNode {
-			return
-		}
-	}
-}
-
-// Section 12.2.3.3.
-func (p *parser) reconstructActiveFormattingElements() {
-	n := p.afe.top()
-	if n == nil {
-		return
-	}
-	if n.Type == scopeMarkerNode || p.oe.index(n) != -1 {
-		return
-	}
-	i := len(p.afe) - 1
-	for n.Type != scopeMarkerNode && p.oe.index(n) == -1 {
-		if i == 0 {
-			i = -1
-			break
-		}
-		i--
-		n = p.afe[i]
-	}
-	for {
-		i++
-		clone := p.afe[i].clone()
-		p.addChild(clone)
-		p.afe[i] = clone
-		if i == len(p.afe)-1 {
-			break
-		}
-	}
-}
-
-// Section 12.2.4.
-func (p *parser) acknowledgeSelfClosingTag() {
-	p.hasSelfClosingToken = false
-}
-
-// An insertion mode (section 12.2.3.1) is the state transition function from
-// a particular state in the HTML5 parser's state machine. It updates the
-// parser's fields depending on parser.tok (where ErrorToken means EOF).
-// It returns whether the token was consumed.
-type insertionMode func(*parser) bool
-
-// setOriginalIM sets the insertion mode to return to after completing a text or
-// inTableText insertion mode.
-// Section 12.2.3.1, "using the rules for".
-func (p *parser) setOriginalIM() {
-	if p.originalIM != nil {
-		panic("html: bad parser state: originalIM was set twice")
-	}
-	p.originalIM = p.im
-}
-
-// Section 12.2.3.1, "reset the insertion mode".
-func (p *parser) resetInsertionMode() {
-	for i := len(p.oe) - 1; i >= 0; i-- {
-		n := p.oe[i]
-		if i == 0 && p.context != nil {
-			n = p.context
-		}
-
-		switch n.DataAtom {
-		case a.Select:
-			p.im = inSelectIM
-		case a.Td, a.Th:
-			p.im = inCellIM
-		case a.Tr:
-			p.im = inRowIM
-		case a.Tbody, a.Thead, a.Tfoot:
-			p.im = inTableBodyIM
-		case a.Caption:
-			p.im = inCaptionIM
-		case a.Colgroup:
-			p.im = inColumnGroupIM
-		case a.Table:
-			p.im = inTableIM
-		case a.Head:
-			p.im = inBodyIM
-		case a.Body:
-			p.im = inBodyIM
-		case a.Frameset:
-			p.im = inFramesetIM
-		case a.Html:
-			p.im = beforeHeadIM
-		default:
-			continue
-		}
-		return
-	}
-	p.im = inBodyIM
-}
-
-const whitespace = " \t\r\n\f"
-
-// Section 12.2.5.4.1.
-func initialIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
-		if len(p.tok.Data) == 0 {
-			// It was all whitespace, so ignore it.
-			return true
-		}
-	case CommentToken:
-		p.doc.AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		n, quirks := parseDoctype(p.tok.Data)
-		p.doc.AppendChild(n)
-		p.quirks = quirks
-		p.im = beforeHTMLIM
-		return true
-	}
-	p.quirks = true
-	p.im = beforeHTMLIM
-	return false
-}
-
-// Section 12.2.5.4.2.
-func beforeHTMLIM(p *parser) bool {
-	switch p.tok.Type {
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	case TextToken:
-		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
-		if len(p.tok.Data) == 0 {
-			// It was all whitespace, so ignore it.
-			return true
-		}
-	case StartTagToken:
-		if p.tok.DataAtom == a.Html {
-			p.addElement()
-			p.im = beforeHeadIM
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Head, a.Body, a.Html, a.Br:
-			p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
-			return false
-		default:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.doc.AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	}
-	p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
-	return false
-}
-
-// Section 12.2.5.4.3.
-func beforeHeadIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
-		if len(p.tok.Data) == 0 {
-			// It was all whitespace, so ignore it.
-			return true
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Head:
-			p.addElement()
-			p.head = p.top()
-			p.im = inHeadIM
-			return true
-		case a.Html:
-			return inBodyIM(p)
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Head, a.Body, a.Html, a.Br:
-			p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
-			return false
-		default:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
-	return false
-}
-
-// Section 12.2.5.4.4.
-func inHeadIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) < len(p.tok.Data) {
-			// Add the initial whitespace to the current node.
-			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
-			if s == "" {
-				return true
-			}
-			p.tok.Data = s
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta:
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-			return true
-		case a.Script, a.Title, a.Noscript, a.Noframes, a.Style:
-			p.addElement()
-			p.setOriginalIM()
-			p.im = textIM
-			return true
-		case a.Head:
-			// Ignore the token.
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Head:
-			n := p.oe.pop()
-			if n.DataAtom != a.Head {
-				panic("html: bad parser state: <head> element not found, in the in-head insertion mode")
-			}
-			p.im = afterHeadIM
-			return true
-		case a.Body, a.Html, a.Br:
-			p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
-			return false
-		default:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
-	return false
-}
-
-// Section 12.2.5.4.6.
-func afterHeadIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) < len(p.tok.Data) {
-			// Add the initial whitespace to the current node.
-			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
-			if s == "" {
-				return true
-			}
-			p.tok.Data = s
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Body:
-			p.addElement()
-			p.framesetOK = false
-			p.im = inBodyIM
-			return true
-		case a.Frameset:
-			p.addElement()
-			p.im = inFramesetIM
-			return true
-		case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
-			p.oe = append(p.oe, p.head)
-			defer p.oe.remove(p.head)
-			return inHeadIM(p)
-		case a.Head:
-			// Ignore the token.
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Body, a.Html, a.Br:
-			// Drop down to creating an implied <body> tag.
-		default:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	p.parseImpliedToken(StartTagToken, a.Body, a.Body.String())
-	p.framesetOK = true
-	return false
-}
-
-// copyAttributes copies attributes of src not found on dst to dst.
-func copyAttributes(dst *Node, src Token) {
-	if len(src.Attr) == 0 {
-		return
-	}
-	attr := map[string]string{}
-	for _, t := range dst.Attr {
-		attr[t.Key] = t.Val
-	}
-	for _, t := range src.Attr {
-		if _, ok := attr[t.Key]; !ok {
-			dst.Attr = append(dst.Attr, t)
-			attr[t.Key] = t.Val
-		}
-	}
-}
-
-// Section 12.2.5.4.7.
-func inBodyIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		d := p.tok.Data
-		switch n := p.oe.top(); n.DataAtom {
-		case a.Pre, a.Listing:
-			if n.FirstChild == nil {
-				// Ignore a newline at the start of a <pre> block.
-				if d != "" && d[0] == '\r' {
-					d = d[1:]
-				}
-				if d != "" && d[0] == '\n' {
-					d = d[1:]
-				}
-			}
-		}
-		d = strings.Replace(d, "\x00", "", -1)
-		if d == "" {
-			return true
-		}
-		p.reconstructActiveFormattingElements()
-		p.addText(d)
-		if p.framesetOK && strings.TrimLeft(d, whitespace) != "" {
-			// There were non-whitespace characters inserted.
-			p.framesetOK = false
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			copyAttributes(p.oe[0], p.tok)
-		case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
-			return inHeadIM(p)
-		case a.Body:
-			if len(p.oe) >= 2 {
-				body := p.oe[1]
-				if body.Type == ElementNode && body.DataAtom == a.Body {
-					p.framesetOK = false
-					copyAttributes(body, p.tok)
-				}
-			}
-		case a.Frameset:
-			if !p.framesetOK || len(p.oe) < 2 || p.oe[1].DataAtom != a.Body {
-				// Ignore the token.
-				return true
-			}
-			body := p.oe[1]
-			if body.Parent != nil {
-				body.Parent.RemoveChild(body)
-			}
-			p.oe = p.oe[:1]
-			p.addElement()
-			p.im = inFramesetIM
-			return true
-		case a.Address, a.Article, a.Aside, a.Blockquote, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Menu, a.Nav, a.Ol, a.P, a.Section, a.Summary, a.Ul:
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-		case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
-			p.popUntil(buttonScope, a.P)
-			switch n := p.top(); n.DataAtom {
-			case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
-				p.oe.pop()
-			}
-			p.addElement()
-		case a.Pre, a.Listing:
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-			// The newline, if any, will be dealt with by the TextToken case.
-			p.framesetOK = false
-		case a.Form:
-			if p.form == nil {
-				p.popUntil(buttonScope, a.P)
-				p.addElement()
-				p.form = p.top()
-			}
-		case a.Li:
-			p.framesetOK = false
-			for i := len(p.oe) - 1; i >= 0; i-- {
-				node := p.oe[i]
-				switch node.DataAtom {
-				case a.Li:
-					p.oe = p.oe[:i]
-				case a.Address, a.Div, a.P:
-					continue
-				default:
-					if !isSpecialElement(node) {
-						continue
-					}
-				}
-				break
-			}
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-		case a.Dd, a.Dt:
-			p.framesetOK = false
-			for i := len(p.oe) - 1; i >= 0; i-- {
-				node := p.oe[i]
-				switch node.DataAtom {
-				case a.Dd, a.Dt:
-					p.oe = p.oe[:i]
-				case a.Address, a.Div, a.P:
-					continue
-				default:
-					if !isSpecialElement(node) {
-						continue
-					}
-				}
-				break
-			}
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-		case a.Plaintext:
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-		case a.Button:
-			p.popUntil(defaultScope, a.Button)
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.framesetOK = false
-		case a.A:
-			for i := len(p.afe) - 1; i >= 0 && p.afe[i].Type != scopeMarkerNode; i-- {
-				if n := p.afe[i]; n.Type == ElementNode && n.DataAtom == a.A {
-					p.inBodyEndTagFormatting(a.A)
-					p.oe.remove(n)
-					p.afe.remove(n)
-					break
-				}
-			}
-			p.reconstructActiveFormattingElements()
-			p.addFormattingElement()
-		case a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
-			p.reconstructActiveFormattingElements()
-			p.addFormattingElement()
-		case a.Nobr:
-			p.reconstructActiveFormattingElements()
-			if p.elementInScope(defaultScope, a.Nobr) {
-				p.inBodyEndTagFormatting(a.Nobr)
-				p.reconstructActiveFormattingElements()
-			}
-			p.addFormattingElement()
-		case a.Applet, a.Marquee, a.Object:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.afe = append(p.afe, &scopeMarker)
-			p.framesetOK = false
-		case a.Table:
-			if !p.quirks {
-				p.popUntil(buttonScope, a.P)
-			}
-			p.addElement()
-			p.framesetOK = false
-			p.im = inTableIM
-			return true
-		case a.Area, a.Br, a.Embed, a.Img, a.Input, a.Keygen, a.Wbr:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-			if p.tok.DataAtom == a.Input {
-				for _, t := range p.tok.Attr {
-					if t.Key == "type" {
-						if strings.ToLower(t.Val) == "hidden" {
-							// Skip setting framesetOK = false
-							return true
-						}
-					}
-				}
-			}
-			p.framesetOK = false
-		case a.Param, a.Source, a.Track:
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-		case a.Hr:
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-			p.framesetOK = false
-		case a.Image:
-			p.tok.DataAtom = a.Img
-			p.tok.Data = a.Img.String()
-			return false
-		case a.Isindex:
-			if p.form != nil {
-				// Ignore the token.
-				return true
-			}
-			action := ""
-			prompt := "This is a searchable index. Enter search keywords: "
-			attr := []Attribute{{Key: "name", Val: "isindex"}}
-			for _, t := range p.tok.Attr {
-				switch t.Key {
-				case "action":
-					action = t.Val
-				case "name":
-					// Ignore the attribute.
-				case "prompt":
-					prompt = t.Val
-				default:
-					attr = append(attr, t)
-				}
-			}
-			p.acknowledgeSelfClosingTag()
-			p.popUntil(buttonScope, a.P)
-			p.parseImpliedToken(StartTagToken, a.Form, a.Form.String())
-			if action != "" {
-				p.form.Attr = []Attribute{{Key: "action", Val: action}}
-			}
-			p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
-			p.parseImpliedToken(StartTagToken, a.Label, a.Label.String())
-			p.addText(prompt)
-			p.addChild(&Node{
-				Type:     ElementNode,
-				DataAtom: a.Input,
-				Data:     a.Input.String(),
-				Attr:     attr,
-			})
-			p.oe.pop()
-			p.parseImpliedToken(EndTagToken, a.Label, a.Label.String())
-			p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
-			p.parseImpliedToken(EndTagToken, a.Form, a.Form.String())
-		case a.Textarea:
-			p.addElement()
-			p.setOriginalIM()
-			p.framesetOK = false
-			p.im = textIM
-		case a.Xmp:
-			p.popUntil(buttonScope, a.P)
-			p.reconstructActiveFormattingElements()
-			p.framesetOK = false
-			p.addElement()
-			p.setOriginalIM()
-			p.im = textIM
-		case a.Iframe:
-			p.framesetOK = false
-			p.addElement()
-			p.setOriginalIM()
-			p.im = textIM
-		case a.Noembed, a.Noscript:
-			p.addElement()
-			p.setOriginalIM()
-			p.im = textIM
-		case a.Select:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.framesetOK = false
-			p.im = inSelectIM
-			return true
-		case a.Optgroup, a.Option:
-			if p.top().DataAtom == a.Option {
-				p.oe.pop()
-			}
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-		case a.Rp, a.Rt:
-			if p.elementInScope(defaultScope, a.Ruby) {
-				p.generateImpliedEndTags()
-			}
-			p.addElement()
-		case a.Math, a.Svg:
-			p.reconstructActiveFormattingElements()
-			if p.tok.DataAtom == a.Math {
-				adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
-			} else {
-				adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
-			}
-			adjustForeignAttributes(p.tok.Attr)
-			p.addElement()
-			p.top().Namespace = p.tok.Data
-			if p.hasSelfClosingToken {
-				p.oe.pop()
-				p.acknowledgeSelfClosingTag()
-			}
-			return true
-		case a.Caption, a.Col, a.Colgroup, a.Frame, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-			// Ignore the token.
-		default:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Body:
-			if p.elementInScope(defaultScope, a.Body) {
-				p.im = afterBodyIM
-			}
-		case a.Html:
-			if p.elementInScope(defaultScope, a.Body) {
-				p.parseImpliedToken(EndTagToken, a.Body, a.Body.String())
-				return false
-			}
-			return true
-		case a.Address, a.Article, a.Aside, a.Blockquote, a.Button, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Listing, a.Menu, a.Nav, a.Ol, a.Pre, a.Section, a.Summary, a.Ul:
-			p.popUntil(defaultScope, p.tok.DataAtom)
-		case a.Form:
-			node := p.form
-			p.form = nil
-			i := p.indexOfElementInScope(defaultScope, a.Form)
-			if node == nil || i == -1 || p.oe[i] != node {
-				// Ignore the token.
-				return true
-			}
-			p.generateImpliedEndTags()
-			p.oe.remove(node)
-		case a.P:
-			if !p.elementInScope(buttonScope, a.P) {
-				p.parseImpliedToken(StartTagToken, a.P, a.P.String())
-			}
-			p.popUntil(buttonScope, a.P)
-		case a.Li:
-			p.popUntil(listItemScope, a.Li)
-		case a.Dd, a.Dt:
-			p.popUntil(defaultScope, p.tok.DataAtom)
-		case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
-			p.popUntil(defaultScope, a.H1, a.H2, a.H3, a.H4, a.H5, a.H6)
-		case a.A, a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.Nobr, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
-			p.inBodyEndTagFormatting(p.tok.DataAtom)
-		case a.Applet, a.Marquee, a.Object:
-			if p.popUntil(defaultScope, p.tok.DataAtom) {
-				p.clearActiveFormattingElements()
-			}
-		case a.Br:
-			p.tok.Type = StartTagToken
-			return false
-		default:
-			p.inBodyEndTagOther(p.tok.DataAtom)
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	}
-
-	return true
-}
-
-func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom) {
-	// This is the "adoption agency" algorithm, described at
-	// https://html.spec.whatwg.org/multipage/syntax.html#adoptionAgency
-
-	// TODO: this is a fairly literal line-by-line translation of that algorithm.
-	// Once the code successfully parses the comprehensive test suite, we should
-	// refactor this code to be more idiomatic.
-
-	// Steps 1-4. The outer loop.
-	for i := 0; i < 8; i++ {
-		// Step 5. Find the formatting element.
-		var formattingElement *Node
-		for j := len(p.afe) - 1; j >= 0; j-- {
-			if p.afe[j].Type == scopeMarkerNode {
-				break
-			}
-			if p.afe[j].DataAtom == tagAtom {
-				formattingElement = p.afe[j]
-				break
-			}
-		}
-		if formattingElement == nil {
-			p.inBodyEndTagOther(tagAtom)
-			return
-		}
-		feIndex := p.oe.index(formattingElement)
-		if feIndex == -1 {
-			p.afe.remove(formattingElement)
-			return
-		}
-		if !p.elementInScope(defaultScope, tagAtom) {
-			// Ignore the tag.
-			return
-		}
-
-		// Steps 9-10. Find the furthest block.
-		var furthestBlock *Node
-		for _, e := range p.oe[feIndex:] {
-			if isSpecialElement(e) {
-				furthestBlock = e
-				break
-			}
-		}
-		if furthestBlock == nil {
-			e := p.oe.pop()
-			for e != formattingElement {
-				e = p.oe.pop()
-			}
-			p.afe.remove(e)
-			return
-		}
-
-		// Steps 11-12. Find the common ancestor and bookmark node.
-		commonAncestor := p.oe[feIndex-1]
-		bookmark := p.afe.index(formattingElement)
-
-		// Step 13. The inner loop. Find the lastNode to reparent.
-		lastNode := furthestBlock
-		node := furthestBlock
-		x := p.oe.index(node)
-		// Steps 13.1-13.2
-		for j := 0; j < 3; j++ {
-			// Step 13.3.
-			x--
-			node = p.oe[x]
-			// Step 13.4 - 13.5.
-			if p.afe.index(node) == -1 {
-				p.oe.remove(node)
-				continue
-			}
-			// Step 13.6.
-			if node == formattingElement {
-				break
-			}
-			// Step 13.7.
-			clone := node.clone()
-			p.afe[p.afe.index(node)] = clone
-			p.oe[p.oe.index(node)] = clone
-			node = clone
-			// Step 13.8.
-			if lastNode == furthestBlock {
-				bookmark = p.afe.index(node) + 1
-			}
-			// Step 13.9.
-			if lastNode.Parent != nil {
-				lastNode.Parent.RemoveChild(lastNode)
-			}
-			node.AppendChild(lastNode)
-			// Step 13.10.
-			lastNode = node
-		}
-
-		// Step 14. Reparent lastNode to the common ancestor,
-		// or for misnested table nodes, to the foster parent.
-		if lastNode.Parent != nil {
-			lastNode.Parent.RemoveChild(lastNode)
-		}
-		switch commonAncestor.DataAtom {
-		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			p.fosterParent(lastNode)
-		default:
-			commonAncestor.AppendChild(lastNode)
-		}
-
-		// Steps 15-17. Reparent nodes from the furthest block's children
-		// to a clone of the formatting element.
-		clone := formattingElement.clone()
-		reparentChildren(clone, furthestBlock)
-		furthestBlock.AppendChild(clone)
-
-		// Step 18. Fix up the list of active formatting elements.
-		if oldLoc := p.afe.index(formattingElement); oldLoc != -1 && oldLoc < bookmark {
-			// Move the bookmark with the rest of the list.
-			bookmark--
-		}
-		p.afe.remove(formattingElement)
-		p.afe.insert(bookmark, clone)
-
-		// Step 19. Fix up the stack of open elements.
-		p.oe.remove(formattingElement)
-		p.oe.insert(p.oe.index(furthestBlock)+1, clone)
-	}
-}
-
-// inBodyEndTagOther performs the "any other end tag" algorithm for inBodyIM.
-// "Any other end tag" handling from 12.2.5.5 The rules for parsing tokens in foreign content
-// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inforeign
-func (p *parser) inBodyEndTagOther(tagAtom a.Atom) {
-	for i := len(p.oe) - 1; i >= 0; i-- {
-		if p.oe[i].DataAtom == tagAtom {
-			p.oe = p.oe[:i]
-			break
-		}
-		if isSpecialElement(p.oe[i]) {
-			break
-		}
-	}
-}
-
-// Section 12.2.5.4.8.
-func textIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		p.oe.pop()
-	case TextToken:
-		d := p.tok.Data
-		if n := p.oe.top(); n.DataAtom == a.Textarea && n.FirstChild == nil {
-			// Ignore a newline at the start of a <textarea> block.
-			if d != "" && d[0] == '\r' {
-				d = d[1:]
-			}
-			if d != "" && d[0] == '\n' {
-				d = d[1:]
-			}
-		}
-		if d == "" {
-			return true
-		}
-		p.addText(d)
-		return true
-	case EndTagToken:
-		p.oe.pop()
-	}
-	p.im = p.originalIM
-	p.originalIM = nil
-	return p.tok.Type == EndTagToken
-}
-
-// Section 12.2.5.4.9.
-func inTableIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		// Stop parsing.
-		return true
-	case TextToken:
-		p.tok.Data = strings.Replace(p.tok.Data, "\x00", "", -1)
-		switch p.oe.top().DataAtom {
-		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			if strings.Trim(p.tok.Data, whitespace) == "" {
-				p.addText(p.tok.Data)
-				return true
-			}
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption:
-			p.clearStackToContext(tableScope)
-			p.afe = append(p.afe, &scopeMarker)
-			p.addElement()
-			p.im = inCaptionIM
-			return true
-		case a.Colgroup:
-			p.clearStackToContext(tableScope)
-			p.addElement()
-			p.im = inColumnGroupIM
-			return true
-		case a.Col:
-			p.parseImpliedToken(StartTagToken, a.Colgroup, a.Colgroup.String())
-			return false
-		case a.Tbody, a.Tfoot, a.Thead:
-			p.clearStackToContext(tableScope)
-			p.addElement()
-			p.im = inTableBodyIM
-			return true
-		case a.Td, a.Th, a.Tr:
-			p.parseImpliedToken(StartTagToken, a.Tbody, a.Tbody.String())
-			return false
-		case a.Table:
-			if p.popUntil(tableScope, a.Table) {
-				p.resetInsertionMode()
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Style, a.Script:
-			return inHeadIM(p)
-		case a.Input:
-			for _, t := range p.tok.Attr {
-				if t.Key == "type" && strings.ToLower(t.Val) == "hidden" {
-					p.addElement()
-					p.oe.pop()
-					return true
-				}
-			}
-			// Otherwise drop down to the default action.
-		case a.Form:
-			if p.form != nil {
-				// Ignore the token.
-				return true
-			}
-			p.addElement()
-			p.form = p.oe.pop()
-		case a.Select:
-			p.reconstructActiveFormattingElements()
-			switch p.top().DataAtom {
-			case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-				p.fosterParenting = true
-			}
-			p.addElement()
-			p.fosterParenting = false
-			p.framesetOK = false
-			p.im = inSelectInTableIM
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Table:
-			if p.popUntil(tableScope, a.Table) {
-				p.resetInsertionMode()
-				return true
-			}
-			// Ignore the token.
-			return true
-		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	p.fosterParenting = true
-	defer func() { p.fosterParenting = false }()
-
-	return inBodyIM(p)
-}
-
-// Section 12.2.5.4.11.
-func inCaptionIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Thead, a.Tr:
-			if p.popUntil(tableScope, a.Caption) {
-				p.clearActiveFormattingElements()
-				p.im = inTableIM
-				return false
-			} else {
-				// Ignore the token.
-				return true
-			}
-		case a.Select:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.framesetOK = false
-			p.im = inSelectInTableIM
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption:
-			if p.popUntil(tableScope, a.Caption) {
-				p.clearActiveFormattingElements()
-				p.im = inTableIM
-			}
-			return true
-		case a.Table:
-			if p.popUntil(tableScope, a.Caption) {
-				p.clearActiveFormattingElements()
-				p.im = inTableIM
-				return false
-			} else {
-				// Ignore the token.
-				return true
-			}
-		case a.Body, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-			// Ignore the token.
-			return true
-		}
-	}
-	return inBodyIM(p)
-}
-
-// Section 12.2.5.4.12.
-func inColumnGroupIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) < len(p.tok.Data) {
-			// Add the initial whitespace to the current node.
-			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
-			if s == "" {
-				return true
-			}
-			p.tok.Data = s
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Col:
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Colgroup:
-			if p.oe.top().DataAtom != a.Html {
-				p.oe.pop()
-				p.im = inTableIM
-			}
-			return true
-		case a.Col:
-			// Ignore the token.
-			return true
-		}
-	}
-	if p.oe.top().DataAtom != a.Html {
-		p.oe.pop()
-		p.im = inTableIM
-		return false
-	}
-	return true
-}
-
-// Section 12.2.5.4.13.
-func inTableBodyIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Tr:
-			p.clearStackToContext(tableBodyScope)
-			p.addElement()
-			p.im = inRowIM
-			return true
-		case a.Td, a.Th:
-			p.parseImpliedToken(StartTagToken, a.Tr, a.Tr.String())
-			return false
-		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead:
-			if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
-				p.im = inTableIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Tbody, a.Tfoot, a.Thead:
-			if p.elementInScope(tableScope, p.tok.DataAtom) {
-				p.clearStackToContext(tableBodyScope)
-				p.oe.pop()
-				p.im = inTableIM
-			}
-			return true
-		case a.Table:
-			if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
-				p.im = inTableIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th, a.Tr:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	}
-
-	return inTableIM(p)
-}
-
-// Section 12.2.5.4.14.
-func inRowIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Td, a.Th:
-			p.clearStackToContext(tableRowScope)
-			p.addElement()
-			p.afe = append(p.afe, &scopeMarker)
-			p.im = inCellIM
-			return true
-		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			if p.popUntil(tableScope, a.Tr) {
-				p.im = inTableBodyIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Tr:
-			if p.popUntil(tableScope, a.Tr) {
-				p.im = inTableBodyIM
-				return true
-			}
-			// Ignore the token.
-			return true
-		case a.Table:
-			if p.popUntil(tableScope, a.Tr) {
-				p.im = inTableBodyIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Tbody, a.Tfoot, a.Thead:
-			if p.elementInScope(tableScope, p.tok.DataAtom) {
-				p.parseImpliedToken(EndTagToken, a.Tr, a.Tr.String())
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th:
-			// Ignore the token.
-			return true
-		}
-	}
-
-	return inTableIM(p)
-}
-
-// Section 12.2.5.4.15.
-func inCellIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-			if p.popUntil(tableScope, a.Td, a.Th) {
-				// Close the cell and reprocess.
-				p.clearActiveFormattingElements()
-				p.im = inRowIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Select:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.framesetOK = false
-			p.im = inSelectInTableIM
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Td, a.Th:
-			if !p.popUntil(tableScope, p.tok.DataAtom) {
-				// Ignore the token.
-				return true
-			}
-			p.clearActiveFormattingElements()
-			p.im = inRowIM
-			return true
-		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html:
-			// Ignore the token.
-			return true
-		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			if !p.elementInScope(tableScope, p.tok.DataAtom) {
-				// Ignore the token.
-				return true
-			}
-			// Close the cell and reprocess.
-			p.popUntil(tableScope, a.Td, a.Th)
-			p.clearActiveFormattingElements()
-			p.im = inRowIM
-			return false
-		}
-	}
-	return inBodyIM(p)
-}
-
-// Section 12.2.5.4.16.
-func inSelectIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		// Stop parsing.
-		return true
-	case TextToken:
-		p.addText(strings.Replace(p.tok.Data, "\x00", "", -1))
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Option:
-			if p.top().DataAtom == a.Option {
-				p.oe.pop()
-			}
-			p.addElement()
-		case a.Optgroup:
-			if p.top().DataAtom == a.Option {
-				p.oe.pop()
-			}
-			if p.top().DataAtom == a.Optgroup {
-				p.oe.pop()
-			}
-			p.addElement()
-		case a.Select:
-			p.tok.Type = EndTagToken
-			return false
-		case a.Input, a.Keygen, a.Textarea:
-			if p.elementInScope(selectScope, a.Select) {
-				p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
-				return false
-			}
-			// In order to properly ignore <textarea>, we need to change the tokenizer mode.
-			p.tokenizer.NextIsNotRawText()
-			// Ignore the token.
-			return true
-		case a.Script:
-			return inHeadIM(p)
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Option:
-			if p.top().DataAtom == a.Option {
-				p.oe.pop()
-			}
-		case a.Optgroup:
-			i := len(p.oe) - 1
-			if p.oe[i].DataAtom == a.Option {
-				i--
-			}
-			if p.oe[i].DataAtom == a.Optgroup {
-				p.oe = p.oe[:i]
-			}
-		case a.Select:
-			if p.popUntil(selectScope, a.Select) {
-				p.resetInsertionMode()
-			}
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	return true
-}
-
-// Section 12.2.5.4.17.
-func inSelectInTableIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken, EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption, a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr, a.Td, a.Th:
-			if p.tok.Type == StartTagToken || p.elementInScope(tableScope, p.tok.DataAtom) {
-				p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
-				return false
-			} else {
-				// Ignore the token.
-				return true
-			}
-		}
-	}
-	return inSelectIM(p)
-}
-
-// Section 12.2.5.4.18.
-func afterBodyIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		// Stop parsing.
-		return true
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) == 0 {
-			// It was all whitespace.
-			return inBodyIM(p)
-		}
-	case StartTagToken:
-		if p.tok.DataAtom == a.Html {
-			return inBodyIM(p)
-		}
-	case EndTagToken:
-		if p.tok.DataAtom == a.Html {
-			if !p.fragment {
-				p.im = afterAfterBodyIM
-			}
-			return true
-		}
-	case CommentToken:
-		// The comment is attached to the <html> element.
-		if len(p.oe) < 1 || p.oe[0].DataAtom != a.Html {
-			panic("html: bad parser state: <html> element not found, in the after-body insertion mode")
-		}
-		p.oe[0].AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	}
-	p.im = inBodyIM
-	return false
-}
-
-// Section 12.2.5.4.19.
-func inFramesetIM(p *parser) bool {
-	switch p.tok.Type {
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case TextToken:
-		// Ignore all text but whitespace.
-		s := strings.Map(func(c rune) rune {
-			switch c {
-			case ' ', '\t', '\n', '\f', '\r':
-				return c
-			}
-			return -1
-		}, p.tok.Data)
-		if s != "" {
-			p.addText(s)
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Frameset:
-			p.addElement()
-		case a.Frame:
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-		case a.Noframes:
-			return inHeadIM(p)
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Frameset:
-			if p.oe.top().DataAtom != a.Html {
-				p.oe.pop()
-				if p.oe.top().DataAtom != a.Frameset {
-					p.im = afterFramesetIM
-					return true
-				}
-			}
-		}
-	default:
-		// Ignore the token.
-	}
-	return true
-}
-
-// Section 12.2.5.4.20.
-func afterFramesetIM(p *parser) bool {
-	switch p.tok.Type {
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case TextToken:
-		// Ignore all text but whitespace.
-		s := strings.Map(func(c rune) rune {
-			switch c {
-			case ' ', '\t', '\n', '\f', '\r':
-				return c
-			}
-			return -1
-		}, p.tok.Data)
-		if s != "" {
-			p.addText(s)
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Noframes:
-			return inHeadIM(p)
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			p.im = afterAfterFramesetIM
-			return true
-		}
-	default:
-		// Ignore the token.
-	}
-	return true
-}
-
-// Section 12.2.5.4.21.
-func afterAfterBodyIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		// Stop parsing.
-		return true
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) == 0 {
-			// It was all whitespace.
-			return inBodyIM(p)
-		}
-	case StartTagToken:
-		if p.tok.DataAtom == a.Html {
-			return inBodyIM(p)
-		}
-	case CommentToken:
-		p.doc.AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		return inBodyIM(p)
-	}
-	p.im = inBodyIM
-	return false
-}
-
-// Section 12.2.5.4.22.
-func afterAfterFramesetIM(p *parser) bool {
-	switch p.tok.Type {
-	case CommentToken:
-		p.doc.AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case TextToken:
-		// Ignore all text but whitespace.
-		s := strings.Map(func(c rune) rune {
-			switch c {
-			case ' ', '\t', '\n', '\f', '\r':
-				return c
-			}
-			return -1
-		}, p.tok.Data)
-		if s != "" {
-			p.tok.Data = s
-			return inBodyIM(p)
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Noframes:
-			return inHeadIM(p)
-		}
-	case DoctypeToken:
-		return inBodyIM(p)
-	default:
-		// Ignore the token.
-	}
-	return true
-}
-
-const whitespaceOrNUL = whitespace + "\x00"
-
-// Section 12.2.5.5.
-func parseForeignContent(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		if p.framesetOK {
-			p.framesetOK = strings.TrimLeft(p.tok.Data, whitespaceOrNUL) == ""
-		}
-		p.tok.Data = strings.Replace(p.tok.Data, "\x00", "\ufffd", -1)
-		p.addText(p.tok.Data)
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case StartTagToken:
-		b := breakout[p.tok.Data]
-		if p.tok.DataAtom == a.Font {
-		loop:
-			for _, attr := range p.tok.Attr {
-				switch attr.Key {
-				case "color", "face", "size":
-					b = true
-					break loop
-				}
-			}
-		}
-		if b {
-			for i := len(p.oe) - 1; i >= 0; i-- {
-				n := p.oe[i]
-				if n.Namespace == "" || htmlIntegrationPoint(n) || mathMLTextIntegrationPoint(n) {
-					p.oe = p.oe[:i+1]
-					break
-				}
-			}
-			return false
-		}
-		switch p.top().Namespace {
-		case "math":
-			adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
-		case "svg":
-			// Adjust SVG tag names. The tokenizer lower-cases tag names, but
-			// SVG wants e.g. "foreignObject" with a capital second "O".
-			if x := svgTagNameAdjustments[p.tok.Data]; x != "" {
-				p.tok.DataAtom = a.Lookup([]byte(x))
-				p.tok.Data = x
-			}
-			adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
-		default:
-			panic("html: bad parser state: unexpected namespace")
-		}
-		adjustForeignAttributes(p.tok.Attr)
-		namespace := p.top().Namespace
-		p.addElement()
-		p.top().Namespace = namespace
-		if namespace != "" {
-			// Don't let the tokenizer go into raw text mode in foreign content
-			// (e.g. in an SVG <title> tag).
-			p.tokenizer.NextIsNotRawText()
-		}
-		if p.hasSelfClosingToken {
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-		}
-	case EndTagToken:
-		for i := len(p.oe) - 1; i >= 0; i-- {
-			if p.oe[i].Namespace == "" {
-				return p.im(p)
-			}
-			if strings.EqualFold(p.oe[i].Data, p.tok.Data) {
-				p.oe = p.oe[:i]
-				break
-			}
-		}
-		return true
-	default:
-		// Ignore the token.
-	}
-	return true
-}
-
-// Section 12.2.5.
-func (p *parser) inForeignContent() bool {
-	if len(p.oe) == 0 {
-		return false
-	}
-	n := p.oe[len(p.oe)-1]
-	if n.Namespace == "" {
-		return false
-	}
-	if mathMLTextIntegrationPoint(n) {
-		if p.tok.Type == StartTagToken && p.tok.DataAtom != a.Mglyph && p.tok.DataAtom != a.Malignmark {
-			return false
-		}
-		if p.tok.Type == TextToken {
-			return false
-		}
-	}
-	if n.Namespace == "math" && n.DataAtom == a.AnnotationXml && p.tok.Type == StartTagToken && p.tok.DataAtom == a.Svg {
-		return false
-	}
-	if htmlIntegrationPoint(n) && (p.tok.Type == StartTagToken || p.tok.Type == TextToken) {
-		return false
-	}
-	if p.tok.Type == ErrorToken {
-		return false
-	}
-	return true
-}
-
-// parseImpliedToken parses a token as though it had appeared in the parser's
-// input.
-func (p *parser) parseImpliedToken(t TokenType, dataAtom a.Atom, data string) {
-	realToken, selfClosing := p.tok, p.hasSelfClosingToken
-	p.tok = Token{
-		Type:     t,
-		DataAtom: dataAtom,
-		Data:     data,
-	}
-	p.hasSelfClosingToken = false
-	p.parseCurrentToken()
-	p.tok, p.hasSelfClosingToken = realToken, selfClosing
-}
-
-// parseCurrentToken runs the current token through the parsing routines
-// until it is consumed.
-func (p *parser) parseCurrentToken() {
-	if p.tok.Type == SelfClosingTagToken {
-		p.hasSelfClosingToken = true
-		p.tok.Type = StartTagToken
-	}
-
-	consumed := false
-	for !consumed {
-		if p.inForeignContent() {
-			consumed = parseForeignContent(p)
-		} else {
-			consumed = p.im(p)
-		}
-	}
-
-	if p.hasSelfClosingToken {
-		// This is a parse error, but ignore it.
-		p.hasSelfClosingToken = false
-	}
-}
-
-func (p *parser) parse() error {
-	// Iterate until EOF. Any other error will cause an early return.
-	var err error
-	for err != io.EOF {
-		// CDATA sections are allowed only in foreign content.
-		n := p.oe.top()
-		p.tokenizer.AllowCDATA(n != nil && n.Namespace != "")
-		// Read and parse the next token.
-		p.tokenizer.Next()
-		p.tok = p.tokenizer.Token()
-		if p.tok.Type == ErrorToken {
-			err = p.tokenizer.Err()
-			if err != nil && err != io.EOF {
-				return err
-			}
-		}
-		p.parseCurrentToken()
-	}
-	return nil
-}
-
-// Parse returns the parse tree for the HTML from the given Reader.
-// The input is assumed to be UTF-8 encoded.
-func Parse(r io.Reader) (*Node, error) {
-	p := &parser{
-		tokenizer: NewTokenizer(r),
-		doc: &Node{
-			Type: DocumentNode,
-		},
-		scripting:  true,
-		framesetOK: true,
-		im:         initialIM,
-	}
-	err := p.parse()
-	if err != nil {
-		return nil, err
-	}
-	return p.doc, nil
-}
-
-// ParseFragment parses a fragment of HTML and returns the nodes that were
-// found. If the fragment is the InnerHTML for an existing element, pass that
-// element in context.
-func ParseFragment(r io.Reader, context *Node) ([]*Node, error) {
-	contextTag := ""
-	if context != nil {
-		if context.Type != ElementNode {
-			return nil, errors.New("html: ParseFragment of non-element Node")
-		}
-		// The next check isn't just context.DataAtom.String() == context.Data because
-		// it is valid to pass an element whose tag isn't a known atom. For example,
-		// DataAtom == 0 and Data = "tagfromthefuture" is perfectly consistent.
-		if context.DataAtom != a.Lookup([]byte(context.Data)) {
-			return nil, fmt.Errorf("html: inconsistent Node: DataAtom=%q, Data=%q", context.DataAtom, context.Data)
-		}
-		contextTag = context.DataAtom.String()
-	}
-	p := &parser{
-		tokenizer: NewTokenizerFragment(r, contextTag),
-		doc: &Node{
-			Type: DocumentNode,
-		},
-		scripting: true,
-		fragment:  true,
-		context:   context,
-	}
-
-	root := &Node{
-		Type:     ElementNode,
-		DataAtom: a.Html,
-		Data:     a.Html.String(),
-	}
-	p.doc.AppendChild(root)
-	p.oe = nodeStack{root}
-	p.resetInsertionMode()
-
-	for n := context; n != nil; n = n.Parent {
-		if n.Type == ElementNode && n.DataAtom == a.Form {
-			p.form = n
-			break
-		}
-	}
-
-	err := p.parse()
-	if err != nil {
-		return nil, err
-	}
-
-	parent := p.doc
-	if context != nil {
-		parent = root
-	}
-
-	var result []*Node
-	for c := parent.FirstChild; c != nil; {
-		next := c.NextSibling
-		parent.RemoveChild(c)
-		result = append(result, c)
-		c = next
-	}
-	return result, nil
-}
diff --git a/vendor/golang.org/x/net/html/render.go b/vendor/golang.org/x/net/html/render.go
deleted file mode 100644
index d34564f49d..0000000000
--- a/vendor/golang.org/x/net/html/render.go
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-)
-
-type writer interface {
-	io.Writer
-	io.ByteWriter
-	WriteString(string) (int, error)
-}
-
-// Render renders the parse tree n to the given writer.
-//
-// Rendering is done on a 'best effort' basis: calling Parse on the output of
-// Render will always result in something similar to the original tree, but it
-// is not necessarily an exact clone unless the original tree was 'well-formed'.
-// 'Well-formed' is not easily specified; the HTML5 specification is
-// complicated.
-//
-// Calling Parse on arbitrary input typically results in a 'well-formed' parse
-// tree. However, it is possible for Parse to yield a 'badly-formed' parse tree.
-// For example, in a 'well-formed' parse tree, no <a> element is a child of
-// another <a> element: parsing "<a><a>" results in two sibling elements.
-// Similarly, in a 'well-formed' parse tree, no <a> element is a child of a
-// <table> element: parsing "<p><table><a>" results in a <p> with two sibling
-// children; the <a> is reparented to the <table>'s parent. However, calling
-// Parse on "<a><table><a>" does not return an error, but the result has an <a>
-// element with an <a> child, and is therefore not 'well-formed'.
-//
-// Programmatically constructed trees are typically also 'well-formed', but it
-// is possible to construct a tree that looks innocuous but, when rendered and
-// re-parsed, results in a different tree. A simple example is that a solitary
-// text node would become a tree containing <html>, <head> and <body> elements.
-// Another example is that the programmatic equivalent of "a<head>b</head>c"
-// becomes "<html><head><head/><body>abc</body></html>".
-func Render(w io.Writer, n *Node) error {
-	if x, ok := w.(writer); ok {
-		return render(x, n)
-	}
-	buf := bufio.NewWriter(w)
-	if err := render(buf, n); err != nil {
-		return err
-	}
-	return buf.Flush()
-}
-
-// plaintextAbort is returned from render1 when a <plaintext> element
-// has been rendered. No more end tags should be rendered after that.
-var plaintextAbort = errors.New("html: internal error (plaintext abort)")
-
-func render(w writer, n *Node) error {
-	err := render1(w, n)
-	if err == plaintextAbort {
-		err = nil
-	}
-	return err
-}
-
-func render1(w writer, n *Node) error {
-	// Render non-element nodes; these are the easy cases.
-	switch n.Type {
-	case ErrorNode:
-		return errors.New("html: cannot render an ErrorNode node")
-	case TextNode:
-		return escape(w, n.Data)
-	case DocumentNode:
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			if err := render1(w, c); err != nil {
-				return err
-			}
-		}
-		return nil
-	case ElementNode:
-		// No-op.
-	case CommentNode:
-		if _, err := w.WriteString("<!--"); err != nil {
-			return err
-		}
-		if _, err := w.WriteString(n.Data); err != nil {
-			return err
-		}
-		if _, err := w.WriteString("-->"); err != nil {
-			return err
-		}
-		return nil
-	case DoctypeNode:
-		if _, err := w.WriteString("<!DOCTYPE "); err != nil {
-			return err
-		}
-		if _, err := w.WriteString(n.Data); err != nil {
-			return err
-		}
-		if n.Attr != nil {
-			var p, s string
-			for _, a := range n.Attr {
-				switch a.Key {
-				case "public":
-					p = a.Val
-				case "system":
-					s = a.Val
-				}
-			}
-			if p != "" {
-				if _, err := w.WriteString(" PUBLIC "); err != nil {
-					return err
-				}
-				if err := writeQuoted(w, p); err != nil {
-					return err
-				}
-				if s != "" {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-					if err := writeQuoted(w, s); err != nil {
-						return err
-					}
-				}
-			} else if s != "" {
-				if _, err := w.WriteString(" SYSTEM "); err != nil {
-					return err
-				}
-				if err := writeQuoted(w, s); err != nil {
-					return err
-				}
-			}
-		}
-		return w.WriteByte('>')
-	default:
-		return errors.New("html: unknown node type")
-	}
-
-	// Render the <xxx> opening tag.
-	if err := w.WriteByte('<'); err != nil {
-		return err
-	}
-	if _, err := w.WriteString(n.Data); err != nil {
-		return err
-	}
-	for _, a := range n.Attr {
-		if err := w.WriteByte(' '); err != nil {
-			return err
-		}
-		if a.Namespace != "" {
-			if _, err := w.WriteString(a.Namespace); err != nil {
-				return err
-			}
-			if err := w.WriteByte(':'); err != nil {
-				return err
-			}
-		}
-		if _, err := w.WriteString(a.Key); err != nil {
-			return err
-		}
-		if _, err := w.WriteString(`="`); err != nil {
-			return err
-		}
-		if err := escape(w, a.Val); err != nil {
-			return err
-		}
-		if err := w.WriteByte('"'); err != nil {
-			return err
-		}
-	}
-	if voidElements[n.Data] {
-		if n.FirstChild != nil {
-			return fmt.Errorf("html: void element <%s> has child nodes", n.Data)
-		}
-		_, err := w.WriteString("/>")
-		return err
-	}
-	if err := w.WriteByte('>'); err != nil {
-		return err
-	}
-
-	// Add initial newline where there is danger of a newline beging ignored.
-	if c := n.FirstChild; c != nil && c.Type == TextNode && strings.HasPrefix(c.Data, "\n") {
-		switch n.Data {
-		case "pre", "listing", "textarea":
-			if err := w.WriteByte('\n'); err != nil {
-				return err
-			}
-		}
-	}
-
-	// Render any child nodes.
-	switch n.Data {
-	case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			if c.Type == TextNode {
-				if _, err := w.WriteString(c.Data); err != nil {
-					return err
-				}
-			} else {
-				if err := render1(w, c); err != nil {
-					return err
-				}
-			}
-		}
-		if n.Data == "plaintext" {
-			// Don't render anything else. <plaintext> must be the
-			// last element in the file, with no closing tag.
-			return plaintextAbort
-		}
-	default:
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			if err := render1(w, c); err != nil {
-				return err
-			}
-		}
-	}
-
-	// Render the </xxx> closing tag.
-	if _, err := w.WriteString("</"); err != nil {
-		return err
-	}
-	if _, err := w.WriteString(n.Data); err != nil {
-		return err
-	}
-	return w.WriteByte('>')
-}
-
-// writeQuoted writes s to w surrounded by quotes. Normally it will use double
-// quotes, but if s contains a double quote, it will use single quotes.
-// It is used for writing the identifiers in a doctype declaration.
-// In valid HTML, they can't contain both types of quotes.
-func writeQuoted(w writer, s string) error {
-	var q byte = '"'
-	if strings.Contains(s, `"`) {
-		q = '\''
-	}
-	if err := w.WriteByte(q); err != nil {
-		return err
-	}
-	if _, err := w.WriteString(s); err != nil {
-		return err
-	}
-	if err := w.WriteByte(q); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Section 12.1.2, "Elements", gives this list of void elements. Void elements
-// are those that can't have any contents.
-var voidElements = map[string]bool{
-	"area":    true,
-	"base":    true,
-	"br":      true,
-	"col":     true,
-	"command": true,
-	"embed":   true,
-	"hr":      true,
-	"img":     true,
-	"input":   true,
-	"keygen":  true,
-	"link":    true,
-	"meta":    true,
-	"param":   true,
-	"source":  true,
-	"track":   true,
-	"wbr":     true,
-}
diff --git a/vendor/golang.org/x/net/html/token.go b/vendor/golang.org/x/net/html/token.go
deleted file mode 100644
index 893e272a9e..0000000000
--- a/vendor/golang.org/x/net/html/token.go
+++ /dev/null
@@ -1,1219 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"strconv"
-	"strings"
-
-	"golang.org/x/net/html/atom"
-)
-
-// A TokenType is the type of a Token.
-type TokenType uint32
-
-const (
-	// ErrorToken means that an error occurred during tokenization.
-	ErrorToken TokenType = iota
-	// TextToken means a text node.
-	TextToken
-	// A StartTagToken looks like <a>.
-	StartTagToken
-	// An EndTagToken looks like </a>.
-	EndTagToken
-	// A SelfClosingTagToken tag looks like <br/>.
-	SelfClosingTagToken
-	// A CommentToken looks like <!--x-->.
-	CommentToken
-	// A DoctypeToken looks like <!DOCTYPE x>
-	DoctypeToken
-)
-
-// ErrBufferExceeded means that the buffering limit was exceeded.
-var ErrBufferExceeded = errors.New("max buffer exceeded")
-
-// String returns a string representation of the TokenType.
-func (t TokenType) String() string {
-	switch t {
-	case ErrorToken:
-		return "Error"
-	case TextToken:
-		return "Text"
-	case StartTagToken:
-		return "StartTag"
-	case EndTagToken:
-		return "EndTag"
-	case SelfClosingTagToken:
-		return "SelfClosingTag"
-	case CommentToken:
-		return "Comment"
-	case DoctypeToken:
-		return "Doctype"
-	}
-	return "Invalid(" + strconv.Itoa(int(t)) + ")"
-}
-
-// An Attribute is an attribute namespace-key-value triple. Namespace is
-// non-empty for foreign attributes like xlink, Key is alphabetic (and hence
-// does not contain escapable characters like '&', '<' or '>'), and Val is
-// unescaped (it looks like "a<b" rather than "a&lt;b").
-//
-// Namespace is only used by the parser, not the tokenizer.
-type Attribute struct {
-	Namespace, Key, Val string
-}
-
-// A Token consists of a TokenType and some Data (tag name for start and end
-// tags, content for text, comments and doctypes). A tag Token may also contain
-// a slice of Attributes. Data is unescaped for all Tokens (it looks like "a<b"
-// rather than "a&lt;b"). For tag Tokens, DataAtom is the atom for Data, or
-// zero if Data is not a known tag name.
-type Token struct {
-	Type     TokenType
-	DataAtom atom.Atom
-	Data     string
-	Attr     []Attribute
-}
-
-// tagString returns a string representation of a tag Token's Data and Attr.
-func (t Token) tagString() string {
-	if len(t.Attr) == 0 {
-		return t.Data
-	}
-	buf := bytes.NewBufferString(t.Data)
-	for _, a := range t.Attr {
-		buf.WriteByte(' ')
-		buf.WriteString(a.Key)
-		buf.WriteString(`="`)
-		escape(buf, a.Val)
-		buf.WriteByte('"')
-	}
-	return buf.String()
-}
-
-// String returns a string representation of the Token.
-func (t Token) String() string {
-	switch t.Type {
-	case ErrorToken:
-		return ""
-	case TextToken:
-		return EscapeString(t.Data)
-	case StartTagToken:
-		return "<" + t.tagString() + ">"
-	case EndTagToken:
-		return "</" + t.tagString() + ">"
-	case SelfClosingTagToken:
-		return "<" + t.tagString() + "/>"
-	case CommentToken:
-		return "<!--" + t.Data + "-->"
-	case DoctypeToken:
-		return "<!DOCTYPE " + t.Data + ">"
-	}
-	return "Invalid(" + strconv.Itoa(int(t.Type)) + ")"
-}
-
-// span is a range of bytes in a Tokenizer's buffer. The start is inclusive,
-// the end is exclusive.
-type span struct {
-	start, end int
-}
-
-// A Tokenizer returns a stream of HTML Tokens.
-type Tokenizer struct {
-	// r is the source of the HTML text.
-	r io.Reader
-	// tt is the TokenType of the current token.
-	tt TokenType
-	// err is the first error encountered during tokenization. It is possible
-	// for tt != Error && err != nil to hold: this means that Next returned a
-	// valid token but the subsequent Next call will return an error token.
-	// For example, if the HTML text input was just "plain", then the first
-	// Next call would set z.err to io.EOF but return a TextToken, and all
-	// subsequent Next calls would return an ErrorToken.
-	// err is never reset. Once it becomes non-nil, it stays non-nil.
-	err error
-	// readErr is the error returned by the io.Reader r. It is separate from
-	// err because it is valid for an io.Reader to return (n int, err1 error)
-	// such that n > 0 && err1 != nil, and callers should always process the
-	// n > 0 bytes before considering the error err1.
-	readErr error
-	// buf[raw.start:raw.end] holds the raw bytes of the current token.
-	// buf[raw.end:] is buffered input that will yield future tokens.
-	raw span
-	buf []byte
-	// maxBuf limits the data buffered in buf. A value of 0 means unlimited.
-	maxBuf int
-	// buf[data.start:data.end] holds the raw bytes of the current token's data:
-	// a text token's text, a tag token's tag name, etc.
-	data span
-	// pendingAttr is the attribute key and value currently being tokenized.
-	// When complete, pendingAttr is pushed onto attr. nAttrReturned is
-	// incremented on each call to TagAttr.
-	pendingAttr   [2]span
-	attr          [][2]span
-	nAttrReturned int
-	// rawTag is the "script" in "</script>" that closes the next token. If
-	// non-empty, the subsequent call to Next will return a raw or RCDATA text
-	// token: one that treats "<p>" as text instead of an element.
-	// rawTag's contents are lower-cased.
-	rawTag string
-	// textIsRaw is whether the current text token's data is not escaped.
-	textIsRaw bool
-	// convertNUL is whether NUL bytes in the current token's data should
-	// be converted into \ufffd replacement characters.
-	convertNUL bool
-	// allowCDATA is whether CDATA sections are allowed in the current context.
-	allowCDATA bool
-}
-
-// AllowCDATA sets whether or not the tokenizer recognizes <![CDATA[foo]]> as
-// the text "foo". The default value is false, which means to recognize it as
-// a bogus comment "<!-- [CDATA[foo]] -->" instead.
-//
-// Strictly speaking, an HTML5 compliant tokenizer should allow CDATA if and
-// only if tokenizing foreign content, such as MathML and SVG. However,
-// tracking foreign-contentness is difficult to do purely in the tokenizer,
-// as opposed to the parser, due to HTML integration points: an <svg> element
-// can contain a <foreignObject> that is foreign-to-SVG but not foreign-to-
-// HTML. For strict compliance with the HTML5 tokenization algorithm, it is the
-// responsibility of the user of a tokenizer to call AllowCDATA as appropriate.
-// In practice, if using the tokenizer without caring whether MathML or SVG
-// CDATA is text or comments, such as tokenizing HTML to find all the anchor
-// text, it is acceptable to ignore this responsibility.
-func (z *Tokenizer) AllowCDATA(allowCDATA bool) {
-	z.allowCDATA = allowCDATA
-}
-
-// NextIsNotRawText instructs the tokenizer that the next token should not be
-// considered as 'raw text'. Some elements, such as script and title elements,
-// normally require the next token after the opening tag to be 'raw text' that
-// has no child elements. For example, tokenizing "<title>a<b>c</b>d</title>"
-// yields a start tag token for "<title>", a text token for "a<b>c</b>d", and
-// an end tag token for "</title>". There are no distinct start tag or end tag
-// tokens for the "<b>" and "</b>".
-//
-// This tokenizer implementation will generally look for raw text at the right
-// times. Strictly speaking, an HTML5 compliant tokenizer should not look for
-// raw text if in foreign content: <title> generally needs raw text, but a
-// <title> inside an <svg> does not. Another example is that a <textarea>
-// generally needs raw text, but a <textarea> is not allowed as an immediate
-// child of a <select>; in normal parsing, a <textarea> implies </select>, but
-// one cannot close the implicit element when parsing a <select>'s InnerHTML.
-// Similarly to AllowCDATA, tracking the correct moment to override raw-text-
-// ness is difficult to do purely in the tokenizer, as opposed to the parser.
-// For strict compliance with the HTML5 tokenization algorithm, it is the
-// responsibility of the user of a tokenizer to call NextIsNotRawText as
-// appropriate. In practice, like AllowCDATA, it is acceptable to ignore this
-// responsibility for basic usage.
-//
-// Note that this 'raw text' concept is different from the one offered by the
-// Tokenizer.Raw method.
-func (z *Tokenizer) NextIsNotRawText() {
-	z.rawTag = ""
-}
-
-// Err returns the error associated with the most recent ErrorToken token.
-// This is typically io.EOF, meaning the end of tokenization.
-func (z *Tokenizer) Err() error {
-	if z.tt != ErrorToken {
-		return nil
-	}
-	return z.err
-}
-
-// readByte returns the next byte from the input stream, doing a buffered read
-// from z.r into z.buf if necessary. z.buf[z.raw.start:z.raw.end] remains a contiguous byte
-// slice that holds all the bytes read so far for the current token.
-// It sets z.err if the underlying reader returns an error.
-// Pre-condition: z.err == nil.
-func (z *Tokenizer) readByte() byte {
-	if z.raw.end >= len(z.buf) {
-		// Our buffer is exhausted and we have to read from z.r. Check if the
-		// previous read resulted in an error.
-		if z.readErr != nil {
-			z.err = z.readErr
-			return 0
-		}
-		// We copy z.buf[z.raw.start:z.raw.end] to the beginning of z.buf. If the length
-		// z.raw.end - z.raw.start is more than half the capacity of z.buf, then we
-		// allocate a new buffer before the copy.
-		c := cap(z.buf)
-		d := z.raw.end - z.raw.start
-		var buf1 []byte
-		if 2*d > c {
-			buf1 = make([]byte, d, 2*c)
-		} else {
-			buf1 = z.buf[:d]
-		}
-		copy(buf1, z.buf[z.raw.start:z.raw.end])
-		if x := z.raw.start; x != 0 {
-			// Adjust the data/attr spans to refer to the same contents after the copy.
-			z.data.start -= x
-			z.data.end -= x
-			z.pendingAttr[0].start -= x
-			z.pendingAttr[0].end -= x
-			z.pendingAttr[1].start -= x
-			z.pendingAttr[1].end -= x
-			for i := range z.attr {
-				z.attr[i][0].start -= x
-				z.attr[i][0].end -= x
-				z.attr[i][1].start -= x
-				z.attr[i][1].end -= x
-			}
-		}
-		z.raw.start, z.raw.end, z.buf = 0, d, buf1[:d]
-		// Now that we have copied the live bytes to the start of the buffer,
-		// we read from z.r into the remainder.
-		var n int
-		n, z.readErr = readAtLeastOneByte(z.r, buf1[d:cap(buf1)])
-		if n == 0 {
-			z.err = z.readErr
-			return 0
-		}
-		z.buf = buf1[:d+n]
-	}
-	x := z.buf[z.raw.end]
-	z.raw.end++
-	if z.maxBuf > 0 && z.raw.end-z.raw.start >= z.maxBuf {
-		z.err = ErrBufferExceeded
-		return 0
-	}
-	return x
-}
-
-// Buffered returns a slice containing data buffered but not yet tokenized.
-func (z *Tokenizer) Buffered() []byte {
-	return z.buf[z.raw.end:]
-}
-
-// readAtLeastOneByte wraps an io.Reader so that reading cannot return (0, nil).
-// It returns io.ErrNoProgress if the underlying r.Read method returns (0, nil)
-// too many times in succession.
-func readAtLeastOneByte(r io.Reader, b []byte) (int, error) {
-	for i := 0; i < 100; i++ {
-		n, err := r.Read(b)
-		if n != 0 || err != nil {
-			return n, err
-		}
-	}
-	return 0, io.ErrNoProgress
-}
-
-// skipWhiteSpace skips past any white space.
-func (z *Tokenizer) skipWhiteSpace() {
-	if z.err != nil {
-		return
-	}
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			return
-		}
-		switch c {
-		case ' ', '\n', '\r', '\t', '\f':
-			// No-op.
-		default:
-			z.raw.end--
-			return
-		}
-	}
-}
-
-// readRawOrRCDATA reads until the next "</foo>", where "foo" is z.rawTag and
-// is typically something like "script" or "textarea".
-func (z *Tokenizer) readRawOrRCDATA() {
-	if z.rawTag == "script" {
-		z.readScript()
-		z.textIsRaw = true
-		z.rawTag = ""
-		return
-	}
-loop:
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			break loop
-		}
-		if c != '<' {
-			continue loop
-		}
-		c = z.readByte()
-		if z.err != nil {
-			break loop
-		}
-		if c != '/' {
-			continue loop
-		}
-		if z.readRawEndTag() || z.err != nil {
-			break loop
-		}
-	}
-	z.data.end = z.raw.end
-	// A textarea's or title's RCDATA can contain escaped entities.
-	z.textIsRaw = z.rawTag != "textarea" && z.rawTag != "title"
-	z.rawTag = ""
-}
-
-// readRawEndTag attempts to read a tag like "</foo>", where "foo" is z.rawTag.
-// If it succeeds, it backs up the input position to reconsume the tag and
-// returns true. Otherwise it returns false. The opening "</" has already been
-// consumed.
-func (z *Tokenizer) readRawEndTag() bool {
-	for i := 0; i < len(z.rawTag); i++ {
-		c := z.readByte()
-		if z.err != nil {
-			return false
-		}
-		if c != z.rawTag[i] && c != z.rawTag[i]-('a'-'A') {
-			z.raw.end--
-			return false
-		}
-	}
-	c := z.readByte()
-	if z.err != nil {
-		return false
-	}
-	switch c {
-	case ' ', '\n', '\r', '\t', '\f', '/', '>':
-		// The 3 is 2 for the leading "</" plus 1 for the trailing character c.
-		z.raw.end -= 3 + len(z.rawTag)
-		return true
-	}
-	z.raw.end--
-	return false
-}
-
-// readScript reads until the next </script> tag, following the byzantine
-// rules for escaping/hiding the closing tag.
-func (z *Tokenizer) readScript() {
-	defer func() {
-		z.data.end = z.raw.end
-	}()
-	var c byte
-
-scriptData:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '<' {
-		goto scriptDataLessThanSign
-	}
-	goto scriptData
-
-scriptDataLessThanSign:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '/':
-		goto scriptDataEndTagOpen
-	case '!':
-		goto scriptDataEscapeStart
-	}
-	z.raw.end--
-	goto scriptData
-
-scriptDataEndTagOpen:
-	if z.readRawEndTag() || z.err != nil {
-		return
-	}
-	goto scriptData
-
-scriptDataEscapeStart:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '-' {
-		goto scriptDataEscapeStartDash
-	}
-	z.raw.end--
-	goto scriptData
-
-scriptDataEscapeStartDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '-' {
-		goto scriptDataEscapedDashDash
-	}
-	z.raw.end--
-	goto scriptData
-
-scriptDataEscaped:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataEscapedDash
-	case '<':
-		goto scriptDataEscapedLessThanSign
-	}
-	goto scriptDataEscaped
-
-scriptDataEscapedDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataEscapedDashDash
-	case '<':
-		goto scriptDataEscapedLessThanSign
-	}
-	goto scriptDataEscaped
-
-scriptDataEscapedDashDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataEscapedDashDash
-	case '<':
-		goto scriptDataEscapedLessThanSign
-	case '>':
-		goto scriptData
-	}
-	goto scriptDataEscaped
-
-scriptDataEscapedLessThanSign:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '/' {
-		goto scriptDataEscapedEndTagOpen
-	}
-	if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
-		goto scriptDataDoubleEscapeStart
-	}
-	z.raw.end--
-	goto scriptData
-
-scriptDataEscapedEndTagOpen:
-	if z.readRawEndTag() || z.err != nil {
-		return
-	}
-	goto scriptDataEscaped
-
-scriptDataDoubleEscapeStart:
-	z.raw.end--
-	for i := 0; i < len("script"); i++ {
-		c = z.readByte()
-		if z.err != nil {
-			return
-		}
-		if c != "script"[i] && c != "SCRIPT"[i] {
-			z.raw.end--
-			goto scriptDataEscaped
-		}
-	}
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case ' ', '\n', '\r', '\t', '\f', '/', '>':
-		goto scriptDataDoubleEscaped
-	}
-	z.raw.end--
-	goto scriptDataEscaped
-
-scriptDataDoubleEscaped:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataDoubleEscapedDash
-	case '<':
-		goto scriptDataDoubleEscapedLessThanSign
-	}
-	goto scriptDataDoubleEscaped
-
-scriptDataDoubleEscapedDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataDoubleEscapedDashDash
-	case '<':
-		goto scriptDataDoubleEscapedLessThanSign
-	}
-	goto scriptDataDoubleEscaped
-
-scriptDataDoubleEscapedDashDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataDoubleEscapedDashDash
-	case '<':
-		goto scriptDataDoubleEscapedLessThanSign
-	case '>':
-		goto scriptData
-	}
-	goto scriptDataDoubleEscaped
-
-scriptDataDoubleEscapedLessThanSign:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '/' {
-		goto scriptDataDoubleEscapeEnd
-	}
-	z.raw.end--
-	goto scriptDataDoubleEscaped
-
-scriptDataDoubleEscapeEnd:
-	if z.readRawEndTag() {
-		z.raw.end += len("</script>")
-		goto scriptDataEscaped
-	}
-	if z.err != nil {
-		return
-	}
-	goto scriptDataDoubleEscaped
-}
-
-// readComment reads the next comment token starting with "<!--". The opening
-// "<!--" has already been consumed.
-func (z *Tokenizer) readComment() {
-	z.data.start = z.raw.end
-	defer func() {
-		if z.data.end < z.data.start {
-			// It's a comment with no data, like <!-->.
-			z.data.end = z.data.start
-		}
-	}()
-	for dashCount := 2; ; {
-		c := z.readByte()
-		if z.err != nil {
-			// Ignore up to two dashes at EOF.
-			if dashCount > 2 {
-				dashCount = 2
-			}
-			z.data.end = z.raw.end - dashCount
-			return
-		}
-		switch c {
-		case '-':
-			dashCount++
-			continue
-		case '>':
-			if dashCount >= 2 {
-				z.data.end = z.raw.end - len("-->")
-				return
-			}
-		case '!':
-			if dashCount >= 2 {
-				c = z.readByte()
-				if z.err != nil {
-					z.data.end = z.raw.end
-					return
-				}
-				if c == '>' {
-					z.data.end = z.raw.end - len("--!>")
-					return
-				}
-			}
-		}
-		dashCount = 0
-	}
-}
-
-// readUntilCloseAngle reads until the next ">".
-func (z *Tokenizer) readUntilCloseAngle() {
-	z.data.start = z.raw.end
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return
-		}
-		if c == '>' {
-			z.data.end = z.raw.end - len(">")
-			return
-		}
-	}
-}
-
-// readMarkupDeclaration reads the next token starting with "<!". It might be
-// a "<!--comment-->", a "<!DOCTYPE foo>", a "<![CDATA[section]]>" or
-// "<!a bogus comment". The opening "<!" has already been consumed.
-func (z *Tokenizer) readMarkupDeclaration() TokenType {
-	z.data.start = z.raw.end
-	var c [2]byte
-	for i := 0; i < 2; i++ {
-		c[i] = z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return CommentToken
-		}
-	}
-	if c[0] == '-' && c[1] == '-' {
-		z.readComment()
-		return CommentToken
-	}
-	z.raw.end -= 2
-	if z.readDoctype() {
-		return DoctypeToken
-	}
-	if z.allowCDATA && z.readCDATA() {
-		z.convertNUL = true
-		return TextToken
-	}
-	// It's a bogus comment.
-	z.readUntilCloseAngle()
-	return CommentToken
-}
-
-// readDoctype attempts to read a doctype declaration and returns true if
-// successful. The opening "<!" has already been consumed.
-func (z *Tokenizer) readDoctype() bool {
-	const s = "DOCTYPE"
-	for i := 0; i < len(s); i++ {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return false
-		}
-		if c != s[i] && c != s[i]+('a'-'A') {
-			// Back up to read the fragment of "DOCTYPE" again.
-			z.raw.end = z.data.start
-			return false
-		}
-	}
-	if z.skipWhiteSpace(); z.err != nil {
-		z.data.start = z.raw.end
-		z.data.end = z.raw.end
-		return true
-	}
-	z.readUntilCloseAngle()
-	return true
-}
-
-// readCDATA attempts to read a CDATA section and returns true if
-// successful. The opening "<!" has already been consumed.
-func (z *Tokenizer) readCDATA() bool {
-	const s = "[CDATA["
-	for i := 0; i < len(s); i++ {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return false
-		}
-		if c != s[i] {
-			// Back up to read the fragment of "[CDATA[" again.
-			z.raw.end = z.data.start
-			return false
-		}
-	}
-	z.data.start = z.raw.end
-	brackets := 0
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return true
-		}
-		switch c {
-		case ']':
-			brackets++
-		case '>':
-			if brackets >= 2 {
-				z.data.end = z.raw.end - len("]]>")
-				return true
-			}
-			brackets = 0
-		default:
-			brackets = 0
-		}
-	}
-}
-
-// startTagIn returns whether the start tag in z.buf[z.data.start:z.data.end]
-// case-insensitively matches any element of ss.
-func (z *Tokenizer) startTagIn(ss ...string) bool {
-loop:
-	for _, s := range ss {
-		if z.data.end-z.data.start != len(s) {
-			continue loop
-		}
-		for i := 0; i < len(s); i++ {
-			c := z.buf[z.data.start+i]
-			if 'A' <= c && c <= 'Z' {
-				c += 'a' - 'A'
-			}
-			if c != s[i] {
-				continue loop
-			}
-		}
-		return true
-	}
-	return false
-}
-
-// readStartTag reads the next start tag token. The opening "<a" has already
-// been consumed, where 'a' means anything in [A-Za-z].
-func (z *Tokenizer) readStartTag() TokenType {
-	z.readTag(true)
-	if z.err != nil {
-		return ErrorToken
-	}
-	// Several tags flag the tokenizer's next token as raw.
-	c, raw := z.buf[z.data.start], false
-	if 'A' <= c && c <= 'Z' {
-		c += 'a' - 'A'
-	}
-	switch c {
-	case 'i':
-		raw = z.startTagIn("iframe")
-	case 'n':
-		raw = z.startTagIn("noembed", "noframes", "noscript")
-	case 'p':
-		raw = z.startTagIn("plaintext")
-	case 's':
-		raw = z.startTagIn("script", "style")
-	case 't':
-		raw = z.startTagIn("textarea", "title")
-	case 'x':
-		raw = z.startTagIn("xmp")
-	}
-	if raw {
-		z.rawTag = strings.ToLower(string(z.buf[z.data.start:z.data.end]))
-	}
-	// Look for a self-closing token like "<br/>".
-	if z.err == nil && z.buf[z.raw.end-2] == '/' {
-		return SelfClosingTagToken
-	}
-	return StartTagToken
-}
-
-// readTag reads the next tag token and its attributes. If saveAttr, those
-// attributes are saved in z.attr, otherwise z.attr is set to an empty slice.
-// The opening "<a" or "</a" has already been consumed, where 'a' means anything
-// in [A-Za-z].
-func (z *Tokenizer) readTag(saveAttr bool) {
-	z.attr = z.attr[:0]
-	z.nAttrReturned = 0
-	// Read the tag name and attribute key/value pairs.
-	z.readTagName()
-	if z.skipWhiteSpace(); z.err != nil {
-		return
-	}
-	for {
-		c := z.readByte()
-		if z.err != nil || c == '>' {
-			break
-		}
-		z.raw.end--
-		z.readTagAttrKey()
-		z.readTagAttrVal()
-		// Save pendingAttr if saveAttr and that attribute has a non-empty key.
-		if saveAttr && z.pendingAttr[0].start != z.pendingAttr[0].end {
-			z.attr = append(z.attr, z.pendingAttr)
-		}
-		if z.skipWhiteSpace(); z.err != nil {
-			break
-		}
-	}
-}
-
-// readTagName sets z.data to the "div" in "<div k=v>". The reader (z.raw.end)
-// is positioned such that the first byte of the tag name (the "d" in "<div")
-// has already been consumed.
-func (z *Tokenizer) readTagName() {
-	z.data.start = z.raw.end - 1
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return
-		}
-		switch c {
-		case ' ', '\n', '\r', '\t', '\f':
-			z.data.end = z.raw.end - 1
-			return
-		case '/', '>':
-			z.raw.end--
-			z.data.end = z.raw.end
-			return
-		}
-	}
-}
-
-// readTagAttrKey sets z.pendingAttr[0] to the "k" in "<div k=v>".
-// Precondition: z.err == nil.
-func (z *Tokenizer) readTagAttrKey() {
-	z.pendingAttr[0].start = z.raw.end
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			z.pendingAttr[0].end = z.raw.end
-			return
-		}
-		switch c {
-		case ' ', '\n', '\r', '\t', '\f', '/':
-			z.pendingAttr[0].end = z.raw.end - 1
-			return
-		case '=', '>':
-			z.raw.end--
-			z.pendingAttr[0].end = z.raw.end
-			return
-		}
-	}
-}
-
-// readTagAttrVal sets z.pendingAttr[1] to the "v" in "<div k=v>".
-func (z *Tokenizer) readTagAttrVal() {
-	z.pendingAttr[1].start = z.raw.end
-	z.pendingAttr[1].end = z.raw.end
-	if z.skipWhiteSpace(); z.err != nil {
-		return
-	}
-	c := z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c != '=' {
-		z.raw.end--
-		return
-	}
-	if z.skipWhiteSpace(); z.err != nil {
-		return
-	}
-	quote := z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch quote {
-	case '>':
-		z.raw.end--
-		return
-
-	case '\'', '"':
-		z.pendingAttr[1].start = z.raw.end
-		for {
-			c := z.readByte()
-			if z.err != nil {
-				z.pendingAttr[1].end = z.raw.end
-				return
-			}
-			if c == quote {
-				z.pendingAttr[1].end = z.raw.end - 1
-				return
-			}
-		}
-
-	default:
-		z.pendingAttr[1].start = z.raw.end - 1
-		for {
-			c := z.readByte()
-			if z.err != nil {
-				z.pendingAttr[1].end = z.raw.end
-				return
-			}
-			switch c {
-			case ' ', '\n', '\r', '\t', '\f':
-				z.pendingAttr[1].end = z.raw.end - 1
-				return
-			case '>':
-				z.raw.end--
-				z.pendingAttr[1].end = z.raw.end
-				return
-			}
-		}
-	}
-}
-
-// Next scans the next token and returns its type.
-func (z *Tokenizer) Next() TokenType {
-	z.raw.start = z.raw.end
-	z.data.start = z.raw.end
-	z.data.end = z.raw.end
-	if z.err != nil {
-		z.tt = ErrorToken
-		return z.tt
-	}
-	if z.rawTag != "" {
-		if z.rawTag == "plaintext" {
-			// Read everything up to EOF.
-			for z.err == nil {
-				z.readByte()
-			}
-			z.data.end = z.raw.end
-			z.textIsRaw = true
-		} else {
-			z.readRawOrRCDATA()
-		}
-		if z.data.end > z.data.start {
-			z.tt = TextToken
-			z.convertNUL = true
-			return z.tt
-		}
-	}
-	z.textIsRaw = false
-	z.convertNUL = false
-
-loop:
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			break loop
-		}
-		if c != '<' {
-			continue loop
-		}
-
-		// Check if the '<' we have just read is part of a tag, comment
-		// or doctype. If not, it's part of the accumulated text token.
-		c = z.readByte()
-		if z.err != nil {
-			break loop
-		}
-		var tokenType TokenType
-		switch {
-		case 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z':
-			tokenType = StartTagToken
-		case c == '/':
-			tokenType = EndTagToken
-		case c == '!' || c == '?':
-			// We use CommentToken to mean any of "<!--actual comments-->",
-			// "<!DOCTYPE declarations>" and "<?xml processing instructions?>".
-			tokenType = CommentToken
-		default:
-			// Reconsume the current character.
-			z.raw.end--
-			continue
-		}
-
-		// We have a non-text token, but we might have accumulated some text
-		// before that. If so, we return the text first, and return the non-
-		// text token on the subsequent call to Next.
-		if x := z.raw.end - len("<a"); z.raw.start < x {
-			z.raw.end = x
-			z.data.end = x
-			z.tt = TextToken
-			return z.tt
-		}
-		switch tokenType {
-		case StartTagToken:
-			z.tt = z.readStartTag()
-			return z.tt
-		case EndTagToken:
-			c = z.readByte()
-			if z.err != nil {
-				break loop
-			}
-			if c == '>' {
-				// "</>" does not generate a token at all. Generate an empty comment
-				// to allow passthrough clients to pick up the data using Raw.
-				// Reset the tokenizer state and start again.
-				z.tt = CommentToken
-				return z.tt
-			}
-			if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
-				z.readTag(false)
-				if z.err != nil {
-					z.tt = ErrorToken
-				} else {
-					z.tt = EndTagToken
-				}
-				return z.tt
-			}
-			z.raw.end--
-			z.readUntilCloseAngle()
-			z.tt = CommentToken
-			return z.tt
-		case CommentToken:
-			if c == '!' {
-				z.tt = z.readMarkupDeclaration()
-				return z.tt
-			}
-			z.raw.end--
-			z.readUntilCloseAngle()
-			z.tt = CommentToken
-			return z.tt
-		}
-	}
-	if z.raw.start < z.raw.end {
-		z.data.end = z.raw.end
-		z.tt = TextToken
-		return z.tt
-	}
-	z.tt = ErrorToken
-	return z.tt
-}
-
-// Raw returns the unmodified text of the current token. Calling Next, Token,
-// Text, TagName or TagAttr may change the contents of the returned slice.
-func (z *Tokenizer) Raw() []byte {
-	return z.buf[z.raw.start:z.raw.end]
-}
-
-// convertNewlines converts "\r" and "\r\n" in s to "\n".
-// The conversion happens in place, but the resulting slice may be shorter.
-func convertNewlines(s []byte) []byte {
-	for i, c := range s {
-		if c != '\r' {
-			continue
-		}
-
-		src := i + 1
-		if src >= len(s) || s[src] != '\n' {
-			s[i] = '\n'
-			continue
-		}
-
-		dst := i
-		for src < len(s) {
-			if s[src] == '\r' {
-				if src+1 < len(s) && s[src+1] == '\n' {
-					src++
-				}
-				s[dst] = '\n'
-			} else {
-				s[dst] = s[src]
-			}
-			src++
-			dst++
-		}
-		return s[:dst]
-	}
-	return s
-}
-
-var (
-	nul         = []byte("\x00")
-	replacement = []byte("\ufffd")
-)
-
-// Text returns the unescaped text of a text, comment or doctype token. The
-// contents of the returned slice may change on the next call to Next.
-func (z *Tokenizer) Text() []byte {
-	switch z.tt {
-	case TextToken, CommentToken, DoctypeToken:
-		s := z.buf[z.data.start:z.data.end]
-		z.data.start = z.raw.end
-		z.data.end = z.raw.end
-		s = convertNewlines(s)
-		if (z.convertNUL || z.tt == CommentToken) && bytes.Contains(s, nul) {
-			s = bytes.Replace(s, nul, replacement, -1)
-		}
-		if !z.textIsRaw {
-			s = unescape(s, false)
-		}
-		return s
-	}
-	return nil
-}
-
-// TagName returns the lower-cased name of a tag token (the `img` out of
-// `<IMG SRC="foo">`) and whether the tag has attributes.
-// The contents of the returned slice may change on the next call to Next.
-func (z *Tokenizer) TagName() (name []byte, hasAttr bool) {
-	if z.data.start < z.data.end {
-		switch z.tt {
-		case StartTagToken, EndTagToken, SelfClosingTagToken:
-			s := z.buf[z.data.start:z.data.end]
-			z.data.start = z.raw.end
-			z.data.end = z.raw.end
-			return lower(s), z.nAttrReturned < len(z.attr)
-		}
-	}
-	return nil, false
-}
-
-// TagAttr returns the lower-cased key and unescaped value of the next unparsed
-// attribute for the current tag token and whether there are more attributes.
-// The contents of the returned slices may change on the next call to Next.
-func (z *Tokenizer) TagAttr() (key, val []byte, moreAttr bool) {
-	if z.nAttrReturned < len(z.attr) {
-		switch z.tt {
-		case StartTagToken, SelfClosingTagToken:
-			x := z.attr[z.nAttrReturned]
-			z.nAttrReturned++
-			key = z.buf[x[0].start:x[0].end]
-			val = z.buf[x[1].start:x[1].end]
-			return lower(key), unescape(convertNewlines(val), true), z.nAttrReturned < len(z.attr)
-		}
-	}
-	return nil, nil, false
-}
-
-// Token returns the next Token. The result's Data and Attr values remain valid
-// after subsequent Next calls.
-func (z *Tokenizer) Token() Token {
-	t := Token{Type: z.tt}
-	switch z.tt {
-	case TextToken, CommentToken, DoctypeToken:
-		t.Data = string(z.Text())
-	case StartTagToken, SelfClosingTagToken, EndTagToken:
-		name, moreAttr := z.TagName()
-		for moreAttr {
-			var key, val []byte
-			key, val, moreAttr = z.TagAttr()
-			t.Attr = append(t.Attr, Attribute{"", atom.String(key), string(val)})
-		}
-		if a := atom.Lookup(name); a != 0 {
-			t.DataAtom, t.Data = a, a.String()
-		} else {
-			t.DataAtom, t.Data = 0, string(name)
-		}
-	}
-	return t
-}
-
-// SetMaxBuf sets a limit on the amount of data buffered during tokenization.
-// A value of 0 means unlimited.
-func (z *Tokenizer) SetMaxBuf(n int) {
-	z.maxBuf = n
-}
-
-// NewTokenizer returns a new HTML Tokenizer for the given Reader.
-// The input is assumed to be UTF-8 encoded.
-func NewTokenizer(r io.Reader) *Tokenizer {
-	return NewTokenizerFragment(r, "")
-}
-
-// NewTokenizerFragment returns a new HTML Tokenizer for the given Reader, for
-// tokenizing an existing element's InnerHTML fragment. contextTag is that
-// element's tag, such as "div" or "iframe".
-//
-// For example, how the InnerHTML "a<b" is tokenized depends on whether it is
-// for a <p> tag or a <script> tag.
-//
-// The input is assumed to be UTF-8 encoded.
-func NewTokenizerFragment(r io.Reader, contextTag string) *Tokenizer {
-	z := &Tokenizer{
-		r:   r,
-		buf: make([]byte, 0, 4096),
-	}
-	if contextTag != "" {
-		switch s := strings.ToLower(contextTag); s {
-		case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "title", "textarea", "xmp":
-			z.rawTag = s
-		}
-	}
-	return z
-}
diff --git a/vendor/golang.org/x/net/idna/idna.go b/vendor/golang.org/x/net/idna/idna.go
deleted file mode 100644
index eb2473507b..0000000000
--- a/vendor/golang.org/x/net/idna/idna.go
+++ /dev/null
@@ -1,680 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package idna implements IDNA2008 using the compatibility processing
-// defined by UTS (Unicode Technical Standard) #46, which defines a standard to
-// deal with the transition from IDNA2003.
-//
-// IDNA2008 (Internationalized Domain Names for Applications), is defined in RFC
-// 5890, RFC 5891, RFC 5892, RFC 5893 and RFC 5894.
-// UTS #46 is defined in http://www.unicode.org/reports/tr46.
-// See http://unicode.org/cldr/utility/idna.jsp for a visualization of the
-// differences between these two standards.
-package idna // import "golang.org/x/net/idna"
-
-import (
-	"fmt"
-	"strings"
-	"unicode/utf8"
-
-	"golang.org/x/text/secure/bidirule"
-	"golang.org/x/text/unicode/norm"
-)
-
-// NOTE: Unlike common practice in Go APIs, the functions will return a
-// sanitized domain name in case of errors. Browsers sometimes use a partially
-// evaluated string as lookup.
-// TODO: the current error handling is, in my opinion, the least opinionated.
-// Other strategies are also viable, though:
-// Option 1) Return an empty string in case of error, but allow the user to
-//    specify explicitly which errors to ignore.
-// Option 2) Return the partially evaluated string if it is itself a valid
-//    string, otherwise return the empty string in case of error.
-// Option 3) Option 1 and 2.
-// Option 4) Always return an empty string for now and implement Option 1 as
-//    needed, and document that the return string may not be empty in case of
-//    error in the future.
-// I think Option 1 is best, but it is quite opinionated.
-
-// ToASCII is a wrapper for Punycode.ToASCII.
-func ToASCII(s string) (string, error) {
-	return Punycode.process(s, true)
-}
-
-// ToUnicode is a wrapper for Punycode.ToUnicode.
-func ToUnicode(s string) (string, error) {
-	return Punycode.process(s, false)
-}
-
-// An Option configures a Profile at creation time.
-type Option func(*options)
-
-// Transitional sets a Profile to use the Transitional mapping as defined in UTS
-// #46. This will cause, for example, "ß" to be mapped to "ss". Using the
-// transitional mapping provides a compromise between IDNA2003 and IDNA2008
-// compatibility. It is used by most browsers when resolving domain names. This
-// option is only meaningful if combined with MapForLookup.
-func Transitional(transitional bool) Option {
-	return func(o *options) { o.transitional = true }
-}
-
-// VerifyDNSLength sets whether a Profile should fail if any of the IDN parts
-// are longer than allowed by the RFC.
-func VerifyDNSLength(verify bool) Option {
-	return func(o *options) { o.verifyDNSLength = verify }
-}
-
-// RemoveLeadingDots removes leading label separators. Leading runes that map to
-// dots, such as U+3002, are removed as well.
-//
-// This is the behavior suggested by the UTS #46 and is adopted by some
-// browsers.
-func RemoveLeadingDots(remove bool) Option {
-	return func(o *options) { o.removeLeadingDots = remove }
-}
-
-// ValidateLabels sets whether to check the mandatory label validation criteria
-// as defined in Section 5.4 of RFC 5891. This includes testing for correct use
-// of hyphens ('-'), normalization, validity of runes, and the context rules.
-func ValidateLabels(enable bool) Option {
-	return func(o *options) {
-		// Don't override existing mappings, but set one that at least checks
-		// normalization if it is not set.
-		if o.mapping == nil && enable {
-			o.mapping = normalize
-		}
-		o.trie = trie
-		o.validateLabels = enable
-		o.fromPuny = validateFromPunycode
-	}
-}
-
-// StrictDomainName limits the set of permissable ASCII characters to those
-// allowed in domain names as defined in RFC 1034 (A-Z, a-z, 0-9 and the
-// hyphen). This is set by default for MapForLookup and ValidateForRegistration.
-//
-// This option is useful, for instance, for browsers that allow characters
-// outside this range, for example a '_' (U+005F LOW LINE). See
-// http://www.rfc-editor.org/std/std3.txt for more details This option
-// corresponds to the UseSTD3ASCIIRules option in UTS #46.
-func StrictDomainName(use bool) Option {
-	return func(o *options) {
-		o.trie = trie
-		o.useSTD3Rules = use
-		o.fromPuny = validateFromPunycode
-	}
-}
-
-// NOTE: the following options pull in tables. The tables should not be linked
-// in as long as the options are not used.
-
-// BidiRule enables the Bidi rule as defined in RFC 5893. Any application
-// that relies on proper validation of labels should include this rule.
-func BidiRule() Option {
-	return func(o *options) { o.bidirule = bidirule.ValidString }
-}
-
-// ValidateForRegistration sets validation options to verify that a given IDN is
-// properly formatted for registration as defined by Section 4 of RFC 5891.
-func ValidateForRegistration() Option {
-	return func(o *options) {
-		o.mapping = validateRegistration
-		StrictDomainName(true)(o)
-		ValidateLabels(true)(o)
-		VerifyDNSLength(true)(o)
-		BidiRule()(o)
-	}
-}
-
-// MapForLookup sets validation and mapping options such that a given IDN is
-// transformed for domain name lookup according to the requirements set out in
-// Section 5 of RFC 5891. The mappings follow the recommendations of RFC 5894,
-// RFC 5895 and UTS 46. It does not add the Bidi Rule. Use the BidiRule option
-// to add this check.
-//
-// The mappings include normalization and mapping case, width and other
-// compatibility mappings.
-func MapForLookup() Option {
-	return func(o *options) {
-		o.mapping = validateAndMap
-		StrictDomainName(true)(o)
-		ValidateLabels(true)(o)
-		RemoveLeadingDots(true)(o)
-	}
-}
-
-type options struct {
-	transitional      bool
-	useSTD3Rules      bool
-	validateLabels    bool
-	verifyDNSLength   bool
-	removeLeadingDots bool
-
-	trie *idnaTrie
-
-	// fromPuny calls validation rules when converting A-labels to U-labels.
-	fromPuny func(p *Profile, s string) error
-
-	// mapping implements a validation and mapping step as defined in RFC 5895
-	// or UTS 46, tailored to, for example, domain registration or lookup.
-	mapping func(p *Profile, s string) (string, error)
-
-	// bidirule, if specified, checks whether s conforms to the Bidi Rule
-	// defined in RFC 5893.
-	bidirule func(s string) bool
-}
-
-// A Profile defines the configuration of a IDNA mapper.
-type Profile struct {
-	options
-}
-
-func apply(o *options, opts []Option) {
-	for _, f := range opts {
-		f(o)
-	}
-}
-
-// New creates a new Profile.
-//
-// With no options, the returned Profile is the most permissive and equals the
-// Punycode Profile. Options can be passed to further restrict the Profile. The
-// MapForLookup and ValidateForRegistration options set a collection of options,
-// for lookup and registration purposes respectively, which can be tailored by
-// adding more fine-grained options, where later options override earlier
-// options.
-func New(o ...Option) *Profile {
-	p := &Profile{}
-	apply(&p.options, o)
-	return p
-}
-
-// ToASCII converts a domain or domain label to its ASCII form. For example,
-// ToASCII("bücher.example.com") is "xn--bcher-kva.example.com", and
-// ToASCII("golang") is "golang". If an error is encountered it will return
-// an error and a (partially) processed result.
-func (p *Profile) ToASCII(s string) (string, error) {
-	return p.process(s, true)
-}
-
-// ToUnicode converts a domain or domain label to its Unicode form. For example,
-// ToUnicode("xn--bcher-kva.example.com") is "bücher.example.com", and
-// ToUnicode("golang") is "golang". If an error is encountered it will return
-// an error and a (partially) processed result.
-func (p *Profile) ToUnicode(s string) (string, error) {
-	pp := *p
-	pp.transitional = false
-	return pp.process(s, false)
-}
-
-// String reports a string with a description of the profile for debugging
-// purposes. The string format may change with different versions.
-func (p *Profile) String() string {
-	s := ""
-	if p.transitional {
-		s = "Transitional"
-	} else {
-		s = "NonTransitional"
-	}
-	if p.useSTD3Rules {
-		s += ":UseSTD3Rules"
-	}
-	if p.validateLabels {
-		s += ":ValidateLabels"
-	}
-	if p.verifyDNSLength {
-		s += ":VerifyDNSLength"
-	}
-	return s
-}
-
-var (
-	// Punycode is a Profile that does raw punycode processing with a minimum
-	// of validation.
-	Punycode *Profile = punycode
-
-	// Lookup is the recommended profile for looking up domain names, according
-	// to Section 5 of RFC 5891. The exact configuration of this profile may
-	// change over time.
-	Lookup *Profile = lookup
-
-	// Display is the recommended profile for displaying domain names.
-	// The configuration of this profile may change over time.
-	Display *Profile = display
-
-	// Registration is the recommended profile for checking whether a given
-	// IDN is valid for registration, according to Section 4 of RFC 5891.
-	Registration *Profile = registration
-
-	punycode = &Profile{}
-	lookup   = &Profile{options{
-		transitional:      true,
-		useSTD3Rules:      true,
-		validateLabels:    true,
-		removeLeadingDots: true,
-		trie:              trie,
-		fromPuny:          validateFromPunycode,
-		mapping:           validateAndMap,
-		bidirule:          bidirule.ValidString,
-	}}
-	display = &Profile{options{
-		useSTD3Rules:      true,
-		validateLabels:    true,
-		removeLeadingDots: true,
-		trie:              trie,
-		fromPuny:          validateFromPunycode,
-		mapping:           validateAndMap,
-		bidirule:          bidirule.ValidString,
-	}}
-	registration = &Profile{options{
-		useSTD3Rules:    true,
-		validateLabels:  true,
-		verifyDNSLength: true,
-		trie:            trie,
-		fromPuny:        validateFromPunycode,
-		mapping:         validateRegistration,
-		bidirule:        bidirule.ValidString,
-	}}
-
-	// TODO: profiles
-	// Register: recommended for approving domain names: don't do any mappings
-	// but rather reject on invalid input. Bundle or block deviation characters.
-)
-
-type labelError struct{ label, code_ string }
-
-func (e labelError) code() string { return e.code_ }
-func (e labelError) Error() string {
-	return fmt.Sprintf("idna: invalid label %q", e.label)
-}
-
-type runeError rune
-
-func (e runeError) code() string { return "P1" }
-func (e runeError) Error() string {
-	return fmt.Sprintf("idna: disallowed rune %U", e)
-}
-
-// process implements the algorithm described in section 4 of UTS #46,
-// see http://www.unicode.org/reports/tr46.
-func (p *Profile) process(s string, toASCII bool) (string, error) {
-	var err error
-	if p.mapping != nil {
-		s, err = p.mapping(p, s)
-	}
-	// Remove leading empty labels.
-	if p.removeLeadingDots {
-		for ; len(s) > 0 && s[0] == '.'; s = s[1:] {
-		}
-	}
-	// It seems like we should only create this error on ToASCII, but the
-	// UTS 46 conformance tests suggests we should always check this.
-	if err == nil && p.verifyDNSLength && s == "" {
-		err = &labelError{s, "A4"}
-	}
-	labels := labelIter{orig: s}
-	for ; !labels.done(); labels.next() {
-		label := labels.label()
-		if label == "" {
-			// Empty labels are not okay. The label iterator skips the last
-			// label if it is empty.
-			if err == nil && p.verifyDNSLength {
-				err = &labelError{s, "A4"}
-			}
-			continue
-		}
-		if strings.HasPrefix(label, acePrefix) {
-			u, err2 := decode(label[len(acePrefix):])
-			if err2 != nil {
-				if err == nil {
-					err = err2
-				}
-				// Spec says keep the old label.
-				continue
-			}
-			labels.set(u)
-			if err == nil && p.validateLabels {
-				err = p.fromPuny(p, u)
-			}
-			if err == nil {
-				// This should be called on NonTransitional, according to the
-				// spec, but that currently does not have any effect. Use the
-				// original profile to preserve options.
-				err = p.validateLabel(u)
-			}
-		} else if err == nil {
-			err = p.validateLabel(label)
-		}
-	}
-	if toASCII {
-		for labels.reset(); !labels.done(); labels.next() {
-			label := labels.label()
-			if !ascii(label) {
-				a, err2 := encode(acePrefix, label)
-				if err == nil {
-					err = err2
-				}
-				label = a
-				labels.set(a)
-			}
-			n := len(label)
-			if p.verifyDNSLength && err == nil && (n == 0 || n > 63) {
-				err = &labelError{label, "A4"}
-			}
-		}
-	}
-	s = labels.result()
-	if toASCII && p.verifyDNSLength && err == nil {
-		// Compute the length of the domain name minus the root label and its dot.
-		n := len(s)
-		if n > 0 && s[n-1] == '.' {
-			n--
-		}
-		if len(s) < 1 || n > 253 {
-			err = &labelError{s, "A4"}
-		}
-	}
-	return s, err
-}
-
-func normalize(p *Profile, s string) (string, error) {
-	return norm.NFC.String(s), nil
-}
-
-func validateRegistration(p *Profile, s string) (string, error) {
-	if !norm.NFC.IsNormalString(s) {
-		return s, &labelError{s, "V1"}
-	}
-	for i := 0; i < len(s); {
-		v, sz := trie.lookupString(s[i:])
-		// Copy bytes not copied so far.
-		switch p.simplify(info(v).category()) {
-		// TODO: handle the NV8 defined in the Unicode idna data set to allow
-		// for strict conformance to IDNA2008.
-		case valid, deviation:
-		case disallowed, mapped, unknown, ignored:
-			r, _ := utf8.DecodeRuneInString(s[i:])
-			return s, runeError(r)
-		}
-		i += sz
-	}
-	return s, nil
-}
-
-func validateAndMap(p *Profile, s string) (string, error) {
-	var (
-		err error
-		b   []byte
-		k   int
-	)
-	for i := 0; i < len(s); {
-		v, sz := trie.lookupString(s[i:])
-		start := i
-		i += sz
-		// Copy bytes not copied so far.
-		switch p.simplify(info(v).category()) {
-		case valid:
-			continue
-		case disallowed:
-			if err == nil {
-				r, _ := utf8.DecodeRuneInString(s[start:])
-				err = runeError(r)
-			}
-			continue
-		case mapped, deviation:
-			b = append(b, s[k:start]...)
-			b = info(v).appendMapping(b, s[start:i])
-		case ignored:
-			b = append(b, s[k:start]...)
-			// drop the rune
-		case unknown:
-			b = append(b, s[k:start]...)
-			b = append(b, "\ufffd"...)
-		}
-		k = i
-	}
-	if k == 0 {
-		// No changes so far.
-		s = norm.NFC.String(s)
-	} else {
-		b = append(b, s[k:]...)
-		if norm.NFC.QuickSpan(b) != len(b) {
-			b = norm.NFC.Bytes(b)
-		}
-		// TODO: the punycode converters require strings as input.
-		s = string(b)
-	}
-	return s, err
-}
-
-// A labelIter allows iterating over domain name labels.
-type labelIter struct {
-	orig     string
-	slice    []string
-	curStart int
-	curEnd   int
-	i        int
-}
-
-func (l *labelIter) reset() {
-	l.curStart = 0
-	l.curEnd = 0
-	l.i = 0
-}
-
-func (l *labelIter) done() bool {
-	return l.curStart >= len(l.orig)
-}
-
-func (l *labelIter) result() string {
-	if l.slice != nil {
-		return strings.Join(l.slice, ".")
-	}
-	return l.orig
-}
-
-func (l *labelIter) label() string {
-	if l.slice != nil {
-		return l.slice[l.i]
-	}
-	p := strings.IndexByte(l.orig[l.curStart:], '.')
-	l.curEnd = l.curStart + p
-	if p == -1 {
-		l.curEnd = len(l.orig)
-	}
-	return l.orig[l.curStart:l.curEnd]
-}
-
-// next sets the value to the next label. It skips the last label if it is empty.
-func (l *labelIter) next() {
-	l.i++
-	if l.slice != nil {
-		if l.i >= len(l.slice) || l.i == len(l.slice)-1 && l.slice[l.i] == "" {
-			l.curStart = len(l.orig)
-		}
-	} else {
-		l.curStart = l.curEnd + 1
-		if l.curStart == len(l.orig)-1 && l.orig[l.curStart] == '.' {
-			l.curStart = len(l.orig)
-		}
-	}
-}
-
-func (l *labelIter) set(s string) {
-	if l.slice == nil {
-		l.slice = strings.Split(l.orig, ".")
-	}
-	l.slice[l.i] = s
-}
-
-// acePrefix is the ASCII Compatible Encoding prefix.
-const acePrefix = "xn--"
-
-func (p *Profile) simplify(cat category) category {
-	switch cat {
-	case disallowedSTD3Mapped:
-		if p.useSTD3Rules {
-			cat = disallowed
-		} else {
-			cat = mapped
-		}
-	case disallowedSTD3Valid:
-		if p.useSTD3Rules {
-			cat = disallowed
-		} else {
-			cat = valid
-		}
-	case deviation:
-		if !p.transitional {
-			cat = valid
-		}
-	case validNV8, validXV8:
-		// TODO: handle V2008
-		cat = valid
-	}
-	return cat
-}
-
-func validateFromPunycode(p *Profile, s string) error {
-	if !norm.NFC.IsNormalString(s) {
-		return &labelError{s, "V1"}
-	}
-	for i := 0; i < len(s); {
-		v, sz := trie.lookupString(s[i:])
-		if c := p.simplify(info(v).category()); c != valid && c != deviation {
-			return &labelError{s, "V6"}
-		}
-		i += sz
-	}
-	return nil
-}
-
-const (
-	zwnj = "\u200c"
-	zwj  = "\u200d"
-)
-
-type joinState int8
-
-const (
-	stateStart joinState = iota
-	stateVirama
-	stateBefore
-	stateBeforeVirama
-	stateAfter
-	stateFAIL
-)
-
-var joinStates = [][numJoinTypes]joinState{
-	stateStart: {
-		joiningL:   stateBefore,
-		joiningD:   stateBefore,
-		joinZWNJ:   stateFAIL,
-		joinZWJ:    stateFAIL,
-		joinVirama: stateVirama,
-	},
-	stateVirama: {
-		joiningL: stateBefore,
-		joiningD: stateBefore,
-	},
-	stateBefore: {
-		joiningL:   stateBefore,
-		joiningD:   stateBefore,
-		joiningT:   stateBefore,
-		joinZWNJ:   stateAfter,
-		joinZWJ:    stateFAIL,
-		joinVirama: stateBeforeVirama,
-	},
-	stateBeforeVirama: {
-		joiningL: stateBefore,
-		joiningD: stateBefore,
-		joiningT: stateBefore,
-	},
-	stateAfter: {
-		joiningL:   stateFAIL,
-		joiningD:   stateBefore,
-		joiningT:   stateAfter,
-		joiningR:   stateStart,
-		joinZWNJ:   stateFAIL,
-		joinZWJ:    stateFAIL,
-		joinVirama: stateAfter, // no-op as we can't accept joiners here
-	},
-	stateFAIL: {
-		0:          stateFAIL,
-		joiningL:   stateFAIL,
-		joiningD:   stateFAIL,
-		joiningT:   stateFAIL,
-		joiningR:   stateFAIL,
-		joinZWNJ:   stateFAIL,
-		joinZWJ:    stateFAIL,
-		joinVirama: stateFAIL,
-	},
-}
-
-// validateLabel validates the criteria from Section 4.1. Item 1, 4, and 6 are
-// already implicitly satisfied by the overall implementation.
-func (p *Profile) validateLabel(s string) error {
-	if s == "" {
-		if p.verifyDNSLength {
-			return &labelError{s, "A4"}
-		}
-		return nil
-	}
-	if p.bidirule != nil && !p.bidirule(s) {
-		return &labelError{s, "B"}
-	}
-	if !p.validateLabels {
-		return nil
-	}
-	trie := p.trie // p.validateLabels is only set if trie is set.
-	if len(s) > 4 && s[2] == '-' && s[3] == '-' {
-		return &labelError{s, "V2"}
-	}
-	if s[0] == '-' || s[len(s)-1] == '-' {
-		return &labelError{s, "V3"}
-	}
-	// TODO: merge the use of this in the trie.
-	v, sz := trie.lookupString(s)
-	x := info(v)
-	if x.isModifier() {
-		return &labelError{s, "V5"}
-	}
-	// Quickly return in the absence of zero-width (non) joiners.
-	if strings.Index(s, zwj) == -1 && strings.Index(s, zwnj) == -1 {
-		return nil
-	}
-	st := stateStart
-	for i := 0; ; {
-		jt := x.joinType()
-		if s[i:i+sz] == zwj {
-			jt = joinZWJ
-		} else if s[i:i+sz] == zwnj {
-			jt = joinZWNJ
-		}
-		st = joinStates[st][jt]
-		if x.isViramaModifier() {
-			st = joinStates[st][joinVirama]
-		}
-		if i += sz; i == len(s) {
-			break
-		}
-		v, sz = trie.lookupString(s[i:])
-		x = info(v)
-	}
-	if st == stateFAIL || st == stateAfter {
-		return &labelError{s, "C"}
-	}
-	return nil
-}
-
-func ascii(s string) bool {
-	for i := 0; i < len(s); i++ {
-		if s[i] >= utf8.RuneSelf {
-			return false
-		}
-	}
-	return true
-}
diff --git a/vendor/golang.org/x/net/idna/punycode.go b/vendor/golang.org/x/net/idna/punycode.go
deleted file mode 100644
index 02c7d59af3..0000000000
--- a/vendor/golang.org/x/net/idna/punycode.go
+++ /dev/null
@@ -1,203 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package idna
-
-// This file implements the Punycode algorithm from RFC 3492.
-
-import (
-	"math"
-	"strings"
-	"unicode/utf8"
-)
-
-// These parameter values are specified in section 5.
-//
-// All computation is done with int32s, so that overflow behavior is identical
-// regardless of whether int is 32-bit or 64-bit.
-const (
-	base        int32 = 36
-	damp        int32 = 700
-	initialBias int32 = 72
-	initialN    int32 = 128
-	skew        int32 = 38
-	tmax        int32 = 26
-	tmin        int32 = 1
-)
-
-func punyError(s string) error { return &labelError{s, "A3"} }
-
-// decode decodes a string as specified in section 6.2.
-func decode(encoded string) (string, error) {
-	if encoded == "" {
-		return "", nil
-	}
-	pos := 1 + strings.LastIndex(encoded, "-")
-	if pos == 1 {
-		return "", punyError(encoded)
-	}
-	if pos == len(encoded) {
-		return encoded[:len(encoded)-1], nil
-	}
-	output := make([]rune, 0, len(encoded))
-	if pos != 0 {
-		for _, r := range encoded[:pos-1] {
-			output = append(output, r)
-		}
-	}
-	i, n, bias := int32(0), initialN, initialBias
-	for pos < len(encoded) {
-		oldI, w := i, int32(1)
-		for k := base; ; k += base {
-			if pos == len(encoded) {
-				return "", punyError(encoded)
-			}
-			digit, ok := decodeDigit(encoded[pos])
-			if !ok {
-				return "", punyError(encoded)
-			}
-			pos++
-			i += digit * w
-			if i < 0 {
-				return "", punyError(encoded)
-			}
-			t := k - bias
-			if t < tmin {
-				t = tmin
-			} else if t > tmax {
-				t = tmax
-			}
-			if digit < t {
-				break
-			}
-			w *= base - t
-			if w >= math.MaxInt32/base {
-				return "", punyError(encoded)
-			}
-		}
-		x := int32(len(output) + 1)
-		bias = adapt(i-oldI, x, oldI == 0)
-		n += i / x
-		i %= x
-		if n > utf8.MaxRune || len(output) >= 1024 {
-			return "", punyError(encoded)
-		}
-		output = append(output, 0)
-		copy(output[i+1:], output[i:])
-		output[i] = n
-		i++
-	}
-	return string(output), nil
-}
-
-// encode encodes a string as specified in section 6.3 and prepends prefix to
-// the result.
-//
-// The "while h < length(input)" line in the specification becomes "for
-// remaining != 0" in the Go code, because len(s) in Go is in bytes, not runes.
-func encode(prefix, s string) (string, error) {
-	output := make([]byte, len(prefix), len(prefix)+1+2*len(s))
-	copy(output, prefix)
-	delta, n, bias := int32(0), initialN, initialBias
-	b, remaining := int32(0), int32(0)
-	for _, r := range s {
-		if r < 0x80 {
-			b++
-			output = append(output, byte(r))
-		} else {
-			remaining++
-		}
-	}
-	h := b
-	if b > 0 {
-		output = append(output, '-')
-	}
-	for remaining != 0 {
-		m := int32(0x7fffffff)
-		for _, r := range s {
-			if m > r && r >= n {
-				m = r
-			}
-		}
-		delta += (m - n) * (h + 1)
-		if delta < 0 {
-			return "", punyError(s)
-		}
-		n = m
-		for _, r := range s {
-			if r < n {
-				delta++
-				if delta < 0 {
-					return "", punyError(s)
-				}
-				continue
-			}
-			if r > n {
-				continue
-			}
-			q := delta
-			for k := base; ; k += base {
-				t := k - bias
-				if t < tmin {
-					t = tmin
-				} else if t > tmax {
-					t = tmax
-				}
-				if q < t {
-					break
-				}
-				output = append(output, encodeDigit(t+(q-t)%(base-t)))
-				q = (q - t) / (base - t)
-			}
-			output = append(output, encodeDigit(q))
-			bias = adapt(delta, h+1, h == b)
-			delta = 0
-			h++
-			remaining--
-		}
-		delta++
-		n++
-	}
-	return string(output), nil
-}
-
-func decodeDigit(x byte) (digit int32, ok bool) {
-	switch {
-	case '0' <= x && x <= '9':
-		return int32(x - ('0' - 26)), true
-	case 'A' <= x && x <= 'Z':
-		return int32(x - 'A'), true
-	case 'a' <= x && x <= 'z':
-		return int32(x - 'a'), true
-	}
-	return 0, false
-}
-
-func encodeDigit(digit int32) byte {
-	switch {
-	case 0 <= digit && digit < 26:
-		return byte(digit + 'a')
-	case 26 <= digit && digit < 36:
-		return byte(digit + ('0' - 26))
-	}
-	panic("idna: internal error in punycode encoding")
-}
-
-// adapt is the bias adaptation function specified in section 6.1.
-func adapt(delta, numPoints int32, firstTime bool) int32 {
-	if firstTime {
-		delta /= damp
-	} else {
-		delta /= 2
-	}
-	delta += delta / numPoints
-	k := int32(0)
-	for delta > ((base-tmin)*tmax)/2 {
-		delta /= base - tmin
-		k += base
-	}
-	return k + (base-tmin+1)*delta/(delta+skew)
-}
diff --git a/vendor/golang.org/x/net/idna/tables.go b/vendor/golang.org/x/net/idna/tables.go
deleted file mode 100644
index d2819345fc..0000000000
--- a/vendor/golang.org/x/net/idna/tables.go
+++ /dev/null
@@ -1,4477 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package idna
-
-// UnicodeVersion is the Unicode version from which the tables in this package are derived.
-const UnicodeVersion = "9.0.0"
-
-var mappings string = "" + // Size: 8176 bytes
-	"\x00\x01 \x03 ̈\x01a\x03 ̄\x012\x013\x03 ́\x03 ̧\x011\x01o\x051⁄4\x051⁄2" +
-	"\x053⁄4\x03i̇\x03l·\x03ʼn\x01s\x03dž\x03ⱥ\x03ⱦ\x01h\x01j\x01r\x01w\x01y" +
-	"\x03 ̆\x03 ̇\x03 ̊\x03 ̨\x03 ̃\x03 ̋\x01l\x01x\x04̈́\x03 ι\x01;\x05 ̈́" +
-	"\x04եւ\x04اٴ\x04وٴ\x04ۇٴ\x04يٴ\x06क़\x06ख़\x06ग़\x06ज़\x06ड़\x06ढ़\x06फ़" +
-	"\x06य़\x06ড়\x06ঢ়\x06য়\x06ਲ਼\x06ਸ਼\x06ਖ਼\x06ਗ਼\x06ਜ਼\x06ਫ਼\x06ଡ଼\x06ଢ଼" +
-	"\x06ํา\x06ໍາ\x06ຫນ\x06ຫມ\x06གྷ\x06ཌྷ\x06དྷ\x06བྷ\x06ཛྷ\x06ཀྵ\x06ཱི\x06ཱུ" +
-	"\x06ྲྀ\x09ྲཱྀ\x06ླྀ\x09ླཱྀ\x06ཱྀ\x06ྒྷ\x06ྜྷ\x06ྡྷ\x06ྦྷ\x06ྫྷ\x06ྐྵ\x02" +
-	"в\x02д\x02о\x02с\x02т\x02ъ\x02ѣ\x02æ\x01b\x01d\x01e\x02ǝ\x01g\x01i\x01k" +
-	"\x01m\x01n\x02ȣ\x01p\x01t\x01u\x02ɐ\x02ɑ\x02ə\x02ɛ\x02ɜ\x02ŋ\x02ɔ\x02ɯ" +
-	"\x01v\x02β\x02γ\x02δ\x02φ\x02χ\x02ρ\x02н\x02ɒ\x01c\x02ɕ\x02ð\x01f\x02ɟ" +
-	"\x02ɡ\x02ɥ\x02ɨ\x02ɩ\x02ɪ\x02ʝ\x02ɭ\x02ʟ\x02ɱ\x02ɰ\x02ɲ\x02ɳ\x02ɴ\x02ɵ" +
-	"\x02ɸ\x02ʂ\x02ʃ\x02ƫ\x02ʉ\x02ʊ\x02ʋ\x02ʌ\x01z\x02ʐ\x02ʑ\x02ʒ\x02θ\x02ss" +
-	"\x02ά\x02έ\x02ή\x02ί\x02ό\x02ύ\x02ώ\x05ἀι\x05ἁι\x05ἂι\x05ἃι\x05ἄι\x05ἅι" +
-	"\x05ἆι\x05ἇι\x05ἠι\x05ἡι\x05ἢι\x05ἣι\x05ἤι\x05ἥι\x05ἦι\x05ἧι\x05ὠι\x05ὡι" +
-	"\x05ὢι\x05ὣι\x05ὤι\x05ὥι\x05ὦι\x05ὧι\x05ὰι\x04αι\x04άι\x05ᾶι\x02ι\x05 ̈͂" +
-	"\x05ὴι\x04ηι\x04ήι\x05ῆι\x05 ̓̀\x05 ̓́\x05 ̓͂\x02ΐ\x05 ̔̀\x05 ̔́\x05 ̔͂" +
-	"\x02ΰ\x05 ̈̀\x01`\x05ὼι\x04ωι\x04ώι\x05ῶι\x06′′\x09′′′\x06‵‵\x09‵‵‵\x02!" +
-	"!\x02??\x02?!\x02!?\x0c′′′′\x010\x014\x015\x016\x017\x018\x019\x01+\x01=" +
-	"\x01(\x01)\x02rs\x02ħ\x02no\x01q\x02sm\x02tm\x02ω\x02å\x02א\x02ב\x02ג" +
-	"\x02ד\x02π\x051⁄7\x051⁄9\x061⁄10\x051⁄3\x052⁄3\x051⁄5\x052⁄5\x053⁄5\x054" +
-	"⁄5\x051⁄6\x055⁄6\x051⁄8\x053⁄8\x055⁄8\x057⁄8\x041⁄\x02ii\x02iv\x02vi" +
-	"\x04viii\x02ix\x02xi\x050⁄3\x06∫∫\x09∫∫∫\x06∮∮\x09∮∮∮\x0210\x0211\x0212" +
-	"\x0213\x0214\x0215\x0216\x0217\x0218\x0219\x0220\x04(10)\x04(11)\x04(12)" +
-	"\x04(13)\x04(14)\x04(15)\x04(16)\x04(17)\x04(18)\x04(19)\x04(20)\x0c∫∫∫∫" +
-	"\x02==\x05⫝̸\x02ɫ\x02ɽ\x02ȿ\x02ɀ\x01.\x04 ゙\x04 ゚\x06より\x06コト\x05(ᄀ)\x05" +
-	"(ᄂ)\x05(ᄃ)\x05(ᄅ)\x05(ᄆ)\x05(ᄇ)\x05(ᄉ)\x05(ᄋ)\x05(ᄌ)\x05(ᄎ)\x05(ᄏ)\x05(ᄐ" +
-	")\x05(ᄑ)\x05(ᄒ)\x05(가)\x05(나)\x05(다)\x05(라)\x05(마)\x05(바)\x05(사)\x05(아)" +
-	"\x05(자)\x05(차)\x05(카)\x05(타)\x05(파)\x05(하)\x05(주)\x08(오전)\x08(오후)\x05(一)" +
-	"\x05(二)\x05(三)\x05(四)\x05(五)\x05(六)\x05(七)\x05(八)\x05(九)\x05(十)\x05(月)" +
-	"\x05(火)\x05(水)\x05(木)\x05(金)\x05(土)\x05(日)\x05(株)\x05(有)\x05(社)\x05(名)" +
-	"\x05(特)\x05(財)\x05(祝)\x05(労)\x05(代)\x05(呼)\x05(学)\x05(監)\x05(企)\x05(資)" +
-	"\x05(協)\x05(祭)\x05(休)\x05(自)\x05(至)\x0221\x0222\x0223\x0224\x0225\x0226" +
-	"\x0227\x0228\x0229\x0230\x0231\x0232\x0233\x0234\x0235\x06참고\x06주의\x0236" +
-	"\x0237\x0238\x0239\x0240\x0241\x0242\x0243\x0244\x0245\x0246\x0247\x0248" +
-	"\x0249\x0250\x041月\x042月\x043月\x044月\x045月\x046月\x047月\x048月\x049月\x0510" +
-	"月\x0511月\x0512月\x02hg\x02ev\x0cアパート\x0cアルファ\x0cアンペア\x09アール\x0cイニング\x09" +
-	"インチ\x09ウォン\x0fエスクード\x0cエーカー\x09オンス\x09オーム\x09カイリ\x0cカラット\x0cカロリー\x09ガロ" +
-	"ン\x09ガンマ\x06ギガ\x09ギニー\x0cキュリー\x0cギルダー\x06キロ\x0fキログラム\x12キロメートル\x0fキロワッ" +
-	"ト\x09グラム\x0fグラムトン\x0fクルゼイロ\x0cクローネ\x09ケース\x09コルナ\x09コーポ\x0cサイクル\x0fサンチ" +
-	"ーム\x0cシリング\x09センチ\x09セント\x09ダース\x06デシ\x06ドル\x06トン\x06ナノ\x09ノット\x09ハイツ" +
-	"\x0fパーセント\x09パーツ\x0cバーレル\x0fピアストル\x09ピクル\x06ピコ\x06ビル\x0fファラッド\x0cフィート" +
-	"\x0fブッシェル\x09フラン\x0fヘクタール\x06ペソ\x09ペニヒ\x09ヘルツ\x09ペンス\x09ページ\x09ベータ\x0cポイ" +
-	"ント\x09ボルト\x06ホン\x09ポンド\x09ホール\x09ホーン\x0cマイクロ\x09マイル\x09マッハ\x09マルク\x0fマ" +
-	"ンション\x0cミクロン\x06ミリ\x0fミリバール\x06メガ\x0cメガトン\x0cメートル\x09ヤード\x09ヤール\x09ユアン" +
-	"\x0cリットル\x06リラ\x09ルピー\x0cルーブル\x06レム\x0fレントゲン\x09ワット\x040点\x041点\x042点" +
-	"\x043点\x044点\x045点\x046点\x047点\x048点\x049点\x0510点\x0511点\x0512点\x0513点" +
-	"\x0514点\x0515点\x0516点\x0517点\x0518点\x0519点\x0520点\x0521点\x0522点\x0523点" +
-	"\x0524点\x02da\x02au\x02ov\x02pc\x02dm\x02iu\x06平成\x06昭和\x06大正\x06明治\x0c株" +
-	"式会社\x02pa\x02na\x02ma\x02ka\x02kb\x02mb\x02gb\x04kcal\x02pf\x02nf\x02m" +
-	"g\x02kg\x02hz\x02ml\x02dl\x02kl\x02fm\x02nm\x02mm\x02cm\x02km\x02m2\x02m" +
-	"3\x05m∕s\x06m∕s2\x07rad∕s\x08rad∕s2\x02ps\x02ns\x02ms\x02pv\x02nv\x02mv" +
-	"\x02kv\x02pw\x02nw\x02mw\x02kw\x02bq\x02cc\x02cd\x06c∕kg\x02db\x02gy\x02" +
-	"ha\x02hp\x02in\x02kk\x02kt\x02lm\x02ln\x02lx\x02ph\x02pr\x02sr\x02sv\x02" +
-	"wb\x05v∕m\x05a∕m\x041日\x042日\x043日\x044日\x045日\x046日\x047日\x048日\x049日" +
-	"\x0510日\x0511日\x0512日\x0513日\x0514日\x0515日\x0516日\x0517日\x0518日\x0519日" +
-	"\x0520日\x0521日\x0522日\x0523日\x0524日\x0525日\x0526日\x0527日\x0528日\x0529日" +
-	"\x0530日\x0531日\x02ь\x02ɦ\x02ɬ\x02ʞ\x02ʇ\x02œ\x04𤋮\x04𢡊\x04𢡄\x04𣏕\x04𥉉" +
-	"\x04𥳐\x04𧻓\x02ff\x02fi\x02fl\x02st\x04մն\x04մե\x04մի\x04վն\x04մխ\x04יִ" +
-	"\x04ײַ\x02ע\x02ה\x02כ\x02ל\x02ם\x02ר\x02ת\x04שׁ\x04שׂ\x06שּׁ\x06שּׂ\x04א" +
-	"ַ\x04אָ\x04אּ\x04בּ\x04גּ\x04דּ\x04הּ\x04וּ\x04זּ\x04טּ\x04יּ\x04ךּ\x04" +
-	"כּ\x04לּ\x04מּ\x04נּ\x04סּ\x04ףּ\x04פּ\x04צּ\x04קּ\x04רּ\x04שּ\x04תּ" +
-	"\x04וֹ\x04בֿ\x04כֿ\x04פֿ\x04אל\x02ٱ\x02ٻ\x02پ\x02ڀ\x02ٺ\x02ٿ\x02ٹ\x02ڤ" +
-	"\x02ڦ\x02ڄ\x02ڃ\x02چ\x02ڇ\x02ڍ\x02ڌ\x02ڎ\x02ڈ\x02ژ\x02ڑ\x02ک\x02گ\x02ڳ" +
-	"\x02ڱ\x02ں\x02ڻ\x02ۀ\x02ہ\x02ھ\x02ے\x02ۓ\x02ڭ\x02ۇ\x02ۆ\x02ۈ\x02ۋ\x02ۅ" +
-	"\x02ۉ\x02ې\x02ى\x04ئا\x04ئە\x04ئو\x04ئۇ\x04ئۆ\x04ئۈ\x04ئې\x04ئى\x02ی\x04" +
-	"ئج\x04ئح\x04ئم\x04ئي\x04بج\x04بح\x04بخ\x04بم\x04بى\x04بي\x04تج\x04تح" +
-	"\x04تخ\x04تم\x04تى\x04تي\x04ثج\x04ثم\x04ثى\x04ثي\x04جح\x04جم\x04حج\x04حم" +
-	"\x04خج\x04خح\x04خم\x04سج\x04سح\x04سخ\x04سم\x04صح\x04صم\x04ضج\x04ضح\x04ضخ" +
-	"\x04ضم\x04طح\x04طم\x04ظم\x04عج\x04عم\x04غج\x04غم\x04فج\x04فح\x04فخ\x04فم" +
-	"\x04فى\x04في\x04قح\x04قم\x04قى\x04قي\x04كا\x04كج\x04كح\x04كخ\x04كل\x04كم" +
-	"\x04كى\x04كي\x04لج\x04لح\x04لخ\x04لم\x04لى\x04لي\x04مج\x04مح\x04مخ\x04مم" +
-	"\x04مى\x04مي\x04نج\x04نح\x04نخ\x04نم\x04نى\x04ني\x04هج\x04هم\x04هى\x04هي" +
-	"\x04يج\x04يح\x04يخ\x04يم\x04يى\x04يي\x04ذٰ\x04رٰ\x04ىٰ\x05 ٌّ\x05 ٍّ\x05" +
-	" َّ\x05 ُّ\x05 ِّ\x05 ّٰ\x04ئر\x04ئز\x04ئن\x04بر\x04بز\x04بن\x04تر\x04تز" +
-	"\x04تن\x04ثر\x04ثز\x04ثن\x04ما\x04نر\x04نز\x04نن\x04ير\x04يز\x04ين\x04ئخ" +
-	"\x04ئه\x04به\x04ته\x04صخ\x04له\x04نه\x04هٰ\x04يه\x04ثه\x04سه\x04شم\x04شه" +
-	"\x06ـَّ\x06ـُّ\x06ـِّ\x04طى\x04طي\x04عى\x04عي\x04غى\x04غي\x04سى\x04سي" +
-	"\x04شى\x04شي\x04حى\x04حي\x04جى\x04جي\x04خى\x04خي\x04صى\x04صي\x04ضى\x04ضي" +
-	"\x04شج\x04شح\x04شخ\x04شر\x04سر\x04صر\x04ضر\x04اً\x06تجم\x06تحج\x06تحم" +
-	"\x06تخم\x06تمج\x06تمح\x06تمخ\x06جمح\x06حمي\x06حمى\x06سحج\x06سجح\x06سجى" +
-	"\x06سمح\x06سمج\x06سمم\x06صحح\x06صمم\x06شحم\x06شجي\x06شمخ\x06شمم\x06ضحى" +
-	"\x06ضخم\x06طمح\x06طمم\x06طمي\x06عجم\x06عمم\x06عمى\x06غمم\x06غمي\x06غمى" +
-	"\x06فخم\x06قمح\x06قمم\x06لحم\x06لحي\x06لحى\x06لجج\x06لخم\x06لمح\x06محج" +
-	"\x06محم\x06محي\x06مجح\x06مجم\x06مخج\x06مخم\x06مجخ\x06همج\x06همم\x06نحم" +
-	"\x06نحى\x06نجم\x06نجى\x06نمي\x06نمى\x06يمم\x06بخي\x06تجي\x06تجى\x06تخي" +
-	"\x06تخى\x06تمي\x06تمى\x06جمي\x06جحى\x06جمى\x06سخى\x06صحي\x06شحي\x06ضحي" +
-	"\x06لجي\x06لمي\x06يحي\x06يجي\x06يمي\x06ممي\x06قمي\x06نحي\x06عمي\x06كمي" +
-	"\x06نجح\x06مخي\x06لجم\x06كمم\x06جحي\x06حجي\x06مجي\x06فمي\x06بحي\x06سخي" +
-	"\x06نجي\x06صلے\x06قلے\x08الله\x08اكبر\x08محمد\x08صلعم\x08رسول\x08عليه" +
-	"\x08وسلم\x06صلى!صلى الله عليه وسلم\x0fجل جلاله\x08ریال\x01,\x01:\x01!" +
-	"\x01?\x01_\x01{\x01}\x01[\x01]\x01#\x01&\x01*\x01-\x01<\x01>\x01\\\x01$" +
-	"\x01%\x01@\x04ـً\x04ـَ\x04ـُ\x04ـِ\x04ـّ\x04ـْ\x02ء\x02آ\x02أ\x02ؤ\x02إ" +
-	"\x02ئ\x02ا\x02ب\x02ة\x02ت\x02ث\x02ج\x02ح\x02خ\x02د\x02ذ\x02ر\x02ز\x02س" +
-	"\x02ش\x02ص\x02ض\x02ط\x02ظ\x02ع\x02غ\x02ف\x02ق\x02ك\x02ل\x02م\x02ن\x02ه" +
-	"\x02و\x02ي\x04لآ\x04لأ\x04لإ\x04لا\x01\x22\x01'\x01/\x01^\x01|\x01~\x02¢" +
-	"\x02£\x02¬\x02¦\x02¥\x08𝅗𝅥\x08𝅘𝅥\x0c𝅘𝅥𝅮\x0c𝅘𝅥𝅯\x0c𝅘𝅥𝅰\x0c𝅘𝅥𝅱\x0c𝅘𝅥𝅲\x08𝆹" +
-	"𝅥\x08𝆺𝅥\x0c𝆹𝅥𝅮\x0c𝆺𝅥𝅮\x0c𝆹𝅥𝅯\x0c𝆺𝅥𝅯\x02ı\x02ȷ\x02α\x02ε\x02ζ\x02η\x02" +
-	"κ\x02λ\x02μ\x02ν\x02ξ\x02ο\x02σ\x02τ\x02υ\x02ψ\x03∇\x03∂\x02ϝ\x02ٮ\x02ڡ" +
-	"\x02ٯ\x020,\x021,\x022,\x023,\x024,\x025,\x026,\x027,\x028,\x029,\x03(a)" +
-	"\x03(b)\x03(c)\x03(d)\x03(e)\x03(f)\x03(g)\x03(h)\x03(i)\x03(j)\x03(k)" +
-	"\x03(l)\x03(m)\x03(n)\x03(o)\x03(p)\x03(q)\x03(r)\x03(s)\x03(t)\x03(u)" +
-	"\x03(v)\x03(w)\x03(x)\x03(y)\x03(z)\x07〔s〕\x02wz\x02hv\x02sd\x03ppv\x02w" +
-	"c\x02mc\x02md\x02dj\x06ほか\x06ココ\x03サ\x03手\x03字\x03双\x03デ\x03二\x03多\x03解" +
-	"\x03天\x03交\x03映\x03無\x03料\x03前\x03後\x03再\x03新\x03初\x03終\x03生\x03販\x03声" +
-	"\x03吹\x03演\x03投\x03捕\x03一\x03三\x03遊\x03左\x03中\x03右\x03指\x03走\x03打\x03禁" +
-	"\x03空\x03合\x03満\x03有\x03月\x03申\x03割\x03営\x03配\x09〔本〕\x09〔三〕\x09〔二〕\x09〔安" +
-	"〕\x09〔点〕\x09〔打〕\x09〔盗〕\x09〔勝〕\x09〔敗〕\x03得\x03可\x03丽\x03丸\x03乁\x03你\x03" +
-	"侮\x03侻\x03倂\x03偺\x03備\x03僧\x03像\x03㒞\x03免\x03兔\x03兤\x03具\x03㒹\x03內\x03" +
-	"冗\x03冤\x03仌\x03冬\x03况\x03凵\x03刃\x03㓟\x03刻\x03剆\x03剷\x03㔕\x03勇\x03勉\x03" +
-	"勤\x03勺\x03包\x03匆\x03北\x03卉\x03卑\x03博\x03即\x03卽\x03卿\x03灰\x03及\x03叟\x03" +
-	"叫\x03叱\x03吆\x03咞\x03吸\x03呈\x03周\x03咢\x03哶\x03唐\x03啓\x03啣\x03善\x03喙\x03" +
-	"喫\x03喳\x03嗂\x03圖\x03嘆\x03圗\x03噑\x03噴\x03切\x03壮\x03城\x03埴\x03堍\x03型\x03" +
-	"堲\x03報\x03墬\x03売\x03壷\x03夆\x03夢\x03奢\x03姬\x03娛\x03娧\x03姘\x03婦\x03㛮\x03" +
-	"嬈\x03嬾\x03寃\x03寘\x03寧\x03寳\x03寿\x03将\x03尢\x03㞁\x03屠\x03屮\x03峀\x03岍\x03" +
-	"嵃\x03嵮\x03嵫\x03嵼\x03巡\x03巢\x03㠯\x03巽\x03帨\x03帽\x03幩\x03㡢\x03㡼\x03庰\x03" +
-	"庳\x03庶\x03廊\x03廾\x03舁\x03弢\x03㣇\x03形\x03彫\x03㣣\x03徚\x03忍\x03志\x03忹\x03" +
-	"悁\x03㤺\x03㤜\x03悔\x03惇\x03慈\x03慌\x03慎\x03慺\x03憎\x03憲\x03憤\x03憯\x03懞\x03" +
-	"懲\x03懶\x03成\x03戛\x03扝\x03抱\x03拔\x03捐\x03挽\x03拼\x03捨\x03掃\x03揤\x03搢\x03" +
-	"揅\x03掩\x03㨮\x03摩\x03摾\x03撝\x03摷\x03㩬\x03敏\x03敬\x03旣\x03書\x03晉\x03㬙\x03" +
-	"暑\x03㬈\x03㫤\x03冒\x03冕\x03最\x03暜\x03肭\x03䏙\x03朗\x03望\x03朡\x03杞\x03杓\x03" +
-	"㭉\x03柺\x03枅\x03桒\x03梅\x03梎\x03栟\x03椔\x03㮝\x03楂\x03榣\x03槪\x03檨\x03櫛\x03" +
-	"㰘\x03次\x03歔\x03㱎\x03歲\x03殟\x03殺\x03殻\x03汎\x03沿\x03泍\x03汧\x03洖\x03派\x03" +
-	"海\x03流\x03浩\x03浸\x03涅\x03洴\x03港\x03湮\x03㴳\x03滋\x03滇\x03淹\x03潮\x03濆\x03" +
-	"瀹\x03瀞\x03瀛\x03㶖\x03灊\x03災\x03灷\x03炭\x03煅\x03熜\x03爨\x03爵\x03牐\x03犀\x03" +
-	"犕\x03獺\x03王\x03㺬\x03玥\x03㺸\x03瑇\x03瑜\x03瑱\x03璅\x03瓊\x03㼛\x03甤\x03甾\x03" +
-	"異\x03瘐\x03㿼\x03䀈\x03直\x03眞\x03真\x03睊\x03䀹\x03瞋\x03䁆\x03䂖\x03硎\x03碌\x03" +
-	"磌\x03䃣\x03祖\x03福\x03秫\x03䄯\x03穀\x03穊\x03穏\x03䈂\x03篆\x03築\x03䈧\x03糒\x03" +
-	"䊠\x03糨\x03糣\x03紀\x03絣\x03䌁\x03緇\x03縂\x03繅\x03䌴\x03䍙\x03罺\x03羕\x03翺\x03" +
-	"者\x03聠\x03聰\x03䏕\x03育\x03脃\x03䐋\x03脾\x03媵\x03舄\x03辞\x03䑫\x03芑\x03芋\x03" +
-	"芝\x03劳\x03花\x03芳\x03芽\x03苦\x03若\x03茝\x03荣\x03莭\x03茣\x03莽\x03菧\x03著\x03" +
-	"荓\x03菊\x03菌\x03菜\x03䔫\x03蓱\x03蓳\x03蔖\x03蕤\x03䕝\x03䕡\x03䕫\x03虐\x03虜\x03" +
-	"虧\x03虩\x03蚩\x03蚈\x03蜎\x03蛢\x03蝹\x03蜨\x03蝫\x03螆\x03蟡\x03蠁\x03䗹\x03衠\x03" +
-	"衣\x03裗\x03裞\x03䘵\x03裺\x03㒻\x03䚾\x03䛇\x03誠\x03諭\x03變\x03豕\x03貫\x03賁\x03" +
-	"贛\x03起\x03跋\x03趼\x03跰\x03軔\x03輸\x03邔\x03郱\x03鄑\x03鄛\x03鈸\x03鋗\x03鋘\x03" +
-	"鉼\x03鏹\x03鐕\x03開\x03䦕\x03閷\x03䧦\x03雃\x03嶲\x03霣\x03䩮\x03䩶\x03韠\x03䪲\x03" +
-	"頋\x03頩\x03飢\x03䬳\x03餩\x03馧\x03駂\x03駾\x03䯎\x03鬒\x03鱀\x03鳽\x03䳎\x03䳭\x03" +
-	"鵧\x03䳸\x03麻\x03䵖\x03黹\x03黾\x03鼅\x03鼏\x03鼖\x03鼻"
-
-var xorData string = "" + // Size: 4855 bytes
-	"\x02\x0c\x09\x02\xb0\xec\x02\xad\xd8\x02\xad\xd9\x02\x06\x07\x02\x0f\x12" +
-	"\x02\x0f\x1f\x02\x0f\x1d\x02\x01\x13\x02\x0f\x16\x02\x0f\x0b\x02\x0f3" +
-	"\x02\x0f7\x02\x0f?\x02\x0f/\x02\x0f*\x02\x0c&\x02\x0c*\x02\x0c;\x02\x0c9" +
-	"\x02\x0c%\x02\xab\xed\x02\xab\xe2\x02\xab\xe3\x02\xa9\xe0\x02\xa9\xe1" +
-	"\x02\xa9\xe6\x02\xa3\xcb\x02\xa3\xc8\x02\xa3\xc9\x02\x01#\x02\x01\x08" +
-	"\x02\x0e>\x02\x0e'\x02\x0f\x03\x02\x03\x0d\x02\x03\x09\x02\x03\x17\x02" +
-	"\x03\x0e\x02\x02\x03\x02\x011\x02\x01\x00\x02\x01\x10\x02\x03<\x02\x07" +
-	"\x0d\x02\x02\x0c\x02\x0c0\x02\x01\x03\x02\x01\x01\x02\x01 \x02\x01\x22" +
-	"\x02\x01)\x02\x01\x0a\x02\x01\x0c\x02\x02\x06\x02\x02\x02\x02\x03\x10" +
-	"\x03\x037 \x03\x0b+\x03\x02\x01\x04\x02\x01\x02\x02\x019\x02\x03\x1c\x02" +
-	"\x02$\x03\x80p$\x02\x03:\x02\x03\x0a\x03\xc1r.\x03\xc1r,\x03\xc1r\x02" +
-	"\x02\x02:\x02\x02>\x02\x02,\x02\x02\x10\x02\x02\x00\x03\xc1s<\x03\xc1s*" +
-	"\x03\xc2L$\x03\xc2L;\x02\x09)\x02\x0a\x19\x03\x83\xab\xe3\x03\x83\xab" +
-	"\xf2\x03 4\xe0\x03\x81\xab\xea\x03\x81\xab\xf3\x03 4\xef\x03\x96\xe1\xcd" +
-	"\x03\x84\xe5\xc3\x02\x0d\x11\x03\x8b\xec\xcb\x03\x94\xec\xcf\x03\x9a\xec" +
-	"\xc2\x03\x8b\xec\xdb\x03\x94\xec\xdf\x03\x9a\xec\xd2\x03\x01\x0c!\x03" +
-	"\x01\x0c#\x03ʠ\x9d\x03ʣ\x9c\x03ʢ\x9f\x03ʥ\x9e\x03ʤ\x91\x03ʧ\x90\x03ʦ\x93" +
-	"\x03ʩ\x92\x03ʨ\x95\x03\xca\xf3\xb5\x03\xca\xf0\xb4\x03\xca\xf1\xb7\x03" +
-	"\xca\xf6\xb6\x03\xca\xf7\x89\x03\xca\xf4\x88\x03\xca\xf5\x8b\x03\xca\xfa" +
-	"\x8a\x03\xca\xfb\x8d\x03\xca\xf8\x8c\x03\xca\xf9\x8f\x03\xca\xfe\x8e\x03" +
-	"\xca\xff\x81\x03\xca\xfc\x80\x03\xca\xfd\x83\x03\xca\xe2\x82\x03\xca\xe3" +
-	"\x85\x03\xca\xe0\x84\x03\xca\xe1\x87\x03\xca\xe6\x86\x03\xca\xe7\x99\x03" +
-	"\xca\xe4\x98\x03\xca\xe5\x9b\x03\xca\xea\x9a\x03\xca\xeb\x9d\x03\xca\xe8" +
-	"\x9c\x03ؓ\x89\x03ߔ\x8b\x02\x010\x03\x03\x04\x1e\x03\x04\x15\x12\x03\x0b" +
-	"\x05,\x03\x06\x04\x00\x03\x06\x04)\x03\x06\x044\x03\x06\x04<\x03\x06\x05" +
-	"\x1d\x03\x06\x06\x00\x03\x06\x06\x0a\x03\x06\x06'\x03\x06\x062\x03\x0786" +
-	"\x03\x079/\x03\x079 \x03\x07:\x0e\x03\x07:\x1b\x03\x07:%\x03\x07;/\x03" +
-	"\x07;%\x03\x074\x11\x03\x076\x09\x03\x077*\x03\x070\x01\x03\x070\x0f\x03" +
-	"\x070.\x03\x071\x16\x03\x071\x04\x03\x0710\x03\x072\x18\x03\x072-\x03" +
-	"\x073\x14\x03\x073>\x03\x07'\x09\x03\x07 \x00\x03\x07\x1f\x0b\x03\x07" +
-	"\x18#\x03\x07\x18(\x03\x07\x186\x03\x07\x18\x03\x03\x07\x19\x16\x03\x07" +
-	"\x116\x03\x07\x12'\x03\x07\x13\x10\x03\x07\x0c&\x03\x07\x0c\x08\x03\x07" +
-	"\x0c\x13\x03\x07\x0d\x02\x03\x07\x0d\x1c\x03\x07\x0b5\x03\x07\x0b\x0a" +
-	"\x03\x07\x0b\x01\x03\x07\x0b\x0f\x03\x07\x05\x00\x03\x07\x05\x09\x03\x07" +
-	"\x05\x0b\x03\x07\x07\x01\x03\x07\x07\x08\x03\x07\x00<\x03\x07\x00+\x03" +
-	"\x07\x01)\x03\x07\x01\x1b\x03\x07\x01\x08\x03\x07\x03?\x03\x0445\x03\x04" +
-	"4\x08\x03\x0454\x03\x04)/\x03\x04)5\x03\x04+\x05\x03\x04+\x14\x03\x04+ " +
-	"\x03\x04+<\x03\x04*&\x03\x04*\x22\x03\x04&8\x03\x04!\x01\x03\x04!\x22" +
-	"\x03\x04\x11+\x03\x04\x10.\x03\x04\x104\x03\x04\x13=\x03\x04\x12\x04\x03" +
-	"\x04\x12\x0a\x03\x04\x0d\x1d\x03\x04\x0d\x07\x03\x04\x0d \x03\x05<>\x03" +
-	"\x055<\x03\x055!\x03\x055#\x03\x055&\x03\x054\x1d\x03\x054\x02\x03\x054" +
-	"\x07\x03\x0571\x03\x053\x1a\x03\x053\x16\x03\x05.<\x03\x05.\x07\x03\x05)" +
-	":\x03\x05)<\x03\x05)\x0c\x03\x05)\x15\x03\x05+-\x03\x05+5\x03\x05$\x1e" +
-	"\x03\x05$\x14\x03\x05'\x04\x03\x05'\x14\x03\x05&\x02\x03\x05\x226\x03" +
-	"\x05\x22\x0c\x03\x05\x22\x1c\x03\x05\x19\x0a\x03\x05\x1b\x09\x03\x05\x1b" +
-	"\x0c\x03\x05\x14\x07\x03\x05\x16?\x03\x05\x16\x0c\x03\x05\x0c\x05\x03" +
-	"\x05\x0e\x0f\x03\x05\x01\x0e\x03\x05\x00(\x03\x05\x030\x03\x05\x03\x06" +
-	"\x03\x0a==\x03\x0a=1\x03\x0a=,\x03\x0a=\x0c\x03\x0a??\x03\x0a<\x08\x03" +
-	"\x0a9!\x03\x0a9)\x03\x0a97\x03\x0a99\x03\x0a6\x0a\x03\x0a6\x1c\x03\x0a6" +
-	"\x17\x03\x0a7'\x03\x0a78\x03\x0a73\x03\x0a'\x01\x03\x0a'&\x03\x0a\x1f" +
-	"\x0e\x03\x0a\x1f\x03\x03\x0a\x1f3\x03\x0a\x1b/\x03\x0a\x18\x19\x03\x0a" +
-	"\x19\x01\x03\x0a\x16\x14\x03\x0a\x0e\x22\x03\x0a\x0f\x10\x03\x0a\x0f\x02" +
-	"\x03\x0a\x0f \x03\x0a\x0c\x04\x03\x0a\x0b>\x03\x0a\x0b+\x03\x0a\x08/\x03" +
-	"\x0a\x046\x03\x0a\x05\x14\x03\x0a\x00\x04\x03\x0a\x00\x10\x03\x0a\x00" +
-	"\x14\x03\x0b<3\x03\x0b;*\x03\x0b9\x22\x03\x0b9)\x03\x0b97\x03\x0b+\x10" +
-	"\x03\x0b((\x03\x0b&5\x03\x0b$\x1c\x03\x0b$\x12\x03\x0b%\x04\x03\x0b#<" +
-	"\x03\x0b#0\x03\x0b#\x0d\x03\x0b#\x19\x03\x0b!:\x03\x0b!\x1f\x03\x0b!\x00" +
-	"\x03\x0b\x1e5\x03\x0b\x1c\x1d\x03\x0b\x1d-\x03\x0b\x1d(\x03\x0b\x18.\x03" +
-	"\x0b\x18 \x03\x0b\x18\x16\x03\x0b\x14\x13\x03\x0b\x15$\x03\x0b\x15\x22" +
-	"\x03\x0b\x12\x1b\x03\x0b\x12\x10\x03\x0b\x132\x03\x0b\x13=\x03\x0b\x12" +
-	"\x18\x03\x0b\x0c&\x03\x0b\x061\x03\x0b\x06:\x03\x0b\x05#\x03\x0b\x05<" +
-	"\x03\x0b\x04\x0b\x03\x0b\x04\x04\x03\x0b\x04\x1b\x03\x0b\x042\x03\x0b" +
-	"\x041\x03\x0b\x03\x03\x03\x0b\x03\x1d\x03\x0b\x03/\x03\x0b\x03+\x03\x0b" +
-	"\x02\x1b\x03\x0b\x02\x00\x03\x0b\x01\x1e\x03\x0b\x01\x08\x03\x0b\x015" +
-	"\x03\x06\x0d9\x03\x06\x0d=\x03\x06\x0d?\x03\x02\x001\x03\x02\x003\x03" +
-	"\x02\x02\x19\x03\x02\x006\x03\x02\x02\x1b\x03\x02\x004\x03\x02\x00<\x03" +
-	"\x02\x02\x0a\x03\x02\x02\x0e\x03\x02\x01\x1a\x03\x02\x01\x07\x03\x02\x01" +
-	"\x05\x03\x02\x01\x0b\x03\x02\x01%\x03\x02\x01\x0c\x03\x02\x01\x04\x03" +
-	"\x02\x01\x1c\x03\x02\x00.\x03\x02\x002\x03\x02\x00>\x03\x02\x00\x12\x03" +
-	"\x02\x00\x16\x03\x02\x011\x03\x02\x013\x03\x02\x02 \x03\x02\x02%\x03\x02" +
-	"\x02$\x03\x02\x028\x03\x02\x02;\x03\x02\x024\x03\x02\x012\x03\x02\x022" +
-	"\x03\x02\x02/\x03\x02\x01,\x03\x02\x01\x13\x03\x02\x01\x16\x03\x02\x01" +
-	"\x11\x03\x02\x01\x1e\x03\x02\x01\x15\x03\x02\x01\x17\x03\x02\x01\x0f\x03" +
-	"\x02\x01\x08\x03\x02\x00?\x03\x02\x03\x07\x03\x02\x03\x0d\x03\x02\x03" +
-	"\x13\x03\x02\x03\x1d\x03\x02\x03\x1f\x03\x02\x00\x03\x03\x02\x00\x0d\x03" +
-	"\x02\x00\x01\x03\x02\x00\x1b\x03\x02\x00\x19\x03\x02\x00\x18\x03\x02\x00" +
-	"\x13\x03\x02\x00/\x03\x07>\x12\x03\x07<\x1f\x03\x07>\x1d\x03\x06\x1d\x0e" +
-	"\x03\x07>\x1c\x03\x07>:\x03\x07>\x13\x03\x04\x12+\x03\x07?\x03\x03\x07>" +
-	"\x02\x03\x06\x224\x03\x06\x1a.\x03\x07<%\x03\x06\x1c\x0b\x03\x0609\x03" +
-	"\x05\x1f\x01\x03\x04'\x08\x03\x93\xfd\xf5\x03\x02\x0d \x03\x02\x0d#\x03" +
-	"\x02\x0d!\x03\x02\x0d&\x03\x02\x0d\x22\x03\x02\x0d/\x03\x02\x0d,\x03\x02" +
-	"\x0d$\x03\x02\x0d'\x03\x02\x0d%\x03\x02\x0d;\x03\x02\x0d=\x03\x02\x0d?" +
-	"\x03\x099.\x03\x08\x0b7\x03\x08\x02\x14\x03\x08\x14\x0d\x03\x08.:\x03" +
-	"\x089'\x03\x0f\x0b\x18\x03\x0f\x1c1\x03\x0f\x17&\x03\x0f9\x1f\x03\x0f0" +
-	"\x0c\x03\x0e\x0a9\x03\x0e\x056\x03\x0e\x1c#\x03\x0f\x13\x0e\x03\x072\x00" +
-	"\x03\x070\x0d\x03\x072\x0b\x03\x06\x11\x18\x03\x070\x10\x03\x06\x0f(\x03" +
-	"\x072\x05\x03\x06\x0f,\x03\x073\x15\x03\x06\x07\x08\x03\x05\x16\x02\x03" +
-	"\x04\x0b \x03\x05:8\x03\x05\x16%\x03\x0a\x0d\x1f\x03\x06\x16\x10\x03\x05" +
-	"\x1d5\x03\x05*;\x03\x05\x16\x1b\x03\x04.-\x03\x06\x1a\x19\x03\x04\x03," +
-	"\x03\x0b87\x03\x04/\x0a\x03\x06\x00,\x03\x04-\x01\x03\x04\x1e-\x03\x06/(" +
-	"\x03\x0a\x0b5\x03\x06\x0e7\x03\x06\x07.\x03\x0597\x03\x0a*%\x03\x0760" +
-	"\x03\x06\x0c;\x03\x05'\x00\x03\x072.\x03\x072\x08\x03\x06=\x01\x03\x06" +
-	"\x05\x1b\x03\x06\x06\x12\x03\x06$=\x03\x06'\x0d\x03\x04\x11\x0f\x03\x076" +
-	",\x03\x06\x07;\x03\x06.,\x03\x86\xf9\xea\x03\x8f\xff\xeb\x02\x092\x02" +
-	"\x095\x02\x094\x02\x09;\x02\x09>\x02\x098\x02\x09*\x02\x09/\x02\x09,\x02" +
-	"\x09%\x02\x09&\x02\x09#\x02\x09 \x02\x08!\x02\x08%\x02\x08$\x02\x08+\x02" +
-	"\x08.\x02\x08*\x02\x08&\x02\x088\x02\x08>\x02\x084\x02\x086\x02\x080\x02" +
-	"\x08\x10\x02\x08\x17\x02\x08\x12\x02\x08\x1d\x02\x08\x1f\x02\x08\x13\x02" +
-	"\x08\x15\x02\x08\x14\x02\x08\x0c\x03\x8b\xfd\xd0\x03\x81\xec\xc6\x03\x87" +
-	"\xe0\x8a\x03-2\xe3\x03\x80\xef\xe4\x03-2\xea\x03\x88\xe6\xeb\x03\x8e\xe6" +
-	"\xe8\x03\x84\xe6\xe9\x03\x97\xe6\xee\x03-2\xf9\x03-2\xf6\x03\x8e\xe3\xad" +
-	"\x03\x80\xe3\x92\x03\x88\xe3\x90\x03\x8e\xe3\x90\x03\x80\xe3\x97\x03\x88" +
-	"\xe3\x95\x03\x88\xfe\xcb\x03\x8e\xfe\xca\x03\x84\xfe\xcd\x03\x91\xef\xc9" +
-	"\x03-2\xc1\x03-2\xc0\x03-2\xcb\x03\x88@\x09\x03\x8e@\x08\x03\x8f\xe0\xf5" +
-	"\x03\x8e\xe6\xf9\x03\x8e\xe0\xfa\x03\x93\xff\xf4\x03\x84\xee\xd3\x03\x0b" +
-	"(\x04\x023 \x021;\x02\x01*\x03\x0b#\x10\x03\x0b 0\x03\x0b!\x10\x03\x0b!0" +
-	"\x03\x07\x15\x08\x03\x09?5\x03\x07\x1f\x08\x03\x07\x17\x0b\x03\x09\x1f" +
-	"\x15\x03\x0b\x1c7\x03\x0a+#\x03\x06\x1a\x1b\x03\x06\x1a\x14\x03\x0a\x01" +
-	"\x18\x03\x06#\x1b\x03\x0a2\x0c\x03\x0a\x01\x04\x03\x09#;\x03\x08='\x03" +
-	"\x08\x1a\x0a\x03\x07</\x03\x07:+\x03\x07\x07*\x03\x06&\x1c\x03\x09\x0c" +
-	"\x16\x03\x09\x10\x0e\x03\x08'\x0f\x03\x08+\x09\x03\x074%\x03\x06!3\x03" +
-	"\x06\x03+\x03\x0b\x1e\x19\x03\x0a))\x03\x09\x08\x19\x03\x08,\x05\x03\x07" +
-	"<2\x03\x06\x1c>\x03\x0a\x111\x03\x09\x1b\x09\x03\x073.\x03\x07\x01\x00" +
-	"\x03\x09/,\x03\x07#>\x03\x07\x048\x03\x0a\x1f\x22\x03\x098>\x03\x09\x11" +
-	"\x00\x03\x08/\x17\x03\x06'\x22\x03\x0b\x1a+\x03\x0a\x22\x19\x03\x0a/1" +
-	"\x03\x0974\x03\x09\x0f\x22\x03\x08,\x22\x03\x08?\x14\x03\x07$5\x03\x07<3" +
-	"\x03\x07=*\x03\x07\x13\x18\x03\x068\x0a\x03\x06\x09\x16\x03\x06\x13\x00" +
-	"\x03\x08\x067\x03\x08\x01\x03\x03\x08\x12\x1d\x03\x07+7\x03\x06(;\x03" +
-	"\x06\x1c?\x03\x07\x0e\x17\x03\x0a\x06\x1d\x03\x0a\x19\x07\x03\x08\x14$" +
-	"\x03\x07$;\x03\x08,$\x03\x08\x06\x0d\x03\x07\x16\x0a\x03\x06>>\x03\x0a" +
-	"\x06\x12\x03\x0a\x14)\x03\x09\x0d\x1f\x03\x09\x12\x17\x03\x09\x19\x01" +
-	"\x03\x08\x11 \x03\x08\x1d'\x03\x06<\x1a\x03\x0a.\x00\x03\x07'\x18\x03" +
-	"\x0a\x22\x08\x03\x08\x0d\x0a\x03\x08\x13)\x03\x07*)\x03\x06<,\x03\x07" +
-	"\x0b\x1a\x03\x09.\x14\x03\x09\x0d\x1e\x03\x07\x0e#\x03\x0b\x1d'\x03\x0a" +
-	"\x0a8\x03\x09%2\x03\x08+&\x03\x080\x12\x03\x0a)4\x03\x08\x06\x1f\x03\x0b" +
-	"\x1b\x1a\x03\x0a\x1b\x0f\x03\x0b\x1d*\x03\x09\x16$\x03\x090\x11\x03\x08" +
-	"\x11\x08\x03\x0a*(\x03\x0a\x042\x03\x089,\x03\x074'\x03\x07\x0f\x05\x03" +
-	"\x09\x0b\x0a\x03\x07\x1b\x01\x03\x09\x17:\x03\x09.\x0d\x03\x07.\x11\x03" +
-	"\x09+\x15\x03\x080\x13\x03\x0b\x1f\x19\x03\x0a \x11\x03\x0a\x220\x03\x09" +
-	"\x07;\x03\x08\x16\x1c\x03\x07,\x13\x03\x07\x0e/\x03\x06\x221\x03\x0a." +
-	"\x0a\x03\x0a7\x02\x03\x0a\x032\x03\x0a\x1d.\x03\x091\x06\x03\x09\x19:" +
-	"\x03\x08\x02/\x03\x060+\x03\x06\x0f-\x03\x06\x1c\x1f\x03\x06\x1d\x07\x03" +
-	"\x0a,\x11\x03\x09=\x0d\x03\x09\x0b;\x03\x07\x1b/\x03\x0a\x1f:\x03\x09 " +
-	"\x1f\x03\x09.\x10\x03\x094\x0b\x03\x09\x1a1\x03\x08#\x1a\x03\x084\x1d" +
-	"\x03\x08\x01\x1f\x03\x08\x11\x22\x03\x07'8\x03\x07\x1a>\x03\x0757\x03" +
-	"\x06&9\x03\x06+\x11\x03\x0a.\x0b\x03\x0a,>\x03\x0a4#\x03\x08%\x17\x03" +
-	"\x07\x05\x22\x03\x07\x0c\x0b\x03\x0a\x1d+\x03\x0a\x19\x16\x03\x09+\x1f" +
-	"\x03\x09\x08\x0b\x03\x08\x16\x18\x03\x08+\x12\x03\x0b\x1d\x0c\x03\x0a=" +
-	"\x10\x03\x0a\x09\x0d\x03\x0a\x10\x11\x03\x09&0\x03\x08(\x1f\x03\x087\x07" +
-	"\x03\x08\x185\x03\x07'6\x03\x06.\x05\x03\x06=\x04\x03\x06;;\x03\x06\x06," +
-	"\x03\x0b\x18>\x03\x08\x00\x18\x03\x06 \x03\x03\x06<\x00\x03\x09%\x18\x03" +
-	"\x0b\x1c<\x03\x0a%!\x03\x0a\x09\x12\x03\x0a\x16\x02\x03\x090'\x03\x09" +
-	"\x0e=\x03\x08 \x0e\x03\x08>\x03\x03\x074>\x03\x06&?\x03\x06\x19\x09\x03" +
-	"\x06?(\x03\x0a-\x0e\x03\x09:3\x03\x098:\x03\x09\x12\x0b\x03\x09\x1d\x17" +
-	"\x03\x087\x05\x03\x082\x14\x03\x08\x06%\x03\x08\x13\x1f\x03\x06\x06\x0e" +
-	"\x03\x0a\x22<\x03\x09/<\x03\x06>+\x03\x0a'?\x03\x0a\x13\x0c\x03\x09\x10<" +
-	"\x03\x07\x1b=\x03\x0a\x19\x13\x03\x09\x22\x1d\x03\x09\x07\x0d\x03\x08)" +
-	"\x1c\x03\x06=\x1a\x03\x0a/4\x03\x0a7\x11\x03\x0a\x16:\x03\x09?3\x03\x09:" +
-	"/\x03\x09\x05\x0a\x03\x09\x14\x06\x03\x087\x22\x03\x080\x07\x03\x08\x1a" +
-	"\x1f\x03\x07\x04(\x03\x07\x04\x09\x03\x06 %\x03\x06<\x08\x03\x0a+\x14" +
-	"\x03\x09\x1d\x16\x03\x0a70\x03\x08 >\x03\x0857\x03\x070\x0a\x03\x06=\x12" +
-	"\x03\x06\x16%\x03\x06\x1d,\x03\x099#\x03\x09\x10>\x03\x07 \x1e\x03\x08" +
-	"\x0c<\x03\x08\x0b\x18\x03\x08\x15+\x03\x08,:\x03\x08%\x22\x03\x07\x0a$" +
-	"\x03\x0b\x1c=\x03\x07+\x08\x03\x0a/\x05\x03\x0a \x07\x03\x0a\x12'\x03" +
-	"\x09#\x11\x03\x08\x1b\x15\x03\x0a\x06\x01\x03\x09\x1c\x1b\x03\x0922\x03" +
-	"\x07\x14<\x03\x07\x09\x04\x03\x061\x04\x03\x07\x0e\x01\x03\x0a\x13\x18" +
-	"\x03\x0a-\x0c\x03\x0a?\x0d\x03\x0a\x09\x0a\x03\x091&\x03\x0a/\x0b\x03" +
-	"\x08$<\x03\x083\x1d\x03\x08\x0c$\x03\x08\x0d\x07\x03\x08\x0d?\x03\x08" +
-	"\x0e\x14\x03\x065\x0a\x03\x08\x1a#\x03\x08\x16#\x03\x0702\x03\x07\x03" +
-	"\x1a\x03\x06(\x1d\x03\x06+\x1b\x03\x06\x0b\x05\x03\x06\x0b\x17\x03\x06" +
-	"\x0c\x04\x03\x06\x1e\x19\x03\x06+0\x03\x062\x18\x03\x0b\x16\x1e\x03\x0a+" +
-	"\x16\x03\x0a-?\x03\x0a#:\x03\x0a#\x10\x03\x0a%$\x03\x0a>+\x03\x0a01\x03" +
-	"\x0a1\x10\x03\x0a\x099\x03\x0a\x0a\x12\x03\x0a\x19\x1f\x03\x0a\x19\x12" +
-	"\x03\x09*)\x03\x09-\x16\x03\x09.1\x03\x09.2\x03\x09<\x0e\x03\x09> \x03" +
-	"\x093\x12\x03\x09\x0b\x01\x03\x09\x1c2\x03\x09\x11\x1c\x03\x09\x15%\x03" +
-	"\x08,&\x03\x08!\x22\x03\x089(\x03\x08\x0b\x1a\x03\x08\x0d2\x03\x08\x0c" +
-	"\x04\x03\x08\x0c\x06\x03\x08\x0c\x1f\x03\x08\x0c\x0c\x03\x08\x0f\x1f\x03" +
-	"\x08\x0f\x1d\x03\x08\x00\x14\x03\x08\x03\x14\x03\x08\x06\x16\x03\x08\x1e" +
-	"#\x03\x08\x11\x11\x03\x08\x10\x18\x03\x08\x14(\x03\x07)\x1e\x03\x07.1" +
-	"\x03\x07 $\x03\x07 '\x03\x078\x08\x03\x07\x0d0\x03\x07\x0f7\x03\x07\x05#" +
-	"\x03\x07\x05\x1a\x03\x07\x1a7\x03\x07\x1d-\x03\x07\x17\x10\x03\x06)\x1f" +
-	"\x03\x062\x0b\x03\x066\x16\x03\x06\x09\x11\x03\x09(\x1e\x03\x07!5\x03" +
-	"\x0b\x11\x16\x03\x0a/\x04\x03\x0a,\x1a\x03\x0b\x173\x03\x0a,1\x03\x0a/5" +
-	"\x03\x0a\x221\x03\x0a\x22\x0d\x03\x0a?%\x03\x0a<,\x03\x0a?#\x03\x0a>\x19" +
-	"\x03\x0a\x08&\x03\x0a\x0b\x0e\x03\x0a\x0c:\x03\x0a\x0c+\x03\x0a\x03\x22" +
-	"\x03\x0a\x06)\x03\x0a\x11\x10\x03\x0a\x11\x1a\x03\x0a\x17-\x03\x0a\x14(" +
-	"\x03\x09)\x1e\x03\x09/\x09\x03\x09.\x00\x03\x09,\x07\x03\x09/*\x03\x09-9" +
-	"\x03\x09\x228\x03\x09%\x09\x03\x09:\x12\x03\x09;\x1d\x03\x09?\x06\x03" +
-	"\x093%\x03\x096\x05\x03\x096\x08\x03\x097\x02\x03\x09\x07,\x03\x09\x04," +
-	"\x03\x09\x1f\x16\x03\x09\x11\x03\x03\x09\x11\x12\x03\x09\x168\x03\x08*" +
-	"\x05\x03\x08/2\x03\x084:\x03\x08\x22+\x03\x08 0\x03\x08&\x0a\x03\x08;" +
-	"\x10\x03\x08>$\x03\x08>\x18\x03\x0829\x03\x082:\x03\x081,\x03\x081<\x03" +
-	"\x081\x1c\x03\x087#\x03\x087*\x03\x08\x09'\x03\x08\x00\x1d\x03\x08\x05-" +
-	"\x03\x08\x1f4\x03\x08\x1d\x04\x03\x08\x16\x0f\x03\x07*7\x03\x07'!\x03" +
-	"\x07%\x1b\x03\x077\x0c\x03\x07\x0c1\x03\x07\x0c.\x03\x07\x00\x06\x03\x07" +
-	"\x01\x02\x03\x07\x010\x03\x07\x06=\x03\x07\x01\x03\x03\x07\x01\x13\x03" +
-	"\x07\x06\x06\x03\x07\x05\x0a\x03\x07\x1f\x09\x03\x07\x17:\x03\x06*1\x03" +
-	"\x06-\x1d\x03\x06\x223\x03\x062:\x03\x060$\x03\x066\x1e\x03\x064\x12\x03" +
-	"\x0645\x03\x06\x0b\x00\x03\x06\x0b7\x03\x06\x07\x1f\x03\x06\x15\x12\x03" +
-	"\x0c\x05\x0f\x03\x0b+\x0b\x03\x0b+-\x03\x06\x16\x1b\x03\x06\x15\x17\x03" +
-	"\x89\xca\xea\x03\x89\xca\xe8\x03\x0c8\x10\x03\x0c8\x01\x03\x0c8\x0f\x03" +
-	"\x0d8%\x03\x0d8!\x03\x0c8-\x03\x0c8/\x03\x0c8+\x03\x0c87\x03\x0c85\x03" +
-	"\x0c9\x09\x03\x0c9\x0d\x03\x0c9\x0f\x03\x0c9\x0b\x03\xcfu\x0c\x03\xcfu" +
-	"\x0f\x03\xcfu\x0e\x03\xcfu\x09\x03\x0c9\x10\x03\x0d9\x0c\x03\xcf`;\x03" +
-	"\xcf`>\x03\xcf`9\x03\xcf`8\x03\xcf`7\x03\xcf`*\x03\xcf`-\x03\xcf`,\x03" +
-	"\x0d\x1b\x1a\x03\x0d\x1b&\x03\x0c=.\x03\x0c=%\x03\x0c>\x1e\x03\x0c>\x14" +
-	"\x03\x0c?\x06\x03\x0c?\x0b\x03\x0c?\x0c\x03\x0c?\x0d\x03\x0c?\x02\x03" +
-	"\x0c>\x0f\x03\x0c>\x08\x03\x0c>\x09\x03\x0c>,\x03\x0c>\x0c\x03\x0c?\x13" +
-	"\x03\x0c?\x16\x03\x0c?\x15\x03\x0c?\x1c\x03\x0c?\x1f\x03\x0c?\x1d\x03" +
-	"\x0c?\x1a\x03\x0c?\x17\x03\x0c?\x08\x03\x0c?\x09\x03\x0c?\x0e\x03\x0c?" +
-	"\x04\x03\x0c?\x05\x03\x0c<?\x03\x0c=\x00\x03\x0c=\x06\x03\x0c=\x05\x03" +
-	"\x0c=\x0c\x03\x0c=\x0f\x03\x0c=\x0d\x03\x0c=\x0b\x03\x0c=\x07\x03\x0c=" +
-	"\x19\x03\x0c=\x15\x03\x0c=\x11\x03\x0c=1\x03\x0c=3\x03\x0c=0\x03\x0c=>" +
-	"\x03\x0c=2\x03\x0c=6\x03\x0c<\x07\x03\x0c<\x05\x03\x0e:!\x03\x0e:#\x03" +
-	"\x0e8\x09\x03\x0e:&\x03\x0e8\x0b\x03\x0e:$\x03\x0e:,\x03\x0e8\x1a\x03" +
-	"\x0e8\x1e\x03\x0e:*\x03\x0e:7\x03\x0e:5\x03\x0e:;\x03\x0e:\x15\x03\x0e:<" +
-	"\x03\x0e:4\x03\x0e:'\x03\x0e:-\x03\x0e:%\x03\x0e:?\x03\x0e:=\x03\x0e:)" +
-	"\x03\x0e:/\x03\xcfs'\x03\x0d=\x0f\x03\x0d+*\x03\x0d99\x03\x0d9;\x03\x0d9" +
-	"?\x03\x0d)\x0d\x03\x0d(%\x02\x01\x18\x02\x01(\x02\x01\x1e\x03\x0f$!\x03" +
-	"\x0f87\x03\x0f4\x0e\x03\x0f5\x1d\x03\x06'\x03\x03\x0f\x08\x18\x03\x0f" +
-	"\x0d\x1b\x03\x0e2=\x03\x0e;\x08\x03\x0e:\x0b\x03\x0e\x06$\x03\x0e\x0d)" +
-	"\x03\x0e\x16\x1f\x03\x0e\x16\x1b\x03\x0d$\x0a\x03\x05,\x1d\x03\x0d. \x03" +
-	"\x0d.#\x03\x0c(/\x03\x09%\x02\x03\x0d90\x03\x0d\x0e4\x03\x0d\x0d\x0f\x03" +
-	"\x0c#\x00\x03\x0c,\x1e\x03\x0c2\x0e\x03\x0c\x01\x17\x03\x0c\x09:\x03\x0e" +
-	"\x173\x03\x0c\x08\x03\x03\x0c\x11\x07\x03\x0c\x10\x18\x03\x0c\x1f\x1c" +
-	"\x03\x0c\x19\x0e\x03\x0c\x1a\x1f\x03\x0f0>\x03\x0b->\x03\x0b<+\x03\x0b8" +
-	"\x13\x03\x0b\x043\x03\x0b\x14\x03\x03\x0b\x16%\x03\x0d\x22&\x03\x0b\x1a" +
-	"\x1a\x03\x0b\x1a\x04\x03\x0a%9\x03\x0a&2\x03\x0a&0\x03\x0a!\x1a\x03\x0a!" +
-	"7\x03\x0a5\x10\x03\x0a=4\x03\x0a?\x0e\x03\x0a>\x10\x03\x0a\x00 \x03\x0a" +
-	"\x0f:\x03\x0a\x0f9\x03\x0a\x0b\x0a\x03\x0a\x17%\x03\x0a\x1b-\x03\x09-" +
-	"\x1a\x03\x09,4\x03\x09.,\x03\x09)\x09\x03\x096!\x03\x091\x1f\x03\x093" +
-	"\x16\x03\x0c+\x1f\x03\x098 \x03\x098=\x03\x0c(\x1a\x03\x0c(\x16\x03\x09" +
-	"\x0a+\x03\x09\x16\x12\x03\x09\x13\x0e\x03\x09\x153\x03\x08)!\x03\x09\x1a" +
-	"\x01\x03\x09\x18\x01\x03\x08%#\x03\x08>\x22\x03\x08\x05%\x03\x08\x02*" +
-	"\x03\x08\x15;\x03\x08\x1b7\x03\x0f\x07\x1d\x03\x0f\x04\x03\x03\x070\x0c" +
-	"\x03\x07;\x0b\x03\x07\x08\x17\x03\x07\x12\x06\x03\x06/-\x03\x0671\x03" +
-	"\x065+\x03\x06>7\x03\x06\x049\x03\x05+\x1e\x03\x05,\x17\x03\x05 \x1d\x03" +
-	"\x05\x22\x05\x03\x050\x1d"
-
-// lookup returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *idnaTrie) lookup(s []byte) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return idnaValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := idnaIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := idnaIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = idnaIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := idnaIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = idnaIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = idnaIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *idnaTrie) lookupUnsafe(s []byte) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return idnaValues[c0]
-	}
-	i := idnaIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = idnaIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = idnaIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// lookupString returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *idnaTrie) lookupString(s string) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return idnaValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := idnaIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := idnaIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = idnaIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := idnaIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = idnaIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = idnaIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *idnaTrie) lookupStringUnsafe(s string) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return idnaValues[c0]
-	}
-	i := idnaIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = idnaIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = idnaIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// idnaTrie. Total size: 28496 bytes (27.83 KiB). Checksum: 43288b883596640e.
-type idnaTrie struct{}
-
-func newIdnaTrie(i int) *idnaTrie {
-	return &idnaTrie{}
-}
-
-// lookupValue determines the type of block n and looks up the value for b.
-func (t *idnaTrie) lookupValue(n uint32, b byte) uint16 {
-	switch {
-	case n < 123:
-		return uint16(idnaValues[n<<6+uint32(b)])
-	default:
-		n -= 123
-		return uint16(idnaSparse.lookup(n, b))
-	}
-}
-
-// idnaValues: 125 blocks, 8000 entries, 16000 bytes
-// The third block is the zero block.
-var idnaValues = [8000]uint16{
-	// Block 0x0, offset 0x0
-	0x00: 0x0080, 0x01: 0x0080, 0x02: 0x0080, 0x03: 0x0080, 0x04: 0x0080, 0x05: 0x0080,
-	0x06: 0x0080, 0x07: 0x0080, 0x08: 0x0080, 0x09: 0x0080, 0x0a: 0x0080, 0x0b: 0x0080,
-	0x0c: 0x0080, 0x0d: 0x0080, 0x0e: 0x0080, 0x0f: 0x0080, 0x10: 0x0080, 0x11: 0x0080,
-	0x12: 0x0080, 0x13: 0x0080, 0x14: 0x0080, 0x15: 0x0080, 0x16: 0x0080, 0x17: 0x0080,
-	0x18: 0x0080, 0x19: 0x0080, 0x1a: 0x0080, 0x1b: 0x0080, 0x1c: 0x0080, 0x1d: 0x0080,
-	0x1e: 0x0080, 0x1f: 0x0080, 0x20: 0x0080, 0x21: 0x0080, 0x22: 0x0080, 0x23: 0x0080,
-	0x24: 0x0080, 0x25: 0x0080, 0x26: 0x0080, 0x27: 0x0080, 0x28: 0x0080, 0x29: 0x0080,
-	0x2a: 0x0080, 0x2b: 0x0080, 0x2c: 0x0080, 0x2d: 0x0008, 0x2e: 0x0008, 0x2f: 0x0080,
-	0x30: 0x0008, 0x31: 0x0008, 0x32: 0x0008, 0x33: 0x0008, 0x34: 0x0008, 0x35: 0x0008,
-	0x36: 0x0008, 0x37: 0x0008, 0x38: 0x0008, 0x39: 0x0008, 0x3a: 0x0080, 0x3b: 0x0080,
-	0x3c: 0x0080, 0x3d: 0x0080, 0x3e: 0x0080, 0x3f: 0x0080,
-	// Block 0x1, offset 0x40
-	0x40: 0x0080, 0x41: 0xe105, 0x42: 0xe105, 0x43: 0xe105, 0x44: 0xe105, 0x45: 0xe105,
-	0x46: 0xe105, 0x47: 0xe105, 0x48: 0xe105, 0x49: 0xe105, 0x4a: 0xe105, 0x4b: 0xe105,
-	0x4c: 0xe105, 0x4d: 0xe105, 0x4e: 0xe105, 0x4f: 0xe105, 0x50: 0xe105, 0x51: 0xe105,
-	0x52: 0xe105, 0x53: 0xe105, 0x54: 0xe105, 0x55: 0xe105, 0x56: 0xe105, 0x57: 0xe105,
-	0x58: 0xe105, 0x59: 0xe105, 0x5a: 0xe105, 0x5b: 0x0080, 0x5c: 0x0080, 0x5d: 0x0080,
-	0x5e: 0x0080, 0x5f: 0x0080, 0x60: 0x0080, 0x61: 0x0008, 0x62: 0x0008, 0x63: 0x0008,
-	0x64: 0x0008, 0x65: 0x0008, 0x66: 0x0008, 0x67: 0x0008, 0x68: 0x0008, 0x69: 0x0008,
-	0x6a: 0x0008, 0x6b: 0x0008, 0x6c: 0x0008, 0x6d: 0x0008, 0x6e: 0x0008, 0x6f: 0x0008,
-	0x70: 0x0008, 0x71: 0x0008, 0x72: 0x0008, 0x73: 0x0008, 0x74: 0x0008, 0x75: 0x0008,
-	0x76: 0x0008, 0x77: 0x0008, 0x78: 0x0008, 0x79: 0x0008, 0x7a: 0x0008, 0x7b: 0x0080,
-	0x7c: 0x0080, 0x7d: 0x0080, 0x7e: 0x0080, 0x7f: 0x0080,
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc0: 0x0040, 0xc1: 0x0040, 0xc2: 0x0040, 0xc3: 0x0040, 0xc4: 0x0040, 0xc5: 0x0040,
-	0xc6: 0x0040, 0xc7: 0x0040, 0xc8: 0x0040, 0xc9: 0x0040, 0xca: 0x0040, 0xcb: 0x0040,
-	0xcc: 0x0040, 0xcd: 0x0040, 0xce: 0x0040, 0xcf: 0x0040, 0xd0: 0x0040, 0xd1: 0x0040,
-	0xd2: 0x0040, 0xd3: 0x0040, 0xd4: 0x0040, 0xd5: 0x0040, 0xd6: 0x0040, 0xd7: 0x0040,
-	0xd8: 0x0040, 0xd9: 0x0040, 0xda: 0x0040, 0xdb: 0x0040, 0xdc: 0x0040, 0xdd: 0x0040,
-	0xde: 0x0040, 0xdf: 0x0040, 0xe0: 0x000a, 0xe1: 0x0018, 0xe2: 0x0018, 0xe3: 0x0018,
-	0xe4: 0x0018, 0xe5: 0x0018, 0xe6: 0x0018, 0xe7: 0x0018, 0xe8: 0x001a, 0xe9: 0x0018,
-	0xea: 0x0039, 0xeb: 0x0018, 0xec: 0x0018, 0xed: 0x03c0, 0xee: 0x0018, 0xef: 0x004a,
-	0xf0: 0x0018, 0xf1: 0x0018, 0xf2: 0x0069, 0xf3: 0x0079, 0xf4: 0x008a, 0xf5: 0x0005,
-	0xf6: 0x0018, 0xf7: 0x0008, 0xf8: 0x00aa, 0xf9: 0x00c9, 0xfa: 0x00d9, 0xfb: 0x0018,
-	0xfc: 0x00e9, 0xfd: 0x0119, 0xfe: 0x0149, 0xff: 0x0018,
-	// Block 0x4, offset 0x100
-	0x100: 0xe00d, 0x101: 0x0008, 0x102: 0xe00d, 0x103: 0x0008, 0x104: 0xe00d, 0x105: 0x0008,
-	0x106: 0xe00d, 0x107: 0x0008, 0x108: 0xe00d, 0x109: 0x0008, 0x10a: 0xe00d, 0x10b: 0x0008,
-	0x10c: 0xe00d, 0x10d: 0x0008, 0x10e: 0xe00d, 0x10f: 0x0008, 0x110: 0xe00d, 0x111: 0x0008,
-	0x112: 0xe00d, 0x113: 0x0008, 0x114: 0xe00d, 0x115: 0x0008, 0x116: 0xe00d, 0x117: 0x0008,
-	0x118: 0xe00d, 0x119: 0x0008, 0x11a: 0xe00d, 0x11b: 0x0008, 0x11c: 0xe00d, 0x11d: 0x0008,
-	0x11e: 0xe00d, 0x11f: 0x0008, 0x120: 0xe00d, 0x121: 0x0008, 0x122: 0xe00d, 0x123: 0x0008,
-	0x124: 0xe00d, 0x125: 0x0008, 0x126: 0xe00d, 0x127: 0x0008, 0x128: 0xe00d, 0x129: 0x0008,
-	0x12a: 0xe00d, 0x12b: 0x0008, 0x12c: 0xe00d, 0x12d: 0x0008, 0x12e: 0xe00d, 0x12f: 0x0008,
-	0x130: 0x0179, 0x131: 0x0008, 0x132: 0x0035, 0x133: 0x004d, 0x134: 0xe00d, 0x135: 0x0008,
-	0x136: 0xe00d, 0x137: 0x0008, 0x138: 0x0008, 0x139: 0xe01d, 0x13a: 0x0008, 0x13b: 0xe03d,
-	0x13c: 0x0008, 0x13d: 0xe01d, 0x13e: 0x0008, 0x13f: 0x0199,
-	// Block 0x5, offset 0x140
-	0x140: 0x0199, 0x141: 0xe01d, 0x142: 0x0008, 0x143: 0xe03d, 0x144: 0x0008, 0x145: 0xe01d,
-	0x146: 0x0008, 0x147: 0xe07d, 0x148: 0x0008, 0x149: 0x01b9, 0x14a: 0xe00d, 0x14b: 0x0008,
-	0x14c: 0xe00d, 0x14d: 0x0008, 0x14e: 0xe00d, 0x14f: 0x0008, 0x150: 0xe00d, 0x151: 0x0008,
-	0x152: 0xe00d, 0x153: 0x0008, 0x154: 0xe00d, 0x155: 0x0008, 0x156: 0xe00d, 0x157: 0x0008,
-	0x158: 0xe00d, 0x159: 0x0008, 0x15a: 0xe00d, 0x15b: 0x0008, 0x15c: 0xe00d, 0x15d: 0x0008,
-	0x15e: 0xe00d, 0x15f: 0x0008, 0x160: 0xe00d, 0x161: 0x0008, 0x162: 0xe00d, 0x163: 0x0008,
-	0x164: 0xe00d, 0x165: 0x0008, 0x166: 0xe00d, 0x167: 0x0008, 0x168: 0xe00d, 0x169: 0x0008,
-	0x16a: 0xe00d, 0x16b: 0x0008, 0x16c: 0xe00d, 0x16d: 0x0008, 0x16e: 0xe00d, 0x16f: 0x0008,
-	0x170: 0xe00d, 0x171: 0x0008, 0x172: 0xe00d, 0x173: 0x0008, 0x174: 0xe00d, 0x175: 0x0008,
-	0x176: 0xe00d, 0x177: 0x0008, 0x178: 0x0065, 0x179: 0xe01d, 0x17a: 0x0008, 0x17b: 0xe03d,
-	0x17c: 0x0008, 0x17d: 0xe01d, 0x17e: 0x0008, 0x17f: 0x01d9,
-	// Block 0x6, offset 0x180
-	0x180: 0x0008, 0x181: 0x007d, 0x182: 0xe00d, 0x183: 0x0008, 0x184: 0xe00d, 0x185: 0x0008,
-	0x186: 0x007d, 0x187: 0xe07d, 0x188: 0x0008, 0x189: 0x0095, 0x18a: 0x00ad, 0x18b: 0xe03d,
-	0x18c: 0x0008, 0x18d: 0x0008, 0x18e: 0x00c5, 0x18f: 0x00dd, 0x190: 0x00f5, 0x191: 0xe01d,
-	0x192: 0x0008, 0x193: 0x010d, 0x194: 0x0125, 0x195: 0x0008, 0x196: 0x013d, 0x197: 0x013d,
-	0x198: 0xe00d, 0x199: 0x0008, 0x19a: 0x0008, 0x19b: 0x0008, 0x19c: 0x010d, 0x19d: 0x0155,
-	0x19e: 0x0008, 0x19f: 0x016d, 0x1a0: 0xe00d, 0x1a1: 0x0008, 0x1a2: 0xe00d, 0x1a3: 0x0008,
-	0x1a4: 0xe00d, 0x1a5: 0x0008, 0x1a6: 0x0185, 0x1a7: 0xe07d, 0x1a8: 0x0008, 0x1a9: 0x019d,
-	0x1aa: 0x0008, 0x1ab: 0x0008, 0x1ac: 0xe00d, 0x1ad: 0x0008, 0x1ae: 0x0185, 0x1af: 0xe0fd,
-	0x1b0: 0x0008, 0x1b1: 0x01b5, 0x1b2: 0x01cd, 0x1b3: 0xe03d, 0x1b4: 0x0008, 0x1b5: 0xe01d,
-	0x1b6: 0x0008, 0x1b7: 0x01e5, 0x1b8: 0xe00d, 0x1b9: 0x0008, 0x1ba: 0x0008, 0x1bb: 0x0008,
-	0x1bc: 0xe00d, 0x1bd: 0x0008, 0x1be: 0x0008, 0x1bf: 0x0008,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x0008, 0x1c1: 0x0008, 0x1c2: 0x0008, 0x1c3: 0x0008, 0x1c4: 0x01e9, 0x1c5: 0x01e9,
-	0x1c6: 0x01e9, 0x1c7: 0x01fd, 0x1c8: 0x0215, 0x1c9: 0x022d, 0x1ca: 0x0245, 0x1cb: 0x025d,
-	0x1cc: 0x0275, 0x1cd: 0xe01d, 0x1ce: 0x0008, 0x1cf: 0xe0fd, 0x1d0: 0x0008, 0x1d1: 0xe01d,
-	0x1d2: 0x0008, 0x1d3: 0xe03d, 0x1d4: 0x0008, 0x1d5: 0xe01d, 0x1d6: 0x0008, 0x1d7: 0xe07d,
-	0x1d8: 0x0008, 0x1d9: 0xe01d, 0x1da: 0x0008, 0x1db: 0xe03d, 0x1dc: 0x0008, 0x1dd: 0x0008,
-	0x1de: 0xe00d, 0x1df: 0x0008, 0x1e0: 0xe00d, 0x1e1: 0x0008, 0x1e2: 0xe00d, 0x1e3: 0x0008,
-	0x1e4: 0xe00d, 0x1e5: 0x0008, 0x1e6: 0xe00d, 0x1e7: 0x0008, 0x1e8: 0xe00d, 0x1e9: 0x0008,
-	0x1ea: 0xe00d, 0x1eb: 0x0008, 0x1ec: 0xe00d, 0x1ed: 0x0008, 0x1ee: 0xe00d, 0x1ef: 0x0008,
-	0x1f0: 0x0008, 0x1f1: 0x028d, 0x1f2: 0x02a5, 0x1f3: 0x02bd, 0x1f4: 0xe00d, 0x1f5: 0x0008,
-	0x1f6: 0x02d5, 0x1f7: 0x02ed, 0x1f8: 0xe00d, 0x1f9: 0x0008, 0x1fa: 0xe00d, 0x1fb: 0x0008,
-	0x1fc: 0xe00d, 0x1fd: 0x0008, 0x1fe: 0xe00d, 0x1ff: 0x0008,
-	// Block 0x8, offset 0x200
-	0x200: 0xe00d, 0x201: 0x0008, 0x202: 0xe00d, 0x203: 0x0008, 0x204: 0xe00d, 0x205: 0x0008,
-	0x206: 0xe00d, 0x207: 0x0008, 0x208: 0xe00d, 0x209: 0x0008, 0x20a: 0xe00d, 0x20b: 0x0008,
-	0x20c: 0xe00d, 0x20d: 0x0008, 0x20e: 0xe00d, 0x20f: 0x0008, 0x210: 0xe00d, 0x211: 0x0008,
-	0x212: 0xe00d, 0x213: 0x0008, 0x214: 0xe00d, 0x215: 0x0008, 0x216: 0xe00d, 0x217: 0x0008,
-	0x218: 0xe00d, 0x219: 0x0008, 0x21a: 0xe00d, 0x21b: 0x0008, 0x21c: 0xe00d, 0x21d: 0x0008,
-	0x21e: 0xe00d, 0x21f: 0x0008, 0x220: 0x0305, 0x221: 0x0008, 0x222: 0xe00d, 0x223: 0x0008,
-	0x224: 0xe00d, 0x225: 0x0008, 0x226: 0xe00d, 0x227: 0x0008, 0x228: 0xe00d, 0x229: 0x0008,
-	0x22a: 0xe00d, 0x22b: 0x0008, 0x22c: 0xe00d, 0x22d: 0x0008, 0x22e: 0xe00d, 0x22f: 0x0008,
-	0x230: 0xe00d, 0x231: 0x0008, 0x232: 0xe00d, 0x233: 0x0008, 0x234: 0x0008, 0x235: 0x0008,
-	0x236: 0x0008, 0x237: 0x0008, 0x238: 0x0008, 0x239: 0x0008, 0x23a: 0x0209, 0x23b: 0xe03d,
-	0x23c: 0x0008, 0x23d: 0x031d, 0x23e: 0x0229, 0x23f: 0x0008,
-	// Block 0x9, offset 0x240
-	0x240: 0x0008, 0x241: 0x0008, 0x242: 0x0018, 0x243: 0x0018, 0x244: 0x0018, 0x245: 0x0018,
-	0x246: 0x0008, 0x247: 0x0008, 0x248: 0x0008, 0x249: 0x0008, 0x24a: 0x0008, 0x24b: 0x0008,
-	0x24c: 0x0008, 0x24d: 0x0008, 0x24e: 0x0008, 0x24f: 0x0008, 0x250: 0x0008, 0x251: 0x0008,
-	0x252: 0x0018, 0x253: 0x0018, 0x254: 0x0018, 0x255: 0x0018, 0x256: 0x0018, 0x257: 0x0018,
-	0x258: 0x029a, 0x259: 0x02ba, 0x25a: 0x02da, 0x25b: 0x02fa, 0x25c: 0x031a, 0x25d: 0x033a,
-	0x25e: 0x0018, 0x25f: 0x0018, 0x260: 0x03ad, 0x261: 0x0359, 0x262: 0x01d9, 0x263: 0x0369,
-	0x264: 0x03c5, 0x265: 0x0018, 0x266: 0x0018, 0x267: 0x0018, 0x268: 0x0018, 0x269: 0x0018,
-	0x26a: 0x0018, 0x26b: 0x0018, 0x26c: 0x0008, 0x26d: 0x0018, 0x26e: 0x0008, 0x26f: 0x0018,
-	0x270: 0x0018, 0x271: 0x0018, 0x272: 0x0018, 0x273: 0x0018, 0x274: 0x0018, 0x275: 0x0018,
-	0x276: 0x0018, 0x277: 0x0018, 0x278: 0x0018, 0x279: 0x0018, 0x27a: 0x0018, 0x27b: 0x0018,
-	0x27c: 0x0018, 0x27d: 0x0018, 0x27e: 0x0018, 0x27f: 0x0018,
-	// Block 0xa, offset 0x280
-	0x280: 0x03dd, 0x281: 0x03dd, 0x282: 0x1308, 0x283: 0x03f5, 0x284: 0x0379, 0x285: 0x040d,
-	0x286: 0x1308, 0x287: 0x1308, 0x288: 0x1308, 0x289: 0x1308, 0x28a: 0x1308, 0x28b: 0x1308,
-	0x28c: 0x1308, 0x28d: 0x1308, 0x28e: 0x1308, 0x28f: 0x13c0, 0x290: 0x1308, 0x291: 0x1308,
-	0x292: 0x1308, 0x293: 0x1308, 0x294: 0x1308, 0x295: 0x1308, 0x296: 0x1308, 0x297: 0x1308,
-	0x298: 0x1308, 0x299: 0x1308, 0x29a: 0x1308, 0x29b: 0x1308, 0x29c: 0x1308, 0x29d: 0x1308,
-	0x29e: 0x1308, 0x29f: 0x1308, 0x2a0: 0x1308, 0x2a1: 0x1308, 0x2a2: 0x1308, 0x2a3: 0x1308,
-	0x2a4: 0x1308, 0x2a5: 0x1308, 0x2a6: 0x1308, 0x2a7: 0x1308, 0x2a8: 0x1308, 0x2a9: 0x1308,
-	0x2aa: 0x1308, 0x2ab: 0x1308, 0x2ac: 0x1308, 0x2ad: 0x1308, 0x2ae: 0x1308, 0x2af: 0x1308,
-	0x2b0: 0xe00d, 0x2b1: 0x0008, 0x2b2: 0xe00d, 0x2b3: 0x0008, 0x2b4: 0x0425, 0x2b5: 0x0008,
-	0x2b6: 0xe00d, 0x2b7: 0x0008, 0x2b8: 0x0040, 0x2b9: 0x0040, 0x2ba: 0x03a2, 0x2bb: 0x0008,
-	0x2bc: 0x0008, 0x2bd: 0x0008, 0x2be: 0x03c2, 0x2bf: 0x043d,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0x0040, 0x2c1: 0x0040, 0x2c2: 0x0040, 0x2c3: 0x0040, 0x2c4: 0x008a, 0x2c5: 0x03d2,
-	0x2c6: 0xe155, 0x2c7: 0x0455, 0x2c8: 0xe12d, 0x2c9: 0xe13d, 0x2ca: 0xe12d, 0x2cb: 0x0040,
-	0x2cc: 0x03dd, 0x2cd: 0x0040, 0x2ce: 0x046d, 0x2cf: 0x0485, 0x2d0: 0x0008, 0x2d1: 0xe105,
-	0x2d2: 0xe105, 0x2d3: 0xe105, 0x2d4: 0xe105, 0x2d5: 0xe105, 0x2d6: 0xe105, 0x2d7: 0xe105,
-	0x2d8: 0xe105, 0x2d9: 0xe105, 0x2da: 0xe105, 0x2db: 0xe105, 0x2dc: 0xe105, 0x2dd: 0xe105,
-	0x2de: 0xe105, 0x2df: 0xe105, 0x2e0: 0x049d, 0x2e1: 0x049d, 0x2e2: 0x0040, 0x2e3: 0x049d,
-	0x2e4: 0x049d, 0x2e5: 0x049d, 0x2e6: 0x049d, 0x2e7: 0x049d, 0x2e8: 0x049d, 0x2e9: 0x049d,
-	0x2ea: 0x049d, 0x2eb: 0x049d, 0x2ec: 0x0008, 0x2ed: 0x0008, 0x2ee: 0x0008, 0x2ef: 0x0008,
-	0x2f0: 0x0008, 0x2f1: 0x0008, 0x2f2: 0x0008, 0x2f3: 0x0008, 0x2f4: 0x0008, 0x2f5: 0x0008,
-	0x2f6: 0x0008, 0x2f7: 0x0008, 0x2f8: 0x0008, 0x2f9: 0x0008, 0x2fa: 0x0008, 0x2fb: 0x0008,
-	0x2fc: 0x0008, 0x2fd: 0x0008, 0x2fe: 0x0008, 0x2ff: 0x0008,
-	// Block 0xc, offset 0x300
-	0x300: 0x0008, 0x301: 0x0008, 0x302: 0xe00f, 0x303: 0x0008, 0x304: 0x0008, 0x305: 0x0008,
-	0x306: 0x0008, 0x307: 0x0008, 0x308: 0x0008, 0x309: 0x0008, 0x30a: 0x0008, 0x30b: 0x0008,
-	0x30c: 0x0008, 0x30d: 0x0008, 0x30e: 0x0008, 0x30f: 0xe0c5, 0x310: 0x04b5, 0x311: 0x04cd,
-	0x312: 0xe0bd, 0x313: 0xe0f5, 0x314: 0xe0fd, 0x315: 0xe09d, 0x316: 0xe0b5, 0x317: 0x0008,
-	0x318: 0xe00d, 0x319: 0x0008, 0x31a: 0xe00d, 0x31b: 0x0008, 0x31c: 0xe00d, 0x31d: 0x0008,
-	0x31e: 0xe00d, 0x31f: 0x0008, 0x320: 0xe00d, 0x321: 0x0008, 0x322: 0xe00d, 0x323: 0x0008,
-	0x324: 0xe00d, 0x325: 0x0008, 0x326: 0xe00d, 0x327: 0x0008, 0x328: 0xe00d, 0x329: 0x0008,
-	0x32a: 0xe00d, 0x32b: 0x0008, 0x32c: 0xe00d, 0x32d: 0x0008, 0x32e: 0xe00d, 0x32f: 0x0008,
-	0x330: 0x04e5, 0x331: 0xe185, 0x332: 0xe18d, 0x333: 0x0008, 0x334: 0x04fd, 0x335: 0x03dd,
-	0x336: 0x0018, 0x337: 0xe07d, 0x338: 0x0008, 0x339: 0xe1d5, 0x33a: 0xe00d, 0x33b: 0x0008,
-	0x33c: 0x0008, 0x33d: 0x0515, 0x33e: 0x052d, 0x33f: 0x052d,
-	// Block 0xd, offset 0x340
-	0x340: 0x0008, 0x341: 0x0008, 0x342: 0x0008, 0x343: 0x0008, 0x344: 0x0008, 0x345: 0x0008,
-	0x346: 0x0008, 0x347: 0x0008, 0x348: 0x0008, 0x349: 0x0008, 0x34a: 0x0008, 0x34b: 0x0008,
-	0x34c: 0x0008, 0x34d: 0x0008, 0x34e: 0x0008, 0x34f: 0x0008, 0x350: 0x0008, 0x351: 0x0008,
-	0x352: 0x0008, 0x353: 0x0008, 0x354: 0x0008, 0x355: 0x0008, 0x356: 0x0008, 0x357: 0x0008,
-	0x358: 0x0008, 0x359: 0x0008, 0x35a: 0x0008, 0x35b: 0x0008, 0x35c: 0x0008, 0x35d: 0x0008,
-	0x35e: 0x0008, 0x35f: 0x0008, 0x360: 0xe00d, 0x361: 0x0008, 0x362: 0xe00d, 0x363: 0x0008,
-	0x364: 0xe00d, 0x365: 0x0008, 0x366: 0xe00d, 0x367: 0x0008, 0x368: 0xe00d, 0x369: 0x0008,
-	0x36a: 0xe00d, 0x36b: 0x0008, 0x36c: 0xe00d, 0x36d: 0x0008, 0x36e: 0xe00d, 0x36f: 0x0008,
-	0x370: 0xe00d, 0x371: 0x0008, 0x372: 0xe00d, 0x373: 0x0008, 0x374: 0xe00d, 0x375: 0x0008,
-	0x376: 0xe00d, 0x377: 0x0008, 0x378: 0xe00d, 0x379: 0x0008, 0x37a: 0xe00d, 0x37b: 0x0008,
-	0x37c: 0xe00d, 0x37d: 0x0008, 0x37e: 0xe00d, 0x37f: 0x0008,
-	// Block 0xe, offset 0x380
-	0x380: 0xe00d, 0x381: 0x0008, 0x382: 0x0018, 0x383: 0x1308, 0x384: 0x1308, 0x385: 0x1308,
-	0x386: 0x1308, 0x387: 0x1308, 0x388: 0x1318, 0x389: 0x1318, 0x38a: 0xe00d, 0x38b: 0x0008,
-	0x38c: 0xe00d, 0x38d: 0x0008, 0x38e: 0xe00d, 0x38f: 0x0008, 0x390: 0xe00d, 0x391: 0x0008,
-	0x392: 0xe00d, 0x393: 0x0008, 0x394: 0xe00d, 0x395: 0x0008, 0x396: 0xe00d, 0x397: 0x0008,
-	0x398: 0xe00d, 0x399: 0x0008, 0x39a: 0xe00d, 0x39b: 0x0008, 0x39c: 0xe00d, 0x39d: 0x0008,
-	0x39e: 0xe00d, 0x39f: 0x0008, 0x3a0: 0xe00d, 0x3a1: 0x0008, 0x3a2: 0xe00d, 0x3a3: 0x0008,
-	0x3a4: 0xe00d, 0x3a5: 0x0008, 0x3a6: 0xe00d, 0x3a7: 0x0008, 0x3a8: 0xe00d, 0x3a9: 0x0008,
-	0x3aa: 0xe00d, 0x3ab: 0x0008, 0x3ac: 0xe00d, 0x3ad: 0x0008, 0x3ae: 0xe00d, 0x3af: 0x0008,
-	0x3b0: 0xe00d, 0x3b1: 0x0008, 0x3b2: 0xe00d, 0x3b3: 0x0008, 0x3b4: 0xe00d, 0x3b5: 0x0008,
-	0x3b6: 0xe00d, 0x3b7: 0x0008, 0x3b8: 0xe00d, 0x3b9: 0x0008, 0x3ba: 0xe00d, 0x3bb: 0x0008,
-	0x3bc: 0xe00d, 0x3bd: 0x0008, 0x3be: 0xe00d, 0x3bf: 0x0008,
-	// Block 0xf, offset 0x3c0
-	0x3c0: 0x0040, 0x3c1: 0xe01d, 0x3c2: 0x0008, 0x3c3: 0xe03d, 0x3c4: 0x0008, 0x3c5: 0xe01d,
-	0x3c6: 0x0008, 0x3c7: 0xe07d, 0x3c8: 0x0008, 0x3c9: 0xe01d, 0x3ca: 0x0008, 0x3cb: 0xe03d,
-	0x3cc: 0x0008, 0x3cd: 0xe01d, 0x3ce: 0x0008, 0x3cf: 0x0008, 0x3d0: 0xe00d, 0x3d1: 0x0008,
-	0x3d2: 0xe00d, 0x3d3: 0x0008, 0x3d4: 0xe00d, 0x3d5: 0x0008, 0x3d6: 0xe00d, 0x3d7: 0x0008,
-	0x3d8: 0xe00d, 0x3d9: 0x0008, 0x3da: 0xe00d, 0x3db: 0x0008, 0x3dc: 0xe00d, 0x3dd: 0x0008,
-	0x3de: 0xe00d, 0x3df: 0x0008, 0x3e0: 0xe00d, 0x3e1: 0x0008, 0x3e2: 0xe00d, 0x3e3: 0x0008,
-	0x3e4: 0xe00d, 0x3e5: 0x0008, 0x3e6: 0xe00d, 0x3e7: 0x0008, 0x3e8: 0xe00d, 0x3e9: 0x0008,
-	0x3ea: 0xe00d, 0x3eb: 0x0008, 0x3ec: 0xe00d, 0x3ed: 0x0008, 0x3ee: 0xe00d, 0x3ef: 0x0008,
-	0x3f0: 0xe00d, 0x3f1: 0x0008, 0x3f2: 0xe00d, 0x3f3: 0x0008, 0x3f4: 0xe00d, 0x3f5: 0x0008,
-	0x3f6: 0xe00d, 0x3f7: 0x0008, 0x3f8: 0xe00d, 0x3f9: 0x0008, 0x3fa: 0xe00d, 0x3fb: 0x0008,
-	0x3fc: 0xe00d, 0x3fd: 0x0008, 0x3fe: 0xe00d, 0x3ff: 0x0008,
-	// Block 0x10, offset 0x400
-	0x400: 0xe00d, 0x401: 0x0008, 0x402: 0xe00d, 0x403: 0x0008, 0x404: 0xe00d, 0x405: 0x0008,
-	0x406: 0xe00d, 0x407: 0x0008, 0x408: 0xe00d, 0x409: 0x0008, 0x40a: 0xe00d, 0x40b: 0x0008,
-	0x40c: 0xe00d, 0x40d: 0x0008, 0x40e: 0xe00d, 0x40f: 0x0008, 0x410: 0xe00d, 0x411: 0x0008,
-	0x412: 0xe00d, 0x413: 0x0008, 0x414: 0xe00d, 0x415: 0x0008, 0x416: 0xe00d, 0x417: 0x0008,
-	0x418: 0xe00d, 0x419: 0x0008, 0x41a: 0xe00d, 0x41b: 0x0008, 0x41c: 0xe00d, 0x41d: 0x0008,
-	0x41e: 0xe00d, 0x41f: 0x0008, 0x420: 0xe00d, 0x421: 0x0008, 0x422: 0xe00d, 0x423: 0x0008,
-	0x424: 0xe00d, 0x425: 0x0008, 0x426: 0xe00d, 0x427: 0x0008, 0x428: 0xe00d, 0x429: 0x0008,
-	0x42a: 0xe00d, 0x42b: 0x0008, 0x42c: 0xe00d, 0x42d: 0x0008, 0x42e: 0xe00d, 0x42f: 0x0008,
-	0x430: 0x0040, 0x431: 0x03f5, 0x432: 0x03f5, 0x433: 0x03f5, 0x434: 0x03f5, 0x435: 0x03f5,
-	0x436: 0x03f5, 0x437: 0x03f5, 0x438: 0x03f5, 0x439: 0x03f5, 0x43a: 0x03f5, 0x43b: 0x03f5,
-	0x43c: 0x03f5, 0x43d: 0x03f5, 0x43e: 0x03f5, 0x43f: 0x03f5,
-	// Block 0x11, offset 0x440
-	0x440: 0x0040, 0x441: 0x0040, 0x442: 0x0040, 0x443: 0x0040, 0x444: 0x0040, 0x445: 0x0040,
-	0x446: 0x0018, 0x447: 0x0018, 0x448: 0x0018, 0x449: 0x0018, 0x44a: 0x0018, 0x44b: 0x0018,
-	0x44c: 0x0018, 0x44d: 0x0018, 0x44e: 0x0018, 0x44f: 0x0018, 0x450: 0x1308, 0x451: 0x1308,
-	0x452: 0x1308, 0x453: 0x1308, 0x454: 0x1308, 0x455: 0x1308, 0x456: 0x1308, 0x457: 0x1308,
-	0x458: 0x1308, 0x459: 0x1308, 0x45a: 0x1308, 0x45b: 0x0018, 0x45c: 0x0340, 0x45d: 0x0040,
-	0x45e: 0x0018, 0x45f: 0x0018, 0x460: 0x0208, 0x461: 0x0008, 0x462: 0x0408, 0x463: 0x0408,
-	0x464: 0x0408, 0x465: 0x0408, 0x466: 0x0208, 0x467: 0x0408, 0x468: 0x0208, 0x469: 0x0408,
-	0x46a: 0x0208, 0x46b: 0x0208, 0x46c: 0x0208, 0x46d: 0x0208, 0x46e: 0x0208, 0x46f: 0x0408,
-	0x470: 0x0408, 0x471: 0x0408, 0x472: 0x0408, 0x473: 0x0208, 0x474: 0x0208, 0x475: 0x0208,
-	0x476: 0x0208, 0x477: 0x0208, 0x478: 0x0208, 0x479: 0x0208, 0x47a: 0x0208, 0x47b: 0x0208,
-	0x47c: 0x0208, 0x47d: 0x0208, 0x47e: 0x0208, 0x47f: 0x0208,
-	// Block 0x12, offset 0x480
-	0x480: 0x0408, 0x481: 0x0208, 0x482: 0x0208, 0x483: 0x0408, 0x484: 0x0408, 0x485: 0x0408,
-	0x486: 0x0408, 0x487: 0x0408, 0x488: 0x0408, 0x489: 0x0408, 0x48a: 0x0408, 0x48b: 0x0408,
-	0x48c: 0x0208, 0x48d: 0x0408, 0x48e: 0x0208, 0x48f: 0x0408, 0x490: 0x0208, 0x491: 0x0208,
-	0x492: 0x0408, 0x493: 0x0408, 0x494: 0x0018, 0x495: 0x0408, 0x496: 0x1308, 0x497: 0x1308,
-	0x498: 0x1308, 0x499: 0x1308, 0x49a: 0x1308, 0x49b: 0x1308, 0x49c: 0x1308, 0x49d: 0x0040,
-	0x49e: 0x0018, 0x49f: 0x1308, 0x4a0: 0x1308, 0x4a1: 0x1308, 0x4a2: 0x1308, 0x4a3: 0x1308,
-	0x4a4: 0x1308, 0x4a5: 0x0008, 0x4a6: 0x0008, 0x4a7: 0x1308, 0x4a8: 0x1308, 0x4a9: 0x0018,
-	0x4aa: 0x1308, 0x4ab: 0x1308, 0x4ac: 0x1308, 0x4ad: 0x1308, 0x4ae: 0x0408, 0x4af: 0x0408,
-	0x4b0: 0x0008, 0x4b1: 0x0008, 0x4b2: 0x0008, 0x4b3: 0x0008, 0x4b4: 0x0008, 0x4b5: 0x0008,
-	0x4b6: 0x0008, 0x4b7: 0x0008, 0x4b8: 0x0008, 0x4b9: 0x0008, 0x4ba: 0x0208, 0x4bb: 0x0208,
-	0x4bc: 0x0208, 0x4bd: 0x0008, 0x4be: 0x0008, 0x4bf: 0x0208,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0x0018, 0x4c1: 0x0018, 0x4c2: 0x0018, 0x4c3: 0x0018, 0x4c4: 0x0018, 0x4c5: 0x0018,
-	0x4c6: 0x0018, 0x4c7: 0x0018, 0x4c8: 0x0018, 0x4c9: 0x0018, 0x4ca: 0x0018, 0x4cb: 0x0018,
-	0x4cc: 0x0018, 0x4cd: 0x0018, 0x4ce: 0x0040, 0x4cf: 0x0340, 0x4d0: 0x0408, 0x4d1: 0x1308,
-	0x4d2: 0x0208, 0x4d3: 0x0208, 0x4d4: 0x0208, 0x4d5: 0x0408, 0x4d6: 0x0408, 0x4d7: 0x0408,
-	0x4d8: 0x0408, 0x4d9: 0x0408, 0x4da: 0x0208, 0x4db: 0x0208, 0x4dc: 0x0208, 0x4dd: 0x0208,
-	0x4de: 0x0408, 0x4df: 0x0208, 0x4e0: 0x0208, 0x4e1: 0x0208, 0x4e2: 0x0208, 0x4e3: 0x0208,
-	0x4e4: 0x0208, 0x4e5: 0x0208, 0x4e6: 0x0208, 0x4e7: 0x0208, 0x4e8: 0x0408, 0x4e9: 0x0208,
-	0x4ea: 0x0408, 0x4eb: 0x0208, 0x4ec: 0x0408, 0x4ed: 0x0208, 0x4ee: 0x0208, 0x4ef: 0x0408,
-	0x4f0: 0x1308, 0x4f1: 0x1308, 0x4f2: 0x1308, 0x4f3: 0x1308, 0x4f4: 0x1308, 0x4f5: 0x1308,
-	0x4f6: 0x1308, 0x4f7: 0x1308, 0x4f8: 0x1308, 0x4f9: 0x1308, 0x4fa: 0x1308, 0x4fb: 0x1308,
-	0x4fc: 0x1308, 0x4fd: 0x1308, 0x4fe: 0x1308, 0x4ff: 0x1308,
-	// Block 0x14, offset 0x500
-	0x500: 0x1008, 0x501: 0x1308, 0x502: 0x1308, 0x503: 0x1308, 0x504: 0x1308, 0x505: 0x1308,
-	0x506: 0x1308, 0x507: 0x1308, 0x508: 0x1308, 0x509: 0x1008, 0x50a: 0x1008, 0x50b: 0x1008,
-	0x50c: 0x1008, 0x50d: 0x1b08, 0x50e: 0x1008, 0x50f: 0x1008, 0x510: 0x0008, 0x511: 0x1308,
-	0x512: 0x1308, 0x513: 0x1308, 0x514: 0x1308, 0x515: 0x1308, 0x516: 0x1308, 0x517: 0x1308,
-	0x518: 0x04c9, 0x519: 0x0501, 0x51a: 0x0539, 0x51b: 0x0571, 0x51c: 0x05a9, 0x51d: 0x05e1,
-	0x51e: 0x0619, 0x51f: 0x0651, 0x520: 0x0008, 0x521: 0x0008, 0x522: 0x1308, 0x523: 0x1308,
-	0x524: 0x0018, 0x525: 0x0018, 0x526: 0x0008, 0x527: 0x0008, 0x528: 0x0008, 0x529: 0x0008,
-	0x52a: 0x0008, 0x52b: 0x0008, 0x52c: 0x0008, 0x52d: 0x0008, 0x52e: 0x0008, 0x52f: 0x0008,
-	0x530: 0x0018, 0x531: 0x0008, 0x532: 0x0008, 0x533: 0x0008, 0x534: 0x0008, 0x535: 0x0008,
-	0x536: 0x0008, 0x537: 0x0008, 0x538: 0x0008, 0x539: 0x0008, 0x53a: 0x0008, 0x53b: 0x0008,
-	0x53c: 0x0008, 0x53d: 0x0008, 0x53e: 0x0008, 0x53f: 0x0008,
-	// Block 0x15, offset 0x540
-	0x540: 0x0008, 0x541: 0x1308, 0x542: 0x1008, 0x543: 0x1008, 0x544: 0x0040, 0x545: 0x0008,
-	0x546: 0x0008, 0x547: 0x0008, 0x548: 0x0008, 0x549: 0x0008, 0x54a: 0x0008, 0x54b: 0x0008,
-	0x54c: 0x0008, 0x54d: 0x0040, 0x54e: 0x0040, 0x54f: 0x0008, 0x550: 0x0008, 0x551: 0x0040,
-	0x552: 0x0040, 0x553: 0x0008, 0x554: 0x0008, 0x555: 0x0008, 0x556: 0x0008, 0x557: 0x0008,
-	0x558: 0x0008, 0x559: 0x0008, 0x55a: 0x0008, 0x55b: 0x0008, 0x55c: 0x0008, 0x55d: 0x0008,
-	0x55e: 0x0008, 0x55f: 0x0008, 0x560: 0x0008, 0x561: 0x0008, 0x562: 0x0008, 0x563: 0x0008,
-	0x564: 0x0008, 0x565: 0x0008, 0x566: 0x0008, 0x567: 0x0008, 0x568: 0x0008, 0x569: 0x0040,
-	0x56a: 0x0008, 0x56b: 0x0008, 0x56c: 0x0008, 0x56d: 0x0008, 0x56e: 0x0008, 0x56f: 0x0008,
-	0x570: 0x0008, 0x571: 0x0040, 0x572: 0x0008, 0x573: 0x0040, 0x574: 0x0040, 0x575: 0x0040,
-	0x576: 0x0008, 0x577: 0x0008, 0x578: 0x0008, 0x579: 0x0008, 0x57a: 0x0040, 0x57b: 0x0040,
-	0x57c: 0x1308, 0x57d: 0x0008, 0x57e: 0x1008, 0x57f: 0x1008,
-	// Block 0x16, offset 0x580
-	0x580: 0x1008, 0x581: 0x1308, 0x582: 0x1308, 0x583: 0x1308, 0x584: 0x1308, 0x585: 0x0040,
-	0x586: 0x0040, 0x587: 0x1008, 0x588: 0x1008, 0x589: 0x0040, 0x58a: 0x0040, 0x58b: 0x1008,
-	0x58c: 0x1008, 0x58d: 0x1b08, 0x58e: 0x0008, 0x58f: 0x0040, 0x590: 0x0040, 0x591: 0x0040,
-	0x592: 0x0040, 0x593: 0x0040, 0x594: 0x0040, 0x595: 0x0040, 0x596: 0x0040, 0x597: 0x1008,
-	0x598: 0x0040, 0x599: 0x0040, 0x59a: 0x0040, 0x59b: 0x0040, 0x59c: 0x0689, 0x59d: 0x06c1,
-	0x59e: 0x0040, 0x59f: 0x06f9, 0x5a0: 0x0008, 0x5a1: 0x0008, 0x5a2: 0x1308, 0x5a3: 0x1308,
-	0x5a4: 0x0040, 0x5a5: 0x0040, 0x5a6: 0x0008, 0x5a7: 0x0008, 0x5a8: 0x0008, 0x5a9: 0x0008,
-	0x5aa: 0x0008, 0x5ab: 0x0008, 0x5ac: 0x0008, 0x5ad: 0x0008, 0x5ae: 0x0008, 0x5af: 0x0008,
-	0x5b0: 0x0008, 0x5b1: 0x0008, 0x5b2: 0x0018, 0x5b3: 0x0018, 0x5b4: 0x0018, 0x5b5: 0x0018,
-	0x5b6: 0x0018, 0x5b7: 0x0018, 0x5b8: 0x0018, 0x5b9: 0x0018, 0x5ba: 0x0018, 0x5bb: 0x0018,
-	0x5bc: 0x0040, 0x5bd: 0x0040, 0x5be: 0x0040, 0x5bf: 0x0040,
-	// Block 0x17, offset 0x5c0
-	0x5c0: 0x0040, 0x5c1: 0x1308, 0x5c2: 0x1308, 0x5c3: 0x1008, 0x5c4: 0x0040, 0x5c5: 0x0008,
-	0x5c6: 0x0008, 0x5c7: 0x0008, 0x5c8: 0x0008, 0x5c9: 0x0008, 0x5ca: 0x0008, 0x5cb: 0x0040,
-	0x5cc: 0x0040, 0x5cd: 0x0040, 0x5ce: 0x0040, 0x5cf: 0x0008, 0x5d0: 0x0008, 0x5d1: 0x0040,
-	0x5d2: 0x0040, 0x5d3: 0x0008, 0x5d4: 0x0008, 0x5d5: 0x0008, 0x5d6: 0x0008, 0x5d7: 0x0008,
-	0x5d8: 0x0008, 0x5d9: 0x0008, 0x5da: 0x0008, 0x5db: 0x0008, 0x5dc: 0x0008, 0x5dd: 0x0008,
-	0x5de: 0x0008, 0x5df: 0x0008, 0x5e0: 0x0008, 0x5e1: 0x0008, 0x5e2: 0x0008, 0x5e3: 0x0008,
-	0x5e4: 0x0008, 0x5e5: 0x0008, 0x5e6: 0x0008, 0x5e7: 0x0008, 0x5e8: 0x0008, 0x5e9: 0x0040,
-	0x5ea: 0x0008, 0x5eb: 0x0008, 0x5ec: 0x0008, 0x5ed: 0x0008, 0x5ee: 0x0008, 0x5ef: 0x0008,
-	0x5f0: 0x0008, 0x5f1: 0x0040, 0x5f2: 0x0008, 0x5f3: 0x0731, 0x5f4: 0x0040, 0x5f5: 0x0008,
-	0x5f6: 0x0769, 0x5f7: 0x0040, 0x5f8: 0x0008, 0x5f9: 0x0008, 0x5fa: 0x0040, 0x5fb: 0x0040,
-	0x5fc: 0x1308, 0x5fd: 0x0040, 0x5fe: 0x1008, 0x5ff: 0x1008,
-	// Block 0x18, offset 0x600
-	0x600: 0x1008, 0x601: 0x1308, 0x602: 0x1308, 0x603: 0x0040, 0x604: 0x0040, 0x605: 0x0040,
-	0x606: 0x0040, 0x607: 0x1308, 0x608: 0x1308, 0x609: 0x0040, 0x60a: 0x0040, 0x60b: 0x1308,
-	0x60c: 0x1308, 0x60d: 0x1b08, 0x60e: 0x0040, 0x60f: 0x0040, 0x610: 0x0040, 0x611: 0x1308,
-	0x612: 0x0040, 0x613: 0x0040, 0x614: 0x0040, 0x615: 0x0040, 0x616: 0x0040, 0x617: 0x0040,
-	0x618: 0x0040, 0x619: 0x07a1, 0x61a: 0x07d9, 0x61b: 0x0811, 0x61c: 0x0008, 0x61d: 0x0040,
-	0x61e: 0x0849, 0x61f: 0x0040, 0x620: 0x0040, 0x621: 0x0040, 0x622: 0x0040, 0x623: 0x0040,
-	0x624: 0x0040, 0x625: 0x0040, 0x626: 0x0008, 0x627: 0x0008, 0x628: 0x0008, 0x629: 0x0008,
-	0x62a: 0x0008, 0x62b: 0x0008, 0x62c: 0x0008, 0x62d: 0x0008, 0x62e: 0x0008, 0x62f: 0x0008,
-	0x630: 0x1308, 0x631: 0x1308, 0x632: 0x0008, 0x633: 0x0008, 0x634: 0x0008, 0x635: 0x1308,
-	0x636: 0x0040, 0x637: 0x0040, 0x638: 0x0040, 0x639: 0x0040, 0x63a: 0x0040, 0x63b: 0x0040,
-	0x63c: 0x0040, 0x63d: 0x0040, 0x63e: 0x0040, 0x63f: 0x0040,
-	// Block 0x19, offset 0x640
-	0x640: 0x0040, 0x641: 0x1308, 0x642: 0x1308, 0x643: 0x1008, 0x644: 0x0040, 0x645: 0x0008,
-	0x646: 0x0008, 0x647: 0x0008, 0x648: 0x0008, 0x649: 0x0008, 0x64a: 0x0008, 0x64b: 0x0008,
-	0x64c: 0x0008, 0x64d: 0x0008, 0x64e: 0x0040, 0x64f: 0x0008, 0x650: 0x0008, 0x651: 0x0008,
-	0x652: 0x0040, 0x653: 0x0008, 0x654: 0x0008, 0x655: 0x0008, 0x656: 0x0008, 0x657: 0x0008,
-	0x658: 0x0008, 0x659: 0x0008, 0x65a: 0x0008, 0x65b: 0x0008, 0x65c: 0x0008, 0x65d: 0x0008,
-	0x65e: 0x0008, 0x65f: 0x0008, 0x660: 0x0008, 0x661: 0x0008, 0x662: 0x0008, 0x663: 0x0008,
-	0x664: 0x0008, 0x665: 0x0008, 0x666: 0x0008, 0x667: 0x0008, 0x668: 0x0008, 0x669: 0x0040,
-	0x66a: 0x0008, 0x66b: 0x0008, 0x66c: 0x0008, 0x66d: 0x0008, 0x66e: 0x0008, 0x66f: 0x0008,
-	0x670: 0x0008, 0x671: 0x0040, 0x672: 0x0008, 0x673: 0x0008, 0x674: 0x0040, 0x675: 0x0008,
-	0x676: 0x0008, 0x677: 0x0008, 0x678: 0x0008, 0x679: 0x0008, 0x67a: 0x0040, 0x67b: 0x0040,
-	0x67c: 0x1308, 0x67d: 0x0008, 0x67e: 0x1008, 0x67f: 0x1008,
-	// Block 0x1a, offset 0x680
-	0x680: 0x1008, 0x681: 0x1308, 0x682: 0x1308, 0x683: 0x1308, 0x684: 0x1308, 0x685: 0x1308,
-	0x686: 0x0040, 0x687: 0x1308, 0x688: 0x1308, 0x689: 0x1008, 0x68a: 0x0040, 0x68b: 0x1008,
-	0x68c: 0x1008, 0x68d: 0x1b08, 0x68e: 0x0040, 0x68f: 0x0040, 0x690: 0x0008, 0x691: 0x0040,
-	0x692: 0x0040, 0x693: 0x0040, 0x694: 0x0040, 0x695: 0x0040, 0x696: 0x0040, 0x697: 0x0040,
-	0x698: 0x0040, 0x699: 0x0040, 0x69a: 0x0040, 0x69b: 0x0040, 0x69c: 0x0040, 0x69d: 0x0040,
-	0x69e: 0x0040, 0x69f: 0x0040, 0x6a0: 0x0008, 0x6a1: 0x0008, 0x6a2: 0x1308, 0x6a3: 0x1308,
-	0x6a4: 0x0040, 0x6a5: 0x0040, 0x6a6: 0x0008, 0x6a7: 0x0008, 0x6a8: 0x0008, 0x6a9: 0x0008,
-	0x6aa: 0x0008, 0x6ab: 0x0008, 0x6ac: 0x0008, 0x6ad: 0x0008, 0x6ae: 0x0008, 0x6af: 0x0008,
-	0x6b0: 0x0018, 0x6b1: 0x0018, 0x6b2: 0x0040, 0x6b3: 0x0040, 0x6b4: 0x0040, 0x6b5: 0x0040,
-	0x6b6: 0x0040, 0x6b7: 0x0040, 0x6b8: 0x0040, 0x6b9: 0x0008, 0x6ba: 0x0040, 0x6bb: 0x0040,
-	0x6bc: 0x0040, 0x6bd: 0x0040, 0x6be: 0x0040, 0x6bf: 0x0040,
-	// Block 0x1b, offset 0x6c0
-	0x6c0: 0x0040, 0x6c1: 0x1308, 0x6c2: 0x1008, 0x6c3: 0x1008, 0x6c4: 0x0040, 0x6c5: 0x0008,
-	0x6c6: 0x0008, 0x6c7: 0x0008, 0x6c8: 0x0008, 0x6c9: 0x0008, 0x6ca: 0x0008, 0x6cb: 0x0008,
-	0x6cc: 0x0008, 0x6cd: 0x0040, 0x6ce: 0x0040, 0x6cf: 0x0008, 0x6d0: 0x0008, 0x6d1: 0x0040,
-	0x6d2: 0x0040, 0x6d3: 0x0008, 0x6d4: 0x0008, 0x6d5: 0x0008, 0x6d6: 0x0008, 0x6d7: 0x0008,
-	0x6d8: 0x0008, 0x6d9: 0x0008, 0x6da: 0x0008, 0x6db: 0x0008, 0x6dc: 0x0008, 0x6dd: 0x0008,
-	0x6de: 0x0008, 0x6df: 0x0008, 0x6e0: 0x0008, 0x6e1: 0x0008, 0x6e2: 0x0008, 0x6e3: 0x0008,
-	0x6e4: 0x0008, 0x6e5: 0x0008, 0x6e6: 0x0008, 0x6e7: 0x0008, 0x6e8: 0x0008, 0x6e9: 0x0040,
-	0x6ea: 0x0008, 0x6eb: 0x0008, 0x6ec: 0x0008, 0x6ed: 0x0008, 0x6ee: 0x0008, 0x6ef: 0x0008,
-	0x6f0: 0x0008, 0x6f1: 0x0040, 0x6f2: 0x0008, 0x6f3: 0x0008, 0x6f4: 0x0040, 0x6f5: 0x0008,
-	0x6f6: 0x0008, 0x6f7: 0x0008, 0x6f8: 0x0008, 0x6f9: 0x0008, 0x6fa: 0x0040, 0x6fb: 0x0040,
-	0x6fc: 0x1308, 0x6fd: 0x0008, 0x6fe: 0x1008, 0x6ff: 0x1308,
-	// Block 0x1c, offset 0x700
-	0x700: 0x1008, 0x701: 0x1308, 0x702: 0x1308, 0x703: 0x1308, 0x704: 0x1308, 0x705: 0x0040,
-	0x706: 0x0040, 0x707: 0x1008, 0x708: 0x1008, 0x709: 0x0040, 0x70a: 0x0040, 0x70b: 0x1008,
-	0x70c: 0x1008, 0x70d: 0x1b08, 0x70e: 0x0040, 0x70f: 0x0040, 0x710: 0x0040, 0x711: 0x0040,
-	0x712: 0x0040, 0x713: 0x0040, 0x714: 0x0040, 0x715: 0x0040, 0x716: 0x1308, 0x717: 0x1008,
-	0x718: 0x0040, 0x719: 0x0040, 0x71a: 0x0040, 0x71b: 0x0040, 0x71c: 0x0881, 0x71d: 0x08b9,
-	0x71e: 0x0040, 0x71f: 0x0008, 0x720: 0x0008, 0x721: 0x0008, 0x722: 0x1308, 0x723: 0x1308,
-	0x724: 0x0040, 0x725: 0x0040, 0x726: 0x0008, 0x727: 0x0008, 0x728: 0x0008, 0x729: 0x0008,
-	0x72a: 0x0008, 0x72b: 0x0008, 0x72c: 0x0008, 0x72d: 0x0008, 0x72e: 0x0008, 0x72f: 0x0008,
-	0x730: 0x0018, 0x731: 0x0008, 0x732: 0x0018, 0x733: 0x0018, 0x734: 0x0018, 0x735: 0x0018,
-	0x736: 0x0018, 0x737: 0x0018, 0x738: 0x0040, 0x739: 0x0040, 0x73a: 0x0040, 0x73b: 0x0040,
-	0x73c: 0x0040, 0x73d: 0x0040, 0x73e: 0x0040, 0x73f: 0x0040,
-	// Block 0x1d, offset 0x740
-	0x740: 0x0040, 0x741: 0x0040, 0x742: 0x1308, 0x743: 0x0008, 0x744: 0x0040, 0x745: 0x0008,
-	0x746: 0x0008, 0x747: 0x0008, 0x748: 0x0008, 0x749: 0x0008, 0x74a: 0x0008, 0x74b: 0x0040,
-	0x74c: 0x0040, 0x74d: 0x0040, 0x74e: 0x0008, 0x74f: 0x0008, 0x750: 0x0008, 0x751: 0x0040,
-	0x752: 0x0008, 0x753: 0x0008, 0x754: 0x0008, 0x755: 0x0008, 0x756: 0x0040, 0x757: 0x0040,
-	0x758: 0x0040, 0x759: 0x0008, 0x75a: 0x0008, 0x75b: 0x0040, 0x75c: 0x0008, 0x75d: 0x0040,
-	0x75e: 0x0008, 0x75f: 0x0008, 0x760: 0x0040, 0x761: 0x0040, 0x762: 0x0040, 0x763: 0x0008,
-	0x764: 0x0008, 0x765: 0x0040, 0x766: 0x0040, 0x767: 0x0040, 0x768: 0x0008, 0x769: 0x0008,
-	0x76a: 0x0008, 0x76b: 0x0040, 0x76c: 0x0040, 0x76d: 0x0040, 0x76e: 0x0008, 0x76f: 0x0008,
-	0x770: 0x0008, 0x771: 0x0008, 0x772: 0x0008, 0x773: 0x0008, 0x774: 0x0008, 0x775: 0x0008,
-	0x776: 0x0008, 0x777: 0x0008, 0x778: 0x0008, 0x779: 0x0008, 0x77a: 0x0040, 0x77b: 0x0040,
-	0x77c: 0x0040, 0x77d: 0x0040, 0x77e: 0x1008, 0x77f: 0x1008,
-	// Block 0x1e, offset 0x780
-	0x780: 0x1308, 0x781: 0x1008, 0x782: 0x1008, 0x783: 0x1008, 0x784: 0x1008, 0x785: 0x0040,
-	0x786: 0x1308, 0x787: 0x1308, 0x788: 0x1308, 0x789: 0x0040, 0x78a: 0x1308, 0x78b: 0x1308,
-	0x78c: 0x1308, 0x78d: 0x1b08, 0x78e: 0x0040, 0x78f: 0x0040, 0x790: 0x0040, 0x791: 0x0040,
-	0x792: 0x0040, 0x793: 0x0040, 0x794: 0x0040, 0x795: 0x1308, 0x796: 0x1308, 0x797: 0x0040,
-	0x798: 0x0008, 0x799: 0x0008, 0x79a: 0x0008, 0x79b: 0x0040, 0x79c: 0x0040, 0x79d: 0x0040,
-	0x79e: 0x0040, 0x79f: 0x0040, 0x7a0: 0x0008, 0x7a1: 0x0008, 0x7a2: 0x1308, 0x7a3: 0x1308,
-	0x7a4: 0x0040, 0x7a5: 0x0040, 0x7a6: 0x0008, 0x7a7: 0x0008, 0x7a8: 0x0008, 0x7a9: 0x0008,
-	0x7aa: 0x0008, 0x7ab: 0x0008, 0x7ac: 0x0008, 0x7ad: 0x0008, 0x7ae: 0x0008, 0x7af: 0x0008,
-	0x7b0: 0x0040, 0x7b1: 0x0040, 0x7b2: 0x0040, 0x7b3: 0x0040, 0x7b4: 0x0040, 0x7b5: 0x0040,
-	0x7b6: 0x0040, 0x7b7: 0x0040, 0x7b8: 0x0018, 0x7b9: 0x0018, 0x7ba: 0x0018, 0x7bb: 0x0018,
-	0x7bc: 0x0018, 0x7bd: 0x0018, 0x7be: 0x0018, 0x7bf: 0x0018,
-	// Block 0x1f, offset 0x7c0
-	0x7c0: 0x0008, 0x7c1: 0x1308, 0x7c2: 0x1008, 0x7c3: 0x1008, 0x7c4: 0x0040, 0x7c5: 0x0008,
-	0x7c6: 0x0008, 0x7c7: 0x0008, 0x7c8: 0x0008, 0x7c9: 0x0008, 0x7ca: 0x0008, 0x7cb: 0x0008,
-	0x7cc: 0x0008, 0x7cd: 0x0040, 0x7ce: 0x0008, 0x7cf: 0x0008, 0x7d0: 0x0008, 0x7d1: 0x0040,
-	0x7d2: 0x0008, 0x7d3: 0x0008, 0x7d4: 0x0008, 0x7d5: 0x0008, 0x7d6: 0x0008, 0x7d7: 0x0008,
-	0x7d8: 0x0008, 0x7d9: 0x0008, 0x7da: 0x0008, 0x7db: 0x0008, 0x7dc: 0x0008, 0x7dd: 0x0008,
-	0x7de: 0x0008, 0x7df: 0x0008, 0x7e0: 0x0008, 0x7e1: 0x0008, 0x7e2: 0x0008, 0x7e3: 0x0008,
-	0x7e4: 0x0008, 0x7e5: 0x0008, 0x7e6: 0x0008, 0x7e7: 0x0008, 0x7e8: 0x0008, 0x7e9: 0x0040,
-	0x7ea: 0x0008, 0x7eb: 0x0008, 0x7ec: 0x0008, 0x7ed: 0x0008, 0x7ee: 0x0008, 0x7ef: 0x0008,
-	0x7f0: 0x0008, 0x7f1: 0x0008, 0x7f2: 0x0008, 0x7f3: 0x0008, 0x7f4: 0x0040, 0x7f5: 0x0008,
-	0x7f6: 0x0008, 0x7f7: 0x0008, 0x7f8: 0x0008, 0x7f9: 0x0008, 0x7fa: 0x0040, 0x7fb: 0x0040,
-	0x7fc: 0x1308, 0x7fd: 0x0008, 0x7fe: 0x1008, 0x7ff: 0x1308,
-	// Block 0x20, offset 0x800
-	0x800: 0x1008, 0x801: 0x1008, 0x802: 0x1008, 0x803: 0x1008, 0x804: 0x1008, 0x805: 0x0040,
-	0x806: 0x1308, 0x807: 0x1008, 0x808: 0x1008, 0x809: 0x0040, 0x80a: 0x1008, 0x80b: 0x1008,
-	0x80c: 0x1308, 0x80d: 0x1b08, 0x80e: 0x0040, 0x80f: 0x0040, 0x810: 0x0040, 0x811: 0x0040,
-	0x812: 0x0040, 0x813: 0x0040, 0x814: 0x0040, 0x815: 0x1008, 0x816: 0x1008, 0x817: 0x0040,
-	0x818: 0x0040, 0x819: 0x0040, 0x81a: 0x0040, 0x81b: 0x0040, 0x81c: 0x0040, 0x81d: 0x0040,
-	0x81e: 0x0008, 0x81f: 0x0040, 0x820: 0x0008, 0x821: 0x0008, 0x822: 0x1308, 0x823: 0x1308,
-	0x824: 0x0040, 0x825: 0x0040, 0x826: 0x0008, 0x827: 0x0008, 0x828: 0x0008, 0x829: 0x0008,
-	0x82a: 0x0008, 0x82b: 0x0008, 0x82c: 0x0008, 0x82d: 0x0008, 0x82e: 0x0008, 0x82f: 0x0008,
-	0x830: 0x0040, 0x831: 0x0008, 0x832: 0x0008, 0x833: 0x0040, 0x834: 0x0040, 0x835: 0x0040,
-	0x836: 0x0040, 0x837: 0x0040, 0x838: 0x0040, 0x839: 0x0040, 0x83a: 0x0040, 0x83b: 0x0040,
-	0x83c: 0x0040, 0x83d: 0x0040, 0x83e: 0x0040, 0x83f: 0x0040,
-	// Block 0x21, offset 0x840
-	0x840: 0x1008, 0x841: 0x1308, 0x842: 0x1308, 0x843: 0x1308, 0x844: 0x1308, 0x845: 0x0040,
-	0x846: 0x1008, 0x847: 0x1008, 0x848: 0x1008, 0x849: 0x0040, 0x84a: 0x1008, 0x84b: 0x1008,
-	0x84c: 0x1008, 0x84d: 0x1b08, 0x84e: 0x0008, 0x84f: 0x0018, 0x850: 0x0040, 0x851: 0x0040,
-	0x852: 0x0040, 0x853: 0x0040, 0x854: 0x0008, 0x855: 0x0008, 0x856: 0x0008, 0x857: 0x1008,
-	0x858: 0x0018, 0x859: 0x0018, 0x85a: 0x0018, 0x85b: 0x0018, 0x85c: 0x0018, 0x85d: 0x0018,
-	0x85e: 0x0018, 0x85f: 0x0008, 0x860: 0x0008, 0x861: 0x0008, 0x862: 0x1308, 0x863: 0x1308,
-	0x864: 0x0040, 0x865: 0x0040, 0x866: 0x0008, 0x867: 0x0008, 0x868: 0x0008, 0x869: 0x0008,
-	0x86a: 0x0008, 0x86b: 0x0008, 0x86c: 0x0008, 0x86d: 0x0008, 0x86e: 0x0008, 0x86f: 0x0008,
-	0x870: 0x0018, 0x871: 0x0018, 0x872: 0x0018, 0x873: 0x0018, 0x874: 0x0018, 0x875: 0x0018,
-	0x876: 0x0018, 0x877: 0x0018, 0x878: 0x0018, 0x879: 0x0018, 0x87a: 0x0008, 0x87b: 0x0008,
-	0x87c: 0x0008, 0x87d: 0x0008, 0x87e: 0x0008, 0x87f: 0x0008,
-	// Block 0x22, offset 0x880
-	0x880: 0x0040, 0x881: 0x0008, 0x882: 0x0008, 0x883: 0x0040, 0x884: 0x0008, 0x885: 0x0040,
-	0x886: 0x0040, 0x887: 0x0008, 0x888: 0x0008, 0x889: 0x0040, 0x88a: 0x0008, 0x88b: 0x0040,
-	0x88c: 0x0040, 0x88d: 0x0008, 0x88e: 0x0040, 0x88f: 0x0040, 0x890: 0x0040, 0x891: 0x0040,
-	0x892: 0x0040, 0x893: 0x0040, 0x894: 0x0008, 0x895: 0x0008, 0x896: 0x0008, 0x897: 0x0008,
-	0x898: 0x0040, 0x899: 0x0008, 0x89a: 0x0008, 0x89b: 0x0008, 0x89c: 0x0008, 0x89d: 0x0008,
-	0x89e: 0x0008, 0x89f: 0x0008, 0x8a0: 0x0040, 0x8a1: 0x0008, 0x8a2: 0x0008, 0x8a3: 0x0008,
-	0x8a4: 0x0040, 0x8a5: 0x0008, 0x8a6: 0x0040, 0x8a7: 0x0008, 0x8a8: 0x0040, 0x8a9: 0x0040,
-	0x8aa: 0x0008, 0x8ab: 0x0008, 0x8ac: 0x0040, 0x8ad: 0x0008, 0x8ae: 0x0008, 0x8af: 0x0008,
-	0x8b0: 0x0008, 0x8b1: 0x1308, 0x8b2: 0x0008, 0x8b3: 0x0929, 0x8b4: 0x1308, 0x8b5: 0x1308,
-	0x8b6: 0x1308, 0x8b7: 0x1308, 0x8b8: 0x1308, 0x8b9: 0x1308, 0x8ba: 0x0040, 0x8bb: 0x1308,
-	0x8bc: 0x1308, 0x8bd: 0x0008, 0x8be: 0x0040, 0x8bf: 0x0040,
-	// Block 0x23, offset 0x8c0
-	0x8c0: 0x0008, 0x8c1: 0x0008, 0x8c2: 0x0008, 0x8c3: 0x09d1, 0x8c4: 0x0008, 0x8c5: 0x0008,
-	0x8c6: 0x0008, 0x8c7: 0x0008, 0x8c8: 0x0040, 0x8c9: 0x0008, 0x8ca: 0x0008, 0x8cb: 0x0008,
-	0x8cc: 0x0008, 0x8cd: 0x0a09, 0x8ce: 0x0008, 0x8cf: 0x0008, 0x8d0: 0x0008, 0x8d1: 0x0008,
-	0x8d2: 0x0a41, 0x8d3: 0x0008, 0x8d4: 0x0008, 0x8d5: 0x0008, 0x8d6: 0x0008, 0x8d7: 0x0a79,
-	0x8d8: 0x0008, 0x8d9: 0x0008, 0x8da: 0x0008, 0x8db: 0x0008, 0x8dc: 0x0ab1, 0x8dd: 0x0008,
-	0x8de: 0x0008, 0x8df: 0x0008, 0x8e0: 0x0008, 0x8e1: 0x0008, 0x8e2: 0x0008, 0x8e3: 0x0008,
-	0x8e4: 0x0008, 0x8e5: 0x0008, 0x8e6: 0x0008, 0x8e7: 0x0008, 0x8e8: 0x0008, 0x8e9: 0x0ae9,
-	0x8ea: 0x0008, 0x8eb: 0x0008, 0x8ec: 0x0008, 0x8ed: 0x0040, 0x8ee: 0x0040, 0x8ef: 0x0040,
-	0x8f0: 0x0040, 0x8f1: 0x1308, 0x8f2: 0x1308, 0x8f3: 0x0b21, 0x8f4: 0x1308, 0x8f5: 0x0b59,
-	0x8f6: 0x0b91, 0x8f7: 0x0bc9, 0x8f8: 0x0c19, 0x8f9: 0x0c51, 0x8fa: 0x1308, 0x8fb: 0x1308,
-	0x8fc: 0x1308, 0x8fd: 0x1308, 0x8fe: 0x1308, 0x8ff: 0x1008,
-	// Block 0x24, offset 0x900
-	0x900: 0x1308, 0x901: 0x0ca1, 0x902: 0x1308, 0x903: 0x1308, 0x904: 0x1b08, 0x905: 0x0018,
-	0x906: 0x1308, 0x907: 0x1308, 0x908: 0x0008, 0x909: 0x0008, 0x90a: 0x0008, 0x90b: 0x0008,
-	0x90c: 0x0008, 0x90d: 0x1308, 0x90e: 0x1308, 0x90f: 0x1308, 0x910: 0x1308, 0x911: 0x1308,
-	0x912: 0x1308, 0x913: 0x0cd9, 0x914: 0x1308, 0x915: 0x1308, 0x916: 0x1308, 0x917: 0x1308,
-	0x918: 0x0040, 0x919: 0x1308, 0x91a: 0x1308, 0x91b: 0x1308, 0x91c: 0x1308, 0x91d: 0x0d11,
-	0x91e: 0x1308, 0x91f: 0x1308, 0x920: 0x1308, 0x921: 0x1308, 0x922: 0x0d49, 0x923: 0x1308,
-	0x924: 0x1308, 0x925: 0x1308, 0x926: 0x1308, 0x927: 0x0d81, 0x928: 0x1308, 0x929: 0x1308,
-	0x92a: 0x1308, 0x92b: 0x1308, 0x92c: 0x0db9, 0x92d: 0x1308, 0x92e: 0x1308, 0x92f: 0x1308,
-	0x930: 0x1308, 0x931: 0x1308, 0x932: 0x1308, 0x933: 0x1308, 0x934: 0x1308, 0x935: 0x1308,
-	0x936: 0x1308, 0x937: 0x1308, 0x938: 0x1308, 0x939: 0x0df1, 0x93a: 0x1308, 0x93b: 0x1308,
-	0x93c: 0x1308, 0x93d: 0x0040, 0x93e: 0x0018, 0x93f: 0x0018,
-	// Block 0x25, offset 0x940
-	0x940: 0x0008, 0x941: 0x0008, 0x942: 0x0008, 0x943: 0x0008, 0x944: 0x0008, 0x945: 0x0008,
-	0x946: 0x0008, 0x947: 0x0008, 0x948: 0x0008, 0x949: 0x0008, 0x94a: 0x0008, 0x94b: 0x0008,
-	0x94c: 0x0008, 0x94d: 0x0008, 0x94e: 0x0008, 0x94f: 0x0008, 0x950: 0x0008, 0x951: 0x0008,
-	0x952: 0x0008, 0x953: 0x0008, 0x954: 0x0008, 0x955: 0x0008, 0x956: 0x0008, 0x957: 0x0008,
-	0x958: 0x0008, 0x959: 0x0008, 0x95a: 0x0008, 0x95b: 0x0008, 0x95c: 0x0008, 0x95d: 0x0008,
-	0x95e: 0x0008, 0x95f: 0x0008, 0x960: 0x0008, 0x961: 0x0008, 0x962: 0x0008, 0x963: 0x0008,
-	0x964: 0x0008, 0x965: 0x0008, 0x966: 0x0008, 0x967: 0x0008, 0x968: 0x0008, 0x969: 0x0008,
-	0x96a: 0x0008, 0x96b: 0x0008, 0x96c: 0x0039, 0x96d: 0x0ed1, 0x96e: 0x0ee9, 0x96f: 0x0008,
-	0x970: 0x0ef9, 0x971: 0x0f09, 0x972: 0x0f19, 0x973: 0x0f31, 0x974: 0x0249, 0x975: 0x0f41,
-	0x976: 0x0259, 0x977: 0x0f51, 0x978: 0x0359, 0x979: 0x0f61, 0x97a: 0x0f71, 0x97b: 0x0008,
-	0x97c: 0x00d9, 0x97d: 0x0f81, 0x97e: 0x0f99, 0x97f: 0x0269,
-	// Block 0x26, offset 0x980
-	0x980: 0x0fa9, 0x981: 0x0fb9, 0x982: 0x0279, 0x983: 0x0039, 0x984: 0x0fc9, 0x985: 0x0fe1,
-	0x986: 0x059d, 0x987: 0x0ee9, 0x988: 0x0ef9, 0x989: 0x0f09, 0x98a: 0x0ff9, 0x98b: 0x1011,
-	0x98c: 0x1029, 0x98d: 0x0f31, 0x98e: 0x0008, 0x98f: 0x0f51, 0x990: 0x0f61, 0x991: 0x1041,
-	0x992: 0x00d9, 0x993: 0x1059, 0x994: 0x05b5, 0x995: 0x05b5, 0x996: 0x0f99, 0x997: 0x0fa9,
-	0x998: 0x0fb9, 0x999: 0x059d, 0x99a: 0x1071, 0x99b: 0x1089, 0x99c: 0x05cd, 0x99d: 0x1099,
-	0x99e: 0x10b1, 0x99f: 0x10c9, 0x9a0: 0x10e1, 0x9a1: 0x10f9, 0x9a2: 0x0f41, 0x9a3: 0x0269,
-	0x9a4: 0x0fb9, 0x9a5: 0x1089, 0x9a6: 0x1099, 0x9a7: 0x10b1, 0x9a8: 0x1111, 0x9a9: 0x10e1,
-	0x9aa: 0x10f9, 0x9ab: 0x0008, 0x9ac: 0x0008, 0x9ad: 0x0008, 0x9ae: 0x0008, 0x9af: 0x0008,
-	0x9b0: 0x0008, 0x9b1: 0x0008, 0x9b2: 0x0008, 0x9b3: 0x0008, 0x9b4: 0x0008, 0x9b5: 0x0008,
-	0x9b6: 0x0008, 0x9b7: 0x0008, 0x9b8: 0x1129, 0x9b9: 0x0008, 0x9ba: 0x0008, 0x9bb: 0x0008,
-	0x9bc: 0x0008, 0x9bd: 0x0008, 0x9be: 0x0008, 0x9bf: 0x0008,
-	// Block 0x27, offset 0x9c0
-	0x9c0: 0x0008, 0x9c1: 0x0008, 0x9c2: 0x0008, 0x9c3: 0x0008, 0x9c4: 0x0008, 0x9c5: 0x0008,
-	0x9c6: 0x0008, 0x9c7: 0x0008, 0x9c8: 0x0008, 0x9c9: 0x0008, 0x9ca: 0x0008, 0x9cb: 0x0008,
-	0x9cc: 0x0008, 0x9cd: 0x0008, 0x9ce: 0x0008, 0x9cf: 0x0008, 0x9d0: 0x0008, 0x9d1: 0x0008,
-	0x9d2: 0x0008, 0x9d3: 0x0008, 0x9d4: 0x0008, 0x9d5: 0x0008, 0x9d6: 0x0008, 0x9d7: 0x0008,
-	0x9d8: 0x0008, 0x9d9: 0x0008, 0x9da: 0x0008, 0x9db: 0x1141, 0x9dc: 0x1159, 0x9dd: 0x1169,
-	0x9de: 0x1181, 0x9df: 0x1029, 0x9e0: 0x1199, 0x9e1: 0x11a9, 0x9e2: 0x11c1, 0x9e3: 0x11d9,
-	0x9e4: 0x11f1, 0x9e5: 0x1209, 0x9e6: 0x1221, 0x9e7: 0x05e5, 0x9e8: 0x1239, 0x9e9: 0x1251,
-	0x9ea: 0xe17d, 0x9eb: 0x1269, 0x9ec: 0x1281, 0x9ed: 0x1299, 0x9ee: 0x12b1, 0x9ef: 0x12c9,
-	0x9f0: 0x12e1, 0x9f1: 0x12f9, 0x9f2: 0x1311, 0x9f3: 0x1329, 0x9f4: 0x1341, 0x9f5: 0x1359,
-	0x9f6: 0x1371, 0x9f7: 0x1389, 0x9f8: 0x05fd, 0x9f9: 0x13a1, 0x9fa: 0x13b9, 0x9fb: 0x13d1,
-	0x9fc: 0x13e1, 0x9fd: 0x13f9, 0x9fe: 0x1411, 0x9ff: 0x1429,
-	// Block 0x28, offset 0xa00
-	0xa00: 0xe00d, 0xa01: 0x0008, 0xa02: 0xe00d, 0xa03: 0x0008, 0xa04: 0xe00d, 0xa05: 0x0008,
-	0xa06: 0xe00d, 0xa07: 0x0008, 0xa08: 0xe00d, 0xa09: 0x0008, 0xa0a: 0xe00d, 0xa0b: 0x0008,
-	0xa0c: 0xe00d, 0xa0d: 0x0008, 0xa0e: 0xe00d, 0xa0f: 0x0008, 0xa10: 0xe00d, 0xa11: 0x0008,
-	0xa12: 0xe00d, 0xa13: 0x0008, 0xa14: 0xe00d, 0xa15: 0x0008, 0xa16: 0xe00d, 0xa17: 0x0008,
-	0xa18: 0xe00d, 0xa19: 0x0008, 0xa1a: 0xe00d, 0xa1b: 0x0008, 0xa1c: 0xe00d, 0xa1d: 0x0008,
-	0xa1e: 0xe00d, 0xa1f: 0x0008, 0xa20: 0xe00d, 0xa21: 0x0008, 0xa22: 0xe00d, 0xa23: 0x0008,
-	0xa24: 0xe00d, 0xa25: 0x0008, 0xa26: 0xe00d, 0xa27: 0x0008, 0xa28: 0xe00d, 0xa29: 0x0008,
-	0xa2a: 0xe00d, 0xa2b: 0x0008, 0xa2c: 0xe00d, 0xa2d: 0x0008, 0xa2e: 0xe00d, 0xa2f: 0x0008,
-	0xa30: 0xe00d, 0xa31: 0x0008, 0xa32: 0xe00d, 0xa33: 0x0008, 0xa34: 0xe00d, 0xa35: 0x0008,
-	0xa36: 0xe00d, 0xa37: 0x0008, 0xa38: 0xe00d, 0xa39: 0x0008, 0xa3a: 0xe00d, 0xa3b: 0x0008,
-	0xa3c: 0xe00d, 0xa3d: 0x0008, 0xa3e: 0xe00d, 0xa3f: 0x0008,
-	// Block 0x29, offset 0xa40
-	0xa40: 0xe00d, 0xa41: 0x0008, 0xa42: 0xe00d, 0xa43: 0x0008, 0xa44: 0xe00d, 0xa45: 0x0008,
-	0xa46: 0xe00d, 0xa47: 0x0008, 0xa48: 0xe00d, 0xa49: 0x0008, 0xa4a: 0xe00d, 0xa4b: 0x0008,
-	0xa4c: 0xe00d, 0xa4d: 0x0008, 0xa4e: 0xe00d, 0xa4f: 0x0008, 0xa50: 0xe00d, 0xa51: 0x0008,
-	0xa52: 0xe00d, 0xa53: 0x0008, 0xa54: 0xe00d, 0xa55: 0x0008, 0xa56: 0x0008, 0xa57: 0x0008,
-	0xa58: 0x0008, 0xa59: 0x0008, 0xa5a: 0x0615, 0xa5b: 0x0635, 0xa5c: 0x0008, 0xa5d: 0x0008,
-	0xa5e: 0x1441, 0xa5f: 0x0008, 0xa60: 0xe00d, 0xa61: 0x0008, 0xa62: 0xe00d, 0xa63: 0x0008,
-	0xa64: 0xe00d, 0xa65: 0x0008, 0xa66: 0xe00d, 0xa67: 0x0008, 0xa68: 0xe00d, 0xa69: 0x0008,
-	0xa6a: 0xe00d, 0xa6b: 0x0008, 0xa6c: 0xe00d, 0xa6d: 0x0008, 0xa6e: 0xe00d, 0xa6f: 0x0008,
-	0xa70: 0xe00d, 0xa71: 0x0008, 0xa72: 0xe00d, 0xa73: 0x0008, 0xa74: 0xe00d, 0xa75: 0x0008,
-	0xa76: 0xe00d, 0xa77: 0x0008, 0xa78: 0xe00d, 0xa79: 0x0008, 0xa7a: 0xe00d, 0xa7b: 0x0008,
-	0xa7c: 0xe00d, 0xa7d: 0x0008, 0xa7e: 0xe00d, 0xa7f: 0x0008,
-	// Block 0x2a, offset 0xa80
-	0xa80: 0x0008, 0xa81: 0x0008, 0xa82: 0x0008, 0xa83: 0x0008, 0xa84: 0x0008, 0xa85: 0x0008,
-	0xa86: 0x0040, 0xa87: 0x0040, 0xa88: 0xe045, 0xa89: 0xe045, 0xa8a: 0xe045, 0xa8b: 0xe045,
-	0xa8c: 0xe045, 0xa8d: 0xe045, 0xa8e: 0x0040, 0xa8f: 0x0040, 0xa90: 0x0008, 0xa91: 0x0008,
-	0xa92: 0x0008, 0xa93: 0x0008, 0xa94: 0x0008, 0xa95: 0x0008, 0xa96: 0x0008, 0xa97: 0x0008,
-	0xa98: 0x0040, 0xa99: 0xe045, 0xa9a: 0x0040, 0xa9b: 0xe045, 0xa9c: 0x0040, 0xa9d: 0xe045,
-	0xa9e: 0x0040, 0xa9f: 0xe045, 0xaa0: 0x0008, 0xaa1: 0x0008, 0xaa2: 0x0008, 0xaa3: 0x0008,
-	0xaa4: 0x0008, 0xaa5: 0x0008, 0xaa6: 0x0008, 0xaa7: 0x0008, 0xaa8: 0xe045, 0xaa9: 0xe045,
-	0xaaa: 0xe045, 0xaab: 0xe045, 0xaac: 0xe045, 0xaad: 0xe045, 0xaae: 0xe045, 0xaaf: 0xe045,
-	0xab0: 0x0008, 0xab1: 0x1459, 0xab2: 0x0008, 0xab3: 0x1471, 0xab4: 0x0008, 0xab5: 0x1489,
-	0xab6: 0x0008, 0xab7: 0x14a1, 0xab8: 0x0008, 0xab9: 0x14b9, 0xaba: 0x0008, 0xabb: 0x14d1,
-	0xabc: 0x0008, 0xabd: 0x14e9, 0xabe: 0x0040, 0xabf: 0x0040,
-	// Block 0x2b, offset 0xac0
-	0xac0: 0x1501, 0xac1: 0x1531, 0xac2: 0x1561, 0xac3: 0x1591, 0xac4: 0x15c1, 0xac5: 0x15f1,
-	0xac6: 0x1621, 0xac7: 0x1651, 0xac8: 0x1501, 0xac9: 0x1531, 0xaca: 0x1561, 0xacb: 0x1591,
-	0xacc: 0x15c1, 0xacd: 0x15f1, 0xace: 0x1621, 0xacf: 0x1651, 0xad0: 0x1681, 0xad1: 0x16b1,
-	0xad2: 0x16e1, 0xad3: 0x1711, 0xad4: 0x1741, 0xad5: 0x1771, 0xad6: 0x17a1, 0xad7: 0x17d1,
-	0xad8: 0x1681, 0xad9: 0x16b1, 0xada: 0x16e1, 0xadb: 0x1711, 0xadc: 0x1741, 0xadd: 0x1771,
-	0xade: 0x17a1, 0xadf: 0x17d1, 0xae0: 0x1801, 0xae1: 0x1831, 0xae2: 0x1861, 0xae3: 0x1891,
-	0xae4: 0x18c1, 0xae5: 0x18f1, 0xae6: 0x1921, 0xae7: 0x1951, 0xae8: 0x1801, 0xae9: 0x1831,
-	0xaea: 0x1861, 0xaeb: 0x1891, 0xaec: 0x18c1, 0xaed: 0x18f1, 0xaee: 0x1921, 0xaef: 0x1951,
-	0xaf0: 0x0008, 0xaf1: 0x0008, 0xaf2: 0x1981, 0xaf3: 0x19b1, 0xaf4: 0x19d9, 0xaf5: 0x0040,
-	0xaf6: 0x0008, 0xaf7: 0x1a01, 0xaf8: 0xe045, 0xaf9: 0xe045, 0xafa: 0x064d, 0xafb: 0x1459,
-	0xafc: 0x19b1, 0xafd: 0x0666, 0xafe: 0x1a31, 0xaff: 0x0686,
-	// Block 0x2c, offset 0xb00
-	0xb00: 0x06a6, 0xb01: 0x1a4a, 0xb02: 0x1a79, 0xb03: 0x1aa9, 0xb04: 0x1ad1, 0xb05: 0x0040,
-	0xb06: 0x0008, 0xb07: 0x1af9, 0xb08: 0x06c5, 0xb09: 0x1471, 0xb0a: 0x06dd, 0xb0b: 0x1489,
-	0xb0c: 0x1aa9, 0xb0d: 0x1b2a, 0xb0e: 0x1b5a, 0xb0f: 0x1b8a, 0xb10: 0x0008, 0xb11: 0x0008,
-	0xb12: 0x0008, 0xb13: 0x1bb9, 0xb14: 0x0040, 0xb15: 0x0040, 0xb16: 0x0008, 0xb17: 0x0008,
-	0xb18: 0xe045, 0xb19: 0xe045, 0xb1a: 0x06f5, 0xb1b: 0x14a1, 0xb1c: 0x0040, 0xb1d: 0x1bd2,
-	0xb1e: 0x1c02, 0xb1f: 0x1c32, 0xb20: 0x0008, 0xb21: 0x0008, 0xb22: 0x0008, 0xb23: 0x1c61,
-	0xb24: 0x0008, 0xb25: 0x0008, 0xb26: 0x0008, 0xb27: 0x0008, 0xb28: 0xe045, 0xb29: 0xe045,
-	0xb2a: 0x070d, 0xb2b: 0x14d1, 0xb2c: 0xe04d, 0xb2d: 0x1c7a, 0xb2e: 0x03d2, 0xb2f: 0x1caa,
-	0xb30: 0x0040, 0xb31: 0x0040, 0xb32: 0x1cb9, 0xb33: 0x1ce9, 0xb34: 0x1d11, 0xb35: 0x0040,
-	0xb36: 0x0008, 0xb37: 0x1d39, 0xb38: 0x0725, 0xb39: 0x14b9, 0xb3a: 0x0515, 0xb3b: 0x14e9,
-	0xb3c: 0x1ce9, 0xb3d: 0x073e, 0xb3e: 0x075e, 0xb3f: 0x0040,
-	// Block 0x2d, offset 0xb40
-	0xb40: 0x000a, 0xb41: 0x000a, 0xb42: 0x000a, 0xb43: 0x000a, 0xb44: 0x000a, 0xb45: 0x000a,
-	0xb46: 0x000a, 0xb47: 0x000a, 0xb48: 0x000a, 0xb49: 0x000a, 0xb4a: 0x000a, 0xb4b: 0x03c0,
-	0xb4c: 0x0003, 0xb4d: 0x0003, 0xb4e: 0x0340, 0xb4f: 0x0340, 0xb50: 0x0018, 0xb51: 0xe00d,
-	0xb52: 0x0018, 0xb53: 0x0018, 0xb54: 0x0018, 0xb55: 0x0018, 0xb56: 0x0018, 0xb57: 0x077e,
-	0xb58: 0x0018, 0xb59: 0x0018, 0xb5a: 0x0018, 0xb5b: 0x0018, 0xb5c: 0x0018, 0xb5d: 0x0018,
-	0xb5e: 0x0018, 0xb5f: 0x0018, 0xb60: 0x0018, 0xb61: 0x0018, 0xb62: 0x0018, 0xb63: 0x0018,
-	0xb64: 0x0040, 0xb65: 0x0040, 0xb66: 0x0040, 0xb67: 0x0018, 0xb68: 0x0040, 0xb69: 0x0040,
-	0xb6a: 0x0340, 0xb6b: 0x0340, 0xb6c: 0x0340, 0xb6d: 0x0340, 0xb6e: 0x0340, 0xb6f: 0x000a,
-	0xb70: 0x0018, 0xb71: 0x0018, 0xb72: 0x0018, 0xb73: 0x1d69, 0xb74: 0x1da1, 0xb75: 0x0018,
-	0xb76: 0x1df1, 0xb77: 0x1e29, 0xb78: 0x0018, 0xb79: 0x0018, 0xb7a: 0x0018, 0xb7b: 0x0018,
-	0xb7c: 0x1e7a, 0xb7d: 0x0018, 0xb7e: 0x079e, 0xb7f: 0x0018,
-	// Block 0x2e, offset 0xb80
-	0xb80: 0x0018, 0xb81: 0x0018, 0xb82: 0x0018, 0xb83: 0x0018, 0xb84: 0x0018, 0xb85: 0x0018,
-	0xb86: 0x0018, 0xb87: 0x1e92, 0xb88: 0x1eaa, 0xb89: 0x1ec2, 0xb8a: 0x0018, 0xb8b: 0x0018,
-	0xb8c: 0x0018, 0xb8d: 0x0018, 0xb8e: 0x0018, 0xb8f: 0x0018, 0xb90: 0x0018, 0xb91: 0x0018,
-	0xb92: 0x0018, 0xb93: 0x0018, 0xb94: 0x0018, 0xb95: 0x0018, 0xb96: 0x0018, 0xb97: 0x1ed9,
-	0xb98: 0x0018, 0xb99: 0x0018, 0xb9a: 0x0018, 0xb9b: 0x0018, 0xb9c: 0x0018, 0xb9d: 0x0018,
-	0xb9e: 0x0018, 0xb9f: 0x000a, 0xba0: 0x03c0, 0xba1: 0x0340, 0xba2: 0x0340, 0xba3: 0x0340,
-	0xba4: 0x03c0, 0xba5: 0x0040, 0xba6: 0x0040, 0xba7: 0x0040, 0xba8: 0x0040, 0xba9: 0x0040,
-	0xbaa: 0x0340, 0xbab: 0x0340, 0xbac: 0x0340, 0xbad: 0x0340, 0xbae: 0x0340, 0xbaf: 0x0340,
-	0xbb0: 0x1f41, 0xbb1: 0x0f41, 0xbb2: 0x0040, 0xbb3: 0x0040, 0xbb4: 0x1f51, 0xbb5: 0x1f61,
-	0xbb6: 0x1f71, 0xbb7: 0x1f81, 0xbb8: 0x1f91, 0xbb9: 0x1fa1, 0xbba: 0x1fb2, 0xbbb: 0x07bd,
-	0xbbc: 0x1fc2, 0xbbd: 0x1fd2, 0xbbe: 0x1fe2, 0xbbf: 0x0f71,
-	// Block 0x2f, offset 0xbc0
-	0xbc0: 0x1f41, 0xbc1: 0x00c9, 0xbc2: 0x0069, 0xbc3: 0x0079, 0xbc4: 0x1f51, 0xbc5: 0x1f61,
-	0xbc6: 0x1f71, 0xbc7: 0x1f81, 0xbc8: 0x1f91, 0xbc9: 0x1fa1, 0xbca: 0x1fb2, 0xbcb: 0x07d5,
-	0xbcc: 0x1fc2, 0xbcd: 0x1fd2, 0xbce: 0x1fe2, 0xbcf: 0x0040, 0xbd0: 0x0039, 0xbd1: 0x0f09,
-	0xbd2: 0x00d9, 0xbd3: 0x0369, 0xbd4: 0x0ff9, 0xbd5: 0x0249, 0xbd6: 0x0f51, 0xbd7: 0x0359,
-	0xbd8: 0x0f61, 0xbd9: 0x0f71, 0xbda: 0x0f99, 0xbdb: 0x01d9, 0xbdc: 0x0fa9, 0xbdd: 0x0040,
-	0xbde: 0x0040, 0xbdf: 0x0040, 0xbe0: 0x0018, 0xbe1: 0x0018, 0xbe2: 0x0018, 0xbe3: 0x0018,
-	0xbe4: 0x0018, 0xbe5: 0x0018, 0xbe6: 0x0018, 0xbe7: 0x0018, 0xbe8: 0x1ff1, 0xbe9: 0x0018,
-	0xbea: 0x0018, 0xbeb: 0x0018, 0xbec: 0x0018, 0xbed: 0x0018, 0xbee: 0x0018, 0xbef: 0x0018,
-	0xbf0: 0x0018, 0xbf1: 0x0018, 0xbf2: 0x0018, 0xbf3: 0x0018, 0xbf4: 0x0018, 0xbf5: 0x0018,
-	0xbf6: 0x0018, 0xbf7: 0x0018, 0xbf8: 0x0018, 0xbf9: 0x0018, 0xbfa: 0x0018, 0xbfb: 0x0018,
-	0xbfc: 0x0018, 0xbfd: 0x0018, 0xbfe: 0x0018, 0xbff: 0x0040,
-	// Block 0x30, offset 0xc00
-	0xc00: 0x07ee, 0xc01: 0x080e, 0xc02: 0x1159, 0xc03: 0x082d, 0xc04: 0x0018, 0xc05: 0x084e,
-	0xc06: 0x086e, 0xc07: 0x1011, 0xc08: 0x0018, 0xc09: 0x088d, 0xc0a: 0x0f31, 0xc0b: 0x0249,
-	0xc0c: 0x0249, 0xc0d: 0x0249, 0xc0e: 0x0249, 0xc0f: 0x2009, 0xc10: 0x0f41, 0xc11: 0x0f41,
-	0xc12: 0x0359, 0xc13: 0x0359, 0xc14: 0x0018, 0xc15: 0x0f71, 0xc16: 0x2021, 0xc17: 0x0018,
-	0xc18: 0x0018, 0xc19: 0x0f99, 0xc1a: 0x2039, 0xc1b: 0x0269, 0xc1c: 0x0269, 0xc1d: 0x0269,
-	0xc1e: 0x0018, 0xc1f: 0x0018, 0xc20: 0x2049, 0xc21: 0x08ad, 0xc22: 0x2061, 0xc23: 0x0018,
-	0xc24: 0x13d1, 0xc25: 0x0018, 0xc26: 0x2079, 0xc27: 0x0018, 0xc28: 0x13d1, 0xc29: 0x0018,
-	0xc2a: 0x0f51, 0xc2b: 0x2091, 0xc2c: 0x0ee9, 0xc2d: 0x1159, 0xc2e: 0x0018, 0xc2f: 0x0f09,
-	0xc30: 0x0f09, 0xc31: 0x1199, 0xc32: 0x0040, 0xc33: 0x0f61, 0xc34: 0x00d9, 0xc35: 0x20a9,
-	0xc36: 0x20c1, 0xc37: 0x20d9, 0xc38: 0x20f1, 0xc39: 0x0f41, 0xc3a: 0x0018, 0xc3b: 0x08cd,
-	0xc3c: 0x2109, 0xc3d: 0x10b1, 0xc3e: 0x10b1, 0xc3f: 0x2109,
-	// Block 0x31, offset 0xc40
-	0xc40: 0x08ed, 0xc41: 0x0018, 0xc42: 0x0018, 0xc43: 0x0018, 0xc44: 0x0018, 0xc45: 0x0ef9,
-	0xc46: 0x0ef9, 0xc47: 0x0f09, 0xc48: 0x0f41, 0xc49: 0x0259, 0xc4a: 0x0018, 0xc4b: 0x0018,
-	0xc4c: 0x0018, 0xc4d: 0x0018, 0xc4e: 0x0008, 0xc4f: 0x0018, 0xc50: 0x2121, 0xc51: 0x2151,
-	0xc52: 0x2181, 0xc53: 0x21b9, 0xc54: 0x21e9, 0xc55: 0x2219, 0xc56: 0x2249, 0xc57: 0x2279,
-	0xc58: 0x22a9, 0xc59: 0x22d9, 0xc5a: 0x2309, 0xc5b: 0x2339, 0xc5c: 0x2369, 0xc5d: 0x2399,
-	0xc5e: 0x23c9, 0xc5f: 0x23f9, 0xc60: 0x0f41, 0xc61: 0x2421, 0xc62: 0x0905, 0xc63: 0x2439,
-	0xc64: 0x1089, 0xc65: 0x2451, 0xc66: 0x0925, 0xc67: 0x2469, 0xc68: 0x2491, 0xc69: 0x0369,
-	0xc6a: 0x24a9, 0xc6b: 0x0945, 0xc6c: 0x0359, 0xc6d: 0x1159, 0xc6e: 0x0ef9, 0xc6f: 0x0f61,
-	0xc70: 0x0f41, 0xc71: 0x2421, 0xc72: 0x0965, 0xc73: 0x2439, 0xc74: 0x1089, 0xc75: 0x2451,
-	0xc76: 0x0985, 0xc77: 0x2469, 0xc78: 0x2491, 0xc79: 0x0369, 0xc7a: 0x24a9, 0xc7b: 0x09a5,
-	0xc7c: 0x0359, 0xc7d: 0x1159, 0xc7e: 0x0ef9, 0xc7f: 0x0f61,
-	// Block 0x32, offset 0xc80
-	0xc80: 0x0018, 0xc81: 0x0018, 0xc82: 0x0018, 0xc83: 0x0018, 0xc84: 0x0018, 0xc85: 0x0018,
-	0xc86: 0x0018, 0xc87: 0x0018, 0xc88: 0x0018, 0xc89: 0x0018, 0xc8a: 0x0018, 0xc8b: 0x0040,
-	0xc8c: 0x0040, 0xc8d: 0x0040, 0xc8e: 0x0040, 0xc8f: 0x0040, 0xc90: 0x0040, 0xc91: 0x0040,
-	0xc92: 0x0040, 0xc93: 0x0040, 0xc94: 0x0040, 0xc95: 0x0040, 0xc96: 0x0040, 0xc97: 0x0040,
-	0xc98: 0x0040, 0xc99: 0x0040, 0xc9a: 0x0040, 0xc9b: 0x0040, 0xc9c: 0x0040, 0xc9d: 0x0040,
-	0xc9e: 0x0040, 0xc9f: 0x0040, 0xca0: 0x00c9, 0xca1: 0x0069, 0xca2: 0x0079, 0xca3: 0x1f51,
-	0xca4: 0x1f61, 0xca5: 0x1f71, 0xca6: 0x1f81, 0xca7: 0x1f91, 0xca8: 0x1fa1, 0xca9: 0x2601,
-	0xcaa: 0x2619, 0xcab: 0x2631, 0xcac: 0x2649, 0xcad: 0x2661, 0xcae: 0x2679, 0xcaf: 0x2691,
-	0xcb0: 0x26a9, 0xcb1: 0x26c1, 0xcb2: 0x26d9, 0xcb3: 0x26f1, 0xcb4: 0x0a06, 0xcb5: 0x0a26,
-	0xcb6: 0x0a46, 0xcb7: 0x0a66, 0xcb8: 0x0a86, 0xcb9: 0x0aa6, 0xcba: 0x0ac6, 0xcbb: 0x0ae6,
-	0xcbc: 0x0b06, 0xcbd: 0x270a, 0xcbe: 0x2732, 0xcbf: 0x275a,
-	// Block 0x33, offset 0xcc0
-	0xcc0: 0x2782, 0xcc1: 0x27aa, 0xcc2: 0x27d2, 0xcc3: 0x27fa, 0xcc4: 0x2822, 0xcc5: 0x284a,
-	0xcc6: 0x2872, 0xcc7: 0x289a, 0xcc8: 0x0040, 0xcc9: 0x0040, 0xcca: 0x0040, 0xccb: 0x0040,
-	0xccc: 0x0040, 0xccd: 0x0040, 0xcce: 0x0040, 0xccf: 0x0040, 0xcd0: 0x0040, 0xcd1: 0x0040,
-	0xcd2: 0x0040, 0xcd3: 0x0040, 0xcd4: 0x0040, 0xcd5: 0x0040, 0xcd6: 0x0040, 0xcd7: 0x0040,
-	0xcd8: 0x0040, 0xcd9: 0x0040, 0xcda: 0x0040, 0xcdb: 0x0040, 0xcdc: 0x0b26, 0xcdd: 0x0b46,
-	0xcde: 0x0b66, 0xcdf: 0x0b86, 0xce0: 0x0ba6, 0xce1: 0x0bc6, 0xce2: 0x0be6, 0xce3: 0x0c06,
-	0xce4: 0x0c26, 0xce5: 0x0c46, 0xce6: 0x0c66, 0xce7: 0x0c86, 0xce8: 0x0ca6, 0xce9: 0x0cc6,
-	0xcea: 0x0ce6, 0xceb: 0x0d06, 0xcec: 0x0d26, 0xced: 0x0d46, 0xcee: 0x0d66, 0xcef: 0x0d86,
-	0xcf0: 0x0da6, 0xcf1: 0x0dc6, 0xcf2: 0x0de6, 0xcf3: 0x0e06, 0xcf4: 0x0e26, 0xcf5: 0x0e46,
-	0xcf6: 0x0039, 0xcf7: 0x0ee9, 0xcf8: 0x1159, 0xcf9: 0x0ef9, 0xcfa: 0x0f09, 0xcfb: 0x1199,
-	0xcfc: 0x0f31, 0xcfd: 0x0249, 0xcfe: 0x0f41, 0xcff: 0x0259,
-	// Block 0x34, offset 0xd00
-	0xd00: 0x0f51, 0xd01: 0x0359, 0xd02: 0x0f61, 0xd03: 0x0f71, 0xd04: 0x00d9, 0xd05: 0x0f99,
-	0xd06: 0x2039, 0xd07: 0x0269, 0xd08: 0x01d9, 0xd09: 0x0fa9, 0xd0a: 0x0fb9, 0xd0b: 0x1089,
-	0xd0c: 0x0279, 0xd0d: 0x0369, 0xd0e: 0x0289, 0xd0f: 0x13d1, 0xd10: 0x0039, 0xd11: 0x0ee9,
-	0xd12: 0x1159, 0xd13: 0x0ef9, 0xd14: 0x0f09, 0xd15: 0x1199, 0xd16: 0x0f31, 0xd17: 0x0249,
-	0xd18: 0x0f41, 0xd19: 0x0259, 0xd1a: 0x0f51, 0xd1b: 0x0359, 0xd1c: 0x0f61, 0xd1d: 0x0f71,
-	0xd1e: 0x00d9, 0xd1f: 0x0f99, 0xd20: 0x2039, 0xd21: 0x0269, 0xd22: 0x01d9, 0xd23: 0x0fa9,
-	0xd24: 0x0fb9, 0xd25: 0x1089, 0xd26: 0x0279, 0xd27: 0x0369, 0xd28: 0x0289, 0xd29: 0x13d1,
-	0xd2a: 0x1f41, 0xd2b: 0x0018, 0xd2c: 0x0018, 0xd2d: 0x0018, 0xd2e: 0x0018, 0xd2f: 0x0018,
-	0xd30: 0x0018, 0xd31: 0x0018, 0xd32: 0x0018, 0xd33: 0x0018, 0xd34: 0x0018, 0xd35: 0x0018,
-	0xd36: 0x0018, 0xd37: 0x0018, 0xd38: 0x0018, 0xd39: 0x0018, 0xd3a: 0x0018, 0xd3b: 0x0018,
-	0xd3c: 0x0018, 0xd3d: 0x0018, 0xd3e: 0x0018, 0xd3f: 0x0018,
-	// Block 0x35, offset 0xd40
-	0xd40: 0x0008, 0xd41: 0x0008, 0xd42: 0x0008, 0xd43: 0x0008, 0xd44: 0x0008, 0xd45: 0x0008,
-	0xd46: 0x0008, 0xd47: 0x0008, 0xd48: 0x0008, 0xd49: 0x0008, 0xd4a: 0x0008, 0xd4b: 0x0008,
-	0xd4c: 0x0008, 0xd4d: 0x0008, 0xd4e: 0x0008, 0xd4f: 0x0008, 0xd50: 0x0008, 0xd51: 0x0008,
-	0xd52: 0x0008, 0xd53: 0x0008, 0xd54: 0x0008, 0xd55: 0x0008, 0xd56: 0x0008, 0xd57: 0x0008,
-	0xd58: 0x0008, 0xd59: 0x0008, 0xd5a: 0x0008, 0xd5b: 0x0008, 0xd5c: 0x0008, 0xd5d: 0x0008,
-	0xd5e: 0x0008, 0xd5f: 0x0040, 0xd60: 0xe00d, 0xd61: 0x0008, 0xd62: 0x2971, 0xd63: 0x0ebd,
-	0xd64: 0x2989, 0xd65: 0x0008, 0xd66: 0x0008, 0xd67: 0xe07d, 0xd68: 0x0008, 0xd69: 0xe01d,
-	0xd6a: 0x0008, 0xd6b: 0xe03d, 0xd6c: 0x0008, 0xd6d: 0x0fe1, 0xd6e: 0x1281, 0xd6f: 0x0fc9,
-	0xd70: 0x1141, 0xd71: 0x0008, 0xd72: 0xe00d, 0xd73: 0x0008, 0xd74: 0x0008, 0xd75: 0xe01d,
-	0xd76: 0x0008, 0xd77: 0x0008, 0xd78: 0x0008, 0xd79: 0x0008, 0xd7a: 0x0008, 0xd7b: 0x0008,
-	0xd7c: 0x0259, 0xd7d: 0x1089, 0xd7e: 0x29a1, 0xd7f: 0x29b9,
-	// Block 0x36, offset 0xd80
-	0xd80: 0xe00d, 0xd81: 0x0008, 0xd82: 0xe00d, 0xd83: 0x0008, 0xd84: 0xe00d, 0xd85: 0x0008,
-	0xd86: 0xe00d, 0xd87: 0x0008, 0xd88: 0xe00d, 0xd89: 0x0008, 0xd8a: 0xe00d, 0xd8b: 0x0008,
-	0xd8c: 0xe00d, 0xd8d: 0x0008, 0xd8e: 0xe00d, 0xd8f: 0x0008, 0xd90: 0xe00d, 0xd91: 0x0008,
-	0xd92: 0xe00d, 0xd93: 0x0008, 0xd94: 0xe00d, 0xd95: 0x0008, 0xd96: 0xe00d, 0xd97: 0x0008,
-	0xd98: 0xe00d, 0xd99: 0x0008, 0xd9a: 0xe00d, 0xd9b: 0x0008, 0xd9c: 0xe00d, 0xd9d: 0x0008,
-	0xd9e: 0xe00d, 0xd9f: 0x0008, 0xda0: 0xe00d, 0xda1: 0x0008, 0xda2: 0xe00d, 0xda3: 0x0008,
-	0xda4: 0x0008, 0xda5: 0x0018, 0xda6: 0x0018, 0xda7: 0x0018, 0xda8: 0x0018, 0xda9: 0x0018,
-	0xdaa: 0x0018, 0xdab: 0xe03d, 0xdac: 0x0008, 0xdad: 0xe01d, 0xdae: 0x0008, 0xdaf: 0x1308,
-	0xdb0: 0x1308, 0xdb1: 0x1308, 0xdb2: 0xe00d, 0xdb3: 0x0008, 0xdb4: 0x0040, 0xdb5: 0x0040,
-	0xdb6: 0x0040, 0xdb7: 0x0040, 0xdb8: 0x0040, 0xdb9: 0x0018, 0xdba: 0x0018, 0xdbb: 0x0018,
-	0xdbc: 0x0018, 0xdbd: 0x0018, 0xdbe: 0x0018, 0xdbf: 0x0018,
-	// Block 0x37, offset 0xdc0
-	0xdc0: 0x26fd, 0xdc1: 0x271d, 0xdc2: 0x273d, 0xdc3: 0x275d, 0xdc4: 0x277d, 0xdc5: 0x279d,
-	0xdc6: 0x27bd, 0xdc7: 0x27dd, 0xdc8: 0x27fd, 0xdc9: 0x281d, 0xdca: 0x283d, 0xdcb: 0x285d,
-	0xdcc: 0x287d, 0xdcd: 0x289d, 0xdce: 0x28bd, 0xdcf: 0x28dd, 0xdd0: 0x28fd, 0xdd1: 0x291d,
-	0xdd2: 0x293d, 0xdd3: 0x295d, 0xdd4: 0x297d, 0xdd5: 0x299d, 0xdd6: 0x0040, 0xdd7: 0x0040,
-	0xdd8: 0x0040, 0xdd9: 0x0040, 0xdda: 0x0040, 0xddb: 0x0040, 0xddc: 0x0040, 0xddd: 0x0040,
-	0xdde: 0x0040, 0xddf: 0x0040, 0xde0: 0x0040, 0xde1: 0x0040, 0xde2: 0x0040, 0xde3: 0x0040,
-	0xde4: 0x0040, 0xde5: 0x0040, 0xde6: 0x0040, 0xde7: 0x0040, 0xde8: 0x0040, 0xde9: 0x0040,
-	0xdea: 0x0040, 0xdeb: 0x0040, 0xdec: 0x0040, 0xded: 0x0040, 0xdee: 0x0040, 0xdef: 0x0040,
-	0xdf0: 0x0040, 0xdf1: 0x0040, 0xdf2: 0x0040, 0xdf3: 0x0040, 0xdf4: 0x0040, 0xdf5: 0x0040,
-	0xdf6: 0x0040, 0xdf7: 0x0040, 0xdf8: 0x0040, 0xdf9: 0x0040, 0xdfa: 0x0040, 0xdfb: 0x0040,
-	0xdfc: 0x0040, 0xdfd: 0x0040, 0xdfe: 0x0040, 0xdff: 0x0040,
-	// Block 0x38, offset 0xe00
-	0xe00: 0x000a, 0xe01: 0x0018, 0xe02: 0x29d1, 0xe03: 0x0018, 0xe04: 0x0018, 0xe05: 0x0008,
-	0xe06: 0x0008, 0xe07: 0x0008, 0xe08: 0x0018, 0xe09: 0x0018, 0xe0a: 0x0018, 0xe0b: 0x0018,
-	0xe0c: 0x0018, 0xe0d: 0x0018, 0xe0e: 0x0018, 0xe0f: 0x0018, 0xe10: 0x0018, 0xe11: 0x0018,
-	0xe12: 0x0018, 0xe13: 0x0018, 0xe14: 0x0018, 0xe15: 0x0018, 0xe16: 0x0018, 0xe17: 0x0018,
-	0xe18: 0x0018, 0xe19: 0x0018, 0xe1a: 0x0018, 0xe1b: 0x0018, 0xe1c: 0x0018, 0xe1d: 0x0018,
-	0xe1e: 0x0018, 0xe1f: 0x0018, 0xe20: 0x0018, 0xe21: 0x0018, 0xe22: 0x0018, 0xe23: 0x0018,
-	0xe24: 0x0018, 0xe25: 0x0018, 0xe26: 0x0018, 0xe27: 0x0018, 0xe28: 0x0018, 0xe29: 0x0018,
-	0xe2a: 0x1308, 0xe2b: 0x1308, 0xe2c: 0x1308, 0xe2d: 0x1308, 0xe2e: 0x1018, 0xe2f: 0x1018,
-	0xe30: 0x0018, 0xe31: 0x0018, 0xe32: 0x0018, 0xe33: 0x0018, 0xe34: 0x0018, 0xe35: 0x0018,
-	0xe36: 0xe125, 0xe37: 0x0018, 0xe38: 0x29bd, 0xe39: 0x29dd, 0xe3a: 0x29fd, 0xe3b: 0x0018,
-	0xe3c: 0x0008, 0xe3d: 0x0018, 0xe3e: 0x0018, 0xe3f: 0x0018,
-	// Block 0x39, offset 0xe40
-	0xe40: 0x2b3d, 0xe41: 0x2b5d, 0xe42: 0x2b7d, 0xe43: 0x2b9d, 0xe44: 0x2bbd, 0xe45: 0x2bdd,
-	0xe46: 0x2bdd, 0xe47: 0x2bdd, 0xe48: 0x2bfd, 0xe49: 0x2bfd, 0xe4a: 0x2bfd, 0xe4b: 0x2bfd,
-	0xe4c: 0x2c1d, 0xe4d: 0x2c1d, 0xe4e: 0x2c1d, 0xe4f: 0x2c3d, 0xe50: 0x2c5d, 0xe51: 0x2c5d,
-	0xe52: 0x2a7d, 0xe53: 0x2a7d, 0xe54: 0x2c5d, 0xe55: 0x2c5d, 0xe56: 0x2c7d, 0xe57: 0x2c7d,
-	0xe58: 0x2c5d, 0xe59: 0x2c5d, 0xe5a: 0x2a7d, 0xe5b: 0x2a7d, 0xe5c: 0x2c5d, 0xe5d: 0x2c5d,
-	0xe5e: 0x2c3d, 0xe5f: 0x2c3d, 0xe60: 0x2c9d, 0xe61: 0x2c9d, 0xe62: 0x2cbd, 0xe63: 0x2cbd,
-	0xe64: 0x0040, 0xe65: 0x2cdd, 0xe66: 0x2cfd, 0xe67: 0x2d1d, 0xe68: 0x2d1d, 0xe69: 0x2d3d,
-	0xe6a: 0x2d5d, 0xe6b: 0x2d7d, 0xe6c: 0x2d9d, 0xe6d: 0x2dbd, 0xe6e: 0x2ddd, 0xe6f: 0x2dfd,
-	0xe70: 0x2e1d, 0xe71: 0x2e3d, 0xe72: 0x2e3d, 0xe73: 0x2e5d, 0xe74: 0x2e7d, 0xe75: 0x2e7d,
-	0xe76: 0x2e9d, 0xe77: 0x2ebd, 0xe78: 0x2e5d, 0xe79: 0x2edd, 0xe7a: 0x2efd, 0xe7b: 0x2edd,
-	0xe7c: 0x2e5d, 0xe7d: 0x2f1d, 0xe7e: 0x2f3d, 0xe7f: 0x2f5d,
-	// Block 0x3a, offset 0xe80
-	0xe80: 0x2f7d, 0xe81: 0x2f9d, 0xe82: 0x2cfd, 0xe83: 0x2cdd, 0xe84: 0x2fbd, 0xe85: 0x2fdd,
-	0xe86: 0x2ffd, 0xe87: 0x301d, 0xe88: 0x303d, 0xe89: 0x305d, 0xe8a: 0x307d, 0xe8b: 0x309d,
-	0xe8c: 0x30bd, 0xe8d: 0x30dd, 0xe8e: 0x30fd, 0xe8f: 0x0040, 0xe90: 0x0018, 0xe91: 0x0018,
-	0xe92: 0x311d, 0xe93: 0x313d, 0xe94: 0x315d, 0xe95: 0x317d, 0xe96: 0x319d, 0xe97: 0x31bd,
-	0xe98: 0x31dd, 0xe99: 0x31fd, 0xe9a: 0x321d, 0xe9b: 0x323d, 0xe9c: 0x315d, 0xe9d: 0x325d,
-	0xe9e: 0x327d, 0xe9f: 0x329d, 0xea0: 0x0008, 0xea1: 0x0008, 0xea2: 0x0008, 0xea3: 0x0008,
-	0xea4: 0x0008, 0xea5: 0x0008, 0xea6: 0x0008, 0xea7: 0x0008, 0xea8: 0x0008, 0xea9: 0x0008,
-	0xeaa: 0x0008, 0xeab: 0x0008, 0xeac: 0x0008, 0xead: 0x0008, 0xeae: 0x0008, 0xeaf: 0x0008,
-	0xeb0: 0x0008, 0xeb1: 0x0008, 0xeb2: 0x0008, 0xeb3: 0x0008, 0xeb4: 0x0008, 0xeb5: 0x0008,
-	0xeb6: 0x0008, 0xeb7: 0x0008, 0xeb8: 0x0008, 0xeb9: 0x0008, 0xeba: 0x0008, 0xebb: 0x0040,
-	0xebc: 0x0040, 0xebd: 0x0040, 0xebe: 0x0040, 0xebf: 0x0040,
-	// Block 0x3b, offset 0xec0
-	0xec0: 0x36a2, 0xec1: 0x36d2, 0xec2: 0x3702, 0xec3: 0x3732, 0xec4: 0x32bd, 0xec5: 0x32dd,
-	0xec6: 0x32fd, 0xec7: 0x331d, 0xec8: 0x0018, 0xec9: 0x0018, 0xeca: 0x0018, 0xecb: 0x0018,
-	0xecc: 0x0018, 0xecd: 0x0018, 0xece: 0x0018, 0xecf: 0x0018, 0xed0: 0x333d, 0xed1: 0x3761,
-	0xed2: 0x3779, 0xed3: 0x3791, 0xed4: 0x37a9, 0xed5: 0x37c1, 0xed6: 0x37d9, 0xed7: 0x37f1,
-	0xed8: 0x3809, 0xed9: 0x3821, 0xeda: 0x3839, 0xedb: 0x3851, 0xedc: 0x3869, 0xedd: 0x3881,
-	0xede: 0x3899, 0xedf: 0x38b1, 0xee0: 0x335d, 0xee1: 0x337d, 0xee2: 0x339d, 0xee3: 0x33bd,
-	0xee4: 0x33dd, 0xee5: 0x33dd, 0xee6: 0x33fd, 0xee7: 0x341d, 0xee8: 0x343d, 0xee9: 0x345d,
-	0xeea: 0x347d, 0xeeb: 0x349d, 0xeec: 0x34bd, 0xeed: 0x34dd, 0xeee: 0x34fd, 0xeef: 0x351d,
-	0xef0: 0x353d, 0xef1: 0x355d, 0xef2: 0x357d, 0xef3: 0x359d, 0xef4: 0x35bd, 0xef5: 0x35dd,
-	0xef6: 0x35fd, 0xef7: 0x361d, 0xef8: 0x363d, 0xef9: 0x365d, 0xefa: 0x367d, 0xefb: 0x369d,
-	0xefc: 0x38c9, 0xefd: 0x3901, 0xefe: 0x36bd, 0xeff: 0x0018,
-	// Block 0x3c, offset 0xf00
-	0xf00: 0x36dd, 0xf01: 0x36fd, 0xf02: 0x371d, 0xf03: 0x373d, 0xf04: 0x375d, 0xf05: 0x377d,
-	0xf06: 0x379d, 0xf07: 0x37bd, 0xf08: 0x37dd, 0xf09: 0x37fd, 0xf0a: 0x381d, 0xf0b: 0x383d,
-	0xf0c: 0x385d, 0xf0d: 0x387d, 0xf0e: 0x389d, 0xf0f: 0x38bd, 0xf10: 0x38dd, 0xf11: 0x38fd,
-	0xf12: 0x391d, 0xf13: 0x393d, 0xf14: 0x395d, 0xf15: 0x397d, 0xf16: 0x399d, 0xf17: 0x39bd,
-	0xf18: 0x39dd, 0xf19: 0x39fd, 0xf1a: 0x3a1d, 0xf1b: 0x3a3d, 0xf1c: 0x3a5d, 0xf1d: 0x3a7d,
-	0xf1e: 0x3a9d, 0xf1f: 0x3abd, 0xf20: 0x3add, 0xf21: 0x3afd, 0xf22: 0x3b1d, 0xf23: 0x3b3d,
-	0xf24: 0x3b5d, 0xf25: 0x3b7d, 0xf26: 0x127d, 0xf27: 0x3b9d, 0xf28: 0x3bbd, 0xf29: 0x3bdd,
-	0xf2a: 0x3bfd, 0xf2b: 0x3c1d, 0xf2c: 0x3c3d, 0xf2d: 0x3c5d, 0xf2e: 0x239d, 0xf2f: 0x3c7d,
-	0xf30: 0x3c9d, 0xf31: 0x3939, 0xf32: 0x3951, 0xf33: 0x3969, 0xf34: 0x3981, 0xf35: 0x3999,
-	0xf36: 0x39b1, 0xf37: 0x39c9, 0xf38: 0x39e1, 0xf39: 0x39f9, 0xf3a: 0x3a11, 0xf3b: 0x3a29,
-	0xf3c: 0x3a41, 0xf3d: 0x3a59, 0xf3e: 0x3a71, 0xf3f: 0x3a89,
-	// Block 0x3d, offset 0xf40
-	0xf40: 0x3aa1, 0xf41: 0x3ac9, 0xf42: 0x3af1, 0xf43: 0x3b19, 0xf44: 0x3b41, 0xf45: 0x3b69,
-	0xf46: 0x3b91, 0xf47: 0x3bb9, 0xf48: 0x3be1, 0xf49: 0x3c09, 0xf4a: 0x3c39, 0xf4b: 0x3c69,
-	0xf4c: 0x3c99, 0xf4d: 0x3cbd, 0xf4e: 0x3cb1, 0xf4f: 0x3cdd, 0xf50: 0x3cfd, 0xf51: 0x3d15,
-	0xf52: 0x3d2d, 0xf53: 0x3d45, 0xf54: 0x3d5d, 0xf55: 0x3d5d, 0xf56: 0x3d45, 0xf57: 0x3d75,
-	0xf58: 0x07bd, 0xf59: 0x3d8d, 0xf5a: 0x3da5, 0xf5b: 0x3dbd, 0xf5c: 0x3dd5, 0xf5d: 0x3ded,
-	0xf5e: 0x3e05, 0xf5f: 0x3e1d, 0xf60: 0x3e35, 0xf61: 0x3e4d, 0xf62: 0x3e65, 0xf63: 0x3e7d,
-	0xf64: 0x3e95, 0xf65: 0x3e95, 0xf66: 0x3ead, 0xf67: 0x3ead, 0xf68: 0x3ec5, 0xf69: 0x3ec5,
-	0xf6a: 0x3edd, 0xf6b: 0x3ef5, 0xf6c: 0x3f0d, 0xf6d: 0x3f25, 0xf6e: 0x3f3d, 0xf6f: 0x3f3d,
-	0xf70: 0x3f55, 0xf71: 0x3f55, 0xf72: 0x3f55, 0xf73: 0x3f6d, 0xf74: 0x3f85, 0xf75: 0x3f9d,
-	0xf76: 0x3fb5, 0xf77: 0x3f9d, 0xf78: 0x3fcd, 0xf79: 0x3fe5, 0xf7a: 0x3f6d, 0xf7b: 0x3ffd,
-	0xf7c: 0x4015, 0xf7d: 0x4015, 0xf7e: 0x4015, 0xf7f: 0x0040,
-	// Block 0x3e, offset 0xf80
-	0xf80: 0x3cc9, 0xf81: 0x3d31, 0xf82: 0x3d99, 0xf83: 0x3e01, 0xf84: 0x3e51, 0xf85: 0x3eb9,
-	0xf86: 0x3f09, 0xf87: 0x3f59, 0xf88: 0x3fd9, 0xf89: 0x4041, 0xf8a: 0x4091, 0xf8b: 0x40e1,
-	0xf8c: 0x4131, 0xf8d: 0x4199, 0xf8e: 0x4201, 0xf8f: 0x4251, 0xf90: 0x42a1, 0xf91: 0x42d9,
-	0xf92: 0x4329, 0xf93: 0x4391, 0xf94: 0x43f9, 0xf95: 0x4431, 0xf96: 0x44b1, 0xf97: 0x4549,
-	0xf98: 0x45c9, 0xf99: 0x4619, 0xf9a: 0x4699, 0xf9b: 0x4719, 0xf9c: 0x4781, 0xf9d: 0x47d1,
-	0xf9e: 0x4821, 0xf9f: 0x4871, 0xfa0: 0x48d9, 0xfa1: 0x4959, 0xfa2: 0x49c1, 0xfa3: 0x4a11,
-	0xfa4: 0x4a61, 0xfa5: 0x4ab1, 0xfa6: 0x4ae9, 0xfa7: 0x4b21, 0xfa8: 0x4b59, 0xfa9: 0x4b91,
-	0xfaa: 0x4be1, 0xfab: 0x4c31, 0xfac: 0x4cb1, 0xfad: 0x4d01, 0xfae: 0x4d69, 0xfaf: 0x4de9,
-	0xfb0: 0x4e39, 0xfb1: 0x4e71, 0xfb2: 0x4ea9, 0xfb3: 0x4f29, 0xfb4: 0x4f91, 0xfb5: 0x5011,
-	0xfb6: 0x5061, 0xfb7: 0x50e1, 0xfb8: 0x5119, 0xfb9: 0x5169, 0xfba: 0x51b9, 0xfbb: 0x5209,
-	0xfbc: 0x5259, 0xfbd: 0x52a9, 0xfbe: 0x5311, 0xfbf: 0x5361,
-	// Block 0x3f, offset 0xfc0
-	0xfc0: 0x5399, 0xfc1: 0x53e9, 0xfc2: 0x5439, 0xfc3: 0x5489, 0xfc4: 0x54f1, 0xfc5: 0x5541,
-	0xfc6: 0x5591, 0xfc7: 0x55e1, 0xfc8: 0x5661, 0xfc9: 0x56c9, 0xfca: 0x5701, 0xfcb: 0x5781,
-	0xfcc: 0x57b9, 0xfcd: 0x5821, 0xfce: 0x5889, 0xfcf: 0x58d9, 0xfd0: 0x5929, 0xfd1: 0x5979,
-	0xfd2: 0x59e1, 0xfd3: 0x5a19, 0xfd4: 0x5a69, 0xfd5: 0x5ad1, 0xfd6: 0x5b09, 0xfd7: 0x5b89,
-	0xfd8: 0x5bd9, 0xfd9: 0x5c01, 0xfda: 0x5c29, 0xfdb: 0x5c51, 0xfdc: 0x5c79, 0xfdd: 0x5ca1,
-	0xfde: 0x5cc9, 0xfdf: 0x5cf1, 0xfe0: 0x5d19, 0xfe1: 0x5d41, 0xfe2: 0x5d69, 0xfe3: 0x5d99,
-	0xfe4: 0x5dc9, 0xfe5: 0x5df9, 0xfe6: 0x5e29, 0xfe7: 0x5e59, 0xfe8: 0x5e89, 0xfe9: 0x5eb9,
-	0xfea: 0x5ee9, 0xfeb: 0x5f19, 0xfec: 0x5f49, 0xfed: 0x5f79, 0xfee: 0x5fa9, 0xfef: 0x5fd9,
-	0xff0: 0x6009, 0xff1: 0x402d, 0xff2: 0x6039, 0xff3: 0x6051, 0xff4: 0x404d, 0xff5: 0x6069,
-	0xff6: 0x6081, 0xff7: 0x6099, 0xff8: 0x406d, 0xff9: 0x406d, 0xffa: 0x60b1, 0xffb: 0x60c9,
-	0xffc: 0x6101, 0xffd: 0x6139, 0xffe: 0x6171, 0xfff: 0x61a9,
-	// Block 0x40, offset 0x1000
-	0x1000: 0x6211, 0x1001: 0x6229, 0x1002: 0x408d, 0x1003: 0x6241, 0x1004: 0x6259, 0x1005: 0x6271,
-	0x1006: 0x6289, 0x1007: 0x62a1, 0x1008: 0x40ad, 0x1009: 0x62b9, 0x100a: 0x62e1, 0x100b: 0x62f9,
-	0x100c: 0x40cd, 0x100d: 0x40cd, 0x100e: 0x6311, 0x100f: 0x6329, 0x1010: 0x6341, 0x1011: 0x40ed,
-	0x1012: 0x410d, 0x1013: 0x412d, 0x1014: 0x414d, 0x1015: 0x416d, 0x1016: 0x6359, 0x1017: 0x6371,
-	0x1018: 0x6389, 0x1019: 0x63a1, 0x101a: 0x63b9, 0x101b: 0x418d, 0x101c: 0x63d1, 0x101d: 0x63e9,
-	0x101e: 0x6401, 0x101f: 0x41ad, 0x1020: 0x41cd, 0x1021: 0x6419, 0x1022: 0x41ed, 0x1023: 0x420d,
-	0x1024: 0x422d, 0x1025: 0x6431, 0x1026: 0x424d, 0x1027: 0x6449, 0x1028: 0x6479, 0x1029: 0x6211,
-	0x102a: 0x426d, 0x102b: 0x428d, 0x102c: 0x42ad, 0x102d: 0x42cd, 0x102e: 0x64b1, 0x102f: 0x64f1,
-	0x1030: 0x6539, 0x1031: 0x6551, 0x1032: 0x42ed, 0x1033: 0x6569, 0x1034: 0x6581, 0x1035: 0x6599,
-	0x1036: 0x430d, 0x1037: 0x65b1, 0x1038: 0x65c9, 0x1039: 0x65b1, 0x103a: 0x65e1, 0x103b: 0x65f9,
-	0x103c: 0x432d, 0x103d: 0x6611, 0x103e: 0x6629, 0x103f: 0x6611,
-	// Block 0x41, offset 0x1040
-	0x1040: 0x434d, 0x1041: 0x436d, 0x1042: 0x0040, 0x1043: 0x6641, 0x1044: 0x6659, 0x1045: 0x6671,
-	0x1046: 0x6689, 0x1047: 0x0040, 0x1048: 0x66c1, 0x1049: 0x66d9, 0x104a: 0x66f1, 0x104b: 0x6709,
-	0x104c: 0x6721, 0x104d: 0x6739, 0x104e: 0x6401, 0x104f: 0x6751, 0x1050: 0x6769, 0x1051: 0x6781,
-	0x1052: 0x438d, 0x1053: 0x6799, 0x1054: 0x6289, 0x1055: 0x43ad, 0x1056: 0x43cd, 0x1057: 0x67b1,
-	0x1058: 0x0040, 0x1059: 0x43ed, 0x105a: 0x67c9, 0x105b: 0x67e1, 0x105c: 0x67f9, 0x105d: 0x6811,
-	0x105e: 0x6829, 0x105f: 0x6859, 0x1060: 0x6889, 0x1061: 0x68b1, 0x1062: 0x68d9, 0x1063: 0x6901,
-	0x1064: 0x6929, 0x1065: 0x6951, 0x1066: 0x6979, 0x1067: 0x69a1, 0x1068: 0x69c9, 0x1069: 0x69f1,
-	0x106a: 0x6a21, 0x106b: 0x6a51, 0x106c: 0x6a81, 0x106d: 0x6ab1, 0x106e: 0x6ae1, 0x106f: 0x6b11,
-	0x1070: 0x6b41, 0x1071: 0x6b71, 0x1072: 0x6ba1, 0x1073: 0x6bd1, 0x1074: 0x6c01, 0x1075: 0x6c31,
-	0x1076: 0x6c61, 0x1077: 0x6c91, 0x1078: 0x6cc1, 0x1079: 0x6cf1, 0x107a: 0x6d21, 0x107b: 0x6d51,
-	0x107c: 0x6d81, 0x107d: 0x6db1, 0x107e: 0x6de1, 0x107f: 0x440d,
-	// Block 0x42, offset 0x1080
-	0x1080: 0xe00d, 0x1081: 0x0008, 0x1082: 0xe00d, 0x1083: 0x0008, 0x1084: 0xe00d, 0x1085: 0x0008,
-	0x1086: 0xe00d, 0x1087: 0x0008, 0x1088: 0xe00d, 0x1089: 0x0008, 0x108a: 0xe00d, 0x108b: 0x0008,
-	0x108c: 0xe00d, 0x108d: 0x0008, 0x108e: 0xe00d, 0x108f: 0x0008, 0x1090: 0xe00d, 0x1091: 0x0008,
-	0x1092: 0xe00d, 0x1093: 0x0008, 0x1094: 0xe00d, 0x1095: 0x0008, 0x1096: 0xe00d, 0x1097: 0x0008,
-	0x1098: 0xe00d, 0x1099: 0x0008, 0x109a: 0xe00d, 0x109b: 0x0008, 0x109c: 0xe00d, 0x109d: 0x0008,
-	0x109e: 0xe00d, 0x109f: 0x0008, 0x10a0: 0xe00d, 0x10a1: 0x0008, 0x10a2: 0xe00d, 0x10a3: 0x0008,
-	0x10a4: 0xe00d, 0x10a5: 0x0008, 0x10a6: 0xe00d, 0x10a7: 0x0008, 0x10a8: 0xe00d, 0x10a9: 0x0008,
-	0x10aa: 0xe00d, 0x10ab: 0x0008, 0x10ac: 0xe00d, 0x10ad: 0x0008, 0x10ae: 0x0008, 0x10af: 0x1308,
-	0x10b0: 0x1318, 0x10b1: 0x1318, 0x10b2: 0x1318, 0x10b3: 0x0018, 0x10b4: 0x1308, 0x10b5: 0x1308,
-	0x10b6: 0x1308, 0x10b7: 0x1308, 0x10b8: 0x1308, 0x10b9: 0x1308, 0x10ba: 0x1308, 0x10bb: 0x1308,
-	0x10bc: 0x1308, 0x10bd: 0x1308, 0x10be: 0x0018, 0x10bf: 0x0008,
-	// Block 0x43, offset 0x10c0
-	0x10c0: 0xe00d, 0x10c1: 0x0008, 0x10c2: 0xe00d, 0x10c3: 0x0008, 0x10c4: 0xe00d, 0x10c5: 0x0008,
-	0x10c6: 0xe00d, 0x10c7: 0x0008, 0x10c8: 0xe00d, 0x10c9: 0x0008, 0x10ca: 0xe00d, 0x10cb: 0x0008,
-	0x10cc: 0xe00d, 0x10cd: 0x0008, 0x10ce: 0xe00d, 0x10cf: 0x0008, 0x10d0: 0xe00d, 0x10d1: 0x0008,
-	0x10d2: 0xe00d, 0x10d3: 0x0008, 0x10d4: 0xe00d, 0x10d5: 0x0008, 0x10d6: 0xe00d, 0x10d7: 0x0008,
-	0x10d8: 0xe00d, 0x10d9: 0x0008, 0x10da: 0xe00d, 0x10db: 0x0008, 0x10dc: 0x0ea1, 0x10dd: 0x6e11,
-	0x10de: 0x1308, 0x10df: 0x1308, 0x10e0: 0x0008, 0x10e1: 0x0008, 0x10e2: 0x0008, 0x10e3: 0x0008,
-	0x10e4: 0x0008, 0x10e5: 0x0008, 0x10e6: 0x0008, 0x10e7: 0x0008, 0x10e8: 0x0008, 0x10e9: 0x0008,
-	0x10ea: 0x0008, 0x10eb: 0x0008, 0x10ec: 0x0008, 0x10ed: 0x0008, 0x10ee: 0x0008, 0x10ef: 0x0008,
-	0x10f0: 0x0008, 0x10f1: 0x0008, 0x10f2: 0x0008, 0x10f3: 0x0008, 0x10f4: 0x0008, 0x10f5: 0x0008,
-	0x10f6: 0x0008, 0x10f7: 0x0008, 0x10f8: 0x0008, 0x10f9: 0x0008, 0x10fa: 0x0008, 0x10fb: 0x0008,
-	0x10fc: 0x0008, 0x10fd: 0x0008, 0x10fe: 0x0008, 0x10ff: 0x0008,
-	// Block 0x44, offset 0x1100
-	0x1100: 0x0018, 0x1101: 0x0018, 0x1102: 0x0018, 0x1103: 0x0018, 0x1104: 0x0018, 0x1105: 0x0018,
-	0x1106: 0x0018, 0x1107: 0x0018, 0x1108: 0x0018, 0x1109: 0x0018, 0x110a: 0x0018, 0x110b: 0x0018,
-	0x110c: 0x0018, 0x110d: 0x0018, 0x110e: 0x0018, 0x110f: 0x0018, 0x1110: 0x0018, 0x1111: 0x0018,
-	0x1112: 0x0018, 0x1113: 0x0018, 0x1114: 0x0018, 0x1115: 0x0018, 0x1116: 0x0018, 0x1117: 0x0008,
-	0x1118: 0x0008, 0x1119: 0x0008, 0x111a: 0x0008, 0x111b: 0x0008, 0x111c: 0x0008, 0x111d: 0x0008,
-	0x111e: 0x0008, 0x111f: 0x0008, 0x1120: 0x0018, 0x1121: 0x0018, 0x1122: 0xe00d, 0x1123: 0x0008,
-	0x1124: 0xe00d, 0x1125: 0x0008, 0x1126: 0xe00d, 0x1127: 0x0008, 0x1128: 0xe00d, 0x1129: 0x0008,
-	0x112a: 0xe00d, 0x112b: 0x0008, 0x112c: 0xe00d, 0x112d: 0x0008, 0x112e: 0xe00d, 0x112f: 0x0008,
-	0x1130: 0x0008, 0x1131: 0x0008, 0x1132: 0xe00d, 0x1133: 0x0008, 0x1134: 0xe00d, 0x1135: 0x0008,
-	0x1136: 0xe00d, 0x1137: 0x0008, 0x1138: 0xe00d, 0x1139: 0x0008, 0x113a: 0xe00d, 0x113b: 0x0008,
-	0x113c: 0xe00d, 0x113d: 0x0008, 0x113e: 0xe00d, 0x113f: 0x0008,
-	// Block 0x45, offset 0x1140
-	0x1140: 0xe00d, 0x1141: 0x0008, 0x1142: 0xe00d, 0x1143: 0x0008, 0x1144: 0xe00d, 0x1145: 0x0008,
-	0x1146: 0xe00d, 0x1147: 0x0008, 0x1148: 0xe00d, 0x1149: 0x0008, 0x114a: 0xe00d, 0x114b: 0x0008,
-	0x114c: 0xe00d, 0x114d: 0x0008, 0x114e: 0xe00d, 0x114f: 0x0008, 0x1150: 0xe00d, 0x1151: 0x0008,
-	0x1152: 0xe00d, 0x1153: 0x0008, 0x1154: 0xe00d, 0x1155: 0x0008, 0x1156: 0xe00d, 0x1157: 0x0008,
-	0x1158: 0xe00d, 0x1159: 0x0008, 0x115a: 0xe00d, 0x115b: 0x0008, 0x115c: 0xe00d, 0x115d: 0x0008,
-	0x115e: 0xe00d, 0x115f: 0x0008, 0x1160: 0xe00d, 0x1161: 0x0008, 0x1162: 0xe00d, 0x1163: 0x0008,
-	0x1164: 0xe00d, 0x1165: 0x0008, 0x1166: 0xe00d, 0x1167: 0x0008, 0x1168: 0xe00d, 0x1169: 0x0008,
-	0x116a: 0xe00d, 0x116b: 0x0008, 0x116c: 0xe00d, 0x116d: 0x0008, 0x116e: 0xe00d, 0x116f: 0x0008,
-	0x1170: 0xe0fd, 0x1171: 0x0008, 0x1172: 0x0008, 0x1173: 0x0008, 0x1174: 0x0008, 0x1175: 0x0008,
-	0x1176: 0x0008, 0x1177: 0x0008, 0x1178: 0x0008, 0x1179: 0xe01d, 0x117a: 0x0008, 0x117b: 0xe03d,
-	0x117c: 0x0008, 0x117d: 0x442d, 0x117e: 0xe00d, 0x117f: 0x0008,
-	// Block 0x46, offset 0x1180
-	0x1180: 0xe00d, 0x1181: 0x0008, 0x1182: 0xe00d, 0x1183: 0x0008, 0x1184: 0xe00d, 0x1185: 0x0008,
-	0x1186: 0xe00d, 0x1187: 0x0008, 0x1188: 0x0008, 0x1189: 0x0018, 0x118a: 0x0018, 0x118b: 0xe03d,
-	0x118c: 0x0008, 0x118d: 0x11d9, 0x118e: 0x0008, 0x118f: 0x0008, 0x1190: 0xe00d, 0x1191: 0x0008,
-	0x1192: 0xe00d, 0x1193: 0x0008, 0x1194: 0x0008, 0x1195: 0x0008, 0x1196: 0xe00d, 0x1197: 0x0008,
-	0x1198: 0xe00d, 0x1199: 0x0008, 0x119a: 0xe00d, 0x119b: 0x0008, 0x119c: 0xe00d, 0x119d: 0x0008,
-	0x119e: 0xe00d, 0x119f: 0x0008, 0x11a0: 0xe00d, 0x11a1: 0x0008, 0x11a2: 0xe00d, 0x11a3: 0x0008,
-	0x11a4: 0xe00d, 0x11a5: 0x0008, 0x11a6: 0xe00d, 0x11a7: 0x0008, 0x11a8: 0xe00d, 0x11a9: 0x0008,
-	0x11aa: 0x6e29, 0x11ab: 0x1029, 0x11ac: 0x11c1, 0x11ad: 0x6e41, 0x11ae: 0x1221, 0x11af: 0x0040,
-	0x11b0: 0x6e59, 0x11b1: 0x6e71, 0x11b2: 0x1239, 0x11b3: 0x444d, 0x11b4: 0xe00d, 0x11b5: 0x0008,
-	0x11b6: 0xe00d, 0x11b7: 0x0008, 0x11b8: 0x0040, 0x11b9: 0x0040, 0x11ba: 0x0040, 0x11bb: 0x0040,
-	0x11bc: 0x0040, 0x11bd: 0x0040, 0x11be: 0x0040, 0x11bf: 0x0040,
-	// Block 0x47, offset 0x11c0
-	0x11c0: 0x64d5, 0x11c1: 0x64f5, 0x11c2: 0x6515, 0x11c3: 0x6535, 0x11c4: 0x6555, 0x11c5: 0x6575,
-	0x11c6: 0x6595, 0x11c7: 0x65b5, 0x11c8: 0x65d5, 0x11c9: 0x65f5, 0x11ca: 0x6615, 0x11cb: 0x6635,
-	0x11cc: 0x6655, 0x11cd: 0x6675, 0x11ce: 0x0008, 0x11cf: 0x0008, 0x11d0: 0x6695, 0x11d1: 0x0008,
-	0x11d2: 0x66b5, 0x11d3: 0x0008, 0x11d4: 0x0008, 0x11d5: 0x66d5, 0x11d6: 0x66f5, 0x11d7: 0x6715,
-	0x11d8: 0x6735, 0x11d9: 0x6755, 0x11da: 0x6775, 0x11db: 0x6795, 0x11dc: 0x67b5, 0x11dd: 0x67d5,
-	0x11de: 0x67f5, 0x11df: 0x0008, 0x11e0: 0x6815, 0x11e1: 0x0008, 0x11e2: 0x6835, 0x11e3: 0x0008,
-	0x11e4: 0x0008, 0x11e5: 0x6855, 0x11e6: 0x6875, 0x11e7: 0x0008, 0x11e8: 0x0008, 0x11e9: 0x0008,
-	0x11ea: 0x6895, 0x11eb: 0x68b5, 0x11ec: 0x68d5, 0x11ed: 0x68f5, 0x11ee: 0x6915, 0x11ef: 0x6935,
-	0x11f0: 0x6955, 0x11f1: 0x6975, 0x11f2: 0x6995, 0x11f3: 0x69b5, 0x11f4: 0x69d5, 0x11f5: 0x69f5,
-	0x11f6: 0x6a15, 0x11f7: 0x6a35, 0x11f8: 0x6a55, 0x11f9: 0x6a75, 0x11fa: 0x6a95, 0x11fb: 0x6ab5,
-	0x11fc: 0x6ad5, 0x11fd: 0x6af5, 0x11fe: 0x6b15, 0x11ff: 0x6b35,
-	// Block 0x48, offset 0x1200
-	0x1200: 0x7a95, 0x1201: 0x7ab5, 0x1202: 0x7ad5, 0x1203: 0x7af5, 0x1204: 0x7b15, 0x1205: 0x7b35,
-	0x1206: 0x7b55, 0x1207: 0x7b75, 0x1208: 0x7b95, 0x1209: 0x7bb5, 0x120a: 0x7bd5, 0x120b: 0x7bf5,
-	0x120c: 0x7c15, 0x120d: 0x7c35, 0x120e: 0x7c55, 0x120f: 0x6ec9, 0x1210: 0x6ef1, 0x1211: 0x6f19,
-	0x1212: 0x7c75, 0x1213: 0x7c95, 0x1214: 0x7cb5, 0x1215: 0x6f41, 0x1216: 0x6f69, 0x1217: 0x6f91,
-	0x1218: 0x7cd5, 0x1219: 0x7cf5, 0x121a: 0x0040, 0x121b: 0x0040, 0x121c: 0x0040, 0x121d: 0x0040,
-	0x121e: 0x0040, 0x121f: 0x0040, 0x1220: 0x0040, 0x1221: 0x0040, 0x1222: 0x0040, 0x1223: 0x0040,
-	0x1224: 0x0040, 0x1225: 0x0040, 0x1226: 0x0040, 0x1227: 0x0040, 0x1228: 0x0040, 0x1229: 0x0040,
-	0x122a: 0x0040, 0x122b: 0x0040, 0x122c: 0x0040, 0x122d: 0x0040, 0x122e: 0x0040, 0x122f: 0x0040,
-	0x1230: 0x0040, 0x1231: 0x0040, 0x1232: 0x0040, 0x1233: 0x0040, 0x1234: 0x0040, 0x1235: 0x0040,
-	0x1236: 0x0040, 0x1237: 0x0040, 0x1238: 0x0040, 0x1239: 0x0040, 0x123a: 0x0040, 0x123b: 0x0040,
-	0x123c: 0x0040, 0x123d: 0x0040, 0x123e: 0x0040, 0x123f: 0x0040,
-	// Block 0x49, offset 0x1240
-	0x1240: 0x6fb9, 0x1241: 0x6fd1, 0x1242: 0x6fe9, 0x1243: 0x7d15, 0x1244: 0x7d35, 0x1245: 0x7001,
-	0x1246: 0x7001, 0x1247: 0x0040, 0x1248: 0x0040, 0x1249: 0x0040, 0x124a: 0x0040, 0x124b: 0x0040,
-	0x124c: 0x0040, 0x124d: 0x0040, 0x124e: 0x0040, 0x124f: 0x0040, 0x1250: 0x0040, 0x1251: 0x0040,
-	0x1252: 0x0040, 0x1253: 0x7019, 0x1254: 0x7041, 0x1255: 0x7069, 0x1256: 0x7091, 0x1257: 0x70b9,
-	0x1258: 0x0040, 0x1259: 0x0040, 0x125a: 0x0040, 0x125b: 0x0040, 0x125c: 0x0040, 0x125d: 0x70e1,
-	0x125e: 0x1308, 0x125f: 0x7109, 0x1260: 0x7131, 0x1261: 0x20a9, 0x1262: 0x20f1, 0x1263: 0x7149,
-	0x1264: 0x7161, 0x1265: 0x7179, 0x1266: 0x7191, 0x1267: 0x71a9, 0x1268: 0x71c1, 0x1269: 0x1fb2,
-	0x126a: 0x71d9, 0x126b: 0x7201, 0x126c: 0x7229, 0x126d: 0x7261, 0x126e: 0x7299, 0x126f: 0x72c1,
-	0x1270: 0x72e9, 0x1271: 0x7311, 0x1272: 0x7339, 0x1273: 0x7361, 0x1274: 0x7389, 0x1275: 0x73b1,
-	0x1276: 0x73d9, 0x1277: 0x0040, 0x1278: 0x7401, 0x1279: 0x7429, 0x127a: 0x7451, 0x127b: 0x7479,
-	0x127c: 0x74a1, 0x127d: 0x0040, 0x127e: 0x74c9, 0x127f: 0x0040,
-	// Block 0x4a, offset 0x1280
-	0x1280: 0x74f1, 0x1281: 0x7519, 0x1282: 0x0040, 0x1283: 0x7541, 0x1284: 0x7569, 0x1285: 0x0040,
-	0x1286: 0x7591, 0x1287: 0x75b9, 0x1288: 0x75e1, 0x1289: 0x7609, 0x128a: 0x7631, 0x128b: 0x7659,
-	0x128c: 0x7681, 0x128d: 0x76a9, 0x128e: 0x76d1, 0x128f: 0x76f9, 0x1290: 0x7721, 0x1291: 0x7721,
-	0x1292: 0x7739, 0x1293: 0x7739, 0x1294: 0x7739, 0x1295: 0x7739, 0x1296: 0x7751, 0x1297: 0x7751,
-	0x1298: 0x7751, 0x1299: 0x7751, 0x129a: 0x7769, 0x129b: 0x7769, 0x129c: 0x7769, 0x129d: 0x7769,
-	0x129e: 0x7781, 0x129f: 0x7781, 0x12a0: 0x7781, 0x12a1: 0x7781, 0x12a2: 0x7799, 0x12a3: 0x7799,
-	0x12a4: 0x7799, 0x12a5: 0x7799, 0x12a6: 0x77b1, 0x12a7: 0x77b1, 0x12a8: 0x77b1, 0x12a9: 0x77b1,
-	0x12aa: 0x77c9, 0x12ab: 0x77c9, 0x12ac: 0x77c9, 0x12ad: 0x77c9, 0x12ae: 0x77e1, 0x12af: 0x77e1,
-	0x12b0: 0x77e1, 0x12b1: 0x77e1, 0x12b2: 0x77f9, 0x12b3: 0x77f9, 0x12b4: 0x77f9, 0x12b5: 0x77f9,
-	0x12b6: 0x7811, 0x12b7: 0x7811, 0x12b8: 0x7811, 0x12b9: 0x7811, 0x12ba: 0x7829, 0x12bb: 0x7829,
-	0x12bc: 0x7829, 0x12bd: 0x7829, 0x12be: 0x7841, 0x12bf: 0x7841,
-	// Block 0x4b, offset 0x12c0
-	0x12c0: 0x7841, 0x12c1: 0x7841, 0x12c2: 0x7859, 0x12c3: 0x7859, 0x12c4: 0x7871, 0x12c5: 0x7871,
-	0x12c6: 0x7889, 0x12c7: 0x7889, 0x12c8: 0x78a1, 0x12c9: 0x78a1, 0x12ca: 0x78b9, 0x12cb: 0x78b9,
-	0x12cc: 0x78d1, 0x12cd: 0x78d1, 0x12ce: 0x78e9, 0x12cf: 0x78e9, 0x12d0: 0x78e9, 0x12d1: 0x78e9,
-	0x12d2: 0x7901, 0x12d3: 0x7901, 0x12d4: 0x7901, 0x12d5: 0x7901, 0x12d6: 0x7919, 0x12d7: 0x7919,
-	0x12d8: 0x7919, 0x12d9: 0x7919, 0x12da: 0x7931, 0x12db: 0x7931, 0x12dc: 0x7931, 0x12dd: 0x7931,
-	0x12de: 0x7949, 0x12df: 0x7949, 0x12e0: 0x7961, 0x12e1: 0x7961, 0x12e2: 0x7961, 0x12e3: 0x7961,
-	0x12e4: 0x7979, 0x12e5: 0x7979, 0x12e6: 0x7991, 0x12e7: 0x7991, 0x12e8: 0x7991, 0x12e9: 0x7991,
-	0x12ea: 0x79a9, 0x12eb: 0x79a9, 0x12ec: 0x79a9, 0x12ed: 0x79a9, 0x12ee: 0x79c1, 0x12ef: 0x79c1,
-	0x12f0: 0x79d9, 0x12f1: 0x79d9, 0x12f2: 0x0018, 0x12f3: 0x0018, 0x12f4: 0x0018, 0x12f5: 0x0018,
-	0x12f6: 0x0018, 0x12f7: 0x0018, 0x12f8: 0x0018, 0x12f9: 0x0018, 0x12fa: 0x0018, 0x12fb: 0x0018,
-	0x12fc: 0x0018, 0x12fd: 0x0018, 0x12fe: 0x0018, 0x12ff: 0x0018,
-	// Block 0x4c, offset 0x1300
-	0x1300: 0x0018, 0x1301: 0x0018, 0x1302: 0x0040, 0x1303: 0x0040, 0x1304: 0x0040, 0x1305: 0x0040,
-	0x1306: 0x0040, 0x1307: 0x0040, 0x1308: 0x0040, 0x1309: 0x0040, 0x130a: 0x0040, 0x130b: 0x0040,
-	0x130c: 0x0040, 0x130d: 0x0040, 0x130e: 0x0040, 0x130f: 0x0040, 0x1310: 0x0040, 0x1311: 0x0040,
-	0x1312: 0x0040, 0x1313: 0x79f1, 0x1314: 0x79f1, 0x1315: 0x79f1, 0x1316: 0x79f1, 0x1317: 0x7a09,
-	0x1318: 0x7a09, 0x1319: 0x7a21, 0x131a: 0x7a21, 0x131b: 0x7a39, 0x131c: 0x7a39, 0x131d: 0x0479,
-	0x131e: 0x7a51, 0x131f: 0x7a51, 0x1320: 0x7a69, 0x1321: 0x7a69, 0x1322: 0x7a81, 0x1323: 0x7a81,
-	0x1324: 0x7a99, 0x1325: 0x7a99, 0x1326: 0x7a99, 0x1327: 0x7a99, 0x1328: 0x7ab1, 0x1329: 0x7ab1,
-	0x132a: 0x7ac9, 0x132b: 0x7ac9, 0x132c: 0x7af1, 0x132d: 0x7af1, 0x132e: 0x7b19, 0x132f: 0x7b19,
-	0x1330: 0x7b41, 0x1331: 0x7b41, 0x1332: 0x7b69, 0x1333: 0x7b69, 0x1334: 0x7b91, 0x1335: 0x7b91,
-	0x1336: 0x7bb9, 0x1337: 0x7bb9, 0x1338: 0x7bb9, 0x1339: 0x7be1, 0x133a: 0x7be1, 0x133b: 0x7be1,
-	0x133c: 0x7c09, 0x133d: 0x7c09, 0x133e: 0x7c09, 0x133f: 0x7c09,
-	// Block 0x4d, offset 0x1340
-	0x1340: 0x85f9, 0x1341: 0x8621, 0x1342: 0x8649, 0x1343: 0x8671, 0x1344: 0x8699, 0x1345: 0x86c1,
-	0x1346: 0x86e9, 0x1347: 0x8711, 0x1348: 0x8739, 0x1349: 0x8761, 0x134a: 0x8789, 0x134b: 0x87b1,
-	0x134c: 0x87d9, 0x134d: 0x8801, 0x134e: 0x8829, 0x134f: 0x8851, 0x1350: 0x8879, 0x1351: 0x88a1,
-	0x1352: 0x88c9, 0x1353: 0x88f1, 0x1354: 0x8919, 0x1355: 0x8941, 0x1356: 0x8969, 0x1357: 0x8991,
-	0x1358: 0x89b9, 0x1359: 0x89e1, 0x135a: 0x8a09, 0x135b: 0x8a31, 0x135c: 0x8a59, 0x135d: 0x8a81,
-	0x135e: 0x8aaa, 0x135f: 0x8ada, 0x1360: 0x8b0a, 0x1361: 0x8b3a, 0x1362: 0x8b6a, 0x1363: 0x8b9a,
-	0x1364: 0x8bc9, 0x1365: 0x8bf1, 0x1366: 0x7c71, 0x1367: 0x8c19, 0x1368: 0x7be1, 0x1369: 0x7c99,
-	0x136a: 0x8c41, 0x136b: 0x8c69, 0x136c: 0x7d39, 0x136d: 0x8c91, 0x136e: 0x7d61, 0x136f: 0x7d89,
-	0x1370: 0x8cb9, 0x1371: 0x8ce1, 0x1372: 0x7e29, 0x1373: 0x8d09, 0x1374: 0x7e51, 0x1375: 0x7e79,
-	0x1376: 0x8d31, 0x1377: 0x8d59, 0x1378: 0x7ec9, 0x1379: 0x8d81, 0x137a: 0x7ef1, 0x137b: 0x7f19,
-	0x137c: 0x83a1, 0x137d: 0x83c9, 0x137e: 0x8441, 0x137f: 0x8469,
-	// Block 0x4e, offset 0x1380
-	0x1380: 0x8491, 0x1381: 0x8531, 0x1382: 0x8559, 0x1383: 0x8581, 0x1384: 0x85a9, 0x1385: 0x8649,
-	0x1386: 0x8671, 0x1387: 0x8699, 0x1388: 0x8da9, 0x1389: 0x8739, 0x138a: 0x8dd1, 0x138b: 0x8df9,
-	0x138c: 0x8829, 0x138d: 0x8e21, 0x138e: 0x8851, 0x138f: 0x8879, 0x1390: 0x8a81, 0x1391: 0x8e49,
-	0x1392: 0x8e71, 0x1393: 0x89b9, 0x1394: 0x8e99, 0x1395: 0x89e1, 0x1396: 0x8a09, 0x1397: 0x7c21,
-	0x1398: 0x7c49, 0x1399: 0x8ec1, 0x139a: 0x7c71, 0x139b: 0x8ee9, 0x139c: 0x7cc1, 0x139d: 0x7ce9,
-	0x139e: 0x7d11, 0x139f: 0x7d39, 0x13a0: 0x8f11, 0x13a1: 0x7db1, 0x13a2: 0x7dd9, 0x13a3: 0x7e01,
-	0x13a4: 0x7e29, 0x13a5: 0x8f39, 0x13a6: 0x7ec9, 0x13a7: 0x7f41, 0x13a8: 0x7f69, 0x13a9: 0x7f91,
-	0x13aa: 0x7fb9, 0x13ab: 0x7fe1, 0x13ac: 0x8031, 0x13ad: 0x8059, 0x13ae: 0x8081, 0x13af: 0x80a9,
-	0x13b0: 0x80d1, 0x13b1: 0x80f9, 0x13b2: 0x8f61, 0x13b3: 0x8121, 0x13b4: 0x8149, 0x13b5: 0x8171,
-	0x13b6: 0x8199, 0x13b7: 0x81c1, 0x13b8: 0x81e9, 0x13b9: 0x8239, 0x13ba: 0x8261, 0x13bb: 0x8289,
-	0x13bc: 0x82b1, 0x13bd: 0x82d9, 0x13be: 0x8301, 0x13bf: 0x8329,
-	// Block 0x4f, offset 0x13c0
-	0x13c0: 0x8351, 0x13c1: 0x8379, 0x13c2: 0x83f1, 0x13c3: 0x8419, 0x13c4: 0x84b9, 0x13c5: 0x84e1,
-	0x13c6: 0x8509, 0x13c7: 0x8531, 0x13c8: 0x8559, 0x13c9: 0x85d1, 0x13ca: 0x85f9, 0x13cb: 0x8621,
-	0x13cc: 0x8649, 0x13cd: 0x8f89, 0x13ce: 0x86c1, 0x13cf: 0x86e9, 0x13d0: 0x8711, 0x13d1: 0x8739,
-	0x13d2: 0x87b1, 0x13d3: 0x87d9, 0x13d4: 0x8801, 0x13d5: 0x8829, 0x13d6: 0x8fb1, 0x13d7: 0x88a1,
-	0x13d8: 0x88c9, 0x13d9: 0x8fd9, 0x13da: 0x8941, 0x13db: 0x8969, 0x13dc: 0x8991, 0x13dd: 0x89b9,
-	0x13de: 0x9001, 0x13df: 0x7c71, 0x13e0: 0x8ee9, 0x13e1: 0x7d39, 0x13e2: 0x8f11, 0x13e3: 0x7e29,
-	0x13e4: 0x8f39, 0x13e5: 0x7ec9, 0x13e6: 0x9029, 0x13e7: 0x80d1, 0x13e8: 0x9051, 0x13e9: 0x9079,
-	0x13ea: 0x90a1, 0x13eb: 0x8531, 0x13ec: 0x8559, 0x13ed: 0x8649, 0x13ee: 0x8829, 0x13ef: 0x8fb1,
-	0x13f0: 0x89b9, 0x13f1: 0x9001, 0x13f2: 0x90c9, 0x13f3: 0x9101, 0x13f4: 0x9139, 0x13f5: 0x9171,
-	0x13f6: 0x9199, 0x13f7: 0x91c1, 0x13f8: 0x91e9, 0x13f9: 0x9211, 0x13fa: 0x9239, 0x13fb: 0x9261,
-	0x13fc: 0x9289, 0x13fd: 0x92b1, 0x13fe: 0x92d9, 0x13ff: 0x9301,
-	// Block 0x50, offset 0x1400
-	0x1400: 0x9329, 0x1401: 0x9351, 0x1402: 0x9379, 0x1403: 0x93a1, 0x1404: 0x93c9, 0x1405: 0x93f1,
-	0x1406: 0x9419, 0x1407: 0x9441, 0x1408: 0x9469, 0x1409: 0x9491, 0x140a: 0x94b9, 0x140b: 0x94e1,
-	0x140c: 0x9079, 0x140d: 0x9509, 0x140e: 0x9531, 0x140f: 0x9559, 0x1410: 0x9581, 0x1411: 0x9171,
-	0x1412: 0x9199, 0x1413: 0x91c1, 0x1414: 0x91e9, 0x1415: 0x9211, 0x1416: 0x9239, 0x1417: 0x9261,
-	0x1418: 0x9289, 0x1419: 0x92b1, 0x141a: 0x92d9, 0x141b: 0x9301, 0x141c: 0x9329, 0x141d: 0x9351,
-	0x141e: 0x9379, 0x141f: 0x93a1, 0x1420: 0x93c9, 0x1421: 0x93f1, 0x1422: 0x9419, 0x1423: 0x9441,
-	0x1424: 0x9469, 0x1425: 0x9491, 0x1426: 0x94b9, 0x1427: 0x94e1, 0x1428: 0x9079, 0x1429: 0x9509,
-	0x142a: 0x9531, 0x142b: 0x9559, 0x142c: 0x9581, 0x142d: 0x9491, 0x142e: 0x94b9, 0x142f: 0x94e1,
-	0x1430: 0x9079, 0x1431: 0x9051, 0x1432: 0x90a1, 0x1433: 0x8211, 0x1434: 0x8059, 0x1435: 0x8081,
-	0x1436: 0x80a9, 0x1437: 0x9491, 0x1438: 0x94b9, 0x1439: 0x94e1, 0x143a: 0x8211, 0x143b: 0x8239,
-	0x143c: 0x95a9, 0x143d: 0x95a9, 0x143e: 0x0018, 0x143f: 0x0018,
-	// Block 0x51, offset 0x1440
-	0x1440: 0x0040, 0x1441: 0x0040, 0x1442: 0x0040, 0x1443: 0x0040, 0x1444: 0x0040, 0x1445: 0x0040,
-	0x1446: 0x0040, 0x1447: 0x0040, 0x1448: 0x0040, 0x1449: 0x0040, 0x144a: 0x0040, 0x144b: 0x0040,
-	0x144c: 0x0040, 0x144d: 0x0040, 0x144e: 0x0040, 0x144f: 0x0040, 0x1450: 0x95d1, 0x1451: 0x9609,
-	0x1452: 0x9609, 0x1453: 0x9641, 0x1454: 0x9679, 0x1455: 0x96b1, 0x1456: 0x96e9, 0x1457: 0x9721,
-	0x1458: 0x9759, 0x1459: 0x9759, 0x145a: 0x9791, 0x145b: 0x97c9, 0x145c: 0x9801, 0x145d: 0x9839,
-	0x145e: 0x9871, 0x145f: 0x98a9, 0x1460: 0x98a9, 0x1461: 0x98e1, 0x1462: 0x9919, 0x1463: 0x9919,
-	0x1464: 0x9951, 0x1465: 0x9951, 0x1466: 0x9989, 0x1467: 0x99c1, 0x1468: 0x99c1, 0x1469: 0x99f9,
-	0x146a: 0x9a31, 0x146b: 0x9a31, 0x146c: 0x9a69, 0x146d: 0x9a69, 0x146e: 0x9aa1, 0x146f: 0x9ad9,
-	0x1470: 0x9ad9, 0x1471: 0x9b11, 0x1472: 0x9b11, 0x1473: 0x9b49, 0x1474: 0x9b81, 0x1475: 0x9bb9,
-	0x1476: 0x9bf1, 0x1477: 0x9bf1, 0x1478: 0x9c29, 0x1479: 0x9c61, 0x147a: 0x9c99, 0x147b: 0x9cd1,
-	0x147c: 0x9d09, 0x147d: 0x9d09, 0x147e: 0x9d41, 0x147f: 0x9d79,
-	// Block 0x52, offset 0x1480
-	0x1480: 0xa949, 0x1481: 0xa981, 0x1482: 0xa9b9, 0x1483: 0xa8a1, 0x1484: 0x9bb9, 0x1485: 0x9989,
-	0x1486: 0xa9f1, 0x1487: 0xaa29, 0x1488: 0x0040, 0x1489: 0x0040, 0x148a: 0x0040, 0x148b: 0x0040,
-	0x148c: 0x0040, 0x148d: 0x0040, 0x148e: 0x0040, 0x148f: 0x0040, 0x1490: 0x0040, 0x1491: 0x0040,
-	0x1492: 0x0040, 0x1493: 0x0040, 0x1494: 0x0040, 0x1495: 0x0040, 0x1496: 0x0040, 0x1497: 0x0040,
-	0x1498: 0x0040, 0x1499: 0x0040, 0x149a: 0x0040, 0x149b: 0x0040, 0x149c: 0x0040, 0x149d: 0x0040,
-	0x149e: 0x0040, 0x149f: 0x0040, 0x14a0: 0x0040, 0x14a1: 0x0040, 0x14a2: 0x0040, 0x14a3: 0x0040,
-	0x14a4: 0x0040, 0x14a5: 0x0040, 0x14a6: 0x0040, 0x14a7: 0x0040, 0x14a8: 0x0040, 0x14a9: 0x0040,
-	0x14aa: 0x0040, 0x14ab: 0x0040, 0x14ac: 0x0040, 0x14ad: 0x0040, 0x14ae: 0x0040, 0x14af: 0x0040,
-	0x14b0: 0xaa61, 0x14b1: 0xaa99, 0x14b2: 0xaad1, 0x14b3: 0xab19, 0x14b4: 0xab61, 0x14b5: 0xaba9,
-	0x14b6: 0xabf1, 0x14b7: 0xac39, 0x14b8: 0xac81, 0x14b9: 0xacc9, 0x14ba: 0xad02, 0x14bb: 0xae12,
-	0x14bc: 0xae91, 0x14bd: 0x0018, 0x14be: 0x0040, 0x14bf: 0x0040,
-	// Block 0x53, offset 0x14c0
-	0x14c0: 0x13c0, 0x14c1: 0x13c0, 0x14c2: 0x13c0, 0x14c3: 0x13c0, 0x14c4: 0x13c0, 0x14c5: 0x13c0,
-	0x14c6: 0x13c0, 0x14c7: 0x13c0, 0x14c8: 0x13c0, 0x14c9: 0x13c0, 0x14ca: 0x13c0, 0x14cb: 0x13c0,
-	0x14cc: 0x13c0, 0x14cd: 0x13c0, 0x14ce: 0x13c0, 0x14cf: 0x13c0, 0x14d0: 0xaeda, 0x14d1: 0x7d55,
-	0x14d2: 0x0040, 0x14d3: 0xaeea, 0x14d4: 0x03c2, 0x14d5: 0xaefa, 0x14d6: 0xaf0a, 0x14d7: 0x7d75,
-	0x14d8: 0x7d95, 0x14d9: 0x0040, 0x14da: 0x0040, 0x14db: 0x0040, 0x14dc: 0x0040, 0x14dd: 0x0040,
-	0x14de: 0x0040, 0x14df: 0x0040, 0x14e0: 0x1308, 0x14e1: 0x1308, 0x14e2: 0x1308, 0x14e3: 0x1308,
-	0x14e4: 0x1308, 0x14e5: 0x1308, 0x14e6: 0x1308, 0x14e7: 0x1308, 0x14e8: 0x1308, 0x14e9: 0x1308,
-	0x14ea: 0x1308, 0x14eb: 0x1308, 0x14ec: 0x1308, 0x14ed: 0x1308, 0x14ee: 0x1308, 0x14ef: 0x1308,
-	0x14f0: 0x0040, 0x14f1: 0x7db5, 0x14f2: 0x7dd5, 0x14f3: 0xaf1a, 0x14f4: 0xaf1a, 0x14f5: 0x1fd2,
-	0x14f6: 0x1fe2, 0x14f7: 0xaf2a, 0x14f8: 0xaf3a, 0x14f9: 0x7df5, 0x14fa: 0x7e15, 0x14fb: 0x7e35,
-	0x14fc: 0x7df5, 0x14fd: 0x7e55, 0x14fe: 0x7e75, 0x14ff: 0x7e55,
-	// Block 0x54, offset 0x1500
-	0x1500: 0x7e95, 0x1501: 0x7eb5, 0x1502: 0x7ed5, 0x1503: 0x7eb5, 0x1504: 0x7ef5, 0x1505: 0x0018,
-	0x1506: 0x0018, 0x1507: 0xaf4a, 0x1508: 0xaf5a, 0x1509: 0x7f16, 0x150a: 0x7f36, 0x150b: 0x7f56,
-	0x150c: 0x7f76, 0x150d: 0xaf1a, 0x150e: 0xaf1a, 0x150f: 0xaf1a, 0x1510: 0xaeda, 0x1511: 0x7f95,
-	0x1512: 0x0040, 0x1513: 0x0040, 0x1514: 0x03c2, 0x1515: 0xaeea, 0x1516: 0xaf0a, 0x1517: 0xaefa,
-	0x1518: 0x7fb5, 0x1519: 0x1fd2, 0x151a: 0x1fe2, 0x151b: 0xaf2a, 0x151c: 0xaf3a, 0x151d: 0x7e95,
-	0x151e: 0x7ef5, 0x151f: 0xaf6a, 0x1520: 0xaf7a, 0x1521: 0xaf8a, 0x1522: 0x1fb2, 0x1523: 0xaf99,
-	0x1524: 0xafaa, 0x1525: 0xafba, 0x1526: 0x1fc2, 0x1527: 0x0040, 0x1528: 0xafca, 0x1529: 0xafda,
-	0x152a: 0xafea, 0x152b: 0xaffa, 0x152c: 0x0040, 0x152d: 0x0040, 0x152e: 0x0040, 0x152f: 0x0040,
-	0x1530: 0x7fd6, 0x1531: 0xb009, 0x1532: 0x7ff6, 0x1533: 0x0008, 0x1534: 0x8016, 0x1535: 0x0040,
-	0x1536: 0x8036, 0x1537: 0xb031, 0x1538: 0x8056, 0x1539: 0xb059, 0x153a: 0x8076, 0x153b: 0xb081,
-	0x153c: 0x8096, 0x153d: 0xb0a9, 0x153e: 0x80b6, 0x153f: 0xb0d1,
-	// Block 0x55, offset 0x1540
-	0x1540: 0xb0f9, 0x1541: 0xb111, 0x1542: 0xb111, 0x1543: 0xb129, 0x1544: 0xb129, 0x1545: 0xb141,
-	0x1546: 0xb141, 0x1547: 0xb159, 0x1548: 0xb159, 0x1549: 0xb171, 0x154a: 0xb171, 0x154b: 0xb171,
-	0x154c: 0xb171, 0x154d: 0xb189, 0x154e: 0xb189, 0x154f: 0xb1a1, 0x1550: 0xb1a1, 0x1551: 0xb1a1,
-	0x1552: 0xb1a1, 0x1553: 0xb1b9, 0x1554: 0xb1b9, 0x1555: 0xb1d1, 0x1556: 0xb1d1, 0x1557: 0xb1d1,
-	0x1558: 0xb1d1, 0x1559: 0xb1e9, 0x155a: 0xb1e9, 0x155b: 0xb1e9, 0x155c: 0xb1e9, 0x155d: 0xb201,
-	0x155e: 0xb201, 0x155f: 0xb201, 0x1560: 0xb201, 0x1561: 0xb219, 0x1562: 0xb219, 0x1563: 0xb219,
-	0x1564: 0xb219, 0x1565: 0xb231, 0x1566: 0xb231, 0x1567: 0xb231, 0x1568: 0xb231, 0x1569: 0xb249,
-	0x156a: 0xb249, 0x156b: 0xb261, 0x156c: 0xb261, 0x156d: 0xb279, 0x156e: 0xb279, 0x156f: 0xb291,
-	0x1570: 0xb291, 0x1571: 0xb2a9, 0x1572: 0xb2a9, 0x1573: 0xb2a9, 0x1574: 0xb2a9, 0x1575: 0xb2c1,
-	0x1576: 0xb2c1, 0x1577: 0xb2c1, 0x1578: 0xb2c1, 0x1579: 0xb2d9, 0x157a: 0xb2d9, 0x157b: 0xb2d9,
-	0x157c: 0xb2d9, 0x157d: 0xb2f1, 0x157e: 0xb2f1, 0x157f: 0xb2f1,
-	// Block 0x56, offset 0x1580
-	0x1580: 0xb2f1, 0x1581: 0xb309, 0x1582: 0xb309, 0x1583: 0xb309, 0x1584: 0xb309, 0x1585: 0xb321,
-	0x1586: 0xb321, 0x1587: 0xb321, 0x1588: 0xb321, 0x1589: 0xb339, 0x158a: 0xb339, 0x158b: 0xb339,
-	0x158c: 0xb339, 0x158d: 0xb351, 0x158e: 0xb351, 0x158f: 0xb351, 0x1590: 0xb351, 0x1591: 0xb369,
-	0x1592: 0xb369, 0x1593: 0xb369, 0x1594: 0xb369, 0x1595: 0xb381, 0x1596: 0xb381, 0x1597: 0xb381,
-	0x1598: 0xb381, 0x1599: 0xb399, 0x159a: 0xb399, 0x159b: 0xb399, 0x159c: 0xb399, 0x159d: 0xb3b1,
-	0x159e: 0xb3b1, 0x159f: 0xb3b1, 0x15a0: 0xb3b1, 0x15a1: 0xb3c9, 0x15a2: 0xb3c9, 0x15a3: 0xb3c9,
-	0x15a4: 0xb3c9, 0x15a5: 0xb3e1, 0x15a6: 0xb3e1, 0x15a7: 0xb3e1, 0x15a8: 0xb3e1, 0x15a9: 0xb3f9,
-	0x15aa: 0xb3f9, 0x15ab: 0xb3f9, 0x15ac: 0xb3f9, 0x15ad: 0xb411, 0x15ae: 0xb411, 0x15af: 0x7ab1,
-	0x15b0: 0x7ab1, 0x15b1: 0xb429, 0x15b2: 0xb429, 0x15b3: 0xb429, 0x15b4: 0xb429, 0x15b5: 0xb441,
-	0x15b6: 0xb441, 0x15b7: 0xb469, 0x15b8: 0xb469, 0x15b9: 0xb491, 0x15ba: 0xb491, 0x15bb: 0xb4b9,
-	0x15bc: 0xb4b9, 0x15bd: 0x0040, 0x15be: 0x0040, 0x15bf: 0x03c0,
-	// Block 0x57, offset 0x15c0
-	0x15c0: 0x0040, 0x15c1: 0xaefa, 0x15c2: 0xb4e2, 0x15c3: 0xaf6a, 0x15c4: 0xafda, 0x15c5: 0xafea,
-	0x15c6: 0xaf7a, 0x15c7: 0xb4f2, 0x15c8: 0x1fd2, 0x15c9: 0x1fe2, 0x15ca: 0xaf8a, 0x15cb: 0x1fb2,
-	0x15cc: 0xaeda, 0x15cd: 0xaf99, 0x15ce: 0x29d1, 0x15cf: 0xb502, 0x15d0: 0x1f41, 0x15d1: 0x00c9,
-	0x15d2: 0x0069, 0x15d3: 0x0079, 0x15d4: 0x1f51, 0x15d5: 0x1f61, 0x15d6: 0x1f71, 0x15d7: 0x1f81,
-	0x15d8: 0x1f91, 0x15d9: 0x1fa1, 0x15da: 0xaeea, 0x15db: 0x03c2, 0x15dc: 0xafaa, 0x15dd: 0x1fc2,
-	0x15de: 0xafba, 0x15df: 0xaf0a, 0x15e0: 0xaffa, 0x15e1: 0x0039, 0x15e2: 0x0ee9, 0x15e3: 0x1159,
-	0x15e4: 0x0ef9, 0x15e5: 0x0f09, 0x15e6: 0x1199, 0x15e7: 0x0f31, 0x15e8: 0x0249, 0x15e9: 0x0f41,
-	0x15ea: 0x0259, 0x15eb: 0x0f51, 0x15ec: 0x0359, 0x15ed: 0x0f61, 0x15ee: 0x0f71, 0x15ef: 0x00d9,
-	0x15f0: 0x0f99, 0x15f1: 0x2039, 0x15f2: 0x0269, 0x15f3: 0x01d9, 0x15f4: 0x0fa9, 0x15f5: 0x0fb9,
-	0x15f6: 0x1089, 0x15f7: 0x0279, 0x15f8: 0x0369, 0x15f9: 0x0289, 0x15fa: 0x13d1, 0x15fb: 0xaf4a,
-	0x15fc: 0xafca, 0x15fd: 0xaf5a, 0x15fe: 0xb512, 0x15ff: 0xaf1a,
-	// Block 0x58, offset 0x1600
-	0x1600: 0x1caa, 0x1601: 0x0039, 0x1602: 0x0ee9, 0x1603: 0x1159, 0x1604: 0x0ef9, 0x1605: 0x0f09,
-	0x1606: 0x1199, 0x1607: 0x0f31, 0x1608: 0x0249, 0x1609: 0x0f41, 0x160a: 0x0259, 0x160b: 0x0f51,
-	0x160c: 0x0359, 0x160d: 0x0f61, 0x160e: 0x0f71, 0x160f: 0x00d9, 0x1610: 0x0f99, 0x1611: 0x2039,
-	0x1612: 0x0269, 0x1613: 0x01d9, 0x1614: 0x0fa9, 0x1615: 0x0fb9, 0x1616: 0x1089, 0x1617: 0x0279,
-	0x1618: 0x0369, 0x1619: 0x0289, 0x161a: 0x13d1, 0x161b: 0xaf2a, 0x161c: 0xb522, 0x161d: 0xaf3a,
-	0x161e: 0xb532, 0x161f: 0x80d5, 0x1620: 0x80f5, 0x1621: 0x29d1, 0x1622: 0x8115, 0x1623: 0x8115,
-	0x1624: 0x8135, 0x1625: 0x8155, 0x1626: 0x8175, 0x1627: 0x8195, 0x1628: 0x81b5, 0x1629: 0x81d5,
-	0x162a: 0x81f5, 0x162b: 0x8215, 0x162c: 0x8235, 0x162d: 0x8255, 0x162e: 0x8275, 0x162f: 0x8295,
-	0x1630: 0x82b5, 0x1631: 0x82d5, 0x1632: 0x82f5, 0x1633: 0x8315, 0x1634: 0x8335, 0x1635: 0x8355,
-	0x1636: 0x8375, 0x1637: 0x8395, 0x1638: 0x83b5, 0x1639: 0x83d5, 0x163a: 0x83f5, 0x163b: 0x8415,
-	0x163c: 0x81b5, 0x163d: 0x8435, 0x163e: 0x8455, 0x163f: 0x8215,
-	// Block 0x59, offset 0x1640
-	0x1640: 0x8475, 0x1641: 0x8495, 0x1642: 0x84b5, 0x1643: 0x84d5, 0x1644: 0x84f5, 0x1645: 0x8515,
-	0x1646: 0x8535, 0x1647: 0x8555, 0x1648: 0x84d5, 0x1649: 0x8575, 0x164a: 0x84d5, 0x164b: 0x8595,
-	0x164c: 0x8595, 0x164d: 0x85b5, 0x164e: 0x85b5, 0x164f: 0x85d5, 0x1650: 0x8515, 0x1651: 0x85f5,
-	0x1652: 0x8615, 0x1653: 0x85f5, 0x1654: 0x8635, 0x1655: 0x8615, 0x1656: 0x8655, 0x1657: 0x8655,
-	0x1658: 0x8675, 0x1659: 0x8675, 0x165a: 0x8695, 0x165b: 0x8695, 0x165c: 0x8615, 0x165d: 0x8115,
-	0x165e: 0x86b5, 0x165f: 0x86d5, 0x1660: 0x0040, 0x1661: 0x86f5, 0x1662: 0x8715, 0x1663: 0x8735,
-	0x1664: 0x8755, 0x1665: 0x8735, 0x1666: 0x8775, 0x1667: 0x8795, 0x1668: 0x87b5, 0x1669: 0x87b5,
-	0x166a: 0x87d5, 0x166b: 0x87d5, 0x166c: 0x87f5, 0x166d: 0x87f5, 0x166e: 0x87d5, 0x166f: 0x87d5,
-	0x1670: 0x8815, 0x1671: 0x8835, 0x1672: 0x8855, 0x1673: 0x8875, 0x1674: 0x8895, 0x1675: 0x88b5,
-	0x1676: 0x88b5, 0x1677: 0x88b5, 0x1678: 0x88d5, 0x1679: 0x88d5, 0x167a: 0x88d5, 0x167b: 0x88d5,
-	0x167c: 0x87b5, 0x167d: 0x87b5, 0x167e: 0x87b5, 0x167f: 0x0040,
-	// Block 0x5a, offset 0x1680
-	0x1680: 0x0040, 0x1681: 0x0040, 0x1682: 0x8715, 0x1683: 0x86f5, 0x1684: 0x88f5, 0x1685: 0x86f5,
-	0x1686: 0x8715, 0x1687: 0x86f5, 0x1688: 0x0040, 0x1689: 0x0040, 0x168a: 0x8915, 0x168b: 0x8715,
-	0x168c: 0x8935, 0x168d: 0x88f5, 0x168e: 0x8935, 0x168f: 0x8715, 0x1690: 0x0040, 0x1691: 0x0040,
-	0x1692: 0x8955, 0x1693: 0x8975, 0x1694: 0x8875, 0x1695: 0x8935, 0x1696: 0x88f5, 0x1697: 0x8935,
-	0x1698: 0x0040, 0x1699: 0x0040, 0x169a: 0x8995, 0x169b: 0x89b5, 0x169c: 0x8995, 0x169d: 0x0040,
-	0x169e: 0x0040, 0x169f: 0x0040, 0x16a0: 0xb541, 0x16a1: 0xb559, 0x16a2: 0xb571, 0x16a3: 0x89d6,
-	0x16a4: 0xb589, 0x16a5: 0xb5a1, 0x16a6: 0x89f5, 0x16a7: 0x0040, 0x16a8: 0x8a15, 0x16a9: 0x8a35,
-	0x16aa: 0x8a55, 0x16ab: 0x8a35, 0x16ac: 0x8a75, 0x16ad: 0x8a95, 0x16ae: 0x8ab5, 0x16af: 0x0040,
-	0x16b0: 0x0040, 0x16b1: 0x0040, 0x16b2: 0x0040, 0x16b3: 0x0040, 0x16b4: 0x0040, 0x16b5: 0x0040,
-	0x16b6: 0x0040, 0x16b7: 0x0040, 0x16b8: 0x0040, 0x16b9: 0x0340, 0x16ba: 0x0340, 0x16bb: 0x0340,
-	0x16bc: 0x0040, 0x16bd: 0x0040, 0x16be: 0x0040, 0x16bf: 0x0040,
-	// Block 0x5b, offset 0x16c0
-	0x16c0: 0x0208, 0x16c1: 0x0208, 0x16c2: 0x0208, 0x16c3: 0x0208, 0x16c4: 0x0208, 0x16c5: 0x0408,
-	0x16c6: 0x0008, 0x16c7: 0x0408, 0x16c8: 0x0018, 0x16c9: 0x0408, 0x16ca: 0x0408, 0x16cb: 0x0008,
-	0x16cc: 0x0008, 0x16cd: 0x0108, 0x16ce: 0x0408, 0x16cf: 0x0408, 0x16d0: 0x0408, 0x16d1: 0x0408,
-	0x16d2: 0x0408, 0x16d3: 0x0208, 0x16d4: 0x0208, 0x16d5: 0x0208, 0x16d6: 0x0208, 0x16d7: 0x0108,
-	0x16d8: 0x0208, 0x16d9: 0x0208, 0x16da: 0x0208, 0x16db: 0x0208, 0x16dc: 0x0208, 0x16dd: 0x0408,
-	0x16de: 0x0208, 0x16df: 0x0208, 0x16e0: 0x0208, 0x16e1: 0x0408, 0x16e2: 0x0008, 0x16e3: 0x0008,
-	0x16e4: 0x0408, 0x16e5: 0x1308, 0x16e6: 0x1308, 0x16e7: 0x0040, 0x16e8: 0x0040, 0x16e9: 0x0040,
-	0x16ea: 0x0040, 0x16eb: 0x0218, 0x16ec: 0x0218, 0x16ed: 0x0218, 0x16ee: 0x0218, 0x16ef: 0x0418,
-	0x16f0: 0x0018, 0x16f1: 0x0018, 0x16f2: 0x0018, 0x16f3: 0x0018, 0x16f4: 0x0018, 0x16f5: 0x0018,
-	0x16f6: 0x0018, 0x16f7: 0x0040, 0x16f8: 0x0040, 0x16f9: 0x0040, 0x16fa: 0x0040, 0x16fb: 0x0040,
-	0x16fc: 0x0040, 0x16fd: 0x0040, 0x16fe: 0x0040, 0x16ff: 0x0040,
-	// Block 0x5c, offset 0x1700
-	0x1700: 0x0208, 0x1701: 0x0408, 0x1702: 0x0208, 0x1703: 0x0408, 0x1704: 0x0408, 0x1705: 0x0408,
-	0x1706: 0x0208, 0x1707: 0x0208, 0x1708: 0x0208, 0x1709: 0x0408, 0x170a: 0x0208, 0x170b: 0x0208,
-	0x170c: 0x0408, 0x170d: 0x0208, 0x170e: 0x0408, 0x170f: 0x0408, 0x1710: 0x0208, 0x1711: 0x0408,
-	0x1712: 0x0040, 0x1713: 0x0040, 0x1714: 0x0040, 0x1715: 0x0040, 0x1716: 0x0040, 0x1717: 0x0040,
-	0x1718: 0x0040, 0x1719: 0x0018, 0x171a: 0x0018, 0x171b: 0x0018, 0x171c: 0x0018, 0x171d: 0x0040,
-	0x171e: 0x0040, 0x171f: 0x0040, 0x1720: 0x0040, 0x1721: 0x0040, 0x1722: 0x0040, 0x1723: 0x0040,
-	0x1724: 0x0040, 0x1725: 0x0040, 0x1726: 0x0040, 0x1727: 0x0040, 0x1728: 0x0040, 0x1729: 0x0418,
-	0x172a: 0x0418, 0x172b: 0x0418, 0x172c: 0x0418, 0x172d: 0x0218, 0x172e: 0x0218, 0x172f: 0x0018,
-	0x1730: 0x0040, 0x1731: 0x0040, 0x1732: 0x0040, 0x1733: 0x0040, 0x1734: 0x0040, 0x1735: 0x0040,
-	0x1736: 0x0040, 0x1737: 0x0040, 0x1738: 0x0040, 0x1739: 0x0040, 0x173a: 0x0040, 0x173b: 0x0040,
-	0x173c: 0x0040, 0x173d: 0x0040, 0x173e: 0x0040, 0x173f: 0x0040,
-	// Block 0x5d, offset 0x1740
-	0x1740: 0x1308, 0x1741: 0x1308, 0x1742: 0x1008, 0x1743: 0x1008, 0x1744: 0x0040, 0x1745: 0x0008,
-	0x1746: 0x0008, 0x1747: 0x0008, 0x1748: 0x0008, 0x1749: 0x0008, 0x174a: 0x0008, 0x174b: 0x0008,
-	0x174c: 0x0008, 0x174d: 0x0040, 0x174e: 0x0040, 0x174f: 0x0008, 0x1750: 0x0008, 0x1751: 0x0040,
-	0x1752: 0x0040, 0x1753: 0x0008, 0x1754: 0x0008, 0x1755: 0x0008, 0x1756: 0x0008, 0x1757: 0x0008,
-	0x1758: 0x0008, 0x1759: 0x0008, 0x175a: 0x0008, 0x175b: 0x0008, 0x175c: 0x0008, 0x175d: 0x0008,
-	0x175e: 0x0008, 0x175f: 0x0008, 0x1760: 0x0008, 0x1761: 0x0008, 0x1762: 0x0008, 0x1763: 0x0008,
-	0x1764: 0x0008, 0x1765: 0x0008, 0x1766: 0x0008, 0x1767: 0x0008, 0x1768: 0x0008, 0x1769: 0x0040,
-	0x176a: 0x0008, 0x176b: 0x0008, 0x176c: 0x0008, 0x176d: 0x0008, 0x176e: 0x0008, 0x176f: 0x0008,
-	0x1770: 0x0008, 0x1771: 0x0040, 0x1772: 0x0008, 0x1773: 0x0008, 0x1774: 0x0040, 0x1775: 0x0008,
-	0x1776: 0x0008, 0x1777: 0x0008, 0x1778: 0x0008, 0x1779: 0x0008, 0x177a: 0x0040, 0x177b: 0x0040,
-	0x177c: 0x1308, 0x177d: 0x0008, 0x177e: 0x1008, 0x177f: 0x1008,
-	// Block 0x5e, offset 0x1780
-	0x1780: 0x1308, 0x1781: 0x1008, 0x1782: 0x1008, 0x1783: 0x1008, 0x1784: 0x1008, 0x1785: 0x0040,
-	0x1786: 0x0040, 0x1787: 0x1008, 0x1788: 0x1008, 0x1789: 0x0040, 0x178a: 0x0040, 0x178b: 0x1008,
-	0x178c: 0x1008, 0x178d: 0x1808, 0x178e: 0x0040, 0x178f: 0x0040, 0x1790: 0x0008, 0x1791: 0x0040,
-	0x1792: 0x0040, 0x1793: 0x0040, 0x1794: 0x0040, 0x1795: 0x0040, 0x1796: 0x0040, 0x1797: 0x1008,
-	0x1798: 0x0040, 0x1799: 0x0040, 0x179a: 0x0040, 0x179b: 0x0040, 0x179c: 0x0040, 0x179d: 0x0008,
-	0x179e: 0x0008, 0x179f: 0x0008, 0x17a0: 0x0008, 0x17a1: 0x0008, 0x17a2: 0x1008, 0x17a3: 0x1008,
-	0x17a4: 0x0040, 0x17a5: 0x0040, 0x17a6: 0x1308, 0x17a7: 0x1308, 0x17a8: 0x1308, 0x17a9: 0x1308,
-	0x17aa: 0x1308, 0x17ab: 0x1308, 0x17ac: 0x1308, 0x17ad: 0x0040, 0x17ae: 0x0040, 0x17af: 0x0040,
-	0x17b0: 0x1308, 0x17b1: 0x1308, 0x17b2: 0x1308, 0x17b3: 0x1308, 0x17b4: 0x1308, 0x17b5: 0x0040,
-	0x17b6: 0x0040, 0x17b7: 0x0040, 0x17b8: 0x0040, 0x17b9: 0x0040, 0x17ba: 0x0040, 0x17bb: 0x0040,
-	0x17bc: 0x0040, 0x17bd: 0x0040, 0x17be: 0x0040, 0x17bf: 0x0040,
-	// Block 0x5f, offset 0x17c0
-	0x17c0: 0x0039, 0x17c1: 0x0ee9, 0x17c2: 0x1159, 0x17c3: 0x0ef9, 0x17c4: 0x0f09, 0x17c5: 0x1199,
-	0x17c6: 0x0f31, 0x17c7: 0x0249, 0x17c8: 0x0f41, 0x17c9: 0x0259, 0x17ca: 0x0f51, 0x17cb: 0x0359,
-	0x17cc: 0x0f61, 0x17cd: 0x0f71, 0x17ce: 0x00d9, 0x17cf: 0x0f99, 0x17d0: 0x2039, 0x17d1: 0x0269,
-	0x17d2: 0x01d9, 0x17d3: 0x0fa9, 0x17d4: 0x0fb9, 0x17d5: 0x1089, 0x17d6: 0x0279, 0x17d7: 0x0369,
-	0x17d8: 0x0289, 0x17d9: 0x13d1, 0x17da: 0x0039, 0x17db: 0x0ee9, 0x17dc: 0x1159, 0x17dd: 0x0ef9,
-	0x17de: 0x0f09, 0x17df: 0x1199, 0x17e0: 0x0f31, 0x17e1: 0x0249, 0x17e2: 0x0f41, 0x17e3: 0x0259,
-	0x17e4: 0x0f51, 0x17e5: 0x0359, 0x17e6: 0x0f61, 0x17e7: 0x0f71, 0x17e8: 0x00d9, 0x17e9: 0x0f99,
-	0x17ea: 0x2039, 0x17eb: 0x0269, 0x17ec: 0x01d9, 0x17ed: 0x0fa9, 0x17ee: 0x0fb9, 0x17ef: 0x1089,
-	0x17f0: 0x0279, 0x17f1: 0x0369, 0x17f2: 0x0289, 0x17f3: 0x13d1, 0x17f4: 0x0039, 0x17f5: 0x0ee9,
-	0x17f6: 0x1159, 0x17f7: 0x0ef9, 0x17f8: 0x0f09, 0x17f9: 0x1199, 0x17fa: 0x0f31, 0x17fb: 0x0249,
-	0x17fc: 0x0f41, 0x17fd: 0x0259, 0x17fe: 0x0f51, 0x17ff: 0x0359,
-	// Block 0x60, offset 0x1800
-	0x1800: 0x0f61, 0x1801: 0x0f71, 0x1802: 0x00d9, 0x1803: 0x0f99, 0x1804: 0x2039, 0x1805: 0x0269,
-	0x1806: 0x01d9, 0x1807: 0x0fa9, 0x1808: 0x0fb9, 0x1809: 0x1089, 0x180a: 0x0279, 0x180b: 0x0369,
-	0x180c: 0x0289, 0x180d: 0x13d1, 0x180e: 0x0039, 0x180f: 0x0ee9, 0x1810: 0x1159, 0x1811: 0x0ef9,
-	0x1812: 0x0f09, 0x1813: 0x1199, 0x1814: 0x0f31, 0x1815: 0x0040, 0x1816: 0x0f41, 0x1817: 0x0259,
-	0x1818: 0x0f51, 0x1819: 0x0359, 0x181a: 0x0f61, 0x181b: 0x0f71, 0x181c: 0x00d9, 0x181d: 0x0f99,
-	0x181e: 0x2039, 0x181f: 0x0269, 0x1820: 0x01d9, 0x1821: 0x0fa9, 0x1822: 0x0fb9, 0x1823: 0x1089,
-	0x1824: 0x0279, 0x1825: 0x0369, 0x1826: 0x0289, 0x1827: 0x13d1, 0x1828: 0x0039, 0x1829: 0x0ee9,
-	0x182a: 0x1159, 0x182b: 0x0ef9, 0x182c: 0x0f09, 0x182d: 0x1199, 0x182e: 0x0f31, 0x182f: 0x0249,
-	0x1830: 0x0f41, 0x1831: 0x0259, 0x1832: 0x0f51, 0x1833: 0x0359, 0x1834: 0x0f61, 0x1835: 0x0f71,
-	0x1836: 0x00d9, 0x1837: 0x0f99, 0x1838: 0x2039, 0x1839: 0x0269, 0x183a: 0x01d9, 0x183b: 0x0fa9,
-	0x183c: 0x0fb9, 0x183d: 0x1089, 0x183e: 0x0279, 0x183f: 0x0369,
-	// Block 0x61, offset 0x1840
-	0x1840: 0x0289, 0x1841: 0x13d1, 0x1842: 0x0039, 0x1843: 0x0ee9, 0x1844: 0x1159, 0x1845: 0x0ef9,
-	0x1846: 0x0f09, 0x1847: 0x1199, 0x1848: 0x0f31, 0x1849: 0x0249, 0x184a: 0x0f41, 0x184b: 0x0259,
-	0x184c: 0x0f51, 0x184d: 0x0359, 0x184e: 0x0f61, 0x184f: 0x0f71, 0x1850: 0x00d9, 0x1851: 0x0f99,
-	0x1852: 0x2039, 0x1853: 0x0269, 0x1854: 0x01d9, 0x1855: 0x0fa9, 0x1856: 0x0fb9, 0x1857: 0x1089,
-	0x1858: 0x0279, 0x1859: 0x0369, 0x185a: 0x0289, 0x185b: 0x13d1, 0x185c: 0x0039, 0x185d: 0x0040,
-	0x185e: 0x1159, 0x185f: 0x0ef9, 0x1860: 0x0040, 0x1861: 0x0040, 0x1862: 0x0f31, 0x1863: 0x0040,
-	0x1864: 0x0040, 0x1865: 0x0259, 0x1866: 0x0f51, 0x1867: 0x0040, 0x1868: 0x0040, 0x1869: 0x0f71,
-	0x186a: 0x00d9, 0x186b: 0x0f99, 0x186c: 0x2039, 0x186d: 0x0040, 0x186e: 0x01d9, 0x186f: 0x0fa9,
-	0x1870: 0x0fb9, 0x1871: 0x1089, 0x1872: 0x0279, 0x1873: 0x0369, 0x1874: 0x0289, 0x1875: 0x13d1,
-	0x1876: 0x0039, 0x1877: 0x0ee9, 0x1878: 0x1159, 0x1879: 0x0ef9, 0x187a: 0x0040, 0x187b: 0x1199,
-	0x187c: 0x0040, 0x187d: 0x0249, 0x187e: 0x0f41, 0x187f: 0x0259,
-	// Block 0x62, offset 0x1880
-	0x1880: 0x0f51, 0x1881: 0x0359, 0x1882: 0x0f61, 0x1883: 0x0f71, 0x1884: 0x0040, 0x1885: 0x0f99,
-	0x1886: 0x2039, 0x1887: 0x0269, 0x1888: 0x01d9, 0x1889: 0x0fa9, 0x188a: 0x0fb9, 0x188b: 0x1089,
-	0x188c: 0x0279, 0x188d: 0x0369, 0x188e: 0x0289, 0x188f: 0x13d1, 0x1890: 0x0039, 0x1891: 0x0ee9,
-	0x1892: 0x1159, 0x1893: 0x0ef9, 0x1894: 0x0f09, 0x1895: 0x1199, 0x1896: 0x0f31, 0x1897: 0x0249,
-	0x1898: 0x0f41, 0x1899: 0x0259, 0x189a: 0x0f51, 0x189b: 0x0359, 0x189c: 0x0f61, 0x189d: 0x0f71,
-	0x189e: 0x00d9, 0x189f: 0x0f99, 0x18a0: 0x2039, 0x18a1: 0x0269, 0x18a2: 0x01d9, 0x18a3: 0x0fa9,
-	0x18a4: 0x0fb9, 0x18a5: 0x1089, 0x18a6: 0x0279, 0x18a7: 0x0369, 0x18a8: 0x0289, 0x18a9: 0x13d1,
-	0x18aa: 0x0039, 0x18ab: 0x0ee9, 0x18ac: 0x1159, 0x18ad: 0x0ef9, 0x18ae: 0x0f09, 0x18af: 0x1199,
-	0x18b0: 0x0f31, 0x18b1: 0x0249, 0x18b2: 0x0f41, 0x18b3: 0x0259, 0x18b4: 0x0f51, 0x18b5: 0x0359,
-	0x18b6: 0x0f61, 0x18b7: 0x0f71, 0x18b8: 0x00d9, 0x18b9: 0x0f99, 0x18ba: 0x2039, 0x18bb: 0x0269,
-	0x18bc: 0x01d9, 0x18bd: 0x0fa9, 0x18be: 0x0fb9, 0x18bf: 0x1089,
-	// Block 0x63, offset 0x18c0
-	0x18c0: 0x0279, 0x18c1: 0x0369, 0x18c2: 0x0289, 0x18c3: 0x13d1, 0x18c4: 0x0039, 0x18c5: 0x0ee9,
-	0x18c6: 0x0040, 0x18c7: 0x0ef9, 0x18c8: 0x0f09, 0x18c9: 0x1199, 0x18ca: 0x0f31, 0x18cb: 0x0040,
-	0x18cc: 0x0040, 0x18cd: 0x0259, 0x18ce: 0x0f51, 0x18cf: 0x0359, 0x18d0: 0x0f61, 0x18d1: 0x0f71,
-	0x18d2: 0x00d9, 0x18d3: 0x0f99, 0x18d4: 0x2039, 0x18d5: 0x0040, 0x18d6: 0x01d9, 0x18d7: 0x0fa9,
-	0x18d8: 0x0fb9, 0x18d9: 0x1089, 0x18da: 0x0279, 0x18db: 0x0369, 0x18dc: 0x0289, 0x18dd: 0x0040,
-	0x18de: 0x0039, 0x18df: 0x0ee9, 0x18e0: 0x1159, 0x18e1: 0x0ef9, 0x18e2: 0x0f09, 0x18e3: 0x1199,
-	0x18e4: 0x0f31, 0x18e5: 0x0249, 0x18e6: 0x0f41, 0x18e7: 0x0259, 0x18e8: 0x0f51, 0x18e9: 0x0359,
-	0x18ea: 0x0f61, 0x18eb: 0x0f71, 0x18ec: 0x00d9, 0x18ed: 0x0f99, 0x18ee: 0x2039, 0x18ef: 0x0269,
-	0x18f0: 0x01d9, 0x18f1: 0x0fa9, 0x18f2: 0x0fb9, 0x18f3: 0x1089, 0x18f4: 0x0279, 0x18f5: 0x0369,
-	0x18f6: 0x0289, 0x18f7: 0x13d1, 0x18f8: 0x0039, 0x18f9: 0x0ee9, 0x18fa: 0x0040, 0x18fb: 0x0ef9,
-	0x18fc: 0x0f09, 0x18fd: 0x1199, 0x18fe: 0x0f31, 0x18ff: 0x0040,
-	// Block 0x64, offset 0x1900
-	0x1900: 0x0f41, 0x1901: 0x0259, 0x1902: 0x0f51, 0x1903: 0x0359, 0x1904: 0x0f61, 0x1905: 0x0040,
-	0x1906: 0x00d9, 0x1907: 0x0040, 0x1908: 0x0040, 0x1909: 0x0040, 0x190a: 0x01d9, 0x190b: 0x0fa9,
-	0x190c: 0x0fb9, 0x190d: 0x1089, 0x190e: 0x0279, 0x190f: 0x0369, 0x1910: 0x0289, 0x1911: 0x0040,
-	0x1912: 0x0039, 0x1913: 0x0ee9, 0x1914: 0x1159, 0x1915: 0x0ef9, 0x1916: 0x0f09, 0x1917: 0x1199,
-	0x1918: 0x0f31, 0x1919: 0x0249, 0x191a: 0x0f41, 0x191b: 0x0259, 0x191c: 0x0f51, 0x191d: 0x0359,
-	0x191e: 0x0f61, 0x191f: 0x0f71, 0x1920: 0x00d9, 0x1921: 0x0f99, 0x1922: 0x2039, 0x1923: 0x0269,
-	0x1924: 0x01d9, 0x1925: 0x0fa9, 0x1926: 0x0fb9, 0x1927: 0x1089, 0x1928: 0x0279, 0x1929: 0x0369,
-	0x192a: 0x0289, 0x192b: 0x13d1, 0x192c: 0x0039, 0x192d: 0x0ee9, 0x192e: 0x1159, 0x192f: 0x0ef9,
-	0x1930: 0x0f09, 0x1931: 0x1199, 0x1932: 0x0f31, 0x1933: 0x0249, 0x1934: 0x0f41, 0x1935: 0x0259,
-	0x1936: 0x0f51, 0x1937: 0x0359, 0x1938: 0x0f61, 0x1939: 0x0f71, 0x193a: 0x00d9, 0x193b: 0x0f99,
-	0x193c: 0x2039, 0x193d: 0x0269, 0x193e: 0x01d9, 0x193f: 0x0fa9,
-	// Block 0x65, offset 0x1940
-	0x1940: 0x0fb9, 0x1941: 0x1089, 0x1942: 0x0279, 0x1943: 0x0369, 0x1944: 0x0289, 0x1945: 0x13d1,
-	0x1946: 0x0039, 0x1947: 0x0ee9, 0x1948: 0x1159, 0x1949: 0x0ef9, 0x194a: 0x0f09, 0x194b: 0x1199,
-	0x194c: 0x0f31, 0x194d: 0x0249, 0x194e: 0x0f41, 0x194f: 0x0259, 0x1950: 0x0f51, 0x1951: 0x0359,
-	0x1952: 0x0f61, 0x1953: 0x0f71, 0x1954: 0x00d9, 0x1955: 0x0f99, 0x1956: 0x2039, 0x1957: 0x0269,
-	0x1958: 0x01d9, 0x1959: 0x0fa9, 0x195a: 0x0fb9, 0x195b: 0x1089, 0x195c: 0x0279, 0x195d: 0x0369,
-	0x195e: 0x0289, 0x195f: 0x13d1, 0x1960: 0x0039, 0x1961: 0x0ee9, 0x1962: 0x1159, 0x1963: 0x0ef9,
-	0x1964: 0x0f09, 0x1965: 0x1199, 0x1966: 0x0f31, 0x1967: 0x0249, 0x1968: 0x0f41, 0x1969: 0x0259,
-	0x196a: 0x0f51, 0x196b: 0x0359, 0x196c: 0x0f61, 0x196d: 0x0f71, 0x196e: 0x00d9, 0x196f: 0x0f99,
-	0x1970: 0x2039, 0x1971: 0x0269, 0x1972: 0x01d9, 0x1973: 0x0fa9, 0x1974: 0x0fb9, 0x1975: 0x1089,
-	0x1976: 0x0279, 0x1977: 0x0369, 0x1978: 0x0289, 0x1979: 0x13d1, 0x197a: 0x0039, 0x197b: 0x0ee9,
-	0x197c: 0x1159, 0x197d: 0x0ef9, 0x197e: 0x0f09, 0x197f: 0x1199,
-	// Block 0x66, offset 0x1980
-	0x1980: 0x0f31, 0x1981: 0x0249, 0x1982: 0x0f41, 0x1983: 0x0259, 0x1984: 0x0f51, 0x1985: 0x0359,
-	0x1986: 0x0f61, 0x1987: 0x0f71, 0x1988: 0x00d9, 0x1989: 0x0f99, 0x198a: 0x2039, 0x198b: 0x0269,
-	0x198c: 0x01d9, 0x198d: 0x0fa9, 0x198e: 0x0fb9, 0x198f: 0x1089, 0x1990: 0x0279, 0x1991: 0x0369,
-	0x1992: 0x0289, 0x1993: 0x13d1, 0x1994: 0x0039, 0x1995: 0x0ee9, 0x1996: 0x1159, 0x1997: 0x0ef9,
-	0x1998: 0x0f09, 0x1999: 0x1199, 0x199a: 0x0f31, 0x199b: 0x0249, 0x199c: 0x0f41, 0x199d: 0x0259,
-	0x199e: 0x0f51, 0x199f: 0x0359, 0x19a0: 0x0f61, 0x19a1: 0x0f71, 0x19a2: 0x00d9, 0x19a3: 0x0f99,
-	0x19a4: 0x2039, 0x19a5: 0x0269, 0x19a6: 0x01d9, 0x19a7: 0x0fa9, 0x19a8: 0x0fb9, 0x19a9: 0x1089,
-	0x19aa: 0x0279, 0x19ab: 0x0369, 0x19ac: 0x0289, 0x19ad: 0x13d1, 0x19ae: 0x0039, 0x19af: 0x0ee9,
-	0x19b0: 0x1159, 0x19b1: 0x0ef9, 0x19b2: 0x0f09, 0x19b3: 0x1199, 0x19b4: 0x0f31, 0x19b5: 0x0249,
-	0x19b6: 0x0f41, 0x19b7: 0x0259, 0x19b8: 0x0f51, 0x19b9: 0x0359, 0x19ba: 0x0f61, 0x19bb: 0x0f71,
-	0x19bc: 0x00d9, 0x19bd: 0x0f99, 0x19be: 0x2039, 0x19bf: 0x0269,
-	// Block 0x67, offset 0x19c0
-	0x19c0: 0x01d9, 0x19c1: 0x0fa9, 0x19c2: 0x0fb9, 0x19c3: 0x1089, 0x19c4: 0x0279, 0x19c5: 0x0369,
-	0x19c6: 0x0289, 0x19c7: 0x13d1, 0x19c8: 0x0039, 0x19c9: 0x0ee9, 0x19ca: 0x1159, 0x19cb: 0x0ef9,
-	0x19cc: 0x0f09, 0x19cd: 0x1199, 0x19ce: 0x0f31, 0x19cf: 0x0249, 0x19d0: 0x0f41, 0x19d1: 0x0259,
-	0x19d2: 0x0f51, 0x19d3: 0x0359, 0x19d4: 0x0f61, 0x19d5: 0x0f71, 0x19d6: 0x00d9, 0x19d7: 0x0f99,
-	0x19d8: 0x2039, 0x19d9: 0x0269, 0x19da: 0x01d9, 0x19db: 0x0fa9, 0x19dc: 0x0fb9, 0x19dd: 0x1089,
-	0x19de: 0x0279, 0x19df: 0x0369, 0x19e0: 0x0289, 0x19e1: 0x13d1, 0x19e2: 0x0039, 0x19e3: 0x0ee9,
-	0x19e4: 0x1159, 0x19e5: 0x0ef9, 0x19e6: 0x0f09, 0x19e7: 0x1199, 0x19e8: 0x0f31, 0x19e9: 0x0249,
-	0x19ea: 0x0f41, 0x19eb: 0x0259, 0x19ec: 0x0f51, 0x19ed: 0x0359, 0x19ee: 0x0f61, 0x19ef: 0x0f71,
-	0x19f0: 0x00d9, 0x19f1: 0x0f99, 0x19f2: 0x2039, 0x19f3: 0x0269, 0x19f4: 0x01d9, 0x19f5: 0x0fa9,
-	0x19f6: 0x0fb9, 0x19f7: 0x1089, 0x19f8: 0x0279, 0x19f9: 0x0369, 0x19fa: 0x0289, 0x19fb: 0x13d1,
-	0x19fc: 0x0039, 0x19fd: 0x0ee9, 0x19fe: 0x1159, 0x19ff: 0x0ef9,
-	// Block 0x68, offset 0x1a00
-	0x1a00: 0x0f09, 0x1a01: 0x1199, 0x1a02: 0x0f31, 0x1a03: 0x0249, 0x1a04: 0x0f41, 0x1a05: 0x0259,
-	0x1a06: 0x0f51, 0x1a07: 0x0359, 0x1a08: 0x0f61, 0x1a09: 0x0f71, 0x1a0a: 0x00d9, 0x1a0b: 0x0f99,
-	0x1a0c: 0x2039, 0x1a0d: 0x0269, 0x1a0e: 0x01d9, 0x1a0f: 0x0fa9, 0x1a10: 0x0fb9, 0x1a11: 0x1089,
-	0x1a12: 0x0279, 0x1a13: 0x0369, 0x1a14: 0x0289, 0x1a15: 0x13d1, 0x1a16: 0x0039, 0x1a17: 0x0ee9,
-	0x1a18: 0x1159, 0x1a19: 0x0ef9, 0x1a1a: 0x0f09, 0x1a1b: 0x1199, 0x1a1c: 0x0f31, 0x1a1d: 0x0249,
-	0x1a1e: 0x0f41, 0x1a1f: 0x0259, 0x1a20: 0x0f51, 0x1a21: 0x0359, 0x1a22: 0x0f61, 0x1a23: 0x0f71,
-	0x1a24: 0x00d9, 0x1a25: 0x0f99, 0x1a26: 0x2039, 0x1a27: 0x0269, 0x1a28: 0x01d9, 0x1a29: 0x0fa9,
-	0x1a2a: 0x0fb9, 0x1a2b: 0x1089, 0x1a2c: 0x0279, 0x1a2d: 0x0369, 0x1a2e: 0x0289, 0x1a2f: 0x13d1,
-	0x1a30: 0x0039, 0x1a31: 0x0ee9, 0x1a32: 0x1159, 0x1a33: 0x0ef9, 0x1a34: 0x0f09, 0x1a35: 0x1199,
-	0x1a36: 0x0f31, 0x1a37: 0x0249, 0x1a38: 0x0f41, 0x1a39: 0x0259, 0x1a3a: 0x0f51, 0x1a3b: 0x0359,
-	0x1a3c: 0x0f61, 0x1a3d: 0x0f71, 0x1a3e: 0x00d9, 0x1a3f: 0x0f99,
-	// Block 0x69, offset 0x1a40
-	0x1a40: 0x2039, 0x1a41: 0x0269, 0x1a42: 0x01d9, 0x1a43: 0x0fa9, 0x1a44: 0x0fb9, 0x1a45: 0x1089,
-	0x1a46: 0x0279, 0x1a47: 0x0369, 0x1a48: 0x0289, 0x1a49: 0x13d1, 0x1a4a: 0x0039, 0x1a4b: 0x0ee9,
-	0x1a4c: 0x1159, 0x1a4d: 0x0ef9, 0x1a4e: 0x0f09, 0x1a4f: 0x1199, 0x1a50: 0x0f31, 0x1a51: 0x0249,
-	0x1a52: 0x0f41, 0x1a53: 0x0259, 0x1a54: 0x0f51, 0x1a55: 0x0359, 0x1a56: 0x0f61, 0x1a57: 0x0f71,
-	0x1a58: 0x00d9, 0x1a59: 0x0f99, 0x1a5a: 0x2039, 0x1a5b: 0x0269, 0x1a5c: 0x01d9, 0x1a5d: 0x0fa9,
-	0x1a5e: 0x0fb9, 0x1a5f: 0x1089, 0x1a60: 0x0279, 0x1a61: 0x0369, 0x1a62: 0x0289, 0x1a63: 0x13d1,
-	0x1a64: 0xba81, 0x1a65: 0xba99, 0x1a66: 0x0040, 0x1a67: 0x0040, 0x1a68: 0xbab1, 0x1a69: 0x1099,
-	0x1a6a: 0x10b1, 0x1a6b: 0x10c9, 0x1a6c: 0xbac9, 0x1a6d: 0xbae1, 0x1a6e: 0xbaf9, 0x1a6f: 0x1429,
-	0x1a70: 0x1a31, 0x1a71: 0xbb11, 0x1a72: 0xbb29, 0x1a73: 0xbb41, 0x1a74: 0xbb59, 0x1a75: 0xbb71,
-	0x1a76: 0xbb89, 0x1a77: 0x2109, 0x1a78: 0x1111, 0x1a79: 0x1429, 0x1a7a: 0xbba1, 0x1a7b: 0xbbb9,
-	0x1a7c: 0xbbd1, 0x1a7d: 0x10e1, 0x1a7e: 0x10f9, 0x1a7f: 0xbbe9,
-	// Block 0x6a, offset 0x1a80
-	0x1a80: 0x2079, 0x1a81: 0xbc01, 0x1a82: 0xbab1, 0x1a83: 0x1099, 0x1a84: 0x10b1, 0x1a85: 0x10c9,
-	0x1a86: 0xbac9, 0x1a87: 0xbae1, 0x1a88: 0xbaf9, 0x1a89: 0x1429, 0x1a8a: 0x1a31, 0x1a8b: 0xbb11,
-	0x1a8c: 0xbb29, 0x1a8d: 0xbb41, 0x1a8e: 0xbb59, 0x1a8f: 0xbb71, 0x1a90: 0xbb89, 0x1a91: 0x2109,
-	0x1a92: 0x1111, 0x1a93: 0xbba1, 0x1a94: 0xbba1, 0x1a95: 0xbbb9, 0x1a96: 0xbbd1, 0x1a97: 0x10e1,
-	0x1a98: 0x10f9, 0x1a99: 0xbbe9, 0x1a9a: 0x2079, 0x1a9b: 0xbc21, 0x1a9c: 0xbac9, 0x1a9d: 0x1429,
-	0x1a9e: 0xbb11, 0x1a9f: 0x10e1, 0x1aa0: 0x1111, 0x1aa1: 0x2109, 0x1aa2: 0xbab1, 0x1aa3: 0x1099,
-	0x1aa4: 0x10b1, 0x1aa5: 0x10c9, 0x1aa6: 0xbac9, 0x1aa7: 0xbae1, 0x1aa8: 0xbaf9, 0x1aa9: 0x1429,
-	0x1aaa: 0x1a31, 0x1aab: 0xbb11, 0x1aac: 0xbb29, 0x1aad: 0xbb41, 0x1aae: 0xbb59, 0x1aaf: 0xbb71,
-	0x1ab0: 0xbb89, 0x1ab1: 0x2109, 0x1ab2: 0x1111, 0x1ab3: 0x1429, 0x1ab4: 0xbba1, 0x1ab5: 0xbbb9,
-	0x1ab6: 0xbbd1, 0x1ab7: 0x10e1, 0x1ab8: 0x10f9, 0x1ab9: 0xbbe9, 0x1aba: 0x2079, 0x1abb: 0xbc01,
-	0x1abc: 0xbab1, 0x1abd: 0x1099, 0x1abe: 0x10b1, 0x1abf: 0x10c9,
-	// Block 0x6b, offset 0x1ac0
-	0x1ac0: 0xbac9, 0x1ac1: 0xbae1, 0x1ac2: 0xbaf9, 0x1ac3: 0x1429, 0x1ac4: 0x1a31, 0x1ac5: 0xbb11,
-	0x1ac6: 0xbb29, 0x1ac7: 0xbb41, 0x1ac8: 0xbb59, 0x1ac9: 0xbb71, 0x1aca: 0xbb89, 0x1acb: 0x2109,
-	0x1acc: 0x1111, 0x1acd: 0xbba1, 0x1ace: 0xbba1, 0x1acf: 0xbbb9, 0x1ad0: 0xbbd1, 0x1ad1: 0x10e1,
-	0x1ad2: 0x10f9, 0x1ad3: 0xbbe9, 0x1ad4: 0x2079, 0x1ad5: 0xbc21, 0x1ad6: 0xbac9, 0x1ad7: 0x1429,
-	0x1ad8: 0xbb11, 0x1ad9: 0x10e1, 0x1ada: 0x1111, 0x1adb: 0x2109, 0x1adc: 0xbab1, 0x1add: 0x1099,
-	0x1ade: 0x10b1, 0x1adf: 0x10c9, 0x1ae0: 0xbac9, 0x1ae1: 0xbae1, 0x1ae2: 0xbaf9, 0x1ae3: 0x1429,
-	0x1ae4: 0x1a31, 0x1ae5: 0xbb11, 0x1ae6: 0xbb29, 0x1ae7: 0xbb41, 0x1ae8: 0xbb59, 0x1ae9: 0xbb71,
-	0x1aea: 0xbb89, 0x1aeb: 0x2109, 0x1aec: 0x1111, 0x1aed: 0x1429, 0x1aee: 0xbba1, 0x1aef: 0xbbb9,
-	0x1af0: 0xbbd1, 0x1af1: 0x10e1, 0x1af2: 0x10f9, 0x1af3: 0xbbe9, 0x1af4: 0x2079, 0x1af5: 0xbc01,
-	0x1af6: 0xbab1, 0x1af7: 0x1099, 0x1af8: 0x10b1, 0x1af9: 0x10c9, 0x1afa: 0xbac9, 0x1afb: 0xbae1,
-	0x1afc: 0xbaf9, 0x1afd: 0x1429, 0x1afe: 0x1a31, 0x1aff: 0xbb11,
-	// Block 0x6c, offset 0x1b00
-	0x1b00: 0xbb29, 0x1b01: 0xbb41, 0x1b02: 0xbb59, 0x1b03: 0xbb71, 0x1b04: 0xbb89, 0x1b05: 0x2109,
-	0x1b06: 0x1111, 0x1b07: 0xbba1, 0x1b08: 0xbba1, 0x1b09: 0xbbb9, 0x1b0a: 0xbbd1, 0x1b0b: 0x10e1,
-	0x1b0c: 0x10f9, 0x1b0d: 0xbbe9, 0x1b0e: 0x2079, 0x1b0f: 0xbc21, 0x1b10: 0xbac9, 0x1b11: 0x1429,
-	0x1b12: 0xbb11, 0x1b13: 0x10e1, 0x1b14: 0x1111, 0x1b15: 0x2109, 0x1b16: 0xbab1, 0x1b17: 0x1099,
-	0x1b18: 0x10b1, 0x1b19: 0x10c9, 0x1b1a: 0xbac9, 0x1b1b: 0xbae1, 0x1b1c: 0xbaf9, 0x1b1d: 0x1429,
-	0x1b1e: 0x1a31, 0x1b1f: 0xbb11, 0x1b20: 0xbb29, 0x1b21: 0xbb41, 0x1b22: 0xbb59, 0x1b23: 0xbb71,
-	0x1b24: 0xbb89, 0x1b25: 0x2109, 0x1b26: 0x1111, 0x1b27: 0x1429, 0x1b28: 0xbba1, 0x1b29: 0xbbb9,
-	0x1b2a: 0xbbd1, 0x1b2b: 0x10e1, 0x1b2c: 0x10f9, 0x1b2d: 0xbbe9, 0x1b2e: 0x2079, 0x1b2f: 0xbc01,
-	0x1b30: 0xbab1, 0x1b31: 0x1099, 0x1b32: 0x10b1, 0x1b33: 0x10c9, 0x1b34: 0xbac9, 0x1b35: 0xbae1,
-	0x1b36: 0xbaf9, 0x1b37: 0x1429, 0x1b38: 0x1a31, 0x1b39: 0xbb11, 0x1b3a: 0xbb29, 0x1b3b: 0xbb41,
-	0x1b3c: 0xbb59, 0x1b3d: 0xbb71, 0x1b3e: 0xbb89, 0x1b3f: 0x2109,
-	// Block 0x6d, offset 0x1b40
-	0x1b40: 0x1111, 0x1b41: 0xbba1, 0x1b42: 0xbba1, 0x1b43: 0xbbb9, 0x1b44: 0xbbd1, 0x1b45: 0x10e1,
-	0x1b46: 0x10f9, 0x1b47: 0xbbe9, 0x1b48: 0x2079, 0x1b49: 0xbc21, 0x1b4a: 0xbac9, 0x1b4b: 0x1429,
-	0x1b4c: 0xbb11, 0x1b4d: 0x10e1, 0x1b4e: 0x1111, 0x1b4f: 0x2109, 0x1b50: 0xbab1, 0x1b51: 0x1099,
-	0x1b52: 0x10b1, 0x1b53: 0x10c9, 0x1b54: 0xbac9, 0x1b55: 0xbae1, 0x1b56: 0xbaf9, 0x1b57: 0x1429,
-	0x1b58: 0x1a31, 0x1b59: 0xbb11, 0x1b5a: 0xbb29, 0x1b5b: 0xbb41, 0x1b5c: 0xbb59, 0x1b5d: 0xbb71,
-	0x1b5e: 0xbb89, 0x1b5f: 0x2109, 0x1b60: 0x1111, 0x1b61: 0x1429, 0x1b62: 0xbba1, 0x1b63: 0xbbb9,
-	0x1b64: 0xbbd1, 0x1b65: 0x10e1, 0x1b66: 0x10f9, 0x1b67: 0xbbe9, 0x1b68: 0x2079, 0x1b69: 0xbc01,
-	0x1b6a: 0xbab1, 0x1b6b: 0x1099, 0x1b6c: 0x10b1, 0x1b6d: 0x10c9, 0x1b6e: 0xbac9, 0x1b6f: 0xbae1,
-	0x1b70: 0xbaf9, 0x1b71: 0x1429, 0x1b72: 0x1a31, 0x1b73: 0xbb11, 0x1b74: 0xbb29, 0x1b75: 0xbb41,
-	0x1b76: 0xbb59, 0x1b77: 0xbb71, 0x1b78: 0xbb89, 0x1b79: 0x2109, 0x1b7a: 0x1111, 0x1b7b: 0xbba1,
-	0x1b7c: 0xbba1, 0x1b7d: 0xbbb9, 0x1b7e: 0xbbd1, 0x1b7f: 0x10e1,
-	// Block 0x6e, offset 0x1b80
-	0x1b80: 0x10f9, 0x1b81: 0xbbe9, 0x1b82: 0x2079, 0x1b83: 0xbc21, 0x1b84: 0xbac9, 0x1b85: 0x1429,
-	0x1b86: 0xbb11, 0x1b87: 0x10e1, 0x1b88: 0x1111, 0x1b89: 0x2109, 0x1b8a: 0xbc41, 0x1b8b: 0xbc41,
-	0x1b8c: 0x0040, 0x1b8d: 0x0040, 0x1b8e: 0x1f41, 0x1b8f: 0x00c9, 0x1b90: 0x0069, 0x1b91: 0x0079,
-	0x1b92: 0x1f51, 0x1b93: 0x1f61, 0x1b94: 0x1f71, 0x1b95: 0x1f81, 0x1b96: 0x1f91, 0x1b97: 0x1fa1,
-	0x1b98: 0x1f41, 0x1b99: 0x00c9, 0x1b9a: 0x0069, 0x1b9b: 0x0079, 0x1b9c: 0x1f51, 0x1b9d: 0x1f61,
-	0x1b9e: 0x1f71, 0x1b9f: 0x1f81, 0x1ba0: 0x1f91, 0x1ba1: 0x1fa1, 0x1ba2: 0x1f41, 0x1ba3: 0x00c9,
-	0x1ba4: 0x0069, 0x1ba5: 0x0079, 0x1ba6: 0x1f51, 0x1ba7: 0x1f61, 0x1ba8: 0x1f71, 0x1ba9: 0x1f81,
-	0x1baa: 0x1f91, 0x1bab: 0x1fa1, 0x1bac: 0x1f41, 0x1bad: 0x00c9, 0x1bae: 0x0069, 0x1baf: 0x0079,
-	0x1bb0: 0x1f51, 0x1bb1: 0x1f61, 0x1bb2: 0x1f71, 0x1bb3: 0x1f81, 0x1bb4: 0x1f91, 0x1bb5: 0x1fa1,
-	0x1bb6: 0x1f41, 0x1bb7: 0x00c9, 0x1bb8: 0x0069, 0x1bb9: 0x0079, 0x1bba: 0x1f51, 0x1bbb: 0x1f61,
-	0x1bbc: 0x1f71, 0x1bbd: 0x1f81, 0x1bbe: 0x1f91, 0x1bbf: 0x1fa1,
-	// Block 0x6f, offset 0x1bc0
-	0x1bc0: 0xe115, 0x1bc1: 0xe115, 0x1bc2: 0xe135, 0x1bc3: 0xe135, 0x1bc4: 0xe115, 0x1bc5: 0xe115,
-	0x1bc6: 0xe175, 0x1bc7: 0xe175, 0x1bc8: 0xe115, 0x1bc9: 0xe115, 0x1bca: 0xe135, 0x1bcb: 0xe135,
-	0x1bcc: 0xe115, 0x1bcd: 0xe115, 0x1bce: 0xe1f5, 0x1bcf: 0xe1f5, 0x1bd0: 0xe115, 0x1bd1: 0xe115,
-	0x1bd2: 0xe135, 0x1bd3: 0xe135, 0x1bd4: 0xe115, 0x1bd5: 0xe115, 0x1bd6: 0xe175, 0x1bd7: 0xe175,
-	0x1bd8: 0xe115, 0x1bd9: 0xe115, 0x1bda: 0xe135, 0x1bdb: 0xe135, 0x1bdc: 0xe115, 0x1bdd: 0xe115,
-	0x1bde: 0x8b05, 0x1bdf: 0x8b05, 0x1be0: 0x04b5, 0x1be1: 0x04b5, 0x1be2: 0x0208, 0x1be3: 0x0208,
-	0x1be4: 0x0208, 0x1be5: 0x0208, 0x1be6: 0x0208, 0x1be7: 0x0208, 0x1be8: 0x0208, 0x1be9: 0x0208,
-	0x1bea: 0x0208, 0x1beb: 0x0208, 0x1bec: 0x0208, 0x1bed: 0x0208, 0x1bee: 0x0208, 0x1bef: 0x0208,
-	0x1bf0: 0x0208, 0x1bf1: 0x0208, 0x1bf2: 0x0208, 0x1bf3: 0x0208, 0x1bf4: 0x0208, 0x1bf5: 0x0208,
-	0x1bf6: 0x0208, 0x1bf7: 0x0208, 0x1bf8: 0x0208, 0x1bf9: 0x0208, 0x1bfa: 0x0208, 0x1bfb: 0x0208,
-	0x1bfc: 0x0208, 0x1bfd: 0x0208, 0x1bfe: 0x0208, 0x1bff: 0x0208,
-	// Block 0x70, offset 0x1c00
-	0x1c00: 0xb189, 0x1c01: 0xb1a1, 0x1c02: 0xb201, 0x1c03: 0xb249, 0x1c04: 0x0040, 0x1c05: 0xb411,
-	0x1c06: 0xb291, 0x1c07: 0xb219, 0x1c08: 0xb309, 0x1c09: 0xb429, 0x1c0a: 0xb399, 0x1c0b: 0xb3b1,
-	0x1c0c: 0xb3c9, 0x1c0d: 0xb3e1, 0x1c0e: 0xb2a9, 0x1c0f: 0xb339, 0x1c10: 0xb369, 0x1c11: 0xb2d9,
-	0x1c12: 0xb381, 0x1c13: 0xb279, 0x1c14: 0xb2c1, 0x1c15: 0xb1d1, 0x1c16: 0xb1e9, 0x1c17: 0xb231,
-	0x1c18: 0xb261, 0x1c19: 0xb2f1, 0x1c1a: 0xb321, 0x1c1b: 0xb351, 0x1c1c: 0xbc59, 0x1c1d: 0x7949,
-	0x1c1e: 0xbc71, 0x1c1f: 0xbc89, 0x1c20: 0x0040, 0x1c21: 0xb1a1, 0x1c22: 0xb201, 0x1c23: 0x0040,
-	0x1c24: 0xb3f9, 0x1c25: 0x0040, 0x1c26: 0x0040, 0x1c27: 0xb219, 0x1c28: 0x0040, 0x1c29: 0xb429,
-	0x1c2a: 0xb399, 0x1c2b: 0xb3b1, 0x1c2c: 0xb3c9, 0x1c2d: 0xb3e1, 0x1c2e: 0xb2a9, 0x1c2f: 0xb339,
-	0x1c30: 0xb369, 0x1c31: 0xb2d9, 0x1c32: 0xb381, 0x1c33: 0x0040, 0x1c34: 0xb2c1, 0x1c35: 0xb1d1,
-	0x1c36: 0xb1e9, 0x1c37: 0xb231, 0x1c38: 0x0040, 0x1c39: 0xb2f1, 0x1c3a: 0x0040, 0x1c3b: 0xb351,
-	0x1c3c: 0x0040, 0x1c3d: 0x0040, 0x1c3e: 0x0040, 0x1c3f: 0x0040,
-	// Block 0x71, offset 0x1c40
-	0x1c40: 0x0040, 0x1c41: 0x0040, 0x1c42: 0xb201, 0x1c43: 0x0040, 0x1c44: 0x0040, 0x1c45: 0x0040,
-	0x1c46: 0x0040, 0x1c47: 0xb219, 0x1c48: 0x0040, 0x1c49: 0xb429, 0x1c4a: 0x0040, 0x1c4b: 0xb3b1,
-	0x1c4c: 0x0040, 0x1c4d: 0xb3e1, 0x1c4e: 0xb2a9, 0x1c4f: 0xb339, 0x1c50: 0x0040, 0x1c51: 0xb2d9,
-	0x1c52: 0xb381, 0x1c53: 0x0040, 0x1c54: 0xb2c1, 0x1c55: 0x0040, 0x1c56: 0x0040, 0x1c57: 0xb231,
-	0x1c58: 0x0040, 0x1c59: 0xb2f1, 0x1c5a: 0x0040, 0x1c5b: 0xb351, 0x1c5c: 0x0040, 0x1c5d: 0x7949,
-	0x1c5e: 0x0040, 0x1c5f: 0xbc89, 0x1c60: 0x0040, 0x1c61: 0xb1a1, 0x1c62: 0xb201, 0x1c63: 0x0040,
-	0x1c64: 0xb3f9, 0x1c65: 0x0040, 0x1c66: 0x0040, 0x1c67: 0xb219, 0x1c68: 0xb309, 0x1c69: 0xb429,
-	0x1c6a: 0xb399, 0x1c6b: 0x0040, 0x1c6c: 0xb3c9, 0x1c6d: 0xb3e1, 0x1c6e: 0xb2a9, 0x1c6f: 0xb339,
-	0x1c70: 0xb369, 0x1c71: 0xb2d9, 0x1c72: 0xb381, 0x1c73: 0x0040, 0x1c74: 0xb2c1, 0x1c75: 0xb1d1,
-	0x1c76: 0xb1e9, 0x1c77: 0xb231, 0x1c78: 0x0040, 0x1c79: 0xb2f1, 0x1c7a: 0xb321, 0x1c7b: 0xb351,
-	0x1c7c: 0xbc59, 0x1c7d: 0x0040, 0x1c7e: 0xbc71, 0x1c7f: 0x0040,
-	// Block 0x72, offset 0x1c80
-	0x1c80: 0xb189, 0x1c81: 0xb1a1, 0x1c82: 0xb201, 0x1c83: 0xb249, 0x1c84: 0xb3f9, 0x1c85: 0xb411,
-	0x1c86: 0xb291, 0x1c87: 0xb219, 0x1c88: 0xb309, 0x1c89: 0xb429, 0x1c8a: 0x0040, 0x1c8b: 0xb3b1,
-	0x1c8c: 0xb3c9, 0x1c8d: 0xb3e1, 0x1c8e: 0xb2a9, 0x1c8f: 0xb339, 0x1c90: 0xb369, 0x1c91: 0xb2d9,
-	0x1c92: 0xb381, 0x1c93: 0xb279, 0x1c94: 0xb2c1, 0x1c95: 0xb1d1, 0x1c96: 0xb1e9, 0x1c97: 0xb231,
-	0x1c98: 0xb261, 0x1c99: 0xb2f1, 0x1c9a: 0xb321, 0x1c9b: 0xb351, 0x1c9c: 0x0040, 0x1c9d: 0x0040,
-	0x1c9e: 0x0040, 0x1c9f: 0x0040, 0x1ca0: 0x0040, 0x1ca1: 0xb1a1, 0x1ca2: 0xb201, 0x1ca3: 0xb249,
-	0x1ca4: 0x0040, 0x1ca5: 0xb411, 0x1ca6: 0xb291, 0x1ca7: 0xb219, 0x1ca8: 0xb309, 0x1ca9: 0xb429,
-	0x1caa: 0x0040, 0x1cab: 0xb3b1, 0x1cac: 0xb3c9, 0x1cad: 0xb3e1, 0x1cae: 0xb2a9, 0x1caf: 0xb339,
-	0x1cb0: 0xb369, 0x1cb1: 0xb2d9, 0x1cb2: 0xb381, 0x1cb3: 0xb279, 0x1cb4: 0xb2c1, 0x1cb5: 0xb1d1,
-	0x1cb6: 0xb1e9, 0x1cb7: 0xb231, 0x1cb8: 0xb261, 0x1cb9: 0xb2f1, 0x1cba: 0xb321, 0x1cbb: 0xb351,
-	0x1cbc: 0x0040, 0x1cbd: 0x0040, 0x1cbe: 0x0040, 0x1cbf: 0x0040,
-	// Block 0x73, offset 0x1cc0
-	0x1cc0: 0x0040, 0x1cc1: 0xbca2, 0x1cc2: 0xbcba, 0x1cc3: 0xbcd2, 0x1cc4: 0xbcea, 0x1cc5: 0xbd02,
-	0x1cc6: 0xbd1a, 0x1cc7: 0xbd32, 0x1cc8: 0xbd4a, 0x1cc9: 0xbd62, 0x1cca: 0xbd7a, 0x1ccb: 0x0018,
-	0x1ccc: 0x0018, 0x1ccd: 0x0040, 0x1cce: 0x0040, 0x1ccf: 0x0040, 0x1cd0: 0xbd92, 0x1cd1: 0xbdb2,
-	0x1cd2: 0xbdd2, 0x1cd3: 0xbdf2, 0x1cd4: 0xbe12, 0x1cd5: 0xbe32, 0x1cd6: 0xbe52, 0x1cd7: 0xbe72,
-	0x1cd8: 0xbe92, 0x1cd9: 0xbeb2, 0x1cda: 0xbed2, 0x1cdb: 0xbef2, 0x1cdc: 0xbf12, 0x1cdd: 0xbf32,
-	0x1cde: 0xbf52, 0x1cdf: 0xbf72, 0x1ce0: 0xbf92, 0x1ce1: 0xbfb2, 0x1ce2: 0xbfd2, 0x1ce3: 0xbff2,
-	0x1ce4: 0xc012, 0x1ce5: 0xc032, 0x1ce6: 0xc052, 0x1ce7: 0xc072, 0x1ce8: 0xc092, 0x1ce9: 0xc0b2,
-	0x1cea: 0xc0d1, 0x1ceb: 0x1159, 0x1cec: 0x0269, 0x1ced: 0x6671, 0x1cee: 0xc111, 0x1cef: 0x0040,
-	0x1cf0: 0x0039, 0x1cf1: 0x0ee9, 0x1cf2: 0x1159, 0x1cf3: 0x0ef9, 0x1cf4: 0x0f09, 0x1cf5: 0x1199,
-	0x1cf6: 0x0f31, 0x1cf7: 0x0249, 0x1cf8: 0x0f41, 0x1cf9: 0x0259, 0x1cfa: 0x0f51, 0x1cfb: 0x0359,
-	0x1cfc: 0x0f61, 0x1cfd: 0x0f71, 0x1cfe: 0x00d9, 0x1cff: 0x0f99,
-	// Block 0x74, offset 0x1d00
-	0x1d00: 0x2039, 0x1d01: 0x0269, 0x1d02: 0x01d9, 0x1d03: 0x0fa9, 0x1d04: 0x0fb9, 0x1d05: 0x1089,
-	0x1d06: 0x0279, 0x1d07: 0x0369, 0x1d08: 0x0289, 0x1d09: 0x13d1, 0x1d0a: 0xc129, 0x1d0b: 0x65b1,
-	0x1d0c: 0xc141, 0x1d0d: 0x1441, 0x1d0e: 0xc159, 0x1d0f: 0xc179, 0x1d10: 0x0018, 0x1d11: 0x0018,
-	0x1d12: 0x0018, 0x1d13: 0x0018, 0x1d14: 0x0018, 0x1d15: 0x0018, 0x1d16: 0x0018, 0x1d17: 0x0018,
-	0x1d18: 0x0018, 0x1d19: 0x0018, 0x1d1a: 0x0018, 0x1d1b: 0x0018, 0x1d1c: 0x0018, 0x1d1d: 0x0018,
-	0x1d1e: 0x0018, 0x1d1f: 0x0018, 0x1d20: 0x0018, 0x1d21: 0x0018, 0x1d22: 0x0018, 0x1d23: 0x0018,
-	0x1d24: 0x0018, 0x1d25: 0x0018, 0x1d26: 0x0018, 0x1d27: 0x0018, 0x1d28: 0x0018, 0x1d29: 0x0018,
-	0x1d2a: 0xc191, 0x1d2b: 0xc1a9, 0x1d2c: 0x0040, 0x1d2d: 0x0040, 0x1d2e: 0x0040, 0x1d2f: 0x0040,
-	0x1d30: 0x0018, 0x1d31: 0x0018, 0x1d32: 0x0018, 0x1d33: 0x0018, 0x1d34: 0x0018, 0x1d35: 0x0018,
-	0x1d36: 0x0018, 0x1d37: 0x0018, 0x1d38: 0x0018, 0x1d39: 0x0018, 0x1d3a: 0x0018, 0x1d3b: 0x0018,
-	0x1d3c: 0x0018, 0x1d3d: 0x0018, 0x1d3e: 0x0018, 0x1d3f: 0x0018,
-	// Block 0x75, offset 0x1d40
-	0x1d40: 0xc1d9, 0x1d41: 0xc211, 0x1d42: 0xc249, 0x1d43: 0x0040, 0x1d44: 0x0040, 0x1d45: 0x0040,
-	0x1d46: 0x0040, 0x1d47: 0x0040, 0x1d48: 0x0040, 0x1d49: 0x0040, 0x1d4a: 0x0040, 0x1d4b: 0x0040,
-	0x1d4c: 0x0040, 0x1d4d: 0x0040, 0x1d4e: 0x0040, 0x1d4f: 0x0040, 0x1d50: 0xc269, 0x1d51: 0xc289,
-	0x1d52: 0xc2a9, 0x1d53: 0xc2c9, 0x1d54: 0xc2e9, 0x1d55: 0xc309, 0x1d56: 0xc329, 0x1d57: 0xc349,
-	0x1d58: 0xc369, 0x1d59: 0xc389, 0x1d5a: 0xc3a9, 0x1d5b: 0xc3c9, 0x1d5c: 0xc3e9, 0x1d5d: 0xc409,
-	0x1d5e: 0xc429, 0x1d5f: 0xc449, 0x1d60: 0xc469, 0x1d61: 0xc489, 0x1d62: 0xc4a9, 0x1d63: 0xc4c9,
-	0x1d64: 0xc4e9, 0x1d65: 0xc509, 0x1d66: 0xc529, 0x1d67: 0xc549, 0x1d68: 0xc569, 0x1d69: 0xc589,
-	0x1d6a: 0xc5a9, 0x1d6b: 0xc5c9, 0x1d6c: 0xc5e9, 0x1d6d: 0xc609, 0x1d6e: 0xc629, 0x1d6f: 0xc649,
-	0x1d70: 0xc669, 0x1d71: 0xc689, 0x1d72: 0xc6a9, 0x1d73: 0xc6c9, 0x1d74: 0xc6e9, 0x1d75: 0xc709,
-	0x1d76: 0xc729, 0x1d77: 0xc749, 0x1d78: 0xc769, 0x1d79: 0xc789, 0x1d7a: 0xc7a9, 0x1d7b: 0xc7c9,
-	0x1d7c: 0x0040, 0x1d7d: 0x0040, 0x1d7e: 0x0040, 0x1d7f: 0x0040,
-	// Block 0x76, offset 0x1d80
-	0x1d80: 0xcaf9, 0x1d81: 0xcb19, 0x1d82: 0xcb39, 0x1d83: 0x8b1d, 0x1d84: 0xcb59, 0x1d85: 0xcb79,
-	0x1d86: 0xcb99, 0x1d87: 0xcbb9, 0x1d88: 0xcbd9, 0x1d89: 0xcbf9, 0x1d8a: 0xcc19, 0x1d8b: 0xcc39,
-	0x1d8c: 0xcc59, 0x1d8d: 0x8b3d, 0x1d8e: 0xcc79, 0x1d8f: 0xcc99, 0x1d90: 0xccb9, 0x1d91: 0xccd9,
-	0x1d92: 0x8b5d, 0x1d93: 0xccf9, 0x1d94: 0xcd19, 0x1d95: 0xc429, 0x1d96: 0x8b7d, 0x1d97: 0xcd39,
-	0x1d98: 0xcd59, 0x1d99: 0xcd79, 0x1d9a: 0xcd99, 0x1d9b: 0xcdb9, 0x1d9c: 0x8b9d, 0x1d9d: 0xcdd9,
-	0x1d9e: 0xcdf9, 0x1d9f: 0xce19, 0x1da0: 0xce39, 0x1da1: 0xce59, 0x1da2: 0xc789, 0x1da3: 0xce79,
-	0x1da4: 0xce99, 0x1da5: 0xceb9, 0x1da6: 0xced9, 0x1da7: 0xcef9, 0x1da8: 0xcf19, 0x1da9: 0xcf39,
-	0x1daa: 0xcf59, 0x1dab: 0xcf79, 0x1dac: 0xcf99, 0x1dad: 0xcfb9, 0x1dae: 0xcfd9, 0x1daf: 0xcff9,
-	0x1db0: 0xd019, 0x1db1: 0xd039, 0x1db2: 0xd039, 0x1db3: 0xd039, 0x1db4: 0x8bbd, 0x1db5: 0xd059,
-	0x1db6: 0xd079, 0x1db7: 0xd099, 0x1db8: 0x8bdd, 0x1db9: 0xd0b9, 0x1dba: 0xd0d9, 0x1dbb: 0xd0f9,
-	0x1dbc: 0xd119, 0x1dbd: 0xd139, 0x1dbe: 0xd159, 0x1dbf: 0xd179,
-	// Block 0x77, offset 0x1dc0
-	0x1dc0: 0xd199, 0x1dc1: 0xd1b9, 0x1dc2: 0xd1d9, 0x1dc3: 0xd1f9, 0x1dc4: 0xd219, 0x1dc5: 0xd239,
-	0x1dc6: 0xd239, 0x1dc7: 0xd259, 0x1dc8: 0xd279, 0x1dc9: 0xd299, 0x1dca: 0xd2b9, 0x1dcb: 0xd2d9,
-	0x1dcc: 0xd2f9, 0x1dcd: 0xd319, 0x1dce: 0xd339, 0x1dcf: 0xd359, 0x1dd0: 0xd379, 0x1dd1: 0xd399,
-	0x1dd2: 0xd3b9, 0x1dd3: 0xd3d9, 0x1dd4: 0xd3f9, 0x1dd5: 0xd419, 0x1dd6: 0xd439, 0x1dd7: 0xd459,
-	0x1dd8: 0xd479, 0x1dd9: 0x8bfd, 0x1dda: 0xd499, 0x1ddb: 0xd4b9, 0x1ddc: 0xd4d9, 0x1ddd: 0xc309,
-	0x1dde: 0xd4f9, 0x1ddf: 0xd519, 0x1de0: 0x8c1d, 0x1de1: 0x8c3d, 0x1de2: 0xd539, 0x1de3: 0xd559,
-	0x1de4: 0xd579, 0x1de5: 0xd599, 0x1de6: 0xd5b9, 0x1de7: 0xd5d9, 0x1de8: 0x0040, 0x1de9: 0xd5f9,
-	0x1dea: 0xd619, 0x1deb: 0xd619, 0x1dec: 0x8c5d, 0x1ded: 0xd639, 0x1dee: 0xd659, 0x1def: 0xd679,
-	0x1df0: 0xd699, 0x1df1: 0x8c7d, 0x1df2: 0xd6b9, 0x1df3: 0xd6d9, 0x1df4: 0x0040, 0x1df5: 0xd6f9,
-	0x1df6: 0xd719, 0x1df7: 0xd739, 0x1df8: 0xd759, 0x1df9: 0xd779, 0x1dfa: 0xd799, 0x1dfb: 0x8c9d,
-	0x1dfc: 0xd7b9, 0x1dfd: 0x8cbd, 0x1dfe: 0xd7d9, 0x1dff: 0xd7f9,
-	// Block 0x78, offset 0x1e00
-	0x1e00: 0xd819, 0x1e01: 0xd839, 0x1e02: 0xd859, 0x1e03: 0xd879, 0x1e04: 0xd899, 0x1e05: 0xd8b9,
-	0x1e06: 0xd8d9, 0x1e07: 0xd8f9, 0x1e08: 0xd919, 0x1e09: 0x8cdd, 0x1e0a: 0xd939, 0x1e0b: 0xd959,
-	0x1e0c: 0xd979, 0x1e0d: 0xd999, 0x1e0e: 0xd9b9, 0x1e0f: 0x8cfd, 0x1e10: 0xd9d9, 0x1e11: 0x8d1d,
-	0x1e12: 0x8d3d, 0x1e13: 0xd9f9, 0x1e14: 0xda19, 0x1e15: 0xda19, 0x1e16: 0xda39, 0x1e17: 0x8d5d,
-	0x1e18: 0x8d7d, 0x1e19: 0xda59, 0x1e1a: 0xda79, 0x1e1b: 0xda99, 0x1e1c: 0xdab9, 0x1e1d: 0xdad9,
-	0x1e1e: 0xdaf9, 0x1e1f: 0xdb19, 0x1e20: 0xdb39, 0x1e21: 0xdb59, 0x1e22: 0xdb79, 0x1e23: 0xdb99,
-	0x1e24: 0x8d9d, 0x1e25: 0xdbb9, 0x1e26: 0xdbd9, 0x1e27: 0xdbf9, 0x1e28: 0xdc19, 0x1e29: 0xdbf9,
-	0x1e2a: 0xdc39, 0x1e2b: 0xdc59, 0x1e2c: 0xdc79, 0x1e2d: 0xdc99, 0x1e2e: 0xdcb9, 0x1e2f: 0xdcd9,
-	0x1e30: 0xdcf9, 0x1e31: 0xdd19, 0x1e32: 0xdd39, 0x1e33: 0xdd59, 0x1e34: 0xdd79, 0x1e35: 0xdd99,
-	0x1e36: 0xddb9, 0x1e37: 0xddd9, 0x1e38: 0x8dbd, 0x1e39: 0xddf9, 0x1e3a: 0xde19, 0x1e3b: 0xde39,
-	0x1e3c: 0xde59, 0x1e3d: 0xde79, 0x1e3e: 0x8ddd, 0x1e3f: 0xde99,
-	// Block 0x79, offset 0x1e40
-	0x1e40: 0xe599, 0x1e41: 0xe5b9, 0x1e42: 0xe5d9, 0x1e43: 0xe5f9, 0x1e44: 0xe619, 0x1e45: 0xe639,
-	0x1e46: 0x8efd, 0x1e47: 0xe659, 0x1e48: 0xe679, 0x1e49: 0xe699, 0x1e4a: 0xe6b9, 0x1e4b: 0xe6d9,
-	0x1e4c: 0xe6f9, 0x1e4d: 0x8f1d, 0x1e4e: 0xe719, 0x1e4f: 0xe739, 0x1e50: 0x8f3d, 0x1e51: 0x8f5d,
-	0x1e52: 0xe759, 0x1e53: 0xe779, 0x1e54: 0xe799, 0x1e55: 0xe7b9, 0x1e56: 0xe7d9, 0x1e57: 0xe7f9,
-	0x1e58: 0xe819, 0x1e59: 0xe839, 0x1e5a: 0xe859, 0x1e5b: 0x8f7d, 0x1e5c: 0xe879, 0x1e5d: 0x8f9d,
-	0x1e5e: 0xe899, 0x1e5f: 0x0040, 0x1e60: 0xe8b9, 0x1e61: 0xe8d9, 0x1e62: 0xe8f9, 0x1e63: 0x8fbd,
-	0x1e64: 0xe919, 0x1e65: 0xe939, 0x1e66: 0x8fdd, 0x1e67: 0x8ffd, 0x1e68: 0xe959, 0x1e69: 0xe979,
-	0x1e6a: 0xe999, 0x1e6b: 0xe9b9, 0x1e6c: 0xe9d9, 0x1e6d: 0xe9d9, 0x1e6e: 0xe9f9, 0x1e6f: 0xea19,
-	0x1e70: 0xea39, 0x1e71: 0xea59, 0x1e72: 0xea79, 0x1e73: 0xea99, 0x1e74: 0xeab9, 0x1e75: 0x901d,
-	0x1e76: 0xead9, 0x1e77: 0x903d, 0x1e78: 0xeaf9, 0x1e79: 0x905d, 0x1e7a: 0xeb19, 0x1e7b: 0x907d,
-	0x1e7c: 0x909d, 0x1e7d: 0x90bd, 0x1e7e: 0xeb39, 0x1e7f: 0xeb59,
-	// Block 0x7a, offset 0x1e80
-	0x1e80: 0xeb79, 0x1e81: 0x90dd, 0x1e82: 0x90fd, 0x1e83: 0x911d, 0x1e84: 0x913d, 0x1e85: 0xeb99,
-	0x1e86: 0xebb9, 0x1e87: 0xebb9, 0x1e88: 0xebd9, 0x1e89: 0xebf9, 0x1e8a: 0xec19, 0x1e8b: 0xec39,
-	0x1e8c: 0xec59, 0x1e8d: 0x915d, 0x1e8e: 0xec79, 0x1e8f: 0xec99, 0x1e90: 0xecb9, 0x1e91: 0xecd9,
-	0x1e92: 0x917d, 0x1e93: 0xecf9, 0x1e94: 0x919d, 0x1e95: 0x91bd, 0x1e96: 0xed19, 0x1e97: 0xed39,
-	0x1e98: 0xed59, 0x1e99: 0xed79, 0x1e9a: 0xed99, 0x1e9b: 0xedb9, 0x1e9c: 0x91dd, 0x1e9d: 0x91fd,
-	0x1e9e: 0x921d, 0x1e9f: 0x0040, 0x1ea0: 0xedd9, 0x1ea1: 0x923d, 0x1ea2: 0xedf9, 0x1ea3: 0xee19,
-	0x1ea4: 0xee39, 0x1ea5: 0x925d, 0x1ea6: 0xee59, 0x1ea7: 0xee79, 0x1ea8: 0xee99, 0x1ea9: 0xeeb9,
-	0x1eaa: 0xeed9, 0x1eab: 0x927d, 0x1eac: 0xeef9, 0x1ead: 0xef19, 0x1eae: 0xef39, 0x1eaf: 0xef59,
-	0x1eb0: 0xef79, 0x1eb1: 0xef99, 0x1eb2: 0x929d, 0x1eb3: 0x92bd, 0x1eb4: 0xefb9, 0x1eb5: 0x92dd,
-	0x1eb6: 0xefd9, 0x1eb7: 0x92fd, 0x1eb8: 0xeff9, 0x1eb9: 0xf019, 0x1eba: 0xf039, 0x1ebb: 0x931d,
-	0x1ebc: 0x933d, 0x1ebd: 0xf059, 0x1ebe: 0x935d, 0x1ebf: 0xf079,
-	// Block 0x7b, offset 0x1ec0
-	0x1ec0: 0xf6b9, 0x1ec1: 0xf6d9, 0x1ec2: 0xf6f9, 0x1ec3: 0xf719, 0x1ec4: 0xf739, 0x1ec5: 0x951d,
-	0x1ec6: 0xf759, 0x1ec7: 0xf779, 0x1ec8: 0xf799, 0x1ec9: 0xf7b9, 0x1eca: 0xf7d9, 0x1ecb: 0x953d,
-	0x1ecc: 0x955d, 0x1ecd: 0xf7f9, 0x1ece: 0xf819, 0x1ecf: 0xf839, 0x1ed0: 0xf859, 0x1ed1: 0xf879,
-	0x1ed2: 0xf899, 0x1ed3: 0x957d, 0x1ed4: 0xf8b9, 0x1ed5: 0xf8d9, 0x1ed6: 0xf8f9, 0x1ed7: 0xf919,
-	0x1ed8: 0x959d, 0x1ed9: 0x95bd, 0x1eda: 0xf939, 0x1edb: 0xf959, 0x1edc: 0xf979, 0x1edd: 0x95dd,
-	0x1ede: 0xf999, 0x1edf: 0xf9b9, 0x1ee0: 0x6815, 0x1ee1: 0x95fd, 0x1ee2: 0xf9d9, 0x1ee3: 0xf9f9,
-	0x1ee4: 0xfa19, 0x1ee5: 0x961d, 0x1ee6: 0xfa39, 0x1ee7: 0xfa59, 0x1ee8: 0xfa79, 0x1ee9: 0xfa99,
-	0x1eea: 0xfab9, 0x1eeb: 0xfad9, 0x1eec: 0xfaf9, 0x1eed: 0x963d, 0x1eee: 0xfb19, 0x1eef: 0xfb39,
-	0x1ef0: 0xfb59, 0x1ef1: 0x965d, 0x1ef2: 0xfb79, 0x1ef3: 0xfb99, 0x1ef4: 0xfbb9, 0x1ef5: 0xfbd9,
-	0x1ef6: 0x7b35, 0x1ef7: 0x967d, 0x1ef8: 0xfbf9, 0x1ef9: 0xfc19, 0x1efa: 0xfc39, 0x1efb: 0x969d,
-	0x1efc: 0xfc59, 0x1efd: 0x96bd, 0x1efe: 0xfc79, 0x1eff: 0xfc79,
-	// Block 0x7c, offset 0x1f00
-	0x1f00: 0xfc99, 0x1f01: 0x96dd, 0x1f02: 0xfcb9, 0x1f03: 0xfcd9, 0x1f04: 0xfcf9, 0x1f05: 0xfd19,
-	0x1f06: 0xfd39, 0x1f07: 0xfd59, 0x1f08: 0xfd79, 0x1f09: 0x96fd, 0x1f0a: 0xfd99, 0x1f0b: 0xfdb9,
-	0x1f0c: 0xfdd9, 0x1f0d: 0xfdf9, 0x1f0e: 0xfe19, 0x1f0f: 0xfe39, 0x1f10: 0x971d, 0x1f11: 0xfe59,
-	0x1f12: 0x973d, 0x1f13: 0x975d, 0x1f14: 0x977d, 0x1f15: 0xfe79, 0x1f16: 0xfe99, 0x1f17: 0xfeb9,
-	0x1f18: 0xfed9, 0x1f19: 0xfef9, 0x1f1a: 0xff19, 0x1f1b: 0xff39, 0x1f1c: 0xff59, 0x1f1d: 0x979d,
-	0x1f1e: 0x0040, 0x1f1f: 0x0040, 0x1f20: 0x0040, 0x1f21: 0x0040, 0x1f22: 0x0040, 0x1f23: 0x0040,
-	0x1f24: 0x0040, 0x1f25: 0x0040, 0x1f26: 0x0040, 0x1f27: 0x0040, 0x1f28: 0x0040, 0x1f29: 0x0040,
-	0x1f2a: 0x0040, 0x1f2b: 0x0040, 0x1f2c: 0x0040, 0x1f2d: 0x0040, 0x1f2e: 0x0040, 0x1f2f: 0x0040,
-	0x1f30: 0x0040, 0x1f31: 0x0040, 0x1f32: 0x0040, 0x1f33: 0x0040, 0x1f34: 0x0040, 0x1f35: 0x0040,
-	0x1f36: 0x0040, 0x1f37: 0x0040, 0x1f38: 0x0040, 0x1f39: 0x0040, 0x1f3a: 0x0040, 0x1f3b: 0x0040,
-	0x1f3c: 0x0040, 0x1f3d: 0x0040, 0x1f3e: 0x0040, 0x1f3f: 0x0040,
-}
-
-// idnaIndex: 35 blocks, 2240 entries, 4480 bytes
-// Block 0 is the zero block.
-var idnaIndex = [2240]uint16{
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc2: 0x01, 0xc3: 0x7b, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x04, 0xc7: 0x05,
-	0xc8: 0x06, 0xc9: 0x7c, 0xca: 0x7d, 0xcb: 0x07, 0xcc: 0x7e, 0xcd: 0x08, 0xce: 0x09, 0xcf: 0x0a,
-	0xd0: 0x7f, 0xd1: 0x0b, 0xd2: 0x0c, 0xd3: 0x0d, 0xd4: 0x0e, 0xd5: 0x80, 0xd6: 0x81, 0xd7: 0x82,
-	0xd8: 0x0f, 0xd9: 0x83, 0xda: 0x84, 0xdb: 0x10, 0xdc: 0x11, 0xdd: 0x85, 0xde: 0x86, 0xdf: 0x87,
-	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05, 0xe4: 0x06, 0xe5: 0x07, 0xe6: 0x07, 0xe7: 0x07,
-	0xe8: 0x07, 0xe9: 0x08, 0xea: 0x09, 0xeb: 0x07, 0xec: 0x07, 0xed: 0x0a, 0xee: 0x0b, 0xef: 0x0c,
-	0xf0: 0x1c, 0xf1: 0x1d, 0xf2: 0x1d, 0xf3: 0x1f, 0xf4: 0x20,
-	// Block 0x4, offset 0x100
-	0x120: 0x88, 0x121: 0x89, 0x122: 0x8a, 0x123: 0x8b, 0x124: 0x8c, 0x125: 0x12, 0x126: 0x13, 0x127: 0x14,
-	0x128: 0x15, 0x129: 0x16, 0x12a: 0x17, 0x12b: 0x18, 0x12c: 0x19, 0x12d: 0x1a, 0x12e: 0x1b, 0x12f: 0x8d,
-	0x130: 0x8e, 0x131: 0x1c, 0x132: 0x1d, 0x133: 0x1e, 0x134: 0x8f, 0x135: 0x1f, 0x136: 0x90, 0x137: 0x91,
-	0x138: 0x92, 0x139: 0x93, 0x13a: 0x20, 0x13b: 0x94, 0x13c: 0x95, 0x13d: 0x21, 0x13e: 0x22, 0x13f: 0x96,
-	// Block 0x5, offset 0x140
-	0x140: 0x97, 0x141: 0x98, 0x142: 0x99, 0x143: 0x9a, 0x144: 0x9b, 0x145: 0x9c, 0x146: 0x9b, 0x147: 0x9b,
-	0x148: 0x9d, 0x149: 0x9e, 0x14a: 0x9f, 0x14b: 0xa0, 0x14c: 0xa1, 0x14d: 0xa2, 0x14e: 0xa3, 0x14f: 0xa4,
-	0x150: 0xa5, 0x151: 0x9d, 0x152: 0x9d, 0x153: 0x9d, 0x154: 0x9d, 0x155: 0x9d, 0x156: 0x9d, 0x157: 0x9d,
-	0x158: 0x9d, 0x159: 0xa6, 0x15a: 0xa7, 0x15b: 0xa8, 0x15c: 0xa9, 0x15d: 0xaa, 0x15e: 0xab, 0x15f: 0xac,
-	0x160: 0xad, 0x161: 0xae, 0x162: 0xaf, 0x163: 0xb0, 0x164: 0xb1, 0x165: 0xb2, 0x166: 0xb3, 0x167: 0xb4,
-	0x168: 0xb5, 0x169: 0xb6, 0x16a: 0xb7, 0x16b: 0xb8, 0x16c: 0xb9, 0x16d: 0xba, 0x16e: 0xbb, 0x16f: 0xbc,
-	0x170: 0xbd, 0x171: 0xbe, 0x172: 0xbf, 0x173: 0xc0, 0x174: 0x23, 0x175: 0x24, 0x176: 0x25, 0x177: 0xc1,
-	0x178: 0x26, 0x179: 0x26, 0x17a: 0x27, 0x17b: 0x26, 0x17c: 0xc2, 0x17d: 0x28, 0x17e: 0x29, 0x17f: 0x2a,
-	// Block 0x6, offset 0x180
-	0x180: 0x2b, 0x181: 0x2c, 0x182: 0x2d, 0x183: 0xc3, 0x184: 0x2e, 0x185: 0x2f, 0x186: 0xc4, 0x187: 0x9b,
-	0x188: 0xc5, 0x189: 0xc6, 0x18a: 0x9b, 0x18b: 0x9b, 0x18c: 0xc7, 0x18d: 0x9b, 0x18e: 0x9b, 0x18f: 0xc8,
-	0x190: 0xc9, 0x191: 0x30, 0x192: 0x31, 0x193: 0x32, 0x194: 0x9b, 0x195: 0x9b, 0x196: 0x9b, 0x197: 0x9b,
-	0x198: 0x9b, 0x199: 0x9b, 0x19a: 0x9b, 0x19b: 0x9b, 0x19c: 0x9b, 0x19d: 0x9b, 0x19e: 0x9b, 0x19f: 0x9b,
-	0x1a0: 0x9b, 0x1a1: 0x9b, 0x1a2: 0x9b, 0x1a3: 0x9b, 0x1a4: 0x9b, 0x1a5: 0x9b, 0x1a6: 0x9b, 0x1a7: 0x9b,
-	0x1a8: 0xca, 0x1a9: 0xcb, 0x1aa: 0x9b, 0x1ab: 0xcc, 0x1ac: 0x9b, 0x1ad: 0xcd, 0x1ae: 0xce, 0x1af: 0xcf,
-	0x1b0: 0xd0, 0x1b1: 0x33, 0x1b2: 0x26, 0x1b3: 0x34, 0x1b4: 0xd1, 0x1b5: 0xd2, 0x1b6: 0xd3, 0x1b7: 0xd4,
-	0x1b8: 0xd5, 0x1b9: 0xd6, 0x1ba: 0xd7, 0x1bb: 0xd8, 0x1bc: 0xd9, 0x1bd: 0xda, 0x1be: 0xdb, 0x1bf: 0x35,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x36, 0x1c1: 0xdc, 0x1c2: 0xdd, 0x1c3: 0xde, 0x1c4: 0xdf, 0x1c5: 0x37, 0x1c6: 0x38, 0x1c7: 0xe0,
-	0x1c8: 0xe1, 0x1c9: 0x39, 0x1ca: 0x3a, 0x1cb: 0x3b, 0x1cc: 0x3c, 0x1cd: 0x3d, 0x1ce: 0x3e, 0x1cf: 0x3f,
-	0x1d0: 0x9d, 0x1d1: 0x9d, 0x1d2: 0x9d, 0x1d3: 0x9d, 0x1d4: 0x9d, 0x1d5: 0x9d, 0x1d6: 0x9d, 0x1d7: 0x9d,
-	0x1d8: 0x9d, 0x1d9: 0x9d, 0x1da: 0x9d, 0x1db: 0x9d, 0x1dc: 0x9d, 0x1dd: 0x9d, 0x1de: 0x9d, 0x1df: 0x9d,
-	0x1e0: 0x9d, 0x1e1: 0x9d, 0x1e2: 0x9d, 0x1e3: 0x9d, 0x1e4: 0x9d, 0x1e5: 0x9d, 0x1e6: 0x9d, 0x1e7: 0x9d,
-	0x1e8: 0x9d, 0x1e9: 0x9d, 0x1ea: 0x9d, 0x1eb: 0x9d, 0x1ec: 0x9d, 0x1ed: 0x9d, 0x1ee: 0x9d, 0x1ef: 0x9d,
-	0x1f0: 0x9d, 0x1f1: 0x9d, 0x1f2: 0x9d, 0x1f3: 0x9d, 0x1f4: 0x9d, 0x1f5: 0x9d, 0x1f6: 0x9d, 0x1f7: 0x9d,
-	0x1f8: 0x9d, 0x1f9: 0x9d, 0x1fa: 0x9d, 0x1fb: 0x9d, 0x1fc: 0x9d, 0x1fd: 0x9d, 0x1fe: 0x9d, 0x1ff: 0x9d,
-	// Block 0x8, offset 0x200
-	0x200: 0x9d, 0x201: 0x9d, 0x202: 0x9d, 0x203: 0x9d, 0x204: 0x9d, 0x205: 0x9d, 0x206: 0x9d, 0x207: 0x9d,
-	0x208: 0x9d, 0x209: 0x9d, 0x20a: 0x9d, 0x20b: 0x9d, 0x20c: 0x9d, 0x20d: 0x9d, 0x20e: 0x9d, 0x20f: 0x9d,
-	0x210: 0x9d, 0x211: 0x9d, 0x212: 0x9d, 0x213: 0x9d, 0x214: 0x9d, 0x215: 0x9d, 0x216: 0x9d, 0x217: 0x9d,
-	0x218: 0x9d, 0x219: 0x9d, 0x21a: 0x9d, 0x21b: 0x9d, 0x21c: 0x9d, 0x21d: 0x9d, 0x21e: 0x9d, 0x21f: 0x9d,
-	0x220: 0x9d, 0x221: 0x9d, 0x222: 0x9d, 0x223: 0x9d, 0x224: 0x9d, 0x225: 0x9d, 0x226: 0x9d, 0x227: 0x9d,
-	0x228: 0x9d, 0x229: 0x9d, 0x22a: 0x9d, 0x22b: 0x9d, 0x22c: 0x9d, 0x22d: 0x9d, 0x22e: 0x9d, 0x22f: 0x9d,
-	0x230: 0x9d, 0x231: 0x9d, 0x232: 0x9d, 0x233: 0x9d, 0x234: 0x9d, 0x235: 0x9d, 0x236: 0xb0, 0x237: 0x9b,
-	0x238: 0x9d, 0x239: 0x9d, 0x23a: 0x9d, 0x23b: 0x9d, 0x23c: 0x9d, 0x23d: 0x9d, 0x23e: 0x9d, 0x23f: 0x9d,
-	// Block 0x9, offset 0x240
-	0x240: 0x9d, 0x241: 0x9d, 0x242: 0x9d, 0x243: 0x9d, 0x244: 0x9d, 0x245: 0x9d, 0x246: 0x9d, 0x247: 0x9d,
-	0x248: 0x9d, 0x249: 0x9d, 0x24a: 0x9d, 0x24b: 0x9d, 0x24c: 0x9d, 0x24d: 0x9d, 0x24e: 0x9d, 0x24f: 0x9d,
-	0x250: 0x9d, 0x251: 0x9d, 0x252: 0x9d, 0x253: 0x9d, 0x254: 0x9d, 0x255: 0x9d, 0x256: 0x9d, 0x257: 0x9d,
-	0x258: 0x9d, 0x259: 0x9d, 0x25a: 0x9d, 0x25b: 0x9d, 0x25c: 0x9d, 0x25d: 0x9d, 0x25e: 0x9d, 0x25f: 0x9d,
-	0x260: 0x9d, 0x261: 0x9d, 0x262: 0x9d, 0x263: 0x9d, 0x264: 0x9d, 0x265: 0x9d, 0x266: 0x9d, 0x267: 0x9d,
-	0x268: 0x9d, 0x269: 0x9d, 0x26a: 0x9d, 0x26b: 0x9d, 0x26c: 0x9d, 0x26d: 0x9d, 0x26e: 0x9d, 0x26f: 0x9d,
-	0x270: 0x9d, 0x271: 0x9d, 0x272: 0x9d, 0x273: 0x9d, 0x274: 0x9d, 0x275: 0x9d, 0x276: 0x9d, 0x277: 0x9d,
-	0x278: 0x9d, 0x279: 0x9d, 0x27a: 0x9d, 0x27b: 0x9d, 0x27c: 0x9d, 0x27d: 0x9d, 0x27e: 0x9d, 0x27f: 0x9d,
-	// Block 0xa, offset 0x280
-	0x280: 0x9d, 0x281: 0x9d, 0x282: 0x9d, 0x283: 0x9d, 0x284: 0x9d, 0x285: 0x9d, 0x286: 0x9d, 0x287: 0x9d,
-	0x288: 0x9d, 0x289: 0x9d, 0x28a: 0x9d, 0x28b: 0x9d, 0x28c: 0x9d, 0x28d: 0x9d, 0x28e: 0x9d, 0x28f: 0x9d,
-	0x290: 0x9d, 0x291: 0x9d, 0x292: 0x9d, 0x293: 0x9d, 0x294: 0x9d, 0x295: 0x9d, 0x296: 0x9d, 0x297: 0x9d,
-	0x298: 0x9d, 0x299: 0x9d, 0x29a: 0x9d, 0x29b: 0x9d, 0x29c: 0x9d, 0x29d: 0x9d, 0x29e: 0x9d, 0x29f: 0x9d,
-	0x2a0: 0x9d, 0x2a1: 0x9d, 0x2a2: 0x9d, 0x2a3: 0x9d, 0x2a4: 0x9d, 0x2a5: 0x9d, 0x2a6: 0x9d, 0x2a7: 0x9d,
-	0x2a8: 0x9d, 0x2a9: 0x9d, 0x2aa: 0x9d, 0x2ab: 0x9d, 0x2ac: 0x9d, 0x2ad: 0x9d, 0x2ae: 0x9d, 0x2af: 0x9d,
-	0x2b0: 0x9d, 0x2b1: 0x9d, 0x2b2: 0x9d, 0x2b3: 0x9d, 0x2b4: 0x9d, 0x2b5: 0x9d, 0x2b6: 0x9d, 0x2b7: 0x9d,
-	0x2b8: 0x9d, 0x2b9: 0x9d, 0x2ba: 0x9d, 0x2bb: 0x9d, 0x2bc: 0x9d, 0x2bd: 0x9d, 0x2be: 0x9d, 0x2bf: 0xe2,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0x9d, 0x2c1: 0x9d, 0x2c2: 0x9d, 0x2c3: 0x9d, 0x2c4: 0x9d, 0x2c5: 0x9d, 0x2c6: 0x9d, 0x2c7: 0x9d,
-	0x2c8: 0x9d, 0x2c9: 0x9d, 0x2ca: 0x9d, 0x2cb: 0x9d, 0x2cc: 0x9d, 0x2cd: 0x9d, 0x2ce: 0x9d, 0x2cf: 0x9d,
-	0x2d0: 0x9d, 0x2d1: 0x9d, 0x2d2: 0xe3, 0x2d3: 0xe4, 0x2d4: 0x9d, 0x2d5: 0x9d, 0x2d6: 0x9d, 0x2d7: 0x9d,
-	0x2d8: 0xe5, 0x2d9: 0x40, 0x2da: 0x41, 0x2db: 0xe6, 0x2dc: 0x42, 0x2dd: 0x43, 0x2de: 0x44, 0x2df: 0xe7,
-	0x2e0: 0xe8, 0x2e1: 0xe9, 0x2e2: 0xea, 0x2e3: 0xeb, 0x2e4: 0xec, 0x2e5: 0xed, 0x2e6: 0xee, 0x2e7: 0xef,
-	0x2e8: 0xf0, 0x2e9: 0xf1, 0x2ea: 0xf2, 0x2eb: 0xf3, 0x2ec: 0xf4, 0x2ed: 0xf5, 0x2ee: 0xf6, 0x2ef: 0xf7,
-	0x2f0: 0x9d, 0x2f1: 0x9d, 0x2f2: 0x9d, 0x2f3: 0x9d, 0x2f4: 0x9d, 0x2f5: 0x9d, 0x2f6: 0x9d, 0x2f7: 0x9d,
-	0x2f8: 0x9d, 0x2f9: 0x9d, 0x2fa: 0x9d, 0x2fb: 0x9d, 0x2fc: 0x9d, 0x2fd: 0x9d, 0x2fe: 0x9d, 0x2ff: 0x9d,
-	// Block 0xc, offset 0x300
-	0x300: 0x9d, 0x301: 0x9d, 0x302: 0x9d, 0x303: 0x9d, 0x304: 0x9d, 0x305: 0x9d, 0x306: 0x9d, 0x307: 0x9d,
-	0x308: 0x9d, 0x309: 0x9d, 0x30a: 0x9d, 0x30b: 0x9d, 0x30c: 0x9d, 0x30d: 0x9d, 0x30e: 0x9d, 0x30f: 0x9d,
-	0x310: 0x9d, 0x311: 0x9d, 0x312: 0x9d, 0x313: 0x9d, 0x314: 0x9d, 0x315: 0x9d, 0x316: 0x9d, 0x317: 0x9d,
-	0x318: 0x9d, 0x319: 0x9d, 0x31a: 0x9d, 0x31b: 0x9d, 0x31c: 0x9d, 0x31d: 0x9d, 0x31e: 0xf8, 0x31f: 0xf9,
-	// Block 0xd, offset 0x340
-	0x340: 0xb8, 0x341: 0xb8, 0x342: 0xb8, 0x343: 0xb8, 0x344: 0xb8, 0x345: 0xb8, 0x346: 0xb8, 0x347: 0xb8,
-	0x348: 0xb8, 0x349: 0xb8, 0x34a: 0xb8, 0x34b: 0xb8, 0x34c: 0xb8, 0x34d: 0xb8, 0x34e: 0xb8, 0x34f: 0xb8,
-	0x350: 0xb8, 0x351: 0xb8, 0x352: 0xb8, 0x353: 0xb8, 0x354: 0xb8, 0x355: 0xb8, 0x356: 0xb8, 0x357: 0xb8,
-	0x358: 0xb8, 0x359: 0xb8, 0x35a: 0xb8, 0x35b: 0xb8, 0x35c: 0xb8, 0x35d: 0xb8, 0x35e: 0xb8, 0x35f: 0xb8,
-	0x360: 0xb8, 0x361: 0xb8, 0x362: 0xb8, 0x363: 0xb8, 0x364: 0xb8, 0x365: 0xb8, 0x366: 0xb8, 0x367: 0xb8,
-	0x368: 0xb8, 0x369: 0xb8, 0x36a: 0xb8, 0x36b: 0xb8, 0x36c: 0xb8, 0x36d: 0xb8, 0x36e: 0xb8, 0x36f: 0xb8,
-	0x370: 0xb8, 0x371: 0xb8, 0x372: 0xb8, 0x373: 0xb8, 0x374: 0xb8, 0x375: 0xb8, 0x376: 0xb8, 0x377: 0xb8,
-	0x378: 0xb8, 0x379: 0xb8, 0x37a: 0xb8, 0x37b: 0xb8, 0x37c: 0xb8, 0x37d: 0xb8, 0x37e: 0xb8, 0x37f: 0xb8,
-	// Block 0xe, offset 0x380
-	0x380: 0xb8, 0x381: 0xb8, 0x382: 0xb8, 0x383: 0xb8, 0x384: 0xb8, 0x385: 0xb8, 0x386: 0xb8, 0x387: 0xb8,
-	0x388: 0xb8, 0x389: 0xb8, 0x38a: 0xb8, 0x38b: 0xb8, 0x38c: 0xb8, 0x38d: 0xb8, 0x38e: 0xb8, 0x38f: 0xb8,
-	0x390: 0xb8, 0x391: 0xb8, 0x392: 0xb8, 0x393: 0xb8, 0x394: 0xb8, 0x395: 0xb8, 0x396: 0xb8, 0x397: 0xb8,
-	0x398: 0xb8, 0x399: 0xb8, 0x39a: 0xb8, 0x39b: 0xb8, 0x39c: 0xb8, 0x39d: 0xb8, 0x39e: 0xb8, 0x39f: 0xb8,
-	0x3a0: 0xb8, 0x3a1: 0xb8, 0x3a2: 0xb8, 0x3a3: 0xb8, 0x3a4: 0xfa, 0x3a5: 0xfb, 0x3a6: 0xfc, 0x3a7: 0xfd,
-	0x3a8: 0x45, 0x3a9: 0xfe, 0x3aa: 0xff, 0x3ab: 0x46, 0x3ac: 0x47, 0x3ad: 0x48, 0x3ae: 0x49, 0x3af: 0x4a,
-	0x3b0: 0x100, 0x3b1: 0x4b, 0x3b2: 0x4c, 0x3b3: 0x4d, 0x3b4: 0x4e, 0x3b5: 0x4f, 0x3b6: 0x101, 0x3b7: 0x50,
-	0x3b8: 0x51, 0x3b9: 0x52, 0x3ba: 0x53, 0x3bb: 0x54, 0x3bc: 0x55, 0x3bd: 0x56, 0x3be: 0x57, 0x3bf: 0x58,
-	// Block 0xf, offset 0x3c0
-	0x3c0: 0x102, 0x3c1: 0x103, 0x3c2: 0x9d, 0x3c3: 0x104, 0x3c4: 0x105, 0x3c5: 0x9b, 0x3c6: 0x106, 0x3c7: 0x107,
-	0x3c8: 0xb8, 0x3c9: 0xb8, 0x3ca: 0x108, 0x3cb: 0x109, 0x3cc: 0x10a, 0x3cd: 0x10b, 0x3ce: 0x10c, 0x3cf: 0x10d,
-	0x3d0: 0x10e, 0x3d1: 0x9d, 0x3d2: 0x10f, 0x3d3: 0x110, 0x3d4: 0x111, 0x3d5: 0x112, 0x3d6: 0xb8, 0x3d7: 0xb8,
-	0x3d8: 0x9d, 0x3d9: 0x9d, 0x3da: 0x9d, 0x3db: 0x9d, 0x3dc: 0x113, 0x3dd: 0x114, 0x3de: 0xb8, 0x3df: 0xb8,
-	0x3e0: 0x115, 0x3e1: 0x116, 0x3e2: 0x117, 0x3e3: 0x118, 0x3e4: 0x119, 0x3e5: 0xb8, 0x3e6: 0x11a, 0x3e7: 0x11b,
-	0x3e8: 0x11c, 0x3e9: 0x11d, 0x3ea: 0x11e, 0x3eb: 0x59, 0x3ec: 0x11f, 0x3ed: 0x120, 0x3ee: 0x5a, 0x3ef: 0xb8,
-	0x3f0: 0x9d, 0x3f1: 0x121, 0x3f2: 0x122, 0x3f3: 0x123, 0x3f4: 0xb8, 0x3f5: 0xb8, 0x3f6: 0xb8, 0x3f7: 0xb8,
-	0x3f8: 0xb8, 0x3f9: 0x124, 0x3fa: 0xb8, 0x3fb: 0xb8, 0x3fc: 0xb8, 0x3fd: 0xb8, 0x3fe: 0xb8, 0x3ff: 0xb8,
-	// Block 0x10, offset 0x400
-	0x400: 0x125, 0x401: 0x126, 0x402: 0x127, 0x403: 0x128, 0x404: 0x129, 0x405: 0x12a, 0x406: 0x12b, 0x407: 0x12c,
-	0x408: 0x12d, 0x409: 0xb8, 0x40a: 0x12e, 0x40b: 0x12f, 0x40c: 0x5b, 0x40d: 0x5c, 0x40e: 0xb8, 0x40f: 0xb8,
-	0x410: 0x130, 0x411: 0x131, 0x412: 0x132, 0x413: 0x133, 0x414: 0xb8, 0x415: 0xb8, 0x416: 0x134, 0x417: 0x135,
-	0x418: 0x136, 0x419: 0x137, 0x41a: 0x138, 0x41b: 0x139, 0x41c: 0x13a, 0x41d: 0xb8, 0x41e: 0xb8, 0x41f: 0xb8,
-	0x420: 0xb8, 0x421: 0xb8, 0x422: 0x13b, 0x423: 0x13c, 0x424: 0xb8, 0x425: 0xb8, 0x426: 0xb8, 0x427: 0xb8,
-	0x428: 0xb8, 0x429: 0xb8, 0x42a: 0xb8, 0x42b: 0x13d, 0x42c: 0xb8, 0x42d: 0xb8, 0x42e: 0xb8, 0x42f: 0xb8,
-	0x430: 0x13e, 0x431: 0x13f, 0x432: 0x140, 0x433: 0xb8, 0x434: 0xb8, 0x435: 0xb8, 0x436: 0xb8, 0x437: 0xb8,
-	0x438: 0xb8, 0x439: 0xb8, 0x43a: 0xb8, 0x43b: 0xb8, 0x43c: 0xb8, 0x43d: 0xb8, 0x43e: 0xb8, 0x43f: 0xb8,
-	// Block 0x11, offset 0x440
-	0x440: 0x9d, 0x441: 0x9d, 0x442: 0x9d, 0x443: 0x9d, 0x444: 0x9d, 0x445: 0x9d, 0x446: 0x9d, 0x447: 0x9d,
-	0x448: 0x9d, 0x449: 0x9d, 0x44a: 0x9d, 0x44b: 0x9d, 0x44c: 0x9d, 0x44d: 0x9d, 0x44e: 0x141, 0x44f: 0xb8,
-	0x450: 0x9b, 0x451: 0x142, 0x452: 0x9d, 0x453: 0x9d, 0x454: 0x9d, 0x455: 0x143, 0x456: 0xb8, 0x457: 0xb8,
-	0x458: 0xb8, 0x459: 0xb8, 0x45a: 0xb8, 0x45b: 0xb8, 0x45c: 0xb8, 0x45d: 0xb8, 0x45e: 0xb8, 0x45f: 0xb8,
-	0x460: 0xb8, 0x461: 0xb8, 0x462: 0xb8, 0x463: 0xb8, 0x464: 0xb8, 0x465: 0xb8, 0x466: 0xb8, 0x467: 0xb8,
-	0x468: 0xb8, 0x469: 0xb8, 0x46a: 0xb8, 0x46b: 0xb8, 0x46c: 0xb8, 0x46d: 0xb8, 0x46e: 0xb8, 0x46f: 0xb8,
-	0x470: 0xb8, 0x471: 0xb8, 0x472: 0xb8, 0x473: 0xb8, 0x474: 0xb8, 0x475: 0xb8, 0x476: 0xb8, 0x477: 0xb8,
-	0x478: 0xb8, 0x479: 0xb8, 0x47a: 0xb8, 0x47b: 0xb8, 0x47c: 0xb8, 0x47d: 0xb8, 0x47e: 0xb8, 0x47f: 0xb8,
-	// Block 0x12, offset 0x480
-	0x480: 0x9d, 0x481: 0x9d, 0x482: 0x9d, 0x483: 0x9d, 0x484: 0x9d, 0x485: 0x9d, 0x486: 0x9d, 0x487: 0x9d,
-	0x488: 0x9d, 0x489: 0x9d, 0x48a: 0x9d, 0x48b: 0x9d, 0x48c: 0x9d, 0x48d: 0x9d, 0x48e: 0x9d, 0x48f: 0x9d,
-	0x490: 0x144, 0x491: 0xb8, 0x492: 0xb8, 0x493: 0xb8, 0x494: 0xb8, 0x495: 0xb8, 0x496: 0xb8, 0x497: 0xb8,
-	0x498: 0xb8, 0x499: 0xb8, 0x49a: 0xb8, 0x49b: 0xb8, 0x49c: 0xb8, 0x49d: 0xb8, 0x49e: 0xb8, 0x49f: 0xb8,
-	0x4a0: 0xb8, 0x4a1: 0xb8, 0x4a2: 0xb8, 0x4a3: 0xb8, 0x4a4: 0xb8, 0x4a5: 0xb8, 0x4a6: 0xb8, 0x4a7: 0xb8,
-	0x4a8: 0xb8, 0x4a9: 0xb8, 0x4aa: 0xb8, 0x4ab: 0xb8, 0x4ac: 0xb8, 0x4ad: 0xb8, 0x4ae: 0xb8, 0x4af: 0xb8,
-	0x4b0: 0xb8, 0x4b1: 0xb8, 0x4b2: 0xb8, 0x4b3: 0xb8, 0x4b4: 0xb8, 0x4b5: 0xb8, 0x4b6: 0xb8, 0x4b7: 0xb8,
-	0x4b8: 0xb8, 0x4b9: 0xb8, 0x4ba: 0xb8, 0x4bb: 0xb8, 0x4bc: 0xb8, 0x4bd: 0xb8, 0x4be: 0xb8, 0x4bf: 0xb8,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0xb8, 0x4c1: 0xb8, 0x4c2: 0xb8, 0x4c3: 0xb8, 0x4c4: 0xb8, 0x4c5: 0xb8, 0x4c6: 0xb8, 0x4c7: 0xb8,
-	0x4c8: 0xb8, 0x4c9: 0xb8, 0x4ca: 0xb8, 0x4cb: 0xb8, 0x4cc: 0xb8, 0x4cd: 0xb8, 0x4ce: 0xb8, 0x4cf: 0xb8,
-	0x4d0: 0x9d, 0x4d1: 0x9d, 0x4d2: 0x9d, 0x4d3: 0x9d, 0x4d4: 0x9d, 0x4d5: 0x9d, 0x4d6: 0x9d, 0x4d7: 0x9d,
-	0x4d8: 0x9d, 0x4d9: 0x145, 0x4da: 0xb8, 0x4db: 0xb8, 0x4dc: 0xb8, 0x4dd: 0xb8, 0x4de: 0xb8, 0x4df: 0xb8,
-	0x4e0: 0xb8, 0x4e1: 0xb8, 0x4e2: 0xb8, 0x4e3: 0xb8, 0x4e4: 0xb8, 0x4e5: 0xb8, 0x4e6: 0xb8, 0x4e7: 0xb8,
-	0x4e8: 0xb8, 0x4e9: 0xb8, 0x4ea: 0xb8, 0x4eb: 0xb8, 0x4ec: 0xb8, 0x4ed: 0xb8, 0x4ee: 0xb8, 0x4ef: 0xb8,
-	0x4f0: 0xb8, 0x4f1: 0xb8, 0x4f2: 0xb8, 0x4f3: 0xb8, 0x4f4: 0xb8, 0x4f5: 0xb8, 0x4f6: 0xb8, 0x4f7: 0xb8,
-	0x4f8: 0xb8, 0x4f9: 0xb8, 0x4fa: 0xb8, 0x4fb: 0xb8, 0x4fc: 0xb8, 0x4fd: 0xb8, 0x4fe: 0xb8, 0x4ff: 0xb8,
-	// Block 0x14, offset 0x500
-	0x500: 0xb8, 0x501: 0xb8, 0x502: 0xb8, 0x503: 0xb8, 0x504: 0xb8, 0x505: 0xb8, 0x506: 0xb8, 0x507: 0xb8,
-	0x508: 0xb8, 0x509: 0xb8, 0x50a: 0xb8, 0x50b: 0xb8, 0x50c: 0xb8, 0x50d: 0xb8, 0x50e: 0xb8, 0x50f: 0xb8,
-	0x510: 0xb8, 0x511: 0xb8, 0x512: 0xb8, 0x513: 0xb8, 0x514: 0xb8, 0x515: 0xb8, 0x516: 0xb8, 0x517: 0xb8,
-	0x518: 0xb8, 0x519: 0xb8, 0x51a: 0xb8, 0x51b: 0xb8, 0x51c: 0xb8, 0x51d: 0xb8, 0x51e: 0xb8, 0x51f: 0xb8,
-	0x520: 0x9d, 0x521: 0x9d, 0x522: 0x9d, 0x523: 0x9d, 0x524: 0x9d, 0x525: 0x9d, 0x526: 0x9d, 0x527: 0x9d,
-	0x528: 0x13d, 0x529: 0x146, 0x52a: 0xb8, 0x52b: 0x147, 0x52c: 0x148, 0x52d: 0x149, 0x52e: 0x14a, 0x52f: 0xb8,
-	0x530: 0xb8, 0x531: 0xb8, 0x532: 0xb8, 0x533: 0xb8, 0x534: 0xb8, 0x535: 0xb8, 0x536: 0xb8, 0x537: 0xb8,
-	0x538: 0xb8, 0x539: 0xb8, 0x53a: 0xb8, 0x53b: 0xb8, 0x53c: 0x9d, 0x53d: 0x14b, 0x53e: 0x14c, 0x53f: 0x14d,
-	// Block 0x15, offset 0x540
-	0x540: 0x9d, 0x541: 0x9d, 0x542: 0x9d, 0x543: 0x9d, 0x544: 0x9d, 0x545: 0x9d, 0x546: 0x9d, 0x547: 0x9d,
-	0x548: 0x9d, 0x549: 0x9d, 0x54a: 0x9d, 0x54b: 0x9d, 0x54c: 0x9d, 0x54d: 0x9d, 0x54e: 0x9d, 0x54f: 0x9d,
-	0x550: 0x9d, 0x551: 0x9d, 0x552: 0x9d, 0x553: 0x9d, 0x554: 0x9d, 0x555: 0x9d, 0x556: 0x9d, 0x557: 0x9d,
-	0x558: 0x9d, 0x559: 0x9d, 0x55a: 0x9d, 0x55b: 0x9d, 0x55c: 0x9d, 0x55d: 0x9d, 0x55e: 0x9d, 0x55f: 0x14e,
-	0x560: 0x9d, 0x561: 0x9d, 0x562: 0x9d, 0x563: 0x9d, 0x564: 0x9d, 0x565: 0x9d, 0x566: 0x9d, 0x567: 0x9d,
-	0x568: 0x9d, 0x569: 0x9d, 0x56a: 0x9d, 0x56b: 0x14f, 0x56c: 0xb8, 0x56d: 0xb8, 0x56e: 0xb8, 0x56f: 0xb8,
-	0x570: 0xb8, 0x571: 0xb8, 0x572: 0xb8, 0x573: 0xb8, 0x574: 0xb8, 0x575: 0xb8, 0x576: 0xb8, 0x577: 0xb8,
-	0x578: 0xb8, 0x579: 0xb8, 0x57a: 0xb8, 0x57b: 0xb8, 0x57c: 0xb8, 0x57d: 0xb8, 0x57e: 0xb8, 0x57f: 0xb8,
-	// Block 0x16, offset 0x580
-	0x580: 0x150, 0x581: 0xb8, 0x582: 0xb8, 0x583: 0xb8, 0x584: 0xb8, 0x585: 0xb8, 0x586: 0xb8, 0x587: 0xb8,
-	0x588: 0xb8, 0x589: 0xb8, 0x58a: 0xb8, 0x58b: 0xb8, 0x58c: 0xb8, 0x58d: 0xb8, 0x58e: 0xb8, 0x58f: 0xb8,
-	0x590: 0xb8, 0x591: 0xb8, 0x592: 0xb8, 0x593: 0xb8, 0x594: 0xb8, 0x595: 0xb8, 0x596: 0xb8, 0x597: 0xb8,
-	0x598: 0xb8, 0x599: 0xb8, 0x59a: 0xb8, 0x59b: 0xb8, 0x59c: 0xb8, 0x59d: 0xb8, 0x59e: 0xb8, 0x59f: 0xb8,
-	0x5a0: 0xb8, 0x5a1: 0xb8, 0x5a2: 0xb8, 0x5a3: 0xb8, 0x5a4: 0xb8, 0x5a5: 0xb8, 0x5a6: 0xb8, 0x5a7: 0xb8,
-	0x5a8: 0xb8, 0x5a9: 0xb8, 0x5aa: 0xb8, 0x5ab: 0xb8, 0x5ac: 0xb8, 0x5ad: 0xb8, 0x5ae: 0xb8, 0x5af: 0xb8,
-	0x5b0: 0x9d, 0x5b1: 0x151, 0x5b2: 0x152, 0x5b3: 0xb8, 0x5b4: 0xb8, 0x5b5: 0xb8, 0x5b6: 0xb8, 0x5b7: 0xb8,
-	0x5b8: 0xb8, 0x5b9: 0xb8, 0x5ba: 0xb8, 0x5bb: 0xb8, 0x5bc: 0xb8, 0x5bd: 0xb8, 0x5be: 0xb8, 0x5bf: 0xb8,
-	// Block 0x17, offset 0x5c0
-	0x5c0: 0x9b, 0x5c1: 0x9b, 0x5c2: 0x9b, 0x5c3: 0x153, 0x5c4: 0x154, 0x5c5: 0x155, 0x5c6: 0x156, 0x5c7: 0x157,
-	0x5c8: 0x9b, 0x5c9: 0x158, 0x5ca: 0xb8, 0x5cb: 0xb8, 0x5cc: 0x9b, 0x5cd: 0x159, 0x5ce: 0xb8, 0x5cf: 0xb8,
-	0x5d0: 0x5d, 0x5d1: 0x5e, 0x5d2: 0x5f, 0x5d3: 0x60, 0x5d4: 0x61, 0x5d5: 0x62, 0x5d6: 0x63, 0x5d7: 0x64,
-	0x5d8: 0x65, 0x5d9: 0x66, 0x5da: 0x67, 0x5db: 0x68, 0x5dc: 0x69, 0x5dd: 0x6a, 0x5de: 0x6b, 0x5df: 0x6c,
-	0x5e0: 0x9b, 0x5e1: 0x9b, 0x5e2: 0x9b, 0x5e3: 0x9b, 0x5e4: 0x9b, 0x5e5: 0x9b, 0x5e6: 0x9b, 0x5e7: 0x9b,
-	0x5e8: 0x15a, 0x5e9: 0x15b, 0x5ea: 0x15c, 0x5eb: 0xb8, 0x5ec: 0xb8, 0x5ed: 0xb8, 0x5ee: 0xb8, 0x5ef: 0xb8,
-	0x5f0: 0xb8, 0x5f1: 0xb8, 0x5f2: 0xb8, 0x5f3: 0xb8, 0x5f4: 0xb8, 0x5f5: 0xb8, 0x5f6: 0xb8, 0x5f7: 0xb8,
-	0x5f8: 0xb8, 0x5f9: 0xb8, 0x5fa: 0xb8, 0x5fb: 0xb8, 0x5fc: 0xb8, 0x5fd: 0xb8, 0x5fe: 0xb8, 0x5ff: 0xb8,
-	// Block 0x18, offset 0x600
-	0x600: 0x15d, 0x601: 0xb8, 0x602: 0xb8, 0x603: 0xb8, 0x604: 0xb8, 0x605: 0xb8, 0x606: 0xb8, 0x607: 0xb8,
-	0x608: 0xb8, 0x609: 0xb8, 0x60a: 0xb8, 0x60b: 0xb8, 0x60c: 0xb8, 0x60d: 0xb8, 0x60e: 0xb8, 0x60f: 0xb8,
-	0x610: 0xb8, 0x611: 0xb8, 0x612: 0xb8, 0x613: 0xb8, 0x614: 0xb8, 0x615: 0xb8, 0x616: 0xb8, 0x617: 0xb8,
-	0x618: 0xb8, 0x619: 0xb8, 0x61a: 0xb8, 0x61b: 0xb8, 0x61c: 0xb8, 0x61d: 0xb8, 0x61e: 0xb8, 0x61f: 0xb8,
-	0x620: 0x9d, 0x621: 0x9d, 0x622: 0x9d, 0x623: 0x15e, 0x624: 0x6d, 0x625: 0x15f, 0x626: 0xb8, 0x627: 0xb8,
-	0x628: 0xb8, 0x629: 0xb8, 0x62a: 0xb8, 0x62b: 0xb8, 0x62c: 0xb8, 0x62d: 0xb8, 0x62e: 0xb8, 0x62f: 0xb8,
-	0x630: 0xb8, 0x631: 0xb8, 0x632: 0xb8, 0x633: 0xb8, 0x634: 0xb8, 0x635: 0xb8, 0x636: 0xb8, 0x637: 0xb8,
-	0x638: 0x6e, 0x639: 0x6f, 0x63a: 0x70, 0x63b: 0x160, 0x63c: 0xb8, 0x63d: 0xb8, 0x63e: 0xb8, 0x63f: 0xb8,
-	// Block 0x19, offset 0x640
-	0x640: 0x161, 0x641: 0x9b, 0x642: 0x162, 0x643: 0x163, 0x644: 0x71, 0x645: 0x72, 0x646: 0x164, 0x647: 0x165,
-	0x648: 0x73, 0x649: 0x166, 0x64a: 0xb8, 0x64b: 0xb8, 0x64c: 0x9b, 0x64d: 0x9b, 0x64e: 0x9b, 0x64f: 0x9b,
-	0x650: 0x9b, 0x651: 0x9b, 0x652: 0x9b, 0x653: 0x9b, 0x654: 0x9b, 0x655: 0x9b, 0x656: 0x9b, 0x657: 0x9b,
-	0x658: 0x9b, 0x659: 0x9b, 0x65a: 0x9b, 0x65b: 0x167, 0x65c: 0x9b, 0x65d: 0x168, 0x65e: 0x9b, 0x65f: 0x169,
-	0x660: 0x16a, 0x661: 0x16b, 0x662: 0x16c, 0x663: 0xb8, 0x664: 0x16d, 0x665: 0x16e, 0x666: 0x16f, 0x667: 0x170,
-	0x668: 0xb8, 0x669: 0xb8, 0x66a: 0xb8, 0x66b: 0xb8, 0x66c: 0xb8, 0x66d: 0xb8, 0x66e: 0xb8, 0x66f: 0xb8,
-	0x670: 0xb8, 0x671: 0xb8, 0x672: 0xb8, 0x673: 0xb8, 0x674: 0xb8, 0x675: 0xb8, 0x676: 0xb8, 0x677: 0xb8,
-	0x678: 0xb8, 0x679: 0xb8, 0x67a: 0xb8, 0x67b: 0xb8, 0x67c: 0xb8, 0x67d: 0xb8, 0x67e: 0xb8, 0x67f: 0xb8,
-	// Block 0x1a, offset 0x680
-	0x680: 0x9d, 0x681: 0x9d, 0x682: 0x9d, 0x683: 0x9d, 0x684: 0x9d, 0x685: 0x9d, 0x686: 0x9d, 0x687: 0x9d,
-	0x688: 0x9d, 0x689: 0x9d, 0x68a: 0x9d, 0x68b: 0x9d, 0x68c: 0x9d, 0x68d: 0x9d, 0x68e: 0x9d, 0x68f: 0x9d,
-	0x690: 0x9d, 0x691: 0x9d, 0x692: 0x9d, 0x693: 0x9d, 0x694: 0x9d, 0x695: 0x9d, 0x696: 0x9d, 0x697: 0x9d,
-	0x698: 0x9d, 0x699: 0x9d, 0x69a: 0x9d, 0x69b: 0x171, 0x69c: 0x9d, 0x69d: 0x9d, 0x69e: 0x9d, 0x69f: 0x9d,
-	0x6a0: 0x9d, 0x6a1: 0x9d, 0x6a2: 0x9d, 0x6a3: 0x9d, 0x6a4: 0x9d, 0x6a5: 0x9d, 0x6a6: 0x9d, 0x6a7: 0x9d,
-	0x6a8: 0x9d, 0x6a9: 0x9d, 0x6aa: 0x9d, 0x6ab: 0x9d, 0x6ac: 0x9d, 0x6ad: 0x9d, 0x6ae: 0x9d, 0x6af: 0x9d,
-	0x6b0: 0x9d, 0x6b1: 0x9d, 0x6b2: 0x9d, 0x6b3: 0x9d, 0x6b4: 0x9d, 0x6b5: 0x9d, 0x6b6: 0x9d, 0x6b7: 0x9d,
-	0x6b8: 0x9d, 0x6b9: 0x9d, 0x6ba: 0x9d, 0x6bb: 0x9d, 0x6bc: 0x9d, 0x6bd: 0x9d, 0x6be: 0x9d, 0x6bf: 0x9d,
-	// Block 0x1b, offset 0x6c0
-	0x6c0: 0x9d, 0x6c1: 0x9d, 0x6c2: 0x9d, 0x6c3: 0x9d, 0x6c4: 0x9d, 0x6c5: 0x9d, 0x6c6: 0x9d, 0x6c7: 0x9d,
-	0x6c8: 0x9d, 0x6c9: 0x9d, 0x6ca: 0x9d, 0x6cb: 0x9d, 0x6cc: 0x9d, 0x6cd: 0x9d, 0x6ce: 0x9d, 0x6cf: 0x9d,
-	0x6d0: 0x9d, 0x6d1: 0x9d, 0x6d2: 0x9d, 0x6d3: 0x9d, 0x6d4: 0x9d, 0x6d5: 0x9d, 0x6d6: 0x9d, 0x6d7: 0x9d,
-	0x6d8: 0x9d, 0x6d9: 0x9d, 0x6da: 0x9d, 0x6db: 0x9d, 0x6dc: 0x172, 0x6dd: 0x9d, 0x6de: 0x9d, 0x6df: 0x9d,
-	0x6e0: 0x173, 0x6e1: 0x9d, 0x6e2: 0x9d, 0x6e3: 0x9d, 0x6e4: 0x9d, 0x6e5: 0x9d, 0x6e6: 0x9d, 0x6e7: 0x9d,
-	0x6e8: 0x9d, 0x6e9: 0x9d, 0x6ea: 0x9d, 0x6eb: 0x9d, 0x6ec: 0x9d, 0x6ed: 0x9d, 0x6ee: 0x9d, 0x6ef: 0x9d,
-	0x6f0: 0x9d, 0x6f1: 0x9d, 0x6f2: 0x9d, 0x6f3: 0x9d, 0x6f4: 0x9d, 0x6f5: 0x9d, 0x6f6: 0x9d, 0x6f7: 0x9d,
-	0x6f8: 0x9d, 0x6f9: 0x9d, 0x6fa: 0x9d, 0x6fb: 0x9d, 0x6fc: 0x9d, 0x6fd: 0x9d, 0x6fe: 0x9d, 0x6ff: 0x9d,
-	// Block 0x1c, offset 0x700
-	0x700: 0x9d, 0x701: 0x9d, 0x702: 0x9d, 0x703: 0x9d, 0x704: 0x9d, 0x705: 0x9d, 0x706: 0x9d, 0x707: 0x9d,
-	0x708: 0x9d, 0x709: 0x9d, 0x70a: 0x9d, 0x70b: 0x9d, 0x70c: 0x9d, 0x70d: 0x9d, 0x70e: 0x9d, 0x70f: 0x9d,
-	0x710: 0x9d, 0x711: 0x9d, 0x712: 0x9d, 0x713: 0x9d, 0x714: 0x9d, 0x715: 0x9d, 0x716: 0x9d, 0x717: 0x9d,
-	0x718: 0x9d, 0x719: 0x9d, 0x71a: 0x9d, 0x71b: 0x9d, 0x71c: 0x9d, 0x71d: 0x9d, 0x71e: 0x9d, 0x71f: 0x9d,
-	0x720: 0x9d, 0x721: 0x9d, 0x722: 0x9d, 0x723: 0x9d, 0x724: 0x9d, 0x725: 0x9d, 0x726: 0x9d, 0x727: 0x9d,
-	0x728: 0x9d, 0x729: 0x9d, 0x72a: 0x9d, 0x72b: 0x9d, 0x72c: 0x9d, 0x72d: 0x9d, 0x72e: 0x9d, 0x72f: 0x9d,
-	0x730: 0x9d, 0x731: 0x9d, 0x732: 0x9d, 0x733: 0x9d, 0x734: 0x9d, 0x735: 0x9d, 0x736: 0x9d, 0x737: 0x9d,
-	0x738: 0x9d, 0x739: 0x9d, 0x73a: 0x174, 0x73b: 0xb8, 0x73c: 0xb8, 0x73d: 0xb8, 0x73e: 0xb8, 0x73f: 0xb8,
-	// Block 0x1d, offset 0x740
-	0x740: 0xb8, 0x741: 0xb8, 0x742: 0xb8, 0x743: 0xb8, 0x744: 0xb8, 0x745: 0xb8, 0x746: 0xb8, 0x747: 0xb8,
-	0x748: 0xb8, 0x749: 0xb8, 0x74a: 0xb8, 0x74b: 0xb8, 0x74c: 0xb8, 0x74d: 0xb8, 0x74e: 0xb8, 0x74f: 0xb8,
-	0x750: 0xb8, 0x751: 0xb8, 0x752: 0xb8, 0x753: 0xb8, 0x754: 0xb8, 0x755: 0xb8, 0x756: 0xb8, 0x757: 0xb8,
-	0x758: 0xb8, 0x759: 0xb8, 0x75a: 0xb8, 0x75b: 0xb8, 0x75c: 0xb8, 0x75d: 0xb8, 0x75e: 0xb8, 0x75f: 0xb8,
-	0x760: 0x74, 0x761: 0x75, 0x762: 0x76, 0x763: 0x175, 0x764: 0x77, 0x765: 0x78, 0x766: 0x176, 0x767: 0x79,
-	0x768: 0x7a, 0x769: 0xb8, 0x76a: 0xb8, 0x76b: 0xb8, 0x76c: 0xb8, 0x76d: 0xb8, 0x76e: 0xb8, 0x76f: 0xb8,
-	0x770: 0xb8, 0x771: 0xb8, 0x772: 0xb8, 0x773: 0xb8, 0x774: 0xb8, 0x775: 0xb8, 0x776: 0xb8, 0x777: 0xb8,
-	0x778: 0xb8, 0x779: 0xb8, 0x77a: 0xb8, 0x77b: 0xb8, 0x77c: 0xb8, 0x77d: 0xb8, 0x77e: 0xb8, 0x77f: 0xb8,
-	// Block 0x1e, offset 0x780
-	0x790: 0x0d, 0x791: 0x0e, 0x792: 0x0f, 0x793: 0x10, 0x794: 0x11, 0x795: 0x0b, 0x796: 0x12, 0x797: 0x07,
-	0x798: 0x13, 0x799: 0x0b, 0x79a: 0x0b, 0x79b: 0x14, 0x79c: 0x0b, 0x79d: 0x15, 0x79e: 0x16, 0x79f: 0x17,
-	0x7a0: 0x07, 0x7a1: 0x07, 0x7a2: 0x07, 0x7a3: 0x07, 0x7a4: 0x07, 0x7a5: 0x07, 0x7a6: 0x07, 0x7a7: 0x07,
-	0x7a8: 0x07, 0x7a9: 0x07, 0x7aa: 0x18, 0x7ab: 0x19, 0x7ac: 0x1a, 0x7ad: 0x0b, 0x7ae: 0x0b, 0x7af: 0x1b,
-	0x7b0: 0x0b, 0x7b1: 0x0b, 0x7b2: 0x0b, 0x7b3: 0x0b, 0x7b4: 0x0b, 0x7b5: 0x0b, 0x7b6: 0x0b, 0x7b7: 0x0b,
-	0x7b8: 0x0b, 0x7b9: 0x0b, 0x7ba: 0x0b, 0x7bb: 0x0b, 0x7bc: 0x0b, 0x7bd: 0x0b, 0x7be: 0x0b, 0x7bf: 0x0b,
-	// Block 0x1f, offset 0x7c0
-	0x7c0: 0x0b, 0x7c1: 0x0b, 0x7c2: 0x0b, 0x7c3: 0x0b, 0x7c4: 0x0b, 0x7c5: 0x0b, 0x7c6: 0x0b, 0x7c7: 0x0b,
-	0x7c8: 0x0b, 0x7c9: 0x0b, 0x7ca: 0x0b, 0x7cb: 0x0b, 0x7cc: 0x0b, 0x7cd: 0x0b, 0x7ce: 0x0b, 0x7cf: 0x0b,
-	0x7d0: 0x0b, 0x7d1: 0x0b, 0x7d2: 0x0b, 0x7d3: 0x0b, 0x7d4: 0x0b, 0x7d5: 0x0b, 0x7d6: 0x0b, 0x7d7: 0x0b,
-	0x7d8: 0x0b, 0x7d9: 0x0b, 0x7da: 0x0b, 0x7db: 0x0b, 0x7dc: 0x0b, 0x7dd: 0x0b, 0x7de: 0x0b, 0x7df: 0x0b,
-	0x7e0: 0x0b, 0x7e1: 0x0b, 0x7e2: 0x0b, 0x7e3: 0x0b, 0x7e4: 0x0b, 0x7e5: 0x0b, 0x7e6: 0x0b, 0x7e7: 0x0b,
-	0x7e8: 0x0b, 0x7e9: 0x0b, 0x7ea: 0x0b, 0x7eb: 0x0b, 0x7ec: 0x0b, 0x7ed: 0x0b, 0x7ee: 0x0b, 0x7ef: 0x0b,
-	0x7f0: 0x0b, 0x7f1: 0x0b, 0x7f2: 0x0b, 0x7f3: 0x0b, 0x7f4: 0x0b, 0x7f5: 0x0b, 0x7f6: 0x0b, 0x7f7: 0x0b,
-	0x7f8: 0x0b, 0x7f9: 0x0b, 0x7fa: 0x0b, 0x7fb: 0x0b, 0x7fc: 0x0b, 0x7fd: 0x0b, 0x7fe: 0x0b, 0x7ff: 0x0b,
-	// Block 0x20, offset 0x800
-	0x800: 0x177, 0x801: 0x178, 0x802: 0xb8, 0x803: 0xb8, 0x804: 0x179, 0x805: 0x179, 0x806: 0x179, 0x807: 0x17a,
-	0x808: 0xb8, 0x809: 0xb8, 0x80a: 0xb8, 0x80b: 0xb8, 0x80c: 0xb8, 0x80d: 0xb8, 0x80e: 0xb8, 0x80f: 0xb8,
-	0x810: 0xb8, 0x811: 0xb8, 0x812: 0xb8, 0x813: 0xb8, 0x814: 0xb8, 0x815: 0xb8, 0x816: 0xb8, 0x817: 0xb8,
-	0x818: 0xb8, 0x819: 0xb8, 0x81a: 0xb8, 0x81b: 0xb8, 0x81c: 0xb8, 0x81d: 0xb8, 0x81e: 0xb8, 0x81f: 0xb8,
-	0x820: 0xb8, 0x821: 0xb8, 0x822: 0xb8, 0x823: 0xb8, 0x824: 0xb8, 0x825: 0xb8, 0x826: 0xb8, 0x827: 0xb8,
-	0x828: 0xb8, 0x829: 0xb8, 0x82a: 0xb8, 0x82b: 0xb8, 0x82c: 0xb8, 0x82d: 0xb8, 0x82e: 0xb8, 0x82f: 0xb8,
-	0x830: 0xb8, 0x831: 0xb8, 0x832: 0xb8, 0x833: 0xb8, 0x834: 0xb8, 0x835: 0xb8, 0x836: 0xb8, 0x837: 0xb8,
-	0x838: 0xb8, 0x839: 0xb8, 0x83a: 0xb8, 0x83b: 0xb8, 0x83c: 0xb8, 0x83d: 0xb8, 0x83e: 0xb8, 0x83f: 0xb8,
-	// Block 0x21, offset 0x840
-	0x840: 0x0b, 0x841: 0x0b, 0x842: 0x0b, 0x843: 0x0b, 0x844: 0x0b, 0x845: 0x0b, 0x846: 0x0b, 0x847: 0x0b,
-	0x848: 0x0b, 0x849: 0x0b, 0x84a: 0x0b, 0x84b: 0x0b, 0x84c: 0x0b, 0x84d: 0x0b, 0x84e: 0x0b, 0x84f: 0x0b,
-	0x850: 0x0b, 0x851: 0x0b, 0x852: 0x0b, 0x853: 0x0b, 0x854: 0x0b, 0x855: 0x0b, 0x856: 0x0b, 0x857: 0x0b,
-	0x858: 0x0b, 0x859: 0x0b, 0x85a: 0x0b, 0x85b: 0x0b, 0x85c: 0x0b, 0x85d: 0x0b, 0x85e: 0x0b, 0x85f: 0x0b,
-	0x860: 0x1e, 0x861: 0x0b, 0x862: 0x0b, 0x863: 0x0b, 0x864: 0x0b, 0x865: 0x0b, 0x866: 0x0b, 0x867: 0x0b,
-	0x868: 0x0b, 0x869: 0x0b, 0x86a: 0x0b, 0x86b: 0x0b, 0x86c: 0x0b, 0x86d: 0x0b, 0x86e: 0x0b, 0x86f: 0x0b,
-	0x870: 0x0b, 0x871: 0x0b, 0x872: 0x0b, 0x873: 0x0b, 0x874: 0x0b, 0x875: 0x0b, 0x876: 0x0b, 0x877: 0x0b,
-	0x878: 0x0b, 0x879: 0x0b, 0x87a: 0x0b, 0x87b: 0x0b, 0x87c: 0x0b, 0x87d: 0x0b, 0x87e: 0x0b, 0x87f: 0x0b,
-	// Block 0x22, offset 0x880
-	0x880: 0x0b, 0x881: 0x0b, 0x882: 0x0b, 0x883: 0x0b, 0x884: 0x0b, 0x885: 0x0b, 0x886: 0x0b, 0x887: 0x0b,
-	0x888: 0x0b, 0x889: 0x0b, 0x88a: 0x0b, 0x88b: 0x0b, 0x88c: 0x0b, 0x88d: 0x0b, 0x88e: 0x0b, 0x88f: 0x0b,
-}
-
-// idnaSparseOffset: 256 entries, 512 bytes
-var idnaSparseOffset = []uint16{0x0, 0x8, 0x19, 0x25, 0x27, 0x2c, 0x34, 0x3f, 0x4b, 0x5c, 0x60, 0x6f, 0x74, 0x7b, 0x87, 0x95, 0xa3, 0xa8, 0xb1, 0xc1, 0xcf, 0xdc, 0xe8, 0xf9, 0x103, 0x10a, 0x117, 0x128, 0x12f, 0x13a, 0x149, 0x157, 0x161, 0x163, 0x167, 0x169, 0x175, 0x180, 0x188, 0x18e, 0x194, 0x199, 0x19e, 0x1a1, 0x1a5, 0x1ab, 0x1b0, 0x1bc, 0x1c6, 0x1cc, 0x1dd, 0x1e7, 0x1ea, 0x1f2, 0x1f5, 0x202, 0x20a, 0x20e, 0x215, 0x21d, 0x22d, 0x239, 0x23b, 0x245, 0x251, 0x25d, 0x269, 0x271, 0x276, 0x280, 0x291, 0x295, 0x2a0, 0x2a4, 0x2ad, 0x2b5, 0x2bb, 0x2c0, 0x2c3, 0x2c6, 0x2ca, 0x2d0, 0x2d4, 0x2d8, 0x2de, 0x2e5, 0x2eb, 0x2f3, 0x2fa, 0x305, 0x30f, 0x313, 0x316, 0x31c, 0x320, 0x322, 0x325, 0x327, 0x32a, 0x334, 0x337, 0x346, 0x34a, 0x34f, 0x352, 0x356, 0x35b, 0x360, 0x366, 0x36c, 0x37b, 0x381, 0x385, 0x394, 0x399, 0x3a1, 0x3ab, 0x3b6, 0x3be, 0x3cf, 0x3d8, 0x3e8, 0x3f5, 0x3ff, 0x404, 0x411, 0x415, 0x41a, 0x41c, 0x420, 0x422, 0x426, 0x42f, 0x435, 0x439, 0x449, 0x453, 0x458, 0x45b, 0x461, 0x468, 0x46d, 0x471, 0x477, 0x47c, 0x485, 0x48a, 0x490, 0x497, 0x49e, 0x4a5, 0x4a9, 0x4ae, 0x4b1, 0x4b6, 0x4c2, 0x4c8, 0x4cd, 0x4d4, 0x4dc, 0x4e1, 0x4e5, 0x4f5, 0x4fc, 0x500, 0x504, 0x50b, 0x50e, 0x511, 0x515, 0x519, 0x51f, 0x528, 0x534, 0x53b, 0x544, 0x54c, 0x553, 0x561, 0x56e, 0x57b, 0x584, 0x588, 0x596, 0x59e, 0x5a9, 0x5b2, 0x5b8, 0x5c0, 0x5c9, 0x5d3, 0x5d6, 0x5e2, 0x5e5, 0x5ea, 0x5ed, 0x5f7, 0x600, 0x60c, 0x60f, 0x614, 0x617, 0x61a, 0x61d, 0x624, 0x62b, 0x62f, 0x63a, 0x63d, 0x643, 0x648, 0x64c, 0x64f, 0x652, 0x655, 0x65a, 0x664, 0x667, 0x66b, 0x67a, 0x686, 0x68a, 0x68f, 0x694, 0x698, 0x69d, 0x6a6, 0x6b1, 0x6b7, 0x6bf, 0x6c3, 0x6c7, 0x6cd, 0x6d3, 0x6d8, 0x6db, 0x6e9, 0x6f0, 0x6f3, 0x6f6, 0x6fa, 0x700, 0x705, 0x70f, 0x714, 0x717, 0x71a, 0x71d, 0x720, 0x724, 0x727, 0x737, 0x748, 0x74d, 0x74f, 0x751}
-
-// idnaSparseValues: 1876 entries, 7504 bytes
-var idnaSparseValues = [1876]valueRange{
-	// Block 0x0, offset 0x0
-	{value: 0x0000, lo: 0x07},
-	{value: 0xe105, lo: 0x80, hi: 0x96},
-	{value: 0x0018, lo: 0x97, hi: 0x97},
-	{value: 0xe105, lo: 0x98, hi: 0x9e},
-	{value: 0x001f, lo: 0x9f, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xb7},
-	{value: 0x0008, lo: 0xb8, hi: 0xbf},
-	// Block 0x1, offset 0x8
-	{value: 0x0000, lo: 0x10},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0xe01d, lo: 0x81, hi: 0x81},
-	{value: 0x0008, lo: 0x82, hi: 0x82},
-	{value: 0x0335, lo: 0x83, hi: 0x83},
-	{value: 0x034d, lo: 0x84, hi: 0x84},
-	{value: 0x0365, lo: 0x85, hi: 0x85},
-	{value: 0xe00d, lo: 0x86, hi: 0x86},
-	{value: 0x0008, lo: 0x87, hi: 0x87},
-	{value: 0xe00d, lo: 0x88, hi: 0x88},
-	{value: 0x0008, lo: 0x89, hi: 0x89},
-	{value: 0xe00d, lo: 0x8a, hi: 0x8a},
-	{value: 0x0008, lo: 0x8b, hi: 0x8b},
-	{value: 0xe00d, lo: 0x8c, hi: 0x8c},
-	{value: 0x0008, lo: 0x8d, hi: 0x8d},
-	{value: 0xe00d, lo: 0x8e, hi: 0x8e},
-	{value: 0x0008, lo: 0x8f, hi: 0xbf},
-	// Block 0x2, offset 0x19
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x0249, lo: 0xb0, hi: 0xb0},
-	{value: 0x037d, lo: 0xb1, hi: 0xb1},
-	{value: 0x0259, lo: 0xb2, hi: 0xb2},
-	{value: 0x0269, lo: 0xb3, hi: 0xb3},
-	{value: 0x034d, lo: 0xb4, hi: 0xb4},
-	{value: 0x0395, lo: 0xb5, hi: 0xb5},
-	{value: 0xe1bd, lo: 0xb6, hi: 0xb6},
-	{value: 0x0279, lo: 0xb7, hi: 0xb7},
-	{value: 0x0289, lo: 0xb8, hi: 0xb8},
-	{value: 0x0008, lo: 0xb9, hi: 0xbf},
-	// Block 0x3, offset 0x25
-	{value: 0x0000, lo: 0x01},
-	{value: 0x1308, lo: 0x80, hi: 0xbf},
-	// Block 0x4, offset 0x27
-	{value: 0x0000, lo: 0x04},
-	{value: 0x03f5, lo: 0x80, hi: 0x8f},
-	{value: 0xe105, lo: 0x90, hi: 0x9f},
-	{value: 0x049d, lo: 0xa0, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x5, offset 0x2c
-	{value: 0x0000, lo: 0x07},
-	{value: 0xe185, lo: 0x80, hi: 0x8f},
-	{value: 0x0545, lo: 0x90, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x98},
-	{value: 0x0008, lo: 0x99, hi: 0x99},
-	{value: 0x0018, lo: 0x9a, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xa0},
-	{value: 0x0008, lo: 0xa1, hi: 0xbf},
-	// Block 0x6, offset 0x34
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0401, lo: 0x87, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x88},
-	{value: 0x0018, lo: 0x89, hi: 0x8a},
-	{value: 0x0040, lo: 0x8b, hi: 0x8c},
-	{value: 0x0018, lo: 0x8d, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0x90},
-	{value: 0x1308, lo: 0x91, hi: 0xbd},
-	{value: 0x0018, lo: 0xbe, hi: 0xbe},
-	{value: 0x1308, lo: 0xbf, hi: 0xbf},
-	// Block 0x7, offset 0x3f
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0018, lo: 0x80, hi: 0x80},
-	{value: 0x1308, lo: 0x81, hi: 0x82},
-	{value: 0x0018, lo: 0x83, hi: 0x83},
-	{value: 0x1308, lo: 0x84, hi: 0x85},
-	{value: 0x0018, lo: 0x86, hi: 0x86},
-	{value: 0x1308, lo: 0x87, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xaa},
-	{value: 0x0040, lo: 0xab, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0x8, offset 0x4b
-	{value: 0x0000, lo: 0x10},
-	{value: 0x0018, lo: 0x80, hi: 0x80},
-	{value: 0x0208, lo: 0x81, hi: 0x87},
-	{value: 0x0408, lo: 0x88, hi: 0x88},
-	{value: 0x0208, lo: 0x89, hi: 0x8a},
-	{value: 0x1308, lo: 0x8b, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa9},
-	{value: 0x0018, lo: 0xaa, hi: 0xad},
-	{value: 0x0208, lo: 0xae, hi: 0xaf},
-	{value: 0x1308, lo: 0xb0, hi: 0xb0},
-	{value: 0x0408, lo: 0xb1, hi: 0xb3},
-	{value: 0x0008, lo: 0xb4, hi: 0xb4},
-	{value: 0x0429, lo: 0xb5, hi: 0xb5},
-	{value: 0x0451, lo: 0xb6, hi: 0xb6},
-	{value: 0x0479, lo: 0xb7, hi: 0xb7},
-	{value: 0x04a1, lo: 0xb8, hi: 0xb8},
-	{value: 0x0208, lo: 0xb9, hi: 0xbf},
-	// Block 0x9, offset 0x5c
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0208, lo: 0x80, hi: 0x87},
-	{value: 0x0408, lo: 0x88, hi: 0x99},
-	{value: 0x0208, lo: 0x9a, hi: 0xbf},
-	// Block 0xa, offset 0x60
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x1308, lo: 0x80, hi: 0x8a},
-	{value: 0x0040, lo: 0x8b, hi: 0x8c},
-	{value: 0x0408, lo: 0x8d, hi: 0x8d},
-	{value: 0x0208, lo: 0x8e, hi: 0x98},
-	{value: 0x0408, lo: 0x99, hi: 0x9b},
-	{value: 0x0208, lo: 0x9c, hi: 0xaa},
-	{value: 0x0408, lo: 0xab, hi: 0xac},
-	{value: 0x0208, lo: 0xad, hi: 0xb0},
-	{value: 0x0408, lo: 0xb1, hi: 0xb1},
-	{value: 0x0208, lo: 0xb2, hi: 0xb2},
-	{value: 0x0408, lo: 0xb3, hi: 0xb4},
-	{value: 0x0208, lo: 0xb5, hi: 0xb7},
-	{value: 0x0408, lo: 0xb8, hi: 0xb9},
-	{value: 0x0208, lo: 0xba, hi: 0xbf},
-	// Block 0xb, offset 0x6f
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xa5},
-	{value: 0x1308, lo: 0xa6, hi: 0xb0},
-	{value: 0x0008, lo: 0xb1, hi: 0xb1},
-	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0xc, offset 0x74
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0208, lo: 0x8a, hi: 0xaa},
-	{value: 0x1308, lo: 0xab, hi: 0xb3},
-	{value: 0x0008, lo: 0xb4, hi: 0xb5},
-	{value: 0x0018, lo: 0xb6, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0xd, offset 0x7b
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0x95},
-	{value: 0x1308, lo: 0x96, hi: 0x99},
-	{value: 0x0008, lo: 0x9a, hi: 0x9a},
-	{value: 0x1308, lo: 0x9b, hi: 0xa3},
-	{value: 0x0008, lo: 0xa4, hi: 0xa4},
-	{value: 0x1308, lo: 0xa5, hi: 0xa7},
-	{value: 0x0008, lo: 0xa8, hi: 0xa8},
-	{value: 0x1308, lo: 0xa9, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xe, offset 0x87
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x0408, lo: 0x80, hi: 0x80},
-	{value: 0x0208, lo: 0x81, hi: 0x85},
-	{value: 0x0408, lo: 0x86, hi: 0x87},
-	{value: 0x0208, lo: 0x88, hi: 0x88},
-	{value: 0x0408, lo: 0x89, hi: 0x89},
-	{value: 0x0208, lo: 0x8a, hi: 0x93},
-	{value: 0x0408, lo: 0x94, hi: 0x94},
-	{value: 0x0208, lo: 0x95, hi: 0x95},
-	{value: 0x0008, lo: 0x96, hi: 0x98},
-	{value: 0x1308, lo: 0x99, hi: 0x9b},
-	{value: 0x0040, lo: 0x9c, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0xbf},
-	// Block 0xf, offset 0x95
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x0040, lo: 0x80, hi: 0x9f},
-	{value: 0x0208, lo: 0xa0, hi: 0xa9},
-	{value: 0x0408, lo: 0xaa, hi: 0xac},
-	{value: 0x0008, lo: 0xad, hi: 0xad},
-	{value: 0x0408, lo: 0xae, hi: 0xae},
-	{value: 0x0208, lo: 0xaf, hi: 0xb0},
-	{value: 0x0408, lo: 0xb1, hi: 0xb2},
-	{value: 0x0208, lo: 0xb3, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xb5},
-	{value: 0x0208, lo: 0xb6, hi: 0xb8},
-	{value: 0x0408, lo: 0xb9, hi: 0xb9},
-	{value: 0x0208, lo: 0xba, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x10, offset 0xa3
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0040, lo: 0x80, hi: 0x93},
-	{value: 0x1308, lo: 0x94, hi: 0xa1},
-	{value: 0x0040, lo: 0xa2, hi: 0xa2},
-	{value: 0x1308, lo: 0xa3, hi: 0xbf},
-	// Block 0x11, offset 0xa8
-	{value: 0x0000, lo: 0x08},
-	{value: 0x1308, lo: 0x80, hi: 0x82},
-	{value: 0x1008, lo: 0x83, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0xb9},
-	{value: 0x1308, lo: 0xba, hi: 0xba},
-	{value: 0x1008, lo: 0xbb, hi: 0xbb},
-	{value: 0x1308, lo: 0xbc, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbd},
-	{value: 0x1008, lo: 0xbe, hi: 0xbf},
-	// Block 0x12, offset 0xb1
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x1308, lo: 0x80, hi: 0x80},
-	{value: 0x1008, lo: 0x81, hi: 0x82},
-	{value: 0x0040, lo: 0x83, hi: 0x85},
-	{value: 0x1008, lo: 0x86, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x1008, lo: 0x8a, hi: 0x8c},
-	{value: 0x1b08, lo: 0x8d, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x96},
-	{value: 0x1008, lo: 0x97, hi: 0x97},
-	{value: 0x0040, lo: 0x98, hi: 0xa5},
-	{value: 0x0008, lo: 0xa6, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x13, offset 0xc1
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x1308, lo: 0x80, hi: 0x80},
-	{value: 0x1008, lo: 0x81, hi: 0x83},
-	{value: 0x0040, lo: 0x84, hi: 0x84},
-	{value: 0x0008, lo: 0x85, hi: 0x8c},
-	{value: 0x0040, lo: 0x8d, hi: 0x8d},
-	{value: 0x0008, lo: 0x8e, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x91},
-	{value: 0x0008, lo: 0x92, hi: 0xa8},
-	{value: 0x0040, lo: 0xa9, hi: 0xa9},
-	{value: 0x0008, lo: 0xaa, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbd},
-	{value: 0x1308, lo: 0xbe, hi: 0xbf},
-	// Block 0x14, offset 0xcf
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x1308, lo: 0x81, hi: 0x81},
-	{value: 0x1008, lo: 0x82, hi: 0x83},
-	{value: 0x0040, lo: 0x84, hi: 0x84},
-	{value: 0x0008, lo: 0x85, hi: 0x8c},
-	{value: 0x0040, lo: 0x8d, hi: 0x8d},
-	{value: 0x0008, lo: 0x8e, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x91},
-	{value: 0x0008, lo: 0x92, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbd},
-	{value: 0x1008, lo: 0xbe, hi: 0xbf},
-	// Block 0x15, offset 0xdc
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0040, lo: 0x80, hi: 0x81},
-	{value: 0x1008, lo: 0x82, hi: 0x83},
-	{value: 0x0040, lo: 0x84, hi: 0x84},
-	{value: 0x0008, lo: 0x85, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x99},
-	{value: 0x0008, lo: 0x9a, hi: 0xb1},
-	{value: 0x0040, lo: 0xb2, hi: 0xb2},
-	{value: 0x0008, lo: 0xb3, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x16, offset 0xe8
-	{value: 0x0000, lo: 0x10},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x89},
-	{value: 0x1b08, lo: 0x8a, hi: 0x8a},
-	{value: 0x0040, lo: 0x8b, hi: 0x8e},
-	{value: 0x1008, lo: 0x8f, hi: 0x91},
-	{value: 0x1308, lo: 0x92, hi: 0x94},
-	{value: 0x0040, lo: 0x95, hi: 0x95},
-	{value: 0x1308, lo: 0x96, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x97},
-	{value: 0x1008, lo: 0x98, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xa5},
-	{value: 0x0008, lo: 0xa6, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xb1},
-	{value: 0x1008, lo: 0xb2, hi: 0xb3},
-	{value: 0x0018, lo: 0xb4, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0x17, offset 0xf9
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0xb0},
-	{value: 0x1308, lo: 0xb1, hi: 0xb1},
-	{value: 0x0008, lo: 0xb2, hi: 0xb2},
-	{value: 0x08f1, lo: 0xb3, hi: 0xb3},
-	{value: 0x1308, lo: 0xb4, hi: 0xb9},
-	{value: 0x1b08, lo: 0xba, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbe},
-	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0x18, offset 0x103
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x1308, lo: 0x87, hi: 0x8e},
-	{value: 0x0018, lo: 0x8f, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0018, lo: 0x9a, hi: 0x9b},
-	{value: 0x0040, lo: 0x9c, hi: 0xbf},
-	// Block 0x19, offset 0x10a
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0008, lo: 0x80, hi: 0x84},
-	{value: 0x0040, lo: 0x85, hi: 0x85},
-	{value: 0x0008, lo: 0x86, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x87},
-	{value: 0x1308, lo: 0x88, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9b},
-	{value: 0x0961, lo: 0x9c, hi: 0x9c},
-	{value: 0x0999, lo: 0x9d, hi: 0x9d},
-	{value: 0x0008, lo: 0x9e, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0x1a, offset 0x117
-	{value: 0x0000, lo: 0x10},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x8a},
-	{value: 0x0008, lo: 0x8b, hi: 0x8b},
-	{value: 0xe03d, lo: 0x8c, hi: 0x8c},
-	{value: 0x0018, lo: 0x8d, hi: 0x97},
-	{value: 0x1308, lo: 0x98, hi: 0x99},
-	{value: 0x0018, lo: 0x9a, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa9},
-	{value: 0x0018, lo: 0xaa, hi: 0xb4},
-	{value: 0x1308, lo: 0xb5, hi: 0xb5},
-	{value: 0x0018, lo: 0xb6, hi: 0xb6},
-	{value: 0x1308, lo: 0xb7, hi: 0xb7},
-	{value: 0x0018, lo: 0xb8, hi: 0xb8},
-	{value: 0x1308, lo: 0xb9, hi: 0xb9},
-	{value: 0x0018, lo: 0xba, hi: 0xbd},
-	{value: 0x1008, lo: 0xbe, hi: 0xbf},
-	// Block 0x1b, offset 0x128
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0018, lo: 0x80, hi: 0x85},
-	{value: 0x1308, lo: 0x86, hi: 0x86},
-	{value: 0x0018, lo: 0x87, hi: 0x8c},
-	{value: 0x0040, lo: 0x8d, hi: 0x8d},
-	{value: 0x0018, lo: 0x8e, hi: 0x9a},
-	{value: 0x0040, lo: 0x9b, hi: 0xbf},
-	// Block 0x1c, offset 0x12f
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0xaa},
-	{value: 0x1008, lo: 0xab, hi: 0xac},
-	{value: 0x1308, lo: 0xad, hi: 0xb0},
-	{value: 0x1008, lo: 0xb1, hi: 0xb1},
-	{value: 0x1308, lo: 0xb2, hi: 0xb7},
-	{value: 0x1008, lo: 0xb8, hi: 0xb8},
-	{value: 0x1b08, lo: 0xb9, hi: 0xba},
-	{value: 0x1008, lo: 0xbb, hi: 0xbc},
-	{value: 0x1308, lo: 0xbd, hi: 0xbe},
-	{value: 0x0008, lo: 0xbf, hi: 0xbf},
-	// Block 0x1d, offset 0x13a
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0018, lo: 0x8a, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x95},
-	{value: 0x1008, lo: 0x96, hi: 0x97},
-	{value: 0x1308, lo: 0x98, hi: 0x99},
-	{value: 0x0008, lo: 0x9a, hi: 0x9d},
-	{value: 0x1308, lo: 0x9e, hi: 0xa0},
-	{value: 0x0008, lo: 0xa1, hi: 0xa1},
-	{value: 0x1008, lo: 0xa2, hi: 0xa4},
-	{value: 0x0008, lo: 0xa5, hi: 0xa6},
-	{value: 0x1008, lo: 0xa7, hi: 0xad},
-	{value: 0x0008, lo: 0xae, hi: 0xb0},
-	{value: 0x1308, lo: 0xb1, hi: 0xb4},
-	{value: 0x0008, lo: 0xb5, hi: 0xbf},
-	// Block 0x1e, offset 0x149
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x0008, lo: 0x80, hi: 0x81},
-	{value: 0x1308, lo: 0x82, hi: 0x82},
-	{value: 0x1008, lo: 0x83, hi: 0x84},
-	{value: 0x1308, lo: 0x85, hi: 0x86},
-	{value: 0x1008, lo: 0x87, hi: 0x8c},
-	{value: 0x1308, lo: 0x8d, hi: 0x8d},
-	{value: 0x0008, lo: 0x8e, hi: 0x8e},
-	{value: 0x1008, lo: 0x8f, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x1008, lo: 0x9a, hi: 0x9c},
-	{value: 0x1308, lo: 0x9d, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0x1f, offset 0x157
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0040, lo: 0x80, hi: 0x86},
-	{value: 0x055d, lo: 0x87, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8c},
-	{value: 0x055d, lo: 0x8d, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xba},
-	{value: 0x0018, lo: 0xbb, hi: 0xbb},
-	{value: 0xe105, lo: 0xbc, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbf},
-	// Block 0x20, offset 0x161
-	{value: 0x0000, lo: 0x01},
-	{value: 0x0018, lo: 0x80, hi: 0xbf},
-	// Block 0x21, offset 0x163
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0xa0},
-	{value: 0x0018, lo: 0xa1, hi: 0xbf},
-	// Block 0x22, offset 0x167
-	{value: 0x0000, lo: 0x01},
-	{value: 0x0008, lo: 0x80, hi: 0xbf},
-	// Block 0x23, offset 0x169
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x0008, lo: 0x8a, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0x98},
-	{value: 0x0040, lo: 0x99, hi: 0x99},
-	{value: 0x0008, lo: 0x9a, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x24, offset 0x175
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x0008, lo: 0x8a, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xb0},
-	{value: 0x0040, lo: 0xb1, hi: 0xb1},
-	{value: 0x0008, lo: 0xb2, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xb7},
-	{value: 0x0008, lo: 0xb8, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0x25, offset 0x180
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x0040, lo: 0x81, hi: 0x81},
-	{value: 0x0008, lo: 0x82, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x87},
-	{value: 0x0008, lo: 0x88, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0xbf},
-	// Block 0x26, offset 0x188
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x91},
-	{value: 0x0008, lo: 0x92, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0xbf},
-	// Block 0x27, offset 0x18e
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x9a},
-	{value: 0x0040, lo: 0x9b, hi: 0x9c},
-	{value: 0x1308, lo: 0x9d, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x28, offset 0x194
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x29, offset 0x199
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xb7},
-	{value: 0xe045, lo: 0xb8, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x2a, offset 0x19e
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0xbf},
-	// Block 0x2b, offset 0x1a1
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xac},
-	{value: 0x0018, lo: 0xad, hi: 0xae},
-	{value: 0x0008, lo: 0xaf, hi: 0xbf},
-	// Block 0x2c, offset 0x1a5
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0x9a},
-	{value: 0x0018, lo: 0x9b, hi: 0x9c},
-	{value: 0x0040, lo: 0x9d, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x2d, offset 0x1ab
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xaa},
-	{value: 0x0018, lo: 0xab, hi: 0xb0},
-	{value: 0x0008, lo: 0xb1, hi: 0xb8},
-	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0x2e, offset 0x1b0
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0x8c},
-	{value: 0x0040, lo: 0x8d, hi: 0x8d},
-	{value: 0x0008, lo: 0x8e, hi: 0x91},
-	{value: 0x1308, lo: 0x92, hi: 0x93},
-	{value: 0x1b08, lo: 0x94, hi: 0x94},
-	{value: 0x0040, lo: 0x95, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xb1},
-	{value: 0x1308, lo: 0xb2, hi: 0xb3},
-	{value: 0x1b08, lo: 0xb4, hi: 0xb4},
-	{value: 0x0018, lo: 0xb5, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x2f, offset 0x1bc
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x91},
-	{value: 0x1308, lo: 0x92, hi: 0x93},
-	{value: 0x0040, lo: 0x94, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xac},
-	{value: 0x0040, lo: 0xad, hi: 0xad},
-	{value: 0x0008, lo: 0xae, hi: 0xb0},
-	{value: 0x0040, lo: 0xb1, hi: 0xb1},
-	{value: 0x1308, lo: 0xb2, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xbf},
-	// Block 0x30, offset 0x1c6
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0xb3},
-	{value: 0x1340, lo: 0xb4, hi: 0xb5},
-	{value: 0x1008, lo: 0xb6, hi: 0xb6},
-	{value: 0x1308, lo: 0xb7, hi: 0xbd},
-	{value: 0x1008, lo: 0xbe, hi: 0xbf},
-	// Block 0x31, offset 0x1cc
-	{value: 0x0000, lo: 0x10},
-	{value: 0x1008, lo: 0x80, hi: 0x85},
-	{value: 0x1308, lo: 0x86, hi: 0x86},
-	{value: 0x1008, lo: 0x87, hi: 0x88},
-	{value: 0x1308, lo: 0x89, hi: 0x91},
-	{value: 0x1b08, lo: 0x92, hi: 0x92},
-	{value: 0x1308, lo: 0x93, hi: 0x93},
-	{value: 0x0018, lo: 0x94, hi: 0x96},
-	{value: 0x0008, lo: 0x97, hi: 0x97},
-	{value: 0x0018, lo: 0x98, hi: 0x9b},
-	{value: 0x0008, lo: 0x9c, hi: 0x9c},
-	{value: 0x1308, lo: 0x9d, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa9},
-	{value: 0x0040, lo: 0xaa, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x32, offset 0x1dd
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0018, lo: 0x80, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x86},
-	{value: 0x0218, lo: 0x87, hi: 0x87},
-	{value: 0x0018, lo: 0x88, hi: 0x8a},
-	{value: 0x13c0, lo: 0x8b, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x0208, lo: 0xa0, hi: 0xbf},
-	// Block 0x33, offset 0x1e7
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0208, lo: 0x80, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0x34, offset 0x1ea
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0x84},
-	{value: 0x1308, lo: 0x85, hi: 0x86},
-	{value: 0x0208, lo: 0x87, hi: 0xa8},
-	{value: 0x1308, lo: 0xa9, hi: 0xa9},
-	{value: 0x0208, lo: 0xaa, hi: 0xaa},
-	{value: 0x0040, lo: 0xab, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x35, offset 0x1f2
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0x36, offset 0x1f5
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0008, lo: 0x80, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x1308, lo: 0xa0, hi: 0xa2},
-	{value: 0x1008, lo: 0xa3, hi: 0xa6},
-	{value: 0x1308, lo: 0xa7, hi: 0xa8},
-	{value: 0x1008, lo: 0xa9, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xaf},
-	{value: 0x1008, lo: 0xb0, hi: 0xb1},
-	{value: 0x1308, lo: 0xb2, hi: 0xb2},
-	{value: 0x1008, lo: 0xb3, hi: 0xb8},
-	{value: 0x1308, lo: 0xb9, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x37, offset 0x202
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0018, lo: 0x80, hi: 0x80},
-	{value: 0x0040, lo: 0x81, hi: 0x83},
-	{value: 0x0018, lo: 0x84, hi: 0x85},
-	{value: 0x0008, lo: 0x86, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0x38, offset 0x20a
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x39, offset 0x20e
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0028, lo: 0x9a, hi: 0x9a},
-	{value: 0x0040, lo: 0x9b, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0xbf},
-	// Block 0x3a, offset 0x215
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0x96},
-	{value: 0x1308, lo: 0x97, hi: 0x98},
-	{value: 0x1008, lo: 0x99, hi: 0x9a},
-	{value: 0x1308, lo: 0x9b, hi: 0x9b},
-	{value: 0x0040, lo: 0x9c, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x3b, offset 0x21d
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x0008, lo: 0x80, hi: 0x94},
-	{value: 0x1008, lo: 0x95, hi: 0x95},
-	{value: 0x1308, lo: 0x96, hi: 0x96},
-	{value: 0x1008, lo: 0x97, hi: 0x97},
-	{value: 0x1308, lo: 0x98, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x1b08, lo: 0xa0, hi: 0xa0},
-	{value: 0x1008, lo: 0xa1, hi: 0xa1},
-	{value: 0x1308, lo: 0xa2, hi: 0xa2},
-	{value: 0x1008, lo: 0xa3, hi: 0xa4},
-	{value: 0x1308, lo: 0xa5, hi: 0xac},
-	{value: 0x1008, lo: 0xad, hi: 0xb2},
-	{value: 0x1308, lo: 0xb3, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbe},
-	{value: 0x1308, lo: 0xbf, hi: 0xbf},
-	// Block 0x3c, offset 0x22d
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xa6},
-	{value: 0x0008, lo: 0xa7, hi: 0xa7},
-	{value: 0x0018, lo: 0xa8, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x1308, lo: 0xb0, hi: 0xbd},
-	{value: 0x1318, lo: 0xbe, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0x3d, offset 0x239
-	{value: 0x0000, lo: 0x01},
-	{value: 0x0040, lo: 0x80, hi: 0xbf},
-	// Block 0x3e, offset 0x23b
-	{value: 0x0000, lo: 0x09},
-	{value: 0x1308, lo: 0x80, hi: 0x83},
-	{value: 0x1008, lo: 0x84, hi: 0x84},
-	{value: 0x0008, lo: 0x85, hi: 0xb3},
-	{value: 0x1308, lo: 0xb4, hi: 0xb4},
-	{value: 0x1008, lo: 0xb5, hi: 0xb5},
-	{value: 0x1308, lo: 0xb6, hi: 0xba},
-	{value: 0x1008, lo: 0xbb, hi: 0xbb},
-	{value: 0x1308, lo: 0xbc, hi: 0xbc},
-	{value: 0x1008, lo: 0xbd, hi: 0xbf},
-	// Block 0x3f, offset 0x245
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x1008, lo: 0x80, hi: 0x81},
-	{value: 0x1308, lo: 0x82, hi: 0x82},
-	{value: 0x1008, lo: 0x83, hi: 0x83},
-	{value: 0x1808, lo: 0x84, hi: 0x84},
-	{value: 0x0008, lo: 0x85, hi: 0x8b},
-	{value: 0x0040, lo: 0x8c, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0018, lo: 0x9a, hi: 0xaa},
-	{value: 0x1308, lo: 0xab, hi: 0xb3},
-	{value: 0x0018, lo: 0xb4, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x40, offset 0x251
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x1308, lo: 0x80, hi: 0x81},
-	{value: 0x1008, lo: 0x82, hi: 0x82},
-	{value: 0x0008, lo: 0x83, hi: 0xa0},
-	{value: 0x1008, lo: 0xa1, hi: 0xa1},
-	{value: 0x1308, lo: 0xa2, hi: 0xa5},
-	{value: 0x1008, lo: 0xa6, hi: 0xa7},
-	{value: 0x1308, lo: 0xa8, hi: 0xa9},
-	{value: 0x1808, lo: 0xaa, hi: 0xaa},
-	{value: 0x1b08, lo: 0xab, hi: 0xab},
-	{value: 0x1308, lo: 0xac, hi: 0xad},
-	{value: 0x0008, lo: 0xae, hi: 0xbf},
-	// Block 0x41, offset 0x25d
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0xa5},
-	{value: 0x1308, lo: 0xa6, hi: 0xa6},
-	{value: 0x1008, lo: 0xa7, hi: 0xa7},
-	{value: 0x1308, lo: 0xa8, hi: 0xa9},
-	{value: 0x1008, lo: 0xaa, hi: 0xac},
-	{value: 0x1308, lo: 0xad, hi: 0xad},
-	{value: 0x1008, lo: 0xae, hi: 0xae},
-	{value: 0x1308, lo: 0xaf, hi: 0xb1},
-	{value: 0x1808, lo: 0xb2, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xbb},
-	{value: 0x0018, lo: 0xbc, hi: 0xbf},
-	// Block 0x42, offset 0x269
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0xa3},
-	{value: 0x1008, lo: 0xa4, hi: 0xab},
-	{value: 0x1308, lo: 0xac, hi: 0xb3},
-	{value: 0x1008, lo: 0xb4, hi: 0xb5},
-	{value: 0x1308, lo: 0xb6, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xba},
-	{value: 0x0018, lo: 0xbb, hi: 0xbf},
-	// Block 0x43, offset 0x271
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0x8c},
-	{value: 0x0008, lo: 0x8d, hi: 0xbd},
-	{value: 0x0018, lo: 0xbe, hi: 0xbf},
-	// Block 0x44, offset 0x276
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0e29, lo: 0x80, hi: 0x80},
-	{value: 0x0e41, lo: 0x81, hi: 0x81},
-	{value: 0x0e59, lo: 0x82, hi: 0x82},
-	{value: 0x0e71, lo: 0x83, hi: 0x83},
-	{value: 0x0e89, lo: 0x84, hi: 0x85},
-	{value: 0x0ea1, lo: 0x86, hi: 0x86},
-	{value: 0x0eb9, lo: 0x87, hi: 0x87},
-	{value: 0x057d, lo: 0x88, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0xbf},
-	// Block 0x45, offset 0x280
-	{value: 0x0000, lo: 0x10},
-	{value: 0x0018, lo: 0x80, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x1308, lo: 0x90, hi: 0x92},
-	{value: 0x0018, lo: 0x93, hi: 0x93},
-	{value: 0x1308, lo: 0x94, hi: 0xa0},
-	{value: 0x1008, lo: 0xa1, hi: 0xa1},
-	{value: 0x1308, lo: 0xa2, hi: 0xa8},
-	{value: 0x0008, lo: 0xa9, hi: 0xac},
-	{value: 0x1308, lo: 0xad, hi: 0xad},
-	{value: 0x0008, lo: 0xae, hi: 0xb1},
-	{value: 0x1008, lo: 0xb2, hi: 0xb3},
-	{value: 0x1308, lo: 0xb4, hi: 0xb4},
-	{value: 0x0008, lo: 0xb5, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xb7},
-	{value: 0x1308, lo: 0xb8, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x46, offset 0x291
-	{value: 0x0000, lo: 0x03},
-	{value: 0x1308, lo: 0x80, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xba},
-	{value: 0x1308, lo: 0xbb, hi: 0xbf},
-	// Block 0x47, offset 0x295
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x87},
-	{value: 0xe045, lo: 0x88, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x97},
-	{value: 0xe045, lo: 0x98, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa7},
-	{value: 0xe045, lo: 0xa8, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb7},
-	{value: 0xe045, lo: 0xb8, hi: 0xbf},
-	// Block 0x48, offset 0x2a0
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0040, lo: 0x80, hi: 0x8f},
-	{value: 0x1318, lo: 0x90, hi: 0xb0},
-	{value: 0x0040, lo: 0xb1, hi: 0xbf},
-	// Block 0x49, offset 0x2a4
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0018, lo: 0x80, hi: 0x82},
-	{value: 0x0040, lo: 0x83, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0x84},
-	{value: 0x0018, lo: 0x85, hi: 0x88},
-	{value: 0x24c1, lo: 0x89, hi: 0x89},
-	{value: 0x0018, lo: 0x8a, hi: 0x8b},
-	{value: 0x0040, lo: 0x8c, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0xbf},
-	// Block 0x4a, offset 0x2ad
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0018, lo: 0x80, hi: 0xab},
-	{value: 0x24f1, lo: 0xac, hi: 0xac},
-	{value: 0x2529, lo: 0xad, hi: 0xad},
-	{value: 0x0018, lo: 0xae, hi: 0xae},
-	{value: 0x2579, lo: 0xaf, hi: 0xaf},
-	{value: 0x25b1, lo: 0xb0, hi: 0xb0},
-	{value: 0x0018, lo: 0xb1, hi: 0xbf},
-	// Block 0x4b, offset 0x2b5
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0x9f},
-	{value: 0x0080, lo: 0xa0, hi: 0xa0},
-	{value: 0x0018, lo: 0xa1, hi: 0xad},
-	{value: 0x0080, lo: 0xae, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xbf},
-	// Block 0x4c, offset 0x2bb
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0xa8},
-	{value: 0x09c5, lo: 0xa9, hi: 0xa9},
-	{value: 0x09e5, lo: 0xaa, hi: 0xaa},
-	{value: 0x0018, lo: 0xab, hi: 0xbf},
-	// Block 0x4d, offset 0x2c0
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0x4e, offset 0x2c3
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0xa6},
-	{value: 0x0040, lo: 0xa7, hi: 0xbf},
-	// Block 0x4f, offset 0x2c6
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0x8b},
-	{value: 0x28c1, lo: 0x8c, hi: 0x8c},
-	{value: 0x0018, lo: 0x8d, hi: 0xbf},
-	// Block 0x50, offset 0x2ca
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0xb3},
-	{value: 0x0e66, lo: 0xb4, hi: 0xb4},
-	{value: 0x292a, lo: 0xb5, hi: 0xb5},
-	{value: 0x0e86, lo: 0xb6, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xbf},
-	// Block 0x51, offset 0x2d0
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0x9b},
-	{value: 0x2941, lo: 0x9c, hi: 0x9c},
-	{value: 0x0018, lo: 0x9d, hi: 0xbf},
-	// Block 0x52, offset 0x2d4
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xb5},
-	{value: 0x0018, lo: 0xb6, hi: 0xbf},
-	// Block 0x53, offset 0x2d8
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x97},
-	{value: 0x0018, lo: 0x98, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbc},
-	{value: 0x0018, lo: 0xbd, hi: 0xbf},
-	// Block 0x54, offset 0x2de
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0018, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x0018, lo: 0x8a, hi: 0x91},
-	{value: 0x0040, lo: 0x92, hi: 0xab},
-	{value: 0x0018, lo: 0xac, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0x55, offset 0x2e5
-	{value: 0x0000, lo: 0x05},
-	{value: 0xe185, lo: 0x80, hi: 0x8f},
-	{value: 0x03f5, lo: 0x90, hi: 0x9f},
-	{value: 0x0ea5, lo: 0xa0, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x56, offset 0x2eb
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0xa5},
-	{value: 0x0040, lo: 0xa6, hi: 0xa6},
-	{value: 0x0008, lo: 0xa7, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xac},
-	{value: 0x0008, lo: 0xad, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x57, offset 0x2f3
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0008, lo: 0x80, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xae},
-	{value: 0xe075, lo: 0xaf, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb0},
-	{value: 0x0040, lo: 0xb1, hi: 0xbe},
-	{value: 0x1b08, lo: 0xbf, hi: 0xbf},
-	// Block 0x58, offset 0x2fa
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa6},
-	{value: 0x0040, lo: 0xa7, hi: 0xa7},
-	{value: 0x0008, lo: 0xa8, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xb7},
-	{value: 0x0008, lo: 0xb8, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0x59, offset 0x305
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x87},
-	{value: 0x0008, lo: 0x88, hi: 0x8e},
-	{value: 0x0040, lo: 0x8f, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x1308, lo: 0xa0, hi: 0xbf},
-	// Block 0x5a, offset 0x30f
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xae},
-	{value: 0x0008, lo: 0xaf, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xbf},
-	// Block 0x5b, offset 0x313
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0x84},
-	{value: 0x0040, lo: 0x85, hi: 0xbf},
-	// Block 0x5c, offset 0x316
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9a},
-	{value: 0x0018, lo: 0x9b, hi: 0x9e},
-	{value: 0x0edd, lo: 0x9f, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xbf},
-	// Block 0x5d, offset 0x31c
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xb2},
-	{value: 0x0efd, lo: 0xb3, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xbf},
-	// Block 0x5e, offset 0x320
-	{value: 0x0020, lo: 0x01},
-	{value: 0x0f1d, lo: 0x80, hi: 0xbf},
-	// Block 0x5f, offset 0x322
-	{value: 0x0020, lo: 0x02},
-	{value: 0x171d, lo: 0x80, hi: 0x8f},
-	{value: 0x18fd, lo: 0x90, hi: 0xbf},
-	// Block 0x60, offset 0x325
-	{value: 0x0020, lo: 0x01},
-	{value: 0x1efd, lo: 0x80, hi: 0xbf},
-	// Block 0x61, offset 0x327
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0xbf},
-	// Block 0x62, offset 0x32a
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x98},
-	{value: 0x1308, lo: 0x99, hi: 0x9a},
-	{value: 0x29e2, lo: 0x9b, hi: 0x9b},
-	{value: 0x2a0a, lo: 0x9c, hi: 0x9c},
-	{value: 0x0008, lo: 0x9d, hi: 0x9e},
-	{value: 0x2a31, lo: 0x9f, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xa0},
-	{value: 0x0008, lo: 0xa1, hi: 0xbf},
-	// Block 0x63, offset 0x334
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xbe},
-	{value: 0x2a69, lo: 0xbf, hi: 0xbf},
-	// Block 0x64, offset 0x337
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x0040, lo: 0x80, hi: 0x84},
-	{value: 0x0008, lo: 0x85, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xb0},
-	{value: 0x2a1d, lo: 0xb1, hi: 0xb1},
-	{value: 0x2a3d, lo: 0xb2, hi: 0xb2},
-	{value: 0x2a5d, lo: 0xb3, hi: 0xb3},
-	{value: 0x2a7d, lo: 0xb4, hi: 0xb4},
-	{value: 0x2a5d, lo: 0xb5, hi: 0xb5},
-	{value: 0x2a9d, lo: 0xb6, hi: 0xb6},
-	{value: 0x2abd, lo: 0xb7, hi: 0xb7},
-	{value: 0x2add, lo: 0xb8, hi: 0xb9},
-	{value: 0x2afd, lo: 0xba, hi: 0xbb},
-	{value: 0x2b1d, lo: 0xbc, hi: 0xbd},
-	{value: 0x2afd, lo: 0xbe, hi: 0xbf},
-	// Block 0x65, offset 0x346
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xa3},
-	{value: 0x0040, lo: 0xa4, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x66, offset 0x34a
-	{value: 0x0030, lo: 0x04},
-	{value: 0x2aa2, lo: 0x80, hi: 0x9d},
-	{value: 0x305a, lo: 0x9e, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x30a2, lo: 0xa0, hi: 0xbf},
-	// Block 0x67, offset 0x34f
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0xbf},
-	// Block 0x68, offset 0x352
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0x8c},
-	{value: 0x0040, lo: 0x8d, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0xbf},
-	// Block 0x69, offset 0x356
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xbd},
-	{value: 0x0018, lo: 0xbe, hi: 0xbf},
-	// Block 0x6a, offset 0x35b
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x8c},
-	{value: 0x0018, lo: 0x8d, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xbf},
-	// Block 0x6b, offset 0x360
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0xa5},
-	{value: 0x0018, lo: 0xa6, hi: 0xaf},
-	{value: 0x1308, lo: 0xb0, hi: 0xb1},
-	{value: 0x0018, lo: 0xb2, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0x6c, offset 0x366
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0040, lo: 0x80, hi: 0xb6},
-	{value: 0x0008, lo: 0xb7, hi: 0xb7},
-	{value: 0x2009, lo: 0xb8, hi: 0xb8},
-	{value: 0x6e89, lo: 0xb9, hi: 0xb9},
-	{value: 0x0008, lo: 0xba, hi: 0xbf},
-	// Block 0x6d, offset 0x36c
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x0008, lo: 0x80, hi: 0x81},
-	{value: 0x1308, lo: 0x82, hi: 0x82},
-	{value: 0x0008, lo: 0x83, hi: 0x85},
-	{value: 0x1b08, lo: 0x86, hi: 0x86},
-	{value: 0x0008, lo: 0x87, hi: 0x8a},
-	{value: 0x1308, lo: 0x8b, hi: 0x8b},
-	{value: 0x0008, lo: 0x8c, hi: 0xa2},
-	{value: 0x1008, lo: 0xa3, hi: 0xa4},
-	{value: 0x1308, lo: 0xa5, hi: 0xa6},
-	{value: 0x1008, lo: 0xa7, hi: 0xa7},
-	{value: 0x0018, lo: 0xa8, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x6e, offset 0x37b
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0208, lo: 0x80, hi: 0xb1},
-	{value: 0x0108, lo: 0xb2, hi: 0xb2},
-	{value: 0x0008, lo: 0xb3, hi: 0xb3},
-	{value: 0x0018, lo: 0xb4, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0x6f, offset 0x381
-	{value: 0x0000, lo: 0x03},
-	{value: 0x1008, lo: 0x80, hi: 0x81},
-	{value: 0x0008, lo: 0x82, hi: 0xb3},
-	{value: 0x1008, lo: 0xb4, hi: 0xbf},
-	// Block 0x70, offset 0x385
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x1008, lo: 0x80, hi: 0x83},
-	{value: 0x1b08, lo: 0x84, hi: 0x84},
-	{value: 0x1308, lo: 0x85, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x8d},
-	{value: 0x0018, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x1308, lo: 0xa0, hi: 0xb1},
-	{value: 0x0008, lo: 0xb2, hi: 0xb7},
-	{value: 0x0018, lo: 0xb8, hi: 0xba},
-	{value: 0x0008, lo: 0xbb, hi: 0xbb},
-	{value: 0x0018, lo: 0xbc, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x71, offset 0x394
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xa5},
-	{value: 0x1308, lo: 0xa6, hi: 0xad},
-	{value: 0x0018, lo: 0xae, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x72, offset 0x399
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x1308, lo: 0x87, hi: 0x91},
-	{value: 0x1008, lo: 0x92, hi: 0x92},
-	{value: 0x1808, lo: 0x93, hi: 0x93},
-	{value: 0x0040, lo: 0x94, hi: 0x9e},
-	{value: 0x0018, lo: 0x9f, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0x73, offset 0x3a1
-	{value: 0x0000, lo: 0x09},
-	{value: 0x1308, lo: 0x80, hi: 0x82},
-	{value: 0x1008, lo: 0x83, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0xb2},
-	{value: 0x1308, lo: 0xb3, hi: 0xb3},
-	{value: 0x1008, lo: 0xb4, hi: 0xb5},
-	{value: 0x1308, lo: 0xb6, hi: 0xb9},
-	{value: 0x1008, lo: 0xba, hi: 0xbb},
-	{value: 0x1308, lo: 0xbc, hi: 0xbc},
-	{value: 0x1008, lo: 0xbd, hi: 0xbf},
-	// Block 0x74, offset 0x3ab
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x1808, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8e},
-	{value: 0x0008, lo: 0x8f, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa4},
-	{value: 0x1308, lo: 0xa5, hi: 0xa5},
-	{value: 0x0008, lo: 0xa6, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0x75, offset 0x3b6
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0xa8},
-	{value: 0x1308, lo: 0xa9, hi: 0xae},
-	{value: 0x1008, lo: 0xaf, hi: 0xb0},
-	{value: 0x1308, lo: 0xb1, hi: 0xb2},
-	{value: 0x1008, lo: 0xb3, hi: 0xb4},
-	{value: 0x1308, lo: 0xb5, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x76, offset 0x3be
-	{value: 0x0000, lo: 0x10},
-	{value: 0x0008, lo: 0x80, hi: 0x82},
-	{value: 0x1308, lo: 0x83, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0x8b},
-	{value: 0x1308, lo: 0x8c, hi: 0x8c},
-	{value: 0x1008, lo: 0x8d, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9b},
-	{value: 0x0018, lo: 0x9c, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xb9},
-	{value: 0x0008, lo: 0xba, hi: 0xba},
-	{value: 0x1008, lo: 0xbb, hi: 0xbb},
-	{value: 0x1308, lo: 0xbc, hi: 0xbc},
-	{value: 0x1008, lo: 0xbd, hi: 0xbd},
-	{value: 0x0008, lo: 0xbe, hi: 0xbf},
-	// Block 0x77, offset 0x3cf
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x1308, lo: 0xb0, hi: 0xb0},
-	{value: 0x0008, lo: 0xb1, hi: 0xb1},
-	{value: 0x1308, lo: 0xb2, hi: 0xb4},
-	{value: 0x0008, lo: 0xb5, hi: 0xb6},
-	{value: 0x1308, lo: 0xb7, hi: 0xb8},
-	{value: 0x0008, lo: 0xb9, hi: 0xbd},
-	{value: 0x1308, lo: 0xbe, hi: 0xbf},
-	// Block 0x78, offset 0x3d8
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x1308, lo: 0x81, hi: 0x81},
-	{value: 0x0008, lo: 0x82, hi: 0x82},
-	{value: 0x0040, lo: 0x83, hi: 0x9a},
-	{value: 0x0008, lo: 0x9b, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xaa},
-	{value: 0x1008, lo: 0xab, hi: 0xab},
-	{value: 0x1308, lo: 0xac, hi: 0xad},
-	{value: 0x1008, lo: 0xae, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb1},
-	{value: 0x0008, lo: 0xb2, hi: 0xb4},
-	{value: 0x1008, lo: 0xb5, hi: 0xb5},
-	{value: 0x1b08, lo: 0xb6, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x79, offset 0x3e8
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x88},
-	{value: 0x0008, lo: 0x89, hi: 0x8e},
-	{value: 0x0040, lo: 0x8f, hi: 0x90},
-	{value: 0x0008, lo: 0x91, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa6},
-	{value: 0x0040, lo: 0xa7, hi: 0xa7},
-	{value: 0x0008, lo: 0xa8, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x7a, offset 0x3f5
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x9a},
-	{value: 0x0018, lo: 0x9b, hi: 0x9b},
-	{value: 0x4465, lo: 0x9c, hi: 0x9c},
-	{value: 0x447d, lo: 0x9d, hi: 0x9d},
-	{value: 0x2971, lo: 0x9e, hi: 0x9e},
-	{value: 0xe06d, lo: 0x9f, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa5},
-	{value: 0x0040, lo: 0xa6, hi: 0xaf},
-	{value: 0x4495, lo: 0xb0, hi: 0xbf},
-	// Block 0x7b, offset 0x3ff
-	{value: 0x0000, lo: 0x04},
-	{value: 0x44b5, lo: 0x80, hi: 0x8f},
-	{value: 0x44d5, lo: 0x90, hi: 0x9f},
-	{value: 0x44f5, lo: 0xa0, hi: 0xaf},
-	{value: 0x44d5, lo: 0xb0, hi: 0xbf},
-	// Block 0x7c, offset 0x404
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0008, lo: 0x80, hi: 0xa2},
-	{value: 0x1008, lo: 0xa3, hi: 0xa4},
-	{value: 0x1308, lo: 0xa5, hi: 0xa5},
-	{value: 0x1008, lo: 0xa6, hi: 0xa7},
-	{value: 0x1308, lo: 0xa8, hi: 0xa8},
-	{value: 0x1008, lo: 0xa9, hi: 0xaa},
-	{value: 0x0018, lo: 0xab, hi: 0xab},
-	{value: 0x1008, lo: 0xac, hi: 0xac},
-	{value: 0x1b08, lo: 0xad, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0x7d, offset 0x411
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xa3},
-	{value: 0x0040, lo: 0xa4, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xbf},
-	// Block 0x7e, offset 0x415
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x8a},
-	{value: 0x0018, lo: 0x8b, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x7f, offset 0x41a
-	{value: 0x0020, lo: 0x01},
-	{value: 0x4515, lo: 0x80, hi: 0xbf},
-	// Block 0x80, offset 0x41c
-	{value: 0x0020, lo: 0x03},
-	{value: 0x4d15, lo: 0x80, hi: 0x94},
-	{value: 0x4ad5, lo: 0x95, hi: 0x95},
-	{value: 0x4fb5, lo: 0x96, hi: 0xbf},
-	// Block 0x81, offset 0x420
-	{value: 0x0020, lo: 0x01},
-	{value: 0x54f5, lo: 0x80, hi: 0xbf},
-	// Block 0x82, offset 0x422
-	{value: 0x0020, lo: 0x03},
-	{value: 0x5cf5, lo: 0x80, hi: 0x84},
-	{value: 0x5655, lo: 0x85, hi: 0x85},
-	{value: 0x5d95, lo: 0x86, hi: 0xbf},
-	// Block 0x83, offset 0x426
-	{value: 0x0020, lo: 0x08},
-	{value: 0x6b55, lo: 0x80, hi: 0x8f},
-	{value: 0x6d15, lo: 0x90, hi: 0x90},
-	{value: 0x6d55, lo: 0x91, hi: 0xab},
-	{value: 0x6ea1, lo: 0xac, hi: 0xac},
-	{value: 0x70b5, lo: 0xad, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xaf},
-	{value: 0x70d5, lo: 0xb0, hi: 0xbf},
-	// Block 0x84, offset 0x42f
-	{value: 0x0020, lo: 0x05},
-	{value: 0x72d5, lo: 0x80, hi: 0xad},
-	{value: 0x6535, lo: 0xae, hi: 0xae},
-	{value: 0x7895, lo: 0xaf, hi: 0xb5},
-	{value: 0x6f55, lo: 0xb6, hi: 0xb6},
-	{value: 0x7975, lo: 0xb7, hi: 0xbf},
-	// Block 0x85, offset 0x435
-	{value: 0x0028, lo: 0x03},
-	{value: 0x7c21, lo: 0x80, hi: 0x82},
-	{value: 0x7be1, lo: 0x83, hi: 0x83},
-	{value: 0x7c99, lo: 0x84, hi: 0xbf},
-	// Block 0x86, offset 0x439
-	{value: 0x0038, lo: 0x0f},
-	{value: 0x9db1, lo: 0x80, hi: 0x83},
-	{value: 0x9e59, lo: 0x84, hi: 0x85},
-	{value: 0x9e91, lo: 0x86, hi: 0x87},
-	{value: 0x9ec9, lo: 0x88, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x91},
-	{value: 0xa089, lo: 0x92, hi: 0x97},
-	{value: 0xa1a1, lo: 0x98, hi: 0x9c},
-	{value: 0xa281, lo: 0x9d, hi: 0xb3},
-	{value: 0x9d41, lo: 0xb4, hi: 0xb4},
-	{value: 0x9db1, lo: 0xb5, hi: 0xb5},
-	{value: 0xa789, lo: 0xb6, hi: 0xbb},
-	{value: 0xa869, lo: 0xbc, hi: 0xbc},
-	{value: 0xa7f9, lo: 0xbd, hi: 0xbd},
-	{value: 0xa8d9, lo: 0xbe, hi: 0xbf},
-	// Block 0x87, offset 0x449
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x8b},
-	{value: 0x0040, lo: 0x8c, hi: 0x8c},
-	{value: 0x0008, lo: 0x8d, hi: 0xa6},
-	{value: 0x0040, lo: 0xa7, hi: 0xa7},
-	{value: 0x0008, lo: 0xa8, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbb},
-	{value: 0x0008, lo: 0xbc, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbe},
-	{value: 0x0008, lo: 0xbf, hi: 0xbf},
-	// Block 0x88, offset 0x453
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0xbf},
-	// Block 0x89, offset 0x458
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x8a, offset 0x45b
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0x82},
-	{value: 0x0040, lo: 0x83, hi: 0x86},
-	{value: 0x0018, lo: 0x87, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xbf},
-	// Block 0x8b, offset 0x461
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0018, lo: 0x80, hi: 0x8e},
-	{value: 0x0040, lo: 0x8f, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0x9b},
-	{value: 0x0040, lo: 0x9c, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xa0},
-	{value: 0x0040, lo: 0xa1, hi: 0xbf},
-	// Block 0x8c, offset 0x468
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0040, lo: 0x80, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0xbc},
-	{value: 0x1308, lo: 0xbd, hi: 0xbd},
-	{value: 0x0040, lo: 0xbe, hi: 0xbf},
-	// Block 0x8d, offset 0x46d
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0x9c},
-	{value: 0x0040, lo: 0x9d, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x8e, offset 0x471
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x90},
-	{value: 0x0040, lo: 0x91, hi: 0x9f},
-	{value: 0x1308, lo: 0xa0, hi: 0xa0},
-	{value: 0x0018, lo: 0xa1, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x8f, offset 0x477
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xa3},
-	{value: 0x0040, lo: 0xa4, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x90, offset 0x47c
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x81},
-	{value: 0x0008, lo: 0x82, hi: 0x89},
-	{value: 0x0018, lo: 0x8a, hi: 0x8a},
-	{value: 0x0040, lo: 0x8b, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xb5},
-	{value: 0x1308, lo: 0xb6, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbf},
-	// Block 0x91, offset 0x485
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9e},
-	{value: 0x0018, lo: 0x9f, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0x92, offset 0x48a
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x83},
-	{value: 0x0040, lo: 0x84, hi: 0x87},
-	{value: 0x0008, lo: 0x88, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0xbf},
-	// Block 0x93, offset 0x490
-	{value: 0x0000, lo: 0x06},
-	{value: 0xe145, lo: 0x80, hi: 0x87},
-	{value: 0xe1c5, lo: 0x88, hi: 0x8f},
-	{value: 0xe145, lo: 0x90, hi: 0x97},
-	{value: 0x8ad5, lo: 0x98, hi: 0x9f},
-	{value: 0x8aed, lo: 0xa0, hi: 0xa7},
-	{value: 0x0008, lo: 0xa8, hi: 0xbf},
-	// Block 0x94, offset 0x497
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0008, lo: 0x80, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa9},
-	{value: 0x0040, lo: 0xaa, hi: 0xaf},
-	{value: 0x8aed, lo: 0xb0, hi: 0xb7},
-	{value: 0x8ad5, lo: 0xb8, hi: 0xbf},
-	// Block 0x95, offset 0x49e
-	{value: 0x0000, lo: 0x06},
-	{value: 0xe145, lo: 0x80, hi: 0x87},
-	{value: 0xe1c5, lo: 0x88, hi: 0x8f},
-	{value: 0xe145, lo: 0x90, hi: 0x93},
-	{value: 0x0040, lo: 0x94, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0xbb},
-	{value: 0x0040, lo: 0xbc, hi: 0xbf},
-	// Block 0x96, offset 0x4a5
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0x97, offset 0x4a9
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xa3},
-	{value: 0x0040, lo: 0xa4, hi: 0xae},
-	{value: 0x0018, lo: 0xaf, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0x98, offset 0x4ae
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0x99, offset 0x4b1
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xbf},
-	// Block 0x9a, offset 0x4b6
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x87},
-	{value: 0x0008, lo: 0x88, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x0008, lo: 0x8a, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xb6},
-	{value: 0x0008, lo: 0xb7, hi: 0xb8},
-	{value: 0x0040, lo: 0xb9, hi: 0xbb},
-	{value: 0x0008, lo: 0xbc, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbe},
-	{value: 0x0008, lo: 0xbf, hi: 0xbf},
-	// Block 0x9b, offset 0x4c2
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x96},
-	{value: 0x0018, lo: 0x97, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xbf},
-	// Block 0x9c, offset 0x4c8
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0xa6},
-	{value: 0x0018, lo: 0xa7, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0x9d, offset 0x4cd
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0040, lo: 0x80, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xb3},
-	{value: 0x0008, lo: 0xb4, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xba},
-	{value: 0x0018, lo: 0xbb, hi: 0xbf},
-	// Block 0x9e, offset 0x4d4
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0x95},
-	{value: 0x0018, lo: 0x96, hi: 0x9b},
-	{value: 0x0040, lo: 0x9c, hi: 0x9e},
-	{value: 0x0018, lo: 0x9f, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbe},
-	{value: 0x0018, lo: 0xbf, hi: 0xbf},
-	// Block 0x9f, offset 0x4dc
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xbb},
-	{value: 0x0018, lo: 0xbc, hi: 0xbd},
-	{value: 0x0008, lo: 0xbe, hi: 0xbf},
-	// Block 0xa0, offset 0x4e1
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0x91},
-	{value: 0x0018, lo: 0x92, hi: 0xbf},
-	// Block 0xa1, offset 0x4e5
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x1308, lo: 0x81, hi: 0x83},
-	{value: 0x0040, lo: 0x84, hi: 0x84},
-	{value: 0x1308, lo: 0x85, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x8b},
-	{value: 0x1308, lo: 0x8c, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x93},
-	{value: 0x0040, lo: 0x94, hi: 0x94},
-	{value: 0x0008, lo: 0x95, hi: 0x97},
-	{value: 0x0040, lo: 0x98, hi: 0x98},
-	{value: 0x0008, lo: 0x99, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xb7},
-	{value: 0x1308, lo: 0xb8, hi: 0xba},
-	{value: 0x0040, lo: 0xbb, hi: 0xbe},
-	{value: 0x1b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xa2, offset 0x4f5
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0018, lo: 0x80, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0x98},
-	{value: 0x0040, lo: 0x99, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbc},
-	{value: 0x0018, lo: 0xbd, hi: 0xbf},
-	// Block 0xa3, offset 0x4fc
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0x9c},
-	{value: 0x0018, lo: 0x9d, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0xa4, offset 0x500
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xb8},
-	{value: 0x0018, lo: 0xb9, hi: 0xbf},
-	// Block 0xa5, offset 0x504
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0008, lo: 0x80, hi: 0x95},
-	{value: 0x0040, lo: 0x96, hi: 0x97},
-	{value: 0x0018, lo: 0x98, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xb7},
-	{value: 0x0018, lo: 0xb8, hi: 0xbf},
-	// Block 0xa6, offset 0x50b
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0xbf},
-	// Block 0xa7, offset 0x50e
-	{value: 0x0000, lo: 0x02},
-	{value: 0x03dd, lo: 0x80, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xbf},
-	// Block 0xa8, offset 0x511
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xb9},
-	{value: 0x0018, lo: 0xba, hi: 0xbf},
-	// Block 0xa9, offset 0x515
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0040, lo: 0x80, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xaa, offset 0x519
-	{value: 0x0000, lo: 0x05},
-	{value: 0x1008, lo: 0x80, hi: 0x80},
-	{value: 0x1308, lo: 0x81, hi: 0x81},
-	{value: 0x1008, lo: 0x82, hi: 0x82},
-	{value: 0x0008, lo: 0x83, hi: 0xb7},
-	{value: 0x1308, lo: 0xb8, hi: 0xbf},
-	// Block 0xab, offset 0x51f
-	{value: 0x0000, lo: 0x08},
-	{value: 0x1308, lo: 0x80, hi: 0x85},
-	{value: 0x1b08, lo: 0x86, hi: 0x86},
-	{value: 0x0018, lo: 0x87, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x91},
-	{value: 0x0018, lo: 0x92, hi: 0xa5},
-	{value: 0x0008, lo: 0xa6, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xbe},
-	{value: 0x1b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xac, offset 0x528
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x1308, lo: 0x80, hi: 0x81},
-	{value: 0x1008, lo: 0x82, hi: 0x82},
-	{value: 0x0008, lo: 0x83, hi: 0xaf},
-	{value: 0x1008, lo: 0xb0, hi: 0xb2},
-	{value: 0x1308, lo: 0xb3, hi: 0xb6},
-	{value: 0x1008, lo: 0xb7, hi: 0xb8},
-	{value: 0x1b08, lo: 0xb9, hi: 0xb9},
-	{value: 0x1308, lo: 0xba, hi: 0xba},
-	{value: 0x0018, lo: 0xbb, hi: 0xbc},
-	{value: 0x0340, lo: 0xbd, hi: 0xbd},
-	{value: 0x0018, lo: 0xbe, hi: 0xbf},
-	// Block 0xad, offset 0x534
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0018, lo: 0x80, hi: 0x81},
-	{value: 0x0040, lo: 0x82, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xa8},
-	{value: 0x0040, lo: 0xa9, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0xae, offset 0x53b
-	{value: 0x0000, lo: 0x08},
-	{value: 0x1308, lo: 0x80, hi: 0x82},
-	{value: 0x0008, lo: 0x83, hi: 0xa6},
-	{value: 0x1308, lo: 0xa7, hi: 0xab},
-	{value: 0x1008, lo: 0xac, hi: 0xac},
-	{value: 0x1308, lo: 0xad, hi: 0xb2},
-	{value: 0x1b08, lo: 0xb3, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xb5},
-	{value: 0x0008, lo: 0xb6, hi: 0xbf},
-	// Block 0xaf, offset 0x544
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0018, lo: 0x80, hi: 0x83},
-	{value: 0x0040, lo: 0x84, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xb2},
-	{value: 0x1308, lo: 0xb3, hi: 0xb3},
-	{value: 0x0018, lo: 0xb4, hi: 0xb5},
-	{value: 0x0008, lo: 0xb6, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0xb0, offset 0x54c
-	{value: 0x0000, lo: 0x06},
-	{value: 0x1308, lo: 0x80, hi: 0x81},
-	{value: 0x1008, lo: 0x82, hi: 0x82},
-	{value: 0x0008, lo: 0x83, hi: 0xb2},
-	{value: 0x1008, lo: 0xb3, hi: 0xb5},
-	{value: 0x1308, lo: 0xb6, hi: 0xbe},
-	{value: 0x1008, lo: 0xbf, hi: 0xbf},
-	// Block 0xb1, offset 0x553
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x1808, lo: 0x80, hi: 0x80},
-	{value: 0x0008, lo: 0x81, hi: 0x84},
-	{value: 0x0018, lo: 0x85, hi: 0x89},
-	{value: 0x1308, lo: 0x8a, hi: 0x8c},
-	{value: 0x0018, lo: 0x8d, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x9a},
-	{value: 0x0018, lo: 0x9b, hi: 0x9b},
-	{value: 0x0008, lo: 0x9c, hi: 0x9c},
-	{value: 0x0018, lo: 0x9d, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xa0},
-	{value: 0x0018, lo: 0xa1, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0xb2, offset 0x561
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0008, lo: 0x80, hi: 0x91},
-	{value: 0x0040, lo: 0x92, hi: 0x92},
-	{value: 0x0008, lo: 0x93, hi: 0xab},
-	{value: 0x1008, lo: 0xac, hi: 0xae},
-	{value: 0x1308, lo: 0xaf, hi: 0xb1},
-	{value: 0x1008, lo: 0xb2, hi: 0xb3},
-	{value: 0x1308, lo: 0xb4, hi: 0xb4},
-	{value: 0x1808, lo: 0xb5, hi: 0xb5},
-	{value: 0x1308, lo: 0xb6, hi: 0xb7},
-	{value: 0x0018, lo: 0xb8, hi: 0xbd},
-	{value: 0x1308, lo: 0xbe, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xb3, offset 0x56e
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x87},
-	{value: 0x0008, lo: 0x88, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x0008, lo: 0x8a, hi: 0x8d},
-	{value: 0x0040, lo: 0x8e, hi: 0x8e},
-	{value: 0x0008, lo: 0x8f, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9e},
-	{value: 0x0008, lo: 0x9f, hi: 0xa8},
-	{value: 0x0018, lo: 0xa9, hi: 0xa9},
-	{value: 0x0040, lo: 0xaa, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbf},
-	// Block 0xb4, offset 0x57b
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0008, lo: 0x80, hi: 0x9e},
-	{value: 0x1308, lo: 0x9f, hi: 0x9f},
-	{value: 0x1008, lo: 0xa0, hi: 0xa2},
-	{value: 0x1308, lo: 0xa3, hi: 0xa9},
-	{value: 0x1b08, lo: 0xaa, hi: 0xaa},
-	{value: 0x0040, lo: 0xab, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb9},
-	{value: 0x0040, lo: 0xba, hi: 0xbf},
-	// Block 0xb5, offset 0x584
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xb4},
-	{value: 0x1008, lo: 0xb5, hi: 0xb7},
-	{value: 0x1308, lo: 0xb8, hi: 0xbf},
-	// Block 0xb6, offset 0x588
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x1008, lo: 0x80, hi: 0x81},
-	{value: 0x1b08, lo: 0x82, hi: 0x82},
-	{value: 0x1308, lo: 0x83, hi: 0x84},
-	{value: 0x1008, lo: 0x85, hi: 0x85},
-	{value: 0x1308, lo: 0x86, hi: 0x86},
-	{value: 0x0008, lo: 0x87, hi: 0x8a},
-	{value: 0x0018, lo: 0x8b, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9a},
-	{value: 0x0018, lo: 0x9b, hi: 0x9b},
-	{value: 0x0040, lo: 0x9c, hi: 0x9c},
-	{value: 0x0018, lo: 0x9d, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0xbf},
-	// Block 0xb7, offset 0x596
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x1008, lo: 0xb0, hi: 0xb2},
-	{value: 0x1308, lo: 0xb3, hi: 0xb8},
-	{value: 0x1008, lo: 0xb9, hi: 0xb9},
-	{value: 0x1308, lo: 0xba, hi: 0xba},
-	{value: 0x1008, lo: 0xbb, hi: 0xbe},
-	{value: 0x1308, lo: 0xbf, hi: 0xbf},
-	// Block 0xb8, offset 0x59e
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x1308, lo: 0x80, hi: 0x80},
-	{value: 0x1008, lo: 0x81, hi: 0x81},
-	{value: 0x1b08, lo: 0x82, hi: 0x82},
-	{value: 0x1308, lo: 0x83, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0x85},
-	{value: 0x0018, lo: 0x86, hi: 0x86},
-	{value: 0x0008, lo: 0x87, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xb9, offset 0x5a9
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0008, lo: 0x80, hi: 0xae},
-	{value: 0x1008, lo: 0xaf, hi: 0xb1},
-	{value: 0x1308, lo: 0xb2, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xb7},
-	{value: 0x1008, lo: 0xb8, hi: 0xbb},
-	{value: 0x1308, lo: 0xbc, hi: 0xbd},
-	{value: 0x1008, lo: 0xbe, hi: 0xbe},
-	{value: 0x1b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xba, offset 0x5b2
-	{value: 0x0000, lo: 0x05},
-	{value: 0x1308, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x97},
-	{value: 0x0008, lo: 0x98, hi: 0x9b},
-	{value: 0x1308, lo: 0x9c, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0xbf},
-	// Block 0xbb, offset 0x5b8
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x1008, lo: 0xb0, hi: 0xb2},
-	{value: 0x1308, lo: 0xb3, hi: 0xba},
-	{value: 0x1008, lo: 0xbb, hi: 0xbc},
-	{value: 0x1308, lo: 0xbd, hi: 0xbd},
-	{value: 0x1008, lo: 0xbe, hi: 0xbe},
-	{value: 0x1b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xbc, offset 0x5c0
-	{value: 0x0000, lo: 0x08},
-	{value: 0x1308, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x83},
-	{value: 0x0008, lo: 0x84, hi: 0x84},
-	{value: 0x0040, lo: 0x85, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xac},
-	{value: 0x0040, lo: 0xad, hi: 0xbf},
-	// Block 0xbd, offset 0x5c9
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0xaa},
-	{value: 0x1308, lo: 0xab, hi: 0xab},
-	{value: 0x1008, lo: 0xac, hi: 0xac},
-	{value: 0x1308, lo: 0xad, hi: 0xad},
-	{value: 0x1008, lo: 0xae, hi: 0xaf},
-	{value: 0x1308, lo: 0xb0, hi: 0xb5},
-	{value: 0x1808, lo: 0xb6, hi: 0xb6},
-	{value: 0x1308, lo: 0xb7, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xbf},
-	// Block 0xbe, offset 0x5d3
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x89},
-	{value: 0x0040, lo: 0x8a, hi: 0xbf},
-	// Block 0xbf, offset 0x5d6
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9c},
-	{value: 0x1308, lo: 0x9d, hi: 0x9f},
-	{value: 0x1008, lo: 0xa0, hi: 0xa1},
-	{value: 0x1308, lo: 0xa2, hi: 0xa5},
-	{value: 0x1008, lo: 0xa6, hi: 0xa6},
-	{value: 0x1308, lo: 0xa7, hi: 0xaa},
-	{value: 0x1b08, lo: 0xab, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xb9},
-	{value: 0x0018, lo: 0xba, hi: 0xbf},
-	// Block 0xc0, offset 0x5e2
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0040, lo: 0x80, hi: 0x9f},
-	{value: 0x049d, lo: 0xa0, hi: 0xbf},
-	// Block 0xc1, offset 0x5e5
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xa9},
-	{value: 0x0018, lo: 0xaa, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xbe},
-	{value: 0x0008, lo: 0xbf, hi: 0xbf},
-	// Block 0xc2, offset 0x5ea
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xb8},
-	{value: 0x0040, lo: 0xb9, hi: 0xbf},
-	// Block 0xc3, offset 0x5ed
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x89},
-	{value: 0x0008, lo: 0x8a, hi: 0xae},
-	{value: 0x1008, lo: 0xaf, hi: 0xaf},
-	{value: 0x1308, lo: 0xb0, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xb7},
-	{value: 0x1308, lo: 0xb8, hi: 0xbd},
-	{value: 0x1008, lo: 0xbe, hi: 0xbe},
-	{value: 0x1b08, lo: 0xbf, hi: 0xbf},
-	// Block 0xc4, offset 0x5f7
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0008, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0018, lo: 0x9a, hi: 0xac},
-	{value: 0x0040, lo: 0xad, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb1},
-	{value: 0x0008, lo: 0xb2, hi: 0xbf},
-	// Block 0xc5, offset 0x600
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x0008, lo: 0x80, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0x91},
-	{value: 0x1308, lo: 0x92, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xa8},
-	{value: 0x1008, lo: 0xa9, hi: 0xa9},
-	{value: 0x1308, lo: 0xaa, hi: 0xb0},
-	{value: 0x1008, lo: 0xb1, hi: 0xb1},
-	{value: 0x1308, lo: 0xb2, hi: 0xb3},
-	{value: 0x1008, lo: 0xb4, hi: 0xb4},
-	{value: 0x1308, lo: 0xb5, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0xc6, offset 0x60c
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0xbf},
-	// Block 0xc7, offset 0x60f
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0xc8, offset 0x614
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x83},
-	{value: 0x0040, lo: 0x84, hi: 0xbf},
-	// Block 0xc9, offset 0x617
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xbf},
-	// Block 0xca, offset 0x61a
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0xbf},
-	// Block 0xcb, offset 0x61d
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0008, lo: 0x80, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa9},
-	{value: 0x0040, lo: 0xaa, hi: 0xad},
-	{value: 0x0018, lo: 0xae, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0xcc, offset 0x624
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0040, lo: 0x80, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xaf},
-	{value: 0x1308, lo: 0xb0, hi: 0xb4},
-	{value: 0x0018, lo: 0xb5, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0xcd, offset 0x62b
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0xaf},
-	{value: 0x1308, lo: 0xb0, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xbf},
-	// Block 0xce, offset 0x62f
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x0008, lo: 0x80, hi: 0x83},
-	{value: 0x0018, lo: 0x84, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9a},
-	{value: 0x0018, lo: 0x9b, hi: 0xa1},
-	{value: 0x0040, lo: 0xa2, hi: 0xa2},
-	{value: 0x0008, lo: 0xa3, hi: 0xb7},
-	{value: 0x0040, lo: 0xb8, hi: 0xbc},
-	{value: 0x0008, lo: 0xbd, hi: 0xbf},
-	// Block 0xcf, offset 0x63a
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0xbf},
-	// Block 0xd0, offset 0x63d
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x84},
-	{value: 0x0040, lo: 0x85, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x90},
-	{value: 0x1008, lo: 0x91, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xd1, offset 0x643
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0040, lo: 0x80, hi: 0x8e},
-	{value: 0x1308, lo: 0x8f, hi: 0x92},
-	{value: 0x0008, lo: 0x93, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0xd2, offset 0x648
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0040, lo: 0x80, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xa0},
-	{value: 0x0040, lo: 0xa1, hi: 0xbf},
-	// Block 0xd3, offset 0x64c
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xac},
-	{value: 0x0040, lo: 0xad, hi: 0xbf},
-	// Block 0xd4, offset 0x64f
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xb2},
-	{value: 0x0040, lo: 0xb3, hi: 0xbf},
-	// Block 0xd5, offset 0x652
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x81},
-	{value: 0x0040, lo: 0x82, hi: 0xbf},
-	// Block 0xd6, offset 0x655
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0008, lo: 0x80, hi: 0xaa},
-	{value: 0x0040, lo: 0xab, hi: 0xaf},
-	{value: 0x0008, lo: 0xb0, hi: 0xbc},
-	{value: 0x0040, lo: 0xbd, hi: 0xbf},
-	// Block 0xd7, offset 0x65a
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0008, lo: 0x80, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9b},
-	{value: 0x0018, lo: 0x9c, hi: 0x9c},
-	{value: 0x1308, lo: 0x9d, hi: 0x9e},
-	{value: 0x0018, lo: 0x9f, hi: 0x9f},
-	{value: 0x03c0, lo: 0xa0, hi: 0xa3},
-	{value: 0x0040, lo: 0xa4, hi: 0xbf},
-	// Block 0xd8, offset 0x664
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0xd9, offset 0x667
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xa6},
-	{value: 0x0040, lo: 0xa7, hi: 0xa8},
-	{value: 0x0018, lo: 0xa9, hi: 0xbf},
-	// Block 0xda, offset 0x66b
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x0018, lo: 0x80, hi: 0x9d},
-	{value: 0xb5b9, lo: 0x9e, hi: 0x9e},
-	{value: 0xb601, lo: 0x9f, hi: 0x9f},
-	{value: 0xb649, lo: 0xa0, hi: 0xa0},
-	{value: 0xb6b1, lo: 0xa1, hi: 0xa1},
-	{value: 0xb719, lo: 0xa2, hi: 0xa2},
-	{value: 0xb781, lo: 0xa3, hi: 0xa3},
-	{value: 0xb7e9, lo: 0xa4, hi: 0xa4},
-	{value: 0x1018, lo: 0xa5, hi: 0xa6},
-	{value: 0x1318, lo: 0xa7, hi: 0xa9},
-	{value: 0x0018, lo: 0xaa, hi: 0xac},
-	{value: 0x1018, lo: 0xad, hi: 0xb2},
-	{value: 0x0340, lo: 0xb3, hi: 0xba},
-	{value: 0x1318, lo: 0xbb, hi: 0xbf},
-	// Block 0xdb, offset 0x67a
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x1318, lo: 0x80, hi: 0x82},
-	{value: 0x0018, lo: 0x83, hi: 0x84},
-	{value: 0x1318, lo: 0x85, hi: 0x8b},
-	{value: 0x0018, lo: 0x8c, hi: 0xa9},
-	{value: 0x1318, lo: 0xaa, hi: 0xad},
-	{value: 0x0018, lo: 0xae, hi: 0xba},
-	{value: 0xb851, lo: 0xbb, hi: 0xbb},
-	{value: 0xb899, lo: 0xbc, hi: 0xbc},
-	{value: 0xb8e1, lo: 0xbd, hi: 0xbd},
-	{value: 0xb949, lo: 0xbe, hi: 0xbe},
-	{value: 0xb9b1, lo: 0xbf, hi: 0xbf},
-	// Block 0xdc, offset 0x686
-	{value: 0x0000, lo: 0x03},
-	{value: 0xba19, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0xa8},
-	{value: 0x0040, lo: 0xa9, hi: 0xbf},
-	// Block 0xdd, offset 0x68a
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x81},
-	{value: 0x1318, lo: 0x82, hi: 0x84},
-	{value: 0x0018, lo: 0x85, hi: 0x85},
-	{value: 0x0040, lo: 0x86, hi: 0xbf},
-	// Block 0xde, offset 0x68f
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xb1},
-	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0xdf, offset 0x694
-	{value: 0x0000, lo: 0x03},
-	{value: 0x1308, lo: 0x80, hi: 0xb6},
-	{value: 0x0018, lo: 0xb7, hi: 0xba},
-	{value: 0x1308, lo: 0xbb, hi: 0xbf},
-	// Block 0xe0, offset 0x698
-	{value: 0x0000, lo: 0x04},
-	{value: 0x1308, lo: 0x80, hi: 0xac},
-	{value: 0x0018, lo: 0xad, hi: 0xb4},
-	{value: 0x1308, lo: 0xb5, hi: 0xb5},
-	{value: 0x0018, lo: 0xb6, hi: 0xbf},
-	// Block 0xe1, offset 0x69d
-	{value: 0x0000, lo: 0x08},
-	{value: 0x0018, lo: 0x80, hi: 0x83},
-	{value: 0x1308, lo: 0x84, hi: 0x84},
-	{value: 0x0018, lo: 0x85, hi: 0x8b},
-	{value: 0x0040, lo: 0x8c, hi: 0x9a},
-	{value: 0x1308, lo: 0x9b, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xa0},
-	{value: 0x1308, lo: 0xa1, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-	// Block 0xe2, offset 0x6a6
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x1308, lo: 0x80, hi: 0x86},
-	{value: 0x0040, lo: 0x87, hi: 0x87},
-	{value: 0x1308, lo: 0x88, hi: 0x98},
-	{value: 0x0040, lo: 0x99, hi: 0x9a},
-	{value: 0x1308, lo: 0x9b, hi: 0xa1},
-	{value: 0x0040, lo: 0xa2, hi: 0xa2},
-	{value: 0x1308, lo: 0xa3, hi: 0xa4},
-	{value: 0x0040, lo: 0xa5, hi: 0xa5},
-	{value: 0x1308, lo: 0xa6, hi: 0xaa},
-	{value: 0x0040, lo: 0xab, hi: 0xbf},
-	// Block 0xe3, offset 0x6b1
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0008, lo: 0x80, hi: 0x84},
-	{value: 0x0040, lo: 0x85, hi: 0x86},
-	{value: 0x0018, lo: 0x87, hi: 0x8f},
-	{value: 0x1308, lo: 0x90, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0xbf},
-	// Block 0xe4, offset 0x6b7
-	{value: 0x0000, lo: 0x07},
-	{value: 0x0208, lo: 0x80, hi: 0x83},
-	{value: 0x1308, lo: 0x84, hi: 0x8a},
-	{value: 0x0040, lo: 0x8b, hi: 0x8f},
-	{value: 0x0008, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9d},
-	{value: 0x0018, lo: 0x9e, hi: 0x9f},
-	{value: 0x0040, lo: 0xa0, hi: 0xbf},
-	// Block 0xe5, offset 0x6bf
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0040, lo: 0x80, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb1},
-	{value: 0x0040, lo: 0xb2, hi: 0xbf},
-	// Block 0xe6, offset 0x6c3
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0xab},
-	{value: 0x0040, lo: 0xac, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xbf},
-	// Block 0xe7, offset 0x6c7
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0x93},
-	{value: 0x0040, lo: 0x94, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xae},
-	{value: 0x0040, lo: 0xaf, hi: 0xb0},
-	{value: 0x0018, lo: 0xb1, hi: 0xbf},
-	// Block 0xe8, offset 0x6cd
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0018, lo: 0x81, hi: 0x8f},
-	{value: 0x0040, lo: 0x90, hi: 0x90},
-	{value: 0x0018, lo: 0x91, hi: 0xb5},
-	{value: 0x0040, lo: 0xb6, hi: 0xbf},
-	// Block 0xe9, offset 0x6d3
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x8f},
-	{value: 0xc1c1, lo: 0x90, hi: 0x90},
-	{value: 0x0018, lo: 0x91, hi: 0xac},
-	{value: 0x0040, lo: 0xad, hi: 0xbf},
-	// Block 0xea, offset 0x6d8
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0040, lo: 0x80, hi: 0xa5},
-	{value: 0x0018, lo: 0xa6, hi: 0xbf},
-	// Block 0xeb, offset 0x6db
-	{value: 0x0000, lo: 0x0d},
-	{value: 0xc7e9, lo: 0x80, hi: 0x80},
-	{value: 0xc839, lo: 0x81, hi: 0x81},
-	{value: 0xc889, lo: 0x82, hi: 0x82},
-	{value: 0xc8d9, lo: 0x83, hi: 0x83},
-	{value: 0xc929, lo: 0x84, hi: 0x84},
-	{value: 0xc979, lo: 0x85, hi: 0x85},
-	{value: 0xc9c9, lo: 0x86, hi: 0x86},
-	{value: 0xca19, lo: 0x87, hi: 0x87},
-	{value: 0xca69, lo: 0x88, hi: 0x88},
-	{value: 0x0040, lo: 0x89, hi: 0x8f},
-	{value: 0xcab9, lo: 0x90, hi: 0x90},
-	{value: 0xcad9, lo: 0x91, hi: 0x91},
-	{value: 0x0040, lo: 0x92, hi: 0xbf},
-	// Block 0xec, offset 0x6e9
-	{value: 0x0000, lo: 0x06},
-	{value: 0x0018, lo: 0x80, hi: 0x92},
-	{value: 0x0040, lo: 0x93, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xac},
-	{value: 0x0040, lo: 0xad, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb6},
-	{value: 0x0040, lo: 0xb7, hi: 0xbf},
-	// Block 0xed, offset 0x6f0
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0xb3},
-	{value: 0x0040, lo: 0xb4, hi: 0xbf},
-	// Block 0xee, offset 0x6f3
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0x94},
-	{value: 0x0040, lo: 0x95, hi: 0xbf},
-	// Block 0xef, offset 0x6f6
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0018, lo: 0x80, hi: 0x8b},
-	{value: 0x0040, lo: 0x8c, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0xbf},
-	// Block 0xf0, offset 0x6fa
-	{value: 0x0000, lo: 0x05},
-	{value: 0x0018, lo: 0x80, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0x99},
-	{value: 0x0040, lo: 0x9a, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xbf},
-	// Block 0xf1, offset 0x700
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x87},
-	{value: 0x0040, lo: 0x88, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0xad},
-	{value: 0x0040, lo: 0xae, hi: 0xbf},
-	// Block 0xf2, offset 0x705
-	{value: 0x0000, lo: 0x09},
-	{value: 0x0040, lo: 0x80, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0x9f},
-	{value: 0x0018, lo: 0xa0, hi: 0xa7},
-	{value: 0x0040, lo: 0xa8, hi: 0xaf},
-	{value: 0x0018, lo: 0xb0, hi: 0xb0},
-	{value: 0x0040, lo: 0xb1, hi: 0xb2},
-	{value: 0x0018, lo: 0xb3, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xf3, offset 0x70f
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0018, lo: 0x80, hi: 0x8b},
-	{value: 0x0040, lo: 0x8c, hi: 0x8f},
-	{value: 0x0018, lo: 0x90, hi: 0x9e},
-	{value: 0x0040, lo: 0x9f, hi: 0xbf},
-	// Block 0xf4, offset 0x714
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0x91},
-	{value: 0x0040, lo: 0x92, hi: 0xbf},
-	// Block 0xf5, offset 0x717
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0018, lo: 0x80, hi: 0x80},
-	{value: 0x0040, lo: 0x81, hi: 0xbf},
-	// Block 0xf6, offset 0x71a
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0x96},
-	{value: 0x0040, lo: 0x97, hi: 0xbf},
-	// Block 0xf7, offset 0x71d
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xb4},
-	{value: 0x0040, lo: 0xb5, hi: 0xbf},
-	// Block 0xf8, offset 0x720
-	{value: 0x0000, lo: 0x03},
-	{value: 0x0008, lo: 0x80, hi: 0x9d},
-	{value: 0x0040, lo: 0x9e, hi: 0x9f},
-	{value: 0x0008, lo: 0xa0, hi: 0xbf},
-	// Block 0xf9, offset 0x724
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0008, lo: 0x80, hi: 0xa1},
-	{value: 0x0040, lo: 0xa2, hi: 0xbf},
-	// Block 0xfa, offset 0x727
-	{value: 0x0020, lo: 0x0f},
-	{value: 0xdeb9, lo: 0x80, hi: 0x89},
-	{value: 0x8dfd, lo: 0x8a, hi: 0x8a},
-	{value: 0xdff9, lo: 0x8b, hi: 0x9c},
-	{value: 0x8e1d, lo: 0x9d, hi: 0x9d},
-	{value: 0xe239, lo: 0x9e, hi: 0xa2},
-	{value: 0x8e3d, lo: 0xa3, hi: 0xa3},
-	{value: 0xe2d9, lo: 0xa4, hi: 0xab},
-	{value: 0x7ed5, lo: 0xac, hi: 0xac},
-	{value: 0xe3d9, lo: 0xad, hi: 0xaf},
-	{value: 0x8e5d, lo: 0xb0, hi: 0xb0},
-	{value: 0xe439, lo: 0xb1, hi: 0xb6},
-	{value: 0x8e7d, lo: 0xb7, hi: 0xb9},
-	{value: 0xe4f9, lo: 0xba, hi: 0xba},
-	{value: 0x8edd, lo: 0xbb, hi: 0xbb},
-	{value: 0xe519, lo: 0xbc, hi: 0xbf},
-	// Block 0xfb, offset 0x737
-	{value: 0x0020, lo: 0x10},
-	{value: 0x937d, lo: 0x80, hi: 0x80},
-	{value: 0xf099, lo: 0x81, hi: 0x86},
-	{value: 0x939d, lo: 0x87, hi: 0x8a},
-	{value: 0xd9f9, lo: 0x8b, hi: 0x8b},
-	{value: 0xf159, lo: 0x8c, hi: 0x96},
-	{value: 0x941d, lo: 0x97, hi: 0x97},
-	{value: 0xf2b9, lo: 0x98, hi: 0xa3},
-	{value: 0x943d, lo: 0xa4, hi: 0xa6},
-	{value: 0xf439, lo: 0xa7, hi: 0xaa},
-	{value: 0x949d, lo: 0xab, hi: 0xab},
-	{value: 0xf4b9, lo: 0xac, hi: 0xac},
-	{value: 0x94bd, lo: 0xad, hi: 0xad},
-	{value: 0xf4d9, lo: 0xae, hi: 0xaf},
-	{value: 0x94dd, lo: 0xb0, hi: 0xb1},
-	{value: 0xf519, lo: 0xb2, hi: 0xbe},
-	{value: 0x0040, lo: 0xbf, hi: 0xbf},
-	// Block 0xfc, offset 0x748
-	{value: 0x0000, lo: 0x04},
-	{value: 0x0040, lo: 0x80, hi: 0x80},
-	{value: 0x0340, lo: 0x81, hi: 0x81},
-	{value: 0x0040, lo: 0x82, hi: 0x9f},
-	{value: 0x0340, lo: 0xa0, hi: 0xbf},
-	// Block 0xfd, offset 0x74d
-	{value: 0x0000, lo: 0x01},
-	{value: 0x0340, lo: 0x80, hi: 0xbf},
-	// Block 0xfe, offset 0x74f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x13c0, lo: 0x80, hi: 0xbf},
-	// Block 0xff, offset 0x751
-	{value: 0x0000, lo: 0x02},
-	{value: 0x13c0, lo: 0x80, hi: 0xaf},
-	{value: 0x0040, lo: 0xb0, hi: 0xbf},
-}
-
-// Total table size 41559 bytes (40KiB); checksum: F4A1FA4E
diff --git a/vendor/golang.org/x/net/idna/trie.go b/vendor/golang.org/x/net/idna/trie.go
deleted file mode 100644
index c4ef847e7a..0000000000
--- a/vendor/golang.org/x/net/idna/trie.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package idna
-
-// appendMapping appends the mapping for the respective rune. isMapped must be
-// true. A mapping is a categorization of a rune as defined in UTS #46.
-func (c info) appendMapping(b []byte, s string) []byte {
-	index := int(c >> indexShift)
-	if c&xorBit == 0 {
-		s := mappings[index:]
-		return append(b, s[1:s[0]+1]...)
-	}
-	b = append(b, s...)
-	if c&inlineXOR == inlineXOR {
-		// TODO: support and handle two-byte inline masks
-		b[len(b)-1] ^= byte(index)
-	} else {
-		for p := len(b) - int(xorData[index]); p < len(b); p++ {
-			index++
-			b[p] ^= xorData[index]
-		}
-	}
-	return b
-}
-
-// Sparse block handling code.
-
-type valueRange struct {
-	value  uint16 // header: value:stride
-	lo, hi byte   // header: lo:n
-}
-
-type sparseBlocks struct {
-	values []valueRange
-	offset []uint16
-}
-
-var idnaSparse = sparseBlocks{
-	values: idnaSparseValues[:],
-	offset: idnaSparseOffset[:],
-}
-
-// Don't use newIdnaTrie to avoid unconditional linking in of the table.
-var trie = &idnaTrie{}
-
-// lookup determines the type of block n and looks up the value for b.
-// For n < t.cutoff, the block is a simple lookup table. Otherwise, the block
-// is a list of ranges with an accompanying value. Given a matching range r,
-// the value for b is by r.value + (b - r.lo) * stride.
-func (t *sparseBlocks) lookup(n uint32, b byte) uint16 {
-	offset := t.offset[n]
-	header := t.values[offset]
-	lo := offset + 1
-	hi := lo + uint16(header.lo)
-	for lo < hi {
-		m := lo + (hi-lo)/2
-		r := t.values[m]
-		if r.lo <= b && b <= r.hi {
-			return r.value + uint16(b-r.lo)*header.value
-		}
-		if b < r.lo {
-			hi = m
-		} else {
-			lo = m + 1
-		}
-	}
-	return 0
-}
diff --git a/vendor/golang.org/x/net/idna/trieval.go b/vendor/golang.org/x/net/idna/trieval.go
deleted file mode 100644
index 63cb03b59b..0000000000
--- a/vendor/golang.org/x/net/idna/trieval.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package idna
-
-// This file contains definitions for interpreting the trie value of the idna
-// trie generated by "go run gen*.go". It is shared by both the generator
-// program and the resultant package. Sharing is achieved by the generator
-// copying gen_trieval.go to trieval.go and changing what's above this comment.
-
-// info holds information from the IDNA mapping table for a single rune. It is
-// the value returned by a trie lookup. In most cases, all information fits in
-// a 16-bit value. For mappings, this value may contain an index into a slice
-// with the mapped string. Such mappings can consist of the actual mapped value
-// or an XOR pattern to be applied to the bytes of the UTF8 encoding of the
-// input rune. This technique is used by the cases packages and reduces the
-// table size significantly.
-//
-// The per-rune values have the following format:
-//
-//   if mapped {
-//     if inlinedXOR {
-//       15..13 inline XOR marker
-//       12..11 unused
-//       10..3  inline XOR mask
-//     } else {
-//       15..3  index into xor or mapping table
-//     }
-//   } else {
-//       15..13 unused
-//           12 modifier (including virama)
-//           11 virama modifier
-//       10..8  joining type
-//        7..3  category type
-//   }
-//      2  use xor pattern
-//   1..0  mapped category
-//
-// See the definitions below for a more detailed description of the various
-// bits.
-type info uint16
-
-const (
-	catSmallMask = 0x3
-	catBigMask   = 0xF8
-	indexShift   = 3
-	xorBit       = 0x4    // interpret the index as an xor pattern
-	inlineXOR    = 0xE000 // These bits are set if the XOR pattern is inlined.
-
-	joinShift = 8
-	joinMask  = 0x07
-
-	viramaModifier = 0x0800
-	modifier       = 0x1000
-)
-
-// A category corresponds to a category defined in the IDNA mapping table.
-type category uint16
-
-const (
-	unknown              category = 0 // not defined currently in unicode.
-	mapped               category = 1
-	disallowedSTD3Mapped category = 2
-	deviation            category = 3
-)
-
-const (
-	valid               category = 0x08
-	validNV8            category = 0x18
-	validXV8            category = 0x28
-	disallowed          category = 0x40
-	disallowedSTD3Valid category = 0x80
-	ignored             category = 0xC0
-)
-
-// join types and additional rune information
-const (
-	joiningL = (iota + 1)
-	joiningD
-	joiningT
-	joiningR
-
-	//the following types are derived during processing
-	joinZWJ
-	joinZWNJ
-	joinVirama
-	numJoinTypes
-)
-
-func (c info) isMapped() bool {
-	return c&0x3 != 0
-}
-
-func (c info) category() category {
-	small := c & catSmallMask
-	if small != 0 {
-		return category(small)
-	}
-	return category(c & catBigMask)
-}
-
-func (c info) joinType() info {
-	if c.isMapped() {
-		return 0
-	}
-	return (c >> joinShift) & joinMask
-}
-
-func (c info) isModifier() bool {
-	return c&(modifier|catSmallMask) == modifier
-}
-
-func (c info) isViramaModifier() bool {
-	return c&(viramaModifier|catSmallMask) == viramaModifier
-}
diff --git a/vendor/golang.org/x/net/proxy/direct.go b/vendor/golang.org/x/net/proxy/direct.go
deleted file mode 100644
index 4c5ad88b1e..0000000000
--- a/vendor/golang.org/x/net/proxy/direct.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"net"
-)
-
-type direct struct{}
-
-// Direct is a direct proxy: one that makes network connections directly.
-var Direct = direct{}
-
-func (direct) Dial(network, addr string) (net.Conn, error) {
-	return net.Dial(network, addr)
-}
diff --git a/vendor/golang.org/x/net/proxy/per_host.go b/vendor/golang.org/x/net/proxy/per_host.go
deleted file mode 100644
index f540b196f7..0000000000
--- a/vendor/golang.org/x/net/proxy/per_host.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"net"
-	"strings"
-)
-
-// A PerHost directs connections to a default Dialer unless the hostname
-// requested matches one of a number of exceptions.
-type PerHost struct {
-	def, bypass Dialer
-
-	bypassNetworks []*net.IPNet
-	bypassIPs      []net.IP
-	bypassZones    []string
-	bypassHosts    []string
-}
-
-// NewPerHost returns a PerHost Dialer that directs connections to either
-// defaultDialer or bypass, depending on whether the connection matches one of
-// the configured rules.
-func NewPerHost(defaultDialer, bypass Dialer) *PerHost {
-	return &PerHost{
-		def:    defaultDialer,
-		bypass: bypass,
-	}
-}
-
-// Dial connects to the address addr on the given network through either
-// defaultDialer or bypass.
-func (p *PerHost) Dial(network, addr string) (c net.Conn, err error) {
-	host, _, err := net.SplitHostPort(addr)
-	if err != nil {
-		return nil, err
-	}
-
-	return p.dialerForRequest(host).Dial(network, addr)
-}
-
-func (p *PerHost) dialerForRequest(host string) Dialer {
-	if ip := net.ParseIP(host); ip != nil {
-		for _, net := range p.bypassNetworks {
-			if net.Contains(ip) {
-				return p.bypass
-			}
-		}
-		for _, bypassIP := range p.bypassIPs {
-			if bypassIP.Equal(ip) {
-				return p.bypass
-			}
-		}
-		return p.def
-	}
-
-	for _, zone := range p.bypassZones {
-		if strings.HasSuffix(host, zone) {
-			return p.bypass
-		}
-		if host == zone[1:] {
-			// For a zone "example.com", we match "example.com"
-			// too.
-			return p.bypass
-		}
-	}
-	for _, bypassHost := range p.bypassHosts {
-		if bypassHost == host {
-			return p.bypass
-		}
-	}
-	return p.def
-}
-
-// AddFromString parses a string that contains comma-separated values
-// specifying hosts that should use the bypass proxy. Each value is either an
-// IP address, a CIDR range, a zone (*.example.com) or a hostname
-// (localhost). A best effort is made to parse the string and errors are
-// ignored.
-func (p *PerHost) AddFromString(s string) {
-	hosts := strings.Split(s, ",")
-	for _, host := range hosts {
-		host = strings.TrimSpace(host)
-		if len(host) == 0 {
-			continue
-		}
-		if strings.Contains(host, "/") {
-			// We assume that it's a CIDR address like 127.0.0.0/8
-			if _, net, err := net.ParseCIDR(host); err == nil {
-				p.AddNetwork(net)
-			}
-			continue
-		}
-		if ip := net.ParseIP(host); ip != nil {
-			p.AddIP(ip)
-			continue
-		}
-		if strings.HasPrefix(host, "*.") {
-			p.AddZone(host[1:])
-			continue
-		}
-		p.AddHost(host)
-	}
-}
-
-// AddIP specifies an IP address that will use the bypass proxy. Note that
-// this will only take effect if a literal IP address is dialed. A connection
-// to a named host will never match an IP.
-func (p *PerHost) AddIP(ip net.IP) {
-	p.bypassIPs = append(p.bypassIPs, ip)
-}
-
-// AddNetwork specifies an IP range that will use the bypass proxy. Note that
-// this will only take effect if a literal IP address is dialed. A connection
-// to a named host will never match.
-func (p *PerHost) AddNetwork(net *net.IPNet) {
-	p.bypassNetworks = append(p.bypassNetworks, net)
-}
-
-// AddZone specifies a DNS suffix that will use the bypass proxy. A zone of
-// "example.com" matches "example.com" and all of its subdomains.
-func (p *PerHost) AddZone(zone string) {
-	if strings.HasSuffix(zone, ".") {
-		zone = zone[:len(zone)-1]
-	}
-	if !strings.HasPrefix(zone, ".") {
-		zone = "." + zone
-	}
-	p.bypassZones = append(p.bypassZones, zone)
-}
-
-// AddHost specifies a hostname that will use the bypass proxy.
-func (p *PerHost) AddHost(host string) {
-	if strings.HasSuffix(host, ".") {
-		host = host[:len(host)-1]
-	}
-	p.bypassHosts = append(p.bypassHosts, host)
-}
diff --git a/vendor/golang.org/x/net/proxy/proxy.go b/vendor/golang.org/x/net/proxy/proxy.go
deleted file mode 100644
index 78a8b7bee9..0000000000
--- a/vendor/golang.org/x/net/proxy/proxy.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package proxy provides support for a variety of protocols to proxy network
-// data.
-package proxy // import "golang.org/x/net/proxy"
-
-import (
-	"errors"
-	"net"
-	"net/url"
-	"os"
-)
-
-// A Dialer is a means to establish a connection.
-type Dialer interface {
-	// Dial connects to the given address via the proxy.
-	Dial(network, addr string) (c net.Conn, err error)
-}
-
-// Auth contains authentication parameters that specific Dialers may require.
-type Auth struct {
-	User, Password string
-}
-
-// FromEnvironment returns the dialer specified by the proxy related variables in
-// the environment.
-func FromEnvironment() Dialer {
-	allProxy := os.Getenv("all_proxy")
-	if len(allProxy) == 0 {
-		return Direct
-	}
-
-	proxyURL, err := url.Parse(allProxy)
-	if err != nil {
-		return Direct
-	}
-	proxy, err := FromURL(proxyURL, Direct)
-	if err != nil {
-		return Direct
-	}
-
-	noProxy := os.Getenv("no_proxy")
-	if len(noProxy) == 0 {
-		return proxy
-	}
-
-	perHost := NewPerHost(proxy, Direct)
-	perHost.AddFromString(noProxy)
-	return perHost
-}
-
-// proxySchemes is a map from URL schemes to a function that creates a Dialer
-// from a URL with such a scheme.
-var proxySchemes map[string]func(*url.URL, Dialer) (Dialer, error)
-
-// RegisterDialerType takes a URL scheme and a function to generate Dialers from
-// a URL with that scheme and a forwarding Dialer. Registered schemes are used
-// by FromURL.
-func RegisterDialerType(scheme string, f func(*url.URL, Dialer) (Dialer, error)) {
-	if proxySchemes == nil {
-		proxySchemes = make(map[string]func(*url.URL, Dialer) (Dialer, error))
-	}
-	proxySchemes[scheme] = f
-}
-
-// FromURL returns a Dialer given a URL specification and an underlying
-// Dialer for it to make network requests.
-func FromURL(u *url.URL, forward Dialer) (Dialer, error) {
-	var auth *Auth
-	if u.User != nil {
-		auth = new(Auth)
-		auth.User = u.User.Username()
-		if p, ok := u.User.Password(); ok {
-			auth.Password = p
-		}
-	}
-
-	switch u.Scheme {
-	case "socks5":
-		return SOCKS5("tcp", u.Host, auth, forward)
-	}
-
-	// If the scheme doesn't match any of the built-in schemes, see if it
-	// was registered by another package.
-	if proxySchemes != nil {
-		if f, ok := proxySchemes[u.Scheme]; ok {
-			return f(u, forward)
-		}
-	}
-
-	return nil, errors.New("proxy: unknown scheme: " + u.Scheme)
-}
diff --git a/vendor/golang.org/x/net/proxy/socks5.go b/vendor/golang.org/x/net/proxy/socks5.go
deleted file mode 100644
index 973f57f197..0000000000
--- a/vendor/golang.org/x/net/proxy/socks5.go
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"errors"
-	"io"
-	"net"
-	"strconv"
-)
-
-// SOCKS5 returns a Dialer that makes SOCKSv5 connections to the given address
-// with an optional username and password. See RFC 1928.
-func SOCKS5(network, addr string, auth *Auth, forward Dialer) (Dialer, error) {
-	s := &socks5{
-		network: network,
-		addr:    addr,
-		forward: forward,
-	}
-	if auth != nil {
-		s.user = auth.User
-		s.password = auth.Password
-	}
-
-	return s, nil
-}
-
-type socks5 struct {
-	user, password string
-	network, addr  string
-	forward        Dialer
-}
-
-const socks5Version = 5
-
-const (
-	socks5AuthNone     = 0
-	socks5AuthPassword = 2
-)
-
-const socks5Connect = 1
-
-const (
-	socks5IP4    = 1
-	socks5Domain = 3
-	socks5IP6    = 4
-)
-
-var socks5Errors = []string{
-	"",
-	"general failure",
-	"connection forbidden",
-	"network unreachable",
-	"host unreachable",
-	"connection refused",
-	"TTL expired",
-	"command not supported",
-	"address type not supported",
-}
-
-// Dial connects to the address addr on the network net via the SOCKS5 proxy.
-func (s *socks5) Dial(network, addr string) (net.Conn, error) {
-	switch network {
-	case "tcp", "tcp6", "tcp4":
-	default:
-		return nil, errors.New("proxy: no support for SOCKS5 proxy connections of type " + network)
-	}
-
-	conn, err := s.forward.Dial(s.network, s.addr)
-	if err != nil {
-		return nil, err
-	}
-	if err := s.connect(conn, addr); err != nil {
-		conn.Close()
-		return nil, err
-	}
-	return conn, nil
-}
-
-// connect takes an existing connection to a socks5 proxy server,
-// and commands the server to extend that connection to target,
-// which must be a canonical address with a host and port.
-func (s *socks5) connect(conn net.Conn, target string) error {
-	host, portStr, err := net.SplitHostPort(target)
-	if err != nil {
-		return err
-	}
-
-	port, err := strconv.Atoi(portStr)
-	if err != nil {
-		return errors.New("proxy: failed to parse port number: " + portStr)
-	}
-	if port < 1 || port > 0xffff {
-		return errors.New("proxy: port number out of range: " + portStr)
-	}
-
-	// the size here is just an estimate
-	buf := make([]byte, 0, 6+len(host))
-
-	buf = append(buf, socks5Version)
-	if len(s.user) > 0 && len(s.user) < 256 && len(s.password) < 256 {
-		buf = append(buf, 2 /* num auth methods */, socks5AuthNone, socks5AuthPassword)
-	} else {
-		buf = append(buf, 1 /* num auth methods */, socks5AuthNone)
-	}
-
-	if _, err := conn.Write(buf); err != nil {
-		return errors.New("proxy: failed to write greeting to SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	if _, err := io.ReadFull(conn, buf[:2]); err != nil {
-		return errors.New("proxy: failed to read greeting from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-	if buf[0] != 5 {
-		return errors.New("proxy: SOCKS5 proxy at " + s.addr + " has unexpected version " + strconv.Itoa(int(buf[0])))
-	}
-	if buf[1] == 0xff {
-		return errors.New("proxy: SOCKS5 proxy at " + s.addr + " requires authentication")
-	}
-
-	if buf[1] == socks5AuthPassword {
-		buf = buf[:0]
-		buf = append(buf, 1 /* password protocol version */)
-		buf = append(buf, uint8(len(s.user)))
-		buf = append(buf, s.user...)
-		buf = append(buf, uint8(len(s.password)))
-		buf = append(buf, s.password...)
-
-		if _, err := conn.Write(buf); err != nil {
-			return errors.New("proxy: failed to write authentication request to SOCKS5 proxy at " + s.addr + ": " + err.Error())
-		}
-
-		if _, err := io.ReadFull(conn, buf[:2]); err != nil {
-			return errors.New("proxy: failed to read authentication reply from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-		}
-
-		if buf[1] != 0 {
-			return errors.New("proxy: SOCKS5 proxy at " + s.addr + " rejected username/password")
-		}
-	}
-
-	buf = buf[:0]
-	buf = append(buf, socks5Version, socks5Connect, 0 /* reserved */)
-
-	if ip := net.ParseIP(host); ip != nil {
-		if ip4 := ip.To4(); ip4 != nil {
-			buf = append(buf, socks5IP4)
-			ip = ip4
-		} else {
-			buf = append(buf, socks5IP6)
-		}
-		buf = append(buf, ip...)
-	} else {
-		if len(host) > 255 {
-			return errors.New("proxy: destination hostname too long: " + host)
-		}
-		buf = append(buf, socks5Domain)
-		buf = append(buf, byte(len(host)))
-		buf = append(buf, host...)
-	}
-	buf = append(buf, byte(port>>8), byte(port))
-
-	if _, err := conn.Write(buf); err != nil {
-		return errors.New("proxy: failed to write connect request to SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	if _, err := io.ReadFull(conn, buf[:4]); err != nil {
-		return errors.New("proxy: failed to read connect reply from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	failure := "unknown error"
-	if int(buf[1]) < len(socks5Errors) {
-		failure = socks5Errors[buf[1]]
-	}
-
-	if len(failure) > 0 {
-		return errors.New("proxy: SOCKS5 proxy at " + s.addr + " failed to connect: " + failure)
-	}
-
-	bytesToDiscard := 0
-	switch buf[3] {
-	case socks5IP4:
-		bytesToDiscard = net.IPv4len
-	case socks5IP6:
-		bytesToDiscard = net.IPv6len
-	case socks5Domain:
-		_, err := io.ReadFull(conn, buf[:1])
-		if err != nil {
-			return errors.New("proxy: failed to read domain length from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-		}
-		bytesToDiscard = int(buf[0])
-	default:
-		return errors.New("proxy: got unknown address type " + strconv.Itoa(int(buf[3])) + " from SOCKS5 proxy at " + s.addr)
-	}
-
-	if cap(buf) < bytesToDiscard {
-		buf = make([]byte, bytesToDiscard)
-	} else {
-		buf = buf[:bytesToDiscard]
-	}
-	if _, err := io.ReadFull(conn, buf); err != nil {
-		return errors.New("proxy: failed to read address from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	// Also need to discard the port number
-	if _, err := io.ReadFull(conn, buf[:2]); err != nil {
-		return errors.New("proxy: failed to read port from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	return nil
-}
diff --git a/vendor/golang.org/x/sys/LICENSE b/vendor/golang.org/x/sys/LICENSE
deleted file mode 100644
index 6a66aea5ea..0000000000
--- a/vendor/golang.org/x/sys/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/sys/PATENTS b/vendor/golang.org/x/sys/PATENTS
deleted file mode 100644
index 733099041f..0000000000
--- a/vendor/golang.org/x/sys/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/sys/unix/README.md b/vendor/golang.org/x/sys/unix/README.md
deleted file mode 100644
index bc6f6031f1..0000000000
--- a/vendor/golang.org/x/sys/unix/README.md
+++ /dev/null
@@ -1,173 +0,0 @@
-# Building `sys/unix`
-
-The sys/unix package provides access to the raw system call interface of the
-underlying operating system. See: https://godoc.org/golang.org/x/sys/unix
-
-Porting Go to a new architecture/OS combination or adding syscalls, types, or
-constants to an existing architecture/OS pair requires some manual effort;
-however, there are tools that automate much of the process.
-
-## Build Systems
-
-There are currently two ways we generate the necessary files. We are currently
-migrating the build system to use containers so the builds are reproducible.
-This is being done on an OS-by-OS basis. Please update this documentation as
-components of the build system change.
-
-### Old Build System (currently for `GOOS != "Linux" || GOARCH == "sparc64"`)
-
-The old build system generates the Go files based on the C header files
-present on your system. This means that files
-for a given GOOS/GOARCH pair must be generated on a system with that OS and
-architecture. This also means that the generated code can differ from system
-to system, based on differences in the header files.
-
-To avoid this, if you are using the old build system, only generate the Go
-files on an installation with unmodified header files. It is also important to
-keep track of which version of the OS the files were generated from (ex.
-Darwin 14 vs Darwin 15). This makes it easier to track the progress of changes
-and have each OS upgrade correspond to a single change.
-
-To build the files for your current OS and architecture, make sure GOOS and
-GOARCH are set correctly and run `mkall.sh`. This will generate the files for
-your specific system. Running `mkall.sh -n` shows the commands that will be run.
-
-Requirements: bash, perl, go
-
-### New Build System (currently for `GOOS == "Linux" && GOARCH != "sparc64"`)
-
-The new build system uses a Docker container to generate the go files directly
-from source checkouts of the kernel and various system libraries. This means
-that on any platform that supports Docker, all the files using the new build
-system can be generated at once, and generated files will not change based on
-what the person running the scripts has installed on their computer.
-
-The OS specific files for the new build system are located in the `${GOOS}`
-directory, and the build is coordinated by the `${GOOS}/mkall.go` program. When
-the kernel or system library updates, modify the Dockerfile at
-`${GOOS}/Dockerfile` to checkout the new release of the source.
-
-To build all the files under the new build system, you must be on an amd64/Linux
-system and have your GOOS and GOARCH set accordingly. Running `mkall.sh` will
-then generate all of the files for all of the GOOS/GOARCH pairs in the new build
-system. Running `mkall.sh -n` shows the commands that will be run.
-
-Requirements: bash, perl, go, docker
-
-## Component files
-
-This section describes the various files used in the code generation process.
-It also contains instructions on how to modify these files to add a new
-architecture/OS or to add additional syscalls, types, or constants. Note that
-if you are using the new build system, the scripts cannot be called normally.
-They must be called from within the docker container.
-
-### asm files
-
-The hand-written assembly file at `asm_${GOOS}_${GOARCH}.s` implements system
-call dispatch. There are three entry points:
-```
-  func Syscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr)
-  func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr)
-  func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr)
-```
-The first and second are the standard ones; they differ only in how many
-arguments can be passed to the kernel. The third is for low-level use by the
-ForkExec wrapper. Unlike the first two, it does not call into the scheduler to
-let it know that a system call is running.
-
-When porting Go to an new architecture/OS, this file must be implemented for
-each GOOS/GOARCH pair.
-
-### mksysnum
-
-Mksysnum is a script located at `${GOOS}/mksysnum.pl` (or `mksysnum_${GOOS}.pl`
-for the old system). This script takes in a list of header files containing the
-syscall number declarations and parses them to produce the corresponding list of
-Go numeric constants. See `zsysnum_${GOOS}_${GOARCH}.go` for the generated
-constants.
-
-Adding new syscall numbers is mostly done by running the build on a sufficiently
-new installation of the target OS (or updating the source checkouts for the
-new build system). However, depending on the OS, you make need to update the
-parsing in mksysnum.
-
-### mksyscall.pl
-
-The `syscall.go`, `syscall_${GOOS}.go`, `syscall_${GOOS}_${GOARCH}.go` are
-hand-written Go files which implement system calls (for unix, the specific OS,
-or the specific OS/Architecture pair respectively) that need special handling
-and list `//sys` comments giving prototypes for ones that can be generated.
-
-The mksyscall.pl script takes the `//sys` and `//sysnb` comments and converts
-them into syscalls. This requires the name of the prototype in the comment to
-match a syscall number in the `zsysnum_${GOOS}_${GOARCH}.go` file. The function
-prototype can be exported (capitalized) or not.
-
-Adding a new syscall often just requires adding a new `//sys` function prototype
-with the desired arguments and a capitalized name so it is exported. However, if
-you want the interface to the syscall to be different, often one will make an
-unexported `//sys` prototype, an then write a custom wrapper in
-`syscall_${GOOS}.go`.
-
-### types files
-
-For each OS, there is a hand-written Go file at `${GOOS}/types.go` (or
-`types_${GOOS}.go` on the old system). This file includes standard C headers and
-creates Go type aliases to the corresponding C types. The file is then fed
-through godef to get the Go compatible definitions. Finally, the generated code
-is fed though mkpost.go to format the code correctly and remove any hidden or
-private identifiers. This cleaned-up code is written to
-`ztypes_${GOOS}_${GOARCH}.go`.
-
-The hardest part about preparing this file is figuring out which headers to
-include and which symbols need to be `#define`d to get the actual data
-structures that pass through to the kernel system calls. Some C libraries
-preset alternate versions for binary compatibility and translate them on the
-way in and out of system calls, but there is almost always a `#define` that can
-get the real ones.
-See `types_darwin.go` and `linux/types.go` for examples.
-
-To add a new type, add in the necessary include statement at the top of the
-file (if it is not already there) and add in a type alias line. Note that if
-your type is significantly different on different architectures, you may need
-some `#if/#elif` macros in your include statements.
-
-### mkerrors.sh
-
-This script is used to generate the system's various constants. This doesn't
-just include the error numbers and error strings, but also the signal numbers
-an a wide variety of miscellaneous constants. The constants come from the list
-of include files in the `includes_${uname}` variable. A regex then picks out
-the desired `#define` statements, and generates the corresponding Go constants.
-The error numbers and strings are generated from `#include <errno.h>`, and the
-signal numbers and strings are generated from `#include <signal.h>`. All of
-these constants are written to `zerrors_${GOOS}_${GOARCH}.go` via a C program,
-`_errors.c`, which prints out all the constants.
-
-To add a constant, add the header that includes it to the appropriate variable.
-Then, edit the regex (if necessary) to match the desired constant. Avoid making
-the regex too broad to avoid matching unintended constants.
-
-
-## Generated files
-
-### `zerror_${GOOS}_${GOARCH}.go`
-
-A file containing all of the system's generated error numbers, error strings,
-signal numbers, and constants. Generated by `mkerrors.sh` (see above).
-
-### `zsyscall_${GOOS}_${GOARCH}.go`
-
-A file containing all the generated syscalls for a specific GOOS and GOARCH.
-Generated by `mksyscall.pl` (see above).
-
-### `zsysnum_${GOOS}_${GOARCH}.go`
-
-A list of numeric constants for all the syscall number of the specific GOOS
-and GOARCH. Generated by mksysnum (see above).
-
-### `ztypes_${GOOS}_${GOARCH}.go`
-
-A file containing Go types for passing into (or returning from) syscalls.
-Generated by godefs and the types file (see above).
diff --git a/vendor/golang.org/x/sys/unix/asm_darwin_386.s b/vendor/golang.org/x/sys/unix/asm_darwin_386.s
deleted file mode 100644
index 8a7278319e..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_darwin_386.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for 386, Darwin
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_darwin_amd64.s b/vendor/golang.org/x/sys/unix/asm_darwin_amd64.s
deleted file mode 100644
index 6321421f27..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_darwin_amd64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for AMD64, Darwin
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	JMP	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_darwin_arm.s b/vendor/golang.org/x/sys/unix/asm_darwin_arm.s
deleted file mode 100644
index 333242d506..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_darwin_arm.s
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-// +build arm,darwin
-
-#include "textflag.h"
-
-//
-// System call support for ARM, Darwin
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	B	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	B	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	B	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-28
-	B	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_darwin_arm64.s b/vendor/golang.org/x/sys/unix/asm_darwin_arm64.s
deleted file mode 100644
index 97e0174371..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_darwin_arm64.s
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-// +build arm64,darwin
-
-#include "textflag.h"
-
-//
-// System call support for AMD64, Darwin
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	B	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	B	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	B	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	B	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s b/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s
deleted file mode 100644
index d5ed6726cc..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for AMD64, DragonFly
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-64
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-88
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-112
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-64
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-88
-	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_freebsd_386.s b/vendor/golang.org/x/sys/unix/asm_freebsd_386.s
deleted file mode 100644
index c9a0a26015..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_freebsd_386.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for 386, FreeBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s
deleted file mode 100644
index 35172477c8..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_freebsd_amd64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for AMD64, FreeBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_freebsd_arm.s b/vendor/golang.org/x/sys/unix/asm_freebsd_arm.s
deleted file mode 100644
index 9227c875bf..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_freebsd_arm.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for ARM, FreeBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	B	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	B	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	B	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-28
-	B	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_386.s b/vendor/golang.org/x/sys/unix/asm_linux_386.s
deleted file mode 100644
index 4db2909323..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_linux_386.s
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for 386, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·RawSyscall6(SB)
-
-TEXT ·socketcall(SB),NOSPLIT,$0-36
-	JMP	syscall·socketcall(SB)
-
-TEXT ·rawsocketcall(SB),NOSPLIT,$0-36
-	JMP	syscall·rawsocketcall(SB)
-
-TEXT ·seek(SB),NOSPLIT,$0-28
-	JMP	syscall·seek(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_amd64.s b/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
deleted file mode 100644
index 44e25c62f9..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for AMD64, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT ·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
-
-TEXT ·gettimeofday(SB),NOSPLIT,$0-16
-	JMP	syscall·gettimeofday(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_arm.s b/vendor/golang.org/x/sys/unix/asm_linux_arm.s
deleted file mode 100644
index cf0b574658..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_linux_arm.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for arm, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	B	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	B	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	B	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	B	syscall·RawSyscall6(SB)
-
-TEXT ·seek(SB),NOSPLIT,$0-32
-	B	syscall·seek(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_arm64.s b/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
deleted file mode 100644
index 4be9bfedea..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-// +build arm64
-// +build !gccgo
-
-#include "textflag.h"
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	B	syscall·Syscall(SB)
-
-TEXT ·Syscall6(SB),NOSPLIT,$0-80
-	B	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-	B	syscall·RawSyscall(SB)
-
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
-	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s b/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
deleted file mode 100644
index 724e580c4e..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-// +build mips64 mips64le
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for mips64, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s b/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
deleted file mode 100644
index 2ea425755e..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-// +build mips mipsle
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for mips, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	JMP syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	JMP syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	JMP syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-28
-	JMP syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	JMP syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s b/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
deleted file mode 100644
index 8d231feb4b..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-// +build ppc64 ppc64le
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for ppc64, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	BR	syscall·Syscall(SB)
-
-TEXT ·Syscall6(SB),NOSPLIT,$0-80
-	BR	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-	BR	syscall·RawSyscall(SB)
-
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
-	BR	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_s390x.s b/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
deleted file mode 100644
index 11889859fb..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build s390x
-// +build linux
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for s390x, Linux
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT ·Syscall(SB),NOSPLIT,$0-56
-	BR	syscall·Syscall(SB)
-
-TEXT ·Syscall6(SB),NOSPLIT,$0-80
-	BR	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-	BR	syscall·RawSyscall(SB)
-
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
-	BR	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_netbsd_386.s b/vendor/golang.org/x/sys/unix/asm_netbsd_386.s
deleted file mode 100644
index 48bdcd7632..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_netbsd_386.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for 386, NetBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s
deleted file mode 100644
index 2ede05c72f..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_netbsd_amd64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for AMD64, NetBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	JMP	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_netbsd_arm.s b/vendor/golang.org/x/sys/unix/asm_netbsd_arm.s
deleted file mode 100644
index e8928571c4..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_netbsd_arm.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for ARM, NetBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	B	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	B	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	B	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-28
-	B	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	B	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_openbsd_386.s b/vendor/golang.org/x/sys/unix/asm_openbsd_386.s
deleted file mode 100644
index 00576f3c83..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_openbsd_386.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for 386, OpenBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-28
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
-	JMP	syscall·Syscall9(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s b/vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s
deleted file mode 100644
index 790ef77f86..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_openbsd_amd64.s
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System call support for AMD64, OpenBSD
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-56
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·Syscall6(SB)
-
-TEXT	·Syscall9(SB),NOSPLIT,$0-104
-	JMP	syscall·Syscall9(SB)
-
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s b/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
deleted file mode 100644
index 43ed17a05f..0000000000
--- a/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gccgo
-
-#include "textflag.h"
-
-//
-// System calls for amd64, Solaris are implemented in runtime/syscall_solaris.go
-//
-
-TEXT ·sysvicall6(SB),NOSPLIT,$0-64
-	JMP	syscall·sysvicall6(SB)
-
-TEXT ·rawSysvicall6(SB),NOSPLIT,$0-64
-	JMP	syscall·rawSysvicall6(SB)
diff --git a/vendor/golang.org/x/sys/unix/bluetooth_linux.go b/vendor/golang.org/x/sys/unix/bluetooth_linux.go
deleted file mode 100644
index 6e32296970..0000000000
--- a/vendor/golang.org/x/sys/unix/bluetooth_linux.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Bluetooth sockets and messages
-
-package unix
-
-// Bluetooth Protocols
-const (
-	BTPROTO_L2CAP  = 0
-	BTPROTO_HCI    = 1
-	BTPROTO_SCO    = 2
-	BTPROTO_RFCOMM = 3
-	BTPROTO_BNEP   = 4
-	BTPROTO_CMTP   = 5
-	BTPROTO_HIDP   = 6
-	BTPROTO_AVDTP  = 7
-)
-
-const (
-	HCI_CHANNEL_RAW     = 0
-	HCI_CHANNEL_USER    = 1
-	HCI_CHANNEL_MONITOR = 2
-	HCI_CHANNEL_CONTROL = 3
-)
-
-// Socketoption Level
-const (
-	SOL_BLUETOOTH = 0x112
-	SOL_HCI       = 0x0
-	SOL_L2CAP     = 0x6
-	SOL_RFCOMM    = 0x12
-	SOL_SCO       = 0x11
-)
diff --git a/vendor/golang.org/x/sys/unix/constants.go b/vendor/golang.org/x/sys/unix/constants.go
deleted file mode 100644
index a96f0ebc26..0000000000
--- a/vendor/golang.org/x/sys/unix/constants.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix
-
-const (
-	R_OK = 0x4
-	W_OK = 0x2
-	X_OK = 0x1
-)
diff --git a/vendor/golang.org/x/sys/unix/dirent.go b/vendor/golang.org/x/sys/unix/dirent.go
deleted file mode 100644
index bd475812b7..0000000000
--- a/vendor/golang.org/x/sys/unix/dirent.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
-
-package unix
-
-import "unsafe"
-
-// readInt returns the size-bytes unsigned integer in native byte order at offset off.
-func readInt(b []byte, off, size uintptr) (u uint64, ok bool) {
-	if len(b) < int(off+size) {
-		return 0, false
-	}
-	if isBigEndian {
-		return readIntBE(b[off:], size), true
-	}
-	return readIntLE(b[off:], size), true
-}
-
-func readIntBE(b []byte, size uintptr) uint64 {
-	switch size {
-	case 1:
-		return uint64(b[0])
-	case 2:
-		_ = b[1] // bounds check hint to compiler; see golang.org/issue/14808
-		return uint64(b[1]) | uint64(b[0])<<8
-	case 4:
-		_ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
-		return uint64(b[3]) | uint64(b[2])<<8 | uint64(b[1])<<16 | uint64(b[0])<<24
-	case 8:
-		_ = b[7] // bounds check hint to compiler; see golang.org/issue/14808
-		return uint64(b[7]) | uint64(b[6])<<8 | uint64(b[5])<<16 | uint64(b[4])<<24 |
-			uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56
-	default:
-		panic("syscall: readInt with unsupported size")
-	}
-}
-
-func readIntLE(b []byte, size uintptr) uint64 {
-	switch size {
-	case 1:
-		return uint64(b[0])
-	case 2:
-		_ = b[1] // bounds check hint to compiler; see golang.org/issue/14808
-		return uint64(b[0]) | uint64(b[1])<<8
-	case 4:
-		_ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
-		return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24
-	case 8:
-		_ = b[7] // bounds check hint to compiler; see golang.org/issue/14808
-		return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 |
-			uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
-	default:
-		panic("syscall: readInt with unsupported size")
-	}
-}
-
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names. It returns the number of
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	count = 0
-	for max != 0 && len(buf) > 0 {
-		reclen, ok := direntReclen(buf)
-		if !ok || reclen > uint64(len(buf)) {
-			return origlen, count, names
-		}
-		rec := buf[:reclen]
-		buf = buf[reclen:]
-		ino, ok := direntIno(rec)
-		if !ok {
-			break
-		}
-		if ino == 0 { // File absent in directory.
-			continue
-		}
-		const namoff = uint64(unsafe.Offsetof(Dirent{}.Name))
-		namlen, ok := direntNamlen(rec)
-		if !ok || namoff+namlen > uint64(len(rec)) {
-			break
-		}
-		name := rec[namoff : namoff+namlen]
-		for i, c := range name {
-			if c == 0 {
-				name = name[:i]
-				break
-			}
-		}
-		// Check for useless names before allocating a string.
-		if string(name) == "." || string(name) == ".." {
-			continue
-		}
-		max--
-		count++
-		names = append(names, string(name))
-	}
-	return origlen - len(buf), count, names
-}
diff --git a/vendor/golang.org/x/sys/unix/endian_big.go b/vendor/golang.org/x/sys/unix/endian_big.go
deleted file mode 100644
index 5e9269063f..0000000000
--- a/vendor/golang.org/x/sys/unix/endian_big.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-// +build ppc64 s390x mips mips64
-
-package unix
-
-const isBigEndian = true
diff --git a/vendor/golang.org/x/sys/unix/endian_little.go b/vendor/golang.org/x/sys/unix/endian_little.go
deleted file mode 100644
index 085df2d8dd..0000000000
--- a/vendor/golang.org/x/sys/unix/endian_little.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-// +build 386 amd64 amd64p32 arm arm64 ppc64le mipsle mips64le
-
-package unix
-
-const isBigEndian = false
diff --git a/vendor/golang.org/x/sys/unix/env_unix.go b/vendor/golang.org/x/sys/unix/env_unix.go
deleted file mode 100644
index 45e281a047..0000000000
--- a/vendor/golang.org/x/sys/unix/env_unix.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2010 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-// Unix environment variables.
-
-package unix
-
-import "syscall"
-
-func Getenv(key string) (value string, found bool) {
-	return syscall.Getenv(key)
-}
-
-func Setenv(key, value string) error {
-	return syscall.Setenv(key, value)
-}
-
-func Clearenv() {
-	syscall.Clearenv()
-}
-
-func Environ() []string {
-	return syscall.Environ()
-}
diff --git a/vendor/golang.org/x/sys/unix/env_unset.go b/vendor/golang.org/x/sys/unix/env_unset.go
deleted file mode 100644
index 9222262559..0000000000
--- a/vendor/golang.org/x/sys/unix/env_unset.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.4
-
-package unix
-
-import "syscall"
-
-func Unsetenv(key string) error {
-	// This was added in Go 1.4.
-	return syscall.Unsetenv(key)
-}
diff --git a/vendor/golang.org/x/sys/unix/flock.go b/vendor/golang.org/x/sys/unix/flock.go
deleted file mode 100644
index ce67a59528..0000000000
--- a/vendor/golang.org/x/sys/unix/flock.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// +build linux darwin freebsd openbsd netbsd dragonfly
-
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd
-
-package unix
-
-import "unsafe"
-
-// fcntl64Syscall is usually SYS_FCNTL, but is overridden on 32-bit Linux
-// systems by flock_linux_32bit.go to be SYS_FCNTL64.
-var fcntl64Syscall uintptr = SYS_FCNTL
-
-// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
-func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
-	_, _, errno := Syscall(fcntl64Syscall, fd, uintptr(cmd), uintptr(unsafe.Pointer(lk)))
-	if errno == 0 {
-		return nil
-	}
-	return errno
-}
diff --git a/vendor/golang.org/x/sys/unix/flock_linux_32bit.go b/vendor/golang.org/x/sys/unix/flock_linux_32bit.go
deleted file mode 100644
index fc0e50e037..0000000000
--- a/vendor/golang.org/x/sys/unix/flock_linux_32bit.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build linux,386 linux,arm linux,mips linux,mipsle
-
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package unix
-
-func init() {
-	// On 32-bit Linux systems, the fcntl syscall that matches Go's
-	// Flock_t type is SYS_FCNTL64, not SYS_FCNTL.
-	fcntl64Syscall = SYS_FCNTL64
-}
diff --git a/vendor/golang.org/x/sys/unix/gccgo.go b/vendor/golang.org/x/sys/unix/gccgo.go
deleted file mode 100644
index 94c8232124..0000000000
--- a/vendor/golang.org/x/sys/unix/gccgo.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gccgo
-
-package unix
-
-import "syscall"
-
-// We can't use the gc-syntax .s files for gccgo.  On the plus side
-// much of the functionality can be written directly in Go.
-
-//extern gccgoRealSyscall
-func realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r, errno uintptr)
-
-func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
-	syscall.Entersyscall()
-	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
-	syscall.Exitsyscall()
-	return r, 0, syscall.Errno(errno)
-}
-
-func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno) {
-	syscall.Entersyscall()
-	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, 0, 0, 0)
-	syscall.Exitsyscall()
-	return r, 0, syscall.Errno(errno)
-}
-
-func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) {
-	syscall.Entersyscall()
-	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9)
-	syscall.Exitsyscall()
-	return r, 0, syscall.Errno(errno)
-}
-
-func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
-	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
-	return r, 0, syscall.Errno(errno)
-}
-
-func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno) {
-	r, errno := realSyscall(trap, a1, a2, a3, a4, a5, a6, 0, 0, 0)
-	return r, 0, syscall.Errno(errno)
-}
diff --git a/vendor/golang.org/x/sys/unix/gccgo_c.c b/vendor/golang.org/x/sys/unix/gccgo_c.c
deleted file mode 100644
index 07f6be0392..0000000000
--- a/vendor/golang.org/x/sys/unix/gccgo_c.c
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gccgo
-
-#include <errno.h>
-#include <stdint.h>
-#include <unistd.h>
-
-#define _STRINGIFY2_(x) #x
-#define _STRINGIFY_(x) _STRINGIFY2_(x)
-#define GOSYM_PREFIX _STRINGIFY_(__USER_LABEL_PREFIX__)
-
-// Call syscall from C code because the gccgo support for calling from
-// Go to C does not support varargs functions.
-
-struct ret {
-	uintptr_t r;
-	uintptr_t err;
-};
-
-struct ret
-gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
-{
-	struct ret r;
-
-	errno = 0;
-	r.r = syscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9);
-	r.err = errno;
-	return r;
-}
-
-// Define the use function in C so that it is not inlined.
-
-extern void use(void *) __asm__ (GOSYM_PREFIX GOPKGPATH ".use") __attribute__((noinline));
-
-void
-use(void *p __attribute__ ((unused)))
-{
-}
diff --git a/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go b/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
deleted file mode 100644
index bffe1a77db..0000000000
--- a/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gccgo,linux,amd64
-
-package unix
-
-import "syscall"
-
-//extern gettimeofday
-func realGettimeofday(*Timeval, *byte) int32
-
-func gettimeofday(tv *Timeval) (err syscall.Errno) {
-	r := realGettimeofday(tv, nil)
-	if r < 0 {
-		return syscall.GetErrno()
-	}
-	return 0
-}
diff --git a/vendor/golang.org/x/sys/unix/gccgo_linux_sparc64.go b/vendor/golang.org/x/sys/unix/gccgo_linux_sparc64.go
deleted file mode 100644
index 56332692c4..0000000000
--- a/vendor/golang.org/x/sys/unix/gccgo_linux_sparc64.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gccgo,linux,sparc64
-
-package unix
-
-import "syscall"
-
-//extern sysconf
-func realSysconf(name int) int64
-
-func sysconf(name int) (n int64, err syscall.Errno) {
-	r := realSysconf(name)
-	if r < 0 {
-		return 0, syscall.GetErrno()
-	}
-	return r, 0
-}
diff --git a/vendor/golang.org/x/sys/unix/mkall.sh b/vendor/golang.org/x/sys/unix/mkall.sh
deleted file mode 100755
index a1a27ae7d9..0000000000
--- a/vendor/golang.org/x/sys/unix/mkall.sh
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# This script runs or (given -n) prints suggested commands to generate files for
-# the Architecture/OS specified by the GOARCH and GOOS environment variables.
-# See README.md for more information about how the build system works.
-
-GOOSARCH="${GOOS}_${GOARCH}"
-
-# defaults
-mksyscall="./mksyscall.pl"
-mkerrors="./mkerrors.sh"
-zerrors="zerrors_$GOOSARCH.go"
-mksysctl=""
-zsysctl="zsysctl_$GOOSARCH.go"
-mksysnum=
-mktypes=
-run="sh"
-cmd=""
-
-case "$1" in
--syscalls)
-	for i in zsyscall*go
-	do
-		# Run the command line that appears in the first line
-		# of the generated file to regenerate it.
-		sed 1q $i | sed 's;^// ;;' | sh > _$i && gofmt < _$i > $i
-		rm _$i
-	done
-	exit 0
-	;;
--n)
-	run="cat"
-	cmd="echo"
-	shift
-esac
-
-case "$#" in
-0)
-	;;
-*)
-	echo 'usage: mkall.sh [-n]' 1>&2
-	exit 2
-esac
-
-if [[ "$GOOS" -eq "linux" ]] && [[ "$GOARCH" != "sparc64" ]]; then
-	# Use then new build system
-	# Files generated through docker (use $cmd so you can Ctl-C the build or run)
-	$cmd docker build --tag generate:$GOOS $GOOS
-	$cmd docker run --interactive --tty --volume $(dirname "$(readlink -f "$0")"):/build generate:$GOOS
-	exit
-fi
-
-GOOSARCH_in=syscall_$GOOSARCH.go
-case "$GOOSARCH" in
-_* | *_ | _)
-	echo 'undefined $GOOS_$GOARCH:' "$GOOSARCH" 1>&2
-	exit 1
-	;;
-darwin_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32"
-	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-darwin_amd64)
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-darwin_arm)
-	mkerrors="$mkerrors"
-	mksysnum="./mksysnum_darwin.pl /usr/include/sys/syscall.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-darwin_arm64)
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk iphoneos)/usr/include/sys/syscall.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-dragonfly_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32 -dragonfly"
-	mksysnum="curl -s 'http://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/sys/kern/syscalls.master' | ./mksysnum_dragonfly.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-dragonfly_amd64)
-	mkerrors="$mkerrors -m64"
-	mksyscall="./mksyscall.pl -dragonfly"
-	mksysnum="curl -s 'http://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/sys/kern/syscalls.master' | ./mksysnum_dragonfly.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-freebsd_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32"
-	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-freebsd_amd64)
-	mkerrors="$mkerrors -m64"
-	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-freebsd_arm)
-	mkerrors="$mkerrors"
-	mksyscall="./mksyscall.pl -l32 -arm"
-	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
-	# Let the type of C char be signed for making the bare syscall
-	# API consistent across over platforms.
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
-	;;
-linux_sparc64)
-	GOOSARCH_in=syscall_linux_sparc64.go
-	unistd_h=/usr/include/sparc64-linux-gnu/asm/unistd.h
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_linux.pl $unistd_h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-netbsd_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32 -netbsd"
-	mksysnum="curl -s 'http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_netbsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-netbsd_amd64)
-	mkerrors="$mkerrors -m64"
-	mksyscall="./mksyscall.pl -netbsd"
-	mksysnum="curl -s 'http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_netbsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-openbsd_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32 -openbsd"
-	mksysctl="./mksysctl_openbsd.pl"
-	zsysctl="zsysctl_openbsd.go"
-	mksysnum="curl -s 'http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_openbsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-openbsd_amd64)
-	mkerrors="$mkerrors -m64"
-	mksyscall="./mksyscall.pl -openbsd"
-	mksysctl="./mksysctl_openbsd.pl"
-	zsysctl="zsysctl_openbsd.go"
-	mksysnum="curl -s 'http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_openbsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-solaris_amd64)
-	mksyscall="./mksyscall_solaris.pl"
-	mkerrors="$mkerrors -m64"
-	mksysnum=
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-*)
-	echo 'unrecognized $GOOS_$GOARCH: ' "$GOOSARCH" 1>&2
-	exit 1
-	;;
-esac
-
-(
-	if [ -n "$mkerrors" ]; then echo "$mkerrors |gofmt >$zerrors"; fi
-	case "$GOOS" in
-	*)
-		syscall_goos="syscall_$GOOS.go"
-		case "$GOOS" in
-		darwin | dragonfly | freebsd | netbsd | openbsd)
-			syscall_goos="syscall_bsd.go $syscall_goos"
-			;;
-		esac
-		if [ -n "$mksyscall" ]; then echo "$mksyscall -tags $GOOS,$GOARCH $syscall_goos $GOOSARCH_in |gofmt >zsyscall_$GOOSARCH.go"; fi
-		;;
-	esac
-	if [ -n "$mksysctl" ]; then echo "$mksysctl |gofmt >$zsysctl"; fi
-	if [ -n "$mksysnum" ]; then echo "$mksysnum |gofmt >zsysnum_$GOOSARCH.go"; fi
-	if [ -n "$mktypes" ]; then
-		echo "$mktypes types_$GOOS.go | go run mkpost.go > ztypes_$GOOSARCH.go";
-	fi
-) | $run
diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh
deleted file mode 100755
index 1bd1c9e6ed..0000000000
--- a/vendor/golang.org/x/sys/unix/mkerrors.sh
+++ /dev/null
@@ -1,545 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# Generate Go code listing errors and other #defined constant
-# values (ENAMETOOLONG etc.), by asking the preprocessor
-# about the definitions.
-
-unset LANG
-export LC_ALL=C
-export LC_CTYPE=C
-
-if test -z "$GOARCH" -o -z "$GOOS"; then
-	echo 1>&2 "GOARCH or GOOS not defined in environment"
-	exit 1
-fi
-
-# Check that we are using the new build system if we should
-if [[ "$GOOS" -eq "linux" ]] && [[ "$GOARCH" != "sparc64" ]]; then
-	if [[ "$GOLANG_SYS_BUILD" -ne "docker" ]]; then
-		echo 1>&2 "In the new build system, mkerrors should not be called directly."
-		echo 1>&2 "See README.md"
-		exit 1
-	fi
-fi
-
-CC=${CC:-cc}
-
-if [[ "$GOOS" -eq "solaris" ]]; then
-	# Assumes GNU versions of utilities in PATH.
-	export PATH=/usr/gnu/bin:$PATH
-fi
-
-uname=$(uname)
-
-includes_Darwin='
-#define _DARWIN_C_SOURCE
-#define KERNEL
-#define _DARWIN_USE_64_BIT_INODE
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/ptrace.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <termios.h>
-'
-
-includes_DragonFly='
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <termios.h>
-#include <netinet/ip.h>
-#include <net/ip_mroute/ip_mroute.h>
-'
-
-includes_FreeBSD='
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <termios.h>
-#include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
-#include <sys/extattr.h>
-
-#if __FreeBSD__ >= 10
-#define IFT_CARP	0xf8	// IFT_CARP is deprecated in FreeBSD 10
-#undef SIOCAIFADDR
-#define SIOCAIFADDR	_IOW(105, 26, struct oifaliasreq)	// ifaliasreq contains if_data
-#undef SIOCSIFPHYADDR
-#define SIOCSIFPHYADDR	_IOW(105, 70, struct oifaliasreq)	// ifaliasreq contains if_data
-#endif
-'
-
-includes_Linux='
-#define _LARGEFILE_SOURCE
-#define _LARGEFILE64_SOURCE
-#ifndef __LP64__
-#define _FILE_OFFSET_BITS 64
-#endif
-#define _GNU_SOURCE
-
-// <sys/ioctl.h> is broken on powerpc64, as it fails to include definitions of
-// these structures. We just include them copied from <bits/termios.h>.
-#if defined(__powerpc__)
-struct sgttyb {
-        char    sg_ispeed;
-        char    sg_ospeed;
-        char    sg_erase;
-        char    sg_kill;
-        short   sg_flags;
-};
-
-struct tchars {
-        char    t_intrc;
-        char    t_quitc;
-        char    t_startc;
-        char    t_stopc;
-        char    t_eofc;
-        char    t_brkc;
-};
-
-struct ltchars {
-        char    t_suspc;
-        char    t_dsuspc;
-        char    t_rprntc;
-        char    t_flushc;
-        char    t_werasc;
-        char    t_lnextc;
-};
-#endif
-
-#include <bits/sockaddr.h>
-#include <sys/epoll.h>
-#include <sys/inotify.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/prctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <linux/if.h>
-#include <linux/if_alg.h>
-#include <linux/if_arp.h>
-#include <linux/if_ether.h>
-#include <linux/if_tun.h>
-#include <linux/if_packet.h>
-#include <linux/if_addr.h>
-#include <linux/falloc.h>
-#include <linux/filter.h>
-#include <linux/fs.h>
-#include <linux/netlink.h>
-#include <linux/random.h>
-#include <linux/reboot.h>
-#include <linux/rtnetlink.h>
-#include <linux/ptrace.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/icmpv6.h>
-#include <linux/serial.h>
-#include <linux/can.h>
-#include <linux/vm_sockets.h>
-#include <net/route.h>
-#include <asm/termbits.h>
-
-#ifndef MSG_FASTOPEN
-#define MSG_FASTOPEN    0x20000000
-#endif
-
-#ifndef PTRACE_GETREGS
-#define PTRACE_GETREGS	0xc
-#endif
-
-#ifndef PTRACE_SETREGS
-#define PTRACE_SETREGS	0xd
-#endif
-
-#ifndef SOL_NETLINK
-#define SOL_NETLINK	270
-#endif
-
-#ifdef SOL_BLUETOOTH
-// SPARC includes this in /usr/include/sparc64-linux-gnu/bits/socket.h
-// but it is already in bluetooth_linux.go
-#undef SOL_BLUETOOTH
-#endif
-
-// Certain constants are missing from the fs/crypto UAPI
-#define FS_KEY_DESC_PREFIX              "fscrypt:"
-#define FS_KEY_DESC_PREFIX_SIZE         8
-#define FS_MAX_KEY_SIZE                 64
-'
-
-includes_NetBSD='
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/termios.h>
-#include <sys/ttycom.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
-#include <netinet/if_ether.h>
-
-// Needed since <sys/param.h> refers to it...
-#define schedppq 1
-'
-
-includes_OpenBSD='
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/termios.h>
-#include <sys/ttycom.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_var.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
-#include <netinet/if_ether.h>
-#include <net/if_bridge.h>
-
-// We keep some constants not supported in OpenBSD 5.5 and beyond for
-// the promise of compatibility.
-#define EMUL_ENABLED		0x1
-#define EMUL_NATIVE		0x2
-#define IPV6_FAITH		0x1d
-#define IPV6_OPTIONS		0x1
-#define IPV6_RTHDR_STRICT	0x1
-#define IPV6_SOCKOPT_RESERVED1	0x3
-#define SIOCGIFGENERIC		0xc020693a
-#define SIOCSIFGENERIC		0x80206939
-#define WALTSIG			0x4
-'
-
-includes_SunOS='
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <termios.h>
-#include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
-'
-
-
-includes='
-#include <sys/types.h>
-#include <sys/file.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
-#include <netinet/tcp.h>
-#include <errno.h>
-#include <sys/signal.h>
-#include <signal.h>
-#include <sys/resource.h>
-#include <time.h>
-'
-ccflags="$@"
-
-# Write go tool cgo -godefs input.
-(
-	echo package unix
-	echo
-	echo '/*'
-	indirect="includes_$(uname)"
-	echo "${!indirect} $includes"
-	echo '*/'
-	echo 'import "C"'
-	echo 'import "syscall"'
-	echo
-	echo 'const ('
-
-	# The gcc command line prints all the #defines
-	# it encounters while processing the input
-	echo "${!indirect} $includes" | $CC -x c - -E -dM $ccflags |
-	awk '
-		$1 != "#define" || $2 ~ /\(/ || $3 == "" {next}
-
-		$2 ~ /^E([ABCD]X|[BIS]P|[SD]I|S|FL)$/ {next}  # 386 registers
-		$2 ~ /^(SIGEV_|SIGSTKSZ|SIGRT(MIN|MAX))/ {next}
-		$2 ~ /^(SCM_SRCRT)$/ {next}
-		$2 ~ /^(MAP_FAILED)$/ {next}
-		$2 ~ /^ELF_.*$/ {next}# <asm/elf.h> contains ELF_ARCH, etc.
-
-		$2 ~ /^EXTATTR_NAMESPACE_NAMES/ ||
-		$2 ~ /^EXTATTR_NAMESPACE_[A-Z]+_STRING/ {next}
-
-		$2 !~ /^ETH_/ &&
-		$2 !~ /^EPROC_/ &&
-		$2 !~ /^EQUIV_/ &&
-		$2 !~ /^EXPR_/ &&
-		$2 ~ /^E[A-Z0-9_]+$/ ||
-		$2 ~ /^B[0-9_]+$/ ||
-		$2 == "BOTHER" ||
-		$2 ~ /^CI?BAUD(EX)?$/ ||
-		$2 == "IBSHIFT" ||
-		$2 ~ /^V[A-Z0-9]+$/ ||
-		$2 ~ /^CS[A-Z0-9]/ ||
-		$2 ~ /^I(SIG|CANON|CRNL|UCLC|EXTEN|MAXBEL|STRIP|UTF8)$/ ||
-		$2 ~ /^IGN/ ||
-		$2 ~ /^IX(ON|ANY|OFF)$/ ||
-		$2 ~ /^IN(LCR|PCK)$/ ||
-		$2 ~ /(^FLU?SH)|(FLU?SH$)/ ||
-		$2 ~ /^C(LOCAL|READ|MSPAR|RTSCTS)$/ ||
-		$2 == "BRKINT" ||
-		$2 == "HUPCL" ||
-		$2 == "PENDIN" ||
-		$2 == "TOSTOP" ||
-		$2 == "XCASE" ||
-		$2 == "ALTWERASE" ||
-		$2 == "NOKERNINFO" ||
-		$2 ~ /^PAR/ ||
-		$2 ~ /^SIG[^_]/ ||
-		$2 ~ /^O[CNPFPL][A-Z]+[^_][A-Z]+$/ ||
-		$2 ~ /^(NL|CR|TAB|BS|VT|FF)DLY$/ ||
-		$2 ~ /^(NL|CR|TAB|BS|VT|FF)[0-9]$/ ||
-		$2 ~ /^O?XTABS$/ ||
-		$2 ~ /^TC[IO](ON|OFF)$/ ||
-		$2 ~ /^IN_/ ||
-		$2 ~ /^LOCK_(SH|EX|NB|UN)$/ ||
-		$2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|ICMP6|TCP|EVFILT|NOTE|EV|SHUT|PROT|MAP|PACKET|MSG|SCM|MCL|DT|MADV|PR)_/ ||
-		$2 ~ /^FALLOC_/ ||
-		$2 == "ICMPV6_FILTER" ||
-		$2 == "SOMAXCONN" ||
-		$2 == "NAME_MAX" ||
-		$2 == "IFNAMSIZ" ||
-		$2 ~ /^CTL_(MAXNAME|NET|QUERY)$/ ||
-		$2 ~ /^SYSCTL_VERS/ ||
-		$2 ~ /^(MS|MNT)_/ ||
-		$2 ~ /^TUN(SET|GET|ATTACH|DETACH)/ ||
-		$2 ~ /^(O|F|FD|NAME|S|PTRACE|PT)_/ ||
-		$2 ~ /^LINUX_REBOOT_CMD_/ ||
-		$2 ~ /^LINUX_REBOOT_MAGIC[12]$/ ||
-		$2 !~ "NLA_TYPE_MASK" &&
-		$2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P)_/ ||
-		$2 ~ /^SIOC/ ||
-		$2 ~ /^TIOC/ ||
-		$2 ~ /^TCGET/ ||
-		$2 ~ /^TCSET/ ||
-		$2 ~ /^TC(FLSH|SBRKP?|XONC)$/ ||
-		$2 !~ "RTF_BITS" &&
-		$2 ~ /^(IFF|IFT|NET_RT|RTM|RTF|RTV|RTA|RTAX)_/ ||
-		$2 ~ /^BIOC/ ||
-		$2 ~ /^RUSAGE_(SELF|CHILDREN|THREAD)/ ||
-		$2 ~ /^RLIMIT_(AS|CORE|CPU|DATA|FSIZE|NOFILE|STACK)|RLIM_INFINITY/ ||
-		$2 ~ /^PRIO_(PROCESS|PGRP|USER)/ ||
-		$2 ~ /^CLONE_[A-Z_]+/ ||
-		$2 !~ /^(BPF_TIMEVAL)$/ &&
-		$2 ~ /^(BPF|DLT)_/ ||
-		$2 ~ /^CLOCK_/ ||
-		$2 ~ /^CAN_/ ||
-		$2 ~ /^ALG_/ ||
-		$2 ~ /^FS_(POLICY_FLAGS|KEY_DESC|ENCRYPTION_MODE|[A-Z0-9_]+_KEY_SIZE|IOC_(GET|SET)_ENCRYPTION)/ ||
-		$2 ~ /^GRND_/ ||
-		$2 ~ /^SPLICE_/ ||
-		$2 ~ /^(VM|VMADDR)_/ ||
-		$2 !~ "WMESGLEN" &&
-		$2 ~ /^W[A-Z0-9]+$/ ||
-		$2 ~ /^BLK[A-Z]*(GET$|SET$|BUF$|PART$|SIZE)/ {printf("\t%s = C.%s\n", $2, $2)}
-		$2 ~ /^__WCOREFLAG$/ {next}
-		$2 ~ /^__W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", substr($2,3), $2)}
-
-		{next}
-	' | sort
-
-	echo ')'
-) >_const.go
-
-# Pull out the error names for later.
-errors=$(
-	echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^E[A-Z0-9_]+$/ { print $2 }' |
-	sort
-)
-
-# Pull out the signal names for later.
-signals=$(
-	echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' |
-	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' |
-	sort
-)
-
-# Again, writing regexps to a file.
-echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^E[A-Z0-9_]+$/ { print "^\t" $2 "[ \t]*=" }' |
-	sort >_error.grep
-echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print "^\t" $2 "[ \t]*=" }' |
-	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' |
-	sort >_signal.grep
-
-echo '// mkerrors.sh' "$@"
-echo '// Code generated by the command above; see README.md. DO NOT EDIT.'
-echo
-echo "// +build ${GOARCH},${GOOS}"
-echo
-go tool cgo -godefs -- "$@" _const.go >_error.out
-cat _error.out | grep -vf _error.grep | grep -vf _signal.grep
-echo
-echo '// Errors'
-echo 'const ('
-cat _error.out | grep -f _error.grep | sed 's/=\(.*\)/= syscall.Errno(\1)/'
-echo ')'
-
-echo
-echo '// Signals'
-echo 'const ('
-cat _error.out | grep -f _signal.grep | sed 's/=\(.*\)/= syscall.Signal(\1)/'
-echo ')'
-
-# Run C program to print error and syscall strings.
-(
-	echo -E "
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-#include <signal.h>
-
-#define nelem(x) (sizeof(x)/sizeof((x)[0]))
-
-enum { A = 'A', Z = 'Z', a = 'a', z = 'z' }; // avoid need for single quotes below
-
-int errors[] = {
-"
-	for i in $errors
-	do
-		echo -E '	'$i,
-	done
-
-	echo -E "
-};
-
-int signals[] = {
-"
-	for i in $signals
-	do
-		echo -E '	'$i,
-	done
-
-	# Use -E because on some systems bash builtin interprets \n itself.
-	echo -E '
-};
-
-static int
-intcmp(const void *a, const void *b)
-{
-	return *(int*)a - *(int*)b;
-}
-
-int
-main(void)
-{
-	int i, e;
-	char buf[1024], *p;
-
-	printf("\n\n// Error table\n");
-	printf("var errors = [...]string {\n");
-	qsort(errors, nelem(errors), sizeof errors[0], intcmp);
-	for(i=0; i<nelem(errors); i++) {
-		e = errors[i];
-		if(i > 0 && errors[i-1] == e)
-			continue;
-		strcpy(buf, strerror(e));
-		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
-		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
-			buf[0] += a - A;
-		printf("\t%d: \"%s\",\n", e, buf);
-	}
-	printf("}\n\n");
-
-	printf("\n\n// Signal table\n");
-	printf("var signals = [...]string {\n");
-	qsort(signals, nelem(signals), sizeof signals[0], intcmp);
-	for(i=0; i<nelem(signals); i++) {
-		e = signals[i];
-		if(i > 0 && signals[i-1] == e)
-			continue;
-		strcpy(buf, strsignal(e));
-		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
-		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
-			buf[0] += a - A;
-		// cut trailing : number.
-		p = strrchr(buf, ":"[0]);
-		if(p)
-			*p = '\0';
-		printf("\t%d: \"%s\",\n", e, buf);
-	}
-	printf("}\n\n");
-
-	return 0;
-}
-
-'
-) >_errors.c
-
-$CC $ccflags -o _errors _errors.c && $GORUN ./_errors && rm -f _errors.c _errors _const.go _error.grep _signal.grep _error.out
diff --git a/vendor/golang.org/x/sys/unix/mkpost.go b/vendor/golang.org/x/sys/unix/mkpost.go
deleted file mode 100644
index d3ff659bb3..0000000000
--- a/vendor/golang.org/x/sys/unix/mkpost.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// mkpost processes the output of cgo -godefs to
-// modify the generated types. It is used to clean up
-// the sys API in an architecture specific manner.
-//
-// mkpost is run after cgo -godefs; see README.md.
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"go/format"
-	"io/ioutil"
-	"log"
-	"os"
-	"regexp"
-)
-
-func main() {
-	// Get the OS and architecture (using GOARCH_TARGET if it exists)
-	goos := os.Getenv("GOOS")
-	goarch := os.Getenv("GOARCH_TARGET")
-	if goarch == "" {
-		goarch = os.Getenv("GOARCH")
-	}
-	// Check that we are using the new build system if we should be.
-	if goos == "linux" && goarch != "sparc64" {
-		if os.Getenv("GOLANG_SYS_BUILD") != "docker" {
-			os.Stderr.WriteString("In the new build system, mkpost should not be called directly.\n")
-			os.Stderr.WriteString("See README.md\n")
-			os.Exit(1)
-		}
-	}
-
-	b, err := ioutil.ReadAll(os.Stdin)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// If we have empty Ptrace structs, we should delete them. Only s390x emits
-	// nonempty Ptrace structs.
-	ptraceRexexp := regexp.MustCompile(`type Ptrace((Psw|Fpregs|Per) struct {\s*})`)
-	b = ptraceRexexp.ReplaceAll(b, nil)
-
-	// Replace the control_regs union with a blank identifier for now.
-	controlRegsRegex := regexp.MustCompile(`(Control_regs)\s+\[0\]uint64`)
-	b = controlRegsRegex.ReplaceAll(b, []byte("_ [0]uint64"))
-
-	// Remove fields that are added by glibc
-	// Note that this is unstable as the identifers are private.
-	removeFieldsRegex := regexp.MustCompile(`X__glibc\S*`)
-	b = removeFieldsRegex.ReplaceAll(b, []byte("_"))
-
-	// We refuse to export private fields on s390x
-	if goarch == "s390x" && goos == "linux" {
-		// Remove cgo padding fields
-		removeFieldsRegex := regexp.MustCompile(`Pad_cgo_\d+`)
-		b = removeFieldsRegex.ReplaceAll(b, []byte("_"))
-
-		// Remove padding, hidden, or unused fields
-		removeFieldsRegex = regexp.MustCompile(`X_\S+`)
-		b = removeFieldsRegex.ReplaceAll(b, []byte("_"))
-	}
-
-	// Remove the first line of warning from cgo
-	b = b[bytes.IndexByte(b, '\n')+1:]
-	// Modify the command in the header to include:
-	//  mkpost, our own warning, and a build tag.
-	replacement := fmt.Sprintf(`$1 | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build %s,%s`, goarch, goos)
-	cgoCommandRegex := regexp.MustCompile(`(cgo -godefs .*)`)
-	b = cgoCommandRegex.ReplaceAll(b, []byte(replacement))
-
-	// gofmt
-	b, err = format.Source(b)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	os.Stdout.Write(b)
-}
diff --git a/vendor/golang.org/x/sys/unix/mksyscall.pl b/vendor/golang.org/x/sys/unix/mksyscall.pl
deleted file mode 100755
index eb4b56ff71..0000000000
--- a/vendor/golang.org/x/sys/unix/mksyscall.pl
+++ /dev/null
@@ -1,328 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# This program reads a file containing function prototypes
-# (like syscall_darwin.go) and generates system call bodies.
-# The prototypes are marked by lines beginning with "//sys"
-# and read like func declarations if //sys is replaced by func, but:
-#	* The parameter lists must give a name for each argument.
-#	  This includes return parameters.
-#	* The parameter lists must give a type for each argument:
-#	  the (x, y, z int) shorthand is not allowed.
-#	* If the return parameter is an error number, it must be named errno.
-
-# A line beginning with //sysnb is like //sys, except that the
-# goroutine will not be suspended during the execution of the system
-# call.  This must only be used for system calls which can never
-# block, as otherwise the system call could cause all goroutines to
-# hang.
-
-use strict;
-
-my $cmdline = "mksyscall.pl " . join(' ', @ARGV);
-my $errors = 0;
-my $_32bit = "";
-my $plan9 = 0;
-my $openbsd = 0;
-my $netbsd = 0;
-my $dragonfly = 0;
-my $arm = 0; # 64-bit value should use (even, odd)-pair
-my $tags = "";  # build tags
-
-if($ARGV[0] eq "-b32") {
-	$_32bit = "big-endian";
-	shift;
-} elsif($ARGV[0] eq "-l32") {
-	$_32bit = "little-endian";
-	shift;
-}
-if($ARGV[0] eq "-plan9") {
-	$plan9 = 1;
-	shift;
-}
-if($ARGV[0] eq "-openbsd") {
-	$openbsd = 1;
-	shift;
-}
-if($ARGV[0] eq "-netbsd") {
-	$netbsd = 1;
-	shift;
-}
-if($ARGV[0] eq "-dragonfly") {
-	$dragonfly = 1;
-	shift;
-}
-if($ARGV[0] eq "-arm") {
-	$arm = 1;
-	shift;
-}
-if($ARGV[0] eq "-tags") {
-	shift;
-	$tags = $ARGV[0];
-	shift;
-}
-
-if($ARGV[0] =~ /^-/) {
-	print STDERR "usage: mksyscall.pl [-b32 | -l32] [-tags x,y] [file ...]\n";
-	exit 1;
-}
-
-# Check that we are using the new build system if we should
-if($ENV{'GOOS'} eq "linux" || $ENV{'GOARCH'} ne "sparc64") {
-	if($ENV{'GOLANG_SYS_BUILD'} ne "docker") {
-		print STDERR "In the new build system, mksyscall should not be called directly.\n";
-		print STDERR "See README.md\n";
-		exit 1;
-	}
-}
-
-
-sub parseparamlist($) {
-	my ($list) = @_;
-	$list =~ s/^\s*//;
-	$list =~ s/\s*$//;
-	if($list eq "") {
-		return ();
-	}
-	return split(/\s*,\s*/, $list);
-}
-
-sub parseparam($) {
-	my ($p) = @_;
-	if($p !~ /^(\S*) (\S*)$/) {
-		print STDERR "$ARGV:$.: malformed parameter: $p\n";
-		$errors = 1;
-		return ("xx", "int");
-	}
-	return ($1, $2);
-}
-
-my $text = "";
-while(<>) {
-	chomp;
-	s/\s+/ /g;
-	s/^\s+//;
-	s/\s+$//;
-	my $nonblock = /^\/\/sysnb /;
-	next if !/^\/\/sys / && !$nonblock;
-
-	# Line must be of the form
-	#	func Open(path string, mode int, perm int) (fd int, errno error)
-	# Split into name, in params, out params.
-	if(!/^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*((?i)SYS_[A-Z0-9_]+))?$/) {
-		print STDERR "$ARGV:$.: malformed //sys declaration\n";
-		$errors = 1;
-		next;
-	}
-	my ($func, $in, $out, $sysname) = ($2, $3, $4, $5);
-
-	# Split argument lists on comma.
-	my @in = parseparamlist($in);
-	my @out = parseparamlist($out);
-
-	# Try in vain to keep people from editing this file.
-	# The theory is that they jump into the middle of the file
-	# without reading the header.
-	$text .= "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n";
-
-	# Go function header.
-	my $out_decl = @out ? sprintf(" (%s)", join(', ', @out)) : "";
-	$text .= sprintf "func %s(%s)%s {\n", $func, join(', ', @in), $out_decl;
-
-	# Check if err return available
-	my $errvar = "";
-	foreach my $p (@out) {
-		my ($name, $type) = parseparam($p);
-		if($type eq "error") {
-			$errvar = $name;
-			last;
-		}
-	}
-
-	# Prepare arguments to Syscall.
-	my @args = ();
-	my $n = 0;
-	foreach my $p (@in) {
-		my ($name, $type) = parseparam($p);
-		if($type =~ /^\*/) {
-			push @args, "uintptr(unsafe.Pointer($name))";
-		} elsif($type eq "string" && $errvar ne "") {
-			$text .= "\tvar _p$n *byte\n";
-			$text .= "\t_p$n, $errvar = BytePtrFromString($name)\n";
-			$text .= "\tif $errvar != nil {\n\t\treturn\n\t}\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type eq "string") {
-			print STDERR "$ARGV:$.: $func uses string arguments, but has no error return\n";
-			$text .= "\tvar _p$n *byte\n";
-			$text .= "\t_p$n, _ = BytePtrFromString($name)\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type =~ /^\[\](.*)/) {
-			# Convert slice into pointer, length.
-			# Have to be careful not to take address of &a[0] if len == 0:
-			# pass dummy pointer in that case.
-			# Used to pass nil, but some OSes or simulators reject write(fd, nil, 0).
-			$text .= "\tvar _p$n unsafe.Pointer\n";
-			$text .= "\tif len($name) > 0 {\n\t\t_p$n = unsafe.Pointer(\&${name}[0])\n\t}";
-			$text .= " else {\n\t\t_p$n = unsafe.Pointer(&_zero)\n\t}";
-			$text .= "\n";
-			push @args, "uintptr(_p$n)", "uintptr(len($name))";
-			$n++;
-		} elsif($type eq "int64" && ($openbsd || $netbsd)) {
-			push @args, "0";
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name>>32)", "uintptr($name)";
-			} elsif($_32bit eq "little-endian") {
-				push @args, "uintptr($name)", "uintptr($name>>32)";
-			} else {
-				push @args, "uintptr($name)";
-			}
-		} elsif($type eq "int64" && $dragonfly) {
-			if ($func !~ /^extp(read|write)/i) {
-				push @args, "0";
-			}
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name>>32)", "uintptr($name)";
-			} elsif($_32bit eq "little-endian") {
-				push @args, "uintptr($name)", "uintptr($name>>32)";
-			} else {
-				push @args, "uintptr($name)";
-			}
-		} elsif($type eq "int64" && $_32bit ne "") {
-			if(@args % 2 && $arm) {
-				# arm abi specifies 64-bit argument uses
-				# (even, odd) pair
-				push @args, "0"
-			}
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name>>32)", "uintptr($name)";
-			} else {
-				push @args, "uintptr($name)", "uintptr($name>>32)";
-			}
-		} else {
-			push @args, "uintptr($name)";
-		}
-	}
-
-	# Determine which form to use; pad args with zeros.
-	my $asm = "Syscall";
-	if ($nonblock) {
-		$asm = "RawSyscall";
-	}
-	if(@args <= 3) {
-		while(@args < 3) {
-			push @args, "0";
-		}
-	} elsif(@args <= 6) {
-		$asm .= "6";
-		while(@args < 6) {
-			push @args, "0";
-		}
-	} elsif(@args <= 9) {
-		$asm .= "9";
-		while(@args < 9) {
-			push @args, "0";
-		}
-	} else {
-		print STDERR "$ARGV:$.: too many arguments to system call\n";
-	}
-
-	# System call number.
-	if($sysname eq "") {
-		$sysname = "SYS_$func";
-		$sysname =~ s/([a-z])([A-Z])/${1}_$2/g;	# turn FooBar into Foo_Bar
-		$sysname =~ y/a-z/A-Z/;
-	}
-
-	# Actual call.
-	my $args = join(', ', @args);
-	my $call = "$asm($sysname, $args)";
-
-	# Assign return values.
-	my $body = "";
-	my @ret = ("_", "_", "_");
-	my $do_errno = 0;
-	for(my $i=0; $i<@out; $i++) {
-		my $p = $out[$i];
-		my ($name, $type) = parseparam($p);
-		my $reg = "";
-		if($name eq "err" && !$plan9) {
-			$reg = "e1";
-			$ret[2] = $reg;
-			$do_errno = 1;
-		} elsif($name eq "err" && $plan9) {
-			$ret[0] = "r0";
-			$ret[2] = "e1";
-			next;
-		} else {
-			$reg = sprintf("r%d", $i);
-			$ret[$i] = $reg;
-		}
-		if($type eq "bool") {
-			$reg = "$reg != 0";
-		}
-		if($type eq "int64" && $_32bit ne "") {
-			# 64-bit number in r1:r0 or r0:r1.
-			if($i+2 > @out) {
-				print STDERR "$ARGV:$.: not enough registers for int64 return\n";
-			}
-			if($_32bit eq "big-endian") {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i, $i+1);
-			} else {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i+1, $i);
-			}
-			$ret[$i] = sprintf("r%d", $i);
-			$ret[$i+1] = sprintf("r%d", $i+1);
-		}
-		if($reg ne "e1" || $plan9) {
-			$body .= "\t$name = $type($reg)\n";
-		}
-	}
-	if ($ret[0] eq "_" && $ret[1] eq "_" && $ret[2] eq "_") {
-		$text .= "\t$call\n";
-	} else {
-		$text .= "\t$ret[0], $ret[1], $ret[2] := $call\n";
-	}
-	$text .= $body;
-
-	if ($plan9 && $ret[2] eq "e1") {
-		$text .= "\tif int32(r0) == -1 {\n";
-		$text .= "\t\terr = e1\n";
-		$text .= "\t}\n";
-	} elsif ($do_errno) {
-		$text .= "\tif e1 != 0 {\n";
-		$text .= "\t\terr = errnoErr(e1)\n";
-		$text .= "\t}\n";
-	}
-	$text .= "\treturn\n";
-	$text .= "}\n\n";
-}
-
-chomp $text;
-chomp $text;
-
-if($errors) {
-	exit 1;
-}
-
-print <<EOF;
-// $cmdline
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build $tags
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-$text
-EOF
-exit 0;
diff --git a/vendor/golang.org/x/sys/unix/mksyscall_solaris.pl b/vendor/golang.org/x/sys/unix/mksyscall_solaris.pl
deleted file mode 100755
index 3e6ed9df8e..0000000000
--- a/vendor/golang.org/x/sys/unix/mksyscall_solaris.pl
+++ /dev/null
@@ -1,289 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# This program reads a file containing function prototypes
-# (like syscall_solaris.go) and generates system call bodies.
-# The prototypes are marked by lines beginning with "//sys"
-# and read like func declarations if //sys is replaced by func, but:
-#	* The parameter lists must give a name for each argument.
-#	  This includes return parameters.
-#	* The parameter lists must give a type for each argument:
-#	  the (x, y, z int) shorthand is not allowed.
-#	* If the return parameter is an error number, it must be named err.
-#	* If go func name needs to be different than its libc name,
-#	* or the function is not in libc, name could be specified
-#	* at the end, after "=" sign, like
-#	  //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt
-
-use strict;
-
-my $cmdline = "mksyscall_solaris.pl " . join(' ', @ARGV);
-my $errors = 0;
-my $_32bit = "";
-my $tags = "";  # build tags
-
-binmode STDOUT;
-
-if($ARGV[0] eq "-b32") {
-	$_32bit = "big-endian";
-	shift;
-} elsif($ARGV[0] eq "-l32") {
-	$_32bit = "little-endian";
-	shift;
-}
-if($ARGV[0] eq "-tags") {
-	shift;
-	$tags = $ARGV[0];
-	shift;
-}
-
-if($ARGV[0] =~ /^-/) {
-	print STDERR "usage: mksyscall_solaris.pl [-b32 | -l32] [-tags x,y] [file ...]\n";
-	exit 1;
-}
-
-sub parseparamlist($) {
-	my ($list) = @_;
-	$list =~ s/^\s*//;
-	$list =~ s/\s*$//;
-	if($list eq "") {
-		return ();
-	}
-	return split(/\s*,\s*/, $list);
-}
-
-sub parseparam($) {
-	my ($p) = @_;
-	if($p !~ /^(\S*) (\S*)$/) {
-		print STDERR "$ARGV:$.: malformed parameter: $p\n";
-		$errors = 1;
-		return ("xx", "int");
-	}
-	return ($1, $2);
-}
-
-my $package = "";
-my $text = "";
-my $dynimports = "";
-my $linknames = "";
-my @vars = ();
-while(<>) {
-	chomp;
-	s/\s+/ /g;
-	s/^\s+//;
-	s/\s+$//;
-	$package = $1 if !$package && /^package (\S+)$/;
-	my $nonblock = /^\/\/sysnb /;
-	next if !/^\/\/sys / && !$nonblock;
-
-	# Line must be of the form
-	#	func Open(path string, mode int, perm int) (fd int, err error)
-	# Split into name, in params, out params.
-	if(!/^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$/) {
-		print STDERR "$ARGV:$.: malformed //sys declaration\n";
-		$errors = 1;
-		next;
-	}
-	my ($nb, $func, $in, $out, $modname, $sysname) = ($1, $2, $3, $4, $5, $6);
-
-	# Split argument lists on comma.
-	my @in = parseparamlist($in);
-	my @out = parseparamlist($out);
-
-	# So file name.
-	if($modname eq "") {
-		$modname = "libc";
-	}
-
-	# System call name.
-	if($sysname eq "") {
-		$sysname = "$func";
-	}
-
-	# System call pointer variable name.
-	my $sysvarname = "proc$sysname";
-
-	my $strconvfunc = "BytePtrFromString";
-	my $strconvtype = "*byte";
-
-	$sysname =~ y/A-Z/a-z/; # All libc functions are lowercase.
-
-	# Runtime import of function to allow cross-platform builds.
-	$dynimports .= "//go:cgo_import_dynamic libc_${sysname} ${sysname} \"$modname.so\"\n";
-	# Link symbol to proc address variable.
-	$linknames .= "//go:linkname ${sysvarname} libc_${sysname}\n";
-	# Library proc address variable.
-	push @vars, $sysvarname;
-
-	# Go function header.
-	$out = join(', ', @out);
-	if($out ne "") {
-		$out = " ($out)";
-	}
-	if($text ne "") {
-		$text .= "\n"
-	}
-	$text .= sprintf "func %s(%s)%s {\n", $func, join(', ', @in), $out;
-
-	# Check if err return available
-	my $errvar = "";
-	foreach my $p (@out) {
-		my ($name, $type) = parseparam($p);
-		if($type eq "error") {
-			$errvar = $name;
-			last;
-		}
-	}
-
-	# Prepare arguments to Syscall.
-	my @args = ();
-	my $n = 0;
-	foreach my $p (@in) {
-		my ($name, $type) = parseparam($p);
-		if($type =~ /^\*/) {
-			push @args, "uintptr(unsafe.Pointer($name))";
-		} elsif($type eq "string" && $errvar ne "") {
-			$text .= "\tvar _p$n $strconvtype\n";
-			$text .= "\t_p$n, $errvar = $strconvfunc($name)\n";
-			$text .= "\tif $errvar != nil {\n\t\treturn\n\t}\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type eq "string") {
-			print STDERR "$ARGV:$.: $func uses string arguments, but has no error return\n";
-			$text .= "\tvar _p$n $strconvtype\n";
-			$text .= "\t_p$n, _ = $strconvfunc($name)\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type =~ /^\[\](.*)/) {
-			# Convert slice into pointer, length.
-			# Have to be careful not to take address of &a[0] if len == 0:
-			# pass nil in that case.
-			$text .= "\tvar _p$n *$1\n";
-			$text .= "\tif len($name) > 0 {\n\t\t_p$n = \&$name\[0]\n\t}\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))", "uintptr(len($name))";
-			$n++;
-		} elsif($type eq "int64" && $_32bit ne "") {
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name >> 32)", "uintptr($name)";
-			} else {
-				push @args, "uintptr($name)", "uintptr($name >> 32)";
-			}
-		} elsif($type eq "bool") {
- 			$text .= "\tvar _p$n uint32\n";
-			$text .= "\tif $name {\n\t\t_p$n = 1\n\t} else {\n\t\t_p$n = 0\n\t}\n";
-			push @args, "uintptr(_p$n)";
-			$n++;
-		} else {
-			push @args, "uintptr($name)";
-		}
-	}
-	my $nargs = @args;
-
-	# Determine which form to use; pad args with zeros.
-	my $asm = "sysvicall6";
-	if ($nonblock) {
-		$asm = "rawSysvicall6";
-	}
-	if(@args <= 6) {
-		while(@args < 6) {
-			push @args, "0";
-		}
-	} else {
-		print STDERR "$ARGV:$.: too many arguments to system call\n";
-	}
-
-	# Actual call.
-	my $args = join(', ', @args);
-	my $call = "$asm(uintptr(unsafe.Pointer(&$sysvarname)), $nargs, $args)";
-
-	# Assign return values.
-	my $body = "";
-	my $failexpr = "";
-	my @ret = ("_", "_", "_");
-	my @pout= ();
-	my $do_errno = 0;
-	for(my $i=0; $i<@out; $i++) {
-		my $p = $out[$i];
-		my ($name, $type) = parseparam($p);
-		my $reg = "";
-		if($name eq "err") {
-			$reg = "e1";
-			$ret[2] = $reg;
-			$do_errno = 1;
-		} else {
-			$reg = sprintf("r%d", $i);
-			$ret[$i] = $reg;
-		}
-		if($type eq "bool") {
-			$reg = "$reg != 0";
-		}
-		if($type eq "int64" && $_32bit ne "") {
-			# 64-bit number in r1:r0 or r0:r1.
-			if($i+2 > @out) {
-				print STDERR "$ARGV:$.: not enough registers for int64 return\n";
-			}
-			if($_32bit eq "big-endian") {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i, $i+1);
-			} else {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i+1, $i);
-			}
-			$ret[$i] = sprintf("r%d", $i);
-			$ret[$i+1] = sprintf("r%d", $i+1);
-		}
-		if($reg ne "e1") {
-			$body .= "\t$name = $type($reg)\n";
-		}
-	}
-	if ($ret[0] eq "_" && $ret[1] eq "_" && $ret[2] eq "_") {
-		$text .= "\t$call\n";
-	} else {
-		$text .= "\t$ret[0], $ret[1], $ret[2] := $call\n";
-	}
-	$text .= $body;
-
-	if ($do_errno) {
-		$text .= "\tif e1 != 0 {\n";
-		$text .= "\t\terr = e1\n";
-		$text .= "\t}\n";
-	}
-	$text .= "\treturn\n";
-	$text .= "}\n";
-}
-
-if($errors) {
-	exit 1;
-}
-
-print <<EOF;
-// $cmdline
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build $tags
-
-package $package
-
-import (
-	"syscall"
-	"unsafe"
-)
-EOF
-
-print "import \"golang.org/x/sys/unix\"\n" if $package ne "unix";
-
-my $vardecls = "\t" . join(",\n\t", @vars);
-$vardecls .= " syscallFunc";
-
-chomp($_=<<EOF);
-
-$dynimports
-$linknames
-var (
-$vardecls
-)
-
-$text
-EOF
-print $_;
-exit 0;
diff --git a/vendor/golang.org/x/sys/unix/mksysctl_openbsd.pl b/vendor/golang.org/x/sys/unix/mksysctl_openbsd.pl
deleted file mode 100755
index be67afa417..0000000000
--- a/vendor/golang.org/x/sys/unix/mksysctl_openbsd.pl
+++ /dev/null
@@ -1,264 +0,0 @@
-#!/usr/bin/env perl
-
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-#
-# Parse the header files for OpenBSD and generate a Go usable sysctl MIB.
-#
-# Build a MIB with each entry being an array containing the level, type and
-# a hash that will contain additional entries if the current entry is a node.
-# We then walk this MIB and create a flattened sysctl name to OID hash.
-#
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $debug = 0;
-my %ctls = ();
-
-my @headers = qw (
-	sys/sysctl.h
-	sys/socket.h
-	sys/tty.h
-	sys/malloc.h
-	sys/mount.h
-	sys/namei.h
-	sys/sem.h
-	sys/shm.h
-	sys/vmmeter.h
-	uvm/uvm_param.h
-	uvm/uvm_swap_encrypt.h
-	ddb/db_var.h
-	net/if.h
-	net/if_pfsync.h
-	net/pipex.h
-	netinet/in.h
-	netinet/icmp_var.h
-	netinet/igmp_var.h
-	netinet/ip_ah.h
-	netinet/ip_carp.h
-	netinet/ip_divert.h
-	netinet/ip_esp.h
-	netinet/ip_ether.h
-	netinet/ip_gre.h
-	netinet/ip_ipcomp.h
-	netinet/ip_ipip.h
-	netinet/pim_var.h
-	netinet/tcp_var.h
-	netinet/udp_var.h
-	netinet6/in6.h
-	netinet6/ip6_divert.h
-	netinet6/pim6_var.h
-	netinet/icmp6.h
-	netmpls/mpls.h
-);
-
-my @ctls = qw (
-	kern
-	vm
-	fs
-	net
-	#debug				# Special handling required
-	hw
-	#machdep			# Arch specific
-	user
-	ddb
-	#vfs				# Special handling required
-	fs.posix
-	kern.forkstat
-	kern.intrcnt
-	kern.malloc
-	kern.nchstats
-	kern.seminfo
-	kern.shminfo
-	kern.timecounter
-	kern.tty
-	kern.watchdog
-	net.bpf
-	net.ifq
-	net.inet
-	net.inet.ah
-	net.inet.carp
-	net.inet.divert
-	net.inet.esp
-	net.inet.etherip
-	net.inet.gre
-	net.inet.icmp
-	net.inet.igmp
-	net.inet.ip
-	net.inet.ip.ifq
-	net.inet.ipcomp
-	net.inet.ipip
-	net.inet.mobileip
-	net.inet.pfsync
-	net.inet.pim
-	net.inet.tcp
-	net.inet.udp
-	net.inet6
-	net.inet6.divert
-	net.inet6.ip6
-	net.inet6.icmp6
-	net.inet6.pim6
-	net.inet6.tcp6
-	net.inet6.udp6
-	net.mpls
-	net.mpls.ifq
-	net.key
-	net.pflow
-	net.pfsync
-	net.pipex
-	net.rt
-	vm.swapencrypt
-	#vfsgenctl			# Special handling required
-);
-
-# Node name "fixups"
-my %ctl_map = (
-	"ipproto" => "net.inet",
-	"net.inet.ipproto" => "net.inet",
-	"net.inet6.ipv6proto" => "net.inet6",
-	"net.inet6.ipv6" => "net.inet6.ip6",
-	"net.inet.icmpv6" => "net.inet6.icmp6",
-	"net.inet6.divert6" => "net.inet6.divert",
-	"net.inet6.tcp6" => "net.inet.tcp",
-	"net.inet6.udp6" => "net.inet.udp",
-	"mpls" => "net.mpls",
-	"swpenc" => "vm.swapencrypt"
-);
-
-# Node mappings
-my %node_map = (
-	"net.inet.ip.ifq" => "net.ifq",
-	"net.inet.pfsync" => "net.pfsync",
-	"net.mpls.ifq" => "net.ifq"
-);
-
-my $ctlname;
-my %mib = ();
-my %sysctl = ();
-my $node;
-
-sub debug() {
-	print STDERR "$_[0]\n" if $debug;
-}
-
-# Walk the MIB and build a sysctl name to OID mapping.
-sub build_sysctl() {
-	my ($node, $name, $oid) = @_;
-	my %node = %{$node};
-	my @oid = @{$oid};
-
-	foreach my $key (sort keys %node) {
-		my @node = @{$node{$key}};
-		my $nodename = $name.($name ne '' ? '.' : '').$key;
-		my @nodeoid = (@oid, $node[0]);
-		if ($node[1] eq 'CTLTYPE_NODE') {
-			if (exists $node_map{$nodename}) {
-				$node = \%mib;
-				$ctlname = $node_map{$nodename};
-				foreach my $part (split /\./, $ctlname) {
-					$node = \%{@{$$node{$part}}[2]};
-				}
-			} else {
-				$node = $node[2];
-			}
-			&build_sysctl($node, $nodename, \@nodeoid);
-		} elsif ($node[1] ne '') {
-			$sysctl{$nodename} = \@nodeoid;
-		}
-	}
-}
-
-foreach my $ctl (@ctls) {
-	$ctls{$ctl} = $ctl;
-}
-
-# Build MIB
-foreach my $header (@headers) {
-	&debug("Processing $header...");
-	open HEADER, "/usr/include/$header" ||
-	    print STDERR "Failed to open $header\n";
-	while (<HEADER>) {
-		if ($_ =~ /^#define\s+(CTL_NAMES)\s+{/ ||
-		    $_ =~ /^#define\s+(CTL_(.*)_NAMES)\s+{/ ||
-		    $_ =~ /^#define\s+((.*)CTL_NAMES)\s+{/) {
-			if ($1 eq 'CTL_NAMES') {
-				# Top level.
-				$node = \%mib;
-			} else {
-				# Node.
-				my $nodename = lc($2);
-				if ($header =~ /^netinet\//) {
-					$ctlname = "net.inet.$nodename";
-				} elsif ($header =~ /^netinet6\//) {
-					$ctlname = "net.inet6.$nodename";
-				} elsif ($header =~ /^net\//) {
-					$ctlname = "net.$nodename";
-				} else {
-					$ctlname = "$nodename";
-					$ctlname =~ s/^(fs|net|kern)_/$1\./;
-				}
-				if (exists $ctl_map{$ctlname}) {
-					$ctlname = $ctl_map{$ctlname};
-				}
-				if (not exists $ctls{$ctlname}) {
-					&debug("Ignoring $ctlname...");
-					next;
-				}
-
-				# Walk down from the top of the MIB.
-				$node = \%mib;
-				foreach my $part (split /\./, $ctlname) {
-					if (not exists $$node{$part}) {
-						&debug("Missing node $part");
-						$$node{$part} = [ 0, '', {} ];
-					}
-					$node = \%{@{$$node{$part}}[2]};
-				}
-			}
-
-			# Populate current node with entries.
-			my $i = -1;
-			while (defined($_) && $_ !~ /^}/) {
-				$_ = <HEADER>;
-				$i++ if $_ =~ /{.*}/;
-				next if $_ !~ /{\s+"(\w+)",\s+(CTLTYPE_[A-Z]+)\s+}/;
-				$$node{$1} = [ $i, $2, {} ];
-			}
-		}
-	}
-	close HEADER;
-}
-
-&build_sysctl(\%mib, "", []);
-
-print <<EOF;
-// mksysctl_openbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix;
-
-type mibentry struct {
-	ctlname string
-	ctloid []_C_int
-}
-
-var sysctlMib = []mibentry {
-EOF
-
-foreach my $name (sort keys %sysctl) {
-	my @oid = @{$sysctl{$name}};
-	print "\t{ \"$name\", []_C_int{ ", join(', ', @oid), " } }, \n";
-}
-
-print <<EOF;
-}
-EOF
diff --git a/vendor/golang.org/x/sys/unix/mksysnum_darwin.pl b/vendor/golang.org/x/sys/unix/mksysnum_darwin.pl
deleted file mode 100755
index 5453c53b19..0000000000
--- a/vendor/golang.org/x/sys/unix/mksysnum_darwin.pl
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for Darwin from sys/syscall.h
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_darwin.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-while(<>){
-	if(/^#define\s+SYS_(\w+)\s+([0-9]+)/){
-		my $name = $1;
-		my $num = $2;
-		$name =~ y/a-z/A-Z/;
-		print "	SYS_$name = $num;"
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/vendor/golang.org/x/sys/unix/mksysnum_dragonfly.pl b/vendor/golang.org/x/sys/unix/mksysnum_dragonfly.pl
deleted file mode 100755
index 6804f41216..0000000000
--- a/vendor/golang.org/x/sys/unix/mksysnum_dragonfly.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for DragonFly from master list
-# (for example, /usr/src/sys/kern/syscalls.master).
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_dragonfly.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-while(<>){
-	if(/^([0-9]+)\s+STD\s+({ \S+\s+(\w+).*)$/){
-		my $num = $1;
-		my $proto = $2;
-		my $name = "SYS_$3";
-		$name =~ y/a-z/A-Z/;
-
-		# There are multiple entries for enosys and nosys, so comment them out.
-		if($name =~ /^SYS_E?NOSYS$/){
-			$name = "// $name";
-		}
-		if($name eq 'SYS_SYS_EXIT'){
-			$name = 'SYS_EXIT';
-		}
-
-		print "	$name = $num;  // $proto\n";
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/vendor/golang.org/x/sys/unix/mksysnum_freebsd.pl b/vendor/golang.org/x/sys/unix/mksysnum_freebsd.pl
deleted file mode 100755
index c83064fe3f..0000000000
--- a/vendor/golang.org/x/sys/unix/mksysnum_freebsd.pl
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for FreeBSD from master list
-# (for example, /usr/src/sys/kern/syscalls.master).
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_freebsd.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-while(<>){
-	if(/^([0-9]+)\s+\S+\s+STD\s+({ \S+\s+(\w+).*)$/){
-		my $num = $1;
-		my $proto = $2;
-		my $name = "SYS_$3";
-		$name =~ y/a-z/A-Z/;
-
-		# There are multiple entries for enosys and nosys, so comment them out.
-		if($name =~ /^SYS_E?NOSYS$/){
-			$name = "// $name";
-		}
-		if($name eq 'SYS_SYS_EXIT'){
-			$name = 'SYS_EXIT';
-		}
-		if($name =~ /^SYS_CAP_+/ || $name =~ /^SYS___CAP_+/){
-			next
-		}
-
-		print "	$name = $num;  // $proto\n";
-
-		# We keep Capsicum syscall numbers for FreeBSD
-		# 9-STABLE here because we are not sure whether they
-		# are mature and stable.
-		if($num == 513){
-			print " SYS_CAP_NEW = 514 // { int cap_new(int fd, uint64_t rights); }\n";
-			print " SYS_CAP_GETRIGHTS = 515 // { int cap_getrights(int fd, \\\n";
-			print " SYS_CAP_ENTER = 516 // { int cap_enter(void); }\n";
-			print " SYS_CAP_GETMODE = 517 // { int cap_getmode(u_int *modep); }\n";
-		}
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/vendor/golang.org/x/sys/unix/mksysnum_netbsd.pl b/vendor/golang.org/x/sys/unix/mksysnum_netbsd.pl
deleted file mode 100755
index d31f2c48fb..0000000000
--- a/vendor/golang.org/x/sys/unix/mksysnum_netbsd.pl
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for OpenBSD from master list
-# (for example, /usr/src/sys/kern/syscalls.master).
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_netbsd.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-my $line = '';
-while(<>){
-	if($line =~ /^(.*)\\$/) {
-		# Handle continuation
-		$line = $1;
-		$_ =~ s/^\s+//;
-		$line .= $_;
-	} else {
-		# New line
-		$line = $_;
-	}
-	next if $line =~ /\\$/;
-	if($line =~ /^([0-9]+)\s+((STD)|(NOERR))\s+(RUMP\s+)?({\s+\S+\s*\*?\s*\|(\S+)\|(\S*)\|(\w+).*\s+})(\s+(\S+))?$/) {
-		my $num = $1;
-		my $proto = $6;
-		my $compat = $8;
-		my $name = "$7_$9";
-
-		$name = "$7_$11" if $11 ne '';
-		$name =~ y/a-z/A-Z/;
-
-		if($compat eq '' || $compat eq '30' || $compat eq '50') {
-			print "	$name = $num;  // $proto\n";
-		}
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/vendor/golang.org/x/sys/unix/mksysnum_openbsd.pl b/vendor/golang.org/x/sys/unix/mksysnum_openbsd.pl
deleted file mode 100755
index 84edf60ca1..0000000000
--- a/vendor/golang.org/x/sys/unix/mksysnum_openbsd.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for OpenBSD from master list
-# (for example, /usr/src/sys/kern/syscalls.master).
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_openbsd.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-while(<>){
-	if(/^([0-9]+)\s+STD\s+(NOLOCK\s+)?({ \S+\s+\*?(\w+).*)$/){
-		my $num = $1;
-		my $proto = $3;
-		my $name = $4;
-		$name =~ y/a-z/A-Z/;
-
-		# There are multiple entries for enosys and nosys, so comment them out.
-		if($name =~ /^SYS_E?NOSYS$/){
-			$name = "// $name";
-		}
-		if($name eq 'SYS_SYS_EXIT'){
-			$name = 'SYS_EXIT';
-		}
-
-		print "	$name = $num;  // $proto\n";
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/vendor/golang.org/x/sys/unix/openbsd_pledge.go b/vendor/golang.org/x/sys/unix/openbsd_pledge.go
deleted file mode 100644
index db4f72ea9c..0000000000
--- a/vendor/golang.org/x/sys/unix/openbsd_pledge.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build openbsd
-// +build 386 amd64 arm
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	SYS_PLEDGE = 108
-)
-
-// Pledge implements the pledge syscall. For more information see pledge(2).
-func Pledge(promises string, paths []string) error {
-	promisesPtr, err := syscall.BytePtrFromString(promises)
-	if err != nil {
-		return err
-	}
-	promisesUnsafe, pathsUnsafe := unsafe.Pointer(promisesPtr), unsafe.Pointer(nil)
-	if paths != nil {
-		var pathsPtr []*byte
-		if pathsPtr, err = syscall.SlicePtrFromStrings(paths); err != nil {
-			return err
-		}
-		pathsUnsafe = unsafe.Pointer(&pathsPtr[0])
-	}
-	_, _, e := syscall.Syscall(SYS_PLEDGE, uintptr(promisesUnsafe), uintptr(pathsUnsafe), 0)
-	if e != 0 {
-		return e
-	}
-	return nil
-}
diff --git a/vendor/golang.org/x/sys/unix/race.go b/vendor/golang.org/x/sys/unix/race.go
deleted file mode 100644
index 3c7627eb5c..0000000000
--- a/vendor/golang.org/x/sys/unix/race.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin,race linux,race freebsd,race
-
-package unix
-
-import (
-	"runtime"
-	"unsafe"
-)
-
-const raceenabled = true
-
-func raceAcquire(addr unsafe.Pointer) {
-	runtime.RaceAcquire(addr)
-}
-
-func raceReleaseMerge(addr unsafe.Pointer) {
-	runtime.RaceReleaseMerge(addr)
-}
-
-func raceReadRange(addr unsafe.Pointer, len int) {
-	runtime.RaceReadRange(addr, len)
-}
-
-func raceWriteRange(addr unsafe.Pointer, len int) {
-	runtime.RaceWriteRange(addr, len)
-}
diff --git a/vendor/golang.org/x/sys/unix/race0.go b/vendor/golang.org/x/sys/unix/race0.go
deleted file mode 100644
index f8678e0d21..0000000000
--- a/vendor/golang.org/x/sys/unix/race0.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin,!race linux,!race freebsd,!race netbsd openbsd solaris dragonfly
-
-package unix
-
-import (
-	"unsafe"
-)
-
-const raceenabled = false
-
-func raceAcquire(addr unsafe.Pointer) {
-}
-
-func raceReleaseMerge(addr unsafe.Pointer) {
-}
-
-func raceReadRange(addr unsafe.Pointer, len int) {
-}
-
-func raceWriteRange(addr unsafe.Pointer, len int) {
-}
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_linux.go b/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
deleted file mode 100644
index d9ff4731a2..0000000000
--- a/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Socket control messages
-
-package unix
-
-import "unsafe"
-
-// UnixCredentials encodes credentials into a socket control message
-// for sending to another process. This can be used for
-// authentication.
-func UnixCredentials(ucred *Ucred) []byte {
-	b := make([]byte, CmsgSpace(SizeofUcred))
-	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
-	h.Level = SOL_SOCKET
-	h.Type = SCM_CREDENTIALS
-	h.SetLen(CmsgLen(SizeofUcred))
-	*((*Ucred)(cmsgData(h))) = *ucred
-	return b
-}
-
-// ParseUnixCredentials decodes a socket control message that contains
-// credentials in a Ucred structure. To receive such a message, the
-// SO_PASSCRED option must be enabled on the socket.
-func ParseUnixCredentials(m *SocketControlMessage) (*Ucred, error) {
-	if m.Header.Level != SOL_SOCKET {
-		return nil, EINVAL
-	}
-	if m.Header.Type != SCM_CREDENTIALS {
-		return nil, EINVAL
-	}
-	ucred := *(*Ucred)(unsafe.Pointer(&m.Data[0]))
-	return &ucred, nil
-}
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
deleted file mode 100644
index f1493a3e6f..0000000000
--- a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-// Socket control messages
-
-package unix
-
-import "unsafe"
-
-// Round the length of a raw sockaddr up to align it properly.
-func cmsgAlignOf(salen int) int {
-	salign := sizeofPtr
-	// NOTE: It seems like 64-bit Darwin and DragonFly BSD kernels
-	// still require 32-bit aligned access to network subsystem.
-	if darwin64Bit || dragonfly64Bit {
-		salign = 4
-	}
-	return (salen + salign - 1) & ^(salign - 1)
-}
-
-// CmsgLen returns the value to store in the Len field of the Cmsghdr
-// structure, taking into account any necessary alignment.
-func CmsgLen(datalen int) int {
-	return cmsgAlignOf(SizeofCmsghdr) + datalen
-}
-
-// CmsgSpace returns the number of bytes an ancillary element with
-// payload of the passed data length occupies.
-func CmsgSpace(datalen int) int {
-	return cmsgAlignOf(SizeofCmsghdr) + cmsgAlignOf(datalen)
-}
-
-func cmsgData(h *Cmsghdr) unsafe.Pointer {
-	return unsafe.Pointer(uintptr(unsafe.Pointer(h)) + uintptr(cmsgAlignOf(SizeofCmsghdr)))
-}
-
-// SocketControlMessage represents a socket control message.
-type SocketControlMessage struct {
-	Header Cmsghdr
-	Data   []byte
-}
-
-// ParseSocketControlMessage parses b as an array of socket control
-// messages.
-func ParseSocketControlMessage(b []byte) ([]SocketControlMessage, error) {
-	var msgs []SocketControlMessage
-	i := 0
-	for i+CmsgLen(0) <= len(b) {
-		h, dbuf, err := socketControlMessageHeaderAndData(b[i:])
-		if err != nil {
-			return nil, err
-		}
-		m := SocketControlMessage{Header: *h, Data: dbuf}
-		msgs = append(msgs, m)
-		i += cmsgAlignOf(int(h.Len))
-	}
-	return msgs, nil
-}
-
-func socketControlMessageHeaderAndData(b []byte) (*Cmsghdr, []byte, error) {
-	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
-	if h.Len < SizeofCmsghdr || uint64(h.Len) > uint64(len(b)) {
-		return nil, nil, EINVAL
-	}
-	return h, b[cmsgAlignOf(SizeofCmsghdr):h.Len], nil
-}
-
-// UnixRights encodes a set of open file descriptors into a socket
-// control message for sending to another process.
-func UnixRights(fds ...int) []byte {
-	datalen := len(fds) * 4
-	b := make([]byte, CmsgSpace(datalen))
-	h := (*Cmsghdr)(unsafe.Pointer(&b[0]))
-	h.Level = SOL_SOCKET
-	h.Type = SCM_RIGHTS
-	h.SetLen(CmsgLen(datalen))
-	data := cmsgData(h)
-	for _, fd := range fds {
-		*(*int32)(data) = int32(fd)
-		data = unsafe.Pointer(uintptr(data) + 4)
-	}
-	return b
-}
-
-// ParseUnixRights decodes a socket control message that contains an
-// integer array of open file descriptors from another process.
-func ParseUnixRights(m *SocketControlMessage) ([]int, error) {
-	if m.Header.Level != SOL_SOCKET {
-		return nil, EINVAL
-	}
-	if m.Header.Type != SCM_RIGHTS {
-		return nil, EINVAL
-	}
-	fds := make([]int, len(m.Data)>>2)
-	for i, j := 0, 0; i < len(m.Data); i += 4 {
-		fds[j] = int(*(*int32)(unsafe.Pointer(&m.Data[i])))
-		j++
-	}
-	return fds, nil
-}
diff --git a/vendor/golang.org/x/sys/unix/str.go b/vendor/golang.org/x/sys/unix/str.go
deleted file mode 100644
index 35ed664353..0000000000
--- a/vendor/golang.org/x/sys/unix/str.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix
-
-func itoa(val int) string { // do it here rather than with fmt to avoid dependency
-	if val < 0 {
-		return "-" + uitoa(uint(-val))
-	}
-	return uitoa(uint(val))
-}
-
-func uitoa(val uint) string {
-	var buf [32]byte // big enough for int64
-	i := len(buf) - 1
-	for val >= 10 {
-		buf[i] = byte(val%10 + '0')
-		i--
-		val /= 10
-	}
-	buf[i] = byte(val + '0')
-	return string(buf[i:])
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall.go b/vendor/golang.org/x/sys/unix/syscall.go
deleted file mode 100644
index 85e35020e2..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-// Package unix contains an interface to the low-level operating system
-// primitives.  OS details vary depending on the underlying system, and
-// by default, godoc will display OS-specific documentation for the current
-// system.  If you want godoc to display OS documentation for another
-// system, set $GOOS and $GOARCH to the desired system.  For example, if
-// you want to view documentation for freebsd/arm on linux/amd64, set $GOOS
-// to freebsd and $GOARCH to arm.
-// The primary use of this package is inside other packages that provide a more
-// portable interface to the system, such as "os", "time" and "net".  Use
-// those packages rather than this one if you can.
-// For details of the functions and data types in this package consult
-// the manuals for the appropriate operating system.
-// These calls return err == nil to indicate success; otherwise
-// err represents an operating system error describing the failure and
-// holds a value of type syscall.Errno.
-package unix // import "golang.org/x/sys/unix"
-
-// ByteSliceFromString returns a NUL-terminated slice of bytes
-// containing the text of s. If s contains a NUL byte at any
-// location, it returns (nil, EINVAL).
-func ByteSliceFromString(s string) ([]byte, error) {
-	for i := 0; i < len(s); i++ {
-		if s[i] == 0 {
-			return nil, EINVAL
-		}
-	}
-	a := make([]byte, len(s)+1)
-	copy(a, s)
-	return a, nil
-}
-
-// BytePtrFromString returns a pointer to a NUL-terminated array of
-// bytes containing the text of s. If s contains a NUL byte at any
-// location, it returns (nil, EINVAL).
-func BytePtrFromString(s string) (*byte, error) {
-	a, err := ByteSliceFromString(s)
-	if err != nil {
-		return nil, err
-	}
-	return &a[0], nil
-}
-
-// Single-word zero for use when we need a valid pointer to 0 bytes.
-// See mkunix.pl.
-var _zero uintptr
-
-func (ts *Timespec) Unix() (sec int64, nsec int64) {
-	return int64(ts.Sec), int64(ts.Nsec)
-}
-
-func (tv *Timeval) Unix() (sec int64, nsec int64) {
-	return int64(tv.Sec), int64(tv.Usec) * 1000
-}
-
-func (ts *Timespec) Nano() int64 {
-	return int64(ts.Sec)*1e9 + int64(ts.Nsec)
-}
-
-func (tv *Timeval) Nano() int64 {
-	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000
-}
-
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go
deleted file mode 100644
index ccb29c75c4..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_bsd.go
+++ /dev/null
@@ -1,614 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-// BSD system call wrappers shared by *BSD based systems
-// including OS X (Darwin) and FreeBSD.  Like the other
-// syscall_*.go files it is compiled as Go code but also
-// used as input to mksyscall which parses the //sys
-// lines and generates system call stubs.
-
-package unix
-
-import (
-	"runtime"
-	"syscall"
-	"unsafe"
-)
-
-/*
- * Wrapped
- */
-
-//sysnb	getgroups(ngid int, gid *_Gid_t) (n int, err error)
-//sysnb	setgroups(ngid int, gid *_Gid_t) (err error)
-
-func Getgroups() (gids []int, err error) {
-	n, err := getgroups(0, nil)
-	if err != nil {
-		return nil, err
-	}
-	if n == 0 {
-		return nil, nil
-	}
-
-	// Sanity check group count.  Max is 16 on BSD.
-	if n < 0 || n > 1000 {
-		return nil, EINVAL
-	}
-
-	a := make([]_Gid_t, n)
-	n, err = getgroups(n, &a[0])
-	if err != nil {
-		return nil, err
-	}
-	gids = make([]int, n)
-	for i, v := range a[0:n] {
-		gids[i] = int(v)
-	}
-	return
-}
-
-func Setgroups(gids []int) (err error) {
-	if len(gids) == 0 {
-		return setgroups(0, nil)
-	}
-
-	a := make([]_Gid_t, len(gids))
-	for i, v := range gids {
-		a[i] = _Gid_t(v)
-	}
-	return setgroups(len(a), &a[0])
-}
-
-func ReadDirent(fd int, buf []byte) (n int, err error) {
-	// Final argument is (basep *uintptr) and the syscall doesn't take nil.
-	// 64 bits should be enough. (32 bits isn't even on 386). Since the
-	// actual system call is getdirentries64, 64 is a good guess.
-	// TODO(rsc): Can we use a single global basep for all calls?
-	var base = (*uintptr)(unsafe.Pointer(new(uint64)))
-	return Getdirentries(fd, buf, base)
-}
-
-// Wait status is 7 bits at bottom, either 0 (exited),
-// 0x7F (stopped), or a signal number that caused an exit.
-// The 0x80 bit is whether there was a core dump.
-// An extra number (exit code, signal causing a stop)
-// is in the high bits.
-
-type WaitStatus uint32
-
-const (
-	mask  = 0x7F
-	core  = 0x80
-	shift = 8
-
-	exited  = 0
-	stopped = 0x7F
-)
-
-func (w WaitStatus) Exited() bool { return w&mask == exited }
-
-func (w WaitStatus) ExitStatus() int {
-	if w&mask != exited {
-		return -1
-	}
-	return int(w >> shift)
-}
-
-func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != 0 }
-
-func (w WaitStatus) Signal() syscall.Signal {
-	sig := syscall.Signal(w & mask)
-	if sig == stopped || sig == 0 {
-		return -1
-	}
-	return sig
-}
-
-func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
-
-func (w WaitStatus) Stopped() bool { return w&mask == stopped && syscall.Signal(w>>shift) != SIGSTOP }
-
-func (w WaitStatus) Continued() bool { return w&mask == stopped && syscall.Signal(w>>shift) == SIGSTOP }
-
-func (w WaitStatus) StopSignal() syscall.Signal {
-	if !w.Stopped() {
-		return -1
-	}
-	return syscall.Signal(w>>shift) & 0xFF
-}
-
-func (w WaitStatus) TrapCause() int { return -1 }
-
-//sys	wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error)
-
-func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
-	var status _C_int
-	wpid, err = wait4(pid, &status, options, rusage)
-	if wstatus != nil {
-		*wstatus = WaitStatus(status)
-	}
-	return
-}
-
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	Shutdown(s int, how int) (err error)
-
-func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Len = SizeofSockaddrInet4
-	sa.raw.Family = AF_INET
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
-}
-
-func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Len = SizeofSockaddrInet6
-	sa.raw.Family = AF_INET6
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	sa.raw.Scope_id = sa.ZoneId
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
-}
-
-func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	name := sa.Name
-	n := len(name)
-	if n >= len(sa.raw.Path) || n == 0 {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Len = byte(3 + n) // 2 for Family, Len; 1 for NUL
-	sa.raw.Family = AF_UNIX
-	for i := 0; i < n; i++ {
-		sa.raw.Path[i] = int8(name[i])
-	}
-	return unsafe.Pointer(&sa.raw), _Socklen(sa.raw.Len), nil
-}
-
-func (sa *SockaddrDatalink) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Index == 0 {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Len = sa.Len
-	sa.raw.Family = AF_LINK
-	sa.raw.Index = sa.Index
-	sa.raw.Type = sa.Type
-	sa.raw.Nlen = sa.Nlen
-	sa.raw.Alen = sa.Alen
-	sa.raw.Slen = sa.Slen
-	for i := 0; i < len(sa.raw.Data); i++ {
-		sa.raw.Data[i] = sa.Data[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrDatalink, nil
-}
-
-func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
-	switch rsa.Addr.Family {
-	case AF_LINK:
-		pp := (*RawSockaddrDatalink)(unsafe.Pointer(rsa))
-		sa := new(SockaddrDatalink)
-		sa.Len = pp.Len
-		sa.Family = pp.Family
-		sa.Index = pp.Index
-		sa.Type = pp.Type
-		sa.Nlen = pp.Nlen
-		sa.Alen = pp.Alen
-		sa.Slen = pp.Slen
-		for i := 0; i < len(sa.Data); i++ {
-			sa.Data[i] = pp.Data[i]
-		}
-		return sa, nil
-
-	case AF_UNIX:
-		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
-		if pp.Len < 2 || pp.Len > SizeofSockaddrUnix {
-			return nil, EINVAL
-		}
-		sa := new(SockaddrUnix)
-
-		// Some BSDs include the trailing NUL in the length, whereas
-		// others do not. Work around this by subtracting the leading
-		// family and len. The path is then scanned to see if a NUL
-		// terminator still exists within the length.
-		n := int(pp.Len) - 2 // subtract leading Family, Len
-		for i := 0; i < n; i++ {
-			if pp.Path[i] == 0 {
-				// found early NUL; assume Len included the NUL
-				// or was overestimating.
-				n = i
-				break
-			}
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
-		sa.Name = string(bytes)
-		return sa, nil
-
-	case AF_INET:
-		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet4)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-
-	case AF_INET6:
-		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet6)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.ZoneId = pp.Scope_id
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-	}
-	return nil, EAFNOSUPPORT
-}
-
-func Accept(fd int) (nfd int, sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	nfd, err = accept(fd, &rsa, &len)
-	if err != nil {
-		return
-	}
-	if runtime.GOOS == "darwin" && len == 0 {
-		// Accepted socket has no address.
-		// This is likely due to a bug in xnu kernels,
-		// where instead of ECONNABORTED error socket
-		// is accepted, but has no address.
-		Close(nfd)
-		return 0, nil, ECONNABORTED
-	}
-	sa, err = anyToSockaddr(&rsa)
-	if err != nil {
-		Close(nfd)
-		nfd = 0
-	}
-	return
-}
-
-func Getsockname(fd int) (sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	if err = getsockname(fd, &rsa, &len); err != nil {
-		return
-	}
-	// TODO(jsing): DragonFly has a "bug" (see issue 3349), which should be
-	// reported upstream.
-	if runtime.GOOS == "dragonfly" && rsa.Addr.Family == AF_UNSPEC && rsa.Addr.Len == 0 {
-		rsa.Addr.Family = AF_UNIX
-		rsa.Addr.Len = SizeofSockaddrUnix
-	}
-	return anyToSockaddr(&rsa)
-}
-
-//sysnb socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-
-func GetsockoptByte(fd, level, opt int) (value byte, err error) {
-	var n byte
-	vallen := _Socklen(1)
-	err = getsockopt(fd, level, opt, unsafe.Pointer(&n), &vallen)
-	return n, err
-}
-
-func GetsockoptInet4Addr(fd, level, opt int) (value [4]byte, err error) {
-	vallen := _Socklen(4)
-	err = getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
-	return value, err
-}
-
-func GetsockoptIPMreq(fd, level, opt int) (*IPMreq, error) {
-	var value IPMreq
-	vallen := _Socklen(SizeofIPMreq)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPv6Mreq(fd, level, opt int) (*IPv6Mreq, error) {
-	var value IPv6Mreq
-	vallen := _Socklen(SizeofIPv6Mreq)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) {
-	var value IPv6MTUInfo
-	vallen := _Socklen(SizeofIPv6MTUInfo)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptICMPv6Filter(fd, level, opt int) (*ICMPv6Filter, error) {
-	var value ICMPv6Filter
-	vallen := _Socklen(SizeofICMPv6Filter)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-//sys   recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys   sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-
-func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
-	var msg Msghdr
-	var rsa RawSockaddrAny
-	msg.Name = (*byte)(unsafe.Pointer(&rsa))
-	msg.Namelen = uint32(SizeofSockaddrAny)
-	var iov Iovec
-	if len(p) > 0 {
-		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
-		iov.SetLen(len(p))
-	}
-	var dummy byte
-	if len(oob) > 0 {
-		// receive at least one normal byte
-		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
-		}
-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
-		msg.SetControllen(len(oob))
-	}
-	msg.Iov = &iov
-	msg.Iovlen = 1
-	if n, err = recvmsg(fd, &msg, flags); err != nil {
-		return
-	}
-	oobn = int(msg.Controllen)
-	recvflags = int(msg.Flags)
-	// source address is only specified if the socket is unconnected
-	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(&rsa)
-	}
-	return
-}
-
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-
-func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
-	_, err = SendmsgN(fd, p, oob, to, flags)
-	return
-}
-
-func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
-	var ptr unsafe.Pointer
-	var salen _Socklen
-	if to != nil {
-		ptr, salen, err = to.sockaddr()
-		if err != nil {
-			return 0, err
-		}
-	}
-	var msg Msghdr
-	msg.Name = (*byte)(unsafe.Pointer(ptr))
-	msg.Namelen = uint32(salen)
-	var iov Iovec
-	if len(p) > 0 {
-		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
-		iov.SetLen(len(p))
-	}
-	var dummy byte
-	if len(oob) > 0 {
-		// send at least one normal byte
-		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
-		}
-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
-		msg.SetControllen(len(oob))
-	}
-	msg.Iov = &iov
-	msg.Iovlen = 1
-	if n, err = sendmsg(fd, &msg, flags); err != nil {
-		return 0, err
-	}
-	if len(oob) > 0 && len(p) == 0 {
-		n = 0
-	}
-	return n, nil
-}
-
-//sys	kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error)
-
-func Kevent(kq int, changes, events []Kevent_t, timeout *Timespec) (n int, err error) {
-	var change, event unsafe.Pointer
-	if len(changes) > 0 {
-		change = unsafe.Pointer(&changes[0])
-	}
-	if len(events) > 0 {
-		event = unsafe.Pointer(&events[0])
-	}
-	return kevent(kq, change, len(changes), event, len(events), timeout)
-}
-
-//sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
-
-// sysctlmib translates name to mib number and appends any additional args.
-func sysctlmib(name string, args ...int) ([]_C_int, error) {
-	// Translate name to mib number.
-	mib, err := nametomib(name)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, a := range args {
-		mib = append(mib, _C_int(a))
-	}
-
-	return mib, nil
-}
-
-func Sysctl(name string) (string, error) {
-	return SysctlArgs(name)
-}
-
-func SysctlArgs(name string, args ...int) (string, error) {
-	buf, err := SysctlRaw(name, args...)
-	if err != nil {
-		return "", err
-	}
-	n := len(buf)
-
-	// Throw away terminating NUL.
-	if n > 0 && buf[n-1] == '\x00' {
-		n--
-	}
-	return string(buf[0:n]), nil
-}
-
-func SysctlUint32(name string) (uint32, error) {
-	return SysctlUint32Args(name)
-}
-
-func SysctlUint32Args(name string, args ...int) (uint32, error) {
-	mib, err := sysctlmib(name, args...)
-	if err != nil {
-		return 0, err
-	}
-
-	n := uintptr(4)
-	buf := make([]byte, 4)
-	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
-		return 0, err
-	}
-	if n != 4 {
-		return 0, EIO
-	}
-	return *(*uint32)(unsafe.Pointer(&buf[0])), nil
-}
-
-func SysctlUint64(name string, args ...int) (uint64, error) {
-	mib, err := sysctlmib(name, args...)
-	if err != nil {
-		return 0, err
-	}
-
-	n := uintptr(8)
-	buf := make([]byte, 8)
-	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
-		return 0, err
-	}
-	if n != 8 {
-		return 0, EIO
-	}
-	return *(*uint64)(unsafe.Pointer(&buf[0])), nil
-}
-
-func SysctlRaw(name string, args ...int) ([]byte, error) {
-	mib, err := sysctlmib(name, args...)
-	if err != nil {
-		return nil, err
-	}
-
-	// Find size.
-	n := uintptr(0)
-	if err := sysctl(mib, nil, &n, nil, 0); err != nil {
-		return nil, err
-	}
-	if n == 0 {
-		return nil, nil
-	}
-
-	// Read into buffer of that size.
-	buf := make([]byte, n)
-	if err := sysctl(mib, &buf[0], &n, nil, 0); err != nil {
-		return nil, err
-	}
-
-	// The actual call may return less than the original reported required
-	// size so ensure we deal with that.
-	return buf[:n], nil
-}
-
-//sys	utimes(path string, timeval *[2]Timeval) (err error)
-
-func Utimes(path string, tv []Timeval) error {
-	if tv == nil {
-		return utimes(path, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-func UtimesNano(path string, ts []Timespec) error {
-	if ts == nil {
-		return utimes(path, nil)
-	}
-	// TODO: The BSDs can do utimensat with SYS_UTIMENSAT but it
-	// isn't supported by darwin so this uses utimes instead
-	if len(ts) != 2 {
-		return EINVAL
-	}
-	// Not as efficient as it could be because Timespec and
-	// Timeval have different types in the different OSes
-	tv := [2]Timeval{
-		NsecToTimeval(TimespecToNsec(ts[0])),
-		NsecToTimeval(TimespecToNsec(ts[1])),
-	}
-	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-//sys	futimes(fd int, timeval *[2]Timeval) (err error)
-
-func Futimes(fd int, tv []Timeval) error {
-	if tv == nil {
-		return futimes(fd, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	return futimes(fd, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-//sys	fcntl(fd int, cmd int, arg int) (val int, err error)
-
-// TODO: wrap
-//	Acct(name nil-string) (err error)
-//	Gethostuuid(uuid *byte, timeout *Timespec) (err error)
-//	Madvise(addr *byte, len int, behav int) (err error)
-//	Mprotect(addr *byte, len int, prot int) (err error)
-//	Msync(addr *byte, len int, flags int) (err error)
-//	Ptrace(req int, pid int, addr uintptr, data int) (ret uintptr, err error)
-
-var mapper = &mmapper{
-	active: make(map[*byte][]byte),
-	mmap:   mmap,
-	munmap: munmap,
-}
-
-func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	return mapper.Mmap(fd, offset, length, prot, flags)
-}
-
-func Munmap(b []byte) (err error) {
-	return mapper.Munmap(b)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go
deleted file mode 100644
index 7d91ac02ac..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_darwin.go
+++ /dev/null
@@ -1,493 +0,0 @@
-// Copyright 2009,2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Darwin system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and wrap
-// it in our own nicer implementation, either here or in
-// syscall_bsd.go or syscall_unix.go.
-
-package unix
-
-import (
-	errorspkg "errors"
-	"syscall"
-	"unsafe"
-)
-
-const ImplementsGetwd = true
-
-func Getwd() (string, error) {
-	buf := make([]byte, 2048)
-	attrs, err := getAttrList(".", attrList{CommonAttr: attrCmnFullpath}, buf, 0)
-	if err == nil && len(attrs) == 1 && len(attrs[0]) >= 2 {
-		wd := string(attrs[0])
-		// Sanity check that it's an absolute path and ends
-		// in a null byte, which we then strip.
-		if wd[0] == '/' && wd[len(wd)-1] == 0 {
-			return wd[:len(wd)-1], nil
-		}
-	}
-	// If pkg/os/getwd.go gets ENOTSUP, it will fall back to the
-	// slow algorithm.
-	return "", ENOTSUP
-}
-
-type SockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-	raw    RawSockaddrDatalink
-}
-
-// Translate "kern.hostname" to []_C_int{0,1,2,3}.
-func nametomib(name string) (mib []_C_int, err error) {
-	const siz = unsafe.Sizeof(mib[0])
-
-	// NOTE(rsc): It seems strange to set the buffer to have
-	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
-	// as the size.  I don't know why the +2 is here, but the
-	// kernel uses +2 for its own implementation of this function.
-	// I am scared that if we don't include the +2 here, the kernel
-	// will silently write 2 words farther than we specify
-	// and we'll get memory corruption.
-	var buf [CTL_MAXNAME + 2]_C_int
-	n := uintptr(CTL_MAXNAME) * siz
-
-	p := (*byte)(unsafe.Pointer(&buf[0]))
-	bytes, err := ByteSliceFromString(name)
-	if err != nil {
-		return nil, err
-	}
-
-	// Magic sysctl: "setting" 0.3 to a string name
-	// lets you read back the array of integers form.
-	if err = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); err != nil {
-		return nil, err
-	}
-	return buf[0 : n/siz], nil
-}
-
-func direntIno(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Ino), unsafe.Sizeof(Dirent{}.Ino))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
-}
-
-//sys   ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
-func PtraceAttach(pid int) (err error) { return ptrace(PT_ATTACH, pid, 0, 0) }
-func PtraceDetach(pid int) (err error) { return ptrace(PT_DETACH, pid, 0, 0) }
-
-const (
-	attrBitMapCount = 5
-	attrCmnFullpath = 0x08000000
-)
-
-type attrList struct {
-	bitmapCount uint16
-	_           uint16
-	CommonAttr  uint32
-	VolAttr     uint32
-	DirAttr     uint32
-	FileAttr    uint32
-	Forkattr    uint32
-}
-
-func getAttrList(path string, attrList attrList, attrBuf []byte, options uint) (attrs [][]byte, err error) {
-	if len(attrBuf) < 4 {
-		return nil, errorspkg.New("attrBuf too small")
-	}
-	attrList.bitmapCount = attrBitMapCount
-
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return nil, err
-	}
-
-	_, _, e1 := Syscall6(
-		SYS_GETATTRLIST,
-		uintptr(unsafe.Pointer(_p0)),
-		uintptr(unsafe.Pointer(&attrList)),
-		uintptr(unsafe.Pointer(&attrBuf[0])),
-		uintptr(len(attrBuf)),
-		uintptr(options),
-		0,
-	)
-	if e1 != 0 {
-		return nil, e1
-	}
-	size := *(*uint32)(unsafe.Pointer(&attrBuf[0]))
-
-	// dat is the section of attrBuf that contains valid data,
-	// without the 4 byte length header. All attribute offsets
-	// are relative to dat.
-	dat := attrBuf
-	if int(size) < len(attrBuf) {
-		dat = dat[:size]
-	}
-	dat = dat[4:] // remove length prefix
-
-	for i := uint32(0); int(i) < len(dat); {
-		header := dat[i:]
-		if len(header) < 8 {
-			return attrs, errorspkg.New("truncated attribute header")
-		}
-		datOff := *(*int32)(unsafe.Pointer(&header[0]))
-		attrLen := *(*uint32)(unsafe.Pointer(&header[4]))
-		if datOff < 0 || uint32(datOff)+attrLen > uint32(len(dat)) {
-			return attrs, errorspkg.New("truncated results; attrBuf too small")
-		}
-		end := uint32(datOff) + attrLen
-		attrs = append(attrs, dat[datOff:end])
-		i = end
-		if r := i % 4; r != 0 {
-			i += (4 - r)
-		}
-	}
-	return
-}
-
-//sysnb pipe() (r int, w int, err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	p[0], p[1], err = pipe()
-	return
-}
-
-func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	var bufsize uintptr
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
-	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT64, uintptr(_p0), bufsize, uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-/*
- * Wrapped
- */
-
-//sys	kill(pid int, signum int, posix int) (err error)
-
-func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(signum), 1) }
-
-/*
- * Exposed directly
- */
-//sys	Access(path string, mode uint32) (err error)
-//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
-//sys	Chdir(path string) (err error)
-//sys	Chflags(path string, flags int) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
-//sys	Chown(path string, uid int, gid int) (err error)
-//sys	Chroot(path string) (err error)
-//sys	Close(fd int) (err error)
-//sys	Dup(fd int) (nfd int, err error)
-//sys	Dup2(from int, to int) (err error)
-//sys	Exchangedata(path1 string, path2 string, options int) (err error)
-//sys	Exit(code int)
-//sys	Fchdir(fd int) (err error)
-//sys	Fchflags(fd int, flags int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Flock(fd int, how int) (err error)
-//sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
-//sys	Fstatfs(fd int, stat *Statfs_t) (err error) = SYS_FSTATFS64
-//sys	Fsync(fd int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) = SYS_GETDIRENTRIES64
-//sys	Getdtablesize() (size int)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (uid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getpgid(pid int) (pgid int, err error)
-//sysnb	Getpgrp() (pgrp int)
-//sysnb	Getpid() (pid int)
-//sysnb	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (prio int, err error)
-//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Getsid(pid int) (sid int, err error)
-//sysnb	Getuid() (uid int)
-//sysnb	Issetugid() (tainted bool)
-//sys	Kqueue() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
-//sys	Mkdir(path string, mode uint32) (err error)
-//sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
-//sys	Open(path string, mode int, perm uint32) (fd int, err error)
-//sys	Pathconf(path string, name int) (val int, err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
-//sys	Rename(from string, to string) (err error)
-//sys	Revoke(path string) (err error)
-//sys	Rmdir(path string) (err error)
-//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
-//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
-//sys	Setegid(egid int) (err error)
-//sysnb	Seteuid(euid int) (err error)
-//sysnb	Setgid(gid int) (err error)
-//sys	Setlogin(name string) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sys	Setprivexec(flag int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Settimeofday(tp *Timeval) (err error)
-//sysnb	Setuid(uid int) (err error)
-//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
-//sys	Statfs(path string, stat *Statfs_t) (err error) = SYS_STATFS64
-//sys	Symlink(path string, link string) (err error)
-//sys	Sync() (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	Umask(newmask int) (oldmask int)
-//sys	Undelete(path string) (err error)
-//sys	Unlink(path string) (err error)
-//sys	Unmount(path string, flags int) (err error)
-//sys	write(fd int, p []byte) (n int, err error)
-//sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
-//sys   munmap(addr uintptr, length uintptr) (err error)
-//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
-//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
-
-/*
- * Unimplemented
- */
-// Profil
-// Sigaction
-// Sigprocmask
-// Getlogin
-// Sigpending
-// Sigaltstack
-// Ioctl
-// Reboot
-// Execve
-// Vfork
-// Sbrk
-// Sstk
-// Ovadvise
-// Mincore
-// Setitimer
-// Swapon
-// Select
-// Sigsuspend
-// Readv
-// Writev
-// Nfssvc
-// Getfh
-// Quotactl
-// Mount
-// Csops
-// Waitid
-// Add_profil
-// Kdebug_trace
-// Sigreturn
-// Mmap
-// Mlock
-// Munlock
-// Atsocket
-// Kqueue_from_portset_np
-// Kqueue_portset
-// Getattrlist
-// Setattrlist
-// Getdirentriesattr
-// Searchfs
-// Delete
-// Copyfile
-// Poll
-// Watchevent
-// Waitevent
-// Modwatch
-// Getxattr
-// Fgetxattr
-// Setxattr
-// Fsetxattr
-// Removexattr
-// Fremovexattr
-// Listxattr
-// Flistxattr
-// Fsctl
-// Initgroups
-// Posix_spawn
-// Nfsclnt
-// Fhopen
-// Minherit
-// Semsys
-// Msgsys
-// Shmsys
-// Semctl
-// Semget
-// Semop
-// Msgctl
-// Msgget
-// Msgsnd
-// Msgrcv
-// Shmat
-// Shmctl
-// Shmdt
-// Shmget
-// Shm_open
-// Shm_unlink
-// Sem_open
-// Sem_close
-// Sem_unlink
-// Sem_wait
-// Sem_trywait
-// Sem_post
-// Sem_getvalue
-// Sem_init
-// Sem_destroy
-// Open_extended
-// Umask_extended
-// Stat_extended
-// Lstat_extended
-// Fstat_extended
-// Chmod_extended
-// Fchmod_extended
-// Access_extended
-// Settid
-// Gettid
-// Setsgroups
-// Getsgroups
-// Setwgroups
-// Getwgroups
-// Mkfifo_extended
-// Mkdir_extended
-// Identitysvc
-// Shared_region_check_np
-// Shared_region_map_np
-// __pthread_mutex_destroy
-// __pthread_mutex_init
-// __pthread_mutex_lock
-// __pthread_mutex_trylock
-// __pthread_mutex_unlock
-// __pthread_cond_init
-// __pthread_cond_destroy
-// __pthread_cond_broadcast
-// __pthread_cond_signal
-// Setsid_with_pid
-// __pthread_cond_timedwait
-// Aio_fsync
-// Aio_return
-// Aio_suspend
-// Aio_cancel
-// Aio_error
-// Aio_read
-// Aio_write
-// Lio_listio
-// __pthread_cond_wait
-// Iopolicysys
-// Mlockall
-// Munlockall
-// __pthread_kill
-// __pthread_sigmask
-// __sigwait
-// __disable_threadsignal
-// __pthread_markcancel
-// __pthread_canceled
-// __semwait_signal
-// Proc_info
-// sendfile
-// Stat64_extended
-// Lstat64_extended
-// Fstat64_extended
-// __pthread_chdir
-// __pthread_fchdir
-// Audit
-// Auditon
-// Getauid
-// Setauid
-// Getaudit
-// Setaudit
-// Getaudit_addr
-// Setaudit_addr
-// Auditctl
-// Bsdthread_create
-// Bsdthread_terminate
-// Stack_snapshot
-// Bsdthread_register
-// Workq_open
-// Workq_ops
-// __mac_execve
-// __mac_syscall
-// __mac_get_file
-// __mac_set_file
-// __mac_get_link
-// __mac_set_link
-// __mac_get_proc
-// __mac_set_proc
-// __mac_get_fd
-// __mac_set_fd
-// __mac_get_pid
-// __mac_get_lcid
-// __mac_get_lctx
-// __mac_set_lctx
-// Setlcid
-// Read_nocancel
-// Write_nocancel
-// Open_nocancel
-// Close_nocancel
-// Wait4_nocancel
-// Recvmsg_nocancel
-// Sendmsg_nocancel
-// Recvfrom_nocancel
-// Accept_nocancel
-// Msync_nocancel
-// Fcntl_nocancel
-// Select_nocancel
-// Fsync_nocancel
-// Connect_nocancel
-// Sigsuspend_nocancel
-// Readv_nocancel
-// Writev_nocancel
-// Sendto_nocancel
-// Pread_nocancel
-// Pwrite_nocancel
-// Waitid_nocancel
-// Poll_nocancel
-// Msgsnd_nocancel
-// Msgrcv_nocancel
-// Sem_wait_nocancel
-// Aio_suspend_nocancel
-// __sigwait_nocancel
-// __semwait_signal_nocancel
-// __mac_mount
-// __mac_get_mount
-// __mac_getfsstat
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_386.go b/vendor/golang.org/x/sys/unix/syscall_darwin_386.go
deleted file mode 100644
index c172a3da5a..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_darwin_386.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build 386,darwin
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int32(nsec / 1e9)
-	return
-}
-
-//sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)
-func Gettimeofday(tv *Timeval) (err error) {
-	// The tv passed to gettimeofday must be non-nil
-	// but is otherwise unused.  The answers come back
-	// in the two registers.
-	sec, usec, err := gettimeofday(tv)
-	tv.Sec = int32(sec)
-	tv.Usec = int32(usec)
-	return err
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var length = uint64(count)
-
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(*offset>>32), uintptr(unsafe.Pointer(&length)), 0, 0, 0, 0)
-
-	written = int(length)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
-// of darwin/386 the syscall is called sysctl instead of __sysctl.
-const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
deleted file mode 100644
index fc1e5a4a82..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,darwin
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-//sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
-func Gettimeofday(tv *Timeval) (err error) {
-	// The tv passed to gettimeofday must be non-nil
-	// but is otherwise unused.  The answers come back
-	// in the two registers.
-	sec, usec, err := gettimeofday(tv)
-	tv.Sec = sec
-	tv.Usec = usec
-	return err
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var length = uint64(count)
-
-	_, _, e1 := Syscall6(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(unsafe.Pointer(&length)), 0, 0)
-
-	written = int(length)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
-// of darwin/amd64 the syscall is called sysctl instead of __sysctl.
-const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
deleted file mode 100644
index d286cf408d..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int32(nsec / 1e9)
-	return
-}
-
-//sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)
-func Gettimeofday(tv *Timeval) (err error) {
-	// The tv passed to gettimeofday must be non-nil
-	// but is otherwise unused.  The answers come back
-	// in the two registers.
-	sec, usec, err := gettimeofday(tv)
-	tv.Sec = int32(sec)
-	tv.Usec = int32(usec)
-	return err
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var length = uint64(count)
-
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(*offset>>32), uintptr(unsafe.Pointer(&length)), 0, 0, 0, 0)
-
-	written = int(length)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
deleted file mode 100644
index c33905cdcd..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build arm64,darwin
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 16384 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-//sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
-func Gettimeofday(tv *Timeval) (err error) {
-	// The tv passed to gettimeofday must be non-nil
-	// but is otherwise unused.  The answers come back
-	// in the two registers.
-	sec, usec, err := gettimeofday(tv)
-	tv.Sec = sec
-	tv.Usec = usec
-	return err
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var length = uint64(count)
-
-	_, _, e1 := Syscall6(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(unsafe.Pointer(&length)), 0, 0)
-
-	written = int(length)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
-
-// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
-// of darwin/arm64 the syscall is called sysctl instead of __sysctl.
-const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
deleted file mode 100644
index 3363456fa7..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
+++ /dev/null
@@ -1,402 +0,0 @@
-// Copyright 2009,2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// FreeBSD system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and wrap
-// it in our own nicer implementation, either here or in
-// syscall_bsd.go or syscall_unix.go.
-
-package unix
-
-import "unsafe"
-
-type SockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-	Rcf    uint16
-	Route  [16]uint16
-	raw    RawSockaddrDatalink
-}
-
-// Translate "kern.hostname" to []_C_int{0,1,2,3}.
-func nametomib(name string) (mib []_C_int, err error) {
-	const siz = unsafe.Sizeof(mib[0])
-
-	// NOTE(rsc): It seems strange to set the buffer to have
-	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
-	// as the size.  I don't know why the +2 is here, but the
-	// kernel uses +2 for its own implementation of this function.
-	// I am scared that if we don't include the +2 here, the kernel
-	// will silently write 2 words farther than we specify
-	// and we'll get memory corruption.
-	var buf [CTL_MAXNAME + 2]_C_int
-	n := uintptr(CTL_MAXNAME) * siz
-
-	p := (*byte)(unsafe.Pointer(&buf[0]))
-	bytes, err := ByteSliceFromString(name)
-	if err != nil {
-		return nil, err
-	}
-
-	// Magic sysctl: "setting" 0.3 to a string name
-	// lets you read back the array of integers form.
-	if err = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); err != nil {
-		return nil, err
-	}
-	return buf[0 : n/siz], nil
-}
-
-func direntIno(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Ino), unsafe.Sizeof(Dirent{}.Ino))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
-	namlen, ok := direntNamlen(buf)
-	if !ok {
-		return 0, false
-	}
-	return (16 + namlen + 1 + 7) & ^7, true
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
-}
-
-//sysnb pipe() (r int, w int, err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	p[0], p[1], err = pipe()
-	return
-}
-
-//sys	extpread(fd int, p []byte, flags int, offset int64) (n int, err error)
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	return extpread(fd, p, 0, offset)
-}
-
-//sys	extpwrite(fd int, p []byte, flags int, offset int64) (n int, err error)
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	return extpwrite(fd, p, 0, offset)
-}
-
-func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	var bufsize uintptr
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
-	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-/*
- * Exposed directly
- */
-//sys	Access(path string, mode uint32) (err error)
-//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
-//sys	Chdir(path string) (err error)
-//sys	Chflags(path string, flags int) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
-//sys	Chown(path string, uid int, gid int) (err error)
-//sys	Chroot(path string) (err error)
-//sys	Close(fd int) (err error)
-//sys	Dup(fd int) (nfd int, err error)
-//sys	Dup2(from int, to int) (err error)
-//sys	Exit(code int)
-//sys	Fchdir(fd int) (err error)
-//sys	Fchflags(fd int, flags int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Flock(fd int, how int) (err error)
-//sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
-//sys	Fsync(fd int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error)
-//sys	Getdtablesize() (size int)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (uid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getpgid(pid int) (pgid int, err error)
-//sysnb	Getpgrp() (pgrp int)
-//sysnb	Getpid() (pid int)
-//sysnb	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (prio int, err error)
-//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Getsid(pid int) (sid int, err error)
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Issetugid() (tainted bool)
-//sys	Kill(pid int, signum syscall.Signal) (err error)
-//sys	Kqueue() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Mkdir(path string, mode uint32) (err error)
-//sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
-//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	Open(path string, mode int, perm uint32) (fd int, err error)
-//sys	Pathconf(path string, name int) (val int, err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
-//sys	Rename(from string, to string) (err error)
-//sys	Revoke(path string) (err error)
-//sys	Rmdir(path string) (err error)
-//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
-//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
-//sysnb	Setegid(egid int) (err error)
-//sysnb	Seteuid(euid int) (err error)
-//sysnb	Setgid(gid int) (err error)
-//sys	Setlogin(name string) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Settimeofday(tp *Timeval) (err error)
-//sysnb	Setuid(uid int) (err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, stat *Statfs_t) (err error)
-//sys	Symlink(path string, link string) (err error)
-//sys	Sync() (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	Umask(newmask int) (oldmask int)
-//sys	Undelete(path string) (err error)
-//sys	Unlink(path string) (err error)
-//sys	Unmount(path string, flags int) (err error)
-//sys	write(fd int, p []byte) (n int, err error)
-//sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
-//sys   munmap(addr uintptr, length uintptr) (err error)
-//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
-//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
-
-/*
- * Unimplemented
- * TODO(jsing): Update this list for DragonFly.
- */
-// Profil
-// Sigaction
-// Sigprocmask
-// Getlogin
-// Sigpending
-// Sigaltstack
-// Ioctl
-// Reboot
-// Execve
-// Vfork
-// Sbrk
-// Sstk
-// Ovadvise
-// Mincore
-// Setitimer
-// Swapon
-// Select
-// Sigsuspend
-// Readv
-// Writev
-// Nfssvc
-// Getfh
-// Quotactl
-// Mount
-// Csops
-// Waitid
-// Add_profil
-// Kdebug_trace
-// Sigreturn
-// Mmap
-// Atsocket
-// Kqueue_from_portset_np
-// Kqueue_portset
-// Getattrlist
-// Setattrlist
-// Getdirentriesattr
-// Searchfs
-// Delete
-// Copyfile
-// Poll
-// Watchevent
-// Waitevent
-// Modwatch
-// Getxattr
-// Fgetxattr
-// Setxattr
-// Fsetxattr
-// Removexattr
-// Fremovexattr
-// Listxattr
-// Flistxattr
-// Fsctl
-// Initgroups
-// Posix_spawn
-// Nfsclnt
-// Fhopen
-// Minherit
-// Semsys
-// Msgsys
-// Shmsys
-// Semctl
-// Semget
-// Semop
-// Msgctl
-// Msgget
-// Msgsnd
-// Msgrcv
-// Shmat
-// Shmctl
-// Shmdt
-// Shmget
-// Shm_open
-// Shm_unlink
-// Sem_open
-// Sem_close
-// Sem_unlink
-// Sem_wait
-// Sem_trywait
-// Sem_post
-// Sem_getvalue
-// Sem_init
-// Sem_destroy
-// Open_extended
-// Umask_extended
-// Stat_extended
-// Lstat_extended
-// Fstat_extended
-// Chmod_extended
-// Fchmod_extended
-// Access_extended
-// Settid
-// Gettid
-// Setsgroups
-// Getsgroups
-// Setwgroups
-// Getwgroups
-// Mkfifo_extended
-// Mkdir_extended
-// Identitysvc
-// Shared_region_check_np
-// Shared_region_map_np
-// __pthread_mutex_destroy
-// __pthread_mutex_init
-// __pthread_mutex_lock
-// __pthread_mutex_trylock
-// __pthread_mutex_unlock
-// __pthread_cond_init
-// __pthread_cond_destroy
-// __pthread_cond_broadcast
-// __pthread_cond_signal
-// Setsid_with_pid
-// __pthread_cond_timedwait
-// Aio_fsync
-// Aio_return
-// Aio_suspend
-// Aio_cancel
-// Aio_error
-// Aio_read
-// Aio_write
-// Lio_listio
-// __pthread_cond_wait
-// Iopolicysys
-// __pthread_kill
-// __pthread_sigmask
-// __sigwait
-// __disable_threadsignal
-// __pthread_markcancel
-// __pthread_canceled
-// __semwait_signal
-// Proc_info
-// Stat64_extended
-// Lstat64_extended
-// Fstat64_extended
-// __pthread_chdir
-// __pthread_fchdir
-// Audit
-// Auditon
-// Getauid
-// Setauid
-// Getaudit
-// Setaudit
-// Getaudit_addr
-// Setaudit_addr
-// Auditctl
-// Bsdthread_create
-// Bsdthread_terminate
-// Stack_snapshot
-// Bsdthread_register
-// Workq_open
-// Workq_ops
-// __mac_execve
-// __mac_syscall
-// __mac_get_file
-// __mac_set_file
-// __mac_get_link
-// __mac_set_link
-// __mac_get_proc
-// __mac_set_proc
-// __mac_get_fd
-// __mac_set_fd
-// __mac_get_pid
-// __mac_get_lcid
-// __mac_get_lctx
-// __mac_set_lctx
-// Setlcid
-// Read_nocancel
-// Write_nocancel
-// Open_nocancel
-// Close_nocancel
-// Wait4_nocancel
-// Recvmsg_nocancel
-// Sendmsg_nocancel
-// Recvfrom_nocancel
-// Accept_nocancel
-// Msync_nocancel
-// Fcntl_nocancel
-// Select_nocancel
-// Fsync_nocancel
-// Connect_nocancel
-// Sigsuspend_nocancel
-// Readv_nocancel
-// Writev_nocancel
-// Sendto_nocancel
-// Pread_nocancel
-// Pwrite_nocancel
-// Waitid_nocancel
-// Poll_nocancel
-// Msgsnd_nocancel
-// Msgrcv_nocancel
-// Sem_wait_nocancel
-// Aio_suspend_nocancel
-// __sigwait_nocancel
-// __semwait_signal_nocancel
-// __mac_mount
-// __mac_get_mount
-// __mac_getfsstat
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
deleted file mode 100644
index da7cb7982c..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,dragonfly
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var writtenOut uint64 = 0
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
-
-	written = int(writtenOut)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
deleted file mode 100644
index 077d1f39ac..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd.go
+++ /dev/null
@@ -1,666 +0,0 @@
-// Copyright 2009,2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// FreeBSD system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and wrap
-// it in our own nicer implementation, either here or in
-// syscall_bsd.go or syscall_unix.go.
-
-package unix
-
-import "unsafe"
-
-type SockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [46]int8
-	raw    RawSockaddrDatalink
-}
-
-// Translate "kern.hostname" to []_C_int{0,1,2,3}.
-func nametomib(name string) (mib []_C_int, err error) {
-	const siz = unsafe.Sizeof(mib[0])
-
-	// NOTE(rsc): It seems strange to set the buffer to have
-	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
-	// as the size.  I don't know why the +2 is here, but the
-	// kernel uses +2 for its own implementation of this function.
-	// I am scared that if we don't include the +2 here, the kernel
-	// will silently write 2 words farther than we specify
-	// and we'll get memory corruption.
-	var buf [CTL_MAXNAME + 2]_C_int
-	n := uintptr(CTL_MAXNAME) * siz
-
-	p := (*byte)(unsafe.Pointer(&buf[0]))
-	bytes, err := ByteSliceFromString(name)
-	if err != nil {
-		return nil, err
-	}
-
-	// Magic sysctl: "setting" 0.3 to a string name
-	// lets you read back the array of integers form.
-	if err = sysctl([]_C_int{0, 3}, p, &n, &bytes[0], uintptr(len(name))); err != nil {
-		return nil, err
-	}
-	return buf[0 : n/siz], nil
-}
-
-func direntIno(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Fileno), unsafe.Sizeof(Dirent{}.Fileno))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
-}
-
-//sysnb pipe() (r int, w int, err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	p[0], p[1], err = pipe()
-	return
-}
-
-func GetsockoptIPMreqn(fd, level, opt int) (*IPMreqn, error) {
-	var value IPMreqn
-	vallen := _Socklen(SizeofIPMreqn)
-	errno := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, errno
-}
-
-func SetsockoptIPMreqn(fd, level, opt int, mreq *IPMreqn) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), unsafe.Sizeof(*mreq))
-}
-
-func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	nfd, err = accept4(fd, &rsa, &len, flags)
-	if err != nil {
-		return
-	}
-	if len > SizeofSockaddrAny {
-		panic("RawSockaddrAny too small")
-	}
-	sa, err = anyToSockaddr(&rsa)
-	if err != nil {
-		Close(nfd)
-		nfd = 0
-	}
-	return
-}
-
-func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	var bufsize uintptr
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
-	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-// Derive extattr namespace and attribute name
-
-func xattrnamespace(fullattr string) (ns int, attr string, err error) {
-	s := -1
-	for idx, val := range fullattr {
-		if val == '.' {
-			s = idx
-			break
-		}
-	}
-
-	if s == -1 {
-		return -1, "", ENOATTR
-	}
-
-	namespace := fullattr[0:s]
-	attr = fullattr[s+1:]
-
-	switch namespace {
-	case "user":
-		return EXTATTR_NAMESPACE_USER, attr, nil
-	case "system":
-		return EXTATTR_NAMESPACE_SYSTEM, attr, nil
-	default:
-		return -1, "", ENOATTR
-	}
-}
-
-func initxattrdest(dest []byte, idx int) (d unsafe.Pointer) {
-	if len(dest) > idx {
-		return unsafe.Pointer(&dest[idx])
-	} else {
-		return unsafe.Pointer(_zero)
-	}
-}
-
-// FreeBSD implements its own syscalls to handle extended attributes
-
-func Getxattr(file string, attr string, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsize := len(dest)
-
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return -1, err
-	}
-
-	return ExtattrGetFile(file, nsid, a, uintptr(d), destsize)
-}
-
-func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsize := len(dest)
-
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return -1, err
-	}
-
-	return ExtattrGetFd(fd, nsid, a, uintptr(d), destsize)
-}
-
-func Lgetxattr(link string, attr string, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsize := len(dest)
-
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return -1, err
-	}
-
-	return ExtattrGetLink(link, nsid, a, uintptr(d), destsize)
-}
-
-// flags are unused on FreeBSD
-
-func Fsetxattr(fd int, attr string, data []byte, flags int) (err error) {
-	d := unsafe.Pointer(&data[0])
-	datasiz := len(data)
-
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return
-	}
-
-	_, err = ExtattrSetFd(fd, nsid, a, uintptr(d), datasiz)
-	return
-}
-
-func Setxattr(file string, attr string, data []byte, flags int) (err error) {
-	d := unsafe.Pointer(&data[0])
-	datasiz := len(data)
-
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return
-	}
-
-	_, err = ExtattrSetFile(file, nsid, a, uintptr(d), datasiz)
-	return
-}
-
-func Lsetxattr(link string, attr string, data []byte, flags int) (err error) {
-	d := unsafe.Pointer(&data[0])
-	datasiz := len(data)
-
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return
-	}
-
-	_, err = ExtattrSetLink(link, nsid, a, uintptr(d), datasiz)
-	return
-}
-
-func Removexattr(file string, attr string) (err error) {
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return
-	}
-
-	err = ExtattrDeleteFile(file, nsid, a)
-	return
-}
-
-func Fremovexattr(fd int, attr string) (err error) {
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return
-	}
-
-	err = ExtattrDeleteFd(fd, nsid, a)
-	return
-}
-
-func Lremovexattr(link string, attr string) (err error) {
-	nsid, a, err := xattrnamespace(attr)
-	if err != nil {
-		return
-	}
-
-	err = ExtattrDeleteLink(link, nsid, a)
-	return
-}
-
-func Listxattr(file string, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsiz := len(dest)
-
-	// FreeBSD won't allow you to list xattrs from multiple namespaces
-	s := 0
-	var e error
-	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
-		stmp, e := ExtattrListFile(file, nsid, uintptr(d), destsiz)
-
-		/* Errors accessing system attrs are ignored so that
-		 * we can implement the Linux-like behavior of omitting errors that
-		 * we don't have read permissions on
-		 *
-		 * Linux will still error if we ask for user attributes on a file that
-		 * we don't have read permissions on, so don't ignore those errors
-		 */
-		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-			e = nil
-			continue
-		} else if e != nil {
-			return s, e
-		}
-
-		s += stmp
-		destsiz -= s
-		if destsiz < 0 {
-			destsiz = 0
-		}
-		d = initxattrdest(dest, s)
-	}
-
-	return s, e
-}
-
-func Flistxattr(fd int, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsiz := len(dest)
-
-	s := 0
-	var e error
-	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
-		stmp, e := ExtattrListFd(fd, nsid, uintptr(d), destsiz)
-		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-			e = nil
-			continue
-		} else if e != nil {
-			return s, e
-		}
-
-		s += stmp
-		destsiz -= s
-		if destsiz < 0 {
-			destsiz = 0
-		}
-		d = initxattrdest(dest, s)
-	}
-
-	return s, e
-}
-
-func Llistxattr(link string, dest []byte) (sz int, err error) {
-	d := initxattrdest(dest, 0)
-	destsiz := len(dest)
-
-	s := 0
-	var e error
-	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
-		stmp, e := ExtattrListLink(link, nsid, uintptr(d), destsiz)
-		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-			e = nil
-			continue
-		} else if e != nil {
-			return s, e
-		}
-
-		s += stmp
-		destsiz -= s
-		if destsiz < 0 {
-			destsiz = 0
-		}
-		d = initxattrdest(dest, s)
-	}
-
-	return s, e
-}
-
-/*
- * Exposed directly
- */
-//sys	Access(path string, mode uint32) (err error)
-//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
-//sys	Chdir(path string) (err error)
-//sys	Chflags(path string, flags int) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
-//sys	Chown(path string, uid int, gid int) (err error)
-//sys	Chroot(path string) (err error)
-//sys	Close(fd int) (err error)
-//sys	Dup(fd int) (nfd int, err error)
-//sys	Dup2(from int, to int) (err error)
-//sys	Exit(code int)
-//sys	ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error)
-//sys	ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error)
-//sys	ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error)
-//sys	ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error)
-//sys	ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
-//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_POSIX_FADVISE
-//sys	Fchdir(fd int) (err error)
-//sys	Fchflags(fd int, flags int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Flock(fd int, how int) (err error)
-//sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
-//sys	Fsync(fd int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error)
-//sys	Getdtablesize() (size int)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (uid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getpgid(pid int) (pgid int, err error)
-//sysnb	Getpgrp() (pgrp int)
-//sysnb	Getpid() (pid int)
-//sysnb	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (prio int, err error)
-//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Getsid(pid int) (sid int, err error)
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Issetugid() (tainted bool)
-//sys	Kill(pid int, signum syscall.Signal) (err error)
-//sys	Kqueue() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Mkdir(path string, mode uint32) (err error)
-//sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
-//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	Open(path string, mode int, perm uint32) (fd int, err error)
-//sys	Pathconf(path string, name int) (val int, err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
-//sys	Rename(from string, to string) (err error)
-//sys	Revoke(path string) (err error)
-//sys	Rmdir(path string) (err error)
-//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
-//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
-//sysnb	Setegid(egid int) (err error)
-//sysnb	Seteuid(euid int) (err error)
-//sysnb	Setgid(gid int) (err error)
-//sys	Setlogin(name string) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Settimeofday(tp *Timeval) (err error)
-//sysnb	Setuid(uid int) (err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, stat *Statfs_t) (err error)
-//sys	Symlink(path string, link string) (err error)
-//sys	Sync() (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	Umask(newmask int) (oldmask int)
-//sys	Undelete(path string) (err error)
-//sys	Unlink(path string) (err error)
-//sys	Unmount(path string, flags int) (err error)
-//sys	write(fd int, p []byte) (n int, err error)
-//sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
-//sys   munmap(addr uintptr, length uintptr) (err error)
-//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
-//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
-//sys	accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error)
-
-/*
- * Unimplemented
- */
-// Profil
-// Sigaction
-// Sigprocmask
-// Getlogin
-// Sigpending
-// Sigaltstack
-// Ioctl
-// Reboot
-// Execve
-// Vfork
-// Sbrk
-// Sstk
-// Ovadvise
-// Mincore
-// Setitimer
-// Swapon
-// Select
-// Sigsuspend
-// Readv
-// Writev
-// Nfssvc
-// Getfh
-// Quotactl
-// Mount
-// Csops
-// Waitid
-// Add_profil
-// Kdebug_trace
-// Sigreturn
-// Mmap
-// Mlock
-// Munlock
-// Atsocket
-// Kqueue_from_portset_np
-// Kqueue_portset
-// Getattrlist
-// Setattrlist
-// Getdirentriesattr
-// Searchfs
-// Delete
-// Copyfile
-// Poll
-// Watchevent
-// Waitevent
-// Modwatch
-// Getxattr
-// Fgetxattr
-// Setxattr
-// Fsetxattr
-// Removexattr
-// Fremovexattr
-// Listxattr
-// Flistxattr
-// Fsctl
-// Initgroups
-// Posix_spawn
-// Nfsclnt
-// Fhopen
-// Minherit
-// Semsys
-// Msgsys
-// Shmsys
-// Semctl
-// Semget
-// Semop
-// Msgctl
-// Msgget
-// Msgsnd
-// Msgrcv
-// Shmat
-// Shmctl
-// Shmdt
-// Shmget
-// Shm_open
-// Shm_unlink
-// Sem_open
-// Sem_close
-// Sem_unlink
-// Sem_wait
-// Sem_trywait
-// Sem_post
-// Sem_getvalue
-// Sem_init
-// Sem_destroy
-// Open_extended
-// Umask_extended
-// Stat_extended
-// Lstat_extended
-// Fstat_extended
-// Chmod_extended
-// Fchmod_extended
-// Access_extended
-// Settid
-// Gettid
-// Setsgroups
-// Getsgroups
-// Setwgroups
-// Getwgroups
-// Mkfifo_extended
-// Mkdir_extended
-// Identitysvc
-// Shared_region_check_np
-// Shared_region_map_np
-// __pthread_mutex_destroy
-// __pthread_mutex_init
-// __pthread_mutex_lock
-// __pthread_mutex_trylock
-// __pthread_mutex_unlock
-// __pthread_cond_init
-// __pthread_cond_destroy
-// __pthread_cond_broadcast
-// __pthread_cond_signal
-// Setsid_with_pid
-// __pthread_cond_timedwait
-// Aio_fsync
-// Aio_return
-// Aio_suspend
-// Aio_cancel
-// Aio_error
-// Aio_read
-// Aio_write
-// Lio_listio
-// __pthread_cond_wait
-// Iopolicysys
-// Mlockall
-// Munlockall
-// __pthread_kill
-// __pthread_sigmask
-// __sigwait
-// __disable_threadsignal
-// __pthread_markcancel
-// __pthread_canceled
-// __semwait_signal
-// Proc_info
-// Stat64_extended
-// Lstat64_extended
-// Fstat64_extended
-// __pthread_chdir
-// __pthread_fchdir
-// Audit
-// Auditon
-// Getauid
-// Setauid
-// Getaudit
-// Setaudit
-// Getaudit_addr
-// Setaudit_addr
-// Auditctl
-// Bsdthread_create
-// Bsdthread_terminate
-// Stack_snapshot
-// Bsdthread_register
-// Workq_open
-// Workq_ops
-// __mac_execve
-// __mac_syscall
-// __mac_get_file
-// __mac_set_file
-// __mac_get_link
-// __mac_set_link
-// __mac_get_proc
-// __mac_set_proc
-// __mac_get_fd
-// __mac_set_fd
-// __mac_get_pid
-// __mac_get_lcid
-// __mac_get_lctx
-// __mac_set_lctx
-// Setlcid
-// Read_nocancel
-// Write_nocancel
-// Open_nocancel
-// Close_nocancel
-// Wait4_nocancel
-// Recvmsg_nocancel
-// Sendmsg_nocancel
-// Recvfrom_nocancel
-// Accept_nocancel
-// Msync_nocancel
-// Fcntl_nocancel
-// Select_nocancel
-// Fsync_nocancel
-// Connect_nocancel
-// Sigsuspend_nocancel
-// Readv_nocancel
-// Writev_nocancel
-// Sendto_nocancel
-// Pread_nocancel
-// Pwrite_nocancel
-// Waitid_nocancel
-// Poll_nocancel
-// Msgsnd_nocancel
-// Msgrcv_nocancel
-// Sem_wait_nocancel
-// Aio_suspend_nocancel
-// __sigwait_nocancel
-// __semwait_signal_nocancel
-// __mac_mount
-// __mac_get_mount
-// __mac_getfsstat
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
deleted file mode 100644
index 6a0cd804d8..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build 386,freebsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int32(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var writtenOut uint64 = 0
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
-
-	written = int(writtenOut)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
deleted file mode 100644
index e142540efa..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,freebsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var writtenOut uint64 = 0
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
-
-	written = int(writtenOut)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
deleted file mode 100644
index 5504cb1255..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build arm,freebsd
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return ts.Sec*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = nsec / 1e9
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	var writtenOut uint64 = 0
-	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
-
-	written = int(writtenOut)
-
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go
deleted file mode 100644
index 9737e08b05..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ /dev/null
@@ -1,1297 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Linux system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and
-// wrap it in our own nicer implementation.
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-/*
- * Wrapped
- */
-
-func Access(path string, mode uint32) (err error) {
-	return Faccessat(AT_FDCWD, path, mode, 0)
-}
-
-func Chmod(path string, mode uint32) (err error) {
-	return Fchmodat(AT_FDCWD, path, mode, 0)
-}
-
-func Chown(path string, uid int, gid int) (err error) {
-	return Fchownat(AT_FDCWD, path, uid, gid, 0)
-}
-
-func Creat(path string, mode uint32) (fd int, err error) {
-	return Open(path, O_CREAT|O_WRONLY|O_TRUNC, mode)
-}
-
-//sys	Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error)
-
-func Link(oldpath string, newpath string) (err error) {
-	return Linkat(AT_FDCWD, oldpath, AT_FDCWD, newpath, 0)
-}
-
-func Mkdir(path string, mode uint32) (err error) {
-	return Mkdirat(AT_FDCWD, path, mode)
-}
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	return Mknodat(AT_FDCWD, path, mode, dev)
-}
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	return openat(AT_FDCWD, path, mode|O_LARGEFILE, perm)
-}
-
-//sys	openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
-
-func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	return openat(dirfd, path, flags|O_LARGEFILE, mode)
-}
-
-//sys	ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error)
-
-func Ppoll(fds []PollFd, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	if len(fds) == 0 {
-		return ppoll(nil, 0, timeout, sigmask)
-	}
-	return ppoll(&fds[0], len(fds), timeout, sigmask)
-}
-
-//sys	Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	return Readlinkat(AT_FDCWD, path, buf)
-}
-
-func Rename(oldpath string, newpath string) (err error) {
-	return Renameat(AT_FDCWD, oldpath, AT_FDCWD, newpath)
-}
-
-func Rmdir(path string) error {
-	return Unlinkat(AT_FDCWD, path, AT_REMOVEDIR)
-}
-
-//sys	Symlinkat(oldpath string, newdirfd int, newpath string) (err error)
-
-func Symlink(oldpath string, newpath string) (err error) {
-	return Symlinkat(oldpath, AT_FDCWD, newpath)
-}
-
-func Unlink(path string) error {
-	return Unlinkat(AT_FDCWD, path, 0)
-}
-
-//sys	Unlinkat(dirfd int, path string, flags int) (err error)
-
-//sys	utimes(path string, times *[2]Timeval) (err error)
-
-func Utimes(path string, tv []Timeval) error {
-	if tv == nil {
-		err := utimensat(AT_FDCWD, path, nil, 0)
-		if err != ENOSYS {
-			return err
-		}
-		return utimes(path, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	var ts [2]Timespec
-	ts[0] = NsecToTimespec(TimevalToNsec(tv[0]))
-	ts[1] = NsecToTimespec(TimevalToNsec(tv[1]))
-	err := utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
-	if err != ENOSYS {
-		return err
-	}
-	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
-
-func UtimesNano(path string, ts []Timespec) error {
-	if ts == nil {
-		err := utimensat(AT_FDCWD, path, nil, 0)
-		if err != ENOSYS {
-			return err
-		}
-		return utimes(path, nil)
-	}
-	if len(ts) != 2 {
-		return EINVAL
-	}
-	err := utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
-	if err != ENOSYS {
-		return err
-	}
-	// If the utimensat syscall isn't available (utimensat was added to Linux
-	// in 2.6.22, Released, 8 July 2007) then fall back to utimes
-	var tv [2]Timeval
-	for i := 0; i < 2; i++ {
-		tv[i] = NsecToTimeval(TimespecToNsec(ts[i]))
-	}
-	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
-	if ts == nil {
-		return utimensat(dirfd, path, nil, flags)
-	}
-	if len(ts) != 2 {
-		return EINVAL
-	}
-	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
-}
-
-//sys	futimesat(dirfd int, path *byte, times *[2]Timeval) (err error)
-
-func Futimesat(dirfd int, path string, tv []Timeval) error {
-	pathp, err := BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	if tv == nil {
-		return futimesat(dirfd, pathp, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	return futimesat(dirfd, pathp, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-func Futimes(fd int, tv []Timeval) (err error) {
-	// Believe it or not, this is the best we can do on Linux
-	// (and is what glibc does).
-	return Utimes("/proc/self/fd/"+itoa(fd), tv)
-}
-
-const ImplementsGetwd = true
-
-//sys	Getcwd(buf []byte) (n int, err error)
-
-func Getwd() (wd string, err error) {
-	var buf [PathMax]byte
-	n, err := Getcwd(buf[0:])
-	if err != nil {
-		return "", err
-	}
-	// Getcwd returns the number of bytes written to buf, including the NUL.
-	if n < 1 || n > len(buf) || buf[n-1] != 0 {
-		return "", EINVAL
-	}
-	return string(buf[0 : n-1]), nil
-}
-
-func Getgroups() (gids []int, err error) {
-	n, err := getgroups(0, nil)
-	if err != nil {
-		return nil, err
-	}
-	if n == 0 {
-		return nil, nil
-	}
-
-	// Sanity check group count.  Max is 1<<16 on Linux.
-	if n < 0 || n > 1<<20 {
-		return nil, EINVAL
-	}
-
-	a := make([]_Gid_t, n)
-	n, err = getgroups(n, &a[0])
-	if err != nil {
-		return nil, err
-	}
-	gids = make([]int, n)
-	for i, v := range a[0:n] {
-		gids[i] = int(v)
-	}
-	return
-}
-
-func Setgroups(gids []int) (err error) {
-	if len(gids) == 0 {
-		return setgroups(0, nil)
-	}
-
-	a := make([]_Gid_t, len(gids))
-	for i, v := range gids {
-		a[i] = _Gid_t(v)
-	}
-	return setgroups(len(a), &a[0])
-}
-
-type WaitStatus uint32
-
-// Wait status is 7 bits at bottom, either 0 (exited),
-// 0x7F (stopped), or a signal number that caused an exit.
-// The 0x80 bit is whether there was a core dump.
-// An extra number (exit code, signal causing a stop)
-// is in the high bits.  At least that's the idea.
-// There are various irregularities.  For example, the
-// "continued" status is 0xFFFF, distinguishing itself
-// from stopped via the core dump bit.
-
-const (
-	mask    = 0x7F
-	core    = 0x80
-	exited  = 0x00
-	stopped = 0x7F
-	shift   = 8
-)
-
-func (w WaitStatus) Exited() bool { return w&mask == exited }
-
-func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != exited }
-
-func (w WaitStatus) Stopped() bool { return w&0xFF == stopped }
-
-func (w WaitStatus) Continued() bool { return w == 0xFFFF }
-
-func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
-
-func (w WaitStatus) ExitStatus() int {
-	if !w.Exited() {
-		return -1
-	}
-	return int(w>>shift) & 0xFF
-}
-
-func (w WaitStatus) Signal() syscall.Signal {
-	if !w.Signaled() {
-		return -1
-	}
-	return syscall.Signal(w & mask)
-}
-
-func (w WaitStatus) StopSignal() syscall.Signal {
-	if !w.Stopped() {
-		return -1
-	}
-	return syscall.Signal(w>>shift) & 0xFF
-}
-
-func (w WaitStatus) TrapCause() int {
-	if w.StopSignal() != SIGTRAP {
-		return -1
-	}
-	return int(w>>shift) >> 8
-}
-
-//sys	wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error)
-
-func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int, err error) {
-	var status _C_int
-	wpid, err = wait4(pid, &status, options, rusage)
-	if wstatus != nil {
-		*wstatus = WaitStatus(status)
-	}
-	return
-}
-
-func Mkfifo(path string, mode uint32) (err error) {
-	return Mknod(path, mode|S_IFIFO, 0)
-}
-
-func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_INET
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet4, nil
-}
-
-func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_INET6
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	sa.raw.Scope_id = sa.ZoneId
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet6, nil
-}
-
-func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	name := sa.Name
-	n := len(name)
-	if n >= len(sa.raw.Path) {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_UNIX
-	for i := 0; i < n; i++ {
-		sa.raw.Path[i] = int8(name[i])
-	}
-	// length is family (uint16), name, NUL.
-	sl := _Socklen(2)
-	if n > 0 {
-		sl += _Socklen(n) + 1
-	}
-	if sa.raw.Path[0] == '@' {
-		sa.raw.Path[0] = 0
-		// Don't count trailing NUL for abstract address.
-		sl--
-	}
-
-	return unsafe.Pointer(&sa.raw), sl, nil
-}
-
-type SockaddrLinklayer struct {
-	Protocol uint16
-	Ifindex  int
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]byte
-	raw      RawSockaddrLinklayer
-}
-
-func (sa *SockaddrLinklayer) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Ifindex < 0 || sa.Ifindex > 0x7fffffff {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_PACKET
-	sa.raw.Protocol = sa.Protocol
-	sa.raw.Ifindex = int32(sa.Ifindex)
-	sa.raw.Hatype = sa.Hatype
-	sa.raw.Pkttype = sa.Pkttype
-	sa.raw.Halen = sa.Halen
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrLinklayer, nil
-}
-
-type SockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-	raw    RawSockaddrNetlink
-}
-
-func (sa *SockaddrNetlink) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	sa.raw.Family = AF_NETLINK
-	sa.raw.Pad = sa.Pad
-	sa.raw.Pid = sa.Pid
-	sa.raw.Groups = sa.Groups
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrNetlink, nil
-}
-
-type SockaddrHCI struct {
-	Dev     uint16
-	Channel uint16
-	raw     RawSockaddrHCI
-}
-
-func (sa *SockaddrHCI) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	sa.raw.Family = AF_BLUETOOTH
-	sa.raw.Dev = sa.Dev
-	sa.raw.Channel = sa.Channel
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrHCI, nil
-}
-
-// SockaddrCAN implements the Sockaddr interface for AF_CAN type sockets.
-// The RxID and TxID fields are used for transport protocol addressing in
-// (CAN_TP16, CAN_TP20, CAN_MCNET, and CAN_ISOTP), they can be left with
-// zero values for CAN_RAW and CAN_BCM sockets as they have no meaning.
-//
-// The SockaddrCAN struct must be bound to the socket file descriptor
-// using Bind before the CAN socket can be used.
-//
-//      // Read one raw CAN frame
-//      fd, _ := Socket(AF_CAN, SOCK_RAW, CAN_RAW)
-//      addr := &SockaddrCAN{Ifindex: index}
-//      Bind(fd, addr)
-//      frame := make([]byte, 16)
-//      Read(fd, frame)
-//
-// The full SocketCAN documentation can be found in the linux kernel
-// archives at: https://www.kernel.org/doc/Documentation/networking/can.txt
-type SockaddrCAN struct {
-	Ifindex int
-	RxID    uint32
-	TxID    uint32
-	raw     RawSockaddrCAN
-}
-
-func (sa *SockaddrCAN) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Ifindex < 0 || sa.Ifindex > 0x7fffffff {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_CAN
-	sa.raw.Ifindex = int32(sa.Ifindex)
-	rx := (*[4]byte)(unsafe.Pointer(&sa.RxID))
-	for i := 0; i < 4; i++ {
-		sa.raw.Addr[i] = rx[i]
-	}
-	tx := (*[4]byte)(unsafe.Pointer(&sa.TxID))
-	for i := 0; i < 4; i++ {
-		sa.raw.Addr[i+4] = tx[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrCAN, nil
-}
-
-// SockaddrALG implements the Sockaddr interface for AF_ALG type sockets.
-// SockaddrALG enables userspace access to the Linux kernel's cryptography
-// subsystem. The Type and Name fields specify which type of hash or cipher
-// should be used with a given socket.
-//
-// To create a file descriptor that provides access to a hash or cipher, both
-// Bind and Accept must be used. Once the setup process is complete, input
-// data can be written to the socket, processed by the kernel, and then read
-// back as hash output or ciphertext.
-//
-// Here is an example of using an AF_ALG socket with SHA1 hashing.
-// The initial socket setup process is as follows:
-//
-//      // Open a socket to perform SHA1 hashing.
-//      fd, _ := unix.Socket(unix.AF_ALG, unix.SOCK_SEQPACKET, 0)
-//      addr := &unix.SockaddrALG{Type: "hash", Name: "sha1"}
-//      unix.Bind(fd, addr)
-//      // Note: unix.Accept does not work at this time; must invoke accept()
-//      // manually using unix.Syscall.
-//      hashfd, _, _ := unix.Syscall(unix.SYS_ACCEPT, uintptr(fd), 0, 0)
-//
-// Once a file descriptor has been returned from Accept, it may be used to
-// perform SHA1 hashing. The descriptor is not safe for concurrent use, but
-// may be re-used repeatedly with subsequent Write and Read operations.
-//
-// When hashing a small byte slice or string, a single Write and Read may
-// be used:
-//
-//      // Assume hashfd is already configured using the setup process.
-//      hash := os.NewFile(hashfd, "sha1")
-//      // Hash an input string and read the results. Each Write discards
-//      // previous hash state. Read always reads the current state.
-//      b := make([]byte, 20)
-//      for i := 0; i < 2; i++ {
-//          io.WriteString(hash, "Hello, world.")
-//          hash.Read(b)
-//          fmt.Println(hex.EncodeToString(b))
-//      }
-//      // Output:
-//      // 2ae01472317d1935a84797ec1983ae243fc6aa28
-//      // 2ae01472317d1935a84797ec1983ae243fc6aa28
-//
-// For hashing larger byte slices, or byte streams such as those read from
-// a file or socket, use Sendto with MSG_MORE to instruct the kernel to update
-// the hash digest instead of creating a new one for a given chunk and finalizing it.
-//
-//      // Assume hashfd and addr are already configured using the setup process.
-//      hash := os.NewFile(hashfd, "sha1")
-//      // Hash the contents of a file.
-//      f, _ := os.Open("/tmp/linux-4.10-rc7.tar.xz")
-//      b := make([]byte, 4096)
-//      for {
-//          n, err := f.Read(b)
-//          if err == io.EOF {
-//              break
-//          }
-//          unix.Sendto(hashfd, b[:n], unix.MSG_MORE, addr)
-//      }
-//      hash.Read(b)
-//      fmt.Println(hex.EncodeToString(b))
-//      // Output: 85cdcad0c06eef66f805ecce353bec9accbeecc5
-//
-// For more information, see: http://www.chronox.de/crypto-API/crypto/userspace-if.html.
-type SockaddrALG struct {
-	Type    string
-	Name    string
-	Feature uint32
-	Mask    uint32
-	raw     RawSockaddrALG
-}
-
-func (sa *SockaddrALG) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	// Leave room for NUL byte terminator.
-	if len(sa.Type) > 13 {
-		return nil, 0, EINVAL
-	}
-	if len(sa.Name) > 63 {
-		return nil, 0, EINVAL
-	}
-
-	sa.raw.Family = AF_ALG
-	sa.raw.Feat = sa.Feature
-	sa.raw.Mask = sa.Mask
-
-	typ, err := ByteSliceFromString(sa.Type)
-	if err != nil {
-		return nil, 0, err
-	}
-	name, err := ByteSliceFromString(sa.Name)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	copy(sa.raw.Type[:], typ)
-	copy(sa.raw.Name[:], name)
-
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrALG, nil
-}
-
-// SockaddrVM implements the Sockaddr interface for AF_VSOCK type sockets.
-// SockaddrVM provides access to Linux VM sockets: a mechanism that enables
-// bidirectional communication between a hypervisor and its guest virtual
-// machines.
-type SockaddrVM struct {
-	// CID and Port specify a context ID and port address for a VM socket.
-	// Guests have a unique CID, and hosts may have a well-known CID of:
-	//  - VMADDR_CID_HYPERVISOR: refers to the hypervisor process.
-	//  - VMADDR_CID_HOST: refers to other processes on the host.
-	CID  uint32
-	Port uint32
-	raw  RawSockaddrVM
-}
-
-func (sa *SockaddrVM) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	sa.raw.Family = AF_VSOCK
-	sa.raw.Port = sa.Port
-	sa.raw.Cid = sa.CID
-
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrVM, nil
-}
-
-func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
-	switch rsa.Addr.Family {
-	case AF_NETLINK:
-		pp := (*RawSockaddrNetlink)(unsafe.Pointer(rsa))
-		sa := new(SockaddrNetlink)
-		sa.Family = pp.Family
-		sa.Pad = pp.Pad
-		sa.Pid = pp.Pid
-		sa.Groups = pp.Groups
-		return sa, nil
-
-	case AF_PACKET:
-		pp := (*RawSockaddrLinklayer)(unsafe.Pointer(rsa))
-		sa := new(SockaddrLinklayer)
-		sa.Protocol = pp.Protocol
-		sa.Ifindex = int(pp.Ifindex)
-		sa.Hatype = pp.Hatype
-		sa.Pkttype = pp.Pkttype
-		sa.Halen = pp.Halen
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-
-	case AF_UNIX:
-		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
-		sa := new(SockaddrUnix)
-		if pp.Path[0] == 0 {
-			// "Abstract" Unix domain socket.
-			// Rewrite leading NUL as @ for textual display.
-			// (This is the standard convention.)
-			// Not friendly to overwrite in place,
-			// but the callers below don't care.
-			pp.Path[0] = '@'
-		}
-
-		// Assume path ends at NUL.
-		// This is not technically the Linux semantics for
-		// abstract Unix domain sockets--they are supposed
-		// to be uninterpreted fixed-size binary blobs--but
-		// everyone uses this convention.
-		n := 0
-		for n < len(pp.Path) && pp.Path[n] != 0 {
-			n++
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
-		sa.Name = string(bytes)
-		return sa, nil
-
-	case AF_INET:
-		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet4)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-
-	case AF_INET6:
-		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet6)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.ZoneId = pp.Scope_id
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-
-	case AF_VSOCK:
-		pp := (*RawSockaddrVM)(unsafe.Pointer(rsa))
-		sa := &SockaddrVM{
-			CID:  pp.Cid,
-			Port: pp.Port,
-		}
-		return sa, nil
-	}
-	return nil, EAFNOSUPPORT
-}
-
-func Accept(fd int) (nfd int, sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	nfd, err = accept(fd, &rsa, &len)
-	if err != nil {
-		return
-	}
-	sa, err = anyToSockaddr(&rsa)
-	if err != nil {
-		Close(nfd)
-		nfd = 0
-	}
-	return
-}
-
-func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	nfd, err = accept4(fd, &rsa, &len, flags)
-	if err != nil {
-		return
-	}
-	if len > SizeofSockaddrAny {
-		panic("RawSockaddrAny too small")
-	}
-	sa, err = anyToSockaddr(&rsa)
-	if err != nil {
-		Close(nfd)
-		nfd = 0
-	}
-	return
-}
-
-func Getsockname(fd int) (sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	if err = getsockname(fd, &rsa, &len); err != nil {
-		return
-	}
-	return anyToSockaddr(&rsa)
-}
-
-func GetsockoptInet4Addr(fd, level, opt int) (value [4]byte, err error) {
-	vallen := _Socklen(4)
-	err = getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
-	return value, err
-}
-
-func GetsockoptIPMreq(fd, level, opt int) (*IPMreq, error) {
-	var value IPMreq
-	vallen := _Socklen(SizeofIPMreq)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPMreqn(fd, level, opt int) (*IPMreqn, error) {
-	var value IPMreqn
-	vallen := _Socklen(SizeofIPMreqn)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPv6Mreq(fd, level, opt int) (*IPv6Mreq, error) {
-	var value IPv6Mreq
-	vallen := _Socklen(SizeofIPv6Mreq)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) {
-	var value IPv6MTUInfo
-	vallen := _Socklen(SizeofIPv6MTUInfo)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptICMPv6Filter(fd, level, opt int) (*ICMPv6Filter, error) {
-	var value ICMPv6Filter
-	vallen := _Socklen(SizeofICMPv6Filter)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptUcred(fd, level, opt int) (*Ucred, error) {
-	var value Ucred
-	vallen := _Socklen(SizeofUcred)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptTCPInfo(fd, level, opt int) (*TCPInfo, error) {
-	var value TCPInfo
-	vallen := _Socklen(SizeofTCPInfo)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func SetsockoptIPMreqn(fd, level, opt int, mreq *IPMreqn) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), unsafe.Sizeof(*mreq))
-}
-
-func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
-	var msg Msghdr
-	var rsa RawSockaddrAny
-	msg.Name = (*byte)(unsafe.Pointer(&rsa))
-	msg.Namelen = uint32(SizeofSockaddrAny)
-	var iov Iovec
-	if len(p) > 0 {
-		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
-		iov.SetLen(len(p))
-	}
-	var dummy byte
-	if len(oob) > 0 {
-		// receive at least one normal byte
-		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
-		}
-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
-		msg.SetControllen(len(oob))
-	}
-	msg.Iov = &iov
-	msg.Iovlen = 1
-	if n, err = recvmsg(fd, &msg, flags); err != nil {
-		return
-	}
-	oobn = int(msg.Controllen)
-	recvflags = int(msg.Flags)
-	// source address is only specified if the socket is unconnected
-	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(&rsa)
-	}
-	return
-}
-
-func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
-	_, err = SendmsgN(fd, p, oob, to, flags)
-	return
-}
-
-func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
-	var ptr unsafe.Pointer
-	var salen _Socklen
-	if to != nil {
-		var err error
-		ptr, salen, err = to.sockaddr()
-		if err != nil {
-			return 0, err
-		}
-	}
-	var msg Msghdr
-	msg.Name = (*byte)(unsafe.Pointer(ptr))
-	msg.Namelen = uint32(salen)
-	var iov Iovec
-	if len(p) > 0 {
-		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
-		iov.SetLen(len(p))
-	}
-	var dummy byte
-	if len(oob) > 0 {
-		// send at least one normal byte
-		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
-		}
-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
-		msg.SetControllen(len(oob))
-	}
-	msg.Iov = &iov
-	msg.Iovlen = 1
-	if n, err = sendmsg(fd, &msg, flags); err != nil {
-		return 0, err
-	}
-	if len(oob) > 0 && len(p) == 0 {
-		n = 0
-	}
-	return n, nil
-}
-
-// BindToDevice binds the socket associated with fd to device.
-func BindToDevice(fd int, device string) (err error) {
-	return SetsockoptString(fd, SOL_SOCKET, SO_BINDTODEVICE, device)
-}
-
-//sys	ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
-
-func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err error) {
-	// The peek requests are machine-size oriented, so we wrap it
-	// to retrieve arbitrary-length data.
-
-	// The ptrace syscall differs from glibc's ptrace.
-	// Peeks returns the word in *data, not as the return value.
-
-	var buf [sizeofPtr]byte
-
-	// Leading edge.  PEEKTEXT/PEEKDATA don't require aligned
-	// access (PEEKUSER warns that it might), but if we don't
-	// align our reads, we might straddle an unmapped page
-	// boundary and not get the bytes leading up to the page
-	// boundary.
-	n := 0
-	if addr%sizeofPtr != 0 {
-		err = ptrace(req, pid, addr-addr%sizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
-		if err != nil {
-			return 0, err
-		}
-		n += copy(out, buf[addr%sizeofPtr:])
-		out = out[n:]
-	}
-
-	// Remainder.
-	for len(out) > 0 {
-		// We use an internal buffer to guarantee alignment.
-		// It's not documented if this is necessary, but we're paranoid.
-		err = ptrace(req, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
-		if err != nil {
-			return n, err
-		}
-		copied := copy(out, buf[0:])
-		n += copied
-		out = out[copied:]
-	}
-
-	return n, nil
-}
-
-func PtracePeekText(pid int, addr uintptr, out []byte) (count int, err error) {
-	return ptracePeek(PTRACE_PEEKTEXT, pid, addr, out)
-}
-
-func PtracePeekData(pid int, addr uintptr, out []byte) (count int, err error) {
-	return ptracePeek(PTRACE_PEEKDATA, pid, addr, out)
-}
-
-func PtracePeekUser(pid int, addr uintptr, out []byte) (count int, err error) {
-	return ptracePeek(PTRACE_PEEKUSR, pid, addr, out)
-}
-
-func ptracePoke(pokeReq int, peekReq int, pid int, addr uintptr, data []byte) (count int, err error) {
-	// As for ptracePeek, we need to align our accesses to deal
-	// with the possibility of straddling an invalid page.
-
-	// Leading edge.
-	n := 0
-	if addr%sizeofPtr != 0 {
-		var buf [sizeofPtr]byte
-		err = ptrace(peekReq, pid, addr-addr%sizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
-		if err != nil {
-			return 0, err
-		}
-		n += copy(buf[addr%sizeofPtr:], data)
-		word := *((*uintptr)(unsafe.Pointer(&buf[0])))
-		err = ptrace(pokeReq, pid, addr-addr%sizeofPtr, word)
-		if err != nil {
-			return 0, err
-		}
-		data = data[n:]
-	}
-
-	// Interior.
-	for len(data) > sizeofPtr {
-		word := *((*uintptr)(unsafe.Pointer(&data[0])))
-		err = ptrace(pokeReq, pid, addr+uintptr(n), word)
-		if err != nil {
-			return n, err
-		}
-		n += sizeofPtr
-		data = data[sizeofPtr:]
-	}
-
-	// Trailing edge.
-	if len(data) > 0 {
-		var buf [sizeofPtr]byte
-		err = ptrace(peekReq, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
-		if err != nil {
-			return n, err
-		}
-		copy(buf[0:], data)
-		word := *((*uintptr)(unsafe.Pointer(&buf[0])))
-		err = ptrace(pokeReq, pid, addr+uintptr(n), word)
-		if err != nil {
-			return n, err
-		}
-		n += len(data)
-	}
-
-	return n, nil
-}
-
-func PtracePokeText(pid int, addr uintptr, data []byte) (count int, err error) {
-	return ptracePoke(PTRACE_POKETEXT, PTRACE_PEEKTEXT, pid, addr, data)
-}
-
-func PtracePokeData(pid int, addr uintptr, data []byte) (count int, err error) {
-	return ptracePoke(PTRACE_POKEDATA, PTRACE_PEEKDATA, pid, addr, data)
-}
-
-func PtraceGetRegs(pid int, regsout *PtraceRegs) (err error) {
-	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
-}
-
-func PtraceSetRegs(pid int, regs *PtraceRegs) (err error) {
-	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
-}
-
-func PtraceSetOptions(pid int, options int) (err error) {
-	return ptrace(PTRACE_SETOPTIONS, pid, 0, uintptr(options))
-}
-
-func PtraceGetEventMsg(pid int) (msg uint, err error) {
-	var data _C_long
-	err = ptrace(PTRACE_GETEVENTMSG, pid, 0, uintptr(unsafe.Pointer(&data)))
-	msg = uint(data)
-	return
-}
-
-func PtraceCont(pid int, signal int) (err error) {
-	return ptrace(PTRACE_CONT, pid, 0, uintptr(signal))
-}
-
-func PtraceSyscall(pid int, signal int) (err error) {
-	return ptrace(PTRACE_SYSCALL, pid, 0, uintptr(signal))
-}
-
-func PtraceSingleStep(pid int) (err error) { return ptrace(PTRACE_SINGLESTEP, pid, 0, 0) }
-
-func PtraceAttach(pid int) (err error) { return ptrace(PTRACE_ATTACH, pid, 0, 0) }
-
-func PtraceDetach(pid int) (err error) { return ptrace(PTRACE_DETACH, pid, 0, 0) }
-
-//sys	reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error)
-
-func Reboot(cmd int) (err error) {
-	return reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd, "")
-}
-
-func ReadDirent(fd int, buf []byte) (n int, err error) {
-	return Getdents(fd, buf)
-}
-
-func direntIno(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Ino), unsafe.Sizeof(Dirent{}.Ino))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
-	reclen, ok := direntReclen(buf)
-	if !ok {
-		return 0, false
-	}
-	return reclen - uint64(unsafe.Offsetof(Dirent{}.Name)), true
-}
-
-//sys	mount(source string, target string, fstype string, flags uintptr, data *byte) (err error)
-
-func Mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
-	// Certain file systems get rather angry and EINVAL if you give
-	// them an empty string of data, rather than NULL.
-	if data == "" {
-		return mount(source, target, fstype, flags, nil)
-	}
-	datap, err := BytePtrFromString(data)
-	if err != nil {
-		return err
-	}
-	return mount(source, target, fstype, flags, datap)
-}
-
-// Sendto
-// Recvfrom
-// Socketpair
-
-/*
- * Direct access
- */
-//sys	Acct(path string) (err error)
-//sys	Adjtimex(buf *Timex) (state int, err error)
-//sys	Chdir(path string) (err error)
-//sys	Chroot(path string) (err error)
-//sys	ClockGettime(clockid int32, time *Timespec) (err error)
-//sys	Close(fd int) (err error)
-//sys	Dup(oldfd int) (fd int, err error)
-//sys	Dup3(oldfd int, newfd int, flags int) (err error)
-//sysnb	EpollCreate(size int) (fd int, err error)
-//sysnb	EpollCreate1(flag int) (fd int, err error)
-//sysnb	EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error)
-//sys	Exit(code int) = SYS_EXIT_GROUP
-//sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
-//sys	Fallocate(fd int, mode uint32, off int64, len int64) (err error)
-//sys	Fchdir(fd int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
-//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
-//sys	fcntl(fd int, cmd int, arg int) (val int, err error)
-//sys	Fdatasync(fd int) (err error)
-//sys	Flock(fd int, how int) (err error)
-//sys	Fsync(fd int) (err error)
-//sys	Getdents(fd int, buf []byte) (n int, err error) = SYS_GETDENTS64
-//sysnb	Getpgid(pid int) (pgid int, err error)
-
-func Getpgrp() (pid int) {
-	pid, _ = Getpgid(0)
-	return
-}
-
-//sysnb	Getpid() (pid int)
-//sysnb	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (prio int, err error)
-//sys	Getrandom(buf []byte, flags int) (n int, err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Getsid(pid int) (sid int, err error)
-//sysnb	Gettid() (tid int)
-//sys	Getxattr(path string, attr string, dest []byte) (sz int, err error)
-//sys	InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error)
-//sysnb	InotifyInit1(flags int) (fd int, err error)
-//sysnb	InotifyRmWatch(fd int, watchdesc uint32) (success int, err error)
-//sysnb	Kill(pid int, sig syscall.Signal) (err error)
-//sys	Klogctl(typ int, buf []byte) (n int, err error) = SYS_SYSLOG
-//sys	Listxattr(path string, dest []byte) (sz int, err error)
-//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
-//sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
-//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	PivotRoot(newroot string, putold string) (err error) = SYS_PIVOT_ROOT
-//sysnb prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) = SYS_PRLIMIT64
-//sys   Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Removexattr(path string, attr string) (err error)
-//sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
-//sys	Setdomainname(p []byte) (err error)
-//sys	Sethostname(p []byte) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Settimeofday(tv *Timeval) (err error)
-//sys	Setns(fd int, nstype int) (err error)
-
-// issue 1435.
-// On linux Setuid and Setgid only affects the current thread, not the process.
-// This does not match what most callers expect so we must return an error
-// here rather than letting the caller think that the call succeeded.
-
-func Setuid(uid int) (err error) {
-	return EOPNOTSUPP
-}
-
-func Setgid(uid int) (err error) {
-	return EOPNOTSUPP
-}
-
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
-//sys	Sync()
-//sysnb	Sysinfo(info *Sysinfo_t) (err error)
-//sys	Tee(rfd int, wfd int, len int, flags int) (n int64, err error)
-//sysnb	Tgkill(tgid int, tid int, sig syscall.Signal) (err error)
-//sysnb	Times(tms *Tms) (ticks uintptr, err error)
-//sysnb	Umask(mask int) (oldmask int)
-//sysnb	Uname(buf *Utsname) (err error)
-//sys	Unmount(target string, flags int) (err error) = SYS_UMOUNT2
-//sys	Unshare(flags int) (err error)
-//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
-//sys	write(fd int, p []byte) (n int, err error)
-//sys	exitThread(code int) (err error) = SYS_EXIT
-//sys	readlen(fd int, p *byte, np int) (n int, err error) = SYS_READ
-//sys	writelen(fd int, p *byte, np int) (n int, err error) = SYS_WRITE
-
-// mmap varies by architecture; see syscall_linux_*.go.
-//sys	munmap(addr uintptr, length uintptr) (err error)
-
-var mapper = &mmapper{
-	active: make(map[*byte][]byte),
-	mmap:   mmap,
-	munmap: munmap,
-}
-
-func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	return mapper.Mmap(fd, offset, length, prot, flags)
-}
-
-func Munmap(b []byte) (err error) {
-	return mapper.Munmap(b)
-}
-
-//sys	Madvise(b []byte, advice int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Munlockall() (err error)
-
-// Vmsplice splices user pages from a slice of Iovecs into a pipe specified by fd,
-// using the specified flags.
-func Vmsplice(fd int, iovs []Iovec, flags int) (int, error) {
-	n, _, errno := Syscall6(
-		SYS_VMSPLICE,
-		uintptr(fd),
-		uintptr(unsafe.Pointer(&iovs[0])),
-		uintptr(len(iovs)),
-		uintptr(flags),
-		0,
-		0,
-	)
-	if errno != 0 {
-		return 0, syscall.Errno(errno)
-	}
-
-	return int(n), nil
-}
-
-/*
- * Unimplemented
- */
-// AddKey
-// AfsSyscall
-// Alarm
-// ArchPrctl
-// Brk
-// Capget
-// Capset
-// ClockGetres
-// ClockNanosleep
-// ClockSettime
-// Clone
-// CreateModule
-// DeleteModule
-// EpollCtlOld
-// EpollPwait
-// EpollWaitOld
-// Eventfd
-// Execve
-// Fgetxattr
-// Flistxattr
-// Fork
-// Fremovexattr
-// Fsetxattr
-// Futex
-// GetKernelSyms
-// GetMempolicy
-// GetRobustList
-// GetThreadArea
-// Getitimer
-// Getpmsg
-// IoCancel
-// IoDestroy
-// IoGetevents
-// IoSetup
-// IoSubmit
-// Ioctl
-// IoprioGet
-// IoprioSet
-// KexecLoad
-// Keyctl
-// Lgetxattr
-// Llistxattr
-// LookupDcookie
-// Lremovexattr
-// Lsetxattr
-// Mbind
-// MigratePages
-// Mincore
-// ModifyLdt
-// Mount
-// MovePages
-// Mprotect
-// MqGetsetattr
-// MqNotify
-// MqOpen
-// MqTimedreceive
-// MqTimedsend
-// MqUnlink
-// Mremap
-// Msgctl
-// Msgget
-// Msgrcv
-// Msgsnd
-// Msync
-// Newfstatat
-// Nfsservctl
-// Personality
-// Pselect6
-// Ptrace
-// Putpmsg
-// QueryModule
-// Quotactl
-// Readahead
-// Readv
-// RemapFilePages
-// RequestKey
-// RestartSyscall
-// RtSigaction
-// RtSigpending
-// RtSigprocmask
-// RtSigqueueinfo
-// RtSigreturn
-// RtSigsuspend
-// RtSigtimedwait
-// SchedGetPriorityMax
-// SchedGetPriorityMin
-// SchedGetaffinity
-// SchedGetparam
-// SchedGetscheduler
-// SchedRrGetInterval
-// SchedSetaffinity
-// SchedSetparam
-// SchedYield
-// Security
-// Semctl
-// Semget
-// Semop
-// Semtimedop
-// SetMempolicy
-// SetRobustList
-// SetThreadArea
-// SetTidAddress
-// Shmat
-// Shmctl
-// Shmdt
-// Shmget
-// Sigaltstack
-// Signalfd
-// Swapoff
-// Swapon
-// Sysfs
-// TimerCreate
-// TimerDelete
-// TimerGetoverrun
-// TimerGettime
-// TimerSettime
-// Timerfd
-// Tkill (obsolete)
-// Tuxcall
-// Umount2
-// Uselib
-// Utimensat
-// Vfork
-// Vhangup
-// Vserver
-// Waitid
-// _Sysctl
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
deleted file mode 100644
index 2b881b9793..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_386.go
+++ /dev/null
@@ -1,399 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// TODO(rsc): Rewrite all nn(SP) references into name+(nn-8)(FP)
-// so that go vet can check that they are correct.
-
-// +build 386,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = int32(nsec / 1e9)
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	return
-}
-
-//sysnb	pipe(p *[2]_C_int) (err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe(&pp)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-// 64-bit file system and 32-bit uid calls
-// (386 default is 32-bit file system and 16-bit uid).
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64_64
-//sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
-//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
-//sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
-//sysnb	Getegid() (egid int) = SYS_GETEGID32
-//sysnb	Geteuid() (euid int) = SYS_GETEUID32
-//sysnb	Getgid() (gid int) = SYS_GETGID32
-//sysnb	Getuid() (uid int) = SYS_GETUID32
-//sysnb	InotifyInit() (fd int, err error)
-//sys	Ioperm(from int, num int, on int) (err error)
-//sys	Iopl(level int) (err error)
-//sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
-//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
-//sys	Setfsgid(gid int) (err error) = SYS_SETFSGID32
-//sys	Setfsuid(uid int) (err error) = SYS_SETFSUID32
-//sysnb	Setregid(rgid int, egid int) (err error) = SYS_SETREGID32
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error) = SYS_SETRESGID32
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32
-//sysnb	Setreuid(ruid int, euid int) (err error) = SYS_SETREUID32
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
-//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error) = SYS_GETGROUPS32
-//sysnb	setgroups(n int, list *_Gid_t) (err error) = SYS_SETGROUPS32
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
-
-//sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Pause() (err error)
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	page := uintptr(offset / 4096)
-	if offset != int64(page)*4096 {
-		return 0, EINVAL
-	}
-	return mmap2(addr, length, prot, flags, fd, page)
-}
-
-type rlimit32 struct {
-	Cur uint32
-	Max uint32
-}
-
-//sysnb getrlimit(resource int, rlim *rlimit32) (err error) = SYS_GETRLIMIT
-
-const rlimInf32 = ^uint32(0)
-const rlimInf64 = ^uint64(0)
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	err = prlimit(0, resource, nil, rlim)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	err = getrlimit(resource, &rl)
-	if err != nil {
-		return
-	}
-
-	if rl.Cur == rlimInf32 {
-		rlim.Cur = rlimInf64
-	} else {
-		rlim.Cur = uint64(rl.Cur)
-	}
-
-	if rl.Max == rlimInf32 {
-		rlim.Max = rlimInf64
-	} else {
-		rlim.Max = uint64(rl.Max)
-	}
-	return
-}
-
-//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	err = prlimit(0, resource, rlim, nil)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	if rlim.Cur == rlimInf64 {
-		rl.Cur = rlimInf32
-	} else if rlim.Cur < uint64(rlimInf32) {
-		rl.Cur = uint32(rlim.Cur)
-	} else {
-		return EINVAL
-	}
-	if rlim.Max == rlimInf64 {
-		rl.Max = rlimInf32
-	} else if rlim.Max < uint64(rlimInf32) {
-		rl.Max = uint32(rlim.Max)
-	} else {
-		return EINVAL
-	}
-
-	return setrlimit(resource, &rl)
-}
-
-// Underlying system call writes to newoffset via pointer.
-// Implemented in assembly to avoid allocation.
-func seek(fd int, offset int64, whence int) (newoffset int64, err syscall.Errno)
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	newoffset, errno := seek(fd, offset, whence)
-	if errno != 0 {
-		return 0, errno
-	}
-	return newoffset, nil
-}
-
-// Vsyscalls on amd64.
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Time(t *Time_t) (tt Time_t, err error)
-
-//sys	Utime(path string, buf *Utimbuf) (err error)
-
-// On x86 Linux, all the socket calls go through an extra indirection,
-// I think because the 5-register system call interface can't handle
-// the 6-argument calls like sendto and recvfrom.  Instead the
-// arguments to the underlying system call are the number below
-// and a pointer to an array of uintptr.  We hide the pointer in the
-// socketcall assembly to avoid allocation on every system call.
-
-const (
-	// see linux/net.h
-	_SOCKET      = 1
-	_BIND        = 2
-	_CONNECT     = 3
-	_LISTEN      = 4
-	_ACCEPT      = 5
-	_GETSOCKNAME = 6
-	_GETPEERNAME = 7
-	_SOCKETPAIR  = 8
-	_SEND        = 9
-	_RECV        = 10
-	_SENDTO      = 11
-	_RECVFROM    = 12
-	_SHUTDOWN    = 13
-	_SETSOCKOPT  = 14
-	_GETSOCKOPT  = 15
-	_SENDMSG     = 16
-	_RECVMSG     = 17
-	_ACCEPT4     = 18
-	_RECVMMSG    = 19
-	_SENDMMSG    = 20
-)
-
-func socketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (n int, err syscall.Errno)
-func rawsocketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (n int, err syscall.Errno)
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	fd, e := socketcall(_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	fd, e := socketcall(_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func getsockname(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, e := rawsocketcall(_GETSOCKNAME, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func getpeername(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, e := rawsocketcall(_GETPEERNAME, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func socketpair(domain int, typ int, flags int, fd *[2]int32) (err error) {
-	_, e := rawsocketcall(_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, e := socketcall(_BIND, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, e := socketcall(_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	fd, e := rawsocketcall(_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, e := socketcall(_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, e := socketcall(_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), vallen, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func recvfrom(s int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var base uintptr
-	if len(p) > 0 {
-		base = uintptr(unsafe.Pointer(&p[0]))
-	}
-	n, e := socketcall(_RECVFROM, uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func sendto(s int, p []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var base uintptr
-	if len(p) > 0 {
-		base = uintptr(unsafe.Pointer(&p[0]))
-	}
-	_, e := socketcall(_SENDTO, uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	n, e := socketcall(_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	n, e := socketcall(_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func Listen(s int, n int) (err error) {
-	_, e := socketcall(_LISTEN, uintptr(s), uintptr(n), 0, 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func Shutdown(s, how int) (err error) {
-	_, e := socketcall(_SHUTDOWN, uintptr(s), uintptr(how), 0, 0, 0, 0)
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e := Syscall(SYS_FSTATFS64, uintptr(fd), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	pathp, err := BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	_, _, e := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(pathp)), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func (r *PtraceRegs) PC() uint64 { return uint64(uint32(r.Eip)) }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Eip = int32(pc) }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
-
-func Poll(fds []PollFd, timeout int) (n int, err error) {
-	if len(fds) == 0 {
-		return poll(nil, 0, timeout)
-	}
-	return poll(&fds[0], len(fds), timeout)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
deleted file mode 100644
index 9516a3fd7e..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,linux
-
-package unix
-
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Getuid() (uid int)
-//sysnb	InotifyInit() (fd int, err error)
-//sys	Ioperm(from int, num int, on int) (err error)
-//sys	Iopl(level int) (err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Listen(s int, n int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Pause() (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
-//sys	Setfsgid(gid int) (err error)
-//sys	Setfsuid(uid int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, buf *Statfs_t) (err error)
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
-
-func Gettimeofday(tv *Timeval) (err error) {
-	errno := gettimeofday(tv)
-	if errno != 0 {
-		return errno
-	}
-	return nil
-}
-
-func Getpagesize() int { return 4096 }
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	var tv Timeval
-	errno := gettimeofday(&tv)
-	if errno != 0 {
-		return 0, errno
-	}
-	if t != nil {
-		*t = Time_t(tv.Sec)
-	}
-	return Time_t(tv.Sec), nil
-}
-
-//sys	Utime(path string, buf *Utimbuf) (err error)
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
-}
-
-//sysnb	pipe(p *[2]_C_int) (err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe(&pp)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-func (r *PtraceRegs) PC() uint64 { return r.Rip }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Rip = pc }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint64(length)
-}
-
-//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
-
-func Poll(fds []PollFd, timeout int) (n int, err error) {
-	if len(fds) == 0 {
-		return poll(nil, 0, timeout)
-	}
-	return poll(&fds[0], len(fds), timeout)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64_gc.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64_gc.go
deleted file mode 100644
index 21a4946ba5..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_amd64_gc.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,linux
-// +build !gccgo
-
-package unix
-
-import "syscall"
-
-//go:noescape
-func gettimeofday(tv *Timeval) (err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
deleted file mode 100644
index 71d8702289..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build arm,linux
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = int32(nsec / 1e9)
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	return
-}
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, 0)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-// Underlying system call writes to newoffset via pointer.
-// Implemented in assembly to avoid allocation.
-func seek(fd int, offset int64, whence int) (newoffset int64, err syscall.Errno)
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	newoffset, errno := seek(fd, offset, whence)
-	if errno != 0 {
-		return 0, errno
-	}
-	return newoffset, nil
-}
-
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error) = SYS_GETGROUPS32
-//sysnb	setgroups(n int, list *_Gid_t) (err error) = SYS_SETGROUPS32
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	socketpair(domain int, typ int, flags int, fd *[2]int32) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-
-// 64-bit file system and 32-bit uid calls
-// (16-bit uid calls are not always supported in newer kernels)
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
-//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
-//sysnb	Getegid() (egid int) = SYS_GETEGID32
-//sysnb	Geteuid() (euid int) = SYS_GETEUID32
-//sysnb	Getgid() (gid int) = SYS_GETGID32
-//sysnb	Getuid() (uid int) = SYS_GETUID32
-//sysnb	InotifyInit() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error) = SYS_LCHOWN32
-//sys	Listen(s int, n int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
-//sys	Setfsgid(gid int) (err error) = SYS_SETFSGID32
-//sys	Setfsuid(uid int) (err error) = SYS_SETFSUID32
-//sysnb	Setregid(rgid int, egid int) (err error) = SYS_SETREGID32
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error) = SYS_SETRESGID32
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error) = SYS_SETRESUID32
-//sysnb	Setreuid(ruid int, euid int) (err error) = SYS_SETREUID32
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
-//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
-
-// Vsyscalls on amd64.
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Pause() (err error)
-
-func Time(t *Time_t) (Time_t, error) {
-	var tv Timeval
-	err := Gettimeofday(&tv)
-	if err != nil {
-		return 0, err
-	}
-	if t != nil {
-		*t = Time_t(tv.Sec)
-	}
-	return Time_t(tv.Sec), nil
-}
-
-func Utime(path string, buf *Utimbuf) error {
-	tv := []Timeval{
-		{Sec: buf.Actime},
-		{Sec: buf.Modtime},
-	}
-	return Utimes(path, tv)
-}
-
-//sys   Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys   Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
-//sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_ARM_FADVISE64_64, uintptr(fd), uintptr(advice), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-//sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e := Syscall(SYS_FSTATFS64, uintptr(fd), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	pathp, err := BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	_, _, e := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(pathp)), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
-	if e != 0 {
-		err = e
-	}
-	return
-}
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	page := uintptr(offset / 4096)
-	if offset != int64(page)*4096 {
-		return 0, EINVAL
-	}
-	return mmap2(addr, length, prot, flags, fd, page)
-}
-
-type rlimit32 struct {
-	Cur uint32
-	Max uint32
-}
-
-//sysnb getrlimit(resource int, rlim *rlimit32) (err error) = SYS_UGETRLIMIT
-
-const rlimInf32 = ^uint32(0)
-const rlimInf64 = ^uint64(0)
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	err = prlimit(0, resource, nil, rlim)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	err = getrlimit(resource, &rl)
-	if err != nil {
-		return
-	}
-
-	if rl.Cur == rlimInf32 {
-		rlim.Cur = rlimInf64
-	} else {
-		rlim.Cur = uint64(rl.Cur)
-	}
-
-	if rl.Max == rlimInf32 {
-		rlim.Max = rlimInf64
-	} else {
-		rlim.Max = uint64(rl.Max)
-	}
-	return
-}
-
-//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	err = prlimit(0, resource, rlim, nil)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	if rlim.Cur == rlimInf64 {
-		rl.Cur = rlimInf32
-	} else if rlim.Cur < uint64(rlimInf32) {
-		rl.Cur = uint32(rlim.Cur)
-	} else {
-		return EINVAL
-	}
-	if rlim.Max == rlimInf64 {
-		rl.Max = rlimInf32
-	} else if rlim.Max < uint64(rlimInf32) {
-		rl.Max = uint32(rlim.Max)
-	} else {
-		return EINVAL
-	}
-
-	return setrlimit(resource, &rl)
-}
-
-func (r *PtraceRegs) PC() uint64 { return uint64(r.Uregs[15]) }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Uregs[15] = uint32(pc) }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
-
-func Poll(fds []PollFd, timeout int) (n int, err error) {
-	if len(fds) == 0 {
-		return poll(nil, 0, timeout)
-	}
-	return poll(&fds[0], len(fds), timeout)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
deleted file mode 100644
index 4a136396cd..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build arm64,linux
-
-package unix
-
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Listen(s int, n int) (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS_PSELECT6
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
-//sys	Setfsgid(gid int) (err error)
-//sys	Setfsuid(uid int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-
-func Stat(path string, stat *Stat_t) (err error) {
-	return Fstatat(AT_FDCWD, path, stat, 0)
-}
-
-func Lchown(path string, uid int, gid int) (err error) {
-	return Fchownat(AT_FDCWD, path, uid, gid, AT_SYMLINK_NOFOLLOW)
-}
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	return Fstatat(AT_FDCWD, path, stat, AT_SYMLINK_NOFOLLOW)
-}
-
-//sys	Statfs(path string, buf *Statfs_t) (err error)
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
-
-func Getpagesize() int { return 65536 }
-
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
-}
-
-func Time(t *Time_t) (Time_t, error) {
-	var tv Timeval
-	err := Gettimeofday(&tv)
-	if err != nil {
-		return 0, err
-	}
-	if t != nil {
-		*t = Time_t(tv.Sec)
-	}
-	return Time_t(tv.Sec), nil
-}
-
-func Utime(path string, buf *Utimbuf) error {
-	tv := []Timeval{
-		{Sec: buf.Actime},
-		{Sec: buf.Modtime},
-	}
-	return Utimes(path, tv)
-}
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, 0)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-func (r *PtraceRegs) PC() uint64 { return r.Pc }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Pc = pc }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint64(length)
-}
-
-func InotifyInit() (fd int, err error) {
-	return InotifyInit1(0)
-}
-
-func Dup2(oldfd int, newfd int) (err error) {
-	return Dup3(oldfd, newfd, 0)
-}
-
-func Pause() (err error) {
-	_, _, e1 := Syscall6(SYS_PPOLL, 0, 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// TODO(dfc): constants that should be in zsysnum_linux_arm64.go, remove
-// these when the deprecated syscalls that the syscall package relies on
-// are removed.
-const (
-	SYS_GETPGRP      = 1060
-	SYS_UTIMES       = 1037
-	SYS_FUTIMESAT    = 1066
-	SYS_PAUSE        = 1061
-	SYS_USTAT        = 1070
-	SYS_UTIME        = 1063
-	SYS_LCHOWN       = 1032
-	SYS_TIME         = 1062
-	SYS_EPOLL_CREATE = 1042
-	SYS_EPOLL_WAIT   = 1069
-)
-
-func Poll(fds []PollFd, timeout int) (n int, err error) {
-	var ts *Timespec
-	if timeout >= 0 {
-		ts = new(Timespec)
-		*ts = NsecToTimespec(int64(timeout) * 1e6)
-	}
-	if len(fds) == 0 {
-		return ppoll(nil, 0, ts, nil)
-	}
-	return ppoll(&fds[0], len(fds), ts, nil)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
deleted file mode 100644
index 8119fde376..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-// +build mips64 mips64le
-
-package unix
-
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Listen(s int, n int) (err error)
-//sys	Pause() (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS_PSELECT6
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
-//sys	Setfsgid(gid int) (err error)
-//sys	Setfsuid(uid int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-//sys	Statfs(path string, buf *Statfs_t) (err error)
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
-
-func Getpagesize() int { return 65536 }
-
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	var tv Timeval
-	err = Gettimeofday(&tv)
-	if err != nil {
-		return 0, err
-	}
-	if t != nil {
-		*t = Time_t(tv.Sec)
-	}
-	return Time_t(tv.Sec), nil
-}
-
-//sys	Utime(path string, buf *Utimbuf) (err error)
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
-}
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, 0)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-func Ioperm(from int, num int, on int) (err error) {
-	return ENOSYS
-}
-
-func Iopl(level int) (err error) {
-	return ENOSYS
-}
-
-type stat_t struct {
-	Dev        uint32
-	Pad0       [3]int32
-	Ino        uint64
-	Mode       uint32
-	Nlink      uint32
-	Uid        uint32
-	Gid        uint32
-	Rdev       uint32
-	Pad1       [3]uint32
-	Size       int64
-	Atime      uint32
-	Atime_nsec uint32
-	Mtime      uint32
-	Mtime_nsec uint32
-	Ctime      uint32
-	Ctime_nsec uint32
-	Blksize    uint32
-	Pad2       uint32
-	Blocks     int64
-}
-
-//sys	fstat(fd int, st *stat_t) (err error)
-//sys	lstat(path string, st *stat_t) (err error)
-//sys	stat(path string, st *stat_t) (err error)
-
-func Fstat(fd int, s *Stat_t) (err error) {
-	st := &stat_t{}
-	err = fstat(fd, st)
-	fillStat_t(s, st)
-	return
-}
-
-func Lstat(path string, s *Stat_t) (err error) {
-	st := &stat_t{}
-	err = lstat(path, st)
-	fillStat_t(s, st)
-	return
-}
-
-func Stat(path string, s *Stat_t) (err error) {
-	st := &stat_t{}
-	err = stat(path, st)
-	fillStat_t(s, st)
-	return
-}
-
-func fillStat_t(s *Stat_t, st *stat_t) {
-	s.Dev = st.Dev
-	s.Ino = st.Ino
-	s.Mode = st.Mode
-	s.Nlink = st.Nlink
-	s.Uid = st.Uid
-	s.Gid = st.Gid
-	s.Rdev = st.Rdev
-	s.Size = st.Size
-	s.Atim = Timespec{int64(st.Atime), int64(st.Atime_nsec)}
-	s.Mtim = Timespec{int64(st.Mtime), int64(st.Mtime_nsec)}
-	s.Ctim = Timespec{int64(st.Ctime), int64(st.Ctime_nsec)}
-	s.Blksize = st.Blksize
-	s.Blocks = st.Blocks
-}
-
-func (r *PtraceRegs) PC() uint64 { return r.Regs[64] }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Regs[64] = pc }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint64(length)
-}
-
-//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
-
-func Poll(fds []PollFd, timeout int) (n int, err error) {
-	if len(fds) == 0 {
-		return poll(nil, 0, timeout)
-	}
-	return poll(&fds[0], len(fds), timeout)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
deleted file mode 100644
index be77d24a4a..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
+++ /dev/null
@@ -1,239 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-// +build mips mipsle
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getuid() (uid int)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Listen(s int, n int) (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = SYS_SENDFILE64
-//sys	Setfsgid(gid int) (err error)
-//sys	Setfsuid(uid int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-
-//sysnb	InotifyInit() (fd int, err error)
-//sys	Ioperm(from int, num int, on int) (err error)
-//sys	Iopl(level int) (err error)
-
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Time(t *Time_t) (tt Time_t, err error)
-
-//sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
-//sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
-//sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
-
-//sys	Utime(path string, buf *Utimbuf) (err error)
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Pause() (err error)
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e := Syscall(SYS_FSTATFS64, uintptr(fd), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
-	if e != 0 {
-		err = errnoErr(e)
-	}
-	return
-}
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	p, err := BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	_, _, e := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(p)), unsafe.Sizeof(*buf), uintptr(unsafe.Pointer(buf)))
-	if e != 0 {
-		err = errnoErr(e)
-	}
-	return
-}
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	_, _, e := Syscall6(SYS__LLSEEK, uintptr(fd), uintptr(offset>>32), uintptr(offset), uintptr(unsafe.Pointer(&off)), uintptr(whence), 0)
-	if e != 0 {
-		err = errnoErr(e)
-	}
-	return
-}
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = int32(nsec / 1e9)
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, 0)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sys	mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error)
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	page := uintptr(offset / 4096)
-	if offset != int64(page)*4096 {
-		return 0, EINVAL
-	}
-	return mmap2(addr, length, prot, flags, fd, page)
-}
-
-const rlimInf32 = ^uint32(0)
-const rlimInf64 = ^uint64(0)
-
-type rlimit32 struct {
-	Cur uint32
-	Max uint32
-}
-
-//sysnb getrlimit(resource int, rlim *rlimit32) (err error) = SYS_GETRLIMIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	err = prlimit(0, resource, nil, rlim)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	err = getrlimit(resource, &rl)
-	if err != nil {
-		return
-	}
-
-	if rl.Cur == rlimInf32 {
-		rlim.Cur = rlimInf64
-	} else {
-		rlim.Cur = uint64(rl.Cur)
-	}
-
-	if rl.Max == rlimInf32 {
-		rlim.Max = rlimInf64
-	} else {
-		rlim.Max = uint64(rl.Max)
-	}
-	return
-}
-
-//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	err = prlimit(0, resource, rlim, nil)
-	if err != ENOSYS {
-		return err
-	}
-
-	rl := rlimit32{}
-	if rlim.Cur == rlimInf64 {
-		rl.Cur = rlimInf32
-	} else if rlim.Cur < uint64(rlimInf32) {
-		rl.Cur = uint32(rlim.Cur)
-	} else {
-		return EINVAL
-	}
-	if rlim.Max == rlimInf64 {
-		rl.Max = rlimInf32
-	} else if rlim.Max < uint64(rlimInf32) {
-		rl.Max = uint32(rlim.Max)
-	} else {
-		return EINVAL
-	}
-
-	return setrlimit(resource, &rl)
-}
-
-func (r *PtraceRegs) PC() uint64 { return uint64(r.Regs[64]) }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Regs[64] = uint32(pc) }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
-
-func Poll(fds []PollFd, timeout int) (n int, err error) {
-	if len(fds) == 0 {
-		return poll(nil, 0, timeout)
-	}
-	return poll(&fds[0], len(fds), timeout)
-}
-
-func Getpagesize() int { return 4096 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
deleted file mode 100644
index 60770f627c..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-// +build ppc64 ppc64le
-
-package unix
-
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error) = SYS_UGETRLIMIT
-//sysnb	Getuid() (uid int)
-//sysnb	InotifyInit() (fd int, err error)
-//sys	Ioperm(from int, num int, on int) (err error)
-//sys	Iopl(level int) (err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Listen(s int, n int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Pause() (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
-//sys	Setfsgid(gid int) (err error)
-//sys	Setfsuid(uid int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, buf *Statfs_t) (err error)
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error) = SYS_SYNC_FILE_RANGE2
-//sys	Truncate(path string, length int64) (err error)
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
-
-func Getpagesize() int { return 65536 }
-
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Time(t *Time_t) (tt Time_t, err error)
-
-//sys	Utime(path string, buf *Utimbuf) (err error)
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
-}
-
-func (r *PtraceRegs) PC() uint64 { return r.Nip }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Nip = pc }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint64(length)
-}
-
-//sysnb pipe(p *[2]_C_int) (err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe(&pp)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
-
-func Poll(fds []PollFd, timeout int) (n int, err error) {
-	if len(fds) == 0 {
-		return poll(nil, 0, timeout)
-	}
-	return poll(&fds[0], len(fds), timeout)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
deleted file mode 100644
index 1708a4bbf9..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
+++ /dev/null
@@ -1,328 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build s390x,linux
-
-package unix
-
-import (
-	"unsafe"
-)
-
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Getuid() (uid int)
-//sysnb	InotifyInit() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Pause() (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
-//sys	Setfsgid(gid int) (err error)
-//sys	Setfsuid(uid int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, buf *Statfs_t) (err error)
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-
-func Getpagesize() int { return 4096 }
-
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	var tv Timeval
-	err = Gettimeofday(&tv)
-	if err != nil {
-		return 0, err
-	}
-	if t != nil {
-		*t = Time_t(tv.Sec)
-	}
-	return Time_t(tv.Sec), nil
-}
-
-//sys	Utime(path string, buf *Utimbuf) (err error)
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, 0) // pipe2 is the same as pipe when flags are set to 0.
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-func Ioperm(from int, num int, on int) (err error) {
-	return ENOSYS
-}
-
-func Iopl(level int) (err error) {
-	return ENOSYS
-}
-
-func (r *PtraceRegs) PC() uint64 { return r.Psw.Addr }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Psw.Addr = pc }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint64(length)
-}
-
-// Linux on s390x uses the old mmap interface, which requires arguments to be passed in a struct.
-// mmap2 also requires arguments to be passed in a struct; it is currently not exposed in <asm/unistd.h>.
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	mmap_args := [6]uintptr{addr, length, uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset)}
-	r0, _, e1 := Syscall(SYS_MMAP, uintptr(unsafe.Pointer(&mmap_args[0])), 0, 0)
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// On s390x Linux, all the socket calls go through an extra indirection.
-// The arguments to the underlying system call (SYS_SOCKETCALL) are the
-// number below and a pointer to an array of uintptr.
-const (
-	// see linux/net.h
-	netSocket      = 1
-	netBind        = 2
-	netConnect     = 3
-	netListen      = 4
-	netAccept      = 5
-	netGetSockName = 6
-	netGetPeerName = 7
-	netSocketPair  = 8
-	netSend        = 9
-	netRecv        = 10
-	netSendTo      = 11
-	netRecvFrom    = 12
-	netShutdown    = 13
-	netSetSockOpt  = 14
-	netGetSockOpt  = 15
-	netSendMsg     = 16
-	netRecvMsg     = 17
-	netAccept4     = 18
-	netRecvMMsg    = 19
-	netSendMMsg    = 20
-)
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (int, error) {
-	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
-	fd, _, err := Syscall(SYS_SOCKETCALL, netAccept, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(fd), nil
-}
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (int, error) {
-	args := [4]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags)}
-	fd, _, err := Syscall(SYS_SOCKETCALL, netAccept4, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(fd), nil
-}
-
-func getsockname(s int, rsa *RawSockaddrAny, addrlen *_Socklen) error {
-	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
-	_, _, err := RawSyscall(SYS_SOCKETCALL, netGetSockName, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func getpeername(s int, rsa *RawSockaddrAny, addrlen *_Socklen) error {
-	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen))}
-	_, _, err := RawSyscall(SYS_SOCKETCALL, netGetPeerName, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func socketpair(domain int, typ int, flags int, fd *[2]int32) error {
-	args := [4]uintptr{uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd))}
-	_, _, err := RawSyscall(SYS_SOCKETCALL, netSocketPair, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) error {
-	args := [3]uintptr{uintptr(s), uintptr(addr), uintptr(addrlen)}
-	_, _, err := Syscall(SYS_SOCKETCALL, netBind, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) error {
-	args := [3]uintptr{uintptr(s), uintptr(addr), uintptr(addrlen)}
-	_, _, err := Syscall(SYS_SOCKETCALL, netConnect, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func socket(domain int, typ int, proto int) (int, error) {
-	args := [3]uintptr{uintptr(domain), uintptr(typ), uintptr(proto)}
-	fd, _, err := RawSyscall(SYS_SOCKETCALL, netSocket, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(fd), nil
-}
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) error {
-	args := [5]uintptr{uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen))}
-	_, _, err := Syscall(SYS_SOCKETCALL, netGetSockOpt, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) error {
-	args := [4]uintptr{uintptr(s), uintptr(level), uintptr(name), uintptr(val)}
-	_, _, err := Syscall(SYS_SOCKETCALL, netSetSockOpt, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func recvfrom(s int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (int, error) {
-	var base uintptr
-	if len(p) > 0 {
-		base = uintptr(unsafe.Pointer(&p[0]))
-	}
-	args := [6]uintptr{uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen))}
-	n, _, err := Syscall(SYS_SOCKETCALL, netRecvFrom, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(n), nil
-}
-
-func sendto(s int, p []byte, flags int, to unsafe.Pointer, addrlen _Socklen) error {
-	var base uintptr
-	if len(p) > 0 {
-		base = uintptr(unsafe.Pointer(&p[0]))
-	}
-	args := [6]uintptr{uintptr(s), base, uintptr(len(p)), uintptr(flags), uintptr(to), uintptr(addrlen)}
-	_, _, err := Syscall(SYS_SOCKETCALL, netSendTo, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func recvmsg(s int, msg *Msghdr, flags int) (int, error) {
-	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags)}
-	n, _, err := Syscall(SYS_SOCKETCALL, netRecvMsg, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(n), nil
-}
-
-func sendmsg(s int, msg *Msghdr, flags int) (int, error) {
-	args := [3]uintptr{uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags)}
-	n, _, err := Syscall(SYS_SOCKETCALL, netSendMsg, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(n), nil
-}
-
-func Listen(s int, n int) error {
-	args := [2]uintptr{uintptr(s), uintptr(n)}
-	_, _, err := Syscall(SYS_SOCKETCALL, netListen, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-func Shutdown(s, how int) error {
-	args := [2]uintptr{uintptr(s), uintptr(how)}
-	_, _, err := Syscall(SYS_SOCKETCALL, netShutdown, uintptr(unsafe.Pointer(&args)), 0)
-	if err != 0 {
-		return err
-	}
-	return nil
-}
-
-//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
-
-func Poll(fds []PollFd, timeout int) (n int, err error) {
-	if len(fds) == 0 {
-		return poll(nil, 0, timeout)
-	}
-	return poll(&fds[0], len(fds), timeout)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
deleted file mode 100644
index 20b7454d77..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build sparc64,linux
-
-package unix
-
-import (
-	"sync/atomic"
-	"syscall"
-)
-
-//sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, buf *Statfs_t) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (euid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Getuid() (uid int)
-//sysnb	InotifyInit() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Listen(s int, n int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Pause() (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
-//sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
-//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
-//sys	Setfsgid(gid int) (err error)
-//sys	Setfsuid(uid int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, buf *Statfs_t) (err error)
-//sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error)
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error)
-//sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
-//sysnb	setgroups(n int, list *_Gid_t) (err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error)
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error)
-//sysnb	socket(domain int, typ int, proto int) (fd int, err error)
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sysnb	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error)
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
-
-func sysconf(name int) (n int64, err syscall.Errno)
-
-// pageSize caches the value of Getpagesize, since it can't change
-// once the system is booted.
-var pageSize int64 // accessed atomically
-
-func Getpagesize() int {
-	n := atomic.LoadInt64(&pageSize)
-	if n == 0 {
-		n, _ = sysconf(_SC_PAGESIZE)
-		atomic.StoreInt64(&pageSize, n)
-	}
-	return int(n)
-}
-
-func Ioperm(from int, num int, on int) (err error) {
-	return ENOSYS
-}
-
-func Iopl(level int) (err error) {
-	return ENOSYS
-}
-
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	var tv Timeval
-	err = Gettimeofday(&tv)
-	if err != nil {
-		return 0, err
-	}
-	if t != nil {
-		*t = Time_t(tv.Sec)
-	}
-	return Time_t(tv.Sec), nil
-}
-
-//sys	Utime(path string, buf *Utimbuf) (err error)
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	return
-}
-
-func (r *PtraceRegs) PC() uint64 { return r.Tpc }
-
-func (r *PtraceRegs) SetPC(pc uint64) { r.Tpc = pc }
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint64(length)
-}
-
-//sysnb pipe(p *[2]_C_int) (err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe(&pp)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sysnb pipe2(p *[2]_C_int, flags int) (err error)
-
-func Pipe2(p []int, flags int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe2(&pp, flags)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sys	poll(fds *PollFd, nfds int, timeout int) (n int, err error)
-
-func Poll(fds []PollFd, timeout int) (n int, err error) {
-	if len(fds) == 0 {
-		return poll(nil, 0, timeout)
-	}
-	return poll(&fds[0], len(fds), timeout)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
deleted file mode 100644
index 01f6a48c86..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd.go
+++ /dev/null
@@ -1,476 +0,0 @@
-// Copyright 2009,2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// NetBSD system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and wrap
-// it in our own nicer implementation, either here or in
-// syscall_bsd.go or syscall_unix.go.
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-type SockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-	raw    RawSockaddrDatalink
-}
-
-func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-func sysctlNodes(mib []_C_int) (nodes []Sysctlnode, err error) {
-	var olen uintptr
-
-	// Get a list of all sysctl nodes below the given MIB by performing
-	// a sysctl for the given MIB with CTL_QUERY appended.
-	mib = append(mib, CTL_QUERY)
-	qnode := Sysctlnode{Flags: SYSCTL_VERS_1}
-	qp := (*byte)(unsafe.Pointer(&qnode))
-	sz := unsafe.Sizeof(qnode)
-	if err = sysctl(mib, nil, &olen, qp, sz); err != nil {
-		return nil, err
-	}
-
-	// Now that we know the size, get the actual nodes.
-	nodes = make([]Sysctlnode, olen/sz)
-	np := (*byte)(unsafe.Pointer(&nodes[0]))
-	if err = sysctl(mib, np, &olen, qp, sz); err != nil {
-		return nil, err
-	}
-
-	return nodes, nil
-}
-
-func nametomib(name string) (mib []_C_int, err error) {
-
-	// Split name into components.
-	var parts []string
-	last := 0
-	for i := 0; i < len(name); i++ {
-		if name[i] == '.' {
-			parts = append(parts, name[last:i])
-			last = i + 1
-		}
-	}
-	parts = append(parts, name[last:])
-
-	// Discover the nodes and construct the MIB OID.
-	for partno, part := range parts {
-		nodes, err := sysctlNodes(mib)
-		if err != nil {
-			return nil, err
-		}
-		for _, node := range nodes {
-			n := make([]byte, 0)
-			for i := range node.Name {
-				if node.Name[i] != 0 {
-					n = append(n, byte(node.Name[i]))
-				}
-			}
-			if string(n) == part {
-				mib = append(mib, _C_int(node.Num))
-				break
-			}
-		}
-		if len(mib) != partno+1 {
-			return nil, EINVAL
-		}
-	}
-
-	return mib, nil
-}
-
-func direntIno(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Fileno), unsafe.Sizeof(Dirent{}.Fileno))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
-}
-
-//sysnb pipe() (fd1 int, fd2 int, err error)
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	p[0], p[1], err = pipe()
-	return
-}
-
-//sys getdents(fd int, buf []byte) (n int, err error)
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	return getdents(fd, buf)
-}
-
-// TODO
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	return -1, ENOSYS
-}
-
-/*
- * Exposed directly
- */
-//sys	Access(path string, mode uint32) (err error)
-//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
-//sys	Chdir(path string) (err error)
-//sys	Chflags(path string, flags int) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
-//sys	Chown(path string, uid int, gid int) (err error)
-//sys	Chroot(path string) (err error)
-//sys	Close(fd int) (err error)
-//sys	Dup(fd int) (nfd int, err error)
-//sys	Dup2(from int, to int) (err error)
-//sys	Exit(code int)
-//sys	Fchdir(fd int) (err error)
-//sys	Fchflags(fd int, flags int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Flock(fd int, how int) (err error)
-//sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fsync(fd int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (uid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getpgid(pid int) (pgid int, err error)
-//sysnb	Getpgrp() (pgrp int)
-//sysnb	Getpid() (pid int)
-//sysnb	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (prio int, err error)
-//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Getsid(pid int) (sid int, err error)
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Issetugid() (tainted bool)
-//sys	Kill(pid int, signum syscall.Signal) (err error)
-//sys	Kqueue() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Mkdir(path string, mode uint32) (err error)
-//sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
-//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	Open(path string, mode int, perm uint32) (fd int, err error)
-//sys	Pathconf(path string, name int) (val int, err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
-//sys	Rename(from string, to string) (err error)
-//sys	Revoke(path string) (err error)
-//sys	Rmdir(path string) (err error)
-//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
-//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
-//sysnb	Setegid(egid int) (err error)
-//sysnb	Seteuid(euid int) (err error)
-//sysnb	Setgid(gid int) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Settimeofday(tp *Timeval) (err error)
-//sysnb	Setuid(uid int) (err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Symlink(path string, link string) (err error)
-//sys	Sync() (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	Umask(newmask int) (oldmask int)
-//sys	Unlink(path string) (err error)
-//sys	Unmount(path string, flags int) (err error)
-//sys	write(fd int, p []byte) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
-//sys	munmap(addr uintptr, length uintptr) (err error)
-//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
-//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
-
-/*
- * Unimplemented
- */
-// ____semctl13
-// __clone
-// __fhopen40
-// __fhstat40
-// __fhstatvfs140
-// __fstat30
-// __getcwd
-// __getfh30
-// __getlogin
-// __lstat30
-// __mount50
-// __msgctl13
-// __msync13
-// __ntp_gettime30
-// __posix_chown
-// __posix_fadvise50
-// __posix_fchown
-// __posix_lchown
-// __posix_rename
-// __setlogin
-// __shmctl13
-// __sigaction_sigtramp
-// __sigaltstack14
-// __sigpending14
-// __sigprocmask14
-// __sigsuspend14
-// __sigtimedwait
-// __stat30
-// __syscall
-// __vfork14
-// _ksem_close
-// _ksem_destroy
-// _ksem_getvalue
-// _ksem_init
-// _ksem_open
-// _ksem_post
-// _ksem_trywait
-// _ksem_unlink
-// _ksem_wait
-// _lwp_continue
-// _lwp_create
-// _lwp_ctl
-// _lwp_detach
-// _lwp_exit
-// _lwp_getname
-// _lwp_getprivate
-// _lwp_kill
-// _lwp_park
-// _lwp_self
-// _lwp_setname
-// _lwp_setprivate
-// _lwp_suspend
-// _lwp_unpark
-// _lwp_unpark_all
-// _lwp_wait
-// _lwp_wakeup
-// _pset_bind
-// _sched_getaffinity
-// _sched_getparam
-// _sched_setaffinity
-// _sched_setparam
-// acct
-// aio_cancel
-// aio_error
-// aio_fsync
-// aio_read
-// aio_return
-// aio_suspend
-// aio_write
-// break
-// clock_getres
-// clock_gettime
-// clock_settime
-// compat_09_ogetdomainname
-// compat_09_osetdomainname
-// compat_09_ouname
-// compat_10_omsgsys
-// compat_10_osemsys
-// compat_10_oshmsys
-// compat_12_fstat12
-// compat_12_getdirentries
-// compat_12_lstat12
-// compat_12_msync
-// compat_12_oreboot
-// compat_12_oswapon
-// compat_12_stat12
-// compat_13_sigaction13
-// compat_13_sigaltstack13
-// compat_13_sigpending13
-// compat_13_sigprocmask13
-// compat_13_sigreturn13
-// compat_13_sigsuspend13
-// compat_14___semctl
-// compat_14_msgctl
-// compat_14_shmctl
-// compat_16___sigaction14
-// compat_16___sigreturn14
-// compat_20_fhstatfs
-// compat_20_fstatfs
-// compat_20_getfsstat
-// compat_20_statfs
-// compat_30___fhstat30
-// compat_30___fstat13
-// compat_30___lstat13
-// compat_30___stat13
-// compat_30_fhopen
-// compat_30_fhstat
-// compat_30_fhstatvfs1
-// compat_30_getdents
-// compat_30_getfh
-// compat_30_ntp_gettime
-// compat_30_socket
-// compat_40_mount
-// compat_43_fstat43
-// compat_43_lstat43
-// compat_43_oaccept
-// compat_43_ocreat
-// compat_43_oftruncate
-// compat_43_ogetdirentries
-// compat_43_ogetdtablesize
-// compat_43_ogethostid
-// compat_43_ogethostname
-// compat_43_ogetkerninfo
-// compat_43_ogetpagesize
-// compat_43_ogetpeername
-// compat_43_ogetrlimit
-// compat_43_ogetsockname
-// compat_43_okillpg
-// compat_43_olseek
-// compat_43_ommap
-// compat_43_oquota
-// compat_43_orecv
-// compat_43_orecvfrom
-// compat_43_orecvmsg
-// compat_43_osend
-// compat_43_osendmsg
-// compat_43_osethostid
-// compat_43_osethostname
-// compat_43_osetrlimit
-// compat_43_osigblock
-// compat_43_osigsetmask
-// compat_43_osigstack
-// compat_43_osigvec
-// compat_43_otruncate
-// compat_43_owait
-// compat_43_stat43
-// execve
-// extattr_delete_fd
-// extattr_delete_file
-// extattr_delete_link
-// extattr_get_fd
-// extattr_get_file
-// extattr_get_link
-// extattr_list_fd
-// extattr_list_file
-// extattr_list_link
-// extattr_set_fd
-// extattr_set_file
-// extattr_set_link
-// extattrctl
-// fchroot
-// fdatasync
-// fgetxattr
-// fktrace
-// flistxattr
-// fork
-// fremovexattr
-// fsetxattr
-// fstatvfs1
-// fsync_range
-// getcontext
-// getitimer
-// getvfsstat
-// getxattr
-// ioctl
-// ktrace
-// lchflags
-// lchmod
-// lfs_bmapv
-// lfs_markv
-// lfs_segclean
-// lfs_segwait
-// lgetxattr
-// lio_listio
-// listxattr
-// llistxattr
-// lremovexattr
-// lseek
-// lsetxattr
-// lutimes
-// madvise
-// mincore
-// minherit
-// modctl
-// mq_close
-// mq_getattr
-// mq_notify
-// mq_open
-// mq_receive
-// mq_send
-// mq_setattr
-// mq_timedreceive
-// mq_timedsend
-// mq_unlink
-// mremap
-// msgget
-// msgrcv
-// msgsnd
-// nfssvc
-// ntp_adjtime
-// pmc_control
-// pmc_get_info
-// poll
-// pollts
-// preadv
-// profil
-// pselect
-// pset_assign
-// pset_create
-// pset_destroy
-// ptrace
-// pwritev
-// quotactl
-// rasctl
-// readv
-// reboot
-// removexattr
-// sa_enable
-// sa_preempt
-// sa_register
-// sa_setconcurrency
-// sa_stacks
-// sa_yield
-// sbrk
-// sched_yield
-// semconfig
-// semget
-// semop
-// setcontext
-// setitimer
-// setxattr
-// shmat
-// shmdt
-// shmget
-// sstk
-// statvfs1
-// swapctl
-// sysarch
-// syscall
-// timer_create
-// timer_delete
-// timer_getoverrun
-// timer_gettime
-// timer_settime
-// undelete
-// utrace
-// uuidgen
-// vadvise
-// vfork
-// writev
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
deleted file mode 100644
index afaca09838..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build 386,netbsd
-
-package unix
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int64(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = uint32(mode)
-	k.Flags = uint32(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
deleted file mode 100644
index a6ff04ce5b..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,netbsd
-
-package unix
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int64(nsec / 1e9)
-	ts.Nsec = int64(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = uint32(mode)
-	k.Flags = uint32(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
deleted file mode 100644
index 68a6969b28..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build arm,netbsd
-
-package unix
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int64(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = uint32(mode)
-	k.Flags = uint32(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_no_getwd.go b/vendor/golang.org/x/sys/unix/syscall_no_getwd.go
deleted file mode 100644
index 530792ea93..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_no_getwd.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build dragonfly freebsd netbsd openbsd
-
-package unix
-
-const ImplementsGetwd = false
-
-func Getwd() (string, error) { return "", ENOTSUP }
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
deleted file mode 100644
index c0d2b6c80d..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd.go
+++ /dev/null
@@ -1,287 +0,0 @@
-// Copyright 2009,2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// OpenBSD system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and wrap
-// it in our own nicer implementation, either here or in
-// syscall_bsd.go or syscall_unix.go.
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-type SockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [24]int8
-	raw    RawSockaddrDatalink
-}
-
-func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-func nametomib(name string) (mib []_C_int, err error) {
-
-	// Perform lookup via a binary search
-	left := 0
-	right := len(sysctlMib) - 1
-	for {
-		idx := left + (right-left)/2
-		switch {
-		case name == sysctlMib[idx].ctlname:
-			return sysctlMib[idx].ctloid, nil
-		case name > sysctlMib[idx].ctlname:
-			left = idx + 1
-		default:
-			right = idx - 1
-		}
-		if left > right {
-			break
-		}
-	}
-	return nil, EINVAL
-}
-
-func direntIno(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Fileno), unsafe.Sizeof(Dirent{}.Fileno))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
-}
-
-//sysnb pipe(p *[2]_C_int) (err error)
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	err = pipe(&pp)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-//sys getdents(fd int, buf []byte) (n int, err error)
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	return getdents(fd, buf)
-}
-
-// TODO
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	return -1, ENOSYS
-}
-
-func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	var bufsize uintptr
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-		bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
-	}
-	r0, _, e1 := Syscall(SYS_GETFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-/*
- * Exposed directly
- */
-//sys	Access(path string, mode uint32) (err error)
-//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
-//sys	Chdir(path string) (err error)
-//sys	Chflags(path string, flags int) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
-//sys	Chown(path string, uid int, gid int) (err error)
-//sys	Chroot(path string) (err error)
-//sys	Close(fd int) (err error)
-//sys	Dup(fd int) (nfd int, err error)
-//sys	Dup2(from int, to int) (err error)
-//sys	Exit(code int)
-//sys	Fchdir(fd int) (err error)
-//sys	Fchflags(fd int, flags int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Flock(fd int, how int) (err error)
-//sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Fstatfs(fd int, stat *Statfs_t) (err error)
-//sys	Fsync(fd int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sysnb	Getegid() (egid int)
-//sysnb	Geteuid() (uid int)
-//sysnb	Getgid() (gid int)
-//sysnb	Getpgid(pid int) (pgid int, err error)
-//sysnb	Getpgrp() (pgrp int)
-//sysnb	Getpid() (pid int)
-//sysnb	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (prio int, err error)
-//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Getsid(pid int) (sid int, err error)
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Issetugid() (tainted bool)
-//sys	Kill(pid int, signum syscall.Signal) (err error)
-//sys	Kqueue() (fd int, err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error)
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Mkdir(path string, mode uint32) (err error)
-//sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
-//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	Open(path string, mode int, perm uint32) (fd int, err error)
-//sys	Pathconf(path string, name int) (val int, err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
-//sys	Rename(from string, to string) (err error)
-//sys	Revoke(path string) (err error)
-//sys	Rmdir(path string) (err error)
-//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
-//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
-//sysnb	Setegid(egid int) (err error)
-//sysnb	Seteuid(euid int) (err error)
-//sysnb	Setgid(gid int) (err error)
-//sys	Setlogin(name string) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
-//sysnb	Setresuid(ruid int, euid int, suid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Settimeofday(tp *Timeval) (err error)
-//sysnb	Setuid(uid int) (err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Statfs(path string, stat *Statfs_t) (err error)
-//sys	Symlink(path string, link string) (err error)
-//sys	Sync() (err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	Umask(newmask int) (oldmask int)
-//sys	Unlink(path string) (err error)
-//sys	Unmount(path string, flags int) (err error)
-//sys	write(fd int, p []byte) (n int, err error)
-//sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
-//sys	munmap(addr uintptr, length uintptr) (err error)
-//sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
-//sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
-
-/*
- * Unimplemented
- */
-// __getcwd
-// __semctl
-// __syscall
-// __sysctl
-// adjfreq
-// break
-// clock_getres
-// clock_gettime
-// clock_settime
-// closefrom
-// execve
-// faccessat
-// fchmodat
-// fchownat
-// fcntl
-// fhopen
-// fhstat
-// fhstatfs
-// fork
-// fstatat
-// futimens
-// getfh
-// getgid
-// getitimer
-// getlogin
-// getresgid
-// getresuid
-// getrtable
-// getthrid
-// ioctl
-// ktrace
-// lfs_bmapv
-// lfs_markv
-// lfs_segclean
-// lfs_segwait
-// linkat
-// mincore
-// minherit
-// mkdirat
-// mkfifoat
-// mknodat
-// mount
-// mquery
-// msgctl
-// msgget
-// msgrcv
-// msgsnd
-// nfssvc
-// nnpfspioctl
-// openat
-// poll
-// preadv
-// profil
-// pwritev
-// quotactl
-// readlinkat
-// readv
-// reboot
-// renameat
-// rfork
-// sched_yield
-// semget
-// semop
-// setgroups
-// setitimer
-// setrtable
-// setsockopt
-// shmat
-// shmctl
-// shmdt
-// shmget
-// sigaction
-// sigaltstack
-// sigpending
-// sigprocmask
-// sigreturn
-// sigsuspend
-// symlinkat
-// sysarch
-// syscall
-// threxit
-// thrsigdivert
-// thrsleep
-// thrwakeup
-// unlinkat
-// utimensat
-// vfork
-// writev
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
deleted file mode 100644
index a66ddc59ce..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build 386,openbsd
-
-package unix
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int64(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint32(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint32(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
deleted file mode 100644
index 0776c1faf9..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,openbsd
-
-package unix
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3
-	tv.Sec = nsec / 1e9
-	return
-}
-
-func SetKevent(k *Kevent_t, fd, mode, flags int) {
-	k.Ident = uint64(fd)
-	k.Filter = int16(mode)
-	k.Flags = uint16(flags)
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (msghdr *Msghdr) SetControllen(length int) {
-	msghdr.Controllen = uint32(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris.go b/vendor/golang.org/x/sys/unix/syscall_solaris.go
deleted file mode 100644
index 3cb1d0bfeb..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_solaris.go
+++ /dev/null
@@ -1,713 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Solaris system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and wrap
-// it in our own nicer implementation, either here or in
-// syscall_solaris.go or syscall_unix.go.
-
-package unix
-
-import (
-	"sync/atomic"
-	"syscall"
-	"unsafe"
-)
-
-// Implemented in runtime/syscall_solaris.go.
-type syscallFunc uintptr
-
-func rawSysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
-func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-type SockaddrDatalink struct {
-	Family uint16
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [244]int8
-	raw    RawSockaddrDatalink
-}
-
-func clen(n []byte) int {
-	for i := 0; i < len(n); i++ {
-		if n[i] == 0 {
-			return i
-		}
-	}
-	return len(n)
-}
-
-func direntIno(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Ino), unsafe.Sizeof(Dirent{}.Ino))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
-	return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
-	reclen, ok := direntReclen(buf)
-	if !ok {
-		return 0, false
-	}
-	return reclen - uint64(unsafe.Offsetof(Dirent{}.Name)), true
-}
-
-//sysnb	pipe(p *[2]_C_int) (n int, err error)
-
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return EINVAL
-	}
-	var pp [2]_C_int
-	n, err := pipe(&pp)
-	if n != 0 {
-		return err
-	}
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return nil
-}
-
-func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_INET
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet4, nil
-}
-
-func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_INET6
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	sa.raw.Scope_id = sa.ZoneId
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), SizeofSockaddrInet6, nil
-}
-
-func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
-	name := sa.Name
-	n := len(name)
-	if n >= len(sa.raw.Path) {
-		return nil, 0, EINVAL
-	}
-	sa.raw.Family = AF_UNIX
-	for i := 0; i < n; i++ {
-		sa.raw.Path[i] = int8(name[i])
-	}
-	// length is family (uint16), name, NUL.
-	sl := _Socklen(2)
-	if n > 0 {
-		sl += _Socklen(n) + 1
-	}
-	if sa.raw.Path[0] == '@' {
-		sa.raw.Path[0] = 0
-		// Don't count trailing NUL for abstract address.
-		sl--
-	}
-
-	return unsafe.Pointer(&sa.raw), sl, nil
-}
-
-//sys	getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = libsocket.getsockname
-
-func Getsockname(fd int) (sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	if err = getsockname(fd, &rsa, &len); err != nil {
-		return
-	}
-	return anyToSockaddr(&rsa)
-}
-
-const ImplementsGetwd = true
-
-//sys	Getcwd(buf []byte) (n int, err error)
-
-func Getwd() (wd string, err error) {
-	var buf [PathMax]byte
-	// Getcwd will return an error if it failed for any reason.
-	_, err = Getcwd(buf[0:])
-	if err != nil {
-		return "", err
-	}
-	n := clen(buf[:])
-	if n < 1 {
-		return "", EINVAL
-	}
-	return string(buf[:n]), nil
-}
-
-/*
- * Wrapped
- */
-
-//sysnb	getgroups(ngid int, gid *_Gid_t) (n int, err error)
-//sysnb	setgroups(ngid int, gid *_Gid_t) (err error)
-
-func Getgroups() (gids []int, err error) {
-	n, err := getgroups(0, nil)
-	// Check for error and sanity check group count.  Newer versions of
-	// Solaris allow up to 1024 (NGROUPS_MAX).
-	if n < 0 || n > 1024 {
-		if err != nil {
-			return nil, err
-		}
-		return nil, EINVAL
-	} else if n == 0 {
-		return nil, nil
-	}
-
-	a := make([]_Gid_t, n)
-	n, err = getgroups(n, &a[0])
-	if n == -1 {
-		return nil, err
-	}
-	gids = make([]int, n)
-	for i, v := range a[0:n] {
-		gids[i] = int(v)
-	}
-	return
-}
-
-func Setgroups(gids []int) (err error) {
-	if len(gids) == 0 {
-		return setgroups(0, nil)
-	}
-
-	a := make([]_Gid_t, len(gids))
-	for i, v := range gids {
-		a[i] = _Gid_t(v)
-	}
-	return setgroups(len(a), &a[0])
-}
-
-func ReadDirent(fd int, buf []byte) (n int, err error) {
-	// Final argument is (basep *uintptr) and the syscall doesn't take nil.
-	// TODO(rsc): Can we use a single global basep for all calls?
-	return Getdents(fd, buf, new(uintptr))
-}
-
-// Wait status is 7 bits at bottom, either 0 (exited),
-// 0x7F (stopped), or a signal number that caused an exit.
-// The 0x80 bit is whether there was a core dump.
-// An extra number (exit code, signal causing a stop)
-// is in the high bits.
-
-type WaitStatus uint32
-
-const (
-	mask  = 0x7F
-	core  = 0x80
-	shift = 8
-
-	exited  = 0
-	stopped = 0x7F
-)
-
-func (w WaitStatus) Exited() bool { return w&mask == exited }
-
-func (w WaitStatus) ExitStatus() int {
-	if w&mask != exited {
-		return -1
-	}
-	return int(w >> shift)
-}
-
-func (w WaitStatus) Signaled() bool { return w&mask != stopped && w&mask != 0 }
-
-func (w WaitStatus) Signal() syscall.Signal {
-	sig := syscall.Signal(w & mask)
-	if sig == stopped || sig == 0 {
-		return -1
-	}
-	return sig
-}
-
-func (w WaitStatus) CoreDump() bool { return w.Signaled() && w&core != 0 }
-
-func (w WaitStatus) Stopped() bool { return w&mask == stopped && syscall.Signal(w>>shift) != SIGSTOP }
-
-func (w WaitStatus) Continued() bool { return w&mask == stopped && syscall.Signal(w>>shift) == SIGSTOP }
-
-func (w WaitStatus) StopSignal() syscall.Signal {
-	if !w.Stopped() {
-		return -1
-	}
-	return syscall.Signal(w>>shift) & 0xFF
-}
-
-func (w WaitStatus) TrapCause() int { return -1 }
-
-//sys	wait4(pid int32, statusp *_C_int, options int, rusage *Rusage) (wpid int32, err error)
-
-func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (int, error) {
-	var status _C_int
-	rpid, err := wait4(int32(pid), &status, options, rusage)
-	wpid := int(rpid)
-	if wpid == -1 {
-		return wpid, err
-	}
-	if wstatus != nil {
-		*wstatus = WaitStatus(status)
-	}
-	return wpid, nil
-}
-
-//sys	gethostname(buf []byte) (n int, err error)
-
-func Gethostname() (name string, err error) {
-	var buf [MaxHostNameLen]byte
-	n, err := gethostname(buf[:])
-	if n != 0 {
-		return "", err
-	}
-	n = clen(buf[:])
-	if n < 1 {
-		return "", EFAULT
-	}
-	return string(buf[:n]), nil
-}
-
-//sys	utimes(path string, times *[2]Timeval) (err error)
-
-func Utimes(path string, tv []Timeval) (err error) {
-	if tv == nil {
-		return utimes(path, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-//sys	utimensat(fd int, path string, times *[2]Timespec, flag int) (err error)
-
-func UtimesNano(path string, ts []Timespec) error {
-	if ts == nil {
-		return utimensat(AT_FDCWD, path, nil, 0)
-	}
-	if len(ts) != 2 {
-		return EINVAL
-	}
-	return utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
-}
-
-func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
-	if ts == nil {
-		return utimensat(dirfd, path, nil, flags)
-	}
-	if len(ts) != 2 {
-		return EINVAL
-	}
-	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
-}
-
-//sys	fcntl(fd int, cmd int, arg int) (val int, err error)
-
-// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
-func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(unsafe.Pointer(lk)), 0, 0, 0)
-	if e1 != 0 {
-		return e1
-	}
-	return nil
-}
-
-//sys	futimesat(fildes int, path *byte, times *[2]Timeval) (err error)
-
-func Futimesat(dirfd int, path string, tv []Timeval) error {
-	pathp, err := BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	if tv == nil {
-		return futimesat(dirfd, pathp, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	return futimesat(dirfd, pathp, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-// Solaris doesn't have an futimes function because it allows NULL to be
-// specified as the path for futimesat.  However, Go doesn't like
-// NULL-style string interfaces, so this simple wrapper is provided.
-func Futimes(fd int, tv []Timeval) error {
-	if tv == nil {
-		return futimesat(fd, nil, nil)
-	}
-	if len(tv) != 2 {
-		return EINVAL
-	}
-	return futimesat(fd, nil, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
-}
-
-func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
-	switch rsa.Addr.Family {
-	case AF_UNIX:
-		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
-		sa := new(SockaddrUnix)
-		// Assume path ends at NUL.
-		// This is not technically the Solaris semantics for
-		// abstract Unix domain sockets -- they are supposed
-		// to be uninterpreted fixed-size binary blobs -- but
-		// everyone uses this convention.
-		n := 0
-		for n < len(pp.Path) && pp.Path[n] != 0 {
-			n++
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
-		sa.Name = string(bytes)
-		return sa, nil
-
-	case AF_INET:
-		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet4)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-
-	case AF_INET6:
-		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet6)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.ZoneId = pp.Scope_id
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-	}
-	return nil, EAFNOSUPPORT
-}
-
-//sys	accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) = libsocket.accept
-
-func Accept(fd int) (nfd int, sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	nfd, err = accept(fd, &rsa, &len)
-	if nfd == -1 {
-		return
-	}
-	sa, err = anyToSockaddr(&rsa)
-	if err != nil {
-		Close(nfd)
-		nfd = 0
-	}
-	return
-}
-
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.recvmsg
-
-func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
-	var msg Msghdr
-	var rsa RawSockaddrAny
-	msg.Name = (*byte)(unsafe.Pointer(&rsa))
-	msg.Namelen = uint32(SizeofSockaddrAny)
-	var iov Iovec
-	if len(p) > 0 {
-		iov.Base = (*int8)(unsafe.Pointer(&p[0]))
-		iov.SetLen(len(p))
-	}
-	var dummy int8
-	if len(oob) > 0 {
-		// receive at least one normal byte
-		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
-		}
-		msg.Accrights = (*int8)(unsafe.Pointer(&oob[0]))
-	}
-	msg.Iov = &iov
-	msg.Iovlen = 1
-	if n, err = recvmsg(fd, &msg, flags); n == -1 {
-		return
-	}
-	oobn = int(msg.Accrightslen)
-	// source address is only specified if the socket is unconnected
-	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(&rsa)
-	}
-	return
-}
-
-func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
-	_, err = SendmsgN(fd, p, oob, to, flags)
-	return
-}
-
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.sendmsg
-
-func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
-	var ptr unsafe.Pointer
-	var salen _Socklen
-	if to != nil {
-		ptr, salen, err = to.sockaddr()
-		if err != nil {
-			return 0, err
-		}
-	}
-	var msg Msghdr
-	msg.Name = (*byte)(unsafe.Pointer(ptr))
-	msg.Namelen = uint32(salen)
-	var iov Iovec
-	if len(p) > 0 {
-		iov.Base = (*int8)(unsafe.Pointer(&p[0]))
-		iov.SetLen(len(p))
-	}
-	var dummy int8
-	if len(oob) > 0 {
-		// send at least one normal byte
-		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
-		}
-		msg.Accrights = (*int8)(unsafe.Pointer(&oob[0]))
-	}
-	msg.Iov = &iov
-	msg.Iovlen = 1
-	if n, err = sendmsg(fd, &msg, flags); err != nil {
-		return 0, err
-	}
-	if len(oob) > 0 && len(p) == 0 {
-		n = 0
-	}
-	return n, nil
-}
-
-//sys	acct(path *byte) (err error)
-
-func Acct(path string) (err error) {
-	if len(path) == 0 {
-		// Assume caller wants to disable accounting.
-		return acct(nil)
-	}
-
-	pathp, err := BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	return acct(pathp)
-}
-
-/*
- * Expose the ioctl function
- */
-
-//sys	ioctl(fd int, req int, arg uintptr) (err error)
-
-func IoctlSetInt(fd int, req int, value int) (err error) {
-	return ioctl(fd, req, uintptr(value))
-}
-
-func IoctlSetWinsize(fd int, req int, value *Winsize) (err error) {
-	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
-}
-
-func IoctlSetTermios(fd int, req int, value *Termios) (err error) {
-	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
-}
-
-func IoctlSetTermio(fd int, req int, value *Termio) (err error) {
-	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
-}
-
-func IoctlGetInt(fd int, req int) (int, error) {
-	var value int
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
-	return value, err
-}
-
-func IoctlGetWinsize(fd int, req int) (*Winsize, error) {
-	var value Winsize
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
-	return &value, err
-}
-
-func IoctlGetTermios(fd int, req int) (*Termios, error) {
-	var value Termios
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
-	return &value, err
-}
-
-func IoctlGetTermio(fd int, req int) (*Termio, error) {
-	var value Termio
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
-	return &value, err
-}
-
-/*
- * Exposed directly
- */
-//sys	Access(path string, mode uint32) (err error)
-//sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
-//sys	Chdir(path string) (err error)
-//sys	Chmod(path string, mode uint32) (err error)
-//sys	Chown(path string, uid int, gid int) (err error)
-//sys	Chroot(path string) (err error)
-//sys	Close(fd int) (err error)
-//sys	Creat(path string, mode uint32) (fd int, err error)
-//sys	Dup(fd int) (nfd int, err error)
-//sys	Dup2(oldfd int, newfd int) (err error)
-//sys	Exit(code int)
-//sys	Fchdir(fd int) (err error)
-//sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
-//sys	Fchown(fd int, uid int, gid int) (err error)
-//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
-//sys	Fdatasync(fd int) (err error)
-//sys	Fpathconf(fd int, name int) (val int, err error)
-//sys	Fstat(fd int, stat *Stat_t) (err error)
-//sys	Getdents(fd int, buf []byte, basep *uintptr) (n int, err error)
-//sysnb	Getgid() (gid int)
-//sysnb	Getpid() (pid int)
-//sysnb	Getpgid(pid int) (pgid int, err error)
-//sysnb	Getpgrp() (pgid int, err error)
-//sys	Geteuid() (euid int)
-//sys	Getegid() (egid int)
-//sys	Getppid() (ppid int)
-//sys	Getpriority(which int, who int) (n int, err error)
-//sysnb	Getrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Getrusage(who int, rusage *Rusage) (err error)
-//sysnb	Gettimeofday(tv *Timeval) (err error)
-//sysnb	Getuid() (uid int)
-//sys	Kill(pid int, signum syscall.Signal) (err error)
-//sys	Lchown(path string, uid int, gid int) (err error)
-//sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error) = libsocket.listen
-//sys	Lstat(path string, stat *Stat_t) (err error)
-//sys	Madvise(b []byte, advice int) (err error)
-//sys	Mkdir(path string, mode uint32) (err error)
-//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
-//sys	Mkfifo(path string, mode uint32) (err error)
-//sys	Mkfifoat(dirfd int, path string, mode uint32) (err error)
-//sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
-//sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
-//sys	Open(path string, mode int, perm uint32) (fd int, err error)
-//sys	Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
-//sys	Pathconf(path string, name int) (val int, err error)
-//sys	Pause() (err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
-//sys	read(fd int, p []byte) (n int, err error)
-//sys	Readlink(path string, buf []byte) (n int, err error)
-//sys	Rename(from string, to string) (err error)
-//sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
-//sys	Rmdir(path string) (err error)
-//sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = lseek
-//sysnb	Setegid(egid int) (err error)
-//sysnb	Seteuid(euid int) (err error)
-//sysnb	Setgid(gid int) (err error)
-//sys	Sethostname(p []byte) (err error)
-//sysnb	Setpgid(pid int, pgid int) (err error)
-//sys	Setpriority(which int, who int, prio int) (err error)
-//sysnb	Setregid(rgid int, egid int) (err error)
-//sysnb	Setreuid(ruid int, euid int) (err error)
-//sysnb	Setrlimit(which int, lim *Rlimit) (err error)
-//sysnb	Setsid() (pid int, err error)
-//sysnb	Setuid(uid int) (err error)
-//sys	Shutdown(s int, how int) (err error) = libsocket.shutdown
-//sys	Stat(path string, stat *Stat_t) (err error)
-//sys	Symlink(path string, link string) (err error)
-//sys	Sync() (err error)
-//sysnb	Times(tms *Tms) (ticks uintptr, err error)
-//sys	Truncate(path string, length int64) (err error)
-//sys	Fsync(fd int) (err error)
-//sys	Ftruncate(fd int, length int64) (err error)
-//sys	Umask(mask int) (oldmask int)
-//sysnb	Uname(buf *Utsname) (err error)
-//sys	Unmount(target string, flags int) (err error) = libc.umount
-//sys	Unlink(path string) (err error)
-//sys	Unlinkat(dirfd int, path string, flags int) (err error)
-//sys	Ustat(dev int, ubuf *Ustat_t) (err error)
-//sys	Utime(path string, buf *Utimbuf) (err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.bind
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.connect
-//sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
-//sys	munmap(addr uintptr, length uintptr) (err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.sendto
-//sys	socket(domain int, typ int, proto int) (fd int, err error) = libsocket.socket
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) = libsocket.socketpair
-//sys	write(fd int, p []byte) (n int, err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) = libsocket.getsockopt
-//sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = libsocket.getpeername
-//sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) = libsocket.setsockopt
-//sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) = libsocket.recvfrom
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-var mapper = &mmapper{
-	active: make(map[*byte][]byte),
-	mmap:   mmap,
-	munmap: munmap,
-}
-
-func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	return mapper.Mmap(fd, offset, length, prot, flags)
-}
-
-func Munmap(b []byte) (err error) {
-	return mapper.Munmap(b)
-}
-
-//sys	sysconf(name int) (n int64, err error)
-
-// pageSize caches the value of Getpagesize, since it can't change
-// once the system is booted.
-var pageSize int64 // accessed atomically
-
-func Getpagesize() int {
-	n := atomic.LoadInt64(&pageSize)
-	if n == 0 {
-		n, _ = sysconf(_SC_PAGESIZE)
-		atomic.StoreInt64(&pageSize, n)
-	}
-	return int(n)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go b/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
deleted file mode 100644
index 5aff62c3bb..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,solaris
-
-package unix
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3
-	tv.Sec = int64(nsec / 1e9)
-	return
-}
-
-func (iov *Iovec) SetLen(length int) {
-	iov.Len = uint64(length)
-}
-
-func (cmsg *Cmsghdr) SetLen(length int) {
-	cmsg.Len = uint32(length)
-}
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	// TODO(aram): implement this, see issue 5847.
-	panic("unimplemented")
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix.go b/vendor/golang.org/x/sys/unix/syscall_unix.go
deleted file mode 100644
index 8a5237de8a..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_unix.go
+++ /dev/null
@@ -1,292 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix
-
-import (
-	"runtime"
-	"sync"
-	"syscall"
-	"unsafe"
-)
-
-var (
-	Stdin  = 0
-	Stdout = 1
-	Stderr = 2
-)
-
-const (
-	darwin64Bit    = runtime.GOOS == "darwin" && sizeofPtr == 8
-	dragonfly64Bit = runtime.GOOS == "dragonfly" && sizeofPtr == 8
-	netbsd32Bit    = runtime.GOOS == "netbsd" && sizeofPtr == 4
-)
-
-// Do the interface allocations only once for common
-// Errno values.
-var (
-	errEAGAIN error = syscall.EAGAIN
-	errEINVAL error = syscall.EINVAL
-	errENOENT error = syscall.ENOENT
-)
-
-// errnoErr returns common boxed Errno values, to prevent
-// allocations at runtime.
-func errnoErr(e syscall.Errno) error {
-	switch e {
-	case 0:
-		return nil
-	case EAGAIN:
-		return errEAGAIN
-	case EINVAL:
-		return errEINVAL
-	case ENOENT:
-		return errENOENT
-	}
-	return e
-}
-
-// Mmap manager, for use by operating system-specific implementations.
-
-type mmapper struct {
-	sync.Mutex
-	active map[*byte][]byte // active mappings; key is last byte in mapping
-	mmap   func(addr, length uintptr, prot, flags, fd int, offset int64) (uintptr, error)
-	munmap func(addr uintptr, length uintptr) error
-}
-
-func (m *mmapper) Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, err error) {
-	if length <= 0 {
-		return nil, EINVAL
-	}
-
-	// Map the requested memory.
-	addr, errno := m.mmap(0, uintptr(length), prot, flags, fd, offset)
-	if errno != nil {
-		return nil, errno
-	}
-
-	// Slice memory layout
-	var sl = struct {
-		addr uintptr
-		len  int
-		cap  int
-	}{addr, length, length}
-
-	// Use unsafe to turn sl into a []byte.
-	b := *(*[]byte)(unsafe.Pointer(&sl))
-
-	// Register mapping in m and return it.
-	p := &b[cap(b)-1]
-	m.Lock()
-	defer m.Unlock()
-	m.active[p] = b
-	return b, nil
-}
-
-func (m *mmapper) Munmap(data []byte) (err error) {
-	if len(data) == 0 || len(data) != cap(data) {
-		return EINVAL
-	}
-
-	// Find the base of the mapping.
-	p := &data[cap(data)-1]
-	m.Lock()
-	defer m.Unlock()
-	b := m.active[p]
-	if b == nil || &b[0] != &data[0] {
-		return EINVAL
-	}
-
-	// Unmap the memory and update m.
-	if errno := m.munmap(uintptr(unsafe.Pointer(&b[0])), uintptr(len(b))); errno != nil {
-		return errno
-	}
-	delete(m.active, p)
-	return nil
-}
-
-func Read(fd int, p []byte) (n int, err error) {
-	n, err = read(fd, p)
-	if raceenabled {
-		if n > 0 {
-			raceWriteRange(unsafe.Pointer(&p[0]), n)
-		}
-		if err == nil {
-			raceAcquire(unsafe.Pointer(&ioSync))
-		}
-	}
-	return
-}
-
-func Write(fd int, p []byte) (n int, err error) {
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	n, err = write(fd, p)
-	if raceenabled && n > 0 {
-		raceReadRange(unsafe.Pointer(&p[0]), n)
-	}
-	return
-}
-
-// For testing: clients can set this flag to force
-// creation of IPv6 sockets to return EAFNOSUPPORT.
-var SocketDisableIPv6 bool
-
-type Sockaddr interface {
-	sockaddr() (ptr unsafe.Pointer, len _Socklen, err error) // lowercase; only we can define Sockaddrs
-}
-
-type SockaddrInet4 struct {
-	Port int
-	Addr [4]byte
-	raw  RawSockaddrInet4
-}
-
-type SockaddrInet6 struct {
-	Port   int
-	ZoneId uint32
-	Addr   [16]byte
-	raw    RawSockaddrInet6
-}
-
-type SockaddrUnix struct {
-	Name string
-	raw  RawSockaddrUnix
-}
-
-func Bind(fd int, sa Sockaddr) (err error) {
-	ptr, n, err := sa.sockaddr()
-	if err != nil {
-		return err
-	}
-	return bind(fd, ptr, n)
-}
-
-func Connect(fd int, sa Sockaddr) (err error) {
-	ptr, n, err := sa.sockaddr()
-	if err != nil {
-		return err
-	}
-	return connect(fd, ptr, n)
-}
-
-func Getpeername(fd int) (sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	if err = getpeername(fd, &rsa, &len); err != nil {
-		return
-	}
-	return anyToSockaddr(&rsa)
-}
-
-func GetsockoptInt(fd, level, opt int) (value int, err error) {
-	var n int32
-	vallen := _Socklen(4)
-	err = getsockopt(fd, level, opt, unsafe.Pointer(&n), &vallen)
-	return int(n), err
-}
-
-func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	var len _Socklen = SizeofSockaddrAny
-	if n, err = recvfrom(fd, p, flags, &rsa, &len); err != nil {
-		return
-	}
-	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(&rsa)
-	}
-	return
-}
-
-func Sendto(fd int, p []byte, flags int, to Sockaddr) (err error) {
-	ptr, n, err := to.sockaddr()
-	if err != nil {
-		return err
-	}
-	return sendto(fd, p, flags, ptr, n)
-}
-
-func SetsockoptByte(fd, level, opt int, value byte) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(&value), 1)
-}
-
-func SetsockoptInt(fd, level, opt int, value int) (err error) {
-	var n = int32(value)
-	return setsockopt(fd, level, opt, unsafe.Pointer(&n), 4)
-}
-
-func SetsockoptInet4Addr(fd, level, opt int, value [4]byte) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(&value[0]), 4)
-}
-
-func SetsockoptIPMreq(fd, level, opt int, mreq *IPMreq) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), SizeofIPMreq)
-}
-
-func SetsockoptIPv6Mreq(fd, level, opt int, mreq *IPv6Mreq) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), SizeofIPv6Mreq)
-}
-
-func SetsockoptICMPv6Filter(fd, level, opt int, filter *ICMPv6Filter) error {
-	return setsockopt(fd, level, opt, unsafe.Pointer(filter), SizeofICMPv6Filter)
-}
-
-func SetsockoptLinger(fd, level, opt int, l *Linger) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(l), SizeofLinger)
-}
-
-func SetsockoptString(fd, level, opt int, s string) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(&[]byte(s)[0]), uintptr(len(s)))
-}
-
-func SetsockoptTimeval(fd, level, opt int, tv *Timeval) (err error) {
-	return setsockopt(fd, level, opt, unsafe.Pointer(tv), unsafe.Sizeof(*tv))
-}
-
-func Socket(domain, typ, proto int) (fd int, err error) {
-	if domain == AF_INET6 && SocketDisableIPv6 {
-		return -1, EAFNOSUPPORT
-	}
-	fd, err = socket(domain, typ, proto)
-	return
-}
-
-func Socketpair(domain, typ, proto int) (fd [2]int, err error) {
-	var fdx [2]int32
-	err = socketpair(domain, typ, proto, &fdx)
-	if err == nil {
-		fd[0] = int(fdx[0])
-		fd[1] = int(fdx[1])
-	}
-	return
-}
-
-func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	return sendfile(outfd, infd, offset, count)
-}
-
-var ioSync int64
-
-func CloseOnExec(fd int) { fcntl(fd, F_SETFD, FD_CLOEXEC) }
-
-func SetNonblock(fd int, nonblocking bool) (err error) {
-	flag, err := fcntl(fd, F_GETFL, 0)
-	if err != nil {
-		return err
-	}
-	if nonblocking {
-		flag |= O_NONBLOCK
-	} else {
-		flag &= ^O_NONBLOCK
-	}
-	_, err = fcntl(fd, F_SETFL, flag)
-	return err
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix_gc.go b/vendor/golang.org/x/sys/unix/syscall_unix_gc.go
deleted file mode 100644
index 4cb8e8edf1..0000000000
--- a/vendor/golang.org/x/sys/unix/syscall_unix_gc.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-// +build !gccgo
-
-package unix
-
-import "syscall"
-
-func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno)
-func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
-func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno)
-func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/vendor/golang.org/x/sys/unix/types_darwin.go b/vendor/golang.org/x/sys/unix/types_darwin.go
deleted file mode 100644
index a3508174e4..0000000000
--- a/vendor/golang.org/x/sys/unix/types_darwin.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See README.md
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define __DARWIN_UNIX03 0
-#define KERNEL
-#define _DARWIN_USE_64_BIT_INODE
-#include <dirent.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <unistd.h>
-#include <mach/mach.h>
-#include <mach/message.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_var.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-#include <netinet/tcp.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-type Timeval32 C.struct_timeval32
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-type Stat_t C.struct_stat64
-
-type Statfs_t C.struct_statfs64
-
-type Flock_t C.struct_flock
-
-type Fstore_t C.struct_fstore
-
-type Radvisory_t C.struct_radvisory
-
-type Fbootstraptransfer_t C.struct_fbootstraptransfer
-
-type Log2phys_t C.struct_log2phys
-
-type Fsid C.struct_fsid
-
-type Dirent C.struct_dirent
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_sockaddr_un
-
-type RawSockaddrDatalink C.struct_sockaddr_dl
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet4Pktinfo C.struct_in_pktinfo
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-const (
-	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
-	SizeofLinger           = C.sizeof_struct_linger
-	SizeofIPMreq           = C.sizeof_struct_ip_mreq
-	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr           = C.sizeof_struct_msghdr
-	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
-	SizeofInet4Pktinfo     = C.sizeof_struct_in_pktinfo
-	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
-)
-
-// Ptrace requests
-
-const (
-	PTRACE_TRACEME = C.PT_TRACE_ME
-	PTRACE_CONT    = C.PT_CONTINUE
-	PTRACE_KILL    = C.PT_KILL
-)
-
-// Events (kqueue, kevent)
-
-type Kevent_t C.struct_kevent
-
-// Select
-
-type FdSet C.fd_set
-
-// Routing and interface messages
-
-const (
-	SizeofIfMsghdr    = C.sizeof_struct_if_msghdr
-	SizeofIfData      = C.sizeof_struct_if_data
-	SizeofIfaMsghdr   = C.sizeof_struct_ifa_msghdr
-	SizeofIfmaMsghdr  = C.sizeof_struct_ifma_msghdr
-	SizeofIfmaMsghdr2 = C.sizeof_struct_ifma_msghdr2
-	SizeofRtMsghdr    = C.sizeof_struct_rt_msghdr
-	SizeofRtMetrics   = C.sizeof_struct_rt_metrics
-)
-
-type IfMsghdr C.struct_if_msghdr
-
-type IfData C.struct_if_data
-
-type IfaMsghdr C.struct_ifa_msghdr
-
-type IfmaMsghdr C.struct_ifma_msghdr
-
-type IfmaMsghdr2 C.struct_ifma_msghdr2
-
-type RtMsghdr C.struct_rt_msghdr
-
-type RtMetrics C.struct_rt_metrics
-
-// Berkeley packet filter
-
-const (
-	SizeofBpfVersion = C.sizeof_struct_bpf_version
-	SizeofBpfStat    = C.sizeof_struct_bpf_stat
-	SizeofBpfProgram = C.sizeof_struct_bpf_program
-	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
-	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
-)
-
-type BpfVersion C.struct_bpf_version
-
-type BpfStat C.struct_bpf_stat
-
-type BpfProgram C.struct_bpf_program
-
-type BpfInsn C.struct_bpf_insn
-
-type BpfHdr C.struct_bpf_hdr
-
-// Terminal handling
-
-type Termios C.struct_termios
-
-// fchmodat-like syscalls.
-
-const (
-	AT_FDCWD            = C.AT_FDCWD
-	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
-)
diff --git a/vendor/golang.org/x/sys/unix/types_dragonfly.go b/vendor/golang.org/x/sys/unix/types_dragonfly.go
deleted file mode 100644
index a818704eb1..0000000000
--- a/vendor/golang.org/x/sys/unix/types_dragonfly.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See README.md
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define KERNEL
-#include <dirent.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-#include <netinet/tcp.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-const ( // Directory mode bits
-	S_IFMT   = C.S_IFMT
-	S_IFIFO  = C.S_IFIFO
-	S_IFCHR  = C.S_IFCHR
-	S_IFDIR  = C.S_IFDIR
-	S_IFBLK  = C.S_IFBLK
-	S_IFREG  = C.S_IFREG
-	S_IFLNK  = C.S_IFLNK
-	S_IFSOCK = C.S_IFSOCK
-	S_ISUID  = C.S_ISUID
-	S_ISGID  = C.S_ISGID
-	S_ISVTX  = C.S_ISVTX
-	S_IRUSR  = C.S_IRUSR
-	S_IWUSR  = C.S_IWUSR
-	S_IXUSR  = C.S_IXUSR
-)
-
-type Stat_t C.struct_stat
-
-type Statfs_t C.struct_statfs
-
-type Flock_t C.struct_flock
-
-type Dirent C.struct_dirent
-
-type Fsid C.struct_fsid
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_sockaddr_un
-
-type RawSockaddrDatalink C.struct_sockaddr_dl
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-const (
-	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
-	SizeofLinger           = C.sizeof_struct_linger
-	SizeofIPMreq           = C.sizeof_struct_ip_mreq
-	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr           = C.sizeof_struct_msghdr
-	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
-	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
-)
-
-// Ptrace requests
-
-const (
-	PTRACE_TRACEME = C.PT_TRACE_ME
-	PTRACE_CONT    = C.PT_CONTINUE
-	PTRACE_KILL    = C.PT_KILL
-)
-
-// Events (kqueue, kevent)
-
-type Kevent_t C.struct_kevent
-
-// Select
-
-type FdSet C.fd_set
-
-// Routing and interface messages
-
-const (
-	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr
-	SizeofIfData           = C.sizeof_struct_if_data
-	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
-	SizeofIfmaMsghdr       = C.sizeof_struct_ifma_msghdr
-	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
-	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
-	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
-)
-
-type IfMsghdr C.struct_if_msghdr
-
-type IfData C.struct_if_data
-
-type IfaMsghdr C.struct_ifa_msghdr
-
-type IfmaMsghdr C.struct_ifma_msghdr
-
-type IfAnnounceMsghdr C.struct_if_announcemsghdr
-
-type RtMsghdr C.struct_rt_msghdr
-
-type RtMetrics C.struct_rt_metrics
-
-// Berkeley packet filter
-
-const (
-	SizeofBpfVersion = C.sizeof_struct_bpf_version
-	SizeofBpfStat    = C.sizeof_struct_bpf_stat
-	SizeofBpfProgram = C.sizeof_struct_bpf_program
-	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
-	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
-)
-
-type BpfVersion C.struct_bpf_version
-
-type BpfStat C.struct_bpf_stat
-
-type BpfProgram C.struct_bpf_program
-
-type BpfInsn C.struct_bpf_insn
-
-type BpfHdr C.struct_bpf_hdr
-
-// Terminal handling
-
-type Termios C.struct_termios
diff --git a/vendor/golang.org/x/sys/unix/types_freebsd.go b/vendor/golang.org/x/sys/unix/types_freebsd.go
deleted file mode 100644
index 972e69a07c..0000000000
--- a/vendor/golang.org/x/sys/unix/types_freebsd.go
+++ /dev/null
@@ -1,353 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See README.md
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define KERNEL
-#include <dirent.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-#include <netinet/tcp.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-// This structure is a duplicate of stat on FreeBSD 8-STABLE.
-// See /usr/include/sys/stat.h.
-struct stat8 {
-#undef st_atimespec	st_atim
-#undef st_mtimespec	st_mtim
-#undef st_ctimespec	st_ctim
-#undef st_birthtimespec	st_birthtim
-	__dev_t   st_dev;
-	ino_t     st_ino;
-	mode_t    st_mode;
-	nlink_t   st_nlink;
-	uid_t     st_uid;
-	gid_t     st_gid;
-	__dev_t   st_rdev;
-#if __BSD_VISIBLE
-	struct  timespec st_atimespec;
-	struct  timespec st_mtimespec;
-	struct  timespec st_ctimespec;
-#else
-	time_t    st_atime;
-	long      __st_atimensec;
-	time_t    st_mtime;
-	long      __st_mtimensec;
-	time_t    st_ctime;
-	long      __st_ctimensec;
-#endif
-	off_t     st_size;
-	blkcnt_t st_blocks;
-	blksize_t st_blksize;
-	fflags_t  st_flags;
-	__uint32_t st_gen;
-	__int32_t st_lspare;
-#if __BSD_VISIBLE
-	struct timespec st_birthtimespec;
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-#else
-	time_t    st_birthtime;
-	long      st_birthtimensec;
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
-#endif
-};
-
-// This structure is a duplicate of if_data on FreeBSD 8-STABLE.
-// See /usr/include/net/if.h.
-struct if_data8 {
-	u_char  ifi_type;
-	u_char  ifi_physical;
-	u_char  ifi_addrlen;
-	u_char  ifi_hdrlen;
-	u_char  ifi_link_state;
-	u_char  ifi_spare_char1;
-	u_char  ifi_spare_char2;
-	u_char  ifi_datalen;
-	u_long  ifi_mtu;
-	u_long  ifi_metric;
-	u_long  ifi_baudrate;
-	u_long  ifi_ipackets;
-	u_long  ifi_ierrors;
-	u_long  ifi_opackets;
-	u_long  ifi_oerrors;
-	u_long  ifi_collisions;
-	u_long  ifi_ibytes;
-	u_long  ifi_obytes;
-	u_long  ifi_imcasts;
-	u_long  ifi_omcasts;
-	u_long  ifi_iqdrops;
-	u_long  ifi_noproto;
-	u_long  ifi_hwassist;
-	time_t  ifi_epoch;
-	struct  timeval ifi_lastchange;
-};
-
-// This structure is a duplicate of if_msghdr on FreeBSD 8-STABLE.
-// See /usr/include/net/if.h.
-struct if_msghdr8 {
-	u_short ifm_msglen;
-	u_char  ifm_version;
-	u_char  ifm_type;
-	int     ifm_addrs;
-	int     ifm_flags;
-	u_short ifm_index;
-	struct  if_data8 ifm_data;
-};
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-const ( // Directory mode bits
-	S_IFMT   = C.S_IFMT
-	S_IFIFO  = C.S_IFIFO
-	S_IFCHR  = C.S_IFCHR
-	S_IFDIR  = C.S_IFDIR
-	S_IFBLK  = C.S_IFBLK
-	S_IFREG  = C.S_IFREG
-	S_IFLNK  = C.S_IFLNK
-	S_IFSOCK = C.S_IFSOCK
-	S_ISUID  = C.S_ISUID
-	S_ISGID  = C.S_ISGID
-	S_ISVTX  = C.S_ISVTX
-	S_IRUSR  = C.S_IRUSR
-	S_IWUSR  = C.S_IWUSR
-	S_IXUSR  = C.S_IXUSR
-)
-
-type Stat_t C.struct_stat8
-
-type Statfs_t C.struct_statfs
-
-type Flock_t C.struct_flock
-
-type Dirent C.struct_dirent
-
-type Fsid C.struct_fsid
-
-// Advice to Fadvise
-
-const (
-	FADV_NORMAL     = C.POSIX_FADV_NORMAL
-	FADV_RANDOM     = C.POSIX_FADV_RANDOM
-	FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL
-	FADV_WILLNEED   = C.POSIX_FADV_WILLNEED
-	FADV_DONTNEED   = C.POSIX_FADV_DONTNEED
-	FADV_NOREUSE    = C.POSIX_FADV_NOREUSE
-)
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_sockaddr_un
-
-type RawSockaddrDatalink C.struct_sockaddr_dl
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPMreqn C.struct_ip_mreqn
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-const (
-	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
-	SizeofLinger           = C.sizeof_struct_linger
-	SizeofIPMreq           = C.sizeof_struct_ip_mreq
-	SizeofIPMreqn          = C.sizeof_struct_ip_mreqn
-	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr           = C.sizeof_struct_msghdr
-	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
-	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
-)
-
-// Ptrace requests
-
-const (
-	PTRACE_TRACEME = C.PT_TRACE_ME
-	PTRACE_CONT    = C.PT_CONTINUE
-	PTRACE_KILL    = C.PT_KILL
-)
-
-// Events (kqueue, kevent)
-
-type Kevent_t C.struct_kevent
-
-// Select
-
-type FdSet C.fd_set
-
-// Routing and interface messages
-
-const (
-	sizeofIfMsghdr         = C.sizeof_struct_if_msghdr
-	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr8
-	sizeofIfData           = C.sizeof_struct_if_data
-	SizeofIfData           = C.sizeof_struct_if_data8
-	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
-	SizeofIfmaMsghdr       = C.sizeof_struct_ifma_msghdr
-	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
-	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
-	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
-)
-
-type ifMsghdr C.struct_if_msghdr
-
-type IfMsghdr C.struct_if_msghdr8
-
-type ifData C.struct_if_data
-
-type IfData C.struct_if_data8
-
-type IfaMsghdr C.struct_ifa_msghdr
-
-type IfmaMsghdr C.struct_ifma_msghdr
-
-type IfAnnounceMsghdr C.struct_if_announcemsghdr
-
-type RtMsghdr C.struct_rt_msghdr
-
-type RtMetrics C.struct_rt_metrics
-
-// Berkeley packet filter
-
-const (
-	SizeofBpfVersion    = C.sizeof_struct_bpf_version
-	SizeofBpfStat       = C.sizeof_struct_bpf_stat
-	SizeofBpfZbuf       = C.sizeof_struct_bpf_zbuf
-	SizeofBpfProgram    = C.sizeof_struct_bpf_program
-	SizeofBpfInsn       = C.sizeof_struct_bpf_insn
-	SizeofBpfHdr        = C.sizeof_struct_bpf_hdr
-	SizeofBpfZbufHeader = C.sizeof_struct_bpf_zbuf_header
-)
-
-type BpfVersion C.struct_bpf_version
-
-type BpfStat C.struct_bpf_stat
-
-type BpfZbuf C.struct_bpf_zbuf
-
-type BpfProgram C.struct_bpf_program
-
-type BpfInsn C.struct_bpf_insn
-
-type BpfHdr C.struct_bpf_hdr
-
-type BpfZbufHeader C.struct_bpf_zbuf_header
-
-// Terminal handling
-
-type Termios C.struct_termios
diff --git a/vendor/golang.org/x/sys/unix/types_netbsd.go b/vendor/golang.org/x/sys/unix/types_netbsd.go
deleted file mode 100644
index 7cfdb9cd4b..0000000000
--- a/vendor/golang.org/x/sys/unix/types_netbsd.go
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See README.md
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define KERNEL
-#include <dirent.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-#include <netinet/tcp.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-type Stat_t C.struct_stat
-
-type Statfs_t C.struct_statfs
-
-type Flock_t C.struct_flock
-
-type Dirent C.struct_dirent
-
-type Fsid C.fsid_t
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_sockaddr_un
-
-type RawSockaddrDatalink C.struct_sockaddr_dl
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-const (
-	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
-	SizeofLinger           = C.sizeof_struct_linger
-	SizeofIPMreq           = C.sizeof_struct_ip_mreq
-	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr           = C.sizeof_struct_msghdr
-	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
-	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
-)
-
-// Ptrace requests
-
-const (
-	PTRACE_TRACEME = C.PT_TRACE_ME
-	PTRACE_CONT    = C.PT_CONTINUE
-	PTRACE_KILL    = C.PT_KILL
-)
-
-// Events (kqueue, kevent)
-
-type Kevent_t C.struct_kevent
-
-// Select
-
-type FdSet C.fd_set
-
-// Routing and interface messages
-
-const (
-	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr
-	SizeofIfData           = C.sizeof_struct_if_data
-	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
-	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
-	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
-	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
-)
-
-type IfMsghdr C.struct_if_msghdr
-
-type IfData C.struct_if_data
-
-type IfaMsghdr C.struct_ifa_msghdr
-
-type IfAnnounceMsghdr C.struct_if_announcemsghdr
-
-type RtMsghdr C.struct_rt_msghdr
-
-type RtMetrics C.struct_rt_metrics
-
-type Mclpool C.struct_mclpool
-
-// Berkeley packet filter
-
-const (
-	SizeofBpfVersion = C.sizeof_struct_bpf_version
-	SizeofBpfStat    = C.sizeof_struct_bpf_stat
-	SizeofBpfProgram = C.sizeof_struct_bpf_program
-	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
-	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
-)
-
-type BpfVersion C.struct_bpf_version
-
-type BpfStat C.struct_bpf_stat
-
-type BpfProgram C.struct_bpf_program
-
-type BpfInsn C.struct_bpf_insn
-
-type BpfHdr C.struct_bpf_hdr
-
-type BpfTimeval C.struct_bpf_timeval
-
-// Terminal handling
-
-type Termios C.struct_termios
-
-// Sysctl
-
-type Sysctlnode C.struct_sysctlnode
diff --git a/vendor/golang.org/x/sys/unix/types_openbsd.go b/vendor/golang.org/x/sys/unix/types_openbsd.go
deleted file mode 100644
index 6c7c227958..0000000000
--- a/vendor/golang.org/x/sys/unix/types_openbsd.go
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See README.md
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define KERNEL
-#include <dirent.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <termios.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-#include <netinet/tcp.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-const ( // Directory mode bits
-	S_IFMT   = C.S_IFMT
-	S_IFIFO  = C.S_IFIFO
-	S_IFCHR  = C.S_IFCHR
-	S_IFDIR  = C.S_IFDIR
-	S_IFBLK  = C.S_IFBLK
-	S_IFREG  = C.S_IFREG
-	S_IFLNK  = C.S_IFLNK
-	S_IFSOCK = C.S_IFSOCK
-	S_ISUID  = C.S_ISUID
-	S_ISGID  = C.S_ISGID
-	S_ISVTX  = C.S_ISVTX
-	S_IRUSR  = C.S_IRUSR
-	S_IWUSR  = C.S_IWUSR
-	S_IXUSR  = C.S_IXUSR
-)
-
-type Stat_t C.struct_stat
-
-type Statfs_t C.struct_statfs
-
-type Flock_t C.struct_flock
-
-type Dirent C.struct_dirent
-
-type Fsid C.fsid_t
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_sockaddr_un
-
-type RawSockaddrDatalink C.struct_sockaddr_dl
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-const (
-	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
-	SizeofLinger           = C.sizeof_struct_linger
-	SizeofIPMreq           = C.sizeof_struct_ip_mreq
-	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr           = C.sizeof_struct_msghdr
-	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
-	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
-)
-
-// Ptrace requests
-
-const (
-	PTRACE_TRACEME = C.PT_TRACE_ME
-	PTRACE_CONT    = C.PT_CONTINUE
-	PTRACE_KILL    = C.PT_KILL
-)
-
-// Events (kqueue, kevent)
-
-type Kevent_t C.struct_kevent
-
-// Select
-
-type FdSet C.fd_set
-
-// Routing and interface messages
-
-const (
-	SizeofIfMsghdr         = C.sizeof_struct_if_msghdr
-	SizeofIfData           = C.sizeof_struct_if_data
-	SizeofIfaMsghdr        = C.sizeof_struct_ifa_msghdr
-	SizeofIfAnnounceMsghdr = C.sizeof_struct_if_announcemsghdr
-	SizeofRtMsghdr         = C.sizeof_struct_rt_msghdr
-	SizeofRtMetrics        = C.sizeof_struct_rt_metrics
-)
-
-type IfMsghdr C.struct_if_msghdr
-
-type IfData C.struct_if_data
-
-type IfaMsghdr C.struct_ifa_msghdr
-
-type IfAnnounceMsghdr C.struct_if_announcemsghdr
-
-type RtMsghdr C.struct_rt_msghdr
-
-type RtMetrics C.struct_rt_metrics
-
-type Mclpool C.struct_mclpool
-
-// Berkeley packet filter
-
-const (
-	SizeofBpfVersion = C.sizeof_struct_bpf_version
-	SizeofBpfStat    = C.sizeof_struct_bpf_stat
-	SizeofBpfProgram = C.sizeof_struct_bpf_program
-	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
-	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
-)
-
-type BpfVersion C.struct_bpf_version
-
-type BpfStat C.struct_bpf_stat
-
-type BpfProgram C.struct_bpf_program
-
-type BpfInsn C.struct_bpf_insn
-
-type BpfHdr C.struct_bpf_hdr
-
-type BpfTimeval C.struct_bpf_timeval
-
-// Terminal handling
-
-type Termios C.struct_termios
diff --git a/vendor/golang.org/x/sys/unix/types_solaris.go b/vendor/golang.org/x/sys/unix/types_solaris.go
deleted file mode 100644
index 69bf1bc4a3..0000000000
--- a/vendor/golang.org/x/sys/unix/types_solaris.go
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See README.md
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define KERNEL
-// These defines ensure that builds done on newer versions of Solaris are
-// backwards-compatible with older versions of Solaris and
-// OpenSolaris-based derivatives.
-#define __USE_SUNOS_SOCKETS__          // msghdr
-#define __USE_LEGACY_PROTOTYPES__      // iovec
-#include <dirent.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <limits.h>
-#include <signal.h>
-#include <termios.h>
-#include <termio.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-#include <netinet/tcp.h>
-#include <ustat.h>
-#include <utime.h>
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_dl s5;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-	PathMax        = C.PATH_MAX
-	MaxHostNameLen = C.MAXHOSTNAMELEN
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-type Timeval32 C.struct_timeval32
-
-type Tms C.struct_tms
-
-type Utimbuf C.struct_utimbuf
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-const ( // Directory mode bits
-	S_IFMT   = C.S_IFMT
-	S_IFIFO  = C.S_IFIFO
-	S_IFCHR  = C.S_IFCHR
-	S_IFDIR  = C.S_IFDIR
-	S_IFBLK  = C.S_IFBLK
-	S_IFREG  = C.S_IFREG
-	S_IFLNK  = C.S_IFLNK
-	S_IFSOCK = C.S_IFSOCK
-	S_ISUID  = C.S_ISUID
-	S_ISGID  = C.S_ISGID
-	S_ISVTX  = C.S_ISVTX
-	S_IRUSR  = C.S_IRUSR
-	S_IWUSR  = C.S_IWUSR
-	S_IXUSR  = C.S_IXUSR
-)
-
-type Stat_t C.struct_stat
-
-type Flock_t C.struct_flock
-
-type Dirent C.struct_dirent
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_sockaddr_un
-
-type RawSockaddrDatalink C.struct_sockaddr_dl
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-const (
-	SizeofSockaddrInet4    = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6    = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny      = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix     = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrDatalink = C.sizeof_struct_sockaddr_dl
-	SizeofLinger           = C.sizeof_struct_linger
-	SizeofIPMreq           = C.sizeof_struct_ip_mreq
-	SizeofIPv6Mreq         = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr           = C.sizeof_struct_msghdr
-	SizeofCmsghdr          = C.sizeof_struct_cmsghdr
-	SizeofInet6Pktinfo     = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo      = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter     = C.sizeof_struct_icmp6_filter
-)
-
-// Select
-
-type FdSet C.fd_set
-
-// Misc
-
-type Utsname C.struct_utsname
-
-type Ustat_t C.struct_ustat
-
-const (
-	AT_FDCWD            = C.AT_FDCWD
-	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
-	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
-	AT_REMOVEDIR        = C.AT_REMOVEDIR
-	AT_EACCESS          = C.AT_EACCESS
-)
-
-// Routing and interface messages
-
-const (
-	SizeofIfMsghdr  = C.sizeof_struct_if_msghdr
-	SizeofIfData    = C.sizeof_struct_if_data
-	SizeofIfaMsghdr = C.sizeof_struct_ifa_msghdr
-	SizeofRtMsghdr  = C.sizeof_struct_rt_msghdr
-	SizeofRtMetrics = C.sizeof_struct_rt_metrics
-)
-
-type IfMsghdr C.struct_if_msghdr
-
-type IfData C.struct_if_data
-
-type IfaMsghdr C.struct_ifa_msghdr
-
-type RtMsghdr C.struct_rt_msghdr
-
-type RtMetrics C.struct_rt_metrics
-
-// Berkeley packet filter
-
-const (
-	SizeofBpfVersion = C.sizeof_struct_bpf_version
-	SizeofBpfStat    = C.sizeof_struct_bpf_stat
-	SizeofBpfProgram = C.sizeof_struct_bpf_program
-	SizeofBpfInsn    = C.sizeof_struct_bpf_insn
-	SizeofBpfHdr     = C.sizeof_struct_bpf_hdr
-)
-
-type BpfVersion C.struct_bpf_version
-
-type BpfStat C.struct_bpf_stat
-
-type BpfProgram C.struct_bpf_program
-
-type BpfInsn C.struct_bpf_insn
-
-type BpfTimeval C.struct_bpf_timeval
-
-type BpfHdr C.struct_bpf_hdr
-
-// sysconf information
-
-const _SC_PAGESIZE = C._SC_PAGESIZE
-
-// Terminal handling
-
-type Termios C.struct_termios
-
-type Termio C.struct_termio
-
-type Winsize C.struct_winsize
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
deleted file mode 100644
index 8e63888351..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
+++ /dev/null
@@ -1,1576 +0,0 @@
-// mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,darwin
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m32 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1c
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1e
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1c
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x28
-	AF_NATM                           = 0x1f
-	AF_NDRV                           = 0x1b
-	AF_NETBIOS                        = 0x21
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PPP                            = 0x22
-	AF_PUP                            = 0x4
-	AF_RESERVED_36                    = 0x24
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x18
-	AF_SNA                            = 0xb
-	AF_SYSTEM                         = 0x20
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_UTUN                           = 0x26
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc00c4279
-	BIOCGETIF                         = 0x4020426b
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4008426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044278
-	BIOCSETF                          = 0x80084267
-	BIOCSETFNR                        = 0x8008427e
-	BIOCSETIF                         = 0x8020426c
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8008426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf5
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_MACHPORT                   = -0x8
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xe
-	EVFILT_THREADMARKER               = 0xe
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xa
-	EVFILT_VM                         = -0xc
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG0                          = 0x1000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_OOBAND                         = 0x2000
-	EV_POLL                           = 0x1000
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_ADDFILESIGS                     = 0x3d
-	F_ADDSIGS                         = 0x3b
-	F_ALLOCATEALL                     = 0x4
-	F_ALLOCATECONTIG                  = 0x2
-	F_CHKCLEAN                        = 0x29
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x43
-	F_FINDSIGS                        = 0x4e
-	F_FLUSH_DATA                      = 0x28
-	F_FREEZE_FS                       = 0x35
-	F_FULLFSYNC                       = 0x33
-	F_GETCODEDIR                      = 0x48
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETLKPID                        = 0x42
-	F_GETNOSIGPIPE                    = 0x4a
-	F_GETOWN                          = 0x5
-	F_GETPATH                         = 0x32
-	F_GETPATH_MTMINFO                 = 0x47
-	F_GETPROTECTIONCLASS              = 0x3f
-	F_GETPROTECTIONLEVEL              = 0x4d
-	F_GLOBAL_NOCACHE                  = 0x37
-	F_LOG2PHYS                        = 0x31
-	F_LOG2PHYS_EXT                    = 0x41
-	F_NOCACHE                         = 0x30
-	F_NODIRECT                        = 0x3e
-	F_OK                              = 0x0
-	F_PATHPKG_CHECK                   = 0x34
-	F_PEOFPOSMODE                     = 0x3
-	F_PREALLOCATE                     = 0x2a
-	F_RDADVISE                        = 0x2c
-	F_RDAHEAD                         = 0x2d
-	F_RDLCK                           = 0x1
-	F_SETBACKINGSTORE                 = 0x46
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETLKWTIMEOUT                   = 0xa
-	F_SETNOSIGPIPE                    = 0x49
-	F_SETOWN                          = 0x6
-	F_SETPROTECTIONCLASS              = 0x40
-	F_SETSIZE                         = 0x2b
-	F_SINGLE_WRITER                   = 0x4c
-	F_THAW_FS                         = 0x36
-	F_TRANSCODEKEY                    = 0x4b
-	F_UNLCK                           = 0x2
-	F_VOLPOSMODE                      = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_AAL5                          = 0x31
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ATM                           = 0x25
-	IFT_BRIDGE                        = 0xd1
-	IFT_CARP                          = 0xf8
-	IFT_CELLULAR                      = 0xff
-	IFT_CEPT                          = 0x13
-	IFT_DS3                           = 0x1e
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0x38
-	IFT_FDDI                          = 0xf
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_GIF                           = 0x37
-	IFT_HDH1822                       = 0x3
-	IFT_HIPPI                         = 0x2f
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE8023ADLAG                 = 0x88
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88026                      = 0xa
-	IFT_L2VLAN                        = 0x87
-	IFT_LAPB                          = 0x10
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_NSIP                          = 0x1b
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PDP                           = 0xff
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PKTAP                         = 0xfe
-	IFT_PPP                           = 0x17
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PTPSERIAL                     = 0x16
-	IFT_RS232                         = 0x21
-	IFT_SDLC                          = 0x11
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0x39
-	IFT_T1                            = 0x12
-	IFT_ULTRA                         = 0x1d
-	IFT_V35                           = 0x2d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LINKLOCALNETNUM                = 0xa9fe0000
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0xfe
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_2292DSTOPTS                  = 0x17
-	IPV6_2292HOPLIMIT                 = 0x14
-	IPV6_2292HOPOPTS                  = 0x16
-	IPV6_2292NEXTHOP                  = 0x15
-	IPV6_2292PKTINFO                  = 0x13
-	IPV6_2292PKTOPTIONS               = 0x19
-	IPV6_2292RTHDR                    = 0x18
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_BOUND_IF                     = 0x7d
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x3c
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVTCLASS                   = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x24
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_BOUND_IF                       = 0x19
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW_ADD                         = 0x28
-	IP_FW_DEL                         = 0x29
-	IP_FW_FLUSH                       = 0x2a
-	IP_FW_GET                         = 0x2c
-	IP_FW_RESETLOG                    = 0x2d
-	IP_FW_ZERO                        = 0x2b
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MF                             = 0x2000
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_IFINDEX              = 0x42
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_NAT__XXX                       = 0x37
-	IP_OFFMASK                        = 0x1fff
-	IP_OLD_FW_ADD                     = 0x32
-	IP_OLD_FW_DEL                     = 0x33
-	IP_OLD_FW_FLUSH                   = 0x34
-	IP_OLD_FW_GET                     = 0x36
-	IP_OLD_FW_RESETLOG                = 0x38
-	IP_OLD_FW_ZERO                    = 0x35
-	IP_OPTIONS                        = 0x1
-	IP_PKTINFO                        = 0x1a
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVPKTINFO                    = 0x1a
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x18
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_STRIPHDR                       = 0x17
-	IP_TOS                            = 0x3
-	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IUTF8                             = 0x4000
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_CAN_REUSE                    = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_FREE_REUSABLE                = 0x7
-	MADV_FREE_REUSE                   = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MADV_ZERO_WIRED_PAGES             = 0x6
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_JIT                           = 0x800
-	MAP_NOCACHE                       = 0x400
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_SHARED                        = 0x1
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_FLUSH                         = 0x400
-	MSG_HAVEMORE                      = 0x2000
-	MSG_HOLD                          = 0x800
-	MSG_NEEDSA                        = 0x10000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_RCVMORE                       = 0x4000
-	MSG_SEND                          = 0x1000
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MSG_WAITSTREAM                    = 0x200
-	MS_ASYNC                          = 0x1
-	MS_DEACTIVATE                     = 0x8
-	MS_INVALIDATE                     = 0x2
-	MS_KILLPAGES                      = 0x4
-	MS_SYNC                           = 0x10
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_DUMP2                      = 0x7
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLIST2                    = 0x6
-	NET_RT_MAXID                      = 0xa
-	NET_RT_STAT                       = 0x4
-	NET_RT_TRASH                      = 0x5
-	NOFLSH                            = 0x80000000
-	NOTE_ABSOLUTE                     = 0x8
-	NOTE_ATTRIB                       = 0x8
-	NOTE_BACKGROUND                   = 0x40
-	NOTE_CHILD                        = 0x4
-	NOTE_CRITICAL                     = 0x20
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXITSTATUS                   = 0x4000000
-	NOTE_EXIT_CSERROR                 = 0x40000
-	NOTE_EXIT_DECRYPTFAIL             = 0x10000
-	NOTE_EXIT_DETAIL                  = 0x2000000
-	NOTE_EXIT_DETAIL_MASK             = 0x70000
-	NOTE_EXIT_MEMORY                  = 0x20000
-	NOTE_EXIT_REPARENTED              = 0x80000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LEEWAY                       = 0x10
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_NONE                         = 0x80
-	NOTE_NSECONDS                     = 0x4
-	NOTE_PCTRLMASK                    = -0x100000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_REAP                         = 0x10000000
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_SECONDS                      = 0x1
-	NOTE_SIGNAL                       = 0x8000000
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_USECONDS                     = 0x2
-	NOTE_VM_ERROR                     = 0x10000000
-	NOTE_VM_PRESSURE                  = 0x80000000
-	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
-	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFDEL                             = 0x20000
-	OFILL                             = 0x80
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALERT                           = 0x20000000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x1000000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x100000
-	O_DP_GETRAWENCRYPTED              = 0x1
-	O_DSYNC                           = 0x400000
-	O_EVTONLY                         = 0x8000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x20000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_POPUP                           = 0x80000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYMLINK                         = 0x200000
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	PT_ATTACH                         = 0xa
-	PT_ATTACHEXC                      = 0xe
-	PT_CONTINUE                       = 0x7
-	PT_DENY_ATTACH                    = 0x1f
-	PT_DETACH                         = 0xb
-	PT_FIRSTMACH                      = 0x20
-	PT_FORCEQUOTA                     = 0x1e
-	PT_KILL                           = 0x8
-	PT_READ_D                         = 0x2
-	PT_READ_I                         = 0x1
-	PT_READ_U                         = 0x3
-	PT_SIGEXC                         = 0xc
-	PT_STEP                           = 0x9
-	PT_THUPDATE                       = 0xd
-	PT_TRACE_ME                       = 0x0
-	PT_WRITE_D                        = 0x5
-	PT_WRITE_I                        = 0x4
-	PT_WRITE_U                        = 0x6
-	RLIMIT_AS                         = 0x5
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_CPU_USAGE_MONITOR          = 0x2
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CLONING                       = 0x100
-	RTF_CONDEMNED                     = 0x2000000
-	RTF_DELCLONE                      = 0x80
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_IFREF                         = 0x4000000
-	RTF_IFSCOPE                       = 0x1000000
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_NOIFREF                       = 0x2000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_PROXY                         = 0x8000000
-	RTF_REJECT                        = 0x8
-	RTF_ROUTER                        = 0x10000000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_WASCLONED                     = 0x20000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_GET2                          = 0x14
-	RTM_IFINFO                        = 0xe
-	RTM_IFINFO2                       = 0x12
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_NEWMADDR2                     = 0x13
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SCM_TIMESTAMP_MONOTONIC           = 0x4
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCARPIPLL                       = 0xc0206928
-	SIOCATMARK                        = 0x40047307
-	SIOCAUTOADDR                      = 0xc0206926
-	SIOCAUTONETMASK                   = 0x80206927
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFPHYADDR                    = 0x80206941
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETVLAN                       = 0xc020697f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFALTMTU                     = 0xc0206948
-	SIOCGIFASYNCMAP                   = 0xc020697c
-	SIOCGIFBOND                       = 0xc0206947
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020695b
-	SIOCGIFCONF                       = 0xc0086924
-	SIOCGIFDEVMTU                     = 0xc0206944
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFKPI                        = 0xc0206987
-	SIOCGIFMAC                        = 0xc0206982
-	SIOCGIFMEDIA                      = 0xc0286938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206940
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc020693f
-	SIOCGIFSTATUS                     = 0xc331693d
-	SIOCGIFVLAN                       = 0xc020697f
-	SIOCGIFWAKEFLAGS                  = 0xc0206988
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCIFCREATE                      = 0xc0206978
-	SIOCIFCREATE2                     = 0xc020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc00c6981
-	SIOCRSLVMULTI                     = 0xc008693b
-	SIOCSDRVSPEC                      = 0x801c697b
-	SIOCSETVLAN                       = 0x8020697e
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFALTMTU                     = 0x80206945
-	SIOCSIFASYNCMAP                   = 0x8020697d
-	SIOCSIFBOND                       = 0x80206946
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020695a
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFKPI                        = 0x80206986
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206983
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x8040693e
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFVLAN                       = 0x8020697e
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_DONTTRUNC                      = 0x2000
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1010
-	SO_LINGER                         = 0x80
-	SO_LINGER_SEC                     = 0x1080
-	SO_NKE                            = 0x1021
-	SO_NOADDRERR                      = 0x1023
-	SO_NOSIGPIPE                      = 0x1022
-	SO_NOTIFYCONFLICT                 = 0x1026
-	SO_NP_EXTENSIONS                  = 0x1083
-	SO_NREAD                          = 0x1020
-	SO_NUMRCVPKT                      = 0x1112
-	SO_NWRITE                         = 0x1024
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1011
-	SO_RANDOMPORT                     = 0x1082
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_REUSESHAREUID                  = 0x1025
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TIMESTAMP_MONOTONIC            = 0x800
-	SO_TYPE                           = 0x1008
-	SO_UPCALLCLOSEWAIT                = 0x1027
-	SO_USELOOPBACK                    = 0x40
-	SO_WANTMORE                       = 0x4000
-	SO_WANTOOBFLAG                    = 0x8000
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONNECTIONTIMEOUT             = 0x20
-	TCP_ENABLE_ECN                    = 0x104
-	TCP_KEEPALIVE                     = 0x10
-	TCP_KEEPCNT                       = 0x102
-	TCP_KEEPINTVL                     = 0x101
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_NOTSENT_LOWAT                 = 0x201
-	TCP_RXT_CONNDROPTIME              = 0x80
-	TCP_RXT_FINDROP                   = 0x100
-	TCP_SENDMOREACKS                  = 0x103
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40087458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCDSIMICROCODE                  = 0x20007455
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGWINSZ                        = 0x40087468
-	TIOCIXOFF                         = 0x20007480
-	TIOCIXON                          = 0x20007481
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x40047403
-	TIOCMODS                          = 0x80047404
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTYGNAME                      = 0x40807453
-	TIOCPTYGRANT                      = 0x20007454
-	TIOCPTYUNLK                       = 0x20007452
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCONS                         = 0x20007463
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2000745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40087459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VT0                               = 0x0
-	VT1                               = 0x10000
-	VTDLY                             = 0x10000
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x10
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x4
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x20
-	WORDSIZE                          = 0x20
-	WSTOPPED                          = 0x8
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADARCH        = syscall.Errno(0x56)
-	EBADEXEC        = syscall.Errno(0x55)
-	EBADF           = syscall.Errno(0x9)
-	EBADMACHO       = syscall.Errno(0x58)
-	EBADMSG         = syscall.Errno(0x5e)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x59)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDEVERR         = syscall.Errno(0x53)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x5a)
-	EILSEQ          = syscall.Errno(0x5c)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x6a)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5f)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x60)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x61)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5b)
-	ENOPOLICY       = syscall.Errno(0x67)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x62)
-	ENOSTR          = syscall.Errno(0x63)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x68)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x66)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x69)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x64)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	EPWROFF         = syscall.Errno(0x52)
-	EQFULL          = syscall.Errno(0x6a)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHLIBVERS      = syscall.Errno(0x57)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x65)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "device not configured",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource deadlock avoided",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "resource busy",
-	17:  "file exists",
-	18:  "cross-device link",
-	19:  "operation not supported by device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "result too large",
-	35:  "resource temporarily unavailable",
-	36:  "operation now in progress",
-	37:  "operation already in progress",
-	38:  "socket operation on non-socket",
-	39:  "destination address required",
-	40:  "message too long",
-	41:  "protocol wrong type for socket",
-	42:  "protocol not available",
-	43:  "protocol not supported",
-	44:  "socket type not supported",
-	45:  "operation not supported",
-	46:  "protocol family not supported",
-	47:  "address family not supported by protocol family",
-	48:  "address already in use",
-	49:  "can't assign requested address",
-	50:  "network is down",
-	51:  "network is unreachable",
-	52:  "network dropped connection on reset",
-	53:  "software caused connection abort",
-	54:  "connection reset by peer",
-	55:  "no buffer space available",
-	56:  "socket is already connected",
-	57:  "socket is not connected",
-	58:  "can't send after socket shutdown",
-	59:  "too many references: can't splice",
-	60:  "operation timed out",
-	61:  "connection refused",
-	62:  "too many levels of symbolic links",
-	63:  "file name too long",
-	64:  "host is down",
-	65:  "no route to host",
-	66:  "directory not empty",
-	67:  "too many processes",
-	68:  "too many users",
-	69:  "disc quota exceeded",
-	70:  "stale NFS file handle",
-	71:  "too many levels of remote in path",
-	72:  "RPC struct is bad",
-	73:  "RPC version wrong",
-	74:  "RPC prog. not avail",
-	75:  "program version wrong",
-	76:  "bad procedure for program",
-	77:  "no locks available",
-	78:  "function not implemented",
-	79:  "inappropriate file type or format",
-	80:  "authentication error",
-	81:  "need authenticator",
-	82:  "device power is off",
-	83:  "device error",
-	84:  "value too large to be stored in data type",
-	85:  "bad executable (or shared library)",
-	86:  "bad CPU type in executable",
-	87:  "shared library version mismatch",
-	88:  "malformed Mach-o file",
-	89:  "operation canceled",
-	90:  "identifier removed",
-	91:  "no message of desired type",
-	92:  "illegal byte sequence",
-	93:  "attribute not found",
-	94:  "bad message",
-	95:  "EMULTIHOP (Reserved)",
-	96:  "no message available on STREAM",
-	97:  "ENOLINK (Reserved)",
-	98:  "no STREAM resources",
-	99:  "not a STREAM",
-	100: "protocol error",
-	101: "STREAM ioctl timeout",
-	102: "operation not supported on socket",
-	103: "policy not found",
-	104: "state not recoverable",
-	105: "previous owner died",
-	106: "interface output queue is full",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
deleted file mode 100644
index 9594f93817..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
+++ /dev/null
@@ -1,1576 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,darwin
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1c
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1e
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1c
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x28
-	AF_NATM                           = 0x1f
-	AF_NDRV                           = 0x1b
-	AF_NETBIOS                        = 0x21
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PPP                            = 0x22
-	AF_PUP                            = 0x4
-	AF_RESERVED_36                    = 0x24
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x18
-	AF_SNA                            = 0xb
-	AF_SYSTEM                         = 0x20
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_UTUN                           = 0x26
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc00c4279
-	BIOCGETIF                         = 0x4020426b
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044278
-	BIOCSETF                          = 0x80104267
-	BIOCSETFNR                        = 0x8010427e
-	BIOCSETIF                         = 0x8020426c
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf5
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_MACHPORT                   = -0x8
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xe
-	EVFILT_THREADMARKER               = 0xe
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xa
-	EVFILT_VM                         = -0xc
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG0                          = 0x1000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_OOBAND                         = 0x2000
-	EV_POLL                           = 0x1000
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_ADDFILESIGS                     = 0x3d
-	F_ADDSIGS                         = 0x3b
-	F_ALLOCATEALL                     = 0x4
-	F_ALLOCATECONTIG                  = 0x2
-	F_CHKCLEAN                        = 0x29
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x43
-	F_FINDSIGS                        = 0x4e
-	F_FLUSH_DATA                      = 0x28
-	F_FREEZE_FS                       = 0x35
-	F_FULLFSYNC                       = 0x33
-	F_GETCODEDIR                      = 0x48
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETLKPID                        = 0x42
-	F_GETNOSIGPIPE                    = 0x4a
-	F_GETOWN                          = 0x5
-	F_GETPATH                         = 0x32
-	F_GETPATH_MTMINFO                 = 0x47
-	F_GETPROTECTIONCLASS              = 0x3f
-	F_GETPROTECTIONLEVEL              = 0x4d
-	F_GLOBAL_NOCACHE                  = 0x37
-	F_LOG2PHYS                        = 0x31
-	F_LOG2PHYS_EXT                    = 0x41
-	F_NOCACHE                         = 0x30
-	F_NODIRECT                        = 0x3e
-	F_OK                              = 0x0
-	F_PATHPKG_CHECK                   = 0x34
-	F_PEOFPOSMODE                     = 0x3
-	F_PREALLOCATE                     = 0x2a
-	F_RDADVISE                        = 0x2c
-	F_RDAHEAD                         = 0x2d
-	F_RDLCK                           = 0x1
-	F_SETBACKINGSTORE                 = 0x46
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETLKWTIMEOUT                   = 0xa
-	F_SETNOSIGPIPE                    = 0x49
-	F_SETOWN                          = 0x6
-	F_SETPROTECTIONCLASS              = 0x40
-	F_SETSIZE                         = 0x2b
-	F_SINGLE_WRITER                   = 0x4c
-	F_THAW_FS                         = 0x36
-	F_TRANSCODEKEY                    = 0x4b
-	F_UNLCK                           = 0x2
-	F_VOLPOSMODE                      = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_AAL5                          = 0x31
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ATM                           = 0x25
-	IFT_BRIDGE                        = 0xd1
-	IFT_CARP                          = 0xf8
-	IFT_CELLULAR                      = 0xff
-	IFT_CEPT                          = 0x13
-	IFT_DS3                           = 0x1e
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0x38
-	IFT_FDDI                          = 0xf
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_GIF                           = 0x37
-	IFT_HDH1822                       = 0x3
-	IFT_HIPPI                         = 0x2f
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE8023ADLAG                 = 0x88
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88026                      = 0xa
-	IFT_L2VLAN                        = 0x87
-	IFT_LAPB                          = 0x10
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_NSIP                          = 0x1b
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PDP                           = 0xff
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PKTAP                         = 0xfe
-	IFT_PPP                           = 0x17
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PTPSERIAL                     = 0x16
-	IFT_RS232                         = 0x21
-	IFT_SDLC                          = 0x11
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0x39
-	IFT_T1                            = 0x12
-	IFT_ULTRA                         = 0x1d
-	IFT_V35                           = 0x2d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LINKLOCALNETNUM                = 0xa9fe0000
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0xfe
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_2292DSTOPTS                  = 0x17
-	IPV6_2292HOPLIMIT                 = 0x14
-	IPV6_2292HOPOPTS                  = 0x16
-	IPV6_2292NEXTHOP                  = 0x15
-	IPV6_2292PKTINFO                  = 0x13
-	IPV6_2292PKTOPTIONS               = 0x19
-	IPV6_2292RTHDR                    = 0x18
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_BOUND_IF                     = 0x7d
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x3c
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVTCLASS                   = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x24
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_BOUND_IF                       = 0x19
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW_ADD                         = 0x28
-	IP_FW_DEL                         = 0x29
-	IP_FW_FLUSH                       = 0x2a
-	IP_FW_GET                         = 0x2c
-	IP_FW_RESETLOG                    = 0x2d
-	IP_FW_ZERO                        = 0x2b
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MF                             = 0x2000
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_IFINDEX              = 0x42
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_NAT__XXX                       = 0x37
-	IP_OFFMASK                        = 0x1fff
-	IP_OLD_FW_ADD                     = 0x32
-	IP_OLD_FW_DEL                     = 0x33
-	IP_OLD_FW_FLUSH                   = 0x34
-	IP_OLD_FW_GET                     = 0x36
-	IP_OLD_FW_RESETLOG                = 0x38
-	IP_OLD_FW_ZERO                    = 0x35
-	IP_OPTIONS                        = 0x1
-	IP_PKTINFO                        = 0x1a
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVPKTINFO                    = 0x1a
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x18
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_STRIPHDR                       = 0x17
-	IP_TOS                            = 0x3
-	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IUTF8                             = 0x4000
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_CAN_REUSE                    = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_FREE_REUSABLE                = 0x7
-	MADV_FREE_REUSE                   = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MADV_ZERO_WIRED_PAGES             = 0x6
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_JIT                           = 0x800
-	MAP_NOCACHE                       = 0x400
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_SHARED                        = 0x1
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_FLUSH                         = 0x400
-	MSG_HAVEMORE                      = 0x2000
-	MSG_HOLD                          = 0x800
-	MSG_NEEDSA                        = 0x10000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_RCVMORE                       = 0x4000
-	MSG_SEND                          = 0x1000
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MSG_WAITSTREAM                    = 0x200
-	MS_ASYNC                          = 0x1
-	MS_DEACTIVATE                     = 0x8
-	MS_INVALIDATE                     = 0x2
-	MS_KILLPAGES                      = 0x4
-	MS_SYNC                           = 0x10
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_DUMP2                      = 0x7
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLIST2                    = 0x6
-	NET_RT_MAXID                      = 0xa
-	NET_RT_STAT                       = 0x4
-	NET_RT_TRASH                      = 0x5
-	NOFLSH                            = 0x80000000
-	NOTE_ABSOLUTE                     = 0x8
-	NOTE_ATTRIB                       = 0x8
-	NOTE_BACKGROUND                   = 0x40
-	NOTE_CHILD                        = 0x4
-	NOTE_CRITICAL                     = 0x20
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXITSTATUS                   = 0x4000000
-	NOTE_EXIT_CSERROR                 = 0x40000
-	NOTE_EXIT_DECRYPTFAIL             = 0x10000
-	NOTE_EXIT_DETAIL                  = 0x2000000
-	NOTE_EXIT_DETAIL_MASK             = 0x70000
-	NOTE_EXIT_MEMORY                  = 0x20000
-	NOTE_EXIT_REPARENTED              = 0x80000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LEEWAY                       = 0x10
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_NONE                         = 0x80
-	NOTE_NSECONDS                     = 0x4
-	NOTE_PCTRLMASK                    = -0x100000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_REAP                         = 0x10000000
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_SECONDS                      = 0x1
-	NOTE_SIGNAL                       = 0x8000000
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_USECONDS                     = 0x2
-	NOTE_VM_ERROR                     = 0x10000000
-	NOTE_VM_PRESSURE                  = 0x80000000
-	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
-	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFDEL                             = 0x20000
-	OFILL                             = 0x80
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALERT                           = 0x20000000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x1000000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x100000
-	O_DP_GETRAWENCRYPTED              = 0x1
-	O_DSYNC                           = 0x400000
-	O_EVTONLY                         = 0x8000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x20000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_POPUP                           = 0x80000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYMLINK                         = 0x200000
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	PT_ATTACH                         = 0xa
-	PT_ATTACHEXC                      = 0xe
-	PT_CONTINUE                       = 0x7
-	PT_DENY_ATTACH                    = 0x1f
-	PT_DETACH                         = 0xb
-	PT_FIRSTMACH                      = 0x20
-	PT_FORCEQUOTA                     = 0x1e
-	PT_KILL                           = 0x8
-	PT_READ_D                         = 0x2
-	PT_READ_I                         = 0x1
-	PT_READ_U                         = 0x3
-	PT_SIGEXC                         = 0xc
-	PT_STEP                           = 0x9
-	PT_THUPDATE                       = 0xd
-	PT_TRACE_ME                       = 0x0
-	PT_WRITE_D                        = 0x5
-	PT_WRITE_I                        = 0x4
-	PT_WRITE_U                        = 0x6
-	RLIMIT_AS                         = 0x5
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_CPU_USAGE_MONITOR          = 0x2
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CLONING                       = 0x100
-	RTF_CONDEMNED                     = 0x2000000
-	RTF_DELCLONE                      = 0x80
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_IFREF                         = 0x4000000
-	RTF_IFSCOPE                       = 0x1000000
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_NOIFREF                       = 0x2000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_PROXY                         = 0x8000000
-	RTF_REJECT                        = 0x8
-	RTF_ROUTER                        = 0x10000000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_WASCLONED                     = 0x20000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_GET2                          = 0x14
-	RTM_IFINFO                        = 0xe
-	RTM_IFINFO2                       = 0x12
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_NEWMADDR2                     = 0x13
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SCM_TIMESTAMP_MONOTONIC           = 0x4
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCARPIPLL                       = 0xc0206928
-	SIOCATMARK                        = 0x40047307
-	SIOCAUTOADDR                      = 0xc0206926
-	SIOCAUTONETMASK                   = 0x80206927
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFPHYADDR                    = 0x80206941
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETVLAN                       = 0xc020697f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFALTMTU                     = 0xc0206948
-	SIOCGIFASYNCMAP                   = 0xc020697c
-	SIOCGIFBOND                       = 0xc0206947
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020695b
-	SIOCGIFCONF                       = 0xc00c6924
-	SIOCGIFDEVMTU                     = 0xc0206944
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFKPI                        = 0xc0206987
-	SIOCGIFMAC                        = 0xc0206982
-	SIOCGIFMEDIA                      = 0xc02c6938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206940
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc020693f
-	SIOCGIFSTATUS                     = 0xc331693d
-	SIOCGIFVLAN                       = 0xc020697f
-	SIOCGIFWAKEFLAGS                  = 0xc0206988
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCIFCREATE                      = 0xc0206978
-	SIOCIFCREATE2                     = 0xc020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106981
-	SIOCRSLVMULTI                     = 0xc010693b
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSETVLAN                       = 0x8020697e
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFALTMTU                     = 0x80206945
-	SIOCSIFASYNCMAP                   = 0x8020697d
-	SIOCSIFBOND                       = 0x80206946
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020695a
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFKPI                        = 0x80206986
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206983
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x8040693e
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFVLAN                       = 0x8020697e
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_DONTTRUNC                      = 0x2000
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1010
-	SO_LINGER                         = 0x80
-	SO_LINGER_SEC                     = 0x1080
-	SO_NKE                            = 0x1021
-	SO_NOADDRERR                      = 0x1023
-	SO_NOSIGPIPE                      = 0x1022
-	SO_NOTIFYCONFLICT                 = 0x1026
-	SO_NP_EXTENSIONS                  = 0x1083
-	SO_NREAD                          = 0x1020
-	SO_NUMRCVPKT                      = 0x1112
-	SO_NWRITE                         = 0x1024
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1011
-	SO_RANDOMPORT                     = 0x1082
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_REUSESHAREUID                  = 0x1025
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TIMESTAMP_MONOTONIC            = 0x800
-	SO_TYPE                           = 0x1008
-	SO_UPCALLCLOSEWAIT                = 0x1027
-	SO_USELOOPBACK                    = 0x40
-	SO_WANTMORE                       = 0x4000
-	SO_WANTOOBFLAG                    = 0x8000
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONNECTIONTIMEOUT             = 0x20
-	TCP_ENABLE_ECN                    = 0x104
-	TCP_KEEPALIVE                     = 0x10
-	TCP_KEEPCNT                       = 0x102
-	TCP_KEEPINTVL                     = 0x101
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_NOTSENT_LOWAT                 = 0x201
-	TCP_RXT_CONNDROPTIME              = 0x80
-	TCP_RXT_FINDROP                   = 0x100
-	TCP_SENDMOREACKS                  = 0x103
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40107458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCDSIMICROCODE                  = 0x20007455
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x40487413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGWINSZ                        = 0x40087468
-	TIOCIXOFF                         = 0x20007480
-	TIOCIXON                          = 0x20007481
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x40047403
-	TIOCMODS                          = 0x80047404
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTYGNAME                      = 0x40807453
-	TIOCPTYGRANT                      = 0x20007454
-	TIOCPTYUNLK                       = 0x20007452
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCONS                         = 0x20007463
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x80487414
-	TIOCSETAF                         = 0x80487416
-	TIOCSETAW                         = 0x80487415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2000745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40107459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VT0                               = 0x0
-	VT1                               = 0x10000
-	VTDLY                             = 0x10000
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x10
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x4
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x20
-	WORDSIZE                          = 0x40
-	WSTOPPED                          = 0x8
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADARCH        = syscall.Errno(0x56)
-	EBADEXEC        = syscall.Errno(0x55)
-	EBADF           = syscall.Errno(0x9)
-	EBADMACHO       = syscall.Errno(0x58)
-	EBADMSG         = syscall.Errno(0x5e)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x59)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDEVERR         = syscall.Errno(0x53)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x5a)
-	EILSEQ          = syscall.Errno(0x5c)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x6a)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5f)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x60)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x61)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5b)
-	ENOPOLICY       = syscall.Errno(0x67)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x62)
-	ENOSTR          = syscall.Errno(0x63)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x68)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x66)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x69)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x64)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	EPWROFF         = syscall.Errno(0x52)
-	EQFULL          = syscall.Errno(0x6a)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHLIBVERS      = syscall.Errno(0x57)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x65)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "device not configured",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource deadlock avoided",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "resource busy",
-	17:  "file exists",
-	18:  "cross-device link",
-	19:  "operation not supported by device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "result too large",
-	35:  "resource temporarily unavailable",
-	36:  "operation now in progress",
-	37:  "operation already in progress",
-	38:  "socket operation on non-socket",
-	39:  "destination address required",
-	40:  "message too long",
-	41:  "protocol wrong type for socket",
-	42:  "protocol not available",
-	43:  "protocol not supported",
-	44:  "socket type not supported",
-	45:  "operation not supported",
-	46:  "protocol family not supported",
-	47:  "address family not supported by protocol family",
-	48:  "address already in use",
-	49:  "can't assign requested address",
-	50:  "network is down",
-	51:  "network is unreachable",
-	52:  "network dropped connection on reset",
-	53:  "software caused connection abort",
-	54:  "connection reset by peer",
-	55:  "no buffer space available",
-	56:  "socket is already connected",
-	57:  "socket is not connected",
-	58:  "can't send after socket shutdown",
-	59:  "too many references: can't splice",
-	60:  "operation timed out",
-	61:  "connection refused",
-	62:  "too many levels of symbolic links",
-	63:  "file name too long",
-	64:  "host is down",
-	65:  "no route to host",
-	66:  "directory not empty",
-	67:  "too many processes",
-	68:  "too many users",
-	69:  "disc quota exceeded",
-	70:  "stale NFS file handle",
-	71:  "too many levels of remote in path",
-	72:  "RPC struct is bad",
-	73:  "RPC version wrong",
-	74:  "RPC prog. not avail",
-	75:  "program version wrong",
-	76:  "bad procedure for program",
-	77:  "no locks available",
-	78:  "function not implemented",
-	79:  "inappropriate file type or format",
-	80:  "authentication error",
-	81:  "need authenticator",
-	82:  "device power is off",
-	83:  "device error",
-	84:  "value too large to be stored in data type",
-	85:  "bad executable (or shared library)",
-	86:  "bad CPU type in executable",
-	87:  "shared library version mismatch",
-	88:  "malformed Mach-o file",
-	89:  "operation canceled",
-	90:  "identifier removed",
-	91:  "no message of desired type",
-	92:  "illegal byte sequence",
-	93:  "attribute not found",
-	94:  "bad message",
-	95:  "EMULTIHOP (Reserved)",
-	96:  "no message available on STREAM",
-	97:  "ENOLINK (Reserved)",
-	98:  "no STREAM resources",
-	99:  "not a STREAM",
-	100: "protocol error",
-	101: "STREAM ioctl timeout",
-	102: "operation not supported on socket",
-	103: "policy not found",
-	104: "state not recoverable",
-	105: "previous owner died",
-	106: "interface output queue is full",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
deleted file mode 100644
index a410e88edd..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
+++ /dev/null
@@ -1,1293 +0,0 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
-
-// +build arm,darwin
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1c
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1e
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1c
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x28
-	AF_NATM                           = 0x1f
-	AF_NDRV                           = 0x1b
-	AF_NETBIOS                        = 0x21
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PPP                            = 0x22
-	AF_PUP                            = 0x4
-	AF_RESERVED_36                    = 0x24
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x18
-	AF_SNA                            = 0xb
-	AF_SYSTEM                         = 0x20
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_UTUN                           = 0x26
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc00c4279
-	BIOCGETIF                         = 0x4020426b
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044278
-	BIOCSETF                          = 0x80104267
-	BIOCSETIF                         = 0x8020426c
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AX25                          = 0x3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_C_HDLC                        = 0x68
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_FDDI                          = 0xa
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_NULL                          = 0x0
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PRONET                        = 0x4
-	DLT_RAW                           = 0xc
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_MACHPORT                   = -0x8
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xe
-	EVFILT_THREADMARKER               = 0xe
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xa
-	EVFILT_VM                         = -0xc
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG0                          = 0x1000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_OOBAND                         = 0x2000
-	EV_POLL                           = 0x1000
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_ADDFILESIGS                     = 0x3d
-	F_ADDSIGS                         = 0x3b
-	F_ALLOCATEALL                     = 0x4
-	F_ALLOCATECONTIG                  = 0x2
-	F_CHKCLEAN                        = 0x29
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x43
-	F_FINDSIGS                        = 0x4e
-	F_FLUSH_DATA                      = 0x28
-	F_FREEZE_FS                       = 0x35
-	F_FULLFSYNC                       = 0x33
-	F_GETCODEDIR                      = 0x48
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETLKPID                        = 0x42
-	F_GETNOSIGPIPE                    = 0x4a
-	F_GETOWN                          = 0x5
-	F_GETPATH                         = 0x32
-	F_GETPATH_MTMINFO                 = 0x47
-	F_GETPROTECTIONCLASS              = 0x3f
-	F_GETPROTECTIONLEVEL              = 0x4d
-	F_GLOBAL_NOCACHE                  = 0x37
-	F_LOG2PHYS                        = 0x31
-	F_LOG2PHYS_EXT                    = 0x41
-	F_NOCACHE                         = 0x30
-	F_NODIRECT                        = 0x3e
-	F_OK                              = 0x0
-	F_PATHPKG_CHECK                   = 0x34
-	F_PEOFPOSMODE                     = 0x3
-	F_PREALLOCATE                     = 0x2a
-	F_RDADVISE                        = 0x2c
-	F_RDAHEAD                         = 0x2d
-	F_RDLCK                           = 0x1
-	F_SETBACKINGSTORE                 = 0x46
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETLKWTIMEOUT                   = 0xa
-	F_SETNOSIGPIPE                    = 0x49
-	F_SETOWN                          = 0x6
-	F_SETPROTECTIONCLASS              = 0x40
-	F_SETSIZE                         = 0x2b
-	F_SINGLE_WRITER                   = 0x4c
-	F_THAW_FS                         = 0x36
-	F_TRANSCODEKEY                    = 0x4b
-	F_UNLCK                           = 0x2
-	F_VOLPOSMODE                      = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_AAL5                          = 0x31
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ATM                           = 0x25
-	IFT_BRIDGE                        = 0xd1
-	IFT_CARP                          = 0xf8
-	IFT_CELLULAR                      = 0xff
-	IFT_CEPT                          = 0x13
-	IFT_DS3                           = 0x1e
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0x38
-	IFT_FDDI                          = 0xf
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_GIF                           = 0x37
-	IFT_HDH1822                       = 0x3
-	IFT_HIPPI                         = 0x2f
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE8023ADLAG                 = 0x88
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88026                      = 0xa
-	IFT_L2VLAN                        = 0x87
-	IFT_LAPB                          = 0x10
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_NSIP                          = 0x1b
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PDP                           = 0xff
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PPP                           = 0x17
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PTPSERIAL                     = 0x16
-	IFT_RS232                         = 0x21
-	IFT_SDLC                          = 0x11
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0x39
-	IFT_T1                            = 0x12
-	IFT_ULTRA                         = 0x1d
-	IFT_V35                           = 0x2d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LINKLOCALNETNUM                = 0xa9fe0000
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0xfe
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_2292DSTOPTS                  = 0x17
-	IPV6_2292HOPLIMIT                 = 0x14
-	IPV6_2292HOPOPTS                  = 0x16
-	IPV6_2292NEXTHOP                  = 0x15
-	IPV6_2292PKTINFO                  = 0x13
-	IPV6_2292PKTOPTIONS               = 0x19
-	IPV6_2292RTHDR                    = 0x18
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_BOUND_IF                     = 0x7d
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVTCLASS                   = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x24
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_BOUND_IF                       = 0x19
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW_ADD                         = 0x28
-	IP_FW_DEL                         = 0x29
-	IP_FW_FLUSH                       = 0x2a
-	IP_FW_GET                         = 0x2c
-	IP_FW_RESETLOG                    = 0x2d
-	IP_FW_ZERO                        = 0x2b
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MF                             = 0x2000
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_IFINDEX              = 0x42
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_NAT__XXX                       = 0x37
-	IP_OFFMASK                        = 0x1fff
-	IP_OLD_FW_ADD                     = 0x32
-	IP_OLD_FW_DEL                     = 0x33
-	IP_OLD_FW_FLUSH                   = 0x34
-	IP_OLD_FW_GET                     = 0x36
-	IP_OLD_FW_RESETLOG                = 0x38
-	IP_OLD_FW_ZERO                    = 0x35
-	IP_OPTIONS                        = 0x1
-	IP_PKTINFO                        = 0x1a
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVPKTINFO                    = 0x1a
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x18
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_STRIPHDR                       = 0x17
-	IP_TOS                            = 0x3
-	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IUTF8                             = 0x4000
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_CAN_REUSE                    = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_FREE_REUSABLE                = 0x7
-	MADV_FREE_REUSE                   = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MADV_ZERO_WIRED_PAGES             = 0x6
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_JIT                           = 0x800
-	MAP_NOCACHE                       = 0x400
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_SHARED                        = 0x1
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_FLUSH                         = 0x400
-	MSG_HAVEMORE                      = 0x2000
-	MSG_HOLD                          = 0x800
-	MSG_NEEDSA                        = 0x10000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_RCVMORE                       = 0x4000
-	MSG_SEND                          = 0x1000
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MSG_WAITSTREAM                    = 0x200
-	MS_ASYNC                          = 0x1
-	MS_DEACTIVATE                     = 0x8
-	MS_INVALIDATE                     = 0x2
-	MS_KILLPAGES                      = 0x4
-	MS_SYNC                           = 0x10
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_DUMP2                      = 0x7
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLIST2                    = 0x6
-	NET_RT_MAXID                      = 0xa
-	NET_RT_STAT                       = 0x4
-	NET_RT_TRASH                      = 0x5
-	NOFLSH                            = 0x80000000
-	NOTE_ABSOLUTE                     = 0x8
-	NOTE_ATTRIB                       = 0x8
-	NOTE_BACKGROUND                   = 0x40
-	NOTE_CHILD                        = 0x4
-	NOTE_CRITICAL                     = 0x20
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXITSTATUS                   = 0x4000000
-	NOTE_EXIT_CSERROR                 = 0x40000
-	NOTE_EXIT_DECRYPTFAIL             = 0x10000
-	NOTE_EXIT_DETAIL                  = 0x2000000
-	NOTE_EXIT_DETAIL_MASK             = 0x70000
-	NOTE_EXIT_MEMORY                  = 0x20000
-	NOTE_EXIT_REPARENTED              = 0x80000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LEEWAY                       = 0x10
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_NONE                         = 0x80
-	NOTE_NSECONDS                     = 0x4
-	NOTE_PCTRLMASK                    = -0x100000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_REAP                         = 0x10000000
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_SECONDS                      = 0x1
-	NOTE_SIGNAL                       = 0x8000000
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_USECONDS                     = 0x2
-	NOTE_VM_ERROR                     = 0x10000000
-	NOTE_VM_PRESSURE                  = 0x80000000
-	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
-	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFDEL                             = 0x20000
-	OFILL                             = 0x80
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALERT                           = 0x20000000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x1000000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x100000
-	O_DP_GETRAWENCRYPTED              = 0x1
-	O_DSYNC                           = 0x400000
-	O_EVTONLY                         = 0x8000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x20000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_POPUP                           = 0x80000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYMLINK                         = 0x200000
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	PT_ATTACH                         = 0xa
-	PT_ATTACHEXC                      = 0xe
-	PT_CONTINUE                       = 0x7
-	PT_DENY_ATTACH                    = 0x1f
-	PT_DETACH                         = 0xb
-	PT_FIRSTMACH                      = 0x20
-	PT_FORCEQUOTA                     = 0x1e
-	PT_KILL                           = 0x8
-	PT_READ_D                         = 0x2
-	PT_READ_I                         = 0x1
-	PT_READ_U                         = 0x3
-	PT_SIGEXC                         = 0xc
-	PT_STEP                           = 0x9
-	PT_THUPDATE                       = 0xd
-	PT_TRACE_ME                       = 0x0
-	PT_WRITE_D                        = 0x5
-	PT_WRITE_I                        = 0x4
-	PT_WRITE_U                        = 0x6
-	RLIMIT_AS                         = 0x5
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_CPU_USAGE_MONITOR          = 0x2
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CLONING                       = 0x100
-	RTF_CONDEMNED                     = 0x2000000
-	RTF_DELCLONE                      = 0x80
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_IFREF                         = 0x4000000
-	RTF_IFSCOPE                       = 0x1000000
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_PROXY                         = 0x8000000
-	RTF_REJECT                        = 0x8
-	RTF_ROUTER                        = 0x10000000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_WASCLONED                     = 0x20000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_GET2                          = 0x14
-	RTM_IFINFO                        = 0xe
-	RTM_IFINFO2                       = 0x12
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_NEWMADDR2                     = 0x13
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SCM_TIMESTAMP_MONOTONIC           = 0x4
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCARPIPLL                       = 0xc0206928
-	SIOCATMARK                        = 0x40047307
-	SIOCAUTOADDR                      = 0xc0206926
-	SIOCAUTONETMASK                   = 0x80206927
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFPHYADDR                    = 0x80206941
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETVLAN                       = 0xc020697f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFALTMTU                     = 0xc0206948
-	SIOCGIFASYNCMAP                   = 0xc020697c
-	SIOCGIFBOND                       = 0xc0206947
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020695b
-	SIOCGIFCONF                       = 0xc00c6924
-	SIOCGIFDEVMTU                     = 0xc0206944
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFKPI                        = 0xc0206987
-	SIOCGIFMAC                        = 0xc0206982
-	SIOCGIFMEDIA                      = 0xc02c6938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206940
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc020693f
-	SIOCGIFSTATUS                     = 0xc331693d
-	SIOCGIFVLAN                       = 0xc020697f
-	SIOCGIFWAKEFLAGS                  = 0xc0206988
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCIFCREATE                      = 0xc0206978
-	SIOCIFCREATE2                     = 0xc020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106981
-	SIOCRSLVMULTI                     = 0xc010693b
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSETVLAN                       = 0x8020697e
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFALTMTU                     = 0x80206945
-	SIOCSIFASYNCMAP                   = 0x8020697d
-	SIOCSIFBOND                       = 0x80206946
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020695a
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFKPI                        = 0x80206986
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206983
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x8040693e
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFVLAN                       = 0x8020697e
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_DONTTRUNC                      = 0x2000
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1010
-	SO_LINGER                         = 0x80
-	SO_LINGER_SEC                     = 0x1080
-	SO_NKE                            = 0x1021
-	SO_NOADDRERR                      = 0x1023
-	SO_NOSIGPIPE                      = 0x1022
-	SO_NOTIFYCONFLICT                 = 0x1026
-	SO_NP_EXTENSIONS                  = 0x1083
-	SO_NREAD                          = 0x1020
-	SO_NUMRCVPKT                      = 0x1112
-	SO_NWRITE                         = 0x1024
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1011
-	SO_RANDOMPORT                     = 0x1082
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_REUSESHAREUID                  = 0x1025
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TIMESTAMP_MONOTONIC            = 0x800
-	SO_TYPE                           = 0x1008
-	SO_UPCALLCLOSEWAIT                = 0x1027
-	SO_USELOOPBACK                    = 0x40
-	SO_WANTMORE                       = 0x4000
-	SO_WANTOOBFLAG                    = 0x8000
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONNECTIONTIMEOUT             = 0x20
-	TCP_ENABLE_ECN                    = 0x104
-	TCP_KEEPALIVE                     = 0x10
-	TCP_KEEPCNT                       = 0x102
-	TCP_KEEPINTVL                     = 0x101
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_NOTSENT_LOWAT                 = 0x201
-	TCP_RXT_CONNDROPTIME              = 0x80
-	TCP_RXT_FINDROP                   = 0x100
-	TCP_SENDMOREACKS                  = 0x103
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40107458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCDSIMICROCODE                  = 0x20007455
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x40487413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGWINSZ                        = 0x40087468
-	TIOCIXOFF                         = 0x20007480
-	TIOCIXON                          = 0x20007481
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x40047403
-	TIOCMODS                          = 0x80047404
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTYGNAME                      = 0x40807453
-	TIOCPTYGRANT                      = 0x20007454
-	TIOCPTYUNLK                       = 0x20007452
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCONS                         = 0x20007463
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x80487414
-	TIOCSETAF                         = 0x80487416
-	TIOCSETAW                         = 0x80487415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2000745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40107459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VT0                               = 0x0
-	VT1                               = 0x10000
-	VTDLY                             = 0x10000
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x10
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x4
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x20
-	WORDSIZE                          = 0x40
-	WSTOPPED                          = 0x8
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADARCH        = syscall.Errno(0x56)
-	EBADEXEC        = syscall.Errno(0x55)
-	EBADF           = syscall.Errno(0x9)
-	EBADMACHO       = syscall.Errno(0x58)
-	EBADMSG         = syscall.Errno(0x5e)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x59)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDEVERR         = syscall.Errno(0x53)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x5a)
-	EILSEQ          = syscall.Errno(0x5c)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x6a)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5f)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x60)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x61)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5b)
-	ENOPOLICY       = syscall.Errno(0x67)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x62)
-	ENOSTR          = syscall.Errno(0x63)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x68)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x66)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x69)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x64)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	EPWROFF         = syscall.Errno(0x52)
-	EQFULL          = syscall.Errno(0x6a)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHLIBVERS      = syscall.Errno(0x57)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x65)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
deleted file mode 100644
index 3189c6b345..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
+++ /dev/null
@@ -1,1576 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm64,darwin
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1c
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1e
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1c
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x28
-	AF_NATM                           = 0x1f
-	AF_NDRV                           = 0x1b
-	AF_NETBIOS                        = 0x21
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PPP                            = 0x22
-	AF_PUP                            = 0x4
-	AF_RESERVED_36                    = 0x24
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x18
-	AF_SNA                            = 0xb
-	AF_SYSTEM                         = 0x20
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_UTUN                           = 0x26
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc00c4279
-	BIOCGETIF                         = 0x4020426b
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044278
-	BIOCSETF                          = 0x80104267
-	BIOCSETFNR                        = 0x8010427e
-	BIOCSETIF                         = 0x8020426c
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf5
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_MACHPORT                   = -0x8
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xe
-	EVFILT_THREADMARKER               = 0xe
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xa
-	EVFILT_VM                         = -0xc
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG0                          = 0x1000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_OOBAND                         = 0x2000
-	EV_POLL                           = 0x1000
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_ADDFILESIGS                     = 0x3d
-	F_ADDSIGS                         = 0x3b
-	F_ALLOCATEALL                     = 0x4
-	F_ALLOCATECONTIG                  = 0x2
-	F_CHKCLEAN                        = 0x29
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x43
-	F_FINDSIGS                        = 0x4e
-	F_FLUSH_DATA                      = 0x28
-	F_FREEZE_FS                       = 0x35
-	F_FULLFSYNC                       = 0x33
-	F_GETCODEDIR                      = 0x48
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETLKPID                        = 0x42
-	F_GETNOSIGPIPE                    = 0x4a
-	F_GETOWN                          = 0x5
-	F_GETPATH                         = 0x32
-	F_GETPATH_MTMINFO                 = 0x47
-	F_GETPROTECTIONCLASS              = 0x3f
-	F_GETPROTECTIONLEVEL              = 0x4d
-	F_GLOBAL_NOCACHE                  = 0x37
-	F_LOG2PHYS                        = 0x31
-	F_LOG2PHYS_EXT                    = 0x41
-	F_NOCACHE                         = 0x30
-	F_NODIRECT                        = 0x3e
-	F_OK                              = 0x0
-	F_PATHPKG_CHECK                   = 0x34
-	F_PEOFPOSMODE                     = 0x3
-	F_PREALLOCATE                     = 0x2a
-	F_RDADVISE                        = 0x2c
-	F_RDAHEAD                         = 0x2d
-	F_RDLCK                           = 0x1
-	F_SETBACKINGSTORE                 = 0x46
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETLKWTIMEOUT                   = 0xa
-	F_SETNOSIGPIPE                    = 0x49
-	F_SETOWN                          = 0x6
-	F_SETPROTECTIONCLASS              = 0x40
-	F_SETSIZE                         = 0x2b
-	F_SINGLE_WRITER                   = 0x4c
-	F_THAW_FS                         = 0x36
-	F_TRANSCODEKEY                    = 0x4b
-	F_UNLCK                           = 0x2
-	F_VOLPOSMODE                      = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_AAL5                          = 0x31
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ATM                           = 0x25
-	IFT_BRIDGE                        = 0xd1
-	IFT_CARP                          = 0xf8
-	IFT_CELLULAR                      = 0xff
-	IFT_CEPT                          = 0x13
-	IFT_DS3                           = 0x1e
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0x38
-	IFT_FDDI                          = 0xf
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_GIF                           = 0x37
-	IFT_HDH1822                       = 0x3
-	IFT_HIPPI                         = 0x2f
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE8023ADLAG                 = 0x88
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88026                      = 0xa
-	IFT_L2VLAN                        = 0x87
-	IFT_LAPB                          = 0x10
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_NSIP                          = 0x1b
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PDP                           = 0xff
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PKTAP                         = 0xfe
-	IFT_PPP                           = 0x17
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PTPSERIAL                     = 0x16
-	IFT_RS232                         = 0x21
-	IFT_SDLC                          = 0x11
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0x39
-	IFT_T1                            = 0x12
-	IFT_ULTRA                         = 0x1d
-	IFT_V35                           = 0x2d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LINKLOCALNETNUM                = 0xa9fe0000
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0xfe
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_2292DSTOPTS                  = 0x17
-	IPV6_2292HOPLIMIT                 = 0x14
-	IPV6_2292HOPOPTS                  = 0x16
-	IPV6_2292NEXTHOP                  = 0x15
-	IPV6_2292PKTINFO                  = 0x13
-	IPV6_2292PKTOPTIONS               = 0x19
-	IPV6_2292RTHDR                    = 0x18
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_BOUND_IF                     = 0x7d
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x3c
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVTCLASS                   = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x24
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_BOUND_IF                       = 0x19
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW_ADD                         = 0x28
-	IP_FW_DEL                         = 0x29
-	IP_FW_FLUSH                       = 0x2a
-	IP_FW_GET                         = 0x2c
-	IP_FW_RESETLOG                    = 0x2d
-	IP_FW_ZERO                        = 0x2b
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MF                             = 0x2000
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_IFINDEX              = 0x42
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_NAT__XXX                       = 0x37
-	IP_OFFMASK                        = 0x1fff
-	IP_OLD_FW_ADD                     = 0x32
-	IP_OLD_FW_DEL                     = 0x33
-	IP_OLD_FW_FLUSH                   = 0x34
-	IP_OLD_FW_GET                     = 0x36
-	IP_OLD_FW_RESETLOG                = 0x38
-	IP_OLD_FW_ZERO                    = 0x35
-	IP_OPTIONS                        = 0x1
-	IP_PKTINFO                        = 0x1a
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVPKTINFO                    = 0x1a
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x18
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_STRIPHDR                       = 0x17
-	IP_TOS                            = 0x3
-	IP_TRAFFIC_MGT_BACKGROUND         = 0x41
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IUTF8                             = 0x4000
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_CAN_REUSE                    = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_FREE_REUSABLE                = 0x7
-	MADV_FREE_REUSE                   = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MADV_ZERO_WIRED_PAGES             = 0x6
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_JIT                           = 0x800
-	MAP_NOCACHE                       = 0x400
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_SHARED                        = 0x1
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_FLUSH                         = 0x400
-	MSG_HAVEMORE                      = 0x2000
-	MSG_HOLD                          = 0x800
-	MSG_NEEDSA                        = 0x10000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_RCVMORE                       = 0x4000
-	MSG_SEND                          = 0x1000
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MSG_WAITSTREAM                    = 0x200
-	MS_ASYNC                          = 0x1
-	MS_DEACTIVATE                     = 0x8
-	MS_INVALIDATE                     = 0x2
-	MS_KILLPAGES                      = 0x4
-	MS_SYNC                           = 0x10
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_DUMP2                      = 0x7
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLIST2                    = 0x6
-	NET_RT_MAXID                      = 0xa
-	NET_RT_STAT                       = 0x4
-	NET_RT_TRASH                      = 0x5
-	NOFLSH                            = 0x80000000
-	NOTE_ABSOLUTE                     = 0x8
-	NOTE_ATTRIB                       = 0x8
-	NOTE_BACKGROUND                   = 0x40
-	NOTE_CHILD                        = 0x4
-	NOTE_CRITICAL                     = 0x20
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXITSTATUS                   = 0x4000000
-	NOTE_EXIT_CSERROR                 = 0x40000
-	NOTE_EXIT_DECRYPTFAIL             = 0x10000
-	NOTE_EXIT_DETAIL                  = 0x2000000
-	NOTE_EXIT_DETAIL_MASK             = 0x70000
-	NOTE_EXIT_MEMORY                  = 0x20000
-	NOTE_EXIT_REPARENTED              = 0x80000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LEEWAY                       = 0x10
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_NONE                         = 0x80
-	NOTE_NSECONDS                     = 0x4
-	NOTE_PCTRLMASK                    = -0x100000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_REAP                         = 0x10000000
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_SECONDS                      = 0x1
-	NOTE_SIGNAL                       = 0x8000000
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_USECONDS                     = 0x2
-	NOTE_VM_ERROR                     = 0x10000000
-	NOTE_VM_PRESSURE                  = 0x80000000
-	NOTE_VM_PRESSURE_SUDDEN_TERMINATE = 0x20000000
-	NOTE_VM_PRESSURE_TERMINATE        = 0x40000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFDEL                             = 0x20000
-	OFILL                             = 0x80
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALERT                           = 0x20000000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x1000000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x100000
-	O_DP_GETRAWENCRYPTED              = 0x1
-	O_DSYNC                           = 0x400000
-	O_EVTONLY                         = 0x8000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x20000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_POPUP                           = 0x80000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYMLINK                         = 0x200000
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	PT_ATTACH                         = 0xa
-	PT_ATTACHEXC                      = 0xe
-	PT_CONTINUE                       = 0x7
-	PT_DENY_ATTACH                    = 0x1f
-	PT_DETACH                         = 0xb
-	PT_FIRSTMACH                      = 0x20
-	PT_FORCEQUOTA                     = 0x1e
-	PT_KILL                           = 0x8
-	PT_READ_D                         = 0x2
-	PT_READ_I                         = 0x1
-	PT_READ_U                         = 0x3
-	PT_SIGEXC                         = 0xc
-	PT_STEP                           = 0x9
-	PT_THUPDATE                       = 0xd
-	PT_TRACE_ME                       = 0x0
-	PT_WRITE_D                        = 0x5
-	PT_WRITE_I                        = 0x4
-	PT_WRITE_U                        = 0x6
-	RLIMIT_AS                         = 0x5
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_CPU_USAGE_MONITOR          = 0x2
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CLONING                       = 0x100
-	RTF_CONDEMNED                     = 0x2000000
-	RTF_DELCLONE                      = 0x80
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_IFREF                         = 0x4000000
-	RTF_IFSCOPE                       = 0x1000000
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_NOIFREF                       = 0x2000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_PROXY                         = 0x8000000
-	RTF_REJECT                        = 0x8
-	RTF_ROUTER                        = 0x10000000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_WASCLONED                     = 0x20000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_GET2                          = 0x14
-	RTM_IFINFO                        = 0xe
-	RTM_IFINFO2                       = 0x12
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_NEWMADDR2                     = 0x13
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SCM_TIMESTAMP_MONOTONIC           = 0x4
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCARPIPLL                       = 0xc0206928
-	SIOCATMARK                        = 0x40047307
-	SIOCAUTOADDR                      = 0xc0206926
-	SIOCAUTONETMASK                   = 0x80206927
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFPHYADDR                    = 0x80206941
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETVLAN                       = 0xc020697f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFALTMTU                     = 0xc0206948
-	SIOCGIFASYNCMAP                   = 0xc020697c
-	SIOCGIFBOND                       = 0xc0206947
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020695b
-	SIOCGIFCONF                       = 0xc00c6924
-	SIOCGIFDEVMTU                     = 0xc0206944
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFKPI                        = 0xc0206987
-	SIOCGIFMAC                        = 0xc0206982
-	SIOCGIFMEDIA                      = 0xc02c6938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206940
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc020693f
-	SIOCGIFSTATUS                     = 0xc331693d
-	SIOCGIFVLAN                       = 0xc020697f
-	SIOCGIFWAKEFLAGS                  = 0xc0206988
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCIFCREATE                      = 0xc0206978
-	SIOCIFCREATE2                     = 0xc020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106981
-	SIOCRSLVMULTI                     = 0xc010693b
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSETVLAN                       = 0x8020697e
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFALTMTU                     = 0x80206945
-	SIOCSIFASYNCMAP                   = 0x8020697d
-	SIOCSIFBOND                       = 0x80206946
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020695a
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFKPI                        = 0x80206986
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206983
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x8040693e
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFVLAN                       = 0x8020697e
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_DONTTRUNC                      = 0x2000
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1010
-	SO_LINGER                         = 0x80
-	SO_LINGER_SEC                     = 0x1080
-	SO_NKE                            = 0x1021
-	SO_NOADDRERR                      = 0x1023
-	SO_NOSIGPIPE                      = 0x1022
-	SO_NOTIFYCONFLICT                 = 0x1026
-	SO_NP_EXTENSIONS                  = 0x1083
-	SO_NREAD                          = 0x1020
-	SO_NUMRCVPKT                      = 0x1112
-	SO_NWRITE                         = 0x1024
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1011
-	SO_RANDOMPORT                     = 0x1082
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_REUSESHAREUID                  = 0x1025
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TIMESTAMP_MONOTONIC            = 0x800
-	SO_TYPE                           = 0x1008
-	SO_UPCALLCLOSEWAIT                = 0x1027
-	SO_USELOOPBACK                    = 0x40
-	SO_WANTMORE                       = 0x4000
-	SO_WANTOOBFLAG                    = 0x8000
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONNECTIONTIMEOUT             = 0x20
-	TCP_ENABLE_ECN                    = 0x104
-	TCP_KEEPALIVE                     = 0x10
-	TCP_KEEPCNT                       = 0x102
-	TCP_KEEPINTVL                     = 0x101
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_NOTSENT_LOWAT                 = 0x201
-	TCP_RXT_CONNDROPTIME              = 0x80
-	TCP_RXT_FINDROP                   = 0x100
-	TCP_SENDMOREACKS                  = 0x103
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40107458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCDSIMICROCODE                  = 0x20007455
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x40487413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGWINSZ                        = 0x40087468
-	TIOCIXOFF                         = 0x20007480
-	TIOCIXON                          = 0x20007481
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x40047403
-	TIOCMODS                          = 0x80047404
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTYGNAME                      = 0x40807453
-	TIOCPTYGRANT                      = 0x20007454
-	TIOCPTYUNLK                       = 0x20007452
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCONS                         = 0x20007463
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x80487414
-	TIOCSETAF                         = 0x80487416
-	TIOCSETAW                         = 0x80487415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2000745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40107459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VT0                               = 0x0
-	VT1                               = 0x10000
-	VTDLY                             = 0x10000
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x10
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x4
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x20
-	WORDSIZE                          = 0x40
-	WSTOPPED                          = 0x8
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADARCH        = syscall.Errno(0x56)
-	EBADEXEC        = syscall.Errno(0x55)
-	EBADF           = syscall.Errno(0x9)
-	EBADMACHO       = syscall.Errno(0x58)
-	EBADMSG         = syscall.Errno(0x5e)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x59)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDEVERR         = syscall.Errno(0x53)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x5a)
-	EILSEQ          = syscall.Errno(0x5c)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x6a)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5f)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x60)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x61)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5b)
-	ENOPOLICY       = syscall.Errno(0x67)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x62)
-	ENOSTR          = syscall.Errno(0x63)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x68)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x66)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x69)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x64)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	EPWROFF         = syscall.Errno(0x52)
-	EQFULL          = syscall.Errno(0x6a)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHLIBVERS      = syscall.Errno(0x57)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x65)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "device not configured",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource deadlock avoided",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "resource busy",
-	17:  "file exists",
-	18:  "cross-device link",
-	19:  "operation not supported by device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "result too large",
-	35:  "resource temporarily unavailable",
-	36:  "operation now in progress",
-	37:  "operation already in progress",
-	38:  "socket operation on non-socket",
-	39:  "destination address required",
-	40:  "message too long",
-	41:  "protocol wrong type for socket",
-	42:  "protocol not available",
-	43:  "protocol not supported",
-	44:  "socket type not supported",
-	45:  "operation not supported",
-	46:  "protocol family not supported",
-	47:  "address family not supported by protocol family",
-	48:  "address already in use",
-	49:  "can't assign requested address",
-	50:  "network is down",
-	51:  "network is unreachable",
-	52:  "network dropped connection on reset",
-	53:  "software caused connection abort",
-	54:  "connection reset by peer",
-	55:  "no buffer space available",
-	56:  "socket is already connected",
-	57:  "socket is not connected",
-	58:  "can't send after socket shutdown",
-	59:  "too many references: can't splice",
-	60:  "operation timed out",
-	61:  "connection refused",
-	62:  "too many levels of symbolic links",
-	63:  "file name too long",
-	64:  "host is down",
-	65:  "no route to host",
-	66:  "directory not empty",
-	67:  "too many processes",
-	68:  "too many users",
-	69:  "disc quota exceeded",
-	70:  "stale NFS file handle",
-	71:  "too many levels of remote in path",
-	72:  "RPC struct is bad",
-	73:  "RPC version wrong",
-	74:  "RPC prog. not avail",
-	75:  "program version wrong",
-	76:  "bad procedure for program",
-	77:  "no locks available",
-	78:  "function not implemented",
-	79:  "inappropriate file type or format",
-	80:  "authentication error",
-	81:  "need authenticator",
-	82:  "device power is off",
-	83:  "device error",
-	84:  "value too large to be stored in data type",
-	85:  "bad executable (or shared library)",
-	86:  "bad CPU type in executable",
-	87:  "shared library version mismatch",
-	88:  "malformed Mach-o file",
-	89:  "operation canceled",
-	90:  "identifier removed",
-	91:  "no message of desired type",
-	92:  "illegal byte sequence",
-	93:  "attribute not found",
-	94:  "bad message",
-	95:  "EMULTIHOP (Reserved)",
-	96:  "no message available on STREAM",
-	97:  "ENOLINK (Reserved)",
-	98:  "no STREAM resources",
-	99:  "not a STREAM",
-	100: "protocol error",
-	101: "STREAM ioctl timeout",
-	102: "operation not supported on socket",
-	103: "policy not found",
-	104: "state not recoverable",
-	105: "previous owner died",
-	106: "interface output queue is full",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
deleted file mode 100644
index 0feceee151..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
+++ /dev/null
@@ -1,1530 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,dragonfly
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ATM                            = 0x1e
-	AF_BLUETOOTH                      = 0x21
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x23
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1c
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x24
-	AF_MPLS                           = 0x22
-	AF_NATM                           = 0x1d
-	AF_NETGRAPH                       = 0x20
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x18
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0104279
-	BIOCGETIF                         = 0x4020426b
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x2000427a
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044278
-	BIOCSETF                          = 0x80104267
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x8010427b
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x8
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DEFAULTBUFSIZE                = 0x1000
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MAX_CLONES                    = 0x80
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DOCSIS                        = 0x8f
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_REDBACK_SMARTEDGE             = 0x20
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DBF                            = 0xf
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_EXCEPT                     = -0x8
-	EVFILT_MARKER                     = 0xf
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x8
-	EVFILT_TIMER                      = -0x7
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_NODATA                         = 0x1000
-	EV_ONESHOT                        = 0x10
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTEXIT_LWP                       = 0x10000
-	EXTEXIT_PROC                      = 0x0
-	EXTEXIT_SETINT                    = 0x1
-	EXTEXIT_SIMPLE                    = 0x0
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_DUP2FD                          = 0xa
-	F_DUP2FD_CLOEXEC                  = 0x12
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x11
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETOWN                          = 0x5
-	F_OK                              = 0x0
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x118e72
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MONITOR                       = 0x40000
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NPOLLING                      = 0x100000
-	IFF_OACTIVE                       = 0x400
-	IFF_OACTIVE_COMPAT                = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_POLLING                       = 0x10000
-	IFF_POLLING_COMPAT                = 0x10000
-	IFF_PPROMISC                      = 0x20000
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_SMART                         = 0x20
-	IFF_STATICARP                     = 0x80000
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xf3
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0xfe
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SKIP                      = 0x39
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TLSP                      = 0x38
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UNKNOWN                   = 0x102
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MMTU                         = 0x500
-	IPV6_MSFILTER                     = 0x4a
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PKTOPTIONS                   = 0x34
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_PREFER_TEMPADDR              = 0x3f
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW_ADD                         = 0x32
-	IP_FW_DEL                         = 0x33
-	IP_FW_FLUSH                       = 0x34
-	IP_FW_GET                         = 0x36
-	IP_FW_RESETLOG                    = 0x37
-	IP_FW_ZERO                        = 0x35
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0x14
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x42
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x41
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_AUTOSYNC                     = 0x7
-	MADV_CONTROL_END                  = 0xb
-	MADV_CONTROL_START                = 0xa
-	MADV_CORE                         = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_INVAL                        = 0xa
-	MADV_NOCORE                       = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_NOSYNC                       = 0x6
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SETMAP                       = 0xb
-	MADV_WILLNEED                     = 0x3
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_NOCORE                        = 0x20000
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_NOSYNC                        = 0x800
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_SHARED                        = 0x1
-	MAP_SIZEALIGN                     = 0x40000
-	MAP_STACK                         = 0x400
-	MAP_TRYFIXED                      = 0x10000
-	MAP_VPAGETABLE                    = 0x2000
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_FBLOCKING                     = 0x10000
-	MSG_FMASK                         = 0xffff0000
-	MSG_FNONBLOCKING                  = 0x20000
-	MSG_NOSIGNAL                      = 0x400
-	MSG_NOTIFICATION                  = 0x200
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_SYNC                          = 0x800
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x0
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_MAXID                      = 0x4
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_OOB                          = 0x2
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x20000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x10000
-	O_DIRECTORY                       = 0x8000000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FAPPEND                         = 0x100000
-	O_FASYNCWRITE                     = 0x800000
-	O_FBLOCKING                       = 0x40000
-	O_FBUFFERED                       = 0x2000000
-	O_FMASK                           = 0x7fc0000
-	O_FNONBLOCKING                    = 0x80000
-	O_FOFFSET                         = 0x200000
-	O_FSYNC                           = 0x80
-	O_FSYNCWRITE                      = 0x400000
-	O_FUNBUFFERED                     = 0x1000000
-	O_MAPONREAD                       = 0x4000000
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0xb
-	RTAX_MPLS1                        = 0x8
-	RTAX_MPLS2                        = 0x9
-	RTAX_MPLS3                        = 0xa
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_MPLS1                         = 0x100
-	RTA_MPLS2                         = 0x200
-	RTA_MPLS3                         = 0x400
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_CLONING                       = 0x100
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MPLSOPS                       = 0x1000000
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_REJECT                        = 0x8
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_WASCLONED                     = 0x20000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x12
-	RTM_IFANNOUNCE                    = 0x11
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x6
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_IWCAPSEGS                     = 0x400
-	RTV_IWMAXSEGS                     = 0x200
-	RTV_MSL                           = 0x100
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCADDRT                         = 0x8040720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCALIFADDR                      = 0x8118691b
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDELRT                         = 0x8040720b
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8118691d
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETSGCNT                      = 0xc0207210
-	SIOCGETVIFCNT                     = 0xc028720f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020691f
-	SIOCGIFCONF                       = 0xc0106924
-	SIOCGIFDATA                       = 0xc0206926
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc028698a
-	SIOCGIFINDEX                      = 0xc0206920
-	SIOCGIFMEDIA                      = 0xc0306938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPOLLCPU                    = 0xc020697e
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFSTATUS                     = 0xc331693b
-	SIOCGIFTSOLEN                     = 0xc0206980
-	SIOCGLIFADDR                      = 0xc118691c
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPRIVATE_0                    = 0xc0206950
-	SIOCGPRIVATE_1                    = 0xc0206951
-	SIOCIFCREATE                      = 0xc020697a
-	SIOCIFCREATE2                     = 0xc020697c
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106978
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020691e
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNAME                       = 0x80206928
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFPOLLCPU                    = 0x8020697d
-	SIOCSIFTSOLEN                     = 0x8020697f
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NOSIGPIPE                      = 0x800
-	SO_OOBINLINE                      = 0x100
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDSPACE                       = 0x100a
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_FASTKEEP                      = 0x80
-	TCP_KEEPCNT                       = 0x400
-	TCP_KEEPIDLE                      = 0x100
-	TCP_KEEPINIT                      = 0x20
-	TCP_KEEPINTVL                     = 0x200
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MINMSS                        = 0x100
-	TCP_MIN_WINSHIFT                  = 0x5
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_SIGNATURE_ENABLE              = 0x10
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40107458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGSID                          = 0x40047463
-	TIOCGSIZE                         = 0x40087468
-	TIOCGWINSZ                        = 0x40087468
-	TIOCISPTMASTER                    = 0x20007455
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x40047403
-	TIOCMODS                          = 0x80047404
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2000745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSSIZE                         = 0x80087467
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40107459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VCHECKPT                          = 0x13
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VERASE2                           = 0x7
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x4
-	WCOREFLAG                         = 0x80
-	WLINUXCLONE                       = 0x80000000
-	WNOHANG                           = 0x1
-	WSTOPPED                          = 0x7f
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EASYNC          = syscall.Errno(0x63)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x59)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x55)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDOOFUS         = syscall.Errno(0x58)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x56)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x63)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5a)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x57)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5b)
-	ENOMEDIUM       = syscall.Errno(0x5d)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5c)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUNUSED94       = syscall.Errno(0x5e)
-	EUNUSED95       = syscall.Errno(0x5f)
-	EUNUSED96       = syscall.Errno(0x60)
-	EUNUSED97       = syscall.Errno(0x61)
-	EUNUSED98       = syscall.Errno(0x62)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT     = syscall.Signal(0x6)
-	SIGALRM     = syscall.Signal(0xe)
-	SIGBUS      = syscall.Signal(0xa)
-	SIGCHLD     = syscall.Signal(0x14)
-	SIGCKPT     = syscall.Signal(0x21)
-	SIGCKPTEXIT = syscall.Signal(0x22)
-	SIGCONT     = syscall.Signal(0x13)
-	SIGEMT      = syscall.Signal(0x7)
-	SIGFPE      = syscall.Signal(0x8)
-	SIGHUP      = syscall.Signal(0x1)
-	SIGILL      = syscall.Signal(0x4)
-	SIGINFO     = syscall.Signal(0x1d)
-	SIGINT      = syscall.Signal(0x2)
-	SIGIO       = syscall.Signal(0x17)
-	SIGIOT      = syscall.Signal(0x6)
-	SIGKILL     = syscall.Signal(0x9)
-	SIGPIPE     = syscall.Signal(0xd)
-	SIGPROF     = syscall.Signal(0x1b)
-	SIGQUIT     = syscall.Signal(0x3)
-	SIGSEGV     = syscall.Signal(0xb)
-	SIGSTOP     = syscall.Signal(0x11)
-	SIGSYS      = syscall.Signal(0xc)
-	SIGTERM     = syscall.Signal(0xf)
-	SIGTHR      = syscall.Signal(0x20)
-	SIGTRAP     = syscall.Signal(0x5)
-	SIGTSTP     = syscall.Signal(0x12)
-	SIGTTIN     = syscall.Signal(0x15)
-	SIGTTOU     = syscall.Signal(0x16)
-	SIGURG      = syscall.Signal(0x10)
-	SIGUSR1     = syscall.Signal(0x1e)
-	SIGUSR2     = syscall.Signal(0x1f)
-	SIGVTALRM   = syscall.Signal(0x1a)
-	SIGWINCH    = syscall.Signal(0x1c)
-	SIGXCPU     = syscall.Signal(0x18)
-	SIGXFSZ     = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "no medium found",
-	94: "unknown error: 94",
-	95: "unknown error: 95",
-	96: "unknown error: 96",
-	97: "unknown error: 97",
-	98: "unknown error: 98",
-	99: "unknown error: 99",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "thread Scheduler",
-	33: "checkPoint",
-	34: "checkPointExit",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
deleted file mode 100644
index 7b95751c3d..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
+++ /dev/null
@@ -1,1743 +0,0 @@
-// mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,freebsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m32 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x23
-	AF_ATM                            = 0x1e
-	AF_BLUETOOTH                      = 0x24
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1c
-	AF_INET6_SDP                      = 0x2a
-	AF_INET_SDP                       = 0x28
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x2a
-	AF_NATM                           = 0x1d
-	AF_NETBIOS                        = 0x6
-	AF_NETGRAPH                       = 0x20
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SCLUSTER                       = 0x22
-	AF_SIP                            = 0x18
-	AF_SLOW                           = 0x21
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_VENDOR00                       = 0x27
-	AF_VENDOR01                       = 0x29
-	AF_VENDOR02                       = 0x2b
-	AF_VENDOR03                       = 0x2d
-	AF_VENDOR04                       = 0x2f
-	AF_VENDOR05                       = 0x31
-	AF_VENDOR06                       = 0x33
-	AF_VENDOR07                       = 0x35
-	AF_VENDOR08                       = 0x37
-	AF_VENDOR09                       = 0x39
-	AF_VENDOR10                       = 0x3b
-	AF_VENDOR11                       = 0x3d
-	AF_VENDOR12                       = 0x3f
-	AF_VENDOR13                       = 0x41
-	AF_VENDOR14                       = 0x43
-	AF_VENDOR15                       = 0x45
-	AF_VENDOR16                       = 0x47
-	AF_VENDOR17                       = 0x49
-	AF_VENDOR18                       = 0x4b
-	AF_VENDOR19                       = 0x4d
-	AF_VENDOR20                       = 0x4f
-	AF_VENDOR21                       = 0x51
-	AF_VENDOR22                       = 0x53
-	AF_VENDOR23                       = 0x55
-	AF_VENDOR24                       = 0x57
-	AF_VENDOR25                       = 0x59
-	AF_VENDOR26                       = 0x5b
-	AF_VENDOR27                       = 0x5d
-	AF_VENDOR28                       = 0x5f
-	AF_VENDOR29                       = 0x61
-	AF_VENDOR30                       = 0x63
-	AF_VENDOR31                       = 0x65
-	AF_VENDOR32                       = 0x67
-	AF_VENDOR33                       = 0x69
-	AF_VENDOR34                       = 0x6b
-	AF_VENDOR35                       = 0x6d
-	AF_VENDOR36                       = 0x6f
-	AF_VENDOR37                       = 0x71
-	AF_VENDOR38                       = 0x73
-	AF_VENDOR39                       = 0x75
-	AF_VENDOR40                       = 0x77
-	AF_VENDOR41                       = 0x79
-	AF_VENDOR42                       = 0x7b
-	AF_VENDOR43                       = 0x7d
-	AF_VENDOR44                       = 0x7f
-	AF_VENDOR45                       = 0x81
-	AF_VENDOR46                       = 0x83
-	AF_VENDOR47                       = 0x85
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427c
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRECTION                    = 0x40044276
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0084279
-	BIOCGETBUFMODE                    = 0x4004427d
-	BIOCGETIF                         = 0x4020426b
-	BIOCGETZMAX                       = 0x4004427f
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4008426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCGTSTAMP                       = 0x40044283
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x2000427a
-	BIOCPROMISC                       = 0x20004269
-	BIOCROTZBUF                       = 0x400c4280
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRECTION                    = 0x80044277
-	BIOCSDLT                          = 0x80044278
-	BIOCSETBUFMODE                    = 0x8004427e
-	BIOCSETF                          = 0x80084267
-	BIOCSETFNR                        = 0x80084282
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x8008427b
-	BIOCSETZBUF                       = 0x800c4281
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8008426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCSTSTAMP                       = 0x80044284
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_BUFMODE_BUFFER                = 0x1
-	BPF_BUFMODE_ZBUF                  = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_T_BINTIME                     = 0x2
-	BPF_T_BINTIME_FAST                = 0x102
-	BPF_T_BINTIME_MONOTONIC           = 0x202
-	BPF_T_BINTIME_MONOTONIC_FAST      = 0x302
-	BPF_T_FAST                        = 0x100
-	BPF_T_FLAG_MASK                   = 0x300
-	BPF_T_FORMAT_MASK                 = 0x3
-	BPF_T_MICROTIME                   = 0x0
-	BPF_T_MICROTIME_FAST              = 0x100
-	BPF_T_MICROTIME_MONOTONIC         = 0x200
-	BPF_T_MICROTIME_MONOTONIC_FAST    = 0x300
-	BPF_T_MONOTONIC                   = 0x200
-	BPF_T_MONOTONIC_FAST              = 0x300
-	BPF_T_NANOTIME                    = 0x1
-	BPF_T_NANOTIME_FAST               = 0x101
-	BPF_T_NANOTIME_MONOTONIC          = 0x201
-	BPF_T_NANOTIME_MONOTONIC_FAST     = 0x301
-	BPF_T_NONE                        = 0x3
-	BPF_T_NORMAL                      = 0x0
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CLOCK_MONOTONIC                   = 0x4
-	CLOCK_MONOTONIC_FAST              = 0xc
-	CLOCK_MONOTONIC_PRECISE           = 0xb
-	CLOCK_PROCESS_CPUTIME_ID          = 0xf
-	CLOCK_PROF                        = 0x2
-	CLOCK_REALTIME                    = 0x0
-	CLOCK_REALTIME_FAST               = 0xa
-	CLOCK_REALTIME_PRECISE            = 0x9
-	CLOCK_SECOND                      = 0xd
-	CLOCK_THREAD_CPUTIME_ID           = 0xe
-	CLOCK_UPTIME                      = 0x5
-	CLOCK_UPTIME_FAST                 = 0x8
-	CLOCK_UPTIME_PRECISE              = 0x7
-	CLOCK_VIRTUAL                     = 0x1
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0x18
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf6
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x79
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_LIO                        = -0xa
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xb
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xb
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_DROP                           = 0x1000
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTATTR_NAMESPACE_EMPTY           = 0x0
-	EXTATTR_NAMESPACE_SYSTEM          = 0x2
-	EXTATTR_NAMESPACE_USER            = 0x1
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_CANCEL                          = 0x5
-	F_DUP2FD                          = 0xa
-	F_DUP2FD_CLOEXEC                  = 0x12
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x11
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0xb
-	F_GETOWN                          = 0x5
-	F_OGETLK                          = 0x7
-	F_OK                              = 0x0
-	F_OSETLK                          = 0x8
-	F_OSETLKW                         = 0x9
-	F_RDAHEAD                         = 0x10
-	F_RDLCK                           = 0x1
-	F_READAHEAD                       = 0xf
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0xc
-	F_SETLKW                          = 0xd
-	F_SETLK_REMOTE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_UNLCKSYS                        = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x218f72
-	IFF_CANTCONFIG                    = 0x10000
-	IFF_DEBUG                         = 0x4
-	IFF_DRV_OACTIVE                   = 0x400
-	IFF_DRV_RUNNING                   = 0x40
-	IFF_DYING                         = 0x200000
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MONITOR                       = 0x40000
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PPROMISC                      = 0x20000
-	IFF_PROMISC                       = 0x100
-	IFF_RENAMING                      = 0x400000
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_SMART                         = 0x20
-	IFF_STATICARP                     = 0x80000
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_IPXIP                         = 0xf9
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf6
-	IFT_PFSYNC                        = 0xf7
-	IFT_PLC                           = 0xae
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_MASK                   = 0xfffffffe
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HIP                       = 0x8b
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MH                        = 0x87
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OLD_DIVERT                = 0xfe
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_RESERVED_253              = 0xfd
-	IPPROTO_RESERVED_254              = 0xfe
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEND                      = 0x103
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SHIM6                     = 0x8c
-	IPPROTO_SKIP                      = 0x39
-	IPPROTO_SPACER                    = 0x7fff
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TLSP                      = 0x38
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_BINDANY                      = 0x40
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MSFILTER                     = 0x4a
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_PREFER_TEMPADDR              = 0x3f
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BINDANY                        = 0x18
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DONTFRAG                       = 0x43
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET3                      = 0x31
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW3                            = 0x30
-	IP_FW_ADD                         = 0x32
-	IP_FW_DEL                         = 0x33
-	IP_FW_FLUSH                       = 0x34
-	IP_FW_GET                         = 0x36
-	IP_FW_NAT_CFG                     = 0x38
-	IP_FW_NAT_DEL                     = 0x39
-	IP_FW_NAT_GET_CONFIG              = 0x3a
-	IP_FW_NAT_GET_LOG                 = 0x3b
-	IP_FW_RESETLOG                    = 0x37
-	IP_FW_TABLE_ADD                   = 0x28
-	IP_FW_TABLE_DEL                   = 0x29
-	IP_FW_TABLE_FLUSH                 = 0x2a
-	IP_FW_TABLE_GETSIZE               = 0x2b
-	IP_FW_TABLE_LIST                  = 0x2c
-	IP_FW_ZERO                        = 0x35
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MAX_SOURCE_FILTER              = 0x400
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x42
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_OFFMASK                        = 0x1fff
-	IP_ONESBCAST                      = 0x17
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTOS                        = 0x44
-	IP_RECVTTL                        = 0x41
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_SENDSRCADDR                    = 0x7
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_AUTOSYNC                     = 0x7
-	MADV_CORE                         = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_NOCORE                       = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_NOSYNC                       = 0x6
-	MADV_PROTECT                      = 0xa
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MAP_ALIGNED_SUPER                 = 0x1000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_ANONYMOUS                     = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_EXCL                          = 0x4000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_NOCORE                        = 0x20000
-	MAP_NORESERVE                     = 0x40
-	MAP_NOSYNC                        = 0x800
-	MAP_PREFAULT_READ                 = 0x40000
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_RESERVED0100                  = 0x100
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CMSG_CLOEXEC                  = 0x40000
-	MSG_COMPAT                        = 0x8000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_NBIO                          = 0x4000
-	MSG_NOSIGNAL                      = 0x20000
-	MSG_NOTIFICATION                  = 0x2000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x0
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLISTL                    = 0x5
-	NET_RT_IFMALIST                   = 0x4
-	NET_RT_MAXID                      = 0x6
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x100000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x10000
-	O_DIRECTORY                       = 0x20000
-	O_EXCL                            = 0x800
-	O_EXEC                            = 0x40000
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_TTY_INIT                        = 0x80000
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x1004d808
-	RTF_GATEWAY                       = 0x2
-	RTF_GWFLAG_COMPAT                 = 0x80000000
-	RTF_HOST                          = 0x4
-	RTF_LLDATA                        = 0x400
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_REJECT                        = 0x8
-	RTF_RNH_LOCKED                    = 0x40000000
-	RTF_STATIC                        = 0x800
-	RTF_STICKY                        = 0x10000000
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x12
-	RTM_IFANNOUNCE                    = 0x11
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RTV_WEIGHT                        = 0x100
-	RT_ALL_FIBS                       = -0x1
-	RT_CACHING_CONTEXT                = 0x1
-	RT_DEFAULT_FIB                    = 0x0
-	RT_NORTREF                        = 0x2
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_BINTIME                       = 0x4
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCADDRT                         = 0x8030720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80246987
-	SIOCALIFADDR                      = 0x8118691b
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDELRT                         = 0x8030720b
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80246989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8118691d
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETSGCNT                      = 0xc0147210
-	SIOCGETVIFCNT                     = 0xc014720f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020691f
-	SIOCGIFCONF                       = 0xc0086924
-	SIOCGIFDESCR                      = 0xc020692a
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFIB                        = 0xc020695c
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc024698a
-	SIOCGIFGROUP                      = 0xc0246988
-	SIOCGIFINDEX                      = 0xc0206920
-	SIOCGIFMAC                        = 0xc0206926
-	SIOCGIFMEDIA                      = 0xc0286938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFSTATUS                     = 0xc331693b
-	SIOCGLIFADDR                      = 0xc118691c
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPRIVATE_0                    = 0xc0206950
-	SIOCGPRIVATE_1                    = 0xc0206951
-	SIOCIFCREATE                      = 0xc020697a
-	SIOCIFCREATE2                     = 0xc020697c
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCSDRVSPEC                      = 0x801c697b
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020691e
-	SIOCSIFDESCR                      = 0x80206929
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFIB                        = 0x8020695d
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206927
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNAME                       = 0x80206928
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFRVNET                      = 0xc020695b
-	SIOCSIFVNET                       = 0xc020695a
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BINTIME                        = 0x2000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1009
-	SO_LINGER                         = 0x80
-	SO_LISTENINCQLEN                  = 0x1013
-	SO_LISTENQLEN                     = 0x1012
-	SO_LISTENQLIMIT                   = 0x1011
-	SO_NOSIGPIPE                      = 0x800
-	SO_NO_DDP                         = 0x8000
-	SO_NO_OFFLOAD                     = 0x4000
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1010
-	SO_PROTOCOL                       = 0x1016
-	SO_PROTOTYPE                      = 0x1016
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SETFIB                         = 0x1014
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SO_USER_COOKIE                    = 0x1015
-	SO_VENDOR                         = 0x80000000
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CA_NAME_MAX                   = 0x10
-	TCP_CONGESTION                    = 0x40
-	TCP_INFO                          = 0x20
-	TCP_KEEPCNT                       = 0x400
-	TCP_KEEPIDLE                      = 0x100
-	TCP_KEEPINIT                      = 0x80
-	TCP_KEEPINTVL                     = 0x200
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_VENDOR                        = 0x80000000
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGPTN                          = 0x4004740f
-	TIOCGSID                          = 0x40047463
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DCD                         = 0x40
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMASTER                      = 0x2000741c
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40087459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VERASE2                           = 0x7
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x4
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x10
-	WLINUXCLONE                       = 0x80000000
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x8
-	WSTOPPED                          = 0x2
-	WTRAPPED                          = 0x20
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x59)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x55)
-	ECAPMODE        = syscall.Errno(0x5e)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDOOFUS         = syscall.Errno(0x58)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x56)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x60)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5a)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x57)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCAPABLE     = syscall.Errno(0x5d)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x5f)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x60)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5c)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGLIBRT  = syscall.Signal(0x21)
-	SIGLWP    = syscall.Signal(0x20)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "capabilities insufficient",
-	94: "not permitted in capability mode",
-	95: "state not recoverable",
-	96: "previous owner died",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "unknown signal",
-	33: "unknown signal",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
deleted file mode 100644
index e48e7799a1..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
+++ /dev/null
@@ -1,1748 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,freebsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x23
-	AF_ATM                            = 0x1e
-	AF_BLUETOOTH                      = 0x24
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1c
-	AF_INET6_SDP                      = 0x2a
-	AF_INET_SDP                       = 0x28
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x2a
-	AF_NATM                           = 0x1d
-	AF_NETBIOS                        = 0x6
-	AF_NETGRAPH                       = 0x20
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SCLUSTER                       = 0x22
-	AF_SIP                            = 0x18
-	AF_SLOW                           = 0x21
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_VENDOR00                       = 0x27
-	AF_VENDOR01                       = 0x29
-	AF_VENDOR02                       = 0x2b
-	AF_VENDOR03                       = 0x2d
-	AF_VENDOR04                       = 0x2f
-	AF_VENDOR05                       = 0x31
-	AF_VENDOR06                       = 0x33
-	AF_VENDOR07                       = 0x35
-	AF_VENDOR08                       = 0x37
-	AF_VENDOR09                       = 0x39
-	AF_VENDOR10                       = 0x3b
-	AF_VENDOR11                       = 0x3d
-	AF_VENDOR12                       = 0x3f
-	AF_VENDOR13                       = 0x41
-	AF_VENDOR14                       = 0x43
-	AF_VENDOR15                       = 0x45
-	AF_VENDOR16                       = 0x47
-	AF_VENDOR17                       = 0x49
-	AF_VENDOR18                       = 0x4b
-	AF_VENDOR19                       = 0x4d
-	AF_VENDOR20                       = 0x4f
-	AF_VENDOR21                       = 0x51
-	AF_VENDOR22                       = 0x53
-	AF_VENDOR23                       = 0x55
-	AF_VENDOR24                       = 0x57
-	AF_VENDOR25                       = 0x59
-	AF_VENDOR26                       = 0x5b
-	AF_VENDOR27                       = 0x5d
-	AF_VENDOR28                       = 0x5f
-	AF_VENDOR29                       = 0x61
-	AF_VENDOR30                       = 0x63
-	AF_VENDOR31                       = 0x65
-	AF_VENDOR32                       = 0x67
-	AF_VENDOR33                       = 0x69
-	AF_VENDOR34                       = 0x6b
-	AF_VENDOR35                       = 0x6d
-	AF_VENDOR36                       = 0x6f
-	AF_VENDOR37                       = 0x71
-	AF_VENDOR38                       = 0x73
-	AF_VENDOR39                       = 0x75
-	AF_VENDOR40                       = 0x77
-	AF_VENDOR41                       = 0x79
-	AF_VENDOR42                       = 0x7b
-	AF_VENDOR43                       = 0x7d
-	AF_VENDOR44                       = 0x7f
-	AF_VENDOR45                       = 0x81
-	AF_VENDOR46                       = 0x83
-	AF_VENDOR47                       = 0x85
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427c
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRECTION                    = 0x40044276
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0104279
-	BIOCGETBUFMODE                    = 0x4004427d
-	BIOCGETIF                         = 0x4020426b
-	BIOCGETZMAX                       = 0x4008427f
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCGTSTAMP                       = 0x40044283
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x2000427a
-	BIOCPROMISC                       = 0x20004269
-	BIOCROTZBUF                       = 0x40184280
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRECTION                    = 0x80044277
-	BIOCSDLT                          = 0x80044278
-	BIOCSETBUFMODE                    = 0x8004427e
-	BIOCSETF                          = 0x80104267
-	BIOCSETFNR                        = 0x80104282
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x8010427b
-	BIOCSETZBUF                       = 0x80184281
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCSTSTAMP                       = 0x80044284
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x8
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_BUFMODE_BUFFER                = 0x1
-	BPF_BUFMODE_ZBUF                  = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_T_BINTIME                     = 0x2
-	BPF_T_BINTIME_FAST                = 0x102
-	BPF_T_BINTIME_MONOTONIC           = 0x202
-	BPF_T_BINTIME_MONOTONIC_FAST      = 0x302
-	BPF_T_FAST                        = 0x100
-	BPF_T_FLAG_MASK                   = 0x300
-	BPF_T_FORMAT_MASK                 = 0x3
-	BPF_T_MICROTIME                   = 0x0
-	BPF_T_MICROTIME_FAST              = 0x100
-	BPF_T_MICROTIME_MONOTONIC         = 0x200
-	BPF_T_MICROTIME_MONOTONIC_FAST    = 0x300
-	BPF_T_MONOTONIC                   = 0x200
-	BPF_T_MONOTONIC_FAST              = 0x300
-	BPF_T_NANOTIME                    = 0x1
-	BPF_T_NANOTIME_FAST               = 0x101
-	BPF_T_NANOTIME_MONOTONIC          = 0x201
-	BPF_T_NANOTIME_MONOTONIC_FAST     = 0x301
-	BPF_T_NONE                        = 0x3
-	BPF_T_NORMAL                      = 0x0
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CLOCK_MONOTONIC                   = 0x4
-	CLOCK_MONOTONIC_FAST              = 0xc
-	CLOCK_MONOTONIC_PRECISE           = 0xb
-	CLOCK_PROCESS_CPUTIME_ID          = 0xf
-	CLOCK_PROF                        = 0x2
-	CLOCK_REALTIME                    = 0x0
-	CLOCK_REALTIME_FAST               = 0xa
-	CLOCK_REALTIME_PRECISE            = 0x9
-	CLOCK_SECOND                      = 0xd
-	CLOCK_THREAD_CPUTIME_ID           = 0xe
-	CLOCK_UPTIME                      = 0x5
-	CLOCK_UPTIME_FAST                 = 0x8
-	CLOCK_UPTIME_PRECISE              = 0x7
-	CLOCK_VIRTUAL                     = 0x1
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0x18
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf6
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x79
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_LIO                        = -0xa
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xb
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xb
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_DROP                           = 0x1000
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTATTR_NAMESPACE_EMPTY           = 0x0
-	EXTATTR_NAMESPACE_SYSTEM          = 0x2
-	EXTATTR_NAMESPACE_USER            = 0x1
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_CANCEL                          = 0x5
-	F_DUP2FD                          = 0xa
-	F_DUP2FD_CLOEXEC                  = 0x12
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x11
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0xb
-	F_GETOWN                          = 0x5
-	F_OGETLK                          = 0x7
-	F_OK                              = 0x0
-	F_OSETLK                          = 0x8
-	F_OSETLKW                         = 0x9
-	F_RDAHEAD                         = 0x10
-	F_RDLCK                           = 0x1
-	F_READAHEAD                       = 0xf
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0xc
-	F_SETLKW                          = 0xd
-	F_SETLK_REMOTE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_UNLCKSYS                        = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x218f72
-	IFF_CANTCONFIG                    = 0x10000
-	IFF_DEBUG                         = 0x4
-	IFF_DRV_OACTIVE                   = 0x400
-	IFF_DRV_RUNNING                   = 0x40
-	IFF_DYING                         = 0x200000
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MONITOR                       = 0x40000
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PPROMISC                      = 0x20000
-	IFF_PROMISC                       = 0x100
-	IFF_RENAMING                      = 0x400000
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_SMART                         = 0x20
-	IFF_STATICARP                     = 0x80000
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_IPXIP                         = 0xf9
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf6
-	IFT_PFSYNC                        = 0xf7
-	IFT_PLC                           = 0xae
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_MASK                   = 0xfffffffe
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HIP                       = 0x8b
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MH                        = 0x87
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OLD_DIVERT                = 0xfe
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_RESERVED_253              = 0xfd
-	IPPROTO_RESERVED_254              = 0xfe
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEND                      = 0x103
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SHIM6                     = 0x8c
-	IPPROTO_SKIP                      = 0x39
-	IPPROTO_SPACER                    = 0x7fff
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TLSP                      = 0x38
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_BINDANY                      = 0x40
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MSFILTER                     = 0x4a
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_PREFER_TEMPADDR              = 0x3f
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BINDANY                        = 0x18
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DONTFRAG                       = 0x43
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET3                      = 0x31
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW3                            = 0x30
-	IP_FW_ADD                         = 0x32
-	IP_FW_DEL                         = 0x33
-	IP_FW_FLUSH                       = 0x34
-	IP_FW_GET                         = 0x36
-	IP_FW_NAT_CFG                     = 0x38
-	IP_FW_NAT_DEL                     = 0x39
-	IP_FW_NAT_GET_CONFIG              = 0x3a
-	IP_FW_NAT_GET_LOG                 = 0x3b
-	IP_FW_RESETLOG                    = 0x37
-	IP_FW_TABLE_ADD                   = 0x28
-	IP_FW_TABLE_DEL                   = 0x29
-	IP_FW_TABLE_FLUSH                 = 0x2a
-	IP_FW_TABLE_GETSIZE               = 0x2b
-	IP_FW_TABLE_LIST                  = 0x2c
-	IP_FW_ZERO                        = 0x35
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MAX_SOURCE_FILTER              = 0x400
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x42
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_OFFMASK                        = 0x1fff
-	IP_ONESBCAST                      = 0x17
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTOS                        = 0x44
-	IP_RECVTTL                        = 0x41
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_SENDSRCADDR                    = 0x7
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_AUTOSYNC                     = 0x7
-	MADV_CORE                         = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_NOCORE                       = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_NOSYNC                       = 0x6
-	MADV_PROTECT                      = 0xa
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MAP_32BIT                         = 0x80000
-	MAP_ALIGNED_SUPER                 = 0x1000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_ANONYMOUS                     = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_EXCL                          = 0x4000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_NOCORE                        = 0x20000
-	MAP_NORESERVE                     = 0x40
-	MAP_NOSYNC                        = 0x800
-	MAP_PREFAULT_READ                 = 0x40000
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_RESERVED0100                  = 0x100
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CMSG_CLOEXEC                  = 0x40000
-	MSG_COMPAT                        = 0x8000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_NBIO                          = 0x4000
-	MSG_NOSIGNAL                      = 0x20000
-	MSG_NOTIFICATION                  = 0x2000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x0
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLISTL                    = 0x5
-	NET_RT_IFMALIST                   = 0x4
-	NET_RT_MAXID                      = 0x6
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_MSECONDS                     = 0x2
-	NOTE_NSECONDS                     = 0x8
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_SECONDS                      = 0x1
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_USECONDS                     = 0x4
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x100000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x10000
-	O_DIRECTORY                       = 0x20000
-	O_EXCL                            = 0x800
-	O_EXEC                            = 0x40000
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_TTY_INIT                        = 0x80000
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x1004d808
-	RTF_GATEWAY                       = 0x2
-	RTF_GWFLAG_COMPAT                 = 0x80000000
-	RTF_HOST                          = 0x4
-	RTF_LLDATA                        = 0x400
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_REJECT                        = 0x8
-	RTF_RNH_LOCKED                    = 0x40000000
-	RTF_STATIC                        = 0x800
-	RTF_STICKY                        = 0x10000000
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x12
-	RTM_IFANNOUNCE                    = 0x11
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RTV_WEIGHT                        = 0x100
-	RT_ALL_FIBS                       = -0x1
-	RT_CACHING_CONTEXT                = 0x1
-	RT_DEFAULT_FIB                    = 0x0
-	RT_NORTREF                        = 0x2
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_BINTIME                       = 0x4
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCADDRT                         = 0x8040720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80286987
-	SIOCALIFADDR                      = 0x8118691b
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDELRT                         = 0x8040720b
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80286989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8118691d
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETSGCNT                      = 0xc0207210
-	SIOCGETVIFCNT                     = 0xc028720f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020691f
-	SIOCGIFCONF                       = 0xc0106924
-	SIOCGIFDESCR                      = 0xc020692a
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFIB                        = 0xc020695c
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc028698a
-	SIOCGIFGROUP                      = 0xc0286988
-	SIOCGIFINDEX                      = 0xc0206920
-	SIOCGIFMAC                        = 0xc0206926
-	SIOCGIFMEDIA                      = 0xc0306938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFSTATUS                     = 0xc331693b
-	SIOCGLIFADDR                      = 0xc118691c
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPRIVATE_0                    = 0xc0206950
-	SIOCGPRIVATE_1                    = 0xc0206951
-	SIOCIFCREATE                      = 0xc020697a
-	SIOCIFCREATE2                     = 0xc020697c
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106978
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020691e
-	SIOCSIFDESCR                      = 0x80206929
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFIB                        = 0x8020695d
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206927
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNAME                       = 0x80206928
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFRVNET                      = 0xc020695b
-	SIOCSIFVNET                       = 0xc020695a
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BINTIME                        = 0x2000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1009
-	SO_LINGER                         = 0x80
-	SO_LISTENINCQLEN                  = 0x1013
-	SO_LISTENQLEN                     = 0x1012
-	SO_LISTENQLIMIT                   = 0x1011
-	SO_NOSIGPIPE                      = 0x800
-	SO_NO_DDP                         = 0x8000
-	SO_NO_OFFLOAD                     = 0x4000
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1010
-	SO_PROTOCOL                       = 0x1016
-	SO_PROTOTYPE                      = 0x1016
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SETFIB                         = 0x1014
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SO_USER_COOKIE                    = 0x1015
-	SO_VENDOR                         = 0x80000000
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CA_NAME_MAX                   = 0x10
-	TCP_CONGESTION                    = 0x40
-	TCP_INFO                          = 0x20
-	TCP_KEEPCNT                       = 0x400
-	TCP_KEEPIDLE                      = 0x100
-	TCP_KEEPINIT                      = 0x80
-	TCP_KEEPINTVL                     = 0x200
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_VENDOR                        = 0x80000000
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGPTN                          = 0x4004740f
-	TIOCGSID                          = 0x40047463
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DCD                         = 0x40
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMASTER                      = 0x2000741c
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40107459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VERASE2                           = 0x7
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x4
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x10
-	WLINUXCLONE                       = 0x80000000
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x8
-	WSTOPPED                          = 0x2
-	WTRAPPED                          = 0x20
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x59)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x55)
-	ECAPMODE        = syscall.Errno(0x5e)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDOOFUS         = syscall.Errno(0x58)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x56)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x60)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5a)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x57)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCAPABLE     = syscall.Errno(0x5d)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x5f)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x60)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5c)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGLIBRT  = syscall.Signal(0x21)
-	SIGLWP    = syscall.Signal(0x20)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "capabilities insufficient",
-	94: "not permitted in capability mode",
-	95: "state not recoverable",
-	96: "previous owner died",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "unknown signal",
-	33: "unknown signal",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
deleted file mode 100644
index 2afbe2d5ed..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
+++ /dev/null
@@ -1,1729 +0,0 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm,freebsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x23
-	AF_ATM                            = 0x1e
-	AF_BLUETOOTH                      = 0x24
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1c
-	AF_INET6_SDP                      = 0x2a
-	AF_INET_SDP                       = 0x28
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x2a
-	AF_NATM                           = 0x1d
-	AF_NETBIOS                        = 0x6
-	AF_NETGRAPH                       = 0x20
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SCLUSTER                       = 0x22
-	AF_SIP                            = 0x18
-	AF_SLOW                           = 0x21
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_VENDOR00                       = 0x27
-	AF_VENDOR01                       = 0x29
-	AF_VENDOR02                       = 0x2b
-	AF_VENDOR03                       = 0x2d
-	AF_VENDOR04                       = 0x2f
-	AF_VENDOR05                       = 0x31
-	AF_VENDOR06                       = 0x33
-	AF_VENDOR07                       = 0x35
-	AF_VENDOR08                       = 0x37
-	AF_VENDOR09                       = 0x39
-	AF_VENDOR10                       = 0x3b
-	AF_VENDOR11                       = 0x3d
-	AF_VENDOR12                       = 0x3f
-	AF_VENDOR13                       = 0x41
-	AF_VENDOR14                       = 0x43
-	AF_VENDOR15                       = 0x45
-	AF_VENDOR16                       = 0x47
-	AF_VENDOR17                       = 0x49
-	AF_VENDOR18                       = 0x4b
-	AF_VENDOR19                       = 0x4d
-	AF_VENDOR20                       = 0x4f
-	AF_VENDOR21                       = 0x51
-	AF_VENDOR22                       = 0x53
-	AF_VENDOR23                       = 0x55
-	AF_VENDOR24                       = 0x57
-	AF_VENDOR25                       = 0x59
-	AF_VENDOR26                       = 0x5b
-	AF_VENDOR27                       = 0x5d
-	AF_VENDOR28                       = 0x5f
-	AF_VENDOR29                       = 0x61
-	AF_VENDOR30                       = 0x63
-	AF_VENDOR31                       = 0x65
-	AF_VENDOR32                       = 0x67
-	AF_VENDOR33                       = 0x69
-	AF_VENDOR34                       = 0x6b
-	AF_VENDOR35                       = 0x6d
-	AF_VENDOR36                       = 0x6f
-	AF_VENDOR37                       = 0x71
-	AF_VENDOR38                       = 0x73
-	AF_VENDOR39                       = 0x75
-	AF_VENDOR40                       = 0x77
-	AF_VENDOR41                       = 0x79
-	AF_VENDOR42                       = 0x7b
-	AF_VENDOR43                       = 0x7d
-	AF_VENDOR44                       = 0x7f
-	AF_VENDOR45                       = 0x81
-	AF_VENDOR46                       = 0x83
-	AF_VENDOR47                       = 0x85
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427c
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRECTION                    = 0x40044276
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0084279
-	BIOCGETBUFMODE                    = 0x4004427d
-	BIOCGETIF                         = 0x4020426b
-	BIOCGETZMAX                       = 0x4004427f
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4008426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCGTSTAMP                       = 0x40044283
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x2000427a
-	BIOCPROMISC                       = 0x20004269
-	BIOCROTZBUF                       = 0x400c4280
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRECTION                    = 0x80044277
-	BIOCSDLT                          = 0x80044278
-	BIOCSETBUFMODE                    = 0x8004427e
-	BIOCSETF                          = 0x80084267
-	BIOCSETFNR                        = 0x80084282
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x8008427b
-	BIOCSETZBUF                       = 0x800c4281
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8008426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCSTSTAMP                       = 0x80044284
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_BUFMODE_BUFFER                = 0x1
-	BPF_BUFMODE_ZBUF                  = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_T_BINTIME                     = 0x2
-	BPF_T_BINTIME_FAST                = 0x102
-	BPF_T_BINTIME_MONOTONIC           = 0x202
-	BPF_T_BINTIME_MONOTONIC_FAST      = 0x302
-	BPF_T_FAST                        = 0x100
-	BPF_T_FLAG_MASK                   = 0x300
-	BPF_T_FORMAT_MASK                 = 0x3
-	BPF_T_MICROTIME                   = 0x0
-	BPF_T_MICROTIME_FAST              = 0x100
-	BPF_T_MICROTIME_MONOTONIC         = 0x200
-	BPF_T_MICROTIME_MONOTONIC_FAST    = 0x300
-	BPF_T_MONOTONIC                   = 0x200
-	BPF_T_MONOTONIC_FAST              = 0x300
-	BPF_T_NANOTIME                    = 0x1
-	BPF_T_NANOTIME_FAST               = 0x101
-	BPF_T_NANOTIME_MONOTONIC          = 0x201
-	BPF_T_NANOTIME_MONOTONIC_FAST     = 0x301
-	BPF_T_NONE                        = 0x3
-	BPF_T_NORMAL                      = 0x0
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0x18
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf6
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x79
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_LIO                        = -0xa
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xb
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xb
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_DROP                           = 0x1000
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTATTR_NAMESPACE_EMPTY           = 0x0
-	EXTATTR_NAMESPACE_SYSTEM          = 0x2
-	EXTATTR_NAMESPACE_USER            = 0x1
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_CANCEL                          = 0x5
-	F_DUP2FD                          = 0xa
-	F_DUP2FD_CLOEXEC                  = 0x12
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x11
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0xb
-	F_GETOWN                          = 0x5
-	F_OGETLK                          = 0x7
-	F_OK                              = 0x0
-	F_OSETLK                          = 0x8
-	F_OSETLKW                         = 0x9
-	F_RDAHEAD                         = 0x10
-	F_RDLCK                           = 0x1
-	F_READAHEAD                       = 0xf
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0xc
-	F_SETLKW                          = 0xd
-	F_SETLK_REMOTE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_UNLCKSYS                        = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x218f72
-	IFF_CANTCONFIG                    = 0x10000
-	IFF_DEBUG                         = 0x4
-	IFF_DRV_OACTIVE                   = 0x400
-	IFF_DRV_RUNNING                   = 0x40
-	IFF_DYING                         = 0x200000
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MONITOR                       = 0x40000
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PPROMISC                      = 0x20000
-	IFF_PROMISC                       = 0x100
-	IFF_RENAMING                      = 0x400000
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_SMART                         = 0x20
-	IFF_STATICARP                     = 0x80000
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_IPXIP                         = 0xf9
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf6
-	IFT_PFSYNC                        = 0xf7
-	IFT_PLC                           = 0xae
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_MASK                   = 0xfffffffe
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HIP                       = 0x8b
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MH                        = 0x87
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OLD_DIVERT                = 0xfe
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_RESERVED_253              = 0xfd
-	IPPROTO_RESERVED_254              = 0xfe
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEND                      = 0x103
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SHIM6                     = 0x8c
-	IPPROTO_SKIP                      = 0x39
-	IPPROTO_SPACER                    = 0x7fff
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TLSP                      = 0x38
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_BINDANY                      = 0x40
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MSFILTER                     = 0x4a
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_PREFER_TEMPADDR              = 0x3f
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BINDANY                        = 0x18
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DONTFRAG                       = 0x43
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET3                      = 0x31
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW3                            = 0x30
-	IP_FW_ADD                         = 0x32
-	IP_FW_DEL                         = 0x33
-	IP_FW_FLUSH                       = 0x34
-	IP_FW_GET                         = 0x36
-	IP_FW_NAT_CFG                     = 0x38
-	IP_FW_NAT_DEL                     = 0x39
-	IP_FW_NAT_GET_CONFIG              = 0x3a
-	IP_FW_NAT_GET_LOG                 = 0x3b
-	IP_FW_RESETLOG                    = 0x37
-	IP_FW_TABLE_ADD                   = 0x28
-	IP_FW_TABLE_DEL                   = 0x29
-	IP_FW_TABLE_FLUSH                 = 0x2a
-	IP_FW_TABLE_GETSIZE               = 0x2b
-	IP_FW_TABLE_LIST                  = 0x2c
-	IP_FW_ZERO                        = 0x35
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MAX_SOURCE_FILTER              = 0x400
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x42
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_OFFMASK                        = 0x1fff
-	IP_ONESBCAST                      = 0x17
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTOS                        = 0x44
-	IP_RECVTTL                        = 0x41
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_SENDSRCADDR                    = 0x7
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_AUTOSYNC                     = 0x7
-	MADV_CORE                         = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_NOCORE                       = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_NOSYNC                       = 0x6
-	MADV_PROTECT                      = 0xa
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MAP_ALIGNED_SUPER                 = 0x1000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_ANONYMOUS                     = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_EXCL                          = 0x4000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_NOCORE                        = 0x20000
-	MAP_NORESERVE                     = 0x40
-	MAP_NOSYNC                        = 0x800
-	MAP_PREFAULT_READ                 = 0x40000
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_RESERVED0100                  = 0x100
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CMSG_CLOEXEC                  = 0x40000
-	MSG_COMPAT                        = 0x8000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_NBIO                          = 0x4000
-	MSG_NOSIGNAL                      = 0x20000
-	MSG_NOTIFICATION                  = 0x2000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x0
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLISTL                    = 0x5
-	NET_RT_IFMALIST                   = 0x4
-	NET_RT_MAXID                      = 0x6
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x100000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x10000
-	O_DIRECTORY                       = 0x20000
-	O_EXCL                            = 0x800
-	O_EXEC                            = 0x40000
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_TTY_INIT                        = 0x80000
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x1004d808
-	RTF_GATEWAY                       = 0x2
-	RTF_GWFLAG_COMPAT                 = 0x80000000
-	RTF_HOST                          = 0x4
-	RTF_LLDATA                        = 0x400
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_REJECT                        = 0x8
-	RTF_RNH_LOCKED                    = 0x40000000
-	RTF_STATIC                        = 0x800
-	RTF_STICKY                        = 0x10000000
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x12
-	RTM_IFANNOUNCE                    = 0x11
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RTV_WEIGHT                        = 0x100
-	RT_ALL_FIBS                       = -0x1
-	RT_CACHING_CONTEXT                = 0x1
-	RT_DEFAULT_FIB                    = 0x0
-	RT_NORTREF                        = 0x2
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_BINTIME                       = 0x4
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCADDRT                         = 0x8030720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80246987
-	SIOCALIFADDR                      = 0x8118691b
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDELRT                         = 0x8030720b
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80246989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8118691d
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETSGCNT                      = 0xc0147210
-	SIOCGETVIFCNT                     = 0xc014720f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020691f
-	SIOCGIFCONF                       = 0xc0086924
-	SIOCGIFDESCR                      = 0xc020692a
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFIB                        = 0xc020695c
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc024698a
-	SIOCGIFGROUP                      = 0xc0246988
-	SIOCGIFINDEX                      = 0xc0206920
-	SIOCGIFMAC                        = 0xc0206926
-	SIOCGIFMEDIA                      = 0xc0286938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFSTATUS                     = 0xc331693b
-	SIOCGLIFADDR                      = 0xc118691c
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPRIVATE_0                    = 0xc0206950
-	SIOCGPRIVATE_1                    = 0xc0206951
-	SIOCIFCREATE                      = 0xc020697a
-	SIOCIFCREATE2                     = 0xc020697c
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCSDRVSPEC                      = 0x801c697b
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020691e
-	SIOCSIFDESCR                      = 0x80206929
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFIB                        = 0x8020695d
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206927
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNAME                       = 0x80206928
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFRVNET                      = 0xc020695b
-	SIOCSIFVNET                       = 0xc020695a
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BINTIME                        = 0x2000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1009
-	SO_LINGER                         = 0x80
-	SO_LISTENINCQLEN                  = 0x1013
-	SO_LISTENQLEN                     = 0x1012
-	SO_LISTENQLIMIT                   = 0x1011
-	SO_NOSIGPIPE                      = 0x800
-	SO_NO_DDP                         = 0x8000
-	SO_NO_OFFLOAD                     = 0x4000
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1010
-	SO_PROTOCOL                       = 0x1016
-	SO_PROTOTYPE                      = 0x1016
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SETFIB                         = 0x1014
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SO_USER_COOKIE                    = 0x1015
-	SO_VENDOR                         = 0x80000000
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CA_NAME_MAX                   = 0x10
-	TCP_CONGESTION                    = 0x40
-	TCP_INFO                          = 0x20
-	TCP_KEEPCNT                       = 0x400
-	TCP_KEEPIDLE                      = 0x100
-	TCP_KEEPINIT                      = 0x80
-	TCP_KEEPINTVL                     = 0x200
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_VENDOR                        = 0x80000000
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGPTN                          = 0x4004740f
-	TIOCGSID                          = 0x40047463
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DCD                         = 0x40
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMASTER                      = 0x2000741c
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40087459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VERASE2                           = 0x7
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x4
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x10
-	WLINUXCLONE                       = 0x80000000
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x8
-	WSTOPPED                          = 0x2
-	WTRAPPED                          = 0x20
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x59)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x55)
-	ECAPMODE        = syscall.Errno(0x5e)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDOOFUS         = syscall.Errno(0x58)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x56)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x60)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5a)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x57)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCAPABLE     = syscall.Errno(0x5d)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTRECOVERABLE = syscall.Errno(0x5f)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EOWNERDEAD      = syscall.Errno(0x60)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x5c)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGLIBRT  = syscall.Signal(0x21)
-	SIGLWP    = syscall.Signal(0x20)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "capabilities insufficient",
-	94: "not permitted in capability mode",
-	95: "state not recoverable",
-	96: "previous owner died",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "unknown signal",
-	33: "unknown signal",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
deleted file mode 100644
index 341bdfc9fe..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
+++ /dev/null
@@ -1,2087 +0,0 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include -m32
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build 386,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2b
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_QIPCRTR                       = 0x2a
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80041270
-	BLKBSZSET                        = 0x40041271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80041272
-	BLKPBSZGET                       = 0x127b
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RAW_FILTER_MAX               = 0x200
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_NCSI                       = 0x88f8
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_UNSHARE_RANGE          = 0x40
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	FS_ENCRYPTION_MODE_AES_256_CBC   = 0x3
-	FS_ENCRYPTION_MODE_AES_256_CTS   = 0x4
-	FS_ENCRYPTION_MODE_AES_256_GCM   = 0x2
-	FS_ENCRYPTION_MODE_AES_256_XTS   = 0x1
-	FS_ENCRYPTION_MODE_INVALID       = 0x0
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x400c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x40106614
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x800c6613
-	FS_KEY_DESCRIPTOR_SIZE           = 0x8
-	FS_KEY_DESC_PREFIX               = "fscrypt:"
-	FS_KEY_DESC_PREFIX_SIZE          = 0x8
-	FS_MAX_KEY_SIZE                  = 0x40
-	FS_POLICY_FLAGS_PAD_16           = 0x2
-	FS_POLICY_FLAGS_PAD_32           = 0x3
-	FS_POLICY_FLAGS_PAD_4            = 0x0
-	FS_POLICY_FLAGS_PAD_8            = 0x1
-	FS_POLICY_FLAGS_PAD_MASK         = 0x3
-	FS_POLICY_FLAGS_VALID            = 0x3
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0xc
-	F_GETLK64                        = 0xc
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0xd
-	F_SETLK64                        = 0xd
-	F_SETLKW                         = 0xe
-	F_SETLKW64                       = 0xe
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_32BIT                        = 0x40
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_BORN                          = 0x20000000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOREMOTELOCK                  = 0x8000000
-	MS_NOSEC                         = 0x10000000
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	MS_VERBOSE                       = 0x8000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x4000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x8000
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = 0xffffffff
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETFPXREGS                = 0x12
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETFPXREGS                = 0x13
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SINGLEBLOCK               = 0x21
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_SYSEMU                    = 0x1f
-	PTRACE_SYSEMU_SINGLESTEP         = 0x20
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x19
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x19
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_CAN_BASE                     = 0x64
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_CNX_ADVICE                    = 0x35
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_REPAIR_WINDOW                = 0x1d
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x400854d5
-	TUNDETACHFILTER                  = 0x400854d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETFILTER                     = 0x800854db
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETBE                     = 0x800454df
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNGETVNETLE                     = 0x800454dd
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETIFINDEX                    = 0x400454da
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETQUEUE                      = 0x400454d9
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETBE                     = 0x400454de
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	TUNSETVNETLE                     = 0x400454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x6
-	VM_SOCKETS_INVALID_VERSION       = 0xffffffff
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x20
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x23)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
deleted file mode 100644
index f636a396d7..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ /dev/null
@@ -1,2088 +0,0 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include -m64
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build amd64,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2b
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_QIPCRTR                       = 0x2a
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKPBSZGET                       = 0x127b
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RAW_FILTER_MAX               = 0x200
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_NCSI                       = 0x88f8
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_UNSHARE_RANGE          = 0x40
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	FS_ENCRYPTION_MODE_AES_256_CBC   = 0x3
-	FS_ENCRYPTION_MODE_AES_256_CTS   = 0x4
-	FS_ENCRYPTION_MODE_AES_256_GCM   = 0x2
-	FS_ENCRYPTION_MODE_AES_256_XTS   = 0x1
-	FS_ENCRYPTION_MODE_INVALID       = 0x0
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x400c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x40106614
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x800c6613
-	FS_KEY_DESCRIPTOR_SIZE           = 0x8
-	FS_KEY_DESC_PREFIX               = "fscrypt:"
-	FS_KEY_DESC_PREFIX_SIZE          = 0x8
-	FS_MAX_KEY_SIZE                  = 0x40
-	FS_POLICY_FLAGS_PAD_16           = 0x2
-	FS_POLICY_FLAGS_PAD_32           = 0x3
-	FS_POLICY_FLAGS_PAD_4            = 0x0
-	FS_POLICY_FLAGS_PAD_8            = 0x1
-	FS_POLICY_FLAGS_PAD_MASK         = 0x3
-	FS_POLICY_FLAGS_VALID            = 0x3
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0x5
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_32BIT                        = 0x40
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_BORN                          = 0x20000000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOREMOTELOCK                  = 0x8000000
-	MS_NOSEC                         = 0x10000000
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	MS_VERBOSE                       = 0x8000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x4000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ARCH_PRCTL                = 0x1e
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETFPXREGS                = 0x12
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETFPXREGS                = 0x13
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SINGLEBLOCK               = 0x21
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_SYSEMU                    = 0x1f
-	PTRACE_SYSEMU_SINGLESTEP         = 0x20
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x19
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x19
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_CAN_BASE                     = 0x64
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_CNX_ADVICE                    = 0x35
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_REPAIR_WINDOW                = 0x1d
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x401054d5
-	TUNDETACHFILTER                  = 0x401054d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETFILTER                     = 0x801054db
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETBE                     = 0x800454df
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNGETVNETLE                     = 0x800454dd
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETIFINDEX                    = 0x400454da
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETQUEUE                      = 0x400454d9
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETBE                     = 0x400454de
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	TUNSETVNETLE                     = 0x400454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x6
-	VM_SOCKETS_INVALID_VERSION       = 0xffffffff
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x23)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
deleted file mode 100644
index 986a94735f..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ /dev/null
@@ -1,2092 +0,0 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build arm,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2b
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_QIPCRTR                       = 0x2a
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80041270
-	BLKBSZSET                        = 0x40041271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80041272
-	BLKPBSZGET                       = 0x127b
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RAW_FILTER_MAX               = 0x200
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_NCSI                       = 0x88f8
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_UNSHARE_RANGE          = 0x40
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	FS_ENCRYPTION_MODE_AES_256_CBC   = 0x3
-	FS_ENCRYPTION_MODE_AES_256_CTS   = 0x4
-	FS_ENCRYPTION_MODE_AES_256_GCM   = 0x2
-	FS_ENCRYPTION_MODE_AES_256_XTS   = 0x1
-	FS_ENCRYPTION_MODE_INVALID       = 0x0
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x400c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x40106614
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x800c6613
-	FS_KEY_DESCRIPTOR_SIZE           = 0x8
-	FS_KEY_DESC_PREFIX               = "fscrypt:"
-	FS_KEY_DESC_PREFIX_SIZE          = 0x8
-	FS_MAX_KEY_SIZE                  = 0x40
-	FS_POLICY_FLAGS_PAD_16           = 0x2
-	FS_POLICY_FLAGS_PAD_32           = 0x3
-	FS_POLICY_FLAGS_PAD_4            = 0x0
-	FS_POLICY_FLAGS_PAD_8            = 0x1
-	FS_POLICY_FLAGS_PAD_MASK         = 0x3
-	FS_POLICY_FLAGS_VALID            = 0x3
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0xc
-	F_GETLK64                        = 0xc
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0xd
-	F_SETLK64                        = 0xd
-	F_SETLKW                         = 0xe
-	F_SETLKW64                       = 0xe
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_BORN                          = 0x20000000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOREMOTELOCK                  = 0x8000000
-	MS_NOSEC                         = 0x10000000
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	MS_VERBOSE                       = 0x8000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x10000
-	O_DIRECTORY                      = 0x4000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x20000
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x8000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x404000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = 0xffffffff
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETCRUNCHREGS             = 0x19
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETHBPREGS                = 0x1d
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GETVFPREGS                = 0x1b
-	PTRACE_GETWMMXREGS               = 0x12
-	PTRACE_GET_THREAD_AREA           = 0x16
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETCRUNCHREGS             = 0x1a
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETHBPREGS                = 0x1e
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SETVFPREGS                = 0x1c
-	PTRACE_SETWMMXREGS               = 0x13
-	PTRACE_SET_SYSCALL               = 0x17
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	PT_DATA_ADDR                     = 0x10004
-	PT_TEXT_ADDR                     = 0x10000
-	PT_TEXT_END_ADDR                 = 0x10008
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x19
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x19
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_CAN_BASE                     = 0x64
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_CNX_ADVICE                    = 0x35
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_REPAIR_WINDOW                = 0x1d
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x400854d5
-	TUNDETACHFILTER                  = 0x400854d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETFILTER                     = 0x800854db
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETBE                     = 0x800454df
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNGETVNETLE                     = 0x800454dd
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETIFINDEX                    = 0x400454da
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETQUEUE                      = 0x400454d9
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETBE                     = 0x400454de
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	TUNSETVNETLE                     = 0x400454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x6
-	VM_SOCKETS_INVALID_VERSION       = 0xffffffff
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x20
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x23)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
deleted file mode 100644
index b72a64538c..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
+++ /dev/null
@@ -1,2077 +0,0 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include -fsigned-char
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build arm64,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2b
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_QIPCRTR                       = 0x2a
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKPBSZGET                       = 0x127b
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RAW_FILTER_MAX               = 0x200
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ESR_MAGIC                        = 0x45535201
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_NCSI                       = 0x88f8
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_UNSHARE_RANGE          = 0x40
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	FS_ENCRYPTION_MODE_AES_256_CBC   = 0x3
-	FS_ENCRYPTION_MODE_AES_256_CTS   = 0x4
-	FS_ENCRYPTION_MODE_AES_256_GCM   = 0x2
-	FS_ENCRYPTION_MODE_AES_256_XTS   = 0x1
-	FS_ENCRYPTION_MODE_INVALID       = 0x0
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x400c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x40106614
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x800c6613
-	FS_KEY_DESCRIPTOR_SIZE           = 0x8
-	FS_KEY_DESC_PREFIX               = "fscrypt:"
-	FS_KEY_DESC_PREFIX_SIZE          = 0x8
-	FS_MAX_KEY_SIZE                  = 0x40
-	FS_POLICY_FLAGS_PAD_16           = 0x2
-	FS_POLICY_FLAGS_PAD_32           = 0x3
-	FS_POLICY_FLAGS_PAD_4            = 0x0
-	FS_POLICY_FLAGS_PAD_8            = 0x1
-	FS_POLICY_FLAGS_PAD_MASK         = 0x3
-	FS_POLICY_FLAGS_VALID            = 0x3
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0x5
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_BORN                          = 0x20000000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOREMOTELOCK                  = 0x8000000
-	MS_NOSEC                         = 0x10000000
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	MS_VERBOSE                       = 0x8000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x10000
-	O_DIRECTORY                      = 0x4000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x8000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x404000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x19
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x19
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_CAN_BASE                     = 0x64
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_CNX_ADVICE                    = 0x35
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_REPAIR_WINDOW                = 0x1d
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x401054d5
-	TUNDETACHFILTER                  = 0x401054d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETFILTER                     = 0x801054db
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETBE                     = 0x800454df
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNGETVNETLE                     = 0x800454dd
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETIFINDEX                    = 0x400454da
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETQUEUE                      = 0x400454d9
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETBE                     = 0x400454de
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	TUNSETVNETLE                     = 0x400454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x6
-	VM_SOCKETS_INVALID_VERSION       = 0xffffffff
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x23)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
deleted file mode 100644
index 198a305482..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
+++ /dev/null
@@ -1,2096 +0,0 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build mips,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2b
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_QIPCRTR                       = 0x2a
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x40041270
-	BLKBSZSET                        = 0x80041271
-	BLKFLSBUF                        = 0x20001261
-	BLKFRAGET                        = 0x20001265
-	BLKFRASET                        = 0x20001264
-	BLKGETSIZE                       = 0x20001260
-	BLKGETSIZE64                     = 0x40041272
-	BLKPBSZGET                       = 0x2000127b
-	BLKRAGET                         = 0x20001263
-	BLKRASET                         = 0x20001262
-	BLKROGET                         = 0x2000125e
-	BLKROSET                         = 0x2000125d
-	BLKRRPART                        = 0x2000125f
-	BLKSECTGET                       = 0x20001267
-	BLKSECTSET                       = 0x20001266
-	BLKSSZGET                        = 0x20001268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RAW_FILTER_MAX               = 0x200
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_NCSI                       = 0x88f8
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_UNSHARE_RANGE          = 0x40
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x2000
-	FS_ENCRYPTION_MODE_AES_256_CBC   = 0x3
-	FS_ENCRYPTION_MODE_AES_256_CTS   = 0x4
-	FS_ENCRYPTION_MODE_AES_256_GCM   = 0x2
-	FS_ENCRYPTION_MODE_AES_256_XTS   = 0x1
-	FS_ENCRYPTION_MODE_INVALID       = 0x0
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x800c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x80106614
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x400c6613
-	FS_KEY_DESCRIPTOR_SIZE           = 0x8
-	FS_KEY_DESC_PREFIX               = "fscrypt:"
-	FS_KEY_DESC_PREFIX_SIZE          = 0x8
-	FS_MAX_KEY_SIZE                  = 0x40
-	FS_POLICY_FLAGS_PAD_16           = 0x2
-	FS_POLICY_FLAGS_PAD_32           = 0x3
-	FS_POLICY_FLAGS_PAD_4            = 0x0
-	FS_POLICY_FLAGS_PAD_8            = 0x1
-	FS_POLICY_FLAGS_PAD_MASK         = 0x3
-	FS_POLICY_FLAGS_VALID            = 0x3
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x21
-	F_GETLK64                        = 0x21
-	F_GETOWN                         = 0x17
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x22
-	F_SETLK64                        = 0x22
-	F_SETLKW                         = 0x23
-	F_SETLKW64                       = 0x23
-	F_SETOWN                         = 0x18
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x100
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x80
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x800
-	MAP_ANONYMOUS                    = 0x800
-	MAP_DENYWRITE                    = 0x2000
-	MAP_EXECUTABLE                   = 0x4000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x1000
-	MAP_HUGETLB                      = 0x80000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x8000
-	MAP_NONBLOCK                     = 0x20000
-	MAP_NORESERVE                    = 0x400
-	MAP_POPULATE                     = 0x10000
-	MAP_PRIVATE                      = 0x2
-	MAP_RENAME                       = 0x800
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x40000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_BORN                          = 0x20000000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOREMOTELOCK                  = 0x8000000
-	MS_NOSEC                         = 0x10000000
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	MS_VERBOSE                       = 0x8000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x8
-	O_ASYNC                          = 0x1000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x100
-	O_DIRECT                         = 0x8000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x10
-	O_EXCL                           = 0x400
-	O_FSYNC                          = 0x4010
-	O_LARGEFILE                      = 0x2000
-	O_NDELAY                         = 0x80
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x800
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x80
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x4010
-	O_SYNC                           = 0x4010
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = 0xffffffff
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_GET_THREAD_AREA_3264      = 0xc4
-	PTRACE_GET_WATCH_REGS            = 0xd0
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_3264             = 0xc1
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_3264             = 0xc0
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_3264             = 0xc3
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_3264             = 0xc2
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SET_WATCH_REGS            = 0xd1
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x6
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x5
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x19
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x19
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x40047307
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x40047309
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x80047308
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x1
-	SOCK_NONBLOCK                    = 0x80
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x2
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_CAN_BASE                     = 0x64
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0xffff
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1009
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x20
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_CNX_ADVICE                    = 0x35
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x1029
-	SO_DONTROUTE                     = 0x10
-	SO_ERROR                         = 0x1007
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x8
-	SO_LINGER                        = 0x80
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0x100
-	SO_PASSCRED                      = 0x11
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x12
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1e
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x1028
-	SO_RCVBUF                        = 0x1002
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x1004
-	SO_RCVTIMEO                      = 0x1006
-	SO_REUSEADDR                     = 0x4
-	SO_REUSEPORT                     = 0x200
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x1001
-	SO_SNDBUFFORCE                   = 0x1f
-	SO_SNDLOWAT                      = 0x1003
-	SO_SNDTIMEO                      = 0x1005
-	SO_STYLE                         = 0x1008
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x1008
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x5407
-	TCGETA                           = 0x5401
-	TCGETS                           = 0x540d
-	TCGETS2                          = 0x4030542a
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_REPAIR_WINDOW                = 0x1d
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x5410
-	TCSBRK                           = 0x5405
-	TCSBRKP                          = 0x5486
-	TCSETA                           = 0x5402
-	TCSETAF                          = 0x5404
-	TCSETAW                          = 0x5403
-	TCSETS                           = 0x540e
-	TCSETS2                          = 0x8030542b
-	TCSETSF                          = 0x5410
-	TCSETSF2                         = 0x8030542d
-	TCSETSW                          = 0x540f
-	TCSETSW2                         = 0x8030542c
-	TCXONC                           = 0x5406
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x80047478
-	TIOCEXCL                         = 0x740d
-	TIOCGDEV                         = 0x40045432
-	TIOCGETD                         = 0x7400
-	TIOCGETP                         = 0x7408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x5492
-	TIOCGLCKTRMIOS                   = 0x548b
-	TIOCGLTC                         = 0x7474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x4020542e
-	TIOCGSERIAL                      = 0x5484
-	TIOCGSID                         = 0x7416
-	TIOCGSOFTCAR                     = 0x5481
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x467f
-	TIOCLINUX                        = 0x5483
-	TIOCMBIC                         = 0x741c
-	TIOCMBIS                         = 0x741b
-	TIOCMGET                         = 0x741d
-	TIOCMIWAIT                       = 0x5491
-	TIOCMSET                         = 0x741a
-	TIOCM_CAR                        = 0x100
-	TIOCM_CD                         = 0x100
-	TIOCM_CTS                        = 0x40
-	TIOCM_DSR                        = 0x400
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x200
-	TIOCM_RNG                        = 0x200
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x20
-	TIOCM_ST                         = 0x10
-	TIOCNOTTY                        = 0x5471
-	TIOCNXCL                         = 0x740e
-	TIOCOUTQ                         = 0x7472
-	TIOCPKT                          = 0x5470
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x5480
-	TIOCSERCONFIG                    = 0x5488
-	TIOCSERGETLSR                    = 0x548e
-	TIOCSERGETMULTI                  = 0x548f
-	TIOCSERGSTRUCT                   = 0x548d
-	TIOCSERGWILD                     = 0x5489
-	TIOCSERSETMULTI                  = 0x5490
-	TIOCSERSWILD                     = 0x548a
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x7401
-	TIOCSETN                         = 0x740a
-	TIOCSETP                         = 0x7409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x548c
-	TIOCSLTC                         = 0x7475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0xc020542f
-	TIOCSSERIAL                      = 0x5485
-	TIOCSSOFTCAR                     = 0x5482
-	TIOCSTI                          = 0x5472
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x8000
-	TUNATTACHFILTER                  = 0x800854d5
-	TUNDETACHFILTER                  = 0x800854d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x400854db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETBE                     = 0x400454df
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNGETVNETLE                     = 0x400454dd
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETBE                     = 0x800454de
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	TUNSETVNETLE                     = 0x800454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x10
-	VEOL                             = 0x11
-	VEOL2                            = 0x6
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x4
-	VM_SOCKETS_INVALID_VERSION       = 0xffffffff
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VSWTCH                           = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x20
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x7d)
-	EADDRNOTAVAIL   = syscall.Errno(0x7e)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x7c)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x95)
-	EBADE           = syscall.Errno(0x32)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x51)
-	EBADMSG         = syscall.Errno(0x4d)
-	EBADR           = syscall.Errno(0x33)
-	EBADRQC         = syscall.Errno(0x36)
-	EBADSLT         = syscall.Errno(0x37)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x9e)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x25)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x82)
-	ECONNREFUSED    = syscall.Errno(0x92)
-	ECONNRESET      = syscall.Errno(0x83)
-	EDEADLK         = syscall.Errno(0x2d)
-	EDEADLOCK       = syscall.Errno(0x38)
-	EDESTADDRREQ    = syscall.Errno(0x60)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x46d)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x93)
-	EHOSTUNREACH    = syscall.Errno(0x94)
-	EHWPOISON       = syscall.Errno(0xa8)
-	EIDRM           = syscall.Errno(0x24)
-	EILSEQ          = syscall.Errno(0x58)
-	EINIT           = syscall.Errno(0x8d)
-	EINPROGRESS     = syscall.Errno(0x96)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x85)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x8b)
-	EKEYEXPIRED     = syscall.Errno(0xa2)
-	EKEYREJECTED    = syscall.Errno(0xa4)
-	EKEYREVOKED     = syscall.Errno(0xa3)
-	EL2HLT          = syscall.Errno(0x2c)
-	EL2NSYNC        = syscall.Errno(0x26)
-	EL3HLT          = syscall.Errno(0x27)
-	EL3RST          = syscall.Errno(0x28)
-	ELIBACC         = syscall.Errno(0x53)
-	ELIBBAD         = syscall.Errno(0x54)
-	ELIBEXEC        = syscall.Errno(0x57)
-	ELIBMAX         = syscall.Errno(0x56)
-	ELIBSCN         = syscall.Errno(0x55)
-	ELNRNG          = syscall.Errno(0x29)
-	ELOOP           = syscall.Errno(0x5a)
-	EMEDIUMTYPE     = syscall.Errno(0xa0)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x61)
-	EMULTIHOP       = syscall.Errno(0x4a)
-	ENAMETOOLONG    = syscall.Errno(0x4e)
-	ENAVAIL         = syscall.Errno(0x8a)
-	ENETDOWN        = syscall.Errno(0x7f)
-	ENETRESET       = syscall.Errno(0x81)
-	ENETUNREACH     = syscall.Errno(0x80)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x35)
-	ENOBUFS         = syscall.Errno(0x84)
-	ENOCSI          = syscall.Errno(0x2b)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0xa1)
-	ENOLCK          = syscall.Errno(0x2e)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x9f)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x23)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x63)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x59)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x86)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x5d)
-	ENOTNAM         = syscall.Errno(0x89)
-	ENOTRECOVERABLE = syscall.Errno(0xa6)
-	ENOTSOCK        = syscall.Errno(0x5f)
-	ENOTSUP         = syscall.Errno(0x7a)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x50)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x7a)
-	EOVERFLOW       = syscall.Errno(0x4f)
-	EOWNERDEAD      = syscall.Errno(0xa5)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x7b)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x78)
-	EPROTOTYPE      = syscall.Errno(0x62)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x52)
-	EREMDEV         = syscall.Errno(0x8e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x8c)
-	ERESTART        = syscall.Errno(0x5b)
-	ERFKILL         = syscall.Errno(0xa7)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x8f)
-	ESOCKTNOSUPPORT = syscall.Errno(0x79)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x97)
-	ESTRPIPE        = syscall.Errno(0x5c)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x91)
-	ETOOMANYREFS    = syscall.Errno(0x90)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x87)
-	EUNATCH         = syscall.Errno(0x2a)
-	EUSERS          = syscall.Errno(0x5e)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x34)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x12)
-	SIGCLD    = syscall.Signal(0x12)
-	SIGCONT   = syscall.Signal(0x19)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x16)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x16)
-	SIGPROF   = syscall.Signal(0x1d)
-	SIGPWR    = syscall.Signal(0x13)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x17)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x18)
-	SIGTTIN   = syscall.Signal(0x1a)
-	SIGTTOU   = syscall.Signal(0x1b)
-	SIGURG    = syscall.Signal(0x15)
-	SIGUSR1   = syscall.Signal(0x10)
-	SIGUSR2   = syscall.Signal(0x11)
-	SIGVTALRM = syscall.Signal(0x1c)
-	SIGWINCH  = syscall.Signal(0x14)
-	SIGXCPU   = syscall.Signal(0x1e)
-	SIGXFSZ   = syscall.Signal(0x1f)
-)
-
-// Error table
-var errors = [...]string{
-	1:    "operation not permitted",
-	2:    "no such file or directory",
-	3:    "no such process",
-	4:    "interrupted system call",
-	5:    "input/output error",
-	6:    "no such device or address",
-	7:    "argument list too long",
-	8:    "exec format error",
-	9:    "bad file descriptor",
-	10:   "no child processes",
-	11:   "resource temporarily unavailable",
-	12:   "cannot allocate memory",
-	13:   "permission denied",
-	14:   "bad address",
-	15:   "block device required",
-	16:   "device or resource busy",
-	17:   "file exists",
-	18:   "invalid cross-device link",
-	19:   "no such device",
-	20:   "not a directory",
-	21:   "is a directory",
-	22:   "invalid argument",
-	23:   "too many open files in system",
-	24:   "too many open files",
-	25:   "inappropriate ioctl for device",
-	26:   "text file busy",
-	27:   "file too large",
-	28:   "no space left on device",
-	29:   "illegal seek",
-	30:   "read-only file system",
-	31:   "too many links",
-	32:   "broken pipe",
-	33:   "numerical argument out of domain",
-	34:   "numerical result out of range",
-	35:   "no message of desired type",
-	36:   "identifier removed",
-	37:   "channel number out of range",
-	38:   "level 2 not synchronized",
-	39:   "level 3 halted",
-	40:   "level 3 reset",
-	41:   "link number out of range",
-	42:   "protocol driver not attached",
-	43:   "no CSI structure available",
-	44:   "level 2 halted",
-	45:   "resource deadlock avoided",
-	46:   "no locks available",
-	50:   "invalid exchange",
-	51:   "invalid request descriptor",
-	52:   "exchange full",
-	53:   "no anode",
-	54:   "invalid request code",
-	55:   "invalid slot",
-	56:   "file locking deadlock error",
-	59:   "bad font file format",
-	60:   "device not a stream",
-	61:   "no data available",
-	62:   "timer expired",
-	63:   "out of streams resources",
-	64:   "machine is not on the network",
-	65:   "package not installed",
-	66:   "object is remote",
-	67:   "link has been severed",
-	68:   "advertise error",
-	69:   "srmount error",
-	70:   "communication error on send",
-	71:   "protocol error",
-	73:   "RFS specific error",
-	74:   "multihop attempted",
-	77:   "bad message",
-	78:   "file name too long",
-	79:   "value too large for defined data type",
-	80:   "name not unique on network",
-	81:   "file descriptor in bad state",
-	82:   "remote address changed",
-	83:   "can not access a needed shared library",
-	84:   "accessing a corrupted shared library",
-	85:   ".lib section in a.out corrupted",
-	86:   "attempting to link in too many shared libraries",
-	87:   "cannot exec a shared library directly",
-	88:   "invalid or incomplete multibyte or wide character",
-	89:   "function not implemented",
-	90:   "too many levels of symbolic links",
-	91:   "interrupted system call should be restarted",
-	92:   "streams pipe error",
-	93:   "directory not empty",
-	94:   "too many users",
-	95:   "socket operation on non-socket",
-	96:   "destination address required",
-	97:   "message too long",
-	98:   "protocol wrong type for socket",
-	99:   "protocol not available",
-	120:  "protocol not supported",
-	121:  "socket type not supported",
-	122:  "operation not supported",
-	123:  "protocol family not supported",
-	124:  "address family not supported by protocol",
-	125:  "address already in use",
-	126:  "cannot assign requested address",
-	127:  "network is down",
-	128:  "network is unreachable",
-	129:  "network dropped connection on reset",
-	130:  "software caused connection abort",
-	131:  "connection reset by peer",
-	132:  "no buffer space available",
-	133:  "transport endpoint is already connected",
-	134:  "transport endpoint is not connected",
-	135:  "structure needs cleaning",
-	137:  "not a XENIX named type file",
-	138:  "no XENIX semaphores available",
-	139:  "is a named type file",
-	140:  "remote I/O error",
-	141:  "unknown error 141",
-	142:  "unknown error 142",
-	143:  "cannot send after transport endpoint shutdown",
-	144:  "too many references: cannot splice",
-	145:  "connection timed out",
-	146:  "connection refused",
-	147:  "host is down",
-	148:  "no route to host",
-	149:  "operation already in progress",
-	150:  "operation now in progress",
-	151:  "stale file handle",
-	158:  "operation canceled",
-	159:  "no medium found",
-	160:  "wrong medium type",
-	161:  "required key not available",
-	162:  "key has expired",
-	163:  "key has been revoked",
-	164:  "key was rejected by service",
-	165:  "owner died",
-	166:  "state not recoverable",
-	167:  "operation not possible due to RF-kill",
-	168:  "memory page has hardware error",
-	1133: "disk quota exceeded",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "user defined signal 1",
-	17: "user defined signal 2",
-	18: "child exited",
-	19: "power failure",
-	20: "window changed",
-	21: "urgent I/O condition",
-	22: "I/O possible",
-	23: "stopped (signal)",
-	24: "stopped",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual timer expired",
-	29: "profiling timer expired",
-	30: "CPU time limit exceeded",
-	31: "file size limit exceeded",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
deleted file mode 100644
index 37d66f31a0..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
+++ /dev/null
@@ -1,2096 +0,0 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build mips64,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2b
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_QIPCRTR                       = 0x2a
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x40081270
-	BLKBSZSET                        = 0x80081271
-	BLKFLSBUF                        = 0x20001261
-	BLKFRAGET                        = 0x20001265
-	BLKFRASET                        = 0x20001264
-	BLKGETSIZE                       = 0x20001260
-	BLKGETSIZE64                     = 0x40081272
-	BLKPBSZGET                       = 0x2000127b
-	BLKRAGET                         = 0x20001263
-	BLKRASET                         = 0x20001262
-	BLKROGET                         = 0x2000125e
-	BLKROSET                         = 0x2000125d
-	BLKRRPART                        = 0x2000125f
-	BLKSECTGET                       = 0x20001267
-	BLKSECTSET                       = 0x20001266
-	BLKSSZGET                        = 0x20001268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RAW_FILTER_MAX               = 0x200
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_NCSI                       = 0x88f8
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_UNSHARE_RANGE          = 0x40
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x2000
-	FS_ENCRYPTION_MODE_AES_256_CBC   = 0x3
-	FS_ENCRYPTION_MODE_AES_256_CTS   = 0x4
-	FS_ENCRYPTION_MODE_AES_256_GCM   = 0x2
-	FS_ENCRYPTION_MODE_AES_256_XTS   = 0x1
-	FS_ENCRYPTION_MODE_INVALID       = 0x0
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x800c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x80106614
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x400c6613
-	FS_KEY_DESCRIPTOR_SIZE           = 0x8
-	FS_KEY_DESC_PREFIX               = "fscrypt:"
-	FS_KEY_DESC_PREFIX_SIZE          = 0x8
-	FS_MAX_KEY_SIZE                  = 0x40
-	FS_POLICY_FLAGS_PAD_16           = 0x2
-	FS_POLICY_FLAGS_PAD_32           = 0x3
-	FS_POLICY_FLAGS_PAD_4            = 0x0
-	FS_POLICY_FLAGS_PAD_8            = 0x1
-	FS_POLICY_FLAGS_PAD_MASK         = 0x3
-	FS_POLICY_FLAGS_VALID            = 0x3
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0xe
-	F_GETLK64                        = 0xe
-	F_GETOWN                         = 0x17
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x18
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x100
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x80
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x800
-	MAP_ANONYMOUS                    = 0x800
-	MAP_DENYWRITE                    = 0x2000
-	MAP_EXECUTABLE                   = 0x4000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x1000
-	MAP_HUGETLB                      = 0x80000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x8000
-	MAP_NONBLOCK                     = 0x20000
-	MAP_NORESERVE                    = 0x400
-	MAP_POPULATE                     = 0x10000
-	MAP_PRIVATE                      = 0x2
-	MAP_RENAME                       = 0x800
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x40000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_BORN                          = 0x20000000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOREMOTELOCK                  = 0x8000000
-	MS_NOSEC                         = 0x10000000
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	MS_VERBOSE                       = 0x8000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x8
-	O_ASYNC                          = 0x1000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x100
-	O_DIRECT                         = 0x8000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x10
-	O_EXCL                           = 0x400
-	O_FSYNC                          = 0x4010
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x80
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x800
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x80
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x4010
-	O_SYNC                           = 0x4010
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_GET_THREAD_AREA_3264      = 0xc4
-	PTRACE_GET_WATCH_REGS            = 0xd0
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_3264             = 0xc1
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_3264             = 0xc0
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_3264             = 0xc3
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_3264             = 0xc2
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SET_WATCH_REGS            = 0xd1
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x6
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x5
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x19
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x19
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x40047307
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x40047309
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x80047308
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x1
-	SOCK_NONBLOCK                    = 0x80
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x2
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_CAN_BASE                     = 0x64
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0xffff
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1009
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x20
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_CNX_ADVICE                    = 0x35
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x1029
-	SO_DONTROUTE                     = 0x10
-	SO_ERROR                         = 0x1007
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x8
-	SO_LINGER                        = 0x80
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0x100
-	SO_PASSCRED                      = 0x11
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x12
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1e
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x1028
-	SO_RCVBUF                        = 0x1002
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x1004
-	SO_RCVTIMEO                      = 0x1006
-	SO_REUSEADDR                     = 0x4
-	SO_REUSEPORT                     = 0x200
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x1001
-	SO_SNDBUFFORCE                   = 0x1f
-	SO_SNDLOWAT                      = 0x1003
-	SO_SNDTIMEO                      = 0x1005
-	SO_STYLE                         = 0x1008
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x1008
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x5407
-	TCGETA                           = 0x5401
-	TCGETS                           = 0x540d
-	TCGETS2                          = 0x4030542a
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_REPAIR_WINDOW                = 0x1d
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x5410
-	TCSBRK                           = 0x5405
-	TCSBRKP                          = 0x5486
-	TCSETA                           = 0x5402
-	TCSETAF                          = 0x5404
-	TCSETAW                          = 0x5403
-	TCSETS                           = 0x540e
-	TCSETS2                          = 0x8030542b
-	TCSETSF                          = 0x5410
-	TCSETSF2                         = 0x8030542d
-	TCSETSW                          = 0x540f
-	TCSETSW2                         = 0x8030542c
-	TCXONC                           = 0x5406
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x80047478
-	TIOCEXCL                         = 0x740d
-	TIOCGDEV                         = 0x40045432
-	TIOCGETD                         = 0x7400
-	TIOCGETP                         = 0x7408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x5492
-	TIOCGLCKTRMIOS                   = 0x548b
-	TIOCGLTC                         = 0x7474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x4020542e
-	TIOCGSERIAL                      = 0x5484
-	TIOCGSID                         = 0x7416
-	TIOCGSOFTCAR                     = 0x5481
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x467f
-	TIOCLINUX                        = 0x5483
-	TIOCMBIC                         = 0x741c
-	TIOCMBIS                         = 0x741b
-	TIOCMGET                         = 0x741d
-	TIOCMIWAIT                       = 0x5491
-	TIOCMSET                         = 0x741a
-	TIOCM_CAR                        = 0x100
-	TIOCM_CD                         = 0x100
-	TIOCM_CTS                        = 0x40
-	TIOCM_DSR                        = 0x400
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x200
-	TIOCM_RNG                        = 0x200
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x20
-	TIOCM_ST                         = 0x10
-	TIOCNOTTY                        = 0x5471
-	TIOCNXCL                         = 0x740e
-	TIOCOUTQ                         = 0x7472
-	TIOCPKT                          = 0x5470
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x5480
-	TIOCSERCONFIG                    = 0x5488
-	TIOCSERGETLSR                    = 0x548e
-	TIOCSERGETMULTI                  = 0x548f
-	TIOCSERGSTRUCT                   = 0x548d
-	TIOCSERGWILD                     = 0x5489
-	TIOCSERSETMULTI                  = 0x5490
-	TIOCSERSWILD                     = 0x548a
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x7401
-	TIOCSETN                         = 0x740a
-	TIOCSETP                         = 0x7409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x548c
-	TIOCSLTC                         = 0x7475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0xc020542f
-	TIOCSSERIAL                      = 0x5485
-	TIOCSSOFTCAR                     = 0x5482
-	TIOCSTI                          = 0x5472
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x8000
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETBE                     = 0x400454df
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNGETVNETLE                     = 0x400454dd
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETBE                     = 0x800454de
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	TUNSETVNETLE                     = 0x800454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x10
-	VEOL                             = 0x11
-	VEOL2                            = 0x6
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x4
-	VM_SOCKETS_INVALID_VERSION       = 0xffffffff
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VSWTCH                           = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x7d)
-	EADDRNOTAVAIL   = syscall.Errno(0x7e)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x7c)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x95)
-	EBADE           = syscall.Errno(0x32)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x51)
-	EBADMSG         = syscall.Errno(0x4d)
-	EBADR           = syscall.Errno(0x33)
-	EBADRQC         = syscall.Errno(0x36)
-	EBADSLT         = syscall.Errno(0x37)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x9e)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x25)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x82)
-	ECONNREFUSED    = syscall.Errno(0x92)
-	ECONNRESET      = syscall.Errno(0x83)
-	EDEADLK         = syscall.Errno(0x2d)
-	EDEADLOCK       = syscall.Errno(0x38)
-	EDESTADDRREQ    = syscall.Errno(0x60)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x46d)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x93)
-	EHOSTUNREACH    = syscall.Errno(0x94)
-	EHWPOISON       = syscall.Errno(0xa8)
-	EIDRM           = syscall.Errno(0x24)
-	EILSEQ          = syscall.Errno(0x58)
-	EINIT           = syscall.Errno(0x8d)
-	EINPROGRESS     = syscall.Errno(0x96)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x85)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x8b)
-	EKEYEXPIRED     = syscall.Errno(0xa2)
-	EKEYREJECTED    = syscall.Errno(0xa4)
-	EKEYREVOKED     = syscall.Errno(0xa3)
-	EL2HLT          = syscall.Errno(0x2c)
-	EL2NSYNC        = syscall.Errno(0x26)
-	EL3HLT          = syscall.Errno(0x27)
-	EL3RST          = syscall.Errno(0x28)
-	ELIBACC         = syscall.Errno(0x53)
-	ELIBBAD         = syscall.Errno(0x54)
-	ELIBEXEC        = syscall.Errno(0x57)
-	ELIBMAX         = syscall.Errno(0x56)
-	ELIBSCN         = syscall.Errno(0x55)
-	ELNRNG          = syscall.Errno(0x29)
-	ELOOP           = syscall.Errno(0x5a)
-	EMEDIUMTYPE     = syscall.Errno(0xa0)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x61)
-	EMULTIHOP       = syscall.Errno(0x4a)
-	ENAMETOOLONG    = syscall.Errno(0x4e)
-	ENAVAIL         = syscall.Errno(0x8a)
-	ENETDOWN        = syscall.Errno(0x7f)
-	ENETRESET       = syscall.Errno(0x81)
-	ENETUNREACH     = syscall.Errno(0x80)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x35)
-	ENOBUFS         = syscall.Errno(0x84)
-	ENOCSI          = syscall.Errno(0x2b)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0xa1)
-	ENOLCK          = syscall.Errno(0x2e)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x9f)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x23)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x63)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x59)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x86)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x5d)
-	ENOTNAM         = syscall.Errno(0x89)
-	ENOTRECOVERABLE = syscall.Errno(0xa6)
-	ENOTSOCK        = syscall.Errno(0x5f)
-	ENOTSUP         = syscall.Errno(0x7a)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x50)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x7a)
-	EOVERFLOW       = syscall.Errno(0x4f)
-	EOWNERDEAD      = syscall.Errno(0xa5)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x7b)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x78)
-	EPROTOTYPE      = syscall.Errno(0x62)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x52)
-	EREMDEV         = syscall.Errno(0x8e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x8c)
-	ERESTART        = syscall.Errno(0x5b)
-	ERFKILL         = syscall.Errno(0xa7)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x8f)
-	ESOCKTNOSUPPORT = syscall.Errno(0x79)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x97)
-	ESTRPIPE        = syscall.Errno(0x5c)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x91)
-	ETOOMANYREFS    = syscall.Errno(0x90)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x87)
-	EUNATCH         = syscall.Errno(0x2a)
-	EUSERS          = syscall.Errno(0x5e)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x34)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x12)
-	SIGCLD    = syscall.Signal(0x12)
-	SIGCONT   = syscall.Signal(0x19)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x16)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x16)
-	SIGPROF   = syscall.Signal(0x1d)
-	SIGPWR    = syscall.Signal(0x13)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x17)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x18)
-	SIGTTIN   = syscall.Signal(0x1a)
-	SIGTTOU   = syscall.Signal(0x1b)
-	SIGURG    = syscall.Signal(0x15)
-	SIGUSR1   = syscall.Signal(0x10)
-	SIGUSR2   = syscall.Signal(0x11)
-	SIGVTALRM = syscall.Signal(0x1c)
-	SIGWINCH  = syscall.Signal(0x14)
-	SIGXCPU   = syscall.Signal(0x1e)
-	SIGXFSZ   = syscall.Signal(0x1f)
-)
-
-// Error table
-var errors = [...]string{
-	1:    "operation not permitted",
-	2:    "no such file or directory",
-	3:    "no such process",
-	4:    "interrupted system call",
-	5:    "input/output error",
-	6:    "no such device or address",
-	7:    "argument list too long",
-	8:    "exec format error",
-	9:    "bad file descriptor",
-	10:   "no child processes",
-	11:   "resource temporarily unavailable",
-	12:   "cannot allocate memory",
-	13:   "permission denied",
-	14:   "bad address",
-	15:   "block device required",
-	16:   "device or resource busy",
-	17:   "file exists",
-	18:   "invalid cross-device link",
-	19:   "no such device",
-	20:   "not a directory",
-	21:   "is a directory",
-	22:   "invalid argument",
-	23:   "too many open files in system",
-	24:   "too many open files",
-	25:   "inappropriate ioctl for device",
-	26:   "text file busy",
-	27:   "file too large",
-	28:   "no space left on device",
-	29:   "illegal seek",
-	30:   "read-only file system",
-	31:   "too many links",
-	32:   "broken pipe",
-	33:   "numerical argument out of domain",
-	34:   "numerical result out of range",
-	35:   "no message of desired type",
-	36:   "identifier removed",
-	37:   "channel number out of range",
-	38:   "level 2 not synchronized",
-	39:   "level 3 halted",
-	40:   "level 3 reset",
-	41:   "link number out of range",
-	42:   "protocol driver not attached",
-	43:   "no CSI structure available",
-	44:   "level 2 halted",
-	45:   "resource deadlock avoided",
-	46:   "no locks available",
-	50:   "invalid exchange",
-	51:   "invalid request descriptor",
-	52:   "exchange full",
-	53:   "no anode",
-	54:   "invalid request code",
-	55:   "invalid slot",
-	56:   "file locking deadlock error",
-	59:   "bad font file format",
-	60:   "device not a stream",
-	61:   "no data available",
-	62:   "timer expired",
-	63:   "out of streams resources",
-	64:   "machine is not on the network",
-	65:   "package not installed",
-	66:   "object is remote",
-	67:   "link has been severed",
-	68:   "advertise error",
-	69:   "srmount error",
-	70:   "communication error on send",
-	71:   "protocol error",
-	73:   "RFS specific error",
-	74:   "multihop attempted",
-	77:   "bad message",
-	78:   "file name too long",
-	79:   "value too large for defined data type",
-	80:   "name not unique on network",
-	81:   "file descriptor in bad state",
-	82:   "remote address changed",
-	83:   "can not access a needed shared library",
-	84:   "accessing a corrupted shared library",
-	85:   ".lib section in a.out corrupted",
-	86:   "attempting to link in too many shared libraries",
-	87:   "cannot exec a shared library directly",
-	88:   "invalid or incomplete multibyte or wide character",
-	89:   "function not implemented",
-	90:   "too many levels of symbolic links",
-	91:   "interrupted system call should be restarted",
-	92:   "streams pipe error",
-	93:   "directory not empty",
-	94:   "too many users",
-	95:   "socket operation on non-socket",
-	96:   "destination address required",
-	97:   "message too long",
-	98:   "protocol wrong type for socket",
-	99:   "protocol not available",
-	120:  "protocol not supported",
-	121:  "socket type not supported",
-	122:  "operation not supported",
-	123:  "protocol family not supported",
-	124:  "address family not supported by protocol",
-	125:  "address already in use",
-	126:  "cannot assign requested address",
-	127:  "network is down",
-	128:  "network is unreachable",
-	129:  "network dropped connection on reset",
-	130:  "software caused connection abort",
-	131:  "connection reset by peer",
-	132:  "no buffer space available",
-	133:  "transport endpoint is already connected",
-	134:  "transport endpoint is not connected",
-	135:  "structure needs cleaning",
-	137:  "not a XENIX named type file",
-	138:  "no XENIX semaphores available",
-	139:  "is a named type file",
-	140:  "remote I/O error",
-	141:  "unknown error 141",
-	142:  "unknown error 142",
-	143:  "cannot send after transport endpoint shutdown",
-	144:  "too many references: cannot splice",
-	145:  "connection timed out",
-	146:  "connection refused",
-	147:  "host is down",
-	148:  "no route to host",
-	149:  "operation already in progress",
-	150:  "operation now in progress",
-	151:  "stale file handle",
-	158:  "operation canceled",
-	159:  "no medium found",
-	160:  "wrong medium type",
-	161:  "required key not available",
-	162:  "key has expired",
-	163:  "key has been revoked",
-	164:  "key was rejected by service",
-	165:  "owner died",
-	166:  "state not recoverable",
-	167:  "operation not possible due to RF-kill",
-	168:  "memory page has hardware error",
-	1133: "disk quota exceeded",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "user defined signal 1",
-	17: "user defined signal 2",
-	18: "child exited",
-	19: "power failure",
-	20: "window changed",
-	21: "urgent I/O condition",
-	22: "I/O possible",
-	23: "stopped (signal)",
-	24: "stopped",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual timer expired",
-	29: "profiling timer expired",
-	30: "CPU time limit exceeded",
-	31: "file size limit exceeded",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
deleted file mode 100644
index 0f33f0fa58..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
+++ /dev/null
@@ -1,2096 +0,0 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build mips64le,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2b
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_QIPCRTR                       = 0x2a
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x40081270
-	BLKBSZSET                        = 0x80081271
-	BLKFLSBUF                        = 0x20001261
-	BLKFRAGET                        = 0x20001265
-	BLKFRASET                        = 0x20001264
-	BLKGETSIZE                       = 0x20001260
-	BLKGETSIZE64                     = 0x40081272
-	BLKPBSZGET                       = 0x2000127b
-	BLKRAGET                         = 0x20001263
-	BLKRASET                         = 0x20001262
-	BLKROGET                         = 0x2000125e
-	BLKROSET                         = 0x2000125d
-	BLKRRPART                        = 0x2000125f
-	BLKSECTGET                       = 0x20001267
-	BLKSECTSET                       = 0x20001266
-	BLKSSZGET                        = 0x20001268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RAW_FILTER_MAX               = 0x200
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_NCSI                       = 0x88f8
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_UNSHARE_RANGE          = 0x40
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x2000
-	FS_ENCRYPTION_MODE_AES_256_CBC   = 0x3
-	FS_ENCRYPTION_MODE_AES_256_CTS   = 0x4
-	FS_ENCRYPTION_MODE_AES_256_GCM   = 0x2
-	FS_ENCRYPTION_MODE_AES_256_XTS   = 0x1
-	FS_ENCRYPTION_MODE_INVALID       = 0x0
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x800c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x80106614
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x400c6613
-	FS_KEY_DESCRIPTOR_SIZE           = 0x8
-	FS_KEY_DESC_PREFIX               = "fscrypt:"
-	FS_KEY_DESC_PREFIX_SIZE          = 0x8
-	FS_MAX_KEY_SIZE                  = 0x40
-	FS_POLICY_FLAGS_PAD_16           = 0x2
-	FS_POLICY_FLAGS_PAD_32           = 0x3
-	FS_POLICY_FLAGS_PAD_4            = 0x0
-	FS_POLICY_FLAGS_PAD_8            = 0x1
-	FS_POLICY_FLAGS_PAD_MASK         = 0x3
-	FS_POLICY_FLAGS_VALID            = 0x3
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0xe
-	F_GETLK64                        = 0xe
-	F_GETOWN                         = 0x17
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x18
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x100
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x80
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x800
-	MAP_ANONYMOUS                    = 0x800
-	MAP_DENYWRITE                    = 0x2000
-	MAP_EXECUTABLE                   = 0x4000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x1000
-	MAP_HUGETLB                      = 0x80000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x8000
-	MAP_NONBLOCK                     = 0x20000
-	MAP_NORESERVE                    = 0x400
-	MAP_POPULATE                     = 0x10000
-	MAP_PRIVATE                      = 0x2
-	MAP_RENAME                       = 0x800
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x40000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_BORN                          = 0x20000000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOREMOTELOCK                  = 0x8000000
-	MS_NOSEC                         = 0x10000000
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	MS_VERBOSE                       = 0x8000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x8
-	O_ASYNC                          = 0x1000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x100
-	O_DIRECT                         = 0x8000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x10
-	O_EXCL                           = 0x400
-	O_FSYNC                          = 0x4010
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x80
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x800
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x80
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x4010
-	O_SYNC                           = 0x4010
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_GET_THREAD_AREA_3264      = 0xc4
-	PTRACE_GET_WATCH_REGS            = 0xd0
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_3264             = 0xc1
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_3264             = 0xc0
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_3264             = 0xc3
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_3264             = 0xc2
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SET_WATCH_REGS            = 0xd1
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x6
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x5
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x19
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x19
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x40047307
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x40047309
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x80047308
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x1
-	SOCK_NONBLOCK                    = 0x80
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x2
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_CAN_BASE                     = 0x64
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0xffff
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1009
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x20
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_CNX_ADVICE                    = 0x35
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x1029
-	SO_DONTROUTE                     = 0x10
-	SO_ERROR                         = 0x1007
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x8
-	SO_LINGER                        = 0x80
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0x100
-	SO_PASSCRED                      = 0x11
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x12
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1e
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x1028
-	SO_RCVBUF                        = 0x1002
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x1004
-	SO_RCVTIMEO                      = 0x1006
-	SO_REUSEADDR                     = 0x4
-	SO_REUSEPORT                     = 0x200
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x1001
-	SO_SNDBUFFORCE                   = 0x1f
-	SO_SNDLOWAT                      = 0x1003
-	SO_SNDTIMEO                      = 0x1005
-	SO_STYLE                         = 0x1008
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x1008
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x5407
-	TCGETA                           = 0x5401
-	TCGETS                           = 0x540d
-	TCGETS2                          = 0x4030542a
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_REPAIR_WINDOW                = 0x1d
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x5410
-	TCSBRK                           = 0x5405
-	TCSBRKP                          = 0x5486
-	TCSETA                           = 0x5402
-	TCSETAF                          = 0x5404
-	TCSETAW                          = 0x5403
-	TCSETS                           = 0x540e
-	TCSETS2                          = 0x8030542b
-	TCSETSF                          = 0x5410
-	TCSETSF2                         = 0x8030542d
-	TCSETSW                          = 0x540f
-	TCSETSW2                         = 0x8030542c
-	TCXONC                           = 0x5406
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x80047478
-	TIOCEXCL                         = 0x740d
-	TIOCGDEV                         = 0x40045432
-	TIOCGETD                         = 0x7400
-	TIOCGETP                         = 0x7408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x5492
-	TIOCGLCKTRMIOS                   = 0x548b
-	TIOCGLTC                         = 0x7474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x4020542e
-	TIOCGSERIAL                      = 0x5484
-	TIOCGSID                         = 0x7416
-	TIOCGSOFTCAR                     = 0x5481
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x467f
-	TIOCLINUX                        = 0x5483
-	TIOCMBIC                         = 0x741c
-	TIOCMBIS                         = 0x741b
-	TIOCMGET                         = 0x741d
-	TIOCMIWAIT                       = 0x5491
-	TIOCMSET                         = 0x741a
-	TIOCM_CAR                        = 0x100
-	TIOCM_CD                         = 0x100
-	TIOCM_CTS                        = 0x40
-	TIOCM_DSR                        = 0x400
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x200
-	TIOCM_RNG                        = 0x200
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x20
-	TIOCM_ST                         = 0x10
-	TIOCNOTTY                        = 0x5471
-	TIOCNXCL                         = 0x740e
-	TIOCOUTQ                         = 0x7472
-	TIOCPKT                          = 0x5470
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x5480
-	TIOCSERCONFIG                    = 0x5488
-	TIOCSERGETLSR                    = 0x548e
-	TIOCSERGETMULTI                  = 0x548f
-	TIOCSERGSTRUCT                   = 0x548d
-	TIOCSERGWILD                     = 0x5489
-	TIOCSERSETMULTI                  = 0x5490
-	TIOCSERSWILD                     = 0x548a
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x7401
-	TIOCSETN                         = 0x740a
-	TIOCSETP                         = 0x7409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x548c
-	TIOCSLTC                         = 0x7475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0xc020542f
-	TIOCSSERIAL                      = 0x5485
-	TIOCSSOFTCAR                     = 0x5482
-	TIOCSTI                          = 0x5472
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x8000
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETBE                     = 0x400454df
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNGETVNETLE                     = 0x400454dd
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETBE                     = 0x800454de
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	TUNSETVNETLE                     = 0x800454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x10
-	VEOL                             = 0x11
-	VEOL2                            = 0x6
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x4
-	VM_SOCKETS_INVALID_VERSION       = 0xffffffff
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VSWTCH                           = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x7d)
-	EADDRNOTAVAIL   = syscall.Errno(0x7e)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x7c)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x95)
-	EBADE           = syscall.Errno(0x32)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x51)
-	EBADMSG         = syscall.Errno(0x4d)
-	EBADR           = syscall.Errno(0x33)
-	EBADRQC         = syscall.Errno(0x36)
-	EBADSLT         = syscall.Errno(0x37)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x9e)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x25)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x82)
-	ECONNREFUSED    = syscall.Errno(0x92)
-	ECONNRESET      = syscall.Errno(0x83)
-	EDEADLK         = syscall.Errno(0x2d)
-	EDEADLOCK       = syscall.Errno(0x38)
-	EDESTADDRREQ    = syscall.Errno(0x60)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x46d)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x93)
-	EHOSTUNREACH    = syscall.Errno(0x94)
-	EHWPOISON       = syscall.Errno(0xa8)
-	EIDRM           = syscall.Errno(0x24)
-	EILSEQ          = syscall.Errno(0x58)
-	EINIT           = syscall.Errno(0x8d)
-	EINPROGRESS     = syscall.Errno(0x96)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x85)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x8b)
-	EKEYEXPIRED     = syscall.Errno(0xa2)
-	EKEYREJECTED    = syscall.Errno(0xa4)
-	EKEYREVOKED     = syscall.Errno(0xa3)
-	EL2HLT          = syscall.Errno(0x2c)
-	EL2NSYNC        = syscall.Errno(0x26)
-	EL3HLT          = syscall.Errno(0x27)
-	EL3RST          = syscall.Errno(0x28)
-	ELIBACC         = syscall.Errno(0x53)
-	ELIBBAD         = syscall.Errno(0x54)
-	ELIBEXEC        = syscall.Errno(0x57)
-	ELIBMAX         = syscall.Errno(0x56)
-	ELIBSCN         = syscall.Errno(0x55)
-	ELNRNG          = syscall.Errno(0x29)
-	ELOOP           = syscall.Errno(0x5a)
-	EMEDIUMTYPE     = syscall.Errno(0xa0)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x61)
-	EMULTIHOP       = syscall.Errno(0x4a)
-	ENAMETOOLONG    = syscall.Errno(0x4e)
-	ENAVAIL         = syscall.Errno(0x8a)
-	ENETDOWN        = syscall.Errno(0x7f)
-	ENETRESET       = syscall.Errno(0x81)
-	ENETUNREACH     = syscall.Errno(0x80)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x35)
-	ENOBUFS         = syscall.Errno(0x84)
-	ENOCSI          = syscall.Errno(0x2b)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0xa1)
-	ENOLCK          = syscall.Errno(0x2e)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x9f)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x23)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x63)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x59)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x86)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x5d)
-	ENOTNAM         = syscall.Errno(0x89)
-	ENOTRECOVERABLE = syscall.Errno(0xa6)
-	ENOTSOCK        = syscall.Errno(0x5f)
-	ENOTSUP         = syscall.Errno(0x7a)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x50)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x7a)
-	EOVERFLOW       = syscall.Errno(0x4f)
-	EOWNERDEAD      = syscall.Errno(0xa5)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x7b)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x78)
-	EPROTOTYPE      = syscall.Errno(0x62)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x52)
-	EREMDEV         = syscall.Errno(0x8e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x8c)
-	ERESTART        = syscall.Errno(0x5b)
-	ERFKILL         = syscall.Errno(0xa7)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x8f)
-	ESOCKTNOSUPPORT = syscall.Errno(0x79)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x97)
-	ESTRPIPE        = syscall.Errno(0x5c)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x91)
-	ETOOMANYREFS    = syscall.Errno(0x90)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x87)
-	EUNATCH         = syscall.Errno(0x2a)
-	EUSERS          = syscall.Errno(0x5e)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x34)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x12)
-	SIGCLD    = syscall.Signal(0x12)
-	SIGCONT   = syscall.Signal(0x19)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x16)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x16)
-	SIGPROF   = syscall.Signal(0x1d)
-	SIGPWR    = syscall.Signal(0x13)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x17)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x18)
-	SIGTTIN   = syscall.Signal(0x1a)
-	SIGTTOU   = syscall.Signal(0x1b)
-	SIGURG    = syscall.Signal(0x15)
-	SIGUSR1   = syscall.Signal(0x10)
-	SIGUSR2   = syscall.Signal(0x11)
-	SIGVTALRM = syscall.Signal(0x1c)
-	SIGWINCH  = syscall.Signal(0x14)
-	SIGXCPU   = syscall.Signal(0x1e)
-	SIGXFSZ   = syscall.Signal(0x1f)
-)
-
-// Error table
-var errors = [...]string{
-	1:    "operation not permitted",
-	2:    "no such file or directory",
-	3:    "no such process",
-	4:    "interrupted system call",
-	5:    "input/output error",
-	6:    "no such device or address",
-	7:    "argument list too long",
-	8:    "exec format error",
-	9:    "bad file descriptor",
-	10:   "no child processes",
-	11:   "resource temporarily unavailable",
-	12:   "cannot allocate memory",
-	13:   "permission denied",
-	14:   "bad address",
-	15:   "block device required",
-	16:   "device or resource busy",
-	17:   "file exists",
-	18:   "invalid cross-device link",
-	19:   "no such device",
-	20:   "not a directory",
-	21:   "is a directory",
-	22:   "invalid argument",
-	23:   "too many open files in system",
-	24:   "too many open files",
-	25:   "inappropriate ioctl for device",
-	26:   "text file busy",
-	27:   "file too large",
-	28:   "no space left on device",
-	29:   "illegal seek",
-	30:   "read-only file system",
-	31:   "too many links",
-	32:   "broken pipe",
-	33:   "numerical argument out of domain",
-	34:   "numerical result out of range",
-	35:   "no message of desired type",
-	36:   "identifier removed",
-	37:   "channel number out of range",
-	38:   "level 2 not synchronized",
-	39:   "level 3 halted",
-	40:   "level 3 reset",
-	41:   "link number out of range",
-	42:   "protocol driver not attached",
-	43:   "no CSI structure available",
-	44:   "level 2 halted",
-	45:   "resource deadlock avoided",
-	46:   "no locks available",
-	50:   "invalid exchange",
-	51:   "invalid request descriptor",
-	52:   "exchange full",
-	53:   "no anode",
-	54:   "invalid request code",
-	55:   "invalid slot",
-	56:   "file locking deadlock error",
-	59:   "bad font file format",
-	60:   "device not a stream",
-	61:   "no data available",
-	62:   "timer expired",
-	63:   "out of streams resources",
-	64:   "machine is not on the network",
-	65:   "package not installed",
-	66:   "object is remote",
-	67:   "link has been severed",
-	68:   "advertise error",
-	69:   "srmount error",
-	70:   "communication error on send",
-	71:   "protocol error",
-	73:   "RFS specific error",
-	74:   "multihop attempted",
-	77:   "bad message",
-	78:   "file name too long",
-	79:   "value too large for defined data type",
-	80:   "name not unique on network",
-	81:   "file descriptor in bad state",
-	82:   "remote address changed",
-	83:   "can not access a needed shared library",
-	84:   "accessing a corrupted shared library",
-	85:   ".lib section in a.out corrupted",
-	86:   "attempting to link in too many shared libraries",
-	87:   "cannot exec a shared library directly",
-	88:   "invalid or incomplete multibyte or wide character",
-	89:   "function not implemented",
-	90:   "too many levels of symbolic links",
-	91:   "interrupted system call should be restarted",
-	92:   "streams pipe error",
-	93:   "directory not empty",
-	94:   "too many users",
-	95:   "socket operation on non-socket",
-	96:   "destination address required",
-	97:   "message too long",
-	98:   "protocol wrong type for socket",
-	99:   "protocol not available",
-	120:  "protocol not supported",
-	121:  "socket type not supported",
-	122:  "operation not supported",
-	123:  "protocol family not supported",
-	124:  "address family not supported by protocol",
-	125:  "address already in use",
-	126:  "cannot assign requested address",
-	127:  "network is down",
-	128:  "network is unreachable",
-	129:  "network dropped connection on reset",
-	130:  "software caused connection abort",
-	131:  "connection reset by peer",
-	132:  "no buffer space available",
-	133:  "transport endpoint is already connected",
-	134:  "transport endpoint is not connected",
-	135:  "structure needs cleaning",
-	137:  "not a XENIX named type file",
-	138:  "no XENIX semaphores available",
-	139:  "is a named type file",
-	140:  "remote I/O error",
-	141:  "unknown error 141",
-	142:  "unknown error 142",
-	143:  "cannot send after transport endpoint shutdown",
-	144:  "too many references: cannot splice",
-	145:  "connection timed out",
-	146:  "connection refused",
-	147:  "host is down",
-	148:  "no route to host",
-	149:  "operation already in progress",
-	150:  "operation now in progress",
-	151:  "stale file handle",
-	158:  "operation canceled",
-	159:  "no medium found",
-	160:  "wrong medium type",
-	161:  "required key not available",
-	162:  "key has expired",
-	163:  "key has been revoked",
-	164:  "key was rejected by service",
-	165:  "owner died",
-	166:  "state not recoverable",
-	167:  "operation not possible due to RF-kill",
-	168:  "memory page has hardware error",
-	1133: "disk quota exceeded",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "user defined signal 1",
-	17: "user defined signal 2",
-	18: "child exited",
-	19: "power failure",
-	20: "window changed",
-	21: "urgent I/O condition",
-	22: "I/O possible",
-	23: "stopped (signal)",
-	24: "stopped",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual timer expired",
-	29: "profiling timer expired",
-	30: "CPU time limit exceeded",
-	31: "file size limit exceeded",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
deleted file mode 100644
index 3fa39fa79d..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
+++ /dev/null
@@ -1,2096 +0,0 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build mipsle,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2b
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_QIPCRTR                       = 0x2a
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x40041270
-	BLKBSZSET                        = 0x80041271
-	BLKFLSBUF                        = 0x20001261
-	BLKFRAGET                        = 0x20001265
-	BLKFRASET                        = 0x20001264
-	BLKGETSIZE                       = 0x20001260
-	BLKGETSIZE64                     = 0x40041272
-	BLKPBSZGET                       = 0x2000127b
-	BLKRAGET                         = 0x20001263
-	BLKRASET                         = 0x20001262
-	BLKROGET                         = 0x2000125e
-	BLKROSET                         = 0x2000125d
-	BLKRRPART                        = 0x2000125f
-	BLKSECTGET                       = 0x20001267
-	BLKSECTSET                       = 0x20001266
-	BLKSSZGET                        = 0x20001268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RAW_FILTER_MAX               = 0x200
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_NCSI                       = 0x88f8
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_UNSHARE_RANGE          = 0x40
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x2000
-	FS_ENCRYPTION_MODE_AES_256_CBC   = 0x3
-	FS_ENCRYPTION_MODE_AES_256_CTS   = 0x4
-	FS_ENCRYPTION_MODE_AES_256_GCM   = 0x2
-	FS_ENCRYPTION_MODE_AES_256_XTS   = 0x1
-	FS_ENCRYPTION_MODE_INVALID       = 0x0
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x800c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x80106614
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x400c6613
-	FS_KEY_DESCRIPTOR_SIZE           = 0x8
-	FS_KEY_DESC_PREFIX               = "fscrypt:"
-	FS_KEY_DESC_PREFIX_SIZE          = 0x8
-	FS_MAX_KEY_SIZE                  = 0x40
-	FS_POLICY_FLAGS_PAD_16           = 0x2
-	FS_POLICY_FLAGS_PAD_32           = 0x3
-	FS_POLICY_FLAGS_PAD_4            = 0x0
-	FS_POLICY_FLAGS_PAD_8            = 0x1
-	FS_POLICY_FLAGS_PAD_MASK         = 0x3
-	FS_POLICY_FLAGS_VALID            = 0x3
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x21
-	F_GETLK64                        = 0x21
-	F_GETOWN                         = 0x17
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x22
-	F_SETLK64                        = 0x22
-	F_SETLKW                         = 0x23
-	F_SETLKW64                       = 0x23
-	F_SETOWN                         = 0x18
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x100
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x80
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x800
-	MAP_ANONYMOUS                    = 0x800
-	MAP_DENYWRITE                    = 0x2000
-	MAP_EXECUTABLE                   = 0x4000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x1000
-	MAP_HUGETLB                      = 0x80000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x8000
-	MAP_NONBLOCK                     = 0x20000
-	MAP_NORESERVE                    = 0x400
-	MAP_POPULATE                     = 0x10000
-	MAP_PRIVATE                      = 0x2
-	MAP_RENAME                       = 0x800
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x40000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_BORN                          = 0x20000000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOREMOTELOCK                  = 0x8000000
-	MS_NOSEC                         = 0x10000000
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	MS_VERBOSE                       = 0x8000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x8
-	O_ASYNC                          = 0x1000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x100
-	O_DIRECT                         = 0x8000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x10
-	O_EXCL                           = 0x400
-	O_FSYNC                          = 0x4010
-	O_LARGEFILE                      = 0x2000
-	O_NDELAY                         = 0x80
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x800
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x80
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x4010
-	O_SYNC                           = 0x4010
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = 0xffffffff
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_GET_THREAD_AREA_3264      = 0xc4
-	PTRACE_GET_WATCH_REGS            = 0xd0
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_3264             = 0xc1
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_3264             = 0xc0
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_3264             = 0xc3
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_3264             = 0xc2
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SET_WATCH_REGS            = 0xd1
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x6
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x5
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x19
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x19
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x40047307
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x40047309
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x80047308
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x1
-	SOCK_NONBLOCK                    = 0x80
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x2
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_CAN_BASE                     = 0x64
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0xffff
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1009
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x20
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_CNX_ADVICE                    = 0x35
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x1029
-	SO_DONTROUTE                     = 0x10
-	SO_ERROR                         = 0x1007
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x8
-	SO_LINGER                        = 0x80
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0x100
-	SO_PASSCRED                      = 0x11
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x12
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1e
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x1028
-	SO_RCVBUF                        = 0x1002
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x1004
-	SO_RCVTIMEO                      = 0x1006
-	SO_REUSEADDR                     = 0x4
-	SO_REUSEPORT                     = 0x200
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x1001
-	SO_SNDBUFFORCE                   = 0x1f
-	SO_SNDLOWAT                      = 0x1003
-	SO_SNDTIMEO                      = 0x1005
-	SO_STYLE                         = 0x1008
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x1008
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x5407
-	TCGETA                           = 0x5401
-	TCGETS                           = 0x540d
-	TCGETS2                          = 0x4030542a
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_REPAIR_WINDOW                = 0x1d
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x5410
-	TCSBRK                           = 0x5405
-	TCSBRKP                          = 0x5486
-	TCSETA                           = 0x5402
-	TCSETAF                          = 0x5404
-	TCSETAW                          = 0x5403
-	TCSETS                           = 0x540e
-	TCSETS2                          = 0x8030542b
-	TCSETSF                          = 0x5410
-	TCSETSF2                         = 0x8030542d
-	TCSETSW                          = 0x540f
-	TCSETSW2                         = 0x8030542c
-	TCXONC                           = 0x5406
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x80047478
-	TIOCEXCL                         = 0x740d
-	TIOCGDEV                         = 0x40045432
-	TIOCGETD                         = 0x7400
-	TIOCGETP                         = 0x7408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x5492
-	TIOCGLCKTRMIOS                   = 0x548b
-	TIOCGLTC                         = 0x7474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x4020542e
-	TIOCGSERIAL                      = 0x5484
-	TIOCGSID                         = 0x7416
-	TIOCGSOFTCAR                     = 0x5481
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x467f
-	TIOCLINUX                        = 0x5483
-	TIOCMBIC                         = 0x741c
-	TIOCMBIS                         = 0x741b
-	TIOCMGET                         = 0x741d
-	TIOCMIWAIT                       = 0x5491
-	TIOCMSET                         = 0x741a
-	TIOCM_CAR                        = 0x100
-	TIOCM_CD                         = 0x100
-	TIOCM_CTS                        = 0x40
-	TIOCM_DSR                        = 0x400
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x200
-	TIOCM_RNG                        = 0x200
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x20
-	TIOCM_ST                         = 0x10
-	TIOCNOTTY                        = 0x5471
-	TIOCNXCL                         = 0x740e
-	TIOCOUTQ                         = 0x7472
-	TIOCPKT                          = 0x5470
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x5480
-	TIOCSERCONFIG                    = 0x5488
-	TIOCSERGETLSR                    = 0x548e
-	TIOCSERGETMULTI                  = 0x548f
-	TIOCSERGSTRUCT                   = 0x548d
-	TIOCSERGWILD                     = 0x5489
-	TIOCSERSETMULTI                  = 0x5490
-	TIOCSERSWILD                     = 0x548a
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x7401
-	TIOCSETN                         = 0x740a
-	TIOCSETP                         = 0x7409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x548c
-	TIOCSLTC                         = 0x7475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0xc020542f
-	TIOCSSERIAL                      = 0x5485
-	TIOCSSOFTCAR                     = 0x5482
-	TIOCSTI                          = 0x5472
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x8000
-	TUNATTACHFILTER                  = 0x800854d5
-	TUNDETACHFILTER                  = 0x800854d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x400854db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETBE                     = 0x400454df
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNGETVNETLE                     = 0x400454dd
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETBE                     = 0x800454de
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	TUNSETVNETLE                     = 0x800454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x10
-	VEOL                             = 0x11
-	VEOL2                            = 0x6
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x4
-	VM_SOCKETS_INVALID_VERSION       = 0xffffffff
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VSWTCH                           = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x20
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x7d)
-	EADDRNOTAVAIL   = syscall.Errno(0x7e)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x7c)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x95)
-	EBADE           = syscall.Errno(0x32)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x51)
-	EBADMSG         = syscall.Errno(0x4d)
-	EBADR           = syscall.Errno(0x33)
-	EBADRQC         = syscall.Errno(0x36)
-	EBADSLT         = syscall.Errno(0x37)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x9e)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x25)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x82)
-	ECONNREFUSED    = syscall.Errno(0x92)
-	ECONNRESET      = syscall.Errno(0x83)
-	EDEADLK         = syscall.Errno(0x2d)
-	EDEADLOCK       = syscall.Errno(0x38)
-	EDESTADDRREQ    = syscall.Errno(0x60)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x46d)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x93)
-	EHOSTUNREACH    = syscall.Errno(0x94)
-	EHWPOISON       = syscall.Errno(0xa8)
-	EIDRM           = syscall.Errno(0x24)
-	EILSEQ          = syscall.Errno(0x58)
-	EINIT           = syscall.Errno(0x8d)
-	EINPROGRESS     = syscall.Errno(0x96)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x85)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x8b)
-	EKEYEXPIRED     = syscall.Errno(0xa2)
-	EKEYREJECTED    = syscall.Errno(0xa4)
-	EKEYREVOKED     = syscall.Errno(0xa3)
-	EL2HLT          = syscall.Errno(0x2c)
-	EL2NSYNC        = syscall.Errno(0x26)
-	EL3HLT          = syscall.Errno(0x27)
-	EL3RST          = syscall.Errno(0x28)
-	ELIBACC         = syscall.Errno(0x53)
-	ELIBBAD         = syscall.Errno(0x54)
-	ELIBEXEC        = syscall.Errno(0x57)
-	ELIBMAX         = syscall.Errno(0x56)
-	ELIBSCN         = syscall.Errno(0x55)
-	ELNRNG          = syscall.Errno(0x29)
-	ELOOP           = syscall.Errno(0x5a)
-	EMEDIUMTYPE     = syscall.Errno(0xa0)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x61)
-	EMULTIHOP       = syscall.Errno(0x4a)
-	ENAMETOOLONG    = syscall.Errno(0x4e)
-	ENAVAIL         = syscall.Errno(0x8a)
-	ENETDOWN        = syscall.Errno(0x7f)
-	ENETRESET       = syscall.Errno(0x81)
-	ENETUNREACH     = syscall.Errno(0x80)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x35)
-	ENOBUFS         = syscall.Errno(0x84)
-	ENOCSI          = syscall.Errno(0x2b)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0xa1)
-	ENOLCK          = syscall.Errno(0x2e)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x9f)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x23)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x63)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x59)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x86)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x5d)
-	ENOTNAM         = syscall.Errno(0x89)
-	ENOTRECOVERABLE = syscall.Errno(0xa6)
-	ENOTSOCK        = syscall.Errno(0x5f)
-	ENOTSUP         = syscall.Errno(0x7a)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x50)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x7a)
-	EOVERFLOW       = syscall.Errno(0x4f)
-	EOWNERDEAD      = syscall.Errno(0xa5)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x7b)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x78)
-	EPROTOTYPE      = syscall.Errno(0x62)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x52)
-	EREMDEV         = syscall.Errno(0x8e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x8c)
-	ERESTART        = syscall.Errno(0x5b)
-	ERFKILL         = syscall.Errno(0xa7)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x8f)
-	ESOCKTNOSUPPORT = syscall.Errno(0x79)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x97)
-	ESTRPIPE        = syscall.Errno(0x5c)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x91)
-	ETOOMANYREFS    = syscall.Errno(0x90)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x87)
-	EUNATCH         = syscall.Errno(0x2a)
-	EUSERS          = syscall.Errno(0x5e)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x34)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x12)
-	SIGCLD    = syscall.Signal(0x12)
-	SIGCONT   = syscall.Signal(0x19)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x16)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x16)
-	SIGPROF   = syscall.Signal(0x1d)
-	SIGPWR    = syscall.Signal(0x13)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x17)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x18)
-	SIGTTIN   = syscall.Signal(0x1a)
-	SIGTTOU   = syscall.Signal(0x1b)
-	SIGURG    = syscall.Signal(0x15)
-	SIGUSR1   = syscall.Signal(0x10)
-	SIGUSR2   = syscall.Signal(0x11)
-	SIGVTALRM = syscall.Signal(0x1c)
-	SIGWINCH  = syscall.Signal(0x14)
-	SIGXCPU   = syscall.Signal(0x1e)
-	SIGXFSZ   = syscall.Signal(0x1f)
-)
-
-// Error table
-var errors = [...]string{
-	1:    "operation not permitted",
-	2:    "no such file or directory",
-	3:    "no such process",
-	4:    "interrupted system call",
-	5:    "input/output error",
-	6:    "no such device or address",
-	7:    "argument list too long",
-	8:    "exec format error",
-	9:    "bad file descriptor",
-	10:   "no child processes",
-	11:   "resource temporarily unavailable",
-	12:   "cannot allocate memory",
-	13:   "permission denied",
-	14:   "bad address",
-	15:   "block device required",
-	16:   "device or resource busy",
-	17:   "file exists",
-	18:   "invalid cross-device link",
-	19:   "no such device",
-	20:   "not a directory",
-	21:   "is a directory",
-	22:   "invalid argument",
-	23:   "too many open files in system",
-	24:   "too many open files",
-	25:   "inappropriate ioctl for device",
-	26:   "text file busy",
-	27:   "file too large",
-	28:   "no space left on device",
-	29:   "illegal seek",
-	30:   "read-only file system",
-	31:   "too many links",
-	32:   "broken pipe",
-	33:   "numerical argument out of domain",
-	34:   "numerical result out of range",
-	35:   "no message of desired type",
-	36:   "identifier removed",
-	37:   "channel number out of range",
-	38:   "level 2 not synchronized",
-	39:   "level 3 halted",
-	40:   "level 3 reset",
-	41:   "link number out of range",
-	42:   "protocol driver not attached",
-	43:   "no CSI structure available",
-	44:   "level 2 halted",
-	45:   "resource deadlock avoided",
-	46:   "no locks available",
-	50:   "invalid exchange",
-	51:   "invalid request descriptor",
-	52:   "exchange full",
-	53:   "no anode",
-	54:   "invalid request code",
-	55:   "invalid slot",
-	56:   "file locking deadlock error",
-	59:   "bad font file format",
-	60:   "device not a stream",
-	61:   "no data available",
-	62:   "timer expired",
-	63:   "out of streams resources",
-	64:   "machine is not on the network",
-	65:   "package not installed",
-	66:   "object is remote",
-	67:   "link has been severed",
-	68:   "advertise error",
-	69:   "srmount error",
-	70:   "communication error on send",
-	71:   "protocol error",
-	73:   "RFS specific error",
-	74:   "multihop attempted",
-	77:   "bad message",
-	78:   "file name too long",
-	79:   "value too large for defined data type",
-	80:   "name not unique on network",
-	81:   "file descriptor in bad state",
-	82:   "remote address changed",
-	83:   "can not access a needed shared library",
-	84:   "accessing a corrupted shared library",
-	85:   ".lib section in a.out corrupted",
-	86:   "attempting to link in too many shared libraries",
-	87:   "cannot exec a shared library directly",
-	88:   "invalid or incomplete multibyte or wide character",
-	89:   "function not implemented",
-	90:   "too many levels of symbolic links",
-	91:   "interrupted system call should be restarted",
-	92:   "streams pipe error",
-	93:   "directory not empty",
-	94:   "too many users",
-	95:   "socket operation on non-socket",
-	96:   "destination address required",
-	97:   "message too long",
-	98:   "protocol wrong type for socket",
-	99:   "protocol not available",
-	120:  "protocol not supported",
-	121:  "socket type not supported",
-	122:  "operation not supported",
-	123:  "protocol family not supported",
-	124:  "address family not supported by protocol",
-	125:  "address already in use",
-	126:  "cannot assign requested address",
-	127:  "network is down",
-	128:  "network is unreachable",
-	129:  "network dropped connection on reset",
-	130:  "software caused connection abort",
-	131:  "connection reset by peer",
-	132:  "no buffer space available",
-	133:  "transport endpoint is already connected",
-	134:  "transport endpoint is not connected",
-	135:  "structure needs cleaning",
-	137:  "not a XENIX named type file",
-	138:  "no XENIX semaphores available",
-	139:  "is a named type file",
-	140:  "remote I/O error",
-	141:  "unknown error 141",
-	142:  "unknown error 142",
-	143:  "cannot send after transport endpoint shutdown",
-	144:  "too many references: cannot splice",
-	145:  "connection timed out",
-	146:  "connection refused",
-	147:  "host is down",
-	148:  "no route to host",
-	149:  "operation already in progress",
-	150:  "operation now in progress",
-	151:  "stale file handle",
-	158:  "operation canceled",
-	159:  "no medium found",
-	160:  "wrong medium type",
-	161:  "required key not available",
-	162:  "key has expired",
-	163:  "key has been revoked",
-	164:  "key was rejected by service",
-	165:  "owner died",
-	166:  "state not recoverable",
-	167:  "operation not possible due to RF-kill",
-	168:  "memory page has hardware error",
-	1133: "disk quota exceeded",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "user defined signal 1",
-	17: "user defined signal 2",
-	18: "child exited",
-	19: "power failure",
-	20: "window changed",
-	21: "urgent I/O condition",
-	22: "I/O possible",
-	23: "stopped (signal)",
-	24: "stopped",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual timer expired",
-	29: "profiling timer expired",
-	30: "CPU time limit exceeded",
-	31: "file size limit exceeded",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
deleted file mode 100644
index 4585ef7785..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
+++ /dev/null
@@ -1,2150 +0,0 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build ppc64,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2b
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_QIPCRTR                       = 0x2a
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x17
-	B110                             = 0x3
-	B115200                          = 0x11
-	B1152000                         = 0x18
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x19
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x1a
-	B230400                          = 0x12
-	B2400                            = 0xb
-	B2500000                         = 0x1b
-	B300                             = 0x7
-	B3000000                         = 0x1c
-	B3500000                         = 0x1d
-	B38400                           = 0xf
-	B4000000                         = 0x1e
-	B460800                          = 0x13
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x14
-	B57600                           = 0x10
-	B576000                          = 0x15
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x16
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x40081270
-	BLKBSZSET                        = 0x80081271
-	BLKFLSBUF                        = 0x20001261
-	BLKFRAGET                        = 0x20001265
-	BLKFRASET                        = 0x20001264
-	BLKGETSIZE                       = 0x20001260
-	BLKGETSIZE64                     = 0x40081272
-	BLKPBSZGET                       = 0x2000127b
-	BLKRAGET                         = 0x20001263
-	BLKRASET                         = 0x20001262
-	BLKROGET                         = 0x2000125e
-	BLKROSET                         = 0x2000125d
-	BLKRRPART                        = 0x2000125f
-	BLKSECTGET                       = 0x20001267
-	BLKSECTSET                       = 0x20001266
-	BLKSSZGET                        = 0x20001268
-	BOTHER                           = 0x1f
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x8000
-	BSDLY                            = 0x8000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RAW_FILTER_MAX               = 0x200
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0xff
-	CBAUDEX                          = 0x0
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0xff0000
-	CLOCAL                           = 0x8000
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x1000
-	CR2                              = 0x2000
-	CR3                              = 0x3000
-	CRDLY                            = 0x3000
-	CREAD                            = 0x800
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x100
-	CS7                              = 0x200
-	CS8                              = 0x300
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x300
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x400
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x40
-	ECHOE                            = 0x2
-	ECHOK                            = 0x4
-	ECHOKE                           = 0x1
-	ECHONL                           = 0x10
-	ECHOPRT                          = 0x20
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_NCSI                       = 0x88f8
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_UNSHARE_RANGE          = 0x40
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x4000
-	FFDLY                            = 0x4000
-	FLUSHO                           = 0x800000
-	FS_ENCRYPTION_MODE_AES_256_CBC   = 0x3
-	FS_ENCRYPTION_MODE_AES_256_CTS   = 0x4
-	FS_ENCRYPTION_MODE_AES_256_GCM   = 0x2
-	FS_ENCRYPTION_MODE_AES_256_XTS   = 0x1
-	FS_ENCRYPTION_MODE_INVALID       = 0x0
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x800c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x80106614
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x400c6613
-	FS_KEY_DESCRIPTOR_SIZE           = 0x8
-	FS_KEY_DESC_PREFIX               = "fscrypt:"
-	FS_KEY_DESC_PREFIX_SIZE          = 0x8
-	FS_MAX_KEY_SIZE                  = 0x40
-	FS_POLICY_FLAGS_PAD_16           = 0x2
-	FS_POLICY_FLAGS_PAD_32           = 0x3
-	FS_POLICY_FLAGS_PAD_4            = 0x0
-	FS_POLICY_FLAGS_PAD_8            = 0x1
-	FS_POLICY_FLAGS_PAD_MASK         = 0x3
-	FS_POLICY_FLAGS_VALID            = 0x3
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0xc
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0xd
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0xe
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x4000
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x100
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x400
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x80
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x1000
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x400
-	IXON                             = 0x200
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x80
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x40
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x2000
-	MCL_FUTURE                       = 0x4000
-	MCL_ONFAULT                      = 0x8000
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_BORN                          = 0x20000000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOREMOTELOCK                  = 0x8000000
-	MS_NOSEC                         = 0x10000000
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	MS_VERBOSE                       = 0x8000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NL2                              = 0x200
-	NL3                              = 0x300
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x300
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80000000
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x4
-	ONLCR                            = 0x2
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x20000
-	O_DIRECTORY                      = 0x4000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x8000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x404000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x1000
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x2000
-	PENDIN                           = 0x20000000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_SAO                         = 0x10
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETEVRREGS                = 0x14
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGS64                 = 0x16
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GETVRREGS                 = 0x12
-	PTRACE_GETVSRREGS                = 0x1b
-	PTRACE_GET_DEBUGREG              = 0x19
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETEVRREGS                = 0x15
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGS64                 = 0x17
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SETVRREGS                 = 0x13
-	PTRACE_SETVSRREGS                = 0x1c
-	PTRACE_SET_DEBUGREG              = 0x1a
-	PTRACE_SINGLEBLOCK               = 0x100
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	PT_CCR                           = 0x26
-	PT_CTR                           = 0x23
-	PT_DAR                           = 0x29
-	PT_DSCR                          = 0x2c
-	PT_DSISR                         = 0x2a
-	PT_FPR0                          = 0x30
-	PT_FPSCR                         = 0x50
-	PT_LNK                           = 0x24
-	PT_MSR                           = 0x21
-	PT_NIP                           = 0x20
-	PT_ORIG_R3                       = 0x22
-	PT_R0                            = 0x0
-	PT_R1                            = 0x1
-	PT_R10                           = 0xa
-	PT_R11                           = 0xb
-	PT_R12                           = 0xc
-	PT_R13                           = 0xd
-	PT_R14                           = 0xe
-	PT_R15                           = 0xf
-	PT_R16                           = 0x10
-	PT_R17                           = 0x11
-	PT_R18                           = 0x12
-	PT_R19                           = 0x13
-	PT_R2                            = 0x2
-	PT_R20                           = 0x14
-	PT_R21                           = 0x15
-	PT_R22                           = 0x16
-	PT_R23                           = 0x17
-	PT_R24                           = 0x18
-	PT_R25                           = 0x19
-	PT_R26                           = 0x1a
-	PT_R27                           = 0x1b
-	PT_R28                           = 0x1c
-	PT_R29                           = 0x1d
-	PT_R3                            = 0x3
-	PT_R30                           = 0x1e
-	PT_R31                           = 0x1f
-	PT_R4                            = 0x4
-	PT_R5                            = 0x5
-	PT_R6                            = 0x6
-	PT_R7                            = 0x7
-	PT_R8                            = 0x8
-	PT_R9                            = 0x9
-	PT_REGS_COUNT                    = 0x2c
-	PT_RESULT                        = 0x2b
-	PT_SOFTE                         = 0x27
-	PT_TRAP                          = 0x28
-	PT_VR0                           = 0x52
-	PT_VRSAVE                        = 0x94
-	PT_VSCR                          = 0x93
-	PT_VSR0                          = 0x96
-	PT_VSR31                         = 0xd4
-	PT_XER                           = 0x25
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x19
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x19
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_CAN_BASE                     = 0x64
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_CNX_ADVICE                    = 0x35
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x14
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x15
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x10
-	SO_RCVTIMEO                      = 0x12
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x11
-	SO_SNDTIMEO                      = 0x13
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x400
-	TAB2                             = 0x800
-	TAB3                             = 0xc00
-	TABDLY                           = 0xc00
-	TCFLSH                           = 0x2000741f
-	TCGETA                           = 0x40147417
-	TCGETS                           = 0x402c7413
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_REPAIR_WINDOW                = 0x1d
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x2000741d
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x80147418
-	TCSETAF                          = 0x8014741c
-	TCSETAW                          = 0x80147419
-	TCSETS                           = 0x802c7414
-	TCSETSF                          = 0x802c7416
-	TCSETSW                          = 0x802c7415
-	TCXONC                           = 0x2000741e
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x40045432
-	TIOCGETC                         = 0x40067412
-	TIOCGETD                         = 0x5424
-	TIOCGETP                         = 0x40067408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGLTC                         = 0x40067474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x4004667f
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_LOOP                       = 0x8000
-	TIOCM_OUT1                       = 0x2000
-	TIOCM_OUT2                       = 0x4000
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x40047473
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETC                         = 0x80067411
-	TIOCSETD                         = 0x5423
-	TIOCSETN                         = 0x8006740a
-	TIOCSETP                         = 0x80067409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSLTC                         = 0x80067475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTART                        = 0x2000746e
-	TIOCSTI                          = 0x5412
-	TIOCSTOP                         = 0x2000746f
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x400000
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETBE                     = 0x400454df
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNGETVNETLE                     = 0x400454dd
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETBE                     = 0x800454de
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	TUNSETVNETLE                     = 0x800454dc
-	VDISCARD                         = 0x10
-	VEOF                             = 0x4
-	VEOL                             = 0x6
-	VEOL2                            = 0x8
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x5
-	VM_SOCKETS_INVALID_VERSION       = 0xffffffff
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xb
-	VSTART                           = 0xd
-	VSTOP                            = 0xe
-	VSUSP                            = 0xc
-	VSWTC                            = 0x9
-	VT0                              = 0x0
-	VT1                              = 0x10000
-	VTDLY                            = 0x10000
-	VTIME                            = 0x7
-	VWERASE                          = 0xa
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4000
-	XTABS                            = 0xc00
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x3a)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	58:  "file locking deadlock error",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
deleted file mode 100644
index b2a9128c4a..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+++ /dev/null
@@ -1,2150 +0,0 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build ppc64le,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2b
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_QIPCRTR                       = 0x2a
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x17
-	B110                             = 0x3
-	B115200                          = 0x11
-	B1152000                         = 0x18
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x19
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x1a
-	B230400                          = 0x12
-	B2400                            = 0xb
-	B2500000                         = 0x1b
-	B300                             = 0x7
-	B3000000                         = 0x1c
-	B3500000                         = 0x1d
-	B38400                           = 0xf
-	B4000000                         = 0x1e
-	B460800                          = 0x13
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x14
-	B57600                           = 0x10
-	B576000                          = 0x15
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x16
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x40081270
-	BLKBSZSET                        = 0x80081271
-	BLKFLSBUF                        = 0x20001261
-	BLKFRAGET                        = 0x20001265
-	BLKFRASET                        = 0x20001264
-	BLKGETSIZE                       = 0x20001260
-	BLKGETSIZE64                     = 0x40081272
-	BLKPBSZGET                       = 0x2000127b
-	BLKRAGET                         = 0x20001263
-	BLKRASET                         = 0x20001262
-	BLKROGET                         = 0x2000125e
-	BLKROSET                         = 0x2000125d
-	BLKRRPART                        = 0x2000125f
-	BLKSECTGET                       = 0x20001267
-	BLKSECTSET                       = 0x20001266
-	BLKSSZGET                        = 0x20001268
-	BOTHER                           = 0x1f
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x8000
-	BSDLY                            = 0x8000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RAW_FILTER_MAX               = 0x200
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0xff
-	CBAUDEX                          = 0x0
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0xff0000
-	CLOCAL                           = 0x8000
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x1000
-	CR2                              = 0x2000
-	CR3                              = 0x3000
-	CRDLY                            = 0x3000
-	CREAD                            = 0x800
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x100
-	CS7                              = 0x200
-	CS8                              = 0x300
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x300
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x400
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x40
-	ECHOE                            = 0x2
-	ECHOK                            = 0x4
-	ECHOKE                           = 0x1
-	ECHONL                           = 0x10
-	ECHOPRT                          = 0x20
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_NCSI                       = 0x88f8
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_UNSHARE_RANGE          = 0x40
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x4000
-	FFDLY                            = 0x4000
-	FLUSHO                           = 0x800000
-	FS_ENCRYPTION_MODE_AES_256_CBC   = 0x3
-	FS_ENCRYPTION_MODE_AES_256_CTS   = 0x4
-	FS_ENCRYPTION_MODE_AES_256_GCM   = 0x2
-	FS_ENCRYPTION_MODE_AES_256_XTS   = 0x1
-	FS_ENCRYPTION_MODE_INVALID       = 0x0
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x800c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x80106614
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x400c6613
-	FS_KEY_DESCRIPTOR_SIZE           = 0x8
-	FS_KEY_DESC_PREFIX               = "fscrypt:"
-	FS_KEY_DESC_PREFIX_SIZE          = 0x8
-	FS_MAX_KEY_SIZE                  = 0x40
-	FS_POLICY_FLAGS_PAD_16           = 0x2
-	FS_POLICY_FLAGS_PAD_32           = 0x3
-	FS_POLICY_FLAGS_PAD_4            = 0x0
-	FS_POLICY_FLAGS_PAD_8            = 0x1
-	FS_POLICY_FLAGS_PAD_MASK         = 0x3
-	FS_POLICY_FLAGS_VALID            = 0x3
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0xc
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0xd
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0xe
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x4000
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x100
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x400
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x80
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x1000
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x400
-	IXON                             = 0x200
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x80
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x40
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x2000
-	MCL_FUTURE                       = 0x4000
-	MCL_ONFAULT                      = 0x8000
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_BORN                          = 0x20000000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOREMOTELOCK                  = 0x8000000
-	MS_NOSEC                         = 0x10000000
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	MS_VERBOSE                       = 0x8000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NL2                              = 0x200
-	NL3                              = 0x300
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x300
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80000000
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x4
-	ONLCR                            = 0x2
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x20000
-	O_DIRECTORY                      = 0x4000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x8000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x404000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x1000
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x2000
-	PENDIN                           = 0x20000000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_SAO                         = 0x10
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETEVRREGS                = 0x14
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGS64                 = 0x16
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GETVRREGS                 = 0x12
-	PTRACE_GETVSRREGS                = 0x1b
-	PTRACE_GET_DEBUGREG              = 0x19
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETEVRREGS                = 0x15
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGS64                 = 0x17
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SETVRREGS                 = 0x13
-	PTRACE_SETVSRREGS                = 0x1c
-	PTRACE_SET_DEBUGREG              = 0x1a
-	PTRACE_SINGLEBLOCK               = 0x100
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	PT_CCR                           = 0x26
-	PT_CTR                           = 0x23
-	PT_DAR                           = 0x29
-	PT_DSCR                          = 0x2c
-	PT_DSISR                         = 0x2a
-	PT_FPR0                          = 0x30
-	PT_FPSCR                         = 0x50
-	PT_LNK                           = 0x24
-	PT_MSR                           = 0x21
-	PT_NIP                           = 0x20
-	PT_ORIG_R3                       = 0x22
-	PT_R0                            = 0x0
-	PT_R1                            = 0x1
-	PT_R10                           = 0xa
-	PT_R11                           = 0xb
-	PT_R12                           = 0xc
-	PT_R13                           = 0xd
-	PT_R14                           = 0xe
-	PT_R15                           = 0xf
-	PT_R16                           = 0x10
-	PT_R17                           = 0x11
-	PT_R18                           = 0x12
-	PT_R19                           = 0x13
-	PT_R2                            = 0x2
-	PT_R20                           = 0x14
-	PT_R21                           = 0x15
-	PT_R22                           = 0x16
-	PT_R23                           = 0x17
-	PT_R24                           = 0x18
-	PT_R25                           = 0x19
-	PT_R26                           = 0x1a
-	PT_R27                           = 0x1b
-	PT_R28                           = 0x1c
-	PT_R29                           = 0x1d
-	PT_R3                            = 0x3
-	PT_R30                           = 0x1e
-	PT_R31                           = 0x1f
-	PT_R4                            = 0x4
-	PT_R5                            = 0x5
-	PT_R6                            = 0x6
-	PT_R7                            = 0x7
-	PT_R8                            = 0x8
-	PT_R9                            = 0x9
-	PT_REGS_COUNT                    = 0x2c
-	PT_RESULT                        = 0x2b
-	PT_SOFTE                         = 0x27
-	PT_TRAP                          = 0x28
-	PT_VR0                           = 0x52
-	PT_VRSAVE                        = 0x94
-	PT_VSCR                          = 0x93
-	PT_VSR0                          = 0x96
-	PT_VSR31                         = 0xd4
-	PT_XER                           = 0x25
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x19
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x19
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_CAN_BASE                     = 0x64
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_CNX_ADVICE                    = 0x35
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x14
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x15
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x10
-	SO_RCVTIMEO                      = 0x12
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x11
-	SO_SNDTIMEO                      = 0x13
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x400
-	TAB2                             = 0x800
-	TAB3                             = 0xc00
-	TABDLY                           = 0xc00
-	TCFLSH                           = 0x2000741f
-	TCGETA                           = 0x40147417
-	TCGETS                           = 0x402c7413
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_REPAIR_WINDOW                = 0x1d
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x2000741d
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x80147418
-	TCSETAF                          = 0x8014741c
-	TCSETAW                          = 0x80147419
-	TCSETS                           = 0x802c7414
-	TCSETSF                          = 0x802c7416
-	TCSETSW                          = 0x802c7415
-	TCXONC                           = 0x2000741e
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x40045432
-	TIOCGETC                         = 0x40067412
-	TIOCGETD                         = 0x5424
-	TIOCGETP                         = 0x40067408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGLTC                         = 0x40067474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x4004667f
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_LOOP                       = 0x8000
-	TIOCM_OUT1                       = 0x2000
-	TIOCM_OUT2                       = 0x4000
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x40047473
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETC                         = 0x80067411
-	TIOCSETD                         = 0x5423
-	TIOCSETN                         = 0x8006740a
-	TIOCSETP                         = 0x80067409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSLTC                         = 0x80067475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTART                        = 0x2000746e
-	TIOCSTI                          = 0x5412
-	TIOCSTOP                         = 0x2000746f
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x400000
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETBE                     = 0x400454df
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNGETVNETLE                     = 0x400454dd
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETBE                     = 0x800454de
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	TUNSETVNETLE                     = 0x800454dc
-	VDISCARD                         = 0x10
-	VEOF                             = 0x4
-	VEOL                             = 0x6
-	VEOL2                            = 0x8
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x5
-	VM_SOCKETS_INVALID_VERSION       = 0xffffffff
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xb
-	VSTART                           = 0xd
-	VSTOP                            = 0xe
-	VSUSP                            = 0xc
-	VSWTC                            = 0x9
-	VT0                              = 0x0
-	VT1                              = 0x10000
-	VTDLY                            = 0x10000
-	VTIME                            = 0x7
-	VWERASE                          = 0xa
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4000
-	XTABS                            = 0xc00
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x3a)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	58:  "file locking deadlock error",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
deleted file mode 100644
index f8b0eb7baf..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
+++ /dev/null
@@ -1,2149 +0,0 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include -fsigned-char
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build s390x,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2b
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_QIPCRTR                       = 0x2a
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKPBSZGET                       = 0x127b
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RAW_FILTER_MAX               = 0x200
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_NCSI                       = 0x88f8
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_UNSHARE_RANGE          = 0x40
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	FS_ENCRYPTION_MODE_AES_256_CBC   = 0x3
-	FS_ENCRYPTION_MODE_AES_256_CTS   = 0x4
-	FS_ENCRYPTION_MODE_AES_256_GCM   = 0x2
-	FS_ENCRYPTION_MODE_AES_256_XTS   = 0x1
-	FS_ENCRYPTION_MODE_INVALID       = 0x0
-	FS_IOC_GET_ENCRYPTION_POLICY     = 0x400c6615
-	FS_IOC_GET_ENCRYPTION_PWSALT     = 0x40106614
-	FS_IOC_SET_ENCRYPTION_POLICY     = 0x800c6613
-	FS_KEY_DESCRIPTOR_SIZE           = 0x8
-	FS_KEY_DESC_PREFIX               = "fscrypt:"
-	FS_KEY_DESC_PREFIX_SIZE          = 0x8
-	FS_MAX_KEY_SIZE                  = 0x40
-	FS_POLICY_FLAGS_PAD_16           = 0x2
-	FS_POLICY_FLAGS_PAD_32           = 0x3
-	FS_POLICY_FLAGS_PAD_4            = 0x0
-	FS_POLICY_FLAGS_PAD_8            = 0x1
-	FS_POLICY_FLAGS_PAD_MASK         = 0x3
-	FS_POLICY_FLAGS_VALID            = 0x3
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0x5
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_BORN                          = 0x20000000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOREMOTELOCK                  = 0x8000000
-	MS_NOSEC                         = 0x10000000
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	MS_VERBOSE                       = 0x8000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x4000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_DISABLE_TE                = 0x5010
-	PTRACE_ENABLE_TE                 = 0x5009
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_LAST_BREAK            = 0x5006
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_AREA             = 0x5003
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_AREA             = 0x5002
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_PEEKUSR_AREA              = 0x5000
-	PTRACE_PEEK_SYSTEM_CALL          = 0x5007
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_AREA             = 0x5005
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_AREA             = 0x5004
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_POKEUSR_AREA              = 0x5001
-	PTRACE_POKE_SYSTEM_CALL          = 0x5008
-	PTRACE_PROT                      = 0x15
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SINGLEBLOCK               = 0xc
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TE_ABORT_RAND             = 0x5011
-	PTRACE_TRACEME                   = 0x0
-	PT_ACR0                          = 0x90
-	PT_ACR1                          = 0x94
-	PT_ACR10                         = 0xb8
-	PT_ACR11                         = 0xbc
-	PT_ACR12                         = 0xc0
-	PT_ACR13                         = 0xc4
-	PT_ACR14                         = 0xc8
-	PT_ACR15                         = 0xcc
-	PT_ACR2                          = 0x98
-	PT_ACR3                          = 0x9c
-	PT_ACR4                          = 0xa0
-	PT_ACR5                          = 0xa4
-	PT_ACR6                          = 0xa8
-	PT_ACR7                          = 0xac
-	PT_ACR8                          = 0xb0
-	PT_ACR9                          = 0xb4
-	PT_CR_10                         = 0x168
-	PT_CR_11                         = 0x170
-	PT_CR_9                          = 0x160
-	PT_ENDREGS                       = 0x1af
-	PT_FPC                           = 0xd8
-	PT_FPR0                          = 0xe0
-	PT_FPR1                          = 0xe8
-	PT_FPR10                         = 0x130
-	PT_FPR11                         = 0x138
-	PT_FPR12                         = 0x140
-	PT_FPR13                         = 0x148
-	PT_FPR14                         = 0x150
-	PT_FPR15                         = 0x158
-	PT_FPR2                          = 0xf0
-	PT_FPR3                          = 0xf8
-	PT_FPR4                          = 0x100
-	PT_FPR5                          = 0x108
-	PT_FPR6                          = 0x110
-	PT_FPR7                          = 0x118
-	PT_FPR8                          = 0x120
-	PT_FPR9                          = 0x128
-	PT_GPR0                          = 0x10
-	PT_GPR1                          = 0x18
-	PT_GPR10                         = 0x60
-	PT_GPR11                         = 0x68
-	PT_GPR12                         = 0x70
-	PT_GPR13                         = 0x78
-	PT_GPR14                         = 0x80
-	PT_GPR15                         = 0x88
-	PT_GPR2                          = 0x20
-	PT_GPR3                          = 0x28
-	PT_GPR4                          = 0x30
-	PT_GPR5                          = 0x38
-	PT_GPR6                          = 0x40
-	PT_GPR7                          = 0x48
-	PT_GPR8                          = 0x50
-	PT_GPR9                          = 0x58
-	PT_IEEE_IP                       = 0x1a8
-	PT_LASTOFF                       = 0x1a8
-	PT_ORIGGPR2                      = 0xd0
-	PT_PSWADDR                       = 0x8
-	PT_PSWMASK                       = 0x0
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x19
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x19
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPING_OPT_STATS       = 0x36
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_CAN_BASE                     = 0x64
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_CNX_ADVICE                    = 0x35
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_REPAIR_WINDOW                = 0x1d
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x401054d5
-	TUNDETACHFILTER                  = 0x401054d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETFILTER                     = 0x801054db
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETBE                     = 0x800454df
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNGETVNETLE                     = 0x800454dd
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETIFINDEX                    = 0x400454da
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETQUEUE                      = 0x400454d9
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETBE                     = 0x400454de
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	TUNSETVNETLE                     = 0x400454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x6
-	VM_SOCKETS_INVALID_VERSION       = 0xffffffff
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x62)
-	EADDRNOTAVAIL   = syscall.Errno(0x63)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x61)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x72)
-	EBADE           = syscall.Errno(0x34)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x4d)
-	EBADMSG         = syscall.Errno(0x4a)
-	EBADR           = syscall.Errno(0x35)
-	EBADRQC         = syscall.Errno(0x38)
-	EBADSLT         = syscall.Errno(0x39)
-	EBFONT          = syscall.Errno(0x3b)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7d)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x2c)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x67)
-	ECONNREFUSED    = syscall.Errno(0x6f)
-	ECONNRESET      = syscall.Errno(0x68)
-	EDEADLK         = syscall.Errno(0x23)
-	EDEADLOCK       = syscall.Errno(0x23)
-	EDESTADDRREQ    = syscall.Errno(0x59)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x49)
-	EDQUOT          = syscall.Errno(0x7a)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x70)
-	EHOSTUNREACH    = syscall.Errno(0x71)
-	EHWPOISON       = syscall.Errno(0x85)
-	EIDRM           = syscall.Errno(0x2b)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x73)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x6a)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x7f)
-	EKEYREJECTED    = syscall.Errno(0x81)
-	EKEYREVOKED     = syscall.Errno(0x80)
-	EL2HLT          = syscall.Errno(0x33)
-	EL2NSYNC        = syscall.Errno(0x2d)
-	EL3HLT          = syscall.Errno(0x2e)
-	EL3RST          = syscall.Errno(0x2f)
-	ELIBACC         = syscall.Errno(0x4f)
-	ELIBBAD         = syscall.Errno(0x50)
-	ELIBEXEC        = syscall.Errno(0x53)
-	ELIBMAX         = syscall.Errno(0x52)
-	ELIBSCN         = syscall.Errno(0x51)
-	ELNRNG          = syscall.Errno(0x30)
-	ELOOP           = syscall.Errno(0x28)
-	EMEDIUMTYPE     = syscall.Errno(0x7c)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x5a)
-	EMULTIHOP       = syscall.Errno(0x48)
-	ENAMETOOLONG    = syscall.Errno(0x24)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x64)
-	ENETRESET       = syscall.Errno(0x66)
-	ENETUNREACH     = syscall.Errno(0x65)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x37)
-	ENOBUFS         = syscall.Errno(0x69)
-	ENOCSI          = syscall.Errno(0x32)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x7e)
-	ENOLCK          = syscall.Errno(0x25)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEDIUM       = syscall.Errno(0x7b)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x2a)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x5c)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x26)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x6b)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x27)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x83)
-	ENOTSOCK        = syscall.Errno(0x58)
-	ENOTSUP         = syscall.Errno(0x5f)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x4c)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x5f)
-	EOVERFLOW       = syscall.Errno(0x4b)
-	EOWNERDEAD      = syscall.Errno(0x82)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x60)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x5d)
-	EPROTOTYPE      = syscall.Errno(0x5b)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x4e)
-	EREMOTE         = syscall.Errno(0x42)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x55)
-	ERFKILL         = syscall.Errno(0x84)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x6c)
-	ESOCKTNOSUPPORT = syscall.Errno(0x5e)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x74)
-	ESTRPIPE        = syscall.Errno(0x56)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x6e)
-	ETOOMANYREFS    = syscall.Errno(0x6d)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x31)
-	EUSERS          = syscall.Errno(0x57)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x36)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0x7)
-	SIGCHLD   = syscall.Signal(0x11)
-	SIGCLD    = syscall.Signal(0x11)
-	SIGCONT   = syscall.Signal(0x12)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x1d)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x1d)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1e)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTKFLT = syscall.Signal(0x10)
-	SIGSTOP   = syscall.Signal(0x13)
-	SIGSYS    = syscall.Signal(0x1f)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x14)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
-	SIGURG    = syscall.Signal(0x17)
-	SIGUSR1   = syscall.Signal(0xa)
-	SIGUSR2   = syscall.Signal(0xc)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
deleted file mode 100644
index 95de199fc4..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
+++ /dev/null
@@ -1,2142 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build sparc64,linux
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2a
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	ASI_LEON_DFLUSH                  = 0x11
-	ASI_LEON_IFLUSH                  = 0x10
-	ASI_LEON_MMUFLUSH                = 0x18
-	B0                               = 0x0
-	B1000000                         = 0x100c
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x100d
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100e
-	B153600                          = 0x1006
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100f
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B300                             = 0x7
-	B307200                          = 0x1007
-	B38400                           = 0xf
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x100a
-	B57600                           = 0x1001
-	B576000                          = 0x100b
-	B600                             = 0x8
-	B614400                          = 0x1008
-	B75                              = 0x2
-	B76800                           = 0x1005
-	B921600                          = 0x1009
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	EMT_TAGOVF                       = 0x1
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x400000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x2000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x7
-	F_GETLK64                        = 0x7
-	F_GETOWN                         = 0x5
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x1
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x8
-	F_SETLK64                        = 0x8
-	F_SETLKW                         = 0x9
-	F_SETLKW64                       = 0x9
-	F_SETOWN                         = 0x6
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x3
-	F_WRLCK                          = 0x2
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x400000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x4000
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x200
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x100
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x40
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_RENAME                       = 0x20
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x2000
-	MCL_FUTURE                       = 0x4000
-	MCL_ONFAULT                      = 0x8000
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x8
-	O_ASYNC                          = 0x40
-	O_CLOEXEC                        = 0x400000
-	O_CREAT                          = 0x200
-	O_DIRECT                         = 0x100000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x2000
-	O_EXCL                           = 0x800
-	O_FSYNC                          = 0x802000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x4004
-	O_NOATIME                        = 0x200000
-	O_NOCTTY                         = 0x8000
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x4000
-	O_PATH                           = 0x1000000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x802000
-	O_SYNC                           = 0x802000
-	O_TMPFILE                        = 0x2010000
-	O_TRUNC                          = 0x400
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPAREGS                = 0x14
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETFPREGS64               = 0x19
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGS64                 = 0x16
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_READDATA                  = 0x10
-	PTRACE_READTEXT                  = 0x12
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETFPAREGS                = 0x15
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETFPREGS64               = 0x1a
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGS64                 = 0x17
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SPARC_DETACH              = 0xb
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	PTRACE_WRITEDATA                 = 0x11
-	PTRACE_WRITETEXT                 = 0x13
-	PT_FP                            = 0x48
-	PT_G0                            = 0x10
-	PT_G1                            = 0x14
-	PT_G2                            = 0x18
-	PT_G3                            = 0x1c
-	PT_G4                            = 0x20
-	PT_G5                            = 0x24
-	PT_G6                            = 0x28
-	PT_G7                            = 0x2c
-	PT_I0                            = 0x30
-	PT_I1                            = 0x34
-	PT_I2                            = 0x38
-	PT_I3                            = 0x3c
-	PT_I4                            = 0x40
-	PT_I5                            = 0x44
-	PT_I6                            = 0x48
-	PT_I7                            = 0x4c
-	PT_NPC                           = 0x8
-	PT_PC                            = 0x4
-	PT_PSR                           = 0x0
-	PT_REGS_MAGIC                    = 0x57ac6c00
-	PT_TNPC                          = 0x90
-	PT_TPC                           = 0x88
-	PT_TSTATE                        = 0x80
-	PT_V9_FP                         = 0x70
-	PT_V9_G0                         = 0x0
-	PT_V9_G1                         = 0x8
-	PT_V9_G2                         = 0x10
-	PT_V9_G3                         = 0x18
-	PT_V9_G4                         = 0x20
-	PT_V9_G5                         = 0x28
-	PT_V9_G6                         = 0x30
-	PT_V9_G7                         = 0x38
-	PT_V9_I0                         = 0x40
-	PT_V9_I1                         = 0x48
-	PT_V9_I2                         = 0x50
-	PT_V9_I3                         = 0x58
-	PT_V9_I4                         = 0x60
-	PT_V9_I5                         = 0x68
-	PT_V9_I6                         = 0x70
-	PT_V9_I7                         = 0x78
-	PT_V9_MAGIC                      = 0x9c
-	PT_V9_TNPC                       = 0x90
-	PT_V9_TPC                        = 0x88
-	PT_V9_TSTATE                     = 0x80
-	PT_V9_Y                          = 0x98
-	PT_WIM                           = 0x10
-	PT_Y                             = 0xc
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x6
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x18
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x11
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x23
-	SCM_TIMESTAMPNS                  = 0x21
-	SCM_WIFI_STATUS                  = 0x25
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCBONDCHANGEACTIVE             = 0x8995
-	SIOCBONDENSLAVE                  = 0x8990
-	SIOCBONDINFOQUERY                = 0x8994
-	SIOCBONDRELEASE                  = 0x8991
-	SIOCBONDSETHWADDR                = 0x8992
-	SIOCBONDSLAVEINFOQUERY           = 0x8993
-	SIOCBRADDBR                      = 0x89a0
-	SIOCBRADDIF                      = 0x89a2
-	SIOCBRDELBR                      = 0x89a1
-	SIOCBRDELIF                      = 0x89a3
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCETHTOOL                      = 0x8946
-	SIOCGARP                         = 0x8954
-	SIOCGHWTSTAMP                    = 0x89b1
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGIFVLAN                      = 0x8982
-	SIOCGMIIPHY                      = 0x8947
-	SIOCGMIIREG                      = 0x8948
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCINQ                          = 0x4004667f
-	SIOCOUTQ                         = 0x40047473
-	SIOCOUTQNSD                      = 0x894b
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSHWTSTAMP                    = 0x89b0
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSIFVLAN                      = 0x8983
-	SIOCSMIIREG                      = 0x8949
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SIOCWANDEV                       = 0x894a
-	SOCK_CLOEXEC                     = 0x400000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x4000
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0xffff
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x8000
-	SO_ATTACH_BPF                    = 0x34
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x35
-	SO_ATTACH_REUSEPORT_EBPF         = 0x36
-	SO_BINDTODEVICE                  = 0xd
-	SO_BPF_EXTENSIONS                = 0x32
-	SO_BROADCAST                     = 0x20
-	SO_BSDCOMPAT                     = 0x400
-	SO_BUSY_POLL                     = 0x30
-	SO_CNX_ADVICE                    = 0x37
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x1029
-	SO_DONTROUTE                     = 0x10
-	SO_ERROR                         = 0x1007
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x33
-	SO_KEEPALIVE                     = 0x8
-	SO_LINGER                        = 0x80
-	SO_LOCK_FILTER                   = 0x28
-	SO_MARK                          = 0x22
-	SO_MAX_PACING_RATE               = 0x31
-	SO_NOFCS                         = 0x27
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0x100
-	SO_PASSCRED                      = 0x2
-	SO_PASSSEC                       = 0x1f
-	SO_PEEK_OFF                      = 0x26
-	SO_PEERCRED                      = 0x40
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1e
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x1028
-	SO_RCVBUF                        = 0x1002
-	SO_RCVBUFFORCE                   = 0x100b
-	SO_RCVLOWAT                      = 0x800
-	SO_RCVTIMEO                      = 0x2000
-	SO_REUSEADDR                     = 0x4
-	SO_REUSEPORT                     = 0x200
-	SO_RXQ_OVFL                      = 0x24
-	SO_SECURITY_AUTHENTICATION       = 0x5001
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x5004
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x5002
-	SO_SELECT_ERR_QUEUE              = 0x29
-	SO_SNDBUF                        = 0x1001
-	SO_SNDBUFFORCE                   = 0x100a
-	SO_SNDLOWAT                      = 0x1000
-	SO_SNDTIMEO                      = 0x4000
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x23
-	SO_TIMESTAMPNS                   = 0x21
-	SO_TYPE                          = 0x1008
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x25
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x20005407
-	TCGETA                           = 0x40125401
-	TCGETS                           = 0x40245408
-	TCGETS2                          = 0x402c540c
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x20005405
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x80125402
-	TCSETAF                          = 0x80125404
-	TCSETAW                          = 0x80125403
-	TCSETS                           = 0x80245409
-	TCSETS2                          = 0x802c540d
-	TCSETSF                          = 0x8024540b
-	TCSETSF2                         = 0x802c540f
-	TCSETSW                          = 0x8024540a
-	TCSETSW2                         = 0x802c540e
-	TCXONC                           = 0x20005406
-	TIOCCBRK                         = 0x2000747a
-	TIOCCONS                         = 0x20007424
-	TIOCEXCL                         = 0x2000740d
-	TIOCGDEV                         = 0x40045432
-	TIOCGETD                         = 0x40047400
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x40047483
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40047486
-	TIOCGRS485                       = 0x40205441
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x40047485
-	TIOCGSOFTCAR                     = 0x40047464
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x4004667f
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x8004746b
-	TIOCMBIS                         = 0x8004746c
-	TIOCMGET                         = 0x4004746a
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x8004746d
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_LOOP                       = 0x8000
-	TIOCM_OUT1                       = 0x2000
-	TIOCM_OUT2                       = 0x4000
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x20007471
-	TIOCNXCL                         = 0x2000740e
-	TIOCOUTQ                         = 0x40047473
-	TIOCPKT                          = 0x80047470
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x2000747b
-	TIOCSCTTY                        = 0x20007484
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x80047401
-	TIOCSIG                          = 0x80047488
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x80047482
-	TIOCSPTLCK                       = 0x80047487
-	TIOCSRS485                       = 0xc0205442
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x80047465
-	TIOCSTART                        = 0x2000746e
-	TIOCSTI                          = 0x80017472
-	TIOCSTOP                         = 0x2000746f
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x20005437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETBE                     = 0x400454df
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNGETVNETLE                     = 0x400454dd
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETBE                     = 0x800454de
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	TUNSETVNETLE                     = 0x800454dc
-	VDISCARD                         = 0xd
-	VDSUSP                           = 0xb
-	VEOF                             = 0x4
-	VEOL                             = 0x5
-	VEOL2                            = 0x6
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x4
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WRAP                             = 0x20000
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
-	__TIOCFLUSH                      = 0x80047410
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EADV            = syscall.Errno(0x53)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x25)
-	EBADE           = syscall.Errno(0x66)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x5d)
-	EBADMSG         = syscall.Errno(0x4c)
-	EBADR           = syscall.Errno(0x67)
-	EBADRQC         = syscall.Errno(0x6a)
-	EBADSLT         = syscall.Errno(0x6b)
-	EBFONT          = syscall.Errno(0x6d)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x7f)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x5e)
-	ECOMM           = syscall.Errno(0x55)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0x4e)
-	EDEADLOCK       = syscall.Errno(0x6c)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDOTDOT         = syscall.Errno(0x58)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EHWPOISON       = syscall.Errno(0x87)
-	EIDRM           = syscall.Errno(0x4d)
-	EILSEQ          = syscall.Errno(0x7a)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	EISNAM          = syscall.Errno(0x78)
-	EKEYEXPIRED     = syscall.Errno(0x81)
-	EKEYREJECTED    = syscall.Errno(0x83)
-	EKEYREVOKED     = syscall.Errno(0x82)
-	EL2HLT          = syscall.Errno(0x65)
-	EL2NSYNC        = syscall.Errno(0x5f)
-	EL3HLT          = syscall.Errno(0x60)
-	EL3RST          = syscall.Errno(0x61)
-	ELIBACC         = syscall.Errno(0x72)
-	ELIBBAD         = syscall.Errno(0x70)
-	ELIBEXEC        = syscall.Errno(0x6e)
-	ELIBMAX         = syscall.Errno(0x7b)
-	ELIBSCN         = syscall.Errno(0x7c)
-	ELNRNG          = syscall.Errno(0x62)
-	ELOOP           = syscall.Errno(0x3e)
-	EMEDIUMTYPE     = syscall.Errno(0x7e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x57)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENAVAIL         = syscall.Errno(0x77)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x69)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENOCSI          = syscall.Errno(0x64)
-	ENODATA         = syscall.Errno(0x6f)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOKEY          = syscall.Errno(0x80)
-	ENOLCK          = syscall.Errno(0x4f)
-	ENOLINK         = syscall.Errno(0x52)
-	ENOMEDIUM       = syscall.Errno(0x7d)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x4b)
-	ENONET          = syscall.Errno(0x50)
-	ENOPKG          = syscall.Errno(0x71)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x4a)
-	ENOSTR          = syscall.Errno(0x48)
-	ENOSYS          = syscall.Errno(0x5a)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTNAM         = syscall.Errno(0x76)
-	ENOTRECOVERABLE = syscall.Errno(0x85)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x2d)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x73)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x5c)
-	EOWNERDEAD      = syscall.Errno(0x84)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROTO          = syscall.Errno(0x56)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x59)
-	EREMOTE         = syscall.Errno(0x47)
-	EREMOTEIO       = syscall.Errno(0x79)
-	ERESTART        = syscall.Errno(0x74)
-	ERFKILL         = syscall.Errno(0x86)
-	EROFS           = syscall.Errno(0x1e)
-	ERREMOTE        = syscall.Errno(0x51)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x54)
-	ESTALE          = syscall.Errno(0x46)
-	ESTRPIPE        = syscall.Errno(0x5b)
-	ETIME           = syscall.Errno(0x49)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUCLEAN         = syscall.Errno(0x75)
-	EUNATCH         = syscall.Errno(0x63)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x68)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCLD    = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGLOST   = syscall.Signal(0x1d)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPOLL   = syscall.Signal(0x17)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x1d)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	36:  "operation now in progress",
-	37:  "operation already in progress",
-	38:  "socket operation on non-socket",
-	39:  "destination address required",
-	40:  "message too long",
-	41:  "protocol wrong type for socket",
-	42:  "protocol not available",
-	43:  "protocol not supported",
-	44:  "socket type not supported",
-	45:  "operation not supported",
-	46:  "protocol family not supported",
-	47:  "address family not supported by protocol",
-	48:  "address already in use",
-	49:  "cannot assign requested address",
-	50:  "network is down",
-	51:  "network is unreachable",
-	52:  "network dropped connection on reset",
-	53:  "software caused connection abort",
-	54:  "connection reset by peer",
-	55:  "no buffer space available",
-	56:  "transport endpoint is already connected",
-	57:  "transport endpoint is not connected",
-	58:  "cannot send after transport endpoint shutdown",
-	59:  "too many references: cannot splice",
-	60:  "connection timed out",
-	61:  "connection refused",
-	62:  "too many levels of symbolic links",
-	63:  "file name too long",
-	64:  "host is down",
-	65:  "no route to host",
-	66:  "directory not empty",
-	67:  "too many processes",
-	68:  "too many users",
-	69:  "disk quota exceeded",
-	70:  "stale file handle",
-	71:  "object is remote",
-	72:  "device not a stream",
-	73:  "timer expired",
-	74:  "out of streams resources",
-	75:  "no message of desired type",
-	76:  "bad message",
-	77:  "identifier removed",
-	78:  "resource deadlock avoided",
-	79:  "no locks available",
-	80:  "machine is not on the network",
-	81:  "unknown error 81",
-	82:  "link has been severed",
-	83:  "advertise error",
-	84:  "srmount error",
-	85:  "communication error on send",
-	86:  "protocol error",
-	87:  "multihop attempted",
-	88:  "RFS specific error",
-	89:  "remote address changed",
-	90:  "function not implemented",
-	91:  "streams pipe error",
-	92:  "value too large for defined data type",
-	93:  "file descriptor in bad state",
-	94:  "channel number out of range",
-	95:  "level 2 not synchronized",
-	96:  "level 3 halted",
-	97:  "level 3 reset",
-	98:  "link number out of range",
-	99:  "protocol driver not attached",
-	100: "no CSI structure available",
-	101: "level 2 halted",
-	102: "invalid exchange",
-	103: "invalid request descriptor",
-	104: "exchange full",
-	105: "no anode",
-	106: "invalid request code",
-	107: "invalid slot",
-	108: "file locking deadlock error",
-	109: "bad font file format",
-	110: "cannot exec a shared library directly",
-	111: "no data available",
-	112: "accessing a corrupted shared library",
-	113: "package not installed",
-	114: "can not access a needed shared library",
-	115: "name not unique on network",
-	116: "interrupted system call should be restarted",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "invalid or incomplete multibyte or wide character",
-	123: "attempting to link in too many shared libraries",
-	124: ".lib section in a.out corrupted",
-	125: "no medium found",
-	126: "wrong medium type",
-	127: "operation canceled",
-	128: "required key not available",
-	129: "key has expired",
-	130: "key has been revoked",
-	131: "key was rejected by service",
-	132: "owner died",
-	133: "state not recoverable",
-	134: "operation not possible due to RF-kill",
-	135: "memory page has hardware error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "resource lost",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
deleted file mode 100644
index b4338d5f26..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
+++ /dev/null
@@ -1,1712 +0,0 @@
-// mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,netbsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m32 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x1c
-	AF_BLUETOOTH                      = 0x1f
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x20
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x18
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x23
-	AF_MPLS                           = 0x21
-	AF_NATM                           = 0x1b
-	AF_NS                             = 0x6
-	AF_OROUTE                         = 0x11
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x22
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	ARPHRD_ARCNET                     = 0x7
-	ARPHRD_ETHER                      = 0x1
-	ARPHRD_FRELAY                     = 0xf
-	ARPHRD_IEEE1394                   = 0x18
-	ARPHRD_IEEE802                    = 0x6
-	ARPHRD_STRIP                      = 0x17
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427d
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0084277
-	BIOCGETIF                         = 0x4090426b
-	BIOCGFEEDBACK                     = 0x4004427c
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRTIMEOUT                     = 0x400c427b
-	BIOCGSEESENT                      = 0x40044278
-	BIOCGSTATS                        = 0x4080426f
-	BIOCGSTATSOLD                     = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044276
-	BIOCSETF                          = 0x80084267
-	BIOCSETIF                         = 0x8090426c
-	BIOCSFEEDBACK                     = 0x8004427d
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRTIMEOUT                     = 0x800c427a
-	BIOCSSEESENT                      = 0x80044279
-	BIOCSTCPF                         = 0x80084272
-	BIOCSUDPF                         = 0x80084273
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALIGNMENT32                   = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DFLTBUFSIZE                   = 0x100000
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x1000000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CLONE_CSIGNAL                     = 0xff
-	CLONE_FILES                       = 0x400
-	CLONE_FS                          = 0x200
-	CLONE_PID                         = 0x1000
-	CLONE_PTRACE                      = 0x2000
-	CLONE_SIGHAND                     = 0x800
-	CLONE_VFORK                       = 0x4000
-	CLONE_VM                          = 0x100
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	CTL_QUERY                         = -0x2
-	DIOCBSFLUSH                       = 0x20006478
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HDLC                          = 0x10
-	DLT_HHDLC                         = 0x79
-	DLT_HIPPI                         = 0xf
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0xe
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RAWAF_MASK                    = 0x2240000
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xd
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EMUL_LINUX                        = 0x1
-	EMUL_LINUX32                      = 0x5
-	EMUL_MAXID                        = 0x6
-	EN_SW_CTL_INF                     = 0x1000
-	EN_SW_CTL_PREC                    = 0x300
-	EN_SW_CTL_ROUND                   = 0xc00
-	EN_SW_DATACHAIN                   = 0x80
-	EN_SW_DENORM                      = 0x2
-	EN_SW_INVOP                       = 0x1
-	EN_SW_OVERFLOW                    = 0x8
-	EN_SW_PRECLOSS                    = 0x20
-	EN_SW_UNDERFLOW                   = 0x10
-	EN_SW_ZERODIV                     = 0x4
-	ETHERCAP_JUMBO_MTU                = 0x4
-	ETHERCAP_VLAN_HWTAGGING           = 0x2
-	ETHERCAP_VLAN_MTU                 = 0x1
-	ETHERMIN                          = 0x2e
-	ETHERMTU                          = 0x5dc
-	ETHERMTU_JUMBO                    = 0x2328
-	ETHERTYPE_8023                    = 0x4
-	ETHERTYPE_AARP                    = 0x80f3
-	ETHERTYPE_ACCTON                  = 0x8390
-	ETHERTYPE_AEONIC                  = 0x8036
-	ETHERTYPE_ALPHA                   = 0x814a
-	ETHERTYPE_AMBER                   = 0x6008
-	ETHERTYPE_AMOEBA                  = 0x8145
-	ETHERTYPE_APOLLO                  = 0x80f7
-	ETHERTYPE_APOLLODOMAIN            = 0x8019
-	ETHERTYPE_APPLETALK               = 0x809b
-	ETHERTYPE_APPLITEK                = 0x80c7
-	ETHERTYPE_ARGONAUT                = 0x803a
-	ETHERTYPE_ARP                     = 0x806
-	ETHERTYPE_AT                      = 0x809b
-	ETHERTYPE_ATALK                   = 0x809b
-	ETHERTYPE_ATOMIC                  = 0x86df
-	ETHERTYPE_ATT                     = 0x8069
-	ETHERTYPE_ATTSTANFORD             = 0x8008
-	ETHERTYPE_AUTOPHON                = 0x806a
-	ETHERTYPE_AXIS                    = 0x8856
-	ETHERTYPE_BCLOOP                  = 0x9003
-	ETHERTYPE_BOFL                    = 0x8102
-	ETHERTYPE_CABLETRON               = 0x7034
-	ETHERTYPE_CHAOS                   = 0x804
-	ETHERTYPE_COMDESIGN               = 0x806c
-	ETHERTYPE_COMPUGRAPHIC            = 0x806d
-	ETHERTYPE_COUNTERPOINT            = 0x8062
-	ETHERTYPE_CRONUS                  = 0x8004
-	ETHERTYPE_CRONUSVLN               = 0x8003
-	ETHERTYPE_DCA                     = 0x1234
-	ETHERTYPE_DDE                     = 0x807b
-	ETHERTYPE_DEBNI                   = 0xaaaa
-	ETHERTYPE_DECAM                   = 0x8048
-	ETHERTYPE_DECCUST                 = 0x6006
-	ETHERTYPE_DECDIAG                 = 0x6005
-	ETHERTYPE_DECDNS                  = 0x803c
-	ETHERTYPE_DECDTS                  = 0x803e
-	ETHERTYPE_DECEXPER                = 0x6000
-	ETHERTYPE_DECLAST                 = 0x8041
-	ETHERTYPE_DECLTM                  = 0x803f
-	ETHERTYPE_DECMUMPS                = 0x6009
-	ETHERTYPE_DECNETBIOS              = 0x8040
-	ETHERTYPE_DELTACON                = 0x86de
-	ETHERTYPE_DIDDLE                  = 0x4321
-	ETHERTYPE_DLOG1                   = 0x660
-	ETHERTYPE_DLOG2                   = 0x661
-	ETHERTYPE_DN                      = 0x6003
-	ETHERTYPE_DOGFIGHT                = 0x1989
-	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_ECMA                    = 0x803
-	ETHERTYPE_ENCRYPT                 = 0x803d
-	ETHERTYPE_ES                      = 0x805d
-	ETHERTYPE_EXCELAN                 = 0x8010
-	ETHERTYPE_EXPERDATA               = 0x8049
-	ETHERTYPE_FLIP                    = 0x8146
-	ETHERTYPE_FLOWCONTROL             = 0x8808
-	ETHERTYPE_FRARP                   = 0x808
-	ETHERTYPE_GENDYN                  = 0x8068
-	ETHERTYPE_HAYES                   = 0x8130
-	ETHERTYPE_HIPPI_FP                = 0x8180
-	ETHERTYPE_HITACHI                 = 0x8820
-	ETHERTYPE_HP                      = 0x8005
-	ETHERTYPE_IEEEPUP                 = 0xa00
-	ETHERTYPE_IEEEPUPAT               = 0xa01
-	ETHERTYPE_IMLBL                   = 0x4c42
-	ETHERTYPE_IMLBLDIAG               = 0x424c
-	ETHERTYPE_IP                      = 0x800
-	ETHERTYPE_IPAS                    = 0x876c
-	ETHERTYPE_IPV6                    = 0x86dd
-	ETHERTYPE_IPX                     = 0x8137
-	ETHERTYPE_IPXNEW                  = 0x8037
-	ETHERTYPE_KALPANA                 = 0x8582
-	ETHERTYPE_LANBRIDGE               = 0x8038
-	ETHERTYPE_LANPROBE                = 0x8888
-	ETHERTYPE_LAT                     = 0x6004
-	ETHERTYPE_LBACK                   = 0x9000
-	ETHERTYPE_LITTLE                  = 0x8060
-	ETHERTYPE_LOGICRAFT               = 0x8148
-	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MATRA                   = 0x807a
-	ETHERTYPE_MAX                     = 0xffff
-	ETHERTYPE_MERIT                   = 0x807c
-	ETHERTYPE_MICP                    = 0x873a
-	ETHERTYPE_MOPDL                   = 0x6001
-	ETHERTYPE_MOPRC                   = 0x6002
-	ETHERTYPE_MOTOROLA                = 0x818d
-	ETHERTYPE_MPLS                    = 0x8847
-	ETHERTYPE_MPLS_MCAST              = 0x8848
-	ETHERTYPE_MUMPS                   = 0x813f
-	ETHERTYPE_NBPCC                   = 0x3c04
-	ETHERTYPE_NBPCLAIM                = 0x3c09
-	ETHERTYPE_NBPCLREQ                = 0x3c05
-	ETHERTYPE_NBPCLRSP                = 0x3c06
-	ETHERTYPE_NBPCREQ                 = 0x3c02
-	ETHERTYPE_NBPCRSP                 = 0x3c03
-	ETHERTYPE_NBPDG                   = 0x3c07
-	ETHERTYPE_NBPDGB                  = 0x3c08
-	ETHERTYPE_NBPDLTE                 = 0x3c0a
-	ETHERTYPE_NBPRAR                  = 0x3c0c
-	ETHERTYPE_NBPRAS                  = 0x3c0b
-	ETHERTYPE_NBPRST                  = 0x3c0d
-	ETHERTYPE_NBPSCD                  = 0x3c01
-	ETHERTYPE_NBPVCD                  = 0x3c00
-	ETHERTYPE_NBS                     = 0x802
-	ETHERTYPE_NCD                     = 0x8149
-	ETHERTYPE_NESTAR                  = 0x8006
-	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NOVELL                  = 0x8138
-	ETHERTYPE_NS                      = 0x600
-	ETHERTYPE_NSAT                    = 0x601
-	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NTRAILER                = 0x10
-	ETHERTYPE_OS9                     = 0x7007
-	ETHERTYPE_OS9NET                  = 0x7009
-	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PAE                     = 0x888e
-	ETHERTYPE_PCS                     = 0x4242
-	ETHERTYPE_PLANNING                = 0x8044
-	ETHERTYPE_PPP                     = 0x880b
-	ETHERTYPE_PPPOE                   = 0x8864
-	ETHERTYPE_PPPOEDISC               = 0x8863
-	ETHERTYPE_PRIMENTS                = 0x7031
-	ETHERTYPE_PUP                     = 0x200
-	ETHERTYPE_PUPAT                   = 0x200
-	ETHERTYPE_RACAL                   = 0x7030
-	ETHERTYPE_RATIONAL                = 0x8150
-	ETHERTYPE_RAWFR                   = 0x6559
-	ETHERTYPE_RCL                     = 0x1995
-	ETHERTYPE_RDP                     = 0x8739
-	ETHERTYPE_RETIX                   = 0x80f2
-	ETHERTYPE_REVARP                  = 0x8035
-	ETHERTYPE_SCA                     = 0x6007
-	ETHERTYPE_SECTRA                  = 0x86db
-	ETHERTYPE_SECUREDATA              = 0x876d
-	ETHERTYPE_SGITW                   = 0x817e
-	ETHERTYPE_SG_BOUNCE               = 0x8016
-	ETHERTYPE_SG_DIAG                 = 0x8013
-	ETHERTYPE_SG_NETGAMES             = 0x8014
-	ETHERTYPE_SG_RESV                 = 0x8015
-	ETHERTYPE_SIMNET                  = 0x5208
-	ETHERTYPE_SLOWPROTOCOLS           = 0x8809
-	ETHERTYPE_SNA                     = 0x80d5
-	ETHERTYPE_SNMP                    = 0x814c
-	ETHERTYPE_SONIX                   = 0xfaf5
-	ETHERTYPE_SPIDER                  = 0x809f
-	ETHERTYPE_SPRITE                  = 0x500
-	ETHERTYPE_STP                     = 0x8181
-	ETHERTYPE_TALARIS                 = 0x812b
-	ETHERTYPE_TALARISMC               = 0x852b
-	ETHERTYPE_TCPCOMP                 = 0x876b
-	ETHERTYPE_TCPSM                   = 0x9002
-	ETHERTYPE_TEC                     = 0x814f
-	ETHERTYPE_TIGAN                   = 0x802f
-	ETHERTYPE_TRAIL                   = 0x1000
-	ETHERTYPE_TRANSETHER              = 0x6558
-	ETHERTYPE_TYMSHARE                = 0x802e
-	ETHERTYPE_UBBST                   = 0x7005
-	ETHERTYPE_UBDEBUG                 = 0x900
-	ETHERTYPE_UBDIAGLOOP              = 0x7002
-	ETHERTYPE_UBDL                    = 0x7000
-	ETHERTYPE_UBNIU                   = 0x7001
-	ETHERTYPE_UBNMC                   = 0x7003
-	ETHERTYPE_VALID                   = 0x1600
-	ETHERTYPE_VARIAN                  = 0x80dd
-	ETHERTYPE_VAXELN                  = 0x803b
-	ETHERTYPE_VEECO                   = 0x8067
-	ETHERTYPE_VEXP                    = 0x805b
-	ETHERTYPE_VGLAB                   = 0x8131
-	ETHERTYPE_VINES                   = 0xbad
-	ETHERTYPE_VINESECHO               = 0xbaf
-	ETHERTYPE_VINESLOOP               = 0xbae
-	ETHERTYPE_VITAL                   = 0xff00
-	ETHERTYPE_VLAN                    = 0x8100
-	ETHERTYPE_VLTLMAN                 = 0x8080
-	ETHERTYPE_VPROD                   = 0x805c
-	ETHERTYPE_VURESERVED              = 0x8147
-	ETHERTYPE_WATERLOO                = 0x8130
-	ETHERTYPE_WELLFLEET               = 0x8103
-	ETHERTYPE_X25                     = 0x805
-	ETHERTYPE_X75                     = 0x801
-	ETHERTYPE_XNSSM                   = 0x9001
-	ETHERTYPE_XTP                     = 0x817d
-	ETHER_ADDR_LEN                    = 0x6
-	ETHER_CRC_LEN                     = 0x4
-	ETHER_CRC_POLY_BE                 = 0x4c11db6
-	ETHER_CRC_POLY_LE                 = 0xedb88320
-	ETHER_HDR_LEN                     = 0xe
-	ETHER_MAX_LEN                     = 0x5ee
-	ETHER_MAX_LEN_JUMBO               = 0x233a
-	ETHER_MIN_LEN                     = 0x40
-	ETHER_PPPOE_ENCAP_LEN             = 0x8
-	ETHER_TYPE_LEN                    = 0x2
-	ETHER_VLAN_ENCAP_LEN              = 0x4
-	EVFILT_AIO                        = 0x2
-	EVFILT_PROC                       = 0x4
-	EVFILT_READ                       = 0x0
-	EVFILT_SIGNAL                     = 0x5
-	EVFILT_SYSCOUNT                   = 0x7
-	EVFILT_TIMER                      = 0x6
-	EVFILT_VNODE                      = 0x3
-	EVFILT_WRITE                      = 0x1
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x100
-	FLUSHO                            = 0x800000
-	F_CLOSEM                          = 0xa
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0xc
-	F_FSCTL                           = -0x80000000
-	F_FSDIRMASK                       = 0x70000000
-	F_FSIN                            = 0x10000000
-	F_FSINOUT                         = 0x30000000
-	F_FSOUT                           = 0x20000000
-	F_FSPRIV                          = 0x8000
-	F_FSVOID                          = 0x40000000
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETNOSIGPIPE                    = 0xd
-	F_GETOWN                          = 0x5
-	F_MAXFD                           = 0xb
-	F_OK                              = 0x0
-	F_PARAM_MASK                      = 0xfff
-	F_PARAM_MAX                       = 0xfff
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETNOSIGPIPE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFA_ROUTE                         = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x8f52
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ECONET                        = 0xce
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LINEGROUP                     = 0xd2
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_PON155                        = 0xcf
-	IFT_PON622                        = 0xd0
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPATM                       = 0xc5
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_Q2931                         = 0xc9
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SIPSIG                        = 0xcc
-	IFT_SIPTG                         = 0xcb
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TELINK                        = 0xc8
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VIRTUALTG                     = 0xca
-	IFT_VOICEDID                      = 0xd5
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEEMFGD                    = 0xd3
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFGDEANA                  = 0xd4
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERCABLE                = 0xc6
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_AH                        = 0x33
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IPV6_ICMP                 = 0x3a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VRRP                      = 0x70
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_EF                             = 0x8000
-	IP_ERRORMTU                       = 0x15
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x16
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0x14
-	IP_MF                             = 0x2000
-	IP_MINFRAGSIZE                    = 0x45
-	IP_MINTTL                         = 0x18
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x17
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x6
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SPACEAVAIL                   = 0x5
-	MADV_WILLNEED                     = 0x3
-	MAP_ALIGNMENT_16MB                = 0x18000000
-	MAP_ALIGNMENT_1TB                 = 0x28000000
-	MAP_ALIGNMENT_256TB               = 0x30000000
-	MAP_ALIGNMENT_4GB                 = 0x20000000
-	MAP_ALIGNMENT_64KB                = 0x10000000
-	MAP_ALIGNMENT_64PB                = 0x38000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_INHERIT_COPY                  = 0x1
-	MAP_INHERIT_DEFAULT               = 0x1
-	MAP_INHERIT_DONATE_COPY           = 0x3
-	MAP_INHERIT_NONE                  = 0x2
-	MAP_INHERIT_SHARE                 = 0x0
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x2000
-	MAP_TRYFIXED                      = 0x400
-	MAP_WIRED                         = 0x800
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_BCAST                         = 0x100
-	MSG_CMSG_CLOEXEC                  = 0x800
-	MSG_CONTROLMBUF                   = 0x2000000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOR                           = 0x8
-	MSG_IOVUSRSPACE                   = 0x4000000
-	MSG_LENUSRSPACE                   = 0x8000000
-	MSG_MCAST                         = 0x200
-	MSG_NAMEMBUF                      = 0x1000000
-	MSG_NBIO                          = 0x1000
-	MSG_NOSIGNAL                      = 0x400
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_USERFLAGS                     = 0xffffff
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x4
-	NAME_MAX                          = 0x1ff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x5
-	NET_RT_MAXID                      = 0x6
-	NET_RT_OIFLIST                    = 0x4
-	NET_RT_OOIFLIST                   = 0x3
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFIOGETBMAP                       = 0xc004667a
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALT_IO                          = 0x40000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x400000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x80000
-	O_DIRECTORY                       = 0x200000
-	O_DSYNC                           = 0x10000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_NOSIGPIPE                       = 0x1000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_RSYNC                           = 0x20000
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PRI_IOFLUSH                       = 0x7c
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x9
-	RTAX_NETMASK                      = 0x2
-	RTAX_TAG                          = 0x8
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTA_TAG                           = 0x100
-	RTF_ANNOUNCE                      = 0x20000
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_CLONED                        = 0x2000
-	RTF_CLONING                       = 0x100
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_MASK                          = 0x80
-	RTF_MODIFIED                      = 0x20
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_REJECT                        = 0x8
-	RTF_SRC                           = 0x10000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_CHGADDR                       = 0x15
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x11
-	RTM_IFANNOUNCE                    = 0x10
-	RTM_IFINFO                        = 0x14
-	RTM_LLINFO_UPD                    = 0x13
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_OIFINFO                       = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_OOIFINFO                      = 0xe
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_SETGATE                       = 0x12
-	RTM_VERSION                       = 0x4
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x4
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x8
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80906931
-	SIOCADDRT                         = 0x8030720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCALIFADDR                      = 0x8118691c
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80906932
-	SIOCDELRT                         = 0x8030720b
-	SIOCDIFADDR                       = 0x80906919
-	SIOCDIFPHYADDR                    = 0x80906949
-	SIOCDLIFADDR                      = 0x8118691e
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETPFSYNC                     = 0xc09069f8
-	SIOCGETSGCNT                      = 0xc0147534
-	SIOCGETVIFCNT                     = 0xc0147533
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0906921
-	SIOCGIFADDRPREF                   = 0xc0946920
-	SIOCGIFALIAS                      = 0xc040691b
-	SIOCGIFBRDADDR                    = 0xc0906923
-	SIOCGIFCAP                        = 0xc0206976
-	SIOCGIFCONF                       = 0xc0086926
-	SIOCGIFDATA                       = 0xc0946985
-	SIOCGIFDLT                        = 0xc0906977
-	SIOCGIFDSTADDR                    = 0xc0906922
-	SIOCGIFFLAGS                      = 0xc0906911
-	SIOCGIFGENERIC                    = 0xc090693a
-	SIOCGIFMEDIA                      = 0xc0286936
-	SIOCGIFMETRIC                     = 0xc0906917
-	SIOCGIFMTU                        = 0xc090697e
-	SIOCGIFNETMASK                    = 0xc0906925
-	SIOCGIFPDSTADDR                   = 0xc0906948
-	SIOCGIFPSRCADDR                   = 0xc0906947
-	SIOCGLIFADDR                      = 0xc118691d
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLINKSTR                      = 0xc01c6987
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGVH                           = 0xc0906983
-	SIOCIFCREATE                      = 0x8090697a
-	SIOCIFDESTROY                     = 0x80906979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCINITIFADDR                    = 0xc0446984
-	SIOCSDRVSPEC                      = 0x801c697b
-	SIOCSETPFSYNC                     = 0x809069f7
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8090690c
-	SIOCSIFADDRPREF                   = 0x8094691f
-	SIOCSIFBRDADDR                    = 0x80906913
-	SIOCSIFCAP                        = 0x80206975
-	SIOCSIFDSTADDR                    = 0x8090690e
-	SIOCSIFFLAGS                      = 0x80906910
-	SIOCSIFGENERIC                    = 0x80906939
-	SIOCSIFMEDIA                      = 0xc0906935
-	SIOCSIFMETRIC                     = 0x80906918
-	SIOCSIFMTU                        = 0x8090697f
-	SIOCSIFNETMASK                    = 0x80906916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLINKSTR                      = 0x801c6988
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SIOCSVH                           = 0xc0906982
-	SIOCZIFDATA                       = 0xc0946986
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_FLAGS_MASK                   = 0xf0000000
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_NOSIGPIPE                    = 0x40000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NOHEADER                       = 0x100a
-	SO_NOSIGPIPE                      = 0x800
-	SO_OOBINLINE                      = 0x100
-	SO_OVERFLOWED                     = 0x1009
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x100c
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x100b
-	SO_TIMESTAMP                      = 0x2000
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SYSCTL_VERSION                    = 0x1000000
-	SYSCTL_VERS_0                     = 0x0
-	SYSCTL_VERS_1                     = 0x1000000
-	SYSCTL_VERS_MASK                  = 0xff000000
-	S_ARCH1                           = 0x10000
-	S_ARCH2                           = 0x20000
-	S_BLKSIZE                         = 0x200
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	S_LOGIN_SET                       = 0x1
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONGCTL                       = 0x20
-	TCP_KEEPCNT                       = 0x6
-	TCP_KEEPIDLE                      = 0x3
-	TCP_KEEPINIT                      = 0x7
-	TCP_KEEPINTVL                     = 0x5
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x400c7458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLAG_CDTRCTS                  = 0x10
-	TIOCFLAG_CLOCAL                   = 0x2
-	TIOCFLAG_CRTSCTS                  = 0x4
-	TIOCFLAG_MDMBUF                   = 0x8
-	TIOCFLAG_SOFTCAR                  = 0x1
-	TIOCFLUSH                         = 0x80047410
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGFLAGS                        = 0x4004745d
-	TIOCGLINED                        = 0x40207442
-	TIOCGPGRP                         = 0x40047477
-	TIOCGQSIZE                        = 0x40047481
-	TIOCGRANTPT                       = 0x20007447
-	TIOCGSID                          = 0x40047463
-	TIOCGSIZE                         = 0x40087468
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGET                          = 0x4004746a
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMGET                        = 0x40287446
-	TIOCPTSNAME                       = 0x40287448
-	TIOCRCVFRAME                      = 0x80047445
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSFLAGS                        = 0x8004745c
-	TIOCSIG                           = 0x2000745f
-	TIOCSLINED                        = 0x80207443
-	TIOCSPGRP                         = 0x80047476
-	TIOCSQSIZE                        = 0x80047480
-	TIOCSSIZE                         = 0x80087467
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x80047465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCUCNTL                         = 0x80047466
-	TIOCXMTFRAME                      = 0x80047444
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WALL                              = 0x8
-	WALLSIG                           = 0x8
-	WALTSIG                           = 0x4
-	WCLONE                            = 0x4
-	WCOREFLAG                         = 0x80
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x10000
-	WNOZOMBIE                         = 0x20000
-	WOPTSCHECKED                      = 0x40000
-	WSTOPPED                          = 0x7f
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x58)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x57)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x55)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x60)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5e)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x59)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5f)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x5a)
-	ENOSTR          = syscall.Errno(0x5b)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x56)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x60)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x5c)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x20)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large or too small",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol option not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "illegal byte sequence",
-	86: "not supported",
-	87: "operation Canceled",
-	88: "bad or Corrupt message",
-	89: "no message available",
-	90: "no STREAM resources",
-	91: "not a STREAM",
-	92: "STREAM ioctl timeout",
-	93: "attribute not found",
-	94: "multihop attempted",
-	95: "link has been severed",
-	96: "protocol error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "power fail/restart",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
deleted file mode 100644
index 4994437b63..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
+++ /dev/null
@@ -1,1702 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,netbsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x1c
-	AF_BLUETOOTH                      = 0x1f
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x20
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x18
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x23
-	AF_MPLS                           = 0x21
-	AF_NATM                           = 0x1b
-	AF_NS                             = 0x6
-	AF_OROUTE                         = 0x11
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x22
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	ARPHRD_ARCNET                     = 0x7
-	ARPHRD_ETHER                      = 0x1
-	ARPHRD_FRELAY                     = 0xf
-	ARPHRD_IEEE1394                   = 0x18
-	ARPHRD_IEEE802                    = 0x6
-	ARPHRD_STRIP                      = 0x17
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427d
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0104277
-	BIOCGETIF                         = 0x4090426b
-	BIOCGFEEDBACK                     = 0x4004427c
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRTIMEOUT                     = 0x4010427b
-	BIOCGSEESENT                      = 0x40044278
-	BIOCGSTATS                        = 0x4080426f
-	BIOCGSTATSOLD                     = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044276
-	BIOCSETF                          = 0x80104267
-	BIOCSETIF                         = 0x8090426c
-	BIOCSFEEDBACK                     = 0x8004427d
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRTIMEOUT                     = 0x8010427a
-	BIOCSSEESENT                      = 0x80044279
-	BIOCSTCPF                         = 0x80104272
-	BIOCSUDPF                         = 0x80104273
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x8
-	BPF_ALIGNMENT32                   = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DFLTBUFSIZE                   = 0x100000
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x1000000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CLONE_CSIGNAL                     = 0xff
-	CLONE_FILES                       = 0x400
-	CLONE_FS                          = 0x200
-	CLONE_PID                         = 0x1000
-	CLONE_PTRACE                      = 0x2000
-	CLONE_SIGHAND                     = 0x800
-	CLONE_VFORK                       = 0x4000
-	CLONE_VM                          = 0x100
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	CTL_QUERY                         = -0x2
-	DIOCBSFLUSH                       = 0x20006478
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HDLC                          = 0x10
-	DLT_HHDLC                         = 0x79
-	DLT_HIPPI                         = 0xf
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0xe
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RAWAF_MASK                    = 0x2240000
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xd
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EMUL_LINUX                        = 0x1
-	EMUL_LINUX32                      = 0x5
-	EMUL_MAXID                        = 0x6
-	ETHERCAP_JUMBO_MTU                = 0x4
-	ETHERCAP_VLAN_HWTAGGING           = 0x2
-	ETHERCAP_VLAN_MTU                 = 0x1
-	ETHERMIN                          = 0x2e
-	ETHERMTU                          = 0x5dc
-	ETHERMTU_JUMBO                    = 0x2328
-	ETHERTYPE_8023                    = 0x4
-	ETHERTYPE_AARP                    = 0x80f3
-	ETHERTYPE_ACCTON                  = 0x8390
-	ETHERTYPE_AEONIC                  = 0x8036
-	ETHERTYPE_ALPHA                   = 0x814a
-	ETHERTYPE_AMBER                   = 0x6008
-	ETHERTYPE_AMOEBA                  = 0x8145
-	ETHERTYPE_APOLLO                  = 0x80f7
-	ETHERTYPE_APOLLODOMAIN            = 0x8019
-	ETHERTYPE_APPLETALK               = 0x809b
-	ETHERTYPE_APPLITEK                = 0x80c7
-	ETHERTYPE_ARGONAUT                = 0x803a
-	ETHERTYPE_ARP                     = 0x806
-	ETHERTYPE_AT                      = 0x809b
-	ETHERTYPE_ATALK                   = 0x809b
-	ETHERTYPE_ATOMIC                  = 0x86df
-	ETHERTYPE_ATT                     = 0x8069
-	ETHERTYPE_ATTSTANFORD             = 0x8008
-	ETHERTYPE_AUTOPHON                = 0x806a
-	ETHERTYPE_AXIS                    = 0x8856
-	ETHERTYPE_BCLOOP                  = 0x9003
-	ETHERTYPE_BOFL                    = 0x8102
-	ETHERTYPE_CABLETRON               = 0x7034
-	ETHERTYPE_CHAOS                   = 0x804
-	ETHERTYPE_COMDESIGN               = 0x806c
-	ETHERTYPE_COMPUGRAPHIC            = 0x806d
-	ETHERTYPE_COUNTERPOINT            = 0x8062
-	ETHERTYPE_CRONUS                  = 0x8004
-	ETHERTYPE_CRONUSVLN               = 0x8003
-	ETHERTYPE_DCA                     = 0x1234
-	ETHERTYPE_DDE                     = 0x807b
-	ETHERTYPE_DEBNI                   = 0xaaaa
-	ETHERTYPE_DECAM                   = 0x8048
-	ETHERTYPE_DECCUST                 = 0x6006
-	ETHERTYPE_DECDIAG                 = 0x6005
-	ETHERTYPE_DECDNS                  = 0x803c
-	ETHERTYPE_DECDTS                  = 0x803e
-	ETHERTYPE_DECEXPER                = 0x6000
-	ETHERTYPE_DECLAST                 = 0x8041
-	ETHERTYPE_DECLTM                  = 0x803f
-	ETHERTYPE_DECMUMPS                = 0x6009
-	ETHERTYPE_DECNETBIOS              = 0x8040
-	ETHERTYPE_DELTACON                = 0x86de
-	ETHERTYPE_DIDDLE                  = 0x4321
-	ETHERTYPE_DLOG1                   = 0x660
-	ETHERTYPE_DLOG2                   = 0x661
-	ETHERTYPE_DN                      = 0x6003
-	ETHERTYPE_DOGFIGHT                = 0x1989
-	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_ECMA                    = 0x803
-	ETHERTYPE_ENCRYPT                 = 0x803d
-	ETHERTYPE_ES                      = 0x805d
-	ETHERTYPE_EXCELAN                 = 0x8010
-	ETHERTYPE_EXPERDATA               = 0x8049
-	ETHERTYPE_FLIP                    = 0x8146
-	ETHERTYPE_FLOWCONTROL             = 0x8808
-	ETHERTYPE_FRARP                   = 0x808
-	ETHERTYPE_GENDYN                  = 0x8068
-	ETHERTYPE_HAYES                   = 0x8130
-	ETHERTYPE_HIPPI_FP                = 0x8180
-	ETHERTYPE_HITACHI                 = 0x8820
-	ETHERTYPE_HP                      = 0x8005
-	ETHERTYPE_IEEEPUP                 = 0xa00
-	ETHERTYPE_IEEEPUPAT               = 0xa01
-	ETHERTYPE_IMLBL                   = 0x4c42
-	ETHERTYPE_IMLBLDIAG               = 0x424c
-	ETHERTYPE_IP                      = 0x800
-	ETHERTYPE_IPAS                    = 0x876c
-	ETHERTYPE_IPV6                    = 0x86dd
-	ETHERTYPE_IPX                     = 0x8137
-	ETHERTYPE_IPXNEW                  = 0x8037
-	ETHERTYPE_KALPANA                 = 0x8582
-	ETHERTYPE_LANBRIDGE               = 0x8038
-	ETHERTYPE_LANPROBE                = 0x8888
-	ETHERTYPE_LAT                     = 0x6004
-	ETHERTYPE_LBACK                   = 0x9000
-	ETHERTYPE_LITTLE                  = 0x8060
-	ETHERTYPE_LOGICRAFT               = 0x8148
-	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MATRA                   = 0x807a
-	ETHERTYPE_MAX                     = 0xffff
-	ETHERTYPE_MERIT                   = 0x807c
-	ETHERTYPE_MICP                    = 0x873a
-	ETHERTYPE_MOPDL                   = 0x6001
-	ETHERTYPE_MOPRC                   = 0x6002
-	ETHERTYPE_MOTOROLA                = 0x818d
-	ETHERTYPE_MPLS                    = 0x8847
-	ETHERTYPE_MPLS_MCAST              = 0x8848
-	ETHERTYPE_MUMPS                   = 0x813f
-	ETHERTYPE_NBPCC                   = 0x3c04
-	ETHERTYPE_NBPCLAIM                = 0x3c09
-	ETHERTYPE_NBPCLREQ                = 0x3c05
-	ETHERTYPE_NBPCLRSP                = 0x3c06
-	ETHERTYPE_NBPCREQ                 = 0x3c02
-	ETHERTYPE_NBPCRSP                 = 0x3c03
-	ETHERTYPE_NBPDG                   = 0x3c07
-	ETHERTYPE_NBPDGB                  = 0x3c08
-	ETHERTYPE_NBPDLTE                 = 0x3c0a
-	ETHERTYPE_NBPRAR                  = 0x3c0c
-	ETHERTYPE_NBPRAS                  = 0x3c0b
-	ETHERTYPE_NBPRST                  = 0x3c0d
-	ETHERTYPE_NBPSCD                  = 0x3c01
-	ETHERTYPE_NBPVCD                  = 0x3c00
-	ETHERTYPE_NBS                     = 0x802
-	ETHERTYPE_NCD                     = 0x8149
-	ETHERTYPE_NESTAR                  = 0x8006
-	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NOVELL                  = 0x8138
-	ETHERTYPE_NS                      = 0x600
-	ETHERTYPE_NSAT                    = 0x601
-	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NTRAILER                = 0x10
-	ETHERTYPE_OS9                     = 0x7007
-	ETHERTYPE_OS9NET                  = 0x7009
-	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PAE                     = 0x888e
-	ETHERTYPE_PCS                     = 0x4242
-	ETHERTYPE_PLANNING                = 0x8044
-	ETHERTYPE_PPP                     = 0x880b
-	ETHERTYPE_PPPOE                   = 0x8864
-	ETHERTYPE_PPPOEDISC               = 0x8863
-	ETHERTYPE_PRIMENTS                = 0x7031
-	ETHERTYPE_PUP                     = 0x200
-	ETHERTYPE_PUPAT                   = 0x200
-	ETHERTYPE_RACAL                   = 0x7030
-	ETHERTYPE_RATIONAL                = 0x8150
-	ETHERTYPE_RAWFR                   = 0x6559
-	ETHERTYPE_RCL                     = 0x1995
-	ETHERTYPE_RDP                     = 0x8739
-	ETHERTYPE_RETIX                   = 0x80f2
-	ETHERTYPE_REVARP                  = 0x8035
-	ETHERTYPE_SCA                     = 0x6007
-	ETHERTYPE_SECTRA                  = 0x86db
-	ETHERTYPE_SECUREDATA              = 0x876d
-	ETHERTYPE_SGITW                   = 0x817e
-	ETHERTYPE_SG_BOUNCE               = 0x8016
-	ETHERTYPE_SG_DIAG                 = 0x8013
-	ETHERTYPE_SG_NETGAMES             = 0x8014
-	ETHERTYPE_SG_RESV                 = 0x8015
-	ETHERTYPE_SIMNET                  = 0x5208
-	ETHERTYPE_SLOWPROTOCOLS           = 0x8809
-	ETHERTYPE_SNA                     = 0x80d5
-	ETHERTYPE_SNMP                    = 0x814c
-	ETHERTYPE_SONIX                   = 0xfaf5
-	ETHERTYPE_SPIDER                  = 0x809f
-	ETHERTYPE_SPRITE                  = 0x500
-	ETHERTYPE_STP                     = 0x8181
-	ETHERTYPE_TALARIS                 = 0x812b
-	ETHERTYPE_TALARISMC               = 0x852b
-	ETHERTYPE_TCPCOMP                 = 0x876b
-	ETHERTYPE_TCPSM                   = 0x9002
-	ETHERTYPE_TEC                     = 0x814f
-	ETHERTYPE_TIGAN                   = 0x802f
-	ETHERTYPE_TRAIL                   = 0x1000
-	ETHERTYPE_TRANSETHER              = 0x6558
-	ETHERTYPE_TYMSHARE                = 0x802e
-	ETHERTYPE_UBBST                   = 0x7005
-	ETHERTYPE_UBDEBUG                 = 0x900
-	ETHERTYPE_UBDIAGLOOP              = 0x7002
-	ETHERTYPE_UBDL                    = 0x7000
-	ETHERTYPE_UBNIU                   = 0x7001
-	ETHERTYPE_UBNMC                   = 0x7003
-	ETHERTYPE_VALID                   = 0x1600
-	ETHERTYPE_VARIAN                  = 0x80dd
-	ETHERTYPE_VAXELN                  = 0x803b
-	ETHERTYPE_VEECO                   = 0x8067
-	ETHERTYPE_VEXP                    = 0x805b
-	ETHERTYPE_VGLAB                   = 0x8131
-	ETHERTYPE_VINES                   = 0xbad
-	ETHERTYPE_VINESECHO               = 0xbaf
-	ETHERTYPE_VINESLOOP               = 0xbae
-	ETHERTYPE_VITAL                   = 0xff00
-	ETHERTYPE_VLAN                    = 0x8100
-	ETHERTYPE_VLTLMAN                 = 0x8080
-	ETHERTYPE_VPROD                   = 0x805c
-	ETHERTYPE_VURESERVED              = 0x8147
-	ETHERTYPE_WATERLOO                = 0x8130
-	ETHERTYPE_WELLFLEET               = 0x8103
-	ETHERTYPE_X25                     = 0x805
-	ETHERTYPE_X75                     = 0x801
-	ETHERTYPE_XNSSM                   = 0x9001
-	ETHERTYPE_XTP                     = 0x817d
-	ETHER_ADDR_LEN                    = 0x6
-	ETHER_CRC_LEN                     = 0x4
-	ETHER_CRC_POLY_BE                 = 0x4c11db6
-	ETHER_CRC_POLY_LE                 = 0xedb88320
-	ETHER_HDR_LEN                     = 0xe
-	ETHER_MAX_LEN                     = 0x5ee
-	ETHER_MAX_LEN_JUMBO               = 0x233a
-	ETHER_MIN_LEN                     = 0x40
-	ETHER_PPPOE_ENCAP_LEN             = 0x8
-	ETHER_TYPE_LEN                    = 0x2
-	ETHER_VLAN_ENCAP_LEN              = 0x4
-	EVFILT_AIO                        = 0x2
-	EVFILT_PROC                       = 0x4
-	EVFILT_READ                       = 0x0
-	EVFILT_SIGNAL                     = 0x5
-	EVFILT_SYSCOUNT                   = 0x7
-	EVFILT_TIMER                      = 0x6
-	EVFILT_VNODE                      = 0x3
-	EVFILT_WRITE                      = 0x1
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x100
-	FLUSHO                            = 0x800000
-	F_CLOSEM                          = 0xa
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0xc
-	F_FSCTL                           = -0x80000000
-	F_FSDIRMASK                       = 0x70000000
-	F_FSIN                            = 0x10000000
-	F_FSINOUT                         = 0x30000000
-	F_FSOUT                           = 0x20000000
-	F_FSPRIV                          = 0x8000
-	F_FSVOID                          = 0x40000000
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETNOSIGPIPE                    = 0xd
-	F_GETOWN                          = 0x5
-	F_MAXFD                           = 0xb
-	F_OK                              = 0x0
-	F_PARAM_MASK                      = 0xfff
-	F_PARAM_MAX                       = 0xfff
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETNOSIGPIPE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFA_ROUTE                         = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x8f52
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ECONET                        = 0xce
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LINEGROUP                     = 0xd2
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_PON155                        = 0xcf
-	IFT_PON622                        = 0xd0
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPATM                       = 0xc5
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_Q2931                         = 0xc9
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SIPSIG                        = 0xcc
-	IFT_SIPTG                         = 0xcb
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TELINK                        = 0xc8
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VIRTUALTG                     = 0xca
-	IFT_VOICEDID                      = 0xd5
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEEMFGD                    = 0xd3
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFGDEANA                  = 0xd4
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERCABLE                = 0xc6
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_AH                        = 0x33
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IPV6_ICMP                 = 0x3a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VRRP                      = 0x70
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_EF                             = 0x8000
-	IP_ERRORMTU                       = 0x15
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x16
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0x14
-	IP_MF                             = 0x2000
-	IP_MINFRAGSIZE                    = 0x45
-	IP_MINTTL                         = 0x18
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x17
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x6
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SPACEAVAIL                   = 0x5
-	MADV_WILLNEED                     = 0x3
-	MAP_ALIGNMENT_16MB                = 0x18000000
-	MAP_ALIGNMENT_1TB                 = 0x28000000
-	MAP_ALIGNMENT_256TB               = 0x30000000
-	MAP_ALIGNMENT_4GB                 = 0x20000000
-	MAP_ALIGNMENT_64KB                = 0x10000000
-	MAP_ALIGNMENT_64PB                = 0x38000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_INHERIT_COPY                  = 0x1
-	MAP_INHERIT_DEFAULT               = 0x1
-	MAP_INHERIT_DONATE_COPY           = 0x3
-	MAP_INHERIT_NONE                  = 0x2
-	MAP_INHERIT_SHARE                 = 0x0
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x2000
-	MAP_TRYFIXED                      = 0x400
-	MAP_WIRED                         = 0x800
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_BCAST                         = 0x100
-	MSG_CMSG_CLOEXEC                  = 0x800
-	MSG_CONTROLMBUF                   = 0x2000000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOR                           = 0x8
-	MSG_IOVUSRSPACE                   = 0x4000000
-	MSG_LENUSRSPACE                   = 0x8000000
-	MSG_MCAST                         = 0x200
-	MSG_NAMEMBUF                      = 0x1000000
-	MSG_NBIO                          = 0x1000
-	MSG_NOSIGNAL                      = 0x400
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_USERFLAGS                     = 0xffffff
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x4
-	NAME_MAX                          = 0x1ff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x5
-	NET_RT_MAXID                      = 0x6
-	NET_RT_OIFLIST                    = 0x4
-	NET_RT_OOIFLIST                   = 0x3
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFIOGETBMAP                       = 0xc004667a
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALT_IO                          = 0x40000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x400000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x80000
-	O_DIRECTORY                       = 0x200000
-	O_DSYNC                           = 0x10000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_NOSIGPIPE                       = 0x1000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_RSYNC                           = 0x20000
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PRI_IOFLUSH                       = 0x7c
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x9
-	RTAX_NETMASK                      = 0x2
-	RTAX_TAG                          = 0x8
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTA_TAG                           = 0x100
-	RTF_ANNOUNCE                      = 0x20000
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_CLONED                        = 0x2000
-	RTF_CLONING                       = 0x100
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_MASK                          = 0x80
-	RTF_MODIFIED                      = 0x20
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_REJECT                        = 0x8
-	RTF_SRC                           = 0x10000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_CHGADDR                       = 0x15
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x11
-	RTM_IFANNOUNCE                    = 0x10
-	RTM_IFINFO                        = 0x14
-	RTM_LLINFO_UPD                    = 0x13
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_OIFINFO                       = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_OOIFINFO                      = 0xe
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_SETGATE                       = 0x12
-	RTM_VERSION                       = 0x4
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x4
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x8
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80906931
-	SIOCADDRT                         = 0x8038720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCALIFADDR                      = 0x8118691c
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80906932
-	SIOCDELRT                         = 0x8038720b
-	SIOCDIFADDR                       = 0x80906919
-	SIOCDIFPHYADDR                    = 0x80906949
-	SIOCDLIFADDR                      = 0x8118691e
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETPFSYNC                     = 0xc09069f8
-	SIOCGETSGCNT                      = 0xc0207534
-	SIOCGETVIFCNT                     = 0xc0287533
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0906921
-	SIOCGIFADDRPREF                   = 0xc0986920
-	SIOCGIFALIAS                      = 0xc040691b
-	SIOCGIFBRDADDR                    = 0xc0906923
-	SIOCGIFCAP                        = 0xc0206976
-	SIOCGIFCONF                       = 0xc0106926
-	SIOCGIFDATA                       = 0xc0986985
-	SIOCGIFDLT                        = 0xc0906977
-	SIOCGIFDSTADDR                    = 0xc0906922
-	SIOCGIFFLAGS                      = 0xc0906911
-	SIOCGIFGENERIC                    = 0xc090693a
-	SIOCGIFMEDIA                      = 0xc0306936
-	SIOCGIFMETRIC                     = 0xc0906917
-	SIOCGIFMTU                        = 0xc090697e
-	SIOCGIFNETMASK                    = 0xc0906925
-	SIOCGIFPDSTADDR                   = 0xc0906948
-	SIOCGIFPSRCADDR                   = 0xc0906947
-	SIOCGLIFADDR                      = 0xc118691d
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLINKSTR                      = 0xc0286987
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGVH                           = 0xc0906983
-	SIOCIFCREATE                      = 0x8090697a
-	SIOCIFDESTROY                     = 0x80906979
-	SIOCIFGCLONERS                    = 0xc0106978
-	SIOCINITIFADDR                    = 0xc0706984
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSETPFSYNC                     = 0x809069f7
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8090690c
-	SIOCSIFADDRPREF                   = 0x8098691f
-	SIOCSIFBRDADDR                    = 0x80906913
-	SIOCSIFCAP                        = 0x80206975
-	SIOCSIFDSTADDR                    = 0x8090690e
-	SIOCSIFFLAGS                      = 0x80906910
-	SIOCSIFGENERIC                    = 0x80906939
-	SIOCSIFMEDIA                      = 0xc0906935
-	SIOCSIFMETRIC                     = 0x80906918
-	SIOCSIFMTU                        = 0x8090697f
-	SIOCSIFNETMASK                    = 0x80906916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLINKSTR                      = 0x80286988
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SIOCSVH                           = 0xc0906982
-	SIOCZIFDATA                       = 0xc0986986
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_FLAGS_MASK                   = 0xf0000000
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_NOSIGPIPE                    = 0x40000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NOHEADER                       = 0x100a
-	SO_NOSIGPIPE                      = 0x800
-	SO_OOBINLINE                      = 0x100
-	SO_OVERFLOWED                     = 0x1009
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x100c
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x100b
-	SO_TIMESTAMP                      = 0x2000
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SYSCTL_VERSION                    = 0x1000000
-	SYSCTL_VERS_0                     = 0x0
-	SYSCTL_VERS_1                     = 0x1000000
-	SYSCTL_VERS_MASK                  = 0xff000000
-	S_ARCH1                           = 0x10000
-	S_ARCH2                           = 0x20000
-	S_BLKSIZE                         = 0x200
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	S_LOGIN_SET                       = 0x1
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONGCTL                       = 0x20
-	TCP_KEEPCNT                       = 0x6
-	TCP_KEEPIDLE                      = 0x3
-	TCP_KEEPINIT                      = 0x7
-	TCP_KEEPINTVL                     = 0x5
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x40107458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLAG_CDTRCTS                  = 0x10
-	TIOCFLAG_CLOCAL                   = 0x2
-	TIOCFLAG_CRTSCTS                  = 0x4
-	TIOCFLAG_MDMBUF                   = 0x8
-	TIOCFLAG_SOFTCAR                  = 0x1
-	TIOCFLUSH                         = 0x80047410
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGFLAGS                        = 0x4004745d
-	TIOCGLINED                        = 0x40207442
-	TIOCGPGRP                         = 0x40047477
-	TIOCGQSIZE                        = 0x40047481
-	TIOCGRANTPT                       = 0x20007447
-	TIOCGSID                          = 0x40047463
-	TIOCGSIZE                         = 0x40087468
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGET                          = 0x4004746a
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMGET                        = 0x40287446
-	TIOCPTSNAME                       = 0x40287448
-	TIOCRCVFRAME                      = 0x80087445
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSFLAGS                        = 0x8004745c
-	TIOCSIG                           = 0x2000745f
-	TIOCSLINED                        = 0x80207443
-	TIOCSPGRP                         = 0x80047476
-	TIOCSQSIZE                        = 0x80047480
-	TIOCSSIZE                         = 0x80087467
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x80047465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCUCNTL                         = 0x80047466
-	TIOCXMTFRAME                      = 0x80087444
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WALL                              = 0x8
-	WALLSIG                           = 0x8
-	WALTSIG                           = 0x4
-	WCLONE                            = 0x4
-	WCOREFLAG                         = 0x80
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x10000
-	WNOZOMBIE                         = 0x20000
-	WOPTSCHECKED                      = 0x40000
-	WSTOPPED                          = 0x7f
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x58)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x57)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x55)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x60)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5e)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x59)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5f)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x5a)
-	ENOSTR          = syscall.Errno(0x5b)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x56)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x60)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x5c)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x20)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large or too small",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol option not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "illegal byte sequence",
-	86: "not supported",
-	87: "operation Canceled",
-	88: "bad or Corrupt message",
-	89: "no message available",
-	90: "no STREAM resources",
-	91: "not a STREAM",
-	92: "STREAM ioctl timeout",
-	93: "attribute not found",
-	94: "multihop attempted",
-	95: "link has been severed",
-	96: "protocol error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "power fail/restart",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
deleted file mode 100644
index ac85ca6452..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
+++ /dev/null
@@ -1,1688 +0,0 @@
-// mkerrors.sh -marm
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build arm,netbsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -marm _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x1c
-	AF_BLUETOOTH                      = 0x1f
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x20
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x18
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x23
-	AF_MPLS                           = 0x21
-	AF_NATM                           = 0x1b
-	AF_NS                             = 0x6
-	AF_OROUTE                         = 0x11
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x22
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	ARPHRD_ARCNET                     = 0x7
-	ARPHRD_ETHER                      = 0x1
-	ARPHRD_FRELAY                     = 0xf
-	ARPHRD_IEEE1394                   = 0x18
-	ARPHRD_IEEE802                    = 0x6
-	ARPHRD_STRIP                      = 0x17
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427d
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0084277
-	BIOCGETIF                         = 0x4090426b
-	BIOCGFEEDBACK                     = 0x4004427c
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRTIMEOUT                     = 0x400c427b
-	BIOCGSEESENT                      = 0x40044278
-	BIOCGSTATS                        = 0x4080426f
-	BIOCGSTATSOLD                     = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDLT                          = 0x80044276
-	BIOCSETF                          = 0x80084267
-	BIOCSETIF                         = 0x8090426c
-	BIOCSFEEDBACK                     = 0x8004427d
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRTIMEOUT                     = 0x800c427a
-	BIOCSSEESENT                      = 0x80044279
-	BIOCSTCPF                         = 0x80084272
-	BIOCSUDPF                         = 0x80084273
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALIGNMENT32                   = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DFLTBUFSIZE                   = 0x100000
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x1000000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	CTL_QUERY                         = -0x2
-	DIOCBSFLUSH                       = 0x20006478
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HDLC                          = 0x10
-	DLT_HHDLC                         = 0x79
-	DLT_HIPPI                         = 0xf
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0xe
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RAWAF_MASK                    = 0x2240000
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xd
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EMUL_LINUX                        = 0x1
-	EMUL_LINUX32                      = 0x5
-	EMUL_MAXID                        = 0x6
-	ETHERCAP_JUMBO_MTU                = 0x4
-	ETHERCAP_VLAN_HWTAGGING           = 0x2
-	ETHERCAP_VLAN_MTU                 = 0x1
-	ETHERMIN                          = 0x2e
-	ETHERMTU                          = 0x5dc
-	ETHERMTU_JUMBO                    = 0x2328
-	ETHERTYPE_8023                    = 0x4
-	ETHERTYPE_AARP                    = 0x80f3
-	ETHERTYPE_ACCTON                  = 0x8390
-	ETHERTYPE_AEONIC                  = 0x8036
-	ETHERTYPE_ALPHA                   = 0x814a
-	ETHERTYPE_AMBER                   = 0x6008
-	ETHERTYPE_AMOEBA                  = 0x8145
-	ETHERTYPE_APOLLO                  = 0x80f7
-	ETHERTYPE_APOLLODOMAIN            = 0x8019
-	ETHERTYPE_APPLETALK               = 0x809b
-	ETHERTYPE_APPLITEK                = 0x80c7
-	ETHERTYPE_ARGONAUT                = 0x803a
-	ETHERTYPE_ARP                     = 0x806
-	ETHERTYPE_AT                      = 0x809b
-	ETHERTYPE_ATALK                   = 0x809b
-	ETHERTYPE_ATOMIC                  = 0x86df
-	ETHERTYPE_ATT                     = 0x8069
-	ETHERTYPE_ATTSTANFORD             = 0x8008
-	ETHERTYPE_AUTOPHON                = 0x806a
-	ETHERTYPE_AXIS                    = 0x8856
-	ETHERTYPE_BCLOOP                  = 0x9003
-	ETHERTYPE_BOFL                    = 0x8102
-	ETHERTYPE_CABLETRON               = 0x7034
-	ETHERTYPE_CHAOS                   = 0x804
-	ETHERTYPE_COMDESIGN               = 0x806c
-	ETHERTYPE_COMPUGRAPHIC            = 0x806d
-	ETHERTYPE_COUNTERPOINT            = 0x8062
-	ETHERTYPE_CRONUS                  = 0x8004
-	ETHERTYPE_CRONUSVLN               = 0x8003
-	ETHERTYPE_DCA                     = 0x1234
-	ETHERTYPE_DDE                     = 0x807b
-	ETHERTYPE_DEBNI                   = 0xaaaa
-	ETHERTYPE_DECAM                   = 0x8048
-	ETHERTYPE_DECCUST                 = 0x6006
-	ETHERTYPE_DECDIAG                 = 0x6005
-	ETHERTYPE_DECDNS                  = 0x803c
-	ETHERTYPE_DECDTS                  = 0x803e
-	ETHERTYPE_DECEXPER                = 0x6000
-	ETHERTYPE_DECLAST                 = 0x8041
-	ETHERTYPE_DECLTM                  = 0x803f
-	ETHERTYPE_DECMUMPS                = 0x6009
-	ETHERTYPE_DECNETBIOS              = 0x8040
-	ETHERTYPE_DELTACON                = 0x86de
-	ETHERTYPE_DIDDLE                  = 0x4321
-	ETHERTYPE_DLOG1                   = 0x660
-	ETHERTYPE_DLOG2                   = 0x661
-	ETHERTYPE_DN                      = 0x6003
-	ETHERTYPE_DOGFIGHT                = 0x1989
-	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_ECMA                    = 0x803
-	ETHERTYPE_ENCRYPT                 = 0x803d
-	ETHERTYPE_ES                      = 0x805d
-	ETHERTYPE_EXCELAN                 = 0x8010
-	ETHERTYPE_EXPERDATA               = 0x8049
-	ETHERTYPE_FLIP                    = 0x8146
-	ETHERTYPE_FLOWCONTROL             = 0x8808
-	ETHERTYPE_FRARP                   = 0x808
-	ETHERTYPE_GENDYN                  = 0x8068
-	ETHERTYPE_HAYES                   = 0x8130
-	ETHERTYPE_HIPPI_FP                = 0x8180
-	ETHERTYPE_HITACHI                 = 0x8820
-	ETHERTYPE_HP                      = 0x8005
-	ETHERTYPE_IEEEPUP                 = 0xa00
-	ETHERTYPE_IEEEPUPAT               = 0xa01
-	ETHERTYPE_IMLBL                   = 0x4c42
-	ETHERTYPE_IMLBLDIAG               = 0x424c
-	ETHERTYPE_IP                      = 0x800
-	ETHERTYPE_IPAS                    = 0x876c
-	ETHERTYPE_IPV6                    = 0x86dd
-	ETHERTYPE_IPX                     = 0x8137
-	ETHERTYPE_IPXNEW                  = 0x8037
-	ETHERTYPE_KALPANA                 = 0x8582
-	ETHERTYPE_LANBRIDGE               = 0x8038
-	ETHERTYPE_LANPROBE                = 0x8888
-	ETHERTYPE_LAT                     = 0x6004
-	ETHERTYPE_LBACK                   = 0x9000
-	ETHERTYPE_LITTLE                  = 0x8060
-	ETHERTYPE_LOGICRAFT               = 0x8148
-	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MATRA                   = 0x807a
-	ETHERTYPE_MAX                     = 0xffff
-	ETHERTYPE_MERIT                   = 0x807c
-	ETHERTYPE_MICP                    = 0x873a
-	ETHERTYPE_MOPDL                   = 0x6001
-	ETHERTYPE_MOPRC                   = 0x6002
-	ETHERTYPE_MOTOROLA                = 0x818d
-	ETHERTYPE_MPLS                    = 0x8847
-	ETHERTYPE_MPLS_MCAST              = 0x8848
-	ETHERTYPE_MUMPS                   = 0x813f
-	ETHERTYPE_NBPCC                   = 0x3c04
-	ETHERTYPE_NBPCLAIM                = 0x3c09
-	ETHERTYPE_NBPCLREQ                = 0x3c05
-	ETHERTYPE_NBPCLRSP                = 0x3c06
-	ETHERTYPE_NBPCREQ                 = 0x3c02
-	ETHERTYPE_NBPCRSP                 = 0x3c03
-	ETHERTYPE_NBPDG                   = 0x3c07
-	ETHERTYPE_NBPDGB                  = 0x3c08
-	ETHERTYPE_NBPDLTE                 = 0x3c0a
-	ETHERTYPE_NBPRAR                  = 0x3c0c
-	ETHERTYPE_NBPRAS                  = 0x3c0b
-	ETHERTYPE_NBPRST                  = 0x3c0d
-	ETHERTYPE_NBPSCD                  = 0x3c01
-	ETHERTYPE_NBPVCD                  = 0x3c00
-	ETHERTYPE_NBS                     = 0x802
-	ETHERTYPE_NCD                     = 0x8149
-	ETHERTYPE_NESTAR                  = 0x8006
-	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NOVELL                  = 0x8138
-	ETHERTYPE_NS                      = 0x600
-	ETHERTYPE_NSAT                    = 0x601
-	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NTRAILER                = 0x10
-	ETHERTYPE_OS9                     = 0x7007
-	ETHERTYPE_OS9NET                  = 0x7009
-	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PAE                     = 0x888e
-	ETHERTYPE_PCS                     = 0x4242
-	ETHERTYPE_PLANNING                = 0x8044
-	ETHERTYPE_PPP                     = 0x880b
-	ETHERTYPE_PPPOE                   = 0x8864
-	ETHERTYPE_PPPOEDISC               = 0x8863
-	ETHERTYPE_PRIMENTS                = 0x7031
-	ETHERTYPE_PUP                     = 0x200
-	ETHERTYPE_PUPAT                   = 0x200
-	ETHERTYPE_RACAL                   = 0x7030
-	ETHERTYPE_RATIONAL                = 0x8150
-	ETHERTYPE_RAWFR                   = 0x6559
-	ETHERTYPE_RCL                     = 0x1995
-	ETHERTYPE_RDP                     = 0x8739
-	ETHERTYPE_RETIX                   = 0x80f2
-	ETHERTYPE_REVARP                  = 0x8035
-	ETHERTYPE_SCA                     = 0x6007
-	ETHERTYPE_SECTRA                  = 0x86db
-	ETHERTYPE_SECUREDATA              = 0x876d
-	ETHERTYPE_SGITW                   = 0x817e
-	ETHERTYPE_SG_BOUNCE               = 0x8016
-	ETHERTYPE_SG_DIAG                 = 0x8013
-	ETHERTYPE_SG_NETGAMES             = 0x8014
-	ETHERTYPE_SG_RESV                 = 0x8015
-	ETHERTYPE_SIMNET                  = 0x5208
-	ETHERTYPE_SLOWPROTOCOLS           = 0x8809
-	ETHERTYPE_SNA                     = 0x80d5
-	ETHERTYPE_SNMP                    = 0x814c
-	ETHERTYPE_SONIX                   = 0xfaf5
-	ETHERTYPE_SPIDER                  = 0x809f
-	ETHERTYPE_SPRITE                  = 0x500
-	ETHERTYPE_STP                     = 0x8181
-	ETHERTYPE_TALARIS                 = 0x812b
-	ETHERTYPE_TALARISMC               = 0x852b
-	ETHERTYPE_TCPCOMP                 = 0x876b
-	ETHERTYPE_TCPSM                   = 0x9002
-	ETHERTYPE_TEC                     = 0x814f
-	ETHERTYPE_TIGAN                   = 0x802f
-	ETHERTYPE_TRAIL                   = 0x1000
-	ETHERTYPE_TRANSETHER              = 0x6558
-	ETHERTYPE_TYMSHARE                = 0x802e
-	ETHERTYPE_UBBST                   = 0x7005
-	ETHERTYPE_UBDEBUG                 = 0x900
-	ETHERTYPE_UBDIAGLOOP              = 0x7002
-	ETHERTYPE_UBDL                    = 0x7000
-	ETHERTYPE_UBNIU                   = 0x7001
-	ETHERTYPE_UBNMC                   = 0x7003
-	ETHERTYPE_VALID                   = 0x1600
-	ETHERTYPE_VARIAN                  = 0x80dd
-	ETHERTYPE_VAXELN                  = 0x803b
-	ETHERTYPE_VEECO                   = 0x8067
-	ETHERTYPE_VEXP                    = 0x805b
-	ETHERTYPE_VGLAB                   = 0x8131
-	ETHERTYPE_VINES                   = 0xbad
-	ETHERTYPE_VINESECHO               = 0xbaf
-	ETHERTYPE_VINESLOOP               = 0xbae
-	ETHERTYPE_VITAL                   = 0xff00
-	ETHERTYPE_VLAN                    = 0x8100
-	ETHERTYPE_VLTLMAN                 = 0x8080
-	ETHERTYPE_VPROD                   = 0x805c
-	ETHERTYPE_VURESERVED              = 0x8147
-	ETHERTYPE_WATERLOO                = 0x8130
-	ETHERTYPE_WELLFLEET               = 0x8103
-	ETHERTYPE_X25                     = 0x805
-	ETHERTYPE_X75                     = 0x801
-	ETHERTYPE_XNSSM                   = 0x9001
-	ETHERTYPE_XTP                     = 0x817d
-	ETHER_ADDR_LEN                    = 0x6
-	ETHER_CRC_LEN                     = 0x4
-	ETHER_CRC_POLY_BE                 = 0x4c11db6
-	ETHER_CRC_POLY_LE                 = 0xedb88320
-	ETHER_HDR_LEN                     = 0xe
-	ETHER_MAX_LEN                     = 0x5ee
-	ETHER_MAX_LEN_JUMBO               = 0x233a
-	ETHER_MIN_LEN                     = 0x40
-	ETHER_PPPOE_ENCAP_LEN             = 0x8
-	ETHER_TYPE_LEN                    = 0x2
-	ETHER_VLAN_ENCAP_LEN              = 0x4
-	EVFILT_AIO                        = 0x2
-	EVFILT_PROC                       = 0x4
-	EVFILT_READ                       = 0x0
-	EVFILT_SIGNAL                     = 0x5
-	EVFILT_SYSCOUNT                   = 0x7
-	EVFILT_TIMER                      = 0x6
-	EVFILT_VNODE                      = 0x3
-	EVFILT_WRITE                      = 0x1
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x100
-	FLUSHO                            = 0x800000
-	F_CLOSEM                          = 0xa
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0xc
-	F_FSCTL                           = -0x80000000
-	F_FSDIRMASK                       = 0x70000000
-	F_FSIN                            = 0x10000000
-	F_FSINOUT                         = 0x30000000
-	F_FSOUT                           = 0x20000000
-	F_FSPRIV                          = 0x8000
-	F_FSVOID                          = 0x40000000
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETNOSIGPIPE                    = 0xd
-	F_GETOWN                          = 0x5
-	F_MAXFD                           = 0xb
-	F_OK                              = 0x0
-	F_PARAM_MASK                      = 0xfff
-	F_PARAM_MAX                       = 0xfff
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETNOSIGPIPE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFA_ROUTE                         = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x8f52
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ECONET                        = 0xce
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LINEGROUP                     = 0xd2
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_PON155                        = 0xcf
-	IFT_PON622                        = 0xd0
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPATM                       = 0xc5
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_Q2931                         = 0xc9
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SIPSIG                        = 0xcc
-	IFT_SIPTG                         = 0xcb
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TELINK                        = 0xc8
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VIRTUALTG                     = 0xca
-	IFT_VOICEDID                      = 0xd5
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEEMFGD                    = 0xd3
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFGDEANA                  = 0xd4
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERCABLE                = 0xc6
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IPPROTO_AH                        = 0x33
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IPV6_ICMP                 = 0x3a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_VRRP                      = 0x70
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_EF                             = 0x8000
-	IP_ERRORMTU                       = 0x15
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x16
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0x14
-	IP_MF                             = 0x2000
-	IP_MINFRAGSIZE                    = 0x45
-	IP_MINTTL                         = 0x18
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTTL                        = 0x17
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x6
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SPACEAVAIL                   = 0x5
-	MADV_WILLNEED                     = 0x3
-	MAP_ALIGNMENT_16MB                = 0x18000000
-	MAP_ALIGNMENT_1TB                 = 0x28000000
-	MAP_ALIGNMENT_256TB               = 0x30000000
-	MAP_ALIGNMENT_4GB                 = 0x20000000
-	MAP_ALIGNMENT_64KB                = 0x10000000
-	MAP_ALIGNMENT_64PB                = 0x38000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_INHERIT_COPY                  = 0x1
-	MAP_INHERIT_DEFAULT               = 0x1
-	MAP_INHERIT_DONATE_COPY           = 0x3
-	MAP_INHERIT_NONE                  = 0x2
-	MAP_INHERIT_SHARE                 = 0x0
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x2000
-	MAP_TRYFIXED                      = 0x400
-	MAP_WIRED                         = 0x800
-	MSG_BCAST                         = 0x100
-	MSG_CMSG_CLOEXEC                  = 0x800
-	MSG_CONTROLMBUF                   = 0x2000000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOR                           = 0x8
-	MSG_IOVUSRSPACE                   = 0x4000000
-	MSG_LENUSRSPACE                   = 0x8000000
-	MSG_MCAST                         = 0x200
-	MSG_NAMEMBUF                      = 0x1000000
-	MSG_NBIO                          = 0x1000
-	MSG_NOSIGNAL                      = 0x400
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_USERFLAGS                     = 0xffffff
-	MSG_WAITALL                       = 0x40
-	NAME_MAX                          = 0x1ff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x5
-	NET_RT_MAXID                      = 0x6
-	NET_RT_OIFLIST                    = 0x4
-	NET_RT_OOIFLIST                   = 0x3
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	OFIOGETBMAP                       = 0xc004667a
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_ALT_IO                          = 0x40000
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x400000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x80000
-	O_DIRECTORY                       = 0x200000
-	O_DSYNC                           = 0x10000
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_NOSIGPIPE                       = 0x1000000
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_RSYNC                           = 0x20000
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	PRI_IOFLUSH                       = 0x7c
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x9
-	RTAX_NETMASK                      = 0x2
-	RTAX_TAG                          = 0x8
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTA_TAG                           = 0x100
-	RTF_ANNOUNCE                      = 0x20000
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_CLONED                        = 0x2000
-	RTF_CLONING                       = 0x100
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_MASK                          = 0x80
-	RTF_MODIFIED                      = 0x20
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_REJECT                        = 0x8
-	RTF_SRC                           = 0x10000
-	RTF_STATIC                        = 0x800
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_CHGADDR                       = 0x15
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x11
-	RTM_IFANNOUNCE                    = 0x10
-	RTM_IFINFO                        = 0x14
-	RTM_LLINFO_UPD                    = 0x13
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_OIFINFO                       = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_OOIFINFO                      = 0xe
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_SETGATE                       = 0x12
-	RTM_VERSION                       = 0x4
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	SCM_CREDS                         = 0x4
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x8
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80906931
-	SIOCADDRT                         = 0x8030720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCALIFADDR                      = 0x8118691c
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80906932
-	SIOCDELRT                         = 0x8030720b
-	SIOCDIFADDR                       = 0x80906919
-	SIOCDIFPHYADDR                    = 0x80906949
-	SIOCDLIFADDR                      = 0x8118691e
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETPFSYNC                     = 0xc09069f8
-	SIOCGETSGCNT                      = 0xc0147534
-	SIOCGETVIFCNT                     = 0xc0147533
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0906921
-	SIOCGIFADDRPREF                   = 0xc0946920
-	SIOCGIFALIAS                      = 0xc040691b
-	SIOCGIFBRDADDR                    = 0xc0906923
-	SIOCGIFCAP                        = 0xc0206976
-	SIOCGIFCONF                       = 0xc0086926
-	SIOCGIFDATA                       = 0xc0946985
-	SIOCGIFDLT                        = 0xc0906977
-	SIOCGIFDSTADDR                    = 0xc0906922
-	SIOCGIFFLAGS                      = 0xc0906911
-	SIOCGIFGENERIC                    = 0xc090693a
-	SIOCGIFMEDIA                      = 0xc0286936
-	SIOCGIFMETRIC                     = 0xc0906917
-	SIOCGIFMTU                        = 0xc090697e
-	SIOCGIFNETMASK                    = 0xc0906925
-	SIOCGIFPDSTADDR                   = 0xc0906948
-	SIOCGIFPSRCADDR                   = 0xc0906947
-	SIOCGLIFADDR                      = 0xc118691d
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLINKSTR                      = 0xc01c6987
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGVH                           = 0xc0906983
-	SIOCIFCREATE                      = 0x8090697a
-	SIOCIFDESTROY                     = 0x80906979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCINITIFADDR                    = 0xc0446984
-	SIOCSDRVSPEC                      = 0x801c697b
-	SIOCSETPFSYNC                     = 0x809069f7
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8090690c
-	SIOCSIFADDRPREF                   = 0x8094691f
-	SIOCSIFBRDADDR                    = 0x80906913
-	SIOCSIFCAP                        = 0x80206975
-	SIOCSIFDSTADDR                    = 0x8090690e
-	SIOCSIFFLAGS                      = 0x80906910
-	SIOCSIFGENERIC                    = 0x80906939
-	SIOCSIFMEDIA                      = 0xc0906935
-	SIOCSIFMETRIC                     = 0x80906918
-	SIOCSIFMTU                        = 0x8090697f
-	SIOCSIFNETMASK                    = 0x80906916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLINKSTR                      = 0x801c6988
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SIOCSVH                           = 0xc0906982
-	SIOCZIFDATA                       = 0xc0946986
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_FLAGS_MASK                   = 0xf0000000
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_NOSIGPIPE                    = 0x40000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NOHEADER                       = 0x100a
-	SO_NOSIGPIPE                      = 0x800
-	SO_OOBINLINE                      = 0x100
-	SO_OVERFLOWED                     = 0x1009
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x100c
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x100b
-	SO_TIMESTAMP                      = 0x2000
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SYSCTL_VERSION                    = 0x1000000
-	SYSCTL_VERS_0                     = 0x0
-	SYSCTL_VERS_1                     = 0x1000000
-	SYSCTL_VERS_MASK                  = 0xff000000
-	S_ARCH1                           = 0x10000
-	S_ARCH2                           = 0x20000
-	S_BLKSIZE                         = 0x200
-	S_IEXEC                           = 0x40
-	S_IFBLK                           = 0x6000
-	S_IFCHR                           = 0x2000
-	S_IFDIR                           = 0x4000
-	S_IFIFO                           = 0x1000
-	S_IFLNK                           = 0xa000
-	S_IFMT                            = 0xf000
-	S_IFREG                           = 0x8000
-	S_IFSOCK                          = 0xc000
-	S_IFWHT                           = 0xe000
-	S_IREAD                           = 0x100
-	S_IRGRP                           = 0x20
-	S_IROTH                           = 0x4
-	S_IRUSR                           = 0x100
-	S_IRWXG                           = 0x38
-	S_IRWXO                           = 0x7
-	S_IRWXU                           = 0x1c0
-	S_ISGID                           = 0x400
-	S_ISTXT                           = 0x200
-	S_ISUID                           = 0x800
-	S_ISVTX                           = 0x200
-	S_IWGRP                           = 0x10
-	S_IWOTH                           = 0x2
-	S_IWRITE                          = 0x80
-	S_IWUSR                           = 0x80
-	S_IXGRP                           = 0x8
-	S_IXOTH                           = 0x1
-	S_IXUSR                           = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CONGCTL                       = 0x20
-	TCP_KEEPCNT                       = 0x6
-	TCP_KEEPIDLE                      = 0x3
-	TCP_KEEPINIT                      = 0x7
-	TCP_KEEPINTVL                     = 0x5
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDCDTIMESTAMP                  = 0x400c7458
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLAG_CDTRCTS                  = 0x10
-	TIOCFLAG_CLOCAL                   = 0x2
-	TIOCFLAG_CRTSCTS                  = 0x4
-	TIOCFLAG_MDMBUF                   = 0x8
-	TIOCFLAG_SOFTCAR                  = 0x1
-	TIOCFLUSH                         = 0x80047410
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGFLAGS                        = 0x4004745d
-	TIOCGLINED                        = 0x40207442
-	TIOCGPGRP                         = 0x40047477
-	TIOCGQSIZE                        = 0x40047481
-	TIOCGRANTPT                       = 0x20007447
-	TIOCGSID                          = 0x40047463
-	TIOCGSIZE                         = 0x40087468
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGET                          = 0x4004746a
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMGET                        = 0x48087446
-	TIOCPTSNAME                       = 0x48087448
-	TIOCRCVFRAME                      = 0x80047445
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSFLAGS                        = 0x8004745c
-	TIOCSIG                           = 0x2000745f
-	TIOCSLINED                        = 0x80207443
-	TIOCSPGRP                         = 0x80047476
-	TIOCSQSIZE                        = 0x80047480
-	TIOCSSIZE                         = 0x80087467
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x80047465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCUCNTL                         = 0x80047466
-	TIOCXMTFRAME                      = 0x80047444
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WALL                              = 0x8
-	WALLSIG                           = 0x8
-	WALTSIG                           = 0x4
-	WCLONE                            = 0x4
-	WCOREFLAG                         = 0x80
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x10000
-	WNOZOMBIE                         = 0x20000
-	WOPTSCHECKED                      = 0x40000
-	WSTOPPED                          = 0x7f
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADMSG         = syscall.Errno(0x58)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x57)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x52)
-	EILSEQ          = syscall.Errno(0x55)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x60)
-	ELOOP           = syscall.Errno(0x3e)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	EMULTIHOP       = syscall.Errno(0x5e)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x5d)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODATA         = syscall.Errno(0x59)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOLINK         = syscall.Errno(0x5f)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x53)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x5a)
-	ENOSTR          = syscall.Errno(0x5b)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x56)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x54)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTO          = syscall.Errno(0x60)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIME           = syscall.Errno(0x5c)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGPWR    = syscall.Signal(0x20)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large or too small",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol option not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "illegal byte sequence",
-	86: "not supported",
-	87: "operation Canceled",
-	88: "bad or Corrupt message",
-	89: "no message available",
-	90: "no STREAM resources",
-	91: "not a STREAM",
-	92: "STREAM ioctl timeout",
-	93: "attribute not found",
-	94: "multihop attempted",
-	95: "link has been severed",
-	96: "protocol error",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "power fail/restart",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
deleted file mode 100644
index 3322e998d3..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
+++ /dev/null
@@ -1,1584 +0,0 @@
-// mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build 386,openbsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m32 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_BLUETOOTH                      = 0x20
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_ENCAP                          = 0x1c
-	AF_HYLINK                         = 0xf
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x18
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_KEY                            = 0x1e
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x24
-	AF_MPLS                           = 0x21
-	AF_NATM                           = 0x1b
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x1d
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	ARPHRD_ETHER                      = 0x1
-	ARPHRD_FRELAY                     = 0xf
-	ARPHRD_IEEE1394                   = 0x18
-	ARPHRD_IEEE802                    = 0x6
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRFILT                      = 0x4004427c
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc008427b
-	BIOCGETIF                         = 0x4020426b
-	BIOCGFILDROP                      = 0x40044278
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044273
-	BIOCGRTIMEOUT                     = 0x400c426e
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x20004276
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRFILT                      = 0x8004427d
-	BIOCSDLT                          = 0x8004427a
-	BIOCSETF                          = 0x80084267
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x80084277
-	BIOCSFILDROP                      = 0x80044279
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044272
-	BIOCSRTIMEOUT                     = 0x800c426d
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIRECTION_IN                  = 0x1
-	BPF_DIRECTION_OUT                 = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x200000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0xff
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DIOCOSFPFLUSH                     = 0x2000444e
-	DLT_ARCNET                        = 0x7
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AX25                          = 0x3
-	DLT_CHAOS                         = 0x5
-	DLT_C_HDLC                        = 0x68
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0xd
-	DLT_FDDI                          = 0xa
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_LOOP                          = 0xc
-	DLT_MPLS                          = 0xdb
-	DLT_NULL                          = 0x0
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PRONET                        = 0x4
-	DLT_RAW                           = 0xe
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EMT_TAGOVF                        = 0x1
-	EMUL_ENABLED                      = 0x1
-	EMUL_NATIVE                       = 0x2
-	ENDRUNDISC                        = 0x9
-	ETHERMIN                          = 0x2e
-	ETHERMTU                          = 0x5dc
-	ETHERTYPE_8023                    = 0x4
-	ETHERTYPE_AARP                    = 0x80f3
-	ETHERTYPE_ACCTON                  = 0x8390
-	ETHERTYPE_AEONIC                  = 0x8036
-	ETHERTYPE_ALPHA                   = 0x814a
-	ETHERTYPE_AMBER                   = 0x6008
-	ETHERTYPE_AMOEBA                  = 0x8145
-	ETHERTYPE_AOE                     = 0x88a2
-	ETHERTYPE_APOLLO                  = 0x80f7
-	ETHERTYPE_APOLLODOMAIN            = 0x8019
-	ETHERTYPE_APPLETALK               = 0x809b
-	ETHERTYPE_APPLITEK                = 0x80c7
-	ETHERTYPE_ARGONAUT                = 0x803a
-	ETHERTYPE_ARP                     = 0x806
-	ETHERTYPE_AT                      = 0x809b
-	ETHERTYPE_ATALK                   = 0x809b
-	ETHERTYPE_ATOMIC                  = 0x86df
-	ETHERTYPE_ATT                     = 0x8069
-	ETHERTYPE_ATTSTANFORD             = 0x8008
-	ETHERTYPE_AUTOPHON                = 0x806a
-	ETHERTYPE_AXIS                    = 0x8856
-	ETHERTYPE_BCLOOP                  = 0x9003
-	ETHERTYPE_BOFL                    = 0x8102
-	ETHERTYPE_CABLETRON               = 0x7034
-	ETHERTYPE_CHAOS                   = 0x804
-	ETHERTYPE_COMDESIGN               = 0x806c
-	ETHERTYPE_COMPUGRAPHIC            = 0x806d
-	ETHERTYPE_COUNTERPOINT            = 0x8062
-	ETHERTYPE_CRONUS                  = 0x8004
-	ETHERTYPE_CRONUSVLN               = 0x8003
-	ETHERTYPE_DCA                     = 0x1234
-	ETHERTYPE_DDE                     = 0x807b
-	ETHERTYPE_DEBNI                   = 0xaaaa
-	ETHERTYPE_DECAM                   = 0x8048
-	ETHERTYPE_DECCUST                 = 0x6006
-	ETHERTYPE_DECDIAG                 = 0x6005
-	ETHERTYPE_DECDNS                  = 0x803c
-	ETHERTYPE_DECDTS                  = 0x803e
-	ETHERTYPE_DECEXPER                = 0x6000
-	ETHERTYPE_DECLAST                 = 0x8041
-	ETHERTYPE_DECLTM                  = 0x803f
-	ETHERTYPE_DECMUMPS                = 0x6009
-	ETHERTYPE_DECNETBIOS              = 0x8040
-	ETHERTYPE_DELTACON                = 0x86de
-	ETHERTYPE_DIDDLE                  = 0x4321
-	ETHERTYPE_DLOG1                   = 0x660
-	ETHERTYPE_DLOG2                   = 0x661
-	ETHERTYPE_DN                      = 0x6003
-	ETHERTYPE_DOGFIGHT                = 0x1989
-	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_ECMA                    = 0x803
-	ETHERTYPE_ENCRYPT                 = 0x803d
-	ETHERTYPE_ES                      = 0x805d
-	ETHERTYPE_EXCELAN                 = 0x8010
-	ETHERTYPE_EXPERDATA               = 0x8049
-	ETHERTYPE_FLIP                    = 0x8146
-	ETHERTYPE_FLOWCONTROL             = 0x8808
-	ETHERTYPE_FRARP                   = 0x808
-	ETHERTYPE_GENDYN                  = 0x8068
-	ETHERTYPE_HAYES                   = 0x8130
-	ETHERTYPE_HIPPI_FP                = 0x8180
-	ETHERTYPE_HITACHI                 = 0x8820
-	ETHERTYPE_HP                      = 0x8005
-	ETHERTYPE_IEEEPUP                 = 0xa00
-	ETHERTYPE_IEEEPUPAT               = 0xa01
-	ETHERTYPE_IMLBL                   = 0x4c42
-	ETHERTYPE_IMLBLDIAG               = 0x424c
-	ETHERTYPE_IP                      = 0x800
-	ETHERTYPE_IPAS                    = 0x876c
-	ETHERTYPE_IPV6                    = 0x86dd
-	ETHERTYPE_IPX                     = 0x8137
-	ETHERTYPE_IPXNEW                  = 0x8037
-	ETHERTYPE_KALPANA                 = 0x8582
-	ETHERTYPE_LANBRIDGE               = 0x8038
-	ETHERTYPE_LANPROBE                = 0x8888
-	ETHERTYPE_LAT                     = 0x6004
-	ETHERTYPE_LBACK                   = 0x9000
-	ETHERTYPE_LITTLE                  = 0x8060
-	ETHERTYPE_LLDP                    = 0x88cc
-	ETHERTYPE_LOGICRAFT               = 0x8148
-	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MATRA                   = 0x807a
-	ETHERTYPE_MAX                     = 0xffff
-	ETHERTYPE_MERIT                   = 0x807c
-	ETHERTYPE_MICP                    = 0x873a
-	ETHERTYPE_MOPDL                   = 0x6001
-	ETHERTYPE_MOPRC                   = 0x6002
-	ETHERTYPE_MOTOROLA                = 0x818d
-	ETHERTYPE_MPLS                    = 0x8847
-	ETHERTYPE_MPLS_MCAST              = 0x8848
-	ETHERTYPE_MUMPS                   = 0x813f
-	ETHERTYPE_NBPCC                   = 0x3c04
-	ETHERTYPE_NBPCLAIM                = 0x3c09
-	ETHERTYPE_NBPCLREQ                = 0x3c05
-	ETHERTYPE_NBPCLRSP                = 0x3c06
-	ETHERTYPE_NBPCREQ                 = 0x3c02
-	ETHERTYPE_NBPCRSP                 = 0x3c03
-	ETHERTYPE_NBPDG                   = 0x3c07
-	ETHERTYPE_NBPDGB                  = 0x3c08
-	ETHERTYPE_NBPDLTE                 = 0x3c0a
-	ETHERTYPE_NBPRAR                  = 0x3c0c
-	ETHERTYPE_NBPRAS                  = 0x3c0b
-	ETHERTYPE_NBPRST                  = 0x3c0d
-	ETHERTYPE_NBPSCD                  = 0x3c01
-	ETHERTYPE_NBPVCD                  = 0x3c00
-	ETHERTYPE_NBS                     = 0x802
-	ETHERTYPE_NCD                     = 0x8149
-	ETHERTYPE_NESTAR                  = 0x8006
-	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NOVELL                  = 0x8138
-	ETHERTYPE_NS                      = 0x600
-	ETHERTYPE_NSAT                    = 0x601
-	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NTRAILER                = 0x10
-	ETHERTYPE_OS9                     = 0x7007
-	ETHERTYPE_OS9NET                  = 0x7009
-	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PAE                     = 0x888e
-	ETHERTYPE_PCS                     = 0x4242
-	ETHERTYPE_PLANNING                = 0x8044
-	ETHERTYPE_PPP                     = 0x880b
-	ETHERTYPE_PPPOE                   = 0x8864
-	ETHERTYPE_PPPOEDISC               = 0x8863
-	ETHERTYPE_PRIMENTS                = 0x7031
-	ETHERTYPE_PUP                     = 0x200
-	ETHERTYPE_PUPAT                   = 0x200
-	ETHERTYPE_QINQ                    = 0x88a8
-	ETHERTYPE_RACAL                   = 0x7030
-	ETHERTYPE_RATIONAL                = 0x8150
-	ETHERTYPE_RAWFR                   = 0x6559
-	ETHERTYPE_RCL                     = 0x1995
-	ETHERTYPE_RDP                     = 0x8739
-	ETHERTYPE_RETIX                   = 0x80f2
-	ETHERTYPE_REVARP                  = 0x8035
-	ETHERTYPE_SCA                     = 0x6007
-	ETHERTYPE_SECTRA                  = 0x86db
-	ETHERTYPE_SECUREDATA              = 0x876d
-	ETHERTYPE_SGITW                   = 0x817e
-	ETHERTYPE_SG_BOUNCE               = 0x8016
-	ETHERTYPE_SG_DIAG                 = 0x8013
-	ETHERTYPE_SG_NETGAMES             = 0x8014
-	ETHERTYPE_SG_RESV                 = 0x8015
-	ETHERTYPE_SIMNET                  = 0x5208
-	ETHERTYPE_SLOW                    = 0x8809
-	ETHERTYPE_SNA                     = 0x80d5
-	ETHERTYPE_SNMP                    = 0x814c
-	ETHERTYPE_SONIX                   = 0xfaf5
-	ETHERTYPE_SPIDER                  = 0x809f
-	ETHERTYPE_SPRITE                  = 0x500
-	ETHERTYPE_STP                     = 0x8181
-	ETHERTYPE_TALARIS                 = 0x812b
-	ETHERTYPE_TALARISMC               = 0x852b
-	ETHERTYPE_TCPCOMP                 = 0x876b
-	ETHERTYPE_TCPSM                   = 0x9002
-	ETHERTYPE_TEC                     = 0x814f
-	ETHERTYPE_TIGAN                   = 0x802f
-	ETHERTYPE_TRAIL                   = 0x1000
-	ETHERTYPE_TRANSETHER              = 0x6558
-	ETHERTYPE_TYMSHARE                = 0x802e
-	ETHERTYPE_UBBST                   = 0x7005
-	ETHERTYPE_UBDEBUG                 = 0x900
-	ETHERTYPE_UBDIAGLOOP              = 0x7002
-	ETHERTYPE_UBDL                    = 0x7000
-	ETHERTYPE_UBNIU                   = 0x7001
-	ETHERTYPE_UBNMC                   = 0x7003
-	ETHERTYPE_VALID                   = 0x1600
-	ETHERTYPE_VARIAN                  = 0x80dd
-	ETHERTYPE_VAXELN                  = 0x803b
-	ETHERTYPE_VEECO                   = 0x8067
-	ETHERTYPE_VEXP                    = 0x805b
-	ETHERTYPE_VGLAB                   = 0x8131
-	ETHERTYPE_VINES                   = 0xbad
-	ETHERTYPE_VINESECHO               = 0xbaf
-	ETHERTYPE_VINESLOOP               = 0xbae
-	ETHERTYPE_VITAL                   = 0xff00
-	ETHERTYPE_VLAN                    = 0x8100
-	ETHERTYPE_VLTLMAN                 = 0x8080
-	ETHERTYPE_VPROD                   = 0x805c
-	ETHERTYPE_VURESERVED              = 0x8147
-	ETHERTYPE_WATERLOO                = 0x8130
-	ETHERTYPE_WELLFLEET               = 0x8103
-	ETHERTYPE_X25                     = 0x805
-	ETHERTYPE_X75                     = 0x801
-	ETHERTYPE_XNSSM                   = 0x9001
-	ETHERTYPE_XTP                     = 0x817d
-	ETHER_ADDR_LEN                    = 0x6
-	ETHER_ALIGN                       = 0x2
-	ETHER_CRC_LEN                     = 0x4
-	ETHER_CRC_POLY_BE                 = 0x4c11db6
-	ETHER_CRC_POLY_LE                 = 0xedb88320
-	ETHER_HDR_LEN                     = 0xe
-	ETHER_MAX_DIX_LEN                 = 0x600
-	ETHER_MAX_LEN                     = 0x5ee
-	ETHER_MIN_LEN                     = 0x40
-	ETHER_TYPE_LEN                    = 0x2
-	ETHER_VLAN_ENCAP_LEN              = 0x4
-	EVFILT_AIO                        = -0x3
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x7
-	EVFILT_TIMER                      = -0x7
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0xa
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETOWN                          = 0x5
-	F_OK                              = 0x0
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFA_ROUTE                         = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x8e52
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BLUETOOTH                     = 0xf8
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf7
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DUMMY                         = 0xf1
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ECONET                        = 0xce
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf3
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LINEGROUP                     = 0xd2
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFLOW                         = 0xf9
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_PON155                        = 0xcf
-	IFT_PON622                        = 0xd0
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPATM                       = 0xc5
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf2
-	IFT_Q2931                         = 0xc9
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SIPSIG                        = 0xcc
-	IFT_SIPTG                         = 0xcb
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TELINK                        = 0xc8
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VIRTUALTG                     = 0xca
-	IFT_VOICEDID                      = 0xd5
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEEMFGD                    = 0xd3
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFGDEANA                  = 0xd4
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERCABLE                = 0xc6
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_HOST                   = 0x1
-	IN_RFC3021_NET                    = 0xfffffffe
-	IN_RFC3021_NSHIFT                 = 0x1f
-	IPPROTO_AH                        = 0x33
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DIVERT_INIT               = 0x2
-	IPPROTO_DIVERT_RESP               = 0x1
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x103
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_UDP                       = 0x11
-	IPV6_AUTH_LEVEL                   = 0x35
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_ESP_NETWORK_LEVEL            = 0x37
-	IPV6_ESP_TRANS_LEVEL              = 0x36
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPCOMP_LEVEL                 = 0x3c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_OPTIONS                      = 0x1
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PIPEX                        = 0x3f
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVDSTPORT                  = 0x40
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTABLE                       = 0x1021
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_AUTH_LEVEL                     = 0x14
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DIVERTFL                       = 0x1022
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_ESP_NETWORK_LEVEL              = 0x16
-	IP_ESP_TRANS_LEVEL                = 0x15
-	IP_HDRINCL                        = 0x2
-	IP_IPCOMP_LEVEL                   = 0x1d
-	IP_IPSECFLOWINFO                  = 0x24
-	IP_IPSEC_LOCAL_AUTH               = 0x1b
-	IP_IPSEC_LOCAL_CRED               = 0x19
-	IP_IPSEC_LOCAL_ID                 = 0x17
-	IP_IPSEC_REMOTE_AUTH              = 0x1c
-	IP_IPSEC_REMOTE_CRED              = 0x1a
-	IP_IPSEC_REMOTE_ID                = 0x18
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x20
-	IP_MIN_MEMBERSHIPS                = 0xf
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PIPEX                          = 0x22
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVDSTPORT                    = 0x21
-	IP_RECVIF                         = 0x1e
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVRTABLE                     = 0x23
-	IP_RECVTTL                        = 0x1f
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RTABLE                         = 0x1021
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LCNT_OVERLOAD_FLUSH               = 0x6
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x6
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SPACEAVAIL                   = 0x5
-	MADV_WILLNEED                     = 0x3
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x4
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_FLAGMASK                      = 0x1ff7
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_INHERIT_COPY                  = 0x1
-	MAP_INHERIT_DONATE_COPY           = 0x3
-	MAP_INHERIT_NONE                  = 0x2
-	MAP_INHERIT_SHARE                 = 0x0
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_SHARED                        = 0x1
-	MAP_TRYFIXED                      = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_BCAST                         = 0x100
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOR                           = 0x8
-	MSG_MCAST                         = 0x200
-	MSG_NOSIGNAL                      = 0x400
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x4
-	MS_SYNC                           = 0x2
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_MAXID                      = 0x6
-	NET_RT_STATS                      = 0x4
-	NET_RT_TABLE                      = 0x5
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EOF                          = 0x2
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRUNCATE                     = 0x80
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x80
-	ONOCR                             = 0x40
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x10000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x20000
-	O_DSYNC                           = 0x80
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_RSYNC                           = 0x80
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PF_FLUSH                          = 0x1
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	PT_MASK                           = 0x3ff000
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_LABEL                        = 0xa
-	RTAX_MAX                          = 0xb
-	RTAX_NETMASK                      = 0x2
-	RTAX_SRC                          = 0x8
-	RTAX_SRCMASK                      = 0x9
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_LABEL                         = 0x400
-	RTA_NETMASK                       = 0x4
-	RTA_SRC                           = 0x100
-	RTA_SRCMASK                       = 0x200
-	RTF_ANNOUNCE                      = 0x4000
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_CLONED                        = 0x10000
-	RTF_CLONING                       = 0x100
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x10f808
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_MASK                          = 0x80
-	RTF_MODIFIED                      = 0x20
-	RTF_MPATH                         = 0x40000
-	RTF_MPLS                          = 0x100000
-	RTF_PERMANENT_ARP                 = 0x2000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x2000
-	RTF_REJECT                        = 0x8
-	RTF_SOURCE                        = 0x20000
-	RTF_STATIC                        = 0x800
-	RTF_TUNNEL                        = 0x100000
-	RTF_UP                            = 0x1
-	RTF_USETRAILERS                   = 0x8000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DESYNC                        = 0x10
-	RTM_GET                           = 0x4
-	RTM_IFANNOUNCE                    = 0xf
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MAXSIZE                       = 0x800
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RT_TABLEID_MAX                    = 0xff
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x4
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80246987
-	SIOCALIFADDR                      = 0x8218691c
-	SIOCATMARK                        = 0x40047307
-	SIOCBRDGADD                       = 0x8054693c
-	SIOCBRDGADDS                      = 0x80546941
-	SIOCBRDGARL                       = 0x806e694d
-	SIOCBRDGDADDR                     = 0x81286947
-	SIOCBRDGDEL                       = 0x8054693d
-	SIOCBRDGDELS                      = 0x80546942
-	SIOCBRDGFLUSH                     = 0x80546948
-	SIOCBRDGFRL                       = 0x806e694e
-	SIOCBRDGGCACHE                    = 0xc0146941
-	SIOCBRDGGFD                       = 0xc0146952
-	SIOCBRDGGHT                       = 0xc0146951
-	SIOCBRDGGIFFLGS                   = 0xc054693e
-	SIOCBRDGGMA                       = 0xc0146953
-	SIOCBRDGGPARAM                    = 0xc03c6958
-	SIOCBRDGGPRI                      = 0xc0146950
-	SIOCBRDGGRL                       = 0xc028694f
-	SIOCBRDGGSIFS                     = 0xc054693c
-	SIOCBRDGGTO                       = 0xc0146946
-	SIOCBRDGIFS                       = 0xc0546942
-	SIOCBRDGRTS                       = 0xc0186943
-	SIOCBRDGSADDR                     = 0xc1286944
-	SIOCBRDGSCACHE                    = 0x80146940
-	SIOCBRDGSFD                       = 0x80146952
-	SIOCBRDGSHT                       = 0x80146951
-	SIOCBRDGSIFCOST                   = 0x80546955
-	SIOCBRDGSIFFLGS                   = 0x8054693f
-	SIOCBRDGSIFPRIO                   = 0x80546954
-	SIOCBRDGSMA                       = 0x80146953
-	SIOCBRDGSPRI                      = 0x80146950
-	SIOCBRDGSPROTO                    = 0x8014695a
-	SIOCBRDGSTO                       = 0x80146945
-	SIOCBRDGSTXHC                     = 0x80146959
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80246989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8218691e
-	SIOCGETKALIVE                     = 0xc01869a4
-	SIOCGETLABEL                      = 0x8020699a
-	SIOCGETPFLOW                      = 0xc02069fe
-	SIOCGETPFSYNC                     = 0xc02069f8
-	SIOCGETSGCNT                      = 0xc0147534
-	SIOCGETVIFCNT                     = 0xc0147533
-	SIOCGETVLAN                       = 0xc0206990
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFASYNCMAP                   = 0xc020697c
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCONF                       = 0xc0086924
-	SIOCGIFDATA                       = 0xc020691b
-	SIOCGIFDESCR                      = 0xc0206981
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGATTR                      = 0xc024698b
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc024698a
-	SIOCGIFGROUP                      = 0xc0246988
-	SIOCGIFHARDMTU                    = 0xc02069a5
-	SIOCGIFMEDIA                      = 0xc0286936
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc020697e
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPRIORITY                   = 0xc020699c
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFRDOMAIN                    = 0xc02069a0
-	SIOCGIFRTLABEL                    = 0xc0206983
-	SIOCGIFTIMESLOT                   = 0xc0206986
-	SIOCGIFXFLAGS                     = 0xc020699e
-	SIOCGLIFADDR                      = 0xc218691d
-	SIOCGLIFPHYADDR                   = 0xc218694b
-	SIOCGLIFPHYRTABLE                 = 0xc02069a2
-	SIOCGLIFPHYTTL                    = 0xc02069a9
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGSPPPPARAMS                   = 0xc0206994
-	SIOCGVH                           = 0xc02069f6
-	SIOCGVNETID                       = 0xc02069a7
-	SIOCIFCREATE                      = 0x8020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCSETKALIVE                     = 0x801869a3
-	SIOCSETLABEL                      = 0x80206999
-	SIOCSETPFLOW                      = 0x802069fd
-	SIOCSETPFSYNC                     = 0x802069f7
-	SIOCSETVLAN                       = 0x8020698f
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFASYNCMAP                   = 0x8020697d
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFDESCR                      = 0x80206980
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGATTR                      = 0x8024698c
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020691f
-	SIOCSIFMEDIA                      = 0xc0206935
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x8020697f
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPRIORITY                   = 0x8020699b
-	SIOCSIFRDOMAIN                    = 0x8020699f
-	SIOCSIFRTLABEL                    = 0x80206982
-	SIOCSIFTIMESLOT                   = 0x80206985
-	SIOCSIFXFLAGS                     = 0x8020699d
-	SIOCSLIFPHYADDR                   = 0x8218694a
-	SIOCSLIFPHYRTABLE                 = 0x802069a1
-	SIOCSLIFPHYTTL                    = 0x802069a8
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SIOCSSPPPPARAMS                   = 0x80206993
-	SIOCSVH                           = 0xc02069f5
-	SIOCSVNETID                       = 0x802069a6
-	SOCK_DGRAM                        = 0x2
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BINDANY                        = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NETPROC                        = 0x1020
-	SO_OOBINLINE                      = 0x100
-	SO_PEERCRED                       = 0x1022
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_RTABLE                         = 0x1021
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_SPLICE                         = 0x1023
-	SO_TIMESTAMP                      = 0x800
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x3
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x4
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOPUSH                        = 0x10
-	TCP_NSTATES                       = 0xb
-	TCP_SACK_ENABLE                   = 0x8
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLAG_CLOCAL                   = 0x2
-	TIOCFLAG_CRTSCTS                  = 0x4
-	TIOCFLAG_MDMBUF                   = 0x8
-	TIOCFLAG_PPS                      = 0x10
-	TIOCFLAG_SOFTCAR                  = 0x1
-	TIOCFLUSH                         = 0x80047410
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGFLAGS                        = 0x4004745d
-	TIOCGPGRP                         = 0x40047477
-	TIOCGSID                          = 0x40047463
-	TIOCGTSTAMP                       = 0x400c745b
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x4004746a
-	TIOCMODS                          = 0x8004746d
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSFLAGS                        = 0x8004745c
-	TIOCSIG                           = 0x8004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x80047465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSTSTAMP                       = 0x8008745a
-	TIOCSWINSZ                        = 0x80087467
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WALTSIG                           = 0x4
-	WCONTINUED                        = 0x8
-	WCOREFLAG                         = 0x80
-	WNOHANG                           = 0x1
-	WSTOPPED                          = 0x7f
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x58)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x59)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EIPSEC          = syscall.Errno(0x52)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x5b)
-	ELOOP           = syscall.Errno(0x3e)
-	EMEDIUMTYPE     = syscall.Errno(0x56)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x53)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOMEDIUM       = syscall.Errno(0x55)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5a)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x5b)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x57)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "IPsec processing failure",
-	83: "attribute not found",
-	84: "illegal byte sequence",
-	85: "no medium found",
-	86: "wrong medium type",
-	87: "value too large to be stored in data type",
-	88: "operation canceled",
-	89: "identifier removed",
-	90: "no message of desired type",
-	91: "not supported",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "thread AST",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
deleted file mode 100644
index 1758ecca93..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
+++ /dev/null
@@ -1,1583 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,openbsd
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_APPLETALK                      = 0x10
-	AF_BLUETOOTH                      = 0x20
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_ENCAP                          = 0x1c
-	AF_HYLINK                         = 0xf
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x18
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_KEY                            = 0x1e
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x24
-	AF_MPLS                           = 0x21
-	AF_NATM                           = 0x1b
-	AF_NS                             = 0x6
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SIP                            = 0x1d
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	ARPHRD_ETHER                      = 0x1
-	ARPHRD_FRELAY                     = 0xf
-	ARPHRD_IEEE1394                   = 0x18
-	ARPHRD_IEEE802                    = 0x6
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B9600                             = 0x2580
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRFILT                      = 0x4004427c
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc010427b
-	BIOCGETIF                         = 0x4020426b
-	BIOCGFILDROP                      = 0x40044278
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044273
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSTATS                        = 0x4008426f
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x20004276
-	BIOCPROMISC                       = 0x20004269
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRFILT                      = 0x8004427d
-	BIOCSDLT                          = 0x8004427a
-	BIOCSETF                          = 0x80104267
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x80104277
-	BIOCSFILDROP                      = 0x80044279
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044272
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_DIRECTION_IN                  = 0x1
-	BPF_DIRECTION_OUT                 = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x200000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0xff
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0xc
-	CTL_NET                           = 0x4
-	DIOCOSFPFLUSH                     = 0x2000444e
-	DLT_ARCNET                        = 0x7
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AX25                          = 0x3
-	DLT_CHAOS                         = 0x5
-	DLT_C_HDLC                        = 0x68
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0xd
-	DLT_FDDI                          = 0xa
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_LOOP                          = 0xc
-	DLT_MPLS                          = 0xdb
-	DLT_NULL                          = 0x0
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x12
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PRONET                        = 0x4
-	DLT_RAW                           = 0xe
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EMT_TAGOVF                        = 0x1
-	EMUL_ENABLED                      = 0x1
-	EMUL_NATIVE                       = 0x2
-	ENDRUNDISC                        = 0x9
-	ETHERMIN                          = 0x2e
-	ETHERMTU                          = 0x5dc
-	ETHERTYPE_8023                    = 0x4
-	ETHERTYPE_AARP                    = 0x80f3
-	ETHERTYPE_ACCTON                  = 0x8390
-	ETHERTYPE_AEONIC                  = 0x8036
-	ETHERTYPE_ALPHA                   = 0x814a
-	ETHERTYPE_AMBER                   = 0x6008
-	ETHERTYPE_AMOEBA                  = 0x8145
-	ETHERTYPE_AOE                     = 0x88a2
-	ETHERTYPE_APOLLO                  = 0x80f7
-	ETHERTYPE_APOLLODOMAIN            = 0x8019
-	ETHERTYPE_APPLETALK               = 0x809b
-	ETHERTYPE_APPLITEK                = 0x80c7
-	ETHERTYPE_ARGONAUT                = 0x803a
-	ETHERTYPE_ARP                     = 0x806
-	ETHERTYPE_AT                      = 0x809b
-	ETHERTYPE_ATALK                   = 0x809b
-	ETHERTYPE_ATOMIC                  = 0x86df
-	ETHERTYPE_ATT                     = 0x8069
-	ETHERTYPE_ATTSTANFORD             = 0x8008
-	ETHERTYPE_AUTOPHON                = 0x806a
-	ETHERTYPE_AXIS                    = 0x8856
-	ETHERTYPE_BCLOOP                  = 0x9003
-	ETHERTYPE_BOFL                    = 0x8102
-	ETHERTYPE_CABLETRON               = 0x7034
-	ETHERTYPE_CHAOS                   = 0x804
-	ETHERTYPE_COMDESIGN               = 0x806c
-	ETHERTYPE_COMPUGRAPHIC            = 0x806d
-	ETHERTYPE_COUNTERPOINT            = 0x8062
-	ETHERTYPE_CRONUS                  = 0x8004
-	ETHERTYPE_CRONUSVLN               = 0x8003
-	ETHERTYPE_DCA                     = 0x1234
-	ETHERTYPE_DDE                     = 0x807b
-	ETHERTYPE_DEBNI                   = 0xaaaa
-	ETHERTYPE_DECAM                   = 0x8048
-	ETHERTYPE_DECCUST                 = 0x6006
-	ETHERTYPE_DECDIAG                 = 0x6005
-	ETHERTYPE_DECDNS                  = 0x803c
-	ETHERTYPE_DECDTS                  = 0x803e
-	ETHERTYPE_DECEXPER                = 0x6000
-	ETHERTYPE_DECLAST                 = 0x8041
-	ETHERTYPE_DECLTM                  = 0x803f
-	ETHERTYPE_DECMUMPS                = 0x6009
-	ETHERTYPE_DECNETBIOS              = 0x8040
-	ETHERTYPE_DELTACON                = 0x86de
-	ETHERTYPE_DIDDLE                  = 0x4321
-	ETHERTYPE_DLOG1                   = 0x660
-	ETHERTYPE_DLOG2                   = 0x661
-	ETHERTYPE_DN                      = 0x6003
-	ETHERTYPE_DOGFIGHT                = 0x1989
-	ETHERTYPE_DSMD                    = 0x8039
-	ETHERTYPE_ECMA                    = 0x803
-	ETHERTYPE_ENCRYPT                 = 0x803d
-	ETHERTYPE_ES                      = 0x805d
-	ETHERTYPE_EXCELAN                 = 0x8010
-	ETHERTYPE_EXPERDATA               = 0x8049
-	ETHERTYPE_FLIP                    = 0x8146
-	ETHERTYPE_FLOWCONTROL             = 0x8808
-	ETHERTYPE_FRARP                   = 0x808
-	ETHERTYPE_GENDYN                  = 0x8068
-	ETHERTYPE_HAYES                   = 0x8130
-	ETHERTYPE_HIPPI_FP                = 0x8180
-	ETHERTYPE_HITACHI                 = 0x8820
-	ETHERTYPE_HP                      = 0x8005
-	ETHERTYPE_IEEEPUP                 = 0xa00
-	ETHERTYPE_IEEEPUPAT               = 0xa01
-	ETHERTYPE_IMLBL                   = 0x4c42
-	ETHERTYPE_IMLBLDIAG               = 0x424c
-	ETHERTYPE_IP                      = 0x800
-	ETHERTYPE_IPAS                    = 0x876c
-	ETHERTYPE_IPV6                    = 0x86dd
-	ETHERTYPE_IPX                     = 0x8137
-	ETHERTYPE_IPXNEW                  = 0x8037
-	ETHERTYPE_KALPANA                 = 0x8582
-	ETHERTYPE_LANBRIDGE               = 0x8038
-	ETHERTYPE_LANPROBE                = 0x8888
-	ETHERTYPE_LAT                     = 0x6004
-	ETHERTYPE_LBACK                   = 0x9000
-	ETHERTYPE_LITTLE                  = 0x8060
-	ETHERTYPE_LLDP                    = 0x88cc
-	ETHERTYPE_LOGICRAFT               = 0x8148
-	ETHERTYPE_LOOPBACK                = 0x9000
-	ETHERTYPE_MATRA                   = 0x807a
-	ETHERTYPE_MAX                     = 0xffff
-	ETHERTYPE_MERIT                   = 0x807c
-	ETHERTYPE_MICP                    = 0x873a
-	ETHERTYPE_MOPDL                   = 0x6001
-	ETHERTYPE_MOPRC                   = 0x6002
-	ETHERTYPE_MOTOROLA                = 0x818d
-	ETHERTYPE_MPLS                    = 0x8847
-	ETHERTYPE_MPLS_MCAST              = 0x8848
-	ETHERTYPE_MUMPS                   = 0x813f
-	ETHERTYPE_NBPCC                   = 0x3c04
-	ETHERTYPE_NBPCLAIM                = 0x3c09
-	ETHERTYPE_NBPCLREQ                = 0x3c05
-	ETHERTYPE_NBPCLRSP                = 0x3c06
-	ETHERTYPE_NBPCREQ                 = 0x3c02
-	ETHERTYPE_NBPCRSP                 = 0x3c03
-	ETHERTYPE_NBPDG                   = 0x3c07
-	ETHERTYPE_NBPDGB                  = 0x3c08
-	ETHERTYPE_NBPDLTE                 = 0x3c0a
-	ETHERTYPE_NBPRAR                  = 0x3c0c
-	ETHERTYPE_NBPRAS                  = 0x3c0b
-	ETHERTYPE_NBPRST                  = 0x3c0d
-	ETHERTYPE_NBPSCD                  = 0x3c01
-	ETHERTYPE_NBPVCD                  = 0x3c00
-	ETHERTYPE_NBS                     = 0x802
-	ETHERTYPE_NCD                     = 0x8149
-	ETHERTYPE_NESTAR                  = 0x8006
-	ETHERTYPE_NETBEUI                 = 0x8191
-	ETHERTYPE_NOVELL                  = 0x8138
-	ETHERTYPE_NS                      = 0x600
-	ETHERTYPE_NSAT                    = 0x601
-	ETHERTYPE_NSCOMPAT                = 0x807
-	ETHERTYPE_NTRAILER                = 0x10
-	ETHERTYPE_OS9                     = 0x7007
-	ETHERTYPE_OS9NET                  = 0x7009
-	ETHERTYPE_PACER                   = 0x80c6
-	ETHERTYPE_PAE                     = 0x888e
-	ETHERTYPE_PCS                     = 0x4242
-	ETHERTYPE_PLANNING                = 0x8044
-	ETHERTYPE_PPP                     = 0x880b
-	ETHERTYPE_PPPOE                   = 0x8864
-	ETHERTYPE_PPPOEDISC               = 0x8863
-	ETHERTYPE_PRIMENTS                = 0x7031
-	ETHERTYPE_PUP                     = 0x200
-	ETHERTYPE_PUPAT                   = 0x200
-	ETHERTYPE_QINQ                    = 0x88a8
-	ETHERTYPE_RACAL                   = 0x7030
-	ETHERTYPE_RATIONAL                = 0x8150
-	ETHERTYPE_RAWFR                   = 0x6559
-	ETHERTYPE_RCL                     = 0x1995
-	ETHERTYPE_RDP                     = 0x8739
-	ETHERTYPE_RETIX                   = 0x80f2
-	ETHERTYPE_REVARP                  = 0x8035
-	ETHERTYPE_SCA                     = 0x6007
-	ETHERTYPE_SECTRA                  = 0x86db
-	ETHERTYPE_SECUREDATA              = 0x876d
-	ETHERTYPE_SGITW                   = 0x817e
-	ETHERTYPE_SG_BOUNCE               = 0x8016
-	ETHERTYPE_SG_DIAG                 = 0x8013
-	ETHERTYPE_SG_NETGAMES             = 0x8014
-	ETHERTYPE_SG_RESV                 = 0x8015
-	ETHERTYPE_SIMNET                  = 0x5208
-	ETHERTYPE_SLOW                    = 0x8809
-	ETHERTYPE_SNA                     = 0x80d5
-	ETHERTYPE_SNMP                    = 0x814c
-	ETHERTYPE_SONIX                   = 0xfaf5
-	ETHERTYPE_SPIDER                  = 0x809f
-	ETHERTYPE_SPRITE                  = 0x500
-	ETHERTYPE_STP                     = 0x8181
-	ETHERTYPE_TALARIS                 = 0x812b
-	ETHERTYPE_TALARISMC               = 0x852b
-	ETHERTYPE_TCPCOMP                 = 0x876b
-	ETHERTYPE_TCPSM                   = 0x9002
-	ETHERTYPE_TEC                     = 0x814f
-	ETHERTYPE_TIGAN                   = 0x802f
-	ETHERTYPE_TRAIL                   = 0x1000
-	ETHERTYPE_TRANSETHER              = 0x6558
-	ETHERTYPE_TYMSHARE                = 0x802e
-	ETHERTYPE_UBBST                   = 0x7005
-	ETHERTYPE_UBDEBUG                 = 0x900
-	ETHERTYPE_UBDIAGLOOP              = 0x7002
-	ETHERTYPE_UBDL                    = 0x7000
-	ETHERTYPE_UBNIU                   = 0x7001
-	ETHERTYPE_UBNMC                   = 0x7003
-	ETHERTYPE_VALID                   = 0x1600
-	ETHERTYPE_VARIAN                  = 0x80dd
-	ETHERTYPE_VAXELN                  = 0x803b
-	ETHERTYPE_VEECO                   = 0x8067
-	ETHERTYPE_VEXP                    = 0x805b
-	ETHERTYPE_VGLAB                   = 0x8131
-	ETHERTYPE_VINES                   = 0xbad
-	ETHERTYPE_VINESECHO               = 0xbaf
-	ETHERTYPE_VINESLOOP               = 0xbae
-	ETHERTYPE_VITAL                   = 0xff00
-	ETHERTYPE_VLAN                    = 0x8100
-	ETHERTYPE_VLTLMAN                 = 0x8080
-	ETHERTYPE_VPROD                   = 0x805c
-	ETHERTYPE_VURESERVED              = 0x8147
-	ETHERTYPE_WATERLOO                = 0x8130
-	ETHERTYPE_WELLFLEET               = 0x8103
-	ETHERTYPE_X25                     = 0x805
-	ETHERTYPE_X75                     = 0x801
-	ETHERTYPE_XNSSM                   = 0x9001
-	ETHERTYPE_XTP                     = 0x817d
-	ETHER_ADDR_LEN                    = 0x6
-	ETHER_ALIGN                       = 0x2
-	ETHER_CRC_LEN                     = 0x4
-	ETHER_CRC_POLY_BE                 = 0x4c11db6
-	ETHER_CRC_POLY_LE                 = 0xedb88320
-	ETHER_HDR_LEN                     = 0xe
-	ETHER_MAX_DIX_LEN                 = 0x600
-	ETHER_MAX_LEN                     = 0x5ee
-	ETHER_MIN_LEN                     = 0x40
-	ETHER_TYPE_LEN                    = 0x2
-	ETHER_VLAN_ENCAP_LEN              = 0x4
-	EVFILT_AIO                        = -0x3
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x7
-	EVFILT_TIMER                      = -0x7
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0xa
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0x7
-	F_GETOWN                          = 0x5
-	F_OK                              = 0x0
-	F_RDLCK                           = 0x1
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0x8
-	F_SETLKW                          = 0x9
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFA_ROUTE                         = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x8e52
-	IFF_DEBUG                         = 0x4
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_NOTRAILERS                    = 0x20
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PROMISC                       = 0x100
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BLUETOOTH                     = 0xf8
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf7
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DUMMY                         = 0xf1
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ECONET                        = 0xce
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf3
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LINEGROUP                     = 0xd2
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf5
-	IFT_PFLOW                         = 0xf9
-	IFT_PFSYNC                        = 0xf6
-	IFT_PLC                           = 0xae
-	IFT_PON155                        = 0xcf
-	IFT_PON622                        = 0xd0
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPATM                       = 0xc5
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf2
-	IFT_Q2931                         = 0xc9
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SIPSIG                        = 0xcc
-	IFT_SIPTG                         = 0xcb
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TELINK                        = 0xc8
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VIRTUALTG                     = 0xca
-	IFT_VOICEDID                      = 0xd5
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEEMFGD                    = 0xd3
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFGDEANA                  = 0xd4
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERCABLE                = 0xc6
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_HOST                   = 0x1
-	IN_RFC3021_NET                    = 0xfffffffe
-	IN_RFC3021_NSHIFT                 = 0x1f
-	IPPROTO_AH                        = 0x33
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DIVERT_INIT               = 0x2
-	IPPROTO_DIVERT_RESP               = 0x1
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x103
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_UDP                       = 0x11
-	IPV6_AUTH_LEVEL                   = 0x35
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_ESP_NETWORK_LEVEL            = 0x37
-	IPV6_ESP_TRANS_LEVEL              = 0x36
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPCOMP_LEVEL                 = 0x3c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MMTU                         = 0x500
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_OPTIONS                      = 0x1
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PIPEX                        = 0x3f
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVDSTPORT                  = 0x40
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTABLE                       = 0x1021
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_AUTH_LEVEL                     = 0x14
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DIVERTFL                       = 0x1022
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_ESP_NETWORK_LEVEL              = 0x16
-	IP_ESP_TRANS_LEVEL                = 0x15
-	IP_HDRINCL                        = 0x2
-	IP_IPCOMP_LEVEL                   = 0x1d
-	IP_IPSECFLOWINFO                  = 0x24
-	IP_IPSEC_LOCAL_AUTH               = 0x1b
-	IP_IPSEC_LOCAL_CRED               = 0x19
-	IP_IPSEC_LOCAL_ID                 = 0x17
-	IP_IPSEC_REMOTE_AUTH              = 0x1c
-	IP_IPSEC_REMOTE_CRED              = 0x1a
-	IP_IPSEC_REMOTE_ID                = 0x18
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x20
-	IP_MIN_MEMBERSHIPS                = 0xf
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_OFFMASK                        = 0x1fff
-	IP_OPTIONS                        = 0x1
-	IP_PIPEX                          = 0x22
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVDSTPORT                    = 0x21
-	IP_RECVIF                         = 0x1e
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVRTABLE                     = 0x23
-	IP_RECVTTL                        = 0x1f
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RTABLE                         = 0x1021
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LCNT_OVERLOAD_FLUSH               = 0x6
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x6
-	MADV_NORMAL                       = 0x0
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_SPACEAVAIL                   = 0x5
-	MADV_WILLNEED                     = 0x3
-	MAP_ANON                          = 0x1000
-	MAP_COPY                          = 0x4
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_FLAGMASK                      = 0x1ff7
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_INHERIT                       = 0x80
-	MAP_INHERIT_COPY                  = 0x1
-	MAP_INHERIT_DONATE_COPY           = 0x3
-	MAP_INHERIT_NONE                  = 0x2
-	MAP_INHERIT_SHARE                 = 0x0
-	MAP_NOEXTEND                      = 0x100
-	MAP_NORESERVE                     = 0x40
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_SHARED                        = 0x1
-	MAP_TRYFIXED                      = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_BCAST                         = 0x100
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOR                           = 0x8
-	MSG_MCAST                         = 0x200
-	MSG_NOSIGNAL                      = 0x400
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x4
-	MS_SYNC                           = 0x2
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_MAXID                      = 0x6
-	NET_RT_STATS                      = 0x4
-	NET_RT_TABLE                      = 0x5
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EOF                          = 0x2
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRUNCATE                     = 0x80
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x80
-	ONOCR                             = 0x40
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x10000
-	O_CREAT                           = 0x200
-	O_DIRECTORY                       = 0x20000
-	O_DSYNC                           = 0x80
-	O_EXCL                            = 0x800
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_RSYNC                           = 0x80
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PF_FLUSH                          = 0x1
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_LABEL                        = 0xa
-	RTAX_MAX                          = 0xb
-	RTAX_NETMASK                      = 0x2
-	RTAX_SRC                          = 0x8
-	RTAX_SRCMASK                      = 0x9
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_LABEL                         = 0x400
-	RTA_NETMASK                       = 0x4
-	RTA_SRC                           = 0x100
-	RTA_SRCMASK                       = 0x200
-	RTF_ANNOUNCE                      = 0x4000
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_CLONED                        = 0x10000
-	RTF_CLONING                       = 0x100
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x10f808
-	RTF_GATEWAY                       = 0x2
-	RTF_HOST                          = 0x4
-	RTF_LLINFO                        = 0x400
-	RTF_MASK                          = 0x80
-	RTF_MODIFIED                      = 0x20
-	RTF_MPATH                         = 0x40000
-	RTF_MPLS                          = 0x100000
-	RTF_PERMANENT_ARP                 = 0x2000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x2000
-	RTF_REJECT                        = 0x8
-	RTF_SOURCE                        = 0x20000
-	RTF_STATIC                        = 0x800
-	RTF_TUNNEL                        = 0x100000
-	RTF_UP                            = 0x1
-	RTF_USETRAILERS                   = 0x8000
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DESYNC                        = 0x10
-	RTM_GET                           = 0x4
-	RTM_IFANNOUNCE                    = 0xf
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MAXSIZE                       = 0x800
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RT_TABLEID_MAX                    = 0xff
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x4
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80286987
-	SIOCALIFADDR                      = 0x8218691c
-	SIOCATMARK                        = 0x40047307
-	SIOCBRDGADD                       = 0x8058693c
-	SIOCBRDGADDS                      = 0x80586941
-	SIOCBRDGARL                       = 0x806e694d
-	SIOCBRDGDADDR                     = 0x81286947
-	SIOCBRDGDEL                       = 0x8058693d
-	SIOCBRDGDELS                      = 0x80586942
-	SIOCBRDGFLUSH                     = 0x80586948
-	SIOCBRDGFRL                       = 0x806e694e
-	SIOCBRDGGCACHE                    = 0xc0146941
-	SIOCBRDGGFD                       = 0xc0146952
-	SIOCBRDGGHT                       = 0xc0146951
-	SIOCBRDGGIFFLGS                   = 0xc058693e
-	SIOCBRDGGMA                       = 0xc0146953
-	SIOCBRDGGPARAM                    = 0xc0406958
-	SIOCBRDGGPRI                      = 0xc0146950
-	SIOCBRDGGRL                       = 0xc030694f
-	SIOCBRDGGSIFS                     = 0xc058693c
-	SIOCBRDGGTO                       = 0xc0146946
-	SIOCBRDGIFS                       = 0xc0586942
-	SIOCBRDGRTS                       = 0xc0206943
-	SIOCBRDGSADDR                     = 0xc1286944
-	SIOCBRDGSCACHE                    = 0x80146940
-	SIOCBRDGSFD                       = 0x80146952
-	SIOCBRDGSHT                       = 0x80146951
-	SIOCBRDGSIFCOST                   = 0x80586955
-	SIOCBRDGSIFFLGS                   = 0x8058693f
-	SIOCBRDGSIFPRIO                   = 0x80586954
-	SIOCBRDGSMA                       = 0x80146953
-	SIOCBRDGSPRI                      = 0x80146950
-	SIOCBRDGSPROTO                    = 0x8014695a
-	SIOCBRDGSTO                       = 0x80146945
-	SIOCBRDGSTXHC                     = 0x80146959
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80286989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8218691e
-	SIOCGETKALIVE                     = 0xc01869a4
-	SIOCGETLABEL                      = 0x8020699a
-	SIOCGETPFLOW                      = 0xc02069fe
-	SIOCGETPFSYNC                     = 0xc02069f8
-	SIOCGETSGCNT                      = 0xc0207534
-	SIOCGETVIFCNT                     = 0xc0287533
-	SIOCGETVLAN                       = 0xc0206990
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFASYNCMAP                   = 0xc020697c
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCONF                       = 0xc0106924
-	SIOCGIFDATA                       = 0xc020691b
-	SIOCGIFDESCR                      = 0xc0206981
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGATTR                      = 0xc028698b
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc028698a
-	SIOCGIFGROUP                      = 0xc0286988
-	SIOCGIFHARDMTU                    = 0xc02069a5
-	SIOCGIFMEDIA                      = 0xc0306936
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc020697e
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPRIORITY                   = 0xc020699c
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFRDOMAIN                    = 0xc02069a0
-	SIOCGIFRTLABEL                    = 0xc0206983
-	SIOCGIFTIMESLOT                   = 0xc0206986
-	SIOCGIFXFLAGS                     = 0xc020699e
-	SIOCGLIFADDR                      = 0xc218691d
-	SIOCGLIFPHYADDR                   = 0xc218694b
-	SIOCGLIFPHYRTABLE                 = 0xc02069a2
-	SIOCGLIFPHYTTL                    = 0xc02069a9
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGSPPPPARAMS                   = 0xc0206994
-	SIOCGVH                           = 0xc02069f6
-	SIOCGVNETID                       = 0xc02069a7
-	SIOCIFCREATE                      = 0x8020697a
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106978
-	SIOCSETKALIVE                     = 0x801869a3
-	SIOCSETLABEL                      = 0x80206999
-	SIOCSETPFLOW                      = 0x802069fd
-	SIOCSETPFSYNC                     = 0x802069f7
-	SIOCSETVLAN                       = 0x8020698f
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFASYNCMAP                   = 0x8020697d
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFDESCR                      = 0x80206980
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGATTR                      = 0x8028698c
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020691f
-	SIOCSIFMEDIA                      = 0xc0206935
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x8020697f
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPRIORITY                   = 0x8020699b
-	SIOCSIFRDOMAIN                    = 0x8020699f
-	SIOCSIFRTLABEL                    = 0x80206982
-	SIOCSIFTIMESLOT                   = 0x80206985
-	SIOCSIFXFLAGS                     = 0x8020699d
-	SIOCSLIFPHYADDR                   = 0x8218694a
-	SIOCSLIFPHYRTABLE                 = 0x802069a1
-	SIOCSLIFPHYTTL                    = 0x802069a8
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SIOCSSPPPPARAMS                   = 0x80206993
-	SIOCSVH                           = 0xc02069f5
-	SIOCSVNETID                       = 0x802069a6
-	SOCK_DGRAM                        = 0x2
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_BINDANY                        = 0x1000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LINGER                         = 0x80
-	SO_NETPROC                        = 0x1020
-	SO_OOBINLINE                      = 0x100
-	SO_PEERCRED                       = 0x1022
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_RTABLE                         = 0x1021
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_SPLICE                         = 0x1023
-	SO_TIMESTAMP                      = 0x800
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x3
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x4
-	TCP_MSS                           = 0x200
-	TCP_NODELAY                       = 0x1
-	TCP_NOPUSH                        = 0x10
-	TCP_NSTATES                       = 0xb
-	TCP_SACK_ENABLE                   = 0x8
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLAG_CLOCAL                   = 0x2
-	TIOCFLAG_CRTSCTS                  = 0x4
-	TIOCFLAG_MDMBUF                   = 0x8
-	TIOCFLAG_PPS                      = 0x10
-	TIOCFLAG_SOFTCAR                  = 0x1
-	TIOCFLUSH                         = 0x80047410
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGFLAGS                        = 0x4004745d
-	TIOCGPGRP                         = 0x40047477
-	TIOCGSID                          = 0x40047463
-	TIOCGTSTAMP                       = 0x4010745b
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGET                          = 0x4004746a
-	TIOCMODG                          = 0x4004746a
-	TIOCMODS                          = 0x8004746d
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCREMOTE                        = 0x80047469
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSFLAGS                        = 0x8004745c
-	TIOCSIG                           = 0x8004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x80047465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSTSTAMP                       = 0x8008745a
-	TIOCSWINSZ                        = 0x80087467
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WALTSIG                           = 0x4
-	WCONTINUED                        = 0x8
-	WCOREFLAG                         = 0x80
-	WNOHANG                           = 0x1
-	WSTOPPED                          = 0x7f
-	WUNTRACED                         = 0x2
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x30)
-	EADDRNOTAVAIL   = syscall.Errno(0x31)
-	EAFNOSUPPORT    = syscall.Errno(0x2f)
-	EAGAIN          = syscall.Errno(0x23)
-	EALREADY        = syscall.Errno(0x25)
-	EAUTH           = syscall.Errno(0x50)
-	EBADF           = syscall.Errno(0x9)
-	EBADRPC         = syscall.Errno(0x48)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x58)
-	ECHILD          = syscall.Errno(0xa)
-	ECONNABORTED    = syscall.Errno(0x35)
-	ECONNREFUSED    = syscall.Errno(0x3d)
-	ECONNRESET      = syscall.Errno(0x36)
-	EDEADLK         = syscall.Errno(0xb)
-	EDESTADDRREQ    = syscall.Errno(0x27)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x45)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EFTYPE          = syscall.Errno(0x4f)
-	EHOSTDOWN       = syscall.Errno(0x40)
-	EHOSTUNREACH    = syscall.Errno(0x41)
-	EIDRM           = syscall.Errno(0x59)
-	EILSEQ          = syscall.Errno(0x54)
-	EINPROGRESS     = syscall.Errno(0x24)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EIPSEC          = syscall.Errno(0x52)
-	EISCONN         = syscall.Errno(0x38)
-	EISDIR          = syscall.Errno(0x15)
-	ELAST           = syscall.Errno(0x5b)
-	ELOOP           = syscall.Errno(0x3e)
-	EMEDIUMTYPE     = syscall.Errno(0x56)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x28)
-	ENAMETOOLONG    = syscall.Errno(0x3f)
-	ENEEDAUTH       = syscall.Errno(0x51)
-	ENETDOWN        = syscall.Errno(0x32)
-	ENETRESET       = syscall.Errno(0x34)
-	ENETUNREACH     = syscall.Errno(0x33)
-	ENFILE          = syscall.Errno(0x17)
-	ENOATTR         = syscall.Errno(0x53)
-	ENOBUFS         = syscall.Errno(0x37)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x4d)
-	ENOMEDIUM       = syscall.Errno(0x55)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x5a)
-	ENOPROTOOPT     = syscall.Errno(0x2a)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSYS          = syscall.Errno(0x4e)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x39)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x42)
-	ENOTSOCK        = syscall.Errno(0x26)
-	ENOTSUP         = syscall.Errno(0x5b)
-	ENOTTY          = syscall.Errno(0x19)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x2d)
-	EOVERFLOW       = syscall.Errno(0x57)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x2e)
-	EPIPE           = syscall.Errno(0x20)
-	EPROCLIM        = syscall.Errno(0x43)
-	EPROCUNAVAIL    = syscall.Errno(0x4c)
-	EPROGMISMATCH   = syscall.Errno(0x4b)
-	EPROGUNAVAIL    = syscall.Errno(0x4a)
-	EPROTONOSUPPORT = syscall.Errno(0x2b)
-	EPROTOTYPE      = syscall.Errno(0x29)
-	ERANGE          = syscall.Errno(0x22)
-	EREMOTE         = syscall.Errno(0x47)
-	EROFS           = syscall.Errno(0x1e)
-	ERPCMISMATCH    = syscall.Errno(0x49)
-	ESHUTDOWN       = syscall.Errno(0x3a)
-	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESTALE          = syscall.Errno(0x46)
-	ETIMEDOUT       = syscall.Errno(0x3c)
-	ETOOMANYREFS    = syscall.Errno(0x3b)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUSERS          = syscall.Errno(0x44)
-	EWOULDBLOCK     = syscall.Errno(0x23)
-	EXDEV           = syscall.Errno(0x12)
-)
-
-// Signals
-const (
-	SIGABRT   = syscall.Signal(0x6)
-	SIGALRM   = syscall.Signal(0xe)
-	SIGBUS    = syscall.Signal(0xa)
-	SIGCHLD   = syscall.Signal(0x14)
-	SIGCONT   = syscall.Signal(0x13)
-	SIGEMT    = syscall.Signal(0x7)
-	SIGFPE    = syscall.Signal(0x8)
-	SIGHUP    = syscall.Signal(0x1)
-	SIGILL    = syscall.Signal(0x4)
-	SIGINFO   = syscall.Signal(0x1d)
-	SIGINT    = syscall.Signal(0x2)
-	SIGIO     = syscall.Signal(0x17)
-	SIGIOT    = syscall.Signal(0x6)
-	SIGKILL   = syscall.Signal(0x9)
-	SIGPIPE   = syscall.Signal(0xd)
-	SIGPROF   = syscall.Signal(0x1b)
-	SIGQUIT   = syscall.Signal(0x3)
-	SIGSEGV   = syscall.Signal(0xb)
-	SIGSTOP   = syscall.Signal(0x11)
-	SIGSYS    = syscall.Signal(0xc)
-	SIGTERM   = syscall.Signal(0xf)
-	SIGTHR    = syscall.Signal(0x20)
-	SIGTRAP   = syscall.Signal(0x5)
-	SIGTSTP   = syscall.Signal(0x12)
-	SIGTTIN   = syscall.Signal(0x15)
-	SIGTTOU   = syscall.Signal(0x16)
-	SIGURG    = syscall.Signal(0x10)
-	SIGUSR1   = syscall.Signal(0x1e)
-	SIGUSR2   = syscall.Signal(0x1f)
-	SIGVTALRM = syscall.Signal(0x1a)
-	SIGWINCH  = syscall.Signal(0x1c)
-	SIGXCPU   = syscall.Signal(0x18)
-	SIGXFSZ   = syscall.Signal(0x19)
-)
-
-// Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "IPsec processing failure",
-	83: "attribute not found",
-	84: "illegal byte sequence",
-	85: "no medium found",
-	86: "wrong medium type",
-	87: "value too large to be stored in data type",
-	88: "operation canceled",
-	89: "identifier removed",
-	90: "no message of desired type",
-	91: "not supported",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "thread AST",
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
deleted file mode 100644
index a08922b981..0000000000
--- a/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
+++ /dev/null
@@ -1,1436 +0,0 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build amd64,solaris
-
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
-
-package unix
-
-import "syscall"
-
-const (
-	AF_802                        = 0x12
-	AF_APPLETALK                  = 0x10
-	AF_CCITT                      = 0xa
-	AF_CHAOS                      = 0x5
-	AF_DATAKIT                    = 0x9
-	AF_DECnet                     = 0xc
-	AF_DLI                        = 0xd
-	AF_ECMA                       = 0x8
-	AF_FILE                       = 0x1
-	AF_GOSIP                      = 0x16
-	AF_HYLINK                     = 0xf
-	AF_IMPLINK                    = 0x3
-	AF_INET                       = 0x2
-	AF_INET6                      = 0x1a
-	AF_INET_OFFLOAD               = 0x1e
-	AF_IPX                        = 0x17
-	AF_KEY                        = 0x1b
-	AF_LAT                        = 0xe
-	AF_LINK                       = 0x19
-	AF_LOCAL                      = 0x1
-	AF_MAX                        = 0x20
-	AF_NBS                        = 0x7
-	AF_NCA                        = 0x1c
-	AF_NIT                        = 0x11
-	AF_NS                         = 0x6
-	AF_OSI                        = 0x13
-	AF_OSINET                     = 0x15
-	AF_PACKET                     = 0x20
-	AF_POLICY                     = 0x1d
-	AF_PUP                        = 0x4
-	AF_ROUTE                      = 0x18
-	AF_SNA                        = 0xb
-	AF_TRILL                      = 0x1f
-	AF_UNIX                       = 0x1
-	AF_UNSPEC                     = 0x0
-	AF_X25                        = 0x14
-	ARPHRD_ARCNET                 = 0x7
-	ARPHRD_ATM                    = 0x10
-	ARPHRD_AX25                   = 0x3
-	ARPHRD_CHAOS                  = 0x5
-	ARPHRD_EETHER                 = 0x2
-	ARPHRD_ETHER                  = 0x1
-	ARPHRD_FC                     = 0x12
-	ARPHRD_FRAME                  = 0xf
-	ARPHRD_HDLC                   = 0x11
-	ARPHRD_IB                     = 0x20
-	ARPHRD_IEEE802                = 0x6
-	ARPHRD_IPATM                  = 0x13
-	ARPHRD_METRICOM               = 0x17
-	ARPHRD_TUNNEL                 = 0x1f
-	B0                            = 0x0
-	B110                          = 0x3
-	B115200                       = 0x12
-	B1200                         = 0x9
-	B134                          = 0x4
-	B150                          = 0x5
-	B153600                       = 0x13
-	B1800                         = 0xa
-	B19200                        = 0xe
-	B200                          = 0x6
-	B230400                       = 0x14
-	B2400                         = 0xb
-	B300                          = 0x7
-	B307200                       = 0x15
-	B38400                        = 0xf
-	B460800                       = 0x16
-	B4800                         = 0xc
-	B50                           = 0x1
-	B57600                        = 0x10
-	B600                          = 0x8
-	B75                           = 0x2
-	B76800                        = 0x11
-	B921600                       = 0x17
-	B9600                         = 0xd
-	BIOCFLUSH                     = 0x20004268
-	BIOCGBLEN                     = 0x40044266
-	BIOCGDLT                      = 0x4004426a
-	BIOCGDLTLIST                  = -0x3fefbd89
-	BIOCGDLTLIST32                = -0x3ff7bd89
-	BIOCGETIF                     = 0x4020426b
-	BIOCGETLIF                    = 0x4078426b
-	BIOCGHDRCMPLT                 = 0x40044274
-	BIOCGRTIMEOUT                 = 0x4010427b
-	BIOCGRTIMEOUT32               = 0x4008427b
-	BIOCGSEESENT                  = 0x40044278
-	BIOCGSTATS                    = 0x4080426f
-	BIOCGSTATSOLD                 = 0x4008426f
-	BIOCIMMEDIATE                 = -0x7ffbbd90
-	BIOCPROMISC                   = 0x20004269
-	BIOCSBLEN                     = -0x3ffbbd9a
-	BIOCSDLT                      = -0x7ffbbd8a
-	BIOCSETF                      = -0x7fefbd99
-	BIOCSETF32                    = -0x7ff7bd99
-	BIOCSETIF                     = -0x7fdfbd94
-	BIOCSETLIF                    = -0x7f87bd94
-	BIOCSHDRCMPLT                 = -0x7ffbbd8b
-	BIOCSRTIMEOUT                 = -0x7fefbd86
-	BIOCSRTIMEOUT32               = -0x7ff7bd86
-	BIOCSSEESENT                  = -0x7ffbbd87
-	BIOCSTCPF                     = -0x7fefbd8e
-	BIOCSUDPF                     = -0x7fefbd8d
-	BIOCVERSION                   = 0x40044271
-	BPF_A                         = 0x10
-	BPF_ABS                       = 0x20
-	BPF_ADD                       = 0x0
-	BPF_ALIGNMENT                 = 0x4
-	BPF_ALU                       = 0x4
-	BPF_AND                       = 0x50
-	BPF_B                         = 0x10
-	BPF_DFLTBUFSIZE               = 0x100000
-	BPF_DIV                       = 0x30
-	BPF_H                         = 0x8
-	BPF_IMM                       = 0x0
-	BPF_IND                       = 0x40
-	BPF_JA                        = 0x0
-	BPF_JEQ                       = 0x10
-	BPF_JGE                       = 0x30
-	BPF_JGT                       = 0x20
-	BPF_JMP                       = 0x5
-	BPF_JSET                      = 0x40
-	BPF_K                         = 0x0
-	BPF_LD                        = 0x0
-	BPF_LDX                       = 0x1
-	BPF_LEN                       = 0x80
-	BPF_LSH                       = 0x60
-	BPF_MAJOR_VERSION             = 0x1
-	BPF_MAXBUFSIZE                = 0x1000000
-	BPF_MAXINSNS                  = 0x200
-	BPF_MEM                       = 0x60
-	BPF_MEMWORDS                  = 0x10
-	BPF_MINBUFSIZE                = 0x20
-	BPF_MINOR_VERSION             = 0x1
-	BPF_MISC                      = 0x7
-	BPF_MSH                       = 0xa0
-	BPF_MUL                       = 0x20
-	BPF_NEG                       = 0x80
-	BPF_OR                        = 0x40
-	BPF_RELEASE                   = 0x30bb6
-	BPF_RET                       = 0x6
-	BPF_RSH                       = 0x70
-	BPF_ST                        = 0x2
-	BPF_STX                       = 0x3
-	BPF_SUB                       = 0x10
-	BPF_TAX                       = 0x0
-	BPF_TXA                       = 0x80
-	BPF_W                         = 0x0
-	BPF_X                         = 0x8
-	BRKINT                        = 0x2
-	CFLUSH                        = 0xf
-	CLOCAL                        = 0x800
-	CLOCK_HIGHRES                 = 0x4
-	CLOCK_LEVEL                   = 0xa
-	CLOCK_MONOTONIC               = 0x4
-	CLOCK_PROCESS_CPUTIME_ID      = 0x5
-	CLOCK_PROF                    = 0x2
-	CLOCK_REALTIME                = 0x3
-	CLOCK_THREAD_CPUTIME_ID       = 0x2
-	CLOCK_VIRTUAL                 = 0x1
-	CREAD                         = 0x80
-	CS5                           = 0x0
-	CS6                           = 0x10
-	CS7                           = 0x20
-	CS8                           = 0x30
-	CSIZE                         = 0x30
-	CSTART                        = 0x11
-	CSTATUS                       = 0x14
-	CSTOP                         = 0x13
-	CSTOPB                        = 0x40
-	CSUSP                         = 0x1a
-	CSWTCH                        = 0x1a
-	DLT_AIRONET_HEADER            = 0x78
-	DLT_APPLE_IP_OVER_IEEE1394    = 0x8a
-	DLT_ARCNET                    = 0x7
-	DLT_ARCNET_LINUX              = 0x81
-	DLT_ATM_CLIP                  = 0x13
-	DLT_ATM_RFC1483               = 0xb
-	DLT_AURORA                    = 0x7e
-	DLT_AX25                      = 0x3
-	DLT_BACNET_MS_TP              = 0xa5
-	DLT_CHAOS                     = 0x5
-	DLT_CISCO_IOS                 = 0x76
-	DLT_C_HDLC                    = 0x68
-	DLT_DOCSIS                    = 0x8f
-	DLT_ECONET                    = 0x73
-	DLT_EN10MB                    = 0x1
-	DLT_EN3MB                     = 0x2
-	DLT_ENC                       = 0x6d
-	DLT_ERF_ETH                   = 0xaf
-	DLT_ERF_POS                   = 0xb0
-	DLT_FDDI                      = 0xa
-	DLT_FRELAY                    = 0x6b
-	DLT_GCOM_SERIAL               = 0xad
-	DLT_GCOM_T1E1                 = 0xac
-	DLT_GPF_F                     = 0xab
-	DLT_GPF_T                     = 0xaa
-	DLT_GPRS_LLC                  = 0xa9
-	DLT_HDLC                      = 0x10
-	DLT_HHDLC                     = 0x79
-	DLT_HIPPI                     = 0xf
-	DLT_IBM_SN                    = 0x92
-	DLT_IBM_SP                    = 0x91
-	DLT_IEEE802                   = 0x6
-	DLT_IEEE802_11                = 0x69
-	DLT_IEEE802_11_RADIO          = 0x7f
-	DLT_IEEE802_11_RADIO_AVS      = 0xa3
-	DLT_IPNET                     = 0xe2
-	DLT_IPOIB                     = 0xa2
-	DLT_IP_OVER_FC                = 0x7a
-	DLT_JUNIPER_ATM1              = 0x89
-	DLT_JUNIPER_ATM2              = 0x87
-	DLT_JUNIPER_CHDLC             = 0xb5
-	DLT_JUNIPER_ES                = 0x84
-	DLT_JUNIPER_ETHER             = 0xb2
-	DLT_JUNIPER_FRELAY            = 0xb4
-	DLT_JUNIPER_GGSN              = 0x85
-	DLT_JUNIPER_MFR               = 0x86
-	DLT_JUNIPER_MLFR              = 0x83
-	DLT_JUNIPER_MLPPP             = 0x82
-	DLT_JUNIPER_MONITOR           = 0xa4
-	DLT_JUNIPER_PIC_PEER          = 0xae
-	DLT_JUNIPER_PPP               = 0xb3
-	DLT_JUNIPER_PPPOE             = 0xa7
-	DLT_JUNIPER_PPPOE_ATM         = 0xa8
-	DLT_JUNIPER_SERVICES          = 0x88
-	DLT_LINUX_IRDA                = 0x90
-	DLT_LINUX_LAPD                = 0xb1
-	DLT_LINUX_SLL                 = 0x71
-	DLT_LOOP                      = 0x6c
-	DLT_LTALK                     = 0x72
-	DLT_MTP2                      = 0x8c
-	DLT_MTP2_WITH_PHDR            = 0x8b
-	DLT_MTP3                      = 0x8d
-	DLT_NULL                      = 0x0
-	DLT_PCI_EXP                   = 0x7d
-	DLT_PFLOG                     = 0x75
-	DLT_PFSYNC                    = 0x12
-	DLT_PPP                       = 0x9
-	DLT_PPP_BSDOS                 = 0xe
-	DLT_PPP_PPPD                  = 0xa6
-	DLT_PRISM_HEADER              = 0x77
-	DLT_PRONET                    = 0x4
-	DLT_RAW                       = 0xc
-	DLT_RAWAF_MASK                = 0x2240000
-	DLT_RIO                       = 0x7c
-	DLT_SCCP                      = 0x8e
-	DLT_SLIP                      = 0x8
-	DLT_SLIP_BSDOS                = 0xd
-	DLT_SUNATM                    = 0x7b
-	DLT_SYMANTEC_FIREWALL         = 0x63
-	DLT_TZSP                      = 0x80
-	ECHO                          = 0x8
-	ECHOCTL                       = 0x200
-	ECHOE                         = 0x10
-	ECHOK                         = 0x20
-	ECHOKE                        = 0x800
-	ECHONL                        = 0x40
-	ECHOPRT                       = 0x400
-	EMPTY_SET                     = 0x0
-	EMT_CPCOVF                    = 0x1
-	EQUALITY_CHECK                = 0x0
-	EXTA                          = 0xe
-	EXTB                          = 0xf
-	FD_CLOEXEC                    = 0x1
-	FD_NFDBITS                    = 0x40
-	FD_SETSIZE                    = 0x10000
-	FLUSHALL                      = 0x1
-	FLUSHDATA                     = 0x0
-	FLUSHO                        = 0x2000
-	F_ALLOCSP                     = 0xa
-	F_ALLOCSP64                   = 0xa
-	F_BADFD                       = 0x2e
-	F_BLKSIZE                     = 0x13
-	F_BLOCKS                      = 0x12
-	F_CHKFL                       = 0x8
-	F_COMPAT                      = 0x8
-	F_DUP2FD                      = 0x9
-	F_DUP2FD_CLOEXEC              = 0x24
-	F_DUPFD                       = 0x0
-	F_DUPFD_CLOEXEC               = 0x25
-	F_FREESP                      = 0xb
-	F_FREESP64                    = 0xb
-	F_GETFD                       = 0x1
-	F_GETFL                       = 0x3
-	F_GETLK                       = 0xe
-	F_GETLK64                     = 0xe
-	F_GETOWN                      = 0x17
-	F_GETXFL                      = 0x2d
-	F_HASREMOTELOCKS              = 0x1a
-	F_ISSTREAM                    = 0xd
-	F_MANDDNY                     = 0x10
-	F_MDACC                       = 0x20
-	F_NODNY                       = 0x0
-	F_NPRIV                       = 0x10
-	F_PRIV                        = 0xf
-	F_QUOTACTL                    = 0x11
-	F_RDACC                       = 0x1
-	F_RDDNY                       = 0x1
-	F_RDLCK                       = 0x1
-	F_REVOKE                      = 0x19
-	F_RMACC                       = 0x4
-	F_RMDNY                       = 0x4
-	F_RWACC                       = 0x3
-	F_RWDNY                       = 0x3
-	F_SETFD                       = 0x2
-	F_SETFL                       = 0x4
-	F_SETLK                       = 0x6
-	F_SETLK64                     = 0x6
-	F_SETLK64_NBMAND              = 0x2a
-	F_SETLKW                      = 0x7
-	F_SETLKW64                    = 0x7
-	F_SETLK_NBMAND                = 0x2a
-	F_SETOWN                      = 0x18
-	F_SHARE                       = 0x28
-	F_SHARE_NBMAND                = 0x2b
-	F_UNLCK                       = 0x3
-	F_UNLKSYS                     = 0x4
-	F_UNSHARE                     = 0x29
-	F_WRACC                       = 0x2
-	F_WRDNY                       = 0x2
-	F_WRLCK                       = 0x2
-	HUPCL                         = 0x400
-	ICANON                        = 0x2
-	ICRNL                         = 0x100
-	IEXTEN                        = 0x8000
-	IFF_ADDRCONF                  = 0x80000
-	IFF_ALLMULTI                  = 0x200
-	IFF_ANYCAST                   = 0x400000
-	IFF_BROADCAST                 = 0x2
-	IFF_CANTCHANGE                = 0x7f203003b5a
-	IFF_COS_ENABLED               = 0x200000000
-	IFF_DEBUG                     = 0x4
-	IFF_DEPRECATED                = 0x40000
-	IFF_DHCPRUNNING               = 0x4000
-	IFF_DUPLICATE                 = 0x4000000000
-	IFF_FAILED                    = 0x10000000
-	IFF_FIXEDMTU                  = 0x1000000000
-	IFF_INACTIVE                  = 0x40000000
-	IFF_INTELLIGENT               = 0x400
-	IFF_IPMP                      = 0x8000000000
-	IFF_IPMP_CANTCHANGE           = 0x10000000
-	IFF_IPMP_INVALID              = 0x1ec200080
-	IFF_IPV4                      = 0x1000000
-	IFF_IPV6                      = 0x2000000
-	IFF_L3PROTECT                 = 0x40000000000
-	IFF_LOOPBACK                  = 0x8
-	IFF_MULTICAST                 = 0x800
-	IFF_MULTI_BCAST               = 0x1000
-	IFF_NOACCEPT                  = 0x4000000
-	IFF_NOARP                     = 0x80
-	IFF_NOFAILOVER                = 0x8000000
-	IFF_NOLINKLOCAL               = 0x20000000000
-	IFF_NOLOCAL                   = 0x20000
-	IFF_NONUD                     = 0x200000
-	IFF_NORTEXCH                  = 0x800000
-	IFF_NOTRAILERS                = 0x20
-	IFF_NOXMIT                    = 0x10000
-	IFF_OFFLINE                   = 0x80000000
-	IFF_POINTOPOINT               = 0x10
-	IFF_PREFERRED                 = 0x400000000
-	IFF_PRIVATE                   = 0x8000
-	IFF_PROMISC                   = 0x100
-	IFF_ROUTER                    = 0x100000
-	IFF_RUNNING                   = 0x40
-	IFF_STANDBY                   = 0x20000000
-	IFF_TEMPORARY                 = 0x800000000
-	IFF_UNNUMBERED                = 0x2000
-	IFF_UP                        = 0x1
-	IFF_VIRTUAL                   = 0x2000000000
-	IFF_VRRP                      = 0x10000000000
-	IFF_XRESOLV                   = 0x100000000
-	IFNAMSIZ                      = 0x10
-	IFT_1822                      = 0x2
-	IFT_6TO4                      = 0xca
-	IFT_AAL5                      = 0x31
-	IFT_ARCNET                    = 0x23
-	IFT_ARCNETPLUS                = 0x24
-	IFT_ATM                       = 0x25
-	IFT_CEPT                      = 0x13
-	IFT_DS3                       = 0x1e
-	IFT_EON                       = 0x19
-	IFT_ETHER                     = 0x6
-	IFT_FDDI                      = 0xf
-	IFT_FRELAY                    = 0x20
-	IFT_FRELAYDCE                 = 0x2c
-	IFT_HDH1822                   = 0x3
-	IFT_HIPPI                     = 0x2f
-	IFT_HSSI                      = 0x2e
-	IFT_HY                        = 0xe
-	IFT_IB                        = 0xc7
-	IFT_IPV4                      = 0xc8
-	IFT_IPV6                      = 0xc9
-	IFT_ISDNBASIC                 = 0x14
-	IFT_ISDNPRIMARY               = 0x15
-	IFT_ISO88022LLC               = 0x29
-	IFT_ISO88023                  = 0x7
-	IFT_ISO88024                  = 0x8
-	IFT_ISO88025                  = 0x9
-	IFT_ISO88026                  = 0xa
-	IFT_LAPB                      = 0x10
-	IFT_LOCALTALK                 = 0x2a
-	IFT_LOOP                      = 0x18
-	IFT_MIOX25                    = 0x26
-	IFT_MODEM                     = 0x30
-	IFT_NSIP                      = 0x1b
-	IFT_OTHER                     = 0x1
-	IFT_P10                       = 0xc
-	IFT_P80                       = 0xd
-	IFT_PARA                      = 0x22
-	IFT_PPP                       = 0x17
-	IFT_PROPMUX                   = 0x36
-	IFT_PROPVIRTUAL               = 0x35
-	IFT_PTPSERIAL                 = 0x16
-	IFT_RS232                     = 0x21
-	IFT_SDLC                      = 0x11
-	IFT_SIP                       = 0x1f
-	IFT_SLIP                      = 0x1c
-	IFT_SMDSDXI                   = 0x2b
-	IFT_SMDSICIP                  = 0x34
-	IFT_SONET                     = 0x27
-	IFT_SONETPATH                 = 0x32
-	IFT_SONETVT                   = 0x33
-	IFT_STARLAN                   = 0xb
-	IFT_T1                        = 0x12
-	IFT_ULTRA                     = 0x1d
-	IFT_V35                       = 0x2d
-	IFT_X25                       = 0x5
-	IFT_X25DDN                    = 0x4
-	IFT_X25PLE                    = 0x28
-	IFT_XETHER                    = 0x1a
-	IGNBRK                        = 0x1
-	IGNCR                         = 0x80
-	IGNPAR                        = 0x4
-	IMAXBEL                       = 0x2000
-	INLCR                         = 0x40
-	INPCK                         = 0x10
-	IN_AUTOCONF_MASK              = 0xffff0000
-	IN_AUTOCONF_NET               = 0xa9fe0000
-	IN_CLASSA_HOST                = 0xffffff
-	IN_CLASSA_MAX                 = 0x80
-	IN_CLASSA_NET                 = 0xff000000
-	IN_CLASSA_NSHIFT              = 0x18
-	IN_CLASSB_HOST                = 0xffff
-	IN_CLASSB_MAX                 = 0x10000
-	IN_CLASSB_NET                 = 0xffff0000
-	IN_CLASSB_NSHIFT              = 0x10
-	IN_CLASSC_HOST                = 0xff
-	IN_CLASSC_NET                 = 0xffffff00
-	IN_CLASSC_NSHIFT              = 0x8
-	IN_CLASSD_HOST                = 0xfffffff
-	IN_CLASSD_NET                 = 0xf0000000
-	IN_CLASSD_NSHIFT              = 0x1c
-	IN_CLASSE_NET                 = 0xffffffff
-	IN_LOOPBACKNET                = 0x7f
-	IN_PRIVATE12_MASK             = 0xfff00000
-	IN_PRIVATE12_NET              = 0xac100000
-	IN_PRIVATE16_MASK             = 0xffff0000
-	IN_PRIVATE16_NET              = 0xc0a80000
-	IN_PRIVATE8_MASK              = 0xff000000
-	IN_PRIVATE8_NET               = 0xa000000
-	IPPROTO_AH                    = 0x33
-	IPPROTO_DSTOPTS               = 0x3c
-	IPPROTO_EGP                   = 0x8
-	IPPROTO_ENCAP                 = 0x4
-	IPPROTO_EON                   = 0x50
-	IPPROTO_ESP                   = 0x32
-	IPPROTO_FRAGMENT              = 0x2c
-	IPPROTO_GGP                   = 0x3
-	IPPROTO_HELLO                 = 0x3f
-	IPPROTO_HOPOPTS               = 0x0
-	IPPROTO_ICMP                  = 0x1
-	IPPROTO_ICMPV6                = 0x3a
-	IPPROTO_IDP                   = 0x16
-	IPPROTO_IGMP                  = 0x2
-	IPPROTO_IP                    = 0x0
-	IPPROTO_IPV6                  = 0x29
-	IPPROTO_MAX                   = 0x100
-	IPPROTO_ND                    = 0x4d
-	IPPROTO_NONE                  = 0x3b
-	IPPROTO_OSPF                  = 0x59
-	IPPROTO_PIM                   = 0x67
-	IPPROTO_PUP                   = 0xc
-	IPPROTO_RAW                   = 0xff
-	IPPROTO_ROUTING               = 0x2b
-	IPPROTO_RSVP                  = 0x2e
-	IPPROTO_SCTP                  = 0x84
-	IPPROTO_TCP                   = 0x6
-	IPPROTO_UDP                   = 0x11
-	IPV6_ADD_MEMBERSHIP           = 0x9
-	IPV6_BOUND_IF                 = 0x41
-	IPV6_CHECKSUM                 = 0x18
-	IPV6_DONTFRAG                 = 0x21
-	IPV6_DROP_MEMBERSHIP          = 0xa
-	IPV6_DSTOPTS                  = 0xf
-	IPV6_FLOWINFO_FLOWLABEL       = 0xffff0f00
-	IPV6_FLOWINFO_TCLASS          = 0xf00f
-	IPV6_HOPLIMIT                 = 0xc
-	IPV6_HOPOPTS                  = 0xe
-	IPV6_JOIN_GROUP               = 0x9
-	IPV6_LEAVE_GROUP              = 0xa
-	IPV6_MULTICAST_HOPS           = 0x7
-	IPV6_MULTICAST_IF             = 0x6
-	IPV6_MULTICAST_LOOP           = 0x8
-	IPV6_NEXTHOP                  = 0xd
-	IPV6_PAD1_OPT                 = 0x0
-	IPV6_PATHMTU                  = 0x25
-	IPV6_PKTINFO                  = 0xb
-	IPV6_PREFER_SRC_CGA           = 0x20
-	IPV6_PREFER_SRC_CGADEFAULT    = 0x10
-	IPV6_PREFER_SRC_CGAMASK       = 0x30
-	IPV6_PREFER_SRC_COA           = 0x2
-	IPV6_PREFER_SRC_DEFAULT       = 0x15
-	IPV6_PREFER_SRC_HOME          = 0x1
-	IPV6_PREFER_SRC_MASK          = 0x3f
-	IPV6_PREFER_SRC_MIPDEFAULT    = 0x1
-	IPV6_PREFER_SRC_MIPMASK       = 0x3
-	IPV6_PREFER_SRC_NONCGA        = 0x10
-	IPV6_PREFER_SRC_PUBLIC        = 0x4
-	IPV6_PREFER_SRC_TMP           = 0x8
-	IPV6_PREFER_SRC_TMPDEFAULT    = 0x4
-	IPV6_PREFER_SRC_TMPMASK       = 0xc
-	IPV6_RECVDSTOPTS              = 0x28
-	IPV6_RECVHOPLIMIT             = 0x13
-	IPV6_RECVHOPOPTS              = 0x14
-	IPV6_RECVPATHMTU              = 0x24
-	IPV6_RECVPKTINFO              = 0x12
-	IPV6_RECVRTHDR                = 0x16
-	IPV6_RECVRTHDRDSTOPTS         = 0x17
-	IPV6_RECVTCLASS               = 0x19
-	IPV6_RTHDR                    = 0x10
-	IPV6_RTHDRDSTOPTS             = 0x11
-	IPV6_RTHDR_TYPE_0             = 0x0
-	IPV6_SEC_OPT                  = 0x22
-	IPV6_SRC_PREFERENCES          = 0x23
-	IPV6_TCLASS                   = 0x26
-	IPV6_UNICAST_HOPS             = 0x5
-	IPV6_UNSPEC_SRC               = 0x42
-	IPV6_USE_MIN_MTU              = 0x20
-	IPV6_V6ONLY                   = 0x27
-	IP_ADD_MEMBERSHIP             = 0x13
-	IP_ADD_SOURCE_MEMBERSHIP      = 0x17
-	IP_BLOCK_SOURCE               = 0x15
-	IP_BOUND_IF                   = 0x41
-	IP_BROADCAST                  = 0x106
-	IP_BROADCAST_TTL              = 0x43
-	IP_DEFAULT_MULTICAST_LOOP     = 0x1
-	IP_DEFAULT_MULTICAST_TTL      = 0x1
-	IP_DF                         = 0x4000
-	IP_DHCPINIT_IF                = 0x45
-	IP_DONTFRAG                   = 0x1b
-	IP_DONTROUTE                  = 0x105
-	IP_DROP_MEMBERSHIP            = 0x14
-	IP_DROP_SOURCE_MEMBERSHIP     = 0x18
-	IP_HDRINCL                    = 0x2
-	IP_MAXPACKET                  = 0xffff
-	IP_MF                         = 0x2000
-	IP_MSS                        = 0x240
-	IP_MULTICAST_IF               = 0x10
-	IP_MULTICAST_LOOP             = 0x12
-	IP_MULTICAST_TTL              = 0x11
-	IP_NEXTHOP                    = 0x19
-	IP_OPTIONS                    = 0x1
-	IP_PKTINFO                    = 0x1a
-	IP_RECVDSTADDR                = 0x7
-	IP_RECVIF                     = 0x9
-	IP_RECVOPTS                   = 0x5
-	IP_RECVPKTINFO                = 0x1a
-	IP_RECVRETOPTS                = 0x6
-	IP_RECVSLLA                   = 0xa
-	IP_RECVTTL                    = 0xb
-	IP_RETOPTS                    = 0x8
-	IP_REUSEADDR                  = 0x104
-	IP_SEC_OPT                    = 0x22
-	IP_TOS                        = 0x3
-	IP_TTL                        = 0x4
-	IP_UNBLOCK_SOURCE             = 0x16
-	IP_UNSPEC_SRC                 = 0x42
-	ISIG                          = 0x1
-	ISTRIP                        = 0x20
-	IXANY                         = 0x800
-	IXOFF                         = 0x1000
-	IXON                          = 0x400
-	MADV_ACCESS_DEFAULT           = 0x6
-	MADV_ACCESS_LWP               = 0x7
-	MADV_ACCESS_MANY              = 0x8
-	MADV_DONTNEED                 = 0x4
-	MADV_FREE                     = 0x5
-	MADV_NORMAL                   = 0x0
-	MADV_RANDOM                   = 0x1
-	MADV_SEQUENTIAL               = 0x2
-	MADV_WILLNEED                 = 0x3
-	MAP_32BIT                     = 0x80
-	MAP_ALIGN                     = 0x200
-	MAP_ANON                      = 0x100
-	MAP_ANONYMOUS                 = 0x100
-	MAP_FIXED                     = 0x10
-	MAP_INITDATA                  = 0x800
-	MAP_NORESERVE                 = 0x40
-	MAP_PRIVATE                   = 0x2
-	MAP_RENAME                    = 0x20
-	MAP_SHARED                    = 0x1
-	MAP_TEXT                      = 0x400
-	MAP_TYPE                      = 0xf
-	MCL_CURRENT                   = 0x1
-	MCL_FUTURE                    = 0x2
-	MSG_CTRUNC                    = 0x10
-	MSG_DONTROUTE                 = 0x4
-	MSG_DONTWAIT                  = 0x80
-	MSG_DUPCTRL                   = 0x800
-	MSG_EOR                       = 0x8
-	MSG_MAXIOVLEN                 = 0x10
-	MSG_NOTIFICATION              = 0x100
-	MSG_OOB                       = 0x1
-	MSG_PEEK                      = 0x2
-	MSG_TRUNC                     = 0x20
-	MSG_WAITALL                   = 0x40
-	MSG_XPG4_2                    = 0x8000
-	MS_ASYNC                      = 0x1
-	MS_INVALIDATE                 = 0x2
-	MS_OLDSYNC                    = 0x0
-	MS_SYNC                       = 0x4
-	M_FLUSH                       = 0x86
-	NOFLSH                        = 0x80
-	OCRNL                         = 0x8
-	OFDEL                         = 0x80
-	OFILL                         = 0x40
-	ONLCR                         = 0x4
-	ONLRET                        = 0x20
-	ONOCR                         = 0x10
-	OPENFAIL                      = -0x1
-	OPOST                         = 0x1
-	O_ACCMODE                     = 0x600003
-	O_APPEND                      = 0x8
-	O_CLOEXEC                     = 0x800000
-	O_CREAT                       = 0x100
-	O_DSYNC                       = 0x40
-	O_EXCL                        = 0x400
-	O_EXEC                        = 0x400000
-	O_LARGEFILE                   = 0x2000
-	O_NDELAY                      = 0x4
-	O_NOCTTY                      = 0x800
-	O_NOFOLLOW                    = 0x20000
-	O_NOLINKS                     = 0x40000
-	O_NONBLOCK                    = 0x80
-	O_RDONLY                      = 0x0
-	O_RDWR                        = 0x2
-	O_RSYNC                       = 0x8000
-	O_SEARCH                      = 0x200000
-	O_SIOCGIFCONF                 = -0x3ff796ec
-	O_SIOCGLIFCONF                = -0x3fef9688
-	O_SYNC                        = 0x10
-	O_TRUNC                       = 0x200
-	O_WRONLY                      = 0x1
-	O_XATTR                       = 0x4000
-	PARENB                        = 0x100
-	PAREXT                        = 0x100000
-	PARMRK                        = 0x8
-	PARODD                        = 0x200
-	PENDIN                        = 0x4000
-	PRIO_PGRP                     = 0x1
-	PRIO_PROCESS                  = 0x0
-	PRIO_USER                     = 0x2
-	PROT_EXEC                     = 0x4
-	PROT_NONE                     = 0x0
-	PROT_READ                     = 0x1
-	PROT_WRITE                    = 0x2
-	RLIMIT_AS                     = 0x6
-	RLIMIT_CORE                   = 0x4
-	RLIMIT_CPU                    = 0x0
-	RLIMIT_DATA                   = 0x2
-	RLIMIT_FSIZE                  = 0x1
-	RLIMIT_NOFILE                 = 0x5
-	RLIMIT_STACK                  = 0x3
-	RLIM_INFINITY                 = -0x3
-	RTAX_AUTHOR                   = 0x6
-	RTAX_BRD                      = 0x7
-	RTAX_DST                      = 0x0
-	RTAX_GATEWAY                  = 0x1
-	RTAX_GENMASK                  = 0x3
-	RTAX_IFA                      = 0x5
-	RTAX_IFP                      = 0x4
-	RTAX_MAX                      = 0x9
-	RTAX_NETMASK                  = 0x2
-	RTAX_SRC                      = 0x8
-	RTA_AUTHOR                    = 0x40
-	RTA_BRD                       = 0x80
-	RTA_DST                       = 0x1
-	RTA_GATEWAY                   = 0x2
-	RTA_GENMASK                   = 0x8
-	RTA_IFA                       = 0x20
-	RTA_IFP                       = 0x10
-	RTA_NETMASK                   = 0x4
-	RTA_NUMBITS                   = 0x9
-	RTA_SRC                       = 0x100
-	RTF_BLACKHOLE                 = 0x1000
-	RTF_CLONING                   = 0x100
-	RTF_DONE                      = 0x40
-	RTF_DYNAMIC                   = 0x10
-	RTF_GATEWAY                   = 0x2
-	RTF_HOST                      = 0x4
-	RTF_INDIRECT                  = 0x40000
-	RTF_KERNEL                    = 0x80000
-	RTF_LLINFO                    = 0x400
-	RTF_MASK                      = 0x80
-	RTF_MODIFIED                  = 0x20
-	RTF_MULTIRT                   = 0x10000
-	RTF_PRIVATE                   = 0x2000
-	RTF_PROTO1                    = 0x8000
-	RTF_PROTO2                    = 0x4000
-	RTF_REJECT                    = 0x8
-	RTF_SETSRC                    = 0x20000
-	RTF_STATIC                    = 0x800
-	RTF_UP                        = 0x1
-	RTF_XRESOLVE                  = 0x200
-	RTF_ZONE                      = 0x100000
-	RTM_ADD                       = 0x1
-	RTM_CHANGE                    = 0x3
-	RTM_CHGADDR                   = 0xf
-	RTM_DELADDR                   = 0xd
-	RTM_DELETE                    = 0x2
-	RTM_FREEADDR                  = 0x10
-	RTM_GET                       = 0x4
-	RTM_IFINFO                    = 0xe
-	RTM_LOCK                      = 0x8
-	RTM_LOSING                    = 0x5
-	RTM_MISS                      = 0x7
-	RTM_NEWADDR                   = 0xc
-	RTM_OLDADD                    = 0x9
-	RTM_OLDDEL                    = 0xa
-	RTM_REDIRECT                  = 0x6
-	RTM_RESOLVE                   = 0xb
-	RTM_VERSION                   = 0x3
-	RTV_EXPIRE                    = 0x4
-	RTV_HOPCOUNT                  = 0x2
-	RTV_MTU                       = 0x1
-	RTV_RPIPE                     = 0x8
-	RTV_RTT                       = 0x40
-	RTV_RTTVAR                    = 0x80
-	RTV_SPIPE                     = 0x10
-	RTV_SSTHRESH                  = 0x20
-	RT_AWARE                      = 0x1
-	RUSAGE_CHILDREN               = -0x1
-	RUSAGE_SELF                   = 0x0
-	SCM_RIGHTS                    = 0x1010
-	SCM_TIMESTAMP                 = 0x1013
-	SCM_UCRED                     = 0x1012
-	SHUT_RD                       = 0x0
-	SHUT_RDWR                     = 0x2
-	SHUT_WR                       = 0x1
-	SIG2STR_MAX                   = 0x20
-	SIOCADDMULTI                  = -0x7fdf96cf
-	SIOCADDRT                     = -0x7fcf8df6
-	SIOCATMARK                    = 0x40047307
-	SIOCDARP                      = -0x7fdb96e0
-	SIOCDELMULTI                  = -0x7fdf96ce
-	SIOCDELRT                     = -0x7fcf8df5
-	SIOCDXARP                     = -0x7fff9658
-	SIOCGARP                      = -0x3fdb96e1
-	SIOCGDSTINFO                  = -0x3fff965c
-	SIOCGENADDR                   = -0x3fdf96ab
-	SIOCGENPSTATS                 = -0x3fdf96c7
-	SIOCGETLSGCNT                 = -0x3fef8deb
-	SIOCGETNAME                   = 0x40107334
-	SIOCGETPEER                   = 0x40107335
-	SIOCGETPROP                   = -0x3fff8f44
-	SIOCGETSGCNT                  = -0x3feb8deb
-	SIOCGETSYNC                   = -0x3fdf96d3
-	SIOCGETVIFCNT                 = -0x3feb8dec
-	SIOCGHIWAT                    = 0x40047301
-	SIOCGIFADDR                   = -0x3fdf96f3
-	SIOCGIFBRDADDR                = -0x3fdf96e9
-	SIOCGIFCONF                   = -0x3ff796a4
-	SIOCGIFDSTADDR                = -0x3fdf96f1
-	SIOCGIFFLAGS                  = -0x3fdf96ef
-	SIOCGIFHWADDR                 = -0x3fdf9647
-	SIOCGIFINDEX                  = -0x3fdf96a6
-	SIOCGIFMEM                    = -0x3fdf96ed
-	SIOCGIFMETRIC                 = -0x3fdf96e5
-	SIOCGIFMTU                    = -0x3fdf96ea
-	SIOCGIFMUXID                  = -0x3fdf96a8
-	SIOCGIFNETMASK                = -0x3fdf96e7
-	SIOCGIFNUM                    = 0x40046957
-	SIOCGIP6ADDRPOLICY            = -0x3fff965e
-	SIOCGIPMSFILTER               = -0x3ffb964c
-	SIOCGLIFADDR                  = -0x3f87968f
-	SIOCGLIFBINDING               = -0x3f879666
-	SIOCGLIFBRDADDR               = -0x3f879685
-	SIOCGLIFCONF                  = -0x3fef965b
-	SIOCGLIFDADSTATE              = -0x3f879642
-	SIOCGLIFDSTADDR               = -0x3f87968d
-	SIOCGLIFFLAGS                 = -0x3f87968b
-	SIOCGLIFGROUPINFO             = -0x3f4b9663
-	SIOCGLIFGROUPNAME             = -0x3f879664
-	SIOCGLIFHWADDR                = -0x3f879640
-	SIOCGLIFINDEX                 = -0x3f87967b
-	SIOCGLIFLNKINFO               = -0x3f879674
-	SIOCGLIFMETRIC                = -0x3f879681
-	SIOCGLIFMTU                   = -0x3f879686
-	SIOCGLIFMUXID                 = -0x3f87967d
-	SIOCGLIFNETMASK               = -0x3f879683
-	SIOCGLIFNUM                   = -0x3ff3967e
-	SIOCGLIFSRCOF                 = -0x3fef964f
-	SIOCGLIFSUBNET                = -0x3f879676
-	SIOCGLIFTOKEN                 = -0x3f879678
-	SIOCGLIFUSESRC                = -0x3f879651
-	SIOCGLIFZONE                  = -0x3f879656
-	SIOCGLOWAT                    = 0x40047303
-	SIOCGMSFILTER                 = -0x3ffb964e
-	SIOCGPGRP                     = 0x40047309
-	SIOCGSTAMP                    = -0x3fef9646
-	SIOCGXARP                     = -0x3fff9659
-	SIOCIFDETACH                  = -0x7fdf96c8
-	SIOCILB                       = -0x3ffb9645
-	SIOCLIFADDIF                  = -0x3f879691
-	SIOCLIFDELND                  = -0x7f879673
-	SIOCLIFGETND                  = -0x3f879672
-	SIOCLIFREMOVEIF               = -0x7f879692
-	SIOCLIFSETND                  = -0x7f879671
-	SIOCLOWER                     = -0x7fdf96d7
-	SIOCSARP                      = -0x7fdb96e2
-	SIOCSCTPGOPT                  = -0x3fef9653
-	SIOCSCTPPEELOFF               = -0x3ffb9652
-	SIOCSCTPSOPT                  = -0x7fef9654
-	SIOCSENABLESDP                = -0x3ffb9649
-	SIOCSETPROP                   = -0x7ffb8f43
-	SIOCSETSYNC                   = -0x7fdf96d4
-	SIOCSHIWAT                    = -0x7ffb8d00
-	SIOCSIFADDR                   = -0x7fdf96f4
-	SIOCSIFBRDADDR                = -0x7fdf96e8
-	SIOCSIFDSTADDR                = -0x7fdf96f2
-	SIOCSIFFLAGS                  = -0x7fdf96f0
-	SIOCSIFINDEX                  = -0x7fdf96a5
-	SIOCSIFMEM                    = -0x7fdf96ee
-	SIOCSIFMETRIC                 = -0x7fdf96e4
-	SIOCSIFMTU                    = -0x7fdf96eb
-	SIOCSIFMUXID                  = -0x7fdf96a7
-	SIOCSIFNAME                   = -0x7fdf96b7
-	SIOCSIFNETMASK                = -0x7fdf96e6
-	SIOCSIP6ADDRPOLICY            = -0x7fff965d
-	SIOCSIPMSFILTER               = -0x7ffb964b
-	SIOCSLGETREQ                  = -0x3fdf96b9
-	SIOCSLIFADDR                  = -0x7f879690
-	SIOCSLIFBRDADDR               = -0x7f879684
-	SIOCSLIFDSTADDR               = -0x7f87968e
-	SIOCSLIFFLAGS                 = -0x7f87968c
-	SIOCSLIFGROUPNAME             = -0x7f879665
-	SIOCSLIFINDEX                 = -0x7f87967a
-	SIOCSLIFLNKINFO               = -0x7f879675
-	SIOCSLIFMETRIC                = -0x7f879680
-	SIOCSLIFMTU                   = -0x7f879687
-	SIOCSLIFMUXID                 = -0x7f87967c
-	SIOCSLIFNAME                  = -0x3f87967f
-	SIOCSLIFNETMASK               = -0x7f879682
-	SIOCSLIFPREFIX                = -0x3f879641
-	SIOCSLIFSUBNET                = -0x7f879677
-	SIOCSLIFTOKEN                 = -0x7f879679
-	SIOCSLIFUSESRC                = -0x7f879650
-	SIOCSLIFZONE                  = -0x7f879655
-	SIOCSLOWAT                    = -0x7ffb8cfe
-	SIOCSLSTAT                    = -0x7fdf96b8
-	SIOCSMSFILTER                 = -0x7ffb964d
-	SIOCSPGRP                     = -0x7ffb8cf8
-	SIOCSPROMISC                  = -0x7ffb96d0
-	SIOCSQPTR                     = -0x3ffb9648
-	SIOCSSDSTATS                  = -0x3fdf96d2
-	SIOCSSESTATS                  = -0x3fdf96d1
-	SIOCSXARP                     = -0x7fff965a
-	SIOCTMYADDR                   = -0x3ff79670
-	SIOCTMYSITE                   = -0x3ff7966e
-	SIOCTONLINK                   = -0x3ff7966f
-	SIOCUPPER                     = -0x7fdf96d8
-	SIOCX25RCV                    = -0x3fdf96c4
-	SIOCX25TBL                    = -0x3fdf96c3
-	SIOCX25XMT                    = -0x3fdf96c5
-	SIOCXPROTO                    = 0x20007337
-	SOCK_CLOEXEC                  = 0x80000
-	SOCK_DGRAM                    = 0x1
-	SOCK_NDELAY                   = 0x200000
-	SOCK_NONBLOCK                 = 0x100000
-	SOCK_RAW                      = 0x4
-	SOCK_RDM                      = 0x5
-	SOCK_SEQPACKET                = 0x6
-	SOCK_STREAM                   = 0x2
-	SOCK_TYPE_MASK                = 0xffff
-	SOL_FILTER                    = 0xfffc
-	SOL_PACKET                    = 0xfffd
-	SOL_ROUTE                     = 0xfffe
-	SOL_SOCKET                    = 0xffff
-	SOMAXCONN                     = 0x80
-	SO_ACCEPTCONN                 = 0x2
-	SO_ALL                        = 0x3f
-	SO_ALLZONES                   = 0x1014
-	SO_ANON_MLP                   = 0x100a
-	SO_ATTACH_FILTER              = 0x40000001
-	SO_BAND                       = 0x4000
-	SO_BROADCAST                  = 0x20
-	SO_COPYOPT                    = 0x80000
-	SO_DEBUG                      = 0x1
-	SO_DELIM                      = 0x8000
-	SO_DETACH_FILTER              = 0x40000002
-	SO_DGRAM_ERRIND               = 0x200
-	SO_DOMAIN                     = 0x100c
-	SO_DONTLINGER                 = -0x81
-	SO_DONTROUTE                  = 0x10
-	SO_ERROPT                     = 0x40000
-	SO_ERROR                      = 0x1007
-	SO_EXCLBIND                   = 0x1015
-	SO_HIWAT                      = 0x10
-	SO_ISNTTY                     = 0x800
-	SO_ISTTY                      = 0x400
-	SO_KEEPALIVE                  = 0x8
-	SO_LINGER                     = 0x80
-	SO_LOWAT                      = 0x20
-	SO_MAC_EXEMPT                 = 0x100b
-	SO_MAC_IMPLICIT               = 0x1016
-	SO_MAXBLK                     = 0x100000
-	SO_MAXPSZ                     = 0x8
-	SO_MINPSZ                     = 0x4
-	SO_MREADOFF                   = 0x80
-	SO_MREADON                    = 0x40
-	SO_NDELOFF                    = 0x200
-	SO_NDELON                     = 0x100
-	SO_NODELIM                    = 0x10000
-	SO_OOBINLINE                  = 0x100
-	SO_PROTOTYPE                  = 0x1009
-	SO_RCVBUF                     = 0x1002
-	SO_RCVLOWAT                   = 0x1004
-	SO_RCVPSH                     = 0x100d
-	SO_RCVTIMEO                   = 0x1006
-	SO_READOPT                    = 0x1
-	SO_RECVUCRED                  = 0x400
-	SO_REUSEADDR                  = 0x4
-	SO_SECATTR                    = 0x1011
-	SO_SNDBUF                     = 0x1001
-	SO_SNDLOWAT                   = 0x1003
-	SO_SNDTIMEO                   = 0x1005
-	SO_STRHOLD                    = 0x20000
-	SO_TAIL                       = 0x200000
-	SO_TIMESTAMP                  = 0x1013
-	SO_TONSTOP                    = 0x2000
-	SO_TOSTOP                     = 0x1000
-	SO_TYPE                       = 0x1008
-	SO_USELOOPBACK                = 0x40
-	SO_VRRP                       = 0x1017
-	SO_WROFF                      = 0x2
-	TCFLSH                        = 0x5407
-	TCGETA                        = 0x5401
-	TCGETS                        = 0x540d
-	TCIFLUSH                      = 0x0
-	TCIOFLUSH                     = 0x2
-	TCOFLUSH                      = 0x1
-	TCP_ABORT_THRESHOLD           = 0x11
-	TCP_ANONPRIVBIND              = 0x20
-	TCP_CONN_ABORT_THRESHOLD      = 0x13
-	TCP_CONN_NOTIFY_THRESHOLD     = 0x12
-	TCP_CORK                      = 0x18
-	TCP_EXCLBIND                  = 0x21
-	TCP_INIT_CWND                 = 0x15
-	TCP_KEEPALIVE                 = 0x8
-	TCP_KEEPALIVE_ABORT_THRESHOLD = 0x17
-	TCP_KEEPALIVE_THRESHOLD       = 0x16
-	TCP_KEEPCNT                   = 0x23
-	TCP_KEEPIDLE                  = 0x22
-	TCP_KEEPINTVL                 = 0x24
-	TCP_LINGER2                   = 0x1c
-	TCP_MAXSEG                    = 0x2
-	TCP_MSS                       = 0x218
-	TCP_NODELAY                   = 0x1
-	TCP_NOTIFY_THRESHOLD          = 0x10
-	TCP_RECVDSTADDR               = 0x14
-	TCP_RTO_INITIAL               = 0x19
-	TCP_RTO_MAX                   = 0x1b
-	TCP_RTO_MIN                   = 0x1a
-	TCSAFLUSH                     = 0x5410
-	TCSBRK                        = 0x5405
-	TCSETA                        = 0x5402
-	TCSETAF                       = 0x5404
-	TCSETAW                       = 0x5403
-	TCSETS                        = 0x540e
-	TCSETSF                       = 0x5410
-	TCSETSW                       = 0x540f
-	TCXONC                        = 0x5406
-	TIOC                          = 0x5400
-	TIOCCBRK                      = 0x747a
-	TIOCCDTR                      = 0x7478
-	TIOCCILOOP                    = 0x746c
-	TIOCEXCL                      = 0x740d
-	TIOCFLUSH                     = 0x7410
-	TIOCGETC                      = 0x7412
-	TIOCGETD                      = 0x7400
-	TIOCGETP                      = 0x7408
-	TIOCGLTC                      = 0x7474
-	TIOCGPGRP                     = 0x7414
-	TIOCGPPS                      = 0x547d
-	TIOCGPPSEV                    = 0x547f
-	TIOCGSID                      = 0x7416
-	TIOCGSOFTCAR                  = 0x5469
-	TIOCGWINSZ                    = 0x5468
-	TIOCHPCL                      = 0x7402
-	TIOCKBOF                      = 0x5409
-	TIOCKBON                      = 0x5408
-	TIOCLBIC                      = 0x747e
-	TIOCLBIS                      = 0x747f
-	TIOCLGET                      = 0x747c
-	TIOCLSET                      = 0x747d
-	TIOCMBIC                      = 0x741c
-	TIOCMBIS                      = 0x741b
-	TIOCMGET                      = 0x741d
-	TIOCMSET                      = 0x741a
-	TIOCM_CAR                     = 0x40
-	TIOCM_CD                      = 0x40
-	TIOCM_CTS                     = 0x20
-	TIOCM_DSR                     = 0x100
-	TIOCM_DTR                     = 0x2
-	TIOCM_LE                      = 0x1
-	TIOCM_RI                      = 0x80
-	TIOCM_RNG                     = 0x80
-	TIOCM_RTS                     = 0x4
-	TIOCM_SR                      = 0x10
-	TIOCM_ST                      = 0x8
-	TIOCNOTTY                     = 0x7471
-	TIOCNXCL                      = 0x740e
-	TIOCOUTQ                      = 0x7473
-	TIOCREMOTE                    = 0x741e
-	TIOCSBRK                      = 0x747b
-	TIOCSCTTY                     = 0x7484
-	TIOCSDTR                      = 0x7479
-	TIOCSETC                      = 0x7411
-	TIOCSETD                      = 0x7401
-	TIOCSETN                      = 0x740a
-	TIOCSETP                      = 0x7409
-	TIOCSIGNAL                    = 0x741f
-	TIOCSILOOP                    = 0x746d
-	TIOCSLTC                      = 0x7475
-	TIOCSPGRP                     = 0x7415
-	TIOCSPPS                      = 0x547e
-	TIOCSSOFTCAR                  = 0x546a
-	TIOCSTART                     = 0x746e
-	TIOCSTI                       = 0x7417
-	TIOCSTOP                      = 0x746f
-	TIOCSWINSZ                    = 0x5467
-	TOSTOP                        = 0x100
-	VCEOF                         = 0x8
-	VCEOL                         = 0x9
-	VDISCARD                      = 0xd
-	VDSUSP                        = 0xb
-	VEOF                          = 0x4
-	VEOL                          = 0x5
-	VEOL2                         = 0x6
-	VERASE                        = 0x2
-	VINTR                         = 0x0
-	VKILL                         = 0x3
-	VLNEXT                        = 0xf
-	VMIN                          = 0x4
-	VQUIT                         = 0x1
-	VREPRINT                      = 0xc
-	VSTART                        = 0x8
-	VSTATUS                       = 0x10
-	VSTOP                         = 0x9
-	VSUSP                         = 0xa
-	VSWTCH                        = 0x7
-	VT0                           = 0x0
-	VT1                           = 0x4000
-	VTDLY                         = 0x4000
-	VTIME                         = 0x5
-	VWERASE                       = 0xe
-	WCONTFLG                      = 0xffff
-	WCONTINUED                    = 0x8
-	WCOREFLG                      = 0x80
-	WEXITED                       = 0x1
-	WNOHANG                       = 0x40
-	WNOWAIT                       = 0x80
-	WOPTMASK                      = 0xcf
-	WRAP                          = 0x20000
-	WSIGMASK                      = 0x7f
-	WSTOPFLG                      = 0x7f
-	WSTOPPED                      = 0x4
-	WTRAPPED                      = 0x2
-	WUNTRACED                     = 0x4
-)
-
-// Errors
-const (
-	E2BIG           = syscall.Errno(0x7)
-	EACCES          = syscall.Errno(0xd)
-	EADDRINUSE      = syscall.Errno(0x7d)
-	EADDRNOTAVAIL   = syscall.Errno(0x7e)
-	EADV            = syscall.Errno(0x44)
-	EAFNOSUPPORT    = syscall.Errno(0x7c)
-	EAGAIN          = syscall.Errno(0xb)
-	EALREADY        = syscall.Errno(0x95)
-	EBADE           = syscall.Errno(0x32)
-	EBADF           = syscall.Errno(0x9)
-	EBADFD          = syscall.Errno(0x51)
-	EBADMSG         = syscall.Errno(0x4d)
-	EBADR           = syscall.Errno(0x33)
-	EBADRQC         = syscall.Errno(0x36)
-	EBADSLT         = syscall.Errno(0x37)
-	EBFONT          = syscall.Errno(0x39)
-	EBUSY           = syscall.Errno(0x10)
-	ECANCELED       = syscall.Errno(0x2f)
-	ECHILD          = syscall.Errno(0xa)
-	ECHRNG          = syscall.Errno(0x25)
-	ECOMM           = syscall.Errno(0x46)
-	ECONNABORTED    = syscall.Errno(0x82)
-	ECONNREFUSED    = syscall.Errno(0x92)
-	ECONNRESET      = syscall.Errno(0x83)
-	EDEADLK         = syscall.Errno(0x2d)
-	EDEADLOCK       = syscall.Errno(0x38)
-	EDESTADDRREQ    = syscall.Errno(0x60)
-	EDOM            = syscall.Errno(0x21)
-	EDQUOT          = syscall.Errno(0x31)
-	EEXIST          = syscall.Errno(0x11)
-	EFAULT          = syscall.Errno(0xe)
-	EFBIG           = syscall.Errno(0x1b)
-	EHOSTDOWN       = syscall.Errno(0x93)
-	EHOSTUNREACH    = syscall.Errno(0x94)
-	EIDRM           = syscall.Errno(0x24)
-	EILSEQ          = syscall.Errno(0x58)
-	EINPROGRESS     = syscall.Errno(0x96)
-	EINTR           = syscall.Errno(0x4)
-	EINVAL          = syscall.Errno(0x16)
-	EIO             = syscall.Errno(0x5)
-	EISCONN         = syscall.Errno(0x85)
-	EISDIR          = syscall.Errno(0x15)
-	EL2HLT          = syscall.Errno(0x2c)
-	EL2NSYNC        = syscall.Errno(0x26)
-	EL3HLT          = syscall.Errno(0x27)
-	EL3RST          = syscall.Errno(0x28)
-	ELIBACC         = syscall.Errno(0x53)
-	ELIBBAD         = syscall.Errno(0x54)
-	ELIBEXEC        = syscall.Errno(0x57)
-	ELIBMAX         = syscall.Errno(0x56)
-	ELIBSCN         = syscall.Errno(0x55)
-	ELNRNG          = syscall.Errno(0x29)
-	ELOCKUNMAPPED   = syscall.Errno(0x48)
-	ELOOP           = syscall.Errno(0x5a)
-	EMFILE          = syscall.Errno(0x18)
-	EMLINK          = syscall.Errno(0x1f)
-	EMSGSIZE        = syscall.Errno(0x61)
-	EMULTIHOP       = syscall.Errno(0x4a)
-	ENAMETOOLONG    = syscall.Errno(0x4e)
-	ENETDOWN        = syscall.Errno(0x7f)
-	ENETRESET       = syscall.Errno(0x81)
-	ENETUNREACH     = syscall.Errno(0x80)
-	ENFILE          = syscall.Errno(0x17)
-	ENOANO          = syscall.Errno(0x35)
-	ENOBUFS         = syscall.Errno(0x84)
-	ENOCSI          = syscall.Errno(0x2b)
-	ENODATA         = syscall.Errno(0x3d)
-	ENODEV          = syscall.Errno(0x13)
-	ENOENT          = syscall.Errno(0x2)
-	ENOEXEC         = syscall.Errno(0x8)
-	ENOLCK          = syscall.Errno(0x2e)
-	ENOLINK         = syscall.Errno(0x43)
-	ENOMEM          = syscall.Errno(0xc)
-	ENOMSG          = syscall.Errno(0x23)
-	ENONET          = syscall.Errno(0x40)
-	ENOPKG          = syscall.Errno(0x41)
-	ENOPROTOOPT     = syscall.Errno(0x63)
-	ENOSPC          = syscall.Errno(0x1c)
-	ENOSR           = syscall.Errno(0x3f)
-	ENOSTR          = syscall.Errno(0x3c)
-	ENOSYS          = syscall.Errno(0x59)
-	ENOTACTIVE      = syscall.Errno(0x49)
-	ENOTBLK         = syscall.Errno(0xf)
-	ENOTCONN        = syscall.Errno(0x86)
-	ENOTDIR         = syscall.Errno(0x14)
-	ENOTEMPTY       = syscall.Errno(0x5d)
-	ENOTRECOVERABLE = syscall.Errno(0x3b)
-	ENOTSOCK        = syscall.Errno(0x5f)
-	ENOTSUP         = syscall.Errno(0x30)
-	ENOTTY          = syscall.Errno(0x19)
-	ENOTUNIQ        = syscall.Errno(0x50)
-	ENXIO           = syscall.Errno(0x6)
-	EOPNOTSUPP      = syscall.Errno(0x7a)
-	EOVERFLOW       = syscall.Errno(0x4f)
-	EOWNERDEAD      = syscall.Errno(0x3a)
-	EPERM           = syscall.Errno(0x1)
-	EPFNOSUPPORT    = syscall.Errno(0x7b)
-	EPIPE           = syscall.Errno(0x20)
-	EPROTO          = syscall.Errno(0x47)
-	EPROTONOSUPPORT = syscall.Errno(0x78)
-	EPROTOTYPE      = syscall.Errno(0x62)
-	ERANGE          = syscall.Errno(0x22)
-	EREMCHG         = syscall.Errno(0x52)
-	EREMOTE         = syscall.Errno(0x42)
-	ERESTART        = syscall.Errno(0x5b)
-	EROFS           = syscall.Errno(0x1e)
-	ESHUTDOWN       = syscall.Errno(0x8f)
-	ESOCKTNOSUPPORT = syscall.Errno(0x79)
-	ESPIPE          = syscall.Errno(0x1d)
-	ESRCH           = syscall.Errno(0x3)
-	ESRMNT          = syscall.Errno(0x45)
-	ESTALE          = syscall.Errno(0x97)
-	ESTRPIPE        = syscall.Errno(0x5c)
-	ETIME           = syscall.Errno(0x3e)
-	ETIMEDOUT       = syscall.Errno(0x91)
-	ETOOMANYREFS    = syscall.Errno(0x90)
-	ETXTBSY         = syscall.Errno(0x1a)
-	EUNATCH         = syscall.Errno(0x2a)
-	EUSERS          = syscall.Errno(0x5e)
-	EWOULDBLOCK     = syscall.Errno(0xb)
-	EXDEV           = syscall.Errno(0x12)
-	EXFULL          = syscall.Errno(0x34)
-)
-
-// Signals
-const (
-	SIGABRT    = syscall.Signal(0x6)
-	SIGALRM    = syscall.Signal(0xe)
-	SIGBUS     = syscall.Signal(0xa)
-	SIGCANCEL  = syscall.Signal(0x24)
-	SIGCHLD    = syscall.Signal(0x12)
-	SIGCLD     = syscall.Signal(0x12)
-	SIGCONT    = syscall.Signal(0x19)
-	SIGEMT     = syscall.Signal(0x7)
-	SIGFPE     = syscall.Signal(0x8)
-	SIGFREEZE  = syscall.Signal(0x22)
-	SIGHUP     = syscall.Signal(0x1)
-	SIGILL     = syscall.Signal(0x4)
-	SIGINFO    = syscall.Signal(0x29)
-	SIGINT     = syscall.Signal(0x2)
-	SIGIO      = syscall.Signal(0x16)
-	SIGIOT     = syscall.Signal(0x6)
-	SIGJVM1    = syscall.Signal(0x27)
-	SIGJVM2    = syscall.Signal(0x28)
-	SIGKILL    = syscall.Signal(0x9)
-	SIGLOST    = syscall.Signal(0x25)
-	SIGLWP     = syscall.Signal(0x21)
-	SIGPIPE    = syscall.Signal(0xd)
-	SIGPOLL    = syscall.Signal(0x16)
-	SIGPROF    = syscall.Signal(0x1d)
-	SIGPWR     = syscall.Signal(0x13)
-	SIGQUIT    = syscall.Signal(0x3)
-	SIGSEGV    = syscall.Signal(0xb)
-	SIGSTOP    = syscall.Signal(0x17)
-	SIGSYS     = syscall.Signal(0xc)
-	SIGTERM    = syscall.Signal(0xf)
-	SIGTHAW    = syscall.Signal(0x23)
-	SIGTRAP    = syscall.Signal(0x5)
-	SIGTSTP    = syscall.Signal(0x18)
-	SIGTTIN    = syscall.Signal(0x1a)
-	SIGTTOU    = syscall.Signal(0x1b)
-	SIGURG     = syscall.Signal(0x15)
-	SIGUSR1    = syscall.Signal(0x10)
-	SIGUSR2    = syscall.Signal(0x11)
-	SIGVTALRM  = syscall.Signal(0x1c)
-	SIGWAITING = syscall.Signal(0x20)
-	SIGWINCH   = syscall.Signal(0x14)
-	SIGXCPU    = syscall.Signal(0x1e)
-	SIGXFSZ    = syscall.Signal(0x1f)
-	SIGXRES    = syscall.Signal(0x26)
-)
-
-// Error table
-var errors = [...]string{
-	1:   "not owner",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "I/O error",
-	6:   "no such device or address",
-	7:   "arg list too long",
-	8:   "exec format error",
-	9:   "bad file number",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "not enough space",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device busy",
-	17:  "file exists",
-	18:  "cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "file table overflow",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "argument out of domain",
-	34:  "result too large",
-	35:  "no message of desired type",
-	36:  "identifier removed",
-	37:  "channel number out of range",
-	38:  "level 2 not synchronized",
-	39:  "level 3 halted",
-	40:  "level 3 reset",
-	41:  "link number out of range",
-	42:  "protocol driver not attached",
-	43:  "no CSI structure available",
-	44:  "level 2 halted",
-	45:  "deadlock situation detected/avoided",
-	46:  "no record locks available",
-	47:  "operation canceled",
-	48:  "operation not supported",
-	49:  "disc quota exceeded",
-	50:  "bad exchange descriptor",
-	51:  "bad request descriptor",
-	52:  "message tables full",
-	53:  "anode table overflow",
-	54:  "bad request code",
-	55:  "invalid slot",
-	56:  "file locking deadlock",
-	57:  "bad font file format",
-	58:  "owner of the lock died",
-	59:  "lock is not recoverable",
-	60:  "not a stream device",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of stream resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "locked lock was unmapped ",
-	73:  "facility is not active",
-	74:  "multihop attempted",
-	77:  "not a data message",
-	78:  "file name too long",
-	79:  "value too large for defined data type",
-	80:  "name not unique on network",
-	81:  "file descriptor in bad state",
-	82:  "remote address changed",
-	83:  "can not access a needed shared library",
-	84:  "accessing a corrupted shared library",
-	85:  ".lib section in a.out corrupted",
-	86:  "attempting to link in more shared libraries than system limit",
-	87:  "can not exec a shared library directly",
-	88:  "illegal byte sequence",
-	89:  "operation not applicable",
-	90:  "number of symbolic links encountered during path name traversal exceeds MAXSYMLINKS",
-	91:  "error 91",
-	92:  "error 92",
-	93:  "directory not empty",
-	94:  "too many users",
-	95:  "socket operation on non-socket",
-	96:  "destination address required",
-	97:  "message too long",
-	98:  "protocol wrong type for socket",
-	99:  "option not supported by protocol",
-	120: "protocol not supported",
-	121: "socket type not supported",
-	122: "operation not supported on transport endpoint",
-	123: "protocol family not supported",
-	124: "address family not supported by protocol family",
-	125: "address already in use",
-	126: "cannot assign requested address",
-	127: "network is down",
-	128: "network is unreachable",
-	129: "network dropped connection because of reset",
-	130: "software caused connection abort",
-	131: "connection reset by peer",
-	132: "no buffer space available",
-	133: "transport endpoint is already connected",
-	134: "transport endpoint is not connected",
-	143: "cannot send after socket shutdown",
-	144: "too many references: cannot splice",
-	145: "connection timed out",
-	146: "connection refused",
-	147: "host is down",
-	148: "no route to host",
-	149: "operation already in progress",
-	150: "operation now in progress",
-	151: "stale NFS file handle",
-}
-
-// Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal Instruction",
-	5:  "trace/Breakpoint Trap",
-	6:  "abort",
-	7:  "emulation Trap",
-	8:  "arithmetic Exception",
-	9:  "killed",
-	10: "bus Error",
-	11: "segmentation Fault",
-	12: "bad System Call",
-	13: "broken Pipe",
-	14: "alarm Clock",
-	15: "terminated",
-	16: "user Signal 1",
-	17: "user Signal 2",
-	18: "child Status Changed",
-	19: "power-Fail/Restart",
-	20: "window Size Change",
-	21: "urgent Socket Condition",
-	22: "pollable Event",
-	23: "stopped (signal)",
-	24: "stopped (user)",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual Timer Expired",
-	29: "profiling Timer Expired",
-	30: "cpu Limit Exceeded",
-	31: "file Size Limit Exceeded",
-	32: "no runnable lwp",
-	33: "inter-lwp signal",
-	34: "checkpoint Freeze",
-	35: "checkpoint Thaw",
-	36: "thread Cancellation",
-	37: "resource Lost",
-	38: "resource Control Exceeded",
-	39: "reserved for JVM 1",
-	40: "reserved for JVM 2",
-	41: "information Request",
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
deleted file mode 100644
index e48f4a5c1c..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
+++ /dev/null
@@ -1,1394 +0,0 @@
-// mksyscall.pl -l32 -tags darwin,386 syscall_bsd.go syscall_darwin.go syscall_darwin_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build darwin,386
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kill(pid int, signum int, posix int) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exchangedata(path1 string, path2 string, options int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path1)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(path2)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setprivexec(flag int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos), uintptr(pos>>32), 0, 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func gettimeofday(tp *Timeval) (sec int32, usec int32, err error) {
-	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	sec = int32(r0)
-	usec = int32(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
deleted file mode 100644
index 672ada0e44..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
+++ /dev/null
@@ -1,1409 +0,0 @@
-// mksyscall.pl -tags darwin,amd64 syscall_bsd.go syscall_darwin.go syscall_darwin_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build darwin,amd64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kill(pid int, signum int, posix int) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exchangedata(path1 string, path2 string, options int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path1)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(path2)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setprivexec(flag int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func gettimeofday(tp *Timeval) (sec int64, usec int32, err error) {
-	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	sec = int64(r0)
-	usec = int32(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
deleted file mode 100644
index d516409dbe..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
+++ /dev/null
@@ -1,1394 +0,0 @@
-// mksyscall.pl -l32 -tags darwin,arm syscall_bsd.go syscall_darwin.go syscall_darwin_arm.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build darwin,arm
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kill(pid int, signum int, posix int) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exchangedata(path1 string, path2 string, options int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path1)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(path2)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setprivexec(flag int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos), uintptr(pos>>32), 0, 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func gettimeofday(tp *Timeval) (sec int32, usec int32, err error) {
-	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	sec = int32(r0)
-	usec = int32(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
deleted file mode 100644
index e97759c357..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
+++ /dev/null
@@ -1,1394 +0,0 @@
-// mksyscall.pl -tags darwin,arm64 syscall_bsd.go syscall_darwin.go syscall_darwin_arm64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build darwin,arm64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kill(pid int, signum int, posix int) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exchangedata(path1 string, path2 string, options int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path1)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(path2)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXCHANGEDATA, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES64, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := RawSyscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setprivexec(flag int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIVEXEC, uintptr(flag), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func gettimeofday(tp *Timeval) (sec int64, usec int32, err error) {
-	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	sec = int64(r0)
-	usec = int32(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
deleted file mode 100644
index 3e9d82a27e..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
+++ /dev/null
@@ -1,1382 +0,0 @@
-// mksyscall.pl -dragonfly -tags dragonfly,amd64 syscall_bsd.go syscall_dragonfly.go syscall_dragonfly_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build dragonfly,amd64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func extpread(fd int, p []byte, flags int, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EXTPREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(offset), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func extpwrite(fd int, p []byte, flags int, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EXTPWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(offset), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
deleted file mode 100644
index f53801ceef..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
+++ /dev/null
@@ -1,1617 +0,0 @@
-// mksyscall.pl -l32 -tags freebsd,386 syscall_bsd.go syscall_freebsd.go syscall_freebsd_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build freebsd,386
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(whence), 0, 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos), uintptr(pos>>32), 0, 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
deleted file mode 100644
index 55b07412cb..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
+++ /dev/null
@@ -1,1617 +0,0 @@
-// mksyscall.pl -tags freebsd,amd64 syscall_bsd.go syscall_freebsd.go syscall_freebsd_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build freebsd,amd64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
deleted file mode 100644
index 0e9b42bf4f..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
+++ /dev/null
@@ -1,1617 +0,0 @@
-// mksyscall.pl -l32 -arm -tags freebsd,arm syscall_bsd.go syscall_freebsd.go syscall_freebsd_arm.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build freebsd,arm
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (r int, w int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	r = int(r0)
-	w = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(file)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attrname)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
-	ret = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall9(SYS_POSIX_FADVISE, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdtablesize() (size int) {
-	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
-	size = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Undelete(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
deleted file mode 100644
index 41693a9602..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
+++ /dev/null
@@ -1,1649 +0,0 @@
-// mksyscall.pl -l32 -tags linux,386 syscall_linux.go syscall_linux_386.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build linux,386
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_FADVISE64_64, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN32, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE64, uintptr(fd), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID32, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID32, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID32, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID32, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ioperm(from int, num int, on int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Iopl(level int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN32, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID32, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID32, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID32, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID32, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(off>>32), uintptr(n), uintptr(n>>32), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE64, uintptr(unsafe.Pointer(_p0)), uintptr(length), uintptr(length>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
-	tt = Time_t(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
deleted file mode 100644
index f10621d90d..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
+++ /dev/null
@@ -1,1842 +0,0 @@
-// mksyscall.pl -tags linux,amd64 syscall_linux.go syscall_linux_amd64.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build linux,amd64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ioperm(from int, num int, on int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Iopl(level int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
deleted file mode 100644
index fae666f6fc..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
+++ /dev/null
@@ -1,1751 +0,0 @@
-// mksyscall.pl -l32 -arm -tags linux,arm syscall_linux.go syscall_linux_arm.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build linux,arm
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, flags int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(flags), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN32, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID32, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID32, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID32, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID32, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN32, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID32, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID32, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID32, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID32, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID32, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID32, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE64, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE64, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
deleted file mode 100644
index a4dca395a6..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
+++ /dev/null
@@ -1,1725 +0,0 @@
-// mksyscall.pl -tags linux,arm64 syscall_linux.go syscall_linux_arm64.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build linux,arm64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_PWAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
deleted file mode 100644
index b56db72957..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
+++ /dev/null
@@ -1,1807 +0,0 @@
-// mksyscall.pl -b32 -arm -tags linux,mips syscall_linux.go syscall_linux_mipsx.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build linux,mips
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off>>32), uintptr(off), uintptr(len>>32), uintptr(len))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(int64(r0)<<32 | int64(r1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE64, uintptr(fd), 0, uintptr(length>>32), uintptr(length), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset>>32), uintptr(offset))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset>>32), uintptr(offset))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(int64(r0)<<32 | int64(r1))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall9(SYS_SYNC_FILE_RANGE, uintptr(fd), 0, uintptr(off>>32), uintptr(off), uintptr(n>>32), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE64, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length>>32), uintptr(length), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ioperm(from int, num int, on int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Iopl(level int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
-	tt = Time_t(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
deleted file mode 100644
index ca2359debb..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
+++ /dev/null
@@ -1,1791 +0,0 @@
-// mksyscall.pl -tags linux,mips64 syscall_linux.go syscall_linux_mips64x.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build linux,mips64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fstat(fd int, st *stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(st)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func lstat(path string, st *stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func stat(path string, st *stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
deleted file mode 100644
index e574940f90..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
+++ /dev/null
@@ -1,1791 +0,0 @@
-// mksyscall.pl -tags linux,mips64le syscall_linux.go syscall_linux_mips64x.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build linux,mips64le
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fstat(fd int, st *stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(st)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func lstat(path string, st *stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func stat(path string, st *stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(st)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
deleted file mode 100644
index 31836d4560..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
+++ /dev/null
@@ -1,1807 +0,0 @@
-// mksyscall.pl -l32 -arm -tags linux,mipsle syscall_linux.go syscall_linux_mipsx.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build linux,mipsle
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(off>>32), uintptr(len), uintptr(len>>32))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE64, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE64, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall9(SYS_SYNC_FILE_RANGE, uintptr(fd), 0, uintptr(off), uintptr(off>>32), uintptr(n), uintptr(n>>32), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE64, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ioperm(from int, num int, on int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Iopl(level int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
-	tt = Time_t(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT64, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setrlimit(resource int, rlim *rlimit32) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
deleted file mode 100644
index 4a767558cc..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
+++ /dev/null
@@ -1,1853 +0,0 @@
-// mksyscall.pl -tags linux,ppc64 syscall_linux.go syscall_linux_ppc64x.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build linux,ppc64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ioperm(from int, num int, on int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Iopl(level int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
-	tt = Time_t(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
deleted file mode 100644
index 5fb34282d2..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
+++ /dev/null
@@ -1,1853 +0,0 @@
-// mksyscall.pl -tags linux,ppc64le syscall_linux.go syscall_linux_ppc64x.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build linux,ppc64le
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_UGETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ioperm(from int, num int, on int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPERM, uintptr(from), uintptr(num), uintptr(on))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Iopl(level int) (err error) {
-	_, _, e1 := Syscall(SYS_IOPL, uintptr(level), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE2, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Time(t *Time_t) (tt Time_t, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIME, uintptr(unsafe.Pointer(t)), 0, 0)
-	tt = Time_t(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
deleted file mode 100644
index 79d285ca3f..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
+++ /dev/null
@@ -1,1633 +0,0 @@
-// mksyscall.pl -tags linux,s390x syscall_linux.go syscall_linux_s390x.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build linux,s390x
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
-	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
deleted file mode 100644
index ce3ec585b6..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
+++ /dev/null
@@ -1,1822 +0,0 @@
-// mksyscall.pl -tags linux,sparc64 syscall_linux.go syscall_linux_sparc64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build linux,sparc64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PPOLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimesat(dirfd int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMESAT, uintptr(dirfd), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(arg)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_REBOOT, uintptr(magic1), uintptr(magic2), uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(source string, target string, fstype string, flags uintptr, data *byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(source)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	var _p2 *byte
-	_p2, err = BytePtrFromString(fstype)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(flags), uintptr(unsafe.Pointer(data)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Acct(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtimex(buf *Timex) (state int, err error) {
-	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
-	state = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func ClockGettime(clockid int32, time *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_CLOCK_GETTIME, uintptr(clockid), uintptr(unsafe.Pointer(time)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup3(oldfd int, newfd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP3, uintptr(oldfd), uintptr(newfd), uintptr(flags))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate(size int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE, uintptr(size), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCreate1(flag int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_EPOLL_CREATE1, uintptr(flag), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
-	_, _, e1 := RawSyscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fallocate(fd int, mode uint32, off int64, len int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FALLOCATE, uintptr(fd), uintptr(mode), uintptr(off), uintptr(len), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FDATASYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS64, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrandom(buf []byte, flags int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETRANDOM, uintptr(_p0), uintptr(len(buf)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
-	tid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(dest) > 0 {
-		_p2 = unsafe.Pointer(&dest[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(pathname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_INOTIFY_ADD_WATCH, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(mask))
-	watchdesc = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit1(flags int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT1, uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyRmWatch(fd int, watchdesc uint32) (success int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_RM_WATCH, uintptr(fd), uintptr(watchdesc), 0)
-	success = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_KILL, uintptr(pid), uintptr(sig), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Klogctl(typ int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_SYSLOG, uintptr(typ), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listxattr(path string, dest []byte) (sz int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(dest) > 0 {
-		_p1 = unsafe.Pointer(&dest[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
-	sz = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_MKNODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func PivotRoot(newroot string, putold string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(newroot)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(putold)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_PIVOT_ROOT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) {
-	_, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_PRCTL, uintptr(option), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Removexattr(path string, attr string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setdomainname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETDOMAINNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sethostname(p []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_SETHOSTNAME, uintptr(_p0), uintptr(len(p)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setns(fd int, nstype int) (err error) {
-	_, _, e1 := Syscall(SYS_SETNS, uintptr(fd), uintptr(nstype), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setxattr(path string, attr string, data []byte, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(attr)
-	if err != nil {
-		return
-	}
-	var _p2 unsafe.Pointer
-	if len(data) > 0 {
-		_p2 = unsafe.Pointer(&data[0])
-	} else {
-		_p2 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sysinfo(info *Sysinfo_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SYSINFO, uintptr(unsafe.Pointer(info)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tee(rfd int, wfd int, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_TEE, uintptr(rfd), uintptr(wfd), uintptr(len), uintptr(flags), 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Tgkill(tgid int, tid int, sig syscall.Signal) (err error) {
-	_, _, e1 := RawSyscall(SYS_TGKILL, uintptr(tgid), uintptr(tid), uintptr(sig))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := RawSyscall(SYS_TIMES, uintptr(unsafe.Pointer(tms)), 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := RawSyscall(SYS_UNAME, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UMOUNT2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unshare(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_UNSHARE, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := Syscall(SYS_USTAT, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func exitThread(code int) (err error) {
-	_, _, e1 := Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, p *byte, np int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(p)), uintptr(np))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(advice))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(events) > 0 {
-		_p0 = unsafe.Pointer(&events[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_EPOLL_WAIT, uintptr(epfd), uintptr(_p0), uintptr(len(events)), uintptr(msec), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, buf *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func InotifyInit() (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_INOTIFY_INIT, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, n int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(n), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pause() (err error) {
-	_, _, e1 := Syscall(SYS_PAUSE, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE64, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (off int64, err error) {
-	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
-	off = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
-	written = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsgid(gid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setfsuid(uid int) (err error) {
-	_, _, e1 := Syscall(SYS_SETFSUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(resource int, rlim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(resource), uintptr(unsafe.Pointer(rlim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, buf *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func SyncFileRange(fd int, off int64, n int64, flags int) (err error) {
-	_, _, e1 := Syscall6(SYS_SYNC_FILE_RANGE, uintptr(fd), uintptr(off), uintptr(n), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) {
-	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(n int, list *_Gid_t) (nn int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	nn = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(n int, list *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error) {
-	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(offset))
-	xaddr = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe2(p *[2]_C_int, flags int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
deleted file mode 100644
index 3182345ece..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
+++ /dev/null
@@ -1,1299 +0,0 @@
-// mksyscall.pl -l32 -netbsd -tags netbsd,386 syscall_bsd.go syscall_netbsd.go syscall_netbsd_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build netbsd,386
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (fd1 int, fd2 int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	fd1 = int(r0)
-	fd2 = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
deleted file mode 100644
index 74ba8189a5..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
+++ /dev/null
@@ -1,1299 +0,0 @@
-// mksyscall.pl -netbsd -tags netbsd,amd64 syscall_bsd.go syscall_netbsd.go syscall_netbsd_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build netbsd,amd64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (fd1 int, fd2 int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	fd1 = int(r0)
-	fd2 = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
deleted file mode 100644
index 1f346e2f52..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
+++ /dev/null
@@ -1,1299 +0,0 @@
-// mksyscall.pl -l32 -arm -tags netbsd,arm syscall_bsd.go syscall_netbsd.go syscall_netbsd_arm.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build netbsd,arm
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe() (fd1 int, fd2 int, err error) {
-	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
-	fd1 = int(r0)
-	fd2 = int(r1)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
deleted file mode 100644
index ca3e813926..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
+++ /dev/null
@@ -1,1357 +0,0 @@
-// mksyscall.pl -l32 -openbsd -tags openbsd,386 syscall_bsd.go syscall_openbsd.go syscall_openbsd_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build openbsd,386
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
-	newoffset = int64(int64(r1)<<32 | int64(r0))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
deleted file mode 100644
index bf63d552ed..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
+++ /dev/null
@@ -1,1357 +0,0 @@
-// mksyscall.pl -openbsd -tags openbsd,amd64 syscall_bsd.go syscall_openbsd.go syscall_openbsd_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build openbsd,amd64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
-	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
-	var _p0 unsafe.Pointer
-	if len(mib) > 0 {
-		_p0 = unsafe.Pointer(&mib[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func utimes(path string, timeval *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func futimes(fd int, timeval *[2]Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]_C_int) (err error) {
-	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func getdents(fd int, buf []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chflags(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup2(from int, to int) (err error) {
-	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchflags(fd int, flags int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Flock(fd int, how int) (err error) {
-	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstatfs(fd int, stat *Statfs_t) (err error) {
-	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Geteuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpgrp() (pgrp int) {
-	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
-	pgrp = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getpriority(which int, who int) (prio int, err error) {
-	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
-	prio = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getsid(pid int) (sid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
-	sid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Issetugid() (tainted bool) {
-	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
-	tainted = bool(r0 != 0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Kqueue() (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	fd = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(buf) > 0 {
-		_p1 = unsafe.Pointer(&buf[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Revoke(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(whence), 0, 0)
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
-	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setlogin(name string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresgid(rgid int, egid int, sgid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setresuid(ruid int, euid int, suid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Settimeofday(tp *Timeval) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Statfs(path string, stat *Statfs_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Sync() (err error) {
-	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Umask(newmask int) (oldmask int) {
-	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Unmount(path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), 0, 0)
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
-	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
deleted file mode 100644
index bdf140b180..0000000000
--- a/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
+++ /dev/null
@@ -1,1562 +0,0 @@
-// mksyscall_solaris.pl -tags solaris,amd64 syscall_solaris.go syscall_solaris_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build solaris,amd64
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-//go:cgo_import_dynamic libc_pipe pipe "libc.so"
-//go:cgo_import_dynamic libc_getsockname getsockname "libsocket.so"
-//go:cgo_import_dynamic libc_getcwd getcwd "libc.so"
-//go:cgo_import_dynamic libc_getgroups getgroups "libc.so"
-//go:cgo_import_dynamic libc_setgroups setgroups "libc.so"
-//go:cgo_import_dynamic libc_wait4 wait4 "libc.so"
-//go:cgo_import_dynamic libc_gethostname gethostname "libc.so"
-//go:cgo_import_dynamic libc_utimes utimes "libc.so"
-//go:cgo_import_dynamic libc_utimensat utimensat "libc.so"
-//go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
-//go:cgo_import_dynamic libc_futimesat futimesat "libc.so"
-//go:cgo_import_dynamic libc_accept accept "libsocket.so"
-//go:cgo_import_dynamic libc_recvmsg recvmsg "libsocket.so"
-//go:cgo_import_dynamic libc_sendmsg sendmsg "libsocket.so"
-//go:cgo_import_dynamic libc_acct acct "libc.so"
-//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
-//go:cgo_import_dynamic libc_access access "libc.so"
-//go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
-//go:cgo_import_dynamic libc_chdir chdir "libc.so"
-//go:cgo_import_dynamic libc_chmod chmod "libc.so"
-//go:cgo_import_dynamic libc_chown chown "libc.so"
-//go:cgo_import_dynamic libc_chroot chroot "libc.so"
-//go:cgo_import_dynamic libc_close close "libc.so"
-//go:cgo_import_dynamic libc_creat creat "libc.so"
-//go:cgo_import_dynamic libc_dup dup "libc.so"
-//go:cgo_import_dynamic libc_dup2 dup2 "libc.so"
-//go:cgo_import_dynamic libc_exit exit "libc.so"
-//go:cgo_import_dynamic libc_fchdir fchdir "libc.so"
-//go:cgo_import_dynamic libc_fchmod fchmod "libc.so"
-//go:cgo_import_dynamic libc_fchmodat fchmodat "libc.so"
-//go:cgo_import_dynamic libc_fchown fchown "libc.so"
-//go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
-//go:cgo_import_dynamic libc_fdatasync fdatasync "libc.so"
-//go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
-//go:cgo_import_dynamic libc_fstat fstat "libc.so"
-//go:cgo_import_dynamic libc_getdents getdents "libc.so"
-//go:cgo_import_dynamic libc_getgid getgid "libc.so"
-//go:cgo_import_dynamic libc_getpid getpid "libc.so"
-//go:cgo_import_dynamic libc_getpgid getpgid "libc.so"
-//go:cgo_import_dynamic libc_getpgrp getpgrp "libc.so"
-//go:cgo_import_dynamic libc_geteuid geteuid "libc.so"
-//go:cgo_import_dynamic libc_getegid getegid "libc.so"
-//go:cgo_import_dynamic libc_getppid getppid "libc.so"
-//go:cgo_import_dynamic libc_getpriority getpriority "libc.so"
-//go:cgo_import_dynamic libc_getrlimit getrlimit "libc.so"
-//go:cgo_import_dynamic libc_getrusage getrusage "libc.so"
-//go:cgo_import_dynamic libc_gettimeofday gettimeofday "libc.so"
-//go:cgo_import_dynamic libc_getuid getuid "libc.so"
-//go:cgo_import_dynamic libc_kill kill "libc.so"
-//go:cgo_import_dynamic libc_lchown lchown "libc.so"
-//go:cgo_import_dynamic libc_link link "libc.so"
-//go:cgo_import_dynamic libc_listen listen "libsocket.so"
-//go:cgo_import_dynamic libc_lstat lstat "libc.so"
-//go:cgo_import_dynamic libc_madvise madvise "libc.so"
-//go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
-//go:cgo_import_dynamic libc_mkdirat mkdirat "libc.so"
-//go:cgo_import_dynamic libc_mkfifo mkfifo "libc.so"
-//go:cgo_import_dynamic libc_mkfifoat mkfifoat "libc.so"
-//go:cgo_import_dynamic libc_mknod mknod "libc.so"
-//go:cgo_import_dynamic libc_mknodat mknodat "libc.so"
-//go:cgo_import_dynamic libc_mlock mlock "libc.so"
-//go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
-//go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
-//go:cgo_import_dynamic libc_munlock munlock "libc.so"
-//go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
-//go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
-//go:cgo_import_dynamic libc_open open "libc.so"
-//go:cgo_import_dynamic libc_openat openat "libc.so"
-//go:cgo_import_dynamic libc_pathconf pathconf "libc.so"
-//go:cgo_import_dynamic libc_pause pause "libc.so"
-//go:cgo_import_dynamic libc_pread pread "libc.so"
-//go:cgo_import_dynamic libc_pwrite pwrite "libc.so"
-//go:cgo_import_dynamic libc_read read "libc.so"
-//go:cgo_import_dynamic libc_readlink readlink "libc.so"
-//go:cgo_import_dynamic libc_rename rename "libc.so"
-//go:cgo_import_dynamic libc_renameat renameat "libc.so"
-//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
-//go:cgo_import_dynamic libc_lseek lseek "libc.so"
-//go:cgo_import_dynamic libc_setegid setegid "libc.so"
-//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
-//go:cgo_import_dynamic libc_setgid setgid "libc.so"
-//go:cgo_import_dynamic libc_sethostname sethostname "libc.so"
-//go:cgo_import_dynamic libc_setpgid setpgid "libc.so"
-//go:cgo_import_dynamic libc_setpriority setpriority "libc.so"
-//go:cgo_import_dynamic libc_setregid setregid "libc.so"
-//go:cgo_import_dynamic libc_setreuid setreuid "libc.so"
-//go:cgo_import_dynamic libc_setrlimit setrlimit "libc.so"
-//go:cgo_import_dynamic libc_setsid setsid "libc.so"
-//go:cgo_import_dynamic libc_setuid setuid "libc.so"
-//go:cgo_import_dynamic libc_shutdown shutdown "libsocket.so"
-//go:cgo_import_dynamic libc_stat stat "libc.so"
-//go:cgo_import_dynamic libc_symlink symlink "libc.so"
-//go:cgo_import_dynamic libc_sync sync "libc.so"
-//go:cgo_import_dynamic libc_times times "libc.so"
-//go:cgo_import_dynamic libc_truncate truncate "libc.so"
-//go:cgo_import_dynamic libc_fsync fsync "libc.so"
-//go:cgo_import_dynamic libc_ftruncate ftruncate "libc.so"
-//go:cgo_import_dynamic libc_umask umask "libc.so"
-//go:cgo_import_dynamic libc_uname uname "libc.so"
-//go:cgo_import_dynamic libc_umount umount "libc.so"
-//go:cgo_import_dynamic libc_unlink unlink "libc.so"
-//go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
-//go:cgo_import_dynamic libc_ustat ustat "libc.so"
-//go:cgo_import_dynamic libc_utime utime "libc.so"
-//go:cgo_import_dynamic libc_bind bind "libsocket.so"
-//go:cgo_import_dynamic libc_connect connect "libsocket.so"
-//go:cgo_import_dynamic libc_mmap mmap "libc.so"
-//go:cgo_import_dynamic libc_munmap munmap "libc.so"
-//go:cgo_import_dynamic libc_sendto sendto "libsocket.so"
-//go:cgo_import_dynamic libc_socket socket "libsocket.so"
-//go:cgo_import_dynamic libc_socketpair socketpair "libsocket.so"
-//go:cgo_import_dynamic libc_write write "libc.so"
-//go:cgo_import_dynamic libc_getsockopt getsockopt "libsocket.so"
-//go:cgo_import_dynamic libc_getpeername getpeername "libsocket.so"
-//go:cgo_import_dynamic libc_setsockopt setsockopt "libsocket.so"
-//go:cgo_import_dynamic libc_recvfrom recvfrom "libsocket.so"
-//go:cgo_import_dynamic libc_sysconf sysconf "libc.so"
-
-//go:linkname procpipe libc_pipe
-//go:linkname procgetsockname libc_getsockname
-//go:linkname procGetcwd libc_getcwd
-//go:linkname procgetgroups libc_getgroups
-//go:linkname procsetgroups libc_setgroups
-//go:linkname procwait4 libc_wait4
-//go:linkname procgethostname libc_gethostname
-//go:linkname procutimes libc_utimes
-//go:linkname procutimensat libc_utimensat
-//go:linkname procfcntl libc_fcntl
-//go:linkname procfutimesat libc_futimesat
-//go:linkname procaccept libc_accept
-//go:linkname procrecvmsg libc_recvmsg
-//go:linkname procsendmsg libc_sendmsg
-//go:linkname procacct libc_acct
-//go:linkname procioctl libc_ioctl
-//go:linkname procAccess libc_access
-//go:linkname procAdjtime libc_adjtime
-//go:linkname procChdir libc_chdir
-//go:linkname procChmod libc_chmod
-//go:linkname procChown libc_chown
-//go:linkname procChroot libc_chroot
-//go:linkname procClose libc_close
-//go:linkname procCreat libc_creat
-//go:linkname procDup libc_dup
-//go:linkname procDup2 libc_dup2
-//go:linkname procExit libc_exit
-//go:linkname procFchdir libc_fchdir
-//go:linkname procFchmod libc_fchmod
-//go:linkname procFchmodat libc_fchmodat
-//go:linkname procFchown libc_fchown
-//go:linkname procFchownat libc_fchownat
-//go:linkname procFdatasync libc_fdatasync
-//go:linkname procFpathconf libc_fpathconf
-//go:linkname procFstat libc_fstat
-//go:linkname procGetdents libc_getdents
-//go:linkname procGetgid libc_getgid
-//go:linkname procGetpid libc_getpid
-//go:linkname procGetpgid libc_getpgid
-//go:linkname procGetpgrp libc_getpgrp
-//go:linkname procGeteuid libc_geteuid
-//go:linkname procGetegid libc_getegid
-//go:linkname procGetppid libc_getppid
-//go:linkname procGetpriority libc_getpriority
-//go:linkname procGetrlimit libc_getrlimit
-//go:linkname procGetrusage libc_getrusage
-//go:linkname procGettimeofday libc_gettimeofday
-//go:linkname procGetuid libc_getuid
-//go:linkname procKill libc_kill
-//go:linkname procLchown libc_lchown
-//go:linkname procLink libc_link
-//go:linkname proclisten libc_listen
-//go:linkname procLstat libc_lstat
-//go:linkname procMadvise libc_madvise
-//go:linkname procMkdir libc_mkdir
-//go:linkname procMkdirat libc_mkdirat
-//go:linkname procMkfifo libc_mkfifo
-//go:linkname procMkfifoat libc_mkfifoat
-//go:linkname procMknod libc_mknod
-//go:linkname procMknodat libc_mknodat
-//go:linkname procMlock libc_mlock
-//go:linkname procMlockall libc_mlockall
-//go:linkname procMprotect libc_mprotect
-//go:linkname procMunlock libc_munlock
-//go:linkname procMunlockall libc_munlockall
-//go:linkname procNanosleep libc_nanosleep
-//go:linkname procOpen libc_open
-//go:linkname procOpenat libc_openat
-//go:linkname procPathconf libc_pathconf
-//go:linkname procPause libc_pause
-//go:linkname procPread libc_pread
-//go:linkname procPwrite libc_pwrite
-//go:linkname procread libc_read
-//go:linkname procReadlink libc_readlink
-//go:linkname procRename libc_rename
-//go:linkname procRenameat libc_renameat
-//go:linkname procRmdir libc_rmdir
-//go:linkname proclseek libc_lseek
-//go:linkname procSetegid libc_setegid
-//go:linkname procSeteuid libc_seteuid
-//go:linkname procSetgid libc_setgid
-//go:linkname procSethostname libc_sethostname
-//go:linkname procSetpgid libc_setpgid
-//go:linkname procSetpriority libc_setpriority
-//go:linkname procSetregid libc_setregid
-//go:linkname procSetreuid libc_setreuid
-//go:linkname procSetrlimit libc_setrlimit
-//go:linkname procSetsid libc_setsid
-//go:linkname procSetuid libc_setuid
-//go:linkname procshutdown libc_shutdown
-//go:linkname procStat libc_stat
-//go:linkname procSymlink libc_symlink
-//go:linkname procSync libc_sync
-//go:linkname procTimes libc_times
-//go:linkname procTruncate libc_truncate
-//go:linkname procFsync libc_fsync
-//go:linkname procFtruncate libc_ftruncate
-//go:linkname procUmask libc_umask
-//go:linkname procUname libc_uname
-//go:linkname procumount libc_umount
-//go:linkname procUnlink libc_unlink
-//go:linkname procUnlinkat libc_unlinkat
-//go:linkname procUstat libc_ustat
-//go:linkname procUtime libc_utime
-//go:linkname procbind libc_bind
-//go:linkname procconnect libc_connect
-//go:linkname procmmap libc_mmap
-//go:linkname procmunmap libc_munmap
-//go:linkname procsendto libc_sendto
-//go:linkname procsocket libc_socket
-//go:linkname procsocketpair libc_socketpair
-//go:linkname procwrite libc_write
-//go:linkname procgetsockopt libc_getsockopt
-//go:linkname procgetpeername libc_getpeername
-//go:linkname procsetsockopt libc_setsockopt
-//go:linkname procrecvfrom libc_recvfrom
-//go:linkname procsysconf libc_sysconf
-
-var (
-	procpipe,
-	procgetsockname,
-	procGetcwd,
-	procgetgroups,
-	procsetgroups,
-	procwait4,
-	procgethostname,
-	procutimes,
-	procutimensat,
-	procfcntl,
-	procfutimesat,
-	procaccept,
-	procrecvmsg,
-	procsendmsg,
-	procacct,
-	procioctl,
-	procAccess,
-	procAdjtime,
-	procChdir,
-	procChmod,
-	procChown,
-	procChroot,
-	procClose,
-	procCreat,
-	procDup,
-	procDup2,
-	procExit,
-	procFchdir,
-	procFchmod,
-	procFchmodat,
-	procFchown,
-	procFchownat,
-	procFdatasync,
-	procFpathconf,
-	procFstat,
-	procGetdents,
-	procGetgid,
-	procGetpid,
-	procGetpgid,
-	procGetpgrp,
-	procGeteuid,
-	procGetegid,
-	procGetppid,
-	procGetpriority,
-	procGetrlimit,
-	procGetrusage,
-	procGettimeofday,
-	procGetuid,
-	procKill,
-	procLchown,
-	procLink,
-	proclisten,
-	procLstat,
-	procMadvise,
-	procMkdir,
-	procMkdirat,
-	procMkfifo,
-	procMkfifoat,
-	procMknod,
-	procMknodat,
-	procMlock,
-	procMlockall,
-	procMprotect,
-	procMunlock,
-	procMunlockall,
-	procNanosleep,
-	procOpen,
-	procOpenat,
-	procPathconf,
-	procPause,
-	procPread,
-	procPwrite,
-	procread,
-	procReadlink,
-	procRename,
-	procRenameat,
-	procRmdir,
-	proclseek,
-	procSetegid,
-	procSeteuid,
-	procSetgid,
-	procSethostname,
-	procSetpgid,
-	procSetpriority,
-	procSetregid,
-	procSetreuid,
-	procSetrlimit,
-	procSetsid,
-	procSetuid,
-	procshutdown,
-	procStat,
-	procSymlink,
-	procSync,
-	procTimes,
-	procTruncate,
-	procFsync,
-	procFtruncate,
-	procUmask,
-	procUname,
-	procumount,
-	procUnlink,
-	procUnlinkat,
-	procUstat,
-	procUtime,
-	procbind,
-	procconnect,
-	procmmap,
-	procmunmap,
-	procsendto,
-	procsocket,
-	procsocketpair,
-	procwrite,
-	procgetsockopt,
-	procgetpeername,
-	procsetsockopt,
-	procrecvfrom,
-	procsysconf syscallFunc
-)
-
-func pipe(p *[2]_C_int) (n int, err error) {
-	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procpipe)), 1, uintptr(unsafe.Pointer(p)), 0, 0, 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetsockname)), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getcwd(buf []byte) (n int, err error) {
-	var _p0 *byte
-	if len(buf) > 0 {
-		_p0 = &buf[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetcwd)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0, 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
-	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procgetgroups)), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func setgroups(ngid int, gid *_Gid_t) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procsetgroups)), 2, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func wait4(pid int32, statusp *_C_int, options int, rusage *Rusage) (wpid int32, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwait4)), 4, uintptr(pid), uintptr(unsafe.Pointer(statusp)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
-	wpid = int32(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func gethostname(buf []byte) (n int, err error) {
-	var _p0 *byte
-	if len(buf) > 0 {
-		_p0 = &buf[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgethostname)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0, 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func utimes(path string, times *[2]Timeval) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procutimes)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func utimensat(fd int, path string, times *[2]Timespec, flag int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procutimensat)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flag), 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func fcntl(fd int, cmd int, arg int) (val int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(arg), 0, 0, 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func futimesat(fildes int, path *byte, times *[2]Timeval) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfutimesat)), 3, uintptr(fildes), uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(times)), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procaccept)), 3, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procrecvmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func acct(path *byte) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procacct)), 1, uintptr(unsafe.Pointer(path)), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func ioctl(fd int, req int, arg uintptr) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procioctl)), 3, uintptr(fd), uintptr(req), uintptr(arg), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Access(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procAccess)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procAdjtime)), 2, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChdir)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Chmod(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChmod)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Chown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChown)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Chroot(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procChroot)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Close(fd int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procClose)), 1, uintptr(fd), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Creat(path string, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procCreat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Dup(fd int) (nfd int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procDup)), 1, uintptr(fd), 0, 0, 0, 0, 0)
-	nfd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Dup2(oldfd int, newfd int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procDup2)), 2, uintptr(oldfd), uintptr(newfd), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Exit(code int) {
-	sysvicall6(uintptr(unsafe.Pointer(&procExit)), 1, uintptr(code), 0, 0, 0, 0, 0)
-	return
-}
-
-func Fchdir(fd int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchdir)), 1, uintptr(fd), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fchmod(fd int, mode uint32) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchmod)), 2, uintptr(fd), uintptr(mode), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchmodat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fchown(fd int, uid int, gid int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchown)), 3, uintptr(fd), uintptr(uid), uintptr(gid), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFchownat)), 5, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fdatasync(fd int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFdatasync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fpathconf(fd int, name int) (val int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFpathconf)), 2, uintptr(fd), uintptr(name), 0, 0, 0, 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fstat(fd int, stat *Stat_t) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFstat)), 2, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getdents(fd int, buf []byte, basep *uintptr) (n int, err error) {
-	var _p0 *byte
-	if len(buf) > 0 {
-		_p0 = &buf[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetdents)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getgid() (gid int) {
-	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetgid)), 0, 0, 0, 0, 0, 0, 0)
-	gid = int(r0)
-	return
-}
-
-func Getpid() (pid int) {
-	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpid)), 0, 0, 0, 0, 0, 0, 0)
-	pid = int(r0)
-	return
-}
-
-func Getpgid(pid int) (pgid int, err error) {
-	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpgid)), 1, uintptr(pid), 0, 0, 0, 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getpgrp() (pgid int, err error) {
-	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetpgrp)), 0, 0, 0, 0, 0, 0, 0)
-	pgid = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Geteuid() (euid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGeteuid)), 0, 0, 0, 0, 0, 0, 0)
-	euid = int(r0)
-	return
-}
-
-func Getegid() (egid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGetegid)), 0, 0, 0, 0, 0, 0, 0)
-	egid = int(r0)
-	return
-}
-
-func Getppid() (ppid int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procGetppid)), 0, 0, 0, 0, 0, 0, 0)
-	ppid = int(r0)
-	return
-}
-
-func Getpriority(which int, who int) (n int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procGetpriority)), 2, uintptr(which), uintptr(who), 0, 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getrusage(who int, rusage *Rusage) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGetrusage)), 2, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Gettimeofday(tv *Timeval) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procGettimeofday)), 1, uintptr(unsafe.Pointer(tv)), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Getuid() (uid int) {
-	r0, _, _ := rawSysvicall6(uintptr(unsafe.Pointer(&procGetuid)), 0, 0, 0, 0, 0, 0, 0)
-	uid = int(r0)
-	return
-}
-
-func Kill(pid int, signum syscall.Signal) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procKill)), 2, uintptr(pid), uintptr(signum), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Lchown(path string, uid int, gid int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLchown)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Link(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLink)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Listen(s int, backlog int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proclisten)), 2, uintptr(s), uintptr(backlog), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Lstat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procLstat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Madvise(b []byte, advice int) (err error) {
-	var _p0 *byte
-	if len(b) > 0 {
-		_p0 = &b[0]
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMadvise)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(advice), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mkdir(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkdir)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mkdirat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkdirat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mkfifo(path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkfifo)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mkfifoat(dirfd int, path string, mode uint32) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMkfifoat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mknod(path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMknod)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMknodat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev), 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mlock(b []byte) (err error) {
-	var _p0 *byte
-	if len(b) > 0 {
-		_p0 = &b[0]
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMlock)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMlockall)), 1, uintptr(flags), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 *byte
-	if len(b) > 0 {
-		_p0 = &b[0]
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMprotect)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(prot), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Munlock(b []byte) (err error) {
-	var _p0 *byte
-	if len(b) > 0 {
-		_p0 = &b[0]
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMunlock)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Munlockall() (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMunlockall)), 0, 0, 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procNanosleep)), 2, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Open(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procOpen)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procOpenat)), 4, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mode), 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Pathconf(path string, name int) (val int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPathconf)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0, 0, 0, 0)
-	val = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Pause() (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPause)), 0, 0, 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 *byte
-	if len(p) > 0 {
-		_p0 = &p[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPread)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 *byte
-	if len(p) > 0 {
-		_p0 = &p[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procPwrite)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(offset), 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func read(fd int, p []byte) (n int, err error) {
-	var _p0 *byte
-	if len(p) > 0 {
-		_p0 = &p[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Readlink(path string, buf []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	if len(buf) > 0 {
-		_p1 = &buf[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procReadlink)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(len(buf)), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Rename(from string, to string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(from)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(to)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRename)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(oldpath)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(newpath)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRenameat)), 4, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Rmdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procRmdir)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proclseek)), 3, uintptr(fd), uintptr(offset), uintptr(whence), 0, 0, 0)
-	newoffset = int64(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setegid(egid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetegid)), 1, uintptr(egid), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Seteuid(euid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSeteuid)), 1, uintptr(euid), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setgid(gid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetgid)), 1, uintptr(gid), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Sethostname(p []byte) (err error) {
-	var _p0 *byte
-	if len(p) > 0 {
-		_p0 = &p[0]
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSethostname)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setpgid(pid int, pgid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetpgid)), 2, uintptr(pid), uintptr(pgid), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setpriority(which int, who int, prio int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSetpriority)), 3, uintptr(which), uintptr(who), uintptr(prio), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setregid(rgid int, egid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetregid)), 2, uintptr(rgid), uintptr(egid), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setreuid(ruid int, euid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetreuid)), 2, uintptr(ruid), uintptr(euid), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setrlimit(which int, lim *Rlimit) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetrlimit)), 2, uintptr(which), uintptr(unsafe.Pointer(lim)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setsid() (pid int, err error) {
-	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetsid)), 0, 0, 0, 0, 0, 0, 0)
-	pid = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Setuid(uid int) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetuid)), 1, uintptr(uid), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Shutdown(s int, how int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procshutdown)), 2, uintptr(s), uintptr(how), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procStat)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Symlink(path string, link string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(link)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSymlink)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Sync() (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSync)), 0, 0, 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Times(tms *Tms) (ticks uintptr, err error) {
-	r0, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procTimes)), 1, uintptr(unsafe.Pointer(tms)), 0, 0, 0, 0, 0)
-	ticks = uintptr(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Truncate(path string, length int64) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procTruncate)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Fsync(fd int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFsync)), 1, uintptr(fd), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Ftruncate(fd int, length int64) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFtruncate)), 2, uintptr(fd), uintptr(length), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Umask(mask int) (oldmask int) {
-	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&procUmask)), 1, uintptr(mask), 0, 0, 0, 0, 0)
-	oldmask = int(r0)
-	return
-}
-
-func Uname(buf *Utsname) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procUname)), 1, uintptr(unsafe.Pointer(buf)), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Unmount(target string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(target)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procumount)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Unlink(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUnlink)), 1, uintptr(unsafe.Pointer(_p0)), 0, 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Unlinkat(dirfd int, path string, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUnlinkat)), 3, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Ustat(dev int, ubuf *Ustat_t) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUstat)), 2, uintptr(dev), uintptr(unsafe.Pointer(ubuf)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func Utime(path string, buf *Utimbuf) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procUtime)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(buf)), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procbind)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procconnect)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procmmap)), 6, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
-	ret = uintptr(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func munmap(addr uintptr, length uintptr) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procmunmap)), 2, uintptr(addr), uintptr(length), 0, 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
-	var _p0 *byte
-	if len(buf) > 0 {
-		_p0 = &buf[0]
-	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendto)), 6, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsocket)), 3, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
-	fd = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procsocketpair)), 4, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func write(fd int, p []byte) (n int, err error) {
-	var _p0 *byte
-	if len(p) > 0 {
-		_p0 = &p[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), 0, 0, 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procgetpeername)), 3, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), 0, 0, 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsetsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
-	var _p0 *byte
-	if len(p) > 0 {
-		_p0 = &p[0]
-	}
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procrecvfrom)), 6, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
-	n = int(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
-
-func sysconf(name int) (n int64, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsysconf)), 1, uintptr(name), 0, 0, 0, 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/unix/zsysctl_openbsd.go b/vendor/golang.org/x/sys/unix/zsysctl_openbsd.go
deleted file mode 100644
index 83bb935b91..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysctl_openbsd.go
+++ /dev/null
@@ -1,270 +0,0 @@
-// mksysctl_openbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-package unix
-
-type mibentry struct {
-	ctlname string
-	ctloid  []_C_int
-}
-
-var sysctlMib = []mibentry{
-	{"ddb.console", []_C_int{9, 6}},
-	{"ddb.log", []_C_int{9, 7}},
-	{"ddb.max_line", []_C_int{9, 3}},
-	{"ddb.max_width", []_C_int{9, 2}},
-	{"ddb.panic", []_C_int{9, 5}},
-	{"ddb.radix", []_C_int{9, 1}},
-	{"ddb.tab_stop_width", []_C_int{9, 4}},
-	{"ddb.trigger", []_C_int{9, 8}},
-	{"fs.posix.setuid", []_C_int{3, 1, 1}},
-	{"hw.allowpowerdown", []_C_int{6, 22}},
-	{"hw.byteorder", []_C_int{6, 4}},
-	{"hw.cpuspeed", []_C_int{6, 12}},
-	{"hw.diskcount", []_C_int{6, 10}},
-	{"hw.disknames", []_C_int{6, 8}},
-	{"hw.diskstats", []_C_int{6, 9}},
-	{"hw.machine", []_C_int{6, 1}},
-	{"hw.model", []_C_int{6, 2}},
-	{"hw.ncpu", []_C_int{6, 3}},
-	{"hw.ncpufound", []_C_int{6, 21}},
-	{"hw.pagesize", []_C_int{6, 7}},
-	{"hw.physmem", []_C_int{6, 19}},
-	{"hw.product", []_C_int{6, 15}},
-	{"hw.serialno", []_C_int{6, 17}},
-	{"hw.setperf", []_C_int{6, 13}},
-	{"hw.usermem", []_C_int{6, 20}},
-	{"hw.uuid", []_C_int{6, 18}},
-	{"hw.vendor", []_C_int{6, 14}},
-	{"hw.version", []_C_int{6, 16}},
-	{"kern.arandom", []_C_int{1, 37}},
-	{"kern.argmax", []_C_int{1, 8}},
-	{"kern.boottime", []_C_int{1, 21}},
-	{"kern.bufcachepercent", []_C_int{1, 72}},
-	{"kern.ccpu", []_C_int{1, 45}},
-	{"kern.clockrate", []_C_int{1, 12}},
-	{"kern.consdev", []_C_int{1, 75}},
-	{"kern.cp_time", []_C_int{1, 40}},
-	{"kern.cp_time2", []_C_int{1, 71}},
-	{"kern.cryptodevallowsoft", []_C_int{1, 53}},
-	{"kern.domainname", []_C_int{1, 22}},
-	{"kern.file", []_C_int{1, 73}},
-	{"kern.forkstat", []_C_int{1, 42}},
-	{"kern.fscale", []_C_int{1, 46}},
-	{"kern.fsync", []_C_int{1, 33}},
-	{"kern.hostid", []_C_int{1, 11}},
-	{"kern.hostname", []_C_int{1, 10}},
-	{"kern.intrcnt.nintrcnt", []_C_int{1, 63, 1}},
-	{"kern.job_control", []_C_int{1, 19}},
-	{"kern.malloc.buckets", []_C_int{1, 39, 1}},
-	{"kern.malloc.kmemnames", []_C_int{1, 39, 3}},
-	{"kern.maxclusters", []_C_int{1, 67}},
-	{"kern.maxfiles", []_C_int{1, 7}},
-	{"kern.maxlocksperuid", []_C_int{1, 70}},
-	{"kern.maxpartitions", []_C_int{1, 23}},
-	{"kern.maxproc", []_C_int{1, 6}},
-	{"kern.maxthread", []_C_int{1, 25}},
-	{"kern.maxvnodes", []_C_int{1, 5}},
-	{"kern.mbstat", []_C_int{1, 59}},
-	{"kern.msgbuf", []_C_int{1, 48}},
-	{"kern.msgbufsize", []_C_int{1, 38}},
-	{"kern.nchstats", []_C_int{1, 41}},
-	{"kern.netlivelocks", []_C_int{1, 76}},
-	{"kern.nfiles", []_C_int{1, 56}},
-	{"kern.ngroups", []_C_int{1, 18}},
-	{"kern.nosuidcoredump", []_C_int{1, 32}},
-	{"kern.nprocs", []_C_int{1, 47}},
-	{"kern.nselcoll", []_C_int{1, 43}},
-	{"kern.nthreads", []_C_int{1, 26}},
-	{"kern.numvnodes", []_C_int{1, 58}},
-	{"kern.osrelease", []_C_int{1, 2}},
-	{"kern.osrevision", []_C_int{1, 3}},
-	{"kern.ostype", []_C_int{1, 1}},
-	{"kern.osversion", []_C_int{1, 27}},
-	{"kern.pool_debug", []_C_int{1, 77}},
-	{"kern.posix1version", []_C_int{1, 17}},
-	{"kern.proc", []_C_int{1, 66}},
-	{"kern.random", []_C_int{1, 31}},
-	{"kern.rawpartition", []_C_int{1, 24}},
-	{"kern.saved_ids", []_C_int{1, 20}},
-	{"kern.securelevel", []_C_int{1, 9}},
-	{"kern.seminfo", []_C_int{1, 61}},
-	{"kern.shminfo", []_C_int{1, 62}},
-	{"kern.somaxconn", []_C_int{1, 28}},
-	{"kern.sominconn", []_C_int{1, 29}},
-	{"kern.splassert", []_C_int{1, 54}},
-	{"kern.stackgap_random", []_C_int{1, 50}},
-	{"kern.sysvipc_info", []_C_int{1, 51}},
-	{"kern.sysvmsg", []_C_int{1, 34}},
-	{"kern.sysvsem", []_C_int{1, 35}},
-	{"kern.sysvshm", []_C_int{1, 36}},
-	{"kern.timecounter.choice", []_C_int{1, 69, 4}},
-	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
-	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
-	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
-	{"kern.tty.maxptys", []_C_int{1, 44, 6}},
-	{"kern.tty.nptys", []_C_int{1, 44, 7}},
-	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
-	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
-	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
-	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
-	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
-	{"kern.ttycount", []_C_int{1, 57}},
-	{"kern.userasymcrypto", []_C_int{1, 60}},
-	{"kern.usercrypto", []_C_int{1, 52}},
-	{"kern.usermount", []_C_int{1, 30}},
-	{"kern.version", []_C_int{1, 4}},
-	{"kern.vnode", []_C_int{1, 13}},
-	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
-	{"kern.watchdog.period", []_C_int{1, 64, 1}},
-	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
-	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
-	{"net.inet.ah.enable", []_C_int{4, 2, 51, 1}},
-	{"net.inet.ah.stats", []_C_int{4, 2, 51, 2}},
-	{"net.inet.carp.allow", []_C_int{4, 2, 112, 1}},
-	{"net.inet.carp.log", []_C_int{4, 2, 112, 3}},
-	{"net.inet.carp.preempt", []_C_int{4, 2, 112, 2}},
-	{"net.inet.carp.stats", []_C_int{4, 2, 112, 4}},
-	{"net.inet.divert.recvspace", []_C_int{4, 2, 258, 1}},
-	{"net.inet.divert.sendspace", []_C_int{4, 2, 258, 2}},
-	{"net.inet.divert.stats", []_C_int{4, 2, 258, 3}},
-	{"net.inet.esp.enable", []_C_int{4, 2, 50, 1}},
-	{"net.inet.esp.stats", []_C_int{4, 2, 50, 4}},
-	{"net.inet.esp.udpencap", []_C_int{4, 2, 50, 2}},
-	{"net.inet.esp.udpencap_port", []_C_int{4, 2, 50, 3}},
-	{"net.inet.etherip.allow", []_C_int{4, 2, 97, 1}},
-	{"net.inet.etherip.stats", []_C_int{4, 2, 97, 2}},
-	{"net.inet.gre.allow", []_C_int{4, 2, 47, 1}},
-	{"net.inet.gre.wccp", []_C_int{4, 2, 47, 2}},
-	{"net.inet.icmp.bmcastecho", []_C_int{4, 2, 1, 2}},
-	{"net.inet.icmp.errppslimit", []_C_int{4, 2, 1, 3}},
-	{"net.inet.icmp.maskrepl", []_C_int{4, 2, 1, 1}},
-	{"net.inet.icmp.rediraccept", []_C_int{4, 2, 1, 4}},
-	{"net.inet.icmp.redirtimeout", []_C_int{4, 2, 1, 5}},
-	{"net.inet.icmp.stats", []_C_int{4, 2, 1, 7}},
-	{"net.inet.icmp.tstamprepl", []_C_int{4, 2, 1, 6}},
-	{"net.inet.igmp.stats", []_C_int{4, 2, 2, 1}},
-	{"net.inet.ip.arpqueued", []_C_int{4, 2, 0, 36}},
-	{"net.inet.ip.encdebug", []_C_int{4, 2, 0, 12}},
-	{"net.inet.ip.forwarding", []_C_int{4, 2, 0, 1}},
-	{"net.inet.ip.ifq.congestion", []_C_int{4, 2, 0, 30, 4}},
-	{"net.inet.ip.ifq.drops", []_C_int{4, 2, 0, 30, 3}},
-	{"net.inet.ip.ifq.len", []_C_int{4, 2, 0, 30, 1}},
-	{"net.inet.ip.ifq.maxlen", []_C_int{4, 2, 0, 30, 2}},
-	{"net.inet.ip.maxqueue", []_C_int{4, 2, 0, 11}},
-	{"net.inet.ip.mforwarding", []_C_int{4, 2, 0, 31}},
-	{"net.inet.ip.mrtproto", []_C_int{4, 2, 0, 34}},
-	{"net.inet.ip.mrtstats", []_C_int{4, 2, 0, 35}},
-	{"net.inet.ip.mtu", []_C_int{4, 2, 0, 4}},
-	{"net.inet.ip.mtudisc", []_C_int{4, 2, 0, 27}},
-	{"net.inet.ip.mtudisctimeout", []_C_int{4, 2, 0, 28}},
-	{"net.inet.ip.multipath", []_C_int{4, 2, 0, 32}},
-	{"net.inet.ip.portfirst", []_C_int{4, 2, 0, 7}},
-	{"net.inet.ip.porthifirst", []_C_int{4, 2, 0, 9}},
-	{"net.inet.ip.porthilast", []_C_int{4, 2, 0, 10}},
-	{"net.inet.ip.portlast", []_C_int{4, 2, 0, 8}},
-	{"net.inet.ip.redirect", []_C_int{4, 2, 0, 2}},
-	{"net.inet.ip.sourceroute", []_C_int{4, 2, 0, 5}},
-	{"net.inet.ip.stats", []_C_int{4, 2, 0, 33}},
-	{"net.inet.ip.ttl", []_C_int{4, 2, 0, 3}},
-	{"net.inet.ipcomp.enable", []_C_int{4, 2, 108, 1}},
-	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
-	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
-	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
-	{"net.inet.mobileip.allow", []_C_int{4, 2, 55, 1}},
-	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
-	{"net.inet.pim.stats", []_C_int{4, 2, 103, 1}},
-	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
-	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
-	{"net.inet.tcp.baddynamic", []_C_int{4, 2, 6, 6}},
-	{"net.inet.tcp.drop", []_C_int{4, 2, 6, 19}},
-	{"net.inet.tcp.ecn", []_C_int{4, 2, 6, 14}},
-	{"net.inet.tcp.ident", []_C_int{4, 2, 6, 9}},
-	{"net.inet.tcp.keepidle", []_C_int{4, 2, 6, 3}},
-	{"net.inet.tcp.keepinittime", []_C_int{4, 2, 6, 2}},
-	{"net.inet.tcp.keepintvl", []_C_int{4, 2, 6, 4}},
-	{"net.inet.tcp.mssdflt", []_C_int{4, 2, 6, 11}},
-	{"net.inet.tcp.reasslimit", []_C_int{4, 2, 6, 18}},
-	{"net.inet.tcp.rfc1323", []_C_int{4, 2, 6, 1}},
-	{"net.inet.tcp.rfc3390", []_C_int{4, 2, 6, 17}},
-	{"net.inet.tcp.rstppslimit", []_C_int{4, 2, 6, 12}},
-	{"net.inet.tcp.sack", []_C_int{4, 2, 6, 10}},
-	{"net.inet.tcp.sackholelimit", []_C_int{4, 2, 6, 20}},
-	{"net.inet.tcp.slowhz", []_C_int{4, 2, 6, 5}},
-	{"net.inet.tcp.stats", []_C_int{4, 2, 6, 21}},
-	{"net.inet.tcp.synbucketlimit", []_C_int{4, 2, 6, 16}},
-	{"net.inet.tcp.syncachelimit", []_C_int{4, 2, 6, 15}},
-	{"net.inet.udp.baddynamic", []_C_int{4, 2, 17, 2}},
-	{"net.inet.udp.checksum", []_C_int{4, 2, 17, 1}},
-	{"net.inet.udp.recvspace", []_C_int{4, 2, 17, 3}},
-	{"net.inet.udp.sendspace", []_C_int{4, 2, 17, 4}},
-	{"net.inet.udp.stats", []_C_int{4, 2, 17, 5}},
-	{"net.inet6.divert.recvspace", []_C_int{4, 24, 86, 1}},
-	{"net.inet6.divert.sendspace", []_C_int{4, 24, 86, 2}},
-	{"net.inet6.divert.stats", []_C_int{4, 24, 86, 3}},
-	{"net.inet6.icmp6.errppslimit", []_C_int{4, 24, 30, 14}},
-	{"net.inet6.icmp6.mtudisc_hiwat", []_C_int{4, 24, 30, 16}},
-	{"net.inet6.icmp6.mtudisc_lowat", []_C_int{4, 24, 30, 17}},
-	{"net.inet6.icmp6.nd6_debug", []_C_int{4, 24, 30, 18}},
-	{"net.inet6.icmp6.nd6_delay", []_C_int{4, 24, 30, 8}},
-	{"net.inet6.icmp6.nd6_maxnudhint", []_C_int{4, 24, 30, 15}},
-	{"net.inet6.icmp6.nd6_mmaxtries", []_C_int{4, 24, 30, 10}},
-	{"net.inet6.icmp6.nd6_prune", []_C_int{4, 24, 30, 6}},
-	{"net.inet6.icmp6.nd6_umaxtries", []_C_int{4, 24, 30, 9}},
-	{"net.inet6.icmp6.nd6_useloopback", []_C_int{4, 24, 30, 11}},
-	{"net.inet6.icmp6.nodeinfo", []_C_int{4, 24, 30, 13}},
-	{"net.inet6.icmp6.rediraccept", []_C_int{4, 24, 30, 2}},
-	{"net.inet6.icmp6.redirtimeout", []_C_int{4, 24, 30, 3}},
-	{"net.inet6.ip6.accept_rtadv", []_C_int{4, 24, 17, 12}},
-	{"net.inet6.ip6.auto_flowlabel", []_C_int{4, 24, 17, 17}},
-	{"net.inet6.ip6.dad_count", []_C_int{4, 24, 17, 16}},
-	{"net.inet6.ip6.dad_pending", []_C_int{4, 24, 17, 49}},
-	{"net.inet6.ip6.defmcasthlim", []_C_int{4, 24, 17, 18}},
-	{"net.inet6.ip6.forwarding", []_C_int{4, 24, 17, 1}},
-	{"net.inet6.ip6.forwsrcrt", []_C_int{4, 24, 17, 5}},
-	{"net.inet6.ip6.hdrnestlimit", []_C_int{4, 24, 17, 15}},
-	{"net.inet6.ip6.hlim", []_C_int{4, 24, 17, 3}},
-	{"net.inet6.ip6.log_interval", []_C_int{4, 24, 17, 14}},
-	{"net.inet6.ip6.maxdynroutes", []_C_int{4, 24, 17, 48}},
-	{"net.inet6.ip6.maxfragpackets", []_C_int{4, 24, 17, 9}},
-	{"net.inet6.ip6.maxfrags", []_C_int{4, 24, 17, 41}},
-	{"net.inet6.ip6.maxifdefrouters", []_C_int{4, 24, 17, 47}},
-	{"net.inet6.ip6.maxifprefixes", []_C_int{4, 24, 17, 46}},
-	{"net.inet6.ip6.mforwarding", []_C_int{4, 24, 17, 42}},
-	{"net.inet6.ip6.mrtproto", []_C_int{4, 24, 17, 8}},
-	{"net.inet6.ip6.mtudisctimeout", []_C_int{4, 24, 17, 50}},
-	{"net.inet6.ip6.multicast_mtudisc", []_C_int{4, 24, 17, 44}},
-	{"net.inet6.ip6.multipath", []_C_int{4, 24, 17, 43}},
-	{"net.inet6.ip6.neighborgcthresh", []_C_int{4, 24, 17, 45}},
-	{"net.inet6.ip6.redirect", []_C_int{4, 24, 17, 2}},
-	{"net.inet6.ip6.rr_prune", []_C_int{4, 24, 17, 22}},
-	{"net.inet6.ip6.sourcecheck", []_C_int{4, 24, 17, 10}},
-	{"net.inet6.ip6.sourcecheck_logint", []_C_int{4, 24, 17, 11}},
-	{"net.inet6.ip6.use_deprecated", []_C_int{4, 24, 17, 21}},
-	{"net.inet6.ip6.v6only", []_C_int{4, 24, 17, 24}},
-	{"net.key.sadb_dump", []_C_int{4, 30, 1}},
-	{"net.key.spd_dump", []_C_int{4, 30, 2}},
-	{"net.mpls.ifq.congestion", []_C_int{4, 33, 3, 4}},
-	{"net.mpls.ifq.drops", []_C_int{4, 33, 3, 3}},
-	{"net.mpls.ifq.len", []_C_int{4, 33, 3, 1}},
-	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
-	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
-	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
-	{"net.mpls.maxloop_inkernel", []_C_int{4, 33, 4}},
-	{"net.mpls.ttl", []_C_int{4, 33, 2}},
-	{"net.pflow.stats", []_C_int{4, 34, 1}},
-	{"net.pipex.enable", []_C_int{4, 35, 1}},
-	{"vm.anonmin", []_C_int{2, 7}},
-	{"vm.loadavg", []_C_int{2, 2}},
-	{"vm.maxslp", []_C_int{2, 10}},
-	{"vm.nkmempages", []_C_int{2, 6}},
-	{"vm.psstrings", []_C_int{2, 3}},
-	{"vm.swapencrypt.enable", []_C_int{2, 5, 0}},
-	{"vm.swapencrypt.keyscreated", []_C_int{2, 5, 1}},
-	{"vm.swapencrypt.keysdeleted", []_C_int{2, 5, 2}},
-	{"vm.uspace", []_C_int{2, 11}},
-	{"vm.uvmexp", []_C_int{2, 4}},
-	{"vm.vmmeter", []_C_int{2, 1}},
-	{"vm.vnodemin", []_C_int{2, 9}},
-	{"vm.vtextmin", []_C_int{2, 8}},
-}
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
deleted file mode 100644
index 2786773ba3..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
+++ /dev/null
@@ -1,398 +0,0 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build 386,darwin
-
-package unix
-
-const (
-	SYS_SYSCALL                        = 0
-	SYS_EXIT                           = 1
-	SYS_FORK                           = 2
-	SYS_READ                           = 3
-	SYS_WRITE                          = 4
-	SYS_OPEN                           = 5
-	SYS_CLOSE                          = 6
-	SYS_WAIT4                          = 7
-	SYS_LINK                           = 9
-	SYS_UNLINK                         = 10
-	SYS_CHDIR                          = 12
-	SYS_FCHDIR                         = 13
-	SYS_MKNOD                          = 14
-	SYS_CHMOD                          = 15
-	SYS_CHOWN                          = 16
-	SYS_GETFSSTAT                      = 18
-	SYS_GETPID                         = 20
-	SYS_SETUID                         = 23
-	SYS_GETUID                         = 24
-	SYS_GETEUID                        = 25
-	SYS_PTRACE                         = 26
-	SYS_RECVMSG                        = 27
-	SYS_SENDMSG                        = 28
-	SYS_RECVFROM                       = 29
-	SYS_ACCEPT                         = 30
-	SYS_GETPEERNAME                    = 31
-	SYS_GETSOCKNAME                    = 32
-	SYS_ACCESS                         = 33
-	SYS_CHFLAGS                        = 34
-	SYS_FCHFLAGS                       = 35
-	SYS_SYNC                           = 36
-	SYS_KILL                           = 37
-	SYS_GETPPID                        = 39
-	SYS_DUP                            = 41
-	SYS_PIPE                           = 42
-	SYS_GETEGID                        = 43
-	SYS_SIGACTION                      = 46
-	SYS_GETGID                         = 47
-	SYS_SIGPROCMASK                    = 48
-	SYS_GETLOGIN                       = 49
-	SYS_SETLOGIN                       = 50
-	SYS_ACCT                           = 51
-	SYS_SIGPENDING                     = 52
-	SYS_SIGALTSTACK                    = 53
-	SYS_IOCTL                          = 54
-	SYS_REBOOT                         = 55
-	SYS_REVOKE                         = 56
-	SYS_SYMLINK                        = 57
-	SYS_READLINK                       = 58
-	SYS_EXECVE                         = 59
-	SYS_UMASK                          = 60
-	SYS_CHROOT                         = 61
-	SYS_MSYNC                          = 65
-	SYS_VFORK                          = 66
-	SYS_MUNMAP                         = 73
-	SYS_MPROTECT                       = 74
-	SYS_MADVISE                        = 75
-	SYS_MINCORE                        = 78
-	SYS_GETGROUPS                      = 79
-	SYS_SETGROUPS                      = 80
-	SYS_GETPGRP                        = 81
-	SYS_SETPGID                        = 82
-	SYS_SETITIMER                      = 83
-	SYS_SWAPON                         = 85
-	SYS_GETITIMER                      = 86
-	SYS_GETDTABLESIZE                  = 89
-	SYS_DUP2                           = 90
-	SYS_FCNTL                          = 92
-	SYS_SELECT                         = 93
-	SYS_FSYNC                          = 95
-	SYS_SETPRIORITY                    = 96
-	SYS_SOCKET                         = 97
-	SYS_CONNECT                        = 98
-	SYS_GETPRIORITY                    = 100
-	SYS_BIND                           = 104
-	SYS_SETSOCKOPT                     = 105
-	SYS_LISTEN                         = 106
-	SYS_SIGSUSPEND                     = 111
-	SYS_GETTIMEOFDAY                   = 116
-	SYS_GETRUSAGE                      = 117
-	SYS_GETSOCKOPT                     = 118
-	SYS_READV                          = 120
-	SYS_WRITEV                         = 121
-	SYS_SETTIMEOFDAY                   = 122
-	SYS_FCHOWN                         = 123
-	SYS_FCHMOD                         = 124
-	SYS_SETREUID                       = 126
-	SYS_SETREGID                       = 127
-	SYS_RENAME                         = 128
-	SYS_FLOCK                          = 131
-	SYS_MKFIFO                         = 132
-	SYS_SENDTO                         = 133
-	SYS_SHUTDOWN                       = 134
-	SYS_SOCKETPAIR                     = 135
-	SYS_MKDIR                          = 136
-	SYS_RMDIR                          = 137
-	SYS_UTIMES                         = 138
-	SYS_FUTIMES                        = 139
-	SYS_ADJTIME                        = 140
-	SYS_GETHOSTUUID                    = 142
-	SYS_SETSID                         = 147
-	SYS_GETPGID                        = 151
-	SYS_SETPRIVEXEC                    = 152
-	SYS_PREAD                          = 153
-	SYS_PWRITE                         = 154
-	SYS_NFSSVC                         = 155
-	SYS_STATFS                         = 157
-	SYS_FSTATFS                        = 158
-	SYS_UNMOUNT                        = 159
-	SYS_GETFH                          = 161
-	SYS_QUOTACTL                       = 165
-	SYS_MOUNT                          = 167
-	SYS_CSOPS                          = 169
-	SYS_CSOPS_AUDITTOKEN               = 170
-	SYS_WAITID                         = 173
-	SYS_KDEBUG_TRACE64                 = 179
-	SYS_KDEBUG_TRACE                   = 180
-	SYS_SETGID                         = 181
-	SYS_SETEGID                        = 182
-	SYS_SETEUID                        = 183
-	SYS_SIGRETURN                      = 184
-	SYS_CHUD                           = 185
-	SYS_FDATASYNC                      = 187
-	SYS_STAT                           = 188
-	SYS_FSTAT                          = 189
-	SYS_LSTAT                          = 190
-	SYS_PATHCONF                       = 191
-	SYS_FPATHCONF                      = 192
-	SYS_GETRLIMIT                      = 194
-	SYS_SETRLIMIT                      = 195
-	SYS_GETDIRENTRIES                  = 196
-	SYS_MMAP                           = 197
-	SYS_LSEEK                          = 199
-	SYS_TRUNCATE                       = 200
-	SYS_FTRUNCATE                      = 201
-	SYS_SYSCTL                         = 202
-	SYS_MLOCK                          = 203
-	SYS_MUNLOCK                        = 204
-	SYS_UNDELETE                       = 205
-	SYS_OPEN_DPROTECTED_NP             = 216
-	SYS_GETATTRLIST                    = 220
-	SYS_SETATTRLIST                    = 221
-	SYS_GETDIRENTRIESATTR              = 222
-	SYS_EXCHANGEDATA                   = 223
-	SYS_SEARCHFS                       = 225
-	SYS_DELETE                         = 226
-	SYS_COPYFILE                       = 227
-	SYS_FGETATTRLIST                   = 228
-	SYS_FSETATTRLIST                   = 229
-	SYS_POLL                           = 230
-	SYS_WATCHEVENT                     = 231
-	SYS_WAITEVENT                      = 232
-	SYS_MODWATCH                       = 233
-	SYS_GETXATTR                       = 234
-	SYS_FGETXATTR                      = 235
-	SYS_SETXATTR                       = 236
-	SYS_FSETXATTR                      = 237
-	SYS_REMOVEXATTR                    = 238
-	SYS_FREMOVEXATTR                   = 239
-	SYS_LISTXATTR                      = 240
-	SYS_FLISTXATTR                     = 241
-	SYS_FSCTL                          = 242
-	SYS_INITGROUPS                     = 243
-	SYS_POSIX_SPAWN                    = 244
-	SYS_FFSCTL                         = 245
-	SYS_NFSCLNT                        = 247
-	SYS_FHOPEN                         = 248
-	SYS_MINHERIT                       = 250
-	SYS_SEMSYS                         = 251
-	SYS_MSGSYS                         = 252
-	SYS_SHMSYS                         = 253
-	SYS_SEMCTL                         = 254
-	SYS_SEMGET                         = 255
-	SYS_SEMOP                          = 256
-	SYS_MSGCTL                         = 258
-	SYS_MSGGET                         = 259
-	SYS_MSGSND                         = 260
-	SYS_MSGRCV                         = 261
-	SYS_SHMAT                          = 262
-	SYS_SHMCTL                         = 263
-	SYS_SHMDT                          = 264
-	SYS_SHMGET                         = 265
-	SYS_SHM_OPEN                       = 266
-	SYS_SHM_UNLINK                     = 267
-	SYS_SEM_OPEN                       = 268
-	SYS_SEM_CLOSE                      = 269
-	SYS_SEM_UNLINK                     = 270
-	SYS_SEM_WAIT                       = 271
-	SYS_SEM_TRYWAIT                    = 272
-	SYS_SEM_POST                       = 273
-	SYS_SYSCTLBYNAME                   = 274
-	SYS_OPEN_EXTENDED                  = 277
-	SYS_UMASK_EXTENDED                 = 278
-	SYS_STAT_EXTENDED                  = 279
-	SYS_LSTAT_EXTENDED                 = 280
-	SYS_FSTAT_EXTENDED                 = 281
-	SYS_CHMOD_EXTENDED                 = 282
-	SYS_FCHMOD_EXTENDED                = 283
-	SYS_ACCESS_EXTENDED                = 284
-	SYS_SETTID                         = 285
-	SYS_GETTID                         = 286
-	SYS_SETSGROUPS                     = 287
-	SYS_GETSGROUPS                     = 288
-	SYS_SETWGROUPS                     = 289
-	SYS_GETWGROUPS                     = 290
-	SYS_MKFIFO_EXTENDED                = 291
-	SYS_MKDIR_EXTENDED                 = 292
-	SYS_IDENTITYSVC                    = 293
-	SYS_SHARED_REGION_CHECK_NP         = 294
-	SYS_VM_PRESSURE_MONITOR            = 296
-	SYS_PSYNCH_RW_LONGRDLOCK           = 297
-	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
-	SYS_PSYNCH_RW_DOWNGRADE            = 299
-	SYS_PSYNCH_RW_UPGRADE              = 300
-	SYS_PSYNCH_MUTEXWAIT               = 301
-	SYS_PSYNCH_MUTEXDROP               = 302
-	SYS_PSYNCH_CVBROAD                 = 303
-	SYS_PSYNCH_CVSIGNAL                = 304
-	SYS_PSYNCH_CVWAIT                  = 305
-	SYS_PSYNCH_RW_RDLOCK               = 306
-	SYS_PSYNCH_RW_WRLOCK               = 307
-	SYS_PSYNCH_RW_UNLOCK               = 308
-	SYS_PSYNCH_RW_UNLOCK2              = 309
-	SYS_GETSID                         = 310
-	SYS_SETTID_WITH_PID                = 311
-	SYS_PSYNCH_CVCLRPREPOST            = 312
-	SYS_AIO_FSYNC                      = 313
-	SYS_AIO_RETURN                     = 314
-	SYS_AIO_SUSPEND                    = 315
-	SYS_AIO_CANCEL                     = 316
-	SYS_AIO_ERROR                      = 317
-	SYS_AIO_READ                       = 318
-	SYS_AIO_WRITE                      = 319
-	SYS_LIO_LISTIO                     = 320
-	SYS_IOPOLICYSYS                    = 322
-	SYS_PROCESS_POLICY                 = 323
-	SYS_MLOCKALL                       = 324
-	SYS_MUNLOCKALL                     = 325
-	SYS_ISSETUGID                      = 327
-	SYS___PTHREAD_KILL                 = 328
-	SYS___PTHREAD_SIGMASK              = 329
-	SYS___SIGWAIT                      = 330
-	SYS___DISABLE_THREADSIGNAL         = 331
-	SYS___PTHREAD_MARKCANCEL           = 332
-	SYS___PTHREAD_CANCELED             = 333
-	SYS___SEMWAIT_SIGNAL               = 334
-	SYS_PROC_INFO                      = 336
-	SYS_SENDFILE                       = 337
-	SYS_STAT64                         = 338
-	SYS_FSTAT64                        = 339
-	SYS_LSTAT64                        = 340
-	SYS_STAT64_EXTENDED                = 341
-	SYS_LSTAT64_EXTENDED               = 342
-	SYS_FSTAT64_EXTENDED               = 343
-	SYS_GETDIRENTRIES64                = 344
-	SYS_STATFS64                       = 345
-	SYS_FSTATFS64                      = 346
-	SYS_GETFSSTAT64                    = 347
-	SYS___PTHREAD_CHDIR                = 348
-	SYS___PTHREAD_FCHDIR               = 349
-	SYS_AUDIT                          = 350
-	SYS_AUDITON                        = 351
-	SYS_GETAUID                        = 353
-	SYS_SETAUID                        = 354
-	SYS_GETAUDIT_ADDR                  = 357
-	SYS_SETAUDIT_ADDR                  = 358
-	SYS_AUDITCTL                       = 359
-	SYS_BSDTHREAD_CREATE               = 360
-	SYS_BSDTHREAD_TERMINATE            = 361
-	SYS_KQUEUE                         = 362
-	SYS_KEVENT                         = 363
-	SYS_LCHOWN                         = 364
-	SYS_STACK_SNAPSHOT                 = 365
-	SYS_BSDTHREAD_REGISTER             = 366
-	SYS_WORKQ_OPEN                     = 367
-	SYS_WORKQ_KERNRETURN               = 368
-	SYS_KEVENT64                       = 369
-	SYS___OLD_SEMWAIT_SIGNAL           = 370
-	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
-	SYS_THREAD_SELFID                  = 372
-	SYS_LEDGER                         = 373
-	SYS___MAC_EXECVE                   = 380
-	SYS___MAC_SYSCALL                  = 381
-	SYS___MAC_GET_FILE                 = 382
-	SYS___MAC_SET_FILE                 = 383
-	SYS___MAC_GET_LINK                 = 384
-	SYS___MAC_SET_LINK                 = 385
-	SYS___MAC_GET_PROC                 = 386
-	SYS___MAC_SET_PROC                 = 387
-	SYS___MAC_GET_FD                   = 388
-	SYS___MAC_SET_FD                   = 389
-	SYS___MAC_GET_PID                  = 390
-	SYS___MAC_GET_LCID                 = 391
-	SYS___MAC_GET_LCTX                 = 392
-	SYS___MAC_SET_LCTX                 = 393
-	SYS_SETLCID                        = 394
-	SYS_GETLCID                        = 395
-	SYS_READ_NOCANCEL                  = 396
-	SYS_WRITE_NOCANCEL                 = 397
-	SYS_OPEN_NOCANCEL                  = 398
-	SYS_CLOSE_NOCANCEL                 = 399
-	SYS_WAIT4_NOCANCEL                 = 400
-	SYS_RECVMSG_NOCANCEL               = 401
-	SYS_SENDMSG_NOCANCEL               = 402
-	SYS_RECVFROM_NOCANCEL              = 403
-	SYS_ACCEPT_NOCANCEL                = 404
-	SYS_MSYNC_NOCANCEL                 = 405
-	SYS_FCNTL_NOCANCEL                 = 406
-	SYS_SELECT_NOCANCEL                = 407
-	SYS_FSYNC_NOCANCEL                 = 408
-	SYS_CONNECT_NOCANCEL               = 409
-	SYS_SIGSUSPEND_NOCANCEL            = 410
-	SYS_READV_NOCANCEL                 = 411
-	SYS_WRITEV_NOCANCEL                = 412
-	SYS_SENDTO_NOCANCEL                = 413
-	SYS_PREAD_NOCANCEL                 = 414
-	SYS_PWRITE_NOCANCEL                = 415
-	SYS_WAITID_NOCANCEL                = 416
-	SYS_POLL_NOCANCEL                  = 417
-	SYS_MSGSND_NOCANCEL                = 418
-	SYS_MSGRCV_NOCANCEL                = 419
-	SYS_SEM_WAIT_NOCANCEL              = 420
-	SYS_AIO_SUSPEND_NOCANCEL           = 421
-	SYS___SIGWAIT_NOCANCEL             = 422
-	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
-	SYS___MAC_MOUNT                    = 424
-	SYS___MAC_GET_MOUNT                = 425
-	SYS___MAC_GETFSSTAT                = 426
-	SYS_FSGETPATH                      = 427
-	SYS_AUDIT_SESSION_SELF             = 428
-	SYS_AUDIT_SESSION_JOIN             = 429
-	SYS_FILEPORT_MAKEPORT              = 430
-	SYS_FILEPORT_MAKEFD                = 431
-	SYS_AUDIT_SESSION_PORT             = 432
-	SYS_PID_SUSPEND                    = 433
-	SYS_PID_RESUME                     = 434
-	SYS_PID_HIBERNATE                  = 435
-	SYS_PID_SHUTDOWN_SOCKETS           = 436
-	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
-	SYS_KAS_INFO                       = 439
-	SYS_MEMORYSTATUS_CONTROL           = 440
-	SYS_GUARDED_OPEN_NP                = 441
-	SYS_GUARDED_CLOSE_NP               = 442
-	SYS_GUARDED_KQUEUE_NP              = 443
-	SYS_CHANGE_FDGUARD_NP              = 444
-	SYS_PROC_RLIMIT_CONTROL            = 446
-	SYS_CONNECTX                       = 447
-	SYS_DISCONNECTX                    = 448
-	SYS_PEELOFF                        = 449
-	SYS_SOCKET_DELEGATE                = 450
-	SYS_TELEMETRY                      = 451
-	SYS_PROC_UUID_POLICY               = 452
-	SYS_MEMORYSTATUS_GET_LEVEL         = 453
-	SYS_SYSTEM_OVERRIDE                = 454
-	SYS_VFS_PURGE                      = 455
-	SYS_SFI_CTL                        = 456
-	SYS_SFI_PIDCTL                     = 457
-	SYS_COALITION                      = 458
-	SYS_COALITION_INFO                 = 459
-	SYS_NECP_MATCH_POLICY              = 460
-	SYS_GETATTRLISTBULK                = 461
-	SYS_OPENAT                         = 463
-	SYS_OPENAT_NOCANCEL                = 464
-	SYS_RENAMEAT                       = 465
-	SYS_FACCESSAT                      = 466
-	SYS_FCHMODAT                       = 467
-	SYS_FCHOWNAT                       = 468
-	SYS_FSTATAT                        = 469
-	SYS_FSTATAT64                      = 470
-	SYS_LINKAT                         = 471
-	SYS_UNLINKAT                       = 472
-	SYS_READLINKAT                     = 473
-	SYS_SYMLINKAT                      = 474
-	SYS_MKDIRAT                        = 475
-	SYS_GETATTRLISTAT                  = 476
-	SYS_PROC_TRACE_LOG                 = 477
-	SYS_BSDTHREAD_CTL                  = 478
-	SYS_OPENBYID_NP                    = 479
-	SYS_RECVMSG_X                      = 480
-	SYS_SENDMSG_X                      = 481
-	SYS_THREAD_SELFUSAGE               = 482
-	SYS_CSRCTL                         = 483
-	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
-	SYS_GUARDED_WRITE_NP               = 485
-	SYS_GUARDED_PWRITE_NP              = 486
-	SYS_GUARDED_WRITEV_NP              = 487
-	SYS_RENAME_EXT                     = 488
-	SYS_MREMAP_ENCRYPTED               = 489
-	SYS_MAXSYSCALL                     = 490
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
deleted file mode 100644
index 09de240c8f..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
+++ /dev/null
@@ -1,398 +0,0 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build amd64,darwin
-
-package unix
-
-const (
-	SYS_SYSCALL                        = 0
-	SYS_EXIT                           = 1
-	SYS_FORK                           = 2
-	SYS_READ                           = 3
-	SYS_WRITE                          = 4
-	SYS_OPEN                           = 5
-	SYS_CLOSE                          = 6
-	SYS_WAIT4                          = 7
-	SYS_LINK                           = 9
-	SYS_UNLINK                         = 10
-	SYS_CHDIR                          = 12
-	SYS_FCHDIR                         = 13
-	SYS_MKNOD                          = 14
-	SYS_CHMOD                          = 15
-	SYS_CHOWN                          = 16
-	SYS_GETFSSTAT                      = 18
-	SYS_GETPID                         = 20
-	SYS_SETUID                         = 23
-	SYS_GETUID                         = 24
-	SYS_GETEUID                        = 25
-	SYS_PTRACE                         = 26
-	SYS_RECVMSG                        = 27
-	SYS_SENDMSG                        = 28
-	SYS_RECVFROM                       = 29
-	SYS_ACCEPT                         = 30
-	SYS_GETPEERNAME                    = 31
-	SYS_GETSOCKNAME                    = 32
-	SYS_ACCESS                         = 33
-	SYS_CHFLAGS                        = 34
-	SYS_FCHFLAGS                       = 35
-	SYS_SYNC                           = 36
-	SYS_KILL                           = 37
-	SYS_GETPPID                        = 39
-	SYS_DUP                            = 41
-	SYS_PIPE                           = 42
-	SYS_GETEGID                        = 43
-	SYS_SIGACTION                      = 46
-	SYS_GETGID                         = 47
-	SYS_SIGPROCMASK                    = 48
-	SYS_GETLOGIN                       = 49
-	SYS_SETLOGIN                       = 50
-	SYS_ACCT                           = 51
-	SYS_SIGPENDING                     = 52
-	SYS_SIGALTSTACK                    = 53
-	SYS_IOCTL                          = 54
-	SYS_REBOOT                         = 55
-	SYS_REVOKE                         = 56
-	SYS_SYMLINK                        = 57
-	SYS_READLINK                       = 58
-	SYS_EXECVE                         = 59
-	SYS_UMASK                          = 60
-	SYS_CHROOT                         = 61
-	SYS_MSYNC                          = 65
-	SYS_VFORK                          = 66
-	SYS_MUNMAP                         = 73
-	SYS_MPROTECT                       = 74
-	SYS_MADVISE                        = 75
-	SYS_MINCORE                        = 78
-	SYS_GETGROUPS                      = 79
-	SYS_SETGROUPS                      = 80
-	SYS_GETPGRP                        = 81
-	SYS_SETPGID                        = 82
-	SYS_SETITIMER                      = 83
-	SYS_SWAPON                         = 85
-	SYS_GETITIMER                      = 86
-	SYS_GETDTABLESIZE                  = 89
-	SYS_DUP2                           = 90
-	SYS_FCNTL                          = 92
-	SYS_SELECT                         = 93
-	SYS_FSYNC                          = 95
-	SYS_SETPRIORITY                    = 96
-	SYS_SOCKET                         = 97
-	SYS_CONNECT                        = 98
-	SYS_GETPRIORITY                    = 100
-	SYS_BIND                           = 104
-	SYS_SETSOCKOPT                     = 105
-	SYS_LISTEN                         = 106
-	SYS_SIGSUSPEND                     = 111
-	SYS_GETTIMEOFDAY                   = 116
-	SYS_GETRUSAGE                      = 117
-	SYS_GETSOCKOPT                     = 118
-	SYS_READV                          = 120
-	SYS_WRITEV                         = 121
-	SYS_SETTIMEOFDAY                   = 122
-	SYS_FCHOWN                         = 123
-	SYS_FCHMOD                         = 124
-	SYS_SETREUID                       = 126
-	SYS_SETREGID                       = 127
-	SYS_RENAME                         = 128
-	SYS_FLOCK                          = 131
-	SYS_MKFIFO                         = 132
-	SYS_SENDTO                         = 133
-	SYS_SHUTDOWN                       = 134
-	SYS_SOCKETPAIR                     = 135
-	SYS_MKDIR                          = 136
-	SYS_RMDIR                          = 137
-	SYS_UTIMES                         = 138
-	SYS_FUTIMES                        = 139
-	SYS_ADJTIME                        = 140
-	SYS_GETHOSTUUID                    = 142
-	SYS_SETSID                         = 147
-	SYS_GETPGID                        = 151
-	SYS_SETPRIVEXEC                    = 152
-	SYS_PREAD                          = 153
-	SYS_PWRITE                         = 154
-	SYS_NFSSVC                         = 155
-	SYS_STATFS                         = 157
-	SYS_FSTATFS                        = 158
-	SYS_UNMOUNT                        = 159
-	SYS_GETFH                          = 161
-	SYS_QUOTACTL                       = 165
-	SYS_MOUNT                          = 167
-	SYS_CSOPS                          = 169
-	SYS_CSOPS_AUDITTOKEN               = 170
-	SYS_WAITID                         = 173
-	SYS_KDEBUG_TRACE64                 = 179
-	SYS_KDEBUG_TRACE                   = 180
-	SYS_SETGID                         = 181
-	SYS_SETEGID                        = 182
-	SYS_SETEUID                        = 183
-	SYS_SIGRETURN                      = 184
-	SYS_CHUD                           = 185
-	SYS_FDATASYNC                      = 187
-	SYS_STAT                           = 188
-	SYS_FSTAT                          = 189
-	SYS_LSTAT                          = 190
-	SYS_PATHCONF                       = 191
-	SYS_FPATHCONF                      = 192
-	SYS_GETRLIMIT                      = 194
-	SYS_SETRLIMIT                      = 195
-	SYS_GETDIRENTRIES                  = 196
-	SYS_MMAP                           = 197
-	SYS_LSEEK                          = 199
-	SYS_TRUNCATE                       = 200
-	SYS_FTRUNCATE                      = 201
-	SYS_SYSCTL                         = 202
-	SYS_MLOCK                          = 203
-	SYS_MUNLOCK                        = 204
-	SYS_UNDELETE                       = 205
-	SYS_OPEN_DPROTECTED_NP             = 216
-	SYS_GETATTRLIST                    = 220
-	SYS_SETATTRLIST                    = 221
-	SYS_GETDIRENTRIESATTR              = 222
-	SYS_EXCHANGEDATA                   = 223
-	SYS_SEARCHFS                       = 225
-	SYS_DELETE                         = 226
-	SYS_COPYFILE                       = 227
-	SYS_FGETATTRLIST                   = 228
-	SYS_FSETATTRLIST                   = 229
-	SYS_POLL                           = 230
-	SYS_WATCHEVENT                     = 231
-	SYS_WAITEVENT                      = 232
-	SYS_MODWATCH                       = 233
-	SYS_GETXATTR                       = 234
-	SYS_FGETXATTR                      = 235
-	SYS_SETXATTR                       = 236
-	SYS_FSETXATTR                      = 237
-	SYS_REMOVEXATTR                    = 238
-	SYS_FREMOVEXATTR                   = 239
-	SYS_LISTXATTR                      = 240
-	SYS_FLISTXATTR                     = 241
-	SYS_FSCTL                          = 242
-	SYS_INITGROUPS                     = 243
-	SYS_POSIX_SPAWN                    = 244
-	SYS_FFSCTL                         = 245
-	SYS_NFSCLNT                        = 247
-	SYS_FHOPEN                         = 248
-	SYS_MINHERIT                       = 250
-	SYS_SEMSYS                         = 251
-	SYS_MSGSYS                         = 252
-	SYS_SHMSYS                         = 253
-	SYS_SEMCTL                         = 254
-	SYS_SEMGET                         = 255
-	SYS_SEMOP                          = 256
-	SYS_MSGCTL                         = 258
-	SYS_MSGGET                         = 259
-	SYS_MSGSND                         = 260
-	SYS_MSGRCV                         = 261
-	SYS_SHMAT                          = 262
-	SYS_SHMCTL                         = 263
-	SYS_SHMDT                          = 264
-	SYS_SHMGET                         = 265
-	SYS_SHM_OPEN                       = 266
-	SYS_SHM_UNLINK                     = 267
-	SYS_SEM_OPEN                       = 268
-	SYS_SEM_CLOSE                      = 269
-	SYS_SEM_UNLINK                     = 270
-	SYS_SEM_WAIT                       = 271
-	SYS_SEM_TRYWAIT                    = 272
-	SYS_SEM_POST                       = 273
-	SYS_SYSCTLBYNAME                   = 274
-	SYS_OPEN_EXTENDED                  = 277
-	SYS_UMASK_EXTENDED                 = 278
-	SYS_STAT_EXTENDED                  = 279
-	SYS_LSTAT_EXTENDED                 = 280
-	SYS_FSTAT_EXTENDED                 = 281
-	SYS_CHMOD_EXTENDED                 = 282
-	SYS_FCHMOD_EXTENDED                = 283
-	SYS_ACCESS_EXTENDED                = 284
-	SYS_SETTID                         = 285
-	SYS_GETTID                         = 286
-	SYS_SETSGROUPS                     = 287
-	SYS_GETSGROUPS                     = 288
-	SYS_SETWGROUPS                     = 289
-	SYS_GETWGROUPS                     = 290
-	SYS_MKFIFO_EXTENDED                = 291
-	SYS_MKDIR_EXTENDED                 = 292
-	SYS_IDENTITYSVC                    = 293
-	SYS_SHARED_REGION_CHECK_NP         = 294
-	SYS_VM_PRESSURE_MONITOR            = 296
-	SYS_PSYNCH_RW_LONGRDLOCK           = 297
-	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
-	SYS_PSYNCH_RW_DOWNGRADE            = 299
-	SYS_PSYNCH_RW_UPGRADE              = 300
-	SYS_PSYNCH_MUTEXWAIT               = 301
-	SYS_PSYNCH_MUTEXDROP               = 302
-	SYS_PSYNCH_CVBROAD                 = 303
-	SYS_PSYNCH_CVSIGNAL                = 304
-	SYS_PSYNCH_CVWAIT                  = 305
-	SYS_PSYNCH_RW_RDLOCK               = 306
-	SYS_PSYNCH_RW_WRLOCK               = 307
-	SYS_PSYNCH_RW_UNLOCK               = 308
-	SYS_PSYNCH_RW_UNLOCK2              = 309
-	SYS_GETSID                         = 310
-	SYS_SETTID_WITH_PID                = 311
-	SYS_PSYNCH_CVCLRPREPOST            = 312
-	SYS_AIO_FSYNC                      = 313
-	SYS_AIO_RETURN                     = 314
-	SYS_AIO_SUSPEND                    = 315
-	SYS_AIO_CANCEL                     = 316
-	SYS_AIO_ERROR                      = 317
-	SYS_AIO_READ                       = 318
-	SYS_AIO_WRITE                      = 319
-	SYS_LIO_LISTIO                     = 320
-	SYS_IOPOLICYSYS                    = 322
-	SYS_PROCESS_POLICY                 = 323
-	SYS_MLOCKALL                       = 324
-	SYS_MUNLOCKALL                     = 325
-	SYS_ISSETUGID                      = 327
-	SYS___PTHREAD_KILL                 = 328
-	SYS___PTHREAD_SIGMASK              = 329
-	SYS___SIGWAIT                      = 330
-	SYS___DISABLE_THREADSIGNAL         = 331
-	SYS___PTHREAD_MARKCANCEL           = 332
-	SYS___PTHREAD_CANCELED             = 333
-	SYS___SEMWAIT_SIGNAL               = 334
-	SYS_PROC_INFO                      = 336
-	SYS_SENDFILE                       = 337
-	SYS_STAT64                         = 338
-	SYS_FSTAT64                        = 339
-	SYS_LSTAT64                        = 340
-	SYS_STAT64_EXTENDED                = 341
-	SYS_LSTAT64_EXTENDED               = 342
-	SYS_FSTAT64_EXTENDED               = 343
-	SYS_GETDIRENTRIES64                = 344
-	SYS_STATFS64                       = 345
-	SYS_FSTATFS64                      = 346
-	SYS_GETFSSTAT64                    = 347
-	SYS___PTHREAD_CHDIR                = 348
-	SYS___PTHREAD_FCHDIR               = 349
-	SYS_AUDIT                          = 350
-	SYS_AUDITON                        = 351
-	SYS_GETAUID                        = 353
-	SYS_SETAUID                        = 354
-	SYS_GETAUDIT_ADDR                  = 357
-	SYS_SETAUDIT_ADDR                  = 358
-	SYS_AUDITCTL                       = 359
-	SYS_BSDTHREAD_CREATE               = 360
-	SYS_BSDTHREAD_TERMINATE            = 361
-	SYS_KQUEUE                         = 362
-	SYS_KEVENT                         = 363
-	SYS_LCHOWN                         = 364
-	SYS_STACK_SNAPSHOT                 = 365
-	SYS_BSDTHREAD_REGISTER             = 366
-	SYS_WORKQ_OPEN                     = 367
-	SYS_WORKQ_KERNRETURN               = 368
-	SYS_KEVENT64                       = 369
-	SYS___OLD_SEMWAIT_SIGNAL           = 370
-	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
-	SYS_THREAD_SELFID                  = 372
-	SYS_LEDGER                         = 373
-	SYS___MAC_EXECVE                   = 380
-	SYS___MAC_SYSCALL                  = 381
-	SYS___MAC_GET_FILE                 = 382
-	SYS___MAC_SET_FILE                 = 383
-	SYS___MAC_GET_LINK                 = 384
-	SYS___MAC_SET_LINK                 = 385
-	SYS___MAC_GET_PROC                 = 386
-	SYS___MAC_SET_PROC                 = 387
-	SYS___MAC_GET_FD                   = 388
-	SYS___MAC_SET_FD                   = 389
-	SYS___MAC_GET_PID                  = 390
-	SYS___MAC_GET_LCID                 = 391
-	SYS___MAC_GET_LCTX                 = 392
-	SYS___MAC_SET_LCTX                 = 393
-	SYS_SETLCID                        = 394
-	SYS_GETLCID                        = 395
-	SYS_READ_NOCANCEL                  = 396
-	SYS_WRITE_NOCANCEL                 = 397
-	SYS_OPEN_NOCANCEL                  = 398
-	SYS_CLOSE_NOCANCEL                 = 399
-	SYS_WAIT4_NOCANCEL                 = 400
-	SYS_RECVMSG_NOCANCEL               = 401
-	SYS_SENDMSG_NOCANCEL               = 402
-	SYS_RECVFROM_NOCANCEL              = 403
-	SYS_ACCEPT_NOCANCEL                = 404
-	SYS_MSYNC_NOCANCEL                 = 405
-	SYS_FCNTL_NOCANCEL                 = 406
-	SYS_SELECT_NOCANCEL                = 407
-	SYS_FSYNC_NOCANCEL                 = 408
-	SYS_CONNECT_NOCANCEL               = 409
-	SYS_SIGSUSPEND_NOCANCEL            = 410
-	SYS_READV_NOCANCEL                 = 411
-	SYS_WRITEV_NOCANCEL                = 412
-	SYS_SENDTO_NOCANCEL                = 413
-	SYS_PREAD_NOCANCEL                 = 414
-	SYS_PWRITE_NOCANCEL                = 415
-	SYS_WAITID_NOCANCEL                = 416
-	SYS_POLL_NOCANCEL                  = 417
-	SYS_MSGSND_NOCANCEL                = 418
-	SYS_MSGRCV_NOCANCEL                = 419
-	SYS_SEM_WAIT_NOCANCEL              = 420
-	SYS_AIO_SUSPEND_NOCANCEL           = 421
-	SYS___SIGWAIT_NOCANCEL             = 422
-	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
-	SYS___MAC_MOUNT                    = 424
-	SYS___MAC_GET_MOUNT                = 425
-	SYS___MAC_GETFSSTAT                = 426
-	SYS_FSGETPATH                      = 427
-	SYS_AUDIT_SESSION_SELF             = 428
-	SYS_AUDIT_SESSION_JOIN             = 429
-	SYS_FILEPORT_MAKEPORT              = 430
-	SYS_FILEPORT_MAKEFD                = 431
-	SYS_AUDIT_SESSION_PORT             = 432
-	SYS_PID_SUSPEND                    = 433
-	SYS_PID_RESUME                     = 434
-	SYS_PID_HIBERNATE                  = 435
-	SYS_PID_SHUTDOWN_SOCKETS           = 436
-	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
-	SYS_KAS_INFO                       = 439
-	SYS_MEMORYSTATUS_CONTROL           = 440
-	SYS_GUARDED_OPEN_NP                = 441
-	SYS_GUARDED_CLOSE_NP               = 442
-	SYS_GUARDED_KQUEUE_NP              = 443
-	SYS_CHANGE_FDGUARD_NP              = 444
-	SYS_PROC_RLIMIT_CONTROL            = 446
-	SYS_CONNECTX                       = 447
-	SYS_DISCONNECTX                    = 448
-	SYS_PEELOFF                        = 449
-	SYS_SOCKET_DELEGATE                = 450
-	SYS_TELEMETRY                      = 451
-	SYS_PROC_UUID_POLICY               = 452
-	SYS_MEMORYSTATUS_GET_LEVEL         = 453
-	SYS_SYSTEM_OVERRIDE                = 454
-	SYS_VFS_PURGE                      = 455
-	SYS_SFI_CTL                        = 456
-	SYS_SFI_PIDCTL                     = 457
-	SYS_COALITION                      = 458
-	SYS_COALITION_INFO                 = 459
-	SYS_NECP_MATCH_POLICY              = 460
-	SYS_GETATTRLISTBULK                = 461
-	SYS_OPENAT                         = 463
-	SYS_OPENAT_NOCANCEL                = 464
-	SYS_RENAMEAT                       = 465
-	SYS_FACCESSAT                      = 466
-	SYS_FCHMODAT                       = 467
-	SYS_FCHOWNAT                       = 468
-	SYS_FSTATAT                        = 469
-	SYS_FSTATAT64                      = 470
-	SYS_LINKAT                         = 471
-	SYS_UNLINKAT                       = 472
-	SYS_READLINKAT                     = 473
-	SYS_SYMLINKAT                      = 474
-	SYS_MKDIRAT                        = 475
-	SYS_GETATTRLISTAT                  = 476
-	SYS_PROC_TRACE_LOG                 = 477
-	SYS_BSDTHREAD_CTL                  = 478
-	SYS_OPENBYID_NP                    = 479
-	SYS_RECVMSG_X                      = 480
-	SYS_SENDMSG_X                      = 481
-	SYS_THREAD_SELFUSAGE               = 482
-	SYS_CSRCTL                         = 483
-	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
-	SYS_GUARDED_WRITE_NP               = 485
-	SYS_GUARDED_PWRITE_NP              = 486
-	SYS_GUARDED_WRITEV_NP              = 487
-	SYS_RENAME_EXT                     = 488
-	SYS_MREMAP_ENCRYPTED               = 489
-	SYS_MAXSYSCALL                     = 490
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
deleted file mode 100644
index b8c9aea852..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
+++ /dev/null
@@ -1,358 +0,0 @@
-// mksysnum_darwin.pl /usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build arm,darwin
-
-package unix
-
-const (
-	SYS_SYSCALL                        = 0
-	SYS_EXIT                           = 1
-	SYS_FORK                           = 2
-	SYS_READ                           = 3
-	SYS_WRITE                          = 4
-	SYS_OPEN                           = 5
-	SYS_CLOSE                          = 6
-	SYS_WAIT4                          = 7
-	SYS_LINK                           = 9
-	SYS_UNLINK                         = 10
-	SYS_CHDIR                          = 12
-	SYS_FCHDIR                         = 13
-	SYS_MKNOD                          = 14
-	SYS_CHMOD                          = 15
-	SYS_CHOWN                          = 16
-	SYS_GETFSSTAT                      = 18
-	SYS_GETPID                         = 20
-	SYS_SETUID                         = 23
-	SYS_GETUID                         = 24
-	SYS_GETEUID                        = 25
-	SYS_PTRACE                         = 26
-	SYS_RECVMSG                        = 27
-	SYS_SENDMSG                        = 28
-	SYS_RECVFROM                       = 29
-	SYS_ACCEPT                         = 30
-	SYS_GETPEERNAME                    = 31
-	SYS_GETSOCKNAME                    = 32
-	SYS_ACCESS                         = 33
-	SYS_CHFLAGS                        = 34
-	SYS_FCHFLAGS                       = 35
-	SYS_SYNC                           = 36
-	SYS_KILL                           = 37
-	SYS_GETPPID                        = 39
-	SYS_DUP                            = 41
-	SYS_PIPE                           = 42
-	SYS_GETEGID                        = 43
-	SYS_SIGACTION                      = 46
-	SYS_GETGID                         = 47
-	SYS_SIGPROCMASK                    = 48
-	SYS_GETLOGIN                       = 49
-	SYS_SETLOGIN                       = 50
-	SYS_ACCT                           = 51
-	SYS_SIGPENDING                     = 52
-	SYS_SIGALTSTACK                    = 53
-	SYS_IOCTL                          = 54
-	SYS_REBOOT                         = 55
-	SYS_REVOKE                         = 56
-	SYS_SYMLINK                        = 57
-	SYS_READLINK                       = 58
-	SYS_EXECVE                         = 59
-	SYS_UMASK                          = 60
-	SYS_CHROOT                         = 61
-	SYS_MSYNC                          = 65
-	SYS_VFORK                          = 66
-	SYS_MUNMAP                         = 73
-	SYS_MPROTECT                       = 74
-	SYS_MADVISE                        = 75
-	SYS_MINCORE                        = 78
-	SYS_GETGROUPS                      = 79
-	SYS_SETGROUPS                      = 80
-	SYS_GETPGRP                        = 81
-	SYS_SETPGID                        = 82
-	SYS_SETITIMER                      = 83
-	SYS_SWAPON                         = 85
-	SYS_GETITIMER                      = 86
-	SYS_GETDTABLESIZE                  = 89
-	SYS_DUP2                           = 90
-	SYS_FCNTL                          = 92
-	SYS_SELECT                         = 93
-	SYS_FSYNC                          = 95
-	SYS_SETPRIORITY                    = 96
-	SYS_SOCKET                         = 97
-	SYS_CONNECT                        = 98
-	SYS_GETPRIORITY                    = 100
-	SYS_BIND                           = 104
-	SYS_SETSOCKOPT                     = 105
-	SYS_LISTEN                         = 106
-	SYS_SIGSUSPEND                     = 111
-	SYS_GETTIMEOFDAY                   = 116
-	SYS_GETRUSAGE                      = 117
-	SYS_GETSOCKOPT                     = 118
-	SYS_READV                          = 120
-	SYS_WRITEV                         = 121
-	SYS_SETTIMEOFDAY                   = 122
-	SYS_FCHOWN                         = 123
-	SYS_FCHMOD                         = 124
-	SYS_SETREUID                       = 126
-	SYS_SETREGID                       = 127
-	SYS_RENAME                         = 128
-	SYS_FLOCK                          = 131
-	SYS_MKFIFO                         = 132
-	SYS_SENDTO                         = 133
-	SYS_SHUTDOWN                       = 134
-	SYS_SOCKETPAIR                     = 135
-	SYS_MKDIR                          = 136
-	SYS_RMDIR                          = 137
-	SYS_UTIMES                         = 138
-	SYS_FUTIMES                        = 139
-	SYS_ADJTIME                        = 140
-	SYS_GETHOSTUUID                    = 142
-	SYS_SETSID                         = 147
-	SYS_GETPGID                        = 151
-	SYS_SETPRIVEXEC                    = 152
-	SYS_PREAD                          = 153
-	SYS_PWRITE                         = 154
-	SYS_NFSSVC                         = 155
-	SYS_STATFS                         = 157
-	SYS_FSTATFS                        = 158
-	SYS_UNMOUNT                        = 159
-	SYS_GETFH                          = 161
-	SYS_QUOTACTL                       = 165
-	SYS_MOUNT                          = 167
-	SYS_CSOPS                          = 169
-	SYS_CSOPS_AUDITTOKEN               = 170
-	SYS_WAITID                         = 173
-	SYS_KDEBUG_TRACE                   = 180
-	SYS_SETGID                         = 181
-	SYS_SETEGID                        = 182
-	SYS_SETEUID                        = 183
-	SYS_SIGRETURN                      = 184
-	SYS_CHUD                           = 185
-	SYS_FDATASYNC                      = 187
-	SYS_STAT                           = 188
-	SYS_FSTAT                          = 189
-	SYS_LSTAT                          = 190
-	SYS_PATHCONF                       = 191
-	SYS_FPATHCONF                      = 192
-	SYS_GETRLIMIT                      = 194
-	SYS_SETRLIMIT                      = 195
-	SYS_GETDIRENTRIES                  = 196
-	SYS_MMAP                           = 197
-	SYS_LSEEK                          = 199
-	SYS_TRUNCATE                       = 200
-	SYS_FTRUNCATE                      = 201
-	SYS___SYSCTL                       = 202
-	SYS_MLOCK                          = 203
-	SYS_MUNLOCK                        = 204
-	SYS_UNDELETE                       = 205
-	SYS_ATSOCKET                       = 206
-	SYS_ATGETMSG                       = 207
-	SYS_ATPUTMSG                       = 208
-	SYS_ATPSNDREQ                      = 209
-	SYS_ATPSNDRSP                      = 210
-	SYS_ATPGETREQ                      = 211
-	SYS_ATPGETRSP                      = 212
-	SYS_OPEN_DPROTECTED_NP             = 216
-	SYS_GETATTRLIST                    = 220
-	SYS_SETATTRLIST                    = 221
-	SYS_GETDIRENTRIESATTR              = 222
-	SYS_EXCHANGEDATA                   = 223
-	SYS_SEARCHFS                       = 225
-	SYS_DELETE                         = 226
-	SYS_COPYFILE                       = 227
-	SYS_FGETATTRLIST                   = 228
-	SYS_FSETATTRLIST                   = 229
-	SYS_POLL                           = 230
-	SYS_WATCHEVENT                     = 231
-	SYS_WAITEVENT                      = 232
-	SYS_MODWATCH                       = 233
-	SYS_GETXATTR                       = 234
-	SYS_FGETXATTR                      = 235
-	SYS_SETXATTR                       = 236
-	SYS_FSETXATTR                      = 237
-	SYS_REMOVEXATTR                    = 238
-	SYS_FREMOVEXATTR                   = 239
-	SYS_LISTXATTR                      = 240
-	SYS_FLISTXATTR                     = 241
-	SYS_FSCTL                          = 242
-	SYS_INITGROUPS                     = 243
-	SYS_POSIX_SPAWN                    = 244
-	SYS_FFSCTL                         = 245
-	SYS_NFSCLNT                        = 247
-	SYS_FHOPEN                         = 248
-	SYS_MINHERIT                       = 250
-	SYS_SEMSYS                         = 251
-	SYS_MSGSYS                         = 252
-	SYS_SHMSYS                         = 253
-	SYS_SEMCTL                         = 254
-	SYS_SEMGET                         = 255
-	SYS_SEMOP                          = 256
-	SYS_MSGCTL                         = 258
-	SYS_MSGGET                         = 259
-	SYS_MSGSND                         = 260
-	SYS_MSGRCV                         = 261
-	SYS_SHMAT                          = 262
-	SYS_SHMCTL                         = 263
-	SYS_SHMDT                          = 264
-	SYS_SHMGET                         = 265
-	SYS_SHM_OPEN                       = 266
-	SYS_SHM_UNLINK                     = 267
-	SYS_SEM_OPEN                       = 268
-	SYS_SEM_CLOSE                      = 269
-	SYS_SEM_UNLINK                     = 270
-	SYS_SEM_WAIT                       = 271
-	SYS_SEM_TRYWAIT                    = 272
-	SYS_SEM_POST                       = 273
-	SYS_SEM_GETVALUE                   = 274
-	SYS_SEM_INIT                       = 275
-	SYS_SEM_DESTROY                    = 276
-	SYS_OPEN_EXTENDED                  = 277
-	SYS_UMASK_EXTENDED                 = 278
-	SYS_STAT_EXTENDED                  = 279
-	SYS_LSTAT_EXTENDED                 = 280
-	SYS_FSTAT_EXTENDED                 = 281
-	SYS_CHMOD_EXTENDED                 = 282
-	SYS_FCHMOD_EXTENDED                = 283
-	SYS_ACCESS_EXTENDED                = 284
-	SYS_SETTID                         = 285
-	SYS_GETTID                         = 286
-	SYS_SETSGROUPS                     = 287
-	SYS_GETSGROUPS                     = 288
-	SYS_SETWGROUPS                     = 289
-	SYS_GETWGROUPS                     = 290
-	SYS_MKFIFO_EXTENDED                = 291
-	SYS_MKDIR_EXTENDED                 = 292
-	SYS_IDENTITYSVC                    = 293
-	SYS_SHARED_REGION_CHECK_NP         = 294
-	SYS_VM_PRESSURE_MONITOR            = 296
-	SYS_PSYNCH_RW_LONGRDLOCK           = 297
-	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
-	SYS_PSYNCH_RW_DOWNGRADE            = 299
-	SYS_PSYNCH_RW_UPGRADE              = 300
-	SYS_PSYNCH_MUTEXWAIT               = 301
-	SYS_PSYNCH_MUTEXDROP               = 302
-	SYS_PSYNCH_CVBROAD                 = 303
-	SYS_PSYNCH_CVSIGNAL                = 304
-	SYS_PSYNCH_CVWAIT                  = 305
-	SYS_PSYNCH_RW_RDLOCK               = 306
-	SYS_PSYNCH_RW_WRLOCK               = 307
-	SYS_PSYNCH_RW_UNLOCK               = 308
-	SYS_PSYNCH_RW_UNLOCK2              = 309
-	SYS_GETSID                         = 310
-	SYS_SETTID_WITH_PID                = 311
-	SYS_PSYNCH_CVCLRPREPOST            = 312
-	SYS_AIO_FSYNC                      = 313
-	SYS_AIO_RETURN                     = 314
-	SYS_AIO_SUSPEND                    = 315
-	SYS_AIO_CANCEL                     = 316
-	SYS_AIO_ERROR                      = 317
-	SYS_AIO_READ                       = 318
-	SYS_AIO_WRITE                      = 319
-	SYS_LIO_LISTIO                     = 320
-	SYS_IOPOLICYSYS                    = 322
-	SYS_PROCESS_POLICY                 = 323
-	SYS_MLOCKALL                       = 324
-	SYS_MUNLOCKALL                     = 325
-	SYS_ISSETUGID                      = 327
-	SYS___PTHREAD_KILL                 = 328
-	SYS___PTHREAD_SIGMASK              = 329
-	SYS___SIGWAIT                      = 330
-	SYS___DISABLE_THREADSIGNAL         = 331
-	SYS___PTHREAD_MARKCANCEL           = 332
-	SYS___PTHREAD_CANCELED             = 333
-	SYS___SEMWAIT_SIGNAL               = 334
-	SYS_PROC_INFO                      = 336
-	SYS_SENDFILE                       = 337
-	SYS_STAT64                         = 338
-	SYS_FSTAT64                        = 339
-	SYS_LSTAT64                        = 340
-	SYS_STAT64_EXTENDED                = 341
-	SYS_LSTAT64_EXTENDED               = 342
-	SYS_FSTAT64_EXTENDED               = 343
-	SYS_GETDIRENTRIES64                = 344
-	SYS_STATFS64                       = 345
-	SYS_FSTATFS64                      = 346
-	SYS_GETFSSTAT64                    = 347
-	SYS___PTHREAD_CHDIR                = 348
-	SYS___PTHREAD_FCHDIR               = 349
-	SYS_AUDIT                          = 350
-	SYS_AUDITON                        = 351
-	SYS_GETAUID                        = 353
-	SYS_SETAUID                        = 354
-	SYS_GETAUDIT_ADDR                  = 357
-	SYS_SETAUDIT_ADDR                  = 358
-	SYS_AUDITCTL                       = 359
-	SYS_BSDTHREAD_CREATE               = 360
-	SYS_BSDTHREAD_TERMINATE            = 361
-	SYS_KQUEUE                         = 362
-	SYS_KEVENT                         = 363
-	SYS_LCHOWN                         = 364
-	SYS_STACK_SNAPSHOT                 = 365
-	SYS_BSDTHREAD_REGISTER             = 366
-	SYS_WORKQ_OPEN                     = 367
-	SYS_WORKQ_KERNRETURN               = 368
-	SYS_KEVENT64                       = 369
-	SYS___OLD_SEMWAIT_SIGNAL           = 370
-	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
-	SYS_THREAD_SELFID                  = 372
-	SYS_LEDGER                         = 373
-	SYS___MAC_EXECVE                   = 380
-	SYS___MAC_SYSCALL                  = 381
-	SYS___MAC_GET_FILE                 = 382
-	SYS___MAC_SET_FILE                 = 383
-	SYS___MAC_GET_LINK                 = 384
-	SYS___MAC_SET_LINK                 = 385
-	SYS___MAC_GET_PROC                 = 386
-	SYS___MAC_SET_PROC                 = 387
-	SYS___MAC_GET_FD                   = 388
-	SYS___MAC_SET_FD                   = 389
-	SYS___MAC_GET_PID                  = 390
-	SYS___MAC_GET_LCID                 = 391
-	SYS___MAC_GET_LCTX                 = 392
-	SYS___MAC_SET_LCTX                 = 393
-	SYS_SETLCID                        = 394
-	SYS_GETLCID                        = 395
-	SYS_READ_NOCANCEL                  = 396
-	SYS_WRITE_NOCANCEL                 = 397
-	SYS_OPEN_NOCANCEL                  = 398
-	SYS_CLOSE_NOCANCEL                 = 399
-	SYS_WAIT4_NOCANCEL                 = 400
-	SYS_RECVMSG_NOCANCEL               = 401
-	SYS_SENDMSG_NOCANCEL               = 402
-	SYS_RECVFROM_NOCANCEL              = 403
-	SYS_ACCEPT_NOCANCEL                = 404
-	SYS_MSYNC_NOCANCEL                 = 405
-	SYS_FCNTL_NOCANCEL                 = 406
-	SYS_SELECT_NOCANCEL                = 407
-	SYS_FSYNC_NOCANCEL                 = 408
-	SYS_CONNECT_NOCANCEL               = 409
-	SYS_SIGSUSPEND_NOCANCEL            = 410
-	SYS_READV_NOCANCEL                 = 411
-	SYS_WRITEV_NOCANCEL                = 412
-	SYS_SENDTO_NOCANCEL                = 413
-	SYS_PREAD_NOCANCEL                 = 414
-	SYS_PWRITE_NOCANCEL                = 415
-	SYS_WAITID_NOCANCEL                = 416
-	SYS_POLL_NOCANCEL                  = 417
-	SYS_MSGSND_NOCANCEL                = 418
-	SYS_MSGRCV_NOCANCEL                = 419
-	SYS_SEM_WAIT_NOCANCEL              = 420
-	SYS_AIO_SUSPEND_NOCANCEL           = 421
-	SYS___SIGWAIT_NOCANCEL             = 422
-	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
-	SYS___MAC_MOUNT                    = 424
-	SYS___MAC_GET_MOUNT                = 425
-	SYS___MAC_GETFSSTAT                = 426
-	SYS_FSGETPATH                      = 427
-	SYS_AUDIT_SESSION_SELF             = 428
-	SYS_AUDIT_SESSION_JOIN             = 429
-	SYS_FILEPORT_MAKEPORT              = 430
-	SYS_FILEPORT_MAKEFD                = 431
-	SYS_AUDIT_SESSION_PORT             = 432
-	SYS_PID_SUSPEND                    = 433
-	SYS_PID_RESUME                     = 434
-	SYS_PID_HIBERNATE                  = 435
-	SYS_PID_SHUTDOWN_SOCKETS           = 436
-	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
-	SYS_KAS_INFO                       = 439
-	SYS_MAXSYSCALL                     = 440
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
deleted file mode 100644
index 26677ebbf5..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
+++ /dev/null
@@ -1,398 +0,0 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk/usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build arm64,darwin
-
-package unix
-
-const (
-	SYS_SYSCALL                        = 0
-	SYS_EXIT                           = 1
-	SYS_FORK                           = 2
-	SYS_READ                           = 3
-	SYS_WRITE                          = 4
-	SYS_OPEN                           = 5
-	SYS_CLOSE                          = 6
-	SYS_WAIT4                          = 7
-	SYS_LINK                           = 9
-	SYS_UNLINK                         = 10
-	SYS_CHDIR                          = 12
-	SYS_FCHDIR                         = 13
-	SYS_MKNOD                          = 14
-	SYS_CHMOD                          = 15
-	SYS_CHOWN                          = 16
-	SYS_GETFSSTAT                      = 18
-	SYS_GETPID                         = 20
-	SYS_SETUID                         = 23
-	SYS_GETUID                         = 24
-	SYS_GETEUID                        = 25
-	SYS_PTRACE                         = 26
-	SYS_RECVMSG                        = 27
-	SYS_SENDMSG                        = 28
-	SYS_RECVFROM                       = 29
-	SYS_ACCEPT                         = 30
-	SYS_GETPEERNAME                    = 31
-	SYS_GETSOCKNAME                    = 32
-	SYS_ACCESS                         = 33
-	SYS_CHFLAGS                        = 34
-	SYS_FCHFLAGS                       = 35
-	SYS_SYNC                           = 36
-	SYS_KILL                           = 37
-	SYS_GETPPID                        = 39
-	SYS_DUP                            = 41
-	SYS_PIPE                           = 42
-	SYS_GETEGID                        = 43
-	SYS_SIGACTION                      = 46
-	SYS_GETGID                         = 47
-	SYS_SIGPROCMASK                    = 48
-	SYS_GETLOGIN                       = 49
-	SYS_SETLOGIN                       = 50
-	SYS_ACCT                           = 51
-	SYS_SIGPENDING                     = 52
-	SYS_SIGALTSTACK                    = 53
-	SYS_IOCTL                          = 54
-	SYS_REBOOT                         = 55
-	SYS_REVOKE                         = 56
-	SYS_SYMLINK                        = 57
-	SYS_READLINK                       = 58
-	SYS_EXECVE                         = 59
-	SYS_UMASK                          = 60
-	SYS_CHROOT                         = 61
-	SYS_MSYNC                          = 65
-	SYS_VFORK                          = 66
-	SYS_MUNMAP                         = 73
-	SYS_MPROTECT                       = 74
-	SYS_MADVISE                        = 75
-	SYS_MINCORE                        = 78
-	SYS_GETGROUPS                      = 79
-	SYS_SETGROUPS                      = 80
-	SYS_GETPGRP                        = 81
-	SYS_SETPGID                        = 82
-	SYS_SETITIMER                      = 83
-	SYS_SWAPON                         = 85
-	SYS_GETITIMER                      = 86
-	SYS_GETDTABLESIZE                  = 89
-	SYS_DUP2                           = 90
-	SYS_FCNTL                          = 92
-	SYS_SELECT                         = 93
-	SYS_FSYNC                          = 95
-	SYS_SETPRIORITY                    = 96
-	SYS_SOCKET                         = 97
-	SYS_CONNECT                        = 98
-	SYS_GETPRIORITY                    = 100
-	SYS_BIND                           = 104
-	SYS_SETSOCKOPT                     = 105
-	SYS_LISTEN                         = 106
-	SYS_SIGSUSPEND                     = 111
-	SYS_GETTIMEOFDAY                   = 116
-	SYS_GETRUSAGE                      = 117
-	SYS_GETSOCKOPT                     = 118
-	SYS_READV                          = 120
-	SYS_WRITEV                         = 121
-	SYS_SETTIMEOFDAY                   = 122
-	SYS_FCHOWN                         = 123
-	SYS_FCHMOD                         = 124
-	SYS_SETREUID                       = 126
-	SYS_SETREGID                       = 127
-	SYS_RENAME                         = 128
-	SYS_FLOCK                          = 131
-	SYS_MKFIFO                         = 132
-	SYS_SENDTO                         = 133
-	SYS_SHUTDOWN                       = 134
-	SYS_SOCKETPAIR                     = 135
-	SYS_MKDIR                          = 136
-	SYS_RMDIR                          = 137
-	SYS_UTIMES                         = 138
-	SYS_FUTIMES                        = 139
-	SYS_ADJTIME                        = 140
-	SYS_GETHOSTUUID                    = 142
-	SYS_SETSID                         = 147
-	SYS_GETPGID                        = 151
-	SYS_SETPRIVEXEC                    = 152
-	SYS_PREAD                          = 153
-	SYS_PWRITE                         = 154
-	SYS_NFSSVC                         = 155
-	SYS_STATFS                         = 157
-	SYS_FSTATFS                        = 158
-	SYS_UNMOUNT                        = 159
-	SYS_GETFH                          = 161
-	SYS_QUOTACTL                       = 165
-	SYS_MOUNT                          = 167
-	SYS_CSOPS                          = 169
-	SYS_CSOPS_AUDITTOKEN               = 170
-	SYS_WAITID                         = 173
-	SYS_KDEBUG_TRACE64                 = 179
-	SYS_KDEBUG_TRACE                   = 180
-	SYS_SETGID                         = 181
-	SYS_SETEGID                        = 182
-	SYS_SETEUID                        = 183
-	SYS_SIGRETURN                      = 184
-	SYS_CHUD                           = 185
-	SYS_FDATASYNC                      = 187
-	SYS_STAT                           = 188
-	SYS_FSTAT                          = 189
-	SYS_LSTAT                          = 190
-	SYS_PATHCONF                       = 191
-	SYS_FPATHCONF                      = 192
-	SYS_GETRLIMIT                      = 194
-	SYS_SETRLIMIT                      = 195
-	SYS_GETDIRENTRIES                  = 196
-	SYS_MMAP                           = 197
-	SYS_LSEEK                          = 199
-	SYS_TRUNCATE                       = 200
-	SYS_FTRUNCATE                      = 201
-	SYS_SYSCTL                         = 202
-	SYS_MLOCK                          = 203
-	SYS_MUNLOCK                        = 204
-	SYS_UNDELETE                       = 205
-	SYS_OPEN_DPROTECTED_NP             = 216
-	SYS_GETATTRLIST                    = 220
-	SYS_SETATTRLIST                    = 221
-	SYS_GETDIRENTRIESATTR              = 222
-	SYS_EXCHANGEDATA                   = 223
-	SYS_SEARCHFS                       = 225
-	SYS_DELETE                         = 226
-	SYS_COPYFILE                       = 227
-	SYS_FGETATTRLIST                   = 228
-	SYS_FSETATTRLIST                   = 229
-	SYS_POLL                           = 230
-	SYS_WATCHEVENT                     = 231
-	SYS_WAITEVENT                      = 232
-	SYS_MODWATCH                       = 233
-	SYS_GETXATTR                       = 234
-	SYS_FGETXATTR                      = 235
-	SYS_SETXATTR                       = 236
-	SYS_FSETXATTR                      = 237
-	SYS_REMOVEXATTR                    = 238
-	SYS_FREMOVEXATTR                   = 239
-	SYS_LISTXATTR                      = 240
-	SYS_FLISTXATTR                     = 241
-	SYS_FSCTL                          = 242
-	SYS_INITGROUPS                     = 243
-	SYS_POSIX_SPAWN                    = 244
-	SYS_FFSCTL                         = 245
-	SYS_NFSCLNT                        = 247
-	SYS_FHOPEN                         = 248
-	SYS_MINHERIT                       = 250
-	SYS_SEMSYS                         = 251
-	SYS_MSGSYS                         = 252
-	SYS_SHMSYS                         = 253
-	SYS_SEMCTL                         = 254
-	SYS_SEMGET                         = 255
-	SYS_SEMOP                          = 256
-	SYS_MSGCTL                         = 258
-	SYS_MSGGET                         = 259
-	SYS_MSGSND                         = 260
-	SYS_MSGRCV                         = 261
-	SYS_SHMAT                          = 262
-	SYS_SHMCTL                         = 263
-	SYS_SHMDT                          = 264
-	SYS_SHMGET                         = 265
-	SYS_SHM_OPEN                       = 266
-	SYS_SHM_UNLINK                     = 267
-	SYS_SEM_OPEN                       = 268
-	SYS_SEM_CLOSE                      = 269
-	SYS_SEM_UNLINK                     = 270
-	SYS_SEM_WAIT                       = 271
-	SYS_SEM_TRYWAIT                    = 272
-	SYS_SEM_POST                       = 273
-	SYS_SYSCTLBYNAME                   = 274
-	SYS_OPEN_EXTENDED                  = 277
-	SYS_UMASK_EXTENDED                 = 278
-	SYS_STAT_EXTENDED                  = 279
-	SYS_LSTAT_EXTENDED                 = 280
-	SYS_FSTAT_EXTENDED                 = 281
-	SYS_CHMOD_EXTENDED                 = 282
-	SYS_FCHMOD_EXTENDED                = 283
-	SYS_ACCESS_EXTENDED                = 284
-	SYS_SETTID                         = 285
-	SYS_GETTID                         = 286
-	SYS_SETSGROUPS                     = 287
-	SYS_GETSGROUPS                     = 288
-	SYS_SETWGROUPS                     = 289
-	SYS_GETWGROUPS                     = 290
-	SYS_MKFIFO_EXTENDED                = 291
-	SYS_MKDIR_EXTENDED                 = 292
-	SYS_IDENTITYSVC                    = 293
-	SYS_SHARED_REGION_CHECK_NP         = 294
-	SYS_VM_PRESSURE_MONITOR            = 296
-	SYS_PSYNCH_RW_LONGRDLOCK           = 297
-	SYS_PSYNCH_RW_YIELDWRLOCK          = 298
-	SYS_PSYNCH_RW_DOWNGRADE            = 299
-	SYS_PSYNCH_RW_UPGRADE              = 300
-	SYS_PSYNCH_MUTEXWAIT               = 301
-	SYS_PSYNCH_MUTEXDROP               = 302
-	SYS_PSYNCH_CVBROAD                 = 303
-	SYS_PSYNCH_CVSIGNAL                = 304
-	SYS_PSYNCH_CVWAIT                  = 305
-	SYS_PSYNCH_RW_RDLOCK               = 306
-	SYS_PSYNCH_RW_WRLOCK               = 307
-	SYS_PSYNCH_RW_UNLOCK               = 308
-	SYS_PSYNCH_RW_UNLOCK2              = 309
-	SYS_GETSID                         = 310
-	SYS_SETTID_WITH_PID                = 311
-	SYS_PSYNCH_CVCLRPREPOST            = 312
-	SYS_AIO_FSYNC                      = 313
-	SYS_AIO_RETURN                     = 314
-	SYS_AIO_SUSPEND                    = 315
-	SYS_AIO_CANCEL                     = 316
-	SYS_AIO_ERROR                      = 317
-	SYS_AIO_READ                       = 318
-	SYS_AIO_WRITE                      = 319
-	SYS_LIO_LISTIO                     = 320
-	SYS_IOPOLICYSYS                    = 322
-	SYS_PROCESS_POLICY                 = 323
-	SYS_MLOCKALL                       = 324
-	SYS_MUNLOCKALL                     = 325
-	SYS_ISSETUGID                      = 327
-	SYS___PTHREAD_KILL                 = 328
-	SYS___PTHREAD_SIGMASK              = 329
-	SYS___SIGWAIT                      = 330
-	SYS___DISABLE_THREADSIGNAL         = 331
-	SYS___PTHREAD_MARKCANCEL           = 332
-	SYS___PTHREAD_CANCELED             = 333
-	SYS___SEMWAIT_SIGNAL               = 334
-	SYS_PROC_INFO                      = 336
-	SYS_SENDFILE                       = 337
-	SYS_STAT64                         = 338
-	SYS_FSTAT64                        = 339
-	SYS_LSTAT64                        = 340
-	SYS_STAT64_EXTENDED                = 341
-	SYS_LSTAT64_EXTENDED               = 342
-	SYS_FSTAT64_EXTENDED               = 343
-	SYS_GETDIRENTRIES64                = 344
-	SYS_STATFS64                       = 345
-	SYS_FSTATFS64                      = 346
-	SYS_GETFSSTAT64                    = 347
-	SYS___PTHREAD_CHDIR                = 348
-	SYS___PTHREAD_FCHDIR               = 349
-	SYS_AUDIT                          = 350
-	SYS_AUDITON                        = 351
-	SYS_GETAUID                        = 353
-	SYS_SETAUID                        = 354
-	SYS_GETAUDIT_ADDR                  = 357
-	SYS_SETAUDIT_ADDR                  = 358
-	SYS_AUDITCTL                       = 359
-	SYS_BSDTHREAD_CREATE               = 360
-	SYS_BSDTHREAD_TERMINATE            = 361
-	SYS_KQUEUE                         = 362
-	SYS_KEVENT                         = 363
-	SYS_LCHOWN                         = 364
-	SYS_STACK_SNAPSHOT                 = 365
-	SYS_BSDTHREAD_REGISTER             = 366
-	SYS_WORKQ_OPEN                     = 367
-	SYS_WORKQ_KERNRETURN               = 368
-	SYS_KEVENT64                       = 369
-	SYS___OLD_SEMWAIT_SIGNAL           = 370
-	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
-	SYS_THREAD_SELFID                  = 372
-	SYS_LEDGER                         = 373
-	SYS___MAC_EXECVE                   = 380
-	SYS___MAC_SYSCALL                  = 381
-	SYS___MAC_GET_FILE                 = 382
-	SYS___MAC_SET_FILE                 = 383
-	SYS___MAC_GET_LINK                 = 384
-	SYS___MAC_SET_LINK                 = 385
-	SYS___MAC_GET_PROC                 = 386
-	SYS___MAC_SET_PROC                 = 387
-	SYS___MAC_GET_FD                   = 388
-	SYS___MAC_SET_FD                   = 389
-	SYS___MAC_GET_PID                  = 390
-	SYS___MAC_GET_LCID                 = 391
-	SYS___MAC_GET_LCTX                 = 392
-	SYS___MAC_SET_LCTX                 = 393
-	SYS_SETLCID                        = 394
-	SYS_GETLCID                        = 395
-	SYS_READ_NOCANCEL                  = 396
-	SYS_WRITE_NOCANCEL                 = 397
-	SYS_OPEN_NOCANCEL                  = 398
-	SYS_CLOSE_NOCANCEL                 = 399
-	SYS_WAIT4_NOCANCEL                 = 400
-	SYS_RECVMSG_NOCANCEL               = 401
-	SYS_SENDMSG_NOCANCEL               = 402
-	SYS_RECVFROM_NOCANCEL              = 403
-	SYS_ACCEPT_NOCANCEL                = 404
-	SYS_MSYNC_NOCANCEL                 = 405
-	SYS_FCNTL_NOCANCEL                 = 406
-	SYS_SELECT_NOCANCEL                = 407
-	SYS_FSYNC_NOCANCEL                 = 408
-	SYS_CONNECT_NOCANCEL               = 409
-	SYS_SIGSUSPEND_NOCANCEL            = 410
-	SYS_READV_NOCANCEL                 = 411
-	SYS_WRITEV_NOCANCEL                = 412
-	SYS_SENDTO_NOCANCEL                = 413
-	SYS_PREAD_NOCANCEL                 = 414
-	SYS_PWRITE_NOCANCEL                = 415
-	SYS_WAITID_NOCANCEL                = 416
-	SYS_POLL_NOCANCEL                  = 417
-	SYS_MSGSND_NOCANCEL                = 418
-	SYS_MSGRCV_NOCANCEL                = 419
-	SYS_SEM_WAIT_NOCANCEL              = 420
-	SYS_AIO_SUSPEND_NOCANCEL           = 421
-	SYS___SIGWAIT_NOCANCEL             = 422
-	SYS___SEMWAIT_SIGNAL_NOCANCEL      = 423
-	SYS___MAC_MOUNT                    = 424
-	SYS___MAC_GET_MOUNT                = 425
-	SYS___MAC_GETFSSTAT                = 426
-	SYS_FSGETPATH                      = 427
-	SYS_AUDIT_SESSION_SELF             = 428
-	SYS_AUDIT_SESSION_JOIN             = 429
-	SYS_FILEPORT_MAKEPORT              = 430
-	SYS_FILEPORT_MAKEFD                = 431
-	SYS_AUDIT_SESSION_PORT             = 432
-	SYS_PID_SUSPEND                    = 433
-	SYS_PID_RESUME                     = 434
-	SYS_PID_HIBERNATE                  = 435
-	SYS_PID_SHUTDOWN_SOCKETS           = 436
-	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
-	SYS_KAS_INFO                       = 439
-	SYS_MEMORYSTATUS_CONTROL           = 440
-	SYS_GUARDED_OPEN_NP                = 441
-	SYS_GUARDED_CLOSE_NP               = 442
-	SYS_GUARDED_KQUEUE_NP              = 443
-	SYS_CHANGE_FDGUARD_NP              = 444
-	SYS_PROC_RLIMIT_CONTROL            = 446
-	SYS_CONNECTX                       = 447
-	SYS_DISCONNECTX                    = 448
-	SYS_PEELOFF                        = 449
-	SYS_SOCKET_DELEGATE                = 450
-	SYS_TELEMETRY                      = 451
-	SYS_PROC_UUID_POLICY               = 452
-	SYS_MEMORYSTATUS_GET_LEVEL         = 453
-	SYS_SYSTEM_OVERRIDE                = 454
-	SYS_VFS_PURGE                      = 455
-	SYS_SFI_CTL                        = 456
-	SYS_SFI_PIDCTL                     = 457
-	SYS_COALITION                      = 458
-	SYS_COALITION_INFO                 = 459
-	SYS_NECP_MATCH_POLICY              = 460
-	SYS_GETATTRLISTBULK                = 461
-	SYS_OPENAT                         = 463
-	SYS_OPENAT_NOCANCEL                = 464
-	SYS_RENAMEAT                       = 465
-	SYS_FACCESSAT                      = 466
-	SYS_FCHMODAT                       = 467
-	SYS_FCHOWNAT                       = 468
-	SYS_FSTATAT                        = 469
-	SYS_FSTATAT64                      = 470
-	SYS_LINKAT                         = 471
-	SYS_UNLINKAT                       = 472
-	SYS_READLINKAT                     = 473
-	SYS_SYMLINKAT                      = 474
-	SYS_MKDIRAT                        = 475
-	SYS_GETATTRLISTAT                  = 476
-	SYS_PROC_TRACE_LOG                 = 477
-	SYS_BSDTHREAD_CTL                  = 478
-	SYS_OPENBYID_NP                    = 479
-	SYS_RECVMSG_X                      = 480
-	SYS_SENDMSG_X                      = 481
-	SYS_THREAD_SELFUSAGE               = 482
-	SYS_CSRCTL                         = 483
-	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
-	SYS_GUARDED_WRITE_NP               = 485
-	SYS_GUARDED_PWRITE_NP              = 486
-	SYS_GUARDED_WRITEV_NP              = 487
-	SYS_RENAME_EXT                     = 488
-	SYS_MREMAP_ENCRYPTED               = 489
-	SYS_MAXSYSCALL                     = 490
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
deleted file mode 100644
index d6038fa9b0..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
+++ /dev/null
@@ -1,304 +0,0 @@
-// mksysnum_dragonfly.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build amd64,dragonfly
-
-package unix
-
-const (
-	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT          = 1   // { void exit(int rval); }
-	SYS_FORK          = 2   // { int fork(void); }
-	SYS_READ          = 3   // { ssize_t read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE         = 4   // { ssize_t write(int fd, const void *buf, size_t nbyte); }
-	SYS_OPEN          = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE         = 6   // { int close(int fd); }
-	SYS_WAIT4         = 7   // { int wait4(int pid, int *status, int options, \
-	SYS_LINK          = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK        = 10  // { int unlink(char *path); }
-	SYS_CHDIR         = 12  // { int chdir(char *path); }
-	SYS_FCHDIR        = 13  // { int fchdir(int fd); }
-	SYS_MKNOD         = 14  // { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD         = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN         = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK        = 17  // { int obreak(char *nsize); } break obreak_args int
-	SYS_GETFSSTAT     = 18  // { int getfsstat(struct statfs *buf, long bufsize, \
-	SYS_GETPID        = 20  // { pid_t getpid(void); }
-	SYS_MOUNT         = 21  // { int mount(char *type, char *path, int flags, \
-	SYS_UNMOUNT       = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID        = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID        = 24  // { uid_t getuid(void); }
-	SYS_GETEUID       = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE        = 26  // { int ptrace(int req, pid_t pid, caddr_t addr, \
-	SYS_RECVMSG       = 27  // { int recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG       = 28  // { int sendmsg(int s, caddr_t msg, int flags); }
-	SYS_RECVFROM      = 29  // { int recvfrom(int s, caddr_t buf, size_t len, \
-	SYS_ACCEPT        = 30  // { int accept(int s, caddr_t name, int *anamelen); }
-	SYS_GETPEERNAME   = 31  // { int getpeername(int fdes, caddr_t asa, int *alen); }
-	SYS_GETSOCKNAME   = 32  // { int getsockname(int fdes, caddr_t asa, int *alen); }
-	SYS_ACCESS        = 33  // { int access(char *path, int flags); }
-	SYS_CHFLAGS       = 34  // { int chflags(char *path, int flags); }
-	SYS_FCHFLAGS      = 35  // { int fchflags(int fd, int flags); }
-	SYS_SYNC          = 36  // { int sync(void); }
-	SYS_KILL          = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID       = 39  // { pid_t getppid(void); }
-	SYS_DUP           = 41  // { int dup(u_int fd); }
-	SYS_PIPE          = 42  // { int pipe(void); }
-	SYS_GETEGID       = 43  // { gid_t getegid(void); }
-	SYS_PROFIL        = 44  // { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE        = 45  // { int ktrace(const char *fname, int ops, int facs, \
-	SYS_GETGID        = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN      = 49  // { int getlogin(char *namebuf, u_int namelen); }
-	SYS_SETLOGIN      = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT          = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK   = 53  // { int sigaltstack(stack_t *ss, stack_t *oss); }
-	SYS_IOCTL         = 54  // { int ioctl(int fd, u_long com, caddr_t data); }
-	SYS_REBOOT        = 55  // { int reboot(int opt); }
-	SYS_REVOKE        = 56  // { int revoke(char *path); }
-	SYS_SYMLINK       = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK      = 58  // { int readlink(char *path, char *buf, int count); }
-	SYS_EXECVE        = 59  // { int execve(char *fname, char **argv, char **envv); }
-	SYS_UMASK         = 60  // { int umask(int newmask); } umask umask_args int
-	SYS_CHROOT        = 61  // { int chroot(char *path); }
-	SYS_MSYNC         = 65  // { int msync(void *addr, size_t len, int flags); }
-	SYS_VFORK         = 66  // { pid_t vfork(void); }
-	SYS_SBRK          = 69  // { int sbrk(int incr); }
-	SYS_SSTK          = 70  // { int sstk(int incr); }
-	SYS_MUNMAP        = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT      = 74  // { int mprotect(void *addr, size_t len, int prot); }
-	SYS_MADVISE       = 75  // { int madvise(void *addr, size_t len, int behav); }
-	SYS_MINCORE       = 78  // { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS     = 79  // { int getgroups(u_int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS     = 80  // { int setgroups(u_int gidsetsize, gid_t *gidset); }
-	SYS_GETPGRP       = 81  // { int getpgrp(void); }
-	SYS_SETPGID       = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER     = 83  // { int setitimer(u_int which, struct itimerval *itv, \
-	SYS_SWAPON        = 85  // { int swapon(char *name); }
-	SYS_GETITIMER     = 86  // { int getitimer(u_int which, struct itimerval *itv); }
-	SYS_GETDTABLESIZE = 89  // { int getdtablesize(void); }
-	SYS_DUP2          = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL         = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT        = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC         = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY   = 96  // { int setpriority(int which, int who, int prio); }
-	SYS_SOCKET        = 97  // { int socket(int domain, int type, int protocol); }
-	SYS_CONNECT       = 98  // { int connect(int s, caddr_t name, int namelen); }
-	SYS_GETPRIORITY   = 100 // { int getpriority(int which, int who); }
-	SYS_BIND          = 104 // { int bind(int s, caddr_t name, int namelen); }
-	SYS_SETSOCKOPT    = 105 // { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN        = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY  = 116 // { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE     = 117 // { int getrusage(int who, struct rusage *rusage); }
-	SYS_GETSOCKOPT    = 118 // { int getsockopt(int s, int level, int name, \
-	SYS_READV         = 120 // { int readv(int fd, struct iovec *iovp, u_int iovcnt); }
-	SYS_WRITEV        = 121 // { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY  = 122 // { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN        = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD        = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID      = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID      = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME        = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK         = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO        = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO        = 133 // { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN      = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR    = 135 // { int socketpair(int domain, int type, int protocol, \
-	SYS_MKDIR         = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR         = 137 // { int rmdir(char *path); }
-	SYS_UTIMES        = 138 // { int utimes(char *path, struct timeval *tptr); }
-	SYS_ADJTIME       = 140 // { int adjtime(struct timeval *delta, \
-	SYS_SETSID        = 147 // { int setsid(void); }
-	SYS_QUOTACTL      = 148 // { int quotactl(char *path, int cmd, int uid, \
-	SYS_STATFS        = 157 // { int statfs(char *path, struct statfs *buf); }
-	SYS_FSTATFS       = 158 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_GETFH         = 161 // { int getfh(char *fname, struct fhandle *fhp); }
-	SYS_GETDOMAINNAME = 162 // { int getdomainname(char *domainname, int len); }
-	SYS_SETDOMAINNAME = 163 // { int setdomainname(char *domainname, int len); }
-	SYS_UNAME         = 164 // { int uname(struct utsname *name); }
-	SYS_SYSARCH       = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO        = 166 // { int rtprio(int function, pid_t pid, \
-	SYS_EXTPREAD      = 173 // { ssize_t extpread(int fd, void *buf, \
-	SYS_EXTPWRITE     = 174 // { ssize_t extpwrite(int fd, const void *buf, \
-	SYS_NTP_ADJTIME   = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID        = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID       = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID       = 183 // { int seteuid(uid_t euid); }
-	SYS_PATHCONF      = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF     = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT     = 194 // { int getrlimit(u_int which, \
-	SYS_SETRLIMIT     = 195 // { int setrlimit(u_int which, \
-	SYS_MMAP          = 197 // { caddr_t mmap(caddr_t addr, size_t len, int prot, \
-	// SYS_NOSYS = 198;  // { int nosys(void); } __syscall __syscall_args int
-	SYS_LSEEK                  = 199 // { off_t lseek(int fd, int pad, off_t offset, \
-	SYS_TRUNCATE               = 200 // { int truncate(char *path, int pad, off_t length); }
-	SYS_FTRUNCATE              = 201 // { int ftruncate(int fd, int pad, off_t length); }
-	SYS___SYSCTL               = 202 // { int __sysctl(int *name, u_int namelen, void *old, \
-	SYS_MLOCK                  = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE               = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                   = 209 // { int poll(struct pollfd *fds, u_int nfds, \
-	SYS___SEMCTL               = 220 // { int __semctl(int semid, int semnum, int cmd, \
-	SYS_SEMGET                 = 221 // { int semget(key_t key, int nsems, int semflg); }
-	SYS_SEMOP                  = 222 // { int semop(int semid, struct sembuf *sops, \
-	SYS_MSGCTL                 = 224 // { int msgctl(int msqid, int cmd, \
-	SYS_MSGGET                 = 225 // { int msgget(key_t key, int msgflg); }
-	SYS_MSGSND                 = 226 // { int msgsnd(int msqid, void *msgp, size_t msgsz, \
-	SYS_MSGRCV                 = 227 // { int msgrcv(int msqid, void *msgp, size_t msgsz, \
-	SYS_SHMAT                  = 228 // { caddr_t shmat(int shmid, const void *shmaddr, \
-	SYS_SHMCTL                 = 229 // { int shmctl(int shmid, int cmd, \
-	SYS_SHMDT                  = 230 // { int shmdt(const void *shmaddr); }
-	SYS_SHMGET                 = 231 // { int shmget(key_t key, size_t size, int shmflg); }
-	SYS_CLOCK_GETTIME          = 232 // { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME          = 233 // { int clock_settime(clockid_t clock_id, \
-	SYS_CLOCK_GETRES           = 234 // { int clock_getres(clockid_t clock_id, \
-	SYS_NANOSLEEP              = 240 // { int nanosleep(const struct timespec *rqtp, \
-	SYS_MINHERIT               = 250 // { int minherit(void *addr, size_t len, int inherit); }
-	SYS_RFORK                  = 251 // { int rfork(int flags); }
-	SYS_OPENBSD_POLL           = 252 // { int openbsd_poll(struct pollfd *fds, u_int nfds, \
-	SYS_ISSETUGID              = 253 // { int issetugid(void); }
-	SYS_LCHOWN                 = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_LCHMOD                 = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                = 276 // { int lutimes(char *path, struct timeval *tptr); }
-	SYS_EXTPREADV              = 289 // { ssize_t extpreadv(int fd, struct iovec *iovp, \
-	SYS_EXTPWRITEV             = 290 // { ssize_t extpwritev(int fd, struct iovec *iovp,\
-	SYS_FHSTATFS               = 297 // { int fhstatfs(const struct fhandle *u_fhp, struct statfs *buf); }
-	SYS_FHOPEN                 = 298 // { int fhopen(const struct fhandle *u_fhp, int flags); }
-	SYS_MODNEXT                = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                = 301 // { int modstat(int modid, struct module_stat* stat); }
-	SYS_MODFNEXT               = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD              = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                = 308 // { int kldstat(int fileid, struct kld_file_stat* stat); }
-	SYS_KLDFIRSTMOD            = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                 = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID              = 311 // { int setresuid(uid_t ruid, uid_t euid, uid_t suid); }
-	SYS_SETRESGID              = 312 // { int setresgid(gid_t rgid, gid_t egid, gid_t sgid); }
-	SYS_AIO_RETURN             = 314 // { int aio_return(struct aiocb *aiocbp); }
-	SYS_AIO_SUSPEND            = 315 // { int aio_suspend(struct aiocb * const * aiocbp, int nent, const struct timespec *timeout); }
-	SYS_AIO_CANCEL             = 316 // { int aio_cancel(int fd, struct aiocb *aiocbp); }
-	SYS_AIO_ERROR              = 317 // { int aio_error(struct aiocb *aiocbp); }
-	SYS_AIO_READ               = 318 // { int aio_read(struct aiocb *aiocbp); }
-	SYS_AIO_WRITE              = 319 // { int aio_write(struct aiocb *aiocbp); }
-	SYS_LIO_LISTIO             = 320 // { int lio_listio(int mode, struct aiocb * const *acb_list, int nent, struct sigevent *sig); }
-	SYS_YIELD                  = 321 // { int yield(void); }
-	SYS_MLOCKALL               = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL             = 325 // { int munlockall(void); }
-	SYS___GETCWD               = 326 // { int __getcwd(u_char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM         = 327 // { int sched_setparam (pid_t pid, const struct sched_param *param); }
-	SYS_SCHED_GETPARAM         = 328 // { int sched_getparam (pid_t pid, struct sched_param *param); }
-	SYS_SCHED_SETSCHEDULER     = 329 // { int sched_setscheduler (pid_t pid, int policy, const struct sched_param *param); }
-	SYS_SCHED_GETSCHEDULER     = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD            = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL  = 334 // { int sched_rr_get_interval (pid_t pid, struct timespec *interval); }
-	SYS_UTRACE                 = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                 = 337 // { int kldsym(int fileid, int cmd, void *data); }
-	SYS_JAIL                   = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK            = 340 // { int sigprocmask(int how, const sigset_t *set, \
-	SYS_SIGSUSPEND             = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGACTION              = 342 // { int sigaction(int sig, const struct sigaction *act, \
-	SYS_SIGPENDING             = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGRETURN              = 344 // { int sigreturn(ucontext_t *sigcntxp); }
-	SYS_SIGTIMEDWAIT           = 345 // { int sigtimedwait(const sigset_t *set,\
-	SYS_SIGWAITINFO            = 346 // { int sigwaitinfo(const sigset_t *set,\
-	SYS___ACL_GET_FILE         = 347 // { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE         = 348 // { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD           = 349 // { int __acl_get_fd(int filedes, acl_type_t type, \
-	SYS___ACL_SET_FD           = 350 // { int __acl_set_fd(int filedes, acl_type_t type, \
-	SYS___ACL_DELETE_FILE      = 351 // { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD        = 352 // { int __acl_delete_fd(int filedes, acl_type_t type); }
-	SYS___ACL_ACLCHECK_FILE    = 353 // { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD      = 354 // { int __acl_aclcheck_fd(int filedes, acl_type_t type, \
-	SYS_EXTATTRCTL             = 355 // { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE       = 356 // { int extattr_set_file(const char *path, \
-	SYS_EXTATTR_GET_FILE       = 357 // { int extattr_get_file(const char *path, \
-	SYS_EXTATTR_DELETE_FILE    = 358 // { int extattr_delete_file(const char *path, \
-	SYS_AIO_WAITCOMPLETE       = 359 // { int aio_waitcomplete(struct aiocb **aiocbp, struct timespec *timeout); }
-	SYS_GETRESUID              = 360 // { int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
-	SYS_GETRESGID              = 361 // { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
-	SYS_KQUEUE                 = 362 // { int kqueue(void); }
-	SYS_KEVENT                 = 363 // { int kevent(int fd, \
-	SYS_SCTP_PEELOFF           = 364 // { int sctp_peeloff(int sd, caddr_t name ); }
-	SYS_LCHFLAGS               = 391 // { int lchflags(char *path, int flags); }
-	SYS_UUIDGEN                = 392 // { int uuidgen(struct uuid *store, int count); }
-	SYS_SENDFILE               = 393 // { int sendfile(int fd, int s, off_t offset, size_t nbytes, \
-	SYS_VARSYM_SET             = 450 // { int varsym_set(int level, const char *name, const char *data); }
-	SYS_VARSYM_GET             = 451 // { int varsym_get(int mask, const char *wild, char *buf, int bufsize); }
-	SYS_VARSYM_LIST            = 452 // { int varsym_list(int level, char *buf, int maxsize, int *marker); }
-	SYS_EXEC_SYS_REGISTER      = 465 // { int exec_sys_register(void *entry); }
-	SYS_EXEC_SYS_UNREGISTER    = 466 // { int exec_sys_unregister(int id); }
-	SYS_SYS_CHECKPOINT         = 467 // { int sys_checkpoint(int type, int fd, pid_t pid, int retval); }
-	SYS_MOUNTCTL               = 468 // { int mountctl(const char *path, int op, int fd, const void *ctl, int ctllen, void *buf, int buflen); }
-	SYS_UMTX_SLEEP             = 469 // { int umtx_sleep(volatile const int *ptr, int value, int timeout); }
-	SYS_UMTX_WAKEUP            = 470 // { int umtx_wakeup(volatile const int *ptr, int count); }
-	SYS_JAIL_ATTACH            = 471 // { int jail_attach(int jid); }
-	SYS_SET_TLS_AREA           = 472 // { int set_tls_area(int which, struct tls_info *info, size_t infosize); }
-	SYS_GET_TLS_AREA           = 473 // { int get_tls_area(int which, struct tls_info *info, size_t infosize); }
-	SYS_CLOSEFROM              = 474 // { int closefrom(int fd); }
-	SYS_STAT                   = 475 // { int stat(const char *path, struct stat *ub); }
-	SYS_FSTAT                  = 476 // { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                  = 477 // { int lstat(const char *path, struct stat *ub); }
-	SYS_FHSTAT                 = 478 // { int fhstat(const struct fhandle *u_fhp, struct stat *sb); }
-	SYS_GETDIRENTRIES          = 479 // { int getdirentries(int fd, char *buf, u_int count, \
-	SYS_GETDENTS               = 480 // { int getdents(int fd, char *buf, size_t count); }
-	SYS_USCHED_SET             = 481 // { int usched_set(pid_t pid, int cmd, void *data, \
-	SYS_EXTACCEPT              = 482 // { int extaccept(int s, int flags, caddr_t name, int *anamelen); }
-	SYS_EXTCONNECT             = 483 // { int extconnect(int s, int flags, caddr_t name, int namelen); }
-	SYS_MCONTROL               = 485 // { int mcontrol(void *addr, size_t len, int behav, off_t value); }
-	SYS_VMSPACE_CREATE         = 486 // { int vmspace_create(void *id, int type, void *data); }
-	SYS_VMSPACE_DESTROY        = 487 // { int vmspace_destroy(void *id); }
-	SYS_VMSPACE_CTL            = 488 // { int vmspace_ctl(void *id, int cmd, 		\
-	SYS_VMSPACE_MMAP           = 489 // { int vmspace_mmap(void *id, void *addr, size_t len, \
-	SYS_VMSPACE_MUNMAP         = 490 // { int vmspace_munmap(void *id, void *addr,	\
-	SYS_VMSPACE_MCONTROL       = 491 // { int vmspace_mcontrol(void *id, void *addr, 	\
-	SYS_VMSPACE_PREAD          = 492 // { ssize_t vmspace_pread(void *id, void *buf, \
-	SYS_VMSPACE_PWRITE         = 493 // { ssize_t vmspace_pwrite(void *id, const void *buf, \
-	SYS_EXTEXIT                = 494 // { void extexit(int how, int status, void *addr); }
-	SYS_LWP_CREATE             = 495 // { int lwp_create(struct lwp_params *params); }
-	SYS_LWP_GETTID             = 496 // { lwpid_t lwp_gettid(void); }
-	SYS_LWP_KILL               = 497 // { int lwp_kill(pid_t pid, lwpid_t tid, int signum); }
-	SYS_LWP_RTPRIO             = 498 // { int lwp_rtprio(int function, pid_t pid, lwpid_t tid, struct rtprio *rtp); }
-	SYS_PSELECT                = 499 // { int pselect(int nd, fd_set *in, fd_set *ou, \
-	SYS_STATVFS                = 500 // { int statvfs(const char *path, struct statvfs *buf); }
-	SYS_FSTATVFS               = 501 // { int fstatvfs(int fd, struct statvfs *buf); }
-	SYS_FHSTATVFS              = 502 // { int fhstatvfs(const struct fhandle *u_fhp, struct statvfs *buf); }
-	SYS_GETVFSSTAT             = 503 // { int getvfsstat(struct statfs *buf,          \
-	SYS_OPENAT                 = 504 // { int openat(int fd, char *path, int flags, int mode); }
-	SYS_FSTATAT                = 505 // { int fstatat(int fd, char *path, 	\
-	SYS_FCHMODAT               = 506 // { int fchmodat(int fd, char *path, int mode, \
-	SYS_FCHOWNAT               = 507 // { int fchownat(int fd, char *path, int uid, int gid, \
-	SYS_UNLINKAT               = 508 // { int unlinkat(int fd, char *path, int flags); }
-	SYS_FACCESSAT              = 509 // { int faccessat(int fd, char *path, int amode, \
-	SYS_MQ_OPEN                = 510 // { mqd_t mq_open(const char * name, int oflag, \
-	SYS_MQ_CLOSE               = 511 // { int mq_close(mqd_t mqdes); }
-	SYS_MQ_UNLINK              = 512 // { int mq_unlink(const char *name); }
-	SYS_MQ_GETATTR             = 513 // { int mq_getattr(mqd_t mqdes, \
-	SYS_MQ_SETATTR             = 514 // { int mq_setattr(mqd_t mqdes, \
-	SYS_MQ_NOTIFY              = 515 // { int mq_notify(mqd_t mqdes, \
-	SYS_MQ_SEND                = 516 // { int mq_send(mqd_t mqdes, const char *msg_ptr, \
-	SYS_MQ_RECEIVE             = 517 // { ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, \
-	SYS_MQ_TIMEDSEND           = 518 // { int mq_timedsend(mqd_t mqdes, \
-	SYS_MQ_TIMEDRECEIVE        = 519 // { ssize_t mq_timedreceive(mqd_t mqdes, \
-	SYS_IOPRIO_SET             = 520 // { int ioprio_set(int which, int who, int prio); }
-	SYS_IOPRIO_GET             = 521 // { int ioprio_get(int which, int who); }
-	SYS_CHROOT_KERNEL          = 522 // { int chroot_kernel(char *path); }
-	SYS_RENAMEAT               = 523 // { int renameat(int oldfd, char *old, int newfd, \
-	SYS_MKDIRAT                = 524 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT               = 525 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT                = 526 // { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_READLINKAT             = 527 // { int readlinkat(int fd, char *path, char *buf, \
-	SYS_SYMLINKAT              = 528 // { int symlinkat(char *path1, int fd, char *path2); }
-	SYS_SWAPOFF                = 529 // { int swapoff(char *name); }
-	SYS_VQUOTACTL              = 530 // { int vquotactl(const char *path, \
-	SYS_LINKAT                 = 531 // { int linkat(int fd1, char *path1, int fd2, \
-	SYS_EACCESS                = 532 // { int eaccess(char *path, int flags); }
-	SYS_LPATHCONF              = 533 // { int lpathconf(char *path, int name); }
-	SYS_VMM_GUEST_CTL          = 534 // { int vmm_guest_ctl(int op, struct vmm_guest_options *options); }
-	SYS_VMM_GUEST_SYNC_ADDR    = 535 // { int vmm_guest_sync_addr(long *dstaddr, long *srcaddr); }
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
deleted file mode 100644
index 262a84536a..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
+++ /dev/null
@@ -1,351 +0,0 @@
-// mksysnum_freebsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build 386,freebsd
-
-package unix
-
-const (
-	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
-	SYS_FORK                     = 2   // { int fork(void); }
-	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
-	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
-	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE                    = 6   // { int close(int fd); }
-	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
-	SYS_LINK                     = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK                   = 10  // { int unlink(char *path); }
-	SYS_CHDIR                    = 12  // { int chdir(char *path); }
-	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
-	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
-	SYS_GETPID                   = 20  // { pid_t getpid(void); }
-	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
-	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID                   = 24  // { uid_t getuid(void); }
-	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
-	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
-	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
-	SYS_ACCEPT                   = 30  // { int accept(int s, \
-	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
-	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
-	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
-	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
-	SYS_SYNC                     = 36  // { int sync(void); }
-	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
-	SYS_DUP                      = 41  // { int dup(u_int fd); }
-	SYS_PIPE                     = 42  // { int pipe(void); }
-	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
-	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
-	SYS_GETGID                   = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
-	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT                     = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
-	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
-	SYS_REBOOT                   = 55  // { int reboot(int opt); }
-	SYS_REVOKE                   = 56  // { int revoke(char *path); }
-	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
-	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
-	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
-	SYS_CHROOT                   = 61  // { int chroot(char *path); }
-	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
-	SYS_VFORK                    = 66  // { int vfork(void); }
-	SYS_SBRK                     = 69  // { int sbrk(int incr); }
-	SYS_SSTK                     = 70  // { int sstk(int incr); }
-	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
-	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
-	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
-	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
-	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
-	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
-	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
-	SYS_SWAPON                   = 85  // { int swapon(char *name); }
-	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
-	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
-	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC                    = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
-	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
-	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
-	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
-	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
-	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
-	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
-	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
-	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
-	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
-	SYS_UTIMES                   = 138 // { int utimes(char *path, \
-	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
-	SYS_SETSID                   = 147 // { int setsid(void); }
-	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
-	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
-	SYS_GETFH                    = 161 // { int getfh(char *fname, \
-	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
-	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
-	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
-	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
-	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
-	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
-	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
-	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
-	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
-	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
-	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
-	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
-	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
-	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
-	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
-	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
-	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
-	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
-	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
-	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
-	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
-	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
-	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
-	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
-	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
-	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
-	SYS_RFORK                    = 251 // { int rfork(int flags); }
-	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
-	SYS_ISSETUGID                = 253 // { int issetugid(void); }
-	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
-	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
-	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
-	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
-	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
-	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
-	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
-	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
-	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
-	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
-	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
-	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
-	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
-	SYS_YIELD                    = 321 // { int yield(void); }
-	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
-	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
-	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
-	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
-	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
-	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
-	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
-	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
-	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
-	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
-	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
-	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
-	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
-	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
-	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_KQUEUE                   = 362 // { int kqueue(void); }
-	SYS_KEVENT                   = 363 // { int kevent(int fd, \
-	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
-	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
-	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
-	SYS___SETUGID                = 374 // { int __setugid(int flag); }
-	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
-	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
-	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
-	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
-	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
-	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
-	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
-	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
-	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
-	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
-	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
-	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
-	SYS_STATFS                   = 396 // { int statfs(char *path, \
-	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
-	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
-	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
-	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
-	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
-	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
-	SYS_SIGRETURN                = 417 // { int sigreturn( \
-	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext( \
-	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
-	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
-	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
-	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
-	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
-	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
-	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
-	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
-	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
-	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
-	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
-	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
-	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
-	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
-	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
-	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
-	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
-	SYS_AUDIT                    = 445 // { int audit(const void *record, \
-	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
-	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
-	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
-	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
-	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
-	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
-	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
-	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
-	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
-	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
-	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
-	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
-	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
-	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
-	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
-	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
-	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
-	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
-	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
-	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
-	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
-	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
-	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
-	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
-	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
-	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
-	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
-	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
-	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
-	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
-	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
-	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
-	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
-	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
-	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
-	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
-	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
-	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
-	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
-	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
-	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
-	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
-	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
-	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
-	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
-	SYS_CAP_NEW                  = 514 // { int cap_new(int fd, uint64_t rights); }
-	SYS_CAP_GETRIGHTS            = 515 // { int cap_getrights(int fd, \
-	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
-	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
-	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
-	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
-	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
-	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
-	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
-	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
-	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
-	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
-	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
-	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
-	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
-	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
-	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
-	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
-	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
-	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
-	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
-	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
-	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
-	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
-	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
deleted file mode 100644
index 57a60ea126..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
+++ /dev/null
@@ -1,351 +0,0 @@
-// mksysnum_freebsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build amd64,freebsd
-
-package unix
-
-const (
-	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
-	SYS_FORK                     = 2   // { int fork(void); }
-	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
-	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
-	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE                    = 6   // { int close(int fd); }
-	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
-	SYS_LINK                     = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK                   = 10  // { int unlink(char *path); }
-	SYS_CHDIR                    = 12  // { int chdir(char *path); }
-	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
-	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
-	SYS_GETPID                   = 20  // { pid_t getpid(void); }
-	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
-	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID                   = 24  // { uid_t getuid(void); }
-	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
-	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
-	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
-	SYS_ACCEPT                   = 30  // { int accept(int s, \
-	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
-	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
-	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
-	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
-	SYS_SYNC                     = 36  // { int sync(void); }
-	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
-	SYS_DUP                      = 41  // { int dup(u_int fd); }
-	SYS_PIPE                     = 42  // { int pipe(void); }
-	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
-	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
-	SYS_GETGID                   = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
-	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT                     = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
-	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
-	SYS_REBOOT                   = 55  // { int reboot(int opt); }
-	SYS_REVOKE                   = 56  // { int revoke(char *path); }
-	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
-	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
-	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
-	SYS_CHROOT                   = 61  // { int chroot(char *path); }
-	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
-	SYS_VFORK                    = 66  // { int vfork(void); }
-	SYS_SBRK                     = 69  // { int sbrk(int incr); }
-	SYS_SSTK                     = 70  // { int sstk(int incr); }
-	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
-	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
-	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
-	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
-	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
-	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
-	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
-	SYS_SWAPON                   = 85  // { int swapon(char *name); }
-	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
-	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
-	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC                    = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
-	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
-	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
-	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
-	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
-	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
-	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
-	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
-	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
-	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
-	SYS_UTIMES                   = 138 // { int utimes(char *path, \
-	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
-	SYS_SETSID                   = 147 // { int setsid(void); }
-	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
-	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
-	SYS_GETFH                    = 161 // { int getfh(char *fname, \
-	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
-	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
-	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
-	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
-	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
-	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
-	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
-	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
-	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
-	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
-	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
-	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
-	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
-	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
-	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
-	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
-	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
-	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
-	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
-	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
-	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
-	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
-	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
-	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
-	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
-	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
-	SYS_RFORK                    = 251 // { int rfork(int flags); }
-	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
-	SYS_ISSETUGID                = 253 // { int issetugid(void); }
-	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
-	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
-	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
-	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
-	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
-	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
-	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
-	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
-	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
-	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
-	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
-	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
-	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
-	SYS_YIELD                    = 321 // { int yield(void); }
-	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
-	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
-	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
-	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
-	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
-	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
-	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
-	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
-	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
-	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
-	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
-	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
-	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
-	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
-	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_KQUEUE                   = 362 // { int kqueue(void); }
-	SYS_KEVENT                   = 363 // { int kevent(int fd, \
-	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
-	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
-	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
-	SYS___SETUGID                = 374 // { int __setugid(int flag); }
-	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
-	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
-	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
-	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
-	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
-	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
-	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
-	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
-	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
-	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
-	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
-	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
-	SYS_STATFS                   = 396 // { int statfs(char *path, \
-	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
-	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
-	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
-	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
-	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
-	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
-	SYS_SIGRETURN                = 417 // { int sigreturn( \
-	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext( \
-	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
-	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
-	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
-	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
-	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
-	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
-	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
-	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
-	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
-	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
-	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
-	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
-	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
-	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
-	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
-	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
-	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
-	SYS_AUDIT                    = 445 // { int audit(const void *record, \
-	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
-	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
-	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
-	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
-	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
-	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
-	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
-	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
-	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
-	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
-	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
-	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
-	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
-	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
-	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
-	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
-	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
-	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
-	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
-	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
-	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
-	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
-	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
-	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
-	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
-	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
-	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
-	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
-	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
-	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
-	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
-	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
-	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
-	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
-	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
-	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
-	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
-	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
-	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
-	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
-	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
-	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
-	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
-	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
-	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
-	SYS_CAP_NEW                  = 514 // { int cap_new(int fd, uint64_t rights); }
-	SYS_CAP_GETRIGHTS            = 515 // { int cap_getrights(int fd, \
-	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
-	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
-	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
-	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
-	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
-	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
-	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
-	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
-	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
-	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
-	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
-	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
-	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
-	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
-	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
-	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
-	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
-	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
-	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
-	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
-	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
-	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
-	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
deleted file mode 100644
index 206b9f612d..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
+++ /dev/null
@@ -1,351 +0,0 @@
-// mksysnum_freebsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build arm,freebsd
-
-package unix
-
-const (
-	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
-	SYS_FORK                     = 2   // { int fork(void); }
-	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
-	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
-	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE                    = 6   // { int close(int fd); }
-	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
-	SYS_LINK                     = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK                   = 10  // { int unlink(char *path); }
-	SYS_CHDIR                    = 12  // { int chdir(char *path); }
-	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
-	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
-	SYS_GETPID                   = 20  // { pid_t getpid(void); }
-	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
-	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID                   = 24  // { uid_t getuid(void); }
-	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
-	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
-	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
-	SYS_ACCEPT                   = 30  // { int accept(int s, \
-	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
-	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
-	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
-	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
-	SYS_SYNC                     = 36  // { int sync(void); }
-	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
-	SYS_DUP                      = 41  // { int dup(u_int fd); }
-	SYS_PIPE                     = 42  // { int pipe(void); }
-	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
-	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
-	SYS_GETGID                   = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
-	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT                     = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
-	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
-	SYS_REBOOT                   = 55  // { int reboot(int opt); }
-	SYS_REVOKE                   = 56  // { int revoke(char *path); }
-	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
-	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
-	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
-	SYS_CHROOT                   = 61  // { int chroot(char *path); }
-	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
-	SYS_VFORK                    = 66  // { int vfork(void); }
-	SYS_SBRK                     = 69  // { int sbrk(int incr); }
-	SYS_SSTK                     = 70  // { int sstk(int incr); }
-	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
-	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
-	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
-	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
-	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
-	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
-	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
-	SYS_SWAPON                   = 85  // { int swapon(char *name); }
-	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
-	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
-	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC                    = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
-	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
-	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
-	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
-	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
-	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
-	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
-	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
-	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
-	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
-	SYS_UTIMES                   = 138 // { int utimes(char *path, \
-	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
-	SYS_SETSID                   = 147 // { int setsid(void); }
-	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
-	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
-	SYS_GETFH                    = 161 // { int getfh(char *fname, \
-	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
-	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
-	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
-	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
-	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
-	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
-	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
-	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
-	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
-	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
-	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
-	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
-	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
-	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
-	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
-	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
-	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
-	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
-	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
-	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
-	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
-	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
-	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
-	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
-	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
-	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
-	SYS_RFORK                    = 251 // { int rfork(int flags); }
-	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
-	SYS_ISSETUGID                = 253 // { int issetugid(void); }
-	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
-	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
-	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
-	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
-	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
-	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
-	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
-	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
-	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
-	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
-	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
-	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
-	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
-	SYS_YIELD                    = 321 // { int yield(void); }
-	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
-	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
-	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
-	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
-	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
-	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
-	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
-	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
-	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
-	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
-	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
-	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
-	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
-	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
-	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_KQUEUE                   = 362 // { int kqueue(void); }
-	SYS_KEVENT                   = 363 // { int kevent(int fd, \
-	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
-	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
-	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
-	SYS___SETUGID                = 374 // { int __setugid(int flag); }
-	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
-	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
-	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
-	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
-	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
-	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
-	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
-	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
-	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
-	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
-	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
-	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
-	SYS_STATFS                   = 396 // { int statfs(char *path, \
-	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
-	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
-	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
-	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
-	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
-	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
-	SYS_SIGRETURN                = 417 // { int sigreturn( \
-	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext( \
-	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
-	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
-	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
-	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
-	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
-	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
-	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
-	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
-	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
-	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
-	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
-	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
-	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
-	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
-	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
-	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
-	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
-	SYS_AUDIT                    = 445 // { int audit(const void *record, \
-	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
-	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
-	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
-	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
-	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
-	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
-	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
-	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
-	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
-	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
-	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
-	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
-	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
-	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
-	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
-	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
-	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
-	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
-	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
-	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
-	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
-	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
-	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
-	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
-	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
-	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
-	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
-	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
-	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
-	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
-	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
-	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
-	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
-	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
-	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
-	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
-	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
-	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
-	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
-	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
-	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
-	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
-	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
-	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
-	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
-	SYS_CAP_NEW                  = 514 // { int cap_new(int fd, uint64_t rights); }
-	SYS_CAP_GETRIGHTS            = 515 // { int cap_getrights(int fd, \
-	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
-	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
-	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
-	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
-	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
-	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
-	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
-	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
-	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
-	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
-	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
-	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
-	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
-	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
-	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
-	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
-	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
-	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
-	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
-	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
-	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
-	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
-	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
deleted file mode 100644
index cef4fed02c..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
+++ /dev/null
@@ -1,388 +0,0 @@
-// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include -m32 /tmp/include/asm/unistd.h
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build 386,linux
-
-package unix
-
-const (
-	SYS_RESTART_SYSCALL        = 0
-	SYS_EXIT                   = 1
-	SYS_FORK                   = 2
-	SYS_READ                   = 3
-	SYS_WRITE                  = 4
-	SYS_OPEN                   = 5
-	SYS_CLOSE                  = 6
-	SYS_WAITPID                = 7
-	SYS_CREAT                  = 8
-	SYS_LINK                   = 9
-	SYS_UNLINK                 = 10
-	SYS_EXECVE                 = 11
-	SYS_CHDIR                  = 12
-	SYS_TIME                   = 13
-	SYS_MKNOD                  = 14
-	SYS_CHMOD                  = 15
-	SYS_LCHOWN                 = 16
-	SYS_BREAK                  = 17
-	SYS_OLDSTAT                = 18
-	SYS_LSEEK                  = 19
-	SYS_GETPID                 = 20
-	SYS_MOUNT                  = 21
-	SYS_UMOUNT                 = 22
-	SYS_SETUID                 = 23
-	SYS_GETUID                 = 24
-	SYS_STIME                  = 25
-	SYS_PTRACE                 = 26
-	SYS_ALARM                  = 27
-	SYS_OLDFSTAT               = 28
-	SYS_PAUSE                  = 29
-	SYS_UTIME                  = 30
-	SYS_STTY                   = 31
-	SYS_GTTY                   = 32
-	SYS_ACCESS                 = 33
-	SYS_NICE                   = 34
-	SYS_FTIME                  = 35
-	SYS_SYNC                   = 36
-	SYS_KILL                   = 37
-	SYS_RENAME                 = 38
-	SYS_MKDIR                  = 39
-	SYS_RMDIR                  = 40
-	SYS_DUP                    = 41
-	SYS_PIPE                   = 42
-	SYS_TIMES                  = 43
-	SYS_PROF                   = 44
-	SYS_BRK                    = 45
-	SYS_SETGID                 = 46
-	SYS_GETGID                 = 47
-	SYS_SIGNAL                 = 48
-	SYS_GETEUID                = 49
-	SYS_GETEGID                = 50
-	SYS_ACCT                   = 51
-	SYS_UMOUNT2                = 52
-	SYS_LOCK                   = 53
-	SYS_IOCTL                  = 54
-	SYS_FCNTL                  = 55
-	SYS_MPX                    = 56
-	SYS_SETPGID                = 57
-	SYS_ULIMIT                 = 58
-	SYS_OLDOLDUNAME            = 59
-	SYS_UMASK                  = 60
-	SYS_CHROOT                 = 61
-	SYS_USTAT                  = 62
-	SYS_DUP2                   = 63
-	SYS_GETPPID                = 64
-	SYS_GETPGRP                = 65
-	SYS_SETSID                 = 66
-	SYS_SIGACTION              = 67
-	SYS_SGETMASK               = 68
-	SYS_SSETMASK               = 69
-	SYS_SETREUID               = 70
-	SYS_SETREGID               = 71
-	SYS_SIGSUSPEND             = 72
-	SYS_SIGPENDING             = 73
-	SYS_SETHOSTNAME            = 74
-	SYS_SETRLIMIT              = 75
-	SYS_GETRLIMIT              = 76
-	SYS_GETRUSAGE              = 77
-	SYS_GETTIMEOFDAY           = 78
-	SYS_SETTIMEOFDAY           = 79
-	SYS_GETGROUPS              = 80
-	SYS_SETGROUPS              = 81
-	SYS_SELECT                 = 82
-	SYS_SYMLINK                = 83
-	SYS_OLDLSTAT               = 84
-	SYS_READLINK               = 85
-	SYS_USELIB                 = 86
-	SYS_SWAPON                 = 87
-	SYS_REBOOT                 = 88
-	SYS_READDIR                = 89
-	SYS_MMAP                   = 90
-	SYS_MUNMAP                 = 91
-	SYS_TRUNCATE               = 92
-	SYS_FTRUNCATE              = 93
-	SYS_FCHMOD                 = 94
-	SYS_FCHOWN                 = 95
-	SYS_GETPRIORITY            = 96
-	SYS_SETPRIORITY            = 97
-	SYS_PROFIL                 = 98
-	SYS_STATFS                 = 99
-	SYS_FSTATFS                = 100
-	SYS_IOPERM                 = 101
-	SYS_SOCKETCALL             = 102
-	SYS_SYSLOG                 = 103
-	SYS_SETITIMER              = 104
-	SYS_GETITIMER              = 105
-	SYS_STAT                   = 106
-	SYS_LSTAT                  = 107
-	SYS_FSTAT                  = 108
-	SYS_OLDUNAME               = 109
-	SYS_IOPL                   = 110
-	SYS_VHANGUP                = 111
-	SYS_IDLE                   = 112
-	SYS_VM86OLD                = 113
-	SYS_WAIT4                  = 114
-	SYS_SWAPOFF                = 115
-	SYS_SYSINFO                = 116
-	SYS_IPC                    = 117
-	SYS_FSYNC                  = 118
-	SYS_SIGRETURN              = 119
-	SYS_CLONE                  = 120
-	SYS_SETDOMAINNAME          = 121
-	SYS_UNAME                  = 122
-	SYS_MODIFY_LDT             = 123
-	SYS_ADJTIMEX               = 124
-	SYS_MPROTECT               = 125
-	SYS_SIGPROCMASK            = 126
-	SYS_CREATE_MODULE          = 127
-	SYS_INIT_MODULE            = 128
-	SYS_DELETE_MODULE          = 129
-	SYS_GET_KERNEL_SYMS        = 130
-	SYS_QUOTACTL               = 131
-	SYS_GETPGID                = 132
-	SYS_FCHDIR                 = 133
-	SYS_BDFLUSH                = 134
-	SYS_SYSFS                  = 135
-	SYS_PERSONALITY            = 136
-	SYS_AFS_SYSCALL            = 137
-	SYS_SETFSUID               = 138
-	SYS_SETFSGID               = 139
-	SYS__LLSEEK                = 140
-	SYS_GETDENTS               = 141
-	SYS__NEWSELECT             = 142
-	SYS_FLOCK                  = 143
-	SYS_MSYNC                  = 144
-	SYS_READV                  = 145
-	SYS_WRITEV                 = 146
-	SYS_GETSID                 = 147
-	SYS_FDATASYNC              = 148
-	SYS__SYSCTL                = 149
-	SYS_MLOCK                  = 150
-	SYS_MUNLOCK                = 151
-	SYS_MLOCKALL               = 152
-	SYS_MUNLOCKALL             = 153
-	SYS_SCHED_SETPARAM         = 154
-	SYS_SCHED_GETPARAM         = 155
-	SYS_SCHED_SETSCHEDULER     = 156
-	SYS_SCHED_GETSCHEDULER     = 157
-	SYS_SCHED_YIELD            = 158
-	SYS_SCHED_GET_PRIORITY_MAX = 159
-	SYS_SCHED_GET_PRIORITY_MIN = 160
-	SYS_SCHED_RR_GET_INTERVAL  = 161
-	SYS_NANOSLEEP              = 162
-	SYS_MREMAP                 = 163
-	SYS_SETRESUID              = 164
-	SYS_GETRESUID              = 165
-	SYS_VM86                   = 166
-	SYS_QUERY_MODULE           = 167
-	SYS_POLL                   = 168
-	SYS_NFSSERVCTL             = 169
-	SYS_SETRESGID              = 170
-	SYS_GETRESGID              = 171
-	SYS_PRCTL                  = 172
-	SYS_RT_SIGRETURN           = 173
-	SYS_RT_SIGACTION           = 174
-	SYS_RT_SIGPROCMASK         = 175
-	SYS_RT_SIGPENDING          = 176
-	SYS_RT_SIGTIMEDWAIT        = 177
-	SYS_RT_SIGQUEUEINFO        = 178
-	SYS_RT_SIGSUSPEND          = 179
-	SYS_PREAD64                = 180
-	SYS_PWRITE64               = 181
-	SYS_CHOWN                  = 182
-	SYS_GETCWD                 = 183
-	SYS_CAPGET                 = 184
-	SYS_CAPSET                 = 185
-	SYS_SIGALTSTACK            = 186
-	SYS_SENDFILE               = 187
-	SYS_GETPMSG                = 188
-	SYS_PUTPMSG                = 189
-	SYS_VFORK                  = 190
-	SYS_UGETRLIMIT             = 191
-	SYS_MMAP2                  = 192
-	SYS_TRUNCATE64             = 193
-	SYS_FTRUNCATE64            = 194
-	SYS_STAT64                 = 195
-	SYS_LSTAT64                = 196
-	SYS_FSTAT64                = 197
-	SYS_LCHOWN32               = 198
-	SYS_GETUID32               = 199
-	SYS_GETGID32               = 200
-	SYS_GETEUID32              = 201
-	SYS_GETEGID32              = 202
-	SYS_SETREUID32             = 203
-	SYS_SETREGID32             = 204
-	SYS_GETGROUPS32            = 205
-	SYS_SETGROUPS32            = 206
-	SYS_FCHOWN32               = 207
-	SYS_SETRESUID32            = 208
-	SYS_GETRESUID32            = 209
-	SYS_SETRESGID32            = 210
-	SYS_GETRESGID32            = 211
-	SYS_CHOWN32                = 212
-	SYS_SETUID32               = 213
-	SYS_SETGID32               = 214
-	SYS_SETFSUID32             = 215
-	SYS_SETFSGID32             = 216
-	SYS_PIVOT_ROOT             = 217
-	SYS_MINCORE                = 218
-	SYS_MADVISE                = 219
-	SYS_GETDENTS64             = 220
-	SYS_FCNTL64                = 221
-	SYS_GETTID                 = 224
-	SYS_READAHEAD              = 225
-	SYS_SETXATTR               = 226
-	SYS_LSETXATTR              = 227
-	SYS_FSETXATTR              = 228
-	SYS_GETXATTR               = 229
-	SYS_LGETXATTR              = 230
-	SYS_FGETXATTR              = 231
-	SYS_LISTXATTR              = 232
-	SYS_LLISTXATTR             = 233
-	SYS_FLISTXATTR             = 234
-	SYS_REMOVEXATTR            = 235
-	SYS_LREMOVEXATTR           = 236
-	SYS_FREMOVEXATTR           = 237
-	SYS_TKILL                  = 238
-	SYS_SENDFILE64             = 239
-	SYS_FUTEX                  = 240
-	SYS_SCHED_SETAFFINITY      = 241
-	SYS_SCHED_GETAFFINITY      = 242
-	SYS_SET_THREAD_AREA        = 243
-	SYS_GET_THREAD_AREA        = 244
-	SYS_IO_SETUP               = 245
-	SYS_IO_DESTROY             = 246
-	SYS_IO_GETEVENTS           = 247
-	SYS_IO_SUBMIT              = 248
-	SYS_IO_CANCEL              = 249
-	SYS_FADVISE64              = 250
-	SYS_EXIT_GROUP             = 252
-	SYS_LOOKUP_DCOOKIE         = 253
-	SYS_EPOLL_CREATE           = 254
-	SYS_EPOLL_CTL              = 255
-	SYS_EPOLL_WAIT             = 256
-	SYS_REMAP_FILE_PAGES       = 257
-	SYS_SET_TID_ADDRESS        = 258
-	SYS_TIMER_CREATE           = 259
-	SYS_TIMER_SETTIME          = 260
-	SYS_TIMER_GETTIME          = 261
-	SYS_TIMER_GETOVERRUN       = 262
-	SYS_TIMER_DELETE           = 263
-	SYS_CLOCK_SETTIME          = 264
-	SYS_CLOCK_GETTIME          = 265
-	SYS_CLOCK_GETRES           = 266
-	SYS_CLOCK_NANOSLEEP        = 267
-	SYS_STATFS64               = 268
-	SYS_FSTATFS64              = 269
-	SYS_TGKILL                 = 270
-	SYS_UTIMES                 = 271
-	SYS_FADVISE64_64           = 272
-	SYS_VSERVER                = 273
-	SYS_MBIND                  = 274
-	SYS_GET_MEMPOLICY          = 275
-	SYS_SET_MEMPOLICY          = 276
-	SYS_MQ_OPEN                = 277
-	SYS_MQ_UNLINK              = 278
-	SYS_MQ_TIMEDSEND           = 279
-	SYS_MQ_TIMEDRECEIVE        = 280
-	SYS_MQ_NOTIFY              = 281
-	SYS_MQ_GETSETATTR          = 282
-	SYS_KEXEC_LOAD             = 283
-	SYS_WAITID                 = 284
-	SYS_ADD_KEY                = 286
-	SYS_REQUEST_KEY            = 287
-	SYS_KEYCTL                 = 288
-	SYS_IOPRIO_SET             = 289
-	SYS_IOPRIO_GET             = 290
-	SYS_INOTIFY_INIT           = 291
-	SYS_INOTIFY_ADD_WATCH      = 292
-	SYS_INOTIFY_RM_WATCH       = 293
-	SYS_MIGRATE_PAGES          = 294
-	SYS_OPENAT                 = 295
-	SYS_MKDIRAT                = 296
-	SYS_MKNODAT                = 297
-	SYS_FCHOWNAT               = 298
-	SYS_FUTIMESAT              = 299
-	SYS_FSTATAT64              = 300
-	SYS_UNLINKAT               = 301
-	SYS_RENAMEAT               = 302
-	SYS_LINKAT                 = 303
-	SYS_SYMLINKAT              = 304
-	SYS_READLINKAT             = 305
-	SYS_FCHMODAT               = 306
-	SYS_FACCESSAT              = 307
-	SYS_PSELECT6               = 308
-	SYS_PPOLL                  = 309
-	SYS_UNSHARE                = 310
-	SYS_SET_ROBUST_LIST        = 311
-	SYS_GET_ROBUST_LIST        = 312
-	SYS_SPLICE                 = 313
-	SYS_SYNC_FILE_RANGE        = 314
-	SYS_TEE                    = 315
-	SYS_VMSPLICE               = 316
-	SYS_MOVE_PAGES             = 317
-	SYS_GETCPU                 = 318
-	SYS_EPOLL_PWAIT            = 319
-	SYS_UTIMENSAT              = 320
-	SYS_SIGNALFD               = 321
-	SYS_TIMERFD_CREATE         = 322
-	SYS_EVENTFD                = 323
-	SYS_FALLOCATE              = 324
-	SYS_TIMERFD_SETTIME        = 325
-	SYS_TIMERFD_GETTIME        = 326
-	SYS_SIGNALFD4              = 327
-	SYS_EVENTFD2               = 328
-	SYS_EPOLL_CREATE1          = 329
-	SYS_DUP3                   = 330
-	SYS_PIPE2                  = 331
-	SYS_INOTIFY_INIT1          = 332
-	SYS_PREADV                 = 333
-	SYS_PWRITEV                = 334
-	SYS_RT_TGSIGQUEUEINFO      = 335
-	SYS_PERF_EVENT_OPEN        = 336
-	SYS_RECVMMSG               = 337
-	SYS_FANOTIFY_INIT          = 338
-	SYS_FANOTIFY_MARK          = 339
-	SYS_PRLIMIT64              = 340
-	SYS_NAME_TO_HANDLE_AT      = 341
-	SYS_OPEN_BY_HANDLE_AT      = 342
-	SYS_CLOCK_ADJTIME          = 343
-	SYS_SYNCFS                 = 344
-	SYS_SENDMMSG               = 345
-	SYS_SETNS                  = 346
-	SYS_PROCESS_VM_READV       = 347
-	SYS_PROCESS_VM_WRITEV      = 348
-	SYS_KCMP                   = 349
-	SYS_FINIT_MODULE           = 350
-	SYS_SCHED_SETATTR          = 351
-	SYS_SCHED_GETATTR          = 352
-	SYS_RENAMEAT2              = 353
-	SYS_SECCOMP                = 354
-	SYS_GETRANDOM              = 355
-	SYS_MEMFD_CREATE           = 356
-	SYS_BPF                    = 357
-	SYS_EXECVEAT               = 358
-	SYS_SOCKET                 = 359
-	SYS_SOCKETPAIR             = 360
-	SYS_BIND                   = 361
-	SYS_CONNECT                = 362
-	SYS_LISTEN                 = 363
-	SYS_ACCEPT4                = 364
-	SYS_GETSOCKOPT             = 365
-	SYS_SETSOCKOPT             = 366
-	SYS_GETSOCKNAME            = 367
-	SYS_GETPEERNAME            = 368
-	SYS_SENDTO                 = 369
-	SYS_SENDMSG                = 370
-	SYS_RECVFROM               = 371
-	SYS_RECVMSG                = 372
-	SYS_SHUTDOWN               = 373
-	SYS_USERFAULTFD            = 374
-	SYS_MEMBARRIER             = 375
-	SYS_MLOCK2                 = 376
-	SYS_COPY_FILE_RANGE        = 377
-	SYS_PREADV2                = 378
-	SYS_PWRITEV2               = 379
-	SYS_PKEY_MPROTECT          = 380
-	SYS_PKEY_ALLOC             = 381
-	SYS_PKEY_FREE              = 382
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
deleted file mode 100644
index 49bfa1270a..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
+++ /dev/null
@@ -1,341 +0,0 @@
-// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include -m64 /tmp/include/asm/unistd.h
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build amd64,linux
-
-package unix
-
-const (
-	SYS_READ                   = 0
-	SYS_WRITE                  = 1
-	SYS_OPEN                   = 2
-	SYS_CLOSE                  = 3
-	SYS_STAT                   = 4
-	SYS_FSTAT                  = 5
-	SYS_LSTAT                  = 6
-	SYS_POLL                   = 7
-	SYS_LSEEK                  = 8
-	SYS_MMAP                   = 9
-	SYS_MPROTECT               = 10
-	SYS_MUNMAP                 = 11
-	SYS_BRK                    = 12
-	SYS_RT_SIGACTION           = 13
-	SYS_RT_SIGPROCMASK         = 14
-	SYS_RT_SIGRETURN           = 15
-	SYS_IOCTL                  = 16
-	SYS_PREAD64                = 17
-	SYS_PWRITE64               = 18
-	SYS_READV                  = 19
-	SYS_WRITEV                 = 20
-	SYS_ACCESS                 = 21
-	SYS_PIPE                   = 22
-	SYS_SELECT                 = 23
-	SYS_SCHED_YIELD            = 24
-	SYS_MREMAP                 = 25
-	SYS_MSYNC                  = 26
-	SYS_MINCORE                = 27
-	SYS_MADVISE                = 28
-	SYS_SHMGET                 = 29
-	SYS_SHMAT                  = 30
-	SYS_SHMCTL                 = 31
-	SYS_DUP                    = 32
-	SYS_DUP2                   = 33
-	SYS_PAUSE                  = 34
-	SYS_NANOSLEEP              = 35
-	SYS_GETITIMER              = 36
-	SYS_ALARM                  = 37
-	SYS_SETITIMER              = 38
-	SYS_GETPID                 = 39
-	SYS_SENDFILE               = 40
-	SYS_SOCKET                 = 41
-	SYS_CONNECT                = 42
-	SYS_ACCEPT                 = 43
-	SYS_SENDTO                 = 44
-	SYS_RECVFROM               = 45
-	SYS_SENDMSG                = 46
-	SYS_RECVMSG                = 47
-	SYS_SHUTDOWN               = 48
-	SYS_BIND                   = 49
-	SYS_LISTEN                 = 50
-	SYS_GETSOCKNAME            = 51
-	SYS_GETPEERNAME            = 52
-	SYS_SOCKETPAIR             = 53
-	SYS_SETSOCKOPT             = 54
-	SYS_GETSOCKOPT             = 55
-	SYS_CLONE                  = 56
-	SYS_FORK                   = 57
-	SYS_VFORK                  = 58
-	SYS_EXECVE                 = 59
-	SYS_EXIT                   = 60
-	SYS_WAIT4                  = 61
-	SYS_KILL                   = 62
-	SYS_UNAME                  = 63
-	SYS_SEMGET                 = 64
-	SYS_SEMOP                  = 65
-	SYS_SEMCTL                 = 66
-	SYS_SHMDT                  = 67
-	SYS_MSGGET                 = 68
-	SYS_MSGSND                 = 69
-	SYS_MSGRCV                 = 70
-	SYS_MSGCTL                 = 71
-	SYS_FCNTL                  = 72
-	SYS_FLOCK                  = 73
-	SYS_FSYNC                  = 74
-	SYS_FDATASYNC              = 75
-	SYS_TRUNCATE               = 76
-	SYS_FTRUNCATE              = 77
-	SYS_GETDENTS               = 78
-	SYS_GETCWD                 = 79
-	SYS_CHDIR                  = 80
-	SYS_FCHDIR                 = 81
-	SYS_RENAME                 = 82
-	SYS_MKDIR                  = 83
-	SYS_RMDIR                  = 84
-	SYS_CREAT                  = 85
-	SYS_LINK                   = 86
-	SYS_UNLINK                 = 87
-	SYS_SYMLINK                = 88
-	SYS_READLINK               = 89
-	SYS_CHMOD                  = 90
-	SYS_FCHMOD                 = 91
-	SYS_CHOWN                  = 92
-	SYS_FCHOWN                 = 93
-	SYS_LCHOWN                 = 94
-	SYS_UMASK                  = 95
-	SYS_GETTIMEOFDAY           = 96
-	SYS_GETRLIMIT              = 97
-	SYS_GETRUSAGE              = 98
-	SYS_SYSINFO                = 99
-	SYS_TIMES                  = 100
-	SYS_PTRACE                 = 101
-	SYS_GETUID                 = 102
-	SYS_SYSLOG                 = 103
-	SYS_GETGID                 = 104
-	SYS_SETUID                 = 105
-	SYS_SETGID                 = 106
-	SYS_GETEUID                = 107
-	SYS_GETEGID                = 108
-	SYS_SETPGID                = 109
-	SYS_GETPPID                = 110
-	SYS_GETPGRP                = 111
-	SYS_SETSID                 = 112
-	SYS_SETREUID               = 113
-	SYS_SETREGID               = 114
-	SYS_GETGROUPS              = 115
-	SYS_SETGROUPS              = 116
-	SYS_SETRESUID              = 117
-	SYS_GETRESUID              = 118
-	SYS_SETRESGID              = 119
-	SYS_GETRESGID              = 120
-	SYS_GETPGID                = 121
-	SYS_SETFSUID               = 122
-	SYS_SETFSGID               = 123
-	SYS_GETSID                 = 124
-	SYS_CAPGET                 = 125
-	SYS_CAPSET                 = 126
-	SYS_RT_SIGPENDING          = 127
-	SYS_RT_SIGTIMEDWAIT        = 128
-	SYS_RT_SIGQUEUEINFO        = 129
-	SYS_RT_SIGSUSPEND          = 130
-	SYS_SIGALTSTACK            = 131
-	SYS_UTIME                  = 132
-	SYS_MKNOD                  = 133
-	SYS_USELIB                 = 134
-	SYS_PERSONALITY            = 135
-	SYS_USTAT                  = 136
-	SYS_STATFS                 = 137
-	SYS_FSTATFS                = 138
-	SYS_SYSFS                  = 139
-	SYS_GETPRIORITY            = 140
-	SYS_SETPRIORITY            = 141
-	SYS_SCHED_SETPARAM         = 142
-	SYS_SCHED_GETPARAM         = 143
-	SYS_SCHED_SETSCHEDULER     = 144
-	SYS_SCHED_GETSCHEDULER     = 145
-	SYS_SCHED_GET_PRIORITY_MAX = 146
-	SYS_SCHED_GET_PRIORITY_MIN = 147
-	SYS_SCHED_RR_GET_INTERVAL  = 148
-	SYS_MLOCK                  = 149
-	SYS_MUNLOCK                = 150
-	SYS_MLOCKALL               = 151
-	SYS_MUNLOCKALL             = 152
-	SYS_VHANGUP                = 153
-	SYS_MODIFY_LDT             = 154
-	SYS_PIVOT_ROOT             = 155
-	SYS__SYSCTL                = 156
-	SYS_PRCTL                  = 157
-	SYS_ARCH_PRCTL             = 158
-	SYS_ADJTIMEX               = 159
-	SYS_SETRLIMIT              = 160
-	SYS_CHROOT                 = 161
-	SYS_SYNC                   = 162
-	SYS_ACCT                   = 163
-	SYS_SETTIMEOFDAY           = 164
-	SYS_MOUNT                  = 165
-	SYS_UMOUNT2                = 166
-	SYS_SWAPON                 = 167
-	SYS_SWAPOFF                = 168
-	SYS_REBOOT                 = 169
-	SYS_SETHOSTNAME            = 170
-	SYS_SETDOMAINNAME          = 171
-	SYS_IOPL                   = 172
-	SYS_IOPERM                 = 173
-	SYS_CREATE_MODULE          = 174
-	SYS_INIT_MODULE            = 175
-	SYS_DELETE_MODULE          = 176
-	SYS_GET_KERNEL_SYMS        = 177
-	SYS_QUERY_MODULE           = 178
-	SYS_QUOTACTL               = 179
-	SYS_NFSSERVCTL             = 180
-	SYS_GETPMSG                = 181
-	SYS_PUTPMSG                = 182
-	SYS_AFS_SYSCALL            = 183
-	SYS_TUXCALL                = 184
-	SYS_SECURITY               = 185
-	SYS_GETTID                 = 186
-	SYS_READAHEAD              = 187
-	SYS_SETXATTR               = 188
-	SYS_LSETXATTR              = 189
-	SYS_FSETXATTR              = 190
-	SYS_GETXATTR               = 191
-	SYS_LGETXATTR              = 192
-	SYS_FGETXATTR              = 193
-	SYS_LISTXATTR              = 194
-	SYS_LLISTXATTR             = 195
-	SYS_FLISTXATTR             = 196
-	SYS_REMOVEXATTR            = 197
-	SYS_LREMOVEXATTR           = 198
-	SYS_FREMOVEXATTR           = 199
-	SYS_TKILL                  = 200
-	SYS_TIME                   = 201
-	SYS_FUTEX                  = 202
-	SYS_SCHED_SETAFFINITY      = 203
-	SYS_SCHED_GETAFFINITY      = 204
-	SYS_SET_THREAD_AREA        = 205
-	SYS_IO_SETUP               = 206
-	SYS_IO_DESTROY             = 207
-	SYS_IO_GETEVENTS           = 208
-	SYS_IO_SUBMIT              = 209
-	SYS_IO_CANCEL              = 210
-	SYS_GET_THREAD_AREA        = 211
-	SYS_LOOKUP_DCOOKIE         = 212
-	SYS_EPOLL_CREATE           = 213
-	SYS_EPOLL_CTL_OLD          = 214
-	SYS_EPOLL_WAIT_OLD         = 215
-	SYS_REMAP_FILE_PAGES       = 216
-	SYS_GETDENTS64             = 217
-	SYS_SET_TID_ADDRESS        = 218
-	SYS_RESTART_SYSCALL        = 219
-	SYS_SEMTIMEDOP             = 220
-	SYS_FADVISE64              = 221
-	SYS_TIMER_CREATE           = 222
-	SYS_TIMER_SETTIME          = 223
-	SYS_TIMER_GETTIME          = 224
-	SYS_TIMER_GETOVERRUN       = 225
-	SYS_TIMER_DELETE           = 226
-	SYS_CLOCK_SETTIME          = 227
-	SYS_CLOCK_GETTIME          = 228
-	SYS_CLOCK_GETRES           = 229
-	SYS_CLOCK_NANOSLEEP        = 230
-	SYS_EXIT_GROUP             = 231
-	SYS_EPOLL_WAIT             = 232
-	SYS_EPOLL_CTL              = 233
-	SYS_TGKILL                 = 234
-	SYS_UTIMES                 = 235
-	SYS_VSERVER                = 236
-	SYS_MBIND                  = 237
-	SYS_SET_MEMPOLICY          = 238
-	SYS_GET_MEMPOLICY          = 239
-	SYS_MQ_OPEN                = 240
-	SYS_MQ_UNLINK              = 241
-	SYS_MQ_TIMEDSEND           = 242
-	SYS_MQ_TIMEDRECEIVE        = 243
-	SYS_MQ_NOTIFY              = 244
-	SYS_MQ_GETSETATTR          = 245
-	SYS_KEXEC_LOAD             = 246
-	SYS_WAITID                 = 247
-	SYS_ADD_KEY                = 248
-	SYS_REQUEST_KEY            = 249
-	SYS_KEYCTL                 = 250
-	SYS_IOPRIO_SET             = 251
-	SYS_IOPRIO_GET             = 252
-	SYS_INOTIFY_INIT           = 253
-	SYS_INOTIFY_ADD_WATCH      = 254
-	SYS_INOTIFY_RM_WATCH       = 255
-	SYS_MIGRATE_PAGES          = 256
-	SYS_OPENAT                 = 257
-	SYS_MKDIRAT                = 258
-	SYS_MKNODAT                = 259
-	SYS_FCHOWNAT               = 260
-	SYS_FUTIMESAT              = 261
-	SYS_NEWFSTATAT             = 262
-	SYS_UNLINKAT               = 263
-	SYS_RENAMEAT               = 264
-	SYS_LINKAT                 = 265
-	SYS_SYMLINKAT              = 266
-	SYS_READLINKAT             = 267
-	SYS_FCHMODAT               = 268
-	SYS_FACCESSAT              = 269
-	SYS_PSELECT6               = 270
-	SYS_PPOLL                  = 271
-	SYS_UNSHARE                = 272
-	SYS_SET_ROBUST_LIST        = 273
-	SYS_GET_ROBUST_LIST        = 274
-	SYS_SPLICE                 = 275
-	SYS_TEE                    = 276
-	SYS_SYNC_FILE_RANGE        = 277
-	SYS_VMSPLICE               = 278
-	SYS_MOVE_PAGES             = 279
-	SYS_UTIMENSAT              = 280
-	SYS_EPOLL_PWAIT            = 281
-	SYS_SIGNALFD               = 282
-	SYS_TIMERFD_CREATE         = 283
-	SYS_EVENTFD                = 284
-	SYS_FALLOCATE              = 285
-	SYS_TIMERFD_SETTIME        = 286
-	SYS_TIMERFD_GETTIME        = 287
-	SYS_ACCEPT4                = 288
-	SYS_SIGNALFD4              = 289
-	SYS_EVENTFD2               = 290
-	SYS_EPOLL_CREATE1          = 291
-	SYS_DUP3                   = 292
-	SYS_PIPE2                  = 293
-	SYS_INOTIFY_INIT1          = 294
-	SYS_PREADV                 = 295
-	SYS_PWRITEV                = 296
-	SYS_RT_TGSIGQUEUEINFO      = 297
-	SYS_PERF_EVENT_OPEN        = 298
-	SYS_RECVMMSG               = 299
-	SYS_FANOTIFY_INIT          = 300
-	SYS_FANOTIFY_MARK          = 301
-	SYS_PRLIMIT64              = 302
-	SYS_NAME_TO_HANDLE_AT      = 303
-	SYS_OPEN_BY_HANDLE_AT      = 304
-	SYS_CLOCK_ADJTIME          = 305
-	SYS_SYNCFS                 = 306
-	SYS_SENDMMSG               = 307
-	SYS_SETNS                  = 308
-	SYS_GETCPU                 = 309
-	SYS_PROCESS_VM_READV       = 310
-	SYS_PROCESS_VM_WRITEV      = 311
-	SYS_KCMP                   = 312
-	SYS_FINIT_MODULE           = 313
-	SYS_SCHED_SETATTR          = 314
-	SYS_SCHED_GETATTR          = 315
-	SYS_RENAMEAT2              = 316
-	SYS_SECCOMP                = 317
-	SYS_GETRANDOM              = 318
-	SYS_MEMFD_CREATE           = 319
-	SYS_KEXEC_FILE_LOAD        = 320
-	SYS_BPF                    = 321
-	SYS_EXECVEAT               = 322
-	SYS_USERFAULTFD            = 323
-	SYS_MEMBARRIER             = 324
-	SYS_MLOCK2                 = 325
-	SYS_COPY_FILE_RANGE        = 326
-	SYS_PREADV2                = 327
-	SYS_PWRITEV2               = 328
-	SYS_PKEY_MPROTECT          = 329
-	SYS_PKEY_ALLOC             = 330
-	SYS_PKEY_FREE              = 331
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
deleted file mode 100644
index 97b182ef5b..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
+++ /dev/null
@@ -1,361 +0,0 @@
-// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build arm,linux
-
-package unix
-
-const (
-	SYS_RESTART_SYSCALL        = 0
-	SYS_EXIT                   = 1
-	SYS_FORK                   = 2
-	SYS_READ                   = 3
-	SYS_WRITE                  = 4
-	SYS_OPEN                   = 5
-	SYS_CLOSE                  = 6
-	SYS_CREAT                  = 8
-	SYS_LINK                   = 9
-	SYS_UNLINK                 = 10
-	SYS_EXECVE                 = 11
-	SYS_CHDIR                  = 12
-	SYS_MKNOD                  = 14
-	SYS_CHMOD                  = 15
-	SYS_LCHOWN                 = 16
-	SYS_LSEEK                  = 19
-	SYS_GETPID                 = 20
-	SYS_MOUNT                  = 21
-	SYS_SETUID                 = 23
-	SYS_GETUID                 = 24
-	SYS_PTRACE                 = 26
-	SYS_PAUSE                  = 29
-	SYS_ACCESS                 = 33
-	SYS_NICE                   = 34
-	SYS_SYNC                   = 36
-	SYS_KILL                   = 37
-	SYS_RENAME                 = 38
-	SYS_MKDIR                  = 39
-	SYS_RMDIR                  = 40
-	SYS_DUP                    = 41
-	SYS_PIPE                   = 42
-	SYS_TIMES                  = 43
-	SYS_BRK                    = 45
-	SYS_SETGID                 = 46
-	SYS_GETGID                 = 47
-	SYS_GETEUID                = 49
-	SYS_GETEGID                = 50
-	SYS_ACCT                   = 51
-	SYS_UMOUNT2                = 52
-	SYS_IOCTL                  = 54
-	SYS_FCNTL                  = 55
-	SYS_SETPGID                = 57
-	SYS_UMASK                  = 60
-	SYS_CHROOT                 = 61
-	SYS_USTAT                  = 62
-	SYS_DUP2                   = 63
-	SYS_GETPPID                = 64
-	SYS_GETPGRP                = 65
-	SYS_SETSID                 = 66
-	SYS_SIGACTION              = 67
-	SYS_SETREUID               = 70
-	SYS_SETREGID               = 71
-	SYS_SIGSUSPEND             = 72
-	SYS_SIGPENDING             = 73
-	SYS_SETHOSTNAME            = 74
-	SYS_SETRLIMIT              = 75
-	SYS_GETRUSAGE              = 77
-	SYS_GETTIMEOFDAY           = 78
-	SYS_SETTIMEOFDAY           = 79
-	SYS_GETGROUPS              = 80
-	SYS_SETGROUPS              = 81
-	SYS_SYMLINK                = 83
-	SYS_READLINK               = 85
-	SYS_USELIB                 = 86
-	SYS_SWAPON                 = 87
-	SYS_REBOOT                 = 88
-	SYS_MUNMAP                 = 91
-	SYS_TRUNCATE               = 92
-	SYS_FTRUNCATE              = 93
-	SYS_FCHMOD                 = 94
-	SYS_FCHOWN                 = 95
-	SYS_GETPRIORITY            = 96
-	SYS_SETPRIORITY            = 97
-	SYS_STATFS                 = 99
-	SYS_FSTATFS                = 100
-	SYS_SYSLOG                 = 103
-	SYS_SETITIMER              = 104
-	SYS_GETITIMER              = 105
-	SYS_STAT                   = 106
-	SYS_LSTAT                  = 107
-	SYS_FSTAT                  = 108
-	SYS_VHANGUP                = 111
-	SYS_WAIT4                  = 114
-	SYS_SWAPOFF                = 115
-	SYS_SYSINFO                = 116
-	SYS_FSYNC                  = 118
-	SYS_SIGRETURN              = 119
-	SYS_CLONE                  = 120
-	SYS_SETDOMAINNAME          = 121
-	SYS_UNAME                  = 122
-	SYS_ADJTIMEX               = 124
-	SYS_MPROTECT               = 125
-	SYS_SIGPROCMASK            = 126
-	SYS_INIT_MODULE            = 128
-	SYS_DELETE_MODULE          = 129
-	SYS_QUOTACTL               = 131
-	SYS_GETPGID                = 132
-	SYS_FCHDIR                 = 133
-	SYS_BDFLUSH                = 134
-	SYS_SYSFS                  = 135
-	SYS_PERSONALITY            = 136
-	SYS_SETFSUID               = 138
-	SYS_SETFSGID               = 139
-	SYS__LLSEEK                = 140
-	SYS_GETDENTS               = 141
-	SYS__NEWSELECT             = 142
-	SYS_FLOCK                  = 143
-	SYS_MSYNC                  = 144
-	SYS_READV                  = 145
-	SYS_WRITEV                 = 146
-	SYS_GETSID                 = 147
-	SYS_FDATASYNC              = 148
-	SYS__SYSCTL                = 149
-	SYS_MLOCK                  = 150
-	SYS_MUNLOCK                = 151
-	SYS_MLOCKALL               = 152
-	SYS_MUNLOCKALL             = 153
-	SYS_SCHED_SETPARAM         = 154
-	SYS_SCHED_GETPARAM         = 155
-	SYS_SCHED_SETSCHEDULER     = 156
-	SYS_SCHED_GETSCHEDULER     = 157
-	SYS_SCHED_YIELD            = 158
-	SYS_SCHED_GET_PRIORITY_MAX = 159
-	SYS_SCHED_GET_PRIORITY_MIN = 160
-	SYS_SCHED_RR_GET_INTERVAL  = 161
-	SYS_NANOSLEEP              = 162
-	SYS_MREMAP                 = 163
-	SYS_SETRESUID              = 164
-	SYS_GETRESUID              = 165
-	SYS_POLL                   = 168
-	SYS_NFSSERVCTL             = 169
-	SYS_SETRESGID              = 170
-	SYS_GETRESGID              = 171
-	SYS_PRCTL                  = 172
-	SYS_RT_SIGRETURN           = 173
-	SYS_RT_SIGACTION           = 174
-	SYS_RT_SIGPROCMASK         = 175
-	SYS_RT_SIGPENDING          = 176
-	SYS_RT_SIGTIMEDWAIT        = 177
-	SYS_RT_SIGQUEUEINFO        = 178
-	SYS_RT_SIGSUSPEND          = 179
-	SYS_PREAD64                = 180
-	SYS_PWRITE64               = 181
-	SYS_CHOWN                  = 182
-	SYS_GETCWD                 = 183
-	SYS_CAPGET                 = 184
-	SYS_CAPSET                 = 185
-	SYS_SIGALTSTACK            = 186
-	SYS_SENDFILE               = 187
-	SYS_VFORK                  = 190
-	SYS_UGETRLIMIT             = 191
-	SYS_MMAP2                  = 192
-	SYS_TRUNCATE64             = 193
-	SYS_FTRUNCATE64            = 194
-	SYS_STAT64                 = 195
-	SYS_LSTAT64                = 196
-	SYS_FSTAT64                = 197
-	SYS_LCHOWN32               = 198
-	SYS_GETUID32               = 199
-	SYS_GETGID32               = 200
-	SYS_GETEUID32              = 201
-	SYS_GETEGID32              = 202
-	SYS_SETREUID32             = 203
-	SYS_SETREGID32             = 204
-	SYS_GETGROUPS32            = 205
-	SYS_SETGROUPS32            = 206
-	SYS_FCHOWN32               = 207
-	SYS_SETRESUID32            = 208
-	SYS_GETRESUID32            = 209
-	SYS_SETRESGID32            = 210
-	SYS_GETRESGID32            = 211
-	SYS_CHOWN32                = 212
-	SYS_SETUID32               = 213
-	SYS_SETGID32               = 214
-	SYS_SETFSUID32             = 215
-	SYS_SETFSGID32             = 216
-	SYS_GETDENTS64             = 217
-	SYS_PIVOT_ROOT             = 218
-	SYS_MINCORE                = 219
-	SYS_MADVISE                = 220
-	SYS_FCNTL64                = 221
-	SYS_GETTID                 = 224
-	SYS_READAHEAD              = 225
-	SYS_SETXATTR               = 226
-	SYS_LSETXATTR              = 227
-	SYS_FSETXATTR              = 228
-	SYS_GETXATTR               = 229
-	SYS_LGETXATTR              = 230
-	SYS_FGETXATTR              = 231
-	SYS_LISTXATTR              = 232
-	SYS_LLISTXATTR             = 233
-	SYS_FLISTXATTR             = 234
-	SYS_REMOVEXATTR            = 235
-	SYS_LREMOVEXATTR           = 236
-	SYS_FREMOVEXATTR           = 237
-	SYS_TKILL                  = 238
-	SYS_SENDFILE64             = 239
-	SYS_FUTEX                  = 240
-	SYS_SCHED_SETAFFINITY      = 241
-	SYS_SCHED_GETAFFINITY      = 242
-	SYS_IO_SETUP               = 243
-	SYS_IO_DESTROY             = 244
-	SYS_IO_GETEVENTS           = 245
-	SYS_IO_SUBMIT              = 246
-	SYS_IO_CANCEL              = 247
-	SYS_EXIT_GROUP             = 248
-	SYS_LOOKUP_DCOOKIE         = 249
-	SYS_EPOLL_CREATE           = 250
-	SYS_EPOLL_CTL              = 251
-	SYS_EPOLL_WAIT             = 252
-	SYS_REMAP_FILE_PAGES       = 253
-	SYS_SET_TID_ADDRESS        = 256
-	SYS_TIMER_CREATE           = 257
-	SYS_TIMER_SETTIME          = 258
-	SYS_TIMER_GETTIME          = 259
-	SYS_TIMER_GETOVERRUN       = 260
-	SYS_TIMER_DELETE           = 261
-	SYS_CLOCK_SETTIME          = 262
-	SYS_CLOCK_GETTIME          = 263
-	SYS_CLOCK_GETRES           = 264
-	SYS_CLOCK_NANOSLEEP        = 265
-	SYS_STATFS64               = 266
-	SYS_FSTATFS64              = 267
-	SYS_TGKILL                 = 268
-	SYS_UTIMES                 = 269
-	SYS_ARM_FADVISE64_64       = 270
-	SYS_PCICONFIG_IOBASE       = 271
-	SYS_PCICONFIG_READ         = 272
-	SYS_PCICONFIG_WRITE        = 273
-	SYS_MQ_OPEN                = 274
-	SYS_MQ_UNLINK              = 275
-	SYS_MQ_TIMEDSEND           = 276
-	SYS_MQ_TIMEDRECEIVE        = 277
-	SYS_MQ_NOTIFY              = 278
-	SYS_MQ_GETSETATTR          = 279
-	SYS_WAITID                 = 280
-	SYS_SOCKET                 = 281
-	SYS_BIND                   = 282
-	SYS_CONNECT                = 283
-	SYS_LISTEN                 = 284
-	SYS_ACCEPT                 = 285
-	SYS_GETSOCKNAME            = 286
-	SYS_GETPEERNAME            = 287
-	SYS_SOCKETPAIR             = 288
-	SYS_SEND                   = 289
-	SYS_SENDTO                 = 290
-	SYS_RECV                   = 291
-	SYS_RECVFROM               = 292
-	SYS_SHUTDOWN               = 293
-	SYS_SETSOCKOPT             = 294
-	SYS_GETSOCKOPT             = 295
-	SYS_SENDMSG                = 296
-	SYS_RECVMSG                = 297
-	SYS_SEMOP                  = 298
-	SYS_SEMGET                 = 299
-	SYS_SEMCTL                 = 300
-	SYS_MSGSND                 = 301
-	SYS_MSGRCV                 = 302
-	SYS_MSGGET                 = 303
-	SYS_MSGCTL                 = 304
-	SYS_SHMAT                  = 305
-	SYS_SHMDT                  = 306
-	SYS_SHMGET                 = 307
-	SYS_SHMCTL                 = 308
-	SYS_ADD_KEY                = 309
-	SYS_REQUEST_KEY            = 310
-	SYS_KEYCTL                 = 311
-	SYS_SEMTIMEDOP             = 312
-	SYS_VSERVER                = 313
-	SYS_IOPRIO_SET             = 314
-	SYS_IOPRIO_GET             = 315
-	SYS_INOTIFY_INIT           = 316
-	SYS_INOTIFY_ADD_WATCH      = 317
-	SYS_INOTIFY_RM_WATCH       = 318
-	SYS_MBIND                  = 319
-	SYS_GET_MEMPOLICY          = 320
-	SYS_SET_MEMPOLICY          = 321
-	SYS_OPENAT                 = 322
-	SYS_MKDIRAT                = 323
-	SYS_MKNODAT                = 324
-	SYS_FCHOWNAT               = 325
-	SYS_FUTIMESAT              = 326
-	SYS_FSTATAT64              = 327
-	SYS_UNLINKAT               = 328
-	SYS_RENAMEAT               = 329
-	SYS_LINKAT                 = 330
-	SYS_SYMLINKAT              = 331
-	SYS_READLINKAT             = 332
-	SYS_FCHMODAT               = 333
-	SYS_FACCESSAT              = 334
-	SYS_PSELECT6               = 335
-	SYS_PPOLL                  = 336
-	SYS_UNSHARE                = 337
-	SYS_SET_ROBUST_LIST        = 338
-	SYS_GET_ROBUST_LIST        = 339
-	SYS_SPLICE                 = 340
-	SYS_ARM_SYNC_FILE_RANGE    = 341
-	SYS_TEE                    = 342
-	SYS_VMSPLICE               = 343
-	SYS_MOVE_PAGES             = 344
-	SYS_GETCPU                 = 345
-	SYS_EPOLL_PWAIT            = 346
-	SYS_KEXEC_LOAD             = 347
-	SYS_UTIMENSAT              = 348
-	SYS_SIGNALFD               = 349
-	SYS_TIMERFD_CREATE         = 350
-	SYS_EVENTFD                = 351
-	SYS_FALLOCATE              = 352
-	SYS_TIMERFD_SETTIME        = 353
-	SYS_TIMERFD_GETTIME        = 354
-	SYS_SIGNALFD4              = 355
-	SYS_EVENTFD2               = 356
-	SYS_EPOLL_CREATE1          = 357
-	SYS_DUP3                   = 358
-	SYS_PIPE2                  = 359
-	SYS_INOTIFY_INIT1          = 360
-	SYS_PREADV                 = 361
-	SYS_PWRITEV                = 362
-	SYS_RT_TGSIGQUEUEINFO      = 363
-	SYS_PERF_EVENT_OPEN        = 364
-	SYS_RECVMMSG               = 365
-	SYS_ACCEPT4                = 366
-	SYS_FANOTIFY_INIT          = 367
-	SYS_FANOTIFY_MARK          = 368
-	SYS_PRLIMIT64              = 369
-	SYS_NAME_TO_HANDLE_AT      = 370
-	SYS_OPEN_BY_HANDLE_AT      = 371
-	SYS_CLOCK_ADJTIME          = 372
-	SYS_SYNCFS                 = 373
-	SYS_SENDMMSG               = 374
-	SYS_SETNS                  = 375
-	SYS_PROCESS_VM_READV       = 376
-	SYS_PROCESS_VM_WRITEV      = 377
-	SYS_KCMP                   = 378
-	SYS_FINIT_MODULE           = 379
-	SYS_SCHED_SETATTR          = 380
-	SYS_SCHED_GETATTR          = 381
-	SYS_RENAMEAT2              = 382
-	SYS_SECCOMP                = 383
-	SYS_GETRANDOM              = 384
-	SYS_MEMFD_CREATE           = 385
-	SYS_BPF                    = 386
-	SYS_EXECVEAT               = 387
-	SYS_USERFAULTFD            = 388
-	SYS_MEMBARRIER             = 389
-	SYS_MLOCK2                 = 390
-	SYS_COPY_FILE_RANGE        = 391
-	SYS_PREADV2                = 392
-	SYS_PWRITEV2               = 393
-	SYS_PKEY_MPROTECT          = 394
-	SYS_PKEY_ALLOC             = 395
-	SYS_PKEY_FREE              = 396
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
deleted file mode 100644
index 640784357f..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
+++ /dev/null
@@ -1,285 +0,0 @@
-// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include -fsigned-char /tmp/include/asm/unistd.h
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build arm64,linux
-
-package unix
-
-const (
-	SYS_IO_SETUP               = 0
-	SYS_IO_DESTROY             = 1
-	SYS_IO_SUBMIT              = 2
-	SYS_IO_CANCEL              = 3
-	SYS_IO_GETEVENTS           = 4
-	SYS_SETXATTR               = 5
-	SYS_LSETXATTR              = 6
-	SYS_FSETXATTR              = 7
-	SYS_GETXATTR               = 8
-	SYS_LGETXATTR              = 9
-	SYS_FGETXATTR              = 10
-	SYS_LISTXATTR              = 11
-	SYS_LLISTXATTR             = 12
-	SYS_FLISTXATTR             = 13
-	SYS_REMOVEXATTR            = 14
-	SYS_LREMOVEXATTR           = 15
-	SYS_FREMOVEXATTR           = 16
-	SYS_GETCWD                 = 17
-	SYS_LOOKUP_DCOOKIE         = 18
-	SYS_EVENTFD2               = 19
-	SYS_EPOLL_CREATE1          = 20
-	SYS_EPOLL_CTL              = 21
-	SYS_EPOLL_PWAIT            = 22
-	SYS_DUP                    = 23
-	SYS_DUP3                   = 24
-	SYS_FCNTL                  = 25
-	SYS_INOTIFY_INIT1          = 26
-	SYS_INOTIFY_ADD_WATCH      = 27
-	SYS_INOTIFY_RM_WATCH       = 28
-	SYS_IOCTL                  = 29
-	SYS_IOPRIO_SET             = 30
-	SYS_IOPRIO_GET             = 31
-	SYS_FLOCK                  = 32
-	SYS_MKNODAT                = 33
-	SYS_MKDIRAT                = 34
-	SYS_UNLINKAT               = 35
-	SYS_SYMLINKAT              = 36
-	SYS_LINKAT                 = 37
-	SYS_RENAMEAT               = 38
-	SYS_UMOUNT2                = 39
-	SYS_MOUNT                  = 40
-	SYS_PIVOT_ROOT             = 41
-	SYS_NFSSERVCTL             = 42
-	SYS_STATFS                 = 43
-	SYS_FSTATFS                = 44
-	SYS_TRUNCATE               = 45
-	SYS_FTRUNCATE              = 46
-	SYS_FALLOCATE              = 47
-	SYS_FACCESSAT              = 48
-	SYS_CHDIR                  = 49
-	SYS_FCHDIR                 = 50
-	SYS_CHROOT                 = 51
-	SYS_FCHMOD                 = 52
-	SYS_FCHMODAT               = 53
-	SYS_FCHOWNAT               = 54
-	SYS_FCHOWN                 = 55
-	SYS_OPENAT                 = 56
-	SYS_CLOSE                  = 57
-	SYS_VHANGUP                = 58
-	SYS_PIPE2                  = 59
-	SYS_QUOTACTL               = 60
-	SYS_GETDENTS64             = 61
-	SYS_LSEEK                  = 62
-	SYS_READ                   = 63
-	SYS_WRITE                  = 64
-	SYS_READV                  = 65
-	SYS_WRITEV                 = 66
-	SYS_PREAD64                = 67
-	SYS_PWRITE64               = 68
-	SYS_PREADV                 = 69
-	SYS_PWRITEV                = 70
-	SYS_SENDFILE               = 71
-	SYS_PSELECT6               = 72
-	SYS_PPOLL                  = 73
-	SYS_SIGNALFD4              = 74
-	SYS_VMSPLICE               = 75
-	SYS_SPLICE                 = 76
-	SYS_TEE                    = 77
-	SYS_READLINKAT             = 78
-	SYS_FSTATAT                = 79
-	SYS_FSTAT                  = 80
-	SYS_SYNC                   = 81
-	SYS_FSYNC                  = 82
-	SYS_FDATASYNC              = 83
-	SYS_SYNC_FILE_RANGE        = 84
-	SYS_TIMERFD_CREATE         = 85
-	SYS_TIMERFD_SETTIME        = 86
-	SYS_TIMERFD_GETTIME        = 87
-	SYS_UTIMENSAT              = 88
-	SYS_ACCT                   = 89
-	SYS_CAPGET                 = 90
-	SYS_CAPSET                 = 91
-	SYS_PERSONALITY            = 92
-	SYS_EXIT                   = 93
-	SYS_EXIT_GROUP             = 94
-	SYS_WAITID                 = 95
-	SYS_SET_TID_ADDRESS        = 96
-	SYS_UNSHARE                = 97
-	SYS_FUTEX                  = 98
-	SYS_SET_ROBUST_LIST        = 99
-	SYS_GET_ROBUST_LIST        = 100
-	SYS_NANOSLEEP              = 101
-	SYS_GETITIMER              = 102
-	SYS_SETITIMER              = 103
-	SYS_KEXEC_LOAD             = 104
-	SYS_INIT_MODULE            = 105
-	SYS_DELETE_MODULE          = 106
-	SYS_TIMER_CREATE           = 107
-	SYS_TIMER_GETTIME          = 108
-	SYS_TIMER_GETOVERRUN       = 109
-	SYS_TIMER_SETTIME          = 110
-	SYS_TIMER_DELETE           = 111
-	SYS_CLOCK_SETTIME          = 112
-	SYS_CLOCK_GETTIME          = 113
-	SYS_CLOCK_GETRES           = 114
-	SYS_CLOCK_NANOSLEEP        = 115
-	SYS_SYSLOG                 = 116
-	SYS_PTRACE                 = 117
-	SYS_SCHED_SETPARAM         = 118
-	SYS_SCHED_SETSCHEDULER     = 119
-	SYS_SCHED_GETSCHEDULER     = 120
-	SYS_SCHED_GETPARAM         = 121
-	SYS_SCHED_SETAFFINITY      = 122
-	SYS_SCHED_GETAFFINITY      = 123
-	SYS_SCHED_YIELD            = 124
-	SYS_SCHED_GET_PRIORITY_MAX = 125
-	SYS_SCHED_GET_PRIORITY_MIN = 126
-	SYS_SCHED_RR_GET_INTERVAL  = 127
-	SYS_RESTART_SYSCALL        = 128
-	SYS_KILL                   = 129
-	SYS_TKILL                  = 130
-	SYS_TGKILL                 = 131
-	SYS_SIGALTSTACK            = 132
-	SYS_RT_SIGSUSPEND          = 133
-	SYS_RT_SIGACTION           = 134
-	SYS_RT_SIGPROCMASK         = 135
-	SYS_RT_SIGPENDING          = 136
-	SYS_RT_SIGTIMEDWAIT        = 137
-	SYS_RT_SIGQUEUEINFO        = 138
-	SYS_RT_SIGRETURN           = 139
-	SYS_SETPRIORITY            = 140
-	SYS_GETPRIORITY            = 141
-	SYS_REBOOT                 = 142
-	SYS_SETREGID               = 143
-	SYS_SETGID                 = 144
-	SYS_SETREUID               = 145
-	SYS_SETUID                 = 146
-	SYS_SETRESUID              = 147
-	SYS_GETRESUID              = 148
-	SYS_SETRESGID              = 149
-	SYS_GETRESGID              = 150
-	SYS_SETFSUID               = 151
-	SYS_SETFSGID               = 152
-	SYS_TIMES                  = 153
-	SYS_SETPGID                = 154
-	SYS_GETPGID                = 155
-	SYS_GETSID                 = 156
-	SYS_SETSID                 = 157
-	SYS_GETGROUPS              = 158
-	SYS_SETGROUPS              = 159
-	SYS_UNAME                  = 160
-	SYS_SETHOSTNAME            = 161
-	SYS_SETDOMAINNAME          = 162
-	SYS_GETRLIMIT              = 163
-	SYS_SETRLIMIT              = 164
-	SYS_GETRUSAGE              = 165
-	SYS_UMASK                  = 166
-	SYS_PRCTL                  = 167
-	SYS_GETCPU                 = 168
-	SYS_GETTIMEOFDAY           = 169
-	SYS_SETTIMEOFDAY           = 170
-	SYS_ADJTIMEX               = 171
-	SYS_GETPID                 = 172
-	SYS_GETPPID                = 173
-	SYS_GETUID                 = 174
-	SYS_GETEUID                = 175
-	SYS_GETGID                 = 176
-	SYS_GETEGID                = 177
-	SYS_GETTID                 = 178
-	SYS_SYSINFO                = 179
-	SYS_MQ_OPEN                = 180
-	SYS_MQ_UNLINK              = 181
-	SYS_MQ_TIMEDSEND           = 182
-	SYS_MQ_TIMEDRECEIVE        = 183
-	SYS_MQ_NOTIFY              = 184
-	SYS_MQ_GETSETATTR          = 185
-	SYS_MSGGET                 = 186
-	SYS_MSGCTL                 = 187
-	SYS_MSGRCV                 = 188
-	SYS_MSGSND                 = 189
-	SYS_SEMGET                 = 190
-	SYS_SEMCTL                 = 191
-	SYS_SEMTIMEDOP             = 192
-	SYS_SEMOP                  = 193
-	SYS_SHMGET                 = 194
-	SYS_SHMCTL                 = 195
-	SYS_SHMAT                  = 196
-	SYS_SHMDT                  = 197
-	SYS_SOCKET                 = 198
-	SYS_SOCKETPAIR             = 199
-	SYS_BIND                   = 200
-	SYS_LISTEN                 = 201
-	SYS_ACCEPT                 = 202
-	SYS_CONNECT                = 203
-	SYS_GETSOCKNAME            = 204
-	SYS_GETPEERNAME            = 205
-	SYS_SENDTO                 = 206
-	SYS_RECVFROM               = 207
-	SYS_SETSOCKOPT             = 208
-	SYS_GETSOCKOPT             = 209
-	SYS_SHUTDOWN               = 210
-	SYS_SENDMSG                = 211
-	SYS_RECVMSG                = 212
-	SYS_READAHEAD              = 213
-	SYS_BRK                    = 214
-	SYS_MUNMAP                 = 215
-	SYS_MREMAP                 = 216
-	SYS_ADD_KEY                = 217
-	SYS_REQUEST_KEY            = 218
-	SYS_KEYCTL                 = 219
-	SYS_CLONE                  = 220
-	SYS_EXECVE                 = 221
-	SYS_MMAP                   = 222
-	SYS_FADVISE64              = 223
-	SYS_SWAPON                 = 224
-	SYS_SWAPOFF                = 225
-	SYS_MPROTECT               = 226
-	SYS_MSYNC                  = 227
-	SYS_MLOCK                  = 228
-	SYS_MUNLOCK                = 229
-	SYS_MLOCKALL               = 230
-	SYS_MUNLOCKALL             = 231
-	SYS_MINCORE                = 232
-	SYS_MADVISE                = 233
-	SYS_REMAP_FILE_PAGES       = 234
-	SYS_MBIND                  = 235
-	SYS_GET_MEMPOLICY          = 236
-	SYS_SET_MEMPOLICY          = 237
-	SYS_MIGRATE_PAGES          = 238
-	SYS_MOVE_PAGES             = 239
-	SYS_RT_TGSIGQUEUEINFO      = 240
-	SYS_PERF_EVENT_OPEN        = 241
-	SYS_ACCEPT4                = 242
-	SYS_RECVMMSG               = 243
-	SYS_ARCH_SPECIFIC_SYSCALL  = 244
-	SYS_WAIT4                  = 260
-	SYS_PRLIMIT64              = 261
-	SYS_FANOTIFY_INIT          = 262
-	SYS_FANOTIFY_MARK          = 263
-	SYS_NAME_TO_HANDLE_AT      = 264
-	SYS_OPEN_BY_HANDLE_AT      = 265
-	SYS_CLOCK_ADJTIME          = 266
-	SYS_SYNCFS                 = 267
-	SYS_SETNS                  = 268
-	SYS_SENDMMSG               = 269
-	SYS_PROCESS_VM_READV       = 270
-	SYS_PROCESS_VM_WRITEV      = 271
-	SYS_KCMP                   = 272
-	SYS_FINIT_MODULE           = 273
-	SYS_SCHED_SETATTR          = 274
-	SYS_SCHED_GETATTR          = 275
-	SYS_RENAMEAT2              = 276
-	SYS_SECCOMP                = 277
-	SYS_GETRANDOM              = 278
-	SYS_MEMFD_CREATE           = 279
-	SYS_BPF                    = 280
-	SYS_EXECVEAT               = 281
-	SYS_USERFAULTFD            = 282
-	SYS_MEMBARRIER             = 283
-	SYS_MLOCK2                 = 284
-	SYS_COPY_FILE_RANGE        = 285
-	SYS_PREADV2                = 286
-	SYS_PWRITEV2               = 287
-	SYS_PKEY_MPROTECT          = 288
-	SYS_PKEY_ALLOC             = 289
-	SYS_PKEY_FREE              = 290
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
deleted file mode 100644
index 939567c099..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
+++ /dev/null
@@ -1,374 +0,0 @@
-// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build mips,linux
-
-package unix
-
-const (
-	SYS_SYSCALL                = 4000
-	SYS_EXIT                   = 4001
-	SYS_FORK                   = 4002
-	SYS_READ                   = 4003
-	SYS_WRITE                  = 4004
-	SYS_OPEN                   = 4005
-	SYS_CLOSE                  = 4006
-	SYS_WAITPID                = 4007
-	SYS_CREAT                  = 4008
-	SYS_LINK                   = 4009
-	SYS_UNLINK                 = 4010
-	SYS_EXECVE                 = 4011
-	SYS_CHDIR                  = 4012
-	SYS_TIME                   = 4013
-	SYS_MKNOD                  = 4014
-	SYS_CHMOD                  = 4015
-	SYS_LCHOWN                 = 4016
-	SYS_BREAK                  = 4017
-	SYS_UNUSED18               = 4018
-	SYS_LSEEK                  = 4019
-	SYS_GETPID                 = 4020
-	SYS_MOUNT                  = 4021
-	SYS_UMOUNT                 = 4022
-	SYS_SETUID                 = 4023
-	SYS_GETUID                 = 4024
-	SYS_STIME                  = 4025
-	SYS_PTRACE                 = 4026
-	SYS_ALARM                  = 4027
-	SYS_UNUSED28               = 4028
-	SYS_PAUSE                  = 4029
-	SYS_UTIME                  = 4030
-	SYS_STTY                   = 4031
-	SYS_GTTY                   = 4032
-	SYS_ACCESS                 = 4033
-	SYS_NICE                   = 4034
-	SYS_FTIME                  = 4035
-	SYS_SYNC                   = 4036
-	SYS_KILL                   = 4037
-	SYS_RENAME                 = 4038
-	SYS_MKDIR                  = 4039
-	SYS_RMDIR                  = 4040
-	SYS_DUP                    = 4041
-	SYS_PIPE                   = 4042
-	SYS_TIMES                  = 4043
-	SYS_PROF                   = 4044
-	SYS_BRK                    = 4045
-	SYS_SETGID                 = 4046
-	SYS_GETGID                 = 4047
-	SYS_SIGNAL                 = 4048
-	SYS_GETEUID                = 4049
-	SYS_GETEGID                = 4050
-	SYS_ACCT                   = 4051
-	SYS_UMOUNT2                = 4052
-	SYS_LOCK                   = 4053
-	SYS_IOCTL                  = 4054
-	SYS_FCNTL                  = 4055
-	SYS_MPX                    = 4056
-	SYS_SETPGID                = 4057
-	SYS_ULIMIT                 = 4058
-	SYS_UNUSED59               = 4059
-	SYS_UMASK                  = 4060
-	SYS_CHROOT                 = 4061
-	SYS_USTAT                  = 4062
-	SYS_DUP2                   = 4063
-	SYS_GETPPID                = 4064
-	SYS_GETPGRP                = 4065
-	SYS_SETSID                 = 4066
-	SYS_SIGACTION              = 4067
-	SYS_SGETMASK               = 4068
-	SYS_SSETMASK               = 4069
-	SYS_SETREUID               = 4070
-	SYS_SETREGID               = 4071
-	SYS_SIGSUSPEND             = 4072
-	SYS_SIGPENDING             = 4073
-	SYS_SETHOSTNAME            = 4074
-	SYS_SETRLIMIT              = 4075
-	SYS_GETRLIMIT              = 4076
-	SYS_GETRUSAGE              = 4077
-	SYS_GETTIMEOFDAY           = 4078
-	SYS_SETTIMEOFDAY           = 4079
-	SYS_GETGROUPS              = 4080
-	SYS_SETGROUPS              = 4081
-	SYS_RESERVED82             = 4082
-	SYS_SYMLINK                = 4083
-	SYS_UNUSED84               = 4084
-	SYS_READLINK               = 4085
-	SYS_USELIB                 = 4086
-	SYS_SWAPON                 = 4087
-	SYS_REBOOT                 = 4088
-	SYS_READDIR                = 4089
-	SYS_MMAP                   = 4090
-	SYS_MUNMAP                 = 4091
-	SYS_TRUNCATE               = 4092
-	SYS_FTRUNCATE              = 4093
-	SYS_FCHMOD                 = 4094
-	SYS_FCHOWN                 = 4095
-	SYS_GETPRIORITY            = 4096
-	SYS_SETPRIORITY            = 4097
-	SYS_PROFIL                 = 4098
-	SYS_STATFS                 = 4099
-	SYS_FSTATFS                = 4100
-	SYS_IOPERM                 = 4101
-	SYS_SOCKETCALL             = 4102
-	SYS_SYSLOG                 = 4103
-	SYS_SETITIMER              = 4104
-	SYS_GETITIMER              = 4105
-	SYS_STAT                   = 4106
-	SYS_LSTAT                  = 4107
-	SYS_FSTAT                  = 4108
-	SYS_UNUSED109              = 4109
-	SYS_IOPL                   = 4110
-	SYS_VHANGUP                = 4111
-	SYS_IDLE                   = 4112
-	SYS_VM86                   = 4113
-	SYS_WAIT4                  = 4114
-	SYS_SWAPOFF                = 4115
-	SYS_SYSINFO                = 4116
-	SYS_IPC                    = 4117
-	SYS_FSYNC                  = 4118
-	SYS_SIGRETURN              = 4119
-	SYS_CLONE                  = 4120
-	SYS_SETDOMAINNAME          = 4121
-	SYS_UNAME                  = 4122
-	SYS_MODIFY_LDT             = 4123
-	SYS_ADJTIMEX               = 4124
-	SYS_MPROTECT               = 4125
-	SYS_SIGPROCMASK            = 4126
-	SYS_CREATE_MODULE          = 4127
-	SYS_INIT_MODULE            = 4128
-	SYS_DELETE_MODULE          = 4129
-	SYS_GET_KERNEL_SYMS        = 4130
-	SYS_QUOTACTL               = 4131
-	SYS_GETPGID                = 4132
-	SYS_FCHDIR                 = 4133
-	SYS_BDFLUSH                = 4134
-	SYS_SYSFS                  = 4135
-	SYS_PERSONALITY            = 4136
-	SYS_AFS_SYSCALL            = 4137
-	SYS_SETFSUID               = 4138
-	SYS_SETFSGID               = 4139
-	SYS__LLSEEK                = 4140
-	SYS_GETDENTS               = 4141
-	SYS__NEWSELECT             = 4142
-	SYS_FLOCK                  = 4143
-	SYS_MSYNC                  = 4144
-	SYS_READV                  = 4145
-	SYS_WRITEV                 = 4146
-	SYS_CACHEFLUSH             = 4147
-	SYS_CACHECTL               = 4148
-	SYS_SYSMIPS                = 4149
-	SYS_UNUSED150              = 4150
-	SYS_GETSID                 = 4151
-	SYS_FDATASYNC              = 4152
-	SYS__SYSCTL                = 4153
-	SYS_MLOCK                  = 4154
-	SYS_MUNLOCK                = 4155
-	SYS_MLOCKALL               = 4156
-	SYS_MUNLOCKALL             = 4157
-	SYS_SCHED_SETPARAM         = 4158
-	SYS_SCHED_GETPARAM         = 4159
-	SYS_SCHED_SETSCHEDULER     = 4160
-	SYS_SCHED_GETSCHEDULER     = 4161
-	SYS_SCHED_YIELD            = 4162
-	SYS_SCHED_GET_PRIORITY_MAX = 4163
-	SYS_SCHED_GET_PRIORITY_MIN = 4164
-	SYS_SCHED_RR_GET_INTERVAL  = 4165
-	SYS_NANOSLEEP              = 4166
-	SYS_MREMAP                 = 4167
-	SYS_ACCEPT                 = 4168
-	SYS_BIND                   = 4169
-	SYS_CONNECT                = 4170
-	SYS_GETPEERNAME            = 4171
-	SYS_GETSOCKNAME            = 4172
-	SYS_GETSOCKOPT             = 4173
-	SYS_LISTEN                 = 4174
-	SYS_RECV                   = 4175
-	SYS_RECVFROM               = 4176
-	SYS_RECVMSG                = 4177
-	SYS_SEND                   = 4178
-	SYS_SENDMSG                = 4179
-	SYS_SENDTO                 = 4180
-	SYS_SETSOCKOPT             = 4181
-	SYS_SHUTDOWN               = 4182
-	SYS_SOCKET                 = 4183
-	SYS_SOCKETPAIR             = 4184
-	SYS_SETRESUID              = 4185
-	SYS_GETRESUID              = 4186
-	SYS_QUERY_MODULE           = 4187
-	SYS_POLL                   = 4188
-	SYS_NFSSERVCTL             = 4189
-	SYS_SETRESGID              = 4190
-	SYS_GETRESGID              = 4191
-	SYS_PRCTL                  = 4192
-	SYS_RT_SIGRETURN           = 4193
-	SYS_RT_SIGACTION           = 4194
-	SYS_RT_SIGPROCMASK         = 4195
-	SYS_RT_SIGPENDING          = 4196
-	SYS_RT_SIGTIMEDWAIT        = 4197
-	SYS_RT_SIGQUEUEINFO        = 4198
-	SYS_RT_SIGSUSPEND          = 4199
-	SYS_PREAD64                = 4200
-	SYS_PWRITE64               = 4201
-	SYS_CHOWN                  = 4202
-	SYS_GETCWD                 = 4203
-	SYS_CAPGET                 = 4204
-	SYS_CAPSET                 = 4205
-	SYS_SIGALTSTACK            = 4206
-	SYS_SENDFILE               = 4207
-	SYS_GETPMSG                = 4208
-	SYS_PUTPMSG                = 4209
-	SYS_MMAP2                  = 4210
-	SYS_TRUNCATE64             = 4211
-	SYS_FTRUNCATE64            = 4212
-	SYS_STAT64                 = 4213
-	SYS_LSTAT64                = 4214
-	SYS_FSTAT64                = 4215
-	SYS_PIVOT_ROOT             = 4216
-	SYS_MINCORE                = 4217
-	SYS_MADVISE                = 4218
-	SYS_GETDENTS64             = 4219
-	SYS_FCNTL64                = 4220
-	SYS_RESERVED221            = 4221
-	SYS_GETTID                 = 4222
-	SYS_READAHEAD              = 4223
-	SYS_SETXATTR               = 4224
-	SYS_LSETXATTR              = 4225
-	SYS_FSETXATTR              = 4226
-	SYS_GETXATTR               = 4227
-	SYS_LGETXATTR              = 4228
-	SYS_FGETXATTR              = 4229
-	SYS_LISTXATTR              = 4230
-	SYS_LLISTXATTR             = 4231
-	SYS_FLISTXATTR             = 4232
-	SYS_REMOVEXATTR            = 4233
-	SYS_LREMOVEXATTR           = 4234
-	SYS_FREMOVEXATTR           = 4235
-	SYS_TKILL                  = 4236
-	SYS_SENDFILE64             = 4237
-	SYS_FUTEX                  = 4238
-	SYS_SCHED_SETAFFINITY      = 4239
-	SYS_SCHED_GETAFFINITY      = 4240
-	SYS_IO_SETUP               = 4241
-	SYS_IO_DESTROY             = 4242
-	SYS_IO_GETEVENTS           = 4243
-	SYS_IO_SUBMIT              = 4244
-	SYS_IO_CANCEL              = 4245
-	SYS_EXIT_GROUP             = 4246
-	SYS_LOOKUP_DCOOKIE         = 4247
-	SYS_EPOLL_CREATE           = 4248
-	SYS_EPOLL_CTL              = 4249
-	SYS_EPOLL_WAIT             = 4250
-	SYS_REMAP_FILE_PAGES       = 4251
-	SYS_SET_TID_ADDRESS        = 4252
-	SYS_RESTART_SYSCALL        = 4253
-	SYS_FADVISE64              = 4254
-	SYS_STATFS64               = 4255
-	SYS_FSTATFS64              = 4256
-	SYS_TIMER_CREATE           = 4257
-	SYS_TIMER_SETTIME          = 4258
-	SYS_TIMER_GETTIME          = 4259
-	SYS_TIMER_GETOVERRUN       = 4260
-	SYS_TIMER_DELETE           = 4261
-	SYS_CLOCK_SETTIME          = 4262
-	SYS_CLOCK_GETTIME          = 4263
-	SYS_CLOCK_GETRES           = 4264
-	SYS_CLOCK_NANOSLEEP        = 4265
-	SYS_TGKILL                 = 4266
-	SYS_UTIMES                 = 4267
-	SYS_MBIND                  = 4268
-	SYS_GET_MEMPOLICY          = 4269
-	SYS_SET_MEMPOLICY          = 4270
-	SYS_MQ_OPEN                = 4271
-	SYS_MQ_UNLINK              = 4272
-	SYS_MQ_TIMEDSEND           = 4273
-	SYS_MQ_TIMEDRECEIVE        = 4274
-	SYS_MQ_NOTIFY              = 4275
-	SYS_MQ_GETSETATTR          = 4276
-	SYS_VSERVER                = 4277
-	SYS_WAITID                 = 4278
-	SYS_ADD_KEY                = 4280
-	SYS_REQUEST_KEY            = 4281
-	SYS_KEYCTL                 = 4282
-	SYS_SET_THREAD_AREA        = 4283
-	SYS_INOTIFY_INIT           = 4284
-	SYS_INOTIFY_ADD_WATCH      = 4285
-	SYS_INOTIFY_RM_WATCH       = 4286
-	SYS_MIGRATE_PAGES          = 4287
-	SYS_OPENAT                 = 4288
-	SYS_MKDIRAT                = 4289
-	SYS_MKNODAT                = 4290
-	SYS_FCHOWNAT               = 4291
-	SYS_FUTIMESAT              = 4292
-	SYS_FSTATAT64              = 4293
-	SYS_UNLINKAT               = 4294
-	SYS_RENAMEAT               = 4295
-	SYS_LINKAT                 = 4296
-	SYS_SYMLINKAT              = 4297
-	SYS_READLINKAT             = 4298
-	SYS_FCHMODAT               = 4299
-	SYS_FACCESSAT              = 4300
-	SYS_PSELECT6               = 4301
-	SYS_PPOLL                  = 4302
-	SYS_UNSHARE                = 4303
-	SYS_SPLICE                 = 4304
-	SYS_SYNC_FILE_RANGE        = 4305
-	SYS_TEE                    = 4306
-	SYS_VMSPLICE               = 4307
-	SYS_MOVE_PAGES             = 4308
-	SYS_SET_ROBUST_LIST        = 4309
-	SYS_GET_ROBUST_LIST        = 4310
-	SYS_KEXEC_LOAD             = 4311
-	SYS_GETCPU                 = 4312
-	SYS_EPOLL_PWAIT            = 4313
-	SYS_IOPRIO_SET             = 4314
-	SYS_IOPRIO_GET             = 4315
-	SYS_UTIMENSAT              = 4316
-	SYS_SIGNALFD               = 4317
-	SYS_TIMERFD                = 4318
-	SYS_EVENTFD                = 4319
-	SYS_FALLOCATE              = 4320
-	SYS_TIMERFD_CREATE         = 4321
-	SYS_TIMERFD_GETTIME        = 4322
-	SYS_TIMERFD_SETTIME        = 4323
-	SYS_SIGNALFD4              = 4324
-	SYS_EVENTFD2               = 4325
-	SYS_EPOLL_CREATE1          = 4326
-	SYS_DUP3                   = 4327
-	SYS_PIPE2                  = 4328
-	SYS_INOTIFY_INIT1          = 4329
-	SYS_PREADV                 = 4330
-	SYS_PWRITEV                = 4331
-	SYS_RT_TGSIGQUEUEINFO      = 4332
-	SYS_PERF_EVENT_OPEN        = 4333
-	SYS_ACCEPT4                = 4334
-	SYS_RECVMMSG               = 4335
-	SYS_FANOTIFY_INIT          = 4336
-	SYS_FANOTIFY_MARK          = 4337
-	SYS_PRLIMIT64              = 4338
-	SYS_NAME_TO_HANDLE_AT      = 4339
-	SYS_OPEN_BY_HANDLE_AT      = 4340
-	SYS_CLOCK_ADJTIME          = 4341
-	SYS_SYNCFS                 = 4342
-	SYS_SENDMMSG               = 4343
-	SYS_SETNS                  = 4344
-	SYS_PROCESS_VM_READV       = 4345
-	SYS_PROCESS_VM_WRITEV      = 4346
-	SYS_KCMP                   = 4347
-	SYS_FINIT_MODULE           = 4348
-	SYS_SCHED_SETATTR          = 4349
-	SYS_SCHED_GETATTR          = 4350
-	SYS_RENAMEAT2              = 4351
-	SYS_SECCOMP                = 4352
-	SYS_GETRANDOM              = 4353
-	SYS_MEMFD_CREATE           = 4354
-	SYS_BPF                    = 4355
-	SYS_EXECVEAT               = 4356
-	SYS_USERFAULTFD            = 4357
-	SYS_MEMBARRIER             = 4358
-	SYS_MLOCK2                 = 4359
-	SYS_COPY_FILE_RANGE        = 4360
-	SYS_PREADV2                = 4361
-	SYS_PWRITEV2               = 4362
-	SYS_PKEY_MPROTECT          = 4363
-	SYS_PKEY_ALLOC             = 4364
-	SYS_PKEY_FREE              = 4365
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
deleted file mode 100644
index 09db959690..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
+++ /dev/null
@@ -1,334 +0,0 @@
-// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build mips64,linux
-
-package unix
-
-const (
-	SYS_READ                   = 5000
-	SYS_WRITE                  = 5001
-	SYS_OPEN                   = 5002
-	SYS_CLOSE                  = 5003
-	SYS_STAT                   = 5004
-	SYS_FSTAT                  = 5005
-	SYS_LSTAT                  = 5006
-	SYS_POLL                   = 5007
-	SYS_LSEEK                  = 5008
-	SYS_MMAP                   = 5009
-	SYS_MPROTECT               = 5010
-	SYS_MUNMAP                 = 5011
-	SYS_BRK                    = 5012
-	SYS_RT_SIGACTION           = 5013
-	SYS_RT_SIGPROCMASK         = 5014
-	SYS_IOCTL                  = 5015
-	SYS_PREAD64                = 5016
-	SYS_PWRITE64               = 5017
-	SYS_READV                  = 5018
-	SYS_WRITEV                 = 5019
-	SYS_ACCESS                 = 5020
-	SYS_PIPE                   = 5021
-	SYS__NEWSELECT             = 5022
-	SYS_SCHED_YIELD            = 5023
-	SYS_MREMAP                 = 5024
-	SYS_MSYNC                  = 5025
-	SYS_MINCORE                = 5026
-	SYS_MADVISE                = 5027
-	SYS_SHMGET                 = 5028
-	SYS_SHMAT                  = 5029
-	SYS_SHMCTL                 = 5030
-	SYS_DUP                    = 5031
-	SYS_DUP2                   = 5032
-	SYS_PAUSE                  = 5033
-	SYS_NANOSLEEP              = 5034
-	SYS_GETITIMER              = 5035
-	SYS_SETITIMER              = 5036
-	SYS_ALARM                  = 5037
-	SYS_GETPID                 = 5038
-	SYS_SENDFILE               = 5039
-	SYS_SOCKET                 = 5040
-	SYS_CONNECT                = 5041
-	SYS_ACCEPT                 = 5042
-	SYS_SENDTO                 = 5043
-	SYS_RECVFROM               = 5044
-	SYS_SENDMSG                = 5045
-	SYS_RECVMSG                = 5046
-	SYS_SHUTDOWN               = 5047
-	SYS_BIND                   = 5048
-	SYS_LISTEN                 = 5049
-	SYS_GETSOCKNAME            = 5050
-	SYS_GETPEERNAME            = 5051
-	SYS_SOCKETPAIR             = 5052
-	SYS_SETSOCKOPT             = 5053
-	SYS_GETSOCKOPT             = 5054
-	SYS_CLONE                  = 5055
-	SYS_FORK                   = 5056
-	SYS_EXECVE                 = 5057
-	SYS_EXIT                   = 5058
-	SYS_WAIT4                  = 5059
-	SYS_KILL                   = 5060
-	SYS_UNAME                  = 5061
-	SYS_SEMGET                 = 5062
-	SYS_SEMOP                  = 5063
-	SYS_SEMCTL                 = 5064
-	SYS_SHMDT                  = 5065
-	SYS_MSGGET                 = 5066
-	SYS_MSGSND                 = 5067
-	SYS_MSGRCV                 = 5068
-	SYS_MSGCTL                 = 5069
-	SYS_FCNTL                  = 5070
-	SYS_FLOCK                  = 5071
-	SYS_FSYNC                  = 5072
-	SYS_FDATASYNC              = 5073
-	SYS_TRUNCATE               = 5074
-	SYS_FTRUNCATE              = 5075
-	SYS_GETDENTS               = 5076
-	SYS_GETCWD                 = 5077
-	SYS_CHDIR                  = 5078
-	SYS_FCHDIR                 = 5079
-	SYS_RENAME                 = 5080
-	SYS_MKDIR                  = 5081
-	SYS_RMDIR                  = 5082
-	SYS_CREAT                  = 5083
-	SYS_LINK                   = 5084
-	SYS_UNLINK                 = 5085
-	SYS_SYMLINK                = 5086
-	SYS_READLINK               = 5087
-	SYS_CHMOD                  = 5088
-	SYS_FCHMOD                 = 5089
-	SYS_CHOWN                  = 5090
-	SYS_FCHOWN                 = 5091
-	SYS_LCHOWN                 = 5092
-	SYS_UMASK                  = 5093
-	SYS_GETTIMEOFDAY           = 5094
-	SYS_GETRLIMIT              = 5095
-	SYS_GETRUSAGE              = 5096
-	SYS_SYSINFO                = 5097
-	SYS_TIMES                  = 5098
-	SYS_PTRACE                 = 5099
-	SYS_GETUID                 = 5100
-	SYS_SYSLOG                 = 5101
-	SYS_GETGID                 = 5102
-	SYS_SETUID                 = 5103
-	SYS_SETGID                 = 5104
-	SYS_GETEUID                = 5105
-	SYS_GETEGID                = 5106
-	SYS_SETPGID                = 5107
-	SYS_GETPPID                = 5108
-	SYS_GETPGRP                = 5109
-	SYS_SETSID                 = 5110
-	SYS_SETREUID               = 5111
-	SYS_SETREGID               = 5112
-	SYS_GETGROUPS              = 5113
-	SYS_SETGROUPS              = 5114
-	SYS_SETRESUID              = 5115
-	SYS_GETRESUID              = 5116
-	SYS_SETRESGID              = 5117
-	SYS_GETRESGID              = 5118
-	SYS_GETPGID                = 5119
-	SYS_SETFSUID               = 5120
-	SYS_SETFSGID               = 5121
-	SYS_GETSID                 = 5122
-	SYS_CAPGET                 = 5123
-	SYS_CAPSET                 = 5124
-	SYS_RT_SIGPENDING          = 5125
-	SYS_RT_SIGTIMEDWAIT        = 5126
-	SYS_RT_SIGQUEUEINFO        = 5127
-	SYS_RT_SIGSUSPEND          = 5128
-	SYS_SIGALTSTACK            = 5129
-	SYS_UTIME                  = 5130
-	SYS_MKNOD                  = 5131
-	SYS_PERSONALITY            = 5132
-	SYS_USTAT                  = 5133
-	SYS_STATFS                 = 5134
-	SYS_FSTATFS                = 5135
-	SYS_SYSFS                  = 5136
-	SYS_GETPRIORITY            = 5137
-	SYS_SETPRIORITY            = 5138
-	SYS_SCHED_SETPARAM         = 5139
-	SYS_SCHED_GETPARAM         = 5140
-	SYS_SCHED_SETSCHEDULER     = 5141
-	SYS_SCHED_GETSCHEDULER     = 5142
-	SYS_SCHED_GET_PRIORITY_MAX = 5143
-	SYS_SCHED_GET_PRIORITY_MIN = 5144
-	SYS_SCHED_RR_GET_INTERVAL  = 5145
-	SYS_MLOCK                  = 5146
-	SYS_MUNLOCK                = 5147
-	SYS_MLOCKALL               = 5148
-	SYS_MUNLOCKALL             = 5149
-	SYS_VHANGUP                = 5150
-	SYS_PIVOT_ROOT             = 5151
-	SYS__SYSCTL                = 5152
-	SYS_PRCTL                  = 5153
-	SYS_ADJTIMEX               = 5154
-	SYS_SETRLIMIT              = 5155
-	SYS_CHROOT                 = 5156
-	SYS_SYNC                   = 5157
-	SYS_ACCT                   = 5158
-	SYS_SETTIMEOFDAY           = 5159
-	SYS_MOUNT                  = 5160
-	SYS_UMOUNT2                = 5161
-	SYS_SWAPON                 = 5162
-	SYS_SWAPOFF                = 5163
-	SYS_REBOOT                 = 5164
-	SYS_SETHOSTNAME            = 5165
-	SYS_SETDOMAINNAME          = 5166
-	SYS_CREATE_MODULE          = 5167
-	SYS_INIT_MODULE            = 5168
-	SYS_DELETE_MODULE          = 5169
-	SYS_GET_KERNEL_SYMS        = 5170
-	SYS_QUERY_MODULE           = 5171
-	SYS_QUOTACTL               = 5172
-	SYS_NFSSERVCTL             = 5173
-	SYS_GETPMSG                = 5174
-	SYS_PUTPMSG                = 5175
-	SYS_AFS_SYSCALL            = 5176
-	SYS_RESERVED177            = 5177
-	SYS_GETTID                 = 5178
-	SYS_READAHEAD              = 5179
-	SYS_SETXATTR               = 5180
-	SYS_LSETXATTR              = 5181
-	SYS_FSETXATTR              = 5182
-	SYS_GETXATTR               = 5183
-	SYS_LGETXATTR              = 5184
-	SYS_FGETXATTR              = 5185
-	SYS_LISTXATTR              = 5186
-	SYS_LLISTXATTR             = 5187
-	SYS_FLISTXATTR             = 5188
-	SYS_REMOVEXATTR            = 5189
-	SYS_LREMOVEXATTR           = 5190
-	SYS_FREMOVEXATTR           = 5191
-	SYS_TKILL                  = 5192
-	SYS_RESERVED193            = 5193
-	SYS_FUTEX                  = 5194
-	SYS_SCHED_SETAFFINITY      = 5195
-	SYS_SCHED_GETAFFINITY      = 5196
-	SYS_CACHEFLUSH             = 5197
-	SYS_CACHECTL               = 5198
-	SYS_SYSMIPS                = 5199
-	SYS_IO_SETUP               = 5200
-	SYS_IO_DESTROY             = 5201
-	SYS_IO_GETEVENTS           = 5202
-	SYS_IO_SUBMIT              = 5203
-	SYS_IO_CANCEL              = 5204
-	SYS_EXIT_GROUP             = 5205
-	SYS_LOOKUP_DCOOKIE         = 5206
-	SYS_EPOLL_CREATE           = 5207
-	SYS_EPOLL_CTL              = 5208
-	SYS_EPOLL_WAIT             = 5209
-	SYS_REMAP_FILE_PAGES       = 5210
-	SYS_RT_SIGRETURN           = 5211
-	SYS_SET_TID_ADDRESS        = 5212
-	SYS_RESTART_SYSCALL        = 5213
-	SYS_SEMTIMEDOP             = 5214
-	SYS_FADVISE64              = 5215
-	SYS_TIMER_CREATE           = 5216
-	SYS_TIMER_SETTIME          = 5217
-	SYS_TIMER_GETTIME          = 5218
-	SYS_TIMER_GETOVERRUN       = 5219
-	SYS_TIMER_DELETE           = 5220
-	SYS_CLOCK_SETTIME          = 5221
-	SYS_CLOCK_GETTIME          = 5222
-	SYS_CLOCK_GETRES           = 5223
-	SYS_CLOCK_NANOSLEEP        = 5224
-	SYS_TGKILL                 = 5225
-	SYS_UTIMES                 = 5226
-	SYS_MBIND                  = 5227
-	SYS_GET_MEMPOLICY          = 5228
-	SYS_SET_MEMPOLICY          = 5229
-	SYS_MQ_OPEN                = 5230
-	SYS_MQ_UNLINK              = 5231
-	SYS_MQ_TIMEDSEND           = 5232
-	SYS_MQ_TIMEDRECEIVE        = 5233
-	SYS_MQ_NOTIFY              = 5234
-	SYS_MQ_GETSETATTR          = 5235
-	SYS_VSERVER                = 5236
-	SYS_WAITID                 = 5237
-	SYS_ADD_KEY                = 5239
-	SYS_REQUEST_KEY            = 5240
-	SYS_KEYCTL                 = 5241
-	SYS_SET_THREAD_AREA        = 5242
-	SYS_INOTIFY_INIT           = 5243
-	SYS_INOTIFY_ADD_WATCH      = 5244
-	SYS_INOTIFY_RM_WATCH       = 5245
-	SYS_MIGRATE_PAGES          = 5246
-	SYS_OPENAT                 = 5247
-	SYS_MKDIRAT                = 5248
-	SYS_MKNODAT                = 5249
-	SYS_FCHOWNAT               = 5250
-	SYS_FUTIMESAT              = 5251
-	SYS_NEWFSTATAT             = 5252
-	SYS_UNLINKAT               = 5253
-	SYS_RENAMEAT               = 5254
-	SYS_LINKAT                 = 5255
-	SYS_SYMLINKAT              = 5256
-	SYS_READLINKAT             = 5257
-	SYS_FCHMODAT               = 5258
-	SYS_FACCESSAT              = 5259
-	SYS_PSELECT6               = 5260
-	SYS_PPOLL                  = 5261
-	SYS_UNSHARE                = 5262
-	SYS_SPLICE                 = 5263
-	SYS_SYNC_FILE_RANGE        = 5264
-	SYS_TEE                    = 5265
-	SYS_VMSPLICE               = 5266
-	SYS_MOVE_PAGES             = 5267
-	SYS_SET_ROBUST_LIST        = 5268
-	SYS_GET_ROBUST_LIST        = 5269
-	SYS_KEXEC_LOAD             = 5270
-	SYS_GETCPU                 = 5271
-	SYS_EPOLL_PWAIT            = 5272
-	SYS_IOPRIO_SET             = 5273
-	SYS_IOPRIO_GET             = 5274
-	SYS_UTIMENSAT              = 5275
-	SYS_SIGNALFD               = 5276
-	SYS_TIMERFD                = 5277
-	SYS_EVENTFD                = 5278
-	SYS_FALLOCATE              = 5279
-	SYS_TIMERFD_CREATE         = 5280
-	SYS_TIMERFD_GETTIME        = 5281
-	SYS_TIMERFD_SETTIME        = 5282
-	SYS_SIGNALFD4              = 5283
-	SYS_EVENTFD2               = 5284
-	SYS_EPOLL_CREATE1          = 5285
-	SYS_DUP3                   = 5286
-	SYS_PIPE2                  = 5287
-	SYS_INOTIFY_INIT1          = 5288
-	SYS_PREADV                 = 5289
-	SYS_PWRITEV                = 5290
-	SYS_RT_TGSIGQUEUEINFO      = 5291
-	SYS_PERF_EVENT_OPEN        = 5292
-	SYS_ACCEPT4                = 5293
-	SYS_RECVMMSG               = 5294
-	SYS_FANOTIFY_INIT          = 5295
-	SYS_FANOTIFY_MARK          = 5296
-	SYS_PRLIMIT64              = 5297
-	SYS_NAME_TO_HANDLE_AT      = 5298
-	SYS_OPEN_BY_HANDLE_AT      = 5299
-	SYS_CLOCK_ADJTIME          = 5300
-	SYS_SYNCFS                 = 5301
-	SYS_SENDMMSG               = 5302
-	SYS_SETNS                  = 5303
-	SYS_PROCESS_VM_READV       = 5304
-	SYS_PROCESS_VM_WRITEV      = 5305
-	SYS_KCMP                   = 5306
-	SYS_FINIT_MODULE           = 5307
-	SYS_GETDENTS64             = 5308
-	SYS_SCHED_SETATTR          = 5309
-	SYS_SCHED_GETATTR          = 5310
-	SYS_RENAMEAT2              = 5311
-	SYS_SECCOMP                = 5312
-	SYS_GETRANDOM              = 5313
-	SYS_MEMFD_CREATE           = 5314
-	SYS_BPF                    = 5315
-	SYS_EXECVEAT               = 5316
-	SYS_USERFAULTFD            = 5317
-	SYS_MEMBARRIER             = 5318
-	SYS_MLOCK2                 = 5319
-	SYS_COPY_FILE_RANGE        = 5320
-	SYS_PREADV2                = 5321
-	SYS_PWRITEV2               = 5322
-	SYS_PKEY_MPROTECT          = 5323
-	SYS_PKEY_ALLOC             = 5324
-	SYS_PKEY_FREE              = 5325
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
deleted file mode 100644
index d1b872a09b..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
+++ /dev/null
@@ -1,334 +0,0 @@
-// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build mips64le,linux
-
-package unix
-
-const (
-	SYS_READ                   = 5000
-	SYS_WRITE                  = 5001
-	SYS_OPEN                   = 5002
-	SYS_CLOSE                  = 5003
-	SYS_STAT                   = 5004
-	SYS_FSTAT                  = 5005
-	SYS_LSTAT                  = 5006
-	SYS_POLL                   = 5007
-	SYS_LSEEK                  = 5008
-	SYS_MMAP                   = 5009
-	SYS_MPROTECT               = 5010
-	SYS_MUNMAP                 = 5011
-	SYS_BRK                    = 5012
-	SYS_RT_SIGACTION           = 5013
-	SYS_RT_SIGPROCMASK         = 5014
-	SYS_IOCTL                  = 5015
-	SYS_PREAD64                = 5016
-	SYS_PWRITE64               = 5017
-	SYS_READV                  = 5018
-	SYS_WRITEV                 = 5019
-	SYS_ACCESS                 = 5020
-	SYS_PIPE                   = 5021
-	SYS__NEWSELECT             = 5022
-	SYS_SCHED_YIELD            = 5023
-	SYS_MREMAP                 = 5024
-	SYS_MSYNC                  = 5025
-	SYS_MINCORE                = 5026
-	SYS_MADVISE                = 5027
-	SYS_SHMGET                 = 5028
-	SYS_SHMAT                  = 5029
-	SYS_SHMCTL                 = 5030
-	SYS_DUP                    = 5031
-	SYS_DUP2                   = 5032
-	SYS_PAUSE                  = 5033
-	SYS_NANOSLEEP              = 5034
-	SYS_GETITIMER              = 5035
-	SYS_SETITIMER              = 5036
-	SYS_ALARM                  = 5037
-	SYS_GETPID                 = 5038
-	SYS_SENDFILE               = 5039
-	SYS_SOCKET                 = 5040
-	SYS_CONNECT                = 5041
-	SYS_ACCEPT                 = 5042
-	SYS_SENDTO                 = 5043
-	SYS_RECVFROM               = 5044
-	SYS_SENDMSG                = 5045
-	SYS_RECVMSG                = 5046
-	SYS_SHUTDOWN               = 5047
-	SYS_BIND                   = 5048
-	SYS_LISTEN                 = 5049
-	SYS_GETSOCKNAME            = 5050
-	SYS_GETPEERNAME            = 5051
-	SYS_SOCKETPAIR             = 5052
-	SYS_SETSOCKOPT             = 5053
-	SYS_GETSOCKOPT             = 5054
-	SYS_CLONE                  = 5055
-	SYS_FORK                   = 5056
-	SYS_EXECVE                 = 5057
-	SYS_EXIT                   = 5058
-	SYS_WAIT4                  = 5059
-	SYS_KILL                   = 5060
-	SYS_UNAME                  = 5061
-	SYS_SEMGET                 = 5062
-	SYS_SEMOP                  = 5063
-	SYS_SEMCTL                 = 5064
-	SYS_SHMDT                  = 5065
-	SYS_MSGGET                 = 5066
-	SYS_MSGSND                 = 5067
-	SYS_MSGRCV                 = 5068
-	SYS_MSGCTL                 = 5069
-	SYS_FCNTL                  = 5070
-	SYS_FLOCK                  = 5071
-	SYS_FSYNC                  = 5072
-	SYS_FDATASYNC              = 5073
-	SYS_TRUNCATE               = 5074
-	SYS_FTRUNCATE              = 5075
-	SYS_GETDENTS               = 5076
-	SYS_GETCWD                 = 5077
-	SYS_CHDIR                  = 5078
-	SYS_FCHDIR                 = 5079
-	SYS_RENAME                 = 5080
-	SYS_MKDIR                  = 5081
-	SYS_RMDIR                  = 5082
-	SYS_CREAT                  = 5083
-	SYS_LINK                   = 5084
-	SYS_UNLINK                 = 5085
-	SYS_SYMLINK                = 5086
-	SYS_READLINK               = 5087
-	SYS_CHMOD                  = 5088
-	SYS_FCHMOD                 = 5089
-	SYS_CHOWN                  = 5090
-	SYS_FCHOWN                 = 5091
-	SYS_LCHOWN                 = 5092
-	SYS_UMASK                  = 5093
-	SYS_GETTIMEOFDAY           = 5094
-	SYS_GETRLIMIT              = 5095
-	SYS_GETRUSAGE              = 5096
-	SYS_SYSINFO                = 5097
-	SYS_TIMES                  = 5098
-	SYS_PTRACE                 = 5099
-	SYS_GETUID                 = 5100
-	SYS_SYSLOG                 = 5101
-	SYS_GETGID                 = 5102
-	SYS_SETUID                 = 5103
-	SYS_SETGID                 = 5104
-	SYS_GETEUID                = 5105
-	SYS_GETEGID                = 5106
-	SYS_SETPGID                = 5107
-	SYS_GETPPID                = 5108
-	SYS_GETPGRP                = 5109
-	SYS_SETSID                 = 5110
-	SYS_SETREUID               = 5111
-	SYS_SETREGID               = 5112
-	SYS_GETGROUPS              = 5113
-	SYS_SETGROUPS              = 5114
-	SYS_SETRESUID              = 5115
-	SYS_GETRESUID              = 5116
-	SYS_SETRESGID              = 5117
-	SYS_GETRESGID              = 5118
-	SYS_GETPGID                = 5119
-	SYS_SETFSUID               = 5120
-	SYS_SETFSGID               = 5121
-	SYS_GETSID                 = 5122
-	SYS_CAPGET                 = 5123
-	SYS_CAPSET                 = 5124
-	SYS_RT_SIGPENDING          = 5125
-	SYS_RT_SIGTIMEDWAIT        = 5126
-	SYS_RT_SIGQUEUEINFO        = 5127
-	SYS_RT_SIGSUSPEND          = 5128
-	SYS_SIGALTSTACK            = 5129
-	SYS_UTIME                  = 5130
-	SYS_MKNOD                  = 5131
-	SYS_PERSONALITY            = 5132
-	SYS_USTAT                  = 5133
-	SYS_STATFS                 = 5134
-	SYS_FSTATFS                = 5135
-	SYS_SYSFS                  = 5136
-	SYS_GETPRIORITY            = 5137
-	SYS_SETPRIORITY            = 5138
-	SYS_SCHED_SETPARAM         = 5139
-	SYS_SCHED_GETPARAM         = 5140
-	SYS_SCHED_SETSCHEDULER     = 5141
-	SYS_SCHED_GETSCHEDULER     = 5142
-	SYS_SCHED_GET_PRIORITY_MAX = 5143
-	SYS_SCHED_GET_PRIORITY_MIN = 5144
-	SYS_SCHED_RR_GET_INTERVAL  = 5145
-	SYS_MLOCK                  = 5146
-	SYS_MUNLOCK                = 5147
-	SYS_MLOCKALL               = 5148
-	SYS_MUNLOCKALL             = 5149
-	SYS_VHANGUP                = 5150
-	SYS_PIVOT_ROOT             = 5151
-	SYS__SYSCTL                = 5152
-	SYS_PRCTL                  = 5153
-	SYS_ADJTIMEX               = 5154
-	SYS_SETRLIMIT              = 5155
-	SYS_CHROOT                 = 5156
-	SYS_SYNC                   = 5157
-	SYS_ACCT                   = 5158
-	SYS_SETTIMEOFDAY           = 5159
-	SYS_MOUNT                  = 5160
-	SYS_UMOUNT2                = 5161
-	SYS_SWAPON                 = 5162
-	SYS_SWAPOFF                = 5163
-	SYS_REBOOT                 = 5164
-	SYS_SETHOSTNAME            = 5165
-	SYS_SETDOMAINNAME          = 5166
-	SYS_CREATE_MODULE          = 5167
-	SYS_INIT_MODULE            = 5168
-	SYS_DELETE_MODULE          = 5169
-	SYS_GET_KERNEL_SYMS        = 5170
-	SYS_QUERY_MODULE           = 5171
-	SYS_QUOTACTL               = 5172
-	SYS_NFSSERVCTL             = 5173
-	SYS_GETPMSG                = 5174
-	SYS_PUTPMSG                = 5175
-	SYS_AFS_SYSCALL            = 5176
-	SYS_RESERVED177            = 5177
-	SYS_GETTID                 = 5178
-	SYS_READAHEAD              = 5179
-	SYS_SETXATTR               = 5180
-	SYS_LSETXATTR              = 5181
-	SYS_FSETXATTR              = 5182
-	SYS_GETXATTR               = 5183
-	SYS_LGETXATTR              = 5184
-	SYS_FGETXATTR              = 5185
-	SYS_LISTXATTR              = 5186
-	SYS_LLISTXATTR             = 5187
-	SYS_FLISTXATTR             = 5188
-	SYS_REMOVEXATTR            = 5189
-	SYS_LREMOVEXATTR           = 5190
-	SYS_FREMOVEXATTR           = 5191
-	SYS_TKILL                  = 5192
-	SYS_RESERVED193            = 5193
-	SYS_FUTEX                  = 5194
-	SYS_SCHED_SETAFFINITY      = 5195
-	SYS_SCHED_GETAFFINITY      = 5196
-	SYS_CACHEFLUSH             = 5197
-	SYS_CACHECTL               = 5198
-	SYS_SYSMIPS                = 5199
-	SYS_IO_SETUP               = 5200
-	SYS_IO_DESTROY             = 5201
-	SYS_IO_GETEVENTS           = 5202
-	SYS_IO_SUBMIT              = 5203
-	SYS_IO_CANCEL              = 5204
-	SYS_EXIT_GROUP             = 5205
-	SYS_LOOKUP_DCOOKIE         = 5206
-	SYS_EPOLL_CREATE           = 5207
-	SYS_EPOLL_CTL              = 5208
-	SYS_EPOLL_WAIT             = 5209
-	SYS_REMAP_FILE_PAGES       = 5210
-	SYS_RT_SIGRETURN           = 5211
-	SYS_SET_TID_ADDRESS        = 5212
-	SYS_RESTART_SYSCALL        = 5213
-	SYS_SEMTIMEDOP             = 5214
-	SYS_FADVISE64              = 5215
-	SYS_TIMER_CREATE           = 5216
-	SYS_TIMER_SETTIME          = 5217
-	SYS_TIMER_GETTIME          = 5218
-	SYS_TIMER_GETOVERRUN       = 5219
-	SYS_TIMER_DELETE           = 5220
-	SYS_CLOCK_SETTIME          = 5221
-	SYS_CLOCK_GETTIME          = 5222
-	SYS_CLOCK_GETRES           = 5223
-	SYS_CLOCK_NANOSLEEP        = 5224
-	SYS_TGKILL                 = 5225
-	SYS_UTIMES                 = 5226
-	SYS_MBIND                  = 5227
-	SYS_GET_MEMPOLICY          = 5228
-	SYS_SET_MEMPOLICY          = 5229
-	SYS_MQ_OPEN                = 5230
-	SYS_MQ_UNLINK              = 5231
-	SYS_MQ_TIMEDSEND           = 5232
-	SYS_MQ_TIMEDRECEIVE        = 5233
-	SYS_MQ_NOTIFY              = 5234
-	SYS_MQ_GETSETATTR          = 5235
-	SYS_VSERVER                = 5236
-	SYS_WAITID                 = 5237
-	SYS_ADD_KEY                = 5239
-	SYS_REQUEST_KEY            = 5240
-	SYS_KEYCTL                 = 5241
-	SYS_SET_THREAD_AREA        = 5242
-	SYS_INOTIFY_INIT           = 5243
-	SYS_INOTIFY_ADD_WATCH      = 5244
-	SYS_INOTIFY_RM_WATCH       = 5245
-	SYS_MIGRATE_PAGES          = 5246
-	SYS_OPENAT                 = 5247
-	SYS_MKDIRAT                = 5248
-	SYS_MKNODAT                = 5249
-	SYS_FCHOWNAT               = 5250
-	SYS_FUTIMESAT              = 5251
-	SYS_NEWFSTATAT             = 5252
-	SYS_UNLINKAT               = 5253
-	SYS_RENAMEAT               = 5254
-	SYS_LINKAT                 = 5255
-	SYS_SYMLINKAT              = 5256
-	SYS_READLINKAT             = 5257
-	SYS_FCHMODAT               = 5258
-	SYS_FACCESSAT              = 5259
-	SYS_PSELECT6               = 5260
-	SYS_PPOLL                  = 5261
-	SYS_UNSHARE                = 5262
-	SYS_SPLICE                 = 5263
-	SYS_SYNC_FILE_RANGE        = 5264
-	SYS_TEE                    = 5265
-	SYS_VMSPLICE               = 5266
-	SYS_MOVE_PAGES             = 5267
-	SYS_SET_ROBUST_LIST        = 5268
-	SYS_GET_ROBUST_LIST        = 5269
-	SYS_KEXEC_LOAD             = 5270
-	SYS_GETCPU                 = 5271
-	SYS_EPOLL_PWAIT            = 5272
-	SYS_IOPRIO_SET             = 5273
-	SYS_IOPRIO_GET             = 5274
-	SYS_UTIMENSAT              = 5275
-	SYS_SIGNALFD               = 5276
-	SYS_TIMERFD                = 5277
-	SYS_EVENTFD                = 5278
-	SYS_FALLOCATE              = 5279
-	SYS_TIMERFD_CREATE         = 5280
-	SYS_TIMERFD_GETTIME        = 5281
-	SYS_TIMERFD_SETTIME        = 5282
-	SYS_SIGNALFD4              = 5283
-	SYS_EVENTFD2               = 5284
-	SYS_EPOLL_CREATE1          = 5285
-	SYS_DUP3                   = 5286
-	SYS_PIPE2                  = 5287
-	SYS_INOTIFY_INIT1          = 5288
-	SYS_PREADV                 = 5289
-	SYS_PWRITEV                = 5290
-	SYS_RT_TGSIGQUEUEINFO      = 5291
-	SYS_PERF_EVENT_OPEN        = 5292
-	SYS_ACCEPT4                = 5293
-	SYS_RECVMMSG               = 5294
-	SYS_FANOTIFY_INIT          = 5295
-	SYS_FANOTIFY_MARK          = 5296
-	SYS_PRLIMIT64              = 5297
-	SYS_NAME_TO_HANDLE_AT      = 5298
-	SYS_OPEN_BY_HANDLE_AT      = 5299
-	SYS_CLOCK_ADJTIME          = 5300
-	SYS_SYNCFS                 = 5301
-	SYS_SENDMMSG               = 5302
-	SYS_SETNS                  = 5303
-	SYS_PROCESS_VM_READV       = 5304
-	SYS_PROCESS_VM_WRITEV      = 5305
-	SYS_KCMP                   = 5306
-	SYS_FINIT_MODULE           = 5307
-	SYS_GETDENTS64             = 5308
-	SYS_SCHED_SETATTR          = 5309
-	SYS_SCHED_GETATTR          = 5310
-	SYS_RENAMEAT2              = 5311
-	SYS_SECCOMP                = 5312
-	SYS_GETRANDOM              = 5313
-	SYS_MEMFD_CREATE           = 5314
-	SYS_BPF                    = 5315
-	SYS_EXECVEAT               = 5316
-	SYS_USERFAULTFD            = 5317
-	SYS_MEMBARRIER             = 5318
-	SYS_MLOCK2                 = 5319
-	SYS_COPY_FILE_RANGE        = 5320
-	SYS_PREADV2                = 5321
-	SYS_PWRITEV2               = 5322
-	SYS_PKEY_MPROTECT          = 5323
-	SYS_PKEY_ALLOC             = 5324
-	SYS_PKEY_FREE              = 5325
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
deleted file mode 100644
index 82ba20f28b..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
+++ /dev/null
@@ -1,374 +0,0 @@
-// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build mipsle,linux
-
-package unix
-
-const (
-	SYS_SYSCALL                = 4000
-	SYS_EXIT                   = 4001
-	SYS_FORK                   = 4002
-	SYS_READ                   = 4003
-	SYS_WRITE                  = 4004
-	SYS_OPEN                   = 4005
-	SYS_CLOSE                  = 4006
-	SYS_WAITPID                = 4007
-	SYS_CREAT                  = 4008
-	SYS_LINK                   = 4009
-	SYS_UNLINK                 = 4010
-	SYS_EXECVE                 = 4011
-	SYS_CHDIR                  = 4012
-	SYS_TIME                   = 4013
-	SYS_MKNOD                  = 4014
-	SYS_CHMOD                  = 4015
-	SYS_LCHOWN                 = 4016
-	SYS_BREAK                  = 4017
-	SYS_UNUSED18               = 4018
-	SYS_LSEEK                  = 4019
-	SYS_GETPID                 = 4020
-	SYS_MOUNT                  = 4021
-	SYS_UMOUNT                 = 4022
-	SYS_SETUID                 = 4023
-	SYS_GETUID                 = 4024
-	SYS_STIME                  = 4025
-	SYS_PTRACE                 = 4026
-	SYS_ALARM                  = 4027
-	SYS_UNUSED28               = 4028
-	SYS_PAUSE                  = 4029
-	SYS_UTIME                  = 4030
-	SYS_STTY                   = 4031
-	SYS_GTTY                   = 4032
-	SYS_ACCESS                 = 4033
-	SYS_NICE                   = 4034
-	SYS_FTIME                  = 4035
-	SYS_SYNC                   = 4036
-	SYS_KILL                   = 4037
-	SYS_RENAME                 = 4038
-	SYS_MKDIR                  = 4039
-	SYS_RMDIR                  = 4040
-	SYS_DUP                    = 4041
-	SYS_PIPE                   = 4042
-	SYS_TIMES                  = 4043
-	SYS_PROF                   = 4044
-	SYS_BRK                    = 4045
-	SYS_SETGID                 = 4046
-	SYS_GETGID                 = 4047
-	SYS_SIGNAL                 = 4048
-	SYS_GETEUID                = 4049
-	SYS_GETEGID                = 4050
-	SYS_ACCT                   = 4051
-	SYS_UMOUNT2                = 4052
-	SYS_LOCK                   = 4053
-	SYS_IOCTL                  = 4054
-	SYS_FCNTL                  = 4055
-	SYS_MPX                    = 4056
-	SYS_SETPGID                = 4057
-	SYS_ULIMIT                 = 4058
-	SYS_UNUSED59               = 4059
-	SYS_UMASK                  = 4060
-	SYS_CHROOT                 = 4061
-	SYS_USTAT                  = 4062
-	SYS_DUP2                   = 4063
-	SYS_GETPPID                = 4064
-	SYS_GETPGRP                = 4065
-	SYS_SETSID                 = 4066
-	SYS_SIGACTION              = 4067
-	SYS_SGETMASK               = 4068
-	SYS_SSETMASK               = 4069
-	SYS_SETREUID               = 4070
-	SYS_SETREGID               = 4071
-	SYS_SIGSUSPEND             = 4072
-	SYS_SIGPENDING             = 4073
-	SYS_SETHOSTNAME            = 4074
-	SYS_SETRLIMIT              = 4075
-	SYS_GETRLIMIT              = 4076
-	SYS_GETRUSAGE              = 4077
-	SYS_GETTIMEOFDAY           = 4078
-	SYS_SETTIMEOFDAY           = 4079
-	SYS_GETGROUPS              = 4080
-	SYS_SETGROUPS              = 4081
-	SYS_RESERVED82             = 4082
-	SYS_SYMLINK                = 4083
-	SYS_UNUSED84               = 4084
-	SYS_READLINK               = 4085
-	SYS_USELIB                 = 4086
-	SYS_SWAPON                 = 4087
-	SYS_REBOOT                 = 4088
-	SYS_READDIR                = 4089
-	SYS_MMAP                   = 4090
-	SYS_MUNMAP                 = 4091
-	SYS_TRUNCATE               = 4092
-	SYS_FTRUNCATE              = 4093
-	SYS_FCHMOD                 = 4094
-	SYS_FCHOWN                 = 4095
-	SYS_GETPRIORITY            = 4096
-	SYS_SETPRIORITY            = 4097
-	SYS_PROFIL                 = 4098
-	SYS_STATFS                 = 4099
-	SYS_FSTATFS                = 4100
-	SYS_IOPERM                 = 4101
-	SYS_SOCKETCALL             = 4102
-	SYS_SYSLOG                 = 4103
-	SYS_SETITIMER              = 4104
-	SYS_GETITIMER              = 4105
-	SYS_STAT                   = 4106
-	SYS_LSTAT                  = 4107
-	SYS_FSTAT                  = 4108
-	SYS_UNUSED109              = 4109
-	SYS_IOPL                   = 4110
-	SYS_VHANGUP                = 4111
-	SYS_IDLE                   = 4112
-	SYS_VM86                   = 4113
-	SYS_WAIT4                  = 4114
-	SYS_SWAPOFF                = 4115
-	SYS_SYSINFO                = 4116
-	SYS_IPC                    = 4117
-	SYS_FSYNC                  = 4118
-	SYS_SIGRETURN              = 4119
-	SYS_CLONE                  = 4120
-	SYS_SETDOMAINNAME          = 4121
-	SYS_UNAME                  = 4122
-	SYS_MODIFY_LDT             = 4123
-	SYS_ADJTIMEX               = 4124
-	SYS_MPROTECT               = 4125
-	SYS_SIGPROCMASK            = 4126
-	SYS_CREATE_MODULE          = 4127
-	SYS_INIT_MODULE            = 4128
-	SYS_DELETE_MODULE          = 4129
-	SYS_GET_KERNEL_SYMS        = 4130
-	SYS_QUOTACTL               = 4131
-	SYS_GETPGID                = 4132
-	SYS_FCHDIR                 = 4133
-	SYS_BDFLUSH                = 4134
-	SYS_SYSFS                  = 4135
-	SYS_PERSONALITY            = 4136
-	SYS_AFS_SYSCALL            = 4137
-	SYS_SETFSUID               = 4138
-	SYS_SETFSGID               = 4139
-	SYS__LLSEEK                = 4140
-	SYS_GETDENTS               = 4141
-	SYS__NEWSELECT             = 4142
-	SYS_FLOCK                  = 4143
-	SYS_MSYNC                  = 4144
-	SYS_READV                  = 4145
-	SYS_WRITEV                 = 4146
-	SYS_CACHEFLUSH             = 4147
-	SYS_CACHECTL               = 4148
-	SYS_SYSMIPS                = 4149
-	SYS_UNUSED150              = 4150
-	SYS_GETSID                 = 4151
-	SYS_FDATASYNC              = 4152
-	SYS__SYSCTL                = 4153
-	SYS_MLOCK                  = 4154
-	SYS_MUNLOCK                = 4155
-	SYS_MLOCKALL               = 4156
-	SYS_MUNLOCKALL             = 4157
-	SYS_SCHED_SETPARAM         = 4158
-	SYS_SCHED_GETPARAM         = 4159
-	SYS_SCHED_SETSCHEDULER     = 4160
-	SYS_SCHED_GETSCHEDULER     = 4161
-	SYS_SCHED_YIELD            = 4162
-	SYS_SCHED_GET_PRIORITY_MAX = 4163
-	SYS_SCHED_GET_PRIORITY_MIN = 4164
-	SYS_SCHED_RR_GET_INTERVAL  = 4165
-	SYS_NANOSLEEP              = 4166
-	SYS_MREMAP                 = 4167
-	SYS_ACCEPT                 = 4168
-	SYS_BIND                   = 4169
-	SYS_CONNECT                = 4170
-	SYS_GETPEERNAME            = 4171
-	SYS_GETSOCKNAME            = 4172
-	SYS_GETSOCKOPT             = 4173
-	SYS_LISTEN                 = 4174
-	SYS_RECV                   = 4175
-	SYS_RECVFROM               = 4176
-	SYS_RECVMSG                = 4177
-	SYS_SEND                   = 4178
-	SYS_SENDMSG                = 4179
-	SYS_SENDTO                 = 4180
-	SYS_SETSOCKOPT             = 4181
-	SYS_SHUTDOWN               = 4182
-	SYS_SOCKET                 = 4183
-	SYS_SOCKETPAIR             = 4184
-	SYS_SETRESUID              = 4185
-	SYS_GETRESUID              = 4186
-	SYS_QUERY_MODULE           = 4187
-	SYS_POLL                   = 4188
-	SYS_NFSSERVCTL             = 4189
-	SYS_SETRESGID              = 4190
-	SYS_GETRESGID              = 4191
-	SYS_PRCTL                  = 4192
-	SYS_RT_SIGRETURN           = 4193
-	SYS_RT_SIGACTION           = 4194
-	SYS_RT_SIGPROCMASK         = 4195
-	SYS_RT_SIGPENDING          = 4196
-	SYS_RT_SIGTIMEDWAIT        = 4197
-	SYS_RT_SIGQUEUEINFO        = 4198
-	SYS_RT_SIGSUSPEND          = 4199
-	SYS_PREAD64                = 4200
-	SYS_PWRITE64               = 4201
-	SYS_CHOWN                  = 4202
-	SYS_GETCWD                 = 4203
-	SYS_CAPGET                 = 4204
-	SYS_CAPSET                 = 4205
-	SYS_SIGALTSTACK            = 4206
-	SYS_SENDFILE               = 4207
-	SYS_GETPMSG                = 4208
-	SYS_PUTPMSG                = 4209
-	SYS_MMAP2                  = 4210
-	SYS_TRUNCATE64             = 4211
-	SYS_FTRUNCATE64            = 4212
-	SYS_STAT64                 = 4213
-	SYS_LSTAT64                = 4214
-	SYS_FSTAT64                = 4215
-	SYS_PIVOT_ROOT             = 4216
-	SYS_MINCORE                = 4217
-	SYS_MADVISE                = 4218
-	SYS_GETDENTS64             = 4219
-	SYS_FCNTL64                = 4220
-	SYS_RESERVED221            = 4221
-	SYS_GETTID                 = 4222
-	SYS_READAHEAD              = 4223
-	SYS_SETXATTR               = 4224
-	SYS_LSETXATTR              = 4225
-	SYS_FSETXATTR              = 4226
-	SYS_GETXATTR               = 4227
-	SYS_LGETXATTR              = 4228
-	SYS_FGETXATTR              = 4229
-	SYS_LISTXATTR              = 4230
-	SYS_LLISTXATTR             = 4231
-	SYS_FLISTXATTR             = 4232
-	SYS_REMOVEXATTR            = 4233
-	SYS_LREMOVEXATTR           = 4234
-	SYS_FREMOVEXATTR           = 4235
-	SYS_TKILL                  = 4236
-	SYS_SENDFILE64             = 4237
-	SYS_FUTEX                  = 4238
-	SYS_SCHED_SETAFFINITY      = 4239
-	SYS_SCHED_GETAFFINITY      = 4240
-	SYS_IO_SETUP               = 4241
-	SYS_IO_DESTROY             = 4242
-	SYS_IO_GETEVENTS           = 4243
-	SYS_IO_SUBMIT              = 4244
-	SYS_IO_CANCEL              = 4245
-	SYS_EXIT_GROUP             = 4246
-	SYS_LOOKUP_DCOOKIE         = 4247
-	SYS_EPOLL_CREATE           = 4248
-	SYS_EPOLL_CTL              = 4249
-	SYS_EPOLL_WAIT             = 4250
-	SYS_REMAP_FILE_PAGES       = 4251
-	SYS_SET_TID_ADDRESS        = 4252
-	SYS_RESTART_SYSCALL        = 4253
-	SYS_FADVISE64              = 4254
-	SYS_STATFS64               = 4255
-	SYS_FSTATFS64              = 4256
-	SYS_TIMER_CREATE           = 4257
-	SYS_TIMER_SETTIME          = 4258
-	SYS_TIMER_GETTIME          = 4259
-	SYS_TIMER_GETOVERRUN       = 4260
-	SYS_TIMER_DELETE           = 4261
-	SYS_CLOCK_SETTIME          = 4262
-	SYS_CLOCK_GETTIME          = 4263
-	SYS_CLOCK_GETRES           = 4264
-	SYS_CLOCK_NANOSLEEP        = 4265
-	SYS_TGKILL                 = 4266
-	SYS_UTIMES                 = 4267
-	SYS_MBIND                  = 4268
-	SYS_GET_MEMPOLICY          = 4269
-	SYS_SET_MEMPOLICY          = 4270
-	SYS_MQ_OPEN                = 4271
-	SYS_MQ_UNLINK              = 4272
-	SYS_MQ_TIMEDSEND           = 4273
-	SYS_MQ_TIMEDRECEIVE        = 4274
-	SYS_MQ_NOTIFY              = 4275
-	SYS_MQ_GETSETATTR          = 4276
-	SYS_VSERVER                = 4277
-	SYS_WAITID                 = 4278
-	SYS_ADD_KEY                = 4280
-	SYS_REQUEST_KEY            = 4281
-	SYS_KEYCTL                 = 4282
-	SYS_SET_THREAD_AREA        = 4283
-	SYS_INOTIFY_INIT           = 4284
-	SYS_INOTIFY_ADD_WATCH      = 4285
-	SYS_INOTIFY_RM_WATCH       = 4286
-	SYS_MIGRATE_PAGES          = 4287
-	SYS_OPENAT                 = 4288
-	SYS_MKDIRAT                = 4289
-	SYS_MKNODAT                = 4290
-	SYS_FCHOWNAT               = 4291
-	SYS_FUTIMESAT              = 4292
-	SYS_FSTATAT64              = 4293
-	SYS_UNLINKAT               = 4294
-	SYS_RENAMEAT               = 4295
-	SYS_LINKAT                 = 4296
-	SYS_SYMLINKAT              = 4297
-	SYS_READLINKAT             = 4298
-	SYS_FCHMODAT               = 4299
-	SYS_FACCESSAT              = 4300
-	SYS_PSELECT6               = 4301
-	SYS_PPOLL                  = 4302
-	SYS_UNSHARE                = 4303
-	SYS_SPLICE                 = 4304
-	SYS_SYNC_FILE_RANGE        = 4305
-	SYS_TEE                    = 4306
-	SYS_VMSPLICE               = 4307
-	SYS_MOVE_PAGES             = 4308
-	SYS_SET_ROBUST_LIST        = 4309
-	SYS_GET_ROBUST_LIST        = 4310
-	SYS_KEXEC_LOAD             = 4311
-	SYS_GETCPU                 = 4312
-	SYS_EPOLL_PWAIT            = 4313
-	SYS_IOPRIO_SET             = 4314
-	SYS_IOPRIO_GET             = 4315
-	SYS_UTIMENSAT              = 4316
-	SYS_SIGNALFD               = 4317
-	SYS_TIMERFD                = 4318
-	SYS_EVENTFD                = 4319
-	SYS_FALLOCATE              = 4320
-	SYS_TIMERFD_CREATE         = 4321
-	SYS_TIMERFD_GETTIME        = 4322
-	SYS_TIMERFD_SETTIME        = 4323
-	SYS_SIGNALFD4              = 4324
-	SYS_EVENTFD2               = 4325
-	SYS_EPOLL_CREATE1          = 4326
-	SYS_DUP3                   = 4327
-	SYS_PIPE2                  = 4328
-	SYS_INOTIFY_INIT1          = 4329
-	SYS_PREADV                 = 4330
-	SYS_PWRITEV                = 4331
-	SYS_RT_TGSIGQUEUEINFO      = 4332
-	SYS_PERF_EVENT_OPEN        = 4333
-	SYS_ACCEPT4                = 4334
-	SYS_RECVMMSG               = 4335
-	SYS_FANOTIFY_INIT          = 4336
-	SYS_FANOTIFY_MARK          = 4337
-	SYS_PRLIMIT64              = 4338
-	SYS_NAME_TO_HANDLE_AT      = 4339
-	SYS_OPEN_BY_HANDLE_AT      = 4340
-	SYS_CLOCK_ADJTIME          = 4341
-	SYS_SYNCFS                 = 4342
-	SYS_SENDMMSG               = 4343
-	SYS_SETNS                  = 4344
-	SYS_PROCESS_VM_READV       = 4345
-	SYS_PROCESS_VM_WRITEV      = 4346
-	SYS_KCMP                   = 4347
-	SYS_FINIT_MODULE           = 4348
-	SYS_SCHED_SETATTR          = 4349
-	SYS_SCHED_GETATTR          = 4350
-	SYS_RENAMEAT2              = 4351
-	SYS_SECCOMP                = 4352
-	SYS_GETRANDOM              = 4353
-	SYS_MEMFD_CREATE           = 4354
-	SYS_BPF                    = 4355
-	SYS_EXECVEAT               = 4356
-	SYS_USERFAULTFD            = 4357
-	SYS_MEMBARRIER             = 4358
-	SYS_MLOCK2                 = 4359
-	SYS_COPY_FILE_RANGE        = 4360
-	SYS_PREADV2                = 4361
-	SYS_PWRITEV2               = 4362
-	SYS_PKEY_MPROTECT          = 4363
-	SYS_PKEY_ALLOC             = 4364
-	SYS_PKEY_FREE              = 4365
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
deleted file mode 100644
index 8944448aee..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
+++ /dev/null
@@ -1,369 +0,0 @@
-// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build ppc64,linux
-
-package unix
-
-const (
-	SYS_RESTART_SYSCALL        = 0
-	SYS_EXIT                   = 1
-	SYS_FORK                   = 2
-	SYS_READ                   = 3
-	SYS_WRITE                  = 4
-	SYS_OPEN                   = 5
-	SYS_CLOSE                  = 6
-	SYS_WAITPID                = 7
-	SYS_CREAT                  = 8
-	SYS_LINK                   = 9
-	SYS_UNLINK                 = 10
-	SYS_EXECVE                 = 11
-	SYS_CHDIR                  = 12
-	SYS_TIME                   = 13
-	SYS_MKNOD                  = 14
-	SYS_CHMOD                  = 15
-	SYS_LCHOWN                 = 16
-	SYS_BREAK                  = 17
-	SYS_OLDSTAT                = 18
-	SYS_LSEEK                  = 19
-	SYS_GETPID                 = 20
-	SYS_MOUNT                  = 21
-	SYS_UMOUNT                 = 22
-	SYS_SETUID                 = 23
-	SYS_GETUID                 = 24
-	SYS_STIME                  = 25
-	SYS_PTRACE                 = 26
-	SYS_ALARM                  = 27
-	SYS_OLDFSTAT               = 28
-	SYS_PAUSE                  = 29
-	SYS_UTIME                  = 30
-	SYS_STTY                   = 31
-	SYS_GTTY                   = 32
-	SYS_ACCESS                 = 33
-	SYS_NICE                   = 34
-	SYS_FTIME                  = 35
-	SYS_SYNC                   = 36
-	SYS_KILL                   = 37
-	SYS_RENAME                 = 38
-	SYS_MKDIR                  = 39
-	SYS_RMDIR                  = 40
-	SYS_DUP                    = 41
-	SYS_PIPE                   = 42
-	SYS_TIMES                  = 43
-	SYS_PROF                   = 44
-	SYS_BRK                    = 45
-	SYS_SETGID                 = 46
-	SYS_GETGID                 = 47
-	SYS_SIGNAL                 = 48
-	SYS_GETEUID                = 49
-	SYS_GETEGID                = 50
-	SYS_ACCT                   = 51
-	SYS_UMOUNT2                = 52
-	SYS_LOCK                   = 53
-	SYS_IOCTL                  = 54
-	SYS_FCNTL                  = 55
-	SYS_MPX                    = 56
-	SYS_SETPGID                = 57
-	SYS_ULIMIT                 = 58
-	SYS_OLDOLDUNAME            = 59
-	SYS_UMASK                  = 60
-	SYS_CHROOT                 = 61
-	SYS_USTAT                  = 62
-	SYS_DUP2                   = 63
-	SYS_GETPPID                = 64
-	SYS_GETPGRP                = 65
-	SYS_SETSID                 = 66
-	SYS_SIGACTION              = 67
-	SYS_SGETMASK               = 68
-	SYS_SSETMASK               = 69
-	SYS_SETREUID               = 70
-	SYS_SETREGID               = 71
-	SYS_SIGSUSPEND             = 72
-	SYS_SIGPENDING             = 73
-	SYS_SETHOSTNAME            = 74
-	SYS_SETRLIMIT              = 75
-	SYS_GETRLIMIT              = 76
-	SYS_GETRUSAGE              = 77
-	SYS_GETTIMEOFDAY           = 78
-	SYS_SETTIMEOFDAY           = 79
-	SYS_GETGROUPS              = 80
-	SYS_SETGROUPS              = 81
-	SYS_SELECT                 = 82
-	SYS_SYMLINK                = 83
-	SYS_OLDLSTAT               = 84
-	SYS_READLINK               = 85
-	SYS_USELIB                 = 86
-	SYS_SWAPON                 = 87
-	SYS_REBOOT                 = 88
-	SYS_READDIR                = 89
-	SYS_MMAP                   = 90
-	SYS_MUNMAP                 = 91
-	SYS_TRUNCATE               = 92
-	SYS_FTRUNCATE              = 93
-	SYS_FCHMOD                 = 94
-	SYS_FCHOWN                 = 95
-	SYS_GETPRIORITY            = 96
-	SYS_SETPRIORITY            = 97
-	SYS_PROFIL                 = 98
-	SYS_STATFS                 = 99
-	SYS_FSTATFS                = 100
-	SYS_IOPERM                 = 101
-	SYS_SOCKETCALL             = 102
-	SYS_SYSLOG                 = 103
-	SYS_SETITIMER              = 104
-	SYS_GETITIMER              = 105
-	SYS_STAT                   = 106
-	SYS_LSTAT                  = 107
-	SYS_FSTAT                  = 108
-	SYS_OLDUNAME               = 109
-	SYS_IOPL                   = 110
-	SYS_VHANGUP                = 111
-	SYS_IDLE                   = 112
-	SYS_VM86                   = 113
-	SYS_WAIT4                  = 114
-	SYS_SWAPOFF                = 115
-	SYS_SYSINFO                = 116
-	SYS_IPC                    = 117
-	SYS_FSYNC                  = 118
-	SYS_SIGRETURN              = 119
-	SYS_CLONE                  = 120
-	SYS_SETDOMAINNAME          = 121
-	SYS_UNAME                  = 122
-	SYS_MODIFY_LDT             = 123
-	SYS_ADJTIMEX               = 124
-	SYS_MPROTECT               = 125
-	SYS_SIGPROCMASK            = 126
-	SYS_CREATE_MODULE          = 127
-	SYS_INIT_MODULE            = 128
-	SYS_DELETE_MODULE          = 129
-	SYS_GET_KERNEL_SYMS        = 130
-	SYS_QUOTACTL               = 131
-	SYS_GETPGID                = 132
-	SYS_FCHDIR                 = 133
-	SYS_BDFLUSH                = 134
-	SYS_SYSFS                  = 135
-	SYS_PERSONALITY            = 136
-	SYS_AFS_SYSCALL            = 137
-	SYS_SETFSUID               = 138
-	SYS_SETFSGID               = 139
-	SYS__LLSEEK                = 140
-	SYS_GETDENTS               = 141
-	SYS__NEWSELECT             = 142
-	SYS_FLOCK                  = 143
-	SYS_MSYNC                  = 144
-	SYS_READV                  = 145
-	SYS_WRITEV                 = 146
-	SYS_GETSID                 = 147
-	SYS_FDATASYNC              = 148
-	SYS__SYSCTL                = 149
-	SYS_MLOCK                  = 150
-	SYS_MUNLOCK                = 151
-	SYS_MLOCKALL               = 152
-	SYS_MUNLOCKALL             = 153
-	SYS_SCHED_SETPARAM         = 154
-	SYS_SCHED_GETPARAM         = 155
-	SYS_SCHED_SETSCHEDULER     = 156
-	SYS_SCHED_GETSCHEDULER     = 157
-	SYS_SCHED_YIELD            = 158
-	SYS_SCHED_GET_PRIORITY_MAX = 159
-	SYS_SCHED_GET_PRIORITY_MIN = 160
-	SYS_SCHED_RR_GET_INTERVAL  = 161
-	SYS_NANOSLEEP              = 162
-	SYS_MREMAP                 = 163
-	SYS_SETRESUID              = 164
-	SYS_GETRESUID              = 165
-	SYS_QUERY_MODULE           = 166
-	SYS_POLL                   = 167
-	SYS_NFSSERVCTL             = 168
-	SYS_SETRESGID              = 169
-	SYS_GETRESGID              = 170
-	SYS_PRCTL                  = 171
-	SYS_RT_SIGRETURN           = 172
-	SYS_RT_SIGACTION           = 173
-	SYS_RT_SIGPROCMASK         = 174
-	SYS_RT_SIGPENDING          = 175
-	SYS_RT_SIGTIMEDWAIT        = 176
-	SYS_RT_SIGQUEUEINFO        = 177
-	SYS_RT_SIGSUSPEND          = 178
-	SYS_PREAD64                = 179
-	SYS_PWRITE64               = 180
-	SYS_CHOWN                  = 181
-	SYS_GETCWD                 = 182
-	SYS_CAPGET                 = 183
-	SYS_CAPSET                 = 184
-	SYS_SIGALTSTACK            = 185
-	SYS_SENDFILE               = 186
-	SYS_GETPMSG                = 187
-	SYS_PUTPMSG                = 188
-	SYS_VFORK                  = 189
-	SYS_UGETRLIMIT             = 190
-	SYS_READAHEAD              = 191
-	SYS_PCICONFIG_READ         = 198
-	SYS_PCICONFIG_WRITE        = 199
-	SYS_PCICONFIG_IOBASE       = 200
-	SYS_MULTIPLEXER            = 201
-	SYS_GETDENTS64             = 202
-	SYS_PIVOT_ROOT             = 203
-	SYS_MADVISE                = 205
-	SYS_MINCORE                = 206
-	SYS_GETTID                 = 207
-	SYS_TKILL                  = 208
-	SYS_SETXATTR               = 209
-	SYS_LSETXATTR              = 210
-	SYS_FSETXATTR              = 211
-	SYS_GETXATTR               = 212
-	SYS_LGETXATTR              = 213
-	SYS_FGETXATTR              = 214
-	SYS_LISTXATTR              = 215
-	SYS_LLISTXATTR             = 216
-	SYS_FLISTXATTR             = 217
-	SYS_REMOVEXATTR            = 218
-	SYS_LREMOVEXATTR           = 219
-	SYS_FREMOVEXATTR           = 220
-	SYS_FUTEX                  = 221
-	SYS_SCHED_SETAFFINITY      = 222
-	SYS_SCHED_GETAFFINITY      = 223
-	SYS_TUXCALL                = 225
-	SYS_IO_SETUP               = 227
-	SYS_IO_DESTROY             = 228
-	SYS_IO_GETEVENTS           = 229
-	SYS_IO_SUBMIT              = 230
-	SYS_IO_CANCEL              = 231
-	SYS_SET_TID_ADDRESS        = 232
-	SYS_FADVISE64              = 233
-	SYS_EXIT_GROUP             = 234
-	SYS_LOOKUP_DCOOKIE         = 235
-	SYS_EPOLL_CREATE           = 236
-	SYS_EPOLL_CTL              = 237
-	SYS_EPOLL_WAIT             = 238
-	SYS_REMAP_FILE_PAGES       = 239
-	SYS_TIMER_CREATE           = 240
-	SYS_TIMER_SETTIME          = 241
-	SYS_TIMER_GETTIME          = 242
-	SYS_TIMER_GETOVERRUN       = 243
-	SYS_TIMER_DELETE           = 244
-	SYS_CLOCK_SETTIME          = 245
-	SYS_CLOCK_GETTIME          = 246
-	SYS_CLOCK_GETRES           = 247
-	SYS_CLOCK_NANOSLEEP        = 248
-	SYS_SWAPCONTEXT            = 249
-	SYS_TGKILL                 = 250
-	SYS_UTIMES                 = 251
-	SYS_STATFS64               = 252
-	SYS_FSTATFS64              = 253
-	SYS_RTAS                   = 255
-	SYS_SYS_DEBUG_SETCONTEXT   = 256
-	SYS_MIGRATE_PAGES          = 258
-	SYS_MBIND                  = 259
-	SYS_GET_MEMPOLICY          = 260
-	SYS_SET_MEMPOLICY          = 261
-	SYS_MQ_OPEN                = 262
-	SYS_MQ_UNLINK              = 263
-	SYS_MQ_TIMEDSEND           = 264
-	SYS_MQ_TIMEDRECEIVE        = 265
-	SYS_MQ_NOTIFY              = 266
-	SYS_MQ_GETSETATTR          = 267
-	SYS_KEXEC_LOAD             = 268
-	SYS_ADD_KEY                = 269
-	SYS_REQUEST_KEY            = 270
-	SYS_KEYCTL                 = 271
-	SYS_WAITID                 = 272
-	SYS_IOPRIO_SET             = 273
-	SYS_IOPRIO_GET             = 274
-	SYS_INOTIFY_INIT           = 275
-	SYS_INOTIFY_ADD_WATCH      = 276
-	SYS_INOTIFY_RM_WATCH       = 277
-	SYS_SPU_RUN                = 278
-	SYS_SPU_CREATE             = 279
-	SYS_PSELECT6               = 280
-	SYS_PPOLL                  = 281
-	SYS_UNSHARE                = 282
-	SYS_SPLICE                 = 283
-	SYS_TEE                    = 284
-	SYS_VMSPLICE               = 285
-	SYS_OPENAT                 = 286
-	SYS_MKDIRAT                = 287
-	SYS_MKNODAT                = 288
-	SYS_FCHOWNAT               = 289
-	SYS_FUTIMESAT              = 290
-	SYS_NEWFSTATAT             = 291
-	SYS_UNLINKAT               = 292
-	SYS_RENAMEAT               = 293
-	SYS_LINKAT                 = 294
-	SYS_SYMLINKAT              = 295
-	SYS_READLINKAT             = 296
-	SYS_FCHMODAT               = 297
-	SYS_FACCESSAT              = 298
-	SYS_GET_ROBUST_LIST        = 299
-	SYS_SET_ROBUST_LIST        = 300
-	SYS_MOVE_PAGES             = 301
-	SYS_GETCPU                 = 302
-	SYS_EPOLL_PWAIT            = 303
-	SYS_UTIMENSAT              = 304
-	SYS_SIGNALFD               = 305
-	SYS_TIMERFD_CREATE         = 306
-	SYS_EVENTFD                = 307
-	SYS_SYNC_FILE_RANGE2       = 308
-	SYS_FALLOCATE              = 309
-	SYS_SUBPAGE_PROT           = 310
-	SYS_TIMERFD_SETTIME        = 311
-	SYS_TIMERFD_GETTIME        = 312
-	SYS_SIGNALFD4              = 313
-	SYS_EVENTFD2               = 314
-	SYS_EPOLL_CREATE1          = 315
-	SYS_DUP3                   = 316
-	SYS_PIPE2                  = 317
-	SYS_INOTIFY_INIT1          = 318
-	SYS_PERF_EVENT_OPEN        = 319
-	SYS_PREADV                 = 320
-	SYS_PWRITEV                = 321
-	SYS_RT_TGSIGQUEUEINFO      = 322
-	SYS_FANOTIFY_INIT          = 323
-	SYS_FANOTIFY_MARK          = 324
-	SYS_PRLIMIT64              = 325
-	SYS_SOCKET                 = 326
-	SYS_BIND                   = 327
-	SYS_CONNECT                = 328
-	SYS_LISTEN                 = 329
-	SYS_ACCEPT                 = 330
-	SYS_GETSOCKNAME            = 331
-	SYS_GETPEERNAME            = 332
-	SYS_SOCKETPAIR             = 333
-	SYS_SEND                   = 334
-	SYS_SENDTO                 = 335
-	SYS_RECV                   = 336
-	SYS_RECVFROM               = 337
-	SYS_SHUTDOWN               = 338
-	SYS_SETSOCKOPT             = 339
-	SYS_GETSOCKOPT             = 340
-	SYS_SENDMSG                = 341
-	SYS_RECVMSG                = 342
-	SYS_RECVMMSG               = 343
-	SYS_ACCEPT4                = 344
-	SYS_NAME_TO_HANDLE_AT      = 345
-	SYS_OPEN_BY_HANDLE_AT      = 346
-	SYS_CLOCK_ADJTIME          = 347
-	SYS_SYNCFS                 = 348
-	SYS_SENDMMSG               = 349
-	SYS_SETNS                  = 350
-	SYS_PROCESS_VM_READV       = 351
-	SYS_PROCESS_VM_WRITEV      = 352
-	SYS_FINIT_MODULE           = 353
-	SYS_KCMP                   = 354
-	SYS_SCHED_SETATTR          = 355
-	SYS_SCHED_GETATTR          = 356
-	SYS_RENAMEAT2              = 357
-	SYS_SECCOMP                = 358
-	SYS_GETRANDOM              = 359
-	SYS_MEMFD_CREATE           = 360
-	SYS_BPF                    = 361
-	SYS_EXECVEAT               = 362
-	SYS_SWITCH_ENDIAN          = 363
-	SYS_USERFAULTFD            = 364
-	SYS_MEMBARRIER             = 365
-	SYS_MLOCK2                 = 378
-	SYS_COPY_FILE_RANGE        = 379
-	SYS_PREADV2                = 380
-	SYS_PWRITEV2               = 381
-	SYS_KEXEC_FILE_LOAD        = 382
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
deleted file mode 100644
index 90a039be4f..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
+++ /dev/null
@@ -1,369 +0,0 @@
-// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build ppc64le,linux
-
-package unix
-
-const (
-	SYS_RESTART_SYSCALL        = 0
-	SYS_EXIT                   = 1
-	SYS_FORK                   = 2
-	SYS_READ                   = 3
-	SYS_WRITE                  = 4
-	SYS_OPEN                   = 5
-	SYS_CLOSE                  = 6
-	SYS_WAITPID                = 7
-	SYS_CREAT                  = 8
-	SYS_LINK                   = 9
-	SYS_UNLINK                 = 10
-	SYS_EXECVE                 = 11
-	SYS_CHDIR                  = 12
-	SYS_TIME                   = 13
-	SYS_MKNOD                  = 14
-	SYS_CHMOD                  = 15
-	SYS_LCHOWN                 = 16
-	SYS_BREAK                  = 17
-	SYS_OLDSTAT                = 18
-	SYS_LSEEK                  = 19
-	SYS_GETPID                 = 20
-	SYS_MOUNT                  = 21
-	SYS_UMOUNT                 = 22
-	SYS_SETUID                 = 23
-	SYS_GETUID                 = 24
-	SYS_STIME                  = 25
-	SYS_PTRACE                 = 26
-	SYS_ALARM                  = 27
-	SYS_OLDFSTAT               = 28
-	SYS_PAUSE                  = 29
-	SYS_UTIME                  = 30
-	SYS_STTY                   = 31
-	SYS_GTTY                   = 32
-	SYS_ACCESS                 = 33
-	SYS_NICE                   = 34
-	SYS_FTIME                  = 35
-	SYS_SYNC                   = 36
-	SYS_KILL                   = 37
-	SYS_RENAME                 = 38
-	SYS_MKDIR                  = 39
-	SYS_RMDIR                  = 40
-	SYS_DUP                    = 41
-	SYS_PIPE                   = 42
-	SYS_TIMES                  = 43
-	SYS_PROF                   = 44
-	SYS_BRK                    = 45
-	SYS_SETGID                 = 46
-	SYS_GETGID                 = 47
-	SYS_SIGNAL                 = 48
-	SYS_GETEUID                = 49
-	SYS_GETEGID                = 50
-	SYS_ACCT                   = 51
-	SYS_UMOUNT2                = 52
-	SYS_LOCK                   = 53
-	SYS_IOCTL                  = 54
-	SYS_FCNTL                  = 55
-	SYS_MPX                    = 56
-	SYS_SETPGID                = 57
-	SYS_ULIMIT                 = 58
-	SYS_OLDOLDUNAME            = 59
-	SYS_UMASK                  = 60
-	SYS_CHROOT                 = 61
-	SYS_USTAT                  = 62
-	SYS_DUP2                   = 63
-	SYS_GETPPID                = 64
-	SYS_GETPGRP                = 65
-	SYS_SETSID                 = 66
-	SYS_SIGACTION              = 67
-	SYS_SGETMASK               = 68
-	SYS_SSETMASK               = 69
-	SYS_SETREUID               = 70
-	SYS_SETREGID               = 71
-	SYS_SIGSUSPEND             = 72
-	SYS_SIGPENDING             = 73
-	SYS_SETHOSTNAME            = 74
-	SYS_SETRLIMIT              = 75
-	SYS_GETRLIMIT              = 76
-	SYS_GETRUSAGE              = 77
-	SYS_GETTIMEOFDAY           = 78
-	SYS_SETTIMEOFDAY           = 79
-	SYS_GETGROUPS              = 80
-	SYS_SETGROUPS              = 81
-	SYS_SELECT                 = 82
-	SYS_SYMLINK                = 83
-	SYS_OLDLSTAT               = 84
-	SYS_READLINK               = 85
-	SYS_USELIB                 = 86
-	SYS_SWAPON                 = 87
-	SYS_REBOOT                 = 88
-	SYS_READDIR                = 89
-	SYS_MMAP                   = 90
-	SYS_MUNMAP                 = 91
-	SYS_TRUNCATE               = 92
-	SYS_FTRUNCATE              = 93
-	SYS_FCHMOD                 = 94
-	SYS_FCHOWN                 = 95
-	SYS_GETPRIORITY            = 96
-	SYS_SETPRIORITY            = 97
-	SYS_PROFIL                 = 98
-	SYS_STATFS                 = 99
-	SYS_FSTATFS                = 100
-	SYS_IOPERM                 = 101
-	SYS_SOCKETCALL             = 102
-	SYS_SYSLOG                 = 103
-	SYS_SETITIMER              = 104
-	SYS_GETITIMER              = 105
-	SYS_STAT                   = 106
-	SYS_LSTAT                  = 107
-	SYS_FSTAT                  = 108
-	SYS_OLDUNAME               = 109
-	SYS_IOPL                   = 110
-	SYS_VHANGUP                = 111
-	SYS_IDLE                   = 112
-	SYS_VM86                   = 113
-	SYS_WAIT4                  = 114
-	SYS_SWAPOFF                = 115
-	SYS_SYSINFO                = 116
-	SYS_IPC                    = 117
-	SYS_FSYNC                  = 118
-	SYS_SIGRETURN              = 119
-	SYS_CLONE                  = 120
-	SYS_SETDOMAINNAME          = 121
-	SYS_UNAME                  = 122
-	SYS_MODIFY_LDT             = 123
-	SYS_ADJTIMEX               = 124
-	SYS_MPROTECT               = 125
-	SYS_SIGPROCMASK            = 126
-	SYS_CREATE_MODULE          = 127
-	SYS_INIT_MODULE            = 128
-	SYS_DELETE_MODULE          = 129
-	SYS_GET_KERNEL_SYMS        = 130
-	SYS_QUOTACTL               = 131
-	SYS_GETPGID                = 132
-	SYS_FCHDIR                 = 133
-	SYS_BDFLUSH                = 134
-	SYS_SYSFS                  = 135
-	SYS_PERSONALITY            = 136
-	SYS_AFS_SYSCALL            = 137
-	SYS_SETFSUID               = 138
-	SYS_SETFSGID               = 139
-	SYS__LLSEEK                = 140
-	SYS_GETDENTS               = 141
-	SYS__NEWSELECT             = 142
-	SYS_FLOCK                  = 143
-	SYS_MSYNC                  = 144
-	SYS_READV                  = 145
-	SYS_WRITEV                 = 146
-	SYS_GETSID                 = 147
-	SYS_FDATASYNC              = 148
-	SYS__SYSCTL                = 149
-	SYS_MLOCK                  = 150
-	SYS_MUNLOCK                = 151
-	SYS_MLOCKALL               = 152
-	SYS_MUNLOCKALL             = 153
-	SYS_SCHED_SETPARAM         = 154
-	SYS_SCHED_GETPARAM         = 155
-	SYS_SCHED_SETSCHEDULER     = 156
-	SYS_SCHED_GETSCHEDULER     = 157
-	SYS_SCHED_YIELD            = 158
-	SYS_SCHED_GET_PRIORITY_MAX = 159
-	SYS_SCHED_GET_PRIORITY_MIN = 160
-	SYS_SCHED_RR_GET_INTERVAL  = 161
-	SYS_NANOSLEEP              = 162
-	SYS_MREMAP                 = 163
-	SYS_SETRESUID              = 164
-	SYS_GETRESUID              = 165
-	SYS_QUERY_MODULE           = 166
-	SYS_POLL                   = 167
-	SYS_NFSSERVCTL             = 168
-	SYS_SETRESGID              = 169
-	SYS_GETRESGID              = 170
-	SYS_PRCTL                  = 171
-	SYS_RT_SIGRETURN           = 172
-	SYS_RT_SIGACTION           = 173
-	SYS_RT_SIGPROCMASK         = 174
-	SYS_RT_SIGPENDING          = 175
-	SYS_RT_SIGTIMEDWAIT        = 176
-	SYS_RT_SIGQUEUEINFO        = 177
-	SYS_RT_SIGSUSPEND          = 178
-	SYS_PREAD64                = 179
-	SYS_PWRITE64               = 180
-	SYS_CHOWN                  = 181
-	SYS_GETCWD                 = 182
-	SYS_CAPGET                 = 183
-	SYS_CAPSET                 = 184
-	SYS_SIGALTSTACK            = 185
-	SYS_SENDFILE               = 186
-	SYS_GETPMSG                = 187
-	SYS_PUTPMSG                = 188
-	SYS_VFORK                  = 189
-	SYS_UGETRLIMIT             = 190
-	SYS_READAHEAD              = 191
-	SYS_PCICONFIG_READ         = 198
-	SYS_PCICONFIG_WRITE        = 199
-	SYS_PCICONFIG_IOBASE       = 200
-	SYS_MULTIPLEXER            = 201
-	SYS_GETDENTS64             = 202
-	SYS_PIVOT_ROOT             = 203
-	SYS_MADVISE                = 205
-	SYS_MINCORE                = 206
-	SYS_GETTID                 = 207
-	SYS_TKILL                  = 208
-	SYS_SETXATTR               = 209
-	SYS_LSETXATTR              = 210
-	SYS_FSETXATTR              = 211
-	SYS_GETXATTR               = 212
-	SYS_LGETXATTR              = 213
-	SYS_FGETXATTR              = 214
-	SYS_LISTXATTR              = 215
-	SYS_LLISTXATTR             = 216
-	SYS_FLISTXATTR             = 217
-	SYS_REMOVEXATTR            = 218
-	SYS_LREMOVEXATTR           = 219
-	SYS_FREMOVEXATTR           = 220
-	SYS_FUTEX                  = 221
-	SYS_SCHED_SETAFFINITY      = 222
-	SYS_SCHED_GETAFFINITY      = 223
-	SYS_TUXCALL                = 225
-	SYS_IO_SETUP               = 227
-	SYS_IO_DESTROY             = 228
-	SYS_IO_GETEVENTS           = 229
-	SYS_IO_SUBMIT              = 230
-	SYS_IO_CANCEL              = 231
-	SYS_SET_TID_ADDRESS        = 232
-	SYS_FADVISE64              = 233
-	SYS_EXIT_GROUP             = 234
-	SYS_LOOKUP_DCOOKIE         = 235
-	SYS_EPOLL_CREATE           = 236
-	SYS_EPOLL_CTL              = 237
-	SYS_EPOLL_WAIT             = 238
-	SYS_REMAP_FILE_PAGES       = 239
-	SYS_TIMER_CREATE           = 240
-	SYS_TIMER_SETTIME          = 241
-	SYS_TIMER_GETTIME          = 242
-	SYS_TIMER_GETOVERRUN       = 243
-	SYS_TIMER_DELETE           = 244
-	SYS_CLOCK_SETTIME          = 245
-	SYS_CLOCK_GETTIME          = 246
-	SYS_CLOCK_GETRES           = 247
-	SYS_CLOCK_NANOSLEEP        = 248
-	SYS_SWAPCONTEXT            = 249
-	SYS_TGKILL                 = 250
-	SYS_UTIMES                 = 251
-	SYS_STATFS64               = 252
-	SYS_FSTATFS64              = 253
-	SYS_RTAS                   = 255
-	SYS_SYS_DEBUG_SETCONTEXT   = 256
-	SYS_MIGRATE_PAGES          = 258
-	SYS_MBIND                  = 259
-	SYS_GET_MEMPOLICY          = 260
-	SYS_SET_MEMPOLICY          = 261
-	SYS_MQ_OPEN                = 262
-	SYS_MQ_UNLINK              = 263
-	SYS_MQ_TIMEDSEND           = 264
-	SYS_MQ_TIMEDRECEIVE        = 265
-	SYS_MQ_NOTIFY              = 266
-	SYS_MQ_GETSETATTR          = 267
-	SYS_KEXEC_LOAD             = 268
-	SYS_ADD_KEY                = 269
-	SYS_REQUEST_KEY            = 270
-	SYS_KEYCTL                 = 271
-	SYS_WAITID                 = 272
-	SYS_IOPRIO_SET             = 273
-	SYS_IOPRIO_GET             = 274
-	SYS_INOTIFY_INIT           = 275
-	SYS_INOTIFY_ADD_WATCH      = 276
-	SYS_INOTIFY_RM_WATCH       = 277
-	SYS_SPU_RUN                = 278
-	SYS_SPU_CREATE             = 279
-	SYS_PSELECT6               = 280
-	SYS_PPOLL                  = 281
-	SYS_UNSHARE                = 282
-	SYS_SPLICE                 = 283
-	SYS_TEE                    = 284
-	SYS_VMSPLICE               = 285
-	SYS_OPENAT                 = 286
-	SYS_MKDIRAT                = 287
-	SYS_MKNODAT                = 288
-	SYS_FCHOWNAT               = 289
-	SYS_FUTIMESAT              = 290
-	SYS_NEWFSTATAT             = 291
-	SYS_UNLINKAT               = 292
-	SYS_RENAMEAT               = 293
-	SYS_LINKAT                 = 294
-	SYS_SYMLINKAT              = 295
-	SYS_READLINKAT             = 296
-	SYS_FCHMODAT               = 297
-	SYS_FACCESSAT              = 298
-	SYS_GET_ROBUST_LIST        = 299
-	SYS_SET_ROBUST_LIST        = 300
-	SYS_MOVE_PAGES             = 301
-	SYS_GETCPU                 = 302
-	SYS_EPOLL_PWAIT            = 303
-	SYS_UTIMENSAT              = 304
-	SYS_SIGNALFD               = 305
-	SYS_TIMERFD_CREATE         = 306
-	SYS_EVENTFD                = 307
-	SYS_SYNC_FILE_RANGE2       = 308
-	SYS_FALLOCATE              = 309
-	SYS_SUBPAGE_PROT           = 310
-	SYS_TIMERFD_SETTIME        = 311
-	SYS_TIMERFD_GETTIME        = 312
-	SYS_SIGNALFD4              = 313
-	SYS_EVENTFD2               = 314
-	SYS_EPOLL_CREATE1          = 315
-	SYS_DUP3                   = 316
-	SYS_PIPE2                  = 317
-	SYS_INOTIFY_INIT1          = 318
-	SYS_PERF_EVENT_OPEN        = 319
-	SYS_PREADV                 = 320
-	SYS_PWRITEV                = 321
-	SYS_RT_TGSIGQUEUEINFO      = 322
-	SYS_FANOTIFY_INIT          = 323
-	SYS_FANOTIFY_MARK          = 324
-	SYS_PRLIMIT64              = 325
-	SYS_SOCKET                 = 326
-	SYS_BIND                   = 327
-	SYS_CONNECT                = 328
-	SYS_LISTEN                 = 329
-	SYS_ACCEPT                 = 330
-	SYS_GETSOCKNAME            = 331
-	SYS_GETPEERNAME            = 332
-	SYS_SOCKETPAIR             = 333
-	SYS_SEND                   = 334
-	SYS_SENDTO                 = 335
-	SYS_RECV                   = 336
-	SYS_RECVFROM               = 337
-	SYS_SHUTDOWN               = 338
-	SYS_SETSOCKOPT             = 339
-	SYS_GETSOCKOPT             = 340
-	SYS_SENDMSG                = 341
-	SYS_RECVMSG                = 342
-	SYS_RECVMMSG               = 343
-	SYS_ACCEPT4                = 344
-	SYS_NAME_TO_HANDLE_AT      = 345
-	SYS_OPEN_BY_HANDLE_AT      = 346
-	SYS_CLOCK_ADJTIME          = 347
-	SYS_SYNCFS                 = 348
-	SYS_SENDMMSG               = 349
-	SYS_SETNS                  = 350
-	SYS_PROCESS_VM_READV       = 351
-	SYS_PROCESS_VM_WRITEV      = 352
-	SYS_FINIT_MODULE           = 353
-	SYS_KCMP                   = 354
-	SYS_SCHED_SETATTR          = 355
-	SYS_SCHED_GETATTR          = 356
-	SYS_RENAMEAT2              = 357
-	SYS_SECCOMP                = 358
-	SYS_GETRANDOM              = 359
-	SYS_MEMFD_CREATE           = 360
-	SYS_BPF                    = 361
-	SYS_EXECVEAT               = 362
-	SYS_SWITCH_ENDIAN          = 363
-	SYS_USERFAULTFD            = 364
-	SYS_MEMBARRIER             = 365
-	SYS_MLOCK2                 = 378
-	SYS_COPY_FILE_RANGE        = 379
-	SYS_PREADV2                = 380
-	SYS_PWRITEV2               = 381
-	SYS_KEXEC_FILE_LOAD        = 382
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
deleted file mode 100644
index aab0cdb183..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
+++ /dev/null
@@ -1,331 +0,0 @@
-// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include -fsigned-char /tmp/include/asm/unistd.h
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build s390x,linux
-
-package unix
-
-const (
-	SYS_EXIT                   = 1
-	SYS_FORK                   = 2
-	SYS_READ                   = 3
-	SYS_WRITE                  = 4
-	SYS_OPEN                   = 5
-	SYS_CLOSE                  = 6
-	SYS_RESTART_SYSCALL        = 7
-	SYS_CREAT                  = 8
-	SYS_LINK                   = 9
-	SYS_UNLINK                 = 10
-	SYS_EXECVE                 = 11
-	SYS_CHDIR                  = 12
-	SYS_MKNOD                  = 14
-	SYS_CHMOD                  = 15
-	SYS_LSEEK                  = 19
-	SYS_GETPID                 = 20
-	SYS_MOUNT                  = 21
-	SYS_UMOUNT                 = 22
-	SYS_PTRACE                 = 26
-	SYS_ALARM                  = 27
-	SYS_PAUSE                  = 29
-	SYS_UTIME                  = 30
-	SYS_ACCESS                 = 33
-	SYS_NICE                   = 34
-	SYS_SYNC                   = 36
-	SYS_KILL                   = 37
-	SYS_RENAME                 = 38
-	SYS_MKDIR                  = 39
-	SYS_RMDIR                  = 40
-	SYS_DUP                    = 41
-	SYS_PIPE                   = 42
-	SYS_TIMES                  = 43
-	SYS_BRK                    = 45
-	SYS_SIGNAL                 = 48
-	SYS_ACCT                   = 51
-	SYS_UMOUNT2                = 52
-	SYS_IOCTL                  = 54
-	SYS_FCNTL                  = 55
-	SYS_SETPGID                = 57
-	SYS_UMASK                  = 60
-	SYS_CHROOT                 = 61
-	SYS_USTAT                  = 62
-	SYS_DUP2                   = 63
-	SYS_GETPPID                = 64
-	SYS_GETPGRP                = 65
-	SYS_SETSID                 = 66
-	SYS_SIGACTION              = 67
-	SYS_SIGSUSPEND             = 72
-	SYS_SIGPENDING             = 73
-	SYS_SETHOSTNAME            = 74
-	SYS_SETRLIMIT              = 75
-	SYS_GETRUSAGE              = 77
-	SYS_GETTIMEOFDAY           = 78
-	SYS_SETTIMEOFDAY           = 79
-	SYS_SYMLINK                = 83
-	SYS_READLINK               = 85
-	SYS_USELIB                 = 86
-	SYS_SWAPON                 = 87
-	SYS_REBOOT                 = 88
-	SYS_READDIR                = 89
-	SYS_MMAP                   = 90
-	SYS_MUNMAP                 = 91
-	SYS_TRUNCATE               = 92
-	SYS_FTRUNCATE              = 93
-	SYS_FCHMOD                 = 94
-	SYS_GETPRIORITY            = 96
-	SYS_SETPRIORITY            = 97
-	SYS_STATFS                 = 99
-	SYS_FSTATFS                = 100
-	SYS_SOCKETCALL             = 102
-	SYS_SYSLOG                 = 103
-	SYS_SETITIMER              = 104
-	SYS_GETITIMER              = 105
-	SYS_STAT                   = 106
-	SYS_LSTAT                  = 107
-	SYS_FSTAT                  = 108
-	SYS_LOOKUP_DCOOKIE         = 110
-	SYS_VHANGUP                = 111
-	SYS_IDLE                   = 112
-	SYS_WAIT4                  = 114
-	SYS_SWAPOFF                = 115
-	SYS_SYSINFO                = 116
-	SYS_IPC                    = 117
-	SYS_FSYNC                  = 118
-	SYS_SIGRETURN              = 119
-	SYS_CLONE                  = 120
-	SYS_SETDOMAINNAME          = 121
-	SYS_UNAME                  = 122
-	SYS_ADJTIMEX               = 124
-	SYS_MPROTECT               = 125
-	SYS_SIGPROCMASK            = 126
-	SYS_CREATE_MODULE          = 127
-	SYS_INIT_MODULE            = 128
-	SYS_DELETE_MODULE          = 129
-	SYS_GET_KERNEL_SYMS        = 130
-	SYS_QUOTACTL               = 131
-	SYS_GETPGID                = 132
-	SYS_FCHDIR                 = 133
-	SYS_BDFLUSH                = 134
-	SYS_SYSFS                  = 135
-	SYS_PERSONALITY            = 136
-	SYS_AFS_SYSCALL            = 137
-	SYS_GETDENTS               = 141
-	SYS_FLOCK                  = 143
-	SYS_MSYNC                  = 144
-	SYS_READV                  = 145
-	SYS_WRITEV                 = 146
-	SYS_GETSID                 = 147
-	SYS_FDATASYNC              = 148
-	SYS__SYSCTL                = 149
-	SYS_MLOCK                  = 150
-	SYS_MUNLOCK                = 151
-	SYS_MLOCKALL               = 152
-	SYS_MUNLOCKALL             = 153
-	SYS_SCHED_SETPARAM         = 154
-	SYS_SCHED_GETPARAM         = 155
-	SYS_SCHED_SETSCHEDULER     = 156
-	SYS_SCHED_GETSCHEDULER     = 157
-	SYS_SCHED_YIELD            = 158
-	SYS_SCHED_GET_PRIORITY_MAX = 159
-	SYS_SCHED_GET_PRIORITY_MIN = 160
-	SYS_SCHED_RR_GET_INTERVAL  = 161
-	SYS_NANOSLEEP              = 162
-	SYS_MREMAP                 = 163
-	SYS_QUERY_MODULE           = 167
-	SYS_POLL                   = 168
-	SYS_NFSSERVCTL             = 169
-	SYS_PRCTL                  = 172
-	SYS_RT_SIGRETURN           = 173
-	SYS_RT_SIGACTION           = 174
-	SYS_RT_SIGPROCMASK         = 175
-	SYS_RT_SIGPENDING          = 176
-	SYS_RT_SIGTIMEDWAIT        = 177
-	SYS_RT_SIGQUEUEINFO        = 178
-	SYS_RT_SIGSUSPEND          = 179
-	SYS_PREAD64                = 180
-	SYS_PWRITE64               = 181
-	SYS_GETCWD                 = 183
-	SYS_CAPGET                 = 184
-	SYS_CAPSET                 = 185
-	SYS_SIGALTSTACK            = 186
-	SYS_SENDFILE               = 187
-	SYS_GETPMSG                = 188
-	SYS_PUTPMSG                = 189
-	SYS_VFORK                  = 190
-	SYS_PIVOT_ROOT             = 217
-	SYS_MINCORE                = 218
-	SYS_MADVISE                = 219
-	SYS_GETDENTS64             = 220
-	SYS_READAHEAD              = 222
-	SYS_SETXATTR               = 224
-	SYS_LSETXATTR              = 225
-	SYS_FSETXATTR              = 226
-	SYS_GETXATTR               = 227
-	SYS_LGETXATTR              = 228
-	SYS_FGETXATTR              = 229
-	SYS_LISTXATTR              = 230
-	SYS_LLISTXATTR             = 231
-	SYS_FLISTXATTR             = 232
-	SYS_REMOVEXATTR            = 233
-	SYS_LREMOVEXATTR           = 234
-	SYS_FREMOVEXATTR           = 235
-	SYS_GETTID                 = 236
-	SYS_TKILL                  = 237
-	SYS_FUTEX                  = 238
-	SYS_SCHED_SETAFFINITY      = 239
-	SYS_SCHED_GETAFFINITY      = 240
-	SYS_TGKILL                 = 241
-	SYS_IO_SETUP               = 243
-	SYS_IO_DESTROY             = 244
-	SYS_IO_GETEVENTS           = 245
-	SYS_IO_SUBMIT              = 246
-	SYS_IO_CANCEL              = 247
-	SYS_EXIT_GROUP             = 248
-	SYS_EPOLL_CREATE           = 249
-	SYS_EPOLL_CTL              = 250
-	SYS_EPOLL_WAIT             = 251
-	SYS_SET_TID_ADDRESS        = 252
-	SYS_FADVISE64              = 253
-	SYS_TIMER_CREATE           = 254
-	SYS_TIMER_SETTIME          = 255
-	SYS_TIMER_GETTIME          = 256
-	SYS_TIMER_GETOVERRUN       = 257
-	SYS_TIMER_DELETE           = 258
-	SYS_CLOCK_SETTIME          = 259
-	SYS_CLOCK_GETTIME          = 260
-	SYS_CLOCK_GETRES           = 261
-	SYS_CLOCK_NANOSLEEP        = 262
-	SYS_STATFS64               = 265
-	SYS_FSTATFS64              = 266
-	SYS_REMAP_FILE_PAGES       = 267
-	SYS_MBIND                  = 268
-	SYS_GET_MEMPOLICY          = 269
-	SYS_SET_MEMPOLICY          = 270
-	SYS_MQ_OPEN                = 271
-	SYS_MQ_UNLINK              = 272
-	SYS_MQ_TIMEDSEND           = 273
-	SYS_MQ_TIMEDRECEIVE        = 274
-	SYS_MQ_NOTIFY              = 275
-	SYS_MQ_GETSETATTR          = 276
-	SYS_KEXEC_LOAD             = 277
-	SYS_ADD_KEY                = 278
-	SYS_REQUEST_KEY            = 279
-	SYS_KEYCTL                 = 280
-	SYS_WAITID                 = 281
-	SYS_IOPRIO_SET             = 282
-	SYS_IOPRIO_GET             = 283
-	SYS_INOTIFY_INIT           = 284
-	SYS_INOTIFY_ADD_WATCH      = 285
-	SYS_INOTIFY_RM_WATCH       = 286
-	SYS_MIGRATE_PAGES          = 287
-	SYS_OPENAT                 = 288
-	SYS_MKDIRAT                = 289
-	SYS_MKNODAT                = 290
-	SYS_FCHOWNAT               = 291
-	SYS_FUTIMESAT              = 292
-	SYS_UNLINKAT               = 294
-	SYS_RENAMEAT               = 295
-	SYS_LINKAT                 = 296
-	SYS_SYMLINKAT              = 297
-	SYS_READLINKAT             = 298
-	SYS_FCHMODAT               = 299
-	SYS_FACCESSAT              = 300
-	SYS_PSELECT6               = 301
-	SYS_PPOLL                  = 302
-	SYS_UNSHARE                = 303
-	SYS_SET_ROBUST_LIST        = 304
-	SYS_GET_ROBUST_LIST        = 305
-	SYS_SPLICE                 = 306
-	SYS_SYNC_FILE_RANGE        = 307
-	SYS_TEE                    = 308
-	SYS_VMSPLICE               = 309
-	SYS_MOVE_PAGES             = 310
-	SYS_GETCPU                 = 311
-	SYS_EPOLL_PWAIT            = 312
-	SYS_UTIMES                 = 313
-	SYS_FALLOCATE              = 314
-	SYS_UTIMENSAT              = 315
-	SYS_SIGNALFD               = 316
-	SYS_TIMERFD                = 317
-	SYS_EVENTFD                = 318
-	SYS_TIMERFD_CREATE         = 319
-	SYS_TIMERFD_SETTIME        = 320
-	SYS_TIMERFD_GETTIME        = 321
-	SYS_SIGNALFD4              = 322
-	SYS_EVENTFD2               = 323
-	SYS_INOTIFY_INIT1          = 324
-	SYS_PIPE2                  = 325
-	SYS_DUP3                   = 326
-	SYS_EPOLL_CREATE1          = 327
-	SYS_PREADV                 = 328
-	SYS_PWRITEV                = 329
-	SYS_RT_TGSIGQUEUEINFO      = 330
-	SYS_PERF_EVENT_OPEN        = 331
-	SYS_FANOTIFY_INIT          = 332
-	SYS_FANOTIFY_MARK          = 333
-	SYS_PRLIMIT64              = 334
-	SYS_NAME_TO_HANDLE_AT      = 335
-	SYS_OPEN_BY_HANDLE_AT      = 336
-	SYS_CLOCK_ADJTIME          = 337
-	SYS_SYNCFS                 = 338
-	SYS_SETNS                  = 339
-	SYS_PROCESS_VM_READV       = 340
-	SYS_PROCESS_VM_WRITEV      = 341
-	SYS_S390_RUNTIME_INSTR     = 342
-	SYS_KCMP                   = 343
-	SYS_FINIT_MODULE           = 344
-	SYS_SCHED_SETATTR          = 345
-	SYS_SCHED_GETATTR          = 346
-	SYS_RENAMEAT2              = 347
-	SYS_SECCOMP                = 348
-	SYS_GETRANDOM              = 349
-	SYS_MEMFD_CREATE           = 350
-	SYS_BPF                    = 351
-	SYS_S390_PCI_MMIO_WRITE    = 352
-	SYS_S390_PCI_MMIO_READ     = 353
-	SYS_EXECVEAT               = 354
-	SYS_USERFAULTFD            = 355
-	SYS_MEMBARRIER             = 356
-	SYS_RECVMMSG               = 357
-	SYS_SENDMMSG               = 358
-	SYS_SOCKET                 = 359
-	SYS_SOCKETPAIR             = 360
-	SYS_BIND                   = 361
-	SYS_CONNECT                = 362
-	SYS_LISTEN                 = 363
-	SYS_ACCEPT4                = 364
-	SYS_GETSOCKOPT             = 365
-	SYS_SETSOCKOPT             = 366
-	SYS_GETSOCKNAME            = 367
-	SYS_GETPEERNAME            = 368
-	SYS_SENDTO                 = 369
-	SYS_SENDMSG                = 370
-	SYS_RECVFROM               = 371
-	SYS_RECVMSG                = 372
-	SYS_SHUTDOWN               = 373
-	SYS_MLOCK2                 = 374
-	SYS_COPY_FILE_RANGE        = 375
-	SYS_PREADV2                = 376
-	SYS_PWRITEV2               = 377
-	SYS_SELECT                 = 142
-	SYS_GETRLIMIT              = 191
-	SYS_LCHOWN                 = 198
-	SYS_GETUID                 = 199
-	SYS_GETGID                 = 200
-	SYS_GETEUID                = 201
-	SYS_GETEGID                = 202
-	SYS_SETREUID               = 203
-	SYS_SETREGID               = 204
-	SYS_GETGROUPS              = 205
-	SYS_SETGROUPS              = 206
-	SYS_FCHOWN                 = 207
-	SYS_SETRESUID              = 208
-	SYS_GETRESUID              = 209
-	SYS_SETRESGID              = 210
-	SYS_GETRESGID              = 211
-	SYS_CHOWN                  = 212
-	SYS_SETUID                 = 213
-	SYS_SETGID                 = 214
-	SYS_SETFSUID               = 215
-	SYS_SETFSGID               = 216
-	SYS_NEWFSTATAT             = 293
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
deleted file mode 100644
index c9c129dc42..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
+++ /dev/null
@@ -1,348 +0,0 @@
-// mksysnum_linux.pl -Ilinux/usr/include -m64 -D__arch64__ linux/usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build sparc64,linux
-
-package unix
-
-const (
-	SYS_RESTART_SYSCALL        = 0
-	SYS_EXIT                   = 1
-	SYS_FORK                   = 2
-	SYS_READ                   = 3
-	SYS_WRITE                  = 4
-	SYS_OPEN                   = 5
-	SYS_CLOSE                  = 6
-	SYS_WAIT4                  = 7
-	SYS_CREAT                  = 8
-	SYS_LINK                   = 9
-	SYS_UNLINK                 = 10
-	SYS_EXECV                  = 11
-	SYS_CHDIR                  = 12
-	SYS_CHOWN                  = 13
-	SYS_MKNOD                  = 14
-	SYS_CHMOD                  = 15
-	SYS_LCHOWN                 = 16
-	SYS_BRK                    = 17
-	SYS_PERFCTR                = 18
-	SYS_LSEEK                  = 19
-	SYS_GETPID                 = 20
-	SYS_CAPGET                 = 21
-	SYS_CAPSET                 = 22
-	SYS_SETUID                 = 23
-	SYS_GETUID                 = 24
-	SYS_VMSPLICE               = 25
-	SYS_PTRACE                 = 26
-	SYS_ALARM                  = 27
-	SYS_SIGALTSTACK            = 28
-	SYS_PAUSE                  = 29
-	SYS_UTIME                  = 30
-	SYS_ACCESS                 = 33
-	SYS_NICE                   = 34
-	SYS_SYNC                   = 36
-	SYS_KILL                   = 37
-	SYS_STAT                   = 38
-	SYS_SENDFILE               = 39
-	SYS_LSTAT                  = 40
-	SYS_DUP                    = 41
-	SYS_PIPE                   = 42
-	SYS_TIMES                  = 43
-	SYS_UMOUNT2                = 45
-	SYS_SETGID                 = 46
-	SYS_GETGID                 = 47
-	SYS_SIGNAL                 = 48
-	SYS_GETEUID                = 49
-	SYS_GETEGID                = 50
-	SYS_ACCT                   = 51
-	SYS_MEMORY_ORDERING        = 52
-	SYS_IOCTL                  = 54
-	SYS_REBOOT                 = 55
-	SYS_SYMLINK                = 57
-	SYS_READLINK               = 58
-	SYS_EXECVE                 = 59
-	SYS_UMASK                  = 60
-	SYS_CHROOT                 = 61
-	SYS_FSTAT                  = 62
-	SYS_FSTAT64                = 63
-	SYS_GETPAGESIZE            = 64
-	SYS_MSYNC                  = 65
-	SYS_VFORK                  = 66
-	SYS_PREAD64                = 67
-	SYS_PWRITE64               = 68
-	SYS_MMAP                   = 71
-	SYS_MUNMAP                 = 73
-	SYS_MPROTECT               = 74
-	SYS_MADVISE                = 75
-	SYS_VHANGUP                = 76
-	SYS_MINCORE                = 78
-	SYS_GETGROUPS              = 79
-	SYS_SETGROUPS              = 80
-	SYS_GETPGRP                = 81
-	SYS_SETITIMER              = 83
-	SYS_SWAPON                 = 85
-	SYS_GETITIMER              = 86
-	SYS_SETHOSTNAME            = 88
-	SYS_DUP2                   = 90
-	SYS_FCNTL                  = 92
-	SYS_SELECT                 = 93
-	SYS_FSYNC                  = 95
-	SYS_SETPRIORITY            = 96
-	SYS_SOCKET                 = 97
-	SYS_CONNECT                = 98
-	SYS_ACCEPT                 = 99
-	SYS_GETPRIORITY            = 100
-	SYS_RT_SIGRETURN           = 101
-	SYS_RT_SIGACTION           = 102
-	SYS_RT_SIGPROCMASK         = 103
-	SYS_RT_SIGPENDING          = 104
-	SYS_RT_SIGTIMEDWAIT        = 105
-	SYS_RT_SIGQUEUEINFO        = 106
-	SYS_RT_SIGSUSPEND          = 107
-	SYS_SETRESUID              = 108
-	SYS_GETRESUID              = 109
-	SYS_SETRESGID              = 110
-	SYS_GETRESGID              = 111
-	SYS_RECVMSG                = 113
-	SYS_SENDMSG                = 114
-	SYS_GETTIMEOFDAY           = 116
-	SYS_GETRUSAGE              = 117
-	SYS_GETSOCKOPT             = 118
-	SYS_GETCWD                 = 119
-	SYS_READV                  = 120
-	SYS_WRITEV                 = 121
-	SYS_SETTIMEOFDAY           = 122
-	SYS_FCHOWN                 = 123
-	SYS_FCHMOD                 = 124
-	SYS_RECVFROM               = 125
-	SYS_SETREUID               = 126
-	SYS_SETREGID               = 127
-	SYS_RENAME                 = 128
-	SYS_TRUNCATE               = 129
-	SYS_FTRUNCATE              = 130
-	SYS_FLOCK                  = 131
-	SYS_LSTAT64                = 132
-	SYS_SENDTO                 = 133
-	SYS_SHUTDOWN               = 134
-	SYS_SOCKETPAIR             = 135
-	SYS_MKDIR                  = 136
-	SYS_RMDIR                  = 137
-	SYS_UTIMES                 = 138
-	SYS_STAT64                 = 139
-	SYS_SENDFILE64             = 140
-	SYS_GETPEERNAME            = 141
-	SYS_FUTEX                  = 142
-	SYS_GETTID                 = 143
-	SYS_GETRLIMIT              = 144
-	SYS_SETRLIMIT              = 145
-	SYS_PIVOT_ROOT             = 146
-	SYS_PRCTL                  = 147
-	SYS_PCICONFIG_READ         = 148
-	SYS_PCICONFIG_WRITE        = 149
-	SYS_GETSOCKNAME            = 150
-	SYS_INOTIFY_INIT           = 151
-	SYS_INOTIFY_ADD_WATCH      = 152
-	SYS_POLL                   = 153
-	SYS_GETDENTS64             = 154
-	SYS_INOTIFY_RM_WATCH       = 156
-	SYS_STATFS                 = 157
-	SYS_FSTATFS                = 158
-	SYS_UMOUNT                 = 159
-	SYS_SCHED_SET_AFFINITY     = 160
-	SYS_SCHED_GET_AFFINITY     = 161
-	SYS_GETDOMAINNAME          = 162
-	SYS_SETDOMAINNAME          = 163
-	SYS_UTRAP_INSTALL          = 164
-	SYS_QUOTACTL               = 165
-	SYS_SET_TID_ADDRESS        = 166
-	SYS_MOUNT                  = 167
-	SYS_USTAT                  = 168
-	SYS_SETXATTR               = 169
-	SYS_LSETXATTR              = 170
-	SYS_FSETXATTR              = 171
-	SYS_GETXATTR               = 172
-	SYS_LGETXATTR              = 173
-	SYS_GETDENTS               = 174
-	SYS_SETSID                 = 175
-	SYS_FCHDIR                 = 176
-	SYS_FGETXATTR              = 177
-	SYS_LISTXATTR              = 178
-	SYS_LLISTXATTR             = 179
-	SYS_FLISTXATTR             = 180
-	SYS_REMOVEXATTR            = 181
-	SYS_LREMOVEXATTR           = 182
-	SYS_SIGPENDING             = 183
-	SYS_QUERY_MODULE           = 184
-	SYS_SETPGID                = 185
-	SYS_FREMOVEXATTR           = 186
-	SYS_TKILL                  = 187
-	SYS_EXIT_GROUP             = 188
-	SYS_UNAME                  = 189
-	SYS_INIT_MODULE            = 190
-	SYS_PERSONALITY            = 191
-	SYS_REMAP_FILE_PAGES       = 192
-	SYS_EPOLL_CREATE           = 193
-	SYS_EPOLL_CTL              = 194
-	SYS_EPOLL_WAIT             = 195
-	SYS_IOPRIO_SET             = 196
-	SYS_GETPPID                = 197
-	SYS_SIGACTION              = 198
-	SYS_SGETMASK               = 199
-	SYS_SSETMASK               = 200
-	SYS_SIGSUSPEND             = 201
-	SYS_OLDLSTAT               = 202
-	SYS_USELIB                 = 203
-	SYS_READDIR                = 204
-	SYS_READAHEAD              = 205
-	SYS_SOCKETCALL             = 206
-	SYS_SYSLOG                 = 207
-	SYS_LOOKUP_DCOOKIE         = 208
-	SYS_FADVISE64              = 209
-	SYS_FADVISE64_64           = 210
-	SYS_TGKILL                 = 211
-	SYS_WAITPID                = 212
-	SYS_SWAPOFF                = 213
-	SYS_SYSINFO                = 214
-	SYS_IPC                    = 215
-	SYS_SIGRETURN              = 216
-	SYS_CLONE                  = 217
-	SYS_IOPRIO_GET             = 218
-	SYS_ADJTIMEX               = 219
-	SYS_SIGPROCMASK            = 220
-	SYS_CREATE_MODULE          = 221
-	SYS_DELETE_MODULE          = 222
-	SYS_GET_KERNEL_SYMS        = 223
-	SYS_GETPGID                = 224
-	SYS_BDFLUSH                = 225
-	SYS_SYSFS                  = 226
-	SYS_AFS_SYSCALL            = 227
-	SYS_SETFSUID               = 228
-	SYS_SETFSGID               = 229
-	SYS__NEWSELECT             = 230
-	SYS_SPLICE                 = 232
-	SYS_STIME                  = 233
-	SYS_STATFS64               = 234
-	SYS_FSTATFS64              = 235
-	SYS__LLSEEK                = 236
-	SYS_MLOCK                  = 237
-	SYS_MUNLOCK                = 238
-	SYS_MLOCKALL               = 239
-	SYS_MUNLOCKALL             = 240
-	SYS_SCHED_SETPARAM         = 241
-	SYS_SCHED_GETPARAM         = 242
-	SYS_SCHED_SETSCHEDULER     = 243
-	SYS_SCHED_GETSCHEDULER     = 244
-	SYS_SCHED_YIELD            = 245
-	SYS_SCHED_GET_PRIORITY_MAX = 246
-	SYS_SCHED_GET_PRIORITY_MIN = 247
-	SYS_SCHED_RR_GET_INTERVAL  = 248
-	SYS_NANOSLEEP              = 249
-	SYS_MREMAP                 = 250
-	SYS__SYSCTL                = 251
-	SYS_GETSID                 = 252
-	SYS_FDATASYNC              = 253
-	SYS_NFSSERVCTL             = 254
-	SYS_SYNC_FILE_RANGE        = 255
-	SYS_CLOCK_SETTIME          = 256
-	SYS_CLOCK_GETTIME          = 257
-	SYS_CLOCK_GETRES           = 258
-	SYS_CLOCK_NANOSLEEP        = 259
-	SYS_SCHED_GETAFFINITY      = 260
-	SYS_SCHED_SETAFFINITY      = 261
-	SYS_TIMER_SETTIME          = 262
-	SYS_TIMER_GETTIME          = 263
-	SYS_TIMER_GETOVERRUN       = 264
-	SYS_TIMER_DELETE           = 265
-	SYS_TIMER_CREATE           = 266
-	SYS_IO_SETUP               = 268
-	SYS_IO_DESTROY             = 269
-	SYS_IO_SUBMIT              = 270
-	SYS_IO_CANCEL              = 271
-	SYS_IO_GETEVENTS           = 272
-	SYS_MQ_OPEN                = 273
-	SYS_MQ_UNLINK              = 274
-	SYS_MQ_TIMEDSEND           = 275
-	SYS_MQ_TIMEDRECEIVE        = 276
-	SYS_MQ_NOTIFY              = 277
-	SYS_MQ_GETSETATTR          = 278
-	SYS_WAITID                 = 279
-	SYS_TEE                    = 280
-	SYS_ADD_KEY                = 281
-	SYS_REQUEST_KEY            = 282
-	SYS_KEYCTL                 = 283
-	SYS_OPENAT                 = 284
-	SYS_MKDIRAT                = 285
-	SYS_MKNODAT                = 286
-	SYS_FCHOWNAT               = 287
-	SYS_FUTIMESAT              = 288
-	SYS_FSTATAT64              = 289
-	SYS_UNLINKAT               = 290
-	SYS_RENAMEAT               = 291
-	SYS_LINKAT                 = 292
-	SYS_SYMLINKAT              = 293
-	SYS_READLINKAT             = 294
-	SYS_FCHMODAT               = 295
-	SYS_FACCESSAT              = 296
-	SYS_PSELECT6               = 297
-	SYS_PPOLL                  = 298
-	SYS_UNSHARE                = 299
-	SYS_SET_ROBUST_LIST        = 300
-	SYS_GET_ROBUST_LIST        = 301
-	SYS_MIGRATE_PAGES          = 302
-	SYS_MBIND                  = 303
-	SYS_GET_MEMPOLICY          = 304
-	SYS_SET_MEMPOLICY          = 305
-	SYS_KEXEC_LOAD             = 306
-	SYS_MOVE_PAGES             = 307
-	SYS_GETCPU                 = 308
-	SYS_EPOLL_PWAIT            = 309
-	SYS_UTIMENSAT              = 310
-	SYS_SIGNALFD               = 311
-	SYS_TIMERFD_CREATE         = 312
-	SYS_EVENTFD                = 313
-	SYS_FALLOCATE              = 314
-	SYS_TIMERFD_SETTIME        = 315
-	SYS_TIMERFD_GETTIME        = 316
-	SYS_SIGNALFD4              = 317
-	SYS_EVENTFD2               = 318
-	SYS_EPOLL_CREATE1          = 319
-	SYS_DUP3                   = 320
-	SYS_PIPE2                  = 321
-	SYS_INOTIFY_INIT1          = 322
-	SYS_ACCEPT4                = 323
-	SYS_PREADV                 = 324
-	SYS_PWRITEV                = 325
-	SYS_RT_TGSIGQUEUEINFO      = 326
-	SYS_PERF_EVENT_OPEN        = 327
-	SYS_RECVMMSG               = 328
-	SYS_FANOTIFY_INIT          = 329
-	SYS_FANOTIFY_MARK          = 330
-	SYS_PRLIMIT64              = 331
-	SYS_NAME_TO_HANDLE_AT      = 332
-	SYS_OPEN_BY_HANDLE_AT      = 333
-	SYS_CLOCK_ADJTIME          = 334
-	SYS_SYNCFS                 = 335
-	SYS_SENDMMSG               = 336
-	SYS_SETNS                  = 337
-	SYS_PROCESS_VM_READV       = 338
-	SYS_PROCESS_VM_WRITEV      = 339
-	SYS_KERN_FEATURES          = 340
-	SYS_KCMP                   = 341
-	SYS_FINIT_MODULE           = 342
-	SYS_SCHED_SETATTR          = 343
-	SYS_SCHED_GETATTR          = 344
-	SYS_RENAMEAT2              = 345
-	SYS_SECCOMP                = 346
-	SYS_GETRANDOM              = 347
-	SYS_MEMFD_CREATE           = 348
-	SYS_BPF                    = 349
-	SYS_EXECVEAT               = 350
-	SYS_MEMBARRIER             = 351
-	SYS_USERFAULTFD            = 352
-	SYS_BIND                   = 353
-	SYS_LISTEN                 = 354
-	SYS_SETSOCKOPT             = 355
-	SYS_MLOCK2                 = 356
-	SYS_COPY_FILE_RANGE        = 357
-	SYS_PREADV2                = 358
-	SYS_PWRITEV2               = 359
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
deleted file mode 100644
index f60d8f9882..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// mksysnum_netbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build 386,netbsd
-
-package unix
-
-const (
-	SYS_EXIT                 = 1   // { void|sys||exit(int rval); }
-	SYS_FORK                 = 2   // { int|sys||fork(void); }
-	SYS_READ                 = 3   // { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE                = 4   // { ssize_t|sys||write(int fd, const void *buf, size_t nbyte); }
-	SYS_OPEN                 = 5   // { int|sys||open(const char *path, int flags, ... mode_t mode); }
-	SYS_CLOSE                = 6   // { int|sys||close(int fd); }
-	SYS_LINK                 = 9   // { int|sys||link(const char *path, const char *link); }
-	SYS_UNLINK               = 10  // { int|sys||unlink(const char *path); }
-	SYS_CHDIR                = 12  // { int|sys||chdir(const char *path); }
-	SYS_FCHDIR               = 13  // { int|sys||fchdir(int fd); }
-	SYS_CHMOD                = 15  // { int|sys||chmod(const char *path, mode_t mode); }
-	SYS_CHOWN                = 16  // { int|sys||chown(const char *path, uid_t uid, gid_t gid); }
-	SYS_BREAK                = 17  // { int|sys||obreak(char *nsize); }
-	SYS_GETPID               = 20  // { pid_t|sys||getpid_with_ppid(void); }
-	SYS_UNMOUNT              = 22  // { int|sys||unmount(const char *path, int flags); }
-	SYS_SETUID               = 23  // { int|sys||setuid(uid_t uid); }
-	SYS_GETUID               = 24  // { uid_t|sys||getuid_with_euid(void); }
-	SYS_GETEUID              = 25  // { uid_t|sys||geteuid(void); }
-	SYS_PTRACE               = 26  // { int|sys||ptrace(int req, pid_t pid, void *addr, int data); }
-	SYS_RECVMSG              = 27  // { ssize_t|sys||recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG              = 28  // { ssize_t|sys||sendmsg(int s, const struct msghdr *msg, int flags); }
-	SYS_RECVFROM             = 29  // { ssize_t|sys||recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
-	SYS_ACCEPT               = 30  // { int|sys||accept(int s, struct sockaddr *name, socklen_t *anamelen); }
-	SYS_GETPEERNAME          = 31  // { int|sys||getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_GETSOCKNAME          = 32  // { int|sys||getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_ACCESS               = 33  // { int|sys||access(const char *path, int flags); }
-	SYS_CHFLAGS              = 34  // { int|sys||chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS             = 35  // { int|sys||fchflags(int fd, u_long flags); }
-	SYS_SYNC                 = 36  // { void|sys||sync(void); }
-	SYS_KILL                 = 37  // { int|sys||kill(pid_t pid, int signum); }
-	SYS_GETPPID              = 39  // { pid_t|sys||getppid(void); }
-	SYS_DUP                  = 41  // { int|sys||dup(int fd); }
-	SYS_PIPE                 = 42  // { int|sys||pipe(void); }
-	SYS_GETEGID              = 43  // { gid_t|sys||getegid(void); }
-	SYS_PROFIL               = 44  // { int|sys||profil(char *samples, size_t size, u_long offset, u_int scale); }
-	SYS_KTRACE               = 45  // { int|sys||ktrace(const char *fname, int ops, int facs, pid_t pid); }
-	SYS_GETGID               = 47  // { gid_t|sys||getgid_with_egid(void); }
-	SYS___GETLOGIN           = 49  // { int|sys||__getlogin(char *namebuf, size_t namelen); }
-	SYS___SETLOGIN           = 50  // { int|sys||__setlogin(const char *namebuf); }
-	SYS_ACCT                 = 51  // { int|sys||acct(const char *path); }
-	SYS_IOCTL                = 54  // { int|sys||ioctl(int fd, u_long com, ... void *data); }
-	SYS_REVOKE               = 56  // { int|sys||revoke(const char *path); }
-	SYS_SYMLINK              = 57  // { int|sys||symlink(const char *path, const char *link); }
-	SYS_READLINK             = 58  // { ssize_t|sys||readlink(const char *path, char *buf, size_t count); }
-	SYS_EXECVE               = 59  // { int|sys||execve(const char *path, char * const *argp, char * const *envp); }
-	SYS_UMASK                = 60  // { mode_t|sys||umask(mode_t newmask); }
-	SYS_CHROOT               = 61  // { int|sys||chroot(const char *path); }
-	SYS_VFORK                = 66  // { int|sys||vfork(void); }
-	SYS_SBRK                 = 69  // { int|sys||sbrk(intptr_t incr); }
-	SYS_SSTK                 = 70  // { int|sys||sstk(int incr); }
-	SYS_VADVISE              = 72  // { int|sys||ovadvise(int anom); }
-	SYS_MUNMAP               = 73  // { int|sys||munmap(void *addr, size_t len); }
-	SYS_MPROTECT             = 74  // { int|sys||mprotect(void *addr, size_t len, int prot); }
-	SYS_MADVISE              = 75  // { int|sys||madvise(void *addr, size_t len, int behav); }
-	SYS_MINCORE              = 78  // { int|sys||mincore(void *addr, size_t len, char *vec); }
-	SYS_GETGROUPS            = 79  // { int|sys||getgroups(int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS            = 80  // { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
-	SYS_GETPGRP              = 81  // { int|sys||getpgrp(void); }
-	SYS_SETPGID              = 82  // { int|sys||setpgid(pid_t pid, pid_t pgid); }
-	SYS_DUP2                 = 90  // { int|sys||dup2(int from, int to); }
-	SYS_FCNTL                = 92  // { int|sys||fcntl(int fd, int cmd, ... void *arg); }
-	SYS_FSYNC                = 95  // { int|sys||fsync(int fd); }
-	SYS_SETPRIORITY          = 96  // { int|sys||setpriority(int which, id_t who, int prio); }
-	SYS_CONNECT              = 98  // { int|sys||connect(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_GETPRIORITY          = 100 // { int|sys||getpriority(int which, id_t who); }
-	SYS_BIND                 = 104 // { int|sys||bind(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_SETSOCKOPT           = 105 // { int|sys||setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
-	SYS_LISTEN               = 106 // { int|sys||listen(int s, int backlog); }
-	SYS_GETSOCKOPT           = 118 // { int|sys||getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
-	SYS_READV                = 120 // { ssize_t|sys||readv(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_WRITEV               = 121 // { ssize_t|sys||writev(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_FCHOWN               = 123 // { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
-	SYS_FCHMOD               = 124 // { int|sys||fchmod(int fd, mode_t mode); }
-	SYS_SETREUID             = 126 // { int|sys||setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID             = 127 // { int|sys||setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME               = 128 // { int|sys||rename(const char *from, const char *to); }
-	SYS_FLOCK                = 131 // { int|sys||flock(int fd, int how); }
-	SYS_MKFIFO               = 132 // { int|sys||mkfifo(const char *path, mode_t mode); }
-	SYS_SENDTO               = 133 // { ssize_t|sys||sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
-	SYS_SHUTDOWN             = 134 // { int|sys||shutdown(int s, int how); }
-	SYS_SOCKETPAIR           = 135 // { int|sys||socketpair(int domain, int type, int protocol, int *rsv); }
-	SYS_MKDIR                = 136 // { int|sys||mkdir(const char *path, mode_t mode); }
-	SYS_RMDIR                = 137 // { int|sys||rmdir(const char *path); }
-	SYS_SETSID               = 147 // { int|sys||setsid(void); }
-	SYS_SYSARCH              = 165 // { int|sys||sysarch(int op, void *parms); }
-	SYS_PREAD                = 173 // { ssize_t|sys||pread(int fd, void *buf, size_t nbyte, int PAD, off_t offset); }
-	SYS_PWRITE               = 174 // { ssize_t|sys||pwrite(int fd, const void *buf, size_t nbyte, int PAD, off_t offset); }
-	SYS_NTP_ADJTIME          = 176 // { int|sys||ntp_adjtime(struct timex *tp); }
-	SYS_SETGID               = 181 // { int|sys||setgid(gid_t gid); }
-	SYS_SETEGID              = 182 // { int|sys||setegid(gid_t egid); }
-	SYS_SETEUID              = 183 // { int|sys||seteuid(uid_t euid); }
-	SYS_PATHCONF             = 191 // { long|sys||pathconf(const char *path, int name); }
-	SYS_FPATHCONF            = 192 // { long|sys||fpathconf(int fd, int name); }
-	SYS_GETRLIMIT            = 194 // { int|sys||getrlimit(int which, struct rlimit *rlp); }
-	SYS_SETRLIMIT            = 195 // { int|sys||setrlimit(int which, const struct rlimit *rlp); }
-	SYS_MMAP                 = 197 // { void *|sys||mmap(void *addr, size_t len, int prot, int flags, int fd, long PAD, off_t pos); }
-	SYS_LSEEK                = 199 // { off_t|sys||lseek(int fd, int PAD, off_t offset, int whence); }
-	SYS_TRUNCATE             = 200 // { int|sys||truncate(const char *path, int PAD, off_t length); }
-	SYS_FTRUNCATE            = 201 // { int|sys||ftruncate(int fd, int PAD, off_t length); }
-	SYS___SYSCTL             = 202 // { int|sys||__sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, const void *new, size_t newlen); }
-	SYS_MLOCK                = 203 // { int|sys||mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK              = 204 // { int|sys||munlock(const void *addr, size_t len); }
-	SYS_UNDELETE             = 205 // { int|sys||undelete(const char *path); }
-	SYS_GETPGID              = 207 // { pid_t|sys||getpgid(pid_t pid); }
-	SYS_REBOOT               = 208 // { int|sys||reboot(int opt, char *bootstr); }
-	SYS_POLL                 = 209 // { int|sys||poll(struct pollfd *fds, u_int nfds, int timeout); }
-	SYS_SEMGET               = 221 // { int|sys||semget(key_t key, int nsems, int semflg); }
-	SYS_SEMOP                = 222 // { int|sys||semop(int semid, struct sembuf *sops, size_t nsops); }
-	SYS_SEMCONFIG            = 223 // { int|sys||semconfig(int flag); }
-	SYS_MSGGET               = 225 // { int|sys||msgget(key_t key, int msgflg); }
-	SYS_MSGSND               = 226 // { int|sys||msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV               = 227 // { ssize_t|sys||msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
-	SYS_SHMAT                = 228 // { void *|sys||shmat(int shmid, const void *shmaddr, int shmflg); }
-	SYS_SHMDT                = 230 // { int|sys||shmdt(const void *shmaddr); }
-	SYS_SHMGET               = 231 // { int|sys||shmget(key_t key, size_t size, int shmflg); }
-	SYS_TIMER_CREATE         = 235 // { int|sys||timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); }
-	SYS_TIMER_DELETE         = 236 // { int|sys||timer_delete(timer_t timerid); }
-	SYS_TIMER_GETOVERRUN     = 239 // { int|sys||timer_getoverrun(timer_t timerid); }
-	SYS_FDATASYNC            = 241 // { int|sys||fdatasync(int fd); }
-	SYS_MLOCKALL             = 242 // { int|sys||mlockall(int flags); }
-	SYS_MUNLOCKALL           = 243 // { int|sys||munlockall(void); }
-	SYS_SIGQUEUEINFO         = 245 // { int|sys||sigqueueinfo(pid_t pid, const siginfo_t *info); }
-	SYS_MODCTL               = 246 // { int|sys||modctl(int cmd, void *arg); }
-	SYS___POSIX_RENAME       = 270 // { int|sys||__posix_rename(const char *from, const char *to); }
-	SYS_SWAPCTL              = 271 // { int|sys||swapctl(int cmd, void *arg, int misc); }
-	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
-	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
-	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
-	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
-	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS_GETSID               = 286 // { pid_t|sys||getsid(pid_t pid); }
-	SYS___CLONE              = 287 // { pid_t|sys||__clone(int flags, void *stack); }
-	SYS_FKTRACE              = 288 // { int|sys||fktrace(int fd, int ops, int facs, pid_t pid); }
-	SYS_PREADV               = 289 // { ssize_t|sys||preadv(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
-	SYS_PWRITEV              = 290 // { ssize_t|sys||pwritev(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
-	SYS___GETCWD             = 296 // { int|sys||__getcwd(char *bufp, size_t length); }
-	SYS_FCHROOT              = 297 // { int|sys||fchroot(int fd); }
-	SYS_LCHFLAGS             = 304 // { int|sys||lchflags(const char *path, u_long flags); }
-	SYS_ISSETUGID            = 305 // { int|sys||issetugid(void); }
-	SYS_UTRACE               = 306 // { int|sys||utrace(const char *label, void *addr, size_t len); }
-	SYS_GETCONTEXT           = 307 // { int|sys||getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT           = 308 // { int|sys||setcontext(const struct __ucontext *ucp); }
-	SYS__LWP_CREATE          = 309 // { int|sys||_lwp_create(const struct __ucontext *ucp, u_long flags, lwpid_t *new_lwp); }
-	SYS__LWP_EXIT            = 310 // { int|sys||_lwp_exit(void); }
-	SYS__LWP_SELF            = 311 // { lwpid_t|sys||_lwp_self(void); }
-	SYS__LWP_WAIT            = 312 // { int|sys||_lwp_wait(lwpid_t wait_for, lwpid_t *departed); }
-	SYS__LWP_SUSPEND         = 313 // { int|sys||_lwp_suspend(lwpid_t target); }
-	SYS__LWP_CONTINUE        = 314 // { int|sys||_lwp_continue(lwpid_t target); }
-	SYS__LWP_WAKEUP          = 315 // { int|sys||_lwp_wakeup(lwpid_t target); }
-	SYS__LWP_GETPRIVATE      = 316 // { void *|sys||_lwp_getprivate(void); }
-	SYS__LWP_SETPRIVATE      = 317 // { void|sys||_lwp_setprivate(void *ptr); }
-	SYS__LWP_KILL            = 318 // { int|sys||_lwp_kill(lwpid_t target, int signo); }
-	SYS__LWP_DETACH          = 319 // { int|sys||_lwp_detach(lwpid_t target); }
-	SYS__LWP_UNPARK          = 321 // { int|sys||_lwp_unpark(lwpid_t target, const void *hint); }
-	SYS__LWP_UNPARK_ALL      = 322 // { ssize_t|sys||_lwp_unpark_all(const lwpid_t *targets, size_t ntargets, const void *hint); }
-	SYS__LWP_SETNAME         = 323 // { int|sys||_lwp_setname(lwpid_t target, const char *name); }
-	SYS__LWP_GETNAME         = 324 // { int|sys||_lwp_getname(lwpid_t target, char *name, size_t len); }
-	SYS__LWP_CTL             = 325 // { int|sys||_lwp_ctl(int features, struct lwpctl **address); }
-	SYS___SIGACTION_SIGTRAMP = 340 // { int|sys||__sigaction_sigtramp(int signum, const struct sigaction *nsa, struct sigaction *osa, const void *tramp, int vers); }
-	SYS_PMC_GET_INFO         = 341 // { int|sys||pmc_get_info(int ctr, int op, void *args); }
-	SYS_PMC_CONTROL          = 342 // { int|sys||pmc_control(int ctr, int op, void *args); }
-	SYS_RASCTL               = 343 // { int|sys||rasctl(void *addr, size_t len, int op); }
-	SYS_KQUEUE               = 344 // { int|sys||kqueue(void); }
-	SYS__SCHED_SETPARAM      = 346 // { int|sys||_sched_setparam(pid_t pid, lwpid_t lid, int policy, const struct sched_param *params); }
-	SYS__SCHED_GETPARAM      = 347 // { int|sys||_sched_getparam(pid_t pid, lwpid_t lid, int *policy, struct sched_param *params); }
-	SYS__SCHED_SETAFFINITY   = 348 // { int|sys||_sched_setaffinity(pid_t pid, lwpid_t lid, size_t size, const cpuset_t *cpuset); }
-	SYS__SCHED_GETAFFINITY   = 349 // { int|sys||_sched_getaffinity(pid_t pid, lwpid_t lid, size_t size, cpuset_t *cpuset); }
-	SYS_SCHED_YIELD          = 350 // { int|sys||sched_yield(void); }
-	SYS_FSYNC_RANGE          = 354 // { int|sys||fsync_range(int fd, int flags, off_t start, off_t length); }
-	SYS_UUIDGEN              = 355 // { int|sys||uuidgen(struct uuid *store, int count); }
-	SYS_GETVFSSTAT           = 356 // { int|sys||getvfsstat(struct statvfs *buf, size_t bufsize, int flags); }
-	SYS_STATVFS1             = 357 // { int|sys||statvfs1(const char *path, struct statvfs *buf, int flags); }
-	SYS_FSTATVFS1            = 358 // { int|sys||fstatvfs1(int fd, struct statvfs *buf, int flags); }
-	SYS_EXTATTRCTL           = 360 // { int|sys||extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FILE     = 361 // { int|sys||extattr_set_file(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FILE     = 362 // { ssize_t|sys||extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FILE  = 363 // { int|sys||extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FD       = 364 // { int|sys||extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FD       = 365 // { ssize_t|sys||extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FD    = 366 // { int|sys||extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_LINK     = 367 // { int|sys||extattr_set_link(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_LINK     = 368 // { ssize_t|sys||extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_LINK  = 369 // { int|sys||extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_LIST_FD      = 370 // { ssize_t|sys||extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_FILE    = 371 // { ssize_t|sys||extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_LINK    = 372 // { ssize_t|sys||extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_SETXATTR             = 375 // { int|sys||setxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
-	SYS_LSETXATTR            = 376 // { int|sys||lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
-	SYS_FSETXATTR            = 377 // { int|sys||fsetxattr(int fd, const char *name, const void *value, size_t size, int flags); }
-	SYS_GETXATTR             = 378 // { int|sys||getxattr(const char *path, const char *name, void *value, size_t size); }
-	SYS_LGETXATTR            = 379 // { int|sys||lgetxattr(const char *path, const char *name, void *value, size_t size); }
-	SYS_FGETXATTR            = 380 // { int|sys||fgetxattr(int fd, const char *name, void *value, size_t size); }
-	SYS_LISTXATTR            = 381 // { int|sys||listxattr(const char *path, char *list, size_t size); }
-	SYS_LLISTXATTR           = 382 // { int|sys||llistxattr(const char *path, char *list, size_t size); }
-	SYS_FLISTXATTR           = 383 // { int|sys||flistxattr(int fd, char *list, size_t size); }
-	SYS_REMOVEXATTR          = 384 // { int|sys||removexattr(const char *path, const char *name); }
-	SYS_LREMOVEXATTR         = 385 // { int|sys||lremovexattr(const char *path, const char *name); }
-	SYS_FREMOVEXATTR         = 386 // { int|sys||fremovexattr(int fd, const char *name); }
-	SYS_GETDENTS             = 390 // { int|sys|30|getdents(int fd, char *buf, size_t count); }
-	SYS_SOCKET               = 394 // { int|sys|30|socket(int domain, int type, int protocol); }
-	SYS_GETFH                = 395 // { int|sys|30|getfh(const char *fname, void *fhp, size_t *fh_size); }
-	SYS_MOUNT                = 410 // { int|sys|50|mount(const char *type, const char *path, int flags, void *data, size_t data_len); }
-	SYS_MREMAP               = 411 // { void *|sys||mremap(void *old_address, size_t old_size, void *new_address, size_t new_size, int flags); }
-	SYS_PSET_CREATE          = 412 // { int|sys||pset_create(psetid_t *psid); }
-	SYS_PSET_DESTROY         = 413 // { int|sys||pset_destroy(psetid_t psid); }
-	SYS_PSET_ASSIGN          = 414 // { int|sys||pset_assign(psetid_t psid, cpuid_t cpuid, psetid_t *opsid); }
-	SYS__PSET_BIND           = 415 // { int|sys||_pset_bind(idtype_t idtype, id_t first_id, id_t second_id, psetid_t psid, psetid_t *opsid); }
-	SYS_POSIX_FADVISE        = 416 // { int|sys|50|posix_fadvise(int fd, int PAD, off_t offset, off_t len, int advice); }
-	SYS_SELECT               = 417 // { int|sys|50|select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
-	SYS_GETTIMEOFDAY         = 418 // { int|sys|50|gettimeofday(struct timeval *tp, void *tzp); }
-	SYS_SETTIMEOFDAY         = 419 // { int|sys|50|settimeofday(const struct timeval *tv, const void *tzp); }
-	SYS_UTIMES               = 420 // { int|sys|50|utimes(const char *path, const struct timeval *tptr); }
-	SYS_ADJTIME              = 421 // { int|sys|50|adjtime(const struct timeval *delta, struct timeval *olddelta); }
-	SYS_FUTIMES              = 423 // { int|sys|50|futimes(int fd, const struct timeval *tptr); }
-	SYS_LUTIMES              = 424 // { int|sys|50|lutimes(const char *path, const struct timeval *tptr); }
-	SYS_SETITIMER            = 425 // { int|sys|50|setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
-	SYS_GETITIMER            = 426 // { int|sys|50|getitimer(int which, struct itimerval *itv); }
-	SYS_CLOCK_GETTIME        = 427 // { int|sys|50|clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME        = 428 // { int|sys|50|clock_settime(clockid_t clock_id, const struct timespec *tp); }
-	SYS_CLOCK_GETRES         = 429 // { int|sys|50|clock_getres(clockid_t clock_id, struct timespec *tp); }
-	SYS_NANOSLEEP            = 430 // { int|sys|50|nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS___SIGTIMEDWAIT       = 431 // { int|sys|50|__sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout); }
-	SYS__LWP_PARK            = 434 // { int|sys|50|_lwp_park(const struct timespec *ts, lwpid_t unpark, const void *hint, const void *unparkhint); }
-	SYS_KEVENT               = 435 // { int|sys|50|kevent(int fd, const struct kevent *changelist, size_t nchanges, struct kevent *eventlist, size_t nevents, const struct timespec *timeout); }
-	SYS_PSELECT              = 436 // { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
-	SYS_POLLTS               = 437 // { int|sys|50|pollts(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
-	SYS_STAT                 = 439 // { int|sys|50|stat(const char *path, struct stat *ub); }
-	SYS_FSTAT                = 440 // { int|sys|50|fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                = 441 // { int|sys|50|lstat(const char *path, struct stat *ub); }
-	SYS___SEMCTL             = 442 // { int|sys|50|__semctl(int semid, int semnum, int cmd, ... union __semun *arg); }
-	SYS_SHMCTL               = 443 // { int|sys|50|shmctl(int shmid, int cmd, struct shmid_ds *buf); }
-	SYS_MSGCTL               = 444 // { int|sys|50|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
-	SYS_GETRUSAGE            = 445 // { int|sys|50|getrusage(int who, struct rusage *rusage); }
-	SYS_TIMER_SETTIME        = 446 // { int|sys|50|timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
-	SYS_TIMER_GETTIME        = 447 // { int|sys|50|timer_gettime(timer_t timerid, struct itimerspec *value); }
-	SYS_NTP_GETTIME          = 448 // { int|sys|50|ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_WAIT4                = 449 // { int|sys|50|wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
-	SYS_MKNOD                = 450 // { int|sys|50|mknod(const char *path, mode_t mode, dev_t dev); }
-	SYS_FHSTAT               = 451 // { int|sys|50|fhstat(const void *fhp, size_t fh_size, struct stat *sb); }
-	SYS_PIPE2                = 453 // { int|sys||pipe2(int *fildes, int flags); }
-	SYS_DUP3                 = 454 // { int|sys||dup3(int from, int to, int flags); }
-	SYS_KQUEUE1              = 455 // { int|sys||kqueue1(int flags); }
-	SYS_PACCEPT              = 456 // { int|sys||paccept(int s, struct sockaddr *name, socklen_t *anamelen, const sigset_t *mask, int flags); }
-	SYS_LINKAT               = 457 // { int|sys||linkat(int fd1, const char *name1, int fd2, const char *name2, int flags); }
-	SYS_RENAMEAT             = 458 // { int|sys||renameat(int fromfd, const char *from, int tofd, const char *to); }
-	SYS_MKFIFOAT             = 459 // { int|sys||mkfifoat(int fd, const char *path, mode_t mode); }
-	SYS_MKNODAT              = 460 // { int|sys||mknodat(int fd, const char *path, mode_t mode, uint32_t dev); }
-	SYS_MKDIRAT              = 461 // { int|sys||mkdirat(int fd, const char *path, mode_t mode); }
-	SYS_FACCESSAT            = 462 // { int|sys||faccessat(int fd, const char *path, int amode, int flag); }
-	SYS_FCHMODAT             = 463 // { int|sys||fchmodat(int fd, const char *path, mode_t mode, int flag); }
-	SYS_FCHOWNAT             = 464 // { int|sys||fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); }
-	SYS_FEXECVE              = 465 // { int|sys||fexecve(int fd, char * const *argp, char * const *envp); }
-	SYS_FSTATAT              = 466 // { int|sys||fstatat(int fd, const char *path, struct stat *buf, int flag); }
-	SYS_UTIMENSAT            = 467 // { int|sys||utimensat(int fd, const char *path, const struct timespec *tptr, int flag); }
-	SYS_OPENAT               = 468 // { int|sys||openat(int fd, const char *path, int oflags, ... mode_t mode); }
-	SYS_READLINKAT           = 469 // { int|sys||readlinkat(int fd, const char *path, char *buf, size_t bufsize); }
-	SYS_SYMLINKAT            = 470 // { int|sys||symlinkat(const char *path1, int fd, const char *path2); }
-	SYS_UNLINKAT             = 471 // { int|sys||unlinkat(int fd, const char *path, int flag); }
-	SYS_FUTIMENS             = 472 // { int|sys||futimens(int fd, const struct timespec *tptr); }
-	SYS___QUOTACTL           = 473 // { int|sys||__quotactl(const char *path, struct quotactl_args *args); }
-	SYS_POSIX_SPAWN          = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
-	SYS_RECVMMSG             = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
-	SYS_SENDMMSG             = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
deleted file mode 100644
index 48a91d4646..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// mksysnum_netbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build amd64,netbsd
-
-package unix
-
-const (
-	SYS_EXIT                 = 1   // { void|sys||exit(int rval); }
-	SYS_FORK                 = 2   // { int|sys||fork(void); }
-	SYS_READ                 = 3   // { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE                = 4   // { ssize_t|sys||write(int fd, const void *buf, size_t nbyte); }
-	SYS_OPEN                 = 5   // { int|sys||open(const char *path, int flags, ... mode_t mode); }
-	SYS_CLOSE                = 6   // { int|sys||close(int fd); }
-	SYS_LINK                 = 9   // { int|sys||link(const char *path, const char *link); }
-	SYS_UNLINK               = 10  // { int|sys||unlink(const char *path); }
-	SYS_CHDIR                = 12  // { int|sys||chdir(const char *path); }
-	SYS_FCHDIR               = 13  // { int|sys||fchdir(int fd); }
-	SYS_CHMOD                = 15  // { int|sys||chmod(const char *path, mode_t mode); }
-	SYS_CHOWN                = 16  // { int|sys||chown(const char *path, uid_t uid, gid_t gid); }
-	SYS_BREAK                = 17  // { int|sys||obreak(char *nsize); }
-	SYS_GETPID               = 20  // { pid_t|sys||getpid_with_ppid(void); }
-	SYS_UNMOUNT              = 22  // { int|sys||unmount(const char *path, int flags); }
-	SYS_SETUID               = 23  // { int|sys||setuid(uid_t uid); }
-	SYS_GETUID               = 24  // { uid_t|sys||getuid_with_euid(void); }
-	SYS_GETEUID              = 25  // { uid_t|sys||geteuid(void); }
-	SYS_PTRACE               = 26  // { int|sys||ptrace(int req, pid_t pid, void *addr, int data); }
-	SYS_RECVMSG              = 27  // { ssize_t|sys||recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG              = 28  // { ssize_t|sys||sendmsg(int s, const struct msghdr *msg, int flags); }
-	SYS_RECVFROM             = 29  // { ssize_t|sys||recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
-	SYS_ACCEPT               = 30  // { int|sys||accept(int s, struct sockaddr *name, socklen_t *anamelen); }
-	SYS_GETPEERNAME          = 31  // { int|sys||getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_GETSOCKNAME          = 32  // { int|sys||getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_ACCESS               = 33  // { int|sys||access(const char *path, int flags); }
-	SYS_CHFLAGS              = 34  // { int|sys||chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS             = 35  // { int|sys||fchflags(int fd, u_long flags); }
-	SYS_SYNC                 = 36  // { void|sys||sync(void); }
-	SYS_KILL                 = 37  // { int|sys||kill(pid_t pid, int signum); }
-	SYS_GETPPID              = 39  // { pid_t|sys||getppid(void); }
-	SYS_DUP                  = 41  // { int|sys||dup(int fd); }
-	SYS_PIPE                 = 42  // { int|sys||pipe(void); }
-	SYS_GETEGID              = 43  // { gid_t|sys||getegid(void); }
-	SYS_PROFIL               = 44  // { int|sys||profil(char *samples, size_t size, u_long offset, u_int scale); }
-	SYS_KTRACE               = 45  // { int|sys||ktrace(const char *fname, int ops, int facs, pid_t pid); }
-	SYS_GETGID               = 47  // { gid_t|sys||getgid_with_egid(void); }
-	SYS___GETLOGIN           = 49  // { int|sys||__getlogin(char *namebuf, size_t namelen); }
-	SYS___SETLOGIN           = 50  // { int|sys||__setlogin(const char *namebuf); }
-	SYS_ACCT                 = 51  // { int|sys||acct(const char *path); }
-	SYS_IOCTL                = 54  // { int|sys||ioctl(int fd, u_long com, ... void *data); }
-	SYS_REVOKE               = 56  // { int|sys||revoke(const char *path); }
-	SYS_SYMLINK              = 57  // { int|sys||symlink(const char *path, const char *link); }
-	SYS_READLINK             = 58  // { ssize_t|sys||readlink(const char *path, char *buf, size_t count); }
-	SYS_EXECVE               = 59  // { int|sys||execve(const char *path, char * const *argp, char * const *envp); }
-	SYS_UMASK                = 60  // { mode_t|sys||umask(mode_t newmask); }
-	SYS_CHROOT               = 61  // { int|sys||chroot(const char *path); }
-	SYS_VFORK                = 66  // { int|sys||vfork(void); }
-	SYS_SBRK                 = 69  // { int|sys||sbrk(intptr_t incr); }
-	SYS_SSTK                 = 70  // { int|sys||sstk(int incr); }
-	SYS_VADVISE              = 72  // { int|sys||ovadvise(int anom); }
-	SYS_MUNMAP               = 73  // { int|sys||munmap(void *addr, size_t len); }
-	SYS_MPROTECT             = 74  // { int|sys||mprotect(void *addr, size_t len, int prot); }
-	SYS_MADVISE              = 75  // { int|sys||madvise(void *addr, size_t len, int behav); }
-	SYS_MINCORE              = 78  // { int|sys||mincore(void *addr, size_t len, char *vec); }
-	SYS_GETGROUPS            = 79  // { int|sys||getgroups(int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS            = 80  // { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
-	SYS_GETPGRP              = 81  // { int|sys||getpgrp(void); }
-	SYS_SETPGID              = 82  // { int|sys||setpgid(pid_t pid, pid_t pgid); }
-	SYS_DUP2                 = 90  // { int|sys||dup2(int from, int to); }
-	SYS_FCNTL                = 92  // { int|sys||fcntl(int fd, int cmd, ... void *arg); }
-	SYS_FSYNC                = 95  // { int|sys||fsync(int fd); }
-	SYS_SETPRIORITY          = 96  // { int|sys||setpriority(int which, id_t who, int prio); }
-	SYS_CONNECT              = 98  // { int|sys||connect(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_GETPRIORITY          = 100 // { int|sys||getpriority(int which, id_t who); }
-	SYS_BIND                 = 104 // { int|sys||bind(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_SETSOCKOPT           = 105 // { int|sys||setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
-	SYS_LISTEN               = 106 // { int|sys||listen(int s, int backlog); }
-	SYS_GETSOCKOPT           = 118 // { int|sys||getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
-	SYS_READV                = 120 // { ssize_t|sys||readv(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_WRITEV               = 121 // { ssize_t|sys||writev(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_FCHOWN               = 123 // { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
-	SYS_FCHMOD               = 124 // { int|sys||fchmod(int fd, mode_t mode); }
-	SYS_SETREUID             = 126 // { int|sys||setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID             = 127 // { int|sys||setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME               = 128 // { int|sys||rename(const char *from, const char *to); }
-	SYS_FLOCK                = 131 // { int|sys||flock(int fd, int how); }
-	SYS_MKFIFO               = 132 // { int|sys||mkfifo(const char *path, mode_t mode); }
-	SYS_SENDTO               = 133 // { ssize_t|sys||sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
-	SYS_SHUTDOWN             = 134 // { int|sys||shutdown(int s, int how); }
-	SYS_SOCKETPAIR           = 135 // { int|sys||socketpair(int domain, int type, int protocol, int *rsv); }
-	SYS_MKDIR                = 136 // { int|sys||mkdir(const char *path, mode_t mode); }
-	SYS_RMDIR                = 137 // { int|sys||rmdir(const char *path); }
-	SYS_SETSID               = 147 // { int|sys||setsid(void); }
-	SYS_SYSARCH              = 165 // { int|sys||sysarch(int op, void *parms); }
-	SYS_PREAD                = 173 // { ssize_t|sys||pread(int fd, void *buf, size_t nbyte, int PAD, off_t offset); }
-	SYS_PWRITE               = 174 // { ssize_t|sys||pwrite(int fd, const void *buf, size_t nbyte, int PAD, off_t offset); }
-	SYS_NTP_ADJTIME          = 176 // { int|sys||ntp_adjtime(struct timex *tp); }
-	SYS_SETGID               = 181 // { int|sys||setgid(gid_t gid); }
-	SYS_SETEGID              = 182 // { int|sys||setegid(gid_t egid); }
-	SYS_SETEUID              = 183 // { int|sys||seteuid(uid_t euid); }
-	SYS_PATHCONF             = 191 // { long|sys||pathconf(const char *path, int name); }
-	SYS_FPATHCONF            = 192 // { long|sys||fpathconf(int fd, int name); }
-	SYS_GETRLIMIT            = 194 // { int|sys||getrlimit(int which, struct rlimit *rlp); }
-	SYS_SETRLIMIT            = 195 // { int|sys||setrlimit(int which, const struct rlimit *rlp); }
-	SYS_MMAP                 = 197 // { void *|sys||mmap(void *addr, size_t len, int prot, int flags, int fd, long PAD, off_t pos); }
-	SYS_LSEEK                = 199 // { off_t|sys||lseek(int fd, int PAD, off_t offset, int whence); }
-	SYS_TRUNCATE             = 200 // { int|sys||truncate(const char *path, int PAD, off_t length); }
-	SYS_FTRUNCATE            = 201 // { int|sys||ftruncate(int fd, int PAD, off_t length); }
-	SYS___SYSCTL             = 202 // { int|sys||__sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, const void *new, size_t newlen); }
-	SYS_MLOCK                = 203 // { int|sys||mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK              = 204 // { int|sys||munlock(const void *addr, size_t len); }
-	SYS_UNDELETE             = 205 // { int|sys||undelete(const char *path); }
-	SYS_GETPGID              = 207 // { pid_t|sys||getpgid(pid_t pid); }
-	SYS_REBOOT               = 208 // { int|sys||reboot(int opt, char *bootstr); }
-	SYS_POLL                 = 209 // { int|sys||poll(struct pollfd *fds, u_int nfds, int timeout); }
-	SYS_SEMGET               = 221 // { int|sys||semget(key_t key, int nsems, int semflg); }
-	SYS_SEMOP                = 222 // { int|sys||semop(int semid, struct sembuf *sops, size_t nsops); }
-	SYS_SEMCONFIG            = 223 // { int|sys||semconfig(int flag); }
-	SYS_MSGGET               = 225 // { int|sys||msgget(key_t key, int msgflg); }
-	SYS_MSGSND               = 226 // { int|sys||msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV               = 227 // { ssize_t|sys||msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
-	SYS_SHMAT                = 228 // { void *|sys||shmat(int shmid, const void *shmaddr, int shmflg); }
-	SYS_SHMDT                = 230 // { int|sys||shmdt(const void *shmaddr); }
-	SYS_SHMGET               = 231 // { int|sys||shmget(key_t key, size_t size, int shmflg); }
-	SYS_TIMER_CREATE         = 235 // { int|sys||timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); }
-	SYS_TIMER_DELETE         = 236 // { int|sys||timer_delete(timer_t timerid); }
-	SYS_TIMER_GETOVERRUN     = 239 // { int|sys||timer_getoverrun(timer_t timerid); }
-	SYS_FDATASYNC            = 241 // { int|sys||fdatasync(int fd); }
-	SYS_MLOCKALL             = 242 // { int|sys||mlockall(int flags); }
-	SYS_MUNLOCKALL           = 243 // { int|sys||munlockall(void); }
-	SYS_SIGQUEUEINFO         = 245 // { int|sys||sigqueueinfo(pid_t pid, const siginfo_t *info); }
-	SYS_MODCTL               = 246 // { int|sys||modctl(int cmd, void *arg); }
-	SYS___POSIX_RENAME       = 270 // { int|sys||__posix_rename(const char *from, const char *to); }
-	SYS_SWAPCTL              = 271 // { int|sys||swapctl(int cmd, void *arg, int misc); }
-	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
-	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
-	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
-	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
-	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS_GETSID               = 286 // { pid_t|sys||getsid(pid_t pid); }
-	SYS___CLONE              = 287 // { pid_t|sys||__clone(int flags, void *stack); }
-	SYS_FKTRACE              = 288 // { int|sys||fktrace(int fd, int ops, int facs, pid_t pid); }
-	SYS_PREADV               = 289 // { ssize_t|sys||preadv(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
-	SYS_PWRITEV              = 290 // { ssize_t|sys||pwritev(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
-	SYS___GETCWD             = 296 // { int|sys||__getcwd(char *bufp, size_t length); }
-	SYS_FCHROOT              = 297 // { int|sys||fchroot(int fd); }
-	SYS_LCHFLAGS             = 304 // { int|sys||lchflags(const char *path, u_long flags); }
-	SYS_ISSETUGID            = 305 // { int|sys||issetugid(void); }
-	SYS_UTRACE               = 306 // { int|sys||utrace(const char *label, void *addr, size_t len); }
-	SYS_GETCONTEXT           = 307 // { int|sys||getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT           = 308 // { int|sys||setcontext(const struct __ucontext *ucp); }
-	SYS__LWP_CREATE          = 309 // { int|sys||_lwp_create(const struct __ucontext *ucp, u_long flags, lwpid_t *new_lwp); }
-	SYS__LWP_EXIT            = 310 // { int|sys||_lwp_exit(void); }
-	SYS__LWP_SELF            = 311 // { lwpid_t|sys||_lwp_self(void); }
-	SYS__LWP_WAIT            = 312 // { int|sys||_lwp_wait(lwpid_t wait_for, lwpid_t *departed); }
-	SYS__LWP_SUSPEND         = 313 // { int|sys||_lwp_suspend(lwpid_t target); }
-	SYS__LWP_CONTINUE        = 314 // { int|sys||_lwp_continue(lwpid_t target); }
-	SYS__LWP_WAKEUP          = 315 // { int|sys||_lwp_wakeup(lwpid_t target); }
-	SYS__LWP_GETPRIVATE      = 316 // { void *|sys||_lwp_getprivate(void); }
-	SYS__LWP_SETPRIVATE      = 317 // { void|sys||_lwp_setprivate(void *ptr); }
-	SYS__LWP_KILL            = 318 // { int|sys||_lwp_kill(lwpid_t target, int signo); }
-	SYS__LWP_DETACH          = 319 // { int|sys||_lwp_detach(lwpid_t target); }
-	SYS__LWP_UNPARK          = 321 // { int|sys||_lwp_unpark(lwpid_t target, const void *hint); }
-	SYS__LWP_UNPARK_ALL      = 322 // { ssize_t|sys||_lwp_unpark_all(const lwpid_t *targets, size_t ntargets, const void *hint); }
-	SYS__LWP_SETNAME         = 323 // { int|sys||_lwp_setname(lwpid_t target, const char *name); }
-	SYS__LWP_GETNAME         = 324 // { int|sys||_lwp_getname(lwpid_t target, char *name, size_t len); }
-	SYS__LWP_CTL             = 325 // { int|sys||_lwp_ctl(int features, struct lwpctl **address); }
-	SYS___SIGACTION_SIGTRAMP = 340 // { int|sys||__sigaction_sigtramp(int signum, const struct sigaction *nsa, struct sigaction *osa, const void *tramp, int vers); }
-	SYS_PMC_GET_INFO         = 341 // { int|sys||pmc_get_info(int ctr, int op, void *args); }
-	SYS_PMC_CONTROL          = 342 // { int|sys||pmc_control(int ctr, int op, void *args); }
-	SYS_RASCTL               = 343 // { int|sys||rasctl(void *addr, size_t len, int op); }
-	SYS_KQUEUE               = 344 // { int|sys||kqueue(void); }
-	SYS__SCHED_SETPARAM      = 346 // { int|sys||_sched_setparam(pid_t pid, lwpid_t lid, int policy, const struct sched_param *params); }
-	SYS__SCHED_GETPARAM      = 347 // { int|sys||_sched_getparam(pid_t pid, lwpid_t lid, int *policy, struct sched_param *params); }
-	SYS__SCHED_SETAFFINITY   = 348 // { int|sys||_sched_setaffinity(pid_t pid, lwpid_t lid, size_t size, const cpuset_t *cpuset); }
-	SYS__SCHED_GETAFFINITY   = 349 // { int|sys||_sched_getaffinity(pid_t pid, lwpid_t lid, size_t size, cpuset_t *cpuset); }
-	SYS_SCHED_YIELD          = 350 // { int|sys||sched_yield(void); }
-	SYS_FSYNC_RANGE          = 354 // { int|sys||fsync_range(int fd, int flags, off_t start, off_t length); }
-	SYS_UUIDGEN              = 355 // { int|sys||uuidgen(struct uuid *store, int count); }
-	SYS_GETVFSSTAT           = 356 // { int|sys||getvfsstat(struct statvfs *buf, size_t bufsize, int flags); }
-	SYS_STATVFS1             = 357 // { int|sys||statvfs1(const char *path, struct statvfs *buf, int flags); }
-	SYS_FSTATVFS1            = 358 // { int|sys||fstatvfs1(int fd, struct statvfs *buf, int flags); }
-	SYS_EXTATTRCTL           = 360 // { int|sys||extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FILE     = 361 // { int|sys||extattr_set_file(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FILE     = 362 // { ssize_t|sys||extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FILE  = 363 // { int|sys||extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FD       = 364 // { int|sys||extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FD       = 365 // { ssize_t|sys||extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FD    = 366 // { int|sys||extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_LINK     = 367 // { int|sys||extattr_set_link(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_LINK     = 368 // { ssize_t|sys||extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_LINK  = 369 // { int|sys||extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_LIST_FD      = 370 // { ssize_t|sys||extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_FILE    = 371 // { ssize_t|sys||extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_LINK    = 372 // { ssize_t|sys||extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_SETXATTR             = 375 // { int|sys||setxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
-	SYS_LSETXATTR            = 376 // { int|sys||lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
-	SYS_FSETXATTR            = 377 // { int|sys||fsetxattr(int fd, const char *name, const void *value, size_t size, int flags); }
-	SYS_GETXATTR             = 378 // { int|sys||getxattr(const char *path, const char *name, void *value, size_t size); }
-	SYS_LGETXATTR            = 379 // { int|sys||lgetxattr(const char *path, const char *name, void *value, size_t size); }
-	SYS_FGETXATTR            = 380 // { int|sys||fgetxattr(int fd, const char *name, void *value, size_t size); }
-	SYS_LISTXATTR            = 381 // { int|sys||listxattr(const char *path, char *list, size_t size); }
-	SYS_LLISTXATTR           = 382 // { int|sys||llistxattr(const char *path, char *list, size_t size); }
-	SYS_FLISTXATTR           = 383 // { int|sys||flistxattr(int fd, char *list, size_t size); }
-	SYS_REMOVEXATTR          = 384 // { int|sys||removexattr(const char *path, const char *name); }
-	SYS_LREMOVEXATTR         = 385 // { int|sys||lremovexattr(const char *path, const char *name); }
-	SYS_FREMOVEXATTR         = 386 // { int|sys||fremovexattr(int fd, const char *name); }
-	SYS_GETDENTS             = 390 // { int|sys|30|getdents(int fd, char *buf, size_t count); }
-	SYS_SOCKET               = 394 // { int|sys|30|socket(int domain, int type, int protocol); }
-	SYS_GETFH                = 395 // { int|sys|30|getfh(const char *fname, void *fhp, size_t *fh_size); }
-	SYS_MOUNT                = 410 // { int|sys|50|mount(const char *type, const char *path, int flags, void *data, size_t data_len); }
-	SYS_MREMAP               = 411 // { void *|sys||mremap(void *old_address, size_t old_size, void *new_address, size_t new_size, int flags); }
-	SYS_PSET_CREATE          = 412 // { int|sys||pset_create(psetid_t *psid); }
-	SYS_PSET_DESTROY         = 413 // { int|sys||pset_destroy(psetid_t psid); }
-	SYS_PSET_ASSIGN          = 414 // { int|sys||pset_assign(psetid_t psid, cpuid_t cpuid, psetid_t *opsid); }
-	SYS__PSET_BIND           = 415 // { int|sys||_pset_bind(idtype_t idtype, id_t first_id, id_t second_id, psetid_t psid, psetid_t *opsid); }
-	SYS_POSIX_FADVISE        = 416 // { int|sys|50|posix_fadvise(int fd, int PAD, off_t offset, off_t len, int advice); }
-	SYS_SELECT               = 417 // { int|sys|50|select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
-	SYS_GETTIMEOFDAY         = 418 // { int|sys|50|gettimeofday(struct timeval *tp, void *tzp); }
-	SYS_SETTIMEOFDAY         = 419 // { int|sys|50|settimeofday(const struct timeval *tv, const void *tzp); }
-	SYS_UTIMES               = 420 // { int|sys|50|utimes(const char *path, const struct timeval *tptr); }
-	SYS_ADJTIME              = 421 // { int|sys|50|adjtime(const struct timeval *delta, struct timeval *olddelta); }
-	SYS_FUTIMES              = 423 // { int|sys|50|futimes(int fd, const struct timeval *tptr); }
-	SYS_LUTIMES              = 424 // { int|sys|50|lutimes(const char *path, const struct timeval *tptr); }
-	SYS_SETITIMER            = 425 // { int|sys|50|setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
-	SYS_GETITIMER            = 426 // { int|sys|50|getitimer(int which, struct itimerval *itv); }
-	SYS_CLOCK_GETTIME        = 427 // { int|sys|50|clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME        = 428 // { int|sys|50|clock_settime(clockid_t clock_id, const struct timespec *tp); }
-	SYS_CLOCK_GETRES         = 429 // { int|sys|50|clock_getres(clockid_t clock_id, struct timespec *tp); }
-	SYS_NANOSLEEP            = 430 // { int|sys|50|nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS___SIGTIMEDWAIT       = 431 // { int|sys|50|__sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout); }
-	SYS__LWP_PARK            = 434 // { int|sys|50|_lwp_park(const struct timespec *ts, lwpid_t unpark, const void *hint, const void *unparkhint); }
-	SYS_KEVENT               = 435 // { int|sys|50|kevent(int fd, const struct kevent *changelist, size_t nchanges, struct kevent *eventlist, size_t nevents, const struct timespec *timeout); }
-	SYS_PSELECT              = 436 // { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
-	SYS_POLLTS               = 437 // { int|sys|50|pollts(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
-	SYS_STAT                 = 439 // { int|sys|50|stat(const char *path, struct stat *ub); }
-	SYS_FSTAT                = 440 // { int|sys|50|fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                = 441 // { int|sys|50|lstat(const char *path, struct stat *ub); }
-	SYS___SEMCTL             = 442 // { int|sys|50|__semctl(int semid, int semnum, int cmd, ... union __semun *arg); }
-	SYS_SHMCTL               = 443 // { int|sys|50|shmctl(int shmid, int cmd, struct shmid_ds *buf); }
-	SYS_MSGCTL               = 444 // { int|sys|50|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
-	SYS_GETRUSAGE            = 445 // { int|sys|50|getrusage(int who, struct rusage *rusage); }
-	SYS_TIMER_SETTIME        = 446 // { int|sys|50|timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
-	SYS_TIMER_GETTIME        = 447 // { int|sys|50|timer_gettime(timer_t timerid, struct itimerspec *value); }
-	SYS_NTP_GETTIME          = 448 // { int|sys|50|ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_WAIT4                = 449 // { int|sys|50|wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
-	SYS_MKNOD                = 450 // { int|sys|50|mknod(const char *path, mode_t mode, dev_t dev); }
-	SYS_FHSTAT               = 451 // { int|sys|50|fhstat(const void *fhp, size_t fh_size, struct stat *sb); }
-	SYS_PIPE2                = 453 // { int|sys||pipe2(int *fildes, int flags); }
-	SYS_DUP3                 = 454 // { int|sys||dup3(int from, int to, int flags); }
-	SYS_KQUEUE1              = 455 // { int|sys||kqueue1(int flags); }
-	SYS_PACCEPT              = 456 // { int|sys||paccept(int s, struct sockaddr *name, socklen_t *anamelen, const sigset_t *mask, int flags); }
-	SYS_LINKAT               = 457 // { int|sys||linkat(int fd1, const char *name1, int fd2, const char *name2, int flags); }
-	SYS_RENAMEAT             = 458 // { int|sys||renameat(int fromfd, const char *from, int tofd, const char *to); }
-	SYS_MKFIFOAT             = 459 // { int|sys||mkfifoat(int fd, const char *path, mode_t mode); }
-	SYS_MKNODAT              = 460 // { int|sys||mknodat(int fd, const char *path, mode_t mode, uint32_t dev); }
-	SYS_MKDIRAT              = 461 // { int|sys||mkdirat(int fd, const char *path, mode_t mode); }
-	SYS_FACCESSAT            = 462 // { int|sys||faccessat(int fd, const char *path, int amode, int flag); }
-	SYS_FCHMODAT             = 463 // { int|sys||fchmodat(int fd, const char *path, mode_t mode, int flag); }
-	SYS_FCHOWNAT             = 464 // { int|sys||fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); }
-	SYS_FEXECVE              = 465 // { int|sys||fexecve(int fd, char * const *argp, char * const *envp); }
-	SYS_FSTATAT              = 466 // { int|sys||fstatat(int fd, const char *path, struct stat *buf, int flag); }
-	SYS_UTIMENSAT            = 467 // { int|sys||utimensat(int fd, const char *path, const struct timespec *tptr, int flag); }
-	SYS_OPENAT               = 468 // { int|sys||openat(int fd, const char *path, int oflags, ... mode_t mode); }
-	SYS_READLINKAT           = 469 // { int|sys||readlinkat(int fd, const char *path, char *buf, size_t bufsize); }
-	SYS_SYMLINKAT            = 470 // { int|sys||symlinkat(const char *path1, int fd, const char *path2); }
-	SYS_UNLINKAT             = 471 // { int|sys||unlinkat(int fd, const char *path, int flag); }
-	SYS_FUTIMENS             = 472 // { int|sys||futimens(int fd, const struct timespec *tptr); }
-	SYS___QUOTACTL           = 473 // { int|sys||__quotactl(const char *path, struct quotactl_args *args); }
-	SYS_POSIX_SPAWN          = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
-	SYS_RECVMMSG             = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
-	SYS_SENDMMSG             = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
deleted file mode 100644
index 612ba662cb..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// mksysnum_netbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build arm,netbsd
-
-package unix
-
-const (
-	SYS_EXIT                 = 1   // { void|sys||exit(int rval); }
-	SYS_FORK                 = 2   // { int|sys||fork(void); }
-	SYS_READ                 = 3   // { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE                = 4   // { ssize_t|sys||write(int fd, const void *buf, size_t nbyte); }
-	SYS_OPEN                 = 5   // { int|sys||open(const char *path, int flags, ... mode_t mode); }
-	SYS_CLOSE                = 6   // { int|sys||close(int fd); }
-	SYS_LINK                 = 9   // { int|sys||link(const char *path, const char *link); }
-	SYS_UNLINK               = 10  // { int|sys||unlink(const char *path); }
-	SYS_CHDIR                = 12  // { int|sys||chdir(const char *path); }
-	SYS_FCHDIR               = 13  // { int|sys||fchdir(int fd); }
-	SYS_CHMOD                = 15  // { int|sys||chmod(const char *path, mode_t mode); }
-	SYS_CHOWN                = 16  // { int|sys||chown(const char *path, uid_t uid, gid_t gid); }
-	SYS_BREAK                = 17  // { int|sys||obreak(char *nsize); }
-	SYS_GETPID               = 20  // { pid_t|sys||getpid_with_ppid(void); }
-	SYS_UNMOUNT              = 22  // { int|sys||unmount(const char *path, int flags); }
-	SYS_SETUID               = 23  // { int|sys||setuid(uid_t uid); }
-	SYS_GETUID               = 24  // { uid_t|sys||getuid_with_euid(void); }
-	SYS_GETEUID              = 25  // { uid_t|sys||geteuid(void); }
-	SYS_PTRACE               = 26  // { int|sys||ptrace(int req, pid_t pid, void *addr, int data); }
-	SYS_RECVMSG              = 27  // { ssize_t|sys||recvmsg(int s, struct msghdr *msg, int flags); }
-	SYS_SENDMSG              = 28  // { ssize_t|sys||sendmsg(int s, const struct msghdr *msg, int flags); }
-	SYS_RECVFROM             = 29  // { ssize_t|sys||recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlenaddr); }
-	SYS_ACCEPT               = 30  // { int|sys||accept(int s, struct sockaddr *name, socklen_t *anamelen); }
-	SYS_GETPEERNAME          = 31  // { int|sys||getpeername(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_GETSOCKNAME          = 32  // { int|sys||getsockname(int fdes, struct sockaddr *asa, socklen_t *alen); }
-	SYS_ACCESS               = 33  // { int|sys||access(const char *path, int flags); }
-	SYS_CHFLAGS              = 34  // { int|sys||chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS             = 35  // { int|sys||fchflags(int fd, u_long flags); }
-	SYS_SYNC                 = 36  // { void|sys||sync(void); }
-	SYS_KILL                 = 37  // { int|sys||kill(pid_t pid, int signum); }
-	SYS_GETPPID              = 39  // { pid_t|sys||getppid(void); }
-	SYS_DUP                  = 41  // { int|sys||dup(int fd); }
-	SYS_PIPE                 = 42  // { int|sys||pipe(void); }
-	SYS_GETEGID              = 43  // { gid_t|sys||getegid(void); }
-	SYS_PROFIL               = 44  // { int|sys||profil(char *samples, size_t size, u_long offset, u_int scale); }
-	SYS_KTRACE               = 45  // { int|sys||ktrace(const char *fname, int ops, int facs, pid_t pid); }
-	SYS_GETGID               = 47  // { gid_t|sys||getgid_with_egid(void); }
-	SYS___GETLOGIN           = 49  // { int|sys||__getlogin(char *namebuf, size_t namelen); }
-	SYS___SETLOGIN           = 50  // { int|sys||__setlogin(const char *namebuf); }
-	SYS_ACCT                 = 51  // { int|sys||acct(const char *path); }
-	SYS_IOCTL                = 54  // { int|sys||ioctl(int fd, u_long com, ... void *data); }
-	SYS_REVOKE               = 56  // { int|sys||revoke(const char *path); }
-	SYS_SYMLINK              = 57  // { int|sys||symlink(const char *path, const char *link); }
-	SYS_READLINK             = 58  // { ssize_t|sys||readlink(const char *path, char *buf, size_t count); }
-	SYS_EXECVE               = 59  // { int|sys||execve(const char *path, char * const *argp, char * const *envp); }
-	SYS_UMASK                = 60  // { mode_t|sys||umask(mode_t newmask); }
-	SYS_CHROOT               = 61  // { int|sys||chroot(const char *path); }
-	SYS_VFORK                = 66  // { int|sys||vfork(void); }
-	SYS_SBRK                 = 69  // { int|sys||sbrk(intptr_t incr); }
-	SYS_SSTK                 = 70  // { int|sys||sstk(int incr); }
-	SYS_VADVISE              = 72  // { int|sys||ovadvise(int anom); }
-	SYS_MUNMAP               = 73  // { int|sys||munmap(void *addr, size_t len); }
-	SYS_MPROTECT             = 74  // { int|sys||mprotect(void *addr, size_t len, int prot); }
-	SYS_MADVISE              = 75  // { int|sys||madvise(void *addr, size_t len, int behav); }
-	SYS_MINCORE              = 78  // { int|sys||mincore(void *addr, size_t len, char *vec); }
-	SYS_GETGROUPS            = 79  // { int|sys||getgroups(int gidsetsize, gid_t *gidset); }
-	SYS_SETGROUPS            = 80  // { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
-	SYS_GETPGRP              = 81  // { int|sys||getpgrp(void); }
-	SYS_SETPGID              = 82  // { int|sys||setpgid(pid_t pid, pid_t pgid); }
-	SYS_DUP2                 = 90  // { int|sys||dup2(int from, int to); }
-	SYS_FCNTL                = 92  // { int|sys||fcntl(int fd, int cmd, ... void *arg); }
-	SYS_FSYNC                = 95  // { int|sys||fsync(int fd); }
-	SYS_SETPRIORITY          = 96  // { int|sys||setpriority(int which, id_t who, int prio); }
-	SYS_CONNECT              = 98  // { int|sys||connect(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_GETPRIORITY          = 100 // { int|sys||getpriority(int which, id_t who); }
-	SYS_BIND                 = 104 // { int|sys||bind(int s, const struct sockaddr *name, socklen_t namelen); }
-	SYS_SETSOCKOPT           = 105 // { int|sys||setsockopt(int s, int level, int name, const void *val, socklen_t valsize); }
-	SYS_LISTEN               = 106 // { int|sys||listen(int s, int backlog); }
-	SYS_GETSOCKOPT           = 118 // { int|sys||getsockopt(int s, int level, int name, void *val, socklen_t *avalsize); }
-	SYS_READV                = 120 // { ssize_t|sys||readv(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_WRITEV               = 121 // { ssize_t|sys||writev(int fd, const struct iovec *iovp, int iovcnt); }
-	SYS_FCHOWN               = 123 // { int|sys||fchown(int fd, uid_t uid, gid_t gid); }
-	SYS_FCHMOD               = 124 // { int|sys||fchmod(int fd, mode_t mode); }
-	SYS_SETREUID             = 126 // { int|sys||setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID             = 127 // { int|sys||setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME               = 128 // { int|sys||rename(const char *from, const char *to); }
-	SYS_FLOCK                = 131 // { int|sys||flock(int fd, int how); }
-	SYS_MKFIFO               = 132 // { int|sys||mkfifo(const char *path, mode_t mode); }
-	SYS_SENDTO               = 133 // { ssize_t|sys||sendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen); }
-	SYS_SHUTDOWN             = 134 // { int|sys||shutdown(int s, int how); }
-	SYS_SOCKETPAIR           = 135 // { int|sys||socketpair(int domain, int type, int protocol, int *rsv); }
-	SYS_MKDIR                = 136 // { int|sys||mkdir(const char *path, mode_t mode); }
-	SYS_RMDIR                = 137 // { int|sys||rmdir(const char *path); }
-	SYS_SETSID               = 147 // { int|sys||setsid(void); }
-	SYS_SYSARCH              = 165 // { int|sys||sysarch(int op, void *parms); }
-	SYS_PREAD                = 173 // { ssize_t|sys||pread(int fd, void *buf, size_t nbyte, int PAD, off_t offset); }
-	SYS_PWRITE               = 174 // { ssize_t|sys||pwrite(int fd, const void *buf, size_t nbyte, int PAD, off_t offset); }
-	SYS_NTP_ADJTIME          = 176 // { int|sys||ntp_adjtime(struct timex *tp); }
-	SYS_SETGID               = 181 // { int|sys||setgid(gid_t gid); }
-	SYS_SETEGID              = 182 // { int|sys||setegid(gid_t egid); }
-	SYS_SETEUID              = 183 // { int|sys||seteuid(uid_t euid); }
-	SYS_PATHCONF             = 191 // { long|sys||pathconf(const char *path, int name); }
-	SYS_FPATHCONF            = 192 // { long|sys||fpathconf(int fd, int name); }
-	SYS_GETRLIMIT            = 194 // { int|sys||getrlimit(int which, struct rlimit *rlp); }
-	SYS_SETRLIMIT            = 195 // { int|sys||setrlimit(int which, const struct rlimit *rlp); }
-	SYS_MMAP                 = 197 // { void *|sys||mmap(void *addr, size_t len, int prot, int flags, int fd, long PAD, off_t pos); }
-	SYS_LSEEK                = 199 // { off_t|sys||lseek(int fd, int PAD, off_t offset, int whence); }
-	SYS_TRUNCATE             = 200 // { int|sys||truncate(const char *path, int PAD, off_t length); }
-	SYS_FTRUNCATE            = 201 // { int|sys||ftruncate(int fd, int PAD, off_t length); }
-	SYS___SYSCTL             = 202 // { int|sys||__sysctl(const int *name, u_int namelen, void *old, size_t *oldlenp, const void *new, size_t newlen); }
-	SYS_MLOCK                = 203 // { int|sys||mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK              = 204 // { int|sys||munlock(const void *addr, size_t len); }
-	SYS_UNDELETE             = 205 // { int|sys||undelete(const char *path); }
-	SYS_GETPGID              = 207 // { pid_t|sys||getpgid(pid_t pid); }
-	SYS_REBOOT               = 208 // { int|sys||reboot(int opt, char *bootstr); }
-	SYS_POLL                 = 209 // { int|sys||poll(struct pollfd *fds, u_int nfds, int timeout); }
-	SYS_SEMGET               = 221 // { int|sys||semget(key_t key, int nsems, int semflg); }
-	SYS_SEMOP                = 222 // { int|sys||semop(int semid, struct sembuf *sops, size_t nsops); }
-	SYS_SEMCONFIG            = 223 // { int|sys||semconfig(int flag); }
-	SYS_MSGGET               = 225 // { int|sys||msgget(key_t key, int msgflg); }
-	SYS_MSGSND               = 226 // { int|sys||msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); }
-	SYS_MSGRCV               = 227 // { ssize_t|sys||msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); }
-	SYS_SHMAT                = 228 // { void *|sys||shmat(int shmid, const void *shmaddr, int shmflg); }
-	SYS_SHMDT                = 230 // { int|sys||shmdt(const void *shmaddr); }
-	SYS_SHMGET               = 231 // { int|sys||shmget(key_t key, size_t size, int shmflg); }
-	SYS_TIMER_CREATE         = 235 // { int|sys||timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); }
-	SYS_TIMER_DELETE         = 236 // { int|sys||timer_delete(timer_t timerid); }
-	SYS_TIMER_GETOVERRUN     = 239 // { int|sys||timer_getoverrun(timer_t timerid); }
-	SYS_FDATASYNC            = 241 // { int|sys||fdatasync(int fd); }
-	SYS_MLOCKALL             = 242 // { int|sys||mlockall(int flags); }
-	SYS_MUNLOCKALL           = 243 // { int|sys||munlockall(void); }
-	SYS_SIGQUEUEINFO         = 245 // { int|sys||sigqueueinfo(pid_t pid, const siginfo_t *info); }
-	SYS_MODCTL               = 246 // { int|sys||modctl(int cmd, void *arg); }
-	SYS___POSIX_RENAME       = 270 // { int|sys||__posix_rename(const char *from, const char *to); }
-	SYS_SWAPCTL              = 271 // { int|sys||swapctl(int cmd, void *arg, int misc); }
-	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
-	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
-	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
-	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
-	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS_GETSID               = 286 // { pid_t|sys||getsid(pid_t pid); }
-	SYS___CLONE              = 287 // { pid_t|sys||__clone(int flags, void *stack); }
-	SYS_FKTRACE              = 288 // { int|sys||fktrace(int fd, int ops, int facs, pid_t pid); }
-	SYS_PREADV               = 289 // { ssize_t|sys||preadv(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
-	SYS_PWRITEV              = 290 // { ssize_t|sys||pwritev(int fd, const struct iovec *iovp, int iovcnt, int PAD, off_t offset); }
-	SYS___GETCWD             = 296 // { int|sys||__getcwd(char *bufp, size_t length); }
-	SYS_FCHROOT              = 297 // { int|sys||fchroot(int fd); }
-	SYS_LCHFLAGS             = 304 // { int|sys||lchflags(const char *path, u_long flags); }
-	SYS_ISSETUGID            = 305 // { int|sys||issetugid(void); }
-	SYS_UTRACE               = 306 // { int|sys||utrace(const char *label, void *addr, size_t len); }
-	SYS_GETCONTEXT           = 307 // { int|sys||getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT           = 308 // { int|sys||setcontext(const struct __ucontext *ucp); }
-	SYS__LWP_CREATE          = 309 // { int|sys||_lwp_create(const struct __ucontext *ucp, u_long flags, lwpid_t *new_lwp); }
-	SYS__LWP_EXIT            = 310 // { int|sys||_lwp_exit(void); }
-	SYS__LWP_SELF            = 311 // { lwpid_t|sys||_lwp_self(void); }
-	SYS__LWP_WAIT            = 312 // { int|sys||_lwp_wait(lwpid_t wait_for, lwpid_t *departed); }
-	SYS__LWP_SUSPEND         = 313 // { int|sys||_lwp_suspend(lwpid_t target); }
-	SYS__LWP_CONTINUE        = 314 // { int|sys||_lwp_continue(lwpid_t target); }
-	SYS__LWP_WAKEUP          = 315 // { int|sys||_lwp_wakeup(lwpid_t target); }
-	SYS__LWP_GETPRIVATE      = 316 // { void *|sys||_lwp_getprivate(void); }
-	SYS__LWP_SETPRIVATE      = 317 // { void|sys||_lwp_setprivate(void *ptr); }
-	SYS__LWP_KILL            = 318 // { int|sys||_lwp_kill(lwpid_t target, int signo); }
-	SYS__LWP_DETACH          = 319 // { int|sys||_lwp_detach(lwpid_t target); }
-	SYS__LWP_UNPARK          = 321 // { int|sys||_lwp_unpark(lwpid_t target, const void *hint); }
-	SYS__LWP_UNPARK_ALL      = 322 // { ssize_t|sys||_lwp_unpark_all(const lwpid_t *targets, size_t ntargets, const void *hint); }
-	SYS__LWP_SETNAME         = 323 // { int|sys||_lwp_setname(lwpid_t target, const char *name); }
-	SYS__LWP_GETNAME         = 324 // { int|sys||_lwp_getname(lwpid_t target, char *name, size_t len); }
-	SYS__LWP_CTL             = 325 // { int|sys||_lwp_ctl(int features, struct lwpctl **address); }
-	SYS___SIGACTION_SIGTRAMP = 340 // { int|sys||__sigaction_sigtramp(int signum, const struct sigaction *nsa, struct sigaction *osa, const void *tramp, int vers); }
-	SYS_PMC_GET_INFO         = 341 // { int|sys||pmc_get_info(int ctr, int op, void *args); }
-	SYS_PMC_CONTROL          = 342 // { int|sys||pmc_control(int ctr, int op, void *args); }
-	SYS_RASCTL               = 343 // { int|sys||rasctl(void *addr, size_t len, int op); }
-	SYS_KQUEUE               = 344 // { int|sys||kqueue(void); }
-	SYS__SCHED_SETPARAM      = 346 // { int|sys||_sched_setparam(pid_t pid, lwpid_t lid, int policy, const struct sched_param *params); }
-	SYS__SCHED_GETPARAM      = 347 // { int|sys||_sched_getparam(pid_t pid, lwpid_t lid, int *policy, struct sched_param *params); }
-	SYS__SCHED_SETAFFINITY   = 348 // { int|sys||_sched_setaffinity(pid_t pid, lwpid_t lid, size_t size, const cpuset_t *cpuset); }
-	SYS__SCHED_GETAFFINITY   = 349 // { int|sys||_sched_getaffinity(pid_t pid, lwpid_t lid, size_t size, cpuset_t *cpuset); }
-	SYS_SCHED_YIELD          = 350 // { int|sys||sched_yield(void); }
-	SYS_FSYNC_RANGE          = 354 // { int|sys||fsync_range(int fd, int flags, off_t start, off_t length); }
-	SYS_UUIDGEN              = 355 // { int|sys||uuidgen(struct uuid *store, int count); }
-	SYS_GETVFSSTAT           = 356 // { int|sys||getvfsstat(struct statvfs *buf, size_t bufsize, int flags); }
-	SYS_STATVFS1             = 357 // { int|sys||statvfs1(const char *path, struct statvfs *buf, int flags); }
-	SYS_FSTATVFS1            = 358 // { int|sys||fstatvfs1(int fd, struct statvfs *buf, int flags); }
-	SYS_EXTATTRCTL           = 360 // { int|sys||extattrctl(const char *path, int cmd, const char *filename, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FILE     = 361 // { int|sys||extattr_set_file(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FILE     = 362 // { ssize_t|sys||extattr_get_file(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FILE  = 363 // { int|sys||extattr_delete_file(const char *path, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_FD       = 364 // { int|sys||extattr_set_fd(int fd, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_FD       = 365 // { ssize_t|sys||extattr_get_fd(int fd, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_FD    = 366 // { int|sys||extattr_delete_fd(int fd, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_SET_LINK     = 367 // { int|sys||extattr_set_link(const char *path, int attrnamespace, const char *attrname, const void *data, size_t nbytes); }
-	SYS_EXTATTR_GET_LINK     = 368 // { ssize_t|sys||extattr_get_link(const char *path, int attrnamespace, const char *attrname, void *data, size_t nbytes); }
-	SYS_EXTATTR_DELETE_LINK  = 369 // { int|sys||extattr_delete_link(const char *path, int attrnamespace, const char *attrname); }
-	SYS_EXTATTR_LIST_FD      = 370 // { ssize_t|sys||extattr_list_fd(int fd, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_FILE    = 371 // { ssize_t|sys||extattr_list_file(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_EXTATTR_LIST_LINK    = 372 // { ssize_t|sys||extattr_list_link(const char *path, int attrnamespace, void *data, size_t nbytes); }
-	SYS_SETXATTR             = 375 // { int|sys||setxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
-	SYS_LSETXATTR            = 376 // { int|sys||lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags); }
-	SYS_FSETXATTR            = 377 // { int|sys||fsetxattr(int fd, const char *name, const void *value, size_t size, int flags); }
-	SYS_GETXATTR             = 378 // { int|sys||getxattr(const char *path, const char *name, void *value, size_t size); }
-	SYS_LGETXATTR            = 379 // { int|sys||lgetxattr(const char *path, const char *name, void *value, size_t size); }
-	SYS_FGETXATTR            = 380 // { int|sys||fgetxattr(int fd, const char *name, void *value, size_t size); }
-	SYS_LISTXATTR            = 381 // { int|sys||listxattr(const char *path, char *list, size_t size); }
-	SYS_LLISTXATTR           = 382 // { int|sys||llistxattr(const char *path, char *list, size_t size); }
-	SYS_FLISTXATTR           = 383 // { int|sys||flistxattr(int fd, char *list, size_t size); }
-	SYS_REMOVEXATTR          = 384 // { int|sys||removexattr(const char *path, const char *name); }
-	SYS_LREMOVEXATTR         = 385 // { int|sys||lremovexattr(const char *path, const char *name); }
-	SYS_FREMOVEXATTR         = 386 // { int|sys||fremovexattr(int fd, const char *name); }
-	SYS_GETDENTS             = 390 // { int|sys|30|getdents(int fd, char *buf, size_t count); }
-	SYS_SOCKET               = 394 // { int|sys|30|socket(int domain, int type, int protocol); }
-	SYS_GETFH                = 395 // { int|sys|30|getfh(const char *fname, void *fhp, size_t *fh_size); }
-	SYS_MOUNT                = 410 // { int|sys|50|mount(const char *type, const char *path, int flags, void *data, size_t data_len); }
-	SYS_MREMAP               = 411 // { void *|sys||mremap(void *old_address, size_t old_size, void *new_address, size_t new_size, int flags); }
-	SYS_PSET_CREATE          = 412 // { int|sys||pset_create(psetid_t *psid); }
-	SYS_PSET_DESTROY         = 413 // { int|sys||pset_destroy(psetid_t psid); }
-	SYS_PSET_ASSIGN          = 414 // { int|sys||pset_assign(psetid_t psid, cpuid_t cpuid, psetid_t *opsid); }
-	SYS__PSET_BIND           = 415 // { int|sys||_pset_bind(idtype_t idtype, id_t first_id, id_t second_id, psetid_t psid, psetid_t *opsid); }
-	SYS_POSIX_FADVISE        = 416 // { int|sys|50|posix_fadvise(int fd, int PAD, off_t offset, off_t len, int advice); }
-	SYS_SELECT               = 417 // { int|sys|50|select(int nd, fd_set *in, fd_set *ou, fd_set *ex, struct timeval *tv); }
-	SYS_GETTIMEOFDAY         = 418 // { int|sys|50|gettimeofday(struct timeval *tp, void *tzp); }
-	SYS_SETTIMEOFDAY         = 419 // { int|sys|50|settimeofday(const struct timeval *tv, const void *tzp); }
-	SYS_UTIMES               = 420 // { int|sys|50|utimes(const char *path, const struct timeval *tptr); }
-	SYS_ADJTIME              = 421 // { int|sys|50|adjtime(const struct timeval *delta, struct timeval *olddelta); }
-	SYS_FUTIMES              = 423 // { int|sys|50|futimes(int fd, const struct timeval *tptr); }
-	SYS_LUTIMES              = 424 // { int|sys|50|lutimes(const char *path, const struct timeval *tptr); }
-	SYS_SETITIMER            = 425 // { int|sys|50|setitimer(int which, const struct itimerval *itv, struct itimerval *oitv); }
-	SYS_GETITIMER            = 426 // { int|sys|50|getitimer(int which, struct itimerval *itv); }
-	SYS_CLOCK_GETTIME        = 427 // { int|sys|50|clock_gettime(clockid_t clock_id, struct timespec *tp); }
-	SYS_CLOCK_SETTIME        = 428 // { int|sys|50|clock_settime(clockid_t clock_id, const struct timespec *tp); }
-	SYS_CLOCK_GETRES         = 429 // { int|sys|50|clock_getres(clockid_t clock_id, struct timespec *tp); }
-	SYS_NANOSLEEP            = 430 // { int|sys|50|nanosleep(const struct timespec *rqtp, struct timespec *rmtp); }
-	SYS___SIGTIMEDWAIT       = 431 // { int|sys|50|__sigtimedwait(const sigset_t *set, siginfo_t *info, struct timespec *timeout); }
-	SYS__LWP_PARK            = 434 // { int|sys|50|_lwp_park(const struct timespec *ts, lwpid_t unpark, const void *hint, const void *unparkhint); }
-	SYS_KEVENT               = 435 // { int|sys|50|kevent(int fd, const struct kevent *changelist, size_t nchanges, struct kevent *eventlist, size_t nevents, const struct timespec *timeout); }
-	SYS_PSELECT              = 436 // { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, fd_set *ex, const struct timespec *ts, const sigset_t *mask); }
-	SYS_POLLTS               = 437 // { int|sys|50|pollts(struct pollfd *fds, u_int nfds, const struct timespec *ts, const sigset_t *mask); }
-	SYS_STAT                 = 439 // { int|sys|50|stat(const char *path, struct stat *ub); }
-	SYS_FSTAT                = 440 // { int|sys|50|fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                = 441 // { int|sys|50|lstat(const char *path, struct stat *ub); }
-	SYS___SEMCTL             = 442 // { int|sys|50|__semctl(int semid, int semnum, int cmd, ... union __semun *arg); }
-	SYS_SHMCTL               = 443 // { int|sys|50|shmctl(int shmid, int cmd, struct shmid_ds *buf); }
-	SYS_MSGCTL               = 444 // { int|sys|50|msgctl(int msqid, int cmd, struct msqid_ds *buf); }
-	SYS_GETRUSAGE            = 445 // { int|sys|50|getrusage(int who, struct rusage *rusage); }
-	SYS_TIMER_SETTIME        = 446 // { int|sys|50|timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); }
-	SYS_TIMER_GETTIME        = 447 // { int|sys|50|timer_gettime(timer_t timerid, struct itimerspec *value); }
-	SYS_NTP_GETTIME          = 448 // { int|sys|50|ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_WAIT4                = 449 // { int|sys|50|wait4(pid_t pid, int *status, int options, struct rusage *rusage); }
-	SYS_MKNOD                = 450 // { int|sys|50|mknod(const char *path, mode_t mode, dev_t dev); }
-	SYS_FHSTAT               = 451 // { int|sys|50|fhstat(const void *fhp, size_t fh_size, struct stat *sb); }
-	SYS_PIPE2                = 453 // { int|sys||pipe2(int *fildes, int flags); }
-	SYS_DUP3                 = 454 // { int|sys||dup3(int from, int to, int flags); }
-	SYS_KQUEUE1              = 455 // { int|sys||kqueue1(int flags); }
-	SYS_PACCEPT              = 456 // { int|sys||paccept(int s, struct sockaddr *name, socklen_t *anamelen, const sigset_t *mask, int flags); }
-	SYS_LINKAT               = 457 // { int|sys||linkat(int fd1, const char *name1, int fd2, const char *name2, int flags); }
-	SYS_RENAMEAT             = 458 // { int|sys||renameat(int fromfd, const char *from, int tofd, const char *to); }
-	SYS_MKFIFOAT             = 459 // { int|sys||mkfifoat(int fd, const char *path, mode_t mode); }
-	SYS_MKNODAT              = 460 // { int|sys||mknodat(int fd, const char *path, mode_t mode, uint32_t dev); }
-	SYS_MKDIRAT              = 461 // { int|sys||mkdirat(int fd, const char *path, mode_t mode); }
-	SYS_FACCESSAT            = 462 // { int|sys||faccessat(int fd, const char *path, int amode, int flag); }
-	SYS_FCHMODAT             = 463 // { int|sys||fchmodat(int fd, const char *path, mode_t mode, int flag); }
-	SYS_FCHOWNAT             = 464 // { int|sys||fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); }
-	SYS_FEXECVE              = 465 // { int|sys||fexecve(int fd, char * const *argp, char * const *envp); }
-	SYS_FSTATAT              = 466 // { int|sys||fstatat(int fd, const char *path, struct stat *buf, int flag); }
-	SYS_UTIMENSAT            = 467 // { int|sys||utimensat(int fd, const char *path, const struct timespec *tptr, int flag); }
-	SYS_OPENAT               = 468 // { int|sys||openat(int fd, const char *path, int oflags, ... mode_t mode); }
-	SYS_READLINKAT           = 469 // { int|sys||readlinkat(int fd, const char *path, char *buf, size_t bufsize); }
-	SYS_SYMLINKAT            = 470 // { int|sys||symlinkat(const char *path1, int fd, const char *path2); }
-	SYS_UNLINKAT             = 471 // { int|sys||unlinkat(int fd, const char *path, int flag); }
-	SYS_FUTIMENS             = 472 // { int|sys||futimens(int fd, const struct timespec *tptr); }
-	SYS___QUOTACTL           = 473 // { int|sys||__quotactl(const char *path, struct quotactl_args *args); }
-	SYS_POSIX_SPAWN          = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
-	SYS_RECVMMSG             = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
-	SYS_SENDMMSG             = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
deleted file mode 100644
index 3e8ce2a1dd..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_386.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// mksysnum_openbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build 386,openbsd
-
-package unix
-
-const (
-	SYS_EXIT           = 1   // { void sys_exit(int rval); }
-	SYS_FORK           = 2   // { int sys_fork(void); }
-	SYS_READ           = 3   // { ssize_t sys_read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE          = 4   // { ssize_t sys_write(int fd, const void *buf, \
-	SYS_OPEN           = 5   // { int sys_open(const char *path, \
-	SYS_CLOSE          = 6   // { int sys_close(int fd); }
-	SYS___TFORK        = 8   // { int sys___tfork(const struct __tfork *param, \
-	SYS_LINK           = 9   // { int sys_link(const char *path, const char *link); }
-	SYS_UNLINK         = 10  // { int sys_unlink(const char *path); }
-	SYS_WAIT4          = 11  // { pid_t sys_wait4(pid_t pid, int *status, \
-	SYS_CHDIR          = 12  // { int sys_chdir(const char *path); }
-	SYS_FCHDIR         = 13  // { int sys_fchdir(int fd); }
-	SYS_MKNOD          = 14  // { int sys_mknod(const char *path, mode_t mode, \
-	SYS_CHMOD          = 15  // { int sys_chmod(const char *path, mode_t mode); }
-	SYS_CHOWN          = 16  // { int sys_chown(const char *path, uid_t uid, \
-	SYS_OBREAK         = 17  // { int sys_obreak(char *nsize); } break
-	SYS_GETDTABLECOUNT = 18  // { int sys_getdtablecount(void); }
-	SYS_GETRUSAGE      = 19  // { int sys_getrusage(int who, \
-	SYS_GETPID         = 20  // { pid_t sys_getpid(void); }
-	SYS_MOUNT          = 21  // { int sys_mount(const char *type, const char *path, \
-	SYS_UNMOUNT        = 22  // { int sys_unmount(const char *path, int flags); }
-	SYS_SETUID         = 23  // { int sys_setuid(uid_t uid); }
-	SYS_GETUID         = 24  // { uid_t sys_getuid(void); }
-	SYS_GETEUID        = 25  // { uid_t sys_geteuid(void); }
-	SYS_PTRACE         = 26  // { int sys_ptrace(int req, pid_t pid, caddr_t addr, \
-	SYS_RECVMSG        = 27  // { ssize_t sys_recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG        = 28  // { ssize_t sys_sendmsg(int s, \
-	SYS_RECVFROM       = 29  // { ssize_t sys_recvfrom(int s, void *buf, size_t len, \
-	SYS_ACCEPT         = 30  // { int sys_accept(int s, struct sockaddr *name, \
-	SYS_GETPEERNAME    = 31  // { int sys_getpeername(int fdes, struct sockaddr *asa, \
-	SYS_GETSOCKNAME    = 32  // { int sys_getsockname(int fdes, struct sockaddr *asa, \
-	SYS_ACCESS         = 33  // { int sys_access(const char *path, int flags); }
-	SYS_CHFLAGS        = 34  // { int sys_chflags(const char *path, u_int flags); }
-	SYS_FCHFLAGS       = 35  // { int sys_fchflags(int fd, u_int flags); }
-	SYS_SYNC           = 36  // { void sys_sync(void); }
-	SYS_KILL           = 37  // { int sys_kill(int pid, int signum); }
-	SYS_STAT           = 38  // { int sys_stat(const char *path, struct stat *ub); }
-	SYS_GETPPID        = 39  // { pid_t sys_getppid(void); }
-	SYS_LSTAT          = 40  // { int sys_lstat(const char *path, struct stat *ub); }
-	SYS_DUP            = 41  // { int sys_dup(int fd); }
-	SYS_FSTATAT        = 42  // { int sys_fstatat(int fd, const char *path, \
-	SYS_GETEGID        = 43  // { gid_t sys_getegid(void); }
-	SYS_PROFIL         = 44  // { int sys_profil(caddr_t samples, size_t size, \
-	SYS_KTRACE         = 45  // { int sys_ktrace(const char *fname, int ops, \
-	SYS_SIGACTION      = 46  // { int sys_sigaction(int signum, \
-	SYS_GETGID         = 47  // { gid_t sys_getgid(void); }
-	SYS_SIGPROCMASK    = 48  // { int sys_sigprocmask(int how, sigset_t mask); }
-	SYS_GETLOGIN       = 49  // { int sys_getlogin(char *namebuf, u_int namelen); }
-	SYS_SETLOGIN       = 50  // { int sys_setlogin(const char *namebuf); }
-	SYS_ACCT           = 51  // { int sys_acct(const char *path); }
-	SYS_SIGPENDING     = 52  // { int sys_sigpending(void); }
-	SYS_FSTAT          = 53  // { int sys_fstat(int fd, struct stat *sb); }
-	SYS_IOCTL          = 54  // { int sys_ioctl(int fd, \
-	SYS_REBOOT         = 55  // { int sys_reboot(int opt); }
-	SYS_REVOKE         = 56  // { int sys_revoke(const char *path); }
-	SYS_SYMLINK        = 57  // { int sys_symlink(const char *path, \
-	SYS_READLINK       = 58  // { int sys_readlink(const char *path, char *buf, \
-	SYS_EXECVE         = 59  // { int sys_execve(const char *path, \
-	SYS_UMASK          = 60  // { mode_t sys_umask(mode_t newmask); }
-	SYS_CHROOT         = 61  // { int sys_chroot(const char *path); }
-	SYS_GETFSSTAT      = 62  // { int sys_getfsstat(struct statfs *buf, size_t bufsize, \
-	SYS_STATFS         = 63  // { int sys_statfs(const char *path, \
-	SYS_FSTATFS        = 64  // { int sys_fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS       = 65  // { int sys_fhstatfs(const fhandle_t *fhp, \
-	SYS_VFORK          = 66  // { int sys_vfork(void); }
-	SYS_GETTIMEOFDAY   = 67  // { int sys_gettimeofday(struct timeval *tp, \
-	SYS_SETTIMEOFDAY   = 68  // { int sys_settimeofday(const struct timeval *tv, \
-	SYS_SETITIMER      = 69  // { int sys_setitimer(int which, \
-	SYS_GETITIMER      = 70  // { int sys_getitimer(int which, \
-	SYS_SELECT         = 71  // { int sys_select(int nd, fd_set *in, fd_set *ou, \
-	SYS_KEVENT         = 72  // { int sys_kevent(int fd, \
-	SYS_MUNMAP         = 73  // { int sys_munmap(void *addr, size_t len); }
-	SYS_MPROTECT       = 74  // { int sys_mprotect(void *addr, size_t len, \
-	SYS_MADVISE        = 75  // { int sys_madvise(void *addr, size_t len, \
-	SYS_UTIMES         = 76  // { int sys_utimes(const char *path, \
-	SYS_FUTIMES        = 77  // { int sys_futimes(int fd, \
-	SYS_MINCORE        = 78  // { int sys_mincore(void *addr, size_t len, \
-	SYS_GETGROUPS      = 79  // { int sys_getgroups(int gidsetsize, \
-	SYS_SETGROUPS      = 80  // { int sys_setgroups(int gidsetsize, \
-	SYS_GETPGRP        = 81  // { int sys_getpgrp(void); }
-	SYS_SETPGID        = 82  // { int sys_setpgid(pid_t pid, int pgid); }
-	SYS_UTIMENSAT      = 84  // { int sys_utimensat(int fd, const char *path, \
-	SYS_FUTIMENS       = 85  // { int sys_futimens(int fd, \
-	SYS_CLOCK_GETTIME  = 87  // { int sys_clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME  = 88  // { int sys_clock_settime(clockid_t clock_id, \
-	SYS_CLOCK_GETRES   = 89  // { int sys_clock_getres(clockid_t clock_id, \
-	SYS_DUP2           = 90  // { int sys_dup2(int from, int to); }
-	SYS_NANOSLEEP      = 91  // { int sys_nanosleep(const struct timespec *rqtp, \
-	SYS_FCNTL          = 92  // { int sys_fcntl(int fd, int cmd, ... void *arg); }
-	SYS___THRSLEEP     = 94  // { int sys___thrsleep(const volatile void *ident, \
-	SYS_FSYNC          = 95  // { int sys_fsync(int fd); }
-	SYS_SETPRIORITY    = 96  // { int sys_setpriority(int which, id_t who, int prio); }
-	SYS_SOCKET         = 97  // { int sys_socket(int domain, int type, int protocol); }
-	SYS_CONNECT        = 98  // { int sys_connect(int s, const struct sockaddr *name, \
-	SYS_GETDENTS       = 99  // { int sys_getdents(int fd, void *buf, size_t buflen); }
-	SYS_GETPRIORITY    = 100 // { int sys_getpriority(int which, id_t who); }
-	SYS_SIGRETURN      = 103 // { int sys_sigreturn(struct sigcontext *sigcntxp); }
-	SYS_BIND           = 104 // { int sys_bind(int s, const struct sockaddr *name, \
-	SYS_SETSOCKOPT     = 105 // { int sys_setsockopt(int s, int level, int name, \
-	SYS_LISTEN         = 106 // { int sys_listen(int s, int backlog); }
-	SYS_PPOLL          = 109 // { int sys_ppoll(struct pollfd *fds, \
-	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, \
-	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
-	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, \
-	SYS_READV          = 120 // { ssize_t sys_readv(int fd, \
-	SYS_WRITEV         = 121 // { ssize_t sys_writev(int fd, \
-	SYS_FCHOWN         = 123 // { int sys_fchown(int fd, uid_t uid, gid_t gid); }
-	SYS_FCHMOD         = 124 // { int sys_fchmod(int fd, mode_t mode); }
-	SYS_SETREUID       = 126 // { int sys_setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID       = 127 // { int sys_setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME         = 128 // { int sys_rename(const char *from, const char *to); }
-	SYS_FLOCK          = 131 // { int sys_flock(int fd, int how); }
-	SYS_MKFIFO         = 132 // { int sys_mkfifo(const char *path, mode_t mode); }
-	SYS_SENDTO         = 133 // { ssize_t sys_sendto(int s, const void *buf, \
-	SYS_SHUTDOWN       = 134 // { int sys_shutdown(int s, int how); }
-	SYS_SOCKETPAIR     = 135 // { int sys_socketpair(int domain, int type, \
-	SYS_MKDIR          = 136 // { int sys_mkdir(const char *path, mode_t mode); }
-	SYS_RMDIR          = 137 // { int sys_rmdir(const char *path); }
-	SYS_ADJTIME        = 140 // { int sys_adjtime(const struct timeval *delta, \
-	SYS_SETSID         = 147 // { int sys_setsid(void); }
-	SYS_QUOTACTL       = 148 // { int sys_quotactl(const char *path, int cmd, \
-	SYS_NFSSVC         = 155 // { int sys_nfssvc(int flag, void *argp); }
-	SYS_GETFH          = 161 // { int sys_getfh(const char *fname, fhandle_t *fhp); }
-	SYS_SYSARCH        = 165 // { int sys_sysarch(int op, void *parms); }
-	SYS_PREAD          = 173 // { ssize_t sys_pread(int fd, void *buf, \
-	SYS_PWRITE         = 174 // { ssize_t sys_pwrite(int fd, const void *buf, \
-	SYS_SETGID         = 181 // { int sys_setgid(gid_t gid); }
-	SYS_SETEGID        = 182 // { int sys_setegid(gid_t egid); }
-	SYS_SETEUID        = 183 // { int sys_seteuid(uid_t euid); }
-	SYS_PATHCONF       = 191 // { long sys_pathconf(const char *path, int name); }
-	SYS_FPATHCONF      = 192 // { long sys_fpathconf(int fd, int name); }
-	SYS_SWAPCTL        = 193 // { int sys_swapctl(int cmd, const void *arg, int misc); }
-	SYS_GETRLIMIT      = 194 // { int sys_getrlimit(int which, \
-	SYS_SETRLIMIT      = 195 // { int sys_setrlimit(int which, \
-	SYS_MMAP           = 197 // { void *sys_mmap(void *addr, size_t len, int prot, \
-	SYS_LSEEK          = 199 // { off_t sys_lseek(int fd, int pad, off_t offset, \
-	SYS_TRUNCATE       = 200 // { int sys_truncate(const char *path, int pad, \
-	SYS_FTRUNCATE      = 201 // { int sys_ftruncate(int fd, int pad, off_t length); }
-	SYS___SYSCTL       = 202 // { int sys___sysctl(const int *name, u_int namelen, \
-	SYS_MLOCK          = 203 // { int sys_mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK        = 204 // { int sys_munlock(const void *addr, size_t len); }
-	SYS_GETPGID        = 207 // { pid_t sys_getpgid(pid_t pid); }
-	SYS_UTRACE         = 209 // { int sys_utrace(const char *label, const void *addr, \
-	SYS_SEMGET         = 221 // { int sys_semget(key_t key, int nsems, int semflg); }
-	SYS_MSGGET         = 225 // { int sys_msgget(key_t key, int msgflg); }
-	SYS_MSGSND         = 226 // { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, \
-	SYS_MSGRCV         = 227 // { int sys_msgrcv(int msqid, void *msgp, size_t msgsz, \
-	SYS_SHMAT          = 228 // { void *sys_shmat(int shmid, const void *shmaddr, \
-	SYS_SHMDT          = 230 // { int sys_shmdt(const void *shmaddr); }
-	SYS_MINHERIT       = 250 // { int sys_minherit(void *addr, size_t len, \
-	SYS_POLL           = 252 // { int sys_poll(struct pollfd *fds, \
-	SYS_ISSETUGID      = 253 // { int sys_issetugid(void); }
-	SYS_LCHOWN         = 254 // { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS_GETSID         = 255 // { pid_t sys_getsid(pid_t pid); }
-	SYS_MSYNC          = 256 // { int sys_msync(void *addr, size_t len, int flags); }
-	SYS_PIPE           = 263 // { int sys_pipe(int *fdp); }
-	SYS_FHOPEN         = 264 // { int sys_fhopen(const fhandle_t *fhp, int flags); }
-	SYS_PREADV         = 267 // { ssize_t sys_preadv(int fd, \
-	SYS_PWRITEV        = 268 // { ssize_t sys_pwritev(int fd, \
-	SYS_KQUEUE         = 269 // { int sys_kqueue(void); }
-	SYS_MLOCKALL       = 271 // { int sys_mlockall(int flags); }
-	SYS_MUNLOCKALL     = 272 // { int sys_munlockall(void); }
-	SYS_GETRESUID      = 281 // { int sys_getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_SETRESUID      = 282 // { int sys_setresuid(uid_t ruid, uid_t euid, \
-	SYS_GETRESGID      = 283 // { int sys_getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_SETRESGID      = 284 // { int sys_setresgid(gid_t rgid, gid_t egid, \
-	SYS_MQUERY         = 286 // { void *sys_mquery(void *addr, size_t len, int prot, \
-	SYS_CLOSEFROM      = 287 // { int sys_closefrom(int fd); }
-	SYS_SIGALTSTACK    = 288 // { int sys_sigaltstack(const struct sigaltstack *nss, \
-	SYS_SHMGET         = 289 // { int sys_shmget(key_t key, size_t size, int shmflg); }
-	SYS_SEMOP          = 290 // { int sys_semop(int semid, struct sembuf *sops, \
-	SYS_FHSTAT         = 294 // { int sys_fhstat(const fhandle_t *fhp, \
-	SYS___SEMCTL       = 295 // { int sys___semctl(int semid, int semnum, int cmd, \
-	SYS_SHMCTL         = 296 // { int sys_shmctl(int shmid, int cmd, \
-	SYS_MSGCTL         = 297 // { int sys_msgctl(int msqid, int cmd, \
-	SYS_SCHED_YIELD    = 298 // { int sys_sched_yield(void); }
-	SYS_GETTHRID       = 299 // { pid_t sys_getthrid(void); }
-	SYS___THRWAKEUP    = 301 // { int sys___thrwakeup(const volatile void *ident, \
-	SYS___THREXIT      = 302 // { void sys___threxit(pid_t *notdead); }
-	SYS___THRSIGDIVERT = 303 // { int sys___thrsigdivert(sigset_t sigmask, \
-	SYS___GETCWD       = 304 // { int sys___getcwd(char *buf, size_t len); }
-	SYS_ADJFREQ        = 305 // { int sys_adjfreq(const int64_t *freq, \
-	SYS_SETRTABLE      = 310 // { int sys_setrtable(int rtableid); }
-	SYS_GETRTABLE      = 311 // { int sys_getrtable(void); }
-	SYS_FACCESSAT      = 313 // { int sys_faccessat(int fd, const char *path, \
-	SYS_FCHMODAT       = 314 // { int sys_fchmodat(int fd, const char *path, \
-	SYS_FCHOWNAT       = 315 // { int sys_fchownat(int fd, const char *path, \
-	SYS_LINKAT         = 317 // { int sys_linkat(int fd1, const char *path1, int fd2, \
-	SYS_MKDIRAT        = 318 // { int sys_mkdirat(int fd, const char *path, \
-	SYS_MKFIFOAT       = 319 // { int sys_mkfifoat(int fd, const char *path, \
-	SYS_MKNODAT        = 320 // { int sys_mknodat(int fd, const char *path, \
-	SYS_OPENAT         = 321 // { int sys_openat(int fd, const char *path, int flags, \
-	SYS_READLINKAT     = 322 // { ssize_t sys_readlinkat(int fd, const char *path, \
-	SYS_RENAMEAT       = 323 // { int sys_renameat(int fromfd, const char *from, \
-	SYS_SYMLINKAT      = 324 // { int sys_symlinkat(const char *path, int fd, \
-	SYS_UNLINKAT       = 325 // { int sys_unlinkat(int fd, const char *path, \
-	SYS___SET_TCB      = 329 // { void sys___set_tcb(void *tcb); }
-	SYS___GET_TCB      = 330 // { void *sys___get_tcb(void); }
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
deleted file mode 100644
index bd28146ddd..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// mksysnum_openbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build amd64,openbsd
-
-package unix
-
-const (
-	SYS_EXIT           = 1   // { void sys_exit(int rval); }
-	SYS_FORK           = 2   // { int sys_fork(void); }
-	SYS_READ           = 3   // { ssize_t sys_read(int fd, void *buf, size_t nbyte); }
-	SYS_WRITE          = 4   // { ssize_t sys_write(int fd, const void *buf, \
-	SYS_OPEN           = 5   // { int sys_open(const char *path, \
-	SYS_CLOSE          = 6   // { int sys_close(int fd); }
-	SYS___TFORK        = 8   // { int sys___tfork(const struct __tfork *param, \
-	SYS_LINK           = 9   // { int sys_link(const char *path, const char *link); }
-	SYS_UNLINK         = 10  // { int sys_unlink(const char *path); }
-	SYS_WAIT4          = 11  // { pid_t sys_wait4(pid_t pid, int *status, \
-	SYS_CHDIR          = 12  // { int sys_chdir(const char *path); }
-	SYS_FCHDIR         = 13  // { int sys_fchdir(int fd); }
-	SYS_MKNOD          = 14  // { int sys_mknod(const char *path, mode_t mode, \
-	SYS_CHMOD          = 15  // { int sys_chmod(const char *path, mode_t mode); }
-	SYS_CHOWN          = 16  // { int sys_chown(const char *path, uid_t uid, \
-	SYS_OBREAK         = 17  // { int sys_obreak(char *nsize); } break
-	SYS_GETDTABLECOUNT = 18  // { int sys_getdtablecount(void); }
-	SYS_GETRUSAGE      = 19  // { int sys_getrusage(int who, \
-	SYS_GETPID         = 20  // { pid_t sys_getpid(void); }
-	SYS_MOUNT          = 21  // { int sys_mount(const char *type, const char *path, \
-	SYS_UNMOUNT        = 22  // { int sys_unmount(const char *path, int flags); }
-	SYS_SETUID         = 23  // { int sys_setuid(uid_t uid); }
-	SYS_GETUID         = 24  // { uid_t sys_getuid(void); }
-	SYS_GETEUID        = 25  // { uid_t sys_geteuid(void); }
-	SYS_PTRACE         = 26  // { int sys_ptrace(int req, pid_t pid, caddr_t addr, \
-	SYS_RECVMSG        = 27  // { ssize_t sys_recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG        = 28  // { ssize_t sys_sendmsg(int s, \
-	SYS_RECVFROM       = 29  // { ssize_t sys_recvfrom(int s, void *buf, size_t len, \
-	SYS_ACCEPT         = 30  // { int sys_accept(int s, struct sockaddr *name, \
-	SYS_GETPEERNAME    = 31  // { int sys_getpeername(int fdes, struct sockaddr *asa, \
-	SYS_GETSOCKNAME    = 32  // { int sys_getsockname(int fdes, struct sockaddr *asa, \
-	SYS_ACCESS         = 33  // { int sys_access(const char *path, int flags); }
-	SYS_CHFLAGS        = 34  // { int sys_chflags(const char *path, u_int flags); }
-	SYS_FCHFLAGS       = 35  // { int sys_fchflags(int fd, u_int flags); }
-	SYS_SYNC           = 36  // { void sys_sync(void); }
-	SYS_KILL           = 37  // { int sys_kill(int pid, int signum); }
-	SYS_STAT           = 38  // { int sys_stat(const char *path, struct stat *ub); }
-	SYS_GETPPID        = 39  // { pid_t sys_getppid(void); }
-	SYS_LSTAT          = 40  // { int sys_lstat(const char *path, struct stat *ub); }
-	SYS_DUP            = 41  // { int sys_dup(int fd); }
-	SYS_FSTATAT        = 42  // { int sys_fstatat(int fd, const char *path, \
-	SYS_GETEGID        = 43  // { gid_t sys_getegid(void); }
-	SYS_PROFIL         = 44  // { int sys_profil(caddr_t samples, size_t size, \
-	SYS_KTRACE         = 45  // { int sys_ktrace(const char *fname, int ops, \
-	SYS_SIGACTION      = 46  // { int sys_sigaction(int signum, \
-	SYS_GETGID         = 47  // { gid_t sys_getgid(void); }
-	SYS_SIGPROCMASK    = 48  // { int sys_sigprocmask(int how, sigset_t mask); }
-	SYS_GETLOGIN       = 49  // { int sys_getlogin(char *namebuf, u_int namelen); }
-	SYS_SETLOGIN       = 50  // { int sys_setlogin(const char *namebuf); }
-	SYS_ACCT           = 51  // { int sys_acct(const char *path); }
-	SYS_SIGPENDING     = 52  // { int sys_sigpending(void); }
-	SYS_FSTAT          = 53  // { int sys_fstat(int fd, struct stat *sb); }
-	SYS_IOCTL          = 54  // { int sys_ioctl(int fd, \
-	SYS_REBOOT         = 55  // { int sys_reboot(int opt); }
-	SYS_REVOKE         = 56  // { int sys_revoke(const char *path); }
-	SYS_SYMLINK        = 57  // { int sys_symlink(const char *path, \
-	SYS_READLINK       = 58  // { int sys_readlink(const char *path, char *buf, \
-	SYS_EXECVE         = 59  // { int sys_execve(const char *path, \
-	SYS_UMASK          = 60  // { mode_t sys_umask(mode_t newmask); }
-	SYS_CHROOT         = 61  // { int sys_chroot(const char *path); }
-	SYS_GETFSSTAT      = 62  // { int sys_getfsstat(struct statfs *buf, size_t bufsize, \
-	SYS_STATFS         = 63  // { int sys_statfs(const char *path, \
-	SYS_FSTATFS        = 64  // { int sys_fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS       = 65  // { int sys_fhstatfs(const fhandle_t *fhp, \
-	SYS_VFORK          = 66  // { int sys_vfork(void); }
-	SYS_GETTIMEOFDAY   = 67  // { int sys_gettimeofday(struct timeval *tp, \
-	SYS_SETTIMEOFDAY   = 68  // { int sys_settimeofday(const struct timeval *tv, \
-	SYS_SETITIMER      = 69  // { int sys_setitimer(int which, \
-	SYS_GETITIMER      = 70  // { int sys_getitimer(int which, \
-	SYS_SELECT         = 71  // { int sys_select(int nd, fd_set *in, fd_set *ou, \
-	SYS_KEVENT         = 72  // { int sys_kevent(int fd, \
-	SYS_MUNMAP         = 73  // { int sys_munmap(void *addr, size_t len); }
-	SYS_MPROTECT       = 74  // { int sys_mprotect(void *addr, size_t len, \
-	SYS_MADVISE        = 75  // { int sys_madvise(void *addr, size_t len, \
-	SYS_UTIMES         = 76  // { int sys_utimes(const char *path, \
-	SYS_FUTIMES        = 77  // { int sys_futimes(int fd, \
-	SYS_MINCORE        = 78  // { int sys_mincore(void *addr, size_t len, \
-	SYS_GETGROUPS      = 79  // { int sys_getgroups(int gidsetsize, \
-	SYS_SETGROUPS      = 80  // { int sys_setgroups(int gidsetsize, \
-	SYS_GETPGRP        = 81  // { int sys_getpgrp(void); }
-	SYS_SETPGID        = 82  // { int sys_setpgid(pid_t pid, int pgid); }
-	SYS_UTIMENSAT      = 84  // { int sys_utimensat(int fd, const char *path, \
-	SYS_FUTIMENS       = 85  // { int sys_futimens(int fd, \
-	SYS_CLOCK_GETTIME  = 87  // { int sys_clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME  = 88  // { int sys_clock_settime(clockid_t clock_id, \
-	SYS_CLOCK_GETRES   = 89  // { int sys_clock_getres(clockid_t clock_id, \
-	SYS_DUP2           = 90  // { int sys_dup2(int from, int to); }
-	SYS_NANOSLEEP      = 91  // { int sys_nanosleep(const struct timespec *rqtp, \
-	SYS_FCNTL          = 92  // { int sys_fcntl(int fd, int cmd, ... void *arg); }
-	SYS___THRSLEEP     = 94  // { int sys___thrsleep(const volatile void *ident, \
-	SYS_FSYNC          = 95  // { int sys_fsync(int fd); }
-	SYS_SETPRIORITY    = 96  // { int sys_setpriority(int which, id_t who, int prio); }
-	SYS_SOCKET         = 97  // { int sys_socket(int domain, int type, int protocol); }
-	SYS_CONNECT        = 98  // { int sys_connect(int s, const struct sockaddr *name, \
-	SYS_GETDENTS       = 99  // { int sys_getdents(int fd, void *buf, size_t buflen); }
-	SYS_GETPRIORITY    = 100 // { int sys_getpriority(int which, id_t who); }
-	SYS_SIGRETURN      = 103 // { int sys_sigreturn(struct sigcontext *sigcntxp); }
-	SYS_BIND           = 104 // { int sys_bind(int s, const struct sockaddr *name, \
-	SYS_SETSOCKOPT     = 105 // { int sys_setsockopt(int s, int level, int name, \
-	SYS_LISTEN         = 106 // { int sys_listen(int s, int backlog); }
-	SYS_PPOLL          = 109 // { int sys_ppoll(struct pollfd *fds, \
-	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, \
-	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
-	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, \
-	SYS_READV          = 120 // { ssize_t sys_readv(int fd, \
-	SYS_WRITEV         = 121 // { ssize_t sys_writev(int fd, \
-	SYS_FCHOWN         = 123 // { int sys_fchown(int fd, uid_t uid, gid_t gid); }
-	SYS_FCHMOD         = 124 // { int sys_fchmod(int fd, mode_t mode); }
-	SYS_SETREUID       = 126 // { int sys_setreuid(uid_t ruid, uid_t euid); }
-	SYS_SETREGID       = 127 // { int sys_setregid(gid_t rgid, gid_t egid); }
-	SYS_RENAME         = 128 // { int sys_rename(const char *from, const char *to); }
-	SYS_FLOCK          = 131 // { int sys_flock(int fd, int how); }
-	SYS_MKFIFO         = 132 // { int sys_mkfifo(const char *path, mode_t mode); }
-	SYS_SENDTO         = 133 // { ssize_t sys_sendto(int s, const void *buf, \
-	SYS_SHUTDOWN       = 134 // { int sys_shutdown(int s, int how); }
-	SYS_SOCKETPAIR     = 135 // { int sys_socketpair(int domain, int type, \
-	SYS_MKDIR          = 136 // { int sys_mkdir(const char *path, mode_t mode); }
-	SYS_RMDIR          = 137 // { int sys_rmdir(const char *path); }
-	SYS_ADJTIME        = 140 // { int sys_adjtime(const struct timeval *delta, \
-	SYS_SETSID         = 147 // { int sys_setsid(void); }
-	SYS_QUOTACTL       = 148 // { int sys_quotactl(const char *path, int cmd, \
-	SYS_NFSSVC         = 155 // { int sys_nfssvc(int flag, void *argp); }
-	SYS_GETFH          = 161 // { int sys_getfh(const char *fname, fhandle_t *fhp); }
-	SYS_SYSARCH        = 165 // { int sys_sysarch(int op, void *parms); }
-	SYS_PREAD          = 173 // { ssize_t sys_pread(int fd, void *buf, \
-	SYS_PWRITE         = 174 // { ssize_t sys_pwrite(int fd, const void *buf, \
-	SYS_SETGID         = 181 // { int sys_setgid(gid_t gid); }
-	SYS_SETEGID        = 182 // { int sys_setegid(gid_t egid); }
-	SYS_SETEUID        = 183 // { int sys_seteuid(uid_t euid); }
-	SYS_PATHCONF       = 191 // { long sys_pathconf(const char *path, int name); }
-	SYS_FPATHCONF      = 192 // { long sys_fpathconf(int fd, int name); }
-	SYS_SWAPCTL        = 193 // { int sys_swapctl(int cmd, const void *arg, int misc); }
-	SYS_GETRLIMIT      = 194 // { int sys_getrlimit(int which, \
-	SYS_SETRLIMIT      = 195 // { int sys_setrlimit(int which, \
-	SYS_MMAP           = 197 // { void *sys_mmap(void *addr, size_t len, int prot, \
-	SYS_LSEEK          = 199 // { off_t sys_lseek(int fd, int pad, off_t offset, \
-	SYS_TRUNCATE       = 200 // { int sys_truncate(const char *path, int pad, \
-	SYS_FTRUNCATE      = 201 // { int sys_ftruncate(int fd, int pad, off_t length); }
-	SYS___SYSCTL       = 202 // { int sys___sysctl(const int *name, u_int namelen, \
-	SYS_MLOCK          = 203 // { int sys_mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK        = 204 // { int sys_munlock(const void *addr, size_t len); }
-	SYS_GETPGID        = 207 // { pid_t sys_getpgid(pid_t pid); }
-	SYS_UTRACE         = 209 // { int sys_utrace(const char *label, const void *addr, \
-	SYS_SEMGET         = 221 // { int sys_semget(key_t key, int nsems, int semflg); }
-	SYS_MSGGET         = 225 // { int sys_msgget(key_t key, int msgflg); }
-	SYS_MSGSND         = 226 // { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, \
-	SYS_MSGRCV         = 227 // { int sys_msgrcv(int msqid, void *msgp, size_t msgsz, \
-	SYS_SHMAT          = 228 // { void *sys_shmat(int shmid, const void *shmaddr, \
-	SYS_SHMDT          = 230 // { int sys_shmdt(const void *shmaddr); }
-	SYS_MINHERIT       = 250 // { int sys_minherit(void *addr, size_t len, \
-	SYS_POLL           = 252 // { int sys_poll(struct pollfd *fds, \
-	SYS_ISSETUGID      = 253 // { int sys_issetugid(void); }
-	SYS_LCHOWN         = 254 // { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
-	SYS_GETSID         = 255 // { pid_t sys_getsid(pid_t pid); }
-	SYS_MSYNC          = 256 // { int sys_msync(void *addr, size_t len, int flags); }
-	SYS_PIPE           = 263 // { int sys_pipe(int *fdp); }
-	SYS_FHOPEN         = 264 // { int sys_fhopen(const fhandle_t *fhp, int flags); }
-	SYS_PREADV         = 267 // { ssize_t sys_preadv(int fd, \
-	SYS_PWRITEV        = 268 // { ssize_t sys_pwritev(int fd, \
-	SYS_KQUEUE         = 269 // { int sys_kqueue(void); }
-	SYS_MLOCKALL       = 271 // { int sys_mlockall(int flags); }
-	SYS_MUNLOCKALL     = 272 // { int sys_munlockall(void); }
-	SYS_GETRESUID      = 281 // { int sys_getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_SETRESUID      = 282 // { int sys_setresuid(uid_t ruid, uid_t euid, \
-	SYS_GETRESGID      = 283 // { int sys_getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_SETRESGID      = 284 // { int sys_setresgid(gid_t rgid, gid_t egid, \
-	SYS_MQUERY         = 286 // { void *sys_mquery(void *addr, size_t len, int prot, \
-	SYS_CLOSEFROM      = 287 // { int sys_closefrom(int fd); }
-	SYS_SIGALTSTACK    = 288 // { int sys_sigaltstack(const struct sigaltstack *nss, \
-	SYS_SHMGET         = 289 // { int sys_shmget(key_t key, size_t size, int shmflg); }
-	SYS_SEMOP          = 290 // { int sys_semop(int semid, struct sembuf *sops, \
-	SYS_FHSTAT         = 294 // { int sys_fhstat(const fhandle_t *fhp, \
-	SYS___SEMCTL       = 295 // { int sys___semctl(int semid, int semnum, int cmd, \
-	SYS_SHMCTL         = 296 // { int sys_shmctl(int shmid, int cmd, \
-	SYS_MSGCTL         = 297 // { int sys_msgctl(int msqid, int cmd, \
-	SYS_SCHED_YIELD    = 298 // { int sys_sched_yield(void); }
-	SYS_GETTHRID       = 299 // { pid_t sys_getthrid(void); }
-	SYS___THRWAKEUP    = 301 // { int sys___thrwakeup(const volatile void *ident, \
-	SYS___THREXIT      = 302 // { void sys___threxit(pid_t *notdead); }
-	SYS___THRSIGDIVERT = 303 // { int sys___thrsigdivert(sigset_t sigmask, \
-	SYS___GETCWD       = 304 // { int sys___getcwd(char *buf, size_t len); }
-	SYS_ADJFREQ        = 305 // { int sys_adjfreq(const int64_t *freq, \
-	SYS_SETRTABLE      = 310 // { int sys_setrtable(int rtableid); }
-	SYS_GETRTABLE      = 311 // { int sys_getrtable(void); }
-	SYS_FACCESSAT      = 313 // { int sys_faccessat(int fd, const char *path, \
-	SYS_FCHMODAT       = 314 // { int sys_fchmodat(int fd, const char *path, \
-	SYS_FCHOWNAT       = 315 // { int sys_fchownat(int fd, const char *path, \
-	SYS_LINKAT         = 317 // { int sys_linkat(int fd1, const char *path1, int fd2, \
-	SYS_MKDIRAT        = 318 // { int sys_mkdirat(int fd, const char *path, \
-	SYS_MKFIFOAT       = 319 // { int sys_mkfifoat(int fd, const char *path, \
-	SYS_MKNODAT        = 320 // { int sys_mknodat(int fd, const char *path, \
-	SYS_OPENAT         = 321 // { int sys_openat(int fd, const char *path, int flags, \
-	SYS_READLINKAT     = 322 // { ssize_t sys_readlinkat(int fd, const char *path, \
-	SYS_RENAMEAT       = 323 // { int sys_renameat(int fromfd, const char *from, \
-	SYS_SYMLINKAT      = 324 // { int sys_symlinkat(const char *path, int fd, \
-	SYS_UNLINKAT       = 325 // { int sys_unlinkat(int fd, const char *path, \
-	SYS___SET_TCB      = 329 // { void sys___set_tcb(void *tcb); }
-	SYS___GET_TCB      = 330 // { void *sys___get_tcb(void); }
-)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
deleted file mode 100644
index c708659859..0000000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,solaris
-
-package unix
-
-// TODO(aram): remove these before Go 1.3.
-const (
-	SYS_EXECVE = 59
-	SYS_FCNTL  = 62
-)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
deleted file mode 100644
index 2de1d44e28..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
+++ /dev/null
@@ -1,447 +0,0 @@
-// +build 386,darwin
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Timeval32 struct{}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           int32
-	Mode          uint16
-	Nlink         uint16
-	Ino           uint64
-	Uid           uint32
-	Gid           uint32
-	Rdev          int32
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       int32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Qspare        [2]int64
-}
-
-type Statfs_t struct {
-	Bsize       uint32
-	Iosize      int32
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      uint64
-	Files       uint64
-	Ffree       uint64
-	Fsid        Fsid
-	Owner       uint32
-	Type        uint32
-	Flags       uint32
-	Fssubtype   uint32
-	Fstypename  [16]int8
-	Mntonname   [1024]int8
-	Mntfromname [1024]int8
-	Reserved    [8]uint32
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Fstore_t struct {
-	Flags      uint32
-	Posmode    int32
-	Offset     int64
-	Length     int64
-	Bytesalloc int64
-}
-
-type Radvisory_t struct {
-	Offset int64
-	Count  int32
-}
-
-type Fbootstraptransfer_t struct {
-	Offset int64
-	Length uint32
-	Buffer *byte
-}
-
-type Log2phys_t struct {
-	Flags       uint32
-	Contigbytes int64
-	Devoffset   int64
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type Dirent struct {
-	Ino       uint64
-	Seekoff   uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [1024]int8
-	Pad_cgo_0 [3]byte
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  uint32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet4Pktinfo     = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint32
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int32
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-const (
-	SizeofIfMsghdr    = 0x70
-	SizeofIfData      = 0x60
-	SizeofIfaMsghdr   = 0x14
-	SizeofIfmaMsghdr  = 0x10
-	SizeofIfmaMsghdr2 = 0x14
-	SizeofRtMsghdr    = 0x5c
-	SizeofRtMetrics   = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Typelen    uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Recvquota  uint8
-	Xmitquota  uint8
-	Unused1    uint8
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint32
-	Ipackets   uint32
-	Ierrors    uint32
-	Opackets   uint32
-	Oerrors    uint32
-	Collisions uint32
-	Ibytes     uint32
-	Obytes     uint32
-	Imcasts    uint32
-	Omcasts    uint32
-	Iqdrops    uint32
-	Noproto    uint32
-	Recvtiming uint32
-	Xmittiming uint32
-	Lastchange Timeval
-	Unused2    uint32
-	Hwassist   uint32
-	Reserved1  uint32
-	Reserved2  uint32
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfmaMsghdr2 struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Refcount  int32
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   int32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-	Filler   [4]uint32
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x8
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
deleted file mode 100644
index 044657878c..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
+++ /dev/null
@@ -1,462 +0,0 @@
-// +build amd64,darwin
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Timeval32 struct {
-	Sec  int32
-	Usec int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           int32
-	Mode          uint16
-	Nlink         uint16
-	Ino           uint64
-	Uid           uint32
-	Gid           uint32
-	Rdev          int32
-	Pad_cgo_0     [4]byte
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       int32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Qspare        [2]int64
-}
-
-type Statfs_t struct {
-	Bsize       uint32
-	Iosize      int32
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      uint64
-	Files       uint64
-	Ffree       uint64
-	Fsid        Fsid
-	Owner       uint32
-	Type        uint32
-	Flags       uint32
-	Fssubtype   uint32
-	Fstypename  [16]int8
-	Mntonname   [1024]int8
-	Mntfromname [1024]int8
-	Reserved    [8]uint32
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Fstore_t struct {
-	Flags      uint32
-	Posmode    int32
-	Offset     int64
-	Length     int64
-	Bytesalloc int64
-}
-
-type Radvisory_t struct {
-	Offset    int64
-	Count     int32
-	Pad_cgo_0 [4]byte
-}
-
-type Fbootstraptransfer_t struct {
-	Offset int64
-	Length uint64
-	Buffer *byte
-}
-
-type Log2phys_t struct {
-	Flags     uint32
-	Pad_cgo_0 [8]byte
-	Pad_cgo_1 [8]byte
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type Dirent struct {
-	Ino       uint64
-	Seekoff   uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [1024]int8
-	Pad_cgo_0 [3]byte
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     int32
-	Pad_cgo_1  [4]byte
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  uint32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet4Pktinfo     = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-const (
-	SizeofIfMsghdr    = 0x70
-	SizeofIfData      = 0x60
-	SizeofIfaMsghdr   = 0x14
-	SizeofIfmaMsghdr  = 0x10
-	SizeofIfmaMsghdr2 = 0x14
-	SizeofRtMsghdr    = 0x5c
-	SizeofRtMetrics   = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Typelen    uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Recvquota  uint8
-	Xmitquota  uint8
-	Unused1    uint8
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint32
-	Ipackets   uint32
-	Ierrors    uint32
-	Opackets   uint32
-	Oerrors    uint32
-	Collisions uint32
-	Ibytes     uint32
-	Obytes     uint32
-	Imcasts    uint32
-	Omcasts    uint32
-	Iqdrops    uint32
-	Noproto    uint32
-	Recvtiming uint32
-	Xmittiming uint32
-	Lastchange Timeval32
-	Unused2    uint32
-	Hwassist   uint32
-	Reserved1  uint32
-	Reserved2  uint32
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfmaMsghdr2 struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Refcount  int32
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   int32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-	Filler   [4]uint32
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval32
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type Termios struct {
-	Iflag     uint64
-	Oflag     uint64
-	Cflag     uint64
-	Lflag     uint64
-	Cc        [20]uint8
-	Pad_cgo_0 [4]byte
-	Ispeed    uint64
-	Ospeed    uint64
-}
-
-const (
-	AT_FDCWD            = -0x2
-	AT_SYMLINK_NOFOLLOW = 0x20
-)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
deleted file mode 100644
index 66df363ce5..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
+++ /dev/null
@@ -1,449 +0,0 @@
-// NOTE: cgo can't generate struct Stat_t and struct Statfs_t yet
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
-
-// +build arm,darwin
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Timeval32 [0]byte
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           int32
-	Mode          uint16
-	Nlink         uint16
-	Ino           uint64
-	Uid           uint32
-	Gid           uint32
-	Rdev          int32
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       int32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Qspare        [2]int64
-}
-
-type Statfs_t struct {
-	Bsize       uint32
-	Iosize      int32
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      uint64
-	Files       uint64
-	Ffree       uint64
-	Fsid        Fsid
-	Owner       uint32
-	Type        uint32
-	Flags       uint32
-	Fssubtype   uint32
-	Fstypename  [16]int8
-	Mntonname   [1024]int8
-	Mntfromname [1024]int8
-	Reserved    [8]uint32
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Fstore_t struct {
-	Flags      uint32
-	Posmode    int32
-	Offset     int64
-	Length     int64
-	Bytesalloc int64
-}
-
-type Radvisory_t struct {
-	Offset int64
-	Count  int32
-}
-
-type Fbootstraptransfer_t struct {
-	Offset int64
-	Length uint32
-	Buffer *byte
-}
-
-type Log2phys_t struct {
-	Flags       uint32
-	Contigbytes int64
-	Devoffset   int64
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type Dirent struct {
-	Ino       uint64
-	Seekoff   uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [1024]int8
-	Pad_cgo_0 [3]byte
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  uint32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet4Pktinfo     = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint32
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int32
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-const (
-	SizeofIfMsghdr    = 0x70
-	SizeofIfData      = 0x60
-	SizeofIfaMsghdr   = 0x14
-	SizeofIfmaMsghdr  = 0x10
-	SizeofIfmaMsghdr2 = 0x14
-	SizeofRtMsghdr    = 0x5c
-	SizeofRtMetrics   = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Typelen    uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Recvquota  uint8
-	Xmitquota  uint8
-	Unused1    uint8
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint32
-	Ipackets   uint32
-	Ierrors    uint32
-	Opackets   uint32
-	Oerrors    uint32
-	Collisions uint32
-	Ibytes     uint32
-	Obytes     uint32
-	Imcasts    uint32
-	Omcasts    uint32
-	Iqdrops    uint32
-	Noproto    uint32
-	Recvtiming uint32
-	Xmittiming uint32
-	Lastchange Timeval
-	Unused2    uint32
-	Hwassist   uint32
-	Reserved1  uint32
-	Reserved2  uint32
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfmaMsghdr2 struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Refcount  int32
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   int32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-	Filler   [4]uint32
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x8
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
deleted file mode 100644
index 85d56eabd3..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
+++ /dev/null
@@ -1,457 +0,0 @@
-// +build arm64,darwin
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Timeval32 struct {
-	Sec  int32
-	Usec int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           int32
-	Mode          uint16
-	Nlink         uint16
-	Ino           uint64
-	Uid           uint32
-	Gid           uint32
-	Rdev          int32
-	Pad_cgo_0     [4]byte
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       int32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Qspare        [2]int64
-}
-
-type Statfs_t struct {
-	Bsize       uint32
-	Iosize      int32
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      uint64
-	Files       uint64
-	Ffree       uint64
-	Fsid        Fsid
-	Owner       uint32
-	Type        uint32
-	Flags       uint32
-	Fssubtype   uint32
-	Fstypename  [16]int8
-	Mntonname   [1024]int8
-	Mntfromname [1024]int8
-	Reserved    [8]uint32
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Fstore_t struct {
-	Flags      uint32
-	Posmode    int32
-	Offset     int64
-	Length     int64
-	Bytesalloc int64
-}
-
-type Radvisory_t struct {
-	Offset    int64
-	Count     int32
-	Pad_cgo_0 [4]byte
-}
-
-type Fbootstraptransfer_t struct {
-	Offset int64
-	Length uint64
-	Buffer *byte
-}
-
-type Log2phys_t struct {
-	Flags     uint32
-	Pad_cgo_0 [8]byte
-	Pad_cgo_1 [8]byte
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type Dirent struct {
-	Ino       uint64
-	Seekoff   uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [1024]int8
-	Pad_cgo_0 [3]byte
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     int32
-	Pad_cgo_1  [4]byte
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  uint32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet4Pktinfo     = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-const (
-	SizeofIfMsghdr    = 0x70
-	SizeofIfData      = 0x60
-	SizeofIfaMsghdr   = 0x14
-	SizeofIfmaMsghdr  = 0x10
-	SizeofIfmaMsghdr2 = 0x14
-	SizeofRtMsghdr    = 0x5c
-	SizeofRtMetrics   = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Typelen    uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Recvquota  uint8
-	Xmitquota  uint8
-	Unused1    uint8
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint32
-	Ipackets   uint32
-	Ierrors    uint32
-	Opackets   uint32
-	Oerrors    uint32
-	Collisions uint32
-	Ibytes     uint32
-	Obytes     uint32
-	Imcasts    uint32
-	Omcasts    uint32
-	Iqdrops    uint32
-	Noproto    uint32
-	Recvtiming uint32
-	Xmittiming uint32
-	Lastchange Timeval32
-	Unused2    uint32
-	Hwassist   uint32
-	Reserved1  uint32
-	Reserved2  uint32
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfmaMsghdr2 struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Refcount  int32
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   int32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-	Filler   [4]uint32
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval32
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type Termios struct {
-	Iflag     uint64
-	Oflag     uint64
-	Cflag     uint64
-	Lflag     uint64
-	Cc        [20]uint8
-	Pad_cgo_0 [4]byte
-	Ispeed    uint64
-	Ospeed    uint64
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
deleted file mode 100644
index 8a6f4e1ce3..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
+++ /dev/null
@@ -1,443 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_dragonfly.go
-
-// +build amd64,dragonfly
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur int64
-	Max int64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Ino      uint64
-	Nlink    uint32
-	Dev      uint32
-	Mode     uint16
-	Padding1 uint16
-	Uid      uint32
-	Gid      uint32
-	Rdev     uint32
-	Atim     Timespec
-	Mtim     Timespec
-	Ctim     Timespec
-	Size     int64
-	Blocks   int64
-	Blksize  uint32
-	Flags    uint32
-	Gen      uint32
-	Lspare   int32
-	Qspare1  int64
-	Qspare2  int64
-}
-
-type Statfs_t struct {
-	Spare2      int64
-	Bsize       int64
-	Iosize      int64
-	Blocks      int64
-	Bfree       int64
-	Bavail      int64
-	Files       int64
-	Ffree       int64
-	Fsid        Fsid
-	Owner       uint32
-	Type        int32
-	Flags       int32
-	Pad_cgo_0   [4]byte
-	Syncwrites  int64
-	Asyncwrites int64
-	Fstypename  [16]int8
-	Mntonname   [80]int8
-	Syncreads   int64
-	Asyncreads  int64
-	Spares1     int16
-	Mntfromname [80]int8
-	Spares2     int16
-	Pad_cgo_1   [4]byte
-	Spare       [2]int64
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno  uint64
-	Namlen  uint16
-	Type    uint8
-	Unused1 uint8
-	Unused2 uint32
-	Name    [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-	Rcf    uint16
-	Route  [16]uint16
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     int32
-	Pad_cgo_1  [4]byte
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x36
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [16]uint64
-}
-
-const (
-	SizeofIfMsghdr         = 0xb0
-	SizeofIfData           = 0xa0
-	SizeofIfaMsghdr        = 0x14
-	SizeofIfmaMsghdr       = 0x10
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x98
-	SizeofRtMetrics        = 0x70
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Physical   uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Recvquota  uint8
-	Xmitquota  uint8
-	Pad_cgo_0  [2]byte
-	Mtu        uint64
-	Metric     uint64
-	Link_state uint64
-	Baudrate   uint64
-	Ipackets   uint64
-	Ierrors    uint64
-	Opackets   uint64
-	Oerrors    uint64
-	Collisions uint64
-	Ibytes     uint64
-	Obytes     uint64
-	Imcasts    uint64
-	Omcasts    uint64
-	Iqdrops    uint64
-	Noproto    uint64
-	Hwassist   uint64
-	Unused     uint64
-	Lastchange Timeval
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint64
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks     uint64
-	Mtu       uint64
-	Pksent    uint64
-	Expire    uint64
-	Sendpipe  uint64
-	Ssthresh  uint64
-	Rtt       uint64
-	Rttvar    uint64
-	Recvpipe  uint64
-	Hopcount  uint64
-	Mssopt    uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Msl       uint64
-	Iwmaxsegs uint64
-	Iwcapsegs uint64
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x20
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [6]byte
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
deleted file mode 100644
index 8cf30947b4..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
+++ /dev/null
@@ -1,502 +0,0 @@
-// +build 386,freebsd
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur int64
-	Max int64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Dev           uint32
-	Ino           uint32
-	Mode          uint16
-	Nlink         uint16
-	Uid           uint32
-	Gid           uint32
-	Rdev          uint32
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       uint32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Birthtimespec Timespec
-	Pad_cgo_0     [8]byte
-}
-
-type Statfs_t struct {
-	Version     uint32
-	Type        uint32
-	Flags       uint64
-	Bsize       uint64
-	Iosize      uint64
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      int64
-	Files       uint64
-	Ffree       int64
-	Syncwrites  uint64
-	Asyncwrites uint64
-	Syncreads   uint64
-	Asyncreads  uint64
-	Spare       [10]uint64
-	Namemax     uint32
-	Owner       uint32
-	Fsid        Fsid
-	Charspare   [80]int8
-	Fstypename  [16]int8
-	Mntfromname [88]int8
-	Mntonname   [88]int8
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-	Sysid  int32
-}
-
-type Dirent struct {
-	Fileno uint32
-	Reclen uint16
-	Type   uint8
-	Namlen uint8
-	Name   [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [46]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x36
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPMreqn          = 0xc
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint32
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int32
-	Udata  *byte
-}
-
-type FdSet struct {
-	X__fds_bits [32]uint32
-}
-
-const (
-	sizeofIfMsghdr         = 0x64
-	SizeofIfMsghdr         = 0x60
-	sizeofIfData           = 0x54
-	SizeofIfData           = 0x50
-	SizeofIfaMsghdr        = 0x14
-	SizeofIfmaMsghdr       = 0x10
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x5c
-	SizeofRtMetrics        = 0x38
-)
-
-type ifMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      ifData
-}
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type ifData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Vhid        uint8
-	Baudrate_pf uint8
-	Datalen     uint8
-	Mtu         uint32
-	Metric      uint32
-	Baudrate    uint32
-	Ipackets    uint32
-	Ierrors     uint32
-	Opackets    uint32
-	Oerrors     uint32
-	Collisions  uint32
-	Ibytes      uint32
-	Obytes      uint32
-	Imcasts     uint32
-	Omcasts     uint32
-	Iqdrops     uint32
-	Noproto     uint32
-	Hwassist    uint64
-	Epoch       int32
-	Lastchange  Timeval
-}
-
-type IfData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Spare_char1 uint8
-	Spare_char2 uint8
-	Datalen     uint8
-	Mtu         uint32
-	Metric      uint32
-	Baudrate    uint32
-	Ipackets    uint32
-	Ierrors     uint32
-	Opackets    uint32
-	Oerrors     uint32
-	Collisions  uint32
-	Ibytes      uint32
-	Obytes      uint32
-	Imcasts     uint32
-	Omcasts     uint32
-	Iqdrops     uint32
-	Noproto     uint32
-	Hwassist    uint32
-	Epoch       int32
-	Lastchange  Timeval
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Fmask     int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   uint32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-	Weight   uint32
-	Filler   [3]uint32
-}
-
-const (
-	SizeofBpfVersion    = 0x4
-	SizeofBpfStat       = 0x8
-	SizeofBpfZbuf       = 0xc
-	SizeofBpfProgram    = 0x8
-	SizeofBpfInsn       = 0x8
-	SizeofBpfHdr        = 0x14
-	SizeofBpfZbufHeader = 0x20
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfZbuf struct {
-	Bufa   *byte
-	Bufb   *byte
-	Buflen uint32
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type BpfZbufHeader struct {
-	Kernel_gen uint32
-	Kernel_len uint32
-	User_gen   uint32
-	X_bzh_pad  [5]uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
deleted file mode 100644
index e5feb207be..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
+++ /dev/null
@@ -1,505 +0,0 @@
-// +build amd64,freebsd
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur int64
-	Max int64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Dev           uint32
-	Ino           uint32
-	Mode          uint16
-	Nlink         uint16
-	Uid           uint32
-	Gid           uint32
-	Rdev          uint32
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       uint32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Birthtimespec Timespec
-}
-
-type Statfs_t struct {
-	Version     uint32
-	Type        uint32
-	Flags       uint64
-	Bsize       uint64
-	Iosize      uint64
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      int64
-	Files       uint64
-	Ffree       int64
-	Syncwrites  uint64
-	Asyncwrites uint64
-	Syncreads   uint64
-	Asyncreads  uint64
-	Spare       [10]uint64
-	Namemax     uint32
-	Owner       uint32
-	Fsid        Fsid
-	Charspare   [80]int8
-	Fstypename  [16]int8
-	Mntfromname [88]int8
-	Mntonname   [88]int8
-}
-
-type Flock_t struct {
-	Start     int64
-	Len       int64
-	Pid       int32
-	Type      int16
-	Whence    int16
-	Sysid     int32
-	Pad_cgo_0 [4]byte
-}
-
-type Dirent struct {
-	Fileno uint32
-	Reclen uint16
-	Type   uint8
-	Namlen uint8
-	Name   [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [46]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     int32
-	Pad_cgo_1  [4]byte
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x36
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPMreqn          = 0xc
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	X__fds_bits [16]uint64
-}
-
-const (
-	sizeofIfMsghdr         = 0xa8
-	SizeofIfMsghdr         = 0xa8
-	sizeofIfData           = 0x98
-	SizeofIfData           = 0x98
-	SizeofIfaMsghdr        = 0x14
-	SizeofIfmaMsghdr       = 0x10
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x98
-	SizeofRtMetrics        = 0x70
-)
-
-type ifMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      ifData
-}
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type ifData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Vhid        uint8
-	Baudrate_pf uint8
-	Datalen     uint8
-	Mtu         uint64
-	Metric      uint64
-	Baudrate    uint64
-	Ipackets    uint64
-	Ierrors     uint64
-	Opackets    uint64
-	Oerrors     uint64
-	Collisions  uint64
-	Ibytes      uint64
-	Obytes      uint64
-	Imcasts     uint64
-	Omcasts     uint64
-	Iqdrops     uint64
-	Noproto     uint64
-	Hwassist    uint64
-	Epoch       int64
-	Lastchange  Timeval
-}
-
-type IfData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Spare_char1 uint8
-	Spare_char2 uint8
-	Datalen     uint8
-	Mtu         uint64
-	Metric      uint64
-	Baudrate    uint64
-	Ipackets    uint64
-	Ierrors     uint64
-	Opackets    uint64
-	Oerrors     uint64
-	Collisions  uint64
-	Ibytes      uint64
-	Obytes      uint64
-	Imcasts     uint64
-	Omcasts     uint64
-	Iqdrops     uint64
-	Noproto     uint64
-	Hwassist    uint64
-	Epoch       int64
-	Lastchange  Timeval
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Fmask     int32
-	Inits     uint64
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint64
-	Mtu      uint64
-	Hopcount uint64
-	Expire   uint64
-	Recvpipe uint64
-	Sendpipe uint64
-	Ssthresh uint64
-	Rtt      uint64
-	Rttvar   uint64
-	Pksent   uint64
-	Weight   uint64
-	Filler   [3]uint64
-}
-
-const (
-	SizeofBpfVersion    = 0x4
-	SizeofBpfStat       = 0x8
-	SizeofBpfZbuf       = 0x18
-	SizeofBpfProgram    = 0x10
-	SizeofBpfInsn       = 0x8
-	SizeofBpfHdr        = 0x20
-	SizeofBpfZbufHeader = 0x20
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfZbuf struct {
-	Bufa   *byte
-	Bufb   *byte
-	Buflen uint64
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [6]byte
-}
-
-type BpfZbufHeader struct {
-	Kernel_gen uint32
-	Kernel_len uint32
-	User_gen   uint32
-	X_bzh_pad  [5]uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
deleted file mode 100644
index 5472b54284..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
+++ /dev/null
@@ -1,497 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -fsigned-char types_freebsd.go
-
-// +build arm,freebsd
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec       int64
-	Nsec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur int64
-	Max int64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Dev           uint32
-	Ino           uint32
-	Mode          uint16
-	Nlink         uint16
-	Uid           uint32
-	Gid           uint32
-	Rdev          uint32
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       uint32
-	Flags         uint32
-	Gen           uint32
-	Lspare        int32
-	Birthtimespec Timespec
-}
-
-type Statfs_t struct {
-	Version     uint32
-	Type        uint32
-	Flags       uint64
-	Bsize       uint64
-	Iosize      uint64
-	Blocks      uint64
-	Bfree       uint64
-	Bavail      int64
-	Files       uint64
-	Ffree       int64
-	Syncwrites  uint64
-	Asyncwrites uint64
-	Syncreads   uint64
-	Asyncreads  uint64
-	Spare       [10]uint64
-	Namemax     uint32
-	Owner       uint32
-	Fsid        Fsid
-	Charspare   [80]int8
-	Fstypename  [16]int8
-	Mntfromname [88]int8
-	Mntonname   [88]int8
-}
-
-type Flock_t struct {
-	Start     int64
-	Len       int64
-	Pid       int32
-	Type      int16
-	Whence    int16
-	Sysid     int32
-	Pad_cgo_0 [4]byte
-}
-
-type Dirent struct {
-	Fileno uint32
-	Reclen uint16
-	Type   uint8
-	Namlen uint8
-	Name   [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [46]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x36
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPMreqn          = 0xc
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint32
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int32
-	Udata  *byte
-}
-
-type FdSet struct {
-	X__fds_bits [32]uint32
-}
-
-const (
-	sizeofIfMsghdr         = 0x70
-	SizeofIfMsghdr         = 0x70
-	sizeofIfData           = 0x60
-	SizeofIfData           = 0x60
-	SizeofIfaMsghdr        = 0x14
-	SizeofIfmaMsghdr       = 0x10
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x5c
-	SizeofRtMetrics        = 0x38
-)
-
-type ifMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      ifData
-}
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type ifData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Vhid        uint8
-	Baudrate_pf uint8
-	Datalen     uint8
-	Mtu         uint32
-	Metric      uint32
-	Baudrate    uint32
-	Ipackets    uint32
-	Ierrors     uint32
-	Opackets    uint32
-	Oerrors     uint32
-	Collisions  uint32
-	Ibytes      uint32
-	Obytes      uint32
-	Imcasts     uint32
-	Omcasts     uint32
-	Iqdrops     uint32
-	Noproto     uint32
-	Hwassist    uint64
-	Epoch       int64
-	Lastchange  Timeval
-}
-
-type IfData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Spare_char1 uint8
-	Spare_char2 uint8
-	Datalen     uint8
-	Mtu         uint32
-	Metric      uint32
-	Baudrate    uint32
-	Ipackets    uint32
-	Ierrors     uint32
-	Opackets    uint32
-	Oerrors     uint32
-	Collisions  uint32
-	Ibytes      uint32
-	Obytes      uint32
-	Imcasts     uint32
-	Omcasts     uint32
-	Iqdrops     uint32
-	Noproto     uint32
-	Hwassist    uint32
-	Pad_cgo_0   [4]byte
-	Epoch       int64
-	Lastchange  Timeval
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Fmask     int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   uint32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-	Weight   uint32
-	Filler   [3]uint32
-}
-
-const (
-	SizeofBpfVersion    = 0x4
-	SizeofBpfStat       = 0x8
-	SizeofBpfZbuf       = 0xc
-	SizeofBpfProgram    = 0x8
-	SizeofBpfInsn       = 0x8
-	SizeofBpfHdr        = 0x20
-	SizeofBpfZbufHeader = 0x20
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfZbuf struct {
-	Bufa   *byte
-	Bufb   *byte
-	Buflen uint32
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [6]byte
-}
-
-type BpfZbufHeader struct {
-	Kernel_gen uint32
-	Kernel_len uint32
-	User_gen   uint32
-	X_bzh_pad  [5]uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
deleted file mode 100644
index 7333755be4..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
+++ /dev/null
@@ -1,668 +0,0 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 linux/types.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build 386,linux
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Timex struct {
-	Modes     uint32
-	Offset    int32
-	Freq      int32
-	Maxerror  int32
-	Esterror  int32
-	Status    int32
-	Constant  int32
-	Precision int32
-	Tolerance int32
-	Time      Timeval
-	Tick      int32
-	Ppsfreq   int32
-	Jitter    int32
-	Shift     int32
-	Stabil    int32
-	Jitcnt    int32
-	Calcnt    int32
-	Errcnt    int32
-	Stbcnt    int32
-	Tai       int32
-	Pad_cgo_0 [44]byte
-}
-
-type Time_t int32
-
-type Tms struct {
-	Utime  int32
-	Stime  int32
-	Cutime int32
-	Cstime int32
-}
-
-type Utimbuf struct {
-	Actime  int32
-	Modtime int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev       uint64
-	X__pad1   uint16
-	Pad_cgo_0 [2]byte
-	X__st_ino uint32
-	Mode      uint32
-	Nlink     uint32
-	Uid       uint32
-	Gid       uint32
-	Rdev      uint64
-	X__pad2   uint16
-	Pad_cgo_1 [2]byte
-	Size      int64
-	Blksize   int32
-	Blocks    int64
-	Atim      Timespec
-	Mtim      Timespec
-	Ctim      Timespec
-	Ino       uint64
-}
-
-type Statfs_t struct {
-	Type    int32
-	Bsize   int32
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int32
-	Frsize  int32
-	Flags   int32
-	Spare   [4]int32
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [1]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type   int16
-	Whence int16
-	Start  int64
-	Len    int64
-	Pid    int32
-}
-
-type FscryptPolicy struct {
-	Version                   uint8
-	Contents_encryption_mode  uint8
-	Filenames_encryption_mode uint8
-	Flags                     uint8
-	Master_key_descriptor     [8]uint8
-}
-
-type FscryptKey struct {
-	Mode uint32
-	Raw  [64]uint8
-	Size uint32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
-}
-
-type RawSockaddrALG struct {
-	Family uint16
-	Type   [14]uint8
-	Feat   uint32
-	Mask   uint32
-	Name   [64]uint8
-}
-
-type RawSockaddrVM struct {
-	Family    uint16
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-	Zero      [4]uint8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     uint32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofSockaddrCAN       = 0x10
-	SizeofSockaddrALG       = 0x58
-	SizeofSockaddrVM        = 0x10
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x1c
-	SizeofCmsghdr           = 0xc
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2b
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x8
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Ebx      int32
-	Ecx      int32
-	Edx      int32
-	Esi      int32
-	Edi      int32
-	Ebp      int32
-	Eax      int32
-	Xds      int32
-	Xes      int32
-	Xfs      int32
-	Xgs      int32
-	Orig_eax int32
-	Eip      int32
-	Xcs      int32
-	Eflags   int32
-	Esp      int32
-	Xss      int32
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-type Sysinfo_t struct {
-	Uptime    int32
-	Loads     [3]uint32
-	Totalram  uint32
-	Freeram   uint32
-	Sharedram uint32
-	Bufferram uint32
-	Totalswap uint32
-	Freeswap  uint32
-	Procs     uint16
-	Pad       uint16
-	Totalhigh uint32
-	Freehigh  uint32
-	Unit      uint32
-	X_f       [8]int8
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree  int32
-	Tinode uint32
-	Fname  [6]int8
-	Fpack  [6]int8
-}
-
-type EpollEvent struct {
-	Events uint32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLIN    = 0x1
-	POLLPRI   = 0x2
-	POLLOUT   = 0x4
-	POLLRDHUP = 0x2000
-	POLLERR   = 0x8
-	POLLHUP   = 0x10
-	POLLNVAL  = 0x20
-)
-
-type Sigset_t struct {
-	X__val [32]uint32
-}
-
-const _SC_PAGESIZE = 0x1e
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [19]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
deleted file mode 100644
index 5807e17479..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
+++ /dev/null
@@ -1,686 +0,0 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 linux/types.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build amd64,linux
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev     uint64
-	Ino     uint64
-	Nlink   uint64
-	Mode    uint32
-	Uid     uint32
-	Gid     uint32
-	X__pad0 int32
-	Rdev    uint64
-	Size    int64
-	Blksize int64
-	Blocks  int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	_       [3]int64
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-type FscryptPolicy struct {
-	Version                   uint8
-	Contents_encryption_mode  uint8
-	Filenames_encryption_mode uint8
-	Flags                     uint8
-	Master_key_descriptor     [8]uint8
-}
-
-type FscryptKey struct {
-	Mode uint32
-	Raw  [64]uint8
-	Size uint32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
-}
-
-type RawSockaddrALG struct {
-	Family uint16
-	Type   [14]uint8
-	Feat   uint32
-	Mask   uint32
-	Name   [64]uint8
-}
-
-type RawSockaddrVM struct {
-	Family    uint16
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-	Zero      [4]uint8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofSockaddrCAN       = 0x10
-	SizeofSockaddrALG       = 0x58
-	SizeofSockaddrVM        = 0x10
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2b
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	R15      uint64
-	R14      uint64
-	R13      uint64
-	R12      uint64
-	Rbp      uint64
-	Rbx      uint64
-	R11      uint64
-	R10      uint64
-	R9       uint64
-	R8       uint64
-	Rax      uint64
-	Rcx      uint64
-	Rdx      uint64
-	Rsi      uint64
-	Rdi      uint64
-	Orig_rax uint64
-	Rip      uint64
-	Cs       uint64
-	Eflags   uint64
-	Rsp      uint64
-	Ss       uint64
-	Fs_base  uint64
-	Gs_base  uint64
-	Ds       uint64
-	Es       uint64
-	Fs       uint64
-	Gs       uint64
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events uint32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLIN    = 0x1
-	POLLPRI   = 0x2
-	POLLOUT   = 0x4
-	POLLRDHUP = 0x2000
-	POLLERR   = 0x8
-	POLLHUP   = 0x10
-	POLLNVAL  = 0x20
-)
-
-type Sigset_t struct {
-	X__val [16]uint64
-}
-
-const _SC_PAGESIZE = 0x1e
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [19]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
deleted file mode 100644
index db7c8bfaed..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
+++ /dev/null
@@ -1,657 +0,0 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build arm,linux
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Timex struct {
-	Modes     uint32
-	Offset    int32
-	Freq      int32
-	Maxerror  int32
-	Esterror  int32
-	Status    int32
-	Constant  int32
-	Precision int32
-	Tolerance int32
-	Time      Timeval
-	Tick      int32
-	Ppsfreq   int32
-	Jitter    int32
-	Shift     int32
-	Stabil    int32
-	Jitcnt    int32
-	Calcnt    int32
-	Errcnt    int32
-	Stbcnt    int32
-	Tai       int32
-	Pad_cgo_0 [44]byte
-}
-
-type Time_t int32
-
-type Tms struct {
-	Utime  int32
-	Stime  int32
-	Cutime int32
-	Cstime int32
-}
-
-type Utimbuf struct {
-	Actime  int32
-	Modtime int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev       uint64
-	X__pad1   uint16
-	Pad_cgo_0 [2]byte
-	X__st_ino uint32
-	Mode      uint32
-	Nlink     uint32
-	Uid       uint32
-	Gid       uint32
-	Rdev      uint64
-	X__pad2   uint16
-	Pad_cgo_1 [6]byte
-	Size      int64
-	Blksize   int32
-	Pad_cgo_2 [4]byte
-	Blocks    int64
-	Atim      Timespec
-	Mtim      Timespec
-	Ctim      Timespec
-	Ino       uint64
-}
-
-type Statfs_t struct {
-	Type      int32
-	Bsize     int32
-	Blocks    uint64
-	Bfree     uint64
-	Bavail    uint64
-	Files     uint64
-	Ffree     uint64
-	Fsid      Fsid
-	Namelen   int32
-	Frsize    int32
-	Flags     int32
-	Spare     [4]int32
-	Pad_cgo_0 [4]byte
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]uint8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-type FscryptPolicy struct {
-	Version                   uint8
-	Contents_encryption_mode  uint8
-	Filenames_encryption_mode uint8
-	Flags                     uint8
-	Master_key_descriptor     [8]uint8
-}
-
-type FscryptKey struct {
-	Mode uint32
-	Raw  [64]uint8
-	Size uint32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
-}
-
-type RawSockaddrALG struct {
-	Family uint16
-	Type   [14]uint8
-	Feat   uint32
-	Mask   uint32
-	Name   [64]uint8
-}
-
-type RawSockaddrVM struct {
-	Family    uint16
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-	Zero      [4]uint8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]uint8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]uint8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     uint32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofSockaddrCAN       = 0x10
-	SizeofSockaddrALG       = 0x58
-	SizeofSockaddrVM        = 0x10
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x1c
-	SizeofCmsghdr           = 0xc
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2b
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x8
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Uregs [18]uint32
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-type Sysinfo_t struct {
-	Uptime    int32
-	Loads     [3]uint32
-	Totalram  uint32
-	Freeram   uint32
-	Sharedram uint32
-	Bufferram uint32
-	Totalswap uint32
-	Freeswap  uint32
-	Procs     uint16
-	Pad       uint16
-	Totalhigh uint32
-	Freehigh  uint32
-	Unit      uint32
-	X_f       [8]uint8
-}
-
-type Utsname struct {
-	Sysname    [65]uint8
-	Nodename   [65]uint8
-	Release    [65]uint8
-	Version    [65]uint8
-	Machine    [65]uint8
-	Domainname [65]uint8
-}
-
-type Ustat_t struct {
-	Tfree  int32
-	Tinode uint32
-	Fname  [6]uint8
-	Fpack  [6]uint8
-}
-
-type EpollEvent struct {
-	Events uint32
-	PadFd  int32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLIN    = 0x1
-	POLLPRI   = 0x2
-	POLLOUT   = 0x4
-	POLLRDHUP = 0x2000
-	POLLERR   = 0x8
-	POLLHUP   = 0x10
-	POLLNVAL  = 0x20
-)
-
-type Sigset_t struct {
-	X__val [32]uint32
-}
-
-const _SC_PAGESIZE = 0x1e
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [19]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
deleted file mode 100644
index 19cca4f004..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
+++ /dev/null
@@ -1,665 +0,0 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char linux/types.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build arm64,linux
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev     uint64
-	Ino     uint64
-	Mode    uint32
-	Nlink   uint32
-	Uid     uint32
-	Gid     uint32
-	Rdev    uint64
-	X__pad1 uint64
-	Size    int64
-	Blksize int32
-	X__pad2 int32
-	Blocks  int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	_       [2]int32
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-type FscryptPolicy struct {
-	Version                   uint8
-	Contents_encryption_mode  uint8
-	Filenames_encryption_mode uint8
-	Flags                     uint8
-	Master_key_descriptor     [8]uint8
-}
-
-type FscryptKey struct {
-	Mode uint32
-	Raw  [64]uint8
-	Size uint32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
-}
-
-type RawSockaddrALG struct {
-	Family uint16
-	Type   [14]uint8
-	Feat   uint32
-	Mask   uint32
-	Name   [64]uint8
-}
-
-type RawSockaddrVM struct {
-	Family    uint16
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-	Zero      [4]uint8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofSockaddrCAN       = 0x10
-	SizeofSockaddrALG       = 0x58
-	SizeofSockaddrVM        = 0x10
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2b
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Regs   [31]uint64
-	Sp     uint64
-	Pc     uint64
-	Pstate uint64
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events uint32
-	PadFd  int32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLIN    = 0x1
-	POLLPRI   = 0x2
-	POLLOUT   = 0x4
-	POLLRDHUP = 0x2000
-	POLLERR   = 0x8
-	POLLHUP   = 0x10
-	POLLNVAL  = 0x20
-)
-
-type Sigset_t struct {
-	X__val [16]uint64
-}
-
-const _SC_PAGESIZE = 0x1e
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [19]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
deleted file mode 100644
index d04ca4c22b..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
+++ /dev/null
@@ -1,666 +0,0 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build mips,linux
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Timex struct {
-	Modes     uint32
-	Offset    int32
-	Freq      int32
-	Maxerror  int32
-	Esterror  int32
-	Status    int32
-	Constant  int32
-	Precision int32
-	Tolerance int32
-	Time      Timeval
-	Tick      int32
-	Ppsfreq   int32
-	Jitter    int32
-	Shift     int32
-	Stabil    int32
-	Jitcnt    int32
-	Calcnt    int32
-	Errcnt    int32
-	Stbcnt    int32
-	Tai       int32
-	Pad_cgo_0 [44]byte
-}
-
-type Time_t int32
-
-type Tms struct {
-	Utime  int32
-	Stime  int32
-	Cutime int32
-	Cstime int32
-}
-
-type Utimbuf struct {
-	Actime  int32
-	Modtime int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev     uint32
-	Pad1    [3]int32
-	Ino     uint64
-	Mode    uint32
-	Nlink   uint32
-	Uid     uint32
-	Gid     uint32
-	Rdev    uint32
-	Pad2    [3]int32
-	Size    int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	Blksize int32
-	Pad4    int32
-	Blocks  int64
-	Pad5    [14]int32
-}
-
-type Statfs_t struct {
-	Type      int32
-	Bsize     int32
-	Frsize    int32
-	Pad_cgo_0 [4]byte
-	Blocks    uint64
-	Bfree     uint64
-	Files     uint64
-	Ffree     uint64
-	Bavail    uint64
-	Fsid      Fsid
-	Namelen   int32
-	Flags     int32
-	Spare     [5]int32
-	Pad_cgo_1 [4]byte
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-type FscryptPolicy struct {
-	Version                   uint8
-	Contents_encryption_mode  uint8
-	Filenames_encryption_mode uint8
-	Flags                     uint8
-	Master_key_descriptor     [8]uint8
-}
-
-type FscryptKey struct {
-	Mode uint32
-	Raw  [64]uint8
-	Size uint32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
-}
-
-type RawSockaddrALG struct {
-	Family uint16
-	Type   [14]uint8
-	Feat   uint32
-	Mask   uint32
-	Name   [64]uint8
-}
-
-type RawSockaddrVM struct {
-	Family    uint16
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-	Zero      [4]uint8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     uint32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofSockaddrCAN       = 0x10
-	SizeofSockaddrALG       = 0x58
-	SizeofSockaddrVM        = 0x10
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x1c
-	SizeofCmsghdr           = 0xc
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2b
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x8
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Regs        [109]uint32
-	U_tsize     uint32
-	U_dsize     uint32
-	U_ssize     uint32
-	Start_code  uint32
-	Start_data  uint32
-	Start_stack uint32
-	Signal      int32
-	U_ar0       *byte
-	Magic       uint32
-	U_comm      [32]int8
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-type Sysinfo_t struct {
-	Uptime    int32
-	Loads     [3]uint32
-	Totalram  uint32
-	Freeram   uint32
-	Sharedram uint32
-	Bufferram uint32
-	Totalswap uint32
-	Freeswap  uint32
-	Procs     uint16
-	Pad       uint16
-	Totalhigh uint32
-	Freehigh  uint32
-	Unit      uint32
-	X_f       [8]int8
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree  int32
-	Tinode uint32
-	Fname  [6]int8
-	Fpack  [6]int8
-}
-
-type EpollEvent struct {
-	Events uint32
-	PadFd  int32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLIN    = 0x1
-	POLLPRI   = 0x2
-	POLLOUT   = 0x4
-	POLLRDHUP = 0x2000
-	POLLERR   = 0x8
-	POLLHUP   = 0x10
-	POLLNVAL  = 0x20
-)
-
-type Sigset_t struct {
-	X__val [32]uint32
-}
-
-const _SC_PAGESIZE = 0x1e
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [23]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
deleted file mode 100644
index 60b83a1260..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
+++ /dev/null
@@ -1,671 +0,0 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build mips64,linux
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev     uint32
-	Pad1    [3]uint32
-	Ino     uint64
-	Mode    uint32
-	Nlink   uint32
-	Uid     uint32
-	Gid     uint32
-	Rdev    uint32
-	Pad2    [3]uint32
-	Size    int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	Blksize uint32
-	Pad4    uint32
-	Blocks  int64
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Frsize  int64
-	Blocks  uint64
-	Bfree   uint64
-	Files   uint64
-	Ffree   uint64
-	Bavail  uint64
-	Fsid    Fsid
-	Namelen int64
-	Flags   int64
-	Spare   [5]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-type FscryptPolicy struct {
-	Version                   uint8
-	Contents_encryption_mode  uint8
-	Filenames_encryption_mode uint8
-	Flags                     uint8
-	Master_key_descriptor     [8]uint8
-}
-
-type FscryptKey struct {
-	Mode uint32
-	Raw  [64]uint8
-	Size uint32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
-}
-
-type RawSockaddrALG struct {
-	Family uint16
-	Type   [14]uint8
-	Feat   uint32
-	Mask   uint32
-	Name   [64]uint8
-}
-
-type RawSockaddrVM struct {
-	Family    uint16
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-	Zero      [4]uint8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofSockaddrCAN       = 0x10
-	SizeofSockaddrALG       = 0x58
-	SizeofSockaddrVM        = 0x10
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2b
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Regs        [102]uint64
-	U_tsize     uint64
-	U_dsize     uint64
-	U_ssize     uint64
-	Start_code  uint64
-	Start_data  uint64
-	Start_stack uint64
-	Signal      int64
-	U_ar0       uint64
-	Magic       uint64
-	U_comm      [32]int8
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events uint32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLIN    = 0x1
-	POLLPRI   = 0x2
-	POLLOUT   = 0x4
-	POLLRDHUP = 0x2000
-	POLLERR   = 0x8
-	POLLHUP   = 0x10
-	POLLNVAL  = 0x20
-)
-
-type Sigset_t struct {
-	X__val [16]uint64
-}
-
-const _SC_PAGESIZE = 0x1e
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [23]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
deleted file mode 100644
index 9e9c680c25..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
+++ /dev/null
@@ -1,671 +0,0 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build mips64le,linux
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev     uint32
-	Pad1    [3]uint32
-	Ino     uint64
-	Mode    uint32
-	Nlink   uint32
-	Uid     uint32
-	Gid     uint32
-	Rdev    uint32
-	Pad2    [3]uint32
-	Size    int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	Blksize uint32
-	Pad4    uint32
-	Blocks  int64
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Frsize  int64
-	Blocks  uint64
-	Bfree   uint64
-	Files   uint64
-	Ffree   uint64
-	Bavail  uint64
-	Fsid    Fsid
-	Namelen int64
-	Flags   int64
-	Spare   [5]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-type FscryptPolicy struct {
-	Version                   uint8
-	Contents_encryption_mode  uint8
-	Filenames_encryption_mode uint8
-	Flags                     uint8
-	Master_key_descriptor     [8]uint8
-}
-
-type FscryptKey struct {
-	Mode uint32
-	Raw  [64]uint8
-	Size uint32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
-}
-
-type RawSockaddrALG struct {
-	Family uint16
-	Type   [14]uint8
-	Feat   uint32
-	Mask   uint32
-	Name   [64]uint8
-}
-
-type RawSockaddrVM struct {
-	Family    uint16
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-	Zero      [4]uint8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofSockaddrCAN       = 0x10
-	SizeofSockaddrALG       = 0x58
-	SizeofSockaddrVM        = 0x10
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2b
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Regs        [102]uint64
-	U_tsize     uint64
-	U_dsize     uint64
-	U_ssize     uint64
-	Start_code  uint64
-	Start_data  uint64
-	Start_stack uint64
-	Signal      int64
-	U_ar0       uint64
-	Magic       uint64
-	U_comm      [32]int8
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events uint32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLIN    = 0x1
-	POLLPRI   = 0x2
-	POLLOUT   = 0x4
-	POLLRDHUP = 0x2000
-	POLLERR   = 0x8
-	POLLHUP   = 0x10
-	POLLNVAL  = 0x20
-)
-
-type Sigset_t struct {
-	X__val [16]uint64
-}
-
-const _SC_PAGESIZE = 0x1e
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [23]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
deleted file mode 100644
index 482b48fdd5..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
+++ /dev/null
@@ -1,666 +0,0 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build mipsle,linux
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Timex struct {
-	Modes     uint32
-	Offset    int32
-	Freq      int32
-	Maxerror  int32
-	Esterror  int32
-	Status    int32
-	Constant  int32
-	Precision int32
-	Tolerance int32
-	Time      Timeval
-	Tick      int32
-	Ppsfreq   int32
-	Jitter    int32
-	Shift     int32
-	Stabil    int32
-	Jitcnt    int32
-	Calcnt    int32
-	Errcnt    int32
-	Stbcnt    int32
-	Tai       int32
-	Pad_cgo_0 [44]byte
-}
-
-type Time_t int32
-
-type Tms struct {
-	Utime  int32
-	Stime  int32
-	Cutime int32
-	Cstime int32
-}
-
-type Utimbuf struct {
-	Actime  int32
-	Modtime int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev     uint32
-	Pad1    [3]int32
-	Ino     uint64
-	Mode    uint32
-	Nlink   uint32
-	Uid     uint32
-	Gid     uint32
-	Rdev    uint32
-	Pad2    [3]int32
-	Size    int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	Blksize int32
-	Pad4    int32
-	Blocks  int64
-	Pad5    [14]int32
-}
-
-type Statfs_t struct {
-	Type      int32
-	Bsize     int32
-	Frsize    int32
-	Pad_cgo_0 [4]byte
-	Blocks    uint64
-	Bfree     uint64
-	Files     uint64
-	Ffree     uint64
-	Bavail    uint64
-	Fsid      Fsid
-	Namelen   int32
-	Flags     int32
-	Spare     [5]int32
-	Pad_cgo_1 [4]byte
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-type FscryptPolicy struct {
-	Version                   uint8
-	Contents_encryption_mode  uint8
-	Filenames_encryption_mode uint8
-	Flags                     uint8
-	Master_key_descriptor     [8]uint8
-}
-
-type FscryptKey struct {
-	Mode uint32
-	Raw  [64]uint8
-	Size uint32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
-}
-
-type RawSockaddrALG struct {
-	Family uint16
-	Type   [14]uint8
-	Feat   uint32
-	Mask   uint32
-	Name   [64]uint8
-}
-
-type RawSockaddrVM struct {
-	Family    uint16
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-	Zero      [4]uint8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     uint32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofSockaddrCAN       = 0x10
-	SizeofSockaddrALG       = 0x58
-	SizeofSockaddrVM        = 0x10
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x1c
-	SizeofCmsghdr           = 0xc
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2b
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x8
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Regs        [109]uint32
-	U_tsize     uint32
-	U_dsize     uint32
-	U_ssize     uint32
-	Start_code  uint32
-	Start_data  uint32
-	Start_stack uint32
-	Signal      int32
-	U_ar0       *byte
-	Magic       uint32
-	U_comm      [32]int8
-}
-
-type FdSet struct {
-	Bits [32]int32
-}
-
-type Sysinfo_t struct {
-	Uptime    int32
-	Loads     [3]uint32
-	Totalram  uint32
-	Freeram   uint32
-	Sharedram uint32
-	Bufferram uint32
-	Totalswap uint32
-	Freeswap  uint32
-	Procs     uint16
-	Pad       uint16
-	Totalhigh uint32
-	Freehigh  uint32
-	Unit      uint32
-	X_f       [8]int8
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree  int32
-	Tinode uint32
-	Fname  [6]int8
-	Fpack  [6]int8
-}
-
-type EpollEvent struct {
-	Events uint32
-	PadFd  int32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLIN    = 0x1
-	POLLPRI   = 0x2
-	POLLOUT   = 0x4
-	POLLRDHUP = 0x2000
-	POLLERR   = 0x8
-	POLLHUP   = 0x10
-	POLLNVAL  = 0x20
-)
-
-type Sigset_t struct {
-	X__val [32]uint32
-}
-
-const _SC_PAGESIZE = 0x1e
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [23]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
deleted file mode 100644
index 4410abb896..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
+++ /dev/null
@@ -1,675 +0,0 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build ppc64,linux
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev     uint64
-	Ino     uint64
-	Nlink   uint64
-	Mode    uint32
-	Uid     uint32
-	Gid     uint32
-	X__pad2 int32
-	Rdev    uint64
-	Size    int64
-	Blksize int64
-	Blocks  int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	_       uint64
-	_       uint64
-	_       uint64
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]uint8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-type FscryptPolicy struct {
-	Version                   uint8
-	Contents_encryption_mode  uint8
-	Filenames_encryption_mode uint8
-	Flags                     uint8
-	Master_key_descriptor     [8]uint8
-}
-
-type FscryptKey struct {
-	Mode uint32
-	Raw  [64]uint8
-	Size uint32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
-}
-
-type RawSockaddrALG struct {
-	Family uint16
-	Type   [14]uint8
-	Feat   uint32
-	Mask   uint32
-	Name   [64]uint8
-}
-
-type RawSockaddrVM struct {
-	Family    uint16
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-	Zero      [4]uint8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]uint8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]uint8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofSockaddrCAN       = 0x10
-	SizeofSockaddrALG       = 0x58
-	SizeofSockaddrVM        = 0x10
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2b
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Gpr       [32]uint64
-	Nip       uint64
-	Msr       uint64
-	Orig_gpr3 uint64
-	Ctr       uint64
-	Link      uint64
-	Xer       uint64
-	Ccr       uint64
-	Softe     uint64
-	Trap      uint64
-	Dar       uint64
-	Dsisr     uint64
-	Result    uint64
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]uint8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]uint8
-	Nodename   [65]uint8
-	Release    [65]uint8
-	Version    [65]uint8
-	Machine    [65]uint8
-	Domainname [65]uint8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]uint8
-	Fpack     [6]uint8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events  uint32
-	X_padFd int32
-	Fd      int32
-	Pad     int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLIN    = 0x1
-	POLLPRI   = 0x2
-	POLLOUT   = 0x4
-	POLLRDHUP = 0x2000
-	POLLERR   = 0x8
-	POLLHUP   = 0x10
-	POLLNVAL  = 0x20
-)
-
-type Sigset_t struct {
-	X__val [16]uint64
-}
-
-const _SC_PAGESIZE = 0x1e
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [19]uint8
-	Line   uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
deleted file mode 100644
index 10947c3ea9..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
+++ /dev/null
@@ -1,675 +0,0 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build ppc64le,linux
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev     uint64
-	Ino     uint64
-	Nlink   uint64
-	Mode    uint32
-	Uid     uint32
-	Gid     uint32
-	X__pad2 int32
-	Rdev    uint64
-	Size    int64
-	Blksize int64
-	Blocks  int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	_       uint64
-	_       uint64
-	_       uint64
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]uint8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
-}
-
-type FscryptPolicy struct {
-	Version                   uint8
-	Contents_encryption_mode  uint8
-	Filenames_encryption_mode uint8
-	Flags                     uint8
-	Master_key_descriptor     [8]uint8
-}
-
-type FscryptKey struct {
-	Mode uint32
-	Raw  [64]uint8
-	Size uint32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
-}
-
-type RawSockaddrALG struct {
-	Family uint16
-	Type   [14]uint8
-	Feat   uint32
-	Mask   uint32
-	Name   [64]uint8
-}
-
-type RawSockaddrVM struct {
-	Family    uint16
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-	Zero      [4]uint8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]uint8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]uint8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofSockaddrCAN       = 0x10
-	SizeofSockaddrALG       = 0x58
-	SizeofSockaddrVM        = 0x10
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2b
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Gpr       [32]uint64
-	Nip       uint64
-	Msr       uint64
-	Orig_gpr3 uint64
-	Ctr       uint64
-	Link      uint64
-	Xer       uint64
-	Ccr       uint64
-	Softe     uint64
-	Trap      uint64
-	Dar       uint64
-	Dsisr     uint64
-	Result    uint64
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]uint8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]uint8
-	Nodename   [65]uint8
-	Release    [65]uint8
-	Version    [65]uint8
-	Machine    [65]uint8
-	Domainname [65]uint8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]uint8
-	Fpack     [6]uint8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events  uint32
-	X_padFd int32
-	Fd      int32
-	Pad     int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLIN    = 0x1
-	POLLPRI   = 0x2
-	POLLOUT   = 0x4
-	POLLRDHUP = 0x2000
-	POLLERR   = 0x8
-	POLLHUP   = 0x10
-	POLLNVAL  = 0x20
-)
-
-type Sigset_t struct {
-	X__val [16]uint64
-}
-
-const _SC_PAGESIZE = 0x1e
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [19]uint8
-	Line   uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
deleted file mode 100644
index 57dbb36b48..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
+++ /dev/null
@@ -1,692 +0,0 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char linux/types.go | go run mkpost.go
-// Code generated by the command above; see README.md. DO NOT EDIT.
-
-// +build s390x,linux
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timex struct {
-	Modes     uint32
-	_         [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	_         [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	_         [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	_         [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev     uint64
-	Ino     uint64
-	Nlink   uint64
-	Mode    uint32
-	Uid     uint32
-	Gid     uint32
-	_       int32
-	Rdev    uint64
-	Size    int64
-	Atim    Timespec
-	Mtim    Timespec
-	Ctim    Timespec
-	Blksize int64
-	Blocks  int64
-	_       [3]int64
-}
-
-type Statfs_t struct {
-	Type    uint32
-	Bsize   uint32
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen uint32
-	Frsize  uint32
-	Flags   uint32
-	Spare   [4]uint32
-	_       [4]byte
-}
-
-type Dirent struct {
-	Ino    uint64
-	Off    int64
-	Reclen uint16
-	Type   uint8
-	Name   [256]int8
-	_      [5]byte
-}
-
-type Fsid struct {
-	_ [2]int32
-}
-
-type Flock_t struct {
-	Type   int16
-	Whence int16
-	_      [4]byte
-	Start  int64
-	Len    int64
-	Pid    int32
-	_      [4]byte
-}
-
-type FscryptPolicy struct {
-	Version                   uint8
-	Contents_encryption_mode  uint8
-	Filenames_encryption_mode uint8
-	Flags                     uint8
-	Master_key_descriptor     [8]uint8
-}
-
-type FscryptKey struct {
-	Mode uint32
-	Raw  [64]uint8
-	Size uint32
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x6
-	FADV_NOREUSE    = 0x7
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddrCAN struct {
-	Family  uint16
-	_       [2]byte
-	Ifindex int32
-	Addr    [8]byte
-}
-
-type RawSockaddrALG struct {
-	Family uint16
-	Type   [14]uint8
-	Feat   uint32
-	Mask   uint32
-	Name   [64]uint8
-}
-
-type RawSockaddrVM struct {
-	Family    uint16
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-	Zero      [4]uint8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	_          [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	_          [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	_              [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofSockaddrCAN       = 0x10
-	SizeofSockaddrALG       = 0x58
-	SizeofSockaddrVM        = 0x10
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2b
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family uint8
-	_      uint8
-	Type   uint16
-	Index  int32
-	Flags  uint32
-	Change uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len    uint16
-	_      [6]byte
-	Filter *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Psw                      PtracePsw
-	Gprs                     [16]uint64
-	Acrs                     [16]uint32
-	Orig_gpr2                uint64
-	Fp_regs                  PtraceFpregs
-	Per_info                 PtracePer
-	Ieee_instruction_pointer uint64
-}
-
-type PtracePsw struct {
-	Mask uint64
-	Addr uint64
-}
-
-type PtraceFpregs struct {
-	Fpc  uint32
-	_    [4]byte
-	Fprs [16]float64
-}
-
-type PtracePer struct {
-	_             [0]uint64
-	_             [24]byte
-	_             [8]byte
-	Starting_addr uint64
-	Ending_addr   uint64
-	Perc_atmid    uint16
-	_             [6]byte
-	Address       uint64
-	Access_id     uint8
-	_             [7]byte
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	_         [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	_         [0]int8
-	_         [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree  int32
-	_      [4]byte
-	Tinode uint64
-	Fname  [6]int8
-	Fpack  [6]int8
-	_      [4]byte
-}
-
-type EpollEvent struct {
-	Events uint32
-	_      int32
-	Fd     int32
-	Pad    int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLIN    = 0x1
-	POLLPRI   = 0x2
-	POLLOUT   = 0x4
-	POLLRDHUP = 0x2000
-	POLLERR   = 0x8
-	POLLHUP   = 0x10
-	POLLNVAL  = 0x20
-)
-
-type Sigset_t struct {
-	_ [16]uint64
-}
-
-const _SC_PAGESIZE = 0x1e
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [19]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
deleted file mode 100644
index 22bdab9614..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
+++ /dev/null
@@ -1,666 +0,0 @@
-// +build sparc64,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go | go run mkpost.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x1000
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Timex struct {
-	Modes     uint32
-	Pad_cgo_0 [4]byte
-	Offset    int64
-	Freq      int64
-	Maxerror  int64
-	Esterror  int64
-	Status    int32
-	Pad_cgo_1 [4]byte
-	Constant  int64
-	Precision int64
-	Tolerance int64
-	Time      Timeval
-	Tick      int64
-	Ppsfreq   int64
-	Jitter    int64
-	Shift     int32
-	Pad_cgo_2 [4]byte
-	Stabil    int64
-	Jitcnt    int64
-	Calcnt    int64
-	Errcnt    int64
-	Stbcnt    int64
-	Tai       int32
-	Pad_cgo_3 [44]byte
-}
-
-type Time_t int64
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev                uint64
-	X__pad1            uint16
-	Pad_cgo_0          [6]byte
-	Ino                uint64
-	Mode               uint32
-	Nlink              uint32
-	Uid                uint32
-	Gid                uint32
-	Rdev               uint64
-	X__pad2            uint16
-	Pad_cgo_1          [6]byte
-	Size               int64
-	Blksize            int64
-	Blocks             int64
-	Atim               Timespec
-	Mtim               Timespec
-	Ctim               Timespec
-	X__glibc_reserved4 uint64
-	X__glibc_reserved5 uint64
-}
-
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
-}
-
-type Fsid struct {
-	X__val [2]int32
-}
-
-type Flock_t struct {
-	Type              int16
-	Whence            int16
-	Pad_cgo_0         [4]byte
-	Start             int64
-	Len               int64
-	Pid               int32
-	X__glibc_reserved int16
-	Pad_cgo_1         [2]byte
-}
-
-const (
-	FADV_NORMAL     = 0x0
-	FADV_RANDOM     = 0x1
-	FADV_SEQUENTIAL = 0x2
-	FADV_WILLNEED   = 0x3
-	FADV_DONTNEED   = 0x4
-	FADV_NOREUSE    = 0x5
-)
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrLinklayer struct {
-	Family   uint16
-	Protocol uint16
-	Ifindex  int32
-	Hatype   uint16
-	Pkttype  uint8
-	Halen    uint8
-	Addr     [8]uint8
-}
-
-type RawSockaddrNetlink struct {
-	Family uint16
-	Pad    uint16
-	Pid    uint32
-	Groups uint32
-}
-
-type RawSockaddrHCI struct {
-	Family  uint16
-	Dev     uint16
-	Channel uint16
-}
-
-type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
-}
-
-type RawSockaddrALG struct {
-	Family uint16
-	Type   [14]uint8
-	Feat   uint32
-	Mask   uint32
-	Name   [64]uint8
-}
-
-type RawSockaddrVM struct {
-	Family    uint16
-	Reserved1 uint16
-	Port      uint32
-	Cid       uint32
-	Zero      [4]uint8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint64
-	Control    *byte
-	Controllen uint64
-	Flags      int32
-	Pad_cgo_1  [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint64
-	Level int32
-	Type  int32
-}
-
-type Inet4Pktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Data [8]uint32
-}
-
-type Ucred struct {
-	Pid int32
-	Uid uint32
-	Gid uint32
-}
-
-type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Pad_cgo_0      [2]byte
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
-}
-
-const (
-	SizeofSockaddrInet4     = 0x10
-	SizeofSockaddrInet6     = 0x1c
-	SizeofSockaddrAny       = 0x70
-	SizeofSockaddrUnix      = 0x6e
-	SizeofSockaddrLinklayer = 0x14
-	SizeofSockaddrNetlink   = 0xc
-	SizeofSockaddrHCI       = 0x6
-	SizeofSockaddrCAN       = 0x10
-	SizeofSockaddrALG       = 0x58
-	SizeofSockaddrVM        = 0x10
-	SizeofLinger            = 0x8
-	SizeofIPMreq            = 0x8
-	SizeofIPMreqn           = 0xc
-	SizeofIPv6Mreq          = 0x14
-	SizeofMsghdr            = 0x38
-	SizeofCmsghdr           = 0x10
-	SizeofInet4Pktinfo      = 0xc
-	SizeofInet6Pktinfo      = 0x14
-	SizeofIPv6MTUInfo       = 0x20
-	SizeofICMPv6Filter      = 0x20
-	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
-)
-
-const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2a
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
-)
-
-type NlMsghdr struct {
-	Len   uint32
-	Type  uint16
-	Flags uint16
-	Seq   uint32
-	Pid   uint32
-}
-
-type NlMsgerr struct {
-	Error int32
-	Msg   NlMsghdr
-}
-
-type RtGenmsg struct {
-	Family uint8
-}
-
-type NlAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type RtAttr struct {
-	Len  uint16
-	Type uint16
-}
-
-type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
-}
-
-type IfAddrmsg struct {
-	Family    uint8
-	Prefixlen uint8
-	Flags     uint8
-	Scope     uint8
-	Index     uint32
-}
-
-type RtMsg struct {
-	Family   uint8
-	Dst_len  uint8
-	Src_len  uint8
-	Tos      uint8
-	Table    uint8
-	Protocol uint8
-	Scope    uint8
-	Type     uint8
-	Flags    uint32
-}
-
-type RtNexthop struct {
-	Len     uint16
-	Flags   uint8
-	Hops    uint8
-	Ifindex int32
-}
-
-const (
-	SizeofSockFilter = 0x8
-	SizeofSockFprog  = 0x10
-)
-
-type SockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
-}
-
-type InotifyEvent struct {
-	Wd     int32
-	Mask   uint32
-	Cookie uint32
-	Len    uint32
-}
-
-const SizeofInotifyEvent = 0x10
-
-type PtraceRegs struct {
-	Regs   [16]uint64
-	Tstate uint64
-	Tpc    uint64
-	Tnpc   uint64
-	Y      uint32
-	Magic  uint32
-}
-
-type ptracePsw struct {
-}
-
-type ptraceFpregs struct {
-}
-
-type ptracePer struct {
-}
-
-type FdSet struct {
-	Bits [16]int64
-}
-
-type Sysinfo_t struct {
-	Uptime    int64
-	Loads     [3]uint64
-	Totalram  uint64
-	Freeram   uint64
-	Sharedram uint64
-	Bufferram uint64
-	Totalswap uint64
-	Freeswap  uint64
-	Procs     uint16
-	Pad       uint16
-	Pad_cgo_0 [4]byte
-	Totalhigh uint64
-	Freehigh  uint64
-	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
-}
-
-type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
-}
-
-type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
-}
-
-type EpollEvent struct {
-	Events  uint32
-	X_padFd int32
-	Fd      int32
-	Pad     int32
-}
-
-const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
-	AT_SYMLINK_FOLLOW   = 0x400
-	AT_SYMLINK_NOFOLLOW = 0x100
-)
-
-type PollFd struct {
-	Fd      int32
-	Events  int16
-	Revents int16
-}
-
-const (
-	POLLIN    = 0x1
-	POLLPRI   = 0x2
-	POLLOUT   = 0x4
-	POLLRDHUP = 0x800
-	POLLERR   = 0x8
-	POLLHUP   = 0x10
-	POLLNVAL  = 0x20
-)
-
-type Sigset_t struct {
-	X__val [16]uint64
-}
-
-const _SC_PAGESIZE = 0x1e
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Line   uint8
-	Cc     [19]uint8
-	Ispeed uint32
-	Ospeed uint32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
deleted file mode 100644
index caf755fb86..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
+++ /dev/null
@@ -1,396 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_netbsd.go
-
-// +build 386,netbsd
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           uint64
-	Mode          uint32
-	Ino           uint64
-	Nlink         uint32
-	Uid           uint32
-	Gid           uint32
-	Rdev          uint64
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       uint32
-	Flags         uint32
-	Gen           uint32
-	Spare         [2]uint32
-}
-
-type Statfs_t [0]byte
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno    uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [512]int8
-	Pad_cgo_0 [3]byte
-}
-
-type Fsid struct {
-	X__fsid_val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint32
-	Filter uint32
-	Flags  uint32
-	Fflags uint32
-	Data   int64
-	Udata  int32
-}
-
-type FdSet struct {
-	Bits [8]uint32
-}
-
-const (
-	SizeofIfMsghdr         = 0x98
-	SizeofIfData           = 0x84
-	SizeofIfaMsghdr        = 0x18
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x78
-	SizeofRtMetrics        = 0x50
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-	Pad_cgo_1 [4]byte
-}
-
-type IfData struct {
-	Type       uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Pad_cgo_0  [1]byte
-	Link_state int32
-	Mtu        uint64
-	Metric     uint64
-	Baudrate   uint64
-	Ipackets   uint64
-	Ierrors    uint64
-	Opackets   uint64
-	Oerrors    uint64
-	Collisions uint64
-	Ibytes     uint64
-	Obytes     uint64
-	Imcasts    uint64
-	Omcasts    uint64
-	Iqdrops    uint64
-	Noproto    uint64
-	Lastchange Timespec
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Metric    int32
-	Index     uint16
-	Pad_cgo_0 [6]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     int32
-	Pad_cgo_1 [4]byte
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint64
-	Mtu      uint64
-	Hopcount uint64
-	Recvpipe uint64
-	Sendpipe uint64
-	Ssthresh uint64
-	Rtt      uint64
-	Rttvar   uint64
-	Expire   int64
-	Pksent   int64
-}
-
-type Mclpool [0]byte
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x80
-	SizeofBpfProgram = 0x8
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv    uint64
-	Drop    uint64
-	Capt    uint64
-	Padding [13]uint64
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type BpfTimeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
-
-type Sysctlnode struct {
-	Flags           uint32
-	Num             int32
-	Name            [32]int8
-	Ver             uint32
-	X__rsvd         uint32
-	Un              [16]byte
-	X_sysctl_size   [8]byte
-	X_sysctl_func   [8]byte
-	X_sysctl_parent [8]byte
-	X_sysctl_desc   [8]byte
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
deleted file mode 100644
index 91b4a5305a..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
+++ /dev/null
@@ -1,403 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_netbsd.go
-
-// +build amd64,netbsd
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           uint64
-	Mode          uint32
-	Pad_cgo_0     [4]byte
-	Ino           uint64
-	Nlink         uint32
-	Uid           uint32
-	Gid           uint32
-	Pad_cgo_1     [4]byte
-	Rdev          uint64
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       uint32
-	Flags         uint32
-	Gen           uint32
-	Spare         [2]uint32
-	Pad_cgo_2     [4]byte
-}
-
-type Statfs_t [0]byte
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno    uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [512]int8
-	Pad_cgo_0 [3]byte
-}
-
-type Fsid struct {
-	X__fsid_val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     int32
-	Pad_cgo_1  [4]byte
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident     uint64
-	Filter    uint32
-	Flags     uint32
-	Fflags    uint32
-	Pad_cgo_0 [4]byte
-	Data      int64
-	Udata     int64
-}
-
-type FdSet struct {
-	Bits [8]uint32
-}
-
-const (
-	SizeofIfMsghdr         = 0x98
-	SizeofIfData           = 0x88
-	SizeofIfaMsghdr        = 0x18
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x78
-	SizeofRtMetrics        = 0x50
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Pad_cgo_0  [1]byte
-	Link_state int32
-	Mtu        uint64
-	Metric     uint64
-	Baudrate   uint64
-	Ipackets   uint64
-	Ierrors    uint64
-	Opackets   uint64
-	Oerrors    uint64
-	Collisions uint64
-	Ibytes     uint64
-	Obytes     uint64
-	Imcasts    uint64
-	Omcasts    uint64
-	Iqdrops    uint64
-	Noproto    uint64
-	Lastchange Timespec
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Metric    int32
-	Index     uint16
-	Pad_cgo_0 [6]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     int32
-	Pad_cgo_1 [4]byte
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint64
-	Mtu      uint64
-	Hopcount uint64
-	Recvpipe uint64
-	Sendpipe uint64
-	Ssthresh uint64
-	Rtt      uint64
-	Rttvar   uint64
-	Expire   int64
-	Pksent   int64
-}
-
-type Mclpool [0]byte
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x80
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x20
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv    uint64
-	Drop    uint64
-	Capt    uint64
-	Padding [13]uint64
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [6]byte
-}
-
-type BpfTimeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
-
-type Sysctlnode struct {
-	Flags           uint32
-	Num             int32
-	Name            [32]int8
-	Ver             uint32
-	X__rsvd         uint32
-	Un              [16]byte
-	X_sysctl_size   [8]byte
-	X_sysctl_func   [8]byte
-	X_sysctl_parent [8]byte
-	X_sysctl_desc   [8]byte
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
deleted file mode 100644
index c0758f9d3f..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
+++ /dev/null
@@ -1,401 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_netbsd.go
-
-// +build arm,netbsd
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec       int64
-	Nsec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-type Stat_t struct {
-	Dev           uint64
-	Mode          uint32
-	Pad_cgo_0     [4]byte
-	Ino           uint64
-	Nlink         uint32
-	Uid           uint32
-	Gid           uint32
-	Pad_cgo_1     [4]byte
-	Rdev          uint64
-	Atimespec     Timespec
-	Mtimespec     Timespec
-	Ctimespec     Timespec
-	Birthtimespec Timespec
-	Size          int64
-	Blocks        int64
-	Blksize       uint32
-	Flags         uint32
-	Gen           uint32
-	Spare         [2]uint32
-	Pad_cgo_2     [4]byte
-}
-
-type Statfs_t [0]byte
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno    uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [512]int8
-	Pad_cgo_0 [3]byte
-}
-
-type Fsid struct {
-	X__fsid_val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [12]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     int32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x14
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident     uint32
-	Filter    uint32
-	Flags     uint32
-	Fflags    uint32
-	Data      int64
-	Udata     int32
-	Pad_cgo_0 [4]byte
-}
-
-type FdSet struct {
-	Bits [8]uint32
-}
-
-const (
-	SizeofIfMsghdr         = 0x98
-	SizeofIfData           = 0x88
-	SizeofIfaMsghdr        = 0x18
-	SizeofIfAnnounceMsghdr = 0x18
-	SizeofRtMsghdr         = 0x78
-	SizeofRtMetrics        = 0x50
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Pad_cgo_0  [1]byte
-	Link_state int32
-	Mtu        uint64
-	Metric     uint64
-	Baudrate   uint64
-	Ipackets   uint64
-	Ierrors    uint64
-	Opackets   uint64
-	Oerrors    uint64
-	Collisions uint64
-	Ibytes     uint64
-	Obytes     uint64
-	Imcasts    uint64
-	Omcasts    uint64
-	Iqdrops    uint64
-	Noproto    uint64
-	Lastchange Timespec
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Metric    int32
-	Index     uint16
-	Pad_cgo_0 [6]byte
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Index   uint16
-	Name    [16]int8
-	What    uint16
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     int32
-	Pad_cgo_1 [4]byte
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint64
-	Mtu      uint64
-	Hopcount uint64
-	Recvpipe uint64
-	Sendpipe uint64
-	Ssthresh uint64
-	Rtt      uint64
-	Rttvar   uint64
-	Expire   int64
-	Pksent   int64
-}
-
-type Mclpool [0]byte
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x80
-	SizeofBpfProgram = 0x8
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv    uint64
-	Drop    uint64
-	Capt    uint64
-	Padding [13]uint64
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type BpfTimeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
-
-type Sysctlnode struct {
-	Flags           uint32
-	Num             int32
-	Name            [32]int8
-	Ver             uint32
-	X__rsvd         uint32
-	Un              [16]byte
-	X_sysctl_size   [8]byte
-	X_sysctl_func   [8]byte
-	X_sysctl_parent [8]byte
-	X_sysctl_desc   [8]byte
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
deleted file mode 100644
index 860a469796..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
+++ /dev/null
@@ -1,441 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_openbsd.go
-
-// +build 386,openbsd
-
-package unix
-
-const (
-	sizeofPtr      = 0x4
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x4
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int32
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int32
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int32
-	Ixrss    int32
-	Idrss    int32
-	Isrss    int32
-	Minflt   int32
-	Majflt   int32
-	Nswap    int32
-	Inblock  int32
-	Oublock  int32
-	Msgsnd   int32
-	Msgrcv   int32
-	Nsignals int32
-	Nvcsw    int32
-	Nivcsw   int32
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Mode           uint32
-	Dev            int32
-	Ino            uint64
-	Nlink          uint32
-	Uid            uint32
-	Gid            uint32
-	Rdev           int32
-	Atim           Timespec
-	Mtim           Timespec
-	Ctim           Timespec
-	Size           int64
-	Blocks         int64
-	Blksize        uint32
-	Flags          uint32
-	Gen            uint32
-	X__st_birthtim Timespec
-}
-
-type Statfs_t struct {
-	F_flags       uint32
-	F_bsize       uint32
-	F_iosize      uint32
-	F_blocks      uint64
-	F_bfree       uint64
-	F_bavail      int64
-	F_files       uint64
-	F_ffree       uint64
-	F_favail      int64
-	F_syncwrites  uint64
-	F_syncreads   uint64
-	F_asyncwrites uint64
-	F_asyncreads  uint64
-	F_fsid        Fsid
-	F_namemax     uint32
-	F_owner       uint32
-	F_ctime       uint64
-	F_fstypename  [16]int8
-	F_mntonname   [90]int8
-	F_mntfromname [90]int8
-	F_mntfromspec [90]int8
-	Pad_cgo_0     [2]byte
-	Mount_info    [160]byte
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno       uint64
-	Off          int64
-	Reclen       uint16
-	Type         uint8
-	Namlen       uint8
-	X__d_padding [4]uint8
-	Name         [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [24]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint32
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Iov        *Iovec
-	Iovlen     uint32
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x20
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x1c
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint32
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]uint32
-}
-
-const (
-	SizeofIfMsghdr         = 0xec
-	SizeofIfData           = 0xd4
-	SizeofIfaMsghdr        = 0x18
-	SizeofIfAnnounceMsghdr = 0x1a
-	SizeofRtMsghdr         = 0x60
-	SizeofRtMetrics        = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	Tableid uint16
-	Pad1    uint8
-	Pad2    uint8
-	Addrs   int32
-	Flags   int32
-	Xflags  int32
-	Data    IfData
-}
-
-type IfData struct {
-	Type         uint8
-	Addrlen      uint8
-	Hdrlen       uint8
-	Link_state   uint8
-	Mtu          uint32
-	Metric       uint32
-	Pad          uint32
-	Baudrate     uint64
-	Ipackets     uint64
-	Ierrors      uint64
-	Opackets     uint64
-	Oerrors      uint64
-	Collisions   uint64
-	Ibytes       uint64
-	Obytes       uint64
-	Imcasts      uint64
-	Omcasts      uint64
-	Iqdrops      uint64
-	Noproto      uint64
-	Capabilities uint32
-	Lastchange   Timeval
-	Mclpool      [7]Mclpool
-}
-
-type IfaMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	Tableid uint16
-	Pad1    uint8
-	Pad2    uint8
-	Addrs   int32
-	Flags   int32
-	Metric  int32
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	What    uint16
-	Name    [16]int8
-}
-
-type RtMsghdr struct {
-	Msglen   uint16
-	Version  uint8
-	Type     uint8
-	Hdrlen   uint16
-	Index    uint16
-	Tableid  uint16
-	Priority uint8
-	Mpls     uint8
-	Addrs    int32
-	Flags    int32
-	Fmask    int32
-	Pid      int32
-	Seq      int32
-	Errno    int32
-	Inits    uint32
-	Rmx      RtMetrics
-}
-
-type RtMetrics struct {
-	Pksent   uint64
-	Expire   int64
-	Locks    uint32
-	Mtu      uint32
-	Refcnt   uint32
-	Hopcount uint32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pad      uint32
-}
-
-type Mclpool struct {
-	Grown int32
-	Alive uint16
-	Hwm   uint16
-	Cwm   uint16
-	Lwm   uint16
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x8
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len   uint32
-	Insns *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type BpfTimeval struct {
-	Sec  uint32
-	Usec uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
deleted file mode 100644
index 23c52727f7..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
+++ /dev/null
@@ -1,448 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_openbsd.go
-
-// +build amd64,openbsd
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Mode           uint32
-	Dev            int32
-	Ino            uint64
-	Nlink          uint32
-	Uid            uint32
-	Gid            uint32
-	Rdev           int32
-	Atim           Timespec
-	Mtim           Timespec
-	Ctim           Timespec
-	Size           int64
-	Blocks         int64
-	Blksize        uint32
-	Flags          uint32
-	Gen            uint32
-	Pad_cgo_0      [4]byte
-	X__st_birthtim Timespec
-}
-
-type Statfs_t struct {
-	F_flags       uint32
-	F_bsize       uint32
-	F_iosize      uint32
-	Pad_cgo_0     [4]byte
-	F_blocks      uint64
-	F_bfree       uint64
-	F_bavail      int64
-	F_files       uint64
-	F_ffree       uint64
-	F_favail      int64
-	F_syncwrites  uint64
-	F_syncreads   uint64
-	F_asyncwrites uint64
-	F_asyncreads  uint64
-	F_fsid        Fsid
-	F_namemax     uint32
-	F_owner       uint32
-	F_ctime       uint64
-	F_fstypename  [16]int8
-	F_mntonname   [90]int8
-	F_mntfromname [90]int8
-	F_mntfromspec [90]int8
-	Pad_cgo_1     [2]byte
-	Mount_info    [160]byte
-}
-
-type Flock_t struct {
-	Start  int64
-	Len    int64
-	Pid    int32
-	Type   int16
-	Whence int16
-}
-
-type Dirent struct {
-	Fileno       uint64
-	Off          int64
-	Reclen       uint16
-	Type         uint8
-	Namlen       uint8
-	X__d_padding [4]uint8
-	Name         [256]int8
-}
-
-type Fsid struct {
-	Val [2]int32
-}
-
-type RawSockaddrInet4 struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Len    uint8
-	Family uint8
-	Path   [104]int8
-}
-
-type RawSockaddrDatalink struct {
-	Len    uint8
-	Family uint8
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [24]int8
-}
-
-type RawSockaddr struct {
-	Len    uint8
-	Family uint8
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [92]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *byte
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name       *byte
-	Namelen    uint32
-	Pad_cgo_0  [4]byte
-	Iov        *Iovec
-	Iovlen     uint32
-	Pad_cgo_1  [4]byte
-	Control    *byte
-	Controllen uint32
-	Flags      int32
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	Filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x1c
-	SizeofSockaddrAny      = 0x6c
-	SizeofSockaddrUnix     = 0x6a
-	SizeofSockaddrDatalink = 0x20
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x20
-	SizeofICMPv6Filter     = 0x20
-)
-
-const (
-	PTRACE_TRACEME = 0x0
-	PTRACE_CONT    = 0x7
-	PTRACE_KILL    = 0x8
-)
-
-type Kevent_t struct {
-	Ident  uint64
-	Filter int16
-	Flags  uint16
-	Fflags uint32
-	Data   int64
-	Udata  *byte
-}
-
-type FdSet struct {
-	Bits [32]uint32
-}
-
-const (
-	SizeofIfMsghdr         = 0xf8
-	SizeofIfData           = 0xe0
-	SizeofIfaMsghdr        = 0x18
-	SizeofIfAnnounceMsghdr = 0x1a
-	SizeofRtMsghdr         = 0x60
-	SizeofRtMetrics        = 0x38
-)
-
-type IfMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	Tableid uint16
-	Pad1    uint8
-	Pad2    uint8
-	Addrs   int32
-	Flags   int32
-	Xflags  int32
-	Data    IfData
-}
-
-type IfData struct {
-	Type         uint8
-	Addrlen      uint8
-	Hdrlen       uint8
-	Link_state   uint8
-	Mtu          uint32
-	Metric       uint32
-	Pad          uint32
-	Baudrate     uint64
-	Ipackets     uint64
-	Ierrors      uint64
-	Opackets     uint64
-	Oerrors      uint64
-	Collisions   uint64
-	Ibytes       uint64
-	Obytes       uint64
-	Imcasts      uint64
-	Omcasts      uint64
-	Iqdrops      uint64
-	Noproto      uint64
-	Capabilities uint32
-	Pad_cgo_0    [4]byte
-	Lastchange   Timeval
-	Mclpool      [7]Mclpool
-	Pad_cgo_1    [4]byte
-}
-
-type IfaMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	Tableid uint16
-	Pad1    uint8
-	Pad2    uint8
-	Addrs   int32
-	Flags   int32
-	Metric  int32
-}
-
-type IfAnnounceMsghdr struct {
-	Msglen  uint16
-	Version uint8
-	Type    uint8
-	Hdrlen  uint16
-	Index   uint16
-	What    uint16
-	Name    [16]int8
-}
-
-type RtMsghdr struct {
-	Msglen   uint16
-	Version  uint8
-	Type     uint8
-	Hdrlen   uint16
-	Index    uint16
-	Tableid  uint16
-	Priority uint8
-	Mpls     uint8
-	Addrs    int32
-	Flags    int32
-	Fmask    int32
-	Pid      int32
-	Seq      int32
-	Errno    int32
-	Inits    uint32
-	Rmx      RtMetrics
-}
-
-type RtMetrics struct {
-	Pksent   uint64
-	Expire   int64
-	Locks    uint32
-	Mtu      uint32
-	Refcnt   uint32
-	Hopcount uint32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pad      uint32
-}
-
-type Mclpool struct {
-	Grown int32
-	Alive uint16
-	Hwm   uint16
-	Cwm   uint16
-	Lwm   uint16
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x8
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv uint32
-	Drop uint32
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-type BpfTimeval struct {
-	Sec  uint32
-	Usec uint32
-}
-
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]uint8
-	Ispeed int32
-	Ospeed int32
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
deleted file mode 100644
index 02777e4d8d..0000000000
--- a/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
+++ /dev/null
@@ -1,423 +0,0 @@
-// +build amd64,solaris
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_solaris.go | go run mkpost.go
-
-package unix
-
-const (
-	sizeofPtr      = 0x8
-	sizeofShort    = 0x2
-	sizeofInt      = 0x4
-	sizeofLong     = 0x8
-	sizeofLongLong = 0x8
-	PathMax        = 0x400
-	MaxHostNameLen = 0x100
-)
-
-type (
-	_C_short     int16
-	_C_int       int32
-	_C_long      int64
-	_C_long_long int64
-)
-
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-type Timeval struct {
-	Sec  int64
-	Usec int64
-}
-
-type Timeval32 struct {
-	Sec  int32
-	Usec int32
-}
-
-type Tms struct {
-	Utime  int64
-	Stime  int64
-	Cutime int64
-	Cstime int64
-}
-
-type Utimbuf struct {
-	Actime  int64
-	Modtime int64
-}
-
-type Rusage struct {
-	Utime    Timeval
-	Stime    Timeval
-	Maxrss   int64
-	Ixrss    int64
-	Idrss    int64
-	Isrss    int64
-	Minflt   int64
-	Majflt   int64
-	Nswap    int64
-	Inblock  int64
-	Oublock  int64
-	Msgsnd   int64
-	Msgrcv   int64
-	Nsignals int64
-	Nvcsw    int64
-	Nivcsw   int64
-}
-
-type Rlimit struct {
-	Cur uint64
-	Max uint64
-}
-
-type _Gid_t uint32
-
-const (
-	S_IFMT   = 0xf000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-type Stat_t struct {
-	Dev       uint64
-	Ino       uint64
-	Mode      uint32
-	Nlink     uint32
-	Uid       uint32
-	Gid       uint32
-	Rdev      uint64
-	Size      int64
-	Atim      Timespec
-	Mtim      Timespec
-	Ctim      Timespec
-	Blksize   int32
-	Pad_cgo_0 [4]byte
-	Blocks    int64
-	Fstype    [16]int8
-}
-
-type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Sysid     int32
-	Pid       int32
-	Pad       [4]int64
-}
-
-type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Name      [1]int8
-	Pad_cgo_0 [5]byte
-}
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type RawSockaddrInet6 struct {
-	Family         uint16
-	Port           uint16
-	Flowinfo       uint32
-	Addr           [16]byte /* in6_addr */
-	Scope_id       uint32
-	X__sin6_src_id uint32
-}
-
-type RawSockaddrUnix struct {
-	Family uint16
-	Path   [108]int8
-}
-
-type RawSockaddrDatalink struct {
-	Family uint16
-	Index  uint16
-	Type   uint8
-	Nlen   uint8
-	Alen   uint8
-	Slen   uint8
-	Data   [244]int8
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [236]int8
-}
-
-type _Socklen uint32
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type Iovec struct {
-	Base *int8
-	Len  uint64
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type Msghdr struct {
-	Name         *byte
-	Namelen      uint32
-	Pad_cgo_0    [4]byte
-	Iov          *Iovec
-	Iovlen       int32
-	Pad_cgo_1    [4]byte
-	Accrights    *int8
-	Accrightslen int32
-	Pad_cgo_2    [4]byte
-}
-
-type Cmsghdr struct {
-	Len   uint32
-	Level int32
-	Type  int32
-}
-
-type Inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type IPv6MTUInfo struct {
-	Addr RawSockaddrInet6
-	Mtu  uint32
-}
-
-type ICMPv6Filter struct {
-	X__icmp6_filt [8]uint32
-}
-
-const (
-	SizeofSockaddrInet4    = 0x10
-	SizeofSockaddrInet6    = 0x20
-	SizeofSockaddrAny      = 0xfc
-	SizeofSockaddrUnix     = 0x6e
-	SizeofSockaddrDatalink = 0xfc
-	SizeofLinger           = 0x8
-	SizeofIPMreq           = 0x8
-	SizeofIPv6Mreq         = 0x14
-	SizeofMsghdr           = 0x30
-	SizeofCmsghdr          = 0xc
-	SizeofInet6Pktinfo     = 0x14
-	SizeofIPv6MTUInfo      = 0x24
-	SizeofICMPv6Filter     = 0x20
-)
-
-type FdSet struct {
-	Bits [1024]int64
-}
-
-type Utsname struct {
-	Sysname  [257]int8
-	Nodename [257]int8
-	Release  [257]int8
-	Version  [257]int8
-	Machine  [257]int8
-}
-
-type Ustat_t struct {
-	Tfree     int64
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_0 [4]byte
-}
-
-const (
-	AT_FDCWD            = 0xffd19553
-	AT_SYMLINK_NOFOLLOW = 0x1000
-	AT_SYMLINK_FOLLOW   = 0x2000
-	AT_REMOVEDIR        = 0x1
-	AT_EACCESS          = 0x4
-)
-
-const (
-	SizeofIfMsghdr  = 0x54
-	SizeofIfData    = 0x44
-	SizeofIfaMsghdr = 0x14
-	SizeofRtMsghdr  = 0x4c
-	SizeofRtMetrics = 0x28
-)
-
-type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
-}
-
-type IfData struct {
-	Type       uint8
-	Addrlen    uint8
-	Hdrlen     uint8
-	Pad_cgo_0  [1]byte
-	Mtu        uint32
-	Metric     uint32
-	Baudrate   uint32
-	Ipackets   uint32
-	Ierrors    uint32
-	Opackets   uint32
-	Oerrors    uint32
-	Collisions uint32
-	Ibytes     uint32
-	Obytes     uint32
-	Imcasts    uint32
-	Omcasts    uint32
-	Iqdrops    uint32
-	Noproto    uint32
-	Lastchange Timeval32
-}
-
-type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
-}
-
-type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
-}
-
-type RtMetrics struct {
-	Locks    uint32
-	Mtu      uint32
-	Hopcount uint32
-	Expire   uint32
-	Recvpipe uint32
-	Sendpipe uint32
-	Ssthresh uint32
-	Rtt      uint32
-	Rttvar   uint32
-	Pksent   uint32
-}
-
-const (
-	SizeofBpfVersion = 0x4
-	SizeofBpfStat    = 0x80
-	SizeofBpfProgram = 0x10
-	SizeofBpfInsn    = 0x8
-	SizeofBpfHdr     = 0x14
-)
-
-type BpfVersion struct {
-	Major uint16
-	Minor uint16
-}
-
-type BpfStat struct {
-	Recv    uint64
-	Drop    uint64
-	Capt    uint64
-	Padding [13]uint64
-}
-
-type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
-}
-
-type BpfInsn struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
-
-type BpfTimeval struct {
-	Sec  int32
-	Usec int32
-}
-
-type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
-}
-
-const _SC_PAGESIZE = 0xb
-
-type Termios struct {
-	Iflag     uint32
-	Oflag     uint32
-	Cflag     uint32
-	Lflag     uint32
-	Cc        [19]uint8
-	Pad_cgo_0 [1]byte
-}
-
-type Termio struct {
-	Iflag     uint16
-	Oflag     uint16
-	Cflag     uint16
-	Lflag     uint16
-	Line      int8
-	Cc        [8]uint8
-	Pad_cgo_0 [1]byte
-}
-
-type Winsize struct {
-	Row    uint16
-	Col    uint16
-	Xpixel uint16
-	Ypixel uint16
-}
diff --git a/vendor/golang.org/x/sys/windows/asm_windows_386.s b/vendor/golang.org/x/sys/windows/asm_windows_386.s
deleted file mode 100644
index 1c20dd2f89..0000000000
--- a/vendor/golang.org/x/sys/windows/asm_windows_386.s
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//
-// System calls for 386, Windows are implemented in runtime/syscall_windows.goc
-//
-
-TEXT ·getprocaddress(SB), 7, $0-8
-	JMP	syscall·getprocaddress(SB)
-
-TEXT ·loadlibrary(SB), 7, $0-4
-	JMP	syscall·loadlibrary(SB)
diff --git a/vendor/golang.org/x/sys/windows/asm_windows_amd64.s b/vendor/golang.org/x/sys/windows/asm_windows_amd64.s
deleted file mode 100644
index 4d025ab556..0000000000
--- a/vendor/golang.org/x/sys/windows/asm_windows_amd64.s
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//
-// System calls for amd64, Windows are implemented in runtime/syscall_windows.goc
-//
-
-TEXT ·getprocaddress(SB), 7, $0-32
-	JMP	syscall·getprocaddress(SB)
-
-TEXT ·loadlibrary(SB), 7, $0-8
-	JMP	syscall·loadlibrary(SB)
diff --git a/vendor/golang.org/x/sys/windows/dll_windows.go b/vendor/golang.org/x/sys/windows/dll_windows.go
deleted file mode 100644
index 0f62046748..0000000000
--- a/vendor/golang.org/x/sys/windows/dll_windows.go
+++ /dev/null
@@ -1,378 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows
-
-import (
-	"sync"
-	"sync/atomic"
-	"syscall"
-	"unsafe"
-)
-
-// DLLError describes reasons for DLL load failures.
-type DLLError struct {
-	Err     error
-	ObjName string
-	Msg     string
-}
-
-func (e *DLLError) Error() string { return e.Msg }
-
-// Implemented in runtime/syscall_windows.goc; we provide jumps to them in our assembly file.
-func loadlibrary(filename *uint16) (handle uintptr, err syscall.Errno)
-func getprocaddress(handle uintptr, procname *uint8) (proc uintptr, err syscall.Errno)
-
-// A DLL implements access to a single DLL.
-type DLL struct {
-	Name   string
-	Handle Handle
-}
-
-// LoadDLL loads DLL file into memory.
-//
-// Warning: using LoadDLL without an absolute path name is subject to
-// DLL preloading attacks. To safely load a system DLL, use LazyDLL
-// with System set to true, or use LoadLibraryEx directly.
-func LoadDLL(name string) (dll *DLL, err error) {
-	namep, err := UTF16PtrFromString(name)
-	if err != nil {
-		return nil, err
-	}
-	h, e := loadlibrary(namep)
-	if e != 0 {
-		return nil, &DLLError{
-			Err:     e,
-			ObjName: name,
-			Msg:     "Failed to load " + name + ": " + e.Error(),
-		}
-	}
-	d := &DLL{
-		Name:   name,
-		Handle: Handle(h),
-	}
-	return d, nil
-}
-
-// MustLoadDLL is like LoadDLL but panics if load operation failes.
-func MustLoadDLL(name string) *DLL {
-	d, e := LoadDLL(name)
-	if e != nil {
-		panic(e)
-	}
-	return d
-}
-
-// FindProc searches DLL d for procedure named name and returns *Proc
-// if found. It returns an error if search fails.
-func (d *DLL) FindProc(name string) (proc *Proc, err error) {
-	namep, err := BytePtrFromString(name)
-	if err != nil {
-		return nil, err
-	}
-	a, e := getprocaddress(uintptr(d.Handle), namep)
-	if e != 0 {
-		return nil, &DLLError{
-			Err:     e,
-			ObjName: name,
-			Msg:     "Failed to find " + name + " procedure in " + d.Name + ": " + e.Error(),
-		}
-	}
-	p := &Proc{
-		Dll:  d,
-		Name: name,
-		addr: a,
-	}
-	return p, nil
-}
-
-// MustFindProc is like FindProc but panics if search fails.
-func (d *DLL) MustFindProc(name string) *Proc {
-	p, e := d.FindProc(name)
-	if e != nil {
-		panic(e)
-	}
-	return p
-}
-
-// Release unloads DLL d from memory.
-func (d *DLL) Release() (err error) {
-	return FreeLibrary(d.Handle)
-}
-
-// A Proc implements access to a procedure inside a DLL.
-type Proc struct {
-	Dll  *DLL
-	Name string
-	addr uintptr
-}
-
-// Addr returns the address of the procedure represented by p.
-// The return value can be passed to Syscall to run the procedure.
-func (p *Proc) Addr() uintptr {
-	return p.addr
-}
-
-//go:uintptrescapes
-
-// Call executes procedure p with arguments a. It will panic, if more then 15 arguments
-// are supplied.
-//
-// The returned error is always non-nil, constructed from the result of GetLastError.
-// Callers must inspect the primary return value to decide whether an error occurred
-// (according to the semantics of the specific function being called) before consulting
-// the error. The error will be guaranteed to contain windows.Errno.
-func (p *Proc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
-	switch len(a) {
-	case 0:
-		return syscall.Syscall(p.Addr(), uintptr(len(a)), 0, 0, 0)
-	case 1:
-		return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], 0, 0)
-	case 2:
-		return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], a[1], 0)
-	case 3:
-		return syscall.Syscall(p.Addr(), uintptr(len(a)), a[0], a[1], a[2])
-	case 4:
-		return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], 0, 0)
-	case 5:
-		return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], 0)
-	case 6:
-		return syscall.Syscall6(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5])
-	case 7:
-		return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], 0, 0)
-	case 8:
-		return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], 0)
-	case 9:
-		return syscall.Syscall9(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8])
-	case 10:
-		return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], 0, 0)
-	case 11:
-		return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], 0)
-	case 12:
-		return syscall.Syscall12(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11])
-	case 13:
-		return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], 0, 0)
-	case 14:
-		return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], 0)
-	case 15:
-		return syscall.Syscall15(p.Addr(), uintptr(len(a)), a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14])
-	default:
-		panic("Call " + p.Name + " with too many arguments " + itoa(len(a)) + ".")
-	}
-	return
-}
-
-// A LazyDLL implements access to a single DLL.
-// It will delay the load of the DLL until the first
-// call to its Handle method or to one of its
-// LazyProc's Addr method.
-type LazyDLL struct {
-	Name string
-
-	// System determines whether the DLL must be loaded from the
-	// Windows System directory, bypassing the normal DLL search
-	// path.
-	System bool
-
-	mu  sync.Mutex
-	dll *DLL // non nil once DLL is loaded
-}
-
-// Load loads DLL file d.Name into memory. It returns an error if fails.
-// Load will not try to load DLL, if it is already loaded into memory.
-func (d *LazyDLL) Load() error {
-	// Non-racy version of:
-	// if d.dll != nil {
-	if atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(&d.dll))) != nil {
-		return nil
-	}
-	d.mu.Lock()
-	defer d.mu.Unlock()
-	if d.dll != nil {
-		return nil
-	}
-
-	// kernel32.dll is special, since it's where LoadLibraryEx comes from.
-	// The kernel already special-cases its name, so it's always
-	// loaded from system32.
-	var dll *DLL
-	var err error
-	if d.Name == "kernel32.dll" {
-		dll, err = LoadDLL(d.Name)
-	} else {
-		dll, err = loadLibraryEx(d.Name, d.System)
-	}
-	if err != nil {
-		return err
-	}
-
-	// Non-racy version of:
-	// d.dll = dll
-	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(&d.dll)), unsafe.Pointer(dll))
-	return nil
-}
-
-// mustLoad is like Load but panics if search fails.
-func (d *LazyDLL) mustLoad() {
-	e := d.Load()
-	if e != nil {
-		panic(e)
-	}
-}
-
-// Handle returns d's module handle.
-func (d *LazyDLL) Handle() uintptr {
-	d.mustLoad()
-	return uintptr(d.dll.Handle)
-}
-
-// NewProc returns a LazyProc for accessing the named procedure in the DLL d.
-func (d *LazyDLL) NewProc(name string) *LazyProc {
-	return &LazyProc{l: d, Name: name}
-}
-
-// NewLazyDLL creates new LazyDLL associated with DLL file.
-func NewLazyDLL(name string) *LazyDLL {
-	return &LazyDLL{Name: name}
-}
-
-// NewLazySystemDLL is like NewLazyDLL, but will only
-// search Windows System directory for the DLL if name is
-// a base name (like "advapi32.dll").
-func NewLazySystemDLL(name string) *LazyDLL {
-	return &LazyDLL{Name: name, System: true}
-}
-
-// A LazyProc implements access to a procedure inside a LazyDLL.
-// It delays the lookup until the Addr method is called.
-type LazyProc struct {
-	Name string
-
-	mu   sync.Mutex
-	l    *LazyDLL
-	proc *Proc
-}
-
-// Find searches DLL for procedure named p.Name. It returns
-// an error if search fails. Find will not search procedure,
-// if it is already found and loaded into memory.
-func (p *LazyProc) Find() error {
-	// Non-racy version of:
-	// if p.proc == nil {
-	if atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(&p.proc))) == nil {
-		p.mu.Lock()
-		defer p.mu.Unlock()
-		if p.proc == nil {
-			e := p.l.Load()
-			if e != nil {
-				return e
-			}
-			proc, e := p.l.dll.FindProc(p.Name)
-			if e != nil {
-				return e
-			}
-			// Non-racy version of:
-			// p.proc = proc
-			atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(&p.proc)), unsafe.Pointer(proc))
-		}
-	}
-	return nil
-}
-
-// mustFind is like Find but panics if search fails.
-func (p *LazyProc) mustFind() {
-	e := p.Find()
-	if e != nil {
-		panic(e)
-	}
-}
-
-// Addr returns the address of the procedure represented by p.
-// The return value can be passed to Syscall to run the procedure.
-func (p *LazyProc) Addr() uintptr {
-	p.mustFind()
-	return p.proc.Addr()
-}
-
-//go:uintptrescapes
-
-// Call executes procedure p with arguments a. It will panic, if more then 15 arguments
-// are supplied.
-//
-// The returned error is always non-nil, constructed from the result of GetLastError.
-// Callers must inspect the primary return value to decide whether an error occurred
-// (according to the semantics of the specific function being called) before consulting
-// the error. The error will be guaranteed to contain windows.Errno.
-func (p *LazyProc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
-	p.mustFind()
-	return p.proc.Call(a...)
-}
-
-var canDoSearchSystem32Once struct {
-	sync.Once
-	v bool
-}
-
-func initCanDoSearchSystem32() {
-	// https://msdn.microsoft.com/en-us/library/ms684179(v=vs.85).aspx says:
-	// "Windows 7, Windows Server 2008 R2, Windows Vista, and Windows
-	// Server 2008: The LOAD_LIBRARY_SEARCH_* flags are available on
-	// systems that have KB2533623 installed. To determine whether the
-	// flags are available, use GetProcAddress to get the address of the
-	// AddDllDirectory, RemoveDllDirectory, or SetDefaultDllDirectories
-	// function. If GetProcAddress succeeds, the LOAD_LIBRARY_SEARCH_*
-	// flags can be used with LoadLibraryEx."
-	canDoSearchSystem32Once.v = (modkernel32.NewProc("AddDllDirectory").Find() == nil)
-}
-
-func canDoSearchSystem32() bool {
-	canDoSearchSystem32Once.Do(initCanDoSearchSystem32)
-	return canDoSearchSystem32Once.v
-}
-
-func isBaseName(name string) bool {
-	for _, c := range name {
-		if c == ':' || c == '/' || c == '\\' {
-			return false
-		}
-	}
-	return true
-}
-
-// loadLibraryEx wraps the Windows LoadLibraryEx function.
-//
-// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms684179(v=vs.85).aspx
-//
-// If name is not an absolute path, LoadLibraryEx searches for the DLL
-// in a variety of automatic locations unless constrained by flags.
-// See: https://msdn.microsoft.com/en-us/library/ff919712%28VS.85%29.aspx
-func loadLibraryEx(name string, system bool) (*DLL, error) {
-	loadDLL := name
-	var flags uintptr
-	if system {
-		if canDoSearchSystem32() {
-			const LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800
-			flags = LOAD_LIBRARY_SEARCH_SYSTEM32
-		} else if isBaseName(name) {
-			// WindowsXP or unpatched Windows machine
-			// trying to load "foo.dll" out of the system
-			// folder, but LoadLibraryEx doesn't support
-			// that yet on their system, so emulate it.
-			windir, _ := Getenv("WINDIR") // old var; apparently works on XP
-			if windir == "" {
-				return nil, errString("%WINDIR% not defined")
-			}
-			loadDLL = windir + "\\System32\\" + name
-		}
-	}
-	h, err := LoadLibraryEx(loadDLL, 0, flags)
-	if err != nil {
-		return nil, err
-	}
-	return &DLL{Name: name, Handle: h}, nil
-}
-
-type errString string
-
-func (s errString) Error() string { return string(s) }
diff --git a/vendor/golang.org/x/sys/windows/env_unset.go b/vendor/golang.org/x/sys/windows/env_unset.go
deleted file mode 100644
index 4ed03aeefc..0000000000
--- a/vendor/golang.org/x/sys/windows/env_unset.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-// +build go1.4
-
-package windows
-
-import "syscall"
-
-func Unsetenv(key string) error {
-	// This was added in Go 1.4.
-	return syscall.Unsetenv(key)
-}
diff --git a/vendor/golang.org/x/sys/windows/env_windows.go b/vendor/golang.org/x/sys/windows/env_windows.go
deleted file mode 100644
index a9d8ef4b7d..0000000000
--- a/vendor/golang.org/x/sys/windows/env_windows.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2010 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Windows environment variables.
-
-package windows
-
-import "syscall"
-
-func Getenv(key string) (value string, found bool) {
-	return syscall.Getenv(key)
-}
-
-func Setenv(key, value string) error {
-	return syscall.Setenv(key, value)
-}
-
-func Clearenv() {
-	syscall.Clearenv()
-}
-
-func Environ() []string {
-	return syscall.Environ()
-}
diff --git a/vendor/golang.org/x/sys/windows/eventlog.go b/vendor/golang.org/x/sys/windows/eventlog.go
deleted file mode 100644
index 40af946e16..0000000000
--- a/vendor/golang.org/x/sys/windows/eventlog.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package windows
-
-const (
-	EVENTLOG_SUCCESS          = 0
-	EVENTLOG_ERROR_TYPE       = 1
-	EVENTLOG_WARNING_TYPE     = 2
-	EVENTLOG_INFORMATION_TYPE = 4
-	EVENTLOG_AUDIT_SUCCESS    = 8
-	EVENTLOG_AUDIT_FAILURE    = 16
-)
-
-//sys	RegisterEventSource(uncServerName *uint16, sourceName *uint16) (handle Handle, err error) [failretval==0] = advapi32.RegisterEventSourceW
-//sys	DeregisterEventSource(handle Handle) (err error) = advapi32.DeregisterEventSource
-//sys	ReportEvent(log Handle, etype uint16, category uint16, eventId uint32, usrSId uintptr, numStrings uint16, dataSize uint32, strings **uint16, rawData *byte) (err error) = advapi32.ReportEventW
diff --git a/vendor/golang.org/x/sys/windows/exec_windows.go b/vendor/golang.org/x/sys/windows/exec_windows.go
deleted file mode 100644
index 3606c3a8b3..0000000000
--- a/vendor/golang.org/x/sys/windows/exec_windows.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Fork, exec, wait, etc.
-
-package windows
-
-// EscapeArg rewrites command line argument s as prescribed
-// in http://msdn.microsoft.com/en-us/library/ms880421.
-// This function returns "" (2 double quotes) if s is empty.
-// Alternatively, these transformations are done:
-// - every back slash (\) is doubled, but only if immediately
-//   followed by double quote (");
-// - every double quote (") is escaped by back slash (\);
-// - finally, s is wrapped with double quotes (arg -> "arg"),
-//   but only if there is space or tab inside s.
-func EscapeArg(s string) string {
-	if len(s) == 0 {
-		return "\"\""
-	}
-	n := len(s)
-	hasSpace := false
-	for i := 0; i < len(s); i++ {
-		switch s[i] {
-		case '"', '\\':
-			n++
-		case ' ', '\t':
-			hasSpace = true
-		}
-	}
-	if hasSpace {
-		n += 2
-	}
-	if n == len(s) {
-		return s
-	}
-
-	qs := make([]byte, n)
-	j := 0
-	if hasSpace {
-		qs[j] = '"'
-		j++
-	}
-	slashes := 0
-	for i := 0; i < len(s); i++ {
-		switch s[i] {
-		default:
-			slashes = 0
-			qs[j] = s[i]
-		case '\\':
-			slashes++
-			qs[j] = s[i]
-		case '"':
-			for ; slashes > 0; slashes-- {
-				qs[j] = '\\'
-				j++
-			}
-			qs[j] = '\\'
-			j++
-			qs[j] = s[i]
-		}
-		j++
-	}
-	if hasSpace {
-		for ; slashes > 0; slashes-- {
-			qs[j] = '\\'
-			j++
-		}
-		qs[j] = '"'
-		j++
-	}
-	return string(qs[:j])
-}
-
-func CloseOnExec(fd Handle) {
-	SetHandleInformation(Handle(fd), HANDLE_FLAG_INHERIT, 0)
-}
-
-// FullPath retrieves the full path of the specified file.
-func FullPath(name string) (path string, err error) {
-	p, err := UTF16PtrFromString(name)
-	if err != nil {
-		return "", err
-	}
-	n := uint32(100)
-	for {
-		buf := make([]uint16, n)
-		n, err = GetFullPathName(p, uint32(len(buf)), &buf[0], nil)
-		if err != nil {
-			return "", err
-		}
-		if n <= uint32(len(buf)) {
-			return UTF16ToString(buf[:n]), nil
-		}
-	}
-}
diff --git a/vendor/golang.org/x/sys/windows/mksyscall.go b/vendor/golang.org/x/sys/windows/mksyscall.go
deleted file mode 100644
index e1c88c9c71..0000000000
--- a/vendor/golang.org/x/sys/windows/mksyscall.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows
-
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go eventlog.go service.go syscall_windows.go security_windows.go
diff --git a/vendor/golang.org/x/sys/windows/race.go b/vendor/golang.org/x/sys/windows/race.go
deleted file mode 100644
index 343e18ab69..0000000000
--- a/vendor/golang.org/x/sys/windows/race.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows,race
-
-package windows
-
-import (
-	"runtime"
-	"unsafe"
-)
-
-const raceenabled = true
-
-func raceAcquire(addr unsafe.Pointer) {
-	runtime.RaceAcquire(addr)
-}
-
-func raceReleaseMerge(addr unsafe.Pointer) {
-	runtime.RaceReleaseMerge(addr)
-}
-
-func raceReadRange(addr unsafe.Pointer, len int) {
-	runtime.RaceReadRange(addr, len)
-}
-
-func raceWriteRange(addr unsafe.Pointer, len int) {
-	runtime.RaceWriteRange(addr, len)
-}
diff --git a/vendor/golang.org/x/sys/windows/race0.go b/vendor/golang.org/x/sys/windows/race0.go
deleted file mode 100644
index 17af843b91..0000000000
--- a/vendor/golang.org/x/sys/windows/race0.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows,!race
-
-package windows
-
-import (
-	"unsafe"
-)
-
-const raceenabled = false
-
-func raceAcquire(addr unsafe.Pointer) {
-}
-
-func raceReleaseMerge(addr unsafe.Pointer) {
-}
-
-func raceReadRange(addr unsafe.Pointer, len int) {
-}
-
-func raceWriteRange(addr unsafe.Pointer, len int) {
-}
diff --git a/vendor/golang.org/x/sys/windows/security_windows.go b/vendor/golang.org/x/sys/windows/security_windows.go
deleted file mode 100644
index ca09bdd701..0000000000
--- a/vendor/golang.org/x/sys/windows/security_windows.go
+++ /dev/null
@@ -1,435 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	STANDARD_RIGHTS_REQUIRED = 0xf0000
-	STANDARD_RIGHTS_READ     = 0x20000
-	STANDARD_RIGHTS_WRITE    = 0x20000
-	STANDARD_RIGHTS_EXECUTE  = 0x20000
-	STANDARD_RIGHTS_ALL      = 0x1F0000
-)
-
-const (
-	NameUnknown          = 0
-	NameFullyQualifiedDN = 1
-	NameSamCompatible    = 2
-	NameDisplay          = 3
-	NameUniqueId         = 6
-	NameCanonical        = 7
-	NameUserPrincipal    = 8
-	NameCanonicalEx      = 9
-	NameServicePrincipal = 10
-	NameDnsDomain        = 12
-)
-
-// This function returns 1 byte BOOLEAN rather than the 4 byte BOOL.
-// http://blogs.msdn.com/b/drnick/archive/2007/12/19/windows-and-upn-format-credentials.aspx
-//sys	TranslateName(accName *uint16, accNameFormat uint32, desiredNameFormat uint32, translatedName *uint16, nSize *uint32) (err error) [failretval&0xff==0] = secur32.TranslateNameW
-//sys	GetUserNameEx(nameFormat uint32, nameBuffre *uint16, nSize *uint32) (err error) [failretval&0xff==0] = secur32.GetUserNameExW
-
-// TranslateAccountName converts a directory service
-// object name from one format to another.
-func TranslateAccountName(username string, from, to uint32, initSize int) (string, error) {
-	u, e := UTF16PtrFromString(username)
-	if e != nil {
-		return "", e
-	}
-	n := uint32(50)
-	for {
-		b := make([]uint16, n)
-		e = TranslateName(u, from, to, &b[0], &n)
-		if e == nil {
-			return UTF16ToString(b[:n]), nil
-		}
-		if e != ERROR_INSUFFICIENT_BUFFER {
-			return "", e
-		}
-		if n <= uint32(len(b)) {
-			return "", e
-		}
-	}
-}
-
-const (
-	// do not reorder
-	NetSetupUnknownStatus = iota
-	NetSetupUnjoined
-	NetSetupWorkgroupName
-	NetSetupDomainName
-)
-
-type UserInfo10 struct {
-	Name       *uint16
-	Comment    *uint16
-	UsrComment *uint16
-	FullName   *uint16
-}
-
-//sys	NetUserGetInfo(serverName *uint16, userName *uint16, level uint32, buf **byte) (neterr error) = netapi32.NetUserGetInfo
-//sys	NetGetJoinInformation(server *uint16, name **uint16, bufType *uint32) (neterr error) = netapi32.NetGetJoinInformation
-//sys	NetApiBufferFree(buf *byte) (neterr error) = netapi32.NetApiBufferFree
-
-const (
-	// do not reorder
-	SidTypeUser = 1 + iota
-	SidTypeGroup
-	SidTypeDomain
-	SidTypeAlias
-	SidTypeWellKnownGroup
-	SidTypeDeletedAccount
-	SidTypeInvalid
-	SidTypeUnknown
-	SidTypeComputer
-	SidTypeLabel
-)
-
-type SidIdentifierAuthority struct {
-	Value [6]byte
-}
-
-var (
-	SECURITY_NULL_SID_AUTHORITY        = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 0}}
-	SECURITY_WORLD_SID_AUTHORITY       = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 1}}
-	SECURITY_LOCAL_SID_AUTHORITY       = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 2}}
-	SECURITY_CREATOR_SID_AUTHORITY     = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 3}}
-	SECURITY_NON_UNIQUE_AUTHORITY      = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 4}}
-	SECURITY_NT_AUTHORITY              = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 5}}
-	SECURITY_MANDATORY_LABEL_AUTHORITY = SidIdentifierAuthority{[6]byte{0, 0, 0, 0, 0, 16}}
-)
-
-const (
-	SECURITY_NULL_RID                   = 0
-	SECURITY_WORLD_RID                  = 0
-	SECURITY_LOCAL_RID                  = 0
-	SECURITY_CREATOR_OWNER_RID          = 0
-	SECURITY_CREATOR_GROUP_RID          = 1
-	SECURITY_DIALUP_RID                 = 1
-	SECURITY_NETWORK_RID                = 2
-	SECURITY_BATCH_RID                  = 3
-	SECURITY_INTERACTIVE_RID            = 4
-	SECURITY_LOGON_IDS_RID              = 5
-	SECURITY_SERVICE_RID                = 6
-	SECURITY_LOCAL_SYSTEM_RID           = 18
-	SECURITY_BUILTIN_DOMAIN_RID         = 32
-	SECURITY_PRINCIPAL_SELF_RID         = 10
-	SECURITY_CREATOR_OWNER_SERVER_RID   = 0x2
-	SECURITY_CREATOR_GROUP_SERVER_RID   = 0x3
-	SECURITY_LOGON_IDS_RID_COUNT        = 0x3
-	SECURITY_ANONYMOUS_LOGON_RID        = 0x7
-	SECURITY_PROXY_RID                  = 0x8
-	SECURITY_ENTERPRISE_CONTROLLERS_RID = 0x9
-	SECURITY_SERVER_LOGON_RID           = SECURITY_ENTERPRISE_CONTROLLERS_RID
-	SECURITY_AUTHENTICATED_USER_RID     = 0xb
-	SECURITY_RESTRICTED_CODE_RID        = 0xc
-	SECURITY_NT_NON_UNIQUE_RID          = 0x15
-)
-
-//sys	LookupAccountSid(systemName *uint16, sid *SID, name *uint16, nameLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32) (err error) = advapi32.LookupAccountSidW
-//sys	LookupAccountName(systemName *uint16, accountName *uint16, sid *SID, sidLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32) (err error) = advapi32.LookupAccountNameW
-//sys	ConvertSidToStringSid(sid *SID, stringSid **uint16) (err error) = advapi32.ConvertSidToStringSidW
-//sys	ConvertStringSidToSid(stringSid *uint16, sid **SID) (err error) = advapi32.ConvertStringSidToSidW
-//sys	GetLengthSid(sid *SID) (len uint32) = advapi32.GetLengthSid
-//sys	CopySid(destSidLen uint32, destSid *SID, srcSid *SID) (err error) = advapi32.CopySid
-//sys	AllocateAndInitializeSid(identAuth *SidIdentifierAuthority, subAuth byte, subAuth0 uint32, subAuth1 uint32, subAuth2 uint32, subAuth3 uint32, subAuth4 uint32, subAuth5 uint32, subAuth6 uint32, subAuth7 uint32, sid **SID) (err error) = advapi32.AllocateAndInitializeSid
-//sys	FreeSid(sid *SID) (err error) [failretval!=0] = advapi32.FreeSid
-//sys	EqualSid(sid1 *SID, sid2 *SID) (isEqual bool) = advapi32.EqualSid
-
-// The security identifier (SID) structure is a variable-length
-// structure used to uniquely identify users or groups.
-type SID struct{}
-
-// StringToSid converts a string-format security identifier
-// sid into a valid, functional sid.
-func StringToSid(s string) (*SID, error) {
-	var sid *SID
-	p, e := UTF16PtrFromString(s)
-	if e != nil {
-		return nil, e
-	}
-	e = ConvertStringSidToSid(p, &sid)
-	if e != nil {
-		return nil, e
-	}
-	defer LocalFree((Handle)(unsafe.Pointer(sid)))
-	return sid.Copy()
-}
-
-// LookupSID retrieves a security identifier sid for the account
-// and the name of the domain on which the account was found.
-// System specify target computer to search.
-func LookupSID(system, account string) (sid *SID, domain string, accType uint32, err error) {
-	if len(account) == 0 {
-		return nil, "", 0, syscall.EINVAL
-	}
-	acc, e := UTF16PtrFromString(account)
-	if e != nil {
-		return nil, "", 0, e
-	}
-	var sys *uint16
-	if len(system) > 0 {
-		sys, e = UTF16PtrFromString(system)
-		if e != nil {
-			return nil, "", 0, e
-		}
-	}
-	n := uint32(50)
-	dn := uint32(50)
-	for {
-		b := make([]byte, n)
-		db := make([]uint16, dn)
-		sid = (*SID)(unsafe.Pointer(&b[0]))
-		e = LookupAccountName(sys, acc, sid, &n, &db[0], &dn, &accType)
-		if e == nil {
-			return sid, UTF16ToString(db), accType, nil
-		}
-		if e != ERROR_INSUFFICIENT_BUFFER {
-			return nil, "", 0, e
-		}
-		if n <= uint32(len(b)) {
-			return nil, "", 0, e
-		}
-	}
-}
-
-// String converts sid to a string format
-// suitable for display, storage, or transmission.
-func (sid *SID) String() (string, error) {
-	var s *uint16
-	e := ConvertSidToStringSid(sid, &s)
-	if e != nil {
-		return "", e
-	}
-	defer LocalFree((Handle)(unsafe.Pointer(s)))
-	return UTF16ToString((*[256]uint16)(unsafe.Pointer(s))[:]), nil
-}
-
-// Len returns the length, in bytes, of a valid security identifier sid.
-func (sid *SID) Len() int {
-	return int(GetLengthSid(sid))
-}
-
-// Copy creates a duplicate of security identifier sid.
-func (sid *SID) Copy() (*SID, error) {
-	b := make([]byte, sid.Len())
-	sid2 := (*SID)(unsafe.Pointer(&b[0]))
-	e := CopySid(uint32(len(b)), sid2, sid)
-	if e != nil {
-		return nil, e
-	}
-	return sid2, nil
-}
-
-// LookupAccount retrieves the name of the account for this sid
-// and the name of the first domain on which this sid is found.
-// System specify target computer to search for.
-func (sid *SID) LookupAccount(system string) (account, domain string, accType uint32, err error) {
-	var sys *uint16
-	if len(system) > 0 {
-		sys, err = UTF16PtrFromString(system)
-		if err != nil {
-			return "", "", 0, err
-		}
-	}
-	n := uint32(50)
-	dn := uint32(50)
-	for {
-		b := make([]uint16, n)
-		db := make([]uint16, dn)
-		e := LookupAccountSid(sys, sid, &b[0], &n, &db[0], &dn, &accType)
-		if e == nil {
-			return UTF16ToString(b), UTF16ToString(db), accType, nil
-		}
-		if e != ERROR_INSUFFICIENT_BUFFER {
-			return "", "", 0, e
-		}
-		if n <= uint32(len(b)) {
-			return "", "", 0, e
-		}
-	}
-}
-
-const (
-	// do not reorder
-	TOKEN_ASSIGN_PRIMARY = 1 << iota
-	TOKEN_DUPLICATE
-	TOKEN_IMPERSONATE
-	TOKEN_QUERY
-	TOKEN_QUERY_SOURCE
-	TOKEN_ADJUST_PRIVILEGES
-	TOKEN_ADJUST_GROUPS
-	TOKEN_ADJUST_DEFAULT
-
-	TOKEN_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED |
-		TOKEN_ASSIGN_PRIMARY |
-		TOKEN_DUPLICATE |
-		TOKEN_IMPERSONATE |
-		TOKEN_QUERY |
-		TOKEN_QUERY_SOURCE |
-		TOKEN_ADJUST_PRIVILEGES |
-		TOKEN_ADJUST_GROUPS |
-		TOKEN_ADJUST_DEFAULT
-	TOKEN_READ  = STANDARD_RIGHTS_READ | TOKEN_QUERY
-	TOKEN_WRITE = STANDARD_RIGHTS_WRITE |
-		TOKEN_ADJUST_PRIVILEGES |
-		TOKEN_ADJUST_GROUPS |
-		TOKEN_ADJUST_DEFAULT
-	TOKEN_EXECUTE = STANDARD_RIGHTS_EXECUTE
-)
-
-const (
-	// do not reorder
-	TokenUser = 1 + iota
-	TokenGroups
-	TokenPrivileges
-	TokenOwner
-	TokenPrimaryGroup
-	TokenDefaultDacl
-	TokenSource
-	TokenType
-	TokenImpersonationLevel
-	TokenStatistics
-	TokenRestrictedSids
-	TokenSessionId
-	TokenGroupsAndPrivileges
-	TokenSessionReference
-	TokenSandBoxInert
-	TokenAuditPolicy
-	TokenOrigin
-	TokenElevationType
-	TokenLinkedToken
-	TokenElevation
-	TokenHasRestrictions
-	TokenAccessInformation
-	TokenVirtualizationAllowed
-	TokenVirtualizationEnabled
-	TokenIntegrityLevel
-	TokenUIAccess
-	TokenMandatoryPolicy
-	TokenLogonSid
-	MaxTokenInfoClass
-)
-
-type SIDAndAttributes struct {
-	Sid        *SID
-	Attributes uint32
-}
-
-type Tokenuser struct {
-	User SIDAndAttributes
-}
-
-type Tokenprimarygroup struct {
-	PrimaryGroup *SID
-}
-
-type Tokengroups struct {
-	GroupCount uint32
-	Groups     [1]SIDAndAttributes
-}
-
-//sys	OpenProcessToken(h Handle, access uint32, token *Token) (err error) = advapi32.OpenProcessToken
-//sys	GetTokenInformation(t Token, infoClass uint32, info *byte, infoLen uint32, returnedLen *uint32) (err error) = advapi32.GetTokenInformation
-//sys	GetUserProfileDirectory(t Token, dir *uint16, dirLen *uint32) (err error) = userenv.GetUserProfileDirectoryW
-
-// An access token contains the security information for a logon session.
-// The system creates an access token when a user logs on, and every
-// process executed on behalf of the user has a copy of the token.
-// The token identifies the user, the user's groups, and the user's
-// privileges. The system uses the token to control access to securable
-// objects and to control the ability of the user to perform various
-// system-related operations on the local computer.
-type Token Handle
-
-// OpenCurrentProcessToken opens the access token
-// associated with current process.
-func OpenCurrentProcessToken() (Token, error) {
-	p, e := GetCurrentProcess()
-	if e != nil {
-		return 0, e
-	}
-	var t Token
-	e = OpenProcessToken(p, TOKEN_QUERY, &t)
-	if e != nil {
-		return 0, e
-	}
-	return t, nil
-}
-
-// Close releases access to access token.
-func (t Token) Close() error {
-	return CloseHandle(Handle(t))
-}
-
-// getInfo retrieves a specified type of information about an access token.
-func (t Token) getInfo(class uint32, initSize int) (unsafe.Pointer, error) {
-	n := uint32(initSize)
-	for {
-		b := make([]byte, n)
-		e := GetTokenInformation(t, class, &b[0], uint32(len(b)), &n)
-		if e == nil {
-			return unsafe.Pointer(&b[0]), nil
-		}
-		if e != ERROR_INSUFFICIENT_BUFFER {
-			return nil, e
-		}
-		if n <= uint32(len(b)) {
-			return nil, e
-		}
-	}
-}
-
-// GetTokenUser retrieves access token t user account information.
-func (t Token) GetTokenUser() (*Tokenuser, error) {
-	i, e := t.getInfo(TokenUser, 50)
-	if e != nil {
-		return nil, e
-	}
-	return (*Tokenuser)(i), nil
-}
-
-// GetTokenGroups retrieves group accounts associated with access token t.
-func (t Token) GetTokenGroups() (*Tokengroups, error) {
-	i, e := t.getInfo(TokenGroups, 50)
-	if e != nil {
-		return nil, e
-	}
-	return (*Tokengroups)(i), nil
-}
-
-// GetTokenPrimaryGroup retrieves access token t primary group information.
-// A pointer to a SID structure representing a group that will become
-// the primary group of any objects created by a process using this access token.
-func (t Token) GetTokenPrimaryGroup() (*Tokenprimarygroup, error) {
-	i, e := t.getInfo(TokenPrimaryGroup, 50)
-	if e != nil {
-		return nil, e
-	}
-	return (*Tokenprimarygroup)(i), nil
-}
-
-// GetUserProfileDirectory retrieves path to the
-// root directory of the access token t user's profile.
-func (t Token) GetUserProfileDirectory() (string, error) {
-	n := uint32(100)
-	for {
-		b := make([]uint16, n)
-		e := GetUserProfileDirectory(t, &b[0], &n)
-		if e == nil {
-			return UTF16ToString(b), nil
-		}
-		if e != ERROR_INSUFFICIENT_BUFFER {
-			return "", e
-		}
-		if n <= uint32(len(b)) {
-			return "", e
-		}
-	}
-}
diff --git a/vendor/golang.org/x/sys/windows/service.go b/vendor/golang.org/x/sys/windows/service.go
deleted file mode 100644
index 1c11d392f0..0000000000
--- a/vendor/golang.org/x/sys/windows/service.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package windows
-
-const (
-	SC_MANAGER_CONNECT            = 1
-	SC_MANAGER_CREATE_SERVICE     = 2
-	SC_MANAGER_ENUMERATE_SERVICE  = 4
-	SC_MANAGER_LOCK               = 8
-	SC_MANAGER_QUERY_LOCK_STATUS  = 16
-	SC_MANAGER_MODIFY_BOOT_CONFIG = 32
-	SC_MANAGER_ALL_ACCESS         = 0xf003f
-)
-
-//sys	OpenSCManager(machineName *uint16, databaseName *uint16, access uint32) (handle Handle, err error) [failretval==0] = advapi32.OpenSCManagerW
-
-const (
-	SERVICE_KERNEL_DRIVER       = 1
-	SERVICE_FILE_SYSTEM_DRIVER  = 2
-	SERVICE_ADAPTER             = 4
-	SERVICE_RECOGNIZER_DRIVER   = 8
-	SERVICE_WIN32_OWN_PROCESS   = 16
-	SERVICE_WIN32_SHARE_PROCESS = 32
-	SERVICE_WIN32               = SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS
-	SERVICE_INTERACTIVE_PROCESS = 256
-	SERVICE_DRIVER              = SERVICE_KERNEL_DRIVER | SERVICE_FILE_SYSTEM_DRIVER | SERVICE_RECOGNIZER_DRIVER
-	SERVICE_TYPE_ALL            = SERVICE_WIN32 | SERVICE_ADAPTER | SERVICE_DRIVER | SERVICE_INTERACTIVE_PROCESS
-
-	SERVICE_BOOT_START   = 0
-	SERVICE_SYSTEM_START = 1
-	SERVICE_AUTO_START   = 2
-	SERVICE_DEMAND_START = 3
-	SERVICE_DISABLED     = 4
-
-	SERVICE_ERROR_IGNORE   = 0
-	SERVICE_ERROR_NORMAL   = 1
-	SERVICE_ERROR_SEVERE   = 2
-	SERVICE_ERROR_CRITICAL = 3
-
-	SC_STATUS_PROCESS_INFO = 0
-
-	SERVICE_STOPPED          = 1
-	SERVICE_START_PENDING    = 2
-	SERVICE_STOP_PENDING     = 3
-	SERVICE_RUNNING          = 4
-	SERVICE_CONTINUE_PENDING = 5
-	SERVICE_PAUSE_PENDING    = 6
-	SERVICE_PAUSED           = 7
-	SERVICE_NO_CHANGE        = 0xffffffff
-
-	SERVICE_ACCEPT_STOP                  = 1
-	SERVICE_ACCEPT_PAUSE_CONTINUE        = 2
-	SERVICE_ACCEPT_SHUTDOWN              = 4
-	SERVICE_ACCEPT_PARAMCHANGE           = 8
-	SERVICE_ACCEPT_NETBINDCHANGE         = 16
-	SERVICE_ACCEPT_HARDWAREPROFILECHANGE = 32
-	SERVICE_ACCEPT_POWEREVENT            = 64
-	SERVICE_ACCEPT_SESSIONCHANGE         = 128
-
-	SERVICE_CONTROL_STOP                  = 1
-	SERVICE_CONTROL_PAUSE                 = 2
-	SERVICE_CONTROL_CONTINUE              = 3
-	SERVICE_CONTROL_INTERROGATE           = 4
-	SERVICE_CONTROL_SHUTDOWN              = 5
-	SERVICE_CONTROL_PARAMCHANGE           = 6
-	SERVICE_CONTROL_NETBINDADD            = 7
-	SERVICE_CONTROL_NETBINDREMOVE         = 8
-	SERVICE_CONTROL_NETBINDENABLE         = 9
-	SERVICE_CONTROL_NETBINDDISABLE        = 10
-	SERVICE_CONTROL_DEVICEEVENT           = 11
-	SERVICE_CONTROL_HARDWAREPROFILECHANGE = 12
-	SERVICE_CONTROL_POWEREVENT            = 13
-	SERVICE_CONTROL_SESSIONCHANGE         = 14
-
-	SERVICE_ACTIVE    = 1
-	SERVICE_INACTIVE  = 2
-	SERVICE_STATE_ALL = 3
-
-	SERVICE_QUERY_CONFIG           = 1
-	SERVICE_CHANGE_CONFIG          = 2
-	SERVICE_QUERY_STATUS           = 4
-	SERVICE_ENUMERATE_DEPENDENTS   = 8
-	SERVICE_START                  = 16
-	SERVICE_STOP                   = 32
-	SERVICE_PAUSE_CONTINUE         = 64
-	SERVICE_INTERROGATE            = 128
-	SERVICE_USER_DEFINED_CONTROL   = 256
-	SERVICE_ALL_ACCESS             = STANDARD_RIGHTS_REQUIRED | SERVICE_QUERY_CONFIG | SERVICE_CHANGE_CONFIG | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_START | SERVICE_STOP | SERVICE_PAUSE_CONTINUE | SERVICE_INTERROGATE | SERVICE_USER_DEFINED_CONTROL
-	SERVICE_RUNS_IN_SYSTEM_PROCESS = 1
-	SERVICE_CONFIG_DESCRIPTION     = 1
-	SERVICE_CONFIG_FAILURE_ACTIONS = 2
-
-	NO_ERROR = 0
-)
-
-type SERVICE_STATUS struct {
-	ServiceType             uint32
-	CurrentState            uint32
-	ControlsAccepted        uint32
-	Win32ExitCode           uint32
-	ServiceSpecificExitCode uint32
-	CheckPoint              uint32
-	WaitHint                uint32
-}
-
-type SERVICE_TABLE_ENTRY struct {
-	ServiceName *uint16
-	ServiceProc uintptr
-}
-
-type QUERY_SERVICE_CONFIG struct {
-	ServiceType      uint32
-	StartType        uint32
-	ErrorControl     uint32
-	BinaryPathName   *uint16
-	LoadOrderGroup   *uint16
-	TagId            uint32
-	Dependencies     *uint16
-	ServiceStartName *uint16
-	DisplayName      *uint16
-}
-
-type SERVICE_DESCRIPTION struct {
-	Description *uint16
-}
-
-//sys	CloseServiceHandle(handle Handle) (err error) = advapi32.CloseServiceHandle
-//sys	CreateService(mgr Handle, serviceName *uint16, displayName *uint16, access uint32, srvType uint32, startType uint32, errCtl uint32, pathName *uint16, loadOrderGroup *uint16, tagId *uint32, dependencies *uint16, serviceStartName *uint16, password *uint16) (handle Handle, err error) [failretval==0] = advapi32.CreateServiceW
-//sys	OpenService(mgr Handle, serviceName *uint16, access uint32) (handle Handle, err error) [failretval==0] = advapi32.OpenServiceW
-//sys	DeleteService(service Handle) (err error) = advapi32.DeleteService
-//sys	StartService(service Handle, numArgs uint32, argVectors **uint16) (err error) = advapi32.StartServiceW
-//sys	QueryServiceStatus(service Handle, status *SERVICE_STATUS) (err error) = advapi32.QueryServiceStatus
-//sys	ControlService(service Handle, control uint32, status *SERVICE_STATUS) (err error) = advapi32.ControlService
-//sys	StartServiceCtrlDispatcher(serviceTable *SERVICE_TABLE_ENTRY) (err error) = advapi32.StartServiceCtrlDispatcherW
-//sys	SetServiceStatus(service Handle, serviceStatus *SERVICE_STATUS) (err error) = advapi32.SetServiceStatus
-//sys	ChangeServiceConfig(service Handle, serviceType uint32, startType uint32, errorControl uint32, binaryPathName *uint16, loadOrderGroup *uint16, tagId *uint32, dependencies *uint16, serviceStartName *uint16, password *uint16, displayName *uint16) (err error) = advapi32.ChangeServiceConfigW
-//sys	QueryServiceConfig(service Handle, serviceConfig *QUERY_SERVICE_CONFIG, bufSize uint32, bytesNeeded *uint32) (err error) = advapi32.QueryServiceConfigW
-//sys	ChangeServiceConfig2(service Handle, infoLevel uint32, info *byte) (err error) = advapi32.ChangeServiceConfig2W
-//sys	QueryServiceConfig2(service Handle, infoLevel uint32, buff *byte, buffSize uint32, bytesNeeded *uint32) (err error) = advapi32.QueryServiceConfig2W
diff --git a/vendor/golang.org/x/sys/windows/str.go b/vendor/golang.org/x/sys/windows/str.go
deleted file mode 100644
index 917cc2aae4..0000000000
--- a/vendor/golang.org/x/sys/windows/str.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package windows
-
-func itoa(val int) string { // do it here rather than with fmt to avoid dependency
-	if val < 0 {
-		return "-" + itoa(-val)
-	}
-	var buf [32]byte // big enough for int64
-	i := len(buf) - 1
-	for val >= 10 {
-		buf[i] = byte(val%10 + '0')
-		i--
-		val /= 10
-	}
-	buf[i] = byte(val + '0')
-	return string(buf[i:])
-}
diff --git a/vendor/golang.org/x/sys/windows/syscall.go b/vendor/golang.org/x/sys/windows/syscall.go
deleted file mode 100644
index 4e2fbe86e2..0000000000
--- a/vendor/golang.org/x/sys/windows/syscall.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-// Package windows contains an interface to the low-level operating system
-// primitives.  OS details vary depending on the underlying system, and
-// by default, godoc will display the OS-specific documentation for the current
-// system.  If you want godoc to display syscall documentation for another
-// system, set $GOOS and $GOARCH to the desired system.  For example, if
-// you want to view documentation for freebsd/arm on linux/amd64, set $GOOS
-// to freebsd and $GOARCH to arm.
-// The primary use of this package is inside other packages that provide a more
-// portable interface to the system, such as "os", "time" and "net".  Use
-// those packages rather than this one if you can.
-// For details of the functions and data types in this package consult
-// the manuals for the appropriate operating system.
-// These calls return err == nil to indicate success; otherwise
-// err represents an operating system error describing the failure and
-// holds a value of type syscall.Errno.
-package windows // import "golang.org/x/sys/windows"
-
-import (
-	"syscall"
-)
-
-// ByteSliceFromString returns a NUL-terminated slice of bytes
-// containing the text of s. If s contains a NUL byte at any
-// location, it returns (nil, syscall.EINVAL).
-func ByteSliceFromString(s string) ([]byte, error) {
-	for i := 0; i < len(s); i++ {
-		if s[i] == 0 {
-			return nil, syscall.EINVAL
-		}
-	}
-	a := make([]byte, len(s)+1)
-	copy(a, s)
-	return a, nil
-}
-
-// BytePtrFromString returns a pointer to a NUL-terminated array of
-// bytes containing the text of s. If s contains a NUL byte at any
-// location, it returns (nil, syscall.EINVAL).
-func BytePtrFromString(s string) (*byte, error) {
-	a, err := ByteSliceFromString(s)
-	if err != nil {
-		return nil, err
-	}
-	return &a[0], nil
-}
-
-// Single-word zero for use when we need a valid pointer to 0 bytes.
-// See mksyscall.pl.
-var _zero uintptr
-
-func (ts *Timespec) Unix() (sec int64, nsec int64) {
-	return int64(ts.Sec), int64(ts.Nsec)
-}
-
-func (tv *Timeval) Unix() (sec int64, nsec int64) {
-	return int64(tv.Sec), int64(tv.Usec) * 1000
-}
-
-func (ts *Timespec) Nano() int64 {
-	return int64(ts.Sec)*1e9 + int64(ts.Nsec)
-}
-
-func (tv *Timeval) Nano() int64 {
-	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000
-}
diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go
deleted file mode 100644
index 99b11fe6a6..0000000000
--- a/vendor/golang.org/x/sys/windows/syscall_windows.go
+++ /dev/null
@@ -1,991 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Windows system calls.
-
-package windows
-
-import (
-	errorspkg "errors"
-	"sync"
-	"syscall"
-	"unicode/utf16"
-	"unsafe"
-)
-
-type Handle uintptr
-
-const InvalidHandle = ^Handle(0)
-
-// StringToUTF16 is deprecated. Use UTF16FromString instead.
-// If s contains a NUL byte this function panics instead of
-// returning an error.
-func StringToUTF16(s string) []uint16 {
-	a, err := UTF16FromString(s)
-	if err != nil {
-		panic("windows: string with NUL passed to StringToUTF16")
-	}
-	return a
-}
-
-// UTF16FromString returns the UTF-16 encoding of the UTF-8 string
-// s, with a terminating NUL added. If s contains a NUL byte at any
-// location, it returns (nil, syscall.EINVAL).
-func UTF16FromString(s string) ([]uint16, error) {
-	for i := 0; i < len(s); i++ {
-		if s[i] == 0 {
-			return nil, syscall.EINVAL
-		}
-	}
-	return utf16.Encode([]rune(s + "\x00")), nil
-}
-
-// UTF16ToString returns the UTF-8 encoding of the UTF-16 sequence s,
-// with a terminating NUL removed.
-func UTF16ToString(s []uint16) string {
-	for i, v := range s {
-		if v == 0 {
-			s = s[0:i]
-			break
-		}
-	}
-	return string(utf16.Decode(s))
-}
-
-// StringToUTF16Ptr is deprecated. Use UTF16PtrFromString instead.
-// If s contains a NUL byte this function panics instead of
-// returning an error.
-func StringToUTF16Ptr(s string) *uint16 { return &StringToUTF16(s)[0] }
-
-// UTF16PtrFromString returns pointer to the UTF-16 encoding of
-// the UTF-8 string s, with a terminating NUL added. If s
-// contains a NUL byte at any location, it returns (nil, syscall.EINVAL).
-func UTF16PtrFromString(s string) (*uint16, error) {
-	a, err := UTF16FromString(s)
-	if err != nil {
-		return nil, err
-	}
-	return &a[0], nil
-}
-
-func Getpagesize() int { return 4096 }
-
-// Converts a Go function to a function pointer conforming
-// to the stdcall or cdecl calling convention.  This is useful when
-// interoperating with Windows code requiring callbacks.
-// Implemented in runtime/syscall_windows.goc
-func NewCallback(fn interface{}) uintptr
-func NewCallbackCDecl(fn interface{}) uintptr
-
-// windows api calls
-
-//sys	GetLastError() (lasterr error)
-//sys	LoadLibrary(libname string) (handle Handle, err error) = LoadLibraryW
-//sys	LoadLibraryEx(libname string, zero Handle, flags uintptr) (handle Handle, err error) = LoadLibraryExW
-//sys	FreeLibrary(handle Handle) (err error)
-//sys	GetProcAddress(module Handle, procname string) (proc uintptr, err error)
-//sys	GetVersion() (ver uint32, err error)
-//sys	FormatMessage(flags uint32, msgsrc uintptr, msgid uint32, langid uint32, buf []uint16, args *byte) (n uint32, err error) = FormatMessageW
-//sys	ExitProcess(exitcode uint32)
-//sys	CreateFile(name *uint16, access uint32, mode uint32, sa *SecurityAttributes, createmode uint32, attrs uint32, templatefile int32) (handle Handle, err error) [failretval==InvalidHandle] = CreateFileW
-//sys	ReadFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error)
-//sys	WriteFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error)
-//sys	SetFilePointer(handle Handle, lowoffset int32, highoffsetptr *int32, whence uint32) (newlowoffset uint32, err error) [failretval==0xffffffff]
-//sys	CloseHandle(handle Handle) (err error)
-//sys	GetStdHandle(stdhandle uint32) (handle Handle, err error) [failretval==InvalidHandle]
-//sys	SetStdHandle(stdhandle uint32, handle Handle) (err error)
-//sys	findFirstFile1(name *uint16, data *win32finddata1) (handle Handle, err error) [failretval==InvalidHandle] = FindFirstFileW
-//sys	findNextFile1(handle Handle, data *win32finddata1) (err error) = FindNextFileW
-//sys	FindClose(handle Handle) (err error)
-//sys	GetFileInformationByHandle(handle Handle, data *ByHandleFileInformation) (err error)
-//sys	GetCurrentDirectory(buflen uint32, buf *uint16) (n uint32, err error) = GetCurrentDirectoryW
-//sys	SetCurrentDirectory(path *uint16) (err error) = SetCurrentDirectoryW
-//sys	CreateDirectory(path *uint16, sa *SecurityAttributes) (err error) = CreateDirectoryW
-//sys	RemoveDirectory(path *uint16) (err error) = RemoveDirectoryW
-//sys	DeleteFile(path *uint16) (err error) = DeleteFileW
-//sys	MoveFile(from *uint16, to *uint16) (err error) = MoveFileW
-//sys	MoveFileEx(from *uint16, to *uint16, flags uint32) (err error) = MoveFileExW
-//sys	GetComputerName(buf *uint16, n *uint32) (err error) = GetComputerNameW
-//sys	GetComputerNameEx(nametype uint32, buf *uint16, n *uint32) (err error) = GetComputerNameExW
-//sys	SetEndOfFile(handle Handle) (err error)
-//sys	GetSystemTimeAsFileTime(time *Filetime)
-//sys	GetSystemTimePreciseAsFileTime(time *Filetime)
-//sys	GetTimeZoneInformation(tzi *Timezoneinformation) (rc uint32, err error) [failretval==0xffffffff]
-//sys	CreateIoCompletionPort(filehandle Handle, cphandle Handle, key uint32, threadcnt uint32) (handle Handle, err error)
-//sys	GetQueuedCompletionStatus(cphandle Handle, qty *uint32, key *uint32, overlapped **Overlapped, timeout uint32) (err error)
-//sys	PostQueuedCompletionStatus(cphandle Handle, qty uint32, key uint32, overlapped *Overlapped) (err error)
-//sys	CancelIo(s Handle) (err error)
-//sys	CancelIoEx(s Handle, o *Overlapped) (err error)
-//sys	CreateProcess(appName *uint16, commandLine *uint16, procSecurity *SecurityAttributes, threadSecurity *SecurityAttributes, inheritHandles bool, creationFlags uint32, env *uint16, currentDir *uint16, startupInfo *StartupInfo, outProcInfo *ProcessInformation) (err error) = CreateProcessW
-//sys	OpenProcess(da uint32, inheritHandle bool, pid uint32) (handle Handle, err error)
-//sys	TerminateProcess(handle Handle, exitcode uint32) (err error)
-//sys	GetExitCodeProcess(handle Handle, exitcode *uint32) (err error)
-//sys	GetStartupInfo(startupInfo *StartupInfo) (err error) = GetStartupInfoW
-//sys	GetCurrentProcess() (pseudoHandle Handle, err error)
-//sys	GetProcessTimes(handle Handle, creationTime *Filetime, exitTime *Filetime, kernelTime *Filetime, userTime *Filetime) (err error)
-//sys	DuplicateHandle(hSourceProcessHandle Handle, hSourceHandle Handle, hTargetProcessHandle Handle, lpTargetHandle *Handle, dwDesiredAccess uint32, bInheritHandle bool, dwOptions uint32) (err error)
-//sys	WaitForSingleObject(handle Handle, waitMilliseconds uint32) (event uint32, err error) [failretval==0xffffffff]
-//sys	GetTempPath(buflen uint32, buf *uint16) (n uint32, err error) = GetTempPathW
-//sys	CreatePipe(readhandle *Handle, writehandle *Handle, sa *SecurityAttributes, size uint32) (err error)
-//sys	GetFileType(filehandle Handle) (n uint32, err error)
-//sys	CryptAcquireContext(provhandle *Handle, container *uint16, provider *uint16, provtype uint32, flags uint32) (err error) = advapi32.CryptAcquireContextW
-//sys	CryptReleaseContext(provhandle Handle, flags uint32) (err error) = advapi32.CryptReleaseContext
-//sys	CryptGenRandom(provhandle Handle, buflen uint32, buf *byte) (err error) = advapi32.CryptGenRandom
-//sys	GetEnvironmentStrings() (envs *uint16, err error) [failretval==nil] = kernel32.GetEnvironmentStringsW
-//sys	FreeEnvironmentStrings(envs *uint16) (err error) = kernel32.FreeEnvironmentStringsW
-//sys	GetEnvironmentVariable(name *uint16, buffer *uint16, size uint32) (n uint32, err error) = kernel32.GetEnvironmentVariableW
-//sys	SetEnvironmentVariable(name *uint16, value *uint16) (err error) = kernel32.SetEnvironmentVariableW
-//sys	SetFileTime(handle Handle, ctime *Filetime, atime *Filetime, wtime *Filetime) (err error)
-//sys	GetFileAttributes(name *uint16) (attrs uint32, err error) [failretval==INVALID_FILE_ATTRIBUTES] = kernel32.GetFileAttributesW
-//sys	SetFileAttributes(name *uint16, attrs uint32) (err error) = kernel32.SetFileAttributesW
-//sys	GetFileAttributesEx(name *uint16, level uint32, info *byte) (err error) = kernel32.GetFileAttributesExW
-//sys	GetCommandLine() (cmd *uint16) = kernel32.GetCommandLineW
-//sys	CommandLineToArgv(cmd *uint16, argc *int32) (argv *[8192]*[8192]uint16, err error) [failretval==nil] = shell32.CommandLineToArgvW
-//sys	LocalFree(hmem Handle) (handle Handle, err error) [failretval!=0]
-//sys	SetHandleInformation(handle Handle, mask uint32, flags uint32) (err error)
-//sys	FlushFileBuffers(handle Handle) (err error)
-//sys	GetFullPathName(path *uint16, buflen uint32, buf *uint16, fname **uint16) (n uint32, err error) = kernel32.GetFullPathNameW
-//sys	GetLongPathName(path *uint16, buf *uint16, buflen uint32) (n uint32, err error) = kernel32.GetLongPathNameW
-//sys	GetShortPathName(longpath *uint16, shortpath *uint16, buflen uint32) (n uint32, err error) = kernel32.GetShortPathNameW
-//sys	CreateFileMapping(fhandle Handle, sa *SecurityAttributes, prot uint32, maxSizeHigh uint32, maxSizeLow uint32, name *uint16) (handle Handle, err error) = kernel32.CreateFileMappingW
-//sys	MapViewOfFile(handle Handle, access uint32, offsetHigh uint32, offsetLow uint32, length uintptr) (addr uintptr, err error)
-//sys	UnmapViewOfFile(addr uintptr) (err error)
-//sys	FlushViewOfFile(addr uintptr, length uintptr) (err error)
-//sys	VirtualLock(addr uintptr, length uintptr) (err error)
-//sys	VirtualUnlock(addr uintptr, length uintptr) (err error)
-//sys	TransmitFile(s Handle, handle Handle, bytesToWrite uint32, bytsPerSend uint32, overlapped *Overlapped, transmitFileBuf *TransmitFileBuffers, flags uint32) (err error) = mswsock.TransmitFile
-//sys	ReadDirectoryChanges(handle Handle, buf *byte, buflen uint32, watchSubTree bool, mask uint32, retlen *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) = kernel32.ReadDirectoryChangesW
-//sys	CertOpenSystemStore(hprov Handle, name *uint16) (store Handle, err error) = crypt32.CertOpenSystemStoreW
-//sys   CertOpenStore(storeProvider uintptr, msgAndCertEncodingType uint32, cryptProv uintptr, flags uint32, para uintptr) (handle Handle, err error) [failretval==InvalidHandle] = crypt32.CertOpenStore
-//sys	CertEnumCertificatesInStore(store Handle, prevContext *CertContext) (context *CertContext, err error) [failretval==nil] = crypt32.CertEnumCertificatesInStore
-//sys   CertAddCertificateContextToStore(store Handle, certContext *CertContext, addDisposition uint32, storeContext **CertContext) (err error) = crypt32.CertAddCertificateContextToStore
-//sys	CertCloseStore(store Handle, flags uint32) (err error) = crypt32.CertCloseStore
-//sys   CertGetCertificateChain(engine Handle, leaf *CertContext, time *Filetime, additionalStore Handle, para *CertChainPara, flags uint32, reserved uintptr, chainCtx **CertChainContext) (err error) = crypt32.CertGetCertificateChain
-//sys   CertFreeCertificateChain(ctx *CertChainContext) = crypt32.CertFreeCertificateChain
-//sys   CertCreateCertificateContext(certEncodingType uint32, certEncoded *byte, encodedLen uint32) (context *CertContext, err error) [failretval==nil] = crypt32.CertCreateCertificateContext
-//sys   CertFreeCertificateContext(ctx *CertContext) (err error) = crypt32.CertFreeCertificateContext
-//sys   CertVerifyCertificateChainPolicy(policyOID uintptr, chain *CertChainContext, para *CertChainPolicyPara, status *CertChainPolicyStatus) (err error) = crypt32.CertVerifyCertificateChainPolicy
-//sys	RegOpenKeyEx(key Handle, subkey *uint16, options uint32, desiredAccess uint32, result *Handle) (regerrno error) = advapi32.RegOpenKeyExW
-//sys	RegCloseKey(key Handle) (regerrno error) = advapi32.RegCloseKey
-//sys	RegQueryInfoKey(key Handle, class *uint16, classLen *uint32, reserved *uint32, subkeysLen *uint32, maxSubkeyLen *uint32, maxClassLen *uint32, valuesLen *uint32, maxValueNameLen *uint32, maxValueLen *uint32, saLen *uint32, lastWriteTime *Filetime) (regerrno error) = advapi32.RegQueryInfoKeyW
-//sys	RegEnumKeyEx(key Handle, index uint32, name *uint16, nameLen *uint32, reserved *uint32, class *uint16, classLen *uint32, lastWriteTime *Filetime) (regerrno error) = advapi32.RegEnumKeyExW
-//sys	RegQueryValueEx(key Handle, name *uint16, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) = advapi32.RegQueryValueExW
-//sys	getCurrentProcessId() (pid uint32) = kernel32.GetCurrentProcessId
-//sys	GetConsoleMode(console Handle, mode *uint32) (err error) = kernel32.GetConsoleMode
-//sys	WriteConsole(console Handle, buf *uint16, towrite uint32, written *uint32, reserved *byte) (err error) = kernel32.WriteConsoleW
-//sys	ReadConsole(console Handle, buf *uint16, toread uint32, read *uint32, inputControl *byte) (err error) = kernel32.ReadConsoleW
-//sys	CreateToolhelp32Snapshot(flags uint32, processId uint32) (handle Handle, err error) [failretval==InvalidHandle] = kernel32.CreateToolhelp32Snapshot
-//sys	Process32First(snapshot Handle, procEntry *ProcessEntry32) (err error) = kernel32.Process32FirstW
-//sys	Process32Next(snapshot Handle, procEntry *ProcessEntry32) (err error) = kernel32.Process32NextW
-//sys	DeviceIoControl(handle Handle, ioControlCode uint32, inBuffer *byte, inBufferSize uint32, outBuffer *byte, outBufferSize uint32, bytesReturned *uint32, overlapped *Overlapped) (err error)
-// This function returns 1 byte BOOLEAN rather than the 4 byte BOOL.
-//sys	CreateSymbolicLink(symlinkfilename *uint16, targetfilename *uint16, flags uint32) (err error) [failretval&0xff==0] = CreateSymbolicLinkW
-//sys	CreateHardLink(filename *uint16, existingfilename *uint16, reserved uintptr) (err error) [failretval&0xff==0] = CreateHardLinkW
-//sys	GetCurrentThreadId() (id uint32)
-//sys	CreateEvent(eventAttrs *syscall.SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle Handle, err error) = kernel32.CreateEventW
-//sys	SetEvent(event Handle) (err error) = kernel32.SetEvent
-
-// syscall interface implementation for other packages
-
-func Exit(code int) { ExitProcess(uint32(code)) }
-
-func makeInheritSa() *SecurityAttributes {
-	var sa SecurityAttributes
-	sa.Length = uint32(unsafe.Sizeof(sa))
-	sa.InheritHandle = 1
-	return &sa
-}
-
-func Open(path string, mode int, perm uint32) (fd Handle, err error) {
-	if len(path) == 0 {
-		return InvalidHandle, ERROR_FILE_NOT_FOUND
-	}
-	pathp, err := UTF16PtrFromString(path)
-	if err != nil {
-		return InvalidHandle, err
-	}
-	var access uint32
-	switch mode & (O_RDONLY | O_WRONLY | O_RDWR) {
-	case O_RDONLY:
-		access = GENERIC_READ
-	case O_WRONLY:
-		access = GENERIC_WRITE
-	case O_RDWR:
-		access = GENERIC_READ | GENERIC_WRITE
-	}
-	if mode&O_CREAT != 0 {
-		access |= GENERIC_WRITE
-	}
-	if mode&O_APPEND != 0 {
-		access &^= GENERIC_WRITE
-		access |= FILE_APPEND_DATA
-	}
-	sharemode := uint32(FILE_SHARE_READ | FILE_SHARE_WRITE)
-	var sa *SecurityAttributes
-	if mode&O_CLOEXEC == 0 {
-		sa = makeInheritSa()
-	}
-	var createmode uint32
-	switch {
-	case mode&(O_CREAT|O_EXCL) == (O_CREAT | O_EXCL):
-		createmode = CREATE_NEW
-	case mode&(O_CREAT|O_TRUNC) == (O_CREAT | O_TRUNC):
-		createmode = CREATE_ALWAYS
-	case mode&O_CREAT == O_CREAT:
-		createmode = OPEN_ALWAYS
-	case mode&O_TRUNC == O_TRUNC:
-		createmode = TRUNCATE_EXISTING
-	default:
-		createmode = OPEN_EXISTING
-	}
-	h, e := CreateFile(pathp, access, sharemode, sa, createmode, FILE_ATTRIBUTE_NORMAL, 0)
-	return h, e
-}
-
-func Read(fd Handle, p []byte) (n int, err error) {
-	var done uint32
-	e := ReadFile(fd, p, &done, nil)
-	if e != nil {
-		if e == ERROR_BROKEN_PIPE {
-			// NOTE(brainman): work around ERROR_BROKEN_PIPE is returned on reading EOF from stdin
-			return 0, nil
-		}
-		return 0, e
-	}
-	if raceenabled {
-		if done > 0 {
-			raceWriteRange(unsafe.Pointer(&p[0]), int(done))
-		}
-		raceAcquire(unsafe.Pointer(&ioSync))
-	}
-	return int(done), nil
-}
-
-func Write(fd Handle, p []byte) (n int, err error) {
-	if raceenabled {
-		raceReleaseMerge(unsafe.Pointer(&ioSync))
-	}
-	var done uint32
-	e := WriteFile(fd, p, &done, nil)
-	if e != nil {
-		return 0, e
-	}
-	if raceenabled && done > 0 {
-		raceReadRange(unsafe.Pointer(&p[0]), int(done))
-	}
-	return int(done), nil
-}
-
-var ioSync int64
-
-func Seek(fd Handle, offset int64, whence int) (newoffset int64, err error) {
-	var w uint32
-	switch whence {
-	case 0:
-		w = FILE_BEGIN
-	case 1:
-		w = FILE_CURRENT
-	case 2:
-		w = FILE_END
-	}
-	hi := int32(offset >> 32)
-	lo := int32(offset)
-	// use GetFileType to check pipe, pipe can't do seek
-	ft, _ := GetFileType(fd)
-	if ft == FILE_TYPE_PIPE {
-		return 0, syscall.EPIPE
-	}
-	rlo, e := SetFilePointer(fd, lo, &hi, w)
-	if e != nil {
-		return 0, e
-	}
-	return int64(hi)<<32 + int64(rlo), nil
-}
-
-func Close(fd Handle) (err error) {
-	return CloseHandle(fd)
-}
-
-var (
-	Stdin  = getStdHandle(STD_INPUT_HANDLE)
-	Stdout = getStdHandle(STD_OUTPUT_HANDLE)
-	Stderr = getStdHandle(STD_ERROR_HANDLE)
-)
-
-func getStdHandle(stdhandle uint32) (fd Handle) {
-	r, _ := GetStdHandle(stdhandle)
-	CloseOnExec(r)
-	return r
-}
-
-const ImplementsGetwd = true
-
-func Getwd() (wd string, err error) {
-	b := make([]uint16, 300)
-	n, e := GetCurrentDirectory(uint32(len(b)), &b[0])
-	if e != nil {
-		return "", e
-	}
-	return string(utf16.Decode(b[0:n])), nil
-}
-
-func Chdir(path string) (err error) {
-	pathp, err := UTF16PtrFromString(path)
-	if err != nil {
-		return err
-	}
-	return SetCurrentDirectory(pathp)
-}
-
-func Mkdir(path string, mode uint32) (err error) {
-	pathp, err := UTF16PtrFromString(path)
-	if err != nil {
-		return err
-	}
-	return CreateDirectory(pathp, nil)
-}
-
-func Rmdir(path string) (err error) {
-	pathp, err := UTF16PtrFromString(path)
-	if err != nil {
-		return err
-	}
-	return RemoveDirectory(pathp)
-}
-
-func Unlink(path string) (err error) {
-	pathp, err := UTF16PtrFromString(path)
-	if err != nil {
-		return err
-	}
-	return DeleteFile(pathp)
-}
-
-func Rename(oldpath, newpath string) (err error) {
-	from, err := UTF16PtrFromString(oldpath)
-	if err != nil {
-		return err
-	}
-	to, err := UTF16PtrFromString(newpath)
-	if err != nil {
-		return err
-	}
-	return MoveFileEx(from, to, MOVEFILE_REPLACE_EXISTING)
-}
-
-func ComputerName() (name string, err error) {
-	var n uint32 = MAX_COMPUTERNAME_LENGTH + 1
-	b := make([]uint16, n)
-	e := GetComputerName(&b[0], &n)
-	if e != nil {
-		return "", e
-	}
-	return string(utf16.Decode(b[0:n])), nil
-}
-
-func Ftruncate(fd Handle, length int64) (err error) {
-	curoffset, e := Seek(fd, 0, 1)
-	if e != nil {
-		return e
-	}
-	defer Seek(fd, curoffset, 0)
-	_, e = Seek(fd, length, 0)
-	if e != nil {
-		return e
-	}
-	e = SetEndOfFile(fd)
-	if e != nil {
-		return e
-	}
-	return nil
-}
-
-func Gettimeofday(tv *Timeval) (err error) {
-	var ft Filetime
-	GetSystemTimeAsFileTime(&ft)
-	*tv = NsecToTimeval(ft.Nanoseconds())
-	return nil
-}
-
-func Pipe(p []Handle) (err error) {
-	if len(p) != 2 {
-		return syscall.EINVAL
-	}
-	var r, w Handle
-	e := CreatePipe(&r, &w, makeInheritSa(), 0)
-	if e != nil {
-		return e
-	}
-	p[0] = r
-	p[1] = w
-	return nil
-}
-
-func Utimes(path string, tv []Timeval) (err error) {
-	if len(tv) != 2 {
-		return syscall.EINVAL
-	}
-	pathp, e := UTF16PtrFromString(path)
-	if e != nil {
-		return e
-	}
-	h, e := CreateFile(pathp,
-		FILE_WRITE_ATTRIBUTES, FILE_SHARE_WRITE, nil,
-		OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0)
-	if e != nil {
-		return e
-	}
-	defer Close(h)
-	a := NsecToFiletime(tv[0].Nanoseconds())
-	w := NsecToFiletime(tv[1].Nanoseconds())
-	return SetFileTime(h, nil, &a, &w)
-}
-
-func UtimesNano(path string, ts []Timespec) (err error) {
-	if len(ts) != 2 {
-		return syscall.EINVAL
-	}
-	pathp, e := UTF16PtrFromString(path)
-	if e != nil {
-		return e
-	}
-	h, e := CreateFile(pathp,
-		FILE_WRITE_ATTRIBUTES, FILE_SHARE_WRITE, nil,
-		OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0)
-	if e != nil {
-		return e
-	}
-	defer Close(h)
-	a := NsecToFiletime(TimespecToNsec(ts[0]))
-	w := NsecToFiletime(TimespecToNsec(ts[1]))
-	return SetFileTime(h, nil, &a, &w)
-}
-
-func Fsync(fd Handle) (err error) {
-	return FlushFileBuffers(fd)
-}
-
-func Chmod(path string, mode uint32) (err error) {
-	if mode == 0 {
-		return syscall.EINVAL
-	}
-	p, e := UTF16PtrFromString(path)
-	if e != nil {
-		return e
-	}
-	attrs, e := GetFileAttributes(p)
-	if e != nil {
-		return e
-	}
-	if mode&S_IWRITE != 0 {
-		attrs &^= FILE_ATTRIBUTE_READONLY
-	} else {
-		attrs |= FILE_ATTRIBUTE_READONLY
-	}
-	return SetFileAttributes(p, attrs)
-}
-
-func LoadCancelIoEx() error {
-	return procCancelIoEx.Find()
-}
-
-func LoadSetFileCompletionNotificationModes() error {
-	return procSetFileCompletionNotificationModes.Find()
-}
-
-// net api calls
-
-const socket_error = uintptr(^uint32(0))
-
-//sys	WSAStartup(verreq uint32, data *WSAData) (sockerr error) = ws2_32.WSAStartup
-//sys	WSACleanup() (err error) [failretval==socket_error] = ws2_32.WSACleanup
-//sys	WSAIoctl(s Handle, iocc uint32, inbuf *byte, cbif uint32, outbuf *byte, cbob uint32, cbbr *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) [failretval==socket_error] = ws2_32.WSAIoctl
-//sys	socket(af int32, typ int32, protocol int32) (handle Handle, err error) [failretval==InvalidHandle] = ws2_32.socket
-//sys	Setsockopt(s Handle, level int32, optname int32, optval *byte, optlen int32) (err error) [failretval==socket_error] = ws2_32.setsockopt
-//sys	Getsockopt(s Handle, level int32, optname int32, optval *byte, optlen *int32) (err error) [failretval==socket_error] = ws2_32.getsockopt
-//sys	bind(s Handle, name unsafe.Pointer, namelen int32) (err error) [failretval==socket_error] = ws2_32.bind
-//sys	connect(s Handle, name unsafe.Pointer, namelen int32) (err error) [failretval==socket_error] = ws2_32.connect
-//sys	getsockname(s Handle, rsa *RawSockaddrAny, addrlen *int32) (err error) [failretval==socket_error] = ws2_32.getsockname
-//sys	getpeername(s Handle, rsa *RawSockaddrAny, addrlen *int32) (err error) [failretval==socket_error] = ws2_32.getpeername
-//sys	listen(s Handle, backlog int32) (err error) [failretval==socket_error] = ws2_32.listen
-//sys	shutdown(s Handle, how int32) (err error) [failretval==socket_error] = ws2_32.shutdown
-//sys	Closesocket(s Handle) (err error) [failretval==socket_error] = ws2_32.closesocket
-//sys	AcceptEx(ls Handle, as Handle, buf *byte, rxdatalen uint32, laddrlen uint32, raddrlen uint32, recvd *uint32, overlapped *Overlapped) (err error) = mswsock.AcceptEx
-//sys	GetAcceptExSockaddrs(buf *byte, rxdatalen uint32, laddrlen uint32, raddrlen uint32, lrsa **RawSockaddrAny, lrsalen *int32, rrsa **RawSockaddrAny, rrsalen *int32) = mswsock.GetAcceptExSockaddrs
-//sys	WSARecv(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32, overlapped *Overlapped, croutine *byte) (err error) [failretval==socket_error] = ws2_32.WSARecv
-//sys	WSASend(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, overlapped *Overlapped, croutine *byte) (err error) [failretval==socket_error] = ws2_32.WSASend
-//sys	WSARecvFrom(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32,  from *RawSockaddrAny, fromlen *int32, overlapped *Overlapped, croutine *byte) (err error) [failretval==socket_error] = ws2_32.WSARecvFrom
-//sys	WSASendTo(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, to *RawSockaddrAny, tolen int32,  overlapped *Overlapped, croutine *byte) (err error) [failretval==socket_error] = ws2_32.WSASendTo
-//sys	GetHostByName(name string) (h *Hostent, err error) [failretval==nil] = ws2_32.gethostbyname
-//sys	GetServByName(name string, proto string) (s *Servent, err error) [failretval==nil] = ws2_32.getservbyname
-//sys	Ntohs(netshort uint16) (u uint16) = ws2_32.ntohs
-//sys	GetProtoByName(name string) (p *Protoent, err error) [failretval==nil] = ws2_32.getprotobyname
-//sys	DnsQuery(name string, qtype uint16, options uint32, extra *byte, qrs **DNSRecord, pr *byte) (status error) = dnsapi.DnsQuery_W
-//sys	DnsRecordListFree(rl *DNSRecord, freetype uint32) = dnsapi.DnsRecordListFree
-//sys	DnsNameCompare(name1 *uint16, name2 *uint16) (same bool) = dnsapi.DnsNameCompare_W
-//sys	GetAddrInfoW(nodename *uint16, servicename *uint16, hints *AddrinfoW, result **AddrinfoW) (sockerr error) = ws2_32.GetAddrInfoW
-//sys	FreeAddrInfoW(addrinfo *AddrinfoW) = ws2_32.FreeAddrInfoW
-//sys	GetIfEntry(pIfRow *MibIfRow) (errcode error) = iphlpapi.GetIfEntry
-//sys	GetAdaptersInfo(ai *IpAdapterInfo, ol *uint32) (errcode error) = iphlpapi.GetAdaptersInfo
-//sys	SetFileCompletionNotificationModes(handle Handle, flags uint8) (err error) = kernel32.SetFileCompletionNotificationModes
-//sys	WSAEnumProtocols(protocols *int32, protocolBuffer *WSAProtocolInfo, bufferLength *uint32) (n int32, err error) [failretval==-1] = ws2_32.WSAEnumProtocolsW
-//sys	GetAdaptersAddresses(family uint32, flags uint32, reserved uintptr, adapterAddresses *IpAdapterAddresses, sizePointer *uint32) (errcode error) = iphlpapi.GetAdaptersAddresses
-//sys	GetACP() (acp uint32) = kernel32.GetACP
-//sys	MultiByteToWideChar(codePage uint32, dwFlags uint32, str *byte, nstr int32, wchar *uint16, nwchar int32) (nwrite int32, err error) = kernel32.MultiByteToWideChar
-
-// For testing: clients can set this flag to force
-// creation of IPv6 sockets to return EAFNOSUPPORT.
-var SocketDisableIPv6 bool
-
-type RawSockaddrInet4 struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]uint8
-}
-
-type RawSockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type RawSockaddr struct {
-	Family uint16
-	Data   [14]int8
-}
-
-type RawSockaddrAny struct {
-	Addr RawSockaddr
-	Pad  [96]int8
-}
-
-type Sockaddr interface {
-	sockaddr() (ptr unsafe.Pointer, len int32, err error) // lowercase; only we can define Sockaddrs
-}
-
-type SockaddrInet4 struct {
-	Port int
-	Addr [4]byte
-	raw  RawSockaddrInet4
-}
-
-func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, int32, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, syscall.EINVAL
-	}
-	sa.raw.Family = AF_INET
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), int32(unsafe.Sizeof(sa.raw)), nil
-}
-
-type SockaddrInet6 struct {
-	Port   int
-	ZoneId uint32
-	Addr   [16]byte
-	raw    RawSockaddrInet6
-}
-
-func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, int32, error) {
-	if sa.Port < 0 || sa.Port > 0xFFFF {
-		return nil, 0, syscall.EINVAL
-	}
-	sa.raw.Family = AF_INET6
-	p := (*[2]byte)(unsafe.Pointer(&sa.raw.Port))
-	p[0] = byte(sa.Port >> 8)
-	p[1] = byte(sa.Port)
-	sa.raw.Scope_id = sa.ZoneId
-	for i := 0; i < len(sa.Addr); i++ {
-		sa.raw.Addr[i] = sa.Addr[i]
-	}
-	return unsafe.Pointer(&sa.raw), int32(unsafe.Sizeof(sa.raw)), nil
-}
-
-type SockaddrUnix struct {
-	Name string
-}
-
-func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, int32, error) {
-	// TODO(brainman): implement SockaddrUnix.sockaddr()
-	return nil, 0, syscall.EWINDOWS
-}
-
-func (rsa *RawSockaddrAny) Sockaddr() (Sockaddr, error) {
-	switch rsa.Addr.Family {
-	case AF_UNIX:
-		return nil, syscall.EWINDOWS
-
-	case AF_INET:
-		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet4)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-
-	case AF_INET6:
-		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa))
-		sa := new(SockaddrInet6)
-		p := (*[2]byte)(unsafe.Pointer(&pp.Port))
-		sa.Port = int(p[0])<<8 + int(p[1])
-		sa.ZoneId = pp.Scope_id
-		for i := 0; i < len(sa.Addr); i++ {
-			sa.Addr[i] = pp.Addr[i]
-		}
-		return sa, nil
-	}
-	return nil, syscall.EAFNOSUPPORT
-}
-
-func Socket(domain, typ, proto int) (fd Handle, err error) {
-	if domain == AF_INET6 && SocketDisableIPv6 {
-		return InvalidHandle, syscall.EAFNOSUPPORT
-	}
-	return socket(int32(domain), int32(typ), int32(proto))
-}
-
-func SetsockoptInt(fd Handle, level, opt int, value int) (err error) {
-	v := int32(value)
-	return Setsockopt(fd, int32(level), int32(opt), (*byte)(unsafe.Pointer(&v)), int32(unsafe.Sizeof(v)))
-}
-
-func Bind(fd Handle, sa Sockaddr) (err error) {
-	ptr, n, err := sa.sockaddr()
-	if err != nil {
-		return err
-	}
-	return bind(fd, ptr, n)
-}
-
-func Connect(fd Handle, sa Sockaddr) (err error) {
-	ptr, n, err := sa.sockaddr()
-	if err != nil {
-		return err
-	}
-	return connect(fd, ptr, n)
-}
-
-func Getsockname(fd Handle) (sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	l := int32(unsafe.Sizeof(rsa))
-	if err = getsockname(fd, &rsa, &l); err != nil {
-		return
-	}
-	return rsa.Sockaddr()
-}
-
-func Getpeername(fd Handle) (sa Sockaddr, err error) {
-	var rsa RawSockaddrAny
-	l := int32(unsafe.Sizeof(rsa))
-	if err = getpeername(fd, &rsa, &l); err != nil {
-		return
-	}
-	return rsa.Sockaddr()
-}
-
-func Listen(s Handle, n int) (err error) {
-	return listen(s, int32(n))
-}
-
-func Shutdown(fd Handle, how int) (err error) {
-	return shutdown(fd, int32(how))
-}
-
-func WSASendto(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, to Sockaddr, overlapped *Overlapped, croutine *byte) (err error) {
-	rsa, l, err := to.sockaddr()
-	if err != nil {
-		return err
-	}
-	return WSASendTo(s, bufs, bufcnt, sent, flags, (*RawSockaddrAny)(unsafe.Pointer(rsa)), l, overlapped, croutine)
-}
-
-func LoadGetAddrInfo() error {
-	return procGetAddrInfoW.Find()
-}
-
-var connectExFunc struct {
-	once sync.Once
-	addr uintptr
-	err  error
-}
-
-func LoadConnectEx() error {
-	connectExFunc.once.Do(func() {
-		var s Handle
-		s, connectExFunc.err = Socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)
-		if connectExFunc.err != nil {
-			return
-		}
-		defer CloseHandle(s)
-		var n uint32
-		connectExFunc.err = WSAIoctl(s,
-			SIO_GET_EXTENSION_FUNCTION_POINTER,
-			(*byte)(unsafe.Pointer(&WSAID_CONNECTEX)),
-			uint32(unsafe.Sizeof(WSAID_CONNECTEX)),
-			(*byte)(unsafe.Pointer(&connectExFunc.addr)),
-			uint32(unsafe.Sizeof(connectExFunc.addr)),
-			&n, nil, 0)
-	})
-	return connectExFunc.err
-}
-
-func connectEx(s Handle, name unsafe.Pointer, namelen int32, sendBuf *byte, sendDataLen uint32, bytesSent *uint32, overlapped *Overlapped) (err error) {
-	r1, _, e1 := syscall.Syscall9(connectExFunc.addr, 7, uintptr(s), uintptr(name), uintptr(namelen), uintptr(unsafe.Pointer(sendBuf)), uintptr(sendDataLen), uintptr(unsafe.Pointer(bytesSent)), uintptr(unsafe.Pointer(overlapped)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = error(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func ConnectEx(fd Handle, sa Sockaddr, sendBuf *byte, sendDataLen uint32, bytesSent *uint32, overlapped *Overlapped) error {
-	err := LoadConnectEx()
-	if err != nil {
-		return errorspkg.New("failed to find ConnectEx: " + err.Error())
-	}
-	ptr, n, err := sa.sockaddr()
-	if err != nil {
-		return err
-	}
-	return connectEx(fd, ptr, n, sendBuf, sendDataLen, bytesSent, overlapped)
-}
-
-// Invented structures to support what package os expects.
-type Rusage struct {
-	CreationTime Filetime
-	ExitTime     Filetime
-	KernelTime   Filetime
-	UserTime     Filetime
-}
-
-type WaitStatus struct {
-	ExitCode uint32
-}
-
-func (w WaitStatus) Exited() bool { return true }
-
-func (w WaitStatus) ExitStatus() int { return int(w.ExitCode) }
-
-func (w WaitStatus) Signal() Signal { return -1 }
-
-func (w WaitStatus) CoreDump() bool { return false }
-
-func (w WaitStatus) Stopped() bool { return false }
-
-func (w WaitStatus) Continued() bool { return false }
-
-func (w WaitStatus) StopSignal() Signal { return -1 }
-
-func (w WaitStatus) Signaled() bool { return false }
-
-func (w WaitStatus) TrapCause() int { return -1 }
-
-// Timespec is an invented structure on Windows, but here for
-// consistency with the corresponding package for other operating systems.
-type Timespec struct {
-	Sec  int64
-	Nsec int64
-}
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
-}
-
-// TODO(brainman): fix all needed for net
-
-func Accept(fd Handle) (nfd Handle, sa Sockaddr, err error) { return 0, nil, syscall.EWINDOWS }
-func Recvfrom(fd Handle, p []byte, flags int) (n int, from Sockaddr, err error) {
-	return 0, nil, syscall.EWINDOWS
-}
-func Sendto(fd Handle, p []byte, flags int, to Sockaddr) (err error)       { return syscall.EWINDOWS }
-func SetsockoptTimeval(fd Handle, level, opt int, tv *Timeval) (err error) { return syscall.EWINDOWS }
-
-// The Linger struct is wrong but we only noticed after Go 1.
-// sysLinger is the real system call structure.
-
-// BUG(brainman): The definition of Linger is not appropriate for direct use
-// with Setsockopt and Getsockopt.
-// Use SetsockoptLinger instead.
-
-type Linger struct {
-	Onoff  int32
-	Linger int32
-}
-
-type sysLinger struct {
-	Onoff  uint16
-	Linger uint16
-}
-
-type IPMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type IPv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-func GetsockoptInt(fd Handle, level, opt int) (int, error) { return -1, syscall.EWINDOWS }
-
-func SetsockoptLinger(fd Handle, level, opt int, l *Linger) (err error) {
-	sys := sysLinger{Onoff: uint16(l.Onoff), Linger: uint16(l.Linger)}
-	return Setsockopt(fd, int32(level), int32(opt), (*byte)(unsafe.Pointer(&sys)), int32(unsafe.Sizeof(sys)))
-}
-
-func SetsockoptInet4Addr(fd Handle, level, opt int, value [4]byte) (err error) {
-	return Setsockopt(fd, int32(level), int32(opt), (*byte)(unsafe.Pointer(&value[0])), 4)
-}
-func SetsockoptIPMreq(fd Handle, level, opt int, mreq *IPMreq) (err error) {
-	return Setsockopt(fd, int32(level), int32(opt), (*byte)(unsafe.Pointer(mreq)), int32(unsafe.Sizeof(*mreq)))
-}
-func SetsockoptIPv6Mreq(fd Handle, level, opt int, mreq *IPv6Mreq) (err error) {
-	return syscall.EWINDOWS
-}
-
-func Getpid() (pid int) { return int(getCurrentProcessId()) }
-
-func FindFirstFile(name *uint16, data *Win32finddata) (handle Handle, err error) {
-	// NOTE(rsc): The Win32finddata struct is wrong for the system call:
-	// the two paths are each one uint16 short. Use the correct struct,
-	// a win32finddata1, and then copy the results out.
-	// There is no loss of expressivity here, because the final
-	// uint16, if it is used, is supposed to be a NUL, and Go doesn't need that.
-	// For Go 1.1, we might avoid the allocation of win32finddata1 here
-	// by adding a final Bug [2]uint16 field to the struct and then
-	// adjusting the fields in the result directly.
-	var data1 win32finddata1
-	handle, err = findFirstFile1(name, &data1)
-	if err == nil {
-		copyFindData(data, &data1)
-	}
-	return
-}
-
-func FindNextFile(handle Handle, data *Win32finddata) (err error) {
-	var data1 win32finddata1
-	err = findNextFile1(handle, &data1)
-	if err == nil {
-		copyFindData(data, &data1)
-	}
-	return
-}
-
-func getProcessEntry(pid int) (*ProcessEntry32, error) {
-	snapshot, err := CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0)
-	if err != nil {
-		return nil, err
-	}
-	defer CloseHandle(snapshot)
-	var procEntry ProcessEntry32
-	procEntry.Size = uint32(unsafe.Sizeof(procEntry))
-	if err = Process32First(snapshot, &procEntry); err != nil {
-		return nil, err
-	}
-	for {
-		if procEntry.ProcessID == uint32(pid) {
-			return &procEntry, nil
-		}
-		err = Process32Next(snapshot, &procEntry)
-		if err != nil {
-			return nil, err
-		}
-	}
-}
-
-func Getppid() (ppid int) {
-	pe, err := getProcessEntry(Getpid())
-	if err != nil {
-		return -1
-	}
-	return int(pe.ParentProcessID)
-}
-
-// TODO(brainman): fix all needed for os
-func Fchdir(fd Handle) (err error)             { return syscall.EWINDOWS }
-func Link(oldpath, newpath string) (err error) { return syscall.EWINDOWS }
-func Symlink(path, link string) (err error)    { return syscall.EWINDOWS }
-
-func Fchmod(fd Handle, mode uint32) (err error)        { return syscall.EWINDOWS }
-func Chown(path string, uid int, gid int) (err error)  { return syscall.EWINDOWS }
-func Lchown(path string, uid int, gid int) (err error) { return syscall.EWINDOWS }
-func Fchown(fd Handle, uid int, gid int) (err error)   { return syscall.EWINDOWS }
-
-func Getuid() (uid int)                  { return -1 }
-func Geteuid() (euid int)                { return -1 }
-func Getgid() (gid int)                  { return -1 }
-func Getegid() (egid int)                { return -1 }
-func Getgroups() (gids []int, err error) { return nil, syscall.EWINDOWS }
-
-type Signal int
-
-func (s Signal) Signal() {}
-
-func (s Signal) String() string {
-	if 0 <= s && int(s) < len(signals) {
-		str := signals[s]
-		if str != "" {
-			return str
-		}
-	}
-	return "signal " + itoa(int(s))
-}
-
-func LoadCreateSymbolicLink() error {
-	return procCreateSymbolicLinkW.Find()
-}
-
-// Readlink returns the destination of the named symbolic link.
-func Readlink(path string, buf []byte) (n int, err error) {
-	fd, err := CreateFile(StringToUTF16Ptr(path), GENERIC_READ, 0, nil, OPEN_EXISTING,
-		FILE_FLAG_OPEN_REPARSE_POINT|FILE_FLAG_BACKUP_SEMANTICS, 0)
-	if err != nil {
-		return -1, err
-	}
-	defer CloseHandle(fd)
-
-	rdbbuf := make([]byte, MAXIMUM_REPARSE_DATA_BUFFER_SIZE)
-	var bytesReturned uint32
-	err = DeviceIoControl(fd, FSCTL_GET_REPARSE_POINT, nil, 0, &rdbbuf[0], uint32(len(rdbbuf)), &bytesReturned, nil)
-	if err != nil {
-		return -1, err
-	}
-
-	rdb := (*reparseDataBuffer)(unsafe.Pointer(&rdbbuf[0]))
-	var s string
-	switch rdb.ReparseTag {
-	case IO_REPARSE_TAG_SYMLINK:
-		data := (*symbolicLinkReparseBuffer)(unsafe.Pointer(&rdb.reparseBuffer))
-		p := (*[0xffff]uint16)(unsafe.Pointer(&data.PathBuffer[0]))
-		s = UTF16ToString(p[data.PrintNameOffset/2 : (data.PrintNameLength-data.PrintNameOffset)/2])
-	case IO_REPARSE_TAG_MOUNT_POINT:
-		data := (*mountPointReparseBuffer)(unsafe.Pointer(&rdb.reparseBuffer))
-		p := (*[0xffff]uint16)(unsafe.Pointer(&data.PathBuffer[0]))
-		s = UTF16ToString(p[data.PrintNameOffset/2 : (data.PrintNameLength-data.PrintNameOffset)/2])
-	default:
-		// the path is not a symlink or junction but another type of reparse
-		// point
-		return -1, syscall.ENOENT
-	}
-	n = copy(buf, []byte(s))
-
-	return n, nil
-}
diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
deleted file mode 100644
index f7bc8d68e6..0000000000
--- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go
+++ /dev/null
@@ -1,2289 +0,0 @@
-// MACHINE GENERATED BY 'go generate' COMMAND; DO NOT EDIT
-
-package windows
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ unsafe.Pointer
-
-// Do the interface allocations only once for common
-// Errno values.
-const (
-	errnoERROR_IO_PENDING = 997
-)
-
-var (
-	errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING)
-)
-
-// errnoErr returns common boxed Errno values, to prevent
-// allocations at runtime.
-func errnoErr(e syscall.Errno) error {
-	switch e {
-	case 0:
-		return nil
-	case errnoERROR_IO_PENDING:
-		return errERROR_IO_PENDING
-	}
-	// TODO: add more here, after collecting data on the common
-	// error values see on Windows. (perhaps when running
-	// all.bat?)
-	return e
-}
-
-var (
-	modadvapi32 = NewLazySystemDLL("advapi32.dll")
-	modkernel32 = NewLazySystemDLL("kernel32.dll")
-	modshell32  = NewLazySystemDLL("shell32.dll")
-	modmswsock  = NewLazySystemDLL("mswsock.dll")
-	modcrypt32  = NewLazySystemDLL("crypt32.dll")
-	modws2_32   = NewLazySystemDLL("ws2_32.dll")
-	moddnsapi   = NewLazySystemDLL("dnsapi.dll")
-	modiphlpapi = NewLazySystemDLL("iphlpapi.dll")
-	modsecur32  = NewLazySystemDLL("secur32.dll")
-	modnetapi32 = NewLazySystemDLL("netapi32.dll")
-	moduserenv  = NewLazySystemDLL("userenv.dll")
-
-	procRegisterEventSourceW               = modadvapi32.NewProc("RegisterEventSourceW")
-	procDeregisterEventSource              = modadvapi32.NewProc("DeregisterEventSource")
-	procReportEventW                       = modadvapi32.NewProc("ReportEventW")
-	procOpenSCManagerW                     = modadvapi32.NewProc("OpenSCManagerW")
-	procCloseServiceHandle                 = modadvapi32.NewProc("CloseServiceHandle")
-	procCreateServiceW                     = modadvapi32.NewProc("CreateServiceW")
-	procOpenServiceW                       = modadvapi32.NewProc("OpenServiceW")
-	procDeleteService                      = modadvapi32.NewProc("DeleteService")
-	procStartServiceW                      = modadvapi32.NewProc("StartServiceW")
-	procQueryServiceStatus                 = modadvapi32.NewProc("QueryServiceStatus")
-	procControlService                     = modadvapi32.NewProc("ControlService")
-	procStartServiceCtrlDispatcherW        = modadvapi32.NewProc("StartServiceCtrlDispatcherW")
-	procSetServiceStatus                   = modadvapi32.NewProc("SetServiceStatus")
-	procChangeServiceConfigW               = modadvapi32.NewProc("ChangeServiceConfigW")
-	procQueryServiceConfigW                = modadvapi32.NewProc("QueryServiceConfigW")
-	procChangeServiceConfig2W              = modadvapi32.NewProc("ChangeServiceConfig2W")
-	procQueryServiceConfig2W               = modadvapi32.NewProc("QueryServiceConfig2W")
-	procGetLastError                       = modkernel32.NewProc("GetLastError")
-	procLoadLibraryW                       = modkernel32.NewProc("LoadLibraryW")
-	procLoadLibraryExW                     = modkernel32.NewProc("LoadLibraryExW")
-	procFreeLibrary                        = modkernel32.NewProc("FreeLibrary")
-	procGetProcAddress                     = modkernel32.NewProc("GetProcAddress")
-	procGetVersion                         = modkernel32.NewProc("GetVersion")
-	procFormatMessageW                     = modkernel32.NewProc("FormatMessageW")
-	procExitProcess                        = modkernel32.NewProc("ExitProcess")
-	procCreateFileW                        = modkernel32.NewProc("CreateFileW")
-	procReadFile                           = modkernel32.NewProc("ReadFile")
-	procWriteFile                          = modkernel32.NewProc("WriteFile")
-	procSetFilePointer                     = modkernel32.NewProc("SetFilePointer")
-	procCloseHandle                        = modkernel32.NewProc("CloseHandle")
-	procGetStdHandle                       = modkernel32.NewProc("GetStdHandle")
-	procSetStdHandle                       = modkernel32.NewProc("SetStdHandle")
-	procFindFirstFileW                     = modkernel32.NewProc("FindFirstFileW")
-	procFindNextFileW                      = modkernel32.NewProc("FindNextFileW")
-	procFindClose                          = modkernel32.NewProc("FindClose")
-	procGetFileInformationByHandle         = modkernel32.NewProc("GetFileInformationByHandle")
-	procGetCurrentDirectoryW               = modkernel32.NewProc("GetCurrentDirectoryW")
-	procSetCurrentDirectoryW               = modkernel32.NewProc("SetCurrentDirectoryW")
-	procCreateDirectoryW                   = modkernel32.NewProc("CreateDirectoryW")
-	procRemoveDirectoryW                   = modkernel32.NewProc("RemoveDirectoryW")
-	procDeleteFileW                        = modkernel32.NewProc("DeleteFileW")
-	procMoveFileW                          = modkernel32.NewProc("MoveFileW")
-	procMoveFileExW                        = modkernel32.NewProc("MoveFileExW")
-	procGetComputerNameW                   = modkernel32.NewProc("GetComputerNameW")
-	procGetComputerNameExW                 = modkernel32.NewProc("GetComputerNameExW")
-	procSetEndOfFile                       = modkernel32.NewProc("SetEndOfFile")
-	procGetSystemTimeAsFileTime            = modkernel32.NewProc("GetSystemTimeAsFileTime")
-	procGetSystemTimePreciseAsFileTime     = modkernel32.NewProc("GetSystemTimePreciseAsFileTime")
-	procGetTimeZoneInformation             = modkernel32.NewProc("GetTimeZoneInformation")
-	procCreateIoCompletionPort             = modkernel32.NewProc("CreateIoCompletionPort")
-	procGetQueuedCompletionStatus          = modkernel32.NewProc("GetQueuedCompletionStatus")
-	procPostQueuedCompletionStatus         = modkernel32.NewProc("PostQueuedCompletionStatus")
-	procCancelIo                           = modkernel32.NewProc("CancelIo")
-	procCancelIoEx                         = modkernel32.NewProc("CancelIoEx")
-	procCreateProcessW                     = modkernel32.NewProc("CreateProcessW")
-	procOpenProcess                        = modkernel32.NewProc("OpenProcess")
-	procTerminateProcess                   = modkernel32.NewProc("TerminateProcess")
-	procGetExitCodeProcess                 = modkernel32.NewProc("GetExitCodeProcess")
-	procGetStartupInfoW                    = modkernel32.NewProc("GetStartupInfoW")
-	procGetCurrentProcess                  = modkernel32.NewProc("GetCurrentProcess")
-	procGetProcessTimes                    = modkernel32.NewProc("GetProcessTimes")
-	procDuplicateHandle                    = modkernel32.NewProc("DuplicateHandle")
-	procWaitForSingleObject                = modkernel32.NewProc("WaitForSingleObject")
-	procGetTempPathW                       = modkernel32.NewProc("GetTempPathW")
-	procCreatePipe                         = modkernel32.NewProc("CreatePipe")
-	procGetFileType                        = modkernel32.NewProc("GetFileType")
-	procCryptAcquireContextW               = modadvapi32.NewProc("CryptAcquireContextW")
-	procCryptReleaseContext                = modadvapi32.NewProc("CryptReleaseContext")
-	procCryptGenRandom                     = modadvapi32.NewProc("CryptGenRandom")
-	procGetEnvironmentStringsW             = modkernel32.NewProc("GetEnvironmentStringsW")
-	procFreeEnvironmentStringsW            = modkernel32.NewProc("FreeEnvironmentStringsW")
-	procGetEnvironmentVariableW            = modkernel32.NewProc("GetEnvironmentVariableW")
-	procSetEnvironmentVariableW            = modkernel32.NewProc("SetEnvironmentVariableW")
-	procSetFileTime                        = modkernel32.NewProc("SetFileTime")
-	procGetFileAttributesW                 = modkernel32.NewProc("GetFileAttributesW")
-	procSetFileAttributesW                 = modkernel32.NewProc("SetFileAttributesW")
-	procGetFileAttributesExW               = modkernel32.NewProc("GetFileAttributesExW")
-	procGetCommandLineW                    = modkernel32.NewProc("GetCommandLineW")
-	procCommandLineToArgvW                 = modshell32.NewProc("CommandLineToArgvW")
-	procLocalFree                          = modkernel32.NewProc("LocalFree")
-	procSetHandleInformation               = modkernel32.NewProc("SetHandleInformation")
-	procFlushFileBuffers                   = modkernel32.NewProc("FlushFileBuffers")
-	procGetFullPathNameW                   = modkernel32.NewProc("GetFullPathNameW")
-	procGetLongPathNameW                   = modkernel32.NewProc("GetLongPathNameW")
-	procGetShortPathNameW                  = modkernel32.NewProc("GetShortPathNameW")
-	procCreateFileMappingW                 = modkernel32.NewProc("CreateFileMappingW")
-	procMapViewOfFile                      = modkernel32.NewProc("MapViewOfFile")
-	procUnmapViewOfFile                    = modkernel32.NewProc("UnmapViewOfFile")
-	procFlushViewOfFile                    = modkernel32.NewProc("FlushViewOfFile")
-	procVirtualLock                        = modkernel32.NewProc("VirtualLock")
-	procVirtualUnlock                      = modkernel32.NewProc("VirtualUnlock")
-	procTransmitFile                       = modmswsock.NewProc("TransmitFile")
-	procReadDirectoryChangesW              = modkernel32.NewProc("ReadDirectoryChangesW")
-	procCertOpenSystemStoreW               = modcrypt32.NewProc("CertOpenSystemStoreW")
-	procCertOpenStore                      = modcrypt32.NewProc("CertOpenStore")
-	procCertEnumCertificatesInStore        = modcrypt32.NewProc("CertEnumCertificatesInStore")
-	procCertAddCertificateContextToStore   = modcrypt32.NewProc("CertAddCertificateContextToStore")
-	procCertCloseStore                     = modcrypt32.NewProc("CertCloseStore")
-	procCertGetCertificateChain            = modcrypt32.NewProc("CertGetCertificateChain")
-	procCertFreeCertificateChain           = modcrypt32.NewProc("CertFreeCertificateChain")
-	procCertCreateCertificateContext       = modcrypt32.NewProc("CertCreateCertificateContext")
-	procCertFreeCertificateContext         = modcrypt32.NewProc("CertFreeCertificateContext")
-	procCertVerifyCertificateChainPolicy   = modcrypt32.NewProc("CertVerifyCertificateChainPolicy")
-	procRegOpenKeyExW                      = modadvapi32.NewProc("RegOpenKeyExW")
-	procRegCloseKey                        = modadvapi32.NewProc("RegCloseKey")
-	procRegQueryInfoKeyW                   = modadvapi32.NewProc("RegQueryInfoKeyW")
-	procRegEnumKeyExW                      = modadvapi32.NewProc("RegEnumKeyExW")
-	procRegQueryValueExW                   = modadvapi32.NewProc("RegQueryValueExW")
-	procGetCurrentProcessId                = modkernel32.NewProc("GetCurrentProcessId")
-	procGetConsoleMode                     = modkernel32.NewProc("GetConsoleMode")
-	procWriteConsoleW                      = modkernel32.NewProc("WriteConsoleW")
-	procReadConsoleW                       = modkernel32.NewProc("ReadConsoleW")
-	procCreateToolhelp32Snapshot           = modkernel32.NewProc("CreateToolhelp32Snapshot")
-	procProcess32FirstW                    = modkernel32.NewProc("Process32FirstW")
-	procProcess32NextW                     = modkernel32.NewProc("Process32NextW")
-	procDeviceIoControl                    = modkernel32.NewProc("DeviceIoControl")
-	procCreateSymbolicLinkW                = modkernel32.NewProc("CreateSymbolicLinkW")
-	procCreateHardLinkW                    = modkernel32.NewProc("CreateHardLinkW")
-	procGetCurrentThreadId                 = modkernel32.NewProc("GetCurrentThreadId")
-	procCreateEventW                       = modkernel32.NewProc("CreateEventW")
-	procSetEvent                           = modkernel32.NewProc("SetEvent")
-	procWSAStartup                         = modws2_32.NewProc("WSAStartup")
-	procWSACleanup                         = modws2_32.NewProc("WSACleanup")
-	procWSAIoctl                           = modws2_32.NewProc("WSAIoctl")
-	procsocket                             = modws2_32.NewProc("socket")
-	procsetsockopt                         = modws2_32.NewProc("setsockopt")
-	procgetsockopt                         = modws2_32.NewProc("getsockopt")
-	procbind                               = modws2_32.NewProc("bind")
-	procconnect                            = modws2_32.NewProc("connect")
-	procgetsockname                        = modws2_32.NewProc("getsockname")
-	procgetpeername                        = modws2_32.NewProc("getpeername")
-	proclisten                             = modws2_32.NewProc("listen")
-	procshutdown                           = modws2_32.NewProc("shutdown")
-	procclosesocket                        = modws2_32.NewProc("closesocket")
-	procAcceptEx                           = modmswsock.NewProc("AcceptEx")
-	procGetAcceptExSockaddrs               = modmswsock.NewProc("GetAcceptExSockaddrs")
-	procWSARecv                            = modws2_32.NewProc("WSARecv")
-	procWSASend                            = modws2_32.NewProc("WSASend")
-	procWSARecvFrom                        = modws2_32.NewProc("WSARecvFrom")
-	procWSASendTo                          = modws2_32.NewProc("WSASendTo")
-	procgethostbyname                      = modws2_32.NewProc("gethostbyname")
-	procgetservbyname                      = modws2_32.NewProc("getservbyname")
-	procntohs                              = modws2_32.NewProc("ntohs")
-	procgetprotobyname                     = modws2_32.NewProc("getprotobyname")
-	procDnsQuery_W                         = moddnsapi.NewProc("DnsQuery_W")
-	procDnsRecordListFree                  = moddnsapi.NewProc("DnsRecordListFree")
-	procDnsNameCompare_W                   = moddnsapi.NewProc("DnsNameCompare_W")
-	procGetAddrInfoW                       = modws2_32.NewProc("GetAddrInfoW")
-	procFreeAddrInfoW                      = modws2_32.NewProc("FreeAddrInfoW")
-	procGetIfEntry                         = modiphlpapi.NewProc("GetIfEntry")
-	procGetAdaptersInfo                    = modiphlpapi.NewProc("GetAdaptersInfo")
-	procSetFileCompletionNotificationModes = modkernel32.NewProc("SetFileCompletionNotificationModes")
-	procWSAEnumProtocolsW                  = modws2_32.NewProc("WSAEnumProtocolsW")
-	procGetAdaptersAddresses               = modiphlpapi.NewProc("GetAdaptersAddresses")
-	procGetACP                             = modkernel32.NewProc("GetACP")
-	procMultiByteToWideChar                = modkernel32.NewProc("MultiByteToWideChar")
-	procTranslateNameW                     = modsecur32.NewProc("TranslateNameW")
-	procGetUserNameExW                     = modsecur32.NewProc("GetUserNameExW")
-	procNetUserGetInfo                     = modnetapi32.NewProc("NetUserGetInfo")
-	procNetGetJoinInformation              = modnetapi32.NewProc("NetGetJoinInformation")
-	procNetApiBufferFree                   = modnetapi32.NewProc("NetApiBufferFree")
-	procLookupAccountSidW                  = modadvapi32.NewProc("LookupAccountSidW")
-	procLookupAccountNameW                 = modadvapi32.NewProc("LookupAccountNameW")
-	procConvertSidToStringSidW             = modadvapi32.NewProc("ConvertSidToStringSidW")
-	procConvertStringSidToSidW             = modadvapi32.NewProc("ConvertStringSidToSidW")
-	procGetLengthSid                       = modadvapi32.NewProc("GetLengthSid")
-	procCopySid                            = modadvapi32.NewProc("CopySid")
-	procAllocateAndInitializeSid           = modadvapi32.NewProc("AllocateAndInitializeSid")
-	procFreeSid                            = modadvapi32.NewProc("FreeSid")
-	procEqualSid                           = modadvapi32.NewProc("EqualSid")
-	procOpenProcessToken                   = modadvapi32.NewProc("OpenProcessToken")
-	procGetTokenInformation                = modadvapi32.NewProc("GetTokenInformation")
-	procGetUserProfileDirectoryW           = moduserenv.NewProc("GetUserProfileDirectoryW")
-)
-
-func RegisterEventSource(uncServerName *uint16, sourceName *uint16) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procRegisterEventSourceW.Addr(), 2, uintptr(unsafe.Pointer(uncServerName)), uintptr(unsafe.Pointer(sourceName)), 0)
-	handle = Handle(r0)
-	if handle == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func DeregisterEventSource(handle Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procDeregisterEventSource.Addr(), 1, uintptr(handle), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func ReportEvent(log Handle, etype uint16, category uint16, eventId uint32, usrSId uintptr, numStrings uint16, dataSize uint32, strings **uint16, rawData *byte) (err error) {
-	r1, _, e1 := syscall.Syscall9(procReportEventW.Addr(), 9, uintptr(log), uintptr(etype), uintptr(category), uintptr(eventId), uintptr(usrSId), uintptr(numStrings), uintptr(dataSize), uintptr(unsafe.Pointer(strings)), uintptr(unsafe.Pointer(rawData)))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func OpenSCManager(machineName *uint16, databaseName *uint16, access uint32) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procOpenSCManagerW.Addr(), 3, uintptr(unsafe.Pointer(machineName)), uintptr(unsafe.Pointer(databaseName)), uintptr(access))
-	handle = Handle(r0)
-	if handle == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CloseServiceHandle(handle Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procCloseServiceHandle.Addr(), 1, uintptr(handle), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CreateService(mgr Handle, serviceName *uint16, displayName *uint16, access uint32, srvType uint32, startType uint32, errCtl uint32, pathName *uint16, loadOrderGroup *uint16, tagId *uint32, dependencies *uint16, serviceStartName *uint16, password *uint16) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall15(procCreateServiceW.Addr(), 13, uintptr(mgr), uintptr(unsafe.Pointer(serviceName)), uintptr(unsafe.Pointer(displayName)), uintptr(access), uintptr(srvType), uintptr(startType), uintptr(errCtl), uintptr(unsafe.Pointer(pathName)), uintptr(unsafe.Pointer(loadOrderGroup)), uintptr(unsafe.Pointer(tagId)), uintptr(unsafe.Pointer(dependencies)), uintptr(unsafe.Pointer(serviceStartName)), uintptr(unsafe.Pointer(password)), 0, 0)
-	handle = Handle(r0)
-	if handle == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func OpenService(mgr Handle, serviceName *uint16, access uint32) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procOpenServiceW.Addr(), 3, uintptr(mgr), uintptr(unsafe.Pointer(serviceName)), uintptr(access))
-	handle = Handle(r0)
-	if handle == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func DeleteService(service Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procDeleteService.Addr(), 1, uintptr(service), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func StartService(service Handle, numArgs uint32, argVectors **uint16) (err error) {
-	r1, _, e1 := syscall.Syscall(procStartServiceW.Addr(), 3, uintptr(service), uintptr(numArgs), uintptr(unsafe.Pointer(argVectors)))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func QueryServiceStatus(service Handle, status *SERVICE_STATUS) (err error) {
-	r1, _, e1 := syscall.Syscall(procQueryServiceStatus.Addr(), 2, uintptr(service), uintptr(unsafe.Pointer(status)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func ControlService(service Handle, control uint32, status *SERVICE_STATUS) (err error) {
-	r1, _, e1 := syscall.Syscall(procControlService.Addr(), 3, uintptr(service), uintptr(control), uintptr(unsafe.Pointer(status)))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func StartServiceCtrlDispatcher(serviceTable *SERVICE_TABLE_ENTRY) (err error) {
-	r1, _, e1 := syscall.Syscall(procStartServiceCtrlDispatcherW.Addr(), 1, uintptr(unsafe.Pointer(serviceTable)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func SetServiceStatus(service Handle, serviceStatus *SERVICE_STATUS) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetServiceStatus.Addr(), 2, uintptr(service), uintptr(unsafe.Pointer(serviceStatus)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func ChangeServiceConfig(service Handle, serviceType uint32, startType uint32, errorControl uint32, binaryPathName *uint16, loadOrderGroup *uint16, tagId *uint32, dependencies *uint16, serviceStartName *uint16, password *uint16, displayName *uint16) (err error) {
-	r1, _, e1 := syscall.Syscall12(procChangeServiceConfigW.Addr(), 11, uintptr(service), uintptr(serviceType), uintptr(startType), uintptr(errorControl), uintptr(unsafe.Pointer(binaryPathName)), uintptr(unsafe.Pointer(loadOrderGroup)), uintptr(unsafe.Pointer(tagId)), uintptr(unsafe.Pointer(dependencies)), uintptr(unsafe.Pointer(serviceStartName)), uintptr(unsafe.Pointer(password)), uintptr(unsafe.Pointer(displayName)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func QueryServiceConfig(service Handle, serviceConfig *QUERY_SERVICE_CONFIG, bufSize uint32, bytesNeeded *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procQueryServiceConfigW.Addr(), 4, uintptr(service), uintptr(unsafe.Pointer(serviceConfig)), uintptr(bufSize), uintptr(unsafe.Pointer(bytesNeeded)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func ChangeServiceConfig2(service Handle, infoLevel uint32, info *byte) (err error) {
-	r1, _, e1 := syscall.Syscall(procChangeServiceConfig2W.Addr(), 3, uintptr(service), uintptr(infoLevel), uintptr(unsafe.Pointer(info)))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func QueryServiceConfig2(service Handle, infoLevel uint32, buff *byte, buffSize uint32, bytesNeeded *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procQueryServiceConfig2W.Addr(), 5, uintptr(service), uintptr(infoLevel), uintptr(unsafe.Pointer(buff)), uintptr(buffSize), uintptr(unsafe.Pointer(bytesNeeded)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetLastError() (lasterr error) {
-	r0, _, _ := syscall.Syscall(procGetLastError.Addr(), 0, 0, 0, 0)
-	if r0 != 0 {
-		lasterr = syscall.Errno(r0)
-	}
-	return
-}
-
-func LoadLibrary(libname string) (handle Handle, err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(libname)
-	if err != nil {
-		return
-	}
-	return _LoadLibrary(_p0)
-}
-
-func _LoadLibrary(libname *uint16) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procLoadLibraryW.Addr(), 1, uintptr(unsafe.Pointer(libname)), 0, 0)
-	handle = Handle(r0)
-	if handle == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func LoadLibraryEx(libname string, zero Handle, flags uintptr) (handle Handle, err error) {
-	var _p0 *uint16
-	_p0, err = syscall.UTF16PtrFromString(libname)
-	if err != nil {
-		return
-	}
-	return _LoadLibraryEx(_p0, zero, flags)
-}
-
-func _LoadLibraryEx(libname *uint16, zero Handle, flags uintptr) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procLoadLibraryExW.Addr(), 3, uintptr(unsafe.Pointer(libname)), uintptr(zero), uintptr(flags))
-	handle = Handle(r0)
-	if handle == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func FreeLibrary(handle Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procFreeLibrary.Addr(), 1, uintptr(handle), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetProcAddress(module Handle, procname string) (proc uintptr, err error) {
-	var _p0 *byte
-	_p0, err = syscall.BytePtrFromString(procname)
-	if err != nil {
-		return
-	}
-	return _GetProcAddress(module, _p0)
-}
-
-func _GetProcAddress(module Handle, procname *byte) (proc uintptr, err error) {
-	r0, _, e1 := syscall.Syscall(procGetProcAddress.Addr(), 2, uintptr(module), uintptr(unsafe.Pointer(procname)), 0)
-	proc = uintptr(r0)
-	if proc == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetVersion() (ver uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetVersion.Addr(), 0, 0, 0, 0)
-	ver = uint32(r0)
-	if ver == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func FormatMessage(flags uint32, msgsrc uintptr, msgid uint32, langid uint32, buf []uint16, args *byte) (n uint32, err error) {
-	var _p0 *uint16
-	if len(buf) > 0 {
-		_p0 = &buf[0]
-	}
-	r0, _, e1 := syscall.Syscall9(procFormatMessageW.Addr(), 7, uintptr(flags), uintptr(msgsrc), uintptr(msgid), uintptr(langid), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(args)), 0, 0)
-	n = uint32(r0)
-	if n == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func ExitProcess(exitcode uint32) {
-	syscall.Syscall(procExitProcess.Addr(), 1, uintptr(exitcode), 0, 0)
-	return
-}
-
-func CreateFile(name *uint16, access uint32, mode uint32, sa *SecurityAttributes, createmode uint32, attrs uint32, templatefile int32) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall9(procCreateFileW.Addr(), 7, uintptr(unsafe.Pointer(name)), uintptr(access), uintptr(mode), uintptr(unsafe.Pointer(sa)), uintptr(createmode), uintptr(attrs), uintptr(templatefile), 0, 0)
-	handle = Handle(r0)
-	if handle == InvalidHandle {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func ReadFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error) {
-	var _p0 *byte
-	if len(buf) > 0 {
-		_p0 = &buf[0]
-	}
-	r1, _, e1 := syscall.Syscall6(procReadFile.Addr(), 5, uintptr(handle), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(done)), uintptr(unsafe.Pointer(overlapped)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func WriteFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error) {
-	var _p0 *byte
-	if len(buf) > 0 {
-		_p0 = &buf[0]
-	}
-	r1, _, e1 := syscall.Syscall6(procWriteFile.Addr(), 5, uintptr(handle), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(unsafe.Pointer(done)), uintptr(unsafe.Pointer(overlapped)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func SetFilePointer(handle Handle, lowoffset int32, highoffsetptr *int32, whence uint32) (newlowoffset uint32, err error) {
-	r0, _, e1 := syscall.Syscall6(procSetFilePointer.Addr(), 4, uintptr(handle), uintptr(lowoffset), uintptr(unsafe.Pointer(highoffsetptr)), uintptr(whence), 0, 0)
-	newlowoffset = uint32(r0)
-	if newlowoffset == 0xffffffff {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CloseHandle(handle Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procCloseHandle.Addr(), 1, uintptr(handle), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetStdHandle(stdhandle uint32) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procGetStdHandle.Addr(), 1, uintptr(stdhandle), 0, 0)
-	handle = Handle(r0)
-	if handle == InvalidHandle {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func SetStdHandle(stdhandle uint32, handle Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetStdHandle.Addr(), 2, uintptr(stdhandle), uintptr(handle), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func findFirstFile1(name *uint16, data *win32finddata1) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procFindFirstFileW.Addr(), 2, uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(data)), 0)
-	handle = Handle(r0)
-	if handle == InvalidHandle {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func findNextFile1(handle Handle, data *win32finddata1) (err error) {
-	r1, _, e1 := syscall.Syscall(procFindNextFileW.Addr(), 2, uintptr(handle), uintptr(unsafe.Pointer(data)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func FindClose(handle Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procFindClose.Addr(), 1, uintptr(handle), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetFileInformationByHandle(handle Handle, data *ByHandleFileInformation) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetFileInformationByHandle.Addr(), 2, uintptr(handle), uintptr(unsafe.Pointer(data)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetCurrentDirectory(buflen uint32, buf *uint16) (n uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetCurrentDirectoryW.Addr(), 2, uintptr(buflen), uintptr(unsafe.Pointer(buf)), 0)
-	n = uint32(r0)
-	if n == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func SetCurrentDirectory(path *uint16) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetCurrentDirectoryW.Addr(), 1, uintptr(unsafe.Pointer(path)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CreateDirectory(path *uint16, sa *SecurityAttributes) (err error) {
-	r1, _, e1 := syscall.Syscall(procCreateDirectoryW.Addr(), 2, uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(sa)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func RemoveDirectory(path *uint16) (err error) {
-	r1, _, e1 := syscall.Syscall(procRemoveDirectoryW.Addr(), 1, uintptr(unsafe.Pointer(path)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func DeleteFile(path *uint16) (err error) {
-	r1, _, e1 := syscall.Syscall(procDeleteFileW.Addr(), 1, uintptr(unsafe.Pointer(path)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func MoveFile(from *uint16, to *uint16) (err error) {
-	r1, _, e1 := syscall.Syscall(procMoveFileW.Addr(), 2, uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(to)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func MoveFileEx(from *uint16, to *uint16, flags uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procMoveFileExW.Addr(), 3, uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(to)), uintptr(flags))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetComputerName(buf *uint16, n *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetComputerNameW.Addr(), 2, uintptr(unsafe.Pointer(buf)), uintptr(unsafe.Pointer(n)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetComputerNameEx(nametype uint32, buf *uint16, n *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetComputerNameExW.Addr(), 3, uintptr(nametype), uintptr(unsafe.Pointer(buf)), uintptr(unsafe.Pointer(n)))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func SetEndOfFile(handle Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetEndOfFile.Addr(), 1, uintptr(handle), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetSystemTimeAsFileTime(time *Filetime) {
-	syscall.Syscall(procGetSystemTimeAsFileTime.Addr(), 1, uintptr(unsafe.Pointer(time)), 0, 0)
-	return
-}
-
-func GetSystemTimePreciseAsFileTime(time *Filetime) {
-	syscall.Syscall(procGetSystemTimePreciseAsFileTime.Addr(), 1, uintptr(unsafe.Pointer(time)), 0, 0)
-	return
-}
-
-func GetTimeZoneInformation(tzi *Timezoneinformation) (rc uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetTimeZoneInformation.Addr(), 1, uintptr(unsafe.Pointer(tzi)), 0, 0)
-	rc = uint32(r0)
-	if rc == 0xffffffff {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CreateIoCompletionPort(filehandle Handle, cphandle Handle, key uint32, threadcnt uint32) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall6(procCreateIoCompletionPort.Addr(), 4, uintptr(filehandle), uintptr(cphandle), uintptr(key), uintptr(threadcnt), 0, 0)
-	handle = Handle(r0)
-	if handle == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetQueuedCompletionStatus(cphandle Handle, qty *uint32, key *uint32, overlapped **Overlapped, timeout uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procGetQueuedCompletionStatus.Addr(), 5, uintptr(cphandle), uintptr(unsafe.Pointer(qty)), uintptr(unsafe.Pointer(key)), uintptr(unsafe.Pointer(overlapped)), uintptr(timeout), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func PostQueuedCompletionStatus(cphandle Handle, qty uint32, key uint32, overlapped *Overlapped) (err error) {
-	r1, _, e1 := syscall.Syscall6(procPostQueuedCompletionStatus.Addr(), 4, uintptr(cphandle), uintptr(qty), uintptr(key), uintptr(unsafe.Pointer(overlapped)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CancelIo(s Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procCancelIo.Addr(), 1, uintptr(s), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CancelIoEx(s Handle, o *Overlapped) (err error) {
-	r1, _, e1 := syscall.Syscall(procCancelIoEx.Addr(), 2, uintptr(s), uintptr(unsafe.Pointer(o)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CreateProcess(appName *uint16, commandLine *uint16, procSecurity *SecurityAttributes, threadSecurity *SecurityAttributes, inheritHandles bool, creationFlags uint32, env *uint16, currentDir *uint16, startupInfo *StartupInfo, outProcInfo *ProcessInformation) (err error) {
-	var _p0 uint32
-	if inheritHandles {
-		_p0 = 1
-	} else {
-		_p0 = 0
-	}
-	r1, _, e1 := syscall.Syscall12(procCreateProcessW.Addr(), 10, uintptr(unsafe.Pointer(appName)), uintptr(unsafe.Pointer(commandLine)), uintptr(unsafe.Pointer(procSecurity)), uintptr(unsafe.Pointer(threadSecurity)), uintptr(_p0), uintptr(creationFlags), uintptr(unsafe.Pointer(env)), uintptr(unsafe.Pointer(currentDir)), uintptr(unsafe.Pointer(startupInfo)), uintptr(unsafe.Pointer(outProcInfo)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func OpenProcess(da uint32, inheritHandle bool, pid uint32) (handle Handle, err error) {
-	var _p0 uint32
-	if inheritHandle {
-		_p0 = 1
-	} else {
-		_p0 = 0
-	}
-	r0, _, e1 := syscall.Syscall(procOpenProcess.Addr(), 3, uintptr(da), uintptr(_p0), uintptr(pid))
-	handle = Handle(r0)
-	if handle == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func TerminateProcess(handle Handle, exitcode uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procTerminateProcess.Addr(), 2, uintptr(handle), uintptr(exitcode), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetExitCodeProcess(handle Handle, exitcode *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetExitCodeProcess.Addr(), 2, uintptr(handle), uintptr(unsafe.Pointer(exitcode)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetStartupInfo(startupInfo *StartupInfo) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetStartupInfoW.Addr(), 1, uintptr(unsafe.Pointer(startupInfo)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetCurrentProcess() (pseudoHandle Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procGetCurrentProcess.Addr(), 0, 0, 0, 0)
-	pseudoHandle = Handle(r0)
-	if pseudoHandle == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetProcessTimes(handle Handle, creationTime *Filetime, exitTime *Filetime, kernelTime *Filetime, userTime *Filetime) (err error) {
-	r1, _, e1 := syscall.Syscall6(procGetProcessTimes.Addr(), 5, uintptr(handle), uintptr(unsafe.Pointer(creationTime)), uintptr(unsafe.Pointer(exitTime)), uintptr(unsafe.Pointer(kernelTime)), uintptr(unsafe.Pointer(userTime)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func DuplicateHandle(hSourceProcessHandle Handle, hSourceHandle Handle, hTargetProcessHandle Handle, lpTargetHandle *Handle, dwDesiredAccess uint32, bInheritHandle bool, dwOptions uint32) (err error) {
-	var _p0 uint32
-	if bInheritHandle {
-		_p0 = 1
-	} else {
-		_p0 = 0
-	}
-	r1, _, e1 := syscall.Syscall9(procDuplicateHandle.Addr(), 7, uintptr(hSourceProcessHandle), uintptr(hSourceHandle), uintptr(hTargetProcessHandle), uintptr(unsafe.Pointer(lpTargetHandle)), uintptr(dwDesiredAccess), uintptr(_p0), uintptr(dwOptions), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func WaitForSingleObject(handle Handle, waitMilliseconds uint32) (event uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procWaitForSingleObject.Addr(), 2, uintptr(handle), uintptr(waitMilliseconds), 0)
-	event = uint32(r0)
-	if event == 0xffffffff {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetTempPath(buflen uint32, buf *uint16) (n uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetTempPathW.Addr(), 2, uintptr(buflen), uintptr(unsafe.Pointer(buf)), 0)
-	n = uint32(r0)
-	if n == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CreatePipe(readhandle *Handle, writehandle *Handle, sa *SecurityAttributes, size uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procCreatePipe.Addr(), 4, uintptr(unsafe.Pointer(readhandle)), uintptr(unsafe.Pointer(writehandle)), uintptr(unsafe.Pointer(sa)), uintptr(size), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetFileType(filehandle Handle) (n uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetFileType.Addr(), 1, uintptr(filehandle), 0, 0)
-	n = uint32(r0)
-	if n == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CryptAcquireContext(provhandle *Handle, container *uint16, provider *uint16, provtype uint32, flags uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procCryptAcquireContextW.Addr(), 5, uintptr(unsafe.Pointer(provhandle)), uintptr(unsafe.Pointer(container)), uintptr(unsafe.Pointer(provider)), uintptr(provtype), uintptr(flags), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CryptReleaseContext(provhandle Handle, flags uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procCryptReleaseContext.Addr(), 2, uintptr(provhandle), uintptr(flags), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CryptGenRandom(provhandle Handle, buflen uint32, buf *byte) (err error) {
-	r1, _, e1 := syscall.Syscall(procCryptGenRandom.Addr(), 3, uintptr(provhandle), uintptr(buflen), uintptr(unsafe.Pointer(buf)))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetEnvironmentStrings() (envs *uint16, err error) {
-	r0, _, e1 := syscall.Syscall(procGetEnvironmentStringsW.Addr(), 0, 0, 0, 0)
-	envs = (*uint16)(unsafe.Pointer(r0))
-	if envs == nil {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func FreeEnvironmentStrings(envs *uint16) (err error) {
-	r1, _, e1 := syscall.Syscall(procFreeEnvironmentStringsW.Addr(), 1, uintptr(unsafe.Pointer(envs)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetEnvironmentVariable(name *uint16, buffer *uint16, size uint32) (n uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetEnvironmentVariableW.Addr(), 3, uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(buffer)), uintptr(size))
-	n = uint32(r0)
-	if n == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func SetEnvironmentVariable(name *uint16, value *uint16) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetEnvironmentVariableW.Addr(), 2, uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(value)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func SetFileTime(handle Handle, ctime *Filetime, atime *Filetime, wtime *Filetime) (err error) {
-	r1, _, e1 := syscall.Syscall6(procSetFileTime.Addr(), 4, uintptr(handle), uintptr(unsafe.Pointer(ctime)), uintptr(unsafe.Pointer(atime)), uintptr(unsafe.Pointer(wtime)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetFileAttributes(name *uint16) (attrs uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetFileAttributesW.Addr(), 1, uintptr(unsafe.Pointer(name)), 0, 0)
-	attrs = uint32(r0)
-	if attrs == INVALID_FILE_ATTRIBUTES {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func SetFileAttributes(name *uint16, attrs uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetFileAttributesW.Addr(), 2, uintptr(unsafe.Pointer(name)), uintptr(attrs), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetFileAttributesEx(name *uint16, level uint32, info *byte) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetFileAttributesExW.Addr(), 3, uintptr(unsafe.Pointer(name)), uintptr(level), uintptr(unsafe.Pointer(info)))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetCommandLine() (cmd *uint16) {
-	r0, _, _ := syscall.Syscall(procGetCommandLineW.Addr(), 0, 0, 0, 0)
-	cmd = (*uint16)(unsafe.Pointer(r0))
-	return
-}
-
-func CommandLineToArgv(cmd *uint16, argc *int32) (argv *[8192]*[8192]uint16, err error) {
-	r0, _, e1 := syscall.Syscall(procCommandLineToArgvW.Addr(), 2, uintptr(unsafe.Pointer(cmd)), uintptr(unsafe.Pointer(argc)), 0)
-	argv = (*[8192]*[8192]uint16)(unsafe.Pointer(r0))
-	if argv == nil {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func LocalFree(hmem Handle) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procLocalFree.Addr(), 1, uintptr(hmem), 0, 0)
-	handle = Handle(r0)
-	if handle != 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func SetHandleInformation(handle Handle, mask uint32, flags uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetHandleInformation.Addr(), 3, uintptr(handle), uintptr(mask), uintptr(flags))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func FlushFileBuffers(handle Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procFlushFileBuffers.Addr(), 1, uintptr(handle), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetFullPathName(path *uint16, buflen uint32, buf *uint16, fname **uint16) (n uint32, err error) {
-	r0, _, e1 := syscall.Syscall6(procGetFullPathNameW.Addr(), 4, uintptr(unsafe.Pointer(path)), uintptr(buflen), uintptr(unsafe.Pointer(buf)), uintptr(unsafe.Pointer(fname)), 0, 0)
-	n = uint32(r0)
-	if n == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetLongPathName(path *uint16, buf *uint16, buflen uint32) (n uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetLongPathNameW.Addr(), 3, uintptr(unsafe.Pointer(path)), uintptr(unsafe.Pointer(buf)), uintptr(buflen))
-	n = uint32(r0)
-	if n == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetShortPathName(longpath *uint16, shortpath *uint16, buflen uint32) (n uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetShortPathNameW.Addr(), 3, uintptr(unsafe.Pointer(longpath)), uintptr(unsafe.Pointer(shortpath)), uintptr(buflen))
-	n = uint32(r0)
-	if n == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CreateFileMapping(fhandle Handle, sa *SecurityAttributes, prot uint32, maxSizeHigh uint32, maxSizeLow uint32, name *uint16) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall6(procCreateFileMappingW.Addr(), 6, uintptr(fhandle), uintptr(unsafe.Pointer(sa)), uintptr(prot), uintptr(maxSizeHigh), uintptr(maxSizeLow), uintptr(unsafe.Pointer(name)))
-	handle = Handle(r0)
-	if handle == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func MapViewOfFile(handle Handle, access uint32, offsetHigh uint32, offsetLow uint32, length uintptr) (addr uintptr, err error) {
-	r0, _, e1 := syscall.Syscall6(procMapViewOfFile.Addr(), 5, uintptr(handle), uintptr(access), uintptr(offsetHigh), uintptr(offsetLow), uintptr(length), 0)
-	addr = uintptr(r0)
-	if addr == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func UnmapViewOfFile(addr uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall(procUnmapViewOfFile.Addr(), 1, uintptr(addr), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func FlushViewOfFile(addr uintptr, length uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall(procFlushViewOfFile.Addr(), 2, uintptr(addr), uintptr(length), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func VirtualLock(addr uintptr, length uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall(procVirtualLock.Addr(), 2, uintptr(addr), uintptr(length), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func VirtualUnlock(addr uintptr, length uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall(procVirtualUnlock.Addr(), 2, uintptr(addr), uintptr(length), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func TransmitFile(s Handle, handle Handle, bytesToWrite uint32, bytsPerSend uint32, overlapped *Overlapped, transmitFileBuf *TransmitFileBuffers, flags uint32) (err error) {
-	r1, _, e1 := syscall.Syscall9(procTransmitFile.Addr(), 7, uintptr(s), uintptr(handle), uintptr(bytesToWrite), uintptr(bytsPerSend), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(transmitFileBuf)), uintptr(flags), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func ReadDirectoryChanges(handle Handle, buf *byte, buflen uint32, watchSubTree bool, mask uint32, retlen *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) {
-	var _p0 uint32
-	if watchSubTree {
-		_p0 = 1
-	} else {
-		_p0 = 0
-	}
-	r1, _, e1 := syscall.Syscall9(procReadDirectoryChangesW.Addr(), 8, uintptr(handle), uintptr(unsafe.Pointer(buf)), uintptr(buflen), uintptr(_p0), uintptr(mask), uintptr(unsafe.Pointer(retlen)), uintptr(unsafe.Pointer(overlapped)), uintptr(completionRoutine), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CertOpenSystemStore(hprov Handle, name *uint16) (store Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procCertOpenSystemStoreW.Addr(), 2, uintptr(hprov), uintptr(unsafe.Pointer(name)), 0)
-	store = Handle(r0)
-	if store == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CertOpenStore(storeProvider uintptr, msgAndCertEncodingType uint32, cryptProv uintptr, flags uint32, para uintptr) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall6(procCertOpenStore.Addr(), 5, uintptr(storeProvider), uintptr(msgAndCertEncodingType), uintptr(cryptProv), uintptr(flags), uintptr(para), 0)
-	handle = Handle(r0)
-	if handle == InvalidHandle {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CertEnumCertificatesInStore(store Handle, prevContext *CertContext) (context *CertContext, err error) {
-	r0, _, e1 := syscall.Syscall(procCertEnumCertificatesInStore.Addr(), 2, uintptr(store), uintptr(unsafe.Pointer(prevContext)), 0)
-	context = (*CertContext)(unsafe.Pointer(r0))
-	if context == nil {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CertAddCertificateContextToStore(store Handle, certContext *CertContext, addDisposition uint32, storeContext **CertContext) (err error) {
-	r1, _, e1 := syscall.Syscall6(procCertAddCertificateContextToStore.Addr(), 4, uintptr(store), uintptr(unsafe.Pointer(certContext)), uintptr(addDisposition), uintptr(unsafe.Pointer(storeContext)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CertCloseStore(store Handle, flags uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procCertCloseStore.Addr(), 2, uintptr(store), uintptr(flags), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CertGetCertificateChain(engine Handle, leaf *CertContext, time *Filetime, additionalStore Handle, para *CertChainPara, flags uint32, reserved uintptr, chainCtx **CertChainContext) (err error) {
-	r1, _, e1 := syscall.Syscall9(procCertGetCertificateChain.Addr(), 8, uintptr(engine), uintptr(unsafe.Pointer(leaf)), uintptr(unsafe.Pointer(time)), uintptr(additionalStore), uintptr(unsafe.Pointer(para)), uintptr(flags), uintptr(reserved), uintptr(unsafe.Pointer(chainCtx)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CertFreeCertificateChain(ctx *CertChainContext) {
-	syscall.Syscall(procCertFreeCertificateChain.Addr(), 1, uintptr(unsafe.Pointer(ctx)), 0, 0)
-	return
-}
-
-func CertCreateCertificateContext(certEncodingType uint32, certEncoded *byte, encodedLen uint32) (context *CertContext, err error) {
-	r0, _, e1 := syscall.Syscall(procCertCreateCertificateContext.Addr(), 3, uintptr(certEncodingType), uintptr(unsafe.Pointer(certEncoded)), uintptr(encodedLen))
-	context = (*CertContext)(unsafe.Pointer(r0))
-	if context == nil {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CertFreeCertificateContext(ctx *CertContext) (err error) {
-	r1, _, e1 := syscall.Syscall(procCertFreeCertificateContext.Addr(), 1, uintptr(unsafe.Pointer(ctx)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CertVerifyCertificateChainPolicy(policyOID uintptr, chain *CertChainContext, para *CertChainPolicyPara, status *CertChainPolicyStatus) (err error) {
-	r1, _, e1 := syscall.Syscall6(procCertVerifyCertificateChainPolicy.Addr(), 4, uintptr(policyOID), uintptr(unsafe.Pointer(chain)), uintptr(unsafe.Pointer(para)), uintptr(unsafe.Pointer(status)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func RegOpenKeyEx(key Handle, subkey *uint16, options uint32, desiredAccess uint32, result *Handle) (regerrno error) {
-	r0, _, _ := syscall.Syscall6(procRegOpenKeyExW.Addr(), 5, uintptr(key), uintptr(unsafe.Pointer(subkey)), uintptr(options), uintptr(desiredAccess), uintptr(unsafe.Pointer(result)), 0)
-	if r0 != 0 {
-		regerrno = syscall.Errno(r0)
-	}
-	return
-}
-
-func RegCloseKey(key Handle) (regerrno error) {
-	r0, _, _ := syscall.Syscall(procRegCloseKey.Addr(), 1, uintptr(key), 0, 0)
-	if r0 != 0 {
-		regerrno = syscall.Errno(r0)
-	}
-	return
-}
-
-func RegQueryInfoKey(key Handle, class *uint16, classLen *uint32, reserved *uint32, subkeysLen *uint32, maxSubkeyLen *uint32, maxClassLen *uint32, valuesLen *uint32, maxValueNameLen *uint32, maxValueLen *uint32, saLen *uint32, lastWriteTime *Filetime) (regerrno error) {
-	r0, _, _ := syscall.Syscall12(procRegQueryInfoKeyW.Addr(), 12, uintptr(key), uintptr(unsafe.Pointer(class)), uintptr(unsafe.Pointer(classLen)), uintptr(unsafe.Pointer(reserved)), uintptr(unsafe.Pointer(subkeysLen)), uintptr(unsafe.Pointer(maxSubkeyLen)), uintptr(unsafe.Pointer(maxClassLen)), uintptr(unsafe.Pointer(valuesLen)), uintptr(unsafe.Pointer(maxValueNameLen)), uintptr(unsafe.Pointer(maxValueLen)), uintptr(unsafe.Pointer(saLen)), uintptr(unsafe.Pointer(lastWriteTime)))
-	if r0 != 0 {
-		regerrno = syscall.Errno(r0)
-	}
-	return
-}
-
-func RegEnumKeyEx(key Handle, index uint32, name *uint16, nameLen *uint32, reserved *uint32, class *uint16, classLen *uint32, lastWriteTime *Filetime) (regerrno error) {
-	r0, _, _ := syscall.Syscall9(procRegEnumKeyExW.Addr(), 8, uintptr(key), uintptr(index), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(nameLen)), uintptr(unsafe.Pointer(reserved)), uintptr(unsafe.Pointer(class)), uintptr(unsafe.Pointer(classLen)), uintptr(unsafe.Pointer(lastWriteTime)), 0)
-	if r0 != 0 {
-		regerrno = syscall.Errno(r0)
-	}
-	return
-}
-
-func RegQueryValueEx(key Handle, name *uint16, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) {
-	r0, _, _ := syscall.Syscall6(procRegQueryValueExW.Addr(), 6, uintptr(key), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(reserved)), uintptr(unsafe.Pointer(valtype)), uintptr(unsafe.Pointer(buf)), uintptr(unsafe.Pointer(buflen)))
-	if r0 != 0 {
-		regerrno = syscall.Errno(r0)
-	}
-	return
-}
-
-func getCurrentProcessId() (pid uint32) {
-	r0, _, _ := syscall.Syscall(procGetCurrentProcessId.Addr(), 0, 0, 0, 0)
-	pid = uint32(r0)
-	return
-}
-
-func GetConsoleMode(console Handle, mode *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(console), uintptr(unsafe.Pointer(mode)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func WriteConsole(console Handle, buf *uint16, towrite uint32, written *uint32, reserved *byte) (err error) {
-	r1, _, e1 := syscall.Syscall6(procWriteConsoleW.Addr(), 5, uintptr(console), uintptr(unsafe.Pointer(buf)), uintptr(towrite), uintptr(unsafe.Pointer(written)), uintptr(unsafe.Pointer(reserved)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func ReadConsole(console Handle, buf *uint16, toread uint32, read *uint32, inputControl *byte) (err error) {
-	r1, _, e1 := syscall.Syscall6(procReadConsoleW.Addr(), 5, uintptr(console), uintptr(unsafe.Pointer(buf)), uintptr(toread), uintptr(unsafe.Pointer(read)), uintptr(unsafe.Pointer(inputControl)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CreateToolhelp32Snapshot(flags uint32, processId uint32) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procCreateToolhelp32Snapshot.Addr(), 2, uintptr(flags), uintptr(processId), 0)
-	handle = Handle(r0)
-	if handle == InvalidHandle {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func Process32First(snapshot Handle, procEntry *ProcessEntry32) (err error) {
-	r1, _, e1 := syscall.Syscall(procProcess32FirstW.Addr(), 2, uintptr(snapshot), uintptr(unsafe.Pointer(procEntry)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func Process32Next(snapshot Handle, procEntry *ProcessEntry32) (err error) {
-	r1, _, e1 := syscall.Syscall(procProcess32NextW.Addr(), 2, uintptr(snapshot), uintptr(unsafe.Pointer(procEntry)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func DeviceIoControl(handle Handle, ioControlCode uint32, inBuffer *byte, inBufferSize uint32, outBuffer *byte, outBufferSize uint32, bytesReturned *uint32, overlapped *Overlapped) (err error) {
-	r1, _, e1 := syscall.Syscall9(procDeviceIoControl.Addr(), 8, uintptr(handle), uintptr(ioControlCode), uintptr(unsafe.Pointer(inBuffer)), uintptr(inBufferSize), uintptr(unsafe.Pointer(outBuffer)), uintptr(outBufferSize), uintptr(unsafe.Pointer(bytesReturned)), uintptr(unsafe.Pointer(overlapped)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CreateSymbolicLink(symlinkfilename *uint16, targetfilename *uint16, flags uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procCreateSymbolicLinkW.Addr(), 3, uintptr(unsafe.Pointer(symlinkfilename)), uintptr(unsafe.Pointer(targetfilename)), uintptr(flags))
-	if r1&0xff == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func CreateHardLink(filename *uint16, existingfilename *uint16, reserved uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall(procCreateHardLinkW.Addr(), 3, uintptr(unsafe.Pointer(filename)), uintptr(unsafe.Pointer(existingfilename)), uintptr(reserved))
-	if r1&0xff == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetCurrentThreadId() (id uint32) {
-	r0, _, _ := syscall.Syscall(procGetCurrentThreadId.Addr(), 0, 0, 0, 0)
-	id = uint32(r0)
-	return
-}
-
-func CreateEvent(eventAttrs *syscall.SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall6(procCreateEventW.Addr(), 4, uintptr(unsafe.Pointer(eventAttrs)), uintptr(manualReset), uintptr(initialState), uintptr(unsafe.Pointer(name)), 0, 0)
-	handle = Handle(r0)
-	if handle == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func SetEvent(event Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetEvent.Addr(), 1, uintptr(event), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func WSAStartup(verreq uint32, data *WSAData) (sockerr error) {
-	r0, _, _ := syscall.Syscall(procWSAStartup.Addr(), 2, uintptr(verreq), uintptr(unsafe.Pointer(data)), 0)
-	if r0 != 0 {
-		sockerr = syscall.Errno(r0)
-	}
-	return
-}
-
-func WSACleanup() (err error) {
-	r1, _, e1 := syscall.Syscall(procWSACleanup.Addr(), 0, 0, 0, 0)
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func WSAIoctl(s Handle, iocc uint32, inbuf *byte, cbif uint32, outbuf *byte, cbob uint32, cbbr *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) {
-	r1, _, e1 := syscall.Syscall9(procWSAIoctl.Addr(), 9, uintptr(s), uintptr(iocc), uintptr(unsafe.Pointer(inbuf)), uintptr(cbif), uintptr(unsafe.Pointer(outbuf)), uintptr(cbob), uintptr(unsafe.Pointer(cbbr)), uintptr(unsafe.Pointer(overlapped)), uintptr(completionRoutine))
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func socket(af int32, typ int32, protocol int32) (handle Handle, err error) {
-	r0, _, e1 := syscall.Syscall(procsocket.Addr(), 3, uintptr(af), uintptr(typ), uintptr(protocol))
-	handle = Handle(r0)
-	if handle == InvalidHandle {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func Setsockopt(s Handle, level int32, optname int32, optval *byte, optlen int32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procsetsockopt.Addr(), 5, uintptr(s), uintptr(level), uintptr(optname), uintptr(unsafe.Pointer(optval)), uintptr(optlen), 0)
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func Getsockopt(s Handle, level int32, optname int32, optval *byte, optlen *int32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procgetsockopt.Addr(), 5, uintptr(s), uintptr(level), uintptr(optname), uintptr(unsafe.Pointer(optval)), uintptr(unsafe.Pointer(optlen)), 0)
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func bind(s Handle, name unsafe.Pointer, namelen int32) (err error) {
-	r1, _, e1 := syscall.Syscall(procbind.Addr(), 3, uintptr(s), uintptr(name), uintptr(namelen))
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func connect(s Handle, name unsafe.Pointer, namelen int32) (err error) {
-	r1, _, e1 := syscall.Syscall(procconnect.Addr(), 3, uintptr(s), uintptr(name), uintptr(namelen))
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func getsockname(s Handle, rsa *RawSockaddrAny, addrlen *int32) (err error) {
-	r1, _, e1 := syscall.Syscall(procgetsockname.Addr(), 3, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func getpeername(s Handle, rsa *RawSockaddrAny, addrlen *int32) (err error) {
-	r1, _, e1 := syscall.Syscall(procgetpeername.Addr(), 3, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func listen(s Handle, backlog int32) (err error) {
-	r1, _, e1 := syscall.Syscall(proclisten.Addr(), 2, uintptr(s), uintptr(backlog), 0)
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func shutdown(s Handle, how int32) (err error) {
-	r1, _, e1 := syscall.Syscall(procshutdown.Addr(), 2, uintptr(s), uintptr(how), 0)
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func Closesocket(s Handle) (err error) {
-	r1, _, e1 := syscall.Syscall(procclosesocket.Addr(), 1, uintptr(s), 0, 0)
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func AcceptEx(ls Handle, as Handle, buf *byte, rxdatalen uint32, laddrlen uint32, raddrlen uint32, recvd *uint32, overlapped *Overlapped) (err error) {
-	r1, _, e1 := syscall.Syscall9(procAcceptEx.Addr(), 8, uintptr(ls), uintptr(as), uintptr(unsafe.Pointer(buf)), uintptr(rxdatalen), uintptr(laddrlen), uintptr(raddrlen), uintptr(unsafe.Pointer(recvd)), uintptr(unsafe.Pointer(overlapped)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetAcceptExSockaddrs(buf *byte, rxdatalen uint32, laddrlen uint32, raddrlen uint32, lrsa **RawSockaddrAny, lrsalen *int32, rrsa **RawSockaddrAny, rrsalen *int32) {
-	syscall.Syscall9(procGetAcceptExSockaddrs.Addr(), 8, uintptr(unsafe.Pointer(buf)), uintptr(rxdatalen), uintptr(laddrlen), uintptr(raddrlen), uintptr(unsafe.Pointer(lrsa)), uintptr(unsafe.Pointer(lrsalen)), uintptr(unsafe.Pointer(rrsa)), uintptr(unsafe.Pointer(rrsalen)), 0)
-	return
-}
-
-func WSARecv(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32, overlapped *Overlapped, croutine *byte) (err error) {
-	r1, _, e1 := syscall.Syscall9(procWSARecv.Addr(), 7, uintptr(s), uintptr(unsafe.Pointer(bufs)), uintptr(bufcnt), uintptr(unsafe.Pointer(recvd)), uintptr(unsafe.Pointer(flags)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)), 0, 0)
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func WSASend(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, overlapped *Overlapped, croutine *byte) (err error) {
-	r1, _, e1 := syscall.Syscall9(procWSASend.Addr(), 7, uintptr(s), uintptr(unsafe.Pointer(bufs)), uintptr(bufcnt), uintptr(unsafe.Pointer(sent)), uintptr(flags), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)), 0, 0)
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func WSARecvFrom(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32, from *RawSockaddrAny, fromlen *int32, overlapped *Overlapped, croutine *byte) (err error) {
-	r1, _, e1 := syscall.Syscall9(procWSARecvFrom.Addr(), 9, uintptr(s), uintptr(unsafe.Pointer(bufs)), uintptr(bufcnt), uintptr(unsafe.Pointer(recvd)), uintptr(unsafe.Pointer(flags)), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)))
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func WSASendTo(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, to *RawSockaddrAny, tolen int32, overlapped *Overlapped, croutine *byte) (err error) {
-	r1, _, e1 := syscall.Syscall9(procWSASendTo.Addr(), 9, uintptr(s), uintptr(unsafe.Pointer(bufs)), uintptr(bufcnt), uintptr(unsafe.Pointer(sent)), uintptr(flags), uintptr(unsafe.Pointer(to)), uintptr(tolen), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)))
-	if r1 == socket_error {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetHostByName(name string) (h *Hostent, err error) {
-	var _p0 *byte
-	_p0, err = syscall.BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	return _GetHostByName(_p0)
-}
-
-func _GetHostByName(name *byte) (h *Hostent, err error) {
-	r0, _, e1 := syscall.Syscall(procgethostbyname.Addr(), 1, uintptr(unsafe.Pointer(name)), 0, 0)
-	h = (*Hostent)(unsafe.Pointer(r0))
-	if h == nil {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetServByName(name string, proto string) (s *Servent, err error) {
-	var _p0 *byte
-	_p0, err = syscall.BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = syscall.BytePtrFromString(proto)
-	if err != nil {
-		return
-	}
-	return _GetServByName(_p0, _p1)
-}
-
-func _GetServByName(name *byte, proto *byte) (s *Servent, err error) {
-	r0, _, e1 := syscall.Syscall(procgetservbyname.Addr(), 2, uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(proto)), 0)
-	s = (*Servent)(unsafe.Pointer(r0))
-	if s == nil {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func Ntohs(netshort uint16) (u uint16) {
-	r0, _, _ := syscall.Syscall(procntohs.Addr(), 1, uintptr(netshort), 0, 0)
-	u = uint16(r0)
-	return
-}
-
-func GetProtoByName(name string) (p *Protoent, err error) {
-	var _p0 *byte
-	_p0, err = syscall.BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	return _GetProtoByName(_p0)
-}
-
-func _GetProtoByName(name *byte) (p *Protoent, err error) {
-	r0, _, e1 := syscall.Syscall(procgetprotobyname.Addr(), 1, uintptr(unsafe.Pointer(name)), 0, 0)
-	p = (*Protoent)(unsafe.Pointer(r0))
-	if p == nil {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func DnsQuery(name string, qtype uint16, options uint32, extra *byte, qrs **DNSRecord, pr *byte) (status error) {
-	var _p0 *uint16
-	_p0, status = syscall.UTF16PtrFromString(name)
-	if status != nil {
-		return
-	}
-	return _DnsQuery(_p0, qtype, options, extra, qrs, pr)
-}
-
-func _DnsQuery(name *uint16, qtype uint16, options uint32, extra *byte, qrs **DNSRecord, pr *byte) (status error) {
-	r0, _, _ := syscall.Syscall6(procDnsQuery_W.Addr(), 6, uintptr(unsafe.Pointer(name)), uintptr(qtype), uintptr(options), uintptr(unsafe.Pointer(extra)), uintptr(unsafe.Pointer(qrs)), uintptr(unsafe.Pointer(pr)))
-	if r0 != 0 {
-		status = syscall.Errno(r0)
-	}
-	return
-}
-
-func DnsRecordListFree(rl *DNSRecord, freetype uint32) {
-	syscall.Syscall(procDnsRecordListFree.Addr(), 2, uintptr(unsafe.Pointer(rl)), uintptr(freetype), 0)
-	return
-}
-
-func DnsNameCompare(name1 *uint16, name2 *uint16) (same bool) {
-	r0, _, _ := syscall.Syscall(procDnsNameCompare_W.Addr(), 2, uintptr(unsafe.Pointer(name1)), uintptr(unsafe.Pointer(name2)), 0)
-	same = r0 != 0
-	return
-}
-
-func GetAddrInfoW(nodename *uint16, servicename *uint16, hints *AddrinfoW, result **AddrinfoW) (sockerr error) {
-	r0, _, _ := syscall.Syscall6(procGetAddrInfoW.Addr(), 4, uintptr(unsafe.Pointer(nodename)), uintptr(unsafe.Pointer(servicename)), uintptr(unsafe.Pointer(hints)), uintptr(unsafe.Pointer(result)), 0, 0)
-	if r0 != 0 {
-		sockerr = syscall.Errno(r0)
-	}
-	return
-}
-
-func FreeAddrInfoW(addrinfo *AddrinfoW) {
-	syscall.Syscall(procFreeAddrInfoW.Addr(), 1, uintptr(unsafe.Pointer(addrinfo)), 0, 0)
-	return
-}
-
-func GetIfEntry(pIfRow *MibIfRow) (errcode error) {
-	r0, _, _ := syscall.Syscall(procGetIfEntry.Addr(), 1, uintptr(unsafe.Pointer(pIfRow)), 0, 0)
-	if r0 != 0 {
-		errcode = syscall.Errno(r0)
-	}
-	return
-}
-
-func GetAdaptersInfo(ai *IpAdapterInfo, ol *uint32) (errcode error) {
-	r0, _, _ := syscall.Syscall(procGetAdaptersInfo.Addr(), 2, uintptr(unsafe.Pointer(ai)), uintptr(unsafe.Pointer(ol)), 0)
-	if r0 != 0 {
-		errcode = syscall.Errno(r0)
-	}
-	return
-}
-
-func SetFileCompletionNotificationModes(handle Handle, flags uint8) (err error) {
-	r1, _, e1 := syscall.Syscall(procSetFileCompletionNotificationModes.Addr(), 2, uintptr(handle), uintptr(flags), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func WSAEnumProtocols(protocols *int32, protocolBuffer *WSAProtocolInfo, bufferLength *uint32) (n int32, err error) {
-	r0, _, e1 := syscall.Syscall(procWSAEnumProtocolsW.Addr(), 3, uintptr(unsafe.Pointer(protocols)), uintptr(unsafe.Pointer(protocolBuffer)), uintptr(unsafe.Pointer(bufferLength)))
-	n = int32(r0)
-	if n == -1 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetAdaptersAddresses(family uint32, flags uint32, reserved uintptr, adapterAddresses *IpAdapterAddresses, sizePointer *uint32) (errcode error) {
-	r0, _, _ := syscall.Syscall6(procGetAdaptersAddresses.Addr(), 5, uintptr(family), uintptr(flags), uintptr(reserved), uintptr(unsafe.Pointer(adapterAddresses)), uintptr(unsafe.Pointer(sizePointer)), 0)
-	if r0 != 0 {
-		errcode = syscall.Errno(r0)
-	}
-	return
-}
-
-func GetACP() (acp uint32) {
-	r0, _, _ := syscall.Syscall(procGetACP.Addr(), 0, 0, 0, 0)
-	acp = uint32(r0)
-	return
-}
-
-func MultiByteToWideChar(codePage uint32, dwFlags uint32, str *byte, nstr int32, wchar *uint16, nwchar int32) (nwrite int32, err error) {
-	r0, _, e1 := syscall.Syscall6(procMultiByteToWideChar.Addr(), 6, uintptr(codePage), uintptr(dwFlags), uintptr(unsafe.Pointer(str)), uintptr(nstr), uintptr(unsafe.Pointer(wchar)), uintptr(nwchar))
-	nwrite = int32(r0)
-	if nwrite == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func TranslateName(accName *uint16, accNameFormat uint32, desiredNameFormat uint32, translatedName *uint16, nSize *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procTranslateNameW.Addr(), 5, uintptr(unsafe.Pointer(accName)), uintptr(accNameFormat), uintptr(desiredNameFormat), uintptr(unsafe.Pointer(translatedName)), uintptr(unsafe.Pointer(nSize)), 0)
-	if r1&0xff == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetUserNameEx(nameFormat uint32, nameBuffre *uint16, nSize *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetUserNameExW.Addr(), 3, uintptr(nameFormat), uintptr(unsafe.Pointer(nameBuffre)), uintptr(unsafe.Pointer(nSize)))
-	if r1&0xff == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func NetUserGetInfo(serverName *uint16, userName *uint16, level uint32, buf **byte) (neterr error) {
-	r0, _, _ := syscall.Syscall6(procNetUserGetInfo.Addr(), 4, uintptr(unsafe.Pointer(serverName)), uintptr(unsafe.Pointer(userName)), uintptr(level), uintptr(unsafe.Pointer(buf)), 0, 0)
-	if r0 != 0 {
-		neterr = syscall.Errno(r0)
-	}
-	return
-}
-
-func NetGetJoinInformation(server *uint16, name **uint16, bufType *uint32) (neterr error) {
-	r0, _, _ := syscall.Syscall(procNetGetJoinInformation.Addr(), 3, uintptr(unsafe.Pointer(server)), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(bufType)))
-	if r0 != 0 {
-		neterr = syscall.Errno(r0)
-	}
-	return
-}
-
-func NetApiBufferFree(buf *byte) (neterr error) {
-	r0, _, _ := syscall.Syscall(procNetApiBufferFree.Addr(), 1, uintptr(unsafe.Pointer(buf)), 0, 0)
-	if r0 != 0 {
-		neterr = syscall.Errno(r0)
-	}
-	return
-}
-
-func LookupAccountSid(systemName *uint16, sid *SID, name *uint16, nameLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall9(procLookupAccountSidW.Addr(), 7, uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(nameLen)), uintptr(unsafe.Pointer(refdDomainName)), uintptr(unsafe.Pointer(refdDomainNameLen)), uintptr(unsafe.Pointer(use)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func LookupAccountName(systemName *uint16, accountName *uint16, sid *SID, sidLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall9(procLookupAccountNameW.Addr(), 7, uintptr(unsafe.Pointer(systemName)), uintptr(unsafe.Pointer(accountName)), uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(sidLen)), uintptr(unsafe.Pointer(refdDomainName)), uintptr(unsafe.Pointer(refdDomainNameLen)), uintptr(unsafe.Pointer(use)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func ConvertSidToStringSid(sid *SID, stringSid **uint16) (err error) {
-	r1, _, e1 := syscall.Syscall(procConvertSidToStringSidW.Addr(), 2, uintptr(unsafe.Pointer(sid)), uintptr(unsafe.Pointer(stringSid)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func ConvertStringSidToSid(stringSid *uint16, sid **SID) (err error) {
-	r1, _, e1 := syscall.Syscall(procConvertStringSidToSidW.Addr(), 2, uintptr(unsafe.Pointer(stringSid)), uintptr(unsafe.Pointer(sid)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetLengthSid(sid *SID) (len uint32) {
-	r0, _, _ := syscall.Syscall(procGetLengthSid.Addr(), 1, uintptr(unsafe.Pointer(sid)), 0, 0)
-	len = uint32(r0)
-	return
-}
-
-func CopySid(destSidLen uint32, destSid *SID, srcSid *SID) (err error) {
-	r1, _, e1 := syscall.Syscall(procCopySid.Addr(), 3, uintptr(destSidLen), uintptr(unsafe.Pointer(destSid)), uintptr(unsafe.Pointer(srcSid)))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func AllocateAndInitializeSid(identAuth *SidIdentifierAuthority, subAuth byte, subAuth0 uint32, subAuth1 uint32, subAuth2 uint32, subAuth3 uint32, subAuth4 uint32, subAuth5 uint32, subAuth6 uint32, subAuth7 uint32, sid **SID) (err error) {
-	r1, _, e1 := syscall.Syscall12(procAllocateAndInitializeSid.Addr(), 11, uintptr(unsafe.Pointer(identAuth)), uintptr(subAuth), uintptr(subAuth0), uintptr(subAuth1), uintptr(subAuth2), uintptr(subAuth3), uintptr(subAuth4), uintptr(subAuth5), uintptr(subAuth6), uintptr(subAuth7), uintptr(unsafe.Pointer(sid)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func FreeSid(sid *SID) (err error) {
-	r1, _, e1 := syscall.Syscall(procFreeSid.Addr(), 1, uintptr(unsafe.Pointer(sid)), 0, 0)
-	if r1 != 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func EqualSid(sid1 *SID, sid2 *SID) (isEqual bool) {
-	r0, _, _ := syscall.Syscall(procEqualSid.Addr(), 2, uintptr(unsafe.Pointer(sid1)), uintptr(unsafe.Pointer(sid2)), 0)
-	isEqual = r0 != 0
-	return
-}
-
-func OpenProcessToken(h Handle, access uint32, token *Token) (err error) {
-	r1, _, e1 := syscall.Syscall(procOpenProcessToken.Addr(), 3, uintptr(h), uintptr(access), uintptr(unsafe.Pointer(token)))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetTokenInformation(t Token, infoClass uint32, info *byte, infoLen uint32, returnedLen *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procGetTokenInformation.Addr(), 5, uintptr(t), uintptr(infoClass), uintptr(unsafe.Pointer(info)), uintptr(infoLen), uintptr(unsafe.Pointer(returnedLen)), 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetUserProfileDirectory(t Token, dir *uint16, dirLen *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall(procGetUserProfileDirectoryW.Addr(), 3, uintptr(t), uintptr(unsafe.Pointer(dir)), uintptr(unsafe.Pointer(dirLen)))
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/windows/ztypes_windows.go b/vendor/golang.org/x/sys/windows/ztypes_windows.go
deleted file mode 100644
index a907ff2ce1..0000000000
--- a/vendor/golang.org/x/sys/windows/ztypes_windows.go
+++ /dev/null
@@ -1,1242 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows
-
-import "syscall"
-
-const (
-	// Windows errors.
-	ERROR_FILE_NOT_FOUND         syscall.Errno = 2
-	ERROR_PATH_NOT_FOUND         syscall.Errno = 3
-	ERROR_ACCESS_DENIED          syscall.Errno = 5
-	ERROR_NO_MORE_FILES          syscall.Errno = 18
-	ERROR_HANDLE_EOF             syscall.Errno = 38
-	ERROR_NETNAME_DELETED        syscall.Errno = 64
-	ERROR_FILE_EXISTS            syscall.Errno = 80
-	ERROR_BROKEN_PIPE            syscall.Errno = 109
-	ERROR_BUFFER_OVERFLOW        syscall.Errno = 111
-	ERROR_INSUFFICIENT_BUFFER    syscall.Errno = 122
-	ERROR_MOD_NOT_FOUND          syscall.Errno = 126
-	ERROR_PROC_NOT_FOUND         syscall.Errno = 127
-	ERROR_ALREADY_EXISTS         syscall.Errno = 183
-	ERROR_ENVVAR_NOT_FOUND       syscall.Errno = 203
-	ERROR_MORE_DATA              syscall.Errno = 234
-	ERROR_OPERATION_ABORTED      syscall.Errno = 995
-	ERROR_IO_PENDING             syscall.Errno = 997
-	ERROR_SERVICE_SPECIFIC_ERROR syscall.Errno = 1066
-	ERROR_NOT_FOUND              syscall.Errno = 1168
-	ERROR_PRIVILEGE_NOT_HELD     syscall.Errno = 1314
-	WSAEACCES                    syscall.Errno = 10013
-	WSAECONNRESET                syscall.Errno = 10054
-)
-
-const (
-	// Invented values to support what package os expects.
-	O_RDONLY   = 0x00000
-	O_WRONLY   = 0x00001
-	O_RDWR     = 0x00002
-	O_CREAT    = 0x00040
-	O_EXCL     = 0x00080
-	O_NOCTTY   = 0x00100
-	O_TRUNC    = 0x00200
-	O_NONBLOCK = 0x00800
-	O_APPEND   = 0x00400
-	O_SYNC     = 0x01000
-	O_ASYNC    = 0x02000
-	O_CLOEXEC  = 0x80000
-)
-
-const (
-	// More invented values for signals
-	SIGHUP  = Signal(0x1)
-	SIGINT  = Signal(0x2)
-	SIGQUIT = Signal(0x3)
-	SIGILL  = Signal(0x4)
-	SIGTRAP = Signal(0x5)
-	SIGABRT = Signal(0x6)
-	SIGBUS  = Signal(0x7)
-	SIGFPE  = Signal(0x8)
-	SIGKILL = Signal(0x9)
-	SIGSEGV = Signal(0xb)
-	SIGPIPE = Signal(0xd)
-	SIGALRM = Signal(0xe)
-	SIGTERM = Signal(0xf)
-)
-
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-}
-
-const (
-	GENERIC_READ    = 0x80000000
-	GENERIC_WRITE   = 0x40000000
-	GENERIC_EXECUTE = 0x20000000
-	GENERIC_ALL     = 0x10000000
-
-	FILE_LIST_DIRECTORY   = 0x00000001
-	FILE_APPEND_DATA      = 0x00000004
-	FILE_WRITE_ATTRIBUTES = 0x00000100
-
-	FILE_SHARE_READ              = 0x00000001
-	FILE_SHARE_WRITE             = 0x00000002
-	FILE_SHARE_DELETE            = 0x00000004
-	FILE_ATTRIBUTE_READONLY      = 0x00000001
-	FILE_ATTRIBUTE_HIDDEN        = 0x00000002
-	FILE_ATTRIBUTE_SYSTEM        = 0x00000004
-	FILE_ATTRIBUTE_DIRECTORY     = 0x00000010
-	FILE_ATTRIBUTE_ARCHIVE       = 0x00000020
-	FILE_ATTRIBUTE_NORMAL        = 0x00000080
-	FILE_ATTRIBUTE_REPARSE_POINT = 0x00000400
-
-	INVALID_FILE_ATTRIBUTES = 0xffffffff
-
-	CREATE_NEW        = 1
-	CREATE_ALWAYS     = 2
-	OPEN_EXISTING     = 3
-	OPEN_ALWAYS       = 4
-	TRUNCATE_EXISTING = 5
-
-	FILE_FLAG_OPEN_REPARSE_POINT = 0x00200000
-	FILE_FLAG_BACKUP_SEMANTICS   = 0x02000000
-	FILE_FLAG_OVERLAPPED         = 0x40000000
-
-	HANDLE_FLAG_INHERIT    = 0x00000001
-	STARTF_USESTDHANDLES   = 0x00000100
-	STARTF_USESHOWWINDOW   = 0x00000001
-	DUPLICATE_CLOSE_SOURCE = 0x00000001
-	DUPLICATE_SAME_ACCESS  = 0x00000002
-
-	STD_INPUT_HANDLE  = -10 & (1<<32 - 1)
-	STD_OUTPUT_HANDLE = -11 & (1<<32 - 1)
-	STD_ERROR_HANDLE  = -12 & (1<<32 - 1)
-
-	FILE_BEGIN   = 0
-	FILE_CURRENT = 1
-	FILE_END     = 2
-
-	LANG_ENGLISH       = 0x09
-	SUBLANG_ENGLISH_US = 0x01
-
-	FORMAT_MESSAGE_ALLOCATE_BUFFER = 256
-	FORMAT_MESSAGE_IGNORE_INSERTS  = 512
-	FORMAT_MESSAGE_FROM_STRING     = 1024
-	FORMAT_MESSAGE_FROM_HMODULE    = 2048
-	FORMAT_MESSAGE_FROM_SYSTEM     = 4096
-	FORMAT_MESSAGE_ARGUMENT_ARRAY  = 8192
-	FORMAT_MESSAGE_MAX_WIDTH_MASK  = 255
-
-	MAX_PATH      = 260
-	MAX_LONG_PATH = 32768
-
-	MAX_COMPUTERNAME_LENGTH = 15
-
-	TIME_ZONE_ID_UNKNOWN  = 0
-	TIME_ZONE_ID_STANDARD = 1
-
-	TIME_ZONE_ID_DAYLIGHT = 2
-	IGNORE                = 0
-	INFINITE              = 0xffffffff
-
-	WAIT_TIMEOUT   = 258
-	WAIT_ABANDONED = 0x00000080
-	WAIT_OBJECT_0  = 0x00000000
-	WAIT_FAILED    = 0xFFFFFFFF
-
-	CREATE_NEW_PROCESS_GROUP   = 0x00000200
-	CREATE_UNICODE_ENVIRONMENT = 0x00000400
-
-	PROCESS_TERMINATE         = 1
-	PROCESS_QUERY_INFORMATION = 0x00000400
-	SYNCHRONIZE               = 0x00100000
-
-	PAGE_READONLY          = 0x02
-	PAGE_READWRITE         = 0x04
-	PAGE_WRITECOPY         = 0x08
-	PAGE_EXECUTE_READ      = 0x20
-	PAGE_EXECUTE_READWRITE = 0x40
-	PAGE_EXECUTE_WRITECOPY = 0x80
-
-	FILE_MAP_COPY    = 0x01
-	FILE_MAP_WRITE   = 0x02
-	FILE_MAP_READ    = 0x04
-	FILE_MAP_EXECUTE = 0x20
-
-	CTRL_C_EVENT     = 0
-	CTRL_BREAK_EVENT = 1
-
-	// Windows reserves errors >= 1<<29 for application use.
-	APPLICATION_ERROR = 1 << 29
-)
-
-const (
-	// flags for CreateToolhelp32Snapshot
-	TH32CS_SNAPHEAPLIST = 0x01
-	TH32CS_SNAPPROCESS  = 0x02
-	TH32CS_SNAPTHREAD   = 0x04
-	TH32CS_SNAPMODULE   = 0x08
-	TH32CS_SNAPMODULE32 = 0x10
-	TH32CS_SNAPALL      = TH32CS_SNAPHEAPLIST | TH32CS_SNAPMODULE | TH32CS_SNAPPROCESS | TH32CS_SNAPTHREAD
-	TH32CS_INHERIT      = 0x80000000
-)
-
-const (
-	// filters for ReadDirectoryChangesW
-	FILE_NOTIFY_CHANGE_FILE_NAME   = 0x001
-	FILE_NOTIFY_CHANGE_DIR_NAME    = 0x002
-	FILE_NOTIFY_CHANGE_ATTRIBUTES  = 0x004
-	FILE_NOTIFY_CHANGE_SIZE        = 0x008
-	FILE_NOTIFY_CHANGE_LAST_WRITE  = 0x010
-	FILE_NOTIFY_CHANGE_LAST_ACCESS = 0x020
-	FILE_NOTIFY_CHANGE_CREATION    = 0x040
-	FILE_NOTIFY_CHANGE_SECURITY    = 0x100
-)
-
-const (
-	// do not reorder
-	FILE_ACTION_ADDED = iota + 1
-	FILE_ACTION_REMOVED
-	FILE_ACTION_MODIFIED
-	FILE_ACTION_RENAMED_OLD_NAME
-	FILE_ACTION_RENAMED_NEW_NAME
-)
-
-const (
-	// wincrypt.h
-	PROV_RSA_FULL                    = 1
-	PROV_RSA_SIG                     = 2
-	PROV_DSS                         = 3
-	PROV_FORTEZZA                    = 4
-	PROV_MS_EXCHANGE                 = 5
-	PROV_SSL                         = 6
-	PROV_RSA_SCHANNEL                = 12
-	PROV_DSS_DH                      = 13
-	PROV_EC_ECDSA_SIG                = 14
-	PROV_EC_ECNRA_SIG                = 15
-	PROV_EC_ECDSA_FULL               = 16
-	PROV_EC_ECNRA_FULL               = 17
-	PROV_DH_SCHANNEL                 = 18
-	PROV_SPYRUS_LYNKS                = 20
-	PROV_RNG                         = 21
-	PROV_INTEL_SEC                   = 22
-	PROV_REPLACE_OWF                 = 23
-	PROV_RSA_AES                     = 24
-	CRYPT_VERIFYCONTEXT              = 0xF0000000
-	CRYPT_NEWKEYSET                  = 0x00000008
-	CRYPT_DELETEKEYSET               = 0x00000010
-	CRYPT_MACHINE_KEYSET             = 0x00000020
-	CRYPT_SILENT                     = 0x00000040
-	CRYPT_DEFAULT_CONTAINER_OPTIONAL = 0x00000080
-
-	USAGE_MATCH_TYPE_AND = 0
-	USAGE_MATCH_TYPE_OR  = 1
-
-	X509_ASN_ENCODING   = 0x00000001
-	PKCS_7_ASN_ENCODING = 0x00010000
-
-	CERT_STORE_PROV_MEMORY = 2
-
-	CERT_STORE_ADD_ALWAYS = 4
-
-	CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG = 0x00000004
-
-	CERT_TRUST_NO_ERROR                          = 0x00000000
-	CERT_TRUST_IS_NOT_TIME_VALID                 = 0x00000001
-	CERT_TRUST_IS_REVOKED                        = 0x00000004
-	CERT_TRUST_IS_NOT_SIGNATURE_VALID            = 0x00000008
-	CERT_TRUST_IS_NOT_VALID_FOR_USAGE            = 0x00000010
-	CERT_TRUST_IS_UNTRUSTED_ROOT                 = 0x00000020
-	CERT_TRUST_REVOCATION_STATUS_UNKNOWN         = 0x00000040
-	CERT_TRUST_IS_CYCLIC                         = 0x00000080
-	CERT_TRUST_INVALID_EXTENSION                 = 0x00000100
-	CERT_TRUST_INVALID_POLICY_CONSTRAINTS        = 0x00000200
-	CERT_TRUST_INVALID_BASIC_CONSTRAINTS         = 0x00000400
-	CERT_TRUST_INVALID_NAME_CONSTRAINTS          = 0x00000800
-	CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT = 0x00001000
-	CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT   = 0x00002000
-	CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT = 0x00004000
-	CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT      = 0x00008000
-	CERT_TRUST_IS_OFFLINE_REVOCATION             = 0x01000000
-	CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY          = 0x02000000
-	CERT_TRUST_IS_EXPLICIT_DISTRUST              = 0x04000000
-	CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT    = 0x08000000
-
-	CERT_CHAIN_POLICY_BASE              = 1
-	CERT_CHAIN_POLICY_AUTHENTICODE      = 2
-	CERT_CHAIN_POLICY_AUTHENTICODE_TS   = 3
-	CERT_CHAIN_POLICY_SSL               = 4
-	CERT_CHAIN_POLICY_BASIC_CONSTRAINTS = 5
-	CERT_CHAIN_POLICY_NT_AUTH           = 6
-	CERT_CHAIN_POLICY_MICROSOFT_ROOT    = 7
-	CERT_CHAIN_POLICY_EV                = 8
-
-	CERT_E_EXPIRED       = 0x800B0101
-	CERT_E_ROLE          = 0x800B0103
-	CERT_E_PURPOSE       = 0x800B0106
-	CERT_E_UNTRUSTEDROOT = 0x800B0109
-	CERT_E_CN_NO_MATCH   = 0x800B010F
-
-	AUTHTYPE_CLIENT = 1
-	AUTHTYPE_SERVER = 2
-)
-
-var (
-	OID_PKIX_KP_SERVER_AUTH = []byte("1.3.6.1.5.5.7.3.1\x00")
-	OID_SERVER_GATED_CRYPTO = []byte("1.3.6.1.4.1.311.10.3.3\x00")
-	OID_SGC_NETSCAPE        = []byte("2.16.840.1.113730.4.1\x00")
-)
-
-// Invented values to support what package os expects.
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-func (tv *Timeval) Nanoseconds() int64 {
-	return (int64(tv.Sec)*1e6 + int64(tv.Usec)) * 1e3
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	tv.Sec = int32(nsec / 1e9)
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	return
-}
-
-type SecurityAttributes struct {
-	Length             uint32
-	SecurityDescriptor uintptr
-	InheritHandle      uint32
-}
-
-type Overlapped struct {
-	Internal     uintptr
-	InternalHigh uintptr
-	Offset       uint32
-	OffsetHigh   uint32
-	HEvent       Handle
-}
-
-type FileNotifyInformation struct {
-	NextEntryOffset uint32
-	Action          uint32
-	FileNameLength  uint32
-	FileName        uint16
-}
-
-type Filetime struct {
-	LowDateTime  uint32
-	HighDateTime uint32
-}
-
-// Nanoseconds returns Filetime ft in nanoseconds
-// since Epoch (00:00:00 UTC, January 1, 1970).
-func (ft *Filetime) Nanoseconds() int64 {
-	// 100-nanosecond intervals since January 1, 1601
-	nsec := int64(ft.HighDateTime)<<32 + int64(ft.LowDateTime)
-	// change starting time to the Epoch (00:00:00 UTC, January 1, 1970)
-	nsec -= 116444736000000000
-	// convert into nanoseconds
-	nsec *= 100
-	return nsec
-}
-
-func NsecToFiletime(nsec int64) (ft Filetime) {
-	// convert into 100-nanosecond
-	nsec /= 100
-	// change starting time to January 1, 1601
-	nsec += 116444736000000000
-	// split into high / low
-	ft.LowDateTime = uint32(nsec & 0xffffffff)
-	ft.HighDateTime = uint32(nsec >> 32 & 0xffffffff)
-	return ft
-}
-
-type Win32finddata struct {
-	FileAttributes    uint32
-	CreationTime      Filetime
-	LastAccessTime    Filetime
-	LastWriteTime     Filetime
-	FileSizeHigh      uint32
-	FileSizeLow       uint32
-	Reserved0         uint32
-	Reserved1         uint32
-	FileName          [MAX_PATH - 1]uint16
-	AlternateFileName [13]uint16
-}
-
-// This is the actual system call structure.
-// Win32finddata is what we committed to in Go 1.
-type win32finddata1 struct {
-	FileAttributes    uint32
-	CreationTime      Filetime
-	LastAccessTime    Filetime
-	LastWriteTime     Filetime
-	FileSizeHigh      uint32
-	FileSizeLow       uint32
-	Reserved0         uint32
-	Reserved1         uint32
-	FileName          [MAX_PATH]uint16
-	AlternateFileName [14]uint16
-}
-
-func copyFindData(dst *Win32finddata, src *win32finddata1) {
-	dst.FileAttributes = src.FileAttributes
-	dst.CreationTime = src.CreationTime
-	dst.LastAccessTime = src.LastAccessTime
-	dst.LastWriteTime = src.LastWriteTime
-	dst.FileSizeHigh = src.FileSizeHigh
-	dst.FileSizeLow = src.FileSizeLow
-	dst.Reserved0 = src.Reserved0
-	dst.Reserved1 = src.Reserved1
-
-	// The src is 1 element bigger than dst, but it must be NUL.
-	copy(dst.FileName[:], src.FileName[:])
-	copy(dst.AlternateFileName[:], src.AlternateFileName[:])
-}
-
-type ByHandleFileInformation struct {
-	FileAttributes     uint32
-	CreationTime       Filetime
-	LastAccessTime     Filetime
-	LastWriteTime      Filetime
-	VolumeSerialNumber uint32
-	FileSizeHigh       uint32
-	FileSizeLow        uint32
-	NumberOfLinks      uint32
-	FileIndexHigh      uint32
-	FileIndexLow       uint32
-}
-
-const (
-	GetFileExInfoStandard = 0
-	GetFileExMaxInfoLevel = 1
-)
-
-type Win32FileAttributeData struct {
-	FileAttributes uint32
-	CreationTime   Filetime
-	LastAccessTime Filetime
-	LastWriteTime  Filetime
-	FileSizeHigh   uint32
-	FileSizeLow    uint32
-}
-
-// ShowWindow constants
-const (
-	// winuser.h
-	SW_HIDE            = 0
-	SW_NORMAL          = 1
-	SW_SHOWNORMAL      = 1
-	SW_SHOWMINIMIZED   = 2
-	SW_SHOWMAXIMIZED   = 3
-	SW_MAXIMIZE        = 3
-	SW_SHOWNOACTIVATE  = 4
-	SW_SHOW            = 5
-	SW_MINIMIZE        = 6
-	SW_SHOWMINNOACTIVE = 7
-	SW_SHOWNA          = 8
-	SW_RESTORE         = 9
-	SW_SHOWDEFAULT     = 10
-	SW_FORCEMINIMIZE   = 11
-)
-
-type StartupInfo struct {
-	Cb            uint32
-	_             *uint16
-	Desktop       *uint16
-	Title         *uint16
-	X             uint32
-	Y             uint32
-	XSize         uint32
-	YSize         uint32
-	XCountChars   uint32
-	YCountChars   uint32
-	FillAttribute uint32
-	Flags         uint32
-	ShowWindow    uint16
-	_             uint16
-	_             *byte
-	StdInput      Handle
-	StdOutput     Handle
-	StdErr        Handle
-}
-
-type ProcessInformation struct {
-	Process   Handle
-	Thread    Handle
-	ProcessId uint32
-	ThreadId  uint32
-}
-
-type ProcessEntry32 struct {
-	Size            uint32
-	Usage           uint32
-	ProcessID       uint32
-	DefaultHeapID   uintptr
-	ModuleID        uint32
-	Threads         uint32
-	ParentProcessID uint32
-	PriClassBase    int32
-	Flags           uint32
-	ExeFile         [MAX_PATH]uint16
-}
-
-type Systemtime struct {
-	Year         uint16
-	Month        uint16
-	DayOfWeek    uint16
-	Day          uint16
-	Hour         uint16
-	Minute       uint16
-	Second       uint16
-	Milliseconds uint16
-}
-
-type Timezoneinformation struct {
-	Bias         int32
-	StandardName [32]uint16
-	StandardDate Systemtime
-	StandardBias int32
-	DaylightName [32]uint16
-	DaylightDate Systemtime
-	DaylightBias int32
-}
-
-// Socket related.
-
-const (
-	AF_UNSPEC  = 0
-	AF_UNIX    = 1
-	AF_INET    = 2
-	AF_INET6   = 23
-	AF_NETBIOS = 17
-
-	SOCK_STREAM    = 1
-	SOCK_DGRAM     = 2
-	SOCK_RAW       = 3
-	SOCK_SEQPACKET = 5
-
-	IPPROTO_IP   = 0
-	IPPROTO_IPV6 = 0x29
-	IPPROTO_TCP  = 6
-	IPPROTO_UDP  = 17
-
-	SOL_SOCKET                = 0xffff
-	SO_REUSEADDR              = 4
-	SO_KEEPALIVE              = 8
-	SO_DONTROUTE              = 16
-	SO_BROADCAST              = 32
-	SO_LINGER                 = 128
-	SO_RCVBUF                 = 0x1002
-	SO_SNDBUF                 = 0x1001
-	SO_UPDATE_ACCEPT_CONTEXT  = 0x700b
-	SO_UPDATE_CONNECT_CONTEXT = 0x7010
-
-	IOC_OUT                            = 0x40000000
-	IOC_IN                             = 0x80000000
-	IOC_VENDOR                         = 0x18000000
-	IOC_INOUT                          = IOC_IN | IOC_OUT
-	IOC_WS2                            = 0x08000000
-	SIO_GET_EXTENSION_FUNCTION_POINTER = IOC_INOUT | IOC_WS2 | 6
-	SIO_KEEPALIVE_VALS                 = IOC_IN | IOC_VENDOR | 4
-	SIO_UDP_CONNRESET                  = IOC_IN | IOC_VENDOR | 12
-
-	// cf. http://support.microsoft.com/default.aspx?scid=kb;en-us;257460
-
-	IP_TOS             = 0x3
-	IP_TTL             = 0x4
-	IP_MULTICAST_IF    = 0x9
-	IP_MULTICAST_TTL   = 0xa
-	IP_MULTICAST_LOOP  = 0xb
-	IP_ADD_MEMBERSHIP  = 0xc
-	IP_DROP_MEMBERSHIP = 0xd
-
-	IPV6_V6ONLY         = 0x1b
-	IPV6_UNICAST_HOPS   = 0x4
-	IPV6_MULTICAST_IF   = 0x9
-	IPV6_MULTICAST_HOPS = 0xa
-	IPV6_MULTICAST_LOOP = 0xb
-	IPV6_JOIN_GROUP     = 0xc
-	IPV6_LEAVE_GROUP    = 0xd
-
-	SOMAXCONN = 0x7fffffff
-
-	TCP_NODELAY = 1
-
-	SHUT_RD   = 0
-	SHUT_WR   = 1
-	SHUT_RDWR = 2
-
-	WSADESCRIPTION_LEN = 256
-	WSASYS_STATUS_LEN  = 128
-)
-
-type WSABuf struct {
-	Len uint32
-	Buf *byte
-}
-
-// Invented values to support what package os expects.
-const (
-	S_IFMT   = 0x1f000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWRITE = 0x80
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-const (
-	FILE_TYPE_CHAR    = 0x0002
-	FILE_TYPE_DISK    = 0x0001
-	FILE_TYPE_PIPE    = 0x0003
-	FILE_TYPE_REMOTE  = 0x8000
-	FILE_TYPE_UNKNOWN = 0x0000
-)
-
-type Hostent struct {
-	Name     *byte
-	Aliases  **byte
-	AddrType uint16
-	Length   uint16
-	AddrList **byte
-}
-
-type Protoent struct {
-	Name    *byte
-	Aliases **byte
-	Proto   uint16
-}
-
-const (
-	DNS_TYPE_A       = 0x0001
-	DNS_TYPE_NS      = 0x0002
-	DNS_TYPE_MD      = 0x0003
-	DNS_TYPE_MF      = 0x0004
-	DNS_TYPE_CNAME   = 0x0005
-	DNS_TYPE_SOA     = 0x0006
-	DNS_TYPE_MB      = 0x0007
-	DNS_TYPE_MG      = 0x0008
-	DNS_TYPE_MR      = 0x0009
-	DNS_TYPE_NULL    = 0x000a
-	DNS_TYPE_WKS     = 0x000b
-	DNS_TYPE_PTR     = 0x000c
-	DNS_TYPE_HINFO   = 0x000d
-	DNS_TYPE_MINFO   = 0x000e
-	DNS_TYPE_MX      = 0x000f
-	DNS_TYPE_TEXT    = 0x0010
-	DNS_TYPE_RP      = 0x0011
-	DNS_TYPE_AFSDB   = 0x0012
-	DNS_TYPE_X25     = 0x0013
-	DNS_TYPE_ISDN    = 0x0014
-	DNS_TYPE_RT      = 0x0015
-	DNS_TYPE_NSAP    = 0x0016
-	DNS_TYPE_NSAPPTR = 0x0017
-	DNS_TYPE_SIG     = 0x0018
-	DNS_TYPE_KEY     = 0x0019
-	DNS_TYPE_PX      = 0x001a
-	DNS_TYPE_GPOS    = 0x001b
-	DNS_TYPE_AAAA    = 0x001c
-	DNS_TYPE_LOC     = 0x001d
-	DNS_TYPE_NXT     = 0x001e
-	DNS_TYPE_EID     = 0x001f
-	DNS_TYPE_NIMLOC  = 0x0020
-	DNS_TYPE_SRV     = 0x0021
-	DNS_TYPE_ATMA    = 0x0022
-	DNS_TYPE_NAPTR   = 0x0023
-	DNS_TYPE_KX      = 0x0024
-	DNS_TYPE_CERT    = 0x0025
-	DNS_TYPE_A6      = 0x0026
-	DNS_TYPE_DNAME   = 0x0027
-	DNS_TYPE_SINK    = 0x0028
-	DNS_TYPE_OPT     = 0x0029
-	DNS_TYPE_DS      = 0x002B
-	DNS_TYPE_RRSIG   = 0x002E
-	DNS_TYPE_NSEC    = 0x002F
-	DNS_TYPE_DNSKEY  = 0x0030
-	DNS_TYPE_DHCID   = 0x0031
-	DNS_TYPE_UINFO   = 0x0064
-	DNS_TYPE_UID     = 0x0065
-	DNS_TYPE_GID     = 0x0066
-	DNS_TYPE_UNSPEC  = 0x0067
-	DNS_TYPE_ADDRS   = 0x00f8
-	DNS_TYPE_TKEY    = 0x00f9
-	DNS_TYPE_TSIG    = 0x00fa
-	DNS_TYPE_IXFR    = 0x00fb
-	DNS_TYPE_AXFR    = 0x00fc
-	DNS_TYPE_MAILB   = 0x00fd
-	DNS_TYPE_MAILA   = 0x00fe
-	DNS_TYPE_ALL     = 0x00ff
-	DNS_TYPE_ANY     = 0x00ff
-	DNS_TYPE_WINS    = 0xff01
-	DNS_TYPE_WINSR   = 0xff02
-	DNS_TYPE_NBSTAT  = 0xff01
-)
-
-const (
-	DNS_INFO_NO_RECORDS = 0x251D
-)
-
-const (
-	// flags inside DNSRecord.Dw
-	DnsSectionQuestion   = 0x0000
-	DnsSectionAnswer     = 0x0001
-	DnsSectionAuthority  = 0x0002
-	DnsSectionAdditional = 0x0003
-)
-
-type DNSSRVData struct {
-	Target   *uint16
-	Priority uint16
-	Weight   uint16
-	Port     uint16
-	Pad      uint16
-}
-
-type DNSPTRData struct {
-	Host *uint16
-}
-
-type DNSMXData struct {
-	NameExchange *uint16
-	Preference   uint16
-	Pad          uint16
-}
-
-type DNSTXTData struct {
-	StringCount uint16
-	StringArray [1]*uint16
-}
-
-type DNSRecord struct {
-	Next     *DNSRecord
-	Name     *uint16
-	Type     uint16
-	Length   uint16
-	Dw       uint32
-	Ttl      uint32
-	Reserved uint32
-	Data     [40]byte
-}
-
-const (
-	TF_DISCONNECT         = 1
-	TF_REUSE_SOCKET       = 2
-	TF_WRITE_BEHIND       = 4
-	TF_USE_DEFAULT_WORKER = 0
-	TF_USE_SYSTEM_THREAD  = 16
-	TF_USE_KERNEL_APC     = 32
-)
-
-type TransmitFileBuffers struct {
-	Head       uintptr
-	HeadLength uint32
-	Tail       uintptr
-	TailLength uint32
-}
-
-const (
-	IFF_UP           = 1
-	IFF_BROADCAST    = 2
-	IFF_LOOPBACK     = 4
-	IFF_POINTTOPOINT = 8
-	IFF_MULTICAST    = 16
-)
-
-const SIO_GET_INTERFACE_LIST = 0x4004747F
-
-// TODO(mattn): SockaddrGen is union of sockaddr/sockaddr_in/sockaddr_in6_old.
-// will be fixed to change variable type as suitable.
-
-type SockaddrGen [24]byte
-
-type InterfaceInfo struct {
-	Flags            uint32
-	Address          SockaddrGen
-	BroadcastAddress SockaddrGen
-	Netmask          SockaddrGen
-}
-
-type IpAddressString struct {
-	String [16]byte
-}
-
-type IpMaskString IpAddressString
-
-type IpAddrString struct {
-	Next      *IpAddrString
-	IpAddress IpAddressString
-	IpMask    IpMaskString
-	Context   uint32
-}
-
-const MAX_ADAPTER_NAME_LENGTH = 256
-const MAX_ADAPTER_DESCRIPTION_LENGTH = 128
-const MAX_ADAPTER_ADDRESS_LENGTH = 8
-
-type IpAdapterInfo struct {
-	Next                *IpAdapterInfo
-	ComboIndex          uint32
-	AdapterName         [MAX_ADAPTER_NAME_LENGTH + 4]byte
-	Description         [MAX_ADAPTER_DESCRIPTION_LENGTH + 4]byte
-	AddressLength       uint32
-	Address             [MAX_ADAPTER_ADDRESS_LENGTH]byte
-	Index               uint32
-	Type                uint32
-	DhcpEnabled         uint32
-	CurrentIpAddress    *IpAddrString
-	IpAddressList       IpAddrString
-	GatewayList         IpAddrString
-	DhcpServer          IpAddrString
-	HaveWins            bool
-	PrimaryWinsServer   IpAddrString
-	SecondaryWinsServer IpAddrString
-	LeaseObtained       int64
-	LeaseExpires        int64
-}
-
-const MAXLEN_PHYSADDR = 8
-const MAX_INTERFACE_NAME_LEN = 256
-const MAXLEN_IFDESCR = 256
-
-type MibIfRow struct {
-	Name            [MAX_INTERFACE_NAME_LEN]uint16
-	Index           uint32
-	Type            uint32
-	Mtu             uint32
-	Speed           uint32
-	PhysAddrLen     uint32
-	PhysAddr        [MAXLEN_PHYSADDR]byte
-	AdminStatus     uint32
-	OperStatus      uint32
-	LastChange      uint32
-	InOctets        uint32
-	InUcastPkts     uint32
-	InNUcastPkts    uint32
-	InDiscards      uint32
-	InErrors        uint32
-	InUnknownProtos uint32
-	OutOctets       uint32
-	OutUcastPkts    uint32
-	OutNUcastPkts   uint32
-	OutDiscards     uint32
-	OutErrors       uint32
-	OutQLen         uint32
-	DescrLen        uint32
-	Descr           [MAXLEN_IFDESCR]byte
-}
-
-type CertContext struct {
-	EncodingType uint32
-	EncodedCert  *byte
-	Length       uint32
-	CertInfo     uintptr
-	Store        Handle
-}
-
-type CertChainContext struct {
-	Size                       uint32
-	TrustStatus                CertTrustStatus
-	ChainCount                 uint32
-	Chains                     **CertSimpleChain
-	LowerQualityChainCount     uint32
-	LowerQualityChains         **CertChainContext
-	HasRevocationFreshnessTime uint32
-	RevocationFreshnessTime    uint32
-}
-
-type CertSimpleChain struct {
-	Size                       uint32
-	TrustStatus                CertTrustStatus
-	NumElements                uint32
-	Elements                   **CertChainElement
-	TrustListInfo              uintptr
-	HasRevocationFreshnessTime uint32
-	RevocationFreshnessTime    uint32
-}
-
-type CertChainElement struct {
-	Size              uint32
-	CertContext       *CertContext
-	TrustStatus       CertTrustStatus
-	RevocationInfo    *CertRevocationInfo
-	IssuanceUsage     *CertEnhKeyUsage
-	ApplicationUsage  *CertEnhKeyUsage
-	ExtendedErrorInfo *uint16
-}
-
-type CertRevocationInfo struct {
-	Size             uint32
-	RevocationResult uint32
-	RevocationOid    *byte
-	OidSpecificInfo  uintptr
-	HasFreshnessTime uint32
-	FreshnessTime    uint32
-	CrlInfo          uintptr // *CertRevocationCrlInfo
-}
-
-type CertTrustStatus struct {
-	ErrorStatus uint32
-	InfoStatus  uint32
-}
-
-type CertUsageMatch struct {
-	Type  uint32
-	Usage CertEnhKeyUsage
-}
-
-type CertEnhKeyUsage struct {
-	Length           uint32
-	UsageIdentifiers **byte
-}
-
-type CertChainPara struct {
-	Size                         uint32
-	RequestedUsage               CertUsageMatch
-	RequstedIssuancePolicy       CertUsageMatch
-	URLRetrievalTimeout          uint32
-	CheckRevocationFreshnessTime uint32
-	RevocationFreshnessTime      uint32
-	CacheResync                  *Filetime
-}
-
-type CertChainPolicyPara struct {
-	Size            uint32
-	Flags           uint32
-	ExtraPolicyPara uintptr
-}
-
-type SSLExtraCertChainPolicyPara struct {
-	Size       uint32
-	AuthType   uint32
-	Checks     uint32
-	ServerName *uint16
-}
-
-type CertChainPolicyStatus struct {
-	Size              uint32
-	Error             uint32
-	ChainIndex        uint32
-	ElementIndex      uint32
-	ExtraPolicyStatus uintptr
-}
-
-const (
-	// do not reorder
-	HKEY_CLASSES_ROOT = 0x80000000 + iota
-	HKEY_CURRENT_USER
-	HKEY_LOCAL_MACHINE
-	HKEY_USERS
-	HKEY_PERFORMANCE_DATA
-	HKEY_CURRENT_CONFIG
-	HKEY_DYN_DATA
-
-	KEY_QUERY_VALUE        = 1
-	KEY_SET_VALUE          = 2
-	KEY_CREATE_SUB_KEY     = 4
-	KEY_ENUMERATE_SUB_KEYS = 8
-	KEY_NOTIFY             = 16
-	KEY_CREATE_LINK        = 32
-	KEY_WRITE              = 0x20006
-	KEY_EXECUTE            = 0x20019
-	KEY_READ               = 0x20019
-	KEY_WOW64_64KEY        = 0x0100
-	KEY_WOW64_32KEY        = 0x0200
-	KEY_ALL_ACCESS         = 0xf003f
-)
-
-const (
-	// do not reorder
-	REG_NONE = iota
-	REG_SZ
-	REG_EXPAND_SZ
-	REG_BINARY
-	REG_DWORD_LITTLE_ENDIAN
-	REG_DWORD_BIG_ENDIAN
-	REG_LINK
-	REG_MULTI_SZ
-	REG_RESOURCE_LIST
-	REG_FULL_RESOURCE_DESCRIPTOR
-	REG_RESOURCE_REQUIREMENTS_LIST
-	REG_QWORD_LITTLE_ENDIAN
-	REG_DWORD = REG_DWORD_LITTLE_ENDIAN
-	REG_QWORD = REG_QWORD_LITTLE_ENDIAN
-)
-
-type AddrinfoW struct {
-	Flags     int32
-	Family    int32
-	Socktype  int32
-	Protocol  int32
-	Addrlen   uintptr
-	Canonname *uint16
-	Addr      uintptr
-	Next      *AddrinfoW
-}
-
-const (
-	AI_PASSIVE     = 1
-	AI_CANONNAME   = 2
-	AI_NUMERICHOST = 4
-)
-
-type GUID struct {
-	Data1 uint32
-	Data2 uint16
-	Data3 uint16
-	Data4 [8]byte
-}
-
-var WSAID_CONNECTEX = GUID{
-	0x25a207b9,
-	0xddf3,
-	0x4660,
-	[8]byte{0x8e, 0xe9, 0x76, 0xe5, 0x8c, 0x74, 0x06, 0x3e},
-}
-
-const (
-	FILE_SKIP_COMPLETION_PORT_ON_SUCCESS = 1
-	FILE_SKIP_SET_EVENT_ON_HANDLE        = 2
-)
-
-const (
-	WSAPROTOCOL_LEN    = 255
-	MAX_PROTOCOL_CHAIN = 7
-	BASE_PROTOCOL      = 1
-	LAYERED_PROTOCOL   = 0
-
-	XP1_CONNECTIONLESS           = 0x00000001
-	XP1_GUARANTEED_DELIVERY      = 0x00000002
-	XP1_GUARANTEED_ORDER         = 0x00000004
-	XP1_MESSAGE_ORIENTED         = 0x00000008
-	XP1_PSEUDO_STREAM            = 0x00000010
-	XP1_GRACEFUL_CLOSE           = 0x00000020
-	XP1_EXPEDITED_DATA           = 0x00000040
-	XP1_CONNECT_DATA             = 0x00000080
-	XP1_DISCONNECT_DATA          = 0x00000100
-	XP1_SUPPORT_BROADCAST        = 0x00000200
-	XP1_SUPPORT_MULTIPOINT       = 0x00000400
-	XP1_MULTIPOINT_CONTROL_PLANE = 0x00000800
-	XP1_MULTIPOINT_DATA_PLANE    = 0x00001000
-	XP1_QOS_SUPPORTED            = 0x00002000
-	XP1_UNI_SEND                 = 0x00008000
-	XP1_UNI_RECV                 = 0x00010000
-	XP1_IFS_HANDLES              = 0x00020000
-	XP1_PARTIAL_MESSAGE          = 0x00040000
-	XP1_SAN_SUPPORT_SDP          = 0x00080000
-
-	PFL_MULTIPLE_PROTO_ENTRIES  = 0x00000001
-	PFL_RECOMMENDED_PROTO_ENTRY = 0x00000002
-	PFL_HIDDEN                  = 0x00000004
-	PFL_MATCHES_PROTOCOL_ZERO   = 0x00000008
-	PFL_NETWORKDIRECT_PROVIDER  = 0x00000010
-)
-
-type WSAProtocolInfo struct {
-	ServiceFlags1     uint32
-	ServiceFlags2     uint32
-	ServiceFlags3     uint32
-	ServiceFlags4     uint32
-	ProviderFlags     uint32
-	ProviderId        GUID
-	CatalogEntryId    uint32
-	ProtocolChain     WSAProtocolChain
-	Version           int32
-	AddressFamily     int32
-	MaxSockAddr       int32
-	MinSockAddr       int32
-	SocketType        int32
-	Protocol          int32
-	ProtocolMaxOffset int32
-	NetworkByteOrder  int32
-	SecurityScheme    int32
-	MessageSize       uint32
-	ProviderReserved  uint32
-	ProtocolName      [WSAPROTOCOL_LEN + 1]uint16
-}
-
-type WSAProtocolChain struct {
-	ChainLen     int32
-	ChainEntries [MAX_PROTOCOL_CHAIN]uint32
-}
-
-type TCPKeepalive struct {
-	OnOff    uint32
-	Time     uint32
-	Interval uint32
-}
-
-type symbolicLinkReparseBuffer struct {
-	SubstituteNameOffset uint16
-	SubstituteNameLength uint16
-	PrintNameOffset      uint16
-	PrintNameLength      uint16
-	Flags                uint32
-	PathBuffer           [1]uint16
-}
-
-type mountPointReparseBuffer struct {
-	SubstituteNameOffset uint16
-	SubstituteNameLength uint16
-	PrintNameOffset      uint16
-	PrintNameLength      uint16
-	PathBuffer           [1]uint16
-}
-
-type reparseDataBuffer struct {
-	ReparseTag        uint32
-	ReparseDataLength uint16
-	Reserved          uint16
-
-	// GenericReparseBuffer
-	reparseBuffer byte
-}
-
-const (
-	FSCTL_GET_REPARSE_POINT          = 0x900A8
-	MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16 * 1024
-	IO_REPARSE_TAG_MOUNT_POINT       = 0xA0000003
-	IO_REPARSE_TAG_SYMLINK           = 0xA000000C
-	SYMBOLIC_LINK_FLAG_DIRECTORY     = 0x1
-)
-
-const (
-	ComputerNameNetBIOS                   = 0
-	ComputerNameDnsHostname               = 1
-	ComputerNameDnsDomain                 = 2
-	ComputerNameDnsFullyQualified         = 3
-	ComputerNamePhysicalNetBIOS           = 4
-	ComputerNamePhysicalDnsHostname       = 5
-	ComputerNamePhysicalDnsDomain         = 6
-	ComputerNamePhysicalDnsFullyQualified = 7
-	ComputerNameMax                       = 8
-)
-
-const (
-	MOVEFILE_REPLACE_EXISTING      = 0x1
-	MOVEFILE_COPY_ALLOWED          = 0x2
-	MOVEFILE_DELAY_UNTIL_REBOOT    = 0x4
-	MOVEFILE_WRITE_THROUGH         = 0x8
-	MOVEFILE_CREATE_HARDLINK       = 0x10
-	MOVEFILE_FAIL_IF_NOT_TRACKABLE = 0x20
-)
-
-const GAA_FLAG_INCLUDE_PREFIX = 0x00000010
-
-const (
-	IF_TYPE_OTHER              = 1
-	IF_TYPE_ETHERNET_CSMACD    = 6
-	IF_TYPE_ISO88025_TOKENRING = 9
-	IF_TYPE_PPP                = 23
-	IF_TYPE_SOFTWARE_LOOPBACK  = 24
-	IF_TYPE_ATM                = 37
-	IF_TYPE_IEEE80211          = 71
-	IF_TYPE_TUNNEL             = 131
-	IF_TYPE_IEEE1394           = 144
-)
-
-type SocketAddress struct {
-	Sockaddr       *syscall.RawSockaddrAny
-	SockaddrLength int32
-}
-
-type IpAdapterUnicastAddress struct {
-	Length             uint32
-	Flags              uint32
-	Next               *IpAdapterUnicastAddress
-	Address            SocketAddress
-	PrefixOrigin       int32
-	SuffixOrigin       int32
-	DadState           int32
-	ValidLifetime      uint32
-	PreferredLifetime  uint32
-	LeaseLifetime      uint32
-	OnLinkPrefixLength uint8
-}
-
-type IpAdapterAnycastAddress struct {
-	Length  uint32
-	Flags   uint32
-	Next    *IpAdapterAnycastAddress
-	Address SocketAddress
-}
-
-type IpAdapterMulticastAddress struct {
-	Length  uint32
-	Flags   uint32
-	Next    *IpAdapterMulticastAddress
-	Address SocketAddress
-}
-
-type IpAdapterDnsServerAdapter struct {
-	Length   uint32
-	Reserved uint32
-	Next     *IpAdapterDnsServerAdapter
-	Address  SocketAddress
-}
-
-type IpAdapterPrefix struct {
-	Length       uint32
-	Flags        uint32
-	Next         *IpAdapterPrefix
-	Address      SocketAddress
-	PrefixLength uint32
-}
-
-type IpAdapterAddresses struct {
-	Length                uint32
-	IfIndex               uint32
-	Next                  *IpAdapterAddresses
-	AdapterName           *byte
-	FirstUnicastAddress   *IpAdapterUnicastAddress
-	FirstAnycastAddress   *IpAdapterAnycastAddress
-	FirstMulticastAddress *IpAdapterMulticastAddress
-	FirstDnsServerAddress *IpAdapterDnsServerAdapter
-	DnsSuffix             *uint16
-	Description           *uint16
-	FriendlyName          *uint16
-	PhysicalAddress       [syscall.MAX_ADAPTER_ADDRESS_LENGTH]byte
-	PhysicalAddressLength uint32
-	Flags                 uint32
-	Mtu                   uint32
-	IfType                uint32
-	OperStatus            uint32
-	Ipv6IfIndex           uint32
-	ZoneIndices           [16]uint32
-	FirstPrefix           *IpAdapterPrefix
-	/* more fields might be present here. */
-}
-
-const (
-	IfOperStatusUp             = 1
-	IfOperStatusDown           = 2
-	IfOperStatusTesting        = 3
-	IfOperStatusUnknown        = 4
-	IfOperStatusDormant        = 5
-	IfOperStatusNotPresent     = 6
-	IfOperStatusLowerLayerDown = 7
-)
diff --git a/vendor/golang.org/x/sys/windows/ztypes_windows_386.go b/vendor/golang.org/x/sys/windows/ztypes_windows_386.go
deleted file mode 100644
index 10f33be0b7..0000000000
--- a/vendor/golang.org/x/sys/windows/ztypes_windows_386.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows
-
-type WSAData struct {
-	Version      uint16
-	HighVersion  uint16
-	Description  [WSADESCRIPTION_LEN + 1]byte
-	SystemStatus [WSASYS_STATUS_LEN + 1]byte
-	MaxSockets   uint16
-	MaxUdpDg     uint16
-	VendorInfo   *byte
-}
-
-type Servent struct {
-	Name    *byte
-	Aliases **byte
-	Port    uint16
-	Proto   *byte
-}
diff --git a/vendor/golang.org/x/sys/windows/ztypes_windows_amd64.go b/vendor/golang.org/x/sys/windows/ztypes_windows_amd64.go
deleted file mode 100644
index 3f272c2499..0000000000
--- a/vendor/golang.org/x/sys/windows/ztypes_windows_amd64.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows
-
-type WSAData struct {
-	Version      uint16
-	HighVersion  uint16
-	MaxSockets   uint16
-	MaxUdpDg     uint16
-	VendorInfo   *byte
-	Description  [WSADESCRIPTION_LEN + 1]byte
-	SystemStatus [WSASYS_STATUS_LEN + 1]byte
-}
-
-type Servent struct {
-	Name    *byte
-	Aliases **byte
-	Proto   *byte
-	Port    uint16
-}
diff --git a/vendor/golang.org/x/text/LICENSE b/vendor/golang.org/x/text/LICENSE
deleted file mode 100644
index 6a66aea5ea..0000000000
--- a/vendor/golang.org/x/text/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/golang.org/x/text/PATENTS b/vendor/golang.org/x/text/PATENTS
deleted file mode 100644
index 733099041f..0000000000
--- a/vendor/golang.org/x/text/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
diff --git a/vendor/golang.org/x/text/encoding/charmap/charmap.go b/vendor/golang.org/x/text/encoding/charmap/charmap.go
deleted file mode 100644
index e89ff0734f..0000000000
--- a/vendor/golang.org/x/text/encoding/charmap/charmap.go
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate go run maketables.go
-
-// Package charmap provides simple character encodings such as IBM Code Page 437
-// and Windows 1252.
-package charmap // import "golang.org/x/text/encoding/charmap"
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/internal"
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/transform"
-)
-
-// These encodings vary only in the way clients should interpret them. Their
-// coded character set is identical and a single implementation can be shared.
-var (
-	// ISO8859_6E is the ISO 8859-6E encoding.
-	ISO8859_6E encoding.Encoding = &iso8859_6E
-
-	// ISO8859_6I is the ISO 8859-6I encoding.
-	ISO8859_6I encoding.Encoding = &iso8859_6I
-
-	// ISO8859_8E is the ISO 8859-8E encoding.
-	ISO8859_8E encoding.Encoding = &iso8859_8E
-
-	// ISO8859_8I is the ISO 8859-8I encoding.
-	ISO8859_8I encoding.Encoding = &iso8859_8I
-
-	iso8859_6E = internal.Encoding{
-		Encoding: ISO8859_6,
-		Name:     "ISO-8859-6E",
-		MIB:      identifier.ISO88596E,
-	}
-
-	iso8859_6I = internal.Encoding{
-		Encoding: ISO8859_6,
-		Name:     "ISO-8859-6I",
-		MIB:      identifier.ISO88596I,
-	}
-
-	iso8859_8E = internal.Encoding{
-		Encoding: ISO8859_8,
-		Name:     "ISO-8859-8E",
-		MIB:      identifier.ISO88598E,
-	}
-
-	iso8859_8I = internal.Encoding{
-		Encoding: ISO8859_8,
-		Name:     "ISO-8859-8I",
-		MIB:      identifier.ISO88598I,
-	}
-)
-
-// All is a list of all defined encodings in this package.
-var All []encoding.Encoding = listAll
-
-// TODO: implement these encodings, in order of importance.
-// ASCII, ISO8859_1:       Rather common. Close to Windows 1252.
-// ISO8859_9:              Close to Windows 1254.
-
-// utf8Enc holds a rune's UTF-8 encoding in data[:len].
-type utf8Enc struct {
-	len  uint8
-	data [3]byte
-}
-
-// Charmap is an 8-bit character set encoding.
-type Charmap struct {
-	// name is the encoding's name.
-	name string
-	// mib is the encoding type of this encoder.
-	mib identifier.MIB
-	// asciiSuperset states whether the encoding is a superset of ASCII.
-	asciiSuperset bool
-	// low is the lower bound of the encoded byte for a non-ASCII rune. If
-	// Charmap.asciiSuperset is true then this will be 0x80, otherwise 0x00.
-	low uint8
-	// replacement is the encoded replacement character.
-	replacement byte
-	// decode is the map from encoded byte to UTF-8.
-	decode [256]utf8Enc
-	// encoding is the map from runes to encoded bytes. Each entry is a
-	// uint32: the high 8 bits are the encoded byte and the low 24 bits are
-	// the rune. The table entries are sorted by ascending rune.
-	encode [256]uint32
-}
-
-// NewDecoder implements the encoding.Encoding interface.
-func (m *Charmap) NewDecoder() *encoding.Decoder {
-	return &encoding.Decoder{Transformer: charmapDecoder{charmap: m}}
-}
-
-// NewEncoder implements the encoding.Encoding interface.
-func (m *Charmap) NewEncoder() *encoding.Encoder {
-	return &encoding.Encoder{Transformer: charmapEncoder{charmap: m}}
-}
-
-// String returns the Charmap's name.
-func (m *Charmap) String() string {
-	return m.name
-}
-
-// ID implements an internal interface.
-func (m *Charmap) ID() (mib identifier.MIB, other string) {
-	return m.mib, ""
-}
-
-// charmapDecoder implements transform.Transformer by decoding to UTF-8.
-type charmapDecoder struct {
-	transform.NopResetter
-	charmap *Charmap
-}
-
-func (m charmapDecoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	for i, c := range src {
-		if m.charmap.asciiSuperset && c < utf8.RuneSelf {
-			if nDst >= len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			dst[nDst] = c
-			nDst++
-			nSrc = i + 1
-			continue
-		}
-
-		decode := &m.charmap.decode[c]
-		n := int(decode.len)
-		if nDst+n > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		// It's 15% faster to avoid calling copy for these tiny slices.
-		for j := 0; j < n; j++ {
-			dst[nDst] = decode.data[j]
-			nDst++
-		}
-		nSrc = i + 1
-	}
-	return nDst, nSrc, err
-}
-
-// DecodeByte returns the Charmap's rune decoding of the byte b.
-func (m *Charmap) DecodeByte(b byte) rune {
-	switch x := &m.decode[b]; x.len {
-	case 1:
-		return rune(x.data[0])
-	case 2:
-		return rune(x.data[0]&0x1f)<<6 | rune(x.data[1]&0x3f)
-	default:
-		return rune(x.data[0]&0x0f)<<12 | rune(x.data[1]&0x3f)<<6 | rune(x.data[2]&0x3f)
-	}
-}
-
-// charmapEncoder implements transform.Transformer by encoding from UTF-8.
-type charmapEncoder struct {
-	transform.NopResetter
-	charmap *Charmap
-}
-
-func (m charmapEncoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-loop:
-	for nSrc < len(src) {
-		if nDst >= len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		r = rune(src[nSrc])
-
-		// Decode a 1-byte rune.
-		if r < utf8.RuneSelf {
-			if m.charmap.asciiSuperset {
-				nSrc++
-				dst[nDst] = uint8(r)
-				nDst++
-				continue
-			}
-			size = 1
-
-		} else {
-			// Decode a multi-byte rune.
-			r, size = utf8.DecodeRune(src[nSrc:])
-			if size == 1 {
-				// All valid runes of size 1 (those below utf8.RuneSelf) were
-				// handled above. We have invalid UTF-8 or we haven't seen the
-				// full character yet.
-				if !atEOF && !utf8.FullRune(src[nSrc:]) {
-					err = transform.ErrShortSrc
-				} else {
-					err = internal.RepertoireError(m.charmap.replacement)
-				}
-				break
-			}
-		}
-
-		// Binary search in [low, high) for that rune in the m.charmap.encode table.
-		for low, high := int(m.charmap.low), 0x100; ; {
-			if low >= high {
-				err = internal.RepertoireError(m.charmap.replacement)
-				break loop
-			}
-			mid := (low + high) / 2
-			got := m.charmap.encode[mid]
-			gotRune := rune(got & (1<<24 - 1))
-			if gotRune < r {
-				low = mid + 1
-			} else if gotRune > r {
-				high = mid
-			} else {
-				dst[nDst] = byte(got >> 24)
-				nDst++
-				break
-			}
-		}
-		nSrc += size
-	}
-	return nDst, nSrc, err
-}
-
-// EncodeRune returns the Charmap's byte encoding of the rune r. ok is whether
-// r is in the Charmap's repertoire. If not, b is set to the Charmap's
-// replacement byte. This is often the ASCII substitute character '\x1a'.
-func (m *Charmap) EncodeRune(r rune) (b byte, ok bool) {
-	if r < utf8.RuneSelf && m.asciiSuperset {
-		return byte(r), true
-	}
-	for low, high := int(m.low), 0x100; ; {
-		if low >= high {
-			return m.replacement, false
-		}
-		mid := (low + high) / 2
-		got := m.encode[mid]
-		gotRune := rune(got & (1<<24 - 1))
-		if gotRune < r {
-			low = mid + 1
-		} else if gotRune > r {
-			high = mid
-		} else {
-			return byte(got >> 24), true
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/encoding/charmap/tables.go b/vendor/golang.org/x/text/encoding/charmap/tables.go
deleted file mode 100644
index cf7281e9e3..0000000000
--- a/vendor/golang.org/x/text/encoding/charmap/tables.go
+++ /dev/null
@@ -1,7410 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package charmap
-
-import (
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/internal/identifier"
-)
-
-// CodePage037 is the IBM Code Page 037 encoding.
-var CodePage037 *Charmap = &codePage037
-
-var codePage037 = Charmap{
-	name:          "IBM Code Page 037",
-	mib:           identifier.IBM037,
-	asciiSuperset: false,
-	low:           0x00,
-	replacement:   0x3f,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x9c, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x86, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x97, 0x00}}, {2, [3]byte{0xc2, 0x8d, 0x00}},
-		{2, [3]byte{0xc2, 0x8e, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x9d, 0x00}}, {2, [3]byte{0xc2, 0x85, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {2, [3]byte{0xc2, 0x87, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x92, 0x00}}, {2, [3]byte{0xc2, 0x8f, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x80, 0x00}}, {2, [3]byte{0xc2, 0x81, 0x00}},
-		{2, [3]byte{0xc2, 0x82, 0x00}}, {2, [3]byte{0xc2, 0x83, 0x00}},
-		{2, [3]byte{0xc2, 0x84, 0x00}}, {1, [3]byte{0x0a, 0x00, 0x00}},
-		{1, [3]byte{0x17, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x88, 0x00}}, {2, [3]byte{0xc2, 0x89, 0x00}},
-		{2, [3]byte{0xc2, 0x8a, 0x00}}, {2, [3]byte{0xc2, 0x8b, 0x00}},
-		{2, [3]byte{0xc2, 0x8c, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x90, 0x00}}, {2, [3]byte{0xc2, 0x91, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {2, [3]byte{0xc2, 0x93, 0x00}},
-		{2, [3]byte{0xc2, 0x94, 0x00}}, {2, [3]byte{0xc2, 0x95, 0x00}},
-		{2, [3]byte{0xc2, 0x96, 0x00}}, {1, [3]byte{0x04, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x98, 0x00}}, {2, [3]byte{0xc2, 0x99, 0x00}},
-		{2, [3]byte{0xc2, 0x9a, 0x00}}, {2, [3]byte{0xc2, 0x9b, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x9e, 0x00}}, {1, [3]byte{0x1a, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0xa4, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa3, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc3, 0xa7, 0x00}}, {2, [3]byte{0xc3, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {1, [3]byte{0x2e, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x28, 0x00, 0x00}},
-		{1, [3]byte{0x2b, 0x00, 0x00}}, {1, [3]byte{0x7c, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xac, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{1, [3]byte{0x21, 0x00, 0x00}}, {1, [3]byte{0x24, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x3b, 0x00, 0x00}}, {2, [3]byte{0xc2, 0xac, 0x00}},
-		{1, [3]byte{0x2d, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x84, 0x00}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x83, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x87, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {1, [3]byte{0x2c, 0x00, 0x00}},
-		{1, [3]byte{0x25, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {1, [3]byte{0x60, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x3d, 0x00, 0x00}}, {1, [3]byte{0x22, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xab, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xb0, 0x00}}, {2, [3]byte{0xc3, 0xbd, 0x00}},
-		{2, [3]byte{0xc3, 0xbe, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {1, [3]byte{0x6a, 0x00, 0x00}},
-		{1, [3]byte{0x6b, 0x00, 0x00}}, {1, [3]byte{0x6c, 0x00, 0x00}},
-		{1, [3]byte{0x6d, 0x00, 0x00}}, {1, [3]byte{0x6e, 0x00, 0x00}},
-		{1, [3]byte{0x6f, 0x00, 0x00}}, {1, [3]byte{0x70, 0x00, 0x00}},
-		{1, [3]byte{0x71, 0x00, 0x00}}, {1, [3]byte{0x72, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xba, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xb8, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc2, 0xa4, 0x00}},
-		{2, [3]byte{0xc2, 0xb5, 0x00}}, {1, [3]byte{0x7e, 0x00, 0x00}},
-		{1, [3]byte{0x73, 0x00, 0x00}}, {1, [3]byte{0x74, 0x00, 0x00}},
-		{1, [3]byte{0x75, 0x00, 0x00}}, {1, [3]byte{0x76, 0x00, 0x00}},
-		{1, [3]byte{0x77, 0x00, 0x00}}, {1, [3]byte{0x78, 0x00, 0x00}},
-		{1, [3]byte{0x79, 0x00, 0x00}}, {1, [3]byte{0x7a, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xa1, 0x00}}, {2, [3]byte{0xc2, 0xbf, 0x00}},
-		{2, [3]byte{0xc3, 0x90, 0x00}}, {2, [3]byte{0xc3, 0x9d, 0x00}},
-		{2, [3]byte{0xc3, 0x9e, 0x00}}, {2, [3]byte{0xc2, 0xae, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa5, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xa9, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xbc, 0x00}},
-		{2, [3]byte{0xc2, 0xbd, 0x00}}, {2, [3]byte{0xc2, 0xbe, 0x00}},
-		{1, [3]byte{0x5b, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xaf, 0x00}}, {2, [3]byte{0xc2, 0xa8, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{1, [3]byte{0x7b, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xad, 0x00}}, {2, [3]byte{0xc3, 0xb4, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb2, 0x00}},
-		{2, [3]byte{0xc3, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{1, [3]byte{0x7d, 0x00, 0x00}}, {1, [3]byte{0x4a, 0x00, 0x00}},
-		{1, [3]byte{0x4b, 0x00, 0x00}}, {1, [3]byte{0x4c, 0x00, 0x00}},
-		{1, [3]byte{0x4d, 0x00, 0x00}}, {1, [3]byte{0x4e, 0x00, 0x00}},
-		{1, [3]byte{0x4f, 0x00, 0x00}}, {1, [3]byte{0x50, 0x00, 0x00}},
-		{1, [3]byte{0x51, 0x00, 0x00}}, {1, [3]byte{0x52, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xb9, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbf, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{1, [3]byte{0x53, 0x00, 0x00}}, {1, [3]byte{0x54, 0x00, 0x00}},
-		{1, [3]byte{0x55, 0x00, 0x00}}, {1, [3]byte{0x56, 0x00, 0x00}},
-		{1, [3]byte{0x57, 0x00, 0x00}}, {1, [3]byte{0x58, 0x00, 0x00}},
-		{1, [3]byte{0x59, 0x00, 0x00}}, {1, [3]byte{0x5a, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc3, 0x94, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x92, 0x00}},
-		{2, [3]byte{0xc3, 0x93, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc2, 0x9f, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x37000004, 0x2d000005, 0x2e000006, 0x2f000007,
-		0x16000008, 0x05000009, 0x2500000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x3c000014, 0x3d000015, 0x32000016, 0x26000017,
-		0x18000018, 0x19000019, 0x3f00001a, 0x2700001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x40000020, 0x5a000021, 0x7f000022, 0x7b000023, 0x5b000024, 0x6c000025, 0x50000026, 0x7d000027,
-		0x4d000028, 0x5d000029, 0x5c00002a, 0x4e00002b, 0x6b00002c, 0x6000002d, 0x4b00002e, 0x6100002f,
-		0xf0000030, 0xf1000031, 0xf2000032, 0xf3000033, 0xf4000034, 0xf5000035, 0xf6000036, 0xf7000037,
-		0xf8000038, 0xf9000039, 0x7a00003a, 0x5e00003b, 0x4c00003c, 0x7e00003d, 0x6e00003e, 0x6f00003f,
-		0x7c000040, 0xc1000041, 0xc2000042, 0xc3000043, 0xc4000044, 0xc5000045, 0xc6000046, 0xc7000047,
-		0xc8000048, 0xc9000049, 0xd100004a, 0xd200004b, 0xd300004c, 0xd400004d, 0xd500004e, 0xd600004f,
-		0xd7000050, 0xd8000051, 0xd9000052, 0xe2000053, 0xe3000054, 0xe4000055, 0xe5000056, 0xe6000057,
-		0xe7000058, 0xe8000059, 0xe900005a, 0xba00005b, 0xe000005c, 0xbb00005d, 0xb000005e, 0x6d00005f,
-		0x79000060, 0x81000061, 0x82000062, 0x83000063, 0x84000064, 0x85000065, 0x86000066, 0x87000067,
-		0x88000068, 0x89000069, 0x9100006a, 0x9200006b, 0x9300006c, 0x9400006d, 0x9500006e, 0x9600006f,
-		0x97000070, 0x98000071, 0x99000072, 0xa2000073, 0xa3000074, 0xa4000075, 0xa5000076, 0xa6000077,
-		0xa7000078, 0xa8000079, 0xa900007a, 0xc000007b, 0x4f00007c, 0xd000007d, 0xa100007e, 0x0700007f,
-		0x20000080, 0x21000081, 0x22000082, 0x23000083, 0x24000084, 0x15000085, 0x06000086, 0x17000087,
-		0x28000088, 0x29000089, 0x2a00008a, 0x2b00008b, 0x2c00008c, 0x0900008d, 0x0a00008e, 0x1b00008f,
-		0x30000090, 0x31000091, 0x1a000092, 0x33000093, 0x34000094, 0x35000095, 0x36000096, 0x08000097,
-		0x38000098, 0x39000099, 0x3a00009a, 0x3b00009b, 0x0400009c, 0x1400009d, 0x3e00009e, 0xff00009f,
-		0x410000a0, 0xaa0000a1, 0x4a0000a2, 0xb10000a3, 0x9f0000a4, 0xb20000a5, 0x6a0000a6, 0xb50000a7,
-		0xbd0000a8, 0xb40000a9, 0x9a0000aa, 0x8a0000ab, 0x5f0000ac, 0xca0000ad, 0xaf0000ae, 0xbc0000af,
-		0x900000b0, 0x8f0000b1, 0xea0000b2, 0xfa0000b3, 0xbe0000b4, 0xa00000b5, 0xb60000b6, 0xb30000b7,
-		0x9d0000b8, 0xda0000b9, 0x9b0000ba, 0x8b0000bb, 0xb70000bc, 0xb80000bd, 0xb90000be, 0xab0000bf,
-		0x640000c0, 0x650000c1, 0x620000c2, 0x660000c3, 0x630000c4, 0x670000c5, 0x9e0000c6, 0x680000c7,
-		0x740000c8, 0x710000c9, 0x720000ca, 0x730000cb, 0x780000cc, 0x750000cd, 0x760000ce, 0x770000cf,
-		0xac0000d0, 0x690000d1, 0xed0000d2, 0xee0000d3, 0xeb0000d4, 0xef0000d5, 0xec0000d6, 0xbf0000d7,
-		0x800000d8, 0xfd0000d9, 0xfe0000da, 0xfb0000db, 0xfc0000dc, 0xad0000dd, 0xae0000de, 0x590000df,
-		0x440000e0, 0x450000e1, 0x420000e2, 0x460000e3, 0x430000e4, 0x470000e5, 0x9c0000e6, 0x480000e7,
-		0x540000e8, 0x510000e9, 0x520000ea, 0x530000eb, 0x580000ec, 0x550000ed, 0x560000ee, 0x570000ef,
-		0x8c0000f0, 0x490000f1, 0xcd0000f2, 0xce0000f3, 0xcb0000f4, 0xcf0000f5, 0xcc0000f6, 0xe10000f7,
-		0x700000f8, 0xdd0000f9, 0xde0000fa, 0xdb0000fb, 0xdc0000fc, 0x8d0000fd, 0x8e0000fe, 0xdf0000ff,
-	},
-}
-
-// CodePage437 is the IBM Code Page 437 encoding.
-var CodePage437 *Charmap = &codePage437
-
-var codePage437 = Charmap{
-	name:          "IBM Code Page 437",
-	mib:           identifier.PC8CodePage437,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x87, 0x00}}, {2, [3]byte{0xc3, 0xbc, 0x00}},
-		{2, [3]byte{0xc3, 0xa9, 0x00}}, {2, [3]byte{0xc3, 0xa2, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa0, 0x00}},
-		{2, [3]byte{0xc3, 0xa5, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xac, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x89, 0x00}}, {2, [3]byte{0xc3, 0xa6, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0xb4, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb2, 0x00}},
-		{2, [3]byte{0xc3, 0xbb, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xbf, 0x00}}, {2, [3]byte{0xc3, 0x96, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc2, 0xa2, 0x00}},
-		{2, [3]byte{0xc2, 0xa3, 0x00}}, {2, [3]byte{0xc2, 0xa5, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xa7}}, {2, [3]byte{0xc6, 0x92, 0x00}},
-		{2, [3]byte{0xc3, 0xa1, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0xba, 0x00}},
-		{2, [3]byte{0xc3, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xba, 0x00}},
-		{2, [3]byte{0xc2, 0xbf, 0x00}}, {3, [3]byte{0xe2, 0x8c, 0x90}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xab, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0x91}}, {3, [3]byte{0xe2, 0x96, 0x92}},
-		{3, [3]byte{0xe2, 0x96, 0x93}}, {3, [3]byte{0xe2, 0x94, 0x82}},
-		{3, [3]byte{0xe2, 0x94, 0xa4}}, {3, [3]byte{0xe2, 0x95, 0xa1}},
-		{3, [3]byte{0xe2, 0x95, 0xa2}}, {3, [3]byte{0xe2, 0x95, 0x96}},
-		{3, [3]byte{0xe2, 0x95, 0x95}}, {3, [3]byte{0xe2, 0x95, 0xa3}},
-		{3, [3]byte{0xe2, 0x95, 0x91}}, {3, [3]byte{0xe2, 0x95, 0x97}},
-		{3, [3]byte{0xe2, 0x95, 0x9d}}, {3, [3]byte{0xe2, 0x95, 0x9c}},
-		{3, [3]byte{0xe2, 0x95, 0x9b}}, {3, [3]byte{0xe2, 0x94, 0x90}},
-		{3, [3]byte{0xe2, 0x94, 0x94}}, {3, [3]byte{0xe2, 0x94, 0xb4}},
-		{3, [3]byte{0xe2, 0x94, 0xac}}, {3, [3]byte{0xe2, 0x94, 0x9c}},
-		{3, [3]byte{0xe2, 0x94, 0x80}}, {3, [3]byte{0xe2, 0x94, 0xbc}},
-		{3, [3]byte{0xe2, 0x95, 0x9e}}, {3, [3]byte{0xe2, 0x95, 0x9f}},
-		{3, [3]byte{0xe2, 0x95, 0x9a}}, {3, [3]byte{0xe2, 0x95, 0x94}},
-		{3, [3]byte{0xe2, 0x95, 0xa9}}, {3, [3]byte{0xe2, 0x95, 0xa6}},
-		{3, [3]byte{0xe2, 0x95, 0xa0}}, {3, [3]byte{0xe2, 0x95, 0x90}},
-		{3, [3]byte{0xe2, 0x95, 0xac}}, {3, [3]byte{0xe2, 0x95, 0xa7}},
-		{3, [3]byte{0xe2, 0x95, 0xa8}}, {3, [3]byte{0xe2, 0x95, 0xa4}},
-		{3, [3]byte{0xe2, 0x95, 0xa5}}, {3, [3]byte{0xe2, 0x95, 0x99}},
-		{3, [3]byte{0xe2, 0x95, 0x98}}, {3, [3]byte{0xe2, 0x95, 0x92}},
-		{3, [3]byte{0xe2, 0x95, 0x93}}, {3, [3]byte{0xe2, 0x95, 0xab}},
-		{3, [3]byte{0xe2, 0x95, 0xaa}}, {3, [3]byte{0xe2, 0x94, 0x98}},
-		{3, [3]byte{0xe2, 0x94, 0x8c}}, {3, [3]byte{0xe2, 0x96, 0x88}},
-		{3, [3]byte{0xe2, 0x96, 0x84}}, {3, [3]byte{0xe2, 0x96, 0x8c}},
-		{3, [3]byte{0xe2, 0x96, 0x90}}, {3, [3]byte{0xe2, 0x96, 0x80}},
-		{2, [3]byte{0xce, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xce, 0x93, 0x00}}, {2, [3]byte{0xcf, 0x80, 0x00}},
-		{2, [3]byte{0xce, 0xa3, 0x00}}, {2, [3]byte{0xcf, 0x83, 0x00}},
-		{2, [3]byte{0xc2, 0xb5, 0x00}}, {2, [3]byte{0xcf, 0x84, 0x00}},
-		{2, [3]byte{0xce, 0xa6, 0x00}}, {2, [3]byte{0xce, 0x98, 0x00}},
-		{2, [3]byte{0xce, 0xa9, 0x00}}, {2, [3]byte{0xce, 0xb4, 0x00}},
-		{3, [3]byte{0xe2, 0x88, 0x9e}}, {2, [3]byte{0xcf, 0x86, 0x00}},
-		{2, [3]byte{0xce, 0xb5, 0x00}}, {3, [3]byte{0xe2, 0x88, 0xa9}},
-		{3, [3]byte{0xe2, 0x89, 0xa1}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{3, [3]byte{0xe2, 0x89, 0xa5}}, {3, [3]byte{0xe2, 0x89, 0xa4}},
-		{3, [3]byte{0xe2, 0x8c, 0xa0}}, {3, [3]byte{0xe2, 0x8c, 0xa1}},
-		{2, [3]byte{0xc3, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x89, 0x88}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x99}},
-		{2, [3]byte{0xc2, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x9a}},
-		{3, [3]byte{0xe2, 0x81, 0xbf}}, {2, [3]byte{0xc2, 0xb2, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0xa0}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xff0000a0, 0xad0000a1, 0x9b0000a2, 0x9c0000a3, 0x9d0000a5, 0xa60000aa, 0xae0000ab, 0xaa0000ac,
-		0xf80000b0, 0xf10000b1, 0xfd0000b2, 0xe60000b5, 0xfa0000b7, 0xa70000ba, 0xaf0000bb, 0xac0000bc,
-		0xab0000bd, 0xa80000bf, 0x8e0000c4, 0x8f0000c5, 0x920000c6, 0x800000c7, 0x900000c9, 0xa50000d1,
-		0x990000d6, 0x9a0000dc, 0xe10000df, 0x850000e0, 0xa00000e1, 0x830000e2, 0x840000e4, 0x860000e5,
-		0x910000e6, 0x870000e7, 0x8a0000e8, 0x820000e9, 0x880000ea, 0x890000eb, 0x8d0000ec, 0xa10000ed,
-		0x8c0000ee, 0x8b0000ef, 0xa40000f1, 0x950000f2, 0xa20000f3, 0x930000f4, 0x940000f6, 0xf60000f7,
-		0x970000f9, 0xa30000fa, 0x960000fb, 0x810000fc, 0x980000ff, 0x9f000192, 0xe2000393, 0xe9000398,
-		0xe40003a3, 0xe80003a6, 0xea0003a9, 0xe00003b1, 0xeb0003b4, 0xee0003b5, 0xe30003c0, 0xe50003c3,
-		0xe70003c4, 0xed0003c6, 0xfc00207f, 0x9e0020a7, 0xf9002219, 0xfb00221a, 0xec00221e, 0xef002229,
-		0xf7002248, 0xf0002261, 0xf3002264, 0xf2002265, 0xa9002310, 0xf4002320, 0xf5002321, 0xc4002500,
-		0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514, 0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c,
-		0xc1002534, 0xc500253c, 0xcd002550, 0xba002551, 0xd5002552, 0xd6002553, 0xc9002554, 0xb8002555,
-		0xb7002556, 0xbb002557, 0xd4002558, 0xd3002559, 0xc800255a, 0xbe00255b, 0xbd00255c, 0xbc00255d,
-		0xc600255e, 0xc700255f, 0xcc002560, 0xb5002561, 0xb6002562, 0xb9002563, 0xd1002564, 0xd2002565,
-		0xcb002566, 0xcf002567, 0xd0002568, 0xca002569, 0xd800256a, 0xd700256b, 0xce00256c, 0xdf002580,
-		0xdc002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
-	},
-}
-
-// CodePage850 is the IBM Code Page 850 encoding.
-var CodePage850 *Charmap = &codePage850
-
-var codePage850 = Charmap{
-	name:          "IBM Code Page 850",
-	mib:           identifier.PC850Multilingual,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x87, 0x00}}, {2, [3]byte{0xc3, 0xbc, 0x00}},
-		{2, [3]byte{0xc3, 0xa9, 0x00}}, {2, [3]byte{0xc3, 0xa2, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa0, 0x00}},
-		{2, [3]byte{0xc3, 0xa5, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xac, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x89, 0x00}}, {2, [3]byte{0xc3, 0xa6, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0xb4, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb2, 0x00}},
-		{2, [3]byte{0xc3, 0xbb, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xbf, 0x00}}, {2, [3]byte{0xc3, 0x96, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0xb8, 0x00}},
-		{2, [3]byte{0xc2, 0xa3, 0x00}}, {2, [3]byte{0xc3, 0x98, 0x00}},
-		{2, [3]byte{0xc3, 0x97, 0x00}}, {2, [3]byte{0xc6, 0x92, 0x00}},
-		{2, [3]byte{0xc3, 0xa1, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0xba, 0x00}},
-		{2, [3]byte{0xc3, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xba, 0x00}},
-		{2, [3]byte{0xc2, 0xbf, 0x00}}, {2, [3]byte{0xc2, 0xae, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xab, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0x91}}, {3, [3]byte{0xe2, 0x96, 0x92}},
-		{3, [3]byte{0xe2, 0x96, 0x93}}, {3, [3]byte{0xe2, 0x94, 0x82}},
-		{3, [3]byte{0xe2, 0x94, 0xa4}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x80, 0x00}},
-		{2, [3]byte{0xc2, 0xa9, 0x00}}, {3, [3]byte{0xe2, 0x95, 0xa3}},
-		{3, [3]byte{0xe2, 0x95, 0x91}}, {3, [3]byte{0xe2, 0x95, 0x97}},
-		{3, [3]byte{0xe2, 0x95, 0x9d}}, {2, [3]byte{0xc2, 0xa2, 0x00}},
-		{2, [3]byte{0xc2, 0xa5, 0x00}}, {3, [3]byte{0xe2, 0x94, 0x90}},
-		{3, [3]byte{0xe2, 0x94, 0x94}}, {3, [3]byte{0xe2, 0x94, 0xb4}},
-		{3, [3]byte{0xe2, 0x94, 0xac}}, {3, [3]byte{0xe2, 0x94, 0x9c}},
-		{3, [3]byte{0xe2, 0x94, 0x80}}, {3, [3]byte{0xe2, 0x94, 0xbc}},
-		{2, [3]byte{0xc3, 0xa3, 0x00}}, {2, [3]byte{0xc3, 0x83, 0x00}},
-		{3, [3]byte{0xe2, 0x95, 0x9a}}, {3, [3]byte{0xe2, 0x95, 0x94}},
-		{3, [3]byte{0xe2, 0x95, 0xa9}}, {3, [3]byte{0xe2, 0x95, 0xa6}},
-		{3, [3]byte{0xe2, 0x95, 0xa0}}, {3, [3]byte{0xe2, 0x95, 0x90}},
-		{3, [3]byte{0xe2, 0x95, 0xac}}, {2, [3]byte{0xc2, 0xa4, 0x00}},
-		{2, [3]byte{0xc3, 0xb0, 0x00}}, {2, [3]byte{0xc3, 0x90, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc4, 0xb1, 0x00}},
-		{2, [3]byte{0xc3, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0x8e, 0x00}},
-		{2, [3]byte{0xc3, 0x8f, 0x00}}, {3, [3]byte{0xe2, 0x94, 0x98}},
-		{3, [3]byte{0xe2, 0x94, 0x8c}}, {3, [3]byte{0xe2, 0x96, 0x88}},
-		{3, [3]byte{0xe2, 0x96, 0x84}}, {2, [3]byte{0xc2, 0xa6, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {3, [3]byte{0xe2, 0x96, 0x80}},
-		{2, [3]byte{0xc3, 0x93, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x92, 0x00}},
-		{2, [3]byte{0xc3, 0xb5, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc2, 0xb5, 0x00}}, {2, [3]byte{0xc3, 0xbe, 0x00}},
-		{2, [3]byte{0xc3, 0x9e, 0x00}}, {2, [3]byte{0xc3, 0x9a, 0x00}},
-		{2, [3]byte{0xc3, 0x9b, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0xbd, 0x00}}, {2, [3]byte{0xc3, 0x9d, 0x00}},
-		{2, [3]byte{0xc2, 0xaf, 0x00}}, {2, [3]byte{0xc2, 0xb4, 0x00}},
-		{2, [3]byte{0xc2, 0xad, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x97}}, {2, [3]byte{0xc2, 0xbe, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xb7, 0x00}}, {2, [3]byte{0xc2, 0xb8, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xa8, 0x00}},
-		{2, [3]byte{0xc2, 0xb7, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xc2, 0xb3, 0x00}}, {2, [3]byte{0xc2, 0xb2, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0xa0}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xff0000a0, 0xad0000a1, 0xbd0000a2, 0x9c0000a3, 0xcf0000a4, 0xbe0000a5, 0xdd0000a6, 0xf50000a7,
-		0xf90000a8, 0xb80000a9, 0xa60000aa, 0xae0000ab, 0xaa0000ac, 0xf00000ad, 0xa90000ae, 0xee0000af,
-		0xf80000b0, 0xf10000b1, 0xfd0000b2, 0xfc0000b3, 0xef0000b4, 0xe60000b5, 0xf40000b6, 0xfa0000b7,
-		0xf70000b8, 0xfb0000b9, 0xa70000ba, 0xaf0000bb, 0xac0000bc, 0xab0000bd, 0xf30000be, 0xa80000bf,
-		0xb70000c0, 0xb50000c1, 0xb60000c2, 0xc70000c3, 0x8e0000c4, 0x8f0000c5, 0x920000c6, 0x800000c7,
-		0xd40000c8, 0x900000c9, 0xd20000ca, 0xd30000cb, 0xde0000cc, 0xd60000cd, 0xd70000ce, 0xd80000cf,
-		0xd10000d0, 0xa50000d1, 0xe30000d2, 0xe00000d3, 0xe20000d4, 0xe50000d5, 0x990000d6, 0x9e0000d7,
-		0x9d0000d8, 0xeb0000d9, 0xe90000da, 0xea0000db, 0x9a0000dc, 0xed0000dd, 0xe80000de, 0xe10000df,
-		0x850000e0, 0xa00000e1, 0x830000e2, 0xc60000e3, 0x840000e4, 0x860000e5, 0x910000e6, 0x870000e7,
-		0x8a0000e8, 0x820000e9, 0x880000ea, 0x890000eb, 0x8d0000ec, 0xa10000ed, 0x8c0000ee, 0x8b0000ef,
-		0xd00000f0, 0xa40000f1, 0x950000f2, 0xa20000f3, 0x930000f4, 0xe40000f5, 0x940000f6, 0xf60000f7,
-		0x9b0000f8, 0x970000f9, 0xa30000fa, 0x960000fb, 0x810000fc, 0xec0000fd, 0xe70000fe, 0x980000ff,
-		0xd5000131, 0x9f000192, 0xf2002017, 0xc4002500, 0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514,
-		0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c, 0xc1002534, 0xc500253c, 0xcd002550, 0xba002551,
-		0xc9002554, 0xbb002557, 0xc800255a, 0xbc00255d, 0xcc002560, 0xb9002563, 0xcb002566, 0xca002569,
-		0xce00256c, 0xdf002580, 0xdc002584, 0xdb002588, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
-	},
-}
-
-// CodePage852 is the IBM Code Page 852 encoding.
-var CodePage852 *Charmap = &codePage852
-
-var codePage852 = Charmap{
-	name:          "IBM Code Page 852",
-	mib:           identifier.PCp852,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x87, 0x00}}, {2, [3]byte{0xc3, 0xbc, 0x00}},
-		{2, [3]byte{0xc3, 0xa9, 0x00}}, {2, [3]byte{0xc3, 0xa2, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc5, 0xaf, 0x00}},
-		{2, [3]byte{0xc4, 0x87, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc5, 0x82, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc5, 0x90, 0x00}}, {2, [3]byte{0xc5, 0x91, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc5, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc4, 0x86, 0x00}},
-		{2, [3]byte{0xc3, 0x89, 0x00}}, {2, [3]byte{0xc4, 0xb9, 0x00}},
-		{2, [3]byte{0xc4, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xb4, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc4, 0xbd, 0x00}},
-		{2, [3]byte{0xc4, 0xbe, 0x00}}, {2, [3]byte{0xc5, 0x9a, 0x00}},
-		{2, [3]byte{0xc5, 0x9b, 0x00}}, {2, [3]byte{0xc3, 0x96, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc5, 0xa4, 0x00}},
-		{2, [3]byte{0xc5, 0xa5, 0x00}}, {2, [3]byte{0xc5, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x97, 0x00}}, {2, [3]byte{0xc4, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0xa1, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0xba, 0x00}},
-		{2, [3]byte{0xc4, 0x84, 0x00}}, {2, [3]byte{0xc4, 0x85, 0x00}},
-		{2, [3]byte{0xc5, 0xbd, 0x00}}, {2, [3]byte{0xc5, 0xbe, 0x00}},
-		{2, [3]byte{0xc4, 0x98, 0x00}}, {2, [3]byte{0xc4, 0x99, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc5, 0xba, 0x00}},
-		{2, [3]byte{0xc4, 0x8c, 0x00}}, {2, [3]byte{0xc5, 0x9f, 0x00}},
-		{2, [3]byte{0xc2, 0xab, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0x91}}, {3, [3]byte{0xe2, 0x96, 0x92}},
-		{3, [3]byte{0xe2, 0x96, 0x93}}, {3, [3]byte{0xe2, 0x94, 0x82}},
-		{3, [3]byte{0xe2, 0x94, 0xa4}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc4, 0x9a, 0x00}},
-		{2, [3]byte{0xc5, 0x9e, 0x00}}, {3, [3]byte{0xe2, 0x95, 0xa3}},
-		{3, [3]byte{0xe2, 0x95, 0x91}}, {3, [3]byte{0xe2, 0x95, 0x97}},
-		{3, [3]byte{0xe2, 0x95, 0x9d}}, {2, [3]byte{0xc5, 0xbb, 0x00}},
-		{2, [3]byte{0xc5, 0xbc, 0x00}}, {3, [3]byte{0xe2, 0x94, 0x90}},
-		{3, [3]byte{0xe2, 0x94, 0x94}}, {3, [3]byte{0xe2, 0x94, 0xb4}},
-		{3, [3]byte{0xe2, 0x94, 0xac}}, {3, [3]byte{0xe2, 0x94, 0x9c}},
-		{3, [3]byte{0xe2, 0x94, 0x80}}, {3, [3]byte{0xe2, 0x94, 0xbc}},
-		{2, [3]byte{0xc4, 0x82, 0x00}}, {2, [3]byte{0xc4, 0x83, 0x00}},
-		{3, [3]byte{0xe2, 0x95, 0x9a}}, {3, [3]byte{0xe2, 0x95, 0x94}},
-		{3, [3]byte{0xe2, 0x95, 0xa9}}, {3, [3]byte{0xe2, 0x95, 0xa6}},
-		{3, [3]byte{0xe2, 0x95, 0xa0}}, {3, [3]byte{0xe2, 0x95, 0x90}},
-		{3, [3]byte{0xe2, 0x95, 0xac}}, {2, [3]byte{0xc2, 0xa4, 0x00}},
-		{2, [3]byte{0xc4, 0x91, 0x00}}, {2, [3]byte{0xc4, 0x90, 0x00}},
-		{2, [3]byte{0xc4, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc4, 0x8f, 0x00}}, {2, [3]byte{0xc5, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0x8e, 0x00}},
-		{2, [3]byte{0xc4, 0x9b, 0x00}}, {3, [3]byte{0xe2, 0x94, 0x98}},
-		{3, [3]byte{0xe2, 0x94, 0x8c}}, {3, [3]byte{0xe2, 0x96, 0x88}},
-		{3, [3]byte{0xe2, 0x96, 0x84}}, {2, [3]byte{0xc5, 0xa2, 0x00}},
-		{2, [3]byte{0xc5, 0xae, 0x00}}, {3, [3]byte{0xe2, 0x96, 0x80}},
-		{2, [3]byte{0xc3, 0x93, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc5, 0x83, 0x00}},
-		{2, [3]byte{0xc5, 0x84, 0x00}}, {2, [3]byte{0xc5, 0x88, 0x00}},
-		{2, [3]byte{0xc5, 0xa0, 0x00}}, {2, [3]byte{0xc5, 0xa1, 0x00}},
-		{2, [3]byte{0xc5, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x9a, 0x00}},
-		{2, [3]byte{0xc5, 0x95, 0x00}}, {2, [3]byte{0xc5, 0xb0, 0x00}},
-		{2, [3]byte{0xc3, 0xbd, 0x00}}, {2, [3]byte{0xc3, 0x9d, 0x00}},
-		{2, [3]byte{0xc5, 0xa3, 0x00}}, {2, [3]byte{0xc2, 0xb4, 0x00}},
-		{2, [3]byte{0xc2, 0xad, 0x00}}, {2, [3]byte{0xcb, 0x9d, 0x00}},
-		{2, [3]byte{0xcb, 0x9b, 0x00}}, {2, [3]byte{0xcb, 0x87, 0x00}},
-		{2, [3]byte{0xcb, 0x98, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xb7, 0x00}}, {2, [3]byte{0xc2, 0xb8, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xa8, 0x00}},
-		{2, [3]byte{0xcb, 0x99, 0x00}}, {2, [3]byte{0xc5, 0xb1, 0x00}},
-		{2, [3]byte{0xc5, 0x98, 0x00}}, {2, [3]byte{0xc5, 0x99, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0xa0}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xff0000a0, 0xcf0000a4, 0xf50000a7, 0xf90000a8, 0xae0000ab, 0xaa0000ac, 0xf00000ad, 0xf80000b0,
-		0xef0000b4, 0xf70000b8, 0xaf0000bb, 0xb50000c1, 0xb60000c2, 0x8e0000c4, 0x800000c7, 0x900000c9,
-		0xd30000cb, 0xd60000cd, 0xd70000ce, 0xe00000d3, 0xe20000d4, 0x990000d6, 0x9e0000d7, 0xe90000da,
-		0x9a0000dc, 0xed0000dd, 0xe10000df, 0xa00000e1, 0x830000e2, 0x840000e4, 0x870000e7, 0x820000e9,
-		0x890000eb, 0xa10000ed, 0x8c0000ee, 0xa20000f3, 0x930000f4, 0x940000f6, 0xf60000f7, 0xa30000fa,
-		0x810000fc, 0xec0000fd, 0xc6000102, 0xc7000103, 0xa4000104, 0xa5000105, 0x8f000106, 0x86000107,
-		0xac00010c, 0x9f00010d, 0xd200010e, 0xd400010f, 0xd1000110, 0xd0000111, 0xa8000118, 0xa9000119,
-		0xb700011a, 0xd800011b, 0x91000139, 0x9200013a, 0x9500013d, 0x9600013e, 0x9d000141, 0x88000142,
-		0xe3000143, 0xe4000144, 0xd5000147, 0xe5000148, 0x8a000150, 0x8b000151, 0xe8000154, 0xea000155,
-		0xfc000158, 0xfd000159, 0x9700015a, 0x9800015b, 0xb800015e, 0xad00015f, 0xe6000160, 0xe7000161,
-		0xdd000162, 0xee000163, 0x9b000164, 0x9c000165, 0xde00016e, 0x8500016f, 0xeb000170, 0xfb000171,
-		0x8d000179, 0xab00017a, 0xbd00017b, 0xbe00017c, 0xa600017d, 0xa700017e, 0xf30002c7, 0xf40002d8,
-		0xfa0002d9, 0xf20002db, 0xf10002dd, 0xc4002500, 0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514,
-		0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c, 0xc1002534, 0xc500253c, 0xcd002550, 0xba002551,
-		0xc9002554, 0xbb002557, 0xc800255a, 0xbc00255d, 0xcc002560, 0xb9002563, 0xcb002566, 0xca002569,
-		0xce00256c, 0xdf002580, 0xdc002584, 0xdb002588, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
-	},
-}
-
-// CodePage855 is the IBM Code Page 855 encoding.
-var CodePage855 *Charmap = &codePage855
-
-var codePage855 = Charmap{
-	name:          "IBM Code Page 855",
-	mib:           identifier.IBM855,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xd1, 0x92, 0x00}}, {2, [3]byte{0xd0, 0x82, 0x00}},
-		{2, [3]byte{0xd1, 0x93, 0x00}}, {2, [3]byte{0xd0, 0x83, 0x00}},
-		{2, [3]byte{0xd1, 0x91, 0x00}}, {2, [3]byte{0xd0, 0x81, 0x00}},
-		{2, [3]byte{0xd1, 0x94, 0x00}}, {2, [3]byte{0xd0, 0x84, 0x00}},
-		{2, [3]byte{0xd1, 0x95, 0x00}}, {2, [3]byte{0xd0, 0x85, 0x00}},
-		{2, [3]byte{0xd1, 0x96, 0x00}}, {2, [3]byte{0xd0, 0x86, 0x00}},
-		{2, [3]byte{0xd1, 0x97, 0x00}}, {2, [3]byte{0xd0, 0x87, 0x00}},
-		{2, [3]byte{0xd1, 0x98, 0x00}}, {2, [3]byte{0xd0, 0x88, 0x00}},
-		{2, [3]byte{0xd1, 0x99, 0x00}}, {2, [3]byte{0xd0, 0x89, 0x00}},
-		{2, [3]byte{0xd1, 0x9a, 0x00}}, {2, [3]byte{0xd0, 0x8a, 0x00}},
-		{2, [3]byte{0xd1, 0x9b, 0x00}}, {2, [3]byte{0xd0, 0x8b, 0x00}},
-		{2, [3]byte{0xd1, 0x9c, 0x00}}, {2, [3]byte{0xd0, 0x8c, 0x00}},
-		{2, [3]byte{0xd1, 0x9e, 0x00}}, {2, [3]byte{0xd0, 0x8e, 0x00}},
-		{2, [3]byte{0xd1, 0x9f, 0x00}}, {2, [3]byte{0xd0, 0x8f, 0x00}},
-		{2, [3]byte{0xd1, 0x8e, 0x00}}, {2, [3]byte{0xd0, 0xae, 0x00}},
-		{2, [3]byte{0xd1, 0x8a, 0x00}}, {2, [3]byte{0xd0, 0xaa, 0x00}},
-		{2, [3]byte{0xd0, 0xb0, 0x00}}, {2, [3]byte{0xd0, 0x90, 0x00}},
-		{2, [3]byte{0xd0, 0xb1, 0x00}}, {2, [3]byte{0xd0, 0x91, 0x00}},
-		{2, [3]byte{0xd1, 0x86, 0x00}}, {2, [3]byte{0xd0, 0xa6, 0x00}},
-		{2, [3]byte{0xd0, 0xb4, 0x00}}, {2, [3]byte{0xd0, 0x94, 0x00}},
-		{2, [3]byte{0xd0, 0xb5, 0x00}}, {2, [3]byte{0xd0, 0x95, 0x00}},
-		{2, [3]byte{0xd1, 0x84, 0x00}}, {2, [3]byte{0xd0, 0xa4, 0x00}},
-		{2, [3]byte{0xd0, 0xb3, 0x00}}, {2, [3]byte{0xd0, 0x93, 0x00}},
-		{2, [3]byte{0xc2, 0xab, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0x91}}, {3, [3]byte{0xe2, 0x96, 0x92}},
-		{3, [3]byte{0xe2, 0x96, 0x93}}, {3, [3]byte{0xe2, 0x94, 0x82}},
-		{3, [3]byte{0xe2, 0x94, 0xa4}}, {2, [3]byte{0xd1, 0x85, 0x00}},
-		{2, [3]byte{0xd0, 0xa5, 0x00}}, {2, [3]byte{0xd0, 0xb8, 0x00}},
-		{2, [3]byte{0xd0, 0x98, 0x00}}, {3, [3]byte{0xe2, 0x95, 0xa3}},
-		{3, [3]byte{0xe2, 0x95, 0x91}}, {3, [3]byte{0xe2, 0x95, 0x97}},
-		{3, [3]byte{0xe2, 0x95, 0x9d}}, {2, [3]byte{0xd0, 0xb9, 0x00}},
-		{2, [3]byte{0xd0, 0x99, 0x00}}, {3, [3]byte{0xe2, 0x94, 0x90}},
-		{3, [3]byte{0xe2, 0x94, 0x94}}, {3, [3]byte{0xe2, 0x94, 0xb4}},
-		{3, [3]byte{0xe2, 0x94, 0xac}}, {3, [3]byte{0xe2, 0x94, 0x9c}},
-		{3, [3]byte{0xe2, 0x94, 0x80}}, {3, [3]byte{0xe2, 0x94, 0xbc}},
-		{2, [3]byte{0xd0, 0xba, 0x00}}, {2, [3]byte{0xd0, 0x9a, 0x00}},
-		{3, [3]byte{0xe2, 0x95, 0x9a}}, {3, [3]byte{0xe2, 0x95, 0x94}},
-		{3, [3]byte{0xe2, 0x95, 0xa9}}, {3, [3]byte{0xe2, 0x95, 0xa6}},
-		{3, [3]byte{0xe2, 0x95, 0xa0}}, {3, [3]byte{0xe2, 0x95, 0x90}},
-		{3, [3]byte{0xe2, 0x95, 0xac}}, {2, [3]byte{0xc2, 0xa4, 0x00}},
-		{2, [3]byte{0xd0, 0xbb, 0x00}}, {2, [3]byte{0xd0, 0x9b, 0x00}},
-		{2, [3]byte{0xd0, 0xbc, 0x00}}, {2, [3]byte{0xd0, 0x9c, 0x00}},
-		{2, [3]byte{0xd0, 0xbd, 0x00}}, {2, [3]byte{0xd0, 0x9d, 0x00}},
-		{2, [3]byte{0xd0, 0xbe, 0x00}}, {2, [3]byte{0xd0, 0x9e, 0x00}},
-		{2, [3]byte{0xd0, 0xbf, 0x00}}, {3, [3]byte{0xe2, 0x94, 0x98}},
-		{3, [3]byte{0xe2, 0x94, 0x8c}}, {3, [3]byte{0xe2, 0x96, 0x88}},
-		{3, [3]byte{0xe2, 0x96, 0x84}}, {2, [3]byte{0xd0, 0x9f, 0x00}},
-		{2, [3]byte{0xd1, 0x8f, 0x00}}, {3, [3]byte{0xe2, 0x96, 0x80}},
-		{2, [3]byte{0xd0, 0xaf, 0x00}}, {2, [3]byte{0xd1, 0x80, 0x00}},
-		{2, [3]byte{0xd0, 0xa0, 0x00}}, {2, [3]byte{0xd1, 0x81, 0x00}},
-		{2, [3]byte{0xd0, 0xa1, 0x00}}, {2, [3]byte{0xd1, 0x82, 0x00}},
-		{2, [3]byte{0xd0, 0xa2, 0x00}}, {2, [3]byte{0xd1, 0x83, 0x00}},
-		{2, [3]byte{0xd0, 0xa3, 0x00}}, {2, [3]byte{0xd0, 0xb6, 0x00}},
-		{2, [3]byte{0xd0, 0x96, 0x00}}, {2, [3]byte{0xd0, 0xb2, 0x00}},
-		{2, [3]byte{0xd0, 0x92, 0x00}}, {2, [3]byte{0xd1, 0x8c, 0x00}},
-		{2, [3]byte{0xd0, 0xac, 0x00}}, {3, [3]byte{0xe2, 0x84, 0x96}},
-		{2, [3]byte{0xc2, 0xad, 0x00}}, {2, [3]byte{0xd1, 0x8b, 0x00}},
-		{2, [3]byte{0xd0, 0xab, 0x00}}, {2, [3]byte{0xd0, 0xb7, 0x00}},
-		{2, [3]byte{0xd0, 0x97, 0x00}}, {2, [3]byte{0xd1, 0x88, 0x00}},
-		{2, [3]byte{0xd0, 0xa8, 0x00}}, {2, [3]byte{0xd1, 0x8d, 0x00}},
-		{2, [3]byte{0xd0, 0xad, 0x00}}, {2, [3]byte{0xd1, 0x89, 0x00}},
-		{2, [3]byte{0xd0, 0xa9, 0x00}}, {2, [3]byte{0xd1, 0x87, 0x00}},
-		{2, [3]byte{0xd0, 0xa7, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0xa0}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xff0000a0, 0xcf0000a4, 0xfd0000a7, 0xae0000ab, 0xf00000ad, 0xaf0000bb, 0x85000401, 0x81000402,
-		0x83000403, 0x87000404, 0x89000405, 0x8b000406, 0x8d000407, 0x8f000408, 0x91000409, 0x9300040a,
-		0x9500040b, 0x9700040c, 0x9900040e, 0x9b00040f, 0xa1000410, 0xa3000411, 0xec000412, 0xad000413,
-		0xa7000414, 0xa9000415, 0xea000416, 0xf4000417, 0xb8000418, 0xbe000419, 0xc700041a, 0xd100041b,
-		0xd300041c, 0xd500041d, 0xd700041e, 0xdd00041f, 0xe2000420, 0xe4000421, 0xe6000422, 0xe8000423,
-		0xab000424, 0xb6000425, 0xa5000426, 0xfc000427, 0xf6000428, 0xfa000429, 0x9f00042a, 0xf200042b,
-		0xee00042c, 0xf800042d, 0x9d00042e, 0xe000042f, 0xa0000430, 0xa2000431, 0xeb000432, 0xac000433,
-		0xa6000434, 0xa8000435, 0xe9000436, 0xf3000437, 0xb7000438, 0xbd000439, 0xc600043a, 0xd000043b,
-		0xd200043c, 0xd400043d, 0xd600043e, 0xd800043f, 0xe1000440, 0xe3000441, 0xe5000442, 0xe7000443,
-		0xaa000444, 0xb5000445, 0xa4000446, 0xfb000447, 0xf5000448, 0xf9000449, 0x9e00044a, 0xf100044b,
-		0xed00044c, 0xf700044d, 0x9c00044e, 0xde00044f, 0x84000451, 0x80000452, 0x82000453, 0x86000454,
-		0x88000455, 0x8a000456, 0x8c000457, 0x8e000458, 0x90000459, 0x9200045a, 0x9400045b, 0x9600045c,
-		0x9800045e, 0x9a00045f, 0xef002116, 0xc4002500, 0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514,
-		0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c, 0xc1002534, 0xc500253c, 0xcd002550, 0xba002551,
-		0xc9002554, 0xbb002557, 0xc800255a, 0xbc00255d, 0xcc002560, 0xb9002563, 0xcb002566, 0xca002569,
-		0xce00256c, 0xdf002580, 0xdc002584, 0xdb002588, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
-	},
-}
-
-// CodePage858 is the Windows Code Page 858 encoding.
-var CodePage858 *Charmap = &codePage858
-
-var codePage858 = Charmap{
-	name:          "Windows Code Page 858",
-	mib:           identifier.IBM00858,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x87, 0x00}}, {2, [3]byte{0xc3, 0xbc, 0x00}},
-		{2, [3]byte{0xc3, 0xa9, 0x00}}, {2, [3]byte{0xc3, 0xa2, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa0, 0x00}},
-		{2, [3]byte{0xc3, 0xa5, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xac, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x89, 0x00}}, {2, [3]byte{0xc3, 0xa6, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0xb4, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb2, 0x00}},
-		{2, [3]byte{0xc3, 0xbb, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xbf, 0x00}}, {2, [3]byte{0xc3, 0x96, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0xb8, 0x00}},
-		{2, [3]byte{0xc2, 0xa3, 0x00}}, {2, [3]byte{0xc3, 0x98, 0x00}},
-		{2, [3]byte{0xc3, 0x97, 0x00}}, {2, [3]byte{0xc6, 0x92, 0x00}},
-		{2, [3]byte{0xc3, 0xa1, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0xba, 0x00}},
-		{2, [3]byte{0xc3, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xba, 0x00}},
-		{2, [3]byte{0xc2, 0xbf, 0x00}}, {2, [3]byte{0xc2, 0xae, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xab, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0x91}}, {3, [3]byte{0xe2, 0x96, 0x92}},
-		{3, [3]byte{0xe2, 0x96, 0x93}}, {3, [3]byte{0xe2, 0x94, 0x82}},
-		{3, [3]byte{0xe2, 0x94, 0xa4}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x80, 0x00}},
-		{2, [3]byte{0xc2, 0xa9, 0x00}}, {3, [3]byte{0xe2, 0x95, 0xa3}},
-		{3, [3]byte{0xe2, 0x95, 0x91}}, {3, [3]byte{0xe2, 0x95, 0x97}},
-		{3, [3]byte{0xe2, 0x95, 0x9d}}, {2, [3]byte{0xc2, 0xa2, 0x00}},
-		{2, [3]byte{0xc2, 0xa5, 0x00}}, {3, [3]byte{0xe2, 0x94, 0x90}},
-		{3, [3]byte{0xe2, 0x94, 0x94}}, {3, [3]byte{0xe2, 0x94, 0xb4}},
-		{3, [3]byte{0xe2, 0x94, 0xac}}, {3, [3]byte{0xe2, 0x94, 0x9c}},
-		{3, [3]byte{0xe2, 0x94, 0x80}}, {3, [3]byte{0xe2, 0x94, 0xbc}},
-		{2, [3]byte{0xc3, 0xa3, 0x00}}, {2, [3]byte{0xc3, 0x83, 0x00}},
-		{3, [3]byte{0xe2, 0x95, 0x9a}}, {3, [3]byte{0xe2, 0x95, 0x94}},
-		{3, [3]byte{0xe2, 0x95, 0xa9}}, {3, [3]byte{0xe2, 0x95, 0xa6}},
-		{3, [3]byte{0xe2, 0x95, 0xa0}}, {3, [3]byte{0xe2, 0x95, 0x90}},
-		{3, [3]byte{0xe2, 0x95, 0xac}}, {2, [3]byte{0xc2, 0xa4, 0x00}},
-		{2, [3]byte{0xc3, 0xb0, 0x00}}, {2, [3]byte{0xc3, 0x90, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {3, [3]byte{0xe2, 0x82, 0xac}},
-		{2, [3]byte{0xc3, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0x8e, 0x00}},
-		{2, [3]byte{0xc3, 0x8f, 0x00}}, {3, [3]byte{0xe2, 0x94, 0x98}},
-		{3, [3]byte{0xe2, 0x94, 0x8c}}, {3, [3]byte{0xe2, 0x96, 0x88}},
-		{3, [3]byte{0xe2, 0x96, 0x84}}, {2, [3]byte{0xc2, 0xa6, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {3, [3]byte{0xe2, 0x96, 0x80}},
-		{2, [3]byte{0xc3, 0x93, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x92, 0x00}},
-		{2, [3]byte{0xc3, 0xb5, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc2, 0xb5, 0x00}}, {2, [3]byte{0xc3, 0xbe, 0x00}},
-		{2, [3]byte{0xc3, 0x9e, 0x00}}, {2, [3]byte{0xc3, 0x9a, 0x00}},
-		{2, [3]byte{0xc3, 0x9b, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0xbd, 0x00}}, {2, [3]byte{0xc3, 0x9d, 0x00}},
-		{2, [3]byte{0xc2, 0xaf, 0x00}}, {2, [3]byte{0xc2, 0xb4, 0x00}},
-		{2, [3]byte{0xc2, 0xad, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x97}}, {2, [3]byte{0xc2, 0xbe, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xb7, 0x00}}, {2, [3]byte{0xc2, 0xb8, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xa8, 0x00}},
-		{2, [3]byte{0xc2, 0xb7, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xc2, 0xb3, 0x00}}, {2, [3]byte{0xc2, 0xb2, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0xa0}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xff0000a0, 0xad0000a1, 0xbd0000a2, 0x9c0000a3, 0xcf0000a4, 0xbe0000a5, 0xdd0000a6, 0xf50000a7,
-		0xf90000a8, 0xb80000a9, 0xa60000aa, 0xae0000ab, 0xaa0000ac, 0xf00000ad, 0xa90000ae, 0xee0000af,
-		0xf80000b0, 0xf10000b1, 0xfd0000b2, 0xfc0000b3, 0xef0000b4, 0xe60000b5, 0xf40000b6, 0xfa0000b7,
-		0xf70000b8, 0xfb0000b9, 0xa70000ba, 0xaf0000bb, 0xac0000bc, 0xab0000bd, 0xf30000be, 0xa80000bf,
-		0xb70000c0, 0xb50000c1, 0xb60000c2, 0xc70000c3, 0x8e0000c4, 0x8f0000c5, 0x920000c6, 0x800000c7,
-		0xd40000c8, 0x900000c9, 0xd20000ca, 0xd30000cb, 0xde0000cc, 0xd60000cd, 0xd70000ce, 0xd80000cf,
-		0xd10000d0, 0xa50000d1, 0xe30000d2, 0xe00000d3, 0xe20000d4, 0xe50000d5, 0x990000d6, 0x9e0000d7,
-		0x9d0000d8, 0xeb0000d9, 0xe90000da, 0xea0000db, 0x9a0000dc, 0xed0000dd, 0xe80000de, 0xe10000df,
-		0x850000e0, 0xa00000e1, 0x830000e2, 0xc60000e3, 0x840000e4, 0x860000e5, 0x910000e6, 0x870000e7,
-		0x8a0000e8, 0x820000e9, 0x880000ea, 0x890000eb, 0x8d0000ec, 0xa10000ed, 0x8c0000ee, 0x8b0000ef,
-		0xd00000f0, 0xa40000f1, 0x950000f2, 0xa20000f3, 0x930000f4, 0xe40000f5, 0x940000f6, 0xf60000f7,
-		0x9b0000f8, 0x970000f9, 0xa30000fa, 0x960000fb, 0x810000fc, 0xec0000fd, 0xe70000fe, 0x980000ff,
-		0x9f000192, 0xf2002017, 0xd50020ac, 0xc4002500, 0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514,
-		0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c, 0xc1002534, 0xc500253c, 0xcd002550, 0xba002551,
-		0xc9002554, 0xbb002557, 0xc800255a, 0xbc00255d, 0xcc002560, 0xb9002563, 0xcb002566, 0xca002569,
-		0xce00256c, 0xdf002580, 0xdc002584, 0xdb002588, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
-	},
-}
-
-// CodePage860 is the IBM Code Page 860 encoding.
-var CodePage860 *Charmap = &codePage860
-
-var codePage860 = Charmap{
-	name:          "IBM Code Page 860",
-	mib:           identifier.IBM860,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x87, 0x00}}, {2, [3]byte{0xc3, 0xbc, 0x00}},
-		{2, [3]byte{0xc3, 0xa9, 0x00}}, {2, [3]byte{0xc3, 0xa2, 0x00}},
-		{2, [3]byte{0xc3, 0xa3, 0x00}}, {2, [3]byte{0xc3, 0xa0, 0x00}},
-		{2, [3]byte{0xc3, 0x81, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0x8a, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc3, 0xac, 0x00}},
-		{2, [3]byte{0xc3, 0x83, 0x00}}, {2, [3]byte{0xc3, 0x82, 0x00}},
-		{2, [3]byte{0xc3, 0x89, 0x00}}, {2, [3]byte{0xc3, 0x80, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0xb4, 0x00}},
-		{2, [3]byte{0xc3, 0xb5, 0x00}}, {2, [3]byte{0xc3, 0xb2, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc2, 0xa2, 0x00}},
-		{2, [3]byte{0xc2, 0xa3, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xa7}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0xa1, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0xba, 0x00}},
-		{2, [3]byte{0xc3, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xba, 0x00}},
-		{2, [3]byte{0xc2, 0xbf, 0x00}}, {2, [3]byte{0xc3, 0x92, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xab, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0x91}}, {3, [3]byte{0xe2, 0x96, 0x92}},
-		{3, [3]byte{0xe2, 0x96, 0x93}}, {3, [3]byte{0xe2, 0x94, 0x82}},
-		{3, [3]byte{0xe2, 0x94, 0xa4}}, {3, [3]byte{0xe2, 0x95, 0xa1}},
-		{3, [3]byte{0xe2, 0x95, 0xa2}}, {3, [3]byte{0xe2, 0x95, 0x96}},
-		{3, [3]byte{0xe2, 0x95, 0x95}}, {3, [3]byte{0xe2, 0x95, 0xa3}},
-		{3, [3]byte{0xe2, 0x95, 0x91}}, {3, [3]byte{0xe2, 0x95, 0x97}},
-		{3, [3]byte{0xe2, 0x95, 0x9d}}, {3, [3]byte{0xe2, 0x95, 0x9c}},
-		{3, [3]byte{0xe2, 0x95, 0x9b}}, {3, [3]byte{0xe2, 0x94, 0x90}},
-		{3, [3]byte{0xe2, 0x94, 0x94}}, {3, [3]byte{0xe2, 0x94, 0xb4}},
-		{3, [3]byte{0xe2, 0x94, 0xac}}, {3, [3]byte{0xe2, 0x94, 0x9c}},
-		{3, [3]byte{0xe2, 0x94, 0x80}}, {3, [3]byte{0xe2, 0x94, 0xbc}},
-		{3, [3]byte{0xe2, 0x95, 0x9e}}, {3, [3]byte{0xe2, 0x95, 0x9f}},
-		{3, [3]byte{0xe2, 0x95, 0x9a}}, {3, [3]byte{0xe2, 0x95, 0x94}},
-		{3, [3]byte{0xe2, 0x95, 0xa9}}, {3, [3]byte{0xe2, 0x95, 0xa6}},
-		{3, [3]byte{0xe2, 0x95, 0xa0}}, {3, [3]byte{0xe2, 0x95, 0x90}},
-		{3, [3]byte{0xe2, 0x95, 0xac}}, {3, [3]byte{0xe2, 0x95, 0xa7}},
-		{3, [3]byte{0xe2, 0x95, 0xa8}}, {3, [3]byte{0xe2, 0x95, 0xa4}},
-		{3, [3]byte{0xe2, 0x95, 0xa5}}, {3, [3]byte{0xe2, 0x95, 0x99}},
-		{3, [3]byte{0xe2, 0x95, 0x98}}, {3, [3]byte{0xe2, 0x95, 0x92}},
-		{3, [3]byte{0xe2, 0x95, 0x93}}, {3, [3]byte{0xe2, 0x95, 0xab}},
-		{3, [3]byte{0xe2, 0x95, 0xaa}}, {3, [3]byte{0xe2, 0x94, 0x98}},
-		{3, [3]byte{0xe2, 0x94, 0x8c}}, {3, [3]byte{0xe2, 0x96, 0x88}},
-		{3, [3]byte{0xe2, 0x96, 0x84}}, {3, [3]byte{0xe2, 0x96, 0x8c}},
-		{3, [3]byte{0xe2, 0x96, 0x90}}, {3, [3]byte{0xe2, 0x96, 0x80}},
-		{2, [3]byte{0xce, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xce, 0x93, 0x00}}, {2, [3]byte{0xcf, 0x80, 0x00}},
-		{2, [3]byte{0xce, 0xa3, 0x00}}, {2, [3]byte{0xcf, 0x83, 0x00}},
-		{2, [3]byte{0xc2, 0xb5, 0x00}}, {2, [3]byte{0xcf, 0x84, 0x00}},
-		{2, [3]byte{0xce, 0xa6, 0x00}}, {2, [3]byte{0xce, 0x98, 0x00}},
-		{2, [3]byte{0xce, 0xa9, 0x00}}, {2, [3]byte{0xce, 0xb4, 0x00}},
-		{3, [3]byte{0xe2, 0x88, 0x9e}}, {2, [3]byte{0xcf, 0x86, 0x00}},
-		{2, [3]byte{0xce, 0xb5, 0x00}}, {3, [3]byte{0xe2, 0x88, 0xa9}},
-		{3, [3]byte{0xe2, 0x89, 0xa1}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{3, [3]byte{0xe2, 0x89, 0xa5}}, {3, [3]byte{0xe2, 0x89, 0xa4}},
-		{3, [3]byte{0xe2, 0x8c, 0xa0}}, {3, [3]byte{0xe2, 0x8c, 0xa1}},
-		{2, [3]byte{0xc3, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x89, 0x88}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x99}},
-		{2, [3]byte{0xc2, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x9a}},
-		{3, [3]byte{0xe2, 0x81, 0xbf}}, {2, [3]byte{0xc2, 0xb2, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0xa0}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xff0000a0, 0xad0000a1, 0x9b0000a2, 0x9c0000a3, 0xa60000aa, 0xae0000ab, 0xaa0000ac, 0xf80000b0,
-		0xf10000b1, 0xfd0000b2, 0xe60000b5, 0xfa0000b7, 0xa70000ba, 0xaf0000bb, 0xac0000bc, 0xab0000bd,
-		0xa80000bf, 0x910000c0, 0x860000c1, 0x8f0000c2, 0x8e0000c3, 0x800000c7, 0x920000c8, 0x900000c9,
-		0x890000ca, 0x980000cc, 0x8b0000cd, 0xa50000d1, 0xa90000d2, 0x9f0000d3, 0x8c0000d4, 0x990000d5,
-		0x9d0000d9, 0x960000da, 0x9a0000dc, 0xe10000df, 0x850000e0, 0xa00000e1, 0x830000e2, 0x840000e3,
-		0x870000e7, 0x8a0000e8, 0x820000e9, 0x880000ea, 0x8d0000ec, 0xa10000ed, 0xa40000f1, 0x950000f2,
-		0xa20000f3, 0x930000f4, 0x940000f5, 0xf60000f7, 0x970000f9, 0xa30000fa, 0x810000fc, 0xe2000393,
-		0xe9000398, 0xe40003a3, 0xe80003a6, 0xea0003a9, 0xe00003b1, 0xeb0003b4, 0xee0003b5, 0xe30003c0,
-		0xe50003c3, 0xe70003c4, 0xed0003c6, 0xfc00207f, 0x9e0020a7, 0xf9002219, 0xfb00221a, 0xec00221e,
-		0xef002229, 0xf7002248, 0xf0002261, 0xf3002264, 0xf2002265, 0xf4002320, 0xf5002321, 0xc4002500,
-		0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514, 0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c,
-		0xc1002534, 0xc500253c, 0xcd002550, 0xba002551, 0xd5002552, 0xd6002553, 0xc9002554, 0xb8002555,
-		0xb7002556, 0xbb002557, 0xd4002558, 0xd3002559, 0xc800255a, 0xbe00255b, 0xbd00255c, 0xbc00255d,
-		0xc600255e, 0xc700255f, 0xcc002560, 0xb5002561, 0xb6002562, 0xb9002563, 0xd1002564, 0xd2002565,
-		0xcb002566, 0xcf002567, 0xd0002568, 0xca002569, 0xd800256a, 0xd700256b, 0xce00256c, 0xdf002580,
-		0xdc002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
-	},
-}
-
-// CodePage862 is the IBM Code Page 862 encoding.
-var CodePage862 *Charmap = &codePage862
-
-var codePage862 = Charmap{
-	name:          "IBM Code Page 862",
-	mib:           identifier.PC862LatinHebrew,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xd7, 0x90, 0x00}}, {2, [3]byte{0xd7, 0x91, 0x00}},
-		{2, [3]byte{0xd7, 0x92, 0x00}}, {2, [3]byte{0xd7, 0x93, 0x00}},
-		{2, [3]byte{0xd7, 0x94, 0x00}}, {2, [3]byte{0xd7, 0x95, 0x00}},
-		{2, [3]byte{0xd7, 0x96, 0x00}}, {2, [3]byte{0xd7, 0x97, 0x00}},
-		{2, [3]byte{0xd7, 0x98, 0x00}}, {2, [3]byte{0xd7, 0x99, 0x00}},
-		{2, [3]byte{0xd7, 0x9a, 0x00}}, {2, [3]byte{0xd7, 0x9b, 0x00}},
-		{2, [3]byte{0xd7, 0x9c, 0x00}}, {2, [3]byte{0xd7, 0x9d, 0x00}},
-		{2, [3]byte{0xd7, 0x9e, 0x00}}, {2, [3]byte{0xd7, 0x9f, 0x00}},
-		{2, [3]byte{0xd7, 0xa0, 0x00}}, {2, [3]byte{0xd7, 0xa1, 0x00}},
-		{2, [3]byte{0xd7, 0xa2, 0x00}}, {2, [3]byte{0xd7, 0xa3, 0x00}},
-		{2, [3]byte{0xd7, 0xa4, 0x00}}, {2, [3]byte{0xd7, 0xa5, 0x00}},
-		{2, [3]byte{0xd7, 0xa6, 0x00}}, {2, [3]byte{0xd7, 0xa7, 0x00}},
-		{2, [3]byte{0xd7, 0xa8, 0x00}}, {2, [3]byte{0xd7, 0xa9, 0x00}},
-		{2, [3]byte{0xd7, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xa2, 0x00}},
-		{2, [3]byte{0xc2, 0xa3, 0x00}}, {2, [3]byte{0xc2, 0xa5, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xa7}}, {2, [3]byte{0xc6, 0x92, 0x00}},
-		{2, [3]byte{0xc3, 0xa1, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0xba, 0x00}},
-		{2, [3]byte{0xc3, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xba, 0x00}},
-		{2, [3]byte{0xc2, 0xbf, 0x00}}, {3, [3]byte{0xe2, 0x8c, 0x90}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xab, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0x91}}, {3, [3]byte{0xe2, 0x96, 0x92}},
-		{3, [3]byte{0xe2, 0x96, 0x93}}, {3, [3]byte{0xe2, 0x94, 0x82}},
-		{3, [3]byte{0xe2, 0x94, 0xa4}}, {3, [3]byte{0xe2, 0x95, 0xa1}},
-		{3, [3]byte{0xe2, 0x95, 0xa2}}, {3, [3]byte{0xe2, 0x95, 0x96}},
-		{3, [3]byte{0xe2, 0x95, 0x95}}, {3, [3]byte{0xe2, 0x95, 0xa3}},
-		{3, [3]byte{0xe2, 0x95, 0x91}}, {3, [3]byte{0xe2, 0x95, 0x97}},
-		{3, [3]byte{0xe2, 0x95, 0x9d}}, {3, [3]byte{0xe2, 0x95, 0x9c}},
-		{3, [3]byte{0xe2, 0x95, 0x9b}}, {3, [3]byte{0xe2, 0x94, 0x90}},
-		{3, [3]byte{0xe2, 0x94, 0x94}}, {3, [3]byte{0xe2, 0x94, 0xb4}},
-		{3, [3]byte{0xe2, 0x94, 0xac}}, {3, [3]byte{0xe2, 0x94, 0x9c}},
-		{3, [3]byte{0xe2, 0x94, 0x80}}, {3, [3]byte{0xe2, 0x94, 0xbc}},
-		{3, [3]byte{0xe2, 0x95, 0x9e}}, {3, [3]byte{0xe2, 0x95, 0x9f}},
-		{3, [3]byte{0xe2, 0x95, 0x9a}}, {3, [3]byte{0xe2, 0x95, 0x94}},
-		{3, [3]byte{0xe2, 0x95, 0xa9}}, {3, [3]byte{0xe2, 0x95, 0xa6}},
-		{3, [3]byte{0xe2, 0x95, 0xa0}}, {3, [3]byte{0xe2, 0x95, 0x90}},
-		{3, [3]byte{0xe2, 0x95, 0xac}}, {3, [3]byte{0xe2, 0x95, 0xa7}},
-		{3, [3]byte{0xe2, 0x95, 0xa8}}, {3, [3]byte{0xe2, 0x95, 0xa4}},
-		{3, [3]byte{0xe2, 0x95, 0xa5}}, {3, [3]byte{0xe2, 0x95, 0x99}},
-		{3, [3]byte{0xe2, 0x95, 0x98}}, {3, [3]byte{0xe2, 0x95, 0x92}},
-		{3, [3]byte{0xe2, 0x95, 0x93}}, {3, [3]byte{0xe2, 0x95, 0xab}},
-		{3, [3]byte{0xe2, 0x95, 0xaa}}, {3, [3]byte{0xe2, 0x94, 0x98}},
-		{3, [3]byte{0xe2, 0x94, 0x8c}}, {3, [3]byte{0xe2, 0x96, 0x88}},
-		{3, [3]byte{0xe2, 0x96, 0x84}}, {3, [3]byte{0xe2, 0x96, 0x8c}},
-		{3, [3]byte{0xe2, 0x96, 0x90}}, {3, [3]byte{0xe2, 0x96, 0x80}},
-		{2, [3]byte{0xce, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xce, 0x93, 0x00}}, {2, [3]byte{0xcf, 0x80, 0x00}},
-		{2, [3]byte{0xce, 0xa3, 0x00}}, {2, [3]byte{0xcf, 0x83, 0x00}},
-		{2, [3]byte{0xc2, 0xb5, 0x00}}, {2, [3]byte{0xcf, 0x84, 0x00}},
-		{2, [3]byte{0xce, 0xa6, 0x00}}, {2, [3]byte{0xce, 0x98, 0x00}},
-		{2, [3]byte{0xce, 0xa9, 0x00}}, {2, [3]byte{0xce, 0xb4, 0x00}},
-		{3, [3]byte{0xe2, 0x88, 0x9e}}, {2, [3]byte{0xcf, 0x86, 0x00}},
-		{2, [3]byte{0xce, 0xb5, 0x00}}, {3, [3]byte{0xe2, 0x88, 0xa9}},
-		{3, [3]byte{0xe2, 0x89, 0xa1}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{3, [3]byte{0xe2, 0x89, 0xa5}}, {3, [3]byte{0xe2, 0x89, 0xa4}},
-		{3, [3]byte{0xe2, 0x8c, 0xa0}}, {3, [3]byte{0xe2, 0x8c, 0xa1}},
-		{2, [3]byte{0xc3, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x89, 0x88}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x99}},
-		{2, [3]byte{0xc2, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x9a}},
-		{3, [3]byte{0xe2, 0x81, 0xbf}}, {2, [3]byte{0xc2, 0xb2, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0xa0}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xff0000a0, 0xad0000a1, 0x9b0000a2, 0x9c0000a3, 0x9d0000a5, 0xa60000aa, 0xae0000ab, 0xaa0000ac,
-		0xf80000b0, 0xf10000b1, 0xfd0000b2, 0xe60000b5, 0xfa0000b7, 0xa70000ba, 0xaf0000bb, 0xac0000bc,
-		0xab0000bd, 0xa80000bf, 0xa50000d1, 0xe10000df, 0xa00000e1, 0xa10000ed, 0xa40000f1, 0xa20000f3,
-		0xf60000f7, 0xa30000fa, 0x9f000192, 0xe2000393, 0xe9000398, 0xe40003a3, 0xe80003a6, 0xea0003a9,
-		0xe00003b1, 0xeb0003b4, 0xee0003b5, 0xe30003c0, 0xe50003c3, 0xe70003c4, 0xed0003c6, 0x800005d0,
-		0x810005d1, 0x820005d2, 0x830005d3, 0x840005d4, 0x850005d5, 0x860005d6, 0x870005d7, 0x880005d8,
-		0x890005d9, 0x8a0005da, 0x8b0005db, 0x8c0005dc, 0x8d0005dd, 0x8e0005de, 0x8f0005df, 0x900005e0,
-		0x910005e1, 0x920005e2, 0x930005e3, 0x940005e4, 0x950005e5, 0x960005e6, 0x970005e7, 0x980005e8,
-		0x990005e9, 0x9a0005ea, 0xfc00207f, 0x9e0020a7, 0xf9002219, 0xfb00221a, 0xec00221e, 0xef002229,
-		0xf7002248, 0xf0002261, 0xf3002264, 0xf2002265, 0xa9002310, 0xf4002320, 0xf5002321, 0xc4002500,
-		0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514, 0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c,
-		0xc1002534, 0xc500253c, 0xcd002550, 0xba002551, 0xd5002552, 0xd6002553, 0xc9002554, 0xb8002555,
-		0xb7002556, 0xbb002557, 0xd4002558, 0xd3002559, 0xc800255a, 0xbe00255b, 0xbd00255c, 0xbc00255d,
-		0xc600255e, 0xc700255f, 0xcc002560, 0xb5002561, 0xb6002562, 0xb9002563, 0xd1002564, 0xd2002565,
-		0xcb002566, 0xcf002567, 0xd0002568, 0xca002569, 0xd800256a, 0xd700256b, 0xce00256c, 0xdf002580,
-		0xdc002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
-	},
-}
-
-// CodePage863 is the IBM Code Page 863 encoding.
-var CodePage863 *Charmap = &codePage863
-
-var codePage863 = Charmap{
-	name:          "IBM Code Page 863",
-	mib:           identifier.IBM863,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x87, 0x00}}, {2, [3]byte{0xc3, 0xbc, 0x00}},
-		{2, [3]byte{0xc3, 0xa9, 0x00}}, {2, [3]byte{0xc3, 0xa2, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0xa0, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x97}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0x89, 0x00}}, {2, [3]byte{0xc3, 0x88, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0xb4, 0x00}},
-		{2, [3]byte{0xc3, 0x8b, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc3, 0xbb, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0x94, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc2, 0xa2, 0x00}},
-		{2, [3]byte{0xc2, 0xa3, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9b, 0x00}}, {2, [3]byte{0xc6, 0x92, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xb4, 0x00}},
-		{2, [3]byte{0xc3, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0xba, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc2, 0xb8, 0x00}},
-		{2, [3]byte{0xc2, 0xb3, 0x00}}, {2, [3]byte{0xc2, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {3, [3]byte{0xe2, 0x8c, 0x90}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xbe, 0x00}},
-		{2, [3]byte{0xc2, 0xab, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0x91}}, {3, [3]byte{0xe2, 0x96, 0x92}},
-		{3, [3]byte{0xe2, 0x96, 0x93}}, {3, [3]byte{0xe2, 0x94, 0x82}},
-		{3, [3]byte{0xe2, 0x94, 0xa4}}, {3, [3]byte{0xe2, 0x95, 0xa1}},
-		{3, [3]byte{0xe2, 0x95, 0xa2}}, {3, [3]byte{0xe2, 0x95, 0x96}},
-		{3, [3]byte{0xe2, 0x95, 0x95}}, {3, [3]byte{0xe2, 0x95, 0xa3}},
-		{3, [3]byte{0xe2, 0x95, 0x91}}, {3, [3]byte{0xe2, 0x95, 0x97}},
-		{3, [3]byte{0xe2, 0x95, 0x9d}}, {3, [3]byte{0xe2, 0x95, 0x9c}},
-		{3, [3]byte{0xe2, 0x95, 0x9b}}, {3, [3]byte{0xe2, 0x94, 0x90}},
-		{3, [3]byte{0xe2, 0x94, 0x94}}, {3, [3]byte{0xe2, 0x94, 0xb4}},
-		{3, [3]byte{0xe2, 0x94, 0xac}}, {3, [3]byte{0xe2, 0x94, 0x9c}},
-		{3, [3]byte{0xe2, 0x94, 0x80}}, {3, [3]byte{0xe2, 0x94, 0xbc}},
-		{3, [3]byte{0xe2, 0x95, 0x9e}}, {3, [3]byte{0xe2, 0x95, 0x9f}},
-		{3, [3]byte{0xe2, 0x95, 0x9a}}, {3, [3]byte{0xe2, 0x95, 0x94}},
-		{3, [3]byte{0xe2, 0x95, 0xa9}}, {3, [3]byte{0xe2, 0x95, 0xa6}},
-		{3, [3]byte{0xe2, 0x95, 0xa0}}, {3, [3]byte{0xe2, 0x95, 0x90}},
-		{3, [3]byte{0xe2, 0x95, 0xac}}, {3, [3]byte{0xe2, 0x95, 0xa7}},
-		{3, [3]byte{0xe2, 0x95, 0xa8}}, {3, [3]byte{0xe2, 0x95, 0xa4}},
-		{3, [3]byte{0xe2, 0x95, 0xa5}}, {3, [3]byte{0xe2, 0x95, 0x99}},
-		{3, [3]byte{0xe2, 0x95, 0x98}}, {3, [3]byte{0xe2, 0x95, 0x92}},
-		{3, [3]byte{0xe2, 0x95, 0x93}}, {3, [3]byte{0xe2, 0x95, 0xab}},
-		{3, [3]byte{0xe2, 0x95, 0xaa}}, {3, [3]byte{0xe2, 0x94, 0x98}},
-		{3, [3]byte{0xe2, 0x94, 0x8c}}, {3, [3]byte{0xe2, 0x96, 0x88}},
-		{3, [3]byte{0xe2, 0x96, 0x84}}, {3, [3]byte{0xe2, 0x96, 0x8c}},
-		{3, [3]byte{0xe2, 0x96, 0x90}}, {3, [3]byte{0xe2, 0x96, 0x80}},
-		{2, [3]byte{0xce, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xce, 0x93, 0x00}}, {2, [3]byte{0xcf, 0x80, 0x00}},
-		{2, [3]byte{0xce, 0xa3, 0x00}}, {2, [3]byte{0xcf, 0x83, 0x00}},
-		{2, [3]byte{0xc2, 0xb5, 0x00}}, {2, [3]byte{0xcf, 0x84, 0x00}},
-		{2, [3]byte{0xce, 0xa6, 0x00}}, {2, [3]byte{0xce, 0x98, 0x00}},
-		{2, [3]byte{0xce, 0xa9, 0x00}}, {2, [3]byte{0xce, 0xb4, 0x00}},
-		{3, [3]byte{0xe2, 0x88, 0x9e}}, {2, [3]byte{0xcf, 0x86, 0x00}},
-		{2, [3]byte{0xce, 0xb5, 0x00}}, {3, [3]byte{0xe2, 0x88, 0xa9}},
-		{3, [3]byte{0xe2, 0x89, 0xa1}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{3, [3]byte{0xe2, 0x89, 0xa5}}, {3, [3]byte{0xe2, 0x89, 0xa4}},
-		{3, [3]byte{0xe2, 0x8c, 0xa0}}, {3, [3]byte{0xe2, 0x8c, 0xa1}},
-		{2, [3]byte{0xc3, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x89, 0x88}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x99}},
-		{2, [3]byte{0xc2, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x9a}},
-		{3, [3]byte{0xe2, 0x81, 0xbf}}, {2, [3]byte{0xc2, 0xb2, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0xa0}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xff0000a0, 0x9b0000a2, 0x9c0000a3, 0x980000a4, 0xa00000a6, 0x8f0000a7, 0xa40000a8, 0xae0000ab,
-		0xaa0000ac, 0xa70000af, 0xf80000b0, 0xf10000b1, 0xfd0000b2, 0xa60000b3, 0xa10000b4, 0xe60000b5,
-		0x860000b6, 0xfa0000b7, 0xa50000b8, 0xaf0000bb, 0xac0000bc, 0xab0000bd, 0xad0000be, 0x8e0000c0,
-		0x840000c2, 0x800000c7, 0x910000c8, 0x900000c9, 0x920000ca, 0x940000cb, 0xa80000ce, 0x950000cf,
-		0x990000d4, 0x9d0000d9, 0x9e0000db, 0x9a0000dc, 0xe10000df, 0x850000e0, 0x830000e2, 0x870000e7,
-		0x8a0000e8, 0x820000e9, 0x880000ea, 0x890000eb, 0x8c0000ee, 0x8b0000ef, 0xa20000f3, 0x930000f4,
-		0xf60000f7, 0x970000f9, 0xa30000fa, 0x960000fb, 0x810000fc, 0x9f000192, 0xe2000393, 0xe9000398,
-		0xe40003a3, 0xe80003a6, 0xea0003a9, 0xe00003b1, 0xeb0003b4, 0xee0003b5, 0xe30003c0, 0xe50003c3,
-		0xe70003c4, 0xed0003c6, 0x8d002017, 0xfc00207f, 0xf9002219, 0xfb00221a, 0xec00221e, 0xef002229,
-		0xf7002248, 0xf0002261, 0xf3002264, 0xf2002265, 0xa9002310, 0xf4002320, 0xf5002321, 0xc4002500,
-		0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514, 0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c,
-		0xc1002534, 0xc500253c, 0xcd002550, 0xba002551, 0xd5002552, 0xd6002553, 0xc9002554, 0xb8002555,
-		0xb7002556, 0xbb002557, 0xd4002558, 0xd3002559, 0xc800255a, 0xbe00255b, 0xbd00255c, 0xbc00255d,
-		0xc600255e, 0xc700255f, 0xcc002560, 0xb5002561, 0xb6002562, 0xb9002563, 0xd1002564, 0xd2002565,
-		0xcb002566, 0xcf002567, 0xd0002568, 0xca002569, 0xd800256a, 0xd700256b, 0xce00256c, 0xdf002580,
-		0xdc002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
-	},
-}
-
-// CodePage865 is the IBM Code Page 865 encoding.
-var CodePage865 *Charmap = &codePage865
-
-var codePage865 = Charmap{
-	name:          "IBM Code Page 865",
-	mib:           identifier.IBM865,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x87, 0x00}}, {2, [3]byte{0xc3, 0xbc, 0x00}},
-		{2, [3]byte{0xc3, 0xa9, 0x00}}, {2, [3]byte{0xc3, 0xa2, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa0, 0x00}},
-		{2, [3]byte{0xc3, 0xa5, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xac, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x89, 0x00}}, {2, [3]byte{0xc3, 0xa6, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0xb4, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb2, 0x00}},
-		{2, [3]byte{0xc3, 0xbb, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xbf, 0x00}}, {2, [3]byte{0xc3, 0x96, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0xb8, 0x00}},
-		{2, [3]byte{0xc2, 0xa3, 0x00}}, {2, [3]byte{0xc3, 0x98, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xa7}}, {2, [3]byte{0xc6, 0x92, 0x00}},
-		{2, [3]byte{0xc3, 0xa1, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0xba, 0x00}},
-		{2, [3]byte{0xc3, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xba, 0x00}},
-		{2, [3]byte{0xc2, 0xbf, 0x00}}, {3, [3]byte{0xe2, 0x8c, 0x90}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xab, 0x00}}, {2, [3]byte{0xc2, 0xa4, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0x91}}, {3, [3]byte{0xe2, 0x96, 0x92}},
-		{3, [3]byte{0xe2, 0x96, 0x93}}, {3, [3]byte{0xe2, 0x94, 0x82}},
-		{3, [3]byte{0xe2, 0x94, 0xa4}}, {3, [3]byte{0xe2, 0x95, 0xa1}},
-		{3, [3]byte{0xe2, 0x95, 0xa2}}, {3, [3]byte{0xe2, 0x95, 0x96}},
-		{3, [3]byte{0xe2, 0x95, 0x95}}, {3, [3]byte{0xe2, 0x95, 0xa3}},
-		{3, [3]byte{0xe2, 0x95, 0x91}}, {3, [3]byte{0xe2, 0x95, 0x97}},
-		{3, [3]byte{0xe2, 0x95, 0x9d}}, {3, [3]byte{0xe2, 0x95, 0x9c}},
-		{3, [3]byte{0xe2, 0x95, 0x9b}}, {3, [3]byte{0xe2, 0x94, 0x90}},
-		{3, [3]byte{0xe2, 0x94, 0x94}}, {3, [3]byte{0xe2, 0x94, 0xb4}},
-		{3, [3]byte{0xe2, 0x94, 0xac}}, {3, [3]byte{0xe2, 0x94, 0x9c}},
-		{3, [3]byte{0xe2, 0x94, 0x80}}, {3, [3]byte{0xe2, 0x94, 0xbc}},
-		{3, [3]byte{0xe2, 0x95, 0x9e}}, {3, [3]byte{0xe2, 0x95, 0x9f}},
-		{3, [3]byte{0xe2, 0x95, 0x9a}}, {3, [3]byte{0xe2, 0x95, 0x94}},
-		{3, [3]byte{0xe2, 0x95, 0xa9}}, {3, [3]byte{0xe2, 0x95, 0xa6}},
-		{3, [3]byte{0xe2, 0x95, 0xa0}}, {3, [3]byte{0xe2, 0x95, 0x90}},
-		{3, [3]byte{0xe2, 0x95, 0xac}}, {3, [3]byte{0xe2, 0x95, 0xa7}},
-		{3, [3]byte{0xe2, 0x95, 0xa8}}, {3, [3]byte{0xe2, 0x95, 0xa4}},
-		{3, [3]byte{0xe2, 0x95, 0xa5}}, {3, [3]byte{0xe2, 0x95, 0x99}},
-		{3, [3]byte{0xe2, 0x95, 0x98}}, {3, [3]byte{0xe2, 0x95, 0x92}},
-		{3, [3]byte{0xe2, 0x95, 0x93}}, {3, [3]byte{0xe2, 0x95, 0xab}},
-		{3, [3]byte{0xe2, 0x95, 0xaa}}, {3, [3]byte{0xe2, 0x94, 0x98}},
-		{3, [3]byte{0xe2, 0x94, 0x8c}}, {3, [3]byte{0xe2, 0x96, 0x88}},
-		{3, [3]byte{0xe2, 0x96, 0x84}}, {3, [3]byte{0xe2, 0x96, 0x8c}},
-		{3, [3]byte{0xe2, 0x96, 0x90}}, {3, [3]byte{0xe2, 0x96, 0x80}},
-		{2, [3]byte{0xce, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xce, 0x93, 0x00}}, {2, [3]byte{0xcf, 0x80, 0x00}},
-		{2, [3]byte{0xce, 0xa3, 0x00}}, {2, [3]byte{0xcf, 0x83, 0x00}},
-		{2, [3]byte{0xc2, 0xb5, 0x00}}, {2, [3]byte{0xcf, 0x84, 0x00}},
-		{2, [3]byte{0xce, 0xa6, 0x00}}, {2, [3]byte{0xce, 0x98, 0x00}},
-		{2, [3]byte{0xce, 0xa9, 0x00}}, {2, [3]byte{0xce, 0xb4, 0x00}},
-		{3, [3]byte{0xe2, 0x88, 0x9e}}, {2, [3]byte{0xcf, 0x86, 0x00}},
-		{2, [3]byte{0xce, 0xb5, 0x00}}, {3, [3]byte{0xe2, 0x88, 0xa9}},
-		{3, [3]byte{0xe2, 0x89, 0xa1}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{3, [3]byte{0xe2, 0x89, 0xa5}}, {3, [3]byte{0xe2, 0x89, 0xa4}},
-		{3, [3]byte{0xe2, 0x8c, 0xa0}}, {3, [3]byte{0xe2, 0x8c, 0xa1}},
-		{2, [3]byte{0xc3, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x89, 0x88}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x99}},
-		{2, [3]byte{0xc2, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x9a}},
-		{3, [3]byte{0xe2, 0x81, 0xbf}}, {2, [3]byte{0xc2, 0xb2, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0xa0}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xff0000a0, 0xad0000a1, 0x9c0000a3, 0xaf0000a4, 0xa60000aa, 0xae0000ab, 0xaa0000ac, 0xf80000b0,
-		0xf10000b1, 0xfd0000b2, 0xe60000b5, 0xfa0000b7, 0xa70000ba, 0xac0000bc, 0xab0000bd, 0xa80000bf,
-		0x8e0000c4, 0x8f0000c5, 0x920000c6, 0x800000c7, 0x900000c9, 0xa50000d1, 0x990000d6, 0x9d0000d8,
-		0x9a0000dc, 0xe10000df, 0x850000e0, 0xa00000e1, 0x830000e2, 0x840000e4, 0x860000e5, 0x910000e6,
-		0x870000e7, 0x8a0000e8, 0x820000e9, 0x880000ea, 0x890000eb, 0x8d0000ec, 0xa10000ed, 0x8c0000ee,
-		0x8b0000ef, 0xa40000f1, 0x950000f2, 0xa20000f3, 0x930000f4, 0x940000f6, 0xf60000f7, 0x9b0000f8,
-		0x970000f9, 0xa30000fa, 0x960000fb, 0x810000fc, 0x980000ff, 0x9f000192, 0xe2000393, 0xe9000398,
-		0xe40003a3, 0xe80003a6, 0xea0003a9, 0xe00003b1, 0xeb0003b4, 0xee0003b5, 0xe30003c0, 0xe50003c3,
-		0xe70003c4, 0xed0003c6, 0xfc00207f, 0x9e0020a7, 0xf9002219, 0xfb00221a, 0xec00221e, 0xef002229,
-		0xf7002248, 0xf0002261, 0xf3002264, 0xf2002265, 0xa9002310, 0xf4002320, 0xf5002321, 0xc4002500,
-		0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514, 0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c,
-		0xc1002534, 0xc500253c, 0xcd002550, 0xba002551, 0xd5002552, 0xd6002553, 0xc9002554, 0xb8002555,
-		0xb7002556, 0xbb002557, 0xd4002558, 0xd3002559, 0xc800255a, 0xbe00255b, 0xbd00255c, 0xbc00255d,
-		0xc600255e, 0xc700255f, 0xcc002560, 0xb5002561, 0xb6002562, 0xb9002563, 0xd1002564, 0xd2002565,
-		0xcb002566, 0xcf002567, 0xd0002568, 0xca002569, 0xd800256a, 0xd700256b, 0xce00256c, 0xdf002580,
-		0xdc002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
-	},
-}
-
-// CodePage866 is the IBM Code Page 866 encoding.
-var CodePage866 *Charmap = &codePage866
-
-var codePage866 = Charmap{
-	name:          "IBM Code Page 866",
-	mib:           identifier.IBM866,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xd0, 0x90, 0x00}}, {2, [3]byte{0xd0, 0x91, 0x00}},
-		{2, [3]byte{0xd0, 0x92, 0x00}}, {2, [3]byte{0xd0, 0x93, 0x00}},
-		{2, [3]byte{0xd0, 0x94, 0x00}}, {2, [3]byte{0xd0, 0x95, 0x00}},
-		{2, [3]byte{0xd0, 0x96, 0x00}}, {2, [3]byte{0xd0, 0x97, 0x00}},
-		{2, [3]byte{0xd0, 0x98, 0x00}}, {2, [3]byte{0xd0, 0x99, 0x00}},
-		{2, [3]byte{0xd0, 0x9a, 0x00}}, {2, [3]byte{0xd0, 0x9b, 0x00}},
-		{2, [3]byte{0xd0, 0x9c, 0x00}}, {2, [3]byte{0xd0, 0x9d, 0x00}},
-		{2, [3]byte{0xd0, 0x9e, 0x00}}, {2, [3]byte{0xd0, 0x9f, 0x00}},
-		{2, [3]byte{0xd0, 0xa0, 0x00}}, {2, [3]byte{0xd0, 0xa1, 0x00}},
-		{2, [3]byte{0xd0, 0xa2, 0x00}}, {2, [3]byte{0xd0, 0xa3, 0x00}},
-		{2, [3]byte{0xd0, 0xa4, 0x00}}, {2, [3]byte{0xd0, 0xa5, 0x00}},
-		{2, [3]byte{0xd0, 0xa6, 0x00}}, {2, [3]byte{0xd0, 0xa7, 0x00}},
-		{2, [3]byte{0xd0, 0xa8, 0x00}}, {2, [3]byte{0xd0, 0xa9, 0x00}},
-		{2, [3]byte{0xd0, 0xaa, 0x00}}, {2, [3]byte{0xd0, 0xab, 0x00}},
-		{2, [3]byte{0xd0, 0xac, 0x00}}, {2, [3]byte{0xd0, 0xad, 0x00}},
-		{2, [3]byte{0xd0, 0xae, 0x00}}, {2, [3]byte{0xd0, 0xaf, 0x00}},
-		{2, [3]byte{0xd0, 0xb0, 0x00}}, {2, [3]byte{0xd0, 0xb1, 0x00}},
-		{2, [3]byte{0xd0, 0xb2, 0x00}}, {2, [3]byte{0xd0, 0xb3, 0x00}},
-		{2, [3]byte{0xd0, 0xb4, 0x00}}, {2, [3]byte{0xd0, 0xb5, 0x00}},
-		{2, [3]byte{0xd0, 0xb6, 0x00}}, {2, [3]byte{0xd0, 0xb7, 0x00}},
-		{2, [3]byte{0xd0, 0xb8, 0x00}}, {2, [3]byte{0xd0, 0xb9, 0x00}},
-		{2, [3]byte{0xd0, 0xba, 0x00}}, {2, [3]byte{0xd0, 0xbb, 0x00}},
-		{2, [3]byte{0xd0, 0xbc, 0x00}}, {2, [3]byte{0xd0, 0xbd, 0x00}},
-		{2, [3]byte{0xd0, 0xbe, 0x00}}, {2, [3]byte{0xd0, 0xbf, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0x91}}, {3, [3]byte{0xe2, 0x96, 0x92}},
-		{3, [3]byte{0xe2, 0x96, 0x93}}, {3, [3]byte{0xe2, 0x94, 0x82}},
-		{3, [3]byte{0xe2, 0x94, 0xa4}}, {3, [3]byte{0xe2, 0x95, 0xa1}},
-		{3, [3]byte{0xe2, 0x95, 0xa2}}, {3, [3]byte{0xe2, 0x95, 0x96}},
-		{3, [3]byte{0xe2, 0x95, 0x95}}, {3, [3]byte{0xe2, 0x95, 0xa3}},
-		{3, [3]byte{0xe2, 0x95, 0x91}}, {3, [3]byte{0xe2, 0x95, 0x97}},
-		{3, [3]byte{0xe2, 0x95, 0x9d}}, {3, [3]byte{0xe2, 0x95, 0x9c}},
-		{3, [3]byte{0xe2, 0x95, 0x9b}}, {3, [3]byte{0xe2, 0x94, 0x90}},
-		{3, [3]byte{0xe2, 0x94, 0x94}}, {3, [3]byte{0xe2, 0x94, 0xb4}},
-		{3, [3]byte{0xe2, 0x94, 0xac}}, {3, [3]byte{0xe2, 0x94, 0x9c}},
-		{3, [3]byte{0xe2, 0x94, 0x80}}, {3, [3]byte{0xe2, 0x94, 0xbc}},
-		{3, [3]byte{0xe2, 0x95, 0x9e}}, {3, [3]byte{0xe2, 0x95, 0x9f}},
-		{3, [3]byte{0xe2, 0x95, 0x9a}}, {3, [3]byte{0xe2, 0x95, 0x94}},
-		{3, [3]byte{0xe2, 0x95, 0xa9}}, {3, [3]byte{0xe2, 0x95, 0xa6}},
-		{3, [3]byte{0xe2, 0x95, 0xa0}}, {3, [3]byte{0xe2, 0x95, 0x90}},
-		{3, [3]byte{0xe2, 0x95, 0xac}}, {3, [3]byte{0xe2, 0x95, 0xa7}},
-		{3, [3]byte{0xe2, 0x95, 0xa8}}, {3, [3]byte{0xe2, 0x95, 0xa4}},
-		{3, [3]byte{0xe2, 0x95, 0xa5}}, {3, [3]byte{0xe2, 0x95, 0x99}},
-		{3, [3]byte{0xe2, 0x95, 0x98}}, {3, [3]byte{0xe2, 0x95, 0x92}},
-		{3, [3]byte{0xe2, 0x95, 0x93}}, {3, [3]byte{0xe2, 0x95, 0xab}},
-		{3, [3]byte{0xe2, 0x95, 0xaa}}, {3, [3]byte{0xe2, 0x94, 0x98}},
-		{3, [3]byte{0xe2, 0x94, 0x8c}}, {3, [3]byte{0xe2, 0x96, 0x88}},
-		{3, [3]byte{0xe2, 0x96, 0x84}}, {3, [3]byte{0xe2, 0x96, 0x8c}},
-		{3, [3]byte{0xe2, 0x96, 0x90}}, {3, [3]byte{0xe2, 0x96, 0x80}},
-		{2, [3]byte{0xd1, 0x80, 0x00}}, {2, [3]byte{0xd1, 0x81, 0x00}},
-		{2, [3]byte{0xd1, 0x82, 0x00}}, {2, [3]byte{0xd1, 0x83, 0x00}},
-		{2, [3]byte{0xd1, 0x84, 0x00}}, {2, [3]byte{0xd1, 0x85, 0x00}},
-		{2, [3]byte{0xd1, 0x86, 0x00}}, {2, [3]byte{0xd1, 0x87, 0x00}},
-		{2, [3]byte{0xd1, 0x88, 0x00}}, {2, [3]byte{0xd1, 0x89, 0x00}},
-		{2, [3]byte{0xd1, 0x8a, 0x00}}, {2, [3]byte{0xd1, 0x8b, 0x00}},
-		{2, [3]byte{0xd1, 0x8c, 0x00}}, {2, [3]byte{0xd1, 0x8d, 0x00}},
-		{2, [3]byte{0xd1, 0x8e, 0x00}}, {2, [3]byte{0xd1, 0x8f, 0x00}},
-		{2, [3]byte{0xd0, 0x81, 0x00}}, {2, [3]byte{0xd1, 0x91, 0x00}},
-		{2, [3]byte{0xd0, 0x84, 0x00}}, {2, [3]byte{0xd1, 0x94, 0x00}},
-		{2, [3]byte{0xd0, 0x87, 0x00}}, {2, [3]byte{0xd1, 0x97, 0x00}},
-		{2, [3]byte{0xd0, 0x8e, 0x00}}, {2, [3]byte{0xd1, 0x9e, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x99}},
-		{2, [3]byte{0xc2, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x9a}},
-		{3, [3]byte{0xe2, 0x84, 0x96}}, {2, [3]byte{0xc2, 0xa4, 0x00}},
-		{3, [3]byte{0xe2, 0x96, 0xa0}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xff0000a0, 0xfd0000a4, 0xf80000b0, 0xfa0000b7, 0xf0000401, 0xf2000404, 0xf4000407, 0xf600040e,
-		0x80000410, 0x81000411, 0x82000412, 0x83000413, 0x84000414, 0x85000415, 0x86000416, 0x87000417,
-		0x88000418, 0x89000419, 0x8a00041a, 0x8b00041b, 0x8c00041c, 0x8d00041d, 0x8e00041e, 0x8f00041f,
-		0x90000420, 0x91000421, 0x92000422, 0x93000423, 0x94000424, 0x95000425, 0x96000426, 0x97000427,
-		0x98000428, 0x99000429, 0x9a00042a, 0x9b00042b, 0x9c00042c, 0x9d00042d, 0x9e00042e, 0x9f00042f,
-		0xa0000430, 0xa1000431, 0xa2000432, 0xa3000433, 0xa4000434, 0xa5000435, 0xa6000436, 0xa7000437,
-		0xa8000438, 0xa9000439, 0xaa00043a, 0xab00043b, 0xac00043c, 0xad00043d, 0xae00043e, 0xaf00043f,
-		0xe0000440, 0xe1000441, 0xe2000442, 0xe3000443, 0xe4000444, 0xe5000445, 0xe6000446, 0xe7000447,
-		0xe8000448, 0xe9000449, 0xea00044a, 0xeb00044b, 0xec00044c, 0xed00044d, 0xee00044e, 0xef00044f,
-		0xf1000451, 0xf3000454, 0xf5000457, 0xf700045e, 0xfc002116, 0xf9002219, 0xfb00221a, 0xc4002500,
-		0xb3002502, 0xda00250c, 0xbf002510, 0xc0002514, 0xd9002518, 0xc300251c, 0xb4002524, 0xc200252c,
-		0xc1002534, 0xc500253c, 0xcd002550, 0xba002551, 0xd5002552, 0xd6002553, 0xc9002554, 0xb8002555,
-		0xb7002556, 0xbb002557, 0xd4002558, 0xd3002559, 0xc800255a, 0xbe00255b, 0xbd00255c, 0xbc00255d,
-		0xc600255e, 0xc700255f, 0xcc002560, 0xb5002561, 0xb6002562, 0xb9002563, 0xd1002564, 0xd2002565,
-		0xcb002566, 0xcf002567, 0xd0002568, 0xca002569, 0xd800256a, 0xd700256b, 0xce00256c, 0xdf002580,
-		0xdc002584, 0xdb002588, 0xdd00258c, 0xde002590, 0xb0002591, 0xb1002592, 0xb2002593, 0xfe0025a0,
-	},
-}
-
-// CodePage1047 is the IBM Code Page 1047 encoding.
-var CodePage1047 *Charmap = &codePage1047
-
-var codePage1047 = Charmap{
-	name:          "IBM Code Page 1047",
-	mib:           identifier.IBM1047,
-	asciiSuperset: false,
-	low:           0x00,
-	replacement:   0x3f,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x9c, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x86, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x97, 0x00}}, {2, [3]byte{0xc2, 0x8d, 0x00}},
-		{2, [3]byte{0xc2, 0x8e, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x9d, 0x00}}, {2, [3]byte{0xc2, 0x85, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {2, [3]byte{0xc2, 0x87, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x92, 0x00}}, {2, [3]byte{0xc2, 0x8f, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x80, 0x00}}, {2, [3]byte{0xc2, 0x81, 0x00}},
-		{2, [3]byte{0xc2, 0x82, 0x00}}, {2, [3]byte{0xc2, 0x83, 0x00}},
-		{2, [3]byte{0xc2, 0x84, 0x00}}, {1, [3]byte{0x0a, 0x00, 0x00}},
-		{1, [3]byte{0x17, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x88, 0x00}}, {2, [3]byte{0xc2, 0x89, 0x00}},
-		{2, [3]byte{0xc2, 0x8a, 0x00}}, {2, [3]byte{0xc2, 0x8b, 0x00}},
-		{2, [3]byte{0xc2, 0x8c, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x90, 0x00}}, {2, [3]byte{0xc2, 0x91, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {2, [3]byte{0xc2, 0x93, 0x00}},
-		{2, [3]byte{0xc2, 0x94, 0x00}}, {2, [3]byte{0xc2, 0x95, 0x00}},
-		{2, [3]byte{0xc2, 0x96, 0x00}}, {1, [3]byte{0x04, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x98, 0x00}}, {2, [3]byte{0xc2, 0x99, 0x00}},
-		{2, [3]byte{0xc2, 0x9a, 0x00}}, {2, [3]byte{0xc2, 0x9b, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x9e, 0x00}}, {1, [3]byte{0x1a, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0xa4, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa3, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc3, 0xa7, 0x00}}, {2, [3]byte{0xc3, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {1, [3]byte{0x2e, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x28, 0x00, 0x00}},
-		{1, [3]byte{0x2b, 0x00, 0x00}}, {1, [3]byte{0x7c, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xac, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{1, [3]byte{0x21, 0x00, 0x00}}, {1, [3]byte{0x24, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x3b, 0x00, 0x00}}, {1, [3]byte{0x5e, 0x00, 0x00}},
-		{1, [3]byte{0x2d, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x84, 0x00}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x83, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x87, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {1, [3]byte{0x2c, 0x00, 0x00}},
-		{1, [3]byte{0x25, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {1, [3]byte{0x60, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x3d, 0x00, 0x00}}, {1, [3]byte{0x22, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xab, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xb0, 0x00}}, {2, [3]byte{0xc3, 0xbd, 0x00}},
-		{2, [3]byte{0xc3, 0xbe, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {1, [3]byte{0x6a, 0x00, 0x00}},
-		{1, [3]byte{0x6b, 0x00, 0x00}}, {1, [3]byte{0x6c, 0x00, 0x00}},
-		{1, [3]byte{0x6d, 0x00, 0x00}}, {1, [3]byte{0x6e, 0x00, 0x00}},
-		{1, [3]byte{0x6f, 0x00, 0x00}}, {1, [3]byte{0x70, 0x00, 0x00}},
-		{1, [3]byte{0x71, 0x00, 0x00}}, {1, [3]byte{0x72, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xba, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xb8, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc2, 0xa4, 0x00}},
-		{2, [3]byte{0xc2, 0xb5, 0x00}}, {1, [3]byte{0x7e, 0x00, 0x00}},
-		{1, [3]byte{0x73, 0x00, 0x00}}, {1, [3]byte{0x74, 0x00, 0x00}},
-		{1, [3]byte{0x75, 0x00, 0x00}}, {1, [3]byte{0x76, 0x00, 0x00}},
-		{1, [3]byte{0x77, 0x00, 0x00}}, {1, [3]byte{0x78, 0x00, 0x00}},
-		{1, [3]byte{0x79, 0x00, 0x00}}, {1, [3]byte{0x7a, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xa1, 0x00}}, {2, [3]byte{0xc2, 0xbf, 0x00}},
-		{2, [3]byte{0xc3, 0x90, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x9e, 0x00}}, {2, [3]byte{0xc2, 0xae, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa5, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xa9, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xbc, 0x00}},
-		{2, [3]byte{0xc2, 0xbd, 0x00}}, {2, [3]byte{0xc2, 0xbe, 0x00}},
-		{2, [3]byte{0xc3, 0x9d, 0x00}}, {2, [3]byte{0xc2, 0xa8, 0x00}},
-		{2, [3]byte{0xc2, 0xaf, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{1, [3]byte{0x7b, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xad, 0x00}}, {2, [3]byte{0xc3, 0xb4, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb2, 0x00}},
-		{2, [3]byte{0xc3, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{1, [3]byte{0x7d, 0x00, 0x00}}, {1, [3]byte{0x4a, 0x00, 0x00}},
-		{1, [3]byte{0x4b, 0x00, 0x00}}, {1, [3]byte{0x4c, 0x00, 0x00}},
-		{1, [3]byte{0x4d, 0x00, 0x00}}, {1, [3]byte{0x4e, 0x00, 0x00}},
-		{1, [3]byte{0x4f, 0x00, 0x00}}, {1, [3]byte{0x50, 0x00, 0x00}},
-		{1, [3]byte{0x51, 0x00, 0x00}}, {1, [3]byte{0x52, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xb9, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbf, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{1, [3]byte{0x53, 0x00, 0x00}}, {1, [3]byte{0x54, 0x00, 0x00}},
-		{1, [3]byte{0x55, 0x00, 0x00}}, {1, [3]byte{0x56, 0x00, 0x00}},
-		{1, [3]byte{0x57, 0x00, 0x00}}, {1, [3]byte{0x58, 0x00, 0x00}},
-		{1, [3]byte{0x59, 0x00, 0x00}}, {1, [3]byte{0x5a, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc3, 0x94, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x92, 0x00}},
-		{2, [3]byte{0xc3, 0x93, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc2, 0x9f, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x37000004, 0x2d000005, 0x2e000006, 0x2f000007,
-		0x16000008, 0x05000009, 0x2500000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x3c000014, 0x3d000015, 0x32000016, 0x26000017,
-		0x18000018, 0x19000019, 0x3f00001a, 0x2700001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x40000020, 0x5a000021, 0x7f000022, 0x7b000023, 0x5b000024, 0x6c000025, 0x50000026, 0x7d000027,
-		0x4d000028, 0x5d000029, 0x5c00002a, 0x4e00002b, 0x6b00002c, 0x6000002d, 0x4b00002e, 0x6100002f,
-		0xf0000030, 0xf1000031, 0xf2000032, 0xf3000033, 0xf4000034, 0xf5000035, 0xf6000036, 0xf7000037,
-		0xf8000038, 0xf9000039, 0x7a00003a, 0x5e00003b, 0x4c00003c, 0x7e00003d, 0x6e00003e, 0x6f00003f,
-		0x7c000040, 0xc1000041, 0xc2000042, 0xc3000043, 0xc4000044, 0xc5000045, 0xc6000046, 0xc7000047,
-		0xc8000048, 0xc9000049, 0xd100004a, 0xd200004b, 0xd300004c, 0xd400004d, 0xd500004e, 0xd600004f,
-		0xd7000050, 0xd8000051, 0xd9000052, 0xe2000053, 0xe3000054, 0xe4000055, 0xe5000056, 0xe6000057,
-		0xe7000058, 0xe8000059, 0xe900005a, 0xad00005b, 0xe000005c, 0xbd00005d, 0x5f00005e, 0x6d00005f,
-		0x79000060, 0x81000061, 0x82000062, 0x83000063, 0x84000064, 0x85000065, 0x86000066, 0x87000067,
-		0x88000068, 0x89000069, 0x9100006a, 0x9200006b, 0x9300006c, 0x9400006d, 0x9500006e, 0x9600006f,
-		0x97000070, 0x98000071, 0x99000072, 0xa2000073, 0xa3000074, 0xa4000075, 0xa5000076, 0xa6000077,
-		0xa7000078, 0xa8000079, 0xa900007a, 0xc000007b, 0x4f00007c, 0xd000007d, 0xa100007e, 0x0700007f,
-		0x20000080, 0x21000081, 0x22000082, 0x23000083, 0x24000084, 0x15000085, 0x06000086, 0x17000087,
-		0x28000088, 0x29000089, 0x2a00008a, 0x2b00008b, 0x2c00008c, 0x0900008d, 0x0a00008e, 0x1b00008f,
-		0x30000090, 0x31000091, 0x1a000092, 0x33000093, 0x34000094, 0x35000095, 0x36000096, 0x08000097,
-		0x38000098, 0x39000099, 0x3a00009a, 0x3b00009b, 0x0400009c, 0x1400009d, 0x3e00009e, 0xff00009f,
-		0x410000a0, 0xaa0000a1, 0x4a0000a2, 0xb10000a3, 0x9f0000a4, 0xb20000a5, 0x6a0000a6, 0xb50000a7,
-		0xbb0000a8, 0xb40000a9, 0x9a0000aa, 0x8a0000ab, 0xb00000ac, 0xca0000ad, 0xaf0000ae, 0xbc0000af,
-		0x900000b0, 0x8f0000b1, 0xea0000b2, 0xfa0000b3, 0xbe0000b4, 0xa00000b5, 0xb60000b6, 0xb30000b7,
-		0x9d0000b8, 0xda0000b9, 0x9b0000ba, 0x8b0000bb, 0xb70000bc, 0xb80000bd, 0xb90000be, 0xab0000bf,
-		0x640000c0, 0x650000c1, 0x620000c2, 0x660000c3, 0x630000c4, 0x670000c5, 0x9e0000c6, 0x680000c7,
-		0x740000c8, 0x710000c9, 0x720000ca, 0x730000cb, 0x780000cc, 0x750000cd, 0x760000ce, 0x770000cf,
-		0xac0000d0, 0x690000d1, 0xed0000d2, 0xee0000d3, 0xeb0000d4, 0xef0000d5, 0xec0000d6, 0xbf0000d7,
-		0x800000d8, 0xfd0000d9, 0xfe0000da, 0xfb0000db, 0xfc0000dc, 0xba0000dd, 0xae0000de, 0x590000df,
-		0x440000e0, 0x450000e1, 0x420000e2, 0x460000e3, 0x430000e4, 0x470000e5, 0x9c0000e6, 0x480000e7,
-		0x540000e8, 0x510000e9, 0x520000ea, 0x530000eb, 0x580000ec, 0x550000ed, 0x560000ee, 0x570000ef,
-		0x8c0000f0, 0x490000f1, 0xcd0000f2, 0xce0000f3, 0xcb0000f4, 0xcf0000f5, 0xcc0000f6, 0xe10000f7,
-		0x700000f8, 0xdd0000f9, 0xde0000fa, 0xdb0000fb, 0xdc0000fc, 0x8d0000fd, 0x8e0000fe, 0xdf0000ff,
-	},
-}
-
-// CodePage1140 is the IBM Code Page 1140 encoding.
-var CodePage1140 *Charmap = &codePage1140
-
-var codePage1140 = Charmap{
-	name:          "IBM Code Page 1140",
-	mib:           identifier.IBM01140,
-	asciiSuperset: false,
-	low:           0x00,
-	replacement:   0x3f,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x9c, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x86, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x97, 0x00}}, {2, [3]byte{0xc2, 0x8d, 0x00}},
-		{2, [3]byte{0xc2, 0x8e, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x9d, 0x00}}, {2, [3]byte{0xc2, 0x85, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {2, [3]byte{0xc2, 0x87, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x92, 0x00}}, {2, [3]byte{0xc2, 0x8f, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x80, 0x00}}, {2, [3]byte{0xc2, 0x81, 0x00}},
-		{2, [3]byte{0xc2, 0x82, 0x00}}, {2, [3]byte{0xc2, 0x83, 0x00}},
-		{2, [3]byte{0xc2, 0x84, 0x00}}, {1, [3]byte{0x0a, 0x00, 0x00}},
-		{1, [3]byte{0x17, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x88, 0x00}}, {2, [3]byte{0xc2, 0x89, 0x00}},
-		{2, [3]byte{0xc2, 0x8a, 0x00}}, {2, [3]byte{0xc2, 0x8b, 0x00}},
-		{2, [3]byte{0xc2, 0x8c, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x90, 0x00}}, {2, [3]byte{0xc2, 0x91, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {2, [3]byte{0xc2, 0x93, 0x00}},
-		{2, [3]byte{0xc2, 0x94, 0x00}}, {2, [3]byte{0xc2, 0x95, 0x00}},
-		{2, [3]byte{0xc2, 0x96, 0x00}}, {1, [3]byte{0x04, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x98, 0x00}}, {2, [3]byte{0xc2, 0x99, 0x00}},
-		{2, [3]byte{0xc2, 0x9a, 0x00}}, {2, [3]byte{0xc2, 0x9b, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x9e, 0x00}}, {1, [3]byte{0x1a, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {2, [3]byte{0xc2, 0xa0, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0xa4, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa3, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc3, 0xa7, 0x00}}, {2, [3]byte{0xc3, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {1, [3]byte{0x2e, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x28, 0x00, 0x00}},
-		{1, [3]byte{0x2b, 0x00, 0x00}}, {1, [3]byte{0x7c, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xac, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{1, [3]byte{0x21, 0x00, 0x00}}, {1, [3]byte{0x24, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x3b, 0x00, 0x00}}, {2, [3]byte{0xc2, 0xac, 0x00}},
-		{1, [3]byte{0x2d, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x84, 0x00}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x83, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x87, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {1, [3]byte{0x2c, 0x00, 0x00}},
-		{1, [3]byte{0x25, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {1, [3]byte{0x60, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x3d, 0x00, 0x00}}, {1, [3]byte{0x22, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xab, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xb0, 0x00}}, {2, [3]byte{0xc3, 0xbd, 0x00}},
-		{2, [3]byte{0xc3, 0xbe, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {1, [3]byte{0x6a, 0x00, 0x00}},
-		{1, [3]byte{0x6b, 0x00, 0x00}}, {1, [3]byte{0x6c, 0x00, 0x00}},
-		{1, [3]byte{0x6d, 0x00, 0x00}}, {1, [3]byte{0x6e, 0x00, 0x00}},
-		{1, [3]byte{0x6f, 0x00, 0x00}}, {1, [3]byte{0x70, 0x00, 0x00}},
-		{1, [3]byte{0x71, 0x00, 0x00}}, {1, [3]byte{0x72, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xba, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xb8, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {3, [3]byte{0xe2, 0x82, 0xac}},
-		{2, [3]byte{0xc2, 0xb5, 0x00}}, {1, [3]byte{0x7e, 0x00, 0x00}},
-		{1, [3]byte{0x73, 0x00, 0x00}}, {1, [3]byte{0x74, 0x00, 0x00}},
-		{1, [3]byte{0x75, 0x00, 0x00}}, {1, [3]byte{0x76, 0x00, 0x00}},
-		{1, [3]byte{0x77, 0x00, 0x00}}, {1, [3]byte{0x78, 0x00, 0x00}},
-		{1, [3]byte{0x79, 0x00, 0x00}}, {1, [3]byte{0x7a, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xa1, 0x00}}, {2, [3]byte{0xc2, 0xbf, 0x00}},
-		{2, [3]byte{0xc3, 0x90, 0x00}}, {2, [3]byte{0xc3, 0x9d, 0x00}},
-		{2, [3]byte{0xc3, 0x9e, 0x00}}, {2, [3]byte{0xc2, 0xae, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa5, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xa9, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xbc, 0x00}},
-		{2, [3]byte{0xc2, 0xbd, 0x00}}, {2, [3]byte{0xc2, 0xbe, 0x00}},
-		{1, [3]byte{0x5b, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xaf, 0x00}}, {2, [3]byte{0xc2, 0xa8, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{1, [3]byte{0x7b, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xad, 0x00}}, {2, [3]byte{0xc3, 0xb4, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb2, 0x00}},
-		{2, [3]byte{0xc3, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{1, [3]byte{0x7d, 0x00, 0x00}}, {1, [3]byte{0x4a, 0x00, 0x00}},
-		{1, [3]byte{0x4b, 0x00, 0x00}}, {1, [3]byte{0x4c, 0x00, 0x00}},
-		{1, [3]byte{0x4d, 0x00, 0x00}}, {1, [3]byte{0x4e, 0x00, 0x00}},
-		{1, [3]byte{0x4f, 0x00, 0x00}}, {1, [3]byte{0x50, 0x00, 0x00}},
-		{1, [3]byte{0x51, 0x00, 0x00}}, {1, [3]byte{0x52, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xb9, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbf, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{1, [3]byte{0x53, 0x00, 0x00}}, {1, [3]byte{0x54, 0x00, 0x00}},
-		{1, [3]byte{0x55, 0x00, 0x00}}, {1, [3]byte{0x56, 0x00, 0x00}},
-		{1, [3]byte{0x57, 0x00, 0x00}}, {1, [3]byte{0x58, 0x00, 0x00}},
-		{1, [3]byte{0x59, 0x00, 0x00}}, {1, [3]byte{0x5a, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc3, 0x94, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x92, 0x00}},
-		{2, [3]byte{0xc3, 0x93, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0xb3, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc2, 0x9f, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x37000004, 0x2d000005, 0x2e000006, 0x2f000007,
-		0x16000008, 0x05000009, 0x2500000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x3c000014, 0x3d000015, 0x32000016, 0x26000017,
-		0x18000018, 0x19000019, 0x3f00001a, 0x2700001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x40000020, 0x5a000021, 0x7f000022, 0x7b000023, 0x5b000024, 0x6c000025, 0x50000026, 0x7d000027,
-		0x4d000028, 0x5d000029, 0x5c00002a, 0x4e00002b, 0x6b00002c, 0x6000002d, 0x4b00002e, 0x6100002f,
-		0xf0000030, 0xf1000031, 0xf2000032, 0xf3000033, 0xf4000034, 0xf5000035, 0xf6000036, 0xf7000037,
-		0xf8000038, 0xf9000039, 0x7a00003a, 0x5e00003b, 0x4c00003c, 0x7e00003d, 0x6e00003e, 0x6f00003f,
-		0x7c000040, 0xc1000041, 0xc2000042, 0xc3000043, 0xc4000044, 0xc5000045, 0xc6000046, 0xc7000047,
-		0xc8000048, 0xc9000049, 0xd100004a, 0xd200004b, 0xd300004c, 0xd400004d, 0xd500004e, 0xd600004f,
-		0xd7000050, 0xd8000051, 0xd9000052, 0xe2000053, 0xe3000054, 0xe4000055, 0xe5000056, 0xe6000057,
-		0xe7000058, 0xe8000059, 0xe900005a, 0xba00005b, 0xe000005c, 0xbb00005d, 0xb000005e, 0x6d00005f,
-		0x79000060, 0x81000061, 0x82000062, 0x83000063, 0x84000064, 0x85000065, 0x86000066, 0x87000067,
-		0x88000068, 0x89000069, 0x9100006a, 0x9200006b, 0x9300006c, 0x9400006d, 0x9500006e, 0x9600006f,
-		0x97000070, 0x98000071, 0x99000072, 0xa2000073, 0xa3000074, 0xa4000075, 0xa5000076, 0xa6000077,
-		0xa7000078, 0xa8000079, 0xa900007a, 0xc000007b, 0x4f00007c, 0xd000007d, 0xa100007e, 0x0700007f,
-		0x20000080, 0x21000081, 0x22000082, 0x23000083, 0x24000084, 0x15000085, 0x06000086, 0x17000087,
-		0x28000088, 0x29000089, 0x2a00008a, 0x2b00008b, 0x2c00008c, 0x0900008d, 0x0a00008e, 0x1b00008f,
-		0x30000090, 0x31000091, 0x1a000092, 0x33000093, 0x34000094, 0x35000095, 0x36000096, 0x08000097,
-		0x38000098, 0x39000099, 0x3a00009a, 0x3b00009b, 0x0400009c, 0x1400009d, 0x3e00009e, 0xff00009f,
-		0x410000a0, 0xaa0000a1, 0x4a0000a2, 0xb10000a3, 0xb20000a5, 0x6a0000a6, 0xb50000a7, 0xbd0000a8,
-		0xb40000a9, 0x9a0000aa, 0x8a0000ab, 0x5f0000ac, 0xca0000ad, 0xaf0000ae, 0xbc0000af, 0x900000b0,
-		0x8f0000b1, 0xea0000b2, 0xfa0000b3, 0xbe0000b4, 0xa00000b5, 0xb60000b6, 0xb30000b7, 0x9d0000b8,
-		0xda0000b9, 0x9b0000ba, 0x8b0000bb, 0xb70000bc, 0xb80000bd, 0xb90000be, 0xab0000bf, 0x640000c0,
-		0x650000c1, 0x620000c2, 0x660000c3, 0x630000c4, 0x670000c5, 0x9e0000c6, 0x680000c7, 0x740000c8,
-		0x710000c9, 0x720000ca, 0x730000cb, 0x780000cc, 0x750000cd, 0x760000ce, 0x770000cf, 0xac0000d0,
-		0x690000d1, 0xed0000d2, 0xee0000d3, 0xeb0000d4, 0xef0000d5, 0xec0000d6, 0xbf0000d7, 0x800000d8,
-		0xfd0000d9, 0xfe0000da, 0xfb0000db, 0xfc0000dc, 0xad0000dd, 0xae0000de, 0x590000df, 0x440000e0,
-		0x450000e1, 0x420000e2, 0x460000e3, 0x430000e4, 0x470000e5, 0x9c0000e6, 0x480000e7, 0x540000e8,
-		0x510000e9, 0x520000ea, 0x530000eb, 0x580000ec, 0x550000ed, 0x560000ee, 0x570000ef, 0x8c0000f0,
-		0x490000f1, 0xcd0000f2, 0xce0000f3, 0xcb0000f4, 0xcf0000f5, 0xcc0000f6, 0xe10000f7, 0x700000f8,
-		0xdd0000f9, 0xde0000fa, 0xdb0000fb, 0xdc0000fc, 0x8d0000fd, 0x8e0000fe, 0xdf0000ff, 0x9f0020ac,
-	},
-}
-
-// ISO8859_1 is the ISO 8859-1 encoding.
-var ISO8859_1 *Charmap = &iso8859_1
-
-var iso8859_1 = Charmap{
-	name:          "ISO 8859-1",
-	mib:           identifier.ISOLatin1,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x80, 0x00}}, {2, [3]byte{0xc2, 0x81, 0x00}},
-		{2, [3]byte{0xc2, 0x82, 0x00}}, {2, [3]byte{0xc2, 0x83, 0x00}},
-		{2, [3]byte{0xc2, 0x84, 0x00}}, {2, [3]byte{0xc2, 0x85, 0x00}},
-		{2, [3]byte{0xc2, 0x86, 0x00}}, {2, [3]byte{0xc2, 0x87, 0x00}},
-		{2, [3]byte{0xc2, 0x88, 0x00}}, {2, [3]byte{0xc2, 0x89, 0x00}},
-		{2, [3]byte{0xc2, 0x8a, 0x00}}, {2, [3]byte{0xc2, 0x8b, 0x00}},
-		{2, [3]byte{0xc2, 0x8c, 0x00}}, {2, [3]byte{0xc2, 0x8d, 0x00}},
-		{2, [3]byte{0xc2, 0x8e, 0x00}}, {2, [3]byte{0xc2, 0x8f, 0x00}},
-		{2, [3]byte{0xc2, 0x90, 0x00}}, {2, [3]byte{0xc2, 0x91, 0x00}},
-		{2, [3]byte{0xc2, 0x92, 0x00}}, {2, [3]byte{0xc2, 0x93, 0x00}},
-		{2, [3]byte{0xc2, 0x94, 0x00}}, {2, [3]byte{0xc2, 0x95, 0x00}},
-		{2, [3]byte{0xc2, 0x96, 0x00}}, {2, [3]byte{0xc2, 0x97, 0x00}},
-		{2, [3]byte{0xc2, 0x98, 0x00}}, {2, [3]byte{0xc2, 0x99, 0x00}},
-		{2, [3]byte{0xc2, 0x9a, 0x00}}, {2, [3]byte{0xc2, 0x9b, 0x00}},
-		{2, [3]byte{0xc2, 0x9c, 0x00}}, {2, [3]byte{0xc2, 0x9d, 0x00}},
-		{2, [3]byte{0xc2, 0x9e, 0x00}}, {2, [3]byte{0xc2, 0x9f, 0x00}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xc2, 0xa5, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc2, 0xaf, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xc2, 0xba, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbe, 0x00}}, {2, [3]byte{0xc2, 0xbf, 0x00}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc3, 0x90, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc3, 0x92, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0x9d, 0x00}},
-		{2, [3]byte{0xc3, 0x9e, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0xa3, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xac, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xb0, 0x00}}, {2, [3]byte{0xc3, 0xb1, 0x00}},
-		{2, [3]byte{0xc3, 0xb2, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc3, 0xbd, 0x00}},
-		{2, [3]byte{0xc3, 0xbe, 0x00}}, {2, [3]byte{0xc3, 0xbf, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0x80000080, 0x81000081, 0x82000082, 0x83000083, 0x84000084, 0x85000085, 0x86000086, 0x87000087,
-		0x88000088, 0x89000089, 0x8a00008a, 0x8b00008b, 0x8c00008c, 0x8d00008d, 0x8e00008e, 0x8f00008f,
-		0x90000090, 0x91000091, 0x92000092, 0x93000093, 0x94000094, 0x95000095, 0x96000096, 0x97000097,
-		0x98000098, 0x99000099, 0x9a00009a, 0x9b00009b, 0x9c00009c, 0x9d00009d, 0x9e00009e, 0x9f00009f,
-		0xa00000a0, 0xa10000a1, 0xa20000a2, 0xa30000a3, 0xa40000a4, 0xa50000a5, 0xa60000a6, 0xa70000a7,
-		0xa80000a8, 0xa90000a9, 0xaa0000aa, 0xab0000ab, 0xac0000ac, 0xad0000ad, 0xae0000ae, 0xaf0000af,
-		0xb00000b0, 0xb10000b1, 0xb20000b2, 0xb30000b3, 0xb40000b4, 0xb50000b5, 0xb60000b6, 0xb70000b7,
-		0xb80000b8, 0xb90000b9, 0xba0000ba, 0xbb0000bb, 0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xbf0000bf,
-		0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7,
-		0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
-		0xd00000d0, 0xd10000d1, 0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd70000d7,
-		0xd80000d8, 0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdd0000dd, 0xde0000de, 0xdf0000df,
-		0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe30000e3, 0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7,
-		0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef,
-		0xf00000f0, 0xf10000f1, 0xf20000f2, 0xf30000f3, 0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf70000f7,
-		0xf80000f8, 0xf90000f9, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc, 0xfd0000fd, 0xfe0000fe, 0xff0000ff,
-	},
-}
-
-// ISO8859_2 is the ISO 8859-2 encoding.
-var ISO8859_2 *Charmap = &iso8859_2
-
-var iso8859_2 = Charmap{
-	name:          "ISO 8859-2",
-	mib:           identifier.ISOLatin2,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc4, 0x84, 0x00}},
-		{2, [3]byte{0xcb, 0x98, 0x00}}, {2, [3]byte{0xc5, 0x81, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xc4, 0xbd, 0x00}},
-		{2, [3]byte{0xc5, 0x9a, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc5, 0xa0, 0x00}},
-		{2, [3]byte{0xc5, 0x9e, 0x00}}, {2, [3]byte{0xc5, 0xa4, 0x00}},
-		{2, [3]byte{0xc5, 0xb9, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc5, 0xbd, 0x00}}, {2, [3]byte{0xc5, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc4, 0x85, 0x00}},
-		{2, [3]byte{0xcb, 0x9b, 0x00}}, {2, [3]byte{0xc5, 0x82, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc4, 0xbe, 0x00}},
-		{2, [3]byte{0xc5, 0x9b, 0x00}}, {2, [3]byte{0xcb, 0x87, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xc5, 0xa1, 0x00}},
-		{2, [3]byte{0xc5, 0x9f, 0x00}}, {2, [3]byte{0xc5, 0xa5, 0x00}},
-		{2, [3]byte{0xc5, 0xba, 0x00}}, {2, [3]byte{0xcb, 0x9d, 0x00}},
-		{2, [3]byte{0xc5, 0xbe, 0x00}}, {2, [3]byte{0xc5, 0xbc, 0x00}},
-		{2, [3]byte{0xc5, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc4, 0x82, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc4, 0xb9, 0x00}},
-		{2, [3]byte{0xc4, 0x86, 0x00}}, {2, [3]byte{0xc3, 0x87, 0x00}},
-		{2, [3]byte{0xc4, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc4, 0x98, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc4, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc4, 0x8e, 0x00}},
-		{2, [3]byte{0xc4, 0x90, 0x00}}, {2, [3]byte{0xc5, 0x83, 0x00}},
-		{2, [3]byte{0xc5, 0x87, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc5, 0x90, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xc5, 0x98, 0x00}}, {2, [3]byte{0xc5, 0xae, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc5, 0xb0, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0x9d, 0x00}},
-		{2, [3]byte{0xc5, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc5, 0x95, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc4, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc4, 0xba, 0x00}},
-		{2, [3]byte{0xc4, 0x87, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc4, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc4, 0x99, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc4, 0x9b, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc4, 0x8f, 0x00}},
-		{2, [3]byte{0xc4, 0x91, 0x00}}, {2, [3]byte{0xc5, 0x84, 0x00}},
-		{2, [3]byte{0xc5, 0x88, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc5, 0x91, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xc5, 0x99, 0x00}}, {2, [3]byte{0xc5, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc5, 0xb1, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc3, 0xbd, 0x00}},
-		{2, [3]byte{0xc5, 0xa3, 0x00}}, {2, [3]byte{0xcb, 0x99, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa40000a4, 0xa70000a7, 0xa80000a8, 0xad0000ad, 0xb00000b0, 0xb40000b4, 0xb80000b8,
-		0xc10000c1, 0xc20000c2, 0xc40000c4, 0xc70000c7, 0xc90000c9, 0xcb0000cb, 0xcd0000cd, 0xce0000ce,
-		0xd30000d3, 0xd40000d4, 0xd60000d6, 0xd70000d7, 0xda0000da, 0xdc0000dc, 0xdd0000dd, 0xdf0000df,
-		0xe10000e1, 0xe20000e2, 0xe40000e4, 0xe70000e7, 0xe90000e9, 0xeb0000eb, 0xed0000ed, 0xee0000ee,
-		0xf30000f3, 0xf40000f4, 0xf60000f6, 0xf70000f7, 0xfa0000fa, 0xfc0000fc, 0xfd0000fd, 0xc3000102,
-		0xe3000103, 0xa1000104, 0xb1000105, 0xc6000106, 0xe6000107, 0xc800010c, 0xe800010d, 0xcf00010e,
-		0xef00010f, 0xd0000110, 0xf0000111, 0xca000118, 0xea000119, 0xcc00011a, 0xec00011b, 0xc5000139,
-		0xe500013a, 0xa500013d, 0xb500013e, 0xa3000141, 0xb3000142, 0xd1000143, 0xf1000144, 0xd2000147,
-		0xf2000148, 0xd5000150, 0xf5000151, 0xc0000154, 0xe0000155, 0xd8000158, 0xf8000159, 0xa600015a,
-		0xb600015b, 0xaa00015e, 0xba00015f, 0xa9000160, 0xb9000161, 0xde000162, 0xfe000163, 0xab000164,
-		0xbb000165, 0xd900016e, 0xf900016f, 0xdb000170, 0xfb000171, 0xac000179, 0xbc00017a, 0xaf00017b,
-		0xbf00017c, 0xae00017d, 0xbe00017e, 0xb70002c7, 0xa20002d8, 0xff0002d9, 0xb20002db, 0xbd0002dd,
-		0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd,
-		0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd,
-		0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd,
-		0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd,
-	},
-}
-
-// ISO8859_3 is the ISO 8859-3 encoding.
-var ISO8859_3 *Charmap = &iso8859_3
-
-var iso8859_3 = Charmap{
-	name:          "ISO 8859-3",
-	mib:           identifier.ISOLatin3,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc4, 0xa6, 0x00}},
-		{2, [3]byte{0xcb, 0x98, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc4, 0xa4, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc4, 0xb0, 0x00}},
-		{2, [3]byte{0xc5, 0x9e, 0x00}}, {2, [3]byte{0xc4, 0x9e, 0x00}},
-		{2, [3]byte{0xc4, 0xb4, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xc5, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc4, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc4, 0xa5, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xc4, 0xb1, 0x00}},
-		{2, [3]byte{0xc5, 0x9f, 0x00}}, {2, [3]byte{0xc4, 0x9f, 0x00}},
-		{2, [3]byte{0xc4, 0xb5, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xc5, 0xbc, 0x00}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc4, 0x8a, 0x00}},
-		{2, [3]byte{0xc4, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc3, 0x92, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc4, 0xa0, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xc4, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc5, 0xac, 0x00}},
-		{2, [3]byte{0xc5, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc4, 0x8b, 0x00}},
-		{2, [3]byte{0xc4, 0x89, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xac, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xc3, 0xb1, 0x00}},
-		{2, [3]byte{0xc3, 0xb2, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc4, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xc4, 0x9d, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc5, 0xad, 0x00}},
-		{2, [3]byte{0xc5, 0x9d, 0x00}}, {2, [3]byte{0xcb, 0x99, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa30000a3, 0xa40000a4, 0xa70000a7, 0xa80000a8, 0xad0000ad, 0xb00000b0, 0xb20000b2,
-		0xb30000b3, 0xb40000b4, 0xb50000b5, 0xb70000b7, 0xb80000b8, 0xbd0000bd, 0xc00000c0, 0xc10000c1,
-		0xc20000c2, 0xc40000c4, 0xc70000c7, 0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc,
-		0xcd0000cd, 0xce0000ce, 0xcf0000cf, 0xd10000d1, 0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd60000d6,
-		0xd70000d7, 0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdf0000df, 0xe00000e0, 0xe10000e1,
-		0xe20000e2, 0xe40000e4, 0xe70000e7, 0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xec0000ec,
-		0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf10000f1, 0xf20000f2, 0xf30000f3, 0xf40000f4, 0xf60000f6,
-		0xf70000f7, 0xf90000f9, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc, 0xc6000108, 0xe6000109, 0xc500010a,
-		0xe500010b, 0xd800011c, 0xf800011d, 0xab00011e, 0xbb00011f, 0xd5000120, 0xf5000121, 0xa6000124,
-		0xb6000125, 0xa1000126, 0xb1000127, 0xa9000130, 0xb9000131, 0xac000134, 0xbc000135, 0xde00015c,
-		0xfe00015d, 0xaa00015e, 0xba00015f, 0xdd00016c, 0xfd00016d, 0xaf00017b, 0xbf00017c, 0xa20002d8,
-		0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9,
-		0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9,
-		0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9,
-		0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9,
-		0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9,
-	},
-}
-
-// ISO8859_4 is the ISO 8859-4 encoding.
-var ISO8859_4 *Charmap = &iso8859_4
-
-var iso8859_4 = Charmap{
-	name:          "ISO 8859-4",
-	mib:           identifier.ISOLatin4,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc4, 0x84, 0x00}},
-		{2, [3]byte{0xc4, 0xb8, 0x00}}, {2, [3]byte{0xc5, 0x96, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xc4, 0xa8, 0x00}},
-		{2, [3]byte{0xc4, 0xbb, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc5, 0xa0, 0x00}},
-		{2, [3]byte{0xc4, 0x92, 0x00}}, {2, [3]byte{0xc4, 0xa2, 0x00}},
-		{2, [3]byte{0xc5, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc5, 0xbd, 0x00}}, {2, [3]byte{0xc2, 0xaf, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc4, 0x85, 0x00}},
-		{2, [3]byte{0xcb, 0x9b, 0x00}}, {2, [3]byte{0xc5, 0x97, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc4, 0xa9, 0x00}},
-		{2, [3]byte{0xc4, 0xbc, 0x00}}, {2, [3]byte{0xcb, 0x87, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xc5, 0xa1, 0x00}},
-		{2, [3]byte{0xc4, 0x93, 0x00}}, {2, [3]byte{0xc4, 0xa3, 0x00}},
-		{2, [3]byte{0xc5, 0xa7, 0x00}}, {2, [3]byte{0xc5, 0x8a, 0x00}},
-		{2, [3]byte{0xc5, 0xbe, 0x00}}, {2, [3]byte{0xc5, 0x8b, 0x00}},
-		{2, [3]byte{0xc4, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc4, 0xae, 0x00}},
-		{2, [3]byte{0xc4, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc4, 0x98, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc4, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc4, 0xaa, 0x00}},
-		{2, [3]byte{0xc4, 0x90, 0x00}}, {2, [3]byte{0xc5, 0x85, 0x00}},
-		{2, [3]byte{0xc5, 0x8c, 0x00}}, {2, [3]byte{0xc4, 0xb6, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {2, [3]byte{0xc5, 0xb2, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc5, 0xa8, 0x00}},
-		{2, [3]byte{0xc5, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc4, 0x81, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0xa3, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc4, 0xaf, 0x00}},
-		{2, [3]byte{0xc4, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc4, 0x99, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc4, 0x97, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc4, 0xab, 0x00}},
-		{2, [3]byte{0xc4, 0x91, 0x00}}, {2, [3]byte{0xc5, 0x86, 0x00}},
-		{2, [3]byte{0xc5, 0x8d, 0x00}}, {2, [3]byte{0xc4, 0xb7, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc5, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc5, 0xa9, 0x00}},
-		{2, [3]byte{0xc5, 0xab, 0x00}}, {2, [3]byte{0xcb, 0x99, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa40000a4, 0xa70000a7, 0xa80000a8, 0xad0000ad, 0xaf0000af, 0xb00000b0, 0xb40000b4,
-		0xb80000b8, 0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc90000c9,
-		0xcb0000cb, 0xcd0000cd, 0xce0000ce, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd70000d7, 0xd80000d8,
-		0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdf0000df, 0xe10000e1, 0xe20000e2, 0xe30000e3, 0xe40000e4,
-		0xe50000e5, 0xe60000e6, 0xe90000e9, 0xeb0000eb, 0xed0000ed, 0xee0000ee, 0xf40000f4, 0xf50000f5,
-		0xf60000f6, 0xf70000f7, 0xf80000f8, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc, 0xc0000100, 0xe0000101,
-		0xa1000104, 0xb1000105, 0xc800010c, 0xe800010d, 0xd0000110, 0xf0000111, 0xaa000112, 0xba000113,
-		0xcc000116, 0xec000117, 0xca000118, 0xea000119, 0xab000122, 0xbb000123, 0xa5000128, 0xb5000129,
-		0xcf00012a, 0xef00012b, 0xc700012e, 0xe700012f, 0xd3000136, 0xf3000137, 0xa2000138, 0xa600013b,
-		0xb600013c, 0xd1000145, 0xf1000146, 0xbd00014a, 0xbf00014b, 0xd200014c, 0xf200014d, 0xa3000156,
-		0xb3000157, 0xa9000160, 0xb9000161, 0xac000166, 0xbc000167, 0xdd000168, 0xfd000169, 0xde00016a,
-		0xfe00016b, 0xd9000172, 0xf9000173, 0xae00017d, 0xbe00017e, 0xb70002c7, 0xff0002d9, 0xb20002db,
-		0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db,
-		0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db,
-		0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db,
-		0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db,
-	},
-}
-
-// ISO8859_5 is the ISO 8859-5 encoding.
-var ISO8859_5 *Charmap = &iso8859_5
-
-var iso8859_5 = Charmap{
-	name:          "ISO 8859-5",
-	mib:           identifier.ISOLatinCyrillic,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xd0, 0x81, 0x00}},
-		{2, [3]byte{0xd0, 0x82, 0x00}}, {2, [3]byte{0xd0, 0x83, 0x00}},
-		{2, [3]byte{0xd0, 0x84, 0x00}}, {2, [3]byte{0xd0, 0x85, 0x00}},
-		{2, [3]byte{0xd0, 0x86, 0x00}}, {2, [3]byte{0xd0, 0x87, 0x00}},
-		{2, [3]byte{0xd0, 0x88, 0x00}}, {2, [3]byte{0xd0, 0x89, 0x00}},
-		{2, [3]byte{0xd0, 0x8a, 0x00}}, {2, [3]byte{0xd0, 0x8b, 0x00}},
-		{2, [3]byte{0xd0, 0x8c, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xd0, 0x8e, 0x00}}, {2, [3]byte{0xd0, 0x8f, 0x00}},
-		{2, [3]byte{0xd0, 0x90, 0x00}}, {2, [3]byte{0xd0, 0x91, 0x00}},
-		{2, [3]byte{0xd0, 0x92, 0x00}}, {2, [3]byte{0xd0, 0x93, 0x00}},
-		{2, [3]byte{0xd0, 0x94, 0x00}}, {2, [3]byte{0xd0, 0x95, 0x00}},
-		{2, [3]byte{0xd0, 0x96, 0x00}}, {2, [3]byte{0xd0, 0x97, 0x00}},
-		{2, [3]byte{0xd0, 0x98, 0x00}}, {2, [3]byte{0xd0, 0x99, 0x00}},
-		{2, [3]byte{0xd0, 0x9a, 0x00}}, {2, [3]byte{0xd0, 0x9b, 0x00}},
-		{2, [3]byte{0xd0, 0x9c, 0x00}}, {2, [3]byte{0xd0, 0x9d, 0x00}},
-		{2, [3]byte{0xd0, 0x9e, 0x00}}, {2, [3]byte{0xd0, 0x9f, 0x00}},
-		{2, [3]byte{0xd0, 0xa0, 0x00}}, {2, [3]byte{0xd0, 0xa1, 0x00}},
-		{2, [3]byte{0xd0, 0xa2, 0x00}}, {2, [3]byte{0xd0, 0xa3, 0x00}},
-		{2, [3]byte{0xd0, 0xa4, 0x00}}, {2, [3]byte{0xd0, 0xa5, 0x00}},
-		{2, [3]byte{0xd0, 0xa6, 0x00}}, {2, [3]byte{0xd0, 0xa7, 0x00}},
-		{2, [3]byte{0xd0, 0xa8, 0x00}}, {2, [3]byte{0xd0, 0xa9, 0x00}},
-		{2, [3]byte{0xd0, 0xaa, 0x00}}, {2, [3]byte{0xd0, 0xab, 0x00}},
-		{2, [3]byte{0xd0, 0xac, 0x00}}, {2, [3]byte{0xd0, 0xad, 0x00}},
-		{2, [3]byte{0xd0, 0xae, 0x00}}, {2, [3]byte{0xd0, 0xaf, 0x00}},
-		{2, [3]byte{0xd0, 0xb0, 0x00}}, {2, [3]byte{0xd0, 0xb1, 0x00}},
-		{2, [3]byte{0xd0, 0xb2, 0x00}}, {2, [3]byte{0xd0, 0xb3, 0x00}},
-		{2, [3]byte{0xd0, 0xb4, 0x00}}, {2, [3]byte{0xd0, 0xb5, 0x00}},
-		{2, [3]byte{0xd0, 0xb6, 0x00}}, {2, [3]byte{0xd0, 0xb7, 0x00}},
-		{2, [3]byte{0xd0, 0xb8, 0x00}}, {2, [3]byte{0xd0, 0xb9, 0x00}},
-		{2, [3]byte{0xd0, 0xba, 0x00}}, {2, [3]byte{0xd0, 0xbb, 0x00}},
-		{2, [3]byte{0xd0, 0xbc, 0x00}}, {2, [3]byte{0xd0, 0xbd, 0x00}},
-		{2, [3]byte{0xd0, 0xbe, 0x00}}, {2, [3]byte{0xd0, 0xbf, 0x00}},
-		{2, [3]byte{0xd1, 0x80, 0x00}}, {2, [3]byte{0xd1, 0x81, 0x00}},
-		{2, [3]byte{0xd1, 0x82, 0x00}}, {2, [3]byte{0xd1, 0x83, 0x00}},
-		{2, [3]byte{0xd1, 0x84, 0x00}}, {2, [3]byte{0xd1, 0x85, 0x00}},
-		{2, [3]byte{0xd1, 0x86, 0x00}}, {2, [3]byte{0xd1, 0x87, 0x00}},
-		{2, [3]byte{0xd1, 0x88, 0x00}}, {2, [3]byte{0xd1, 0x89, 0x00}},
-		{2, [3]byte{0xd1, 0x8a, 0x00}}, {2, [3]byte{0xd1, 0x8b, 0x00}},
-		{2, [3]byte{0xd1, 0x8c, 0x00}}, {2, [3]byte{0xd1, 0x8d, 0x00}},
-		{2, [3]byte{0xd1, 0x8e, 0x00}}, {2, [3]byte{0xd1, 0x8f, 0x00}},
-		{3, [3]byte{0xe2, 0x84, 0x96}}, {2, [3]byte{0xd1, 0x91, 0x00}},
-		{2, [3]byte{0xd1, 0x92, 0x00}}, {2, [3]byte{0xd1, 0x93, 0x00}},
-		{2, [3]byte{0xd1, 0x94, 0x00}}, {2, [3]byte{0xd1, 0x95, 0x00}},
-		{2, [3]byte{0xd1, 0x96, 0x00}}, {2, [3]byte{0xd1, 0x97, 0x00}},
-		{2, [3]byte{0xd1, 0x98, 0x00}}, {2, [3]byte{0xd1, 0x99, 0x00}},
-		{2, [3]byte{0xd1, 0x9a, 0x00}}, {2, [3]byte{0xd1, 0x9b, 0x00}},
-		{2, [3]byte{0xd1, 0x9c, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xd1, 0x9e, 0x00}}, {2, [3]byte{0xd1, 0x9f, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xfd0000a7, 0xad0000ad, 0xa1000401, 0xa2000402, 0xa3000403, 0xa4000404, 0xa5000405,
-		0xa6000406, 0xa7000407, 0xa8000408, 0xa9000409, 0xaa00040a, 0xab00040b, 0xac00040c, 0xae00040e,
-		0xaf00040f, 0xb0000410, 0xb1000411, 0xb2000412, 0xb3000413, 0xb4000414, 0xb5000415, 0xb6000416,
-		0xb7000417, 0xb8000418, 0xb9000419, 0xba00041a, 0xbb00041b, 0xbc00041c, 0xbd00041d, 0xbe00041e,
-		0xbf00041f, 0xc0000420, 0xc1000421, 0xc2000422, 0xc3000423, 0xc4000424, 0xc5000425, 0xc6000426,
-		0xc7000427, 0xc8000428, 0xc9000429, 0xca00042a, 0xcb00042b, 0xcc00042c, 0xcd00042d, 0xce00042e,
-		0xcf00042f, 0xd0000430, 0xd1000431, 0xd2000432, 0xd3000433, 0xd4000434, 0xd5000435, 0xd6000436,
-		0xd7000437, 0xd8000438, 0xd9000439, 0xda00043a, 0xdb00043b, 0xdc00043c, 0xdd00043d, 0xde00043e,
-		0xdf00043f, 0xe0000440, 0xe1000441, 0xe2000442, 0xe3000443, 0xe4000444, 0xe5000445, 0xe6000446,
-		0xe7000447, 0xe8000448, 0xe9000449, 0xea00044a, 0xeb00044b, 0xec00044c, 0xed00044d, 0xee00044e,
-		0xef00044f, 0xf1000451, 0xf2000452, 0xf3000453, 0xf4000454, 0xf5000455, 0xf6000456, 0xf7000457,
-		0xf8000458, 0xf9000459, 0xfa00045a, 0xfb00045b, 0xfc00045c, 0xfe00045e, 0xff00045f, 0xf0002116,
-		0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116,
-		0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116,
-		0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116,
-		0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116,
-	},
-}
-
-// ISO8859_6 is the ISO 8859-6 encoding.
-var ISO8859_6 *Charmap = &iso8859_6
-
-var iso8859_6 = Charmap{
-	name:          "ISO 8859-6",
-	mib:           identifier.ISOLatinArabic,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xd8, 0x8c, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xd8, 0x9b, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xd8, 0x9f, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xd8, 0xa1, 0x00}},
-		{2, [3]byte{0xd8, 0xa2, 0x00}}, {2, [3]byte{0xd8, 0xa3, 0x00}},
-		{2, [3]byte{0xd8, 0xa4, 0x00}}, {2, [3]byte{0xd8, 0xa5, 0x00}},
-		{2, [3]byte{0xd8, 0xa6, 0x00}}, {2, [3]byte{0xd8, 0xa7, 0x00}},
-		{2, [3]byte{0xd8, 0xa8, 0x00}}, {2, [3]byte{0xd8, 0xa9, 0x00}},
-		{2, [3]byte{0xd8, 0xaa, 0x00}}, {2, [3]byte{0xd8, 0xab, 0x00}},
-		{2, [3]byte{0xd8, 0xac, 0x00}}, {2, [3]byte{0xd8, 0xad, 0x00}},
-		{2, [3]byte{0xd8, 0xae, 0x00}}, {2, [3]byte{0xd8, 0xaf, 0x00}},
-		{2, [3]byte{0xd8, 0xb0, 0x00}}, {2, [3]byte{0xd8, 0xb1, 0x00}},
-		{2, [3]byte{0xd8, 0xb2, 0x00}}, {2, [3]byte{0xd8, 0xb3, 0x00}},
-		{2, [3]byte{0xd8, 0xb4, 0x00}}, {2, [3]byte{0xd8, 0xb5, 0x00}},
-		{2, [3]byte{0xd8, 0xb6, 0x00}}, {2, [3]byte{0xd8, 0xb7, 0x00}},
-		{2, [3]byte{0xd8, 0xb8, 0x00}}, {2, [3]byte{0xd8, 0xb9, 0x00}},
-		{2, [3]byte{0xd8, 0xba, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xd9, 0x80, 0x00}}, {2, [3]byte{0xd9, 0x81, 0x00}},
-		{2, [3]byte{0xd9, 0x82, 0x00}}, {2, [3]byte{0xd9, 0x83, 0x00}},
-		{2, [3]byte{0xd9, 0x84, 0x00}}, {2, [3]byte{0xd9, 0x85, 0x00}},
-		{2, [3]byte{0xd9, 0x86, 0x00}}, {2, [3]byte{0xd9, 0x87, 0x00}},
-		{2, [3]byte{0xd9, 0x88, 0x00}}, {2, [3]byte{0xd9, 0x89, 0x00}},
-		{2, [3]byte{0xd9, 0x8a, 0x00}}, {2, [3]byte{0xd9, 0x8b, 0x00}},
-		{2, [3]byte{0xd9, 0x8c, 0x00}}, {2, [3]byte{0xd9, 0x8d, 0x00}},
-		{2, [3]byte{0xd9, 0x8e, 0x00}}, {2, [3]byte{0xd9, 0x8f, 0x00}},
-		{2, [3]byte{0xd9, 0x90, 0x00}}, {2, [3]byte{0xd9, 0x91, 0x00}},
-		{2, [3]byte{0xd9, 0x92, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa40000a4, 0xad0000ad, 0xac00060c, 0xbb00061b, 0xbf00061f, 0xc1000621, 0xc2000622,
-		0xc3000623, 0xc4000624, 0xc5000625, 0xc6000626, 0xc7000627, 0xc8000628, 0xc9000629, 0xca00062a,
-		0xcb00062b, 0xcc00062c, 0xcd00062d, 0xce00062e, 0xcf00062f, 0xd0000630, 0xd1000631, 0xd2000632,
-		0xd3000633, 0xd4000634, 0xd5000635, 0xd6000636, 0xd7000637, 0xd8000638, 0xd9000639, 0xda00063a,
-		0xe0000640, 0xe1000641, 0xe2000642, 0xe3000643, 0xe4000644, 0xe5000645, 0xe6000646, 0xe7000647,
-		0xe8000648, 0xe9000649, 0xea00064a, 0xeb00064b, 0xec00064c, 0xed00064d, 0xee00064e, 0xef00064f,
-		0xf0000650, 0xf1000651, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
-		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
-		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
-		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
-		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
-		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
-		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
-		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
-		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
-		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
-	},
-}
-
-// ISO8859_7 is the ISO 8859-7 encoding.
-var ISO8859_7 *Charmap = &iso8859_7
-
-var iso8859_7 = Charmap{
-	name:          "ISO 8859-7",
-	mib:           identifier.ISOLatinGreek,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x98}},
-		{3, [3]byte{0xe2, 0x80, 0x99}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {3, [3]byte{0xe2, 0x82, 0xaf}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xcd, 0xba, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0x95}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xce, 0x84, 0x00}}, {2, [3]byte{0xce, 0x85, 0x00}},
-		{2, [3]byte{0xce, 0x86, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xce, 0x88, 0x00}}, {2, [3]byte{0xce, 0x89, 0x00}},
-		{2, [3]byte{0xce, 0x8a, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xce, 0x8c, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xce, 0x8e, 0x00}}, {2, [3]byte{0xce, 0x8f, 0x00}},
-		{2, [3]byte{0xce, 0x90, 0x00}}, {2, [3]byte{0xce, 0x91, 0x00}},
-		{2, [3]byte{0xce, 0x92, 0x00}}, {2, [3]byte{0xce, 0x93, 0x00}},
-		{2, [3]byte{0xce, 0x94, 0x00}}, {2, [3]byte{0xce, 0x95, 0x00}},
-		{2, [3]byte{0xce, 0x96, 0x00}}, {2, [3]byte{0xce, 0x97, 0x00}},
-		{2, [3]byte{0xce, 0x98, 0x00}}, {2, [3]byte{0xce, 0x99, 0x00}},
-		{2, [3]byte{0xce, 0x9a, 0x00}}, {2, [3]byte{0xce, 0x9b, 0x00}},
-		{2, [3]byte{0xce, 0x9c, 0x00}}, {2, [3]byte{0xce, 0x9d, 0x00}},
-		{2, [3]byte{0xce, 0x9e, 0x00}}, {2, [3]byte{0xce, 0x9f, 0x00}},
-		{2, [3]byte{0xce, 0xa0, 0x00}}, {2, [3]byte{0xce, 0xa1, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xce, 0xa3, 0x00}},
-		{2, [3]byte{0xce, 0xa4, 0x00}}, {2, [3]byte{0xce, 0xa5, 0x00}},
-		{2, [3]byte{0xce, 0xa6, 0x00}}, {2, [3]byte{0xce, 0xa7, 0x00}},
-		{2, [3]byte{0xce, 0xa8, 0x00}}, {2, [3]byte{0xce, 0xa9, 0x00}},
-		{2, [3]byte{0xce, 0xaa, 0x00}}, {2, [3]byte{0xce, 0xab, 0x00}},
-		{2, [3]byte{0xce, 0xac, 0x00}}, {2, [3]byte{0xce, 0xad, 0x00}},
-		{2, [3]byte{0xce, 0xae, 0x00}}, {2, [3]byte{0xce, 0xaf, 0x00}},
-		{2, [3]byte{0xce, 0xb0, 0x00}}, {2, [3]byte{0xce, 0xb1, 0x00}},
-		{2, [3]byte{0xce, 0xb2, 0x00}}, {2, [3]byte{0xce, 0xb3, 0x00}},
-		{2, [3]byte{0xce, 0xb4, 0x00}}, {2, [3]byte{0xce, 0xb5, 0x00}},
-		{2, [3]byte{0xce, 0xb6, 0x00}}, {2, [3]byte{0xce, 0xb7, 0x00}},
-		{2, [3]byte{0xce, 0xb8, 0x00}}, {2, [3]byte{0xce, 0xb9, 0x00}},
-		{2, [3]byte{0xce, 0xba, 0x00}}, {2, [3]byte{0xce, 0xbb, 0x00}},
-		{2, [3]byte{0xce, 0xbc, 0x00}}, {2, [3]byte{0xce, 0xbd, 0x00}},
-		{2, [3]byte{0xce, 0xbe, 0x00}}, {2, [3]byte{0xce, 0xbf, 0x00}},
-		{2, [3]byte{0xcf, 0x80, 0x00}}, {2, [3]byte{0xcf, 0x81, 0x00}},
-		{2, [3]byte{0xcf, 0x82, 0x00}}, {2, [3]byte{0xcf, 0x83, 0x00}},
-		{2, [3]byte{0xcf, 0x84, 0x00}}, {2, [3]byte{0xcf, 0x85, 0x00}},
-		{2, [3]byte{0xcf, 0x86, 0x00}}, {2, [3]byte{0xcf, 0x87, 0x00}},
-		{2, [3]byte{0xcf, 0x88, 0x00}}, {2, [3]byte{0xcf, 0x89, 0x00}},
-		{2, [3]byte{0xcf, 0x8a, 0x00}}, {2, [3]byte{0xcf, 0x8b, 0x00}},
-		{2, [3]byte{0xcf, 0x8c, 0x00}}, {2, [3]byte{0xcf, 0x8d, 0x00}},
-		{2, [3]byte{0xcf, 0x8e, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa30000a3, 0xa60000a6, 0xa70000a7, 0xa80000a8, 0xa90000a9, 0xab0000ab, 0xac0000ac,
-		0xad0000ad, 0xb00000b0, 0xb10000b1, 0xb20000b2, 0xb30000b3, 0xb70000b7, 0xbb0000bb, 0xbd0000bd,
-		0xaa00037a, 0xb4000384, 0xb5000385, 0xb6000386, 0xb8000388, 0xb9000389, 0xba00038a, 0xbc00038c,
-		0xbe00038e, 0xbf00038f, 0xc0000390, 0xc1000391, 0xc2000392, 0xc3000393, 0xc4000394, 0xc5000395,
-		0xc6000396, 0xc7000397, 0xc8000398, 0xc9000399, 0xca00039a, 0xcb00039b, 0xcc00039c, 0xcd00039d,
-		0xce00039e, 0xcf00039f, 0xd00003a0, 0xd10003a1, 0xd30003a3, 0xd40003a4, 0xd50003a5, 0xd60003a6,
-		0xd70003a7, 0xd80003a8, 0xd90003a9, 0xda0003aa, 0xdb0003ab, 0xdc0003ac, 0xdd0003ad, 0xde0003ae,
-		0xdf0003af, 0xe00003b0, 0xe10003b1, 0xe20003b2, 0xe30003b3, 0xe40003b4, 0xe50003b5, 0xe60003b6,
-		0xe70003b7, 0xe80003b8, 0xe90003b9, 0xea0003ba, 0xeb0003bb, 0xec0003bc, 0xed0003bd, 0xee0003be,
-		0xef0003bf, 0xf00003c0, 0xf10003c1, 0xf20003c2, 0xf30003c3, 0xf40003c4, 0xf50003c5, 0xf60003c6,
-		0xf70003c7, 0xf80003c8, 0xf90003c9, 0xfa0003ca, 0xfb0003cb, 0xfc0003cc, 0xfd0003cd, 0xfe0003ce,
-		0xaf002015, 0xa1002018, 0xa2002019, 0xa40020ac, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af,
-		0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af,
-		0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af,
-		0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af,
-		0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af,
-	},
-}
-
-// ISO8859_8 is the ISO 8859-8 encoding.
-var ISO8859_8 *Charmap = &iso8859_8
-
-var iso8859_8 = Charmap{
-	name:          "ISO 8859-8",
-	mib:           identifier.ISOLatinHebrew,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xc2, 0xa5, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0x97, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc2, 0xaf, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xb7, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbe, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0x97}},
-		{2, [3]byte{0xd7, 0x90, 0x00}}, {2, [3]byte{0xd7, 0x91, 0x00}},
-		{2, [3]byte{0xd7, 0x92, 0x00}}, {2, [3]byte{0xd7, 0x93, 0x00}},
-		{2, [3]byte{0xd7, 0x94, 0x00}}, {2, [3]byte{0xd7, 0x95, 0x00}},
-		{2, [3]byte{0xd7, 0x96, 0x00}}, {2, [3]byte{0xd7, 0x97, 0x00}},
-		{2, [3]byte{0xd7, 0x98, 0x00}}, {2, [3]byte{0xd7, 0x99, 0x00}},
-		{2, [3]byte{0xd7, 0x9a, 0x00}}, {2, [3]byte{0xd7, 0x9b, 0x00}},
-		{2, [3]byte{0xd7, 0x9c, 0x00}}, {2, [3]byte{0xd7, 0x9d, 0x00}},
-		{2, [3]byte{0xd7, 0x9e, 0x00}}, {2, [3]byte{0xd7, 0x9f, 0x00}},
-		{2, [3]byte{0xd7, 0xa0, 0x00}}, {2, [3]byte{0xd7, 0xa1, 0x00}},
-		{2, [3]byte{0xd7, 0xa2, 0x00}}, {2, [3]byte{0xd7, 0xa3, 0x00}},
-		{2, [3]byte{0xd7, 0xa4, 0x00}}, {2, [3]byte{0xd7, 0xa5, 0x00}},
-		{2, [3]byte{0xd7, 0xa6, 0x00}}, {2, [3]byte{0xd7, 0xa7, 0x00}},
-		{2, [3]byte{0xd7, 0xa8, 0x00}}, {2, [3]byte{0xd7, 0xa9, 0x00}},
-		{2, [3]byte{0xd7, 0xaa, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0x8e}},
-		{3, [3]byte{0xe2, 0x80, 0x8f}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa20000a2, 0xa30000a3, 0xa40000a4, 0xa50000a5, 0xa60000a6, 0xa70000a7, 0xa80000a8,
-		0xa90000a9, 0xab0000ab, 0xac0000ac, 0xad0000ad, 0xae0000ae, 0xaf0000af, 0xb00000b0, 0xb10000b1,
-		0xb20000b2, 0xb30000b3, 0xb40000b4, 0xb50000b5, 0xb60000b6, 0xb70000b7, 0xb80000b8, 0xb90000b9,
-		0xbb0000bb, 0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xaa0000d7, 0xba0000f7, 0xe00005d0, 0xe10005d1,
-		0xe20005d2, 0xe30005d3, 0xe40005d4, 0xe50005d5, 0xe60005d6, 0xe70005d7, 0xe80005d8, 0xe90005d9,
-		0xea0005da, 0xeb0005db, 0xec0005dc, 0xed0005dd, 0xee0005de, 0xef0005df, 0xf00005e0, 0xf10005e1,
-		0xf20005e2, 0xf30005e3, 0xf40005e4, 0xf50005e5, 0xf60005e6, 0xf70005e7, 0xf80005e8, 0xf90005e9,
-		0xfa0005ea, 0xfd00200e, 0xfe00200f, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
-		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
-		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
-		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
-		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
-		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
-		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
-		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
-		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
-	},
-}
-
-// ISO8859_9 is the ISO 8859-9 encoding.
-var ISO8859_9 *Charmap = &iso8859_9
-
-var iso8859_9 = Charmap{
-	name:          "ISO 8859-9",
-	mib:           identifier.ISOLatin5,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc2, 0x80, 0x00}}, {2, [3]byte{0xc2, 0x81, 0x00}},
-		{2, [3]byte{0xc2, 0x82, 0x00}}, {2, [3]byte{0xc2, 0x83, 0x00}},
-		{2, [3]byte{0xc2, 0x84, 0x00}}, {2, [3]byte{0xc2, 0x85, 0x00}},
-		{2, [3]byte{0xc2, 0x86, 0x00}}, {2, [3]byte{0xc2, 0x87, 0x00}},
-		{2, [3]byte{0xc2, 0x88, 0x00}}, {2, [3]byte{0xc2, 0x89, 0x00}},
-		{2, [3]byte{0xc2, 0x8a, 0x00}}, {2, [3]byte{0xc2, 0x8b, 0x00}},
-		{2, [3]byte{0xc2, 0x8c, 0x00}}, {2, [3]byte{0xc2, 0x8d, 0x00}},
-		{2, [3]byte{0xc2, 0x8e, 0x00}}, {2, [3]byte{0xc2, 0x8f, 0x00}},
-		{2, [3]byte{0xc2, 0x90, 0x00}}, {2, [3]byte{0xc2, 0x91, 0x00}},
-		{2, [3]byte{0xc2, 0x92, 0x00}}, {2, [3]byte{0xc2, 0x93, 0x00}},
-		{2, [3]byte{0xc2, 0x94, 0x00}}, {2, [3]byte{0xc2, 0x95, 0x00}},
-		{2, [3]byte{0xc2, 0x96, 0x00}}, {2, [3]byte{0xc2, 0x97, 0x00}},
-		{2, [3]byte{0xc2, 0x98, 0x00}}, {2, [3]byte{0xc2, 0x99, 0x00}},
-		{2, [3]byte{0xc2, 0x9a, 0x00}}, {2, [3]byte{0xc2, 0x9b, 0x00}},
-		{2, [3]byte{0xc2, 0x9c, 0x00}}, {2, [3]byte{0xc2, 0x9d, 0x00}},
-		{2, [3]byte{0xc2, 0x9e, 0x00}}, {2, [3]byte{0xc2, 0x9f, 0x00}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xc2, 0xa5, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc2, 0xaf, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xc2, 0xba, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbe, 0x00}}, {2, [3]byte{0xc2, 0xbf, 0x00}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc4, 0x9e, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc3, 0x92, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc4, 0xb0, 0x00}},
-		{2, [3]byte{0xc5, 0x9e, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0xa3, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xac, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc4, 0x9f, 0x00}}, {2, [3]byte{0xc3, 0xb1, 0x00}},
-		{2, [3]byte{0xc3, 0xb2, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc4, 0xb1, 0x00}},
-		{2, [3]byte{0xc5, 0x9f, 0x00}}, {2, [3]byte{0xc3, 0xbf, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0x80000080, 0x81000081, 0x82000082, 0x83000083, 0x84000084, 0x85000085, 0x86000086, 0x87000087,
-		0x88000088, 0x89000089, 0x8a00008a, 0x8b00008b, 0x8c00008c, 0x8d00008d, 0x8e00008e, 0x8f00008f,
-		0x90000090, 0x91000091, 0x92000092, 0x93000093, 0x94000094, 0x95000095, 0x96000096, 0x97000097,
-		0x98000098, 0x99000099, 0x9a00009a, 0x9b00009b, 0x9c00009c, 0x9d00009d, 0x9e00009e, 0x9f00009f,
-		0xa00000a0, 0xa10000a1, 0xa20000a2, 0xa30000a3, 0xa40000a4, 0xa50000a5, 0xa60000a6, 0xa70000a7,
-		0xa80000a8, 0xa90000a9, 0xaa0000aa, 0xab0000ab, 0xac0000ac, 0xad0000ad, 0xae0000ae, 0xaf0000af,
-		0xb00000b0, 0xb10000b1, 0xb20000b2, 0xb30000b3, 0xb40000b4, 0xb50000b5, 0xb60000b6, 0xb70000b7,
-		0xb80000b8, 0xb90000b9, 0xba0000ba, 0xbb0000bb, 0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xbf0000bf,
-		0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7,
-		0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
-		0xd10000d1, 0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd70000d7, 0xd80000d8,
-		0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2,
-		0xe30000e3, 0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7, 0xe80000e8, 0xe90000e9, 0xea0000ea,
-		0xeb0000eb, 0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf10000f1, 0xf20000f2, 0xf30000f3,
-		0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf70000f7, 0xf80000f8, 0xf90000f9, 0xfa0000fa, 0xfb0000fb,
-		0xfc0000fc, 0xff0000ff, 0xd000011e, 0xf000011f, 0xdd000130, 0xfd000131, 0xde00015e, 0xfe00015f,
-	},
-}
-
-// ISO8859_10 is the ISO 8859-10 encoding.
-var ISO8859_10 *Charmap = &iso8859_10
-
-var iso8859_10 = Charmap{
-	name:          "ISO 8859-10",
-	mib:           identifier.ISOLatin6,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc4, 0x84, 0x00}},
-		{2, [3]byte{0xc4, 0x92, 0x00}}, {2, [3]byte{0xc4, 0xa2, 0x00}},
-		{2, [3]byte{0xc4, 0xaa, 0x00}}, {2, [3]byte{0xc4, 0xa8, 0x00}},
-		{2, [3]byte{0xc4, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc4, 0xbb, 0x00}}, {2, [3]byte{0xc4, 0x90, 0x00}},
-		{2, [3]byte{0xc5, 0xa0, 0x00}}, {2, [3]byte{0xc5, 0xa6, 0x00}},
-		{2, [3]byte{0xc5, 0xbd, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc5, 0xaa, 0x00}}, {2, [3]byte{0xc5, 0x8a, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc4, 0x85, 0x00}},
-		{2, [3]byte{0xc4, 0x93, 0x00}}, {2, [3]byte{0xc4, 0xa3, 0x00}},
-		{2, [3]byte{0xc4, 0xab, 0x00}}, {2, [3]byte{0xc4, 0xa9, 0x00}},
-		{2, [3]byte{0xc4, 0xb7, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc4, 0xbc, 0x00}}, {2, [3]byte{0xc4, 0x91, 0x00}},
-		{2, [3]byte{0xc5, 0xa1, 0x00}}, {2, [3]byte{0xc5, 0xa7, 0x00}},
-		{2, [3]byte{0xc5, 0xbe, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x95}},
-		{2, [3]byte{0xc5, 0xab, 0x00}}, {2, [3]byte{0xc5, 0x8b, 0x00}},
-		{2, [3]byte{0xc4, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc4, 0xae, 0x00}},
-		{2, [3]byte{0xc4, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc4, 0x98, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc4, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc3, 0x90, 0x00}}, {2, [3]byte{0xc5, 0x85, 0x00}},
-		{2, [3]byte{0xc5, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc5, 0xa8, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {2, [3]byte{0xc5, 0xb2, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0x9d, 0x00}},
-		{2, [3]byte{0xc3, 0x9e, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc4, 0x81, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0xa3, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc4, 0xaf, 0x00}},
-		{2, [3]byte{0xc4, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc4, 0x99, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc4, 0x97, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xb0, 0x00}}, {2, [3]byte{0xc5, 0x86, 0x00}},
-		{2, [3]byte{0xc5, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc5, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc5, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc3, 0xbd, 0x00}},
-		{2, [3]byte{0xc3, 0xbe, 0x00}}, {2, [3]byte{0xc4, 0xb8, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa70000a7, 0xad0000ad, 0xb00000b0, 0xb70000b7, 0xc10000c1, 0xc20000c2, 0xc30000c3,
-		0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc90000c9, 0xcb0000cb, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
-		0xd00000d0, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd80000d8, 0xda0000da, 0xdb0000db,
-		0xdc0000dc, 0xdd0000dd, 0xde0000de, 0xdf0000df, 0xe10000e1, 0xe20000e2, 0xe30000e3, 0xe40000e4,
-		0xe50000e5, 0xe60000e6, 0xe90000e9, 0xeb0000eb, 0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf00000f0,
-		0xf30000f3, 0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf80000f8, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc,
-		0xfd0000fd, 0xfe0000fe, 0xc0000100, 0xe0000101, 0xa1000104, 0xb1000105, 0xc800010c, 0xe800010d,
-		0xa9000110, 0xb9000111, 0xa2000112, 0xb2000113, 0xcc000116, 0xec000117, 0xca000118, 0xea000119,
-		0xa3000122, 0xb3000123, 0xa5000128, 0xb5000129, 0xa400012a, 0xb400012b, 0xc700012e, 0xe700012f,
-		0xa6000136, 0xb6000137, 0xff000138, 0xa800013b, 0xb800013c, 0xd1000145, 0xf1000146, 0xaf00014a,
-		0xbf00014b, 0xd200014c, 0xf200014d, 0xaa000160, 0xba000161, 0xab000166, 0xbb000167, 0xd7000168,
-		0xf7000169, 0xae00016a, 0xbe00016b, 0xd9000172, 0xf9000173, 0xac00017d, 0xbc00017e, 0xbd002015,
-		0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015,
-		0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015,
-		0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015,
-		0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015,
-	},
-}
-
-// ISO8859_13 is the ISO 8859-13 encoding.
-var ISO8859_13 *Charmap = &iso8859_13
-
-var iso8859_13 = Charmap{
-	name:          "ISO 8859-13",
-	mib:           identifier.ISO885913,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x9d}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x9e}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xc5, 0x96, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc3, 0x86, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x9c}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xc5, 0x97, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbe, 0x00}}, {2, [3]byte{0xc3, 0xa6, 0x00}},
-		{2, [3]byte{0xc4, 0x84, 0x00}}, {2, [3]byte{0xc4, 0xae, 0x00}},
-		{2, [3]byte{0xc4, 0x80, 0x00}}, {2, [3]byte{0xc4, 0x86, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc4, 0x98, 0x00}}, {2, [3]byte{0xc4, 0x92, 0x00}},
-		{2, [3]byte{0xc4, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc5, 0xb9, 0x00}}, {2, [3]byte{0xc4, 0x96, 0x00}},
-		{2, [3]byte{0xc4, 0xa2, 0x00}}, {2, [3]byte{0xc4, 0xb6, 0x00}},
-		{2, [3]byte{0xc4, 0xaa, 0x00}}, {2, [3]byte{0xc4, 0xbb, 0x00}},
-		{2, [3]byte{0xc5, 0xa0, 0x00}}, {2, [3]byte{0xc5, 0x83, 0x00}},
-		{2, [3]byte{0xc5, 0x85, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc5, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xc5, 0xb2, 0x00}}, {2, [3]byte{0xc5, 0x81, 0x00}},
-		{2, [3]byte{0xc5, 0x9a, 0x00}}, {2, [3]byte{0xc5, 0xaa, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc5, 0xbb, 0x00}},
-		{2, [3]byte{0xc5, 0xbd, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc4, 0x85, 0x00}}, {2, [3]byte{0xc4, 0xaf, 0x00}},
-		{2, [3]byte{0xc4, 0x81, 0x00}}, {2, [3]byte{0xc4, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc4, 0x99, 0x00}}, {2, [3]byte{0xc4, 0x93, 0x00}},
-		{2, [3]byte{0xc4, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc5, 0xba, 0x00}}, {2, [3]byte{0xc4, 0x97, 0x00}},
-		{2, [3]byte{0xc4, 0xa3, 0x00}}, {2, [3]byte{0xc4, 0xb7, 0x00}},
-		{2, [3]byte{0xc4, 0xab, 0x00}}, {2, [3]byte{0xc4, 0xbc, 0x00}},
-		{2, [3]byte{0xc5, 0xa1, 0x00}}, {2, [3]byte{0xc5, 0x84, 0x00}},
-		{2, [3]byte{0xc5, 0x86, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc5, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xc5, 0xb3, 0x00}}, {2, [3]byte{0xc5, 0x82, 0x00}},
-		{2, [3]byte{0xc5, 0x9b, 0x00}}, {2, [3]byte{0xc5, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc5, 0xbc, 0x00}},
-		{2, [3]byte{0xc5, 0xbe, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x99}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa20000a2, 0xa30000a3, 0xa40000a4, 0xa60000a6, 0xa70000a7, 0xa90000a9, 0xab0000ab,
-		0xac0000ac, 0xad0000ad, 0xae0000ae, 0xb00000b0, 0xb10000b1, 0xb20000b2, 0xb30000b3, 0xb50000b5,
-		0xb60000b6, 0xb70000b7, 0xb90000b9, 0xbb0000bb, 0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xc40000c4,
-		0xc50000c5, 0xaf0000c6, 0xc90000c9, 0xd30000d3, 0xd50000d5, 0xd60000d6, 0xd70000d7, 0xa80000d8,
-		0xdc0000dc, 0xdf0000df, 0xe40000e4, 0xe50000e5, 0xbf0000e6, 0xe90000e9, 0xf30000f3, 0xf50000f5,
-		0xf60000f6, 0xf70000f7, 0xb80000f8, 0xfc0000fc, 0xc2000100, 0xe2000101, 0xc0000104, 0xe0000105,
-		0xc3000106, 0xe3000107, 0xc800010c, 0xe800010d, 0xc7000112, 0xe7000113, 0xcb000116, 0xeb000117,
-		0xc6000118, 0xe6000119, 0xcc000122, 0xec000123, 0xce00012a, 0xee00012b, 0xc100012e, 0xe100012f,
-		0xcd000136, 0xed000137, 0xcf00013b, 0xef00013c, 0xd9000141, 0xf9000142, 0xd1000143, 0xf1000144,
-		0xd2000145, 0xf2000146, 0xd400014c, 0xf400014d, 0xaa000156, 0xba000157, 0xda00015a, 0xfa00015b,
-		0xd0000160, 0xf0000161, 0xdb00016a, 0xfb00016b, 0xd8000172, 0xf8000173, 0xca000179, 0xea00017a,
-		0xdd00017b, 0xfd00017c, 0xde00017d, 0xfe00017e, 0xff002019, 0xb400201c, 0xa100201d, 0xa500201e,
-		0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e,
-		0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e,
-		0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e,
-		0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e,
-	},
-}
-
-// ISO8859_14 is the ISO 8859-14 encoding.
-var ISO8859_14 *Charmap = &iso8859_14
-
-var iso8859_14 = Charmap{
-	name:          "ISO 8859-14",
-	mib:           identifier.ISO885914,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {3, [3]byte{0xe1, 0xb8, 0x82}},
-		{3, [3]byte{0xe1, 0xb8, 0x83}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc4, 0x8a, 0x00}}, {2, [3]byte{0xc4, 0x8b, 0x00}},
-		{3, [3]byte{0xe1, 0xb8, 0x8a}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{3, [3]byte{0xe1, 0xba, 0x80}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{3, [3]byte{0xe1, 0xba, 0x82}}, {3, [3]byte{0xe1, 0xb8, 0x8b}},
-		{3, [3]byte{0xe1, 0xbb, 0xb2}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc5, 0xb8, 0x00}},
-		{3, [3]byte{0xe1, 0xb8, 0x9e}}, {3, [3]byte{0xe1, 0xb8, 0x9f}},
-		{2, [3]byte{0xc4, 0xa0, 0x00}}, {2, [3]byte{0xc4, 0xa1, 0x00}},
-		{3, [3]byte{0xe1, 0xb9, 0x80}}, {3, [3]byte{0xe1, 0xb9, 0x81}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {3, [3]byte{0xe1, 0xb9, 0x96}},
-		{3, [3]byte{0xe1, 0xba, 0x81}}, {3, [3]byte{0xe1, 0xb9, 0x97}},
-		{3, [3]byte{0xe1, 0xba, 0x83}}, {3, [3]byte{0xe1, 0xb9, 0xa0}},
-		{3, [3]byte{0xe1, 0xbb, 0xb3}}, {3, [3]byte{0xe1, 0xba, 0x84}},
-		{3, [3]byte{0xe1, 0xba, 0x85}}, {3, [3]byte{0xe1, 0xb9, 0xa1}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc5, 0xb4, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc3, 0x92, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {3, [3]byte{0xe1, 0xb9, 0xaa}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0x9d, 0x00}},
-		{2, [3]byte{0xc5, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0xa3, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xac, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc5, 0xb5, 0x00}}, {2, [3]byte{0xc3, 0xb1, 0x00}},
-		{2, [3]byte{0xc3, 0xb2, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {3, [3]byte{0xe1, 0xb9, 0xab}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc3, 0xbd, 0x00}},
-		{2, [3]byte{0xc5, 0xb7, 0x00}}, {2, [3]byte{0xc3, 0xbf, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa30000a3, 0xa70000a7, 0xa90000a9, 0xad0000ad, 0xae0000ae, 0xb60000b6, 0xc00000c0,
-		0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7, 0xc80000c8,
-		0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf, 0xd10000d1,
-		0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd80000d8, 0xd90000d9, 0xda0000da,
-		0xdb0000db, 0xdc0000dc, 0xdd0000dd, 0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe30000e3,
-		0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7, 0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb,
-		0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf10000f1, 0xf20000f2, 0xf30000f3, 0xf40000f4,
-		0xf50000f5, 0xf60000f6, 0xf80000f8, 0xf90000f9, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc, 0xfd0000fd,
-		0xff0000ff, 0xa400010a, 0xa500010b, 0xb2000120, 0xb3000121, 0xd0000174, 0xf0000175, 0xde000176,
-		0xfe000177, 0xaf000178, 0xa1001e02, 0xa2001e03, 0xa6001e0a, 0xab001e0b, 0xb0001e1e, 0xb1001e1f,
-		0xb4001e40, 0xb5001e41, 0xb7001e56, 0xb9001e57, 0xbb001e60, 0xbf001e61, 0xd7001e6a, 0xf7001e6b,
-		0xa8001e80, 0xb8001e81, 0xaa001e82, 0xba001e83, 0xbd001e84, 0xbe001e85, 0xac001ef2, 0xbc001ef3,
-		0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3,
-		0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3,
-		0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3,
-		0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3,
-	},
-}
-
-// ISO8859_15 is the ISO 8859-15 encoding.
-var ISO8859_15 *Charmap = &iso8859_15
-
-var iso8859_15 = Charmap{
-	name:          "ISO 8859-15",
-	mib:           identifier.ISO885915,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {2, [3]byte{0xc2, 0xa5, 0x00}},
-		{2, [3]byte{0xc5, 0xa0, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc5, 0xa1, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc2, 0xaf, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xc5, 0xbd, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc5, 0xbe, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xc2, 0xba, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc5, 0x92, 0x00}}, {2, [3]byte{0xc5, 0x93, 0x00}},
-		{2, [3]byte{0xc5, 0xb8, 0x00}}, {2, [3]byte{0xc2, 0xbf, 0x00}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc3, 0x90, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc3, 0x92, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0x9d, 0x00}},
-		{2, [3]byte{0xc3, 0x9e, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0xa3, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xac, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xb0, 0x00}}, {2, [3]byte{0xc3, 0xb1, 0x00}},
-		{2, [3]byte{0xc3, 0xb2, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc3, 0xbd, 0x00}},
-		{2, [3]byte{0xc3, 0xbe, 0x00}}, {2, [3]byte{0xc3, 0xbf, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa10000a1, 0xa20000a2, 0xa30000a3, 0xa50000a5, 0xa70000a7, 0xa90000a9, 0xaa0000aa,
-		0xab0000ab, 0xac0000ac, 0xad0000ad, 0xae0000ae, 0xaf0000af, 0xb00000b0, 0xb10000b1, 0xb20000b2,
-		0xb30000b3, 0xb50000b5, 0xb60000b6, 0xb70000b7, 0xb90000b9, 0xba0000ba, 0xbb0000bb, 0xbf0000bf,
-		0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7,
-		0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
-		0xd00000d0, 0xd10000d1, 0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd70000d7,
-		0xd80000d8, 0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdd0000dd, 0xde0000de, 0xdf0000df,
-		0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe30000e3, 0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7,
-		0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef,
-		0xf00000f0, 0xf10000f1, 0xf20000f2, 0xf30000f3, 0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf70000f7,
-		0xf80000f8, 0xf90000f9, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc, 0xfd0000fd, 0xfe0000fe, 0xff0000ff,
-		0xbc000152, 0xbd000153, 0xa6000160, 0xa8000161, 0xbe000178, 0xb400017d, 0xb800017e, 0xa40020ac,
-		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
-		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
-		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
-		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
-	},
-}
-
-// ISO8859_16 is the ISO 8859-16 encoding.
-var ISO8859_16 *Charmap = &iso8859_16
-
-var iso8859_16 = Charmap{
-	name:          "ISO 8859-16",
-	mib:           identifier.ISO885916,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc4, 0x84, 0x00}},
-		{2, [3]byte{0xc4, 0x85, 0x00}}, {2, [3]byte{0xc5, 0x81, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {3, [3]byte{0xe2, 0x80, 0x9e}},
-		{2, [3]byte{0xc5, 0xa0, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc5, 0xa1, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xc8, 0x98, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc5, 0xb9, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc5, 0xba, 0x00}}, {2, [3]byte{0xc5, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc4, 0x8c, 0x00}}, {2, [3]byte{0xc5, 0x82, 0x00}},
-		{2, [3]byte{0xc5, 0xbd, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x9d}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc5, 0xbe, 0x00}}, {2, [3]byte{0xc4, 0x8d, 0x00}},
-		{2, [3]byte{0xc8, 0x99, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc5, 0x92, 0x00}}, {2, [3]byte{0xc5, 0x93, 0x00}},
-		{2, [3]byte{0xc5, 0xb8, 0x00}}, {2, [3]byte{0xc5, 0xbc, 0x00}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc4, 0x82, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc4, 0x86, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc4, 0x90, 0x00}}, {2, [3]byte{0xc5, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0x92, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc5, 0x90, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc5, 0x9a, 0x00}},
-		{2, [3]byte{0xc5, 0xb0, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc4, 0x98, 0x00}},
-		{2, [3]byte{0xc8, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc4, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc4, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xac, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc4, 0x91, 0x00}}, {2, [3]byte{0xc5, 0x84, 0x00}},
-		{2, [3]byte{0xc3, 0xb2, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc5, 0x91, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc5, 0x9b, 0x00}},
-		{2, [3]byte{0xc5, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc4, 0x99, 0x00}},
-		{2, [3]byte{0xc8, 0x9b, 0x00}}, {2, [3]byte{0xc3, 0xbf, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa70000a7, 0xa90000a9, 0xab0000ab, 0xad0000ad, 0xb00000b0, 0xb10000b1, 0xb60000b6,
-		0xb70000b7, 0xbb0000bb, 0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc40000c4, 0xc60000c6, 0xc70000c7,
-		0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
-		0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd60000d6, 0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc,
-		0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe40000e4, 0xe60000e6, 0xe70000e7, 0xe80000e8,
-		0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf20000f2,
-		0xf30000f3, 0xf40000f4, 0xf60000f6, 0xf90000f9, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc, 0xff0000ff,
-		0xc3000102, 0xe3000103, 0xa1000104, 0xa2000105, 0xc5000106, 0xe5000107, 0xb200010c, 0xb900010d,
-		0xd0000110, 0xf0000111, 0xdd000118, 0xfd000119, 0xa3000141, 0xb3000142, 0xd1000143, 0xf1000144,
-		0xd5000150, 0xf5000151, 0xbc000152, 0xbd000153, 0xd700015a, 0xf700015b, 0xa6000160, 0xa8000161,
-		0xd8000170, 0xf8000171, 0xbe000178, 0xac000179, 0xae00017a, 0xaf00017b, 0xbf00017c, 0xb400017d,
-		0xb800017e, 0xaa000218, 0xba000219, 0xde00021a, 0xfe00021b, 0xb500201d, 0xa500201e, 0xa40020ac,
-		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
-		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
-		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
-		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
-	},
-}
-
-// KOI8R is the KOI8-R encoding.
-var KOI8R *Charmap = &koi8R
-
-var koi8R = Charmap{
-	name:          "KOI8-R",
-	mib:           identifier.KOI8R,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xe2, 0x94, 0x80}}, {3, [3]byte{0xe2, 0x94, 0x82}},
-		{3, [3]byte{0xe2, 0x94, 0x8c}}, {3, [3]byte{0xe2, 0x94, 0x90}},
-		{3, [3]byte{0xe2, 0x94, 0x94}}, {3, [3]byte{0xe2, 0x94, 0x98}},
-		{3, [3]byte{0xe2, 0x94, 0x9c}}, {3, [3]byte{0xe2, 0x94, 0xa4}},
-		{3, [3]byte{0xe2, 0x94, 0xac}}, {3, [3]byte{0xe2, 0x94, 0xb4}},
-		{3, [3]byte{0xe2, 0x94, 0xbc}}, {3, [3]byte{0xe2, 0x96, 0x80}},
-		{3, [3]byte{0xe2, 0x96, 0x84}}, {3, [3]byte{0xe2, 0x96, 0x88}},
-		{3, [3]byte{0xe2, 0x96, 0x8c}}, {3, [3]byte{0xe2, 0x96, 0x90}},
-		{3, [3]byte{0xe2, 0x96, 0x91}}, {3, [3]byte{0xe2, 0x96, 0x92}},
-		{3, [3]byte{0xe2, 0x96, 0x93}}, {3, [3]byte{0xe2, 0x8c, 0xa0}},
-		{3, [3]byte{0xe2, 0x96, 0xa0}}, {3, [3]byte{0xe2, 0x88, 0x99}},
-		{3, [3]byte{0xe2, 0x88, 0x9a}}, {3, [3]byte{0xe2, 0x89, 0x88}},
-		{3, [3]byte{0xe2, 0x89, 0xa4}}, {3, [3]byte{0xe2, 0x89, 0xa5}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {3, [3]byte{0xe2, 0x8c, 0xa1}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb2, 0x00}},
-		{2, [3]byte{0xc2, 0xb7, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{3, [3]byte{0xe2, 0x95, 0x90}}, {3, [3]byte{0xe2, 0x95, 0x91}},
-		{3, [3]byte{0xe2, 0x95, 0x92}}, {2, [3]byte{0xd1, 0x91, 0x00}},
-		{3, [3]byte{0xe2, 0x95, 0x93}}, {3, [3]byte{0xe2, 0x95, 0x94}},
-		{3, [3]byte{0xe2, 0x95, 0x95}}, {3, [3]byte{0xe2, 0x95, 0x96}},
-		{3, [3]byte{0xe2, 0x95, 0x97}}, {3, [3]byte{0xe2, 0x95, 0x98}},
-		{3, [3]byte{0xe2, 0x95, 0x99}}, {3, [3]byte{0xe2, 0x95, 0x9a}},
-		{3, [3]byte{0xe2, 0x95, 0x9b}}, {3, [3]byte{0xe2, 0x95, 0x9c}},
-		{3, [3]byte{0xe2, 0x95, 0x9d}}, {3, [3]byte{0xe2, 0x95, 0x9e}},
-		{3, [3]byte{0xe2, 0x95, 0x9f}}, {3, [3]byte{0xe2, 0x95, 0xa0}},
-		{3, [3]byte{0xe2, 0x95, 0xa1}}, {2, [3]byte{0xd0, 0x81, 0x00}},
-		{3, [3]byte{0xe2, 0x95, 0xa2}}, {3, [3]byte{0xe2, 0x95, 0xa3}},
-		{3, [3]byte{0xe2, 0x95, 0xa4}}, {3, [3]byte{0xe2, 0x95, 0xa5}},
-		{3, [3]byte{0xe2, 0x95, 0xa6}}, {3, [3]byte{0xe2, 0x95, 0xa7}},
-		{3, [3]byte{0xe2, 0x95, 0xa8}}, {3, [3]byte{0xe2, 0x95, 0xa9}},
-		{3, [3]byte{0xe2, 0x95, 0xaa}}, {3, [3]byte{0xe2, 0x95, 0xab}},
-		{3, [3]byte{0xe2, 0x95, 0xac}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xd1, 0x8e, 0x00}}, {2, [3]byte{0xd0, 0xb0, 0x00}},
-		{2, [3]byte{0xd0, 0xb1, 0x00}}, {2, [3]byte{0xd1, 0x86, 0x00}},
-		{2, [3]byte{0xd0, 0xb4, 0x00}}, {2, [3]byte{0xd0, 0xb5, 0x00}},
-		{2, [3]byte{0xd1, 0x84, 0x00}}, {2, [3]byte{0xd0, 0xb3, 0x00}},
-		{2, [3]byte{0xd1, 0x85, 0x00}}, {2, [3]byte{0xd0, 0xb8, 0x00}},
-		{2, [3]byte{0xd0, 0xb9, 0x00}}, {2, [3]byte{0xd0, 0xba, 0x00}},
-		{2, [3]byte{0xd0, 0xbb, 0x00}}, {2, [3]byte{0xd0, 0xbc, 0x00}},
-		{2, [3]byte{0xd0, 0xbd, 0x00}}, {2, [3]byte{0xd0, 0xbe, 0x00}},
-		{2, [3]byte{0xd0, 0xbf, 0x00}}, {2, [3]byte{0xd1, 0x8f, 0x00}},
-		{2, [3]byte{0xd1, 0x80, 0x00}}, {2, [3]byte{0xd1, 0x81, 0x00}},
-		{2, [3]byte{0xd1, 0x82, 0x00}}, {2, [3]byte{0xd1, 0x83, 0x00}},
-		{2, [3]byte{0xd0, 0xb6, 0x00}}, {2, [3]byte{0xd0, 0xb2, 0x00}},
-		{2, [3]byte{0xd1, 0x8c, 0x00}}, {2, [3]byte{0xd1, 0x8b, 0x00}},
-		{2, [3]byte{0xd0, 0xb7, 0x00}}, {2, [3]byte{0xd1, 0x88, 0x00}},
-		{2, [3]byte{0xd1, 0x8d, 0x00}}, {2, [3]byte{0xd1, 0x89, 0x00}},
-		{2, [3]byte{0xd1, 0x87, 0x00}}, {2, [3]byte{0xd1, 0x8a, 0x00}},
-		{2, [3]byte{0xd0, 0xae, 0x00}}, {2, [3]byte{0xd0, 0x90, 0x00}},
-		{2, [3]byte{0xd0, 0x91, 0x00}}, {2, [3]byte{0xd0, 0xa6, 0x00}},
-		{2, [3]byte{0xd0, 0x94, 0x00}}, {2, [3]byte{0xd0, 0x95, 0x00}},
-		{2, [3]byte{0xd0, 0xa4, 0x00}}, {2, [3]byte{0xd0, 0x93, 0x00}},
-		{2, [3]byte{0xd0, 0xa5, 0x00}}, {2, [3]byte{0xd0, 0x98, 0x00}},
-		{2, [3]byte{0xd0, 0x99, 0x00}}, {2, [3]byte{0xd0, 0x9a, 0x00}},
-		{2, [3]byte{0xd0, 0x9b, 0x00}}, {2, [3]byte{0xd0, 0x9c, 0x00}},
-		{2, [3]byte{0xd0, 0x9d, 0x00}}, {2, [3]byte{0xd0, 0x9e, 0x00}},
-		{2, [3]byte{0xd0, 0x9f, 0x00}}, {2, [3]byte{0xd0, 0xaf, 0x00}},
-		{2, [3]byte{0xd0, 0xa0, 0x00}}, {2, [3]byte{0xd0, 0xa1, 0x00}},
-		{2, [3]byte{0xd0, 0xa2, 0x00}}, {2, [3]byte{0xd0, 0xa3, 0x00}},
-		{2, [3]byte{0xd0, 0x96, 0x00}}, {2, [3]byte{0xd0, 0x92, 0x00}},
-		{2, [3]byte{0xd0, 0xac, 0x00}}, {2, [3]byte{0xd0, 0xab, 0x00}},
-		{2, [3]byte{0xd0, 0x97, 0x00}}, {2, [3]byte{0xd0, 0xa8, 0x00}},
-		{2, [3]byte{0xd0, 0xad, 0x00}}, {2, [3]byte{0xd0, 0xa9, 0x00}},
-		{2, [3]byte{0xd0, 0xa7, 0x00}}, {2, [3]byte{0xd0, 0xaa, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0x9a0000a0, 0xbf0000a9, 0x9c0000b0, 0x9d0000b2, 0x9e0000b7, 0x9f0000f7, 0xb3000401, 0xe1000410,
-		0xe2000411, 0xf7000412, 0xe7000413, 0xe4000414, 0xe5000415, 0xf6000416, 0xfa000417, 0xe9000418,
-		0xea000419, 0xeb00041a, 0xec00041b, 0xed00041c, 0xee00041d, 0xef00041e, 0xf000041f, 0xf2000420,
-		0xf3000421, 0xf4000422, 0xf5000423, 0xe6000424, 0xe8000425, 0xe3000426, 0xfe000427, 0xfb000428,
-		0xfd000429, 0xff00042a, 0xf900042b, 0xf800042c, 0xfc00042d, 0xe000042e, 0xf100042f, 0xc1000430,
-		0xc2000431, 0xd7000432, 0xc7000433, 0xc4000434, 0xc5000435, 0xd6000436, 0xda000437, 0xc9000438,
-		0xca000439, 0xcb00043a, 0xcc00043b, 0xcd00043c, 0xce00043d, 0xcf00043e, 0xd000043f, 0xd2000440,
-		0xd3000441, 0xd4000442, 0xd5000443, 0xc6000444, 0xc8000445, 0xc3000446, 0xde000447, 0xdb000448,
-		0xdd000449, 0xdf00044a, 0xd900044b, 0xd800044c, 0xdc00044d, 0xc000044e, 0xd100044f, 0xa3000451,
-		0x95002219, 0x9600221a, 0x97002248, 0x98002264, 0x99002265, 0x93002320, 0x9b002321, 0x80002500,
-		0x81002502, 0x8200250c, 0x83002510, 0x84002514, 0x85002518, 0x8600251c, 0x87002524, 0x8800252c,
-		0x89002534, 0x8a00253c, 0xa0002550, 0xa1002551, 0xa2002552, 0xa4002553, 0xa5002554, 0xa6002555,
-		0xa7002556, 0xa8002557, 0xa9002558, 0xaa002559, 0xab00255a, 0xac00255b, 0xad00255c, 0xae00255d,
-		0xaf00255e, 0xb000255f, 0xb1002560, 0xb2002561, 0xb4002562, 0xb5002563, 0xb6002564, 0xb7002565,
-		0xb8002566, 0xb9002567, 0xba002568, 0xbb002569, 0xbc00256a, 0xbd00256b, 0xbe00256c, 0x8b002580,
-		0x8c002584, 0x8d002588, 0x8e00258c, 0x8f002590, 0x90002591, 0x91002592, 0x92002593, 0x940025a0,
-	},
-}
-
-// KOI8U is the KOI8-U encoding.
-var KOI8U *Charmap = &koi8U
-
-var koi8U = Charmap{
-	name:          "KOI8-U",
-	mib:           identifier.KOI8U,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xe2, 0x94, 0x80}}, {3, [3]byte{0xe2, 0x94, 0x82}},
-		{3, [3]byte{0xe2, 0x94, 0x8c}}, {3, [3]byte{0xe2, 0x94, 0x90}},
-		{3, [3]byte{0xe2, 0x94, 0x94}}, {3, [3]byte{0xe2, 0x94, 0x98}},
-		{3, [3]byte{0xe2, 0x94, 0x9c}}, {3, [3]byte{0xe2, 0x94, 0xa4}},
-		{3, [3]byte{0xe2, 0x94, 0xac}}, {3, [3]byte{0xe2, 0x94, 0xb4}},
-		{3, [3]byte{0xe2, 0x94, 0xbc}}, {3, [3]byte{0xe2, 0x96, 0x80}},
-		{3, [3]byte{0xe2, 0x96, 0x84}}, {3, [3]byte{0xe2, 0x96, 0x88}},
-		{3, [3]byte{0xe2, 0x96, 0x8c}}, {3, [3]byte{0xe2, 0x96, 0x90}},
-		{3, [3]byte{0xe2, 0x96, 0x91}}, {3, [3]byte{0xe2, 0x96, 0x92}},
-		{3, [3]byte{0xe2, 0x96, 0x93}}, {3, [3]byte{0xe2, 0x8c, 0xa0}},
-		{3, [3]byte{0xe2, 0x96, 0xa0}}, {3, [3]byte{0xe2, 0x88, 0x99}},
-		{3, [3]byte{0xe2, 0x88, 0x9a}}, {3, [3]byte{0xe2, 0x89, 0x88}},
-		{3, [3]byte{0xe2, 0x89, 0xa4}}, {3, [3]byte{0xe2, 0x89, 0xa5}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {3, [3]byte{0xe2, 0x8c, 0xa1}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb2, 0x00}},
-		{2, [3]byte{0xc2, 0xb7, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{3, [3]byte{0xe2, 0x95, 0x90}}, {3, [3]byte{0xe2, 0x95, 0x91}},
-		{3, [3]byte{0xe2, 0x95, 0x92}}, {2, [3]byte{0xd1, 0x91, 0x00}},
-		{2, [3]byte{0xd1, 0x94, 0x00}}, {3, [3]byte{0xe2, 0x95, 0x94}},
-		{2, [3]byte{0xd1, 0x96, 0x00}}, {2, [3]byte{0xd1, 0x97, 0x00}},
-		{3, [3]byte{0xe2, 0x95, 0x97}}, {3, [3]byte{0xe2, 0x95, 0x98}},
-		{3, [3]byte{0xe2, 0x95, 0x99}}, {3, [3]byte{0xe2, 0x95, 0x9a}},
-		{3, [3]byte{0xe2, 0x95, 0x9b}}, {2, [3]byte{0xd2, 0x91, 0x00}},
-		{2, [3]byte{0xd1, 0x9e, 0x00}}, {3, [3]byte{0xe2, 0x95, 0x9e}},
-		{3, [3]byte{0xe2, 0x95, 0x9f}}, {3, [3]byte{0xe2, 0x95, 0xa0}},
-		{3, [3]byte{0xe2, 0x95, 0xa1}}, {2, [3]byte{0xd0, 0x81, 0x00}},
-		{2, [3]byte{0xd0, 0x84, 0x00}}, {3, [3]byte{0xe2, 0x95, 0xa3}},
-		{2, [3]byte{0xd0, 0x86, 0x00}}, {2, [3]byte{0xd0, 0x87, 0x00}},
-		{3, [3]byte{0xe2, 0x95, 0xa6}}, {3, [3]byte{0xe2, 0x95, 0xa7}},
-		{3, [3]byte{0xe2, 0x95, 0xa8}}, {3, [3]byte{0xe2, 0x95, 0xa9}},
-		{3, [3]byte{0xe2, 0x95, 0xaa}}, {2, [3]byte{0xd2, 0x90, 0x00}},
-		{2, [3]byte{0xd0, 0x8e, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xd1, 0x8e, 0x00}}, {2, [3]byte{0xd0, 0xb0, 0x00}},
-		{2, [3]byte{0xd0, 0xb1, 0x00}}, {2, [3]byte{0xd1, 0x86, 0x00}},
-		{2, [3]byte{0xd0, 0xb4, 0x00}}, {2, [3]byte{0xd0, 0xb5, 0x00}},
-		{2, [3]byte{0xd1, 0x84, 0x00}}, {2, [3]byte{0xd0, 0xb3, 0x00}},
-		{2, [3]byte{0xd1, 0x85, 0x00}}, {2, [3]byte{0xd0, 0xb8, 0x00}},
-		{2, [3]byte{0xd0, 0xb9, 0x00}}, {2, [3]byte{0xd0, 0xba, 0x00}},
-		{2, [3]byte{0xd0, 0xbb, 0x00}}, {2, [3]byte{0xd0, 0xbc, 0x00}},
-		{2, [3]byte{0xd0, 0xbd, 0x00}}, {2, [3]byte{0xd0, 0xbe, 0x00}},
-		{2, [3]byte{0xd0, 0xbf, 0x00}}, {2, [3]byte{0xd1, 0x8f, 0x00}},
-		{2, [3]byte{0xd1, 0x80, 0x00}}, {2, [3]byte{0xd1, 0x81, 0x00}},
-		{2, [3]byte{0xd1, 0x82, 0x00}}, {2, [3]byte{0xd1, 0x83, 0x00}},
-		{2, [3]byte{0xd0, 0xb6, 0x00}}, {2, [3]byte{0xd0, 0xb2, 0x00}},
-		{2, [3]byte{0xd1, 0x8c, 0x00}}, {2, [3]byte{0xd1, 0x8b, 0x00}},
-		{2, [3]byte{0xd0, 0xb7, 0x00}}, {2, [3]byte{0xd1, 0x88, 0x00}},
-		{2, [3]byte{0xd1, 0x8d, 0x00}}, {2, [3]byte{0xd1, 0x89, 0x00}},
-		{2, [3]byte{0xd1, 0x87, 0x00}}, {2, [3]byte{0xd1, 0x8a, 0x00}},
-		{2, [3]byte{0xd0, 0xae, 0x00}}, {2, [3]byte{0xd0, 0x90, 0x00}},
-		{2, [3]byte{0xd0, 0x91, 0x00}}, {2, [3]byte{0xd0, 0xa6, 0x00}},
-		{2, [3]byte{0xd0, 0x94, 0x00}}, {2, [3]byte{0xd0, 0x95, 0x00}},
-		{2, [3]byte{0xd0, 0xa4, 0x00}}, {2, [3]byte{0xd0, 0x93, 0x00}},
-		{2, [3]byte{0xd0, 0xa5, 0x00}}, {2, [3]byte{0xd0, 0x98, 0x00}},
-		{2, [3]byte{0xd0, 0x99, 0x00}}, {2, [3]byte{0xd0, 0x9a, 0x00}},
-		{2, [3]byte{0xd0, 0x9b, 0x00}}, {2, [3]byte{0xd0, 0x9c, 0x00}},
-		{2, [3]byte{0xd0, 0x9d, 0x00}}, {2, [3]byte{0xd0, 0x9e, 0x00}},
-		{2, [3]byte{0xd0, 0x9f, 0x00}}, {2, [3]byte{0xd0, 0xaf, 0x00}},
-		{2, [3]byte{0xd0, 0xa0, 0x00}}, {2, [3]byte{0xd0, 0xa1, 0x00}},
-		{2, [3]byte{0xd0, 0xa2, 0x00}}, {2, [3]byte{0xd0, 0xa3, 0x00}},
-		{2, [3]byte{0xd0, 0x96, 0x00}}, {2, [3]byte{0xd0, 0x92, 0x00}},
-		{2, [3]byte{0xd0, 0xac, 0x00}}, {2, [3]byte{0xd0, 0xab, 0x00}},
-		{2, [3]byte{0xd0, 0x97, 0x00}}, {2, [3]byte{0xd0, 0xa8, 0x00}},
-		{2, [3]byte{0xd0, 0xad, 0x00}}, {2, [3]byte{0xd0, 0xa9, 0x00}},
-		{2, [3]byte{0xd0, 0xa7, 0x00}}, {2, [3]byte{0xd0, 0xaa, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0x9a0000a0, 0xbf0000a9, 0x9c0000b0, 0x9d0000b2, 0x9e0000b7, 0x9f0000f7, 0xb3000401, 0xb4000404,
-		0xb6000406, 0xb7000407, 0xbe00040e, 0xe1000410, 0xe2000411, 0xf7000412, 0xe7000413, 0xe4000414,
-		0xe5000415, 0xf6000416, 0xfa000417, 0xe9000418, 0xea000419, 0xeb00041a, 0xec00041b, 0xed00041c,
-		0xee00041d, 0xef00041e, 0xf000041f, 0xf2000420, 0xf3000421, 0xf4000422, 0xf5000423, 0xe6000424,
-		0xe8000425, 0xe3000426, 0xfe000427, 0xfb000428, 0xfd000429, 0xff00042a, 0xf900042b, 0xf800042c,
-		0xfc00042d, 0xe000042e, 0xf100042f, 0xc1000430, 0xc2000431, 0xd7000432, 0xc7000433, 0xc4000434,
-		0xc5000435, 0xd6000436, 0xda000437, 0xc9000438, 0xca000439, 0xcb00043a, 0xcc00043b, 0xcd00043c,
-		0xce00043d, 0xcf00043e, 0xd000043f, 0xd2000440, 0xd3000441, 0xd4000442, 0xd5000443, 0xc6000444,
-		0xc8000445, 0xc3000446, 0xde000447, 0xdb000448, 0xdd000449, 0xdf00044a, 0xd900044b, 0xd800044c,
-		0xdc00044d, 0xc000044e, 0xd100044f, 0xa3000451, 0xa4000454, 0xa6000456, 0xa7000457, 0xae00045e,
-		0xbd000490, 0xad000491, 0x95002219, 0x9600221a, 0x97002248, 0x98002264, 0x99002265, 0x93002320,
-		0x9b002321, 0x80002500, 0x81002502, 0x8200250c, 0x83002510, 0x84002514, 0x85002518, 0x8600251c,
-		0x87002524, 0x8800252c, 0x89002534, 0x8a00253c, 0xa0002550, 0xa1002551, 0xa2002552, 0xa5002554,
-		0xa8002557, 0xa9002558, 0xaa002559, 0xab00255a, 0xac00255b, 0xaf00255e, 0xb000255f, 0xb1002560,
-		0xb2002561, 0xb5002563, 0xb8002566, 0xb9002567, 0xba002568, 0xbb002569, 0xbc00256a, 0x8b002580,
-		0x8c002584, 0x8d002588, 0x8e00258c, 0x8f002590, 0x90002591, 0x91002592, 0x92002593, 0x940025a0,
-	},
-}
-
-// Macintosh is the Macintosh encoding.
-var Macintosh *Charmap = &macintosh
-
-var macintosh = Charmap{
-	name:          "Macintosh",
-	mib:           identifier.Macintosh,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x87, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x91, 0x00}}, {2, [3]byte{0xc3, 0x96, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa2, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa3, 0x00}},
-		{2, [3]byte{0xc3, 0xa5, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xa9, 0x00}}, {2, [3]byte{0xc3, 0xa8, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xad, 0x00}}, {2, [3]byte{0xc3, 0xac, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xb1, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb2, 0x00}}, {2, [3]byte{0xc3, 0xb4, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xbb, 0x00}}, {2, [3]byte{0xc3, 0xbc, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0xa0}}, {2, [3]byte{0xc2, 0xb0, 0x00}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa7, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xa2}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{3, [3]byte{0xe2, 0x84, 0xa2}}, {2, [3]byte{0xc2, 0xb4, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {3, [3]byte{0xe2, 0x89, 0xa0}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0x98, 0x00}},
-		{3, [3]byte{0xe2, 0x88, 0x9e}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{3, [3]byte{0xe2, 0x89, 0xa4}}, {3, [3]byte{0xe2, 0x89, 0xa5}},
-		{2, [3]byte{0xc2, 0xa5, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{3, [3]byte{0xe2, 0x88, 0x82}}, {3, [3]byte{0xe2, 0x88, 0x91}},
-		{3, [3]byte{0xe2, 0x88, 0x8f}}, {2, [3]byte{0xcf, 0x80, 0x00}},
-		{3, [3]byte{0xe2, 0x88, 0xab}}, {2, [3]byte{0xc2, 0xaa, 0x00}},
-		{2, [3]byte{0xc2, 0xba, 0x00}}, {2, [3]byte{0xce, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc3, 0xb8, 0x00}},
-		{2, [3]byte{0xc2, 0xbf, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x9a}},
-		{2, [3]byte{0xc6, 0x92, 0x00}}, {3, [3]byte{0xe2, 0x89, 0x88}},
-		{3, [3]byte{0xe2, 0x88, 0x86}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xbb, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xa6}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0x80, 0x00}},
-		{2, [3]byte{0xc3, 0x83, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc5, 0x92, 0x00}}, {2, [3]byte{0xc5, 0x93, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x93}}, {3, [3]byte{0xe2, 0x80, 0x94}},
-		{3, [3]byte{0xe2, 0x80, 0x9c}}, {3, [3]byte{0xe2, 0x80, 0x9d}},
-		{3, [3]byte{0xe2, 0x80, 0x98}}, {3, [3]byte{0xe2, 0x80, 0x99}},
-		{2, [3]byte{0xc3, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x97, 0x8a}},
-		{2, [3]byte{0xc3, 0xbf, 0x00}}, {2, [3]byte{0xc5, 0xb8, 0x00}},
-		{3, [3]byte{0xe2, 0x81, 0x84}}, {3, [3]byte{0xe2, 0x82, 0xac}},
-		{3, [3]byte{0xe2, 0x80, 0xb9}}, {3, [3]byte{0xe2, 0x80, 0xba}},
-		{3, [3]byte{0xef, 0xac, 0x81}}, {3, [3]byte{0xef, 0xac, 0x82}},
-		{3, [3]byte{0xe2, 0x80, 0xa1}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x9a}}, {3, [3]byte{0xe2, 0x80, 0x9e}},
-		{3, [3]byte{0xe2, 0x80, 0xb0}}, {2, [3]byte{0xc3, 0x82, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x8b, 0x00}}, {2, [3]byte{0xc3, 0x88, 0x00}},
-		{2, [3]byte{0xc3, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0x8e, 0x00}},
-		{2, [3]byte{0xc3, 0x8f, 0x00}}, {2, [3]byte{0xc3, 0x8c, 0x00}},
-		{2, [3]byte{0xc3, 0x93, 0x00}}, {2, [3]byte{0xc3, 0x94, 0x00}},
-		{3, [3]byte{0xef, 0xa3, 0xbf}}, {2, [3]byte{0xc3, 0x92, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x99, 0x00}}, {2, [3]byte{0xc4, 0xb1, 0x00}},
-		{2, [3]byte{0xcb, 0x86, 0x00}}, {2, [3]byte{0xcb, 0x9c, 0x00}},
-		{2, [3]byte{0xc2, 0xaf, 0x00}}, {2, [3]byte{0xcb, 0x98, 0x00}},
-		{2, [3]byte{0xcb, 0x99, 0x00}}, {2, [3]byte{0xcb, 0x9a, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xcb, 0x9d, 0x00}},
-		{2, [3]byte{0xcb, 0x9b, 0x00}}, {2, [3]byte{0xcb, 0x87, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xca0000a0, 0xc10000a1, 0xa20000a2, 0xa30000a3, 0xb40000a5, 0xa40000a7, 0xac0000a8, 0xa90000a9,
-		0xbb0000aa, 0xc70000ab, 0xc20000ac, 0xa80000ae, 0xf80000af, 0xa10000b0, 0xb10000b1, 0xab0000b4,
-		0xb50000b5, 0xa60000b6, 0xe10000b7, 0xfc0000b8, 0xbc0000ba, 0xc80000bb, 0xc00000bf, 0xcb0000c0,
-		0xe70000c1, 0xe50000c2, 0xcc0000c3, 0x800000c4, 0x810000c5, 0xae0000c6, 0x820000c7, 0xe90000c8,
-		0x830000c9, 0xe60000ca, 0xe80000cb, 0xed0000cc, 0xea0000cd, 0xeb0000ce, 0xec0000cf, 0x840000d1,
-		0xf10000d2, 0xee0000d3, 0xef0000d4, 0xcd0000d5, 0x850000d6, 0xaf0000d8, 0xf40000d9, 0xf20000da,
-		0xf30000db, 0x860000dc, 0xa70000df, 0x880000e0, 0x870000e1, 0x890000e2, 0x8b0000e3, 0x8a0000e4,
-		0x8c0000e5, 0xbe0000e6, 0x8d0000e7, 0x8f0000e8, 0x8e0000e9, 0x900000ea, 0x910000eb, 0x930000ec,
-		0x920000ed, 0x940000ee, 0x950000ef, 0x960000f1, 0x980000f2, 0x970000f3, 0x990000f4, 0x9b0000f5,
-		0x9a0000f6, 0xd60000f7, 0xbf0000f8, 0x9d0000f9, 0x9c0000fa, 0x9e0000fb, 0x9f0000fc, 0xd80000ff,
-		0xf5000131, 0xce000152, 0xcf000153, 0xd9000178, 0xc4000192, 0xf60002c6, 0xff0002c7, 0xf90002d8,
-		0xfa0002d9, 0xfb0002da, 0xfe0002db, 0xf70002dc, 0xfd0002dd, 0xbd0003a9, 0xb90003c0, 0xd0002013,
-		0xd1002014, 0xd4002018, 0xd5002019, 0xe200201a, 0xd200201c, 0xd300201d, 0xe300201e, 0xa0002020,
-		0xe0002021, 0xa5002022, 0xc9002026, 0xe4002030, 0xdc002039, 0xdd00203a, 0xda002044, 0xdb0020ac,
-		0xaa002122, 0xb6002202, 0xc6002206, 0xb800220f, 0xb7002211, 0xc300221a, 0xb000221e, 0xba00222b,
-		0xc5002248, 0xad002260, 0xb2002264, 0xb3002265, 0xd70025ca, 0xf000f8ff, 0xde00fb01, 0xdf00fb02,
-	},
-}
-
-// MacintoshCyrillic is the Macintosh Cyrillic encoding.
-var MacintoshCyrillic *Charmap = &macintoshCyrillic
-
-var macintoshCyrillic = Charmap{
-	name:          "Macintosh Cyrillic",
-	mib:           identifier.MacintoshCyrillic,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xd0, 0x90, 0x00}}, {2, [3]byte{0xd0, 0x91, 0x00}},
-		{2, [3]byte{0xd0, 0x92, 0x00}}, {2, [3]byte{0xd0, 0x93, 0x00}},
-		{2, [3]byte{0xd0, 0x94, 0x00}}, {2, [3]byte{0xd0, 0x95, 0x00}},
-		{2, [3]byte{0xd0, 0x96, 0x00}}, {2, [3]byte{0xd0, 0x97, 0x00}},
-		{2, [3]byte{0xd0, 0x98, 0x00}}, {2, [3]byte{0xd0, 0x99, 0x00}},
-		{2, [3]byte{0xd0, 0x9a, 0x00}}, {2, [3]byte{0xd0, 0x9b, 0x00}},
-		{2, [3]byte{0xd0, 0x9c, 0x00}}, {2, [3]byte{0xd0, 0x9d, 0x00}},
-		{2, [3]byte{0xd0, 0x9e, 0x00}}, {2, [3]byte{0xd0, 0x9f, 0x00}},
-		{2, [3]byte{0xd0, 0xa0, 0x00}}, {2, [3]byte{0xd0, 0xa1, 0x00}},
-		{2, [3]byte{0xd0, 0xa2, 0x00}}, {2, [3]byte{0xd0, 0xa3, 0x00}},
-		{2, [3]byte{0xd0, 0xa4, 0x00}}, {2, [3]byte{0xd0, 0xa5, 0x00}},
-		{2, [3]byte{0xd0, 0xa6, 0x00}}, {2, [3]byte{0xd0, 0xa7, 0x00}},
-		{2, [3]byte{0xd0, 0xa8, 0x00}}, {2, [3]byte{0xd0, 0xa9, 0x00}},
-		{2, [3]byte{0xd0, 0xaa, 0x00}}, {2, [3]byte{0xd0, 0xab, 0x00}},
-		{2, [3]byte{0xd0, 0xac, 0x00}}, {2, [3]byte{0xd0, 0xad, 0x00}},
-		{2, [3]byte{0xd0, 0xae, 0x00}}, {2, [3]byte{0xd0, 0xaf, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0xa0}}, {2, [3]byte{0xc2, 0xb0, 0x00}},
-		{2, [3]byte{0xd2, 0x90, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa7, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xa2}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xd0, 0x86, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{3, [3]byte{0xe2, 0x84, 0xa2}}, {2, [3]byte{0xd0, 0x82, 0x00}},
-		{2, [3]byte{0xd1, 0x92, 0x00}}, {3, [3]byte{0xe2, 0x89, 0xa0}},
-		{2, [3]byte{0xd0, 0x83, 0x00}}, {2, [3]byte{0xd1, 0x93, 0x00}},
-		{3, [3]byte{0xe2, 0x88, 0x9e}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{3, [3]byte{0xe2, 0x89, 0xa4}}, {3, [3]byte{0xe2, 0x89, 0xa5}},
-		{2, [3]byte{0xd1, 0x96, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xd2, 0x91, 0x00}}, {2, [3]byte{0xd0, 0x88, 0x00}},
-		{2, [3]byte{0xd0, 0x84, 0x00}}, {2, [3]byte{0xd1, 0x94, 0x00}},
-		{2, [3]byte{0xd0, 0x87, 0x00}}, {2, [3]byte{0xd1, 0x97, 0x00}},
-		{2, [3]byte{0xd0, 0x89, 0x00}}, {2, [3]byte{0xd1, 0x99, 0x00}},
-		{2, [3]byte{0xd0, 0x8a, 0x00}}, {2, [3]byte{0xd1, 0x9a, 0x00}},
-		{2, [3]byte{0xd1, 0x98, 0x00}}, {2, [3]byte{0xd0, 0x85, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {3, [3]byte{0xe2, 0x88, 0x9a}},
-		{2, [3]byte{0xc6, 0x92, 0x00}}, {3, [3]byte{0xe2, 0x89, 0x88}},
-		{3, [3]byte{0xe2, 0x88, 0x86}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xbb, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xa6}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xd0, 0x8b, 0x00}},
-		{2, [3]byte{0xd1, 0x9b, 0x00}}, {2, [3]byte{0xd0, 0x8c, 0x00}},
-		{2, [3]byte{0xd1, 0x9c, 0x00}}, {2, [3]byte{0xd1, 0x95, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x93}}, {3, [3]byte{0xe2, 0x80, 0x94}},
-		{3, [3]byte{0xe2, 0x80, 0x9c}}, {3, [3]byte{0xe2, 0x80, 0x9d}},
-		{3, [3]byte{0xe2, 0x80, 0x98}}, {3, [3]byte{0xe2, 0x80, 0x99}},
-		{2, [3]byte{0xc3, 0xb7, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x9e}},
-		{2, [3]byte{0xd0, 0x8e, 0x00}}, {2, [3]byte{0xd1, 0x9e, 0x00}},
-		{2, [3]byte{0xd0, 0x8f, 0x00}}, {2, [3]byte{0xd1, 0x9f, 0x00}},
-		{3, [3]byte{0xe2, 0x84, 0x96}}, {2, [3]byte{0xd0, 0x81, 0x00}},
-		{2, [3]byte{0xd1, 0x91, 0x00}}, {2, [3]byte{0xd1, 0x8f, 0x00}},
-		{2, [3]byte{0xd0, 0xb0, 0x00}}, {2, [3]byte{0xd0, 0xb1, 0x00}},
-		{2, [3]byte{0xd0, 0xb2, 0x00}}, {2, [3]byte{0xd0, 0xb3, 0x00}},
-		{2, [3]byte{0xd0, 0xb4, 0x00}}, {2, [3]byte{0xd0, 0xb5, 0x00}},
-		{2, [3]byte{0xd0, 0xb6, 0x00}}, {2, [3]byte{0xd0, 0xb7, 0x00}},
-		{2, [3]byte{0xd0, 0xb8, 0x00}}, {2, [3]byte{0xd0, 0xb9, 0x00}},
-		{2, [3]byte{0xd0, 0xba, 0x00}}, {2, [3]byte{0xd0, 0xbb, 0x00}},
-		{2, [3]byte{0xd0, 0xbc, 0x00}}, {2, [3]byte{0xd0, 0xbd, 0x00}},
-		{2, [3]byte{0xd0, 0xbe, 0x00}}, {2, [3]byte{0xd0, 0xbf, 0x00}},
-		{2, [3]byte{0xd1, 0x80, 0x00}}, {2, [3]byte{0xd1, 0x81, 0x00}},
-		{2, [3]byte{0xd1, 0x82, 0x00}}, {2, [3]byte{0xd1, 0x83, 0x00}},
-		{2, [3]byte{0xd1, 0x84, 0x00}}, {2, [3]byte{0xd1, 0x85, 0x00}},
-		{2, [3]byte{0xd1, 0x86, 0x00}}, {2, [3]byte{0xd1, 0x87, 0x00}},
-		{2, [3]byte{0xd1, 0x88, 0x00}}, {2, [3]byte{0xd1, 0x89, 0x00}},
-		{2, [3]byte{0xd1, 0x8a, 0x00}}, {2, [3]byte{0xd1, 0x8b, 0x00}},
-		{2, [3]byte{0xd1, 0x8c, 0x00}}, {2, [3]byte{0xd1, 0x8d, 0x00}},
-		{2, [3]byte{0xd1, 0x8e, 0x00}}, {3, [3]byte{0xe2, 0x82, 0xac}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xca0000a0, 0xa30000a3, 0xa40000a7, 0xa90000a9, 0xc70000ab, 0xc20000ac, 0xa80000ae, 0xa10000b0,
-		0xb10000b1, 0xb50000b5, 0xa60000b6, 0xc80000bb, 0xd60000f7, 0xc4000192, 0xdd000401, 0xab000402,
-		0xae000403, 0xb8000404, 0xc1000405, 0xa7000406, 0xba000407, 0xb7000408, 0xbc000409, 0xbe00040a,
-		0xcb00040b, 0xcd00040c, 0xd800040e, 0xda00040f, 0x80000410, 0x81000411, 0x82000412, 0x83000413,
-		0x84000414, 0x85000415, 0x86000416, 0x87000417, 0x88000418, 0x89000419, 0x8a00041a, 0x8b00041b,
-		0x8c00041c, 0x8d00041d, 0x8e00041e, 0x8f00041f, 0x90000420, 0x91000421, 0x92000422, 0x93000423,
-		0x94000424, 0x95000425, 0x96000426, 0x97000427, 0x98000428, 0x99000429, 0x9a00042a, 0x9b00042b,
-		0x9c00042c, 0x9d00042d, 0x9e00042e, 0x9f00042f, 0xe0000430, 0xe1000431, 0xe2000432, 0xe3000433,
-		0xe4000434, 0xe5000435, 0xe6000436, 0xe7000437, 0xe8000438, 0xe9000439, 0xea00043a, 0xeb00043b,
-		0xec00043c, 0xed00043d, 0xee00043e, 0xef00043f, 0xf0000440, 0xf1000441, 0xf2000442, 0xf3000443,
-		0xf4000444, 0xf5000445, 0xf6000446, 0xf7000447, 0xf8000448, 0xf9000449, 0xfa00044a, 0xfb00044b,
-		0xfc00044c, 0xfd00044d, 0xfe00044e, 0xdf00044f, 0xde000451, 0xac000452, 0xaf000453, 0xb9000454,
-		0xcf000455, 0xb4000456, 0xbb000457, 0xc0000458, 0xbd000459, 0xbf00045a, 0xcc00045b, 0xce00045c,
-		0xd900045e, 0xdb00045f, 0xa2000490, 0xb6000491, 0xd0002013, 0xd1002014, 0xd4002018, 0xd5002019,
-		0xd200201c, 0xd300201d, 0xd700201e, 0xa0002020, 0xa5002022, 0xc9002026, 0xff0020ac, 0xdc002116,
-		0xaa002122, 0xc6002206, 0xc300221a, 0xb000221e, 0xc5002248, 0xad002260, 0xb2002264, 0xb3002265,
-	},
-}
-
-// Windows874 is the Windows 874 encoding.
-var Windows874 *Charmap = &windows874
-
-var windows874 = Charmap{
-	name:          "Windows 874",
-	mib:           identifier.Windows874,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0xa6}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0x98}},
-		{3, [3]byte{0xe2, 0x80, 0x99}}, {3, [3]byte{0xe2, 0x80, 0x9c}},
-		{3, [3]byte{0xe2, 0x80, 0x9d}}, {3, [3]byte{0xe2, 0x80, 0xa2}},
-		{3, [3]byte{0xe2, 0x80, 0x93}}, {3, [3]byte{0xe2, 0x80, 0x94}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {3, [3]byte{0xe0, 0xb8, 0x81}},
-		{3, [3]byte{0xe0, 0xb8, 0x82}}, {3, [3]byte{0xe0, 0xb8, 0x83}},
-		{3, [3]byte{0xe0, 0xb8, 0x84}}, {3, [3]byte{0xe0, 0xb8, 0x85}},
-		{3, [3]byte{0xe0, 0xb8, 0x86}}, {3, [3]byte{0xe0, 0xb8, 0x87}},
-		{3, [3]byte{0xe0, 0xb8, 0x88}}, {3, [3]byte{0xe0, 0xb8, 0x89}},
-		{3, [3]byte{0xe0, 0xb8, 0x8a}}, {3, [3]byte{0xe0, 0xb8, 0x8b}},
-		{3, [3]byte{0xe0, 0xb8, 0x8c}}, {3, [3]byte{0xe0, 0xb8, 0x8d}},
-		{3, [3]byte{0xe0, 0xb8, 0x8e}}, {3, [3]byte{0xe0, 0xb8, 0x8f}},
-		{3, [3]byte{0xe0, 0xb8, 0x90}}, {3, [3]byte{0xe0, 0xb8, 0x91}},
-		{3, [3]byte{0xe0, 0xb8, 0x92}}, {3, [3]byte{0xe0, 0xb8, 0x93}},
-		{3, [3]byte{0xe0, 0xb8, 0x94}}, {3, [3]byte{0xe0, 0xb8, 0x95}},
-		{3, [3]byte{0xe0, 0xb8, 0x96}}, {3, [3]byte{0xe0, 0xb8, 0x97}},
-		{3, [3]byte{0xe0, 0xb8, 0x98}}, {3, [3]byte{0xe0, 0xb8, 0x99}},
-		{3, [3]byte{0xe0, 0xb8, 0x9a}}, {3, [3]byte{0xe0, 0xb8, 0x9b}},
-		{3, [3]byte{0xe0, 0xb8, 0x9c}}, {3, [3]byte{0xe0, 0xb8, 0x9d}},
-		{3, [3]byte{0xe0, 0xb8, 0x9e}}, {3, [3]byte{0xe0, 0xb8, 0x9f}},
-		{3, [3]byte{0xe0, 0xb8, 0xa0}}, {3, [3]byte{0xe0, 0xb8, 0xa1}},
-		{3, [3]byte{0xe0, 0xb8, 0xa2}}, {3, [3]byte{0xe0, 0xb8, 0xa3}},
-		{3, [3]byte{0xe0, 0xb8, 0xa4}}, {3, [3]byte{0xe0, 0xb8, 0xa5}},
-		{3, [3]byte{0xe0, 0xb8, 0xa6}}, {3, [3]byte{0xe0, 0xb8, 0xa7}},
-		{3, [3]byte{0xe0, 0xb8, 0xa8}}, {3, [3]byte{0xe0, 0xb8, 0xa9}},
-		{3, [3]byte{0xe0, 0xb8, 0xaa}}, {3, [3]byte{0xe0, 0xb8, 0xab}},
-		{3, [3]byte{0xe0, 0xb8, 0xac}}, {3, [3]byte{0xe0, 0xb8, 0xad}},
-		{3, [3]byte{0xe0, 0xb8, 0xae}}, {3, [3]byte{0xe0, 0xb8, 0xaf}},
-		{3, [3]byte{0xe0, 0xb8, 0xb0}}, {3, [3]byte{0xe0, 0xb8, 0xb1}},
-		{3, [3]byte{0xe0, 0xb8, 0xb2}}, {3, [3]byte{0xe0, 0xb8, 0xb3}},
-		{3, [3]byte{0xe0, 0xb8, 0xb4}}, {3, [3]byte{0xe0, 0xb8, 0xb5}},
-		{3, [3]byte{0xe0, 0xb8, 0xb6}}, {3, [3]byte{0xe0, 0xb8, 0xb7}},
-		{3, [3]byte{0xe0, 0xb8, 0xb8}}, {3, [3]byte{0xe0, 0xb8, 0xb9}},
-		{3, [3]byte{0xe0, 0xb8, 0xba}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe0, 0xb8, 0xbf}},
-		{3, [3]byte{0xe0, 0xb9, 0x80}}, {3, [3]byte{0xe0, 0xb9, 0x81}},
-		{3, [3]byte{0xe0, 0xb9, 0x82}}, {3, [3]byte{0xe0, 0xb9, 0x83}},
-		{3, [3]byte{0xe0, 0xb9, 0x84}}, {3, [3]byte{0xe0, 0xb9, 0x85}},
-		{3, [3]byte{0xe0, 0xb9, 0x86}}, {3, [3]byte{0xe0, 0xb9, 0x87}},
-		{3, [3]byte{0xe0, 0xb9, 0x88}}, {3, [3]byte{0xe0, 0xb9, 0x89}},
-		{3, [3]byte{0xe0, 0xb9, 0x8a}}, {3, [3]byte{0xe0, 0xb9, 0x8b}},
-		{3, [3]byte{0xe0, 0xb9, 0x8c}}, {3, [3]byte{0xe0, 0xb9, 0x8d}},
-		{3, [3]byte{0xe0, 0xb9, 0x8e}}, {3, [3]byte{0xe0, 0xb9, 0x8f}},
-		{3, [3]byte{0xe0, 0xb9, 0x90}}, {3, [3]byte{0xe0, 0xb9, 0x91}},
-		{3, [3]byte{0xe0, 0xb9, 0x92}}, {3, [3]byte{0xe0, 0xb9, 0x93}},
-		{3, [3]byte{0xe0, 0xb9, 0x94}}, {3, [3]byte{0xe0, 0xb9, 0x95}},
-		{3, [3]byte{0xe0, 0xb9, 0x96}}, {3, [3]byte{0xe0, 0xb9, 0x97}},
-		{3, [3]byte{0xe0, 0xb9, 0x98}}, {3, [3]byte{0xe0, 0xb9, 0x99}},
-		{3, [3]byte{0xe0, 0xb9, 0x9a}}, {3, [3]byte{0xe0, 0xb9, 0x9b}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa1000e01, 0xa2000e02, 0xa3000e03, 0xa4000e04, 0xa5000e05, 0xa6000e06, 0xa7000e07,
-		0xa8000e08, 0xa9000e09, 0xaa000e0a, 0xab000e0b, 0xac000e0c, 0xad000e0d, 0xae000e0e, 0xaf000e0f,
-		0xb0000e10, 0xb1000e11, 0xb2000e12, 0xb3000e13, 0xb4000e14, 0xb5000e15, 0xb6000e16, 0xb7000e17,
-		0xb8000e18, 0xb9000e19, 0xba000e1a, 0xbb000e1b, 0xbc000e1c, 0xbd000e1d, 0xbe000e1e, 0xbf000e1f,
-		0xc0000e20, 0xc1000e21, 0xc2000e22, 0xc3000e23, 0xc4000e24, 0xc5000e25, 0xc6000e26, 0xc7000e27,
-		0xc8000e28, 0xc9000e29, 0xca000e2a, 0xcb000e2b, 0xcc000e2c, 0xcd000e2d, 0xce000e2e, 0xcf000e2f,
-		0xd0000e30, 0xd1000e31, 0xd2000e32, 0xd3000e33, 0xd4000e34, 0xd5000e35, 0xd6000e36, 0xd7000e37,
-		0xd8000e38, 0xd9000e39, 0xda000e3a, 0xdf000e3f, 0xe0000e40, 0xe1000e41, 0xe2000e42, 0xe3000e43,
-		0xe4000e44, 0xe5000e45, 0xe6000e46, 0xe7000e47, 0xe8000e48, 0xe9000e49, 0xea000e4a, 0xeb000e4b,
-		0xec000e4c, 0xed000e4d, 0xee000e4e, 0xef000e4f, 0xf0000e50, 0xf1000e51, 0xf2000e52, 0xf3000e53,
-		0xf4000e54, 0xf5000e55, 0xf6000e56, 0xf7000e57, 0xf8000e58, 0xf9000e59, 0xfa000e5a, 0xfb000e5b,
-		0x96002013, 0x97002014, 0x91002018, 0x92002019, 0x9300201c, 0x9400201d, 0x95002022, 0x85002026,
-		0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac,
-		0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac,
-		0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac,
-		0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac,
-	},
-}
-
-// Windows1250 is the Windows 1250 encoding.
-var Windows1250 *Charmap = &windows1250
-
-var windows1250 = Charmap{
-	name:          "Windows 1250",
-	mib:           identifier.Windows1250,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xe2, 0x80, 0x9a}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xe2, 0x80, 0x9e}}, {3, [3]byte{0xe2, 0x80, 0xa6}},
-		{3, [3]byte{0xe2, 0x80, 0xa0}}, {3, [3]byte{0xe2, 0x80, 0xa1}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0xb0}},
-		{2, [3]byte{0xc5, 0xa0, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xb9}},
-		{2, [3]byte{0xc5, 0x9a, 0x00}}, {2, [3]byte{0xc5, 0xa4, 0x00}},
-		{2, [3]byte{0xc5, 0xbd, 0x00}}, {2, [3]byte{0xc5, 0xb9, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0x98}},
-		{3, [3]byte{0xe2, 0x80, 0x99}}, {3, [3]byte{0xe2, 0x80, 0x9c}},
-		{3, [3]byte{0xe2, 0x80, 0x9d}}, {3, [3]byte{0xe2, 0x80, 0xa2}},
-		{3, [3]byte{0xe2, 0x80, 0x93}}, {3, [3]byte{0xe2, 0x80, 0x94}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x84, 0xa2}},
-		{2, [3]byte{0xc5, 0xa1, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xba}},
-		{2, [3]byte{0xc5, 0x9b, 0x00}}, {2, [3]byte{0xc5, 0xa5, 0x00}},
-		{2, [3]byte{0xc5, 0xbe, 0x00}}, {2, [3]byte{0xc5, 0xba, 0x00}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xcb, 0x87, 0x00}},
-		{2, [3]byte{0xcb, 0x98, 0x00}}, {2, [3]byte{0xc5, 0x81, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xc4, 0x84, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xc5, 0x9e, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc5, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xcb, 0x9b, 0x00}}, {2, [3]byte{0xc5, 0x82, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xc4, 0x85, 0x00}},
-		{2, [3]byte{0xc5, 0x9f, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc4, 0xbd, 0x00}}, {2, [3]byte{0xcb, 0x9d, 0x00}},
-		{2, [3]byte{0xc4, 0xbe, 0x00}}, {2, [3]byte{0xc5, 0xbc, 0x00}},
-		{2, [3]byte{0xc5, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc4, 0x82, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc4, 0xb9, 0x00}},
-		{2, [3]byte{0xc4, 0x86, 0x00}}, {2, [3]byte{0xc3, 0x87, 0x00}},
-		{2, [3]byte{0xc4, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc4, 0x98, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc4, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc4, 0x8e, 0x00}},
-		{2, [3]byte{0xc4, 0x90, 0x00}}, {2, [3]byte{0xc5, 0x83, 0x00}},
-		{2, [3]byte{0xc5, 0x87, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc5, 0x90, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xc5, 0x98, 0x00}}, {2, [3]byte{0xc5, 0xae, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc5, 0xb0, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0x9d, 0x00}},
-		{2, [3]byte{0xc5, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc5, 0x95, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc4, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc4, 0xba, 0x00}},
-		{2, [3]byte{0xc4, 0x87, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc4, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc4, 0x99, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc4, 0x9b, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc4, 0x8f, 0x00}},
-		{2, [3]byte{0xc4, 0x91, 0x00}}, {2, [3]byte{0xc5, 0x84, 0x00}},
-		{2, [3]byte{0xc5, 0x88, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc5, 0x91, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xc5, 0x99, 0x00}}, {2, [3]byte{0xc5, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc5, 0xb1, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc3, 0xbd, 0x00}},
-		{2, [3]byte{0xc5, 0xa3, 0x00}}, {2, [3]byte{0xcb, 0x99, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa40000a4, 0xa60000a6, 0xa70000a7, 0xa80000a8, 0xa90000a9, 0xab0000ab, 0xac0000ac,
-		0xad0000ad, 0xae0000ae, 0xb00000b0, 0xb10000b1, 0xb40000b4, 0xb50000b5, 0xb60000b6, 0xb70000b7,
-		0xb80000b8, 0xbb0000bb, 0xc10000c1, 0xc20000c2, 0xc40000c4, 0xc70000c7, 0xc90000c9, 0xcb0000cb,
-		0xcd0000cd, 0xce0000ce, 0xd30000d3, 0xd40000d4, 0xd60000d6, 0xd70000d7, 0xda0000da, 0xdc0000dc,
-		0xdd0000dd, 0xdf0000df, 0xe10000e1, 0xe20000e2, 0xe40000e4, 0xe70000e7, 0xe90000e9, 0xeb0000eb,
-		0xed0000ed, 0xee0000ee, 0xf30000f3, 0xf40000f4, 0xf60000f6, 0xf70000f7, 0xfa0000fa, 0xfc0000fc,
-		0xfd0000fd, 0xc3000102, 0xe3000103, 0xa5000104, 0xb9000105, 0xc6000106, 0xe6000107, 0xc800010c,
-		0xe800010d, 0xcf00010e, 0xef00010f, 0xd0000110, 0xf0000111, 0xca000118, 0xea000119, 0xcc00011a,
-		0xec00011b, 0xc5000139, 0xe500013a, 0xbc00013d, 0xbe00013e, 0xa3000141, 0xb3000142, 0xd1000143,
-		0xf1000144, 0xd2000147, 0xf2000148, 0xd5000150, 0xf5000151, 0xc0000154, 0xe0000155, 0xd8000158,
-		0xf8000159, 0x8c00015a, 0x9c00015b, 0xaa00015e, 0xba00015f, 0x8a000160, 0x9a000161, 0xde000162,
-		0xfe000163, 0x8d000164, 0x9d000165, 0xd900016e, 0xf900016f, 0xdb000170, 0xfb000171, 0x8f000179,
-		0x9f00017a, 0xaf00017b, 0xbf00017c, 0x8e00017d, 0x9e00017e, 0xa10002c7, 0xa20002d8, 0xff0002d9,
-		0xb20002db, 0xbd0002dd, 0x96002013, 0x97002014, 0x91002018, 0x92002019, 0x8200201a, 0x9300201c,
-		0x9400201d, 0x8400201e, 0x86002020, 0x87002021, 0x95002022, 0x85002026, 0x89002030, 0x8b002039,
-		0x9b00203a, 0x800020ac, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
-	},
-}
-
-// Windows1251 is the Windows 1251 encoding.
-var Windows1251 *Charmap = &windows1251
-
-var windows1251 = Charmap{
-	name:          "Windows 1251",
-	mib:           identifier.Windows1251,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{2, [3]byte{0xd0, 0x82, 0x00}}, {2, [3]byte{0xd0, 0x83, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x9a}}, {2, [3]byte{0xd1, 0x93, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x9e}}, {3, [3]byte{0xe2, 0x80, 0xa6}},
-		{3, [3]byte{0xe2, 0x80, 0xa0}}, {3, [3]byte{0xe2, 0x80, 0xa1}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {3, [3]byte{0xe2, 0x80, 0xb0}},
-		{2, [3]byte{0xd0, 0x89, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xb9}},
-		{2, [3]byte{0xd0, 0x8a, 0x00}}, {2, [3]byte{0xd0, 0x8c, 0x00}},
-		{2, [3]byte{0xd0, 0x8b, 0x00}}, {2, [3]byte{0xd0, 0x8f, 0x00}},
-		{2, [3]byte{0xd1, 0x92, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x98}},
-		{3, [3]byte{0xe2, 0x80, 0x99}}, {3, [3]byte{0xe2, 0x80, 0x9c}},
-		{3, [3]byte{0xe2, 0x80, 0x9d}}, {3, [3]byte{0xe2, 0x80, 0xa2}},
-		{3, [3]byte{0xe2, 0x80, 0x93}}, {3, [3]byte{0xe2, 0x80, 0x94}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x84, 0xa2}},
-		{2, [3]byte{0xd1, 0x99, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xba}},
-		{2, [3]byte{0xd1, 0x9a, 0x00}}, {2, [3]byte{0xd1, 0x9c, 0x00}},
-		{2, [3]byte{0xd1, 0x9b, 0x00}}, {2, [3]byte{0xd1, 0x9f, 0x00}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xd0, 0x8e, 0x00}},
-		{2, [3]byte{0xd1, 0x9e, 0x00}}, {2, [3]byte{0xd0, 0x88, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xd2, 0x90, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xd0, 0x81, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xd0, 0x84, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xd0, 0x87, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xd0, 0x86, 0x00}}, {2, [3]byte{0xd1, 0x96, 0x00}},
-		{2, [3]byte{0xd2, 0x91, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xd1, 0x91, 0x00}}, {3, [3]byte{0xe2, 0x84, 0x96}},
-		{2, [3]byte{0xd1, 0x94, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xd1, 0x98, 0x00}}, {2, [3]byte{0xd0, 0x85, 0x00}},
-		{2, [3]byte{0xd1, 0x95, 0x00}}, {2, [3]byte{0xd1, 0x97, 0x00}},
-		{2, [3]byte{0xd0, 0x90, 0x00}}, {2, [3]byte{0xd0, 0x91, 0x00}},
-		{2, [3]byte{0xd0, 0x92, 0x00}}, {2, [3]byte{0xd0, 0x93, 0x00}},
-		{2, [3]byte{0xd0, 0x94, 0x00}}, {2, [3]byte{0xd0, 0x95, 0x00}},
-		{2, [3]byte{0xd0, 0x96, 0x00}}, {2, [3]byte{0xd0, 0x97, 0x00}},
-		{2, [3]byte{0xd0, 0x98, 0x00}}, {2, [3]byte{0xd0, 0x99, 0x00}},
-		{2, [3]byte{0xd0, 0x9a, 0x00}}, {2, [3]byte{0xd0, 0x9b, 0x00}},
-		{2, [3]byte{0xd0, 0x9c, 0x00}}, {2, [3]byte{0xd0, 0x9d, 0x00}},
-		{2, [3]byte{0xd0, 0x9e, 0x00}}, {2, [3]byte{0xd0, 0x9f, 0x00}},
-		{2, [3]byte{0xd0, 0xa0, 0x00}}, {2, [3]byte{0xd0, 0xa1, 0x00}},
-		{2, [3]byte{0xd0, 0xa2, 0x00}}, {2, [3]byte{0xd0, 0xa3, 0x00}},
-		{2, [3]byte{0xd0, 0xa4, 0x00}}, {2, [3]byte{0xd0, 0xa5, 0x00}},
-		{2, [3]byte{0xd0, 0xa6, 0x00}}, {2, [3]byte{0xd0, 0xa7, 0x00}},
-		{2, [3]byte{0xd0, 0xa8, 0x00}}, {2, [3]byte{0xd0, 0xa9, 0x00}},
-		{2, [3]byte{0xd0, 0xaa, 0x00}}, {2, [3]byte{0xd0, 0xab, 0x00}},
-		{2, [3]byte{0xd0, 0xac, 0x00}}, {2, [3]byte{0xd0, 0xad, 0x00}},
-		{2, [3]byte{0xd0, 0xae, 0x00}}, {2, [3]byte{0xd0, 0xaf, 0x00}},
-		{2, [3]byte{0xd0, 0xb0, 0x00}}, {2, [3]byte{0xd0, 0xb1, 0x00}},
-		{2, [3]byte{0xd0, 0xb2, 0x00}}, {2, [3]byte{0xd0, 0xb3, 0x00}},
-		{2, [3]byte{0xd0, 0xb4, 0x00}}, {2, [3]byte{0xd0, 0xb5, 0x00}},
-		{2, [3]byte{0xd0, 0xb6, 0x00}}, {2, [3]byte{0xd0, 0xb7, 0x00}},
-		{2, [3]byte{0xd0, 0xb8, 0x00}}, {2, [3]byte{0xd0, 0xb9, 0x00}},
-		{2, [3]byte{0xd0, 0xba, 0x00}}, {2, [3]byte{0xd0, 0xbb, 0x00}},
-		{2, [3]byte{0xd0, 0xbc, 0x00}}, {2, [3]byte{0xd0, 0xbd, 0x00}},
-		{2, [3]byte{0xd0, 0xbe, 0x00}}, {2, [3]byte{0xd0, 0xbf, 0x00}},
-		{2, [3]byte{0xd1, 0x80, 0x00}}, {2, [3]byte{0xd1, 0x81, 0x00}},
-		{2, [3]byte{0xd1, 0x82, 0x00}}, {2, [3]byte{0xd1, 0x83, 0x00}},
-		{2, [3]byte{0xd1, 0x84, 0x00}}, {2, [3]byte{0xd1, 0x85, 0x00}},
-		{2, [3]byte{0xd1, 0x86, 0x00}}, {2, [3]byte{0xd1, 0x87, 0x00}},
-		{2, [3]byte{0xd1, 0x88, 0x00}}, {2, [3]byte{0xd1, 0x89, 0x00}},
-		{2, [3]byte{0xd1, 0x8a, 0x00}}, {2, [3]byte{0xd1, 0x8b, 0x00}},
-		{2, [3]byte{0xd1, 0x8c, 0x00}}, {2, [3]byte{0xd1, 0x8d, 0x00}},
-		{2, [3]byte{0xd1, 0x8e, 0x00}}, {2, [3]byte{0xd1, 0x8f, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa40000a4, 0xa60000a6, 0xa70000a7, 0xa90000a9, 0xab0000ab, 0xac0000ac, 0xad0000ad,
-		0xae0000ae, 0xb00000b0, 0xb10000b1, 0xb50000b5, 0xb60000b6, 0xb70000b7, 0xbb0000bb, 0xa8000401,
-		0x80000402, 0x81000403, 0xaa000404, 0xbd000405, 0xb2000406, 0xaf000407, 0xa3000408, 0x8a000409,
-		0x8c00040a, 0x8e00040b, 0x8d00040c, 0xa100040e, 0x8f00040f, 0xc0000410, 0xc1000411, 0xc2000412,
-		0xc3000413, 0xc4000414, 0xc5000415, 0xc6000416, 0xc7000417, 0xc8000418, 0xc9000419, 0xca00041a,
-		0xcb00041b, 0xcc00041c, 0xcd00041d, 0xce00041e, 0xcf00041f, 0xd0000420, 0xd1000421, 0xd2000422,
-		0xd3000423, 0xd4000424, 0xd5000425, 0xd6000426, 0xd7000427, 0xd8000428, 0xd9000429, 0xda00042a,
-		0xdb00042b, 0xdc00042c, 0xdd00042d, 0xde00042e, 0xdf00042f, 0xe0000430, 0xe1000431, 0xe2000432,
-		0xe3000433, 0xe4000434, 0xe5000435, 0xe6000436, 0xe7000437, 0xe8000438, 0xe9000439, 0xea00043a,
-		0xeb00043b, 0xec00043c, 0xed00043d, 0xee00043e, 0xef00043f, 0xf0000440, 0xf1000441, 0xf2000442,
-		0xf3000443, 0xf4000444, 0xf5000445, 0xf6000446, 0xf7000447, 0xf8000448, 0xf9000449, 0xfa00044a,
-		0xfb00044b, 0xfc00044c, 0xfd00044d, 0xfe00044e, 0xff00044f, 0xb8000451, 0x90000452, 0x83000453,
-		0xba000454, 0xbe000455, 0xb3000456, 0xbf000457, 0xbc000458, 0x9a000459, 0x9c00045a, 0x9e00045b,
-		0x9d00045c, 0xa200045e, 0x9f00045f, 0xa5000490, 0xb4000491, 0x96002013, 0x97002014, 0x91002018,
-		0x92002019, 0x8200201a, 0x9300201c, 0x9400201d, 0x8400201e, 0x86002020, 0x87002021, 0x95002022,
-		0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0x880020ac, 0xb9002116, 0x99002122, 0x99002122,
-	},
-}
-
-// Windows1252 is the Windows 1252 encoding.
-var Windows1252 *Charmap = &windows1252
-
-var windows1252 = Charmap{
-	name:          "Windows 1252",
-	mib:           identifier.Windows1252,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xe2, 0x80, 0x9a}}, {2, [3]byte{0xc6, 0x92, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x9e}}, {3, [3]byte{0xe2, 0x80, 0xa6}},
-		{3, [3]byte{0xe2, 0x80, 0xa0}}, {3, [3]byte{0xe2, 0x80, 0xa1}},
-		{2, [3]byte{0xcb, 0x86, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xb0}},
-		{2, [3]byte{0xc5, 0xa0, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xb9}},
-		{2, [3]byte{0xc5, 0x92, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc5, 0xbd, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0x98}},
-		{3, [3]byte{0xe2, 0x80, 0x99}}, {3, [3]byte{0xe2, 0x80, 0x9c}},
-		{3, [3]byte{0xe2, 0x80, 0x9d}}, {3, [3]byte{0xe2, 0x80, 0xa2}},
-		{3, [3]byte{0xe2, 0x80, 0x93}}, {3, [3]byte{0xe2, 0x80, 0x94}},
-		{2, [3]byte{0xcb, 0x9c, 0x00}}, {3, [3]byte{0xe2, 0x84, 0xa2}},
-		{2, [3]byte{0xc5, 0xa1, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xba}},
-		{2, [3]byte{0xc5, 0x93, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc5, 0xbe, 0x00}}, {2, [3]byte{0xc5, 0xb8, 0x00}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xc2, 0xa5, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc2, 0xaf, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xc2, 0xba, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbe, 0x00}}, {2, [3]byte{0xc2, 0xbf, 0x00}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc3, 0x90, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc3, 0x92, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc3, 0x9d, 0x00}},
-		{2, [3]byte{0xc3, 0x9e, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0xa3, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xac, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc3, 0xb0, 0x00}}, {2, [3]byte{0xc3, 0xb1, 0x00}},
-		{2, [3]byte{0xc3, 0xb2, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc3, 0xbd, 0x00}},
-		{2, [3]byte{0xc3, 0xbe, 0x00}}, {2, [3]byte{0xc3, 0xbf, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa10000a1, 0xa20000a2, 0xa30000a3, 0xa40000a4, 0xa50000a5, 0xa60000a6, 0xa70000a7,
-		0xa80000a8, 0xa90000a9, 0xaa0000aa, 0xab0000ab, 0xac0000ac, 0xad0000ad, 0xae0000ae, 0xaf0000af,
-		0xb00000b0, 0xb10000b1, 0xb20000b2, 0xb30000b3, 0xb40000b4, 0xb50000b5, 0xb60000b6, 0xb70000b7,
-		0xb80000b8, 0xb90000b9, 0xba0000ba, 0xbb0000bb, 0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xbf0000bf,
-		0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7,
-		0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
-		0xd00000d0, 0xd10000d1, 0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd70000d7,
-		0xd80000d8, 0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdd0000dd, 0xde0000de, 0xdf0000df,
-		0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe30000e3, 0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7,
-		0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef,
-		0xf00000f0, 0xf10000f1, 0xf20000f2, 0xf30000f3, 0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf70000f7,
-		0xf80000f8, 0xf90000f9, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc, 0xfd0000fd, 0xfe0000fe, 0xff0000ff,
-		0x8c000152, 0x9c000153, 0x8a000160, 0x9a000161, 0x9f000178, 0x8e00017d, 0x9e00017e, 0x83000192,
-		0x880002c6, 0x980002dc, 0x96002013, 0x97002014, 0x91002018, 0x92002019, 0x8200201a, 0x9300201c,
-		0x9400201d, 0x8400201e, 0x86002020, 0x87002021, 0x95002022, 0x85002026, 0x89002030, 0x8b002039,
-		0x9b00203a, 0x800020ac, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
-	},
-}
-
-// Windows1253 is the Windows 1253 encoding.
-var Windows1253 *Charmap = &windows1253
-
-var windows1253 = Charmap{
-	name:          "Windows 1253",
-	mib:           identifier.Windows1253,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xe2, 0x80, 0x9a}}, {2, [3]byte{0xc6, 0x92, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x9e}}, {3, [3]byte{0xe2, 0x80, 0xa6}},
-		{3, [3]byte{0xe2, 0x80, 0xa0}}, {3, [3]byte{0xe2, 0x80, 0xa1}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0xb0}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0xb9}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0x98}},
-		{3, [3]byte{0xe2, 0x80, 0x99}}, {3, [3]byte{0xe2, 0x80, 0x9c}},
-		{3, [3]byte{0xe2, 0x80, 0x9d}}, {3, [3]byte{0xe2, 0x80, 0xa2}},
-		{3, [3]byte{0xe2, 0x80, 0x93}}, {3, [3]byte{0xe2, 0x80, 0x94}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x84, 0xa2}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0xba}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xce, 0x85, 0x00}},
-		{2, [3]byte{0xce, 0x86, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xc2, 0xa5, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x95}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xce, 0x84, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xce, 0x88, 0x00}}, {2, [3]byte{0xce, 0x89, 0x00}},
-		{2, [3]byte{0xce, 0x8a, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xce, 0x8c, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xce, 0x8e, 0x00}}, {2, [3]byte{0xce, 0x8f, 0x00}},
-		{2, [3]byte{0xce, 0x90, 0x00}}, {2, [3]byte{0xce, 0x91, 0x00}},
-		{2, [3]byte{0xce, 0x92, 0x00}}, {2, [3]byte{0xce, 0x93, 0x00}},
-		{2, [3]byte{0xce, 0x94, 0x00}}, {2, [3]byte{0xce, 0x95, 0x00}},
-		{2, [3]byte{0xce, 0x96, 0x00}}, {2, [3]byte{0xce, 0x97, 0x00}},
-		{2, [3]byte{0xce, 0x98, 0x00}}, {2, [3]byte{0xce, 0x99, 0x00}},
-		{2, [3]byte{0xce, 0x9a, 0x00}}, {2, [3]byte{0xce, 0x9b, 0x00}},
-		{2, [3]byte{0xce, 0x9c, 0x00}}, {2, [3]byte{0xce, 0x9d, 0x00}},
-		{2, [3]byte{0xce, 0x9e, 0x00}}, {2, [3]byte{0xce, 0x9f, 0x00}},
-		{2, [3]byte{0xce, 0xa0, 0x00}}, {2, [3]byte{0xce, 0xa1, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xce, 0xa3, 0x00}},
-		{2, [3]byte{0xce, 0xa4, 0x00}}, {2, [3]byte{0xce, 0xa5, 0x00}},
-		{2, [3]byte{0xce, 0xa6, 0x00}}, {2, [3]byte{0xce, 0xa7, 0x00}},
-		{2, [3]byte{0xce, 0xa8, 0x00}}, {2, [3]byte{0xce, 0xa9, 0x00}},
-		{2, [3]byte{0xce, 0xaa, 0x00}}, {2, [3]byte{0xce, 0xab, 0x00}},
-		{2, [3]byte{0xce, 0xac, 0x00}}, {2, [3]byte{0xce, 0xad, 0x00}},
-		{2, [3]byte{0xce, 0xae, 0x00}}, {2, [3]byte{0xce, 0xaf, 0x00}},
-		{2, [3]byte{0xce, 0xb0, 0x00}}, {2, [3]byte{0xce, 0xb1, 0x00}},
-		{2, [3]byte{0xce, 0xb2, 0x00}}, {2, [3]byte{0xce, 0xb3, 0x00}},
-		{2, [3]byte{0xce, 0xb4, 0x00}}, {2, [3]byte{0xce, 0xb5, 0x00}},
-		{2, [3]byte{0xce, 0xb6, 0x00}}, {2, [3]byte{0xce, 0xb7, 0x00}},
-		{2, [3]byte{0xce, 0xb8, 0x00}}, {2, [3]byte{0xce, 0xb9, 0x00}},
-		{2, [3]byte{0xce, 0xba, 0x00}}, {2, [3]byte{0xce, 0xbb, 0x00}},
-		{2, [3]byte{0xce, 0xbc, 0x00}}, {2, [3]byte{0xce, 0xbd, 0x00}},
-		{2, [3]byte{0xce, 0xbe, 0x00}}, {2, [3]byte{0xce, 0xbf, 0x00}},
-		{2, [3]byte{0xcf, 0x80, 0x00}}, {2, [3]byte{0xcf, 0x81, 0x00}},
-		{2, [3]byte{0xcf, 0x82, 0x00}}, {2, [3]byte{0xcf, 0x83, 0x00}},
-		{2, [3]byte{0xcf, 0x84, 0x00}}, {2, [3]byte{0xcf, 0x85, 0x00}},
-		{2, [3]byte{0xcf, 0x86, 0x00}}, {2, [3]byte{0xcf, 0x87, 0x00}},
-		{2, [3]byte{0xcf, 0x88, 0x00}}, {2, [3]byte{0xcf, 0x89, 0x00}},
-		{2, [3]byte{0xcf, 0x8a, 0x00}}, {2, [3]byte{0xcf, 0x8b, 0x00}},
-		{2, [3]byte{0xcf, 0x8c, 0x00}}, {2, [3]byte{0xcf, 0x8d, 0x00}},
-		{2, [3]byte{0xcf, 0x8e, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa30000a3, 0xa40000a4, 0xa50000a5, 0xa60000a6, 0xa70000a7, 0xa80000a8, 0xa90000a9,
-		0xab0000ab, 0xac0000ac, 0xad0000ad, 0xae0000ae, 0xb00000b0, 0xb10000b1, 0xb20000b2, 0xb30000b3,
-		0xb50000b5, 0xb60000b6, 0xb70000b7, 0xbb0000bb, 0xbd0000bd, 0x83000192, 0xb4000384, 0xa1000385,
-		0xa2000386, 0xb8000388, 0xb9000389, 0xba00038a, 0xbc00038c, 0xbe00038e, 0xbf00038f, 0xc0000390,
-		0xc1000391, 0xc2000392, 0xc3000393, 0xc4000394, 0xc5000395, 0xc6000396, 0xc7000397, 0xc8000398,
-		0xc9000399, 0xca00039a, 0xcb00039b, 0xcc00039c, 0xcd00039d, 0xce00039e, 0xcf00039f, 0xd00003a0,
-		0xd10003a1, 0xd30003a3, 0xd40003a4, 0xd50003a5, 0xd60003a6, 0xd70003a7, 0xd80003a8, 0xd90003a9,
-		0xda0003aa, 0xdb0003ab, 0xdc0003ac, 0xdd0003ad, 0xde0003ae, 0xdf0003af, 0xe00003b0, 0xe10003b1,
-		0xe20003b2, 0xe30003b3, 0xe40003b4, 0xe50003b5, 0xe60003b6, 0xe70003b7, 0xe80003b8, 0xe90003b9,
-		0xea0003ba, 0xeb0003bb, 0xec0003bc, 0xed0003bd, 0xee0003be, 0xef0003bf, 0xf00003c0, 0xf10003c1,
-		0xf20003c2, 0xf30003c3, 0xf40003c4, 0xf50003c5, 0xf60003c6, 0xf70003c7, 0xf80003c8, 0xf90003c9,
-		0xfa0003ca, 0xfb0003cb, 0xfc0003cc, 0xfd0003cd, 0xfe0003ce, 0x96002013, 0x97002014, 0xaf002015,
-		0x91002018, 0x92002019, 0x8200201a, 0x9300201c, 0x9400201d, 0x8400201e, 0x86002020, 0x87002021,
-		0x95002022, 0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0x800020ac, 0x99002122, 0x99002122,
-		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
-		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
-	},
-}
-
-// Windows1254 is the Windows 1254 encoding.
-var Windows1254 *Charmap = &windows1254
-
-var windows1254 = Charmap{
-	name:          "Windows 1254",
-	mib:           identifier.Windows1254,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xe2, 0x80, 0x9a}}, {2, [3]byte{0xc6, 0x92, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x9e}}, {3, [3]byte{0xe2, 0x80, 0xa6}},
-		{3, [3]byte{0xe2, 0x80, 0xa0}}, {3, [3]byte{0xe2, 0x80, 0xa1}},
-		{2, [3]byte{0xcb, 0x86, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xb0}},
-		{2, [3]byte{0xc5, 0xa0, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xb9}},
-		{2, [3]byte{0xc5, 0x92, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0x98}},
-		{3, [3]byte{0xe2, 0x80, 0x99}}, {3, [3]byte{0xe2, 0x80, 0x9c}},
-		{3, [3]byte{0xe2, 0x80, 0x9d}}, {3, [3]byte{0xe2, 0x80, 0xa2}},
-		{3, [3]byte{0xe2, 0x80, 0x93}}, {3, [3]byte{0xe2, 0x80, 0x94}},
-		{2, [3]byte{0xcb, 0x9c, 0x00}}, {3, [3]byte{0xe2, 0x84, 0xa2}},
-		{2, [3]byte{0xc5, 0xa1, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xba}},
-		{2, [3]byte{0xc5, 0x93, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xc5, 0xb8, 0x00}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xc2, 0xa5, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc2, 0xaf, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xc2, 0xba, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbe, 0x00}}, {2, [3]byte{0xc2, 0xbf, 0x00}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc3, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xc3, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc4, 0x9e, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xc3, 0x92, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc4, 0xb0, 0x00}},
-		{2, [3]byte{0xc5, 0x9e, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc3, 0xa3, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xac, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc4, 0x9f, 0x00}}, {2, [3]byte{0xc3, 0xb1, 0x00}},
-		{2, [3]byte{0xc3, 0xb2, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc4, 0xb1, 0x00}},
-		{2, [3]byte{0xc5, 0x9f, 0x00}}, {2, [3]byte{0xc3, 0xbf, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa10000a1, 0xa20000a2, 0xa30000a3, 0xa40000a4, 0xa50000a5, 0xa60000a6, 0xa70000a7,
-		0xa80000a8, 0xa90000a9, 0xaa0000aa, 0xab0000ab, 0xac0000ac, 0xad0000ad, 0xae0000ae, 0xaf0000af,
-		0xb00000b0, 0xb10000b1, 0xb20000b2, 0xb30000b3, 0xb40000b4, 0xb50000b5, 0xb60000b6, 0xb70000b7,
-		0xb80000b8, 0xb90000b9, 0xba0000ba, 0xbb0000bb, 0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xbf0000bf,
-		0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc30000c3, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7,
-		0xc80000c8, 0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcc0000cc, 0xcd0000cd, 0xce0000ce, 0xcf0000cf,
-		0xd10000d1, 0xd20000d2, 0xd30000d3, 0xd40000d4, 0xd50000d5, 0xd60000d6, 0xd70000d7, 0xd80000d8,
-		0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc, 0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2,
-		0xe30000e3, 0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7, 0xe80000e8, 0xe90000e9, 0xea0000ea,
-		0xeb0000eb, 0xec0000ec, 0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf10000f1, 0xf20000f2, 0xf30000f3,
-		0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf70000f7, 0xf80000f8, 0xf90000f9, 0xfa0000fa, 0xfb0000fb,
-		0xfc0000fc, 0xff0000ff, 0xd000011e, 0xf000011f, 0xdd000130, 0xfd000131, 0x8c000152, 0x9c000153,
-		0xde00015e, 0xfe00015f, 0x8a000160, 0x9a000161, 0x9f000178, 0x83000192, 0x880002c6, 0x980002dc,
-		0x96002013, 0x97002014, 0x91002018, 0x92002019, 0x8200201a, 0x9300201c, 0x9400201d, 0x8400201e,
-		0x86002020, 0x87002021, 0x95002022, 0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0x800020ac,
-		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
-	},
-}
-
-// Windows1255 is the Windows 1255 encoding.
-var Windows1255 *Charmap = &windows1255
-
-var windows1255 = Charmap{
-	name:          "Windows 1255",
-	mib:           identifier.Windows1255,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xe2, 0x80, 0x9a}}, {2, [3]byte{0xc6, 0x92, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x9e}}, {3, [3]byte{0xe2, 0x80, 0xa6}},
-		{3, [3]byte{0xe2, 0x80, 0xa0}}, {3, [3]byte{0xe2, 0x80, 0xa1}},
-		{2, [3]byte{0xcb, 0x86, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xb0}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0xb9}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0x98}},
-		{3, [3]byte{0xe2, 0x80, 0x99}}, {3, [3]byte{0xe2, 0x80, 0x9c}},
-		{3, [3]byte{0xe2, 0x80, 0x9d}}, {3, [3]byte{0xe2, 0x80, 0xa2}},
-		{3, [3]byte{0xe2, 0x80, 0x93}}, {3, [3]byte{0xe2, 0x80, 0x94}},
-		{2, [3]byte{0xcb, 0x9c, 0x00}}, {3, [3]byte{0xe2, 0x84, 0xa2}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0xba}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xaa}}, {2, [3]byte{0xc2, 0xa5, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0x97, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc2, 0xaf, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xb7, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbe, 0x00}}, {2, [3]byte{0xc2, 0xbf, 0x00}},
-		{2, [3]byte{0xd6, 0xb0, 0x00}}, {2, [3]byte{0xd6, 0xb1, 0x00}},
-		{2, [3]byte{0xd6, 0xb2, 0x00}}, {2, [3]byte{0xd6, 0xb3, 0x00}},
-		{2, [3]byte{0xd6, 0xb4, 0x00}}, {2, [3]byte{0xd6, 0xb5, 0x00}},
-		{2, [3]byte{0xd6, 0xb6, 0x00}}, {2, [3]byte{0xd6, 0xb7, 0x00}},
-		{2, [3]byte{0xd6, 0xb8, 0x00}}, {2, [3]byte{0xd6, 0xb9, 0x00}},
-		{2, [3]byte{0xd6, 0xba, 0x00}}, {2, [3]byte{0xd6, 0xbb, 0x00}},
-		{2, [3]byte{0xd6, 0xbc, 0x00}}, {2, [3]byte{0xd6, 0xbd, 0x00}},
-		{2, [3]byte{0xd6, 0xbe, 0x00}}, {2, [3]byte{0xd6, 0xbf, 0x00}},
-		{2, [3]byte{0xd7, 0x80, 0x00}}, {2, [3]byte{0xd7, 0x81, 0x00}},
-		{2, [3]byte{0xd7, 0x82, 0x00}}, {2, [3]byte{0xd7, 0x83, 0x00}},
-		{2, [3]byte{0xd7, 0xb0, 0x00}}, {2, [3]byte{0xd7, 0xb1, 0x00}},
-		{2, [3]byte{0xd7, 0xb2, 0x00}}, {2, [3]byte{0xd7, 0xb3, 0x00}},
-		{2, [3]byte{0xd7, 0xb4, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xd7, 0x90, 0x00}}, {2, [3]byte{0xd7, 0x91, 0x00}},
-		{2, [3]byte{0xd7, 0x92, 0x00}}, {2, [3]byte{0xd7, 0x93, 0x00}},
-		{2, [3]byte{0xd7, 0x94, 0x00}}, {2, [3]byte{0xd7, 0x95, 0x00}},
-		{2, [3]byte{0xd7, 0x96, 0x00}}, {2, [3]byte{0xd7, 0x97, 0x00}},
-		{2, [3]byte{0xd7, 0x98, 0x00}}, {2, [3]byte{0xd7, 0x99, 0x00}},
-		{2, [3]byte{0xd7, 0x9a, 0x00}}, {2, [3]byte{0xd7, 0x9b, 0x00}},
-		{2, [3]byte{0xd7, 0x9c, 0x00}}, {2, [3]byte{0xd7, 0x9d, 0x00}},
-		{2, [3]byte{0xd7, 0x9e, 0x00}}, {2, [3]byte{0xd7, 0x9f, 0x00}},
-		{2, [3]byte{0xd7, 0xa0, 0x00}}, {2, [3]byte{0xd7, 0xa1, 0x00}},
-		{2, [3]byte{0xd7, 0xa2, 0x00}}, {2, [3]byte{0xd7, 0xa3, 0x00}},
-		{2, [3]byte{0xd7, 0xa4, 0x00}}, {2, [3]byte{0xd7, 0xa5, 0x00}},
-		{2, [3]byte{0xd7, 0xa6, 0x00}}, {2, [3]byte{0xd7, 0xa7, 0x00}},
-		{2, [3]byte{0xd7, 0xa8, 0x00}}, {2, [3]byte{0xd7, 0xa9, 0x00}},
-		{2, [3]byte{0xd7, 0xaa, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0x8e}},
-		{3, [3]byte{0xe2, 0x80, 0x8f}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa10000a1, 0xa20000a2, 0xa30000a3, 0xa50000a5, 0xa60000a6, 0xa70000a7, 0xa80000a8,
-		0xa90000a9, 0xab0000ab, 0xac0000ac, 0xad0000ad, 0xae0000ae, 0xaf0000af, 0xb00000b0, 0xb10000b1,
-		0xb20000b2, 0xb30000b3, 0xb40000b4, 0xb50000b5, 0xb60000b6, 0xb70000b7, 0xb80000b8, 0xb90000b9,
-		0xbb0000bb, 0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xbf0000bf, 0xaa0000d7, 0xba0000f7, 0x83000192,
-		0x880002c6, 0x980002dc, 0xc00005b0, 0xc10005b1, 0xc20005b2, 0xc30005b3, 0xc40005b4, 0xc50005b5,
-		0xc60005b6, 0xc70005b7, 0xc80005b8, 0xc90005b9, 0xca0005ba, 0xcb0005bb, 0xcc0005bc, 0xcd0005bd,
-		0xce0005be, 0xcf0005bf, 0xd00005c0, 0xd10005c1, 0xd20005c2, 0xd30005c3, 0xe00005d0, 0xe10005d1,
-		0xe20005d2, 0xe30005d3, 0xe40005d4, 0xe50005d5, 0xe60005d6, 0xe70005d7, 0xe80005d8, 0xe90005d9,
-		0xea0005da, 0xeb0005db, 0xec0005dc, 0xed0005dd, 0xee0005de, 0xef0005df, 0xf00005e0, 0xf10005e1,
-		0xf20005e2, 0xf30005e3, 0xf40005e4, 0xf50005e5, 0xf60005e6, 0xf70005e7, 0xf80005e8, 0xf90005e9,
-		0xfa0005ea, 0xd40005f0, 0xd50005f1, 0xd60005f2, 0xd70005f3, 0xd80005f4, 0xfd00200e, 0xfe00200f,
-		0x96002013, 0x97002014, 0x91002018, 0x92002019, 0x8200201a, 0x9300201c, 0x9400201d, 0x8400201e,
-		0x86002020, 0x87002021, 0x95002022, 0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0xa40020aa,
-		0x800020ac, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
-		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
-		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
-	},
-}
-
-// Windows1256 is the Windows 1256 encoding.
-var Windows1256 *Charmap = &windows1256
-
-var windows1256 = Charmap{
-	name:          "Windows 1256",
-	mib:           identifier.Windows1256,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {2, [3]byte{0xd9, 0xbe, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x9a}}, {2, [3]byte{0xc6, 0x92, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x9e}}, {3, [3]byte{0xe2, 0x80, 0xa6}},
-		{3, [3]byte{0xe2, 0x80, 0xa0}}, {3, [3]byte{0xe2, 0x80, 0xa1}},
-		{2, [3]byte{0xcb, 0x86, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xb0}},
-		{2, [3]byte{0xd9, 0xb9, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xb9}},
-		{2, [3]byte{0xc5, 0x92, 0x00}}, {2, [3]byte{0xda, 0x86, 0x00}},
-		{2, [3]byte{0xda, 0x98, 0x00}}, {2, [3]byte{0xda, 0x88, 0x00}},
-		{2, [3]byte{0xda, 0xaf, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x98}},
-		{3, [3]byte{0xe2, 0x80, 0x99}}, {3, [3]byte{0xe2, 0x80, 0x9c}},
-		{3, [3]byte{0xe2, 0x80, 0x9d}}, {3, [3]byte{0xe2, 0x80, 0xa2}},
-		{3, [3]byte{0xe2, 0x80, 0x93}}, {3, [3]byte{0xe2, 0x80, 0x94}},
-		{2, [3]byte{0xda, 0xa9, 0x00}}, {3, [3]byte{0xe2, 0x84, 0xa2}},
-		{2, [3]byte{0xda, 0x91, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xba}},
-		{2, [3]byte{0xc5, 0x93, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x8c}},
-		{3, [3]byte{0xe2, 0x80, 0x8d}}, {2, [3]byte{0xda, 0xba, 0x00}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xd8, 0x8c, 0x00}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xc2, 0xa5, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xda, 0xbe, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc2, 0xaf, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xd8, 0x9b, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbe, 0x00}}, {2, [3]byte{0xd8, 0x9f, 0x00}},
-		{2, [3]byte{0xdb, 0x81, 0x00}}, {2, [3]byte{0xd8, 0xa1, 0x00}},
-		{2, [3]byte{0xd8, 0xa2, 0x00}}, {2, [3]byte{0xd8, 0xa3, 0x00}},
-		{2, [3]byte{0xd8, 0xa4, 0x00}}, {2, [3]byte{0xd8, 0xa5, 0x00}},
-		{2, [3]byte{0xd8, 0xa6, 0x00}}, {2, [3]byte{0xd8, 0xa7, 0x00}},
-		{2, [3]byte{0xd8, 0xa8, 0x00}}, {2, [3]byte{0xd8, 0xa9, 0x00}},
-		{2, [3]byte{0xd8, 0xaa, 0x00}}, {2, [3]byte{0xd8, 0xab, 0x00}},
-		{2, [3]byte{0xd8, 0xac, 0x00}}, {2, [3]byte{0xd8, 0xad, 0x00}},
-		{2, [3]byte{0xd8, 0xae, 0x00}}, {2, [3]byte{0xd8, 0xaf, 0x00}},
-		{2, [3]byte{0xd8, 0xb0, 0x00}}, {2, [3]byte{0xd8, 0xb1, 0x00}},
-		{2, [3]byte{0xd8, 0xb2, 0x00}}, {2, [3]byte{0xd8, 0xb3, 0x00}},
-		{2, [3]byte{0xd8, 0xb4, 0x00}}, {2, [3]byte{0xd8, 0xb5, 0x00}},
-		{2, [3]byte{0xd8, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xd8, 0xb7, 0x00}}, {2, [3]byte{0xd8, 0xb8, 0x00}},
-		{2, [3]byte{0xd8, 0xb9, 0x00}}, {2, [3]byte{0xd8, 0xba, 0x00}},
-		{2, [3]byte{0xd9, 0x80, 0x00}}, {2, [3]byte{0xd9, 0x81, 0x00}},
-		{2, [3]byte{0xd9, 0x82, 0x00}}, {2, [3]byte{0xd9, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xd9, 0x84, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xd9, 0x85, 0x00}},
-		{2, [3]byte{0xd9, 0x86, 0x00}}, {2, [3]byte{0xd9, 0x87, 0x00}},
-		{2, [3]byte{0xd9, 0x88, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xd9, 0x89, 0x00}}, {2, [3]byte{0xd9, 0x8a, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xd9, 0x8b, 0x00}}, {2, [3]byte{0xd9, 0x8c, 0x00}},
-		{2, [3]byte{0xd9, 0x8d, 0x00}}, {2, [3]byte{0xd9, 0x8e, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xd9, 0x8f, 0x00}},
-		{2, [3]byte{0xd9, 0x90, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xd9, 0x91, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xd9, 0x92, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {3, [3]byte{0xe2, 0x80, 0x8e}},
-		{3, [3]byte{0xe2, 0x80, 0x8f}}, {2, [3]byte{0xdb, 0x92, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa20000a2, 0xa30000a3, 0xa40000a4, 0xa50000a5, 0xa60000a6, 0xa70000a7, 0xa80000a8,
-		0xa90000a9, 0xab0000ab, 0xac0000ac, 0xad0000ad, 0xae0000ae, 0xaf0000af, 0xb00000b0, 0xb10000b1,
-		0xb20000b2, 0xb30000b3, 0xb40000b4, 0xb50000b5, 0xb60000b6, 0xb70000b7, 0xb80000b8, 0xb90000b9,
-		0xbb0000bb, 0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xd70000d7, 0xe00000e0, 0xe20000e2, 0xe70000e7,
-		0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xee0000ee, 0xef0000ef, 0xf40000f4, 0xf70000f7,
-		0xf90000f9, 0xfb0000fb, 0xfc0000fc, 0x8c000152, 0x9c000153, 0x83000192, 0x880002c6, 0xa100060c,
-		0xba00061b, 0xbf00061f, 0xc1000621, 0xc2000622, 0xc3000623, 0xc4000624, 0xc5000625, 0xc6000626,
-		0xc7000627, 0xc8000628, 0xc9000629, 0xca00062a, 0xcb00062b, 0xcc00062c, 0xcd00062d, 0xce00062e,
-		0xcf00062f, 0xd0000630, 0xd1000631, 0xd2000632, 0xd3000633, 0xd4000634, 0xd5000635, 0xd6000636,
-		0xd8000637, 0xd9000638, 0xda000639, 0xdb00063a, 0xdc000640, 0xdd000641, 0xde000642, 0xdf000643,
-		0xe1000644, 0xe3000645, 0xe4000646, 0xe5000647, 0xe6000648, 0xec000649, 0xed00064a, 0xf000064b,
-		0xf100064c, 0xf200064d, 0xf300064e, 0xf500064f, 0xf6000650, 0xf8000651, 0xfa000652, 0x8a000679,
-		0x8100067e, 0x8d000686, 0x8f000688, 0x9a000691, 0x8e000698, 0x980006a9, 0x900006af, 0x9f0006ba,
-		0xaa0006be, 0xc00006c1, 0xff0006d2, 0x9d00200c, 0x9e00200d, 0xfd00200e, 0xfe00200f, 0x96002013,
-		0x97002014, 0x91002018, 0x92002019, 0x8200201a, 0x9300201c, 0x9400201d, 0x8400201e, 0x86002020,
-		0x87002021, 0x95002022, 0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0x800020ac, 0x99002122,
-	},
-}
-
-// Windows1257 is the Windows 1257 encoding.
-var Windows1257 *Charmap = &windows1257
-
-var windows1257 = Charmap{
-	name:          "Windows 1257",
-	mib:           identifier.Windows1257,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xe2, 0x80, 0x9a}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xe2, 0x80, 0x9e}}, {3, [3]byte{0xe2, 0x80, 0xa6}},
-		{3, [3]byte{0xe2, 0x80, 0xa0}}, {3, [3]byte{0xe2, 0x80, 0xa1}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0xb0}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0xb9}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xc2, 0xa8, 0x00}},
-		{2, [3]byte{0xcb, 0x87, 0x00}}, {2, [3]byte{0xc2, 0xb8, 0x00}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0x98}},
-		{3, [3]byte{0xe2, 0x80, 0x99}}, {3, [3]byte{0xe2, 0x80, 0x9c}},
-		{3, [3]byte{0xe2, 0x80, 0x9d}}, {3, [3]byte{0xe2, 0x80, 0xa2}},
-		{3, [3]byte{0xe2, 0x80, 0x93}}, {3, [3]byte{0xe2, 0x80, 0x94}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x84, 0xa2}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0xba}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xc2, 0xaf, 0x00}},
-		{2, [3]byte{0xcb, 0x9b, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xc5, 0x96, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc3, 0x86, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xc5, 0x97, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbe, 0x00}}, {2, [3]byte{0xc3, 0xa6, 0x00}},
-		{2, [3]byte{0xc4, 0x84, 0x00}}, {2, [3]byte{0xc4, 0xae, 0x00}},
-		{2, [3]byte{0xc4, 0x80, 0x00}}, {2, [3]byte{0xc4, 0x86, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc4, 0x98, 0x00}}, {2, [3]byte{0xc4, 0x92, 0x00}},
-		{2, [3]byte{0xc4, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc5, 0xb9, 0x00}}, {2, [3]byte{0xc4, 0x96, 0x00}},
-		{2, [3]byte{0xc4, 0xa2, 0x00}}, {2, [3]byte{0xc4, 0xb6, 0x00}},
-		{2, [3]byte{0xc4, 0xaa, 0x00}}, {2, [3]byte{0xc4, 0xbb, 0x00}},
-		{2, [3]byte{0xc5, 0xa0, 0x00}}, {2, [3]byte{0xc5, 0x83, 0x00}},
-		{2, [3]byte{0xc5, 0x85, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc5, 0x8c, 0x00}}, {2, [3]byte{0xc3, 0x95, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xc5, 0xb2, 0x00}}, {2, [3]byte{0xc5, 0x81, 0x00}},
-		{2, [3]byte{0xc5, 0x9a, 0x00}}, {2, [3]byte{0xc5, 0xaa, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc5, 0xbb, 0x00}},
-		{2, [3]byte{0xc5, 0xbd, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc4, 0x85, 0x00}}, {2, [3]byte{0xc4, 0xaf, 0x00}},
-		{2, [3]byte{0xc4, 0x81, 0x00}}, {2, [3]byte{0xc4, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc4, 0x99, 0x00}}, {2, [3]byte{0xc4, 0x93, 0x00}},
-		{2, [3]byte{0xc4, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc5, 0xba, 0x00}}, {2, [3]byte{0xc4, 0x97, 0x00}},
-		{2, [3]byte{0xc4, 0xa3, 0x00}}, {2, [3]byte{0xc4, 0xb7, 0x00}},
-		{2, [3]byte{0xc4, 0xab, 0x00}}, {2, [3]byte{0xc4, 0xbc, 0x00}},
-		{2, [3]byte{0xc5, 0xa1, 0x00}}, {2, [3]byte{0xc5, 0x84, 0x00}},
-		{2, [3]byte{0xc5, 0x86, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc5, 0x8d, 0x00}}, {2, [3]byte{0xc3, 0xb5, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xc5, 0xb3, 0x00}}, {2, [3]byte{0xc5, 0x82, 0x00}},
-		{2, [3]byte{0xc5, 0x9b, 0x00}}, {2, [3]byte{0xc5, 0xab, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc5, 0xbc, 0x00}},
-		{2, [3]byte{0xc5, 0xbe, 0x00}}, {2, [3]byte{0xcb, 0x99, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa20000a2, 0xa30000a3, 0xa40000a4, 0xa60000a6, 0xa70000a7, 0x8d0000a8, 0xa90000a9,
-		0xab0000ab, 0xac0000ac, 0xad0000ad, 0xae0000ae, 0x9d0000af, 0xb00000b0, 0xb10000b1, 0xb20000b2,
-		0xb30000b3, 0xb40000b4, 0xb50000b5, 0xb60000b6, 0xb70000b7, 0x8f0000b8, 0xb90000b9, 0xbb0000bb,
-		0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xc40000c4, 0xc50000c5, 0xaf0000c6, 0xc90000c9, 0xd30000d3,
-		0xd50000d5, 0xd60000d6, 0xd70000d7, 0xa80000d8, 0xdc0000dc, 0xdf0000df, 0xe40000e4, 0xe50000e5,
-		0xbf0000e6, 0xe90000e9, 0xf30000f3, 0xf50000f5, 0xf60000f6, 0xf70000f7, 0xb80000f8, 0xfc0000fc,
-		0xc2000100, 0xe2000101, 0xc0000104, 0xe0000105, 0xc3000106, 0xe3000107, 0xc800010c, 0xe800010d,
-		0xc7000112, 0xe7000113, 0xcb000116, 0xeb000117, 0xc6000118, 0xe6000119, 0xcc000122, 0xec000123,
-		0xce00012a, 0xee00012b, 0xc100012e, 0xe100012f, 0xcd000136, 0xed000137, 0xcf00013b, 0xef00013c,
-		0xd9000141, 0xf9000142, 0xd1000143, 0xf1000144, 0xd2000145, 0xf2000146, 0xd400014c, 0xf400014d,
-		0xaa000156, 0xba000157, 0xda00015a, 0xfa00015b, 0xd0000160, 0xf0000161, 0xdb00016a, 0xfb00016b,
-		0xd8000172, 0xf8000173, 0xca000179, 0xea00017a, 0xdd00017b, 0xfd00017c, 0xde00017d, 0xfe00017e,
-		0x8e0002c7, 0xff0002d9, 0x9e0002db, 0x96002013, 0x97002014, 0x91002018, 0x92002019, 0x8200201a,
-		0x9300201c, 0x9400201d, 0x8400201e, 0x86002020, 0x87002021, 0x95002022, 0x85002026, 0x89002030,
-		0x8b002039, 0x9b00203a, 0x800020ac, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
-		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
-	},
-}
-
-// Windows1258 is the Windows 1258 encoding.
-var Windows1258 *Charmap = &windows1258
-
-var windows1258 = Charmap{
-	name:          "Windows 1258",
-	mib:           identifier.Windows1258,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xac}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xe2, 0x80, 0x9a}}, {2, [3]byte{0xc6, 0x92, 0x00}},
-		{3, [3]byte{0xe2, 0x80, 0x9e}}, {3, [3]byte{0xe2, 0x80, 0xa6}},
-		{3, [3]byte{0xe2, 0x80, 0xa0}}, {3, [3]byte{0xe2, 0x80, 0xa1}},
-		{2, [3]byte{0xcb, 0x86, 0x00}}, {3, [3]byte{0xe2, 0x80, 0xb0}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0xb9}},
-		{2, [3]byte{0xc5, 0x92, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0x98}},
-		{3, [3]byte{0xe2, 0x80, 0x99}}, {3, [3]byte{0xe2, 0x80, 0x9c}},
-		{3, [3]byte{0xe2, 0x80, 0x9d}}, {3, [3]byte{0xe2, 0x80, 0xa2}},
-		{3, [3]byte{0xe2, 0x80, 0x93}}, {3, [3]byte{0xe2, 0x80, 0x94}},
-		{2, [3]byte{0xcb, 0x9c, 0x00}}, {3, [3]byte{0xe2, 0x84, 0xa2}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {3, [3]byte{0xe2, 0x80, 0xba}},
-		{2, [3]byte{0xc5, 0x93, 0x00}}, {3, [3]byte{0xef, 0xbf, 0xbd}},
-		{3, [3]byte{0xef, 0xbf, 0xbd}}, {2, [3]byte{0xc5, 0xb8, 0x00}},
-		{2, [3]byte{0xc2, 0xa0, 0x00}}, {2, [3]byte{0xc2, 0xa1, 0x00}},
-		{2, [3]byte{0xc2, 0xa2, 0x00}}, {2, [3]byte{0xc2, 0xa3, 0x00}},
-		{2, [3]byte{0xc2, 0xa4, 0x00}}, {2, [3]byte{0xc2, 0xa5, 0x00}},
-		{2, [3]byte{0xc2, 0xa6, 0x00}}, {2, [3]byte{0xc2, 0xa7, 0x00}},
-		{2, [3]byte{0xc2, 0xa8, 0x00}}, {2, [3]byte{0xc2, 0xa9, 0x00}},
-		{2, [3]byte{0xc2, 0xaa, 0x00}}, {2, [3]byte{0xc2, 0xab, 0x00}},
-		{2, [3]byte{0xc2, 0xac, 0x00}}, {2, [3]byte{0xc2, 0xad, 0x00}},
-		{2, [3]byte{0xc2, 0xae, 0x00}}, {2, [3]byte{0xc2, 0xaf, 0x00}},
-		{2, [3]byte{0xc2, 0xb0, 0x00}}, {2, [3]byte{0xc2, 0xb1, 0x00}},
-		{2, [3]byte{0xc2, 0xb2, 0x00}}, {2, [3]byte{0xc2, 0xb3, 0x00}},
-		{2, [3]byte{0xc2, 0xb4, 0x00}}, {2, [3]byte{0xc2, 0xb5, 0x00}},
-		{2, [3]byte{0xc2, 0xb6, 0x00}}, {2, [3]byte{0xc2, 0xb7, 0x00}},
-		{2, [3]byte{0xc2, 0xb8, 0x00}}, {2, [3]byte{0xc2, 0xb9, 0x00}},
-		{2, [3]byte{0xc2, 0xba, 0x00}}, {2, [3]byte{0xc2, 0xbb, 0x00}},
-		{2, [3]byte{0xc2, 0xbc, 0x00}}, {2, [3]byte{0xc2, 0xbd, 0x00}},
-		{2, [3]byte{0xc2, 0xbe, 0x00}}, {2, [3]byte{0xc2, 0xbf, 0x00}},
-		{2, [3]byte{0xc3, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x81, 0x00}},
-		{2, [3]byte{0xc3, 0x82, 0x00}}, {2, [3]byte{0xc4, 0x82, 0x00}},
-		{2, [3]byte{0xc3, 0x84, 0x00}}, {2, [3]byte{0xc3, 0x85, 0x00}},
-		{2, [3]byte{0xc3, 0x86, 0x00}}, {2, [3]byte{0xc3, 0x87, 0x00}},
-		{2, [3]byte{0xc3, 0x88, 0x00}}, {2, [3]byte{0xc3, 0x89, 0x00}},
-		{2, [3]byte{0xc3, 0x8a, 0x00}}, {2, [3]byte{0xc3, 0x8b, 0x00}},
-		{2, [3]byte{0xcc, 0x80, 0x00}}, {2, [3]byte{0xc3, 0x8d, 0x00}},
-		{2, [3]byte{0xc3, 0x8e, 0x00}}, {2, [3]byte{0xc3, 0x8f, 0x00}},
-		{2, [3]byte{0xc4, 0x90, 0x00}}, {2, [3]byte{0xc3, 0x91, 0x00}},
-		{2, [3]byte{0xcc, 0x89, 0x00}}, {2, [3]byte{0xc3, 0x93, 0x00}},
-		{2, [3]byte{0xc3, 0x94, 0x00}}, {2, [3]byte{0xc6, 0xa0, 0x00}},
-		{2, [3]byte{0xc3, 0x96, 0x00}}, {2, [3]byte{0xc3, 0x97, 0x00}},
-		{2, [3]byte{0xc3, 0x98, 0x00}}, {2, [3]byte{0xc3, 0x99, 0x00}},
-		{2, [3]byte{0xc3, 0x9a, 0x00}}, {2, [3]byte{0xc3, 0x9b, 0x00}},
-		{2, [3]byte{0xc3, 0x9c, 0x00}}, {2, [3]byte{0xc6, 0xaf, 0x00}},
-		{2, [3]byte{0xcc, 0x83, 0x00}}, {2, [3]byte{0xc3, 0x9f, 0x00}},
-		{2, [3]byte{0xc3, 0xa0, 0x00}}, {2, [3]byte{0xc3, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xa2, 0x00}}, {2, [3]byte{0xc4, 0x83, 0x00}},
-		{2, [3]byte{0xc3, 0xa4, 0x00}}, {2, [3]byte{0xc3, 0xa5, 0x00}},
-		{2, [3]byte{0xc3, 0xa6, 0x00}}, {2, [3]byte{0xc3, 0xa7, 0x00}},
-		{2, [3]byte{0xc3, 0xa8, 0x00}}, {2, [3]byte{0xc3, 0xa9, 0x00}},
-		{2, [3]byte{0xc3, 0xaa, 0x00}}, {2, [3]byte{0xc3, 0xab, 0x00}},
-		{2, [3]byte{0xcc, 0x81, 0x00}}, {2, [3]byte{0xc3, 0xad, 0x00}},
-		{2, [3]byte{0xc3, 0xae, 0x00}}, {2, [3]byte{0xc3, 0xaf, 0x00}},
-		{2, [3]byte{0xc4, 0x91, 0x00}}, {2, [3]byte{0xc3, 0xb1, 0x00}},
-		{2, [3]byte{0xcc, 0xa3, 0x00}}, {2, [3]byte{0xc3, 0xb3, 0x00}},
-		{2, [3]byte{0xc3, 0xb4, 0x00}}, {2, [3]byte{0xc6, 0xa1, 0x00}},
-		{2, [3]byte{0xc3, 0xb6, 0x00}}, {2, [3]byte{0xc3, 0xb7, 0x00}},
-		{2, [3]byte{0xc3, 0xb8, 0x00}}, {2, [3]byte{0xc3, 0xb9, 0x00}},
-		{2, [3]byte{0xc3, 0xba, 0x00}}, {2, [3]byte{0xc3, 0xbb, 0x00}},
-		{2, [3]byte{0xc3, 0xbc, 0x00}}, {2, [3]byte{0xc6, 0xb0, 0x00}},
-		{3, [3]byte{0xe2, 0x82, 0xab}}, {2, [3]byte{0xc3, 0xbf, 0x00}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0xa00000a0, 0xa10000a1, 0xa20000a2, 0xa30000a3, 0xa40000a4, 0xa50000a5, 0xa60000a6, 0xa70000a7,
-		0xa80000a8, 0xa90000a9, 0xaa0000aa, 0xab0000ab, 0xac0000ac, 0xad0000ad, 0xae0000ae, 0xaf0000af,
-		0xb00000b0, 0xb10000b1, 0xb20000b2, 0xb30000b3, 0xb40000b4, 0xb50000b5, 0xb60000b6, 0xb70000b7,
-		0xb80000b8, 0xb90000b9, 0xba0000ba, 0xbb0000bb, 0xbc0000bc, 0xbd0000bd, 0xbe0000be, 0xbf0000bf,
-		0xc00000c0, 0xc10000c1, 0xc20000c2, 0xc40000c4, 0xc50000c5, 0xc60000c6, 0xc70000c7, 0xc80000c8,
-		0xc90000c9, 0xca0000ca, 0xcb0000cb, 0xcd0000cd, 0xce0000ce, 0xcf0000cf, 0xd10000d1, 0xd30000d3,
-		0xd40000d4, 0xd60000d6, 0xd70000d7, 0xd80000d8, 0xd90000d9, 0xda0000da, 0xdb0000db, 0xdc0000dc,
-		0xdf0000df, 0xe00000e0, 0xe10000e1, 0xe20000e2, 0xe40000e4, 0xe50000e5, 0xe60000e6, 0xe70000e7,
-		0xe80000e8, 0xe90000e9, 0xea0000ea, 0xeb0000eb, 0xed0000ed, 0xee0000ee, 0xef0000ef, 0xf10000f1,
-		0xf30000f3, 0xf40000f4, 0xf60000f6, 0xf70000f7, 0xf80000f8, 0xf90000f9, 0xfa0000fa, 0xfb0000fb,
-		0xfc0000fc, 0xff0000ff, 0xc3000102, 0xe3000103, 0xd0000110, 0xf0000111, 0x8c000152, 0x9c000153,
-		0x9f000178, 0x83000192, 0xd50001a0, 0xf50001a1, 0xdd0001af, 0xfd0001b0, 0x880002c6, 0x980002dc,
-		0xcc000300, 0xec000301, 0xde000303, 0xd2000309, 0xf2000323, 0x96002013, 0x97002014, 0x91002018,
-		0x92002019, 0x8200201a, 0x9300201c, 0x9400201d, 0x8400201e, 0x86002020, 0x87002021, 0x95002022,
-		0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0xfe0020ab, 0x800020ac, 0x99002122, 0x99002122,
-		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
-	},
-}
-
-// XUserDefined is the X-User-Defined encoding.
-//
-// It is defined at http://encoding.spec.whatwg.org/#x-user-defined
-var XUserDefined *Charmap = &xUserDefined
-
-var xUserDefined = Charmap{
-	name:          "X-User-Defined",
-	mib:           identifier.XUserDefined,
-	asciiSuperset: true,
-	low:           0x80,
-	replacement:   0x1a,
-	decode: [256]utf8Enc{
-		{1, [3]byte{0x00, 0x00, 0x00}}, {1, [3]byte{0x01, 0x00, 0x00}},
-		{1, [3]byte{0x02, 0x00, 0x00}}, {1, [3]byte{0x03, 0x00, 0x00}},
-		{1, [3]byte{0x04, 0x00, 0x00}}, {1, [3]byte{0x05, 0x00, 0x00}},
-		{1, [3]byte{0x06, 0x00, 0x00}}, {1, [3]byte{0x07, 0x00, 0x00}},
-		{1, [3]byte{0x08, 0x00, 0x00}}, {1, [3]byte{0x09, 0x00, 0x00}},
-		{1, [3]byte{0x0a, 0x00, 0x00}}, {1, [3]byte{0x0b, 0x00, 0x00}},
-		{1, [3]byte{0x0c, 0x00, 0x00}}, {1, [3]byte{0x0d, 0x00, 0x00}},
-		{1, [3]byte{0x0e, 0x00, 0x00}}, {1, [3]byte{0x0f, 0x00, 0x00}},
-		{1, [3]byte{0x10, 0x00, 0x00}}, {1, [3]byte{0x11, 0x00, 0x00}},
-		{1, [3]byte{0x12, 0x00, 0x00}}, {1, [3]byte{0x13, 0x00, 0x00}},
-		{1, [3]byte{0x14, 0x00, 0x00}}, {1, [3]byte{0x15, 0x00, 0x00}},
-		{1, [3]byte{0x16, 0x00, 0x00}}, {1, [3]byte{0x17, 0x00, 0x00}},
-		{1, [3]byte{0x18, 0x00, 0x00}}, {1, [3]byte{0x19, 0x00, 0x00}},
-		{1, [3]byte{0x1a, 0x00, 0x00}}, {1, [3]byte{0x1b, 0x00, 0x00}},
-		{1, [3]byte{0x1c, 0x00, 0x00}}, {1, [3]byte{0x1d, 0x00, 0x00}},
-		{1, [3]byte{0x1e, 0x00, 0x00}}, {1, [3]byte{0x1f, 0x00, 0x00}},
-		{1, [3]byte{0x20, 0x00, 0x00}}, {1, [3]byte{0x21, 0x00, 0x00}},
-		{1, [3]byte{0x22, 0x00, 0x00}}, {1, [3]byte{0x23, 0x00, 0x00}},
-		{1, [3]byte{0x24, 0x00, 0x00}}, {1, [3]byte{0x25, 0x00, 0x00}},
-		{1, [3]byte{0x26, 0x00, 0x00}}, {1, [3]byte{0x27, 0x00, 0x00}},
-		{1, [3]byte{0x28, 0x00, 0x00}}, {1, [3]byte{0x29, 0x00, 0x00}},
-		{1, [3]byte{0x2a, 0x00, 0x00}}, {1, [3]byte{0x2b, 0x00, 0x00}},
-		{1, [3]byte{0x2c, 0x00, 0x00}}, {1, [3]byte{0x2d, 0x00, 0x00}},
-		{1, [3]byte{0x2e, 0x00, 0x00}}, {1, [3]byte{0x2f, 0x00, 0x00}},
-		{1, [3]byte{0x30, 0x00, 0x00}}, {1, [3]byte{0x31, 0x00, 0x00}},
-		{1, [3]byte{0x32, 0x00, 0x00}}, {1, [3]byte{0x33, 0x00, 0x00}},
-		{1, [3]byte{0x34, 0x00, 0x00}}, {1, [3]byte{0x35, 0x00, 0x00}},
-		{1, [3]byte{0x36, 0x00, 0x00}}, {1, [3]byte{0x37, 0x00, 0x00}},
-		{1, [3]byte{0x38, 0x00, 0x00}}, {1, [3]byte{0x39, 0x00, 0x00}},
-		{1, [3]byte{0x3a, 0x00, 0x00}}, {1, [3]byte{0x3b, 0x00, 0x00}},
-		{1, [3]byte{0x3c, 0x00, 0x00}}, {1, [3]byte{0x3d, 0x00, 0x00}},
-		{1, [3]byte{0x3e, 0x00, 0x00}}, {1, [3]byte{0x3f, 0x00, 0x00}},
-		{1, [3]byte{0x40, 0x00, 0x00}}, {1, [3]byte{0x41, 0x00, 0x00}},
-		{1, [3]byte{0x42, 0x00, 0x00}}, {1, [3]byte{0x43, 0x00, 0x00}},
-		{1, [3]byte{0x44, 0x00, 0x00}}, {1, [3]byte{0x45, 0x00, 0x00}},
-		{1, [3]byte{0x46, 0x00, 0x00}}, {1, [3]byte{0x47, 0x00, 0x00}},
-		{1, [3]byte{0x48, 0x00, 0x00}}, {1, [3]byte{0x49, 0x00, 0x00}},
-		{1, [3]byte{0x4a, 0x00, 0x00}}, {1, [3]byte{0x4b, 0x00, 0x00}},
-		{1, [3]byte{0x4c, 0x00, 0x00}}, {1, [3]byte{0x4d, 0x00, 0x00}},
-		{1, [3]byte{0x4e, 0x00, 0x00}}, {1, [3]byte{0x4f, 0x00, 0x00}},
-		{1, [3]byte{0x50, 0x00, 0x00}}, {1, [3]byte{0x51, 0x00, 0x00}},
-		{1, [3]byte{0x52, 0x00, 0x00}}, {1, [3]byte{0x53, 0x00, 0x00}},
-		{1, [3]byte{0x54, 0x00, 0x00}}, {1, [3]byte{0x55, 0x00, 0x00}},
-		{1, [3]byte{0x56, 0x00, 0x00}}, {1, [3]byte{0x57, 0x00, 0x00}},
-		{1, [3]byte{0x58, 0x00, 0x00}}, {1, [3]byte{0x59, 0x00, 0x00}},
-		{1, [3]byte{0x5a, 0x00, 0x00}}, {1, [3]byte{0x5b, 0x00, 0x00}},
-		{1, [3]byte{0x5c, 0x00, 0x00}}, {1, [3]byte{0x5d, 0x00, 0x00}},
-		{1, [3]byte{0x5e, 0x00, 0x00}}, {1, [3]byte{0x5f, 0x00, 0x00}},
-		{1, [3]byte{0x60, 0x00, 0x00}}, {1, [3]byte{0x61, 0x00, 0x00}},
-		{1, [3]byte{0x62, 0x00, 0x00}}, {1, [3]byte{0x63, 0x00, 0x00}},
-		{1, [3]byte{0x64, 0x00, 0x00}}, {1, [3]byte{0x65, 0x00, 0x00}},
-		{1, [3]byte{0x66, 0x00, 0x00}}, {1, [3]byte{0x67, 0x00, 0x00}},
-		{1, [3]byte{0x68, 0x00, 0x00}}, {1, [3]byte{0x69, 0x00, 0x00}},
-		{1, [3]byte{0x6a, 0x00, 0x00}}, {1, [3]byte{0x6b, 0x00, 0x00}},
-		{1, [3]byte{0x6c, 0x00, 0x00}}, {1, [3]byte{0x6d, 0x00, 0x00}},
-		{1, [3]byte{0x6e, 0x00, 0x00}}, {1, [3]byte{0x6f, 0x00, 0x00}},
-		{1, [3]byte{0x70, 0x00, 0x00}}, {1, [3]byte{0x71, 0x00, 0x00}},
-		{1, [3]byte{0x72, 0x00, 0x00}}, {1, [3]byte{0x73, 0x00, 0x00}},
-		{1, [3]byte{0x74, 0x00, 0x00}}, {1, [3]byte{0x75, 0x00, 0x00}},
-		{1, [3]byte{0x76, 0x00, 0x00}}, {1, [3]byte{0x77, 0x00, 0x00}},
-		{1, [3]byte{0x78, 0x00, 0x00}}, {1, [3]byte{0x79, 0x00, 0x00}},
-		{1, [3]byte{0x7a, 0x00, 0x00}}, {1, [3]byte{0x7b, 0x00, 0x00}},
-		{1, [3]byte{0x7c, 0x00, 0x00}}, {1, [3]byte{0x7d, 0x00, 0x00}},
-		{1, [3]byte{0x7e, 0x00, 0x00}}, {1, [3]byte{0x7f, 0x00, 0x00}},
-		{3, [3]byte{0xef, 0x9e, 0x80}}, {3, [3]byte{0xef, 0x9e, 0x81}},
-		{3, [3]byte{0xef, 0x9e, 0x82}}, {3, [3]byte{0xef, 0x9e, 0x83}},
-		{3, [3]byte{0xef, 0x9e, 0x84}}, {3, [3]byte{0xef, 0x9e, 0x85}},
-		{3, [3]byte{0xef, 0x9e, 0x86}}, {3, [3]byte{0xef, 0x9e, 0x87}},
-		{3, [3]byte{0xef, 0x9e, 0x88}}, {3, [3]byte{0xef, 0x9e, 0x89}},
-		{3, [3]byte{0xef, 0x9e, 0x8a}}, {3, [3]byte{0xef, 0x9e, 0x8b}},
-		{3, [3]byte{0xef, 0x9e, 0x8c}}, {3, [3]byte{0xef, 0x9e, 0x8d}},
-		{3, [3]byte{0xef, 0x9e, 0x8e}}, {3, [3]byte{0xef, 0x9e, 0x8f}},
-		{3, [3]byte{0xef, 0x9e, 0x90}}, {3, [3]byte{0xef, 0x9e, 0x91}},
-		{3, [3]byte{0xef, 0x9e, 0x92}}, {3, [3]byte{0xef, 0x9e, 0x93}},
-		{3, [3]byte{0xef, 0x9e, 0x94}}, {3, [3]byte{0xef, 0x9e, 0x95}},
-		{3, [3]byte{0xef, 0x9e, 0x96}}, {3, [3]byte{0xef, 0x9e, 0x97}},
-		{3, [3]byte{0xef, 0x9e, 0x98}}, {3, [3]byte{0xef, 0x9e, 0x99}},
-		{3, [3]byte{0xef, 0x9e, 0x9a}}, {3, [3]byte{0xef, 0x9e, 0x9b}},
-		{3, [3]byte{0xef, 0x9e, 0x9c}}, {3, [3]byte{0xef, 0x9e, 0x9d}},
-		{3, [3]byte{0xef, 0x9e, 0x9e}}, {3, [3]byte{0xef, 0x9e, 0x9f}},
-		{3, [3]byte{0xef, 0x9e, 0xa0}}, {3, [3]byte{0xef, 0x9e, 0xa1}},
-		{3, [3]byte{0xef, 0x9e, 0xa2}}, {3, [3]byte{0xef, 0x9e, 0xa3}},
-		{3, [3]byte{0xef, 0x9e, 0xa4}}, {3, [3]byte{0xef, 0x9e, 0xa5}},
-		{3, [3]byte{0xef, 0x9e, 0xa6}}, {3, [3]byte{0xef, 0x9e, 0xa7}},
-		{3, [3]byte{0xef, 0x9e, 0xa8}}, {3, [3]byte{0xef, 0x9e, 0xa9}},
-		{3, [3]byte{0xef, 0x9e, 0xaa}}, {3, [3]byte{0xef, 0x9e, 0xab}},
-		{3, [3]byte{0xef, 0x9e, 0xac}}, {3, [3]byte{0xef, 0x9e, 0xad}},
-		{3, [3]byte{0xef, 0x9e, 0xae}}, {3, [3]byte{0xef, 0x9e, 0xaf}},
-		{3, [3]byte{0xef, 0x9e, 0xb0}}, {3, [3]byte{0xef, 0x9e, 0xb1}},
-		{3, [3]byte{0xef, 0x9e, 0xb2}}, {3, [3]byte{0xef, 0x9e, 0xb3}},
-		{3, [3]byte{0xef, 0x9e, 0xb4}}, {3, [3]byte{0xef, 0x9e, 0xb5}},
-		{3, [3]byte{0xef, 0x9e, 0xb6}}, {3, [3]byte{0xef, 0x9e, 0xb7}},
-		{3, [3]byte{0xef, 0x9e, 0xb8}}, {3, [3]byte{0xef, 0x9e, 0xb9}},
-		{3, [3]byte{0xef, 0x9e, 0xba}}, {3, [3]byte{0xef, 0x9e, 0xbb}},
-		{3, [3]byte{0xef, 0x9e, 0xbc}}, {3, [3]byte{0xef, 0x9e, 0xbd}},
-		{3, [3]byte{0xef, 0x9e, 0xbe}}, {3, [3]byte{0xef, 0x9e, 0xbf}},
-		{3, [3]byte{0xef, 0x9f, 0x80}}, {3, [3]byte{0xef, 0x9f, 0x81}},
-		{3, [3]byte{0xef, 0x9f, 0x82}}, {3, [3]byte{0xef, 0x9f, 0x83}},
-		{3, [3]byte{0xef, 0x9f, 0x84}}, {3, [3]byte{0xef, 0x9f, 0x85}},
-		{3, [3]byte{0xef, 0x9f, 0x86}}, {3, [3]byte{0xef, 0x9f, 0x87}},
-		{3, [3]byte{0xef, 0x9f, 0x88}}, {3, [3]byte{0xef, 0x9f, 0x89}},
-		{3, [3]byte{0xef, 0x9f, 0x8a}}, {3, [3]byte{0xef, 0x9f, 0x8b}},
-		{3, [3]byte{0xef, 0x9f, 0x8c}}, {3, [3]byte{0xef, 0x9f, 0x8d}},
-		{3, [3]byte{0xef, 0x9f, 0x8e}}, {3, [3]byte{0xef, 0x9f, 0x8f}},
-		{3, [3]byte{0xef, 0x9f, 0x90}}, {3, [3]byte{0xef, 0x9f, 0x91}},
-		{3, [3]byte{0xef, 0x9f, 0x92}}, {3, [3]byte{0xef, 0x9f, 0x93}},
-		{3, [3]byte{0xef, 0x9f, 0x94}}, {3, [3]byte{0xef, 0x9f, 0x95}},
-		{3, [3]byte{0xef, 0x9f, 0x96}}, {3, [3]byte{0xef, 0x9f, 0x97}},
-		{3, [3]byte{0xef, 0x9f, 0x98}}, {3, [3]byte{0xef, 0x9f, 0x99}},
-		{3, [3]byte{0xef, 0x9f, 0x9a}}, {3, [3]byte{0xef, 0x9f, 0x9b}},
-		{3, [3]byte{0xef, 0x9f, 0x9c}}, {3, [3]byte{0xef, 0x9f, 0x9d}},
-		{3, [3]byte{0xef, 0x9f, 0x9e}}, {3, [3]byte{0xef, 0x9f, 0x9f}},
-		{3, [3]byte{0xef, 0x9f, 0xa0}}, {3, [3]byte{0xef, 0x9f, 0xa1}},
-		{3, [3]byte{0xef, 0x9f, 0xa2}}, {3, [3]byte{0xef, 0x9f, 0xa3}},
-		{3, [3]byte{0xef, 0x9f, 0xa4}}, {3, [3]byte{0xef, 0x9f, 0xa5}},
-		{3, [3]byte{0xef, 0x9f, 0xa6}}, {3, [3]byte{0xef, 0x9f, 0xa7}},
-		{3, [3]byte{0xef, 0x9f, 0xa8}}, {3, [3]byte{0xef, 0x9f, 0xa9}},
-		{3, [3]byte{0xef, 0x9f, 0xaa}}, {3, [3]byte{0xef, 0x9f, 0xab}},
-		{3, [3]byte{0xef, 0x9f, 0xac}}, {3, [3]byte{0xef, 0x9f, 0xad}},
-		{3, [3]byte{0xef, 0x9f, 0xae}}, {3, [3]byte{0xef, 0x9f, 0xaf}},
-		{3, [3]byte{0xef, 0x9f, 0xb0}}, {3, [3]byte{0xef, 0x9f, 0xb1}},
-		{3, [3]byte{0xef, 0x9f, 0xb2}}, {3, [3]byte{0xef, 0x9f, 0xb3}},
-		{3, [3]byte{0xef, 0x9f, 0xb4}}, {3, [3]byte{0xef, 0x9f, 0xb5}},
-		{3, [3]byte{0xef, 0x9f, 0xb6}}, {3, [3]byte{0xef, 0x9f, 0xb7}},
-		{3, [3]byte{0xef, 0x9f, 0xb8}}, {3, [3]byte{0xef, 0x9f, 0xb9}},
-		{3, [3]byte{0xef, 0x9f, 0xba}}, {3, [3]byte{0xef, 0x9f, 0xbb}},
-		{3, [3]byte{0xef, 0x9f, 0xbc}}, {3, [3]byte{0xef, 0x9f, 0xbd}},
-		{3, [3]byte{0xef, 0x9f, 0xbe}}, {3, [3]byte{0xef, 0x9f, 0xbf}},
-	},
-	encode: [256]uint32{
-		0x00000000, 0x01000001, 0x02000002, 0x03000003, 0x04000004, 0x05000005, 0x06000006, 0x07000007,
-		0x08000008, 0x09000009, 0x0a00000a, 0x0b00000b, 0x0c00000c, 0x0d00000d, 0x0e00000e, 0x0f00000f,
-		0x10000010, 0x11000011, 0x12000012, 0x13000013, 0x14000014, 0x15000015, 0x16000016, 0x17000017,
-		0x18000018, 0x19000019, 0x1a00001a, 0x1b00001b, 0x1c00001c, 0x1d00001d, 0x1e00001e, 0x1f00001f,
-		0x20000020, 0x21000021, 0x22000022, 0x23000023, 0x24000024, 0x25000025, 0x26000026, 0x27000027,
-		0x28000028, 0x29000029, 0x2a00002a, 0x2b00002b, 0x2c00002c, 0x2d00002d, 0x2e00002e, 0x2f00002f,
-		0x30000030, 0x31000031, 0x32000032, 0x33000033, 0x34000034, 0x35000035, 0x36000036, 0x37000037,
-		0x38000038, 0x39000039, 0x3a00003a, 0x3b00003b, 0x3c00003c, 0x3d00003d, 0x3e00003e, 0x3f00003f,
-		0x40000040, 0x41000041, 0x42000042, 0x43000043, 0x44000044, 0x45000045, 0x46000046, 0x47000047,
-		0x48000048, 0x49000049, 0x4a00004a, 0x4b00004b, 0x4c00004c, 0x4d00004d, 0x4e00004e, 0x4f00004f,
-		0x50000050, 0x51000051, 0x52000052, 0x53000053, 0x54000054, 0x55000055, 0x56000056, 0x57000057,
-		0x58000058, 0x59000059, 0x5a00005a, 0x5b00005b, 0x5c00005c, 0x5d00005d, 0x5e00005e, 0x5f00005f,
-		0x60000060, 0x61000061, 0x62000062, 0x63000063, 0x64000064, 0x65000065, 0x66000066, 0x67000067,
-		0x68000068, 0x69000069, 0x6a00006a, 0x6b00006b, 0x6c00006c, 0x6d00006d, 0x6e00006e, 0x6f00006f,
-		0x70000070, 0x71000071, 0x72000072, 0x73000073, 0x74000074, 0x75000075, 0x76000076, 0x77000077,
-		0x78000078, 0x79000079, 0x7a00007a, 0x7b00007b, 0x7c00007c, 0x7d00007d, 0x7e00007e, 0x7f00007f,
-		0x8000f780, 0x8100f781, 0x8200f782, 0x8300f783, 0x8400f784, 0x8500f785, 0x8600f786, 0x8700f787,
-		0x8800f788, 0x8900f789, 0x8a00f78a, 0x8b00f78b, 0x8c00f78c, 0x8d00f78d, 0x8e00f78e, 0x8f00f78f,
-		0x9000f790, 0x9100f791, 0x9200f792, 0x9300f793, 0x9400f794, 0x9500f795, 0x9600f796, 0x9700f797,
-		0x9800f798, 0x9900f799, 0x9a00f79a, 0x9b00f79b, 0x9c00f79c, 0x9d00f79d, 0x9e00f79e, 0x9f00f79f,
-		0xa000f7a0, 0xa100f7a1, 0xa200f7a2, 0xa300f7a3, 0xa400f7a4, 0xa500f7a5, 0xa600f7a6, 0xa700f7a7,
-		0xa800f7a8, 0xa900f7a9, 0xaa00f7aa, 0xab00f7ab, 0xac00f7ac, 0xad00f7ad, 0xae00f7ae, 0xaf00f7af,
-		0xb000f7b0, 0xb100f7b1, 0xb200f7b2, 0xb300f7b3, 0xb400f7b4, 0xb500f7b5, 0xb600f7b6, 0xb700f7b7,
-		0xb800f7b8, 0xb900f7b9, 0xba00f7ba, 0xbb00f7bb, 0xbc00f7bc, 0xbd00f7bd, 0xbe00f7be, 0xbf00f7bf,
-		0xc000f7c0, 0xc100f7c1, 0xc200f7c2, 0xc300f7c3, 0xc400f7c4, 0xc500f7c5, 0xc600f7c6, 0xc700f7c7,
-		0xc800f7c8, 0xc900f7c9, 0xca00f7ca, 0xcb00f7cb, 0xcc00f7cc, 0xcd00f7cd, 0xce00f7ce, 0xcf00f7cf,
-		0xd000f7d0, 0xd100f7d1, 0xd200f7d2, 0xd300f7d3, 0xd400f7d4, 0xd500f7d5, 0xd600f7d6, 0xd700f7d7,
-		0xd800f7d8, 0xd900f7d9, 0xda00f7da, 0xdb00f7db, 0xdc00f7dc, 0xdd00f7dd, 0xde00f7de, 0xdf00f7df,
-		0xe000f7e0, 0xe100f7e1, 0xe200f7e2, 0xe300f7e3, 0xe400f7e4, 0xe500f7e5, 0xe600f7e6, 0xe700f7e7,
-		0xe800f7e8, 0xe900f7e9, 0xea00f7ea, 0xeb00f7eb, 0xec00f7ec, 0xed00f7ed, 0xee00f7ee, 0xef00f7ef,
-		0xf000f7f0, 0xf100f7f1, 0xf200f7f2, 0xf300f7f3, 0xf400f7f4, 0xf500f7f5, 0xf600f7f6, 0xf700f7f7,
-		0xf800f7f8, 0xf900f7f9, 0xfa00f7fa, 0xfb00f7fb, 0xfc00f7fc, 0xfd00f7fd, 0xfe00f7fe, 0xff00f7ff,
-	},
-}
-var listAll = []encoding.Encoding{
-	CodePage037,
-	CodePage437,
-	CodePage850,
-	CodePage852,
-	CodePage855,
-	CodePage858,
-	CodePage860,
-	CodePage862,
-	CodePage863,
-	CodePage865,
-	CodePage866,
-	CodePage1047,
-	CodePage1140,
-	ISO8859_1,
-	ISO8859_2,
-	ISO8859_3,
-	ISO8859_4,
-	ISO8859_5,
-	ISO8859_6,
-	ISO8859_6E,
-	ISO8859_6I,
-	ISO8859_7,
-	ISO8859_8,
-	ISO8859_8E,
-	ISO8859_8I,
-	ISO8859_9,
-	ISO8859_10,
-	ISO8859_13,
-	ISO8859_14,
-	ISO8859_15,
-	ISO8859_16,
-	KOI8R,
-	KOI8U,
-	Macintosh,
-	MacintoshCyrillic,
-	Windows874,
-	Windows1250,
-	Windows1251,
-	Windows1252,
-	Windows1253,
-	Windows1254,
-	Windows1255,
-	Windows1256,
-	Windows1257,
-	Windows1258,
-	XUserDefined,
-}
-
-// Total table size 87024 bytes (84KiB); checksum: 811C9DC5
diff --git a/vendor/golang.org/x/text/encoding/encoding.go b/vendor/golang.org/x/text/encoding/encoding.go
deleted file mode 100644
index 221f175c01..0000000000
--- a/vendor/golang.org/x/text/encoding/encoding.go
+++ /dev/null
@@ -1,335 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package encoding defines an interface for character encodings, such as Shift
-// JIS and Windows 1252, that can convert to and from UTF-8.
-//
-// Encoding implementations are provided in other packages, such as
-// golang.org/x/text/encoding/charmap and
-// golang.org/x/text/encoding/japanese.
-package encoding // import "golang.org/x/text/encoding"
-
-import (
-	"errors"
-	"io"
-	"strconv"
-	"unicode/utf8"
-
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/transform"
-)
-
-// TODO:
-// - There seems to be some inconsistency in when decoders return errors
-//   and when not. Also documentation seems to suggest they shouldn't return
-//   errors at all (except for UTF-16).
-// - Encoders seem to rely on or at least benefit from the input being in NFC
-//   normal form. Perhaps add an example how users could prepare their output.
-
-// Encoding is a character set encoding that can be transformed to and from
-// UTF-8.
-type Encoding interface {
-	// NewDecoder returns a Decoder.
-	NewDecoder() *Decoder
-
-	// NewEncoder returns an Encoder.
-	NewEncoder() *Encoder
-}
-
-// A Decoder converts bytes to UTF-8. It implements transform.Transformer.
-//
-// Transforming source bytes that are not of that encoding will not result in an
-// error per se. Each byte that cannot be transcoded will be represented in the
-// output by the UTF-8 encoding of '\uFFFD', the replacement rune.
-type Decoder struct {
-	transform.Transformer
-
-	// This forces external creators of Decoders to use names in struct
-	// initializers, allowing for future extendibility without having to break
-	// code.
-	_ struct{}
-}
-
-// Bytes converts the given encoded bytes to UTF-8. It returns the converted
-// bytes or nil, err if any error occurred.
-func (d *Decoder) Bytes(b []byte) ([]byte, error) {
-	b, _, err := transform.Bytes(d, b)
-	if err != nil {
-		return nil, err
-	}
-	return b, nil
-}
-
-// String converts the given encoded string to UTF-8. It returns the converted
-// string or "", err if any error occurred.
-func (d *Decoder) String(s string) (string, error) {
-	s, _, err := transform.String(d, s)
-	if err != nil {
-		return "", err
-	}
-	return s, nil
-}
-
-// Reader wraps another Reader to decode its bytes.
-//
-// The Decoder may not be used for any other operation as long as the returned
-// Reader is in use.
-func (d *Decoder) Reader(r io.Reader) io.Reader {
-	return transform.NewReader(r, d)
-}
-
-// An Encoder converts bytes from UTF-8. It implements transform.Transformer.
-//
-// Each rune that cannot be transcoded will result in an error. In this case,
-// the transform will consume all source byte up to, not including the offending
-// rune. Transforming source bytes that are not valid UTF-8 will be replaced by
-// `\uFFFD`. To return early with an error instead, use transform.Chain to
-// preprocess the data with a UTF8Validator.
-type Encoder struct {
-	transform.Transformer
-
-	// This forces external creators of Encoders to use names in struct
-	// initializers, allowing for future extendibility without having to break
-	// code.
-	_ struct{}
-}
-
-// Bytes converts bytes from UTF-8. It returns the converted bytes or nil, err if
-// any error occurred.
-func (e *Encoder) Bytes(b []byte) ([]byte, error) {
-	b, _, err := transform.Bytes(e, b)
-	if err != nil {
-		return nil, err
-	}
-	return b, nil
-}
-
-// String converts a string from UTF-8. It returns the converted string or
-// "", err if any error occurred.
-func (e *Encoder) String(s string) (string, error) {
-	s, _, err := transform.String(e, s)
-	if err != nil {
-		return "", err
-	}
-	return s, nil
-}
-
-// Writer wraps another Writer to encode its UTF-8 output.
-//
-// The Encoder may not be used for any other operation as long as the returned
-// Writer is in use.
-func (e *Encoder) Writer(w io.Writer) io.Writer {
-	return transform.NewWriter(w, e)
-}
-
-// ASCIISub is the ASCII substitute character, as recommended by
-// http://unicode.org/reports/tr36/#Text_Comparison
-const ASCIISub = '\x1a'
-
-// Nop is the nop encoding. Its transformed bytes are the same as the source
-// bytes; it does not replace invalid UTF-8 sequences.
-var Nop Encoding = nop{}
-
-type nop struct{}
-
-func (nop) NewDecoder() *Decoder {
-	return &Decoder{Transformer: transform.Nop}
-}
-func (nop) NewEncoder() *Encoder {
-	return &Encoder{Transformer: transform.Nop}
-}
-
-// Replacement is the replacement encoding. Decoding from the replacement
-// encoding yields a single '\uFFFD' replacement rune. Encoding from UTF-8 to
-// the replacement encoding yields the same as the source bytes except that
-// invalid UTF-8 is converted to '\uFFFD'.
-//
-// It is defined at http://encoding.spec.whatwg.org/#replacement
-var Replacement Encoding = replacement{}
-
-type replacement struct{}
-
-func (replacement) NewDecoder() *Decoder {
-	return &Decoder{Transformer: replacementDecoder{}}
-}
-
-func (replacement) NewEncoder() *Encoder {
-	return &Encoder{Transformer: replacementEncoder{}}
-}
-
-func (replacement) ID() (mib identifier.MIB, other string) {
-	return identifier.Replacement, ""
-}
-
-type replacementDecoder struct{ transform.NopResetter }
-
-func (replacementDecoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	if len(dst) < 3 {
-		return 0, 0, transform.ErrShortDst
-	}
-	if atEOF {
-		const fffd = "\ufffd"
-		dst[0] = fffd[0]
-		dst[1] = fffd[1]
-		dst[2] = fffd[2]
-		nDst = 3
-	}
-	return nDst, len(src), nil
-}
-
-type replacementEncoder struct{ transform.NopResetter }
-
-func (replacementEncoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-
-	for ; nSrc < len(src); nSrc += size {
-		r = rune(src[nSrc])
-
-		// Decode a 1-byte rune.
-		if r < utf8.RuneSelf {
-			size = 1
-
-		} else {
-			// Decode a multi-byte rune.
-			r, size = utf8.DecodeRune(src[nSrc:])
-			if size == 1 {
-				// All valid runes of size 1 (those below utf8.RuneSelf) were
-				// handled above. We have invalid UTF-8 or we haven't seen the
-				// full character yet.
-				if !atEOF && !utf8.FullRune(src[nSrc:]) {
-					err = transform.ErrShortSrc
-					break
-				}
-				r = '\ufffd'
-			}
-		}
-
-		if nDst+utf8.RuneLen(r) > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		nDst += utf8.EncodeRune(dst[nDst:], r)
-	}
-	return nDst, nSrc, err
-}
-
-// HTMLEscapeUnsupported wraps encoders to replace source runes outside the
-// repertoire of the destination encoding with HTML escape sequences.
-//
-// This wrapper exists to comply to URL and HTML forms requiring a
-// non-terminating legacy encoder. The produced sequences may lead to data
-// loss as they are indistinguishable from legitimate input. To avoid this
-// issue, use UTF-8 encodings whenever possible.
-func HTMLEscapeUnsupported(e *Encoder) *Encoder {
-	return &Encoder{Transformer: &errorHandler{e, errorToHTML}}
-}
-
-// ReplaceUnsupported wraps encoders to replace source runes outside the
-// repertoire of the destination encoding with an encoding-specific
-// replacement.
-//
-// This wrapper is only provided for backwards compatibility and legacy
-// handling. Its use is strongly discouraged. Use UTF-8 whenever possible.
-func ReplaceUnsupported(e *Encoder) *Encoder {
-	return &Encoder{Transformer: &errorHandler{e, errorToReplacement}}
-}
-
-type errorHandler struct {
-	*Encoder
-	handler func(dst []byte, r rune, err repertoireError) (n int, ok bool)
-}
-
-// TODO: consider making this error public in some form.
-type repertoireError interface {
-	Replacement() byte
-}
-
-func (h errorHandler) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	nDst, nSrc, err = h.Transformer.Transform(dst, src, atEOF)
-	for err != nil {
-		rerr, ok := err.(repertoireError)
-		if !ok {
-			return nDst, nSrc, err
-		}
-		r, sz := utf8.DecodeRune(src[nSrc:])
-		n, ok := h.handler(dst[nDst:], r, rerr)
-		if !ok {
-			return nDst, nSrc, transform.ErrShortDst
-		}
-		err = nil
-		nDst += n
-		if nSrc += sz; nSrc < len(src) {
-			var dn, sn int
-			dn, sn, err = h.Transformer.Transform(dst[nDst:], src[nSrc:], atEOF)
-			nDst += dn
-			nSrc += sn
-		}
-	}
-	return nDst, nSrc, err
-}
-
-func errorToHTML(dst []byte, r rune, err repertoireError) (n int, ok bool) {
-	buf := [8]byte{}
-	b := strconv.AppendUint(buf[:0], uint64(r), 10)
-	if n = len(b) + len("&#;"); n >= len(dst) {
-		return 0, false
-	}
-	dst[0] = '&'
-	dst[1] = '#'
-	dst[copy(dst[2:], b)+2] = ';'
-	return n, true
-}
-
-func errorToReplacement(dst []byte, r rune, err repertoireError) (n int, ok bool) {
-	if len(dst) == 0 {
-		return 0, false
-	}
-	dst[0] = err.Replacement()
-	return 1, true
-}
-
-// ErrInvalidUTF8 means that a transformer encountered invalid UTF-8.
-var ErrInvalidUTF8 = errors.New("encoding: invalid UTF-8")
-
-// UTF8Validator is a transformer that returns ErrInvalidUTF8 on the first
-// input byte that is not valid UTF-8.
-var UTF8Validator transform.Transformer = utf8Validator{}
-
-type utf8Validator struct{ transform.NopResetter }
-
-func (utf8Validator) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	n := len(src)
-	if n > len(dst) {
-		n = len(dst)
-	}
-	for i := 0; i < n; {
-		if c := src[i]; c < utf8.RuneSelf {
-			dst[i] = c
-			i++
-			continue
-		}
-		_, size := utf8.DecodeRune(src[i:])
-		if size == 1 {
-			// All valid runes of size 1 (those below utf8.RuneSelf) were
-			// handled above. We have invalid UTF-8 or we haven't seen the
-			// full character yet.
-			err = ErrInvalidUTF8
-			if !atEOF && !utf8.FullRune(src[i:]) {
-				err = transform.ErrShortSrc
-			}
-			return i, i, err
-		}
-		if i+size > len(dst) {
-			return i, i, transform.ErrShortDst
-		}
-		for ; size > 0; size-- {
-			dst[i] = src[i]
-			i++
-		}
-	}
-	if len(src) > len(dst) {
-		err = transform.ErrShortDst
-	}
-	return n, n, err
-}
diff --git a/vendor/golang.org/x/text/encoding/htmlindex/htmlindex.go b/vendor/golang.org/x/text/encoding/htmlindex/htmlindex.go
deleted file mode 100644
index 70f2ac4bc7..0000000000
--- a/vendor/golang.org/x/text/encoding/htmlindex/htmlindex.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate go run gen.go
-
-// Package htmlindex maps character set encoding names to Encodings as
-// recommended by the W3C for use in HTML 5. See http://www.w3.org/TR/encoding.
-package htmlindex
-
-// TODO: perhaps have a "bare" version of the index (used by this package) that
-// is not pre-loaded with all encodings. Global variables in encodings prevent
-// the linker from being able to purge unneeded tables. This means that
-// referencing all encodings, as this package does for the default index, links
-// in all encodings unconditionally.
-//
-// This issue can be solved by either solving the linking issue (see
-// https://github.com/golang/go/issues/6330) or refactoring the encoding tables
-// (e.g. moving the tables to internal packages that do not use global
-// variables).
-
-// TODO: allow canonicalizing names
-
-import (
-	"errors"
-	"strings"
-	"sync"
-
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/language"
-)
-
-var (
-	errInvalidName = errors.New("htmlindex: invalid encoding name")
-	errUnknown     = errors.New("htmlindex: unknown Encoding")
-	errUnsupported = errors.New("htmlindex: this encoding is not supported")
-)
-
-var (
-	matcherOnce sync.Once
-	matcher     language.Matcher
-)
-
-// LanguageDefault returns the canonical name of the default encoding for a
-// given language.
-func LanguageDefault(tag language.Tag) string {
-	matcherOnce.Do(func() {
-		tags := []language.Tag{}
-		for _, t := range strings.Split(locales, " ") {
-			tags = append(tags, language.MustParse(t))
-		}
-		matcher = language.NewMatcher(tags)
-	})
-	_, i, _ := matcher.Match(tag)
-	return canonical[localeMap[i]] // Default is Windows-1252.
-}
-
-// Get returns an Encoding for one of the names listed in
-// http://www.w3.org/TR/encoding using the Default Index. Matching is case-
-// insensitive.
-func Get(name string) (encoding.Encoding, error) {
-	x, ok := nameMap[strings.ToLower(strings.TrimSpace(name))]
-	if !ok {
-		return nil, errInvalidName
-	}
-	return encodings[x], nil
-}
-
-// Name reports the canonical name of the given Encoding. It will return
-// an error if e is not associated with a supported encoding scheme.
-func Name(e encoding.Encoding) (string, error) {
-	id, ok := e.(identifier.Interface)
-	if !ok {
-		return "", errUnknown
-	}
-	mib, _ := id.ID()
-	if mib == 0 {
-		return "", errUnknown
-	}
-	v, ok := mibMap[mib]
-	if !ok {
-		return "", errUnsupported
-	}
-	return canonical[v], nil
-}
diff --git a/vendor/golang.org/x/text/encoding/htmlindex/map.go b/vendor/golang.org/x/text/encoding/htmlindex/map.go
deleted file mode 100644
index c61439045d..0000000000
--- a/vendor/golang.org/x/text/encoding/htmlindex/map.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package htmlindex
-
-import (
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/charmap"
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/encoding/japanese"
-	"golang.org/x/text/encoding/korean"
-	"golang.org/x/text/encoding/simplifiedchinese"
-	"golang.org/x/text/encoding/traditionalchinese"
-	"golang.org/x/text/encoding/unicode"
-)
-
-// mibMap maps a MIB identifier to an htmlEncoding index.
-var mibMap = map[identifier.MIB]htmlEncoding{
-	identifier.UTF8:              utf8,
-	identifier.UTF16BE:           utf16be,
-	identifier.UTF16LE:           utf16le,
-	identifier.IBM866:            ibm866,
-	identifier.ISOLatin2:         iso8859_2,
-	identifier.ISOLatin3:         iso8859_3,
-	identifier.ISOLatin4:         iso8859_4,
-	identifier.ISOLatinCyrillic:  iso8859_5,
-	identifier.ISOLatinArabic:    iso8859_6,
-	identifier.ISOLatinGreek:     iso8859_7,
-	identifier.ISOLatinHebrew:    iso8859_8,
-	identifier.ISO88598I:         iso8859_8I,
-	identifier.ISOLatin6:         iso8859_10,
-	identifier.ISO885913:         iso8859_13,
-	identifier.ISO885914:         iso8859_14,
-	identifier.ISO885915:         iso8859_15,
-	identifier.ISO885916:         iso8859_16,
-	identifier.KOI8R:             koi8r,
-	identifier.KOI8U:             koi8u,
-	identifier.Macintosh:         macintosh,
-	identifier.MacintoshCyrillic: macintoshCyrillic,
-	identifier.Windows874:        windows874,
-	identifier.Windows1250:       windows1250,
-	identifier.Windows1251:       windows1251,
-	identifier.Windows1252:       windows1252,
-	identifier.Windows1253:       windows1253,
-	identifier.Windows1254:       windows1254,
-	identifier.Windows1255:       windows1255,
-	identifier.Windows1256:       windows1256,
-	identifier.Windows1257:       windows1257,
-	identifier.Windows1258:       windows1258,
-	identifier.XUserDefined:      xUserDefined,
-	identifier.GBK:               gbk,
-	identifier.GB18030:           gb18030,
-	identifier.Big5:              big5,
-	identifier.EUCPkdFmtJapanese: eucjp,
-	identifier.ISO2022JP:         iso2022jp,
-	identifier.ShiftJIS:          shiftJIS,
-	identifier.EUCKR:             euckr,
-	identifier.Replacement:       replacement,
-}
-
-// encodings maps the internal htmlEncoding to an Encoding.
-// TODO: consider using a reusable index in encoding/internal.
-var encodings = [numEncodings]encoding.Encoding{
-	utf8:              unicode.UTF8,
-	ibm866:            charmap.CodePage866,
-	iso8859_2:         charmap.ISO8859_2,
-	iso8859_3:         charmap.ISO8859_3,
-	iso8859_4:         charmap.ISO8859_4,
-	iso8859_5:         charmap.ISO8859_5,
-	iso8859_6:         charmap.ISO8859_6,
-	iso8859_7:         charmap.ISO8859_7,
-	iso8859_8:         charmap.ISO8859_8,
-	iso8859_8I:        charmap.ISO8859_8I,
-	iso8859_10:        charmap.ISO8859_10,
-	iso8859_13:        charmap.ISO8859_13,
-	iso8859_14:        charmap.ISO8859_14,
-	iso8859_15:        charmap.ISO8859_15,
-	iso8859_16:        charmap.ISO8859_16,
-	koi8r:             charmap.KOI8R,
-	koi8u:             charmap.KOI8U,
-	macintosh:         charmap.Macintosh,
-	windows874:        charmap.Windows874,
-	windows1250:       charmap.Windows1250,
-	windows1251:       charmap.Windows1251,
-	windows1252:       charmap.Windows1252,
-	windows1253:       charmap.Windows1253,
-	windows1254:       charmap.Windows1254,
-	windows1255:       charmap.Windows1255,
-	windows1256:       charmap.Windows1256,
-	windows1257:       charmap.Windows1257,
-	windows1258:       charmap.Windows1258,
-	macintoshCyrillic: charmap.MacintoshCyrillic,
-	gbk:               simplifiedchinese.GBK,
-	gb18030:           simplifiedchinese.GB18030,
-	big5:              traditionalchinese.Big5,
-	eucjp:             japanese.EUCJP,
-	iso2022jp:         japanese.ISO2022JP,
-	shiftJIS:          japanese.ShiftJIS,
-	euckr:             korean.EUCKR,
-	replacement:       encoding.Replacement,
-	utf16be:           unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM),
-	utf16le:           unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM),
-	xUserDefined:      charmap.XUserDefined,
-}
diff --git a/vendor/golang.org/x/text/encoding/htmlindex/tables.go b/vendor/golang.org/x/text/encoding/htmlindex/tables.go
deleted file mode 100644
index 9d6b4315c2..0000000000
--- a/vendor/golang.org/x/text/encoding/htmlindex/tables.go
+++ /dev/null
@@ -1,352 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package htmlindex
-
-type htmlEncoding byte
-
-const (
-	utf8 htmlEncoding = iota
-	ibm866
-	iso8859_2
-	iso8859_3
-	iso8859_4
-	iso8859_5
-	iso8859_6
-	iso8859_7
-	iso8859_8
-	iso8859_8I
-	iso8859_10
-	iso8859_13
-	iso8859_14
-	iso8859_15
-	iso8859_16
-	koi8r
-	koi8u
-	macintosh
-	windows874
-	windows1250
-	windows1251
-	windows1252
-	windows1253
-	windows1254
-	windows1255
-	windows1256
-	windows1257
-	windows1258
-	macintoshCyrillic
-	gbk
-	gb18030
-	big5
-	eucjp
-	iso2022jp
-	shiftJIS
-	euckr
-	replacement
-	utf16be
-	utf16le
-	xUserDefined
-	numEncodings
-)
-
-var canonical = [numEncodings]string{
-	"utf-8",
-	"ibm866",
-	"iso-8859-2",
-	"iso-8859-3",
-	"iso-8859-4",
-	"iso-8859-5",
-	"iso-8859-6",
-	"iso-8859-7",
-	"iso-8859-8",
-	"iso-8859-8-i",
-	"iso-8859-10",
-	"iso-8859-13",
-	"iso-8859-14",
-	"iso-8859-15",
-	"iso-8859-16",
-	"koi8-r",
-	"koi8-u",
-	"macintosh",
-	"windows-874",
-	"windows-1250",
-	"windows-1251",
-	"windows-1252",
-	"windows-1253",
-	"windows-1254",
-	"windows-1255",
-	"windows-1256",
-	"windows-1257",
-	"windows-1258",
-	"x-mac-cyrillic",
-	"gbk",
-	"gb18030",
-	"big5",
-	"euc-jp",
-	"iso-2022-jp",
-	"shift_jis",
-	"euc-kr",
-	"replacement",
-	"utf-16be",
-	"utf-16le",
-	"x-user-defined",
-}
-
-var nameMap = map[string]htmlEncoding{
-	"unicode-1-1-utf-8":   utf8,
-	"utf-8":               utf8,
-	"utf8":                utf8,
-	"866":                 ibm866,
-	"cp866":               ibm866,
-	"csibm866":            ibm866,
-	"ibm866":              ibm866,
-	"csisolatin2":         iso8859_2,
-	"iso-8859-2":          iso8859_2,
-	"iso-ir-101":          iso8859_2,
-	"iso8859-2":           iso8859_2,
-	"iso88592":            iso8859_2,
-	"iso_8859-2":          iso8859_2,
-	"iso_8859-2:1987":     iso8859_2,
-	"l2":                  iso8859_2,
-	"latin2":              iso8859_2,
-	"csisolatin3":         iso8859_3,
-	"iso-8859-3":          iso8859_3,
-	"iso-ir-109":          iso8859_3,
-	"iso8859-3":           iso8859_3,
-	"iso88593":            iso8859_3,
-	"iso_8859-3":          iso8859_3,
-	"iso_8859-3:1988":     iso8859_3,
-	"l3":                  iso8859_3,
-	"latin3":              iso8859_3,
-	"csisolatin4":         iso8859_4,
-	"iso-8859-4":          iso8859_4,
-	"iso-ir-110":          iso8859_4,
-	"iso8859-4":           iso8859_4,
-	"iso88594":            iso8859_4,
-	"iso_8859-4":          iso8859_4,
-	"iso_8859-4:1988":     iso8859_4,
-	"l4":                  iso8859_4,
-	"latin4":              iso8859_4,
-	"csisolatincyrillic":  iso8859_5,
-	"cyrillic":            iso8859_5,
-	"iso-8859-5":          iso8859_5,
-	"iso-ir-144":          iso8859_5,
-	"iso8859-5":           iso8859_5,
-	"iso88595":            iso8859_5,
-	"iso_8859-5":          iso8859_5,
-	"iso_8859-5:1988":     iso8859_5,
-	"arabic":              iso8859_6,
-	"asmo-708":            iso8859_6,
-	"csiso88596e":         iso8859_6,
-	"csiso88596i":         iso8859_6,
-	"csisolatinarabic":    iso8859_6,
-	"ecma-114":            iso8859_6,
-	"iso-8859-6":          iso8859_6,
-	"iso-8859-6-e":        iso8859_6,
-	"iso-8859-6-i":        iso8859_6,
-	"iso-ir-127":          iso8859_6,
-	"iso8859-6":           iso8859_6,
-	"iso88596":            iso8859_6,
-	"iso_8859-6":          iso8859_6,
-	"iso_8859-6:1987":     iso8859_6,
-	"csisolatingreek":     iso8859_7,
-	"ecma-118":            iso8859_7,
-	"elot_928":            iso8859_7,
-	"greek":               iso8859_7,
-	"greek8":              iso8859_7,
-	"iso-8859-7":          iso8859_7,
-	"iso-ir-126":          iso8859_7,
-	"iso8859-7":           iso8859_7,
-	"iso88597":            iso8859_7,
-	"iso_8859-7":          iso8859_7,
-	"iso_8859-7:1987":     iso8859_7,
-	"sun_eu_greek":        iso8859_7,
-	"csiso88598e":         iso8859_8,
-	"csisolatinhebrew":    iso8859_8,
-	"hebrew":              iso8859_8,
-	"iso-8859-8":          iso8859_8,
-	"iso-8859-8-e":        iso8859_8,
-	"iso-ir-138":          iso8859_8,
-	"iso8859-8":           iso8859_8,
-	"iso88598":            iso8859_8,
-	"iso_8859-8":          iso8859_8,
-	"iso_8859-8:1988":     iso8859_8,
-	"visual":              iso8859_8,
-	"csiso88598i":         iso8859_8I,
-	"iso-8859-8-i":        iso8859_8I,
-	"logical":             iso8859_8I,
-	"csisolatin6":         iso8859_10,
-	"iso-8859-10":         iso8859_10,
-	"iso-ir-157":          iso8859_10,
-	"iso8859-10":          iso8859_10,
-	"iso885910":           iso8859_10,
-	"l6":                  iso8859_10,
-	"latin6":              iso8859_10,
-	"iso-8859-13":         iso8859_13,
-	"iso8859-13":          iso8859_13,
-	"iso885913":           iso8859_13,
-	"iso-8859-14":         iso8859_14,
-	"iso8859-14":          iso8859_14,
-	"iso885914":           iso8859_14,
-	"csisolatin9":         iso8859_15,
-	"iso-8859-15":         iso8859_15,
-	"iso8859-15":          iso8859_15,
-	"iso885915":           iso8859_15,
-	"iso_8859-15":         iso8859_15,
-	"l9":                  iso8859_15,
-	"iso-8859-16":         iso8859_16,
-	"cskoi8r":             koi8r,
-	"koi":                 koi8r,
-	"koi8":                koi8r,
-	"koi8-r":              koi8r,
-	"koi8_r":              koi8r,
-	"koi8-ru":             koi8u,
-	"koi8-u":              koi8u,
-	"csmacintosh":         macintosh,
-	"mac":                 macintosh,
-	"macintosh":           macintosh,
-	"x-mac-roman":         macintosh,
-	"dos-874":             windows874,
-	"iso-8859-11":         windows874,
-	"iso8859-11":          windows874,
-	"iso885911":           windows874,
-	"tis-620":             windows874,
-	"windows-874":         windows874,
-	"cp1250":              windows1250,
-	"windows-1250":        windows1250,
-	"x-cp1250":            windows1250,
-	"cp1251":              windows1251,
-	"windows-1251":        windows1251,
-	"x-cp1251":            windows1251,
-	"ansi_x3.4-1968":      windows1252,
-	"ascii":               windows1252,
-	"cp1252":              windows1252,
-	"cp819":               windows1252,
-	"csisolatin1":         windows1252,
-	"ibm819":              windows1252,
-	"iso-8859-1":          windows1252,
-	"iso-ir-100":          windows1252,
-	"iso8859-1":           windows1252,
-	"iso88591":            windows1252,
-	"iso_8859-1":          windows1252,
-	"iso_8859-1:1987":     windows1252,
-	"l1":                  windows1252,
-	"latin1":              windows1252,
-	"us-ascii":            windows1252,
-	"windows-1252":        windows1252,
-	"x-cp1252":            windows1252,
-	"cp1253":              windows1253,
-	"windows-1253":        windows1253,
-	"x-cp1253":            windows1253,
-	"cp1254":              windows1254,
-	"csisolatin5":         windows1254,
-	"iso-8859-9":          windows1254,
-	"iso-ir-148":          windows1254,
-	"iso8859-9":           windows1254,
-	"iso88599":            windows1254,
-	"iso_8859-9":          windows1254,
-	"iso_8859-9:1989":     windows1254,
-	"l5":                  windows1254,
-	"latin5":              windows1254,
-	"windows-1254":        windows1254,
-	"x-cp1254":            windows1254,
-	"cp1255":              windows1255,
-	"windows-1255":        windows1255,
-	"x-cp1255":            windows1255,
-	"cp1256":              windows1256,
-	"windows-1256":        windows1256,
-	"x-cp1256":            windows1256,
-	"cp1257":              windows1257,
-	"windows-1257":        windows1257,
-	"x-cp1257":            windows1257,
-	"cp1258":              windows1258,
-	"windows-1258":        windows1258,
-	"x-cp1258":            windows1258,
-	"x-mac-cyrillic":      macintoshCyrillic,
-	"x-mac-ukrainian":     macintoshCyrillic,
-	"chinese":             gbk,
-	"csgb2312":            gbk,
-	"csiso58gb231280":     gbk,
-	"gb2312":              gbk,
-	"gb_2312":             gbk,
-	"gb_2312-80":          gbk,
-	"gbk":                 gbk,
-	"iso-ir-58":           gbk,
-	"x-gbk":               gbk,
-	"gb18030":             gb18030,
-	"big5":                big5,
-	"big5-hkscs":          big5,
-	"cn-big5":             big5,
-	"csbig5":              big5,
-	"x-x-big5":            big5,
-	"cseucpkdfmtjapanese": eucjp,
-	"euc-jp":              eucjp,
-	"x-euc-jp":            eucjp,
-	"csiso2022jp":         iso2022jp,
-	"iso-2022-jp":         iso2022jp,
-	"csshiftjis":          shiftJIS,
-	"ms932":               shiftJIS,
-	"ms_kanji":            shiftJIS,
-	"shift-jis":           shiftJIS,
-	"shift_jis":           shiftJIS,
-	"sjis":                shiftJIS,
-	"windows-31j":         shiftJIS,
-	"x-sjis":              shiftJIS,
-	"cseuckr":             euckr,
-	"csksc56011987":       euckr,
-	"euc-kr":              euckr,
-	"iso-ir-149":          euckr,
-	"korean":              euckr,
-	"ks_c_5601-1987":      euckr,
-	"ks_c_5601-1989":      euckr,
-	"ksc5601":             euckr,
-	"ksc_5601":            euckr,
-	"windows-949":         euckr,
-	"csiso2022kr":         replacement,
-	"hz-gb-2312":          replacement,
-	"iso-2022-cn":         replacement,
-	"iso-2022-cn-ext":     replacement,
-	"iso-2022-kr":         replacement,
-	"utf-16be":            utf16be,
-	"utf-16":              utf16le,
-	"utf-16le":            utf16le,
-	"x-user-defined":      xUserDefined,
-}
-
-var localeMap = []htmlEncoding{
-	windows1252, // und_Latn
-	windows1256, // ar
-	windows1251, // ba
-	windows1251, // be
-	windows1251, // bg
-	windows1250, // cs
-	iso8859_7,   // el
-	windows1257, // et
-	windows1256, // fa
-	windows1255, // he
-	windows1250, // hr
-	iso8859_2,   // hu
-	shiftJIS,    // ja
-	windows1251, // kk
-	euckr,       // ko
-	windows1254, // ku
-	windows1251, // ky
-	windows1257, // lt
-	windows1257, // lv
-	windows1251, // mk
-	iso8859_2,   // pl
-	windows1251, // ru
-	windows1251, // sah
-	windows1250, // sk
-	iso8859_2,   // sl
-	windows1251, // sr
-	windows1251, // tg
-	windows874,  // th
-	windows1254, // tr
-	windows1251, // tt
-	windows1251, // uk
-	windows1258, // vi
-	gb18030,     // zh-hans
-	big5,        // zh-hant
-}
-
-const locales = "und_Latn ar ba be bg cs el et fa he hr hu ja kk ko ku ky lt lv mk pl ru sah sk sl sr tg th tr tt uk vi zh-hans zh-hant"
diff --git a/vendor/golang.org/x/text/encoding/internal/identifier/identifier.go b/vendor/golang.org/x/text/encoding/internal/identifier/identifier.go
deleted file mode 100644
index 7351b4ef8a..0000000000
--- a/vendor/golang.org/x/text/encoding/internal/identifier/identifier.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate go run gen.go
-
-// Package identifier defines the contract between implementations of Encoding
-// and Index by defining identifiers that uniquely identify standardized coded
-// character sets (CCS) and character encoding schemes (CES), which we will
-// together refer to as encodings, for which Encoding implementations provide
-// converters to and from UTF-8. This package is typically only of concern to
-// implementers of Indexes and Encodings.
-//
-// One part of the identifier is the MIB code, which is defined by IANA and
-// uniquely identifies a CCS or CES. Each code is associated with data that
-// references authorities, official documentation as well as aliases and MIME
-// names.
-//
-// Not all CESs are covered by the IANA registry. The "other" string that is
-// returned by ID can be used to identify other character sets or versions of
-// existing ones.
-//
-// It is recommended that each package that provides a set of Encodings provide
-// the All and Common variables to reference all supported encodings and
-// commonly used subset. This allows Index implementations to include all
-// available encodings without explicitly referencing or knowing about them.
-package identifier
-
-// Note: this package is internal, but could be made public if there is a need
-// for writing third-party Indexes and Encodings.
-
-// References:
-// - http://source.icu-project.org/repos/icu/icu/trunk/source/data/mappings/convrtrs.txt
-// - http://www.iana.org/assignments/character-sets/character-sets.xhtml
-// - http://www.iana.org/assignments/ianacharset-mib/ianacharset-mib
-// - http://www.ietf.org/rfc/rfc2978.txt
-// - http://www.unicode.org/reports/tr22/
-// - http://www.w3.org/TR/encoding/
-// - https://encoding.spec.whatwg.org/
-// - https://encoding.spec.whatwg.org/encodings.json
-// - https://tools.ietf.org/html/rfc6657#section-5
-
-// Interface can be implemented by Encodings to define the CCS or CES for which
-// it implements conversions.
-type Interface interface {
-	// ID returns an encoding identifier. Exactly one of the mib and other
-	// values should be non-zero.
-	//
-	// In the usual case it is only necessary to indicate the MIB code. The
-	// other string can be used to specify encodings for which there is no MIB,
-	// such as "x-mac-dingbat".
-	//
-	// The other string may only contain the characters a-z, A-Z, 0-9, - and _.
-	ID() (mib MIB, other string)
-
-	// NOTE: the restrictions on the encoding are to allow extending the syntax
-	// with additional information such as versions, vendors and other variants.
-}
-
-// A MIB identifies an encoding. It is derived from the IANA MIB codes and adds
-// some identifiers for some encodings that are not covered by the IANA
-// standard.
-//
-// See http://www.iana.org/assignments/ianacharset-mib.
-type MIB uint16
-
-// These additional MIB types are not defined in IANA. They are added because
-// they are common and defined within the text repo.
-const (
-	// Unofficial marks the start of encodings not registered by IANA.
-	Unofficial MIB = 10000 + iota
-
-	// Replacement is the WhatWG replacement encoding.
-	Replacement
-
-	// XUserDefined is the code for x-user-defined.
-	XUserDefined
-
-	// MacintoshCyrillic is the code for x-mac-cyrillic.
-	MacintoshCyrillic
-)
diff --git a/vendor/golang.org/x/text/encoding/internal/identifier/mib.go b/vendor/golang.org/x/text/encoding/internal/identifier/mib.go
deleted file mode 100644
index 768842b0a5..0000000000
--- a/vendor/golang.org/x/text/encoding/internal/identifier/mib.go
+++ /dev/null
@@ -1,1621 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package identifier
-
-const (
-	// ASCII is the MIB identifier with IANA name US-ASCII (MIME: US-ASCII).
-	//
-	// ANSI X3.4-1986
-	// Reference: RFC2046
-	ASCII MIB = 3
-
-	// ISOLatin1 is the MIB identifier with IANA name ISO_8859-1:1987 (MIME: ISO-8859-1).
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISOLatin1 MIB = 4
-
-	// ISOLatin2 is the MIB identifier with IANA name ISO_8859-2:1987 (MIME: ISO-8859-2).
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISOLatin2 MIB = 5
-
-	// ISOLatin3 is the MIB identifier with IANA name ISO_8859-3:1988 (MIME: ISO-8859-3).
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISOLatin3 MIB = 6
-
-	// ISOLatin4 is the MIB identifier with IANA name ISO_8859-4:1988 (MIME: ISO-8859-4).
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISOLatin4 MIB = 7
-
-	// ISOLatinCyrillic is the MIB identifier with IANA name ISO_8859-5:1988 (MIME: ISO-8859-5).
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISOLatinCyrillic MIB = 8
-
-	// ISOLatinArabic is the MIB identifier with IANA name ISO_8859-6:1987 (MIME: ISO-8859-6).
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISOLatinArabic MIB = 9
-
-	// ISOLatinGreek is the MIB identifier with IANA name ISO_8859-7:1987 (MIME: ISO-8859-7).
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1947
-	// Reference: RFC1345
-	ISOLatinGreek MIB = 10
-
-	// ISOLatinHebrew is the MIB identifier with IANA name ISO_8859-8:1988 (MIME: ISO-8859-8).
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISOLatinHebrew MIB = 11
-
-	// ISOLatin5 is the MIB identifier with IANA name ISO_8859-9:1989 (MIME: ISO-8859-9).
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISOLatin5 MIB = 12
-
-	// ISOLatin6 is the MIB identifier with IANA name ISO-8859-10 (MIME: ISO-8859-10).
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISOLatin6 MIB = 13
-
-	// ISOTextComm is the MIB identifier with IANA name ISO_6937-2-add.
-	//
-	// ISO-IR: International Register of Escape Sequences and ISO 6937-2:1983
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISOTextComm MIB = 14
-
-	// HalfWidthKatakana is the MIB identifier with IANA name JIS_X0201.
-	//
-	// JIS X 0201-1976.   One byte only, this is equivalent to
-	// JIS/Roman (similar to ASCII) plus eight-bit half-width
-	// Katakana
-	// Reference: RFC1345
-	HalfWidthKatakana MIB = 15
-
-	// JISEncoding is the MIB identifier with IANA name JIS_Encoding.
-	//
-	// JIS X 0202-1991.  Uses ISO 2022 escape sequences to
-	// shift code sets as documented in JIS X 0202-1991.
-	JISEncoding MIB = 16
-
-	// ShiftJIS is the MIB identifier with IANA name Shift_JIS (MIME: Shift_JIS).
-	//
-	// This charset is an extension of csHalfWidthKatakana by
-	// adding graphic characters in JIS X 0208.  The CCS's are
-	// JIS X0201:1997 and JIS X0208:1997.  The
-	// complete definition is shown in Appendix 1 of JIS
-	// X0208:1997.
-	// This charset can be used for the top-level media type "text".
-	ShiftJIS MIB = 17
-
-	// EUCPkdFmtJapanese is the MIB identifier with IANA name Extended_UNIX_Code_Packed_Format_for_Japanese (MIME: EUC-JP).
-	//
-	// Standardized by OSF, UNIX International, and UNIX Systems
-	// Laboratories Pacific.  Uses ISO 2022 rules to select
-	// code set 0: US-ASCII (a single 7-bit byte set)
-	// code set 1: JIS X0208-1990 (a double 8-bit byte set)
-	// restricted to A0-FF in both bytes
-	// code set 2: Half Width Katakana (a single 7-bit byte set)
-	// requiring SS2 as the character prefix
-	// code set 3: JIS X0212-1990 (a double 7-bit byte set)
-	// restricted to A0-FF in both bytes
-	// requiring SS3 as the character prefix
-	EUCPkdFmtJapanese MIB = 18
-
-	// EUCFixWidJapanese is the MIB identifier with IANA name Extended_UNIX_Code_Fixed_Width_for_Japanese.
-	//
-	// Used in Japan.  Each character is 2 octets.
-	// code set 0: US-ASCII (a single 7-bit byte set)
-	// 1st byte = 00
-	// 2nd byte = 20-7E
-	// code set 1: JIS X0208-1990 (a double 7-bit byte set)
-	// restricted  to A0-FF in both bytes
-	// code set 2: Half Width Katakana (a single 7-bit byte set)
-	// 1st byte = 00
-	// 2nd byte = A0-FF
-	// code set 3: JIS X0212-1990 (a double 7-bit byte set)
-	// restricted to A0-FF in
-	// the first byte
-	// and 21-7E in the second byte
-	EUCFixWidJapanese MIB = 19
-
-	// ISO4UnitedKingdom is the MIB identifier with IANA name BS_4730.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO4UnitedKingdom MIB = 20
-
-	// ISO11SwedishForNames is the MIB identifier with IANA name SEN_850200_C.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO11SwedishForNames MIB = 21
-
-	// ISO15Italian is the MIB identifier with IANA name IT.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO15Italian MIB = 22
-
-	// ISO17Spanish is the MIB identifier with IANA name ES.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO17Spanish MIB = 23
-
-	// ISO21German is the MIB identifier with IANA name DIN_66003.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO21German MIB = 24
-
-	// ISO60Norwegian1 is the MIB identifier with IANA name NS_4551-1.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO60Norwegian1 MIB = 25
-
-	// ISO69French is the MIB identifier with IANA name NF_Z_62-010.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO69French MIB = 26
-
-	// ISO10646UTF1 is the MIB identifier with IANA name ISO-10646-UTF-1.
-	//
-	// Universal Transfer Format (1), this is the multibyte
-	// encoding, that subsets ASCII-7. It does not have byte
-	// ordering issues.
-	ISO10646UTF1 MIB = 27
-
-	// ISO646basic1983 is the MIB identifier with IANA name ISO_646.basic:1983.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO646basic1983 MIB = 28
-
-	// INVARIANT is the MIB identifier with IANA name INVARIANT.
-	//
-	// Reference: RFC1345
-	INVARIANT MIB = 29
-
-	// ISO2IntlRefVersion is the MIB identifier with IANA name ISO_646.irv:1983.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO2IntlRefVersion MIB = 30
-
-	// NATSSEFI is the MIB identifier with IANA name NATS-SEFI.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	NATSSEFI MIB = 31
-
-	// NATSSEFIADD is the MIB identifier with IANA name NATS-SEFI-ADD.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	NATSSEFIADD MIB = 32
-
-	// NATSDANO is the MIB identifier with IANA name NATS-DANO.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	NATSDANO MIB = 33
-
-	// NATSDANOADD is the MIB identifier with IANA name NATS-DANO-ADD.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	NATSDANOADD MIB = 34
-
-	// ISO10Swedish is the MIB identifier with IANA name SEN_850200_B.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO10Swedish MIB = 35
-
-	// KSC56011987 is the MIB identifier with IANA name KS_C_5601-1987.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	KSC56011987 MIB = 36
-
-	// ISO2022KR is the MIB identifier with IANA name ISO-2022-KR (MIME: ISO-2022-KR).
-	//
-	// rfc1557 (see also KS_C_5601-1987)
-	// Reference: RFC1557
-	ISO2022KR MIB = 37
-
-	// EUCKR is the MIB identifier with IANA name EUC-KR (MIME: EUC-KR).
-	//
-	// rfc1557 (see also KS_C_5861-1992)
-	// Reference: RFC1557
-	EUCKR MIB = 38
-
-	// ISO2022JP is the MIB identifier with IANA name ISO-2022-JP (MIME: ISO-2022-JP).
-	//
-	// rfc1468 (see also rfc2237 )
-	// Reference: RFC1468
-	ISO2022JP MIB = 39
-
-	// ISO2022JP2 is the MIB identifier with IANA name ISO-2022-JP-2 (MIME: ISO-2022-JP-2).
-	//
-	// rfc1554
-	// Reference: RFC1554
-	ISO2022JP2 MIB = 40
-
-	// ISO13JISC6220jp is the MIB identifier with IANA name JIS_C6220-1969-jp.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO13JISC6220jp MIB = 41
-
-	// ISO14JISC6220ro is the MIB identifier with IANA name JIS_C6220-1969-ro.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO14JISC6220ro MIB = 42
-
-	// ISO16Portuguese is the MIB identifier with IANA name PT.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO16Portuguese MIB = 43
-
-	// ISO18Greek7Old is the MIB identifier with IANA name greek7-old.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO18Greek7Old MIB = 44
-
-	// ISO19LatinGreek is the MIB identifier with IANA name latin-greek.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO19LatinGreek MIB = 45
-
-	// ISO25French is the MIB identifier with IANA name NF_Z_62-010_(1973).
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO25French MIB = 46
-
-	// ISO27LatinGreek1 is the MIB identifier with IANA name Latin-greek-1.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO27LatinGreek1 MIB = 47
-
-	// ISO5427Cyrillic is the MIB identifier with IANA name ISO_5427.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO5427Cyrillic MIB = 48
-
-	// ISO42JISC62261978 is the MIB identifier with IANA name JIS_C6226-1978.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO42JISC62261978 MIB = 49
-
-	// ISO47BSViewdata is the MIB identifier with IANA name BS_viewdata.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO47BSViewdata MIB = 50
-
-	// ISO49INIS is the MIB identifier with IANA name INIS.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO49INIS MIB = 51
-
-	// ISO50INIS8 is the MIB identifier with IANA name INIS-8.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO50INIS8 MIB = 52
-
-	// ISO51INISCyrillic is the MIB identifier with IANA name INIS-cyrillic.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO51INISCyrillic MIB = 53
-
-	// ISO54271981 is the MIB identifier with IANA name ISO_5427:1981.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO54271981 MIB = 54
-
-	// ISO5428Greek is the MIB identifier with IANA name ISO_5428:1980.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO5428Greek MIB = 55
-
-	// ISO57GB1988 is the MIB identifier with IANA name GB_1988-80.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO57GB1988 MIB = 56
-
-	// ISO58GB231280 is the MIB identifier with IANA name GB_2312-80.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO58GB231280 MIB = 57
-
-	// ISO61Norwegian2 is the MIB identifier with IANA name NS_4551-2.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO61Norwegian2 MIB = 58
-
-	// ISO70VideotexSupp1 is the MIB identifier with IANA name videotex-suppl.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO70VideotexSupp1 MIB = 59
-
-	// ISO84Portuguese2 is the MIB identifier with IANA name PT2.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO84Portuguese2 MIB = 60
-
-	// ISO85Spanish2 is the MIB identifier with IANA name ES2.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO85Spanish2 MIB = 61
-
-	// ISO86Hungarian is the MIB identifier with IANA name MSZ_7795.3.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO86Hungarian MIB = 62
-
-	// ISO87JISX0208 is the MIB identifier with IANA name JIS_C6226-1983.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO87JISX0208 MIB = 63
-
-	// ISO88Greek7 is the MIB identifier with IANA name greek7.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO88Greek7 MIB = 64
-
-	// ISO89ASMO449 is the MIB identifier with IANA name ASMO_449.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO89ASMO449 MIB = 65
-
-	// ISO90 is the MIB identifier with IANA name iso-ir-90.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO90 MIB = 66
-
-	// ISO91JISC62291984a is the MIB identifier with IANA name JIS_C6229-1984-a.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO91JISC62291984a MIB = 67
-
-	// ISO92JISC62991984b is the MIB identifier with IANA name JIS_C6229-1984-b.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO92JISC62991984b MIB = 68
-
-	// ISO93JIS62291984badd is the MIB identifier with IANA name JIS_C6229-1984-b-add.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO93JIS62291984badd MIB = 69
-
-	// ISO94JIS62291984hand is the MIB identifier with IANA name JIS_C6229-1984-hand.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO94JIS62291984hand MIB = 70
-
-	// ISO95JIS62291984handadd is the MIB identifier with IANA name JIS_C6229-1984-hand-add.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO95JIS62291984handadd MIB = 71
-
-	// ISO96JISC62291984kana is the MIB identifier with IANA name JIS_C6229-1984-kana.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO96JISC62291984kana MIB = 72
-
-	// ISO2033 is the MIB identifier with IANA name ISO_2033-1983.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO2033 MIB = 73
-
-	// ISO99NAPLPS is the MIB identifier with IANA name ANSI_X3.110-1983.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO99NAPLPS MIB = 74
-
-	// ISO102T617bit is the MIB identifier with IANA name T.61-7bit.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO102T617bit MIB = 75
-
-	// ISO103T618bit is the MIB identifier with IANA name T.61-8bit.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO103T618bit MIB = 76
-
-	// ISO111ECMACyrillic is the MIB identifier with IANA name ECMA-cyrillic.
-	//
-	// ISO registry
-	// (formerly ECMA
-	// registry )
-	ISO111ECMACyrillic MIB = 77
-
-	// ISO121Canadian1 is the MIB identifier with IANA name CSA_Z243.4-1985-1.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO121Canadian1 MIB = 78
-
-	// ISO122Canadian2 is the MIB identifier with IANA name CSA_Z243.4-1985-2.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO122Canadian2 MIB = 79
-
-	// ISO123CSAZ24341985gr is the MIB identifier with IANA name CSA_Z243.4-1985-gr.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO123CSAZ24341985gr MIB = 80
-
-	// ISO88596E is the MIB identifier with IANA name ISO_8859-6-E (MIME: ISO-8859-6-E).
-	//
-	// rfc1556
-	// Reference: RFC1556
-	ISO88596E MIB = 81
-
-	// ISO88596I is the MIB identifier with IANA name ISO_8859-6-I (MIME: ISO-8859-6-I).
-	//
-	// rfc1556
-	// Reference: RFC1556
-	ISO88596I MIB = 82
-
-	// ISO128T101G2 is the MIB identifier with IANA name T.101-G2.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO128T101G2 MIB = 83
-
-	// ISO88598E is the MIB identifier with IANA name ISO_8859-8-E (MIME: ISO-8859-8-E).
-	//
-	// rfc1556
-	// Reference: RFC1556
-	ISO88598E MIB = 84
-
-	// ISO88598I is the MIB identifier with IANA name ISO_8859-8-I (MIME: ISO-8859-8-I).
-	//
-	// rfc1556
-	// Reference: RFC1556
-	ISO88598I MIB = 85
-
-	// ISO139CSN369103 is the MIB identifier with IANA name CSN_369103.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO139CSN369103 MIB = 86
-
-	// ISO141JUSIB1002 is the MIB identifier with IANA name JUS_I.B1.002.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO141JUSIB1002 MIB = 87
-
-	// ISO143IECP271 is the MIB identifier with IANA name IEC_P27-1.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO143IECP271 MIB = 88
-
-	// ISO146Serbian is the MIB identifier with IANA name JUS_I.B1.003-serb.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO146Serbian MIB = 89
-
-	// ISO147Macedonian is the MIB identifier with IANA name JUS_I.B1.003-mac.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO147Macedonian MIB = 90
-
-	// ISO150GreekCCITT is the MIB identifier with IANA name greek-ccitt.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO150GreekCCITT MIB = 91
-
-	// ISO151Cuba is the MIB identifier with IANA name NC_NC00-10:81.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO151Cuba MIB = 92
-
-	// ISO6937Add is the MIB identifier with IANA name ISO_6937-2-25.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO6937Add MIB = 93
-
-	// ISO153GOST1976874 is the MIB identifier with IANA name GOST_19768-74.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO153GOST1976874 MIB = 94
-
-	// ISO8859Supp is the MIB identifier with IANA name ISO_8859-supp.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO8859Supp MIB = 95
-
-	// ISO10367Box is the MIB identifier with IANA name ISO_10367-box.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO10367Box MIB = 96
-
-	// ISO158Lap is the MIB identifier with IANA name latin-lap.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO158Lap MIB = 97
-
-	// ISO159JISX02121990 is the MIB identifier with IANA name JIS_X0212-1990.
-	//
-	// ISO-IR: International Register of Escape Sequences
-	// Note: The current registration authority is IPSJ/ITSCJ, Japan.
-	// Reference: RFC1345
-	ISO159JISX02121990 MIB = 98
-
-	// ISO646Danish is the MIB identifier with IANA name DS_2089.
-	//
-	// Danish Standard, DS 2089, February 1974
-	// Reference: RFC1345
-	ISO646Danish MIB = 99
-
-	// USDK is the MIB identifier with IANA name us-dk.
-	//
-	// Reference: RFC1345
-	USDK MIB = 100
-
-	// DKUS is the MIB identifier with IANA name dk-us.
-	//
-	// Reference: RFC1345
-	DKUS MIB = 101
-
-	// KSC5636 is the MIB identifier with IANA name KSC5636.
-	//
-	// Reference: RFC1345
-	KSC5636 MIB = 102
-
-	// Unicode11UTF7 is the MIB identifier with IANA name UNICODE-1-1-UTF-7.
-	//
-	// rfc1642
-	// Reference: RFC1642
-	Unicode11UTF7 MIB = 103
-
-	// ISO2022CN is the MIB identifier with IANA name ISO-2022-CN.
-	//
-	// rfc1922
-	// Reference: RFC1922
-	ISO2022CN MIB = 104
-
-	// ISO2022CNEXT is the MIB identifier with IANA name ISO-2022-CN-EXT.
-	//
-	// rfc1922
-	// Reference: RFC1922
-	ISO2022CNEXT MIB = 105
-
-	// UTF8 is the MIB identifier with IANA name UTF-8.
-	//
-	// rfc3629
-	// Reference: RFC3629
-	UTF8 MIB = 106
-
-	// ISO885913 is the MIB identifier with IANA name ISO-8859-13.
-	//
-	// ISO See http://www.iana.org/assignments/charset-reg/ISO-8859-13 http://www.iana.org/assignments/charset-reg/ISO-8859-13
-	ISO885913 MIB = 109
-
-	// ISO885914 is the MIB identifier with IANA name ISO-8859-14.
-	//
-	// ISO See http://www.iana.org/assignments/charset-reg/ISO-8859-14
-	ISO885914 MIB = 110
-
-	// ISO885915 is the MIB identifier with IANA name ISO-8859-15.
-	//
-	// ISO
-	// Please see: http://www.iana.org/assignments/charset-reg/ISO-8859-15
-	ISO885915 MIB = 111
-
-	// ISO885916 is the MIB identifier with IANA name ISO-8859-16.
-	//
-	// ISO
-	ISO885916 MIB = 112
-
-	// GBK is the MIB identifier with IANA name GBK.
-	//
-	// Chinese IT Standardization Technical Committee
-	// Please see: http://www.iana.org/assignments/charset-reg/GBK
-	GBK MIB = 113
-
-	// GB18030 is the MIB identifier with IANA name GB18030.
-	//
-	// Chinese IT Standardization Technical Committee
-	// Please see: http://www.iana.org/assignments/charset-reg/GB18030
-	GB18030 MIB = 114
-
-	// OSDEBCDICDF0415 is the MIB identifier with IANA name OSD_EBCDIC_DF04_15.
-	//
-	// Fujitsu-Siemens standard mainframe EBCDIC encoding
-	// Please see: http://www.iana.org/assignments/charset-reg/OSD-EBCDIC-DF04-15
-	OSDEBCDICDF0415 MIB = 115
-
-	// OSDEBCDICDF03IRV is the MIB identifier with IANA name OSD_EBCDIC_DF03_IRV.
-	//
-	// Fujitsu-Siemens standard mainframe EBCDIC encoding
-	// Please see: http://www.iana.org/assignments/charset-reg/OSD-EBCDIC-DF03-IRV
-	OSDEBCDICDF03IRV MIB = 116
-
-	// OSDEBCDICDF041 is the MIB identifier with IANA name OSD_EBCDIC_DF04_1.
-	//
-	// Fujitsu-Siemens standard mainframe EBCDIC encoding
-	// Please see: http://www.iana.org/assignments/charset-reg/OSD-EBCDIC-DF04-1
-	OSDEBCDICDF041 MIB = 117
-
-	// ISO115481 is the MIB identifier with IANA name ISO-11548-1.
-	//
-	// See http://www.iana.org/assignments/charset-reg/ISO-11548-1
-	ISO115481 MIB = 118
-
-	// KZ1048 is the MIB identifier with IANA name KZ-1048.
-	//
-	// See http://www.iana.org/assignments/charset-reg/KZ-1048
-	KZ1048 MIB = 119
-
-	// Unicode is the MIB identifier with IANA name ISO-10646-UCS-2.
-	//
-	// the 2-octet Basic Multilingual Plane, aka Unicode
-	// this needs to specify network byte order: the standard
-	// does not specify (it is a 16-bit integer space)
-	Unicode MIB = 1000
-
-	// UCS4 is the MIB identifier with IANA name ISO-10646-UCS-4.
-	//
-	// the full code space. (same comment about byte order,
-	// these are 31-bit numbers.
-	UCS4 MIB = 1001
-
-	// UnicodeASCII is the MIB identifier with IANA name ISO-10646-UCS-Basic.
-	//
-	// ASCII subset of Unicode.  Basic Latin = collection 1
-	// See ISO 10646, Appendix A
-	UnicodeASCII MIB = 1002
-
-	// UnicodeLatin1 is the MIB identifier with IANA name ISO-10646-Unicode-Latin1.
-	//
-	// ISO Latin-1 subset of Unicode. Basic Latin and Latin-1
-	// Supplement  = collections 1 and 2.  See ISO 10646,
-	// Appendix A.  See rfc1815 .
-	UnicodeLatin1 MIB = 1003
-
-	// UnicodeJapanese is the MIB identifier with IANA name ISO-10646-J-1.
-	//
-	// ISO 10646 Japanese, see rfc1815 .
-	UnicodeJapanese MIB = 1004
-
-	// UnicodeIBM1261 is the MIB identifier with IANA name ISO-Unicode-IBM-1261.
-	//
-	// IBM Latin-2, -3, -5, Extended Presentation Set, GCSGID: 1261
-	UnicodeIBM1261 MIB = 1005
-
-	// UnicodeIBM1268 is the MIB identifier with IANA name ISO-Unicode-IBM-1268.
-	//
-	// IBM Latin-4 Extended Presentation Set, GCSGID: 1268
-	UnicodeIBM1268 MIB = 1006
-
-	// UnicodeIBM1276 is the MIB identifier with IANA name ISO-Unicode-IBM-1276.
-	//
-	// IBM Cyrillic Greek Extended Presentation Set, GCSGID: 1276
-	UnicodeIBM1276 MIB = 1007
-
-	// UnicodeIBM1264 is the MIB identifier with IANA name ISO-Unicode-IBM-1264.
-	//
-	// IBM Arabic Presentation Set, GCSGID: 1264
-	UnicodeIBM1264 MIB = 1008
-
-	// UnicodeIBM1265 is the MIB identifier with IANA name ISO-Unicode-IBM-1265.
-	//
-	// IBM Hebrew Presentation Set, GCSGID: 1265
-	UnicodeIBM1265 MIB = 1009
-
-	// Unicode11 is the MIB identifier with IANA name UNICODE-1-1.
-	//
-	// rfc1641
-	// Reference: RFC1641
-	Unicode11 MIB = 1010
-
-	// SCSU is the MIB identifier with IANA name SCSU.
-	//
-	// SCSU See http://www.iana.org/assignments/charset-reg/SCSU
-	SCSU MIB = 1011
-
-	// UTF7 is the MIB identifier with IANA name UTF-7.
-	//
-	// rfc2152
-	// Reference: RFC2152
-	UTF7 MIB = 1012
-
-	// UTF16BE is the MIB identifier with IANA name UTF-16BE.
-	//
-	// rfc2781
-	// Reference: RFC2781
-	UTF16BE MIB = 1013
-
-	// UTF16LE is the MIB identifier with IANA name UTF-16LE.
-	//
-	// rfc2781
-	// Reference: RFC2781
-	UTF16LE MIB = 1014
-
-	// UTF16 is the MIB identifier with IANA name UTF-16.
-	//
-	// rfc2781
-	// Reference: RFC2781
-	UTF16 MIB = 1015
-
-	// CESU8 is the MIB identifier with IANA name CESU-8.
-	//
-	// http://www.unicode.org/unicode/reports/tr26
-	CESU8 MIB = 1016
-
-	// UTF32 is the MIB identifier with IANA name UTF-32.
-	//
-	// http://www.unicode.org/unicode/reports/tr19/
-	UTF32 MIB = 1017
-
-	// UTF32BE is the MIB identifier with IANA name UTF-32BE.
-	//
-	// http://www.unicode.org/unicode/reports/tr19/
-	UTF32BE MIB = 1018
-
-	// UTF32LE is the MIB identifier with IANA name UTF-32LE.
-	//
-	// http://www.unicode.org/unicode/reports/tr19/
-	UTF32LE MIB = 1019
-
-	// BOCU1 is the MIB identifier with IANA name BOCU-1.
-	//
-	// http://www.unicode.org/notes/tn6/
-	BOCU1 MIB = 1020
-
-	// Windows30Latin1 is the MIB identifier with IANA name ISO-8859-1-Windows-3.0-Latin-1.
-	//
-	// Extended ISO 8859-1 Latin-1 for Windows 3.0.
-	// PCL Symbol Set id: 9U
-	Windows30Latin1 MIB = 2000
-
-	// Windows31Latin1 is the MIB identifier with IANA name ISO-8859-1-Windows-3.1-Latin-1.
-	//
-	// Extended ISO 8859-1 Latin-1 for Windows 3.1.
-	// PCL Symbol Set id: 19U
-	Windows31Latin1 MIB = 2001
-
-	// Windows31Latin2 is the MIB identifier with IANA name ISO-8859-2-Windows-Latin-2.
-	//
-	// Extended ISO 8859-2.  Latin-2 for Windows 3.1.
-	// PCL Symbol Set id: 9E
-	Windows31Latin2 MIB = 2002
-
-	// Windows31Latin5 is the MIB identifier with IANA name ISO-8859-9-Windows-Latin-5.
-	//
-	// Extended ISO 8859-9.  Latin-5 for Windows 3.1
-	// PCL Symbol Set id: 5T
-	Windows31Latin5 MIB = 2003
-
-	// HPRoman8 is the MIB identifier with IANA name hp-roman8.
-	//
-	// LaserJet IIP Printer User's Manual,
-	// HP part no 33471-90901, Hewlet-Packard, June 1989.
-	// Reference: RFC1345
-	HPRoman8 MIB = 2004
-
-	// AdobeStandardEncoding is the MIB identifier with IANA name Adobe-Standard-Encoding.
-	//
-	// PostScript Language Reference Manual
-	// PCL Symbol Set id: 10J
-	AdobeStandardEncoding MIB = 2005
-
-	// VenturaUS is the MIB identifier with IANA name Ventura-US.
-	//
-	// Ventura US.  ASCII plus characters typically used in
-	// publishing, like pilcrow, copyright, registered, trade mark,
-	// section, dagger, and double dagger in the range A0 (hex)
-	// to FF (hex).
-	// PCL Symbol Set id: 14J
-	VenturaUS MIB = 2006
-
-	// VenturaInternational is the MIB identifier with IANA name Ventura-International.
-	//
-	// Ventura International.  ASCII plus coded characters similar
-	// to Roman8.
-	// PCL Symbol Set id: 13J
-	VenturaInternational MIB = 2007
-
-	// DECMCS is the MIB identifier with IANA name DEC-MCS.
-	//
-	// VAX/VMS User's Manual,
-	// Order Number: AI-Y517A-TE, April 1986.
-	// Reference: RFC1345
-	DECMCS MIB = 2008
-
-	// PC850Multilingual is the MIB identifier with IANA name IBM850.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	PC850Multilingual MIB = 2009
-
-	// PC8DanishNorwegian is the MIB identifier with IANA name PC8-Danish-Norwegian.
-	//
-	// PC Danish Norwegian
-	// 8-bit PC set for Danish Norwegian
-	// PCL Symbol Set id: 11U
-	PC8DanishNorwegian MIB = 2012
-
-	// PC862LatinHebrew is the MIB identifier with IANA name IBM862.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	PC862LatinHebrew MIB = 2013
-
-	// PC8Turkish is the MIB identifier with IANA name PC8-Turkish.
-	//
-	// PC Latin Turkish.  PCL Symbol Set id: 9T
-	PC8Turkish MIB = 2014
-
-	// IBMSymbols is the MIB identifier with IANA name IBM-Symbols.
-	//
-	// Presentation Set, CPGID: 259
-	IBMSymbols MIB = 2015
-
-	// IBMThai is the MIB identifier with IANA name IBM-Thai.
-	//
-	// Presentation Set, CPGID: 838
-	IBMThai MIB = 2016
-
-	// HPLegal is the MIB identifier with IANA name HP-Legal.
-	//
-	// PCL 5 Comparison Guide, Hewlett-Packard,
-	// HP part number 5961-0510, October 1992
-	// PCL Symbol Set id: 1U
-	HPLegal MIB = 2017
-
-	// HPPiFont is the MIB identifier with IANA name HP-Pi-font.
-	//
-	// PCL 5 Comparison Guide, Hewlett-Packard,
-	// HP part number 5961-0510, October 1992
-	// PCL Symbol Set id: 15U
-	HPPiFont MIB = 2018
-
-	// HPMath8 is the MIB identifier with IANA name HP-Math8.
-	//
-	// PCL 5 Comparison Guide, Hewlett-Packard,
-	// HP part number 5961-0510, October 1992
-	// PCL Symbol Set id: 8M
-	HPMath8 MIB = 2019
-
-	// HPPSMath is the MIB identifier with IANA name Adobe-Symbol-Encoding.
-	//
-	// PostScript Language Reference Manual
-	// PCL Symbol Set id: 5M
-	HPPSMath MIB = 2020
-
-	// HPDesktop is the MIB identifier with IANA name HP-DeskTop.
-	//
-	// PCL 5 Comparison Guide, Hewlett-Packard,
-	// HP part number 5961-0510, October 1992
-	// PCL Symbol Set id: 7J
-	HPDesktop MIB = 2021
-
-	// VenturaMath is the MIB identifier with IANA name Ventura-Math.
-	//
-	// PCL 5 Comparison Guide, Hewlett-Packard,
-	// HP part number 5961-0510, October 1992
-	// PCL Symbol Set id: 6M
-	VenturaMath MIB = 2022
-
-	// MicrosoftPublishing is the MIB identifier with IANA name Microsoft-Publishing.
-	//
-	// PCL 5 Comparison Guide, Hewlett-Packard,
-	// HP part number 5961-0510, October 1992
-	// PCL Symbol Set id: 6J
-	MicrosoftPublishing MIB = 2023
-
-	// Windows31J is the MIB identifier with IANA name Windows-31J.
-	//
-	// Windows Japanese.  A further extension of Shift_JIS
-	// to include NEC special characters (Row 13), NEC
-	// selection of IBM extensions (Rows 89 to 92), and IBM
-	// extensions (Rows 115 to 119).  The CCS's are
-	// JIS X0201:1997, JIS X0208:1997, and these extensions.
-	// This charset can be used for the top-level media type "text",
-	// but it is of limited or specialized use (see rfc2278 ).
-	// PCL Symbol Set id: 19K
-	Windows31J MIB = 2024
-
-	// GB2312 is the MIB identifier with IANA name GB2312 (MIME: GB2312).
-	//
-	// Chinese for People's Republic of China (PRC) mixed one byte,
-	// two byte set:
-	// 20-7E = one byte ASCII
-	// A1-FE = two byte PRC Kanji
-	// See GB 2312-80
-	// PCL Symbol Set Id: 18C
-	GB2312 MIB = 2025
-
-	// Big5 is the MIB identifier with IANA name Big5 (MIME: Big5).
-	//
-	// Chinese for Taiwan Multi-byte set.
-	// PCL Symbol Set Id: 18T
-	Big5 MIB = 2026
-
-	// Macintosh is the MIB identifier with IANA name macintosh.
-	//
-	// The Unicode Standard ver1.0, ISBN 0-201-56788-1, Oct 1991
-	// Reference: RFC1345
-	Macintosh MIB = 2027
-
-	// IBM037 is the MIB identifier with IANA name IBM037.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM037 MIB = 2028
-
-	// IBM038 is the MIB identifier with IANA name IBM038.
-	//
-	// IBM 3174 Character Set Ref, GA27-3831-02, March 1990
-	// Reference: RFC1345
-	IBM038 MIB = 2029
-
-	// IBM273 is the MIB identifier with IANA name IBM273.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM273 MIB = 2030
-
-	// IBM274 is the MIB identifier with IANA name IBM274.
-	//
-	// IBM 3174 Character Set Ref, GA27-3831-02, March 1990
-	// Reference: RFC1345
-	IBM274 MIB = 2031
-
-	// IBM275 is the MIB identifier with IANA name IBM275.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM275 MIB = 2032
-
-	// IBM277 is the MIB identifier with IANA name IBM277.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM277 MIB = 2033
-
-	// IBM278 is the MIB identifier with IANA name IBM278.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM278 MIB = 2034
-
-	// IBM280 is the MIB identifier with IANA name IBM280.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM280 MIB = 2035
-
-	// IBM281 is the MIB identifier with IANA name IBM281.
-	//
-	// IBM 3174 Character Set Ref, GA27-3831-02, March 1990
-	// Reference: RFC1345
-	IBM281 MIB = 2036
-
-	// IBM284 is the MIB identifier with IANA name IBM284.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM284 MIB = 2037
-
-	// IBM285 is the MIB identifier with IANA name IBM285.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM285 MIB = 2038
-
-	// IBM290 is the MIB identifier with IANA name IBM290.
-	//
-	// IBM 3174 Character Set Ref, GA27-3831-02, March 1990
-	// Reference: RFC1345
-	IBM290 MIB = 2039
-
-	// IBM297 is the MIB identifier with IANA name IBM297.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM297 MIB = 2040
-
-	// IBM420 is the MIB identifier with IANA name IBM420.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990,
-	// IBM NLS RM p 11-11
-	// Reference: RFC1345
-	IBM420 MIB = 2041
-
-	// IBM423 is the MIB identifier with IANA name IBM423.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM423 MIB = 2042
-
-	// IBM424 is the MIB identifier with IANA name IBM424.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM424 MIB = 2043
-
-	// PC8CodePage437 is the MIB identifier with IANA name IBM437.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	PC8CodePage437 MIB = 2011
-
-	// IBM500 is the MIB identifier with IANA name IBM500.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM500 MIB = 2044
-
-	// IBM851 is the MIB identifier with IANA name IBM851.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM851 MIB = 2045
-
-	// PCp852 is the MIB identifier with IANA name IBM852.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	PCp852 MIB = 2010
-
-	// IBM855 is the MIB identifier with IANA name IBM855.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM855 MIB = 2046
-
-	// IBM857 is the MIB identifier with IANA name IBM857.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM857 MIB = 2047
-
-	// IBM860 is the MIB identifier with IANA name IBM860.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM860 MIB = 2048
-
-	// IBM861 is the MIB identifier with IANA name IBM861.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM861 MIB = 2049
-
-	// IBM863 is the MIB identifier with IANA name IBM863.
-	//
-	// IBM Keyboard layouts and code pages, PN 07G4586 June 1991
-	// Reference: RFC1345
-	IBM863 MIB = 2050
-
-	// IBM864 is the MIB identifier with IANA name IBM864.
-	//
-	// IBM Keyboard layouts and code pages, PN 07G4586 June 1991
-	// Reference: RFC1345
-	IBM864 MIB = 2051
-
-	// IBM865 is the MIB identifier with IANA name IBM865.
-	//
-	// IBM DOS 3.3 Ref (Abridged), 94X9575 (Feb 1987)
-	// Reference: RFC1345
-	IBM865 MIB = 2052
-
-	// IBM868 is the MIB identifier with IANA name IBM868.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM868 MIB = 2053
-
-	// IBM869 is the MIB identifier with IANA name IBM869.
-	//
-	// IBM Keyboard layouts and code pages, PN 07G4586 June 1991
-	// Reference: RFC1345
-	IBM869 MIB = 2054
-
-	// IBM870 is the MIB identifier with IANA name IBM870.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM870 MIB = 2055
-
-	// IBM871 is the MIB identifier with IANA name IBM871.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM871 MIB = 2056
-
-	// IBM880 is the MIB identifier with IANA name IBM880.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM880 MIB = 2057
-
-	// IBM891 is the MIB identifier with IANA name IBM891.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM891 MIB = 2058
-
-	// IBM903 is the MIB identifier with IANA name IBM903.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM903 MIB = 2059
-
-	// IBBM904 is the MIB identifier with IANA name IBM904.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBBM904 MIB = 2060
-
-	// IBM905 is the MIB identifier with IANA name IBM905.
-	//
-	// IBM 3174 Character Set Ref, GA27-3831-02, March 1990
-	// Reference: RFC1345
-	IBM905 MIB = 2061
-
-	// IBM918 is the MIB identifier with IANA name IBM918.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM918 MIB = 2062
-
-	// IBM1026 is the MIB identifier with IANA name IBM1026.
-	//
-	// IBM NLS RM Vol2 SE09-8002-01, March 1990
-	// Reference: RFC1345
-	IBM1026 MIB = 2063
-
-	// IBMEBCDICATDE is the MIB identifier with IANA name EBCDIC-AT-DE.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	IBMEBCDICATDE MIB = 2064
-
-	// EBCDICATDEA is the MIB identifier with IANA name EBCDIC-AT-DE-A.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICATDEA MIB = 2065
-
-	// EBCDICCAFR is the MIB identifier with IANA name EBCDIC-CA-FR.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICCAFR MIB = 2066
-
-	// EBCDICDKNO is the MIB identifier with IANA name EBCDIC-DK-NO.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICDKNO MIB = 2067
-
-	// EBCDICDKNOA is the MIB identifier with IANA name EBCDIC-DK-NO-A.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICDKNOA MIB = 2068
-
-	// EBCDICFISE is the MIB identifier with IANA name EBCDIC-FI-SE.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICFISE MIB = 2069
-
-	// EBCDICFISEA is the MIB identifier with IANA name EBCDIC-FI-SE-A.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICFISEA MIB = 2070
-
-	// EBCDICFR is the MIB identifier with IANA name EBCDIC-FR.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICFR MIB = 2071
-
-	// EBCDICIT is the MIB identifier with IANA name EBCDIC-IT.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICIT MIB = 2072
-
-	// EBCDICPT is the MIB identifier with IANA name EBCDIC-PT.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICPT MIB = 2073
-
-	// EBCDICES is the MIB identifier with IANA name EBCDIC-ES.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICES MIB = 2074
-
-	// EBCDICESA is the MIB identifier with IANA name EBCDIC-ES-A.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICESA MIB = 2075
-
-	// EBCDICESS is the MIB identifier with IANA name EBCDIC-ES-S.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICESS MIB = 2076
-
-	// EBCDICUK is the MIB identifier with IANA name EBCDIC-UK.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICUK MIB = 2077
-
-	// EBCDICUS is the MIB identifier with IANA name EBCDIC-US.
-	//
-	// IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
-	// Reference: RFC1345
-	EBCDICUS MIB = 2078
-
-	// Unknown8BiT is the MIB identifier with IANA name UNKNOWN-8BIT.
-	//
-	// Reference: RFC1428
-	Unknown8BiT MIB = 2079
-
-	// Mnemonic is the MIB identifier with IANA name MNEMONIC.
-	//
-	// rfc1345 , also known as "mnemonic+ascii+38"
-	// Reference: RFC1345
-	Mnemonic MIB = 2080
-
-	// Mnem is the MIB identifier with IANA name MNEM.
-	//
-	// rfc1345 , also known as "mnemonic+ascii+8200"
-	// Reference: RFC1345
-	Mnem MIB = 2081
-
-	// VISCII is the MIB identifier with IANA name VISCII.
-	//
-	// rfc1456
-	// Reference: RFC1456
-	VISCII MIB = 2082
-
-	// VIQR is the MIB identifier with IANA name VIQR.
-	//
-	// rfc1456
-	// Reference: RFC1456
-	VIQR MIB = 2083
-
-	// KOI8R is the MIB identifier with IANA name KOI8-R (MIME: KOI8-R).
-	//
-	// rfc1489 , based on GOST-19768-74, ISO-6937/8,
-	// INIS-Cyrillic, ISO-5427.
-	// Reference: RFC1489
-	KOI8R MIB = 2084
-
-	// HZGB2312 is the MIB identifier with IANA name HZ-GB-2312.
-	//
-	// rfc1842 , rfc1843 rfc1843 rfc1842
-	HZGB2312 MIB = 2085
-
-	// IBM866 is the MIB identifier with IANA name IBM866.
-	//
-	// IBM NLDG Volume 2 (SE09-8002-03) August 1994
-	IBM866 MIB = 2086
-
-	// PC775Baltic is the MIB identifier with IANA name IBM775.
-	//
-	// HP PCL 5 Comparison Guide (P/N 5021-0329) pp B-13, 1996
-	PC775Baltic MIB = 2087
-
-	// KOI8U is the MIB identifier with IANA name KOI8-U.
-	//
-	// rfc2319
-	// Reference: RFC2319
-	KOI8U MIB = 2088
-
-	// IBM00858 is the MIB identifier with IANA name IBM00858.
-	//
-	// IBM See http://www.iana.org/assignments/charset-reg/IBM00858
-	IBM00858 MIB = 2089
-
-	// IBM00924 is the MIB identifier with IANA name IBM00924.
-	//
-	// IBM See http://www.iana.org/assignments/charset-reg/IBM00924
-	IBM00924 MIB = 2090
-
-	// IBM01140 is the MIB identifier with IANA name IBM01140.
-	//
-	// IBM See http://www.iana.org/assignments/charset-reg/IBM01140
-	IBM01140 MIB = 2091
-
-	// IBM01141 is the MIB identifier with IANA name IBM01141.
-	//
-	// IBM See http://www.iana.org/assignments/charset-reg/IBM01141
-	IBM01141 MIB = 2092
-
-	// IBM01142 is the MIB identifier with IANA name IBM01142.
-	//
-	// IBM See http://www.iana.org/assignments/charset-reg/IBM01142
-	IBM01142 MIB = 2093
-
-	// IBM01143 is the MIB identifier with IANA name IBM01143.
-	//
-	// IBM See http://www.iana.org/assignments/charset-reg/IBM01143
-	IBM01143 MIB = 2094
-
-	// IBM01144 is the MIB identifier with IANA name IBM01144.
-	//
-	// IBM See http://www.iana.org/assignments/charset-reg/IBM01144
-	IBM01144 MIB = 2095
-
-	// IBM01145 is the MIB identifier with IANA name IBM01145.
-	//
-	// IBM See http://www.iana.org/assignments/charset-reg/IBM01145
-	IBM01145 MIB = 2096
-
-	// IBM01146 is the MIB identifier with IANA name IBM01146.
-	//
-	// IBM See http://www.iana.org/assignments/charset-reg/IBM01146
-	IBM01146 MIB = 2097
-
-	// IBM01147 is the MIB identifier with IANA name IBM01147.
-	//
-	// IBM See http://www.iana.org/assignments/charset-reg/IBM01147
-	IBM01147 MIB = 2098
-
-	// IBM01148 is the MIB identifier with IANA name IBM01148.
-	//
-	// IBM See http://www.iana.org/assignments/charset-reg/IBM01148
-	IBM01148 MIB = 2099
-
-	// IBM01149 is the MIB identifier with IANA name IBM01149.
-	//
-	// IBM See http://www.iana.org/assignments/charset-reg/IBM01149
-	IBM01149 MIB = 2100
-
-	// Big5HKSCS is the MIB identifier with IANA name Big5-HKSCS.
-	//
-	// See http://www.iana.org/assignments/charset-reg/Big5-HKSCS
-	Big5HKSCS MIB = 2101
-
-	// IBM1047 is the MIB identifier with IANA name IBM1047.
-	//
-	// IBM1047 (EBCDIC Latin 1/Open Systems) http://www-1.ibm.com/servers/eserver/iseries/software/globalization/pdf/cp01047z.pdf
-	IBM1047 MIB = 2102
-
-	// PTCP154 is the MIB identifier with IANA name PTCP154.
-	//
-	// See http://www.iana.org/assignments/charset-reg/PTCP154
-	PTCP154 MIB = 2103
-
-	// Amiga1251 is the MIB identifier with IANA name Amiga-1251.
-	//
-	// See http://www.amiga.ultranet.ru/Amiga-1251.html
-	Amiga1251 MIB = 2104
-
-	// KOI7switched is the MIB identifier with IANA name KOI7-switched.
-	//
-	// See http://www.iana.org/assignments/charset-reg/KOI7-switched
-	KOI7switched MIB = 2105
-
-	// BRF is the MIB identifier with IANA name BRF.
-	//
-	// See http://www.iana.org/assignments/charset-reg/BRF
-	BRF MIB = 2106
-
-	// TSCII is the MIB identifier with IANA name TSCII.
-	//
-	// See http://www.iana.org/assignments/charset-reg/TSCII
-	TSCII MIB = 2107
-
-	// CP51932 is the MIB identifier with IANA name CP51932.
-	//
-	// See http://www.iana.org/assignments/charset-reg/CP51932
-	CP51932 MIB = 2108
-
-	// Windows874 is the MIB identifier with IANA name windows-874.
-	//
-	// See http://www.iana.org/assignments/charset-reg/windows-874
-	Windows874 MIB = 2109
-
-	// Windows1250 is the MIB identifier with IANA name windows-1250.
-	//
-	// Microsoft http://www.iana.org/assignments/charset-reg/windows-1250
-	Windows1250 MIB = 2250
-
-	// Windows1251 is the MIB identifier with IANA name windows-1251.
-	//
-	// Microsoft http://www.iana.org/assignments/charset-reg/windows-1251
-	Windows1251 MIB = 2251
-
-	// Windows1252 is the MIB identifier with IANA name windows-1252.
-	//
-	// Microsoft http://www.iana.org/assignments/charset-reg/windows-1252
-	Windows1252 MIB = 2252
-
-	// Windows1253 is the MIB identifier with IANA name windows-1253.
-	//
-	// Microsoft http://www.iana.org/assignments/charset-reg/windows-1253
-	Windows1253 MIB = 2253
-
-	// Windows1254 is the MIB identifier with IANA name windows-1254.
-	//
-	// Microsoft http://www.iana.org/assignments/charset-reg/windows-1254
-	Windows1254 MIB = 2254
-
-	// Windows1255 is the MIB identifier with IANA name windows-1255.
-	//
-	// Microsoft http://www.iana.org/assignments/charset-reg/windows-1255
-	Windows1255 MIB = 2255
-
-	// Windows1256 is the MIB identifier with IANA name windows-1256.
-	//
-	// Microsoft http://www.iana.org/assignments/charset-reg/windows-1256
-	Windows1256 MIB = 2256
-
-	// Windows1257 is the MIB identifier with IANA name windows-1257.
-	//
-	// Microsoft http://www.iana.org/assignments/charset-reg/windows-1257
-	Windows1257 MIB = 2257
-
-	// Windows1258 is the MIB identifier with IANA name windows-1258.
-	//
-	// Microsoft http://www.iana.org/assignments/charset-reg/windows-1258
-	Windows1258 MIB = 2258
-
-	// TIS620 is the MIB identifier with IANA name TIS-620.
-	//
-	// Thai Industrial Standards Institute (TISI)
-	TIS620 MIB = 2259
-
-	// CP50220 is the MIB identifier with IANA name CP50220.
-	//
-	// See http://www.iana.org/assignments/charset-reg/CP50220
-	CP50220 MIB = 2260
-)
diff --git a/vendor/golang.org/x/text/encoding/internal/internal.go b/vendor/golang.org/x/text/encoding/internal/internal.go
deleted file mode 100644
index 75a5fd1658..0000000000
--- a/vendor/golang.org/x/text/encoding/internal/internal.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package internal contains code that is shared among encoding implementations.
-package internal
-
-import (
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/transform"
-)
-
-// Encoding is an implementation of the Encoding interface that adds the String
-// and ID methods to an existing encoding.
-type Encoding struct {
-	encoding.Encoding
-	Name string
-	MIB  identifier.MIB
-}
-
-// _ verifies that Encoding implements identifier.Interface.
-var _ identifier.Interface = (*Encoding)(nil)
-
-func (e *Encoding) String() string {
-	return e.Name
-}
-
-func (e *Encoding) ID() (mib identifier.MIB, other string) {
-	return e.MIB, ""
-}
-
-// SimpleEncoding is an Encoding that combines two Transformers.
-type SimpleEncoding struct {
-	Decoder transform.Transformer
-	Encoder transform.Transformer
-}
-
-func (e *SimpleEncoding) NewDecoder() *encoding.Decoder {
-	return &encoding.Decoder{Transformer: e.Decoder}
-}
-
-func (e *SimpleEncoding) NewEncoder() *encoding.Encoder {
-	return &encoding.Encoder{Transformer: e.Encoder}
-}
-
-// FuncEncoding is an Encoding that combines two functions returning a new
-// Transformer.
-type FuncEncoding struct {
-	Decoder func() transform.Transformer
-	Encoder func() transform.Transformer
-}
-
-func (e FuncEncoding) NewDecoder() *encoding.Decoder {
-	return &encoding.Decoder{Transformer: e.Decoder()}
-}
-
-func (e FuncEncoding) NewEncoder() *encoding.Encoder {
-	return &encoding.Encoder{Transformer: e.Encoder()}
-}
-
-// A RepertoireError indicates a rune is not in the repertoire of a destination
-// encoding. It is associated with an encoding-specific suggested replacement
-// byte.
-type RepertoireError byte
-
-// Error implements the error interrface.
-func (r RepertoireError) Error() string {
-	return "encoding: rune not supported by encoding."
-}
-
-// Replacement returns the replacement string associated with this error.
-func (r RepertoireError) Replacement() byte { return byte(r) }
-
-var ErrASCIIReplacement = RepertoireError(encoding.ASCIISub)
diff --git a/vendor/golang.org/x/text/encoding/japanese/all.go b/vendor/golang.org/x/text/encoding/japanese/all.go
deleted file mode 100644
index 6cfa8de450..0000000000
--- a/vendor/golang.org/x/text/encoding/japanese/all.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package japanese
-
-import (
-	"golang.org/x/text/encoding"
-)
-
-// All is a list of all defined encodings in this package.
-var All = []encoding.Encoding{EUCJP, ISO2022JP, ShiftJIS}
diff --git a/vendor/golang.org/x/text/encoding/japanese/eucjp.go b/vendor/golang.org/x/text/encoding/japanese/eucjp.go
deleted file mode 100644
index 79313fa589..0000000000
--- a/vendor/golang.org/x/text/encoding/japanese/eucjp.go
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package japanese
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/internal"
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/transform"
-)
-
-// EUCJP is the EUC-JP encoding.
-var EUCJP encoding.Encoding = &eucJP
-
-var eucJP = internal.Encoding{
-	&internal.SimpleEncoding{eucJPDecoder{}, eucJPEncoder{}},
-	"EUC-JP",
-	identifier.EUCPkdFmtJapanese,
-}
-
-type eucJPDecoder struct{ transform.NopResetter }
-
-// See https://encoding.spec.whatwg.org/#euc-jp-decoder.
-func (eucJPDecoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-loop:
-	for ; nSrc < len(src); nSrc += size {
-		switch c0 := src[nSrc]; {
-		case c0 < utf8.RuneSelf:
-			r, size = rune(c0), 1
-
-		case c0 == 0x8e:
-			if nSrc+1 >= len(src) {
-				if !atEOF {
-					err = transform.ErrShortSrc
-					break loop
-				}
-				r, size = utf8.RuneError, 1
-				break
-			}
-			c1 := src[nSrc+1]
-			switch {
-			case c1 < 0xa1:
-				r, size = utf8.RuneError, 1
-			case c1 > 0xdf:
-				r, size = utf8.RuneError, 2
-				if c1 == 0xff {
-					size = 1
-				}
-			default:
-				r, size = rune(c1)+(0xff61-0xa1), 2
-			}
-		case c0 == 0x8f:
-			if nSrc+2 >= len(src) {
-				if !atEOF {
-					err = transform.ErrShortSrc
-					break loop
-				}
-				r, size = utf8.RuneError, 1
-				if p := nSrc + 1; p < len(src) && 0xa1 <= src[p] && src[p] < 0xfe {
-					size = 2
-				}
-				break
-			}
-			c1 := src[nSrc+1]
-			if c1 < 0xa1 || 0xfe < c1 {
-				r, size = utf8.RuneError, 1
-				break
-			}
-			c2 := src[nSrc+2]
-			if c2 < 0xa1 || 0xfe < c2 {
-				r, size = utf8.RuneError, 2
-				break
-			}
-			r, size = utf8.RuneError, 3
-			if i := int(c1-0xa1)*94 + int(c2-0xa1); i < len(jis0212Decode) {
-				r = rune(jis0212Decode[i])
-				if r == 0 {
-					r = utf8.RuneError
-				}
-			}
-
-		case 0xa1 <= c0 && c0 <= 0xfe:
-			if nSrc+1 >= len(src) {
-				if !atEOF {
-					err = transform.ErrShortSrc
-					break loop
-				}
-				r, size = utf8.RuneError, 1
-				break
-			}
-			c1 := src[nSrc+1]
-			if c1 < 0xa1 || 0xfe < c1 {
-				r, size = utf8.RuneError, 1
-				break
-			}
-			r, size = utf8.RuneError, 2
-			if i := int(c0-0xa1)*94 + int(c1-0xa1); i < len(jis0208Decode) {
-				r = rune(jis0208Decode[i])
-				if r == 0 {
-					r = utf8.RuneError
-				}
-			}
-
-		default:
-			r, size = utf8.RuneError, 1
-		}
-
-		if nDst+utf8.RuneLen(r) > len(dst) {
-			err = transform.ErrShortDst
-			break loop
-		}
-		nDst += utf8.EncodeRune(dst[nDst:], r)
-	}
-	return nDst, nSrc, err
-}
-
-type eucJPEncoder struct{ transform.NopResetter }
-
-func (eucJPEncoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-	for ; nSrc < len(src); nSrc += size {
-		r = rune(src[nSrc])
-
-		// Decode a 1-byte rune.
-		if r < utf8.RuneSelf {
-			size = 1
-
-		} else {
-			// Decode a multi-byte rune.
-			r, size = utf8.DecodeRune(src[nSrc:])
-			if size == 1 {
-				// All valid runes of size 1 (those below utf8.RuneSelf) were
-				// handled above. We have invalid UTF-8 or we haven't seen the
-				// full character yet.
-				if !atEOF && !utf8.FullRune(src[nSrc:]) {
-					err = transform.ErrShortSrc
-					break
-				}
-			}
-
-			// func init checks that the switch covers all tables.
-			switch {
-			case encode0Low <= r && r < encode0High:
-				if r = rune(encode0[r-encode0Low]); r != 0 {
-					goto write2or3
-				}
-			case encode1Low <= r && r < encode1High:
-				if r = rune(encode1[r-encode1Low]); r != 0 {
-					goto write2or3
-				}
-			case encode2Low <= r && r < encode2High:
-				if r = rune(encode2[r-encode2Low]); r != 0 {
-					goto write2or3
-				}
-			case encode3Low <= r && r < encode3High:
-				if r = rune(encode3[r-encode3Low]); r != 0 {
-					goto write2or3
-				}
-			case encode4Low <= r && r < encode4High:
-				if r = rune(encode4[r-encode4Low]); r != 0 {
-					goto write2or3
-				}
-			case encode5Low <= r && r < encode5High:
-				if 0xff61 <= r && r < 0xffa0 {
-					goto write2
-				}
-				if r = rune(encode5[r-encode5Low]); r != 0 {
-					goto write2or3
-				}
-			}
-			err = internal.ErrASCIIReplacement
-			break
-		}
-
-		if nDst >= len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst] = uint8(r)
-		nDst++
-		continue
-
-	write2or3:
-		if r>>tableShift == jis0208 {
-			if nDst+2 > len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-		} else {
-			if nDst+3 > len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			dst[nDst] = 0x8f
-			nDst++
-		}
-		dst[nDst+0] = 0xa1 + uint8(r>>codeShift)&codeMask
-		dst[nDst+1] = 0xa1 + uint8(r)&codeMask
-		nDst += 2
-		continue
-
-	write2:
-		if nDst+2 > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst+0] = 0x8e
-		dst[nDst+1] = uint8(r - (0xff61 - 0xa1))
-		nDst += 2
-		continue
-	}
-	return nDst, nSrc, err
-}
-
-func init() {
-	// Check that the hard-coded encode switch covers all tables.
-	if numEncodeTables != 6 {
-		panic("bad numEncodeTables")
-	}
-}
diff --git a/vendor/golang.org/x/text/encoding/japanese/iso2022jp.go b/vendor/golang.org/x/text/encoding/japanese/iso2022jp.go
deleted file mode 100644
index 613226df5e..0000000000
--- a/vendor/golang.org/x/text/encoding/japanese/iso2022jp.go
+++ /dev/null
@@ -1,299 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package japanese
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/internal"
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/transform"
-)
-
-// ISO2022JP is the ISO-2022-JP encoding.
-var ISO2022JP encoding.Encoding = &iso2022JP
-
-var iso2022JP = internal.Encoding{
-	internal.FuncEncoding{iso2022JPNewDecoder, iso2022JPNewEncoder},
-	"ISO-2022-JP",
-	identifier.ISO2022JP,
-}
-
-func iso2022JPNewDecoder() transform.Transformer {
-	return new(iso2022JPDecoder)
-}
-
-func iso2022JPNewEncoder() transform.Transformer {
-	return new(iso2022JPEncoder)
-}
-
-const (
-	asciiState = iota
-	katakanaState
-	jis0208State
-	jis0212State
-)
-
-const asciiEsc = 0x1b
-
-type iso2022JPDecoder int
-
-func (d *iso2022JPDecoder) Reset() {
-	*d = asciiState
-}
-
-func (d *iso2022JPDecoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-	for ; nSrc < len(src); nSrc += size {
-		c0 := src[nSrc]
-		if c0 >= utf8.RuneSelf {
-			r, size = '\ufffd', 1
-			goto write
-		}
-
-		if c0 == asciiEsc {
-			if nSrc+2 >= len(src) {
-				if !atEOF {
-					return nDst, nSrc, transform.ErrShortSrc
-				}
-				// TODO: is it correct to only skip 1??
-				r, size = '\ufffd', 1
-				goto write
-			}
-			size = 3
-			c1 := src[nSrc+1]
-			c2 := src[nSrc+2]
-			switch {
-			case c1 == '$' && (c2 == '@' || c2 == 'B'): // 0x24 {0x40, 0x42}
-				*d = jis0208State
-				continue
-			case c1 == '$' && c2 == '(': // 0x24 0x28
-				if nSrc+3 >= len(src) {
-					if !atEOF {
-						return nDst, nSrc, transform.ErrShortSrc
-					}
-					r, size = '\ufffd', 1
-					goto write
-				}
-				size = 4
-				if src[nSrc+3] == 'D' {
-					*d = jis0212State
-					continue
-				}
-			case c1 == '(' && (c2 == 'B' || c2 == 'J'): // 0x28 {0x42, 0x4A}
-				*d = asciiState
-				continue
-			case c1 == '(' && c2 == 'I': // 0x28 0x49
-				*d = katakanaState
-				continue
-			}
-			r, size = '\ufffd', 1
-			goto write
-		}
-
-		switch *d {
-		case asciiState:
-			r, size = rune(c0), 1
-
-		case katakanaState:
-			if c0 < 0x21 || 0x60 <= c0 {
-				r, size = '\ufffd', 1
-				goto write
-			}
-			r, size = rune(c0)+(0xff61-0x21), 1
-
-		default:
-			if c0 == 0x0a {
-				*d = asciiState
-				r, size = rune(c0), 1
-				goto write
-			}
-			if nSrc+1 >= len(src) {
-				if !atEOF {
-					return nDst, nSrc, transform.ErrShortSrc
-				}
-				r, size = '\ufffd', 1
-				goto write
-			}
-			size = 2
-			c1 := src[nSrc+1]
-			i := int(c0-0x21)*94 + int(c1-0x21)
-			if *d == jis0208State && i < len(jis0208Decode) {
-				r = rune(jis0208Decode[i])
-			} else if *d == jis0212State && i < len(jis0212Decode) {
-				r = rune(jis0212Decode[i])
-			} else {
-				r = '\ufffd'
-				goto write
-			}
-			if r == 0 {
-				r = '\ufffd'
-			}
-		}
-
-	write:
-		if nDst+utf8.RuneLen(r) > len(dst) {
-			return nDst, nSrc, transform.ErrShortDst
-		}
-		nDst += utf8.EncodeRune(dst[nDst:], r)
-	}
-	return nDst, nSrc, err
-}
-
-type iso2022JPEncoder int
-
-func (e *iso2022JPEncoder) Reset() {
-	*e = asciiState
-}
-
-func (e *iso2022JPEncoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-	for ; nSrc < len(src); nSrc += size {
-		r = rune(src[nSrc])
-
-		// Decode a 1-byte rune.
-		if r < utf8.RuneSelf {
-			size = 1
-
-		} else {
-			// Decode a multi-byte rune.
-			r, size = utf8.DecodeRune(src[nSrc:])
-			if size == 1 {
-				// All valid runes of size 1 (those below utf8.RuneSelf) were
-				// handled above. We have invalid UTF-8 or we haven't seen the
-				// full character yet.
-				if !atEOF && !utf8.FullRune(src[nSrc:]) {
-					err = transform.ErrShortSrc
-					break
-				}
-			}
-
-			// func init checks that the switch covers all tables.
-			//
-			// http://encoding.spec.whatwg.org/#iso-2022-jp says that "the index jis0212
-			// is not used by the iso-2022-jp encoder due to lack of widespread support".
-			//
-			// TODO: do we have to special-case U+00A5 and U+203E, as per
-			// http://encoding.spec.whatwg.org/#iso-2022-jp
-			// Doing so would mean that "\u00a5" would not be preserved
-			// after an encode-decode round trip.
-			switch {
-			case encode0Low <= r && r < encode0High:
-				if r = rune(encode0[r-encode0Low]); r>>tableShift == jis0208 {
-					goto writeJIS
-				}
-			case encode1Low <= r && r < encode1High:
-				if r = rune(encode1[r-encode1Low]); r>>tableShift == jis0208 {
-					goto writeJIS
-				}
-			case encode2Low <= r && r < encode2High:
-				if r = rune(encode2[r-encode2Low]); r>>tableShift == jis0208 {
-					goto writeJIS
-				}
-			case encode3Low <= r && r < encode3High:
-				if r = rune(encode3[r-encode3Low]); r>>tableShift == jis0208 {
-					goto writeJIS
-				}
-			case encode4Low <= r && r < encode4High:
-				if r = rune(encode4[r-encode4Low]); r>>tableShift == jis0208 {
-					goto writeJIS
-				}
-			case encode5Low <= r && r < encode5High:
-				if 0xff61 <= r && r < 0xffa0 {
-					goto writeKatakana
-				}
-				if r = rune(encode5[r-encode5Low]); r>>tableShift == jis0208 {
-					goto writeJIS
-				}
-			}
-
-			// Switch back to ASCII state in case of error so that an ASCII
-			// replacement character can be written in the correct state.
-			if *e != asciiState {
-				if nDst+3 > len(dst) {
-					err = transform.ErrShortDst
-					break
-				}
-				*e = asciiState
-				dst[nDst+0] = asciiEsc
-				dst[nDst+1] = '('
-				dst[nDst+2] = 'B'
-				nDst += 3
-			}
-			err = internal.ErrASCIIReplacement
-			break
-		}
-
-		if *e != asciiState {
-			if nDst+4 > len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			*e = asciiState
-			dst[nDst+0] = asciiEsc
-			dst[nDst+1] = '('
-			dst[nDst+2] = 'B'
-			nDst += 3
-		} else if nDst >= len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst] = uint8(r)
-		nDst++
-		continue
-
-	writeJIS:
-		if *e != jis0208State {
-			if nDst+5 > len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			*e = jis0208State
-			dst[nDst+0] = asciiEsc
-			dst[nDst+1] = '$'
-			dst[nDst+2] = 'B'
-			nDst += 3
-		} else if nDst+2 > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst+0] = 0x21 + uint8(r>>codeShift)&codeMask
-		dst[nDst+1] = 0x21 + uint8(r)&codeMask
-		nDst += 2
-		continue
-
-	writeKatakana:
-		if *e != katakanaState {
-			if nDst+4 > len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			*e = katakanaState
-			dst[nDst+0] = asciiEsc
-			dst[nDst+1] = '('
-			dst[nDst+2] = 'I'
-			nDst += 3
-		} else if nDst >= len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst] = uint8(r - (0xff61 - 0x21))
-		nDst++
-		continue
-	}
-	if atEOF && err == nil && *e != asciiState {
-		if nDst+3 > len(dst) {
-			err = transform.ErrShortDst
-		} else {
-			*e = asciiState
-			dst[nDst+0] = asciiEsc
-			dst[nDst+1] = '('
-			dst[nDst+2] = 'B'
-			nDst += 3
-		}
-	}
-	return nDst, nSrc, err
-}
diff --git a/vendor/golang.org/x/text/encoding/japanese/shiftjis.go b/vendor/golang.org/x/text/encoding/japanese/shiftjis.go
deleted file mode 100644
index 16fd8a6e3e..0000000000
--- a/vendor/golang.org/x/text/encoding/japanese/shiftjis.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package japanese
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/internal"
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/transform"
-)
-
-// ShiftJIS is the Shift JIS encoding, also known as Code Page 932 and
-// Windows-31J.
-var ShiftJIS encoding.Encoding = &shiftJIS
-
-var shiftJIS = internal.Encoding{
-	&internal.SimpleEncoding{shiftJISDecoder{}, shiftJISEncoder{}},
-	"Shift JIS",
-	identifier.ShiftJIS,
-}
-
-type shiftJISDecoder struct{ transform.NopResetter }
-
-func (shiftJISDecoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-loop:
-	for ; nSrc < len(src); nSrc += size {
-		switch c0 := src[nSrc]; {
-		case c0 < utf8.RuneSelf:
-			r, size = rune(c0), 1
-
-		case 0xa1 <= c0 && c0 < 0xe0:
-			r, size = rune(c0)+(0xff61-0xa1), 1
-
-		case (0x81 <= c0 && c0 < 0xa0) || (0xe0 <= c0 && c0 < 0xfd):
-			if c0 <= 0x9f {
-				c0 -= 0x70
-			} else {
-				c0 -= 0xb0
-			}
-			c0 = 2*c0 - 0x21
-
-			if nSrc+1 >= len(src) {
-				if !atEOF {
-					err = transform.ErrShortSrc
-					break loop
-				}
-				r, size = '\ufffd', 1
-				goto write
-			}
-			c1 := src[nSrc+1]
-			switch {
-			case c1 < 0x40:
-				r, size = '\ufffd', 1 // c1 is ASCII so output on next round
-				goto write
-			case c1 < 0x7f:
-				c0--
-				c1 -= 0x40
-			case c1 == 0x7f:
-				r, size = '\ufffd', 1 // c1 is ASCII so output on next round
-				goto write
-			case c1 < 0x9f:
-				c0--
-				c1 -= 0x41
-			case c1 < 0xfd:
-				c1 -= 0x9f
-			default:
-				r, size = '\ufffd', 2
-				goto write
-			}
-			r, size = '\ufffd', 2
-			if i := int(c0)*94 + int(c1); i < len(jis0208Decode) {
-				r = rune(jis0208Decode[i])
-				if r == 0 {
-					r = '\ufffd'
-				}
-			}
-
-		case c0 == 0x80:
-			r, size = 0x80, 1
-
-		default:
-			r, size = '\ufffd', 1
-		}
-	write:
-		if nDst+utf8.RuneLen(r) > len(dst) {
-			err = transform.ErrShortDst
-			break loop
-		}
-		nDst += utf8.EncodeRune(dst[nDst:], r)
-	}
-	return nDst, nSrc, err
-}
-
-type shiftJISEncoder struct{ transform.NopResetter }
-
-func (shiftJISEncoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-loop:
-	for ; nSrc < len(src); nSrc += size {
-		r = rune(src[nSrc])
-
-		// Decode a 1-byte rune.
-		if r < utf8.RuneSelf {
-			size = 1
-
-		} else {
-			// Decode a multi-byte rune.
-			r, size = utf8.DecodeRune(src[nSrc:])
-			if size == 1 {
-				// All valid runes of size 1 (those below utf8.RuneSelf) were
-				// handled above. We have invalid UTF-8 or we haven't seen the
-				// full character yet.
-				if !atEOF && !utf8.FullRune(src[nSrc:]) {
-					err = transform.ErrShortSrc
-					break loop
-				}
-			}
-
-			// func init checks that the switch covers all tables.
-			switch {
-			case encode0Low <= r && r < encode0High:
-				if r = rune(encode0[r-encode0Low]); r>>tableShift == jis0208 {
-					goto write2
-				}
-			case encode1Low <= r && r < encode1High:
-				if r = rune(encode1[r-encode1Low]); r>>tableShift == jis0208 {
-					goto write2
-				}
-			case encode2Low <= r && r < encode2High:
-				if r = rune(encode2[r-encode2Low]); r>>tableShift == jis0208 {
-					goto write2
-				}
-			case encode3Low <= r && r < encode3High:
-				if r = rune(encode3[r-encode3Low]); r>>tableShift == jis0208 {
-					goto write2
-				}
-			case encode4Low <= r && r < encode4High:
-				if r = rune(encode4[r-encode4Low]); r>>tableShift == jis0208 {
-					goto write2
-				}
-			case encode5Low <= r && r < encode5High:
-				if 0xff61 <= r && r < 0xffa0 {
-					r -= 0xff61 - 0xa1
-					goto write1
-				}
-				if r = rune(encode5[r-encode5Low]); r>>tableShift == jis0208 {
-					goto write2
-				}
-			}
-			err = internal.ErrASCIIReplacement
-			break
-		}
-
-	write1:
-		if nDst >= len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst] = uint8(r)
-		nDst++
-		continue
-
-	write2:
-		j1 := uint8(r>>codeShift) & codeMask
-		j2 := uint8(r) & codeMask
-		if nDst+2 > len(dst) {
-			err = transform.ErrShortDst
-			break loop
-		}
-		if j1 <= 61 {
-			dst[nDst+0] = 129 + j1/2
-		} else {
-			dst[nDst+0] = 193 + j1/2
-		}
-		if j1&1 == 0 {
-			dst[nDst+1] = j2 + j2/63 + 64
-		} else {
-			dst[nDst+1] = j2 + 159
-		}
-		nDst += 2
-		continue
-	}
-	return nDst, nSrc, err
-}
diff --git a/vendor/golang.org/x/text/encoding/japanese/tables.go b/vendor/golang.org/x/text/encoding/japanese/tables.go
deleted file mode 100644
index 8717b79ae0..0000000000
--- a/vendor/golang.org/x/text/encoding/japanese/tables.go
+++ /dev/null
@@ -1,26971 +0,0 @@
-// generated by go run maketables.go; DO NOT EDIT
-
-// Package japanese provides Japanese encodings such as EUC-JP and Shift JIS.
-package japanese // import "golang.org/x/text/encoding/japanese"
-
-// jis0208Decode is the decoding table from JIS 0208 code to Unicode.
-// It is defined at http://encoding.spec.whatwg.org/index-jis0208.txt
-var jis0208Decode = [...]uint16{
-	0:     0x3000,
-	1:     0x3001,
-	2:     0x3002,
-	3:     0xFF0C,
-	4:     0xFF0E,
-	5:     0x30FB,
-	6:     0xFF1A,
-	7:     0xFF1B,
-	8:     0xFF1F,
-	9:     0xFF01,
-	10:    0x309B,
-	11:    0x309C,
-	12:    0x00B4,
-	13:    0xFF40,
-	14:    0x00A8,
-	15:    0xFF3E,
-	16:    0xFFE3,
-	17:    0xFF3F,
-	18:    0x30FD,
-	19:    0x30FE,
-	20:    0x309D,
-	21:    0x309E,
-	22:    0x3003,
-	23:    0x4EDD,
-	24:    0x3005,
-	25:    0x3006,
-	26:    0x3007,
-	27:    0x30FC,
-	28:    0x2015,
-	29:    0x2010,
-	30:    0xFF0F,
-	31:    0xFF3C,
-	32:    0xFF5E,
-	33:    0x2225,
-	34:    0xFF5C,
-	35:    0x2026,
-	36:    0x2025,
-	37:    0x2018,
-	38:    0x2019,
-	39:    0x201C,
-	40:    0x201D,
-	41:    0xFF08,
-	42:    0xFF09,
-	43:    0x3014,
-	44:    0x3015,
-	45:    0xFF3B,
-	46:    0xFF3D,
-	47:    0xFF5B,
-	48:    0xFF5D,
-	49:    0x3008,
-	50:    0x3009,
-	51:    0x300A,
-	52:    0x300B,
-	53:    0x300C,
-	54:    0x300D,
-	55:    0x300E,
-	56:    0x300F,
-	57:    0x3010,
-	58:    0x3011,
-	59:    0xFF0B,
-	60:    0xFF0D,
-	61:    0x00B1,
-	62:    0x00D7,
-	63:    0x00F7,
-	64:    0xFF1D,
-	65:    0x2260,
-	66:    0xFF1C,
-	67:    0xFF1E,
-	68:    0x2266,
-	69:    0x2267,
-	70:    0x221E,
-	71:    0x2234,
-	72:    0x2642,
-	73:    0x2640,
-	74:    0x00B0,
-	75:    0x2032,
-	76:    0x2033,
-	77:    0x2103,
-	78:    0xFFE5,
-	79:    0xFF04,
-	80:    0xFFE0,
-	81:    0xFFE1,
-	82:    0xFF05,
-	83:    0xFF03,
-	84:    0xFF06,
-	85:    0xFF0A,
-	86:    0xFF20,
-	87:    0x00A7,
-	88:    0x2606,
-	89:    0x2605,
-	90:    0x25CB,
-	91:    0x25CF,
-	92:    0x25CE,
-	93:    0x25C7,
-	94:    0x25C6,
-	95:    0x25A1,
-	96:    0x25A0,
-	97:    0x25B3,
-	98:    0x25B2,
-	99:    0x25BD,
-	100:   0x25BC,
-	101:   0x203B,
-	102:   0x3012,
-	103:   0x2192,
-	104:   0x2190,
-	105:   0x2191,
-	106:   0x2193,
-	107:   0x3013,
-	119:   0x2208,
-	120:   0x220B,
-	121:   0x2286,
-	122:   0x2287,
-	123:   0x2282,
-	124:   0x2283,
-	125:   0x222A,
-	126:   0x2229,
-	135:   0x2227,
-	136:   0x2228,
-	137:   0xFFE2,
-	138:   0x21D2,
-	139:   0x21D4,
-	140:   0x2200,
-	141:   0x2203,
-	153:   0x2220,
-	154:   0x22A5,
-	155:   0x2312,
-	156:   0x2202,
-	157:   0x2207,
-	158:   0x2261,
-	159:   0x2252,
-	160:   0x226A,
-	161:   0x226B,
-	162:   0x221A,
-	163:   0x223D,
-	164:   0x221D,
-	165:   0x2235,
-	166:   0x222B,
-	167:   0x222C,
-	175:   0x212B,
-	176:   0x2030,
-	177:   0x266F,
-	178:   0x266D,
-	179:   0x266A,
-	180:   0x2020,
-	181:   0x2021,
-	182:   0x00B6,
-	187:   0x25EF,
-	203:   0xFF10,
-	204:   0xFF11,
-	205:   0xFF12,
-	206:   0xFF13,
-	207:   0xFF14,
-	208:   0xFF15,
-	209:   0xFF16,
-	210:   0xFF17,
-	211:   0xFF18,
-	212:   0xFF19,
-	220:   0xFF21,
-	221:   0xFF22,
-	222:   0xFF23,
-	223:   0xFF24,
-	224:   0xFF25,
-	225:   0xFF26,
-	226:   0xFF27,
-	227:   0xFF28,
-	228:   0xFF29,
-	229:   0xFF2A,
-	230:   0xFF2B,
-	231:   0xFF2C,
-	232:   0xFF2D,
-	233:   0xFF2E,
-	234:   0xFF2F,
-	235:   0xFF30,
-	236:   0xFF31,
-	237:   0xFF32,
-	238:   0xFF33,
-	239:   0xFF34,
-	240:   0xFF35,
-	241:   0xFF36,
-	242:   0xFF37,
-	243:   0xFF38,
-	244:   0xFF39,
-	245:   0xFF3A,
-	252:   0xFF41,
-	253:   0xFF42,
-	254:   0xFF43,
-	255:   0xFF44,
-	256:   0xFF45,
-	257:   0xFF46,
-	258:   0xFF47,
-	259:   0xFF48,
-	260:   0xFF49,
-	261:   0xFF4A,
-	262:   0xFF4B,
-	263:   0xFF4C,
-	264:   0xFF4D,
-	265:   0xFF4E,
-	266:   0xFF4F,
-	267:   0xFF50,
-	268:   0xFF51,
-	269:   0xFF52,
-	270:   0xFF53,
-	271:   0xFF54,
-	272:   0xFF55,
-	273:   0xFF56,
-	274:   0xFF57,
-	275:   0xFF58,
-	276:   0xFF59,
-	277:   0xFF5A,
-	282:   0x3041,
-	283:   0x3042,
-	284:   0x3043,
-	285:   0x3044,
-	286:   0x3045,
-	287:   0x3046,
-	288:   0x3047,
-	289:   0x3048,
-	290:   0x3049,
-	291:   0x304A,
-	292:   0x304B,
-	293:   0x304C,
-	294:   0x304D,
-	295:   0x304E,
-	296:   0x304F,
-	297:   0x3050,
-	298:   0x3051,
-	299:   0x3052,
-	300:   0x3053,
-	301:   0x3054,
-	302:   0x3055,
-	303:   0x3056,
-	304:   0x3057,
-	305:   0x3058,
-	306:   0x3059,
-	307:   0x305A,
-	308:   0x305B,
-	309:   0x305C,
-	310:   0x305D,
-	311:   0x305E,
-	312:   0x305F,
-	313:   0x3060,
-	314:   0x3061,
-	315:   0x3062,
-	316:   0x3063,
-	317:   0x3064,
-	318:   0x3065,
-	319:   0x3066,
-	320:   0x3067,
-	321:   0x3068,
-	322:   0x3069,
-	323:   0x306A,
-	324:   0x306B,
-	325:   0x306C,
-	326:   0x306D,
-	327:   0x306E,
-	328:   0x306F,
-	329:   0x3070,
-	330:   0x3071,
-	331:   0x3072,
-	332:   0x3073,
-	333:   0x3074,
-	334:   0x3075,
-	335:   0x3076,
-	336:   0x3077,
-	337:   0x3078,
-	338:   0x3079,
-	339:   0x307A,
-	340:   0x307B,
-	341:   0x307C,
-	342:   0x307D,
-	343:   0x307E,
-	344:   0x307F,
-	345:   0x3080,
-	346:   0x3081,
-	347:   0x3082,
-	348:   0x3083,
-	349:   0x3084,
-	350:   0x3085,
-	351:   0x3086,
-	352:   0x3087,
-	353:   0x3088,
-	354:   0x3089,
-	355:   0x308A,
-	356:   0x308B,
-	357:   0x308C,
-	358:   0x308D,
-	359:   0x308E,
-	360:   0x308F,
-	361:   0x3090,
-	362:   0x3091,
-	363:   0x3092,
-	364:   0x3093,
-	376:   0x30A1,
-	377:   0x30A2,
-	378:   0x30A3,
-	379:   0x30A4,
-	380:   0x30A5,
-	381:   0x30A6,
-	382:   0x30A7,
-	383:   0x30A8,
-	384:   0x30A9,
-	385:   0x30AA,
-	386:   0x30AB,
-	387:   0x30AC,
-	388:   0x30AD,
-	389:   0x30AE,
-	390:   0x30AF,
-	391:   0x30B0,
-	392:   0x30B1,
-	393:   0x30B2,
-	394:   0x30B3,
-	395:   0x30B4,
-	396:   0x30B5,
-	397:   0x30B6,
-	398:   0x30B7,
-	399:   0x30B8,
-	400:   0x30B9,
-	401:   0x30BA,
-	402:   0x30BB,
-	403:   0x30BC,
-	404:   0x30BD,
-	405:   0x30BE,
-	406:   0x30BF,
-	407:   0x30C0,
-	408:   0x30C1,
-	409:   0x30C2,
-	410:   0x30C3,
-	411:   0x30C4,
-	412:   0x30C5,
-	413:   0x30C6,
-	414:   0x30C7,
-	415:   0x30C8,
-	416:   0x30C9,
-	417:   0x30CA,
-	418:   0x30CB,
-	419:   0x30CC,
-	420:   0x30CD,
-	421:   0x30CE,
-	422:   0x30CF,
-	423:   0x30D0,
-	424:   0x30D1,
-	425:   0x30D2,
-	426:   0x30D3,
-	427:   0x30D4,
-	428:   0x30D5,
-	429:   0x30D6,
-	430:   0x30D7,
-	431:   0x30D8,
-	432:   0x30D9,
-	433:   0x30DA,
-	434:   0x30DB,
-	435:   0x30DC,
-	436:   0x30DD,
-	437:   0x30DE,
-	438:   0x30DF,
-	439:   0x30E0,
-	440:   0x30E1,
-	441:   0x30E2,
-	442:   0x30E3,
-	443:   0x30E4,
-	444:   0x30E5,
-	445:   0x30E6,
-	446:   0x30E7,
-	447:   0x30E8,
-	448:   0x30E9,
-	449:   0x30EA,
-	450:   0x30EB,
-	451:   0x30EC,
-	452:   0x30ED,
-	453:   0x30EE,
-	454:   0x30EF,
-	455:   0x30F0,
-	456:   0x30F1,
-	457:   0x30F2,
-	458:   0x30F3,
-	459:   0x30F4,
-	460:   0x30F5,
-	461:   0x30F6,
-	470:   0x0391,
-	471:   0x0392,
-	472:   0x0393,
-	473:   0x0394,
-	474:   0x0395,
-	475:   0x0396,
-	476:   0x0397,
-	477:   0x0398,
-	478:   0x0399,
-	479:   0x039A,
-	480:   0x039B,
-	481:   0x039C,
-	482:   0x039D,
-	483:   0x039E,
-	484:   0x039F,
-	485:   0x03A0,
-	486:   0x03A1,
-	487:   0x03A3,
-	488:   0x03A4,
-	489:   0x03A5,
-	490:   0x03A6,
-	491:   0x03A7,
-	492:   0x03A8,
-	493:   0x03A9,
-	502:   0x03B1,
-	503:   0x03B2,
-	504:   0x03B3,
-	505:   0x03B4,
-	506:   0x03B5,
-	507:   0x03B6,
-	508:   0x03B7,
-	509:   0x03B8,
-	510:   0x03B9,
-	511:   0x03BA,
-	512:   0x03BB,
-	513:   0x03BC,
-	514:   0x03BD,
-	515:   0x03BE,
-	516:   0x03BF,
-	517:   0x03C0,
-	518:   0x03C1,
-	519:   0x03C3,
-	520:   0x03C4,
-	521:   0x03C5,
-	522:   0x03C6,
-	523:   0x03C7,
-	524:   0x03C8,
-	525:   0x03C9,
-	564:   0x0410,
-	565:   0x0411,
-	566:   0x0412,
-	567:   0x0413,
-	568:   0x0414,
-	569:   0x0415,
-	570:   0x0401,
-	571:   0x0416,
-	572:   0x0417,
-	573:   0x0418,
-	574:   0x0419,
-	575:   0x041A,
-	576:   0x041B,
-	577:   0x041C,
-	578:   0x041D,
-	579:   0x041E,
-	580:   0x041F,
-	581:   0x0420,
-	582:   0x0421,
-	583:   0x0422,
-	584:   0x0423,
-	585:   0x0424,
-	586:   0x0425,
-	587:   0x0426,
-	588:   0x0427,
-	589:   0x0428,
-	590:   0x0429,
-	591:   0x042A,
-	592:   0x042B,
-	593:   0x042C,
-	594:   0x042D,
-	595:   0x042E,
-	596:   0x042F,
-	612:   0x0430,
-	613:   0x0431,
-	614:   0x0432,
-	615:   0x0433,
-	616:   0x0434,
-	617:   0x0435,
-	618:   0x0451,
-	619:   0x0436,
-	620:   0x0437,
-	621:   0x0438,
-	622:   0x0439,
-	623:   0x043A,
-	624:   0x043B,
-	625:   0x043C,
-	626:   0x043D,
-	627:   0x043E,
-	628:   0x043F,
-	629:   0x0440,
-	630:   0x0441,
-	631:   0x0442,
-	632:   0x0443,
-	633:   0x0444,
-	634:   0x0445,
-	635:   0x0446,
-	636:   0x0447,
-	637:   0x0448,
-	638:   0x0449,
-	639:   0x044A,
-	640:   0x044B,
-	641:   0x044C,
-	642:   0x044D,
-	643:   0x044E,
-	644:   0x044F,
-	658:   0x2500,
-	659:   0x2502,
-	660:   0x250C,
-	661:   0x2510,
-	662:   0x2518,
-	663:   0x2514,
-	664:   0x251C,
-	665:   0x252C,
-	666:   0x2524,
-	667:   0x2534,
-	668:   0x253C,
-	669:   0x2501,
-	670:   0x2503,
-	671:   0x250F,
-	672:   0x2513,
-	673:   0x251B,
-	674:   0x2517,
-	675:   0x2523,
-	676:   0x2533,
-	677:   0x252B,
-	678:   0x253B,
-	679:   0x254B,
-	680:   0x2520,
-	681:   0x252F,
-	682:   0x2528,
-	683:   0x2537,
-	684:   0x253F,
-	685:   0x251D,
-	686:   0x2530,
-	687:   0x2525,
-	688:   0x2538,
-	689:   0x2542,
-	1128:  0x2460,
-	1129:  0x2461,
-	1130:  0x2462,
-	1131:  0x2463,
-	1132:  0x2464,
-	1133:  0x2465,
-	1134:  0x2466,
-	1135:  0x2467,
-	1136:  0x2468,
-	1137:  0x2469,
-	1138:  0x246A,
-	1139:  0x246B,
-	1140:  0x246C,
-	1141:  0x246D,
-	1142:  0x246E,
-	1143:  0x246F,
-	1144:  0x2470,
-	1145:  0x2471,
-	1146:  0x2472,
-	1147:  0x2473,
-	1148:  0x2160,
-	1149:  0x2161,
-	1150:  0x2162,
-	1151:  0x2163,
-	1152:  0x2164,
-	1153:  0x2165,
-	1154:  0x2166,
-	1155:  0x2167,
-	1156:  0x2168,
-	1157:  0x2169,
-	1159:  0x3349,
-	1160:  0x3314,
-	1161:  0x3322,
-	1162:  0x334D,
-	1163:  0x3318,
-	1164:  0x3327,
-	1165:  0x3303,
-	1166:  0x3336,
-	1167:  0x3351,
-	1168:  0x3357,
-	1169:  0x330D,
-	1170:  0x3326,
-	1171:  0x3323,
-	1172:  0x332B,
-	1173:  0x334A,
-	1174:  0x333B,
-	1175:  0x339C,
-	1176:  0x339D,
-	1177:  0x339E,
-	1178:  0x338E,
-	1179:  0x338F,
-	1180:  0x33C4,
-	1181:  0x33A1,
-	1190:  0x337B,
-	1191:  0x301D,
-	1192:  0x301F,
-	1193:  0x2116,
-	1194:  0x33CD,
-	1195:  0x2121,
-	1196:  0x32A4,
-	1197:  0x32A5,
-	1198:  0x32A6,
-	1199:  0x32A7,
-	1200:  0x32A8,
-	1201:  0x3231,
-	1202:  0x3232,
-	1203:  0x3239,
-	1204:  0x337E,
-	1205:  0x337D,
-	1206:  0x337C,
-	1207:  0x2252,
-	1208:  0x2261,
-	1209:  0x222B,
-	1210:  0x222E,
-	1211:  0x2211,
-	1212:  0x221A,
-	1213:  0x22A5,
-	1214:  0x2220,
-	1215:  0x221F,
-	1216:  0x22BF,
-	1217:  0x2235,
-	1218:  0x2229,
-	1219:  0x222A,
-	1410:  0x4E9C,
-	1411:  0x5516,
-	1412:  0x5A03,
-	1413:  0x963F,
-	1414:  0x54C0,
-	1415:  0x611B,
-	1416:  0x6328,
-	1417:  0x59F6,
-	1418:  0x9022,
-	1419:  0x8475,
-	1420:  0x831C,
-	1421:  0x7A50,
-	1422:  0x60AA,
-	1423:  0x63E1,
-	1424:  0x6E25,
-	1425:  0x65ED,
-	1426:  0x8466,
-	1427:  0x82A6,
-	1428:  0x9BF5,
-	1429:  0x6893,
-	1430:  0x5727,
-	1431:  0x65A1,
-	1432:  0x6271,
-	1433:  0x5B9B,
-	1434:  0x59D0,
-	1435:  0x867B,
-	1436:  0x98F4,
-	1437:  0x7D62,
-	1438:  0x7DBE,
-	1439:  0x9B8E,
-	1440:  0x6216,
-	1441:  0x7C9F,
-	1442:  0x88B7,
-	1443:  0x5B89,
-	1444:  0x5EB5,
-	1445:  0x6309,
-	1446:  0x6697,
-	1447:  0x6848,
-	1448:  0x95C7,
-	1449:  0x978D,
-	1450:  0x674F,
-	1451:  0x4EE5,
-	1452:  0x4F0A,
-	1453:  0x4F4D,
-	1454:  0x4F9D,
-	1455:  0x5049,
-	1456:  0x56F2,
-	1457:  0x5937,
-	1458:  0x59D4,
-	1459:  0x5A01,
-	1460:  0x5C09,
-	1461:  0x60DF,
-	1462:  0x610F,
-	1463:  0x6170,
-	1464:  0x6613,
-	1465:  0x6905,
-	1466:  0x70BA,
-	1467:  0x754F,
-	1468:  0x7570,
-	1469:  0x79FB,
-	1470:  0x7DAD,
-	1471:  0x7DEF,
-	1472:  0x80C3,
-	1473:  0x840E,
-	1474:  0x8863,
-	1475:  0x8B02,
-	1476:  0x9055,
-	1477:  0x907A,
-	1478:  0x533B,
-	1479:  0x4E95,
-	1480:  0x4EA5,
-	1481:  0x57DF,
-	1482:  0x80B2,
-	1483:  0x90C1,
-	1484:  0x78EF,
-	1485:  0x4E00,
-	1486:  0x58F1,
-	1487:  0x6EA2,
-	1488:  0x9038,
-	1489:  0x7A32,
-	1490:  0x8328,
-	1491:  0x828B,
-	1492:  0x9C2F,
-	1493:  0x5141,
-	1494:  0x5370,
-	1495:  0x54BD,
-	1496:  0x54E1,
-	1497:  0x56E0,
-	1498:  0x59FB,
-	1499:  0x5F15,
-	1500:  0x98F2,
-	1501:  0x6DEB,
-	1502:  0x80E4,
-	1503:  0x852D,
-	1504:  0x9662,
-	1505:  0x9670,
-	1506:  0x96A0,
-	1507:  0x97FB,
-	1508:  0x540B,
-	1509:  0x53F3,
-	1510:  0x5B87,
-	1511:  0x70CF,
-	1512:  0x7FBD,
-	1513:  0x8FC2,
-	1514:  0x96E8,
-	1515:  0x536F,
-	1516:  0x9D5C,
-	1517:  0x7ABA,
-	1518:  0x4E11,
-	1519:  0x7893,
-	1520:  0x81FC,
-	1521:  0x6E26,
-	1522:  0x5618,
-	1523:  0x5504,
-	1524:  0x6B1D,
-	1525:  0x851A,
-	1526:  0x9C3B,
-	1527:  0x59E5,
-	1528:  0x53A9,
-	1529:  0x6D66,
-	1530:  0x74DC,
-	1531:  0x958F,
-	1532:  0x5642,
-	1533:  0x4E91,
-	1534:  0x904B,
-	1535:  0x96F2,
-	1536:  0x834F,
-	1537:  0x990C,
-	1538:  0x53E1,
-	1539:  0x55B6,
-	1540:  0x5B30,
-	1541:  0x5F71,
-	1542:  0x6620,
-	1543:  0x66F3,
-	1544:  0x6804,
-	1545:  0x6C38,
-	1546:  0x6CF3,
-	1547:  0x6D29,
-	1548:  0x745B,
-	1549:  0x76C8,
-	1550:  0x7A4E,
-	1551:  0x9834,
-	1552:  0x82F1,
-	1553:  0x885B,
-	1554:  0x8A60,
-	1555:  0x92ED,
-	1556:  0x6DB2,
-	1557:  0x75AB,
-	1558:  0x76CA,
-	1559:  0x99C5,
-	1560:  0x60A6,
-	1561:  0x8B01,
-	1562:  0x8D8A,
-	1563:  0x95B2,
-	1564:  0x698E,
-	1565:  0x53AD,
-	1566:  0x5186,
-	1567:  0x5712,
-	1568:  0x5830,
-	1569:  0x5944,
-	1570:  0x5BB4,
-	1571:  0x5EF6,
-	1572:  0x6028,
-	1573:  0x63A9,
-	1574:  0x63F4,
-	1575:  0x6CBF,
-	1576:  0x6F14,
-	1577:  0x708E,
-	1578:  0x7114,
-	1579:  0x7159,
-	1580:  0x71D5,
-	1581:  0x733F,
-	1582:  0x7E01,
-	1583:  0x8276,
-	1584:  0x82D1,
-	1585:  0x8597,
-	1586:  0x9060,
-	1587:  0x925B,
-	1588:  0x9D1B,
-	1589:  0x5869,
-	1590:  0x65BC,
-	1591:  0x6C5A,
-	1592:  0x7525,
-	1593:  0x51F9,
-	1594:  0x592E,
-	1595:  0x5965,
-	1596:  0x5F80,
-	1597:  0x5FDC,
-	1598:  0x62BC,
-	1599:  0x65FA,
-	1600:  0x6A2A,
-	1601:  0x6B27,
-	1602:  0x6BB4,
-	1603:  0x738B,
-	1604:  0x7FC1,
-	1605:  0x8956,
-	1606:  0x9D2C,
-	1607:  0x9D0E,
-	1608:  0x9EC4,
-	1609:  0x5CA1,
-	1610:  0x6C96,
-	1611:  0x837B,
-	1612:  0x5104,
-	1613:  0x5C4B,
-	1614:  0x61B6,
-	1615:  0x81C6,
-	1616:  0x6876,
-	1617:  0x7261,
-	1618:  0x4E59,
-	1619:  0x4FFA,
-	1620:  0x5378,
-	1621:  0x6069,
-	1622:  0x6E29,
-	1623:  0x7A4F,
-	1624:  0x97F3,
-	1625:  0x4E0B,
-	1626:  0x5316,
-	1627:  0x4EEE,
-	1628:  0x4F55,
-	1629:  0x4F3D,
-	1630:  0x4FA1,
-	1631:  0x4F73,
-	1632:  0x52A0,
-	1633:  0x53EF,
-	1634:  0x5609,
-	1635:  0x590F,
-	1636:  0x5AC1,
-	1637:  0x5BB6,
-	1638:  0x5BE1,
-	1639:  0x79D1,
-	1640:  0x6687,
-	1641:  0x679C,
-	1642:  0x67B6,
-	1643:  0x6B4C,
-	1644:  0x6CB3,
-	1645:  0x706B,
-	1646:  0x73C2,
-	1647:  0x798D,
-	1648:  0x79BE,
-	1649:  0x7A3C,
-	1650:  0x7B87,
-	1651:  0x82B1,
-	1652:  0x82DB,
-	1653:  0x8304,
-	1654:  0x8377,
-	1655:  0x83EF,
-	1656:  0x83D3,
-	1657:  0x8766,
-	1658:  0x8AB2,
-	1659:  0x5629,
-	1660:  0x8CA8,
-	1661:  0x8FE6,
-	1662:  0x904E,
-	1663:  0x971E,
-	1664:  0x868A,
-	1665:  0x4FC4,
-	1666:  0x5CE8,
-	1667:  0x6211,
-	1668:  0x7259,
-	1669:  0x753B,
-	1670:  0x81E5,
-	1671:  0x82BD,
-	1672:  0x86FE,
-	1673:  0x8CC0,
-	1674:  0x96C5,
-	1675:  0x9913,
-	1676:  0x99D5,
-	1677:  0x4ECB,
-	1678:  0x4F1A,
-	1679:  0x89E3,
-	1680:  0x56DE,
-	1681:  0x584A,
-	1682:  0x58CA,
-	1683:  0x5EFB,
-	1684:  0x5FEB,
-	1685:  0x602A,
-	1686:  0x6094,
-	1687:  0x6062,
-	1688:  0x61D0,
-	1689:  0x6212,
-	1690:  0x62D0,
-	1691:  0x6539,
-	1692:  0x9B41,
-	1693:  0x6666,
-	1694:  0x68B0,
-	1695:  0x6D77,
-	1696:  0x7070,
-	1697:  0x754C,
-	1698:  0x7686,
-	1699:  0x7D75,
-	1700:  0x82A5,
-	1701:  0x87F9,
-	1702:  0x958B,
-	1703:  0x968E,
-	1704:  0x8C9D,
-	1705:  0x51F1,
-	1706:  0x52BE,
-	1707:  0x5916,
-	1708:  0x54B3,
-	1709:  0x5BB3,
-	1710:  0x5D16,
-	1711:  0x6168,
-	1712:  0x6982,
-	1713:  0x6DAF,
-	1714:  0x788D,
-	1715:  0x84CB,
-	1716:  0x8857,
-	1717:  0x8A72,
-	1718:  0x93A7,
-	1719:  0x9AB8,
-	1720:  0x6D6C,
-	1721:  0x99A8,
-	1722:  0x86D9,
-	1723:  0x57A3,
-	1724:  0x67FF,
-	1725:  0x86CE,
-	1726:  0x920E,
-	1727:  0x5283,
-	1728:  0x5687,
-	1729:  0x5404,
-	1730:  0x5ED3,
-	1731:  0x62E1,
-	1732:  0x64B9,
-	1733:  0x683C,
-	1734:  0x6838,
-	1735:  0x6BBB,
-	1736:  0x7372,
-	1737:  0x78BA,
-	1738:  0x7A6B,
-	1739:  0x899A,
-	1740:  0x89D2,
-	1741:  0x8D6B,
-	1742:  0x8F03,
-	1743:  0x90ED,
-	1744:  0x95A3,
-	1745:  0x9694,
-	1746:  0x9769,
-	1747:  0x5B66,
-	1748:  0x5CB3,
-	1749:  0x697D,
-	1750:  0x984D,
-	1751:  0x984E,
-	1752:  0x639B,
-	1753:  0x7B20,
-	1754:  0x6A2B,
-	1755:  0x6A7F,
-	1756:  0x68B6,
-	1757:  0x9C0D,
-	1758:  0x6F5F,
-	1759:  0x5272,
-	1760:  0x559D,
-	1761:  0x6070,
-	1762:  0x62EC,
-	1763:  0x6D3B,
-	1764:  0x6E07,
-	1765:  0x6ED1,
-	1766:  0x845B,
-	1767:  0x8910,
-	1768:  0x8F44,
-	1769:  0x4E14,
-	1770:  0x9C39,
-	1771:  0x53F6,
-	1772:  0x691B,
-	1773:  0x6A3A,
-	1774:  0x9784,
-	1775:  0x682A,
-	1776:  0x515C,
-	1777:  0x7AC3,
-	1778:  0x84B2,
-	1779:  0x91DC,
-	1780:  0x938C,
-	1781:  0x565B,
-	1782:  0x9D28,
-	1783:  0x6822,
-	1784:  0x8305,
-	1785:  0x8431,
-	1786:  0x7CA5,
-	1787:  0x5208,
-	1788:  0x82C5,
-	1789:  0x74E6,
-	1790:  0x4E7E,
-	1791:  0x4F83,
-	1792:  0x51A0,
-	1793:  0x5BD2,
-	1794:  0x520A,
-	1795:  0x52D8,
-	1796:  0x52E7,
-	1797:  0x5DFB,
-	1798:  0x559A,
-	1799:  0x582A,
-	1800:  0x59E6,
-	1801:  0x5B8C,
-	1802:  0x5B98,
-	1803:  0x5BDB,
-	1804:  0x5E72,
-	1805:  0x5E79,
-	1806:  0x60A3,
-	1807:  0x611F,
-	1808:  0x6163,
-	1809:  0x61BE,
-	1810:  0x63DB,
-	1811:  0x6562,
-	1812:  0x67D1,
-	1813:  0x6853,
-	1814:  0x68FA,
-	1815:  0x6B3E,
-	1816:  0x6B53,
-	1817:  0x6C57,
-	1818:  0x6F22,
-	1819:  0x6F97,
-	1820:  0x6F45,
-	1821:  0x74B0,
-	1822:  0x7518,
-	1823:  0x76E3,
-	1824:  0x770B,
-	1825:  0x7AFF,
-	1826:  0x7BA1,
-	1827:  0x7C21,
-	1828:  0x7DE9,
-	1829:  0x7F36,
-	1830:  0x7FF0,
-	1831:  0x809D,
-	1832:  0x8266,
-	1833:  0x839E,
-	1834:  0x89B3,
-	1835:  0x8ACC,
-	1836:  0x8CAB,
-	1837:  0x9084,
-	1838:  0x9451,
-	1839:  0x9593,
-	1840:  0x9591,
-	1841:  0x95A2,
-	1842:  0x9665,
-	1843:  0x97D3,
-	1844:  0x9928,
-	1845:  0x8218,
-	1846:  0x4E38,
-	1847:  0x542B,
-	1848:  0x5CB8,
-	1849:  0x5DCC,
-	1850:  0x73A9,
-	1851:  0x764C,
-	1852:  0x773C,
-	1853:  0x5CA9,
-	1854:  0x7FEB,
-	1855:  0x8D0B,
-	1856:  0x96C1,
-	1857:  0x9811,
-	1858:  0x9854,
-	1859:  0x9858,
-	1860:  0x4F01,
-	1861:  0x4F0E,
-	1862:  0x5371,
-	1863:  0x559C,
-	1864:  0x5668,
-	1865:  0x57FA,
-	1866:  0x5947,
-	1867:  0x5B09,
-	1868:  0x5BC4,
-	1869:  0x5C90,
-	1870:  0x5E0C,
-	1871:  0x5E7E,
-	1872:  0x5FCC,
-	1873:  0x63EE,
-	1874:  0x673A,
-	1875:  0x65D7,
-	1876:  0x65E2,
-	1877:  0x671F,
-	1878:  0x68CB,
-	1879:  0x68C4,
-	1880:  0x6A5F,
-	1881:  0x5E30,
-	1882:  0x6BC5,
-	1883:  0x6C17,
-	1884:  0x6C7D,
-	1885:  0x757F,
-	1886:  0x7948,
-	1887:  0x5B63,
-	1888:  0x7A00,
-	1889:  0x7D00,
-	1890:  0x5FBD,
-	1891:  0x898F,
-	1892:  0x8A18,
-	1893:  0x8CB4,
-	1894:  0x8D77,
-	1895:  0x8ECC,
-	1896:  0x8F1D,
-	1897:  0x98E2,
-	1898:  0x9A0E,
-	1899:  0x9B3C,
-	1900:  0x4E80,
-	1901:  0x507D,
-	1902:  0x5100,
-	1903:  0x5993,
-	1904:  0x5B9C,
-	1905:  0x622F,
-	1906:  0x6280,
-	1907:  0x64EC,
-	1908:  0x6B3A,
-	1909:  0x72A0,
-	1910:  0x7591,
-	1911:  0x7947,
-	1912:  0x7FA9,
-	1913:  0x87FB,
-	1914:  0x8ABC,
-	1915:  0x8B70,
-	1916:  0x63AC,
-	1917:  0x83CA,
-	1918:  0x97A0,
-	1919:  0x5409,
-	1920:  0x5403,
-	1921:  0x55AB,
-	1922:  0x6854,
-	1923:  0x6A58,
-	1924:  0x8A70,
-	1925:  0x7827,
-	1926:  0x6775,
-	1927:  0x9ECD,
-	1928:  0x5374,
-	1929:  0x5BA2,
-	1930:  0x811A,
-	1931:  0x8650,
-	1932:  0x9006,
-	1933:  0x4E18,
-	1934:  0x4E45,
-	1935:  0x4EC7,
-	1936:  0x4F11,
-	1937:  0x53CA,
-	1938:  0x5438,
-	1939:  0x5BAE,
-	1940:  0x5F13,
-	1941:  0x6025,
-	1942:  0x6551,
-	1943:  0x673D,
-	1944:  0x6C42,
-	1945:  0x6C72,
-	1946:  0x6CE3,
-	1947:  0x7078,
-	1948:  0x7403,
-	1949:  0x7A76,
-	1950:  0x7AAE,
-	1951:  0x7B08,
-	1952:  0x7D1A,
-	1953:  0x7CFE,
-	1954:  0x7D66,
-	1955:  0x65E7,
-	1956:  0x725B,
-	1957:  0x53BB,
-	1958:  0x5C45,
-	1959:  0x5DE8,
-	1960:  0x62D2,
-	1961:  0x62E0,
-	1962:  0x6319,
-	1963:  0x6E20,
-	1964:  0x865A,
-	1965:  0x8A31,
-	1966:  0x8DDD,
-	1967:  0x92F8,
-	1968:  0x6F01,
-	1969:  0x79A6,
-	1970:  0x9B5A,
-	1971:  0x4EA8,
-	1972:  0x4EAB,
-	1973:  0x4EAC,
-	1974:  0x4F9B,
-	1975:  0x4FA0,
-	1976:  0x50D1,
-	1977:  0x5147,
-	1978:  0x7AF6,
-	1979:  0x5171,
-	1980:  0x51F6,
-	1981:  0x5354,
-	1982:  0x5321,
-	1983:  0x537F,
-	1984:  0x53EB,
-	1985:  0x55AC,
-	1986:  0x5883,
-	1987:  0x5CE1,
-	1988:  0x5F37,
-	1989:  0x5F4A,
-	1990:  0x602F,
-	1991:  0x6050,
-	1992:  0x606D,
-	1993:  0x631F,
-	1994:  0x6559,
-	1995:  0x6A4B,
-	1996:  0x6CC1,
-	1997:  0x72C2,
-	1998:  0x72ED,
-	1999:  0x77EF,
-	2000:  0x80F8,
-	2001:  0x8105,
-	2002:  0x8208,
-	2003:  0x854E,
-	2004:  0x90F7,
-	2005:  0x93E1,
-	2006:  0x97FF,
-	2007:  0x9957,
-	2008:  0x9A5A,
-	2009:  0x4EF0,
-	2010:  0x51DD,
-	2011:  0x5C2D,
-	2012:  0x6681,
-	2013:  0x696D,
-	2014:  0x5C40,
-	2015:  0x66F2,
-	2016:  0x6975,
-	2017:  0x7389,
-	2018:  0x6850,
-	2019:  0x7C81,
-	2020:  0x50C5,
-	2021:  0x52E4,
-	2022:  0x5747,
-	2023:  0x5DFE,
-	2024:  0x9326,
-	2025:  0x65A4,
-	2026:  0x6B23,
-	2027:  0x6B3D,
-	2028:  0x7434,
-	2029:  0x7981,
-	2030:  0x79BD,
-	2031:  0x7B4B,
-	2032:  0x7DCA,
-	2033:  0x82B9,
-	2034:  0x83CC,
-	2035:  0x887F,
-	2036:  0x895F,
-	2037:  0x8B39,
-	2038:  0x8FD1,
-	2039:  0x91D1,
-	2040:  0x541F,
-	2041:  0x9280,
-	2042:  0x4E5D,
-	2043:  0x5036,
-	2044:  0x53E5,
-	2045:  0x533A,
-	2046:  0x72D7,
-	2047:  0x7396,
-	2048:  0x77E9,
-	2049:  0x82E6,
-	2050:  0x8EAF,
-	2051:  0x99C6,
-	2052:  0x99C8,
-	2053:  0x99D2,
-	2054:  0x5177,
-	2055:  0x611A,
-	2056:  0x865E,
-	2057:  0x55B0,
-	2058:  0x7A7A,
-	2059:  0x5076,
-	2060:  0x5BD3,
-	2061:  0x9047,
-	2062:  0x9685,
-	2063:  0x4E32,
-	2064:  0x6ADB,
-	2065:  0x91E7,
-	2066:  0x5C51,
-	2067:  0x5C48,
-	2068:  0x6398,
-	2069:  0x7A9F,
-	2070:  0x6C93,
-	2071:  0x9774,
-	2072:  0x8F61,
-	2073:  0x7AAA,
-	2074:  0x718A,
-	2075:  0x9688,
-	2076:  0x7C82,
-	2077:  0x6817,
-	2078:  0x7E70,
-	2079:  0x6851,
-	2080:  0x936C,
-	2081:  0x52F2,
-	2082:  0x541B,
-	2083:  0x85AB,
-	2084:  0x8A13,
-	2085:  0x7FA4,
-	2086:  0x8ECD,
-	2087:  0x90E1,
-	2088:  0x5366,
-	2089:  0x8888,
-	2090:  0x7941,
-	2091:  0x4FC2,
-	2092:  0x50BE,
-	2093:  0x5211,
-	2094:  0x5144,
-	2095:  0x5553,
-	2096:  0x572D,
-	2097:  0x73EA,
-	2098:  0x578B,
-	2099:  0x5951,
-	2100:  0x5F62,
-	2101:  0x5F84,
-	2102:  0x6075,
-	2103:  0x6176,
-	2104:  0x6167,
-	2105:  0x61A9,
-	2106:  0x63B2,
-	2107:  0x643A,
-	2108:  0x656C,
-	2109:  0x666F,
-	2110:  0x6842,
-	2111:  0x6E13,
-	2112:  0x7566,
-	2113:  0x7A3D,
-	2114:  0x7CFB,
-	2115:  0x7D4C,
-	2116:  0x7D99,
-	2117:  0x7E4B,
-	2118:  0x7F6B,
-	2119:  0x830E,
-	2120:  0x834A,
-	2121:  0x86CD,
-	2122:  0x8A08,
-	2123:  0x8A63,
-	2124:  0x8B66,
-	2125:  0x8EFD,
-	2126:  0x981A,
-	2127:  0x9D8F,
-	2128:  0x82B8,
-	2129:  0x8FCE,
-	2130:  0x9BE8,
-	2131:  0x5287,
-	2132:  0x621F,
-	2133:  0x6483,
-	2134:  0x6FC0,
-	2135:  0x9699,
-	2136:  0x6841,
-	2137:  0x5091,
-	2138:  0x6B20,
-	2139:  0x6C7A,
-	2140:  0x6F54,
-	2141:  0x7A74,
-	2142:  0x7D50,
-	2143:  0x8840,
-	2144:  0x8A23,
-	2145:  0x6708,
-	2146:  0x4EF6,
-	2147:  0x5039,
-	2148:  0x5026,
-	2149:  0x5065,
-	2150:  0x517C,
-	2151:  0x5238,
-	2152:  0x5263,
-	2153:  0x55A7,
-	2154:  0x570F,
-	2155:  0x5805,
-	2156:  0x5ACC,
-	2157:  0x5EFA,
-	2158:  0x61B2,
-	2159:  0x61F8,
-	2160:  0x62F3,
-	2161:  0x6372,
-	2162:  0x691C,
-	2163:  0x6A29,
-	2164:  0x727D,
-	2165:  0x72AC,
-	2166:  0x732E,
-	2167:  0x7814,
-	2168:  0x786F,
-	2169:  0x7D79,
-	2170:  0x770C,
-	2171:  0x80A9,
-	2172:  0x898B,
-	2173:  0x8B19,
-	2174:  0x8CE2,
-	2175:  0x8ED2,
-	2176:  0x9063,
-	2177:  0x9375,
-	2178:  0x967A,
-	2179:  0x9855,
-	2180:  0x9A13,
-	2181:  0x9E78,
-	2182:  0x5143,
-	2183:  0x539F,
-	2184:  0x53B3,
-	2185:  0x5E7B,
-	2186:  0x5F26,
-	2187:  0x6E1B,
-	2188:  0x6E90,
-	2189:  0x7384,
-	2190:  0x73FE,
-	2191:  0x7D43,
-	2192:  0x8237,
-	2193:  0x8A00,
-	2194:  0x8AFA,
-	2195:  0x9650,
-	2196:  0x4E4E,
-	2197:  0x500B,
-	2198:  0x53E4,
-	2199:  0x547C,
-	2200:  0x56FA,
-	2201:  0x59D1,
-	2202:  0x5B64,
-	2203:  0x5DF1,
-	2204:  0x5EAB,
-	2205:  0x5F27,
-	2206:  0x6238,
-	2207:  0x6545,
-	2208:  0x67AF,
-	2209:  0x6E56,
-	2210:  0x72D0,
-	2211:  0x7CCA,
-	2212:  0x88B4,
-	2213:  0x80A1,
-	2214:  0x80E1,
-	2215:  0x83F0,
-	2216:  0x864E,
-	2217:  0x8A87,
-	2218:  0x8DE8,
-	2219:  0x9237,
-	2220:  0x96C7,
-	2221:  0x9867,
-	2222:  0x9F13,
-	2223:  0x4E94,
-	2224:  0x4E92,
-	2225:  0x4F0D,
-	2226:  0x5348,
-	2227:  0x5449,
-	2228:  0x543E,
-	2229:  0x5A2F,
-	2230:  0x5F8C,
-	2231:  0x5FA1,
-	2232:  0x609F,
-	2233:  0x68A7,
-	2234:  0x6A8E,
-	2235:  0x745A,
-	2236:  0x7881,
-	2237:  0x8A9E,
-	2238:  0x8AA4,
-	2239:  0x8B77,
-	2240:  0x9190,
-	2241:  0x4E5E,
-	2242:  0x9BC9,
-	2243:  0x4EA4,
-	2244:  0x4F7C,
-	2245:  0x4FAF,
-	2246:  0x5019,
-	2247:  0x5016,
-	2248:  0x5149,
-	2249:  0x516C,
-	2250:  0x529F,
-	2251:  0x52B9,
-	2252:  0x52FE,
-	2253:  0x539A,
-	2254:  0x53E3,
-	2255:  0x5411,
-	2256:  0x540E,
-	2257:  0x5589,
-	2258:  0x5751,
-	2259:  0x57A2,
-	2260:  0x597D,
-	2261:  0x5B54,
-	2262:  0x5B5D,
-	2263:  0x5B8F,
-	2264:  0x5DE5,
-	2265:  0x5DE7,
-	2266:  0x5DF7,
-	2267:  0x5E78,
-	2268:  0x5E83,
-	2269:  0x5E9A,
-	2270:  0x5EB7,
-	2271:  0x5F18,
-	2272:  0x6052,
-	2273:  0x614C,
-	2274:  0x6297,
-	2275:  0x62D8,
-	2276:  0x63A7,
-	2277:  0x653B,
-	2278:  0x6602,
-	2279:  0x6643,
-	2280:  0x66F4,
-	2281:  0x676D,
-	2282:  0x6821,
-	2283:  0x6897,
-	2284:  0x69CB,
-	2285:  0x6C5F,
-	2286:  0x6D2A,
-	2287:  0x6D69,
-	2288:  0x6E2F,
-	2289:  0x6E9D,
-	2290:  0x7532,
-	2291:  0x7687,
-	2292:  0x786C,
-	2293:  0x7A3F,
-	2294:  0x7CE0,
-	2295:  0x7D05,
-	2296:  0x7D18,
-	2297:  0x7D5E,
-	2298:  0x7DB1,
-	2299:  0x8015,
-	2300:  0x8003,
-	2301:  0x80AF,
-	2302:  0x80B1,
-	2303:  0x8154,
-	2304:  0x818F,
-	2305:  0x822A,
-	2306:  0x8352,
-	2307:  0x884C,
-	2308:  0x8861,
-	2309:  0x8B1B,
-	2310:  0x8CA2,
-	2311:  0x8CFC,
-	2312:  0x90CA,
-	2313:  0x9175,
-	2314:  0x9271,
-	2315:  0x783F,
-	2316:  0x92FC,
-	2317:  0x95A4,
-	2318:  0x964D,
-	2319:  0x9805,
-	2320:  0x9999,
-	2321:  0x9AD8,
-	2322:  0x9D3B,
-	2323:  0x525B,
-	2324:  0x52AB,
-	2325:  0x53F7,
-	2326:  0x5408,
-	2327:  0x58D5,
-	2328:  0x62F7,
-	2329:  0x6FE0,
-	2330:  0x8C6A,
-	2331:  0x8F5F,
-	2332:  0x9EB9,
-	2333:  0x514B,
-	2334:  0x523B,
-	2335:  0x544A,
-	2336:  0x56FD,
-	2337:  0x7A40,
-	2338:  0x9177,
-	2339:  0x9D60,
-	2340:  0x9ED2,
-	2341:  0x7344,
-	2342:  0x6F09,
-	2343:  0x8170,
-	2344:  0x7511,
-	2345:  0x5FFD,
-	2346:  0x60DA,
-	2347:  0x9AA8,
-	2348:  0x72DB,
-	2349:  0x8FBC,
-	2350:  0x6B64,
-	2351:  0x9803,
-	2352:  0x4ECA,
-	2353:  0x56F0,
-	2354:  0x5764,
-	2355:  0x58BE,
-	2356:  0x5A5A,
-	2357:  0x6068,
-	2358:  0x61C7,
-	2359:  0x660F,
-	2360:  0x6606,
-	2361:  0x6839,
-	2362:  0x68B1,
-	2363:  0x6DF7,
-	2364:  0x75D5,
-	2365:  0x7D3A,
-	2366:  0x826E,
-	2367:  0x9B42,
-	2368:  0x4E9B,
-	2369:  0x4F50,
-	2370:  0x53C9,
-	2371:  0x5506,
-	2372:  0x5D6F,
-	2373:  0x5DE6,
-	2374:  0x5DEE,
-	2375:  0x67FB,
-	2376:  0x6C99,
-	2377:  0x7473,
-	2378:  0x7802,
-	2379:  0x8A50,
-	2380:  0x9396,
-	2381:  0x88DF,
-	2382:  0x5750,
-	2383:  0x5EA7,
-	2384:  0x632B,
-	2385:  0x50B5,
-	2386:  0x50AC,
-	2387:  0x518D,
-	2388:  0x6700,
-	2389:  0x54C9,
-	2390:  0x585E,
-	2391:  0x59BB,
-	2392:  0x5BB0,
-	2393:  0x5F69,
-	2394:  0x624D,
-	2395:  0x63A1,
-	2396:  0x683D,
-	2397:  0x6B73,
-	2398:  0x6E08,
-	2399:  0x707D,
-	2400:  0x91C7,
-	2401:  0x7280,
-	2402:  0x7815,
-	2403:  0x7826,
-	2404:  0x796D,
-	2405:  0x658E,
-	2406:  0x7D30,
-	2407:  0x83DC,
-	2408:  0x88C1,
-	2409:  0x8F09,
-	2410:  0x969B,
-	2411:  0x5264,
-	2412:  0x5728,
-	2413:  0x6750,
-	2414:  0x7F6A,
-	2415:  0x8CA1,
-	2416:  0x51B4,
-	2417:  0x5742,
-	2418:  0x962A,
-	2419:  0x583A,
-	2420:  0x698A,
-	2421:  0x80B4,
-	2422:  0x54B2,
-	2423:  0x5D0E,
-	2424:  0x57FC,
-	2425:  0x7895,
-	2426:  0x9DFA,
-	2427:  0x4F5C,
-	2428:  0x524A,
-	2429:  0x548B,
-	2430:  0x643E,
-	2431:  0x6628,
-	2432:  0x6714,
-	2433:  0x67F5,
-	2434:  0x7A84,
-	2435:  0x7B56,
-	2436:  0x7D22,
-	2437:  0x932F,
-	2438:  0x685C,
-	2439:  0x9BAD,
-	2440:  0x7B39,
-	2441:  0x5319,
-	2442:  0x518A,
-	2443:  0x5237,
-	2444:  0x5BDF,
-	2445:  0x62F6,
-	2446:  0x64AE,
-	2447:  0x64E6,
-	2448:  0x672D,
-	2449:  0x6BBA,
-	2450:  0x85A9,
-	2451:  0x96D1,
-	2452:  0x7690,
-	2453:  0x9BD6,
-	2454:  0x634C,
-	2455:  0x9306,
-	2456:  0x9BAB,
-	2457:  0x76BF,
-	2458:  0x6652,
-	2459:  0x4E09,
-	2460:  0x5098,
-	2461:  0x53C2,
-	2462:  0x5C71,
-	2463:  0x60E8,
-	2464:  0x6492,
-	2465:  0x6563,
-	2466:  0x685F,
-	2467:  0x71E6,
-	2468:  0x73CA,
-	2469:  0x7523,
-	2470:  0x7B97,
-	2471:  0x7E82,
-	2472:  0x8695,
-	2473:  0x8B83,
-	2474:  0x8CDB,
-	2475:  0x9178,
-	2476:  0x9910,
-	2477:  0x65AC,
-	2478:  0x66AB,
-	2479:  0x6B8B,
-	2480:  0x4ED5,
-	2481:  0x4ED4,
-	2482:  0x4F3A,
-	2483:  0x4F7F,
-	2484:  0x523A,
-	2485:  0x53F8,
-	2486:  0x53F2,
-	2487:  0x55E3,
-	2488:  0x56DB,
-	2489:  0x58EB,
-	2490:  0x59CB,
-	2491:  0x59C9,
-	2492:  0x59FF,
-	2493:  0x5B50,
-	2494:  0x5C4D,
-	2495:  0x5E02,
-	2496:  0x5E2B,
-	2497:  0x5FD7,
-	2498:  0x601D,
-	2499:  0x6307,
-	2500:  0x652F,
-	2501:  0x5B5C,
-	2502:  0x65AF,
-	2503:  0x65BD,
-	2504:  0x65E8,
-	2505:  0x679D,
-	2506:  0x6B62,
-	2507:  0x6B7B,
-	2508:  0x6C0F,
-	2509:  0x7345,
-	2510:  0x7949,
-	2511:  0x79C1,
-	2512:  0x7CF8,
-	2513:  0x7D19,
-	2514:  0x7D2B,
-	2515:  0x80A2,
-	2516:  0x8102,
-	2517:  0x81F3,
-	2518:  0x8996,
-	2519:  0x8A5E,
-	2520:  0x8A69,
-	2521:  0x8A66,
-	2522:  0x8A8C,
-	2523:  0x8AEE,
-	2524:  0x8CC7,
-	2525:  0x8CDC,
-	2526:  0x96CC,
-	2527:  0x98FC,
-	2528:  0x6B6F,
-	2529:  0x4E8B,
-	2530:  0x4F3C,
-	2531:  0x4F8D,
-	2532:  0x5150,
-	2533:  0x5B57,
-	2534:  0x5BFA,
-	2535:  0x6148,
-	2536:  0x6301,
-	2537:  0x6642,
-	2538:  0x6B21,
-	2539:  0x6ECB,
-	2540:  0x6CBB,
-	2541:  0x723E,
-	2542:  0x74BD,
-	2543:  0x75D4,
-	2544:  0x78C1,
-	2545:  0x793A,
-	2546:  0x800C,
-	2547:  0x8033,
-	2548:  0x81EA,
-	2549:  0x8494,
-	2550:  0x8F9E,
-	2551:  0x6C50,
-	2552:  0x9E7F,
-	2553:  0x5F0F,
-	2554:  0x8B58,
-	2555:  0x9D2B,
-	2556:  0x7AFA,
-	2557:  0x8EF8,
-	2558:  0x5B8D,
-	2559:  0x96EB,
-	2560:  0x4E03,
-	2561:  0x53F1,
-	2562:  0x57F7,
-	2563:  0x5931,
-	2564:  0x5AC9,
-	2565:  0x5BA4,
-	2566:  0x6089,
-	2567:  0x6E7F,
-	2568:  0x6F06,
-	2569:  0x75BE,
-	2570:  0x8CEA,
-	2571:  0x5B9F,
-	2572:  0x8500,
-	2573:  0x7BE0,
-	2574:  0x5072,
-	2575:  0x67F4,
-	2576:  0x829D,
-	2577:  0x5C61,
-	2578:  0x854A,
-	2579:  0x7E1E,
-	2580:  0x820E,
-	2581:  0x5199,
-	2582:  0x5C04,
-	2583:  0x6368,
-	2584:  0x8D66,
-	2585:  0x659C,
-	2586:  0x716E,
-	2587:  0x793E,
-	2588:  0x7D17,
-	2589:  0x8005,
-	2590:  0x8B1D,
-	2591:  0x8ECA,
-	2592:  0x906E,
-	2593:  0x86C7,
-	2594:  0x90AA,
-	2595:  0x501F,
-	2596:  0x52FA,
-	2597:  0x5C3A,
-	2598:  0x6753,
-	2599:  0x707C,
-	2600:  0x7235,
-	2601:  0x914C,
-	2602:  0x91C8,
-	2603:  0x932B,
-	2604:  0x82E5,
-	2605:  0x5BC2,
-	2606:  0x5F31,
-	2607:  0x60F9,
-	2608:  0x4E3B,
-	2609:  0x53D6,
-	2610:  0x5B88,
-	2611:  0x624B,
-	2612:  0x6731,
-	2613:  0x6B8A,
-	2614:  0x72E9,
-	2615:  0x73E0,
-	2616:  0x7A2E,
-	2617:  0x816B,
-	2618:  0x8DA3,
-	2619:  0x9152,
-	2620:  0x9996,
-	2621:  0x5112,
-	2622:  0x53D7,
-	2623:  0x546A,
-	2624:  0x5BFF,
-	2625:  0x6388,
-	2626:  0x6A39,
-	2627:  0x7DAC,
-	2628:  0x9700,
-	2629:  0x56DA,
-	2630:  0x53CE,
-	2631:  0x5468,
-	2632:  0x5B97,
-	2633:  0x5C31,
-	2634:  0x5DDE,
-	2635:  0x4FEE,
-	2636:  0x6101,
-	2637:  0x62FE,
-	2638:  0x6D32,
-	2639:  0x79C0,
-	2640:  0x79CB,
-	2641:  0x7D42,
-	2642:  0x7E4D,
-	2643:  0x7FD2,
-	2644:  0x81ED,
-	2645:  0x821F,
-	2646:  0x8490,
-	2647:  0x8846,
-	2648:  0x8972,
-	2649:  0x8B90,
-	2650:  0x8E74,
-	2651:  0x8F2F,
-	2652:  0x9031,
-	2653:  0x914B,
-	2654:  0x916C,
-	2655:  0x96C6,
-	2656:  0x919C,
-	2657:  0x4EC0,
-	2658:  0x4F4F,
-	2659:  0x5145,
-	2660:  0x5341,
-	2661:  0x5F93,
-	2662:  0x620E,
-	2663:  0x67D4,
-	2664:  0x6C41,
-	2665:  0x6E0B,
-	2666:  0x7363,
-	2667:  0x7E26,
-	2668:  0x91CD,
-	2669:  0x9283,
-	2670:  0x53D4,
-	2671:  0x5919,
-	2672:  0x5BBF,
-	2673:  0x6DD1,
-	2674:  0x795D,
-	2675:  0x7E2E,
-	2676:  0x7C9B,
-	2677:  0x587E,
-	2678:  0x719F,
-	2679:  0x51FA,
-	2680:  0x8853,
-	2681:  0x8FF0,
-	2682:  0x4FCA,
-	2683:  0x5CFB,
-	2684:  0x6625,
-	2685:  0x77AC,
-	2686:  0x7AE3,
-	2687:  0x821C,
-	2688:  0x99FF,
-	2689:  0x51C6,
-	2690:  0x5FAA,
-	2691:  0x65EC,
-	2692:  0x696F,
-	2693:  0x6B89,
-	2694:  0x6DF3,
-	2695:  0x6E96,
-	2696:  0x6F64,
-	2697:  0x76FE,
-	2698:  0x7D14,
-	2699:  0x5DE1,
-	2700:  0x9075,
-	2701:  0x9187,
-	2702:  0x9806,
-	2703:  0x51E6,
-	2704:  0x521D,
-	2705:  0x6240,
-	2706:  0x6691,
-	2707:  0x66D9,
-	2708:  0x6E1A,
-	2709:  0x5EB6,
-	2710:  0x7DD2,
-	2711:  0x7F72,
-	2712:  0x66F8,
-	2713:  0x85AF,
-	2714:  0x85F7,
-	2715:  0x8AF8,
-	2716:  0x52A9,
-	2717:  0x53D9,
-	2718:  0x5973,
-	2719:  0x5E8F,
-	2720:  0x5F90,
-	2721:  0x6055,
-	2722:  0x92E4,
-	2723:  0x9664,
-	2724:  0x50B7,
-	2725:  0x511F,
-	2726:  0x52DD,
-	2727:  0x5320,
-	2728:  0x5347,
-	2729:  0x53EC,
-	2730:  0x54E8,
-	2731:  0x5546,
-	2732:  0x5531,
-	2733:  0x5617,
-	2734:  0x5968,
-	2735:  0x59BE,
-	2736:  0x5A3C,
-	2737:  0x5BB5,
-	2738:  0x5C06,
-	2739:  0x5C0F,
-	2740:  0x5C11,
-	2741:  0x5C1A,
-	2742:  0x5E84,
-	2743:  0x5E8A,
-	2744:  0x5EE0,
-	2745:  0x5F70,
-	2746:  0x627F,
-	2747:  0x6284,
-	2748:  0x62DB,
-	2749:  0x638C,
-	2750:  0x6377,
-	2751:  0x6607,
-	2752:  0x660C,
-	2753:  0x662D,
-	2754:  0x6676,
-	2755:  0x677E,
-	2756:  0x68A2,
-	2757:  0x6A1F,
-	2758:  0x6A35,
-	2759:  0x6CBC,
-	2760:  0x6D88,
-	2761:  0x6E09,
-	2762:  0x6E58,
-	2763:  0x713C,
-	2764:  0x7126,
-	2765:  0x7167,
-	2766:  0x75C7,
-	2767:  0x7701,
-	2768:  0x785D,
-	2769:  0x7901,
-	2770:  0x7965,
-	2771:  0x79F0,
-	2772:  0x7AE0,
-	2773:  0x7B11,
-	2774:  0x7CA7,
-	2775:  0x7D39,
-	2776:  0x8096,
-	2777:  0x83D6,
-	2778:  0x848B,
-	2779:  0x8549,
-	2780:  0x885D,
-	2781:  0x88F3,
-	2782:  0x8A1F,
-	2783:  0x8A3C,
-	2784:  0x8A54,
-	2785:  0x8A73,
-	2786:  0x8C61,
-	2787:  0x8CDE,
-	2788:  0x91A4,
-	2789:  0x9266,
-	2790:  0x937E,
-	2791:  0x9418,
-	2792:  0x969C,
-	2793:  0x9798,
-	2794:  0x4E0A,
-	2795:  0x4E08,
-	2796:  0x4E1E,
-	2797:  0x4E57,
-	2798:  0x5197,
-	2799:  0x5270,
-	2800:  0x57CE,
-	2801:  0x5834,
-	2802:  0x58CC,
-	2803:  0x5B22,
-	2804:  0x5E38,
-	2805:  0x60C5,
-	2806:  0x64FE,
-	2807:  0x6761,
-	2808:  0x6756,
-	2809:  0x6D44,
-	2810:  0x72B6,
-	2811:  0x7573,
-	2812:  0x7A63,
-	2813:  0x84B8,
-	2814:  0x8B72,
-	2815:  0x91B8,
-	2816:  0x9320,
-	2817:  0x5631,
-	2818:  0x57F4,
-	2819:  0x98FE,
-	2820:  0x62ED,
-	2821:  0x690D,
-	2822:  0x6B96,
-	2823:  0x71ED,
-	2824:  0x7E54,
-	2825:  0x8077,
-	2826:  0x8272,
-	2827:  0x89E6,
-	2828:  0x98DF,
-	2829:  0x8755,
-	2830:  0x8FB1,
-	2831:  0x5C3B,
-	2832:  0x4F38,
-	2833:  0x4FE1,
-	2834:  0x4FB5,
-	2835:  0x5507,
-	2836:  0x5A20,
-	2837:  0x5BDD,
-	2838:  0x5BE9,
-	2839:  0x5FC3,
-	2840:  0x614E,
-	2841:  0x632F,
-	2842:  0x65B0,
-	2843:  0x664B,
-	2844:  0x68EE,
-	2845:  0x699B,
-	2846:  0x6D78,
-	2847:  0x6DF1,
-	2848:  0x7533,
-	2849:  0x75B9,
-	2850:  0x771F,
-	2851:  0x795E,
-	2852:  0x79E6,
-	2853:  0x7D33,
-	2854:  0x81E3,
-	2855:  0x82AF,
-	2856:  0x85AA,
-	2857:  0x89AA,
-	2858:  0x8A3A,
-	2859:  0x8EAB,
-	2860:  0x8F9B,
-	2861:  0x9032,
-	2862:  0x91DD,
-	2863:  0x9707,
-	2864:  0x4EBA,
-	2865:  0x4EC1,
-	2866:  0x5203,
-	2867:  0x5875,
-	2868:  0x58EC,
-	2869:  0x5C0B,
-	2870:  0x751A,
-	2871:  0x5C3D,
-	2872:  0x814E,
-	2873:  0x8A0A,
-	2874:  0x8FC5,
-	2875:  0x9663,
-	2876:  0x976D,
-	2877:  0x7B25,
-	2878:  0x8ACF,
-	2879:  0x9808,
-	2880:  0x9162,
-	2881:  0x56F3,
-	2882:  0x53A8,
-	2883:  0x9017,
-	2884:  0x5439,
-	2885:  0x5782,
-	2886:  0x5E25,
-	2887:  0x63A8,
-	2888:  0x6C34,
-	2889:  0x708A,
-	2890:  0x7761,
-	2891:  0x7C8B,
-	2892:  0x7FE0,
-	2893:  0x8870,
-	2894:  0x9042,
-	2895:  0x9154,
-	2896:  0x9310,
-	2897:  0x9318,
-	2898:  0x968F,
-	2899:  0x745E,
-	2900:  0x9AC4,
-	2901:  0x5D07,
-	2902:  0x5D69,
-	2903:  0x6570,
-	2904:  0x67A2,
-	2905:  0x8DA8,
-	2906:  0x96DB,
-	2907:  0x636E,
-	2908:  0x6749,
-	2909:  0x6919,
-	2910:  0x83C5,
-	2911:  0x9817,
-	2912:  0x96C0,
-	2913:  0x88FE,
-	2914:  0x6F84,
-	2915:  0x647A,
-	2916:  0x5BF8,
-	2917:  0x4E16,
-	2918:  0x702C,
-	2919:  0x755D,
-	2920:  0x662F,
-	2921:  0x51C4,
-	2922:  0x5236,
-	2923:  0x52E2,
-	2924:  0x59D3,
-	2925:  0x5F81,
-	2926:  0x6027,
-	2927:  0x6210,
-	2928:  0x653F,
-	2929:  0x6574,
-	2930:  0x661F,
-	2931:  0x6674,
-	2932:  0x68F2,
-	2933:  0x6816,
-	2934:  0x6B63,
-	2935:  0x6E05,
-	2936:  0x7272,
-	2937:  0x751F,
-	2938:  0x76DB,
-	2939:  0x7CBE,
-	2940:  0x8056,
-	2941:  0x58F0,
-	2942:  0x88FD,
-	2943:  0x897F,
-	2944:  0x8AA0,
-	2945:  0x8A93,
-	2946:  0x8ACB,
-	2947:  0x901D,
-	2948:  0x9192,
-	2949:  0x9752,
-	2950:  0x9759,
-	2951:  0x6589,
-	2952:  0x7A0E,
-	2953:  0x8106,
-	2954:  0x96BB,
-	2955:  0x5E2D,
-	2956:  0x60DC,
-	2957:  0x621A,
-	2958:  0x65A5,
-	2959:  0x6614,
-	2960:  0x6790,
-	2961:  0x77F3,
-	2962:  0x7A4D,
-	2963:  0x7C4D,
-	2964:  0x7E3E,
-	2965:  0x810A,
-	2966:  0x8CAC,
-	2967:  0x8D64,
-	2968:  0x8DE1,
-	2969:  0x8E5F,
-	2970:  0x78A9,
-	2971:  0x5207,
-	2972:  0x62D9,
-	2973:  0x63A5,
-	2974:  0x6442,
-	2975:  0x6298,
-	2976:  0x8A2D,
-	2977:  0x7A83,
-	2978:  0x7BC0,
-	2979:  0x8AAC,
-	2980:  0x96EA,
-	2981:  0x7D76,
-	2982:  0x820C,
-	2983:  0x8749,
-	2984:  0x4ED9,
-	2985:  0x5148,
-	2986:  0x5343,
-	2987:  0x5360,
-	2988:  0x5BA3,
-	2989:  0x5C02,
-	2990:  0x5C16,
-	2991:  0x5DDD,
-	2992:  0x6226,
-	2993:  0x6247,
-	2994:  0x64B0,
-	2995:  0x6813,
-	2996:  0x6834,
-	2997:  0x6CC9,
-	2998:  0x6D45,
-	2999:  0x6D17,
-	3000:  0x67D3,
-	3001:  0x6F5C,
-	3002:  0x714E,
-	3003:  0x717D,
-	3004:  0x65CB,
-	3005:  0x7A7F,
-	3006:  0x7BAD,
-	3007:  0x7DDA,
-	3008:  0x7E4A,
-	3009:  0x7FA8,
-	3010:  0x817A,
-	3011:  0x821B,
-	3012:  0x8239,
-	3013:  0x85A6,
-	3014:  0x8A6E,
-	3015:  0x8CCE,
-	3016:  0x8DF5,
-	3017:  0x9078,
-	3018:  0x9077,
-	3019:  0x92AD,
-	3020:  0x9291,
-	3021:  0x9583,
-	3022:  0x9BAE,
-	3023:  0x524D,
-	3024:  0x5584,
-	3025:  0x6F38,
-	3026:  0x7136,
-	3027:  0x5168,
-	3028:  0x7985,
-	3029:  0x7E55,
-	3030:  0x81B3,
-	3031:  0x7CCE,
-	3032:  0x564C,
-	3033:  0x5851,
-	3034:  0x5CA8,
-	3035:  0x63AA,
-	3036:  0x66FE,
-	3037:  0x66FD,
-	3038:  0x695A,
-	3039:  0x72D9,
-	3040:  0x758F,
-	3041:  0x758E,
-	3042:  0x790E,
-	3043:  0x7956,
-	3044:  0x79DF,
-	3045:  0x7C97,
-	3046:  0x7D20,
-	3047:  0x7D44,
-	3048:  0x8607,
-	3049:  0x8A34,
-	3050:  0x963B,
-	3051:  0x9061,
-	3052:  0x9F20,
-	3053:  0x50E7,
-	3054:  0x5275,
-	3055:  0x53CC,
-	3056:  0x53E2,
-	3057:  0x5009,
-	3058:  0x55AA,
-	3059:  0x58EE,
-	3060:  0x594F,
-	3061:  0x723D,
-	3062:  0x5B8B,
-	3063:  0x5C64,
-	3064:  0x531D,
-	3065:  0x60E3,
-	3066:  0x60F3,
-	3067:  0x635C,
-	3068:  0x6383,
-	3069:  0x633F,
-	3070:  0x63BB,
-	3071:  0x64CD,
-	3072:  0x65E9,
-	3073:  0x66F9,
-	3074:  0x5DE3,
-	3075:  0x69CD,
-	3076:  0x69FD,
-	3077:  0x6F15,
-	3078:  0x71E5,
-	3079:  0x4E89,
-	3080:  0x75E9,
-	3081:  0x76F8,
-	3082:  0x7A93,
-	3083:  0x7CDF,
-	3084:  0x7DCF,
-	3085:  0x7D9C,
-	3086:  0x8061,
-	3087:  0x8349,
-	3088:  0x8358,
-	3089:  0x846C,
-	3090:  0x84BC,
-	3091:  0x85FB,
-	3092:  0x88C5,
-	3093:  0x8D70,
-	3094:  0x9001,
-	3095:  0x906D,
-	3096:  0x9397,
-	3097:  0x971C,
-	3098:  0x9A12,
-	3099:  0x50CF,
-	3100:  0x5897,
-	3101:  0x618E,
-	3102:  0x81D3,
-	3103:  0x8535,
-	3104:  0x8D08,
-	3105:  0x9020,
-	3106:  0x4FC3,
-	3107:  0x5074,
-	3108:  0x5247,
-	3109:  0x5373,
-	3110:  0x606F,
-	3111:  0x6349,
-	3112:  0x675F,
-	3113:  0x6E2C,
-	3114:  0x8DB3,
-	3115:  0x901F,
-	3116:  0x4FD7,
-	3117:  0x5C5E,
-	3118:  0x8CCA,
-	3119:  0x65CF,
-	3120:  0x7D9A,
-	3121:  0x5352,
-	3122:  0x8896,
-	3123:  0x5176,
-	3124:  0x63C3,
-	3125:  0x5B58,
-	3126:  0x5B6B,
-	3127:  0x5C0A,
-	3128:  0x640D,
-	3129:  0x6751,
-	3130:  0x905C,
-	3131:  0x4ED6,
-	3132:  0x591A,
-	3133:  0x592A,
-	3134:  0x6C70,
-	3135:  0x8A51,
-	3136:  0x553E,
-	3137:  0x5815,
-	3138:  0x59A5,
-	3139:  0x60F0,
-	3140:  0x6253,
-	3141:  0x67C1,
-	3142:  0x8235,
-	3143:  0x6955,
-	3144:  0x9640,
-	3145:  0x99C4,
-	3146:  0x9A28,
-	3147:  0x4F53,
-	3148:  0x5806,
-	3149:  0x5BFE,
-	3150:  0x8010,
-	3151:  0x5CB1,
-	3152:  0x5E2F,
-	3153:  0x5F85,
-	3154:  0x6020,
-	3155:  0x614B,
-	3156:  0x6234,
-	3157:  0x66FF,
-	3158:  0x6CF0,
-	3159:  0x6EDE,
-	3160:  0x80CE,
-	3161:  0x817F,
-	3162:  0x82D4,
-	3163:  0x888B,
-	3164:  0x8CB8,
-	3165:  0x9000,
-	3166:  0x902E,
-	3167:  0x968A,
-	3168:  0x9EDB,
-	3169:  0x9BDB,
-	3170:  0x4EE3,
-	3171:  0x53F0,
-	3172:  0x5927,
-	3173:  0x7B2C,
-	3174:  0x918D,
-	3175:  0x984C,
-	3176:  0x9DF9,
-	3177:  0x6EDD,
-	3178:  0x7027,
-	3179:  0x5353,
-	3180:  0x5544,
-	3181:  0x5B85,
-	3182:  0x6258,
-	3183:  0x629E,
-	3184:  0x62D3,
-	3185:  0x6CA2,
-	3186:  0x6FEF,
-	3187:  0x7422,
-	3188:  0x8A17,
-	3189:  0x9438,
-	3190:  0x6FC1,
-	3191:  0x8AFE,
-	3192:  0x8338,
-	3193:  0x51E7,
-	3194:  0x86F8,
-	3195:  0x53EA,
-	3196:  0x53E9,
-	3197:  0x4F46,
-	3198:  0x9054,
-	3199:  0x8FB0,
-	3200:  0x596A,
-	3201:  0x8131,
-	3202:  0x5DFD,
-	3203:  0x7AEA,
-	3204:  0x8FBF,
-	3205:  0x68DA,
-	3206:  0x8C37,
-	3207:  0x72F8,
-	3208:  0x9C48,
-	3209:  0x6A3D,
-	3210:  0x8AB0,
-	3211:  0x4E39,
-	3212:  0x5358,
-	3213:  0x5606,
-	3214:  0x5766,
-	3215:  0x62C5,
-	3216:  0x63A2,
-	3217:  0x65E6,
-	3218:  0x6B4E,
-	3219:  0x6DE1,
-	3220:  0x6E5B,
-	3221:  0x70AD,
-	3222:  0x77ED,
-	3223:  0x7AEF,
-	3224:  0x7BAA,
-	3225:  0x7DBB,
-	3226:  0x803D,
-	3227:  0x80C6,
-	3228:  0x86CB,
-	3229:  0x8A95,
-	3230:  0x935B,
-	3231:  0x56E3,
-	3232:  0x58C7,
-	3233:  0x5F3E,
-	3234:  0x65AD,
-	3235:  0x6696,
-	3236:  0x6A80,
-	3237:  0x6BB5,
-	3238:  0x7537,
-	3239:  0x8AC7,
-	3240:  0x5024,
-	3241:  0x77E5,
-	3242:  0x5730,
-	3243:  0x5F1B,
-	3244:  0x6065,
-	3245:  0x667A,
-	3246:  0x6C60,
-	3247:  0x75F4,
-	3248:  0x7A1A,
-	3249:  0x7F6E,
-	3250:  0x81F4,
-	3251:  0x8718,
-	3252:  0x9045,
-	3253:  0x99B3,
-	3254:  0x7BC9,
-	3255:  0x755C,
-	3256:  0x7AF9,
-	3257:  0x7B51,
-	3258:  0x84C4,
-	3259:  0x9010,
-	3260:  0x79E9,
-	3261:  0x7A92,
-	3262:  0x8336,
-	3263:  0x5AE1,
-	3264:  0x7740,
-	3265:  0x4E2D,
-	3266:  0x4EF2,
-	3267:  0x5B99,
-	3268:  0x5FE0,
-	3269:  0x62BD,
-	3270:  0x663C,
-	3271:  0x67F1,
-	3272:  0x6CE8,
-	3273:  0x866B,
-	3274:  0x8877,
-	3275:  0x8A3B,
-	3276:  0x914E,
-	3277:  0x92F3,
-	3278:  0x99D0,
-	3279:  0x6A17,
-	3280:  0x7026,
-	3281:  0x732A,
-	3282:  0x82E7,
-	3283:  0x8457,
-	3284:  0x8CAF,
-	3285:  0x4E01,
-	3286:  0x5146,
-	3287:  0x51CB,
-	3288:  0x558B,
-	3289:  0x5BF5,
-	3290:  0x5E16,
-	3291:  0x5E33,
-	3292:  0x5E81,
-	3293:  0x5F14,
-	3294:  0x5F35,
-	3295:  0x5F6B,
-	3296:  0x5FB4,
-	3297:  0x61F2,
-	3298:  0x6311,
-	3299:  0x66A2,
-	3300:  0x671D,
-	3301:  0x6F6E,
-	3302:  0x7252,
-	3303:  0x753A,
-	3304:  0x773A,
-	3305:  0x8074,
-	3306:  0x8139,
-	3307:  0x8178,
-	3308:  0x8776,
-	3309:  0x8ABF,
-	3310:  0x8ADC,
-	3311:  0x8D85,
-	3312:  0x8DF3,
-	3313:  0x929A,
-	3314:  0x9577,
-	3315:  0x9802,
-	3316:  0x9CE5,
-	3317:  0x52C5,
-	3318:  0x6357,
-	3319:  0x76F4,
-	3320:  0x6715,
-	3321:  0x6C88,
-	3322:  0x73CD,
-	3323:  0x8CC3,
-	3324:  0x93AE,
-	3325:  0x9673,
-	3326:  0x6D25,
-	3327:  0x589C,
-	3328:  0x690E,
-	3329:  0x69CC,
-	3330:  0x8FFD,
-	3331:  0x939A,
-	3332:  0x75DB,
-	3333:  0x901A,
-	3334:  0x585A,
-	3335:  0x6802,
-	3336:  0x63B4,
-	3337:  0x69FB,
-	3338:  0x4F43,
-	3339:  0x6F2C,
-	3340:  0x67D8,
-	3341:  0x8FBB,
-	3342:  0x8526,
-	3343:  0x7DB4,
-	3344:  0x9354,
-	3345:  0x693F,
-	3346:  0x6F70,
-	3347:  0x576A,
-	3348:  0x58F7,
-	3349:  0x5B2C,
-	3350:  0x7D2C,
-	3351:  0x722A,
-	3352:  0x540A,
-	3353:  0x91E3,
-	3354:  0x9DB4,
-	3355:  0x4EAD,
-	3356:  0x4F4E,
-	3357:  0x505C,
-	3358:  0x5075,
-	3359:  0x5243,
-	3360:  0x8C9E,
-	3361:  0x5448,
-	3362:  0x5824,
-	3363:  0x5B9A,
-	3364:  0x5E1D,
-	3365:  0x5E95,
-	3366:  0x5EAD,
-	3367:  0x5EF7,
-	3368:  0x5F1F,
-	3369:  0x608C,
-	3370:  0x62B5,
-	3371:  0x633A,
-	3372:  0x63D0,
-	3373:  0x68AF,
-	3374:  0x6C40,
-	3375:  0x7887,
-	3376:  0x798E,
-	3377:  0x7A0B,
-	3378:  0x7DE0,
-	3379:  0x8247,
-	3380:  0x8A02,
-	3381:  0x8AE6,
-	3382:  0x8E44,
-	3383:  0x9013,
-	3384:  0x90B8,
-	3385:  0x912D,
-	3386:  0x91D8,
-	3387:  0x9F0E,
-	3388:  0x6CE5,
-	3389:  0x6458,
-	3390:  0x64E2,
-	3391:  0x6575,
-	3392:  0x6EF4,
-	3393:  0x7684,
-	3394:  0x7B1B,
-	3395:  0x9069,
-	3396:  0x93D1,
-	3397:  0x6EBA,
-	3398:  0x54F2,
-	3399:  0x5FB9,
-	3400:  0x64A4,
-	3401:  0x8F4D,
-	3402:  0x8FED,
-	3403:  0x9244,
-	3404:  0x5178,
-	3405:  0x586B,
-	3406:  0x5929,
-	3407:  0x5C55,
-	3408:  0x5E97,
-	3409:  0x6DFB,
-	3410:  0x7E8F,
-	3411:  0x751C,
-	3412:  0x8CBC,
-	3413:  0x8EE2,
-	3414:  0x985B,
-	3415:  0x70B9,
-	3416:  0x4F1D,
-	3417:  0x6BBF,
-	3418:  0x6FB1,
-	3419:  0x7530,
-	3420:  0x96FB,
-	3421:  0x514E,
-	3422:  0x5410,
-	3423:  0x5835,
-	3424:  0x5857,
-	3425:  0x59AC,
-	3426:  0x5C60,
-	3427:  0x5F92,
-	3428:  0x6597,
-	3429:  0x675C,
-	3430:  0x6E21,
-	3431:  0x767B,
-	3432:  0x83DF,
-	3433:  0x8CED,
-	3434:  0x9014,
-	3435:  0x90FD,
-	3436:  0x934D,
-	3437:  0x7825,
-	3438:  0x783A,
-	3439:  0x52AA,
-	3440:  0x5EA6,
-	3441:  0x571F,
-	3442:  0x5974,
-	3443:  0x6012,
-	3444:  0x5012,
-	3445:  0x515A,
-	3446:  0x51AC,
-	3447:  0x51CD,
-	3448:  0x5200,
-	3449:  0x5510,
-	3450:  0x5854,
-	3451:  0x5858,
-	3452:  0x5957,
-	3453:  0x5B95,
-	3454:  0x5CF6,
-	3455:  0x5D8B,
-	3456:  0x60BC,
-	3457:  0x6295,
-	3458:  0x642D,
-	3459:  0x6771,
-	3460:  0x6843,
-	3461:  0x68BC,
-	3462:  0x68DF,
-	3463:  0x76D7,
-	3464:  0x6DD8,
-	3465:  0x6E6F,
-	3466:  0x6D9B,
-	3467:  0x706F,
-	3468:  0x71C8,
-	3469:  0x5F53,
-	3470:  0x75D8,
-	3471:  0x7977,
-	3472:  0x7B49,
-	3473:  0x7B54,
-	3474:  0x7B52,
-	3475:  0x7CD6,
-	3476:  0x7D71,
-	3477:  0x5230,
-	3478:  0x8463,
-	3479:  0x8569,
-	3480:  0x85E4,
-	3481:  0x8A0E,
-	3482:  0x8B04,
-	3483:  0x8C46,
-	3484:  0x8E0F,
-	3485:  0x9003,
-	3486:  0x900F,
-	3487:  0x9419,
-	3488:  0x9676,
-	3489:  0x982D,
-	3490:  0x9A30,
-	3491:  0x95D8,
-	3492:  0x50CD,
-	3493:  0x52D5,
-	3494:  0x540C,
-	3495:  0x5802,
-	3496:  0x5C0E,
-	3497:  0x61A7,
-	3498:  0x649E,
-	3499:  0x6D1E,
-	3500:  0x77B3,
-	3501:  0x7AE5,
-	3502:  0x80F4,
-	3503:  0x8404,
-	3504:  0x9053,
-	3505:  0x9285,
-	3506:  0x5CE0,
-	3507:  0x9D07,
-	3508:  0x533F,
-	3509:  0x5F97,
-	3510:  0x5FB3,
-	3511:  0x6D9C,
-	3512:  0x7279,
-	3513:  0x7763,
-	3514:  0x79BF,
-	3515:  0x7BE4,
-	3516:  0x6BD2,
-	3517:  0x72EC,
-	3518:  0x8AAD,
-	3519:  0x6803,
-	3520:  0x6A61,
-	3521:  0x51F8,
-	3522:  0x7A81,
-	3523:  0x6934,
-	3524:  0x5C4A,
-	3525:  0x9CF6,
-	3526:  0x82EB,
-	3527:  0x5BC5,
-	3528:  0x9149,
-	3529:  0x701E,
-	3530:  0x5678,
-	3531:  0x5C6F,
-	3532:  0x60C7,
-	3533:  0x6566,
-	3534:  0x6C8C,
-	3535:  0x8C5A,
-	3536:  0x9041,
-	3537:  0x9813,
-	3538:  0x5451,
-	3539:  0x66C7,
-	3540:  0x920D,
-	3541:  0x5948,
-	3542:  0x90A3,
-	3543:  0x5185,
-	3544:  0x4E4D,
-	3545:  0x51EA,
-	3546:  0x8599,
-	3547:  0x8B0E,
-	3548:  0x7058,
-	3549:  0x637A,
-	3550:  0x934B,
-	3551:  0x6962,
-	3552:  0x99B4,
-	3553:  0x7E04,
-	3554:  0x7577,
-	3555:  0x5357,
-	3556:  0x6960,
-	3557:  0x8EDF,
-	3558:  0x96E3,
-	3559:  0x6C5D,
-	3560:  0x4E8C,
-	3561:  0x5C3C,
-	3562:  0x5F10,
-	3563:  0x8FE9,
-	3564:  0x5302,
-	3565:  0x8CD1,
-	3566:  0x8089,
-	3567:  0x8679,
-	3568:  0x5EFF,
-	3569:  0x65E5,
-	3570:  0x4E73,
-	3571:  0x5165,
-	3572:  0x5982,
-	3573:  0x5C3F,
-	3574:  0x97EE,
-	3575:  0x4EFB,
-	3576:  0x598A,
-	3577:  0x5FCD,
-	3578:  0x8A8D,
-	3579:  0x6FE1,
-	3580:  0x79B0,
-	3581:  0x7962,
-	3582:  0x5BE7,
-	3583:  0x8471,
-	3584:  0x732B,
-	3585:  0x71B1,
-	3586:  0x5E74,
-	3587:  0x5FF5,
-	3588:  0x637B,
-	3589:  0x649A,
-	3590:  0x71C3,
-	3591:  0x7C98,
-	3592:  0x4E43,
-	3593:  0x5EFC,
-	3594:  0x4E4B,
-	3595:  0x57DC,
-	3596:  0x56A2,
-	3597:  0x60A9,
-	3598:  0x6FC3,
-	3599:  0x7D0D,
-	3600:  0x80FD,
-	3601:  0x8133,
-	3602:  0x81BF,
-	3603:  0x8FB2,
-	3604:  0x8997,
-	3605:  0x86A4,
-	3606:  0x5DF4,
-	3607:  0x628A,
-	3608:  0x64AD,
-	3609:  0x8987,
-	3610:  0x6777,
-	3611:  0x6CE2,
-	3612:  0x6D3E,
-	3613:  0x7436,
-	3614:  0x7834,
-	3615:  0x5A46,
-	3616:  0x7F75,
-	3617:  0x82AD,
-	3618:  0x99AC,
-	3619:  0x4FF3,
-	3620:  0x5EC3,
-	3621:  0x62DD,
-	3622:  0x6392,
-	3623:  0x6557,
-	3624:  0x676F,
-	3625:  0x76C3,
-	3626:  0x724C,
-	3627:  0x80CC,
-	3628:  0x80BA,
-	3629:  0x8F29,
-	3630:  0x914D,
-	3631:  0x500D,
-	3632:  0x57F9,
-	3633:  0x5A92,
-	3634:  0x6885,
-	3635:  0x6973,
-	3636:  0x7164,
-	3637:  0x72FD,
-	3638:  0x8CB7,
-	3639:  0x58F2,
-	3640:  0x8CE0,
-	3641:  0x966A,
-	3642:  0x9019,
-	3643:  0x877F,
-	3644:  0x79E4,
-	3645:  0x77E7,
-	3646:  0x8429,
-	3647:  0x4F2F,
-	3648:  0x5265,
-	3649:  0x535A,
-	3650:  0x62CD,
-	3651:  0x67CF,
-	3652:  0x6CCA,
-	3653:  0x767D,
-	3654:  0x7B94,
-	3655:  0x7C95,
-	3656:  0x8236,
-	3657:  0x8584,
-	3658:  0x8FEB,
-	3659:  0x66DD,
-	3660:  0x6F20,
-	3661:  0x7206,
-	3662:  0x7E1B,
-	3663:  0x83AB,
-	3664:  0x99C1,
-	3665:  0x9EA6,
-	3666:  0x51FD,
-	3667:  0x7BB1,
-	3668:  0x7872,
-	3669:  0x7BB8,
-	3670:  0x8087,
-	3671:  0x7B48,
-	3672:  0x6AE8,
-	3673:  0x5E61,
-	3674:  0x808C,
-	3675:  0x7551,
-	3676:  0x7560,
-	3677:  0x516B,
-	3678:  0x9262,
-	3679:  0x6E8C,
-	3680:  0x767A,
-	3681:  0x9197,
-	3682:  0x9AEA,
-	3683:  0x4F10,
-	3684:  0x7F70,
-	3685:  0x629C,
-	3686:  0x7B4F,
-	3687:  0x95A5,
-	3688:  0x9CE9,
-	3689:  0x567A,
-	3690:  0x5859,
-	3691:  0x86E4,
-	3692:  0x96BC,
-	3693:  0x4F34,
-	3694:  0x5224,
-	3695:  0x534A,
-	3696:  0x53CD,
-	3697:  0x53DB,
-	3698:  0x5E06,
-	3699:  0x642C,
-	3700:  0x6591,
-	3701:  0x677F,
-	3702:  0x6C3E,
-	3703:  0x6C4E,
-	3704:  0x7248,
-	3705:  0x72AF,
-	3706:  0x73ED,
-	3707:  0x7554,
-	3708:  0x7E41,
-	3709:  0x822C,
-	3710:  0x85E9,
-	3711:  0x8CA9,
-	3712:  0x7BC4,
-	3713:  0x91C6,
-	3714:  0x7169,
-	3715:  0x9812,
-	3716:  0x98EF,
-	3717:  0x633D,
-	3718:  0x6669,
-	3719:  0x756A,
-	3720:  0x76E4,
-	3721:  0x78D0,
-	3722:  0x8543,
-	3723:  0x86EE,
-	3724:  0x532A,
-	3725:  0x5351,
-	3726:  0x5426,
-	3727:  0x5983,
-	3728:  0x5E87,
-	3729:  0x5F7C,
-	3730:  0x60B2,
-	3731:  0x6249,
-	3732:  0x6279,
-	3733:  0x62AB,
-	3734:  0x6590,
-	3735:  0x6BD4,
-	3736:  0x6CCC,
-	3737:  0x75B2,
-	3738:  0x76AE,
-	3739:  0x7891,
-	3740:  0x79D8,
-	3741:  0x7DCB,
-	3742:  0x7F77,
-	3743:  0x80A5,
-	3744:  0x88AB,
-	3745:  0x8AB9,
-	3746:  0x8CBB,
-	3747:  0x907F,
-	3748:  0x975E,
-	3749:  0x98DB,
-	3750:  0x6A0B,
-	3751:  0x7C38,
-	3752:  0x5099,
-	3753:  0x5C3E,
-	3754:  0x5FAE,
-	3755:  0x6787,
-	3756:  0x6BD8,
-	3757:  0x7435,
-	3758:  0x7709,
-	3759:  0x7F8E,
-	3760:  0x9F3B,
-	3761:  0x67CA,
-	3762:  0x7A17,
-	3763:  0x5339,
-	3764:  0x758B,
-	3765:  0x9AED,
-	3766:  0x5F66,
-	3767:  0x819D,
-	3768:  0x83F1,
-	3769:  0x8098,
-	3770:  0x5F3C,
-	3771:  0x5FC5,
-	3772:  0x7562,
-	3773:  0x7B46,
-	3774:  0x903C,
-	3775:  0x6867,
-	3776:  0x59EB,
-	3777:  0x5A9B,
-	3778:  0x7D10,
-	3779:  0x767E,
-	3780:  0x8B2C,
-	3781:  0x4FF5,
-	3782:  0x5F6A,
-	3783:  0x6A19,
-	3784:  0x6C37,
-	3785:  0x6F02,
-	3786:  0x74E2,
-	3787:  0x7968,
-	3788:  0x8868,
-	3789:  0x8A55,
-	3790:  0x8C79,
-	3791:  0x5EDF,
-	3792:  0x63CF,
-	3793:  0x75C5,
-	3794:  0x79D2,
-	3795:  0x82D7,
-	3796:  0x9328,
-	3797:  0x92F2,
-	3798:  0x849C,
-	3799:  0x86ED,
-	3800:  0x9C2D,
-	3801:  0x54C1,
-	3802:  0x5F6C,
-	3803:  0x658C,
-	3804:  0x6D5C,
-	3805:  0x7015,
-	3806:  0x8CA7,
-	3807:  0x8CD3,
-	3808:  0x983B,
-	3809:  0x654F,
-	3810:  0x74F6,
-	3811:  0x4E0D,
-	3812:  0x4ED8,
-	3813:  0x57E0,
-	3814:  0x592B,
-	3815:  0x5A66,
-	3816:  0x5BCC,
-	3817:  0x51A8,
-	3818:  0x5E03,
-	3819:  0x5E9C,
-	3820:  0x6016,
-	3821:  0x6276,
-	3822:  0x6577,
-	3823:  0x65A7,
-	3824:  0x666E,
-	3825:  0x6D6E,
-	3826:  0x7236,
-	3827:  0x7B26,
-	3828:  0x8150,
-	3829:  0x819A,
-	3830:  0x8299,
-	3831:  0x8B5C,
-	3832:  0x8CA0,
-	3833:  0x8CE6,
-	3834:  0x8D74,
-	3835:  0x961C,
-	3836:  0x9644,
-	3837:  0x4FAE,
-	3838:  0x64AB,
-	3839:  0x6B66,
-	3840:  0x821E,
-	3841:  0x8461,
-	3842:  0x856A,
-	3843:  0x90E8,
-	3844:  0x5C01,
-	3845:  0x6953,
-	3846:  0x98A8,
-	3847:  0x847A,
-	3848:  0x8557,
-	3849:  0x4F0F,
-	3850:  0x526F,
-	3851:  0x5FA9,
-	3852:  0x5E45,
-	3853:  0x670D,
-	3854:  0x798F,
-	3855:  0x8179,
-	3856:  0x8907,
-	3857:  0x8986,
-	3858:  0x6DF5,
-	3859:  0x5F17,
-	3860:  0x6255,
-	3861:  0x6CB8,
-	3862:  0x4ECF,
-	3863:  0x7269,
-	3864:  0x9B92,
-	3865:  0x5206,
-	3866:  0x543B,
-	3867:  0x5674,
-	3868:  0x58B3,
-	3869:  0x61A4,
-	3870:  0x626E,
-	3871:  0x711A,
-	3872:  0x596E,
-	3873:  0x7C89,
-	3874:  0x7CDE,
-	3875:  0x7D1B,
-	3876:  0x96F0,
-	3877:  0x6587,
-	3878:  0x805E,
-	3879:  0x4E19,
-	3880:  0x4F75,
-	3881:  0x5175,
-	3882:  0x5840,
-	3883:  0x5E63,
-	3884:  0x5E73,
-	3885:  0x5F0A,
-	3886:  0x67C4,
-	3887:  0x4E26,
-	3888:  0x853D,
-	3889:  0x9589,
-	3890:  0x965B,
-	3891:  0x7C73,
-	3892:  0x9801,
-	3893:  0x50FB,
-	3894:  0x58C1,
-	3895:  0x7656,
-	3896:  0x78A7,
-	3897:  0x5225,
-	3898:  0x77A5,
-	3899:  0x8511,
-	3900:  0x7B86,
-	3901:  0x504F,
-	3902:  0x5909,
-	3903:  0x7247,
-	3904:  0x7BC7,
-	3905:  0x7DE8,
-	3906:  0x8FBA,
-	3907:  0x8FD4,
-	3908:  0x904D,
-	3909:  0x4FBF,
-	3910:  0x52C9,
-	3911:  0x5A29,
-	3912:  0x5F01,
-	3913:  0x97AD,
-	3914:  0x4FDD,
-	3915:  0x8217,
-	3916:  0x92EA,
-	3917:  0x5703,
-	3918:  0x6355,
-	3919:  0x6B69,
-	3920:  0x752B,
-	3921:  0x88DC,
-	3922:  0x8F14,
-	3923:  0x7A42,
-	3924:  0x52DF,
-	3925:  0x5893,
-	3926:  0x6155,
-	3927:  0x620A,
-	3928:  0x66AE,
-	3929:  0x6BCD,
-	3930:  0x7C3F,
-	3931:  0x83E9,
-	3932:  0x5023,
-	3933:  0x4FF8,
-	3934:  0x5305,
-	3935:  0x5446,
-	3936:  0x5831,
-	3937:  0x5949,
-	3938:  0x5B9D,
-	3939:  0x5CF0,
-	3940:  0x5CEF,
-	3941:  0x5D29,
-	3942:  0x5E96,
-	3943:  0x62B1,
-	3944:  0x6367,
-	3945:  0x653E,
-	3946:  0x65B9,
-	3947:  0x670B,
-	3948:  0x6CD5,
-	3949:  0x6CE1,
-	3950:  0x70F9,
-	3951:  0x7832,
-	3952:  0x7E2B,
-	3953:  0x80DE,
-	3954:  0x82B3,
-	3955:  0x840C,
-	3956:  0x84EC,
-	3957:  0x8702,
-	3958:  0x8912,
-	3959:  0x8A2A,
-	3960:  0x8C4A,
-	3961:  0x90A6,
-	3962:  0x92D2,
-	3963:  0x98FD,
-	3964:  0x9CF3,
-	3965:  0x9D6C,
-	3966:  0x4E4F,
-	3967:  0x4EA1,
-	3968:  0x508D,
-	3969:  0x5256,
-	3970:  0x574A,
-	3971:  0x59A8,
-	3972:  0x5E3D,
-	3973:  0x5FD8,
-	3974:  0x5FD9,
-	3975:  0x623F,
-	3976:  0x66B4,
-	3977:  0x671B,
-	3978:  0x67D0,
-	3979:  0x68D2,
-	3980:  0x5192,
-	3981:  0x7D21,
-	3982:  0x80AA,
-	3983:  0x81A8,
-	3984:  0x8B00,
-	3985:  0x8C8C,
-	3986:  0x8CBF,
-	3987:  0x927E,
-	3988:  0x9632,
-	3989:  0x5420,
-	3990:  0x982C,
-	3991:  0x5317,
-	3992:  0x50D5,
-	3993:  0x535C,
-	3994:  0x58A8,
-	3995:  0x64B2,
-	3996:  0x6734,
-	3997:  0x7267,
-	3998:  0x7766,
-	3999:  0x7A46,
-	4000:  0x91E6,
-	4001:  0x52C3,
-	4002:  0x6CA1,
-	4003:  0x6B86,
-	4004:  0x5800,
-	4005:  0x5E4C,
-	4006:  0x5954,
-	4007:  0x672C,
-	4008:  0x7FFB,
-	4009:  0x51E1,
-	4010:  0x76C6,
-	4011:  0x6469,
-	4012:  0x78E8,
-	4013:  0x9B54,
-	4014:  0x9EBB,
-	4015:  0x57CB,
-	4016:  0x59B9,
-	4017:  0x6627,
-	4018:  0x679A,
-	4019:  0x6BCE,
-	4020:  0x54E9,
-	4021:  0x69D9,
-	4022:  0x5E55,
-	4023:  0x819C,
-	4024:  0x6795,
-	4025:  0x9BAA,
-	4026:  0x67FE,
-	4027:  0x9C52,
-	4028:  0x685D,
-	4029:  0x4EA6,
-	4030:  0x4FE3,
-	4031:  0x53C8,
-	4032:  0x62B9,
-	4033:  0x672B,
-	4034:  0x6CAB,
-	4035:  0x8FC4,
-	4036:  0x4FAD,
-	4037:  0x7E6D,
-	4038:  0x9EBF,
-	4039:  0x4E07,
-	4040:  0x6162,
-	4041:  0x6E80,
-	4042:  0x6F2B,
-	4043:  0x8513,
-	4044:  0x5473,
-	4045:  0x672A,
-	4046:  0x9B45,
-	4047:  0x5DF3,
-	4048:  0x7B95,
-	4049:  0x5CAC,
-	4050:  0x5BC6,
-	4051:  0x871C,
-	4052:  0x6E4A,
-	4053:  0x84D1,
-	4054:  0x7A14,
-	4055:  0x8108,
-	4056:  0x5999,
-	4057:  0x7C8D,
-	4058:  0x6C11,
-	4059:  0x7720,
-	4060:  0x52D9,
-	4061:  0x5922,
-	4062:  0x7121,
-	4063:  0x725F,
-	4064:  0x77DB,
-	4065:  0x9727,
-	4066:  0x9D61,
-	4067:  0x690B,
-	4068:  0x5A7F,
-	4069:  0x5A18,
-	4070:  0x51A5,
-	4071:  0x540D,
-	4072:  0x547D,
-	4073:  0x660E,
-	4074:  0x76DF,
-	4075:  0x8FF7,
-	4076:  0x9298,
-	4077:  0x9CF4,
-	4078:  0x59EA,
-	4079:  0x725D,
-	4080:  0x6EC5,
-	4081:  0x514D,
-	4082:  0x68C9,
-	4083:  0x7DBF,
-	4084:  0x7DEC,
-	4085:  0x9762,
-	4086:  0x9EBA,
-	4087:  0x6478,
-	4088:  0x6A21,
-	4089:  0x8302,
-	4090:  0x5984,
-	4091:  0x5B5F,
-	4092:  0x6BDB,
-	4093:  0x731B,
-	4094:  0x76F2,
-	4095:  0x7DB2,
-	4096:  0x8017,
-	4097:  0x8499,
-	4098:  0x5132,
-	4099:  0x6728,
-	4100:  0x9ED9,
-	4101:  0x76EE,
-	4102:  0x6762,
-	4103:  0x52FF,
-	4104:  0x9905,
-	4105:  0x5C24,
-	4106:  0x623B,
-	4107:  0x7C7E,
-	4108:  0x8CB0,
-	4109:  0x554F,
-	4110:  0x60B6,
-	4111:  0x7D0B,
-	4112:  0x9580,
-	4113:  0x5301,
-	4114:  0x4E5F,
-	4115:  0x51B6,
-	4116:  0x591C,
-	4117:  0x723A,
-	4118:  0x8036,
-	4119:  0x91CE,
-	4120:  0x5F25,
-	4121:  0x77E2,
-	4122:  0x5384,
-	4123:  0x5F79,
-	4124:  0x7D04,
-	4125:  0x85AC,
-	4126:  0x8A33,
-	4127:  0x8E8D,
-	4128:  0x9756,
-	4129:  0x67F3,
-	4130:  0x85AE,
-	4131:  0x9453,
-	4132:  0x6109,
-	4133:  0x6108,
-	4134:  0x6CB9,
-	4135:  0x7652,
-	4136:  0x8AED,
-	4137:  0x8F38,
-	4138:  0x552F,
-	4139:  0x4F51,
-	4140:  0x512A,
-	4141:  0x52C7,
-	4142:  0x53CB,
-	4143:  0x5BA5,
-	4144:  0x5E7D,
-	4145:  0x60A0,
-	4146:  0x6182,
-	4147:  0x63D6,
-	4148:  0x6709,
-	4149:  0x67DA,
-	4150:  0x6E67,
-	4151:  0x6D8C,
-	4152:  0x7336,
-	4153:  0x7337,
-	4154:  0x7531,
-	4155:  0x7950,
-	4156:  0x88D5,
-	4157:  0x8A98,
-	4158:  0x904A,
-	4159:  0x9091,
-	4160:  0x90F5,
-	4161:  0x96C4,
-	4162:  0x878D,
-	4163:  0x5915,
-	4164:  0x4E88,
-	4165:  0x4F59,
-	4166:  0x4E0E,
-	4167:  0x8A89,
-	4168:  0x8F3F,
-	4169:  0x9810,
-	4170:  0x50AD,
-	4171:  0x5E7C,
-	4172:  0x5996,
-	4173:  0x5BB9,
-	4174:  0x5EB8,
-	4175:  0x63DA,
-	4176:  0x63FA,
-	4177:  0x64C1,
-	4178:  0x66DC,
-	4179:  0x694A,
-	4180:  0x69D8,
-	4181:  0x6D0B,
-	4182:  0x6EB6,
-	4183:  0x7194,
-	4184:  0x7528,
-	4185:  0x7AAF,
-	4186:  0x7F8A,
-	4187:  0x8000,
-	4188:  0x8449,
-	4189:  0x84C9,
-	4190:  0x8981,
-	4191:  0x8B21,
-	4192:  0x8E0A,
-	4193:  0x9065,
-	4194:  0x967D,
-	4195:  0x990A,
-	4196:  0x617E,
-	4197:  0x6291,
-	4198:  0x6B32,
-	4199:  0x6C83,
-	4200:  0x6D74,
-	4201:  0x7FCC,
-	4202:  0x7FFC,
-	4203:  0x6DC0,
-	4204:  0x7F85,
-	4205:  0x87BA,
-	4206:  0x88F8,
-	4207:  0x6765,
-	4208:  0x83B1,
-	4209:  0x983C,
-	4210:  0x96F7,
-	4211:  0x6D1B,
-	4212:  0x7D61,
-	4213:  0x843D,
-	4214:  0x916A,
-	4215:  0x4E71,
-	4216:  0x5375,
-	4217:  0x5D50,
-	4218:  0x6B04,
-	4219:  0x6FEB,
-	4220:  0x85CD,
-	4221:  0x862D,
-	4222:  0x89A7,
-	4223:  0x5229,
-	4224:  0x540F,
-	4225:  0x5C65,
-	4226:  0x674E,
-	4227:  0x68A8,
-	4228:  0x7406,
-	4229:  0x7483,
-	4230:  0x75E2,
-	4231:  0x88CF,
-	4232:  0x88E1,
-	4233:  0x91CC,
-	4234:  0x96E2,
-	4235:  0x9678,
-	4236:  0x5F8B,
-	4237:  0x7387,
-	4238:  0x7ACB,
-	4239:  0x844E,
-	4240:  0x63A0,
-	4241:  0x7565,
-	4242:  0x5289,
-	4243:  0x6D41,
-	4244:  0x6E9C,
-	4245:  0x7409,
-	4246:  0x7559,
-	4247:  0x786B,
-	4248:  0x7C92,
-	4249:  0x9686,
-	4250:  0x7ADC,
-	4251:  0x9F8D,
-	4252:  0x4FB6,
-	4253:  0x616E,
-	4254:  0x65C5,
-	4255:  0x865C,
-	4256:  0x4E86,
-	4257:  0x4EAE,
-	4258:  0x50DA,
-	4259:  0x4E21,
-	4260:  0x51CC,
-	4261:  0x5BEE,
-	4262:  0x6599,
-	4263:  0x6881,
-	4264:  0x6DBC,
-	4265:  0x731F,
-	4266:  0x7642,
-	4267:  0x77AD,
-	4268:  0x7A1C,
-	4269:  0x7CE7,
-	4270:  0x826F,
-	4271:  0x8AD2,
-	4272:  0x907C,
-	4273:  0x91CF,
-	4274:  0x9675,
-	4275:  0x9818,
-	4276:  0x529B,
-	4277:  0x7DD1,
-	4278:  0x502B,
-	4279:  0x5398,
-	4280:  0x6797,
-	4281:  0x6DCB,
-	4282:  0x71D0,
-	4283:  0x7433,
-	4284:  0x81E8,
-	4285:  0x8F2A,
-	4286:  0x96A3,
-	4287:  0x9C57,
-	4288:  0x9E9F,
-	4289:  0x7460,
-	4290:  0x5841,
-	4291:  0x6D99,
-	4292:  0x7D2F,
-	4293:  0x985E,
-	4294:  0x4EE4,
-	4295:  0x4F36,
-	4296:  0x4F8B,
-	4297:  0x51B7,
-	4298:  0x52B1,
-	4299:  0x5DBA,
-	4300:  0x601C,
-	4301:  0x73B2,
-	4302:  0x793C,
-	4303:  0x82D3,
-	4304:  0x9234,
-	4305:  0x96B7,
-	4306:  0x96F6,
-	4307:  0x970A,
-	4308:  0x9E97,
-	4309:  0x9F62,
-	4310:  0x66A6,
-	4311:  0x6B74,
-	4312:  0x5217,
-	4313:  0x52A3,
-	4314:  0x70C8,
-	4315:  0x88C2,
-	4316:  0x5EC9,
-	4317:  0x604B,
-	4318:  0x6190,
-	4319:  0x6F23,
-	4320:  0x7149,
-	4321:  0x7C3E,
-	4322:  0x7DF4,
-	4323:  0x806F,
-	4324:  0x84EE,
-	4325:  0x9023,
-	4326:  0x932C,
-	4327:  0x5442,
-	4328:  0x9B6F,
-	4329:  0x6AD3,
-	4330:  0x7089,
-	4331:  0x8CC2,
-	4332:  0x8DEF,
-	4333:  0x9732,
-	4334:  0x52B4,
-	4335:  0x5A41,
-	4336:  0x5ECA,
-	4337:  0x5F04,
-	4338:  0x6717,
-	4339:  0x697C,
-	4340:  0x6994,
-	4341:  0x6D6A,
-	4342:  0x6F0F,
-	4343:  0x7262,
-	4344:  0x72FC,
-	4345:  0x7BED,
-	4346:  0x8001,
-	4347:  0x807E,
-	4348:  0x874B,
-	4349:  0x90CE,
-	4350:  0x516D,
-	4351:  0x9E93,
-	4352:  0x7984,
-	4353:  0x808B,
-	4354:  0x9332,
-	4355:  0x8AD6,
-	4356:  0x502D,
-	4357:  0x548C,
-	4358:  0x8A71,
-	4359:  0x6B6A,
-	4360:  0x8CC4,
-	4361:  0x8107,
-	4362:  0x60D1,
-	4363:  0x67A0,
-	4364:  0x9DF2,
-	4365:  0x4E99,
-	4366:  0x4E98,
-	4367:  0x9C10,
-	4368:  0x8A6B,
-	4369:  0x85C1,
-	4370:  0x8568,
-	4371:  0x6900,
-	4372:  0x6E7E,
-	4373:  0x7897,
-	4374:  0x8155,
-	4418:  0x5F0C,
-	4419:  0x4E10,
-	4420:  0x4E15,
-	4421:  0x4E2A,
-	4422:  0x4E31,
-	4423:  0x4E36,
-	4424:  0x4E3C,
-	4425:  0x4E3F,
-	4426:  0x4E42,
-	4427:  0x4E56,
-	4428:  0x4E58,
-	4429:  0x4E82,
-	4430:  0x4E85,
-	4431:  0x8C6B,
-	4432:  0x4E8A,
-	4433:  0x8212,
-	4434:  0x5F0D,
-	4435:  0x4E8E,
-	4436:  0x4E9E,
-	4437:  0x4E9F,
-	4438:  0x4EA0,
-	4439:  0x4EA2,
-	4440:  0x4EB0,
-	4441:  0x4EB3,
-	4442:  0x4EB6,
-	4443:  0x4ECE,
-	4444:  0x4ECD,
-	4445:  0x4EC4,
-	4446:  0x4EC6,
-	4447:  0x4EC2,
-	4448:  0x4ED7,
-	4449:  0x4EDE,
-	4450:  0x4EED,
-	4451:  0x4EDF,
-	4452:  0x4EF7,
-	4453:  0x4F09,
-	4454:  0x4F5A,
-	4455:  0x4F30,
-	4456:  0x4F5B,
-	4457:  0x4F5D,
-	4458:  0x4F57,
-	4459:  0x4F47,
-	4460:  0x4F76,
-	4461:  0x4F88,
-	4462:  0x4F8F,
-	4463:  0x4F98,
-	4464:  0x4F7B,
-	4465:  0x4F69,
-	4466:  0x4F70,
-	4467:  0x4F91,
-	4468:  0x4F6F,
-	4469:  0x4F86,
-	4470:  0x4F96,
-	4471:  0x5118,
-	4472:  0x4FD4,
-	4473:  0x4FDF,
-	4474:  0x4FCE,
-	4475:  0x4FD8,
-	4476:  0x4FDB,
-	4477:  0x4FD1,
-	4478:  0x4FDA,
-	4479:  0x4FD0,
-	4480:  0x4FE4,
-	4481:  0x4FE5,
-	4482:  0x501A,
-	4483:  0x5028,
-	4484:  0x5014,
-	4485:  0x502A,
-	4486:  0x5025,
-	4487:  0x5005,
-	4488:  0x4F1C,
-	4489:  0x4FF6,
-	4490:  0x5021,
-	4491:  0x5029,
-	4492:  0x502C,
-	4493:  0x4FFE,
-	4494:  0x4FEF,
-	4495:  0x5011,
-	4496:  0x5006,
-	4497:  0x5043,
-	4498:  0x5047,
-	4499:  0x6703,
-	4500:  0x5055,
-	4501:  0x5050,
-	4502:  0x5048,
-	4503:  0x505A,
-	4504:  0x5056,
-	4505:  0x506C,
-	4506:  0x5078,
-	4507:  0x5080,
-	4508:  0x509A,
-	4509:  0x5085,
-	4510:  0x50B4,
-	4511:  0x50B2,
-	4512:  0x50C9,
-	4513:  0x50CA,
-	4514:  0x50B3,
-	4515:  0x50C2,
-	4516:  0x50D6,
-	4517:  0x50DE,
-	4518:  0x50E5,
-	4519:  0x50ED,
-	4520:  0x50E3,
-	4521:  0x50EE,
-	4522:  0x50F9,
-	4523:  0x50F5,
-	4524:  0x5109,
-	4525:  0x5101,
-	4526:  0x5102,
-	4527:  0x5116,
-	4528:  0x5115,
-	4529:  0x5114,
-	4530:  0x511A,
-	4531:  0x5121,
-	4532:  0x513A,
-	4533:  0x5137,
-	4534:  0x513C,
-	4535:  0x513B,
-	4536:  0x513F,
-	4537:  0x5140,
-	4538:  0x5152,
-	4539:  0x514C,
-	4540:  0x5154,
-	4541:  0x5162,
-	4542:  0x7AF8,
-	4543:  0x5169,
-	4544:  0x516A,
-	4545:  0x516E,
-	4546:  0x5180,
-	4547:  0x5182,
-	4548:  0x56D8,
-	4549:  0x518C,
-	4550:  0x5189,
-	4551:  0x518F,
-	4552:  0x5191,
-	4553:  0x5193,
-	4554:  0x5195,
-	4555:  0x5196,
-	4556:  0x51A4,
-	4557:  0x51A6,
-	4558:  0x51A2,
-	4559:  0x51A9,
-	4560:  0x51AA,
-	4561:  0x51AB,
-	4562:  0x51B3,
-	4563:  0x51B1,
-	4564:  0x51B2,
-	4565:  0x51B0,
-	4566:  0x51B5,
-	4567:  0x51BD,
-	4568:  0x51C5,
-	4569:  0x51C9,
-	4570:  0x51DB,
-	4571:  0x51E0,
-	4572:  0x8655,
-	4573:  0x51E9,
-	4574:  0x51ED,
-	4575:  0x51F0,
-	4576:  0x51F5,
-	4577:  0x51FE,
-	4578:  0x5204,
-	4579:  0x520B,
-	4580:  0x5214,
-	4581:  0x520E,
-	4582:  0x5227,
-	4583:  0x522A,
-	4584:  0x522E,
-	4585:  0x5233,
-	4586:  0x5239,
-	4587:  0x524F,
-	4588:  0x5244,
-	4589:  0x524B,
-	4590:  0x524C,
-	4591:  0x525E,
-	4592:  0x5254,
-	4593:  0x526A,
-	4594:  0x5274,
-	4595:  0x5269,
-	4596:  0x5273,
-	4597:  0x527F,
-	4598:  0x527D,
-	4599:  0x528D,
-	4600:  0x5294,
-	4601:  0x5292,
-	4602:  0x5271,
-	4603:  0x5288,
-	4604:  0x5291,
-	4605:  0x8FA8,
-	4606:  0x8FA7,
-	4607:  0x52AC,
-	4608:  0x52AD,
-	4609:  0x52BC,
-	4610:  0x52B5,
-	4611:  0x52C1,
-	4612:  0x52CD,
-	4613:  0x52D7,
-	4614:  0x52DE,
-	4615:  0x52E3,
-	4616:  0x52E6,
-	4617:  0x98ED,
-	4618:  0x52E0,
-	4619:  0x52F3,
-	4620:  0x52F5,
-	4621:  0x52F8,
-	4622:  0x52F9,
-	4623:  0x5306,
-	4624:  0x5308,
-	4625:  0x7538,
-	4626:  0x530D,
-	4627:  0x5310,
-	4628:  0x530F,
-	4629:  0x5315,
-	4630:  0x531A,
-	4631:  0x5323,
-	4632:  0x532F,
-	4633:  0x5331,
-	4634:  0x5333,
-	4635:  0x5338,
-	4636:  0x5340,
-	4637:  0x5346,
-	4638:  0x5345,
-	4639:  0x4E17,
-	4640:  0x5349,
-	4641:  0x534D,
-	4642:  0x51D6,
-	4643:  0x535E,
-	4644:  0x5369,
-	4645:  0x536E,
-	4646:  0x5918,
-	4647:  0x537B,
-	4648:  0x5377,
-	4649:  0x5382,
-	4650:  0x5396,
-	4651:  0x53A0,
-	4652:  0x53A6,
-	4653:  0x53A5,
-	4654:  0x53AE,
-	4655:  0x53B0,
-	4656:  0x53B6,
-	4657:  0x53C3,
-	4658:  0x7C12,
-	4659:  0x96D9,
-	4660:  0x53DF,
-	4661:  0x66FC,
-	4662:  0x71EE,
-	4663:  0x53EE,
-	4664:  0x53E8,
-	4665:  0x53ED,
-	4666:  0x53FA,
-	4667:  0x5401,
-	4668:  0x543D,
-	4669:  0x5440,
-	4670:  0x542C,
-	4671:  0x542D,
-	4672:  0x543C,
-	4673:  0x542E,
-	4674:  0x5436,
-	4675:  0x5429,
-	4676:  0x541D,
-	4677:  0x544E,
-	4678:  0x548F,
-	4679:  0x5475,
-	4680:  0x548E,
-	4681:  0x545F,
-	4682:  0x5471,
-	4683:  0x5477,
-	4684:  0x5470,
-	4685:  0x5492,
-	4686:  0x547B,
-	4687:  0x5480,
-	4688:  0x5476,
-	4689:  0x5484,
-	4690:  0x5490,
-	4691:  0x5486,
-	4692:  0x54C7,
-	4693:  0x54A2,
-	4694:  0x54B8,
-	4695:  0x54A5,
-	4696:  0x54AC,
-	4697:  0x54C4,
-	4698:  0x54C8,
-	4699:  0x54A8,
-	4700:  0x54AB,
-	4701:  0x54C2,
-	4702:  0x54A4,
-	4703:  0x54BE,
-	4704:  0x54BC,
-	4705:  0x54D8,
-	4706:  0x54E5,
-	4707:  0x54E6,
-	4708:  0x550F,
-	4709:  0x5514,
-	4710:  0x54FD,
-	4711:  0x54EE,
-	4712:  0x54ED,
-	4713:  0x54FA,
-	4714:  0x54E2,
-	4715:  0x5539,
-	4716:  0x5540,
-	4717:  0x5563,
-	4718:  0x554C,
-	4719:  0x552E,
-	4720:  0x555C,
-	4721:  0x5545,
-	4722:  0x5556,
-	4723:  0x5557,
-	4724:  0x5538,
-	4725:  0x5533,
-	4726:  0x555D,
-	4727:  0x5599,
-	4728:  0x5580,
-	4729:  0x54AF,
-	4730:  0x558A,
-	4731:  0x559F,
-	4732:  0x557B,
-	4733:  0x557E,
-	4734:  0x5598,
-	4735:  0x559E,
-	4736:  0x55AE,
-	4737:  0x557C,
-	4738:  0x5583,
-	4739:  0x55A9,
-	4740:  0x5587,
-	4741:  0x55A8,
-	4742:  0x55DA,
-	4743:  0x55C5,
-	4744:  0x55DF,
-	4745:  0x55C4,
-	4746:  0x55DC,
-	4747:  0x55E4,
-	4748:  0x55D4,
-	4749:  0x5614,
-	4750:  0x55F7,
-	4751:  0x5616,
-	4752:  0x55FE,
-	4753:  0x55FD,
-	4754:  0x561B,
-	4755:  0x55F9,
-	4756:  0x564E,
-	4757:  0x5650,
-	4758:  0x71DF,
-	4759:  0x5634,
-	4760:  0x5636,
-	4761:  0x5632,
-	4762:  0x5638,
-	4763:  0x566B,
-	4764:  0x5664,
-	4765:  0x562F,
-	4766:  0x566C,
-	4767:  0x566A,
-	4768:  0x5686,
-	4769:  0x5680,
-	4770:  0x568A,
-	4771:  0x56A0,
-	4772:  0x5694,
-	4773:  0x568F,
-	4774:  0x56A5,
-	4775:  0x56AE,
-	4776:  0x56B6,
-	4777:  0x56B4,
-	4778:  0x56C2,
-	4779:  0x56BC,
-	4780:  0x56C1,
-	4781:  0x56C3,
-	4782:  0x56C0,
-	4783:  0x56C8,
-	4784:  0x56CE,
-	4785:  0x56D1,
-	4786:  0x56D3,
-	4787:  0x56D7,
-	4788:  0x56EE,
-	4789:  0x56F9,
-	4790:  0x5700,
-	4791:  0x56FF,
-	4792:  0x5704,
-	4793:  0x5709,
-	4794:  0x5708,
-	4795:  0x570B,
-	4796:  0x570D,
-	4797:  0x5713,
-	4798:  0x5718,
-	4799:  0x5716,
-	4800:  0x55C7,
-	4801:  0x571C,
-	4802:  0x5726,
-	4803:  0x5737,
-	4804:  0x5738,
-	4805:  0x574E,
-	4806:  0x573B,
-	4807:  0x5740,
-	4808:  0x574F,
-	4809:  0x5769,
-	4810:  0x57C0,
-	4811:  0x5788,
-	4812:  0x5761,
-	4813:  0x577F,
-	4814:  0x5789,
-	4815:  0x5793,
-	4816:  0x57A0,
-	4817:  0x57B3,
-	4818:  0x57A4,
-	4819:  0x57AA,
-	4820:  0x57B0,
-	4821:  0x57C3,
-	4822:  0x57C6,
-	4823:  0x57D4,
-	4824:  0x57D2,
-	4825:  0x57D3,
-	4826:  0x580A,
-	4827:  0x57D6,
-	4828:  0x57E3,
-	4829:  0x580B,
-	4830:  0x5819,
-	4831:  0x581D,
-	4832:  0x5872,
-	4833:  0x5821,
-	4834:  0x5862,
-	4835:  0x584B,
-	4836:  0x5870,
-	4837:  0x6BC0,
-	4838:  0x5852,
-	4839:  0x583D,
-	4840:  0x5879,
-	4841:  0x5885,
-	4842:  0x58B9,
-	4843:  0x589F,
-	4844:  0x58AB,
-	4845:  0x58BA,
-	4846:  0x58DE,
-	4847:  0x58BB,
-	4848:  0x58B8,
-	4849:  0x58AE,
-	4850:  0x58C5,
-	4851:  0x58D3,
-	4852:  0x58D1,
-	4853:  0x58D7,
-	4854:  0x58D9,
-	4855:  0x58D8,
-	4856:  0x58E5,
-	4857:  0x58DC,
-	4858:  0x58E4,
-	4859:  0x58DF,
-	4860:  0x58EF,
-	4861:  0x58FA,
-	4862:  0x58F9,
-	4863:  0x58FB,
-	4864:  0x58FC,
-	4865:  0x58FD,
-	4866:  0x5902,
-	4867:  0x590A,
-	4868:  0x5910,
-	4869:  0x591B,
-	4870:  0x68A6,
-	4871:  0x5925,
-	4872:  0x592C,
-	4873:  0x592D,
-	4874:  0x5932,
-	4875:  0x5938,
-	4876:  0x593E,
-	4877:  0x7AD2,
-	4878:  0x5955,
-	4879:  0x5950,
-	4880:  0x594E,
-	4881:  0x595A,
-	4882:  0x5958,
-	4883:  0x5962,
-	4884:  0x5960,
-	4885:  0x5967,
-	4886:  0x596C,
-	4887:  0x5969,
-	4888:  0x5978,
-	4889:  0x5981,
-	4890:  0x599D,
-	4891:  0x4F5E,
-	4892:  0x4FAB,
-	4893:  0x59A3,
-	4894:  0x59B2,
-	4895:  0x59C6,
-	4896:  0x59E8,
-	4897:  0x59DC,
-	4898:  0x598D,
-	4899:  0x59D9,
-	4900:  0x59DA,
-	4901:  0x5A25,
-	4902:  0x5A1F,
-	4903:  0x5A11,
-	4904:  0x5A1C,
-	4905:  0x5A09,
-	4906:  0x5A1A,
-	4907:  0x5A40,
-	4908:  0x5A6C,
-	4909:  0x5A49,
-	4910:  0x5A35,
-	4911:  0x5A36,
-	4912:  0x5A62,
-	4913:  0x5A6A,
-	4914:  0x5A9A,
-	4915:  0x5ABC,
-	4916:  0x5ABE,
-	4917:  0x5ACB,
-	4918:  0x5AC2,
-	4919:  0x5ABD,
-	4920:  0x5AE3,
-	4921:  0x5AD7,
-	4922:  0x5AE6,
-	4923:  0x5AE9,
-	4924:  0x5AD6,
-	4925:  0x5AFA,
-	4926:  0x5AFB,
-	4927:  0x5B0C,
-	4928:  0x5B0B,
-	4929:  0x5B16,
-	4930:  0x5B32,
-	4931:  0x5AD0,
-	4932:  0x5B2A,
-	4933:  0x5B36,
-	4934:  0x5B3E,
-	4935:  0x5B43,
-	4936:  0x5B45,
-	4937:  0x5B40,
-	4938:  0x5B51,
-	4939:  0x5B55,
-	4940:  0x5B5A,
-	4941:  0x5B5B,
-	4942:  0x5B65,
-	4943:  0x5B69,
-	4944:  0x5B70,
-	4945:  0x5B73,
-	4946:  0x5B75,
-	4947:  0x5B78,
-	4948:  0x6588,
-	4949:  0x5B7A,
-	4950:  0x5B80,
-	4951:  0x5B83,
-	4952:  0x5BA6,
-	4953:  0x5BB8,
-	4954:  0x5BC3,
-	4955:  0x5BC7,
-	4956:  0x5BC9,
-	4957:  0x5BD4,
-	4958:  0x5BD0,
-	4959:  0x5BE4,
-	4960:  0x5BE6,
-	4961:  0x5BE2,
-	4962:  0x5BDE,
-	4963:  0x5BE5,
-	4964:  0x5BEB,
-	4965:  0x5BF0,
-	4966:  0x5BF6,
-	4967:  0x5BF3,
-	4968:  0x5C05,
-	4969:  0x5C07,
-	4970:  0x5C08,
-	4971:  0x5C0D,
-	4972:  0x5C13,
-	4973:  0x5C20,
-	4974:  0x5C22,
-	4975:  0x5C28,
-	4976:  0x5C38,
-	4977:  0x5C39,
-	4978:  0x5C41,
-	4979:  0x5C46,
-	4980:  0x5C4E,
-	4981:  0x5C53,
-	4982:  0x5C50,
-	4983:  0x5C4F,
-	4984:  0x5B71,
-	4985:  0x5C6C,
-	4986:  0x5C6E,
-	4987:  0x4E62,
-	4988:  0x5C76,
-	4989:  0x5C79,
-	4990:  0x5C8C,
-	4991:  0x5C91,
-	4992:  0x5C94,
-	4993:  0x599B,
-	4994:  0x5CAB,
-	4995:  0x5CBB,
-	4996:  0x5CB6,
-	4997:  0x5CBC,
-	4998:  0x5CB7,
-	4999:  0x5CC5,
-	5000:  0x5CBE,
-	5001:  0x5CC7,
-	5002:  0x5CD9,
-	5003:  0x5CE9,
-	5004:  0x5CFD,
-	5005:  0x5CFA,
-	5006:  0x5CED,
-	5007:  0x5D8C,
-	5008:  0x5CEA,
-	5009:  0x5D0B,
-	5010:  0x5D15,
-	5011:  0x5D17,
-	5012:  0x5D5C,
-	5013:  0x5D1F,
-	5014:  0x5D1B,
-	5015:  0x5D11,
-	5016:  0x5D14,
-	5017:  0x5D22,
-	5018:  0x5D1A,
-	5019:  0x5D19,
-	5020:  0x5D18,
-	5021:  0x5D4C,
-	5022:  0x5D52,
-	5023:  0x5D4E,
-	5024:  0x5D4B,
-	5025:  0x5D6C,
-	5026:  0x5D73,
-	5027:  0x5D76,
-	5028:  0x5D87,
-	5029:  0x5D84,
-	5030:  0x5D82,
-	5031:  0x5DA2,
-	5032:  0x5D9D,
-	5033:  0x5DAC,
-	5034:  0x5DAE,
-	5035:  0x5DBD,
-	5036:  0x5D90,
-	5037:  0x5DB7,
-	5038:  0x5DBC,
-	5039:  0x5DC9,
-	5040:  0x5DCD,
-	5041:  0x5DD3,
-	5042:  0x5DD2,
-	5043:  0x5DD6,
-	5044:  0x5DDB,
-	5045:  0x5DEB,
-	5046:  0x5DF2,
-	5047:  0x5DF5,
-	5048:  0x5E0B,
-	5049:  0x5E1A,
-	5050:  0x5E19,
-	5051:  0x5E11,
-	5052:  0x5E1B,
-	5053:  0x5E36,
-	5054:  0x5E37,
-	5055:  0x5E44,
-	5056:  0x5E43,
-	5057:  0x5E40,
-	5058:  0x5E4E,
-	5059:  0x5E57,
-	5060:  0x5E54,
-	5061:  0x5E5F,
-	5062:  0x5E62,
-	5063:  0x5E64,
-	5064:  0x5E47,
-	5065:  0x5E75,
-	5066:  0x5E76,
-	5067:  0x5E7A,
-	5068:  0x9EBC,
-	5069:  0x5E7F,
-	5070:  0x5EA0,
-	5071:  0x5EC1,
-	5072:  0x5EC2,
-	5073:  0x5EC8,
-	5074:  0x5ED0,
-	5075:  0x5ECF,
-	5076:  0x5ED6,
-	5077:  0x5EE3,
-	5078:  0x5EDD,
-	5079:  0x5EDA,
-	5080:  0x5EDB,
-	5081:  0x5EE2,
-	5082:  0x5EE1,
-	5083:  0x5EE8,
-	5084:  0x5EE9,
-	5085:  0x5EEC,
-	5086:  0x5EF1,
-	5087:  0x5EF3,
-	5088:  0x5EF0,
-	5089:  0x5EF4,
-	5090:  0x5EF8,
-	5091:  0x5EFE,
-	5092:  0x5F03,
-	5093:  0x5F09,
-	5094:  0x5F5D,
-	5095:  0x5F5C,
-	5096:  0x5F0B,
-	5097:  0x5F11,
-	5098:  0x5F16,
-	5099:  0x5F29,
-	5100:  0x5F2D,
-	5101:  0x5F38,
-	5102:  0x5F41,
-	5103:  0x5F48,
-	5104:  0x5F4C,
-	5105:  0x5F4E,
-	5106:  0x5F2F,
-	5107:  0x5F51,
-	5108:  0x5F56,
-	5109:  0x5F57,
-	5110:  0x5F59,
-	5111:  0x5F61,
-	5112:  0x5F6D,
-	5113:  0x5F73,
-	5114:  0x5F77,
-	5115:  0x5F83,
-	5116:  0x5F82,
-	5117:  0x5F7F,
-	5118:  0x5F8A,
-	5119:  0x5F88,
-	5120:  0x5F91,
-	5121:  0x5F87,
-	5122:  0x5F9E,
-	5123:  0x5F99,
-	5124:  0x5F98,
-	5125:  0x5FA0,
-	5126:  0x5FA8,
-	5127:  0x5FAD,
-	5128:  0x5FBC,
-	5129:  0x5FD6,
-	5130:  0x5FFB,
-	5131:  0x5FE4,
-	5132:  0x5FF8,
-	5133:  0x5FF1,
-	5134:  0x5FDD,
-	5135:  0x60B3,
-	5136:  0x5FFF,
-	5137:  0x6021,
-	5138:  0x6060,
-	5139:  0x6019,
-	5140:  0x6010,
-	5141:  0x6029,
-	5142:  0x600E,
-	5143:  0x6031,
-	5144:  0x601B,
-	5145:  0x6015,
-	5146:  0x602B,
-	5147:  0x6026,
-	5148:  0x600F,
-	5149:  0x603A,
-	5150:  0x605A,
-	5151:  0x6041,
-	5152:  0x606A,
-	5153:  0x6077,
-	5154:  0x605F,
-	5155:  0x604A,
-	5156:  0x6046,
-	5157:  0x604D,
-	5158:  0x6063,
-	5159:  0x6043,
-	5160:  0x6064,
-	5161:  0x6042,
-	5162:  0x606C,
-	5163:  0x606B,
-	5164:  0x6059,
-	5165:  0x6081,
-	5166:  0x608D,
-	5167:  0x60E7,
-	5168:  0x6083,
-	5169:  0x609A,
-	5170:  0x6084,
-	5171:  0x609B,
-	5172:  0x6096,
-	5173:  0x6097,
-	5174:  0x6092,
-	5175:  0x60A7,
-	5176:  0x608B,
-	5177:  0x60E1,
-	5178:  0x60B8,
-	5179:  0x60E0,
-	5180:  0x60D3,
-	5181:  0x60B4,
-	5182:  0x5FF0,
-	5183:  0x60BD,
-	5184:  0x60C6,
-	5185:  0x60B5,
-	5186:  0x60D8,
-	5187:  0x614D,
-	5188:  0x6115,
-	5189:  0x6106,
-	5190:  0x60F6,
-	5191:  0x60F7,
-	5192:  0x6100,
-	5193:  0x60F4,
-	5194:  0x60FA,
-	5195:  0x6103,
-	5196:  0x6121,
-	5197:  0x60FB,
-	5198:  0x60F1,
-	5199:  0x610D,
-	5200:  0x610E,
-	5201:  0x6147,
-	5202:  0x613E,
-	5203:  0x6128,
-	5204:  0x6127,
-	5205:  0x614A,
-	5206:  0x613F,
-	5207:  0x613C,
-	5208:  0x612C,
-	5209:  0x6134,
-	5210:  0x613D,
-	5211:  0x6142,
-	5212:  0x6144,
-	5213:  0x6173,
-	5214:  0x6177,
-	5215:  0x6158,
-	5216:  0x6159,
-	5217:  0x615A,
-	5218:  0x616B,
-	5219:  0x6174,
-	5220:  0x616F,
-	5221:  0x6165,
-	5222:  0x6171,
-	5223:  0x615F,
-	5224:  0x615D,
-	5225:  0x6153,
-	5226:  0x6175,
-	5227:  0x6199,
-	5228:  0x6196,
-	5229:  0x6187,
-	5230:  0x61AC,
-	5231:  0x6194,
-	5232:  0x619A,
-	5233:  0x618A,
-	5234:  0x6191,
-	5235:  0x61AB,
-	5236:  0x61AE,
-	5237:  0x61CC,
-	5238:  0x61CA,
-	5239:  0x61C9,
-	5240:  0x61F7,
-	5241:  0x61C8,
-	5242:  0x61C3,
-	5243:  0x61C6,
-	5244:  0x61BA,
-	5245:  0x61CB,
-	5246:  0x7F79,
-	5247:  0x61CD,
-	5248:  0x61E6,
-	5249:  0x61E3,
-	5250:  0x61F6,
-	5251:  0x61FA,
-	5252:  0x61F4,
-	5253:  0x61FF,
-	5254:  0x61FD,
-	5255:  0x61FC,
-	5256:  0x61FE,
-	5257:  0x6200,
-	5258:  0x6208,
-	5259:  0x6209,
-	5260:  0x620D,
-	5261:  0x620C,
-	5262:  0x6214,
-	5263:  0x621B,
-	5264:  0x621E,
-	5265:  0x6221,
-	5266:  0x622A,
-	5267:  0x622E,
-	5268:  0x6230,
-	5269:  0x6232,
-	5270:  0x6233,
-	5271:  0x6241,
-	5272:  0x624E,
-	5273:  0x625E,
-	5274:  0x6263,
-	5275:  0x625B,
-	5276:  0x6260,
-	5277:  0x6268,
-	5278:  0x627C,
-	5279:  0x6282,
-	5280:  0x6289,
-	5281:  0x627E,
-	5282:  0x6292,
-	5283:  0x6293,
-	5284:  0x6296,
-	5285:  0x62D4,
-	5286:  0x6283,
-	5287:  0x6294,
-	5288:  0x62D7,
-	5289:  0x62D1,
-	5290:  0x62BB,
-	5291:  0x62CF,
-	5292:  0x62FF,
-	5293:  0x62C6,
-	5294:  0x64D4,
-	5295:  0x62C8,
-	5296:  0x62DC,
-	5297:  0x62CC,
-	5298:  0x62CA,
-	5299:  0x62C2,
-	5300:  0x62C7,
-	5301:  0x629B,
-	5302:  0x62C9,
-	5303:  0x630C,
-	5304:  0x62EE,
-	5305:  0x62F1,
-	5306:  0x6327,
-	5307:  0x6302,
-	5308:  0x6308,
-	5309:  0x62EF,
-	5310:  0x62F5,
-	5311:  0x6350,
-	5312:  0x633E,
-	5313:  0x634D,
-	5314:  0x641C,
-	5315:  0x634F,
-	5316:  0x6396,
-	5317:  0x638E,
-	5318:  0x6380,
-	5319:  0x63AB,
-	5320:  0x6376,
-	5321:  0x63A3,
-	5322:  0x638F,
-	5323:  0x6389,
-	5324:  0x639F,
-	5325:  0x63B5,
-	5326:  0x636B,
-	5327:  0x6369,
-	5328:  0x63BE,
-	5329:  0x63E9,
-	5330:  0x63C0,
-	5331:  0x63C6,
-	5332:  0x63E3,
-	5333:  0x63C9,
-	5334:  0x63D2,
-	5335:  0x63F6,
-	5336:  0x63C4,
-	5337:  0x6416,
-	5338:  0x6434,
-	5339:  0x6406,
-	5340:  0x6413,
-	5341:  0x6426,
-	5342:  0x6436,
-	5343:  0x651D,
-	5344:  0x6417,
-	5345:  0x6428,
-	5346:  0x640F,
-	5347:  0x6467,
-	5348:  0x646F,
-	5349:  0x6476,
-	5350:  0x644E,
-	5351:  0x652A,
-	5352:  0x6495,
-	5353:  0x6493,
-	5354:  0x64A5,
-	5355:  0x64A9,
-	5356:  0x6488,
-	5357:  0x64BC,
-	5358:  0x64DA,
-	5359:  0x64D2,
-	5360:  0x64C5,
-	5361:  0x64C7,
-	5362:  0x64BB,
-	5363:  0x64D8,
-	5364:  0x64C2,
-	5365:  0x64F1,
-	5366:  0x64E7,
-	5367:  0x8209,
-	5368:  0x64E0,
-	5369:  0x64E1,
-	5370:  0x62AC,
-	5371:  0x64E3,
-	5372:  0x64EF,
-	5373:  0x652C,
-	5374:  0x64F6,
-	5375:  0x64F4,
-	5376:  0x64F2,
-	5377:  0x64FA,
-	5378:  0x6500,
-	5379:  0x64FD,
-	5380:  0x6518,
-	5381:  0x651C,
-	5382:  0x6505,
-	5383:  0x6524,
-	5384:  0x6523,
-	5385:  0x652B,
-	5386:  0x6534,
-	5387:  0x6535,
-	5388:  0x6537,
-	5389:  0x6536,
-	5390:  0x6538,
-	5391:  0x754B,
-	5392:  0x6548,
-	5393:  0x6556,
-	5394:  0x6555,
-	5395:  0x654D,
-	5396:  0x6558,
-	5397:  0x655E,
-	5398:  0x655D,
-	5399:  0x6572,
-	5400:  0x6578,
-	5401:  0x6582,
-	5402:  0x6583,
-	5403:  0x8B8A,
-	5404:  0x659B,
-	5405:  0x659F,
-	5406:  0x65AB,
-	5407:  0x65B7,
-	5408:  0x65C3,
-	5409:  0x65C6,
-	5410:  0x65C1,
-	5411:  0x65C4,
-	5412:  0x65CC,
-	5413:  0x65D2,
-	5414:  0x65DB,
-	5415:  0x65D9,
-	5416:  0x65E0,
-	5417:  0x65E1,
-	5418:  0x65F1,
-	5419:  0x6772,
-	5420:  0x660A,
-	5421:  0x6603,
-	5422:  0x65FB,
-	5423:  0x6773,
-	5424:  0x6635,
-	5425:  0x6636,
-	5426:  0x6634,
-	5427:  0x661C,
-	5428:  0x664F,
-	5429:  0x6644,
-	5430:  0x6649,
-	5431:  0x6641,
-	5432:  0x665E,
-	5433:  0x665D,
-	5434:  0x6664,
-	5435:  0x6667,
-	5436:  0x6668,
-	5437:  0x665F,
-	5438:  0x6662,
-	5439:  0x6670,
-	5440:  0x6683,
-	5441:  0x6688,
-	5442:  0x668E,
-	5443:  0x6689,
-	5444:  0x6684,
-	5445:  0x6698,
-	5446:  0x669D,
-	5447:  0x66C1,
-	5448:  0x66B9,
-	5449:  0x66C9,
-	5450:  0x66BE,
-	5451:  0x66BC,
-	5452:  0x66C4,
-	5453:  0x66B8,
-	5454:  0x66D6,
-	5455:  0x66DA,
-	5456:  0x66E0,
-	5457:  0x663F,
-	5458:  0x66E6,
-	5459:  0x66E9,
-	5460:  0x66F0,
-	5461:  0x66F5,
-	5462:  0x66F7,
-	5463:  0x670F,
-	5464:  0x6716,
-	5465:  0x671E,
-	5466:  0x6726,
-	5467:  0x6727,
-	5468:  0x9738,
-	5469:  0x672E,
-	5470:  0x673F,
-	5471:  0x6736,
-	5472:  0x6741,
-	5473:  0x6738,
-	5474:  0x6737,
-	5475:  0x6746,
-	5476:  0x675E,
-	5477:  0x6760,
-	5478:  0x6759,
-	5479:  0x6763,
-	5480:  0x6764,
-	5481:  0x6789,
-	5482:  0x6770,
-	5483:  0x67A9,
-	5484:  0x677C,
-	5485:  0x676A,
-	5486:  0x678C,
-	5487:  0x678B,
-	5488:  0x67A6,
-	5489:  0x67A1,
-	5490:  0x6785,
-	5491:  0x67B7,
-	5492:  0x67EF,
-	5493:  0x67B4,
-	5494:  0x67EC,
-	5495:  0x67B3,
-	5496:  0x67E9,
-	5497:  0x67B8,
-	5498:  0x67E4,
-	5499:  0x67DE,
-	5500:  0x67DD,
-	5501:  0x67E2,
-	5502:  0x67EE,
-	5503:  0x67B9,
-	5504:  0x67CE,
-	5505:  0x67C6,
-	5506:  0x67E7,
-	5507:  0x6A9C,
-	5508:  0x681E,
-	5509:  0x6846,
-	5510:  0x6829,
-	5511:  0x6840,
-	5512:  0x684D,
-	5513:  0x6832,
-	5514:  0x684E,
-	5515:  0x68B3,
-	5516:  0x682B,
-	5517:  0x6859,
-	5518:  0x6863,
-	5519:  0x6877,
-	5520:  0x687F,
-	5521:  0x689F,
-	5522:  0x688F,
-	5523:  0x68AD,
-	5524:  0x6894,
-	5525:  0x689D,
-	5526:  0x689B,
-	5527:  0x6883,
-	5528:  0x6AAE,
-	5529:  0x68B9,
-	5530:  0x6874,
-	5531:  0x68B5,
-	5532:  0x68A0,
-	5533:  0x68BA,
-	5534:  0x690F,
-	5535:  0x688D,
-	5536:  0x687E,
-	5537:  0x6901,
-	5538:  0x68CA,
-	5539:  0x6908,
-	5540:  0x68D8,
-	5541:  0x6922,
-	5542:  0x6926,
-	5543:  0x68E1,
-	5544:  0x690C,
-	5545:  0x68CD,
-	5546:  0x68D4,
-	5547:  0x68E7,
-	5548:  0x68D5,
-	5549:  0x6936,
-	5550:  0x6912,
-	5551:  0x6904,
-	5552:  0x68D7,
-	5553:  0x68E3,
-	5554:  0x6925,
-	5555:  0x68F9,
-	5556:  0x68E0,
-	5557:  0x68EF,
-	5558:  0x6928,
-	5559:  0x692A,
-	5560:  0x691A,
-	5561:  0x6923,
-	5562:  0x6921,
-	5563:  0x68C6,
-	5564:  0x6979,
-	5565:  0x6977,
-	5566:  0x695C,
-	5567:  0x6978,
-	5568:  0x696B,
-	5569:  0x6954,
-	5570:  0x697E,
-	5571:  0x696E,
-	5572:  0x6939,
-	5573:  0x6974,
-	5574:  0x693D,
-	5575:  0x6959,
-	5576:  0x6930,
-	5577:  0x6961,
-	5578:  0x695E,
-	5579:  0x695D,
-	5580:  0x6981,
-	5581:  0x696A,
-	5582:  0x69B2,
-	5583:  0x69AE,
-	5584:  0x69D0,
-	5585:  0x69BF,
-	5586:  0x69C1,
-	5587:  0x69D3,
-	5588:  0x69BE,
-	5589:  0x69CE,
-	5590:  0x5BE8,
-	5591:  0x69CA,
-	5592:  0x69DD,
-	5593:  0x69BB,
-	5594:  0x69C3,
-	5595:  0x69A7,
-	5596:  0x6A2E,
-	5597:  0x6991,
-	5598:  0x69A0,
-	5599:  0x699C,
-	5600:  0x6995,
-	5601:  0x69B4,
-	5602:  0x69DE,
-	5603:  0x69E8,
-	5604:  0x6A02,
-	5605:  0x6A1B,
-	5606:  0x69FF,
-	5607:  0x6B0A,
-	5608:  0x69F9,
-	5609:  0x69F2,
-	5610:  0x69E7,
-	5611:  0x6A05,
-	5612:  0x69B1,
-	5613:  0x6A1E,
-	5614:  0x69ED,
-	5615:  0x6A14,
-	5616:  0x69EB,
-	5617:  0x6A0A,
-	5618:  0x6A12,
-	5619:  0x6AC1,
-	5620:  0x6A23,
-	5621:  0x6A13,
-	5622:  0x6A44,
-	5623:  0x6A0C,
-	5624:  0x6A72,
-	5625:  0x6A36,
-	5626:  0x6A78,
-	5627:  0x6A47,
-	5628:  0x6A62,
-	5629:  0x6A59,
-	5630:  0x6A66,
-	5631:  0x6A48,
-	5632:  0x6A38,
-	5633:  0x6A22,
-	5634:  0x6A90,
-	5635:  0x6A8D,
-	5636:  0x6AA0,
-	5637:  0x6A84,
-	5638:  0x6AA2,
-	5639:  0x6AA3,
-	5640:  0x6A97,
-	5641:  0x8617,
-	5642:  0x6ABB,
-	5643:  0x6AC3,
-	5644:  0x6AC2,
-	5645:  0x6AB8,
-	5646:  0x6AB3,
-	5647:  0x6AAC,
-	5648:  0x6ADE,
-	5649:  0x6AD1,
-	5650:  0x6ADF,
-	5651:  0x6AAA,
-	5652:  0x6ADA,
-	5653:  0x6AEA,
-	5654:  0x6AFB,
-	5655:  0x6B05,
-	5656:  0x8616,
-	5657:  0x6AFA,
-	5658:  0x6B12,
-	5659:  0x6B16,
-	5660:  0x9B31,
-	5661:  0x6B1F,
-	5662:  0x6B38,
-	5663:  0x6B37,
-	5664:  0x76DC,
-	5665:  0x6B39,
-	5666:  0x98EE,
-	5667:  0x6B47,
-	5668:  0x6B43,
-	5669:  0x6B49,
-	5670:  0x6B50,
-	5671:  0x6B59,
-	5672:  0x6B54,
-	5673:  0x6B5B,
-	5674:  0x6B5F,
-	5675:  0x6B61,
-	5676:  0x6B78,
-	5677:  0x6B79,
-	5678:  0x6B7F,
-	5679:  0x6B80,
-	5680:  0x6B84,
-	5681:  0x6B83,
-	5682:  0x6B8D,
-	5683:  0x6B98,
-	5684:  0x6B95,
-	5685:  0x6B9E,
-	5686:  0x6BA4,
-	5687:  0x6BAA,
-	5688:  0x6BAB,
-	5689:  0x6BAF,
-	5690:  0x6BB2,
-	5691:  0x6BB1,
-	5692:  0x6BB3,
-	5693:  0x6BB7,
-	5694:  0x6BBC,
-	5695:  0x6BC6,
-	5696:  0x6BCB,
-	5697:  0x6BD3,
-	5698:  0x6BDF,
-	5699:  0x6BEC,
-	5700:  0x6BEB,
-	5701:  0x6BF3,
-	5702:  0x6BEF,
-	5703:  0x9EBE,
-	5704:  0x6C08,
-	5705:  0x6C13,
-	5706:  0x6C14,
-	5707:  0x6C1B,
-	5708:  0x6C24,
-	5709:  0x6C23,
-	5710:  0x6C5E,
-	5711:  0x6C55,
-	5712:  0x6C62,
-	5713:  0x6C6A,
-	5714:  0x6C82,
-	5715:  0x6C8D,
-	5716:  0x6C9A,
-	5717:  0x6C81,
-	5718:  0x6C9B,
-	5719:  0x6C7E,
-	5720:  0x6C68,
-	5721:  0x6C73,
-	5722:  0x6C92,
-	5723:  0x6C90,
-	5724:  0x6CC4,
-	5725:  0x6CF1,
-	5726:  0x6CD3,
-	5727:  0x6CBD,
-	5728:  0x6CD7,
-	5729:  0x6CC5,
-	5730:  0x6CDD,
-	5731:  0x6CAE,
-	5732:  0x6CB1,
-	5733:  0x6CBE,
-	5734:  0x6CBA,
-	5735:  0x6CDB,
-	5736:  0x6CEF,
-	5737:  0x6CD9,
-	5738:  0x6CEA,
-	5739:  0x6D1F,
-	5740:  0x884D,
-	5741:  0x6D36,
-	5742:  0x6D2B,
-	5743:  0x6D3D,
-	5744:  0x6D38,
-	5745:  0x6D19,
-	5746:  0x6D35,
-	5747:  0x6D33,
-	5748:  0x6D12,
-	5749:  0x6D0C,
-	5750:  0x6D63,
-	5751:  0x6D93,
-	5752:  0x6D64,
-	5753:  0x6D5A,
-	5754:  0x6D79,
-	5755:  0x6D59,
-	5756:  0x6D8E,
-	5757:  0x6D95,
-	5758:  0x6FE4,
-	5759:  0x6D85,
-	5760:  0x6DF9,
-	5761:  0x6E15,
-	5762:  0x6E0A,
-	5763:  0x6DB5,
-	5764:  0x6DC7,
-	5765:  0x6DE6,
-	5766:  0x6DB8,
-	5767:  0x6DC6,
-	5768:  0x6DEC,
-	5769:  0x6DDE,
-	5770:  0x6DCC,
-	5771:  0x6DE8,
-	5772:  0x6DD2,
-	5773:  0x6DC5,
-	5774:  0x6DFA,
-	5775:  0x6DD9,
-	5776:  0x6DE4,
-	5777:  0x6DD5,
-	5778:  0x6DEA,
-	5779:  0x6DEE,
-	5780:  0x6E2D,
-	5781:  0x6E6E,
-	5782:  0x6E2E,
-	5783:  0x6E19,
-	5784:  0x6E72,
-	5785:  0x6E5F,
-	5786:  0x6E3E,
-	5787:  0x6E23,
-	5788:  0x6E6B,
-	5789:  0x6E2B,
-	5790:  0x6E76,
-	5791:  0x6E4D,
-	5792:  0x6E1F,
-	5793:  0x6E43,
-	5794:  0x6E3A,
-	5795:  0x6E4E,
-	5796:  0x6E24,
-	5797:  0x6EFF,
-	5798:  0x6E1D,
-	5799:  0x6E38,
-	5800:  0x6E82,
-	5801:  0x6EAA,
-	5802:  0x6E98,
-	5803:  0x6EC9,
-	5804:  0x6EB7,
-	5805:  0x6ED3,
-	5806:  0x6EBD,
-	5807:  0x6EAF,
-	5808:  0x6EC4,
-	5809:  0x6EB2,
-	5810:  0x6ED4,
-	5811:  0x6ED5,
-	5812:  0x6E8F,
-	5813:  0x6EA5,
-	5814:  0x6EC2,
-	5815:  0x6E9F,
-	5816:  0x6F41,
-	5817:  0x6F11,
-	5818:  0x704C,
-	5819:  0x6EEC,
-	5820:  0x6EF8,
-	5821:  0x6EFE,
-	5822:  0x6F3F,
-	5823:  0x6EF2,
-	5824:  0x6F31,
-	5825:  0x6EEF,
-	5826:  0x6F32,
-	5827:  0x6ECC,
-	5828:  0x6F3E,
-	5829:  0x6F13,
-	5830:  0x6EF7,
-	5831:  0x6F86,
-	5832:  0x6F7A,
-	5833:  0x6F78,
-	5834:  0x6F81,
-	5835:  0x6F80,
-	5836:  0x6F6F,
-	5837:  0x6F5B,
-	5838:  0x6FF3,
-	5839:  0x6F6D,
-	5840:  0x6F82,
-	5841:  0x6F7C,
-	5842:  0x6F58,
-	5843:  0x6F8E,
-	5844:  0x6F91,
-	5845:  0x6FC2,
-	5846:  0x6F66,
-	5847:  0x6FB3,
-	5848:  0x6FA3,
-	5849:  0x6FA1,
-	5850:  0x6FA4,
-	5851:  0x6FB9,
-	5852:  0x6FC6,
-	5853:  0x6FAA,
-	5854:  0x6FDF,
-	5855:  0x6FD5,
-	5856:  0x6FEC,
-	5857:  0x6FD4,
-	5858:  0x6FD8,
-	5859:  0x6FF1,
-	5860:  0x6FEE,
-	5861:  0x6FDB,
-	5862:  0x7009,
-	5863:  0x700B,
-	5864:  0x6FFA,
-	5865:  0x7011,
-	5866:  0x7001,
-	5867:  0x700F,
-	5868:  0x6FFE,
-	5869:  0x701B,
-	5870:  0x701A,
-	5871:  0x6F74,
-	5872:  0x701D,
-	5873:  0x7018,
-	5874:  0x701F,
-	5875:  0x7030,
-	5876:  0x703E,
-	5877:  0x7032,
-	5878:  0x7051,
-	5879:  0x7063,
-	5880:  0x7099,
-	5881:  0x7092,
-	5882:  0x70AF,
-	5883:  0x70F1,
-	5884:  0x70AC,
-	5885:  0x70B8,
-	5886:  0x70B3,
-	5887:  0x70AE,
-	5888:  0x70DF,
-	5889:  0x70CB,
-	5890:  0x70DD,
-	5891:  0x70D9,
-	5892:  0x7109,
-	5893:  0x70FD,
-	5894:  0x711C,
-	5895:  0x7119,
-	5896:  0x7165,
-	5897:  0x7155,
-	5898:  0x7188,
-	5899:  0x7166,
-	5900:  0x7162,
-	5901:  0x714C,
-	5902:  0x7156,
-	5903:  0x716C,
-	5904:  0x718F,
-	5905:  0x71FB,
-	5906:  0x7184,
-	5907:  0x7195,
-	5908:  0x71A8,
-	5909:  0x71AC,
-	5910:  0x71D7,
-	5911:  0x71B9,
-	5912:  0x71BE,
-	5913:  0x71D2,
-	5914:  0x71C9,
-	5915:  0x71D4,
-	5916:  0x71CE,
-	5917:  0x71E0,
-	5918:  0x71EC,
-	5919:  0x71E7,
-	5920:  0x71F5,
-	5921:  0x71FC,
-	5922:  0x71F9,
-	5923:  0x71FF,
-	5924:  0x720D,
-	5925:  0x7210,
-	5926:  0x721B,
-	5927:  0x7228,
-	5928:  0x722D,
-	5929:  0x722C,
-	5930:  0x7230,
-	5931:  0x7232,
-	5932:  0x723B,
-	5933:  0x723C,
-	5934:  0x723F,
-	5935:  0x7240,
-	5936:  0x7246,
-	5937:  0x724B,
-	5938:  0x7258,
-	5939:  0x7274,
-	5940:  0x727E,
-	5941:  0x7282,
-	5942:  0x7281,
-	5943:  0x7287,
-	5944:  0x7292,
-	5945:  0x7296,
-	5946:  0x72A2,
-	5947:  0x72A7,
-	5948:  0x72B9,
-	5949:  0x72B2,
-	5950:  0x72C3,
-	5951:  0x72C6,
-	5952:  0x72C4,
-	5953:  0x72CE,
-	5954:  0x72D2,
-	5955:  0x72E2,
-	5956:  0x72E0,
-	5957:  0x72E1,
-	5958:  0x72F9,
-	5959:  0x72F7,
-	5960:  0x500F,
-	5961:  0x7317,
-	5962:  0x730A,
-	5963:  0x731C,
-	5964:  0x7316,
-	5965:  0x731D,
-	5966:  0x7334,
-	5967:  0x732F,
-	5968:  0x7329,
-	5969:  0x7325,
-	5970:  0x733E,
-	5971:  0x734E,
-	5972:  0x734F,
-	5973:  0x9ED8,
-	5974:  0x7357,
-	5975:  0x736A,
-	5976:  0x7368,
-	5977:  0x7370,
-	5978:  0x7378,
-	5979:  0x7375,
-	5980:  0x737B,
-	5981:  0x737A,
-	5982:  0x73C8,
-	5983:  0x73B3,
-	5984:  0x73CE,
-	5985:  0x73BB,
-	5986:  0x73C0,
-	5987:  0x73E5,
-	5988:  0x73EE,
-	5989:  0x73DE,
-	5990:  0x74A2,
-	5991:  0x7405,
-	5992:  0x746F,
-	5993:  0x7425,
-	5994:  0x73F8,
-	5995:  0x7432,
-	5996:  0x743A,
-	5997:  0x7455,
-	5998:  0x743F,
-	5999:  0x745F,
-	6000:  0x7459,
-	6001:  0x7441,
-	6002:  0x745C,
-	6003:  0x7469,
-	6004:  0x7470,
-	6005:  0x7463,
-	6006:  0x746A,
-	6007:  0x7476,
-	6008:  0x747E,
-	6009:  0x748B,
-	6010:  0x749E,
-	6011:  0x74A7,
-	6012:  0x74CA,
-	6013:  0x74CF,
-	6014:  0x74D4,
-	6015:  0x73F1,
-	6016:  0x74E0,
-	6017:  0x74E3,
-	6018:  0x74E7,
-	6019:  0x74E9,
-	6020:  0x74EE,
-	6021:  0x74F2,
-	6022:  0x74F0,
-	6023:  0x74F1,
-	6024:  0x74F8,
-	6025:  0x74F7,
-	6026:  0x7504,
-	6027:  0x7503,
-	6028:  0x7505,
-	6029:  0x750C,
-	6030:  0x750E,
-	6031:  0x750D,
-	6032:  0x7515,
-	6033:  0x7513,
-	6034:  0x751E,
-	6035:  0x7526,
-	6036:  0x752C,
-	6037:  0x753C,
-	6038:  0x7544,
-	6039:  0x754D,
-	6040:  0x754A,
-	6041:  0x7549,
-	6042:  0x755B,
-	6043:  0x7546,
-	6044:  0x755A,
-	6045:  0x7569,
-	6046:  0x7564,
-	6047:  0x7567,
-	6048:  0x756B,
-	6049:  0x756D,
-	6050:  0x7578,
-	6051:  0x7576,
-	6052:  0x7586,
-	6053:  0x7587,
-	6054:  0x7574,
-	6055:  0x758A,
-	6056:  0x7589,
-	6057:  0x7582,
-	6058:  0x7594,
-	6059:  0x759A,
-	6060:  0x759D,
-	6061:  0x75A5,
-	6062:  0x75A3,
-	6063:  0x75C2,
-	6064:  0x75B3,
-	6065:  0x75C3,
-	6066:  0x75B5,
-	6067:  0x75BD,
-	6068:  0x75B8,
-	6069:  0x75BC,
-	6070:  0x75B1,
-	6071:  0x75CD,
-	6072:  0x75CA,
-	6073:  0x75D2,
-	6074:  0x75D9,
-	6075:  0x75E3,
-	6076:  0x75DE,
-	6077:  0x75FE,
-	6078:  0x75FF,
-	6079:  0x75FC,
-	6080:  0x7601,
-	6081:  0x75F0,
-	6082:  0x75FA,
-	6083:  0x75F2,
-	6084:  0x75F3,
-	6085:  0x760B,
-	6086:  0x760D,
-	6087:  0x7609,
-	6088:  0x761F,
-	6089:  0x7627,
-	6090:  0x7620,
-	6091:  0x7621,
-	6092:  0x7622,
-	6093:  0x7624,
-	6094:  0x7634,
-	6095:  0x7630,
-	6096:  0x763B,
-	6097:  0x7647,
-	6098:  0x7648,
-	6099:  0x7646,
-	6100:  0x765C,
-	6101:  0x7658,
-	6102:  0x7661,
-	6103:  0x7662,
-	6104:  0x7668,
-	6105:  0x7669,
-	6106:  0x766A,
-	6107:  0x7667,
-	6108:  0x766C,
-	6109:  0x7670,
-	6110:  0x7672,
-	6111:  0x7676,
-	6112:  0x7678,
-	6113:  0x767C,
-	6114:  0x7680,
-	6115:  0x7683,
-	6116:  0x7688,
-	6117:  0x768B,
-	6118:  0x768E,
-	6119:  0x7696,
-	6120:  0x7693,
-	6121:  0x7699,
-	6122:  0x769A,
-	6123:  0x76B0,
-	6124:  0x76B4,
-	6125:  0x76B8,
-	6126:  0x76B9,
-	6127:  0x76BA,
-	6128:  0x76C2,
-	6129:  0x76CD,
-	6130:  0x76D6,
-	6131:  0x76D2,
-	6132:  0x76DE,
-	6133:  0x76E1,
-	6134:  0x76E5,
-	6135:  0x76E7,
-	6136:  0x76EA,
-	6137:  0x862F,
-	6138:  0x76FB,
-	6139:  0x7708,
-	6140:  0x7707,
-	6141:  0x7704,
-	6142:  0x7729,
-	6143:  0x7724,
-	6144:  0x771E,
-	6145:  0x7725,
-	6146:  0x7726,
-	6147:  0x771B,
-	6148:  0x7737,
-	6149:  0x7738,
-	6150:  0x7747,
-	6151:  0x775A,
-	6152:  0x7768,
-	6153:  0x776B,
-	6154:  0x775B,
-	6155:  0x7765,
-	6156:  0x777F,
-	6157:  0x777E,
-	6158:  0x7779,
-	6159:  0x778E,
-	6160:  0x778B,
-	6161:  0x7791,
-	6162:  0x77A0,
-	6163:  0x779E,
-	6164:  0x77B0,
-	6165:  0x77B6,
-	6166:  0x77B9,
-	6167:  0x77BF,
-	6168:  0x77BC,
-	6169:  0x77BD,
-	6170:  0x77BB,
-	6171:  0x77C7,
-	6172:  0x77CD,
-	6173:  0x77D7,
-	6174:  0x77DA,
-	6175:  0x77DC,
-	6176:  0x77E3,
-	6177:  0x77EE,
-	6178:  0x77FC,
-	6179:  0x780C,
-	6180:  0x7812,
-	6181:  0x7926,
-	6182:  0x7820,
-	6183:  0x792A,
-	6184:  0x7845,
-	6185:  0x788E,
-	6186:  0x7874,
-	6187:  0x7886,
-	6188:  0x787C,
-	6189:  0x789A,
-	6190:  0x788C,
-	6191:  0x78A3,
-	6192:  0x78B5,
-	6193:  0x78AA,
-	6194:  0x78AF,
-	6195:  0x78D1,
-	6196:  0x78C6,
-	6197:  0x78CB,
-	6198:  0x78D4,
-	6199:  0x78BE,
-	6200:  0x78BC,
-	6201:  0x78C5,
-	6202:  0x78CA,
-	6203:  0x78EC,
-	6204:  0x78E7,
-	6205:  0x78DA,
-	6206:  0x78FD,
-	6207:  0x78F4,
-	6208:  0x7907,
-	6209:  0x7912,
-	6210:  0x7911,
-	6211:  0x7919,
-	6212:  0x792C,
-	6213:  0x792B,
-	6214:  0x7940,
-	6215:  0x7960,
-	6216:  0x7957,
-	6217:  0x795F,
-	6218:  0x795A,
-	6219:  0x7955,
-	6220:  0x7953,
-	6221:  0x797A,
-	6222:  0x797F,
-	6223:  0x798A,
-	6224:  0x799D,
-	6225:  0x79A7,
-	6226:  0x9F4B,
-	6227:  0x79AA,
-	6228:  0x79AE,
-	6229:  0x79B3,
-	6230:  0x79B9,
-	6231:  0x79BA,
-	6232:  0x79C9,
-	6233:  0x79D5,
-	6234:  0x79E7,
-	6235:  0x79EC,
-	6236:  0x79E1,
-	6237:  0x79E3,
-	6238:  0x7A08,
-	6239:  0x7A0D,
-	6240:  0x7A18,
-	6241:  0x7A19,
-	6242:  0x7A20,
-	6243:  0x7A1F,
-	6244:  0x7980,
-	6245:  0x7A31,
-	6246:  0x7A3B,
-	6247:  0x7A3E,
-	6248:  0x7A37,
-	6249:  0x7A43,
-	6250:  0x7A57,
-	6251:  0x7A49,
-	6252:  0x7A61,
-	6253:  0x7A62,
-	6254:  0x7A69,
-	6255:  0x9F9D,
-	6256:  0x7A70,
-	6257:  0x7A79,
-	6258:  0x7A7D,
-	6259:  0x7A88,
-	6260:  0x7A97,
-	6261:  0x7A95,
-	6262:  0x7A98,
-	6263:  0x7A96,
-	6264:  0x7AA9,
-	6265:  0x7AC8,
-	6266:  0x7AB0,
-	6267:  0x7AB6,
-	6268:  0x7AC5,
-	6269:  0x7AC4,
-	6270:  0x7ABF,
-	6271:  0x9083,
-	6272:  0x7AC7,
-	6273:  0x7ACA,
-	6274:  0x7ACD,
-	6275:  0x7ACF,
-	6276:  0x7AD5,
-	6277:  0x7AD3,
-	6278:  0x7AD9,
-	6279:  0x7ADA,
-	6280:  0x7ADD,
-	6281:  0x7AE1,
-	6282:  0x7AE2,
-	6283:  0x7AE6,
-	6284:  0x7AED,
-	6285:  0x7AF0,
-	6286:  0x7B02,
-	6287:  0x7B0F,
-	6288:  0x7B0A,
-	6289:  0x7B06,
-	6290:  0x7B33,
-	6291:  0x7B18,
-	6292:  0x7B19,
-	6293:  0x7B1E,
-	6294:  0x7B35,
-	6295:  0x7B28,
-	6296:  0x7B36,
-	6297:  0x7B50,
-	6298:  0x7B7A,
-	6299:  0x7B04,
-	6300:  0x7B4D,
-	6301:  0x7B0B,
-	6302:  0x7B4C,
-	6303:  0x7B45,
-	6304:  0x7B75,
-	6305:  0x7B65,
-	6306:  0x7B74,
-	6307:  0x7B67,
-	6308:  0x7B70,
-	6309:  0x7B71,
-	6310:  0x7B6C,
-	6311:  0x7B6E,
-	6312:  0x7B9D,
-	6313:  0x7B98,
-	6314:  0x7B9F,
-	6315:  0x7B8D,
-	6316:  0x7B9C,
-	6317:  0x7B9A,
-	6318:  0x7B8B,
-	6319:  0x7B92,
-	6320:  0x7B8F,
-	6321:  0x7B5D,
-	6322:  0x7B99,
-	6323:  0x7BCB,
-	6324:  0x7BC1,
-	6325:  0x7BCC,
-	6326:  0x7BCF,
-	6327:  0x7BB4,
-	6328:  0x7BC6,
-	6329:  0x7BDD,
-	6330:  0x7BE9,
-	6331:  0x7C11,
-	6332:  0x7C14,
-	6333:  0x7BE6,
-	6334:  0x7BE5,
-	6335:  0x7C60,
-	6336:  0x7C00,
-	6337:  0x7C07,
-	6338:  0x7C13,
-	6339:  0x7BF3,
-	6340:  0x7BF7,
-	6341:  0x7C17,
-	6342:  0x7C0D,
-	6343:  0x7BF6,
-	6344:  0x7C23,
-	6345:  0x7C27,
-	6346:  0x7C2A,
-	6347:  0x7C1F,
-	6348:  0x7C37,
-	6349:  0x7C2B,
-	6350:  0x7C3D,
-	6351:  0x7C4C,
-	6352:  0x7C43,
-	6353:  0x7C54,
-	6354:  0x7C4F,
-	6355:  0x7C40,
-	6356:  0x7C50,
-	6357:  0x7C58,
-	6358:  0x7C5F,
-	6359:  0x7C64,
-	6360:  0x7C56,
-	6361:  0x7C65,
-	6362:  0x7C6C,
-	6363:  0x7C75,
-	6364:  0x7C83,
-	6365:  0x7C90,
-	6366:  0x7CA4,
-	6367:  0x7CAD,
-	6368:  0x7CA2,
-	6369:  0x7CAB,
-	6370:  0x7CA1,
-	6371:  0x7CA8,
-	6372:  0x7CB3,
-	6373:  0x7CB2,
-	6374:  0x7CB1,
-	6375:  0x7CAE,
-	6376:  0x7CB9,
-	6377:  0x7CBD,
-	6378:  0x7CC0,
-	6379:  0x7CC5,
-	6380:  0x7CC2,
-	6381:  0x7CD8,
-	6382:  0x7CD2,
-	6383:  0x7CDC,
-	6384:  0x7CE2,
-	6385:  0x9B3B,
-	6386:  0x7CEF,
-	6387:  0x7CF2,
-	6388:  0x7CF4,
-	6389:  0x7CF6,
-	6390:  0x7CFA,
-	6391:  0x7D06,
-	6392:  0x7D02,
-	6393:  0x7D1C,
-	6394:  0x7D15,
-	6395:  0x7D0A,
-	6396:  0x7D45,
-	6397:  0x7D4B,
-	6398:  0x7D2E,
-	6399:  0x7D32,
-	6400:  0x7D3F,
-	6401:  0x7D35,
-	6402:  0x7D46,
-	6403:  0x7D73,
-	6404:  0x7D56,
-	6405:  0x7D4E,
-	6406:  0x7D72,
-	6407:  0x7D68,
-	6408:  0x7D6E,
-	6409:  0x7D4F,
-	6410:  0x7D63,
-	6411:  0x7D93,
-	6412:  0x7D89,
-	6413:  0x7D5B,
-	6414:  0x7D8F,
-	6415:  0x7D7D,
-	6416:  0x7D9B,
-	6417:  0x7DBA,
-	6418:  0x7DAE,
-	6419:  0x7DA3,
-	6420:  0x7DB5,
-	6421:  0x7DC7,
-	6422:  0x7DBD,
-	6423:  0x7DAB,
-	6424:  0x7E3D,
-	6425:  0x7DA2,
-	6426:  0x7DAF,
-	6427:  0x7DDC,
-	6428:  0x7DB8,
-	6429:  0x7D9F,
-	6430:  0x7DB0,
-	6431:  0x7DD8,
-	6432:  0x7DDD,
-	6433:  0x7DE4,
-	6434:  0x7DDE,
-	6435:  0x7DFB,
-	6436:  0x7DF2,
-	6437:  0x7DE1,
-	6438:  0x7E05,
-	6439:  0x7E0A,
-	6440:  0x7E23,
-	6441:  0x7E21,
-	6442:  0x7E12,
-	6443:  0x7E31,
-	6444:  0x7E1F,
-	6445:  0x7E09,
-	6446:  0x7E0B,
-	6447:  0x7E22,
-	6448:  0x7E46,
-	6449:  0x7E66,
-	6450:  0x7E3B,
-	6451:  0x7E35,
-	6452:  0x7E39,
-	6453:  0x7E43,
-	6454:  0x7E37,
-	6455:  0x7E32,
-	6456:  0x7E3A,
-	6457:  0x7E67,
-	6458:  0x7E5D,
-	6459:  0x7E56,
-	6460:  0x7E5E,
-	6461:  0x7E59,
-	6462:  0x7E5A,
-	6463:  0x7E79,
-	6464:  0x7E6A,
-	6465:  0x7E69,
-	6466:  0x7E7C,
-	6467:  0x7E7B,
-	6468:  0x7E83,
-	6469:  0x7DD5,
-	6470:  0x7E7D,
-	6471:  0x8FAE,
-	6472:  0x7E7F,
-	6473:  0x7E88,
-	6474:  0x7E89,
-	6475:  0x7E8C,
-	6476:  0x7E92,
-	6477:  0x7E90,
-	6478:  0x7E93,
-	6479:  0x7E94,
-	6480:  0x7E96,
-	6481:  0x7E8E,
-	6482:  0x7E9B,
-	6483:  0x7E9C,
-	6484:  0x7F38,
-	6485:  0x7F3A,
-	6486:  0x7F45,
-	6487:  0x7F4C,
-	6488:  0x7F4D,
-	6489:  0x7F4E,
-	6490:  0x7F50,
-	6491:  0x7F51,
-	6492:  0x7F55,
-	6493:  0x7F54,
-	6494:  0x7F58,
-	6495:  0x7F5F,
-	6496:  0x7F60,
-	6497:  0x7F68,
-	6498:  0x7F69,
-	6499:  0x7F67,
-	6500:  0x7F78,
-	6501:  0x7F82,
-	6502:  0x7F86,
-	6503:  0x7F83,
-	6504:  0x7F88,
-	6505:  0x7F87,
-	6506:  0x7F8C,
-	6507:  0x7F94,
-	6508:  0x7F9E,
-	6509:  0x7F9D,
-	6510:  0x7F9A,
-	6511:  0x7FA3,
-	6512:  0x7FAF,
-	6513:  0x7FB2,
-	6514:  0x7FB9,
-	6515:  0x7FAE,
-	6516:  0x7FB6,
-	6517:  0x7FB8,
-	6518:  0x8B71,
-	6519:  0x7FC5,
-	6520:  0x7FC6,
-	6521:  0x7FCA,
-	6522:  0x7FD5,
-	6523:  0x7FD4,
-	6524:  0x7FE1,
-	6525:  0x7FE6,
-	6526:  0x7FE9,
-	6527:  0x7FF3,
-	6528:  0x7FF9,
-	6529:  0x98DC,
-	6530:  0x8006,
-	6531:  0x8004,
-	6532:  0x800B,
-	6533:  0x8012,
-	6534:  0x8018,
-	6535:  0x8019,
-	6536:  0x801C,
-	6537:  0x8021,
-	6538:  0x8028,
-	6539:  0x803F,
-	6540:  0x803B,
-	6541:  0x804A,
-	6542:  0x8046,
-	6543:  0x8052,
-	6544:  0x8058,
-	6545:  0x805A,
-	6546:  0x805F,
-	6547:  0x8062,
-	6548:  0x8068,
-	6549:  0x8073,
-	6550:  0x8072,
-	6551:  0x8070,
-	6552:  0x8076,
-	6553:  0x8079,
-	6554:  0x807D,
-	6555:  0x807F,
-	6556:  0x8084,
-	6557:  0x8086,
-	6558:  0x8085,
-	6559:  0x809B,
-	6560:  0x8093,
-	6561:  0x809A,
-	6562:  0x80AD,
-	6563:  0x5190,
-	6564:  0x80AC,
-	6565:  0x80DB,
-	6566:  0x80E5,
-	6567:  0x80D9,
-	6568:  0x80DD,
-	6569:  0x80C4,
-	6570:  0x80DA,
-	6571:  0x80D6,
-	6572:  0x8109,
-	6573:  0x80EF,
-	6574:  0x80F1,
-	6575:  0x811B,
-	6576:  0x8129,
-	6577:  0x8123,
-	6578:  0x812F,
-	6579:  0x814B,
-	6580:  0x968B,
-	6581:  0x8146,
-	6582:  0x813E,
-	6583:  0x8153,
-	6584:  0x8151,
-	6585:  0x80FC,
-	6586:  0x8171,
-	6587:  0x816E,
-	6588:  0x8165,
-	6589:  0x8166,
-	6590:  0x8174,
-	6591:  0x8183,
-	6592:  0x8188,
-	6593:  0x818A,
-	6594:  0x8180,
-	6595:  0x8182,
-	6596:  0x81A0,
-	6597:  0x8195,
-	6598:  0x81A4,
-	6599:  0x81A3,
-	6600:  0x815F,
-	6601:  0x8193,
-	6602:  0x81A9,
-	6603:  0x81B0,
-	6604:  0x81B5,
-	6605:  0x81BE,
-	6606:  0x81B8,
-	6607:  0x81BD,
-	6608:  0x81C0,
-	6609:  0x81C2,
-	6610:  0x81BA,
-	6611:  0x81C9,
-	6612:  0x81CD,
-	6613:  0x81D1,
-	6614:  0x81D9,
-	6615:  0x81D8,
-	6616:  0x81C8,
-	6617:  0x81DA,
-	6618:  0x81DF,
-	6619:  0x81E0,
-	6620:  0x81E7,
-	6621:  0x81FA,
-	6622:  0x81FB,
-	6623:  0x81FE,
-	6624:  0x8201,
-	6625:  0x8202,
-	6626:  0x8205,
-	6627:  0x8207,
-	6628:  0x820A,
-	6629:  0x820D,
-	6630:  0x8210,
-	6631:  0x8216,
-	6632:  0x8229,
-	6633:  0x822B,
-	6634:  0x8238,
-	6635:  0x8233,
-	6636:  0x8240,
-	6637:  0x8259,
-	6638:  0x8258,
-	6639:  0x825D,
-	6640:  0x825A,
-	6641:  0x825F,
-	6642:  0x8264,
-	6643:  0x8262,
-	6644:  0x8268,
-	6645:  0x826A,
-	6646:  0x826B,
-	6647:  0x822E,
-	6648:  0x8271,
-	6649:  0x8277,
-	6650:  0x8278,
-	6651:  0x827E,
-	6652:  0x828D,
-	6653:  0x8292,
-	6654:  0x82AB,
-	6655:  0x829F,
-	6656:  0x82BB,
-	6657:  0x82AC,
-	6658:  0x82E1,
-	6659:  0x82E3,
-	6660:  0x82DF,
-	6661:  0x82D2,
-	6662:  0x82F4,
-	6663:  0x82F3,
-	6664:  0x82FA,
-	6665:  0x8393,
-	6666:  0x8303,
-	6667:  0x82FB,
-	6668:  0x82F9,
-	6669:  0x82DE,
-	6670:  0x8306,
-	6671:  0x82DC,
-	6672:  0x8309,
-	6673:  0x82D9,
-	6674:  0x8335,
-	6675:  0x8334,
-	6676:  0x8316,
-	6677:  0x8332,
-	6678:  0x8331,
-	6679:  0x8340,
-	6680:  0x8339,
-	6681:  0x8350,
-	6682:  0x8345,
-	6683:  0x832F,
-	6684:  0x832B,
-	6685:  0x8317,
-	6686:  0x8318,
-	6687:  0x8385,
-	6688:  0x839A,
-	6689:  0x83AA,
-	6690:  0x839F,
-	6691:  0x83A2,
-	6692:  0x8396,
-	6693:  0x8323,
-	6694:  0x838E,
-	6695:  0x8387,
-	6696:  0x838A,
-	6697:  0x837C,
-	6698:  0x83B5,
-	6699:  0x8373,
-	6700:  0x8375,
-	6701:  0x83A0,
-	6702:  0x8389,
-	6703:  0x83A8,
-	6704:  0x83F4,
-	6705:  0x8413,
-	6706:  0x83EB,
-	6707:  0x83CE,
-	6708:  0x83FD,
-	6709:  0x8403,
-	6710:  0x83D8,
-	6711:  0x840B,
-	6712:  0x83C1,
-	6713:  0x83F7,
-	6714:  0x8407,
-	6715:  0x83E0,
-	6716:  0x83F2,
-	6717:  0x840D,
-	6718:  0x8422,
-	6719:  0x8420,
-	6720:  0x83BD,
-	6721:  0x8438,
-	6722:  0x8506,
-	6723:  0x83FB,
-	6724:  0x846D,
-	6725:  0x842A,
-	6726:  0x843C,
-	6727:  0x855A,
-	6728:  0x8484,
-	6729:  0x8477,
-	6730:  0x846B,
-	6731:  0x84AD,
-	6732:  0x846E,
-	6733:  0x8482,
-	6734:  0x8469,
-	6735:  0x8446,
-	6736:  0x842C,
-	6737:  0x846F,
-	6738:  0x8479,
-	6739:  0x8435,
-	6740:  0x84CA,
-	6741:  0x8462,
-	6742:  0x84B9,
-	6743:  0x84BF,
-	6744:  0x849F,
-	6745:  0x84D9,
-	6746:  0x84CD,
-	6747:  0x84BB,
-	6748:  0x84DA,
-	6749:  0x84D0,
-	6750:  0x84C1,
-	6751:  0x84C6,
-	6752:  0x84D6,
-	6753:  0x84A1,
-	6754:  0x8521,
-	6755:  0x84FF,
-	6756:  0x84F4,
-	6757:  0x8517,
-	6758:  0x8518,
-	6759:  0x852C,
-	6760:  0x851F,
-	6761:  0x8515,
-	6762:  0x8514,
-	6763:  0x84FC,
-	6764:  0x8540,
-	6765:  0x8563,
-	6766:  0x8558,
-	6767:  0x8548,
-	6768:  0x8541,
-	6769:  0x8602,
-	6770:  0x854B,
-	6771:  0x8555,
-	6772:  0x8580,
-	6773:  0x85A4,
-	6774:  0x8588,
-	6775:  0x8591,
-	6776:  0x858A,
-	6777:  0x85A8,
-	6778:  0x856D,
-	6779:  0x8594,
-	6780:  0x859B,
-	6781:  0x85EA,
-	6782:  0x8587,
-	6783:  0x859C,
-	6784:  0x8577,
-	6785:  0x857E,
-	6786:  0x8590,
-	6787:  0x85C9,
-	6788:  0x85BA,
-	6789:  0x85CF,
-	6790:  0x85B9,
-	6791:  0x85D0,
-	6792:  0x85D5,
-	6793:  0x85DD,
-	6794:  0x85E5,
-	6795:  0x85DC,
-	6796:  0x85F9,
-	6797:  0x860A,
-	6798:  0x8613,
-	6799:  0x860B,
-	6800:  0x85FE,
-	6801:  0x85FA,
-	6802:  0x8606,
-	6803:  0x8622,
-	6804:  0x861A,
-	6805:  0x8630,
-	6806:  0x863F,
-	6807:  0x864D,
-	6808:  0x4E55,
-	6809:  0x8654,
-	6810:  0x865F,
-	6811:  0x8667,
-	6812:  0x8671,
-	6813:  0x8693,
-	6814:  0x86A3,
-	6815:  0x86A9,
-	6816:  0x86AA,
-	6817:  0x868B,
-	6818:  0x868C,
-	6819:  0x86B6,
-	6820:  0x86AF,
-	6821:  0x86C4,
-	6822:  0x86C6,
-	6823:  0x86B0,
-	6824:  0x86C9,
-	6825:  0x8823,
-	6826:  0x86AB,
-	6827:  0x86D4,
-	6828:  0x86DE,
-	6829:  0x86E9,
-	6830:  0x86EC,
-	6831:  0x86DF,
-	6832:  0x86DB,
-	6833:  0x86EF,
-	6834:  0x8712,
-	6835:  0x8706,
-	6836:  0x8708,
-	6837:  0x8700,
-	6838:  0x8703,
-	6839:  0x86FB,
-	6840:  0x8711,
-	6841:  0x8709,
-	6842:  0x870D,
-	6843:  0x86F9,
-	6844:  0x870A,
-	6845:  0x8734,
-	6846:  0x873F,
-	6847:  0x8737,
-	6848:  0x873B,
-	6849:  0x8725,
-	6850:  0x8729,
-	6851:  0x871A,
-	6852:  0x8760,
-	6853:  0x875F,
-	6854:  0x8778,
-	6855:  0x874C,
-	6856:  0x874E,
-	6857:  0x8774,
-	6858:  0x8757,
-	6859:  0x8768,
-	6860:  0x876E,
-	6861:  0x8759,
-	6862:  0x8753,
-	6863:  0x8763,
-	6864:  0x876A,
-	6865:  0x8805,
-	6866:  0x87A2,
-	6867:  0x879F,
-	6868:  0x8782,
-	6869:  0x87AF,
-	6870:  0x87CB,
-	6871:  0x87BD,
-	6872:  0x87C0,
-	6873:  0x87D0,
-	6874:  0x96D6,
-	6875:  0x87AB,
-	6876:  0x87C4,
-	6877:  0x87B3,
-	6878:  0x87C7,
-	6879:  0x87C6,
-	6880:  0x87BB,
-	6881:  0x87EF,
-	6882:  0x87F2,
-	6883:  0x87E0,
-	6884:  0x880F,
-	6885:  0x880D,
-	6886:  0x87FE,
-	6887:  0x87F6,
-	6888:  0x87F7,
-	6889:  0x880E,
-	6890:  0x87D2,
-	6891:  0x8811,
-	6892:  0x8816,
-	6893:  0x8815,
-	6894:  0x8822,
-	6895:  0x8821,
-	6896:  0x8831,
-	6897:  0x8836,
-	6898:  0x8839,
-	6899:  0x8827,
-	6900:  0x883B,
-	6901:  0x8844,
-	6902:  0x8842,
-	6903:  0x8852,
-	6904:  0x8859,
-	6905:  0x885E,
-	6906:  0x8862,
-	6907:  0x886B,
-	6908:  0x8881,
-	6909:  0x887E,
-	6910:  0x889E,
-	6911:  0x8875,
-	6912:  0x887D,
-	6913:  0x88B5,
-	6914:  0x8872,
-	6915:  0x8882,
-	6916:  0x8897,
-	6917:  0x8892,
-	6918:  0x88AE,
-	6919:  0x8899,
-	6920:  0x88A2,
-	6921:  0x888D,
-	6922:  0x88A4,
-	6923:  0x88B0,
-	6924:  0x88BF,
-	6925:  0x88B1,
-	6926:  0x88C3,
-	6927:  0x88C4,
-	6928:  0x88D4,
-	6929:  0x88D8,
-	6930:  0x88D9,
-	6931:  0x88DD,
-	6932:  0x88F9,
-	6933:  0x8902,
-	6934:  0x88FC,
-	6935:  0x88F4,
-	6936:  0x88E8,
-	6937:  0x88F2,
-	6938:  0x8904,
-	6939:  0x890C,
-	6940:  0x890A,
-	6941:  0x8913,
-	6942:  0x8943,
-	6943:  0x891E,
-	6944:  0x8925,
-	6945:  0x892A,
-	6946:  0x892B,
-	6947:  0x8941,
-	6948:  0x8944,
-	6949:  0x893B,
-	6950:  0x8936,
-	6951:  0x8938,
-	6952:  0x894C,
-	6953:  0x891D,
-	6954:  0x8960,
-	6955:  0x895E,
-	6956:  0x8966,
-	6957:  0x8964,
-	6958:  0x896D,
-	6959:  0x896A,
-	6960:  0x896F,
-	6961:  0x8974,
-	6962:  0x8977,
-	6963:  0x897E,
-	6964:  0x8983,
-	6965:  0x8988,
-	6966:  0x898A,
-	6967:  0x8993,
-	6968:  0x8998,
-	6969:  0x89A1,
-	6970:  0x89A9,
-	6971:  0x89A6,
-	6972:  0x89AC,
-	6973:  0x89AF,
-	6974:  0x89B2,
-	6975:  0x89BA,
-	6976:  0x89BD,
-	6977:  0x89BF,
-	6978:  0x89C0,
-	6979:  0x89DA,
-	6980:  0x89DC,
-	6981:  0x89DD,
-	6982:  0x89E7,
-	6983:  0x89F4,
-	6984:  0x89F8,
-	6985:  0x8A03,
-	6986:  0x8A16,
-	6987:  0x8A10,
-	6988:  0x8A0C,
-	6989:  0x8A1B,
-	6990:  0x8A1D,
-	6991:  0x8A25,
-	6992:  0x8A36,
-	6993:  0x8A41,
-	6994:  0x8A5B,
-	6995:  0x8A52,
-	6996:  0x8A46,
-	6997:  0x8A48,
-	6998:  0x8A7C,
-	6999:  0x8A6D,
-	7000:  0x8A6C,
-	7001:  0x8A62,
-	7002:  0x8A85,
-	7003:  0x8A82,
-	7004:  0x8A84,
-	7005:  0x8AA8,
-	7006:  0x8AA1,
-	7007:  0x8A91,
-	7008:  0x8AA5,
-	7009:  0x8AA6,
-	7010:  0x8A9A,
-	7011:  0x8AA3,
-	7012:  0x8AC4,
-	7013:  0x8ACD,
-	7014:  0x8AC2,
-	7015:  0x8ADA,
-	7016:  0x8AEB,
-	7017:  0x8AF3,
-	7018:  0x8AE7,
-	7019:  0x8AE4,
-	7020:  0x8AF1,
-	7021:  0x8B14,
-	7022:  0x8AE0,
-	7023:  0x8AE2,
-	7024:  0x8AF7,
-	7025:  0x8ADE,
-	7026:  0x8ADB,
-	7027:  0x8B0C,
-	7028:  0x8B07,
-	7029:  0x8B1A,
-	7030:  0x8AE1,
-	7031:  0x8B16,
-	7032:  0x8B10,
-	7033:  0x8B17,
-	7034:  0x8B20,
-	7035:  0x8B33,
-	7036:  0x97AB,
-	7037:  0x8B26,
-	7038:  0x8B2B,
-	7039:  0x8B3E,
-	7040:  0x8B28,
-	7041:  0x8B41,
-	7042:  0x8B4C,
-	7043:  0x8B4F,
-	7044:  0x8B4E,
-	7045:  0x8B49,
-	7046:  0x8B56,
-	7047:  0x8B5B,
-	7048:  0x8B5A,
-	7049:  0x8B6B,
-	7050:  0x8B5F,
-	7051:  0x8B6C,
-	7052:  0x8B6F,
-	7053:  0x8B74,
-	7054:  0x8B7D,
-	7055:  0x8B80,
-	7056:  0x8B8C,
-	7057:  0x8B8E,
-	7058:  0x8B92,
-	7059:  0x8B93,
-	7060:  0x8B96,
-	7061:  0x8B99,
-	7062:  0x8B9A,
-	7063:  0x8C3A,
-	7064:  0x8C41,
-	7065:  0x8C3F,
-	7066:  0x8C48,
-	7067:  0x8C4C,
-	7068:  0x8C4E,
-	7069:  0x8C50,
-	7070:  0x8C55,
-	7071:  0x8C62,
-	7072:  0x8C6C,
-	7073:  0x8C78,
-	7074:  0x8C7A,
-	7075:  0x8C82,
-	7076:  0x8C89,
-	7077:  0x8C85,
-	7078:  0x8C8A,
-	7079:  0x8C8D,
-	7080:  0x8C8E,
-	7081:  0x8C94,
-	7082:  0x8C7C,
-	7083:  0x8C98,
-	7084:  0x621D,
-	7085:  0x8CAD,
-	7086:  0x8CAA,
-	7087:  0x8CBD,
-	7088:  0x8CB2,
-	7089:  0x8CB3,
-	7090:  0x8CAE,
-	7091:  0x8CB6,
-	7092:  0x8CC8,
-	7093:  0x8CC1,
-	7094:  0x8CE4,
-	7095:  0x8CE3,
-	7096:  0x8CDA,
-	7097:  0x8CFD,
-	7098:  0x8CFA,
-	7099:  0x8CFB,
-	7100:  0x8D04,
-	7101:  0x8D05,
-	7102:  0x8D0A,
-	7103:  0x8D07,
-	7104:  0x8D0F,
-	7105:  0x8D0D,
-	7106:  0x8D10,
-	7107:  0x9F4E,
-	7108:  0x8D13,
-	7109:  0x8CCD,
-	7110:  0x8D14,
-	7111:  0x8D16,
-	7112:  0x8D67,
-	7113:  0x8D6D,
-	7114:  0x8D71,
-	7115:  0x8D73,
-	7116:  0x8D81,
-	7117:  0x8D99,
-	7118:  0x8DC2,
-	7119:  0x8DBE,
-	7120:  0x8DBA,
-	7121:  0x8DCF,
-	7122:  0x8DDA,
-	7123:  0x8DD6,
-	7124:  0x8DCC,
-	7125:  0x8DDB,
-	7126:  0x8DCB,
-	7127:  0x8DEA,
-	7128:  0x8DEB,
-	7129:  0x8DDF,
-	7130:  0x8DE3,
-	7131:  0x8DFC,
-	7132:  0x8E08,
-	7133:  0x8E09,
-	7134:  0x8DFF,
-	7135:  0x8E1D,
-	7136:  0x8E1E,
-	7137:  0x8E10,
-	7138:  0x8E1F,
-	7139:  0x8E42,
-	7140:  0x8E35,
-	7141:  0x8E30,
-	7142:  0x8E34,
-	7143:  0x8E4A,
-	7144:  0x8E47,
-	7145:  0x8E49,
-	7146:  0x8E4C,
-	7147:  0x8E50,
-	7148:  0x8E48,
-	7149:  0x8E59,
-	7150:  0x8E64,
-	7151:  0x8E60,
-	7152:  0x8E2A,
-	7153:  0x8E63,
-	7154:  0x8E55,
-	7155:  0x8E76,
-	7156:  0x8E72,
-	7157:  0x8E7C,
-	7158:  0x8E81,
-	7159:  0x8E87,
-	7160:  0x8E85,
-	7161:  0x8E84,
-	7162:  0x8E8B,
-	7163:  0x8E8A,
-	7164:  0x8E93,
-	7165:  0x8E91,
-	7166:  0x8E94,
-	7167:  0x8E99,
-	7168:  0x8EAA,
-	7169:  0x8EA1,
-	7170:  0x8EAC,
-	7171:  0x8EB0,
-	7172:  0x8EC6,
-	7173:  0x8EB1,
-	7174:  0x8EBE,
-	7175:  0x8EC5,
-	7176:  0x8EC8,
-	7177:  0x8ECB,
-	7178:  0x8EDB,
-	7179:  0x8EE3,
-	7180:  0x8EFC,
-	7181:  0x8EFB,
-	7182:  0x8EEB,
-	7183:  0x8EFE,
-	7184:  0x8F0A,
-	7185:  0x8F05,
-	7186:  0x8F15,
-	7187:  0x8F12,
-	7188:  0x8F19,
-	7189:  0x8F13,
-	7190:  0x8F1C,
-	7191:  0x8F1F,
-	7192:  0x8F1B,
-	7193:  0x8F0C,
-	7194:  0x8F26,
-	7195:  0x8F33,
-	7196:  0x8F3B,
-	7197:  0x8F39,
-	7198:  0x8F45,
-	7199:  0x8F42,
-	7200:  0x8F3E,
-	7201:  0x8F4C,
-	7202:  0x8F49,
-	7203:  0x8F46,
-	7204:  0x8F4E,
-	7205:  0x8F57,
-	7206:  0x8F5C,
-	7207:  0x8F62,
-	7208:  0x8F63,
-	7209:  0x8F64,
-	7210:  0x8F9C,
-	7211:  0x8F9F,
-	7212:  0x8FA3,
-	7213:  0x8FAD,
-	7214:  0x8FAF,
-	7215:  0x8FB7,
-	7216:  0x8FDA,
-	7217:  0x8FE5,
-	7218:  0x8FE2,
-	7219:  0x8FEA,
-	7220:  0x8FEF,
-	7221:  0x9087,
-	7222:  0x8FF4,
-	7223:  0x9005,
-	7224:  0x8FF9,
-	7225:  0x8FFA,
-	7226:  0x9011,
-	7227:  0x9015,
-	7228:  0x9021,
-	7229:  0x900D,
-	7230:  0x901E,
-	7231:  0x9016,
-	7232:  0x900B,
-	7233:  0x9027,
-	7234:  0x9036,
-	7235:  0x9035,
-	7236:  0x9039,
-	7237:  0x8FF8,
-	7238:  0x904F,
-	7239:  0x9050,
-	7240:  0x9051,
-	7241:  0x9052,
-	7242:  0x900E,
-	7243:  0x9049,
-	7244:  0x903E,
-	7245:  0x9056,
-	7246:  0x9058,
-	7247:  0x905E,
-	7248:  0x9068,
-	7249:  0x906F,
-	7250:  0x9076,
-	7251:  0x96A8,
-	7252:  0x9072,
-	7253:  0x9082,
-	7254:  0x907D,
-	7255:  0x9081,
-	7256:  0x9080,
-	7257:  0x908A,
-	7258:  0x9089,
-	7259:  0x908F,
-	7260:  0x90A8,
-	7261:  0x90AF,
-	7262:  0x90B1,
-	7263:  0x90B5,
-	7264:  0x90E2,
-	7265:  0x90E4,
-	7266:  0x6248,
-	7267:  0x90DB,
-	7268:  0x9102,
-	7269:  0x9112,
-	7270:  0x9119,
-	7271:  0x9132,
-	7272:  0x9130,
-	7273:  0x914A,
-	7274:  0x9156,
-	7275:  0x9158,
-	7276:  0x9163,
-	7277:  0x9165,
-	7278:  0x9169,
-	7279:  0x9173,
-	7280:  0x9172,
-	7281:  0x918B,
-	7282:  0x9189,
-	7283:  0x9182,
-	7284:  0x91A2,
-	7285:  0x91AB,
-	7286:  0x91AF,
-	7287:  0x91AA,
-	7288:  0x91B5,
-	7289:  0x91B4,
-	7290:  0x91BA,
-	7291:  0x91C0,
-	7292:  0x91C1,
-	7293:  0x91C9,
-	7294:  0x91CB,
-	7295:  0x91D0,
-	7296:  0x91D6,
-	7297:  0x91DF,
-	7298:  0x91E1,
-	7299:  0x91DB,
-	7300:  0x91FC,
-	7301:  0x91F5,
-	7302:  0x91F6,
-	7303:  0x921E,
-	7304:  0x91FF,
-	7305:  0x9214,
-	7306:  0x922C,
-	7307:  0x9215,
-	7308:  0x9211,
-	7309:  0x925E,
-	7310:  0x9257,
-	7311:  0x9245,
-	7312:  0x9249,
-	7313:  0x9264,
-	7314:  0x9248,
-	7315:  0x9295,
-	7316:  0x923F,
-	7317:  0x924B,
-	7318:  0x9250,
-	7319:  0x929C,
-	7320:  0x9296,
-	7321:  0x9293,
-	7322:  0x929B,
-	7323:  0x925A,
-	7324:  0x92CF,
-	7325:  0x92B9,
-	7326:  0x92B7,
-	7327:  0x92E9,
-	7328:  0x930F,
-	7329:  0x92FA,
-	7330:  0x9344,
-	7331:  0x932E,
-	7332:  0x9319,
-	7333:  0x9322,
-	7334:  0x931A,
-	7335:  0x9323,
-	7336:  0x933A,
-	7337:  0x9335,
-	7338:  0x933B,
-	7339:  0x935C,
-	7340:  0x9360,
-	7341:  0x937C,
-	7342:  0x936E,
-	7343:  0x9356,
-	7344:  0x93B0,
-	7345:  0x93AC,
-	7346:  0x93AD,
-	7347:  0x9394,
-	7348:  0x93B9,
-	7349:  0x93D6,
-	7350:  0x93D7,
-	7351:  0x93E8,
-	7352:  0x93E5,
-	7353:  0x93D8,
-	7354:  0x93C3,
-	7355:  0x93DD,
-	7356:  0x93D0,
-	7357:  0x93C8,
-	7358:  0x93E4,
-	7359:  0x941A,
-	7360:  0x9414,
-	7361:  0x9413,
-	7362:  0x9403,
-	7363:  0x9407,
-	7364:  0x9410,
-	7365:  0x9436,
-	7366:  0x942B,
-	7367:  0x9435,
-	7368:  0x9421,
-	7369:  0x943A,
-	7370:  0x9441,
-	7371:  0x9452,
-	7372:  0x9444,
-	7373:  0x945B,
-	7374:  0x9460,
-	7375:  0x9462,
-	7376:  0x945E,
-	7377:  0x946A,
-	7378:  0x9229,
-	7379:  0x9470,
-	7380:  0x9475,
-	7381:  0x9477,
-	7382:  0x947D,
-	7383:  0x945A,
-	7384:  0x947C,
-	7385:  0x947E,
-	7386:  0x9481,
-	7387:  0x947F,
-	7388:  0x9582,
-	7389:  0x9587,
-	7390:  0x958A,
-	7391:  0x9594,
-	7392:  0x9596,
-	7393:  0x9598,
-	7394:  0x9599,
-	7395:  0x95A0,
-	7396:  0x95A8,
-	7397:  0x95A7,
-	7398:  0x95AD,
-	7399:  0x95BC,
-	7400:  0x95BB,
-	7401:  0x95B9,
-	7402:  0x95BE,
-	7403:  0x95CA,
-	7404:  0x6FF6,
-	7405:  0x95C3,
-	7406:  0x95CD,
-	7407:  0x95CC,
-	7408:  0x95D5,
-	7409:  0x95D4,
-	7410:  0x95D6,
-	7411:  0x95DC,
-	7412:  0x95E1,
-	7413:  0x95E5,
-	7414:  0x95E2,
-	7415:  0x9621,
-	7416:  0x9628,
-	7417:  0x962E,
-	7418:  0x962F,
-	7419:  0x9642,
-	7420:  0x964C,
-	7421:  0x964F,
-	7422:  0x964B,
-	7423:  0x9677,
-	7424:  0x965C,
-	7425:  0x965E,
-	7426:  0x965D,
-	7427:  0x965F,
-	7428:  0x9666,
-	7429:  0x9672,
-	7430:  0x966C,
-	7431:  0x968D,
-	7432:  0x9698,
-	7433:  0x9695,
-	7434:  0x9697,
-	7435:  0x96AA,
-	7436:  0x96A7,
-	7437:  0x96B1,
-	7438:  0x96B2,
-	7439:  0x96B0,
-	7440:  0x96B4,
-	7441:  0x96B6,
-	7442:  0x96B8,
-	7443:  0x96B9,
-	7444:  0x96CE,
-	7445:  0x96CB,
-	7446:  0x96C9,
-	7447:  0x96CD,
-	7448:  0x894D,
-	7449:  0x96DC,
-	7450:  0x970D,
-	7451:  0x96D5,
-	7452:  0x96F9,
-	7453:  0x9704,
-	7454:  0x9706,
-	7455:  0x9708,
-	7456:  0x9713,
-	7457:  0x970E,
-	7458:  0x9711,
-	7459:  0x970F,
-	7460:  0x9716,
-	7461:  0x9719,
-	7462:  0x9724,
-	7463:  0x972A,
-	7464:  0x9730,
-	7465:  0x9739,
-	7466:  0x973D,
-	7467:  0x973E,
-	7468:  0x9744,
-	7469:  0x9746,
-	7470:  0x9748,
-	7471:  0x9742,
-	7472:  0x9749,
-	7473:  0x975C,
-	7474:  0x9760,
-	7475:  0x9764,
-	7476:  0x9766,
-	7477:  0x9768,
-	7478:  0x52D2,
-	7479:  0x976B,
-	7480:  0x9771,
-	7481:  0x9779,
-	7482:  0x9785,
-	7483:  0x977C,
-	7484:  0x9781,
-	7485:  0x977A,
-	7486:  0x9786,
-	7487:  0x978B,
-	7488:  0x978F,
-	7489:  0x9790,
-	7490:  0x979C,
-	7491:  0x97A8,
-	7492:  0x97A6,
-	7493:  0x97A3,
-	7494:  0x97B3,
-	7495:  0x97B4,
-	7496:  0x97C3,
-	7497:  0x97C6,
-	7498:  0x97C8,
-	7499:  0x97CB,
-	7500:  0x97DC,
-	7501:  0x97ED,
-	7502:  0x9F4F,
-	7503:  0x97F2,
-	7504:  0x7ADF,
-	7505:  0x97F6,
-	7506:  0x97F5,
-	7507:  0x980F,
-	7508:  0x980C,
-	7509:  0x9838,
-	7510:  0x9824,
-	7511:  0x9821,
-	7512:  0x9837,
-	7513:  0x983D,
-	7514:  0x9846,
-	7515:  0x984F,
-	7516:  0x984B,
-	7517:  0x986B,
-	7518:  0x986F,
-	7519:  0x9870,
-	7520:  0x9871,
-	7521:  0x9874,
-	7522:  0x9873,
-	7523:  0x98AA,
-	7524:  0x98AF,
-	7525:  0x98B1,
-	7526:  0x98B6,
-	7527:  0x98C4,
-	7528:  0x98C3,
-	7529:  0x98C6,
-	7530:  0x98E9,
-	7531:  0x98EB,
-	7532:  0x9903,
-	7533:  0x9909,
-	7534:  0x9912,
-	7535:  0x9914,
-	7536:  0x9918,
-	7537:  0x9921,
-	7538:  0x991D,
-	7539:  0x991E,
-	7540:  0x9924,
-	7541:  0x9920,
-	7542:  0x992C,
-	7543:  0x992E,
-	7544:  0x993D,
-	7545:  0x993E,
-	7546:  0x9942,
-	7547:  0x9949,
-	7548:  0x9945,
-	7549:  0x9950,
-	7550:  0x994B,
-	7551:  0x9951,
-	7552:  0x9952,
-	7553:  0x994C,
-	7554:  0x9955,
-	7555:  0x9997,
-	7556:  0x9998,
-	7557:  0x99A5,
-	7558:  0x99AD,
-	7559:  0x99AE,
-	7560:  0x99BC,
-	7561:  0x99DF,
-	7562:  0x99DB,
-	7563:  0x99DD,
-	7564:  0x99D8,
-	7565:  0x99D1,
-	7566:  0x99ED,
-	7567:  0x99EE,
-	7568:  0x99F1,
-	7569:  0x99F2,
-	7570:  0x99FB,
-	7571:  0x99F8,
-	7572:  0x9A01,
-	7573:  0x9A0F,
-	7574:  0x9A05,
-	7575:  0x99E2,
-	7576:  0x9A19,
-	7577:  0x9A2B,
-	7578:  0x9A37,
-	7579:  0x9A45,
-	7580:  0x9A42,
-	7581:  0x9A40,
-	7582:  0x9A43,
-	7583:  0x9A3E,
-	7584:  0x9A55,
-	7585:  0x9A4D,
-	7586:  0x9A5B,
-	7587:  0x9A57,
-	7588:  0x9A5F,
-	7589:  0x9A62,
-	7590:  0x9A65,
-	7591:  0x9A64,
-	7592:  0x9A69,
-	7593:  0x9A6B,
-	7594:  0x9A6A,
-	7595:  0x9AAD,
-	7596:  0x9AB0,
-	7597:  0x9ABC,
-	7598:  0x9AC0,
-	7599:  0x9ACF,
-	7600:  0x9AD1,
-	7601:  0x9AD3,
-	7602:  0x9AD4,
-	7603:  0x9ADE,
-	7604:  0x9ADF,
-	7605:  0x9AE2,
-	7606:  0x9AE3,
-	7607:  0x9AE6,
-	7608:  0x9AEF,
-	7609:  0x9AEB,
-	7610:  0x9AEE,
-	7611:  0x9AF4,
-	7612:  0x9AF1,
-	7613:  0x9AF7,
-	7614:  0x9AFB,
-	7615:  0x9B06,
-	7616:  0x9B18,
-	7617:  0x9B1A,
-	7618:  0x9B1F,
-	7619:  0x9B22,
-	7620:  0x9B23,
-	7621:  0x9B25,
-	7622:  0x9B27,
-	7623:  0x9B28,
-	7624:  0x9B29,
-	7625:  0x9B2A,
-	7626:  0x9B2E,
-	7627:  0x9B2F,
-	7628:  0x9B32,
-	7629:  0x9B44,
-	7630:  0x9B43,
-	7631:  0x9B4F,
-	7632:  0x9B4D,
-	7633:  0x9B4E,
-	7634:  0x9B51,
-	7635:  0x9B58,
-	7636:  0x9B74,
-	7637:  0x9B93,
-	7638:  0x9B83,
-	7639:  0x9B91,
-	7640:  0x9B96,
-	7641:  0x9B97,
-	7642:  0x9B9F,
-	7643:  0x9BA0,
-	7644:  0x9BA8,
-	7645:  0x9BB4,
-	7646:  0x9BC0,
-	7647:  0x9BCA,
-	7648:  0x9BB9,
-	7649:  0x9BC6,
-	7650:  0x9BCF,
-	7651:  0x9BD1,
-	7652:  0x9BD2,
-	7653:  0x9BE3,
-	7654:  0x9BE2,
-	7655:  0x9BE4,
-	7656:  0x9BD4,
-	7657:  0x9BE1,
-	7658:  0x9C3A,
-	7659:  0x9BF2,
-	7660:  0x9BF1,
-	7661:  0x9BF0,
-	7662:  0x9C15,
-	7663:  0x9C14,
-	7664:  0x9C09,
-	7665:  0x9C13,
-	7666:  0x9C0C,
-	7667:  0x9C06,
-	7668:  0x9C08,
-	7669:  0x9C12,
-	7670:  0x9C0A,
-	7671:  0x9C04,
-	7672:  0x9C2E,
-	7673:  0x9C1B,
-	7674:  0x9C25,
-	7675:  0x9C24,
-	7676:  0x9C21,
-	7677:  0x9C30,
-	7678:  0x9C47,
-	7679:  0x9C32,
-	7680:  0x9C46,
-	7681:  0x9C3E,
-	7682:  0x9C5A,
-	7683:  0x9C60,
-	7684:  0x9C67,
-	7685:  0x9C76,
-	7686:  0x9C78,
-	7687:  0x9CE7,
-	7688:  0x9CEC,
-	7689:  0x9CF0,
-	7690:  0x9D09,
-	7691:  0x9D08,
-	7692:  0x9CEB,
-	7693:  0x9D03,
-	7694:  0x9D06,
-	7695:  0x9D2A,
-	7696:  0x9D26,
-	7697:  0x9DAF,
-	7698:  0x9D23,
-	7699:  0x9D1F,
-	7700:  0x9D44,
-	7701:  0x9D15,
-	7702:  0x9D12,
-	7703:  0x9D41,
-	7704:  0x9D3F,
-	7705:  0x9D3E,
-	7706:  0x9D46,
-	7707:  0x9D48,
-	7708:  0x9D5D,
-	7709:  0x9D5E,
-	7710:  0x9D64,
-	7711:  0x9D51,
-	7712:  0x9D50,
-	7713:  0x9D59,
-	7714:  0x9D72,
-	7715:  0x9D89,
-	7716:  0x9D87,
-	7717:  0x9DAB,
-	7718:  0x9D6F,
-	7719:  0x9D7A,
-	7720:  0x9D9A,
-	7721:  0x9DA4,
-	7722:  0x9DA9,
-	7723:  0x9DB2,
-	7724:  0x9DC4,
-	7725:  0x9DC1,
-	7726:  0x9DBB,
-	7727:  0x9DB8,
-	7728:  0x9DBA,
-	7729:  0x9DC6,
-	7730:  0x9DCF,
-	7731:  0x9DC2,
-	7732:  0x9DD9,
-	7733:  0x9DD3,
-	7734:  0x9DF8,
-	7735:  0x9DE6,
-	7736:  0x9DED,
-	7737:  0x9DEF,
-	7738:  0x9DFD,
-	7739:  0x9E1A,
-	7740:  0x9E1B,
-	7741:  0x9E1E,
-	7742:  0x9E75,
-	7743:  0x9E79,
-	7744:  0x9E7D,
-	7745:  0x9E81,
-	7746:  0x9E88,
-	7747:  0x9E8B,
-	7748:  0x9E8C,
-	7749:  0x9E92,
-	7750:  0x9E95,
-	7751:  0x9E91,
-	7752:  0x9E9D,
-	7753:  0x9EA5,
-	7754:  0x9EA9,
-	7755:  0x9EB8,
-	7756:  0x9EAA,
-	7757:  0x9EAD,
-	7758:  0x9761,
-	7759:  0x9ECC,
-	7760:  0x9ECE,
-	7761:  0x9ECF,
-	7762:  0x9ED0,
-	7763:  0x9ED4,
-	7764:  0x9EDC,
-	7765:  0x9EDE,
-	7766:  0x9EDD,
-	7767:  0x9EE0,
-	7768:  0x9EE5,
-	7769:  0x9EE8,
-	7770:  0x9EEF,
-	7771:  0x9EF4,
-	7772:  0x9EF6,
-	7773:  0x9EF7,
-	7774:  0x9EF9,
-	7775:  0x9EFB,
-	7776:  0x9EFC,
-	7777:  0x9EFD,
-	7778:  0x9F07,
-	7779:  0x9F08,
-	7780:  0x76B7,
-	7781:  0x9F15,
-	7782:  0x9F21,
-	7783:  0x9F2C,
-	7784:  0x9F3E,
-	7785:  0x9F4A,
-	7786:  0x9F52,
-	7787:  0x9F54,
-	7788:  0x9F63,
-	7789:  0x9F5F,
-	7790:  0x9F60,
-	7791:  0x9F61,
-	7792:  0x9F66,
-	7793:  0x9F67,
-	7794:  0x9F6C,
-	7795:  0x9F6A,
-	7796:  0x9F77,
-	7797:  0x9F72,
-	7798:  0x9F76,
-	7799:  0x9F95,
-	7800:  0x9F9C,
-	7801:  0x9FA0,
-	7802:  0x582F,
-	7803:  0x69C7,
-	7804:  0x9059,
-	7805:  0x7464,
-	7806:  0x51DC,
-	7807:  0x7199,
-	8272:  0x7E8A,
-	8273:  0x891C,
-	8274:  0x9348,
-	8275:  0x9288,
-	8276:  0x84DC,
-	8277:  0x4FC9,
-	8278:  0x70BB,
-	8279:  0x6631,
-	8280:  0x68C8,
-	8281:  0x92F9,
-	8282:  0x66FB,
-	8283:  0x5F45,
-	8284:  0x4E28,
-	8285:  0x4EE1,
-	8286:  0x4EFC,
-	8287:  0x4F00,
-	8288:  0x4F03,
-	8289:  0x4F39,
-	8290:  0x4F56,
-	8291:  0x4F92,
-	8292:  0x4F8A,
-	8293:  0x4F9A,
-	8294:  0x4F94,
-	8295:  0x4FCD,
-	8296:  0x5040,
-	8297:  0x5022,
-	8298:  0x4FFF,
-	8299:  0x501E,
-	8300:  0x5046,
-	8301:  0x5070,
-	8302:  0x5042,
-	8303:  0x5094,
-	8304:  0x50F4,
-	8305:  0x50D8,
-	8306:  0x514A,
-	8307:  0x5164,
-	8308:  0x519D,
-	8309:  0x51BE,
-	8310:  0x51EC,
-	8311:  0x5215,
-	8312:  0x529C,
-	8313:  0x52A6,
-	8314:  0x52C0,
-	8315:  0x52DB,
-	8316:  0x5300,
-	8317:  0x5307,
-	8318:  0x5324,
-	8319:  0x5372,
-	8320:  0x5393,
-	8321:  0x53B2,
-	8322:  0x53DD,
-	8323:  0xFA0E,
-	8324:  0x549C,
-	8325:  0x548A,
-	8326:  0x54A9,
-	8327:  0x54FF,
-	8328:  0x5586,
-	8329:  0x5759,
-	8330:  0x5765,
-	8331:  0x57AC,
-	8332:  0x57C8,
-	8333:  0x57C7,
-	8334:  0xFA0F,
-	8335:  0xFA10,
-	8336:  0x589E,
-	8337:  0x58B2,
-	8338:  0x590B,
-	8339:  0x5953,
-	8340:  0x595B,
-	8341:  0x595D,
-	8342:  0x5963,
-	8343:  0x59A4,
-	8344:  0x59BA,
-	8345:  0x5B56,
-	8346:  0x5BC0,
-	8347:  0x752F,
-	8348:  0x5BD8,
-	8349:  0x5BEC,
-	8350:  0x5C1E,
-	8351:  0x5CA6,
-	8352:  0x5CBA,
-	8353:  0x5CF5,
-	8354:  0x5D27,
-	8355:  0x5D53,
-	8356:  0xFA11,
-	8357:  0x5D42,
-	8358:  0x5D6D,
-	8359:  0x5DB8,
-	8360:  0x5DB9,
-	8361:  0x5DD0,
-	8362:  0x5F21,
-	8363:  0x5F34,
-	8364:  0x5F67,
-	8365:  0x5FB7,
-	8366:  0x5FDE,
-	8367:  0x605D,
-	8368:  0x6085,
-	8369:  0x608A,
-	8370:  0x60DE,
-	8371:  0x60D5,
-	8372:  0x6120,
-	8373:  0x60F2,
-	8374:  0x6111,
-	8375:  0x6137,
-	8376:  0x6130,
-	8377:  0x6198,
-	8378:  0x6213,
-	8379:  0x62A6,
-	8380:  0x63F5,
-	8381:  0x6460,
-	8382:  0x649D,
-	8383:  0x64CE,
-	8384:  0x654E,
-	8385:  0x6600,
-	8386:  0x6615,
-	8387:  0x663B,
-	8388:  0x6609,
-	8389:  0x662E,
-	8390:  0x661E,
-	8391:  0x6624,
-	8392:  0x6665,
-	8393:  0x6657,
-	8394:  0x6659,
-	8395:  0xFA12,
-	8396:  0x6673,
-	8397:  0x6699,
-	8398:  0x66A0,
-	8399:  0x66B2,
-	8400:  0x66BF,
-	8401:  0x66FA,
-	8402:  0x670E,
-	8403:  0xF929,
-	8404:  0x6766,
-	8405:  0x67BB,
-	8406:  0x6852,
-	8407:  0x67C0,
-	8408:  0x6801,
-	8409:  0x6844,
-	8410:  0x68CF,
-	8411:  0xFA13,
-	8412:  0x6968,
-	8413:  0xFA14,
-	8414:  0x6998,
-	8415:  0x69E2,
-	8416:  0x6A30,
-	8417:  0x6A6B,
-	8418:  0x6A46,
-	8419:  0x6A73,
-	8420:  0x6A7E,
-	8421:  0x6AE2,
-	8422:  0x6AE4,
-	8423:  0x6BD6,
-	8424:  0x6C3F,
-	8425:  0x6C5C,
-	8426:  0x6C86,
-	8427:  0x6C6F,
-	8428:  0x6CDA,
-	8429:  0x6D04,
-	8430:  0x6D87,
-	8431:  0x6D6F,
-	8432:  0x6D96,
-	8433:  0x6DAC,
-	8434:  0x6DCF,
-	8435:  0x6DF8,
-	8436:  0x6DF2,
-	8437:  0x6DFC,
-	8438:  0x6E39,
-	8439:  0x6E5C,
-	8440:  0x6E27,
-	8441:  0x6E3C,
-	8442:  0x6EBF,
-	8443:  0x6F88,
-	8444:  0x6FB5,
-	8445:  0x6FF5,
-	8446:  0x7005,
-	8447:  0x7007,
-	8448:  0x7028,
-	8449:  0x7085,
-	8450:  0x70AB,
-	8451:  0x710F,
-	8452:  0x7104,
-	8453:  0x715C,
-	8454:  0x7146,
-	8455:  0x7147,
-	8456:  0xFA15,
-	8457:  0x71C1,
-	8458:  0x71FE,
-	8459:  0x72B1,
-	8460:  0x72BE,
-	8461:  0x7324,
-	8462:  0xFA16,
-	8463:  0x7377,
-	8464:  0x73BD,
-	8465:  0x73C9,
-	8466:  0x73D6,
-	8467:  0x73E3,
-	8468:  0x73D2,
-	8469:  0x7407,
-	8470:  0x73F5,
-	8471:  0x7426,
-	8472:  0x742A,
-	8473:  0x7429,
-	8474:  0x742E,
-	8475:  0x7462,
-	8476:  0x7489,
-	8477:  0x749F,
-	8478:  0x7501,
-	8479:  0x756F,
-	8480:  0x7682,
-	8481:  0x769C,
-	8482:  0x769E,
-	8483:  0x769B,
-	8484:  0x76A6,
-	8485:  0xFA17,
-	8486:  0x7746,
-	8487:  0x52AF,
-	8488:  0x7821,
-	8489:  0x784E,
-	8490:  0x7864,
-	8491:  0x787A,
-	8492:  0x7930,
-	8493:  0xFA18,
-	8494:  0xFA19,
-	8495:  0xFA1A,
-	8496:  0x7994,
-	8497:  0xFA1B,
-	8498:  0x799B,
-	8499:  0x7AD1,
-	8500:  0x7AE7,
-	8501:  0xFA1C,
-	8502:  0x7AEB,
-	8503:  0x7B9E,
-	8504:  0xFA1D,
-	8505:  0x7D48,
-	8506:  0x7D5C,
-	8507:  0x7DB7,
-	8508:  0x7DA0,
-	8509:  0x7DD6,
-	8510:  0x7E52,
-	8511:  0x7F47,
-	8512:  0x7FA1,
-	8513:  0xFA1E,
-	8514:  0x8301,
-	8515:  0x8362,
-	8516:  0x837F,
-	8517:  0x83C7,
-	8518:  0x83F6,
-	8519:  0x8448,
-	8520:  0x84B4,
-	8521:  0x8553,
-	8522:  0x8559,
-	8523:  0x856B,
-	8524:  0xFA1F,
-	8525:  0x85B0,
-	8526:  0xFA20,
-	8527:  0xFA21,
-	8528:  0x8807,
-	8529:  0x88F5,
-	8530:  0x8A12,
-	8531:  0x8A37,
-	8532:  0x8A79,
-	8533:  0x8AA7,
-	8534:  0x8ABE,
-	8535:  0x8ADF,
-	8536:  0xFA22,
-	8537:  0x8AF6,
-	8538:  0x8B53,
-	8539:  0x8B7F,
-	8540:  0x8CF0,
-	8541:  0x8CF4,
-	8542:  0x8D12,
-	8543:  0x8D76,
-	8544:  0xFA23,
-	8545:  0x8ECF,
-	8546:  0xFA24,
-	8547:  0xFA25,
-	8548:  0x9067,
-	8549:  0x90DE,
-	8550:  0xFA26,
-	8551:  0x9115,
-	8552:  0x9127,
-	8553:  0x91DA,
-	8554:  0x91D7,
-	8555:  0x91DE,
-	8556:  0x91ED,
-	8557:  0x91EE,
-	8558:  0x91E4,
-	8559:  0x91E5,
-	8560:  0x9206,
-	8561:  0x9210,
-	8562:  0x920A,
-	8563:  0x923A,
-	8564:  0x9240,
-	8565:  0x923C,
-	8566:  0x924E,
-	8567:  0x9259,
-	8568:  0x9251,
-	8569:  0x9239,
-	8570:  0x9267,
-	8571:  0x92A7,
-	8572:  0x9277,
-	8573:  0x9278,
-	8574:  0x92E7,
-	8575:  0x92D7,
-	8576:  0x92D9,
-	8577:  0x92D0,
-	8578:  0xFA27,
-	8579:  0x92D5,
-	8580:  0x92E0,
-	8581:  0x92D3,
-	8582:  0x9325,
-	8583:  0x9321,
-	8584:  0x92FB,
-	8585:  0xFA28,
-	8586:  0x931E,
-	8587:  0x92FF,
-	8588:  0x931D,
-	8589:  0x9302,
-	8590:  0x9370,
-	8591:  0x9357,
-	8592:  0x93A4,
-	8593:  0x93C6,
-	8594:  0x93DE,
-	8595:  0x93F8,
-	8596:  0x9431,
-	8597:  0x9445,
-	8598:  0x9448,
-	8599:  0x9592,
-	8600:  0xF9DC,
-	8601:  0xFA29,
-	8602:  0x969D,
-	8603:  0x96AF,
-	8604:  0x9733,
-	8605:  0x973B,
-	8606:  0x9743,
-	8607:  0x974D,
-	8608:  0x974F,
-	8609:  0x9751,
-	8610:  0x9755,
-	8611:  0x9857,
-	8612:  0x9865,
-	8613:  0xFA2A,
-	8614:  0xFA2B,
-	8615:  0x9927,
-	8616:  0xFA2C,
-	8617:  0x999E,
-	8618:  0x9A4E,
-	8619:  0x9AD9,
-	8620:  0x9ADC,
-	8621:  0x9B75,
-	8622:  0x9B72,
-	8623:  0x9B8F,
-	8624:  0x9BB1,
-	8625:  0x9BBB,
-	8626:  0x9C00,
-	8627:  0x9D70,
-	8628:  0x9D6B,
-	8629:  0xFA2D,
-	8630:  0x9E19,
-	8631:  0x9ED1,
-	8634:  0x2170,
-	8635:  0x2171,
-	8636:  0x2172,
-	8637:  0x2173,
-	8638:  0x2174,
-	8639:  0x2175,
-	8640:  0x2176,
-	8641:  0x2177,
-	8642:  0x2178,
-	8643:  0x2179,
-	8644:  0xFFE2,
-	8645:  0xFFE4,
-	8646:  0xFF07,
-	8647:  0xFF02,
-	10716: 0x2170,
-	10717: 0x2171,
-	10718: 0x2172,
-	10719: 0x2173,
-	10720: 0x2174,
-	10721: 0x2175,
-	10722: 0x2176,
-	10723: 0x2177,
-	10724: 0x2178,
-	10725: 0x2179,
-	10726: 0x2160,
-	10727: 0x2161,
-	10728: 0x2162,
-	10729: 0x2163,
-	10730: 0x2164,
-	10731: 0x2165,
-	10732: 0x2166,
-	10733: 0x2167,
-	10734: 0x2168,
-	10735: 0x2169,
-	10736: 0xFFE2,
-	10737: 0xFFE4,
-	10738: 0xFF07,
-	10739: 0xFF02,
-	10740: 0x3231,
-	10741: 0x2116,
-	10742: 0x2121,
-	10743: 0x2235,
-	10744: 0x7E8A,
-	10745: 0x891C,
-	10746: 0x9348,
-	10747: 0x9288,
-	10748: 0x84DC,
-	10749: 0x4FC9,
-	10750: 0x70BB,
-	10751: 0x6631,
-	10752: 0x68C8,
-	10753: 0x92F9,
-	10754: 0x66FB,
-	10755: 0x5F45,
-	10756: 0x4E28,
-	10757: 0x4EE1,
-	10758: 0x4EFC,
-	10759: 0x4F00,
-	10760: 0x4F03,
-	10761: 0x4F39,
-	10762: 0x4F56,
-	10763: 0x4F92,
-	10764: 0x4F8A,
-	10765: 0x4F9A,
-	10766: 0x4F94,
-	10767: 0x4FCD,
-	10768: 0x5040,
-	10769: 0x5022,
-	10770: 0x4FFF,
-	10771: 0x501E,
-	10772: 0x5046,
-	10773: 0x5070,
-	10774: 0x5042,
-	10775: 0x5094,
-	10776: 0x50F4,
-	10777: 0x50D8,
-	10778: 0x514A,
-	10779: 0x5164,
-	10780: 0x519D,
-	10781: 0x51BE,
-	10782: 0x51EC,
-	10783: 0x5215,
-	10784: 0x529C,
-	10785: 0x52A6,
-	10786: 0x52C0,
-	10787: 0x52DB,
-	10788: 0x5300,
-	10789: 0x5307,
-	10790: 0x5324,
-	10791: 0x5372,
-	10792: 0x5393,
-	10793: 0x53B2,
-	10794: 0x53DD,
-	10795: 0xFA0E,
-	10796: 0x549C,
-	10797: 0x548A,
-	10798: 0x54A9,
-	10799: 0x54FF,
-	10800: 0x5586,
-	10801: 0x5759,
-	10802: 0x5765,
-	10803: 0x57AC,
-	10804: 0x57C8,
-	10805: 0x57C7,
-	10806: 0xFA0F,
-	10807: 0xFA10,
-	10808: 0x589E,
-	10809: 0x58B2,
-	10810: 0x590B,
-	10811: 0x5953,
-	10812: 0x595B,
-	10813: 0x595D,
-	10814: 0x5963,
-	10815: 0x59A4,
-	10816: 0x59BA,
-	10817: 0x5B56,
-	10818: 0x5BC0,
-	10819: 0x752F,
-	10820: 0x5BD8,
-	10821: 0x5BEC,
-	10822: 0x5C1E,
-	10823: 0x5CA6,
-	10824: 0x5CBA,
-	10825: 0x5CF5,
-	10826: 0x5D27,
-	10827: 0x5D53,
-	10828: 0xFA11,
-	10829: 0x5D42,
-	10830: 0x5D6D,
-	10831: 0x5DB8,
-	10832: 0x5DB9,
-	10833: 0x5DD0,
-	10834: 0x5F21,
-	10835: 0x5F34,
-	10836: 0x5F67,
-	10837: 0x5FB7,
-	10838: 0x5FDE,
-	10839: 0x605D,
-	10840: 0x6085,
-	10841: 0x608A,
-	10842: 0x60DE,
-	10843: 0x60D5,
-	10844: 0x6120,
-	10845: 0x60F2,
-	10846: 0x6111,
-	10847: 0x6137,
-	10848: 0x6130,
-	10849: 0x6198,
-	10850: 0x6213,
-	10851: 0x62A6,
-	10852: 0x63F5,
-	10853: 0x6460,
-	10854: 0x649D,
-	10855: 0x64CE,
-	10856: 0x654E,
-	10857: 0x6600,
-	10858: 0x6615,
-	10859: 0x663B,
-	10860: 0x6609,
-	10861: 0x662E,
-	10862: 0x661E,
-	10863: 0x6624,
-	10864: 0x6665,
-	10865: 0x6657,
-	10866: 0x6659,
-	10867: 0xFA12,
-	10868: 0x6673,
-	10869: 0x6699,
-	10870: 0x66A0,
-	10871: 0x66B2,
-	10872: 0x66BF,
-	10873: 0x66FA,
-	10874: 0x670E,
-	10875: 0xF929,
-	10876: 0x6766,
-	10877: 0x67BB,
-	10878: 0x6852,
-	10879: 0x67C0,
-	10880: 0x6801,
-	10881: 0x6844,
-	10882: 0x68CF,
-	10883: 0xFA13,
-	10884: 0x6968,
-	10885: 0xFA14,
-	10886: 0x6998,
-	10887: 0x69E2,
-	10888: 0x6A30,
-	10889: 0x6A6B,
-	10890: 0x6A46,
-	10891: 0x6A73,
-	10892: 0x6A7E,
-	10893: 0x6AE2,
-	10894: 0x6AE4,
-	10895: 0x6BD6,
-	10896: 0x6C3F,
-	10897: 0x6C5C,
-	10898: 0x6C86,
-	10899: 0x6C6F,
-	10900: 0x6CDA,
-	10901: 0x6D04,
-	10902: 0x6D87,
-	10903: 0x6D6F,
-	10904: 0x6D96,
-	10905: 0x6DAC,
-	10906: 0x6DCF,
-	10907: 0x6DF8,
-	10908: 0x6DF2,
-	10909: 0x6DFC,
-	10910: 0x6E39,
-	10911: 0x6E5C,
-	10912: 0x6E27,
-	10913: 0x6E3C,
-	10914: 0x6EBF,
-	10915: 0x6F88,
-	10916: 0x6FB5,
-	10917: 0x6FF5,
-	10918: 0x7005,
-	10919: 0x7007,
-	10920: 0x7028,
-	10921: 0x7085,
-	10922: 0x70AB,
-	10923: 0x710F,
-	10924: 0x7104,
-	10925: 0x715C,
-	10926: 0x7146,
-	10927: 0x7147,
-	10928: 0xFA15,
-	10929: 0x71C1,
-	10930: 0x71FE,
-	10931: 0x72B1,
-	10932: 0x72BE,
-	10933: 0x7324,
-	10934: 0xFA16,
-	10935: 0x7377,
-	10936: 0x73BD,
-	10937: 0x73C9,
-	10938: 0x73D6,
-	10939: 0x73E3,
-	10940: 0x73D2,
-	10941: 0x7407,
-	10942: 0x73F5,
-	10943: 0x7426,
-	10944: 0x742A,
-	10945: 0x7429,
-	10946: 0x742E,
-	10947: 0x7462,
-	10948: 0x7489,
-	10949: 0x749F,
-	10950: 0x7501,
-	10951: 0x756F,
-	10952: 0x7682,
-	10953: 0x769C,
-	10954: 0x769E,
-	10955: 0x769B,
-	10956: 0x76A6,
-	10957: 0xFA17,
-	10958: 0x7746,
-	10959: 0x52AF,
-	10960: 0x7821,
-	10961: 0x784E,
-	10962: 0x7864,
-	10963: 0x787A,
-	10964: 0x7930,
-	10965: 0xFA18,
-	10966: 0xFA19,
-	10967: 0xFA1A,
-	10968: 0x7994,
-	10969: 0xFA1B,
-	10970: 0x799B,
-	10971: 0x7AD1,
-	10972: 0x7AE7,
-	10973: 0xFA1C,
-	10974: 0x7AEB,
-	10975: 0x7B9E,
-	10976: 0xFA1D,
-	10977: 0x7D48,
-	10978: 0x7D5C,
-	10979: 0x7DB7,
-	10980: 0x7DA0,
-	10981: 0x7DD6,
-	10982: 0x7E52,
-	10983: 0x7F47,
-	10984: 0x7FA1,
-	10985: 0xFA1E,
-	10986: 0x8301,
-	10987: 0x8362,
-	10988: 0x837F,
-	10989: 0x83C7,
-	10990: 0x83F6,
-	10991: 0x8448,
-	10992: 0x84B4,
-	10993: 0x8553,
-	10994: 0x8559,
-	10995: 0x856B,
-	10996: 0xFA1F,
-	10997: 0x85B0,
-	10998: 0xFA20,
-	10999: 0xFA21,
-	11000: 0x8807,
-	11001: 0x88F5,
-	11002: 0x8A12,
-	11003: 0x8A37,
-	11004: 0x8A79,
-	11005: 0x8AA7,
-	11006: 0x8ABE,
-	11007: 0x8ADF,
-	11008: 0xFA22,
-	11009: 0x8AF6,
-	11010: 0x8B53,
-	11011: 0x8B7F,
-	11012: 0x8CF0,
-	11013: 0x8CF4,
-	11014: 0x8D12,
-	11015: 0x8D76,
-	11016: 0xFA23,
-	11017: 0x8ECF,
-	11018: 0xFA24,
-	11019: 0xFA25,
-	11020: 0x9067,
-	11021: 0x90DE,
-	11022: 0xFA26,
-	11023: 0x9115,
-	11024: 0x9127,
-	11025: 0x91DA,
-	11026: 0x91D7,
-	11027: 0x91DE,
-	11028: 0x91ED,
-	11029: 0x91EE,
-	11030: 0x91E4,
-	11031: 0x91E5,
-	11032: 0x9206,
-	11033: 0x9210,
-	11034: 0x920A,
-	11035: 0x923A,
-	11036: 0x9240,
-	11037: 0x923C,
-	11038: 0x924E,
-	11039: 0x9259,
-	11040: 0x9251,
-	11041: 0x9239,
-	11042: 0x9267,
-	11043: 0x92A7,
-	11044: 0x9277,
-	11045: 0x9278,
-	11046: 0x92E7,
-	11047: 0x92D7,
-	11048: 0x92D9,
-	11049: 0x92D0,
-	11050: 0xFA27,
-	11051: 0x92D5,
-	11052: 0x92E0,
-	11053: 0x92D3,
-	11054: 0x9325,
-	11055: 0x9321,
-	11056: 0x92FB,
-	11057: 0xFA28,
-	11058: 0x931E,
-	11059: 0x92FF,
-	11060: 0x931D,
-	11061: 0x9302,
-	11062: 0x9370,
-	11063: 0x9357,
-	11064: 0x93A4,
-	11065: 0x93C6,
-	11066: 0x93DE,
-	11067: 0x93F8,
-	11068: 0x9431,
-	11069: 0x9445,
-	11070: 0x9448,
-	11071: 0x9592,
-	11072: 0xF9DC,
-	11073: 0xFA29,
-	11074: 0x969D,
-	11075: 0x96AF,
-	11076: 0x9733,
-	11077: 0x973B,
-	11078: 0x9743,
-	11079: 0x974D,
-	11080: 0x974F,
-	11081: 0x9751,
-	11082: 0x9755,
-	11083: 0x9857,
-	11084: 0x9865,
-	11085: 0xFA2A,
-	11086: 0xFA2B,
-	11087: 0x9927,
-	11088: 0xFA2C,
-	11089: 0x999E,
-	11090: 0x9A4E,
-	11091: 0x9AD9,
-	11092: 0x9ADC,
-	11093: 0x9B75,
-	11094: 0x9B72,
-	11095: 0x9B8F,
-	11096: 0x9BB1,
-	11097: 0x9BBB,
-	11098: 0x9C00,
-	11099: 0x9D70,
-	11100: 0x9D6B,
-	11101: 0xFA2D,
-	11102: 0x9E19,
-	11103: 0x9ED1,
-}
-
-// jis0212Decode is the decoding table from JIS 0212 code to Unicode.
-// It is defined at http://encoding.spec.whatwg.org/index-jis0212.txt
-var jis0212Decode = [...]uint16{
-	108:  0x02D8,
-	109:  0x02C7,
-	110:  0x00B8,
-	111:  0x02D9,
-	112:  0x02DD,
-	113:  0x00AF,
-	114:  0x02DB,
-	115:  0x02DA,
-	116:  0xFF5E,
-	117:  0x0384,
-	118:  0x0385,
-	127:  0x00A1,
-	128:  0x00A6,
-	129:  0x00BF,
-	168:  0x00BA,
-	169:  0x00AA,
-	170:  0x00A9,
-	171:  0x00AE,
-	172:  0x2122,
-	173:  0x00A4,
-	174:  0x2116,
-	534:  0x0386,
-	535:  0x0388,
-	536:  0x0389,
-	537:  0x038A,
-	538:  0x03AA,
-	540:  0x038C,
-	542:  0x038E,
-	543:  0x03AB,
-	545:  0x038F,
-	550:  0x03AC,
-	551:  0x03AD,
-	552:  0x03AE,
-	553:  0x03AF,
-	554:  0x03CA,
-	555:  0x0390,
-	556:  0x03CC,
-	557:  0x03C2,
-	558:  0x03CD,
-	559:  0x03CB,
-	560:  0x03B0,
-	561:  0x03CE,
-	597:  0x0402,
-	598:  0x0403,
-	599:  0x0404,
-	600:  0x0405,
-	601:  0x0406,
-	602:  0x0407,
-	603:  0x0408,
-	604:  0x0409,
-	605:  0x040A,
-	606:  0x040B,
-	607:  0x040C,
-	608:  0x040E,
-	609:  0x040F,
-	645:  0x0452,
-	646:  0x0453,
-	647:  0x0454,
-	648:  0x0455,
-	649:  0x0456,
-	650:  0x0457,
-	651:  0x0458,
-	652:  0x0459,
-	653:  0x045A,
-	654:  0x045B,
-	655:  0x045C,
-	656:  0x045E,
-	657:  0x045F,
-	752:  0x00C6,
-	753:  0x0110,
-	755:  0x0126,
-	757:  0x0132,
-	759:  0x0141,
-	760:  0x013F,
-	762:  0x014A,
-	763:  0x00D8,
-	764:  0x0152,
-	766:  0x0166,
-	767:  0x00DE,
-	784:  0x00E6,
-	785:  0x0111,
-	786:  0x00F0,
-	787:  0x0127,
-	788:  0x0131,
-	789:  0x0133,
-	790:  0x0138,
-	791:  0x0142,
-	792:  0x0140,
-	793:  0x0149,
-	794:  0x014B,
-	795:  0x00F8,
-	796:  0x0153,
-	797:  0x00DF,
-	798:  0x0167,
-	799:  0x00FE,
-	846:  0x00C1,
-	847:  0x00C0,
-	848:  0x00C4,
-	849:  0x00C2,
-	850:  0x0102,
-	851:  0x01CD,
-	852:  0x0100,
-	853:  0x0104,
-	854:  0x00C5,
-	855:  0x00C3,
-	856:  0x0106,
-	857:  0x0108,
-	858:  0x010C,
-	859:  0x00C7,
-	860:  0x010A,
-	861:  0x010E,
-	862:  0x00C9,
-	863:  0x00C8,
-	864:  0x00CB,
-	865:  0x00CA,
-	866:  0x011A,
-	867:  0x0116,
-	868:  0x0112,
-	869:  0x0118,
-	871:  0x011C,
-	872:  0x011E,
-	873:  0x0122,
-	874:  0x0120,
-	875:  0x0124,
-	876:  0x00CD,
-	877:  0x00CC,
-	878:  0x00CF,
-	879:  0x00CE,
-	880:  0x01CF,
-	881:  0x0130,
-	882:  0x012A,
-	883:  0x012E,
-	884:  0x0128,
-	885:  0x0134,
-	886:  0x0136,
-	887:  0x0139,
-	888:  0x013D,
-	889:  0x013B,
-	890:  0x0143,
-	891:  0x0147,
-	892:  0x0145,
-	893:  0x00D1,
-	894:  0x00D3,
-	895:  0x00D2,
-	896:  0x00D6,
-	897:  0x00D4,
-	898:  0x01D1,
-	899:  0x0150,
-	900:  0x014C,
-	901:  0x00D5,
-	902:  0x0154,
-	903:  0x0158,
-	904:  0x0156,
-	905:  0x015A,
-	906:  0x015C,
-	907:  0x0160,
-	908:  0x015E,
-	909:  0x0164,
-	910:  0x0162,
-	911:  0x00DA,
-	912:  0x00D9,
-	913:  0x00DC,
-	914:  0x00DB,
-	915:  0x016C,
-	916:  0x01D3,
-	917:  0x0170,
-	918:  0x016A,
-	919:  0x0172,
-	920:  0x016E,
-	921:  0x0168,
-	922:  0x01D7,
-	923:  0x01DB,
-	924:  0x01D9,
-	925:  0x01D5,
-	926:  0x0174,
-	927:  0x00DD,
-	928:  0x0178,
-	929:  0x0176,
-	930:  0x0179,
-	931:  0x017D,
-	932:  0x017B,
-	940:  0x00E1,
-	941:  0x00E0,
-	942:  0x00E4,
-	943:  0x00E2,
-	944:  0x0103,
-	945:  0x01CE,
-	946:  0x0101,
-	947:  0x0105,
-	948:  0x00E5,
-	949:  0x00E3,
-	950:  0x0107,
-	951:  0x0109,
-	952:  0x010D,
-	953:  0x00E7,
-	954:  0x010B,
-	955:  0x010F,
-	956:  0x00E9,
-	957:  0x00E8,
-	958:  0x00EB,
-	959:  0x00EA,
-	960:  0x011B,
-	961:  0x0117,
-	962:  0x0113,
-	963:  0x0119,
-	964:  0x01F5,
-	965:  0x011D,
-	966:  0x011F,
-	968:  0x0121,
-	969:  0x0125,
-	970:  0x00ED,
-	971:  0x00EC,
-	972:  0x00EF,
-	973:  0x00EE,
-	974:  0x01D0,
-	976:  0x012B,
-	977:  0x012F,
-	978:  0x0129,
-	979:  0x0135,
-	980:  0x0137,
-	981:  0x013A,
-	982:  0x013E,
-	983:  0x013C,
-	984:  0x0144,
-	985:  0x0148,
-	986:  0x0146,
-	987:  0x00F1,
-	988:  0x00F3,
-	989:  0x00F2,
-	990:  0x00F6,
-	991:  0x00F4,
-	992:  0x01D2,
-	993:  0x0151,
-	994:  0x014D,
-	995:  0x00F5,
-	996:  0x0155,
-	997:  0x0159,
-	998:  0x0157,
-	999:  0x015B,
-	1000: 0x015D,
-	1001: 0x0161,
-	1002: 0x015F,
-	1003: 0x0165,
-	1004: 0x0163,
-	1005: 0x00FA,
-	1006: 0x00F9,
-	1007: 0x00FC,
-	1008: 0x00FB,
-	1009: 0x016D,
-	1010: 0x01D4,
-	1011: 0x0171,
-	1012: 0x016B,
-	1013: 0x0173,
-	1014: 0x016F,
-	1015: 0x0169,
-	1016: 0x01D8,
-	1017: 0x01DC,
-	1018: 0x01DA,
-	1019: 0x01D6,
-	1020: 0x0175,
-	1021: 0x00FD,
-	1022: 0x00FF,
-	1023: 0x0177,
-	1024: 0x017A,
-	1025: 0x017E,
-	1026: 0x017C,
-	1410: 0x4E02,
-	1411: 0x4E04,
-	1412: 0x4E05,
-	1413: 0x4E0C,
-	1414: 0x4E12,
-	1415: 0x4E1F,
-	1416: 0x4E23,
-	1417: 0x4E24,
-	1418: 0x4E28,
-	1419: 0x4E2B,
-	1420: 0x4E2E,
-	1421: 0x4E2F,
-	1422: 0x4E30,
-	1423: 0x4E35,
-	1424: 0x4E40,
-	1425: 0x4E41,
-	1426: 0x4E44,
-	1427: 0x4E47,
-	1428: 0x4E51,
-	1429: 0x4E5A,
-	1430: 0x4E5C,
-	1431: 0x4E63,
-	1432: 0x4E68,
-	1433: 0x4E69,
-	1434: 0x4E74,
-	1435: 0x4E75,
-	1436: 0x4E79,
-	1437: 0x4E7F,
-	1438: 0x4E8D,
-	1439: 0x4E96,
-	1440: 0x4E97,
-	1441: 0x4E9D,
-	1442: 0x4EAF,
-	1443: 0x4EB9,
-	1444: 0x4EC3,
-	1445: 0x4ED0,
-	1446: 0x4EDA,
-	1447: 0x4EDB,
-	1448: 0x4EE0,
-	1449: 0x4EE1,
-	1450: 0x4EE2,
-	1451: 0x4EE8,
-	1452: 0x4EEF,
-	1453: 0x4EF1,
-	1454: 0x4EF3,
-	1455: 0x4EF5,
-	1456: 0x4EFD,
-	1457: 0x4EFE,
-	1458: 0x4EFF,
-	1459: 0x4F00,
-	1460: 0x4F02,
-	1461: 0x4F03,
-	1462: 0x4F08,
-	1463: 0x4F0B,
-	1464: 0x4F0C,
-	1465: 0x4F12,
-	1466: 0x4F15,
-	1467: 0x4F16,
-	1468: 0x4F17,
-	1469: 0x4F19,
-	1470: 0x4F2E,
-	1471: 0x4F31,
-	1472: 0x4F60,
-	1473: 0x4F33,
-	1474: 0x4F35,
-	1475: 0x4F37,
-	1476: 0x4F39,
-	1477: 0x4F3B,
-	1478: 0x4F3E,
-	1479: 0x4F40,
-	1480: 0x4F42,
-	1481: 0x4F48,
-	1482: 0x4F49,
-	1483: 0x4F4B,
-	1484: 0x4F4C,
-	1485: 0x4F52,
-	1486: 0x4F54,
-	1487: 0x4F56,
-	1488: 0x4F58,
-	1489: 0x4F5F,
-	1490: 0x4F63,
-	1491: 0x4F6A,
-	1492: 0x4F6C,
-	1493: 0x4F6E,
-	1494: 0x4F71,
-	1495: 0x4F77,
-	1496: 0x4F78,
-	1497: 0x4F79,
-	1498: 0x4F7A,
-	1499: 0x4F7D,
-	1500: 0x4F7E,
-	1501: 0x4F81,
-	1502: 0x4F82,
-	1503: 0x4F84,
-	1504: 0x4F85,
-	1505: 0x4F89,
-	1506: 0x4F8A,
-	1507: 0x4F8C,
-	1508: 0x4F8E,
-	1509: 0x4F90,
-	1510: 0x4F92,
-	1511: 0x4F93,
-	1512: 0x4F94,
-	1513: 0x4F97,
-	1514: 0x4F99,
-	1515: 0x4F9A,
-	1516: 0x4F9E,
-	1517: 0x4F9F,
-	1518: 0x4FB2,
-	1519: 0x4FB7,
-	1520: 0x4FB9,
-	1521: 0x4FBB,
-	1522: 0x4FBC,
-	1523: 0x4FBD,
-	1524: 0x4FBE,
-	1525: 0x4FC0,
-	1526: 0x4FC1,
-	1527: 0x4FC5,
-	1528: 0x4FC6,
-	1529: 0x4FC8,
-	1530: 0x4FC9,
-	1531: 0x4FCB,
-	1532: 0x4FCC,
-	1533: 0x4FCD,
-	1534: 0x4FCF,
-	1535: 0x4FD2,
-	1536: 0x4FDC,
-	1537: 0x4FE0,
-	1538: 0x4FE2,
-	1539: 0x4FF0,
-	1540: 0x4FF2,
-	1541: 0x4FFC,
-	1542: 0x4FFD,
-	1543: 0x4FFF,
-	1544: 0x5000,
-	1545: 0x5001,
-	1546: 0x5004,
-	1547: 0x5007,
-	1548: 0x500A,
-	1549: 0x500C,
-	1550: 0x500E,
-	1551: 0x5010,
-	1552: 0x5013,
-	1553: 0x5017,
-	1554: 0x5018,
-	1555: 0x501B,
-	1556: 0x501C,
-	1557: 0x501D,
-	1558: 0x501E,
-	1559: 0x5022,
-	1560: 0x5027,
-	1561: 0x502E,
-	1562: 0x5030,
-	1563: 0x5032,
-	1564: 0x5033,
-	1565: 0x5035,
-	1566: 0x5040,
-	1567: 0x5041,
-	1568: 0x5042,
-	1569: 0x5045,
-	1570: 0x5046,
-	1571: 0x504A,
-	1572: 0x504C,
-	1573: 0x504E,
-	1574: 0x5051,
-	1575: 0x5052,
-	1576: 0x5053,
-	1577: 0x5057,
-	1578: 0x5059,
-	1579: 0x505F,
-	1580: 0x5060,
-	1581: 0x5062,
-	1582: 0x5063,
-	1583: 0x5066,
-	1584: 0x5067,
-	1585: 0x506A,
-	1586: 0x506D,
-	1587: 0x5070,
-	1588: 0x5071,
-	1589: 0x503B,
-	1590: 0x5081,
-	1591: 0x5083,
-	1592: 0x5084,
-	1593: 0x5086,
-	1594: 0x508A,
-	1595: 0x508E,
-	1596: 0x508F,
-	1597: 0x5090,
-	1598: 0x5092,
-	1599: 0x5093,
-	1600: 0x5094,
-	1601: 0x5096,
-	1602: 0x509B,
-	1603: 0x509C,
-	1604: 0x509E,
-	1605: 0x509F,
-	1606: 0x50A0,
-	1607: 0x50A1,
-	1608: 0x50A2,
-	1609: 0x50AA,
-	1610: 0x50AF,
-	1611: 0x50B0,
-	1612: 0x50B9,
-	1613: 0x50BA,
-	1614: 0x50BD,
-	1615: 0x50C0,
-	1616: 0x50C3,
-	1617: 0x50C4,
-	1618: 0x50C7,
-	1619: 0x50CC,
-	1620: 0x50CE,
-	1621: 0x50D0,
-	1622: 0x50D3,
-	1623: 0x50D4,
-	1624: 0x50D8,
-	1625: 0x50DC,
-	1626: 0x50DD,
-	1627: 0x50DF,
-	1628: 0x50E2,
-	1629: 0x50E4,
-	1630: 0x50E6,
-	1631: 0x50E8,
-	1632: 0x50E9,
-	1633: 0x50EF,
-	1634: 0x50F1,
-	1635: 0x50F6,
-	1636: 0x50FA,
-	1637: 0x50FE,
-	1638: 0x5103,
-	1639: 0x5106,
-	1640: 0x5107,
-	1641: 0x5108,
-	1642: 0x510B,
-	1643: 0x510C,
-	1644: 0x510D,
-	1645: 0x510E,
-	1646: 0x50F2,
-	1647: 0x5110,
-	1648: 0x5117,
-	1649: 0x5119,
-	1650: 0x511B,
-	1651: 0x511C,
-	1652: 0x511D,
-	1653: 0x511E,
-	1654: 0x5123,
-	1655: 0x5127,
-	1656: 0x5128,
-	1657: 0x512C,
-	1658: 0x512D,
-	1659: 0x512F,
-	1660: 0x5131,
-	1661: 0x5133,
-	1662: 0x5134,
-	1663: 0x5135,
-	1664: 0x5138,
-	1665: 0x5139,
-	1666: 0x5142,
-	1667: 0x514A,
-	1668: 0x514F,
-	1669: 0x5153,
-	1670: 0x5155,
-	1671: 0x5157,
-	1672: 0x5158,
-	1673: 0x515F,
-	1674: 0x5164,
-	1675: 0x5166,
-	1676: 0x517E,
-	1677: 0x5183,
-	1678: 0x5184,
-	1679: 0x518B,
-	1680: 0x518E,
-	1681: 0x5198,
-	1682: 0x519D,
-	1683: 0x51A1,
-	1684: 0x51A3,
-	1685: 0x51AD,
-	1686: 0x51B8,
-	1687: 0x51BA,
-	1688: 0x51BC,
-	1689: 0x51BE,
-	1690: 0x51BF,
-	1691: 0x51C2,
-	1692: 0x51C8,
-	1693: 0x51CF,
-	1694: 0x51D1,
-	1695: 0x51D2,
-	1696: 0x51D3,
-	1697: 0x51D5,
-	1698: 0x51D8,
-	1699: 0x51DE,
-	1700: 0x51E2,
-	1701: 0x51E5,
-	1702: 0x51EE,
-	1703: 0x51F2,
-	1704: 0x51F3,
-	1705: 0x51F4,
-	1706: 0x51F7,
-	1707: 0x5201,
-	1708: 0x5202,
-	1709: 0x5205,
-	1710: 0x5212,
-	1711: 0x5213,
-	1712: 0x5215,
-	1713: 0x5216,
-	1714: 0x5218,
-	1715: 0x5222,
-	1716: 0x5228,
-	1717: 0x5231,
-	1718: 0x5232,
-	1719: 0x5235,
-	1720: 0x523C,
-	1721: 0x5245,
-	1722: 0x5249,
-	1723: 0x5255,
-	1724: 0x5257,
-	1725: 0x5258,
-	1726: 0x525A,
-	1727: 0x525C,
-	1728: 0x525F,
-	1729: 0x5260,
-	1730: 0x5261,
-	1731: 0x5266,
-	1732: 0x526E,
-	1733: 0x5277,
-	1734: 0x5278,
-	1735: 0x5279,
-	1736: 0x5280,
-	1737: 0x5282,
-	1738: 0x5285,
-	1739: 0x528A,
-	1740: 0x528C,
-	1741: 0x5293,
-	1742: 0x5295,
-	1743: 0x5296,
-	1744: 0x5297,
-	1745: 0x5298,
-	1746: 0x529A,
-	1747: 0x529C,
-	1748: 0x52A4,
-	1749: 0x52A5,
-	1750: 0x52A6,
-	1751: 0x52A7,
-	1752: 0x52AF,
-	1753: 0x52B0,
-	1754: 0x52B6,
-	1755: 0x52B7,
-	1756: 0x52B8,
-	1757: 0x52BA,
-	1758: 0x52BB,
-	1759: 0x52BD,
-	1760: 0x52C0,
-	1761: 0x52C4,
-	1762: 0x52C6,
-	1763: 0x52C8,
-	1764: 0x52CC,
-	1765: 0x52CF,
-	1766: 0x52D1,
-	1767: 0x52D4,
-	1768: 0x52D6,
-	1769: 0x52DB,
-	1770: 0x52DC,
-	1771: 0x52E1,
-	1772: 0x52E5,
-	1773: 0x52E8,
-	1774: 0x52E9,
-	1775: 0x52EA,
-	1776: 0x52EC,
-	1777: 0x52F0,
-	1778: 0x52F1,
-	1779: 0x52F4,
-	1780: 0x52F6,
-	1781: 0x52F7,
-	1782: 0x5300,
-	1783: 0x5303,
-	1784: 0x530A,
-	1785: 0x530B,
-	1786: 0x530C,
-	1787: 0x5311,
-	1788: 0x5313,
-	1789: 0x5318,
-	1790: 0x531B,
-	1791: 0x531C,
-	1792: 0x531E,
-	1793: 0x531F,
-	1794: 0x5325,
-	1795: 0x5327,
-	1796: 0x5328,
-	1797: 0x5329,
-	1798: 0x532B,
-	1799: 0x532C,
-	1800: 0x532D,
-	1801: 0x5330,
-	1802: 0x5332,
-	1803: 0x5335,
-	1804: 0x533C,
-	1805: 0x533D,
-	1806: 0x533E,
-	1807: 0x5342,
-	1808: 0x534C,
-	1809: 0x534B,
-	1810: 0x5359,
-	1811: 0x535B,
-	1812: 0x5361,
-	1813: 0x5363,
-	1814: 0x5365,
-	1815: 0x536C,
-	1816: 0x536D,
-	1817: 0x5372,
-	1818: 0x5379,
-	1819: 0x537E,
-	1820: 0x5383,
-	1821: 0x5387,
-	1822: 0x5388,
-	1823: 0x538E,
-	1824: 0x5393,
-	1825: 0x5394,
-	1826: 0x5399,
-	1827: 0x539D,
-	1828: 0x53A1,
-	1829: 0x53A4,
-	1830: 0x53AA,
-	1831: 0x53AB,
-	1832: 0x53AF,
-	1833: 0x53B2,
-	1834: 0x53B4,
-	1835: 0x53B5,
-	1836: 0x53B7,
-	1837: 0x53B8,
-	1838: 0x53BA,
-	1839: 0x53BD,
-	1840: 0x53C0,
-	1841: 0x53C5,
-	1842: 0x53CF,
-	1843: 0x53D2,
-	1844: 0x53D3,
-	1845: 0x53D5,
-	1846: 0x53DA,
-	1847: 0x53DD,
-	1848: 0x53DE,
-	1849: 0x53E0,
-	1850: 0x53E6,
-	1851: 0x53E7,
-	1852: 0x53F5,
-	1853: 0x5402,
-	1854: 0x5413,
-	1855: 0x541A,
-	1856: 0x5421,
-	1857: 0x5427,
-	1858: 0x5428,
-	1859: 0x542A,
-	1860: 0x542F,
-	1861: 0x5431,
-	1862: 0x5434,
-	1863: 0x5435,
-	1864: 0x5443,
-	1865: 0x5444,
-	1866: 0x5447,
-	1867: 0x544D,
-	1868: 0x544F,
-	1869: 0x545E,
-	1870: 0x5462,
-	1871: 0x5464,
-	1872: 0x5466,
-	1873: 0x5467,
-	1874: 0x5469,
-	1875: 0x546B,
-	1876: 0x546D,
-	1877: 0x546E,
-	1878: 0x5474,
-	1879: 0x547F,
-	1880: 0x5481,
-	1881: 0x5483,
-	1882: 0x5485,
-	1883: 0x5488,
-	1884: 0x5489,
-	1885: 0x548D,
-	1886: 0x5491,
-	1887: 0x5495,
-	1888: 0x5496,
-	1889: 0x549C,
-	1890: 0x549F,
-	1891: 0x54A1,
-	1892: 0x54A6,
-	1893: 0x54A7,
-	1894: 0x54A9,
-	1895: 0x54AA,
-	1896: 0x54AD,
-	1897: 0x54AE,
-	1898: 0x54B1,
-	1899: 0x54B7,
-	1900: 0x54B9,
-	1901: 0x54BA,
-	1902: 0x54BB,
-	1903: 0x54BF,
-	1904: 0x54C6,
-	1905: 0x54CA,
-	1906: 0x54CD,
-	1907: 0x54CE,
-	1908: 0x54E0,
-	1909: 0x54EA,
-	1910: 0x54EC,
-	1911: 0x54EF,
-	1912: 0x54F6,
-	1913: 0x54FC,
-	1914: 0x54FE,
-	1915: 0x54FF,
-	1916: 0x5500,
-	1917: 0x5501,
-	1918: 0x5505,
-	1919: 0x5508,
-	1920: 0x5509,
-	1921: 0x550C,
-	1922: 0x550D,
-	1923: 0x550E,
-	1924: 0x5515,
-	1925: 0x552A,
-	1926: 0x552B,
-	1927: 0x5532,
-	1928: 0x5535,
-	1929: 0x5536,
-	1930: 0x553B,
-	1931: 0x553C,
-	1932: 0x553D,
-	1933: 0x5541,
-	1934: 0x5547,
-	1935: 0x5549,
-	1936: 0x554A,
-	1937: 0x554D,
-	1938: 0x5550,
-	1939: 0x5551,
-	1940: 0x5558,
-	1941: 0x555A,
-	1942: 0x555B,
-	1943: 0x555E,
-	1944: 0x5560,
-	1945: 0x5561,
-	1946: 0x5564,
-	1947: 0x5566,
-	1948: 0x557F,
-	1949: 0x5581,
-	1950: 0x5582,
-	1951: 0x5586,
-	1952: 0x5588,
-	1953: 0x558E,
-	1954: 0x558F,
-	1955: 0x5591,
-	1956: 0x5592,
-	1957: 0x5593,
-	1958: 0x5594,
-	1959: 0x5597,
-	1960: 0x55A3,
-	1961: 0x55A4,
-	1962: 0x55AD,
-	1963: 0x55B2,
-	1964: 0x55BF,
-	1965: 0x55C1,
-	1966: 0x55C3,
-	1967: 0x55C6,
-	1968: 0x55C9,
-	1969: 0x55CB,
-	1970: 0x55CC,
-	1971: 0x55CE,
-	1972: 0x55D1,
-	1973: 0x55D2,
-	1974: 0x55D3,
-	1975: 0x55D7,
-	1976: 0x55D8,
-	1977: 0x55DB,
-	1978: 0x55DE,
-	1979: 0x55E2,
-	1980: 0x55E9,
-	1981: 0x55F6,
-	1982: 0x55FF,
-	1983: 0x5605,
-	1984: 0x5608,
-	1985: 0x560A,
-	1986: 0x560D,
-	1987: 0x560E,
-	1988: 0x560F,
-	1989: 0x5610,
-	1990: 0x5611,
-	1991: 0x5612,
-	1992: 0x5619,
-	1993: 0x562C,
-	1994: 0x5630,
-	1995: 0x5633,
-	1996: 0x5635,
-	1997: 0x5637,
-	1998: 0x5639,
-	1999: 0x563B,
-	2000: 0x563C,
-	2001: 0x563D,
-	2002: 0x563F,
-	2003: 0x5640,
-	2004: 0x5641,
-	2005: 0x5643,
-	2006: 0x5644,
-	2007: 0x5646,
-	2008: 0x5649,
-	2009: 0x564B,
-	2010: 0x564D,
-	2011: 0x564F,
-	2012: 0x5654,
-	2013: 0x565E,
-	2014: 0x5660,
-	2015: 0x5661,
-	2016: 0x5662,
-	2017: 0x5663,
-	2018: 0x5666,
-	2019: 0x5669,
-	2020: 0x566D,
-	2021: 0x566F,
-	2022: 0x5671,
-	2023: 0x5672,
-	2024: 0x5675,
-	2025: 0x5684,
-	2026: 0x5685,
-	2027: 0x5688,
-	2028: 0x568B,
-	2029: 0x568C,
-	2030: 0x5695,
-	2031: 0x5699,
-	2032: 0x569A,
-	2033: 0x569D,
-	2034: 0x569E,
-	2035: 0x569F,
-	2036: 0x56A6,
-	2037: 0x56A7,
-	2038: 0x56A8,
-	2039: 0x56A9,
-	2040: 0x56AB,
-	2041: 0x56AC,
-	2042: 0x56AD,
-	2043: 0x56B1,
-	2044: 0x56B3,
-	2045: 0x56B7,
-	2046: 0x56BE,
-	2047: 0x56C5,
-	2048: 0x56C9,
-	2049: 0x56CA,
-	2050: 0x56CB,
-	2051: 0x56CF,
-	2052: 0x56D0,
-	2053: 0x56CC,
-	2054: 0x56CD,
-	2055: 0x56D9,
-	2056: 0x56DC,
-	2057: 0x56DD,
-	2058: 0x56DF,
-	2059: 0x56E1,
-	2060: 0x56E4,
-	2061: 0x56E5,
-	2062: 0x56E6,
-	2063: 0x56E7,
-	2064: 0x56E8,
-	2065: 0x56F1,
-	2066: 0x56EB,
-	2067: 0x56ED,
-	2068: 0x56F6,
-	2069: 0x56F7,
-	2070: 0x5701,
-	2071: 0x5702,
-	2072: 0x5707,
-	2073: 0x570A,
-	2074: 0x570C,
-	2075: 0x5711,
-	2076: 0x5715,
-	2077: 0x571A,
-	2078: 0x571B,
-	2079: 0x571D,
-	2080: 0x5720,
-	2081: 0x5722,
-	2082: 0x5723,
-	2083: 0x5724,
-	2084: 0x5725,
-	2085: 0x5729,
-	2086: 0x572A,
-	2087: 0x572C,
-	2088: 0x572E,
-	2089: 0x572F,
-	2090: 0x5733,
-	2091: 0x5734,
-	2092: 0x573D,
-	2093: 0x573E,
-	2094: 0x573F,
-	2095: 0x5745,
-	2096: 0x5746,
-	2097: 0x574C,
-	2098: 0x574D,
-	2099: 0x5752,
-	2100: 0x5762,
-	2101: 0x5765,
-	2102: 0x5767,
-	2103: 0x5768,
-	2104: 0x576B,
-	2105: 0x576D,
-	2106: 0x576E,
-	2107: 0x576F,
-	2108: 0x5770,
-	2109: 0x5771,
-	2110: 0x5773,
-	2111: 0x5774,
-	2112: 0x5775,
-	2113: 0x5777,
-	2114: 0x5779,
-	2115: 0x577A,
-	2116: 0x577B,
-	2117: 0x577C,
-	2118: 0x577E,
-	2119: 0x5781,
-	2120: 0x5783,
-	2121: 0x578C,
-	2122: 0x5794,
-	2123: 0x5797,
-	2124: 0x5799,
-	2125: 0x579A,
-	2126: 0x579C,
-	2127: 0x579D,
-	2128: 0x579E,
-	2129: 0x579F,
-	2130: 0x57A1,
-	2131: 0x5795,
-	2132: 0x57A7,
-	2133: 0x57A8,
-	2134: 0x57A9,
-	2135: 0x57AC,
-	2136: 0x57B8,
-	2137: 0x57BD,
-	2138: 0x57C7,
-	2139: 0x57C8,
-	2140: 0x57CC,
-	2141: 0x57CF,
-	2142: 0x57D5,
-	2143: 0x57DD,
-	2144: 0x57DE,
-	2145: 0x57E4,
-	2146: 0x57E6,
-	2147: 0x57E7,
-	2148: 0x57E9,
-	2149: 0x57ED,
-	2150: 0x57F0,
-	2151: 0x57F5,
-	2152: 0x57F6,
-	2153: 0x57F8,
-	2154: 0x57FD,
-	2155: 0x57FE,
-	2156: 0x57FF,
-	2157: 0x5803,
-	2158: 0x5804,
-	2159: 0x5808,
-	2160: 0x5809,
-	2161: 0x57E1,
-	2162: 0x580C,
-	2163: 0x580D,
-	2164: 0x581B,
-	2165: 0x581E,
-	2166: 0x581F,
-	2167: 0x5820,
-	2168: 0x5826,
-	2169: 0x5827,
-	2170: 0x582D,
-	2171: 0x5832,
-	2172: 0x5839,
-	2173: 0x583F,
-	2174: 0x5849,
-	2175: 0x584C,
-	2176: 0x584D,
-	2177: 0x584F,
-	2178: 0x5850,
-	2179: 0x5855,
-	2180: 0x585F,
-	2181: 0x5861,
-	2182: 0x5864,
-	2183: 0x5867,
-	2184: 0x5868,
-	2185: 0x5878,
-	2186: 0x587C,
-	2187: 0x587F,
-	2188: 0x5880,
-	2189: 0x5881,
-	2190: 0x5887,
-	2191: 0x5888,
-	2192: 0x5889,
-	2193: 0x588A,
-	2194: 0x588C,
-	2195: 0x588D,
-	2196: 0x588F,
-	2197: 0x5890,
-	2198: 0x5894,
-	2199: 0x5896,
-	2200: 0x589D,
-	2201: 0x58A0,
-	2202: 0x58A1,
-	2203: 0x58A2,
-	2204: 0x58A6,
-	2205: 0x58A9,
-	2206: 0x58B1,
-	2207: 0x58B2,
-	2208: 0x58C4,
-	2209: 0x58BC,
-	2210: 0x58C2,
-	2211: 0x58C8,
-	2212: 0x58CD,
-	2213: 0x58CE,
-	2214: 0x58D0,
-	2215: 0x58D2,
-	2216: 0x58D4,
-	2217: 0x58D6,
-	2218: 0x58DA,
-	2219: 0x58DD,
-	2220: 0x58E1,
-	2221: 0x58E2,
-	2222: 0x58E9,
-	2223: 0x58F3,
-	2224: 0x5905,
-	2225: 0x5906,
-	2226: 0x590B,
-	2227: 0x590C,
-	2228: 0x5912,
-	2229: 0x5913,
-	2230: 0x5914,
-	2231: 0x8641,
-	2232: 0x591D,
-	2233: 0x5921,
-	2234: 0x5923,
-	2235: 0x5924,
-	2236: 0x5928,
-	2237: 0x592F,
-	2238: 0x5930,
-	2239: 0x5933,
-	2240: 0x5935,
-	2241: 0x5936,
-	2242: 0x593F,
-	2243: 0x5943,
-	2244: 0x5946,
-	2245: 0x5952,
-	2246: 0x5953,
-	2247: 0x5959,
-	2248: 0x595B,
-	2249: 0x595D,
-	2250: 0x595E,
-	2251: 0x595F,
-	2252: 0x5961,
-	2253: 0x5963,
-	2254: 0x596B,
-	2255: 0x596D,
-	2256: 0x596F,
-	2257: 0x5972,
-	2258: 0x5975,
-	2259: 0x5976,
-	2260: 0x5979,
-	2261: 0x597B,
-	2262: 0x597C,
-	2263: 0x598B,
-	2264: 0x598C,
-	2265: 0x598E,
-	2266: 0x5992,
-	2267: 0x5995,
-	2268: 0x5997,
-	2269: 0x599F,
-	2270: 0x59A4,
-	2271: 0x59A7,
-	2272: 0x59AD,
-	2273: 0x59AE,
-	2274: 0x59AF,
-	2275: 0x59B0,
-	2276: 0x59B3,
-	2277: 0x59B7,
-	2278: 0x59BA,
-	2279: 0x59BC,
-	2280: 0x59C1,
-	2281: 0x59C3,
-	2282: 0x59C4,
-	2283: 0x59C8,
-	2284: 0x59CA,
-	2285: 0x59CD,
-	2286: 0x59D2,
-	2287: 0x59DD,
-	2288: 0x59DE,
-	2289: 0x59DF,
-	2290: 0x59E3,
-	2291: 0x59E4,
-	2292: 0x59E7,
-	2293: 0x59EE,
-	2294: 0x59EF,
-	2295: 0x59F1,
-	2296: 0x59F2,
-	2297: 0x59F4,
-	2298: 0x59F7,
-	2299: 0x5A00,
-	2300: 0x5A04,
-	2301: 0x5A0C,
-	2302: 0x5A0D,
-	2303: 0x5A0E,
-	2304: 0x5A12,
-	2305: 0x5A13,
-	2306: 0x5A1E,
-	2307: 0x5A23,
-	2308: 0x5A24,
-	2309: 0x5A27,
-	2310: 0x5A28,
-	2311: 0x5A2A,
-	2312: 0x5A2D,
-	2313: 0x5A30,
-	2314: 0x5A44,
-	2315: 0x5A45,
-	2316: 0x5A47,
-	2317: 0x5A48,
-	2318: 0x5A4C,
-	2319: 0x5A50,
-	2320: 0x5A55,
-	2321: 0x5A5E,
-	2322: 0x5A63,
-	2323: 0x5A65,
-	2324: 0x5A67,
-	2325: 0x5A6D,
-	2326: 0x5A77,
-	2327: 0x5A7A,
-	2328: 0x5A7B,
-	2329: 0x5A7E,
-	2330: 0x5A8B,
-	2331: 0x5A90,
-	2332: 0x5A93,
-	2333: 0x5A96,
-	2334: 0x5A99,
-	2335: 0x5A9C,
-	2336: 0x5A9E,
-	2337: 0x5A9F,
-	2338: 0x5AA0,
-	2339: 0x5AA2,
-	2340: 0x5AA7,
-	2341: 0x5AAC,
-	2342: 0x5AB1,
-	2343: 0x5AB2,
-	2344: 0x5AB3,
-	2345: 0x5AB5,
-	2346: 0x5AB8,
-	2347: 0x5ABA,
-	2348: 0x5ABB,
-	2349: 0x5ABF,
-	2350: 0x5AC4,
-	2351: 0x5AC6,
-	2352: 0x5AC8,
-	2353: 0x5ACF,
-	2354: 0x5ADA,
-	2355: 0x5ADC,
-	2356: 0x5AE0,
-	2357: 0x5AE5,
-	2358: 0x5AEA,
-	2359: 0x5AEE,
-	2360: 0x5AF5,
-	2361: 0x5AF6,
-	2362: 0x5AFD,
-	2363: 0x5B00,
-	2364: 0x5B01,
-	2365: 0x5B08,
-	2366: 0x5B17,
-	2367: 0x5B34,
-	2368: 0x5B19,
-	2369: 0x5B1B,
-	2370: 0x5B1D,
-	2371: 0x5B21,
-	2372: 0x5B25,
-	2373: 0x5B2D,
-	2374: 0x5B38,
-	2375: 0x5B41,
-	2376: 0x5B4B,
-	2377: 0x5B4C,
-	2378: 0x5B52,
-	2379: 0x5B56,
-	2380: 0x5B5E,
-	2381: 0x5B68,
-	2382: 0x5B6E,
-	2383: 0x5B6F,
-	2384: 0x5B7C,
-	2385: 0x5B7D,
-	2386: 0x5B7E,
-	2387: 0x5B7F,
-	2388: 0x5B81,
-	2389: 0x5B84,
-	2390: 0x5B86,
-	2391: 0x5B8A,
-	2392: 0x5B8E,
-	2393: 0x5B90,
-	2394: 0x5B91,
-	2395: 0x5B93,
-	2396: 0x5B94,
-	2397: 0x5B96,
-	2398: 0x5BA8,
-	2399: 0x5BA9,
-	2400: 0x5BAC,
-	2401: 0x5BAD,
-	2402: 0x5BAF,
-	2403: 0x5BB1,
-	2404: 0x5BB2,
-	2405: 0x5BB7,
-	2406: 0x5BBA,
-	2407: 0x5BBC,
-	2408: 0x5BC0,
-	2409: 0x5BC1,
-	2410: 0x5BCD,
-	2411: 0x5BCF,
-	2412: 0x5BD6,
-	2413: 0x5BD7,
-	2414: 0x5BD8,
-	2415: 0x5BD9,
-	2416: 0x5BDA,
-	2417: 0x5BE0,
-	2418: 0x5BEF,
-	2419: 0x5BF1,
-	2420: 0x5BF4,
-	2421: 0x5BFD,
-	2422: 0x5C0C,
-	2423: 0x5C17,
-	2424: 0x5C1E,
-	2425: 0x5C1F,
-	2426: 0x5C23,
-	2427: 0x5C26,
-	2428: 0x5C29,
-	2429: 0x5C2B,
-	2430: 0x5C2C,
-	2431: 0x5C2E,
-	2432: 0x5C30,
-	2433: 0x5C32,
-	2434: 0x5C35,
-	2435: 0x5C36,
-	2436: 0x5C59,
-	2437: 0x5C5A,
-	2438: 0x5C5C,
-	2439: 0x5C62,
-	2440: 0x5C63,
-	2441: 0x5C67,
-	2442: 0x5C68,
-	2443: 0x5C69,
-	2444: 0x5C6D,
-	2445: 0x5C70,
-	2446: 0x5C74,
-	2447: 0x5C75,
-	2448: 0x5C7A,
-	2449: 0x5C7B,
-	2450: 0x5C7C,
-	2451: 0x5C7D,
-	2452: 0x5C87,
-	2453: 0x5C88,
-	2454: 0x5C8A,
-	2455: 0x5C8F,
-	2456: 0x5C92,
-	2457: 0x5C9D,
-	2458: 0x5C9F,
-	2459: 0x5CA0,
-	2460: 0x5CA2,
-	2461: 0x5CA3,
-	2462: 0x5CA6,
-	2463: 0x5CAA,
-	2464: 0x5CB2,
-	2465: 0x5CB4,
-	2466: 0x5CB5,
-	2467: 0x5CBA,
-	2468: 0x5CC9,
-	2469: 0x5CCB,
-	2470: 0x5CD2,
-	2471: 0x5CDD,
-	2472: 0x5CD7,
-	2473: 0x5CEE,
-	2474: 0x5CF1,
-	2475: 0x5CF2,
-	2476: 0x5CF4,
-	2477: 0x5D01,
-	2478: 0x5D06,
-	2479: 0x5D0D,
-	2480: 0x5D12,
-	2481: 0x5D2B,
-	2482: 0x5D23,
-	2483: 0x5D24,
-	2484: 0x5D26,
-	2485: 0x5D27,
-	2486: 0x5D31,
-	2487: 0x5D34,
-	2488: 0x5D39,
-	2489: 0x5D3D,
-	2490: 0x5D3F,
-	2491: 0x5D42,
-	2492: 0x5D43,
-	2493: 0x5D46,
-	2494: 0x5D48,
-	2495: 0x5D55,
-	2496: 0x5D51,
-	2497: 0x5D59,
-	2498: 0x5D4A,
-	2499: 0x5D5F,
-	2500: 0x5D60,
-	2501: 0x5D61,
-	2502: 0x5D62,
-	2503: 0x5D64,
-	2504: 0x5D6A,
-	2505: 0x5D6D,
-	2506: 0x5D70,
-	2507: 0x5D79,
-	2508: 0x5D7A,
-	2509: 0x5D7E,
-	2510: 0x5D7F,
-	2511: 0x5D81,
-	2512: 0x5D83,
-	2513: 0x5D88,
-	2514: 0x5D8A,
-	2515: 0x5D92,
-	2516: 0x5D93,
-	2517: 0x5D94,
-	2518: 0x5D95,
-	2519: 0x5D99,
-	2520: 0x5D9B,
-	2521: 0x5D9F,
-	2522: 0x5DA0,
-	2523: 0x5DA7,
-	2524: 0x5DAB,
-	2525: 0x5DB0,
-	2526: 0x5DB4,
-	2527: 0x5DB8,
-	2528: 0x5DB9,
-	2529: 0x5DC3,
-	2530: 0x5DC7,
-	2531: 0x5DCB,
-	2532: 0x5DD0,
-	2533: 0x5DCE,
-	2534: 0x5DD8,
-	2535: 0x5DD9,
-	2536: 0x5DE0,
-	2537: 0x5DE4,
-	2538: 0x5DE9,
-	2539: 0x5DF8,
-	2540: 0x5DF9,
-	2541: 0x5E00,
-	2542: 0x5E07,
-	2543: 0x5E0D,
-	2544: 0x5E12,
-	2545: 0x5E14,
-	2546: 0x5E15,
-	2547: 0x5E18,
-	2548: 0x5E1F,
-	2549: 0x5E20,
-	2550: 0x5E2E,
-	2551: 0x5E28,
-	2552: 0x5E32,
-	2553: 0x5E35,
-	2554: 0x5E3E,
-	2555: 0x5E4B,
-	2556: 0x5E50,
-	2557: 0x5E49,
-	2558: 0x5E51,
-	2559: 0x5E56,
-	2560: 0x5E58,
-	2561: 0x5E5B,
-	2562: 0x5E5C,
-	2563: 0x5E5E,
-	2564: 0x5E68,
-	2565: 0x5E6A,
-	2566: 0x5E6B,
-	2567: 0x5E6C,
-	2568: 0x5E6D,
-	2569: 0x5E6E,
-	2570: 0x5E70,
-	2571: 0x5E80,
-	2572: 0x5E8B,
-	2573: 0x5E8E,
-	2574: 0x5EA2,
-	2575: 0x5EA4,
-	2576: 0x5EA5,
-	2577: 0x5EA8,
-	2578: 0x5EAA,
-	2579: 0x5EAC,
-	2580: 0x5EB1,
-	2581: 0x5EB3,
-	2582: 0x5EBD,
-	2583: 0x5EBE,
-	2584: 0x5EBF,
-	2585: 0x5EC6,
-	2586: 0x5ECC,
-	2587: 0x5ECB,
-	2588: 0x5ECE,
-	2589: 0x5ED1,
-	2590: 0x5ED2,
-	2591: 0x5ED4,
-	2592: 0x5ED5,
-	2593: 0x5EDC,
-	2594: 0x5EDE,
-	2595: 0x5EE5,
-	2596: 0x5EEB,
-	2597: 0x5F02,
-	2598: 0x5F06,
-	2599: 0x5F07,
-	2600: 0x5F08,
-	2601: 0x5F0E,
-	2602: 0x5F19,
-	2603: 0x5F1C,
-	2604: 0x5F1D,
-	2605: 0x5F21,
-	2606: 0x5F22,
-	2607: 0x5F23,
-	2608: 0x5F24,
-	2609: 0x5F28,
-	2610: 0x5F2B,
-	2611: 0x5F2C,
-	2612: 0x5F2E,
-	2613: 0x5F30,
-	2614: 0x5F34,
-	2615: 0x5F36,
-	2616: 0x5F3B,
-	2617: 0x5F3D,
-	2618: 0x5F3F,
-	2619: 0x5F40,
-	2620: 0x5F44,
-	2621: 0x5F45,
-	2622: 0x5F47,
-	2623: 0x5F4D,
-	2624: 0x5F50,
-	2625: 0x5F54,
-	2626: 0x5F58,
-	2627: 0x5F5B,
-	2628: 0x5F60,
-	2629: 0x5F63,
-	2630: 0x5F64,
-	2631: 0x5F67,
-	2632: 0x5F6F,
-	2633: 0x5F72,
-	2634: 0x5F74,
-	2635: 0x5F75,
-	2636: 0x5F78,
-	2637: 0x5F7A,
-	2638: 0x5F7D,
-	2639: 0x5F7E,
-	2640: 0x5F89,
-	2641: 0x5F8D,
-	2642: 0x5F8F,
-	2643: 0x5F96,
-	2644: 0x5F9C,
-	2645: 0x5F9D,
-	2646: 0x5FA2,
-	2647: 0x5FA7,
-	2648: 0x5FAB,
-	2649: 0x5FA4,
-	2650: 0x5FAC,
-	2651: 0x5FAF,
-	2652: 0x5FB0,
-	2653: 0x5FB1,
-	2654: 0x5FB8,
-	2655: 0x5FC4,
-	2656: 0x5FC7,
-	2657: 0x5FC8,
-	2658: 0x5FC9,
-	2659: 0x5FCB,
-	2660: 0x5FD0,
-	2661: 0x5FD1,
-	2662: 0x5FD2,
-	2663: 0x5FD3,
-	2664: 0x5FD4,
-	2665: 0x5FDE,
-	2666: 0x5FE1,
-	2667: 0x5FE2,
-	2668: 0x5FE8,
-	2669: 0x5FE9,
-	2670: 0x5FEA,
-	2671: 0x5FEC,
-	2672: 0x5FED,
-	2673: 0x5FEE,
-	2674: 0x5FEF,
-	2675: 0x5FF2,
-	2676: 0x5FF3,
-	2677: 0x5FF6,
-	2678: 0x5FFA,
-	2679: 0x5FFC,
-	2680: 0x6007,
-	2681: 0x600A,
-	2682: 0x600D,
-	2683: 0x6013,
-	2684: 0x6014,
-	2685: 0x6017,
-	2686: 0x6018,
-	2687: 0x601A,
-	2688: 0x601F,
-	2689: 0x6024,
-	2690: 0x602D,
-	2691: 0x6033,
-	2692: 0x6035,
-	2693: 0x6040,
-	2694: 0x6047,
-	2695: 0x6048,
-	2696: 0x6049,
-	2697: 0x604C,
-	2698: 0x6051,
-	2699: 0x6054,
-	2700: 0x6056,
-	2701: 0x6057,
-	2702: 0x605D,
-	2703: 0x6061,
-	2704: 0x6067,
-	2705: 0x6071,
-	2706: 0x607E,
-	2707: 0x607F,
-	2708: 0x6082,
-	2709: 0x6086,
-	2710: 0x6088,
-	2711: 0x608A,
-	2712: 0x608E,
-	2713: 0x6091,
-	2714: 0x6093,
-	2715: 0x6095,
-	2716: 0x6098,
-	2717: 0x609D,
-	2718: 0x609E,
-	2719: 0x60A2,
-	2720: 0x60A4,
-	2721: 0x60A5,
-	2722: 0x60A8,
-	2723: 0x60B0,
-	2724: 0x60B1,
-	2725: 0x60B7,
-	2726: 0x60BB,
-	2727: 0x60BE,
-	2728: 0x60C2,
-	2729: 0x60C4,
-	2730: 0x60C8,
-	2731: 0x60C9,
-	2732: 0x60CA,
-	2733: 0x60CB,
-	2734: 0x60CE,
-	2735: 0x60CF,
-	2736: 0x60D4,
-	2737: 0x60D5,
-	2738: 0x60D9,
-	2739: 0x60DB,
-	2740: 0x60DD,
-	2741: 0x60DE,
-	2742: 0x60E2,
-	2743: 0x60E5,
-	2744: 0x60F2,
-	2745: 0x60F5,
-	2746: 0x60F8,
-	2747: 0x60FC,
-	2748: 0x60FD,
-	2749: 0x6102,
-	2750: 0x6107,
-	2751: 0x610A,
-	2752: 0x610C,
-	2753: 0x6110,
-	2754: 0x6111,
-	2755: 0x6112,
-	2756: 0x6113,
-	2757: 0x6114,
-	2758: 0x6116,
-	2759: 0x6117,
-	2760: 0x6119,
-	2761: 0x611C,
-	2762: 0x611E,
-	2763: 0x6122,
-	2764: 0x612A,
-	2765: 0x612B,
-	2766: 0x6130,
-	2767: 0x6131,
-	2768: 0x6135,
-	2769: 0x6136,
-	2770: 0x6137,
-	2771: 0x6139,
-	2772: 0x6141,
-	2773: 0x6145,
-	2774: 0x6146,
-	2775: 0x6149,
-	2776: 0x615E,
-	2777: 0x6160,
-	2778: 0x616C,
-	2779: 0x6172,
-	2780: 0x6178,
-	2781: 0x617B,
-	2782: 0x617C,
-	2783: 0x617F,
-	2784: 0x6180,
-	2785: 0x6181,
-	2786: 0x6183,
-	2787: 0x6184,
-	2788: 0x618B,
-	2789: 0x618D,
-	2790: 0x6192,
-	2791: 0x6193,
-	2792: 0x6197,
-	2793: 0x6198,
-	2794: 0x619C,
-	2795: 0x619D,
-	2796: 0x619F,
-	2797: 0x61A0,
-	2798: 0x61A5,
-	2799: 0x61A8,
-	2800: 0x61AA,
-	2801: 0x61AD,
-	2802: 0x61B8,
-	2803: 0x61B9,
-	2804: 0x61BC,
-	2805: 0x61C0,
-	2806: 0x61C1,
-	2807: 0x61C2,
-	2808: 0x61CE,
-	2809: 0x61CF,
-	2810: 0x61D5,
-	2811: 0x61DC,
-	2812: 0x61DD,
-	2813: 0x61DE,
-	2814: 0x61DF,
-	2815: 0x61E1,
-	2816: 0x61E2,
-	2817: 0x61E7,
-	2818: 0x61E9,
-	2819: 0x61E5,
-	2820: 0x61EC,
-	2821: 0x61ED,
-	2822: 0x61EF,
-	2823: 0x6201,
-	2824: 0x6203,
-	2825: 0x6204,
-	2826: 0x6207,
-	2827: 0x6213,
-	2828: 0x6215,
-	2829: 0x621C,
-	2830: 0x6220,
-	2831: 0x6222,
-	2832: 0x6223,
-	2833: 0x6227,
-	2834: 0x6229,
-	2835: 0x622B,
-	2836: 0x6239,
-	2837: 0x623D,
-	2838: 0x6242,
-	2839: 0x6243,
-	2840: 0x6244,
-	2841: 0x6246,
-	2842: 0x624C,
-	2843: 0x6250,
-	2844: 0x6251,
-	2845: 0x6252,
-	2846: 0x6254,
-	2847: 0x6256,
-	2848: 0x625A,
-	2849: 0x625C,
-	2850: 0x6264,
-	2851: 0x626D,
-	2852: 0x626F,
-	2853: 0x6273,
-	2854: 0x627A,
-	2855: 0x627D,
-	2856: 0x628D,
-	2857: 0x628E,
-	2858: 0x628F,
-	2859: 0x6290,
-	2860: 0x62A6,
-	2861: 0x62A8,
-	2862: 0x62B3,
-	2863: 0x62B6,
-	2864: 0x62B7,
-	2865: 0x62BA,
-	2866: 0x62BE,
-	2867: 0x62BF,
-	2868: 0x62C4,
-	2869: 0x62CE,
-	2870: 0x62D5,
-	2871: 0x62D6,
-	2872: 0x62DA,
-	2873: 0x62EA,
-	2874: 0x62F2,
-	2875: 0x62F4,
-	2876: 0x62FC,
-	2877: 0x62FD,
-	2878: 0x6303,
-	2879: 0x6304,
-	2880: 0x630A,
-	2881: 0x630B,
-	2882: 0x630D,
-	2883: 0x6310,
-	2884: 0x6313,
-	2885: 0x6316,
-	2886: 0x6318,
-	2887: 0x6329,
-	2888: 0x632A,
-	2889: 0x632D,
-	2890: 0x6335,
-	2891: 0x6336,
-	2892: 0x6339,
-	2893: 0x633C,
-	2894: 0x6341,
-	2895: 0x6342,
-	2896: 0x6343,
-	2897: 0x6344,
-	2898: 0x6346,
-	2899: 0x634A,
-	2900: 0x634B,
-	2901: 0x634E,
-	2902: 0x6352,
-	2903: 0x6353,
-	2904: 0x6354,
-	2905: 0x6358,
-	2906: 0x635B,
-	2907: 0x6365,
-	2908: 0x6366,
-	2909: 0x636C,
-	2910: 0x636D,
-	2911: 0x6371,
-	2912: 0x6374,
-	2913: 0x6375,
-	2914: 0x6378,
-	2915: 0x637C,
-	2916: 0x637D,
-	2917: 0x637F,
-	2918: 0x6382,
-	2919: 0x6384,
-	2920: 0x6387,
-	2921: 0x638A,
-	2922: 0x6390,
-	2923: 0x6394,
-	2924: 0x6395,
-	2925: 0x6399,
-	2926: 0x639A,
-	2927: 0x639E,
-	2928: 0x63A4,
-	2929: 0x63A6,
-	2930: 0x63AD,
-	2931: 0x63AE,
-	2932: 0x63AF,
-	2933: 0x63BD,
-	2934: 0x63C1,
-	2935: 0x63C5,
-	2936: 0x63C8,
-	2937: 0x63CE,
-	2938: 0x63D1,
-	2939: 0x63D3,
-	2940: 0x63D4,
-	2941: 0x63D5,
-	2942: 0x63DC,
-	2943: 0x63E0,
-	2944: 0x63E5,
-	2945: 0x63EA,
-	2946: 0x63EC,
-	2947: 0x63F2,
-	2948: 0x63F3,
-	2949: 0x63F5,
-	2950: 0x63F8,
-	2951: 0x63F9,
-	2952: 0x6409,
-	2953: 0x640A,
-	2954: 0x6410,
-	2955: 0x6412,
-	2956: 0x6414,
-	2957: 0x6418,
-	2958: 0x641E,
-	2959: 0x6420,
-	2960: 0x6422,
-	2961: 0x6424,
-	2962: 0x6425,
-	2963: 0x6429,
-	2964: 0x642A,
-	2965: 0x642F,
-	2966: 0x6430,
-	2967: 0x6435,
-	2968: 0x643D,
-	2969: 0x643F,
-	2970: 0x644B,
-	2971: 0x644F,
-	2972: 0x6451,
-	2973: 0x6452,
-	2974: 0x6453,
-	2975: 0x6454,
-	2976: 0x645A,
-	2977: 0x645B,
-	2978: 0x645C,
-	2979: 0x645D,
-	2980: 0x645F,
-	2981: 0x6460,
-	2982: 0x6461,
-	2983: 0x6463,
-	2984: 0x646D,
-	2985: 0x6473,
-	2986: 0x6474,
-	2987: 0x647B,
-	2988: 0x647D,
-	2989: 0x6485,
-	2990: 0x6487,
-	2991: 0x648F,
-	2992: 0x6490,
-	2993: 0x6491,
-	2994: 0x6498,
-	2995: 0x6499,
-	2996: 0x649B,
-	2997: 0x649D,
-	2998: 0x649F,
-	2999: 0x64A1,
-	3000: 0x64A3,
-	3001: 0x64A6,
-	3002: 0x64A8,
-	3003: 0x64AC,
-	3004: 0x64B3,
-	3005: 0x64BD,
-	3006: 0x64BE,
-	3007: 0x64BF,
-	3008: 0x64C4,
-	3009: 0x64C9,
-	3010: 0x64CA,
-	3011: 0x64CB,
-	3012: 0x64CC,
-	3013: 0x64CE,
-	3014: 0x64D0,
-	3015: 0x64D1,
-	3016: 0x64D5,
-	3017: 0x64D7,
-	3018: 0x64E4,
-	3019: 0x64E5,
-	3020: 0x64E9,
-	3021: 0x64EA,
-	3022: 0x64ED,
-	3023: 0x64F0,
-	3024: 0x64F5,
-	3025: 0x64F7,
-	3026: 0x64FB,
-	3027: 0x64FF,
-	3028: 0x6501,
-	3029: 0x6504,
-	3030: 0x6508,
-	3031: 0x6509,
-	3032: 0x650A,
-	3033: 0x650F,
-	3034: 0x6513,
-	3035: 0x6514,
-	3036: 0x6516,
-	3037: 0x6519,
-	3038: 0x651B,
-	3039: 0x651E,
-	3040: 0x651F,
-	3041: 0x6522,
-	3042: 0x6526,
-	3043: 0x6529,
-	3044: 0x652E,
-	3045: 0x6531,
-	3046: 0x653A,
-	3047: 0x653C,
-	3048: 0x653D,
-	3049: 0x6543,
-	3050: 0x6547,
-	3051: 0x6549,
-	3052: 0x6550,
-	3053: 0x6552,
-	3054: 0x6554,
-	3055: 0x655F,
-	3056: 0x6560,
-	3057: 0x6567,
-	3058: 0x656B,
-	3059: 0x657A,
-	3060: 0x657D,
-	3061: 0x6581,
-	3062: 0x6585,
-	3063: 0x658A,
-	3064: 0x6592,
-	3065: 0x6595,
-	3066: 0x6598,
-	3067: 0x659D,
-	3068: 0x65A0,
-	3069: 0x65A3,
-	3070: 0x65A6,
-	3071: 0x65AE,
-	3072: 0x65B2,
-	3073: 0x65B3,
-	3074: 0x65B4,
-	3075: 0x65BF,
-	3076: 0x65C2,
-	3077: 0x65C8,
-	3078: 0x65C9,
-	3079: 0x65CE,
-	3080: 0x65D0,
-	3081: 0x65D4,
-	3082: 0x65D6,
-	3083: 0x65D8,
-	3084: 0x65DF,
-	3085: 0x65F0,
-	3086: 0x65F2,
-	3087: 0x65F4,
-	3088: 0x65F5,
-	3089: 0x65F9,
-	3090: 0x65FE,
-	3091: 0x65FF,
-	3092: 0x6600,
-	3093: 0x6604,
-	3094: 0x6608,
-	3095: 0x6609,
-	3096: 0x660D,
-	3097: 0x6611,
-	3098: 0x6612,
-	3099: 0x6615,
-	3100: 0x6616,
-	3101: 0x661D,
-	3102: 0x661E,
-	3103: 0x6621,
-	3104: 0x6622,
-	3105: 0x6623,
-	3106: 0x6624,
-	3107: 0x6626,
-	3108: 0x6629,
-	3109: 0x662A,
-	3110: 0x662B,
-	3111: 0x662C,
-	3112: 0x662E,
-	3113: 0x6630,
-	3114: 0x6631,
-	3115: 0x6633,
-	3116: 0x6639,
-	3117: 0x6637,
-	3118: 0x6640,
-	3119: 0x6645,
-	3120: 0x6646,
-	3121: 0x664A,
-	3122: 0x664C,
-	3123: 0x6651,
-	3124: 0x664E,
-	3125: 0x6657,
-	3126: 0x6658,
-	3127: 0x6659,
-	3128: 0x665B,
-	3129: 0x665C,
-	3130: 0x6660,
-	3131: 0x6661,
-	3132: 0x66FB,
-	3133: 0x666A,
-	3134: 0x666B,
-	3135: 0x666C,
-	3136: 0x667E,
-	3137: 0x6673,
-	3138: 0x6675,
-	3139: 0x667F,
-	3140: 0x6677,
-	3141: 0x6678,
-	3142: 0x6679,
-	3143: 0x667B,
-	3144: 0x6680,
-	3145: 0x667C,
-	3146: 0x668B,
-	3147: 0x668C,
-	3148: 0x668D,
-	3149: 0x6690,
-	3150: 0x6692,
-	3151: 0x6699,
-	3152: 0x669A,
-	3153: 0x669B,
-	3154: 0x669C,
-	3155: 0x669F,
-	3156: 0x66A0,
-	3157: 0x66A4,
-	3158: 0x66AD,
-	3159: 0x66B1,
-	3160: 0x66B2,
-	3161: 0x66B5,
-	3162: 0x66BB,
-	3163: 0x66BF,
-	3164: 0x66C0,
-	3165: 0x66C2,
-	3166: 0x66C3,
-	3167: 0x66C8,
-	3168: 0x66CC,
-	3169: 0x66CE,
-	3170: 0x66CF,
-	3171: 0x66D4,
-	3172: 0x66DB,
-	3173: 0x66DF,
-	3174: 0x66E8,
-	3175: 0x66EB,
-	3176: 0x66EC,
-	3177: 0x66EE,
-	3178: 0x66FA,
-	3179: 0x6705,
-	3180: 0x6707,
-	3181: 0x670E,
-	3182: 0x6713,
-	3183: 0x6719,
-	3184: 0x671C,
-	3185: 0x6720,
-	3186: 0x6722,
-	3187: 0x6733,
-	3188: 0x673E,
-	3189: 0x6745,
-	3190: 0x6747,
-	3191: 0x6748,
-	3192: 0x674C,
-	3193: 0x6754,
-	3194: 0x6755,
-	3195: 0x675D,
-	3196: 0x6766,
-	3197: 0x676C,
-	3198: 0x676E,
-	3199: 0x6774,
-	3200: 0x6776,
-	3201: 0x677B,
-	3202: 0x6781,
-	3203: 0x6784,
-	3204: 0x678E,
-	3205: 0x678F,
-	3206: 0x6791,
-	3207: 0x6793,
-	3208: 0x6796,
-	3209: 0x6798,
-	3210: 0x6799,
-	3211: 0x679B,
-	3212: 0x67B0,
-	3213: 0x67B1,
-	3214: 0x67B2,
-	3215: 0x67B5,
-	3216: 0x67BB,
-	3217: 0x67BC,
-	3218: 0x67BD,
-	3219: 0x67F9,
-	3220: 0x67C0,
-	3221: 0x67C2,
-	3222: 0x67C3,
-	3223: 0x67C5,
-	3224: 0x67C8,
-	3225: 0x67C9,
-	3226: 0x67D2,
-	3227: 0x67D7,
-	3228: 0x67D9,
-	3229: 0x67DC,
-	3230: 0x67E1,
-	3231: 0x67E6,
-	3232: 0x67F0,
-	3233: 0x67F2,
-	3234: 0x67F6,
-	3235: 0x67F7,
-	3236: 0x6852,
-	3237: 0x6814,
-	3238: 0x6819,
-	3239: 0x681D,
-	3240: 0x681F,
-	3241: 0x6828,
-	3242: 0x6827,
-	3243: 0x682C,
-	3244: 0x682D,
-	3245: 0x682F,
-	3246: 0x6830,
-	3247: 0x6831,
-	3248: 0x6833,
-	3249: 0x683B,
-	3250: 0x683F,
-	3251: 0x6844,
-	3252: 0x6845,
-	3253: 0x684A,
-	3254: 0x684C,
-	3255: 0x6855,
-	3256: 0x6857,
-	3257: 0x6858,
-	3258: 0x685B,
-	3259: 0x686B,
-	3260: 0x686E,
-	3261: 0x686F,
-	3262: 0x6870,
-	3263: 0x6871,
-	3264: 0x6872,
-	3265: 0x6875,
-	3266: 0x6879,
-	3267: 0x687A,
-	3268: 0x687B,
-	3269: 0x687C,
-	3270: 0x6882,
-	3271: 0x6884,
-	3272: 0x6886,
-	3273: 0x6888,
-	3274: 0x6896,
-	3275: 0x6898,
-	3276: 0x689A,
-	3277: 0x689C,
-	3278: 0x68A1,
-	3279: 0x68A3,
-	3280: 0x68A5,
-	3281: 0x68A9,
-	3282: 0x68AA,
-	3283: 0x68AE,
-	3284: 0x68B2,
-	3285: 0x68BB,
-	3286: 0x68C5,
-	3287: 0x68C8,
-	3288: 0x68CC,
-	3289: 0x68CF,
-	3290: 0x68D0,
-	3291: 0x68D1,
-	3292: 0x68D3,
-	3293: 0x68D6,
-	3294: 0x68D9,
-	3295: 0x68DC,
-	3296: 0x68DD,
-	3297: 0x68E5,
-	3298: 0x68E8,
-	3299: 0x68EA,
-	3300: 0x68EB,
-	3301: 0x68EC,
-	3302: 0x68ED,
-	3303: 0x68F0,
-	3304: 0x68F1,
-	3305: 0x68F5,
-	3306: 0x68F6,
-	3307: 0x68FB,
-	3308: 0x68FC,
-	3309: 0x68FD,
-	3310: 0x6906,
-	3311: 0x6909,
-	3312: 0x690A,
-	3313: 0x6910,
-	3314: 0x6911,
-	3315: 0x6913,
-	3316: 0x6916,
-	3317: 0x6917,
-	3318: 0x6931,
-	3319: 0x6933,
-	3320: 0x6935,
-	3321: 0x6938,
-	3322: 0x693B,
-	3323: 0x6942,
-	3324: 0x6945,
-	3325: 0x6949,
-	3326: 0x694E,
-	3327: 0x6957,
-	3328: 0x695B,
-	3329: 0x6963,
-	3330: 0x6964,
-	3331: 0x6965,
-	3332: 0x6966,
-	3333: 0x6968,
-	3334: 0x6969,
-	3335: 0x696C,
-	3336: 0x6970,
-	3337: 0x6971,
-	3338: 0x6972,
-	3339: 0x697A,
-	3340: 0x697B,
-	3341: 0x697F,
-	3342: 0x6980,
-	3343: 0x698D,
-	3344: 0x6992,
-	3345: 0x6996,
-	3346: 0x6998,
-	3347: 0x69A1,
-	3348: 0x69A5,
-	3349: 0x69A6,
-	3350: 0x69A8,
-	3351: 0x69AB,
-	3352: 0x69AD,
-	3353: 0x69AF,
-	3354: 0x69B7,
-	3355: 0x69B8,
-	3356: 0x69BA,
-	3357: 0x69BC,
-	3358: 0x69C5,
-	3359: 0x69C8,
-	3360: 0x69D1,
-	3361: 0x69D6,
-	3362: 0x69D7,
-	3363: 0x69E2,
-	3364: 0x69E5,
-	3365: 0x69EE,
-	3366: 0x69EF,
-	3367: 0x69F1,
-	3368: 0x69F3,
-	3369: 0x69F5,
-	3370: 0x69FE,
-	3371: 0x6A00,
-	3372: 0x6A01,
-	3373: 0x6A03,
-	3374: 0x6A0F,
-	3375: 0x6A11,
-	3376: 0x6A15,
-	3377: 0x6A1A,
-	3378: 0x6A1D,
-	3379: 0x6A20,
-	3380: 0x6A24,
-	3381: 0x6A28,
-	3382: 0x6A30,
-	3383: 0x6A32,
-	3384: 0x6A34,
-	3385: 0x6A37,
-	3386: 0x6A3B,
-	3387: 0x6A3E,
-	3388: 0x6A3F,
-	3389: 0x6A45,
-	3390: 0x6A46,
-	3391: 0x6A49,
-	3392: 0x6A4A,
-	3393: 0x6A4E,
-	3394: 0x6A50,
-	3395: 0x6A51,
-	3396: 0x6A52,
-	3397: 0x6A55,
-	3398: 0x6A56,
-	3399: 0x6A5B,
-	3400: 0x6A64,
-	3401: 0x6A67,
-	3402: 0x6A6A,
-	3403: 0x6A71,
-	3404: 0x6A73,
-	3405: 0x6A7E,
-	3406: 0x6A81,
-	3407: 0x6A83,
-	3408: 0x6A86,
-	3409: 0x6A87,
-	3410: 0x6A89,
-	3411: 0x6A8B,
-	3412: 0x6A91,
-	3413: 0x6A9B,
-	3414: 0x6A9D,
-	3415: 0x6A9E,
-	3416: 0x6A9F,
-	3417: 0x6AA5,
-	3418: 0x6AAB,
-	3419: 0x6AAF,
-	3420: 0x6AB0,
-	3421: 0x6AB1,
-	3422: 0x6AB4,
-	3423: 0x6ABD,
-	3424: 0x6ABE,
-	3425: 0x6ABF,
-	3426: 0x6AC6,
-	3427: 0x6AC9,
-	3428: 0x6AC8,
-	3429: 0x6ACC,
-	3430: 0x6AD0,
-	3431: 0x6AD4,
-	3432: 0x6AD5,
-	3433: 0x6AD6,
-	3434: 0x6ADC,
-	3435: 0x6ADD,
-	3436: 0x6AE4,
-	3437: 0x6AE7,
-	3438: 0x6AEC,
-	3439: 0x6AF0,
-	3440: 0x6AF1,
-	3441: 0x6AF2,
-	3442: 0x6AFC,
-	3443: 0x6AFD,
-	3444: 0x6B02,
-	3445: 0x6B03,
-	3446: 0x6B06,
-	3447: 0x6B07,
-	3448: 0x6B09,
-	3449: 0x6B0F,
-	3450: 0x6B10,
-	3451: 0x6B11,
-	3452: 0x6B17,
-	3453: 0x6B1B,
-	3454: 0x6B1E,
-	3455: 0x6B24,
-	3456: 0x6B28,
-	3457: 0x6B2B,
-	3458: 0x6B2C,
-	3459: 0x6B2F,
-	3460: 0x6B35,
-	3461: 0x6B36,
-	3462: 0x6B3B,
-	3463: 0x6B3F,
-	3464: 0x6B46,
-	3465: 0x6B4A,
-	3466: 0x6B4D,
-	3467: 0x6B52,
-	3468: 0x6B56,
-	3469: 0x6B58,
-	3470: 0x6B5D,
-	3471: 0x6B60,
-	3472: 0x6B67,
-	3473: 0x6B6B,
-	3474: 0x6B6E,
-	3475: 0x6B70,
-	3476: 0x6B75,
-	3477: 0x6B7D,
-	3478: 0x6B7E,
-	3479: 0x6B82,
-	3480: 0x6B85,
-	3481: 0x6B97,
-	3482: 0x6B9B,
-	3483: 0x6B9F,
-	3484: 0x6BA0,
-	3485: 0x6BA2,
-	3486: 0x6BA3,
-	3487: 0x6BA8,
-	3488: 0x6BA9,
-	3489: 0x6BAC,
-	3490: 0x6BAD,
-	3491: 0x6BAE,
-	3492: 0x6BB0,
-	3493: 0x6BB8,
-	3494: 0x6BB9,
-	3495: 0x6BBD,
-	3496: 0x6BBE,
-	3497: 0x6BC3,
-	3498: 0x6BC4,
-	3499: 0x6BC9,
-	3500: 0x6BCC,
-	3501: 0x6BD6,
-	3502: 0x6BDA,
-	3503: 0x6BE1,
-	3504: 0x6BE3,
-	3505: 0x6BE6,
-	3506: 0x6BE7,
-	3507: 0x6BEE,
-	3508: 0x6BF1,
-	3509: 0x6BF7,
-	3510: 0x6BF9,
-	3511: 0x6BFF,
-	3512: 0x6C02,
-	3513: 0x6C04,
-	3514: 0x6C05,
-	3515: 0x6C09,
-	3516: 0x6C0D,
-	3517: 0x6C0E,
-	3518: 0x6C10,
-	3519: 0x6C12,
-	3520: 0x6C19,
-	3521: 0x6C1F,
-	3522: 0x6C26,
-	3523: 0x6C27,
-	3524: 0x6C28,
-	3525: 0x6C2C,
-	3526: 0x6C2E,
-	3527: 0x6C33,
-	3528: 0x6C35,
-	3529: 0x6C36,
-	3530: 0x6C3A,
-	3531: 0x6C3B,
-	3532: 0x6C3F,
-	3533: 0x6C4A,
-	3534: 0x6C4B,
-	3535: 0x6C4D,
-	3536: 0x6C4F,
-	3537: 0x6C52,
-	3538: 0x6C54,
-	3539: 0x6C59,
-	3540: 0x6C5B,
-	3541: 0x6C5C,
-	3542: 0x6C6B,
-	3543: 0x6C6D,
-	3544: 0x6C6F,
-	3545: 0x6C74,
-	3546: 0x6C76,
-	3547: 0x6C78,
-	3548: 0x6C79,
-	3549: 0x6C7B,
-	3550: 0x6C85,
-	3551: 0x6C86,
-	3552: 0x6C87,
-	3553: 0x6C89,
-	3554: 0x6C94,
-	3555: 0x6C95,
-	3556: 0x6C97,
-	3557: 0x6C98,
-	3558: 0x6C9C,
-	3559: 0x6C9F,
-	3560: 0x6CB0,
-	3561: 0x6CB2,
-	3562: 0x6CB4,
-	3563: 0x6CC2,
-	3564: 0x6CC6,
-	3565: 0x6CCD,
-	3566: 0x6CCF,
-	3567: 0x6CD0,
-	3568: 0x6CD1,
-	3569: 0x6CD2,
-	3570: 0x6CD4,
-	3571: 0x6CD6,
-	3572: 0x6CDA,
-	3573: 0x6CDC,
-	3574: 0x6CE0,
-	3575: 0x6CE7,
-	3576: 0x6CE9,
-	3577: 0x6CEB,
-	3578: 0x6CEC,
-	3579: 0x6CEE,
-	3580: 0x6CF2,
-	3581: 0x6CF4,
-	3582: 0x6D04,
-	3583: 0x6D07,
-	3584: 0x6D0A,
-	3585: 0x6D0E,
-	3586: 0x6D0F,
-	3587: 0x6D11,
-	3588: 0x6D13,
-	3589: 0x6D1A,
-	3590: 0x6D26,
-	3591: 0x6D27,
-	3592: 0x6D28,
-	3593: 0x6C67,
-	3594: 0x6D2E,
-	3595: 0x6D2F,
-	3596: 0x6D31,
-	3597: 0x6D39,
-	3598: 0x6D3C,
-	3599: 0x6D3F,
-	3600: 0x6D57,
-	3601: 0x6D5E,
-	3602: 0x6D5F,
-	3603: 0x6D61,
-	3604: 0x6D65,
-	3605: 0x6D67,
-	3606: 0x6D6F,
-	3607: 0x6D70,
-	3608: 0x6D7C,
-	3609: 0x6D82,
-	3610: 0x6D87,
-	3611: 0x6D91,
-	3612: 0x6D92,
-	3613: 0x6D94,
-	3614: 0x6D96,
-	3615: 0x6D97,
-	3616: 0x6D98,
-	3617: 0x6DAA,
-	3618: 0x6DAC,
-	3619: 0x6DB4,
-	3620: 0x6DB7,
-	3621: 0x6DB9,
-	3622: 0x6DBD,
-	3623: 0x6DBF,
-	3624: 0x6DC4,
-	3625: 0x6DC8,
-	3626: 0x6DCA,
-	3627: 0x6DCE,
-	3628: 0x6DCF,
-	3629: 0x6DD6,
-	3630: 0x6DDB,
-	3631: 0x6DDD,
-	3632: 0x6DDF,
-	3633: 0x6DE0,
-	3634: 0x6DE2,
-	3635: 0x6DE5,
-	3636: 0x6DE9,
-	3637: 0x6DEF,
-	3638: 0x6DF0,
-	3639: 0x6DF4,
-	3640: 0x6DF6,
-	3641: 0x6DFC,
-	3642: 0x6E00,
-	3643: 0x6E04,
-	3644: 0x6E1E,
-	3645: 0x6E22,
-	3646: 0x6E27,
-	3647: 0x6E32,
-	3648: 0x6E36,
-	3649: 0x6E39,
-	3650: 0x6E3B,
-	3651: 0x6E3C,
-	3652: 0x6E44,
-	3653: 0x6E45,
-	3654: 0x6E48,
-	3655: 0x6E49,
-	3656: 0x6E4B,
-	3657: 0x6E4F,
-	3658: 0x6E51,
-	3659: 0x6E52,
-	3660: 0x6E53,
-	3661: 0x6E54,
-	3662: 0x6E57,
-	3663: 0x6E5C,
-	3664: 0x6E5D,
-	3665: 0x6E5E,
-	3666: 0x6E62,
-	3667: 0x6E63,
-	3668: 0x6E68,
-	3669: 0x6E73,
-	3670: 0x6E7B,
-	3671: 0x6E7D,
-	3672: 0x6E8D,
-	3673: 0x6E93,
-	3674: 0x6E99,
-	3675: 0x6EA0,
-	3676: 0x6EA7,
-	3677: 0x6EAD,
-	3678: 0x6EAE,
-	3679: 0x6EB1,
-	3680: 0x6EB3,
-	3681: 0x6EBB,
-	3682: 0x6EBF,
-	3683: 0x6EC0,
-	3684: 0x6EC1,
-	3685: 0x6EC3,
-	3686: 0x6EC7,
-	3687: 0x6EC8,
-	3688: 0x6ECA,
-	3689: 0x6ECD,
-	3690: 0x6ECE,
-	3691: 0x6ECF,
-	3692: 0x6EEB,
-	3693: 0x6EED,
-	3694: 0x6EEE,
-	3695: 0x6EF9,
-	3696: 0x6EFB,
-	3697: 0x6EFD,
-	3698: 0x6F04,
-	3699: 0x6F08,
-	3700: 0x6F0A,
-	3701: 0x6F0C,
-	3702: 0x6F0D,
-	3703: 0x6F16,
-	3704: 0x6F18,
-	3705: 0x6F1A,
-	3706: 0x6F1B,
-	3707: 0x6F26,
-	3708: 0x6F29,
-	3709: 0x6F2A,
-	3710: 0x6F2F,
-	3711: 0x6F30,
-	3712: 0x6F33,
-	3713: 0x6F36,
-	3714: 0x6F3B,
-	3715: 0x6F3C,
-	3716: 0x6F2D,
-	3717: 0x6F4F,
-	3718: 0x6F51,
-	3719: 0x6F52,
-	3720: 0x6F53,
-	3721: 0x6F57,
-	3722: 0x6F59,
-	3723: 0x6F5A,
-	3724: 0x6F5D,
-	3725: 0x6F5E,
-	3726: 0x6F61,
-	3727: 0x6F62,
-	3728: 0x6F68,
-	3729: 0x6F6C,
-	3730: 0x6F7D,
-	3731: 0x6F7E,
-	3732: 0x6F83,
-	3733: 0x6F87,
-	3734: 0x6F88,
-	3735: 0x6F8B,
-	3736: 0x6F8C,
-	3737: 0x6F8D,
-	3738: 0x6F90,
-	3739: 0x6F92,
-	3740: 0x6F93,
-	3741: 0x6F94,
-	3742: 0x6F96,
-	3743: 0x6F9A,
-	3744: 0x6F9F,
-	3745: 0x6FA0,
-	3746: 0x6FA5,
-	3747: 0x6FA6,
-	3748: 0x6FA7,
-	3749: 0x6FA8,
-	3750: 0x6FAE,
-	3751: 0x6FAF,
-	3752: 0x6FB0,
-	3753: 0x6FB5,
-	3754: 0x6FB6,
-	3755: 0x6FBC,
-	3756: 0x6FC5,
-	3757: 0x6FC7,
-	3758: 0x6FC8,
-	3759: 0x6FCA,
-	3760: 0x6FDA,
-	3761: 0x6FDE,
-	3762: 0x6FE8,
-	3763: 0x6FE9,
-	3764: 0x6FF0,
-	3765: 0x6FF5,
-	3766: 0x6FF9,
-	3767: 0x6FFC,
-	3768: 0x6FFD,
-	3769: 0x7000,
-	3770: 0x7005,
-	3771: 0x7006,
-	3772: 0x7007,
-	3773: 0x700D,
-	3774: 0x7017,
-	3775: 0x7020,
-	3776: 0x7023,
-	3777: 0x702F,
-	3778: 0x7034,
-	3779: 0x7037,
-	3780: 0x7039,
-	3781: 0x703C,
-	3782: 0x7043,
-	3783: 0x7044,
-	3784: 0x7048,
-	3785: 0x7049,
-	3786: 0x704A,
-	3787: 0x704B,
-	3788: 0x7054,
-	3789: 0x7055,
-	3790: 0x705D,
-	3791: 0x705E,
-	3792: 0x704E,
-	3793: 0x7064,
-	3794: 0x7065,
-	3795: 0x706C,
-	3796: 0x706E,
-	3797: 0x7075,
-	3798: 0x7076,
-	3799: 0x707E,
-	3800: 0x7081,
-	3801: 0x7085,
-	3802: 0x7086,
-	3803: 0x7094,
-	3804: 0x7095,
-	3805: 0x7096,
-	3806: 0x7097,
-	3807: 0x7098,
-	3808: 0x709B,
-	3809: 0x70A4,
-	3810: 0x70AB,
-	3811: 0x70B0,
-	3812: 0x70B1,
-	3813: 0x70B4,
-	3814: 0x70B7,
-	3815: 0x70CA,
-	3816: 0x70D1,
-	3817: 0x70D3,
-	3818: 0x70D4,
-	3819: 0x70D5,
-	3820: 0x70D6,
-	3821: 0x70D8,
-	3822: 0x70DC,
-	3823: 0x70E4,
-	3824: 0x70FA,
-	3825: 0x7103,
-	3826: 0x7104,
-	3827: 0x7105,
-	3828: 0x7106,
-	3829: 0x7107,
-	3830: 0x710B,
-	3831: 0x710C,
-	3832: 0x710F,
-	3833: 0x711E,
-	3834: 0x7120,
-	3835: 0x712B,
-	3836: 0x712D,
-	3837: 0x712F,
-	3838: 0x7130,
-	3839: 0x7131,
-	3840: 0x7138,
-	3841: 0x7141,
-	3842: 0x7145,
-	3843: 0x7146,
-	3844: 0x7147,
-	3845: 0x714A,
-	3846: 0x714B,
-	3847: 0x7150,
-	3848: 0x7152,
-	3849: 0x7157,
-	3850: 0x715A,
-	3851: 0x715C,
-	3852: 0x715E,
-	3853: 0x7160,
-	3854: 0x7168,
-	3855: 0x7179,
-	3856: 0x7180,
-	3857: 0x7185,
-	3858: 0x7187,
-	3859: 0x718C,
-	3860: 0x7192,
-	3861: 0x719A,
-	3862: 0x719B,
-	3863: 0x71A0,
-	3864: 0x71A2,
-	3865: 0x71AF,
-	3866: 0x71B0,
-	3867: 0x71B2,
-	3868: 0x71B3,
-	3869: 0x71BA,
-	3870: 0x71BF,
-	3871: 0x71C0,
-	3872: 0x71C1,
-	3873: 0x71C4,
-	3874: 0x71CB,
-	3875: 0x71CC,
-	3876: 0x71D3,
-	3877: 0x71D6,
-	3878: 0x71D9,
-	3879: 0x71DA,
-	3880: 0x71DC,
-	3881: 0x71F8,
-	3882: 0x71FE,
-	3883: 0x7200,
-	3884: 0x7207,
-	3885: 0x7208,
-	3886: 0x7209,
-	3887: 0x7213,
-	3888: 0x7217,
-	3889: 0x721A,
-	3890: 0x721D,
-	3891: 0x721F,
-	3892: 0x7224,
-	3893: 0x722B,
-	3894: 0x722F,
-	3895: 0x7234,
-	3896: 0x7238,
-	3897: 0x7239,
-	3898: 0x7241,
-	3899: 0x7242,
-	3900: 0x7243,
-	3901: 0x7245,
-	3902: 0x724E,
-	3903: 0x724F,
-	3904: 0x7250,
-	3905: 0x7253,
-	3906: 0x7255,
-	3907: 0x7256,
-	3908: 0x725A,
-	3909: 0x725C,
-	3910: 0x725E,
-	3911: 0x7260,
-	3912: 0x7263,
-	3913: 0x7268,
-	3914: 0x726B,
-	3915: 0x726E,
-	3916: 0x726F,
-	3917: 0x7271,
-	3918: 0x7277,
-	3919: 0x7278,
-	3920: 0x727B,
-	3921: 0x727C,
-	3922: 0x727F,
-	3923: 0x7284,
-	3924: 0x7289,
-	3925: 0x728D,
-	3926: 0x728E,
-	3927: 0x7293,
-	3928: 0x729B,
-	3929: 0x72A8,
-	3930: 0x72AD,
-	3931: 0x72AE,
-	3932: 0x72B1,
-	3933: 0x72B4,
-	3934: 0x72BE,
-	3935: 0x72C1,
-	3936: 0x72C7,
-	3937: 0x72C9,
-	3938: 0x72CC,
-	3939: 0x72D5,
-	3940: 0x72D6,
-	3941: 0x72D8,
-	3942: 0x72DF,
-	3943: 0x72E5,
-	3944: 0x72F3,
-	3945: 0x72F4,
-	3946: 0x72FA,
-	3947: 0x72FB,
-	3948: 0x72FE,
-	3949: 0x7302,
-	3950: 0x7304,
-	3951: 0x7305,
-	3952: 0x7307,
-	3953: 0x730B,
-	3954: 0x730D,
-	3955: 0x7312,
-	3956: 0x7313,
-	3957: 0x7318,
-	3958: 0x7319,
-	3959: 0x731E,
-	3960: 0x7322,
-	3961: 0x7324,
-	3962: 0x7327,
-	3963: 0x7328,
-	3964: 0x732C,
-	3965: 0x7331,
-	3966: 0x7332,
-	3967: 0x7335,
-	3968: 0x733A,
-	3969: 0x733B,
-	3970: 0x733D,
-	3971: 0x7343,
-	3972: 0x734D,
-	3973: 0x7350,
-	3974: 0x7352,
-	3975: 0x7356,
-	3976: 0x7358,
-	3977: 0x735D,
-	3978: 0x735E,
-	3979: 0x735F,
-	3980: 0x7360,
-	3981: 0x7366,
-	3982: 0x7367,
-	3983: 0x7369,
-	3984: 0x736B,
-	3985: 0x736C,
-	3986: 0x736E,
-	3987: 0x736F,
-	3988: 0x7371,
-	3989: 0x7377,
-	3990: 0x7379,
-	3991: 0x737C,
-	3992: 0x7380,
-	3993: 0x7381,
-	3994: 0x7383,
-	3995: 0x7385,
-	3996: 0x7386,
-	3997: 0x738E,
-	3998: 0x7390,
-	3999: 0x7393,
-	4000: 0x7395,
-	4001: 0x7397,
-	4002: 0x7398,
-	4003: 0x739C,
-	4004: 0x739E,
-	4005: 0x739F,
-	4006: 0x73A0,
-	4007: 0x73A2,
-	4008: 0x73A5,
-	4009: 0x73A6,
-	4010: 0x73AA,
-	4011: 0x73AB,
-	4012: 0x73AD,
-	4013: 0x73B5,
-	4014: 0x73B7,
-	4015: 0x73B9,
-	4016: 0x73BC,
-	4017: 0x73BD,
-	4018: 0x73BF,
-	4019: 0x73C5,
-	4020: 0x73C6,
-	4021: 0x73C9,
-	4022: 0x73CB,
-	4023: 0x73CC,
-	4024: 0x73CF,
-	4025: 0x73D2,
-	4026: 0x73D3,
-	4027: 0x73D6,
-	4028: 0x73D9,
-	4029: 0x73DD,
-	4030: 0x73E1,
-	4031: 0x73E3,
-	4032: 0x73E6,
-	4033: 0x73E7,
-	4034: 0x73E9,
-	4035: 0x73F4,
-	4036: 0x73F5,
-	4037: 0x73F7,
-	4038: 0x73F9,
-	4039: 0x73FA,
-	4040: 0x73FB,
-	4041: 0x73FD,
-	4042: 0x73FF,
-	4043: 0x7400,
-	4044: 0x7401,
-	4045: 0x7404,
-	4046: 0x7407,
-	4047: 0x740A,
-	4048: 0x7411,
-	4049: 0x741A,
-	4050: 0x741B,
-	4051: 0x7424,
-	4052: 0x7426,
-	4053: 0x7428,
-	4054: 0x7429,
-	4055: 0x742A,
-	4056: 0x742B,
-	4057: 0x742C,
-	4058: 0x742D,
-	4059: 0x742E,
-	4060: 0x742F,
-	4061: 0x7430,
-	4062: 0x7431,
-	4063: 0x7439,
-	4064: 0x7440,
-	4065: 0x7443,
-	4066: 0x7444,
-	4067: 0x7446,
-	4068: 0x7447,
-	4069: 0x744B,
-	4070: 0x744D,
-	4071: 0x7451,
-	4072: 0x7452,
-	4073: 0x7457,
-	4074: 0x745D,
-	4075: 0x7462,
-	4076: 0x7466,
-	4077: 0x7467,
-	4078: 0x7468,
-	4079: 0x746B,
-	4080: 0x746D,
-	4081: 0x746E,
-	4082: 0x7471,
-	4083: 0x7472,
-	4084: 0x7480,
-	4085: 0x7481,
-	4086: 0x7485,
-	4087: 0x7486,
-	4088: 0x7487,
-	4089: 0x7489,
-	4090: 0x748F,
-	4091: 0x7490,
-	4092: 0x7491,
-	4093: 0x7492,
-	4094: 0x7498,
-	4095: 0x7499,
-	4096: 0x749A,
-	4097: 0x749C,
-	4098: 0x749F,
-	4099: 0x74A0,
-	4100: 0x74A1,
-	4101: 0x74A3,
-	4102: 0x74A6,
-	4103: 0x74A8,
-	4104: 0x74A9,
-	4105: 0x74AA,
-	4106: 0x74AB,
-	4107: 0x74AE,
-	4108: 0x74AF,
-	4109: 0x74B1,
-	4110: 0x74B2,
-	4111: 0x74B5,
-	4112: 0x74B9,
-	4113: 0x74BB,
-	4114: 0x74BF,
-	4115: 0x74C8,
-	4116: 0x74C9,
-	4117: 0x74CC,
-	4118: 0x74D0,
-	4119: 0x74D3,
-	4120: 0x74D8,
-	4121: 0x74DA,
-	4122: 0x74DB,
-	4123: 0x74DE,
-	4124: 0x74DF,
-	4125: 0x74E4,
-	4126: 0x74E8,
-	4127: 0x74EA,
-	4128: 0x74EB,
-	4129: 0x74EF,
-	4130: 0x74F4,
-	4131: 0x74FA,
-	4132: 0x74FB,
-	4133: 0x74FC,
-	4134: 0x74FF,
-	4135: 0x7506,
-	4136: 0x7512,
-	4137: 0x7516,
-	4138: 0x7517,
-	4139: 0x7520,
-	4140: 0x7521,
-	4141: 0x7524,
-	4142: 0x7527,
-	4143: 0x7529,
-	4144: 0x752A,
-	4145: 0x752F,
-	4146: 0x7536,
-	4147: 0x7539,
-	4148: 0x753D,
-	4149: 0x753E,
-	4150: 0x753F,
-	4151: 0x7540,
-	4152: 0x7543,
-	4153: 0x7547,
-	4154: 0x7548,
-	4155: 0x754E,
-	4156: 0x7550,
-	4157: 0x7552,
-	4158: 0x7557,
-	4159: 0x755E,
-	4160: 0x755F,
-	4161: 0x7561,
-	4162: 0x756F,
-	4163: 0x7571,
-	4164: 0x7579,
-	4165: 0x757A,
-	4166: 0x757B,
-	4167: 0x757C,
-	4168: 0x757D,
-	4169: 0x757E,
-	4170: 0x7581,
-	4171: 0x7585,
-	4172: 0x7590,
-	4173: 0x7592,
-	4174: 0x7593,
-	4175: 0x7595,
-	4176: 0x7599,
-	4177: 0x759C,
-	4178: 0x75A2,
-	4179: 0x75A4,
-	4180: 0x75B4,
-	4181: 0x75BA,
-	4182: 0x75BF,
-	4183: 0x75C0,
-	4184: 0x75C1,
-	4185: 0x75C4,
-	4186: 0x75C6,
-	4187: 0x75CC,
-	4188: 0x75CE,
-	4189: 0x75CF,
-	4190: 0x75D7,
-	4191: 0x75DC,
-	4192: 0x75DF,
-	4193: 0x75E0,
-	4194: 0x75E1,
-	4195: 0x75E4,
-	4196: 0x75E7,
-	4197: 0x75EC,
-	4198: 0x75EE,
-	4199: 0x75EF,
-	4200: 0x75F1,
-	4201: 0x75F9,
-	4202: 0x7600,
-	4203: 0x7602,
-	4204: 0x7603,
-	4205: 0x7604,
-	4206: 0x7607,
-	4207: 0x7608,
-	4208: 0x760A,
-	4209: 0x760C,
-	4210: 0x760F,
-	4211: 0x7612,
-	4212: 0x7613,
-	4213: 0x7615,
-	4214: 0x7616,
-	4215: 0x7619,
-	4216: 0x761B,
-	4217: 0x761C,
-	4218: 0x761D,
-	4219: 0x761E,
-	4220: 0x7623,
-	4221: 0x7625,
-	4222: 0x7626,
-	4223: 0x7629,
-	4224: 0x762D,
-	4225: 0x7632,
-	4226: 0x7633,
-	4227: 0x7635,
-	4228: 0x7638,
-	4229: 0x7639,
-	4230: 0x763A,
-	4231: 0x763C,
-	4232: 0x764A,
-	4233: 0x7640,
-	4234: 0x7641,
-	4235: 0x7643,
-	4236: 0x7644,
-	4237: 0x7645,
-	4238: 0x7649,
-	4239: 0x764B,
-	4240: 0x7655,
-	4241: 0x7659,
-	4242: 0x765F,
-	4243: 0x7664,
-	4244: 0x7665,
-	4245: 0x766D,
-	4246: 0x766E,
-	4247: 0x766F,
-	4248: 0x7671,
-	4249: 0x7674,
-	4250: 0x7681,
-	4251: 0x7685,
-	4252: 0x768C,
-	4253: 0x768D,
-	4254: 0x7695,
-	4255: 0x769B,
-	4256: 0x769C,
-	4257: 0x769D,
-	4258: 0x769F,
-	4259: 0x76A0,
-	4260: 0x76A2,
-	4261: 0x76A3,
-	4262: 0x76A4,
-	4263: 0x76A5,
-	4264: 0x76A6,
-	4265: 0x76A7,
-	4266: 0x76A8,
-	4267: 0x76AA,
-	4268: 0x76AD,
-	4269: 0x76BD,
-	4270: 0x76C1,
-	4271: 0x76C5,
-	4272: 0x76C9,
-	4273: 0x76CB,
-	4274: 0x76CC,
-	4275: 0x76CE,
-	4276: 0x76D4,
-	4277: 0x76D9,
-	4278: 0x76E0,
-	4279: 0x76E6,
-	4280: 0x76E8,
-	4281: 0x76EC,
-	4282: 0x76F0,
-	4283: 0x76F1,
-	4284: 0x76F6,
-	4285: 0x76F9,
-	4286: 0x76FC,
-	4287: 0x7700,
-	4288: 0x7706,
-	4289: 0x770A,
-	4290: 0x770E,
-	4291: 0x7712,
-	4292: 0x7714,
-	4293: 0x7715,
-	4294: 0x7717,
-	4295: 0x7719,
-	4296: 0x771A,
-	4297: 0x771C,
-	4298: 0x7722,
-	4299: 0x7728,
-	4300: 0x772D,
-	4301: 0x772E,
-	4302: 0x772F,
-	4303: 0x7734,
-	4304: 0x7735,
-	4305: 0x7736,
-	4306: 0x7739,
-	4307: 0x773D,
-	4308: 0x773E,
-	4309: 0x7742,
-	4310: 0x7745,
-	4311: 0x7746,
-	4312: 0x774A,
-	4313: 0x774D,
-	4314: 0x774E,
-	4315: 0x774F,
-	4316: 0x7752,
-	4317: 0x7756,
-	4318: 0x7757,
-	4319: 0x775C,
-	4320: 0x775E,
-	4321: 0x775F,
-	4322: 0x7760,
-	4323: 0x7762,
-	4324: 0x7764,
-	4325: 0x7767,
-	4326: 0x776A,
-	4327: 0x776C,
-	4328: 0x7770,
-	4329: 0x7772,
-	4330: 0x7773,
-	4331: 0x7774,
-	4332: 0x777A,
-	4333: 0x777D,
-	4334: 0x7780,
-	4335: 0x7784,
-	4336: 0x778C,
-	4337: 0x778D,
-	4338: 0x7794,
-	4339: 0x7795,
-	4340: 0x7796,
-	4341: 0x779A,
-	4342: 0x779F,
-	4343: 0x77A2,
-	4344: 0x77A7,
-	4345: 0x77AA,
-	4346: 0x77AE,
-	4347: 0x77AF,
-	4348: 0x77B1,
-	4349: 0x77B5,
-	4350: 0x77BE,
-	4351: 0x77C3,
-	4352: 0x77C9,
-	4353: 0x77D1,
-	4354: 0x77D2,
-	4355: 0x77D5,
-	4356: 0x77D9,
-	4357: 0x77DE,
-	4358: 0x77DF,
-	4359: 0x77E0,
-	4360: 0x77E4,
-	4361: 0x77E6,
-	4362: 0x77EA,
-	4363: 0x77EC,
-	4364: 0x77F0,
-	4365: 0x77F1,
-	4366: 0x77F4,
-	4367: 0x77F8,
-	4368: 0x77FB,
-	4369: 0x7805,
-	4370: 0x7806,
-	4371: 0x7809,
-	4372: 0x780D,
-	4373: 0x780E,
-	4374: 0x7811,
-	4375: 0x781D,
-	4376: 0x7821,
-	4377: 0x7822,
-	4378: 0x7823,
-	4379: 0x782D,
-	4380: 0x782E,
-	4381: 0x7830,
-	4382: 0x7835,
-	4383: 0x7837,
-	4384: 0x7843,
-	4385: 0x7844,
-	4386: 0x7847,
-	4387: 0x7848,
-	4388: 0x784C,
-	4389: 0x784E,
-	4390: 0x7852,
-	4391: 0x785C,
-	4392: 0x785E,
-	4393: 0x7860,
-	4394: 0x7861,
-	4395: 0x7863,
-	4396: 0x7864,
-	4397: 0x7868,
-	4398: 0x786A,
-	4399: 0x786E,
-	4400: 0x787A,
-	4401: 0x787E,
-	4402: 0x788A,
-	4403: 0x788F,
-	4404: 0x7894,
-	4405: 0x7898,
-	4406: 0x78A1,
-	4407: 0x789D,
-	4408: 0x789E,
-	4409: 0x789F,
-	4410: 0x78A4,
-	4411: 0x78A8,
-	4412: 0x78AC,
-	4413: 0x78AD,
-	4414: 0x78B0,
-	4415: 0x78B1,
-	4416: 0x78B2,
-	4417: 0x78B3,
-	4418: 0x78BB,
-	4419: 0x78BD,
-	4420: 0x78BF,
-	4421: 0x78C7,
-	4422: 0x78C8,
-	4423: 0x78C9,
-	4424: 0x78CC,
-	4425: 0x78CE,
-	4426: 0x78D2,
-	4427: 0x78D3,
-	4428: 0x78D5,
-	4429: 0x78D6,
-	4430: 0x78E4,
-	4431: 0x78DB,
-	4432: 0x78DF,
-	4433: 0x78E0,
-	4434: 0x78E1,
-	4435: 0x78E6,
-	4436: 0x78EA,
-	4437: 0x78F2,
-	4438: 0x78F3,
-	4439: 0x7900,
-	4440: 0x78F6,
-	4441: 0x78F7,
-	4442: 0x78FA,
-	4443: 0x78FB,
-	4444: 0x78FF,
-	4445: 0x7906,
-	4446: 0x790C,
-	4447: 0x7910,
-	4448: 0x791A,
-	4449: 0x791C,
-	4450: 0x791E,
-	4451: 0x791F,
-	4452: 0x7920,
-	4453: 0x7925,
-	4454: 0x7927,
-	4455: 0x7929,
-	4456: 0x792D,
-	4457: 0x7931,
-	4458: 0x7934,
-	4459: 0x7935,
-	4460: 0x793B,
-	4461: 0x793D,
-	4462: 0x793F,
-	4463: 0x7944,
-	4464: 0x7945,
-	4465: 0x7946,
-	4466: 0x794A,
-	4467: 0x794B,
-	4468: 0x794F,
-	4469: 0x7951,
-	4470: 0x7954,
-	4471: 0x7958,
-	4472: 0x795B,
-	4473: 0x795C,
-	4474: 0x7967,
-	4475: 0x7969,
-	4476: 0x796B,
-	4477: 0x7972,
-	4478: 0x7979,
-	4479: 0x797B,
-	4480: 0x797C,
-	4481: 0x797E,
-	4482: 0x798B,
-	4483: 0x798C,
-	4484: 0x7991,
-	4485: 0x7993,
-	4486: 0x7994,
-	4487: 0x7995,
-	4488: 0x7996,
-	4489: 0x7998,
-	4490: 0x799B,
-	4491: 0x799C,
-	4492: 0x79A1,
-	4493: 0x79A8,
-	4494: 0x79A9,
-	4495: 0x79AB,
-	4496: 0x79AF,
-	4497: 0x79B1,
-	4498: 0x79B4,
-	4499: 0x79B8,
-	4500: 0x79BB,
-	4501: 0x79C2,
-	4502: 0x79C4,
-	4503: 0x79C7,
-	4504: 0x79C8,
-	4505: 0x79CA,
-	4506: 0x79CF,
-	4507: 0x79D4,
-	4508: 0x79D6,
-	4509: 0x79DA,
-	4510: 0x79DD,
-	4511: 0x79DE,
-	4512: 0x79E0,
-	4513: 0x79E2,
-	4514: 0x79E5,
-	4515: 0x79EA,
-	4516: 0x79EB,
-	4517: 0x79ED,
-	4518: 0x79F1,
-	4519: 0x79F8,
-	4520: 0x79FC,
-	4521: 0x7A02,
-	4522: 0x7A03,
-	4523: 0x7A07,
-	4524: 0x7A09,
-	4525: 0x7A0A,
-	4526: 0x7A0C,
-	4527: 0x7A11,
-	4528: 0x7A15,
-	4529: 0x7A1B,
-	4530: 0x7A1E,
-	4531: 0x7A21,
-	4532: 0x7A27,
-	4533: 0x7A2B,
-	4534: 0x7A2D,
-	4535: 0x7A2F,
-	4536: 0x7A30,
-	4537: 0x7A34,
-	4538: 0x7A35,
-	4539: 0x7A38,
-	4540: 0x7A39,
-	4541: 0x7A3A,
-	4542: 0x7A44,
-	4543: 0x7A45,
-	4544: 0x7A47,
-	4545: 0x7A48,
-	4546: 0x7A4C,
-	4547: 0x7A55,
-	4548: 0x7A56,
-	4549: 0x7A59,
-	4550: 0x7A5C,
-	4551: 0x7A5D,
-	4552: 0x7A5F,
-	4553: 0x7A60,
-	4554: 0x7A65,
-	4555: 0x7A67,
-	4556: 0x7A6A,
-	4557: 0x7A6D,
-	4558: 0x7A75,
-	4559: 0x7A78,
-	4560: 0x7A7E,
-	4561: 0x7A80,
-	4562: 0x7A82,
-	4563: 0x7A85,
-	4564: 0x7A86,
-	4565: 0x7A8A,
-	4566: 0x7A8B,
-	4567: 0x7A90,
-	4568: 0x7A91,
-	4569: 0x7A94,
-	4570: 0x7A9E,
-	4571: 0x7AA0,
-	4572: 0x7AA3,
-	4573: 0x7AAC,
-	4574: 0x7AB3,
-	4575: 0x7AB5,
-	4576: 0x7AB9,
-	4577: 0x7ABB,
-	4578: 0x7ABC,
-	4579: 0x7AC6,
-	4580: 0x7AC9,
-	4581: 0x7ACC,
-	4582: 0x7ACE,
-	4583: 0x7AD1,
-	4584: 0x7ADB,
-	4585: 0x7AE8,
-	4586: 0x7AE9,
-	4587: 0x7AEB,
-	4588: 0x7AEC,
-	4589: 0x7AF1,
-	4590: 0x7AF4,
-	4591: 0x7AFB,
-	4592: 0x7AFD,
-	4593: 0x7AFE,
-	4594: 0x7B07,
-	4595: 0x7B14,
-	4596: 0x7B1F,
-	4597: 0x7B23,
-	4598: 0x7B27,
-	4599: 0x7B29,
-	4600: 0x7B2A,
-	4601: 0x7B2B,
-	4602: 0x7B2D,
-	4603: 0x7B2E,
-	4604: 0x7B2F,
-	4605: 0x7B30,
-	4606: 0x7B31,
-	4607: 0x7B34,
-	4608: 0x7B3D,
-	4609: 0x7B3F,
-	4610: 0x7B40,
-	4611: 0x7B41,
-	4612: 0x7B47,
-	4613: 0x7B4E,
-	4614: 0x7B55,
-	4615: 0x7B60,
-	4616: 0x7B64,
-	4617: 0x7B66,
-	4618: 0x7B69,
-	4619: 0x7B6A,
-	4620: 0x7B6D,
-	4621: 0x7B6F,
-	4622: 0x7B72,
-	4623: 0x7B73,
-	4624: 0x7B77,
-	4625: 0x7B84,
-	4626: 0x7B89,
-	4627: 0x7B8E,
-	4628: 0x7B90,
-	4629: 0x7B91,
-	4630: 0x7B96,
-	4631: 0x7B9B,
-	4632: 0x7B9E,
-	4633: 0x7BA0,
-	4634: 0x7BA5,
-	4635: 0x7BAC,
-	4636: 0x7BAF,
-	4637: 0x7BB0,
-	4638: 0x7BB2,
-	4639: 0x7BB5,
-	4640: 0x7BB6,
-	4641: 0x7BBA,
-	4642: 0x7BBB,
-	4643: 0x7BBC,
-	4644: 0x7BBD,
-	4645: 0x7BC2,
-	4646: 0x7BC5,
-	4647: 0x7BC8,
-	4648: 0x7BCA,
-	4649: 0x7BD4,
-	4650: 0x7BD6,
-	4651: 0x7BD7,
-	4652: 0x7BD9,
-	4653: 0x7BDA,
-	4654: 0x7BDB,
-	4655: 0x7BE8,
-	4656: 0x7BEA,
-	4657: 0x7BF2,
-	4658: 0x7BF4,
-	4659: 0x7BF5,
-	4660: 0x7BF8,
-	4661: 0x7BF9,
-	4662: 0x7BFA,
-	4663: 0x7BFC,
-	4664: 0x7BFE,
-	4665: 0x7C01,
-	4666: 0x7C02,
-	4667: 0x7C03,
-	4668: 0x7C04,
-	4669: 0x7C06,
-	4670: 0x7C09,
-	4671: 0x7C0B,
-	4672: 0x7C0C,
-	4673: 0x7C0E,
-	4674: 0x7C0F,
-	4675: 0x7C19,
-	4676: 0x7C1B,
-	4677: 0x7C20,
-	4678: 0x7C25,
-	4679: 0x7C26,
-	4680: 0x7C28,
-	4681: 0x7C2C,
-	4682: 0x7C31,
-	4683: 0x7C33,
-	4684: 0x7C34,
-	4685: 0x7C36,
-	4686: 0x7C39,
-	4687: 0x7C3A,
-	4688: 0x7C46,
-	4689: 0x7C4A,
-	4690: 0x7C55,
-	4691: 0x7C51,
-	4692: 0x7C52,
-	4693: 0x7C53,
-	4694: 0x7C59,
-	4695: 0x7C5A,
-	4696: 0x7C5B,
-	4697: 0x7C5C,
-	4698: 0x7C5D,
-	4699: 0x7C5E,
-	4700: 0x7C61,
-	4701: 0x7C63,
-	4702: 0x7C67,
-	4703: 0x7C69,
-	4704: 0x7C6D,
-	4705: 0x7C6E,
-	4706: 0x7C70,
-	4707: 0x7C72,
-	4708: 0x7C79,
-	4709: 0x7C7C,
-	4710: 0x7C7D,
-	4711: 0x7C86,
-	4712: 0x7C87,
-	4713: 0x7C8F,
-	4714: 0x7C94,
-	4715: 0x7C9E,
-	4716: 0x7CA0,
-	4717: 0x7CA6,
-	4718: 0x7CB0,
-	4719: 0x7CB6,
-	4720: 0x7CB7,
-	4721: 0x7CBA,
-	4722: 0x7CBB,
-	4723: 0x7CBC,
-	4724: 0x7CBF,
-	4725: 0x7CC4,
-	4726: 0x7CC7,
-	4727: 0x7CC8,
-	4728: 0x7CC9,
-	4729: 0x7CCD,
-	4730: 0x7CCF,
-	4731: 0x7CD3,
-	4732: 0x7CD4,
-	4733: 0x7CD5,
-	4734: 0x7CD7,
-	4735: 0x7CD9,
-	4736: 0x7CDA,
-	4737: 0x7CDD,
-	4738: 0x7CE6,
-	4739: 0x7CE9,
-	4740: 0x7CEB,
-	4741: 0x7CF5,
-	4742: 0x7D03,
-	4743: 0x7D07,
-	4744: 0x7D08,
-	4745: 0x7D09,
-	4746: 0x7D0F,
-	4747: 0x7D11,
-	4748: 0x7D12,
-	4749: 0x7D13,
-	4750: 0x7D16,
-	4751: 0x7D1D,
-	4752: 0x7D1E,
-	4753: 0x7D23,
-	4754: 0x7D26,
-	4755: 0x7D2A,
-	4756: 0x7D2D,
-	4757: 0x7D31,
-	4758: 0x7D3C,
-	4759: 0x7D3D,
-	4760: 0x7D3E,
-	4761: 0x7D40,
-	4762: 0x7D41,
-	4763: 0x7D47,
-	4764: 0x7D48,
-	4765: 0x7D4D,
-	4766: 0x7D51,
-	4767: 0x7D53,
-	4768: 0x7D57,
-	4769: 0x7D59,
-	4770: 0x7D5A,
-	4771: 0x7D5C,
-	4772: 0x7D5D,
-	4773: 0x7D65,
-	4774: 0x7D67,
-	4775: 0x7D6A,
-	4776: 0x7D70,
-	4777: 0x7D78,
-	4778: 0x7D7A,
-	4779: 0x7D7B,
-	4780: 0x7D7F,
-	4781: 0x7D81,
-	4782: 0x7D82,
-	4783: 0x7D83,
-	4784: 0x7D85,
-	4785: 0x7D86,
-	4786: 0x7D88,
-	4787: 0x7D8B,
-	4788: 0x7D8C,
-	4789: 0x7D8D,
-	4790: 0x7D91,
-	4791: 0x7D96,
-	4792: 0x7D97,
-	4793: 0x7D9D,
-	4794: 0x7D9E,
-	4795: 0x7DA6,
-	4796: 0x7DA7,
-	4797: 0x7DAA,
-	4798: 0x7DB3,
-	4799: 0x7DB6,
-	4800: 0x7DB7,
-	4801: 0x7DB9,
-	4802: 0x7DC2,
-	4803: 0x7DC3,
-	4804: 0x7DC4,
-	4805: 0x7DC5,
-	4806: 0x7DC6,
-	4807: 0x7DCC,
-	4808: 0x7DCD,
-	4809: 0x7DCE,
-	4810: 0x7DD7,
-	4811: 0x7DD9,
-	4812: 0x7E00,
-	4813: 0x7DE2,
-	4814: 0x7DE5,
-	4815: 0x7DE6,
-	4816: 0x7DEA,
-	4817: 0x7DEB,
-	4818: 0x7DED,
-	4819: 0x7DF1,
-	4820: 0x7DF5,
-	4821: 0x7DF6,
-	4822: 0x7DF9,
-	4823: 0x7DFA,
-	4824: 0x7E08,
-	4825: 0x7E10,
-	4826: 0x7E11,
-	4827: 0x7E15,
-	4828: 0x7E17,
-	4829: 0x7E1C,
-	4830: 0x7E1D,
-	4831: 0x7E20,
-	4832: 0x7E27,
-	4833: 0x7E28,
-	4834: 0x7E2C,
-	4835: 0x7E2D,
-	4836: 0x7E2F,
-	4837: 0x7E33,
-	4838: 0x7E36,
-	4839: 0x7E3F,
-	4840: 0x7E44,
-	4841: 0x7E45,
-	4842: 0x7E47,
-	4843: 0x7E4E,
-	4844: 0x7E50,
-	4845: 0x7E52,
-	4846: 0x7E58,
-	4847: 0x7E5F,
-	4848: 0x7E61,
-	4849: 0x7E62,
-	4850: 0x7E65,
-	4851: 0x7E6B,
-	4852: 0x7E6E,
-	4853: 0x7E6F,
-	4854: 0x7E73,
-	4855: 0x7E78,
-	4856: 0x7E7E,
-	4857: 0x7E81,
-	4858: 0x7E86,
-	4859: 0x7E87,
-	4860: 0x7E8A,
-	4861: 0x7E8D,
-	4862: 0x7E91,
-	4863: 0x7E95,
-	4864: 0x7E98,
-	4865: 0x7E9A,
-	4866: 0x7E9D,
-	4867: 0x7E9E,
-	4868: 0x7F3C,
-	4869: 0x7F3B,
-	4870: 0x7F3D,
-	4871: 0x7F3E,
-	4872: 0x7F3F,
-	4873: 0x7F43,
-	4874: 0x7F44,
-	4875: 0x7F47,
-	4876: 0x7F4F,
-	4877: 0x7F52,
-	4878: 0x7F53,
-	4879: 0x7F5B,
-	4880: 0x7F5C,
-	4881: 0x7F5D,
-	4882: 0x7F61,
-	4883: 0x7F63,
-	4884: 0x7F64,
-	4885: 0x7F65,
-	4886: 0x7F66,
-	4887: 0x7F6D,
-	4888: 0x7F71,
-	4889: 0x7F7D,
-	4890: 0x7F7E,
-	4891: 0x7F7F,
-	4892: 0x7F80,
-	4893: 0x7F8B,
-	4894: 0x7F8D,
-	4895: 0x7F8F,
-	4896: 0x7F90,
-	4897: 0x7F91,
-	4898: 0x7F96,
-	4899: 0x7F97,
-	4900: 0x7F9C,
-	4901: 0x7FA1,
-	4902: 0x7FA2,
-	4903: 0x7FA6,
-	4904: 0x7FAA,
-	4905: 0x7FAD,
-	4906: 0x7FB4,
-	4907: 0x7FBC,
-	4908: 0x7FBF,
-	4909: 0x7FC0,
-	4910: 0x7FC3,
-	4911: 0x7FC8,
-	4912: 0x7FCE,
-	4913: 0x7FCF,
-	4914: 0x7FDB,
-	4915: 0x7FDF,
-	4916: 0x7FE3,
-	4917: 0x7FE5,
-	4918: 0x7FE8,
-	4919: 0x7FEC,
-	4920: 0x7FEE,
-	4921: 0x7FEF,
-	4922: 0x7FF2,
-	4923: 0x7FFA,
-	4924: 0x7FFD,
-	4925: 0x7FFE,
-	4926: 0x7FFF,
-	4927: 0x8007,
-	4928: 0x8008,
-	4929: 0x800A,
-	4930: 0x800D,
-	4931: 0x800E,
-	4932: 0x800F,
-	4933: 0x8011,
-	4934: 0x8013,
-	4935: 0x8014,
-	4936: 0x8016,
-	4937: 0x801D,
-	4938: 0x801E,
-	4939: 0x801F,
-	4940: 0x8020,
-	4941: 0x8024,
-	4942: 0x8026,
-	4943: 0x802C,
-	4944: 0x802E,
-	4945: 0x8030,
-	4946: 0x8034,
-	4947: 0x8035,
-	4948: 0x8037,
-	4949: 0x8039,
-	4950: 0x803A,
-	4951: 0x803C,
-	4952: 0x803E,
-	4953: 0x8040,
-	4954: 0x8044,
-	4955: 0x8060,
-	4956: 0x8064,
-	4957: 0x8066,
-	4958: 0x806D,
-	4959: 0x8071,
-	4960: 0x8075,
-	4961: 0x8081,
-	4962: 0x8088,
-	4963: 0x808E,
-	4964: 0x809C,
-	4965: 0x809E,
-	4966: 0x80A6,
-	4967: 0x80A7,
-	4968: 0x80AB,
-	4969: 0x80B8,
-	4970: 0x80B9,
-	4971: 0x80C8,
-	4972: 0x80CD,
-	4973: 0x80CF,
-	4974: 0x80D2,
-	4975: 0x80D4,
-	4976: 0x80D5,
-	4977: 0x80D7,
-	4978: 0x80D8,
-	4979: 0x80E0,
-	4980: 0x80ED,
-	4981: 0x80EE,
-	4982: 0x80F0,
-	4983: 0x80F2,
-	4984: 0x80F3,
-	4985: 0x80F6,
-	4986: 0x80F9,
-	4987: 0x80FA,
-	4988: 0x80FE,
-	4989: 0x8103,
-	4990: 0x810B,
-	4991: 0x8116,
-	4992: 0x8117,
-	4993: 0x8118,
-	4994: 0x811C,
-	4995: 0x811E,
-	4996: 0x8120,
-	4997: 0x8124,
-	4998: 0x8127,
-	4999: 0x812C,
-	5000: 0x8130,
-	5001: 0x8135,
-	5002: 0x813A,
-	5003: 0x813C,
-	5004: 0x8145,
-	5005: 0x8147,
-	5006: 0x814A,
-	5007: 0x814C,
-	5008: 0x8152,
-	5009: 0x8157,
-	5010: 0x8160,
-	5011: 0x8161,
-	5012: 0x8167,
-	5013: 0x8168,
-	5014: 0x8169,
-	5015: 0x816D,
-	5016: 0x816F,
-	5017: 0x8177,
-	5018: 0x8181,
-	5019: 0x8190,
-	5020: 0x8184,
-	5021: 0x8185,
-	5022: 0x8186,
-	5023: 0x818B,
-	5024: 0x818E,
-	5025: 0x8196,
-	5026: 0x8198,
-	5027: 0x819B,
-	5028: 0x819E,
-	5029: 0x81A2,
-	5030: 0x81AE,
-	5031: 0x81B2,
-	5032: 0x81B4,
-	5033: 0x81BB,
-	5034: 0x81CB,
-	5035: 0x81C3,
-	5036: 0x81C5,
-	5037: 0x81CA,
-	5038: 0x81CE,
-	5039: 0x81CF,
-	5040: 0x81D5,
-	5041: 0x81D7,
-	5042: 0x81DB,
-	5043: 0x81DD,
-	5044: 0x81DE,
-	5045: 0x81E1,
-	5046: 0x81E4,
-	5047: 0x81EB,
-	5048: 0x81EC,
-	5049: 0x81F0,
-	5050: 0x81F1,
-	5051: 0x81F2,
-	5052: 0x81F5,
-	5053: 0x81F6,
-	5054: 0x81F8,
-	5055: 0x81F9,
-	5056: 0x81FD,
-	5057: 0x81FF,
-	5058: 0x8200,
-	5059: 0x8203,
-	5060: 0x820F,
-	5061: 0x8213,
-	5062: 0x8214,
-	5063: 0x8219,
-	5064: 0x821A,
-	5065: 0x821D,
-	5066: 0x8221,
-	5067: 0x8222,
-	5068: 0x8228,
-	5069: 0x8232,
-	5070: 0x8234,
-	5071: 0x823A,
-	5072: 0x8243,
-	5073: 0x8244,
-	5074: 0x8245,
-	5075: 0x8246,
-	5076: 0x824B,
-	5077: 0x824E,
-	5078: 0x824F,
-	5079: 0x8251,
-	5080: 0x8256,
-	5081: 0x825C,
-	5082: 0x8260,
-	5083: 0x8263,
-	5084: 0x8267,
-	5085: 0x826D,
-	5086: 0x8274,
-	5087: 0x827B,
-	5088: 0x827D,
-	5089: 0x827F,
-	5090: 0x8280,
-	5091: 0x8281,
-	5092: 0x8283,
-	5093: 0x8284,
-	5094: 0x8287,
-	5095: 0x8289,
-	5096: 0x828A,
-	5097: 0x828E,
-	5098: 0x8291,
-	5099: 0x8294,
-	5100: 0x8296,
-	5101: 0x8298,
-	5102: 0x829A,
-	5103: 0x829B,
-	5104: 0x82A0,
-	5105: 0x82A1,
-	5106: 0x82A3,
-	5107: 0x82A4,
-	5108: 0x82A7,
-	5109: 0x82A8,
-	5110: 0x82A9,
-	5111: 0x82AA,
-	5112: 0x82AE,
-	5113: 0x82B0,
-	5114: 0x82B2,
-	5115: 0x82B4,
-	5116: 0x82B7,
-	5117: 0x82BA,
-	5118: 0x82BC,
-	5119: 0x82BE,
-	5120: 0x82BF,
-	5121: 0x82C6,
-	5122: 0x82D0,
-	5123: 0x82D5,
-	5124: 0x82DA,
-	5125: 0x82E0,
-	5126: 0x82E2,
-	5127: 0x82E4,
-	5128: 0x82E8,
-	5129: 0x82EA,
-	5130: 0x82ED,
-	5131: 0x82EF,
-	5132: 0x82F6,
-	5133: 0x82F7,
-	5134: 0x82FD,
-	5135: 0x82FE,
-	5136: 0x8300,
-	5137: 0x8301,
-	5138: 0x8307,
-	5139: 0x8308,
-	5140: 0x830A,
-	5141: 0x830B,
-	5142: 0x8354,
-	5143: 0x831B,
-	5144: 0x831D,
-	5145: 0x831E,
-	5146: 0x831F,
-	5147: 0x8321,
-	5148: 0x8322,
-	5149: 0x832C,
-	5150: 0x832D,
-	5151: 0x832E,
-	5152: 0x8330,
-	5153: 0x8333,
-	5154: 0x8337,
-	5155: 0x833A,
-	5156: 0x833C,
-	5157: 0x833D,
-	5158: 0x8342,
-	5159: 0x8343,
-	5160: 0x8344,
-	5161: 0x8347,
-	5162: 0x834D,
-	5163: 0x834E,
-	5164: 0x8351,
-	5165: 0x8355,
-	5166: 0x8356,
-	5167: 0x8357,
-	5168: 0x8370,
-	5169: 0x8378,
-	5170: 0x837D,
-	5171: 0x837F,
-	5172: 0x8380,
-	5173: 0x8382,
-	5174: 0x8384,
-	5175: 0x8386,
-	5176: 0x838D,
-	5177: 0x8392,
-	5178: 0x8394,
-	5179: 0x8395,
-	5180: 0x8398,
-	5181: 0x8399,
-	5182: 0x839B,
-	5183: 0x839C,
-	5184: 0x839D,
-	5185: 0x83A6,
-	5186: 0x83A7,
-	5187: 0x83A9,
-	5188: 0x83AC,
-	5189: 0x83BE,
-	5190: 0x83BF,
-	5191: 0x83C0,
-	5192: 0x83C7,
-	5193: 0x83C9,
-	5194: 0x83CF,
-	5195: 0x83D0,
-	5196: 0x83D1,
-	5197: 0x83D4,
-	5198: 0x83DD,
-	5199: 0x8353,
-	5200: 0x83E8,
-	5201: 0x83EA,
-	5202: 0x83F6,
-	5203: 0x83F8,
-	5204: 0x83F9,
-	5205: 0x83FC,
-	5206: 0x8401,
-	5207: 0x8406,
-	5208: 0x840A,
-	5209: 0x840F,
-	5210: 0x8411,
-	5211: 0x8415,
-	5212: 0x8419,
-	5213: 0x83AD,
-	5214: 0x842F,
-	5215: 0x8439,
-	5216: 0x8445,
-	5217: 0x8447,
-	5218: 0x8448,
-	5219: 0x844A,
-	5220: 0x844D,
-	5221: 0x844F,
-	5222: 0x8451,
-	5223: 0x8452,
-	5224: 0x8456,
-	5225: 0x8458,
-	5226: 0x8459,
-	5227: 0x845A,
-	5228: 0x845C,
-	5229: 0x8460,
-	5230: 0x8464,
-	5231: 0x8465,
-	5232: 0x8467,
-	5233: 0x846A,
-	5234: 0x8470,
-	5235: 0x8473,
-	5236: 0x8474,
-	5237: 0x8476,
-	5238: 0x8478,
-	5239: 0x847C,
-	5240: 0x847D,
-	5241: 0x8481,
-	5242: 0x8485,
-	5243: 0x8492,
-	5244: 0x8493,
-	5245: 0x8495,
-	5246: 0x849E,
-	5247: 0x84A6,
-	5248: 0x84A8,
-	5249: 0x84A9,
-	5250: 0x84AA,
-	5251: 0x84AF,
-	5252: 0x84B1,
-	5253: 0x84B4,
-	5254: 0x84BA,
-	5255: 0x84BD,
-	5256: 0x84BE,
-	5257: 0x84C0,
-	5258: 0x84C2,
-	5259: 0x84C7,
-	5260: 0x84C8,
-	5261: 0x84CC,
-	5262: 0x84CF,
-	5263: 0x84D3,
-	5264: 0x84DC,
-	5265: 0x84E7,
-	5266: 0x84EA,
-	5267: 0x84EF,
-	5268: 0x84F0,
-	5269: 0x84F1,
-	5270: 0x84F2,
-	5271: 0x84F7,
-	5272: 0x8532,
-	5273: 0x84FA,
-	5274: 0x84FB,
-	5275: 0x84FD,
-	5276: 0x8502,
-	5277: 0x8503,
-	5278: 0x8507,
-	5279: 0x850C,
-	5280: 0x850E,
-	5281: 0x8510,
-	5282: 0x851C,
-	5283: 0x851E,
-	5284: 0x8522,
-	5285: 0x8523,
-	5286: 0x8524,
-	5287: 0x8525,
-	5288: 0x8527,
-	5289: 0x852A,
-	5290: 0x852B,
-	5291: 0x852F,
-	5292: 0x8533,
-	5293: 0x8534,
-	5294: 0x8536,
-	5295: 0x853F,
-	5296: 0x8546,
-	5297: 0x854F,
-	5298: 0x8550,
-	5299: 0x8551,
-	5300: 0x8552,
-	5301: 0x8553,
-	5302: 0x8556,
-	5303: 0x8559,
-	5304: 0x855C,
-	5305: 0x855D,
-	5306: 0x855E,
-	5307: 0x855F,
-	5308: 0x8560,
-	5309: 0x8561,
-	5310: 0x8562,
-	5311: 0x8564,
-	5312: 0x856B,
-	5313: 0x856F,
-	5314: 0x8579,
-	5315: 0x857A,
-	5316: 0x857B,
-	5317: 0x857D,
-	5318: 0x857F,
-	5319: 0x8581,
-	5320: 0x8585,
-	5321: 0x8586,
-	5322: 0x8589,
-	5323: 0x858B,
-	5324: 0x858C,
-	5325: 0x858F,
-	5326: 0x8593,
-	5327: 0x8598,
-	5328: 0x859D,
-	5329: 0x859F,
-	5330: 0x85A0,
-	5331: 0x85A2,
-	5332: 0x85A5,
-	5333: 0x85A7,
-	5334: 0x85B4,
-	5335: 0x85B6,
-	5336: 0x85B7,
-	5337: 0x85B8,
-	5338: 0x85BC,
-	5339: 0x85BD,
-	5340: 0x85BE,
-	5341: 0x85BF,
-	5342: 0x85C2,
-	5343: 0x85C7,
-	5344: 0x85CA,
-	5345: 0x85CB,
-	5346: 0x85CE,
-	5347: 0x85AD,
-	5348: 0x85D8,
-	5349: 0x85DA,
-	5350: 0x85DF,
-	5351: 0x85E0,
-	5352: 0x85E6,
-	5353: 0x85E8,
-	5354: 0x85ED,
-	5355: 0x85F3,
-	5356: 0x85F6,
-	5357: 0x85FC,
-	5358: 0x85FF,
-	5359: 0x8600,
-	5360: 0x8604,
-	5361: 0x8605,
-	5362: 0x860D,
-	5363: 0x860E,
-	5364: 0x8610,
-	5365: 0x8611,
-	5366: 0x8612,
-	5367: 0x8618,
-	5368: 0x8619,
-	5369: 0x861B,
-	5370: 0x861E,
-	5371: 0x8621,
-	5372: 0x8627,
-	5373: 0x8629,
-	5374: 0x8636,
-	5375: 0x8638,
-	5376: 0x863A,
-	5377: 0x863C,
-	5378: 0x863D,
-	5379: 0x8640,
-	5380: 0x8642,
-	5381: 0x8646,
-	5382: 0x8652,
-	5383: 0x8653,
-	5384: 0x8656,
-	5385: 0x8657,
-	5386: 0x8658,
-	5387: 0x8659,
-	5388: 0x865D,
-	5389: 0x8660,
-	5390: 0x8661,
-	5391: 0x8662,
-	5392: 0x8663,
-	5393: 0x8664,
-	5394: 0x8669,
-	5395: 0x866C,
-	5396: 0x866F,
-	5397: 0x8675,
-	5398: 0x8676,
-	5399: 0x8677,
-	5400: 0x867A,
-	5401: 0x868D,
-	5402: 0x8691,
-	5403: 0x8696,
-	5404: 0x8698,
-	5405: 0x869A,
-	5406: 0x869C,
-	5407: 0x86A1,
-	5408: 0x86A6,
-	5409: 0x86A7,
-	5410: 0x86A8,
-	5411: 0x86AD,
-	5412: 0x86B1,
-	5413: 0x86B3,
-	5414: 0x86B4,
-	5415: 0x86B5,
-	5416: 0x86B7,
-	5417: 0x86B8,
-	5418: 0x86B9,
-	5419: 0x86BF,
-	5420: 0x86C0,
-	5421: 0x86C1,
-	5422: 0x86C3,
-	5423: 0x86C5,
-	5424: 0x86D1,
-	5425: 0x86D2,
-	5426: 0x86D5,
-	5427: 0x86D7,
-	5428: 0x86DA,
-	5429: 0x86DC,
-	5430: 0x86E0,
-	5431: 0x86E3,
-	5432: 0x86E5,
-	5433: 0x86E7,
-	5434: 0x8688,
-	5435: 0x86FA,
-	5436: 0x86FC,
-	5437: 0x86FD,
-	5438: 0x8704,
-	5439: 0x8705,
-	5440: 0x8707,
-	5441: 0x870B,
-	5442: 0x870E,
-	5443: 0x870F,
-	5444: 0x8710,
-	5445: 0x8713,
-	5446: 0x8714,
-	5447: 0x8719,
-	5448: 0x871E,
-	5449: 0x871F,
-	5450: 0x8721,
-	5451: 0x8723,
-	5452: 0x8728,
-	5453: 0x872E,
-	5454: 0x872F,
-	5455: 0x8731,
-	5456: 0x8732,
-	5457: 0x8739,
-	5458: 0x873A,
-	5459: 0x873C,
-	5460: 0x873D,
-	5461: 0x873E,
-	5462: 0x8740,
-	5463: 0x8743,
-	5464: 0x8745,
-	5465: 0x874D,
-	5466: 0x8758,
-	5467: 0x875D,
-	5468: 0x8761,
-	5469: 0x8764,
-	5470: 0x8765,
-	5471: 0x876F,
-	5472: 0x8771,
-	5473: 0x8772,
-	5474: 0x877B,
-	5475: 0x8783,
-	5476: 0x8784,
-	5477: 0x8785,
-	5478: 0x8786,
-	5479: 0x8787,
-	5480: 0x8788,
-	5481: 0x8789,
-	5482: 0x878B,
-	5483: 0x878C,
-	5484: 0x8790,
-	5485: 0x8793,
-	5486: 0x8795,
-	5487: 0x8797,
-	5488: 0x8798,
-	5489: 0x8799,
-	5490: 0x879E,
-	5491: 0x87A0,
-	5492: 0x87A3,
-	5493: 0x87A7,
-	5494: 0x87AC,
-	5495: 0x87AD,
-	5496: 0x87AE,
-	5497: 0x87B1,
-	5498: 0x87B5,
-	5499: 0x87BE,
-	5500: 0x87BF,
-	5501: 0x87C1,
-	5502: 0x87C8,
-	5503: 0x87C9,
-	5504: 0x87CA,
-	5505: 0x87CE,
-	5506: 0x87D5,
-	5507: 0x87D6,
-	5508: 0x87D9,
-	5509: 0x87DA,
-	5510: 0x87DC,
-	5511: 0x87DF,
-	5512: 0x87E2,
-	5513: 0x87E3,
-	5514: 0x87E4,
-	5515: 0x87EA,
-	5516: 0x87EB,
-	5517: 0x87ED,
-	5518: 0x87F1,
-	5519: 0x87F3,
-	5520: 0x87F8,
-	5521: 0x87FA,
-	5522: 0x87FF,
-	5523: 0x8801,
-	5524: 0x8803,
-	5525: 0x8806,
-	5526: 0x8809,
-	5527: 0x880A,
-	5528: 0x880B,
-	5529: 0x8810,
-	5530: 0x8819,
-	5531: 0x8812,
-	5532: 0x8813,
-	5533: 0x8814,
-	5534: 0x8818,
-	5535: 0x881A,
-	5536: 0x881B,
-	5537: 0x881C,
-	5538: 0x881E,
-	5539: 0x881F,
-	5540: 0x8828,
-	5541: 0x882D,
-	5542: 0x882E,
-	5543: 0x8830,
-	5544: 0x8832,
-	5545: 0x8835,
-	5546: 0x883A,
-	5547: 0x883C,
-	5548: 0x8841,
-	5549: 0x8843,
-	5550: 0x8845,
-	5551: 0x8848,
-	5552: 0x8849,
-	5553: 0x884A,
-	5554: 0x884B,
-	5555: 0x884E,
-	5556: 0x8851,
-	5557: 0x8855,
-	5558: 0x8856,
-	5559: 0x8858,
-	5560: 0x885A,
-	5561: 0x885C,
-	5562: 0x885F,
-	5563: 0x8860,
-	5564: 0x8864,
-	5565: 0x8869,
-	5566: 0x8871,
-	5567: 0x8879,
-	5568: 0x887B,
-	5569: 0x8880,
-	5570: 0x8898,
-	5571: 0x889A,
-	5572: 0x889B,
-	5573: 0x889C,
-	5574: 0x889F,
-	5575: 0x88A0,
-	5576: 0x88A8,
-	5577: 0x88AA,
-	5578: 0x88BA,
-	5579: 0x88BD,
-	5580: 0x88BE,
-	5581: 0x88C0,
-	5582: 0x88CA,
-	5583: 0x88CB,
-	5584: 0x88CC,
-	5585: 0x88CD,
-	5586: 0x88CE,
-	5587: 0x88D1,
-	5588: 0x88D2,
-	5589: 0x88D3,
-	5590: 0x88DB,
-	5591: 0x88DE,
-	5592: 0x88E7,
-	5593: 0x88EF,
-	5594: 0x88F0,
-	5595: 0x88F1,
-	5596: 0x88F5,
-	5597: 0x88F7,
-	5598: 0x8901,
-	5599: 0x8906,
-	5600: 0x890D,
-	5601: 0x890E,
-	5602: 0x890F,
-	5603: 0x8915,
-	5604: 0x8916,
-	5605: 0x8918,
-	5606: 0x8919,
-	5607: 0x891A,
-	5608: 0x891C,
-	5609: 0x8920,
-	5610: 0x8926,
-	5611: 0x8927,
-	5612: 0x8928,
-	5613: 0x8930,
-	5614: 0x8931,
-	5615: 0x8932,
-	5616: 0x8935,
-	5617: 0x8939,
-	5618: 0x893A,
-	5619: 0x893E,
-	5620: 0x8940,
-	5621: 0x8942,
-	5622: 0x8945,
-	5623: 0x8946,
-	5624: 0x8949,
-	5625: 0x894F,
-	5626: 0x8952,
-	5627: 0x8957,
-	5628: 0x895A,
-	5629: 0x895B,
-	5630: 0x895C,
-	5631: 0x8961,
-	5632: 0x8962,
-	5633: 0x8963,
-	5634: 0x896B,
-	5635: 0x896E,
-	5636: 0x8970,
-	5637: 0x8973,
-	5638: 0x8975,
-	5639: 0x897A,
-	5640: 0x897B,
-	5641: 0x897C,
-	5642: 0x897D,
-	5643: 0x8989,
-	5644: 0x898D,
-	5645: 0x8990,
-	5646: 0x8994,
-	5647: 0x8995,
-	5648: 0x899B,
-	5649: 0x899C,
-	5650: 0x899F,
-	5651: 0x89A0,
-	5652: 0x89A5,
-	5653: 0x89B0,
-	5654: 0x89B4,
-	5655: 0x89B5,
-	5656: 0x89B6,
-	5657: 0x89B7,
-	5658: 0x89BC,
-	5659: 0x89D4,
-	5660: 0x89D5,
-	5661: 0x89D6,
-	5662: 0x89D7,
-	5663: 0x89D8,
-	5664: 0x89E5,
-	5665: 0x89E9,
-	5666: 0x89EB,
-	5667: 0x89ED,
-	5668: 0x89F1,
-	5669: 0x89F3,
-	5670: 0x89F6,
-	5671: 0x89F9,
-	5672: 0x89FD,
-	5673: 0x89FF,
-	5674: 0x8A04,
-	5675: 0x8A05,
-	5676: 0x8A07,
-	5677: 0x8A0F,
-	5678: 0x8A11,
-	5679: 0x8A12,
-	5680: 0x8A14,
-	5681: 0x8A15,
-	5682: 0x8A1E,
-	5683: 0x8A20,
-	5684: 0x8A22,
-	5685: 0x8A24,
-	5686: 0x8A26,
-	5687: 0x8A2B,
-	5688: 0x8A2C,
-	5689: 0x8A2F,
-	5690: 0x8A35,
-	5691: 0x8A37,
-	5692: 0x8A3D,
-	5693: 0x8A3E,
-	5694: 0x8A40,
-	5695: 0x8A43,
-	5696: 0x8A45,
-	5697: 0x8A47,
-	5698: 0x8A49,
-	5699: 0x8A4D,
-	5700: 0x8A4E,
-	5701: 0x8A53,
-	5702: 0x8A56,
-	5703: 0x8A57,
-	5704: 0x8A58,
-	5705: 0x8A5C,
-	5706: 0x8A5D,
-	5707: 0x8A61,
-	5708: 0x8A65,
-	5709: 0x8A67,
-	5710: 0x8A75,
-	5711: 0x8A76,
-	5712: 0x8A77,
-	5713: 0x8A79,
-	5714: 0x8A7A,
-	5715: 0x8A7B,
-	5716: 0x8A7E,
-	5717: 0x8A7F,
-	5718: 0x8A80,
-	5719: 0x8A83,
-	5720: 0x8A86,
-	5721: 0x8A8B,
-	5722: 0x8A8F,
-	5723: 0x8A90,
-	5724: 0x8A92,
-	5725: 0x8A96,
-	5726: 0x8A97,
-	5727: 0x8A99,
-	5728: 0x8A9F,
-	5729: 0x8AA7,
-	5730: 0x8AA9,
-	5731: 0x8AAE,
-	5732: 0x8AAF,
-	5733: 0x8AB3,
-	5734: 0x8AB6,
-	5735: 0x8AB7,
-	5736: 0x8ABB,
-	5737: 0x8ABE,
-	5738: 0x8AC3,
-	5739: 0x8AC6,
-	5740: 0x8AC8,
-	5741: 0x8AC9,
-	5742: 0x8ACA,
-	5743: 0x8AD1,
-	5744: 0x8AD3,
-	5745: 0x8AD4,
-	5746: 0x8AD5,
-	5747: 0x8AD7,
-	5748: 0x8ADD,
-	5749: 0x8ADF,
-	5750: 0x8AEC,
-	5751: 0x8AF0,
-	5752: 0x8AF4,
-	5753: 0x8AF5,
-	5754: 0x8AF6,
-	5755: 0x8AFC,
-	5756: 0x8AFF,
-	5757: 0x8B05,
-	5758: 0x8B06,
-	5759: 0x8B0B,
-	5760: 0x8B11,
-	5761: 0x8B1C,
-	5762: 0x8B1E,
-	5763: 0x8B1F,
-	5764: 0x8B0A,
-	5765: 0x8B2D,
-	5766: 0x8B30,
-	5767: 0x8B37,
-	5768: 0x8B3C,
-	5769: 0x8B42,
-	5770: 0x8B43,
-	5771: 0x8B44,
-	5772: 0x8B45,
-	5773: 0x8B46,
-	5774: 0x8B48,
-	5775: 0x8B52,
-	5776: 0x8B53,
-	5777: 0x8B54,
-	5778: 0x8B59,
-	5779: 0x8B4D,
-	5780: 0x8B5E,
-	5781: 0x8B63,
-	5782: 0x8B6D,
-	5783: 0x8B76,
-	5784: 0x8B78,
-	5785: 0x8B79,
-	5786: 0x8B7C,
-	5787: 0x8B7E,
-	5788: 0x8B81,
-	5789: 0x8B84,
-	5790: 0x8B85,
-	5791: 0x8B8B,
-	5792: 0x8B8D,
-	5793: 0x8B8F,
-	5794: 0x8B94,
-	5795: 0x8B95,
-	5796: 0x8B9C,
-	5797: 0x8B9E,
-	5798: 0x8B9F,
-	5799: 0x8C38,
-	5800: 0x8C39,
-	5801: 0x8C3D,
-	5802: 0x8C3E,
-	5803: 0x8C45,
-	5804: 0x8C47,
-	5805: 0x8C49,
-	5806: 0x8C4B,
-	5807: 0x8C4F,
-	5808: 0x8C51,
-	5809: 0x8C53,
-	5810: 0x8C54,
-	5811: 0x8C57,
-	5812: 0x8C58,
-	5813: 0x8C5B,
-	5814: 0x8C5D,
-	5815: 0x8C59,
-	5816: 0x8C63,
-	5817: 0x8C64,
-	5818: 0x8C66,
-	5819: 0x8C68,
-	5820: 0x8C69,
-	5821: 0x8C6D,
-	5822: 0x8C73,
-	5823: 0x8C75,
-	5824: 0x8C76,
-	5825: 0x8C7B,
-	5826: 0x8C7E,
-	5827: 0x8C86,
-	5828: 0x8C87,
-	5829: 0x8C8B,
-	5830: 0x8C90,
-	5831: 0x8C92,
-	5832: 0x8C93,
-	5833: 0x8C99,
-	5834: 0x8C9B,
-	5835: 0x8C9C,
-	5836: 0x8CA4,
-	5837: 0x8CB9,
-	5838: 0x8CBA,
-	5839: 0x8CC5,
-	5840: 0x8CC6,
-	5841: 0x8CC9,
-	5842: 0x8CCB,
-	5843: 0x8CCF,
-	5844: 0x8CD6,
-	5845: 0x8CD5,
-	5846: 0x8CD9,
-	5847: 0x8CDD,
-	5848: 0x8CE1,
-	5849: 0x8CE8,
-	5850: 0x8CEC,
-	5851: 0x8CEF,
-	5852: 0x8CF0,
-	5853: 0x8CF2,
-	5854: 0x8CF5,
-	5855: 0x8CF7,
-	5856: 0x8CF8,
-	5857: 0x8CFE,
-	5858: 0x8CFF,
-	5859: 0x8D01,
-	5860: 0x8D03,
-	5861: 0x8D09,
-	5862: 0x8D12,
-	5863: 0x8D17,
-	5864: 0x8D1B,
-	5865: 0x8D65,
-	5866: 0x8D69,
-	5867: 0x8D6C,
-	5868: 0x8D6E,
-	5869: 0x8D7F,
-	5870: 0x8D82,
-	5871: 0x8D84,
-	5872: 0x8D88,
-	5873: 0x8D8D,
-	5874: 0x8D90,
-	5875: 0x8D91,
-	5876: 0x8D95,
-	5877: 0x8D9E,
-	5878: 0x8D9F,
-	5879: 0x8DA0,
-	5880: 0x8DA6,
-	5881: 0x8DAB,
-	5882: 0x8DAC,
-	5883: 0x8DAF,
-	5884: 0x8DB2,
-	5885: 0x8DB5,
-	5886: 0x8DB7,
-	5887: 0x8DB9,
-	5888: 0x8DBB,
-	5889: 0x8DC0,
-	5890: 0x8DC5,
-	5891: 0x8DC6,
-	5892: 0x8DC7,
-	5893: 0x8DC8,
-	5894: 0x8DCA,
-	5895: 0x8DCE,
-	5896: 0x8DD1,
-	5897: 0x8DD4,
-	5898: 0x8DD5,
-	5899: 0x8DD7,
-	5900: 0x8DD9,
-	5901: 0x8DE4,
-	5902: 0x8DE5,
-	5903: 0x8DE7,
-	5904: 0x8DEC,
-	5905: 0x8DF0,
-	5906: 0x8DBC,
-	5907: 0x8DF1,
-	5908: 0x8DF2,
-	5909: 0x8DF4,
-	5910: 0x8DFD,
-	5911: 0x8E01,
-	5912: 0x8E04,
-	5913: 0x8E05,
-	5914: 0x8E06,
-	5915: 0x8E0B,
-	5916: 0x8E11,
-	5917: 0x8E14,
-	5918: 0x8E16,
-	5919: 0x8E20,
-	5920: 0x8E21,
-	5921: 0x8E22,
-	5922: 0x8E23,
-	5923: 0x8E26,
-	5924: 0x8E27,
-	5925: 0x8E31,
-	5926: 0x8E33,
-	5927: 0x8E36,
-	5928: 0x8E37,
-	5929: 0x8E38,
-	5930: 0x8E39,
-	5931: 0x8E3D,
-	5932: 0x8E40,
-	5933: 0x8E41,
-	5934: 0x8E4B,
-	5935: 0x8E4D,
-	5936: 0x8E4E,
-	5937: 0x8E4F,
-	5938: 0x8E54,
-	5939: 0x8E5B,
-	5940: 0x8E5C,
-	5941: 0x8E5D,
-	5942: 0x8E5E,
-	5943: 0x8E61,
-	5944: 0x8E62,
-	5945: 0x8E69,
-	5946: 0x8E6C,
-	5947: 0x8E6D,
-	5948: 0x8E6F,
-	5949: 0x8E70,
-	5950: 0x8E71,
-	5951: 0x8E79,
-	5952: 0x8E7A,
-	5953: 0x8E7B,
-	5954: 0x8E82,
-	5955: 0x8E83,
-	5956: 0x8E89,
-	5957: 0x8E90,
-	5958: 0x8E92,
-	5959: 0x8E95,
-	5960: 0x8E9A,
-	5961: 0x8E9B,
-	5962: 0x8E9D,
-	5963: 0x8E9E,
-	5964: 0x8EA2,
-	5965: 0x8EA7,
-	5966: 0x8EA9,
-	5967: 0x8EAD,
-	5968: 0x8EAE,
-	5969: 0x8EB3,
-	5970: 0x8EB5,
-	5971: 0x8EBA,
-	5972: 0x8EBB,
-	5973: 0x8EC0,
-	5974: 0x8EC1,
-	5975: 0x8EC3,
-	5976: 0x8EC4,
-	5977: 0x8EC7,
-	5978: 0x8ECF,
-	5979: 0x8ED1,
-	5980: 0x8ED4,
-	5981: 0x8EDC,
-	5982: 0x8EE8,
-	5983: 0x8EEE,
-	5984: 0x8EF0,
-	5985: 0x8EF1,
-	5986: 0x8EF7,
-	5987: 0x8EF9,
-	5988: 0x8EFA,
-	5989: 0x8EED,
-	5990: 0x8F00,
-	5991: 0x8F02,
-	5992: 0x8F07,
-	5993: 0x8F08,
-	5994: 0x8F0F,
-	5995: 0x8F10,
-	5996: 0x8F16,
-	5997: 0x8F17,
-	5998: 0x8F18,
-	5999: 0x8F1E,
-	6000: 0x8F20,
-	6001: 0x8F21,
-	6002: 0x8F23,
-	6003: 0x8F25,
-	6004: 0x8F27,
-	6005: 0x8F28,
-	6006: 0x8F2C,
-	6007: 0x8F2D,
-	6008: 0x8F2E,
-	6009: 0x8F34,
-	6010: 0x8F35,
-	6011: 0x8F36,
-	6012: 0x8F37,
-	6013: 0x8F3A,
-	6014: 0x8F40,
-	6015: 0x8F41,
-	6016: 0x8F43,
-	6017: 0x8F47,
-	6018: 0x8F4F,
-	6019: 0x8F51,
-	6020: 0x8F52,
-	6021: 0x8F53,
-	6022: 0x8F54,
-	6023: 0x8F55,
-	6024: 0x8F58,
-	6025: 0x8F5D,
-	6026: 0x8F5E,
-	6027: 0x8F65,
-	6028: 0x8F9D,
-	6029: 0x8FA0,
-	6030: 0x8FA1,
-	6031: 0x8FA4,
-	6032: 0x8FA5,
-	6033: 0x8FA6,
-	6034: 0x8FB5,
-	6035: 0x8FB6,
-	6036: 0x8FB8,
-	6037: 0x8FBE,
-	6038: 0x8FC0,
-	6039: 0x8FC1,
-	6040: 0x8FC6,
-	6041: 0x8FCA,
-	6042: 0x8FCB,
-	6043: 0x8FCD,
-	6044: 0x8FD0,
-	6045: 0x8FD2,
-	6046: 0x8FD3,
-	6047: 0x8FD5,
-	6048: 0x8FE0,
-	6049: 0x8FE3,
-	6050: 0x8FE4,
-	6051: 0x8FE8,
-	6052: 0x8FEE,
-	6053: 0x8FF1,
-	6054: 0x8FF5,
-	6055: 0x8FF6,
-	6056: 0x8FFB,
-	6057: 0x8FFE,
-	6058: 0x9002,
-	6059: 0x9004,
-	6060: 0x9008,
-	6061: 0x900C,
-	6062: 0x9018,
-	6063: 0x901B,
-	6064: 0x9028,
-	6065: 0x9029,
-	6066: 0x902F,
-	6067: 0x902A,
-	6068: 0x902C,
-	6069: 0x902D,
-	6070: 0x9033,
-	6071: 0x9034,
-	6072: 0x9037,
-	6073: 0x903F,
-	6074: 0x9043,
-	6075: 0x9044,
-	6076: 0x904C,
-	6077: 0x905B,
-	6078: 0x905D,
-	6079: 0x9062,
-	6080: 0x9066,
-	6081: 0x9067,
-	6082: 0x906C,
-	6083: 0x9070,
-	6084: 0x9074,
-	6085: 0x9079,
-	6086: 0x9085,
-	6087: 0x9088,
-	6088: 0x908B,
-	6089: 0x908C,
-	6090: 0x908E,
-	6091: 0x9090,
-	6092: 0x9095,
-	6093: 0x9097,
-	6094: 0x9098,
-	6095: 0x9099,
-	6096: 0x909B,
-	6097: 0x90A0,
-	6098: 0x90A1,
-	6099: 0x90A2,
-	6100: 0x90A5,
-	6101: 0x90B0,
-	6102: 0x90B2,
-	6103: 0x90B3,
-	6104: 0x90B4,
-	6105: 0x90B6,
-	6106: 0x90BD,
-	6107: 0x90CC,
-	6108: 0x90BE,
-	6109: 0x90C3,
-	6110: 0x90C4,
-	6111: 0x90C5,
-	6112: 0x90C7,
-	6113: 0x90C8,
-	6114: 0x90D5,
-	6115: 0x90D7,
-	6116: 0x90D8,
-	6117: 0x90D9,
-	6118: 0x90DC,
-	6119: 0x90DD,
-	6120: 0x90DF,
-	6121: 0x90E5,
-	6122: 0x90D2,
-	6123: 0x90F6,
-	6124: 0x90EB,
-	6125: 0x90EF,
-	6126: 0x90F0,
-	6127: 0x90F4,
-	6128: 0x90FE,
-	6129: 0x90FF,
-	6130: 0x9100,
-	6131: 0x9104,
-	6132: 0x9105,
-	6133: 0x9106,
-	6134: 0x9108,
-	6135: 0x910D,
-	6136: 0x9110,
-	6137: 0x9114,
-	6138: 0x9116,
-	6139: 0x9117,
-	6140: 0x9118,
-	6141: 0x911A,
-	6142: 0x911C,
-	6143: 0x911E,
-	6144: 0x9120,
-	6145: 0x9125,
-	6146: 0x9122,
-	6147: 0x9123,
-	6148: 0x9127,
-	6149: 0x9129,
-	6150: 0x912E,
-	6151: 0x912F,
-	6152: 0x9131,
-	6153: 0x9134,
-	6154: 0x9136,
-	6155: 0x9137,
-	6156: 0x9139,
-	6157: 0x913A,
-	6158: 0x913C,
-	6159: 0x913D,
-	6160: 0x9143,
-	6161: 0x9147,
-	6162: 0x9148,
-	6163: 0x914F,
-	6164: 0x9153,
-	6165: 0x9157,
-	6166: 0x9159,
-	6167: 0x915A,
-	6168: 0x915B,
-	6169: 0x9161,
-	6170: 0x9164,
-	6171: 0x9167,
-	6172: 0x916D,
-	6173: 0x9174,
-	6174: 0x9179,
-	6175: 0x917A,
-	6176: 0x917B,
-	6177: 0x9181,
-	6178: 0x9183,
-	6179: 0x9185,
-	6180: 0x9186,
-	6181: 0x918A,
-	6182: 0x918E,
-	6183: 0x9191,
-	6184: 0x9193,
-	6185: 0x9194,
-	6186: 0x9195,
-	6187: 0x9198,
-	6188: 0x919E,
-	6189: 0x91A1,
-	6190: 0x91A6,
-	6191: 0x91A8,
-	6192: 0x91AC,
-	6193: 0x91AD,
-	6194: 0x91AE,
-	6195: 0x91B0,
-	6196: 0x91B1,
-	6197: 0x91B2,
-	6198: 0x91B3,
-	6199: 0x91B6,
-	6200: 0x91BB,
-	6201: 0x91BC,
-	6202: 0x91BD,
-	6203: 0x91BF,
-	6204: 0x91C2,
-	6205: 0x91C3,
-	6206: 0x91C5,
-	6207: 0x91D3,
-	6208: 0x91D4,
-	6209: 0x91D7,
-	6210: 0x91D9,
-	6211: 0x91DA,
-	6212: 0x91DE,
-	6213: 0x91E4,
-	6214: 0x91E5,
-	6215: 0x91E9,
-	6216: 0x91EA,
-	6217: 0x91EC,
-	6218: 0x91ED,
-	6219: 0x91EE,
-	6220: 0x91EF,
-	6221: 0x91F0,
-	6222: 0x91F1,
-	6223: 0x91F7,
-	6224: 0x91F9,
-	6225: 0x91FB,
-	6226: 0x91FD,
-	6227: 0x9200,
-	6228: 0x9201,
-	6229: 0x9204,
-	6230: 0x9205,
-	6231: 0x9206,
-	6232: 0x9207,
-	6233: 0x9209,
-	6234: 0x920A,
-	6235: 0x920C,
-	6236: 0x9210,
-	6237: 0x9212,
-	6238: 0x9213,
-	6239: 0x9216,
-	6240: 0x9218,
-	6241: 0x921C,
-	6242: 0x921D,
-	6243: 0x9223,
-	6244: 0x9224,
-	6245: 0x9225,
-	6246: 0x9226,
-	6247: 0x9228,
-	6248: 0x922E,
-	6249: 0x922F,
-	6250: 0x9230,
-	6251: 0x9233,
-	6252: 0x9235,
-	6253: 0x9236,
-	6254: 0x9238,
-	6255: 0x9239,
-	6256: 0x923A,
-	6257: 0x923C,
-	6258: 0x923E,
-	6259: 0x9240,
-	6260: 0x9242,
-	6261: 0x9243,
-	6262: 0x9246,
-	6263: 0x9247,
-	6264: 0x924A,
-	6265: 0x924D,
-	6266: 0x924E,
-	6267: 0x924F,
-	6268: 0x9251,
-	6269: 0x9258,
-	6270: 0x9259,
-	6271: 0x925C,
-	6272: 0x925D,
-	6273: 0x9260,
-	6274: 0x9261,
-	6275: 0x9265,
-	6276: 0x9267,
-	6277: 0x9268,
-	6278: 0x9269,
-	6279: 0x926E,
-	6280: 0x926F,
-	6281: 0x9270,
-	6282: 0x9275,
-	6283: 0x9276,
-	6284: 0x9277,
-	6285: 0x9278,
-	6286: 0x9279,
-	6287: 0x927B,
-	6288: 0x927C,
-	6289: 0x927D,
-	6290: 0x927F,
-	6291: 0x9288,
-	6292: 0x9289,
-	6293: 0x928A,
-	6294: 0x928D,
-	6295: 0x928E,
-	6296: 0x9292,
-	6297: 0x9297,
-	6298: 0x9299,
-	6299: 0x929F,
-	6300: 0x92A0,
-	6301: 0x92A4,
-	6302: 0x92A5,
-	6303: 0x92A7,
-	6304: 0x92A8,
-	6305: 0x92AB,
-	6306: 0x92AF,
-	6307: 0x92B2,
-	6308: 0x92B6,
-	6309: 0x92B8,
-	6310: 0x92BA,
-	6311: 0x92BB,
-	6312: 0x92BC,
-	6313: 0x92BD,
-	6314: 0x92BF,
-	6315: 0x92C0,
-	6316: 0x92C1,
-	6317: 0x92C2,
-	6318: 0x92C3,
-	6319: 0x92C5,
-	6320: 0x92C6,
-	6321: 0x92C7,
-	6322: 0x92C8,
-	6323: 0x92CB,
-	6324: 0x92CC,
-	6325: 0x92CD,
-	6326: 0x92CE,
-	6327: 0x92D0,
-	6328: 0x92D3,
-	6329: 0x92D5,
-	6330: 0x92D7,
-	6331: 0x92D8,
-	6332: 0x92D9,
-	6333: 0x92DC,
-	6334: 0x92DD,
-	6335: 0x92DF,
-	6336: 0x92E0,
-	6337: 0x92E1,
-	6338: 0x92E3,
-	6339: 0x92E5,
-	6340: 0x92E7,
-	6341: 0x92E8,
-	6342: 0x92EC,
-	6343: 0x92EE,
-	6344: 0x92F0,
-	6345: 0x92F9,
-	6346: 0x92FB,
-	6347: 0x92FF,
-	6348: 0x9300,
-	6349: 0x9302,
-	6350: 0x9308,
-	6351: 0x930D,
-	6352: 0x9311,
-	6353: 0x9314,
-	6354: 0x9315,
-	6355: 0x931C,
-	6356: 0x931D,
-	6357: 0x931E,
-	6358: 0x931F,
-	6359: 0x9321,
-	6360: 0x9324,
-	6361: 0x9325,
-	6362: 0x9327,
-	6363: 0x9329,
-	6364: 0x932A,
-	6365: 0x9333,
-	6366: 0x9334,
-	6367: 0x9336,
-	6368: 0x9337,
-	6369: 0x9347,
-	6370: 0x9348,
-	6371: 0x9349,
-	6372: 0x9350,
-	6373: 0x9351,
-	6374: 0x9352,
-	6375: 0x9355,
-	6376: 0x9357,
-	6377: 0x9358,
-	6378: 0x935A,
-	6379: 0x935E,
-	6380: 0x9364,
-	6381: 0x9365,
-	6382: 0x9367,
-	6383: 0x9369,
-	6384: 0x936A,
-	6385: 0x936D,
-	6386: 0x936F,
-	6387: 0x9370,
-	6388: 0x9371,
-	6389: 0x9373,
-	6390: 0x9374,
-	6391: 0x9376,
-	6392: 0x937A,
-	6393: 0x937D,
-	6394: 0x937F,
-	6395: 0x9380,
-	6396: 0x9381,
-	6397: 0x9382,
-	6398: 0x9388,
-	6399: 0x938A,
-	6400: 0x938B,
-	6401: 0x938D,
-	6402: 0x938F,
-	6403: 0x9392,
-	6404: 0x9395,
-	6405: 0x9398,
-	6406: 0x939B,
-	6407: 0x939E,
-	6408: 0x93A1,
-	6409: 0x93A3,
-	6410: 0x93A4,
-	6411: 0x93A6,
-	6412: 0x93A8,
-	6413: 0x93AB,
-	6414: 0x93B4,
-	6415: 0x93B5,
-	6416: 0x93B6,
-	6417: 0x93BA,
-	6418: 0x93A9,
-	6419: 0x93C1,
-	6420: 0x93C4,
-	6421: 0x93C5,
-	6422: 0x93C6,
-	6423: 0x93C7,
-	6424: 0x93C9,
-	6425: 0x93CA,
-	6426: 0x93CB,
-	6427: 0x93CC,
-	6428: 0x93CD,
-	6429: 0x93D3,
-	6430: 0x93D9,
-	6431: 0x93DC,
-	6432: 0x93DE,
-	6433: 0x93DF,
-	6434: 0x93E2,
-	6435: 0x93E6,
-	6436: 0x93E7,
-	6437: 0x93F9,
-	6438: 0x93F7,
-	6439: 0x93F8,
-	6440: 0x93FA,
-	6441: 0x93FB,
-	6442: 0x93FD,
-	6443: 0x9401,
-	6444: 0x9402,
-	6445: 0x9404,
-	6446: 0x9408,
-	6447: 0x9409,
-	6448: 0x940D,
-	6449: 0x940E,
-	6450: 0x940F,
-	6451: 0x9415,
-	6452: 0x9416,
-	6453: 0x9417,
-	6454: 0x941F,
-	6455: 0x942E,
-	6456: 0x942F,
-	6457: 0x9431,
-	6458: 0x9432,
-	6459: 0x9433,
-	6460: 0x9434,
-	6461: 0x943B,
-	6462: 0x943F,
-	6463: 0x943D,
-	6464: 0x9443,
-	6465: 0x9445,
-	6466: 0x9448,
-	6467: 0x944A,
-	6468: 0x944C,
-	6469: 0x9455,
-	6470: 0x9459,
-	6471: 0x945C,
-	6472: 0x945F,
-	6473: 0x9461,
-	6474: 0x9463,
-	6475: 0x9468,
-	6476: 0x946B,
-	6477: 0x946D,
-	6478: 0x946E,
-	6479: 0x946F,
-	6480: 0x9471,
-	6481: 0x9472,
-	6482: 0x9484,
-	6483: 0x9483,
-	6484: 0x9578,
-	6485: 0x9579,
-	6486: 0x957E,
-	6487: 0x9584,
-	6488: 0x9588,
-	6489: 0x958C,
-	6490: 0x958D,
-	6491: 0x958E,
-	6492: 0x959D,
-	6493: 0x959E,
-	6494: 0x959F,
-	6495: 0x95A1,
-	6496: 0x95A6,
-	6497: 0x95A9,
-	6498: 0x95AB,
-	6499: 0x95AC,
-	6500: 0x95B4,
-	6501: 0x95B6,
-	6502: 0x95BA,
-	6503: 0x95BD,
-	6504: 0x95BF,
-	6505: 0x95C6,
-	6506: 0x95C8,
-	6507: 0x95C9,
-	6508: 0x95CB,
-	6509: 0x95D0,
-	6510: 0x95D1,
-	6511: 0x95D2,
-	6512: 0x95D3,
-	6513: 0x95D9,
-	6514: 0x95DA,
-	6515: 0x95DD,
-	6516: 0x95DE,
-	6517: 0x95DF,
-	6518: 0x95E0,
-	6519: 0x95E4,
-	6520: 0x95E6,
-	6521: 0x961D,
-	6522: 0x961E,
-	6523: 0x9622,
-	6524: 0x9624,
-	6525: 0x9625,
-	6526: 0x9626,
-	6527: 0x962C,
-	6528: 0x9631,
-	6529: 0x9633,
-	6530: 0x9637,
-	6531: 0x9638,
-	6532: 0x9639,
-	6533: 0x963A,
-	6534: 0x963C,
-	6535: 0x963D,
-	6536: 0x9641,
-	6537: 0x9652,
-	6538: 0x9654,
-	6539: 0x9656,
-	6540: 0x9657,
-	6541: 0x9658,
-	6542: 0x9661,
-	6543: 0x966E,
-	6544: 0x9674,
-	6545: 0x967B,
-	6546: 0x967C,
-	6547: 0x967E,
-	6548: 0x967F,
-	6549: 0x9681,
-	6550: 0x9682,
-	6551: 0x9683,
-	6552: 0x9684,
-	6553: 0x9689,
-	6554: 0x9691,
-	6555: 0x9696,
-	6556: 0x969A,
-	6557: 0x969D,
-	6558: 0x969F,
-	6559: 0x96A4,
-	6560: 0x96A5,
-	6561: 0x96A6,
-	6562: 0x96A9,
-	6563: 0x96AE,
-	6564: 0x96AF,
-	6565: 0x96B3,
-	6566: 0x96BA,
-	6567: 0x96CA,
-	6568: 0x96D2,
-	6569: 0x5DB2,
-	6570: 0x96D8,
-	6571: 0x96DA,
-	6572: 0x96DD,
-	6573: 0x96DE,
-	6574: 0x96DF,
-	6575: 0x96E9,
-	6576: 0x96EF,
-	6577: 0x96F1,
-	6578: 0x96FA,
-	6579: 0x9702,
-	6580: 0x9703,
-	6581: 0x9705,
-	6582: 0x9709,
-	6583: 0x971A,
-	6584: 0x971B,
-	6585: 0x971D,
-	6586: 0x9721,
-	6587: 0x9722,
-	6588: 0x9723,
-	6589: 0x9728,
-	6590: 0x9731,
-	6591: 0x9733,
-	6592: 0x9741,
-	6593: 0x9743,
-	6594: 0x974A,
-	6595: 0x974E,
-	6596: 0x974F,
-	6597: 0x9755,
-	6598: 0x9757,
-	6599: 0x9758,
-	6600: 0x975A,
-	6601: 0x975B,
-	6602: 0x9763,
-	6603: 0x9767,
-	6604: 0x976A,
-	6605: 0x976E,
-	6606: 0x9773,
-	6607: 0x9776,
-	6608: 0x9777,
-	6609: 0x9778,
-	6610: 0x977B,
-	6611: 0x977D,
-	6612: 0x977F,
-	6613: 0x9780,
-	6614: 0x9789,
-	6615: 0x9795,
-	6616: 0x9796,
-	6617: 0x9797,
-	6618: 0x9799,
-	6619: 0x979A,
-	6620: 0x979E,
-	6621: 0x979F,
-	6622: 0x97A2,
-	6623: 0x97AC,
-	6624: 0x97AE,
-	6625: 0x97B1,
-	6626: 0x97B2,
-	6627: 0x97B5,
-	6628: 0x97B6,
-	6629: 0x97B8,
-	6630: 0x97B9,
-	6631: 0x97BA,
-	6632: 0x97BC,
-	6633: 0x97BE,
-	6634: 0x97BF,
-	6635: 0x97C1,
-	6636: 0x97C4,
-	6637: 0x97C5,
-	6638: 0x97C7,
-	6639: 0x97C9,
-	6640: 0x97CA,
-	6641: 0x97CC,
-	6642: 0x97CD,
-	6643: 0x97CE,
-	6644: 0x97D0,
-	6645: 0x97D1,
-	6646: 0x97D4,
-	6647: 0x97D7,
-	6648: 0x97D8,
-	6649: 0x97D9,
-	6650: 0x97DD,
-	6651: 0x97DE,
-	6652: 0x97E0,
-	6653: 0x97DB,
-	6654: 0x97E1,
-	6655: 0x97E4,
-	6656: 0x97EF,
-	6657: 0x97F1,
-	6658: 0x97F4,
-	6659: 0x97F7,
-	6660: 0x97F8,
-	6661: 0x97FA,
-	6662: 0x9807,
-	6663: 0x980A,
-	6664: 0x9819,
-	6665: 0x980D,
-	6666: 0x980E,
-	6667: 0x9814,
-	6668: 0x9816,
-	6669: 0x981C,
-	6670: 0x981E,
-	6671: 0x9820,
-	6672: 0x9823,
-	6673: 0x9826,
-	6674: 0x982B,
-	6675: 0x982E,
-	6676: 0x982F,
-	6677: 0x9830,
-	6678: 0x9832,
-	6679: 0x9833,
-	6680: 0x9835,
-	6681: 0x9825,
-	6682: 0x983E,
-	6683: 0x9844,
-	6684: 0x9847,
-	6685: 0x984A,
-	6686: 0x9851,
-	6687: 0x9852,
-	6688: 0x9853,
-	6689: 0x9856,
-	6690: 0x9857,
-	6691: 0x9859,
-	6692: 0x985A,
-	6693: 0x9862,
-	6694: 0x9863,
-	6695: 0x9865,
-	6696: 0x9866,
-	6697: 0x986A,
-	6698: 0x986C,
-	6699: 0x98AB,
-	6700: 0x98AD,
-	6701: 0x98AE,
-	6702: 0x98B0,
-	6703: 0x98B4,
-	6704: 0x98B7,
-	6705: 0x98B8,
-	6706: 0x98BA,
-	6707: 0x98BB,
-	6708: 0x98BF,
-	6709: 0x98C2,
-	6710: 0x98C5,
-	6711: 0x98C8,
-	6712: 0x98CC,
-	6713: 0x98E1,
-	6714: 0x98E3,
-	6715: 0x98E5,
-	6716: 0x98E6,
-	6717: 0x98E7,
-	6718: 0x98EA,
-	6719: 0x98F3,
-	6720: 0x98F6,
-	6721: 0x9902,
-	6722: 0x9907,
-	6723: 0x9908,
-	6724: 0x9911,
-	6725: 0x9915,
-	6726: 0x9916,
-	6727: 0x9917,
-	6728: 0x991A,
-	6729: 0x991B,
-	6730: 0x991C,
-	6731: 0x991F,
-	6732: 0x9922,
-	6733: 0x9926,
-	6734: 0x9927,
-	6735: 0x992B,
-	6736: 0x9931,
-	6737: 0x9932,
-	6738: 0x9933,
-	6739: 0x9934,
-	6740: 0x9935,
-	6741: 0x9939,
-	6742: 0x993A,
-	6743: 0x993B,
-	6744: 0x993C,
-	6745: 0x9940,
-	6746: 0x9941,
-	6747: 0x9946,
-	6748: 0x9947,
-	6749: 0x9948,
-	6750: 0x994D,
-	6751: 0x994E,
-	6752: 0x9954,
-	6753: 0x9958,
-	6754: 0x9959,
-	6755: 0x995B,
-	6756: 0x995C,
-	6757: 0x995E,
-	6758: 0x995F,
-	6759: 0x9960,
-	6760: 0x999B,
-	6761: 0x999D,
-	6762: 0x999F,
-	6763: 0x99A6,
-	6764: 0x99B0,
-	6765: 0x99B1,
-	6766: 0x99B2,
-	6767: 0x99B5,
-	6768: 0x99B9,
-	6769: 0x99BA,
-	6770: 0x99BD,
-	6771: 0x99BF,
-	6772: 0x99C3,
-	6773: 0x99C9,
-	6774: 0x99D3,
-	6775: 0x99D4,
-	6776: 0x99D9,
-	6777: 0x99DA,
-	6778: 0x99DC,
-	6779: 0x99DE,
-	6780: 0x99E7,
-	6781: 0x99EA,
-	6782: 0x99EB,
-	6783: 0x99EC,
-	6784: 0x99F0,
-	6785: 0x99F4,
-	6786: 0x99F5,
-	6787: 0x99F9,
-	6788: 0x99FD,
-	6789: 0x99FE,
-	6790: 0x9A02,
-	6791: 0x9A03,
-	6792: 0x9A04,
-	6793: 0x9A0B,
-	6794: 0x9A0C,
-	6795: 0x9A10,
-	6796: 0x9A11,
-	6797: 0x9A16,
-	6798: 0x9A1E,
-	6799: 0x9A20,
-	6800: 0x9A22,
-	6801: 0x9A23,
-	6802: 0x9A24,
-	6803: 0x9A27,
-	6804: 0x9A2D,
-	6805: 0x9A2E,
-	6806: 0x9A33,
-	6807: 0x9A35,
-	6808: 0x9A36,
-	6809: 0x9A38,
-	6810: 0x9A47,
-	6811: 0x9A41,
-	6812: 0x9A44,
-	6813: 0x9A4A,
-	6814: 0x9A4B,
-	6815: 0x9A4C,
-	6816: 0x9A4E,
-	6817: 0x9A51,
-	6818: 0x9A54,
-	6819: 0x9A56,
-	6820: 0x9A5D,
-	6821: 0x9AAA,
-	6822: 0x9AAC,
-	6823: 0x9AAE,
-	6824: 0x9AAF,
-	6825: 0x9AB2,
-	6826: 0x9AB4,
-	6827: 0x9AB5,
-	6828: 0x9AB6,
-	6829: 0x9AB9,
-	6830: 0x9ABB,
-	6831: 0x9ABE,
-	6832: 0x9ABF,
-	6833: 0x9AC1,
-	6834: 0x9AC3,
-	6835: 0x9AC6,
-	6836: 0x9AC8,
-	6837: 0x9ACE,
-	6838: 0x9AD0,
-	6839: 0x9AD2,
-	6840: 0x9AD5,
-	6841: 0x9AD6,
-	6842: 0x9AD7,
-	6843: 0x9ADB,
-	6844: 0x9ADC,
-	6845: 0x9AE0,
-	6846: 0x9AE4,
-	6847: 0x9AE5,
-	6848: 0x9AE7,
-	6849: 0x9AE9,
-	6850: 0x9AEC,
-	6851: 0x9AF2,
-	6852: 0x9AF3,
-	6853: 0x9AF5,
-	6854: 0x9AF9,
-	6855: 0x9AFA,
-	6856: 0x9AFD,
-	6857: 0x9AFF,
-	6858: 0x9B00,
-	6859: 0x9B01,
-	6860: 0x9B02,
-	6861: 0x9B03,
-	6862: 0x9B04,
-	6863: 0x9B05,
-	6864: 0x9B08,
-	6865: 0x9B09,
-	6866: 0x9B0B,
-	6867: 0x9B0C,
-	6868: 0x9B0D,
-	6869: 0x9B0E,
-	6870: 0x9B10,
-	6871: 0x9B12,
-	6872: 0x9B16,
-	6873: 0x9B19,
-	6874: 0x9B1B,
-	6875: 0x9B1C,
-	6876: 0x9B20,
-	6877: 0x9B26,
-	6878: 0x9B2B,
-	6879: 0x9B2D,
-	6880: 0x9B33,
-	6881: 0x9B34,
-	6882: 0x9B35,
-	6883: 0x9B37,
-	6884: 0x9B39,
-	6885: 0x9B3A,
-	6886: 0x9B3D,
-	6887: 0x9B48,
-	6888: 0x9B4B,
-	6889: 0x9B4C,
-	6890: 0x9B55,
-	6891: 0x9B56,
-	6892: 0x9B57,
-	6893: 0x9B5B,
-	6894: 0x9B5E,
-	6895: 0x9B61,
-	6896: 0x9B63,
-	6897: 0x9B65,
-	6898: 0x9B66,
-	6899: 0x9B68,
-	6900: 0x9B6A,
-	6901: 0x9B6B,
-	6902: 0x9B6C,
-	6903: 0x9B6D,
-	6904: 0x9B6E,
-	6905: 0x9B73,
-	6906: 0x9B75,
-	6907: 0x9B77,
-	6908: 0x9B78,
-	6909: 0x9B79,
-	6910: 0x9B7F,
-	6911: 0x9B80,
-	6912: 0x9B84,
-	6913: 0x9B85,
-	6914: 0x9B86,
-	6915: 0x9B87,
-	6916: 0x9B89,
-	6917: 0x9B8A,
-	6918: 0x9B8B,
-	6919: 0x9B8D,
-	6920: 0x9B8F,
-	6921: 0x9B90,
-	6922: 0x9B94,
-	6923: 0x9B9A,
-	6924: 0x9B9D,
-	6925: 0x9B9E,
-	6926: 0x9BA6,
-	6927: 0x9BA7,
-	6928: 0x9BA9,
-	6929: 0x9BAC,
-	6930: 0x9BB0,
-	6931: 0x9BB1,
-	6932: 0x9BB2,
-	6933: 0x9BB7,
-	6934: 0x9BB8,
-	6935: 0x9BBB,
-	6936: 0x9BBC,
-	6937: 0x9BBE,
-	6938: 0x9BBF,
-	6939: 0x9BC1,
-	6940: 0x9BC7,
-	6941: 0x9BC8,
-	6942: 0x9BCE,
-	6943: 0x9BD0,
-	6944: 0x9BD7,
-	6945: 0x9BD8,
-	6946: 0x9BDD,
-	6947: 0x9BDF,
-	6948: 0x9BE5,
-	6949: 0x9BE7,
-	6950: 0x9BEA,
-	6951: 0x9BEB,
-	6952: 0x9BEF,
-	6953: 0x9BF3,
-	6954: 0x9BF7,
-	6955: 0x9BF8,
-	6956: 0x9BF9,
-	6957: 0x9BFA,
-	6958: 0x9BFD,
-	6959: 0x9BFF,
-	6960: 0x9C00,
-	6961: 0x9C02,
-	6962: 0x9C0B,
-	6963: 0x9C0F,
-	6964: 0x9C11,
-	6965: 0x9C16,
-	6966: 0x9C18,
-	6967: 0x9C19,
-	6968: 0x9C1A,
-	6969: 0x9C1C,
-	6970: 0x9C1E,
-	6971: 0x9C22,
-	6972: 0x9C23,
-	6973: 0x9C26,
-	6974: 0x9C27,
-	6975: 0x9C28,
-	6976: 0x9C29,
-	6977: 0x9C2A,
-	6978: 0x9C31,
-	6979: 0x9C35,
-	6980: 0x9C36,
-	6981: 0x9C37,
-	6982: 0x9C3D,
-	6983: 0x9C41,
-	6984: 0x9C43,
-	6985: 0x9C44,
-	6986: 0x9C45,
-	6987: 0x9C49,
-	6988: 0x9C4A,
-	6989: 0x9C4E,
-	6990: 0x9C4F,
-	6991: 0x9C50,
-	6992: 0x9C53,
-	6993: 0x9C54,
-	6994: 0x9C56,
-	6995: 0x9C58,
-	6996: 0x9C5B,
-	6997: 0x9C5D,
-	6998: 0x9C5E,
-	6999: 0x9C5F,
-	7000: 0x9C63,
-	7001: 0x9C69,
-	7002: 0x9C6A,
-	7003: 0x9C5C,
-	7004: 0x9C6B,
-	7005: 0x9C68,
-	7006: 0x9C6E,
-	7007: 0x9C70,
-	7008: 0x9C72,
-	7009: 0x9C75,
-	7010: 0x9C77,
-	7011: 0x9C7B,
-	7012: 0x9CE6,
-	7013: 0x9CF2,
-	7014: 0x9CF7,
-	7015: 0x9CF9,
-	7016: 0x9D0B,
-	7017: 0x9D02,
-	7018: 0x9D11,
-	7019: 0x9D17,
-	7020: 0x9D18,
-	7021: 0x9D1C,
-	7022: 0x9D1D,
-	7023: 0x9D1E,
-	7024: 0x9D2F,
-	7025: 0x9D30,
-	7026: 0x9D32,
-	7027: 0x9D33,
-	7028: 0x9D34,
-	7029: 0x9D3A,
-	7030: 0x9D3C,
-	7031: 0x9D45,
-	7032: 0x9D3D,
-	7033: 0x9D42,
-	7034: 0x9D43,
-	7035: 0x9D47,
-	7036: 0x9D4A,
-	7037: 0x9D53,
-	7038: 0x9D54,
-	7039: 0x9D5F,
-	7040: 0x9D63,
-	7041: 0x9D62,
-	7042: 0x9D65,
-	7043: 0x9D69,
-	7044: 0x9D6A,
-	7045: 0x9D6B,
-	7046: 0x9D70,
-	7047: 0x9D76,
-	7048: 0x9D77,
-	7049: 0x9D7B,
-	7050: 0x9D7C,
-	7051: 0x9D7E,
-	7052: 0x9D83,
-	7053: 0x9D84,
-	7054: 0x9D86,
-	7055: 0x9D8A,
-	7056: 0x9D8D,
-	7057: 0x9D8E,
-	7058: 0x9D92,
-	7059: 0x9D93,
-	7060: 0x9D95,
-	7061: 0x9D96,
-	7062: 0x9D97,
-	7063: 0x9D98,
-	7064: 0x9DA1,
-	7065: 0x9DAA,
-	7066: 0x9DAC,
-	7067: 0x9DAE,
-	7068: 0x9DB1,
-	7069: 0x9DB5,
-	7070: 0x9DB9,
-	7071: 0x9DBC,
-	7072: 0x9DBF,
-	7073: 0x9DC3,
-	7074: 0x9DC7,
-	7075: 0x9DC9,
-	7076: 0x9DCA,
-	7077: 0x9DD4,
-	7078: 0x9DD5,
-	7079: 0x9DD6,
-	7080: 0x9DD7,
-	7081: 0x9DDA,
-	7082: 0x9DDE,
-	7083: 0x9DDF,
-	7084: 0x9DE0,
-	7085: 0x9DE5,
-	7086: 0x9DE7,
-	7087: 0x9DE9,
-	7088: 0x9DEB,
-	7089: 0x9DEE,
-	7090: 0x9DF0,
-	7091: 0x9DF3,
-	7092: 0x9DF4,
-	7093: 0x9DFE,
-	7094: 0x9E0A,
-	7095: 0x9E02,
-	7096: 0x9E07,
-	7097: 0x9E0E,
-	7098: 0x9E10,
-	7099: 0x9E11,
-	7100: 0x9E12,
-	7101: 0x9E15,
-	7102: 0x9E16,
-	7103: 0x9E19,
-	7104: 0x9E1C,
-	7105: 0x9E1D,
-	7106: 0x9E7A,
-	7107: 0x9E7B,
-	7108: 0x9E7C,
-	7109: 0x9E80,
-	7110: 0x9E82,
-	7111: 0x9E83,
-	7112: 0x9E84,
-	7113: 0x9E85,
-	7114: 0x9E87,
-	7115: 0x9E8E,
-	7116: 0x9E8F,
-	7117: 0x9E96,
-	7118: 0x9E98,
-	7119: 0x9E9B,
-	7120: 0x9E9E,
-	7121: 0x9EA4,
-	7122: 0x9EA8,
-	7123: 0x9EAC,
-	7124: 0x9EAE,
-	7125: 0x9EAF,
-	7126: 0x9EB0,
-	7127: 0x9EB3,
-	7128: 0x9EB4,
-	7129: 0x9EB5,
-	7130: 0x9EC6,
-	7131: 0x9EC8,
-	7132: 0x9ECB,
-	7133: 0x9ED5,
-	7134: 0x9EDF,
-	7135: 0x9EE4,
-	7136: 0x9EE7,
-	7137: 0x9EEC,
-	7138: 0x9EED,
-	7139: 0x9EEE,
-	7140: 0x9EF0,
-	7141: 0x9EF1,
-	7142: 0x9EF2,
-	7143: 0x9EF5,
-	7144: 0x9EF8,
-	7145: 0x9EFF,
-	7146: 0x9F02,
-	7147: 0x9F03,
-	7148: 0x9F09,
-	7149: 0x9F0F,
-	7150: 0x9F10,
-	7151: 0x9F11,
-	7152: 0x9F12,
-	7153: 0x9F14,
-	7154: 0x9F16,
-	7155: 0x9F17,
-	7156: 0x9F19,
-	7157: 0x9F1A,
-	7158: 0x9F1B,
-	7159: 0x9F1F,
-	7160: 0x9F22,
-	7161: 0x9F26,
-	7162: 0x9F2A,
-	7163: 0x9F2B,
-	7164: 0x9F2F,
-	7165: 0x9F31,
-	7166: 0x9F32,
-	7167: 0x9F34,
-	7168: 0x9F37,
-	7169: 0x9F39,
-	7170: 0x9F3A,
-	7171: 0x9F3C,
-	7172: 0x9F3D,
-	7173: 0x9F3F,
-	7174: 0x9F41,
-	7175: 0x9F43,
-	7176: 0x9F44,
-	7177: 0x9F45,
-	7178: 0x9F46,
-	7179: 0x9F47,
-	7180: 0x9F53,
-	7181: 0x9F55,
-	7182: 0x9F56,
-	7183: 0x9F57,
-	7184: 0x9F58,
-	7185: 0x9F5A,
-	7186: 0x9F5D,
-	7187: 0x9F5E,
-	7188: 0x9F68,
-	7189: 0x9F69,
-	7190: 0x9F6D,
-	7191: 0x9F6E,
-	7192: 0x9F6F,
-	7193: 0x9F70,
-	7194: 0x9F71,
-	7195: 0x9F73,
-	7196: 0x9F75,
-	7197: 0x9F7A,
-	7198: 0x9F7D,
-	7199: 0x9F8F,
-	7200: 0x9F90,
-	7201: 0x9F91,
-	7202: 0x9F92,
-	7203: 0x9F94,
-	7204: 0x9F96,
-	7205: 0x9F97,
-	7206: 0x9F9E,
-	7207: 0x9FA1,
-	7208: 0x9FA2,
-	7209: 0x9FA3,
-	7210: 0x9FA5,
-}
-
-const (
-	jis0208    = 1
-	jis0212    = 2
-	codeMask   = 0x7f
-	codeShift  = 7
-	tableShift = 14
-)
-
-const numEncodeTables = 6
-
-// encodeX are the encoding tables from Unicode to JIS code,
-// sorted by decreasing length.
-// encode0: 20902 entries for runes in [19968, 40870).
-// encode1:  1632 entries for runes in [ 8208,  9840).
-// encode2:   974 entries for runes in [12288, 13262).
-// encode3:   959 entries for runes in [  161,  1120).
-// encode4:   261 entries for runes in [63785, 64046).
-// encode5:   229 entries for runes in [65281, 65510).
-//
-// The high two bits of the value record whether the JIS code comes from the
-// JIS0208 table (high bits == 1) or the JIS0212 table (high bits == 2).
-// The low 14 bits are two 7-bit unsigned integers j1 and j2 that form the
-// JIS code (94*j1 + j2) within that table.
-
-const encode0Low, encode0High = 19968, 40870
-
-var encode0 = [...]uint16{
-	19968 - 19968: jis0208<<14 | 0x0F<<7 | 0x4B,
-	19969 - 19968: jis0208<<14 | 0x22<<7 | 0x59,
-	19970 - 19968: jis0212<<14 | 0x0F<<7 | 0x00,
-	19971 - 19968: jis0208<<14 | 0x1B<<7 | 0x16,
-	19972 - 19968: jis0212<<14 | 0x0F<<7 | 0x01,
-	19973 - 19968: jis0212<<14 | 0x0F<<7 | 0x02,
-	19975 - 19968: jis0208<<14 | 0x2A<<7 | 0x5B,
-	19976 - 19968: jis0208<<14 | 0x1D<<7 | 0x45,
-	19977 - 19968: jis0208<<14 | 0x1A<<7 | 0x0F,
-	19978 - 19968: jis0208<<14 | 0x1D<<7 | 0x44,
-	19979 - 19968: jis0208<<14 | 0x11<<7 | 0x1B,
-	19980 - 19968: jis0212<<14 | 0x0F<<7 | 0x03,
-	19981 - 19968: jis0208<<14 | 0x28<<7 | 0x33,
-	19982 - 19968: jis0208<<14 | 0x2C<<7 | 0x1E,
-	19984 - 19968: jis0208<<14 | 0x2F<<7 | 0x01,
-	19985 - 19968: jis0208<<14 | 0x10<<7 | 0x0E,
-	19986 - 19968: jis0212<<14 | 0x0F<<7 | 0x04,
-	19988 - 19968: jis0208<<14 | 0x12<<7 | 0x4D,
-	19989 - 19968: jis0208<<14 | 0x2F<<7 | 0x02,
-	19990 - 19968: jis0208<<14 | 0x1F<<7 | 0x03,
-	19991 - 19968: jis0208<<14 | 0x31<<7 | 0x21,
-	19992 - 19968: jis0208<<14 | 0x14<<7 | 0x35,
-	19993 - 19968: jis0208<<14 | 0x29<<7 | 0x19,
-	19998 - 19968: jis0208<<14 | 0x1D<<7 | 0x46,
-	19999 - 19968: jis0212<<14 | 0x0F<<7 | 0x05,
-	20001 - 19968: jis0208<<14 | 0x2D<<7 | 0x1D,
-	20003 - 19968: jis0212<<14 | 0x0F<<7 | 0x06,
-	20004 - 19968: jis0212<<14 | 0x0F<<7 | 0x07,
-	20006 - 19968: jis0208<<14 | 0x29<<7 | 0x21,
-	20008 - 19968: jis0208<<14 | 0x58<<7 | 0x0C,
-	20010 - 19968: jis0208<<14 | 0x2F<<7 | 0x03,
-	20011 - 19968: jis0212<<14 | 0x0F<<7 | 0x09,
-	20013 - 19968: jis0208<<14 | 0x22<<7 | 0x45,
-	20014 - 19968: jis0212<<14 | 0x0F<<7 | 0x0A,
-	20015 - 19968: jis0212<<14 | 0x0F<<7 | 0x0B,
-	20016 - 19968: jis0212<<14 | 0x0F<<7 | 0x0C,
-	20017 - 19968: jis0208<<14 | 0x2F<<7 | 0x04,
-	20018 - 19968: jis0208<<14 | 0x15<<7 | 0x59,
-	20021 - 19968: jis0212<<14 | 0x0F<<7 | 0x0D,
-	20022 - 19968: jis0208<<14 | 0x2F<<7 | 0x05,
-	20024 - 19968: jis0208<<14 | 0x13<<7 | 0x3C,
-	20025 - 19968: jis0208<<14 | 0x22<<7 | 0x0F,
-	20027 - 19968: jis0208<<14 | 0x1B<<7 | 0x46,
-	20028 - 19968: jis0208<<14 | 0x2F<<7 | 0x06,
-	20031 - 19968: jis0208<<14 | 0x2F<<7 | 0x07,
-	20032 - 19968: jis0212<<14 | 0x0F<<7 | 0x0E,
-	20033 - 19968: jis0212<<14 | 0x0F<<7 | 0x0F,
-	20034 - 19968: jis0208<<14 | 0x2F<<7 | 0x08,
-	20035 - 19968: jis0208<<14 | 0x26<<7 | 0x14,
-	20036 - 19968: jis0212<<14 | 0x0F<<7 | 0x10,
-	20037 - 19968: jis0208<<14 | 0x14<<7 | 0x36,
-	20039 - 19968: jis0212<<14 | 0x0F<<7 | 0x11,
-	20043 - 19968: jis0208<<14 | 0x26<<7 | 0x16,
-	20045 - 19968: jis0208<<14 | 0x25<<7 | 0x42,
-	20046 - 19968: jis0208<<14 | 0x17<<7 | 0x22,
-	20047 - 19968: jis0208<<14 | 0x2A<<7 | 0x12,
-	20049 - 19968: jis0212<<14 | 0x0F<<7 | 0x12,
-	20053 - 19968: jis0208<<14 | 0x48<<7 | 0x28,
-	20054 - 19968: jis0208<<14 | 0x2F<<7 | 0x09,
-	20055 - 19968: jis0208<<14 | 0x1D<<7 | 0x47,
-	20056 - 19968: jis0208<<14 | 0x2F<<7 | 0x0A,
-	20057 - 19968: jis0208<<14 | 0x11<<7 | 0x14,
-	20058 - 19968: jis0212<<14 | 0x0F<<7 | 0x13,
-	20060 - 19968: jis0212<<14 | 0x0F<<7 | 0x14,
-	20061 - 19968: jis0208<<14 | 0x15<<7 | 0x44,
-	20062 - 19968: jis0208<<14 | 0x17<<7 | 0x4F,
-	20063 - 19968: jis0208<<14 | 0x2B<<7 | 0x48,
-	20066 - 19968: jis0208<<14 | 0x35<<7 | 0x05,
-	20067 - 19968: jis0212<<14 | 0x0F<<7 | 0x15,
-	20072 - 19968: jis0212<<14 | 0x0F<<7 | 0x16,
-	20073 - 19968: jis0212<<14 | 0x0F<<7 | 0x17,
-	20081 - 19968: jis0208<<14 | 0x2C<<7 | 0x4F,
-	20083 - 19968: jis0208<<14 | 0x25<<7 | 0x5C,
-	20084 - 19968: jis0212<<14 | 0x0F<<7 | 0x18,
-	20085 - 19968: jis0212<<14 | 0x0F<<7 | 0x19,
-	20089 - 19968: jis0212<<14 | 0x0F<<7 | 0x1A,
-	20094 - 19968: jis0208<<14 | 0x13<<7 | 0x04,
-	20095 - 19968: jis0212<<14 | 0x0F<<7 | 0x1B,
-	20096 - 19968: jis0208<<14 | 0x14<<7 | 0x14,
-	20098 - 19968: jis0208<<14 | 0x2F<<7 | 0x0B,
-	20101 - 19968: jis0208<<14 | 0x2F<<7 | 0x0C,
-	20102 - 19968: jis0208<<14 | 0x2D<<7 | 0x1A,
-	20104 - 19968: jis0208<<14 | 0x2C<<7 | 0x1C,
-	20105 - 19968: jis0208<<14 | 0x20<<7 | 0x47,
-	20106 - 19968: jis0208<<14 | 0x2F<<7 | 0x0E,
-	20107 - 19968: jis0208<<14 | 0x1A<<7 | 0x55,
-	20108 - 19968: jis0208<<14 | 0x25<<7 | 0x52,
-	20109 - 19968: jis0212<<14 | 0x0F<<7 | 0x1C,
-	20110 - 19968: jis0208<<14 | 0x2F<<7 | 0x11,
-	20113 - 19968: jis0208<<14 | 0x10<<7 | 0x1D,
-	20114 - 19968: jis0208<<14 | 0x17<<7 | 0x3E,
-	20116 - 19968: jis0208<<14 | 0x17<<7 | 0x3D,
-	20117 - 19968: jis0208<<14 | 0x0F<<7 | 0x45,
-	20118 - 19968: jis0212<<14 | 0x0F<<7 | 0x1D,
-	20119 - 19968: jis0212<<14 | 0x0F<<7 | 0x1E,
-	20120 - 19968: jis0208<<14 | 0x2E<<7 | 0x2A,
-	20121 - 19968: jis0208<<14 | 0x2E<<7 | 0x29,
-	20123 - 19968: jis0208<<14 | 0x19<<7 | 0x12,
-	20124 - 19968: jis0208<<14 | 0x0F<<7 | 0x00,
-	20125 - 19968: jis0212<<14 | 0x0F<<7 | 0x1F,
-	20126 - 19968: jis0208<<14 | 0x2F<<7 | 0x12,
-	20127 - 19968: jis0208<<14 | 0x2F<<7 | 0x13,
-	20128 - 19968: jis0208<<14 | 0x2F<<7 | 0x14,
-	20129 - 19968: jis0208<<14 | 0x2A<<7 | 0x13,
-	20130 - 19968: jis0208<<14 | 0x2F<<7 | 0x15,
-	20132 - 19968: jis0208<<14 | 0x17<<7 | 0x51,
-	20133 - 19968: jis0208<<14 | 0x0F<<7 | 0x46,
-	20134 - 19968: jis0208<<14 | 0x2A<<7 | 0x51,
-	20136 - 19968: jis0208<<14 | 0x14<<7 | 0x5B,
-	20139 - 19968: jis0208<<14 | 0x14<<7 | 0x5C,
-	20140 - 19968: jis0208<<14 | 0x14<<7 | 0x5D,
-	20141 - 19968: jis0208<<14 | 0x23<<7 | 0x41,
-	20142 - 19968: jis0208<<14 | 0x2D<<7 | 0x1B,
-	20143 - 19968: jis0212<<14 | 0x0F<<7 | 0x20,
-	20144 - 19968: jis0208<<14 | 0x2F<<7 | 0x16,
-	20147 - 19968: jis0208<<14 | 0x2F<<7 | 0x17,
-	20150 - 19968: jis0208<<14 | 0x2F<<7 | 0x18,
-	20153 - 19968: jis0212<<14 | 0x0F<<7 | 0x21,
-	20154 - 19968: jis0208<<14 | 0x1E<<7 | 0x2C,
-	20160 - 19968: jis0208<<14 | 0x1C<<7 | 0x19,
-	20161 - 19968: jis0208<<14 | 0x1E<<7 | 0x2D,
-	20162 - 19968: jis0208<<14 | 0x2F<<7 | 0x1D,
-	20163 - 19968: jis0212<<14 | 0x0F<<7 | 0x22,
-	20164 - 19968: jis0208<<14 | 0x2F<<7 | 0x1B,
-	20166 - 19968: jis0208<<14 | 0x2F<<7 | 0x1C,
-	20167 - 19968: jis0208<<14 | 0x14<<7 | 0x37,
-	20170 - 19968: jis0208<<14 | 0x19<<7 | 0x02,
-	20171 - 19968: jis0208<<14 | 0x11<<7 | 0x4F,
-	20173 - 19968: jis0208<<14 | 0x2F<<7 | 0x1A,
-	20174 - 19968: jis0208<<14 | 0x2F<<7 | 0x19,
-	20175 - 19968: jis0208<<14 | 0x29<<7 | 0x08,
-	20176 - 19968: jis0212<<14 | 0x0F<<7 | 0x23,
-	20180 - 19968: jis0208<<14 | 0x1A<<7 | 0x25,
-	20181 - 19968: jis0208<<14 | 0x1A<<7 | 0x24,
-	20182 - 19968: jis0208<<14 | 0x21<<7 | 0x1D,
-	20183 - 19968: jis0208<<14 | 0x2F<<7 | 0x1E,
-	20184 - 19968: jis0208<<14 | 0x28<<7 | 0x34,
-	20185 - 19968: jis0208<<14 | 0x1F<<7 | 0x46,
-	20186 - 19968: jis0212<<14 | 0x0F<<7 | 0x24,
-	20187 - 19968: jis0212<<14 | 0x0F<<7 | 0x25,
-	20189 - 19968: jis0208<<14 | 0x00<<7 | 0x17,
-	20190 - 19968: jis0208<<14 | 0x2F<<7 | 0x1F,
-	20191 - 19968: jis0208<<14 | 0x2F<<7 | 0x21,
-	20192 - 19968: jis0212<<14 | 0x0F<<7 | 0x26,
-	20193 - 19968: jis0208<<14 | 0x58<<7 | 0x0D,
-	20194 - 19968: jis0212<<14 | 0x0F<<7 | 0x28,
-	20195 - 19968: jis0208<<14 | 0x21<<7 | 0x44,
-	20196 - 19968: jis0208<<14 | 0x2D<<7 | 0x40,
-	20197 - 19968: jis0208<<14 | 0x0F<<7 | 0x29,
-	20200 - 19968: jis0212<<14 | 0x0F<<7 | 0x29,
-	20205 - 19968: jis0208<<14 | 0x2F<<7 | 0x20,
-	20206 - 19968: jis0208<<14 | 0x11<<7 | 0x1D,
-	20207 - 19968: jis0212<<14 | 0x0F<<7 | 0x2A,
-	20208 - 19968: jis0208<<14 | 0x15<<7 | 0x23,
-	20209 - 19968: jis0212<<14 | 0x0F<<7 | 0x2B,
-	20210 - 19968: jis0208<<14 | 0x22<<7 | 0x46,
-	20211 - 19968: jis0212<<14 | 0x0F<<7 | 0x2C,
-	20213 - 19968: jis0212<<14 | 0x0F<<7 | 0x2D,
-	20214 - 19968: jis0208<<14 | 0x16<<7 | 0x4E,
-	20215 - 19968: jis0208<<14 | 0x2F<<7 | 0x22,
-	20219 - 19968: jis0208<<14 | 0x26<<7 | 0x03,
-	20220 - 19968: jis0208<<14 | 0x58<<7 | 0x0E,
-	20221 - 19968: jis0212<<14 | 0x0F<<7 | 0x2E,
-	20222 - 19968: jis0212<<14 | 0x0F<<7 | 0x2F,
-	20223 - 19968: jis0212<<14 | 0x0F<<7 | 0x30,
-	20224 - 19968: jis0208<<14 | 0x58<<7 | 0x0F,
-	20225 - 19968: jis0208<<14 | 0x13<<7 | 0x4A,
-	20226 - 19968: jis0212<<14 | 0x0F<<7 | 0x32,
-	20227 - 19968: jis0208<<14 | 0x58<<7 | 0x10,
-	20232 - 19968: jis0212<<14 | 0x0F<<7 | 0x34,
-	20233 - 19968: jis0208<<14 | 0x2F<<7 | 0x23,
-	20234 - 19968: jis0208<<14 | 0x0F<<7 | 0x2A,
-	20235 - 19968: jis0212<<14 | 0x0F<<7 | 0x35,
-	20236 - 19968: jis0212<<14 | 0x0F<<7 | 0x36,
-	20237 - 19968: jis0208<<14 | 0x17<<7 | 0x3F,
-	20238 - 19968: jis0208<<14 | 0x13<<7 | 0x4B,
-	20239 - 19968: jis0208<<14 | 0x28<<7 | 0x59,
-	20240 - 19968: jis0208<<14 | 0x27<<7 | 0x11,
-	20241 - 19968: jis0208<<14 | 0x14<<7 | 0x38,
-	20242 - 19968: jis0212<<14 | 0x0F<<7 | 0x37,
-	20245 - 19968: jis0212<<14 | 0x0F<<7 | 0x38,
-	20246 - 19968: jis0212<<14 | 0x0F<<7 | 0x39,
-	20247 - 19968: jis0212<<14 | 0x0F<<7 | 0x3A,
-	20249 - 19968: jis0212<<14 | 0x0F<<7 | 0x3B,
-	20250 - 19968: jis0208<<14 | 0x11<<7 | 0x50,
-	20252 - 19968: jis0208<<14 | 0x2F<<7 | 0x46,
-	20253 - 19968: jis0208<<14 | 0x24<<7 | 0x20,
-	20270 - 19968: jis0212<<14 | 0x0F<<7 | 0x3C,
-	20271 - 19968: jis0208<<14 | 0x26<<7 | 0x4B,
-	20272 - 19968: jis0208<<14 | 0x2F<<7 | 0x25,
-	20273 - 19968: jis0212<<14 | 0x0F<<7 | 0x3D,
-	20275 - 19968: jis0212<<14 | 0x0F<<7 | 0x3F,
-	20276 - 19968: jis0208<<14 | 0x27<<7 | 0x1B,
-	20277 - 19968: jis0212<<14 | 0x0F<<7 | 0x40,
-	20278 - 19968: jis0208<<14 | 0x2D<<7 | 0x41,
-	20279 - 19968: jis0212<<14 | 0x0F<<7 | 0x41,
-	20280 - 19968: jis0208<<14 | 0x1E<<7 | 0x0C,
-	20281 - 19968: jis0208<<14 | 0x58<<7 | 0x11,
-	20282 - 19968: jis0208<<14 | 0x1A<<7 | 0x26,
-	20283 - 19968: jis0212<<14 | 0x0F<<7 | 0x43,
-	20284 - 19968: jis0208<<14 | 0x1A<<7 | 0x56,
-	20285 - 19968: jis0208<<14 | 0x11<<7 | 0x1F,
-	20286 - 19968: jis0212<<14 | 0x0F<<7 | 0x44,
-	20288 - 19968: jis0212<<14 | 0x0F<<7 | 0x45,
-	20290 - 19968: jis0212<<14 | 0x0F<<7 | 0x46,
-	20291 - 19968: jis0208<<14 | 0x23<<7 | 0x30,
-	20294 - 19968: jis0208<<14 | 0x22<<7 | 0x01,
-	20295 - 19968: jis0208<<14 | 0x2F<<7 | 0x29,
-	20296 - 19968: jis0212<<14 | 0x0F<<7 | 0x47,
-	20297 - 19968: jis0212<<14 | 0x0F<<7 | 0x48,
-	20299 - 19968: jis0212<<14 | 0x0F<<7 | 0x49,
-	20300 - 19968: jis0212<<14 | 0x0F<<7 | 0x4A,
-	20301 - 19968: jis0208<<14 | 0x0F<<7 | 0x2B,
-	20302 - 19968: jis0208<<14 | 0x23<<7 | 0x42,
-	20303 - 19968: jis0208<<14 | 0x1C<<7 | 0x1A,
-	20304 - 19968: jis0208<<14 | 0x19<<7 | 0x13,
-	20305 - 19968: jis0208<<14 | 0x2C<<7 | 0x03,
-	20306 - 19968: jis0212<<14 | 0x0F<<7 | 0x4B,
-	20307 - 19968: jis0208<<14 | 0x21<<7 | 0x2D,
-	20308 - 19968: jis0212<<14 | 0x0F<<7 | 0x4C,
-	20309 - 19968: jis0208<<14 | 0x11<<7 | 0x1E,
-	20310 - 19968: jis0208<<14 | 0x58<<7 | 0x12,
-	20311 - 19968: jis0208<<14 | 0x2F<<7 | 0x28,
-	20312 - 19968: jis0212<<14 | 0x0F<<7 | 0x4E,
-	20313 - 19968: jis0208<<14 | 0x2C<<7 | 0x1D,
-	20314 - 19968: jis0208<<14 | 0x2F<<7 | 0x24,
-	20315 - 19968: jis0208<<14 | 0x2F<<7 | 0x26,
-	20316 - 19968: jis0208<<14 | 0x19<<7 | 0x4D,
-	20317 - 19968: jis0208<<14 | 0x2F<<7 | 0x27,
-	20318 - 19968: jis0208<<14 | 0x34<<7 | 0x03,
-	20319 - 19968: jis0212<<14 | 0x0F<<7 | 0x4F,
-	20320 - 19968: jis0212<<14 | 0x0F<<7 | 0x3E,
-	20323 - 19968: jis0212<<14 | 0x0F<<7 | 0x50,
-	20329 - 19968: jis0208<<14 | 0x2F<<7 | 0x2F,
-	20330 - 19968: jis0212<<14 | 0x0F<<7 | 0x51,
-	20332 - 19968: jis0212<<14 | 0x0F<<7 | 0x52,
-	20334 - 19968: jis0212<<14 | 0x0F<<7 | 0x53,
-	20335 - 19968: jis0208<<14 | 0x2F<<7 | 0x32,
-	20336 - 19968: jis0208<<14 | 0x2F<<7 | 0x30,
-	20337 - 19968: jis0212<<14 | 0x0F<<7 | 0x54,
-	20339 - 19968: jis0208<<14 | 0x11<<7 | 0x21,
-	20341 - 19968: jis0208<<14 | 0x29<<7 | 0x1A,
-	20342 - 19968: jis0208<<14 | 0x2F<<7 | 0x2A,
-	20343 - 19968: jis0212<<14 | 0x0F<<7 | 0x55,
-	20344 - 19968: jis0212<<14 | 0x0F<<7 | 0x56,
-	20345 - 19968: jis0212<<14 | 0x0F<<7 | 0x57,
-	20346 - 19968: jis0212<<14 | 0x0F<<7 | 0x58,
-	20347 - 19968: jis0208<<14 | 0x2F<<7 | 0x2E,
-	20348 - 19968: jis0208<<14 | 0x17<<7 | 0x52,
-	20349 - 19968: jis0212<<14 | 0x0F<<7 | 0x59,
-	20350 - 19968: jis0212<<14 | 0x0F<<7 | 0x5A,
-	20351 - 19968: jis0208<<14 | 0x1A<<7 | 0x27,
-	20353 - 19968: jis0212<<14 | 0x0F<<7 | 0x5B,
-	20354 - 19968: jis0212<<14 | 0x0F<<7 | 0x5C,
-	20355 - 19968: jis0208<<14 | 0x13<<7 | 0x05,
-	20356 - 19968: jis0212<<14 | 0x0F<<7 | 0x5D,
-	20357 - 19968: jis0212<<14 | 0x10<<7 | 0x00,
-	20358 - 19968: jis0208<<14 | 0x2F<<7 | 0x33,
-	20360 - 19968: jis0208<<14 | 0x2F<<7 | 0x2B,
-	20361 - 19968: jis0212<<14 | 0x10<<7 | 0x01,
-	20362 - 19968: jis0208<<14 | 0x58<<7 | 0x14,
-	20363 - 19968: jis0208<<14 | 0x2D<<7 | 0x42,
-	20364 - 19968: jis0212<<14 | 0x10<<7 | 0x03,
-	20365 - 19968: jis0208<<14 | 0x1A<<7 | 0x57,
-	20366 - 19968: jis0212<<14 | 0x10<<7 | 0x04,
-	20367 - 19968: jis0208<<14 | 0x2F<<7 | 0x2C,
-	20368 - 19968: jis0212<<14 | 0x10<<7 | 0x05,
-	20369 - 19968: jis0208<<14 | 0x2F<<7 | 0x31,
-	20370 - 19968: jis0208<<14 | 0x58<<7 | 0x13,
-	20371 - 19968: jis0212<<14 | 0x10<<7 | 0x07,
-	20372 - 19968: jis0208<<14 | 0x58<<7 | 0x16,
-	20374 - 19968: jis0208<<14 | 0x2F<<7 | 0x34,
-	20375 - 19968: jis0212<<14 | 0x10<<7 | 0x09,
-	20376 - 19968: jis0208<<14 | 0x2F<<7 | 0x2D,
-	20377 - 19968: jis0212<<14 | 0x10<<7 | 0x0A,
-	20378 - 19968: jis0208<<14 | 0x58<<7 | 0x15,
-	20379 - 19968: jis0208<<14 | 0x15<<7 | 0x00,
-	20381 - 19968: jis0208<<14 | 0x0F<<7 | 0x2C,
-	20382 - 19968: jis0212<<14 | 0x10<<7 | 0x0C,
-	20383 - 19968: jis0212<<14 | 0x10<<7 | 0x0D,
-	20384 - 19968: jis0208<<14 | 0x15<<7 | 0x01,
-	20385 - 19968: jis0208<<14 | 0x11<<7 | 0x20,
-	20395 - 19968: jis0208<<14 | 0x34<<7 | 0x04,
-	20397 - 19968: jis0208<<14 | 0x2A<<7 | 0x58,
-	20398 - 19968: jis0208<<14 | 0x28<<7 | 0x4D,
-	20399 - 19968: jis0208<<14 | 0x17<<7 | 0x53,
-	20402 - 19968: jis0212<<14 | 0x10<<7 | 0x0E,
-	20405 - 19968: jis0208<<14 | 0x1E<<7 | 0x0E,
-	20406 - 19968: jis0208<<14 | 0x2D<<7 | 0x16,
-	20407 - 19968: jis0212<<14 | 0x10<<7 | 0x0F,
-	20409 - 19968: jis0212<<14 | 0x10<<7 | 0x10,
-	20411 - 19968: jis0212<<14 | 0x10<<7 | 0x11,
-	20412 - 19968: jis0212<<14 | 0x10<<7 | 0x12,
-	20413 - 19968: jis0212<<14 | 0x10<<7 | 0x13,
-	20414 - 19968: jis0212<<14 | 0x10<<7 | 0x14,
-	20415 - 19968: jis0208<<14 | 0x29<<7 | 0x37,
-	20416 - 19968: jis0212<<14 | 0x10<<7 | 0x15,
-	20417 - 19968: jis0212<<14 | 0x10<<7 | 0x16,
-	20418 - 19968: jis0208<<14 | 0x16<<7 | 0x17,
-	20419 - 19968: jis0208<<14 | 0x21<<7 | 0x04,
-	20420 - 19968: jis0208<<14 | 0x11<<7 | 0x43,
-	20421 - 19968: jis0212<<14 | 0x10<<7 | 0x17,
-	20422 - 19968: jis0212<<14 | 0x10<<7 | 0x18,
-	20424 - 19968: jis0212<<14 | 0x10<<7 | 0x19,
-	20425 - 19968: jis0208<<14 | 0x58<<7 | 0x05,
-	20426 - 19968: jis0208<<14 | 0x1C<<7 | 0x32,
-	20427 - 19968: jis0212<<14 | 0x10<<7 | 0x1B,
-	20428 - 19968: jis0212<<14 | 0x10<<7 | 0x1C,
-	20429 - 19968: jis0208<<14 | 0x58<<7 | 0x17,
-	20430 - 19968: jis0208<<14 | 0x2F<<7 | 0x38,
-	20431 - 19968: jis0212<<14 | 0x10<<7 | 0x1E,
-	20432 - 19968: jis0208<<14 | 0x2F<<7 | 0x3D,
-	20433 - 19968: jis0208<<14 | 0x2F<<7 | 0x3B,
-	20434 - 19968: jis0212<<14 | 0x10<<7 | 0x1F,
-	20436 - 19968: jis0208<<14 | 0x2F<<7 | 0x36,
-	20439 - 19968: jis0208<<14 | 0x21<<7 | 0x0E,
-	20440 - 19968: jis0208<<14 | 0x2F<<7 | 0x39,
-	20442 - 19968: jis0208<<14 | 0x2F<<7 | 0x3C,
-	20443 - 19968: jis0208<<14 | 0x2F<<7 | 0x3A,
-	20444 - 19968: jis0212<<14 | 0x10<<7 | 0x20,
-	20445 - 19968: jis0208<<14 | 0x29<<7 | 0x3C,
-	20447 - 19968: jis0208<<14 | 0x2F<<7 | 0x37,
-	20448 - 19968: jis0212<<14 | 0x10<<7 | 0x21,
-	20449 - 19968: jis0208<<14 | 0x1E<<7 | 0x0D,
-	20450 - 19968: jis0212<<14 | 0x10<<7 | 0x22,
-	20451 - 19968: jis0208<<14 | 0x2A<<7 | 0x52,
-	20452 - 19968: jis0208<<14 | 0x2F<<7 | 0x3E,
-	20453 - 19968: jis0208<<14 | 0x2F<<7 | 0x3F,
-	20462 - 19968: jis0208<<14 | 0x1C<<7 | 0x03,
-	20463 - 19968: jis0208<<14 | 0x2F<<7 | 0x4C,
-	20464 - 19968: jis0212<<14 | 0x10<<7 | 0x23,
-	20466 - 19968: jis0212<<14 | 0x10<<7 | 0x24,
-	20467 - 19968: jis0208<<14 | 0x26<<7 | 0x2F,
-	20469 - 19968: jis0208<<14 | 0x28<<7 | 0x15,
-	20470 - 19968: jis0208<<14 | 0x2F<<7 | 0x47,
-	20472 - 19968: jis0208<<14 | 0x29<<7 | 0x4F,
-	20474 - 19968: jis0208<<14 | 0x11<<7 | 0x15,
-	20476 - 19968: jis0212<<14 | 0x10<<7 | 0x25,
-	20477 - 19968: jis0212<<14 | 0x10<<7 | 0x26,
-	20478 - 19968: jis0208<<14 | 0x2F<<7 | 0x4B,
-	20479 - 19968: jis0208<<14 | 0x58<<7 | 0x1A,
-	20480 - 19968: jis0212<<14 | 0x10<<7 | 0x28,
-	20481 - 19968: jis0212<<14 | 0x10<<7 | 0x29,
-	20484 - 19968: jis0212<<14 | 0x10<<7 | 0x2A,
-	20485 - 19968: jis0208<<14 | 0x2F<<7 | 0x45,
-	20486 - 19968: jis0208<<14 | 0x2F<<7 | 0x4E,
-	20487 - 19968: jis0212<<14 | 0x10<<7 | 0x2B,
-	20489 - 19968: jis0208<<14 | 0x20<<7 | 0x31,
-	20490 - 19968: jis0212<<14 | 0x10<<7 | 0x2C,
-	20491 - 19968: jis0208<<14 | 0x17<<7 | 0x23,
-	20492 - 19968: jis0212<<14 | 0x10<<7 | 0x2D,
-	20493 - 19968: jis0208<<14 | 0x26<<7 | 0x3B,
-	20494 - 19968: jis0212<<14 | 0x10<<7 | 0x2E,
-	20495 - 19968: jis0208<<14 | 0x3F<<7 | 0x26,
-	20496 - 19968: jis0212<<14 | 0x10<<7 | 0x2F,
-	20497 - 19968: jis0208<<14 | 0x2F<<7 | 0x4D,
-	20498 - 19968: jis0208<<14 | 0x24<<7 | 0x3C,
-	20499 - 19968: jis0212<<14 | 0x10<<7 | 0x30,
-	20500 - 19968: jis0208<<14 | 0x2F<<7 | 0x42,
-	20502 - 19968: jis0208<<14 | 0x17<<7 | 0x55,
-	20503 - 19968: jis0212<<14 | 0x10<<7 | 0x31,
-	20504 - 19968: jis0212<<14 | 0x10<<7 | 0x32,
-	20505 - 19968: jis0208<<14 | 0x17<<7 | 0x54,
-	20506 - 19968: jis0208<<14 | 0x2F<<7 | 0x40,
-	20507 - 19968: jis0212<<14 | 0x10<<7 | 0x33,
-	20508 - 19968: jis0212<<14 | 0x10<<7 | 0x34,
-	20509 - 19968: jis0212<<14 | 0x10<<7 | 0x35,
-	20510 - 19968: jis0208<<14 | 0x58<<7 | 0x1B,
-	20511 - 19968: jis0208<<14 | 0x1B<<7 | 0x39,
-	20513 - 19968: jis0208<<14 | 0x2F<<7 | 0x48,
-	20514 - 19968: jis0208<<14 | 0x58<<7 | 0x19,
-	20515 - 19968: jis0208<<14 | 0x29<<7 | 0x4E,
-	20516 - 19968: jis0208<<14 | 0x22<<7 | 0x2C,
-	20517 - 19968: jis0208<<14 | 0x2F<<7 | 0x44,
-	20518 - 19968: jis0208<<14 | 0x16<<7 | 0x50,
-	20519 - 19968: jis0212<<14 | 0x10<<7 | 0x38,
-	20520 - 19968: jis0208<<14 | 0x2F<<7 | 0x41,
-	20521 - 19968: jis0208<<14 | 0x2F<<7 | 0x49,
-	20522 - 19968: jis0208<<14 | 0x2F<<7 | 0x43,
-	20523 - 19968: jis0208<<14 | 0x2D<<7 | 0x30,
-	20524 - 19968: jis0208<<14 | 0x2F<<7 | 0x4A,
-	20525 - 19968: jis0208<<14 | 0x2E<<7 | 0x20,
-	20526 - 19968: jis0212<<14 | 0x10<<7 | 0x39,
-	20528 - 19968: jis0212<<14 | 0x10<<7 | 0x3A,
-	20530 - 19968: jis0212<<14 | 0x10<<7 | 0x3B,
-	20531 - 19968: jis0212<<14 | 0x10<<7 | 0x3C,
-	20533 - 19968: jis0212<<14 | 0x10<<7 | 0x3D,
-	20534 - 19968: jis0208<<14 | 0x15<<7 | 0x45,
-	20537 - 19968: jis0208<<14 | 0x16<<7 | 0x4F,
-	20539 - 19968: jis0212<<14 | 0x10<<7 | 0x55,
-	20544 - 19968: jis0208<<14 | 0x58<<7 | 0x18,
-	20545 - 19968: jis0212<<14 | 0x10<<7 | 0x3F,
-	20546 - 19968: jis0208<<14 | 0x58<<7 | 0x1E,
-	20547 - 19968: jis0208<<14 | 0x2F<<7 | 0x4F,
-	20549 - 19968: jis0212<<14 | 0x10<<7 | 0x41,
-	20550 - 19968: jis0208<<14 | 0x58<<7 | 0x1C,
-	20551 - 19968: jis0208<<14 | 0x2F<<7 | 0x50,
-	20552 - 19968: jis0208<<14 | 0x2F<<7 | 0x54,
-	20553 - 19968: jis0208<<14 | 0x0F<<7 | 0x2D,
-	20554 - 19968: jis0212<<14 | 0x10<<7 | 0x43,
-	20556 - 19968: jis0212<<14 | 0x10<<7 | 0x44,
-	20558 - 19968: jis0212<<14 | 0x10<<7 | 0x45,
-	20559 - 19968: jis0208<<14 | 0x29<<7 | 0x2F,
-	20560 - 19968: jis0208<<14 | 0x2F<<7 | 0x53,
-	20561 - 19968: jis0212<<14 | 0x10<<7 | 0x46,
-	20562 - 19968: jis0212<<14 | 0x10<<7 | 0x47,
-	20563 - 19968: jis0212<<14 | 0x10<<7 | 0x48,
-	20565 - 19968: jis0208<<14 | 0x2F<<7 | 0x52,
-	20566 - 19968: jis0208<<14 | 0x2F<<7 | 0x56,
-	20567 - 19968: jis0212<<14 | 0x10<<7 | 0x49,
-	20569 - 19968: jis0212<<14 | 0x10<<7 | 0x4A,
-	20570 - 19968: jis0208<<14 | 0x2F<<7 | 0x55,
-	20572 - 19968: jis0208<<14 | 0x23<<7 | 0x43,
-	20575 - 19968: jis0212<<14 | 0x10<<7 | 0x4B,
-	20576 - 19968: jis0212<<14 | 0x10<<7 | 0x4C,
-	20578 - 19968: jis0212<<14 | 0x10<<7 | 0x4D,
-	20579 - 19968: jis0212<<14 | 0x10<<7 | 0x4E,
-	20581 - 19968: jis0208<<14 | 0x16<<7 | 0x51,
-	20582 - 19968: jis0212<<14 | 0x10<<7 | 0x4F,
-	20583 - 19968: jis0212<<14 | 0x10<<7 | 0x50,
-	20586 - 19968: jis0212<<14 | 0x10<<7 | 0x51,
-	20588 - 19968: jis0208<<14 | 0x2F<<7 | 0x57,
-	20589 - 19968: jis0212<<14 | 0x10<<7 | 0x52,
-	20592 - 19968: jis0208<<14 | 0x58<<7 | 0x1D,
-	20593 - 19968: jis0212<<14 | 0x10<<7 | 0x54,
-	20594 - 19968: jis0208<<14 | 0x1B<<7 | 0x24,
-	20596 - 19968: jis0208<<14 | 0x21<<7 | 0x05,
-	20597 - 19968: jis0208<<14 | 0x23<<7 | 0x44,
-	20598 - 19968: jis0208<<14 | 0x15<<7 | 0x55,
-	20600 - 19968: jis0208<<14 | 0x2F<<7 | 0x58,
-	20605 - 19968: jis0208<<14 | 0x14<<7 | 0x15,
-	20608 - 19968: jis0208<<14 | 0x2F<<7 | 0x59,
-	20609 - 19968: jis0212<<14 | 0x10<<7 | 0x56,
-	20611 - 19968: jis0212<<14 | 0x10<<7 | 0x57,
-	20612 - 19968: jis0212<<14 | 0x10<<7 | 0x58,
-	20613 - 19968: jis0208<<14 | 0x2F<<7 | 0x5B,
-	20614 - 19968: jis0212<<14 | 0x10<<7 | 0x59,
-	20618 - 19968: jis0212<<14 | 0x10<<7 | 0x5A,
-	20621 - 19968: jis0208<<14 | 0x2A<<7 | 0x14,
-	20622 - 19968: jis0212<<14 | 0x10<<7 | 0x5B,
-	20623 - 19968: jis0212<<14 | 0x10<<7 | 0x5C,
-	20624 - 19968: jis0212<<14 | 0x10<<7 | 0x5D,
-	20625 - 19968: jis0208<<14 | 0x16<<7 | 0x45,
-	20626 - 19968: jis0212<<14 | 0x11<<7 | 0x00,
-	20627 - 19968: jis0212<<14 | 0x11<<7 | 0x01,
-	20628 - 19968: jis0208<<14 | 0x58<<7 | 0x1F,
-	20630 - 19968: jis0212<<14 | 0x11<<7 | 0x03,
-	20632 - 19968: jis0208<<14 | 0x1A<<7 | 0x10,
-	20633 - 19968: jis0208<<14 | 0x27<<7 | 0x56,
-	20634 - 19968: jis0208<<14 | 0x2F<<7 | 0x5A,
-	20635 - 19968: jis0212<<14 | 0x11<<7 | 0x04,
-	20636 - 19968: jis0212<<14 | 0x11<<7 | 0x05,
-	20638 - 19968: jis0212<<14 | 0x11<<7 | 0x06,
-	20639 - 19968: jis0212<<14 | 0x11<<7 | 0x07,
-	20640 - 19968: jis0212<<14 | 0x11<<7 | 0x08,
-	20641 - 19968: jis0212<<14 | 0x11<<7 | 0x09,
-	20642 - 19968: jis0212<<14 | 0x11<<7 | 0x0A,
-	20650 - 19968: jis0212<<14 | 0x11<<7 | 0x0B,
-	20652 - 19968: jis0208<<14 | 0x19<<7 | 0x24,
-	20653 - 19968: jis0208<<14 | 0x2C<<7 | 0x22,
-	20655 - 19968: jis0212<<14 | 0x11<<7 | 0x0C,
-	20656 - 19968: jis0212<<14 | 0x11<<7 | 0x0D,
-	20658 - 19968: jis0208<<14 | 0x2F<<7 | 0x5D,
-	20659 - 19968: jis0208<<14 | 0x30<<7 | 0x02,
-	20660 - 19968: jis0208<<14 | 0x2F<<7 | 0x5C,
-	20661 - 19968: jis0208<<14 | 0x19<<7 | 0x23,
-	20663 - 19968: jis0208<<14 | 0x1C<<7 | 0x5C,
-	20665 - 19968: jis0212<<14 | 0x11<<7 | 0x0E,
-	20666 - 19968: jis0212<<14 | 0x11<<7 | 0x0F,
-	20669 - 19968: jis0212<<14 | 0x11<<7 | 0x10,
-	20670 - 19968: jis0208<<14 | 0x16<<7 | 0x18,
-	20672 - 19968: jis0212<<14 | 0x11<<7 | 0x11,
-	20674 - 19968: jis0208<<14 | 0x30<<7 | 0x03,
-	20675 - 19968: jis0212<<14 | 0x11<<7 | 0x12,
-	20676 - 19968: jis0212<<14 | 0x11<<7 | 0x13,
-	20677 - 19968: jis0208<<14 | 0x15<<7 | 0x2E,
-	20679 - 19968: jis0212<<14 | 0x11<<7 | 0x14,
-	20681 - 19968: jis0208<<14 | 0x30<<7 | 0x00,
-	20682 - 19968: jis0208<<14 | 0x30<<7 | 0x01,
-	20684 - 19968: jis0212<<14 | 0x11<<7 | 0x15,
-	20685 - 19968: jis0208<<14 | 0x25<<7 | 0x0E,
-	20686 - 19968: jis0212<<14 | 0x11<<7 | 0x16,
-	20687 - 19968: jis0208<<14 | 0x20<<7 | 0x5B,
-	20688 - 19968: jis0212<<14 | 0x11<<7 | 0x17,
-	20689 - 19968: jis0208<<14 | 0x15<<7 | 0x02,
-	20691 - 19968: jis0212<<14 | 0x11<<7 | 0x18,
-	20692 - 19968: jis0212<<14 | 0x11<<7 | 0x19,
-	20693 - 19968: jis0208<<14 | 0x2A<<7 | 0x2C,
-	20694 - 19968: jis0208<<14 | 0x30<<7 | 0x04,
-	20696 - 19968: jis0208<<14 | 0x58<<7 | 0x21,
-	20698 - 19968: jis0208<<14 | 0x2D<<7 | 0x1C,
-	20700 - 19968: jis0212<<14 | 0x11<<7 | 0x1B,
-	20701 - 19968: jis0212<<14 | 0x11<<7 | 0x1C,
-	20702 - 19968: jis0208<<14 | 0x30<<7 | 0x05,
-	20703 - 19968: jis0212<<14 | 0x11<<7 | 0x1D,
-	20706 - 19968: jis0212<<14 | 0x11<<7 | 0x1E,
-	20707 - 19968: jis0208<<14 | 0x30<<7 | 0x08,
-	20708 - 19968: jis0212<<14 | 0x11<<7 | 0x1F,
-	20709 - 19968: jis0208<<14 | 0x30<<7 | 0x06,
-	20710 - 19968: jis0212<<14 | 0x11<<7 | 0x20,
-	20711 - 19968: jis0208<<14 | 0x20<<7 | 0x2D,
-	20712 - 19968: jis0212<<14 | 0x11<<7 | 0x21,
-	20713 - 19968: jis0212<<14 | 0x11<<7 | 0x22,
-	20717 - 19968: jis0208<<14 | 0x30<<7 | 0x07,
-	20718 - 19968: jis0208<<14 | 0x30<<7 | 0x09,
-	20719 - 19968: jis0212<<14 | 0x11<<7 | 0x23,
-	20721 - 19968: jis0212<<14 | 0x11<<7 | 0x24,
-	20722 - 19968: jis0212<<14 | 0x11<<7 | 0x30,
-	20724 - 19968: jis0208<<14 | 0x58<<7 | 0x20,
-	20725 - 19968: jis0208<<14 | 0x30<<7 | 0x0B,
-	20726 - 19968: jis0212<<14 | 0x11<<7 | 0x25,
-	20729 - 19968: jis0208<<14 | 0x30<<7 | 0x0A,
-	20730 - 19968: jis0212<<14 | 0x11<<7 | 0x26,
-	20731 - 19968: jis0208<<14 | 0x29<<7 | 0x27,
-	20734 - 19968: jis0212<<14 | 0x11<<7 | 0x27,
-	20736 - 19968: jis0208<<14 | 0x14<<7 | 0x16,
-	20737 - 19968: jis0208<<14 | 0x30<<7 | 0x0D,
-	20738 - 19968: jis0208<<14 | 0x30<<7 | 0x0E,
-	20739 - 19968: jis0212<<14 | 0x11<<7 | 0x28,
-	20740 - 19968: jis0208<<14 | 0x11<<7 | 0x0E,
-	20742 - 19968: jis0212<<14 | 0x11<<7 | 0x29,
-	20743 - 19968: jis0212<<14 | 0x11<<7 | 0x2A,
-	20744 - 19968: jis0212<<14 | 0x11<<7 | 0x2B,
-	20745 - 19968: jis0208<<14 | 0x30<<7 | 0x0C,
-	20747 - 19968: jis0212<<14 | 0x11<<7 | 0x2C,
-	20748 - 19968: jis0212<<14 | 0x11<<7 | 0x2D,
-	20749 - 19968: jis0212<<14 | 0x11<<7 | 0x2E,
-	20750 - 19968: jis0212<<14 | 0x11<<7 | 0x2F,
-	20752 - 19968: jis0212<<14 | 0x11<<7 | 0x31,
-	20754 - 19968: jis0208<<14 | 0x1B<<7 | 0x53,
-	20756 - 19968: jis0208<<14 | 0x30<<7 | 0x11,
-	20757 - 19968: jis0208<<14 | 0x30<<7 | 0x10,
-	20758 - 19968: jis0208<<14 | 0x30<<7 | 0x0F,
-	20759 - 19968: jis0212<<14 | 0x11<<7 | 0x32,
-	20760 - 19968: jis0208<<14 | 0x2F<<7 | 0x35,
-	20761 - 19968: jis0212<<14 | 0x11<<7 | 0x33,
-	20762 - 19968: jis0208<<14 | 0x30<<7 | 0x12,
-	20763 - 19968: jis0212<<14 | 0x11<<7 | 0x34,
-	20764 - 19968: jis0212<<14 | 0x11<<7 | 0x35,
-	20765 - 19968: jis0212<<14 | 0x11<<7 | 0x36,
-	20766 - 19968: jis0212<<14 | 0x11<<7 | 0x37,
-	20767 - 19968: jis0208<<14 | 0x1C<<7 | 0x5D,
-	20769 - 19968: jis0208<<14 | 0x30<<7 | 0x13,
-	20771 - 19968: jis0212<<14 | 0x11<<7 | 0x38,
-	20775 - 19968: jis0212<<14 | 0x11<<7 | 0x39,
-	20776 - 19968: jis0212<<14 | 0x11<<7 | 0x3A,
-	20778 - 19968: jis0208<<14 | 0x2C<<7 | 0x04,
-	20780 - 19968: jis0212<<14 | 0x11<<7 | 0x3B,
-	20781 - 19968: jis0212<<14 | 0x11<<7 | 0x3C,
-	20783 - 19968: jis0212<<14 | 0x11<<7 | 0x3D,
-	20785 - 19968: jis0212<<14 | 0x11<<7 | 0x3E,
-	20786 - 19968: jis0208<<14 | 0x2B<<7 | 0x38,
-	20787 - 19968: jis0212<<14 | 0x11<<7 | 0x3F,
-	20788 - 19968: jis0212<<14 | 0x11<<7 | 0x40,
-	20789 - 19968: jis0212<<14 | 0x11<<7 | 0x41,
-	20791 - 19968: jis0208<<14 | 0x30<<7 | 0x15,
-	20792 - 19968: jis0212<<14 | 0x11<<7 | 0x42,
-	20793 - 19968: jis0212<<14 | 0x11<<7 | 0x43,
-	20794 - 19968: jis0208<<14 | 0x30<<7 | 0x14,
-	20795 - 19968: jis0208<<14 | 0x30<<7 | 0x17,
-	20796 - 19968: jis0208<<14 | 0x30<<7 | 0x16,
-	20799 - 19968: jis0208<<14 | 0x30<<7 | 0x18,
-	20800 - 19968: jis0208<<14 | 0x30<<7 | 0x19,
-	20801 - 19968: jis0208<<14 | 0x0F<<7 | 0x53,
-	20802 - 19968: jis0212<<14 | 0x11<<7 | 0x44,
-	20803 - 19968: jis0208<<14 | 0x17<<7 | 0x14,
-	20804 - 19968: jis0208<<14 | 0x16<<7 | 0x1A,
-	20805 - 19968: jis0208<<14 | 0x1C<<7 | 0x1B,
-	20806 - 19968: jis0208<<14 | 0x22<<7 | 0x5A,
-	20807 - 19968: jis0208<<14 | 0x15<<7 | 0x03,
-	20808 - 19968: jis0208<<14 | 0x1F<<7 | 0x47,
-	20809 - 19968: jis0208<<14 | 0x17<<7 | 0x56,
-	20810 - 19968: jis0208<<14 | 0x58<<7 | 0x22,
-	20811 - 19968: jis0208<<14 | 0x18<<7 | 0x4D,
-	20812 - 19968: jis0208<<14 | 0x30<<7 | 0x1B,
-	20813 - 19968: jis0208<<14 | 0x2B<<7 | 0x27,
-	20814 - 19968: jis0208<<14 | 0x24<<7 | 0x25,
-	20815 - 19968: jis0212<<14 | 0x11<<7 | 0x46,
-	20816 - 19968: jis0208<<14 | 0x1A<<7 | 0x58,
-	20818 - 19968: jis0208<<14 | 0x30<<7 | 0x1A,
-	20819 - 19968: jis0212<<14 | 0x11<<7 | 0x47,
-	20820 - 19968: jis0208<<14 | 0x30<<7 | 0x1C,
-	20821 - 19968: jis0212<<14 | 0x11<<7 | 0x48,
-	20823 - 19968: jis0212<<14 | 0x11<<7 | 0x49,
-	20824 - 19968: jis0212<<14 | 0x11<<7 | 0x4A,
-	20826 - 19968: jis0208<<14 | 0x24<<7 | 0x3D,
-	20828 - 19968: jis0208<<14 | 0x12<<7 | 0x54,
-	20831 - 19968: jis0212<<14 | 0x11<<7 | 0x4B,
-	20834 - 19968: jis0208<<14 | 0x30<<7 | 0x1D,
-	20836 - 19968: jis0208<<14 | 0x58<<7 | 0x23,
-	20837 - 19968: jis0208<<14 | 0x25<<7 | 0x5D,
-	20838 - 19968: jis0212<<14 | 0x11<<7 | 0x4D,
-	20840 - 19968: jis0208<<14 | 0x20<<7 | 0x13,
-	20841 - 19968: jis0208<<14 | 0x30<<7 | 0x1F,
-	20842 - 19968: jis0208<<14 | 0x30<<7 | 0x20,
-	20843 - 19968: jis0208<<14 | 0x27<<7 | 0x0B,
-	20844 - 19968: jis0208<<14 | 0x17<<7 | 0x57,
-	20845 - 19968: jis0208<<14 | 0x2E<<7 | 0x1A,
-	20846 - 19968: jis0208<<14 | 0x30<<7 | 0x21,
-	20849 - 19968: jis0208<<14 | 0x15<<7 | 0x05,
-	20853 - 19968: jis0208<<14 | 0x29<<7 | 0x1B,
-	20854 - 19968: jis0208<<14 | 0x21<<7 | 0x15,
-	20855 - 19968: jis0208<<14 | 0x15<<7 | 0x50,
-	20856 - 19968: jis0208<<14 | 0x24<<7 | 0x14,
-	20860 - 19968: jis0208<<14 | 0x16<<7 | 0x52,
-	20862 - 19968: jis0212<<14 | 0x11<<7 | 0x4E,
-	20864 - 19968: jis0208<<14 | 0x30<<7 | 0x22,
-	20866 - 19968: jis0208<<14 | 0x30<<7 | 0x23,
-	20867 - 19968: jis0212<<14 | 0x11<<7 | 0x4F,
-	20868 - 19968: jis0212<<14 | 0x11<<7 | 0x50,
-	20869 - 19968: jis0208<<14 | 0x25<<7 | 0x41,
-	20870 - 19968: jis0208<<14 | 0x10<<7 | 0x3E,
-	20873 - 19968: jis0208<<14 | 0x30<<7 | 0x26,
-	20874 - 19968: jis0208<<14 | 0x19<<7 | 0x5C,
-	20875 - 19968: jis0212<<14 | 0x11<<7 | 0x51,
-	20876 - 19968: jis0208<<14 | 0x30<<7 | 0x25,
-	20877 - 19968: jis0208<<14 | 0x19<<7 | 0x25,
-	20878 - 19968: jis0212<<14 | 0x11<<7 | 0x52,
-	20879 - 19968: jis0208<<14 | 0x30<<7 | 0x27,
-	20880 - 19968: jis0208<<14 | 0x45<<7 | 0x4D,
-	20881 - 19968: jis0208<<14 | 0x30<<7 | 0x28,
-	20882 - 19968: jis0208<<14 | 0x2A<<7 | 0x20,
-	20883 - 19968: jis0208<<14 | 0x30<<7 | 0x29,
-	20885 - 19968: jis0208<<14 | 0x30<<7 | 0x2A,
-	20886 - 19968: jis0208<<14 | 0x30<<7 | 0x2B,
-	20887 - 19968: jis0208<<14 | 0x1D<<7 | 0x48,
-	20888 - 19968: jis0212<<14 | 0x11<<7 | 0x53,
-	20889 - 19968: jis0208<<14 | 0x1B<<7 | 0x2B,
-	20893 - 19968: jis0208<<14 | 0x58<<7 | 0x24,
-	20896 - 19968: jis0208<<14 | 0x13<<7 | 0x06,
-	20897 - 19968: jis0212<<14 | 0x11<<7 | 0x55,
-	20898 - 19968: jis0208<<14 | 0x30<<7 | 0x2E,
-	20899 - 19968: jis0212<<14 | 0x11<<7 | 0x56,
-	20900 - 19968: jis0208<<14 | 0x30<<7 | 0x2C,
-	20901 - 19968: jis0208<<14 | 0x2B<<7 | 0x1C,
-	20902 - 19968: jis0208<<14 | 0x30<<7 | 0x2D,
-	20904 - 19968: jis0208<<14 | 0x28<<7 | 0x39,
-	20905 - 19968: jis0208<<14 | 0x30<<7 | 0x2F,
-	20906 - 19968: jis0208<<14 | 0x30<<7 | 0x30,
-	20907 - 19968: jis0208<<14 | 0x30<<7 | 0x31,
-	20908 - 19968: jis0208<<14 | 0x24<<7 | 0x3E,
-	20909 - 19968: jis0212<<14 | 0x11<<7 | 0x57,
-	20912 - 19968: jis0208<<14 | 0x30<<7 | 0x35,
-	20913 - 19968: jis0208<<14 | 0x30<<7 | 0x33,
-	20914 - 19968: jis0208<<14 | 0x30<<7 | 0x34,
-	20915 - 19968: jis0208<<14 | 0x30<<7 | 0x32,
-	20916 - 19968: jis0208<<14 | 0x19<<7 | 0x42,
-	20917 - 19968: jis0208<<14 | 0x30<<7 | 0x36,
-	20918 - 19968: jis0208<<14 | 0x2B<<7 | 0x49,
-	20919 - 19968: jis0208<<14 | 0x2D<<7 | 0x43,
-	20920 - 19968: jis0212<<14 | 0x11<<7 | 0x58,
-	20922 - 19968: jis0212<<14 | 0x11<<7 | 0x59,
-	20924 - 19968: jis0212<<14 | 0x11<<7 | 0x5A,
-	20925 - 19968: jis0208<<14 | 0x30<<7 | 0x37,
-	20926 - 19968: jis0208<<14 | 0x58<<7 | 0x25,
-	20927 - 19968: jis0212<<14 | 0x11<<7 | 0x5C,
-	20930 - 19968: jis0212<<14 | 0x11<<7 | 0x5D,
-	20932 - 19968: jis0208<<14 | 0x1F<<7 | 0x07,
-	20933 - 19968: jis0208<<14 | 0x30<<7 | 0x38,
-	20934 - 19968: jis0208<<14 | 0x1C<<7 | 0x39,
-	20936 - 19968: jis0212<<14 | 0x12<<7 | 0x00,
-	20937 - 19968: jis0208<<14 | 0x30<<7 | 0x39,
-	20939 - 19968: jis0208<<14 | 0x22<<7 | 0x5B,
-	20940 - 19968: jis0208<<14 | 0x2D<<7 | 0x1E,
-	20941 - 19968: jis0208<<14 | 0x24<<7 | 0x3F,
-	20943 - 19968: jis0212<<14 | 0x12<<7 | 0x01,
-	20945 - 19968: jis0212<<14 | 0x12<<7 | 0x02,
-	20946 - 19968: jis0212<<14 | 0x12<<7 | 0x03,
-	20947 - 19968: jis0212<<14 | 0x12<<7 | 0x04,
-	20949 - 19968: jis0212<<14 | 0x12<<7 | 0x05,
-	20950 - 19968: jis0208<<14 | 0x31<<7 | 0x24,
-	20952 - 19968: jis0212<<14 | 0x12<<7 | 0x06,
-	20955 - 19968: jis0208<<14 | 0x30<<7 | 0x3A,
-	20956 - 19968: jis0208<<14 | 0x53<<7 | 0x04,
-	20957 - 19968: jis0208<<14 | 0x15<<7 | 0x24,
-	20958 - 19968: jis0212<<14 | 0x12<<7 | 0x07,
-	20960 - 19968: jis0208<<14 | 0x30<<7 | 0x3B,
-	20961 - 19968: jis0208<<14 | 0x2A<<7 | 0x3D,
-	20962 - 19968: jis0212<<14 | 0x12<<7 | 0x08,
-	20965 - 19968: jis0212<<14 | 0x12<<7 | 0x09,
-	20966 - 19968: jis0208<<14 | 0x1C<<7 | 0x47,
-	20967 - 19968: jis0208<<14 | 0x21<<7 | 0x5B,
-	20969 - 19968: jis0208<<14 | 0x30<<7 | 0x3D,
-	20970 - 19968: jis0208<<14 | 0x25<<7 | 0x43,
-	20972 - 19968: jis0208<<14 | 0x58<<7 | 0x26,
-	20973 - 19968: jis0208<<14 | 0x30<<7 | 0x3E,
-	20974 - 19968: jis0212<<14 | 0x12<<7 | 0x0A,
-	20976 - 19968: jis0208<<14 | 0x30<<7 | 0x3F,
-	20977 - 19968: jis0208<<14 | 0x12<<7 | 0x0D,
-	20978 - 19968: jis0212<<14 | 0x12<<7 | 0x0B,
-	20979 - 19968: jis0212<<14 | 0x12<<7 | 0x0C,
-	20980 - 19968: jis0212<<14 | 0x12<<7 | 0x0D,
-	20981 - 19968: jis0208<<14 | 0x30<<7 | 0x40,
-	20982 - 19968: jis0208<<14 | 0x15<<7 | 0x06,
-	20983 - 19968: jis0212<<14 | 0x12<<7 | 0x0E,
-	20984 - 19968: jis0208<<14 | 0x25<<7 | 0x2B,
-	20985 - 19968: jis0208<<14 | 0x10<<7 | 0x59,
-	20986 - 19968: jis0208<<14 | 0x1C<<7 | 0x2F,
-	20989 - 19968: jis0208<<14 | 0x27<<7 | 0x00,
-	20990 - 19968: jis0208<<14 | 0x30<<7 | 0x41,
-	20992 - 19968: jis0208<<14 | 0x24<<7 | 0x40,
-	20993 - 19968: jis0212<<14 | 0x12<<7 | 0x0F,
-	20994 - 19968: jis0212<<14 | 0x12<<7 | 0x10,
-	20995 - 19968: jis0208<<14 | 0x1E<<7 | 0x2E,
-	20996 - 19968: jis0208<<14 | 0x30<<7 | 0x42,
-	20997 - 19968: jis0212<<14 | 0x12<<7 | 0x11,
-	20998 - 19968: jis0208<<14 | 0x29<<7 | 0x0B,
-	20999 - 19968: jis0208<<14 | 0x1F<<7 | 0x39,
-	21000 - 19968: jis0208<<14 | 0x13<<7 | 0x01,
-	21002 - 19968: jis0208<<14 | 0x13<<7 | 0x08,
-	21003 - 19968: jis0208<<14 | 0x30<<7 | 0x43,
-	21006 - 19968: jis0208<<14 | 0x30<<7 | 0x45,
-	21009 - 19968: jis0208<<14 | 0x16<<7 | 0x19,
-	21010 - 19968: jis0212<<14 | 0x12<<7 | 0x12,
-	21011 - 19968: jis0212<<14 | 0x12<<7 | 0x13,
-	21012 - 19968: jis0208<<14 | 0x30<<7 | 0x44,
-	21013 - 19968: jis0208<<14 | 0x58<<7 | 0x27,
-	21014 - 19968: jis0212<<14 | 0x12<<7 | 0x15,
-	21015 - 19968: jis0208<<14 | 0x2D<<7 | 0x52,
-	21016 - 19968: jis0212<<14 | 0x12<<7 | 0x16,
-	21021 - 19968: jis0208<<14 | 0x1C<<7 | 0x48,
-	21026 - 19968: jis0212<<14 | 0x12<<7 | 0x17,
-	21028 - 19968: jis0208<<14 | 0x27<<7 | 0x1C,
-	21029 - 19968: jis0208<<14 | 0x29<<7 | 0x2B,
-	21031 - 19968: jis0208<<14 | 0x30<<7 | 0x46,
-	21032 - 19968: jis0212<<14 | 0x12<<7 | 0x18,
-	21033 - 19968: jis0208<<14 | 0x2C<<7 | 0x57,
-	21034 - 19968: jis0208<<14 | 0x30<<7 | 0x47,
-	21038 - 19968: jis0208<<14 | 0x30<<7 | 0x48,
-	21040 - 19968: jis0208<<14 | 0x24<<7 | 0x5D,
-	21041 - 19968: jis0212<<14 | 0x12<<7 | 0x19,
-	21042 - 19968: jis0212<<14 | 0x12<<7 | 0x1A,
-	21043 - 19968: jis0208<<14 | 0x30<<7 | 0x49,
-	21045 - 19968: jis0212<<14 | 0x12<<7 | 0x1B,
-	21046 - 19968: jis0208<<14 | 0x1F<<7 | 0x08,
-	21047 - 19968: jis0208<<14 | 0x19<<7 | 0x5D,
-	21048 - 19968: jis0208<<14 | 0x16<<7 | 0x53,
-	21049 - 19968: jis0208<<14 | 0x30<<7 | 0x4A,
-	21050 - 19968: jis0208<<14 | 0x1A<<7 | 0x28,
-	21051 - 19968: jis0208<<14 | 0x18<<7 | 0x4E,
-	21052 - 19968: jis0212<<14 | 0x12<<7 | 0x1C,
-	21059 - 19968: jis0208<<14 | 0x23<<7 | 0x45,
-	21060 - 19968: jis0208<<14 | 0x30<<7 | 0x4C,
-	21061 - 19968: jis0212<<14 | 0x12<<7 | 0x1D,
-	21063 - 19968: jis0208<<14 | 0x21<<7 | 0x06,
-	21065 - 19968: jis0212<<14 | 0x12<<7 | 0x1E,
-	21066 - 19968: jis0208<<14 | 0x19<<7 | 0x4E,
-	21067 - 19968: jis0208<<14 | 0x30<<7 | 0x4D,
-	21068 - 19968: jis0208<<14 | 0x30<<7 | 0x4E,
-	21069 - 19968: jis0208<<14 | 0x20<<7 | 0x0F,
-	21071 - 19968: jis0208<<14 | 0x30<<7 | 0x4B,
-	21076 - 19968: jis0208<<14 | 0x30<<7 | 0x50,
-	21077 - 19968: jis0212<<14 | 0x12<<7 | 0x1F,
-	21078 - 19968: jis0208<<14 | 0x2A<<7 | 0x15,
-	21079 - 19968: jis0212<<14 | 0x12<<7 | 0x20,
-	21080 - 19968: jis0212<<14 | 0x12<<7 | 0x21,
-	21082 - 19968: jis0212<<14 | 0x12<<7 | 0x22,
-	21083 - 19968: jis0208<<14 | 0x18<<7 | 0x43,
-	21084 - 19968: jis0212<<14 | 0x12<<7 | 0x23,
-	21086 - 19968: jis0208<<14 | 0x30<<7 | 0x4F,
-	21087 - 19968: jis0212<<14 | 0x12<<7 | 0x24,
-	21088 - 19968: jis0212<<14 | 0x12<<7 | 0x25,
-	21089 - 19968: jis0212<<14 | 0x12<<7 | 0x26,
-	21091 - 19968: jis0208<<14 | 0x16<<7 | 0x54,
-	21092 - 19968: jis0208<<14 | 0x19<<7 | 0x3D,
-	21093 - 19968: jis0208<<14 | 0x26<<7 | 0x4C,
-	21094 - 19968: jis0212<<14 | 0x12<<7 | 0x27,
-	21097 - 19968: jis0208<<14 | 0x30<<7 | 0x53,
-	21098 - 19968: jis0208<<14 | 0x30<<7 | 0x51,
-	21102 - 19968: jis0212<<14 | 0x12<<7 | 0x28,
-	21103 - 19968: jis0208<<14 | 0x28<<7 | 0x5A,
-	21104 - 19968: jis0208<<14 | 0x1D<<7 | 0x49,
-	21105 - 19968: jis0208<<14 | 0x30<<7 | 0x5A,
-	21106 - 19968: jis0208<<14 | 0x12<<7 | 0x43,
-	21107 - 19968: jis0208<<14 | 0x30<<7 | 0x54,
-	21108 - 19968: jis0208<<14 | 0x30<<7 | 0x52,
-	21109 - 19968: jis0208<<14 | 0x20<<7 | 0x2E,
-	21111 - 19968: jis0212<<14 | 0x12<<7 | 0x29,
-	21112 - 19968: jis0212<<14 | 0x12<<7 | 0x2A,
-	21113 - 19968: jis0212<<14 | 0x12<<7 | 0x2B,
-	21117 - 19968: jis0208<<14 | 0x30<<7 | 0x56,
-	21119 - 19968: jis0208<<14 | 0x30<<7 | 0x55,
-	21120 - 19968: jis0212<<14 | 0x12<<7 | 0x2C,
-	21122 - 19968: jis0212<<14 | 0x12<<7 | 0x2D,
-	21123 - 19968: jis0208<<14 | 0x12<<7 | 0x23,
-	21125 - 19968: jis0212<<14 | 0x12<<7 | 0x2E,
-	21127 - 19968: jis0208<<14 | 0x16<<7 | 0x3F,
-	21128 - 19968: jis0208<<14 | 0x30<<7 | 0x5B,
-	21129 - 19968: jis0208<<14 | 0x2D<<7 | 0x0C,
-	21130 - 19968: jis0212<<14 | 0x12<<7 | 0x2F,
-	21132 - 19968: jis0212<<14 | 0x12<<7 | 0x30,
-	21133 - 19968: jis0208<<14 | 0x30<<7 | 0x57,
-	21137 - 19968: jis0208<<14 | 0x30<<7 | 0x5C,
-	21138 - 19968: jis0208<<14 | 0x30<<7 | 0x59,
-	21139 - 19968: jis0212<<14 | 0x12<<7 | 0x31,
-	21140 - 19968: jis0208<<14 | 0x30<<7 | 0x58,
-	21141 - 19968: jis0212<<14 | 0x12<<7 | 0x32,
-	21142 - 19968: jis0212<<14 | 0x12<<7 | 0x33,
-	21143 - 19968: jis0212<<14 | 0x12<<7 | 0x34,
-	21144 - 19968: jis0212<<14 | 0x12<<7 | 0x35,
-	21146 - 19968: jis0212<<14 | 0x12<<7 | 0x36,
-	21147 - 19968: jis0208<<14 | 0x2D<<7 | 0x2E,
-	21148 - 19968: jis0208<<14 | 0x58<<7 | 0x28,
-	21151 - 19968: jis0208<<14 | 0x17<<7 | 0x58,
-	21152 - 19968: jis0208<<14 | 0x11<<7 | 0x22,
-	21155 - 19968: jis0208<<14 | 0x2D<<7 | 0x53,
-	21156 - 19968: jis0212<<14 | 0x12<<7 | 0x38,
-	21157 - 19968: jis0212<<14 | 0x12<<7 | 0x39,
-	21158 - 19968: jis0208<<14 | 0x58<<7 | 0x29,
-	21159 - 19968: jis0212<<14 | 0x12<<7 | 0x3B,
-	21161 - 19968: jis0208<<14 | 0x1C<<7 | 0x54,
-	21162 - 19968: jis0208<<14 | 0x24<<7 | 0x37,
-	21163 - 19968: jis0208<<14 | 0x18<<7 | 0x44,
-	21164 - 19968: jis0208<<14 | 0x31<<7 | 0x01,
-	21165 - 19968: jis0208<<14 | 0x31<<7 | 0x02,
-	21167 - 19968: jis0208<<14 | 0x5A<<7 | 0x1B,
-	21168 - 19968: jis0212<<14 | 0x12<<7 | 0x3D,
-	21169 - 19968: jis0208<<14 | 0x2D<<7 | 0x44,
-	21172 - 19968: jis0208<<14 | 0x2E<<7 | 0x0A,
-	21173 - 19968: jis0208<<14 | 0x31<<7 | 0x04,
-	21174 - 19968: jis0212<<14 | 0x12<<7 | 0x3E,
-	21175 - 19968: jis0212<<14 | 0x12<<7 | 0x3F,
-	21176 - 19968: jis0212<<14 | 0x12<<7 | 0x40,
-	21177 - 19968: jis0208<<14 | 0x17<<7 | 0x59,
-	21178 - 19968: jis0212<<14 | 0x12<<7 | 0x41,
-	21179 - 19968: jis0212<<14 | 0x12<<7 | 0x42,
-	21180 - 19968: jis0208<<14 | 0x31<<7 | 0x03,
-	21181 - 19968: jis0212<<14 | 0x12<<7 | 0x43,
-	21182 - 19968: jis0208<<14 | 0x12<<7 | 0x0E,
-	21184 - 19968: jis0208<<14 | 0x58<<7 | 0x2A,
-	21185 - 19968: jis0208<<14 | 0x31<<7 | 0x05,
-	21187 - 19968: jis0208<<14 | 0x2A<<7 | 0x35,
-	21188 - 19968: jis0212<<14 | 0x12<<7 | 0x45,
-	21189 - 19968: jis0208<<14 | 0x23<<7 | 0x1B,
-	21190 - 19968: jis0212<<14 | 0x12<<7 | 0x46,
-	21191 - 19968: jis0208<<14 | 0x2C<<7 | 0x05,
-	21192 - 19968: jis0212<<14 | 0x12<<7 | 0x47,
-	21193 - 19968: jis0208<<14 | 0x29<<7 | 0x38,
-	21196 - 19968: jis0212<<14 | 0x12<<7 | 0x48,
-	21197 - 19968: jis0208<<14 | 0x31<<7 | 0x06,
-	21199 - 19968: jis0212<<14 | 0x12<<7 | 0x49,
-	21201 - 19968: jis0212<<14 | 0x12<<7 | 0x4A,
-	21202 - 19968: jis0208<<14 | 0x4F<<7 | 0x34,
-	21204 - 19968: jis0212<<14 | 0x12<<7 | 0x4B,
-	21205 - 19968: jis0208<<14 | 0x25<<7 | 0x0F,
-	21206 - 19968: jis0212<<14 | 0x12<<7 | 0x4C,
-	21207 - 19968: jis0208<<14 | 0x31<<7 | 0x07,
-	21208 - 19968: jis0208<<14 | 0x13<<7 | 0x09,
-	21209 - 19968: jis0208<<14 | 0x2B<<7 | 0x12,
-	21211 - 19968: jis0208<<14 | 0x58<<7 | 0x2B,
-	21212 - 19968: jis0212<<14 | 0x12<<7 | 0x4E,
-	21213 - 19968: jis0208<<14 | 0x1D<<7 | 0x00,
-	21214 - 19968: jis0208<<14 | 0x31<<7 | 0x08,
-	21215 - 19968: jis0208<<14 | 0x29<<7 | 0x46,
-	21216 - 19968: jis0208<<14 | 0x31<<7 | 0x0C,
-	21217 - 19968: jis0212<<14 | 0x12<<7 | 0x4F,
-	21218 - 19968: jis0208<<14 | 0x1F<<7 | 0x09,
-	21219 - 19968: jis0208<<14 | 0x31<<7 | 0x09,
-	21220 - 19968: jis0208<<14 | 0x15<<7 | 0x2F,
-	21221 - 19968: jis0212<<14 | 0x12<<7 | 0x50,
-	21222 - 19968: jis0208<<14 | 0x31<<7 | 0x0A,
-	21223 - 19968: jis0208<<14 | 0x13<<7 | 0x0A,
-	21224 - 19968: jis0212<<14 | 0x12<<7 | 0x51,
-	21225 - 19968: jis0212<<14 | 0x12<<7 | 0x52,
-	21226 - 19968: jis0212<<14 | 0x12<<7 | 0x53,
-	21228 - 19968: jis0212<<14 | 0x12<<7 | 0x54,
-	21232 - 19968: jis0212<<14 | 0x12<<7 | 0x55,
-	21233 - 19968: jis0212<<14 | 0x12<<7 | 0x56,
-	21234 - 19968: jis0208<<14 | 0x16<<7 | 0x0D,
-	21235 - 19968: jis0208<<14 | 0x31<<7 | 0x0D,
-	21236 - 19968: jis0212<<14 | 0x12<<7 | 0x57,
-	21237 - 19968: jis0208<<14 | 0x31<<7 | 0x0E,
-	21238 - 19968: jis0212<<14 | 0x12<<7 | 0x58,
-	21239 - 19968: jis0212<<14 | 0x12<<7 | 0x59,
-	21240 - 19968: jis0208<<14 | 0x31<<7 | 0x0F,
-	21241 - 19968: jis0208<<14 | 0x31<<7 | 0x10,
-	21242 - 19968: jis0208<<14 | 0x1B<<7 | 0x3A,
-	21246 - 19968: jis0208<<14 | 0x17<<7 | 0x5A,
-	21247 - 19968: jis0208<<14 | 0x2B<<7 | 0x3D,
-	21248 - 19968: jis0208<<14 | 0x58<<7 | 0x2C,
-	21249 - 19968: jis0208<<14 | 0x2B<<7 | 0x47,
-	21250 - 19968: jis0208<<14 | 0x25<<7 | 0x56,
-	21251 - 19968: jis0212<<14 | 0x12<<7 | 0x5B,
-	21253 - 19968: jis0208<<14 | 0x29<<7 | 0x50,
-	21254 - 19968: jis0208<<14 | 0x31<<7 | 0x11,
-	21255 - 19968: jis0208<<14 | 0x58<<7 | 0x2D,
-	21256 - 19968: jis0208<<14 | 0x31<<7 | 0x12,
-	21258 - 19968: jis0212<<14 | 0x12<<7 | 0x5C,
-	21259 - 19968: jis0212<<14 | 0x12<<7 | 0x5D,
-	21260 - 19968: jis0212<<14 | 0x13<<7 | 0x00,
-	21261 - 19968: jis0208<<14 | 0x31<<7 | 0x14,
-	21263 - 19968: jis0208<<14 | 0x31<<7 | 0x16,
-	21264 - 19968: jis0208<<14 | 0x31<<7 | 0x15,
-	21265 - 19968: jis0212<<14 | 0x13<<7 | 0x01,
-	21267 - 19968: jis0212<<14 | 0x13<<7 | 0x02,
-	21269 - 19968: jis0208<<14 | 0x31<<7 | 0x17,
-	21270 - 19968: jis0208<<14 | 0x11<<7 | 0x1C,
-	21271 - 19968: jis0208<<14 | 0x2A<<7 | 0x2B,
-	21272 - 19968: jis0212<<14 | 0x13<<7 | 0x03,
-	21273 - 19968: jis0208<<14 | 0x19<<7 | 0x5B,
-	21274 - 19968: jis0208<<14 | 0x31<<7 | 0x18,
-	21275 - 19968: jis0212<<14 | 0x13<<7 | 0x04,
-	21276 - 19968: jis0212<<14 | 0x13<<7 | 0x05,
-	21277 - 19968: jis0208<<14 | 0x20<<7 | 0x38,
-	21278 - 19968: jis0212<<14 | 0x13<<7 | 0x06,
-	21279 - 19968: jis0212<<14 | 0x13<<7 | 0x07,
-	21280 - 19968: jis0208<<14 | 0x1D<<7 | 0x01,
-	21281 - 19968: jis0208<<14 | 0x15<<7 | 0x08,
-	21283 - 19968: jis0208<<14 | 0x31<<7 | 0x19,
-	21284 - 19968: jis0208<<14 | 0x58<<7 | 0x2E,
-	21285 - 19968: jis0212<<14 | 0x13<<7 | 0x08,
-	21287 - 19968: jis0212<<14 | 0x13<<7 | 0x09,
-	21288 - 19968: jis0212<<14 | 0x13<<7 | 0x0A,
-	21289 - 19968: jis0212<<14 | 0x13<<7 | 0x0B,
-	21290 - 19968: jis0208<<14 | 0x27<<7 | 0x3A,
-	21291 - 19968: jis0212<<14 | 0x13<<7 | 0x0C,
-	21292 - 19968: jis0212<<14 | 0x13<<7 | 0x0D,
-	21293 - 19968: jis0212<<14 | 0x13<<7 | 0x0E,
-	21295 - 19968: jis0208<<14 | 0x31<<7 | 0x1A,
-	21296 - 19968: jis0212<<14 | 0x13<<7 | 0x0F,
-	21297 - 19968: jis0208<<14 | 0x31<<7 | 0x1B,
-	21298 - 19968: jis0212<<14 | 0x13<<7 | 0x10,
-	21299 - 19968: jis0208<<14 | 0x31<<7 | 0x1C,
-	21301 - 19968: jis0212<<14 | 0x13<<7 | 0x11,
-	21304 - 19968: jis0208<<14 | 0x31<<7 | 0x1D,
-	21305 - 19968: jis0208<<14 | 0x28<<7 | 0x03,
-	21306 - 19968: jis0208<<14 | 0x15<<7 | 0x47,
-	21307 - 19968: jis0208<<14 | 0x0F<<7 | 0x44,
-	21308 - 19968: jis0212<<14 | 0x13<<7 | 0x12,
-	21309 - 19968: jis0212<<14 | 0x13<<7 | 0x13,
-	21310 - 19968: jis0212<<14 | 0x13<<7 | 0x14,
-	21311 - 19968: jis0208<<14 | 0x25<<7 | 0x1E,
-	21312 - 19968: jis0208<<14 | 0x31<<7 | 0x1E,
-	21313 - 19968: jis0208<<14 | 0x1C<<7 | 0x1C,
-	21314 - 19968: jis0212<<14 | 0x13<<7 | 0x15,
-	21315 - 19968: jis0208<<14 | 0x1F<<7 | 0x48,
-	21317 - 19968: jis0208<<14 | 0x31<<7 | 0x20,
-	21318 - 19968: jis0208<<14 | 0x31<<7 | 0x1F,
-	21319 - 19968: jis0208<<14 | 0x1D<<7 | 0x02,
-	21320 - 19968: jis0208<<14 | 0x17<<7 | 0x40,
-	21321 - 19968: jis0208<<14 | 0x31<<7 | 0x22,
-	21322 - 19968: jis0208<<14 | 0x27<<7 | 0x1D,
-	21323 - 19968: jis0212<<14 | 0x13<<7 | 0x17,
-	21324 - 19968: jis0212<<14 | 0x13<<7 | 0x16,
-	21325 - 19968: jis0208<<14 | 0x31<<7 | 0x23,
-	21329 - 19968: jis0208<<14 | 0x27<<7 | 0x3B,
-	21330 - 19968: jis0208<<14 | 0x21<<7 | 0x13,
-	21331 - 19968: jis0208<<14 | 0x21<<7 | 0x4D,
-	21332 - 19968: jis0208<<14 | 0x15<<7 | 0x07,
-	21335 - 19968: jis0208<<14 | 0x25<<7 | 0x4D,
-	21336 - 19968: jis0208<<14 | 0x22<<7 | 0x10,
-	21337 - 19968: jis0212<<14 | 0x13<<7 | 0x18,
-	21338 - 19968: jis0208<<14 | 0x26<<7 | 0x4D,
-	21339 - 19968: jis0212<<14 | 0x13<<7 | 0x19,
-	21340 - 19968: jis0208<<14 | 0x2A<<7 | 0x2D,
-	21342 - 19968: jis0208<<14 | 0x31<<7 | 0x25,
-	21344 - 19968: jis0208<<14 | 0x1F<<7 | 0x49,
-	21345 - 19968: jis0212<<14 | 0x13<<7 | 0x1A,
-	21347 - 19968: jis0212<<14 | 0x13<<7 | 0x1B,
-	21349 - 19968: jis0212<<14 | 0x13<<7 | 0x1C,
-	21350 - 19968: jis0208<<14 | 0x16<<7 | 0x14,
-	21353 - 19968: jis0208<<14 | 0x31<<7 | 0x26,
-	21356 - 19968: jis0212<<14 | 0x13<<7 | 0x1D,
-	21357 - 19968: jis0212<<14 | 0x13<<7 | 0x1E,
-	21358 - 19968: jis0208<<14 | 0x31<<7 | 0x27,
-	21359 - 19968: jis0208<<14 | 0x10<<7 | 0x0B,
-	21360 - 19968: jis0208<<14 | 0x0F<<7 | 0x54,
-	21361 - 19968: jis0208<<14 | 0x13<<7 | 0x4C,
-	21362 - 19968: jis0208<<14 | 0x58<<7 | 0x2F,
-	21363 - 19968: jis0208<<14 | 0x21<<7 | 0x07,
-	21364 - 19968: jis0208<<14 | 0x14<<7 | 0x30,
-	21365 - 19968: jis0208<<14 | 0x2C<<7 | 0x50,
-	21367 - 19968: jis0208<<14 | 0x31<<7 | 0x2A,
-	21368 - 19968: jis0208<<14 | 0x11<<7 | 0x16,
-	21369 - 19968: jis0212<<14 | 0x13<<7 | 0x20,
-	21371 - 19968: jis0208<<14 | 0x31<<7 | 0x29,
-	21374 - 19968: jis0212<<14 | 0x13<<7 | 0x21,
-	21375 - 19968: jis0208<<14 | 0x15<<7 | 0x09,
-	21378 - 19968: jis0208<<14 | 0x31<<7 | 0x2B,
-	21379 - 19968: jis0212<<14 | 0x13<<7 | 0x22,
-	21380 - 19968: jis0208<<14 | 0x2B<<7 | 0x50,
-	21383 - 19968: jis0212<<14 | 0x13<<7 | 0x23,
-	21384 - 19968: jis0212<<14 | 0x13<<7 | 0x24,
-	21390 - 19968: jis0212<<14 | 0x13<<7 | 0x25,
-	21395 - 19968: jis0208<<14 | 0x58<<7 | 0x30,
-	21396 - 19968: jis0212<<14 | 0x13<<7 | 0x27,
-	21398 - 19968: jis0208<<14 | 0x31<<7 | 0x2C,
-	21400 - 19968: jis0208<<14 | 0x2D<<7 | 0x31,
-	21401 - 19968: jis0212<<14 | 0x13<<7 | 0x28,
-	21402 - 19968: jis0208<<14 | 0x17<<7 | 0x5B,
-	21405 - 19968: jis0212<<14 | 0x13<<7 | 0x29,
-	21407 - 19968: jis0208<<14 | 0x17<<7 | 0x15,
-	21408 - 19968: jis0208<<14 | 0x31<<7 | 0x2D,
-	21409 - 19968: jis0212<<14 | 0x13<<7 | 0x2A,
-	21412 - 19968: jis0212<<14 | 0x13<<7 | 0x2B,
-	21413 - 19968: jis0208<<14 | 0x31<<7 | 0x2F,
-	21414 - 19968: jis0208<<14 | 0x31<<7 | 0x2E,
-	21416 - 19968: jis0208<<14 | 0x1E<<7 | 0x3E,
-	21417 - 19968: jis0208<<14 | 0x10<<7 | 0x18,
-	21418 - 19968: jis0212<<14 | 0x13<<7 | 0x2C,
-	21419 - 19968: jis0212<<14 | 0x13<<7 | 0x2D,
-	21421 - 19968: jis0208<<14 | 0x10<<7 | 0x3D,
-	21422 - 19968: jis0208<<14 | 0x31<<7 | 0x30,
-	21423 - 19968: jis0212<<14 | 0x13<<7 | 0x2E,
-	21424 - 19968: jis0208<<14 | 0x31<<7 | 0x31,
-	21426 - 19968: jis0208<<14 | 0x58<<7 | 0x31,
-	21427 - 19968: jis0208<<14 | 0x17<<7 | 0x16,
-	21428 - 19968: jis0212<<14 | 0x13<<7 | 0x30,
-	21429 - 19968: jis0212<<14 | 0x13<<7 | 0x31,
-	21430 - 19968: jis0208<<14 | 0x31<<7 | 0x32,
-	21431 - 19968: jis0212<<14 | 0x13<<7 | 0x32,
-	21432 - 19968: jis0212<<14 | 0x13<<7 | 0x33,
-	21434 - 19968: jis0212<<14 | 0x13<<7 | 0x34,
-	21435 - 19968: jis0208<<14 | 0x14<<7 | 0x4D,
-	21437 - 19968: jis0212<<14 | 0x13<<7 | 0x35,
-	21440 - 19968: jis0212<<14 | 0x13<<7 | 0x36,
-	21442 - 19968: jis0208<<14 | 0x1A<<7 | 0x11,
-	21443 - 19968: jis0208<<14 | 0x31<<7 | 0x33,
-	21445 - 19968: jis0212<<14 | 0x13<<7 | 0x37,
-	21448 - 19968: jis0208<<14 | 0x2A<<7 | 0x53,
-	21449 - 19968: jis0208<<14 | 0x19<<7 | 0x14,
-	21450 - 19968: jis0208<<14 | 0x14<<7 | 0x39,
-	21451 - 19968: jis0208<<14 | 0x2C<<7 | 0x06,
-	21452 - 19968: jis0208<<14 | 0x20<<7 | 0x2F,
-	21453 - 19968: jis0208<<14 | 0x27<<7 | 0x1E,
-	21454 - 19968: jis0208<<14 | 0x1B<<7 | 0x5C,
-	21455 - 19968: jis0212<<14 | 0x13<<7 | 0x38,
-	21458 - 19968: jis0212<<14 | 0x13<<7 | 0x39,
-	21459 - 19968: jis0212<<14 | 0x13<<7 | 0x3A,
-	21460 - 19968: jis0208<<14 | 0x1C<<7 | 0x26,
-	21461 - 19968: jis0212<<14 | 0x13<<7 | 0x3B,
-	21462 - 19968: jis0208<<14 | 0x1B<<7 | 0x47,
-	21463 - 19968: jis0208<<14 | 0x1B<<7 | 0x54,
-	21465 - 19968: jis0208<<14 | 0x1C<<7 | 0x55,
-	21466 - 19968: jis0212<<14 | 0x13<<7 | 0x3C,
-	21467 - 19968: jis0208<<14 | 0x27<<7 | 0x1F,
-	21469 - 19968: jis0208<<14 | 0x58<<7 | 0x32,
-	21470 - 19968: jis0212<<14 | 0x13<<7 | 0x3E,
-	21471 - 19968: jis0208<<14 | 0x31<<7 | 0x36,
-	21472 - 19968: jis0212<<14 | 0x13<<7 | 0x3F,
-	21473 - 19968: jis0208<<14 | 0x10<<7 | 0x22,
-	21474 - 19968: jis0208<<14 | 0x20<<7 | 0x30,
-	21475 - 19968: jis0208<<14 | 0x17<<7 | 0x5C,
-	21476 - 19968: jis0208<<14 | 0x17<<7 | 0x24,
-	21477 - 19968: jis0208<<14 | 0x15<<7 | 0x46,
-	21478 - 19968: jis0212<<14 | 0x13<<7 | 0x40,
-	21479 - 19968: jis0212<<14 | 0x13<<7 | 0x41,
-	21480 - 19968: jis0208<<14 | 0x31<<7 | 0x3A,
-	21481 - 19968: jis0208<<14 | 0x22<<7 | 0x00,
-	21482 - 19968: jis0208<<14 | 0x21<<7 | 0x5D,
-	21483 - 19968: jis0208<<14 | 0x15<<7 | 0x0A,
-	21484 - 19968: jis0208<<14 | 0x1D<<7 | 0x03,
-	21485 - 19968: jis0208<<14 | 0x31<<7 | 0x3B,
-	21486 - 19968: jis0208<<14 | 0x31<<7 | 0x39,
-	21487 - 19968: jis0208<<14 | 0x11<<7 | 0x23,
-	21488 - 19968: jis0208<<14 | 0x21<<7 | 0x45,
-	21489 - 19968: jis0208<<14 | 0x1B<<7 | 0x17,
-	21490 - 19968: jis0208<<14 | 0x1A<<7 | 0x2A,
-	21491 - 19968: jis0208<<14 | 0x10<<7 | 0x05,
-	21493 - 19968: jis0212<<14 | 0x13<<7 | 0x42,
-	21494 - 19968: jis0208<<14 | 0x12<<7 | 0x4F,
-	21495 - 19968: jis0208<<14 | 0x18<<7 | 0x45,
-	21496 - 19968: jis0208<<14 | 0x1A<<7 | 0x29,
-	21498 - 19968: jis0208<<14 | 0x31<<7 | 0x3C,
-	21505 - 19968: jis0208<<14 | 0x31<<7 | 0x3D,
-	21506 - 19968: jis0212<<14 | 0x13<<7 | 0x43,
-	21507 - 19968: jis0208<<14 | 0x14<<7 | 0x28,
-	21508 - 19968: jis0208<<14 | 0x12<<7 | 0x25,
-	21512 - 19968: jis0208<<14 | 0x18<<7 | 0x46,
-	21513 - 19968: jis0208<<14 | 0x14<<7 | 0x27,
-	21514 - 19968: jis0208<<14 | 0x23<<7 | 0x3E,
-	21515 - 19968: jis0208<<14 | 0x10<<7 | 0x04,
-	21516 - 19968: jis0208<<14 | 0x25<<7 | 0x10,
-	21517 - 19968: jis0208<<14 | 0x2B<<7 | 0x1D,
-	21518 - 19968: jis0208<<14 | 0x18<<7 | 0x00,
-	21519 - 19968: jis0208<<14 | 0x2C<<7 | 0x58,
-	21520 - 19968: jis0208<<14 | 0x24<<7 | 0x26,
-	21521 - 19968: jis0208<<14 | 0x17<<7 | 0x5D,
-	21523 - 19968: jis0212<<14 | 0x13<<7 | 0x44,
-	21530 - 19968: jis0212<<14 | 0x13<<7 | 0x45,
-	21531 - 19968: jis0208<<14 | 0x16<<7 | 0x0E,
-	21533 - 19968: jis0208<<14 | 0x31<<7 | 0x46,
-	21535 - 19968: jis0208<<14 | 0x15<<7 | 0x42,
-	21536 - 19968: jis0208<<14 | 0x2A<<7 | 0x29,
-	21537 - 19968: jis0212<<14 | 0x13<<7 | 0x46,
-	21542 - 19968: jis0208<<14 | 0x27<<7 | 0x3C,
-	21543 - 19968: jis0212<<14 | 0x13<<7 | 0x47,
-	21544 - 19968: jis0212<<14 | 0x13<<7 | 0x48,
-	21545 - 19968: jis0208<<14 | 0x31<<7 | 0x45,
-	21546 - 19968: jis0212<<14 | 0x13<<7 | 0x49,
-	21547 - 19968: jis0208<<14 | 0x13<<7 | 0x3D,
-	21548 - 19968: jis0208<<14 | 0x31<<7 | 0x40,
-	21549 - 19968: jis0208<<14 | 0x31<<7 | 0x41,
-	21550 - 19968: jis0208<<14 | 0x31<<7 | 0x43,
-	21551 - 19968: jis0212<<14 | 0x13<<7 | 0x4A,
-	21553 - 19968: jis0212<<14 | 0x13<<7 | 0x4B,
-	21556 - 19968: jis0212<<14 | 0x13<<7 | 0x4C,
-	21557 - 19968: jis0212<<14 | 0x13<<7 | 0x4D,
-	21558 - 19968: jis0208<<14 | 0x31<<7 | 0x44,
-	21560 - 19968: jis0208<<14 | 0x14<<7 | 0x3A,
-	21561 - 19968: jis0208<<14 | 0x1E<<7 | 0x40,
-	21563 - 19968: jis0208<<14 | 0x29<<7 | 0x0C,
-	21564 - 19968: jis0208<<14 | 0x31<<7 | 0x42,
-	21565 - 19968: jis0208<<14 | 0x31<<7 | 0x3E,
-	21566 - 19968: jis0208<<14 | 0x17<<7 | 0x42,
-	21568 - 19968: jis0208<<14 | 0x31<<7 | 0x3F,
-	21570 - 19968: jis0208<<14 | 0x2E<<7 | 0x03,
-	21571 - 19968: jis0212<<14 | 0x13<<7 | 0x4E,
-	21572 - 19968: jis0212<<14 | 0x13<<7 | 0x4F,
-	21574 - 19968: jis0208<<14 | 0x29<<7 | 0x51,
-	21575 - 19968: jis0212<<14 | 0x13<<7 | 0x50,
-	21576 - 19968: jis0208<<14 | 0x23<<7 | 0x47,
-	21577 - 19968: jis0208<<14 | 0x17<<7 | 0x41,
-	21578 - 19968: jis0208<<14 | 0x18<<7 | 0x4F,
-	21581 - 19968: jis0212<<14 | 0x13<<7 | 0x51,
-	21582 - 19968: jis0208<<14 | 0x31<<7 | 0x47,
-	21583 - 19968: jis0212<<14 | 0x13<<7 | 0x52,
-	21585 - 19968: jis0208<<14 | 0x25<<7 | 0x3C,
-	21598 - 19968: jis0212<<14 | 0x13<<7 | 0x53,
-	21599 - 19968: jis0208<<14 | 0x31<<7 | 0x4B,
-	21602 - 19968: jis0212<<14 | 0x13<<7 | 0x54,
-	21604 - 19968: jis0212<<14 | 0x13<<7 | 0x55,
-	21606 - 19968: jis0212<<14 | 0x13<<7 | 0x56,
-	21607 - 19968: jis0212<<14 | 0x13<<7 | 0x57,
-	21608 - 19968: jis0208<<14 | 0x1B<<7 | 0x5D,
-	21609 - 19968: jis0212<<14 | 0x13<<7 | 0x58,
-	21610 - 19968: jis0208<<14 | 0x1B<<7 | 0x55,
-	21611 - 19968: jis0212<<14 | 0x13<<7 | 0x59,
-	21613 - 19968: jis0212<<14 | 0x13<<7 | 0x5A,
-	21614 - 19968: jis0212<<14 | 0x13<<7 | 0x5B,
-	21616 - 19968: jis0208<<14 | 0x31<<7 | 0x4E,
-	21617 - 19968: jis0208<<14 | 0x31<<7 | 0x4C,
-	21619 - 19968: jis0208<<14 | 0x2B<<7 | 0x02,
-	21620 - 19968: jis0212<<14 | 0x13<<7 | 0x5C,
-	21621 - 19968: jis0208<<14 | 0x31<<7 | 0x49,
-	21622 - 19968: jis0208<<14 | 0x31<<7 | 0x52,
-	21623 - 19968: jis0208<<14 | 0x31<<7 | 0x4D,
-	21627 - 19968: jis0208<<14 | 0x31<<7 | 0x50,
-	21628 - 19968: jis0208<<14 | 0x17<<7 | 0x25,
-	21629 - 19968: jis0208<<14 | 0x2B<<7 | 0x1E,
-	21631 - 19968: jis0212<<14 | 0x13<<7 | 0x5D,
-	21632 - 19968: jis0208<<14 | 0x31<<7 | 0x51,
-	21633 - 19968: jis0212<<14 | 0x14<<7 | 0x00,
-	21635 - 19968: jis0212<<14 | 0x14<<7 | 0x01,
-	21636 - 19968: jis0208<<14 | 0x31<<7 | 0x53,
-	21637 - 19968: jis0212<<14 | 0x14<<7 | 0x02,
-	21638 - 19968: jis0208<<14 | 0x31<<7 | 0x55,
-	21640 - 19968: jis0212<<14 | 0x14<<7 | 0x03,
-	21641 - 19968: jis0212<<14 | 0x14<<7 | 0x04,
-	21642 - 19968: jis0208<<14 | 0x58<<7 | 0x35,
-	21643 - 19968: jis0208<<14 | 0x19<<7 | 0x4F,
-	21644 - 19968: jis0208<<14 | 0x2E<<7 | 0x21,
-	21645 - 19968: jis0212<<14 | 0x14<<7 | 0x05,
-	21646 - 19968: jis0208<<14 | 0x31<<7 | 0x4A,
-	21647 - 19968: jis0208<<14 | 0x31<<7 | 0x48,
-	21648 - 19968: jis0208<<14 | 0x31<<7 | 0x54,
-	21649 - 19968: jis0212<<14 | 0x14<<7 | 0x06,
-	21650 - 19968: jis0208<<14 | 0x31<<7 | 0x4F,
-	21653 - 19968: jis0212<<14 | 0x14<<7 | 0x07,
-	21654 - 19968: jis0212<<14 | 0x14<<7 | 0x08,
-	21660 - 19968: jis0208<<14 | 0x58<<7 | 0x34,
-	21663 - 19968: jis0212<<14 | 0x14<<7 | 0x0A,
-	21665 - 19968: jis0212<<14 | 0x14<<7 | 0x0B,
-	21666 - 19968: jis0208<<14 | 0x31<<7 | 0x57,
-	21668 - 19968: jis0208<<14 | 0x32<<7 | 0x02,
-	21669 - 19968: jis0208<<14 | 0x31<<7 | 0x59,
-	21670 - 19968: jis0212<<14 | 0x14<<7 | 0x0C,
-	21671 - 19968: jis0212<<14 | 0x14<<7 | 0x0D,
-	21672 - 19968: jis0208<<14 | 0x31<<7 | 0x5D,
-	21673 - 19968: jis0208<<14 | 0x58<<7 | 0x36,
-	21674 - 19968: jis0212<<14 | 0x14<<7 | 0x0F,
-	21675 - 19968: jis0208<<14 | 0x32<<7 | 0x00,
-	21676 - 19968: jis0208<<14 | 0x31<<7 | 0x5A,
-	21677 - 19968: jis0212<<14 | 0x14<<7 | 0x10,
-	21678 - 19968: jis0212<<14 | 0x14<<7 | 0x11,
-	21679 - 19968: jis0208<<14 | 0x32<<7 | 0x1D,
-	21681 - 19968: jis0212<<14 | 0x14<<7 | 0x12,
-	21682 - 19968: jis0208<<14 | 0x19<<7 | 0x48,
-	21683 - 19968: jis0208<<14 | 0x12<<7 | 0x10,
-	21687 - 19968: jis0212<<14 | 0x14<<7 | 0x13,
-	21688 - 19968: jis0208<<14 | 0x31<<7 | 0x58,
-	21689 - 19968: jis0212<<14 | 0x14<<7 | 0x14,
-	21690 - 19968: jis0212<<14 | 0x14<<7 | 0x15,
-	21691 - 19968: jis0212<<14 | 0x14<<7 | 0x16,
-	21692 - 19968: jis0208<<14 | 0x32<<7 | 0x04,
-	21693 - 19968: jis0208<<14 | 0x0F<<7 | 0x55,
-	21694 - 19968: jis0208<<14 | 0x32<<7 | 0x03,
-	21695 - 19968: jis0212<<14 | 0x14<<7 | 0x17,
-	21696 - 19968: jis0208<<14 | 0x0F<<7 | 0x04,
-	21697 - 19968: jis0208<<14 | 0x28<<7 | 0x29,
-	21698 - 19968: jis0208<<14 | 0x32<<7 | 0x01,
-	21700 - 19968: jis0208<<14 | 0x31<<7 | 0x5B,
-	21702 - 19968: jis0212<<14 | 0x14<<7 | 0x18,
-	21703 - 19968: jis0208<<14 | 0x31<<7 | 0x56,
-	21704 - 19968: jis0208<<14 | 0x31<<7 | 0x5C,
-	21705 - 19968: jis0208<<14 | 0x19<<7 | 0x27,
-	21706 - 19968: jis0212<<14 | 0x14<<7 | 0x19,
-	21709 - 19968: jis0212<<14 | 0x14<<7 | 0x1A,
-	21710 - 19968: jis0212<<14 | 0x14<<7 | 0x1B,
-	21720 - 19968: jis0208<<14 | 0x32<<7 | 0x05,
-	21728 - 19968: jis0212<<14 | 0x14<<7 | 0x1C,
-	21729 - 19968: jis0208<<14 | 0x0F<<7 | 0x56,
-	21730 - 19968: jis0208<<14 | 0x32<<7 | 0x0E,
-	21733 - 19968: jis0208<<14 | 0x32<<7 | 0x06,
-	21734 - 19968: jis0208<<14 | 0x32<<7 | 0x07,
-	21736 - 19968: jis0208<<14 | 0x1D<<7 | 0x04,
-	21737 - 19968: jis0208<<14 | 0x2A<<7 | 0x48,
-	21738 - 19968: jis0212<<14 | 0x14<<7 | 0x1D,
-	21740 - 19968: jis0212<<14 | 0x14<<7 | 0x1E,
-	21741 - 19968: jis0208<<14 | 0x32<<7 | 0x0C,
-	21742 - 19968: jis0208<<14 | 0x32<<7 | 0x0B,
-	21743 - 19968: jis0212<<14 | 0x14<<7 | 0x1F,
-	21746 - 19968: jis0208<<14 | 0x24<<7 | 0x0E,
-	21750 - 19968: jis0212<<14 | 0x14<<7 | 0x20,
-	21754 - 19968: jis0208<<14 | 0x32<<7 | 0x0D,
-	21756 - 19968: jis0212<<14 | 0x14<<7 | 0x21,
-	21757 - 19968: jis0208<<14 | 0x32<<7 | 0x0A,
-	21758 - 19968: jis0212<<14 | 0x14<<7 | 0x22,
-	21759 - 19968: jis0208<<14 | 0x58<<7 | 0x37,
-	21760 - 19968: jis0212<<14 | 0x14<<7 | 0x24,
-	21761 - 19968: jis0212<<14 | 0x14<<7 | 0x25,
-	21764 - 19968: jis0208<<14 | 0x10<<7 | 0x13,
-	21765 - 19968: jis0212<<14 | 0x14<<7 | 0x26,
-	21766 - 19968: jis0208<<14 | 0x19<<7 | 0x15,
-	21767 - 19968: jis0208<<14 | 0x1E<<7 | 0x0F,
-	21768 - 19968: jis0212<<14 | 0x14<<7 | 0x27,
-	21769 - 19968: jis0212<<14 | 0x14<<7 | 0x28,
-	21772 - 19968: jis0212<<14 | 0x14<<7 | 0x29,
-	21773 - 19968: jis0212<<14 | 0x14<<7 | 0x2A,
-	21774 - 19968: jis0212<<14 | 0x14<<7 | 0x2B,
-	21775 - 19968: jis0208<<14 | 0x32<<7 | 0x08,
-	21776 - 19968: jis0208<<14 | 0x24<<7 | 0x41,
-	21780 - 19968: jis0208<<14 | 0x32<<7 | 0x09,
-	21781 - 19968: jis0212<<14 | 0x14<<7 | 0x2C,
-	21782 - 19968: jis0208<<14 | 0x0F<<7 | 0x01,
-	21802 - 19968: jis0212<<14 | 0x14<<7 | 0x2D,
-	21803 - 19968: jis0212<<14 | 0x14<<7 | 0x2E,
-	21806 - 19968: jis0208<<14 | 0x32<<7 | 0x13,
-	21807 - 19968: jis0208<<14 | 0x2C<<7 | 0x02,
-	21809 - 19968: jis0208<<14 | 0x1D<<7 | 0x06,
-	21810 - 19968: jis0212<<14 | 0x14<<7 | 0x2F,
-	21811 - 19968: jis0208<<14 | 0x32<<7 | 0x19,
-	21813 - 19968: jis0212<<14 | 0x14<<7 | 0x30,
-	21814 - 19968: jis0212<<14 | 0x14<<7 | 0x31,
-	21816 - 19968: jis0208<<14 | 0x32<<7 | 0x18,
-	21817 - 19968: jis0208<<14 | 0x32<<7 | 0x0F,
-	21819 - 19968: jis0212<<14 | 0x14<<7 | 0x32,
-	21820 - 19968: jis0212<<14 | 0x14<<7 | 0x33,
-	21821 - 19968: jis0212<<14 | 0x14<<7 | 0x34,
-	21822 - 19968: jis0208<<14 | 0x21<<7 | 0x22,
-	21824 - 19968: jis0208<<14 | 0x32<<7 | 0x10,
-	21825 - 19968: jis0212<<14 | 0x14<<7 | 0x35,
-	21828 - 19968: jis0208<<14 | 0x21<<7 | 0x4E,
-	21829 - 19968: jis0208<<14 | 0x32<<7 | 0x15,
-	21830 - 19968: jis0208<<14 | 0x1D<<7 | 0x05,
-	21831 - 19968: jis0212<<14 | 0x14<<7 | 0x36,
-	21833 - 19968: jis0212<<14 | 0x14<<7 | 0x37,
-	21834 - 19968: jis0212<<14 | 0x14<<7 | 0x38,
-	21836 - 19968: jis0208<<14 | 0x32<<7 | 0x12,
-	21837 - 19968: jis0212<<14 | 0x14<<7 | 0x39,
-	21839 - 19968: jis0208<<14 | 0x2B<<7 | 0x43,
-	21840 - 19968: jis0212<<14 | 0x14<<7 | 0x3A,
-	21841 - 19968: jis0212<<14 | 0x14<<7 | 0x3B,
-	21843 - 19968: jis0208<<14 | 0x16<<7 | 0x1B,
-	21846 - 19968: jis0208<<14 | 0x32<<7 | 0x16,
-	21847 - 19968: jis0208<<14 | 0x32<<7 | 0x17,
-	21848 - 19968: jis0212<<14 | 0x14<<7 | 0x3C,
-	21850 - 19968: jis0212<<14 | 0x14<<7 | 0x3D,
-	21851 - 19968: jis0212<<14 | 0x14<<7 | 0x3E,
-	21852 - 19968: jis0208<<14 | 0x32<<7 | 0x14,
-	21853 - 19968: jis0208<<14 | 0x32<<7 | 0x1A,
-	21854 - 19968: jis0212<<14 | 0x14<<7 | 0x3F,
-	21856 - 19968: jis0212<<14 | 0x14<<7 | 0x40,
-	21857 - 19968: jis0212<<14 | 0x14<<7 | 0x41,
-	21859 - 19968: jis0208<<14 | 0x32<<7 | 0x11,
-	21860 - 19968: jis0212<<14 | 0x14<<7 | 0x42,
-	21862 - 19968: jis0212<<14 | 0x14<<7 | 0x43,
-	21883 - 19968: jis0208<<14 | 0x32<<7 | 0x20,
-	21884 - 19968: jis0208<<14 | 0x32<<7 | 0x25,
-	21886 - 19968: jis0208<<14 | 0x32<<7 | 0x21,
-	21887 - 19968: jis0212<<14 | 0x14<<7 | 0x44,
-	21888 - 19968: jis0208<<14 | 0x32<<7 | 0x1C,
-	21889 - 19968: jis0212<<14 | 0x14<<7 | 0x45,
-	21890 - 19968: jis0212<<14 | 0x14<<7 | 0x46,
-	21891 - 19968: jis0208<<14 | 0x32<<7 | 0x26,
-	21892 - 19968: jis0208<<14 | 0x20<<7 | 0x10,
-	21894 - 19968: jis0208<<14 | 0x58<<7 | 0x38,
-	21895 - 19968: jis0208<<14 | 0x32<<7 | 0x28,
-	21896 - 19968: jis0212<<14 | 0x14<<7 | 0x48,
-	21897 - 19968: jis0208<<14 | 0x18<<7 | 0x01,
-	21898 - 19968: jis0208<<14 | 0x32<<7 | 0x1E,
-	21899 - 19968: jis0208<<14 | 0x22<<7 | 0x5C,
-	21902 - 19968: jis0212<<14 | 0x14<<7 | 0x49,
-	21903 - 19968: jis0212<<14 | 0x14<<7 | 0x4A,
-	21905 - 19968: jis0212<<14 | 0x14<<7 | 0x4B,
-	21906 - 19968: jis0212<<14 | 0x14<<7 | 0x4C,
-	21907 - 19968: jis0212<<14 | 0x14<<7 | 0x4D,
-	21908 - 19968: jis0212<<14 | 0x14<<7 | 0x4E,
-	21911 - 19968: jis0212<<14 | 0x14<<7 | 0x4F,
-	21912 - 19968: jis0208<<14 | 0x32<<7 | 0x22,
-	21913 - 19968: jis0208<<14 | 0x32<<7 | 0x1B,
-	21914 - 19968: jis0208<<14 | 0x13<<7 | 0x0C,
-	21916 - 19968: jis0208<<14 | 0x13<<7 | 0x4D,
-	21917 - 19968: jis0208<<14 | 0x12<<7 | 0x44,
-	21918 - 19968: jis0208<<14 | 0x32<<7 | 0x23,
-	21919 - 19968: jis0208<<14 | 0x32<<7 | 0x1F,
-	21923 - 19968: jis0212<<14 | 0x14<<7 | 0x50,
-	21924 - 19968: jis0212<<14 | 0x14<<7 | 0x51,
-	21927 - 19968: jis0208<<14 | 0x16<<7 | 0x55,
-	21928 - 19968: jis0208<<14 | 0x32<<7 | 0x29,
-	21929 - 19968: jis0208<<14 | 0x32<<7 | 0x27,
-	21930 - 19968: jis0208<<14 | 0x20<<7 | 0x32,
-	21931 - 19968: jis0208<<14 | 0x14<<7 | 0x29,
-	21932 - 19968: jis0208<<14 | 0x15<<7 | 0x0B,
-	21933 - 19968: jis0212<<14 | 0x14<<7 | 0x52,
-	21934 - 19968: jis0208<<14 | 0x32<<7 | 0x24,
-	21936 - 19968: jis0208<<14 | 0x15<<7 | 0x53,
-	21938 - 19968: jis0212<<14 | 0x14<<7 | 0x53,
-	21942 - 19968: jis0208<<14 | 0x10<<7 | 0x23,
-	21951 - 19968: jis0212<<14 | 0x14<<7 | 0x54,
-	21953 - 19968: jis0212<<14 | 0x14<<7 | 0x55,
-	21955 - 19968: jis0212<<14 | 0x14<<7 | 0x56,
-	21956 - 19968: jis0208<<14 | 0x32<<7 | 0x2D,
-	21957 - 19968: jis0208<<14 | 0x32<<7 | 0x2B,
-	21958 - 19968: jis0212<<14 | 0x14<<7 | 0x57,
-	21959 - 19968: jis0208<<14 | 0x33<<7 | 0x06,
-	21961 - 19968: jis0212<<14 | 0x14<<7 | 0x58,
-	21963 - 19968: jis0212<<14 | 0x14<<7 | 0x59,
-	21964 - 19968: jis0212<<14 | 0x14<<7 | 0x5A,
-	21966 - 19968: jis0212<<14 | 0x14<<7 | 0x5B,
-	21969 - 19968: jis0212<<14 | 0x14<<7 | 0x5C,
-	21970 - 19968: jis0212<<14 | 0x14<<7 | 0x5D,
-	21971 - 19968: jis0212<<14 | 0x15<<7 | 0x00,
-	21972 - 19968: jis0208<<14 | 0x32<<7 | 0x30,
-	21975 - 19968: jis0212<<14 | 0x15<<7 | 0x01,
-	21976 - 19968: jis0212<<14 | 0x15<<7 | 0x02,
-	21978 - 19968: jis0208<<14 | 0x32<<7 | 0x2A,
-	21979 - 19968: jis0212<<14 | 0x15<<7 | 0x03,
-	21980 - 19968: jis0208<<14 | 0x32<<7 | 0x2E,
-	21982 - 19968: jis0212<<14 | 0x15<<7 | 0x04,
-	21983 - 19968: jis0208<<14 | 0x32<<7 | 0x2C,
-	21986 - 19968: jis0212<<14 | 0x15<<7 | 0x05,
-	21987 - 19968: jis0208<<14 | 0x1A<<7 | 0x2B,
-	21988 - 19968: jis0208<<14 | 0x32<<7 | 0x2F,
-	21993 - 19968: jis0212<<14 | 0x15<<7 | 0x06,
-	22006 - 19968: jis0212<<14 | 0x15<<7 | 0x07,
-	22007 - 19968: jis0208<<14 | 0x32<<7 | 0x32,
-	22009 - 19968: jis0208<<14 | 0x32<<7 | 0x37,
-	22013 - 19968: jis0208<<14 | 0x32<<7 | 0x35,
-	22014 - 19968: jis0208<<14 | 0x32<<7 | 0x34,
-	22015 - 19968: jis0212<<14 | 0x15<<7 | 0x08,
-	22021 - 19968: jis0212<<14 | 0x15<<7 | 0x09,
-	22022 - 19968: jis0208<<14 | 0x22<<7 | 0x11,
-	22024 - 19968: jis0212<<14 | 0x15<<7 | 0x0A,
-	22025 - 19968: jis0208<<14 | 0x11<<7 | 0x24,
-	22026 - 19968: jis0212<<14 | 0x15<<7 | 0x0B,
-	22029 - 19968: jis0212<<14 | 0x15<<7 | 0x0C,
-	22030 - 19968: jis0212<<14 | 0x15<<7 | 0x0D,
-	22031 - 19968: jis0212<<14 | 0x15<<7 | 0x0E,
-	22032 - 19968: jis0212<<14 | 0x15<<7 | 0x0F,
-	22033 - 19968: jis0212<<14 | 0x15<<7 | 0x10,
-	22034 - 19968: jis0212<<14 | 0x15<<7 | 0x11,
-	22036 - 19968: jis0208<<14 | 0x32<<7 | 0x31,
-	22038 - 19968: jis0208<<14 | 0x32<<7 | 0x33,
-	22039 - 19968: jis0208<<14 | 0x1D<<7 | 0x07,
-	22040 - 19968: jis0208<<14 | 0x10<<7 | 0x12,
-	22041 - 19968: jis0212<<14 | 0x15<<7 | 0x12,
-	22043 - 19968: jis0208<<14 | 0x32<<7 | 0x36,
-	22057 - 19968: jis0208<<14 | 0x11<<7 | 0x3D,
-	22060 - 19968: jis0212<<14 | 0x15<<7 | 0x13,
-	22063 - 19968: jis0208<<14 | 0x32<<7 | 0x41,
-	22064 - 19968: jis0212<<14 | 0x15<<7 | 0x14,
-	22065 - 19968: jis0208<<14 | 0x1D<<7 | 0x5B,
-	22066 - 19968: jis0208<<14 | 0x32<<7 | 0x3D,
-	22067 - 19968: jis0212<<14 | 0x15<<7 | 0x15,
-	22068 - 19968: jis0208<<14 | 0x32<<7 | 0x3B,
-	22069 - 19968: jis0212<<14 | 0x15<<7 | 0x16,
-	22070 - 19968: jis0208<<14 | 0x32<<7 | 0x3C,
-	22071 - 19968: jis0212<<14 | 0x15<<7 | 0x17,
-	22072 - 19968: jis0208<<14 | 0x32<<7 | 0x3E,
-	22073 - 19968: jis0212<<14 | 0x15<<7 | 0x18,
-	22075 - 19968: jis0212<<14 | 0x15<<7 | 0x19,
-	22076 - 19968: jis0212<<14 | 0x15<<7 | 0x1A,
-	22077 - 19968: jis0212<<14 | 0x15<<7 | 0x1B,
-	22079 - 19968: jis0212<<14 | 0x15<<7 | 0x1C,
-	22080 - 19968: jis0212<<14 | 0x15<<7 | 0x1D,
-	22081 - 19968: jis0212<<14 | 0x15<<7 | 0x1E,
-	22082 - 19968: jis0208<<14 | 0x10<<7 | 0x1C,
-	22083 - 19968: jis0212<<14 | 0x15<<7 | 0x1F,
-	22084 - 19968: jis0212<<14 | 0x15<<7 | 0x20,
-	22086 - 19968: jis0212<<14 | 0x15<<7 | 0x21,
-	22089 - 19968: jis0212<<14 | 0x15<<7 | 0x22,
-	22091 - 19968: jis0212<<14 | 0x15<<7 | 0x23,
-	22092 - 19968: jis0208<<14 | 0x20<<7 | 0x18,
-	22093 - 19968: jis0212<<14 | 0x15<<7 | 0x24,
-	22094 - 19968: jis0208<<14 | 0x32<<7 | 0x38,
-	22095 - 19968: jis0212<<14 | 0x15<<7 | 0x25,
-	22096 - 19968: jis0208<<14 | 0x32<<7 | 0x39,
-	22100 - 19968: jis0212<<14 | 0x15<<7 | 0x26,
-	22107 - 19968: jis0208<<14 | 0x12<<7 | 0x59,
-	22110 - 19968: jis0212<<14 | 0x15<<7 | 0x27,
-	22112 - 19968: jis0212<<14 | 0x15<<7 | 0x28,
-	22113 - 19968: jis0212<<14 | 0x15<<7 | 0x29,
-	22114 - 19968: jis0212<<14 | 0x15<<7 | 0x2A,
-	22115 - 19968: jis0212<<14 | 0x15<<7 | 0x2B,
-	22116 - 19968: jis0208<<14 | 0x32<<7 | 0x40,
-	22118 - 19968: jis0212<<14 | 0x15<<7 | 0x2C,
-	22120 - 19968: jis0208<<14 | 0x13<<7 | 0x4E,
-	22121 - 19968: jis0212<<14 | 0x15<<7 | 0x2D,
-	22122 - 19968: jis0208<<14 | 0x32<<7 | 0x43,
-	22123 - 19968: jis0208<<14 | 0x32<<7 | 0x3F,
-	22124 - 19968: jis0208<<14 | 0x32<<7 | 0x42,
-	22125 - 19968: jis0212<<14 | 0x15<<7 | 0x2E,
-	22127 - 19968: jis0212<<14 | 0x15<<7 | 0x2F,
-	22129 - 19968: jis0212<<14 | 0x15<<7 | 0x30,
-	22130 - 19968: jis0212<<14 | 0x15<<7 | 0x31,
-	22132 - 19968: jis0208<<14 | 0x29<<7 | 0x0D,
-	22133 - 19968: jis0212<<14 | 0x15<<7 | 0x32,
-	22136 - 19968: jis0208<<14 | 0x25<<7 | 0x34,
-	22138 - 19968: jis0208<<14 | 0x27<<7 | 0x17,
-	22144 - 19968: jis0208<<14 | 0x32<<7 | 0x45,
-	22148 - 19968: jis0212<<14 | 0x15<<7 | 0x33,
-	22149 - 19968: jis0212<<14 | 0x15<<7 | 0x34,
-	22150 - 19968: jis0208<<14 | 0x32<<7 | 0x44,
-	22151 - 19968: jis0208<<14 | 0x12<<7 | 0x24,
-	22152 - 19968: jis0212<<14 | 0x15<<7 | 0x35,
-	22154 - 19968: jis0208<<14 | 0x32<<7 | 0x46,
-	22155 - 19968: jis0212<<14 | 0x15<<7 | 0x36,
-	22156 - 19968: jis0212<<14 | 0x15<<7 | 0x37,
-	22159 - 19968: jis0208<<14 | 0x32<<7 | 0x49,
-	22164 - 19968: jis0208<<14 | 0x32<<7 | 0x48,
-	22165 - 19968: jis0212<<14 | 0x15<<7 | 0x38,
-	22169 - 19968: jis0212<<14 | 0x15<<7 | 0x39,
-	22170 - 19968: jis0212<<14 | 0x15<<7 | 0x3A,
-	22173 - 19968: jis0212<<14 | 0x15<<7 | 0x3B,
-	22174 - 19968: jis0212<<14 | 0x15<<7 | 0x3C,
-	22175 - 19968: jis0212<<14 | 0x15<<7 | 0x3D,
-	22176 - 19968: jis0208<<14 | 0x32<<7 | 0x47,
-	22178 - 19968: jis0208<<14 | 0x26<<7 | 0x18,
-	22181 - 19968: jis0208<<14 | 0x32<<7 | 0x4A,
-	22182 - 19968: jis0212<<14 | 0x15<<7 | 0x3E,
-	22183 - 19968: jis0212<<14 | 0x15<<7 | 0x3F,
-	22184 - 19968: jis0212<<14 | 0x15<<7 | 0x40,
-	22185 - 19968: jis0212<<14 | 0x15<<7 | 0x41,
-	22187 - 19968: jis0212<<14 | 0x15<<7 | 0x42,
-	22188 - 19968: jis0212<<14 | 0x15<<7 | 0x43,
-	22189 - 19968: jis0212<<14 | 0x15<<7 | 0x44,
-	22190 - 19968: jis0208<<14 | 0x32<<7 | 0x4B,
-	22193 - 19968: jis0212<<14 | 0x15<<7 | 0x45,
-	22195 - 19968: jis0212<<14 | 0x15<<7 | 0x46,
-	22196 - 19968: jis0208<<14 | 0x32<<7 | 0x4D,
-	22198 - 19968: jis0208<<14 | 0x32<<7 | 0x4C,
-	22199 - 19968: jis0212<<14 | 0x15<<7 | 0x47,
-	22204 - 19968: jis0208<<14 | 0x32<<7 | 0x4F,
-	22206 - 19968: jis0212<<14 | 0x15<<7 | 0x48,
-	22208 - 19968: jis0208<<14 | 0x32<<7 | 0x52,
-	22209 - 19968: jis0208<<14 | 0x32<<7 | 0x50,
-	22210 - 19968: jis0208<<14 | 0x32<<7 | 0x4E,
-	22211 - 19968: jis0208<<14 | 0x32<<7 | 0x51,
-	22213 - 19968: jis0212<<14 | 0x15<<7 | 0x49,
-	22216 - 19968: jis0208<<14 | 0x32<<7 | 0x53,
-	22217 - 19968: jis0212<<14 | 0x15<<7 | 0x4A,
-	22218 - 19968: jis0212<<14 | 0x15<<7 | 0x4B,
-	22219 - 19968: jis0212<<14 | 0x15<<7 | 0x4C,
-	22220 - 19968: jis0212<<14 | 0x15<<7 | 0x4F,
-	22221 - 19968: jis0212<<14 | 0x15<<7 | 0x50,
-	22222 - 19968: jis0208<<14 | 0x32<<7 | 0x54,
-	22223 - 19968: jis0212<<14 | 0x15<<7 | 0x4D,
-	22224 - 19968: jis0212<<14 | 0x15<<7 | 0x4E,
-	22225 - 19968: jis0208<<14 | 0x32<<7 | 0x55,
-	22227 - 19968: jis0208<<14 | 0x32<<7 | 0x56,
-	22231 - 19968: jis0208<<14 | 0x32<<7 | 0x57,
-	22232 - 19968: jis0208<<14 | 0x30<<7 | 0x24,
-	22233 - 19968: jis0212<<14 | 0x15<<7 | 0x51,
-	22234 - 19968: jis0208<<14 | 0x1B<<7 | 0x5B,
-	22235 - 19968: jis0208<<14 | 0x1A<<7 | 0x2C,
-	22236 - 19968: jis0212<<14 | 0x15<<7 | 0x52,
-	22237 - 19968: jis0212<<14 | 0x15<<7 | 0x53,
-	22238 - 19968: jis0208<<14 | 0x11<<7 | 0x52,
-	22239 - 19968: jis0212<<14 | 0x15<<7 | 0x54,
-	22240 - 19968: jis0208<<14 | 0x0F<<7 | 0x57,
-	22241 - 19968: jis0212<<14 | 0x15<<7 | 0x55,
-	22243 - 19968: jis0208<<14 | 0x22<<7 | 0x23,
-	22244 - 19968: jis0212<<14 | 0x15<<7 | 0x56,
-	22245 - 19968: jis0212<<14 | 0x15<<7 | 0x57,
-	22246 - 19968: jis0212<<14 | 0x15<<7 | 0x58,
-	22247 - 19968: jis0212<<14 | 0x15<<7 | 0x59,
-	22248 - 19968: jis0212<<14 | 0x15<<7 | 0x5A,
-	22251 - 19968: jis0212<<14 | 0x15<<7 | 0x5C,
-	22253 - 19968: jis0212<<14 | 0x15<<7 | 0x5D,
-	22254 - 19968: jis0208<<14 | 0x32<<7 | 0x58,
-	22256 - 19968: jis0208<<14 | 0x19<<7 | 0x03,
-	22257 - 19968: jis0212<<14 | 0x15<<7 | 0x5B,
-	22258 - 19968: jis0208<<14 | 0x0F<<7 | 0x2E,
-	22259 - 19968: jis0208<<14 | 0x1E<<7 | 0x3D,
-	22262 - 19968: jis0212<<14 | 0x16<<7 | 0x00,
-	22263 - 19968: jis0212<<14 | 0x16<<7 | 0x01,
-	22265 - 19968: jis0208<<14 | 0x32<<7 | 0x59,
-	22266 - 19968: jis0208<<14 | 0x17<<7 | 0x26,
-	22269 - 19968: jis0208<<14 | 0x18<<7 | 0x50,
-	22271 - 19968: jis0208<<14 | 0x32<<7 | 0x5B,
-	22272 - 19968: jis0208<<14 | 0x32<<7 | 0x5A,
-	22273 - 19968: jis0212<<14 | 0x16<<7 | 0x02,
-	22274 - 19968: jis0212<<14 | 0x16<<7 | 0x03,
-	22275 - 19968: jis0208<<14 | 0x29<<7 | 0x3F,
-	22276 - 19968: jis0208<<14 | 0x32<<7 | 0x5C,
-	22279 - 19968: jis0212<<14 | 0x16<<7 | 0x04,
-	22280 - 19968: jis0208<<14 | 0x33<<7 | 0x00,
-	22281 - 19968: jis0208<<14 | 0x32<<7 | 0x5D,
-	22282 - 19968: jis0212<<14 | 0x16<<7 | 0x05,
-	22283 - 19968: jis0208<<14 | 0x33<<7 | 0x01,
-	22284 - 19968: jis0212<<14 | 0x16<<7 | 0x06,
-	22285 - 19968: jis0208<<14 | 0x33<<7 | 0x02,
-	22287 - 19968: jis0208<<14 | 0x16<<7 | 0x56,
-	22289 - 19968: jis0212<<14 | 0x16<<7 | 0x07,
-	22290 - 19968: jis0208<<14 | 0x10<<7 | 0x3F,
-	22291 - 19968: jis0208<<14 | 0x33<<7 | 0x03,
-	22293 - 19968: jis0212<<14 | 0x16<<7 | 0x08,
-	22294 - 19968: jis0208<<14 | 0x33<<7 | 0x05,
-	22296 - 19968: jis0208<<14 | 0x33<<7 | 0x04,
-	22298 - 19968: jis0212<<14 | 0x16<<7 | 0x09,
-	22299 - 19968: jis0212<<14 | 0x16<<7 | 0x0A,
-	22300 - 19968: jis0208<<14 | 0x33<<7 | 0x07,
-	22301 - 19968: jis0212<<14 | 0x16<<7 | 0x0B,
-	22303 - 19968: jis0208<<14 | 0x24<<7 | 0x39,
-	22304 - 19968: jis0212<<14 | 0x16<<7 | 0x0C,
-	22306 - 19968: jis0212<<14 | 0x16<<7 | 0x0D,
-	22307 - 19968: jis0212<<14 | 0x16<<7 | 0x0E,
-	22308 - 19968: jis0212<<14 | 0x16<<7 | 0x0F,
-	22309 - 19968: jis0212<<14 | 0x16<<7 | 0x10,
-	22310 - 19968: jis0208<<14 | 0x33<<7 | 0x08,
-	22311 - 19968: jis0208<<14 | 0x0F<<7 | 0x14,
-	22312 - 19968: jis0208<<14 | 0x19<<7 | 0x3E,
-	22313 - 19968: jis0212<<14 | 0x16<<7 | 0x11,
-	22314 - 19968: jis0212<<14 | 0x16<<7 | 0x12,
-	22316 - 19968: jis0212<<14 | 0x16<<7 | 0x13,
-	22317 - 19968: jis0208<<14 | 0x16<<7 | 0x1C,
-	22318 - 19968: jis0212<<14 | 0x16<<7 | 0x14,
-	22319 - 19968: jis0212<<14 | 0x16<<7 | 0x15,
-	22320 - 19968: jis0208<<14 | 0x22<<7 | 0x2E,
-	22323 - 19968: jis0212<<14 | 0x16<<7 | 0x16,
-	22324 - 19968: jis0212<<14 | 0x16<<7 | 0x17,
-	22327 - 19968: jis0208<<14 | 0x33<<7 | 0x09,
-	22328 - 19968: jis0208<<14 | 0x33<<7 | 0x0A,
-	22331 - 19968: jis0208<<14 | 0x33<<7 | 0x0C,
-	22333 - 19968: jis0212<<14 | 0x16<<7 | 0x18,
-	22334 - 19968: jis0212<<14 | 0x16<<7 | 0x19,
-	22335 - 19968: jis0212<<14 | 0x16<<7 | 0x1A,
-	22336 - 19968: jis0208<<14 | 0x33<<7 | 0x0D,
-	22338 - 19968: jis0208<<14 | 0x19<<7 | 0x43,
-	22341 - 19968: jis0212<<14 | 0x16<<7 | 0x1B,
-	22342 - 19968: jis0212<<14 | 0x16<<7 | 0x1C,
-	22343 - 19968: jis0208<<14 | 0x15<<7 | 0x30,
-	22346 - 19968: jis0208<<14 | 0x2A<<7 | 0x16,
-	22348 - 19968: jis0212<<14 | 0x16<<7 | 0x1D,
-	22349 - 19968: jis0212<<14 | 0x16<<7 | 0x1E,
-	22350 - 19968: jis0208<<14 | 0x33<<7 | 0x0B,
-	22351 - 19968: jis0208<<14 | 0x33<<7 | 0x0E,
-	22352 - 19968: jis0208<<14 | 0x19<<7 | 0x20,
-	22353 - 19968: jis0208<<14 | 0x18<<7 | 0x02,
-	22354 - 19968: jis0212<<14 | 0x16<<7 | 0x1F,
-	22361 - 19968: jis0208<<14 | 0x58<<7 | 0x39,
-	22369 - 19968: jis0208<<14 | 0x33<<7 | 0x12,
-	22370 - 19968: jis0212<<14 | 0x16<<7 | 0x20,
-	22372 - 19968: jis0208<<14 | 0x19<<7 | 0x04,
-	22373 - 19968: jis0208<<14 | 0x58<<7 | 0x3A,
-	22374 - 19968: jis0208<<14 | 0x22<<7 | 0x12,
-	22375 - 19968: jis0212<<14 | 0x16<<7 | 0x22,
-	22376 - 19968: jis0212<<14 | 0x16<<7 | 0x23,
-	22377 - 19968: jis0208<<14 | 0x33<<7 | 0x0F,
-	22378 - 19968: jis0208<<14 | 0x23<<7 | 0x39,
-	22379 - 19968: jis0212<<14 | 0x16<<7 | 0x24,
-	22381 - 19968: jis0212<<14 | 0x16<<7 | 0x25,
-	22382 - 19968: jis0212<<14 | 0x16<<7 | 0x26,
-	22383 - 19968: jis0212<<14 | 0x16<<7 | 0x27,
-	22384 - 19968: jis0212<<14 | 0x16<<7 | 0x28,
-	22385 - 19968: jis0212<<14 | 0x16<<7 | 0x29,
-	22387 - 19968: jis0212<<14 | 0x16<<7 | 0x2A,
-	22388 - 19968: jis0212<<14 | 0x16<<7 | 0x2B,
-	22389 - 19968: jis0212<<14 | 0x16<<7 | 0x2C,
-	22391 - 19968: jis0212<<14 | 0x16<<7 | 0x2D,
-	22393 - 19968: jis0212<<14 | 0x16<<7 | 0x2E,
-	22394 - 19968: jis0212<<14 | 0x16<<7 | 0x2F,
-	22395 - 19968: jis0212<<14 | 0x16<<7 | 0x30,
-	22396 - 19968: jis0212<<14 | 0x16<<7 | 0x31,
-	22398 - 19968: jis0212<<14 | 0x16<<7 | 0x32,
-	22399 - 19968: jis0208<<14 | 0x33<<7 | 0x13,
-	22401 - 19968: jis0212<<14 | 0x16<<7 | 0x33,
-	22402 - 19968: jis0208<<14 | 0x1E<<7 | 0x41,
-	22403 - 19968: jis0212<<14 | 0x16<<7 | 0x34,
-	22408 - 19968: jis0208<<14 | 0x33<<7 | 0x11,
-	22409 - 19968: jis0208<<14 | 0x33<<7 | 0x14,
-	22411 - 19968: jis0208<<14 | 0x16<<7 | 0x1E,
-	22412 - 19968: jis0212<<14 | 0x16<<7 | 0x35,
-	22419 - 19968: jis0208<<14 | 0x33<<7 | 0x15,
-	22420 - 19968: jis0212<<14 | 0x16<<7 | 0x36,
-	22421 - 19968: jis0212<<14 | 0x16<<7 | 0x3F,
-	22423 - 19968: jis0212<<14 | 0x16<<7 | 0x37,
-	22425 - 19968: jis0212<<14 | 0x16<<7 | 0x38,
-	22426 - 19968: jis0212<<14 | 0x16<<7 | 0x39,
-	22428 - 19968: jis0212<<14 | 0x16<<7 | 0x3A,
-	22429 - 19968: jis0212<<14 | 0x16<<7 | 0x3B,
-	22430 - 19968: jis0212<<14 | 0x16<<7 | 0x3C,
-	22431 - 19968: jis0212<<14 | 0x16<<7 | 0x3D,
-	22432 - 19968: jis0208<<14 | 0x33<<7 | 0x16,
-	22433 - 19968: jis0212<<14 | 0x16<<7 | 0x3E,
-	22434 - 19968: jis0208<<14 | 0x18<<7 | 0x03,
-	22435 - 19968: jis0208<<14 | 0x12<<7 | 0x1F,
-	22436 - 19968: jis0208<<14 | 0x33<<7 | 0x18,
-	22439 - 19968: jis0212<<14 | 0x16<<7 | 0x40,
-	22440 - 19968: jis0212<<14 | 0x16<<7 | 0x41,
-	22441 - 19968: jis0212<<14 | 0x16<<7 | 0x42,
-	22442 - 19968: jis0208<<14 | 0x33<<7 | 0x19,
-	22444 - 19968: jis0208<<14 | 0x58<<7 | 0x3B,
-	22448 - 19968: jis0208<<14 | 0x33<<7 | 0x1A,
-	22451 - 19968: jis0208<<14 | 0x33<<7 | 0x17,
-	22456 - 19968: jis0212<<14 | 0x16<<7 | 0x44,
-	22461 - 19968: jis0212<<14 | 0x16<<7 | 0x45,
-	22464 - 19968: jis0208<<14 | 0x33<<7 | 0x10,
-	22467 - 19968: jis0208<<14 | 0x33<<7 | 0x1B,
-	22470 - 19968: jis0208<<14 | 0x33<<7 | 0x1C,
-	22471 - 19968: jis0208<<14 | 0x58<<7 | 0x3D,
-	22472 - 19968: jis0208<<14 | 0x58<<7 | 0x3C,
-	22475 - 19968: jis0208<<14 | 0x2A<<7 | 0x43,
-	22476 - 19968: jis0212<<14 | 0x16<<7 | 0x48,
-	22478 - 19968: jis0208<<14 | 0x1D<<7 | 0x4A,
-	22479 - 19968: jis0212<<14 | 0x16<<7 | 0x49,
-	22482 - 19968: jis0208<<14 | 0x33<<7 | 0x1E,
-	22483 - 19968: jis0208<<14 | 0x33<<7 | 0x1F,
-	22484 - 19968: jis0208<<14 | 0x33<<7 | 0x1D,
-	22485 - 19968: jis0212<<14 | 0x16<<7 | 0x4A,
-	22486 - 19968: jis0208<<14 | 0x33<<7 | 0x21,
-	22492 - 19968: jis0208<<14 | 0x26<<7 | 0x17,
-	22493 - 19968: jis0212<<14 | 0x16<<7 | 0x4B,
-	22494 - 19968: jis0212<<14 | 0x16<<7 | 0x4C,
-	22495 - 19968: jis0208<<14 | 0x0F<<7 | 0x47,
-	22496 - 19968: jis0208<<14 | 0x28<<7 | 0x35,
-	22497 - 19968: jis0212<<14 | 0x16<<7 | 0x5D,
-	22499 - 19968: jis0208<<14 | 0x33<<7 | 0x22,
-	22500 - 19968: jis0212<<14 | 0x16<<7 | 0x4D,
-	22502 - 19968: jis0212<<14 | 0x16<<7 | 0x4E,
-	22503 - 19968: jis0212<<14 | 0x16<<7 | 0x4F,
-	22505 - 19968: jis0212<<14 | 0x16<<7 | 0x50,
-	22509 - 19968: jis0212<<14 | 0x16<<7 | 0x51,
-	22512 - 19968: jis0212<<14 | 0x16<<7 | 0x52,
-	22516 - 19968: jis0208<<14 | 0x1D<<7 | 0x5C,
-	22517 - 19968: jis0212<<14 | 0x16<<7 | 0x53,
-	22518 - 19968: jis0212<<14 | 0x16<<7 | 0x54,
-	22519 - 19968: jis0208<<14 | 0x1B<<7 | 0x18,
-	22520 - 19968: jis0212<<14 | 0x16<<7 | 0x55,
-	22521 - 19968: jis0208<<14 | 0x26<<7 | 0x3C,
-	22522 - 19968: jis0208<<14 | 0x13<<7 | 0x4F,
-	22524 - 19968: jis0208<<14 | 0x19<<7 | 0x4A,
-	22525 - 19968: jis0212<<14 | 0x16<<7 | 0x56,
-	22526 - 19968: jis0212<<14 | 0x16<<7 | 0x57,
-	22527 - 19968: jis0212<<14 | 0x16<<7 | 0x58,
-	22528 - 19968: jis0208<<14 | 0x2A<<7 | 0x38,
-	22530 - 19968: jis0208<<14 | 0x25<<7 | 0x11,
-	22531 - 19968: jis0212<<14 | 0x16<<7 | 0x59,
-	22532 - 19968: jis0212<<14 | 0x16<<7 | 0x5A,
-	22533 - 19968: jis0208<<14 | 0x16<<7 | 0x57,
-	22534 - 19968: jis0208<<14 | 0x21<<7 | 0x2E,
-	22536 - 19968: jis0212<<14 | 0x16<<7 | 0x5B,
-	22537 - 19968: jis0212<<14 | 0x16<<7 | 0x5C,
-	22538 - 19968: jis0208<<14 | 0x33<<7 | 0x20,
-	22539 - 19968: jis0208<<14 | 0x33<<7 | 0x23,
-	22540 - 19968: jis0212<<14 | 0x17<<7 | 0x00,
-	22541 - 19968: jis0212<<14 | 0x17<<7 | 0x01,
-	22549 - 19968: jis0208<<14 | 0x21<<7 | 0x23,
-	22553 - 19968: jis0208<<14 | 0x33<<7 | 0x24,
-	22555 - 19968: jis0212<<14 | 0x17<<7 | 0x02,
-	22557 - 19968: jis0208<<14 | 0x33<<7 | 0x25,
-	22558 - 19968: jis0212<<14 | 0x17<<7 | 0x03,
-	22559 - 19968: jis0212<<14 | 0x17<<7 | 0x04,
-	22560 - 19968: jis0212<<14 | 0x17<<7 | 0x05,
-	22561 - 19968: jis0208<<14 | 0x33<<7 | 0x27,
-	22564 - 19968: jis0208<<14 | 0x23<<7 | 0x48,
-	22566 - 19968: jis0212<<14 | 0x17<<7 | 0x06,
-	22567 - 19968: jis0212<<14 | 0x17<<7 | 0x07,
-	22570 - 19968: jis0208<<14 | 0x13<<7 | 0x0D,
-	22573 - 19968: jis0212<<14 | 0x17<<7 | 0x08,
-	22575 - 19968: jis0208<<14 | 0x53<<7 | 0x00,
-	22576 - 19968: jis0208<<14 | 0x10<<7 | 0x40,
-	22577 - 19968: jis0208<<14 | 0x29<<7 | 0x52,
-	22578 - 19968: jis0212<<14 | 0x17<<7 | 0x09,
-	22580 - 19968: jis0208<<14 | 0x1D<<7 | 0x4B,
-	22581 - 19968: jis0208<<14 | 0x24<<7 | 0x27,
-	22585 - 19968: jis0212<<14 | 0x17<<7 | 0x0A,
-	22586 - 19968: jis0208<<14 | 0x19<<7 | 0x45,
-	22589 - 19968: jis0208<<14 | 0x33<<7 | 0x2D,
-	22591 - 19968: jis0212<<14 | 0x17<<7 | 0x0B,
-	22592 - 19968: jis0208<<14 | 0x29<<7 | 0x1C,
-	22593 - 19968: jis0208<<14 | 0x2D<<7 | 0x3C,
-	22601 - 19968: jis0212<<14 | 0x17<<7 | 0x0C,
-	22602 - 19968: jis0208<<14 | 0x11<<7 | 0x53,
-	22603 - 19968: jis0208<<14 | 0x33<<7 | 0x29,
-	22604 - 19968: jis0212<<14 | 0x17<<7 | 0x0D,
-	22605 - 19968: jis0212<<14 | 0x17<<7 | 0x0E,
-	22607 - 19968: jis0212<<14 | 0x17<<7 | 0x0F,
-	22608 - 19968: jis0212<<14 | 0x17<<7 | 0x10,
-	22609 - 19968: jis0208<<14 | 0x20<<7 | 0x19,
-	22610 - 19968: jis0208<<14 | 0x33<<7 | 0x2C,
-	22612 - 19968: jis0208<<14 | 0x24<<7 | 0x42,
-	22613 - 19968: jis0212<<14 | 0x17<<7 | 0x11,
-	22615 - 19968: jis0208<<14 | 0x24<<7 | 0x28,
-	22616 - 19968: jis0208<<14 | 0x24<<7 | 0x43,
-	22617 - 19968: jis0208<<14 | 0x27<<7 | 0x18,
-	22618 - 19968: jis0208<<14 | 0x23<<7 | 0x2C,
-	22622 - 19968: jis0208<<14 | 0x19<<7 | 0x28,
-	22623 - 19968: jis0212<<14 | 0x17<<7 | 0x12,
-	22625 - 19968: jis0212<<14 | 0x17<<7 | 0x13,
-	22626 - 19968: jis0208<<14 | 0x33<<7 | 0x28,
-	22628 - 19968: jis0212<<14 | 0x17<<7 | 0x14,
-	22631 - 19968: jis0212<<14 | 0x17<<7 | 0x15,
-	22632 - 19968: jis0212<<14 | 0x17<<7 | 0x16,
-	22633 - 19968: jis0208<<14 | 0x10<<7 | 0x55,
-	22635 - 19968: jis0208<<14 | 0x24<<7 | 0x15,
-	22640 - 19968: jis0208<<14 | 0x33<<7 | 0x2A,
-	22642 - 19968: jis0208<<14 | 0x33<<7 | 0x26,
-	22645 - 19968: jis0208<<14 | 0x1E<<7 | 0x2F,
-	22648 - 19968: jis0212<<14 | 0x17<<7 | 0x17,
-	22649 - 19968: jis0208<<14 | 0x33<<7 | 0x2E,
-	22652 - 19968: jis0212<<14 | 0x17<<7 | 0x18,
-	22654 - 19968: jis0208<<14 | 0x1C<<7 | 0x2D,
-	22655 - 19968: jis0212<<14 | 0x17<<7 | 0x19,
-	22656 - 19968: jis0212<<14 | 0x17<<7 | 0x1A,
-	22657 - 19968: jis0212<<14 | 0x17<<7 | 0x1B,
-	22659 - 19968: jis0208<<14 | 0x15<<7 | 0x0C,
-	22661 - 19968: jis0208<<14 | 0x33<<7 | 0x2F,
-	22663 - 19968: jis0212<<14 | 0x17<<7 | 0x1C,
-	22664 - 19968: jis0212<<14 | 0x17<<7 | 0x1D,
-	22665 - 19968: jis0212<<14 | 0x17<<7 | 0x1E,
-	22666 - 19968: jis0212<<14 | 0x17<<7 | 0x1F,
-	22668 - 19968: jis0212<<14 | 0x17<<7 | 0x20,
-	22669 - 19968: jis0212<<14 | 0x17<<7 | 0x21,
-	22671 - 19968: jis0212<<14 | 0x17<<7 | 0x22,
-	22672 - 19968: jis0212<<14 | 0x17<<7 | 0x23,
-	22675 - 19968: jis0208<<14 | 0x29<<7 | 0x47,
-	22676 - 19968: jis0212<<14 | 0x17<<7 | 0x24,
-	22678 - 19968: jis0212<<14 | 0x17<<7 | 0x25,
-	22679 - 19968: jis0208<<14 | 0x20<<7 | 0x5C,
-	22684 - 19968: jis0208<<14 | 0x23<<7 | 0x25,
-	22685 - 19968: jis0212<<14 | 0x17<<7 | 0x26,
-	22686 - 19968: jis0208<<14 | 0x58<<7 | 0x40,
-	22687 - 19968: jis0208<<14 | 0x33<<7 | 0x31,
-	22688 - 19968: jis0212<<14 | 0x17<<7 | 0x27,
-	22689 - 19968: jis0212<<14 | 0x17<<7 | 0x28,
-	22690 - 19968: jis0212<<14 | 0x17<<7 | 0x29,
-	22694 - 19968: jis0212<<14 | 0x17<<7 | 0x2A,
-	22696 - 19968: jis0208<<14 | 0x2A<<7 | 0x2E,
-	22697 - 19968: jis0212<<14 | 0x17<<7 | 0x2B,
-	22699 - 19968: jis0208<<14 | 0x33<<7 | 0x32,
-	22702 - 19968: jis0208<<14 | 0x33<<7 | 0x37,
-	22705 - 19968: jis0212<<14 | 0x17<<7 | 0x2C,
-	22706 - 19968: jis0208<<14 | 0x58<<7 | 0x41,
-	22707 - 19968: jis0208<<14 | 0x29<<7 | 0x0E,
-	22712 - 19968: jis0208<<14 | 0x33<<7 | 0x36,
-	22713 - 19968: jis0208<<14 | 0x33<<7 | 0x30,
-	22714 - 19968: jis0208<<14 | 0x33<<7 | 0x33,
-	22715 - 19968: jis0208<<14 | 0x33<<7 | 0x35,
-	22716 - 19968: jis0212<<14 | 0x17<<7 | 0x2F,
-	22718 - 19968: jis0208<<14 | 0x19<<7 | 0x05,
-	22721 - 19968: jis0208<<14 | 0x29<<7 | 0x28,
-	22722 - 19968: jis0212<<14 | 0x17<<7 | 0x30,
-	22724 - 19968: jis0212<<14 | 0x17<<7 | 0x2E,
-	22725 - 19968: jis0208<<14 | 0x33<<7 | 0x38,
-	22727 - 19968: jis0208<<14 | 0x22<<7 | 0x24,
-	22728 - 19968: jis0212<<14 | 0x17<<7 | 0x31,
-	22730 - 19968: jis0208<<14 | 0x11<<7 | 0x54,
-	22732 - 19968: jis0208<<14 | 0x1D<<7 | 0x4C,
-	22733 - 19968: jis0212<<14 | 0x17<<7 | 0x32,
-	22734 - 19968: jis0212<<14 | 0x17<<7 | 0x33,
-	22736 - 19968: jis0212<<14 | 0x17<<7 | 0x34,
-	22737 - 19968: jis0208<<14 | 0x33<<7 | 0x3A,
-	22738 - 19968: jis0212<<14 | 0x17<<7 | 0x35,
-	22739 - 19968: jis0208<<14 | 0x33<<7 | 0x39,
-	22740 - 19968: jis0212<<14 | 0x17<<7 | 0x36,
-	22741 - 19968: jis0208<<14 | 0x18<<7 | 0x47,
-	22742 - 19968: jis0212<<14 | 0x17<<7 | 0x37,
-	22743 - 19968: jis0208<<14 | 0x33<<7 | 0x3B,
-	22744 - 19968: jis0208<<14 | 0x33<<7 | 0x3D,
-	22745 - 19968: jis0208<<14 | 0x33<<7 | 0x3C,
-	22746 - 19968: jis0212<<14 | 0x17<<7 | 0x38,
-	22748 - 19968: jis0208<<14 | 0x33<<7 | 0x3F,
-	22749 - 19968: jis0212<<14 | 0x17<<7 | 0x39,
-	22750 - 19968: jis0208<<14 | 0x33<<7 | 0x34,
-	22751 - 19968: jis0208<<14 | 0x33<<7 | 0x41,
-	22753 - 19968: jis0212<<14 | 0x17<<7 | 0x3A,
-	22754 - 19968: jis0212<<14 | 0x17<<7 | 0x3B,
-	22756 - 19968: jis0208<<14 | 0x33<<7 | 0x40,
-	22757 - 19968: jis0208<<14 | 0x33<<7 | 0x3E,
-	22761 - 19968: jis0212<<14 | 0x17<<7 | 0x3C,
-	22763 - 19968: jis0208<<14 | 0x1A<<7 | 0x2D,
-	22764 - 19968: jis0208<<14 | 0x1E<<7 | 0x30,
-	22766 - 19968: jis0208<<14 | 0x20<<7 | 0x33,
-	22767 - 19968: jis0208<<14 | 0x33<<7 | 0x42,
-	22768 - 19968: jis0208<<14 | 0x1F<<7 | 0x1B,
-	22769 - 19968: jis0208<<14 | 0x0F<<7 | 0x4C,
-	22770 - 19968: jis0208<<14 | 0x26<<7 | 0x43,
-	22771 - 19968: jis0212<<14 | 0x17<<7 | 0x3D,
-	22775 - 19968: jis0208<<14 | 0x23<<7 | 0x3A,
-	22777 - 19968: jis0208<<14 | 0x33<<7 | 0x44,
-	22778 - 19968: jis0208<<14 | 0x33<<7 | 0x43,
-	22779 - 19968: jis0208<<14 | 0x33<<7 | 0x45,
-	22780 - 19968: jis0208<<14 | 0x33<<7 | 0x46,
-	22781 - 19968: jis0208<<14 | 0x33<<7 | 0x47,
-	22786 - 19968: jis0208<<14 | 0x33<<7 | 0x48,
-	22789 - 19968: jis0212<<14 | 0x17<<7 | 0x3E,
-	22790 - 19968: jis0212<<14 | 0x17<<7 | 0x3F,
-	22793 - 19968: jis0208<<14 | 0x29<<7 | 0x30,
-	22794 - 19968: jis0208<<14 | 0x33<<7 | 0x49,
-	22795 - 19968: jis0208<<14 | 0x58<<7 | 0x42,
-	22796 - 19968: jis0212<<14 | 0x17<<7 | 0x41,
-	22799 - 19968: jis0208<<14 | 0x11<<7 | 0x25,
-	22800 - 19968: jis0208<<14 | 0x33<<7 | 0x4A,
-	22802 - 19968: jis0212<<14 | 0x17<<7 | 0x42,
-	22803 - 19968: jis0212<<14 | 0x17<<7 | 0x43,
-	22804 - 19968: jis0212<<14 | 0x17<<7 | 0x44,
-	22805 - 19968: jis0208<<14 | 0x2C<<7 | 0x1B,
-	22806 - 19968: jis0208<<14 | 0x12<<7 | 0x0F,
-	22808 - 19968: jis0208<<14 | 0x31<<7 | 0x28,
-	22809 - 19968: jis0208<<14 | 0x1C<<7 | 0x27,
-	22810 - 19968: jis0208<<14 | 0x21<<7 | 0x1E,
-	22811 - 19968: jis0208<<14 | 0x33<<7 | 0x4B,
-	22812 - 19968: jis0208<<14 | 0x2B<<7 | 0x4A,
-	22813 - 19968: jis0212<<14 | 0x17<<7 | 0x46,
-	22817 - 19968: jis0212<<14 | 0x17<<7 | 0x47,
-	22818 - 19968: jis0208<<14 | 0x2B<<7 | 0x13,
-	22819 - 19968: jis0212<<14 | 0x17<<7 | 0x48,
-	22820 - 19968: jis0212<<14 | 0x17<<7 | 0x49,
-	22821 - 19968: jis0208<<14 | 0x33<<7 | 0x4D,
-	22823 - 19968: jis0208<<14 | 0x21<<7 | 0x46,
-	22824 - 19968: jis0212<<14 | 0x17<<7 | 0x4A,
-	22825 - 19968: jis0208<<14 | 0x24<<7 | 0x16,
-	22826 - 19968: jis0208<<14 | 0x21<<7 | 0x1F,
-	22827 - 19968: jis0208<<14 | 0x28<<7 | 0x36,
-	22828 - 19968: jis0208<<14 | 0x33<<7 | 0x4E,
-	22829 - 19968: jis0208<<14 | 0x33<<7 | 0x4F,
-	22830 - 19968: jis0208<<14 | 0x10<<7 | 0x5A,
-	22831 - 19968: jis0212<<14 | 0x17<<7 | 0x4B,
-	22832 - 19968: jis0212<<14 | 0x17<<7 | 0x4C,
-	22833 - 19968: jis0208<<14 | 0x1B<<7 | 0x19,
-	22834 - 19968: jis0208<<14 | 0x33<<7 | 0x50,
-	22835 - 19968: jis0212<<14 | 0x17<<7 | 0x4D,
-	22837 - 19968: jis0212<<14 | 0x17<<7 | 0x4E,
-	22838 - 19968: jis0212<<14 | 0x17<<7 | 0x4F,
-	22839 - 19968: jis0208<<14 | 0x0F<<7 | 0x2F,
-	22840 - 19968: jis0208<<14 | 0x33<<7 | 0x51,
-	22846 - 19968: jis0208<<14 | 0x33<<7 | 0x52,
-	22847 - 19968: jis0212<<14 | 0x17<<7 | 0x50,
-	22851 - 19968: jis0212<<14 | 0x17<<7 | 0x51,
-	22852 - 19968: jis0208<<14 | 0x10<<7 | 0x41,
-	22854 - 19968: jis0212<<14 | 0x17<<7 | 0x52,
-	22855 - 19968: jis0208<<14 | 0x13<<7 | 0x50,
-	22856 - 19968: jis0208<<14 | 0x25<<7 | 0x3F,
-	22857 - 19968: jis0208<<14 | 0x29<<7 | 0x53,
-	22862 - 19968: jis0208<<14 | 0x33<<7 | 0x56,
-	22863 - 19968: jis0208<<14 | 0x20<<7 | 0x34,
-	22864 - 19968: jis0208<<14 | 0x33<<7 | 0x55,
-	22865 - 19968: jis0208<<14 | 0x16<<7 | 0x1F,
-	22866 - 19968: jis0212<<14 | 0x17<<7 | 0x53,
-	22867 - 19968: jis0208<<14 | 0x58<<7 | 0x43,
-	22868 - 19968: jis0208<<14 | 0x2A<<7 | 0x3A,
-	22869 - 19968: jis0208<<14 | 0x33<<7 | 0x54,
-	22871 - 19968: jis0208<<14 | 0x24<<7 | 0x44,
-	22872 - 19968: jis0208<<14 | 0x33<<7 | 0x58,
-	22873 - 19968: jis0212<<14 | 0x17<<7 | 0x55,
-	22874 - 19968: jis0208<<14 | 0x33<<7 | 0x57,
-	22875 - 19968: jis0208<<14 | 0x58<<7 | 0x44,
-	22877 - 19968: jis0208<<14 | 0x58<<7 | 0x45,
-	22878 - 19968: jis0212<<14 | 0x17<<7 | 0x58,
-	22879 - 19968: jis0212<<14 | 0x17<<7 | 0x59,
-	22880 - 19968: jis0208<<14 | 0x33<<7 | 0x5A,
-	22881 - 19968: jis0212<<14 | 0x17<<7 | 0x5A,
-	22882 - 19968: jis0208<<14 | 0x33<<7 | 0x59,
-	22883 - 19968: jis0208<<14 | 0x58<<7 | 0x46,
-	22885 - 19968: jis0208<<14 | 0x10<<7 | 0x5B,
-	22887 - 19968: jis0208<<14 | 0x33<<7 | 0x5B,
-	22888 - 19968: jis0208<<14 | 0x1D<<7 | 0x08,
-	22889 - 19968: jis0208<<14 | 0x33<<7 | 0x5D,
-	22890 - 19968: jis0208<<14 | 0x22<<7 | 0x04,
-	22891 - 19968: jis0212<<14 | 0x17<<7 | 0x5C,
-	22892 - 19968: jis0208<<14 | 0x33<<7 | 0x5C,
-	22893 - 19968: jis0212<<14 | 0x17<<7 | 0x5D,
-	22894 - 19968: jis0208<<14 | 0x29<<7 | 0x12,
-	22895 - 19968: jis0212<<14 | 0x18<<7 | 0x00,
-	22898 - 19968: jis0212<<14 | 0x18<<7 | 0x01,
-	22899 - 19968: jis0208<<14 | 0x1C<<7 | 0x56,
-	22900 - 19968: jis0208<<14 | 0x24<<7 | 0x3A,
-	22901 - 19968: jis0212<<14 | 0x18<<7 | 0x02,
-	22902 - 19968: jis0212<<14 | 0x18<<7 | 0x03,
-	22904 - 19968: jis0208<<14 | 0x34<<7 | 0x00,
-	22905 - 19968: jis0212<<14 | 0x18<<7 | 0x04,
-	22907 - 19968: jis0212<<14 | 0x18<<7 | 0x05,
-	22908 - 19968: jis0212<<14 | 0x18<<7 | 0x06,
-	22909 - 19968: jis0208<<14 | 0x18<<7 | 0x04,
-	22913 - 19968: jis0208<<14 | 0x34<<7 | 0x01,
-	22914 - 19968: jis0208<<14 | 0x26<<7 | 0x00,
-	22915 - 19968: jis0208<<14 | 0x27<<7 | 0x3D,
-	22916 - 19968: jis0208<<14 | 0x2B<<7 | 0x30,
-	22922 - 19968: jis0208<<14 | 0x26<<7 | 0x04,
-	22923 - 19968: jis0212<<14 | 0x18<<7 | 0x07,
-	22924 - 19968: jis0212<<14 | 0x18<<7 | 0x08,
-	22925 - 19968: jis0208<<14 | 0x34<<7 | 0x0A,
-	22926 - 19968: jis0212<<14 | 0x18<<7 | 0x09,
-	22930 - 19968: jis0212<<14 | 0x18<<7 | 0x0A,
-	22931 - 19968: jis0208<<14 | 0x14<<7 | 0x17,
-	22933 - 19968: jis0212<<14 | 0x18<<7 | 0x0B,
-	22934 - 19968: jis0208<<14 | 0x2C<<7 | 0x24,
-	22935 - 19968: jis0212<<14 | 0x18<<7 | 0x0C,
-	22937 - 19968: jis0208<<14 | 0x2B<<7 | 0x0E,
-	22939 - 19968: jis0208<<14 | 0x35<<7 | 0x0B,
-	22941 - 19968: jis0208<<14 | 0x34<<7 | 0x02,
-	22943 - 19968: jis0212<<14 | 0x18<<7 | 0x0D,
-	22947 - 19968: jis0208<<14 | 0x34<<7 | 0x05,
-	22948 - 19968: jis0208<<14 | 0x58<<7 | 0x47,
-	22949 - 19968: jis0208<<14 | 0x21<<7 | 0x24,
-	22951 - 19968: jis0212<<14 | 0x18<<7 | 0x0F,
-	22952 - 19968: jis0208<<14 | 0x2A<<7 | 0x17,
-	22956 - 19968: jis0208<<14 | 0x24<<7 | 0x29,
-	22957 - 19968: jis0212<<14 | 0x18<<7 | 0x10,
-	22958 - 19968: jis0212<<14 | 0x18<<7 | 0x11,
-	22959 - 19968: jis0212<<14 | 0x18<<7 | 0x12,
-	22960 - 19968: jis0212<<14 | 0x18<<7 | 0x13,
-	22962 - 19968: jis0208<<14 | 0x34<<7 | 0x06,
-	22963 - 19968: jis0212<<14 | 0x18<<7 | 0x14,
-	22967 - 19968: jis0212<<14 | 0x18<<7 | 0x15,
-	22969 - 19968: jis0208<<14 | 0x2A<<7 | 0x44,
-	22970 - 19968: jis0208<<14 | 0x58<<7 | 0x48,
-	22971 - 19968: jis0208<<14 | 0x19<<7 | 0x29,
-	22972 - 19968: jis0212<<14 | 0x18<<7 | 0x17,
-	22974 - 19968: jis0208<<14 | 0x1D<<7 | 0x09,
-	22977 - 19968: jis0212<<14 | 0x18<<7 | 0x18,
-	22979 - 19968: jis0212<<14 | 0x18<<7 | 0x19,
-	22980 - 19968: jis0212<<14 | 0x18<<7 | 0x1A,
-	22982 - 19968: jis0208<<14 | 0x34<<7 | 0x07,
-	22984 - 19968: jis0212<<14 | 0x18<<7 | 0x1B,
-	22985 - 19968: jis0208<<14 | 0x1A<<7 | 0x2F,
-	22986 - 19968: jis0212<<14 | 0x18<<7 | 0x1C,
-	22987 - 19968: jis0208<<14 | 0x1A<<7 | 0x2E,
-	22989 - 19968: jis0212<<14 | 0x18<<7 | 0x1D,
-	22992 - 19968: jis0208<<14 | 0x0F<<7 | 0x18,
-	22993 - 19968: jis0208<<14 | 0x17<<7 | 0x27,
-	22994 - 19968: jis0212<<14 | 0x18<<7 | 0x1E,
-	22995 - 19968: jis0208<<14 | 0x1F<<7 | 0x0A,
-	22996 - 19968: jis0208<<14 | 0x0F<<7 | 0x30,
-	23001 - 19968: jis0208<<14 | 0x34<<7 | 0x0B,
-	23002 - 19968: jis0208<<14 | 0x34<<7 | 0x0C,
-	23004 - 19968: jis0208<<14 | 0x34<<7 | 0x09,
-	23005 - 19968: jis0212<<14 | 0x18<<7 | 0x1F,
-	23006 - 19968: jis0212<<14 | 0x18<<7 | 0x20,
-	23007 - 19968: jis0212<<14 | 0x18<<7 | 0x21,
-	23011 - 19968: jis0212<<14 | 0x18<<7 | 0x22,
-	23012 - 19968: jis0212<<14 | 0x18<<7 | 0x23,
-	23013 - 19968: jis0208<<14 | 0x10<<7 | 0x17,
-	23014 - 19968: jis0208<<14 | 0x13<<7 | 0x0E,
-	23015 - 19968: jis0212<<14 | 0x18<<7 | 0x24,
-	23016 - 19968: jis0208<<14 | 0x34<<7 | 0x08,
-	23018 - 19968: jis0208<<14 | 0x2B<<7 | 0x24,
-	23019 - 19968: jis0208<<14 | 0x28<<7 | 0x10,
-	23022 - 19968: jis0212<<14 | 0x18<<7 | 0x25,
-	23023 - 19968: jis0212<<14 | 0x18<<7 | 0x26,
-	23025 - 19968: jis0212<<14 | 0x18<<7 | 0x27,
-	23026 - 19968: jis0212<<14 | 0x18<<7 | 0x28,
-	23028 - 19968: jis0212<<14 | 0x18<<7 | 0x29,
-	23030 - 19968: jis0208<<14 | 0x0F<<7 | 0x07,
-	23031 - 19968: jis0212<<14 | 0x18<<7 | 0x2A,
-	23035 - 19968: jis0208<<14 | 0x0F<<7 | 0x58,
-	23039 - 19968: jis0208<<14 | 0x1A<<7 | 0x30,
-	23040 - 19968: jis0212<<14 | 0x18<<7 | 0x2B,
-	23041 - 19968: jis0208<<14 | 0x0F<<7 | 0x31,
-	23043 - 19968: jis0208<<14 | 0x0F<<7 | 0x02,
-	23044 - 19968: jis0212<<14 | 0x18<<7 | 0x2C,
-	23049 - 19968: jis0208<<14 | 0x34<<7 | 0x11,
-	23052 - 19968: jis0212<<14 | 0x18<<7 | 0x2D,
-	23053 - 19968: jis0212<<14 | 0x18<<7 | 0x2E,
-	23054 - 19968: jis0212<<14 | 0x18<<7 | 0x2F,
-	23057 - 19968: jis0208<<14 | 0x34<<7 | 0x0F,
-	23058 - 19968: jis0212<<14 | 0x18<<7 | 0x30,
-	23059 - 19968: jis0212<<14 | 0x18<<7 | 0x31,
-	23064 - 19968: jis0208<<14 | 0x2B<<7 | 0x1B,
-	23066 - 19968: jis0208<<14 | 0x34<<7 | 0x12,
-	23068 - 19968: jis0208<<14 | 0x34<<7 | 0x10,
-	23070 - 19968: jis0212<<14 | 0x18<<7 | 0x32,
-	23071 - 19968: jis0208<<14 | 0x34<<7 | 0x0E,
-	23072 - 19968: jis0208<<14 | 0x1E<<7 | 0x10,
-	23075 - 19968: jis0212<<14 | 0x18<<7 | 0x33,
-	23076 - 19968: jis0212<<14 | 0x18<<7 | 0x34,
-	23077 - 19968: jis0208<<14 | 0x34<<7 | 0x0D,
-	23079 - 19968: jis0212<<14 | 0x18<<7 | 0x35,
-	23080 - 19968: jis0212<<14 | 0x18<<7 | 0x36,
-	23081 - 19968: jis0208<<14 | 0x29<<7 | 0x39,
-	23082 - 19968: jis0212<<14 | 0x18<<7 | 0x37,
-	23085 - 19968: jis0212<<14 | 0x18<<7 | 0x38,
-	23087 - 19968: jis0208<<14 | 0x17<<7 | 0x43,
-	23088 - 19968: jis0212<<14 | 0x18<<7 | 0x39,
-	23093 - 19968: jis0208<<14 | 0x34<<7 | 0x16,
-	23094 - 19968: jis0208<<14 | 0x34<<7 | 0x17,
-	23100 - 19968: jis0208<<14 | 0x1D<<7 | 0x0A,
-	23104 - 19968: jis0208<<14 | 0x34<<7 | 0x13,
-	23105 - 19968: jis0208<<14 | 0x2E<<7 | 0x0B,
-	23108 - 19968: jis0212<<14 | 0x18<<7 | 0x3A,
-	23109 - 19968: jis0212<<14 | 0x18<<7 | 0x3B,
-	23110 - 19968: jis0208<<14 | 0x26<<7 | 0x2B,
-	23111 - 19968: jis0212<<14 | 0x18<<7 | 0x3C,
-	23112 - 19968: jis0212<<14 | 0x18<<7 | 0x3D,
-	23113 - 19968: jis0208<<14 | 0x34<<7 | 0x15,
-	23116 - 19968: jis0212<<14 | 0x18<<7 | 0x3E,
-	23120 - 19968: jis0212<<14 | 0x18<<7 | 0x3F,
-	23125 - 19968: jis0212<<14 | 0x18<<7 | 0x40,
-	23130 - 19968: jis0208<<14 | 0x19<<7 | 0x06,
-	23134 - 19968: jis0212<<14 | 0x18<<7 | 0x41,
-	23138 - 19968: jis0208<<14 | 0x34<<7 | 0x18,
-	23139 - 19968: jis0212<<14 | 0x18<<7 | 0x42,
-	23141 - 19968: jis0212<<14 | 0x18<<7 | 0x43,
-	23142 - 19968: jis0208<<14 | 0x28<<7 | 0x37,
-	23143 - 19968: jis0212<<14 | 0x18<<7 | 0x44,
-	23146 - 19968: jis0208<<14 | 0x34<<7 | 0x19,
-	23148 - 19968: jis0208<<14 | 0x34<<7 | 0x14,
-	23149 - 19968: jis0212<<14 | 0x18<<7 | 0x45,
-	23159 - 19968: jis0212<<14 | 0x18<<7 | 0x46,
-	23162 - 19968: jis0212<<14 | 0x18<<7 | 0x47,
-	23163 - 19968: jis0212<<14 | 0x18<<7 | 0x48,
-	23166 - 19968: jis0212<<14 | 0x18<<7 | 0x49,
-	23167 - 19968: jis0208<<14 | 0x2B<<7 | 0x1A,
-	23179 - 19968: jis0212<<14 | 0x18<<7 | 0x4A,
-	23184 - 19968: jis0212<<14 | 0x18<<7 | 0x4B,
-	23186 - 19968: jis0208<<14 | 0x26<<7 | 0x3D,
-	23187 - 19968: jis0212<<14 | 0x18<<7 | 0x4C,
-	23190 - 19968: jis0212<<14 | 0x18<<7 | 0x4D,
-	23193 - 19968: jis0212<<14 | 0x18<<7 | 0x4E,
-	23194 - 19968: jis0208<<14 | 0x34<<7 | 0x1A,
-	23195 - 19968: jis0208<<14 | 0x28<<7 | 0x11,
-	23196 - 19968: jis0212<<14 | 0x18<<7 | 0x4F,
-	23198 - 19968: jis0212<<14 | 0x18<<7 | 0x50,
-	23199 - 19968: jis0212<<14 | 0x18<<7 | 0x51,
-	23200 - 19968: jis0212<<14 | 0x18<<7 | 0x52,
-	23202 - 19968: jis0212<<14 | 0x18<<7 | 0x53,
-	23207 - 19968: jis0212<<14 | 0x18<<7 | 0x54,
-	23212 - 19968: jis0212<<14 | 0x18<<7 | 0x55,
-	23217 - 19968: jis0212<<14 | 0x18<<7 | 0x56,
-	23218 - 19968: jis0212<<14 | 0x18<<7 | 0x57,
-	23219 - 19968: jis0212<<14 | 0x18<<7 | 0x58,
-	23221 - 19968: jis0212<<14 | 0x18<<7 | 0x59,
-	23224 - 19968: jis0212<<14 | 0x18<<7 | 0x5A,
-	23226 - 19968: jis0212<<14 | 0x18<<7 | 0x5B,
-	23227 - 19968: jis0212<<14 | 0x18<<7 | 0x5C,
-	23228 - 19968: jis0208<<14 | 0x34<<7 | 0x1B,
-	23229 - 19968: jis0208<<14 | 0x34<<7 | 0x1F,
-	23230 - 19968: jis0208<<14 | 0x34<<7 | 0x1C,
-	23231 - 19968: jis0212<<14 | 0x18<<7 | 0x5D,
-	23233 - 19968: jis0208<<14 | 0x11<<7 | 0x26,
-	23234 - 19968: jis0208<<14 | 0x34<<7 | 0x1E,
-	23236 - 19968: jis0212<<14 | 0x19<<7 | 0x00,
-	23238 - 19968: jis0212<<14 | 0x19<<7 | 0x01,
-	23240 - 19968: jis0212<<14 | 0x19<<7 | 0x02,
-	23241 - 19968: jis0208<<14 | 0x1B<<7 | 0x1A,
-	23243 - 19968: jis0208<<14 | 0x34<<7 | 0x1D,
-	23244 - 19968: jis0208<<14 | 0x16<<7 | 0x58,
-	23247 - 19968: jis0212<<14 | 0x19<<7 | 0x03,
-	23248 - 19968: jis0208<<14 | 0x34<<7 | 0x2B,
-	23254 - 19968: jis0208<<14 | 0x34<<7 | 0x24,
-	23255 - 19968: jis0208<<14 | 0x34<<7 | 0x21,
-	23258 - 19968: jis0212<<14 | 0x19<<7 | 0x04,
-	23260 - 19968: jis0212<<14 | 0x19<<7 | 0x05,
-	23264 - 19968: jis0212<<14 | 0x19<<7 | 0x06,
-	23265 - 19968: jis0208<<14 | 0x22<<7 | 0x43,
-	23267 - 19968: jis0208<<14 | 0x34<<7 | 0x20,
-	23269 - 19968: jis0212<<14 | 0x19<<7 | 0x07,
-	23270 - 19968: jis0208<<14 | 0x34<<7 | 0x22,
-	23273 - 19968: jis0208<<14 | 0x34<<7 | 0x23,
-	23274 - 19968: jis0212<<14 | 0x19<<7 | 0x08,
-	23278 - 19968: jis0212<<14 | 0x19<<7 | 0x09,
-	23285 - 19968: jis0212<<14 | 0x19<<7 | 0x0A,
-	23286 - 19968: jis0212<<14 | 0x19<<7 | 0x0B,
-	23290 - 19968: jis0208<<14 | 0x34<<7 | 0x25,
-	23291 - 19968: jis0208<<14 | 0x34<<7 | 0x26,
-	23293 - 19968: jis0212<<14 | 0x19<<7 | 0x0C,
-	23296 - 19968: jis0212<<14 | 0x19<<7 | 0x0D,
-	23297 - 19968: jis0212<<14 | 0x19<<7 | 0x0E,
-	23304 - 19968: jis0212<<14 | 0x19<<7 | 0x0F,
-	23305 - 19968: jis0208<<14 | 0x13<<7 | 0x51,
-	23307 - 19968: jis0208<<14 | 0x34<<7 | 0x28,
-	23308 - 19968: jis0208<<14 | 0x34<<7 | 0x27,
-	23318 - 19968: jis0208<<14 | 0x34<<7 | 0x29,
-	23319 - 19968: jis0212<<14 | 0x19<<7 | 0x10,
-	23321 - 19968: jis0212<<14 | 0x19<<7 | 0x12,
-	23323 - 19968: jis0212<<14 | 0x19<<7 | 0x13,
-	23325 - 19968: jis0212<<14 | 0x19<<7 | 0x14,
-	23329 - 19968: jis0212<<14 | 0x19<<7 | 0x15,
-	23330 - 19968: jis0208<<14 | 0x1D<<7 | 0x4D,
-	23333 - 19968: jis0212<<14 | 0x19<<7 | 0x16,
-	23338 - 19968: jis0208<<14 | 0x34<<7 | 0x2C,
-	23340 - 19968: jis0208<<14 | 0x23<<7 | 0x3B,
-	23341 - 19968: jis0212<<14 | 0x19<<7 | 0x17,
-	23344 - 19968: jis0208<<14 | 0x10<<7 | 0x24,
-	23346 - 19968: jis0208<<14 | 0x34<<7 | 0x2A,
-	23348 - 19968: jis0212<<14 | 0x19<<7 | 0x11,
-	23350 - 19968: jis0208<<14 | 0x34<<7 | 0x2D,
-	23352 - 19968: jis0212<<14 | 0x19<<7 | 0x18,
-	23358 - 19968: jis0208<<14 | 0x34<<7 | 0x2E,
-	23360 - 19968: jis0208<<14 | 0x34<<7 | 0x31,
-	23361 - 19968: jis0212<<14 | 0x19<<7 | 0x19,
-	23363 - 19968: jis0208<<14 | 0x34<<7 | 0x2F,
-	23365 - 19968: jis0208<<14 | 0x34<<7 | 0x30,
-	23371 - 19968: jis0212<<14 | 0x19<<7 | 0x1A,
-	23372 - 19968: jis0212<<14 | 0x19<<7 | 0x1B,
-	23376 - 19968: jis0208<<14 | 0x1A<<7 | 0x31,
-	23377 - 19968: jis0208<<14 | 0x34<<7 | 0x32,
-	23378 - 19968: jis0212<<14 | 0x19<<7 | 0x1C,
-	23380 - 19968: jis0208<<14 | 0x18<<7 | 0x05,
-	23381 - 19968: jis0208<<14 | 0x34<<7 | 0x33,
-	23382 - 19968: jis0208<<14 | 0x58<<7 | 0x49,
-	23383 - 19968: jis0208<<14 | 0x1A<<7 | 0x59,
-	23384 - 19968: jis0208<<14 | 0x21<<7 | 0x17,
-	23386 - 19968: jis0208<<14 | 0x34<<7 | 0x34,
-	23387 - 19968: jis0208<<14 | 0x34<<7 | 0x35,
-	23388 - 19968: jis0208<<14 | 0x1A<<7 | 0x39,
-	23389 - 19968: jis0208<<14 | 0x18<<7 | 0x06,
-	23390 - 19968: jis0212<<14 | 0x19<<7 | 0x1E,
-	23391 - 19968: jis0208<<14 | 0x2B<<7 | 0x31,
-	23395 - 19968: jis0208<<14 | 0x14<<7 | 0x07,
-	23396 - 19968: jis0208<<14 | 0x17<<7 | 0x28,
-	23397 - 19968: jis0208<<14 | 0x34<<7 | 0x36,
-	23398 - 19968: jis0208<<14 | 0x12<<7 | 0x37,
-	23400 - 19968: jis0212<<14 | 0x19<<7 | 0x1F,
-	23401 - 19968: jis0208<<14 | 0x34<<7 | 0x37,
-	23403 - 19968: jis0208<<14 | 0x21<<7 | 0x18,
-	23406 - 19968: jis0212<<14 | 0x19<<7 | 0x20,
-	23407 - 19968: jis0212<<14 | 0x19<<7 | 0x21,
-	23408 - 19968: jis0208<<14 | 0x34<<7 | 0x38,
-	23409 - 19968: jis0208<<14 | 0x35<<7 | 0x02,
-	23411 - 19968: jis0208<<14 | 0x34<<7 | 0x39,
-	23413 - 19968: jis0208<<14 | 0x34<<7 | 0x3A,
-	23416 - 19968: jis0208<<14 | 0x34<<7 | 0x3B,
-	23418 - 19968: jis0208<<14 | 0x34<<7 | 0x3D,
-	23420 - 19968: jis0212<<14 | 0x19<<7 | 0x22,
-	23421 - 19968: jis0212<<14 | 0x19<<7 | 0x23,
-	23422 - 19968: jis0212<<14 | 0x19<<7 | 0x24,
-	23423 - 19968: jis0212<<14 | 0x19<<7 | 0x25,
-	23424 - 19968: jis0208<<14 | 0x34<<7 | 0x3E,
-	23425 - 19968: jis0212<<14 | 0x19<<7 | 0x26,
-	23427 - 19968: jis0208<<14 | 0x34<<7 | 0x3F,
-	23428 - 19968: jis0212<<14 | 0x19<<7 | 0x27,
-	23429 - 19968: jis0208<<14 | 0x21<<7 | 0x4F,
-	23430 - 19968: jis0212<<14 | 0x19<<7 | 0x28,
-	23431 - 19968: jis0208<<14 | 0x10<<7 | 0x06,
-	23432 - 19968: jis0208<<14 | 0x1B<<7 | 0x48,
-	23433 - 19968: jis0208<<14 | 0x0F<<7 | 0x21,
-	23434 - 19968: jis0212<<14 | 0x19<<7 | 0x29,
-	23435 - 19968: jis0208<<14 | 0x20<<7 | 0x36,
-	23436 - 19968: jis0208<<14 | 0x13<<7 | 0x0F,
-	23437 - 19968: jis0208<<14 | 0x1B<<7 | 0x14,
-	23438 - 19968: jis0212<<14 | 0x19<<7 | 0x2A,
-	23439 - 19968: jis0208<<14 | 0x18<<7 | 0x07,
-	23440 - 19968: jis0212<<14 | 0x19<<7 | 0x2B,
-	23441 - 19968: jis0212<<14 | 0x19<<7 | 0x2C,
-	23443 - 19968: jis0212<<14 | 0x19<<7 | 0x2D,
-	23444 - 19968: jis0212<<14 | 0x19<<7 | 0x2E,
-	23445 - 19968: jis0208<<14 | 0x24<<7 | 0x45,
-	23446 - 19968: jis0212<<14 | 0x19<<7 | 0x2F,
-	23447 - 19968: jis0208<<14 | 0x1C<<7 | 0x00,
-	23448 - 19968: jis0208<<14 | 0x13<<7 | 0x10,
-	23449 - 19968: jis0208<<14 | 0x22<<7 | 0x47,
-	23450 - 19968: jis0208<<14 | 0x23<<7 | 0x49,
-	23451 - 19968: jis0208<<14 | 0x0F<<7 | 0x17,
-	23452 - 19968: jis0208<<14 | 0x14<<7 | 0x18,
-	23453 - 19968: jis0208<<14 | 0x29<<7 | 0x54,
-	23455 - 19968: jis0208<<14 | 0x1B<<7 | 0x21,
-	23458 - 19968: jis0208<<14 | 0x14<<7 | 0x31,
-	23459 - 19968: jis0208<<14 | 0x1F<<7 | 0x4A,
-	23460 - 19968: jis0208<<14 | 0x1B<<7 | 0x1B,
-	23461 - 19968: jis0208<<14 | 0x2C<<7 | 0x07,
-	23462 - 19968: jis0208<<14 | 0x34<<7 | 0x40,
-	23464 - 19968: jis0212<<14 | 0x19<<7 | 0x30,
-	23465 - 19968: jis0212<<14 | 0x19<<7 | 0x31,
-	23468 - 19968: jis0212<<14 | 0x19<<7 | 0x32,
-	23469 - 19968: jis0212<<14 | 0x19<<7 | 0x33,
-	23470 - 19968: jis0208<<14 | 0x14<<7 | 0x3B,
-	23471 - 19968: jis0212<<14 | 0x19<<7 | 0x34,
-	23472 - 19968: jis0208<<14 | 0x19<<7 | 0x2A,
-	23473 - 19968: jis0212<<14 | 0x19<<7 | 0x35,
-	23474 - 19968: jis0212<<14 | 0x19<<7 | 0x36,
-	23475 - 19968: jis0208<<14 | 0x12<<7 | 0x11,
-	23476 - 19968: jis0208<<14 | 0x10<<7 | 0x42,
-	23477 - 19968: jis0208<<14 | 0x1D<<7 | 0x0B,
-	23478 - 19968: jis0208<<14 | 0x11<<7 | 0x27,
-	23479 - 19968: jis0212<<14 | 0x19<<7 | 0x37,
-	23480 - 19968: jis0208<<14 | 0x34<<7 | 0x41,
-	23481 - 19968: jis0208<<14 | 0x2C<<7 | 0x25,
-	23482 - 19968: jis0212<<14 | 0x19<<7 | 0x38,
-	23484 - 19968: jis0212<<14 | 0x19<<7 | 0x39,
-	23487 - 19968: jis0208<<14 | 0x1C<<7 | 0x28,
-	23488 - 19968: jis0208<<14 | 0x58<<7 | 0x4A,
-	23489 - 19968: jis0212<<14 | 0x19<<7 | 0x3B,
-	23490 - 19968: jis0208<<14 | 0x1B<<7 | 0x43,
-	23491 - 19968: jis0208<<14 | 0x34<<7 | 0x42,
-	23492 - 19968: jis0208<<14 | 0x13<<7 | 0x52,
-	23493 - 19968: jis0208<<14 | 0x25<<7 | 0x31,
-	23494 - 19968: jis0208<<14 | 0x2B<<7 | 0x08,
-	23495 - 19968: jis0208<<14 | 0x34<<7 | 0x43,
-	23497 - 19968: jis0208<<14 | 0x34<<7 | 0x44,
-	23500 - 19968: jis0208<<14 | 0x28<<7 | 0x38,
-	23501 - 19968: jis0212<<14 | 0x19<<7 | 0x3C,
-	23503 - 19968: jis0212<<14 | 0x19<<7 | 0x3D,
-	23504 - 19968: jis0208<<14 | 0x34<<7 | 0x46,
-	23506 - 19968: jis0208<<14 | 0x13<<7 | 0x07,
-	23507 - 19968: jis0208<<14 | 0x15<<7 | 0x56,
-	23508 - 19968: jis0208<<14 | 0x34<<7 | 0x45,
-	23510 - 19968: jis0212<<14 | 0x19<<7 | 0x3E,
-	23511 - 19968: jis0212<<14 | 0x19<<7 | 0x3F,
-	23512 - 19968: jis0208<<14 | 0x58<<7 | 0x4C,
-	23513 - 19968: jis0212<<14 | 0x19<<7 | 0x41,
-	23514 - 19968: jis0212<<14 | 0x19<<7 | 0x42,
-	23515 - 19968: jis0208<<14 | 0x13<<7 | 0x11,
-	23517 - 19968: jis0208<<14 | 0x1E<<7 | 0x11,
-	23518 - 19968: jis0208<<14 | 0x34<<7 | 0x4A,
-	23519 - 19968: jis0208<<14 | 0x1A<<7 | 0x00,
-	23520 - 19968: jis0212<<14 | 0x19<<7 | 0x43,
-	23521 - 19968: jis0208<<14 | 0x11<<7 | 0x28,
-	23522 - 19968: jis0208<<14 | 0x34<<7 | 0x49,
-	23524 - 19968: jis0208<<14 | 0x34<<7 | 0x47,
-	23525 - 19968: jis0208<<14 | 0x34<<7 | 0x4B,
-	23526 - 19968: jis0208<<14 | 0x34<<7 | 0x48,
-	23527 - 19968: jis0208<<14 | 0x26<<7 | 0x0A,
-	23528 - 19968: jis0208<<14 | 0x3B<<7 | 0x2C,
-	23529 - 19968: jis0208<<14 | 0x1E<<7 | 0x12,
-	23531 - 19968: jis0208<<14 | 0x34<<7 | 0x4C,
-	23532 - 19968: jis0208<<14 | 0x58<<7 | 0x4D,
-	23534 - 19968: jis0208<<14 | 0x2D<<7 | 0x1F,
-	23535 - 19968: jis0212<<14 | 0x19<<7 | 0x44,
-	23536 - 19968: jis0208<<14 | 0x34<<7 | 0x4D,
-	23537 - 19968: jis0212<<14 | 0x19<<7 | 0x45,
-	23539 - 19968: jis0208<<14 | 0x34<<7 | 0x4F,
-	23540 - 19968: jis0212<<14 | 0x19<<7 | 0x46,
-	23541 - 19968: jis0208<<14 | 0x22<<7 | 0x5D,
-	23542 - 19968: jis0208<<14 | 0x34<<7 | 0x4E,
-	23544 - 19968: jis0208<<14 | 0x1F<<7 | 0x02,
-	23546 - 19968: jis0208<<14 | 0x1A<<7 | 0x5A,
-	23549 - 19968: jis0212<<14 | 0x19<<7 | 0x47,
-	23550 - 19968: jis0208<<14 | 0x21<<7 | 0x2F,
-	23551 - 19968: jis0208<<14 | 0x1B<<7 | 0x56,
-	23553 - 19968: jis0208<<14 | 0x28<<7 | 0x54,
-	23554 - 19968: jis0208<<14 | 0x1F<<7 | 0x4B,
-	23556 - 19968: jis0208<<14 | 0x1B<<7 | 0x2C,
-	23557 - 19968: jis0208<<14 | 0x34<<7 | 0x50,
-	23558 - 19968: jis0208<<14 | 0x1D<<7 | 0x0C,
-	23559 - 19968: jis0208<<14 | 0x34<<7 | 0x51,
-	23560 - 19968: jis0208<<14 | 0x34<<7 | 0x52,
-	23561 - 19968: jis0208<<14 | 0x0F<<7 | 0x32,
-	23562 - 19968: jis0208<<14 | 0x21<<7 | 0x19,
-	23563 - 19968: jis0208<<14 | 0x1E<<7 | 0x31,
-	23564 - 19968: jis0212<<14 | 0x19<<7 | 0x48,
-	23565 - 19968: jis0208<<14 | 0x34<<7 | 0x53,
-	23566 - 19968: jis0208<<14 | 0x25<<7 | 0x12,
-	23567 - 19968: jis0208<<14 | 0x1D<<7 | 0x0D,
-	23569 - 19968: jis0208<<14 | 0x1D<<7 | 0x0E,
-	23571 - 19968: jis0208<<14 | 0x34<<7 | 0x54,
-	23574 - 19968: jis0208<<14 | 0x1F<<7 | 0x4C,
-	23575 - 19968: jis0212<<14 | 0x19<<7 | 0x49,
-	23578 - 19968: jis0208<<14 | 0x1D<<7 | 0x0F,
-	23582 - 19968: jis0208<<14 | 0x58<<7 | 0x4E,
-	23583 - 19968: jis0212<<14 | 0x19<<7 | 0x4B,
-	23584 - 19968: jis0208<<14 | 0x34<<7 | 0x55,
-	23586 - 19968: jis0208<<14 | 0x34<<7 | 0x56,
-	23587 - 19968: jis0212<<14 | 0x19<<7 | 0x4C,
-	23588 - 19968: jis0208<<14 | 0x2B<<7 | 0x3F,
-	23590 - 19968: jis0212<<14 | 0x19<<7 | 0x4D,
-	23592 - 19968: jis0208<<14 | 0x34<<7 | 0x57,
-	23593 - 19968: jis0212<<14 | 0x19<<7 | 0x4E,
-	23595 - 19968: jis0212<<14 | 0x19<<7 | 0x4F,
-	23596 - 19968: jis0212<<14 | 0x19<<7 | 0x50,
-	23597 - 19968: jis0208<<14 | 0x15<<7 | 0x25,
-	23598 - 19968: jis0212<<14 | 0x19<<7 | 0x51,
-	23600 - 19968: jis0212<<14 | 0x19<<7 | 0x52,
-	23601 - 19968: jis0208<<14 | 0x1C<<7 | 0x01,
-	23602 - 19968: jis0212<<14 | 0x19<<7 | 0x53,
-	23605 - 19968: jis0212<<14 | 0x19<<7 | 0x54,
-	23606 - 19968: jis0212<<14 | 0x19<<7 | 0x55,
-	23608 - 19968: jis0208<<14 | 0x34<<7 | 0x58,
-	23609 - 19968: jis0208<<14 | 0x34<<7 | 0x59,
-	23610 - 19968: jis0208<<14 | 0x1B<<7 | 0x3B,
-	23611 - 19968: jis0208<<14 | 0x1E<<7 | 0x0B,
-	23612 - 19968: jis0208<<14 | 0x25<<7 | 0x53,
-	23613 - 19968: jis0208<<14 | 0x1E<<7 | 0x33,
-	23614 - 19968: jis0208<<14 | 0x27<<7 | 0x57,
-	23615 - 19968: jis0208<<14 | 0x26<<7 | 0x01,
-	23616 - 19968: jis0208<<14 | 0x15<<7 | 0x28,
-	23617 - 19968: jis0208<<14 | 0x34<<7 | 0x5A,
-	23621 - 19968: jis0208<<14 | 0x14<<7 | 0x4E,
-	23622 - 19968: jis0208<<14 | 0x34<<7 | 0x5B,
-	23624 - 19968: jis0208<<14 | 0x15<<7 | 0x5D,
-	23626 - 19968: jis0208<<14 | 0x25<<7 | 0x2E,
-	23627 - 19968: jis0208<<14 | 0x11<<7 | 0x0F,
-	23629 - 19968: jis0208<<14 | 0x1A<<7 | 0x32,
-	23630 - 19968: jis0208<<14 | 0x34<<7 | 0x5C,
-	23631 - 19968: jis0208<<14 | 0x35<<7 | 0x01,
-	23632 - 19968: jis0208<<14 | 0x35<<7 | 0x00,
-	23633 - 19968: jis0208<<14 | 0x15<<7 | 0x5C,
-	23635 - 19968: jis0208<<14 | 0x34<<7 | 0x5D,
-	23637 - 19968: jis0208<<14 | 0x24<<7 | 0x17,
-	23641 - 19968: jis0212<<14 | 0x19<<7 | 0x56,
-	23642 - 19968: jis0212<<14 | 0x19<<7 | 0x57,
-	23644 - 19968: jis0212<<14 | 0x19<<7 | 0x58,
-	23646 - 19968: jis0208<<14 | 0x21<<7 | 0x0F,
-	23648 - 19968: jis0208<<14 | 0x24<<7 | 0x2A,
-	23649 - 19968: jis0208<<14 | 0x1B<<7 | 0x27,
-	23650 - 19968: jis0212<<14 | 0x19<<7 | 0x59,
-	23651 - 19968: jis0212<<14 | 0x19<<7 | 0x5A,
-	23652 - 19968: jis0208<<14 | 0x20<<7 | 0x37,
-	23653 - 19968: jis0208<<14 | 0x2C<<7 | 0x59,
-	23655 - 19968: jis0212<<14 | 0x19<<7 | 0x5B,
-	23656 - 19968: jis0212<<14 | 0x19<<7 | 0x5C,
-	23657 - 19968: jis0212<<14 | 0x19<<7 | 0x5D,
-	23660 - 19968: jis0208<<14 | 0x35<<7 | 0x03,
-	23661 - 19968: jis0212<<14 | 0x1A<<7 | 0x00,
-	23662 - 19968: jis0208<<14 | 0x35<<7 | 0x04,
-	23663 - 19968: jis0208<<14 | 0x25<<7 | 0x35,
-	23664 - 19968: jis0212<<14 | 0x1A<<7 | 0x01,
-	23665 - 19968: jis0208<<14 | 0x1A<<7 | 0x12,
-	23668 - 19968: jis0212<<14 | 0x1A<<7 | 0x02,
-	23669 - 19968: jis0212<<14 | 0x1A<<7 | 0x03,
-	23670 - 19968: jis0208<<14 | 0x35<<7 | 0x06,
-	23673 - 19968: jis0208<<14 | 0x35<<7 | 0x07,
-	23674 - 19968: jis0212<<14 | 0x1A<<7 | 0x04,
-	23675 - 19968: jis0212<<14 | 0x1A<<7 | 0x05,
-	23676 - 19968: jis0212<<14 | 0x1A<<7 | 0x06,
-	23677 - 19968: jis0212<<14 | 0x1A<<7 | 0x07,
-	23687 - 19968: jis0212<<14 | 0x1A<<7 | 0x08,
-	23688 - 19968: jis0212<<14 | 0x1A<<7 | 0x09,
-	23690 - 19968: jis0212<<14 | 0x1A<<7 | 0x0A,
-	23692 - 19968: jis0208<<14 | 0x35<<7 | 0x08,
-	23695 - 19968: jis0212<<14 | 0x1A<<7 | 0x0B,
-	23696 - 19968: jis0208<<14 | 0x13<<7 | 0x53,
-	23697 - 19968: jis0208<<14 | 0x35<<7 | 0x09,
-	23698 - 19968: jis0212<<14 | 0x1A<<7 | 0x0C,
-	23700 - 19968: jis0208<<14 | 0x35<<7 | 0x0A,
-	23709 - 19968: jis0212<<14 | 0x1A<<7 | 0x0D,
-	23711 - 19968: jis0212<<14 | 0x1A<<7 | 0x0E,
-	23712 - 19968: jis0212<<14 | 0x1A<<7 | 0x0F,
-	23713 - 19968: jis0208<<14 | 0x11<<7 | 0x0B,
-	23714 - 19968: jis0212<<14 | 0x1A<<7 | 0x10,
-	23715 - 19968: jis0212<<14 | 0x1A<<7 | 0x11,
-	23718 - 19968: jis0208<<14 | 0x58<<7 | 0x4F,
-	23720 - 19968: jis0208<<14 | 0x20<<7 | 0x1A,
-	23721 - 19968: jis0208<<14 | 0x13<<7 | 0x43,
-	23722 - 19968: jis0212<<14 | 0x1A<<7 | 0x13,
-	23723 - 19968: jis0208<<14 | 0x35<<7 | 0x0C,
-	23724 - 19968: jis0208<<14 | 0x2B<<7 | 0x07,
-	23729 - 19968: jis0208<<14 | 0x21<<7 | 0x31,
-	23730 - 19968: jis0212<<14 | 0x1A<<7 | 0x14,
-	23731 - 19968: jis0208<<14 | 0x12<<7 | 0x38,
-	23732 - 19968: jis0212<<14 | 0x1A<<7 | 0x15,
-	23733 - 19968: jis0212<<14 | 0x1A<<7 | 0x16,
-	23734 - 19968: jis0208<<14 | 0x35<<7 | 0x0E,
-	23735 - 19968: jis0208<<14 | 0x35<<7 | 0x10,
-	23736 - 19968: jis0208<<14 | 0x13<<7 | 0x3E,
-	23738 - 19968: jis0208<<14 | 0x58<<7 | 0x50,
-	23739 - 19968: jis0208<<14 | 0x35<<7 | 0x0D,
-	23740 - 19968: jis0208<<14 | 0x35<<7 | 0x0F,
-	23742 - 19968: jis0208<<14 | 0x35<<7 | 0x12,
-	23749 - 19968: jis0208<<14 | 0x35<<7 | 0x11,
-	23751 - 19968: jis0208<<14 | 0x35<<7 | 0x13,
-	23753 - 19968: jis0212<<14 | 0x1A<<7 | 0x18,
-	23755 - 19968: jis0212<<14 | 0x1A<<7 | 0x19,
-	23762 - 19968: jis0212<<14 | 0x1A<<7 | 0x1A,
-	23767 - 19968: jis0212<<14 | 0x1A<<7 | 0x1C,
-	23769 - 19968: jis0208<<14 | 0x35<<7 | 0x14,
-	23773 - 19968: jis0212<<14 | 0x1A<<7 | 0x1B,
-	23776 - 19968: jis0208<<14 | 0x25<<7 | 0x1C,
-	23777 - 19968: jis0208<<14 | 0x15<<7 | 0x0D,
-	23784 - 19968: jis0208<<14 | 0x11<<7 | 0x44,
-	23785 - 19968: jis0208<<14 | 0x35<<7 | 0x15,
-	23786 - 19968: jis0208<<14 | 0x35<<7 | 0x1A,
-	23789 - 19968: jis0208<<14 | 0x35<<7 | 0x18,
-	23790 - 19968: jis0212<<14 | 0x1A<<7 | 0x1D,
-	23791 - 19968: jis0208<<14 | 0x29<<7 | 0x56,
-	23792 - 19968: jis0208<<14 | 0x29<<7 | 0x55,
-	23793 - 19968: jis0212<<14 | 0x1A<<7 | 0x1E,
-	23794 - 19968: jis0212<<14 | 0x1A<<7 | 0x1F,
-	23796 - 19968: jis0212<<14 | 0x1A<<7 | 0x20,
-	23797 - 19968: jis0208<<14 | 0x58<<7 | 0x51,
-	23798 - 19968: jis0208<<14 | 0x24<<7 | 0x46,
-	23802 - 19968: jis0208<<14 | 0x35<<7 | 0x17,
-	23803 - 19968: jis0208<<14 | 0x1C<<7 | 0x33,
-	23805 - 19968: jis0208<<14 | 0x35<<7 | 0x16,
-	23809 - 19968: jis0212<<14 | 0x1A<<7 | 0x21,
-	23814 - 19968: jis0212<<14 | 0x1A<<7 | 0x22,
-	23815 - 19968: jis0208<<14 | 0x1E<<7 | 0x51,
-	23819 - 19968: jis0208<<14 | 0x35<<7 | 0x1B,
-	23821 - 19968: jis0212<<14 | 0x1A<<7 | 0x23,
-	23822 - 19968: jis0208<<14 | 0x19<<7 | 0x49,
-	23825 - 19968: jis0208<<14 | 0x35<<7 | 0x21,
-	23826 - 19968: jis0212<<14 | 0x1A<<7 | 0x24,
-	23828 - 19968: jis0208<<14 | 0x35<<7 | 0x22,
-	23829 - 19968: jis0208<<14 | 0x35<<7 | 0x1C,
-	23830 - 19968: jis0208<<14 | 0x12<<7 | 0x12,
-	23831 - 19968: jis0208<<14 | 0x35<<7 | 0x1D,
-	23832 - 19968: jis0208<<14 | 0x35<<7 | 0x26,
-	23833 - 19968: jis0208<<14 | 0x35<<7 | 0x25,
-	23834 - 19968: jis0208<<14 | 0x35<<7 | 0x24,
-	23835 - 19968: jis0208<<14 | 0x35<<7 | 0x20,
-	23839 - 19968: jis0208<<14 | 0x35<<7 | 0x1F,
-	23842 - 19968: jis0208<<14 | 0x35<<7 | 0x23,
-	23843 - 19968: jis0212<<14 | 0x1A<<7 | 0x26,
-	23844 - 19968: jis0212<<14 | 0x1A<<7 | 0x27,
-	23846 - 19968: jis0212<<14 | 0x1A<<7 | 0x28,
-	23847 - 19968: jis0208<<14 | 0x58<<7 | 0x52,
-	23849 - 19968: jis0208<<14 | 0x29<<7 | 0x57,
-	23851 - 19968: jis0212<<14 | 0x1A<<7 | 0x25,
-	23857 - 19968: jis0212<<14 | 0x1A<<7 | 0x2A,
-	23860 - 19968: jis0212<<14 | 0x1A<<7 | 0x2B,
-	23865 - 19968: jis0212<<14 | 0x1A<<7 | 0x2C,
-	23869 - 19968: jis0212<<14 | 0x1A<<7 | 0x2D,
-	23871 - 19968: jis0212<<14 | 0x1A<<7 | 0x2E,
-	23874 - 19968: jis0208<<14 | 0x58<<7 | 0x55,
-	23875 - 19968: jis0212<<14 | 0x1A<<7 | 0x30,
-	23878 - 19968: jis0212<<14 | 0x1A<<7 | 0x31,
-	23880 - 19968: jis0212<<14 | 0x1A<<7 | 0x32,
-	23882 - 19968: jis0212<<14 | 0x1A<<7 | 0x36,
-	23883 - 19968: jis0208<<14 | 0x35<<7 | 0x2A,
-	23884 - 19968: jis0208<<14 | 0x35<<7 | 0x27,
-	23886 - 19968: jis0208<<14 | 0x35<<7 | 0x29,
-	23888 - 19968: jis0208<<14 | 0x2C<<7 | 0x51,
-	23889 - 19968: jis0212<<14 | 0x1A<<7 | 0x34,
-	23890 - 19968: jis0208<<14 | 0x35<<7 | 0x28,
-	23891 - 19968: jis0208<<14 | 0x58<<7 | 0x53,
-	23893 - 19968: jis0212<<14 | 0x1A<<7 | 0x33,
-	23897 - 19968: jis0212<<14 | 0x1A<<7 | 0x35,
-	23900 - 19968: jis0208<<14 | 0x35<<7 | 0x1E,
-	23903 - 19968: jis0212<<14 | 0x1A<<7 | 0x37,
-	23904 - 19968: jis0212<<14 | 0x1A<<7 | 0x38,
-	23905 - 19968: jis0212<<14 | 0x1A<<7 | 0x39,
-	23906 - 19968: jis0212<<14 | 0x1A<<7 | 0x3A,
-	23908 - 19968: jis0212<<14 | 0x1A<<7 | 0x3B,
-	23913 - 19968: jis0208<<14 | 0x1E<<7 | 0x52,
-	23914 - 19968: jis0212<<14 | 0x1A<<7 | 0x3C,
-	23916 - 19968: jis0208<<14 | 0x35<<7 | 0x2B,
-	23917 - 19968: jis0208<<14 | 0x58<<7 | 0x56,
-	23919 - 19968: jis0208<<14 | 0x19<<7 | 0x16,
-	23920 - 19968: jis0212<<14 | 0x1A<<7 | 0x3E,
-	23923 - 19968: jis0208<<14 | 0x35<<7 | 0x2C,
-	23926 - 19968: jis0208<<14 | 0x35<<7 | 0x2D,
-	23929 - 19968: jis0212<<14 | 0x1A<<7 | 0x3F,
-	23930 - 19968: jis0212<<14 | 0x1A<<7 | 0x40,
-	23934 - 19968: jis0212<<14 | 0x1A<<7 | 0x41,
-	23935 - 19968: jis0212<<14 | 0x1A<<7 | 0x42,
-	23937 - 19968: jis0212<<14 | 0x1A<<7 | 0x43,
-	23938 - 19968: jis0208<<14 | 0x35<<7 | 0x30,
-	23939 - 19968: jis0212<<14 | 0x1A<<7 | 0x44,
-	23940 - 19968: jis0208<<14 | 0x35<<7 | 0x2F,
-	23943 - 19968: jis0208<<14 | 0x35<<7 | 0x2E,
-	23944 - 19968: jis0212<<14 | 0x1A<<7 | 0x45,
-	23946 - 19968: jis0212<<14 | 0x1A<<7 | 0x46,
-	23947 - 19968: jis0208<<14 | 0x24<<7 | 0x47,
-	23948 - 19968: jis0208<<14 | 0x35<<7 | 0x19,
-	23952 - 19968: jis0208<<14 | 0x35<<7 | 0x36,
-	23954 - 19968: jis0212<<14 | 0x1A<<7 | 0x47,
-	23955 - 19968: jis0212<<14 | 0x1A<<7 | 0x48,
-	23956 - 19968: jis0212<<14 | 0x1A<<7 | 0x49,
-	23957 - 19968: jis0212<<14 | 0x1A<<7 | 0x4A,
-	23961 - 19968: jis0212<<14 | 0x1A<<7 | 0x4B,
-	23963 - 19968: jis0212<<14 | 0x1A<<7 | 0x4C,
-	23965 - 19968: jis0208<<14 | 0x35<<7 | 0x32,
-	23967 - 19968: jis0212<<14 | 0x1A<<7 | 0x4D,
-	23968 - 19968: jis0212<<14 | 0x1A<<7 | 0x4E,
-	23970 - 19968: jis0208<<14 | 0x35<<7 | 0x31,
-	23975 - 19968: jis0212<<14 | 0x1A<<7 | 0x4F,
-	23979 - 19968: jis0212<<14 | 0x1A<<7 | 0x50,
-	23980 - 19968: jis0208<<14 | 0x35<<7 | 0x33,
-	23982 - 19968: jis0208<<14 | 0x35<<7 | 0x34,
-	23984 - 19968: jis0212<<14 | 0x1A<<7 | 0x51,
-	23986 - 19968: jis0212<<14 | 0x45<<7 | 0x53,
-	23988 - 19968: jis0212<<14 | 0x1A<<7 | 0x52,
-	23991 - 19968: jis0208<<14 | 0x35<<7 | 0x37,
-	23992 - 19968: jis0208<<14 | 0x58<<7 | 0x57,
-	23993 - 19968: jis0208<<14 | 0x58<<7 | 0x58,
-	23994 - 19968: jis0208<<14 | 0x2D<<7 | 0x45,
-	23996 - 19968: jis0208<<14 | 0x35<<7 | 0x38,
-	23997 - 19968: jis0208<<14 | 0x35<<7 | 0x35,
-	24003 - 19968: jis0212<<14 | 0x1A<<7 | 0x55,
-	24007 - 19968: jis0212<<14 | 0x1A<<7 | 0x56,
-	24009 - 19968: jis0208<<14 | 0x35<<7 | 0x39,
-	24011 - 19968: jis0212<<14 | 0x1A<<7 | 0x57,
-	24012 - 19968: jis0208<<14 | 0x13<<7 | 0x3F,
-	24013 - 19968: jis0208<<14 | 0x35<<7 | 0x3A,
-	24014 - 19968: jis0212<<14 | 0x1A<<7 | 0x59,
-	24016 - 19968: jis0208<<14 | 0x58<<7 | 0x59,
-	24018 - 19968: jis0208<<14 | 0x35<<7 | 0x3C,
-	24019 - 19968: jis0208<<14 | 0x35<<7 | 0x3B,
-	24022 - 19968: jis0208<<14 | 0x35<<7 | 0x3D,
-	24024 - 19968: jis0212<<14 | 0x1A<<7 | 0x5A,
-	24025 - 19968: jis0212<<14 | 0x1A<<7 | 0x5B,
-	24027 - 19968: jis0208<<14 | 0x35<<7 | 0x3E,
-	24029 - 19968: jis0208<<14 | 0x1F<<7 | 0x4D,
-	24030 - 19968: jis0208<<14 | 0x1C<<7 | 0x02,
-	24032 - 19968: jis0212<<14 | 0x1A<<7 | 0x5C,
-	24033 - 19968: jis0208<<14 | 0x1C<<7 | 0x43,
-	24035 - 19968: jis0208<<14 | 0x20<<7 | 0x42,
-	24036 - 19968: jis0212<<14 | 0x1A<<7 | 0x5D,
-	24037 - 19968: jis0208<<14 | 0x18<<7 | 0x08,
-	24038 - 19968: jis0208<<14 | 0x19<<7 | 0x17,
-	24039 - 19968: jis0208<<14 | 0x18<<7 | 0x09,
-	24040 - 19968: jis0208<<14 | 0x14<<7 | 0x4F,
-	24041 - 19968: jis0212<<14 | 0x1B<<7 | 0x00,
-	24043 - 19968: jis0208<<14 | 0x35<<7 | 0x3F,
-	24046 - 19968: jis0208<<14 | 0x19<<7 | 0x18,
-	24049 - 19968: jis0208<<14 | 0x17<<7 | 0x29,
-	24050 - 19968: jis0208<<14 | 0x35<<7 | 0x40,
-	24051 - 19968: jis0208<<14 | 0x2B<<7 | 0x05,
-	24052 - 19968: jis0208<<14 | 0x26<<7 | 0x22,
-	24053 - 19968: jis0208<<14 | 0x35<<7 | 0x41,
-	24055 - 19968: jis0208<<14 | 0x18<<7 | 0x0A,
-	24056 - 19968: jis0212<<14 | 0x1B<<7 | 0x01,
-	24057 - 19968: jis0212<<14 | 0x1B<<7 | 0x02,
-	24059 - 19968: jis0208<<14 | 0x13<<7 | 0x0B,
-	24061 - 19968: jis0208<<14 | 0x22<<7 | 0x06,
-	24062 - 19968: jis0208<<14 | 0x15<<7 | 0x31,
-	24064 - 19968: jis0212<<14 | 0x1B<<7 | 0x03,
-	24066 - 19968: jis0208<<14 | 0x1A<<7 | 0x33,
-	24067 - 19968: jis0208<<14 | 0x28<<7 | 0x3A,
-	24070 - 19968: jis0208<<14 | 0x27<<7 | 0x20,
-	24071 - 19968: jis0212<<14 | 0x1B<<7 | 0x04,
-	24075 - 19968: jis0208<<14 | 0x35<<7 | 0x42,
-	24076 - 19968: jis0208<<14 | 0x13<<7 | 0x54,
-	24077 - 19968: jis0212<<14 | 0x1B<<7 | 0x05,
-	24081 - 19968: jis0208<<14 | 0x35<<7 | 0x45,
-	24082 - 19968: jis0212<<14 | 0x1B<<7 | 0x06,
-	24084 - 19968: jis0212<<14 | 0x1B<<7 | 0x07,
-	24085 - 19968: jis0212<<14 | 0x1B<<7 | 0x08,
-	24086 - 19968: jis0208<<14 | 0x23<<7 | 0x00,
-	24088 - 19968: jis0212<<14 | 0x1B<<7 | 0x09,
-	24089 - 19968: jis0208<<14 | 0x35<<7 | 0x44,
-	24090 - 19968: jis0208<<14 | 0x35<<7 | 0x43,
-	24091 - 19968: jis0208<<14 | 0x35<<7 | 0x46,
-	24093 - 19968: jis0208<<14 | 0x23<<7 | 0x4A,
-	24095 - 19968: jis0212<<14 | 0x1B<<7 | 0x0A,
-	24096 - 19968: jis0212<<14 | 0x1B<<7 | 0x0B,
-	24101 - 19968: jis0208<<14 | 0x1E<<7 | 0x42,
-	24104 - 19968: jis0212<<14 | 0x1B<<7 | 0x0D,
-	24107 - 19968: jis0208<<14 | 0x1A<<7 | 0x34,
-	24109 - 19968: jis0208<<14 | 0x1F<<7 | 0x29,
-	24110 - 19968: jis0212<<14 | 0x1B<<7 | 0x0C,
-	24111 - 19968: jis0208<<14 | 0x21<<7 | 0x32,
-	24112 - 19968: jis0208<<14 | 0x14<<7 | 0x01,
-	24114 - 19968: jis0212<<14 | 0x1B<<7 | 0x0E,
-	24115 - 19968: jis0208<<14 | 0x23<<7 | 0x01,
-	24117 - 19968: jis0212<<14 | 0x1B<<7 | 0x0F,
-	24118 - 19968: jis0208<<14 | 0x35<<7 | 0x47,
-	24119 - 19968: jis0208<<14 | 0x35<<7 | 0x48,
-	24120 - 19968: jis0208<<14 | 0x1D<<7 | 0x4E,
-	24125 - 19968: jis0208<<14 | 0x2A<<7 | 0x18,
-	24126 - 19968: jis0212<<14 | 0x1B<<7 | 0x10,
-	24128 - 19968: jis0208<<14 | 0x35<<7 | 0x4B,
-	24131 - 19968: jis0208<<14 | 0x35<<7 | 0x4A,
-	24132 - 19968: jis0208<<14 | 0x35<<7 | 0x49,
-	24133 - 19968: jis0208<<14 | 0x28<<7 | 0x5C,
-	24135 - 19968: jis0208<<14 | 0x35<<7 | 0x52,
-	24137 - 19968: jis0212<<14 | 0x1B<<7 | 0x13,
-	24139 - 19968: jis0212<<14 | 0x1B<<7 | 0x11,
-	24140 - 19968: jis0208<<14 | 0x2A<<7 | 0x39,
-	24142 - 19968: jis0208<<14 | 0x35<<7 | 0x4C,
-	24144 - 19968: jis0212<<14 | 0x1B<<7 | 0x12,
-	24145 - 19968: jis0212<<14 | 0x1B<<7 | 0x14,
-	24148 - 19968: jis0208<<14 | 0x35<<7 | 0x4E,
-	24149 - 19968: jis0208<<14 | 0x2A<<7 | 0x4A,
-	24150 - 19968: jis0212<<14 | 0x1B<<7 | 0x15,
-	24151 - 19968: jis0208<<14 | 0x35<<7 | 0x4D,
-	24152 - 19968: jis0212<<14 | 0x1B<<7 | 0x16,
-	24155 - 19968: jis0212<<14 | 0x1B<<7 | 0x17,
-	24156 - 19968: jis0212<<14 | 0x1B<<7 | 0x18,
-	24158 - 19968: jis0212<<14 | 0x1B<<7 | 0x19,
-	24159 - 19968: jis0208<<14 | 0x35<<7 | 0x4F,
-	24161 - 19968: jis0208<<14 | 0x27<<7 | 0x07,
-	24162 - 19968: jis0208<<14 | 0x35<<7 | 0x50,
-	24163 - 19968: jis0208<<14 | 0x29<<7 | 0x1D,
-	24164 - 19968: jis0208<<14 | 0x35<<7 | 0x51,
-	24168 - 19968: jis0212<<14 | 0x1B<<7 | 0x1A,
-	24170 - 19968: jis0212<<14 | 0x1B<<7 | 0x1B,
-	24171 - 19968: jis0212<<14 | 0x1B<<7 | 0x1C,
-	24172 - 19968: jis0212<<14 | 0x1B<<7 | 0x1D,
-	24173 - 19968: jis0212<<14 | 0x1B<<7 | 0x1E,
-	24174 - 19968: jis0212<<14 | 0x1B<<7 | 0x1F,
-	24176 - 19968: jis0212<<14 | 0x1B<<7 | 0x20,
-	24178 - 19968: jis0208<<14 | 0x13<<7 | 0x12,
-	24179 - 19968: jis0208<<14 | 0x29<<7 | 0x1E,
-	24180 - 19968: jis0208<<14 | 0x26<<7 | 0x0E,
-	24181 - 19968: jis0208<<14 | 0x35<<7 | 0x53,
-	24182 - 19968: jis0208<<14 | 0x35<<7 | 0x54,
-	24184 - 19968: jis0208<<14 | 0x18<<7 | 0x0B,
-	24185 - 19968: jis0208<<14 | 0x13<<7 | 0x13,
-	24186 - 19968: jis0208<<14 | 0x35<<7 | 0x55,
-	24187 - 19968: jis0208<<14 | 0x17<<7 | 0x17,
-	24188 - 19968: jis0208<<14 | 0x2C<<7 | 0x23,
-	24189 - 19968: jis0208<<14 | 0x2C<<7 | 0x08,
-	24190 - 19968: jis0208<<14 | 0x13<<7 | 0x55,
-	24191 - 19968: jis0208<<14 | 0x35<<7 | 0x57,
-	24192 - 19968: jis0212<<14 | 0x1B<<7 | 0x21,
-	24193 - 19968: jis0208<<14 | 0x23<<7 | 0x02,
-	24195 - 19968: jis0208<<14 | 0x18<<7 | 0x0C,
-	24196 - 19968: jis0208<<14 | 0x1D<<7 | 0x10,
-	24199 - 19968: jis0208<<14 | 0x27<<7 | 0x3E,
-	24202 - 19968: jis0208<<14 | 0x1D<<7 | 0x11,
-	24203 - 19968: jis0212<<14 | 0x1B<<7 | 0x22,
-	24206 - 19968: jis0212<<14 | 0x1B<<7 | 0x23,
-	24207 - 19968: jis0208<<14 | 0x1C<<7 | 0x57,
-	24213 - 19968: jis0208<<14 | 0x23<<7 | 0x4B,
-	24214 - 19968: jis0208<<14 | 0x29<<7 | 0x58,
-	24215 - 19968: jis0208<<14 | 0x24<<7 | 0x18,
-	24218 - 19968: jis0208<<14 | 0x18<<7 | 0x0D,
-	24220 - 19968: jis0208<<14 | 0x28<<7 | 0x3B,
-	24224 - 19968: jis0208<<14 | 0x35<<7 | 0x58,
-	24226 - 19968: jis0212<<14 | 0x1B<<7 | 0x24,
-	24228 - 19968: jis0212<<14 | 0x1B<<7 | 0x25,
-	24229 - 19968: jis0212<<14 | 0x1B<<7 | 0x26,
-	24230 - 19968: jis0208<<14 | 0x24<<7 | 0x38,
-	24231 - 19968: jis0208<<14 | 0x19<<7 | 0x21,
-	24232 - 19968: jis0212<<14 | 0x1B<<7 | 0x27,
-	24234 - 19968: jis0212<<14 | 0x1B<<7 | 0x28,
-	24235 - 19968: jis0208<<14 | 0x17<<7 | 0x2A,
-	24236 - 19968: jis0212<<14 | 0x1B<<7 | 0x29,
-	24237 - 19968: jis0208<<14 | 0x23<<7 | 0x4C,
-	24241 - 19968: jis0212<<14 | 0x1B<<7 | 0x2A,
-	24243 - 19968: jis0212<<14 | 0x1B<<7 | 0x2B,
-	24245 - 19968: jis0208<<14 | 0x0F<<7 | 0x22,
-	24246 - 19968: jis0208<<14 | 0x1C<<7 | 0x4D,
-	24247 - 19968: jis0208<<14 | 0x18<<7 | 0x0E,
-	24248 - 19968: jis0208<<14 | 0x2C<<7 | 0x26,
-	24253 - 19968: jis0212<<14 | 0x1B<<7 | 0x2C,
-	24254 - 19968: jis0212<<14 | 0x1B<<7 | 0x2D,
-	24255 - 19968: jis0212<<14 | 0x1B<<7 | 0x2E,
-	24257 - 19968: jis0208<<14 | 0x35<<7 | 0x59,
-	24258 - 19968: jis0208<<14 | 0x35<<7 | 0x5A,
-	24259 - 19968: jis0208<<14 | 0x26<<7 | 0x30,
-	24262 - 19968: jis0212<<14 | 0x1B<<7 | 0x2F,
-	24264 - 19968: jis0208<<14 | 0x35<<7 | 0x5B,
-	24265 - 19968: jis0208<<14 | 0x2D<<7 | 0x56,
-	24266 - 19968: jis0208<<14 | 0x2E<<7 | 0x0C,
-	24267 - 19968: jis0212<<14 | 0x1B<<7 | 0x31,
-	24268 - 19968: jis0212<<14 | 0x1B<<7 | 0x30,
-	24270 - 19968: jis0212<<14 | 0x1B<<7 | 0x32,
-	24271 - 19968: jis0208<<14 | 0x35<<7 | 0x5D,
-	24272 - 19968: jis0208<<14 | 0x35<<7 | 0x5C,
-	24273 - 19968: jis0212<<14 | 0x1B<<7 | 0x33,
-	24274 - 19968: jis0212<<14 | 0x1B<<7 | 0x34,
-	24275 - 19968: jis0208<<14 | 0x12<<7 | 0x26,
-	24276 - 19968: jis0212<<14 | 0x1B<<7 | 0x35,
-	24277 - 19968: jis0212<<14 | 0x1B<<7 | 0x36,
-	24278 - 19968: jis0208<<14 | 0x36<<7 | 0x00,
-	24282 - 19968: jis0208<<14 | 0x36<<7 | 0x03,
-	24283 - 19968: jis0208<<14 | 0x36<<7 | 0x04,
-	24284 - 19968: jis0212<<14 | 0x1B<<7 | 0x37,
-	24285 - 19968: jis0208<<14 | 0x36<<7 | 0x02,
-	24286 - 19968: jis0212<<14 | 0x1B<<7 | 0x38,
-	24287 - 19968: jis0208<<14 | 0x28<<7 | 0x1F,
-	24288 - 19968: jis0208<<14 | 0x1D<<7 | 0x12,
-	24289 - 19968: jis0208<<14 | 0x36<<7 | 0x06,
-	24290 - 19968: jis0208<<14 | 0x36<<7 | 0x05,
-	24291 - 19968: jis0208<<14 | 0x36<<7 | 0x01,
-	24293 - 19968: jis0212<<14 | 0x1B<<7 | 0x39,
-	24296 - 19968: jis0208<<14 | 0x36<<7 | 0x07,
-	24297 - 19968: jis0208<<14 | 0x36<<7 | 0x08,
-	24299 - 19968: jis0212<<14 | 0x1B<<7 | 0x3A,
-	24300 - 19968: jis0208<<14 | 0x36<<7 | 0x09,
-	24304 - 19968: jis0208<<14 | 0x36<<7 | 0x0C,
-	24305 - 19968: jis0208<<14 | 0x36<<7 | 0x0A,
-	24307 - 19968: jis0208<<14 | 0x36<<7 | 0x0B,
-	24308 - 19968: jis0208<<14 | 0x36<<7 | 0x0D,
-	24310 - 19968: jis0208<<14 | 0x10<<7 | 0x43,
-	24311 - 19968: jis0208<<14 | 0x23<<7 | 0x4D,
-	24312 - 19968: jis0208<<14 | 0x36<<7 | 0x0E,
-	24314 - 19968: jis0208<<14 | 0x16<<7 | 0x59,
-	24315 - 19968: jis0208<<14 | 0x11<<7 | 0x55,
-	24316 - 19968: jis0208<<14 | 0x26<<7 | 0x15,
-	24318 - 19968: jis0208<<14 | 0x36<<7 | 0x0F,
-	24319 - 19968: jis0208<<14 | 0x25<<7 | 0x5A,
-	24321 - 19968: jis0208<<14 | 0x29<<7 | 0x3A,
-	24322 - 19968: jis0212<<14 | 0x1B<<7 | 0x3B,
-	24323 - 19968: jis0208<<14 | 0x36<<7 | 0x10,
-	24324 - 19968: jis0208<<14 | 0x2E<<7 | 0x0D,
-	24326 - 19968: jis0212<<14 | 0x1B<<7 | 0x3C,
-	24327 - 19968: jis0212<<14 | 0x1B<<7 | 0x3D,
-	24328 - 19968: jis0212<<14 | 0x1B<<7 | 0x3E,
-	24329 - 19968: jis0208<<14 | 0x36<<7 | 0x11,
-	24330 - 19968: jis0208<<14 | 0x29<<7 | 0x1F,
-	24331 - 19968: jis0208<<14 | 0x36<<7 | 0x14,
-	24332 - 19968: jis0208<<14 | 0x2F<<7 | 0x00,
-	24333 - 19968: jis0208<<14 | 0x2F<<7 | 0x10,
-	24334 - 19968: jis0212<<14 | 0x1B<<7 | 0x3F,
-	24335 - 19968: jis0208<<14 | 0x1B<<7 | 0x0F,
-	24336 - 19968: jis0208<<14 | 0x25<<7 | 0x54,
-	24337 - 19968: jis0208<<14 | 0x36<<7 | 0x15,
-	24339 - 19968: jis0208<<14 | 0x14<<7 | 0x3C,
-	24340 - 19968: jis0208<<14 | 0x23<<7 | 0x03,
-	24341 - 19968: jis0208<<14 | 0x0F<<7 | 0x59,
-	24342 - 19968: jis0208<<14 | 0x36<<7 | 0x16,
-	24343 - 19968: jis0208<<14 | 0x29<<7 | 0x05,
-	24344 - 19968: jis0208<<14 | 0x18<<7 | 0x0F,
-	24345 - 19968: jis0212<<14 | 0x1B<<7 | 0x40,
-	24347 - 19968: jis0208<<14 | 0x22<<7 | 0x2F,
-	24348 - 19968: jis0212<<14 | 0x1B<<7 | 0x41,
-	24349 - 19968: jis0212<<14 | 0x1B<<7 | 0x42,
-	24351 - 19968: jis0208<<14 | 0x23<<7 | 0x4E,
-	24353 - 19968: jis0208<<14 | 0x58<<7 | 0x5A,
-	24354 - 19968: jis0212<<14 | 0x1B<<7 | 0x44,
-	24355 - 19968: jis0212<<14 | 0x1B<<7 | 0x45,
-	24356 - 19968: jis0212<<14 | 0x1B<<7 | 0x46,
-	24357 - 19968: jis0208<<14 | 0x2B<<7 | 0x4E,
-	24358 - 19968: jis0208<<14 | 0x17<<7 | 0x18,
-	24359 - 19968: jis0208<<14 | 0x17<<7 | 0x2B,
-	24360 - 19968: jis0212<<14 | 0x1B<<7 | 0x47,
-	24361 - 19968: jis0208<<14 | 0x36<<7 | 0x17,
-	24363 - 19968: jis0212<<14 | 0x1B<<7 | 0x48,
-	24364 - 19968: jis0212<<14 | 0x1B<<7 | 0x49,
-	24365 - 19968: jis0208<<14 | 0x36<<7 | 0x18,
-	24366 - 19968: jis0212<<14 | 0x1B<<7 | 0x4A,
-	24367 - 19968: jis0208<<14 | 0x36<<7 | 0x1E,
-	24368 - 19968: jis0212<<14 | 0x1B<<7 | 0x4B,
-	24369 - 19968: jis0208<<14 | 0x1B<<7 | 0x44,
-	24372 - 19968: jis0208<<14 | 0x58<<7 | 0x5B,
-	24373 - 19968: jis0208<<14 | 0x23<<7 | 0x04,
-	24374 - 19968: jis0212<<14 | 0x1B<<7 | 0x4D,
-	24375 - 19968: jis0208<<14 | 0x15<<7 | 0x0E,
-	24376 - 19968: jis0208<<14 | 0x36<<7 | 0x19,
-	24379 - 19968: jis0212<<14 | 0x1B<<7 | 0x4E,
-	24380 - 19968: jis0208<<14 | 0x28<<7 | 0x0A,
-	24381 - 19968: jis0212<<14 | 0x1B<<7 | 0x4F,
-	24382 - 19968: jis0208<<14 | 0x22<<7 | 0x25,
-	24383 - 19968: jis0212<<14 | 0x1B<<7 | 0x50,
-	24384 - 19968: jis0212<<14 | 0x1B<<7 | 0x51,
-	24385 - 19968: jis0208<<14 | 0x36<<7 | 0x1A,
-	24388 - 19968: jis0212<<14 | 0x1B<<7 | 0x52,
-	24389 - 19968: jis0208<<14 | 0x58<<7 | 0x0B,
-	24391 - 19968: jis0212<<14 | 0x1B<<7 | 0x54,
-	24392 - 19968: jis0208<<14 | 0x36<<7 | 0x1B,
-	24394 - 19968: jis0208<<14 | 0x15<<7 | 0x0F,
-	24396 - 19968: jis0208<<14 | 0x36<<7 | 0x1C,
-	24397 - 19968: jis0212<<14 | 0x1B<<7 | 0x55,
-	24398 - 19968: jis0208<<14 | 0x36<<7 | 0x1D,
-	24400 - 19968: jis0212<<14 | 0x1B<<7 | 0x56,
-	24401 - 19968: jis0208<<14 | 0x36<<7 | 0x1F,
-	24403 - 19968: jis0208<<14 | 0x24<<7 | 0x55,
-	24404 - 19968: jis0212<<14 | 0x1B<<7 | 0x57,
-	24406 - 19968: jis0208<<14 | 0x36<<7 | 0x20,
-	24407 - 19968: jis0208<<14 | 0x36<<7 | 0x21,
-	24408 - 19968: jis0212<<14 | 0x1B<<7 | 0x58,
-	24409 - 19968: jis0208<<14 | 0x36<<7 | 0x22,
-	24411 - 19968: jis0212<<14 | 0x1B<<7 | 0x59,
-	24412 - 19968: jis0208<<14 | 0x36<<7 | 0x13,
-	24413 - 19968: jis0208<<14 | 0x36<<7 | 0x12,
-	24416 - 19968: jis0212<<14 | 0x1B<<7 | 0x5A,
-	24417 - 19968: jis0208<<14 | 0x36<<7 | 0x23,
-	24418 - 19968: jis0208<<14 | 0x16<<7 | 0x20,
-	24419 - 19968: jis0212<<14 | 0x1B<<7 | 0x5B,
-	24420 - 19968: jis0212<<14 | 0x1B<<7 | 0x5C,
-	24422 - 19968: jis0208<<14 | 0x28<<7 | 0x06,
-	24423 - 19968: jis0208<<14 | 0x58<<7 | 0x5C,
-	24425 - 19968: jis0208<<14 | 0x19<<7 | 0x2B,
-	24426 - 19968: jis0208<<14 | 0x28<<7 | 0x16,
-	24427 - 19968: jis0208<<14 | 0x23<<7 | 0x05,
-	24428 - 19968: jis0208<<14 | 0x28<<7 | 0x2A,
-	24429 - 19968: jis0208<<14 | 0x36<<7 | 0x24,
-	24431 - 19968: jis0212<<14 | 0x1C<<7 | 0x00,
-	24432 - 19968: jis0208<<14 | 0x1D<<7 | 0x13,
-	24433 - 19968: jis0208<<14 | 0x10<<7 | 0x25,
-	24434 - 19968: jis0212<<14 | 0x1C<<7 | 0x01,
-	24435 - 19968: jis0208<<14 | 0x36<<7 | 0x25,
-	24436 - 19968: jis0212<<14 | 0x1C<<7 | 0x02,
-	24437 - 19968: jis0212<<14 | 0x1C<<7 | 0x03,
-	24439 - 19968: jis0208<<14 | 0x36<<7 | 0x26,
-	24440 - 19968: jis0212<<14 | 0x1C<<7 | 0x04,
-	24441 - 19968: jis0208<<14 | 0x2B<<7 | 0x51,
-	24442 - 19968: jis0212<<14 | 0x1C<<7 | 0x05,
-	24444 - 19968: jis0208<<14 | 0x27<<7 | 0x3F,
-	24445 - 19968: jis0212<<14 | 0x1C<<7 | 0x06,
-	24446 - 19968: jis0212<<14 | 0x1C<<7 | 0x07,
-	24447 - 19968: jis0208<<14 | 0x36<<7 | 0x29,
-	24448 - 19968: jis0208<<14 | 0x10<<7 | 0x5C,
-	24449 - 19968: jis0208<<14 | 0x1F<<7 | 0x0B,
-	24450 - 19968: jis0208<<14 | 0x36<<7 | 0x28,
-	24451 - 19968: jis0208<<14 | 0x36<<7 | 0x27,
-	24452 - 19968: jis0208<<14 | 0x16<<7 | 0x21,
-	24453 - 19968: jis0208<<14 | 0x21<<7 | 0x33,
-	24455 - 19968: jis0208<<14 | 0x36<<7 | 0x2D,
-	24456 - 19968: jis0208<<14 | 0x36<<7 | 0x2B,
-	24457 - 19968: jis0212<<14 | 0x1C<<7 | 0x08,
-	24458 - 19968: jis0208<<14 | 0x36<<7 | 0x2A,
-	24459 - 19968: jis0208<<14 | 0x2D<<7 | 0x06,
-	24460 - 19968: jis0208<<14 | 0x17<<7 | 0x44,
-	24461 - 19968: jis0212<<14 | 0x1C<<7 | 0x09,
-	24463 - 19968: jis0212<<14 | 0x1C<<7 | 0x0A,
-	24464 - 19968: jis0208<<14 | 0x1C<<7 | 0x58,
-	24465 - 19968: jis0208<<14 | 0x36<<7 | 0x2C,
-	24466 - 19968: jis0208<<14 | 0x24<<7 | 0x2B,
-	24467 - 19968: jis0208<<14 | 0x1C<<7 | 0x1D,
-	24470 - 19968: jis0212<<14 | 0x1C<<7 | 0x0B,
-	24471 - 19968: jis0208<<14 | 0x25<<7 | 0x1F,
-	24472 - 19968: jis0208<<14 | 0x36<<7 | 0x30,
-	24473 - 19968: jis0208<<14 | 0x36<<7 | 0x2F,
-	24476 - 19968: jis0212<<14 | 0x1C<<7 | 0x0C,
-	24477 - 19968: jis0212<<14 | 0x1C<<7 | 0x0D,
-	24478 - 19968: jis0208<<14 | 0x36<<7 | 0x2E,
-	24480 - 19968: jis0208<<14 | 0x36<<7 | 0x31,
-	24481 - 19968: jis0208<<14 | 0x17<<7 | 0x45,
-	24482 - 19968: jis0212<<14 | 0x1C<<7 | 0x0E,
-	24484 - 19968: jis0212<<14 | 0x1C<<7 | 0x11,
-	24487 - 19968: jis0212<<14 | 0x1C<<7 | 0x0F,
-	24488 - 19968: jis0208<<14 | 0x36<<7 | 0x32,
-	24489 - 19968: jis0208<<14 | 0x28<<7 | 0x5B,
-	24490 - 19968: jis0208<<14 | 0x1C<<7 | 0x3A,
-	24491 - 19968: jis0212<<14 | 0x1C<<7 | 0x10,
-	24492 - 19968: jis0212<<14 | 0x1C<<7 | 0x12,
-	24493 - 19968: jis0208<<14 | 0x36<<7 | 0x33,
-	24494 - 19968: jis0208<<14 | 0x27<<7 | 0x58,
-	24495 - 19968: jis0212<<14 | 0x1C<<7 | 0x13,
-	24496 - 19968: jis0212<<14 | 0x1C<<7 | 0x14,
-	24497 - 19968: jis0212<<14 | 0x1C<<7 | 0x15,
-	24499 - 19968: jis0208<<14 | 0x25<<7 | 0x20,
-	24500 - 19968: jis0208<<14 | 0x23<<7 | 0x06,
-	24503 - 19968: jis0208<<14 | 0x58<<7 | 0x5D,
-	24504 - 19968: jis0212<<14 | 0x1C<<7 | 0x16,
-	24505 - 19968: jis0208<<14 | 0x24<<7 | 0x0F,
-	24508 - 19968: jis0208<<14 | 0x36<<7 | 0x34,
-	24509 - 19968: jis0208<<14 | 0x14<<7 | 0x0A,
-	24515 - 19968: jis0208<<14 | 0x1E<<7 | 0x13,
-	24516 - 19968: jis0212<<14 | 0x1C<<7 | 0x17,
-	24517 - 19968: jis0208<<14 | 0x28<<7 | 0x0B,
-	24519 - 19968: jis0212<<14 | 0x1C<<7 | 0x18,
-	24520 - 19968: jis0212<<14 | 0x1C<<7 | 0x19,
-	24521 - 19968: jis0212<<14 | 0x1C<<7 | 0x1A,
-	24523 - 19968: jis0212<<14 | 0x1C<<7 | 0x1B,
-	24524 - 19968: jis0208<<14 | 0x13<<7 | 0x56,
-	24525 - 19968: jis0208<<14 | 0x26<<7 | 0x05,
-	24528 - 19968: jis0212<<14 | 0x1C<<7 | 0x1C,
-	24529 - 19968: jis0212<<14 | 0x1C<<7 | 0x1D,
-	24530 - 19968: jis0212<<14 | 0x1C<<7 | 0x1E,
-	24531 - 19968: jis0212<<14 | 0x1C<<7 | 0x1F,
-	24532 - 19968: jis0212<<14 | 0x1C<<7 | 0x20,
-	24534 - 19968: jis0208<<14 | 0x36<<7 | 0x35,
-	24535 - 19968: jis0208<<14 | 0x1A<<7 | 0x35,
-	24536 - 19968: jis0208<<14 | 0x2A<<7 | 0x19,
-	24537 - 19968: jis0208<<14 | 0x2A<<7 | 0x1A,
-	24540 - 19968: jis0208<<14 | 0x10<<7 | 0x5D,
-	24541 - 19968: jis0208<<14 | 0x36<<7 | 0x3A,
-	24542 - 19968: jis0208<<14 | 0x59<<7 | 0x00,
-	24544 - 19968: jis0208<<14 | 0x22<<7 | 0x48,
-	24545 - 19968: jis0212<<14 | 0x1C<<7 | 0x22,
-	24546 - 19968: jis0212<<14 | 0x1C<<7 | 0x23,
-	24548 - 19968: jis0208<<14 | 0x36<<7 | 0x37,
-	24552 - 19968: jis0212<<14 | 0x1C<<7 | 0x24,
-	24553 - 19968: jis0212<<14 | 0x1C<<7 | 0x25,
-	24554 - 19968: jis0212<<14 | 0x1C<<7 | 0x26,
-	24555 - 19968: jis0208<<14 | 0x11<<7 | 0x56,
-	24556 - 19968: jis0212<<14 | 0x1C<<7 | 0x27,
-	24557 - 19968: jis0212<<14 | 0x1C<<7 | 0x28,
-	24558 - 19968: jis0212<<14 | 0x1C<<7 | 0x29,
-	24559 - 19968: jis0212<<14 | 0x1C<<7 | 0x2A,
-	24560 - 19968: jis0208<<14 | 0x37<<7 | 0x0C,
-	24561 - 19968: jis0208<<14 | 0x36<<7 | 0x39,
-	24562 - 19968: jis0212<<14 | 0x1C<<7 | 0x2B,
-	24563 - 19968: jis0212<<14 | 0x1C<<7 | 0x2C,
-	24565 - 19968: jis0208<<14 | 0x26<<7 | 0x0F,
-	24566 - 19968: jis0212<<14 | 0x1C<<7 | 0x2D,
-	24568 - 19968: jis0208<<14 | 0x36<<7 | 0x38,
-	24570 - 19968: jis0212<<14 | 0x1C<<7 | 0x2E,
-	24571 - 19968: jis0208<<14 | 0x36<<7 | 0x36,
-	24572 - 19968: jis0212<<14 | 0x1C<<7 | 0x2F,
-	24573 - 19968: jis0208<<14 | 0x18<<7 | 0x59,
-	24575 - 19968: jis0208<<14 | 0x36<<7 | 0x3C,
-	24583 - 19968: jis0212<<14 | 0x1C<<7 | 0x30,
-	24586 - 19968: jis0212<<14 | 0x1C<<7 | 0x31,
-	24589 - 19968: jis0212<<14 | 0x1C<<7 | 0x32,
-	24590 - 19968: jis0208<<14 | 0x36<<7 | 0x42,
-	24591 - 19968: jis0208<<14 | 0x36<<7 | 0x48,
-	24592 - 19968: jis0208<<14 | 0x36<<7 | 0x40,
-	24594 - 19968: jis0208<<14 | 0x24<<7 | 0x3B,
-	24595 - 19968: jis0212<<14 | 0x1C<<7 | 0x33,
-	24596 - 19968: jis0212<<14 | 0x1C<<7 | 0x34,
-	24597 - 19968: jis0208<<14 | 0x36<<7 | 0x45,
-	24598 - 19968: jis0208<<14 | 0x28<<7 | 0x3C,
-	24599 - 19968: jis0212<<14 | 0x1C<<7 | 0x35,
-	24600 - 19968: jis0212<<14 | 0x1C<<7 | 0x36,
-	24601 - 19968: jis0208<<14 | 0x36<<7 | 0x3F,
-	24602 - 19968: jis0212<<14 | 0x1C<<7 | 0x37,
-	24603 - 19968: jis0208<<14 | 0x36<<7 | 0x44,
-	24604 - 19968: jis0208<<14 | 0x2D<<7 | 0x46,
-	24605 - 19968: jis0208<<14 | 0x1A<<7 | 0x36,
-	24607 - 19968: jis0212<<14 | 0x1C<<7 | 0x38,
-	24608 - 19968: jis0208<<14 | 0x21<<7 | 0x34,
-	24609 - 19968: jis0208<<14 | 0x36<<7 | 0x3D,
-	24612 - 19968: jis0212<<14 | 0x1C<<7 | 0x39,
-	24613 - 19968: jis0208<<14 | 0x14<<7 | 0x3D,
-	24614 - 19968: jis0208<<14 | 0x36<<7 | 0x47,
-	24615 - 19968: jis0208<<14 | 0x1F<<7 | 0x0C,
-	24616 - 19968: jis0208<<14 | 0x10<<7 | 0x44,
-	24617 - 19968: jis0208<<14 | 0x36<<7 | 0x41,
-	24618 - 19968: jis0208<<14 | 0x11<<7 | 0x57,
-	24619 - 19968: jis0208<<14 | 0x36<<7 | 0x46,
-	24621 - 19968: jis0212<<14 | 0x1C<<7 | 0x3A,
-	24623 - 19968: jis0208<<14 | 0x15<<7 | 0x10,
-	24625 - 19968: jis0208<<14 | 0x36<<7 | 0x43,
-	24627 - 19968: jis0212<<14 | 0x1C<<7 | 0x3B,
-	24629 - 19968: jis0212<<14 | 0x1C<<7 | 0x3C,
-	24634 - 19968: jis0208<<14 | 0x36<<7 | 0x49,
-	24640 - 19968: jis0212<<14 | 0x1C<<7 | 0x3D,
-	24641 - 19968: jis0208<<14 | 0x36<<7 | 0x4B,
-	24642 - 19968: jis0208<<14 | 0x36<<7 | 0x55,
-	24643 - 19968: jis0208<<14 | 0x36<<7 | 0x53,
-	24646 - 19968: jis0208<<14 | 0x36<<7 | 0x50,
-	24647 - 19968: jis0212<<14 | 0x1C<<7 | 0x3E,
-	24648 - 19968: jis0212<<14 | 0x1C<<7 | 0x3F,
-	24649 - 19968: jis0212<<14 | 0x1C<<7 | 0x40,
-	24650 - 19968: jis0208<<14 | 0x36<<7 | 0x4F,
-	24651 - 19968: jis0208<<14 | 0x2D<<7 | 0x57,
-	24652 - 19968: jis0212<<14 | 0x1C<<7 | 0x41,
-	24653 - 19968: jis0208<<14 | 0x36<<7 | 0x51,
-	24656 - 19968: jis0208<<14 | 0x15<<7 | 0x11,
-	24657 - 19968: jis0212<<14 | 0x1C<<7 | 0x42,
-	24658 - 19968: jis0208<<14 | 0x18<<7 | 0x10,
-	24660 - 19968: jis0212<<14 | 0x1C<<7 | 0x43,
-	24661 - 19968: jis0208<<14 | 0x1C<<7 | 0x59,
-	24662 - 19968: jis0212<<14 | 0x1C<<7 | 0x44,
-	24663 - 19968: jis0212<<14 | 0x1C<<7 | 0x45,
-	24665 - 19968: jis0208<<14 | 0x36<<7 | 0x58,
-	24666 - 19968: jis0208<<14 | 0x36<<7 | 0x4A,
-	24669 - 19968: jis0208<<14 | 0x59<<7 | 0x01,
-	24671 - 19968: jis0208<<14 | 0x36<<7 | 0x4E,
-	24672 - 19968: jis0208<<14 | 0x36<<7 | 0x3E,
-	24673 - 19968: jis0212<<14 | 0x1C<<7 | 0x47,
-	24674 - 19968: jis0208<<14 | 0x11<<7 | 0x59,
-	24675 - 19968: jis0208<<14 | 0x36<<7 | 0x52,
-	24676 - 19968: jis0208<<14 | 0x36<<7 | 0x54,
-	24677 - 19968: jis0208<<14 | 0x22<<7 | 0x30,
-	24679 - 19968: jis0212<<14 | 0x1C<<7 | 0x48,
-	24680 - 19968: jis0208<<14 | 0x19<<7 | 0x07,
-	24681 - 19968: jis0208<<14 | 0x11<<7 | 0x17,
-	24682 - 19968: jis0208<<14 | 0x36<<7 | 0x4C,
-	24683 - 19968: jis0208<<14 | 0x36<<7 | 0x57,
-	24684 - 19968: jis0208<<14 | 0x36<<7 | 0x56,
-	24685 - 19968: jis0208<<14 | 0x15<<7 | 0x12,
-	24687 - 19968: jis0208<<14 | 0x21<<7 | 0x08,
-	24688 - 19968: jis0208<<14 | 0x12<<7 | 0x45,
-	24689 - 19968: jis0212<<14 | 0x1C<<7 | 0x49,
-	24693 - 19968: jis0208<<14 | 0x16<<7 | 0x22,
-	24695 - 19968: jis0208<<14 | 0x36<<7 | 0x4D,
-	24702 - 19968: jis0212<<14 | 0x1C<<7 | 0x4A,
-	24703 - 19968: jis0212<<14 | 0x1C<<7 | 0x4B,
-	24705 - 19968: jis0208<<14 | 0x36<<7 | 0x59,
-	24706 - 19968: jis0212<<14 | 0x1C<<7 | 0x4C,
-	24707 - 19968: jis0208<<14 | 0x36<<7 | 0x5C,
-	24708 - 19968: jis0208<<14 | 0x37<<7 | 0x00,
-	24709 - 19968: jis0208<<14 | 0x59<<7 | 0x02,
-	24710 - 19968: jis0212<<14 | 0x1C<<7 | 0x4D,
-	24712 - 19968: jis0212<<14 | 0x1C<<7 | 0x4E,
-	24713 - 19968: jis0208<<14 | 0x1B<<7 | 0x1C,
-	24714 - 19968: jis0208<<14 | 0x59<<7 | 0x03,
-	24715 - 19968: jis0208<<14 | 0x37<<7 | 0x06,
-	24716 - 19968: jis0208<<14 | 0x23<<7 | 0x4F,
-	24717 - 19968: jis0208<<14 | 0x36<<7 | 0x5A,
-	24718 - 19968: jis0212<<14 | 0x1C<<7 | 0x50,
-	24721 - 19968: jis0212<<14 | 0x1C<<7 | 0x51,
-	24722 - 19968: jis0208<<14 | 0x37<<7 | 0x04,
-	24723 - 19968: jis0212<<14 | 0x1C<<7 | 0x52,
-	24724 - 19968: jis0208<<14 | 0x11<<7 | 0x58,
-	24725 - 19968: jis0212<<14 | 0x1C<<7 | 0x53,
-	24726 - 19968: jis0208<<14 | 0x37<<7 | 0x02,
-	24727 - 19968: jis0208<<14 | 0x37<<7 | 0x03,
-	24728 - 19968: jis0212<<14 | 0x1C<<7 | 0x54,
-	24730 - 19968: jis0208<<14 | 0x36<<7 | 0x5D,
-	24731 - 19968: jis0208<<14 | 0x37<<7 | 0x01,
-	24733 - 19968: jis0212<<14 | 0x1C<<7 | 0x55,
-	24734 - 19968: jis0212<<14 | 0x1C<<7 | 0x56,
-	24735 - 19968: jis0208<<14 | 0x17<<7 | 0x46,
-	24736 - 19968: jis0208<<14 | 0x2C<<7 | 0x09,
-	24738 - 19968: jis0212<<14 | 0x1C<<7 | 0x57,
-	24739 - 19968: jis0208<<14 | 0x13<<7 | 0x14,
-	24740 - 19968: jis0212<<14 | 0x1C<<7 | 0x58,
-	24741 - 19968: jis0212<<14 | 0x1C<<7 | 0x59,
-	24742 - 19968: jis0208<<14 | 0x10<<7 | 0x38,
-	24743 - 19968: jis0208<<14 | 0x37<<7 | 0x05,
-	24744 - 19968: jis0212<<14 | 0x1C<<7 | 0x5A,
-	24745 - 19968: jis0208<<14 | 0x26<<7 | 0x19,
-	24746 - 19968: jis0208<<14 | 0x0F<<7 | 0x0C,
-	24752 - 19968: jis0212<<14 | 0x1C<<7 | 0x5B,
-	24753 - 19968: jis0212<<14 | 0x1C<<7 | 0x5C,
-	24754 - 19968: jis0208<<14 | 0x27<<7 | 0x40,
-	24755 - 19968: jis0208<<14 | 0x36<<7 | 0x3B,
-	24756 - 19968: jis0208<<14 | 0x37<<7 | 0x0B,
-	24757 - 19968: jis0208<<14 | 0x37<<7 | 0x0F,
-	24758 - 19968: jis0208<<14 | 0x2B<<7 | 0x44,
-	24759 - 19968: jis0212<<14 | 0x1C<<7 | 0x5D,
-	24760 - 19968: jis0208<<14 | 0x37<<7 | 0x08,
-	24763 - 19968: jis0212<<14 | 0x1D<<7 | 0x00,
-	24764 - 19968: jis0208<<14 | 0x24<<7 | 0x48,
-	24765 - 19968: jis0208<<14 | 0x37<<7 | 0x0D,
-	24766 - 19968: jis0212<<14 | 0x1D<<7 | 0x01,
-	24770 - 19968: jis0212<<14 | 0x1D<<7 | 0x02,
-	24772 - 19968: jis0212<<14 | 0x1D<<7 | 0x03,
-	24773 - 19968: jis0208<<14 | 0x1D<<7 | 0x4F,
-	24774 - 19968: jis0208<<14 | 0x37<<7 | 0x0E,
-	24775 - 19968: jis0208<<14 | 0x25<<7 | 0x36,
-	24776 - 19968: jis0212<<14 | 0x1D<<7 | 0x04,
-	24777 - 19968: jis0212<<14 | 0x1D<<7 | 0x05,
-	24778 - 19968: jis0212<<14 | 0x1D<<7 | 0x06,
-	24779 - 19968: jis0212<<14 | 0x1D<<7 | 0x07,
-	24782 - 19968: jis0212<<14 | 0x1D<<7 | 0x08,
-	24783 - 19968: jis0212<<14 | 0x1D<<7 | 0x09,
-	24785 - 19968: jis0208<<14 | 0x2E<<7 | 0x26,
-	24787 - 19968: jis0208<<14 | 0x37<<7 | 0x0A,
-	24788 - 19968: jis0212<<14 | 0x1D<<7 | 0x0A,
-	24789 - 19968: jis0208<<14 | 0x59<<7 | 0x05,
-	24792 - 19968: jis0208<<14 | 0x37<<7 | 0x10,
-	24793 - 19968: jis0212<<14 | 0x1D<<7 | 0x0C,
-	24794 - 19968: jis0208<<14 | 0x18<<7 | 0x5A,
-	24795 - 19968: jis0212<<14 | 0x1D<<7 | 0x0D,
-	24796 - 19968: jis0208<<14 | 0x1F<<7 | 0x2A,
-	24797 - 19968: jis0212<<14 | 0x1D<<7 | 0x0E,
-	24798 - 19968: jis0208<<14 | 0x59<<7 | 0x04,
-	24799 - 19968: jis0208<<14 | 0x0F<<7 | 0x33,
-	24800 - 19968: jis0208<<14 | 0x37<<7 | 0x09,
-	24801 - 19968: jis0208<<14 | 0x37<<7 | 0x07,
-	24802 - 19968: jis0212<<14 | 0x1D<<7 | 0x10,
-	24803 - 19968: jis0208<<14 | 0x20<<7 | 0x39,
-	24805 - 19968: jis0212<<14 | 0x1D<<7 | 0x11,
-	24807 - 19968: jis0208<<14 | 0x36<<7 | 0x5B,
-	24808 - 19968: jis0208<<14 | 0x1A<<7 | 0x13,
-	24816 - 19968: jis0208<<14 | 0x21<<7 | 0x25,
-	24817 - 19968: jis0208<<14 | 0x37<<7 | 0x1C,
-	24818 - 19968: jis0208<<14 | 0x59<<7 | 0x07,
-	24819 - 19968: jis0208<<14 | 0x20<<7 | 0x3A,
-	24820 - 19968: jis0208<<14 | 0x37<<7 | 0x17,
-	24821 - 19968: jis0212<<14 | 0x1D<<7 | 0x13,
-	24822 - 19968: jis0208<<14 | 0x37<<7 | 0x14,
-	24823 - 19968: jis0208<<14 | 0x37<<7 | 0x15,
-	24824 - 19968: jis0212<<14 | 0x1D<<7 | 0x14,
-	24825 - 19968: jis0208<<14 | 0x1B<<7 | 0x45,
-	24826 - 19968: jis0208<<14 | 0x37<<7 | 0x18,
-	24827 - 19968: jis0208<<14 | 0x37<<7 | 0x1B,
-	24828 - 19968: jis0212<<14 | 0x1D<<7 | 0x15,
-	24829 - 19968: jis0212<<14 | 0x1D<<7 | 0x16,
-	24832 - 19968: jis0208<<14 | 0x37<<7 | 0x16,
-	24833 - 19968: jis0208<<14 | 0x1C<<7 | 0x04,
-	24834 - 19968: jis0212<<14 | 0x1D<<7 | 0x17,
-	24835 - 19968: jis0208<<14 | 0x37<<7 | 0x19,
-	24838 - 19968: jis0208<<14 | 0x37<<7 | 0x13,
-	24839 - 19968: jis0212<<14 | 0x1D<<7 | 0x18,
-	24840 - 19968: jis0208<<14 | 0x2B<<7 | 0x5B,
-	24841 - 19968: jis0208<<14 | 0x2B<<7 | 0x5A,
-	24842 - 19968: jis0212<<14 | 0x1D<<7 | 0x19,
-	24844 - 19968: jis0212<<14 | 0x1D<<7 | 0x1A,
-	24845 - 19968: jis0208<<14 | 0x37<<7 | 0x1D,
-	24846 - 19968: jis0208<<14 | 0x37<<7 | 0x1E,
-	24847 - 19968: jis0208<<14 | 0x0F<<7 | 0x34,
-	24848 - 19968: jis0212<<14 | 0x1D<<7 | 0x1B,
-	24849 - 19968: jis0208<<14 | 0x59<<7 | 0x08,
-	24850 - 19968: jis0212<<14 | 0x1D<<7 | 0x1D,
-	24851 - 19968: jis0212<<14 | 0x1D<<7 | 0x1E,
-	24852 - 19968: jis0212<<14 | 0x1D<<7 | 0x1F,
-	24853 - 19968: jis0208<<14 | 0x37<<7 | 0x12,
-	24854 - 19968: jis0212<<14 | 0x1D<<7 | 0x20,
-	24855 - 19968: jis0212<<14 | 0x1D<<7 | 0x21,
-	24857 - 19968: jis0212<<14 | 0x1D<<7 | 0x22,
-	24858 - 19968: jis0208<<14 | 0x15<<7 | 0x51,
-	24859 - 19968: jis0208<<14 | 0x0F<<7 | 0x05,
-	24860 - 19968: jis0212<<14 | 0x1D<<7 | 0x23,
-	24862 - 19968: jis0212<<14 | 0x1D<<7 | 0x24,
-	24863 - 19968: jis0208<<14 | 0x13<<7 | 0x15,
-	24864 - 19968: jis0208<<14 | 0x59<<7 | 0x06,
-	24865 - 19968: jis0208<<14 | 0x37<<7 | 0x1A,
-	24866 - 19968: jis0212<<14 | 0x1D<<7 | 0x25,
-	24871 - 19968: jis0208<<14 | 0x37<<7 | 0x22,
-	24872 - 19968: jis0208<<14 | 0x37<<7 | 0x21,
-	24874 - 19968: jis0212<<14 | 0x1D<<7 | 0x26,
-	24875 - 19968: jis0212<<14 | 0x1D<<7 | 0x27,
-	24876 - 19968: jis0208<<14 | 0x37<<7 | 0x26,
-	24880 - 19968: jis0208<<14 | 0x59<<7 | 0x0A,
-	24881 - 19968: jis0212<<14 | 0x1D<<7 | 0x29,
-	24884 - 19968: jis0208<<14 | 0x37<<7 | 0x27,
-	24885 - 19968: jis0212<<14 | 0x1D<<7 | 0x2A,
-	24886 - 19968: jis0212<<14 | 0x1D<<7 | 0x2B,
-	24887 - 19968: jis0208<<14 | 0x59<<7 | 0x09,
-	24889 - 19968: jis0212<<14 | 0x1D<<7 | 0x2D,
-	24892 - 19968: jis0208<<14 | 0x37<<7 | 0x25,
-	24893 - 19968: jis0208<<14 | 0x37<<7 | 0x28,
-	24894 - 19968: jis0208<<14 | 0x37<<7 | 0x20,
-	24895 - 19968: jis0208<<14 | 0x37<<7 | 0x24,
-	24897 - 19968: jis0212<<14 | 0x1D<<7 | 0x2E,
-	24898 - 19968: jis0208<<14 | 0x37<<7 | 0x29,
-	24900 - 19968: jis0208<<14 | 0x37<<7 | 0x2A,
-	24901 - 19968: jis0212<<14 | 0x1D<<7 | 0x2F,
-	24902 - 19968: jis0212<<14 | 0x1D<<7 | 0x30,
-	24903 - 19968: jis0208<<14 | 0x37<<7 | 0x1F,
-	24904 - 19968: jis0208<<14 | 0x1A<<7 | 0x5B,
-	24905 - 19968: jis0212<<14 | 0x1D<<7 | 0x31,
-	24906 - 19968: jis0208<<14 | 0x37<<7 | 0x23,
-	24907 - 19968: jis0208<<14 | 0x21<<7 | 0x35,
-	24908 - 19968: jis0208<<14 | 0x18<<7 | 0x11,
-	24909 - 19968: jis0208<<14 | 0x37<<7 | 0x11,
-	24910 - 19968: jis0208<<14 | 0x1E<<7 | 0x14,
-	24915 - 19968: jis0208<<14 | 0x37<<7 | 0x37,
-	24917 - 19968: jis0208<<14 | 0x29<<7 | 0x48,
-	24920 - 19968: jis0208<<14 | 0x37<<7 | 0x2D,
-	24921 - 19968: jis0208<<14 | 0x37<<7 | 0x2E,
-	24922 - 19968: jis0208<<14 | 0x37<<7 | 0x2F,
-	24925 - 19968: jis0208<<14 | 0x37<<7 | 0x36,
-	24926 - 19968: jis0212<<14 | 0x1D<<7 | 0x32,
-	24927 - 19968: jis0208<<14 | 0x37<<7 | 0x35,
-	24928 - 19968: jis0212<<14 | 0x1D<<7 | 0x33,
-	24930 - 19968: jis0208<<14 | 0x2A<<7 | 0x5C,
-	24931 - 19968: jis0208<<14 | 0x13<<7 | 0x16,
-	24933 - 19968: jis0208<<14 | 0x37<<7 | 0x33,
-	24935 - 19968: jis0208<<14 | 0x16<<7 | 0x24,
-	24936 - 19968: jis0208<<14 | 0x12<<7 | 0x13,
-	24939 - 19968: jis0208<<14 | 0x37<<7 | 0x30,
-	24940 - 19968: jis0212<<14 | 0x1D<<7 | 0x34,
-	24942 - 19968: jis0208<<14 | 0x2D<<7 | 0x17,
-	24943 - 19968: jis0208<<14 | 0x37<<7 | 0x32,
-	24944 - 19968: jis0208<<14 | 0x0F<<7 | 0x35,
-	24945 - 19968: jis0208<<14 | 0x37<<7 | 0x34,
-	24946 - 19968: jis0212<<14 | 0x1D<<7 | 0x35,
-	24947 - 19968: jis0208<<14 | 0x37<<7 | 0x2B,
-	24948 - 19968: jis0208<<14 | 0x37<<7 | 0x31,
-	24949 - 19968: jis0208<<14 | 0x37<<7 | 0x38,
-	24950 - 19968: jis0208<<14 | 0x16<<7 | 0x23,
-	24951 - 19968: jis0208<<14 | 0x37<<7 | 0x2C,
-	24952 - 19968: jis0212<<14 | 0x1D<<7 | 0x36,
-	24955 - 19968: jis0212<<14 | 0x1D<<7 | 0x37,
-	24956 - 19968: jis0212<<14 | 0x1D<<7 | 0x38,
-	24958 - 19968: jis0208<<14 | 0x2C<<7 | 0x3C,
-	24959 - 19968: jis0212<<14 | 0x1D<<7 | 0x39,
-	24960 - 19968: jis0212<<14 | 0x1D<<7 | 0x3A,
-	24961 - 19968: jis0212<<14 | 0x1D<<7 | 0x3B,
-	24962 - 19968: jis0208<<14 | 0x2C<<7 | 0x0A,
-	24963 - 19968: jis0212<<14 | 0x1D<<7 | 0x3C,
-	24964 - 19968: jis0212<<14 | 0x1D<<7 | 0x3D,
-	24967 - 19968: jis0208<<14 | 0x37<<7 | 0x3B,
-	24970 - 19968: jis0208<<14 | 0x37<<7 | 0x3F,
-	24971 - 19968: jis0212<<14 | 0x1D<<7 | 0x3E,
-	24973 - 19968: jis0212<<14 | 0x1D<<7 | 0x3F,
-	24974 - 19968: jis0208<<14 | 0x20<<7 | 0x5D,
-	24976 - 19968: jis0208<<14 | 0x2D<<7 | 0x58,
-	24977 - 19968: jis0208<<14 | 0x37<<7 | 0x40,
-	24978 - 19968: jis0212<<14 | 0x1D<<7 | 0x40,
-	24979 - 19968: jis0212<<14 | 0x1D<<7 | 0x41,
-	24980 - 19968: jis0208<<14 | 0x37<<7 | 0x3D,
-	24982 - 19968: jis0208<<14 | 0x37<<7 | 0x3A,
-	24983 - 19968: jis0212<<14 | 0x1D<<7 | 0x42,
-	24984 - 19968: jis0208<<14 | 0x59<<7 | 0x0B,
-	24985 - 19968: jis0208<<14 | 0x37<<7 | 0x39,
-	24986 - 19968: jis0208<<14 | 0x37<<7 | 0x3E,
-	24988 - 19968: jis0212<<14 | 0x1D<<7 | 0x44,
-	24989 - 19968: jis0212<<14 | 0x1D<<7 | 0x45,
-	24991 - 19968: jis0212<<14 | 0x1D<<7 | 0x46,
-	24992 - 19968: jis0212<<14 | 0x1D<<7 | 0x47,
-	24996 - 19968: jis0208<<14 | 0x29<<7 | 0x0F,
-	24997 - 19968: jis0212<<14 | 0x1D<<7 | 0x48,
-	24999 - 19968: jis0208<<14 | 0x25<<7 | 0x13,
-	25000 - 19968: jis0212<<14 | 0x1D<<7 | 0x49,
-	25001 - 19968: jis0208<<14 | 0x16<<7 | 0x25,
-	25002 - 19968: jis0212<<14 | 0x1D<<7 | 0x4A,
-	25003 - 19968: jis0208<<14 | 0x37<<7 | 0x41,
-	25004 - 19968: jis0208<<14 | 0x37<<7 | 0x3C,
-	25005 - 19968: jis0212<<14 | 0x1D<<7 | 0x4B,
-	25006 - 19968: jis0208<<14 | 0x37<<7 | 0x42,
-	25010 - 19968: jis0208<<14 | 0x16<<7 | 0x5A,
-	25014 - 19968: jis0208<<14 | 0x11<<7 | 0x10,
-	25016 - 19968: jis0212<<14 | 0x1D<<7 | 0x4C,
-	25017 - 19968: jis0212<<14 | 0x1D<<7 | 0x4D,
-	25018 - 19968: jis0208<<14 | 0x37<<7 | 0x4A,
-	25020 - 19968: jis0212<<14 | 0x1D<<7 | 0x4E,
-	25022 - 19968: jis0208<<14 | 0x13<<7 | 0x17,
-	25024 - 19968: jis0212<<14 | 0x1D<<7 | 0x4F,
-	25025 - 19968: jis0212<<14 | 0x1D<<7 | 0x50,
-	25026 - 19968: jis0212<<14 | 0x1D<<7 | 0x51,
-	25027 - 19968: jis0208<<14 | 0x37<<7 | 0x48,
-	25030 - 19968: jis0208<<14 | 0x37<<7 | 0x49,
-	25031 - 19968: jis0208<<14 | 0x19<<7 | 0x08,
-	25032 - 19968: jis0208<<14 | 0x37<<7 | 0x47,
-	25033 - 19968: jis0208<<14 | 0x37<<7 | 0x45,
-	25034 - 19968: jis0208<<14 | 0x37<<7 | 0x44,
-	25035 - 19968: jis0208<<14 | 0x37<<7 | 0x4B,
-	25036 - 19968: jis0208<<14 | 0x37<<7 | 0x43,
-	25037 - 19968: jis0208<<14 | 0x37<<7 | 0x4D,
-	25038 - 19968: jis0212<<14 | 0x1D<<7 | 0x52,
-	25039 - 19968: jis0212<<14 | 0x1D<<7 | 0x53,
-	25040 - 19968: jis0208<<14 | 0x11<<7 | 0x5A,
-	25045 - 19968: jis0212<<14 | 0x1D<<7 | 0x54,
-	25052 - 19968: jis0212<<14 | 0x1D<<7 | 0x55,
-	25053 - 19968: jis0212<<14 | 0x1D<<7 | 0x56,
-	25054 - 19968: jis0212<<14 | 0x1D<<7 | 0x57,
-	25055 - 19968: jis0212<<14 | 0x1D<<7 | 0x58,
-	25057 - 19968: jis0212<<14 | 0x1D<<7 | 0x59,
-	25058 - 19968: jis0212<<14 | 0x1D<<7 | 0x5A,
-	25059 - 19968: jis0208<<14 | 0x37<<7 | 0x4F,
-	25061 - 19968: jis0212<<14 | 0x1D<<7 | 0x5D,
-	25062 - 19968: jis0208<<14 | 0x37<<7 | 0x4E,
-	25063 - 19968: jis0212<<14 | 0x1D<<7 | 0x5B,
-	25065 - 19968: jis0212<<14 | 0x1D<<7 | 0x5C,
-	25068 - 19968: jis0212<<14 | 0x1E<<7 | 0x00,
-	25069 - 19968: jis0212<<14 | 0x1E<<7 | 0x01,
-	25071 - 19968: jis0212<<14 | 0x1E<<7 | 0x02,
-	25074 - 19968: jis0208<<14 | 0x23<<7 | 0x07,
-	25076 - 19968: jis0208<<14 | 0x37<<7 | 0x52,
-	25078 - 19968: jis0208<<14 | 0x37<<7 | 0x50,
-	25079 - 19968: jis0208<<14 | 0x37<<7 | 0x46,
-	25080 - 19968: jis0208<<14 | 0x16<<7 | 0x5B,
-	25082 - 19968: jis0208<<14 | 0x37<<7 | 0x51,
-	25084 - 19968: jis0208<<14 | 0x37<<7 | 0x55,
-	25085 - 19968: jis0208<<14 | 0x37<<7 | 0x54,
-	25086 - 19968: jis0208<<14 | 0x37<<7 | 0x56,
-	25087 - 19968: jis0208<<14 | 0x37<<7 | 0x53,
-	25088 - 19968: jis0208<<14 | 0x37<<7 | 0x57,
-	25089 - 19968: jis0212<<14 | 0x1E<<7 | 0x03,
-	25091 - 19968: jis0212<<14 | 0x1E<<7 | 0x04,
-	25092 - 19968: jis0212<<14 | 0x1E<<7 | 0x05,
-	25095 - 19968: jis0212<<14 | 0x1E<<7 | 0x06,
-	25096 - 19968: jis0208<<14 | 0x37<<7 | 0x58,
-	25097 - 19968: jis0208<<14 | 0x37<<7 | 0x59,
-	25098 - 19968: jis0208<<14 | 0x29<<7 | 0x49,
-	25100 - 19968: jis0208<<14 | 0x37<<7 | 0x5B,
-	25101 - 19968: jis0208<<14 | 0x37<<7 | 0x5A,
-	25102 - 19968: jis0208<<14 | 0x1C<<7 | 0x1E,
-	25104 - 19968: jis0208<<14 | 0x1F<<7 | 0x0D,
-	25105 - 19968: jis0208<<14 | 0x11<<7 | 0x45,
-	25106 - 19968: jis0208<<14 | 0x11<<7 | 0x5B,
-	25107 - 19968: jis0208<<14 | 0x59<<7 | 0x0C,
-	25108 - 19968: jis0208<<14 | 0x37<<7 | 0x5C,
-	25109 - 19968: jis0212<<14 | 0x1E<<7 | 0x08,
-	25110 - 19968: jis0208<<14 | 0x0F<<7 | 0x1E,
-	25114 - 19968: jis0208<<14 | 0x1F<<7 | 0x2B,
-	25115 - 19968: jis0208<<14 | 0x37<<7 | 0x5D,
-	25116 - 19968: jis0212<<14 | 0x1E<<7 | 0x09,
-	25117 - 19968: jis0208<<14 | 0x4B<<7 | 0x22,
-	25118 - 19968: jis0208<<14 | 0x38<<7 | 0x00,
-	25119 - 19968: jis0208<<14 | 0x16<<7 | 0x40,
-	25120 - 19968: jis0212<<14 | 0x1E<<7 | 0x0A,
-	25121 - 19968: jis0208<<14 | 0x38<<7 | 0x01,
-	25122 - 19968: jis0212<<14 | 0x1E<<7 | 0x0B,
-	25123 - 19968: jis0212<<14 | 0x1E<<7 | 0x0C,
-	25126 - 19968: jis0208<<14 | 0x1F<<7 | 0x4E,
-	25127 - 19968: jis0212<<14 | 0x1E<<7 | 0x0D,
-	25129 - 19968: jis0212<<14 | 0x1E<<7 | 0x0E,
-	25130 - 19968: jis0208<<14 | 0x38<<7 | 0x02,
-	25131 - 19968: jis0212<<14 | 0x1E<<7 | 0x0F,
-	25134 - 19968: jis0208<<14 | 0x38<<7 | 0x03,
-	25135 - 19968: jis0208<<14 | 0x14<<7 | 0x19,
-	25136 - 19968: jis0208<<14 | 0x38<<7 | 0x04,
-	25138 - 19968: jis0208<<14 | 0x38<<7 | 0x05,
-	25139 - 19968: jis0208<<14 | 0x38<<7 | 0x06,
-	25140 - 19968: jis0208<<14 | 0x21<<7 | 0x36,
-	25144 - 19968: jis0208<<14 | 0x17<<7 | 0x2C,
-	25145 - 19968: jis0212<<14 | 0x1E<<7 | 0x10,
-	25147 - 19968: jis0208<<14 | 0x2B<<7 | 0x40,
-	25149 - 19968: jis0212<<14 | 0x1E<<7 | 0x11,
-	25151 - 19968: jis0208<<14 | 0x2A<<7 | 0x1B,
-	25152 - 19968: jis0208<<14 | 0x1C<<7 | 0x49,
-	25153 - 19968: jis0208<<14 | 0x38<<7 | 0x07,
-	25154 - 19968: jis0212<<14 | 0x1E<<7 | 0x12,
-	25155 - 19968: jis0212<<14 | 0x1E<<7 | 0x13,
-	25156 - 19968: jis0212<<14 | 0x1E<<7 | 0x14,
-	25158 - 19968: jis0212<<14 | 0x1E<<7 | 0x15,
-	25159 - 19968: jis0208<<14 | 0x1F<<7 | 0x4F,
-	25160 - 19968: jis0208<<14 | 0x4D<<7 | 0x1C,
-	25161 - 19968: jis0208<<14 | 0x27<<7 | 0x41,
-	25163 - 19968: jis0208<<14 | 0x1B<<7 | 0x49,
-	25164 - 19968: jis0212<<14 | 0x1E<<7 | 0x16,
-	25165 - 19968: jis0208<<14 | 0x19<<7 | 0x2C,
-	25166 - 19968: jis0208<<14 | 0x38<<7 | 0x08,
-	25168 - 19968: jis0212<<14 | 0x1E<<7 | 0x17,
-	25169 - 19968: jis0212<<14 | 0x1E<<7 | 0x18,
-	25170 - 19968: jis0212<<14 | 0x1E<<7 | 0x19,
-	25171 - 19968: jis0208<<14 | 0x21<<7 | 0x26,
-	25172 - 19968: jis0212<<14 | 0x1E<<7 | 0x1A,
-	25173 - 19968: jis0208<<14 | 0x29<<7 | 0x06,
-	25174 - 19968: jis0212<<14 | 0x1E<<7 | 0x1B,
-	25176 - 19968: jis0208<<14 | 0x21<<7 | 0x50,
-	25178 - 19968: jis0212<<14 | 0x1E<<7 | 0x1C,
-	25179 - 19968: jis0208<<14 | 0x38<<7 | 0x0B,
-	25180 - 19968: jis0212<<14 | 0x1E<<7 | 0x1D,
-	25182 - 19968: jis0208<<14 | 0x38<<7 | 0x09,
-	25184 - 19968: jis0208<<14 | 0x38<<7 | 0x0C,
-	25187 - 19968: jis0208<<14 | 0x38<<7 | 0x0A,
-	25188 - 19968: jis0212<<14 | 0x1E<<7 | 0x1E,
-	25192 - 19968: jis0208<<14 | 0x38<<7 | 0x0D,
-	25197 - 19968: jis0212<<14 | 0x1E<<7 | 0x1F,
-	25198 - 19968: jis0208<<14 | 0x29<<7 | 0x10,
-	25199 - 19968: jis0212<<14 | 0x1E<<7 | 0x20,
-	25201 - 19968: jis0208<<14 | 0x0F<<7 | 0x16,
-	25203 - 19968: jis0212<<14 | 0x1E<<7 | 0x21,
-	25206 - 19968: jis0208<<14 | 0x28<<7 | 0x3D,
-	25209 - 19968: jis0208<<14 | 0x27<<7 | 0x42,
-	25210 - 19968: jis0212<<14 | 0x1E<<7 | 0x22,
-	25212 - 19968: jis0208<<14 | 0x38<<7 | 0x0E,
-	25213 - 19968: jis0212<<14 | 0x1E<<7 | 0x23,
-	25214 - 19968: jis0208<<14 | 0x38<<7 | 0x11,
-	25215 - 19968: jis0208<<14 | 0x1D<<7 | 0x14,
-	25216 - 19968: jis0208<<14 | 0x14<<7 | 0x1A,
-	25218 - 19968: jis0208<<14 | 0x38<<7 | 0x0F,
-	25219 - 19968: jis0208<<14 | 0x38<<7 | 0x16,
-	25220 - 19968: jis0208<<14 | 0x1D<<7 | 0x15,
-	25225 - 19968: jis0208<<14 | 0x38<<7 | 0x10,
-	25226 - 19968: jis0208<<14 | 0x26<<7 | 0x23,
-	25229 - 19968: jis0212<<14 | 0x1E<<7 | 0x24,
-	25230 - 19968: jis0212<<14 | 0x1E<<7 | 0x25,
-	25231 - 19968: jis0212<<14 | 0x1E<<7 | 0x26,
-	25232 - 19968: jis0212<<14 | 0x1E<<7 | 0x27,
-	25233 - 19968: jis0208<<14 | 0x2C<<7 | 0x3D,
-	25234 - 19968: jis0208<<14 | 0x38<<7 | 0x12,
-	25235 - 19968: jis0208<<14 | 0x38<<7 | 0x13,
-	25236 - 19968: jis0208<<14 | 0x38<<7 | 0x17,
-	25237 - 19968: jis0208<<14 | 0x24<<7 | 0x49,
-	25238 - 19968: jis0208<<14 | 0x38<<7 | 0x14,
-	25239 - 19968: jis0208<<14 | 0x18<<7 | 0x12,
-	25240 - 19968: jis0208<<14 | 0x1F<<7 | 0x3D,
-	25243 - 19968: jis0208<<14 | 0x38<<7 | 0x25,
-	25244 - 19968: jis0208<<14 | 0x27<<7 | 0x13,
-	25246 - 19968: jis0208<<14 | 0x21<<7 | 0x51,
-	25254 - 19968: jis0208<<14 | 0x59<<7 | 0x0D,
-	25256 - 19968: jis0212<<14 | 0x1E<<7 | 0x29,
-	25259 - 19968: jis0208<<14 | 0x27<<7 | 0x43,
-	25260 - 19968: jis0208<<14 | 0x39<<7 | 0x0C,
-	25265 - 19968: jis0208<<14 | 0x29<<7 | 0x59,
-	25267 - 19968: jis0212<<14 | 0x1E<<7 | 0x2A,
-	25269 - 19968: jis0208<<14 | 0x23<<7 | 0x50,
-	25270 - 19968: jis0212<<14 | 0x1E<<7 | 0x2B,
-	25271 - 19968: jis0212<<14 | 0x1E<<7 | 0x2C,
-	25273 - 19968: jis0208<<14 | 0x2A<<7 | 0x54,
-	25274 - 19968: jis0212<<14 | 0x1E<<7 | 0x2D,
-	25275 - 19968: jis0208<<14 | 0x38<<7 | 0x1A,
-	25276 - 19968: jis0208<<14 | 0x11<<7 | 0x00,
-	25277 - 19968: jis0208<<14 | 0x22<<7 | 0x49,
-	25278 - 19968: jis0212<<14 | 0x1E<<7 | 0x2E,
-	25279 - 19968: jis0212<<14 | 0x1E<<7 | 0x2F,
-	25282 - 19968: jis0208<<14 | 0x38<<7 | 0x23,
-	25284 - 19968: jis0212<<14 | 0x1E<<7 | 0x30,
-	25285 - 19968: jis0208<<14 | 0x22<<7 | 0x13,
-	25286 - 19968: jis0208<<14 | 0x38<<7 | 0x1D,
-	25287 - 19968: jis0208<<14 | 0x38<<7 | 0x24,
-	25288 - 19968: jis0208<<14 | 0x38<<7 | 0x1F,
-	25289 - 19968: jis0208<<14 | 0x38<<7 | 0x26,
-	25290 - 19968: jis0208<<14 | 0x38<<7 | 0x22,
-	25292 - 19968: jis0208<<14 | 0x38<<7 | 0x21,
-	25293 - 19968: jis0208<<14 | 0x26<<7 | 0x4E,
-	25294 - 19968: jis0212<<14 | 0x1E<<7 | 0x31,
-	25295 - 19968: jis0208<<14 | 0x38<<7 | 0x1B,
-	25296 - 19968: jis0208<<14 | 0x11<<7 | 0x5C,
-	25297 - 19968: jis0208<<14 | 0x38<<7 | 0x19,
-	25298 - 19968: jis0208<<14 | 0x14<<7 | 0x50,
-	25299 - 19968: jis0208<<14 | 0x21<<7 | 0x52,
-	25300 - 19968: jis0208<<14 | 0x38<<7 | 0x15,
-	25301 - 19968: jis0212<<14 | 0x1E<<7 | 0x32,
-	25302 - 19968: jis0212<<14 | 0x1E<<7 | 0x33,
-	25303 - 19968: jis0208<<14 | 0x38<<7 | 0x18,
-	25304 - 19968: jis0208<<14 | 0x18<<7 | 0x13,
-	25305 - 19968: jis0208<<14 | 0x1F<<7 | 0x3A,
-	25306 - 19968: jis0212<<14 | 0x1E<<7 | 0x34,
-	25307 - 19968: jis0208<<14 | 0x1D<<7 | 0x16,
-	25308 - 19968: jis0208<<14 | 0x38<<7 | 0x20,
-	25309 - 19968: jis0208<<14 | 0x26<<7 | 0x31,
-	25312 - 19968: jis0208<<14 | 0x14<<7 | 0x51,
-	25313 - 19968: jis0208<<14 | 0x12<<7 | 0x27,
-	25322 - 19968: jis0212<<14 | 0x1E<<7 | 0x35,
-	25324 - 19968: jis0208<<14 | 0x12<<7 | 0x46,
-	25325 - 19968: jis0208<<14 | 0x1E<<7 | 0x00,
-	25326 - 19968: jis0208<<14 | 0x38<<7 | 0x28,
-	25327 - 19968: jis0208<<14 | 0x38<<7 | 0x2D,
-	25329 - 19968: jis0208<<14 | 0x38<<7 | 0x29,
-	25330 - 19968: jis0212<<14 | 0x1E<<7 | 0x36,
-	25331 - 19968: jis0208<<14 | 0x16<<7 | 0x5C,
-	25332 - 19968: jis0212<<14 | 0x1E<<7 | 0x37,
-	25333 - 19968: jis0208<<14 | 0x38<<7 | 0x2E,
-	25334 - 19968: jis0208<<14 | 0x1A<<7 | 0x01,
-	25335 - 19968: jis0208<<14 | 0x18<<7 | 0x48,
-	25340 - 19968: jis0212<<14 | 0x1E<<7 | 0x38,
-	25341 - 19968: jis0212<<14 | 0x1E<<7 | 0x39,
-	25342 - 19968: jis0208<<14 | 0x1C<<7 | 0x05,
-	25343 - 19968: jis0208<<14 | 0x38<<7 | 0x1C,
-	25345 - 19968: jis0208<<14 | 0x1A<<7 | 0x5C,
-	25346 - 19968: jis0208<<14 | 0x38<<7 | 0x2B,
-	25347 - 19968: jis0212<<14 | 0x1E<<7 | 0x3A,
-	25348 - 19968: jis0212<<14 | 0x1E<<7 | 0x3B,
-	25351 - 19968: jis0208<<14 | 0x1A<<7 | 0x37,
-	25352 - 19968: jis0208<<14 | 0x38<<7 | 0x2C,
-	25353 - 19968: jis0208<<14 | 0x0F<<7 | 0x23,
-	25354 - 19968: jis0212<<14 | 0x1E<<7 | 0x3C,
-	25355 - 19968: jis0212<<14 | 0x1E<<7 | 0x3D,
-	25356 - 19968: jis0208<<14 | 0x38<<7 | 0x27,
-	25357 - 19968: jis0212<<14 | 0x1E<<7 | 0x3E,
-	25360 - 19968: jis0212<<14 | 0x1E<<7 | 0x3F,
-	25361 - 19968: jis0208<<14 | 0x23<<7 | 0x08,
-	25363 - 19968: jis0212<<14 | 0x1E<<7 | 0x40,
-	25366 - 19968: jis0212<<14 | 0x1E<<7 | 0x41,
-	25368 - 19968: jis0212<<14 | 0x1E<<7 | 0x42,
-	25369 - 19968: jis0208<<14 | 0x14<<7 | 0x52,
-	25375 - 19968: jis0208<<14 | 0x15<<7 | 0x13,
-	25383 - 19968: jis0208<<14 | 0x38<<7 | 0x2A,
-	25384 - 19968: jis0208<<14 | 0x0F<<7 | 0x06,
-	25385 - 19968: jis0212<<14 | 0x1E<<7 | 0x43,
-	25386 - 19968: jis0212<<14 | 0x1E<<7 | 0x44,
-	25387 - 19968: jis0208<<14 | 0x19<<7 | 0x22,
-	25389 - 19968: jis0212<<14 | 0x1E<<7 | 0x45,
-	25391 - 19968: jis0208<<14 | 0x1E<<7 | 0x15,
-	25397 - 19968: jis0212<<14 | 0x1E<<7 | 0x46,
-	25398 - 19968: jis0212<<14 | 0x1E<<7 | 0x47,
-	25401 - 19968: jis0212<<14 | 0x1E<<7 | 0x48,
-	25402 - 19968: jis0208<<14 | 0x23<<7 | 0x51,
-	25404 - 19968: jis0212<<14 | 0x1E<<7 | 0x49,
-	25405 - 19968: jis0208<<14 | 0x27<<7 | 0x33,
-	25406 - 19968: jis0208<<14 | 0x38<<7 | 0x30,
-	25407 - 19968: jis0208<<14 | 0x20<<7 | 0x3D,
-	25409 - 19968: jis0212<<14 | 0x1E<<7 | 0x4A,
-	25410 - 19968: jis0212<<14 | 0x1E<<7 | 0x4B,
-	25411 - 19968: jis0212<<14 | 0x1E<<7 | 0x4C,
-	25412 - 19968: jis0212<<14 | 0x1E<<7 | 0x4D,
-	25414 - 19968: jis0212<<14 | 0x1E<<7 | 0x4E,
-	25417 - 19968: jis0208<<14 | 0x21<<7 | 0x09,
-	25418 - 19968: jis0212<<14 | 0x1E<<7 | 0x4F,
-	25419 - 19968: jis0212<<14 | 0x1E<<7 | 0x50,
-	25420 - 19968: jis0208<<14 | 0x1A<<7 | 0x0A,
-	25421 - 19968: jis0208<<14 | 0x38<<7 | 0x31,
-	25422 - 19968: jis0212<<14 | 0x1E<<7 | 0x51,
-	25423 - 19968: jis0208<<14 | 0x38<<7 | 0x33,
-	25424 - 19968: jis0208<<14 | 0x38<<7 | 0x2F,
-	25426 - 19968: jis0212<<14 | 0x1E<<7 | 0x52,
-	25427 - 19968: jis0212<<14 | 0x1E<<7 | 0x53,
-	25428 - 19968: jis0212<<14 | 0x1E<<7 | 0x54,
-	25429 - 19968: jis0208<<14 | 0x29<<7 | 0x40,
-	25431 - 19968: jis0208<<14 | 0x23<<7 | 0x1C,
-	25432 - 19968: jis0212<<14 | 0x1E<<7 | 0x55,
-	25435 - 19968: jis0212<<14 | 0x1E<<7 | 0x56,
-	25436 - 19968: jis0208<<14 | 0x20<<7 | 0x3B,
-	25445 - 19968: jis0212<<14 | 0x1E<<7 | 0x57,
-	25446 - 19968: jis0212<<14 | 0x1E<<7 | 0x58,
-	25447 - 19968: jis0208<<14 | 0x29<<7 | 0x5A,
-	25448 - 19968: jis0208<<14 | 0x1B<<7 | 0x2D,
-	25449 - 19968: jis0208<<14 | 0x38<<7 | 0x3F,
-	25451 - 19968: jis0208<<14 | 0x38<<7 | 0x3E,
-	25452 - 19968: jis0212<<14 | 0x1E<<7 | 0x59,
-	25453 - 19968: jis0212<<14 | 0x1E<<7 | 0x5A,
-	25454 - 19968: jis0208<<14 | 0x1E<<7 | 0x57,
-	25457 - 19968: jis0212<<14 | 0x1E<<7 | 0x5B,
-	25458 - 19968: jis0208<<14 | 0x16<<7 | 0x5D,
-	25460 - 19968: jis0212<<14 | 0x1E<<7 | 0x5C,
-	25461 - 19968: jis0212<<14 | 0x1E<<7 | 0x5D,
-	25462 - 19968: jis0208<<14 | 0x38<<7 | 0x38,
-	25463 - 19968: jis0208<<14 | 0x1D<<7 | 0x18,
-	25464 - 19968: jis0212<<14 | 0x1F<<7 | 0x00,
-	25466 - 19968: jis0208<<14 | 0x25<<7 | 0x47,
-	25467 - 19968: jis0208<<14 | 0x26<<7 | 0x10,
-	25468 - 19968: jis0212<<14 | 0x1F<<7 | 0x01,
-	25469 - 19968: jis0212<<14 | 0x1F<<7 | 0x02,
-	25471 - 19968: jis0212<<14 | 0x1F<<7 | 0x03,
-	25472 - 19968: jis0208<<14 | 0x38<<7 | 0x36,
-	25474 - 19968: jis0212<<14 | 0x1F<<7 | 0x04,
-	25475 - 19968: jis0208<<14 | 0x20<<7 | 0x3C,
-	25476 - 19968: jis0212<<14 | 0x1F<<7 | 0x05,
-	25479 - 19968: jis0212<<14 | 0x1F<<7 | 0x06,
-	25480 - 19968: jis0208<<14 | 0x1B<<7 | 0x57,
-	25481 - 19968: jis0208<<14 | 0x38<<7 | 0x3B,
-	25482 - 19968: jis0212<<14 | 0x1F<<7 | 0x07,
-	25484 - 19968: jis0208<<14 | 0x1D<<7 | 0x17,
-	25486 - 19968: jis0208<<14 | 0x38<<7 | 0x35,
-	25487 - 19968: jis0208<<14 | 0x38<<7 | 0x3A,
-	25488 - 19968: jis0212<<14 | 0x1F<<7 | 0x08,
-	25490 - 19968: jis0208<<14 | 0x26<<7 | 0x32,
-	25492 - 19968: jis0212<<14 | 0x1F<<7 | 0x09,
-	25493 - 19968: jis0212<<14 | 0x1F<<7 | 0x0A,
-	25494 - 19968: jis0208<<14 | 0x38<<7 | 0x34,
-	25496 - 19968: jis0208<<14 | 0x16<<7 | 0x00,
-	25497 - 19968: jis0212<<14 | 0x1F<<7 | 0x0B,
-	25498 - 19968: jis0212<<14 | 0x1F<<7 | 0x0C,
-	25499 - 19968: jis0208<<14 | 0x12<<7 | 0x3C,
-	25502 - 19968: jis0212<<14 | 0x1F<<7 | 0x0D,
-	25503 - 19968: jis0208<<14 | 0x38<<7 | 0x3C,
-	25504 - 19968: jis0208<<14 | 0x2D<<7 | 0x0A,
-	25505 - 19968: jis0208<<14 | 0x19<<7 | 0x2D,
-	25506 - 19968: jis0208<<14 | 0x22<<7 | 0x14,
-	25507 - 19968: jis0208<<14 | 0x38<<7 | 0x39,
-	25508 - 19968: jis0212<<14 | 0x1F<<7 | 0x0E,
-	25509 - 19968: jis0208<<14 | 0x1F<<7 | 0x3B,
-	25510 - 19968: jis0212<<14 | 0x1F<<7 | 0x0F,
-	25511 - 19968: jis0208<<14 | 0x18<<7 | 0x14,
-	25512 - 19968: jis0208<<14 | 0x1E<<7 | 0x43,
-	25513 - 19968: jis0208<<14 | 0x10<<7 | 0x45,
-	25514 - 19968: jis0208<<14 | 0x20<<7 | 0x1B,
-	25515 - 19968: jis0208<<14 | 0x38<<7 | 0x37,
-	25516 - 19968: jis0208<<14 | 0x14<<7 | 0x24,
-	25517 - 19968: jis0212<<14 | 0x1F<<7 | 0x10,
-	25518 - 19968: jis0212<<14 | 0x1F<<7 | 0x11,
-	25519 - 19968: jis0212<<14 | 0x1F<<7 | 0x12,
-	25522 - 19968: jis0208<<14 | 0x16<<7 | 0x26,
-	25524 - 19968: jis0208<<14 | 0x23<<7 | 0x2E,
-	25525 - 19968: jis0208<<14 | 0x38<<7 | 0x3D,
-	25531 - 19968: jis0208<<14 | 0x20<<7 | 0x3E,
-	25533 - 19968: jis0212<<14 | 0x1F<<7 | 0x13,
-	25534 - 19968: jis0208<<14 | 0x38<<7 | 0x40,
-	25536 - 19968: jis0208<<14 | 0x38<<7 | 0x42,
-	25537 - 19968: jis0212<<14 | 0x1F<<7 | 0x14,
-	25539 - 19968: jis0208<<14 | 0x21<<7 | 0x16,
-	25540 - 19968: jis0208<<14 | 0x38<<7 | 0x48,
-	25541 - 19968: jis0212<<14 | 0x1F<<7 | 0x15,
-	25542 - 19968: jis0208<<14 | 0x38<<7 | 0x43,
-	25544 - 19968: jis0212<<14 | 0x1F<<7 | 0x16,
-	25545 - 19968: jis0208<<14 | 0x38<<7 | 0x45,
-	25550 - 19968: jis0212<<14 | 0x1F<<7 | 0x17,
-	25551 - 19968: jis0208<<14 | 0x28<<7 | 0x20,
-	25552 - 19968: jis0208<<14 | 0x23<<7 | 0x52,
-	25553 - 19968: jis0212<<14 | 0x1F<<7 | 0x18,
-	25554 - 19968: jis0208<<14 | 0x38<<7 | 0x46,
-	25555 - 19968: jis0212<<14 | 0x1F<<7 | 0x19,
-	25556 - 19968: jis0212<<14 | 0x1F<<7 | 0x1A,
-	25557 - 19968: jis0212<<14 | 0x1F<<7 | 0x1B,
-	25558 - 19968: jis0208<<14 | 0x2C<<7 | 0x0B,
-	25562 - 19968: jis0208<<14 | 0x2C<<7 | 0x27,
-	25563 - 19968: jis0208<<14 | 0x13<<7 | 0x18,
-	25564 - 19968: jis0212<<14 | 0x1F<<7 | 0x1C,
-	25568 - 19968: jis0212<<14 | 0x1F<<7 | 0x1D,
-	25569 - 19968: jis0208<<14 | 0x0F<<7 | 0x0D,
-	25571 - 19968: jis0208<<14 | 0x38<<7 | 0x44,
-	25573 - 19968: jis0212<<14 | 0x1F<<7 | 0x1E,
-	25577 - 19968: jis0208<<14 | 0x38<<7 | 0x41,
-	25578 - 19968: jis0212<<14 | 0x1F<<7 | 0x1F,
-	25580 - 19968: jis0212<<14 | 0x1F<<7 | 0x20,
-	25582 - 19968: jis0208<<14 | 0x13<<7 | 0x57,
-	25586 - 19968: jis0212<<14 | 0x1F<<7 | 0x21,
-	25587 - 19968: jis0212<<14 | 0x1F<<7 | 0x22,
-	25588 - 19968: jis0208<<14 | 0x10<<7 | 0x46,
-	25589 - 19968: jis0208<<14 | 0x59<<7 | 0x0E,
-	25590 - 19968: jis0208<<14 | 0x38<<7 | 0x47,
-	25592 - 19968: jis0212<<14 | 0x1F<<7 | 0x24,
-	25593 - 19968: jis0212<<14 | 0x1F<<7 | 0x25,
-	25594 - 19968: jis0208<<14 | 0x2C<<7 | 0x28,
-	25606 - 19968: jis0208<<14 | 0x38<<7 | 0x4B,
-	25609 - 19968: jis0212<<14 | 0x1F<<7 | 0x26,
-	25610 - 19968: jis0212<<14 | 0x1F<<7 | 0x27,
-	25613 - 19968: jis0208<<14 | 0x21<<7 | 0x1A,
-	25615 - 19968: jis0208<<14 | 0x38<<7 | 0x52,
-	25616 - 19968: jis0212<<14 | 0x1F<<7 | 0x28,
-	25618 - 19968: jis0212<<14 | 0x1F<<7 | 0x29,
-	25619 - 19968: jis0208<<14 | 0x38<<7 | 0x4C,
-	25620 - 19968: jis0212<<14 | 0x1F<<7 | 0x2A,
-	25622 - 19968: jis0208<<14 | 0x38<<7 | 0x49,
-	25623 - 19968: jis0208<<14 | 0x38<<7 | 0x50,
-	25624 - 19968: jis0212<<14 | 0x1F<<7 | 0x2B,
-	25628 - 19968: jis0208<<14 | 0x38<<7 | 0x32,
-	25630 - 19968: jis0212<<14 | 0x1F<<7 | 0x2C,
-	25632 - 19968: jis0212<<14 | 0x1F<<7 | 0x2D,
-	25634 - 19968: jis0212<<14 | 0x1F<<7 | 0x2E,
-	25636 - 19968: jis0212<<14 | 0x1F<<7 | 0x2F,
-	25637 - 19968: jis0212<<14 | 0x1F<<7 | 0x30,
-	25638 - 19968: jis0208<<14 | 0x38<<7 | 0x4D,
-	25640 - 19968: jis0208<<14 | 0x38<<7 | 0x51,
-	25641 - 19968: jis0212<<14 | 0x1F<<7 | 0x31,
-	25642 - 19968: jis0212<<14 | 0x1F<<7 | 0x32,
-	25644 - 19968: jis0208<<14 | 0x27<<7 | 0x21,
-	25645 - 19968: jis0208<<14 | 0x24<<7 | 0x4A,
-	25647 - 19968: jis0212<<14 | 0x1F<<7 | 0x33,
-	25648 - 19968: jis0212<<14 | 0x1F<<7 | 0x34,
-	25652 - 19968: jis0208<<14 | 0x38<<7 | 0x4A,
-	25653 - 19968: jis0212<<14 | 0x1F<<7 | 0x35,
-	25654 - 19968: jis0208<<14 | 0x38<<7 | 0x4E,
-	25658 - 19968: jis0208<<14 | 0x16<<7 | 0x27,
-	25661 - 19968: jis0212<<14 | 0x1F<<7 | 0x36,
-	25662 - 19968: jis0208<<14 | 0x19<<7 | 0x50,
-	25663 - 19968: jis0212<<14 | 0x1F<<7 | 0x37,
-	25666 - 19968: jis0208<<14 | 0x1F<<7 | 0x3C,
-	25675 - 19968: jis0212<<14 | 0x1F<<7 | 0x38,
-	25678 - 19968: jis0208<<14 | 0x38<<7 | 0x56,
-	25679 - 19968: jis0212<<14 | 0x1F<<7 | 0x39,
-	25681 - 19968: jis0212<<14 | 0x1F<<7 | 0x3A,
-	25682 - 19968: jis0212<<14 | 0x1F<<7 | 0x3B,
-	25683 - 19968: jis0212<<14 | 0x1F<<7 | 0x3C,
-	25684 - 19968: jis0212<<14 | 0x1F<<7 | 0x3D,
-	25688 - 19968: jis0208<<14 | 0x24<<7 | 0x05,
-	25690 - 19968: jis0212<<14 | 0x1F<<7 | 0x3E,
-	25691 - 19968: jis0212<<14 | 0x1F<<7 | 0x3F,
-	25692 - 19968: jis0212<<14 | 0x1F<<7 | 0x40,
-	25693 - 19968: jis0212<<14 | 0x1F<<7 | 0x41,
-	25695 - 19968: jis0212<<14 | 0x1F<<7 | 0x42,
-	25696 - 19968: jis0208<<14 | 0x59<<7 | 0x0F,
-	25697 - 19968: jis0212<<14 | 0x1F<<7 | 0x44,
-	25699 - 19968: jis0212<<14 | 0x1F<<7 | 0x45,
-	25703 - 19968: jis0208<<14 | 0x38<<7 | 0x53,
-	25705 - 19968: jis0208<<14 | 0x2A<<7 | 0x3F,
-	25709 - 19968: jis0212<<14 | 0x1F<<7 | 0x46,
-	25711 - 19968: jis0208<<14 | 0x38<<7 | 0x54,
-	25715 - 19968: jis0212<<14 | 0x1F<<7 | 0x47,
-	25716 - 19968: jis0212<<14 | 0x1F<<7 | 0x48,
-	25718 - 19968: jis0208<<14 | 0x38<<7 | 0x55,
-	25720 - 19968: jis0208<<14 | 0x2B<<7 | 0x2D,
-	25722 - 19968: jis0208<<14 | 0x1F<<7 | 0x01,
-	25723 - 19968: jis0212<<14 | 0x1F<<7 | 0x49,
-	25725 - 19968: jis0212<<14 | 0x1F<<7 | 0x4A,
-	25731 - 19968: jis0208<<14 | 0x16<<7 | 0x41,
-	25733 - 19968: jis0212<<14 | 0x1F<<7 | 0x4B,
-	25735 - 19968: jis0212<<14 | 0x1F<<7 | 0x4C,
-	25736 - 19968: jis0208<<14 | 0x38<<7 | 0x5C,
-	25743 - 19968: jis0212<<14 | 0x1F<<7 | 0x4D,
-	25744 - 19968: jis0212<<14 | 0x1F<<7 | 0x4E,
-	25745 - 19968: jis0212<<14 | 0x1F<<7 | 0x4F,
-	25746 - 19968: jis0208<<14 | 0x1A<<7 | 0x14,
-	25747 - 19968: jis0208<<14 | 0x38<<7 | 0x59,
-	25749 - 19968: jis0208<<14 | 0x38<<7 | 0x58,
-	25752 - 19968: jis0212<<14 | 0x1F<<7 | 0x50,
-	25753 - 19968: jis0212<<14 | 0x1F<<7 | 0x51,
-	25754 - 19968: jis0208<<14 | 0x26<<7 | 0x11,
-	25755 - 19968: jis0212<<14 | 0x1F<<7 | 0x52,
-	25757 - 19968: jis0208<<14 | 0x59<<7 | 0x10,
-	25758 - 19968: jis0208<<14 | 0x25<<7 | 0x14,
-	25759 - 19968: jis0212<<14 | 0x1F<<7 | 0x54,
-	25761 - 19968: jis0212<<14 | 0x1F<<7 | 0x55,
-	25763 - 19968: jis0212<<14 | 0x1F<<7 | 0x56,
-	25764 - 19968: jis0208<<14 | 0x24<<7 | 0x10,
-	25765 - 19968: jis0208<<14 | 0x38<<7 | 0x5A,
-	25766 - 19968: jis0212<<14 | 0x1F<<7 | 0x57,
-	25768 - 19968: jis0212<<14 | 0x1F<<7 | 0x58,
-	25769 - 19968: jis0208<<14 | 0x38<<7 | 0x5B,
-	25771 - 19968: jis0208<<14 | 0x28<<7 | 0x4E,
-	25772 - 19968: jis0212<<14 | 0x1F<<7 | 0x59,
-	25773 - 19968: jis0208<<14 | 0x26<<7 | 0x24,
-	25774 - 19968: jis0208<<14 | 0x1A<<7 | 0x02,
-	25776 - 19968: jis0208<<14 | 0x1F<<7 | 0x50,
-	25778 - 19968: jis0208<<14 | 0x2A<<7 | 0x2F,
-	25779 - 19968: jis0212<<14 | 0x1F<<7 | 0x5A,
-	25785 - 19968: jis0208<<14 | 0x12<<7 | 0x28,
-	25787 - 19968: jis0208<<14 | 0x39<<7 | 0x04,
-	25788 - 19968: jis0208<<14 | 0x38<<7 | 0x5D,
-	25789 - 19968: jis0212<<14 | 0x1F<<7 | 0x5B,
-	25790 - 19968: jis0212<<14 | 0x1F<<7 | 0x5C,
-	25791 - 19968: jis0212<<14 | 0x1F<<7 | 0x5D,
-	25793 - 19968: jis0208<<14 | 0x2C<<7 | 0x29,
-	25794 - 19968: jis0208<<14 | 0x39<<7 | 0x06,
-	25796 - 19968: jis0212<<14 | 0x20<<7 | 0x00,
-	25797 - 19968: jis0208<<14 | 0x39<<7 | 0x02,
-	25799 - 19968: jis0208<<14 | 0x39<<7 | 0x03,
-	25801 - 19968: jis0212<<14 | 0x20<<7 | 0x01,
-	25802 - 19968: jis0212<<14 | 0x20<<7 | 0x02,
-	25803 - 19968: jis0212<<14 | 0x20<<7 | 0x03,
-	25804 - 19968: jis0212<<14 | 0x20<<7 | 0x04,
-	25805 - 19968: jis0208<<14 | 0x20<<7 | 0x3F,
-	25806 - 19968: jis0208<<14 | 0x59<<7 | 0x11,
-	25808 - 19968: jis0212<<14 | 0x20<<7 | 0x06,
-	25809 - 19968: jis0212<<14 | 0x20<<7 | 0x07,
-	25810 - 19968: jis0208<<14 | 0x39<<7 | 0x01,
-	25812 - 19968: jis0208<<14 | 0x38<<7 | 0x1E,
-	25813 - 19968: jis0212<<14 | 0x20<<7 | 0x08,
-	25815 - 19968: jis0212<<14 | 0x20<<7 | 0x09,
-	25816 - 19968: jis0208<<14 | 0x39<<7 | 0x05,
-	25818 - 19968: jis0208<<14 | 0x39<<7 | 0x00,
-	25824 - 19968: jis0208<<14 | 0x39<<7 | 0x0A,
-	25825 - 19968: jis0208<<14 | 0x39<<7 | 0x0B,
-	25826 - 19968: jis0208<<14 | 0x24<<7 | 0x06,
-	25827 - 19968: jis0208<<14 | 0x39<<7 | 0x0D,
-	25828 - 19968: jis0212<<14 | 0x20<<7 | 0x0A,
-	25829 - 19968: jis0212<<14 | 0x20<<7 | 0x0B,
-	25830 - 19968: jis0208<<14 | 0x1A<<7 | 0x03,
-	25831 - 19968: jis0208<<14 | 0x39<<7 | 0x08,
-	25833 - 19968: jis0212<<14 | 0x20<<7 | 0x0C,
-	25834 - 19968: jis0212<<14 | 0x20<<7 | 0x0D,
-	25836 - 19968: jis0208<<14 | 0x14<<7 | 0x1B,
-	25837 - 19968: jis0212<<14 | 0x20<<7 | 0x0E,
-	25839 - 19968: jis0208<<14 | 0x39<<7 | 0x0E,
-	25840 - 19968: jis0212<<14 | 0x20<<7 | 0x0F,
-	25841 - 19968: jis0208<<14 | 0x39<<7 | 0x07,
-	25842 - 19968: jis0208<<14 | 0x39<<7 | 0x12,
-	25844 - 19968: jis0208<<14 | 0x39<<7 | 0x11,
-	25845 - 19968: jis0212<<14 | 0x20<<7 | 0x10,
-	25846 - 19968: jis0208<<14 | 0x39<<7 | 0x10,
-	25847 - 19968: jis0212<<14 | 0x20<<7 | 0x11,
-	25850 - 19968: jis0208<<14 | 0x39<<7 | 0x13,
-	25851 - 19968: jis0212<<14 | 0x20<<7 | 0x12,
-	25853 - 19968: jis0208<<14 | 0x39<<7 | 0x15,
-	25854 - 19968: jis0208<<14 | 0x1D<<7 | 0x50,
-	25855 - 19968: jis0212<<14 | 0x20<<7 | 0x13,
-	25856 - 19968: jis0208<<14 | 0x39<<7 | 0x14,
-	25857 - 19968: jis0212<<14 | 0x20<<7 | 0x14,
-	25860 - 19968: jis0212<<14 | 0x20<<7 | 0x15,
-	25861 - 19968: jis0208<<14 | 0x39<<7 | 0x18,
-	25864 - 19968: jis0212<<14 | 0x20<<7 | 0x16,
-	25865 - 19968: jis0212<<14 | 0x20<<7 | 0x17,
-	25866 - 19968: jis0212<<14 | 0x20<<7 | 0x18,
-	25871 - 19968: jis0212<<14 | 0x20<<7 | 0x19,
-	25875 - 19968: jis0212<<14 | 0x20<<7 | 0x1A,
-	25876 - 19968: jis0212<<14 | 0x20<<7 | 0x1B,
-	25878 - 19968: jis0212<<14 | 0x20<<7 | 0x1C,
-	25880 - 19968: jis0208<<14 | 0x39<<7 | 0x16,
-	25881 - 19968: jis0212<<14 | 0x20<<7 | 0x1D,
-	25883 - 19968: jis0212<<14 | 0x20<<7 | 0x1E,
-	25884 - 19968: jis0208<<14 | 0x39<<7 | 0x17,
-	25885 - 19968: jis0208<<14 | 0x38<<7 | 0x4F,
-	25886 - 19968: jis0212<<14 | 0x20<<7 | 0x1F,
-	25887 - 19968: jis0212<<14 | 0x20<<7 | 0x20,
-	25890 - 19968: jis0212<<14 | 0x20<<7 | 0x21,
-	25891 - 19968: jis0208<<14 | 0x39<<7 | 0x1A,
-	25892 - 19968: jis0208<<14 | 0x39<<7 | 0x19,
-	25894 - 19968: jis0212<<14 | 0x20<<7 | 0x22,
-	25897 - 19968: jis0212<<14 | 0x20<<7 | 0x23,
-	25898 - 19968: jis0208<<14 | 0x38<<7 | 0x57,
-	25899 - 19968: jis0208<<14 | 0x39<<7 | 0x1B,
-	25900 - 19968: jis0208<<14 | 0x39<<7 | 0x0F,
-	25902 - 19968: jis0212<<14 | 0x20<<7 | 0x24,
-	25903 - 19968: jis0208<<14 | 0x1A<<7 | 0x38,
-	25905 - 19968: jis0212<<14 | 0x20<<7 | 0x25,
-	25908 - 19968: jis0208<<14 | 0x39<<7 | 0x1C,
-	25909 - 19968: jis0208<<14 | 0x39<<7 | 0x1D,
-	25910 - 19968: jis0208<<14 | 0x39<<7 | 0x1F,
-	25911 - 19968: jis0208<<14 | 0x39<<7 | 0x1E,
-	25912 - 19968: jis0208<<14 | 0x39<<7 | 0x20,
-	25913 - 19968: jis0208<<14 | 0x11<<7 | 0x5D,
-	25914 - 19968: jis0212<<14 | 0x20<<7 | 0x26,
-	25915 - 19968: jis0208<<14 | 0x18<<7 | 0x15,
-	25916 - 19968: jis0212<<14 | 0x20<<7 | 0x27,
-	25917 - 19968: jis0212<<14 | 0x20<<7 | 0x28,
-	25918 - 19968: jis0208<<14 | 0x29<<7 | 0x5B,
-	25919 - 19968: jis0208<<14 | 0x1F<<7 | 0x0E,
-	25923 - 19968: jis0212<<14 | 0x20<<7 | 0x29,
-	25925 - 19968: jis0208<<14 | 0x17<<7 | 0x2D,
-	25927 - 19968: jis0212<<14 | 0x20<<7 | 0x2A,
-	25928 - 19968: jis0208<<14 | 0x39<<7 | 0x22,
-	25929 - 19968: jis0212<<14 | 0x20<<7 | 0x2B,
-	25933 - 19968: jis0208<<14 | 0x39<<7 | 0x25,
-	25934 - 19968: jis0208<<14 | 0x59<<7 | 0x12,
-	25935 - 19968: jis0208<<14 | 0x28<<7 | 0x31,
-	25936 - 19968: jis0212<<14 | 0x20<<7 | 0x2C,
-	25937 - 19968: jis0208<<14 | 0x14<<7 | 0x3E,
-	25938 - 19968: jis0212<<14 | 0x20<<7 | 0x2D,
-	25940 - 19968: jis0212<<14 | 0x20<<7 | 0x2E,
-	25941 - 19968: jis0208<<14 | 0x39<<7 | 0x24,
-	25942 - 19968: jis0208<<14 | 0x39<<7 | 0x23,
-	25943 - 19968: jis0208<<14 | 0x26<<7 | 0x33,
-	25944 - 19968: jis0208<<14 | 0x39<<7 | 0x26,
-	25945 - 19968: jis0208<<14 | 0x15<<7 | 0x14,
-	25949 - 19968: jis0208<<14 | 0x39<<7 | 0x28,
-	25950 - 19968: jis0208<<14 | 0x39<<7 | 0x27,
-	25951 - 19968: jis0212<<14 | 0x20<<7 | 0x2F,
-	25952 - 19968: jis0212<<14 | 0x20<<7 | 0x30,
-	25954 - 19968: jis0208<<14 | 0x13<<7 | 0x19,
-	25955 - 19968: jis0208<<14 | 0x1A<<7 | 0x15,
-	25958 - 19968: jis0208<<14 | 0x25<<7 | 0x37,
-	25959 - 19968: jis0212<<14 | 0x20<<7 | 0x31,
-	25963 - 19968: jis0212<<14 | 0x20<<7 | 0x32,
-	25964 - 19968: jis0208<<14 | 0x16<<7 | 0x28,
-	25968 - 19968: jis0208<<14 | 0x1E<<7 | 0x53,
-	25970 - 19968: jis0208<<14 | 0x39<<7 | 0x29,
-	25972 - 19968: jis0208<<14 | 0x1F<<7 | 0x0F,
-	25973 - 19968: jis0208<<14 | 0x24<<7 | 0x07,
-	25975 - 19968: jis0208<<14 | 0x28<<7 | 0x3E,
-	25976 - 19968: jis0208<<14 | 0x39<<7 | 0x2A,
-	25978 - 19968: jis0212<<14 | 0x20<<7 | 0x33,
-	25981 - 19968: jis0212<<14 | 0x20<<7 | 0x34,
-	25985 - 19968: jis0212<<14 | 0x20<<7 | 0x35,
-	25986 - 19968: jis0208<<14 | 0x39<<7 | 0x2B,
-	25987 - 19968: jis0208<<14 | 0x39<<7 | 0x2C,
-	25989 - 19968: jis0212<<14 | 0x20<<7 | 0x36,
-	25991 - 19968: jis0208<<14 | 0x29<<7 | 0x17,
-	25992 - 19968: jis0208<<14 | 0x34<<7 | 0x3C,
-	25993 - 19968: jis0208<<14 | 0x1F<<7 | 0x25,
-	25994 - 19968: jis0212<<14 | 0x20<<7 | 0x37,
-	25996 - 19968: jis0208<<14 | 0x28<<7 | 0x2B,
-	25998 - 19968: jis0208<<14 | 0x19<<7 | 0x37,
-	26000 - 19968: jis0208<<14 | 0x27<<7 | 0x44,
-	26001 - 19968: jis0208<<14 | 0x27<<7 | 0x22,
-	26002 - 19968: jis0212<<14 | 0x20<<7 | 0x38,
-	26005 - 19968: jis0212<<14 | 0x20<<7 | 0x39,
-	26007 - 19968: jis0208<<14 | 0x24<<7 | 0x2C,
-	26008 - 19968: jis0212<<14 | 0x20<<7 | 0x3A,
-	26009 - 19968: jis0208<<14 | 0x2D<<7 | 0x20,
-	26011 - 19968: jis0208<<14 | 0x39<<7 | 0x2E,
-	26012 - 19968: jis0208<<14 | 0x1B<<7 | 0x2F,
-	26013 - 19968: jis0212<<14 | 0x20<<7 | 0x3B,
-	26015 - 19968: jis0208<<14 | 0x39<<7 | 0x2F,
-	26016 - 19968: jis0212<<14 | 0x20<<7 | 0x3C,
-	26017 - 19968: jis0208<<14 | 0x0F<<7 | 0x15,
-	26019 - 19968: jis0212<<14 | 0x20<<7 | 0x3D,
-	26020 - 19968: jis0208<<14 | 0x15<<7 | 0x33,
-	26021 - 19968: jis0208<<14 | 0x1F<<7 | 0x2C,
-	26022 - 19968: jis0212<<14 | 0x20<<7 | 0x3E,
-	26023 - 19968: jis0208<<14 | 0x28<<7 | 0x3F,
-	26027 - 19968: jis0208<<14 | 0x39<<7 | 0x30,
-	26028 - 19968: jis0208<<14 | 0x1A<<7 | 0x21,
-	26029 - 19968: jis0208<<14 | 0x22<<7 | 0x26,
-	26030 - 19968: jis0212<<14 | 0x20<<7 | 0x3F,
-	26031 - 19968: jis0208<<14 | 0x1A<<7 | 0x3A,
-	26032 - 19968: jis0208<<14 | 0x1E<<7 | 0x16,
-	26034 - 19968: jis0212<<14 | 0x20<<7 | 0x40,
-	26035 - 19968: jis0212<<14 | 0x20<<7 | 0x41,
-	26036 - 19968: jis0212<<14 | 0x20<<7 | 0x42,
-	26039 - 19968: jis0208<<14 | 0x39<<7 | 0x31,
-	26041 - 19968: jis0208<<14 | 0x29<<7 | 0x5C,
-	26044 - 19968: jis0208<<14 | 0x10<<7 | 0x56,
-	26045 - 19968: jis0208<<14 | 0x1A<<7 | 0x3B,
-	26047 - 19968: jis0212<<14 | 0x20<<7 | 0x43,
-	26049 - 19968: jis0208<<14 | 0x39<<7 | 0x34,
-	26050 - 19968: jis0212<<14 | 0x20<<7 | 0x44,
-	26051 - 19968: jis0208<<14 | 0x39<<7 | 0x32,
-	26052 - 19968: jis0208<<14 | 0x39<<7 | 0x35,
-	26053 - 19968: jis0208<<14 | 0x2D<<7 | 0x18,
-	26054 - 19968: jis0208<<14 | 0x39<<7 | 0x33,
-	26056 - 19968: jis0212<<14 | 0x20<<7 | 0x45,
-	26057 - 19968: jis0212<<14 | 0x20<<7 | 0x46,
-	26059 - 19968: jis0208<<14 | 0x1F<<7 | 0x5A,
-	26060 - 19968: jis0208<<14 | 0x39<<7 | 0x36,
-	26062 - 19968: jis0212<<14 | 0x20<<7 | 0x47,
-	26063 - 19968: jis0208<<14 | 0x21<<7 | 0x11,
-	26064 - 19968: jis0212<<14 | 0x20<<7 | 0x48,
-	26066 - 19968: jis0208<<14 | 0x39<<7 | 0x37,
-	26068 - 19968: jis0212<<14 | 0x20<<7 | 0x49,
-	26070 - 19968: jis0212<<14 | 0x20<<7 | 0x4A,
-	26071 - 19968: jis0208<<14 | 0x13<<7 | 0x59,
-	26072 - 19968: jis0212<<14 | 0x20<<7 | 0x4B,
-	26073 - 19968: jis0208<<14 | 0x39<<7 | 0x39,
-	26075 - 19968: jis0208<<14 | 0x39<<7 | 0x38,
-	26079 - 19968: jis0212<<14 | 0x20<<7 | 0x4C,
-	26080 - 19968: jis0208<<14 | 0x39<<7 | 0x3A,
-	26081 - 19968: jis0208<<14 | 0x39<<7 | 0x3B,
-	26082 - 19968: jis0208<<14 | 0x13<<7 | 0x5A,
-	26085 - 19968: jis0208<<14 | 0x25<<7 | 0x5B,
-	26086 - 19968: jis0208<<14 | 0x22<<7 | 0x15,
-	26087 - 19968: jis0208<<14 | 0x14<<7 | 0x4B,
-	26088 - 19968: jis0208<<14 | 0x1A<<7 | 0x3C,
-	26089 - 19968: jis0208<<14 | 0x20<<7 | 0x40,
-	26092 - 19968: jis0208<<14 | 0x1C<<7 | 0x3B,
-	26093 - 19968: jis0208<<14 | 0x0F<<7 | 0x0F,
-	26096 - 19968: jis0212<<14 | 0x20<<7 | 0x4D,
-	26097 - 19968: jis0208<<14 | 0x39<<7 | 0x3C,
-	26098 - 19968: jis0212<<14 | 0x20<<7 | 0x4E,
-	26100 - 19968: jis0212<<14 | 0x20<<7 | 0x4F,
-	26101 - 19968: jis0212<<14 | 0x20<<7 | 0x50,
-	26105 - 19968: jis0212<<14 | 0x20<<7 | 0x51,
-	26106 - 19968: jis0208<<14 | 0x11<<7 | 0x01,
-	26107 - 19968: jis0208<<14 | 0x39<<7 | 0x40,
-	26110 - 19968: jis0212<<14 | 0x20<<7 | 0x52,
-	26111 - 19968: jis0212<<14 | 0x20<<7 | 0x53,
-	26112 - 19968: jis0208<<14 | 0x59<<7 | 0x13,
-	26114 - 19968: jis0208<<14 | 0x18<<7 | 0x16,
-	26115 - 19968: jis0208<<14 | 0x39<<7 | 0x3F,
-	26116 - 19968: jis0212<<14 | 0x20<<7 | 0x55,
-	26118 - 19968: jis0208<<14 | 0x19<<7 | 0x0A,
-	26119 - 19968: jis0208<<14 | 0x1D<<7 | 0x19,
-	26120 - 19968: jis0212<<14 | 0x20<<7 | 0x56,
-	26121 - 19968: jis0208<<14 | 0x59<<7 | 0x16,
-	26122 - 19968: jis0208<<14 | 0x39<<7 | 0x3E,
-	26124 - 19968: jis0208<<14 | 0x1D<<7 | 0x1A,
-	26125 - 19968: jis0212<<14 | 0x20<<7 | 0x58,
-	26126 - 19968: jis0208<<14 | 0x2B<<7 | 0x1F,
-	26127 - 19968: jis0208<<14 | 0x19<<7 | 0x09,
-	26129 - 19968: jis0212<<14 | 0x20<<7 | 0x59,
-	26130 - 19968: jis0212<<14 | 0x20<<7 | 0x5A,
-	26131 - 19968: jis0208<<14 | 0x0F<<7 | 0x36,
-	26132 - 19968: jis0208<<14 | 0x1F<<7 | 0x2D,
-	26133 - 19968: jis0208<<14 | 0x59<<7 | 0x14,
-	26134 - 19968: jis0212<<14 | 0x20<<7 | 0x5C,
-	26140 - 19968: jis0208<<14 | 0x39<<7 | 0x45,
-	26141 - 19968: jis0212<<14 | 0x20<<7 | 0x5D,
-	26142 - 19968: jis0208<<14 | 0x59<<7 | 0x18,
-	26143 - 19968: jis0208<<14 | 0x1F<<7 | 0x10,
-	26144 - 19968: jis0208<<14 | 0x10<<7 | 0x26,
-	26145 - 19968: jis0212<<14 | 0x21<<7 | 0x01,
-	26146 - 19968: jis0212<<14 | 0x21<<7 | 0x02,
-	26147 - 19968: jis0212<<14 | 0x21<<7 | 0x03,
-	26148 - 19968: jis0208<<14 | 0x59<<7 | 0x19,
-	26149 - 19968: jis0208<<14 | 0x1C<<7 | 0x34,
-	26150 - 19968: jis0212<<14 | 0x21<<7 | 0x05,
-	26151 - 19968: jis0208<<14 | 0x2A<<7 | 0x45,
-	26152 - 19968: jis0208<<14 | 0x19<<7 | 0x51,
-	26153 - 19968: jis0212<<14 | 0x21<<7 | 0x06,
-	26154 - 19968: jis0212<<14 | 0x21<<7 | 0x07,
-	26155 - 19968: jis0212<<14 | 0x21<<7 | 0x08,
-	26156 - 19968: jis0212<<14 | 0x21<<7 | 0x09,
-	26157 - 19968: jis0208<<14 | 0x1D<<7 | 0x1B,
-	26158 - 19968: jis0208<<14 | 0x59<<7 | 0x17,
-	26159 - 19968: jis0208<<14 | 0x1F<<7 | 0x06,
-	26160 - 19968: jis0212<<14 | 0x21<<7 | 0x0B,
-	26161 - 19968: jis0208<<14 | 0x58<<7 | 0x07,
-	26163 - 19968: jis0212<<14 | 0x21<<7 | 0x0D,
-	26164 - 19968: jis0208<<14 | 0x39<<7 | 0x44,
-	26165 - 19968: jis0208<<14 | 0x39<<7 | 0x42,
-	26166 - 19968: jis0208<<14 | 0x39<<7 | 0x43,
-	26167 - 19968: jis0212<<14 | 0x21<<7 | 0x0F,
-	26169 - 19968: jis0212<<14 | 0x21<<7 | 0x0E,
-	26171 - 19968: jis0208<<14 | 0x59<<7 | 0x15,
-	26172 - 19968: jis0208<<14 | 0x22<<7 | 0x4A,
-	26175 - 19968: jis0208<<14 | 0x3A<<7 | 0x05,
-	26176 - 19968: jis0212<<14 | 0x21<<7 | 0x10,
-	26177 - 19968: jis0208<<14 | 0x39<<7 | 0x49,
-	26178 - 19968: jis0208<<14 | 0x1A<<7 | 0x5D,
-	26179 - 19968: jis0208<<14 | 0x18<<7 | 0x17,
-	26180 - 19968: jis0208<<14 | 0x39<<7 | 0x47,
-	26181 - 19968: jis0212<<14 | 0x21<<7 | 0x11,
-	26182 - 19968: jis0212<<14 | 0x21<<7 | 0x12,
-	26185 - 19968: jis0208<<14 | 0x39<<7 | 0x48,
-	26186 - 19968: jis0212<<14 | 0x21<<7 | 0x13,
-	26187 - 19968: jis0208<<14 | 0x1E<<7 | 0x17,
-	26188 - 19968: jis0212<<14 | 0x21<<7 | 0x14,
-	26190 - 19968: jis0212<<14 | 0x21<<7 | 0x16,
-	26191 - 19968: jis0208<<14 | 0x39<<7 | 0x46,
-	26193 - 19968: jis0212<<14 | 0x21<<7 | 0x15,
-	26194 - 19968: jis0208<<14 | 0x1A<<7 | 0x0E,
-	26199 - 19968: jis0208<<14 | 0x59<<7 | 0x1B,
-	26200 - 19968: jis0212<<14 | 0x21<<7 | 0x18,
-	26201 - 19968: jis0208<<14 | 0x59<<7 | 0x1C,
-	26203 - 19968: jis0212<<14 | 0x21<<7 | 0x1A,
-	26204 - 19968: jis0212<<14 | 0x21<<7 | 0x1B,
-	26205 - 19968: jis0208<<14 | 0x39<<7 | 0x4B,
-	26206 - 19968: jis0208<<14 | 0x39<<7 | 0x4A,
-	26207 - 19968: jis0208<<14 | 0x39<<7 | 0x4F,
-	26208 - 19968: jis0212<<14 | 0x21<<7 | 0x1C,
-	26209 - 19968: jis0212<<14 | 0x21<<7 | 0x1D,
-	26210 - 19968: jis0208<<14 | 0x39<<7 | 0x50,
-	26212 - 19968: jis0208<<14 | 0x39<<7 | 0x4C,
-	26213 - 19968: jis0208<<14 | 0x59<<7 | 0x1A,
-	26214 - 19968: jis0208<<14 | 0x12<<7 | 0x01,
-	26215 - 19968: jis0208<<14 | 0x39<<7 | 0x4D,
-	26216 - 19968: jis0208<<14 | 0x39<<7 | 0x4E,
-	26217 - 19968: jis0208<<14 | 0x27<<7 | 0x34,
-	26218 - 19968: jis0212<<14 | 0x21<<7 | 0x1F,
-	26219 - 19968: jis0212<<14 | 0x21<<7 | 0x20,
-	26220 - 19968: jis0212<<14 | 0x21<<7 | 0x21,
-	26222 - 19968: jis0208<<14 | 0x28<<7 | 0x40,
-	26223 - 19968: jis0208<<14 | 0x16<<7 | 0x29,
-	26224 - 19968: jis0208<<14 | 0x39<<7 | 0x51,
-	26227 - 19968: jis0208<<14 | 0x59<<7 | 0x1E,
-	26228 - 19968: jis0208<<14 | 0x1F<<7 | 0x11,
-	26229 - 19968: jis0212<<14 | 0x21<<7 | 0x24,
-	26230 - 19968: jis0208<<14 | 0x1D<<7 | 0x1C,
-	26231 - 19968: jis0212<<14 | 0x21<<7 | 0x26,
-	26232 - 19968: jis0212<<14 | 0x21<<7 | 0x27,
-	26233 - 19968: jis0212<<14 | 0x21<<7 | 0x28,
-	26234 - 19968: jis0208<<14 | 0x22<<7 | 0x31,
-	26235 - 19968: jis0212<<14 | 0x21<<7 | 0x29,
-	26236 - 19968: jis0212<<14 | 0x21<<7 | 0x2B,
-	26238 - 19968: jis0212<<14 | 0x21<<7 | 0x22,
-	26239 - 19968: jis0212<<14 | 0x21<<7 | 0x25,
-	26240 - 19968: jis0212<<14 | 0x21<<7 | 0x2A,
-	26241 - 19968: jis0208<<14 | 0x15<<7 | 0x26,
-	26243 - 19968: jis0208<<14 | 0x39<<7 | 0x52,
-	26244 - 19968: jis0208<<14 | 0x39<<7 | 0x56,
-	26247 - 19968: jis0208<<14 | 0x11<<7 | 0x2A,
-	26248 - 19968: jis0208<<14 | 0x39<<7 | 0x53,
-	26249 - 19968: jis0208<<14 | 0x39<<7 | 0x55,
-	26251 - 19968: jis0212<<14 | 0x21<<7 | 0x2C,
-	26252 - 19968: jis0212<<14 | 0x21<<7 | 0x2D,
-	26253 - 19968: jis0212<<14 | 0x21<<7 | 0x2E,
-	26254 - 19968: jis0208<<14 | 0x39<<7 | 0x54,
-	26256 - 19968: jis0212<<14 | 0x21<<7 | 0x2F,
-	26257 - 19968: jis0208<<14 | 0x1C<<7 | 0x4A,
-	26258 - 19968: jis0212<<14 | 0x21<<7 | 0x30,
-	26262 - 19968: jis0208<<14 | 0x22<<7 | 0x27,
-	26263 - 19968: jis0208<<14 | 0x0F<<7 | 0x24,
-	26264 - 19968: jis0208<<14 | 0x39<<7 | 0x57,
-	26265 - 19968: jis0208<<14 | 0x59<<7 | 0x1F,
-	26266 - 19968: jis0212<<14 | 0x21<<7 | 0x32,
-	26267 - 19968: jis0212<<14 | 0x21<<7 | 0x33,
-	26268 - 19968: jis0212<<14 | 0x21<<7 | 0x34,
-	26269 - 19968: jis0208<<14 | 0x39<<7 | 0x58,
-	26271 - 19968: jis0212<<14 | 0x21<<7 | 0x35,
-	26272 - 19968: jis0208<<14 | 0x59<<7 | 0x20,
-	26274 - 19968: jis0208<<14 | 0x23<<7 | 0x09,
-	26276 - 19968: jis0212<<14 | 0x21<<7 | 0x37,
-	26278 - 19968: jis0208<<14 | 0x2D<<7 | 0x50,
-	26283 - 19968: jis0208<<14 | 0x1A<<7 | 0x22,
-	26285 - 19968: jis0212<<14 | 0x21<<7 | 0x38,
-	26286 - 19968: jis0208<<14 | 0x29<<7 | 0x4A,
-	26289 - 19968: jis0212<<14 | 0x21<<7 | 0x39,
-	26290 - 19968: jis0208<<14 | 0x59<<7 | 0x21,
-	26292 - 19968: jis0208<<14 | 0x2A<<7 | 0x1C,
-	26293 - 19968: jis0212<<14 | 0x21<<7 | 0x3B,
-	26296 - 19968: jis0208<<14 | 0x3A<<7 | 0x01,
-	26297 - 19968: jis0208<<14 | 0x39<<7 | 0x5A,
-	26299 - 19968: jis0212<<14 | 0x21<<7 | 0x3C,
-	26300 - 19968: jis0208<<14 | 0x39<<7 | 0x5D,
-	26302 - 19968: jis0208<<14 | 0x39<<7 | 0x5C,
-	26303 - 19968: jis0208<<14 | 0x59<<7 | 0x22,
-	26304 - 19968: jis0212<<14 | 0x21<<7 | 0x3E,
-	26305 - 19968: jis0208<<14 | 0x39<<7 | 0x59,
-	26306 - 19968: jis0212<<14 | 0x21<<7 | 0x3F,
-	26307 - 19968: jis0212<<14 | 0x21<<7 | 0x40,
-	26308 - 19968: jis0208<<14 | 0x3A<<7 | 0x00,
-	26311 - 19968: jis0208<<14 | 0x25<<7 | 0x3D,
-	26312 - 19968: jis0212<<14 | 0x21<<7 | 0x41,
-	26313 - 19968: jis0208<<14 | 0x39<<7 | 0x5B,
-	26316 - 19968: jis0212<<14 | 0x21<<7 | 0x42,
-	26318 - 19968: jis0212<<14 | 0x21<<7 | 0x43,
-	26319 - 19968: jis0212<<14 | 0x21<<7 | 0x44,
-	26324 - 19968: jis0212<<14 | 0x21<<7 | 0x45,
-	26326 - 19968: jis0208<<14 | 0x3A<<7 | 0x02,
-	26329 - 19968: jis0208<<14 | 0x1C<<7 | 0x4B,
-	26330 - 19968: jis0208<<14 | 0x3A<<7 | 0x03,
-	26331 - 19968: jis0212<<14 | 0x21<<7 | 0x46,
-	26332 - 19968: jis0208<<14 | 0x2C<<7 | 0x2A,
-	26333 - 19968: jis0208<<14 | 0x26<<7 | 0x57,
-	26335 - 19968: jis0212<<14 | 0x21<<7 | 0x47,
-	26336 - 19968: jis0208<<14 | 0x3A<<7 | 0x04,
-	26342 - 19968: jis0208<<14 | 0x3A<<7 | 0x06,
-	26344 - 19968: jis0212<<14 | 0x21<<7 | 0x48,
-	26345 - 19968: jis0208<<14 | 0x3A<<7 | 0x07,
-	26347 - 19968: jis0212<<14 | 0x21<<7 | 0x49,
-	26348 - 19968: jis0212<<14 | 0x21<<7 | 0x4A,
-	26350 - 19968: jis0212<<14 | 0x21<<7 | 0x4B,
-	26352 - 19968: jis0208<<14 | 0x3A<<7 | 0x08,
-	26354 - 19968: jis0208<<14 | 0x15<<7 | 0x29,
-	26355 - 19968: jis0208<<14 | 0x10<<7 | 0x27,
-	26356 - 19968: jis0208<<14 | 0x18<<7 | 0x18,
-	26357 - 19968: jis0208<<14 | 0x3A<<7 | 0x09,
-	26359 - 19968: jis0208<<14 | 0x3A<<7 | 0x0A,
-	26360 - 19968: jis0208<<14 | 0x1C<<7 | 0x50,
-	26361 - 19968: jis0208<<14 | 0x20<<7 | 0x41,
-	26362 - 19968: jis0208<<14 | 0x59<<7 | 0x23,
-	26363 - 19968: jis0208<<14 | 0x58<<7 | 0x0A,
-	26364 - 19968: jis0208<<14 | 0x31<<7 | 0x37,
-	26365 - 19968: jis0208<<14 | 0x20<<7 | 0x1D,
-	26366 - 19968: jis0208<<14 | 0x20<<7 | 0x1C,
-	26367 - 19968: jis0208<<14 | 0x21<<7 | 0x37,
-	26368 - 19968: jis0208<<14 | 0x19<<7 | 0x26,
-	26371 - 19968: jis0208<<14 | 0x2F<<7 | 0x51,
-	26373 - 19968: jis0212<<14 | 0x21<<7 | 0x4D,
-	26375 - 19968: jis0212<<14 | 0x21<<7 | 0x4E,
-	26376 - 19968: jis0208<<14 | 0x16<<7 | 0x4D,
-	26377 - 19968: jis0208<<14 | 0x2C<<7 | 0x0C,
-	26379 - 19968: jis0208<<14 | 0x29<<7 | 0x5D,
-	26381 - 19968: jis0208<<14 | 0x28<<7 | 0x5D,
-	26382 - 19968: jis0208<<14 | 0x59<<7 | 0x24,
-	26383 - 19968: jis0208<<14 | 0x3A<<7 | 0x0B,
-	26387 - 19968: jis0212<<14 | 0x21<<7 | 0x50,
-	26388 - 19968: jis0208<<14 | 0x19<<7 | 0x52,
-	26389 - 19968: jis0208<<14 | 0x23<<7 | 0x1E,
-	26390 - 19968: jis0208<<14 | 0x3A<<7 | 0x0C,
-	26391 - 19968: jis0208<<14 | 0x2E<<7 | 0x0E,
-	26393 - 19968: jis0212<<14 | 0x21<<7 | 0x51,
-	26395 - 19968: jis0208<<14 | 0x2A<<7 | 0x1D,
-	26396 - 19968: jis0212<<14 | 0x21<<7 | 0x52,
-	26397 - 19968: jis0208<<14 | 0x23<<7 | 0x0A,
-	26398 - 19968: jis0208<<14 | 0x3A<<7 | 0x0D,
-	26399 - 19968: jis0208<<14 | 0x13<<7 | 0x5B,
-	26400 - 19968: jis0212<<14 | 0x21<<7 | 0x53,
-	26402 - 19968: jis0212<<14 | 0x21<<7 | 0x54,
-	26406 - 19968: jis0208<<14 | 0x3A<<7 | 0x0E,
-	26407 - 19968: jis0208<<14 | 0x3A<<7 | 0x0F,
-	26408 - 19968: jis0208<<14 | 0x2B<<7 | 0x39,
-	26410 - 19968: jis0208<<14 | 0x2B<<7 | 0x03,
-	26411 - 19968: jis0208<<14 | 0x2A<<7 | 0x55,
-	26412 - 19968: jis0208<<14 | 0x2A<<7 | 0x3B,
-	26413 - 19968: jis0208<<14 | 0x1A<<7 | 0x04,
-	26414 - 19968: jis0208<<14 | 0x3A<<7 | 0x11,
-	26417 - 19968: jis0208<<14 | 0x1B<<7 | 0x4A,
-	26419 - 19968: jis0212<<14 | 0x21<<7 | 0x55,
-	26420 - 19968: jis0208<<14 | 0x2A<<7 | 0x30,
-	26422 - 19968: jis0208<<14 | 0x3A<<7 | 0x13,
-	26423 - 19968: jis0208<<14 | 0x3A<<7 | 0x16,
-	26424 - 19968: jis0208<<14 | 0x3A<<7 | 0x15,
-	26426 - 19968: jis0208<<14 | 0x13<<7 | 0x58,
-	26429 - 19968: jis0208<<14 | 0x14<<7 | 0x3F,
-	26430 - 19968: jis0212<<14 | 0x21<<7 | 0x56,
-	26431 - 19968: jis0208<<14 | 0x3A<<7 | 0x12,
-	26433 - 19968: jis0208<<14 | 0x3A<<7 | 0x14,
-	26437 - 19968: jis0212<<14 | 0x21<<7 | 0x57,
-	26438 - 19968: jis0208<<14 | 0x3A<<7 | 0x17,
-	26439 - 19968: jis0212<<14 | 0x21<<7 | 0x58,
-	26440 - 19968: jis0212<<14 | 0x21<<7 | 0x59,
-	26441 - 19968: jis0208<<14 | 0x1E<<7 | 0x58,
-	26444 - 19968: jis0212<<14 | 0x21<<7 | 0x5A,
-	26446 - 19968: jis0208<<14 | 0x2C<<7 | 0x5A,
-	26447 - 19968: jis0208<<14 | 0x0F<<7 | 0x28,
-	26448 - 19968: jis0208<<14 | 0x19<<7 | 0x3F,
-	26449 - 19968: jis0208<<14 | 0x21<<7 | 0x1B,
-	26451 - 19968: jis0208<<14 | 0x1B<<7 | 0x3C,
-	26452 - 19968: jis0212<<14 | 0x21<<7 | 0x5B,
-	26453 - 19968: jis0212<<14 | 0x21<<7 | 0x5C,
-	26454 - 19968: jis0208<<14 | 0x1D<<7 | 0x52,
-	26457 - 19968: jis0208<<14 | 0x3A<<7 | 0x1A,
-	26460 - 19968: jis0208<<14 | 0x24<<7 | 0x2D,
-	26461 - 19968: jis0212<<14 | 0x21<<7 | 0x5D,
-	26462 - 19968: jis0208<<14 | 0x3A<<7 | 0x18,
-	26463 - 19968: jis0208<<14 | 0x21<<7 | 0x0A,
-	26464 - 19968: jis0208<<14 | 0x3A<<7 | 0x19,
-	26465 - 19968: jis0208<<14 | 0x1D<<7 | 0x51,
-	26466 - 19968: jis0208<<14 | 0x2B<<7 | 0x3C,
-	26467 - 19968: jis0208<<14 | 0x3A<<7 | 0x1B,
-	26468 - 19968: jis0208<<14 | 0x3A<<7 | 0x1C,
-	26469 - 19968: jis0208<<14 | 0x2C<<7 | 0x47,
-	26470 - 19968: jis0208<<14 | 0x59<<7 | 0x26,
-	26474 - 19968: jis0208<<14 | 0x3A<<7 | 0x21,
-	26476 - 19968: jis0212<<14 | 0x22<<7 | 0x01,
-	26477 - 19968: jis0208<<14 | 0x18<<7 | 0x19,
-	26478 - 19968: jis0212<<14 | 0x22<<7 | 0x02,
-	26479 - 19968: jis0208<<14 | 0x26<<7 | 0x34,
-	26480 - 19968: jis0208<<14 | 0x3A<<7 | 0x1E,
-	26481 - 19968: jis0208<<14 | 0x24<<7 | 0x4B,
-	26482 - 19968: jis0208<<14 | 0x39<<7 | 0x3D,
-	26483 - 19968: jis0208<<14 | 0x39<<7 | 0x41,
-	26484 - 19968: jis0212<<14 | 0x22<<7 | 0x03,
-	26485 - 19968: jis0208<<14 | 0x14<<7 | 0x2E,
-	26486 - 19968: jis0212<<14 | 0x22<<7 | 0x04,
-	26487 - 19968: jis0208<<14 | 0x26<<7 | 0x26,
-	26491 - 19968: jis0212<<14 | 0x22<<7 | 0x05,
-	26492 - 19968: jis0208<<14 | 0x3A<<7 | 0x20,
-	26494 - 19968: jis0208<<14 | 0x1D<<7 | 0x1D,
-	26495 - 19968: jis0208<<14 | 0x27<<7 | 0x23,
-	26497 - 19968: jis0212<<14 | 0x22<<7 | 0x06,
-	26500 - 19968: jis0212<<14 | 0x22<<7 | 0x07,
-	26501 - 19968: jis0208<<14 | 0x3A<<7 | 0x26,
-	26503 - 19968: jis0208<<14 | 0x27<<7 | 0x59,
-	26505 - 19968: jis0208<<14 | 0x3A<<7 | 0x1D,
-	26507 - 19968: jis0208<<14 | 0x3A<<7 | 0x23,
-	26508 - 19968: jis0208<<14 | 0x3A<<7 | 0x22,
-	26510 - 19968: jis0212<<14 | 0x22<<7 | 0x08,
-	26511 - 19968: jis0212<<14 | 0x22<<7 | 0x09,
-	26512 - 19968: jis0208<<14 | 0x1F<<7 | 0x2E,
-	26513 - 19968: jis0212<<14 | 0x22<<7 | 0x0A,
-	26515 - 19968: jis0212<<14 | 0x22<<7 | 0x0B,
-	26517 - 19968: jis0208<<14 | 0x2A<<7 | 0x4C,
-	26518 - 19968: jis0212<<14 | 0x22<<7 | 0x0C,
-	26519 - 19968: jis0208<<14 | 0x2D<<7 | 0x32,
-	26520 - 19968: jis0212<<14 | 0x22<<7 | 0x0D,
-	26521 - 19968: jis0212<<14 | 0x22<<7 | 0x0E,
-	26522 - 19968: jis0208<<14 | 0x2A<<7 | 0x46,
-	26523 - 19968: jis0212<<14 | 0x22<<7 | 0x0F,
-	26524 - 19968: jis0208<<14 | 0x11<<7 | 0x2B,
-	26525 - 19968: jis0208<<14 | 0x1A<<7 | 0x3D,
-	26528 - 19968: jis0208<<14 | 0x2E<<7 | 0x27,
-	26529 - 19968: jis0208<<14 | 0x3A<<7 | 0x25,
-	26530 - 19968: jis0208<<14 | 0x1E<<7 | 0x54,
-	26534 - 19968: jis0208<<14 | 0x3A<<7 | 0x24,
-	26537 - 19968: jis0208<<14 | 0x3A<<7 | 0x1F,
-	26543 - 19968: jis0208<<14 | 0x17<<7 | 0x2E,
-	26544 - 19968: jis0212<<14 | 0x22<<7 | 0x10,
-	26545 - 19968: jis0212<<14 | 0x22<<7 | 0x11,
-	26546 - 19968: jis0212<<14 | 0x22<<7 | 0x12,
-	26547 - 19968: jis0208<<14 | 0x3A<<7 | 0x2B,
-	26548 - 19968: jis0208<<14 | 0x3A<<7 | 0x29,
-	26549 - 19968: jis0212<<14 | 0x22<<7 | 0x13,
-	26550 - 19968: jis0208<<14 | 0x11<<7 | 0x2C,
-	26551 - 19968: jis0208<<14 | 0x3A<<7 | 0x27,
-	26552 - 19968: jis0208<<14 | 0x3A<<7 | 0x2D,
-	26553 - 19968: jis0208<<14 | 0x3A<<7 | 0x33,
-	26555 - 19968: jis0208<<14 | 0x59<<7 | 0x27,
-	26556 - 19968: jis0212<<14 | 0x22<<7 | 0x15,
-	26557 - 19968: jis0212<<14 | 0x22<<7 | 0x16,
-	26560 - 19968: jis0208<<14 | 0x59<<7 | 0x29,
-	26561 - 19968: jis0208<<14 | 0x21<<7 | 0x27,
-	26562 - 19968: jis0212<<14 | 0x22<<7 | 0x19,
-	26563 - 19968: jis0212<<14 | 0x22<<7 | 0x1A,
-	26564 - 19968: jis0208<<14 | 0x29<<7 | 0x20,
-	26565 - 19968: jis0212<<14 | 0x22<<7 | 0x1B,
-	26566 - 19968: jis0208<<14 | 0x3A<<7 | 0x35,
-	26568 - 19968: jis0212<<14 | 0x22<<7 | 0x1C,
-	26569 - 19968: jis0212<<14 | 0x22<<7 | 0x1D,
-	26570 - 19968: jis0208<<14 | 0x28<<7 | 0x01,
-	26574 - 19968: jis0208<<14 | 0x3A<<7 | 0x34,
-	26575 - 19968: jis0208<<14 | 0x26<<7 | 0x4F,
-	26576 - 19968: jis0208<<14 | 0x2A<<7 | 0x1E,
-	26577 - 19968: jis0208<<14 | 0x13<<7 | 0x1A,
-	26578 - 19968: jis0212<<14 | 0x22<<7 | 0x1E,
-	26579 - 19968: jis0208<<14 | 0x1F<<7 | 0x56,
-	26580 - 19968: jis0208<<14 | 0x1C<<7 | 0x1F,
-	26583 - 19968: jis0212<<14 | 0x22<<7 | 0x1F,
-	26584 - 19968: jis0208<<14 | 0x23<<7 | 0x32,
-	26585 - 19968: jis0212<<14 | 0x22<<7 | 0x20,
-	26586 - 19968: jis0208<<14 | 0x2C<<7 | 0x0D,
-	26588 - 19968: jis0212<<14 | 0x22<<7 | 0x21,
-	26589 - 19968: jis0208<<14 | 0x3A<<7 | 0x30,
-	26590 - 19968: jis0208<<14 | 0x3A<<7 | 0x2F,
-	26593 - 19968: jis0212<<14 | 0x22<<7 | 0x22,
-	26594 - 19968: jis0208<<14 | 0x3A<<7 | 0x31,
-	26596 - 19968: jis0208<<14 | 0x3A<<7 | 0x2E,
-	26598 - 19968: jis0212<<14 | 0x22<<7 | 0x23,
-	26599 - 19968: jis0208<<14 | 0x3A<<7 | 0x36,
-	26601 - 19968: jis0208<<14 | 0x3A<<7 | 0x2C,
-	26604 - 19968: jis0208<<14 | 0x3A<<7 | 0x2A,
-	26606 - 19968: jis0208<<14 | 0x3A<<7 | 0x32,
-	26607 - 19968: jis0208<<14 | 0x3A<<7 | 0x28,
-	26608 - 19968: jis0212<<14 | 0x22<<7 | 0x24,
-	26609 - 19968: jis0208<<14 | 0x22<<7 | 0x4B,
-	26610 - 19968: jis0212<<14 | 0x22<<7 | 0x25,
-	26611 - 19968: jis0208<<14 | 0x2B<<7 | 0x57,
-	26612 - 19968: jis0208<<14 | 0x1B<<7 | 0x25,
-	26613 - 19968: jis0208<<14 | 0x19<<7 | 0x53,
-	26614 - 19968: jis0212<<14 | 0x22<<7 | 0x26,
-	26615 - 19968: jis0212<<14 | 0x22<<7 | 0x27,
-	26617 - 19968: jis0212<<14 | 0x22<<7 | 0x17,
-	26619 - 19968: jis0208<<14 | 0x19<<7 | 0x19,
-	26622 - 19968: jis0208<<14 | 0x2A<<7 | 0x4E,
-	26623 - 19968: jis0208<<14 | 0x12<<7 | 0x20,
-	26625 - 19968: jis0208<<14 | 0x59<<7 | 0x2A,
-	26626 - 19968: jis0208<<14 | 0x23<<7 | 0x2D,
-	26627 - 19968: jis0208<<14 | 0x25<<7 | 0x29,
-	26628 - 19968: jis0208<<14 | 0x10<<7 | 0x28,
-	26643 - 19968: jis0208<<14 | 0x1F<<7 | 0x51,
-	26644 - 19968: jis0212<<14 | 0x22<<7 | 0x29,
-	26646 - 19968: jis0208<<14 | 0x1F<<7 | 0x13,
-	26647 - 19968: jis0208<<14 | 0x16<<7 | 0x09,
-	26649 - 19968: jis0212<<14 | 0x22<<7 | 0x2A,
-	26653 - 19968: jis0212<<14 | 0x22<<7 | 0x2B,
-	26654 - 19968: jis0208<<14 | 0x3A<<7 | 0x38,
-	26655 - 19968: jis0212<<14 | 0x22<<7 | 0x2C,
-	26657 - 19968: jis0208<<14 | 0x18<<7 | 0x1A,
-	26658 - 19968: jis0208<<14 | 0x12<<7 | 0x5B,
-	26663 - 19968: jis0212<<14 | 0x22<<7 | 0x2E,
-	26664 - 19968: jis0212<<14 | 0x22<<7 | 0x2D,
-	26665 - 19968: jis0208<<14 | 0x3A<<7 | 0x3A,
-	26666 - 19968: jis0208<<14 | 0x12<<7 | 0x53,
-	26667 - 19968: jis0208<<14 | 0x3A<<7 | 0x40,
-	26668 - 19968: jis0212<<14 | 0x22<<7 | 0x2F,
-	26669 - 19968: jis0212<<14 | 0x22<<7 | 0x30,
-	26671 - 19968: jis0212<<14 | 0x22<<7 | 0x31,
-	26672 - 19968: jis0212<<14 | 0x22<<7 | 0x32,
-	26673 - 19968: jis0212<<14 | 0x22<<7 | 0x33,
-	26674 - 19968: jis0208<<14 | 0x3A<<7 | 0x3D,
-	26675 - 19968: jis0212<<14 | 0x22<<7 | 0x34,
-	26676 - 19968: jis0208<<14 | 0x1F<<7 | 0x52,
-	26680 - 19968: jis0208<<14 | 0x12<<7 | 0x2A,
-	26681 - 19968: jis0208<<14 | 0x19<<7 | 0x0B,
-	26683 - 19968: jis0212<<14 | 0x22<<7 | 0x35,
-	26684 - 19968: jis0208<<14 | 0x12<<7 | 0x29,
-	26685 - 19968: jis0208<<14 | 0x19<<7 | 0x2E,
-	26687 - 19968: jis0212<<14 | 0x22<<7 | 0x36,
-	26688 - 19968: jis0208<<14 | 0x3A<<7 | 0x3B,
-	26689 - 19968: jis0208<<14 | 0x16<<7 | 0x44,
-	26690 - 19968: jis0208<<14 | 0x16<<7 | 0x2A,
-	26691 - 19968: jis0208<<14 | 0x24<<7 | 0x4C,
-	26692 - 19968: jis0208<<14 | 0x59<<7 | 0x2B,
-	26693 - 19968: jis0212<<14 | 0x22<<7 | 0x38,
-	26694 - 19968: jis0208<<14 | 0x3A<<7 | 0x39,
-	26696 - 19968: jis0208<<14 | 0x0F<<7 | 0x25,
-	26698 - 19968: jis0212<<14 | 0x22<<7 | 0x39,
-	26700 - 19968: jis0212<<14 | 0x22<<7 | 0x3A,
-	26701 - 19968: jis0208<<14 | 0x3A<<7 | 0x3C,
-	26702 - 19968: jis0208<<14 | 0x3A<<7 | 0x3E,
-	26704 - 19968: jis0208<<14 | 0x15<<7 | 0x2C,
-	26705 - 19968: jis0208<<14 | 0x16<<7 | 0x0B,
-	26706 - 19968: jis0208<<14 | 0x59<<7 | 0x28,
-	26707 - 19968: jis0208<<14 | 0x13<<7 | 0x1B,
-	26708 - 19968: jis0208<<14 | 0x14<<7 | 0x2A,
-	26709 - 19968: jis0212<<14 | 0x22<<7 | 0x3B,
-	26711 - 19968: jis0212<<14 | 0x22<<7 | 0x3C,
-	26712 - 19968: jis0212<<14 | 0x22<<7 | 0x3D,
-	26713 - 19968: jis0208<<14 | 0x3A<<7 | 0x41,
-	26715 - 19968: jis0212<<14 | 0x22<<7 | 0x3E,
-	26716 - 19968: jis0208<<14 | 0x19<<7 | 0x58,
-	26717 - 19968: jis0208<<14 | 0x2A<<7 | 0x50,
-	26719 - 19968: jis0208<<14 | 0x1A<<7 | 0x16,
-	26723 - 19968: jis0208<<14 | 0x3A<<7 | 0x42,
-	26727 - 19968: jis0208<<14 | 0x28<<7 | 0x0F,
-	26731 - 19968: jis0212<<14 | 0x22<<7 | 0x3F,
-	26734 - 19968: jis0212<<14 | 0x22<<7 | 0x40,
-	26735 - 19968: jis0212<<14 | 0x22<<7 | 0x41,
-	26736 - 19968: jis0212<<14 | 0x22<<7 | 0x42,
-	26737 - 19968: jis0212<<14 | 0x22<<7 | 0x43,
-	26738 - 19968: jis0212<<14 | 0x22<<7 | 0x44,
-	26740 - 19968: jis0208<<14 | 0x3A<<7 | 0x4E,
-	26741 - 19968: jis0212<<14 | 0x22<<7 | 0x45,
-	26742 - 19968: jis0208<<14 | 0x11<<7 | 0x12,
-	26743 - 19968: jis0208<<14 | 0x3A<<7 | 0x43,
-	26745 - 19968: jis0212<<14 | 0x22<<7 | 0x46,
-	26746 - 19968: jis0212<<14 | 0x22<<7 | 0x47,
-	26747 - 19968: jis0212<<14 | 0x22<<7 | 0x48,
-	26748 - 19968: jis0212<<14 | 0x22<<7 | 0x49,
-	26750 - 19968: jis0208<<14 | 0x3A<<7 | 0x54,
-	26751 - 19968: jis0208<<14 | 0x3A<<7 | 0x44,
-	26753 - 19968: jis0208<<14 | 0x2D<<7 | 0x21,
-	26754 - 19968: jis0212<<14 | 0x22<<7 | 0x4A,
-	26755 - 19968: jis0208<<14 | 0x3A<<7 | 0x4B,
-	26756 - 19968: jis0212<<14 | 0x22<<7 | 0x4B,
-	26757 - 19968: jis0208<<14 | 0x26<<7 | 0x3E,
-	26758 - 19968: jis0212<<14 | 0x22<<7 | 0x4C,
-	26760 - 19968: jis0212<<14 | 0x22<<7 | 0x4D,
-	26765 - 19968: jis0208<<14 | 0x3A<<7 | 0x53,
-	26767 - 19968: jis0208<<14 | 0x3A<<7 | 0x46,
-	26771 - 19968: jis0208<<14 | 0x0F<<7 | 0x13,
-	26772 - 19968: jis0208<<14 | 0x3A<<7 | 0x48,
-	26774 - 19968: jis0212<<14 | 0x22<<7 | 0x4E,
-	26775 - 19968: jis0208<<14 | 0x18<<7 | 0x1B,
-	26776 - 19968: jis0212<<14 | 0x22<<7 | 0x4F,
-	26778 - 19968: jis0212<<14 | 0x22<<7 | 0x50,
-	26779 - 19968: jis0208<<14 | 0x3A<<7 | 0x4A,
-	26780 - 19968: jis0212<<14 | 0x22<<7 | 0x51,
-	26781 - 19968: jis0208<<14 | 0x3A<<7 | 0x49,
-	26783 - 19968: jis0208<<14 | 0x3A<<7 | 0x45,
-	26784 - 19968: jis0208<<14 | 0x3A<<7 | 0x50,
-	26785 - 19968: jis0212<<14 | 0x22<<7 | 0x52,
-	26786 - 19968: jis0208<<14 | 0x1D<<7 | 0x1E,
-	26787 - 19968: jis0212<<14 | 0x22<<7 | 0x53,
-	26789 - 19968: jis0212<<14 | 0x22<<7 | 0x54,
-	26790 - 19968: jis0208<<14 | 0x33<<7 | 0x4C,
-	26791 - 19968: jis0208<<14 | 0x17<<7 | 0x47,
-	26792 - 19968: jis0208<<14 | 0x2C<<7 | 0x5B,
-	26793 - 19968: jis0212<<14 | 0x22<<7 | 0x55,
-	26794 - 19968: jis0212<<14 | 0x22<<7 | 0x56,
-	26797 - 19968: jis0208<<14 | 0x3A<<7 | 0x47,
-	26798 - 19968: jis0212<<14 | 0x22<<7 | 0x57,
-	26799 - 19968: jis0208<<14 | 0x23<<7 | 0x53,
-	26800 - 19968: jis0208<<14 | 0x12<<7 | 0x02,
-	26801 - 19968: jis0208<<14 | 0x19<<7 | 0x0C,
-	26802 - 19968: jis0212<<14 | 0x22<<7 | 0x58,
-	26803 - 19968: jis0208<<14 | 0x3A<<7 | 0x3F,
-	26805 - 19968: jis0208<<14 | 0x3A<<7 | 0x4F,
-	26806 - 19968: jis0208<<14 | 0x12<<7 | 0x40,
-	26809 - 19968: jis0208<<14 | 0x3A<<7 | 0x4D,
-	26810 - 19968: jis0208<<14 | 0x3A<<7 | 0x51,
-	26811 - 19968: jis0212<<14 | 0x22<<7 | 0x59,
-	26812 - 19968: jis0208<<14 | 0x24<<7 | 0x4D,
-	26820 - 19968: jis0208<<14 | 0x13<<7 | 0x5D,
-	26821 - 19968: jis0212<<14 | 0x22<<7 | 0x5A,
-	26822 - 19968: jis0208<<14 | 0x3B<<7 | 0x11,
-	26824 - 19968: jis0208<<14 | 0x58<<7 | 0x08,
-	26825 - 19968: jis0208<<14 | 0x2B<<7 | 0x28,
-	26826 - 19968: jis0208<<14 | 0x3A<<7 | 0x56,
-	26827 - 19968: jis0208<<14 | 0x13<<7 | 0x5C,
-	26828 - 19968: jis0212<<14 | 0x22<<7 | 0x5C,
-	26829 - 19968: jis0208<<14 | 0x3A<<7 | 0x5D,
-	26831 - 19968: jis0208<<14 | 0x59<<7 | 0x2C,
-	26832 - 19968: jis0212<<14 | 0x23<<7 | 0x00,
-	26833 - 19968: jis0212<<14 | 0x23<<7 | 0x01,
-	26834 - 19968: jis0208<<14 | 0x2A<<7 | 0x1F,
-	26835 - 19968: jis0212<<14 | 0x23<<7 | 0x02,
-	26836 - 19968: jis0208<<14 | 0x3B<<7 | 0x00,
-	26837 - 19968: jis0208<<14 | 0x3B<<7 | 0x02,
-	26838 - 19968: jis0212<<14 | 0x23<<7 | 0x03,
-	26839 - 19968: jis0208<<14 | 0x3B<<7 | 0x06,
-	26840 - 19968: jis0208<<14 | 0x3A<<7 | 0x58,
-	26841 - 19968: jis0212<<14 | 0x23<<7 | 0x04,
-	26842 - 19968: jis0208<<14 | 0x22<<7 | 0x09,
-	26844 - 19968: jis0212<<14 | 0x23<<7 | 0x05,
-	26845 - 19968: jis0212<<14 | 0x23<<7 | 0x06,
-	26847 - 19968: jis0208<<14 | 0x24<<7 | 0x4E,
-	26848 - 19968: jis0208<<14 | 0x3B<<7 | 0x0A,
-	26849 - 19968: jis0208<<14 | 0x3A<<7 | 0x5B,
-	26851 - 19968: jis0208<<14 | 0x3B<<7 | 0x07,
-	26853 - 19968: jis0212<<14 | 0x23<<7 | 0x07,
-	26855 - 19968: jis0208<<14 | 0x3B<<7 | 0x01,
-	26856 - 19968: jis0212<<14 | 0x23<<7 | 0x08,
-	26858 - 19968: jis0212<<14 | 0x23<<7 | 0x09,
-	26859 - 19968: jis0212<<14 | 0x23<<7 | 0x0A,
-	26860 - 19968: jis0212<<14 | 0x23<<7 | 0x0B,
-	26861 - 19968: jis0212<<14 | 0x23<<7 | 0x0C,
-	26862 - 19968: jis0208<<14 | 0x1E<<7 | 0x18,
-	26863 - 19968: jis0208<<14 | 0x3B<<7 | 0x0B,
-	26864 - 19968: jis0212<<14 | 0x23<<7 | 0x0D,
-	26865 - 19968: jis0212<<14 | 0x23<<7 | 0x0E,
-	26866 - 19968: jis0208<<14 | 0x1F<<7 | 0x12,
-	26869 - 19968: jis0212<<14 | 0x23<<7 | 0x0F,
-	26870 - 19968: jis0212<<14 | 0x23<<7 | 0x10,
-	26873 - 19968: jis0208<<14 | 0x3B<<7 | 0x09,
-	26874 - 19968: jis0208<<14 | 0x13<<7 | 0x1C,
-	26875 - 19968: jis0212<<14 | 0x23<<7 | 0x11,
-	26876 - 19968: jis0212<<14 | 0x23<<7 | 0x12,
-	26877 - 19968: jis0212<<14 | 0x23<<7 | 0x13,
-	26880 - 19968: jis0208<<14 | 0x2E<<7 | 0x2F,
-	26881 - 19968: jis0208<<14 | 0x3A<<7 | 0x55,
-	26884 - 19968: jis0208<<14 | 0x3B<<7 | 0x05,
-	26885 - 19968: jis0208<<14 | 0x0F<<7 | 0x37,
-	26886 - 19968: jis0212<<14 | 0x23<<7 | 0x14,
-	26888 - 19968: jis0208<<14 | 0x3A<<7 | 0x57,
-	26889 - 19968: jis0212<<14 | 0x23<<7 | 0x15,
-	26890 - 19968: jis0212<<14 | 0x23<<7 | 0x16,
-	26891 - 19968: jis0208<<14 | 0x2B<<7 | 0x19,
-	26892 - 19968: jis0208<<14 | 0x3A<<7 | 0x5C,
-	26893 - 19968: jis0208<<14 | 0x1E<<7 | 0x01,
-	26894 - 19968: jis0208<<14 | 0x23<<7 | 0x26,
-	26895 - 19968: jis0208<<14 | 0x3A<<7 | 0x52,
-	26896 - 19968: jis0212<<14 | 0x23<<7 | 0x17,
-	26897 - 19968: jis0212<<14 | 0x23<<7 | 0x18,
-	26898 - 19968: jis0208<<14 | 0x3B<<7 | 0x04,
-	26899 - 19968: jis0212<<14 | 0x23<<7 | 0x19,
-	26902 - 19968: jis0212<<14 | 0x23<<7 | 0x1A,
-	26903 - 19968: jis0212<<14 | 0x23<<7 | 0x1B,
-	26905 - 19968: jis0208<<14 | 0x1E<<7 | 0x59,
-	26906 - 19968: jis0208<<14 | 0x3B<<7 | 0x0E,
-	26907 - 19968: jis0208<<14 | 0x12<<7 | 0x50,
-	26908 - 19968: jis0208<<14 | 0x17<<7 | 0x00,
-	26913 - 19968: jis0208<<14 | 0x3B<<7 | 0x10,
-	26914 - 19968: jis0208<<14 | 0x3A<<7 | 0x59,
-	26915 - 19968: jis0208<<14 | 0x3B<<7 | 0x0F,
-	26917 - 19968: jis0208<<14 | 0x3B<<7 | 0x08,
-	26918 - 19968: jis0208<<14 | 0x3A<<7 | 0x5A,
-	26920 - 19968: jis0208<<14 | 0x3B<<7 | 0x0C,
-	26922 - 19968: jis0208<<14 | 0x3B<<7 | 0x0D,
-	26928 - 19968: jis0208<<14 | 0x3B<<7 | 0x1E,
-	26929 - 19968: jis0212<<14 | 0x23<<7 | 0x1C,
-	26931 - 19968: jis0212<<14 | 0x23<<7 | 0x1D,
-	26932 - 19968: jis0208<<14 | 0x25<<7 | 0x2D,
-	26933 - 19968: jis0212<<14 | 0x23<<7 | 0x1E,
-	26934 - 19968: jis0208<<14 | 0x3B<<7 | 0x03,
-	26936 - 19968: jis0212<<14 | 0x23<<7 | 0x1F,
-	26937 - 19968: jis0208<<14 | 0x3B<<7 | 0x1A,
-	26939 - 19968: jis0212<<14 | 0x23<<7 | 0x20,
-	26941 - 19968: jis0208<<14 | 0x3B<<7 | 0x1C,
-	26943 - 19968: jis0208<<14 | 0x23<<7 | 0x37,
-	26946 - 19968: jis0212<<14 | 0x23<<7 | 0x21,
-	26949 - 19968: jis0212<<14 | 0x23<<7 | 0x22,
-	26953 - 19968: jis0212<<14 | 0x23<<7 | 0x23,
-	26954 - 19968: jis0208<<14 | 0x2C<<7 | 0x2B,
-	26958 - 19968: jis0212<<14 | 0x23<<7 | 0x24,
-	26963 - 19968: jis0208<<14 | 0x28<<7 | 0x55,
-	26964 - 19968: jis0208<<14 | 0x3B<<7 | 0x17,
-	26965 - 19968: jis0208<<14 | 0x21<<7 | 0x29,
-	26967 - 19968: jis0212<<14 | 0x23<<7 | 0x25,
-	26969 - 19968: jis0208<<14 | 0x3B<<7 | 0x1D,
-	26970 - 19968: jis0208<<14 | 0x20<<7 | 0x1E,
-	26971 - 19968: jis0212<<14 | 0x23<<7 | 0x26,
-	26972 - 19968: jis0208<<14 | 0x3B<<7 | 0x14,
-	26973 - 19968: jis0208<<14 | 0x3B<<7 | 0x21,
-	26974 - 19968: jis0208<<14 | 0x3B<<7 | 0x20,
-	26976 - 19968: jis0208<<14 | 0x25<<7 | 0x4E,
-	26977 - 19968: jis0208<<14 | 0x3B<<7 | 0x1F,
-	26978 - 19968: jis0208<<14 | 0x25<<7 | 0x49,
-	26979 - 19968: jis0212<<14 | 0x23<<7 | 0x27,
-	26980 - 19968: jis0212<<14 | 0x23<<7 | 0x28,
-	26981 - 19968: jis0212<<14 | 0x23<<7 | 0x29,
-	26982 - 19968: jis0212<<14 | 0x23<<7 | 0x2A,
-	26984 - 19968: jis0208<<14 | 0x59<<7 | 0x2E,
-	26985 - 19968: jis0212<<14 | 0x23<<7 | 0x2C,
-	26986 - 19968: jis0208<<14 | 0x3B<<7 | 0x23,
-	26987 - 19968: jis0208<<14 | 0x3B<<7 | 0x16,
-	26988 - 19968: jis0212<<14 | 0x23<<7 | 0x2D,
-	26989 - 19968: jis0208<<14 | 0x15<<7 | 0x27,
-	26990 - 19968: jis0208<<14 | 0x3B<<7 | 0x19,
-	26991 - 19968: jis0208<<14 | 0x1C<<7 | 0x3C,
-	26992 - 19968: jis0212<<14 | 0x23<<7 | 0x2E,
-	26993 - 19968: jis0212<<14 | 0x23<<7 | 0x2F,
-	26994 - 19968: jis0212<<14 | 0x23<<7 | 0x30,
-	26995 - 19968: jis0208<<14 | 0x26<<7 | 0x3F,
-	26996 - 19968: jis0208<<14 | 0x3B<<7 | 0x1B,
-	26997 - 19968: jis0208<<14 | 0x15<<7 | 0x2A,
-	26999 - 19968: jis0208<<14 | 0x3B<<7 | 0x13,
-	27000 - 19968: jis0208<<14 | 0x3B<<7 | 0x15,
-	27001 - 19968: jis0208<<14 | 0x3B<<7 | 0x12,
-	27002 - 19968: jis0212<<14 | 0x23<<7 | 0x31,
-	27003 - 19968: jis0212<<14 | 0x23<<7 | 0x32,
-	27004 - 19968: jis0208<<14 | 0x2E<<7 | 0x0F,
-	27005 - 19968: jis0208<<14 | 0x12<<7 | 0x39,
-	27006 - 19968: jis0208<<14 | 0x3B<<7 | 0x18,
-	27007 - 19968: jis0212<<14 | 0x23<<7 | 0x33,
-	27008 - 19968: jis0212<<14 | 0x23<<7 | 0x34,
-	27009 - 19968: jis0208<<14 | 0x3B<<7 | 0x22,
-	27010 - 19968: jis0208<<14 | 0x12<<7 | 0x14,
-	27018 - 19968: jis0208<<14 | 0x19<<7 | 0x46,
-	27021 - 19968: jis0212<<14 | 0x23<<7 | 0x35,
-	27022 - 19968: jis0208<<14 | 0x10<<7 | 0x3C,
-	27025 - 19968: jis0208<<14 | 0x3B<<7 | 0x33,
-	27026 - 19968: jis0212<<14 | 0x23<<7 | 0x36,
-	27028 - 19968: jis0208<<14 | 0x2E<<7 | 0x10,
-	27029 - 19968: jis0208<<14 | 0x3B<<7 | 0x36,
-	27030 - 19968: jis0212<<14 | 0x23<<7 | 0x37,
-	27032 - 19968: jis0208<<14 | 0x59<<7 | 0x30,
-	27035 - 19968: jis0208<<14 | 0x1E<<7 | 0x19,
-	27036 - 19968: jis0208<<14 | 0x3B<<7 | 0x35,
-	27040 - 19968: jis0208<<14 | 0x3B<<7 | 0x34,
-	27041 - 19968: jis0212<<14 | 0x23<<7 | 0x39,
-	27045 - 19968: jis0212<<14 | 0x23<<7 | 0x3A,
-	27046 - 19968: jis0212<<14 | 0x23<<7 | 0x3B,
-	27047 - 19968: jis0208<<14 | 0x3B<<7 | 0x31,
-	27048 - 19968: jis0212<<14 | 0x23<<7 | 0x3C,
-	27051 - 19968: jis0212<<14 | 0x23<<7 | 0x3D,
-	27053 - 19968: jis0212<<14 | 0x23<<7 | 0x3E,
-	27054 - 19968: jis0208<<14 | 0x3B<<7 | 0x25,
-	27055 - 19968: jis0212<<14 | 0x23<<7 | 0x3F,
-	27057 - 19968: jis0208<<14 | 0x3B<<7 | 0x42,
-	27058 - 19968: jis0208<<14 | 0x3B<<7 | 0x24,
-	27060 - 19968: jis0208<<14 | 0x3B<<7 | 0x37,
-	27063 - 19968: jis0212<<14 | 0x23<<7 | 0x40,
-	27064 - 19968: jis0212<<14 | 0x23<<7 | 0x41,
-	27066 - 19968: jis0212<<14 | 0x23<<7 | 0x42,
-	27067 - 19968: jis0208<<14 | 0x3B<<7 | 0x2F,
-	27068 - 19968: jis0212<<14 | 0x23<<7 | 0x43,
-	27070 - 19968: jis0208<<14 | 0x3B<<7 | 0x2A,
-	27071 - 19968: jis0208<<14 | 0x3B<<7 | 0x27,
-	27073 - 19968: jis0208<<14 | 0x3B<<7 | 0x28,
-	27075 - 19968: jis0208<<14 | 0x3B<<7 | 0x30,
-	27077 - 19968: jis0212<<14 | 0x23<<7 | 0x44,
-	27079 - 19968: jis0208<<14 | 0x53<<7 | 0x01,
-	27080 - 19968: jis0212<<14 | 0x23<<7 | 0x45,
-	27082 - 19968: jis0208<<14 | 0x3B<<7 | 0x2D,
-	27083 - 19968: jis0208<<14 | 0x18<<7 | 0x1C,
-	27084 - 19968: jis0208<<14 | 0x23<<7 | 0x27,
-	27085 - 19968: jis0208<<14 | 0x20<<7 | 0x43,
-	27086 - 19968: jis0208<<14 | 0x3B<<7 | 0x2B,
-	27088 - 19968: jis0208<<14 | 0x3B<<7 | 0x26,
-	27089 - 19968: jis0212<<14 | 0x23<<7 | 0x46,
-	27091 - 19968: jis0208<<14 | 0x3B<<7 | 0x29,
-	27094 - 19968: jis0212<<14 | 0x23<<7 | 0x47,
-	27095 - 19968: jis0212<<14 | 0x23<<7 | 0x48,
-	27096 - 19968: jis0208<<14 | 0x2C<<7 | 0x2C,
-	27097 - 19968: jis0208<<14 | 0x2A<<7 | 0x49,
-	27101 - 19968: jis0208<<14 | 0x3B<<7 | 0x2E,
-	27102 - 19968: jis0208<<14 | 0x3B<<7 | 0x38,
-	27106 - 19968: jis0208<<14 | 0x59<<7 | 0x31,
-	27109 - 19968: jis0212<<14 | 0x23<<7 | 0x4A,
-	27111 - 19968: jis0208<<14 | 0x3B<<7 | 0x40,
-	27112 - 19968: jis0208<<14 | 0x3B<<7 | 0x39,
-	27115 - 19968: jis0208<<14 | 0x3B<<7 | 0x46,
-	27117 - 19968: jis0208<<14 | 0x3B<<7 | 0x44,
-	27118 - 19968: jis0212<<14 | 0x23<<7 | 0x4B,
-	27119 - 19968: jis0212<<14 | 0x23<<7 | 0x4C,
-	27121 - 19968: jis0212<<14 | 0x23<<7 | 0x4D,
-	27122 - 19968: jis0208<<14 | 0x3B<<7 | 0x3F,
-	27123 - 19968: jis0212<<14 | 0x23<<7 | 0x4E,
-	27125 - 19968: jis0212<<14 | 0x23<<7 | 0x4F,
-	27129 - 19968: jis0208<<14 | 0x3B<<7 | 0x3E,
-	27131 - 19968: jis0208<<14 | 0x23<<7 | 0x2F,
-	27133 - 19968: jis0208<<14 | 0x20<<7 | 0x44,
-	27134 - 19968: jis0212<<14 | 0x23<<7 | 0x50,
-	27135 - 19968: jis0208<<14 | 0x3B<<7 | 0x3C,
-	27136 - 19968: jis0212<<14 | 0x23<<7 | 0x51,
-	27137 - 19968: jis0212<<14 | 0x23<<7 | 0x52,
-	27138 - 19968: jis0208<<14 | 0x3B<<7 | 0x3A,
-	27139 - 19968: jis0212<<14 | 0x23<<7 | 0x53,
-	27141 - 19968: jis0208<<14 | 0x3B<<7 | 0x41,
-	27146 - 19968: jis0208<<14 | 0x3B<<7 | 0x47,
-	27147 - 19968: jis0208<<14 | 0x27<<7 | 0x54,
-	27148 - 19968: jis0208<<14 | 0x3B<<7 | 0x4D,
-	27151 - 19968: jis0212<<14 | 0x23<<7 | 0x54,
-	27153 - 19968: jis0212<<14 | 0x23<<7 | 0x55,
-	27154 - 19968: jis0208<<14 | 0x3B<<7 | 0x48,
-	27155 - 19968: jis0208<<14 | 0x3B<<7 | 0x4B,
-	27156 - 19968: jis0208<<14 | 0x3B<<7 | 0x45,
-	27157 - 19968: jis0212<<14 | 0x23<<7 | 0x56,
-	27159 - 19968: jis0208<<14 | 0x22<<7 | 0x53,
-	27161 - 19968: jis0208<<14 | 0x28<<7 | 0x17,
-	27162 - 19968: jis0212<<14 | 0x23<<7 | 0x57,
-	27163 - 19968: jis0208<<14 | 0x3B<<7 | 0x3B,
-	27165 - 19968: jis0212<<14 | 0x23<<7 | 0x58,
-	27166 - 19968: jis0208<<14 | 0x3B<<7 | 0x43,
-	27167 - 19968: jis0208<<14 | 0x1D<<7 | 0x1F,
-	27168 - 19968: jis0212<<14 | 0x23<<7 | 0x59,
-	27169 - 19968: jis0208<<14 | 0x2B<<7 | 0x2E,
-	27170 - 19968: jis0208<<14 | 0x3B<<7 | 0x57,
-	27171 - 19968: jis0208<<14 | 0x3B<<7 | 0x4A,
-	27172 - 19968: jis0212<<14 | 0x23<<7 | 0x5A,
-	27176 - 19968: jis0212<<14 | 0x23<<7 | 0x5B,
-	27177 - 19968: jis0208<<14 | 0x17<<7 | 0x01,
-	27178 - 19968: jis0208<<14 | 0x11<<7 | 0x02,
-	27179 - 19968: jis0208<<14 | 0x12<<7 | 0x3E,
-	27182 - 19968: jis0208<<14 | 0x3B<<7 | 0x32,
-	27184 - 19968: jis0208<<14 | 0x59<<7 | 0x32,
-	27186 - 19968: jis0212<<14 | 0x23<<7 | 0x5D,
-	27188 - 19968: jis0212<<14 | 0x24<<7 | 0x00,
-	27189 - 19968: jis0208<<14 | 0x1D<<7 | 0x20,
-	27190 - 19968: jis0208<<14 | 0x3B<<7 | 0x4F,
-	27191 - 19968: jis0212<<14 | 0x24<<7 | 0x01,
-	27192 - 19968: jis0208<<14 | 0x3B<<7 | 0x56,
-	27193 - 19968: jis0208<<14 | 0x1B<<7 | 0x58,
-	27194 - 19968: jis0208<<14 | 0x12<<7 | 0x51,
-	27195 - 19968: jis0212<<14 | 0x24<<7 | 0x02,
-	27197 - 19968: jis0208<<14 | 0x22<<7 | 0x0D,
-	27198 - 19968: jis0212<<14 | 0x24<<7 | 0x03,
-	27199 - 19968: jis0212<<14 | 0x24<<7 | 0x04,
-	27204 - 19968: jis0208<<14 | 0x3B<<7 | 0x4C,
-	27205 - 19968: jis0212<<14 | 0x24<<7 | 0x05,
-	27206 - 19968: jis0208<<14 | 0x59<<7 | 0x34,
-	27207 - 19968: jis0208<<14 | 0x3B<<7 | 0x51,
-	27208 - 19968: jis0208<<14 | 0x3B<<7 | 0x55,
-	27209 - 19968: jis0212<<14 | 0x24<<7 | 0x07,
-	27210 - 19968: jis0212<<14 | 0x24<<7 | 0x08,
-	27211 - 19968: jis0208<<14 | 0x15<<7 | 0x15,
-	27214 - 19968: jis0212<<14 | 0x24<<7 | 0x09,
-	27216 - 19968: jis0212<<14 | 0x24<<7 | 0x0A,
-	27217 - 19968: jis0212<<14 | 0x24<<7 | 0x0B,
-	27218 - 19968: jis0212<<14 | 0x24<<7 | 0x0C,
-	27221 - 19968: jis0212<<14 | 0x24<<7 | 0x0D,
-	27222 - 19968: jis0212<<14 | 0x24<<7 | 0x0E,
-	27224 - 19968: jis0208<<14 | 0x14<<7 | 0x2B,
-	27225 - 19968: jis0208<<14 | 0x3B<<7 | 0x53,
-	27227 - 19968: jis0212<<14 | 0x24<<7 | 0x0F,
-	27231 - 19968: jis0208<<14 | 0x14<<7 | 0x00,
-	27233 - 19968: jis0208<<14 | 0x25<<7 | 0x2A,
-	27234 - 19968: jis0208<<14 | 0x3B<<7 | 0x52,
-	27236 - 19968: jis0212<<14 | 0x24<<7 | 0x10,
-	27238 - 19968: jis0208<<14 | 0x3B<<7 | 0x54,
-	27239 - 19968: jis0212<<14 | 0x24<<7 | 0x11,
-	27242 - 19968: jis0212<<14 | 0x24<<7 | 0x12,
-	27243 - 19968: jis0208<<14 | 0x59<<7 | 0x33,
-	27249 - 19968: jis0212<<14 | 0x24<<7 | 0x13,
-	27250 - 19968: jis0208<<14 | 0x3B<<7 | 0x4E,
-	27251 - 19968: jis0208<<14 | 0x59<<7 | 0x35,
-	27256 - 19968: jis0208<<14 | 0x3B<<7 | 0x50,
-	27262 - 19968: jis0208<<14 | 0x59<<7 | 0x36,
-	27263 - 19968: jis0208<<14 | 0x12<<7 | 0x3F,
-	27264 - 19968: jis0208<<14 | 0x22<<7 | 0x28,
-	27265 - 19968: jis0212<<14 | 0x24<<7 | 0x16,
-	27267 - 19968: jis0212<<14 | 0x24<<7 | 0x17,
-	27268 - 19968: jis0208<<14 | 0x3B<<7 | 0x5B,
-	27270 - 19968: jis0212<<14 | 0x24<<7 | 0x18,
-	27271 - 19968: jis0212<<14 | 0x24<<7 | 0x19,
-	27273 - 19968: jis0212<<14 | 0x24<<7 | 0x1A,
-	27275 - 19968: jis0212<<14 | 0x24<<7 | 0x1B,
-	27277 - 19968: jis0208<<14 | 0x3B<<7 | 0x59,
-	27278 - 19968: jis0208<<14 | 0x17<<7 | 0x48,
-	27280 - 19968: jis0208<<14 | 0x3B<<7 | 0x58,
-	27281 - 19968: jis0212<<14 | 0x24<<7 | 0x1C,
-	27287 - 19968: jis0208<<14 | 0x3C<<7 | 0x00,
-	27291 - 19968: jis0212<<14 | 0x24<<7 | 0x1D,
-	27292 - 19968: jis0208<<14 | 0x3A<<7 | 0x37,
-	27293 - 19968: jis0212<<14 | 0x24<<7 | 0x1E,
-	27294 - 19968: jis0212<<14 | 0x24<<7 | 0x1F,
-	27295 - 19968: jis0212<<14 | 0x24<<7 | 0x20,
-	27296 - 19968: jis0208<<14 | 0x3B<<7 | 0x5A,
-	27298 - 19968: jis0208<<14 | 0x3B<<7 | 0x5C,
-	27299 - 19968: jis0208<<14 | 0x3B<<7 | 0x5D,
-	27301 - 19968: jis0212<<14 | 0x24<<7 | 0x21,
-	27306 - 19968: jis0208<<14 | 0x3C<<7 | 0x0B,
-	27307 - 19968: jis0212<<14 | 0x24<<7 | 0x22,
-	27308 - 19968: jis0208<<14 | 0x3C<<7 | 0x07,
-	27310 - 19968: jis0208<<14 | 0x3A<<7 | 0x4C,
-	27311 - 19968: jis0212<<14 | 0x24<<7 | 0x23,
-	27312 - 19968: jis0212<<14 | 0x24<<7 | 0x24,
-	27313 - 19968: jis0212<<14 | 0x24<<7 | 0x25,
-	27315 - 19968: jis0208<<14 | 0x3C<<7 | 0x06,
-	27316 - 19968: jis0212<<14 | 0x24<<7 | 0x26,
-	27320 - 19968: jis0208<<14 | 0x3C<<7 | 0x05,
-	27323 - 19968: jis0208<<14 | 0x3C<<7 | 0x02,
-	27325 - 19968: jis0212<<14 | 0x24<<7 | 0x27,
-	27326 - 19968: jis0212<<14 | 0x24<<7 | 0x28,
-	27327 - 19968: jis0212<<14 | 0x24<<7 | 0x29,
-	27329 - 19968: jis0208<<14 | 0x3B<<7 | 0x49,
-	27330 - 19968: jis0208<<14 | 0x3C<<7 | 0x04,
-	27331 - 19968: jis0208<<14 | 0x3C<<7 | 0x03,
-	27334 - 19968: jis0212<<14 | 0x24<<7 | 0x2A,
-	27336 - 19968: jis0212<<14 | 0x24<<7 | 0x2C,
-	27337 - 19968: jis0212<<14 | 0x24<<7 | 0x2B,
-	27340 - 19968: jis0212<<14 | 0x24<<7 | 0x2D,
-	27344 - 19968: jis0212<<14 | 0x24<<7 | 0x2E,
-	27345 - 19968: jis0208<<14 | 0x3C<<7 | 0x09,
-	27347 - 19968: jis0208<<14 | 0x2E<<7 | 0x05,
-	27348 - 19968: jis0212<<14 | 0x24<<7 | 0x2F,
-	27349 - 19968: jis0212<<14 | 0x24<<7 | 0x30,
-	27350 - 19968: jis0212<<14 | 0x24<<7 | 0x31,
-	27354 - 19968: jis0208<<14 | 0x3C<<7 | 0x0C,
-	27355 - 19968: jis0208<<14 | 0x15<<7 | 0x5A,
-	27356 - 19968: jis0212<<14 | 0x24<<7 | 0x32,
-	27357 - 19968: jis0212<<14 | 0x24<<7 | 0x33,
-	27358 - 19968: jis0208<<14 | 0x3C<<7 | 0x08,
-	27359 - 19968: jis0208<<14 | 0x3C<<7 | 0x0A,
-	27362 - 19968: jis0208<<14 | 0x59<<7 | 0x37,
-	27364 - 19968: jis0208<<14 | 0x59<<7 | 0x38,
-	27367 - 19968: jis0212<<14 | 0x24<<7 | 0x35,
-	27368 - 19968: jis0208<<14 | 0x27<<7 | 0x06,
-	27370 - 19968: jis0208<<14 | 0x3C<<7 | 0x0D,
-	27372 - 19968: jis0212<<14 | 0x24<<7 | 0x36,
-	27376 - 19968: jis0212<<14 | 0x24<<7 | 0x37,
-	27377 - 19968: jis0212<<14 | 0x24<<7 | 0x38,
-	27378 - 19968: jis0212<<14 | 0x24<<7 | 0x39,
-	27386 - 19968: jis0208<<14 | 0x3C<<7 | 0x11,
-	27387 - 19968: jis0208<<14 | 0x3C<<7 | 0x0E,
-	27388 - 19968: jis0212<<14 | 0x24<<7 | 0x3A,
-	27389 - 19968: jis0212<<14 | 0x24<<7 | 0x3B,
-	27394 - 19968: jis0212<<14 | 0x24<<7 | 0x3C,
-	27395 - 19968: jis0212<<14 | 0x24<<7 | 0x3D,
-	27396 - 19968: jis0208<<14 | 0x2C<<7 | 0x52,
-	27397 - 19968: jis0208<<14 | 0x3C<<7 | 0x0F,
-	27398 - 19968: jis0212<<14 | 0x24<<7 | 0x3E,
-	27399 - 19968: jis0212<<14 | 0x24<<7 | 0x3F,
-	27401 - 19968: jis0212<<14 | 0x24<<7 | 0x40,
-	27402 - 19968: jis0208<<14 | 0x3B<<7 | 0x3D,
-	27407 - 19968: jis0212<<14 | 0x24<<7 | 0x41,
-	27408 - 19968: jis0212<<14 | 0x24<<7 | 0x42,
-	27409 - 19968: jis0212<<14 | 0x24<<7 | 0x43,
-	27410 - 19968: jis0208<<14 | 0x3C<<7 | 0x12,
-	27414 - 19968: jis0208<<14 | 0x3C<<7 | 0x13,
-	27415 - 19968: jis0212<<14 | 0x24<<7 | 0x44,
-	27419 - 19968: jis0212<<14 | 0x24<<7 | 0x45,
-	27421 - 19968: jis0208<<14 | 0x10<<7 | 0x14,
-	27422 - 19968: jis0212<<14 | 0x24<<7 | 0x46,
-	27423 - 19968: jis0208<<14 | 0x3C<<7 | 0x15,
-	27424 - 19968: jis0208<<14 | 0x16<<7 | 0x46,
-	27425 - 19968: jis0208<<14 | 0x1B<<7 | 0x00,
-	27427 - 19968: jis0208<<14 | 0x15<<7 | 0x34,
-	27428 - 19968: jis0212<<14 | 0x24<<7 | 0x47,
-	27431 - 19968: jis0208<<14 | 0x11<<7 | 0x03,
-	27432 - 19968: jis0212<<14 | 0x24<<7 | 0x48,
-	27435 - 19968: jis0212<<14 | 0x24<<7 | 0x49,
-	27436 - 19968: jis0212<<14 | 0x24<<7 | 0x4A,
-	27439 - 19968: jis0212<<14 | 0x24<<7 | 0x4B,
-	27442 - 19968: jis0208<<14 | 0x2C<<7 | 0x3E,
-	27445 - 19968: jis0212<<14 | 0x24<<7 | 0x4C,
-	27446 - 19968: jis0212<<14 | 0x24<<7 | 0x4D,
-	27447 - 19968: jis0208<<14 | 0x3C<<7 | 0x17,
-	27448 - 19968: jis0208<<14 | 0x3C<<7 | 0x16,
-	27449 - 19968: jis0208<<14 | 0x3C<<7 | 0x19,
-	27450 - 19968: jis0208<<14 | 0x14<<7 | 0x1C,
-	27451 - 19968: jis0212<<14 | 0x24<<7 | 0x4E,
-	27453 - 19968: jis0208<<14 | 0x15<<7 | 0x35,
-	27454 - 19968: jis0208<<14 | 0x13<<7 | 0x1D,
-	27455 - 19968: jis0212<<14 | 0x24<<7 | 0x4F,
-	27459 - 19968: jis0208<<14 | 0x3C<<7 | 0x1C,
-	27462 - 19968: jis0212<<14 | 0x24<<7 | 0x50,
-	27463 - 19968: jis0208<<14 | 0x3C<<7 | 0x1B,
-	27465 - 19968: jis0208<<14 | 0x3C<<7 | 0x1D,
-	27466 - 19968: jis0212<<14 | 0x24<<7 | 0x51,
-	27468 - 19968: jis0208<<14 | 0x11<<7 | 0x2D,
-	27469 - 19968: jis0212<<14 | 0x24<<7 | 0x52,
-	27470 - 19968: jis0208<<14 | 0x22<<7 | 0x16,
-	27472 - 19968: jis0208<<14 | 0x3C<<7 | 0x1E,
-	27474 - 19968: jis0212<<14 | 0x24<<7 | 0x53,
-	27475 - 19968: jis0208<<14 | 0x13<<7 | 0x1E,
-	27476 - 19968: jis0208<<14 | 0x3C<<7 | 0x20,
-	27478 - 19968: jis0212<<14 | 0x24<<7 | 0x54,
-	27480 - 19968: jis0212<<14 | 0x24<<7 | 0x55,
-	27481 - 19968: jis0208<<14 | 0x3C<<7 | 0x1F,
-	27483 - 19968: jis0208<<14 | 0x3C<<7 | 0x21,
-	27485 - 19968: jis0212<<14 | 0x24<<7 | 0x56,
-	27487 - 19968: jis0208<<14 | 0x3C<<7 | 0x22,
-	27488 - 19968: jis0212<<14 | 0x24<<7 | 0x57,
-	27489 - 19968: jis0208<<14 | 0x3C<<7 | 0x23,
-	27490 - 19968: jis0208<<14 | 0x1A<<7 | 0x3E,
-	27491 - 19968: jis0208<<14 | 0x1F<<7 | 0x14,
-	27492 - 19968: jis0208<<14 | 0x19<<7 | 0x00,
-	27494 - 19968: jis0208<<14 | 0x28<<7 | 0x4F,
-	27495 - 19968: jis0212<<14 | 0x24<<7 | 0x58,
-	27497 - 19968: jis0208<<14 | 0x29<<7 | 0x41,
-	27498 - 19968: jis0208<<14 | 0x2E<<7 | 0x23,
-	27499 - 19968: jis0212<<14 | 0x24<<7 | 0x59,
-	27502 - 19968: jis0212<<14 | 0x24<<7 | 0x5A,
-	27503 - 19968: jis0208<<14 | 0x1A<<7 | 0x54,
-	27504 - 19968: jis0212<<14 | 0x24<<7 | 0x5B,
-	27507 - 19968: jis0208<<14 | 0x19<<7 | 0x2F,
-	27508 - 19968: jis0208<<14 | 0x2D<<7 | 0x51,
-	27509 - 19968: jis0212<<14 | 0x24<<7 | 0x5C,
-	27512 - 19968: jis0208<<14 | 0x3C<<7 | 0x24,
-	27513 - 19968: jis0208<<14 | 0x3C<<7 | 0x25,
-	27515 - 19968: jis0208<<14 | 0x1A<<7 | 0x3F,
-	27517 - 19968: jis0212<<14 | 0x24<<7 | 0x5D,
-	27518 - 19968: jis0212<<14 | 0x25<<7 | 0x00,
-	27519 - 19968: jis0208<<14 | 0x3C<<7 | 0x26,
-	27520 - 19968: jis0208<<14 | 0x3C<<7 | 0x27,
-	27522 - 19968: jis0212<<14 | 0x25<<7 | 0x01,
-	27523 - 19968: jis0208<<14 | 0x3C<<7 | 0x29,
-	27524 - 19968: jis0208<<14 | 0x3C<<7 | 0x28,
-	27525 - 19968: jis0212<<14 | 0x25<<7 | 0x02,
-	27526 - 19968: jis0208<<14 | 0x2A<<7 | 0x37,
-	27529 - 19968: jis0208<<14 | 0x1C<<7 | 0x3D,
-	27530 - 19968: jis0208<<14 | 0x1B<<7 | 0x4B,
-	27531 - 19968: jis0208<<14 | 0x1A<<7 | 0x23,
-	27533 - 19968: jis0208<<14 | 0x3C<<7 | 0x2A,
-	27541 - 19968: jis0208<<14 | 0x3C<<7 | 0x2C,
-	27542 - 19968: jis0208<<14 | 0x1E<<7 | 0x02,
-	27543 - 19968: jis0212<<14 | 0x25<<7 | 0x03,
-	27544 - 19968: jis0208<<14 | 0x3C<<7 | 0x2B,
-	27547 - 19968: jis0212<<14 | 0x25<<7 | 0x04,
-	27550 - 19968: jis0208<<14 | 0x3C<<7 | 0x2D,
-	27551 - 19968: jis0212<<14 | 0x25<<7 | 0x05,
-	27552 - 19968: jis0212<<14 | 0x25<<7 | 0x06,
-	27554 - 19968: jis0212<<14 | 0x25<<7 | 0x07,
-	27555 - 19968: jis0212<<14 | 0x25<<7 | 0x08,
-	27556 - 19968: jis0208<<14 | 0x3C<<7 | 0x2E,
-	27560 - 19968: jis0212<<14 | 0x25<<7 | 0x09,
-	27561 - 19968: jis0212<<14 | 0x25<<7 | 0x0A,
-	27562 - 19968: jis0208<<14 | 0x3C<<7 | 0x2F,
-	27563 - 19968: jis0208<<14 | 0x3C<<7 | 0x30,
-	27564 - 19968: jis0212<<14 | 0x25<<7 | 0x0B,
-	27565 - 19968: jis0212<<14 | 0x25<<7 | 0x0C,
-	27566 - 19968: jis0212<<14 | 0x25<<7 | 0x0D,
-	27567 - 19968: jis0208<<14 | 0x3C<<7 | 0x31,
-	27568 - 19968: jis0212<<14 | 0x25<<7 | 0x0E,
-	27569 - 19968: jis0208<<14 | 0x3C<<7 | 0x33,
-	27570 - 19968: jis0208<<14 | 0x3C<<7 | 0x32,
-	27571 - 19968: jis0208<<14 | 0x3C<<7 | 0x34,
-	27572 - 19968: jis0208<<14 | 0x11<<7 | 0x04,
-	27573 - 19968: jis0208<<14 | 0x22<<7 | 0x29,
-	27575 - 19968: jis0208<<14 | 0x3C<<7 | 0x35,
-	27576 - 19968: jis0212<<14 | 0x25<<7 | 0x0F,
-	27577 - 19968: jis0212<<14 | 0x25<<7 | 0x10,
-	27578 - 19968: jis0208<<14 | 0x1A<<7 | 0x05,
-	27579 - 19968: jis0208<<14 | 0x12<<7 | 0x2B,
-	27580 - 19968: jis0208<<14 | 0x3C<<7 | 0x36,
-	27581 - 19968: jis0212<<14 | 0x25<<7 | 0x11,
-	27582 - 19968: jis0212<<14 | 0x25<<7 | 0x12,
-	27583 - 19968: jis0208<<14 | 0x24<<7 | 0x21,
-	27584 - 19968: jis0208<<14 | 0x33<<7 | 0x2B,
-	27587 - 19968: jis0212<<14 | 0x25<<7 | 0x13,
-	27588 - 19968: jis0212<<14 | 0x25<<7 | 0x14,
-	27589 - 19968: jis0208<<14 | 0x14<<7 | 0x02,
-	27590 - 19968: jis0208<<14 | 0x3C<<7 | 0x37,
-	27593 - 19968: jis0212<<14 | 0x25<<7 | 0x15,
-	27595 - 19968: jis0208<<14 | 0x3C<<7 | 0x38,
-	27596 - 19968: jis0212<<14 | 0x25<<7 | 0x16,
-	27597 - 19968: jis0208<<14 | 0x29<<7 | 0x4B,
-	27598 - 19968: jis0208<<14 | 0x2A<<7 | 0x47,
-	27602 - 19968: jis0208<<14 | 0x25<<7 | 0x26,
-	27603 - 19968: jis0208<<14 | 0x3C<<7 | 0x39,
-	27604 - 19968: jis0208<<14 | 0x27<<7 | 0x45,
-	27606 - 19968: jis0208<<14 | 0x59<<7 | 0x39,
-	27608 - 19968: jis0208<<14 | 0x27<<7 | 0x5A,
-	27610 - 19968: jis0212<<14 | 0x25<<7 | 0x18,
-	27611 - 19968: jis0208<<14 | 0x2B<<7 | 0x32,
-	27615 - 19968: jis0208<<14 | 0x3C<<7 | 0x3A,
-	27617 - 19968: jis0212<<14 | 0x25<<7 | 0x19,
-	27619 - 19968: jis0212<<14 | 0x25<<7 | 0x1A,
-	27622 - 19968: jis0212<<14 | 0x25<<7 | 0x1B,
-	27623 - 19968: jis0212<<14 | 0x25<<7 | 0x1C,
-	27627 - 19968: jis0208<<14 | 0x3C<<7 | 0x3C,
-	27628 - 19968: jis0208<<14 | 0x3C<<7 | 0x3B,
-	27630 - 19968: jis0212<<14 | 0x25<<7 | 0x1D,
-	27631 - 19968: jis0208<<14 | 0x3C<<7 | 0x3E,
-	27633 - 19968: jis0212<<14 | 0x25<<7 | 0x1E,
-	27635 - 19968: jis0208<<14 | 0x3C<<7 | 0x3D,
-	27639 - 19968: jis0212<<14 | 0x25<<7 | 0x1F,
-	27641 - 19968: jis0212<<14 | 0x25<<7 | 0x20,
-	27647 - 19968: jis0212<<14 | 0x25<<7 | 0x21,
-	27650 - 19968: jis0212<<14 | 0x25<<7 | 0x22,
-	27652 - 19968: jis0212<<14 | 0x25<<7 | 0x23,
-	27653 - 19968: jis0212<<14 | 0x25<<7 | 0x24,
-	27656 - 19968: jis0208<<14 | 0x3C<<7 | 0x40,
-	27657 - 19968: jis0212<<14 | 0x25<<7 | 0x25,
-	27661 - 19968: jis0212<<14 | 0x25<<7 | 0x26,
-	27662 - 19968: jis0212<<14 | 0x25<<7 | 0x27,
-	27663 - 19968: jis0208<<14 | 0x1A<<7 | 0x40,
-	27664 - 19968: jis0212<<14 | 0x25<<7 | 0x28,
-	27665 - 19968: jis0208<<14 | 0x2B<<7 | 0x10,
-	27666 - 19968: jis0212<<14 | 0x25<<7 | 0x29,
-	27667 - 19968: jis0208<<14 | 0x3C<<7 | 0x41,
-	27668 - 19968: jis0208<<14 | 0x3C<<7 | 0x42,
-	27671 - 19968: jis0208<<14 | 0x14<<7 | 0x03,
-	27673 - 19968: jis0212<<14 | 0x25<<7 | 0x2A,
-	27675 - 19968: jis0208<<14 | 0x3C<<7 | 0x43,
-	27679 - 19968: jis0212<<14 | 0x25<<7 | 0x2B,
-	27683 - 19968: jis0208<<14 | 0x3C<<7 | 0x45,
-	27684 - 19968: jis0208<<14 | 0x3C<<7 | 0x44,
-	27686 - 19968: jis0212<<14 | 0x25<<7 | 0x2C,
-	27687 - 19968: jis0212<<14 | 0x25<<7 | 0x2D,
-	27688 - 19968: jis0212<<14 | 0x25<<7 | 0x2E,
-	27692 - 19968: jis0212<<14 | 0x25<<7 | 0x2F,
-	27694 - 19968: jis0212<<14 | 0x25<<7 | 0x30,
-	27699 - 19968: jis0212<<14 | 0x25<<7 | 0x31,
-	27700 - 19968: jis0208<<14 | 0x1E<<7 | 0x44,
-	27701 - 19968: jis0212<<14 | 0x25<<7 | 0x32,
-	27702 - 19968: jis0212<<14 | 0x25<<7 | 0x33,
-	27703 - 19968: jis0208<<14 | 0x28<<7 | 0x18,
-	27704 - 19968: jis0208<<14 | 0x10<<7 | 0x29,
-	27706 - 19968: jis0212<<14 | 0x25<<7 | 0x34,
-	27707 - 19968: jis0212<<14 | 0x25<<7 | 0x35,
-	27710 - 19968: jis0208<<14 | 0x27<<7 | 0x24,
-	27711 - 19968: jis0208<<14 | 0x59<<7 | 0x3A,
-	27712 - 19968: jis0208<<14 | 0x23<<7 | 0x54,
-	27713 - 19968: jis0208<<14 | 0x1C<<7 | 0x20,
-	27714 - 19968: jis0208<<14 | 0x14<<7 | 0x40,
-	27722 - 19968: jis0212<<14 | 0x25<<7 | 0x37,
-	27723 - 19968: jis0212<<14 | 0x25<<7 | 0x38,
-	27725 - 19968: jis0212<<14 | 0x25<<7 | 0x39,
-	27726 - 19968: jis0208<<14 | 0x27<<7 | 0x25,
-	27727 - 19968: jis0212<<14 | 0x25<<7 | 0x3A,
-	27728 - 19968: jis0208<<14 | 0x1B<<7 | 0x0D,
-	27730 - 19968: jis0212<<14 | 0x25<<7 | 0x3B,
-	27732 - 19968: jis0212<<14 | 0x25<<7 | 0x3C,
-	27733 - 19968: jis0208<<14 | 0x3C<<7 | 0x47,
-	27735 - 19968: jis0208<<14 | 0x13<<7 | 0x1F,
-	27737 - 19968: jis0212<<14 | 0x25<<7 | 0x3D,
-	27738 - 19968: jis0208<<14 | 0x10<<7 | 0x57,
-	27739 - 19968: jis0212<<14 | 0x25<<7 | 0x3E,
-	27740 - 19968: jis0208<<14 | 0x59<<7 | 0x3B,
-	27741 - 19968: jis0208<<14 | 0x25<<7 | 0x51,
-	27742 - 19968: jis0208<<14 | 0x3C<<7 | 0x46,
-	27743 - 19968: jis0208<<14 | 0x18<<7 | 0x1D,
-	27744 - 19968: jis0208<<14 | 0x22<<7 | 0x32,
-	27746 - 19968: jis0208<<14 | 0x3C<<7 | 0x48,
-	27751 - 19968: jis0212<<14 | 0x26<<7 | 0x15,
-	27752 - 19968: jis0208<<14 | 0x3C<<7 | 0x50,
-	27754 - 19968: jis0208<<14 | 0x3C<<7 | 0x49,
-	27755 - 19968: jis0212<<14 | 0x25<<7 | 0x40,
-	27757 - 19968: jis0212<<14 | 0x25<<7 | 0x41,
-	27759 - 19968: jis0208<<14 | 0x59<<7 | 0x3D,
-	27760 - 19968: jis0208<<14 | 0x21<<7 | 0x20,
-	27762 - 19968: jis0208<<14 | 0x14<<7 | 0x41,
-	27763 - 19968: jis0208<<14 | 0x3C<<7 | 0x51,
-	27764 - 19968: jis0212<<14 | 0x25<<7 | 0x43,
-	27766 - 19968: jis0212<<14 | 0x25<<7 | 0x44,
-	27768 - 19968: jis0212<<14 | 0x25<<7 | 0x45,
-	27769 - 19968: jis0212<<14 | 0x25<<7 | 0x46,
-	27770 - 19968: jis0208<<14 | 0x16<<7 | 0x47,
-	27771 - 19968: jis0212<<14 | 0x25<<7 | 0x47,
-	27773 - 19968: jis0208<<14 | 0x14<<7 | 0x04,
-	27774 - 19968: jis0208<<14 | 0x3C<<7 | 0x4F,
-	27777 - 19968: jis0208<<14 | 0x3C<<7 | 0x4D,
-	27778 - 19968: jis0208<<14 | 0x3C<<7 | 0x4A,
-	27779 - 19968: jis0208<<14 | 0x2C<<7 | 0x3F,
-	27781 - 19968: jis0212<<14 | 0x25<<7 | 0x48,
-	27782 - 19968: jis0208<<14 | 0x59<<7 | 0x3C,
-	27783 - 19968: jis0212<<14 | 0x25<<7 | 0x4A,
-	27784 - 19968: jis0208<<14 | 0x23<<7 | 0x1F,
-	27785 - 19968: jis0212<<14 | 0x25<<7 | 0x4B,
-	27788 - 19968: jis0208<<14 | 0x25<<7 | 0x38,
-	27789 - 19968: jis0208<<14 | 0x3C<<7 | 0x4B,
-	27792 - 19968: jis0208<<14 | 0x3C<<7 | 0x53,
-	27794 - 19968: jis0208<<14 | 0x3C<<7 | 0x52,
-	27795 - 19968: jis0208<<14 | 0x16<<7 | 0x02,
-	27796 - 19968: jis0212<<14 | 0x25<<7 | 0x4C,
-	27797 - 19968: jis0212<<14 | 0x25<<7 | 0x4D,
-	27798 - 19968: jis0208<<14 | 0x11<<7 | 0x0C,
-	27799 - 19968: jis0212<<14 | 0x25<<7 | 0x4E,
-	27800 - 19968: jis0212<<14 | 0x25<<7 | 0x4F,
-	27801 - 19968: jis0208<<14 | 0x19<<7 | 0x1A,
-	27802 - 19968: jis0208<<14 | 0x3C<<7 | 0x4C,
-	27803 - 19968: jis0208<<14 | 0x3C<<7 | 0x4E,
-	27804 - 19968: jis0212<<14 | 0x25<<7 | 0x50,
-	27807 - 19968: jis0212<<14 | 0x25<<7 | 0x51,
-	27809 - 19968: jis0208<<14 | 0x2A<<7 | 0x36,
-	27810 - 19968: jis0208<<14 | 0x21<<7 | 0x53,
-	27819 - 19968: jis0208<<14 | 0x2A<<7 | 0x56,
-	27822 - 19968: jis0208<<14 | 0x3C<<7 | 0x5B,
-	27824 - 19968: jis0212<<14 | 0x25<<7 | 0x52,
-	27825 - 19968: jis0208<<14 | 0x3C<<7 | 0x5C,
-	27826 - 19968: jis0212<<14 | 0x25<<7 | 0x53,
-	27827 - 19968: jis0208<<14 | 0x11<<7 | 0x2E,
-	27828 - 19968: jis0212<<14 | 0x25<<7 | 0x54,
-	27832 - 19968: jis0208<<14 | 0x29<<7 | 0x07,
-	27833 - 19968: jis0208<<14 | 0x2B<<7 | 0x5C,
-	27834 - 19968: jis0208<<14 | 0x3D<<7 | 0x00,
-	27835 - 19968: jis0208<<14 | 0x1B<<7 | 0x02,
-	27836 - 19968: jis0208<<14 | 0x1D<<7 | 0x21,
-	27837 - 19968: jis0208<<14 | 0x3C<<7 | 0x57,
-	27838 - 19968: jis0208<<14 | 0x3C<<7 | 0x5D,
-	27839 - 19968: jis0208<<14 | 0x10<<7 | 0x47,
-	27841 - 19968: jis0208<<14 | 0x15<<7 | 0x16,
-	27842 - 19968: jis0212<<14 | 0x25<<7 | 0x55,
-	27844 - 19968: jis0208<<14 | 0x3C<<7 | 0x54,
-	27845 - 19968: jis0208<<14 | 0x3C<<7 | 0x59,
-	27846 - 19968: jis0212<<14 | 0x25<<7 | 0x56,
-	27849 - 19968: jis0208<<14 | 0x1F<<7 | 0x53,
-	27850 - 19968: jis0208<<14 | 0x26<<7 | 0x50,
-	27852 - 19968: jis0208<<14 | 0x27<<7 | 0x46,
-	27853 - 19968: jis0212<<14 | 0x25<<7 | 0x57,
-	27855 - 19968: jis0212<<14 | 0x25<<7 | 0x58,
-	27856 - 19968: jis0212<<14 | 0x25<<7 | 0x59,
-	27857 - 19968: jis0212<<14 | 0x25<<7 | 0x5A,
-	27858 - 19968: jis0212<<14 | 0x25<<7 | 0x5B,
-	27859 - 19968: jis0208<<14 | 0x3C<<7 | 0x56,
-	27860 - 19968: jis0212<<14 | 0x25<<7 | 0x5C,
-	27861 - 19968: jis0208<<14 | 0x2A<<7 | 0x00,
-	27862 - 19968: jis0212<<14 | 0x25<<7 | 0x5D,
-	27863 - 19968: jis0208<<14 | 0x3C<<7 | 0x58,
-	27865 - 19968: jis0208<<14 | 0x3D<<7 | 0x03,
-	27866 - 19968: jis0208<<14 | 0x59<<7 | 0x3E,
-	27867 - 19968: jis0208<<14 | 0x3D<<7 | 0x01,
-	27868 - 19968: jis0212<<14 | 0x26<<7 | 0x01,
-	27869 - 19968: jis0208<<14 | 0x3C<<7 | 0x5A,
-	27872 - 19968: jis0212<<14 | 0x26<<7 | 0x02,
-	27873 - 19968: jis0208<<14 | 0x2A<<7 | 0x01,
-	27874 - 19968: jis0208<<14 | 0x26<<7 | 0x27,
-	27875 - 19968: jis0208<<14 | 0x14<<7 | 0x42,
-	27877 - 19968: jis0208<<14 | 0x24<<7 | 0x04,
-	27879 - 19968: jis0212<<14 | 0x26<<7 | 0x03,
-	27880 - 19968: jis0208<<14 | 0x22<<7 | 0x4C,
-	27881 - 19968: jis0212<<14 | 0x26<<7 | 0x04,
-	27882 - 19968: jis0208<<14 | 0x3D<<7 | 0x04,
-	27883 - 19968: jis0212<<14 | 0x26<<7 | 0x05,
-	27884 - 19968: jis0212<<14 | 0x26<<7 | 0x06,
-	27886 - 19968: jis0212<<14 | 0x26<<7 | 0x07,
-	27887 - 19968: jis0208<<14 | 0x3D<<7 | 0x02,
-	27888 - 19968: jis0208<<14 | 0x21<<7 | 0x38,
-	27889 - 19968: jis0208<<14 | 0x3C<<7 | 0x55,
-	27890 - 19968: jis0212<<14 | 0x26<<7 | 0x08,
-	27891 - 19968: jis0208<<14 | 0x10<<7 | 0x2A,
-	27892 - 19968: jis0212<<14 | 0x26<<7 | 0x09,
-	27908 - 19968: jis0208<<14 | 0x59<<7 | 0x3F,
-	27911 - 19968: jis0212<<14 | 0x26<<7 | 0x0B,
-	27914 - 19968: jis0212<<14 | 0x26<<7 | 0x0C,
-	27915 - 19968: jis0208<<14 | 0x2C<<7 | 0x2D,
-	27916 - 19968: jis0208<<14 | 0x3D<<7 | 0x0F,
-	27918 - 19968: jis0212<<14 | 0x26<<7 | 0x0D,
-	27919 - 19968: jis0212<<14 | 0x26<<7 | 0x0E,
-	27921 - 19968: jis0212<<14 | 0x26<<7 | 0x0F,
-	27922 - 19968: jis0208<<14 | 0x3D<<7 | 0x0E,
-	27923 - 19968: jis0212<<14 | 0x26<<7 | 0x10,
-	27927 - 19968: jis0208<<14 | 0x1F<<7 | 0x55,
-	27929 - 19968: jis0208<<14 | 0x3D<<7 | 0x0B,
-	27930 - 19968: jis0212<<14 | 0x26<<7 | 0x11,
-	27931 - 19968: jis0208<<14 | 0x2C<<7 | 0x4B,
-	27934 - 19968: jis0208<<14 | 0x25<<7 | 0x15,
-	27935 - 19968: jis0208<<14 | 0x3D<<7 | 0x05,
-	27941 - 19968: jis0208<<14 | 0x23<<7 | 0x24,
-	27942 - 19968: jis0212<<14 | 0x26<<7 | 0x12,
-	27943 - 19968: jis0212<<14 | 0x26<<7 | 0x13,
-	27944 - 19968: jis0212<<14 | 0x26<<7 | 0x14,
-	27945 - 19968: jis0208<<14 | 0x10<<7 | 0x2B,
-	27946 - 19968: jis0208<<14 | 0x18<<7 | 0x1E,
-	27947 - 19968: jis0208<<14 | 0x3D<<7 | 0x08,
-	27950 - 19968: jis0212<<14 | 0x26<<7 | 0x16,
-	27951 - 19968: jis0212<<14 | 0x26<<7 | 0x17,
-	27953 - 19968: jis0212<<14 | 0x26<<7 | 0x18,
-	27954 - 19968: jis0208<<14 | 0x1C<<7 | 0x06,
-	27955 - 19968: jis0208<<14 | 0x3D<<7 | 0x0D,
-	27957 - 19968: jis0208<<14 | 0x3D<<7 | 0x0C,
-	27958 - 19968: jis0208<<14 | 0x3D<<7 | 0x07,
-	27960 - 19968: jis0208<<14 | 0x3D<<7 | 0x0A,
-	27961 - 19968: jis0212<<14 | 0x26<<7 | 0x19,
-	27963 - 19968: jis0208<<14 | 0x12<<7 | 0x47,
-	27964 - 19968: jis0212<<14 | 0x26<<7 | 0x1A,
-	27965 - 19968: jis0208<<14 | 0x3D<<7 | 0x09,
-	27966 - 19968: jis0208<<14 | 0x26<<7 | 0x28,
-	27967 - 19968: jis0212<<14 | 0x26<<7 | 0x1B,
-	27969 - 19968: jis0208<<14 | 0x2D<<7 | 0x0D,
-	27972 - 19968: jis0208<<14 | 0x1D<<7 | 0x53,
-	27973 - 19968: jis0208<<14 | 0x1F<<7 | 0x54,
-	27991 - 19968: jis0212<<14 | 0x26<<7 | 0x1C,
-	27993 - 19968: jis0208<<14 | 0x3D<<7 | 0x15,
-	27994 - 19968: jis0208<<14 | 0x3D<<7 | 0x13,
-	27996 - 19968: jis0208<<14 | 0x28<<7 | 0x2C,
-	27998 - 19968: jis0212<<14 | 0x26<<7 | 0x1D,
-	27999 - 19968: jis0212<<14 | 0x26<<7 | 0x1E,
-	28001 - 19968: jis0212<<14 | 0x26<<7 | 0x1F,
-	28003 - 19968: jis0208<<14 | 0x3D<<7 | 0x10,
-	28004 - 19968: jis0208<<14 | 0x3D<<7 | 0x12,
-	28005 - 19968: jis0212<<14 | 0x26<<7 | 0x20,
-	28006 - 19968: jis0208<<14 | 0x10<<7 | 0x19,
-	28007 - 19968: jis0212<<14 | 0x26<<7 | 0x21,
-	28009 - 19968: jis0208<<14 | 0x18<<7 | 0x1F,
-	28010 - 19968: jis0208<<14 | 0x2E<<7 | 0x11,
-	28012 - 19968: jis0208<<14 | 0x12<<7 | 0x1C,
-	28014 - 19968: jis0208<<14 | 0x28<<7 | 0x41,
-	28015 - 19968: jis0208<<14 | 0x59<<7 | 0x41,
-	28016 - 19968: jis0212<<14 | 0x26<<7 | 0x23,
-	28020 - 19968: jis0208<<14 | 0x2C<<7 | 0x40,
-	28023 - 19968: jis0208<<14 | 0x12<<7 | 0x03,
-	28024 - 19968: jis0208<<14 | 0x1E<<7 | 0x1A,
-	28025 - 19968: jis0208<<14 | 0x3D<<7 | 0x14,
-	28028 - 19968: jis0212<<14 | 0x26<<7 | 0x24,
-	28034 - 19968: jis0212<<14 | 0x26<<7 | 0x25,
-	28037 - 19968: jis0208<<14 | 0x3D<<7 | 0x19,
-	28039 - 19968: jis0208<<14 | 0x59<<7 | 0x40,
-	28040 - 19968: jis0208<<14 | 0x1D<<7 | 0x22,
-	28044 - 19968: jis0208<<14 | 0x2C<<7 | 0x0F,
-	28046 - 19968: jis0208<<14 | 0x3D<<7 | 0x16,
-	28049 - 19968: jis0212<<14 | 0x26<<7 | 0x27,
-	28050 - 19968: jis0212<<14 | 0x26<<7 | 0x28,
-	28051 - 19968: jis0208<<14 | 0x3D<<7 | 0x11,
-	28052 - 19968: jis0212<<14 | 0x26<<7 | 0x29,
-	28053 - 19968: jis0208<<14 | 0x3D<<7 | 0x17,
-	28054 - 19968: jis0208<<14 | 0x59<<7 | 0x42,
-	28055 - 19968: jis0212<<14 | 0x26<<7 | 0x2B,
-	28056 - 19968: jis0212<<14 | 0x26<<7 | 0x2C,
-	28057 - 19968: jis0208<<14 | 0x2D<<7 | 0x3D,
-	28059 - 19968: jis0208<<14 | 0x24<<7 | 0x52,
-	28060 - 19968: jis0208<<14 | 0x25<<7 | 0x21,
-	28074 - 19968: jis0212<<14 | 0x26<<7 | 0x2D,
-	28076 - 19968: jis0208<<14 | 0x59<<7 | 0x43,
-	28079 - 19968: jis0208<<14 | 0x12<<7 | 0x15,
-	28082 - 19968: jis0208<<14 | 0x10<<7 | 0x34,
-	28084 - 19968: jis0212<<14 | 0x26<<7 | 0x2F,
-	28085 - 19968: jis0208<<14 | 0x3D<<7 | 0x1D,
-	28087 - 19968: jis0212<<14 | 0x26<<7 | 0x30,
-	28088 - 19968: jis0208<<14 | 0x3D<<7 | 0x20,
-	28089 - 19968: jis0212<<14 | 0x26<<7 | 0x31,
-	28092 - 19968: jis0208<<14 | 0x2D<<7 | 0x22,
-	28093 - 19968: jis0212<<14 | 0x26<<7 | 0x32,
-	28095 - 19968: jis0212<<14 | 0x26<<7 | 0x33,
-	28096 - 19968: jis0208<<14 | 0x2C<<7 | 0x43,
-	28100 - 19968: jis0212<<14 | 0x26<<7 | 0x34,
-	28101 - 19968: jis0208<<14 | 0x3D<<7 | 0x27,
-	28102 - 19968: jis0208<<14 | 0x3D<<7 | 0x21,
-	28103 - 19968: jis0208<<14 | 0x3D<<7 | 0x1E,
-	28104 - 19968: jis0212<<14 | 0x26<<7 | 0x35,
-	28106 - 19968: jis0212<<14 | 0x26<<7 | 0x36,
-	28107 - 19968: jis0208<<14 | 0x2D<<7 | 0x33,
-	28108 - 19968: jis0208<<14 | 0x3D<<7 | 0x24,
-	28110 - 19968: jis0212<<14 | 0x26<<7 | 0x37,
-	28111 - 19968: jis0208<<14 | 0x59<<7 | 0x44,
-	28113 - 19968: jis0208<<14 | 0x1C<<7 | 0x29,
-	28114 - 19968: jis0208<<14 | 0x3D<<7 | 0x26,
-	28117 - 19968: jis0208<<14 | 0x3D<<7 | 0x2B,
-	28118 - 19968: jis0212<<14 | 0x26<<7 | 0x39,
-	28120 - 19968: jis0208<<14 | 0x24<<7 | 0x50,
-	28121 - 19968: jis0208<<14 | 0x3D<<7 | 0x29,
-	28123 - 19968: jis0212<<14 | 0x26<<7 | 0x3A,
-	28125 - 19968: jis0212<<14 | 0x26<<7 | 0x3B,
-	28126 - 19968: jis0208<<14 | 0x3D<<7 | 0x23,
-	28127 - 19968: jis0212<<14 | 0x26<<7 | 0x3C,
-	28128 - 19968: jis0212<<14 | 0x26<<7 | 0x3D,
-	28129 - 19968: jis0208<<14 | 0x22<<7 | 0x17,
-	28130 - 19968: jis0212<<14 | 0x26<<7 | 0x3E,
-	28132 - 19968: jis0208<<14 | 0x3D<<7 | 0x2A,
-	28133 - 19968: jis0212<<14 | 0x26<<7 | 0x3F,
-	28134 - 19968: jis0208<<14 | 0x3D<<7 | 0x1F,
-	28136 - 19968: jis0208<<14 | 0x3D<<7 | 0x25,
-	28137 - 19968: jis0212<<14 | 0x26<<7 | 0x40,
-	28138 - 19968: jis0208<<14 | 0x3D<<7 | 0x2C,
-	28139 - 19968: jis0208<<14 | 0x0F<<7 | 0x5B,
-	28140 - 19968: jis0208<<14 | 0x3D<<7 | 0x22,
-	28142 - 19968: jis0208<<14 | 0x3D<<7 | 0x2D,
-	28143 - 19968: jis0212<<14 | 0x26<<7 | 0x41,
-	28144 - 19968: jis0212<<14 | 0x26<<7 | 0x42,
-	28145 - 19968: jis0208<<14 | 0x1E<<7 | 0x1B,
-	28146 - 19968: jis0208<<14 | 0x59<<7 | 0x46,
-	28147 - 19968: jis0208<<14 | 0x1C<<7 | 0x3E,
-	28148 - 19968: jis0212<<14 | 0x26<<7 | 0x43,
-	28149 - 19968: jis0208<<14 | 0x29<<7 | 0x04,
-	28150 - 19968: jis0212<<14 | 0x26<<7 | 0x44,
-	28151 - 19968: jis0208<<14 | 0x19<<7 | 0x0D,
-	28152 - 19968: jis0208<<14 | 0x59<<7 | 0x45,
-	28153 - 19968: jis0208<<14 | 0x3D<<7 | 0x1A,
-	28154 - 19968: jis0208<<14 | 0x3D<<7 | 0x28,
-	28155 - 19968: jis0208<<14 | 0x24<<7 | 0x19,
-	28156 - 19968: jis0208<<14 | 0x59<<7 | 0x47,
-	28160 - 19968: jis0212<<14 | 0x26<<7 | 0x46,
-	28164 - 19968: jis0212<<14 | 0x26<<7 | 0x47,
-	28165 - 19968: jis0208<<14 | 0x1F<<7 | 0x15,
-	28167 - 19968: jis0208<<14 | 0x12<<7 | 0x48,
-	28168 - 19968: jis0208<<14 | 0x19<<7 | 0x30,
-	28169 - 19968: jis0208<<14 | 0x1D<<7 | 0x23,
-	28170 - 19968: jis0208<<14 | 0x3D<<7 | 0x1C,
-	28171 - 19968: jis0208<<14 | 0x1C<<7 | 0x21,
-	28179 - 19968: jis0208<<14 | 0x16<<7 | 0x2B,
-	28181 - 19968: jis0208<<14 | 0x3D<<7 | 0x1B,
-	28185 - 19968: jis0208<<14 | 0x3D<<7 | 0x31,
-	28186 - 19968: jis0208<<14 | 0x1C<<7 | 0x4C,
-	28187 - 19968: jis0208<<14 | 0x17<<7 | 0x19,
-	28189 - 19968: jis0208<<14 | 0x3D<<7 | 0x40,
-	28190 - 19968: jis0212<<14 | 0x26<<7 | 0x48,
-	28191 - 19968: jis0208<<14 | 0x3D<<7 | 0x3A,
-	28192 - 19968: jis0208<<14 | 0x14<<7 | 0x53,
-	28193 - 19968: jis0208<<14 | 0x24<<7 | 0x2E,
-	28194 - 19968: jis0212<<14 | 0x26<<7 | 0x49,
-	28195 - 19968: jis0208<<14 | 0x3D<<7 | 0x35,
-	28196 - 19968: jis0208<<14 | 0x3D<<7 | 0x3E,
-	28197 - 19968: jis0208<<14 | 0x0F<<7 | 0x0E,
-	28198 - 19968: jis0208<<14 | 0x10<<7 | 0x11,
-	28199 - 19968: jis0208<<14 | 0x59<<7 | 0x4A,
-	28201 - 19968: jis0208<<14 | 0x11<<7 | 0x18,
-	28203 - 19968: jis0208<<14 | 0x3D<<7 | 0x37,
-	28204 - 19968: jis0208<<14 | 0x21<<7 | 0x0B,
-	28205 - 19968: jis0208<<14 | 0x3D<<7 | 0x2E,
-	28206 - 19968: jis0208<<14 | 0x3D<<7 | 0x30,
-	28207 - 19968: jis0208<<14 | 0x18<<7 | 0x20,
-	28210 - 19968: jis0212<<14 | 0x26<<7 | 0x4B,
-	28214 - 19968: jis0212<<14 | 0x26<<7 | 0x4C,
-	28216 - 19968: jis0208<<14 | 0x3D<<7 | 0x41,
-	28217 - 19968: jis0208<<14 | 0x59<<7 | 0x48,
-	28218 - 19968: jis0208<<14 | 0x3D<<7 | 0x3C,
-	28219 - 19968: jis0212<<14 | 0x26<<7 | 0x4E,
-	28220 - 19968: jis0208<<14 | 0x59<<7 | 0x4B,
-	28222 - 19968: jis0208<<14 | 0x3D<<7 | 0x34,
-	28227 - 19968: jis0208<<14 | 0x3D<<7 | 0x3B,
-	28228 - 19968: jis0212<<14 | 0x26<<7 | 0x50,
-	28229 - 19968: jis0212<<14 | 0x26<<7 | 0x51,
-	28232 - 19968: jis0212<<14 | 0x26<<7 | 0x52,
-	28233 - 19968: jis0212<<14 | 0x26<<7 | 0x53,
-	28234 - 19968: jis0208<<14 | 0x2B<<7 | 0x0A,
-	28235 - 19968: jis0212<<14 | 0x26<<7 | 0x54,
-	28237 - 19968: jis0208<<14 | 0x3D<<7 | 0x39,
-	28238 - 19968: jis0208<<14 | 0x3D<<7 | 0x3D,
-	28239 - 19968: jis0212<<14 | 0x26<<7 | 0x55,
-	28241 - 19968: jis0212<<14 | 0x26<<7 | 0x56,
-	28242 - 19968: jis0212<<14 | 0x26<<7 | 0x57,
-	28243 - 19968: jis0212<<14 | 0x26<<7 | 0x58,
-	28244 - 19968: jis0212<<14 | 0x26<<7 | 0x59,
-	28246 - 19968: jis0208<<14 | 0x17<<7 | 0x2F,
-	28247 - 19968: jis0212<<14 | 0x26<<7 | 0x5A,
-	28248 - 19968: jis0208<<14 | 0x1D<<7 | 0x24,
-	28251 - 19968: jis0208<<14 | 0x22<<7 | 0x18,
-	28252 - 19968: jis0208<<14 | 0x59<<7 | 0x49,
-	28253 - 19968: jis0212<<14 | 0x26<<7 | 0x5C,
-	28254 - 19968: jis0212<<14 | 0x26<<7 | 0x5D,
-	28255 - 19968: jis0208<<14 | 0x3D<<7 | 0x33,
-	28258 - 19968: jis0212<<14 | 0x27<<7 | 0x00,
-	28259 - 19968: jis0212<<14 | 0x27<<7 | 0x01,
-	28263 - 19968: jis0208<<14 | 0x2C<<7 | 0x0E,
-	28264 - 19968: jis0212<<14 | 0x27<<7 | 0x02,
-	28267 - 19968: jis0208<<14 | 0x3D<<7 | 0x36,
-	28270 - 19968: jis0208<<14 | 0x3D<<7 | 0x2F,
-	28271 - 19968: jis0208<<14 | 0x24<<7 | 0x51,
-	28274 - 19968: jis0208<<14 | 0x3D<<7 | 0x32,
-	28275 - 19968: jis0212<<14 | 0x27<<7 | 0x03,
-	28278 - 19968: jis0208<<14 | 0x3D<<7 | 0x38,
-	28283 - 19968: jis0212<<14 | 0x27<<7 | 0x04,
-	28285 - 19968: jis0212<<14 | 0x27<<7 | 0x05,
-	28286 - 19968: jis0208<<14 | 0x2E<<7 | 0x30,
-	28287 - 19968: jis0208<<14 | 0x1B<<7 | 0x1D,
-	28288 - 19968: jis0208<<14 | 0x2A<<7 | 0x5D,
-	28290 - 19968: jis0208<<14 | 0x3D<<7 | 0x42,
-	28300 - 19968: jis0208<<14 | 0x27<<7 | 0x0D,
-	28301 - 19968: jis0212<<14 | 0x27<<7 | 0x06,
-	28303 - 19968: jis0208<<14 | 0x3D<<7 | 0x4E,
-	28304 - 19968: jis0208<<14 | 0x17<<7 | 0x1A,
-	28307 - 19968: jis0212<<14 | 0x27<<7 | 0x07,
-	28310 - 19968: jis0208<<14 | 0x1C<<7 | 0x3F,
-	28312 - 19968: jis0208<<14 | 0x3D<<7 | 0x44,
-	28313 - 19968: jis0212<<14 | 0x27<<7 | 0x08,
-	28316 - 19968: jis0208<<14 | 0x2D<<7 | 0x0E,
-	28317 - 19968: jis0208<<14 | 0x18<<7 | 0x21,
-	28319 - 19968: jis0208<<14 | 0x3D<<7 | 0x51,
-	28320 - 19968: jis0212<<14 | 0x27<<7 | 0x09,
-	28322 - 19968: jis0208<<14 | 0x0F<<7 | 0x4D,
-	28325 - 19968: jis0208<<14 | 0x3D<<7 | 0x4F,
-	28327 - 19968: jis0212<<14 | 0x27<<7 | 0x0A,
-	28330 - 19968: jis0208<<14 | 0x3D<<7 | 0x43,
-	28333 - 19968: jis0212<<14 | 0x27<<7 | 0x0B,
-	28334 - 19968: jis0212<<14 | 0x27<<7 | 0x0C,
-	28335 - 19968: jis0208<<14 | 0x3D<<7 | 0x49,
-	28337 - 19968: jis0212<<14 | 0x27<<7 | 0x0D,
-	28338 - 19968: jis0208<<14 | 0x3D<<7 | 0x4B,
-	28339 - 19968: jis0212<<14 | 0x27<<7 | 0x0E,
-	28342 - 19968: jis0208<<14 | 0x2C<<7 | 0x2E,
-	28343 - 19968: jis0208<<14 | 0x3D<<7 | 0x46,
-	28346 - 19968: jis0208<<14 | 0x24<<7 | 0x0D,
-	28347 - 19968: jis0212<<14 | 0x27<<7 | 0x0F,
-	28349 - 19968: jis0208<<14 | 0x3D<<7 | 0x48,
-	28351 - 19968: jis0208<<14 | 0x59<<7 | 0x4C,
-	28352 - 19968: jis0212<<14 | 0x27<<7 | 0x11,
-	28353 - 19968: jis0212<<14 | 0x27<<7 | 0x12,
-	28354 - 19968: jis0208<<14 | 0x3D<<7 | 0x50,
-	28355 - 19968: jis0212<<14 | 0x27<<7 | 0x13,
-	28356 - 19968: jis0208<<14 | 0x3D<<7 | 0x4A,
-	28357 - 19968: jis0208<<14 | 0x2B<<7 | 0x26,
-	28359 - 19968: jis0212<<14 | 0x27<<7 | 0x14,
-	28360 - 19968: jis0212<<14 | 0x27<<7 | 0x15,
-	28361 - 19968: jis0208<<14 | 0x3D<<7 | 0x45,
-	28362 - 19968: jis0212<<14 | 0x27<<7 | 0x16,
-	28363 - 19968: jis0208<<14 | 0x1B<<7 | 0x01,
-	28364 - 19968: jis0208<<14 | 0x3D<<7 | 0x5D,
-	28365 - 19968: jis0212<<14 | 0x27<<7 | 0x17,
-	28366 - 19968: jis0212<<14 | 0x27<<7 | 0x18,
-	28367 - 19968: jis0212<<14 | 0x27<<7 | 0x19,
-	28369 - 19968: jis0208<<14 | 0x12<<7 | 0x49,
-	28371 - 19968: jis0208<<14 | 0x3D<<7 | 0x47,
-	28372 - 19968: jis0208<<14 | 0x3D<<7 | 0x4C,
-	28373 - 19968: jis0208<<14 | 0x3D<<7 | 0x4D,
-	28381 - 19968: jis0208<<14 | 0x21<<7 | 0x4B,
-	28382 - 19968: jis0208<<14 | 0x21<<7 | 0x39,
-	28395 - 19968: jis0212<<14 | 0x27<<7 | 0x1A,
-	28396 - 19968: jis0208<<14 | 0x3D<<7 | 0x55,
-	28397 - 19968: jis0212<<14 | 0x27<<7 | 0x1B,
-	28398 - 19968: jis0212<<14 | 0x27<<7 | 0x1C,
-	28399 - 19968: jis0208<<14 | 0x3D<<7 | 0x5B,
-	28402 - 19968: jis0208<<14 | 0x3D<<7 | 0x59,
-	28404 - 19968: jis0208<<14 | 0x24<<7 | 0x08,
-	28407 - 19968: jis0208<<14 | 0x3E<<7 | 0x02,
-	28408 - 19968: jis0208<<14 | 0x3D<<7 | 0x56,
-	28409 - 19968: jis0212<<14 | 0x27<<7 | 0x1D,
-	28411 - 19968: jis0212<<14 | 0x27<<7 | 0x1E,
-	28413 - 19968: jis0212<<14 | 0x27<<7 | 0x1F,
-	28414 - 19968: jis0208<<14 | 0x3D<<7 | 0x57,
-	28415 - 19968: jis0208<<14 | 0x3D<<7 | 0x3F,
-	28417 - 19968: jis0208<<14 | 0x14<<7 | 0x58,
-	28418 - 19968: jis0208<<14 | 0x28<<7 | 0x19,
-	28420 - 19968: jis0212<<14 | 0x27<<7 | 0x20,
-	28422 - 19968: jis0208<<14 | 0x1B<<7 | 0x1E,
-	28424 - 19968: jis0212<<14 | 0x27<<7 | 0x21,
-	28425 - 19968: jis0208<<14 | 0x18<<7 | 0x56,
-	28426 - 19968: jis0212<<14 | 0x27<<7 | 0x22,
-	28428 - 19968: jis0212<<14 | 0x27<<7 | 0x23,
-	28429 - 19968: jis0212<<14 | 0x27<<7 | 0x24,
-	28431 - 19968: jis0208<<14 | 0x2E<<7 | 0x12,
-	28433 - 19968: jis0208<<14 | 0x3D<<7 | 0x53,
-	28435 - 19968: jis0208<<14 | 0x3E<<7 | 0x01,
-	28436 - 19968: jis0208<<14 | 0x10<<7 | 0x48,
-	28437 - 19968: jis0208<<14 | 0x20<<7 | 0x45,
-	28438 - 19968: jis0212<<14 | 0x27<<7 | 0x25,
-	28440 - 19968: jis0212<<14 | 0x27<<7 | 0x26,
-	28442 - 19968: jis0212<<14 | 0x27<<7 | 0x27,
-	28443 - 19968: jis0212<<14 | 0x27<<7 | 0x28,
-	28448 - 19968: jis0208<<14 | 0x26<<7 | 0x58,
-	28450 - 19968: jis0208<<14 | 0x13<<7 | 0x20,
-	28451 - 19968: jis0208<<14 | 0x2D<<7 | 0x59,
-	28454 - 19968: jis0212<<14 | 0x27<<7 | 0x29,
-	28457 - 19968: jis0212<<14 | 0x27<<7 | 0x2A,
-	28458 - 19968: jis0212<<14 | 0x27<<7 | 0x2B,
-	28459 - 19968: jis0208<<14 | 0x2B<<7 | 0x00,
-	28460 - 19968: jis0208<<14 | 0x23<<7 | 0x31,
-	28461 - 19968: jis0212<<14 | 0x27<<7 | 0x32,
-	28463 - 19968: jis0212<<14 | 0x27<<7 | 0x2C,
-	28464 - 19968: jis0212<<14 | 0x27<<7 | 0x2D,
-	28465 - 19968: jis0208<<14 | 0x3D<<7 | 0x5A,
-	28466 - 19968: jis0208<<14 | 0x3D<<7 | 0x5C,
-	28467 - 19968: jis0212<<14 | 0x27<<7 | 0x2E,
-	28470 - 19968: jis0212<<14 | 0x27<<7 | 0x2F,
-	28472 - 19968: jis0208<<14 | 0x20<<7 | 0x11,
-	28475 - 19968: jis0212<<14 | 0x27<<7 | 0x30,
-	28476 - 19968: jis0212<<14 | 0x27<<7 | 0x31,
-	28478 - 19968: jis0208<<14 | 0x3E<<7 | 0x00,
-	28479 - 19968: jis0208<<14 | 0x3D<<7 | 0x58,
-	28481 - 19968: jis0208<<14 | 0x3D<<7 | 0x52,
-	28485 - 19968: jis0208<<14 | 0x13<<7 | 0x22,
-	28495 - 19968: jis0212<<14 | 0x27<<7 | 0x33,
-	28497 - 19968: jis0212<<14 | 0x27<<7 | 0x34,
-	28498 - 19968: jis0212<<14 | 0x27<<7 | 0x35,
-	28499 - 19968: jis0212<<14 | 0x27<<7 | 0x36,
-	28500 - 19968: jis0208<<14 | 0x16<<7 | 0x48,
-	28503 - 19968: jis0212<<14 | 0x27<<7 | 0x37,
-	28504 - 19968: jis0208<<14 | 0x3E<<7 | 0x0E,
-	28505 - 19968: jis0212<<14 | 0x27<<7 | 0x38,
-	28506 - 19968: jis0212<<14 | 0x27<<7 | 0x39,
-	28507 - 19968: jis0208<<14 | 0x3E<<7 | 0x09,
-	28508 - 19968: jis0208<<14 | 0x1F<<7 | 0x57,
-	28509 - 19968: jis0212<<14 | 0x27<<7 | 0x3A,
-	28510 - 19968: jis0212<<14 | 0x27<<7 | 0x3B,
-	28511 - 19968: jis0208<<14 | 0x12<<7 | 0x42,
-	28513 - 19968: jis0212<<14 | 0x27<<7 | 0x3C,
-	28514 - 19968: jis0212<<14 | 0x27<<7 | 0x3D,
-	28516 - 19968: jis0208<<14 | 0x1C<<7 | 0x40,
-	28518 - 19968: jis0208<<14 | 0x3E<<7 | 0x12,
-	28520 - 19968: jis0212<<14 | 0x27<<7 | 0x3E,
-	28524 - 19968: jis0212<<14 | 0x27<<7 | 0x3F,
-	28525 - 19968: jis0208<<14 | 0x3E<<7 | 0x0B,
-	28526 - 19968: jis0208<<14 | 0x23<<7 | 0x0B,
-	28527 - 19968: jis0208<<14 | 0x3E<<7 | 0x08,
-	28528 - 19968: jis0208<<14 | 0x23<<7 | 0x38,
-	28532 - 19968: jis0208<<14 | 0x3E<<7 | 0x2B,
-	28536 - 19968: jis0208<<14 | 0x3E<<7 | 0x05,
-	28538 - 19968: jis0208<<14 | 0x3E<<7 | 0x04,
-	28540 - 19968: jis0208<<14 | 0x3E<<7 | 0x0D,
-	28541 - 19968: jis0212<<14 | 0x27<<7 | 0x40,
-	28542 - 19968: jis0212<<14 | 0x27<<7 | 0x41,
-	28544 - 19968: jis0208<<14 | 0x3E<<7 | 0x07,
-	28545 - 19968: jis0208<<14 | 0x3E<<7 | 0x06,
-	28546 - 19968: jis0208<<14 | 0x3E<<7 | 0x0C,
-	28547 - 19968: jis0212<<14 | 0x27<<7 | 0x42,
-	28548 - 19968: jis0208<<14 | 0x1F<<7 | 0x00,
-	28550 - 19968: jis0208<<14 | 0x3E<<7 | 0x03,
-	28551 - 19968: jis0212<<14 | 0x27<<7 | 0x43,
-	28552 - 19968: jis0208<<14 | 0x59<<7 | 0x4D,
-	28555 - 19968: jis0212<<14 | 0x27<<7 | 0x45,
-	28556 - 19968: jis0212<<14 | 0x27<<7 | 0x46,
-	28557 - 19968: jis0212<<14 | 0x27<<7 | 0x47,
-	28558 - 19968: jis0208<<14 | 0x3E<<7 | 0x0F,
-	28560 - 19968: jis0212<<14 | 0x27<<7 | 0x48,
-	28561 - 19968: jis0208<<14 | 0x3E<<7 | 0x10,
-	28562 - 19968: jis0212<<14 | 0x27<<7 | 0x49,
-	28563 - 19968: jis0212<<14 | 0x27<<7 | 0x4A,
-	28564 - 19968: jis0212<<14 | 0x27<<7 | 0x4B,
-	28566 - 19968: jis0212<<14 | 0x27<<7 | 0x4C,
-	28567 - 19968: jis0208<<14 | 0x13<<7 | 0x21,
-	28570 - 19968: jis0212<<14 | 0x27<<7 | 0x4D,
-	28575 - 19968: jis0212<<14 | 0x27<<7 | 0x4E,
-	28576 - 19968: jis0212<<14 | 0x27<<7 | 0x4F,
-	28577 - 19968: jis0208<<14 | 0x3E<<7 | 0x15,
-	28579 - 19968: jis0208<<14 | 0x3E<<7 | 0x14,
-	28580 - 19968: jis0208<<14 | 0x3E<<7 | 0x16,
-	28581 - 19968: jis0212<<14 | 0x27<<7 | 0x50,
-	28582 - 19968: jis0212<<14 | 0x27<<7 | 0x51,
-	28583 - 19968: jis0212<<14 | 0x27<<7 | 0x52,
-	28584 - 19968: jis0212<<14 | 0x27<<7 | 0x53,
-	28586 - 19968: jis0208<<14 | 0x3E<<7 | 0x19,
-	28590 - 19968: jis0212<<14 | 0x27<<7 | 0x54,
-	28591 - 19968: jis0212<<14 | 0x27<<7 | 0x55,
-	28592 - 19968: jis0212<<14 | 0x27<<7 | 0x56,
-	28593 - 19968: jis0208<<14 | 0x24<<7 | 0x22,
-	28595 - 19968: jis0208<<14 | 0x3E<<7 | 0x13,
-	28597 - 19968: jis0208<<14 | 0x59<<7 | 0x4E,
-	28598 - 19968: jis0212<<14 | 0x27<<7 | 0x58,
-	28601 - 19968: jis0208<<14 | 0x3E<<7 | 0x17,
-	28604 - 19968: jis0212<<14 | 0x27<<7 | 0x59,
-	28608 - 19968: jis0208<<14 | 0x16<<7 | 0x42,
-	28609 - 19968: jis0208<<14 | 0x21<<7 | 0x58,
-	28610 - 19968: jis0208<<14 | 0x3E<<7 | 0x11,
-	28611 - 19968: jis0208<<14 | 0x26<<7 | 0x1A,
-	28613 - 19968: jis0212<<14 | 0x27<<7 | 0x5A,
-	28614 - 19968: jis0208<<14 | 0x3E<<7 | 0x18,
-	28615 - 19968: jis0212<<14 | 0x27<<7 | 0x5B,
-	28616 - 19968: jis0212<<14 | 0x27<<7 | 0x5C,
-	28618 - 19968: jis0212<<14 | 0x27<<7 | 0x5D,
-	28628 - 19968: jis0208<<14 | 0x3E<<7 | 0x1D,
-	28629 - 19968: jis0208<<14 | 0x3E<<7 | 0x1B,
-	28632 - 19968: jis0208<<14 | 0x3E<<7 | 0x1E,
-	28634 - 19968: jis0212<<14 | 0x28<<7 | 0x00,
-	28635 - 19968: jis0208<<14 | 0x3E<<7 | 0x21,
-	28638 - 19968: jis0212<<14 | 0x28<<7 | 0x01,
-	28639 - 19968: jis0208<<14 | 0x3E<<7 | 0x1A,
-	28640 - 19968: jis0208<<14 | 0x18<<7 | 0x49,
-	28641 - 19968: jis0208<<14 | 0x26<<7 | 0x07,
-	28644 - 19968: jis0208<<14 | 0x3D<<7 | 0x18,
-	28648 - 19968: jis0212<<14 | 0x28<<7 | 0x02,
-	28649 - 19968: jis0212<<14 | 0x28<<7 | 0x03,
-	28651 - 19968: jis0208<<14 | 0x2C<<7 | 0x53,
-	28652 - 19968: jis0208<<14 | 0x3E<<7 | 0x1C,
-	28654 - 19968: jis0208<<14 | 0x3E<<7 | 0x20,
-	28655 - 19968: jis0208<<14 | 0x21<<7 | 0x54,
-	28656 - 19968: jis0212<<14 | 0x28<<7 | 0x04,
-	28657 - 19968: jis0208<<14 | 0x3E<<7 | 0x1F,
-	28659 - 19968: jis0208<<14 | 0x3E<<7 | 0x0A,
-	28661 - 19968: jis0208<<14 | 0x59<<7 | 0x4F,
-	28662 - 19968: jis0208<<14 | 0x4E<<7 | 0x48,
-	28665 - 19968: jis0212<<14 | 0x28<<7 | 0x06,
-	28666 - 19968: jis0208<<14 | 0x3E<<7 | 0x24,
-	28668 - 19968: jis0212<<14 | 0x28<<7 | 0x07,
-	28669 - 19968: jis0212<<14 | 0x28<<7 | 0x08,
-	28670 - 19968: jis0208<<14 | 0x3E<<7 | 0x28,
-	28672 - 19968: jis0212<<14 | 0x28<<7 | 0x09,
-	28673 - 19968: jis0208<<14 | 0x3E<<7 | 0x26,
-	28677 - 19968: jis0208<<14 | 0x59<<7 | 0x50,
-	28678 - 19968: jis0212<<14 | 0x28<<7 | 0x0B,
-	28679 - 19968: jis0208<<14 | 0x59<<7 | 0x51,
-	28681 - 19968: jis0208<<14 | 0x3E<<7 | 0x22,
-	28683 - 19968: jis0208<<14 | 0x3E<<7 | 0x23,
-	28685 - 19968: jis0212<<14 | 0x28<<7 | 0x0D,
-	28687 - 19968: jis0208<<14 | 0x3E<<7 | 0x27,
-	28689 - 19968: jis0208<<14 | 0x3E<<7 | 0x25,
-	28693 - 19968: jis0208<<14 | 0x28<<7 | 0x2D,
-	28695 - 19968: jis0212<<14 | 0x28<<7 | 0x0E,
-	28696 - 19968: jis0208<<14 | 0x3E<<7 | 0x2D,
-	28698 - 19968: jis0208<<14 | 0x3E<<7 | 0x2A,
-	28699 - 19968: jis0208<<14 | 0x3E<<7 | 0x29,
-	28701 - 19968: jis0208<<14 | 0x3E<<7 | 0x2C,
-	28702 - 19968: jis0208<<14 | 0x25<<7 | 0x33,
-	28703 - 19968: jis0208<<14 | 0x3E<<7 | 0x2E,
-	28704 - 19968: jis0212<<14 | 0x28<<7 | 0x0F,
-	28707 - 19968: jis0212<<14 | 0x28<<7 | 0x10,
-	28710 - 19968: jis0208<<14 | 0x22<<7 | 0x54,
-	28711 - 19968: jis0208<<14 | 0x21<<7 | 0x4C,
-	28712 - 19968: jis0208<<14 | 0x59<<7 | 0x52,
-	28716 - 19968: jis0208<<14 | 0x1F<<7 | 0x04,
-	28719 - 19968: jis0212<<14 | 0x28<<7 | 0x11,
-	28720 - 19968: jis0208<<14 | 0x3E<<7 | 0x2F,
-	28722 - 19968: jis0208<<14 | 0x3E<<7 | 0x31,
-	28724 - 19968: jis0212<<14 | 0x28<<7 | 0x12,
-	28727 - 19968: jis0212<<14 | 0x28<<7 | 0x13,
-	28729 - 19968: jis0212<<14 | 0x28<<7 | 0x14,
-	28732 - 19968: jis0212<<14 | 0x28<<7 | 0x15,
-	28734 - 19968: jis0208<<14 | 0x3E<<7 | 0x30,
-	28739 - 19968: jis0212<<14 | 0x28<<7 | 0x16,
-	28740 - 19968: jis0212<<14 | 0x28<<7 | 0x17,
-	28744 - 19968: jis0212<<14 | 0x28<<7 | 0x18,
-	28745 - 19968: jis0212<<14 | 0x28<<7 | 0x19,
-	28746 - 19968: jis0212<<14 | 0x28<<7 | 0x1A,
-	28747 - 19968: jis0212<<14 | 0x28<<7 | 0x1B,
-	28748 - 19968: jis0208<<14 | 0x3D<<7 | 0x54,
-	28750 - 19968: jis0212<<14 | 0x28<<7 | 0x20,
-	28753 - 19968: jis0208<<14 | 0x3E<<7 | 0x32,
-	28756 - 19968: jis0212<<14 | 0x28<<7 | 0x1C,
-	28757 - 19968: jis0212<<14 | 0x28<<7 | 0x1D,
-	28760 - 19968: jis0208<<14 | 0x25<<7 | 0x46,
-	28765 - 19968: jis0212<<14 | 0x28<<7 | 0x1E,
-	28766 - 19968: jis0212<<14 | 0x28<<7 | 0x1F,
-	28771 - 19968: jis0208<<14 | 0x3E<<7 | 0x33,
-	28772 - 19968: jis0212<<14 | 0x28<<7 | 0x21,
-	28773 - 19968: jis0212<<14 | 0x28<<7 | 0x22,
-	28779 - 19968: jis0208<<14 | 0x11<<7 | 0x2F,
-	28780 - 19968: jis0212<<14 | 0x28<<7 | 0x23,
-	28782 - 19968: jis0212<<14 | 0x28<<7 | 0x24,
-	28783 - 19968: jis0208<<14 | 0x24<<7 | 0x53,
-	28784 - 19968: jis0208<<14 | 0x12<<7 | 0x04,
-	28789 - 19968: jis0212<<14 | 0x28<<7 | 0x25,
-	28790 - 19968: jis0212<<14 | 0x28<<7 | 0x26,
-	28792 - 19968: jis0208<<14 | 0x14<<7 | 0x43,
-	28796 - 19968: jis0208<<14 | 0x1B<<7 | 0x3D,
-	28797 - 19968: jis0208<<14 | 0x19<<7 | 0x31,
-	28798 - 19968: jis0212<<14 | 0x28<<7 | 0x27,
-	28801 - 19968: jis0212<<14 | 0x28<<7 | 0x28,
-	28805 - 19968: jis0208<<14 | 0x59<<7 | 0x53,
-	28806 - 19968: jis0212<<14 | 0x28<<7 | 0x2A,
-	28809 - 19968: jis0208<<14 | 0x2E<<7 | 0x06,
-	28810 - 19968: jis0208<<14 | 0x1E<<7 | 0x45,
-	28814 - 19968: jis0208<<14 | 0x10<<7 | 0x49,
-	28818 - 19968: jis0208<<14 | 0x3E<<7 | 0x35,
-	28820 - 19968: jis0212<<14 | 0x28<<7 | 0x2B,
-	28821 - 19968: jis0212<<14 | 0x28<<7 | 0x2C,
-	28822 - 19968: jis0212<<14 | 0x28<<7 | 0x2D,
-	28823 - 19968: jis0212<<14 | 0x28<<7 | 0x2E,
-	28824 - 19968: jis0212<<14 | 0x28<<7 | 0x2F,
-	28825 - 19968: jis0208<<14 | 0x3E<<7 | 0x34,
-	28827 - 19968: jis0212<<14 | 0x28<<7 | 0x30,
-	28836 - 19968: jis0212<<14 | 0x28<<7 | 0x31,
-	28843 - 19968: jis0208<<14 | 0x59<<7 | 0x54,
-	28844 - 19968: jis0208<<14 | 0x3E<<7 | 0x38,
-	28845 - 19968: jis0208<<14 | 0x22<<7 | 0x19,
-	28846 - 19968: jis0208<<14 | 0x3E<<7 | 0x3B,
-	28847 - 19968: jis0208<<14 | 0x3E<<7 | 0x36,
-	28848 - 19968: jis0212<<14 | 0x28<<7 | 0x33,
-	28849 - 19968: jis0212<<14 | 0x28<<7 | 0x34,
-	28851 - 19968: jis0208<<14 | 0x3E<<7 | 0x3A,
-	28852 - 19968: jis0212<<14 | 0x28<<7 | 0x35,
-	28855 - 19968: jis0212<<14 | 0x28<<7 | 0x36,
-	28856 - 19968: jis0208<<14 | 0x3E<<7 | 0x39,
-	28857 - 19968: jis0208<<14 | 0x24<<7 | 0x1F,
-	28858 - 19968: jis0208<<14 | 0x0F<<7 | 0x38,
-	28859 - 19968: jis0208<<14 | 0x58<<7 | 0x06,
-	28872 - 19968: jis0208<<14 | 0x2D<<7 | 0x54,
-	28874 - 19968: jis0212<<14 | 0x28<<7 | 0x37,
-	28875 - 19968: jis0208<<14 | 0x3E<<7 | 0x3D,
-	28879 - 19968: jis0208<<14 | 0x10<<7 | 0x07,
-	28881 - 19968: jis0212<<14 | 0x28<<7 | 0x38,
-	28883 - 19968: jis0212<<14 | 0x28<<7 | 0x39,
-	28884 - 19968: jis0212<<14 | 0x28<<7 | 0x3A,
-	28885 - 19968: jis0212<<14 | 0x28<<7 | 0x3B,
-	28886 - 19968: jis0212<<14 | 0x28<<7 | 0x3C,
-	28888 - 19968: jis0212<<14 | 0x28<<7 | 0x3D,
-	28889 - 19968: jis0208<<14 | 0x3E<<7 | 0x3F,
-	28892 - 19968: jis0212<<14 | 0x28<<7 | 0x3E,
-	28893 - 19968: jis0208<<14 | 0x3E<<7 | 0x3E,
-	28895 - 19968: jis0208<<14 | 0x3E<<7 | 0x3C,
-	28900 - 19968: jis0212<<14 | 0x28<<7 | 0x3F,
-	28913 - 19968: jis0208<<14 | 0x3E<<7 | 0x37,
-	28921 - 19968: jis0208<<14 | 0x2A<<7 | 0x02,
-	28922 - 19968: jis0212<<14 | 0x28<<7 | 0x40,
-	28925 - 19968: jis0208<<14 | 0x3E<<7 | 0x41,
-	28931 - 19968: jis0212<<14 | 0x28<<7 | 0x41,
-	28932 - 19968: jis0208<<14 | 0x59<<7 | 0x56,
-	28933 - 19968: jis0212<<14 | 0x28<<7 | 0x43,
-	28934 - 19968: jis0212<<14 | 0x28<<7 | 0x44,
-	28935 - 19968: jis0212<<14 | 0x28<<7 | 0x45,
-	28937 - 19968: jis0208<<14 | 0x3E<<7 | 0x40,
-	28939 - 19968: jis0212<<14 | 0x28<<7 | 0x46,
-	28940 - 19968: jis0212<<14 | 0x28<<7 | 0x47,
-	28943 - 19968: jis0208<<14 | 0x59<<7 | 0x55,
-	28948 - 19968: jis0208<<14 | 0x10<<7 | 0x4A,
-	28953 - 19968: jis0208<<14 | 0x3E<<7 | 0x43,
-	28954 - 19968: jis0208<<14 | 0x29<<7 | 0x11,
-	28956 - 19968: jis0208<<14 | 0x3E<<7 | 0x42,
-	28958 - 19968: jis0212<<14 | 0x28<<7 | 0x49,
-	28960 - 19968: jis0212<<14 | 0x28<<7 | 0x4A,
-	28961 - 19968: jis0208<<14 | 0x2B<<7 | 0x14,
-	28966 - 19968: jis0208<<14 | 0x1D<<7 | 0x26,
-	28971 - 19968: jis0212<<14 | 0x28<<7 | 0x4B,
-	28973 - 19968: jis0212<<14 | 0x28<<7 | 0x4C,
-	28975 - 19968: jis0212<<14 | 0x28<<7 | 0x4D,
-	28976 - 19968: jis0212<<14 | 0x28<<7 | 0x4E,
-	28977 - 19968: jis0212<<14 | 0x28<<7 | 0x4F,
-	28982 - 19968: jis0208<<14 | 0x20<<7 | 0x12,
-	28984 - 19968: jis0212<<14 | 0x28<<7 | 0x50,
-	28988 - 19968: jis0208<<14 | 0x1D<<7 | 0x25,
-	28993 - 19968: jis0212<<14 | 0x28<<7 | 0x51,
-	28997 - 19968: jis0212<<14 | 0x28<<7 | 0x52,
-	28998 - 19968: jis0208<<14 | 0x59<<7 | 0x58,
-	28999 - 19968: jis0208<<14 | 0x59<<7 | 0x59,
-	29001 - 19968: jis0208<<14 | 0x2D<<7 | 0x5A,
-	29002 - 19968: jis0212<<14 | 0x28<<7 | 0x55,
-	29003 - 19968: jis0212<<14 | 0x28<<7 | 0x56,
-	29004 - 19968: jis0208<<14 | 0x3E<<7 | 0x49,
-	29006 - 19968: jis0208<<14 | 0x1F<<7 | 0x58,
-	29008 - 19968: jis0212<<14 | 0x28<<7 | 0x57,
-	29010 - 19968: jis0212<<14 | 0x28<<7 | 0x58,
-	29013 - 19968: jis0208<<14 | 0x3E<<7 | 0x45,
-	29014 - 19968: jis0208<<14 | 0x3E<<7 | 0x4A,
-	29015 - 19968: jis0212<<14 | 0x28<<7 | 0x59,
-	29017 - 19968: jis0208<<14 | 0x10<<7 | 0x4B,
-	29018 - 19968: jis0212<<14 | 0x28<<7 | 0x5A,
-	29020 - 19968: jis0208<<14 | 0x59<<7 | 0x57,
-	29022 - 19968: jis0212<<14 | 0x28<<7 | 0x5C,
-	29024 - 19968: jis0212<<14 | 0x28<<7 | 0x5D,
-	29026 - 19968: jis0208<<14 | 0x3E<<7 | 0x48,
-	29028 - 19968: jis0208<<14 | 0x26<<7 | 0x40,
-	29029 - 19968: jis0208<<14 | 0x3E<<7 | 0x44,
-	29030 - 19968: jis0208<<14 | 0x3E<<7 | 0x47,
-	29031 - 19968: jis0208<<14 | 0x1D<<7 | 0x27,
-	29032 - 19968: jis0212<<14 | 0x29<<7 | 0x00,
-	29033 - 19968: jis0208<<14 | 0x27<<7 | 0x30,
-	29036 - 19968: jis0208<<14 | 0x3E<<7 | 0x4B,
-	29038 - 19968: jis0208<<14 | 0x1B<<7 | 0x30,
-	29049 - 19968: jis0212<<14 | 0x29<<7 | 0x01,
-	29053 - 19968: jis0208<<14 | 0x1F<<7 | 0x59,
-	29056 - 19968: jis0212<<14 | 0x29<<7 | 0x02,
-	29060 - 19968: jis0208<<14 | 0x3E<<7 | 0x4E,
-	29061 - 19968: jis0212<<14 | 0x29<<7 | 0x03,
-	29063 - 19968: jis0212<<14 | 0x29<<7 | 0x04,
-	29064 - 19968: jis0208<<14 | 0x3E<<7 | 0x46,
-	29066 - 19968: jis0208<<14 | 0x16<<7 | 0x06,
-	29068 - 19968: jis0212<<14 | 0x29<<7 | 0x05,
-	29071 - 19968: jis0208<<14 | 0x3E<<7 | 0x4C,
-	29074 - 19968: jis0212<<14 | 0x29<<7 | 0x06,
-	29076 - 19968: jis0208<<14 | 0x2C<<7 | 0x2F,
-	29077 - 19968: jis0208<<14 | 0x3E<<7 | 0x4F,
-	29081 - 19968: jis0208<<14 | 0x53<<7 | 0x05,
-	29082 - 19968: jis0212<<14 | 0x29<<7 | 0x07,
-	29083 - 19968: jis0212<<14 | 0x29<<7 | 0x08,
-	29087 - 19968: jis0208<<14 | 0x1C<<7 | 0x2E,
-	29088 - 19968: jis0212<<14 | 0x29<<7 | 0x09,
-	29090 - 19968: jis0212<<14 | 0x29<<7 | 0x0A,
-	29096 - 19968: jis0208<<14 | 0x3E<<7 | 0x50,
-	29100 - 19968: jis0208<<14 | 0x3E<<7 | 0x51,
-	29103 - 19968: jis0212<<14 | 0x29<<7 | 0x0B,
-	29104 - 19968: jis0212<<14 | 0x29<<7 | 0x0C,
-	29105 - 19968: jis0208<<14 | 0x26<<7 | 0x0D,
-	29106 - 19968: jis0212<<14 | 0x29<<7 | 0x0D,
-	29107 - 19968: jis0212<<14 | 0x29<<7 | 0x0E,
-	29113 - 19968: jis0208<<14 | 0x3E<<7 | 0x53,
-	29114 - 19968: jis0212<<14 | 0x29<<7 | 0x0F,
-	29118 - 19968: jis0208<<14 | 0x3E<<7 | 0x54,
-	29119 - 19968: jis0212<<14 | 0x29<<7 | 0x10,
-	29120 - 19968: jis0212<<14 | 0x29<<7 | 0x11,
-	29121 - 19968: jis0208<<14 | 0x59<<7 | 0x5B,
-	29123 - 19968: jis0208<<14 | 0x26<<7 | 0x12,
-	29124 - 19968: jis0212<<14 | 0x29<<7 | 0x13,
-	29128 - 19968: jis0208<<14 | 0x24<<7 | 0x54,
-	29129 - 19968: jis0208<<14 | 0x3E<<7 | 0x56,
-	29131 - 19968: jis0212<<14 | 0x29<<7 | 0x14,
-	29132 - 19968: jis0212<<14 | 0x29<<7 | 0x15,
-	29134 - 19968: jis0208<<14 | 0x3E<<7 | 0x58,
-	29136 - 19968: jis0208<<14 | 0x2D<<7 | 0x34,
-	29138 - 19968: jis0208<<14 | 0x3E<<7 | 0x55,
-	29139 - 19968: jis0212<<14 | 0x29<<7 | 0x16,
-	29140 - 19968: jis0208<<14 | 0x3E<<7 | 0x57,
-	29141 - 19968: jis0208<<14 | 0x10<<7 | 0x4C,
-	29142 - 19968: jis0212<<14 | 0x29<<7 | 0x17,
-	29143 - 19968: jis0208<<14 | 0x3E<<7 | 0x52,
-	29145 - 19968: jis0212<<14 | 0x29<<7 | 0x18,
-	29146 - 19968: jis0212<<14 | 0x29<<7 | 0x19,
-	29148 - 19968: jis0212<<14 | 0x29<<7 | 0x1A,
-	29151 - 19968: jis0208<<14 | 0x32<<7 | 0x3A,
-	29152 - 19968: jis0208<<14 | 0x3E<<7 | 0x59,
-	29157 - 19968: jis0208<<14 | 0x20<<7 | 0x46,
-	29158 - 19968: jis0208<<14 | 0x1A<<7 | 0x17,
-	29159 - 19968: jis0208<<14 | 0x3E<<7 | 0x5B,
-	29164 - 19968: jis0208<<14 | 0x3E<<7 | 0x5A,
-	29165 - 19968: jis0208<<14 | 0x1E<<7 | 0x03,
-	29166 - 19968: jis0208<<14 | 0x31<<7 | 0x38,
-	29173 - 19968: jis0208<<14 | 0x3E<<7 | 0x5C,
-	29176 - 19968: jis0212<<14 | 0x29<<7 | 0x1B,
-	29177 - 19968: jis0208<<14 | 0x3F<<7 | 0x00,
-	29179 - 19968: jis0208<<14 | 0x3E<<7 | 0x4D,
-	29180 - 19968: jis0208<<14 | 0x3E<<7 | 0x5D,
-	29182 - 19968: jis0208<<14 | 0x59<<7 | 0x5C,
-	29183 - 19968: jis0208<<14 | 0x3F<<7 | 0x01,
-	29184 - 19968: jis0212<<14 | 0x29<<7 | 0x1D,
-	29190 - 19968: jis0208<<14 | 0x26<<7 | 0x59,
-	29191 - 19968: jis0212<<14 | 0x29<<7 | 0x1E,
-	29192 - 19968: jis0212<<14 | 0x29<<7 | 0x1F,
-	29193 - 19968: jis0212<<14 | 0x29<<7 | 0x20,
-	29197 - 19968: jis0208<<14 | 0x3F<<7 | 0x02,
-	29200 - 19968: jis0208<<14 | 0x3F<<7 | 0x03,
-	29203 - 19968: jis0212<<14 | 0x29<<7 | 0x21,
-	29207 - 19968: jis0212<<14 | 0x29<<7 | 0x22,
-	29210 - 19968: jis0212<<14 | 0x29<<7 | 0x23,
-	29211 - 19968: jis0208<<14 | 0x3F<<7 | 0x04,
-	29213 - 19968: jis0212<<14 | 0x29<<7 | 0x24,
-	29215 - 19968: jis0212<<14 | 0x29<<7 | 0x25,
-	29220 - 19968: jis0212<<14 | 0x29<<7 | 0x26,
-	29224 - 19968: jis0208<<14 | 0x3F<<7 | 0x05,
-	29226 - 19968: jis0208<<14 | 0x23<<7 | 0x3D,
-	29227 - 19968: jis0212<<14 | 0x29<<7 | 0x27,
-	29228 - 19968: jis0208<<14 | 0x3F<<7 | 0x07,
-	29229 - 19968: jis0208<<14 | 0x3F<<7 | 0x06,
-	29231 - 19968: jis0212<<14 | 0x29<<7 | 0x28,
-	29232 - 19968: jis0208<<14 | 0x3F<<7 | 0x08,
-	29234 - 19968: jis0208<<14 | 0x3F<<7 | 0x09,
-	29236 - 19968: jis0212<<14 | 0x29<<7 | 0x29,
-	29237 - 19968: jis0208<<14 | 0x1B<<7 | 0x3E,
-	29238 - 19968: jis0208<<14 | 0x28<<7 | 0x42,
-	29240 - 19968: jis0212<<14 | 0x29<<7 | 0x2A,
-	29241 - 19968: jis0212<<14 | 0x29<<7 | 0x2B,
-	29242 - 19968: jis0208<<14 | 0x2B<<7 | 0x4B,
-	29243 - 19968: jis0208<<14 | 0x3F<<7 | 0x0A,
-	29244 - 19968: jis0208<<14 | 0x3F<<7 | 0x0B,
-	29245 - 19968: jis0208<<14 | 0x20<<7 | 0x35,
-	29246 - 19968: jis0208<<14 | 0x1B<<7 | 0x03,
-	29247 - 19968: jis0208<<14 | 0x3F<<7 | 0x0C,
-	29248 - 19968: jis0208<<14 | 0x3F<<7 | 0x0D,
-	29249 - 19968: jis0212<<14 | 0x29<<7 | 0x2C,
-	29250 - 19968: jis0212<<14 | 0x29<<7 | 0x2D,
-	29251 - 19968: jis0212<<14 | 0x29<<7 | 0x2E,
-	29253 - 19968: jis0212<<14 | 0x29<<7 | 0x2F,
-	29254 - 19968: jis0208<<14 | 0x3F<<7 | 0x0E,
-	29255 - 19968: jis0208<<14 | 0x29<<7 | 0x31,
-	29256 - 19968: jis0208<<14 | 0x27<<7 | 0x26,
-	29259 - 19968: jis0208<<14 | 0x3F<<7 | 0x0F,
-	29260 - 19968: jis0208<<14 | 0x26<<7 | 0x36,
-	29262 - 19968: jis0212<<14 | 0x29<<7 | 0x30,
-	29263 - 19968: jis0212<<14 | 0x29<<7 | 0x31,
-	29264 - 19968: jis0212<<14 | 0x29<<7 | 0x32,
-	29266 - 19968: jis0208<<14 | 0x23<<7 | 0x0C,
-	29267 - 19968: jis0212<<14 | 0x29<<7 | 0x33,
-	29269 - 19968: jis0212<<14 | 0x29<<7 | 0x34,
-	29270 - 19968: jis0212<<14 | 0x29<<7 | 0x35,
-	29272 - 19968: jis0208<<14 | 0x3F<<7 | 0x10,
-	29273 - 19968: jis0208<<14 | 0x11<<7 | 0x46,
-	29274 - 19968: jis0212<<14 | 0x29<<7 | 0x36,
-	29275 - 19968: jis0208<<14 | 0x14<<7 | 0x4C,
-	29276 - 19968: jis0212<<14 | 0x29<<7 | 0x37,
-	29277 - 19968: jis0208<<14 | 0x2B<<7 | 0x25,
-	29278 - 19968: jis0212<<14 | 0x29<<7 | 0x38,
-	29279 - 19968: jis0208<<14 | 0x2B<<7 | 0x15,
-	29280 - 19968: jis0212<<14 | 0x29<<7 | 0x39,
-	29281 - 19968: jis0208<<14 | 0x11<<7 | 0x13,
-	29282 - 19968: jis0208<<14 | 0x2E<<7 | 0x13,
-	29283 - 19968: jis0212<<14 | 0x29<<7 | 0x3A,
-	29287 - 19968: jis0208<<14 | 0x2A<<7 | 0x31,
-	29288 - 19968: jis0212<<14 | 0x29<<7 | 0x3B,
-	29289 - 19968: jis0208<<14 | 0x29<<7 | 0x09,
-	29291 - 19968: jis0212<<14 | 0x29<<7 | 0x3C,
-	29294 - 19968: jis0212<<14 | 0x29<<7 | 0x3D,
-	29295 - 19968: jis0212<<14 | 0x29<<7 | 0x3E,
-	29297 - 19968: jis0212<<14 | 0x29<<7 | 0x3F,
-	29298 - 19968: jis0208<<14 | 0x1F<<7 | 0x16,
-	29300 - 19968: jis0208<<14 | 0x3F<<7 | 0x11,
-	29303 - 19968: jis0212<<14 | 0x29<<7 | 0x40,
-	29304 - 19968: jis0212<<14 | 0x29<<7 | 0x41,
-	29305 - 19968: jis0208<<14 | 0x25<<7 | 0x22,
-	29307 - 19968: jis0212<<14 | 0x29<<7 | 0x42,
-	29308 - 19968: jis0212<<14 | 0x29<<7 | 0x43,
-	29309 - 19968: jis0208<<14 | 0x17<<7 | 0x02,
-	29310 - 19968: jis0208<<14 | 0x3F<<7 | 0x12,
-	29311 - 19968: jis0212<<14 | 0x29<<7 | 0x44,
-	29312 - 19968: jis0208<<14 | 0x19<<7 | 0x33,
-	29313 - 19968: jis0208<<14 | 0x3F<<7 | 0x14,
-	29314 - 19968: jis0208<<14 | 0x3F<<7 | 0x13,
-	29316 - 19968: jis0212<<14 | 0x29<<7 | 0x45,
-	29319 - 19968: jis0208<<14 | 0x3F<<7 | 0x15,
-	29321 - 19968: jis0212<<14 | 0x29<<7 | 0x46,
-	29325 - 19968: jis0212<<14 | 0x29<<7 | 0x47,
-	29326 - 19968: jis0212<<14 | 0x29<<7 | 0x48,
-	29330 - 19968: jis0208<<14 | 0x3F<<7 | 0x16,
-	29331 - 19968: jis0212<<14 | 0x29<<7 | 0x49,
-	29334 - 19968: jis0208<<14 | 0x3F<<7 | 0x17,
-	29339 - 19968: jis0212<<14 | 0x29<<7 | 0x4A,
-	29344 - 19968: jis0208<<14 | 0x14<<7 | 0x1D,
-	29346 - 19968: jis0208<<14 | 0x3F<<7 | 0x18,
-	29351 - 19968: jis0208<<14 | 0x3F<<7 | 0x19,
-	29352 - 19968: jis0212<<14 | 0x29<<7 | 0x4B,
-	29356 - 19968: jis0208<<14 | 0x17<<7 | 0x03,
-	29357 - 19968: jis0212<<14 | 0x29<<7 | 0x4C,
-	29358 - 19968: jis0212<<14 | 0x29<<7 | 0x4D,
-	29359 - 19968: jis0208<<14 | 0x27<<7 | 0x27,
-	29361 - 19968: jis0208<<14 | 0x59<<7 | 0x5D,
-	29362 - 19968: jis0208<<14 | 0x3F<<7 | 0x1B,
-	29364 - 19968: jis0212<<14 | 0x29<<7 | 0x4F,
-	29366 - 19968: jis0208<<14 | 0x1D<<7 | 0x54,
-	29369 - 19968: jis0208<<14 | 0x3F<<7 | 0x1A,
-	29374 - 19968: jis0208<<14 | 0x5A<<7 | 0x00,
-	29377 - 19968: jis0212<<14 | 0x29<<7 | 0x51,
-	29378 - 19968: jis0208<<14 | 0x15<<7 | 0x17,
-	29379 - 19968: jis0208<<14 | 0x3F<<7 | 0x1C,
-	29380 - 19968: jis0208<<14 | 0x3F<<7 | 0x1E,
-	29382 - 19968: jis0208<<14 | 0x3F<<7 | 0x1D,
-	29383 - 19968: jis0212<<14 | 0x29<<7 | 0x52,
-	29385 - 19968: jis0212<<14 | 0x29<<7 | 0x53,
-	29388 - 19968: jis0212<<14 | 0x29<<7 | 0x54,
-	29390 - 19968: jis0208<<14 | 0x3F<<7 | 0x1F,
-	29392 - 19968: jis0208<<14 | 0x17<<7 | 0x30,
-	29394 - 19968: jis0208<<14 | 0x3F<<7 | 0x20,
-	29397 - 19968: jis0212<<14 | 0x29<<7 | 0x55,
-	29398 - 19968: jis0212<<14 | 0x29<<7 | 0x56,
-	29399 - 19968: jis0208<<14 | 0x15<<7 | 0x48,
-	29400 - 19968: jis0212<<14 | 0x29<<7 | 0x57,
-	29401 - 19968: jis0208<<14 | 0x20<<7 | 0x1F,
-	29403 - 19968: jis0208<<14 | 0x18<<7 | 0x5C,
-	29407 - 19968: jis0212<<14 | 0x29<<7 | 0x58,
-	29408 - 19968: jis0208<<14 | 0x3F<<7 | 0x22,
-	29409 - 19968: jis0208<<14 | 0x3F<<7 | 0x23,
-	29410 - 19968: jis0208<<14 | 0x3F<<7 | 0x21,
-	29413 - 19968: jis0212<<14 | 0x29<<7 | 0x59,
-	29417 - 19968: jis0208<<14 | 0x1B<<7 | 0x4C,
-	29420 - 19968: jis0208<<14 | 0x25<<7 | 0x27,
-	29421 - 19968: jis0208<<14 | 0x15<<7 | 0x18,
-	29427 - 19968: jis0212<<14 | 0x29<<7 | 0x5A,
-	29428 - 19968: jis0212<<14 | 0x29<<7 | 0x5B,
-	29431 - 19968: jis0208<<14 | 0x3F<<7 | 0x25,
-	29432 - 19968: jis0208<<14 | 0x22<<7 | 0x0B,
-	29433 - 19968: jis0208<<14 | 0x3F<<7 | 0x24,
-	29434 - 19968: jis0212<<14 | 0x29<<7 | 0x5C,
-	29435 - 19968: jis0212<<14 | 0x29<<7 | 0x5D,
-	29436 - 19968: jis0208<<14 | 0x2E<<7 | 0x14,
-	29437 - 19968: jis0208<<14 | 0x26<<7 | 0x41,
-	29438 - 19968: jis0212<<14 | 0x2A<<7 | 0x00,
-	29442 - 19968: jis0212<<14 | 0x2A<<7 | 0x01,
-	29444 - 19968: jis0212<<14 | 0x2A<<7 | 0x02,
-	29445 - 19968: jis0212<<14 | 0x2A<<7 | 0x03,
-	29447 - 19968: jis0212<<14 | 0x2A<<7 | 0x04,
-	29450 - 19968: jis0208<<14 | 0x3F<<7 | 0x28,
-	29451 - 19968: jis0212<<14 | 0x2A<<7 | 0x05,
-	29453 - 19968: jis0212<<14 | 0x2A<<7 | 0x06,
-	29458 - 19968: jis0212<<14 | 0x2A<<7 | 0x07,
-	29459 - 19968: jis0212<<14 | 0x2A<<7 | 0x08,
-	29462 - 19968: jis0208<<14 | 0x3F<<7 | 0x2A,
-	29463 - 19968: jis0208<<14 | 0x3F<<7 | 0x27,
-	29464 - 19968: jis0212<<14 | 0x2A<<7 | 0x09,
-	29465 - 19968: jis0212<<14 | 0x2A<<7 | 0x0A,
-	29467 - 19968: jis0208<<14 | 0x2B<<7 | 0x33,
-	29468 - 19968: jis0208<<14 | 0x3F<<7 | 0x29,
-	29469 - 19968: jis0208<<14 | 0x3F<<7 | 0x2B,
-	29470 - 19968: jis0212<<14 | 0x2A<<7 | 0x0B,
-	29471 - 19968: jis0208<<14 | 0x2D<<7 | 0x23,
-	29474 - 19968: jis0212<<14 | 0x2A<<7 | 0x0C,
-	29476 - 19968: jis0208<<14 | 0x5A<<7 | 0x01,
-	29477 - 19968: jis0208<<14 | 0x3F<<7 | 0x2F,
-	29479 - 19968: jis0212<<14 | 0x2A<<7 | 0x0E,
-	29480 - 19968: jis0212<<14 | 0x2A<<7 | 0x0F,
-	29481 - 19968: jis0208<<14 | 0x3F<<7 | 0x2E,
-	29482 - 19968: jis0208<<14 | 0x22<<7 | 0x55,
-	29483 - 19968: jis0208<<14 | 0x26<<7 | 0x0C,
-	29484 - 19968: jis0212<<14 | 0x2A<<7 | 0x10,
-	29486 - 19968: jis0208<<14 | 0x17<<7 | 0x04,
-	29487 - 19968: jis0208<<14 | 0x3F<<7 | 0x2D,
-	29489 - 19968: jis0212<<14 | 0x2A<<7 | 0x11,
-	29490 - 19968: jis0212<<14 | 0x2A<<7 | 0x12,
-	29492 - 19968: jis0208<<14 | 0x3F<<7 | 0x2C,
-	29493 - 19968: jis0212<<14 | 0x2A<<7 | 0x13,
-	29494 - 19968: jis0208<<14 | 0x2C<<7 | 0x10,
-	29495 - 19968: jis0208<<14 | 0x2C<<7 | 0x11,
-	29498 - 19968: jis0212<<14 | 0x2A<<7 | 0x14,
-	29499 - 19968: jis0212<<14 | 0x2A<<7 | 0x15,
-	29501 - 19968: jis0212<<14 | 0x2A<<7 | 0x16,
-	29502 - 19968: jis0208<<14 | 0x3F<<7 | 0x30,
-	29503 - 19968: jis0208<<14 | 0x10<<7 | 0x4D,
-	29507 - 19968: jis0212<<14 | 0x2A<<7 | 0x17,
-	29508 - 19968: jis0208<<14 | 0x18<<7 | 0x55,
-	29509 - 19968: jis0208<<14 | 0x1A<<7 | 0x41,
-	29517 - 19968: jis0212<<14 | 0x2A<<7 | 0x18,
-	29518 - 19968: jis0208<<14 | 0x3F<<7 | 0x31,
-	29519 - 19968: jis0208<<14 | 0x3F<<7 | 0x32,
-	29520 - 19968: jis0212<<14 | 0x2A<<7 | 0x19,
-	29522 - 19968: jis0212<<14 | 0x2A<<7 | 0x1A,
-	29526 - 19968: jis0212<<14 | 0x2A<<7 | 0x1B,
-	29527 - 19968: jis0208<<14 | 0x3F<<7 | 0x34,
-	29528 - 19968: jis0212<<14 | 0x2A<<7 | 0x1C,
-	29533 - 19968: jis0212<<14 | 0x2A<<7 | 0x1D,
-	29534 - 19968: jis0212<<14 | 0x2A<<7 | 0x1E,
-	29535 - 19968: jis0212<<14 | 0x2A<<7 | 0x1F,
-	29536 - 19968: jis0212<<14 | 0x2A<<7 | 0x20,
-	29539 - 19968: jis0208<<14 | 0x1C<<7 | 0x22,
-	29542 - 19968: jis0212<<14 | 0x2A<<7 | 0x21,
-	29543 - 19968: jis0212<<14 | 0x2A<<7 | 0x22,
-	29544 - 19968: jis0208<<14 | 0x3F<<7 | 0x36,
-	29545 - 19968: jis0212<<14 | 0x2A<<7 | 0x23,
-	29546 - 19968: jis0208<<14 | 0x3F<<7 | 0x35,
-	29547 - 19968: jis0212<<14 | 0x2A<<7 | 0x24,
-	29548 - 19968: jis0212<<14 | 0x2A<<7 | 0x25,
-	29550 - 19968: jis0212<<14 | 0x2A<<7 | 0x26,
-	29551 - 19968: jis0212<<14 | 0x2A<<7 | 0x27,
-	29552 - 19968: jis0208<<14 | 0x3F<<7 | 0x37,
-	29553 - 19968: jis0212<<14 | 0x2A<<7 | 0x28,
-	29554 - 19968: jis0208<<14 | 0x12<<7 | 0x2C,
-	29557 - 19968: jis0208<<14 | 0x3F<<7 | 0x39,
-	29559 - 19968: jis0208<<14 | 0x5A<<7 | 0x03,
-	29560 - 19968: jis0208<<14 | 0x3F<<7 | 0x38,
-	29561 - 19968: jis0212<<14 | 0x2A<<7 | 0x2A,
-	29562 - 19968: jis0208<<14 | 0x3F<<7 | 0x3B,
-	29563 - 19968: jis0208<<14 | 0x3F<<7 | 0x3A,
-	29564 - 19968: jis0212<<14 | 0x2A<<7 | 0x2B,
-	29568 - 19968: jis0212<<14 | 0x2A<<7 | 0x2C,
-	29569 - 19968: jis0212<<14 | 0x2A<<7 | 0x2D,
-	29571 - 19968: jis0212<<14 | 0x2A<<7 | 0x2E,
-	29572 - 19968: jis0208<<14 | 0x17<<7 | 0x1B,
-	29573 - 19968: jis0212<<14 | 0x2A<<7 | 0x2F,
-	29574 - 19968: jis0212<<14 | 0x2A<<7 | 0x30,
-	29575 - 19968: jis0208<<14 | 0x2D<<7 | 0x07,
-	29577 - 19968: jis0208<<14 | 0x15<<7 | 0x2B,
-	29579 - 19968: jis0208<<14 | 0x11<<7 | 0x05,
-	29582 - 19968: jis0212<<14 | 0x2A<<7 | 0x31,
-	29584 - 19968: jis0212<<14 | 0x2A<<7 | 0x32,
-	29587 - 19968: jis0212<<14 | 0x2A<<7 | 0x33,
-	29589 - 19968: jis0212<<14 | 0x2A<<7 | 0x34,
-	29590 - 19968: jis0208<<14 | 0x15<<7 | 0x49,
-	29591 - 19968: jis0212<<14 | 0x2A<<7 | 0x35,
-	29592 - 19968: jis0212<<14 | 0x2A<<7 | 0x36,
-	29596 - 19968: jis0212<<14 | 0x2A<<7 | 0x37,
-	29598 - 19968: jis0212<<14 | 0x2A<<7 | 0x38,
-	29599 - 19968: jis0212<<14 | 0x2A<<7 | 0x39,
-	29600 - 19968: jis0212<<14 | 0x2A<<7 | 0x3A,
-	29602 - 19968: jis0212<<14 | 0x2A<<7 | 0x3B,
-	29605 - 19968: jis0212<<14 | 0x2A<<7 | 0x3C,
-	29606 - 19968: jis0212<<14 | 0x2A<<7 | 0x3D,
-	29609 - 19968: jis0208<<14 | 0x13<<7 | 0x40,
-	29610 - 19968: jis0212<<14 | 0x2A<<7 | 0x3E,
-	29611 - 19968: jis0212<<14 | 0x2A<<7 | 0x3F,
-	29613 - 19968: jis0212<<14 | 0x2A<<7 | 0x40,
-	29618 - 19968: jis0208<<14 | 0x2D<<7 | 0x47,
-	29619 - 19968: jis0208<<14 | 0x3F<<7 | 0x3D,
-	29621 - 19968: jis0212<<14 | 0x2A<<7 | 0x41,
-	29623 - 19968: jis0212<<14 | 0x2A<<7 | 0x42,
-	29625 - 19968: jis0212<<14 | 0x2A<<7 | 0x43,
-	29627 - 19968: jis0208<<14 | 0x3F<<7 | 0x3F,
-	29628 - 19968: jis0212<<14 | 0x2A<<7 | 0x44,
-	29629 - 19968: jis0208<<14 | 0x5A<<7 | 0x04,
-	29631 - 19968: jis0212<<14 | 0x2A<<7 | 0x46,
-	29632 - 19968: jis0208<<14 | 0x3F<<7 | 0x40,
-	29634 - 19968: jis0208<<14 | 0x11<<7 | 0x30,
-	29637 - 19968: jis0212<<14 | 0x2A<<7 | 0x47,
-	29638 - 19968: jis0212<<14 | 0x2A<<7 | 0x48,
-	29640 - 19968: jis0208<<14 | 0x3F<<7 | 0x3C,
-	29641 - 19968: jis0208<<14 | 0x5A<<7 | 0x05,
-	29642 - 19968: jis0208<<14 | 0x1A<<7 | 0x18,
-	29643 - 19968: jis0212<<14 | 0x2A<<7 | 0x4A,
-	29644 - 19968: jis0212<<14 | 0x2A<<7 | 0x4B,
-	29645 - 19968: jis0208<<14 | 0x23<<7 | 0x20,
-	29646 - 19968: jis0208<<14 | 0x3F<<7 | 0x3E,
-	29647 - 19968: jis0212<<14 | 0x2A<<7 | 0x4C,
-	29650 - 19968: jis0208<<14 | 0x5A<<7 | 0x08,
-	29651 - 19968: jis0212<<14 | 0x2A<<7 | 0x4E,
-	29654 - 19968: jis0208<<14 | 0x5A<<7 | 0x06,
-	29657 - 19968: jis0212<<14 | 0x2A<<7 | 0x50,
-	29661 - 19968: jis0212<<14 | 0x2A<<7 | 0x51,
-	29662 - 19968: jis0208<<14 | 0x3F<<7 | 0x43,
-	29664 - 19968: jis0208<<14 | 0x1B<<7 | 0x4D,
-	29665 - 19968: jis0212<<14 | 0x2A<<7 | 0x52,
-	29667 - 19968: jis0208<<14 | 0x5A<<7 | 0x07,
-	29669 - 19968: jis0208<<14 | 0x3F<<7 | 0x41,
-	29670 - 19968: jis0212<<14 | 0x2A<<7 | 0x54,
-	29671 - 19968: jis0212<<14 | 0x2A<<7 | 0x55,
-	29673 - 19968: jis0212<<14 | 0x2A<<7 | 0x56,
-	29674 - 19968: jis0208<<14 | 0x16<<7 | 0x1D,
-	29677 - 19968: jis0208<<14 | 0x27<<7 | 0x28,
-	29678 - 19968: jis0208<<14 | 0x3F<<7 | 0x42,
-	29681 - 19968: jis0208<<14 | 0x3F<<7 | 0x5D,
-	29684 - 19968: jis0212<<14 | 0x2A<<7 | 0x57,
-	29685 - 19968: jis0208<<14 | 0x5A<<7 | 0x0A,
-	29687 - 19968: jis0212<<14 | 0x2A<<7 | 0x59,
-	29688 - 19968: jis0208<<14 | 0x3F<<7 | 0x48,
-	29689 - 19968: jis0212<<14 | 0x2A<<7 | 0x5A,
-	29690 - 19968: jis0212<<14 | 0x2A<<7 | 0x5B,
-	29691 - 19968: jis0212<<14 | 0x2A<<7 | 0x5C,
-	29693 - 19968: jis0212<<14 | 0x2A<<7 | 0x5D,
-	29694 - 19968: jis0208<<14 | 0x17<<7 | 0x1C,
-	29695 - 19968: jis0212<<14 | 0x2B<<7 | 0x00,
-	29696 - 19968: jis0212<<14 | 0x2B<<7 | 0x01,
-	29697 - 19968: jis0212<<14 | 0x2B<<7 | 0x02,
-	29699 - 19968: jis0208<<14 | 0x14<<7 | 0x44,
-	29700 - 19968: jis0212<<14 | 0x2B<<7 | 0x03,
-	29701 - 19968: jis0208<<14 | 0x3F<<7 | 0x45,
-	29702 - 19968: jis0208<<14 | 0x2C<<7 | 0x5C,
-	29703 - 19968: jis0208<<14 | 0x5A<<7 | 0x09,
-	29705 - 19968: jis0208<<14 | 0x2D<<7 | 0x0F,
-	29706 - 19968: jis0212<<14 | 0x2B<<7 | 0x05,
-	29713 - 19968: jis0212<<14 | 0x2B<<7 | 0x06,
-	29722 - 19968: jis0212<<14 | 0x2B<<7 | 0x07,
-	29723 - 19968: jis0212<<14 | 0x2B<<7 | 0x08,
-	29730 - 19968: jis0208<<14 | 0x21<<7 | 0x55,
-	29732 - 19968: jis0212<<14 | 0x2B<<7 | 0x09,
-	29733 - 19968: jis0208<<14 | 0x3F<<7 | 0x47,
-	29734 - 19968: jis0208<<14 | 0x5A<<7 | 0x0B,
-	29736 - 19968: jis0212<<14 | 0x2B<<7 | 0x0B,
-	29737 - 19968: jis0208<<14 | 0x5A<<7 | 0x0D,
-	29738 - 19968: jis0208<<14 | 0x5A<<7 | 0x0C,
-	29739 - 19968: jis0212<<14 | 0x2B<<7 | 0x0E,
-	29740 - 19968: jis0212<<14 | 0x2B<<7 | 0x0F,
-	29741 - 19968: jis0212<<14 | 0x2B<<7 | 0x10,
-	29742 - 19968: jis0208<<14 | 0x5A<<7 | 0x0E,
-	29743 - 19968: jis0212<<14 | 0x2B<<7 | 0x12,
-	29744 - 19968: jis0212<<14 | 0x2B<<7 | 0x13,
-	29745 - 19968: jis0212<<14 | 0x2B<<7 | 0x14,
-	29746 - 19968: jis0208<<14 | 0x3F<<7 | 0x49,
-	29747 - 19968: jis0208<<14 | 0x2D<<7 | 0x35,
-	29748 - 19968: jis0208<<14 | 0x15<<7 | 0x36,
-	29749 - 19968: jis0208<<14 | 0x27<<7 | 0x5B,
-	29750 - 19968: jis0208<<14 | 0x26<<7 | 0x29,
-	29753 - 19968: jis0212<<14 | 0x2B<<7 | 0x15,
-	29754 - 19968: jis0208<<14 | 0x3F<<7 | 0x4A,
-	29759 - 19968: jis0208<<14 | 0x3F<<7 | 0x4C,
-	29760 - 19968: jis0212<<14 | 0x2B<<7 | 0x16,
-	29761 - 19968: jis0208<<14 | 0x3F<<7 | 0x4F,
-	29763 - 19968: jis0212<<14 | 0x2B<<7 | 0x17,
-	29764 - 19968: jis0212<<14 | 0x2B<<7 | 0x18,
-	29766 - 19968: jis0212<<14 | 0x2B<<7 | 0x19,
-	29767 - 19968: jis0212<<14 | 0x2B<<7 | 0x1A,
-	29771 - 19968: jis0212<<14 | 0x2B<<7 | 0x1B,
-	29773 - 19968: jis0212<<14 | 0x2B<<7 | 0x1C,
-	29777 - 19968: jis0212<<14 | 0x2B<<7 | 0x1D,
-	29778 - 19968: jis0212<<14 | 0x2B<<7 | 0x1E,
-	29781 - 19968: jis0208<<14 | 0x3F<<7 | 0x4B,
-	29783 - 19968: jis0212<<14 | 0x2B<<7 | 0x1F,
-	29785 - 19968: jis0208<<14 | 0x3F<<7 | 0x4E,
-	29786 - 19968: jis0208<<14 | 0x17<<7 | 0x49,
-	29787 - 19968: jis0208<<14 | 0x10<<7 | 0x2C,
-	29788 - 19968: jis0208<<14 | 0x3F<<7 | 0x50,
-	29789 - 19968: jis0212<<14 | 0x2B<<7 | 0x20,
-	29790 - 19968: jis0208<<14 | 0x1E<<7 | 0x4F,
-	29791 - 19968: jis0208<<14 | 0x3F<<7 | 0x4D,
-	29792 - 19968: jis0208<<14 | 0x2D<<7 | 0x3B,
-	29794 - 19968: jis0208<<14 | 0x5A<<7 | 0x0F,
-	29795 - 19968: jis0208<<14 | 0x3F<<7 | 0x53,
-	29796 - 19968: jis0208<<14 | 0x53<<7 | 0x03,
-	29798 - 19968: jis0212<<14 | 0x2B<<7 | 0x22,
-	29799 - 19968: jis0212<<14 | 0x2B<<7 | 0x23,
-	29800 - 19968: jis0212<<14 | 0x2B<<7 | 0x24,
-	29801 - 19968: jis0208<<14 | 0x3F<<7 | 0x51,
-	29802 - 19968: jis0208<<14 | 0x3F<<7 | 0x54,
-	29803 - 19968: jis0212<<14 | 0x2B<<7 | 0x25,
-	29805 - 19968: jis0212<<14 | 0x2B<<7 | 0x26,
-	29806 - 19968: jis0212<<14 | 0x2B<<7 | 0x27,
-	29807 - 19968: jis0208<<14 | 0x3F<<7 | 0x46,
-	29808 - 19968: jis0208<<14 | 0x3F<<7 | 0x52,
-	29809 - 19968: jis0212<<14 | 0x2B<<7 | 0x28,
-	29810 - 19968: jis0212<<14 | 0x2B<<7 | 0x29,
-	29811 - 19968: jis0208<<14 | 0x19<<7 | 0x1B,
-	29814 - 19968: jis0208<<14 | 0x3F<<7 | 0x55,
-	29822 - 19968: jis0208<<14 | 0x3F<<7 | 0x56,
-	29824 - 19968: jis0212<<14 | 0x2B<<7 | 0x2A,
-	29825 - 19968: jis0212<<14 | 0x2B<<7 | 0x2B,
-	29827 - 19968: jis0208<<14 | 0x2C<<7 | 0x5D,
-	29829 - 19968: jis0212<<14 | 0x2B<<7 | 0x2C,
-	29830 - 19968: jis0212<<14 | 0x2B<<7 | 0x2D,
-	29831 - 19968: jis0212<<14 | 0x2B<<7 | 0x2E,
-	29833 - 19968: jis0208<<14 | 0x5A<<7 | 0x10,
-	29835 - 19968: jis0208<<14 | 0x3F<<7 | 0x57,
-	29839 - 19968: jis0212<<14 | 0x2B<<7 | 0x30,
-	29840 - 19968: jis0212<<14 | 0x2B<<7 | 0x31,
-	29841 - 19968: jis0212<<14 | 0x2B<<7 | 0x32,
-	29842 - 19968: jis0212<<14 | 0x2B<<7 | 0x33,
-	29848 - 19968: jis0212<<14 | 0x2B<<7 | 0x34,
-	29849 - 19968: jis0212<<14 | 0x2B<<7 | 0x35,
-	29850 - 19968: jis0212<<14 | 0x2B<<7 | 0x36,
-	29852 - 19968: jis0212<<14 | 0x2B<<7 | 0x37,
-	29854 - 19968: jis0208<<14 | 0x3F<<7 | 0x58,
-	29855 - 19968: jis0208<<14 | 0x5A<<7 | 0x11,
-	29856 - 19968: jis0212<<14 | 0x2B<<7 | 0x39,
-	29857 - 19968: jis0212<<14 | 0x2B<<7 | 0x3A,
-	29858 - 19968: jis0208<<14 | 0x3F<<7 | 0x44,
-	29859 - 19968: jis0212<<14 | 0x2B<<7 | 0x3B,
-	29862 - 19968: jis0212<<14 | 0x2B<<7 | 0x3C,
-	29863 - 19968: jis0208<<14 | 0x3F<<7 | 0x59,
-	29864 - 19968: jis0212<<14 | 0x2B<<7 | 0x3D,
-	29865 - 19968: jis0212<<14 | 0x2B<<7 | 0x3E,
-	29866 - 19968: jis0212<<14 | 0x2B<<7 | 0x3F,
-	29867 - 19968: jis0212<<14 | 0x2B<<7 | 0x40,
-	29870 - 19968: jis0212<<14 | 0x2B<<7 | 0x41,
-	29871 - 19968: jis0212<<14 | 0x2B<<7 | 0x42,
-	29872 - 19968: jis0208<<14 | 0x13<<7 | 0x23,
-	29873 - 19968: jis0212<<14 | 0x2B<<7 | 0x43,
-	29874 - 19968: jis0212<<14 | 0x2B<<7 | 0x44,
-	29877 - 19968: jis0212<<14 | 0x2B<<7 | 0x45,
-	29881 - 19968: jis0212<<14 | 0x2B<<7 | 0x46,
-	29883 - 19968: jis0212<<14 | 0x2B<<7 | 0x47,
-	29885 - 19968: jis0208<<14 | 0x1B<<7 | 0x04,
-	29887 - 19968: jis0212<<14 | 0x2B<<7 | 0x48,
-	29896 - 19968: jis0212<<14 | 0x2B<<7 | 0x49,
-	29897 - 19968: jis0212<<14 | 0x2B<<7 | 0x4A,
-	29898 - 19968: jis0208<<14 | 0x3F<<7 | 0x5A,
-	29900 - 19968: jis0212<<14 | 0x2B<<7 | 0x4B,
-	29903 - 19968: jis0208<<14 | 0x3F<<7 | 0x5B,
-	29904 - 19968: jis0212<<14 | 0x2B<<7 | 0x4C,
-	29907 - 19968: jis0212<<14 | 0x2B<<7 | 0x4D,
-	29908 - 19968: jis0208<<14 | 0x3F<<7 | 0x5C,
-	29912 - 19968: jis0212<<14 | 0x2B<<7 | 0x4E,
-	29914 - 19968: jis0212<<14 | 0x2B<<7 | 0x4F,
-	29915 - 19968: jis0212<<14 | 0x2B<<7 | 0x50,
-	29916 - 19968: jis0208<<14 | 0x10<<7 | 0x1A,
-	29918 - 19968: jis0212<<14 | 0x2B<<7 | 0x51,
-	29919 - 19968: jis0212<<14 | 0x2B<<7 | 0x52,
-	29920 - 19968: jis0208<<14 | 0x40<<7 | 0x00,
-	29922 - 19968: jis0208<<14 | 0x28<<7 | 0x1A,
-	29923 - 19968: jis0208<<14 | 0x40<<7 | 0x01,
-	29924 - 19968: jis0212<<14 | 0x2B<<7 | 0x53,
-	29926 - 19968: jis0208<<14 | 0x13<<7 | 0x03,
-	29927 - 19968: jis0208<<14 | 0x40<<7 | 0x02,
-	29928 - 19968: jis0212<<14 | 0x2B<<7 | 0x54,
-	29929 - 19968: jis0208<<14 | 0x40<<7 | 0x03,
-	29930 - 19968: jis0212<<14 | 0x2B<<7 | 0x55,
-	29931 - 19968: jis0212<<14 | 0x2B<<7 | 0x56,
-	29934 - 19968: jis0208<<14 | 0x40<<7 | 0x04,
-	29935 - 19968: jis0212<<14 | 0x2B<<7 | 0x57,
-	29936 - 19968: jis0208<<14 | 0x40<<7 | 0x06,
-	29937 - 19968: jis0208<<14 | 0x40<<7 | 0x07,
-	29938 - 19968: jis0208<<14 | 0x40<<7 | 0x05,
-	29940 - 19968: jis0212<<14 | 0x2B<<7 | 0x58,
-	29942 - 19968: jis0208<<14 | 0x28<<7 | 0x32,
-	29943 - 19968: jis0208<<14 | 0x40<<7 | 0x09,
-	29944 - 19968: jis0208<<14 | 0x40<<7 | 0x08,
-	29946 - 19968: jis0212<<14 | 0x2B<<7 | 0x59,
-	29947 - 19968: jis0212<<14 | 0x2B<<7 | 0x5A,
-	29948 - 19968: jis0212<<14 | 0x2B<<7 | 0x5B,
-	29951 - 19968: jis0212<<14 | 0x2B<<7 | 0x5C,
-	29953 - 19968: jis0208<<14 | 0x5A<<7 | 0x12,
-	29955 - 19968: jis0208<<14 | 0x40<<7 | 0x0B,
-	29956 - 19968: jis0208<<14 | 0x40<<7 | 0x0A,
-	29957 - 19968: jis0208<<14 | 0x40<<7 | 0x0C,
-	29958 - 19968: jis0212<<14 | 0x2B<<7 | 0x5D,
-	29964 - 19968: jis0208<<14 | 0x40<<7 | 0x0D,
-	29965 - 19968: jis0208<<14 | 0x40<<7 | 0x0F,
-	29966 - 19968: jis0208<<14 | 0x40<<7 | 0x0E,
-	29969 - 19968: jis0208<<14 | 0x18<<7 | 0x58,
-	29970 - 19968: jis0212<<14 | 0x2C<<7 | 0x00,
-	29971 - 19968: jis0208<<14 | 0x40<<7 | 0x11,
-	29973 - 19968: jis0208<<14 | 0x40<<7 | 0x10,
-	29974 - 19968: jis0212<<14 | 0x2C<<7 | 0x01,
-	29975 - 19968: jis0212<<14 | 0x2C<<7 | 0x02,
-	29976 - 19968: jis0208<<14 | 0x13<<7 | 0x24,
-	29978 - 19968: jis0208<<14 | 0x1E<<7 | 0x32,
-	29980 - 19968: jis0208<<14 | 0x24<<7 | 0x1B,
-	29982 - 19968: jis0208<<14 | 0x40<<7 | 0x12,
-	29983 - 19968: jis0208<<14 | 0x1F<<7 | 0x17,
-	29984 - 19968: jis0212<<14 | 0x2C<<7 | 0x03,
-	29985 - 19968: jis0212<<14 | 0x2C<<7 | 0x04,
-	29987 - 19968: jis0208<<14 | 0x1A<<7 | 0x19,
-	29988 - 19968: jis0212<<14 | 0x2C<<7 | 0x05,
-	29989 - 19968: jis0208<<14 | 0x10<<7 | 0x58,
-	29990 - 19968: jis0208<<14 | 0x40<<7 | 0x13,
-	29991 - 19968: jis0212<<14 | 0x2C<<7 | 0x06,
-	29992 - 19968: jis0208<<14 | 0x2C<<7 | 0x30,
-	29993 - 19968: jis0212<<14 | 0x2C<<7 | 0x07,
-	29994 - 19968: jis0212<<14 | 0x2C<<7 | 0x08,
-	29995 - 19968: jis0208<<14 | 0x29<<7 | 0x42,
-	29996 - 19968: jis0208<<14 | 0x40<<7 | 0x14,
-	29999 - 19968: jis0208<<14 | 0x58<<7 | 0x4B,
-	30000 - 19968: jis0208<<14 | 0x24<<7 | 0x23,
-	30001 - 19968: jis0208<<14 | 0x2C<<7 | 0x12,
-	30002 - 19968: jis0208<<14 | 0x18<<7 | 0x22,
-	30003 - 19968: jis0208<<14 | 0x1E<<7 | 0x1C,
-	30006 - 19968: jis0212<<14 | 0x2C<<7 | 0x0A,
-	30007 - 19968: jis0208<<14 | 0x22<<7 | 0x2A,
-	30008 - 19968: jis0208<<14 | 0x31<<7 | 0x13,
-	30009 - 19968: jis0212<<14 | 0x2C<<7 | 0x0B,
-	30010 - 19968: jis0208<<14 | 0x23<<7 | 0x0D,
-	30011 - 19968: jis0208<<14 | 0x11<<7 | 0x47,
-	30012 - 19968: jis0208<<14 | 0x40<<7 | 0x15,
-	30013 - 19968: jis0212<<14 | 0x2C<<7 | 0x0C,
-	30014 - 19968: jis0212<<14 | 0x2C<<7 | 0x0D,
-	30015 - 19968: jis0212<<14 | 0x2C<<7 | 0x0E,
-	30016 - 19968: jis0212<<14 | 0x2C<<7 | 0x0F,
-	30019 - 19968: jis0212<<14 | 0x2C<<7 | 0x10,
-	30020 - 19968: jis0208<<14 | 0x40<<7 | 0x16,
-	30022 - 19968: jis0208<<14 | 0x40<<7 | 0x1B,
-	30023 - 19968: jis0212<<14 | 0x2C<<7 | 0x11,
-	30024 - 19968: jis0212<<14 | 0x2C<<7 | 0x12,
-	30025 - 19968: jis0208<<14 | 0x40<<7 | 0x19,
-	30026 - 19968: jis0208<<14 | 0x40<<7 | 0x18,
-	30027 - 19968: jis0208<<14 | 0x39<<7 | 0x21,
-	30028 - 19968: jis0208<<14 | 0x12<<7 | 0x05,
-	30029 - 19968: jis0208<<14 | 0x40<<7 | 0x17,
-	30030 - 19968: jis0212<<14 | 0x2C<<7 | 0x13,
-	30031 - 19968: jis0208<<14 | 0x0F<<7 | 0x39,
-	30032 - 19968: jis0212<<14 | 0x2C<<7 | 0x14,
-	30033 - 19968: jis0208<<14 | 0x27<<7 | 0x09,
-	30034 - 19968: jis0212<<14 | 0x2C<<7 | 0x15,
-	30036 - 19968: jis0208<<14 | 0x27<<7 | 0x29,
-	30039 - 19968: jis0212<<14 | 0x2C<<7 | 0x16,
-	30041 - 19968: jis0208<<14 | 0x2D<<7 | 0x10,
-	30042 - 19968: jis0208<<14 | 0x40<<7 | 0x1C,
-	30043 - 19968: jis0208<<14 | 0x40<<7 | 0x1A,
-	30044 - 19968: jis0208<<14 | 0x22<<7 | 0x3B,
-	30045 - 19968: jis0208<<14 | 0x1F<<7 | 0x05,
-	30046 - 19968: jis0212<<14 | 0x2C<<7 | 0x17,
-	30047 - 19968: jis0212<<14 | 0x2C<<7 | 0x18,
-	30048 - 19968: jis0208<<14 | 0x27<<7 | 0x0A,
-	30049 - 19968: jis0212<<14 | 0x2C<<7 | 0x19,
-	30050 - 19968: jis0208<<14 | 0x28<<7 | 0x0C,
-	30052 - 19968: jis0208<<14 | 0x40<<7 | 0x1E,
-	30053 - 19968: jis0208<<14 | 0x2D<<7 | 0x0B,
-	30054 - 19968: jis0208<<14 | 0x16<<7 | 0x2C,
-	30055 - 19968: jis0208<<14 | 0x40<<7 | 0x1F,
-	30057 - 19968: jis0208<<14 | 0x40<<7 | 0x1D,
-	30058 - 19968: jis0208<<14 | 0x27<<7 | 0x35,
-	30059 - 19968: jis0208<<14 | 0x40<<7 | 0x20,
-	30061 - 19968: jis0208<<14 | 0x40<<7 | 0x21,
-	30063 - 19968: jis0208<<14 | 0x5A<<7 | 0x13,
-	30064 - 19968: jis0208<<14 | 0x0F<<7 | 0x3A,
-	30065 - 19968: jis0212<<14 | 0x2C<<7 | 0x1B,
-	30067 - 19968: jis0208<<14 | 0x1D<<7 | 0x55,
-	30068 - 19968: jis0208<<14 | 0x40<<7 | 0x26,
-	30070 - 19968: jis0208<<14 | 0x40<<7 | 0x23,
-	30071 - 19968: jis0208<<14 | 0x25<<7 | 0x4C,
-	30072 - 19968: jis0208<<14 | 0x40<<7 | 0x22,
-	30073 - 19968: jis0212<<14 | 0x2C<<7 | 0x1C,
-	30074 - 19968: jis0212<<14 | 0x2C<<7 | 0x1D,
-	30075 - 19968: jis0212<<14 | 0x2C<<7 | 0x1E,
-	30076 - 19968: jis0212<<14 | 0x2C<<7 | 0x1F,
-	30077 - 19968: jis0212<<14 | 0x2C<<7 | 0x20,
-	30078 - 19968: jis0212<<14 | 0x2C<<7 | 0x21,
-	30079 - 19968: jis0208<<14 | 0x14<<7 | 0x05,
-	30081 - 19968: jis0212<<14 | 0x2C<<7 | 0x22,
-	30082 - 19968: jis0208<<14 | 0x40<<7 | 0x29,
-	30085 - 19968: jis0212<<14 | 0x2C<<7 | 0x23,
-	30086 - 19968: jis0208<<14 | 0x40<<7 | 0x24,
-	30087 - 19968: jis0208<<14 | 0x40<<7 | 0x25,
-	30089 - 19968: jis0208<<14 | 0x40<<7 | 0x28,
-	30090 - 19968: jis0208<<14 | 0x40<<7 | 0x27,
-	30091 - 19968: jis0208<<14 | 0x28<<7 | 0x04,
-	30094 - 19968: jis0208<<14 | 0x20<<7 | 0x21,
-	30095 - 19968: jis0208<<14 | 0x20<<7 | 0x20,
-	30096 - 19968: jis0212<<14 | 0x2C<<7 | 0x24,
-	30097 - 19968: jis0208<<14 | 0x14<<7 | 0x1E,
-	30098 - 19968: jis0212<<14 | 0x2C<<7 | 0x25,
-	30099 - 19968: jis0212<<14 | 0x2C<<7 | 0x26,
-	30100 - 19968: jis0208<<14 | 0x40<<7 | 0x2A,
-	30101 - 19968: jis0212<<14 | 0x2C<<7 | 0x27,
-	30105 - 19968: jis0212<<14 | 0x2C<<7 | 0x28,
-	30106 - 19968: jis0208<<14 | 0x40<<7 | 0x2B,
-	30108 - 19968: jis0212<<14 | 0x2C<<7 | 0x29,
-	30109 - 19968: jis0208<<14 | 0x40<<7 | 0x2C,
-	30114 - 19968: jis0212<<14 | 0x2C<<7 | 0x2A,
-	30115 - 19968: jis0208<<14 | 0x40<<7 | 0x2E,
-	30116 - 19968: jis0212<<14 | 0x2C<<7 | 0x2B,
-	30117 - 19968: jis0208<<14 | 0x40<<7 | 0x2D,
-	30123 - 19968: jis0208<<14 | 0x10<<7 | 0x35,
-	30129 - 19968: jis0208<<14 | 0x40<<7 | 0x36,
-	30130 - 19968: jis0208<<14 | 0x27<<7 | 0x47,
-	30131 - 19968: jis0208<<14 | 0x40<<7 | 0x30,
-	30132 - 19968: jis0212<<14 | 0x2C<<7 | 0x2C,
-	30133 - 19968: jis0208<<14 | 0x40<<7 | 0x32,
-	30136 - 19968: jis0208<<14 | 0x40<<7 | 0x34,
-	30137 - 19968: jis0208<<14 | 0x1E<<7 | 0x1D,
-	30138 - 19968: jis0212<<14 | 0x2C<<7 | 0x2D,
-	30140 - 19968: jis0208<<14 | 0x40<<7 | 0x35,
-	30141 - 19968: jis0208<<14 | 0x40<<7 | 0x33,
-	30142 - 19968: jis0208<<14 | 0x1B<<7 | 0x1F,
-	30143 - 19968: jis0212<<14 | 0x2C<<7 | 0x2E,
-	30144 - 19968: jis0212<<14 | 0x2C<<7 | 0x2F,
-	30145 - 19968: jis0212<<14 | 0x2C<<7 | 0x30,
-	30146 - 19968: jis0208<<14 | 0x40<<7 | 0x2F,
-	30147 - 19968: jis0208<<14 | 0x40<<7 | 0x31,
-	30148 - 19968: jis0212<<14 | 0x2C<<7 | 0x31,
-	30149 - 19968: jis0208<<14 | 0x28<<7 | 0x21,
-	30150 - 19968: jis0212<<14 | 0x2C<<7 | 0x32,
-	30151 - 19968: jis0208<<14 | 0x1D<<7 | 0x28,
-	30154 - 19968: jis0208<<14 | 0x40<<7 | 0x38,
-	30156 - 19968: jis0212<<14 | 0x2C<<7 | 0x33,
-	30157 - 19968: jis0208<<14 | 0x40<<7 | 0x37,
-	30158 - 19968: jis0212<<14 | 0x2C<<7 | 0x34,
-	30159 - 19968: jis0212<<14 | 0x2C<<7 | 0x35,
-	30162 - 19968: jis0208<<14 | 0x40<<7 | 0x39,
-	30164 - 19968: jis0208<<14 | 0x1B<<7 | 0x05,
-	30165 - 19968: jis0208<<14 | 0x19<<7 | 0x0E,
-	30167 - 19968: jis0212<<14 | 0x2C<<7 | 0x36,
-	30168 - 19968: jis0208<<14 | 0x24<<7 | 0x56,
-	30169 - 19968: jis0208<<14 | 0x40<<7 | 0x3A,
-	30171 - 19968: jis0208<<14 | 0x23<<7 | 0x2A,
-	30172 - 19968: jis0212<<14 | 0x2C<<7 | 0x37,
-	30174 - 19968: jis0208<<14 | 0x40<<7 | 0x3C,
-	30175 - 19968: jis0212<<14 | 0x2C<<7 | 0x38,
-	30176 - 19968: jis0212<<14 | 0x2C<<7 | 0x39,
-	30177 - 19968: jis0212<<14 | 0x2C<<7 | 0x3A,
-	30178 - 19968: jis0208<<14 | 0x2D<<7 | 0x00,
-	30179 - 19968: jis0208<<14 | 0x40<<7 | 0x3B,
-	30180 - 19968: jis0212<<14 | 0x2C<<7 | 0x3B,
-	30183 - 19968: jis0212<<14 | 0x2C<<7 | 0x3C,
-	30185 - 19968: jis0208<<14 | 0x20<<7 | 0x48,
-	30188 - 19968: jis0212<<14 | 0x2C<<7 | 0x3D,
-	30190 - 19968: jis0212<<14 | 0x2C<<7 | 0x3E,
-	30191 - 19968: jis0212<<14 | 0x2C<<7 | 0x3F,
-	30192 - 19968: jis0208<<14 | 0x40<<7 | 0x41,
-	30193 - 19968: jis0212<<14 | 0x2C<<7 | 0x40,
-	30194 - 19968: jis0208<<14 | 0x40<<7 | 0x43,
-	30195 - 19968: jis0208<<14 | 0x40<<7 | 0x44,
-	30196 - 19968: jis0208<<14 | 0x22<<7 | 0x33,
-	30201 - 19968: jis0212<<14 | 0x2C<<7 | 0x41,
-	30202 - 19968: jis0208<<14 | 0x40<<7 | 0x42,
-	30204 - 19968: jis0208<<14 | 0x40<<7 | 0x3F,
-	30206 - 19968: jis0208<<14 | 0x40<<7 | 0x3D,
-	30207 - 19968: jis0208<<14 | 0x40<<7 | 0x3E,
-	30208 - 19968: jis0212<<14 | 0x2C<<7 | 0x42,
-	30209 - 19968: jis0208<<14 | 0x40<<7 | 0x40,
-	30210 - 19968: jis0212<<14 | 0x2C<<7 | 0x43,
-	30211 - 19968: jis0212<<14 | 0x2C<<7 | 0x44,
-	30212 - 19968: jis0212<<14 | 0x2C<<7 | 0x45,
-	30215 - 19968: jis0212<<14 | 0x2C<<7 | 0x46,
-	30216 - 19968: jis0212<<14 | 0x2C<<7 | 0x47,
-	30217 - 19968: jis0208<<14 | 0x40<<7 | 0x47,
-	30218 - 19968: jis0212<<14 | 0x2C<<7 | 0x48,
-	30219 - 19968: jis0208<<14 | 0x40<<7 | 0x45,
-	30220 - 19968: jis0212<<14 | 0x2C<<7 | 0x49,
-	30221 - 19968: jis0208<<14 | 0x40<<7 | 0x46,
-	30223 - 19968: jis0212<<14 | 0x2C<<7 | 0x4A,
-	30226 - 19968: jis0212<<14 | 0x2C<<7 | 0x4B,
-	30227 - 19968: jis0212<<14 | 0x2C<<7 | 0x4C,
-	30229 - 19968: jis0212<<14 | 0x2C<<7 | 0x4D,
-	30230 - 19968: jis0212<<14 | 0x2C<<7 | 0x4E,
-	30233 - 19968: jis0212<<14 | 0x2C<<7 | 0x4F,
-	30235 - 19968: jis0212<<14 | 0x2C<<7 | 0x50,
-	30236 - 19968: jis0212<<14 | 0x2C<<7 | 0x51,
-	30237 - 19968: jis0212<<14 | 0x2C<<7 | 0x52,
-	30238 - 19968: jis0212<<14 | 0x2C<<7 | 0x53,
-	30239 - 19968: jis0208<<14 | 0x40<<7 | 0x48,
-	30240 - 19968: jis0208<<14 | 0x40<<7 | 0x4A,
-	30241 - 19968: jis0208<<14 | 0x40<<7 | 0x4B,
-	30242 - 19968: jis0208<<14 | 0x40<<7 | 0x4C,
-	30243 - 19968: jis0212<<14 | 0x2C<<7 | 0x54,
-	30244 - 19968: jis0208<<14 | 0x40<<7 | 0x4D,
-	30245 - 19968: jis0212<<14 | 0x2C<<7 | 0x55,
-	30246 - 19968: jis0212<<14 | 0x2C<<7 | 0x56,
-	30247 - 19968: jis0208<<14 | 0x40<<7 | 0x49,
-	30249 - 19968: jis0212<<14 | 0x2C<<7 | 0x57,
-	30253 - 19968: jis0212<<14 | 0x2C<<7 | 0x58,
-	30256 - 19968: jis0208<<14 | 0x40<<7 | 0x4F,
-	30258 - 19968: jis0212<<14 | 0x2C<<7 | 0x59,
-	30259 - 19968: jis0212<<14 | 0x2C<<7 | 0x5A,
-	30260 - 19968: jis0208<<14 | 0x40<<7 | 0x4E,
-	30261 - 19968: jis0212<<14 | 0x2C<<7 | 0x5B,
-	30264 - 19968: jis0212<<14 | 0x2C<<7 | 0x5C,
-	30265 - 19968: jis0212<<14 | 0x2C<<7 | 0x5D,
-	30266 - 19968: jis0212<<14 | 0x2D<<7 | 0x00,
-	30267 - 19968: jis0208<<14 | 0x40<<7 | 0x50,
-	30268 - 19968: jis0212<<14 | 0x2D<<7 | 0x01,
-	30272 - 19968: jis0212<<14 | 0x2D<<7 | 0x03,
-	30273 - 19968: jis0212<<14 | 0x2D<<7 | 0x04,
-	30274 - 19968: jis0208<<14 | 0x2D<<7 | 0x24,
-	30275 - 19968: jis0212<<14 | 0x2D<<7 | 0x05,
-	30276 - 19968: jis0212<<14 | 0x2D<<7 | 0x06,
-	30277 - 19968: jis0212<<14 | 0x2D<<7 | 0x07,
-	30278 - 19968: jis0208<<14 | 0x40<<7 | 0x53,
-	30279 - 19968: jis0208<<14 | 0x40<<7 | 0x51,
-	30280 - 19968: jis0208<<14 | 0x40<<7 | 0x52,
-	30281 - 19968: jis0212<<14 | 0x2D<<7 | 0x08,
-	30282 - 19968: jis0212<<14 | 0x2D<<7 | 0x02,
-	30283 - 19968: jis0212<<14 | 0x2D<<7 | 0x09,
-	30284 - 19968: jis0208<<14 | 0x13<<7 | 0x41,
-	30290 - 19968: jis0208<<14 | 0x2B<<7 | 0x5D,
-	30293 - 19968: jis0212<<14 | 0x2D<<7 | 0x0A,
-	30294 - 19968: jis0208<<14 | 0x29<<7 | 0x29,
-	30296 - 19968: jis0208<<14 | 0x40<<7 | 0x55,
-	30297 - 19968: jis0212<<14 | 0x2D<<7 | 0x0B,
-	30300 - 19968: jis0208<<14 | 0x40<<7 | 0x54,
-	30303 - 19968: jis0212<<14 | 0x2D<<7 | 0x0C,
-	30305 - 19968: jis0208<<14 | 0x40<<7 | 0x56,
-	30306 - 19968: jis0208<<14 | 0x40<<7 | 0x57,
-	30308 - 19968: jis0212<<14 | 0x2D<<7 | 0x0D,
-	30309 - 19968: jis0212<<14 | 0x2D<<7 | 0x0E,
-	30311 - 19968: jis0208<<14 | 0x40<<7 | 0x5B,
-	30312 - 19968: jis0208<<14 | 0x40<<7 | 0x58,
-	30313 - 19968: jis0208<<14 | 0x40<<7 | 0x59,
-	30314 - 19968: jis0208<<14 | 0x40<<7 | 0x5A,
-	30316 - 19968: jis0208<<14 | 0x40<<7 | 0x5C,
-	30317 - 19968: jis0212<<14 | 0x2D<<7 | 0x0F,
-	30318 - 19968: jis0212<<14 | 0x2D<<7 | 0x10,
-	30319 - 19968: jis0212<<14 | 0x2D<<7 | 0x11,
-	30320 - 19968: jis0208<<14 | 0x40<<7 | 0x5D,
-	30321 - 19968: jis0212<<14 | 0x2D<<7 | 0x12,
-	30322 - 19968: jis0208<<14 | 0x41<<7 | 0x00,
-	30324 - 19968: jis0212<<14 | 0x2D<<7 | 0x13,
-	30326 - 19968: jis0208<<14 | 0x41<<7 | 0x01,
-	30328 - 19968: jis0208<<14 | 0x41<<7 | 0x02,
-	30330 - 19968: jis0208<<14 | 0x27<<7 | 0x0E,
-	30331 - 19968: jis0208<<14 | 0x24<<7 | 0x2F,
-	30332 - 19968: jis0208<<14 | 0x41<<7 | 0x03,
-	30333 - 19968: jis0208<<14 | 0x26<<7 | 0x51,
-	30334 - 19968: jis0208<<14 | 0x28<<7 | 0x13,
-	30336 - 19968: jis0208<<14 | 0x41<<7 | 0x04,
-	30337 - 19968: jis0212<<14 | 0x2D<<7 | 0x14,
-	30338 - 19968: jis0208<<14 | 0x5A<<7 | 0x14,
-	30339 - 19968: jis0208<<14 | 0x41<<7 | 0x05,
-	30340 - 19968: jis0208<<14 | 0x24<<7 | 0x09,
-	30341 - 19968: jis0212<<14 | 0x2D<<7 | 0x15,
-	30342 - 19968: jis0208<<14 | 0x12<<7 | 0x06,
-	30343 - 19968: jis0208<<14 | 0x18<<7 | 0x23,
-	30344 - 19968: jis0208<<14 | 0x41<<7 | 0x06,
-	30347 - 19968: jis0208<<14 | 0x41<<7 | 0x07,
-	30348 - 19968: jis0212<<14 | 0x2D<<7 | 0x16,
-	30349 - 19968: jis0212<<14 | 0x2D<<7 | 0x17,
-	30350 - 19968: jis0208<<14 | 0x41<<7 | 0x08,
-	30352 - 19968: jis0208<<14 | 0x1A<<7 | 0x08,
-	30355 - 19968: jis0208<<14 | 0x41<<7 | 0x0A,
-	30357 - 19968: jis0212<<14 | 0x2D<<7 | 0x18,
-	30358 - 19968: jis0208<<14 | 0x41<<7 | 0x09,
-	30361 - 19968: jis0208<<14 | 0x41<<7 | 0x0B,
-	30362 - 19968: jis0208<<14 | 0x41<<7 | 0x0C,
-	30363 - 19968: jis0208<<14 | 0x5A<<7 | 0x17,
-	30364 - 19968: jis0208<<14 | 0x5A<<7 | 0x15,
-	30365 - 19968: jis0212<<14 | 0x2D<<7 | 0x1B,
-	30366 - 19968: jis0208<<14 | 0x5A<<7 | 0x16,
-	30367 - 19968: jis0212<<14 | 0x2D<<7 | 0x1C,
-	30368 - 19968: jis0212<<14 | 0x2D<<7 | 0x1D,
-	30370 - 19968: jis0212<<14 | 0x2D<<7 | 0x1E,
-	30371 - 19968: jis0212<<14 | 0x2D<<7 | 0x1F,
-	30372 - 19968: jis0212<<14 | 0x2D<<7 | 0x20,
-	30373 - 19968: jis0212<<14 | 0x2D<<7 | 0x21,
-	30374 - 19968: jis0208<<14 | 0x5A<<7 | 0x18,
-	30375 - 19968: jis0212<<14 | 0x2D<<7 | 0x23,
-	30376 - 19968: jis0212<<14 | 0x2D<<7 | 0x24,
-	30378 - 19968: jis0212<<14 | 0x2D<<7 | 0x25,
-	30381 - 19968: jis0212<<14 | 0x2D<<7 | 0x26,
-	30382 - 19968: jis0208<<14 | 0x27<<7 | 0x48,
-	30384 - 19968: jis0208<<14 | 0x41<<7 | 0x0D,
-	30388 - 19968: jis0208<<14 | 0x41<<7 | 0x0E,
-	30391 - 19968: jis0208<<14 | 0x52<<7 | 0x48,
-	30392 - 19968: jis0208<<14 | 0x41<<7 | 0x0F,
-	30393 - 19968: jis0208<<14 | 0x41<<7 | 0x10,
-	30394 - 19968: jis0208<<14 | 0x41<<7 | 0x11,
-	30397 - 19968: jis0212<<14 | 0x2D<<7 | 0x27,
-	30399 - 19968: jis0208<<14 | 0x1A<<7 | 0x0D,
-	30401 - 19968: jis0212<<14 | 0x2D<<7 | 0x28,
-	30402 - 19968: jis0208<<14 | 0x41<<7 | 0x12,
-	30403 - 19968: jis0208<<14 | 0x26<<7 | 0x35,
-	30405 - 19968: jis0212<<14 | 0x2D<<7 | 0x29,
-	30406 - 19968: jis0208<<14 | 0x2A<<7 | 0x3E,
-	30408 - 19968: jis0208<<14 | 0x10<<7 | 0x2D,
-	30409 - 19968: jis0212<<14 | 0x2D<<7 | 0x2A,
-	30410 - 19968: jis0208<<14 | 0x10<<7 | 0x36,
-	30411 - 19968: jis0212<<14 | 0x2D<<7 | 0x2B,
-	30412 - 19968: jis0212<<14 | 0x2D<<7 | 0x2C,
-	30413 - 19968: jis0208<<14 | 0x41<<7 | 0x13,
-	30414 - 19968: jis0212<<14 | 0x2D<<7 | 0x2D,
-	30418 - 19968: jis0208<<14 | 0x41<<7 | 0x15,
-	30420 - 19968: jis0212<<14 | 0x2D<<7 | 0x2E,
-	30422 - 19968: jis0208<<14 | 0x41<<7 | 0x14,
-	30423 - 19968: jis0208<<14 | 0x24<<7 | 0x4F,
-	30425 - 19968: jis0212<<14 | 0x2D<<7 | 0x2F,
-	30427 - 19968: jis0208<<14 | 0x1F<<7 | 0x18,
-	30428 - 19968: jis0208<<14 | 0x3C<<7 | 0x18,
-	30430 - 19968: jis0208<<14 | 0x41<<7 | 0x16,
-	30431 - 19968: jis0208<<14 | 0x2B<<7 | 0x20,
-	30432 - 19968: jis0212<<14 | 0x2D<<7 | 0x30,
-	30433 - 19968: jis0208<<14 | 0x41<<7 | 0x17,
-	30435 - 19968: jis0208<<14 | 0x13<<7 | 0x25,
-	30436 - 19968: jis0208<<14 | 0x27<<7 | 0x36,
-	30437 - 19968: jis0208<<14 | 0x41<<7 | 0x18,
-	30438 - 19968: jis0212<<14 | 0x2D<<7 | 0x31,
-	30439 - 19968: jis0208<<14 | 0x41<<7 | 0x19,
-	30440 - 19968: jis0212<<14 | 0x2D<<7 | 0x32,
-	30442 - 19968: jis0208<<14 | 0x41<<7 | 0x1A,
-	30444 - 19968: jis0212<<14 | 0x2D<<7 | 0x33,
-	30446 - 19968: jis0208<<14 | 0x2B<<7 | 0x3B,
-	30448 - 19968: jis0212<<14 | 0x2D<<7 | 0x34,
-	30449 - 19968: jis0212<<14 | 0x2D<<7 | 0x35,
-	30450 - 19968: jis0208<<14 | 0x2B<<7 | 0x34,
-	30452 - 19968: jis0208<<14 | 0x23<<7 | 0x1D,
-	30454 - 19968: jis0212<<14 | 0x2D<<7 | 0x36,
-	30456 - 19968: jis0208<<14 | 0x20<<7 | 0x49,
-	30457 - 19968: jis0212<<14 | 0x2D<<7 | 0x37,
-	30459 - 19968: jis0208<<14 | 0x41<<7 | 0x1C,
-	30460 - 19968: jis0212<<14 | 0x2D<<7 | 0x38,
-	30462 - 19968: jis0208<<14 | 0x1C<<7 | 0x41,
-	30464 - 19968: jis0212<<14 | 0x2D<<7 | 0x39,
-	30465 - 19968: jis0208<<14 | 0x1D<<7 | 0x29,
-	30468 - 19968: jis0208<<14 | 0x41<<7 | 0x1F,
-	30470 - 19968: jis0212<<14 | 0x2D<<7 | 0x3A,
-	30471 - 19968: jis0208<<14 | 0x41<<7 | 0x1E,
-	30472 - 19968: jis0208<<14 | 0x41<<7 | 0x1D,
-	30473 - 19968: jis0208<<14 | 0x27<<7 | 0x5C,
-	30474 - 19968: jis0212<<14 | 0x2D<<7 | 0x3B,
-	30475 - 19968: jis0208<<14 | 0x13<<7 | 0x26,
-	30476 - 19968: jis0208<<14 | 0x17<<7 | 0x08,
-	30478 - 19968: jis0212<<14 | 0x2D<<7 | 0x3C,
-	30482 - 19968: jis0212<<14 | 0x2D<<7 | 0x3D,
-	30484 - 19968: jis0212<<14 | 0x2D<<7 | 0x3E,
-	30485 - 19968: jis0212<<14 | 0x2D<<7 | 0x3F,
-	30487 - 19968: jis0212<<14 | 0x2D<<7 | 0x40,
-	30489 - 19968: jis0212<<14 | 0x2D<<7 | 0x41,
-	30490 - 19968: jis0212<<14 | 0x2D<<7 | 0x42,
-	30491 - 19968: jis0208<<14 | 0x41<<7 | 0x25,
-	30492 - 19968: jis0212<<14 | 0x2D<<7 | 0x43,
-	30494 - 19968: jis0208<<14 | 0x41<<7 | 0x22,
-	30495 - 19968: jis0208<<14 | 0x1E<<7 | 0x1E,
-	30496 - 19968: jis0208<<14 | 0x2B<<7 | 0x11,
-	30498 - 19968: jis0212<<14 | 0x2D<<7 | 0x44,
-	30500 - 19968: jis0208<<14 | 0x41<<7 | 0x21,
-	30501 - 19968: jis0208<<14 | 0x41<<7 | 0x23,
-	30502 - 19968: jis0208<<14 | 0x41<<7 | 0x24,
-	30504 - 19968: jis0212<<14 | 0x2D<<7 | 0x45,
-	30505 - 19968: jis0208<<14 | 0x41<<7 | 0x20,
-	30509 - 19968: jis0212<<14 | 0x2D<<7 | 0x46,
-	30510 - 19968: jis0212<<14 | 0x2D<<7 | 0x47,
-	30511 - 19968: jis0212<<14 | 0x2D<<7 | 0x48,
-	30516 - 19968: jis0212<<14 | 0x2D<<7 | 0x49,
-	30517 - 19968: jis0212<<14 | 0x2D<<7 | 0x4A,
-	30518 - 19968: jis0212<<14 | 0x2D<<7 | 0x4B,
-	30519 - 19968: jis0208<<14 | 0x41<<7 | 0x26,
-	30520 - 19968: jis0208<<14 | 0x41<<7 | 0x27,
-	30521 - 19968: jis0212<<14 | 0x2D<<7 | 0x4C,
-	30522 - 19968: jis0208<<14 | 0x23<<7 | 0x0E,
-	30524 - 19968: jis0208<<14 | 0x13<<7 | 0x42,
-	30525 - 19968: jis0212<<14 | 0x2D<<7 | 0x4D,
-	30526 - 19968: jis0212<<14 | 0x2D<<7 | 0x4E,
-	30528 - 19968: jis0208<<14 | 0x22<<7 | 0x44,
-	30530 - 19968: jis0212<<14 | 0x2D<<7 | 0x4F,
-	30533 - 19968: jis0212<<14 | 0x2D<<7 | 0x50,
-	30534 - 19968: jis0208<<14 | 0x5A<<7 | 0x1A,
-	30535 - 19968: jis0208<<14 | 0x41<<7 | 0x28,
-	30538 - 19968: jis0212<<14 | 0x2D<<7 | 0x52,
-	30541 - 19968: jis0212<<14 | 0x2D<<7 | 0x53,
-	30542 - 19968: jis0212<<14 | 0x2D<<7 | 0x54,
-	30543 - 19968: jis0212<<14 | 0x2D<<7 | 0x55,
-	30546 - 19968: jis0212<<14 | 0x2D<<7 | 0x56,
-	30550 - 19968: jis0212<<14 | 0x2D<<7 | 0x57,
-	30551 - 19968: jis0212<<14 | 0x2D<<7 | 0x58,
-	30554 - 19968: jis0208<<14 | 0x41<<7 | 0x29,
-	30555 - 19968: jis0208<<14 | 0x41<<7 | 0x2C,
-	30556 - 19968: jis0212<<14 | 0x2D<<7 | 0x59,
-	30558 - 19968: jis0212<<14 | 0x2D<<7 | 0x5A,
-	30559 - 19968: jis0212<<14 | 0x2D<<7 | 0x5B,
-	30560 - 19968: jis0212<<14 | 0x2D<<7 | 0x5C,
-	30561 - 19968: jis0208<<14 | 0x1E<<7 | 0x46,
-	30562 - 19968: jis0212<<14 | 0x2D<<7 | 0x5D,
-	30563 - 19968: jis0208<<14 | 0x25<<7 | 0x23,
-	30564 - 19968: jis0212<<14 | 0x2E<<7 | 0x00,
-	30565 - 19968: jis0208<<14 | 0x41<<7 | 0x2D,
-	30566 - 19968: jis0208<<14 | 0x2A<<7 | 0x32,
-	30567 - 19968: jis0212<<14 | 0x2E<<7 | 0x01,
-	30568 - 19968: jis0208<<14 | 0x41<<7 | 0x2A,
-	30570 - 19968: jis0212<<14 | 0x2E<<7 | 0x02,
-	30571 - 19968: jis0208<<14 | 0x41<<7 | 0x2B,
-	30572 - 19968: jis0212<<14 | 0x2E<<7 | 0x03,
-	30576 - 19968: jis0212<<14 | 0x2E<<7 | 0x04,
-	30578 - 19968: jis0212<<14 | 0x2E<<7 | 0x05,
-	30579 - 19968: jis0212<<14 | 0x2E<<7 | 0x06,
-	30580 - 19968: jis0212<<14 | 0x2E<<7 | 0x07,
-	30585 - 19968: jis0208<<14 | 0x41<<7 | 0x30,
-	30586 - 19968: jis0212<<14 | 0x2E<<7 | 0x08,
-	30589 - 19968: jis0212<<14 | 0x2E<<7 | 0x09,
-	30590 - 19968: jis0208<<14 | 0x41<<7 | 0x2F,
-	30591 - 19968: jis0208<<14 | 0x41<<7 | 0x2E,
-	30592 - 19968: jis0212<<14 | 0x2E<<7 | 0x0A,
-	30596 - 19968: jis0212<<14 | 0x2E<<7 | 0x0B,
-	30603 - 19968: jis0208<<14 | 0x41<<7 | 0x32,
-	30604 - 19968: jis0212<<14 | 0x2E<<7 | 0x0C,
-	30605 - 19968: jis0212<<14 | 0x2E<<7 | 0x0D,
-	30606 - 19968: jis0208<<14 | 0x41<<7 | 0x31,
-	30609 - 19968: jis0208<<14 | 0x41<<7 | 0x33,
-	30612 - 19968: jis0212<<14 | 0x2E<<7 | 0x0E,
-	30613 - 19968: jis0212<<14 | 0x2E<<7 | 0x0F,
-	30614 - 19968: jis0212<<14 | 0x2E<<7 | 0x10,
-	30618 - 19968: jis0212<<14 | 0x2E<<7 | 0x11,
-	30622 - 19968: jis0208<<14 | 0x41<<7 | 0x35,
-	30623 - 19968: jis0212<<14 | 0x2E<<7 | 0x12,
-	30624 - 19968: jis0208<<14 | 0x41<<7 | 0x34,
-	30626 - 19968: jis0212<<14 | 0x2E<<7 | 0x13,
-	30629 - 19968: jis0208<<14 | 0x29<<7 | 0x2C,
-	30631 - 19968: jis0212<<14 | 0x2E<<7 | 0x14,
-	30634 - 19968: jis0212<<14 | 0x2E<<7 | 0x15,
-	30636 - 19968: jis0208<<14 | 0x1C<<7 | 0x35,
-	30637 - 19968: jis0208<<14 | 0x2D<<7 | 0x25,
-	30638 - 19968: jis0212<<14 | 0x2E<<7 | 0x16,
-	30639 - 19968: jis0212<<14 | 0x2E<<7 | 0x17,
-	30640 - 19968: jis0208<<14 | 0x41<<7 | 0x36,
-	30641 - 19968: jis0212<<14 | 0x2E<<7 | 0x18,
-	30643 - 19968: jis0208<<14 | 0x25<<7 | 0x16,
-	30645 - 19968: jis0212<<14 | 0x2E<<7 | 0x19,
-	30646 - 19968: jis0208<<14 | 0x41<<7 | 0x37,
-	30649 - 19968: jis0208<<14 | 0x41<<7 | 0x38,
-	30651 - 19968: jis0208<<14 | 0x41<<7 | 0x3C,
-	30652 - 19968: jis0208<<14 | 0x41<<7 | 0x3A,
-	30653 - 19968: jis0208<<14 | 0x41<<7 | 0x3B,
-	30654 - 19968: jis0212<<14 | 0x2E<<7 | 0x1A,
-	30655 - 19968: jis0208<<14 | 0x41<<7 | 0x39,
-	30659 - 19968: jis0212<<14 | 0x2E<<7 | 0x1B,
-	30663 - 19968: jis0208<<14 | 0x41<<7 | 0x3D,
-	30665 - 19968: jis0212<<14 | 0x2E<<7 | 0x1C,
-	30669 - 19968: jis0208<<14 | 0x41<<7 | 0x3E,
-	30673 - 19968: jis0212<<14 | 0x2E<<7 | 0x1D,
-	30674 - 19968: jis0212<<14 | 0x2E<<7 | 0x1E,
-	30677 - 19968: jis0212<<14 | 0x2E<<7 | 0x1F,
-	30679 - 19968: jis0208<<14 | 0x41<<7 | 0x3F,
-	30681 - 19968: jis0212<<14 | 0x2E<<7 | 0x20,
-	30682 - 19968: jis0208<<14 | 0x41<<7 | 0x40,
-	30683 - 19968: jis0208<<14 | 0x2B<<7 | 0x16,
-	30684 - 19968: jis0208<<14 | 0x41<<7 | 0x41,
-	30686 - 19968: jis0212<<14 | 0x2E<<7 | 0x21,
-	30687 - 19968: jis0212<<14 | 0x2E<<7 | 0x22,
-	30688 - 19968: jis0212<<14 | 0x2E<<7 | 0x23,
-	30690 - 19968: jis0208<<14 | 0x2B<<7 | 0x4F,
-	30691 - 19968: jis0208<<14 | 0x41<<7 | 0x42,
-	30692 - 19968: jis0212<<14 | 0x2E<<7 | 0x24,
-	30693 - 19968: jis0208<<14 | 0x22<<7 | 0x2D,
-	30694 - 19968: jis0212<<14 | 0x2E<<7 | 0x25,
-	30695 - 19968: jis0208<<14 | 0x26<<7 | 0x49,
-	30697 - 19968: jis0208<<14 | 0x15<<7 | 0x4A,
-	30698 - 19968: jis0212<<14 | 0x2E<<7 | 0x26,
-	30700 - 19968: jis0212<<14 | 0x2E<<7 | 0x27,
-	30701 - 19968: jis0208<<14 | 0x22<<7 | 0x1A,
-	30702 - 19968: jis0208<<14 | 0x41<<7 | 0x43,
-	30703 - 19968: jis0208<<14 | 0x15<<7 | 0x19,
-	30704 - 19968: jis0212<<14 | 0x2E<<7 | 0x28,
-	30705 - 19968: jis0212<<14 | 0x2E<<7 | 0x29,
-	30707 - 19968: jis0208<<14 | 0x1F<<7 | 0x2F,
-	30708 - 19968: jis0212<<14 | 0x2E<<7 | 0x2A,
-	30712 - 19968: jis0212<<14 | 0x2E<<7 | 0x2B,
-	30715 - 19968: jis0212<<14 | 0x2E<<7 | 0x2C,
-	30716 - 19968: jis0208<<14 | 0x41<<7 | 0x44,
-	30722 - 19968: jis0208<<14 | 0x19<<7 | 0x1C,
-	30725 - 19968: jis0212<<14 | 0x2E<<7 | 0x2D,
-	30726 - 19968: jis0212<<14 | 0x2E<<7 | 0x2E,
-	30729 - 19968: jis0212<<14 | 0x2E<<7 | 0x2F,
-	30732 - 19968: jis0208<<14 | 0x41<<7 | 0x45,
-	30733 - 19968: jis0212<<14 | 0x2E<<7 | 0x30,
-	30734 - 19968: jis0212<<14 | 0x2E<<7 | 0x31,
-	30737 - 19968: jis0212<<14 | 0x2E<<7 | 0x32,
-	30738 - 19968: jis0208<<14 | 0x41<<7 | 0x46,
-	30740 - 19968: jis0208<<14 | 0x17<<7 | 0x05,
-	30741 - 19968: jis0208<<14 | 0x19<<7 | 0x34,
-	30749 - 19968: jis0212<<14 | 0x2E<<7 | 0x33,
-	30752 - 19968: jis0208<<14 | 0x41<<7 | 0x48,
-	30753 - 19968: jis0208<<14 | 0x5A<<7 | 0x1C,
-	30754 - 19968: jis0212<<14 | 0x2E<<7 | 0x35,
-	30755 - 19968: jis0212<<14 | 0x2E<<7 | 0x36,
-	30757 - 19968: jis0208<<14 | 0x24<<7 | 0x35,
-	30758 - 19968: jis0208<<14 | 0x19<<7 | 0x35,
-	30759 - 19968: jis0208<<14 | 0x14<<7 | 0x2D,
-	30765 - 19968: jis0212<<14 | 0x2E<<7 | 0x37,
-	30766 - 19968: jis0212<<14 | 0x2E<<7 | 0x38,
-	30768 - 19968: jis0212<<14 | 0x2E<<7 | 0x39,
-	30770 - 19968: jis0208<<14 | 0x2A<<7 | 0x03,
-	30772 - 19968: jis0208<<14 | 0x26<<7 | 0x2A,
-	30773 - 19968: jis0212<<14 | 0x2E<<7 | 0x3A,
-	30775 - 19968: jis0212<<14 | 0x2E<<7 | 0x3B,
-	30778 - 19968: jis0208<<14 | 0x24<<7 | 0x36,
-	30783 - 19968: jis0208<<14 | 0x18<<7 | 0x3B,
-	30787 - 19968: jis0212<<14 | 0x2E<<7 | 0x3C,
-	30788 - 19968: jis0212<<14 | 0x2E<<7 | 0x3D,
-	30789 - 19968: jis0208<<14 | 0x41<<7 | 0x4A,
-	30791 - 19968: jis0212<<14 | 0x2E<<7 | 0x3E,
-	30792 - 19968: jis0212<<14 | 0x2E<<7 | 0x3F,
-	30796 - 19968: jis0212<<14 | 0x2E<<7 | 0x40,
-	30798 - 19968: jis0208<<14 | 0x5A<<7 | 0x1D,
-	30802 - 19968: jis0212<<14 | 0x2E<<7 | 0x42,
-	30812 - 19968: jis0212<<14 | 0x2E<<7 | 0x43,
-	30813 - 19968: jis0208<<14 | 0x1D<<7 | 0x2A,
-	30814 - 19968: jis0212<<14 | 0x2E<<7 | 0x44,
-	30816 - 19968: jis0212<<14 | 0x2E<<7 | 0x45,
-	30817 - 19968: jis0212<<14 | 0x2E<<7 | 0x46,
-	30819 - 19968: jis0212<<14 | 0x2E<<7 | 0x47,
-	30820 - 19968: jis0208<<14 | 0x5A<<7 | 0x1E,
-	30824 - 19968: jis0212<<14 | 0x2E<<7 | 0x49,
-	30826 - 19968: jis0212<<14 | 0x2E<<7 | 0x4A,
-	30827 - 19968: jis0208<<14 | 0x2D<<7 | 0x11,
-	30828 - 19968: jis0208<<14 | 0x18<<7 | 0x24,
-	30830 - 19968: jis0212<<14 | 0x2E<<7 | 0x4B,
-	30831 - 19968: jis0208<<14 | 0x17<<7 | 0x06,
-	30834 - 19968: jis0208<<14 | 0x27<<7 | 0x02,
-	30836 - 19968: jis0208<<14 | 0x41<<7 | 0x4C,
-	30842 - 19968: jis0208<<14 | 0x5A<<7 | 0x1F,
-	30844 - 19968: jis0208<<14 | 0x41<<7 | 0x4E,
-	30846 - 19968: jis0212<<14 | 0x2E<<7 | 0x4D,
-	30849 - 19968: jis0208<<14 | 0x17<<7 | 0x4A,
-	30854 - 19968: jis0208<<14 | 0x41<<7 | 0x4D,
-	30855 - 19968: jis0208<<14 | 0x23<<7 | 0x55,
-	30858 - 19968: jis0212<<14 | 0x2E<<7 | 0x4E,
-	30860 - 19968: jis0208<<14 | 0x41<<7 | 0x50,
-	30861 - 19968: jis0208<<14 | 0x12<<7 | 0x16,
-	30862 - 19968: jis0208<<14 | 0x41<<7 | 0x4B,
-	30863 - 19968: jis0212<<14 | 0x2E<<7 | 0x4F,
-	30865 - 19968: jis0208<<14 | 0x27<<7 | 0x49,
-	30867 - 19968: jis0208<<14 | 0x10<<7 | 0x0F,
-	30868 - 19968: jis0212<<14 | 0x2E<<7 | 0x50,
-	30869 - 19968: jis0208<<14 | 0x19<<7 | 0x4B,
-	30871 - 19968: jis0208<<14 | 0x2E<<7 | 0x31,
-	30872 - 19968: jis0212<<14 | 0x2E<<7 | 0x51,
-	30874 - 19968: jis0208<<14 | 0x41<<7 | 0x4F,
-	30877 - 19968: jis0212<<14 | 0x2E<<7 | 0x53,
-	30878 - 19968: jis0212<<14 | 0x2E<<7 | 0x54,
-	30879 - 19968: jis0212<<14 | 0x2E<<7 | 0x55,
-	30881 - 19968: jis0212<<14 | 0x2E<<7 | 0x52,
-	30883 - 19968: jis0208<<14 | 0x41<<7 | 0x51,
-	30884 - 19968: jis0212<<14 | 0x2E<<7 | 0x56,
-	30887 - 19968: jis0208<<14 | 0x29<<7 | 0x2A,
-	30888 - 19968: jis0212<<14 | 0x2E<<7 | 0x57,
-	30889 - 19968: jis0208<<14 | 0x1F<<7 | 0x38,
-	30890 - 19968: jis0208<<14 | 0x41<<7 | 0x53,
-	30892 - 19968: jis0212<<14 | 0x2E<<7 | 0x58,
-	30893 - 19968: jis0212<<14 | 0x2E<<7 | 0x59,
-	30895 - 19968: jis0208<<14 | 0x41<<7 | 0x54,
-	30896 - 19968: jis0212<<14 | 0x2E<<7 | 0x5A,
-	30897 - 19968: jis0212<<14 | 0x2E<<7 | 0x5B,
-	30898 - 19968: jis0212<<14 | 0x2E<<7 | 0x5C,
-	30899 - 19968: jis0212<<14 | 0x2E<<7 | 0x5D,
-	30901 - 19968: jis0208<<14 | 0x41<<7 | 0x52,
-	30906 - 19968: jis0208<<14 | 0x12<<7 | 0x2D,
-	30907 - 19968: jis0212<<14 | 0x2F<<7 | 0x00,
-	30908 - 19968: jis0208<<14 | 0x41<<7 | 0x5A,
-	30909 - 19968: jis0212<<14 | 0x2F<<7 | 0x01,
-	30910 - 19968: jis0208<<14 | 0x41<<7 | 0x59,
-	30911 - 19968: jis0212<<14 | 0x2F<<7 | 0x02,
-	30913 - 19968: jis0208<<14 | 0x1B<<7 | 0x06,
-	30917 - 19968: jis0208<<14 | 0x41<<7 | 0x5B,
-	30918 - 19968: jis0208<<14 | 0x41<<7 | 0x56,
-	30919 - 19968: jis0212<<14 | 0x2F<<7 | 0x03,
-	30920 - 19968: jis0212<<14 | 0x2F<<7 | 0x04,
-	30921 - 19968: jis0212<<14 | 0x2F<<7 | 0x05,
-	30922 - 19968: jis0208<<14 | 0x41<<7 | 0x5C,
-	30923 - 19968: jis0208<<14 | 0x41<<7 | 0x57,
-	30924 - 19968: jis0212<<14 | 0x2F<<7 | 0x06,
-	30926 - 19968: jis0212<<14 | 0x2F<<7 | 0x07,
-	30928 - 19968: jis0208<<14 | 0x27<<7 | 0x37,
-	30929 - 19968: jis0208<<14 | 0x41<<7 | 0x55,
-	30930 - 19968: jis0212<<14 | 0x2F<<7 | 0x08,
-	30931 - 19968: jis0212<<14 | 0x2F<<7 | 0x09,
-	30932 - 19968: jis0208<<14 | 0x41<<7 | 0x58,
-	30933 - 19968: jis0212<<14 | 0x2F<<7 | 0x0A,
-	30934 - 19968: jis0212<<14 | 0x2F<<7 | 0x0B,
-	30938 - 19968: jis0208<<14 | 0x42<<7 | 0x01,
-	30939 - 19968: jis0212<<14 | 0x2F<<7 | 0x0D,
-	30943 - 19968: jis0212<<14 | 0x2F<<7 | 0x0E,
-	30944 - 19968: jis0212<<14 | 0x2F<<7 | 0x0F,
-	30945 - 19968: jis0212<<14 | 0x2F<<7 | 0x10,
-	30948 - 19968: jis0212<<14 | 0x2F<<7 | 0x0C,
-	30950 - 19968: jis0212<<14 | 0x2F<<7 | 0x11,
-	30951 - 19968: jis0208<<14 | 0x42<<7 | 0x00,
-	30952 - 19968: jis0208<<14 | 0x2A<<7 | 0x40,
-	30954 - 19968: jis0212<<14 | 0x2F<<7 | 0x12,
-	30956 - 19968: jis0208<<14 | 0x41<<7 | 0x5D,
-	30959 - 19968: jis0208<<14 | 0x0F<<7 | 0x4A,
-	30962 - 19968: jis0212<<14 | 0x2F<<7 | 0x13,
-	30963 - 19968: jis0212<<14 | 0x2F<<7 | 0x14,
-	30964 - 19968: jis0208<<14 | 0x42<<7 | 0x03,
-	30966 - 19968: jis0212<<14 | 0x2F<<7 | 0x16,
-	30967 - 19968: jis0212<<14 | 0x2F<<7 | 0x17,
-	30970 - 19968: jis0212<<14 | 0x2F<<7 | 0x18,
-	30971 - 19968: jis0212<<14 | 0x2F<<7 | 0x19,
-	30973 - 19968: jis0208<<14 | 0x42<<7 | 0x02,
-	30975 - 19968: jis0212<<14 | 0x2F<<7 | 0x1A,
-	30976 - 19968: jis0212<<14 | 0x2F<<7 | 0x15,
-	30977 - 19968: jis0208<<14 | 0x1D<<7 | 0x2B,
-	30982 - 19968: jis0212<<14 | 0x2F<<7 | 0x1B,
-	30983 - 19968: jis0208<<14 | 0x42<<7 | 0x04,
-	30988 - 19968: jis0212<<14 | 0x2F<<7 | 0x1C,
-	30990 - 19968: jis0208<<14 | 0x20<<7 | 0x22,
-	30992 - 19968: jis0212<<14 | 0x2F<<7 | 0x1D,
-	30993 - 19968: jis0208<<14 | 0x42<<7 | 0x06,
-	30994 - 19968: jis0208<<14 | 0x42<<7 | 0x05,
-	31001 - 19968: jis0208<<14 | 0x42<<7 | 0x07,
-	31002 - 19968: jis0212<<14 | 0x2F<<7 | 0x1E,
-	31004 - 19968: jis0212<<14 | 0x2F<<7 | 0x1F,
-	31006 - 19968: jis0212<<14 | 0x2F<<7 | 0x20,
-	31007 - 19968: jis0212<<14 | 0x2F<<7 | 0x21,
-	31008 - 19968: jis0212<<14 | 0x2F<<7 | 0x22,
-	31013 - 19968: jis0212<<14 | 0x2F<<7 | 0x23,
-	31014 - 19968: jis0208<<14 | 0x41<<7 | 0x47,
-	31015 - 19968: jis0212<<14 | 0x2F<<7 | 0x24,
-	31017 - 19968: jis0212<<14 | 0x2F<<7 | 0x25,
-	31018 - 19968: jis0208<<14 | 0x41<<7 | 0x49,
-	31019 - 19968: jis0208<<14 | 0x42<<7 | 0x09,
-	31020 - 19968: jis0208<<14 | 0x42<<7 | 0x08,
-	31021 - 19968: jis0212<<14 | 0x2F<<7 | 0x26,
-	31024 - 19968: jis0208<<14 | 0x5A<<7 | 0x20,
-	31025 - 19968: jis0212<<14 | 0x2F<<7 | 0x27,
-	31028 - 19968: jis0212<<14 | 0x2F<<7 | 0x28,
-	31029 - 19968: jis0212<<14 | 0x2F<<7 | 0x29,
-	31034 - 19968: jis0208<<14 | 0x1B<<7 | 0x07,
-	31035 - 19968: jis0212<<14 | 0x2F<<7 | 0x2A,
-	31036 - 19968: jis0208<<14 | 0x2D<<7 | 0x48,
-	31037 - 19968: jis0212<<14 | 0x2F<<7 | 0x2B,
-	31038 - 19968: jis0208<<14 | 0x1B<<7 | 0x31,
-	31039 - 19968: jis0212<<14 | 0x2F<<7 | 0x2C,
-	31040 - 19968: jis0208<<14 | 0x42<<7 | 0x0A,
-	31041 - 19968: jis0208<<14 | 0x16<<7 | 0x16,
-	31044 - 19968: jis0212<<14 | 0x2F<<7 | 0x2D,
-	31045 - 19968: jis0212<<14 | 0x2F<<7 | 0x2E,
-	31046 - 19968: jis0212<<14 | 0x2F<<7 | 0x2F,
-	31047 - 19968: jis0208<<14 | 0x14<<7 | 0x1F,
-	31048 - 19968: jis0208<<14 | 0x14<<7 | 0x06,
-	31049 - 19968: jis0208<<14 | 0x1A<<7 | 0x42,
-	31050 - 19968: jis0212<<14 | 0x2F<<7 | 0x30,
-	31051 - 19968: jis0212<<14 | 0x2F<<7 | 0x31,
-	31055 - 19968: jis0212<<14 | 0x2F<<7 | 0x32,
-	31056 - 19968: jis0208<<14 | 0x2C<<7 | 0x13,
-	31057 - 19968: jis0212<<14 | 0x2F<<7 | 0x33,
-	31059 - 19968: jis0208<<14 | 0x42<<7 | 0x10,
-	31060 - 19968: jis0212<<14 | 0x2F<<7 | 0x34,
-	31061 - 19968: jis0208<<14 | 0x42<<7 | 0x0F,
-	31062 - 19968: jis0208<<14 | 0x20<<7 | 0x23,
-	31063 - 19968: jis0208<<14 | 0x42<<7 | 0x0C,
-	31064 - 19968: jis0212<<14 | 0x2F<<7 | 0x35,
-	31066 - 19968: jis0208<<14 | 0x42<<7 | 0x0E,
-	31067 - 19968: jis0212<<14 | 0x2F<<7 | 0x36,
-	31068 - 19968: jis0212<<14 | 0x2F<<7 | 0x37,
-	31069 - 19968: jis0208<<14 | 0x1C<<7 | 0x2A,
-	31070 - 19968: jis0208<<14 | 0x1E<<7 | 0x1F,
-	31071 - 19968: jis0208<<14 | 0x42<<7 | 0x0D,
-	31072 - 19968: jis0208<<14 | 0x42<<7 | 0x0B,
-	31074 - 19968: jis0208<<14 | 0x26<<7 | 0x09,
-	31077 - 19968: jis0208<<14 | 0x1D<<7 | 0x2C,
-	31079 - 19968: jis0212<<14 | 0x2F<<7 | 0x38,
-	31080 - 19968: jis0208<<14 | 0x28<<7 | 0x1B,
-	31081 - 19968: jis0212<<14 | 0x2F<<7 | 0x39,
-	31083 - 19968: jis0212<<14 | 0x2F<<7 | 0x3A,
-	31085 - 19968: jis0208<<14 | 0x19<<7 | 0x36,
-	31090 - 19968: jis0212<<14 | 0x2F<<7 | 0x3B,
-	31095 - 19968: jis0208<<14 | 0x24<<7 | 0x57,
-	31097 - 19968: jis0212<<14 | 0x2F<<7 | 0x3C,
-	31098 - 19968: jis0208<<14 | 0x42<<7 | 0x11,
-	31099 - 19968: jis0212<<14 | 0x2F<<7 | 0x3D,
-	31100 - 19968: jis0212<<14 | 0x2F<<7 | 0x3E,
-	31102 - 19968: jis0212<<14 | 0x2F<<7 | 0x3F,
-	31103 - 19968: jis0208<<14 | 0x42<<7 | 0x12,
-	31104 - 19968: jis0208<<14 | 0x42<<7 | 0x28,
-	31105 - 19968: jis0208<<14 | 0x15<<7 | 0x37,
-	31108 - 19968: jis0208<<14 | 0x2E<<7 | 0x1C,
-	31109 - 19968: jis0208<<14 | 0x20<<7 | 0x14,
-	31114 - 19968: jis0208<<14 | 0x42<<7 | 0x13,
-	31115 - 19968: jis0212<<14 | 0x2F<<7 | 0x40,
-	31116 - 19968: jis0212<<14 | 0x2F<<7 | 0x41,
-	31117 - 19968: jis0208<<14 | 0x11<<7 | 0x31,
-	31118 - 19968: jis0208<<14 | 0x23<<7 | 0x56,
-	31119 - 19968: jis0208<<14 | 0x29<<7 | 0x00,
-	31121 - 19968: jis0212<<14 | 0x2F<<7 | 0x42,
-	31123 - 19968: jis0212<<14 | 0x2F<<7 | 0x43,
-	31124 - 19968: jis0208<<14 | 0x5A<<7 | 0x24,
-	31125 - 19968: jis0212<<14 | 0x2F<<7 | 0x45,
-	31126 - 19968: jis0212<<14 | 0x2F<<7 | 0x46,
-	31128 - 19968: jis0212<<14 | 0x2F<<7 | 0x47,
-	31131 - 19968: jis0208<<14 | 0x5A<<7 | 0x26,
-	31132 - 19968: jis0212<<14 | 0x2F<<7 | 0x49,
-	31133 - 19968: jis0208<<14 | 0x42<<7 | 0x14,
-	31137 - 19968: jis0212<<14 | 0x2F<<7 | 0x4A,
-	31142 - 19968: jis0208<<14 | 0x14<<7 | 0x59,
-	31143 - 19968: jis0208<<14 | 0x42<<7 | 0x15,
-	31144 - 19968: jis0212<<14 | 0x2F<<7 | 0x4B,
-	31145 - 19968: jis0212<<14 | 0x2F<<7 | 0x4C,
-	31146 - 19968: jis0208<<14 | 0x42<<7 | 0x17,
-	31147 - 19968: jis0212<<14 | 0x2F<<7 | 0x4D,
-	31150 - 19968: jis0208<<14 | 0x42<<7 | 0x18,
-	31151 - 19968: jis0212<<14 | 0x2F<<7 | 0x4E,
-	31152 - 19968: jis0208<<14 | 0x26<<7 | 0x08,
-	31153 - 19968: jis0212<<14 | 0x2F<<7 | 0x4F,
-	31155 - 19968: jis0208<<14 | 0x42<<7 | 0x19,
-	31156 - 19968: jis0212<<14 | 0x2F<<7 | 0x50,
-	31160 - 19968: jis0212<<14 | 0x2F<<7 | 0x51,
-	31161 - 19968: jis0208<<14 | 0x42<<7 | 0x1A,
-	31162 - 19968: jis0208<<14 | 0x42<<7 | 0x1B,
-	31163 - 19968: jis0212<<14 | 0x2F<<7 | 0x52,
-	31165 - 19968: jis0208<<14 | 0x15<<7 | 0x38,
-	31166 - 19968: jis0208<<14 | 0x11<<7 | 0x32,
-	31167 - 19968: jis0208<<14 | 0x25<<7 | 0x24,
-	31168 - 19968: jis0208<<14 | 0x1C<<7 | 0x07,
-	31169 - 19968: jis0208<<14 | 0x1A<<7 | 0x43,
-	31170 - 19968: jis0212<<14 | 0x2F<<7 | 0x53,
-	31172 - 19968: jis0212<<14 | 0x2F<<7 | 0x54,
-	31175 - 19968: jis0212<<14 | 0x2F<<7 | 0x55,
-	31176 - 19968: jis0212<<14 | 0x2F<<7 | 0x56,
-	31177 - 19968: jis0208<<14 | 0x42<<7 | 0x1C,
-	31178 - 19968: jis0212<<14 | 0x2F<<7 | 0x57,
-	31179 - 19968: jis0208<<14 | 0x1C<<7 | 0x08,
-	31183 - 19968: jis0212<<14 | 0x2F<<7 | 0x58,
-	31185 - 19968: jis0208<<14 | 0x11<<7 | 0x29,
-	31186 - 19968: jis0208<<14 | 0x28<<7 | 0x22,
-	31188 - 19968: jis0212<<14 | 0x2F<<7 | 0x59,
-	31189 - 19968: jis0208<<14 | 0x42<<7 | 0x1D,
-	31190 - 19968: jis0212<<14 | 0x2F<<7 | 0x5A,
-	31192 - 19968: jis0208<<14 | 0x27<<7 | 0x4A,
-	31194 - 19968: jis0212<<14 | 0x2F<<7 | 0x5B,
-	31197 - 19968: jis0212<<14 | 0x2F<<7 | 0x5C,
-	31198 - 19968: jis0212<<14 | 0x2F<<7 | 0x5D,
-	31199 - 19968: jis0208<<14 | 0x20<<7 | 0x24,
-	31200 - 19968: jis0212<<14 | 0x30<<7 | 0x00,
-	31201 - 19968: jis0208<<14 | 0x42<<7 | 0x20,
-	31202 - 19968: jis0212<<14 | 0x30<<7 | 0x01,
-	31203 - 19968: jis0208<<14 | 0x42<<7 | 0x21,
-	31204 - 19968: jis0208<<14 | 0x26<<7 | 0x48,
-	31205 - 19968: jis0212<<14 | 0x30<<7 | 0x02,
-	31206 - 19968: jis0208<<14 | 0x1E<<7 | 0x20,
-	31207 - 19968: jis0208<<14 | 0x42<<7 | 0x1E,
-	31209 - 19968: jis0208<<14 | 0x22<<7 | 0x40,
-	31210 - 19968: jis0212<<14 | 0x30<<7 | 0x03,
-	31211 - 19968: jis0212<<14 | 0x30<<7 | 0x04,
-	31212 - 19968: jis0208<<14 | 0x42<<7 | 0x1F,
-	31213 - 19968: jis0212<<14 | 0x30<<7 | 0x05,
-	31216 - 19968: jis0208<<14 | 0x1D<<7 | 0x2D,
-	31217 - 19968: jis0212<<14 | 0x30<<7 | 0x06,
-	31224 - 19968: jis0212<<14 | 0x30<<7 | 0x07,
-	31227 - 19968: jis0208<<14 | 0x0F<<7 | 0x3B,
-	31228 - 19968: jis0212<<14 | 0x30<<7 | 0x08,
-	31232 - 19968: jis0208<<14 | 0x14<<7 | 0x08,
-	31234 - 19968: jis0212<<14 | 0x30<<7 | 0x09,
-	31235 - 19968: jis0212<<14 | 0x30<<7 | 0x0A,
-	31239 - 19968: jis0212<<14 | 0x30<<7 | 0x0B,
-	31240 - 19968: jis0208<<14 | 0x42<<7 | 0x22,
-	31241 - 19968: jis0212<<14 | 0x30<<7 | 0x0C,
-	31242 - 19968: jis0212<<14 | 0x30<<7 | 0x0D,
-	31243 - 19968: jis0208<<14 | 0x23<<7 | 0x57,
-	31244 - 19968: jis0212<<14 | 0x30<<7 | 0x0E,
-	31245 - 19968: jis0208<<14 | 0x42<<7 | 0x23,
-	31246 - 19968: jis0208<<14 | 0x1F<<7 | 0x26,
-	31249 - 19968: jis0212<<14 | 0x30<<7 | 0x0F,
-	31252 - 19968: jis0208<<14 | 0x2B<<7 | 0x0C,
-	31253 - 19968: jis0212<<14 | 0x30<<7 | 0x10,
-	31255 - 19968: jis0208<<14 | 0x28<<7 | 0x02,
-	31256 - 19968: jis0208<<14 | 0x42<<7 | 0x24,
-	31257 - 19968: jis0208<<14 | 0x42<<7 | 0x25,
-	31258 - 19968: jis0208<<14 | 0x22<<7 | 0x34,
-	31259 - 19968: jis0212<<14 | 0x30<<7 | 0x11,
-	31260 - 19968: jis0208<<14 | 0x2D<<7 | 0x26,
-	31262 - 19968: jis0212<<14 | 0x30<<7 | 0x12,
-	31263 - 19968: jis0208<<14 | 0x42<<7 | 0x27,
-	31264 - 19968: jis0208<<14 | 0x42<<7 | 0x26,
-	31265 - 19968: jis0212<<14 | 0x30<<7 | 0x13,
-	31271 - 19968: jis0212<<14 | 0x30<<7 | 0x14,
-	31275 - 19968: jis0212<<14 | 0x30<<7 | 0x15,
-	31277 - 19968: jis0212<<14 | 0x30<<7 | 0x16,
-	31278 - 19968: jis0208<<14 | 0x1B<<7 | 0x4E,
-	31279 - 19968: jis0212<<14 | 0x30<<7 | 0x17,
-	31280 - 19968: jis0212<<14 | 0x30<<7 | 0x18,
-	31281 - 19968: jis0208<<14 | 0x42<<7 | 0x29,
-	31282 - 19968: jis0208<<14 | 0x0F<<7 | 0x4F,
-	31284 - 19968: jis0212<<14 | 0x30<<7 | 0x19,
-	31285 - 19968: jis0212<<14 | 0x30<<7 | 0x1A,
-	31287 - 19968: jis0208<<14 | 0x42<<7 | 0x2C,
-	31288 - 19968: jis0212<<14 | 0x30<<7 | 0x1B,
-	31289 - 19968: jis0212<<14 | 0x30<<7 | 0x1C,
-	31290 - 19968: jis0212<<14 | 0x30<<7 | 0x1D,
-	31291 - 19968: jis0208<<14 | 0x42<<7 | 0x2A,
-	31292 - 19968: jis0208<<14 | 0x11<<7 | 0x33,
-	31293 - 19968: jis0208<<14 | 0x16<<7 | 0x2D,
-	31294 - 19968: jis0208<<14 | 0x42<<7 | 0x2B,
-	31295 - 19968: jis0208<<14 | 0x18<<7 | 0x25,
-	31296 - 19968: jis0208<<14 | 0x18<<7 | 0x51,
-	31298 - 19968: jis0208<<14 | 0x29<<7 | 0x45,
-	31299 - 19968: jis0208<<14 | 0x42<<7 | 0x2D,
-	31300 - 19968: jis0212<<14 | 0x30<<7 | 0x1E,
-	31301 - 19968: jis0212<<14 | 0x30<<7 | 0x1F,
-	31302 - 19968: jis0208<<14 | 0x2A<<7 | 0x33,
-	31303 - 19968: jis0212<<14 | 0x30<<7 | 0x20,
-	31304 - 19968: jis0212<<14 | 0x30<<7 | 0x21,
-	31305 - 19968: jis0208<<14 | 0x42<<7 | 0x2F,
-	31308 - 19968: jis0212<<14 | 0x30<<7 | 0x22,
-	31309 - 19968: jis0208<<14 | 0x1F<<7 | 0x30,
-	31310 - 19968: jis0208<<14 | 0x10<<7 | 0x2E,
-	31311 - 19968: jis0208<<14 | 0x11<<7 | 0x19,
-	31312 - 19968: jis0208<<14 | 0x0F<<7 | 0x0B,
-	31317 - 19968: jis0212<<14 | 0x30<<7 | 0x23,
-	31318 - 19968: jis0212<<14 | 0x30<<7 | 0x24,
-	31319 - 19968: jis0208<<14 | 0x42<<7 | 0x2E,
-	31321 - 19968: jis0212<<14 | 0x30<<7 | 0x25,
-	31324 - 19968: jis0212<<14 | 0x30<<7 | 0x26,
-	31325 - 19968: jis0212<<14 | 0x30<<7 | 0x27,
-	31327 - 19968: jis0212<<14 | 0x30<<7 | 0x28,
-	31328 - 19968: jis0212<<14 | 0x30<<7 | 0x29,
-	31329 - 19968: jis0208<<14 | 0x42<<7 | 0x30,
-	31330 - 19968: jis0208<<14 | 0x42<<7 | 0x31,
-	31331 - 19968: jis0208<<14 | 0x1D<<7 | 0x56,
-	31333 - 19968: jis0212<<14 | 0x30<<7 | 0x2A,
-	31335 - 19968: jis0212<<14 | 0x30<<7 | 0x2B,
-	31337 - 19968: jis0208<<14 | 0x42<<7 | 0x32,
-	31338 - 19968: jis0212<<14 | 0x30<<7 | 0x2C,
-	31339 - 19968: jis0208<<14 | 0x12<<7 | 0x2E,
-	31341 - 19968: jis0212<<14 | 0x30<<7 | 0x2D,
-	31344 - 19968: jis0208<<14 | 0x42<<7 | 0x34,
-	31348 - 19968: jis0208<<14 | 0x16<<7 | 0x49,
-	31349 - 19968: jis0212<<14 | 0x30<<7 | 0x2E,
-	31350 - 19968: jis0208<<14 | 0x14<<7 | 0x45,
-	31352 - 19968: jis0212<<14 | 0x30<<7 | 0x2F,
-	31353 - 19968: jis0208<<14 | 0x42<<7 | 0x35,
-	31354 - 19968: jis0208<<14 | 0x15<<7 | 0x54,
-	31357 - 19968: jis0208<<14 | 0x42<<7 | 0x36,
-	31358 - 19968: jis0212<<14 | 0x30<<7 | 0x30,
-	31359 - 19968: jis0208<<14 | 0x1F<<7 | 0x5B,
-	31360 - 19968: jis0212<<14 | 0x30<<7 | 0x31,
-	31361 - 19968: jis0208<<14 | 0x25<<7 | 0x2C,
-	31362 - 19968: jis0212<<14 | 0x30<<7 | 0x32,
-	31363 - 19968: jis0208<<14 | 0x1F<<7 | 0x3F,
-	31364 - 19968: jis0208<<14 | 0x19<<7 | 0x54,
-	31365 - 19968: jis0212<<14 | 0x30<<7 | 0x33,
-	31366 - 19968: jis0212<<14 | 0x30<<7 | 0x34,
-	31368 - 19968: jis0208<<14 | 0x42<<7 | 0x37,
-	31370 - 19968: jis0212<<14 | 0x30<<7 | 0x35,
-	31371 - 19968: jis0212<<14 | 0x30<<7 | 0x36,
-	31376 - 19968: jis0212<<14 | 0x30<<7 | 0x37,
-	31377 - 19968: jis0212<<14 | 0x30<<7 | 0x38,
-	31378 - 19968: jis0208<<14 | 0x22<<7 | 0x41,
-	31379 - 19968: jis0208<<14 | 0x20<<7 | 0x4A,
-	31380 - 19968: jis0212<<14 | 0x30<<7 | 0x39,
-	31381 - 19968: jis0208<<14 | 0x42<<7 | 0x39,
-	31382 - 19968: jis0208<<14 | 0x42<<7 | 0x3B,
-	31383 - 19968: jis0208<<14 | 0x42<<7 | 0x38,
-	31384 - 19968: jis0208<<14 | 0x42<<7 | 0x3A,
-	31390 - 19968: jis0212<<14 | 0x30<<7 | 0x3A,
-	31391 - 19968: jis0208<<14 | 0x16<<7 | 0x01,
-	31392 - 19968: jis0212<<14 | 0x30<<7 | 0x3B,
-	31395 - 19968: jis0212<<14 | 0x30<<7 | 0x3C,
-	31401 - 19968: jis0208<<14 | 0x42<<7 | 0x3C,
-	31402 - 19968: jis0208<<14 | 0x16<<7 | 0x05,
-	31404 - 19968: jis0212<<14 | 0x30<<7 | 0x3D,
-	31406 - 19968: jis0208<<14 | 0x14<<7 | 0x46,
-	31407 - 19968: jis0208<<14 | 0x2C<<7 | 0x31,
-	31408 - 19968: jis0208<<14 | 0x42<<7 | 0x3E,
-	31411 - 19968: jis0212<<14 | 0x30<<7 | 0x3E,
-	31413 - 19968: jis0212<<14 | 0x30<<7 | 0x3F,
-	31414 - 19968: jis0208<<14 | 0x42<<7 | 0x3F,
-	31417 - 19968: jis0212<<14 | 0x30<<7 | 0x40,
-	31418 - 19968: jis0208<<14 | 0x10<<7 | 0x0D,
-	31419 - 19968: jis0212<<14 | 0x30<<7 | 0x41,
-	31420 - 19968: jis0212<<14 | 0x30<<7 | 0x42,
-	31423 - 19968: jis0208<<14 | 0x42<<7 | 0x42,
-	31427 - 19968: jis0208<<14 | 0x12<<7 | 0x55,
-	31428 - 19968: jis0208<<14 | 0x42<<7 | 0x41,
-	31429 - 19968: jis0208<<14 | 0x42<<7 | 0x40,
-	31430 - 19968: jis0212<<14 | 0x30<<7 | 0x43,
-	31431 - 19968: jis0208<<14 | 0x42<<7 | 0x44,
-	31432 - 19968: jis0208<<14 | 0x42<<7 | 0x3D,
-	31433 - 19968: jis0212<<14 | 0x30<<7 | 0x44,
-	31434 - 19968: jis0208<<14 | 0x42<<7 | 0x45,
-	31435 - 19968: jis0208<<14 | 0x2D<<7 | 0x08,
-	31436 - 19968: jis0212<<14 | 0x30<<7 | 0x45,
-	31437 - 19968: jis0208<<14 | 0x42<<7 | 0x46,
-	31438 - 19968: jis0212<<14 | 0x30<<7 | 0x46,
-	31439 - 19968: jis0208<<14 | 0x42<<7 | 0x47,
-	31441 - 19968: jis0208<<14 | 0x5A<<7 | 0x27,
-	31442 - 19968: jis0208<<14 | 0x33<<7 | 0x53,
-	31443 - 19968: jis0208<<14 | 0x42<<7 | 0x49,
-	31445 - 19968: jis0208<<14 | 0x42<<7 | 0x48,
-	31449 - 19968: jis0208<<14 | 0x42<<7 | 0x4A,
-	31450 - 19968: jis0208<<14 | 0x42<<7 | 0x4B,
-	31451 - 19968: jis0212<<14 | 0x30<<7 | 0x48,
-	31452 - 19968: jis0208<<14 | 0x2D<<7 | 0x14,
-	31453 - 19968: jis0208<<14 | 0x42<<7 | 0x4C,
-	31455 - 19968: jis0208<<14 | 0x4F<<7 | 0x4E,
-	31456 - 19968: jis0208<<14 | 0x1D<<7 | 0x2E,
-	31457 - 19968: jis0208<<14 | 0x42<<7 | 0x4D,
-	31458 - 19968: jis0208<<14 | 0x42<<7 | 0x4E,
-	31459 - 19968: jis0208<<14 | 0x1C<<7 | 0x36,
-	31461 - 19968: jis0208<<14 | 0x25<<7 | 0x17,
-	31462 - 19968: jis0208<<14 | 0x42<<7 | 0x4F,
-	31463 - 19968: jis0208<<14 | 0x5A<<7 | 0x28,
-	31464 - 19968: jis0212<<14 | 0x30<<7 | 0x49,
-	31465 - 19968: jis0212<<14 | 0x30<<7 | 0x4A,
-	31466 - 19968: jis0208<<14 | 0x22<<7 | 0x07,
-	31467 - 19968: jis0208<<14 | 0x5A<<7 | 0x2A,
-	31468 - 19968: jis0212<<14 | 0x30<<7 | 0x4C,
-	31469 - 19968: jis0208<<14 | 0x42<<7 | 0x50,
-	31471 - 19968: jis0208<<14 | 0x22<<7 | 0x1B,
-	31472 - 19968: jis0208<<14 | 0x42<<7 | 0x51,
-	31473 - 19968: jis0212<<14 | 0x30<<7 | 0x4D,
-	31476 - 19968: jis0212<<14 | 0x30<<7 | 0x4E,
-	31478 - 19968: jis0208<<14 | 0x15<<7 | 0x04,
-	31480 - 19968: jis0208<<14 | 0x30<<7 | 0x1E,
-	31481 - 19968: jis0208<<14 | 0x22<<7 | 0x3C,
-	31482 - 19968: jis0208<<14 | 0x1B<<7 | 0x12,
-	31483 - 19968: jis0212<<14 | 0x30<<7 | 0x4F,
-	31485 - 19968: jis0212<<14 | 0x30<<7 | 0x50,
-	31486 - 19968: jis0212<<14 | 0x30<<7 | 0x51,
-	31487 - 19968: jis0208<<14 | 0x13<<7 | 0x27,
-	31490 - 19968: jis0208<<14 | 0x42<<7 | 0x52,
-	31492 - 19968: jis0208<<14 | 0x43<<7 | 0x01,
-	31494 - 19968: jis0208<<14 | 0x42<<7 | 0x55,
-	31495 - 19968: jis0212<<14 | 0x30<<7 | 0x52,
-	31496 - 19968: jis0208<<14 | 0x14<<7 | 0x47,
-	31498 - 19968: jis0208<<14 | 0x42<<7 | 0x54,
-	31499 - 19968: jis0208<<14 | 0x43<<7 | 0x03,
-	31503 - 19968: jis0208<<14 | 0x42<<7 | 0x53,
-	31505 - 19968: jis0208<<14 | 0x1D<<7 | 0x2F,
-	31508 - 19968: jis0212<<14 | 0x30<<7 | 0x53,
-	31512 - 19968: jis0208<<14 | 0x42<<7 | 0x57,
-	31513 - 19968: jis0208<<14 | 0x42<<7 | 0x58,
-	31515 - 19968: jis0208<<14 | 0x24<<7 | 0x0A,
-	31518 - 19968: jis0208<<14 | 0x42<<7 | 0x59,
-	31519 - 19968: jis0212<<14 | 0x30<<7 | 0x54,
-	31520 - 19968: jis0208<<14 | 0x12<<7 | 0x3D,
-	31523 - 19968: jis0212<<14 | 0x30<<7 | 0x55,
-	31525 - 19968: jis0208<<14 | 0x1E<<7 | 0x39,
-	31526 - 19968: jis0208<<14 | 0x28<<7 | 0x43,
-	31527 - 19968: jis0212<<14 | 0x30<<7 | 0x56,
-	31528 - 19968: jis0208<<14 | 0x42<<7 | 0x5B,
-	31529 - 19968: jis0212<<14 | 0x30<<7 | 0x57,
-	31530 - 19968: jis0212<<14 | 0x30<<7 | 0x58,
-	31531 - 19968: jis0212<<14 | 0x30<<7 | 0x59,
-	31532 - 19968: jis0208<<14 | 0x21<<7 | 0x47,
-	31533 - 19968: jis0212<<14 | 0x30<<7 | 0x5A,
-	31534 - 19968: jis0212<<14 | 0x30<<7 | 0x5B,
-	31535 - 19968: jis0212<<14 | 0x30<<7 | 0x5C,
-	31536 - 19968: jis0212<<14 | 0x30<<7 | 0x5D,
-	31537 - 19968: jis0212<<14 | 0x31<<7 | 0x00,
-	31539 - 19968: jis0208<<14 | 0x42<<7 | 0x56,
-	31540 - 19968: jis0212<<14 | 0x31<<7 | 0x01,
-	31541 - 19968: jis0208<<14 | 0x42<<7 | 0x5A,
-	31542 - 19968: jis0208<<14 | 0x42<<7 | 0x5C,
-	31545 - 19968: jis0208<<14 | 0x19<<7 | 0x5A,
-	31549 - 19968: jis0212<<14 | 0x31<<7 | 0x02,
-	31551 - 19968: jis0212<<14 | 0x31<<7 | 0x03,
-	31552 - 19968: jis0212<<14 | 0x31<<7 | 0x04,
-	31553 - 19968: jis0212<<14 | 0x31<<7 | 0x05,
-	31557 - 19968: jis0208<<14 | 0x43<<7 | 0x05,
-	31558 - 19968: jis0208<<14 | 0x28<<7 | 0x0D,
-	31559 - 19968: jis0212<<14 | 0x31<<7 | 0x06,
-	31560 - 19968: jis0208<<14 | 0x27<<7 | 0x05,
-	31561 - 19968: jis0208<<14 | 0x24<<7 | 0x58,
-	31563 - 19968: jis0208<<14 | 0x15<<7 | 0x39,
-	31564 - 19968: jis0208<<14 | 0x43<<7 | 0x04,
-	31565 - 19968: jis0208<<14 | 0x43<<7 | 0x02,
-	31566 - 19968: jis0212<<14 | 0x31<<7 | 0x07,
-	31567 - 19968: jis0208<<14 | 0x27<<7 | 0x14,
-	31568 - 19968: jis0208<<14 | 0x42<<7 | 0x5D,
-	31569 - 19968: jis0208<<14 | 0x22<<7 | 0x3D,
-	31570 - 19968: jis0208<<14 | 0x24<<7 | 0x5A,
-	31572 - 19968: jis0208<<14 | 0x24<<7 | 0x59,
-	31573 - 19968: jis0212<<14 | 0x31<<7 | 0x08,
-	31574 - 19968: jis0208<<14 | 0x19<<7 | 0x55,
-	31581 - 19968: jis0208<<14 | 0x43<<7 | 0x17,
-	31584 - 19968: jis0212<<14 | 0x31<<7 | 0x09,
-	31588 - 19968: jis0212<<14 | 0x31<<7 | 0x0A,
-	31589 - 19968: jis0208<<14 | 0x43<<7 | 0x07,
-	31590 - 19968: jis0212<<14 | 0x31<<7 | 0x0B,
-	31591 - 19968: jis0208<<14 | 0x43<<7 | 0x09,
-	31593 - 19968: jis0212<<14 | 0x31<<7 | 0x0C,
-	31594 - 19968: jis0212<<14 | 0x31<<7 | 0x0D,
-	31596 - 19968: jis0208<<14 | 0x43<<7 | 0x0C,
-	31597 - 19968: jis0212<<14 | 0x31<<7 | 0x0E,
-	31598 - 19968: jis0208<<14 | 0x43<<7 | 0x0D,
-	31599 - 19968: jis0212<<14 | 0x31<<7 | 0x0F,
-	31600 - 19968: jis0208<<14 | 0x43<<7 | 0x0A,
-	31601 - 19968: jis0208<<14 | 0x43<<7 | 0x0B,
-	31602 - 19968: jis0212<<14 | 0x31<<7 | 0x10,
-	31603 - 19968: jis0212<<14 | 0x31<<7 | 0x11,
-	31604 - 19968: jis0208<<14 | 0x43<<7 | 0x08,
-	31605 - 19968: jis0208<<14 | 0x43<<7 | 0x06,
-	31607 - 19968: jis0212<<14 | 0x31<<7 | 0x12,
-	31610 - 19968: jis0208<<14 | 0x43<<7 | 0x00,
-	31620 - 19968: jis0212<<14 | 0x31<<7 | 0x13,
-	31622 - 19968: jis0208<<14 | 0x29<<7 | 0x2E,
-	31623 - 19968: jis0208<<14 | 0x11<<7 | 0x34,
-	31625 - 19968: jis0212<<14 | 0x31<<7 | 0x14,
-	31627 - 19968: jis0208<<14 | 0x43<<7 | 0x14,
-	31629 - 19968: jis0208<<14 | 0x43<<7 | 0x11,
-	31630 - 19968: jis0212<<14 | 0x31<<7 | 0x15,
-	31631 - 19968: jis0208<<14 | 0x43<<7 | 0x16,
-	31632 - 19968: jis0212<<14 | 0x31<<7 | 0x16,
-	31633 - 19968: jis0212<<14 | 0x31<<7 | 0x17,
-	31634 - 19968: jis0208<<14 | 0x43<<7 | 0x15,
-	31636 - 19968: jis0208<<14 | 0x26<<7 | 0x52,
-	31637 - 19968: jis0208<<14 | 0x2B<<7 | 0x06,
-	31638 - 19968: jis0212<<14 | 0x31<<7 | 0x18,
-	31639 - 19968: jis0208<<14 | 0x1A<<7 | 0x1A,
-	31640 - 19968: jis0208<<14 | 0x43<<7 | 0x0F,
-	31641 - 19968: jis0208<<14 | 0x43<<7 | 0x18,
-	31642 - 19968: jis0208<<14 | 0x43<<7 | 0x13,
-	31643 - 19968: jis0212<<14 | 0x31<<7 | 0x19,
-	31644 - 19968: jis0208<<14 | 0x43<<7 | 0x12,
-	31645 - 19968: jis0208<<14 | 0x43<<7 | 0x0E,
-	31646 - 19968: jis0208<<14 | 0x5A<<7 | 0x2B,
-	31647 - 19968: jis0208<<14 | 0x43<<7 | 0x10,
-	31648 - 19968: jis0212<<14 | 0x31<<7 | 0x1B,
-	31649 - 19968: jis0208<<14 | 0x13<<7 | 0x28,
-	31653 - 19968: jis0212<<14 | 0x31<<7 | 0x1C,
-	31658 - 19968: jis0208<<14 | 0x22<<7 | 0x1C,
-	31660 - 19968: jis0212<<14 | 0x31<<7 | 0x1D,
-	31661 - 19968: jis0208<<14 | 0x1F<<7 | 0x5C,
-	31663 - 19968: jis0212<<14 | 0x31<<7 | 0x1E,
-	31664 - 19968: jis0212<<14 | 0x31<<7 | 0x1F,
-	31665 - 19968: jis0208<<14 | 0x27<<7 | 0x01,
-	31666 - 19968: jis0212<<14 | 0x31<<7 | 0x20,
-	31668 - 19968: jis0208<<14 | 0x43<<7 | 0x1D,
-	31669 - 19968: jis0212<<14 | 0x31<<7 | 0x21,
-	31670 - 19968: jis0212<<14 | 0x31<<7 | 0x22,
-	31672 - 19968: jis0208<<14 | 0x27<<7 | 0x03,
-	31674 - 19968: jis0212<<14 | 0x31<<7 | 0x23,
-	31675 - 19968: jis0212<<14 | 0x31<<7 | 0x24,
-	31676 - 19968: jis0212<<14 | 0x31<<7 | 0x25,
-	31677 - 19968: jis0212<<14 | 0x31<<7 | 0x26,
-	31680 - 19968: jis0208<<14 | 0x1F<<7 | 0x40,
-	31681 - 19968: jis0208<<14 | 0x43<<7 | 0x1A,
-	31682 - 19968: jis0212<<14 | 0x31<<7 | 0x27,
-	31684 - 19968: jis0208<<14 | 0x27<<7 | 0x2E,
-	31685 - 19968: jis0212<<14 | 0x31<<7 | 0x28,
-	31686 - 19968: jis0208<<14 | 0x43<<7 | 0x1E,
-	31687 - 19968: jis0208<<14 | 0x29<<7 | 0x32,
-	31688 - 19968: jis0212<<14 | 0x31<<7 | 0x29,
-	31689 - 19968: jis0208<<14 | 0x22<<7 | 0x3A,
-	31690 - 19968: jis0212<<14 | 0x31<<7 | 0x2A,
-	31691 - 19968: jis0208<<14 | 0x43<<7 | 0x19,
-	31692 - 19968: jis0208<<14 | 0x43<<7 | 0x1B,
-	31695 - 19968: jis0208<<14 | 0x43<<7 | 0x1C,
-	31700 - 19968: jis0212<<14 | 0x31<<7 | 0x2B,
-	31702 - 19968: jis0212<<14 | 0x31<<7 | 0x2C,
-	31703 - 19968: jis0212<<14 | 0x31<<7 | 0x2D,
-	31705 - 19968: jis0212<<14 | 0x31<<7 | 0x2E,
-	31706 - 19968: jis0212<<14 | 0x31<<7 | 0x2F,
-	31707 - 19968: jis0212<<14 | 0x31<<7 | 0x30,
-	31709 - 19968: jis0208<<14 | 0x43<<7 | 0x1F,
-	31712 - 19968: jis0208<<14 | 0x1B<<7 | 0x23,
-	31716 - 19968: jis0208<<14 | 0x25<<7 | 0x25,
-	31717 - 19968: jis0208<<14 | 0x43<<7 | 0x24,
-	31718 - 19968: jis0208<<14 | 0x43<<7 | 0x23,
-	31720 - 19968: jis0212<<14 | 0x31<<7 | 0x31,
-	31721 - 19968: jis0208<<14 | 0x43<<7 | 0x20,
-	31722 - 19968: jis0212<<14 | 0x31<<7 | 0x32,
-	31725 - 19968: jis0208<<14 | 0x2E<<7 | 0x15,
-	31730 - 19968: jis0212<<14 | 0x31<<7 | 0x33,
-	31731 - 19968: jis0208<<14 | 0x43<<7 | 0x29,
-	31732 - 19968: jis0212<<14 | 0x31<<7 | 0x34,
-	31733 - 19968: jis0212<<14 | 0x31<<7 | 0x35,
-	31734 - 19968: jis0208<<14 | 0x43<<7 | 0x2D,
-	31735 - 19968: jis0208<<14 | 0x43<<7 | 0x2A,
-	31736 - 19968: jis0212<<14 | 0x31<<7 | 0x36,
-	31737 - 19968: jis0212<<14 | 0x31<<7 | 0x37,
-	31738 - 19968: jis0212<<14 | 0x31<<7 | 0x38,
-	31740 - 19968: jis0212<<14 | 0x31<<7 | 0x39,
-	31742 - 19968: jis0212<<14 | 0x31<<7 | 0x3A,
-	31744 - 19968: jis0208<<14 | 0x43<<7 | 0x26,
-	31745 - 19968: jis0212<<14 | 0x31<<7 | 0x3B,
-	31746 - 19968: jis0212<<14 | 0x31<<7 | 0x3C,
-	31747 - 19968: jis0212<<14 | 0x31<<7 | 0x3D,
-	31748 - 19968: jis0212<<14 | 0x31<<7 | 0x3E,
-	31750 - 19968: jis0212<<14 | 0x31<<7 | 0x3F,
-	31751 - 19968: jis0208<<14 | 0x43<<7 | 0x27,
-	31753 - 19968: jis0212<<14 | 0x31<<7 | 0x40,
-	31755 - 19968: jis0212<<14 | 0x31<<7 | 0x41,
-	31756 - 19968: jis0212<<14 | 0x31<<7 | 0x42,
-	31757 - 19968: jis0208<<14 | 0x43<<7 | 0x2C,
-	31758 - 19968: jis0212<<14 | 0x31<<7 | 0x43,
-	31759 - 19968: jis0212<<14 | 0x31<<7 | 0x44,
-	31761 - 19968: jis0208<<14 | 0x43<<7 | 0x21,
-	31762 - 19968: jis0208<<14 | 0x31<<7 | 0x34,
-	31763 - 19968: jis0208<<14 | 0x43<<7 | 0x28,
-	31764 - 19968: jis0208<<14 | 0x43<<7 | 0x22,
-	31767 - 19968: jis0208<<14 | 0x43<<7 | 0x2B,
-	31769 - 19968: jis0212<<14 | 0x31<<7 | 0x45,
-	31771 - 19968: jis0212<<14 | 0x31<<7 | 0x46,
-	31775 - 19968: jis0208<<14 | 0x43<<7 | 0x31,
-	31776 - 19968: jis0212<<14 | 0x31<<7 | 0x47,
-	31777 - 19968: jis0208<<14 | 0x13<<7 | 0x29,
-	31779 - 19968: jis0208<<14 | 0x43<<7 | 0x2E,
-	31781 - 19968: jis0212<<14 | 0x31<<7 | 0x48,
-	31782 - 19968: jis0212<<14 | 0x31<<7 | 0x49,
-	31783 - 19968: jis0208<<14 | 0x43<<7 | 0x2F,
-	31784 - 19968: jis0212<<14 | 0x31<<7 | 0x4A,
-	31786 - 19968: jis0208<<14 | 0x43<<7 | 0x30,
-	31787 - 19968: jis0208<<14 | 0x43<<7 | 0x33,
-	31788 - 19968: jis0212<<14 | 0x31<<7 | 0x4B,
-	31793 - 19968: jis0212<<14 | 0x31<<7 | 0x4C,
-	31795 - 19968: jis0212<<14 | 0x31<<7 | 0x4D,
-	31796 - 19968: jis0212<<14 | 0x31<<7 | 0x4E,
-	31798 - 19968: jis0212<<14 | 0x31<<7 | 0x4F,
-	31799 - 19968: jis0208<<14 | 0x43<<7 | 0x32,
-	31800 - 19968: jis0208<<14 | 0x27<<7 | 0x55,
-	31801 - 19968: jis0212<<14 | 0x31<<7 | 0x50,
-	31802 - 19968: jis0212<<14 | 0x31<<7 | 0x51,
-	31805 - 19968: jis0208<<14 | 0x43<<7 | 0x34,
-	31806 - 19968: jis0208<<14 | 0x2D<<7 | 0x5B,
-	31807 - 19968: jis0208<<14 | 0x29<<7 | 0x4C,
-	31808 - 19968: jis0208<<14 | 0x43<<7 | 0x39,
-	31811 - 19968: jis0208<<14 | 0x43<<7 | 0x36,
-	31814 - 19968: jis0212<<14 | 0x31<<7 | 0x52,
-	31818 - 19968: jis0212<<14 | 0x31<<7 | 0x53,
-	31820 - 19968: jis0208<<14 | 0x43<<7 | 0x35,
-	31821 - 19968: jis0208<<14 | 0x1F<<7 | 0x31,
-	31823 - 19968: jis0208<<14 | 0x43<<7 | 0x38,
-	31824 - 19968: jis0208<<14 | 0x43<<7 | 0x3A,
-	31825 - 19968: jis0212<<14 | 0x31<<7 | 0x55,
-	31826 - 19968: jis0212<<14 | 0x31<<7 | 0x56,
-	31827 - 19968: jis0212<<14 | 0x31<<7 | 0x57,
-	31828 - 19968: jis0208<<14 | 0x43<<7 | 0x37,
-	31829 - 19968: jis0212<<14 | 0x31<<7 | 0x54,
-	31830 - 19968: jis0208<<14 | 0x43<<7 | 0x3E,
-	31832 - 19968: jis0208<<14 | 0x43<<7 | 0x3B,
-	31833 - 19968: jis0212<<14 | 0x31<<7 | 0x58,
-	31834 - 19968: jis0212<<14 | 0x31<<7 | 0x59,
-	31835 - 19968: jis0212<<14 | 0x31<<7 | 0x5A,
-	31836 - 19968: jis0212<<14 | 0x31<<7 | 0x5B,
-	31837 - 19968: jis0212<<14 | 0x31<<7 | 0x5C,
-	31838 - 19968: jis0212<<14 | 0x31<<7 | 0x5D,
-	31839 - 19968: jis0208<<14 | 0x43<<7 | 0x3C,
-	31840 - 19968: jis0208<<14 | 0x43<<7 | 0x25,
-	31841 - 19968: jis0212<<14 | 0x32<<7 | 0x00,
-	31843 - 19968: jis0212<<14 | 0x32<<7 | 0x01,
-	31844 - 19968: jis0208<<14 | 0x43<<7 | 0x3D,
-	31845 - 19968: jis0208<<14 | 0x43<<7 | 0x3F,
-	31847 - 19968: jis0212<<14 | 0x32<<7 | 0x02,
-	31849 - 19968: jis0212<<14 | 0x32<<7 | 0x03,
-	31852 - 19968: jis0208<<14 | 0x43<<7 | 0x40,
-	31853 - 19968: jis0212<<14 | 0x32<<7 | 0x04,
-	31854 - 19968: jis0212<<14 | 0x32<<7 | 0x05,
-	31856 - 19968: jis0212<<14 | 0x32<<7 | 0x06,
-	31858 - 19968: jis0212<<14 | 0x32<<7 | 0x07,
-	31859 - 19968: jis0208<<14 | 0x29<<7 | 0x25,
-	31861 - 19968: jis0208<<14 | 0x43<<7 | 0x41,
-	31865 - 19968: jis0212<<14 | 0x32<<7 | 0x08,
-	31868 - 19968: jis0212<<14 | 0x32<<7 | 0x09,
-	31869 - 19968: jis0212<<14 | 0x32<<7 | 0x0A,
-	31870 - 19968: jis0208<<14 | 0x2B<<7 | 0x41,
-	31873 - 19968: jis0208<<14 | 0x15<<7 | 0x2D,
-	31874 - 19968: jis0208<<14 | 0x16<<7 | 0x08,
-	31875 - 19968: jis0208<<14 | 0x43<<7 | 0x42,
-	31878 - 19968: jis0212<<14 | 0x32<<7 | 0x0B,
-	31879 - 19968: jis0212<<14 | 0x32<<7 | 0x0C,
-	31881 - 19968: jis0208<<14 | 0x29<<7 | 0x13,
-	31883 - 19968: jis0208<<14 | 0x1E<<7 | 0x47,
-	31885 - 19968: jis0208<<14 | 0x2B<<7 | 0x0F,
-	31887 - 19968: jis0212<<14 | 0x32<<7 | 0x0D,
-	31888 - 19968: jis0208<<14 | 0x43<<7 | 0x43,
-	31890 - 19968: jis0208<<14 | 0x2D<<7 | 0x12,
-	31892 - 19968: jis0212<<14 | 0x32<<7 | 0x0E,
-	31893 - 19968: jis0208<<14 | 0x26<<7 | 0x53,
-	31895 - 19968: jis0208<<14 | 0x20<<7 | 0x25,
-	31896 - 19968: jis0208<<14 | 0x26<<7 | 0x13,
-	31899 - 19968: jis0208<<14 | 0x1C<<7 | 0x2C,
-	31902 - 19968: jis0212<<14 | 0x32<<7 | 0x0F,
-	31903 - 19968: jis0208<<14 | 0x0F<<7 | 0x1F,
-	31904 - 19968: jis0212<<14 | 0x32<<7 | 0x10,
-	31905 - 19968: jis0208<<14 | 0x43<<7 | 0x48,
-	31906 - 19968: jis0208<<14 | 0x43<<7 | 0x46,
-	31908 - 19968: jis0208<<14 | 0x43<<7 | 0x44,
-	31909 - 19968: jis0208<<14 | 0x13<<7 | 0x00,
-	31910 - 19968: jis0212<<14 | 0x32<<7 | 0x11,
-	31911 - 19968: jis0208<<14 | 0x1D<<7 | 0x30,
-	31912 - 19968: jis0208<<14 | 0x43<<7 | 0x49,
-	31915 - 19968: jis0208<<14 | 0x43<<7 | 0x47,
-	31917 - 19968: jis0208<<14 | 0x43<<7 | 0x45,
-	31918 - 19968: jis0208<<14 | 0x43<<7 | 0x4D,
-	31920 - 19968: jis0212<<14 | 0x32<<7 | 0x12,
-	31921 - 19968: jis0208<<14 | 0x43<<7 | 0x4C,
-	31922 - 19968: jis0208<<14 | 0x43<<7 | 0x4B,
-	31923 - 19968: jis0208<<14 | 0x43<<7 | 0x4A,
-	31926 - 19968: jis0212<<14 | 0x32<<7 | 0x13,
-	31927 - 19968: jis0212<<14 | 0x32<<7 | 0x14,
-	31929 - 19968: jis0208<<14 | 0x43<<7 | 0x4E,
-	31930 - 19968: jis0212<<14 | 0x32<<7 | 0x15,
-	31931 - 19968: jis0212<<14 | 0x32<<7 | 0x16,
-	31932 - 19968: jis0212<<14 | 0x32<<7 | 0x17,
-	31933 - 19968: jis0208<<14 | 0x43<<7 | 0x4F,
-	31934 - 19968: jis0208<<14 | 0x1F<<7 | 0x19,
-	31935 - 19968: jis0212<<14 | 0x32<<7 | 0x18,
-	31936 - 19968: jis0208<<14 | 0x43<<7 | 0x50,
-	31938 - 19968: jis0208<<14 | 0x43<<7 | 0x52,
-	31940 - 19968: jis0212<<14 | 0x32<<7 | 0x19,
-	31941 - 19968: jis0208<<14 | 0x43<<7 | 0x51,
-	31943 - 19968: jis0212<<14 | 0x32<<7 | 0x1A,
-	31944 - 19968: jis0212<<14 | 0x32<<7 | 0x1B,
-	31945 - 19968: jis0212<<14 | 0x32<<7 | 0x1C,
-	31946 - 19968: jis0208<<14 | 0x17<<7 | 0x31,
-	31949 - 19968: jis0212<<14 | 0x32<<7 | 0x1D,
-	31950 - 19968: jis0208<<14 | 0x20<<7 | 0x17,
-	31951 - 19968: jis0212<<14 | 0x32<<7 | 0x1E,
-	31954 - 19968: jis0208<<14 | 0x43<<7 | 0x54,
-	31955 - 19968: jis0212<<14 | 0x32<<7 | 0x1F,
-	31956 - 19968: jis0212<<14 | 0x32<<7 | 0x20,
-	31957 - 19968: jis0212<<14 | 0x32<<7 | 0x21,
-	31958 - 19968: jis0208<<14 | 0x24<<7 | 0x5B,
-	31959 - 19968: jis0212<<14 | 0x32<<7 | 0x22,
-	31960 - 19968: jis0208<<14 | 0x43<<7 | 0x53,
-	31961 - 19968: jis0212<<14 | 0x32<<7 | 0x23,
-	31962 - 19968: jis0212<<14 | 0x32<<7 | 0x24,
-	31964 - 19968: jis0208<<14 | 0x43<<7 | 0x55,
-	31965 - 19968: jis0212<<14 | 0x32<<7 | 0x25,
-	31966 - 19968: jis0208<<14 | 0x29<<7 | 0x14,
-	31967 - 19968: jis0208<<14 | 0x20<<7 | 0x4B,
-	31968 - 19968: jis0208<<14 | 0x18<<7 | 0x26,
-	31970 - 19968: jis0208<<14 | 0x43<<7 | 0x56,
-	31974 - 19968: jis0212<<14 | 0x32<<7 | 0x26,
-	31975 - 19968: jis0208<<14 | 0x2D<<7 | 0x27,
-	31977 - 19968: jis0212<<14 | 0x32<<7 | 0x27,
-	31979 - 19968: jis0212<<14 | 0x32<<7 | 0x28,
-	31983 - 19968: jis0208<<14 | 0x43<<7 | 0x58,
-	31986 - 19968: jis0208<<14 | 0x43<<7 | 0x59,
-	31988 - 19968: jis0208<<14 | 0x43<<7 | 0x5A,
-	31989 - 19968: jis0212<<14 | 0x32<<7 | 0x29,
-	31990 - 19968: jis0208<<14 | 0x43<<7 | 0x5B,
-	31992 - 19968: jis0208<<14 | 0x1A<<7 | 0x44,
-	31994 - 19968: jis0208<<14 | 0x43<<7 | 0x5C,
-	31995 - 19968: jis0208<<14 | 0x16<<7 | 0x2E,
-	31998 - 19968: jis0208<<14 | 0x14<<7 | 0x49,
-	32000 - 19968: jis0208<<14 | 0x14<<7 | 0x09,
-	32002 - 19968: jis0208<<14 | 0x44<<7 | 0x00,
-	32003 - 19968: jis0212<<14 | 0x32<<7 | 0x2A,
-	32004 - 19968: jis0208<<14 | 0x2B<<7 | 0x52,
-	32005 - 19968: jis0208<<14 | 0x18<<7 | 0x27,
-	32006 - 19968: jis0208<<14 | 0x43<<7 | 0x5D,
-	32007 - 19968: jis0212<<14 | 0x32<<7 | 0x2B,
-	32008 - 19968: jis0212<<14 | 0x32<<7 | 0x2C,
-	32009 - 19968: jis0212<<14 | 0x32<<7 | 0x2D,
-	32010 - 19968: jis0208<<14 | 0x44<<7 | 0x03,
-	32011 - 19968: jis0208<<14 | 0x2B<<7 | 0x45,
-	32013 - 19968: jis0208<<14 | 0x26<<7 | 0x1B,
-	32015 - 19968: jis0212<<14 | 0x32<<7 | 0x2E,
-	32016 - 19968: jis0208<<14 | 0x28<<7 | 0x12,
-	32017 - 19968: jis0212<<14 | 0x32<<7 | 0x2F,
-	32018 - 19968: jis0212<<14 | 0x32<<7 | 0x30,
-	32019 - 19968: jis0212<<14 | 0x32<<7 | 0x31,
-	32020 - 19968: jis0208<<14 | 0x1C<<7 | 0x42,
-	32021 - 19968: jis0208<<14 | 0x44<<7 | 0x02,
-	32022 - 19968: jis0212<<14 | 0x32<<7 | 0x32,
-	32023 - 19968: jis0208<<14 | 0x1B<<7 | 0x32,
-	32024 - 19968: jis0208<<14 | 0x18<<7 | 0x28,
-	32025 - 19968: jis0208<<14 | 0x1A<<7 | 0x45,
-	32026 - 19968: jis0208<<14 | 0x14<<7 | 0x48,
-	32027 - 19968: jis0208<<14 | 0x29<<7 | 0x15,
-	32028 - 19968: jis0208<<14 | 0x44<<7 | 0x01,
-	32029 - 19968: jis0212<<14 | 0x32<<7 | 0x33,
-	32030 - 19968: jis0212<<14 | 0x32<<7 | 0x34,
-	32032 - 19968: jis0208<<14 | 0x20<<7 | 0x26,
-	32033 - 19968: jis0208<<14 | 0x2A<<7 | 0x21,
-	32034 - 19968: jis0208<<14 | 0x19<<7 | 0x56,
-	32035 - 19968: jis0212<<14 | 0x32<<7 | 0x35,
-	32038 - 19968: jis0212<<14 | 0x32<<7 | 0x36,
-	32042 - 19968: jis0212<<14 | 0x32<<7 | 0x37,
-	32043 - 19968: jis0208<<14 | 0x1A<<7 | 0x46,
-	32044 - 19968: jis0208<<14 | 0x23<<7 | 0x3C,
-	32045 - 19968: jis0212<<14 | 0x32<<7 | 0x38,
-	32046 - 19968: jis0208<<14 | 0x44<<7 | 0x06,
-	32047 - 19968: jis0208<<14 | 0x2D<<7 | 0x3E,
-	32048 - 19968: jis0208<<14 | 0x19<<7 | 0x38,
-	32049 - 19968: jis0212<<14 | 0x32<<7 | 0x39,
-	32050 - 19968: jis0208<<14 | 0x44<<7 | 0x07,
-	32051 - 19968: jis0208<<14 | 0x1E<<7 | 0x21,
-	32053 - 19968: jis0208<<14 | 0x44<<7 | 0x09,
-	32057 - 19968: jis0208<<14 | 0x1D<<7 | 0x31,
-	32058 - 19968: jis0208<<14 | 0x19<<7 | 0x0F,
-	32060 - 19968: jis0212<<14 | 0x32<<7 | 0x3A,
-	32061 - 19968: jis0212<<14 | 0x32<<7 | 0x3B,
-	32062 - 19968: jis0212<<14 | 0x32<<7 | 0x3C,
-	32063 - 19968: jis0208<<14 | 0x44<<7 | 0x08,
-	32064 - 19968: jis0212<<14 | 0x32<<7 | 0x3D,
-	32065 - 19968: jis0212<<14 | 0x32<<7 | 0x3E,
-	32066 - 19968: jis0208<<14 | 0x1C<<7 | 0x09,
-	32067 - 19968: jis0208<<14 | 0x17<<7 | 0x1D,
-	32068 - 19968: jis0208<<14 | 0x20<<7 | 0x27,
-	32069 - 19968: jis0208<<14 | 0x44<<7 | 0x04,
-	32070 - 19968: jis0208<<14 | 0x44<<7 | 0x0A,
-	32071 - 19968: jis0212<<14 | 0x32<<7 | 0x3F,
-	32072 - 19968: jis0208<<14 | 0x5A<<7 | 0x2D,
-	32075 - 19968: jis0208<<14 | 0x44<<7 | 0x05,
-	32076 - 19968: jis0208<<14 | 0x16<<7 | 0x2F,
-	32077 - 19968: jis0212<<14 | 0x32<<7 | 0x41,
-	32078 - 19968: jis0208<<14 | 0x44<<7 | 0x0D,
-	32079 - 19968: jis0208<<14 | 0x44<<7 | 0x11,
-	32080 - 19968: jis0208<<14 | 0x16<<7 | 0x4A,
-	32081 - 19968: jis0212<<14 | 0x32<<7 | 0x42,
-	32083 - 19968: jis0212<<14 | 0x32<<7 | 0x43,
-	32086 - 19968: jis0208<<14 | 0x44<<7 | 0x0C,
-	32087 - 19968: jis0212<<14 | 0x32<<7 | 0x44,
-	32089 - 19968: jis0212<<14 | 0x32<<7 | 0x45,
-	32090 - 19968: jis0212<<14 | 0x32<<7 | 0x46,
-	32091 - 19968: jis0208<<14 | 0x44<<7 | 0x15,
-	32092 - 19968: jis0208<<14 | 0x5A<<7 | 0x2E,
-	32093 - 19968: jis0212<<14 | 0x32<<7 | 0x48,
-	32094 - 19968: jis0208<<14 | 0x18<<7 | 0x29,
-	32097 - 19968: jis0208<<14 | 0x2C<<7 | 0x4C,
-	32098 - 19968: jis0208<<14 | 0x0F<<7 | 0x1B,
-	32099 - 19968: jis0208<<14 | 0x44<<7 | 0x12,
-	32101 - 19968: jis0212<<14 | 0x32<<7 | 0x49,
-	32102 - 19968: jis0208<<14 | 0x14<<7 | 0x4A,
-	32103 - 19968: jis0212<<14 | 0x32<<7 | 0x4A,
-	32104 - 19968: jis0208<<14 | 0x44<<7 | 0x0F,
-	32106 - 19968: jis0212<<14 | 0x32<<7 | 0x4B,
-	32110 - 19968: jis0208<<14 | 0x44<<7 | 0x10,
-	32112 - 19968: jis0212<<14 | 0x32<<7 | 0x4C,
-	32113 - 19968: jis0208<<14 | 0x24<<7 | 0x5C,
-	32114 - 19968: jis0208<<14 | 0x44<<7 | 0x0E,
-	32115 - 19968: jis0208<<14 | 0x44<<7 | 0x0B,
-	32117 - 19968: jis0208<<14 | 0x12<<7 | 0x07,
-	32118 - 19968: jis0208<<14 | 0x1F<<7 | 0x43,
-	32120 - 19968: jis0212<<14 | 0x32<<7 | 0x4D,
-	32121 - 19968: jis0208<<14 | 0x17<<7 | 0x07,
-	32122 - 19968: jis0212<<14 | 0x32<<7 | 0x4E,
-	32123 - 19968: jis0212<<14 | 0x32<<7 | 0x4F,
-	32125 - 19968: jis0208<<14 | 0x44<<7 | 0x17,
-	32127 - 19968: jis0212<<14 | 0x32<<7 | 0x50,
-	32129 - 19968: jis0212<<14 | 0x32<<7 | 0x51,
-	32130 - 19968: jis0212<<14 | 0x32<<7 | 0x52,
-	32131 - 19968: jis0212<<14 | 0x32<<7 | 0x53,
-	32133 - 19968: jis0212<<14 | 0x32<<7 | 0x54,
-	32134 - 19968: jis0212<<14 | 0x32<<7 | 0x55,
-	32136 - 19968: jis0212<<14 | 0x32<<7 | 0x56,
-	32137 - 19968: jis0208<<14 | 0x44<<7 | 0x14,
-	32139 - 19968: jis0212<<14 | 0x32<<7 | 0x57,
-	32140 - 19968: jis0212<<14 | 0x32<<7 | 0x58,
-	32141 - 19968: jis0212<<14 | 0x32<<7 | 0x59,
-	32143 - 19968: jis0208<<14 | 0x44<<7 | 0x16,
-	32145 - 19968: jis0212<<14 | 0x32<<7 | 0x5A,
-	32147 - 19968: jis0208<<14 | 0x44<<7 | 0x13,
-	32150 - 19968: jis0212<<14 | 0x32<<7 | 0x5B,
-	32151 - 19968: jis0212<<14 | 0x32<<7 | 0x5C,
-	32153 - 19968: jis0208<<14 | 0x16<<7 | 0x30,
-	32154 - 19968: jis0208<<14 | 0x21<<7 | 0x12,
-	32155 - 19968: jis0208<<14 | 0x44<<7 | 0x18,
-	32156 - 19968: jis0208<<14 | 0x20<<7 | 0x4D,
-	32157 - 19968: jis0212<<14 | 0x32<<7 | 0x5D,
-	32158 - 19968: jis0212<<14 | 0x33<<7 | 0x00,
-	32159 - 19968: jis0208<<14 | 0x44<<7 | 0x25,
-	32160 - 19968: jis0208<<14 | 0x5A<<7 | 0x30,
-	32162 - 19968: jis0208<<14 | 0x44<<7 | 0x21,
-	32163 - 19968: jis0208<<14 | 0x44<<7 | 0x1B,
-	32166 - 19968: jis0212<<14 | 0x33<<7 | 0x01,
-	32167 - 19968: jis0212<<14 | 0x33<<7 | 0x02,
-	32170 - 19968: jis0212<<14 | 0x33<<7 | 0x03,
-	32171 - 19968: jis0208<<14 | 0x44<<7 | 0x1F,
-	32172 - 19968: jis0208<<14 | 0x1B<<7 | 0x59,
-	32173 - 19968: jis0208<<14 | 0x0F<<7 | 0x3C,
-	32174 - 19968: jis0208<<14 | 0x44<<7 | 0x1A,
-	32175 - 19968: jis0208<<14 | 0x44<<7 | 0x22,
-	32176 - 19968: jis0208<<14 | 0x44<<7 | 0x26,
-	32177 - 19968: jis0208<<14 | 0x18<<7 | 0x2A,
-	32178 - 19968: jis0208<<14 | 0x2B<<7 | 0x35,
-	32179 - 19968: jis0212<<14 | 0x33<<7 | 0x04,
-	32180 - 19968: jis0208<<14 | 0x23<<7 | 0x35,
-	32181 - 19968: jis0208<<14 | 0x44<<7 | 0x1C,
-	32182 - 19968: jis0212<<14 | 0x33<<7 | 0x05,
-	32183 - 19968: jis0208<<14 | 0x5A<<7 | 0x2F,
-	32184 - 19968: jis0208<<14 | 0x44<<7 | 0x24,
-	32185 - 19968: jis0212<<14 | 0x33<<7 | 0x07,
-	32186 - 19968: jis0208<<14 | 0x44<<7 | 0x19,
-	32187 - 19968: jis0208<<14 | 0x22<<7 | 0x1D,
-	32189 - 19968: jis0208<<14 | 0x44<<7 | 0x1E,
-	32190 - 19968: jis0208<<14 | 0x0F<<7 | 0x1C,
-	32191 - 19968: jis0208<<14 | 0x2B<<7 | 0x29,
-	32194 - 19968: jis0212<<14 | 0x33<<7 | 0x08,
-	32195 - 19968: jis0212<<14 | 0x33<<7 | 0x09,
-	32196 - 19968: jis0212<<14 | 0x33<<7 | 0x0A,
-	32197 - 19968: jis0212<<14 | 0x33<<7 | 0x0B,
-	32198 - 19968: jis0212<<14 | 0x33<<7 | 0x0C,
-	32199 - 19968: jis0208<<14 | 0x44<<7 | 0x1D,
-	32202 - 19968: jis0208<<14 | 0x15<<7 | 0x3A,
-	32203 - 19968: jis0208<<14 | 0x27<<7 | 0x4B,
-	32204 - 19968: jis0212<<14 | 0x33<<7 | 0x0D,
-	32205 - 19968: jis0212<<14 | 0x33<<7 | 0x0E,
-	32206 - 19968: jis0212<<14 | 0x33<<7 | 0x0F,
-	32207 - 19968: jis0208<<14 | 0x20<<7 | 0x4C,
-	32209 - 19968: jis0208<<14 | 0x2D<<7 | 0x2F,
-	32210 - 19968: jis0208<<14 | 0x1C<<7 | 0x4E,
-	32213 - 19968: jis0208<<14 | 0x44<<7 | 0x4D,
-	32214 - 19968: jis0208<<14 | 0x5A<<7 | 0x31,
-	32215 - 19968: jis0212<<14 | 0x33<<7 | 0x10,
-	32216 - 19968: jis0208<<14 | 0x44<<7 | 0x27,
-	32217 - 19968: jis0212<<14 | 0x33<<7 | 0x11,
-	32218 - 19968: jis0208<<14 | 0x1F<<7 | 0x5D,
-	32220 - 19968: jis0208<<14 | 0x44<<7 | 0x23,
-	32221 - 19968: jis0208<<14 | 0x44<<7 | 0x28,
-	32222 - 19968: jis0208<<14 | 0x44<<7 | 0x2A,
-	32224 - 19968: jis0208<<14 | 0x23<<7 | 0x58,
-	32225 - 19968: jis0208<<14 | 0x44<<7 | 0x2D,
-	32226 - 19968: jis0212<<14 | 0x33<<7 | 0x13,
-	32228 - 19968: jis0208<<14 | 0x44<<7 | 0x29,
-	32229 - 19968: jis0212<<14 | 0x33<<7 | 0x14,
-	32230 - 19968: jis0212<<14 | 0x33<<7 | 0x15,
-	32232 - 19968: jis0208<<14 | 0x29<<7 | 0x33,
-	32233 - 19968: jis0208<<14 | 0x13<<7 | 0x2A,
-	32234 - 19968: jis0212<<14 | 0x33<<7 | 0x16,
-	32235 - 19968: jis0212<<14 | 0x33<<7 | 0x17,
-	32236 - 19968: jis0208<<14 | 0x2B<<7 | 0x2A,
-	32237 - 19968: jis0212<<14 | 0x33<<7 | 0x18,
-	32239 - 19968: jis0208<<14 | 0x0F<<7 | 0x3D,
-	32241 - 19968: jis0212<<14 | 0x33<<7 | 0x19,
-	32242 - 19968: jis0208<<14 | 0x44<<7 | 0x2C,
-	32244 - 19968: jis0208<<14 | 0x2D<<7 | 0x5C,
-	32245 - 19968: jis0212<<14 | 0x33<<7 | 0x1A,
-	32246 - 19968: jis0212<<14 | 0x33<<7 | 0x1B,
-	32249 - 19968: jis0212<<14 | 0x33<<7 | 0x1C,
-	32250 - 19968: jis0212<<14 | 0x33<<7 | 0x1D,
-	32251 - 19968: jis0208<<14 | 0x44<<7 | 0x2B,
-	32256 - 19968: jis0212<<14 | 0x33<<7 | 0x12,
-	32257 - 19968: jis0208<<14 | 0x10<<7 | 0x4E,
-	32260 - 19968: jis0208<<14 | 0x25<<7 | 0x4B,
-	32261 - 19968: jis0208<<14 | 0x44<<7 | 0x2E,
-	32264 - 19968: jis0212<<14 | 0x33<<7 | 0x1E,
-	32265 - 19968: jis0208<<14 | 0x44<<7 | 0x35,
-	32266 - 19968: jis0208<<14 | 0x44<<7 | 0x2F,
-	32267 - 19968: jis0208<<14 | 0x44<<7 | 0x36,
-	32272 - 19968: jis0212<<14 | 0x33<<7 | 0x1F,
-	32273 - 19968: jis0212<<14 | 0x33<<7 | 0x20,
-	32274 - 19968: jis0208<<14 | 0x44<<7 | 0x32,
-	32277 - 19968: jis0212<<14 | 0x33<<7 | 0x21,
-	32279 - 19968: jis0212<<14 | 0x33<<7 | 0x22,
-	32283 - 19968: jis0208<<14 | 0x26<<7 | 0x5A,
-	32284 - 19968: jis0212<<14 | 0x33<<7 | 0x23,
-	32285 - 19968: jis0212<<14 | 0x33<<7 | 0x24,
-	32286 - 19968: jis0208<<14 | 0x1B<<7 | 0x29,
-	32287 - 19968: jis0208<<14 | 0x44<<7 | 0x34,
-	32288 - 19968: jis0212<<14 | 0x33<<7 | 0x25,
-	32289 - 19968: jis0208<<14 | 0x44<<7 | 0x31,
-	32290 - 19968: jis0208<<14 | 0x44<<7 | 0x37,
-	32291 - 19968: jis0208<<14 | 0x44<<7 | 0x30,
-	32294 - 19968: jis0208<<14 | 0x1C<<7 | 0x23,
-	32295 - 19968: jis0212<<14 | 0x33<<7 | 0x26,
-	32296 - 19968: jis0212<<14 | 0x33<<7 | 0x27,
-	32299 - 19968: jis0208<<14 | 0x2A<<7 | 0x04,
-	32300 - 19968: jis0212<<14 | 0x33<<7 | 0x28,
-	32301 - 19968: jis0212<<14 | 0x33<<7 | 0x29,
-	32302 - 19968: jis0208<<14 | 0x1C<<7 | 0x2B,
-	32303 - 19968: jis0212<<14 | 0x33<<7 | 0x2A,
-	32305 - 19968: jis0208<<14 | 0x44<<7 | 0x33,
-	32306 - 19968: jis0208<<14 | 0x44<<7 | 0x3F,
-	32307 - 19968: jis0212<<14 | 0x33<<7 | 0x2B,
-	32309 - 19968: jis0208<<14 | 0x44<<7 | 0x3B,
-	32310 - 19968: jis0212<<14 | 0x33<<7 | 0x2C,
-	32311 - 19968: jis0208<<14 | 0x44<<7 | 0x3E,
-	32313 - 19968: jis0208<<14 | 0x44<<7 | 0x3C,
-	32314 - 19968: jis0208<<14 | 0x44<<7 | 0x40,
-	32315 - 19968: jis0208<<14 | 0x44<<7 | 0x3A,
-	32317 - 19968: jis0208<<14 | 0x44<<7 | 0x20,
-	32318 - 19968: jis0208<<14 | 0x1F<<7 | 0x32,
-	32319 - 19968: jis0212<<14 | 0x33<<7 | 0x2D,
-	32321 - 19968: jis0208<<14 | 0x27<<7 | 0x2A,
-	32323 - 19968: jis0208<<14 | 0x44<<7 | 0x3D,
-	32324 - 19968: jis0212<<14 | 0x33<<7 | 0x2E,
-	32325 - 19968: jis0212<<14 | 0x33<<7 | 0x2F,
-	32326 - 19968: jis0208<<14 | 0x44<<7 | 0x38,
-	32327 - 19968: jis0212<<14 | 0x33<<7 | 0x30,
-	32330 - 19968: jis0208<<14 | 0x20<<7 | 0x00,
-	32331 - 19968: jis0208<<14 | 0x16<<7 | 0x31,
-	32333 - 19968: jis0208<<14 | 0x1C<<7 | 0x0A,
-	32334 - 19968: jis0212<<14 | 0x33<<7 | 0x31,
-	32336 - 19968: jis0212<<14 | 0x33<<7 | 0x32,
-	32338 - 19968: jis0208<<14 | 0x5A<<7 | 0x32,
-	32340 - 19968: jis0208<<14 | 0x1E<<7 | 0x04,
-	32341 - 19968: jis0208<<14 | 0x20<<7 | 0x15,
-	32342 - 19968: jis0208<<14 | 0x44<<7 | 0x43,
-	32344 - 19968: jis0212<<14 | 0x33<<7 | 0x34,
-	32345 - 19968: jis0208<<14 | 0x44<<7 | 0x45,
-	32346 - 19968: jis0208<<14 | 0x44<<7 | 0x46,
-	32349 - 19968: jis0208<<14 | 0x44<<7 | 0x42,
-	32350 - 19968: jis0208<<14 | 0x44<<7 | 0x44,
-	32351 - 19968: jis0212<<14 | 0x33<<7 | 0x35,
-	32353 - 19968: jis0212<<14 | 0x33<<7 | 0x36,
-	32354 - 19968: jis0212<<14 | 0x33<<7 | 0x37,
-	32357 - 19968: jis0212<<14 | 0x33<<7 | 0x38,
-	32358 - 19968: jis0208<<14 | 0x44<<7 | 0x39,
-	32359 - 19968: jis0208<<14 | 0x44<<7 | 0x41,
-	32361 - 19968: jis0208<<14 | 0x44<<7 | 0x49,
-	32362 - 19968: jis0208<<14 | 0x44<<7 | 0x48,
-	32363 - 19968: jis0212<<14 | 0x33<<7 | 0x39,
-	32365 - 19968: jis0208<<14 | 0x2A<<7 | 0x59,
-	32366 - 19968: jis0212<<14 | 0x33<<7 | 0x3A,
-	32367 - 19968: jis0212<<14 | 0x33<<7 | 0x3B,
-	32368 - 19968: jis0208<<14 | 0x16<<7 | 0x0A,
-	32371 - 19968: jis0212<<14 | 0x33<<7 | 0x3C,
-	32376 - 19968: jis0212<<14 | 0x33<<7 | 0x3D,
-	32377 - 19968: jis0208<<14 | 0x44<<7 | 0x47,
-	32379 - 19968: jis0208<<14 | 0x44<<7 | 0x4B,
-	32380 - 19968: jis0208<<14 | 0x44<<7 | 0x4A,
-	32381 - 19968: jis0208<<14 | 0x44<<7 | 0x4E,
-	32382 - 19968: jis0212<<14 | 0x33<<7 | 0x3E,
-	32383 - 19968: jis0208<<14 | 0x44<<7 | 0x50,
-	32385 - 19968: jis0212<<14 | 0x33<<7 | 0x3F,
-	32386 - 19968: jis0208<<14 | 0x1A<<7 | 0x1B,
-	32387 - 19968: jis0208<<14 | 0x44<<7 | 0x4C,
-	32390 - 19968: jis0212<<14 | 0x33<<7 | 0x40,
-	32391 - 19968: jis0212<<14 | 0x33<<7 | 0x41,
-	32392 - 19968: jis0208<<14 | 0x44<<7 | 0x51,
-	32393 - 19968: jis0208<<14 | 0x44<<7 | 0x52,
-	32394 - 19968: jis0208<<14 | 0x58<<7 | 0x00,
-	32396 - 19968: jis0208<<14 | 0x44<<7 | 0x53,
-	32397 - 19968: jis0212<<14 | 0x33<<7 | 0x43,
-	32398 - 19968: jis0208<<14 | 0x44<<7 | 0x59,
-	32399 - 19968: jis0208<<14 | 0x24<<7 | 0x1A,
-	32400 - 19968: jis0208<<14 | 0x44<<7 | 0x55,
-	32401 - 19968: jis0212<<14 | 0x33<<7 | 0x44,
-	32402 - 19968: jis0208<<14 | 0x44<<7 | 0x54,
-	32403 - 19968: jis0208<<14 | 0x44<<7 | 0x56,
-	32404 - 19968: jis0208<<14 | 0x44<<7 | 0x57,
-	32405 - 19968: jis0212<<14 | 0x33<<7 | 0x45,
-	32406 - 19968: jis0208<<14 | 0x44<<7 | 0x58,
-	32408 - 19968: jis0212<<14 | 0x33<<7 | 0x46,
-	32410 - 19968: jis0212<<14 | 0x33<<7 | 0x47,
-	32411 - 19968: jis0208<<14 | 0x44<<7 | 0x5A,
-	32412 - 19968: jis0208<<14 | 0x44<<7 | 0x5B,
-	32413 - 19968: jis0212<<14 | 0x33<<7 | 0x48,
-	32414 - 19968: jis0212<<14 | 0x33<<7 | 0x49,
-	32566 - 19968: jis0208<<14 | 0x13<<7 | 0x2B,
-	32568 - 19968: jis0208<<14 | 0x44<<7 | 0x5C,
-	32570 - 19968: jis0208<<14 | 0x44<<7 | 0x5D,
-	32571 - 19968: jis0212<<14 | 0x33<<7 | 0x4B,
-	32572 - 19968: jis0212<<14 | 0x33<<7 | 0x4A,
-	32573 - 19968: jis0212<<14 | 0x33<<7 | 0x4C,
-	32574 - 19968: jis0212<<14 | 0x33<<7 | 0x4D,
-	32575 - 19968: jis0212<<14 | 0x33<<7 | 0x4E,
-	32579 - 19968: jis0212<<14 | 0x33<<7 | 0x4F,
-	32580 - 19968: jis0212<<14 | 0x33<<7 | 0x50,
-	32581 - 19968: jis0208<<14 | 0x45<<7 | 0x00,
-	32583 - 19968: jis0208<<14 | 0x5A<<7 | 0x33,
-	32588 - 19968: jis0208<<14 | 0x45<<7 | 0x01,
-	32589 - 19968: jis0208<<14 | 0x45<<7 | 0x02,
-	32590 - 19968: jis0208<<14 | 0x45<<7 | 0x03,
-	32591 - 19968: jis0212<<14 | 0x33<<7 | 0x52,
-	32592 - 19968: jis0208<<14 | 0x45<<7 | 0x04,
-	32593 - 19968: jis0208<<14 | 0x45<<7 | 0x05,
-	32594 - 19968: jis0212<<14 | 0x33<<7 | 0x53,
-	32595 - 19968: jis0212<<14 | 0x33<<7 | 0x54,
-	32596 - 19968: jis0208<<14 | 0x45<<7 | 0x07,
-	32597 - 19968: jis0208<<14 | 0x45<<7 | 0x06,
-	32600 - 19968: jis0208<<14 | 0x45<<7 | 0x08,
-	32603 - 19968: jis0212<<14 | 0x33<<7 | 0x55,
-	32604 - 19968: jis0212<<14 | 0x33<<7 | 0x56,
-	32605 - 19968: jis0212<<14 | 0x33<<7 | 0x57,
-	32607 - 19968: jis0208<<14 | 0x45<<7 | 0x09,
-	32608 - 19968: jis0208<<14 | 0x45<<7 | 0x0A,
-	32609 - 19968: jis0212<<14 | 0x33<<7 | 0x58,
-	32611 - 19968: jis0212<<14 | 0x33<<7 | 0x59,
-	32612 - 19968: jis0212<<14 | 0x33<<7 | 0x5A,
-	32613 - 19968: jis0212<<14 | 0x33<<7 | 0x5B,
-	32614 - 19968: jis0212<<14 | 0x33<<7 | 0x5C,
-	32615 - 19968: jis0208<<14 | 0x45<<7 | 0x0D,
-	32616 - 19968: jis0208<<14 | 0x45<<7 | 0x0B,
-	32617 - 19968: jis0208<<14 | 0x45<<7 | 0x0C,
-	32618 - 19968: jis0208<<14 | 0x19<<7 | 0x40,
-	32619 - 19968: jis0208<<14 | 0x16<<7 | 0x32,
-	32621 - 19968: jis0212<<14 | 0x33<<7 | 0x5D,
-	32622 - 19968: jis0208<<14 | 0x22<<7 | 0x35,
-	32624 - 19968: jis0208<<14 | 0x27<<7 | 0x12,
-	32625 - 19968: jis0212<<14 | 0x34<<7 | 0x00,
-	32626 - 19968: jis0208<<14 | 0x1C<<7 | 0x4F,
-	32629 - 19968: jis0208<<14 | 0x26<<7 | 0x2C,
-	32631 - 19968: jis0208<<14 | 0x27<<7 | 0x4C,
-	32632 - 19968: jis0208<<14 | 0x45<<7 | 0x0E,
-	32633 - 19968: jis0208<<14 | 0x37<<7 | 0x4C,
-	32637 - 19968: jis0212<<14 | 0x34<<7 | 0x01,
-	32638 - 19968: jis0212<<14 | 0x34<<7 | 0x02,
-	32639 - 19968: jis0212<<14 | 0x34<<7 | 0x03,
-	32640 - 19968: jis0212<<14 | 0x34<<7 | 0x04,
-	32642 - 19968: jis0208<<14 | 0x45<<7 | 0x0F,
-	32643 - 19968: jis0208<<14 | 0x45<<7 | 0x11,
-	32645 - 19968: jis0208<<14 | 0x2C<<7 | 0x44,
-	32646 - 19968: jis0208<<14 | 0x45<<7 | 0x10,
-	32647 - 19968: jis0208<<14 | 0x45<<7 | 0x13,
-	32648 - 19968: jis0208<<14 | 0x45<<7 | 0x12,
-	32650 - 19968: jis0208<<14 | 0x2C<<7 | 0x32,
-	32651 - 19968: jis0212<<14 | 0x34<<7 | 0x05,
-	32652 - 19968: jis0208<<14 | 0x45<<7 | 0x14,
-	32653 - 19968: jis0212<<14 | 0x34<<7 | 0x06,
-	32654 - 19968: jis0208<<14 | 0x27<<7 | 0x5D,
-	32655 - 19968: jis0212<<14 | 0x34<<7 | 0x07,
-	32656 - 19968: jis0212<<14 | 0x34<<7 | 0x08,
-	32657 - 19968: jis0212<<14 | 0x34<<7 | 0x09,
-	32660 - 19968: jis0208<<14 | 0x45<<7 | 0x15,
-	32662 - 19968: jis0212<<14 | 0x34<<7 | 0x0A,
-	32663 - 19968: jis0212<<14 | 0x34<<7 | 0x0B,
-	32666 - 19968: jis0208<<14 | 0x45<<7 | 0x18,
-	32668 - 19968: jis0212<<14 | 0x34<<7 | 0x0C,
-	32669 - 19968: jis0208<<14 | 0x45<<7 | 0x17,
-	32670 - 19968: jis0208<<14 | 0x45<<7 | 0x16,
-	32673 - 19968: jis0208<<14 | 0x5A<<7 | 0x34,
-	32674 - 19968: jis0212<<14 | 0x34<<7 | 0x0E,
-	32675 - 19968: jis0208<<14 | 0x45<<7 | 0x19,
-	32676 - 19968: jis0208<<14 | 0x16<<7 | 0x11,
-	32678 - 19968: jis0212<<14 | 0x34<<7 | 0x0F,
-	32680 - 19968: jis0208<<14 | 0x20<<7 | 0x01,
-	32681 - 19968: jis0208<<14 | 0x14<<7 | 0x20,
-	32682 - 19968: jis0212<<14 | 0x34<<7 | 0x10,
-	32685 - 19968: jis0212<<14 | 0x34<<7 | 0x11,
-	32686 - 19968: jis0208<<14 | 0x45<<7 | 0x1D,
-	32687 - 19968: jis0208<<14 | 0x45<<7 | 0x1A,
-	32690 - 19968: jis0208<<14 | 0x45<<7 | 0x1B,
-	32692 - 19968: jis0212<<14 | 0x34<<7 | 0x12,
-	32694 - 19968: jis0208<<14 | 0x45<<7 | 0x1E,
-	32696 - 19968: jis0208<<14 | 0x45<<7 | 0x1F,
-	32697 - 19968: jis0208<<14 | 0x45<<7 | 0x1C,
-	32700 - 19968: jis0212<<14 | 0x34<<7 | 0x13,
-	32701 - 19968: jis0208<<14 | 0x10<<7 | 0x08,
-	32703 - 19968: jis0212<<14 | 0x34<<7 | 0x14,
-	32704 - 19968: jis0212<<14 | 0x34<<7 | 0x15,
-	32705 - 19968: jis0208<<14 | 0x11<<7 | 0x06,
-	32707 - 19968: jis0212<<14 | 0x34<<7 | 0x16,
-	32709 - 19968: jis0208<<14 | 0x45<<7 | 0x21,
-	32710 - 19968: jis0208<<14 | 0x45<<7 | 0x22,
-	32712 - 19968: jis0212<<14 | 0x34<<7 | 0x17,
-	32714 - 19968: jis0208<<14 | 0x45<<7 | 0x23,
-	32716 - 19968: jis0208<<14 | 0x2C<<7 | 0x41,
-	32718 - 19968: jis0212<<14 | 0x34<<7 | 0x18,
-	32719 - 19968: jis0212<<14 | 0x34<<7 | 0x19,
-	32722 - 19968: jis0208<<14 | 0x1C<<7 | 0x0B,
-	32724 - 19968: jis0208<<14 | 0x45<<7 | 0x25,
-	32725 - 19968: jis0208<<14 | 0x45<<7 | 0x24,
-	32731 - 19968: jis0212<<14 | 0x34<<7 | 0x1A,
-	32735 - 19968: jis0212<<14 | 0x34<<7 | 0x1B,
-	32736 - 19968: jis0208<<14 | 0x1E<<7 | 0x48,
-	32737 - 19968: jis0208<<14 | 0x45<<7 | 0x26,
-	32739 - 19968: jis0212<<14 | 0x34<<7 | 0x1C,
-	32741 - 19968: jis0212<<14 | 0x34<<7 | 0x1D,
-	32742 - 19968: jis0208<<14 | 0x45<<7 | 0x27,
-	32744 - 19968: jis0212<<14 | 0x34<<7 | 0x1E,
-	32745 - 19968: jis0208<<14 | 0x45<<7 | 0x28,
-	32747 - 19968: jis0208<<14 | 0x13<<7 | 0x44,
-	32748 - 19968: jis0212<<14 | 0x34<<7 | 0x1F,
-	32750 - 19968: jis0212<<14 | 0x34<<7 | 0x20,
-	32751 - 19968: jis0212<<14 | 0x34<<7 | 0x21,
-	32752 - 19968: jis0208<<14 | 0x13<<7 | 0x2C,
-	32754 - 19968: jis0212<<14 | 0x34<<7 | 0x22,
-	32755 - 19968: jis0208<<14 | 0x45<<7 | 0x29,
-	32761 - 19968: jis0208<<14 | 0x45<<7 | 0x2A,
-	32762 - 19968: jis0212<<14 | 0x34<<7 | 0x23,
-	32763 - 19968: jis0208<<14 | 0x2A<<7 | 0x3C,
-	32764 - 19968: jis0208<<14 | 0x2C<<7 | 0x42,
-	32765 - 19968: jis0212<<14 | 0x34<<7 | 0x24,
-	32766 - 19968: jis0212<<14 | 0x34<<7 | 0x25,
-	32767 - 19968: jis0212<<14 | 0x34<<7 | 0x26,
-	32768 - 19968: jis0208<<14 | 0x2C<<7 | 0x33,
-	32769 - 19968: jis0208<<14 | 0x2E<<7 | 0x16,
-	32771 - 19968: jis0208<<14 | 0x18<<7 | 0x2C,
-	32772 - 19968: jis0208<<14 | 0x45<<7 | 0x2D,
-	32773 - 19968: jis0208<<14 | 0x1B<<7 | 0x33,
-	32774 - 19968: jis0208<<14 | 0x45<<7 | 0x2C,
-	32775 - 19968: jis0212<<14 | 0x34<<7 | 0x27,
-	32776 - 19968: jis0212<<14 | 0x34<<7 | 0x28,
-	32778 - 19968: jis0212<<14 | 0x34<<7 | 0x29,
-	32779 - 19968: jis0208<<14 | 0x45<<7 | 0x2E,
-	32780 - 19968: jis0208<<14 | 0x1B<<7 | 0x08,
-	32781 - 19968: jis0212<<14 | 0x34<<7 | 0x2A,
-	32782 - 19968: jis0212<<14 | 0x34<<7 | 0x2B,
-	32783 - 19968: jis0212<<14 | 0x34<<7 | 0x2C,
-	32784 - 19968: jis0208<<14 | 0x21<<7 | 0x30,
-	32785 - 19968: jis0212<<14 | 0x34<<7 | 0x2D,
-	32786 - 19968: jis0208<<14 | 0x45<<7 | 0x2F,
-	32787 - 19968: jis0212<<14 | 0x34<<7 | 0x2E,
-	32788 - 19968: jis0212<<14 | 0x34<<7 | 0x2F,
-	32789 - 19968: jis0208<<14 | 0x18<<7 | 0x2B,
-	32790 - 19968: jis0212<<14 | 0x34<<7 | 0x30,
-	32791 - 19968: jis0208<<14 | 0x2B<<7 | 0x36,
-	32792 - 19968: jis0208<<14 | 0x45<<7 | 0x30,
-	32793 - 19968: jis0208<<14 | 0x45<<7 | 0x31,
-	32796 - 19968: jis0208<<14 | 0x45<<7 | 0x32,
-	32797 - 19968: jis0212<<14 | 0x34<<7 | 0x31,
-	32798 - 19968: jis0212<<14 | 0x34<<7 | 0x32,
-	32799 - 19968: jis0212<<14 | 0x34<<7 | 0x33,
-	32800 - 19968: jis0212<<14 | 0x34<<7 | 0x34,
-	32801 - 19968: jis0208<<14 | 0x45<<7 | 0x33,
-	32804 - 19968: jis0212<<14 | 0x34<<7 | 0x35,
-	32806 - 19968: jis0212<<14 | 0x34<<7 | 0x36,
-	32808 - 19968: jis0208<<14 | 0x45<<7 | 0x34,
-	32812 - 19968: jis0212<<14 | 0x34<<7 | 0x37,
-	32814 - 19968: jis0212<<14 | 0x34<<7 | 0x38,
-	32816 - 19968: jis0212<<14 | 0x34<<7 | 0x39,
-	32819 - 19968: jis0208<<14 | 0x1B<<7 | 0x09,
-	32820 - 19968: jis0212<<14 | 0x34<<7 | 0x3A,
-	32821 - 19968: jis0212<<14 | 0x34<<7 | 0x3B,
-	32822 - 19968: jis0208<<14 | 0x2B<<7 | 0x4C,
-	32823 - 19968: jis0212<<14 | 0x34<<7 | 0x3C,
-	32825 - 19968: jis0212<<14 | 0x34<<7 | 0x3D,
-	32826 - 19968: jis0212<<14 | 0x34<<7 | 0x3E,
-	32827 - 19968: jis0208<<14 | 0x45<<7 | 0x36,
-	32828 - 19968: jis0212<<14 | 0x34<<7 | 0x3F,
-	32829 - 19968: jis0208<<14 | 0x22<<7 | 0x1E,
-	32830 - 19968: jis0212<<14 | 0x34<<7 | 0x40,
-	32831 - 19968: jis0208<<14 | 0x45<<7 | 0x35,
-	32832 - 19968: jis0212<<14 | 0x34<<7 | 0x41,
-	32836 - 19968: jis0212<<14 | 0x34<<7 | 0x42,
-	32838 - 19968: jis0208<<14 | 0x45<<7 | 0x38,
-	32842 - 19968: jis0208<<14 | 0x45<<7 | 0x37,
-	32850 - 19968: jis0208<<14 | 0x45<<7 | 0x39,
-	32854 - 19968: jis0208<<14 | 0x1F<<7 | 0x1A,
-	32856 - 19968: jis0208<<14 | 0x45<<7 | 0x3A,
-	32858 - 19968: jis0208<<14 | 0x45<<7 | 0x3B,
-	32862 - 19968: jis0208<<14 | 0x29<<7 | 0x18,
-	32863 - 19968: jis0208<<14 | 0x45<<7 | 0x3C,
-	32864 - 19968: jis0212<<14 | 0x34<<7 | 0x43,
-	32865 - 19968: jis0208<<14 | 0x20<<7 | 0x4E,
-	32866 - 19968: jis0208<<14 | 0x45<<7 | 0x3D,
-	32868 - 19968: jis0212<<14 | 0x34<<7 | 0x44,
-	32870 - 19968: jis0212<<14 | 0x34<<7 | 0x45,
-	32872 - 19968: jis0208<<14 | 0x45<<7 | 0x3E,
-	32877 - 19968: jis0212<<14 | 0x34<<7 | 0x46,
-	32879 - 19968: jis0208<<14 | 0x2D<<7 | 0x5D,
-	32880 - 19968: jis0208<<14 | 0x45<<7 | 0x41,
-	32881 - 19968: jis0212<<14 | 0x34<<7 | 0x47,
-	32882 - 19968: jis0208<<14 | 0x45<<7 | 0x40,
-	32883 - 19968: jis0208<<14 | 0x45<<7 | 0x3F,
-	32884 - 19968: jis0208<<14 | 0x23<<7 | 0x0F,
-	32885 - 19968: jis0212<<14 | 0x34<<7 | 0x48,
-	32886 - 19968: jis0208<<14 | 0x45<<7 | 0x42,
-	32887 - 19968: jis0208<<14 | 0x1E<<7 | 0x05,
-	32889 - 19968: jis0208<<14 | 0x45<<7 | 0x43,
-	32893 - 19968: jis0208<<14 | 0x45<<7 | 0x44,
-	32894 - 19968: jis0208<<14 | 0x2E<<7 | 0x17,
-	32895 - 19968: jis0208<<14 | 0x45<<7 | 0x45,
-	32897 - 19968: jis0212<<14 | 0x34<<7 | 0x49,
-	32900 - 19968: jis0208<<14 | 0x45<<7 | 0x46,
-	32901 - 19968: jis0208<<14 | 0x45<<7 | 0x48,
-	32902 - 19968: jis0208<<14 | 0x45<<7 | 0x47,
-	32903 - 19968: jis0208<<14 | 0x27<<7 | 0x04,
-	32904 - 19968: jis0212<<14 | 0x34<<7 | 0x4A,
-	32905 - 19968: jis0208<<14 | 0x25<<7 | 0x58,
-	32907 - 19968: jis0208<<14 | 0x2E<<7 | 0x1D,
-	32908 - 19968: jis0208<<14 | 0x27<<7 | 0x08,
-	32910 - 19968: jis0212<<14 | 0x34<<7 | 0x4B,
-	32915 - 19968: jis0208<<14 | 0x45<<7 | 0x4A,
-	32918 - 19968: jis0208<<14 | 0x1D<<7 | 0x32,
-	32920 - 19968: jis0208<<14 | 0x28<<7 | 0x09,
-	32922 - 19968: jis0208<<14 | 0x45<<7 | 0x4B,
-	32923 - 19968: jis0208<<14 | 0x45<<7 | 0x49,
-	32924 - 19968: jis0212<<14 | 0x34<<7 | 0x4C,
-	32925 - 19968: jis0208<<14 | 0x13<<7 | 0x2D,
-	32926 - 19968: jis0212<<14 | 0x34<<7 | 0x4D,
-	32929 - 19968: jis0208<<14 | 0x17<<7 | 0x33,
-	32930 - 19968: jis0208<<14 | 0x1A<<7 | 0x47,
-	32933 - 19968: jis0208<<14 | 0x27<<7 | 0x4D,
-	32934 - 19968: jis0212<<14 | 0x34<<7 | 0x4E,
-	32935 - 19968: jis0212<<14 | 0x34<<7 | 0x4F,
-	32937 - 19968: jis0208<<14 | 0x17<<7 | 0x09,
-	32938 - 19968: jis0208<<14 | 0x2A<<7 | 0x22,
-	32939 - 19968: jis0212<<14 | 0x34<<7 | 0x50,
-	32940 - 19968: jis0208<<14 | 0x45<<7 | 0x4E,
-	32941 - 19968: jis0208<<14 | 0x45<<7 | 0x4C,
-	32943 - 19968: jis0208<<14 | 0x18<<7 | 0x2D,
-	32945 - 19968: jis0208<<14 | 0x18<<7 | 0x2E,
-	32946 - 19968: jis0208<<14 | 0x0F<<7 | 0x48,
-	32948 - 19968: jis0208<<14 | 0x19<<7 | 0x47,
-	32952 - 19968: jis0212<<14 | 0x34<<7 | 0x51,
-	32953 - 19968: jis0212<<14 | 0x34<<7 | 0x52,
-	32954 - 19968: jis0208<<14 | 0x26<<7 | 0x38,
-	32963 - 19968: jis0208<<14 | 0x0F<<7 | 0x3E,
-	32964 - 19968: jis0208<<14 | 0x45<<7 | 0x53,
-	32966 - 19968: jis0208<<14 | 0x22<<7 | 0x1F,
-	32968 - 19968: jis0212<<14 | 0x34<<7 | 0x53,
-	32972 - 19968: jis0208<<14 | 0x26<<7 | 0x37,
-	32973 - 19968: jis0212<<14 | 0x34<<7 | 0x54,
-	32974 - 19968: jis0208<<14 | 0x21<<7 | 0x3A,
-	32975 - 19968: jis0212<<14 | 0x34<<7 | 0x55,
-	32978 - 19968: jis0212<<14 | 0x34<<7 | 0x56,
-	32980 - 19968: jis0212<<14 | 0x34<<7 | 0x57,
-	32981 - 19968: jis0212<<14 | 0x34<<7 | 0x58,
-	32982 - 19968: jis0208<<14 | 0x45<<7 | 0x55,
-	32983 - 19968: jis0212<<14 | 0x34<<7 | 0x59,
-	32984 - 19968: jis0212<<14 | 0x34<<7 | 0x5A,
-	32985 - 19968: jis0208<<14 | 0x45<<7 | 0x51,
-	32986 - 19968: jis0208<<14 | 0x45<<7 | 0x54,
-	32987 - 19968: jis0208<<14 | 0x45<<7 | 0x4F,
-	32989 - 19968: jis0208<<14 | 0x45<<7 | 0x52,
-	32990 - 19968: jis0208<<14 | 0x2A<<7 | 0x05,
-	32992 - 19968: jis0212<<14 | 0x34<<7 | 0x5B,
-	32993 - 19968: jis0208<<14 | 0x17<<7 | 0x34,
-	32996 - 19968: jis0208<<14 | 0x0F<<7 | 0x5C,
-	32997 - 19968: jis0208<<14 | 0x45<<7 | 0x50,
-	33005 - 19968: jis0212<<14 | 0x34<<7 | 0x5C,
-	33006 - 19968: jis0212<<14 | 0x34<<7 | 0x5D,
-	33007 - 19968: jis0208<<14 | 0x45<<7 | 0x57,
-	33008 - 19968: jis0212<<14 | 0x35<<7 | 0x00,
-	33009 - 19968: jis0208<<14 | 0x45<<7 | 0x58,
-	33010 - 19968: jis0212<<14 | 0x35<<7 | 0x01,
-	33011 - 19968: jis0212<<14 | 0x35<<7 | 0x02,
-	33012 - 19968: jis0208<<14 | 0x25<<7 | 0x18,
-	33014 - 19968: jis0212<<14 | 0x35<<7 | 0x03,
-	33016 - 19968: jis0208<<14 | 0x15<<7 | 0x1A,
-	33017 - 19968: jis0212<<14 | 0x35<<7 | 0x04,
-	33018 - 19968: jis0212<<14 | 0x35<<7 | 0x05,
-	33020 - 19968: jis0208<<14 | 0x46<<7 | 0x05,
-	33021 - 19968: jis0208<<14 | 0x26<<7 | 0x1C,
-	33022 - 19968: jis0212<<14 | 0x35<<7 | 0x06,
-	33026 - 19968: jis0208<<14 | 0x1A<<7 | 0x48,
-	33027 - 19968: jis0212<<14 | 0x35<<7 | 0x07,
-	33029 - 19968: jis0208<<14 | 0x15<<7 | 0x1B,
-	33030 - 19968: jis0208<<14 | 0x1F<<7 | 0x27,
-	33031 - 19968: jis0208<<14 | 0x2E<<7 | 0x25,
-	33032 - 19968: jis0208<<14 | 0x2B<<7 | 0x0D,
-	33033 - 19968: jis0208<<14 | 0x45<<7 | 0x56,
-	33034 - 19968: jis0208<<14 | 0x1F<<7 | 0x33,
-	33035 - 19968: jis0212<<14 | 0x35<<7 | 0x08,
-	33046 - 19968: jis0212<<14 | 0x35<<7 | 0x09,
-	33047 - 19968: jis0212<<14 | 0x35<<7 | 0x0A,
-	33048 - 19968: jis0212<<14 | 0x35<<7 | 0x0B,
-	33050 - 19968: jis0208<<14 | 0x14<<7 | 0x32,
-	33051 - 19968: jis0208<<14 | 0x45<<7 | 0x59,
-	33052 - 19968: jis0212<<14 | 0x35<<7 | 0x0C,
-	33054 - 19968: jis0212<<14 | 0x35<<7 | 0x0D,
-	33056 - 19968: jis0212<<14 | 0x35<<7 | 0x0E,
-	33059 - 19968: jis0208<<14 | 0x45<<7 | 0x5B,
-	33060 - 19968: jis0212<<14 | 0x35<<7 | 0x0F,
-	33063 - 19968: jis0212<<14 | 0x35<<7 | 0x10,
-	33065 - 19968: jis0208<<14 | 0x45<<7 | 0x5A,
-	33068 - 19968: jis0212<<14 | 0x35<<7 | 0x11,
-	33071 - 19968: jis0208<<14 | 0x45<<7 | 0x5C,
-	33072 - 19968: jis0212<<14 | 0x35<<7 | 0x12,
-	33073 - 19968: jis0208<<14 | 0x22<<7 | 0x05,
-	33075 - 19968: jis0208<<14 | 0x26<<7 | 0x1D,
-	33077 - 19968: jis0212<<14 | 0x35<<7 | 0x13,
-	33081 - 19968: jis0208<<14 | 0x23<<7 | 0x10,
-	33082 - 19968: jis0212<<14 | 0x35<<7 | 0x14,
-	33084 - 19968: jis0212<<14 | 0x35<<7 | 0x15,
-	33086 - 19968: jis0208<<14 | 0x46<<7 | 0x02,
-	33093 - 19968: jis0212<<14 | 0x35<<7 | 0x16,
-	33094 - 19968: jis0208<<14 | 0x46<<7 | 0x01,
-	33095 - 19968: jis0212<<14 | 0x35<<7 | 0x17,
-	33098 - 19968: jis0212<<14 | 0x35<<7 | 0x18,
-	33099 - 19968: jis0208<<14 | 0x45<<7 | 0x5D,
-	33100 - 19968: jis0212<<14 | 0x35<<7 | 0x19,
-	33102 - 19968: jis0208<<14 | 0x1E<<7 | 0x34,
-	33104 - 19968: jis0208<<14 | 0x28<<7 | 0x44,
-	33105 - 19968: jis0208<<14 | 0x46<<7 | 0x04,
-	33106 - 19968: jis0212<<14 | 0x35<<7 | 0x1A,
-	33107 - 19968: jis0208<<14 | 0x46<<7 | 0x03,
-	33108 - 19968: jis0208<<14 | 0x18<<7 | 0x2F,
-	33109 - 19968: jis0208<<14 | 0x2E<<7 | 0x32,
-	33111 - 19968: jis0212<<14 | 0x35<<7 | 0x1B,
-	33119 - 19968: jis0208<<14 | 0x46<<7 | 0x14,
-	33120 - 19968: jis0212<<14 | 0x35<<7 | 0x1C,
-	33121 - 19968: jis0212<<14 | 0x35<<7 | 0x1D,
-	33125 - 19968: jis0208<<14 | 0x46<<7 | 0x08,
-	33126 - 19968: jis0208<<14 | 0x46<<7 | 0x09,
-	33127 - 19968: jis0212<<14 | 0x35<<7 | 0x1E,
-	33128 - 19968: jis0212<<14 | 0x35<<7 | 0x1F,
-	33129 - 19968: jis0212<<14 | 0x35<<7 | 0x20,
-	33131 - 19968: jis0208<<14 | 0x1B<<7 | 0x4F,
-	33133 - 19968: jis0212<<14 | 0x35<<7 | 0x21,
-	33134 - 19968: jis0208<<14 | 0x46<<7 | 0x07,
-	33135 - 19968: jis0212<<14 | 0x35<<7 | 0x22,
-	33136 - 19968: jis0208<<14 | 0x18<<7 | 0x57,
-	33137 - 19968: jis0208<<14 | 0x46<<7 | 0x06,
-	33140 - 19968: jis0208<<14 | 0x46<<7 | 0x0A,
-	33143 - 19968: jis0212<<14 | 0x35<<7 | 0x23,
-	33144 - 19968: jis0208<<14 | 0x23<<7 | 0x11,
-	33145 - 19968: jis0208<<14 | 0x29<<7 | 0x01,
-	33146 - 19968: jis0208<<14 | 0x20<<7 | 0x02,
-	33151 - 19968: jis0208<<14 | 0x21<<7 | 0x3B,
-	33152 - 19968: jis0208<<14 | 0x46<<7 | 0x0E,
-	33153 - 19968: jis0212<<14 | 0x35<<7 | 0x24,
-	33154 - 19968: jis0208<<14 | 0x46<<7 | 0x0F,
-	33155 - 19968: jis0208<<14 | 0x46<<7 | 0x0B,
-	33156 - 19968: jis0212<<14 | 0x35<<7 | 0x26,
-	33157 - 19968: jis0212<<14 | 0x35<<7 | 0x27,
-	33158 - 19968: jis0212<<14 | 0x35<<7 | 0x28,
-	33160 - 19968: jis0208<<14 | 0x46<<7 | 0x0C,
-	33162 - 19968: jis0208<<14 | 0x46<<7 | 0x0D,
-	33163 - 19968: jis0212<<14 | 0x35<<7 | 0x29,
-	33166 - 19968: jis0212<<14 | 0x35<<7 | 0x2A,
-	33167 - 19968: jis0208<<14 | 0x18<<7 | 0x30,
-	33168 - 19968: jis0212<<14 | 0x35<<7 | 0x25,
-	33171 - 19968: jis0208<<14 | 0x46<<7 | 0x15,
-	33173 - 19968: jis0208<<14 | 0x46<<7 | 0x11,
-	33174 - 19968: jis0212<<14 | 0x35<<7 | 0x2B,
-	33176 - 19968: jis0212<<14 | 0x35<<7 | 0x2C,
-	33178 - 19968: jis0208<<14 | 0x28<<7 | 0x45,
-	33179 - 19968: jis0212<<14 | 0x35<<7 | 0x2D,
-	33180 - 19968: jis0208<<14 | 0x2A<<7 | 0x4B,
-	33181 - 19968: jis0208<<14 | 0x28<<7 | 0x07,
-	33182 - 19968: jis0212<<14 | 0x35<<7 | 0x2E,
-	33184 - 19968: jis0208<<14 | 0x46<<7 | 0x10,
-	33186 - 19968: jis0212<<14 | 0x35<<7 | 0x2F,
-	33187 - 19968: jis0208<<14 | 0x46<<7 | 0x13,
-	33188 - 19968: jis0208<<14 | 0x46<<7 | 0x12,
-	33192 - 19968: jis0208<<14 | 0x2A<<7 | 0x23,
-	33193 - 19968: jis0208<<14 | 0x46<<7 | 0x16,
-	33198 - 19968: jis0212<<14 | 0x35<<7 | 0x30,
-	33200 - 19968: jis0208<<14 | 0x46<<7 | 0x17,
-	33202 - 19968: jis0212<<14 | 0x35<<7 | 0x31,
-	33203 - 19968: jis0208<<14 | 0x20<<7 | 0x16,
-	33204 - 19968: jis0212<<14 | 0x35<<7 | 0x32,
-	33205 - 19968: jis0208<<14 | 0x46<<7 | 0x18,
-	33208 - 19968: jis0208<<14 | 0x46<<7 | 0x1A,
-	33210 - 19968: jis0208<<14 | 0x46<<7 | 0x1E,
-	33211 - 19968: jis0212<<14 | 0x35<<7 | 0x33,
-	33213 - 19968: jis0208<<14 | 0x46<<7 | 0x1B,
-	33214 - 19968: jis0208<<14 | 0x46<<7 | 0x19,
-	33215 - 19968: jis0208<<14 | 0x26<<7 | 0x1E,
-	33216 - 19968: jis0208<<14 | 0x46<<7 | 0x1C,
-	33218 - 19968: jis0208<<14 | 0x46<<7 | 0x1D,
-	33219 - 19968: jis0212<<14 | 0x35<<7 | 0x35,
-	33221 - 19968: jis0212<<14 | 0x35<<7 | 0x36,
-	33222 - 19968: jis0208<<14 | 0x11<<7 | 0x11,
-	33224 - 19968: jis0208<<14 | 0x46<<7 | 0x24,
-	33225 - 19968: jis0208<<14 | 0x46<<7 | 0x1F,
-	33226 - 19968: jis0212<<14 | 0x35<<7 | 0x37,
-	33227 - 19968: jis0212<<14 | 0x35<<7 | 0x34,
-	33229 - 19968: jis0208<<14 | 0x46<<7 | 0x20,
-	33230 - 19968: jis0212<<14 | 0x35<<7 | 0x38,
-	33231 - 19968: jis0212<<14 | 0x35<<7 | 0x39,
-	33233 - 19968: jis0208<<14 | 0x46<<7 | 0x21,
-	33235 - 19968: jis0208<<14 | 0x21<<7 | 0x00,
-	33237 - 19968: jis0212<<14 | 0x35<<7 | 0x3A,
-	33239 - 19968: jis0212<<14 | 0x35<<7 | 0x3B,
-	33240 - 19968: jis0208<<14 | 0x46<<7 | 0x23,
-	33241 - 19968: jis0208<<14 | 0x46<<7 | 0x22,
-	33242 - 19968: jis0208<<14 | 0x46<<7 | 0x25,
-	33243 - 19968: jis0212<<14 | 0x35<<7 | 0x3C,
-	33245 - 19968: jis0212<<14 | 0x35<<7 | 0x3D,
-	33246 - 19968: jis0212<<14 | 0x35<<7 | 0x3E,
-	33247 - 19968: jis0208<<14 | 0x46<<7 | 0x26,
-	33248 - 19968: jis0208<<14 | 0x46<<7 | 0x27,
-	33249 - 19968: jis0212<<14 | 0x35<<7 | 0x3F,
-	33251 - 19968: jis0208<<14 | 0x1E<<7 | 0x22,
-	33252 - 19968: jis0212<<14 | 0x35<<7 | 0x40,
-	33253 - 19968: jis0208<<14 | 0x11<<7 | 0x48,
-	33255 - 19968: jis0208<<14 | 0x46<<7 | 0x28,
-	33256 - 19968: jis0208<<14 | 0x2D<<7 | 0x36,
-	33258 - 19968: jis0208<<14 | 0x1B<<7 | 0x0A,
-	33259 - 19968: jis0212<<14 | 0x35<<7 | 0x41,
-	33260 - 19968: jis0212<<14 | 0x35<<7 | 0x42,
-	33261 - 19968: jis0208<<14 | 0x1C<<7 | 0x0C,
-	33264 - 19968: jis0212<<14 | 0x35<<7 | 0x43,
-	33265 - 19968: jis0212<<14 | 0x35<<7 | 0x44,
-	33266 - 19968: jis0212<<14 | 0x35<<7 | 0x45,
-	33267 - 19968: jis0208<<14 | 0x1A<<7 | 0x49,
-	33268 - 19968: jis0208<<14 | 0x22<<7 | 0x36,
-	33269 - 19968: jis0212<<14 | 0x35<<7 | 0x46,
-	33270 - 19968: jis0212<<14 | 0x35<<7 | 0x47,
-	33272 - 19968: jis0212<<14 | 0x35<<7 | 0x48,
-	33273 - 19968: jis0212<<14 | 0x35<<7 | 0x49,
-	33274 - 19968: jis0208<<14 | 0x46<<7 | 0x29,
-	33275 - 19968: jis0208<<14 | 0x46<<7 | 0x2A,
-	33276 - 19968: jis0208<<14 | 0x10<<7 | 0x10,
-	33277 - 19968: jis0212<<14 | 0x35<<7 | 0x4A,
-	33278 - 19968: jis0208<<14 | 0x46<<7 | 0x2B,
-	33279 - 19968: jis0212<<14 | 0x35<<7 | 0x4B,
-	33280 - 19968: jis0212<<14 | 0x35<<7 | 0x4C,
-	33281 - 19968: jis0208<<14 | 0x46<<7 | 0x2C,
-	33282 - 19968: jis0208<<14 | 0x46<<7 | 0x2D,
-	33283 - 19968: jis0212<<14 | 0x35<<7 | 0x4D,
-	33285 - 19968: jis0208<<14 | 0x46<<7 | 0x2E,
-	33287 - 19968: jis0208<<14 | 0x46<<7 | 0x2F,
-	33288 - 19968: jis0208<<14 | 0x15<<7 | 0x1C,
-	33289 - 19968: jis0208<<14 | 0x39<<7 | 0x09,
-	33290 - 19968: jis0208<<14 | 0x46<<7 | 0x30,
-	33292 - 19968: jis0208<<14 | 0x1F<<7 | 0x44,
-	33293 - 19968: jis0208<<14 | 0x46<<7 | 0x31,
-	33294 - 19968: jis0208<<14 | 0x1B<<7 | 0x2A,
-	33295 - 19968: jis0212<<14 | 0x35<<7 | 0x4E,
-	33296 - 19968: jis0208<<14 | 0x46<<7 | 0x32,
-	33298 - 19968: jis0208<<14 | 0x2F<<7 | 0x0F,
-	33299 - 19968: jis0212<<14 | 0x35<<7 | 0x4F,
-	33300 - 19968: jis0212<<14 | 0x35<<7 | 0x50,
-	33302 - 19968: jis0208<<14 | 0x46<<7 | 0x33,
-	33303 - 19968: jis0208<<14 | 0x29<<7 | 0x3D,
-	33304 - 19968: jis0208<<14 | 0x13<<7 | 0x3B,
-	33305 - 19968: jis0212<<14 | 0x35<<7 | 0x51,
-	33306 - 19968: jis0212<<14 | 0x35<<7 | 0x52,
-	33307 - 19968: jis0208<<14 | 0x20<<7 | 0x03,
-	33308 - 19968: jis0208<<14 | 0x1C<<7 | 0x37,
-	33309 - 19968: jis0212<<14 | 0x35<<7 | 0x53,
-	33310 - 19968: jis0208<<14 | 0x28<<7 | 0x50,
-	33311 - 19968: jis0208<<14 | 0x1C<<7 | 0x0D,
-	33313 - 19968: jis0212<<14 | 0x35<<7 | 0x54,
-	33314 - 19968: jis0212<<14 | 0x35<<7 | 0x55,
-	33320 - 19968: jis0212<<14 | 0x35<<7 | 0x56,
-	33321 - 19968: jis0208<<14 | 0x46<<7 | 0x34,
-	33322 - 19968: jis0208<<14 | 0x18<<7 | 0x31,
-	33323 - 19968: jis0208<<14 | 0x46<<7 | 0x35,
-	33324 - 19968: jis0208<<14 | 0x27<<7 | 0x2B,
-	33326 - 19968: jis0208<<14 | 0x46<<7 | 0x43,
-	33330 - 19968: jis0212<<14 | 0x35<<7 | 0x57,
-	33331 - 19968: jis0208<<14 | 0x46<<7 | 0x37,
-	33332 - 19968: jis0212<<14 | 0x35<<7 | 0x58,
-	33333 - 19968: jis0208<<14 | 0x21<<7 | 0x28,
-	33334 - 19968: jis0208<<14 | 0x26<<7 | 0x54,
-	33335 - 19968: jis0208<<14 | 0x17<<7 | 0x1E,
-	33336 - 19968: jis0208<<14 | 0x46<<7 | 0x36,
-	33337 - 19968: jis0208<<14 | 0x20<<7 | 0x04,
-	33338 - 19968: jis0212<<14 | 0x35<<7 | 0x59,
-	33344 - 19968: jis0208<<14 | 0x46<<7 | 0x38,
-	33347 - 19968: jis0212<<14 | 0x35<<7 | 0x5A,
-	33348 - 19968: jis0212<<14 | 0x35<<7 | 0x5B,
-	33349 - 19968: jis0212<<14 | 0x35<<7 | 0x5C,
-	33350 - 19968: jis0212<<14 | 0x35<<7 | 0x5D,
-	33351 - 19968: jis0208<<14 | 0x23<<7 | 0x59,
-	33355 - 19968: jis0212<<14 | 0x36<<7 | 0x00,
-	33358 - 19968: jis0212<<14 | 0x36<<7 | 0x01,
-	33359 - 19968: jis0212<<14 | 0x36<<7 | 0x02,
-	33361 - 19968: jis0212<<14 | 0x36<<7 | 0x03,
-	33366 - 19968: jis0212<<14 | 0x36<<7 | 0x04,
-	33368 - 19968: jis0208<<14 | 0x46<<7 | 0x3A,
-	33369 - 19968: jis0208<<14 | 0x46<<7 | 0x39,
-	33370 - 19968: jis0208<<14 | 0x46<<7 | 0x3C,
-	33372 - 19968: jis0212<<14 | 0x36<<7 | 0x05,
-	33373 - 19968: jis0208<<14 | 0x46<<7 | 0x3B,
-	33375 - 19968: jis0208<<14 | 0x46<<7 | 0x3D,
-	33376 - 19968: jis0212<<14 | 0x36<<7 | 0x06,
-	33378 - 19968: jis0208<<14 | 0x46<<7 | 0x3F,
-	33379 - 19968: jis0212<<14 | 0x36<<7 | 0x07,
-	33380 - 19968: jis0208<<14 | 0x46<<7 | 0x3E,
-	33382 - 19968: jis0208<<14 | 0x13<<7 | 0x2E,
-	33383 - 19968: jis0212<<14 | 0x36<<7 | 0x08,
-	33384 - 19968: jis0208<<14 | 0x46<<7 | 0x40,
-	33386 - 19968: jis0208<<14 | 0x46<<7 | 0x41,
-	33387 - 19968: jis0208<<14 | 0x46<<7 | 0x42,
-	33389 - 19968: jis0212<<14 | 0x36<<7 | 0x09,
-	33390 - 19968: jis0208<<14 | 0x19<<7 | 0x10,
-	33391 - 19968: jis0208<<14 | 0x2D<<7 | 0x28,
-	33393 - 19968: jis0208<<14 | 0x46<<7 | 0x44,
-	33394 - 19968: jis0208<<14 | 0x1E<<7 | 0x06,
-	33396 - 19968: jis0212<<14 | 0x36<<7 | 0x0A,
-	33398 - 19968: jis0208<<14 | 0x10<<7 | 0x4F,
-	33399 - 19968: jis0208<<14 | 0x46<<7 | 0x45,
-	33400 - 19968: jis0208<<14 | 0x46<<7 | 0x46,
-	33403 - 19968: jis0212<<14 | 0x36<<7 | 0x0B,
-	33405 - 19968: jis0212<<14 | 0x36<<7 | 0x0C,
-	33406 - 19968: jis0208<<14 | 0x46<<7 | 0x47,
-	33407 - 19968: jis0212<<14 | 0x36<<7 | 0x0D,
-	33408 - 19968: jis0212<<14 | 0x36<<7 | 0x0E,
-	33409 - 19968: jis0212<<14 | 0x36<<7 | 0x0F,
-	33411 - 19968: jis0212<<14 | 0x36<<7 | 0x10,
-	33412 - 19968: jis0212<<14 | 0x36<<7 | 0x11,
-	33415 - 19968: jis0212<<14 | 0x36<<7 | 0x12,
-	33417 - 19968: jis0212<<14 | 0x36<<7 | 0x13,
-	33418 - 19968: jis0212<<14 | 0x36<<7 | 0x14,
-	33419 - 19968: jis0208<<14 | 0x0F<<7 | 0x51,
-	33421 - 19968: jis0208<<14 | 0x46<<7 | 0x48,
-	33422 - 19968: jis0212<<14 | 0x36<<7 | 0x15,
-	33425 - 19968: jis0212<<14 | 0x36<<7 | 0x16,
-	33426 - 19968: jis0208<<14 | 0x46<<7 | 0x49,
-	33428 - 19968: jis0212<<14 | 0x36<<7 | 0x17,
-	33430 - 19968: jis0212<<14 | 0x36<<7 | 0x18,
-	33432 - 19968: jis0212<<14 | 0x36<<7 | 0x19,
-	33433 - 19968: jis0208<<14 | 0x28<<7 | 0x46,
-	33434 - 19968: jis0212<<14 | 0x36<<7 | 0x1A,
-	33435 - 19968: jis0212<<14 | 0x36<<7 | 0x1B,
-	33437 - 19968: jis0208<<14 | 0x1B<<7 | 0x26,
-	33439 - 19968: jis0208<<14 | 0x46<<7 | 0x4B,
-	33440 - 19968: jis0212<<14 | 0x36<<7 | 0x1C,
-	33441 - 19968: jis0212<<14 | 0x36<<7 | 0x1D,
-	33443 - 19968: jis0212<<14 | 0x36<<7 | 0x1E,
-	33444 - 19968: jis0212<<14 | 0x36<<7 | 0x1F,
-	33445 - 19968: jis0208<<14 | 0x12<<7 | 0x08,
-	33446 - 19968: jis0208<<14 | 0x0F<<7 | 0x11,
-	33447 - 19968: jis0212<<14 | 0x36<<7 | 0x20,
-	33448 - 19968: jis0212<<14 | 0x36<<7 | 0x21,
-	33449 - 19968: jis0212<<14 | 0x36<<7 | 0x22,
-	33450 - 19968: jis0212<<14 | 0x36<<7 | 0x23,
-	33451 - 19968: jis0208<<14 | 0x46<<7 | 0x4A,
-	33452 - 19968: jis0208<<14 | 0x46<<7 | 0x4D,
-	33453 - 19968: jis0208<<14 | 0x26<<7 | 0x2D,
-	33454 - 19968: jis0212<<14 | 0x36<<7 | 0x24,
-	33455 - 19968: jis0208<<14 | 0x1E<<7 | 0x23,
-	33456 - 19968: jis0212<<14 | 0x36<<7 | 0x25,
-	33457 - 19968: jis0208<<14 | 0x11<<7 | 0x35,
-	33458 - 19968: jis0212<<14 | 0x36<<7 | 0x26,
-	33459 - 19968: jis0208<<14 | 0x2A<<7 | 0x06,
-	33460 - 19968: jis0212<<14 | 0x36<<7 | 0x27,
-	33463 - 19968: jis0212<<14 | 0x36<<7 | 0x28,
-	33464 - 19968: jis0208<<14 | 0x16<<7 | 0x3C,
-	33465 - 19968: jis0208<<14 | 0x15<<7 | 0x3B,
-	33466 - 19968: jis0212<<14 | 0x36<<7 | 0x29,
-	33467 - 19968: jis0208<<14 | 0x46<<7 | 0x4C,
-	33468 - 19968: jis0212<<14 | 0x36<<7 | 0x2A,
-	33469 - 19968: jis0208<<14 | 0x11<<7 | 0x49,
-	33470 - 19968: jis0212<<14 | 0x36<<7 | 0x2B,
-	33471 - 19968: jis0212<<14 | 0x36<<7 | 0x2C,
-	33477 - 19968: jis0208<<14 | 0x13<<7 | 0x02,
-	33478 - 19968: jis0212<<14 | 0x36<<7 | 0x2D,
-	33488 - 19968: jis0212<<14 | 0x36<<7 | 0x2E,
-	33489 - 19968: jis0208<<14 | 0x10<<7 | 0x50,
-	33490 - 19968: jis0208<<14 | 0x46<<7 | 0x51,
-	33491 - 19968: jis0208<<14 | 0x2D<<7 | 0x49,
-	33492 - 19968: jis0208<<14 | 0x21<<7 | 0x3C,
-	33493 - 19968: jis0212<<14 | 0x36<<7 | 0x2F,
-	33495 - 19968: jis0208<<14 | 0x28<<7 | 0x23,
-	33497 - 19968: jis0208<<14 | 0x46<<7 | 0x5D,
-	33498 - 19968: jis0212<<14 | 0x36<<7 | 0x30,
-	33499 - 19968: jis0208<<14 | 0x11<<7 | 0x36,
-	33500 - 19968: jis0208<<14 | 0x46<<7 | 0x5B,
-	33502 - 19968: jis0208<<14 | 0x46<<7 | 0x59,
-	33503 - 19968: jis0208<<14 | 0x46<<7 | 0x50,
-	33504 - 19968: jis0212<<14 | 0x36<<7 | 0x31,
-	33505 - 19968: jis0208<<14 | 0x46<<7 | 0x4E,
-	33506 - 19968: jis0212<<14 | 0x36<<7 | 0x32,
-	33507 - 19968: jis0208<<14 | 0x46<<7 | 0x4F,
-	33508 - 19968: jis0212<<14 | 0x36<<7 | 0x33,
-	33509 - 19968: jis0208<<14 | 0x1B<<7 | 0x42,
-	33510 - 19968: jis0208<<14 | 0x15<<7 | 0x4B,
-	33511 - 19968: jis0208<<14 | 0x22<<7 | 0x56,
-	33512 - 19968: jis0212<<14 | 0x36<<7 | 0x34,
-	33514 - 19968: jis0212<<14 | 0x36<<7 | 0x35,
-	33515 - 19968: jis0208<<14 | 0x25<<7 | 0x30,
-	33517 - 19968: jis0212<<14 | 0x36<<7 | 0x36,
-	33519 - 19968: jis0212<<14 | 0x36<<7 | 0x37,
-	33521 - 19968: jis0208<<14 | 0x10<<7 | 0x30,
-	33523 - 19968: jis0208<<14 | 0x46<<7 | 0x53,
-	33524 - 19968: jis0208<<14 | 0x46<<7 | 0x52,
-	33526 - 19968: jis0212<<14 | 0x36<<7 | 0x38,
-	33527 - 19968: jis0212<<14 | 0x36<<7 | 0x39,
-	33529 - 19968: jis0208<<14 | 0x46<<7 | 0x58,
-	33530 - 19968: jis0208<<14 | 0x46<<7 | 0x54,
-	33531 - 19968: jis0208<<14 | 0x46<<7 | 0x57,
-	33533 - 19968: jis0212<<14 | 0x36<<7 | 0x3A,
-	33534 - 19968: jis0212<<14 | 0x36<<7 | 0x3B,
-	33536 - 19968: jis0212<<14 | 0x36<<7 | 0x3C,
-	33537 - 19968: jis0208<<14 | 0x5A<<7 | 0x36,
-	33538 - 19968: jis0208<<14 | 0x2B<<7 | 0x2F,
-	33539 - 19968: jis0208<<14 | 0x46<<7 | 0x56,
-	33540 - 19968: jis0208<<14 | 0x11<<7 | 0x37,
-	33541 - 19968: jis0208<<14 | 0x12<<7 | 0x5C,
-	33542 - 19968: jis0208<<14 | 0x46<<7 | 0x5A,
-	33543 - 19968: jis0212<<14 | 0x36<<7 | 0x3E,
-	33544 - 19968: jis0212<<14 | 0x36<<7 | 0x3F,
-	33545 - 19968: jis0208<<14 | 0x46<<7 | 0x5C,
-	33546 - 19968: jis0212<<14 | 0x36<<7 | 0x40,
-	33547 - 19968: jis0212<<14 | 0x36<<7 | 0x41,
-	33550 - 19968: jis0208<<14 | 0x16<<7 | 0x33,
-	33558 - 19968: jis0208<<14 | 0x47<<7 | 0x02,
-	33559 - 19968: jis0208<<14 | 0x47<<7 | 0x0B,
-	33560 - 19968: jis0208<<14 | 0x47<<7 | 0x0C,
-	33563 - 19968: jis0212<<14 | 0x36<<7 | 0x43,
-	33564 - 19968: jis0208<<14 | 0x0F<<7 | 0x0A,
-	33565 - 19968: jis0212<<14 | 0x36<<7 | 0x44,
-	33566 - 19968: jis0212<<14 | 0x36<<7 | 0x45,
-	33567 - 19968: jis0212<<14 | 0x36<<7 | 0x46,
-	33569 - 19968: jis0212<<14 | 0x36<<7 | 0x47,
-	33570 - 19968: jis0212<<14 | 0x36<<7 | 0x48,
-	33571 - 19968: jis0208<<14 | 0x47<<7 | 0x13,
-	33576 - 19968: jis0208<<14 | 0x0F<<7 | 0x50,
-	33579 - 19968: jis0208<<14 | 0x47<<7 | 0x0A,
-	33580 - 19968: jis0212<<14 | 0x36<<7 | 0x49,
-	33581 - 19968: jis0212<<14 | 0x36<<7 | 0x4A,
-	33582 - 19968: jis0212<<14 | 0x36<<7 | 0x4B,
-	33583 - 19968: jis0208<<14 | 0x47<<7 | 0x09,
-	33584 - 19968: jis0212<<14 | 0x36<<7 | 0x4C,
-	33585 - 19968: jis0208<<14 | 0x47<<7 | 0x04,
-	33586 - 19968: jis0208<<14 | 0x47<<7 | 0x03,
-	33587 - 19968: jis0212<<14 | 0x36<<7 | 0x4D,
-	33588 - 19968: jis0208<<14 | 0x47<<7 | 0x01,
-	33589 - 19968: jis0208<<14 | 0x47<<7 | 0x00,
-	33590 - 19968: jis0208<<14 | 0x22<<7 | 0x42,
-	33591 - 19968: jis0212<<14 | 0x36<<7 | 0x4E,
-	33592 - 19968: jis0208<<14 | 0x21<<7 | 0x5A,
-	33593 - 19968: jis0208<<14 | 0x47<<7 | 0x06,
-	33594 - 19968: jis0212<<14 | 0x36<<7 | 0x4F,
-	33596 - 19968: jis0212<<14 | 0x36<<7 | 0x50,
-	33597 - 19968: jis0212<<14 | 0x36<<7 | 0x51,
-	33600 - 19968: jis0208<<14 | 0x47<<7 | 0x05,
-	33602 - 19968: jis0212<<14 | 0x36<<7 | 0x52,
-	33603 - 19968: jis0212<<14 | 0x36<<7 | 0x53,
-	33604 - 19968: jis0212<<14 | 0x36<<7 | 0x54,
-	33605 - 19968: jis0208<<14 | 0x47<<7 | 0x08,
-	33607 - 19968: jis0212<<14 | 0x36<<7 | 0x55,
-	33609 - 19968: jis0208<<14 | 0x20<<7 | 0x4F,
-	33610 - 19968: jis0208<<14 | 0x16<<7 | 0x34,
-	33613 - 19968: jis0212<<14 | 0x36<<7 | 0x56,
-	33614 - 19968: jis0212<<14 | 0x36<<7 | 0x57,
-	33615 - 19968: jis0208<<14 | 0x10<<7 | 0x20,
-	33616 - 19968: jis0208<<14 | 0x47<<7 | 0x07,
-	33617 - 19968: jis0212<<14 | 0x36<<7 | 0x58,
-	33618 - 19968: jis0208<<14 | 0x18<<7 | 0x32,
-	33619 - 19968: jis0212<<14 | 0x37<<7 | 0x1D,
-	33620 - 19968: jis0212<<14 | 0x36<<7 | 0x42,
-	33621 - 19968: jis0212<<14 | 0x36<<7 | 0x59,
-	33622 - 19968: jis0212<<14 | 0x36<<7 | 0x5A,
-	33623 - 19968: jis0212<<14 | 0x36<<7 | 0x5B,
-	33624 - 19968: jis0208<<14 | 0x20<<7 | 0x50,
-	33634 - 19968: jis0208<<14 | 0x5A<<7 | 0x37,
-	33648 - 19968: jis0212<<14 | 0x36<<7 | 0x5C,
-	33651 - 19968: jis0208<<14 | 0x47<<7 | 0x19,
-	33653 - 19968: jis0208<<14 | 0x47<<7 | 0x1A,
-	33655 - 19968: jis0208<<14 | 0x11<<7 | 0x38,
-	33656 - 19968: jis0212<<14 | 0x36<<7 | 0x5D,
-	33659 - 19968: jis0208<<14 | 0x11<<7 | 0x0D,
-	33660 - 19968: jis0208<<14 | 0x47<<7 | 0x17,
-	33661 - 19968: jis0212<<14 | 0x37<<7 | 0x00,
-	33663 - 19968: jis0208<<14 | 0x5A<<7 | 0x38,
-	33664 - 19968: jis0212<<14 | 0x37<<7 | 0x02,
-	33666 - 19968: jis0212<<14 | 0x37<<7 | 0x03,
-	33668 - 19968: jis0212<<14 | 0x37<<7 | 0x04,
-	33669 - 19968: jis0208<<14 | 0x47<<7 | 0x0D,
-	33670 - 19968: jis0212<<14 | 0x37<<7 | 0x05,
-	33671 - 19968: jis0208<<14 | 0x47<<7 | 0x15,
-	33673 - 19968: jis0208<<14 | 0x47<<7 | 0x1C,
-	33674 - 19968: jis0208<<14 | 0x47<<7 | 0x16,
-	33677 - 19968: jis0212<<14 | 0x37<<7 | 0x06,
-	33678 - 19968: jis0208<<14 | 0x47<<7 | 0x14,
-	33682 - 19968: jis0212<<14 | 0x37<<7 | 0x07,
-	33683 - 19968: jis0208<<14 | 0x46<<7 | 0x55,
-	33684 - 19968: jis0212<<14 | 0x37<<7 | 0x08,
-	33685 - 19968: jis0212<<14 | 0x37<<7 | 0x09,
-	33686 - 19968: jis0208<<14 | 0x47<<7 | 0x12,
-	33688 - 19968: jis0212<<14 | 0x37<<7 | 0x0A,
-	33689 - 19968: jis0212<<14 | 0x37<<7 | 0x0B,
-	33690 - 19968: jis0208<<14 | 0x47<<7 | 0x0E,
-	33691 - 19968: jis0212<<14 | 0x37<<7 | 0x0C,
-	33692 - 19968: jis0212<<14 | 0x37<<7 | 0x0D,
-	33693 - 19968: jis0212<<14 | 0x37<<7 | 0x0E,
-	33694 - 19968: jis0208<<14 | 0x13<<7 | 0x2F,
-	33695 - 19968: jis0208<<14 | 0x47<<7 | 0x10,
-	33696 - 19968: jis0208<<14 | 0x47<<7 | 0x1B,
-	33698 - 19968: jis0208<<14 | 0x47<<7 | 0x11,
-	33702 - 19968: jis0212<<14 | 0x37<<7 | 0x0F,
-	33703 - 19968: jis0212<<14 | 0x37<<7 | 0x10,
-	33704 - 19968: jis0208<<14 | 0x47<<7 | 0x1D,
-	33705 - 19968: jis0212<<14 | 0x37<<7 | 0x11,
-	33706 - 19968: jis0208<<14 | 0x47<<7 | 0x0F,
-	33707 - 19968: jis0208<<14 | 0x26<<7 | 0x5B,
-	33708 - 19968: jis0212<<14 | 0x37<<7 | 0x12,
-	33709 - 19968: jis0212<<14 | 0x37<<7 | 0x2B,
-	33713 - 19968: jis0208<<14 | 0x2C<<7 | 0x48,
-	33717 - 19968: jis0208<<14 | 0x47<<7 | 0x18,
-	33725 - 19968: jis0208<<14 | 0x47<<7 | 0x2E,
-	33726 - 19968: jis0212<<14 | 0x37<<7 | 0x13,
-	33727 - 19968: jis0212<<14 | 0x37<<7 | 0x14,
-	33728 - 19968: jis0212<<14 | 0x37<<7 | 0x15,
-	33729 - 19968: jis0208<<14 | 0x47<<7 | 0x26,
-	33733 - 19968: jis0208<<14 | 0x1E<<7 | 0x5A,
-	33735 - 19968: jis0208<<14 | 0x5A<<7 | 0x39,
-	33737 - 19968: jis0212<<14 | 0x37<<7 | 0x17,
-	33738 - 19968: jis0208<<14 | 0x14<<7 | 0x25,
-	33740 - 19968: jis0208<<14 | 0x15<<7 | 0x3C,
-	33742 - 19968: jis0208<<14 | 0x47<<7 | 0x21,
-	33743 - 19968: jis0212<<14 | 0x37<<7 | 0x18,
-	33744 - 19968: jis0212<<14 | 0x37<<7 | 0x19,
-	33745 - 19968: jis0212<<14 | 0x37<<7 | 0x1A,
-	33747 - 19968: jis0208<<14 | 0x11<<7 | 0x3A,
-	33748 - 19968: jis0212<<14 | 0x37<<7 | 0x1B,
-	33750 - 19968: jis0208<<14 | 0x1D<<7 | 0x33,
-	33752 - 19968: jis0208<<14 | 0x47<<7 | 0x24,
-	33756 - 19968: jis0208<<14 | 0x19<<7 | 0x39,
-	33757 - 19968: jis0212<<14 | 0x37<<7 | 0x1C,
-	33759 - 19968: jis0208<<14 | 0x24<<7 | 0x30,
-	33760 - 19968: jis0208<<14 | 0x47<<7 | 0x29,
-	33768 - 19968: jis0212<<14 | 0x37<<7 | 0x1E,
-	33769 - 19968: jis0208<<14 | 0x29<<7 | 0x4D,
-	33770 - 19968: jis0212<<14 | 0x37<<7 | 0x1F,
-	33771 - 19968: jis0208<<14 | 0x47<<7 | 0x20,
-	33775 - 19968: jis0208<<14 | 0x11<<7 | 0x39,
-	33776 - 19968: jis0208<<14 | 0x17<<7 | 0x35,
-	33777 - 19968: jis0208<<14 | 0x28<<7 | 0x08,
-	33778 - 19968: jis0208<<14 | 0x47<<7 | 0x2A,
-	33780 - 19968: jis0208<<14 | 0x47<<7 | 0x1E,
-	33782 - 19968: jis0208<<14 | 0x5A<<7 | 0x3A,
-	33783 - 19968: jis0208<<14 | 0x47<<7 | 0x27,
-	33784 - 19968: jis0212<<14 | 0x37<<7 | 0x21,
-	33785 - 19968: jis0212<<14 | 0x37<<7 | 0x22,
-	33787 - 19968: jis0208<<14 | 0x47<<7 | 0x31,
-	33788 - 19968: jis0212<<14 | 0x37<<7 | 0x23,
-	33789 - 19968: jis0208<<14 | 0x47<<7 | 0x22,
-	33793 - 19968: jis0212<<14 | 0x37<<7 | 0x24,
-	33795 - 19968: jis0208<<14 | 0x47<<7 | 0x23,
-	33796 - 19968: jis0208<<14 | 0x25<<7 | 0x19,
-	33798 - 19968: jis0212<<14 | 0x37<<7 | 0x25,
-	33799 - 19968: jis0208<<14 | 0x47<<7 | 0x28,
-	33802 - 19968: jis0212<<14 | 0x37<<7 | 0x26,
-	33803 - 19968: jis0208<<14 | 0x47<<7 | 0x25,
-	33804 - 19968: jis0208<<14 | 0x2A<<7 | 0x07,
-	33805 - 19968: jis0208<<14 | 0x47<<7 | 0x2B,
-	33806 - 19968: jis0208<<14 | 0x0F<<7 | 0x3F,
-	33807 - 19968: jis0212<<14 | 0x37<<7 | 0x27,
-	33809 - 19968: jis0212<<14 | 0x37<<7 | 0x28,
-	33811 - 19968: jis0208<<14 | 0x47<<7 | 0x1F,
-	33813 - 19968: jis0212<<14 | 0x37<<7 | 0x29,
-	33817 - 19968: jis0212<<14 | 0x37<<7 | 0x2A,
-	33824 - 19968: jis0208<<14 | 0x47<<7 | 0x2D,
-	33826 - 19968: jis0208<<14 | 0x47<<7 | 0x2C,
-	33833 - 19968: jis0208<<14 | 0x26<<7 | 0x4A,
-	33834 - 19968: jis0208<<14 | 0x47<<7 | 0x33,
-	33836 - 19968: jis0208<<14 | 0x47<<7 | 0x3E,
-	33839 - 19968: jis0212<<14 | 0x37<<7 | 0x2C,
-	33841 - 19968: jis0208<<14 | 0x12<<7 | 0x5D,
-	33845 - 19968: jis0208<<14 | 0x47<<7 | 0x41,
-	33848 - 19968: jis0208<<14 | 0x47<<7 | 0x2F,
-	33849 - 19968: jis0212<<14 | 0x37<<7 | 0x2D,
-	33852 - 19968: jis0208<<14 | 0x47<<7 | 0x34,
-	33853 - 19968: jis0208<<14 | 0x2C<<7 | 0x4D,
-	33861 - 19968: jis0212<<14 | 0x37<<7 | 0x2E,
-	33862 - 19968: jis0208<<14 | 0x47<<7 | 0x3D,
-	33863 - 19968: jis0212<<14 | 0x37<<7 | 0x2F,
-	33864 - 19968: jis0208<<14 | 0x5A<<7 | 0x3B,
-	33865 - 19968: jis0208<<14 | 0x2C<<7 | 0x34,
-	33866 - 19968: jis0212<<14 | 0x37<<7 | 0x31,
-	33869 - 19968: jis0212<<14 | 0x37<<7 | 0x32,
-	33870 - 19968: jis0208<<14 | 0x2D<<7 | 0x09,
-	33871 - 19968: jis0212<<14 | 0x37<<7 | 0x33,
-	33873 - 19968: jis0212<<14 | 0x37<<7 | 0x34,
-	33874 - 19968: jis0212<<14 | 0x37<<7 | 0x35,
-	33878 - 19968: jis0212<<14 | 0x37<<7 | 0x36,
-	33879 - 19968: jis0208<<14 | 0x22<<7 | 0x57,
-	33880 - 19968: jis0212<<14 | 0x37<<7 | 0x37,
-	33881 - 19968: jis0212<<14 | 0x37<<7 | 0x38,
-	33882 - 19968: jis0212<<14 | 0x37<<7 | 0x39,
-	33883 - 19968: jis0208<<14 | 0x12<<7 | 0x4A,
-	33884 - 19968: jis0212<<14 | 0x37<<7 | 0x3A,
-	33888 - 19968: jis0212<<14 | 0x37<<7 | 0x3B,
-	33889 - 19968: jis0208<<14 | 0x28<<7 | 0x51,
-	33890 - 19968: jis0208<<14 | 0x47<<7 | 0x43,
-	33891 - 19968: jis0208<<14 | 0x25<<7 | 0x00,
-	33892 - 19968: jis0212<<14 | 0x37<<7 | 0x3C,
-	33893 - 19968: jis0212<<14 | 0x37<<7 | 0x3D,
-	33894 - 19968: jis0208<<14 | 0x0F<<7 | 0x10,
-	33895 - 19968: jis0212<<14 | 0x37<<7 | 0x3E,
-	33897 - 19968: jis0208<<14 | 0x47<<7 | 0x3C,
-	33898 - 19968: jis0212<<14 | 0x37<<7 | 0x3F,
-	33899 - 19968: jis0208<<14 | 0x47<<7 | 0x38,
-	33900 - 19968: jis0208<<14 | 0x20<<7 | 0x51,
-	33901 - 19968: jis0208<<14 | 0x47<<7 | 0x32,
-	33902 - 19968: jis0208<<14 | 0x47<<7 | 0x3A,
-	33903 - 19968: jis0208<<14 | 0x47<<7 | 0x3F,
-	33904 - 19968: jis0212<<14 | 0x37<<7 | 0x40,
-	33905 - 19968: jis0208<<14 | 0x26<<7 | 0x0B,
-	33907 - 19968: jis0212<<14 | 0x37<<7 | 0x41,
-	33908 - 19968: jis0212<<14 | 0x37<<7 | 0x42,
-	33909 - 19968: jis0208<<14 | 0x0F<<7 | 0x09,
-	33910 - 19968: jis0212<<14 | 0x37<<7 | 0x43,
-	33911 - 19968: jis0208<<14 | 0x47<<7 | 0x37,
-	33912 - 19968: jis0212<<14 | 0x37<<7 | 0x44,
-	33913 - 19968: jis0208<<14 | 0x47<<7 | 0x40,
-	33914 - 19968: jis0208<<14 | 0x28<<7 | 0x57,
-	33916 - 19968: jis0212<<14 | 0x37<<7 | 0x45,
-	33917 - 19968: jis0212<<14 | 0x37<<7 | 0x46,
-	33921 - 19968: jis0212<<14 | 0x37<<7 | 0x47,
-	33922 - 19968: jis0208<<14 | 0x47<<7 | 0x3B,
-	33924 - 19968: jis0208<<14 | 0x47<<7 | 0x36,
-	33925 - 19968: jis0212<<14 | 0x37<<7 | 0x48,
-	33931 - 19968: jis0208<<14 | 0x1D<<7 | 0x34,
-	33936 - 19968: jis0208<<14 | 0x1C<<7 | 0x0E,
-	33938 - 19968: jis0212<<14 | 0x37<<7 | 0x49,
-	33939 - 19968: jis0212<<14 | 0x37<<7 | 0x4A,
-	33940 - 19968: jis0208<<14 | 0x1B<<7 | 0x0B,
-	33941 - 19968: jis0212<<14 | 0x37<<7 | 0x4B,
-	33945 - 19968: jis0208<<14 | 0x2B<<7 | 0x37,
-	33948 - 19968: jis0208<<14 | 0x28<<7 | 0x26,
-	33950 - 19968: jis0212<<14 | 0x37<<7 | 0x4C,
-	33951 - 19968: jis0208<<14 | 0x47<<7 | 0x46,
-	33953 - 19968: jis0208<<14 | 0x47<<7 | 0x4F,
-	33958 - 19968: jis0212<<14 | 0x37<<7 | 0x4D,
-	33960 - 19968: jis0212<<14 | 0x37<<7 | 0x4E,
-	33961 - 19968: jis0212<<14 | 0x37<<7 | 0x4F,
-	33962 - 19968: jis0212<<14 | 0x37<<7 | 0x50,
-	33965 - 19968: jis0208<<14 | 0x47<<7 | 0x39,
-	33967 - 19968: jis0212<<14 | 0x37<<7 | 0x51,
-	33969 - 19968: jis0212<<14 | 0x37<<7 | 0x52,
-	33970 - 19968: jis0208<<14 | 0x12<<7 | 0x56,
-	33972 - 19968: jis0208<<14 | 0x5A<<7 | 0x3C,
-	33976 - 19968: jis0208<<14 | 0x1D<<7 | 0x57,
-	33977 - 19968: jis0208<<14 | 0x47<<7 | 0x44,
-	33978 - 19968: jis0212<<14 | 0x37<<7 | 0x54,
-	33979 - 19968: jis0208<<14 | 0x47<<7 | 0x49,
-	33980 - 19968: jis0208<<14 | 0x20<<7 | 0x52,
-	33981 - 19968: jis0212<<14 | 0x37<<7 | 0x55,
-	33982 - 19968: jis0212<<14 | 0x37<<7 | 0x56,
-	33983 - 19968: jis0208<<14 | 0x47<<7 | 0x45,
-	33984 - 19968: jis0212<<14 | 0x37<<7 | 0x57,
-	33985 - 19968: jis0208<<14 | 0x47<<7 | 0x4C,
-	33986 - 19968: jis0212<<14 | 0x37<<7 | 0x58,
-	33988 - 19968: jis0208<<14 | 0x22<<7 | 0x3E,
-	33990 - 19968: jis0208<<14 | 0x47<<7 | 0x4D,
-	33991 - 19968: jis0212<<14 | 0x37<<7 | 0x59,
-	33992 - 19968: jis0212<<14 | 0x37<<7 | 0x5A,
-	33993 - 19968: jis0208<<14 | 0x2C<<7 | 0x35,
-	33994 - 19968: jis0208<<14 | 0x47<<7 | 0x42,
-	33995 - 19968: jis0208<<14 | 0x12<<7 | 0x17,
-	33996 - 19968: jis0212<<14 | 0x37<<7 | 0x5B,
-	33997 - 19968: jis0208<<14 | 0x47<<7 | 0x48,
-	33999 - 19968: jis0212<<14 | 0x37<<7 | 0x5C,
-	34000 - 19968: jis0208<<14 | 0x47<<7 | 0x4B,
-	34001 - 19968: jis0208<<14 | 0x2B<<7 | 0x0B,
-	34003 - 19968: jis0212<<14 | 0x37<<7 | 0x5D,
-	34006 - 19968: jis0208<<14 | 0x47<<7 | 0x4E,
-	34009 - 19968: jis0208<<14 | 0x47<<7 | 0x47,
-	34010 - 19968: jis0208<<14 | 0x47<<7 | 0x4A,
-	34012 - 19968: jis0208<<14 | 0x58<<7 | 0x04,
-	34023 - 19968: jis0212<<14 | 0x38<<7 | 0x01,
-	34026 - 19968: jis0212<<14 | 0x38<<7 | 0x02,
-	34028 - 19968: jis0208<<14 | 0x2A<<7 | 0x08,
-	34030 - 19968: jis0208<<14 | 0x2E<<7 | 0x00,
-	34031 - 19968: jis0212<<14 | 0x38<<7 | 0x03,
-	34032 - 19968: jis0212<<14 | 0x38<<7 | 0x04,
-	34033 - 19968: jis0212<<14 | 0x38<<7 | 0x05,
-	34034 - 19968: jis0212<<14 | 0x38<<7 | 0x06,
-	34036 - 19968: jis0208<<14 | 0x47<<7 | 0x52,
-	34039 - 19968: jis0212<<14 | 0x38<<7 | 0x07,
-	34042 - 19968: jis0212<<14 | 0x38<<7 | 0x09,
-	34043 - 19968: jis0212<<14 | 0x38<<7 | 0x0A,
-	34044 - 19968: jis0208<<14 | 0x47<<7 | 0x59,
-	34045 - 19968: jis0212<<14 | 0x38<<7 | 0x0B,
-	34047 - 19968: jis0208<<14 | 0x47<<7 | 0x51,
-	34048 - 19968: jis0208<<14 | 0x1B<<7 | 0x22,
-	34050 - 19968: jis0212<<14 | 0x38<<7 | 0x0C,
-	34051 - 19968: jis0212<<14 | 0x38<<7 | 0x0D,
-	34054 - 19968: jis0208<<14 | 0x47<<7 | 0x30,
-	34055 - 19968: jis0212<<14 | 0x38<<7 | 0x0E,
-	34060 - 19968: jis0212<<14 | 0x38<<7 | 0x0F,
-	34062 - 19968: jis0212<<14 | 0x38<<7 | 0x10,
-	34064 - 19968: jis0212<<14 | 0x38<<7 | 0x11,
-	34065 - 19968: jis0208<<14 | 0x29<<7 | 0x2D,
-	34067 - 19968: jis0208<<14 | 0x2B<<7 | 0x01,
-	34068 - 19968: jis0208<<14 | 0x47<<7 | 0x58,
-	34069 - 19968: jis0208<<14 | 0x47<<7 | 0x57,
-	34071 - 19968: jis0208<<14 | 0x47<<7 | 0x53,
-	34072 - 19968: jis0208<<14 | 0x47<<7 | 0x54,
-	34074 - 19968: jis0208<<14 | 0x10<<7 | 0x15,
-	34076 - 19968: jis0212<<14 | 0x38<<7 | 0x12,
-	34078 - 19968: jis0212<<14 | 0x38<<7 | 0x13,
-	34079 - 19968: jis0208<<14 | 0x47<<7 | 0x56,
-	34081 - 19968: jis0208<<14 | 0x47<<7 | 0x50,
-	34082 - 19968: jis0212<<14 | 0x38<<7 | 0x14,
-	34083 - 19968: jis0212<<14 | 0x38<<7 | 0x15,
-	34084 - 19968: jis0212<<14 | 0x38<<7 | 0x16,
-	34085 - 19968: jis0212<<14 | 0x38<<7 | 0x17,
-	34086 - 19968: jis0208<<14 | 0x23<<7 | 0x34,
-	34087 - 19968: jis0212<<14 | 0x38<<7 | 0x18,
-	34090 - 19968: jis0212<<14 | 0x38<<7 | 0x19,
-	34091 - 19968: jis0212<<14 | 0x38<<7 | 0x1A,
-	34092 - 19968: jis0208<<14 | 0x47<<7 | 0x55,
-	34093 - 19968: jis0208<<14 | 0x0F<<7 | 0x5D,
-	34095 - 19968: jis0212<<14 | 0x38<<7 | 0x1B,
-	34098 - 19968: jis0212<<14 | 0x38<<7 | 0x08,
-	34099 - 19968: jis0212<<14 | 0x38<<7 | 0x1C,
-	34100 - 19968: jis0212<<14 | 0x38<<7 | 0x1D,
-	34101 - 19968: jis0208<<14 | 0x21<<7 | 0x01,
-	34102 - 19968: jis0212<<14 | 0x38<<7 | 0x1E,
-	34109 - 19968: jis0208<<14 | 0x29<<7 | 0x22,
-	34111 - 19968: jis0212<<14 | 0x38<<7 | 0x1F,
-	34112 - 19968: jis0208<<14 | 0x47<<7 | 0x5A,
-	34113 - 19968: jis0208<<14 | 0x48<<7 | 0x00,
-	34115 - 19968: jis0208<<14 | 0x27<<7 | 0x38,
-	34118 - 19968: jis0212<<14 | 0x38<<7 | 0x20,
-	34120 - 19968: jis0208<<14 | 0x47<<7 | 0x5D,
-	34121 - 19968: jis0208<<14 | 0x1D<<7 | 0x35,
-	34122 - 19968: jis0208<<14 | 0x1B<<7 | 0x28,
-	34123 - 19968: jis0208<<14 | 0x48<<7 | 0x02,
-	34126 - 19968: jis0208<<14 | 0x15<<7 | 0x1D,
-	34127 - 19968: jis0212<<14 | 0x38<<7 | 0x21,
-	34128 - 19968: jis0212<<14 | 0x38<<7 | 0x22,
-	34129 - 19968: jis0212<<14 | 0x38<<7 | 0x23,
-	34130 - 19968: jis0212<<14 | 0x38<<7 | 0x24,
-	34131 - 19968: jis0208<<14 | 0x5A<<7 | 0x3D,
-	34133 - 19968: jis0208<<14 | 0x48<<7 | 0x03,
-	34134 - 19968: jis0212<<14 | 0x38<<7 | 0x26,
-	34135 - 19968: jis0208<<14 | 0x28<<7 | 0x58,
-	34136 - 19968: jis0208<<14 | 0x47<<7 | 0x5C,
-	34137 - 19968: jis0208<<14 | 0x5A<<7 | 0x3E,
-	34138 - 19968: jis0208<<14 | 0x47<<7 | 0x35,
-	34140 - 19968: jis0212<<14 | 0x38<<7 | 0x28,
-	34141 - 19968: jis0212<<14 | 0x38<<7 | 0x29,
-	34142 - 19968: jis0212<<14 | 0x38<<7 | 0x2A,
-	34143 - 19968: jis0212<<14 | 0x38<<7 | 0x2B,
-	34144 - 19968: jis0212<<14 | 0x38<<7 | 0x2C,
-	34145 - 19968: jis0212<<14 | 0x38<<7 | 0x2D,
-	34146 - 19968: jis0212<<14 | 0x38<<7 | 0x2E,
-	34147 - 19968: jis0208<<14 | 0x47<<7 | 0x5B,
-	34148 - 19968: jis0212<<14 | 0x38<<7 | 0x2F,
-	34152 - 19968: jis0208<<14 | 0x2E<<7 | 0x2E,
-	34153 - 19968: jis0208<<14 | 0x25<<7 | 0x01,
-	34154 - 19968: jis0208<<14 | 0x28<<7 | 0x52,
-	34155 - 19968: jis0208<<14 | 0x5A<<7 | 0x3F,
-	34157 - 19968: jis0208<<14 | 0x48<<7 | 0x0A,
-	34159 - 19968: jis0212<<14 | 0x38<<7 | 0x31,
-	34167 - 19968: jis0208<<14 | 0x48<<7 | 0x10,
-	34169 - 19968: jis0212<<14 | 0x38<<7 | 0x32,
-	34170 - 19968: jis0212<<14 | 0x38<<7 | 0x33,
-	34171 - 19968: jis0212<<14 | 0x38<<7 | 0x34,
-	34173 - 19968: jis0212<<14 | 0x38<<7 | 0x35,
-	34174 - 19968: jis0208<<14 | 0x48<<7 | 0x11,
-	34175 - 19968: jis0212<<14 | 0x38<<7 | 0x36,
-	34176 - 19968: jis0208<<14 | 0x48<<7 | 0x04,
-	34177 - 19968: jis0212<<14 | 0x38<<7 | 0x37,
-	34180 - 19968: jis0208<<14 | 0x26<<7 | 0x55,
-	34181 - 19968: jis0212<<14 | 0x38<<7 | 0x38,
-	34182 - 19968: jis0212<<14 | 0x38<<7 | 0x39,
-	34183 - 19968: jis0208<<14 | 0x48<<7 | 0x0E,
-	34184 - 19968: jis0208<<14 | 0x48<<7 | 0x06,
-	34185 - 19968: jis0212<<14 | 0x38<<7 | 0x3A,
-	34186 - 19968: jis0208<<14 | 0x48<<7 | 0x08,
-	34187 - 19968: jis0212<<14 | 0x38<<7 | 0x3B,
-	34188 - 19968: jis0212<<14 | 0x38<<7 | 0x3C,
-	34191 - 19968: jis0212<<14 | 0x38<<7 | 0x3D,
-	34192 - 19968: jis0208<<14 | 0x48<<7 | 0x12,
-	34193 - 19968: jis0208<<14 | 0x48<<7 | 0x07,
-	34195 - 19968: jis0212<<14 | 0x38<<7 | 0x3E,
-	34196 - 19968: jis0208<<14 | 0x48<<7 | 0x0B,
-	34199 - 19968: jis0208<<14 | 0x10<<7 | 0x51,
-	34200 - 19968: jis0212<<14 | 0x38<<7 | 0x3F,
-	34201 - 19968: jis0208<<14 | 0x25<<7 | 0x44,
-	34203 - 19968: jis0208<<14 | 0x48<<7 | 0x0C,
-	34204 - 19968: jis0208<<14 | 0x48<<7 | 0x0F,
-	34205 - 19968: jis0212<<14 | 0x38<<7 | 0x40,
-	34207 - 19968: jis0212<<14 | 0x38<<7 | 0x41,
-	34208 - 19968: jis0212<<14 | 0x38<<7 | 0x42,
-	34210 - 19968: jis0212<<14 | 0x38<<7 | 0x43,
-	34212 - 19968: jis0208<<14 | 0x48<<7 | 0x05,
-	34213 - 19968: jis0212<<14 | 0x38<<7 | 0x44,
-	34214 - 19968: jis0208<<14 | 0x20<<7 | 0x05,
-	34215 - 19968: jis0212<<14 | 0x38<<7 | 0x45,
-	34216 - 19968: jis0208<<14 | 0x48<<7 | 0x09,
-	34217 - 19968: jis0208<<14 | 0x1A<<7 | 0x06,
-	34218 - 19968: jis0208<<14 | 0x1E<<7 | 0x24,
-	34219 - 19968: jis0208<<14 | 0x16<<7 | 0x0F,
-	34220 - 19968: jis0208<<14 | 0x2B<<7 | 0x53,
-	34221 - 19968: jis0212<<14 | 0x38<<7 | 0x53,
-	34222 - 19968: jis0208<<14 | 0x2B<<7 | 0x58,
-	34223 - 19968: jis0208<<14 | 0x1C<<7 | 0x51,
-	34224 - 19968: jis0208<<14 | 0x5A<<7 | 0x41,
-	34228 - 19968: jis0212<<14 | 0x38<<7 | 0x46,
-	34230 - 19968: jis0212<<14 | 0x38<<7 | 0x47,
-	34231 - 19968: jis0212<<14 | 0x38<<7 | 0x48,
-	34232 - 19968: jis0212<<14 | 0x38<<7 | 0x49,
-	34233 - 19968: jis0208<<14 | 0x48<<7 | 0x16,
-	34234 - 19968: jis0208<<14 | 0x48<<7 | 0x14,
-	34236 - 19968: jis0212<<14 | 0x38<<7 | 0x4A,
-	34237 - 19968: jis0212<<14 | 0x38<<7 | 0x4B,
-	34238 - 19968: jis0212<<14 | 0x38<<7 | 0x4C,
-	34239 - 19968: jis0212<<14 | 0x38<<7 | 0x4D,
-	34241 - 19968: jis0208<<14 | 0x2E<<7 | 0x2D,
-	34242 - 19968: jis0212<<14 | 0x38<<7 | 0x4E,
-	34247 - 19968: jis0212<<14 | 0x38<<7 | 0x4F,
-	34249 - 19968: jis0208<<14 | 0x48<<7 | 0x13,
-	34250 - 19968: jis0212<<14 | 0x38<<7 | 0x50,
-	34251 - 19968: jis0212<<14 | 0x38<<7 | 0x51,
-	34253 - 19968: jis0208<<14 | 0x2C<<7 | 0x54,
-	34254 - 19968: jis0212<<14 | 0x38<<7 | 0x52,
-	34255 - 19968: jis0208<<14 | 0x48<<7 | 0x15,
-	34256 - 19968: jis0208<<14 | 0x48<<7 | 0x17,
-	34261 - 19968: jis0208<<14 | 0x48<<7 | 0x18,
-	34264 - 19968: jis0212<<14 | 0x38<<7 | 0x54,
-	34266 - 19968: jis0212<<14 | 0x38<<7 | 0x55,
-	34268 - 19968: jis0208<<14 | 0x48<<7 | 0x1B,
-	34269 - 19968: jis0208<<14 | 0x48<<7 | 0x19,
-	34271 - 19968: jis0212<<14 | 0x38<<7 | 0x56,
-	34272 - 19968: jis0212<<14 | 0x38<<7 | 0x57,
-	34276 - 19968: jis0208<<14 | 0x25<<7 | 0x02,
-	34277 - 19968: jis0208<<14 | 0x48<<7 | 0x1A,
-	34278 - 19968: jis0212<<14 | 0x38<<7 | 0x58,
-	34280 - 19968: jis0212<<14 | 0x38<<7 | 0x59,
-	34281 - 19968: jis0208<<14 | 0x27<<7 | 0x2C,
-	34282 - 19968: jis0208<<14 | 0x48<<7 | 0x0D,
-	34285 - 19968: jis0212<<14 | 0x38<<7 | 0x5A,
-	34291 - 19968: jis0212<<14 | 0x38<<7 | 0x5B,
-	34294 - 19968: jis0212<<14 | 0x38<<7 | 0x5C,
-	34295 - 19968: jis0208<<14 | 0x1C<<7 | 0x52,
-	34297 - 19968: jis0208<<14 | 0x48<<7 | 0x1C,
-	34298 - 19968: jis0208<<14 | 0x48<<7 | 0x21,
-	34299 - 19968: jis0208<<14 | 0x20<<7 | 0x53,
-	34300 - 19968: jis0212<<14 | 0x38<<7 | 0x5D,
-	34302 - 19968: jis0208<<14 | 0x48<<7 | 0x20,
-	34303 - 19968: jis0212<<14 | 0x39<<7 | 0x00,
-	34304 - 19968: jis0212<<14 | 0x39<<7 | 0x01,
-	34306 - 19968: jis0208<<14 | 0x48<<7 | 0x01,
-	34308 - 19968: jis0212<<14 | 0x39<<7 | 0x02,
-	34309 - 19968: jis0212<<14 | 0x39<<7 | 0x03,
-	34310 - 19968: jis0208<<14 | 0x48<<7 | 0x22,
-	34311 - 19968: jis0208<<14 | 0x20<<7 | 0x28,
-	34314 - 19968: jis0208<<14 | 0x48<<7 | 0x1D,
-	34315 - 19968: jis0208<<14 | 0x48<<7 | 0x1F,
-	34317 - 19968: jis0212<<14 | 0x39<<7 | 0x04,
-	34318 - 19968: jis0212<<14 | 0x39<<7 | 0x05,
-	34320 - 19968: jis0212<<14 | 0x39<<7 | 0x06,
-	34321 - 19968: jis0212<<14 | 0x39<<7 | 0x07,
-	34322 - 19968: jis0212<<14 | 0x39<<7 | 0x08,
-	34323 - 19968: jis0208<<14 | 0x48<<7 | 0x1E,
-	34326 - 19968: jis0208<<14 | 0x3C<<7 | 0x10,
-	34327 - 19968: jis0208<<14 | 0x3C<<7 | 0x01,
-	34328 - 19968: jis0212<<14 | 0x39<<7 | 0x09,
-	34329 - 19968: jis0212<<14 | 0x39<<7 | 0x0A,
-	34330 - 19968: jis0208<<14 | 0x48<<7 | 0x24,
-	34331 - 19968: jis0212<<14 | 0x39<<7 | 0x0B,
-	34334 - 19968: jis0212<<14 | 0x39<<7 | 0x0C,
-	34337 - 19968: jis0212<<14 | 0x39<<7 | 0x0D,
-	34338 - 19968: jis0208<<14 | 0x48<<7 | 0x23,
-	34343 - 19968: jis0212<<14 | 0x39<<7 | 0x0E,
-	34345 - 19968: jis0212<<14 | 0x39<<7 | 0x0F,
-	34349 - 19968: jis0208<<14 | 0x2C<<7 | 0x55,
-	34351 - 19968: jis0208<<14 | 0x41<<7 | 0x1B,
-	34352 - 19968: jis0208<<14 | 0x48<<7 | 0x25,
-	34358 - 19968: jis0212<<14 | 0x39<<7 | 0x10,
-	34360 - 19968: jis0212<<14 | 0x39<<7 | 0x11,
-	34362 - 19968: jis0212<<14 | 0x39<<7 | 0x12,
-	34364 - 19968: jis0212<<14 | 0x39<<7 | 0x13,
-	34365 - 19968: jis0212<<14 | 0x39<<7 | 0x14,
-	34367 - 19968: jis0208<<14 | 0x48<<7 | 0x26,
-	34368 - 19968: jis0212<<14 | 0x39<<7 | 0x15,
-	34369 - 19968: jis0212<<14 | 0x17<<7 | 0x45,
-	34370 - 19968: jis0212<<14 | 0x39<<7 | 0x16,
-	34374 - 19968: jis0212<<14 | 0x39<<7 | 0x17,
-	34381 - 19968: jis0208<<14 | 0x48<<7 | 0x27,
-	34382 - 19968: jis0208<<14 | 0x17<<7 | 0x36,
-	34384 - 19968: jis0208<<14 | 0x14<<7 | 0x33,
-	34386 - 19968: jis0212<<14 | 0x39<<7 | 0x18,
-	34387 - 19968: jis0212<<14 | 0x39<<7 | 0x19,
-	34388 - 19968: jis0208<<14 | 0x48<<7 | 0x29,
-	34389 - 19968: jis0208<<14 | 0x30<<7 | 0x3C,
-	34390 - 19968: jis0212<<14 | 0x39<<7 | 0x1A,
-	34391 - 19968: jis0212<<14 | 0x39<<7 | 0x1B,
-	34392 - 19968: jis0212<<14 | 0x39<<7 | 0x1C,
-	34393 - 19968: jis0212<<14 | 0x39<<7 | 0x1D,
-	34394 - 19968: jis0208<<14 | 0x14<<7 | 0x54,
-	34396 - 19968: jis0208<<14 | 0x2D<<7 | 0x19,
-	34397 - 19968: jis0212<<14 | 0x39<<7 | 0x1E,
-	34398 - 19968: jis0208<<14 | 0x15<<7 | 0x52,
-	34399 - 19968: jis0208<<14 | 0x48<<7 | 0x2A,
-	34400 - 19968: jis0212<<14 | 0x39<<7 | 0x1F,
-	34401 - 19968: jis0212<<14 | 0x39<<7 | 0x20,
-	34402 - 19968: jis0212<<14 | 0x39<<7 | 0x21,
-	34403 - 19968: jis0212<<14 | 0x39<<7 | 0x22,
-	34404 - 19968: jis0212<<14 | 0x39<<7 | 0x23,
-	34407 - 19968: jis0208<<14 | 0x48<<7 | 0x2B,
-	34409 - 19968: jis0212<<14 | 0x39<<7 | 0x24,
-	34411 - 19968: jis0208<<14 | 0x22<<7 | 0x4D,
-	34412 - 19968: jis0212<<14 | 0x39<<7 | 0x25,
-	34415 - 19968: jis0212<<14 | 0x39<<7 | 0x26,
-	34417 - 19968: jis0208<<14 | 0x48<<7 | 0x2C,
-	34421 - 19968: jis0212<<14 | 0x39<<7 | 0x27,
-	34422 - 19968: jis0212<<14 | 0x39<<7 | 0x28,
-	34423 - 19968: jis0212<<14 | 0x39<<7 | 0x29,
-	34425 - 19968: jis0208<<14 | 0x25<<7 | 0x59,
-	34426 - 19968: jis0212<<14 | 0x39<<7 | 0x2A,
-	34427 - 19968: jis0208<<14 | 0x0F<<7 | 0x19,
-	34440 - 19968: jis0212<<14 | 0x39<<7 | 0x4C,
-	34442 - 19968: jis0208<<14 | 0x11<<7 | 0x42,
-	34443 - 19968: jis0208<<14 | 0x48<<7 | 0x31,
-	34444 - 19968: jis0208<<14 | 0x48<<7 | 0x32,
-	34445 - 19968: jis0212<<14 | 0x39<<7 | 0x2B,
-	34449 - 19968: jis0212<<14 | 0x39<<7 | 0x2C,
-	34451 - 19968: jis0208<<14 | 0x48<<7 | 0x2D,
-	34453 - 19968: jis0208<<14 | 0x1A<<7 | 0x1C,
-	34454 - 19968: jis0212<<14 | 0x39<<7 | 0x2D,
-	34456 - 19968: jis0212<<14 | 0x39<<7 | 0x2E,
-	34458 - 19968: jis0212<<14 | 0x39<<7 | 0x2F,
-	34460 - 19968: jis0212<<14 | 0x39<<7 | 0x30,
-	34465 - 19968: jis0212<<14 | 0x39<<7 | 0x31,
-	34467 - 19968: jis0208<<14 | 0x48<<7 | 0x2E,
-	34468 - 19968: jis0208<<14 | 0x26<<7 | 0x21,
-	34470 - 19968: jis0212<<14 | 0x39<<7 | 0x32,
-	34471 - 19968: jis0212<<14 | 0x39<<7 | 0x33,
-	34472 - 19968: jis0212<<14 | 0x39<<7 | 0x34,
-	34473 - 19968: jis0208<<14 | 0x48<<7 | 0x2F,
-	34474 - 19968: jis0208<<14 | 0x48<<7 | 0x30,
-	34475 - 19968: jis0208<<14 | 0x48<<7 | 0x3A,
-	34477 - 19968: jis0212<<14 | 0x39<<7 | 0x35,
-	34479 - 19968: jis0208<<14 | 0x48<<7 | 0x34,
-	34480 - 19968: jis0208<<14 | 0x48<<7 | 0x37,
-	34481 - 19968: jis0212<<14 | 0x39<<7 | 0x36,
-	34483 - 19968: jis0212<<14 | 0x39<<7 | 0x37,
-	34484 - 19968: jis0212<<14 | 0x39<<7 | 0x38,
-	34485 - 19968: jis0212<<14 | 0x39<<7 | 0x39,
-	34486 - 19968: jis0208<<14 | 0x48<<7 | 0x33,
-	34487 - 19968: jis0212<<14 | 0x39<<7 | 0x3A,
-	34488 - 19968: jis0212<<14 | 0x39<<7 | 0x3B,
-	34489 - 19968: jis0212<<14 | 0x39<<7 | 0x3C,
-	34495 - 19968: jis0212<<14 | 0x39<<7 | 0x3D,
-	34496 - 19968: jis0212<<14 | 0x39<<7 | 0x3E,
-	34497 - 19968: jis0212<<14 | 0x39<<7 | 0x3F,
-	34499 - 19968: jis0212<<14 | 0x39<<7 | 0x40,
-	34500 - 19968: jis0208<<14 | 0x48<<7 | 0x35,
-	34501 - 19968: jis0212<<14 | 0x39<<7 | 0x41,
-	34502 - 19968: jis0208<<14 | 0x48<<7 | 0x36,
-	34503 - 19968: jis0208<<14 | 0x1B<<7 | 0x37,
-	34505 - 19968: jis0208<<14 | 0x48<<7 | 0x38,
-	34507 - 19968: jis0208<<14 | 0x22<<7 | 0x20,
-	34509 - 19968: jis0208<<14 | 0x16<<7 | 0x35,
-	34510 - 19968: jis0208<<14 | 0x12<<7 | 0x21,
-	34513 - 19968: jis0212<<14 | 0x39<<7 | 0x42,
-	34514 - 19968: jis0212<<14 | 0x39<<7 | 0x43,
-	34516 - 19968: jis0208<<14 | 0x48<<7 | 0x3B,
-	34517 - 19968: jis0212<<14 | 0x39<<7 | 0x44,
-	34519 - 19968: jis0212<<14 | 0x39<<7 | 0x45,
-	34521 - 19968: jis0208<<14 | 0x12<<7 | 0x1E,
-	34522 - 19968: jis0212<<14 | 0x39<<7 | 0x46,
-	34523 - 19968: jis0208<<14 | 0x48<<7 | 0x40,
-	34524 - 19968: jis0212<<14 | 0x39<<7 | 0x47,
-	34526 - 19968: jis0208<<14 | 0x48<<7 | 0x3C,
-	34527 - 19968: jis0208<<14 | 0x48<<7 | 0x3F,
-	34528 - 19968: jis0212<<14 | 0x39<<7 | 0x48,
-	34531 - 19968: jis0212<<14 | 0x39<<7 | 0x49,
-	34532 - 19968: jis0208<<14 | 0x27<<7 | 0x19,
-	34533 - 19968: jis0212<<14 | 0x39<<7 | 0x4A,
-	34535 - 19968: jis0212<<14 | 0x39<<7 | 0x4B,
-	34537 - 19968: jis0208<<14 | 0x48<<7 | 0x3D,
-	34540 - 19968: jis0208<<14 | 0x48<<7 | 0x3E,
-	34541 - 19968: jis0208<<14 | 0x28<<7 | 0x27,
-	34542 - 19968: jis0208<<14 | 0x27<<7 | 0x39,
-	34543 - 19968: jis0208<<14 | 0x48<<7 | 0x41,
-	34552 - 19968: jis0208<<14 | 0x21<<7 | 0x5C,
-	34553 - 19968: jis0208<<14 | 0x48<<7 | 0x4B,
-	34554 - 19968: jis0212<<14 | 0x39<<7 | 0x4D,
-	34555 - 19968: jis0208<<14 | 0x48<<7 | 0x47,
-	34556 - 19968: jis0212<<14 | 0x39<<7 | 0x4E,
-	34557 - 19968: jis0212<<14 | 0x39<<7 | 0x4F,
-	34558 - 19968: jis0208<<14 | 0x11<<7 | 0x4A,
-	34560 - 19968: jis0208<<14 | 0x48<<7 | 0x45,
-	34562 - 19968: jis0208<<14 | 0x2A<<7 | 0x09,
-	34563 - 19968: jis0208<<14 | 0x48<<7 | 0x46,
-	34564 - 19968: jis0212<<14 | 0x39<<7 | 0x50,
-	34565 - 19968: jis0212<<14 | 0x39<<7 | 0x51,
-	34566 - 19968: jis0208<<14 | 0x48<<7 | 0x43,
-	34567 - 19968: jis0212<<14 | 0x39<<7 | 0x52,
-	34568 - 19968: jis0208<<14 | 0x48<<7 | 0x44,
-	34569 - 19968: jis0208<<14 | 0x48<<7 | 0x49,
-	34570 - 19968: jis0208<<14 | 0x48<<7 | 0x4C,
-	34571 - 19968: jis0212<<14 | 0x39<<7 | 0x53,
-	34573 - 19968: jis0208<<14 | 0x48<<7 | 0x4A,
-	34574 - 19968: jis0212<<14 | 0x39<<7 | 0x54,
-	34575 - 19968: jis0212<<14 | 0x39<<7 | 0x55,
-	34576 - 19968: jis0212<<14 | 0x39<<7 | 0x56,
-	34577 - 19968: jis0208<<14 | 0x48<<7 | 0x48,
-	34578 - 19968: jis0208<<14 | 0x48<<7 | 0x42,
-	34579 - 19968: jis0212<<14 | 0x39<<7 | 0x57,
-	34580 - 19968: jis0212<<14 | 0x39<<7 | 0x58,
-	34584 - 19968: jis0208<<14 | 0x22<<7 | 0x37,
-	34585 - 19968: jis0212<<14 | 0x39<<7 | 0x59,
-	34586 - 19968: jis0208<<14 | 0x48<<7 | 0x53,
-	34588 - 19968: jis0208<<14 | 0x2B<<7 | 0x09,
-	34590 - 19968: jis0212<<14 | 0x39<<7 | 0x5A,
-	34591 - 19968: jis0212<<14 | 0x39<<7 | 0x5B,
-	34593 - 19968: jis0212<<14 | 0x39<<7 | 0x5C,
-	34595 - 19968: jis0212<<14 | 0x39<<7 | 0x5D,
-	34597 - 19968: jis0208<<14 | 0x48<<7 | 0x51,
-	34600 - 19968: jis0212<<14 | 0x3A<<7 | 0x00,
-	34601 - 19968: jis0208<<14 | 0x48<<7 | 0x52,
-	34606 - 19968: jis0212<<14 | 0x3A<<7 | 0x01,
-	34607 - 19968: jis0212<<14 | 0x3A<<7 | 0x02,
-	34609 - 19968: jis0212<<14 | 0x3A<<7 | 0x03,
-	34610 - 19968: jis0212<<14 | 0x3A<<7 | 0x04,
-	34612 - 19968: jis0208<<14 | 0x48<<7 | 0x4D,
-	34615 - 19968: jis0208<<14 | 0x48<<7 | 0x4F,
-	34617 - 19968: jis0212<<14 | 0x3A<<7 | 0x05,
-	34618 - 19968: jis0212<<14 | 0x3A<<7 | 0x06,
-	34619 - 19968: jis0208<<14 | 0x48<<7 | 0x50,
-	34620 - 19968: jis0212<<14 | 0x3A<<7 | 0x07,
-	34621 - 19968: jis0212<<14 | 0x3A<<7 | 0x08,
-	34622 - 19968: jis0212<<14 | 0x3A<<7 | 0x09,
-	34623 - 19968: jis0208<<14 | 0x48<<7 | 0x4E,
-	34624 - 19968: jis0212<<14 | 0x3A<<7 | 0x0A,
-	34627 - 19968: jis0212<<14 | 0x3A<<7 | 0x0B,
-	34629 - 19968: jis0212<<14 | 0x3A<<7 | 0x0C,
-	34633 - 19968: jis0208<<14 | 0x1F<<7 | 0x45,
-	34635 - 19968: jis0208<<14 | 0x2E<<7 | 0x18,
-	34636 - 19968: jis0208<<14 | 0x48<<7 | 0x57,
-	34637 - 19968: jis0212<<14 | 0x3A<<7 | 0x0D,
-	34638 - 19968: jis0208<<14 | 0x48<<7 | 0x58,
-	34643 - 19968: jis0208<<14 | 0x49<<7 | 0x00,
-	34645 - 19968: jis0208<<14 | 0x1E<<7 | 0x09,
-	34647 - 19968: jis0208<<14 | 0x48<<7 | 0x5A,
-	34648 - 19968: jis0212<<14 | 0x3A<<7 | 0x0E,
-	34649 - 19968: jis0208<<14 | 0x48<<7 | 0x5D,
-	34653 - 19968: jis0212<<14 | 0x3A<<7 | 0x0F,
-	34655 - 19968: jis0208<<14 | 0x48<<7 | 0x55,
-	34656 - 19968: jis0208<<14 | 0x48<<7 | 0x54,
-	34657 - 19968: jis0212<<14 | 0x3A<<7 | 0x10,
-	34659 - 19968: jis0208<<14 | 0x49<<7 | 0x01,
-	34660 - 19968: jis0212<<14 | 0x3A<<7 | 0x11,
-	34661 - 19968: jis0212<<14 | 0x3A<<7 | 0x12,
-	34662 - 19968: jis0208<<14 | 0x11<<7 | 0x3B,
-	34664 - 19968: jis0208<<14 | 0x48<<7 | 0x5B,
-	34666 - 19968: jis0208<<14 | 0x49<<7 | 0x02,
-	34670 - 19968: jis0208<<14 | 0x48<<7 | 0x5C,
-	34671 - 19968: jis0212<<14 | 0x3A<<7 | 0x13,
-	34673 - 19968: jis0212<<14 | 0x3A<<7 | 0x14,
-	34674 - 19968: jis0212<<14 | 0x3A<<7 | 0x15,
-	34676 - 19968: jis0208<<14 | 0x48<<7 | 0x59,
-	34678 - 19968: jis0208<<14 | 0x23<<7 | 0x12,
-	34680 - 19968: jis0208<<14 | 0x48<<7 | 0x56,
-	34683 - 19968: jis0212<<14 | 0x3A<<7 | 0x16,
-	34687 - 19968: jis0208<<14 | 0x26<<7 | 0x47,
-	34690 - 19968: jis0208<<14 | 0x49<<7 | 0x06,
-	34691 - 19968: jis0212<<14 | 0x3A<<7 | 0x17,
-	34692 - 19968: jis0212<<14 | 0x3A<<7 | 0x18,
-	34693 - 19968: jis0212<<14 | 0x3A<<7 | 0x19,
-	34694 - 19968: jis0212<<14 | 0x3A<<7 | 0x1A,
-	34695 - 19968: jis0212<<14 | 0x3A<<7 | 0x1B,
-	34696 - 19968: jis0212<<14 | 0x3A<<7 | 0x1C,
-	34697 - 19968: jis0212<<14 | 0x3A<<7 | 0x1D,
-	34699 - 19968: jis0212<<14 | 0x3A<<7 | 0x1E,
-	34700 - 19968: jis0212<<14 | 0x3A<<7 | 0x1F,
-	34701 - 19968: jis0208<<14 | 0x2C<<7 | 0x1A,
-	34704 - 19968: jis0212<<14 | 0x3A<<7 | 0x20,
-	34707 - 19968: jis0212<<14 | 0x3A<<7 | 0x21,
-	34709 - 19968: jis0212<<14 | 0x3A<<7 | 0x22,
-	34711 - 19968: jis0212<<14 | 0x3A<<7 | 0x23,
-	34712 - 19968: jis0212<<14 | 0x3A<<7 | 0x24,
-	34713 - 19968: jis0212<<14 | 0x3A<<7 | 0x25,
-	34718 - 19968: jis0212<<14 | 0x3A<<7 | 0x26,
-	34719 - 19968: jis0208<<14 | 0x49<<7 | 0x05,
-	34720 - 19968: jis0212<<14 | 0x3A<<7 | 0x27,
-	34722 - 19968: jis0208<<14 | 0x49<<7 | 0x04,
-	34723 - 19968: jis0212<<14 | 0x3A<<7 | 0x28,
-	34727 - 19968: jis0212<<14 | 0x3A<<7 | 0x29,
-	34731 - 19968: jis0208<<14 | 0x49<<7 | 0x0D,
-	34732 - 19968: jis0212<<14 | 0x3A<<7 | 0x2A,
-	34733 - 19968: jis0212<<14 | 0x3A<<7 | 0x2B,
-	34734 - 19968: jis0212<<14 | 0x3A<<7 | 0x2C,
-	34735 - 19968: jis0208<<14 | 0x49<<7 | 0x07,
-	34737 - 19968: jis0212<<14 | 0x3A<<7 | 0x2D,
-	34739 - 19968: jis0208<<14 | 0x49<<7 | 0x0F,
-	34741 - 19968: jis0212<<14 | 0x3A<<7 | 0x2E,
-	34746 - 19968: jis0208<<14 | 0x2C<<7 | 0x45,
-	34747 - 19968: jis0208<<14 | 0x49<<7 | 0x12,
-	34749 - 19968: jis0208<<14 | 0x49<<7 | 0x09,
-	34750 - 19968: jis0212<<14 | 0x3A<<7 | 0x2F,
-	34751 - 19968: jis0212<<14 | 0x3A<<7 | 0x30,
-	34752 - 19968: jis0208<<14 | 0x49<<7 | 0x0A,
-	34753 - 19968: jis0212<<14 | 0x3A<<7 | 0x31,
-	34756 - 19968: jis0208<<14 | 0x49<<7 | 0x0E,
-	34758 - 19968: jis0208<<14 | 0x49<<7 | 0x11,
-	34759 - 19968: jis0208<<14 | 0x49<<7 | 0x10,
-	34760 - 19968: jis0212<<14 | 0x3A<<7 | 0x32,
-	34761 - 19968: jis0212<<14 | 0x3A<<7 | 0x33,
-	34762 - 19968: jis0212<<14 | 0x3A<<7 | 0x34,
-	34763 - 19968: jis0208<<14 | 0x49<<7 | 0x08,
-	34766 - 19968: jis0212<<14 | 0x3A<<7 | 0x35,
-	34768 - 19968: jis0208<<14 | 0x49<<7 | 0x0B,
-	34770 - 19968: jis0208<<14 | 0x49<<7 | 0x1C,
-	34773 - 19968: jis0212<<14 | 0x3A<<7 | 0x36,
-	34774 - 19968: jis0212<<14 | 0x3A<<7 | 0x37,
-	34777 - 19968: jis0212<<14 | 0x3A<<7 | 0x38,
-	34778 - 19968: jis0212<<14 | 0x3A<<7 | 0x39,
-	34780 - 19968: jis0212<<14 | 0x3A<<7 | 0x3A,
-	34783 - 19968: jis0212<<14 | 0x3A<<7 | 0x3B,
-	34784 - 19968: jis0208<<14 | 0x49<<7 | 0x15,
-	34786 - 19968: jis0212<<14 | 0x3A<<7 | 0x3C,
-	34787 - 19968: jis0212<<14 | 0x3A<<7 | 0x3D,
-	34788 - 19968: jis0212<<14 | 0x3A<<7 | 0x3E,
-	34794 - 19968: jis0212<<14 | 0x3A<<7 | 0x3F,
-	34795 - 19968: jis0212<<14 | 0x3A<<7 | 0x40,
-	34797 - 19968: jis0212<<14 | 0x3A<<7 | 0x41,
-	34799 - 19968: jis0208<<14 | 0x49<<7 | 0x13,
-	34801 - 19968: jis0212<<14 | 0x3A<<7 | 0x42,
-	34802 - 19968: jis0208<<14 | 0x49<<7 | 0x14,
-	34803 - 19968: jis0212<<14 | 0x3A<<7 | 0x43,
-	34806 - 19968: jis0208<<14 | 0x49<<7 | 0x19,
-	34807 - 19968: jis0208<<14 | 0x49<<7 | 0x1A,
-	34808 - 19968: jis0212<<14 | 0x3A<<7 | 0x44,
-	34809 - 19968: jis0208<<14 | 0x12<<7 | 0x09,
-	34810 - 19968: jis0212<<14 | 0x3A<<7 | 0x45,
-	34811 - 19968: jis0208<<14 | 0x14<<7 | 0x21,
-	34814 - 19968: jis0208<<14 | 0x49<<7 | 0x18,
-	34815 - 19968: jis0212<<14 | 0x3A<<7 | 0x46,
-	34817 - 19968: jis0212<<14 | 0x3A<<7 | 0x47,
-	34819 - 19968: jis0212<<14 | 0x3A<<7 | 0x48,
-	34821 - 19968: jis0208<<14 | 0x49<<7 | 0x03,
-	34822 - 19968: jis0212<<14 | 0x3A<<7 | 0x49,
-	34823 - 19968: jis0208<<14 | 0x5A<<7 | 0x44,
-	34825 - 19968: jis0212<<14 | 0x3A<<7 | 0x4A,
-	34826 - 19968: jis0212<<14 | 0x3A<<7 | 0x4B,
-	34827 - 19968: jis0212<<14 | 0x3A<<7 | 0x4C,
-	34829 - 19968: jis0208<<14 | 0x49<<7 | 0x17,
-	34830 - 19968: jis0208<<14 | 0x49<<7 | 0x1B,
-	34831 - 19968: jis0208<<14 | 0x49<<7 | 0x16,
-	34832 - 19968: jis0212<<14 | 0x3A<<7 | 0x4D,
-	34833 - 19968: jis0208<<14 | 0x49<<7 | 0x1D,
-	34834 - 19968: jis0212<<14 | 0x3A<<7 | 0x4F,
-	34835 - 19968: jis0212<<14 | 0x3A<<7 | 0x50,
-	34836 - 19968: jis0212<<14 | 0x3A<<7 | 0x51,
-	34837 - 19968: jis0208<<14 | 0x49<<7 | 0x1F,
-	34838 - 19968: jis0208<<14 | 0x49<<7 | 0x1E,
-	34840 - 19968: jis0212<<14 | 0x3A<<7 | 0x52,
-	34841 - 19968: jis0212<<14 | 0x3A<<7 | 0x4E,
-	34842 - 19968: jis0212<<14 | 0x3A<<7 | 0x53,
-	34843 - 19968: jis0212<<14 | 0x3A<<7 | 0x54,
-	34844 - 19968: jis0212<<14 | 0x3A<<7 | 0x55,
-	34846 - 19968: jis0212<<14 | 0x3A<<7 | 0x56,
-	34847 - 19968: jis0212<<14 | 0x3A<<7 | 0x57,
-	34849 - 19968: jis0208<<14 | 0x49<<7 | 0x21,
-	34850 - 19968: jis0208<<14 | 0x49<<7 | 0x20,
-	34851 - 19968: jis0208<<14 | 0x48<<7 | 0x39,
-	34855 - 19968: jis0208<<14 | 0x49<<7 | 0x25,
-	34856 - 19968: jis0212<<14 | 0x3A<<7 | 0x58,
-	34861 - 19968: jis0212<<14 | 0x3A<<7 | 0x59,
-	34862 - 19968: jis0212<<14 | 0x3A<<7 | 0x5A,
-	34864 - 19968: jis0212<<14 | 0x3A<<7 | 0x5B,
-	34865 - 19968: jis0208<<14 | 0x49<<7 | 0x22,
-	34866 - 19968: jis0212<<14 | 0x3A<<7 | 0x5C,
-	34869 - 19968: jis0212<<14 | 0x3A<<7 | 0x5D,
-	34870 - 19968: jis0208<<14 | 0x49<<7 | 0x23,
-	34873 - 19968: jis0208<<14 | 0x49<<7 | 0x24,
-	34874 - 19968: jis0212<<14 | 0x3B<<7 | 0x00,
-	34875 - 19968: jis0208<<14 | 0x49<<7 | 0x26,
-	34876 - 19968: jis0212<<14 | 0x3B<<7 | 0x01,
-	34880 - 19968: jis0208<<14 | 0x16<<7 | 0x4B,
-	34881 - 19968: jis0212<<14 | 0x3B<<7 | 0x02,
-	34882 - 19968: jis0208<<14 | 0x49<<7 | 0x28,
-	34883 - 19968: jis0212<<14 | 0x3B<<7 | 0x03,
-	34884 - 19968: jis0208<<14 | 0x49<<7 | 0x27,
-	34885 - 19968: jis0212<<14 | 0x3B<<7 | 0x04,
-	34886 - 19968: jis0208<<14 | 0x1C<<7 | 0x0F,
-	34888 - 19968: jis0212<<14 | 0x3B<<7 | 0x05,
-	34889 - 19968: jis0212<<14 | 0x3B<<7 | 0x06,
-	34890 - 19968: jis0212<<14 | 0x3B<<7 | 0x07,
-	34891 - 19968: jis0212<<14 | 0x3B<<7 | 0x08,
-	34892 - 19968: jis0208<<14 | 0x18<<7 | 0x33,
-	34893 - 19968: jis0208<<14 | 0x3D<<7 | 0x06,
-	34894 - 19968: jis0212<<14 | 0x3B<<7 | 0x09,
-	34897 - 19968: jis0212<<14 | 0x3B<<7 | 0x0A,
-	34898 - 19968: jis0208<<14 | 0x49<<7 | 0x29,
-	34899 - 19968: jis0208<<14 | 0x1C<<7 | 0x30,
-	34901 - 19968: jis0212<<14 | 0x3B<<7 | 0x0B,
-	34902 - 19968: jis0212<<14 | 0x3B<<7 | 0x0C,
-	34903 - 19968: jis0208<<14 | 0x12<<7 | 0x18,
-	34904 - 19968: jis0212<<14 | 0x3B<<7 | 0x0D,
-	34905 - 19968: jis0208<<14 | 0x49<<7 | 0x2A,
-	34906 - 19968: jis0212<<14 | 0x3B<<7 | 0x0E,
-	34907 - 19968: jis0208<<14 | 0x10<<7 | 0x31,
-	34908 - 19968: jis0212<<14 | 0x3B<<7 | 0x0F,
-	34909 - 19968: jis0208<<14 | 0x1D<<7 | 0x36,
-	34910 - 19968: jis0208<<14 | 0x49<<7 | 0x2B,
-	34911 - 19968: jis0212<<14 | 0x3B<<7 | 0x10,
-	34912 - 19968: jis0212<<14 | 0x3B<<7 | 0x11,
-	34913 - 19968: jis0208<<14 | 0x18<<7 | 0x34,
-	34914 - 19968: jis0208<<14 | 0x49<<7 | 0x2C,
-	34915 - 19968: jis0208<<14 | 0x0F<<7 | 0x40,
-	34916 - 19968: jis0212<<14 | 0x3B<<7 | 0x12,
-	34920 - 19968: jis0208<<14 | 0x28<<7 | 0x1C,
-	34921 - 19968: jis0212<<14 | 0x3B<<7 | 0x13,
-	34923 - 19968: jis0208<<14 | 0x49<<7 | 0x2D,
-	34928 - 19968: jis0208<<14 | 0x1E<<7 | 0x49,
-	34929 - 19968: jis0212<<14 | 0x3B<<7 | 0x14,
-	34930 - 19968: jis0208<<14 | 0x49<<7 | 0x34,
-	34933 - 19968: jis0208<<14 | 0x49<<7 | 0x31,
-	34935 - 19968: jis0208<<14 | 0x22<<7 | 0x4E,
-	34937 - 19968: jis0212<<14 | 0x3B<<7 | 0x15,
-	34939 - 19968: jis0212<<14 | 0x3B<<7 | 0x16,
-	34941 - 19968: jis0208<<14 | 0x49<<7 | 0x32,
-	34942 - 19968: jis0208<<14 | 0x49<<7 | 0x2F,
-	34943 - 19968: jis0208<<14 | 0x15<<7 | 0x3D,
-	34944 - 19968: jis0212<<14 | 0x3B<<7 | 0x17,
-	34945 - 19968: jis0208<<14 | 0x49<<7 | 0x2E,
-	34946 - 19968: jis0208<<14 | 0x49<<7 | 0x35,
-	34952 - 19968: jis0208<<14 | 0x16<<7 | 0x15,
-	34955 - 19968: jis0208<<14 | 0x21<<7 | 0x3D,
-	34957 - 19968: jis0208<<14 | 0x49<<7 | 0x3B,
-	34962 - 19968: jis0208<<14 | 0x49<<7 | 0x37,
-	34966 - 19968: jis0208<<14 | 0x21<<7 | 0x14,
-	34967 - 19968: jis0208<<14 | 0x49<<7 | 0x36,
-	34968 - 19968: jis0212<<14 | 0x3B<<7 | 0x18,
-	34969 - 19968: jis0208<<14 | 0x49<<7 | 0x39,
-	34970 - 19968: jis0212<<14 | 0x3B<<7 | 0x19,
-	34971 - 19968: jis0212<<14 | 0x3B<<7 | 0x1A,
-	34972 - 19968: jis0212<<14 | 0x3B<<7 | 0x1B,
-	34974 - 19968: jis0208<<14 | 0x49<<7 | 0x30,
-	34975 - 19968: jis0212<<14 | 0x3B<<7 | 0x1C,
-	34976 - 19968: jis0212<<14 | 0x3B<<7 | 0x1D,
-	34978 - 19968: jis0208<<14 | 0x49<<7 | 0x3A,
-	34980 - 19968: jis0208<<14 | 0x49<<7 | 0x3C,
-	34984 - 19968: jis0212<<14 | 0x3B<<7 | 0x1E,
-	34986 - 19968: jis0212<<14 | 0x3B<<7 | 0x1F,
-	34987 - 19968: jis0208<<14 | 0x27<<7 | 0x4E,
-	34990 - 19968: jis0208<<14 | 0x49<<7 | 0x38,
-	34992 - 19968: jis0208<<14 | 0x49<<7 | 0x3D,
-	34993 - 19968: jis0208<<14 | 0x49<<7 | 0x3F,
-	34996 - 19968: jis0208<<14 | 0x17<<7 | 0x32,
-	34997 - 19968: jis0208<<14 | 0x49<<7 | 0x33,
-	34999 - 19968: jis0208<<14 | 0x0F<<7 | 0x20,
-	35002 - 19968: jis0212<<14 | 0x3B<<7 | 0x20,
-	35005 - 19968: jis0212<<14 | 0x3B<<7 | 0x21,
-	35006 - 19968: jis0212<<14 | 0x3B<<7 | 0x22,
-	35007 - 19968: jis0208<<14 | 0x49<<7 | 0x3E,
-	35008 - 19968: jis0212<<14 | 0x3B<<7 | 0x23,
-	35009 - 19968: jis0208<<14 | 0x19<<7 | 0x3A,
-	35010 - 19968: jis0208<<14 | 0x2D<<7 | 0x55,
-	35011 - 19968: jis0208<<14 | 0x49<<7 | 0x40,
-	35012 - 19968: jis0208<<14 | 0x49<<7 | 0x41,
-	35013 - 19968: jis0208<<14 | 0x20<<7 | 0x54,
-	35018 - 19968: jis0212<<14 | 0x3B<<7 | 0x24,
-	35019 - 19968: jis0212<<14 | 0x3B<<7 | 0x25,
-	35020 - 19968: jis0212<<14 | 0x3B<<7 | 0x26,
-	35021 - 19968: jis0212<<14 | 0x3B<<7 | 0x27,
-	35022 - 19968: jis0212<<14 | 0x3B<<7 | 0x28,
-	35023 - 19968: jis0208<<14 | 0x2D<<7 | 0x01,
-	35025 - 19968: jis0212<<14 | 0x3B<<7 | 0x29,
-	35026 - 19968: jis0212<<14 | 0x3B<<7 | 0x2A,
-	35027 - 19968: jis0212<<14 | 0x3B<<7 | 0x2B,
-	35028 - 19968: jis0208<<14 | 0x49<<7 | 0x42,
-	35029 - 19968: jis0208<<14 | 0x2C<<7 | 0x14,
-	35032 - 19968: jis0208<<14 | 0x49<<7 | 0x43,
-	35033 - 19968: jis0208<<14 | 0x49<<7 | 0x44,
-	35035 - 19968: jis0212<<14 | 0x3B<<7 | 0x2C,
-	35036 - 19968: jis0208<<14 | 0x29<<7 | 0x43,
-	35037 - 19968: jis0208<<14 | 0x49<<7 | 0x45,
-	35038 - 19968: jis0212<<14 | 0x3B<<7 | 0x2D,
-	35039 - 19968: jis0208<<14 | 0x19<<7 | 0x1F,
-	35041 - 19968: jis0208<<14 | 0x2D<<7 | 0x02,
-	35047 - 19968: jis0212<<14 | 0x3B<<7 | 0x2E,
-	35048 - 19968: jis0208<<14 | 0x49<<7 | 0x4A,
-	35055 - 19968: jis0212<<14 | 0x3B<<7 | 0x2F,
-	35056 - 19968: jis0212<<14 | 0x3B<<7 | 0x30,
-	35057 - 19968: jis0212<<14 | 0x3B<<7 | 0x31,
-	35058 - 19968: jis0208<<14 | 0x49<<7 | 0x4B,
-	35059 - 19968: jis0208<<14 | 0x1D<<7 | 0x37,
-	35060 - 19968: jis0208<<14 | 0x49<<7 | 0x49,
-	35061 - 19968: jis0208<<14 | 0x5A<<7 | 0x45,
-	35063 - 19968: jis0212<<14 | 0x3B<<7 | 0x33,
-	35064 - 19968: jis0208<<14 | 0x2C<<7 | 0x46,
-	35065 - 19968: jis0208<<14 | 0x49<<7 | 0x46,
-	35068 - 19968: jis0208<<14 | 0x49<<7 | 0x48,
-	35069 - 19968: jis0208<<14 | 0x1F<<7 | 0x1C,
-	35070 - 19968: jis0208<<14 | 0x1E<<7 | 0x5D,
-	35073 - 19968: jis0212<<14 | 0x3B<<7 | 0x34,
-	35074 - 19968: jis0208<<14 | 0x49<<7 | 0x47,
-	35076 - 19968: jis0208<<14 | 0x49<<7 | 0x4C,
-	35078 - 19968: jis0212<<14 | 0x3B<<7 | 0x35,
-	35079 - 19968: jis0208<<14 | 0x29<<7 | 0x02,
-	35082 - 19968: jis0208<<14 | 0x49<<7 | 0x4E,
-	35084 - 19968: jis0208<<14 | 0x49<<7 | 0x4D,
-	35085 - 19968: jis0212<<14 | 0x3B<<7 | 0x36,
-	35086 - 19968: jis0212<<14 | 0x3B<<7 | 0x37,
-	35087 - 19968: jis0212<<14 | 0x3B<<7 | 0x38,
-	35088 - 19968: jis0208<<14 | 0x12<<7 | 0x4B,
-	35090 - 19968: jis0208<<14 | 0x2A<<7 | 0x0A,
-	35091 - 19968: jis0208<<14 | 0x49<<7 | 0x4F,
-	35093 - 19968: jis0212<<14 | 0x3B<<7 | 0x39,
-	35094 - 19968: jis0212<<14 | 0x3B<<7 | 0x3A,
-	35096 - 19968: jis0212<<14 | 0x3B<<7 | 0x3B,
-	35097 - 19968: jis0212<<14 | 0x3B<<7 | 0x3C,
-	35098 - 19968: jis0212<<14 | 0x3B<<7 | 0x3D,
-	35100 - 19968: jis0208<<14 | 0x58<<7 | 0x01,
-	35101 - 19968: jis0208<<14 | 0x49<<7 | 0x5B,
-	35102 - 19968: jis0208<<14 | 0x49<<7 | 0x51,
-	35104 - 19968: jis0212<<14 | 0x3B<<7 | 0x3F,
-	35109 - 19968: jis0208<<14 | 0x49<<7 | 0x52,
-	35110 - 19968: jis0212<<14 | 0x3B<<7 | 0x40,
-	35111 - 19968: jis0212<<14 | 0x3B<<7 | 0x41,
-	35112 - 19968: jis0212<<14 | 0x3B<<7 | 0x42,
-	35114 - 19968: jis0208<<14 | 0x49<<7 | 0x53,
-	35115 - 19968: jis0208<<14 | 0x49<<7 | 0x54,
-	35120 - 19968: jis0212<<14 | 0x3B<<7 | 0x43,
-	35121 - 19968: jis0212<<14 | 0x3B<<7 | 0x44,
-	35122 - 19968: jis0212<<14 | 0x3B<<7 | 0x45,
-	35125 - 19968: jis0212<<14 | 0x3B<<7 | 0x46,
-	35126 - 19968: jis0208<<14 | 0x49<<7 | 0x58,
-	35128 - 19968: jis0208<<14 | 0x49<<7 | 0x59,
-	35129 - 19968: jis0212<<14 | 0x3B<<7 | 0x47,
-	35130 - 19968: jis0212<<14 | 0x3B<<7 | 0x48,
-	35131 - 19968: jis0208<<14 | 0x49<<7 | 0x57,
-	35134 - 19968: jis0212<<14 | 0x3B<<7 | 0x49,
-	35136 - 19968: jis0212<<14 | 0x3B<<7 | 0x4A,
-	35137 - 19968: jis0208<<14 | 0x49<<7 | 0x55,
-	35138 - 19968: jis0212<<14 | 0x3B<<7 | 0x4B,
-	35139 - 19968: jis0208<<14 | 0x49<<7 | 0x50,
-	35140 - 19968: jis0208<<14 | 0x49<<7 | 0x56,
-	35141 - 19968: jis0212<<14 | 0x3B<<7 | 0x4C,
-	35142 - 19968: jis0212<<14 | 0x3B<<7 | 0x4D,
-	35145 - 19968: jis0212<<14 | 0x3B<<7 | 0x4E,
-	35148 - 19968: jis0208<<14 | 0x49<<7 | 0x5A,
-	35149 - 19968: jis0208<<14 | 0x4F<<7 | 0x16,
-	35151 - 19968: jis0212<<14 | 0x3B<<7 | 0x4F,
-	35154 - 19968: jis0212<<14 | 0x3B<<7 | 0x50,
-	35158 - 19968: jis0208<<14 | 0x11<<7 | 0x07,
-	35159 - 19968: jis0212<<14 | 0x3B<<7 | 0x51,
-	35162 - 19968: jis0212<<14 | 0x3B<<7 | 0x52,
-	35163 - 19968: jis0212<<14 | 0x3B<<7 | 0x53,
-	35164 - 19968: jis0212<<14 | 0x3B<<7 | 0x54,
-	35166 - 19968: jis0208<<14 | 0x49<<7 | 0x5D,
-	35167 - 19968: jis0208<<14 | 0x15<<7 | 0x3E,
-	35168 - 19968: jis0208<<14 | 0x49<<7 | 0x5C,
-	35169 - 19968: jis0212<<14 | 0x3B<<7 | 0x55,
-	35170 - 19968: jis0212<<14 | 0x3B<<7 | 0x56,
-	35171 - 19968: jis0212<<14 | 0x3B<<7 | 0x57,
-	35172 - 19968: jis0208<<14 | 0x4A<<7 | 0x01,
-	35174 - 19968: jis0208<<14 | 0x4A<<7 | 0x00,
-	35178 - 19968: jis0208<<14 | 0x4A<<7 | 0x03,
-	35179 - 19968: jis0212<<14 | 0x3B<<7 | 0x58,
-	35181 - 19968: jis0208<<14 | 0x4A<<7 | 0x02,
-	35182 - 19968: jis0212<<14 | 0x3B<<7 | 0x59,
-	35183 - 19968: jis0208<<14 | 0x4A<<7 | 0x04,
-	35184 - 19968: jis0212<<14 | 0x3B<<7 | 0x5A,
-	35186 - 19968: jis0208<<14 | 0x1C<<7 | 0x10,
-	35187 - 19968: jis0212<<14 | 0x3B<<7 | 0x5B,
-	35188 - 19968: jis0208<<14 | 0x4A<<7 | 0x05,
-	35189 - 19968: jis0212<<14 | 0x3B<<7 | 0x5C,
-	35191 - 19968: jis0208<<14 | 0x4A<<7 | 0x06,
-	35194 - 19968: jis0212<<14 | 0x3B<<7 | 0x5D,
-	35195 - 19968: jis0212<<14 | 0x3C<<7 | 0x00,
-	35196 - 19968: jis0212<<14 | 0x3C<<7 | 0x01,
-	35197 - 19968: jis0212<<14 | 0x3C<<7 | 0x02,
-	35198 - 19968: jis0208<<14 | 0x4A<<7 | 0x07,
-	35199 - 19968: jis0208<<14 | 0x1F<<7 | 0x1D,
-	35201 - 19968: jis0208<<14 | 0x2C<<7 | 0x36,
-	35203 - 19968: jis0208<<14 | 0x4A<<7 | 0x08,
-	35206 - 19968: jis0208<<14 | 0x29<<7 | 0x03,
-	35207 - 19968: jis0208<<14 | 0x26<<7 | 0x25,
-	35208 - 19968: jis0208<<14 | 0x4A<<7 | 0x09,
-	35209 - 19968: jis0212<<14 | 0x3C<<7 | 0x03,
-	35210 - 19968: jis0208<<14 | 0x4A<<7 | 0x0A,
-	35211 - 19968: jis0208<<14 | 0x17<<7 | 0x0A,
-	35213 - 19968: jis0212<<14 | 0x3C<<7 | 0x04,
-	35215 - 19968: jis0208<<14 | 0x14<<7 | 0x0B,
-	35216 - 19968: jis0212<<14 | 0x3C<<7 | 0x05,
-	35219 - 19968: jis0208<<14 | 0x4A<<7 | 0x0B,
-	35220 - 19968: jis0212<<14 | 0x3C<<7 | 0x06,
-	35221 - 19968: jis0212<<14 | 0x3C<<7 | 0x07,
-	35222 - 19968: jis0208<<14 | 0x1A<<7 | 0x4A,
-	35223 - 19968: jis0208<<14 | 0x26<<7 | 0x20,
-	35224 - 19968: jis0208<<14 | 0x4A<<7 | 0x0C,
-	35226 - 19968: jis0208<<14 | 0x12<<7 | 0x2F,
-	35227 - 19968: jis0212<<14 | 0x3C<<7 | 0x08,
-	35228 - 19968: jis0212<<14 | 0x3C<<7 | 0x09,
-	35231 - 19968: jis0212<<14 | 0x3C<<7 | 0x0A,
-	35232 - 19968: jis0212<<14 | 0x3C<<7 | 0x0B,
-	35233 - 19968: jis0208<<14 | 0x4A<<7 | 0x0D,
-	35237 - 19968: jis0212<<14 | 0x3C<<7 | 0x0C,
-	35238 - 19968: jis0208<<14 | 0x4A<<7 | 0x0F,
-	35239 - 19968: jis0208<<14 | 0x2C<<7 | 0x56,
-	35241 - 19968: jis0208<<14 | 0x4A<<7 | 0x0E,
-	35242 - 19968: jis0208<<14 | 0x1E<<7 | 0x25,
-	35244 - 19968: jis0208<<14 | 0x4A<<7 | 0x10,
-	35247 - 19968: jis0208<<14 | 0x4A<<7 | 0x11,
-	35248 - 19968: jis0212<<14 | 0x3C<<7 | 0x0D,
-	35250 - 19968: jis0208<<14 | 0x4A<<7 | 0x12,
-	35251 - 19968: jis0208<<14 | 0x13<<7 | 0x30,
-	35252 - 19968: jis0212<<14 | 0x3C<<7 | 0x0E,
-	35253 - 19968: jis0212<<14 | 0x3C<<7 | 0x0F,
-	35254 - 19968: jis0212<<14 | 0x3C<<7 | 0x10,
-	35255 - 19968: jis0212<<14 | 0x3C<<7 | 0x11,
-	35258 - 19968: jis0208<<14 | 0x4A<<7 | 0x13,
-	35260 - 19968: jis0212<<14 | 0x3C<<7 | 0x12,
-	35261 - 19968: jis0208<<14 | 0x4A<<7 | 0x14,
-	35263 - 19968: jis0208<<14 | 0x4A<<7 | 0x15,
-	35264 - 19968: jis0208<<14 | 0x4A<<7 | 0x16,
-	35282 - 19968: jis0208<<14 | 0x12<<7 | 0x30,
-	35284 - 19968: jis0212<<14 | 0x3C<<7 | 0x13,
-	35285 - 19968: jis0212<<14 | 0x3C<<7 | 0x14,
-	35286 - 19968: jis0212<<14 | 0x3C<<7 | 0x15,
-	35287 - 19968: jis0212<<14 | 0x3C<<7 | 0x16,
-	35288 - 19968: jis0212<<14 | 0x3C<<7 | 0x17,
-	35290 - 19968: jis0208<<14 | 0x4A<<7 | 0x17,
-	35292 - 19968: jis0208<<14 | 0x4A<<7 | 0x18,
-	35293 - 19968: jis0208<<14 | 0x4A<<7 | 0x19,
-	35299 - 19968: jis0208<<14 | 0x11<<7 | 0x51,
-	35301 - 19968: jis0212<<14 | 0x3C<<7 | 0x18,
-	35302 - 19968: jis0208<<14 | 0x1E<<7 | 0x07,
-	35303 - 19968: jis0208<<14 | 0x4A<<7 | 0x1A,
-	35305 - 19968: jis0212<<14 | 0x3C<<7 | 0x19,
-	35307 - 19968: jis0212<<14 | 0x3C<<7 | 0x1A,
-	35309 - 19968: jis0212<<14 | 0x3C<<7 | 0x1B,
-	35313 - 19968: jis0212<<14 | 0x3C<<7 | 0x1C,
-	35315 - 19968: jis0212<<14 | 0x3C<<7 | 0x1D,
-	35316 - 19968: jis0208<<14 | 0x4A<<7 | 0x1B,
-	35318 - 19968: jis0212<<14 | 0x3C<<7 | 0x1E,
-	35320 - 19968: jis0208<<14 | 0x4A<<7 | 0x1C,
-	35321 - 19968: jis0212<<14 | 0x3C<<7 | 0x1F,
-	35325 - 19968: jis0212<<14 | 0x3C<<7 | 0x20,
-	35327 - 19968: jis0212<<14 | 0x3C<<7 | 0x21,
-	35328 - 19968: jis0208<<14 | 0x17<<7 | 0x1F,
-	35330 - 19968: jis0208<<14 | 0x23<<7 | 0x5A,
-	35331 - 19968: jis0208<<14 | 0x4A<<7 | 0x1D,
-	35332 - 19968: jis0212<<14 | 0x3C<<7 | 0x22,
-	35333 - 19968: jis0212<<14 | 0x3C<<7 | 0x23,
-	35335 - 19968: jis0212<<14 | 0x3C<<7 | 0x24,
-	35336 - 19968: jis0208<<14 | 0x16<<7 | 0x36,
-	35338 - 19968: jis0208<<14 | 0x1E<<7 | 0x35,
-	35340 - 19968: jis0208<<14 | 0x4A<<7 | 0x20,
-	35342 - 19968: jis0208<<14 | 0x25<<7 | 0x03,
-	35343 - 19968: jis0212<<14 | 0x3C<<7 | 0x25,
-	35344 - 19968: jis0208<<14 | 0x4A<<7 | 0x1F,
-	35345 - 19968: jis0212<<14 | 0x3C<<7 | 0x26,
-	35346 - 19968: jis0208<<14 | 0x5A<<7 | 0x46,
-	35347 - 19968: jis0208<<14 | 0x16<<7 | 0x10,
-	35348 - 19968: jis0212<<14 | 0x3C<<7 | 0x28,
-	35349 - 19968: jis0212<<14 | 0x3C<<7 | 0x29,
-	35350 - 19968: jis0208<<14 | 0x4A<<7 | 0x1E,
-	35351 - 19968: jis0208<<14 | 0x21<<7 | 0x56,
-	35352 - 19968: jis0208<<14 | 0x14<<7 | 0x0C,
-	35355 - 19968: jis0208<<14 | 0x4A<<7 | 0x21,
-	35357 - 19968: jis0208<<14 | 0x4A<<7 | 0x22,
-	35358 - 19968: jis0212<<14 | 0x3C<<7 | 0x2A,
-	35359 - 19968: jis0208<<14 | 0x1D<<7 | 0x38,
-	35360 - 19968: jis0212<<14 | 0x3C<<7 | 0x2B,
-	35362 - 19968: jis0212<<14 | 0x3C<<7 | 0x2C,
-	35363 - 19968: jis0208<<14 | 0x16<<7 | 0x4C,
-	35364 - 19968: jis0212<<14 | 0x3C<<7 | 0x2D,
-	35365 - 19968: jis0208<<14 | 0x4A<<7 | 0x23,
-	35366 - 19968: jis0212<<14 | 0x3C<<7 | 0x2E,
-	35370 - 19968: jis0208<<14 | 0x2A<<7 | 0x0B,
-	35371 - 19968: jis0212<<14 | 0x3C<<7 | 0x2F,
-	35372 - 19968: jis0212<<14 | 0x3C<<7 | 0x30,
-	35373 - 19968: jis0208<<14 | 0x1F<<7 | 0x3E,
-	35375 - 19968: jis0212<<14 | 0x3C<<7 | 0x31,
-	35377 - 19968: jis0208<<14 | 0x14<<7 | 0x55,
-	35379 - 19968: jis0208<<14 | 0x2B<<7 | 0x54,
-	35380 - 19968: jis0208<<14 | 0x20<<7 | 0x29,
-	35381 - 19968: jis0212<<14 | 0x3C<<7 | 0x32,
-	35382 - 19968: jis0208<<14 | 0x4A<<7 | 0x24,
-	35383 - 19968: jis0208<<14 | 0x5A<<7 | 0x47,
-	35386 - 19968: jis0208<<14 | 0x1E<<7 | 0x26,
-	35387 - 19968: jis0208<<14 | 0x22<<7 | 0x4F,
-	35388 - 19968: jis0208<<14 | 0x1D<<7 | 0x39,
-	35389 - 19968: jis0212<<14 | 0x3C<<7 | 0x34,
-	35390 - 19968: jis0212<<14 | 0x3C<<7 | 0x35,
-	35392 - 19968: jis0212<<14 | 0x3C<<7 | 0x36,
-	35393 - 19968: jis0208<<14 | 0x4A<<7 | 0x25,
-	35395 - 19968: jis0212<<14 | 0x3C<<7 | 0x37,
-	35397 - 19968: jis0212<<14 | 0x3C<<7 | 0x38,
-	35398 - 19968: jis0208<<14 | 0x4A<<7 | 0x28,
-	35399 - 19968: jis0212<<14 | 0x3C<<7 | 0x39,
-	35400 - 19968: jis0208<<14 | 0x4A<<7 | 0x29,
-	35401 - 19968: jis0212<<14 | 0x3C<<7 | 0x3A,
-	35405 - 19968: jis0212<<14 | 0x3C<<7 | 0x3B,
-	35406 - 19968: jis0212<<14 | 0x3C<<7 | 0x3C,
-	35408 - 19968: jis0208<<14 | 0x19<<7 | 0x1D,
-	35409 - 19968: jis0208<<14 | 0x21<<7 | 0x21,
-	35410 - 19968: jis0208<<14 | 0x4A<<7 | 0x27,
-	35411 - 19968: jis0212<<14 | 0x3C<<7 | 0x3D,
-	35412 - 19968: jis0208<<14 | 0x1D<<7 | 0x3A,
-	35413 - 19968: jis0208<<14 | 0x28<<7 | 0x1D,
-	35414 - 19968: jis0212<<14 | 0x3C<<7 | 0x3E,
-	35415 - 19968: jis0212<<14 | 0x3C<<7 | 0x3F,
-	35416 - 19968: jis0212<<14 | 0x3C<<7 | 0x40,
-	35419 - 19968: jis0208<<14 | 0x4A<<7 | 0x26,
-	35420 - 19968: jis0212<<14 | 0x3C<<7 | 0x41,
-	35421 - 19968: jis0212<<14 | 0x3C<<7 | 0x42,
-	35422 - 19968: jis0208<<14 | 0x1A<<7 | 0x4B,
-	35424 - 19968: jis0208<<14 | 0x10<<7 | 0x32,
-	35425 - 19968: jis0212<<14 | 0x3C<<7 | 0x43,
-	35426 - 19968: jis0208<<14 | 0x4A<<7 | 0x2D,
-	35427 - 19968: jis0208<<14 | 0x16<<7 | 0x37,
-	35429 - 19968: jis0212<<14 | 0x3C<<7 | 0x44,
-	35430 - 19968: jis0208<<14 | 0x1A<<7 | 0x4D,
-	35431 - 19968: jis0212<<14 | 0x3C<<7 | 0x45,
-	35433 - 19968: jis0208<<14 | 0x1A<<7 | 0x4C,
-	35435 - 19968: jis0208<<14 | 0x2E<<7 | 0x2C,
-	35436 - 19968: jis0208<<14 | 0x4A<<7 | 0x2C,
-	35437 - 19968: jis0208<<14 | 0x4A<<7 | 0x2B,
-	35438 - 19968: jis0208<<14 | 0x20<<7 | 0x06,
-	35440 - 19968: jis0208<<14 | 0x14<<7 | 0x2C,
-	35441 - 19968: jis0208<<14 | 0x2E<<7 | 0x22,
-	35442 - 19968: jis0208<<14 | 0x12<<7 | 0x19,
-	35443 - 19968: jis0208<<14 | 0x1D<<7 | 0x3B,
-	35445 - 19968: jis0212<<14 | 0x3C<<7 | 0x46,
-	35446 - 19968: jis0212<<14 | 0x3C<<7 | 0x47,
-	35447 - 19968: jis0212<<14 | 0x3C<<7 | 0x48,
-	35449 - 19968: jis0208<<14 | 0x5A<<7 | 0x48,
-	35450 - 19968: jis0212<<14 | 0x3C<<7 | 0x4A,
-	35451 - 19968: jis0212<<14 | 0x3C<<7 | 0x4B,
-	35452 - 19968: jis0208<<14 | 0x4A<<7 | 0x2A,
-	35454 - 19968: jis0212<<14 | 0x3C<<7 | 0x4C,
-	35455 - 19968: jis0212<<14 | 0x3C<<7 | 0x4D,
-	35456 - 19968: jis0212<<14 | 0x3C<<7 | 0x4E,
-	35458 - 19968: jis0208<<14 | 0x4A<<7 | 0x2F,
-	35459 - 19968: jis0212<<14 | 0x3C<<7 | 0x4F,
-	35460 - 19968: jis0208<<14 | 0x4A<<7 | 0x30,
-	35461 - 19968: jis0208<<14 | 0x4A<<7 | 0x2E,
-	35462 - 19968: jis0212<<14 | 0x3C<<7 | 0x50,
-	35463 - 19968: jis0208<<14 | 0x17<<7 | 0x37,
-	35465 - 19968: jis0208<<14 | 0x2C<<7 | 0x1F,
-	35467 - 19968: jis0212<<14 | 0x3C<<7 | 0x51,
-	35468 - 19968: jis0208<<14 | 0x1A<<7 | 0x4E,
-	35469 - 19968: jis0208<<14 | 0x26<<7 | 0x06,
-	35471 - 19968: jis0212<<14 | 0x3C<<7 | 0x52,
-	35472 - 19968: jis0212<<14 | 0x3C<<7 | 0x53,
-	35473 - 19968: jis0208<<14 | 0x4A<<7 | 0x33,
-	35474 - 19968: jis0212<<14 | 0x3C<<7 | 0x54,
-	35475 - 19968: jis0208<<14 | 0x1F<<7 | 0x1F,
-	35477 - 19968: jis0208<<14 | 0x22<<7 | 0x21,
-	35478 - 19968: jis0212<<14 | 0x3C<<7 | 0x55,
-	35479 - 19968: jis0212<<14 | 0x3C<<7 | 0x56,
-	35480 - 19968: jis0208<<14 | 0x2C<<7 | 0x15,
-	35481 - 19968: jis0212<<14 | 0x3C<<7 | 0x57,
-	35482 - 19968: jis0208<<14 | 0x4A<<7 | 0x36,
-	35486 - 19968: jis0208<<14 | 0x17<<7 | 0x4B,
-	35487 - 19968: jis0212<<14 | 0x3C<<7 | 0x58,
-	35488 - 19968: jis0208<<14 | 0x1F<<7 | 0x1E,
-	35489 - 19968: jis0208<<14 | 0x4A<<7 | 0x32,
-	35491 - 19968: jis0208<<14 | 0x4A<<7 | 0x37,
-	35492 - 19968: jis0208<<14 | 0x17<<7 | 0x4C,
-	35493 - 19968: jis0208<<14 | 0x4A<<7 | 0x34,
-	35494 - 19968: jis0208<<14 | 0x4A<<7 | 0x35,
-	35495 - 19968: jis0208<<14 | 0x5A<<7 | 0x49,
-	35496 - 19968: jis0208<<14 | 0x4A<<7 | 0x31,
-	35497 - 19968: jis0212<<14 | 0x3C<<7 | 0x5A,
-	35500 - 19968: jis0208<<14 | 0x1F<<7 | 0x41,
-	35501 - 19968: jis0208<<14 | 0x25<<7 | 0x28,
-	35502 - 19968: jis0212<<14 | 0x3C<<7 | 0x5B,
-	35503 - 19968: jis0212<<14 | 0x3C<<7 | 0x5C,
-	35504 - 19968: jis0208<<14 | 0x22<<7 | 0x0E,
-	35506 - 19968: jis0208<<14 | 0x11<<7 | 0x3C,
-	35507 - 19968: jis0212<<14 | 0x3C<<7 | 0x5D,
-	35510 - 19968: jis0212<<14 | 0x3D<<7 | 0x00,
-	35511 - 19968: jis0212<<14 | 0x3D<<7 | 0x01,
-	35513 - 19968: jis0208<<14 | 0x27<<7 | 0x4F,
-	35515 - 19968: jis0212<<14 | 0x3D<<7 | 0x02,
-	35516 - 19968: jis0208<<14 | 0x14<<7 | 0x22,
-	35518 - 19968: jis0208<<14 | 0x5A<<7 | 0x4A,
-	35519 - 19968: jis0208<<14 | 0x23<<7 | 0x13,
-	35522 - 19968: jis0208<<14 | 0x4A<<7 | 0x3A,
-	35523 - 19968: jis0212<<14 | 0x3D<<7 | 0x04,
-	35524 - 19968: jis0208<<14 | 0x4A<<7 | 0x38,
-	35526 - 19968: jis0212<<14 | 0x3D<<7 | 0x05,
-	35527 - 19968: jis0208<<14 | 0x22<<7 | 0x2B,
-	35528 - 19968: jis0212<<14 | 0x3D<<7 | 0x06,
-	35529 - 19968: jis0212<<14 | 0x3D<<7 | 0x07,
-	35530 - 19968: jis0212<<14 | 0x3D<<7 | 0x08,
-	35531 - 19968: jis0208<<14 | 0x1F<<7 | 0x20,
-	35532 - 19968: jis0208<<14 | 0x13<<7 | 0x31,
-	35533 - 19968: jis0208<<14 | 0x4A<<7 | 0x39,
-	35535 - 19968: jis0208<<14 | 0x1E<<7 | 0x3A,
-	35537 - 19968: jis0212<<14 | 0x3D<<7 | 0x09,
-	35538 - 19968: jis0208<<14 | 0x2D<<7 | 0x29,
-	35539 - 19968: jis0212<<14 | 0x3D<<7 | 0x0A,
-	35540 - 19968: jis0212<<14 | 0x3D<<7 | 0x0B,
-	35541 - 19968: jis0212<<14 | 0x3D<<7 | 0x0C,
-	35542 - 19968: jis0208<<14 | 0x2E<<7 | 0x1F,
-	35543 - 19968: jis0212<<14 | 0x3D<<7 | 0x0D,
-	35546 - 19968: jis0208<<14 | 0x4A<<7 | 0x3B,
-	35547 - 19968: jis0208<<14 | 0x4A<<7 | 0x46,
-	35548 - 19968: jis0208<<14 | 0x23<<7 | 0x14,
-	35549 - 19968: jis0212<<14 | 0x3D<<7 | 0x0E,
-	35550 - 19968: jis0208<<14 | 0x4A<<7 | 0x45,
-	35551 - 19968: jis0208<<14 | 0x5A<<7 | 0x4B,
-	35552 - 19968: jis0208<<14 | 0x4A<<7 | 0x42,
-	35553 - 19968: jis0208<<14 | 0x4A<<7 | 0x4A,
-	35554 - 19968: jis0208<<14 | 0x4A<<7 | 0x43,
-	35556 - 19968: jis0208<<14 | 0x4A<<7 | 0x3F,
-	35558 - 19968: jis0208<<14 | 0x23<<7 | 0x5B,
-	35559 - 19968: jis0208<<14 | 0x4A<<7 | 0x3E,
-	35563 - 19968: jis0208<<14 | 0x4A<<7 | 0x3C,
-	35564 - 19968: jis0212<<14 | 0x3D<<7 | 0x10,
-	35565 - 19968: jis0208<<14 | 0x2C<<7 | 0x00,
-	35566 - 19968: jis0208<<14 | 0x1A<<7 | 0x4F,
-	35568 - 19968: jis0212<<14 | 0x3D<<7 | 0x11,
-	35569 - 19968: jis0208<<14 | 0x4A<<7 | 0x40,
-	35571 - 19968: jis0208<<14 | 0x4A<<7 | 0x3D,
-	35572 - 19968: jis0212<<14 | 0x3D<<7 | 0x12,
-	35573 - 19968: jis0212<<14 | 0x3D<<7 | 0x13,
-	35574 - 19968: jis0208<<14 | 0x5A<<7 | 0x4D,
-	35575 - 19968: jis0208<<14 | 0x4A<<7 | 0x44,
-	35576 - 19968: jis0208<<14 | 0x1C<<7 | 0x53,
-	35578 - 19968: jis0208<<14 | 0x17<<7 | 0x20,
-	35580 - 19968: jis0212<<14 | 0x3D<<7 | 0x15,
-	35582 - 19968: jis0208<<14 | 0x21<<7 | 0x59,
-	35583 - 19968: jis0212<<14 | 0x3D<<7 | 0x16,
-	35584 - 19968: jis0208<<14 | 0x2A<<7 | 0x24,
-	35585 - 19968: jis0208<<14 | 0x10<<7 | 0x39,
-	35586 - 19968: jis0208<<14 | 0x0F<<7 | 0x41,
-	35588 - 19968: jis0208<<14 | 0x25<<7 | 0x04,
-	35589 - 19968: jis0212<<14 | 0x3D<<7 | 0x17,
-	35590 - 19968: jis0212<<14 | 0x3D<<7 | 0x18,
-	35591 - 19968: jis0208<<14 | 0x4A<<7 | 0x48,
-	35594 - 19968: jis0212<<14 | 0x3D<<7 | 0x1E,
-	35595 - 19968: jis0212<<14 | 0x3D<<7 | 0x19,
-	35596 - 19968: jis0208<<14 | 0x4A<<7 | 0x47,
-	35598 - 19968: jis0208<<14 | 0x25<<7 | 0x45,
-	35600 - 19968: jis0208<<14 | 0x4A<<7 | 0x4C,
-	35601 - 19968: jis0212<<14 | 0x3D<<7 | 0x1A,
-	35604 - 19968: jis0208<<14 | 0x4A<<7 | 0x41,
-	35606 - 19968: jis0208<<14 | 0x4A<<7 | 0x4B,
-	35607 - 19968: jis0208<<14 | 0x4A<<7 | 0x4D,
-	35609 - 19968: jis0208<<14 | 0x17<<7 | 0x0B,
-	35610 - 19968: jis0208<<14 | 0x4A<<7 | 0x49,
-	35611 - 19968: jis0208<<14 | 0x18<<7 | 0x35,
-	35612 - 19968: jis0212<<14 | 0x3D<<7 | 0x1B,
-	35613 - 19968: jis0208<<14 | 0x1B<<7 | 0x34,
-	35614 - 19968: jis0212<<14 | 0x3D<<7 | 0x1C,
-	35615 - 19968: jis0212<<14 | 0x3D<<7 | 0x1D,
-	35616 - 19968: jis0208<<14 | 0x4A<<7 | 0x4E,
-	35617 - 19968: jis0208<<14 | 0x2C<<7 | 0x37,
-	35622 - 19968: jis0208<<14 | 0x4A<<7 | 0x51,
-	35624 - 19968: jis0208<<14 | 0x4A<<7 | 0x54,
-	35627 - 19968: jis0208<<14 | 0x4A<<7 | 0x52,
-	35628 - 19968: jis0208<<14 | 0x28<<7 | 0x14,
-	35629 - 19968: jis0212<<14 | 0x3D<<7 | 0x1F,
-	35632 - 19968: jis0212<<14 | 0x3D<<7 | 0x20,
-	35635 - 19968: jis0208<<14 | 0x4A<<7 | 0x4F,
-	35639 - 19968: jis0212<<14 | 0x3D<<7 | 0x21,
-	35641 - 19968: jis0208<<14 | 0x15<<7 | 0x3F,
-	35644 - 19968: jis0212<<14 | 0x3D<<7 | 0x22,
-	35646 - 19968: jis0208<<14 | 0x4A<<7 | 0x53,
-	35649 - 19968: jis0208<<14 | 0x4A<<7 | 0x55,
-	35650 - 19968: jis0212<<14 | 0x3D<<7 | 0x23,
-	35651 - 19968: jis0212<<14 | 0x3D<<7 | 0x24,
-	35652 - 19968: jis0212<<14 | 0x3D<<7 | 0x25,
-	35653 - 19968: jis0212<<14 | 0x3D<<7 | 0x26,
-	35654 - 19968: jis0212<<14 | 0x3D<<7 | 0x27,
-	35656 - 19968: jis0212<<14 | 0x3D<<7 | 0x28,
-	35657 - 19968: jis0208<<14 | 0x4A<<7 | 0x59,
-	35660 - 19968: jis0208<<14 | 0x4A<<7 | 0x56,
-	35661 - 19968: jis0212<<14 | 0x3D<<7 | 0x2D,
-	35662 - 19968: jis0208<<14 | 0x4A<<7 | 0x58,
-	35663 - 19968: jis0208<<14 | 0x4A<<7 | 0x57,
-	35666 - 19968: jis0212<<14 | 0x3D<<7 | 0x29,
-	35667 - 19968: jis0208<<14 | 0x5A<<7 | 0x4E,
-	35668 - 19968: jis0212<<14 | 0x3D<<7 | 0x2B,
-	35670 - 19968: jis0208<<14 | 0x4A<<7 | 0x5A,
-	35672 - 19968: jis0208<<14 | 0x1B<<7 | 0x10,
-	35673 - 19968: jis0212<<14 | 0x3D<<7 | 0x2C,
-	35674 - 19968: jis0208<<14 | 0x4A<<7 | 0x5C,
-	35675 - 19968: jis0208<<14 | 0x4A<<7 | 0x5B,
-	35676 - 19968: jis0208<<14 | 0x28<<7 | 0x47,
-	35678 - 19968: jis0212<<14 | 0x3D<<7 | 0x2E,
-	35679 - 19968: jis0208<<14 | 0x4B<<7 | 0x00,
-	35683 - 19968: jis0212<<14 | 0x3D<<7 | 0x2F,
-	35686 - 19968: jis0208<<14 | 0x16<<7 | 0x38,
-	35691 - 19968: jis0208<<14 | 0x4A<<7 | 0x5D,
-	35692 - 19968: jis0208<<14 | 0x4B<<7 | 0x01,
-	35693 - 19968: jis0212<<14 | 0x3D<<7 | 0x30,
-	35695 - 19968: jis0208<<14 | 0x4B<<7 | 0x02,
-	35696 - 19968: jis0208<<14 | 0x14<<7 | 0x23,
-	35697 - 19968: jis0208<<14 | 0x45<<7 | 0x20,
-	35698 - 19968: jis0208<<14 | 0x1D<<7 | 0x58,
-	35700 - 19968: jis0208<<14 | 0x4B<<7 | 0x03,
-	35702 - 19968: jis0212<<14 | 0x3D<<7 | 0x31,
-	35703 - 19968: jis0208<<14 | 0x17<<7 | 0x4D,
-	35704 - 19968: jis0212<<14 | 0x3D<<7 | 0x32,
-	35705 - 19968: jis0212<<14 | 0x3D<<7 | 0x33,
-	35708 - 19968: jis0212<<14 | 0x3D<<7 | 0x34,
-	35709 - 19968: jis0208<<14 | 0x4B<<7 | 0x04,
-	35710 - 19968: jis0212<<14 | 0x3D<<7 | 0x35,
-	35711 - 19968: jis0208<<14 | 0x5A<<7 | 0x4F,
-	35712 - 19968: jis0208<<14 | 0x4B<<7 | 0x05,
-	35713 - 19968: jis0212<<14 | 0x3D<<7 | 0x36,
-	35715 - 19968: jis0208<<14 | 0x1A<<7 | 0x1D,
-	35716 - 19968: jis0212<<14 | 0x3D<<7 | 0x37,
-	35717 - 19968: jis0212<<14 | 0x3D<<7 | 0x38,
-	35722 - 19968: jis0208<<14 | 0x39<<7 | 0x2D,
-	35723 - 19968: jis0212<<14 | 0x3D<<7 | 0x39,
-	35724 - 19968: jis0208<<14 | 0x4B<<7 | 0x06,
-	35725 - 19968: jis0212<<14 | 0x3D<<7 | 0x3A,
-	35726 - 19968: jis0208<<14 | 0x4B<<7 | 0x07,
-	35727 - 19968: jis0212<<14 | 0x3D<<7 | 0x3B,
-	35728 - 19968: jis0208<<14 | 0x1C<<7 | 0x11,
-	35730 - 19968: jis0208<<14 | 0x4B<<7 | 0x08,
-	35731 - 19968: jis0208<<14 | 0x4B<<7 | 0x09,
-	35732 - 19968: jis0212<<14 | 0x3D<<7 | 0x3C,
-	35733 - 19968: jis0212<<14 | 0x3D<<7 | 0x3D,
-	35734 - 19968: jis0208<<14 | 0x4B<<7 | 0x0A,
-	35737 - 19968: jis0208<<14 | 0x4B<<7 | 0x0B,
-	35738 - 19968: jis0208<<14 | 0x4B<<7 | 0x0C,
-	35740 - 19968: jis0212<<14 | 0x3D<<7 | 0x3E,
-	35742 - 19968: jis0212<<14 | 0x3D<<7 | 0x3F,
-	35743 - 19968: jis0212<<14 | 0x3D<<7 | 0x40,
-	35895 - 19968: jis0208<<14 | 0x22<<7 | 0x0A,
-	35896 - 19968: jis0212<<14 | 0x3D<<7 | 0x41,
-	35897 - 19968: jis0212<<14 | 0x3D<<7 | 0x42,
-	35898 - 19968: jis0208<<14 | 0x4B<<7 | 0x0D,
-	35901 - 19968: jis0212<<14 | 0x3D<<7 | 0x43,
-	35902 - 19968: jis0212<<14 | 0x3D<<7 | 0x44,
-	35903 - 19968: jis0208<<14 | 0x4B<<7 | 0x0F,
-	35905 - 19968: jis0208<<14 | 0x4B<<7 | 0x0E,
-	35909 - 19968: jis0212<<14 | 0x3D<<7 | 0x45,
-	35910 - 19968: jis0208<<14 | 0x25<<7 | 0x05,
-	35911 - 19968: jis0212<<14 | 0x3D<<7 | 0x46,
-	35912 - 19968: jis0208<<14 | 0x4B<<7 | 0x10,
-	35913 - 19968: jis0212<<14 | 0x3D<<7 | 0x47,
-	35914 - 19968: jis0208<<14 | 0x2A<<7 | 0x0C,
-	35915 - 19968: jis0212<<14 | 0x3D<<7 | 0x48,
-	35916 - 19968: jis0208<<14 | 0x4B<<7 | 0x11,
-	35918 - 19968: jis0208<<14 | 0x4B<<7 | 0x12,
-	35919 - 19968: jis0212<<14 | 0x3D<<7 | 0x49,
-	35920 - 19968: jis0208<<14 | 0x4B<<7 | 0x13,
-	35921 - 19968: jis0212<<14 | 0x3D<<7 | 0x4A,
-	35923 - 19968: jis0212<<14 | 0x3D<<7 | 0x4B,
-	35924 - 19968: jis0212<<14 | 0x3D<<7 | 0x4C,
-	35925 - 19968: jis0208<<14 | 0x4B<<7 | 0x14,
-	35927 - 19968: jis0212<<14 | 0x3D<<7 | 0x4D,
-	35928 - 19968: jis0212<<14 | 0x3D<<7 | 0x4E,
-	35929 - 19968: jis0212<<14 | 0x3D<<7 | 0x51,
-	35930 - 19968: jis0208<<14 | 0x25<<7 | 0x39,
-	35931 - 19968: jis0212<<14 | 0x3D<<7 | 0x4F,
-	35933 - 19968: jis0212<<14 | 0x3D<<7 | 0x50,
-	35937 - 19968: jis0208<<14 | 0x1D<<7 | 0x3C,
-	35938 - 19968: jis0208<<14 | 0x4B<<7 | 0x15,
-	35939 - 19968: jis0212<<14 | 0x3D<<7 | 0x52,
-	35940 - 19968: jis0212<<14 | 0x3D<<7 | 0x53,
-	35942 - 19968: jis0212<<14 | 0x3D<<7 | 0x54,
-	35944 - 19968: jis0212<<14 | 0x3D<<7 | 0x55,
-	35945 - 19968: jis0212<<14 | 0x3D<<7 | 0x56,
-	35946 - 19968: jis0208<<14 | 0x18<<7 | 0x4A,
-	35947 - 19968: jis0208<<14 | 0x2F<<7 | 0x0D,
-	35948 - 19968: jis0208<<14 | 0x4B<<7 | 0x16,
-	35949 - 19968: jis0212<<14 | 0x3D<<7 | 0x57,
-	35955 - 19968: jis0212<<14 | 0x3D<<7 | 0x58,
-	35957 - 19968: jis0212<<14 | 0x3D<<7 | 0x59,
-	35958 - 19968: jis0212<<14 | 0x3D<<7 | 0x5A,
-	35960 - 19968: jis0208<<14 | 0x4B<<7 | 0x17,
-	35961 - 19968: jis0208<<14 | 0x28<<7 | 0x1E,
-	35962 - 19968: jis0208<<14 | 0x4B<<7 | 0x18,
-	35963 - 19968: jis0212<<14 | 0x3D<<7 | 0x5B,
-	35964 - 19968: jis0208<<14 | 0x4B<<7 | 0x20,
-	35966 - 19968: jis0212<<14 | 0x3D<<7 | 0x5C,
-	35970 - 19968: jis0208<<14 | 0x4B<<7 | 0x19,
-	35973 - 19968: jis0208<<14 | 0x4B<<7 | 0x1B,
-	35974 - 19968: jis0212<<14 | 0x3D<<7 | 0x5D,
-	35975 - 19968: jis0212<<14 | 0x3E<<7 | 0x00,
-	35977 - 19968: jis0208<<14 | 0x4B<<7 | 0x1A,
-	35978 - 19968: jis0208<<14 | 0x4B<<7 | 0x1C,
-	35979 - 19968: jis0212<<14 | 0x3E<<7 | 0x01,
-	35980 - 19968: jis0208<<14 | 0x2A<<7 | 0x25,
-	35981 - 19968: jis0208<<14 | 0x4B<<7 | 0x1D,
-	35982 - 19968: jis0208<<14 | 0x4B<<7 | 0x1E,
-	35984 - 19968: jis0212<<14 | 0x3E<<7 | 0x02,
-	35986 - 19968: jis0212<<14 | 0x3E<<7 | 0x03,
-	35987 - 19968: jis0212<<14 | 0x3E<<7 | 0x04,
-	35988 - 19968: jis0208<<14 | 0x4B<<7 | 0x1F,
-	35992 - 19968: jis0208<<14 | 0x4B<<7 | 0x21,
-	35993 - 19968: jis0212<<14 | 0x3E<<7 | 0x05,
-	35995 - 19968: jis0212<<14 | 0x3E<<7 | 0x06,
-	35996 - 19968: jis0212<<14 | 0x3E<<7 | 0x07,
-	35997 - 19968: jis0208<<14 | 0x12<<7 | 0x0C,
-	35998 - 19968: jis0208<<14 | 0x23<<7 | 0x46,
-	36000 - 19968: jis0208<<14 | 0x28<<7 | 0x48,
-	36001 - 19968: jis0208<<14 | 0x19<<7 | 0x41,
-	36002 - 19968: jis0208<<14 | 0x18<<7 | 0x36,
-	36004 - 19968: jis0212<<14 | 0x3E<<7 | 0x08,
-	36007 - 19968: jis0208<<14 | 0x28<<7 | 0x2E,
-	36008 - 19968: jis0208<<14 | 0x11<<7 | 0x3E,
-	36009 - 19968: jis0208<<14 | 0x27<<7 | 0x2D,
-	36010 - 19968: jis0208<<14 | 0x4B<<7 | 0x24,
-	36011 - 19968: jis0208<<14 | 0x13<<7 | 0x32,
-	36012 - 19968: jis0208<<14 | 0x1F<<7 | 0x34,
-	36013 - 19968: jis0208<<14 | 0x4B<<7 | 0x23,
-	36014 - 19968: jis0208<<14 | 0x4B<<7 | 0x28,
-	36015 - 19968: jis0208<<14 | 0x22<<7 | 0x58,
-	36016 - 19968: jis0208<<14 | 0x2B<<7 | 0x42,
-	36018 - 19968: jis0208<<14 | 0x4B<<7 | 0x26,
-	36019 - 19968: jis0208<<14 | 0x4B<<7 | 0x27,
-	36020 - 19968: jis0208<<14 | 0x14<<7 | 0x0D,
-	36022 - 19968: jis0208<<14 | 0x4B<<7 | 0x29,
-	36023 - 19968: jis0208<<14 | 0x26<<7 | 0x42,
-	36024 - 19968: jis0208<<14 | 0x21<<7 | 0x3E,
-	36025 - 19968: jis0212<<14 | 0x3E<<7 | 0x09,
-	36026 - 19968: jis0212<<14 | 0x3E<<7 | 0x0A,
-	36027 - 19968: jis0208<<14 | 0x27<<7 | 0x50,
-	36028 - 19968: jis0208<<14 | 0x24<<7 | 0x1C,
-	36029 - 19968: jis0208<<14 | 0x4B<<7 | 0x25,
-	36031 - 19968: jis0208<<14 | 0x2A<<7 | 0x26,
-	36032 - 19968: jis0208<<14 | 0x11<<7 | 0x4B,
-	36033 - 19968: jis0208<<14 | 0x4B<<7 | 0x2B,
-	36034 - 19968: jis0208<<14 | 0x2E<<7 | 0x07,
-	36035 - 19968: jis0208<<14 | 0x23<<7 | 0x21,
-	36036 - 19968: jis0208<<14 | 0x2E<<7 | 0x24,
-	36037 - 19968: jis0212<<14 | 0x3E<<7 | 0x0B,
-	36038 - 19968: jis0212<<14 | 0x3E<<7 | 0x0C,
-	36039 - 19968: jis0208<<14 | 0x1A<<7 | 0x50,
-	36040 - 19968: jis0208<<14 | 0x4B<<7 | 0x2A,
-	36041 - 19968: jis0212<<14 | 0x3E<<7 | 0x0D,
-	36042 - 19968: jis0208<<14 | 0x21<<7 | 0x10,
-	36043 - 19968: jis0212<<14 | 0x3E<<7 | 0x0E,
-	36045 - 19968: jis0208<<14 | 0x4B<<7 | 0x3B,
-	36046 - 19968: jis0208<<14 | 0x20<<7 | 0x07,
-	36047 - 19968: jis0212<<14 | 0x3E<<7 | 0x0F,
-	36049 - 19968: jis0208<<14 | 0x25<<7 | 0x57,
-	36051 - 19968: jis0208<<14 | 0x28<<7 | 0x2F,
-	36053 - 19968: jis0212<<14 | 0x3E<<7 | 0x11,
-	36054 - 19968: jis0212<<14 | 0x3E<<7 | 0x10,
-	36057 - 19968: jis0212<<14 | 0x3E<<7 | 0x12,
-	36058 - 19968: jis0208<<14 | 0x4B<<7 | 0x2E,
-	36059 - 19968: jis0208<<14 | 0x1A<<7 | 0x1E,
-	36060 - 19968: jis0208<<14 | 0x1A<<7 | 0x51,
-	36061 - 19968: jis0212<<14 | 0x3E<<7 | 0x13,
-	36062 - 19968: jis0208<<14 | 0x1D<<7 | 0x3D,
-	36064 - 19968: jis0208<<14 | 0x26<<7 | 0x44,
-	36065 - 19968: jis0212<<14 | 0x3E<<7 | 0x14,
-	36066 - 19968: jis0208<<14 | 0x17<<7 | 0x0C,
-	36067 - 19968: jis0208<<14 | 0x4B<<7 | 0x2D,
-	36068 - 19968: jis0208<<14 | 0x4B<<7 | 0x2C,
-	36070 - 19968: jis0208<<14 | 0x28<<7 | 0x49,
-	36072 - 19968: jis0212<<14 | 0x3E<<7 | 0x15,
-	36074 - 19968: jis0208<<14 | 0x1B<<7 | 0x20,
-	36076 - 19968: jis0212<<14 | 0x3E<<7 | 0x16,
-	36077 - 19968: jis0208<<14 | 0x24<<7 | 0x31,
-	36079 - 19968: jis0212<<14 | 0x3E<<7 | 0x17,
-	36080 - 19968: jis0208<<14 | 0x5A<<7 | 0x50,
-	36082 - 19968: jis0212<<14 | 0x3E<<7 | 0x19,
-	36084 - 19968: jis0208<<14 | 0x5A<<7 | 0x51,
-	36085 - 19968: jis0212<<14 | 0x3E<<7 | 0x1A,
-	36087 - 19968: jis0212<<14 | 0x3E<<7 | 0x1B,
-	36088 - 19968: jis0212<<14 | 0x3E<<7 | 0x1C,
-	36090 - 19968: jis0208<<14 | 0x4B<<7 | 0x30,
-	36091 - 19968: jis0208<<14 | 0x4B<<7 | 0x31,
-	36092 - 19968: jis0208<<14 | 0x18<<7 | 0x37,
-	36093 - 19968: jis0208<<14 | 0x4B<<7 | 0x2F,
-	36094 - 19968: jis0212<<14 | 0x3E<<7 | 0x1D,
-	36095 - 19968: jis0212<<14 | 0x3E<<7 | 0x1E,
-	36097 - 19968: jis0212<<14 | 0x3E<<7 | 0x1F,
-	36099 - 19968: jis0212<<14 | 0x3E<<7 | 0x20,
-	36100 - 19968: jis0208<<14 | 0x4B<<7 | 0x32,
-	36101 - 19968: jis0208<<14 | 0x4B<<7 | 0x33,
-	36103 - 19968: jis0208<<14 | 0x4B<<7 | 0x35,
-	36104 - 19968: jis0208<<14 | 0x21<<7 | 0x02,
-	36105 - 19968: jis0212<<14 | 0x3E<<7 | 0x21,
-	36106 - 19968: jis0208<<14 | 0x4B<<7 | 0x34,
-	36107 - 19968: jis0208<<14 | 0x13<<7 | 0x45,
-	36109 - 19968: jis0208<<14 | 0x4B<<7 | 0x37,
-	36111 - 19968: jis0208<<14 | 0x4B<<7 | 0x36,
-	36112 - 19968: jis0208<<14 | 0x4B<<7 | 0x38,
-	36114 - 19968: jis0208<<14 | 0x5A<<7 | 0x52,
-	36115 - 19968: jis0208<<14 | 0x4B<<7 | 0x3A,
-	36116 - 19968: jis0208<<14 | 0x4B<<7 | 0x3C,
-	36118 - 19968: jis0208<<14 | 0x4B<<7 | 0x3D,
-	36119 - 19968: jis0212<<14 | 0x3E<<7 | 0x23,
-	36123 - 19968: jis0212<<14 | 0x3E<<7 | 0x24,
-	36196 - 19968: jis0208<<14 | 0x1F<<7 | 0x35,
-	36197 - 19968: jis0212<<14 | 0x3E<<7 | 0x25,
-	36198 - 19968: jis0208<<14 | 0x1B<<7 | 0x2E,
-	36199 - 19968: jis0208<<14 | 0x4B<<7 | 0x3E,
-	36201 - 19968: jis0212<<14 | 0x3E<<7 | 0x26,
-	36203 - 19968: jis0208<<14 | 0x12<<7 | 0x31,
-	36204 - 19968: jis0212<<14 | 0x3E<<7 | 0x27,
-	36205 - 19968: jis0208<<14 | 0x4B<<7 | 0x3F,
-	36206 - 19968: jis0212<<14 | 0x3E<<7 | 0x28,
-	36208 - 19968: jis0208<<14 | 0x20<<7 | 0x55,
-	36209 - 19968: jis0208<<14 | 0x4B<<7 | 0x40,
-	36211 - 19968: jis0208<<14 | 0x4B<<7 | 0x41,
-	36212 - 19968: jis0208<<14 | 0x28<<7 | 0x4A,
-	36214 - 19968: jis0208<<14 | 0x5A<<7 | 0x53,
-	36215 - 19968: jis0208<<14 | 0x14<<7 | 0x0E,
-	36223 - 19968: jis0212<<14 | 0x3E<<7 | 0x29,
-	36225 - 19968: jis0208<<14 | 0x4B<<7 | 0x42,
-	36226 - 19968: jis0212<<14 | 0x3E<<7 | 0x2A,
-	36228 - 19968: jis0212<<14 | 0x3E<<7 | 0x2B,
-	36229 - 19968: jis0208<<14 | 0x23<<7 | 0x15,
-	36232 - 19968: jis0212<<14 | 0x3E<<7 | 0x2C,
-	36234 - 19968: jis0208<<14 | 0x10<<7 | 0x3A,
-	36237 - 19968: jis0212<<14 | 0x3E<<7 | 0x2D,
-	36240 - 19968: jis0212<<14 | 0x3E<<7 | 0x2E,
-	36241 - 19968: jis0212<<14 | 0x3E<<7 | 0x2F,
-	36245 - 19968: jis0212<<14 | 0x3E<<7 | 0x30,
-	36249 - 19968: jis0208<<14 | 0x4B<<7 | 0x43,
-	36254 - 19968: jis0212<<14 | 0x3E<<7 | 0x31,
-	36255 - 19968: jis0212<<14 | 0x3E<<7 | 0x32,
-	36256 - 19968: jis0212<<14 | 0x3E<<7 | 0x33,
-	36259 - 19968: jis0208<<14 | 0x1B<<7 | 0x50,
-	36262 - 19968: jis0212<<14 | 0x3E<<7 | 0x34,
-	36264 - 19968: jis0208<<14 | 0x1E<<7 | 0x55,
-	36267 - 19968: jis0212<<14 | 0x3E<<7 | 0x35,
-	36268 - 19968: jis0212<<14 | 0x3E<<7 | 0x36,
-	36271 - 19968: jis0212<<14 | 0x3E<<7 | 0x37,
-	36274 - 19968: jis0212<<14 | 0x3E<<7 | 0x38,
-	36275 - 19968: jis0208<<14 | 0x21<<7 | 0x0C,
-	36277 - 19968: jis0212<<14 | 0x3E<<7 | 0x39,
-	36279 - 19968: jis0212<<14 | 0x3E<<7 | 0x3A,
-	36281 - 19968: jis0212<<14 | 0x3E<<7 | 0x3B,
-	36282 - 19968: jis0208<<14 | 0x4B<<7 | 0x46,
-	36283 - 19968: jis0212<<14 | 0x3E<<7 | 0x3C,
-	36284 - 19968: jis0212<<14 | 0x3E<<7 | 0x4E,
-	36286 - 19968: jis0208<<14 | 0x4B<<7 | 0x45,
-	36288 - 19968: jis0212<<14 | 0x3E<<7 | 0x3D,
-	36290 - 19968: jis0208<<14 | 0x4B<<7 | 0x44,
-	36293 - 19968: jis0212<<14 | 0x3E<<7 | 0x3E,
-	36294 - 19968: jis0212<<14 | 0x3E<<7 | 0x3F,
-	36295 - 19968: jis0212<<14 | 0x3E<<7 | 0x40,
-	36296 - 19968: jis0212<<14 | 0x3E<<7 | 0x41,
-	36298 - 19968: jis0212<<14 | 0x3E<<7 | 0x42,
-	36299 - 19968: jis0208<<14 | 0x4B<<7 | 0x4C,
-	36300 - 19968: jis0208<<14 | 0x4B<<7 | 0x4A,
-	36302 - 19968: jis0212<<14 | 0x3E<<7 | 0x43,
-	36303 - 19968: jis0208<<14 | 0x4B<<7 | 0x47,
-	36305 - 19968: jis0212<<14 | 0x3E<<7 | 0x44,
-	36308 - 19968: jis0212<<14 | 0x3E<<7 | 0x45,
-	36309 - 19968: jis0212<<14 | 0x3E<<7 | 0x46,
-	36310 - 19968: jis0208<<14 | 0x4B<<7 | 0x49,
-	36311 - 19968: jis0212<<14 | 0x3E<<7 | 0x47,
-	36313 - 19968: jis0212<<14 | 0x3E<<7 | 0x48,
-	36314 - 19968: jis0208<<14 | 0x4B<<7 | 0x48,
-	36315 - 19968: jis0208<<14 | 0x4B<<7 | 0x4B,
-	36317 - 19968: jis0208<<14 | 0x14<<7 | 0x56,
-	36319 - 19968: jis0208<<14 | 0x4B<<7 | 0x4F,
-	36321 - 19968: jis0208<<14 | 0x1F<<7 | 0x36,
-	36323 - 19968: jis0208<<14 | 0x4B<<7 | 0x50,
-	36324 - 19968: jis0212<<14 | 0x3E<<7 | 0x49,
-	36325 - 19968: jis0212<<14 | 0x3E<<7 | 0x4A,
-	36327 - 19968: jis0212<<14 | 0x3E<<7 | 0x4B,
-	36328 - 19968: jis0208<<14 | 0x17<<7 | 0x38,
-	36330 - 19968: jis0208<<14 | 0x4B<<7 | 0x4D,
-	36331 - 19968: jis0208<<14 | 0x4B<<7 | 0x4E,
-	36332 - 19968: jis0212<<14 | 0x3E<<7 | 0x4C,
-	36335 - 19968: jis0208<<14 | 0x2E<<7 | 0x08,
-	36336 - 19968: jis0212<<14 | 0x3E<<7 | 0x4D,
-	36337 - 19968: jis0212<<14 | 0x3E<<7 | 0x4F,
-	36338 - 19968: jis0212<<14 | 0x3E<<7 | 0x50,
-	36339 - 19968: jis0208<<14 | 0x23<<7 | 0x16,
-	36340 - 19968: jis0212<<14 | 0x3E<<7 | 0x51,
-	36341 - 19968: jis0208<<14 | 0x20<<7 | 0x08,
-	36348 - 19968: jis0208<<14 | 0x4B<<7 | 0x51,
-	36349 - 19968: jis0212<<14 | 0x3E<<7 | 0x52,
-	36351 - 19968: jis0208<<14 | 0x4B<<7 | 0x54,
-	36353 - 19968: jis0212<<14 | 0x3E<<7 | 0x53,
-	36356 - 19968: jis0212<<14 | 0x3E<<7 | 0x54,
-	36357 - 19968: jis0212<<14 | 0x3E<<7 | 0x55,
-	36358 - 19968: jis0212<<14 | 0x3E<<7 | 0x56,
-	36360 - 19968: jis0208<<14 | 0x4B<<7 | 0x52,
-	36361 - 19968: jis0208<<14 | 0x4B<<7 | 0x53,
-	36362 - 19968: jis0208<<14 | 0x2C<<7 | 0x38,
-	36363 - 19968: jis0212<<14 | 0x3E<<7 | 0x57,
-	36367 - 19968: jis0208<<14 | 0x25<<7 | 0x06,
-	36368 - 19968: jis0208<<14 | 0x4B<<7 | 0x57,
-	36369 - 19968: jis0212<<14 | 0x3E<<7 | 0x58,
-	36372 - 19968: jis0212<<14 | 0x3E<<7 | 0x59,
-	36374 - 19968: jis0212<<14 | 0x3E<<7 | 0x5A,
-	36381 - 19968: jis0208<<14 | 0x4B<<7 | 0x55,
-	36382 - 19968: jis0208<<14 | 0x4B<<7 | 0x56,
-	36383 - 19968: jis0208<<14 | 0x4B<<7 | 0x58,
-	36384 - 19968: jis0212<<14 | 0x3E<<7 | 0x5B,
-	36385 - 19968: jis0212<<14 | 0x3E<<7 | 0x5C,
-	36386 - 19968: jis0212<<14 | 0x3E<<7 | 0x5D,
-	36387 - 19968: jis0212<<14 | 0x3F<<7 | 0x00,
-	36390 - 19968: jis0212<<14 | 0x3F<<7 | 0x01,
-	36391 - 19968: jis0212<<14 | 0x3F<<7 | 0x02,
-	36394 - 19968: jis0208<<14 | 0x4C<<7 | 0x08,
-	36400 - 19968: jis0208<<14 | 0x4B<<7 | 0x5B,
-	36401 - 19968: jis0212<<14 | 0x3F<<7 | 0x03,
-	36403 - 19968: jis0212<<14 | 0x3F<<7 | 0x04,
-	36404 - 19968: jis0208<<14 | 0x4B<<7 | 0x5C,
-	36405 - 19968: jis0208<<14 | 0x4B<<7 | 0x5A,
-	36406 - 19968: jis0212<<14 | 0x3F<<7 | 0x05,
-	36407 - 19968: jis0212<<14 | 0x3F<<7 | 0x06,
-	36408 - 19968: jis0212<<14 | 0x3F<<7 | 0x07,
-	36409 - 19968: jis0212<<14 | 0x3F<<7 | 0x08,
-	36413 - 19968: jis0212<<14 | 0x3F<<7 | 0x09,
-	36416 - 19968: jis0212<<14 | 0x3F<<7 | 0x0A,
-	36417 - 19968: jis0212<<14 | 0x3F<<7 | 0x0B,
-	36418 - 19968: jis0208<<14 | 0x4B<<7 | 0x59,
-	36420 - 19968: jis0208<<14 | 0x23<<7 | 0x5C,
-	36423 - 19968: jis0208<<14 | 0x4C<<7 | 0x00,
-	36424 - 19968: jis0208<<14 | 0x4C<<7 | 0x04,
-	36425 - 19968: jis0208<<14 | 0x4C<<7 | 0x01,
-	36426 - 19968: jis0208<<14 | 0x4B<<7 | 0x5D,
-	36427 - 19968: jis0212<<14 | 0x3F<<7 | 0x0C,
-	36428 - 19968: jis0208<<14 | 0x4C<<7 | 0x02,
-	36429 - 19968: jis0212<<14 | 0x3F<<7 | 0x0D,
-	36430 - 19968: jis0212<<14 | 0x3F<<7 | 0x0E,
-	36431 - 19968: jis0212<<14 | 0x3F<<7 | 0x0F,
-	36432 - 19968: jis0208<<14 | 0x4C<<7 | 0x03,
-	36436 - 19968: jis0212<<14 | 0x3F<<7 | 0x10,
-	36437 - 19968: jis0208<<14 | 0x4C<<7 | 0x0A,
-	36441 - 19968: jis0208<<14 | 0x4C<<7 | 0x05,
-	36443 - 19968: jis0212<<14 | 0x3F<<7 | 0x11,
-	36444 - 19968: jis0212<<14 | 0x3F<<7 | 0x12,
-	36445 - 19968: jis0212<<14 | 0x3F<<7 | 0x13,
-	36446 - 19968: jis0212<<14 | 0x3F<<7 | 0x14,
-	36447 - 19968: jis0208<<14 | 0x1F<<7 | 0x37,
-	36448 - 19968: jis0208<<14 | 0x4C<<7 | 0x07,
-	36449 - 19968: jis0212<<14 | 0x3F<<7 | 0x15,
-	36450 - 19968: jis0212<<14 | 0x3F<<7 | 0x16,
-	36451 - 19968: jis0208<<14 | 0x4C<<7 | 0x09,
-	36452 - 19968: jis0208<<14 | 0x4C<<7 | 0x06,
-	36457 - 19968: jis0212<<14 | 0x3F<<7 | 0x17,
-	36460 - 19968: jis0212<<14 | 0x3F<<7 | 0x18,
-	36461 - 19968: jis0212<<14 | 0x3F<<7 | 0x19,
-	36463 - 19968: jis0212<<14 | 0x3F<<7 | 0x1A,
-	36464 - 19968: jis0212<<14 | 0x3F<<7 | 0x1B,
-	36465 - 19968: jis0212<<14 | 0x3F<<7 | 0x1C,
-	36466 - 19968: jis0208<<14 | 0x4C<<7 | 0x0C,
-	36468 - 19968: jis0208<<14 | 0x1C<<7 | 0x12,
-	36470 - 19968: jis0208<<14 | 0x4C<<7 | 0x0B,
-	36473 - 19968: jis0212<<14 | 0x3F<<7 | 0x1D,
-	36474 - 19968: jis0212<<14 | 0x3F<<7 | 0x1E,
-	36475 - 19968: jis0212<<14 | 0x3F<<7 | 0x1F,
-	36476 - 19968: jis0208<<14 | 0x4C<<7 | 0x0D,
-	36481 - 19968: jis0208<<14 | 0x4C<<7 | 0x0E,
-	36482 - 19968: jis0212<<14 | 0x3F<<7 | 0x20,
-	36483 - 19968: jis0212<<14 | 0x3F<<7 | 0x21,
-	36484 - 19968: jis0208<<14 | 0x4C<<7 | 0x11,
-	36485 - 19968: jis0208<<14 | 0x4C<<7 | 0x10,
-	36487 - 19968: jis0208<<14 | 0x4C<<7 | 0x0F,
-	36489 - 19968: jis0212<<14 | 0x3F<<7 | 0x22,
-	36490 - 19968: jis0208<<14 | 0x4C<<7 | 0x13,
-	36491 - 19968: jis0208<<14 | 0x4C<<7 | 0x12,
-	36493 - 19968: jis0208<<14 | 0x2B<<7 | 0x55,
-	36496 - 19968: jis0212<<14 | 0x3F<<7 | 0x23,
-	36497 - 19968: jis0208<<14 | 0x4C<<7 | 0x15,
-	36498 - 19968: jis0212<<14 | 0x3F<<7 | 0x24,
-	36499 - 19968: jis0208<<14 | 0x4C<<7 | 0x14,
-	36500 - 19968: jis0208<<14 | 0x4C<<7 | 0x16,
-	36501 - 19968: jis0212<<14 | 0x3F<<7 | 0x25,
-	36505 - 19968: jis0208<<14 | 0x4C<<7 | 0x17,
-	36506 - 19968: jis0212<<14 | 0x3F<<7 | 0x26,
-	36507 - 19968: jis0212<<14 | 0x3F<<7 | 0x27,
-	36509 - 19968: jis0212<<14 | 0x3F<<7 | 0x28,
-	36510 - 19968: jis0212<<14 | 0x3F<<7 | 0x29,
-	36513 - 19968: jis0208<<14 | 0x4C<<7 | 0x19,
-	36514 - 19968: jis0212<<14 | 0x3F<<7 | 0x2A,
-	36519 - 19968: jis0212<<14 | 0x3F<<7 | 0x2B,
-	36521 - 19968: jis0212<<14 | 0x3F<<7 | 0x2C,
-	36522 - 19968: jis0208<<14 | 0x4C<<7 | 0x18,
-	36523 - 19968: jis0208<<14 | 0x1E<<7 | 0x27,
-	36524 - 19968: jis0208<<14 | 0x4C<<7 | 0x1A,
-	36525 - 19968: jis0212<<14 | 0x3F<<7 | 0x2D,
-	36526 - 19968: jis0212<<14 | 0x3F<<7 | 0x2E,
-	36527 - 19968: jis0208<<14 | 0x15<<7 | 0x4C,
-	36528 - 19968: jis0208<<14 | 0x4C<<7 | 0x1B,
-	36529 - 19968: jis0208<<14 | 0x4C<<7 | 0x1D,
-	36531 - 19968: jis0212<<14 | 0x3F<<7 | 0x2F,
-	36533 - 19968: jis0212<<14 | 0x3F<<7 | 0x30,
-	36538 - 19968: jis0212<<14 | 0x3F<<7 | 0x31,
-	36539 - 19968: jis0212<<14 | 0x3F<<7 | 0x32,
-	36542 - 19968: jis0208<<14 | 0x4C<<7 | 0x1E,
-	36544 - 19968: jis0212<<14 | 0x3F<<7 | 0x33,
-	36545 - 19968: jis0212<<14 | 0x3F<<7 | 0x34,
-	36547 - 19968: jis0212<<14 | 0x3F<<7 | 0x35,
-	36548 - 19968: jis0212<<14 | 0x3F<<7 | 0x36,
-	36549 - 19968: jis0208<<14 | 0x4C<<7 | 0x1F,
-	36550 - 19968: jis0208<<14 | 0x4C<<7 | 0x1C,
-	36551 - 19968: jis0212<<14 | 0x3F<<7 | 0x37,
-	36552 - 19968: jis0208<<14 | 0x4C<<7 | 0x20,
-	36554 - 19968: jis0208<<14 | 0x1B<<7 | 0x35,
-	36555 - 19968: jis0208<<14 | 0x4C<<7 | 0x21,
-	36556 - 19968: jis0208<<14 | 0x14<<7 | 0x0F,
-	36557 - 19968: jis0208<<14 | 0x16<<7 | 0x12,
-	36559 - 19968: jis0208<<14 | 0x5A<<7 | 0x55,
-	36561 - 19968: jis0212<<14 | 0x3F<<7 | 0x39,
-	36562 - 19968: jis0208<<14 | 0x17<<7 | 0x0D,
-	36564 - 19968: jis0212<<14 | 0x3F<<7 | 0x3A,
-	36571 - 19968: jis0208<<14 | 0x4C<<7 | 0x22,
-	36572 - 19968: jis0212<<14 | 0x3F<<7 | 0x3B,
-	36575 - 19968: jis0208<<14 | 0x25<<7 | 0x4F,
-	36578 - 19968: jis0208<<14 | 0x24<<7 | 0x1D,
-	36579 - 19968: jis0208<<14 | 0x4C<<7 | 0x23,
-	36584 - 19968: jis0212<<14 | 0x3F<<7 | 0x3C,
-	36587 - 19968: jis0208<<14 | 0x4C<<7 | 0x26,
-	36589 - 19968: jis0212<<14 | 0x3F<<7 | 0x43,
-	36590 - 19968: jis0212<<14 | 0x3F<<7 | 0x3D,
-	36592 - 19968: jis0212<<14 | 0x3F<<7 | 0x3E,
-	36593 - 19968: jis0212<<14 | 0x3F<<7 | 0x3F,
-	36599 - 19968: jis0212<<14 | 0x3F<<7 | 0x40,
-	36600 - 19968: jis0208<<14 | 0x1B<<7 | 0x13,
-	36601 - 19968: jis0212<<14 | 0x3F<<7 | 0x41,
-	36602 - 19968: jis0212<<14 | 0x3F<<7 | 0x42,
-	36603 - 19968: jis0208<<14 | 0x4C<<7 | 0x25,
-	36604 - 19968: jis0208<<14 | 0x4C<<7 | 0x24,
-	36605 - 19968: jis0208<<14 | 0x16<<7 | 0x39,
-	36606 - 19968: jis0208<<14 | 0x4C<<7 | 0x27,
-	36608 - 19968: jis0212<<14 | 0x3F<<7 | 0x44,
-	36610 - 19968: jis0212<<14 | 0x3F<<7 | 0x45,
-	36611 - 19968: jis0208<<14 | 0x12<<7 | 0x32,
-	36613 - 19968: jis0208<<14 | 0x4C<<7 | 0x29,
-	36615 - 19968: jis0212<<14 | 0x3F<<7 | 0x46,
-	36616 - 19968: jis0212<<14 | 0x3F<<7 | 0x47,
-	36617 - 19968: jis0208<<14 | 0x19<<7 | 0x3B,
-	36618 - 19968: jis0208<<14 | 0x4C<<7 | 0x28,
-	36620 - 19968: jis0208<<14 | 0x4C<<7 | 0x31,
-	36623 - 19968: jis0212<<14 | 0x3F<<7 | 0x48,
-	36624 - 19968: jis0212<<14 | 0x3F<<7 | 0x49,
-	36626 - 19968: jis0208<<14 | 0x4C<<7 | 0x2B,
-	36627 - 19968: jis0208<<14 | 0x4C<<7 | 0x2D,
-	36628 - 19968: jis0208<<14 | 0x29<<7 | 0x44,
-	36629 - 19968: jis0208<<14 | 0x4C<<7 | 0x2A,
-	36630 - 19968: jis0212<<14 | 0x3F<<7 | 0x4A,
-	36631 - 19968: jis0212<<14 | 0x3F<<7 | 0x4B,
-	36632 - 19968: jis0212<<14 | 0x3F<<7 | 0x4C,
-	36633 - 19968: jis0208<<14 | 0x4C<<7 | 0x2C,
-	36635 - 19968: jis0208<<14 | 0x4C<<7 | 0x30,
-	36636 - 19968: jis0208<<14 | 0x4C<<7 | 0x2E,
-	36637 - 19968: jis0208<<14 | 0x14<<7 | 0x10,
-	36638 - 19968: jis0212<<14 | 0x3F<<7 | 0x4D,
-	36639 - 19968: jis0208<<14 | 0x4C<<7 | 0x2F,
-	36640 - 19968: jis0212<<14 | 0x3F<<7 | 0x4E,
-	36641 - 19968: jis0212<<14 | 0x3F<<7 | 0x4F,
-	36643 - 19968: jis0212<<14 | 0x3F<<7 | 0x50,
-	36645 - 19968: jis0212<<14 | 0x3F<<7 | 0x51,
-	36646 - 19968: jis0208<<14 | 0x4C<<7 | 0x32,
-	36647 - 19968: jis0212<<14 | 0x3F<<7 | 0x52,
-	36648 - 19968: jis0212<<14 | 0x3F<<7 | 0x53,
-	36649 - 19968: jis0208<<14 | 0x26<<7 | 0x39,
-	36650 - 19968: jis0208<<14 | 0x2D<<7 | 0x37,
-	36652 - 19968: jis0212<<14 | 0x3F<<7 | 0x54,
-	36653 - 19968: jis0212<<14 | 0x3F<<7 | 0x55,
-	36654 - 19968: jis0212<<14 | 0x3F<<7 | 0x56,
-	36655 - 19968: jis0208<<14 | 0x1C<<7 | 0x13,
-	36659 - 19968: jis0208<<14 | 0x4C<<7 | 0x33,
-	36660 - 19968: jis0212<<14 | 0x3F<<7 | 0x57,
-	36661 - 19968: jis0212<<14 | 0x3F<<7 | 0x58,
-	36662 - 19968: jis0212<<14 | 0x3F<<7 | 0x59,
-	36663 - 19968: jis0212<<14 | 0x3F<<7 | 0x5A,
-	36664 - 19968: jis0208<<14 | 0x2C<<7 | 0x01,
-	36665 - 19968: jis0208<<14 | 0x4C<<7 | 0x35,
-	36666 - 19968: jis0212<<14 | 0x3F<<7 | 0x5B,
-	36667 - 19968: jis0208<<14 | 0x4C<<7 | 0x34,
-	36670 - 19968: jis0208<<14 | 0x4C<<7 | 0x38,
-	36671 - 19968: jis0208<<14 | 0x2C<<7 | 0x20,
-	36672 - 19968: jis0212<<14 | 0x3F<<7 | 0x5C,
-	36673 - 19968: jis0212<<14 | 0x3F<<7 | 0x5D,
-	36674 - 19968: jis0208<<14 | 0x4C<<7 | 0x37,
-	36675 - 19968: jis0212<<14 | 0x40<<7 | 0x00,
-	36676 - 19968: jis0208<<14 | 0x12<<7 | 0x4C,
-	36677 - 19968: jis0208<<14 | 0x4C<<7 | 0x36,
-	36678 - 19968: jis0208<<14 | 0x4C<<7 | 0x3B,
-	36679 - 19968: jis0212<<14 | 0x40<<7 | 0x01,
-	36681 - 19968: jis0208<<14 | 0x4C<<7 | 0x3A,
-	36684 - 19968: jis0208<<14 | 0x4C<<7 | 0x39,
-	36685 - 19968: jis0208<<14 | 0x24<<7 | 0x11,
-	36686 - 19968: jis0208<<14 | 0x4C<<7 | 0x3C,
-	36687 - 19968: jis0212<<14 | 0x40<<7 | 0x02,
-	36689 - 19968: jis0212<<14 | 0x40<<7 | 0x03,
-	36690 - 19968: jis0212<<14 | 0x40<<7 | 0x04,
-	36691 - 19968: jis0212<<14 | 0x40<<7 | 0x05,
-	36692 - 19968: jis0212<<14 | 0x40<<7 | 0x06,
-	36693 - 19968: jis0212<<14 | 0x40<<7 | 0x07,
-	36695 - 19968: jis0208<<14 | 0x4C<<7 | 0x3D,
-	36696 - 19968: jis0212<<14 | 0x40<<7 | 0x08,
-	36700 - 19968: jis0208<<14 | 0x4C<<7 | 0x3E,
-	36701 - 19968: jis0212<<14 | 0x40<<7 | 0x09,
-	36702 - 19968: jis0212<<14 | 0x40<<7 | 0x0A,
-	36703 - 19968: jis0208<<14 | 0x18<<7 | 0x4B,
-	36705 - 19968: jis0208<<14 | 0x16<<7 | 0x04,
-	36706 - 19968: jis0208<<14 | 0x4C<<7 | 0x3F,
-	36707 - 19968: jis0208<<14 | 0x4C<<7 | 0x40,
-	36708 - 19968: jis0208<<14 | 0x4C<<7 | 0x41,
-	36709 - 19968: jis0212<<14 | 0x40<<7 | 0x0B,
-	36763 - 19968: jis0208<<14 | 0x1E<<7 | 0x28,
-	36764 - 19968: jis0208<<14 | 0x4C<<7 | 0x42,
-	36765 - 19968: jis0212<<14 | 0x40<<7 | 0x0C,
-	36766 - 19968: jis0208<<14 | 0x1B<<7 | 0x0C,
-	36767 - 19968: jis0208<<14 | 0x4C<<7 | 0x43,
-	36768 - 19968: jis0212<<14 | 0x40<<7 | 0x0D,
-	36769 - 19968: jis0212<<14 | 0x40<<7 | 0x0E,
-	36771 - 19968: jis0208<<14 | 0x4C<<7 | 0x44,
-	36772 - 19968: jis0212<<14 | 0x40<<7 | 0x0F,
-	36773 - 19968: jis0212<<14 | 0x40<<7 | 0x10,
-	36774 - 19968: jis0212<<14 | 0x40<<7 | 0x11,
-	36775 - 19968: jis0208<<14 | 0x31<<7 | 0x00,
-	36776 - 19968: jis0208<<14 | 0x30<<7 | 0x5D,
-	36781 - 19968: jis0208<<14 | 0x4C<<7 | 0x45,
-	36782 - 19968: jis0208<<14 | 0x44<<7 | 0x4F,
-	36783 - 19968: jis0208<<14 | 0x4C<<7 | 0x46,
-	36784 - 19968: jis0208<<14 | 0x22<<7 | 0x03,
-	36785 - 19968: jis0208<<14 | 0x1E<<7 | 0x0A,
-	36786 - 19968: jis0208<<14 | 0x26<<7 | 0x1F,
-	36789 - 19968: jis0212<<14 | 0x40<<7 | 0x12,
-	36790 - 19968: jis0212<<14 | 0x40<<7 | 0x13,
-	36791 - 19968: jis0208<<14 | 0x4C<<7 | 0x47,
-	36792 - 19968: jis0212<<14 | 0x40<<7 | 0x14,
-	36794 - 19968: jis0208<<14 | 0x29<<7 | 0x34,
-	36795 - 19968: jis0208<<14 | 0x23<<7 | 0x33,
-	36796 - 19968: jis0208<<14 | 0x18<<7 | 0x5D,
-	36798 - 19968: jis0212<<14 | 0x40<<7 | 0x15,
-	36799 - 19968: jis0208<<14 | 0x22<<7 | 0x08,
-	36800 - 19968: jis0212<<14 | 0x40<<7 | 0x16,
-	36801 - 19968: jis0212<<14 | 0x40<<7 | 0x17,
-	36802 - 19968: jis0208<<14 | 0x10<<7 | 0x09,
-	36804 - 19968: jis0208<<14 | 0x2A<<7 | 0x57,
-	36805 - 19968: jis0208<<14 | 0x1E<<7 | 0x36,
-	36806 - 19968: jis0212<<14 | 0x40<<7 | 0x18,
-	36810 - 19968: jis0212<<14 | 0x40<<7 | 0x19,
-	36811 - 19968: jis0212<<14 | 0x40<<7 | 0x1A,
-	36813 - 19968: jis0212<<14 | 0x40<<7 | 0x1B,
-	36814 - 19968: jis0208<<14 | 0x16<<7 | 0x3D,
-	36816 - 19968: jis0212<<14 | 0x40<<7 | 0x1C,
-	36817 - 19968: jis0208<<14 | 0x15<<7 | 0x40,
-	36818 - 19968: jis0212<<14 | 0x40<<7 | 0x1D,
-	36819 - 19968: jis0212<<14 | 0x40<<7 | 0x1E,
-	36820 - 19968: jis0208<<14 | 0x29<<7 | 0x35,
-	36821 - 19968: jis0212<<14 | 0x40<<7 | 0x1F,
-	36826 - 19968: jis0208<<14 | 0x4C<<7 | 0x48,
-	36832 - 19968: jis0212<<14 | 0x40<<7 | 0x20,
-	36834 - 19968: jis0208<<14 | 0x4C<<7 | 0x4A,
-	36835 - 19968: jis0212<<14 | 0x40<<7 | 0x21,
-	36836 - 19968: jis0212<<14 | 0x40<<7 | 0x22,
-	36837 - 19968: jis0208<<14 | 0x4C<<7 | 0x49,
-	36838 - 19968: jis0208<<14 | 0x11<<7 | 0x3F,
-	36840 - 19968: jis0212<<14 | 0x40<<7 | 0x23,
-	36841 - 19968: jis0208<<14 | 0x25<<7 | 0x55,
-	36842 - 19968: jis0208<<14 | 0x4C<<7 | 0x4B,
-	36843 - 19968: jis0208<<14 | 0x26<<7 | 0x56,
-	36845 - 19968: jis0208<<14 | 0x24<<7 | 0x12,
-	36846 - 19968: jis0212<<14 | 0x40<<7 | 0x24,
-	36847 - 19968: jis0208<<14 | 0x4C<<7 | 0x4C,
-	36848 - 19968: jis0208<<14 | 0x1C<<7 | 0x31,
-	36849 - 19968: jis0212<<14 | 0x40<<7 | 0x25,
-	36852 - 19968: jis0208<<14 | 0x4C<<7 | 0x4E,
-	36853 - 19968: jis0212<<14 | 0x40<<7 | 0x26,
-	36854 - 19968: jis0212<<14 | 0x40<<7 | 0x27,
-	36855 - 19968: jis0208<<14 | 0x2B<<7 | 0x21,
-	36856 - 19968: jis0208<<14 | 0x4C<<7 | 0x5D,
-	36857 - 19968: jis0208<<14 | 0x4C<<7 | 0x50,
-	36858 - 19968: jis0208<<14 | 0x4C<<7 | 0x51,
-	36859 - 19968: jis0212<<14 | 0x40<<7 | 0x28,
-	36861 - 19968: jis0208<<14 | 0x23<<7 | 0x28,
-	36862 - 19968: jis0212<<14 | 0x40<<7 | 0x29,
-	36864 - 19968: jis0208<<14 | 0x21<<7 | 0x3F,
-	36865 - 19968: jis0208<<14 | 0x20<<7 | 0x56,
-	36866 - 19968: jis0212<<14 | 0x40<<7 | 0x2A,
-	36867 - 19968: jis0208<<14 | 0x25<<7 | 0x07,
-	36868 - 19968: jis0212<<14 | 0x40<<7 | 0x2B,
-	36869 - 19968: jis0208<<14 | 0x4C<<7 | 0x4F,
-	36870 - 19968: jis0208<<14 | 0x14<<7 | 0x34,
-	36872 - 19968: jis0212<<14 | 0x40<<7 | 0x2C,
-	36875 - 19968: jis0208<<14 | 0x4C<<7 | 0x58,
-	36876 - 19968: jis0212<<14 | 0x40<<7 | 0x2D,
-	36877 - 19968: jis0208<<14 | 0x4C<<7 | 0x55,
-	36878 - 19968: jis0208<<14 | 0x4D<<7 | 0x04,
-	36879 - 19968: jis0208<<14 | 0x25<<7 | 0x08,
-	36880 - 19968: jis0208<<14 | 0x22<<7 | 0x3F,
-	36881 - 19968: jis0208<<14 | 0x4C<<7 | 0x52,
-	36883 - 19968: jis0208<<14 | 0x23<<7 | 0x5D,
-	36884 - 19968: jis0208<<14 | 0x24<<7 | 0x32,
-	36885 - 19968: jis0208<<14 | 0x4C<<7 | 0x53,
-	36886 - 19968: jis0208<<14 | 0x4C<<7 | 0x57,
-	36887 - 19968: jis0208<<14 | 0x1E<<7 | 0x3F,
-	36888 - 19968: jis0212<<14 | 0x40<<7 | 0x2E,
-	36889 - 19968: jis0208<<14 | 0x26<<7 | 0x46,
-	36890 - 19968: jis0208<<14 | 0x23<<7 | 0x2B,
-	36891 - 19968: jis0212<<14 | 0x40<<7 | 0x2F,
-	36893 - 19968: jis0208<<14 | 0x1F<<7 | 0x21,
-	36894 - 19968: jis0208<<14 | 0x4C<<7 | 0x56,
-	36895 - 19968: jis0208<<14 | 0x21<<7 | 0x0D,
-	36896 - 19968: jis0208<<14 | 0x21<<7 | 0x03,
-	36897 - 19968: jis0208<<14 | 0x4C<<7 | 0x54,
-	36898 - 19968: jis0208<<14 | 0x0F<<7 | 0x08,
-	36899 - 19968: jis0208<<14 | 0x2E<<7 | 0x01,
-	36903 - 19968: jis0208<<14 | 0x4C<<7 | 0x59,
-	36904 - 19968: jis0212<<14 | 0x40<<7 | 0x30,
-	36905 - 19968: jis0212<<14 | 0x40<<7 | 0x31,
-	36906 - 19968: jis0212<<14 | 0x40<<7 | 0x33,
-	36908 - 19968: jis0212<<14 | 0x40<<7 | 0x34,
-	36909 - 19968: jis0212<<14 | 0x40<<7 | 0x35,
-	36910 - 19968: jis0208<<14 | 0x21<<7 | 0x40,
-	36911 - 19968: jis0212<<14 | 0x40<<7 | 0x32,
-	36913 - 19968: jis0208<<14 | 0x1C<<7 | 0x14,
-	36914 - 19968: jis0208<<14 | 0x1E<<7 | 0x29,
-	36915 - 19968: jis0212<<14 | 0x40<<7 | 0x36,
-	36916 - 19968: jis0212<<14 | 0x40<<7 | 0x37,
-	36917 - 19968: jis0208<<14 | 0x4C<<7 | 0x5B,
-	36918 - 19968: jis0208<<14 | 0x4C<<7 | 0x5A,
-	36919 - 19968: jis0212<<14 | 0x40<<7 | 0x38,
-	36920 - 19968: jis0208<<14 | 0x0F<<7 | 0x4E,
-	36921 - 19968: jis0208<<14 | 0x4C<<7 | 0x5C,
-	36924 - 19968: jis0208<<14 | 0x28<<7 | 0x0E,
-	36926 - 19968: jis0208<<14 | 0x4D<<7 | 0x06,
-	36927 - 19968: jis0212<<14 | 0x40<<7 | 0x39,
-	36929 - 19968: jis0208<<14 | 0x25<<7 | 0x3A,
-	36930 - 19968: jis0208<<14 | 0x1E<<7 | 0x4A,
-	36931 - 19968: jis0212<<14 | 0x40<<7 | 0x3A,
-	36932 - 19968: jis0212<<14 | 0x40<<7 | 0x3B,
-	36933 - 19968: jis0208<<14 | 0x22<<7 | 0x38,
-	36935 - 19968: jis0208<<14 | 0x15<<7 | 0x57,
-	36937 - 19968: jis0208<<14 | 0x4D<<7 | 0x05,
-	36938 - 19968: jis0208<<14 | 0x2C<<7 | 0x16,
-	36939 - 19968: jis0208<<14 | 0x10<<7 | 0x1E,
-	36940 - 19968: jis0212<<14 | 0x40<<7 | 0x3C,
-	36941 - 19968: jis0208<<14 | 0x29<<7 | 0x36,
-	36942 - 19968: jis0208<<14 | 0x11<<7 | 0x40,
-	36943 - 19968: jis0208<<14 | 0x4D<<7 | 0x00,
-	36944 - 19968: jis0208<<14 | 0x4D<<7 | 0x01,
-	36945 - 19968: jis0208<<14 | 0x4D<<7 | 0x02,
-	36946 - 19968: jis0208<<14 | 0x4D<<7 | 0x03,
-	36947 - 19968: jis0208<<14 | 0x25<<7 | 0x1A,
-	36948 - 19968: jis0208<<14 | 0x22<<7 | 0x02,
-	36949 - 19968: jis0208<<14 | 0x0F<<7 | 0x42,
-	36950 - 19968: jis0208<<14 | 0x4D<<7 | 0x07,
-	36952 - 19968: jis0208<<14 | 0x4D<<7 | 0x08,
-	36953 - 19968: jis0208<<14 | 0x53<<7 | 0x02,
-	36955 - 19968: jis0212<<14 | 0x40<<7 | 0x3D,
-	36956 - 19968: jis0208<<14 | 0x21<<7 | 0x1C,
-	36957 - 19968: jis0212<<14 | 0x40<<7 | 0x3E,
-	36958 - 19968: jis0208<<14 | 0x4D<<7 | 0x09,
-	36960 - 19968: jis0208<<14 | 0x10<<7 | 0x52,
-	36961 - 19968: jis0208<<14 | 0x20<<7 | 0x2B,
-	36962 - 19968: jis0212<<14 | 0x40<<7 | 0x3F,
-	36963 - 19968: jis0208<<14 | 0x17<<7 | 0x0E,
-	36965 - 19968: jis0208<<14 | 0x2C<<7 | 0x39,
-	36966 - 19968: jis0212<<14 | 0x40<<7 | 0x40,
-	36967 - 19968: jis0208<<14 | 0x5A<<7 | 0x58,
-	36968 - 19968: jis0208<<14 | 0x4D<<7 | 0x0A,
-	36969 - 19968: jis0208<<14 | 0x24<<7 | 0x0B,
-	36972 - 19968: jis0212<<14 | 0x40<<7 | 0x42,
-	36973 - 19968: jis0208<<14 | 0x20<<7 | 0x57,
-	36974 - 19968: jis0208<<14 | 0x1B<<7 | 0x36,
-	36975 - 19968: jis0208<<14 | 0x4D<<7 | 0x0B,
-	36976 - 19968: jis0212<<14 | 0x40<<7 | 0x43,
-	36978 - 19968: jis0208<<14 | 0x4D<<7 | 0x0E,
-	36980 - 19968: jis0212<<14 | 0x40<<7 | 0x44,
-	36981 - 19968: jis0208<<14 | 0x1C<<7 | 0x44,
-	36982 - 19968: jis0208<<14 | 0x4D<<7 | 0x0C,
-	36983 - 19968: jis0208<<14 | 0x20<<7 | 0x0A,
-	36984 - 19968: jis0208<<14 | 0x20<<7 | 0x09,
-	36985 - 19968: jis0212<<14 | 0x40<<7 | 0x45,
-	36986 - 19968: jis0208<<14 | 0x0F<<7 | 0x43,
-	36988 - 19968: jis0208<<14 | 0x2D<<7 | 0x2A,
-	36989 - 19968: jis0208<<14 | 0x4D<<7 | 0x10,
-	36991 - 19968: jis0208<<14 | 0x27<<7 | 0x51,
-	36992 - 19968: jis0208<<14 | 0x4D<<7 | 0x12,
-	36993 - 19968: jis0208<<14 | 0x4D<<7 | 0x11,
-	36994 - 19968: jis0208<<14 | 0x4D<<7 | 0x0F,
-	36995 - 19968: jis0208<<14 | 0x42<<7 | 0x43,
-	36996 - 19968: jis0208<<14 | 0x13<<7 | 0x33,
-	36997 - 19968: jis0212<<14 | 0x40<<7 | 0x46,
-	36999 - 19968: jis0208<<14 | 0x4C<<7 | 0x4D,
-	37000 - 19968: jis0212<<14 | 0x40<<7 | 0x47,
-	37001 - 19968: jis0208<<14 | 0x4D<<7 | 0x14,
-	37002 - 19968: jis0208<<14 | 0x4D<<7 | 0x13,
-	37003 - 19968: jis0212<<14 | 0x40<<7 | 0x48,
-	37004 - 19968: jis0212<<14 | 0x40<<7 | 0x49,
-	37006 - 19968: jis0212<<14 | 0x40<<7 | 0x4A,
-	37007 - 19968: jis0208<<14 | 0x4D<<7 | 0x15,
-	37008 - 19968: jis0212<<14 | 0x40<<7 | 0x4B,
-	37009 - 19968: jis0208<<14 | 0x2C<<7 | 0x17,
-	37013 - 19968: jis0212<<14 | 0x40<<7 | 0x4C,
-	37015 - 19968: jis0212<<14 | 0x40<<7 | 0x4D,
-	37016 - 19968: jis0212<<14 | 0x40<<7 | 0x4E,
-	37017 - 19968: jis0212<<14 | 0x40<<7 | 0x4F,
-	37019 - 19968: jis0212<<14 | 0x40<<7 | 0x50,
-	37024 - 19968: jis0212<<14 | 0x40<<7 | 0x51,
-	37025 - 19968: jis0212<<14 | 0x40<<7 | 0x52,
-	37026 - 19968: jis0212<<14 | 0x40<<7 | 0x53,
-	37027 - 19968: jis0208<<14 | 0x25<<7 | 0x40,
-	37029 - 19968: jis0212<<14 | 0x40<<7 | 0x54,
-	37030 - 19968: jis0208<<14 | 0x2A<<7 | 0x0D,
-	37032 - 19968: jis0208<<14 | 0x4D<<7 | 0x16,
-	37034 - 19968: jis0208<<14 | 0x1B<<7 | 0x38,
-	37039 - 19968: jis0208<<14 | 0x4D<<7 | 0x17,
-	37040 - 19968: jis0212<<14 | 0x40<<7 | 0x55,
-	37041 - 19968: jis0208<<14 | 0x4D<<7 | 0x18,
-	37042 - 19968: jis0212<<14 | 0x40<<7 | 0x56,
-	37043 - 19968: jis0212<<14 | 0x40<<7 | 0x57,
-	37044 - 19968: jis0212<<14 | 0x40<<7 | 0x58,
-	37045 - 19968: jis0208<<14 | 0x4D<<7 | 0x19,
-	37046 - 19968: jis0212<<14 | 0x40<<7 | 0x59,
-	37048 - 19968: jis0208<<14 | 0x24<<7 | 0x00,
-	37053 - 19968: jis0212<<14 | 0x40<<7 | 0x5A,
-	37054 - 19968: jis0212<<14 | 0x40<<7 | 0x5C,
-	37057 - 19968: jis0208<<14 | 0x0F<<7 | 0x49,
-	37059 - 19968: jis0212<<14 | 0x40<<7 | 0x5D,
-	37060 - 19968: jis0212<<14 | 0x41<<7 | 0x00,
-	37061 - 19968: jis0212<<14 | 0x41<<7 | 0x01,
-	37063 - 19968: jis0212<<14 | 0x41<<7 | 0x02,
-	37064 - 19968: jis0212<<14 | 0x41<<7 | 0x03,
-	37066 - 19968: jis0208<<14 | 0x18<<7 | 0x38,
-	37068 - 19968: jis0212<<14 | 0x40<<7 | 0x5B,
-	37070 - 19968: jis0208<<14 | 0x2E<<7 | 0x19,
-	37074 - 19968: jis0212<<14 | 0x41<<7 | 0x0C,
-	37077 - 19968: jis0212<<14 | 0x41<<7 | 0x04,
-	37079 - 19968: jis0212<<14 | 0x41<<7 | 0x05,
-	37080 - 19968: jis0212<<14 | 0x41<<7 | 0x06,
-	37081 - 19968: jis0212<<14 | 0x41<<7 | 0x07,
-	37083 - 19968: jis0208<<14 | 0x4D<<7 | 0x1D,
-	37084 - 19968: jis0212<<14 | 0x41<<7 | 0x08,
-	37085 - 19968: jis0212<<14 | 0x41<<7 | 0x09,
-	37086 - 19968: jis0208<<14 | 0x5A<<7 | 0x59,
-	37087 - 19968: jis0212<<14 | 0x41<<7 | 0x0A,
-	37089 - 19968: jis0208<<14 | 0x16<<7 | 0x13,
-	37090 - 19968: jis0208<<14 | 0x4D<<7 | 0x1A,
-	37092 - 19968: jis0208<<14 | 0x4D<<7 | 0x1B,
-	37093 - 19968: jis0212<<14 | 0x41<<7 | 0x0B,
-	37096 - 19968: jis0208<<14 | 0x28<<7 | 0x53,
-	37099 - 19968: jis0212<<14 | 0x41<<7 | 0x0E,
-	37101 - 19968: jis0208<<14 | 0x12<<7 | 0x33,
-	37103 - 19968: jis0212<<14 | 0x41<<7 | 0x0F,
-	37104 - 19968: jis0212<<14 | 0x41<<7 | 0x10,
-	37108 - 19968: jis0212<<14 | 0x41<<7 | 0x11,
-	37109 - 19968: jis0208<<14 | 0x2C<<7 | 0x18,
-	37110 - 19968: jis0212<<14 | 0x41<<7 | 0x0D,
-	37111 - 19968: jis0208<<14 | 0x15<<7 | 0x1E,
-	37117 - 19968: jis0208<<14 | 0x24<<7 | 0x33,
-	37118 - 19968: jis0212<<14 | 0x41<<7 | 0x12,
-	37119 - 19968: jis0212<<14 | 0x41<<7 | 0x13,
-	37120 - 19968: jis0212<<14 | 0x41<<7 | 0x14,
-	37122 - 19968: jis0208<<14 | 0x4D<<7 | 0x1E,
-	37124 - 19968: jis0212<<14 | 0x41<<7 | 0x15,
-	37125 - 19968: jis0212<<14 | 0x41<<7 | 0x16,
-	37126 - 19968: jis0212<<14 | 0x41<<7 | 0x17,
-	37128 - 19968: jis0212<<14 | 0x41<<7 | 0x18,
-	37133 - 19968: jis0212<<14 | 0x41<<7 | 0x19,
-	37136 - 19968: jis0212<<14 | 0x41<<7 | 0x1A,
-	37138 - 19968: jis0208<<14 | 0x4D<<7 | 0x1F,
-	37140 - 19968: jis0212<<14 | 0x41<<7 | 0x1B,
-	37141 - 19968: jis0208<<14 | 0x5A<<7 | 0x5B,
-	37142 - 19968: jis0212<<14 | 0x41<<7 | 0x1C,
-	37143 - 19968: jis0212<<14 | 0x41<<7 | 0x1D,
-	37144 - 19968: jis0212<<14 | 0x41<<7 | 0x1E,
-	37145 - 19968: jis0208<<14 | 0x4D<<7 | 0x20,
-	37146 - 19968: jis0212<<14 | 0x41<<7 | 0x1F,
-	37148 - 19968: jis0212<<14 | 0x41<<7 | 0x20,
-	37150 - 19968: jis0212<<14 | 0x41<<7 | 0x21,
-	37152 - 19968: jis0212<<14 | 0x41<<7 | 0x22,
-	37154 - 19968: jis0212<<14 | 0x41<<7 | 0x24,
-	37155 - 19968: jis0212<<14 | 0x41<<7 | 0x25,
-	37157 - 19968: jis0212<<14 | 0x41<<7 | 0x23,
-	37159 - 19968: jis0208<<14 | 0x5A<<7 | 0x5C,
-	37161 - 19968: jis0212<<14 | 0x41<<7 | 0x27,
-	37165 - 19968: jis0208<<14 | 0x24<<7 | 0x01,
-	37166 - 19968: jis0212<<14 | 0x41<<7 | 0x28,
-	37167 - 19968: jis0212<<14 | 0x41<<7 | 0x29,
-	37168 - 19968: jis0208<<14 | 0x4D<<7 | 0x22,
-	37169 - 19968: jis0212<<14 | 0x41<<7 | 0x2A,
-	37170 - 19968: jis0208<<14 | 0x4D<<7 | 0x21,
-	37172 - 19968: jis0212<<14 | 0x41<<7 | 0x2B,
-	37174 - 19968: jis0212<<14 | 0x41<<7 | 0x2C,
-	37175 - 19968: jis0212<<14 | 0x41<<7 | 0x2D,
-	37177 - 19968: jis0212<<14 | 0x41<<7 | 0x2E,
-	37178 - 19968: jis0212<<14 | 0x41<<7 | 0x2F,
-	37180 - 19968: jis0212<<14 | 0x41<<7 | 0x30,
-	37181 - 19968: jis0212<<14 | 0x41<<7 | 0x31,
-	37187 - 19968: jis0212<<14 | 0x41<<7 | 0x32,
-	37191 - 19968: jis0212<<14 | 0x41<<7 | 0x33,
-	37192 - 19968: jis0212<<14 | 0x41<<7 | 0x34,
-	37193 - 19968: jis0208<<14 | 0x25<<7 | 0x32,
-	37194 - 19968: jis0208<<14 | 0x4D<<7 | 0x23,
-	37195 - 19968: jis0208<<14 | 0x1C<<7 | 0x15,
-	37196 - 19968: jis0208<<14 | 0x1B<<7 | 0x3F,
-	37197 - 19968: jis0208<<14 | 0x26<<7 | 0x3A,
-	37198 - 19968: jis0208<<14 | 0x22<<7 | 0x50,
-	37199 - 19968: jis0212<<14 | 0x41<<7 | 0x35,
-	37202 - 19968: jis0208<<14 | 0x1B<<7 | 0x51,
-	37203 - 19968: jis0212<<14 | 0x41<<7 | 0x36,
-	37204 - 19968: jis0208<<14 | 0x1E<<7 | 0x4B,
-	37206 - 19968: jis0208<<14 | 0x4D<<7 | 0x24,
-	37207 - 19968: jis0212<<14 | 0x41<<7 | 0x37,
-	37208 - 19968: jis0208<<14 | 0x4D<<7 | 0x25,
-	37209 - 19968: jis0212<<14 | 0x41<<7 | 0x38,
-	37210 - 19968: jis0212<<14 | 0x41<<7 | 0x39,
-	37211 - 19968: jis0212<<14 | 0x41<<7 | 0x3A,
-	37217 - 19968: jis0212<<14 | 0x41<<7 | 0x3B,
-	37218 - 19968: jis0208<<14 | 0x1E<<7 | 0x3C,
-	37219 - 19968: jis0208<<14 | 0x4D<<7 | 0x26,
-	37220 - 19968: jis0212<<14 | 0x41<<7 | 0x3C,
-	37221 - 19968: jis0208<<14 | 0x4D<<7 | 0x27,
-	37223 - 19968: jis0212<<14 | 0x41<<7 | 0x3D,
-	37225 - 19968: jis0208<<14 | 0x4D<<7 | 0x28,
-	37226 - 19968: jis0208<<14 | 0x2C<<7 | 0x4E,
-	37228 - 19968: jis0208<<14 | 0x1C<<7 | 0x16,
-	37229 - 19968: jis0212<<14 | 0x41<<7 | 0x3E,
-	37234 - 19968: jis0208<<14 | 0x4D<<7 | 0x2A,
-	37235 - 19968: jis0208<<14 | 0x4D<<7 | 0x29,
-	37236 - 19968: jis0212<<14 | 0x41<<7 | 0x3F,
-	37237 - 19968: jis0208<<14 | 0x18<<7 | 0x39,
-	37239 - 19968: jis0208<<14 | 0x18<<7 | 0x52,
-	37240 - 19968: jis0208<<14 | 0x1A<<7 | 0x1F,
-	37241 - 19968: jis0212<<14 | 0x41<<7 | 0x40,
-	37242 - 19968: jis0212<<14 | 0x41<<7 | 0x41,
-	37243 - 19968: jis0212<<14 | 0x41<<7 | 0x42,
-	37249 - 19968: jis0212<<14 | 0x41<<7 | 0x43,
-	37250 - 19968: jis0208<<14 | 0x4D<<7 | 0x2D,
-	37251 - 19968: jis0212<<14 | 0x41<<7 | 0x44,
-	37253 - 19968: jis0212<<14 | 0x41<<7 | 0x45,
-	37254 - 19968: jis0212<<14 | 0x41<<7 | 0x46,
-	37255 - 19968: jis0208<<14 | 0x1C<<7 | 0x45,
-	37257 - 19968: jis0208<<14 | 0x4D<<7 | 0x2C,
-	37258 - 19968: jis0212<<14 | 0x41<<7 | 0x47,
-	37259 - 19968: jis0208<<14 | 0x4D<<7 | 0x2B,
-	37261 - 19968: jis0208<<14 | 0x21<<7 | 0x48,
-	37262 - 19968: jis0212<<14 | 0x41<<7 | 0x48,
-	37264 - 19968: jis0208<<14 | 0x17<<7 | 0x4E,
-	37265 - 19968: jis0212<<14 | 0x41<<7 | 0x49,
-	37266 - 19968: jis0208<<14 | 0x1F<<7 | 0x22,
-	37267 - 19968: jis0212<<14 | 0x41<<7 | 0x4A,
-	37268 - 19968: jis0212<<14 | 0x41<<7 | 0x4B,
-	37269 - 19968: jis0212<<14 | 0x41<<7 | 0x4C,
-	37271 - 19968: jis0208<<14 | 0x27<<7 | 0x0F,
-	37272 - 19968: jis0212<<14 | 0x41<<7 | 0x4D,
-	37276 - 19968: jis0208<<14 | 0x1C<<7 | 0x18,
-	37278 - 19968: jis0212<<14 | 0x41<<7 | 0x4E,
-	37281 - 19968: jis0212<<14 | 0x41<<7 | 0x4F,
-	37282 - 19968: jis0208<<14 | 0x4D<<7 | 0x2E,
-	37284 - 19968: jis0208<<14 | 0x1D<<7 | 0x3E,
-	37286 - 19968: jis0212<<14 | 0x41<<7 | 0x50,
-	37288 - 19968: jis0212<<14 | 0x41<<7 | 0x51,
-	37290 - 19968: jis0208<<14 | 0x4D<<7 | 0x31,
-	37291 - 19968: jis0208<<14 | 0x4D<<7 | 0x2F,
-	37292 - 19968: jis0212<<14 | 0x41<<7 | 0x52,
-	37293 - 19968: jis0212<<14 | 0x41<<7 | 0x53,
-	37294 - 19968: jis0212<<14 | 0x41<<7 | 0x54,
-	37295 - 19968: jis0208<<14 | 0x4D<<7 | 0x30,
-	37296 - 19968: jis0212<<14 | 0x41<<7 | 0x55,
-	37297 - 19968: jis0212<<14 | 0x41<<7 | 0x56,
-	37298 - 19968: jis0212<<14 | 0x41<<7 | 0x57,
-	37299 - 19968: jis0212<<14 | 0x41<<7 | 0x58,
-	37300 - 19968: jis0208<<14 | 0x4D<<7 | 0x33,
-	37301 - 19968: jis0208<<14 | 0x4D<<7 | 0x32,
-	37302 - 19968: jis0212<<14 | 0x41<<7 | 0x59,
-	37304 - 19968: jis0208<<14 | 0x1D<<7 | 0x59,
-	37306 - 19968: jis0208<<14 | 0x4D<<7 | 0x34,
-	37307 - 19968: jis0212<<14 | 0x41<<7 | 0x5A,
-	37308 - 19968: jis0212<<14 | 0x41<<7 | 0x5B,
-	37309 - 19968: jis0212<<14 | 0x41<<7 | 0x5C,
-	37311 - 19968: jis0212<<14 | 0x41<<7 | 0x5D,
-	37312 - 19968: jis0208<<14 | 0x4D<<7 | 0x35,
-	37313 - 19968: jis0208<<14 | 0x4D<<7 | 0x36,
-	37314 - 19968: jis0212<<14 | 0x42<<7 | 0x00,
-	37315 - 19968: jis0212<<14 | 0x42<<7 | 0x01,
-	37317 - 19968: jis0212<<14 | 0x42<<7 | 0x02,
-	37318 - 19968: jis0208<<14 | 0x27<<7 | 0x2F,
-	37319 - 19968: jis0208<<14 | 0x19<<7 | 0x32,
-	37320 - 19968: jis0208<<14 | 0x1B<<7 | 0x40,
-	37321 - 19968: jis0208<<14 | 0x4D<<7 | 0x37,
-	37323 - 19968: jis0208<<14 | 0x4D<<7 | 0x38,
-	37324 - 19968: jis0208<<14 | 0x2D<<7 | 0x03,
-	37325 - 19968: jis0208<<14 | 0x1C<<7 | 0x24,
-	37326 - 19968: jis0208<<14 | 0x2B<<7 | 0x4D,
-	37327 - 19968: jis0208<<14 | 0x2D<<7 | 0x2B,
-	37328 - 19968: jis0208<<14 | 0x4D<<7 | 0x39,
-	37329 - 19968: jis0208<<14 | 0x15<<7 | 0x41,
-	37331 - 19968: jis0212<<14 | 0x42<<7 | 0x03,
-	37332 - 19968: jis0212<<14 | 0x42<<7 | 0x04,
-	37334 - 19968: jis0208<<14 | 0x4D<<7 | 0x3A,
-	37335 - 19968: jis0208<<14 | 0x5B<<7 | 0x00,
-	37336 - 19968: jis0208<<14 | 0x24<<7 | 0x02,
-	37337 - 19968: jis0212<<14 | 0x42<<7 | 0x06,
-	37338 - 19968: jis0208<<14 | 0x5A<<7 | 0x5D,
-	37339 - 19968: jis0208<<14 | 0x4D<<7 | 0x3D,
-	37340 - 19968: jis0208<<14 | 0x12<<7 | 0x57,
-	37341 - 19968: jis0208<<14 | 0x1E<<7 | 0x2A,
-	37342 - 19968: jis0208<<14 | 0x5B<<7 | 0x01,
-	37343 - 19968: jis0208<<14 | 0x4D<<7 | 0x3B,
-	37345 - 19968: jis0208<<14 | 0x4D<<7 | 0x3C,
-	37347 - 19968: jis0208<<14 | 0x23<<7 | 0x3F,
-	37348 - 19968: jis0208<<14 | 0x5B<<7 | 0x04,
-	37349 - 19968: jis0208<<14 | 0x5B<<7 | 0x05,
-	37350 - 19968: jis0208<<14 | 0x2A<<7 | 0x34,
-	37351 - 19968: jis0208<<14 | 0x15<<7 | 0x5B,
-	37353 - 19968: jis0212<<14 | 0x42<<7 | 0x0B,
-	37354 - 19968: jis0212<<14 | 0x42<<7 | 0x0C,
-	37356 - 19968: jis0212<<14 | 0x42<<7 | 0x0D,
-	37357 - 19968: jis0208<<14 | 0x5B<<7 | 0x02,
-	37358 - 19968: jis0208<<14 | 0x5B<<7 | 0x03,
-	37359 - 19968: jis0212<<14 | 0x42<<7 | 0x10,
-	37360 - 19968: jis0212<<14 | 0x42<<7 | 0x11,
-	37361 - 19968: jis0212<<14 | 0x42<<7 | 0x12,
-	37365 - 19968: jis0208<<14 | 0x4D<<7 | 0x3F,
-	37366 - 19968: jis0208<<14 | 0x4D<<7 | 0x40,
-	37367 - 19968: jis0212<<14 | 0x42<<7 | 0x13,
-	37369 - 19968: jis0212<<14 | 0x42<<7 | 0x14,
-	37371 - 19968: jis0212<<14 | 0x42<<7 | 0x15,
-	37372 - 19968: jis0208<<14 | 0x4D<<7 | 0x3E,
-	37373 - 19968: jis0212<<14 | 0x42<<7 | 0x16,
-	37375 - 19968: jis0208<<14 | 0x4D<<7 | 0x42,
-	37376 - 19968: jis0212<<14 | 0x42<<7 | 0x17,
-	37377 - 19968: jis0212<<14 | 0x42<<7 | 0x18,
-	37380 - 19968: jis0212<<14 | 0x42<<7 | 0x19,
-	37381 - 19968: jis0212<<14 | 0x42<<7 | 0x1A,
-	37382 - 19968: jis0208<<14 | 0x5B<<7 | 0x06,
-	37383 - 19968: jis0212<<14 | 0x42<<7 | 0x1C,
-	37385 - 19968: jis0212<<14 | 0x42<<7 | 0x1D,
-	37386 - 19968: jis0208<<14 | 0x5B<<7 | 0x08,
-	37388 - 19968: jis0212<<14 | 0x42<<7 | 0x1F,
-	37389 - 19968: jis0208<<14 | 0x25<<7 | 0x3E,
-	37390 - 19968: jis0208<<14 | 0x12<<7 | 0x22,
-	37392 - 19968: jis0208<<14 | 0x5B<<7 | 0x07,
-	37393 - 19968: jis0208<<14 | 0x4D<<7 | 0x46,
-	37394 - 19968: jis0212<<14 | 0x42<<7 | 0x21,
-	37395 - 19968: jis0212<<14 | 0x42<<7 | 0x22,
-	37396 - 19968: jis0208<<14 | 0x4D<<7 | 0x43,
-	37397 - 19968: jis0208<<14 | 0x4D<<7 | 0x45,
-	37398 - 19968: jis0212<<14 | 0x42<<7 | 0x23,
-	37400 - 19968: jis0212<<14 | 0x42<<7 | 0x24,
-	37404 - 19968: jis0212<<14 | 0x42<<7 | 0x25,
-	37405 - 19968: jis0212<<14 | 0x42<<7 | 0x26,
-	37406 - 19968: jis0208<<14 | 0x4D<<7 | 0x41,
-	37411 - 19968: jis0212<<14 | 0x42<<7 | 0x27,
-	37412 - 19968: jis0212<<14 | 0x42<<7 | 0x28,
-	37413 - 19968: jis0212<<14 | 0x42<<7 | 0x29,
-	37414 - 19968: jis0212<<14 | 0x42<<7 | 0x2A,
-	37416 - 19968: jis0212<<14 | 0x42<<7 | 0x2B,
-	37417 - 19968: jis0208<<14 | 0x4E<<7 | 0x2E,
-	37420 - 19968: jis0208<<14 | 0x4D<<7 | 0x44,
-	37422 - 19968: jis0212<<14 | 0x42<<7 | 0x2C,
-	37423 - 19968: jis0212<<14 | 0x42<<7 | 0x2D,
-	37424 - 19968: jis0212<<14 | 0x42<<7 | 0x2E,
-	37427 - 19968: jis0212<<14 | 0x42<<7 | 0x2F,
-	37428 - 19968: jis0208<<14 | 0x2D<<7 | 0x4A,
-	37429 - 19968: jis0212<<14 | 0x42<<7 | 0x30,
-	37430 - 19968: jis0212<<14 | 0x42<<7 | 0x31,
-	37431 - 19968: jis0208<<14 | 0x17<<7 | 0x39,
-	37432 - 19968: jis0212<<14 | 0x42<<7 | 0x32,
-	37433 - 19968: jis0208<<14 | 0x5B<<7 | 0x0F,
-	37434 - 19968: jis0208<<14 | 0x5B<<7 | 0x09,
-	37436 - 19968: jis0208<<14 | 0x5B<<7 | 0x0B,
-	37438 - 19968: jis0212<<14 | 0x42<<7 | 0x36,
-	37439 - 19968: jis0208<<14 | 0x4D<<7 | 0x4E,
-	37440 - 19968: jis0208<<14 | 0x5B<<7 | 0x0A,
-	37442 - 19968: jis0212<<14 | 0x42<<7 | 0x38,
-	37443 - 19968: jis0212<<14 | 0x42<<7 | 0x39,
-	37444 - 19968: jis0208<<14 | 0x24<<7 | 0x13,
-	37445 - 19968: jis0208<<14 | 0x4D<<7 | 0x49,
-	37446 - 19968: jis0212<<14 | 0x42<<7 | 0x3A,
-	37447 - 19968: jis0212<<14 | 0x42<<7 | 0x3B,
-	37448 - 19968: jis0208<<14 | 0x4D<<7 | 0x4C,
-	37449 - 19968: jis0208<<14 | 0x4D<<7 | 0x4A,
-	37450 - 19968: jis0212<<14 | 0x42<<7 | 0x3C,
-	37451 - 19968: jis0208<<14 | 0x4D<<7 | 0x4F,
-	37453 - 19968: jis0212<<14 | 0x42<<7 | 0x3D,
-	37454 - 19968: jis0208<<14 | 0x5B<<7 | 0x0C,
-	37455 - 19968: jis0212<<14 | 0x42<<7 | 0x3F,
-	37456 - 19968: jis0208<<14 | 0x4D<<7 | 0x50,
-	37457 - 19968: jis0208<<14 | 0x5B<<7 | 0x0E,
-	37463 - 19968: jis0208<<14 | 0x4D<<7 | 0x48,
-	37464 - 19968: jis0212<<14 | 0x42<<7 | 0x41,
-	37465 - 19968: jis0208<<14 | 0x5B<<7 | 0x0D,
-	37466 - 19968: jis0208<<14 | 0x4D<<7 | 0x55,
-	37467 - 19968: jis0208<<14 | 0x10<<7 | 0x53,
-	37468 - 19968: jis0212<<14 | 0x42<<7 | 0x43,
-	37469 - 19968: jis0212<<14 | 0x42<<7 | 0x44,
-	37470 - 19968: jis0208<<14 | 0x4D<<7 | 0x47,
-	37472 - 19968: jis0212<<14 | 0x42<<7 | 0x45,
-	37473 - 19968: jis0212<<14 | 0x42<<7 | 0x46,
-	37474 - 19968: jis0208<<14 | 0x27<<7 | 0x0C,
-	37476 - 19968: jis0208<<14 | 0x4D<<7 | 0x4B,
-	37477 - 19968: jis0212<<14 | 0x42<<7 | 0x47,
-	37478 - 19968: jis0208<<14 | 0x1D<<7 | 0x3F,
-	37479 - 19968: jis0208<<14 | 0x5B<<7 | 0x10,
-	37480 - 19968: jis0212<<14 | 0x42<<7 | 0x49,
-	37481 - 19968: jis0212<<14 | 0x42<<7 | 0x4A,
-	37486 - 19968: jis0212<<14 | 0x42<<7 | 0x4B,
-	37487 - 19968: jis0212<<14 | 0x42<<7 | 0x4C,
-	37488 - 19968: jis0212<<14 | 0x42<<7 | 0x4D,
-	37489 - 19968: jis0208<<14 | 0x18<<7 | 0x3A,
-	37493 - 19968: jis0212<<14 | 0x42<<7 | 0x4E,
-	37494 - 19968: jis0212<<14 | 0x42<<7 | 0x4F,
-	37495 - 19968: jis0208<<14 | 0x5B<<7 | 0x12,
-	37496 - 19968: jis0208<<14 | 0x5B<<7 | 0x13,
-	37497 - 19968: jis0212<<14 | 0x42<<7 | 0x52,
-	37499 - 19968: jis0212<<14 | 0x42<<7 | 0x53,
-	37500 - 19968: jis0212<<14 | 0x42<<7 | 0x54,
-	37501 - 19968: jis0212<<14 | 0x42<<7 | 0x55,
-	37502 - 19968: jis0208<<14 | 0x2A<<7 | 0x27,
-	37503 - 19968: jis0212<<14 | 0x42<<7 | 0x56,
-	37504 - 19968: jis0208<<14 | 0x15<<7 | 0x43,
-	37507 - 19968: jis0208<<14 | 0x1C<<7 | 0x25,
-	37509 - 19968: jis0208<<14 | 0x25<<7 | 0x1B,
-	37512 - 19968: jis0208<<14 | 0x58<<7 | 0x03,
-	37513 - 19968: jis0212<<14 | 0x42<<7 | 0x58,
-	37514 - 19968: jis0212<<14 | 0x42<<7 | 0x59,
-	37517 - 19968: jis0212<<14 | 0x42<<7 | 0x5A,
-	37518 - 19968: jis0212<<14 | 0x42<<7 | 0x5B,
-	37521 - 19968: jis0208<<14 | 0x20<<7 | 0x0C,
-	37522 - 19968: jis0212<<14 | 0x42<<7 | 0x5C,
-	37523 - 19968: jis0208<<14 | 0x4D<<7 | 0x53,
-	37525 - 19968: jis0208<<14 | 0x4D<<7 | 0x4D,
-	37526 - 19968: jis0208<<14 | 0x4D<<7 | 0x52,
-	37527 - 19968: jis0212<<14 | 0x42<<7 | 0x5D,
-	37528 - 19968: jis0208<<14 | 0x2B<<7 | 0x22,
-	37529 - 19968: jis0212<<14 | 0x43<<7 | 0x00,
-	37530 - 19968: jis0208<<14 | 0x23<<7 | 0x17,
-	37531 - 19968: jis0208<<14 | 0x4D<<7 | 0x54,
-	37532 - 19968: jis0208<<14 | 0x4D<<7 | 0x51,
-	37535 - 19968: jis0212<<14 | 0x43<<7 | 0x01,
-	37536 - 19968: jis0212<<14 | 0x43<<7 | 0x02,
-	37540 - 19968: jis0212<<14 | 0x43<<7 | 0x03,
-	37541 - 19968: jis0212<<14 | 0x43<<7 | 0x04,
-	37543 - 19968: jis0208<<14 | 0x5B<<7 | 0x11,
-	37544 - 19968: jis0212<<14 | 0x43<<7 | 0x06,
-	37547 - 19968: jis0212<<14 | 0x43<<7 | 0x07,
-	37549 - 19968: jis0208<<14 | 0x20<<7 | 0x0B,
-	37551 - 19968: jis0212<<14 | 0x43<<7 | 0x08,
-	37554 - 19968: jis0212<<14 | 0x43<<7 | 0x09,
-	37558 - 19968: jis0212<<14 | 0x43<<7 | 0x0A,
-	37559 - 19968: jis0208<<14 | 0x4D<<7 | 0x58,
-	37560 - 19968: jis0212<<14 | 0x43<<7 | 0x0B,
-	37561 - 19968: jis0208<<14 | 0x4D<<7 | 0x57,
-	37562 - 19968: jis0212<<14 | 0x43<<7 | 0x0C,
-	37563 - 19968: jis0212<<14 | 0x43<<7 | 0x0D,
-	37564 - 19968: jis0212<<14 | 0x43<<7 | 0x0E,
-	37565 - 19968: jis0212<<14 | 0x43<<7 | 0x0F,
-	37567 - 19968: jis0212<<14 | 0x43<<7 | 0x10,
-	37568 - 19968: jis0212<<14 | 0x43<<7 | 0x11,
-	37569 - 19968: jis0212<<14 | 0x43<<7 | 0x12,
-	37570 - 19968: jis0212<<14 | 0x43<<7 | 0x13,
-	37571 - 19968: jis0212<<14 | 0x43<<7 | 0x14,
-	37573 - 19968: jis0212<<14 | 0x43<<7 | 0x15,
-	37574 - 19968: jis0212<<14 | 0x43<<7 | 0x16,
-	37575 - 19968: jis0212<<14 | 0x43<<7 | 0x17,
-	37576 - 19968: jis0212<<14 | 0x43<<7 | 0x18,
-	37579 - 19968: jis0212<<14 | 0x43<<7 | 0x19,
-	37580 - 19968: jis0212<<14 | 0x43<<7 | 0x1A,
-	37581 - 19968: jis0212<<14 | 0x43<<7 | 0x1B,
-	37582 - 19968: jis0212<<14 | 0x43<<7 | 0x1C,
-	37583 - 19968: jis0208<<14 | 0x4D<<7 | 0x56,
-	37584 - 19968: jis0208<<14 | 0x5B<<7 | 0x17,
-	37586 - 19968: jis0208<<14 | 0x2A<<7 | 0x0E,
-	37587 - 19968: jis0208<<14 | 0x5B<<7 | 0x1B,
-	37589 - 19968: jis0208<<14 | 0x5B<<7 | 0x19,
-	37591 - 19968: jis0208<<14 | 0x5B<<7 | 0x15,
-	37592 - 19968: jis0212<<14 | 0x43<<7 | 0x21,
-	37593 - 19968: jis0208<<14 | 0x5B<<7 | 0x16,
-	37596 - 19968: jis0212<<14 | 0x43<<7 | 0x23,
-	37597 - 19968: jis0212<<14 | 0x43<<7 | 0x24,
-	37599 - 19968: jis0212<<14 | 0x43<<7 | 0x25,
-	37600 - 19968: jis0208<<14 | 0x5B<<7 | 0x1A,
-	37601 - 19968: jis0212<<14 | 0x43<<7 | 0x27,
-	37603 - 19968: jis0212<<14 | 0x43<<7 | 0x28,
-	37604 - 19968: jis0208<<14 | 0x1C<<7 | 0x5A,
-	37605 - 19968: jis0212<<14 | 0x43<<7 | 0x29,
-	37607 - 19968: jis0208<<14 | 0x5B<<7 | 0x14,
-	37608 - 19968: jis0212<<14 | 0x43<<7 | 0x2B,
-	37609 - 19968: jis0208<<14 | 0x4D<<7 | 0x59,
-	37610 - 19968: jis0208<<14 | 0x29<<7 | 0x3E,
-	37612 - 19968: jis0212<<14 | 0x43<<7 | 0x2C,
-	37613 - 19968: jis0208<<14 | 0x10<<7 | 0x33,
-	37614 - 19968: jis0212<<14 | 0x43<<7 | 0x2D,
-	37616 - 19968: jis0212<<14 | 0x43<<7 | 0x2E,
-	37618 - 19968: jis0208<<14 | 0x28<<7 | 0x25,
-	37619 - 19968: jis0208<<14 | 0x22<<7 | 0x51,
-	37624 - 19968: jis0208<<14 | 0x14<<7 | 0x57,
-	37625 - 19968: jis0208<<14 | 0x58<<7 | 0x09,
-	37626 - 19968: jis0208<<14 | 0x4D<<7 | 0x5B,
-	37627 - 19968: jis0208<<14 | 0x5B<<7 | 0x1E,
-	37628 - 19968: jis0208<<14 | 0x18<<7 | 0x3C,
-	37631 - 19968: jis0208<<14 | 0x5B<<7 | 0x21,
-	37632 - 19968: jis0212<<14 | 0x43<<7 | 0x32,
-	37634 - 19968: jis0208<<14 | 0x5B<<7 | 0x23,
-	37638 - 19968: jis0208<<14 | 0x1A<<7 | 0x0B,
-	37640 - 19968: jis0212<<14 | 0x43<<7 | 0x34,
-	37645 - 19968: jis0212<<14 | 0x43<<7 | 0x35,
-	37647 - 19968: jis0208<<14 | 0x4D<<7 | 0x5A,
-	37648 - 19968: jis0208<<14 | 0x1E<<7 | 0x4C,
-	37649 - 19968: jis0212<<14 | 0x43<<7 | 0x36,
-	37652 - 19968: jis0212<<14 | 0x43<<7 | 0x37,
-	37653 - 19968: jis0212<<14 | 0x43<<7 | 0x38,
-	37656 - 19968: jis0208<<14 | 0x1E<<7 | 0x4D,
-	37657 - 19968: jis0208<<14 | 0x4E<<7 | 0x00,
-	37658 - 19968: jis0208<<14 | 0x4E<<7 | 0x02,
-	37660 - 19968: jis0212<<14 | 0x43<<7 | 0x39,
-	37661 - 19968: jis0208<<14 | 0x5B<<7 | 0x22,
-	37662 - 19968: jis0208<<14 | 0x5B<<7 | 0x20,
-	37663 - 19968: jis0212<<14 | 0x43<<7 | 0x3C,
-	37664 - 19968: jis0208<<14 | 0x1D<<7 | 0x5A,
-	37665 - 19968: jis0208<<14 | 0x5B<<7 | 0x1D,
-	37666 - 19968: jis0208<<14 | 0x4E<<7 | 0x01,
-	37667 - 19968: jis0208<<14 | 0x4E<<7 | 0x03,
-	37668 - 19968: jis0212<<14 | 0x43<<7 | 0x3E,
-	37669 - 19968: jis0208<<14 | 0x5B<<7 | 0x1C,
-	37670 - 19968: jis0208<<14 | 0x15<<7 | 0x32,
-	37671 - 19968: jis0212<<14 | 0x43<<7 | 0x40,
-	37672 - 19968: jis0208<<14 | 0x28<<7 | 0x24,
-	37673 - 19968: jis0212<<14 | 0x43<<7 | 0x41,
-	37674 - 19968: jis0212<<14 | 0x43<<7 | 0x42,
-	37675 - 19968: jis0208<<14 | 0x1B<<7 | 0x41,
-	37676 - 19968: jis0208<<14 | 0x2E<<7 | 0x02,
-	37678 - 19968: jis0208<<14 | 0x4D<<7 | 0x5D,
-	37679 - 19968: jis0208<<14 | 0x19<<7 | 0x57,
-	37682 - 19968: jis0208<<14 | 0x2E<<7 | 0x1E,
-	37683 - 19968: jis0212<<14 | 0x43<<7 | 0x43,
-	37684 - 19968: jis0212<<14 | 0x43<<7 | 0x44,
-	37685 - 19968: jis0208<<14 | 0x4E<<7 | 0x05,
-	37686 - 19968: jis0212<<14 | 0x43<<7 | 0x45,
-	37687 - 19968: jis0212<<14 | 0x43<<7 | 0x46,
-	37690 - 19968: jis0208<<14 | 0x4E<<7 | 0x04,
-	37691 - 19968: jis0208<<14 | 0x4E<<7 | 0x06,
-	37700 - 19968: jis0208<<14 | 0x4D<<7 | 0x5C,
-	37703 - 19968: jis0212<<14 | 0x43<<7 | 0x47,
-	37704 - 19968: jis0208<<14 | 0x58<<7 | 0x02,
-	37705 - 19968: jis0212<<14 | 0x43<<7 | 0x49,
-	37707 - 19968: jis0208<<14 | 0x25<<7 | 0x48,
-	37709 - 19968: jis0208<<14 | 0x24<<7 | 0x34,
-	37712 - 19968: jis0212<<14 | 0x43<<7 | 0x4A,
-	37713 - 19968: jis0212<<14 | 0x43<<7 | 0x4B,
-	37714 - 19968: jis0212<<14 | 0x43<<7 | 0x4C,
-	37716 - 19968: jis0208<<14 | 0x23<<7 | 0x36,
-	37717 - 19968: jis0212<<14 | 0x43<<7 | 0x4D,
-	37718 - 19968: jis0208<<14 | 0x4E<<7 | 0x0B,
-	37719 - 19968: jis0208<<14 | 0x5B<<7 | 0x25,
-	37720 - 19968: jis0212<<14 | 0x43<<7 | 0x4F,
-	37722 - 19968: jis0212<<14 | 0x43<<7 | 0x50,
-	37723 - 19968: jis0208<<14 | 0x22<<7 | 0x22,
-	37724 - 19968: jis0208<<14 | 0x4E<<7 | 0x07,
-	37726 - 19968: jis0212<<14 | 0x43<<7 | 0x51,
-	37728 - 19968: jis0208<<14 | 0x4E<<7 | 0x08,
-	37732 - 19968: jis0212<<14 | 0x43<<7 | 0x52,
-	37733 - 19968: jis0212<<14 | 0x43<<7 | 0x53,
-	37735 - 19968: jis0212<<14 | 0x43<<7 | 0x54,
-	37737 - 19968: jis0212<<14 | 0x43<<7 | 0x55,
-	37738 - 19968: jis0212<<14 | 0x43<<7 | 0x56,
-	37740 - 19968: jis0208<<14 | 0x16<<7 | 0x0C,
-	37741 - 19968: jis0212<<14 | 0x43<<7 | 0x57,
-	37742 - 19968: jis0208<<14 | 0x4E<<7 | 0x0A,
-	37743 - 19968: jis0212<<14 | 0x43<<7 | 0x58,
-	37744 - 19968: jis0208<<14 | 0x5B<<7 | 0x24,
-	37745 - 19968: jis0212<<14 | 0x43<<7 | 0x5A,
-	37747 - 19968: jis0212<<14 | 0x43<<7 | 0x5B,
-	37748 - 19968: jis0212<<14 | 0x43<<7 | 0x5C,
-	37749 - 19968: jis0208<<14 | 0x17<<7 | 0x0F,
-	37750 - 19968: jis0212<<14 | 0x43<<7 | 0x5D,
-	37754 - 19968: jis0212<<14 | 0x44<<7 | 0x00,
-	37756 - 19968: jis0208<<14 | 0x4E<<7 | 0x09,
-	37757 - 19968: jis0212<<14 | 0x44<<7 | 0x01,
-	37758 - 19968: jis0208<<14 | 0x1D<<7 | 0x40,
-	37759 - 19968: jis0212<<14 | 0x44<<7 | 0x02,
-	37760 - 19968: jis0212<<14 | 0x44<<7 | 0x03,
-	37761 - 19968: jis0212<<14 | 0x44<<7 | 0x04,
-	37762 - 19968: jis0212<<14 | 0x44<<7 | 0x05,
-	37768 - 19968: jis0212<<14 | 0x44<<7 | 0x06,
-	37770 - 19968: jis0212<<14 | 0x44<<7 | 0x07,
-	37771 - 19968: jis0212<<14 | 0x44<<7 | 0x08,
-	37772 - 19968: jis0208<<14 | 0x12<<7 | 0x58,
-	37773 - 19968: jis0212<<14 | 0x44<<7 | 0x09,
-	37775 - 19968: jis0212<<14 | 0x44<<7 | 0x0A,
-	37778 - 19968: jis0212<<14 | 0x44<<7 | 0x0B,
-	37780 - 19968: jis0208<<14 | 0x4E<<7 | 0x0F,
-	37781 - 19968: jis0212<<14 | 0x44<<7 | 0x0C,
-	37782 - 19968: jis0208<<14 | 0x19<<7 | 0x1E,
-	37783 - 19968: jis0208<<14 | 0x20<<7 | 0x58,
-	37784 - 19968: jis0212<<14 | 0x44<<7 | 0x0D,
-	37786 - 19968: jis0208<<14 | 0x23<<7 | 0x29,
-	37787 - 19968: jis0212<<14 | 0x44<<7 | 0x0E,
-	37790 - 19968: jis0212<<14 | 0x44<<7 | 0x0F,
-	37793 - 19968: jis0212<<14 | 0x44<<7 | 0x10,
-	37795 - 19968: jis0212<<14 | 0x44<<7 | 0x11,
-	37796 - 19968: jis0208<<14 | 0x5B<<7 | 0x26,
-	37798 - 19968: jis0212<<14 | 0x44<<7 | 0x13,
-	37799 - 19968: jis0208<<14 | 0x12<<7 | 0x1A,
-	37800 - 19968: jis0212<<14 | 0x44<<7 | 0x14,
-	37801 - 19968: jis0212<<14 | 0x44<<7 | 0x1A,
-	37803 - 19968: jis0212<<14 | 0x44<<7 | 0x15,
-	37804 - 19968: jis0208<<14 | 0x4E<<7 | 0x0D,
-	37805 - 19968: jis0208<<14 | 0x4E<<7 | 0x0E,
-	37806 - 19968: jis0208<<14 | 0x23<<7 | 0x22,
-	37808 - 19968: jis0208<<14 | 0x4E<<7 | 0x0C,
-	37812 - 19968: jis0212<<14 | 0x44<<7 | 0x16,
-	37813 - 19968: jis0212<<14 | 0x44<<7 | 0x17,
-	37814 - 19968: jis0212<<14 | 0x44<<7 | 0x18,
-	37817 - 19968: jis0208<<14 | 0x4E<<7 | 0x10,
-	37818 - 19968: jis0212<<14 | 0x44<<7 | 0x19,
-	37825 - 19968: jis0212<<14 | 0x44<<7 | 0x1B,
-	37827 - 19968: jis0208<<14 | 0x4E<<7 | 0x16,
-	37828 - 19968: jis0212<<14 | 0x44<<7 | 0x1C,
-	37829 - 19968: jis0212<<14 | 0x44<<7 | 0x1D,
-	37830 - 19968: jis0208<<14 | 0x5B<<7 | 0x27,
-	37831 - 19968: jis0212<<14 | 0x44<<7 | 0x1F,
-	37832 - 19968: jis0208<<14 | 0x4E<<7 | 0x19,
-	37833 - 19968: jis0212<<14 | 0x44<<7 | 0x20,
-	37834 - 19968: jis0212<<14 | 0x44<<7 | 0x21,
-	37835 - 19968: jis0212<<14 | 0x44<<7 | 0x22,
-	37836 - 19968: jis0212<<14 | 0x44<<7 | 0x23,
-	37837 - 19968: jis0212<<14 | 0x44<<7 | 0x24,
-	37840 - 19968: jis0208<<14 | 0x4E<<7 | 0x18,
-	37841 - 19968: jis0208<<14 | 0x24<<7 | 0x0C,
-	37843 - 19968: jis0212<<14 | 0x44<<7 | 0x25,
-	37846 - 19968: jis0208<<14 | 0x4E<<7 | 0x11,
-	37847 - 19968: jis0208<<14 | 0x4E<<7 | 0x12,
-	37848 - 19968: jis0208<<14 | 0x4E<<7 | 0x15,
-	37849 - 19968: jis0212<<14 | 0x44<<7 | 0x26,
-	37852 - 19968: jis0212<<14 | 0x44<<7 | 0x27,
-	37853 - 19968: jis0208<<14 | 0x4E<<7 | 0x17,
-	37854 - 19968: jis0208<<14 | 0x5B<<7 | 0x28,
-	37855 - 19968: jis0212<<14 | 0x44<<7 | 0x29,
-	37857 - 19968: jis0208<<14 | 0x15<<7 | 0x1F,
-	37858 - 19968: jis0212<<14 | 0x44<<7 | 0x2A,
-	37860 - 19968: jis0208<<14 | 0x4E<<7 | 0x1A,
-	37861 - 19968: jis0208<<14 | 0x4E<<7 | 0x14,
-	37862 - 19968: jis0212<<14 | 0x44<<7 | 0x2B,
-	37863 - 19968: jis0212<<14 | 0x44<<7 | 0x2C,
-	37864 - 19968: jis0208<<14 | 0x4E<<7 | 0x13,
-	37879 - 19968: jis0212<<14 | 0x44<<7 | 0x2E,
-	37880 - 19968: jis0208<<14 | 0x5B<<7 | 0x29,
-	37881 - 19968: jis0212<<14 | 0x44<<7 | 0x2D,
-	37882 - 19968: jis0212<<14 | 0x44<<7 | 0x30,
-	37883 - 19968: jis0212<<14 | 0x44<<7 | 0x31,
-	37885 - 19968: jis0212<<14 | 0x44<<7 | 0x32,
-	37889 - 19968: jis0212<<14 | 0x44<<7 | 0x33,
-	37890 - 19968: jis0212<<14 | 0x44<<7 | 0x34,
-	37891 - 19968: jis0208<<14 | 0x4E<<7 | 0x1E,
-	37892 - 19968: jis0212<<14 | 0x44<<7 | 0x35,
-	37895 - 19968: jis0208<<14 | 0x4E<<7 | 0x1F,
-	37896 - 19968: jis0212<<14 | 0x44<<7 | 0x36,
-	37897 - 19968: jis0212<<14 | 0x44<<7 | 0x37,
-	37901 - 19968: jis0212<<14 | 0x44<<7 | 0x38,
-	37902 - 19968: jis0212<<14 | 0x44<<7 | 0x39,
-	37903 - 19968: jis0212<<14 | 0x44<<7 | 0x3A,
-	37904 - 19968: jis0208<<14 | 0x4E<<7 | 0x20,
-	37907 - 19968: jis0208<<14 | 0x4E<<7 | 0x1D,
-	37908 - 19968: jis0208<<14 | 0x4E<<7 | 0x1C,
-	37909 - 19968: jis0212<<14 | 0x44<<7 | 0x3B,
-	37910 - 19968: jis0212<<14 | 0x44<<7 | 0x3C,
-	37911 - 19968: jis0212<<14 | 0x44<<7 | 0x3D,
-	37912 - 19968: jis0208<<14 | 0x1D<<7 | 0x41,
-	37913 - 19968: jis0208<<14 | 0x25<<7 | 0x09,
-	37914 - 19968: jis0208<<14 | 0x4E<<7 | 0x1B,
-	37919 - 19968: jis0212<<14 | 0x44<<7 | 0x3E,
-	37921 - 19968: jis0208<<14 | 0x4E<<7 | 0x24,
-	37931 - 19968: jis0208<<14 | 0x4E<<7 | 0x22,
-	37934 - 19968: jis0212<<14 | 0x44<<7 | 0x3F,
-	37935 - 19968: jis0212<<14 | 0x44<<7 | 0x40,
-	37937 - 19968: jis0208<<14 | 0x5B<<7 | 0x2A,
-	37938 - 19968: jis0212<<14 | 0x44<<7 | 0x42,
-	37939 - 19968: jis0212<<14 | 0x44<<7 | 0x43,
-	37940 - 19968: jis0212<<14 | 0x44<<7 | 0x44,
-	37941 - 19968: jis0208<<14 | 0x4E<<7 | 0x23,
-	37942 - 19968: jis0208<<14 | 0x4E<<7 | 0x21,
-	37944 - 19968: jis0208<<14 | 0x21<<7 | 0x57,
-	37946 - 19968: jis0208<<14 | 0x4E<<7 | 0x25,
-	37947 - 19968: jis0212<<14 | 0x44<<7 | 0x45,
-	37949 - 19968: jis0212<<14 | 0x44<<7 | 0x47,
-	37951 - 19968: jis0212<<14 | 0x44<<7 | 0x46,
-	37953 - 19968: jis0208<<14 | 0x4E<<7 | 0x26,
-	37955 - 19968: jis0212<<14 | 0x44<<7 | 0x48,
-	37956 - 19968: jis0208<<14 | 0x4E<<7 | 0x28,
-	37957 - 19968: jis0208<<14 | 0x5B<<7 | 0x2B,
-	37960 - 19968: jis0208<<14 | 0x5B<<7 | 0x2C,
-	37962 - 19968: jis0212<<14 | 0x44<<7 | 0x4B,
-	37964 - 19968: jis0212<<14 | 0x44<<7 | 0x4C,
-	37969 - 19968: jis0208<<14 | 0x13<<7 | 0x34,
-	37970 - 19968: jis0208<<14 | 0x4E<<7 | 0x27,
-	37971 - 19968: jis0208<<14 | 0x2B<<7 | 0x59,
-	37973 - 19968: jis0212<<14 | 0x44<<7 | 0x4D,
-	37977 - 19968: jis0212<<14 | 0x44<<7 | 0x4E,
-	37978 - 19968: jis0208<<14 | 0x4E<<7 | 0x33,
-	37979 - 19968: jis0208<<14 | 0x4E<<7 | 0x29,
-	37980 - 19968: jis0212<<14 | 0x44<<7 | 0x4F,
-	37982 - 19968: jis0208<<14 | 0x4E<<7 | 0x2C,
-	37983 - 19968: jis0212<<14 | 0x44<<7 | 0x50,
-	37984 - 19968: jis0208<<14 | 0x4E<<7 | 0x2A,
-	37985 - 19968: jis0212<<14 | 0x44<<7 | 0x51,
-	37986 - 19968: jis0208<<14 | 0x4E<<7 | 0x2B,
-	37987 - 19968: jis0212<<14 | 0x44<<7 | 0x52,
-	37992 - 19968: jis0212<<14 | 0x44<<7 | 0x53,
-	37994 - 19968: jis0208<<14 | 0x4E<<7 | 0x2D,
-	37995 - 19968: jis0212<<14 | 0x44<<7 | 0x54,
-	37997 - 19968: jis0212<<14 | 0x44<<7 | 0x55,
-	37998 - 19968: jis0212<<14 | 0x44<<7 | 0x56,
-	37999 - 19968: jis0212<<14 | 0x44<<7 | 0x57,
-	38000 - 19968: jis0208<<14 | 0x4E<<7 | 0x2F,
-	38001 - 19968: jis0212<<14 | 0x44<<7 | 0x58,
-	38002 - 19968: jis0212<<14 | 0x44<<7 | 0x59,
-	38005 - 19968: jis0208<<14 | 0x4E<<7 | 0x30,
-	38007 - 19968: jis0208<<14 | 0x4E<<7 | 0x31,
-	38012 - 19968: jis0208<<14 | 0x4E<<7 | 0x34,
-	38013 - 19968: jis0208<<14 | 0x4E<<7 | 0x32,
-	38014 - 19968: jis0208<<14 | 0x4E<<7 | 0x35,
-	38015 - 19968: jis0208<<14 | 0x4E<<7 | 0x37,
-	38017 - 19968: jis0208<<14 | 0x4E<<7 | 0x36,
-	38019 - 19968: jis0212<<14 | 0x44<<7 | 0x5B,
-	38020 - 19968: jis0212<<14 | 0x44<<7 | 0x5A,
-	38263 - 19968: jis0208<<14 | 0x23<<7 | 0x18,
-	38264 - 19968: jis0212<<14 | 0x44<<7 | 0x5C,
-	38265 - 19968: jis0212<<14 | 0x44<<7 | 0x5D,
-	38270 - 19968: jis0212<<14 | 0x45<<7 | 0x00,
-	38272 - 19968: jis0208<<14 | 0x2B<<7 | 0x46,
-	38274 - 19968: jis0208<<14 | 0x4E<<7 | 0x38,
-	38275 - 19968: jis0208<<14 | 0x20<<7 | 0x0D,
-	38276 - 19968: jis0212<<14 | 0x45<<7 | 0x01,
-	38279 - 19968: jis0208<<14 | 0x4E<<7 | 0x39,
-	38280 - 19968: jis0212<<14 | 0x45<<7 | 0x02,
-	38281 - 19968: jis0208<<14 | 0x29<<7 | 0x23,
-	38282 - 19968: jis0208<<14 | 0x4E<<7 | 0x3A,
-	38283 - 19968: jis0208<<14 | 0x12<<7 | 0x0A,
-	38284 - 19968: jis0212<<14 | 0x45<<7 | 0x03,
-	38285 - 19968: jis0212<<14 | 0x45<<7 | 0x04,
-	38286 - 19968: jis0212<<14 | 0x45<<7 | 0x05,
-	38287 - 19968: jis0208<<14 | 0x10<<7 | 0x1B,
-	38289 - 19968: jis0208<<14 | 0x13<<7 | 0x36,
-	38290 - 19968: jis0208<<14 | 0x5B<<7 | 0x2D,
-	38291 - 19968: jis0208<<14 | 0x13<<7 | 0x35,
-	38292 - 19968: jis0208<<14 | 0x4E<<7 | 0x3B,
-	38294 - 19968: jis0208<<14 | 0x4E<<7 | 0x3C,
-	38296 - 19968: jis0208<<14 | 0x4E<<7 | 0x3D,
-	38297 - 19968: jis0208<<14 | 0x4E<<7 | 0x3E,
-	38301 - 19968: jis0212<<14 | 0x45<<7 | 0x06,
-	38302 - 19968: jis0212<<14 | 0x45<<7 | 0x07,
-	38303 - 19968: jis0212<<14 | 0x45<<7 | 0x08,
-	38304 - 19968: jis0208<<14 | 0x4E<<7 | 0x3F,
-	38305 - 19968: jis0212<<14 | 0x45<<7 | 0x09,
-	38306 - 19968: jis0208<<14 | 0x13<<7 | 0x37,
-	38307 - 19968: jis0208<<14 | 0x12<<7 | 0x34,
-	38308 - 19968: jis0208<<14 | 0x18<<7 | 0x3D,
-	38309 - 19968: jis0208<<14 | 0x27<<7 | 0x15,
-	38310 - 19968: jis0212<<14 | 0x45<<7 | 0x0A,
-	38311 - 19968: jis0208<<14 | 0x4E<<7 | 0x41,
-	38312 - 19968: jis0208<<14 | 0x4E<<7 | 0x40,
-	38313 - 19968: jis0212<<14 | 0x45<<7 | 0x0B,
-	38315 - 19968: jis0212<<14 | 0x45<<7 | 0x0C,
-	38316 - 19968: jis0212<<14 | 0x45<<7 | 0x0D,
-	38317 - 19968: jis0208<<14 | 0x4E<<7 | 0x42,
-	38322 - 19968: jis0208<<14 | 0x10<<7 | 0x3B,
-	38324 - 19968: jis0212<<14 | 0x45<<7 | 0x0E,
-	38326 - 19968: jis0212<<14 | 0x45<<7 | 0x0F,
-	38329 - 19968: jis0208<<14 | 0x4E<<7 | 0x45,
-	38330 - 19968: jis0212<<14 | 0x45<<7 | 0x10,
-	38331 - 19968: jis0208<<14 | 0x4E<<7 | 0x44,
-	38332 - 19968: jis0208<<14 | 0x4E<<7 | 0x43,
-	38333 - 19968: jis0212<<14 | 0x45<<7 | 0x11,
-	38334 - 19968: jis0208<<14 | 0x4E<<7 | 0x46,
-	38335 - 19968: jis0212<<14 | 0x45<<7 | 0x12,
-	38339 - 19968: jis0208<<14 | 0x4E<<7 | 0x49,
-	38342 - 19968: jis0212<<14 | 0x45<<7 | 0x13,
-	38343 - 19968: jis0208<<14 | 0x0F<<7 | 0x26,
-	38344 - 19968: jis0212<<14 | 0x45<<7 | 0x14,
-	38345 - 19968: jis0212<<14 | 0x45<<7 | 0x15,
-	38346 - 19968: jis0208<<14 | 0x4E<<7 | 0x47,
-	38347 - 19968: jis0212<<14 | 0x45<<7 | 0x16,
-	38348 - 19968: jis0208<<14 | 0x4E<<7 | 0x4B,
-	38349 - 19968: jis0208<<14 | 0x4E<<7 | 0x4A,
-	38352 - 19968: jis0212<<14 | 0x45<<7 | 0x17,
-	38353 - 19968: jis0212<<14 | 0x45<<7 | 0x18,
-	38354 - 19968: jis0212<<14 | 0x45<<7 | 0x19,
-	38355 - 19968: jis0212<<14 | 0x45<<7 | 0x1A,
-	38356 - 19968: jis0208<<14 | 0x4E<<7 | 0x4D,
-	38357 - 19968: jis0208<<14 | 0x4E<<7 | 0x4C,
-	38358 - 19968: jis0208<<14 | 0x4E<<7 | 0x4E,
-	38360 - 19968: jis0208<<14 | 0x25<<7 | 0x0D,
-	38361 - 19968: jis0212<<14 | 0x45<<7 | 0x1B,
-	38362 - 19968: jis0212<<14 | 0x45<<7 | 0x1C,
-	38364 - 19968: jis0208<<14 | 0x4E<<7 | 0x4F,
-	38365 - 19968: jis0212<<14 | 0x45<<7 | 0x1D,
-	38366 - 19968: jis0212<<14 | 0x45<<7 | 0x1E,
-	38367 - 19968: jis0212<<14 | 0x45<<7 | 0x1F,
-	38368 - 19968: jis0212<<14 | 0x45<<7 | 0x20,
-	38369 - 19968: jis0208<<14 | 0x4E<<7 | 0x50,
-	38370 - 19968: jis0208<<14 | 0x4E<<7 | 0x52,
-	38372 - 19968: jis0212<<14 | 0x45<<7 | 0x21,
-	38373 - 19968: jis0208<<14 | 0x4E<<7 | 0x51,
-	38374 - 19968: jis0212<<14 | 0x45<<7 | 0x22,
-	38428 - 19968: jis0208<<14 | 0x28<<7 | 0x4B,
-	38429 - 19968: jis0212<<14 | 0x45<<7 | 0x23,
-	38430 - 19968: jis0212<<14 | 0x45<<7 | 0x24,
-	38433 - 19968: jis0208<<14 | 0x4E<<7 | 0x53,
-	38434 - 19968: jis0212<<14 | 0x45<<7 | 0x25,
-	38436 - 19968: jis0212<<14 | 0x45<<7 | 0x26,
-	38437 - 19968: jis0212<<14 | 0x45<<7 | 0x27,
-	38438 - 19968: jis0212<<14 | 0x45<<7 | 0x28,
-	38440 - 19968: jis0208<<14 | 0x4E<<7 | 0x54,
-	38442 - 19968: jis0208<<14 | 0x19<<7 | 0x44,
-	38444 - 19968: jis0212<<14 | 0x45<<7 | 0x29,
-	38446 - 19968: jis0208<<14 | 0x4E<<7 | 0x55,
-	38447 - 19968: jis0208<<14 | 0x4E<<7 | 0x56,
-	38449 - 19968: jis0212<<14 | 0x45<<7 | 0x2A,
-	38450 - 19968: jis0208<<14 | 0x2A<<7 | 0x28,
-	38451 - 19968: jis0212<<14 | 0x45<<7 | 0x2B,
-	38455 - 19968: jis0212<<14 | 0x45<<7 | 0x2C,
-	38456 - 19968: jis0212<<14 | 0x45<<7 | 0x2D,
-	38457 - 19968: jis0212<<14 | 0x45<<7 | 0x2E,
-	38458 - 19968: jis0212<<14 | 0x45<<7 | 0x2F,
-	38459 - 19968: jis0208<<14 | 0x20<<7 | 0x2A,
-	38460 - 19968: jis0212<<14 | 0x45<<7 | 0x30,
-	38461 - 19968: jis0212<<14 | 0x45<<7 | 0x31,
-	38463 - 19968: jis0208<<14 | 0x0F<<7 | 0x03,
-	38464 - 19968: jis0208<<14 | 0x21<<7 | 0x2A,
-	38465 - 19968: jis0212<<14 | 0x45<<7 | 0x32,
-	38466 - 19968: jis0208<<14 | 0x4E<<7 | 0x57,
-	38468 - 19968: jis0208<<14 | 0x28<<7 | 0x4C,
-	38475 - 19968: jis0208<<14 | 0x4E<<7 | 0x5A,
-	38476 - 19968: jis0208<<14 | 0x4E<<7 | 0x58,
-	38477 - 19968: jis0208<<14 | 0x18<<7 | 0x3E,
-	38479 - 19968: jis0208<<14 | 0x4E<<7 | 0x59,
-	38480 - 19968: jis0208<<14 | 0x17<<7 | 0x21,
-	38482 - 19968: jis0212<<14 | 0x45<<7 | 0x33,
-	38484 - 19968: jis0212<<14 | 0x45<<7 | 0x34,
-	38486 - 19968: jis0212<<14 | 0x45<<7 | 0x35,
-	38487 - 19968: jis0212<<14 | 0x45<<7 | 0x36,
-	38488 - 19968: jis0212<<14 | 0x45<<7 | 0x37,
-	38491 - 19968: jis0208<<14 | 0x29<<7 | 0x24,
-	38492 - 19968: jis0208<<14 | 0x4E<<7 | 0x5C,
-	38493 - 19968: jis0208<<14 | 0x4F<<7 | 0x00,
-	38494 - 19968: jis0208<<14 | 0x4E<<7 | 0x5D,
-	38495 - 19968: jis0208<<14 | 0x4F<<7 | 0x01,
-	38497 - 19968: jis0212<<14 | 0x45<<7 | 0x38,
-	38498 - 19968: jis0208<<14 | 0x10<<7 | 0x00,
-	38499 - 19968: jis0208<<14 | 0x1E<<7 | 0x37,
-	38500 - 19968: jis0208<<14 | 0x1C<<7 | 0x5B,
-	38501 - 19968: jis0208<<14 | 0x13<<7 | 0x38,
-	38502 - 19968: jis0208<<14 | 0x4F<<7 | 0x02,
-	38506 - 19968: jis0208<<14 | 0x26<<7 | 0x45,
-	38508 - 19968: jis0208<<14 | 0x4F<<7 | 0x04,
-	38510 - 19968: jis0212<<14 | 0x45<<7 | 0x39,
-	38512 - 19968: jis0208<<14 | 0x10<<7 | 0x01,
-	38514 - 19968: jis0208<<14 | 0x4F<<7 | 0x03,
-	38515 - 19968: jis0208<<14 | 0x23<<7 | 0x23,
-	38516 - 19968: jis0212<<14 | 0x45<<7 | 0x3A,
-	38517 - 19968: jis0208<<14 | 0x2D<<7 | 0x2C,
-	38518 - 19968: jis0208<<14 | 0x25<<7 | 0x0A,
-	38519 - 19968: jis0208<<14 | 0x4E<<7 | 0x5B,
-	38520 - 19968: jis0208<<14 | 0x2D<<7 | 0x05,
-	38522 - 19968: jis0208<<14 | 0x17<<7 | 0x10,
-	38523 - 19968: jis0212<<14 | 0x45<<7 | 0x3B,
-	38524 - 19968: jis0212<<14 | 0x45<<7 | 0x3C,
-	38525 - 19968: jis0208<<14 | 0x2C<<7 | 0x3A,
-	38526 - 19968: jis0212<<14 | 0x45<<7 | 0x3D,
-	38527 - 19968: jis0212<<14 | 0x45<<7 | 0x3E,
-	38529 - 19968: jis0212<<14 | 0x45<<7 | 0x3F,
-	38530 - 19968: jis0212<<14 | 0x45<<7 | 0x40,
-	38531 - 19968: jis0212<<14 | 0x45<<7 | 0x41,
-	38532 - 19968: jis0212<<14 | 0x45<<7 | 0x42,
-	38533 - 19968: jis0208<<14 | 0x15<<7 | 0x58,
-	38534 - 19968: jis0208<<14 | 0x2D<<7 | 0x13,
-	38536 - 19968: jis0208<<14 | 0x16<<7 | 0x07,
-	38537 - 19968: jis0212<<14 | 0x45<<7 | 0x43,
-	38538 - 19968: jis0208<<14 | 0x21<<7 | 0x41,
-	38539 - 19968: jis0208<<14 | 0x46<<7 | 0x00,
-	38541 - 19968: jis0208<<14 | 0x4F<<7 | 0x05,
-	38542 - 19968: jis0208<<14 | 0x12<<7 | 0x0B,
-	38543 - 19968: jis0208<<14 | 0x1E<<7 | 0x4E,
-	38545 - 19968: jis0212<<14 | 0x45<<7 | 0x44,
-	38548 - 19968: jis0208<<14 | 0x12<<7 | 0x35,
-	38549 - 19968: jis0208<<14 | 0x4F<<7 | 0x07,
-	38550 - 19968: jis0212<<14 | 0x45<<7 | 0x45,
-	38551 - 19968: jis0208<<14 | 0x4F<<7 | 0x08,
-	38552 - 19968: jis0208<<14 | 0x4F<<7 | 0x06,
-	38553 - 19968: jis0208<<14 | 0x16<<7 | 0x43,
-	38554 - 19968: jis0212<<14 | 0x45<<7 | 0x46,
-	38555 - 19968: jis0208<<14 | 0x19<<7 | 0x3C,
-	38556 - 19968: jis0208<<14 | 0x1D<<7 | 0x42,
-	38557 - 19968: jis0208<<14 | 0x5B<<7 | 0x30,
-	38559 - 19968: jis0212<<14 | 0x45<<7 | 0x48,
-	38560 - 19968: jis0208<<14 | 0x10<<7 | 0x02,
-	38563 - 19968: jis0208<<14 | 0x2D<<7 | 0x38,
-	38564 - 19968: jis0212<<14 | 0x45<<7 | 0x49,
-	38565 - 19968: jis0212<<14 | 0x45<<7 | 0x4A,
-	38566 - 19968: jis0212<<14 | 0x45<<7 | 0x4B,
-	38567 - 19968: jis0208<<14 | 0x4F<<7 | 0x0A,
-	38568 - 19968: jis0208<<14 | 0x4D<<7 | 0x0D,
-	38569 - 19968: jis0212<<14 | 0x45<<7 | 0x4C,
-	38570 - 19968: jis0208<<14 | 0x4F<<7 | 0x09,
-	38574 - 19968: jis0212<<14 | 0x45<<7 | 0x4D,
-	38575 - 19968: jis0208<<14 | 0x5B<<7 | 0x31,
-	38576 - 19968: jis0208<<14 | 0x4F<<7 | 0x0D,
-	38577 - 19968: jis0208<<14 | 0x4F<<7 | 0x0B,
-	38578 - 19968: jis0208<<14 | 0x4F<<7 | 0x0C,
-	38579 - 19968: jis0212<<14 | 0x45<<7 | 0x4F,
-	38580 - 19968: jis0208<<14 | 0x4F<<7 | 0x0E,
-	38582 - 19968: jis0208<<14 | 0x4F<<7 | 0x0F,
-	38583 - 19968: jis0208<<14 | 0x2D<<7 | 0x4B,
-	38584 - 19968: jis0208<<14 | 0x4F<<7 | 0x10,
-	38585 - 19968: jis0208<<14 | 0x4F<<7 | 0x11,
-	38586 - 19968: jis0212<<14 | 0x45<<7 | 0x50,
-	38587 - 19968: jis0208<<14 | 0x1F<<7 | 0x28,
-	38588 - 19968: jis0208<<14 | 0x27<<7 | 0x1A,
-	38592 - 19968: jis0208<<14 | 0x1E<<7 | 0x5C,
-	38593 - 19968: jis0208<<14 | 0x13<<7 | 0x46,
-	38596 - 19968: jis0208<<14 | 0x2C<<7 | 0x19,
-	38597 - 19968: jis0208<<14 | 0x11<<7 | 0x4C,
-	38598 - 19968: jis0208<<14 | 0x1C<<7 | 0x17,
-	38599 - 19968: jis0208<<14 | 0x17<<7 | 0x3A,
-	38601 - 19968: jis0208<<14 | 0x4F<<7 | 0x14,
-	38602 - 19968: jis0212<<14 | 0x45<<7 | 0x51,
-	38603 - 19968: jis0208<<14 | 0x4F<<7 | 0x13,
-	38604 - 19968: jis0208<<14 | 0x1A<<7 | 0x52,
-	38605 - 19968: jis0208<<14 | 0x4F<<7 | 0x15,
-	38606 - 19968: jis0208<<14 | 0x4F<<7 | 0x12,
-	38609 - 19968: jis0208<<14 | 0x1A<<7 | 0x07,
-	38610 - 19968: jis0212<<14 | 0x45<<7 | 0x52,
-	38613 - 19968: jis0208<<14 | 0x4F<<7 | 0x19,
-	38614 - 19968: jis0208<<14 | 0x49<<7 | 0x0C,
-	38616 - 19968: jis0212<<14 | 0x45<<7 | 0x54,
-	38617 - 19968: jis0208<<14 | 0x31<<7 | 0x35,
-	38618 - 19968: jis0212<<14 | 0x45<<7 | 0x55,
-	38619 - 19968: jis0208<<14 | 0x1E<<7 | 0x56,
-	38620 - 19968: jis0208<<14 | 0x4F<<7 | 0x17,
-	38621 - 19968: jis0212<<14 | 0x45<<7 | 0x56,
-	38622 - 19968: jis0212<<14 | 0x45<<7 | 0x57,
-	38623 - 19968: jis0212<<14 | 0x45<<7 | 0x58,
-	38626 - 19968: jis0208<<14 | 0x2D<<7 | 0x04,
-	38627 - 19968: jis0208<<14 | 0x25<<7 | 0x50,
-	38632 - 19968: jis0208<<14 | 0x10<<7 | 0x0A,
-	38633 - 19968: jis0212<<14 | 0x45<<7 | 0x59,
-	38634 - 19968: jis0208<<14 | 0x1F<<7 | 0x42,
-	38635 - 19968: jis0208<<14 | 0x1B<<7 | 0x15,
-	38639 - 19968: jis0212<<14 | 0x45<<7 | 0x5A,
-	38640 - 19968: jis0208<<14 | 0x29<<7 | 0x16,
-	38641 - 19968: jis0212<<14 | 0x45<<7 | 0x5B,
-	38642 - 19968: jis0208<<14 | 0x10<<7 | 0x1F,
-	38646 - 19968: jis0208<<14 | 0x2D<<7 | 0x4C,
-	38647 - 19968: jis0208<<14 | 0x2C<<7 | 0x4A,
-	38649 - 19968: jis0208<<14 | 0x4F<<7 | 0x1A,
-	38650 - 19968: jis0212<<14 | 0x45<<7 | 0x5C,
-	38651 - 19968: jis0208<<14 | 0x24<<7 | 0x24,
-	38656 - 19968: jis0208<<14 | 0x1B<<7 | 0x5A,
-	38658 - 19968: jis0212<<14 | 0x45<<7 | 0x5D,
-	38659 - 19968: jis0212<<14 | 0x46<<7 | 0x00,
-	38660 - 19968: jis0208<<14 | 0x4F<<7 | 0x1B,
-	38661 - 19968: jis0212<<14 | 0x46<<7 | 0x01,
-	38662 - 19968: jis0208<<14 | 0x4F<<7 | 0x1C,
-	38663 - 19968: jis0208<<14 | 0x1E<<7 | 0x2B,
-	38664 - 19968: jis0208<<14 | 0x4F<<7 | 0x1D,
-	38665 - 19968: jis0212<<14 | 0x46<<7 | 0x02,
-	38666 - 19968: jis0208<<14 | 0x2D<<7 | 0x4D,
-	38669 - 19968: jis0208<<14 | 0x4F<<7 | 0x18,
-	38670 - 19968: jis0208<<14 | 0x4F<<7 | 0x1F,
-	38671 - 19968: jis0208<<14 | 0x4F<<7 | 0x21,
-	38673 - 19968: jis0208<<14 | 0x4F<<7 | 0x20,
-	38675 - 19968: jis0208<<14 | 0x4F<<7 | 0x1E,
-	38678 - 19968: jis0208<<14 | 0x4F<<7 | 0x22,
-	38681 - 19968: jis0208<<14 | 0x4F<<7 | 0x23,
-	38682 - 19968: jis0212<<14 | 0x46<<7 | 0x03,
-	38683 - 19968: jis0212<<14 | 0x46<<7 | 0x04,
-	38684 - 19968: jis0208<<14 | 0x20<<7 | 0x59,
-	38685 - 19968: jis0212<<14 | 0x46<<7 | 0x05,
-	38686 - 19968: jis0208<<14 | 0x11<<7 | 0x41,
-	38689 - 19968: jis0212<<14 | 0x46<<7 | 0x06,
-	38690 - 19968: jis0212<<14 | 0x46<<7 | 0x07,
-	38691 - 19968: jis0212<<14 | 0x46<<7 | 0x08,
-	38692 - 19968: jis0208<<14 | 0x4F<<7 | 0x24,
-	38695 - 19968: jis0208<<14 | 0x2B<<7 | 0x17,
-	38696 - 19968: jis0212<<14 | 0x46<<7 | 0x09,
-	38698 - 19968: jis0208<<14 | 0x4F<<7 | 0x25,
-	38704 - 19968: jis0208<<14 | 0x4F<<7 | 0x26,
-	38705 - 19968: jis0212<<14 | 0x46<<7 | 0x0A,
-	38706 - 19968: jis0208<<14 | 0x2E<<7 | 0x09,
-	38707 - 19968: jis0208<<14 | 0x5B<<7 | 0x32,
-	38712 - 19968: jis0208<<14 | 0x3A<<7 | 0x10,
-	38713 - 19968: jis0208<<14 | 0x4F<<7 | 0x27,
-	38715 - 19968: jis0208<<14 | 0x5B<<7 | 0x33,
-	38717 - 19968: jis0208<<14 | 0x4F<<7 | 0x28,
-	38718 - 19968: jis0208<<14 | 0x4F<<7 | 0x29,
-	38721 - 19968: jis0212<<14 | 0x46<<7 | 0x0C,
-	38722 - 19968: jis0208<<14 | 0x4F<<7 | 0x2D,
-	38723 - 19968: jis0208<<14 | 0x5B<<7 | 0x34,
-	38724 - 19968: jis0208<<14 | 0x4F<<7 | 0x2A,
-	38726 - 19968: jis0208<<14 | 0x4F<<7 | 0x2B,
-	38728 - 19968: jis0208<<14 | 0x4F<<7 | 0x2C,
-	38729 - 19968: jis0208<<14 | 0x4F<<7 | 0x2E,
-	38730 - 19968: jis0212<<14 | 0x46<<7 | 0x0E,
-	38733 - 19968: jis0208<<14 | 0x5B<<7 | 0x35,
-	38734 - 19968: jis0212<<14 | 0x46<<7 | 0x0F,
-	38735 - 19968: jis0208<<14 | 0x5B<<7 | 0x36,
-	38737 - 19968: jis0208<<14 | 0x5B<<7 | 0x37,
-	38738 - 19968: jis0208<<14 | 0x1F<<7 | 0x23,
-	38741 - 19968: jis0208<<14 | 0x5B<<7 | 0x38,
-	38742 - 19968: jis0208<<14 | 0x2B<<7 | 0x56,
-	38743 - 19968: jis0212<<14 | 0x46<<7 | 0x12,
-	38744 - 19968: jis0212<<14 | 0x46<<7 | 0x13,
-	38745 - 19968: jis0208<<14 | 0x1F<<7 | 0x24,
-	38746 - 19968: jis0212<<14 | 0x46<<7 | 0x14,
-	38747 - 19968: jis0212<<14 | 0x46<<7 | 0x15,
-	38748 - 19968: jis0208<<14 | 0x4F<<7 | 0x2F,
-	38750 - 19968: jis0208<<14 | 0x27<<7 | 0x52,
-	38752 - 19968: jis0208<<14 | 0x4F<<7 | 0x30,
-	38753 - 19968: jis0208<<14 | 0x52<<7 | 0x32,
-	38754 - 19968: jis0208<<14 | 0x2B<<7 | 0x2B,
-	38755 - 19968: jis0212<<14 | 0x46<<7 | 0x16,
-	38756 - 19968: jis0208<<14 | 0x4F<<7 | 0x31,
-	38758 - 19968: jis0208<<14 | 0x4F<<7 | 0x32,
-	38759 - 19968: jis0212<<14 | 0x46<<7 | 0x17,
-	38760 - 19968: jis0208<<14 | 0x4F<<7 | 0x33,
-	38761 - 19968: jis0208<<14 | 0x12<<7 | 0x36,
-	38762 - 19968: jis0212<<14 | 0x46<<7 | 0x18,
-	38763 - 19968: jis0208<<14 | 0x4F<<7 | 0x35,
-	38765 - 19968: jis0208<<14 | 0x1E<<7 | 0x38,
-	38766 - 19968: jis0212<<14 | 0x46<<7 | 0x19,
-	38769 - 19968: jis0208<<14 | 0x4F<<7 | 0x36,
-	38771 - 19968: jis0212<<14 | 0x46<<7 | 0x1A,
-	38772 - 19968: jis0208<<14 | 0x16<<7 | 0x03,
-	38774 - 19968: jis0212<<14 | 0x46<<7 | 0x1B,
-	38775 - 19968: jis0212<<14 | 0x46<<7 | 0x1C,
-	38776 - 19968: jis0212<<14 | 0x46<<7 | 0x1D,
-	38777 - 19968: jis0208<<14 | 0x4F<<7 | 0x37,
-	38778 - 19968: jis0208<<14 | 0x4F<<7 | 0x3B,
-	38779 - 19968: jis0212<<14 | 0x46<<7 | 0x1E,
-	38780 - 19968: jis0208<<14 | 0x4F<<7 | 0x39,
-	38781 - 19968: jis0212<<14 | 0x46<<7 | 0x1F,
-	38783 - 19968: jis0212<<14 | 0x46<<7 | 0x20,
-	38784 - 19968: jis0212<<14 | 0x46<<7 | 0x21,
-	38785 - 19968: jis0208<<14 | 0x4F<<7 | 0x3A,
-	38788 - 19968: jis0208<<14 | 0x12<<7 | 0x52,
-	38789 - 19968: jis0208<<14 | 0x4F<<7 | 0x38,
-	38790 - 19968: jis0208<<14 | 0x4F<<7 | 0x3C,
-	38793 - 19968: jis0212<<14 | 0x46<<7 | 0x22,
-	38795 - 19968: jis0208<<14 | 0x4F<<7 | 0x3D,
-	38797 - 19968: jis0208<<14 | 0x0F<<7 | 0x27,
-	38799 - 19968: jis0208<<14 | 0x4F<<7 | 0x3E,
-	38800 - 19968: jis0208<<14 | 0x4F<<7 | 0x3F,
-	38805 - 19968: jis0212<<14 | 0x46<<7 | 0x23,
-	38806 - 19968: jis0212<<14 | 0x46<<7 | 0x24,
-	38807 - 19968: jis0212<<14 | 0x46<<7 | 0x25,
-	38808 - 19968: jis0208<<14 | 0x1D<<7 | 0x43,
-	38809 - 19968: jis0212<<14 | 0x46<<7 | 0x26,
-	38810 - 19968: jis0212<<14 | 0x46<<7 | 0x27,
-	38812 - 19968: jis0208<<14 | 0x4F<<7 | 0x40,
-	38814 - 19968: jis0212<<14 | 0x46<<7 | 0x28,
-	38815 - 19968: jis0212<<14 | 0x46<<7 | 0x29,
-	38816 - 19968: jis0208<<14 | 0x14<<7 | 0x26,
-	38818 - 19968: jis0212<<14 | 0x46<<7 | 0x2A,
-	38819 - 19968: jis0208<<14 | 0x4F<<7 | 0x43,
-	38822 - 19968: jis0208<<14 | 0x4F<<7 | 0x42,
-	38824 - 19968: jis0208<<14 | 0x4F<<7 | 0x41,
-	38827 - 19968: jis0208<<14 | 0x4A<<7 | 0x50,
-	38828 - 19968: jis0212<<14 | 0x46<<7 | 0x2B,
-	38829 - 19968: jis0208<<14 | 0x29<<7 | 0x3B,
-	38830 - 19968: jis0212<<14 | 0x46<<7 | 0x2C,
-	38833 - 19968: jis0212<<14 | 0x46<<7 | 0x2D,
-	38834 - 19968: jis0212<<14 | 0x46<<7 | 0x2E,
-	38835 - 19968: jis0208<<14 | 0x4F<<7 | 0x44,
-	38836 - 19968: jis0208<<14 | 0x4F<<7 | 0x45,
-	38837 - 19968: jis0212<<14 | 0x46<<7 | 0x2F,
-	38838 - 19968: jis0212<<14 | 0x46<<7 | 0x30,
-	38840 - 19968: jis0212<<14 | 0x46<<7 | 0x31,
-	38841 - 19968: jis0212<<14 | 0x46<<7 | 0x32,
-	38842 - 19968: jis0212<<14 | 0x46<<7 | 0x33,
-	38844 - 19968: jis0212<<14 | 0x46<<7 | 0x34,
-	38846 - 19968: jis0212<<14 | 0x46<<7 | 0x35,
-	38847 - 19968: jis0212<<14 | 0x46<<7 | 0x36,
-	38849 - 19968: jis0212<<14 | 0x46<<7 | 0x37,
-	38851 - 19968: jis0208<<14 | 0x4F<<7 | 0x46,
-	38852 - 19968: jis0212<<14 | 0x46<<7 | 0x38,
-	38853 - 19968: jis0212<<14 | 0x46<<7 | 0x39,
-	38854 - 19968: jis0208<<14 | 0x4F<<7 | 0x47,
-	38855 - 19968: jis0212<<14 | 0x46<<7 | 0x3A,
-	38856 - 19968: jis0208<<14 | 0x4F<<7 | 0x48,
-	38857 - 19968: jis0212<<14 | 0x46<<7 | 0x3B,
-	38858 - 19968: jis0212<<14 | 0x46<<7 | 0x3C,
-	38859 - 19968: jis0208<<14 | 0x4F<<7 | 0x49,
-	38860 - 19968: jis0212<<14 | 0x46<<7 | 0x3D,
-	38861 - 19968: jis0212<<14 | 0x46<<7 | 0x3E,
-	38862 - 19968: jis0212<<14 | 0x46<<7 | 0x3F,
-	38864 - 19968: jis0212<<14 | 0x46<<7 | 0x40,
-	38865 - 19968: jis0212<<14 | 0x46<<7 | 0x41,
-	38867 - 19968: jis0208<<14 | 0x13<<7 | 0x39,
-	38868 - 19968: jis0212<<14 | 0x46<<7 | 0x42,
-	38871 - 19968: jis0212<<14 | 0x46<<7 | 0x43,
-	38872 - 19968: jis0212<<14 | 0x46<<7 | 0x44,
-	38873 - 19968: jis0212<<14 | 0x46<<7 | 0x45,
-	38875 - 19968: jis0212<<14 | 0x46<<7 | 0x49,
-	38876 - 19968: jis0208<<14 | 0x4F<<7 | 0x4A,
-	38877 - 19968: jis0212<<14 | 0x46<<7 | 0x46,
-	38878 - 19968: jis0212<<14 | 0x46<<7 | 0x47,
-	38880 - 19968: jis0212<<14 | 0x46<<7 | 0x48,
-	38881 - 19968: jis0212<<14 | 0x46<<7 | 0x4A,
-	38884 - 19968: jis0212<<14 | 0x46<<7 | 0x4B,
-	38893 - 19968: jis0208<<14 | 0x4F<<7 | 0x4B,
-	38894 - 19968: jis0208<<14 | 0x26<<7 | 0x02,
-	38895 - 19968: jis0212<<14 | 0x46<<7 | 0x4C,
-	38897 - 19968: jis0212<<14 | 0x46<<7 | 0x4D,
-	38898 - 19968: jis0208<<14 | 0x4F<<7 | 0x4D,
-	38899 - 19968: jis0208<<14 | 0x11<<7 | 0x1A,
-	38900 - 19968: jis0212<<14 | 0x46<<7 | 0x4E,
-	38901 - 19968: jis0208<<14 | 0x4F<<7 | 0x50,
-	38902 - 19968: jis0208<<14 | 0x4F<<7 | 0x4F,
-	38903 - 19968: jis0212<<14 | 0x46<<7 | 0x4F,
-	38904 - 19968: jis0212<<14 | 0x46<<7 | 0x50,
-	38906 - 19968: jis0212<<14 | 0x46<<7 | 0x51,
-	38907 - 19968: jis0208<<14 | 0x10<<7 | 0x03,
-	38911 - 19968: jis0208<<14 | 0x15<<7 | 0x20,
-	38913 - 19968: jis0208<<14 | 0x29<<7 | 0x26,
-	38914 - 19968: jis0208<<14 | 0x23<<7 | 0x19,
-	38915 - 19968: jis0208<<14 | 0x19<<7 | 0x01,
-	38917 - 19968: jis0208<<14 | 0x18<<7 | 0x3F,
-	38918 - 19968: jis0208<<14 | 0x1C<<7 | 0x46,
-	38919 - 19968: jis0212<<14 | 0x46<<7 | 0x52,
-	38920 - 19968: jis0208<<14 | 0x1E<<7 | 0x3B,
-	38922 - 19968: jis0212<<14 | 0x46<<7 | 0x53,
-	38924 - 19968: jis0208<<14 | 0x4F<<7 | 0x52,
-	38925 - 19968: jis0212<<14 | 0x46<<7 | 0x55,
-	38926 - 19968: jis0212<<14 | 0x46<<7 | 0x56,
-	38927 - 19968: jis0208<<14 | 0x4F<<7 | 0x51,
-	38928 - 19968: jis0208<<14 | 0x2C<<7 | 0x21,
-	38929 - 19968: jis0208<<14 | 0x13<<7 | 0x47,
-	38930 - 19968: jis0208<<14 | 0x27<<7 | 0x31,
-	38931 - 19968: jis0208<<14 | 0x25<<7 | 0x3B,
-	38932 - 19968: jis0212<<14 | 0x46<<7 | 0x57,
-	38934 - 19968: jis0212<<14 | 0x46<<7 | 0x58,
-	38935 - 19968: jis0208<<14 | 0x1E<<7 | 0x5B,
-	38936 - 19968: jis0208<<14 | 0x2D<<7 | 0x2D,
-	38937 - 19968: jis0212<<14 | 0x46<<7 | 0x54,
-	38938 - 19968: jis0208<<14 | 0x16<<7 | 0x3A,
-	38940 - 19968: jis0212<<14 | 0x46<<7 | 0x59,
-	38942 - 19968: jis0212<<14 | 0x46<<7 | 0x5A,
-	38944 - 19968: jis0212<<14 | 0x46<<7 | 0x5B,
-	38945 - 19968: jis0208<<14 | 0x4F<<7 | 0x55,
-	38947 - 19968: jis0212<<14 | 0x46<<7 | 0x5C,
-	38948 - 19968: jis0208<<14 | 0x4F<<7 | 0x54,
-	38949 - 19968: jis0212<<14 | 0x47<<7 | 0x07,
-	38950 - 19968: jis0212<<14 | 0x46<<7 | 0x5D,
-	38955 - 19968: jis0212<<14 | 0x47<<7 | 0x00,
-	38956 - 19968: jis0208<<14 | 0x2A<<7 | 0x2A,
-	38957 - 19968: jis0208<<14 | 0x25<<7 | 0x0B,
-	38958 - 19968: jis0212<<14 | 0x47<<7 | 0x01,
-	38959 - 19968: jis0212<<14 | 0x47<<7 | 0x02,
-	38960 - 19968: jis0212<<14 | 0x47<<7 | 0x03,
-	38962 - 19968: jis0212<<14 | 0x47<<7 | 0x04,
-	38963 - 19968: jis0212<<14 | 0x47<<7 | 0x05,
-	38964 - 19968: jis0208<<14 | 0x10<<7 | 0x2F,
-	38965 - 19968: jis0212<<14 | 0x47<<7 | 0x06,
-	38967 - 19968: jis0208<<14 | 0x4F<<7 | 0x56,
-	38968 - 19968: jis0208<<14 | 0x4F<<7 | 0x53,
-	38971 - 19968: jis0208<<14 | 0x28<<7 | 0x30,
-	38972 - 19968: jis0208<<14 | 0x2C<<7 | 0x49,
-	38973 - 19968: jis0208<<14 | 0x4F<<7 | 0x57,
-	38974 - 19968: jis0212<<14 | 0x47<<7 | 0x08,
-	38980 - 19968: jis0212<<14 | 0x47<<7 | 0x09,
-	38982 - 19968: jis0208<<14 | 0x4F<<7 | 0x58,
-	38983 - 19968: jis0212<<14 | 0x47<<7 | 0x0A,
-	38986 - 19968: jis0212<<14 | 0x47<<7 | 0x0B,
-	38987 - 19968: jis0208<<14 | 0x4F<<7 | 0x5A,
-	38988 - 19968: jis0208<<14 | 0x21<<7 | 0x49,
-	38989 - 19968: jis0208<<14 | 0x12<<7 | 0x3A,
-	38990 - 19968: jis0208<<14 | 0x12<<7 | 0x3B,
-	38991 - 19968: jis0208<<14 | 0x4F<<7 | 0x59,
-	38993 - 19968: jis0212<<14 | 0x47<<7 | 0x0C,
-	38994 - 19968: jis0212<<14 | 0x47<<7 | 0x0D,
-	38995 - 19968: jis0212<<14 | 0x47<<7 | 0x0E,
-	38996 - 19968: jis0208<<14 | 0x13<<7 | 0x48,
-	38997 - 19968: jis0208<<14 | 0x17<<7 | 0x11,
-	38998 - 19968: jis0212<<14 | 0x47<<7 | 0x0F,
-	38999 - 19968: jis0208<<14 | 0x5B<<7 | 0x39,
-	39000 - 19968: jis0208<<14 | 0x13<<7 | 0x49,
-	39001 - 19968: jis0212<<14 | 0x47<<7 | 0x11,
-	39002 - 19968: jis0212<<14 | 0x47<<7 | 0x12,
-	39003 - 19968: jis0208<<14 | 0x24<<7 | 0x1E,
-	39006 - 19968: jis0208<<14 | 0x2D<<7 | 0x3F,
-	39010 - 19968: jis0212<<14 | 0x47<<7 | 0x13,
-	39011 - 19968: jis0212<<14 | 0x47<<7 | 0x14,
-	39013 - 19968: jis0208<<14 | 0x5B<<7 | 0x3A,
-	39014 - 19968: jis0212<<14 | 0x47<<7 | 0x16,
-	39015 - 19968: jis0208<<14 | 0x17<<7 | 0x3B,
-	39018 - 19968: jis0212<<14 | 0x47<<7 | 0x17,
-	39019 - 19968: jis0208<<14 | 0x4F<<7 | 0x5B,
-	39020 - 19968: jis0212<<14 | 0x47<<7 | 0x18,
-	39023 - 19968: jis0208<<14 | 0x4F<<7 | 0x5C,
-	39024 - 19968: jis0208<<14 | 0x4F<<7 | 0x5D,
-	39025 - 19968: jis0208<<14 | 0x50<<7 | 0x00,
-	39027 - 19968: jis0208<<14 | 0x50<<7 | 0x02,
-	39028 - 19968: jis0208<<14 | 0x50<<7 | 0x01,
-	39080 - 19968: jis0208<<14 | 0x28<<7 | 0x56,
-	39082 - 19968: jis0208<<14 | 0x50<<7 | 0x03,
-	39083 - 19968: jis0212<<14 | 0x47<<7 | 0x19,
-	39085 - 19968: jis0212<<14 | 0x47<<7 | 0x1A,
-	39086 - 19968: jis0212<<14 | 0x47<<7 | 0x1B,
-	39087 - 19968: jis0208<<14 | 0x50<<7 | 0x04,
-	39088 - 19968: jis0212<<14 | 0x47<<7 | 0x1C,
-	39089 - 19968: jis0208<<14 | 0x50<<7 | 0x05,
-	39092 - 19968: jis0212<<14 | 0x47<<7 | 0x1D,
-	39094 - 19968: jis0208<<14 | 0x50<<7 | 0x06,
-	39095 - 19968: jis0212<<14 | 0x47<<7 | 0x1E,
-	39096 - 19968: jis0212<<14 | 0x47<<7 | 0x1F,
-	39098 - 19968: jis0212<<14 | 0x47<<7 | 0x20,
-	39099 - 19968: jis0212<<14 | 0x47<<7 | 0x21,
-	39103 - 19968: jis0212<<14 | 0x47<<7 | 0x22,
-	39106 - 19968: jis0212<<14 | 0x47<<7 | 0x23,
-	39107 - 19968: jis0208<<14 | 0x50<<7 | 0x08,
-	39108 - 19968: jis0208<<14 | 0x50<<7 | 0x07,
-	39109 - 19968: jis0212<<14 | 0x47<<7 | 0x24,
-	39110 - 19968: jis0208<<14 | 0x50<<7 | 0x09,
-	39112 - 19968: jis0212<<14 | 0x47<<7 | 0x25,
-	39116 - 19968: jis0212<<14 | 0x47<<7 | 0x26,
-	39131 - 19968: jis0208<<14 | 0x27<<7 | 0x53,
-	39132 - 19968: jis0208<<14 | 0x45<<7 | 0x2B,
-	39135 - 19968: jis0208<<14 | 0x1E<<7 | 0x08,
-	39137 - 19968: jis0212<<14 | 0x47<<7 | 0x27,
-	39138 - 19968: jis0208<<14 | 0x14<<7 | 0x11,
-	39139 - 19968: jis0212<<14 | 0x47<<7 | 0x28,
-	39141 - 19968: jis0212<<14 | 0x47<<7 | 0x29,
-	39142 - 19968: jis0212<<14 | 0x47<<7 | 0x2A,
-	39143 - 19968: jis0212<<14 | 0x47<<7 | 0x2B,
-	39145 - 19968: jis0208<<14 | 0x50<<7 | 0x0A,
-	39146 - 19968: jis0212<<14 | 0x47<<7 | 0x2C,
-	39147 - 19968: jis0208<<14 | 0x50<<7 | 0x0B,
-	39149 - 19968: jis0208<<14 | 0x31<<7 | 0x0B,
-	39150 - 19968: jis0208<<14 | 0x3C<<7 | 0x1A,
-	39151 - 19968: jis0208<<14 | 0x27<<7 | 0x32,
-	39154 - 19968: jis0208<<14 | 0x0F<<7 | 0x5A,
-	39155 - 19968: jis0212<<14 | 0x47<<7 | 0x2D,
-	39156 - 19968: jis0208<<14 | 0x0F<<7 | 0x1A,
-	39158 - 19968: jis0212<<14 | 0x47<<7 | 0x2E,
-	39164 - 19968: jis0208<<14 | 0x1A<<7 | 0x53,
-	39165 - 19968: jis0208<<14 | 0x2A<<7 | 0x0F,
-	39166 - 19968: jis0208<<14 | 0x1D<<7 | 0x5D,
-	39170 - 19968: jis0212<<14 | 0x47<<7 | 0x2F,
-	39171 - 19968: jis0208<<14 | 0x50<<7 | 0x0C,
-	39173 - 19968: jis0208<<14 | 0x2B<<7 | 0x3E,
-	39175 - 19968: jis0212<<14 | 0x47<<7 | 0x30,
-	39176 - 19968: jis0212<<14 | 0x47<<7 | 0x31,
-	39177 - 19968: jis0208<<14 | 0x50<<7 | 0x0D,
-	39178 - 19968: jis0208<<14 | 0x2C<<7 | 0x3B,
-	39180 - 19968: jis0208<<14 | 0x10<<7 | 0x21,
-	39184 - 19968: jis0208<<14 | 0x1A<<7 | 0x20,
-	39185 - 19968: jis0212<<14 | 0x47<<7 | 0x32,
-	39186 - 19968: jis0208<<14 | 0x50<<7 | 0x0E,
-	39187 - 19968: jis0208<<14 | 0x11<<7 | 0x4D,
-	39188 - 19968: jis0208<<14 | 0x50<<7 | 0x0F,
-	39189 - 19968: jis0212<<14 | 0x47<<7 | 0x33,
-	39190 - 19968: jis0212<<14 | 0x47<<7 | 0x34,
-	39191 - 19968: jis0212<<14 | 0x47<<7 | 0x35,
-	39192 - 19968: jis0208<<14 | 0x50<<7 | 0x10,
-	39194 - 19968: jis0212<<14 | 0x47<<7 | 0x36,
-	39195 - 19968: jis0212<<14 | 0x47<<7 | 0x37,
-	39196 - 19968: jis0212<<14 | 0x47<<7 | 0x38,
-	39197 - 19968: jis0208<<14 | 0x50<<7 | 0x12,
-	39198 - 19968: jis0208<<14 | 0x50<<7 | 0x13,
-	39199 - 19968: jis0212<<14 | 0x47<<7 | 0x39,
-	39200 - 19968: jis0208<<14 | 0x50<<7 | 0x15,
-	39201 - 19968: jis0208<<14 | 0x50<<7 | 0x11,
-	39202 - 19968: jis0212<<14 | 0x47<<7 | 0x3A,
-	39204 - 19968: jis0208<<14 | 0x50<<7 | 0x14,
-	39206 - 19968: jis0212<<14 | 0x47<<7 | 0x3B,
-	39207 - 19968: jis0208<<14 | 0x5B<<7 | 0x3D,
-	39208 - 19968: jis0208<<14 | 0x13<<7 | 0x3A,
-	39211 - 19968: jis0212<<14 | 0x47<<7 | 0x3D,
-	39212 - 19968: jis0208<<14 | 0x50<<7 | 0x16,
-	39214 - 19968: jis0208<<14 | 0x50<<7 | 0x17,
-	39217 - 19968: jis0212<<14 | 0x47<<7 | 0x3E,
-	39218 - 19968: jis0212<<14 | 0x47<<7 | 0x3F,
-	39219 - 19968: jis0212<<14 | 0x47<<7 | 0x40,
-	39220 - 19968: jis0212<<14 | 0x47<<7 | 0x41,
-	39221 - 19968: jis0212<<14 | 0x47<<7 | 0x42,
-	39225 - 19968: jis0212<<14 | 0x47<<7 | 0x43,
-	39226 - 19968: jis0212<<14 | 0x47<<7 | 0x44,
-	39227 - 19968: jis0212<<14 | 0x47<<7 | 0x45,
-	39228 - 19968: jis0212<<14 | 0x47<<7 | 0x46,
-	39229 - 19968: jis0208<<14 | 0x50<<7 | 0x18,
-	39230 - 19968: jis0208<<14 | 0x50<<7 | 0x19,
-	39232 - 19968: jis0212<<14 | 0x47<<7 | 0x47,
-	39233 - 19968: jis0212<<14 | 0x47<<7 | 0x48,
-	39234 - 19968: jis0208<<14 | 0x50<<7 | 0x1A,
-	39237 - 19968: jis0208<<14 | 0x50<<7 | 0x1C,
-	39238 - 19968: jis0212<<14 | 0x47<<7 | 0x49,
-	39239 - 19968: jis0212<<14 | 0x47<<7 | 0x4A,
-	39240 - 19968: jis0212<<14 | 0x47<<7 | 0x4B,
-	39241 - 19968: jis0208<<14 | 0x50<<7 | 0x1B,
-	39243 - 19968: jis0208<<14 | 0x50<<7 | 0x1E,
-	39244 - 19968: jis0208<<14 | 0x50<<7 | 0x21,
-	39245 - 19968: jis0212<<14 | 0x47<<7 | 0x4C,
-	39246 - 19968: jis0212<<14 | 0x47<<7 | 0x4D,
-	39248 - 19968: jis0208<<14 | 0x50<<7 | 0x1D,
-	39249 - 19968: jis0208<<14 | 0x50<<7 | 0x1F,
-	39250 - 19968: jis0208<<14 | 0x50<<7 | 0x20,
-	39252 - 19968: jis0212<<14 | 0x47<<7 | 0x4E,
-	39253 - 19968: jis0208<<14 | 0x50<<7 | 0x22,
-	39255 - 19968: jis0208<<14 | 0x15<<7 | 0x21,
-	39256 - 19968: jis0212<<14 | 0x47<<7 | 0x4F,
-	39257 - 19968: jis0212<<14 | 0x47<<7 | 0x50,
-	39259 - 19968: jis0212<<14 | 0x47<<7 | 0x51,
-	39260 - 19968: jis0212<<14 | 0x47<<7 | 0x52,
-	39262 - 19968: jis0212<<14 | 0x47<<7 | 0x53,
-	39263 - 19968: jis0212<<14 | 0x47<<7 | 0x54,
-	39264 - 19968: jis0212<<14 | 0x47<<7 | 0x55,
-	39318 - 19968: jis0208<<14 | 0x1B<<7 | 0x52,
-	39319 - 19968: jis0208<<14 | 0x50<<7 | 0x23,
-	39320 - 19968: jis0208<<14 | 0x50<<7 | 0x24,
-	39321 - 19968: jis0208<<14 | 0x18<<7 | 0x40,
-	39323 - 19968: jis0212<<14 | 0x47<<7 | 0x56,
-	39325 - 19968: jis0212<<14 | 0x47<<7 | 0x57,
-	39326 - 19968: jis0208<<14 | 0x5B<<7 | 0x3F,
-	39327 - 19968: jis0212<<14 | 0x47<<7 | 0x58,
-	39333 - 19968: jis0208<<14 | 0x50<<7 | 0x25,
-	39334 - 19968: jis0212<<14 | 0x47<<7 | 0x59,
-	39336 - 19968: jis0208<<14 | 0x12<<7 | 0x1D,
-	39340 - 19968: jis0208<<14 | 0x26<<7 | 0x2E,
-	39341 - 19968: jis0208<<14 | 0x50<<7 | 0x26,
-	39342 - 19968: jis0208<<14 | 0x50<<7 | 0x27,
-	39344 - 19968: jis0212<<14 | 0x47<<7 | 0x5A,
-	39345 - 19968: jis0212<<14 | 0x47<<7 | 0x5B,
-	39346 - 19968: jis0212<<14 | 0x47<<7 | 0x5C,
-	39347 - 19968: jis0208<<14 | 0x22<<7 | 0x39,
-	39348 - 19968: jis0208<<14 | 0x25<<7 | 0x4A,
-	39349 - 19968: jis0212<<14 | 0x47<<7 | 0x5D,
-	39353 - 19968: jis0212<<14 | 0x48<<7 | 0x00,
-	39354 - 19968: jis0212<<14 | 0x48<<7 | 0x01,
-	39356 - 19968: jis0208<<14 | 0x50<<7 | 0x28,
-	39357 - 19968: jis0212<<14 | 0x48<<7 | 0x02,
-	39359 - 19968: jis0212<<14 | 0x48<<7 | 0x03,
-	39361 - 19968: jis0208<<14 | 0x26<<7 | 0x5C,
-	39363 - 19968: jis0212<<14 | 0x48<<7 | 0x04,
-	39364 - 19968: jis0208<<14 | 0x21<<7 | 0x2B,
-	39365 - 19968: jis0208<<14 | 0x10<<7 | 0x37,
-	39366 - 19968: jis0208<<14 | 0x15<<7 | 0x4D,
-	39368 - 19968: jis0208<<14 | 0x15<<7 | 0x4E,
-	39369 - 19968: jis0212<<14 | 0x48<<7 | 0x05,
-	39376 - 19968: jis0208<<14 | 0x22<<7 | 0x52,
-	39377 - 19968: jis0208<<14 | 0x50<<7 | 0x2D,
-	39378 - 19968: jis0208<<14 | 0x15<<7 | 0x4F,
-	39379 - 19968: jis0212<<14 | 0x48<<7 | 0x06,
-	39380 - 19968: jis0212<<14 | 0x48<<7 | 0x07,
-	39381 - 19968: jis0208<<14 | 0x11<<7 | 0x4E,
-	39384 - 19968: jis0208<<14 | 0x50<<7 | 0x2C,
-	39385 - 19968: jis0212<<14 | 0x48<<7 | 0x08,
-	39386 - 19968: jis0212<<14 | 0x48<<7 | 0x09,
-	39387 - 19968: jis0208<<14 | 0x50<<7 | 0x2A,
-	39388 - 19968: jis0212<<14 | 0x48<<7 | 0x0A,
-	39389 - 19968: jis0208<<14 | 0x50<<7 | 0x2B,
-	39390 - 19968: jis0212<<14 | 0x48<<7 | 0x0B,
-	39391 - 19968: jis0208<<14 | 0x50<<7 | 0x29,
-	39394 - 19968: jis0208<<14 | 0x50<<7 | 0x37,
-	39399 - 19968: jis0212<<14 | 0x48<<7 | 0x0C,
-	39402 - 19968: jis0212<<14 | 0x48<<7 | 0x0D,
-	39403 - 19968: jis0212<<14 | 0x48<<7 | 0x0E,
-	39404 - 19968: jis0212<<14 | 0x48<<7 | 0x0F,
-	39405 - 19968: jis0208<<14 | 0x50<<7 | 0x2E,
-	39406 - 19968: jis0208<<14 | 0x50<<7 | 0x2F,
-	39408 - 19968: jis0212<<14 | 0x48<<7 | 0x10,
-	39409 - 19968: jis0208<<14 | 0x50<<7 | 0x30,
-	39410 - 19968: jis0208<<14 | 0x50<<7 | 0x31,
-	39412 - 19968: jis0212<<14 | 0x48<<7 | 0x11,
-	39413 - 19968: jis0212<<14 | 0x48<<7 | 0x12,
-	39416 - 19968: jis0208<<14 | 0x50<<7 | 0x33,
-	39417 - 19968: jis0212<<14 | 0x48<<7 | 0x13,
-	39419 - 19968: jis0208<<14 | 0x50<<7 | 0x32,
-	39421 - 19968: jis0212<<14 | 0x48<<7 | 0x14,
-	39422 - 19968: jis0212<<14 | 0x48<<7 | 0x15,
-	39423 - 19968: jis0208<<14 | 0x1C<<7 | 0x38,
-	39425 - 19968: jis0208<<14 | 0x50<<7 | 0x34,
-	39426 - 19968: jis0212<<14 | 0x48<<7 | 0x16,
-	39427 - 19968: jis0212<<14 | 0x48<<7 | 0x17,
-	39428 - 19968: jis0212<<14 | 0x48<<7 | 0x18,
-	39429 - 19968: jis0208<<14 | 0x50<<7 | 0x36,
-	39435 - 19968: jis0212<<14 | 0x48<<7 | 0x19,
-	39436 - 19968: jis0212<<14 | 0x48<<7 | 0x1A,
-	39438 - 19968: jis0208<<14 | 0x14<<7 | 0x12,
-	39439 - 19968: jis0208<<14 | 0x50<<7 | 0x35,
-	39440 - 19968: jis0212<<14 | 0x48<<7 | 0x1B,
-	39441 - 19968: jis0212<<14 | 0x48<<7 | 0x1C,
-	39442 - 19968: jis0208<<14 | 0x20<<7 | 0x5A,
-	39443 - 19968: jis0208<<14 | 0x17<<7 | 0x12,
-	39446 - 19968: jis0212<<14 | 0x48<<7 | 0x1D,
-	39449 - 19968: jis0208<<14 | 0x50<<7 | 0x38,
-	39454 - 19968: jis0212<<14 | 0x48<<7 | 0x1E,
-	39456 - 19968: jis0212<<14 | 0x48<<7 | 0x1F,
-	39458 - 19968: jis0212<<14 | 0x48<<7 | 0x20,
-	39459 - 19968: jis0212<<14 | 0x48<<7 | 0x21,
-	39460 - 19968: jis0212<<14 | 0x48<<7 | 0x22,
-	39463 - 19968: jis0212<<14 | 0x48<<7 | 0x23,
-	39464 - 19968: jis0208<<14 | 0x21<<7 | 0x2C,
-	39467 - 19968: jis0208<<14 | 0x50<<7 | 0x39,
-	39469 - 19968: jis0212<<14 | 0x48<<7 | 0x24,
-	39470 - 19968: jis0212<<14 | 0x48<<7 | 0x25,
-	39472 - 19968: jis0208<<14 | 0x25<<7 | 0x0C,
-	39475 - 19968: jis0212<<14 | 0x48<<7 | 0x26,
-	39477 - 19968: jis0212<<14 | 0x48<<7 | 0x27,
-	39478 - 19968: jis0212<<14 | 0x48<<7 | 0x28,
-	39479 - 19968: jis0208<<14 | 0x50<<7 | 0x3A,
-	39480 - 19968: jis0212<<14 | 0x48<<7 | 0x29,
-	39486 - 19968: jis0208<<14 | 0x50<<7 | 0x3F,
-	39488 - 19968: jis0208<<14 | 0x50<<7 | 0x3D,
-	39489 - 19968: jis0212<<14 | 0x48<<7 | 0x2B,
-	39490 - 19968: jis0208<<14 | 0x50<<7 | 0x3C,
-	39491 - 19968: jis0208<<14 | 0x50<<7 | 0x3E,
-	39492 - 19968: jis0212<<14 | 0x48<<7 | 0x2C,
-	39493 - 19968: jis0208<<14 | 0x50<<7 | 0x3B,
-	39495 - 19968: jis0212<<14 | 0x48<<7 | 0x2A,
-	39498 - 19968: jis0212<<14 | 0x48<<7 | 0x2D,
-	39499 - 19968: jis0212<<14 | 0x48<<7 | 0x2E,
-	39500 - 19968: jis0212<<14 | 0x48<<7 | 0x2F,
-	39501 - 19968: jis0208<<14 | 0x50<<7 | 0x41,
-	39502 - 19968: jis0208<<14 | 0x5B<<7 | 0x40,
-	39505 - 19968: jis0212<<14 | 0x48<<7 | 0x31,
-	39508 - 19968: jis0212<<14 | 0x48<<7 | 0x32,
-	39509 - 19968: jis0208<<14 | 0x50<<7 | 0x40,
-	39510 - 19968: jis0212<<14 | 0x48<<7 | 0x33,
-	39511 - 19968: jis0208<<14 | 0x50<<7 | 0x43,
-	39514 - 19968: jis0208<<14 | 0x15<<7 | 0x22,
-	39515 - 19968: jis0208<<14 | 0x50<<7 | 0x42,
-	39517 - 19968: jis0212<<14 | 0x48<<7 | 0x34,
-	39519 - 19968: jis0208<<14 | 0x50<<7 | 0x44,
-	39522 - 19968: jis0208<<14 | 0x50<<7 | 0x45,
-	39524 - 19968: jis0208<<14 | 0x50<<7 | 0x47,
-	39525 - 19968: jis0208<<14 | 0x50<<7 | 0x46,
-	39529 - 19968: jis0208<<14 | 0x50<<7 | 0x48,
-	39530 - 19968: jis0208<<14 | 0x50<<7 | 0x4A,
-	39531 - 19968: jis0208<<14 | 0x50<<7 | 0x49,
-	39592 - 19968: jis0208<<14 | 0x18<<7 | 0x5B,
-	39594 - 19968: jis0212<<14 | 0x48<<7 | 0x35,
-	39596 - 19968: jis0212<<14 | 0x48<<7 | 0x36,
-	39597 - 19968: jis0208<<14 | 0x50<<7 | 0x4B,
-	39598 - 19968: jis0212<<14 | 0x48<<7 | 0x37,
-	39599 - 19968: jis0212<<14 | 0x48<<7 | 0x38,
-	39600 - 19968: jis0208<<14 | 0x50<<7 | 0x4C,
-	39602 - 19968: jis0212<<14 | 0x48<<7 | 0x39,
-	39604 - 19968: jis0212<<14 | 0x48<<7 | 0x3A,
-	39605 - 19968: jis0212<<14 | 0x48<<7 | 0x3B,
-	39606 - 19968: jis0212<<14 | 0x48<<7 | 0x3C,
-	39608 - 19968: jis0208<<14 | 0x12<<7 | 0x1B,
-	39609 - 19968: jis0212<<14 | 0x48<<7 | 0x3D,
-	39611 - 19968: jis0212<<14 | 0x48<<7 | 0x3E,
-	39612 - 19968: jis0208<<14 | 0x50<<7 | 0x4D,
-	39614 - 19968: jis0212<<14 | 0x48<<7 | 0x3F,
-	39615 - 19968: jis0212<<14 | 0x48<<7 | 0x40,
-	39616 - 19968: jis0208<<14 | 0x50<<7 | 0x4E,
-	39617 - 19968: jis0212<<14 | 0x48<<7 | 0x41,
-	39619 - 19968: jis0212<<14 | 0x48<<7 | 0x42,
-	39620 - 19968: jis0208<<14 | 0x1E<<7 | 0x50,
-	39622 - 19968: jis0212<<14 | 0x48<<7 | 0x43,
-	39624 - 19968: jis0212<<14 | 0x48<<7 | 0x44,
-	39630 - 19968: jis0212<<14 | 0x48<<7 | 0x45,
-	39631 - 19968: jis0208<<14 | 0x50<<7 | 0x4F,
-	39632 - 19968: jis0212<<14 | 0x48<<7 | 0x46,
-	39633 - 19968: jis0208<<14 | 0x50<<7 | 0x50,
-	39634 - 19968: jis0212<<14 | 0x48<<7 | 0x47,
-	39635 - 19968: jis0208<<14 | 0x50<<7 | 0x51,
-	39636 - 19968: jis0208<<14 | 0x50<<7 | 0x52,
-	39637 - 19968: jis0212<<14 | 0x48<<7 | 0x48,
-	39638 - 19968: jis0212<<14 | 0x48<<7 | 0x49,
-	39639 - 19968: jis0212<<14 | 0x48<<7 | 0x4A,
-	39640 - 19968: jis0208<<14 | 0x18<<7 | 0x41,
-	39641 - 19968: jis0208<<14 | 0x5B<<7 | 0x41,
-	39643 - 19968: jis0212<<14 | 0x48<<7 | 0x4B,
-	39644 - 19968: jis0208<<14 | 0x5B<<7 | 0x42,
-	39646 - 19968: jis0208<<14 | 0x50<<7 | 0x53,
-	39647 - 19968: jis0208<<14 | 0x50<<7 | 0x54,
-	39648 - 19968: jis0212<<14 | 0x48<<7 | 0x4D,
-	39650 - 19968: jis0208<<14 | 0x50<<7 | 0x55,
-	39651 - 19968: jis0208<<14 | 0x50<<7 | 0x56,
-	39652 - 19968: jis0212<<14 | 0x48<<7 | 0x4E,
-	39653 - 19968: jis0212<<14 | 0x48<<7 | 0x4F,
-	39654 - 19968: jis0208<<14 | 0x50<<7 | 0x57,
-	39655 - 19968: jis0212<<14 | 0x48<<7 | 0x50,
-	39657 - 19968: jis0212<<14 | 0x48<<7 | 0x51,
-	39658 - 19968: jis0208<<14 | 0x27<<7 | 0x10,
-	39659 - 19968: jis0208<<14 | 0x50<<7 | 0x59,
-	39660 - 19968: jis0212<<14 | 0x48<<7 | 0x52,
-	39661 - 19968: jis0208<<14 | 0x28<<7 | 0x05,
-	39662 - 19968: jis0208<<14 | 0x50<<7 | 0x5A,
-	39663 - 19968: jis0208<<14 | 0x50<<7 | 0x58,
-	39665 - 19968: jis0208<<14 | 0x50<<7 | 0x5C,
-	39666 - 19968: jis0212<<14 | 0x48<<7 | 0x53,
-	39667 - 19968: jis0212<<14 | 0x48<<7 | 0x54,
-	39668 - 19968: jis0208<<14 | 0x50<<7 | 0x5B,
-	39669 - 19968: jis0212<<14 | 0x48<<7 | 0x55,
-	39671 - 19968: jis0208<<14 | 0x50<<7 | 0x5D,
-	39673 - 19968: jis0212<<14 | 0x48<<7 | 0x56,
-	39674 - 19968: jis0212<<14 | 0x48<<7 | 0x57,
-	39675 - 19968: jis0208<<14 | 0x51<<7 | 0x00,
-	39677 - 19968: jis0212<<14 | 0x48<<7 | 0x58,
-	39679 - 19968: jis0212<<14 | 0x48<<7 | 0x59,
-	39680 - 19968: jis0212<<14 | 0x48<<7 | 0x5A,
-	39681 - 19968: jis0212<<14 | 0x48<<7 | 0x5B,
-	39682 - 19968: jis0212<<14 | 0x48<<7 | 0x5C,
-	39683 - 19968: jis0212<<14 | 0x48<<7 | 0x5D,
-	39684 - 19968: jis0212<<14 | 0x49<<7 | 0x00,
-	39685 - 19968: jis0212<<14 | 0x49<<7 | 0x01,
-	39686 - 19968: jis0208<<14 | 0x51<<7 | 0x01,
-	39688 - 19968: jis0212<<14 | 0x49<<7 | 0x02,
-	39689 - 19968: jis0212<<14 | 0x49<<7 | 0x03,
-	39691 - 19968: jis0212<<14 | 0x49<<7 | 0x04,
-	39692 - 19968: jis0212<<14 | 0x49<<7 | 0x05,
-	39693 - 19968: jis0212<<14 | 0x49<<7 | 0x06,
-	39694 - 19968: jis0212<<14 | 0x49<<7 | 0x07,
-	39696 - 19968: jis0212<<14 | 0x49<<7 | 0x08,
-	39698 - 19968: jis0212<<14 | 0x49<<7 | 0x09,
-	39702 - 19968: jis0212<<14 | 0x49<<7 | 0x0A,
-	39704 - 19968: jis0208<<14 | 0x51<<7 | 0x02,
-	39705 - 19968: jis0212<<14 | 0x49<<7 | 0x0B,
-	39706 - 19968: jis0208<<14 | 0x51<<7 | 0x03,
-	39707 - 19968: jis0212<<14 | 0x49<<7 | 0x0C,
-	39708 - 19968: jis0212<<14 | 0x49<<7 | 0x0D,
-	39711 - 19968: jis0208<<14 | 0x51<<7 | 0x04,
-	39712 - 19968: jis0212<<14 | 0x49<<7 | 0x0E,
-	39714 - 19968: jis0208<<14 | 0x51<<7 | 0x05,
-	39715 - 19968: jis0208<<14 | 0x51<<7 | 0x06,
-	39717 - 19968: jis0208<<14 | 0x51<<7 | 0x07,
-	39718 - 19968: jis0212<<14 | 0x49<<7 | 0x0F,
-	39719 - 19968: jis0208<<14 | 0x51<<7 | 0x08,
-	39720 - 19968: jis0208<<14 | 0x51<<7 | 0x09,
-	39721 - 19968: jis0208<<14 | 0x51<<7 | 0x0A,
-	39722 - 19968: jis0208<<14 | 0x51<<7 | 0x0B,
-	39723 - 19968: jis0212<<14 | 0x49<<7 | 0x10,
-	39725 - 19968: jis0212<<14 | 0x49<<7 | 0x11,
-	39726 - 19968: jis0208<<14 | 0x51<<7 | 0x0C,
-	39727 - 19968: jis0208<<14 | 0x51<<7 | 0x0D,
-	39729 - 19968: jis0208<<14 | 0x3C<<7 | 0x14,
-	39730 - 19968: jis0208<<14 | 0x51<<7 | 0x0E,
-	39731 - 19968: jis0212<<14 | 0x49<<7 | 0x12,
-	39732 - 19968: jis0212<<14 | 0x49<<7 | 0x13,
-	39733 - 19968: jis0212<<14 | 0x49<<7 | 0x14,
-	39735 - 19968: jis0212<<14 | 0x49<<7 | 0x15,
-	39737 - 19968: jis0212<<14 | 0x49<<7 | 0x16,
-	39738 - 19968: jis0212<<14 | 0x49<<7 | 0x17,
-	39739 - 19968: jis0208<<14 | 0x43<<7 | 0x57,
-	39740 - 19968: jis0208<<14 | 0x14<<7 | 0x13,
-	39741 - 19968: jis0212<<14 | 0x49<<7 | 0x18,
-	39745 - 19968: jis0208<<14 | 0x12<<7 | 0x00,
-	39746 - 19968: jis0208<<14 | 0x19<<7 | 0x11,
-	39747 - 19968: jis0208<<14 | 0x51<<7 | 0x10,
-	39748 - 19968: jis0208<<14 | 0x51<<7 | 0x0F,
-	39749 - 19968: jis0208<<14 | 0x2B<<7 | 0x04,
-	39752 - 19968: jis0212<<14 | 0x49<<7 | 0x19,
-	39755 - 19968: jis0212<<14 | 0x49<<7 | 0x1A,
-	39756 - 19968: jis0212<<14 | 0x49<<7 | 0x1B,
-	39757 - 19968: jis0208<<14 | 0x51<<7 | 0x12,
-	39758 - 19968: jis0208<<14 | 0x51<<7 | 0x13,
-	39759 - 19968: jis0208<<14 | 0x51<<7 | 0x11,
-	39761 - 19968: jis0208<<14 | 0x51<<7 | 0x14,
-	39764 - 19968: jis0208<<14 | 0x2A<<7 | 0x41,
-	39765 - 19968: jis0212<<14 | 0x49<<7 | 0x1C,
-	39766 - 19968: jis0212<<14 | 0x49<<7 | 0x1D,
-	39767 - 19968: jis0212<<14 | 0x49<<7 | 0x1E,
-	39768 - 19968: jis0208<<14 | 0x51<<7 | 0x15,
-	39770 - 19968: jis0208<<14 | 0x14<<7 | 0x5A,
-	39771 - 19968: jis0212<<14 | 0x49<<7 | 0x1F,
-	39774 - 19968: jis0212<<14 | 0x49<<7 | 0x20,
-	39777 - 19968: jis0212<<14 | 0x49<<7 | 0x21,
-	39779 - 19968: jis0212<<14 | 0x49<<7 | 0x22,
-	39781 - 19968: jis0212<<14 | 0x49<<7 | 0x23,
-	39782 - 19968: jis0212<<14 | 0x49<<7 | 0x24,
-	39784 - 19968: jis0212<<14 | 0x49<<7 | 0x25,
-	39786 - 19968: jis0212<<14 | 0x49<<7 | 0x26,
-	39787 - 19968: jis0212<<14 | 0x49<<7 | 0x27,
-	39788 - 19968: jis0212<<14 | 0x49<<7 | 0x28,
-	39789 - 19968: jis0212<<14 | 0x49<<7 | 0x29,
-	39790 - 19968: jis0212<<14 | 0x49<<7 | 0x2A,
-	39791 - 19968: jis0208<<14 | 0x2E<<7 | 0x04,
-	39794 - 19968: jis0208<<14 | 0x5B<<7 | 0x44,
-	39795 - 19968: jis0212<<14 | 0x49<<7 | 0x2B,
-	39796 - 19968: jis0208<<14 | 0x51<<7 | 0x16,
-	39797 - 19968: jis0208<<14 | 0x5B<<7 | 0x43,
-	39799 - 19968: jis0212<<14 | 0x49<<7 | 0x2D,
-	39800 - 19968: jis0212<<14 | 0x49<<7 | 0x2E,
-	39801 - 19968: jis0212<<14 | 0x49<<7 | 0x2F,
-	39807 - 19968: jis0212<<14 | 0x49<<7 | 0x30,
-	39808 - 19968: jis0212<<14 | 0x49<<7 | 0x31,
-	39811 - 19968: jis0208<<14 | 0x51<<7 | 0x18,
-	39812 - 19968: jis0212<<14 | 0x49<<7 | 0x32,
-	39813 - 19968: jis0212<<14 | 0x49<<7 | 0x33,
-	39814 - 19968: jis0212<<14 | 0x49<<7 | 0x34,
-	39815 - 19968: jis0212<<14 | 0x49<<7 | 0x35,
-	39817 - 19968: jis0212<<14 | 0x49<<7 | 0x36,
-	39818 - 19968: jis0212<<14 | 0x49<<7 | 0x37,
-	39819 - 19968: jis0212<<14 | 0x49<<7 | 0x38,
-	39821 - 19968: jis0212<<14 | 0x49<<7 | 0x39,
-	39822 - 19968: jis0208<<14 | 0x0F<<7 | 0x1D,
-	39823 - 19968: jis0208<<14 | 0x5B<<7 | 0x45,
-	39824 - 19968: jis0212<<14 | 0x49<<7 | 0x3B,
-	39825 - 19968: jis0208<<14 | 0x51<<7 | 0x19,
-	39826 - 19968: jis0208<<14 | 0x29<<7 | 0x0A,
-	39827 - 19968: jis0208<<14 | 0x51<<7 | 0x17,
-	39828 - 19968: jis0212<<14 | 0x49<<7 | 0x3C,
-	39830 - 19968: jis0208<<14 | 0x51<<7 | 0x1A,
-	39831 - 19968: jis0208<<14 | 0x51<<7 | 0x1B,
-	39834 - 19968: jis0212<<14 | 0x49<<7 | 0x3D,
-	39837 - 19968: jis0212<<14 | 0x49<<7 | 0x3E,
-	39838 - 19968: jis0212<<14 | 0x49<<7 | 0x3F,
-	39839 - 19968: jis0208<<14 | 0x51<<7 | 0x1C,
-	39840 - 19968: jis0208<<14 | 0x51<<7 | 0x1D,
-	39846 - 19968: jis0212<<14 | 0x49<<7 | 0x40,
-	39847 - 19968: jis0212<<14 | 0x49<<7 | 0x41,
-	39848 - 19968: jis0208<<14 | 0x51<<7 | 0x1E,
-	39849 - 19968: jis0212<<14 | 0x49<<7 | 0x42,
-	39850 - 19968: jis0208<<14 | 0x2A<<7 | 0x4D,
-	39851 - 19968: jis0208<<14 | 0x1A<<7 | 0x0C,
-	39852 - 19968: jis0212<<14 | 0x49<<7 | 0x43,
-	39853 - 19968: jis0208<<14 | 0x19<<7 | 0x59,
-	39854 - 19968: jis0208<<14 | 0x20<<7 | 0x0E,
-	39856 - 19968: jis0212<<14 | 0x49<<7 | 0x44,
-	39857 - 19968: jis0208<<14 | 0x5B<<7 | 0x46,
-	39858 - 19968: jis0212<<14 | 0x49<<7 | 0x46,
-	39860 - 19968: jis0208<<14 | 0x51<<7 | 0x1F,
-	39863 - 19968: jis0212<<14 | 0x49<<7 | 0x47,
-	39864 - 19968: jis0212<<14 | 0x49<<7 | 0x48,
-	39865 - 19968: jis0208<<14 | 0x51<<7 | 0x22,
-	39867 - 19968: jis0208<<14 | 0x5B<<7 | 0x47,
-	39868 - 19968: jis0212<<14 | 0x49<<7 | 0x4A,
-	39870 - 19968: jis0212<<14 | 0x49<<7 | 0x4B,
-	39871 - 19968: jis0212<<14 | 0x49<<7 | 0x4C,
-	39872 - 19968: jis0208<<14 | 0x51<<7 | 0x20,
-	39873 - 19968: jis0212<<14 | 0x49<<7 | 0x4D,
-	39878 - 19968: jis0208<<14 | 0x51<<7 | 0x23,
-	39879 - 19968: jis0212<<14 | 0x49<<7 | 0x4E,
-	39880 - 19968: jis0212<<14 | 0x49<<7 | 0x4F,
-	39881 - 19968: jis0208<<14 | 0x17<<7 | 0x50,
-	39882 - 19968: jis0208<<14 | 0x51<<7 | 0x21,
-	39886 - 19968: jis0212<<14 | 0x49<<7 | 0x50,
-	39887 - 19968: jis0208<<14 | 0x51<<7 | 0x24,
-	39888 - 19968: jis0212<<14 | 0x49<<7 | 0x51,
-	39889 - 19968: jis0208<<14 | 0x51<<7 | 0x25,
-	39890 - 19968: jis0208<<14 | 0x51<<7 | 0x26,
-	39892 - 19968: jis0208<<14 | 0x51<<7 | 0x2A,
-	39894 - 19968: jis0208<<14 | 0x1A<<7 | 0x09,
-	39895 - 19968: jis0212<<14 | 0x49<<7 | 0x52,
-	39896 - 19968: jis0212<<14 | 0x49<<7 | 0x53,
-	39899 - 19968: jis0208<<14 | 0x21<<7 | 0x43,
-	39901 - 19968: jis0212<<14 | 0x49<<7 | 0x54,
-	39903 - 19968: jis0212<<14 | 0x49<<7 | 0x55,
-	39905 - 19968: jis0208<<14 | 0x51<<7 | 0x2B,
-	39906 - 19968: jis0208<<14 | 0x51<<7 | 0x28,
-	39907 - 19968: jis0208<<14 | 0x51<<7 | 0x27,
-	39908 - 19968: jis0208<<14 | 0x51<<7 | 0x29,
-	39909 - 19968: jis0212<<14 | 0x49<<7 | 0x56,
-	39911 - 19968: jis0212<<14 | 0x49<<7 | 0x57,
-	39912 - 19968: jis0208<<14 | 0x16<<7 | 0x3E,
-	39914 - 19968: jis0212<<14 | 0x49<<7 | 0x58,
-	39915 - 19968: jis0212<<14 | 0x49<<7 | 0x59,
-	39919 - 19968: jis0212<<14 | 0x49<<7 | 0x5A,
-	39920 - 19968: jis0208<<14 | 0x51<<7 | 0x2F,
-	39921 - 19968: jis0208<<14 | 0x51<<7 | 0x2E,
-	39922 - 19968: jis0208<<14 | 0x51<<7 | 0x2D,
-	39923 - 19968: jis0212<<14 | 0x49<<7 | 0x5B,
-	39925 - 19968: jis0208<<14 | 0x0F<<7 | 0x12,
-	39927 - 19968: jis0212<<14 | 0x49<<7 | 0x5C,
-	39928 - 19968: jis0212<<14 | 0x49<<7 | 0x5D,
-	39929 - 19968: jis0212<<14 | 0x4A<<7 | 0x00,
-	39930 - 19968: jis0212<<14 | 0x4A<<7 | 0x01,
-	39933 - 19968: jis0212<<14 | 0x4A<<7 | 0x02,
-	39935 - 19968: jis0212<<14 | 0x4A<<7 | 0x03,
-	39936 - 19968: jis0208<<14 | 0x5B<<7 | 0x48,
-	39938 - 19968: jis0212<<14 | 0x4A<<7 | 0x05,
-	39940 - 19968: jis0208<<14 | 0x51<<7 | 0x39,
-	39942 - 19968: jis0208<<14 | 0x51<<7 | 0x35,
-	39944 - 19968: jis0208<<14 | 0x51<<7 | 0x36,
-	39945 - 19968: jis0208<<14 | 0x51<<7 | 0x32,
-	39946 - 19968: jis0208<<14 | 0x51<<7 | 0x38,
-	39947 - 19968: jis0212<<14 | 0x4A<<7 | 0x06,
-	39948 - 19968: jis0208<<14 | 0x51<<7 | 0x34,
-	39949 - 19968: jis0208<<14 | 0x12<<7 | 0x41,
-	39951 - 19968: jis0212<<14 | 0x4A<<7 | 0x07,
-	39952 - 19968: jis0208<<14 | 0x2E<<7 | 0x2B,
-	39953 - 19968: jis0212<<14 | 0x4A<<7 | 0x08,
-	39954 - 19968: jis0208<<14 | 0x51<<7 | 0x37,
-	39955 - 19968: jis0208<<14 | 0x51<<7 | 0x33,
-	39956 - 19968: jis0208<<14 | 0x51<<7 | 0x31,
-	39957 - 19968: jis0208<<14 | 0x51<<7 | 0x30,
-	39958 - 19968: jis0212<<14 | 0x4A<<7 | 0x09,
-	39960 - 19968: jis0212<<14 | 0x4A<<7 | 0x0A,
-	39961 - 19968: jis0212<<14 | 0x4A<<7 | 0x0B,
-	39962 - 19968: jis0212<<14 | 0x4A<<7 | 0x0C,
-	39963 - 19968: jis0208<<14 | 0x51<<7 | 0x3B,
-	39964 - 19968: jis0212<<14 | 0x4A<<7 | 0x0D,
-	39966 - 19968: jis0212<<14 | 0x4A<<7 | 0x0E,
-	39969 - 19968: jis0208<<14 | 0x51<<7 | 0x3E,
-	39970 - 19968: jis0212<<14 | 0x4A<<7 | 0x0F,
-	39971 - 19968: jis0212<<14 | 0x4A<<7 | 0x10,
-	39972 - 19968: jis0208<<14 | 0x51<<7 | 0x3D,
-	39973 - 19968: jis0208<<14 | 0x51<<7 | 0x3C,
-	39974 - 19968: jis0212<<14 | 0x4A<<7 | 0x11,
-	39975 - 19968: jis0212<<14 | 0x4A<<7 | 0x12,
-	39976 - 19968: jis0212<<14 | 0x4A<<7 | 0x13,
-	39977 - 19968: jis0212<<14 | 0x4A<<7 | 0x14,
-	39978 - 19968: jis0212<<14 | 0x4A<<7 | 0x15,
-	39981 - 19968: jis0208<<14 | 0x28<<7 | 0x28,
-	39982 - 19968: jis0208<<14 | 0x51<<7 | 0x3A,
-	39983 - 19968: jis0208<<14 | 0x0F<<7 | 0x52,
-	39984 - 19968: jis0208<<14 | 0x51<<7 | 0x3F,
-	39985 - 19968: jis0212<<14 | 0x4A<<7 | 0x16,
-	39986 - 19968: jis0208<<14 | 0x51<<7 | 0x41,
-	39989 - 19968: jis0212<<14 | 0x4A<<7 | 0x17,
-	39990 - 19968: jis0212<<14 | 0x4A<<7 | 0x18,
-	39991 - 19968: jis0212<<14 | 0x4A<<7 | 0x19,
-	39993 - 19968: jis0208<<14 | 0x12<<7 | 0x4E,
-	39994 - 19968: jis0208<<14 | 0x51<<7 | 0x2C,
-	39995 - 19968: jis0208<<14 | 0x10<<7 | 0x16,
-	39997 - 19968: jis0212<<14 | 0x4A<<7 | 0x1A,
-	39998 - 19968: jis0208<<14 | 0x51<<7 | 0x43,
-	40001 - 19968: jis0212<<14 | 0x4A<<7 | 0x1B,
-	40003 - 19968: jis0212<<14 | 0x4A<<7 | 0x1C,
-	40004 - 19968: jis0212<<14 | 0x4A<<7 | 0x1D,
-	40005 - 19968: jis0212<<14 | 0x4A<<7 | 0x1E,
-	40006 - 19968: jis0208<<14 | 0x51<<7 | 0x42,
-	40007 - 19968: jis0208<<14 | 0x51<<7 | 0x40,
-	40008 - 19968: jis0208<<14 | 0x22<<7 | 0x0C,
-	40009 - 19968: jis0212<<14 | 0x4A<<7 | 0x1F,
-	40010 - 19968: jis0212<<14 | 0x4A<<7 | 0x20,
-	40014 - 19968: jis0212<<14 | 0x4A<<7 | 0x21,
-	40015 - 19968: jis0212<<14 | 0x4A<<7 | 0x22,
-	40016 - 19968: jis0212<<14 | 0x4A<<7 | 0x23,
-	40018 - 19968: jis0208<<14 | 0x2A<<7 | 0x4F,
-	40019 - 19968: jis0212<<14 | 0x4A<<7 | 0x24,
-	40020 - 19968: jis0212<<14 | 0x4A<<7 | 0x25,
-	40022 - 19968: jis0212<<14 | 0x4A<<7 | 0x26,
-	40023 - 19968: jis0208<<14 | 0x2D<<7 | 0x39,
-	40024 - 19968: jis0212<<14 | 0x4A<<7 | 0x27,
-	40026 - 19968: jis0208<<14 | 0x51<<7 | 0x44,
-	40027 - 19968: jis0212<<14 | 0x4A<<7 | 0x28,
-	40028 - 19968: jis0212<<14 | 0x4A<<7 | 0x2F,
-	40029 - 19968: jis0212<<14 | 0x4A<<7 | 0x29,
-	40030 - 19968: jis0212<<14 | 0x4A<<7 | 0x2A,
-	40031 - 19968: jis0212<<14 | 0x4A<<7 | 0x2B,
-	40032 - 19968: jis0208<<14 | 0x51<<7 | 0x45,
-	40035 - 19968: jis0212<<14 | 0x4A<<7 | 0x2C,
-	40039 - 19968: jis0208<<14 | 0x51<<7 | 0x46,
-	40040 - 19968: jis0212<<14 | 0x4A<<7 | 0x31,
-	40041 - 19968: jis0212<<14 | 0x4A<<7 | 0x2D,
-	40042 - 19968: jis0212<<14 | 0x4A<<7 | 0x2E,
-	40043 - 19968: jis0212<<14 | 0x4A<<7 | 0x30,
-	40046 - 19968: jis0212<<14 | 0x4A<<7 | 0x32,
-	40048 - 19968: jis0212<<14 | 0x4A<<7 | 0x33,
-	40050 - 19968: jis0212<<14 | 0x4A<<7 | 0x34,
-	40053 - 19968: jis0212<<14 | 0x4A<<7 | 0x35,
-	40054 - 19968: jis0208<<14 | 0x51<<7 | 0x47,
-	40055 - 19968: jis0212<<14 | 0x4A<<7 | 0x36,
-	40056 - 19968: jis0208<<14 | 0x51<<7 | 0x48,
-	40059 - 19968: jis0212<<14 | 0x4A<<7 | 0x37,
-	40165 - 19968: jis0208<<14 | 0x23<<7 | 0x1A,
-	40166 - 19968: jis0212<<14 | 0x4A<<7 | 0x38,
-	40167 - 19968: jis0208<<14 | 0x51<<7 | 0x49,
-	40169 - 19968: jis0208<<14 | 0x27<<7 | 0x16,
-	40171 - 19968: jis0208<<14 | 0x51<<7 | 0x4E,
-	40172 - 19968: jis0208<<14 | 0x51<<7 | 0x4A,
-	40176 - 19968: jis0208<<14 | 0x51<<7 | 0x4B,
-	40178 - 19968: jis0212<<14 | 0x4A<<7 | 0x39,
-	40179 - 19968: jis0208<<14 | 0x2A<<7 | 0x10,
-	40180 - 19968: jis0208<<14 | 0x2B<<7 | 0x23,
-	40182 - 19968: jis0208<<14 | 0x25<<7 | 0x2F,
-	40183 - 19968: jis0212<<14 | 0x4A<<7 | 0x3A,
-	40185 - 19968: jis0212<<14 | 0x4A<<7 | 0x3B,
-	40194 - 19968: jis0212<<14 | 0x4A<<7 | 0x3D,
-	40195 - 19968: jis0208<<14 | 0x51<<7 | 0x4F,
-	40198 - 19968: jis0208<<14 | 0x51<<7 | 0x50,
-	40199 - 19968: jis0208<<14 | 0x25<<7 | 0x1D,
-	40200 - 19968: jis0208<<14 | 0x51<<7 | 0x4D,
-	40201 - 19968: jis0208<<14 | 0x51<<7 | 0x4C,
-	40203 - 19968: jis0212<<14 | 0x4A<<7 | 0x3C,
-	40206 - 19968: jis0208<<14 | 0x11<<7 | 0x09,
-	40209 - 19968: jis0212<<14 | 0x4A<<7 | 0x3E,
-	40210 - 19968: jis0208<<14 | 0x51<<7 | 0x58,
-	40213 - 19968: jis0208<<14 | 0x51<<7 | 0x57,
-	40215 - 19968: jis0212<<14 | 0x4A<<7 | 0x3F,
-	40216 - 19968: jis0212<<14 | 0x4A<<7 | 0x40,
-	40219 - 19968: jis0208<<14 | 0x10<<7 | 0x54,
-	40220 - 19968: jis0212<<14 | 0x4A<<7 | 0x41,
-	40221 - 19968: jis0212<<14 | 0x4A<<7 | 0x42,
-	40222 - 19968: jis0212<<14 | 0x4A<<7 | 0x43,
-	40223 - 19968: jis0208<<14 | 0x51<<7 | 0x55,
-	40227 - 19968: jis0208<<14 | 0x51<<7 | 0x54,
-	40230 - 19968: jis0208<<14 | 0x51<<7 | 0x52,
-	40232 - 19968: jis0208<<14 | 0x12<<7 | 0x5A,
-	40234 - 19968: jis0208<<14 | 0x51<<7 | 0x51,
-	40235 - 19968: jis0208<<14 | 0x1B<<7 | 0x11,
-	40236 - 19968: jis0208<<14 | 0x11<<7 | 0x08,
-	40239 - 19968: jis0212<<14 | 0x4A<<7 | 0x44,
-	40240 - 19968: jis0212<<14 | 0x4A<<7 | 0x45,
-	40242 - 19968: jis0212<<14 | 0x4A<<7 | 0x46,
-	40243 - 19968: jis0212<<14 | 0x4A<<7 | 0x47,
-	40244 - 19968: jis0212<<14 | 0x4A<<7 | 0x48,
-	40250 - 19968: jis0212<<14 | 0x4A<<7 | 0x49,
-	40251 - 19968: jis0208<<14 | 0x18<<7 | 0x42,
-	40252 - 19968: jis0212<<14 | 0x4A<<7 | 0x4A,
-	40253 - 19968: jis0212<<14 | 0x4A<<7 | 0x4C,
-	40254 - 19968: jis0208<<14 | 0x51<<7 | 0x5B,
-	40255 - 19968: jis0208<<14 | 0x51<<7 | 0x5A,
-	40257 - 19968: jis0208<<14 | 0x51<<7 | 0x59,
-	40258 - 19968: jis0212<<14 | 0x4A<<7 | 0x4D,
-	40259 - 19968: jis0212<<14 | 0x4A<<7 | 0x4E,
-	40260 - 19968: jis0208<<14 | 0x51<<7 | 0x56,
-	40261 - 19968: jis0212<<14 | 0x4A<<7 | 0x4B,
-	40262 - 19968: jis0208<<14 | 0x51<<7 | 0x5C,
-	40263 - 19968: jis0212<<14 | 0x4A<<7 | 0x4F,
-	40264 - 19968: jis0208<<14 | 0x51<<7 | 0x5D,
-	40266 - 19968: jis0212<<14 | 0x4A<<7 | 0x50,
-	40272 - 19968: jis0208<<14 | 0x52<<7 | 0x04,
-	40273 - 19968: jis0208<<14 | 0x52<<7 | 0x03,
-	40275 - 19968: jis0212<<14 | 0x4A<<7 | 0x51,
-	40276 - 19968: jis0212<<14 | 0x4A<<7 | 0x52,
-	40281 - 19968: jis0208<<14 | 0x52<<7 | 0x05,
-	40284 - 19968: jis0208<<14 | 0x10<<7 | 0x0C,
-	40285 - 19968: jis0208<<14 | 0x52<<7 | 0x00,
-	40286 - 19968: jis0208<<14 | 0x52<<7 | 0x01,
-	40287 - 19968: jis0212<<14 | 0x4A<<7 | 0x53,
-	40288 - 19968: jis0208<<14 | 0x18<<7 | 0x53,
-	40289 - 19968: jis0208<<14 | 0x2B<<7 | 0x18,
-	40290 - 19968: jis0212<<14 | 0x4A<<7 | 0x55,
-	40291 - 19968: jis0212<<14 | 0x4A<<7 | 0x54,
-	40292 - 19968: jis0208<<14 | 0x52<<7 | 0x02,
-	40293 - 19968: jis0212<<14 | 0x4A<<7 | 0x56,
-	40297 - 19968: jis0212<<14 | 0x4A<<7 | 0x57,
-	40298 - 19968: jis0212<<14 | 0x4A<<7 | 0x58,
-	40299 - 19968: jis0208<<14 | 0x5B<<7 | 0x4A,
-	40300 - 19968: jis0208<<14 | 0x2A<<7 | 0x11,
-	40303 - 19968: jis0208<<14 | 0x52<<7 | 0x0A,
-	40304 - 19968: jis0208<<14 | 0x5B<<7 | 0x49,
-	40306 - 19968: jis0208<<14 | 0x52<<7 | 0x06,
-	40310 - 19968: jis0212<<14 | 0x4A<<7 | 0x5B,
-	40311 - 19968: jis0212<<14 | 0x4A<<7 | 0x5C,
-	40314 - 19968: jis0208<<14 | 0x52<<7 | 0x0B,
-	40315 - 19968: jis0212<<14 | 0x4A<<7 | 0x5D,
-	40316 - 19968: jis0212<<14 | 0x4B<<7 | 0x00,
-	40318 - 19968: jis0212<<14 | 0x4B<<7 | 0x01,
-	40323 - 19968: jis0212<<14 | 0x4B<<7 | 0x02,
-	40324 - 19968: jis0212<<14 | 0x4B<<7 | 0x03,
-	40326 - 19968: jis0212<<14 | 0x4B<<7 | 0x04,
-	40327 - 19968: jis0208<<14 | 0x52<<7 | 0x08,
-	40329 - 19968: jis0208<<14 | 0x52<<7 | 0x07,
-	40330 - 19968: jis0212<<14 | 0x4B<<7 | 0x05,
-	40333 - 19968: jis0212<<14 | 0x4B<<7 | 0x06,
-	40334 - 19968: jis0212<<14 | 0x4B<<7 | 0x07,
-	40335 - 19968: jis0208<<14 | 0x16<<7 | 0x3B,
-	40338 - 19968: jis0212<<14 | 0x4B<<7 | 0x08,
-	40339 - 19968: jis0212<<14 | 0x4B<<7 | 0x09,
-	40341 - 19968: jis0212<<14 | 0x4B<<7 | 0x0A,
-	40342 - 19968: jis0212<<14 | 0x4B<<7 | 0x0B,
-	40343 - 19968: jis0212<<14 | 0x4B<<7 | 0x0C,
-	40344 - 19968: jis0212<<14 | 0x4B<<7 | 0x0D,
-	40346 - 19968: jis0208<<14 | 0x52<<7 | 0x0C,
-	40353 - 19968: jis0212<<14 | 0x4B<<7 | 0x0E,
-	40356 - 19968: jis0208<<14 | 0x52<<7 | 0x0D,
-	40361 - 19968: jis0208<<14 | 0x52<<7 | 0x0E,
-	40362 - 19968: jis0212<<14 | 0x4B<<7 | 0x0F,
-	40363 - 19968: jis0208<<14 | 0x52<<7 | 0x09,
-	40364 - 19968: jis0212<<14 | 0x4B<<7 | 0x10,
-	40366 - 19968: jis0212<<14 | 0x4B<<7 | 0x11,
-	40367 - 19968: jis0208<<14 | 0x51<<7 | 0x53,
-	40369 - 19968: jis0212<<14 | 0x4B<<7 | 0x12,
-	40370 - 19968: jis0208<<14 | 0x52<<7 | 0x0F,
-	40372 - 19968: jis0208<<14 | 0x23<<7 | 0x40,
-	40373 - 19968: jis0212<<14 | 0x4B<<7 | 0x13,
-	40376 - 19968: jis0208<<14 | 0x52<<7 | 0x13,
-	40377 - 19968: jis0212<<14 | 0x4B<<7 | 0x14,
-	40378 - 19968: jis0208<<14 | 0x52<<7 | 0x14,
-	40379 - 19968: jis0208<<14 | 0x52<<7 | 0x12,
-	40380 - 19968: jis0212<<14 | 0x4B<<7 | 0x15,
-	40383 - 19968: jis0212<<14 | 0x4B<<7 | 0x16,
-	40385 - 19968: jis0208<<14 | 0x52<<7 | 0x11,
-	40386 - 19968: jis0208<<14 | 0x52<<7 | 0x17,
-	40387 - 19968: jis0212<<14 | 0x4B<<7 | 0x17,
-	40388 - 19968: jis0208<<14 | 0x52<<7 | 0x10,
-	40390 - 19968: jis0208<<14 | 0x52<<7 | 0x15,
-	40391 - 19968: jis0212<<14 | 0x4B<<7 | 0x18,
-	40393 - 19968: jis0212<<14 | 0x4B<<7 | 0x19,
-	40394 - 19968: jis0212<<14 | 0x4B<<7 | 0x1A,
-	40399 - 19968: jis0208<<14 | 0x52<<7 | 0x16,
-	40403 - 19968: jis0208<<14 | 0x52<<7 | 0x19,
-	40404 - 19968: jis0212<<14 | 0x4B<<7 | 0x1B,
-	40405 - 19968: jis0212<<14 | 0x4B<<7 | 0x1C,
-	40406 - 19968: jis0212<<14 | 0x4B<<7 | 0x1D,
-	40407 - 19968: jis0212<<14 | 0x4B<<7 | 0x1E,
-	40409 - 19968: jis0208<<14 | 0x52<<7 | 0x18,
-	40410 - 19968: jis0212<<14 | 0x4B<<7 | 0x1F,
-	40414 - 19968: jis0212<<14 | 0x4B<<7 | 0x20,
-	40415 - 19968: jis0212<<14 | 0x4B<<7 | 0x21,
-	40416 - 19968: jis0212<<14 | 0x4B<<7 | 0x22,
-	40421 - 19968: jis0212<<14 | 0x4B<<7 | 0x23,
-	40422 - 19968: jis0208<<14 | 0x52<<7 | 0x1B,
-	40423 - 19968: jis0212<<14 | 0x4B<<7 | 0x24,
-	40425 - 19968: jis0212<<14 | 0x4B<<7 | 0x25,
-	40427 - 19968: jis0212<<14 | 0x4B<<7 | 0x26,
-	40429 - 19968: jis0208<<14 | 0x52<<7 | 0x1C,
-	40430 - 19968: jis0212<<14 | 0x4B<<7 | 0x27,
-	40431 - 19968: jis0208<<14 | 0x52<<7 | 0x1D,
-	40432 - 19968: jis0212<<14 | 0x4B<<7 | 0x28,
-	40434 - 19968: jis0208<<14 | 0x2E<<7 | 0x28,
-	40435 - 19968: jis0212<<14 | 0x4B<<7 | 0x29,
-	40436 - 19968: jis0212<<14 | 0x4B<<7 | 0x2A,
-	40440 - 19968: jis0208<<14 | 0x52<<7 | 0x1A,
-	40441 - 19968: jis0208<<14 | 0x21<<7 | 0x4A,
-	40442 - 19968: jis0208<<14 | 0x19<<7 | 0x4C,
-	40445 - 19968: jis0208<<14 | 0x52<<7 | 0x1E,
-	40446 - 19968: jis0212<<14 | 0x4B<<7 | 0x2B,
-	40450 - 19968: jis0212<<14 | 0x4B<<7 | 0x2D,
-	40455 - 19968: jis0212<<14 | 0x4B<<7 | 0x2E,
-	40458 - 19968: jis0212<<14 | 0x4B<<7 | 0x2C,
-	40462 - 19968: jis0212<<14 | 0x4B<<7 | 0x2F,
-	40464 - 19968: jis0212<<14 | 0x4B<<7 | 0x30,
-	40465 - 19968: jis0212<<14 | 0x4B<<7 | 0x31,
-	40466 - 19968: jis0212<<14 | 0x4B<<7 | 0x32,
-	40469 - 19968: jis0212<<14 | 0x4B<<7 | 0x33,
-	40470 - 19968: jis0212<<14 | 0x4B<<7 | 0x34,
-	40473 - 19968: jis0208<<14 | 0x5B<<7 | 0x4C,
-	40474 - 19968: jis0208<<14 | 0x52<<7 | 0x1F,
-	40475 - 19968: jis0208<<14 | 0x52<<7 | 0x20,
-	40476 - 19968: jis0212<<14 | 0x4B<<7 | 0x36,
-	40477 - 19968: jis0212<<14 | 0x4B<<7 | 0x37,
-	40478 - 19968: jis0208<<14 | 0x52<<7 | 0x21,
-	40565 - 19968: jis0208<<14 | 0x52<<7 | 0x22,
-	40568 - 19968: jis0208<<14 | 0x17<<7 | 0x13,
-	40569 - 19968: jis0208<<14 | 0x52<<7 | 0x23,
-	40570 - 19968: jis0212<<14 | 0x4B<<7 | 0x38,
-	40571 - 19968: jis0212<<14 | 0x4B<<7 | 0x39,
-	40572 - 19968: jis0212<<14 | 0x4B<<7 | 0x3A,
-	40573 - 19968: jis0208<<14 | 0x52<<7 | 0x24,
-	40575 - 19968: jis0208<<14 | 0x1B<<7 | 0x0E,
-	40576 - 19968: jis0212<<14 | 0x4B<<7 | 0x3B,
-	40577 - 19968: jis0208<<14 | 0x52<<7 | 0x25,
-	40578 - 19968: jis0212<<14 | 0x4B<<7 | 0x3C,
-	40579 - 19968: jis0212<<14 | 0x4B<<7 | 0x3D,
-	40580 - 19968: jis0212<<14 | 0x4B<<7 | 0x3E,
-	40581 - 19968: jis0212<<14 | 0x4B<<7 | 0x3F,
-	40583 - 19968: jis0212<<14 | 0x4B<<7 | 0x40,
-	40584 - 19968: jis0208<<14 | 0x52<<7 | 0x26,
-	40587 - 19968: jis0208<<14 | 0x52<<7 | 0x27,
-	40588 - 19968: jis0208<<14 | 0x52<<7 | 0x28,
-	40590 - 19968: jis0212<<14 | 0x4B<<7 | 0x41,
-	40591 - 19968: jis0212<<14 | 0x4B<<7 | 0x42,
-	40593 - 19968: jis0208<<14 | 0x52<<7 | 0x2B,
-	40594 - 19968: jis0208<<14 | 0x52<<7 | 0x29,
-	40595 - 19968: jis0208<<14 | 0x2E<<7 | 0x1B,
-	40597 - 19968: jis0208<<14 | 0x52<<7 | 0x2A,
-	40598 - 19968: jis0212<<14 | 0x4B<<7 | 0x43,
-	40599 - 19968: jis0208<<14 | 0x2D<<7 | 0x4E,
-	40600 - 19968: jis0212<<14 | 0x4B<<7 | 0x44,
-	40603 - 19968: jis0212<<14 | 0x4B<<7 | 0x45,
-	40605 - 19968: jis0208<<14 | 0x52<<7 | 0x2C,
-	40606 - 19968: jis0212<<14 | 0x4B<<7 | 0x46,
-	40607 - 19968: jis0208<<14 | 0x2D<<7 | 0x3A,
-	40612 - 19968: jis0212<<14 | 0x4B<<7 | 0x47,
-	40613 - 19968: jis0208<<14 | 0x52<<7 | 0x2D,
-	40614 - 19968: jis0208<<14 | 0x26<<7 | 0x5D,
-	40616 - 19968: jis0212<<14 | 0x4B<<7 | 0x48,
-	40617 - 19968: jis0208<<14 | 0x52<<7 | 0x2E,
-	40618 - 19968: jis0208<<14 | 0x52<<7 | 0x30,
-	40620 - 19968: jis0212<<14 | 0x4B<<7 | 0x49,
-	40621 - 19968: jis0208<<14 | 0x52<<7 | 0x31,
-	40622 - 19968: jis0212<<14 | 0x4B<<7 | 0x4A,
-	40623 - 19968: jis0212<<14 | 0x4B<<7 | 0x4B,
-	40624 - 19968: jis0212<<14 | 0x4B<<7 | 0x4C,
-	40627 - 19968: jis0212<<14 | 0x4B<<7 | 0x4D,
-	40628 - 19968: jis0212<<14 | 0x4B<<7 | 0x4E,
-	40629 - 19968: jis0212<<14 | 0x4B<<7 | 0x4F,
-	40632 - 19968: jis0208<<14 | 0x52<<7 | 0x2F,
-	40633 - 19968: jis0208<<14 | 0x18<<7 | 0x4C,
-	40634 - 19968: jis0208<<14 | 0x2B<<7 | 0x2C,
-	40635 - 19968: jis0208<<14 | 0x2A<<7 | 0x42,
-	40636 - 19968: jis0208<<14 | 0x35<<7 | 0x56,
-	40638 - 19968: jis0208<<14 | 0x3C<<7 | 0x3F,
-	40639 - 19968: jis0208<<14 | 0x2A<<7 | 0x5A,
-	40644 - 19968: jis0208<<14 | 0x11<<7 | 0x0A,
-	40646 - 19968: jis0212<<14 | 0x4B<<7 | 0x50,
-	40648 - 19968: jis0212<<14 | 0x4B<<7 | 0x51,
-	40651 - 19968: jis0212<<14 | 0x4B<<7 | 0x52,
-	40652 - 19968: jis0208<<14 | 0x52<<7 | 0x33,
-	40653 - 19968: jis0208<<14 | 0x14<<7 | 0x2F,
-	40654 - 19968: jis0208<<14 | 0x52<<7 | 0x34,
-	40655 - 19968: jis0208<<14 | 0x52<<7 | 0x35,
-	40656 - 19968: jis0208<<14 | 0x52<<7 | 0x36,
-	40657 - 19968: jis0208<<14 | 0x5B<<7 | 0x4D,
-	40658 - 19968: jis0208<<14 | 0x18<<7 | 0x54,
-	40660 - 19968: jis0208<<14 | 0x52<<7 | 0x37,
-	40661 - 19968: jis0212<<14 | 0x4B<<7 | 0x53,
-	40664 - 19968: jis0208<<14 | 0x3F<<7 | 0x33,
-	40665 - 19968: jis0208<<14 | 0x2B<<7 | 0x3A,
-	40667 - 19968: jis0208<<14 | 0x21<<7 | 0x42,
-	40668 - 19968: jis0208<<14 | 0x52<<7 | 0x38,
-	40669 - 19968: jis0208<<14 | 0x52<<7 | 0x3A,
-	40670 - 19968: jis0208<<14 | 0x52<<7 | 0x39,
-	40671 - 19968: jis0212<<14 | 0x4B<<7 | 0x54,
-	40672 - 19968: jis0208<<14 | 0x52<<7 | 0x3B,
-	40676 - 19968: jis0212<<14 | 0x4B<<7 | 0x55,
-	40677 - 19968: jis0208<<14 | 0x52<<7 | 0x3C,
-	40679 - 19968: jis0212<<14 | 0x4B<<7 | 0x56,
-	40680 - 19968: jis0208<<14 | 0x52<<7 | 0x3D,
-	40684 - 19968: jis0212<<14 | 0x4B<<7 | 0x57,
-	40685 - 19968: jis0212<<14 | 0x4B<<7 | 0x58,
-	40686 - 19968: jis0212<<14 | 0x4B<<7 | 0x59,
-	40687 - 19968: jis0208<<14 | 0x52<<7 | 0x3E,
-	40688 - 19968: jis0212<<14 | 0x4B<<7 | 0x5A,
-	40689 - 19968: jis0212<<14 | 0x4B<<7 | 0x5B,
-	40690 - 19968: jis0212<<14 | 0x4B<<7 | 0x5C,
-	40692 - 19968: jis0208<<14 | 0x52<<7 | 0x3F,
-	40693 - 19968: jis0212<<14 | 0x4B<<7 | 0x5D,
-	40694 - 19968: jis0208<<14 | 0x52<<7 | 0x40,
-	40695 - 19968: jis0208<<14 | 0x52<<7 | 0x41,
-	40696 - 19968: jis0212<<14 | 0x4C<<7 | 0x00,
-	40697 - 19968: jis0208<<14 | 0x52<<7 | 0x42,
-	40699 - 19968: jis0208<<14 | 0x52<<7 | 0x43,
-	40700 - 19968: jis0208<<14 | 0x52<<7 | 0x44,
-	40701 - 19968: jis0208<<14 | 0x52<<7 | 0x45,
-	40703 - 19968: jis0212<<14 | 0x4C<<7 | 0x01,
-	40706 - 19968: jis0212<<14 | 0x4C<<7 | 0x02,
-	40707 - 19968: jis0212<<14 | 0x4C<<7 | 0x03,
-	40711 - 19968: jis0208<<14 | 0x52<<7 | 0x46,
-	40712 - 19968: jis0208<<14 | 0x52<<7 | 0x47,
-	40713 - 19968: jis0212<<14 | 0x4C<<7 | 0x04,
-	40718 - 19968: jis0208<<14 | 0x24<<7 | 0x03,
-	40719 - 19968: jis0212<<14 | 0x4C<<7 | 0x05,
-	40720 - 19968: jis0212<<14 | 0x4C<<7 | 0x06,
-	40721 - 19968: jis0212<<14 | 0x4C<<7 | 0x07,
-	40722 - 19968: jis0212<<14 | 0x4C<<7 | 0x08,
-	40723 - 19968: jis0208<<14 | 0x17<<7 | 0x3C,
-	40724 - 19968: jis0212<<14 | 0x4C<<7 | 0x09,
-	40725 - 19968: jis0208<<14 | 0x52<<7 | 0x49,
-	40726 - 19968: jis0212<<14 | 0x4C<<7 | 0x0A,
-	40727 - 19968: jis0212<<14 | 0x4C<<7 | 0x0B,
-	40729 - 19968: jis0212<<14 | 0x4C<<7 | 0x0C,
-	40730 - 19968: jis0212<<14 | 0x4C<<7 | 0x0D,
-	40731 - 19968: jis0212<<14 | 0x4C<<7 | 0x0E,
-	40735 - 19968: jis0212<<14 | 0x4C<<7 | 0x0F,
-	40736 - 19968: jis0208<<14 | 0x20<<7 | 0x2C,
-	40737 - 19968: jis0208<<14 | 0x52<<7 | 0x4A,
-	40738 - 19968: jis0212<<14 | 0x4C<<7 | 0x10,
-	40742 - 19968: jis0212<<14 | 0x4C<<7 | 0x11,
-	40746 - 19968: jis0212<<14 | 0x4C<<7 | 0x12,
-	40747 - 19968: jis0212<<14 | 0x4C<<7 | 0x13,
-	40748 - 19968: jis0208<<14 | 0x52<<7 | 0x4B,
-	40751 - 19968: jis0212<<14 | 0x4C<<7 | 0x14,
-	40753 - 19968: jis0212<<14 | 0x4C<<7 | 0x15,
-	40754 - 19968: jis0212<<14 | 0x4C<<7 | 0x16,
-	40756 - 19968: jis0212<<14 | 0x4C<<7 | 0x17,
-	40759 - 19968: jis0212<<14 | 0x4C<<7 | 0x18,
-	40761 - 19968: jis0212<<14 | 0x4C<<7 | 0x19,
-	40762 - 19968: jis0212<<14 | 0x4C<<7 | 0x1A,
-	40763 - 19968: jis0208<<14 | 0x28<<7 | 0x00,
-	40764 - 19968: jis0212<<14 | 0x4C<<7 | 0x1B,
-	40765 - 19968: jis0212<<14 | 0x4C<<7 | 0x1C,
-	40766 - 19968: jis0208<<14 | 0x52<<7 | 0x4C,
-	40767 - 19968: jis0212<<14 | 0x4C<<7 | 0x1D,
-	40769 - 19968: jis0212<<14 | 0x4C<<7 | 0x1E,
-	40771 - 19968: jis0212<<14 | 0x4C<<7 | 0x1F,
-	40772 - 19968: jis0212<<14 | 0x4C<<7 | 0x20,
-	40773 - 19968: jis0212<<14 | 0x4C<<7 | 0x21,
-	40774 - 19968: jis0212<<14 | 0x4C<<7 | 0x22,
-	40775 - 19968: jis0212<<14 | 0x4C<<7 | 0x23,
-	40778 - 19968: jis0208<<14 | 0x52<<7 | 0x4D,
-	40779 - 19968: jis0208<<14 | 0x42<<7 | 0x16,
-	40782 - 19968: jis0208<<14 | 0x4B<<7 | 0x39,
-	40783 - 19968: jis0208<<14 | 0x4F<<7 | 0x4C,
-	40786 - 19968: jis0208<<14 | 0x52<<7 | 0x4E,
-	40787 - 19968: jis0212<<14 | 0x4C<<7 | 0x24,
-	40788 - 19968: jis0208<<14 | 0x52<<7 | 0x4F,
-	40789 - 19968: jis0212<<14 | 0x4C<<7 | 0x25,
-	40790 - 19968: jis0212<<14 | 0x4C<<7 | 0x26,
-	40791 - 19968: jis0212<<14 | 0x4C<<7 | 0x27,
-	40792 - 19968: jis0212<<14 | 0x4C<<7 | 0x28,
-	40794 - 19968: jis0212<<14 | 0x4C<<7 | 0x29,
-	40797 - 19968: jis0212<<14 | 0x4C<<7 | 0x2A,
-	40798 - 19968: jis0212<<14 | 0x4C<<7 | 0x2B,
-	40799 - 19968: jis0208<<14 | 0x52<<7 | 0x51,
-	40800 - 19968: jis0208<<14 | 0x52<<7 | 0x52,
-	40801 - 19968: jis0208<<14 | 0x52<<7 | 0x53,
-	40802 - 19968: jis0208<<14 | 0x2D<<7 | 0x4F,
-	40803 - 19968: jis0208<<14 | 0x52<<7 | 0x50,
-	40806 - 19968: jis0208<<14 | 0x52<<7 | 0x54,
-	40807 - 19968: jis0208<<14 | 0x52<<7 | 0x55,
-	40808 - 19968: jis0212<<14 | 0x4C<<7 | 0x2C,
-	40809 - 19968: jis0212<<14 | 0x4C<<7 | 0x2D,
-	40810 - 19968: jis0208<<14 | 0x52<<7 | 0x57,
-	40812 - 19968: jis0208<<14 | 0x52<<7 | 0x56,
-	40813 - 19968: jis0212<<14 | 0x4C<<7 | 0x2E,
-	40814 - 19968: jis0212<<14 | 0x4C<<7 | 0x2F,
-	40815 - 19968: jis0212<<14 | 0x4C<<7 | 0x30,
-	40816 - 19968: jis0212<<14 | 0x4C<<7 | 0x31,
-	40817 - 19968: jis0212<<14 | 0x4C<<7 | 0x32,
-	40818 - 19968: jis0208<<14 | 0x52<<7 | 0x59,
-	40819 - 19968: jis0212<<14 | 0x4C<<7 | 0x33,
-	40821 - 19968: jis0212<<14 | 0x4C<<7 | 0x34,
-	40822 - 19968: jis0208<<14 | 0x52<<7 | 0x5A,
-	40823 - 19968: jis0208<<14 | 0x52<<7 | 0x58,
-	40826 - 19968: jis0212<<14 | 0x4C<<7 | 0x35,
-	40829 - 19968: jis0212<<14 | 0x4C<<7 | 0x36,
-	40845 - 19968: jis0208<<14 | 0x2D<<7 | 0x15,
-	40847 - 19968: jis0212<<14 | 0x4C<<7 | 0x37,
-	40848 - 19968: jis0212<<14 | 0x4C<<7 | 0x38,
-	40849 - 19968: jis0212<<14 | 0x4C<<7 | 0x39,
-	40850 - 19968: jis0212<<14 | 0x4C<<7 | 0x3A,
-	40852 - 19968: jis0212<<14 | 0x4C<<7 | 0x3B,
-	40853 - 19968: jis0208<<14 | 0x52<<7 | 0x5B,
-	40854 - 19968: jis0212<<14 | 0x4C<<7 | 0x3C,
-	40855 - 19968: jis0212<<14 | 0x4C<<7 | 0x3D,
-	40860 - 19968: jis0208<<14 | 0x52<<7 | 0x5C,
-	40861 - 19968: jis0208<<14 | 0x42<<7 | 0x33,
-	40862 - 19968: jis0212<<14 | 0x4C<<7 | 0x3E,
-	40864 - 19968: jis0208<<14 | 0x52<<7 | 0x5D,
-	40865 - 19968: jis0212<<14 | 0x4C<<7 | 0x3F,
-	40866 - 19968: jis0212<<14 | 0x4C<<7 | 0x40,
-	40867 - 19968: jis0212<<14 | 0x4C<<7 | 0x41,
-	40869 - 19968: jis0212<<14 | 0x4C<<7 | 0x42,
-}
-
-const encode1Low, encode1High = 8208, 9840
-
-var encode1 = [...]uint16{
-	8208 - 8208: jis0208<<14 | 0x00<<7 | 0x1D,
-	8213 - 8208: jis0208<<14 | 0x00<<7 | 0x1C,
-	8216 - 8208: jis0208<<14 | 0x00<<7 | 0x25,
-	8217 - 8208: jis0208<<14 | 0x00<<7 | 0x26,
-	8220 - 8208: jis0208<<14 | 0x00<<7 | 0x27,
-	8221 - 8208: jis0208<<14 | 0x00<<7 | 0x28,
-	8224 - 8208: jis0208<<14 | 0x01<<7 | 0x56,
-	8225 - 8208: jis0208<<14 | 0x01<<7 | 0x57,
-	8229 - 8208: jis0208<<14 | 0x00<<7 | 0x24,
-	8230 - 8208: jis0208<<14 | 0x00<<7 | 0x23,
-	8240 - 8208: jis0208<<14 | 0x01<<7 | 0x52,
-	8242 - 8208: jis0208<<14 | 0x00<<7 | 0x4B,
-	8243 - 8208: jis0208<<14 | 0x00<<7 | 0x4C,
-	8251 - 8208: jis0208<<14 | 0x01<<7 | 0x07,
-	8451 - 8208: jis0208<<14 | 0x00<<7 | 0x4D,
-	8470 - 8208: jis0208<<14 | 0x0C<<7 | 0x41,
-	8481 - 8208: jis0208<<14 | 0x0C<<7 | 0x43,
-	8482 - 8208: jis0212<<14 | 0x01<<7 | 0x4E,
-	8491 - 8208: jis0208<<14 | 0x01<<7 | 0x51,
-	8544 - 8208: jis0208<<14 | 0x0C<<7 | 0x14,
-	8545 - 8208: jis0208<<14 | 0x0C<<7 | 0x15,
-	8546 - 8208: jis0208<<14 | 0x0C<<7 | 0x16,
-	8547 - 8208: jis0208<<14 | 0x0C<<7 | 0x17,
-	8548 - 8208: jis0208<<14 | 0x0C<<7 | 0x18,
-	8549 - 8208: jis0208<<14 | 0x0C<<7 | 0x19,
-	8550 - 8208: jis0208<<14 | 0x0C<<7 | 0x1A,
-	8551 - 8208: jis0208<<14 | 0x0C<<7 | 0x1B,
-	8552 - 8208: jis0208<<14 | 0x0C<<7 | 0x1C,
-	8553 - 8208: jis0208<<14 | 0x0C<<7 | 0x1D,
-	8560 - 8208: jis0208<<14 | 0x5B<<7 | 0x50,
-	8561 - 8208: jis0208<<14 | 0x5B<<7 | 0x51,
-	8562 - 8208: jis0208<<14 | 0x5B<<7 | 0x52,
-	8563 - 8208: jis0208<<14 | 0x5B<<7 | 0x53,
-	8564 - 8208: jis0208<<14 | 0x5B<<7 | 0x54,
-	8565 - 8208: jis0208<<14 | 0x5B<<7 | 0x55,
-	8566 - 8208: jis0208<<14 | 0x5B<<7 | 0x56,
-	8567 - 8208: jis0208<<14 | 0x5B<<7 | 0x57,
-	8568 - 8208: jis0208<<14 | 0x5B<<7 | 0x58,
-	8569 - 8208: jis0208<<14 | 0x5B<<7 | 0x59,
-	8592 - 8208: jis0208<<14 | 0x01<<7 | 0x0A,
-	8593 - 8208: jis0208<<14 | 0x01<<7 | 0x0B,
-	8594 - 8208: jis0208<<14 | 0x01<<7 | 0x09,
-	8595 - 8208: jis0208<<14 | 0x01<<7 | 0x0C,
-	8658 - 8208: jis0208<<14 | 0x01<<7 | 0x2C,
-	8660 - 8208: jis0208<<14 | 0x01<<7 | 0x2D,
-	8704 - 8208: jis0208<<14 | 0x01<<7 | 0x2E,
-	8706 - 8208: jis0208<<14 | 0x01<<7 | 0x3E,
-	8707 - 8208: jis0208<<14 | 0x01<<7 | 0x2F,
-	8711 - 8208: jis0208<<14 | 0x01<<7 | 0x3F,
-	8712 - 8208: jis0208<<14 | 0x01<<7 | 0x19,
-	8715 - 8208: jis0208<<14 | 0x01<<7 | 0x1A,
-	8721 - 8208: jis0208<<14 | 0x0C<<7 | 0x53,
-	8730 - 8208: jis0208<<14 | 0x01<<7 | 0x44,
-	8733 - 8208: jis0208<<14 | 0x01<<7 | 0x46,
-	8734 - 8208: jis0208<<14 | 0x00<<7 | 0x46,
-	8735 - 8208: jis0208<<14 | 0x0C<<7 | 0x57,
-	8736 - 8208: jis0208<<14 | 0x01<<7 | 0x3B,
-	8741 - 8208: jis0208<<14 | 0x00<<7 | 0x21,
-	8743 - 8208: jis0208<<14 | 0x01<<7 | 0x29,
-	8744 - 8208: jis0208<<14 | 0x01<<7 | 0x2A,
-	8745 - 8208: jis0208<<14 | 0x01<<7 | 0x20,
-	8746 - 8208: jis0208<<14 | 0x01<<7 | 0x1F,
-	8747 - 8208: jis0208<<14 | 0x01<<7 | 0x48,
-	8748 - 8208: jis0208<<14 | 0x01<<7 | 0x49,
-	8750 - 8208: jis0208<<14 | 0x0C<<7 | 0x52,
-	8756 - 8208: jis0208<<14 | 0x00<<7 | 0x47,
-	8757 - 8208: jis0208<<14 | 0x01<<7 | 0x47,
-	8765 - 8208: jis0208<<14 | 0x01<<7 | 0x45,
-	8786 - 8208: jis0208<<14 | 0x01<<7 | 0x41,
-	8800 - 8208: jis0208<<14 | 0x00<<7 | 0x41,
-	8801 - 8208: jis0208<<14 | 0x01<<7 | 0x40,
-	8806 - 8208: jis0208<<14 | 0x00<<7 | 0x44,
-	8807 - 8208: jis0208<<14 | 0x00<<7 | 0x45,
-	8810 - 8208: jis0208<<14 | 0x01<<7 | 0x42,
-	8811 - 8208: jis0208<<14 | 0x01<<7 | 0x43,
-	8834 - 8208: jis0208<<14 | 0x01<<7 | 0x1D,
-	8835 - 8208: jis0208<<14 | 0x01<<7 | 0x1E,
-	8838 - 8208: jis0208<<14 | 0x01<<7 | 0x1B,
-	8839 - 8208: jis0208<<14 | 0x01<<7 | 0x1C,
-	8869 - 8208: jis0208<<14 | 0x01<<7 | 0x3C,
-	8895 - 8208: jis0208<<14 | 0x0C<<7 | 0x58,
-	8978 - 8208: jis0208<<14 | 0x01<<7 | 0x3D,
-	9312 - 8208: jis0208<<14 | 0x0C<<7 | 0x00,
-	9313 - 8208: jis0208<<14 | 0x0C<<7 | 0x01,
-	9314 - 8208: jis0208<<14 | 0x0C<<7 | 0x02,
-	9315 - 8208: jis0208<<14 | 0x0C<<7 | 0x03,
-	9316 - 8208: jis0208<<14 | 0x0C<<7 | 0x04,
-	9317 - 8208: jis0208<<14 | 0x0C<<7 | 0x05,
-	9318 - 8208: jis0208<<14 | 0x0C<<7 | 0x06,
-	9319 - 8208: jis0208<<14 | 0x0C<<7 | 0x07,
-	9320 - 8208: jis0208<<14 | 0x0C<<7 | 0x08,
-	9321 - 8208: jis0208<<14 | 0x0C<<7 | 0x09,
-	9322 - 8208: jis0208<<14 | 0x0C<<7 | 0x0A,
-	9323 - 8208: jis0208<<14 | 0x0C<<7 | 0x0B,
-	9324 - 8208: jis0208<<14 | 0x0C<<7 | 0x0C,
-	9325 - 8208: jis0208<<14 | 0x0C<<7 | 0x0D,
-	9326 - 8208: jis0208<<14 | 0x0C<<7 | 0x0E,
-	9327 - 8208: jis0208<<14 | 0x0C<<7 | 0x0F,
-	9328 - 8208: jis0208<<14 | 0x0C<<7 | 0x10,
-	9329 - 8208: jis0208<<14 | 0x0C<<7 | 0x11,
-	9330 - 8208: jis0208<<14 | 0x0C<<7 | 0x12,
-	9331 - 8208: jis0208<<14 | 0x0C<<7 | 0x13,
-	9472 - 8208: jis0208<<14 | 0x07<<7 | 0x00,
-	9473 - 8208: jis0208<<14 | 0x07<<7 | 0x0B,
-	9474 - 8208: jis0208<<14 | 0x07<<7 | 0x01,
-	9475 - 8208: jis0208<<14 | 0x07<<7 | 0x0C,
-	9484 - 8208: jis0208<<14 | 0x07<<7 | 0x02,
-	9487 - 8208: jis0208<<14 | 0x07<<7 | 0x0D,
-	9488 - 8208: jis0208<<14 | 0x07<<7 | 0x03,
-	9491 - 8208: jis0208<<14 | 0x07<<7 | 0x0E,
-	9492 - 8208: jis0208<<14 | 0x07<<7 | 0x05,
-	9495 - 8208: jis0208<<14 | 0x07<<7 | 0x10,
-	9496 - 8208: jis0208<<14 | 0x07<<7 | 0x04,
-	9499 - 8208: jis0208<<14 | 0x07<<7 | 0x0F,
-	9500 - 8208: jis0208<<14 | 0x07<<7 | 0x06,
-	9501 - 8208: jis0208<<14 | 0x07<<7 | 0x1B,
-	9504 - 8208: jis0208<<14 | 0x07<<7 | 0x16,
-	9507 - 8208: jis0208<<14 | 0x07<<7 | 0x11,
-	9508 - 8208: jis0208<<14 | 0x07<<7 | 0x08,
-	9509 - 8208: jis0208<<14 | 0x07<<7 | 0x1D,
-	9512 - 8208: jis0208<<14 | 0x07<<7 | 0x18,
-	9515 - 8208: jis0208<<14 | 0x07<<7 | 0x13,
-	9516 - 8208: jis0208<<14 | 0x07<<7 | 0x07,
-	9519 - 8208: jis0208<<14 | 0x07<<7 | 0x17,
-	9520 - 8208: jis0208<<14 | 0x07<<7 | 0x1C,
-	9523 - 8208: jis0208<<14 | 0x07<<7 | 0x12,
-	9524 - 8208: jis0208<<14 | 0x07<<7 | 0x09,
-	9527 - 8208: jis0208<<14 | 0x07<<7 | 0x19,
-	9528 - 8208: jis0208<<14 | 0x07<<7 | 0x1E,
-	9531 - 8208: jis0208<<14 | 0x07<<7 | 0x14,
-	9532 - 8208: jis0208<<14 | 0x07<<7 | 0x0A,
-	9535 - 8208: jis0208<<14 | 0x07<<7 | 0x1A,
-	9538 - 8208: jis0208<<14 | 0x07<<7 | 0x1F,
-	9547 - 8208: jis0208<<14 | 0x07<<7 | 0x15,
-	9632 - 8208: jis0208<<14 | 0x01<<7 | 0x02,
-	9633 - 8208: jis0208<<14 | 0x01<<7 | 0x01,
-	9650 - 8208: jis0208<<14 | 0x01<<7 | 0x04,
-	9651 - 8208: jis0208<<14 | 0x01<<7 | 0x03,
-	9660 - 8208: jis0208<<14 | 0x01<<7 | 0x06,
-	9661 - 8208: jis0208<<14 | 0x01<<7 | 0x05,
-	9670 - 8208: jis0208<<14 | 0x01<<7 | 0x00,
-	9671 - 8208: jis0208<<14 | 0x00<<7 | 0x5D,
-	9675 - 8208: jis0208<<14 | 0x00<<7 | 0x5A,
-	9678 - 8208: jis0208<<14 | 0x00<<7 | 0x5C,
-	9679 - 8208: jis0208<<14 | 0x00<<7 | 0x5B,
-	9711 - 8208: jis0208<<14 | 0x01<<7 | 0x5D,
-	9733 - 8208: jis0208<<14 | 0x00<<7 | 0x59,
-	9734 - 8208: jis0208<<14 | 0x00<<7 | 0x58,
-	9792 - 8208: jis0208<<14 | 0x00<<7 | 0x49,
-	9794 - 8208: jis0208<<14 | 0x00<<7 | 0x48,
-	9834 - 8208: jis0208<<14 | 0x01<<7 | 0x55,
-	9837 - 8208: jis0208<<14 | 0x01<<7 | 0x54,
-	9839 - 8208: jis0208<<14 | 0x01<<7 | 0x53,
-}
-
-const encode2Low, encode2High = 12288, 13262
-
-var encode2 = [...]uint16{
-	12288 - 12288: jis0208<<14 | 0x00<<7 | 0x00,
-	12289 - 12288: jis0208<<14 | 0x00<<7 | 0x01,
-	12290 - 12288: jis0208<<14 | 0x00<<7 | 0x02,
-	12291 - 12288: jis0208<<14 | 0x00<<7 | 0x16,
-	12293 - 12288: jis0208<<14 | 0x00<<7 | 0x18,
-	12294 - 12288: jis0208<<14 | 0x00<<7 | 0x19,
-	12295 - 12288: jis0208<<14 | 0x00<<7 | 0x1A,
-	12296 - 12288: jis0208<<14 | 0x00<<7 | 0x31,
-	12297 - 12288: jis0208<<14 | 0x00<<7 | 0x32,
-	12298 - 12288: jis0208<<14 | 0x00<<7 | 0x33,
-	12299 - 12288: jis0208<<14 | 0x00<<7 | 0x34,
-	12300 - 12288: jis0208<<14 | 0x00<<7 | 0x35,
-	12301 - 12288: jis0208<<14 | 0x00<<7 | 0x36,
-	12302 - 12288: jis0208<<14 | 0x00<<7 | 0x37,
-	12303 - 12288: jis0208<<14 | 0x00<<7 | 0x38,
-	12304 - 12288: jis0208<<14 | 0x00<<7 | 0x39,
-	12305 - 12288: jis0208<<14 | 0x00<<7 | 0x3A,
-	12306 - 12288: jis0208<<14 | 0x01<<7 | 0x08,
-	12307 - 12288: jis0208<<14 | 0x01<<7 | 0x0D,
-	12308 - 12288: jis0208<<14 | 0x00<<7 | 0x2B,
-	12309 - 12288: jis0208<<14 | 0x00<<7 | 0x2C,
-	12317 - 12288: jis0208<<14 | 0x0C<<7 | 0x3F,
-	12319 - 12288: jis0208<<14 | 0x0C<<7 | 0x40,
-	12353 - 12288: jis0208<<14 | 0x03<<7 | 0x00,
-	12354 - 12288: jis0208<<14 | 0x03<<7 | 0x01,
-	12355 - 12288: jis0208<<14 | 0x03<<7 | 0x02,
-	12356 - 12288: jis0208<<14 | 0x03<<7 | 0x03,
-	12357 - 12288: jis0208<<14 | 0x03<<7 | 0x04,
-	12358 - 12288: jis0208<<14 | 0x03<<7 | 0x05,
-	12359 - 12288: jis0208<<14 | 0x03<<7 | 0x06,
-	12360 - 12288: jis0208<<14 | 0x03<<7 | 0x07,
-	12361 - 12288: jis0208<<14 | 0x03<<7 | 0x08,
-	12362 - 12288: jis0208<<14 | 0x03<<7 | 0x09,
-	12363 - 12288: jis0208<<14 | 0x03<<7 | 0x0A,
-	12364 - 12288: jis0208<<14 | 0x03<<7 | 0x0B,
-	12365 - 12288: jis0208<<14 | 0x03<<7 | 0x0C,
-	12366 - 12288: jis0208<<14 | 0x03<<7 | 0x0D,
-	12367 - 12288: jis0208<<14 | 0x03<<7 | 0x0E,
-	12368 - 12288: jis0208<<14 | 0x03<<7 | 0x0F,
-	12369 - 12288: jis0208<<14 | 0x03<<7 | 0x10,
-	12370 - 12288: jis0208<<14 | 0x03<<7 | 0x11,
-	12371 - 12288: jis0208<<14 | 0x03<<7 | 0x12,
-	12372 - 12288: jis0208<<14 | 0x03<<7 | 0x13,
-	12373 - 12288: jis0208<<14 | 0x03<<7 | 0x14,
-	12374 - 12288: jis0208<<14 | 0x03<<7 | 0x15,
-	12375 - 12288: jis0208<<14 | 0x03<<7 | 0x16,
-	12376 - 12288: jis0208<<14 | 0x03<<7 | 0x17,
-	12377 - 12288: jis0208<<14 | 0x03<<7 | 0x18,
-	12378 - 12288: jis0208<<14 | 0x03<<7 | 0x19,
-	12379 - 12288: jis0208<<14 | 0x03<<7 | 0x1A,
-	12380 - 12288: jis0208<<14 | 0x03<<7 | 0x1B,
-	12381 - 12288: jis0208<<14 | 0x03<<7 | 0x1C,
-	12382 - 12288: jis0208<<14 | 0x03<<7 | 0x1D,
-	12383 - 12288: jis0208<<14 | 0x03<<7 | 0x1E,
-	12384 - 12288: jis0208<<14 | 0x03<<7 | 0x1F,
-	12385 - 12288: jis0208<<14 | 0x03<<7 | 0x20,
-	12386 - 12288: jis0208<<14 | 0x03<<7 | 0x21,
-	12387 - 12288: jis0208<<14 | 0x03<<7 | 0x22,
-	12388 - 12288: jis0208<<14 | 0x03<<7 | 0x23,
-	12389 - 12288: jis0208<<14 | 0x03<<7 | 0x24,
-	12390 - 12288: jis0208<<14 | 0x03<<7 | 0x25,
-	12391 - 12288: jis0208<<14 | 0x03<<7 | 0x26,
-	12392 - 12288: jis0208<<14 | 0x03<<7 | 0x27,
-	12393 - 12288: jis0208<<14 | 0x03<<7 | 0x28,
-	12394 - 12288: jis0208<<14 | 0x03<<7 | 0x29,
-	12395 - 12288: jis0208<<14 | 0x03<<7 | 0x2A,
-	12396 - 12288: jis0208<<14 | 0x03<<7 | 0x2B,
-	12397 - 12288: jis0208<<14 | 0x03<<7 | 0x2C,
-	12398 - 12288: jis0208<<14 | 0x03<<7 | 0x2D,
-	12399 - 12288: jis0208<<14 | 0x03<<7 | 0x2E,
-	12400 - 12288: jis0208<<14 | 0x03<<7 | 0x2F,
-	12401 - 12288: jis0208<<14 | 0x03<<7 | 0x30,
-	12402 - 12288: jis0208<<14 | 0x03<<7 | 0x31,
-	12403 - 12288: jis0208<<14 | 0x03<<7 | 0x32,
-	12404 - 12288: jis0208<<14 | 0x03<<7 | 0x33,
-	12405 - 12288: jis0208<<14 | 0x03<<7 | 0x34,
-	12406 - 12288: jis0208<<14 | 0x03<<7 | 0x35,
-	12407 - 12288: jis0208<<14 | 0x03<<7 | 0x36,
-	12408 - 12288: jis0208<<14 | 0x03<<7 | 0x37,
-	12409 - 12288: jis0208<<14 | 0x03<<7 | 0x38,
-	12410 - 12288: jis0208<<14 | 0x03<<7 | 0x39,
-	12411 - 12288: jis0208<<14 | 0x03<<7 | 0x3A,
-	12412 - 12288: jis0208<<14 | 0x03<<7 | 0x3B,
-	12413 - 12288: jis0208<<14 | 0x03<<7 | 0x3C,
-	12414 - 12288: jis0208<<14 | 0x03<<7 | 0x3D,
-	12415 - 12288: jis0208<<14 | 0x03<<7 | 0x3E,
-	12416 - 12288: jis0208<<14 | 0x03<<7 | 0x3F,
-	12417 - 12288: jis0208<<14 | 0x03<<7 | 0x40,
-	12418 - 12288: jis0208<<14 | 0x03<<7 | 0x41,
-	12419 - 12288: jis0208<<14 | 0x03<<7 | 0x42,
-	12420 - 12288: jis0208<<14 | 0x03<<7 | 0x43,
-	12421 - 12288: jis0208<<14 | 0x03<<7 | 0x44,
-	12422 - 12288: jis0208<<14 | 0x03<<7 | 0x45,
-	12423 - 12288: jis0208<<14 | 0x03<<7 | 0x46,
-	12424 - 12288: jis0208<<14 | 0x03<<7 | 0x47,
-	12425 - 12288: jis0208<<14 | 0x03<<7 | 0x48,
-	12426 - 12288: jis0208<<14 | 0x03<<7 | 0x49,
-	12427 - 12288: jis0208<<14 | 0x03<<7 | 0x4A,
-	12428 - 12288: jis0208<<14 | 0x03<<7 | 0x4B,
-	12429 - 12288: jis0208<<14 | 0x03<<7 | 0x4C,
-	12430 - 12288: jis0208<<14 | 0x03<<7 | 0x4D,
-	12431 - 12288: jis0208<<14 | 0x03<<7 | 0x4E,
-	12432 - 12288: jis0208<<14 | 0x03<<7 | 0x4F,
-	12433 - 12288: jis0208<<14 | 0x03<<7 | 0x50,
-	12434 - 12288: jis0208<<14 | 0x03<<7 | 0x51,
-	12435 - 12288: jis0208<<14 | 0x03<<7 | 0x52,
-	12443 - 12288: jis0208<<14 | 0x00<<7 | 0x0A,
-	12444 - 12288: jis0208<<14 | 0x00<<7 | 0x0B,
-	12445 - 12288: jis0208<<14 | 0x00<<7 | 0x14,
-	12446 - 12288: jis0208<<14 | 0x00<<7 | 0x15,
-	12449 - 12288: jis0208<<14 | 0x04<<7 | 0x00,
-	12450 - 12288: jis0208<<14 | 0x04<<7 | 0x01,
-	12451 - 12288: jis0208<<14 | 0x04<<7 | 0x02,
-	12452 - 12288: jis0208<<14 | 0x04<<7 | 0x03,
-	12453 - 12288: jis0208<<14 | 0x04<<7 | 0x04,
-	12454 - 12288: jis0208<<14 | 0x04<<7 | 0x05,
-	12455 - 12288: jis0208<<14 | 0x04<<7 | 0x06,
-	12456 - 12288: jis0208<<14 | 0x04<<7 | 0x07,
-	12457 - 12288: jis0208<<14 | 0x04<<7 | 0x08,
-	12458 - 12288: jis0208<<14 | 0x04<<7 | 0x09,
-	12459 - 12288: jis0208<<14 | 0x04<<7 | 0x0A,
-	12460 - 12288: jis0208<<14 | 0x04<<7 | 0x0B,
-	12461 - 12288: jis0208<<14 | 0x04<<7 | 0x0C,
-	12462 - 12288: jis0208<<14 | 0x04<<7 | 0x0D,
-	12463 - 12288: jis0208<<14 | 0x04<<7 | 0x0E,
-	12464 - 12288: jis0208<<14 | 0x04<<7 | 0x0F,
-	12465 - 12288: jis0208<<14 | 0x04<<7 | 0x10,
-	12466 - 12288: jis0208<<14 | 0x04<<7 | 0x11,
-	12467 - 12288: jis0208<<14 | 0x04<<7 | 0x12,
-	12468 - 12288: jis0208<<14 | 0x04<<7 | 0x13,
-	12469 - 12288: jis0208<<14 | 0x04<<7 | 0x14,
-	12470 - 12288: jis0208<<14 | 0x04<<7 | 0x15,
-	12471 - 12288: jis0208<<14 | 0x04<<7 | 0x16,
-	12472 - 12288: jis0208<<14 | 0x04<<7 | 0x17,
-	12473 - 12288: jis0208<<14 | 0x04<<7 | 0x18,
-	12474 - 12288: jis0208<<14 | 0x04<<7 | 0x19,
-	12475 - 12288: jis0208<<14 | 0x04<<7 | 0x1A,
-	12476 - 12288: jis0208<<14 | 0x04<<7 | 0x1B,
-	12477 - 12288: jis0208<<14 | 0x04<<7 | 0x1C,
-	12478 - 12288: jis0208<<14 | 0x04<<7 | 0x1D,
-	12479 - 12288: jis0208<<14 | 0x04<<7 | 0x1E,
-	12480 - 12288: jis0208<<14 | 0x04<<7 | 0x1F,
-	12481 - 12288: jis0208<<14 | 0x04<<7 | 0x20,
-	12482 - 12288: jis0208<<14 | 0x04<<7 | 0x21,
-	12483 - 12288: jis0208<<14 | 0x04<<7 | 0x22,
-	12484 - 12288: jis0208<<14 | 0x04<<7 | 0x23,
-	12485 - 12288: jis0208<<14 | 0x04<<7 | 0x24,
-	12486 - 12288: jis0208<<14 | 0x04<<7 | 0x25,
-	12487 - 12288: jis0208<<14 | 0x04<<7 | 0x26,
-	12488 - 12288: jis0208<<14 | 0x04<<7 | 0x27,
-	12489 - 12288: jis0208<<14 | 0x04<<7 | 0x28,
-	12490 - 12288: jis0208<<14 | 0x04<<7 | 0x29,
-	12491 - 12288: jis0208<<14 | 0x04<<7 | 0x2A,
-	12492 - 12288: jis0208<<14 | 0x04<<7 | 0x2B,
-	12493 - 12288: jis0208<<14 | 0x04<<7 | 0x2C,
-	12494 - 12288: jis0208<<14 | 0x04<<7 | 0x2D,
-	12495 - 12288: jis0208<<14 | 0x04<<7 | 0x2E,
-	12496 - 12288: jis0208<<14 | 0x04<<7 | 0x2F,
-	12497 - 12288: jis0208<<14 | 0x04<<7 | 0x30,
-	12498 - 12288: jis0208<<14 | 0x04<<7 | 0x31,
-	12499 - 12288: jis0208<<14 | 0x04<<7 | 0x32,
-	12500 - 12288: jis0208<<14 | 0x04<<7 | 0x33,
-	12501 - 12288: jis0208<<14 | 0x04<<7 | 0x34,
-	12502 - 12288: jis0208<<14 | 0x04<<7 | 0x35,
-	12503 - 12288: jis0208<<14 | 0x04<<7 | 0x36,
-	12504 - 12288: jis0208<<14 | 0x04<<7 | 0x37,
-	12505 - 12288: jis0208<<14 | 0x04<<7 | 0x38,
-	12506 - 12288: jis0208<<14 | 0x04<<7 | 0x39,
-	12507 - 12288: jis0208<<14 | 0x04<<7 | 0x3A,
-	12508 - 12288: jis0208<<14 | 0x04<<7 | 0x3B,
-	12509 - 12288: jis0208<<14 | 0x04<<7 | 0x3C,
-	12510 - 12288: jis0208<<14 | 0x04<<7 | 0x3D,
-	12511 - 12288: jis0208<<14 | 0x04<<7 | 0x3E,
-	12512 - 12288: jis0208<<14 | 0x04<<7 | 0x3F,
-	12513 - 12288: jis0208<<14 | 0x04<<7 | 0x40,
-	12514 - 12288: jis0208<<14 | 0x04<<7 | 0x41,
-	12515 - 12288: jis0208<<14 | 0x04<<7 | 0x42,
-	12516 - 12288: jis0208<<14 | 0x04<<7 | 0x43,
-	12517 - 12288: jis0208<<14 | 0x04<<7 | 0x44,
-	12518 - 12288: jis0208<<14 | 0x04<<7 | 0x45,
-	12519 - 12288: jis0208<<14 | 0x04<<7 | 0x46,
-	12520 - 12288: jis0208<<14 | 0x04<<7 | 0x47,
-	12521 - 12288: jis0208<<14 | 0x04<<7 | 0x48,
-	12522 - 12288: jis0208<<14 | 0x04<<7 | 0x49,
-	12523 - 12288: jis0208<<14 | 0x04<<7 | 0x4A,
-	12524 - 12288: jis0208<<14 | 0x04<<7 | 0x4B,
-	12525 - 12288: jis0208<<14 | 0x04<<7 | 0x4C,
-	12526 - 12288: jis0208<<14 | 0x04<<7 | 0x4D,
-	12527 - 12288: jis0208<<14 | 0x04<<7 | 0x4E,
-	12528 - 12288: jis0208<<14 | 0x04<<7 | 0x4F,
-	12529 - 12288: jis0208<<14 | 0x04<<7 | 0x50,
-	12530 - 12288: jis0208<<14 | 0x04<<7 | 0x51,
-	12531 - 12288: jis0208<<14 | 0x04<<7 | 0x52,
-	12532 - 12288: jis0208<<14 | 0x04<<7 | 0x53,
-	12533 - 12288: jis0208<<14 | 0x04<<7 | 0x54,
-	12534 - 12288: jis0208<<14 | 0x04<<7 | 0x55,
-	12539 - 12288: jis0208<<14 | 0x00<<7 | 0x05,
-	12540 - 12288: jis0208<<14 | 0x00<<7 | 0x1B,
-	12541 - 12288: jis0208<<14 | 0x00<<7 | 0x12,
-	12542 - 12288: jis0208<<14 | 0x00<<7 | 0x13,
-	12849 - 12288: jis0208<<14 | 0x0C<<7 | 0x49,
-	12850 - 12288: jis0208<<14 | 0x0C<<7 | 0x4A,
-	12857 - 12288: jis0208<<14 | 0x0C<<7 | 0x4B,
-	12964 - 12288: jis0208<<14 | 0x0C<<7 | 0x44,
-	12965 - 12288: jis0208<<14 | 0x0C<<7 | 0x45,
-	12966 - 12288: jis0208<<14 | 0x0C<<7 | 0x46,
-	12967 - 12288: jis0208<<14 | 0x0C<<7 | 0x47,
-	12968 - 12288: jis0208<<14 | 0x0C<<7 | 0x48,
-	13059 - 12288: jis0208<<14 | 0x0C<<7 | 0x25,
-	13069 - 12288: jis0208<<14 | 0x0C<<7 | 0x29,
-	13076 - 12288: jis0208<<14 | 0x0C<<7 | 0x20,
-	13080 - 12288: jis0208<<14 | 0x0C<<7 | 0x23,
-	13090 - 12288: jis0208<<14 | 0x0C<<7 | 0x21,
-	13091 - 12288: jis0208<<14 | 0x0C<<7 | 0x2B,
-	13094 - 12288: jis0208<<14 | 0x0C<<7 | 0x2A,
-	13095 - 12288: jis0208<<14 | 0x0C<<7 | 0x24,
-	13099 - 12288: jis0208<<14 | 0x0C<<7 | 0x2C,
-	13110 - 12288: jis0208<<14 | 0x0C<<7 | 0x26,
-	13115 - 12288: jis0208<<14 | 0x0C<<7 | 0x2E,
-	13129 - 12288: jis0208<<14 | 0x0C<<7 | 0x1F,
-	13130 - 12288: jis0208<<14 | 0x0C<<7 | 0x2D,
-	13133 - 12288: jis0208<<14 | 0x0C<<7 | 0x22,
-	13137 - 12288: jis0208<<14 | 0x0C<<7 | 0x27,
-	13143 - 12288: jis0208<<14 | 0x0C<<7 | 0x28,
-	13179 - 12288: jis0208<<14 | 0x0C<<7 | 0x3E,
-	13180 - 12288: jis0208<<14 | 0x0C<<7 | 0x4E,
-	13181 - 12288: jis0208<<14 | 0x0C<<7 | 0x4D,
-	13182 - 12288: jis0208<<14 | 0x0C<<7 | 0x4C,
-	13198 - 12288: jis0208<<14 | 0x0C<<7 | 0x32,
-	13199 - 12288: jis0208<<14 | 0x0C<<7 | 0x33,
-	13212 - 12288: jis0208<<14 | 0x0C<<7 | 0x2F,
-	13213 - 12288: jis0208<<14 | 0x0C<<7 | 0x30,
-	13214 - 12288: jis0208<<14 | 0x0C<<7 | 0x31,
-	13217 - 12288: jis0208<<14 | 0x0C<<7 | 0x35,
-	13252 - 12288: jis0208<<14 | 0x0C<<7 | 0x34,
-	13261 - 12288: jis0208<<14 | 0x0C<<7 | 0x42,
-}
-
-const encode3Low, encode3High = 161, 1120
-
-var encode3 = [...]uint16{
-	161 - 161:  jis0212<<14 | 0x01<<7 | 0x21,
-	164 - 161:  jis0212<<14 | 0x01<<7 | 0x4F,
-	166 - 161:  jis0212<<14 | 0x01<<7 | 0x22,
-	167 - 161:  jis0208<<14 | 0x00<<7 | 0x57,
-	168 - 161:  jis0208<<14 | 0x00<<7 | 0x0E,
-	169 - 161:  jis0212<<14 | 0x01<<7 | 0x4C,
-	170 - 161:  jis0212<<14 | 0x01<<7 | 0x4B,
-	174 - 161:  jis0212<<14 | 0x01<<7 | 0x4D,
-	175 - 161:  jis0212<<14 | 0x01<<7 | 0x13,
-	176 - 161:  jis0208<<14 | 0x00<<7 | 0x4A,
-	177 - 161:  jis0208<<14 | 0x00<<7 | 0x3D,
-	180 - 161:  jis0208<<14 | 0x00<<7 | 0x0C,
-	182 - 161:  jis0208<<14 | 0x01<<7 | 0x58,
-	184 - 161:  jis0212<<14 | 0x01<<7 | 0x10,
-	186 - 161:  jis0212<<14 | 0x01<<7 | 0x4A,
-	191 - 161:  jis0212<<14 | 0x01<<7 | 0x23,
-	192 - 161:  jis0212<<14 | 0x09<<7 | 0x01,
-	193 - 161:  jis0212<<14 | 0x09<<7 | 0x00,
-	194 - 161:  jis0212<<14 | 0x09<<7 | 0x03,
-	195 - 161:  jis0212<<14 | 0x09<<7 | 0x09,
-	196 - 161:  jis0212<<14 | 0x09<<7 | 0x02,
-	197 - 161:  jis0212<<14 | 0x09<<7 | 0x08,
-	198 - 161:  jis0212<<14 | 0x08<<7 | 0x00,
-	199 - 161:  jis0212<<14 | 0x09<<7 | 0x0D,
-	200 - 161:  jis0212<<14 | 0x09<<7 | 0x11,
-	201 - 161:  jis0212<<14 | 0x09<<7 | 0x10,
-	202 - 161:  jis0212<<14 | 0x09<<7 | 0x13,
-	203 - 161:  jis0212<<14 | 0x09<<7 | 0x12,
-	204 - 161:  jis0212<<14 | 0x09<<7 | 0x1F,
-	205 - 161:  jis0212<<14 | 0x09<<7 | 0x1E,
-	206 - 161:  jis0212<<14 | 0x09<<7 | 0x21,
-	207 - 161:  jis0212<<14 | 0x09<<7 | 0x20,
-	209 - 161:  jis0212<<14 | 0x09<<7 | 0x2F,
-	210 - 161:  jis0212<<14 | 0x09<<7 | 0x31,
-	211 - 161:  jis0212<<14 | 0x09<<7 | 0x30,
-	212 - 161:  jis0212<<14 | 0x09<<7 | 0x33,
-	213 - 161:  jis0212<<14 | 0x09<<7 | 0x37,
-	214 - 161:  jis0212<<14 | 0x09<<7 | 0x32,
-	215 - 161:  jis0208<<14 | 0x00<<7 | 0x3E,
-	216 - 161:  jis0212<<14 | 0x08<<7 | 0x0B,
-	217 - 161:  jis0212<<14 | 0x09<<7 | 0x42,
-	218 - 161:  jis0212<<14 | 0x09<<7 | 0x41,
-	219 - 161:  jis0212<<14 | 0x09<<7 | 0x44,
-	220 - 161:  jis0212<<14 | 0x09<<7 | 0x43,
-	221 - 161:  jis0212<<14 | 0x09<<7 | 0x51,
-	222 - 161:  jis0212<<14 | 0x08<<7 | 0x0F,
-	223 - 161:  jis0212<<14 | 0x08<<7 | 0x2D,
-	224 - 161:  jis0212<<14 | 0x0A<<7 | 0x01,
-	225 - 161:  jis0212<<14 | 0x0A<<7 | 0x00,
-	226 - 161:  jis0212<<14 | 0x0A<<7 | 0x03,
-	227 - 161:  jis0212<<14 | 0x0A<<7 | 0x09,
-	228 - 161:  jis0212<<14 | 0x0A<<7 | 0x02,
-	229 - 161:  jis0212<<14 | 0x0A<<7 | 0x08,
-	230 - 161:  jis0212<<14 | 0x08<<7 | 0x20,
-	231 - 161:  jis0212<<14 | 0x0A<<7 | 0x0D,
-	232 - 161:  jis0212<<14 | 0x0A<<7 | 0x11,
-	233 - 161:  jis0212<<14 | 0x0A<<7 | 0x10,
-	234 - 161:  jis0212<<14 | 0x0A<<7 | 0x13,
-	235 - 161:  jis0212<<14 | 0x0A<<7 | 0x12,
-	236 - 161:  jis0212<<14 | 0x0A<<7 | 0x1F,
-	237 - 161:  jis0212<<14 | 0x0A<<7 | 0x1E,
-	238 - 161:  jis0212<<14 | 0x0A<<7 | 0x21,
-	239 - 161:  jis0212<<14 | 0x0A<<7 | 0x20,
-	240 - 161:  jis0212<<14 | 0x08<<7 | 0x22,
-	241 - 161:  jis0212<<14 | 0x0A<<7 | 0x2F,
-	242 - 161:  jis0212<<14 | 0x0A<<7 | 0x31,
-	243 - 161:  jis0212<<14 | 0x0A<<7 | 0x30,
-	244 - 161:  jis0212<<14 | 0x0A<<7 | 0x33,
-	245 - 161:  jis0212<<14 | 0x0A<<7 | 0x37,
-	246 - 161:  jis0212<<14 | 0x0A<<7 | 0x32,
-	247 - 161:  jis0208<<14 | 0x00<<7 | 0x3F,
-	248 - 161:  jis0212<<14 | 0x08<<7 | 0x2B,
-	249 - 161:  jis0212<<14 | 0x0A<<7 | 0x42,
-	250 - 161:  jis0212<<14 | 0x0A<<7 | 0x41,
-	251 - 161:  jis0212<<14 | 0x0A<<7 | 0x44,
-	252 - 161:  jis0212<<14 | 0x0A<<7 | 0x43,
-	253 - 161:  jis0212<<14 | 0x0A<<7 | 0x51,
-	254 - 161:  jis0212<<14 | 0x08<<7 | 0x2F,
-	255 - 161:  jis0212<<14 | 0x0A<<7 | 0x52,
-	256 - 161:  jis0212<<14 | 0x09<<7 | 0x06,
-	257 - 161:  jis0212<<14 | 0x0A<<7 | 0x06,
-	258 - 161:  jis0212<<14 | 0x09<<7 | 0x04,
-	259 - 161:  jis0212<<14 | 0x0A<<7 | 0x04,
-	260 - 161:  jis0212<<14 | 0x09<<7 | 0x07,
-	261 - 161:  jis0212<<14 | 0x0A<<7 | 0x07,
-	262 - 161:  jis0212<<14 | 0x09<<7 | 0x0A,
-	263 - 161:  jis0212<<14 | 0x0A<<7 | 0x0A,
-	264 - 161:  jis0212<<14 | 0x09<<7 | 0x0B,
-	265 - 161:  jis0212<<14 | 0x0A<<7 | 0x0B,
-	266 - 161:  jis0212<<14 | 0x09<<7 | 0x0E,
-	267 - 161:  jis0212<<14 | 0x0A<<7 | 0x0E,
-	268 - 161:  jis0212<<14 | 0x09<<7 | 0x0C,
-	269 - 161:  jis0212<<14 | 0x0A<<7 | 0x0C,
-	270 - 161:  jis0212<<14 | 0x09<<7 | 0x0F,
-	271 - 161:  jis0212<<14 | 0x0A<<7 | 0x0F,
-	272 - 161:  jis0212<<14 | 0x08<<7 | 0x01,
-	273 - 161:  jis0212<<14 | 0x08<<7 | 0x21,
-	274 - 161:  jis0212<<14 | 0x09<<7 | 0x16,
-	275 - 161:  jis0212<<14 | 0x0A<<7 | 0x16,
-	278 - 161:  jis0212<<14 | 0x09<<7 | 0x15,
-	279 - 161:  jis0212<<14 | 0x0A<<7 | 0x15,
-	280 - 161:  jis0212<<14 | 0x09<<7 | 0x17,
-	281 - 161:  jis0212<<14 | 0x0A<<7 | 0x17,
-	282 - 161:  jis0212<<14 | 0x09<<7 | 0x14,
-	283 - 161:  jis0212<<14 | 0x0A<<7 | 0x14,
-	284 - 161:  jis0212<<14 | 0x09<<7 | 0x19,
-	285 - 161:  jis0212<<14 | 0x0A<<7 | 0x19,
-	286 - 161:  jis0212<<14 | 0x09<<7 | 0x1A,
-	287 - 161:  jis0212<<14 | 0x0A<<7 | 0x1A,
-	288 - 161:  jis0212<<14 | 0x09<<7 | 0x1C,
-	289 - 161:  jis0212<<14 | 0x0A<<7 | 0x1C,
-	290 - 161:  jis0212<<14 | 0x09<<7 | 0x1B,
-	292 - 161:  jis0212<<14 | 0x09<<7 | 0x1D,
-	293 - 161:  jis0212<<14 | 0x0A<<7 | 0x1D,
-	294 - 161:  jis0212<<14 | 0x08<<7 | 0x03,
-	295 - 161:  jis0212<<14 | 0x08<<7 | 0x23,
-	296 - 161:  jis0212<<14 | 0x09<<7 | 0x26,
-	297 - 161:  jis0212<<14 | 0x0A<<7 | 0x26,
-	298 - 161:  jis0212<<14 | 0x09<<7 | 0x24,
-	299 - 161:  jis0212<<14 | 0x0A<<7 | 0x24,
-	302 - 161:  jis0212<<14 | 0x09<<7 | 0x25,
-	303 - 161:  jis0212<<14 | 0x0A<<7 | 0x25,
-	304 - 161:  jis0212<<14 | 0x09<<7 | 0x23,
-	305 - 161:  jis0212<<14 | 0x08<<7 | 0x24,
-	306 - 161:  jis0212<<14 | 0x08<<7 | 0x05,
-	307 - 161:  jis0212<<14 | 0x08<<7 | 0x25,
-	308 - 161:  jis0212<<14 | 0x09<<7 | 0x27,
-	309 - 161:  jis0212<<14 | 0x0A<<7 | 0x27,
-	310 - 161:  jis0212<<14 | 0x09<<7 | 0x28,
-	311 - 161:  jis0212<<14 | 0x0A<<7 | 0x28,
-	312 - 161:  jis0212<<14 | 0x08<<7 | 0x26,
-	313 - 161:  jis0212<<14 | 0x09<<7 | 0x29,
-	314 - 161:  jis0212<<14 | 0x0A<<7 | 0x29,
-	315 - 161:  jis0212<<14 | 0x09<<7 | 0x2B,
-	316 - 161:  jis0212<<14 | 0x0A<<7 | 0x2B,
-	317 - 161:  jis0212<<14 | 0x09<<7 | 0x2A,
-	318 - 161:  jis0212<<14 | 0x0A<<7 | 0x2A,
-	319 - 161:  jis0212<<14 | 0x08<<7 | 0x08,
-	320 - 161:  jis0212<<14 | 0x08<<7 | 0x28,
-	321 - 161:  jis0212<<14 | 0x08<<7 | 0x07,
-	322 - 161:  jis0212<<14 | 0x08<<7 | 0x27,
-	323 - 161:  jis0212<<14 | 0x09<<7 | 0x2C,
-	324 - 161:  jis0212<<14 | 0x0A<<7 | 0x2C,
-	325 - 161:  jis0212<<14 | 0x09<<7 | 0x2E,
-	326 - 161:  jis0212<<14 | 0x0A<<7 | 0x2E,
-	327 - 161:  jis0212<<14 | 0x09<<7 | 0x2D,
-	328 - 161:  jis0212<<14 | 0x0A<<7 | 0x2D,
-	329 - 161:  jis0212<<14 | 0x08<<7 | 0x29,
-	330 - 161:  jis0212<<14 | 0x08<<7 | 0x0A,
-	331 - 161:  jis0212<<14 | 0x08<<7 | 0x2A,
-	332 - 161:  jis0212<<14 | 0x09<<7 | 0x36,
-	333 - 161:  jis0212<<14 | 0x0A<<7 | 0x36,
-	336 - 161:  jis0212<<14 | 0x09<<7 | 0x35,
-	337 - 161:  jis0212<<14 | 0x0A<<7 | 0x35,
-	338 - 161:  jis0212<<14 | 0x08<<7 | 0x0C,
-	339 - 161:  jis0212<<14 | 0x08<<7 | 0x2C,
-	340 - 161:  jis0212<<14 | 0x09<<7 | 0x38,
-	341 - 161:  jis0212<<14 | 0x0A<<7 | 0x38,
-	342 - 161:  jis0212<<14 | 0x09<<7 | 0x3A,
-	343 - 161:  jis0212<<14 | 0x0A<<7 | 0x3A,
-	344 - 161:  jis0212<<14 | 0x09<<7 | 0x39,
-	345 - 161:  jis0212<<14 | 0x0A<<7 | 0x39,
-	346 - 161:  jis0212<<14 | 0x09<<7 | 0x3B,
-	347 - 161:  jis0212<<14 | 0x0A<<7 | 0x3B,
-	348 - 161:  jis0212<<14 | 0x09<<7 | 0x3C,
-	349 - 161:  jis0212<<14 | 0x0A<<7 | 0x3C,
-	350 - 161:  jis0212<<14 | 0x09<<7 | 0x3E,
-	351 - 161:  jis0212<<14 | 0x0A<<7 | 0x3E,
-	352 - 161:  jis0212<<14 | 0x09<<7 | 0x3D,
-	353 - 161:  jis0212<<14 | 0x0A<<7 | 0x3D,
-	354 - 161:  jis0212<<14 | 0x09<<7 | 0x40,
-	355 - 161:  jis0212<<14 | 0x0A<<7 | 0x40,
-	356 - 161:  jis0212<<14 | 0x09<<7 | 0x3F,
-	357 - 161:  jis0212<<14 | 0x0A<<7 | 0x3F,
-	358 - 161:  jis0212<<14 | 0x08<<7 | 0x0E,
-	359 - 161:  jis0212<<14 | 0x08<<7 | 0x2E,
-	360 - 161:  jis0212<<14 | 0x09<<7 | 0x4B,
-	361 - 161:  jis0212<<14 | 0x0A<<7 | 0x4B,
-	362 - 161:  jis0212<<14 | 0x09<<7 | 0x48,
-	363 - 161:  jis0212<<14 | 0x0A<<7 | 0x48,
-	364 - 161:  jis0212<<14 | 0x09<<7 | 0x45,
-	365 - 161:  jis0212<<14 | 0x0A<<7 | 0x45,
-	366 - 161:  jis0212<<14 | 0x09<<7 | 0x4A,
-	367 - 161:  jis0212<<14 | 0x0A<<7 | 0x4A,
-	368 - 161:  jis0212<<14 | 0x09<<7 | 0x47,
-	369 - 161:  jis0212<<14 | 0x0A<<7 | 0x47,
-	370 - 161:  jis0212<<14 | 0x09<<7 | 0x49,
-	371 - 161:  jis0212<<14 | 0x0A<<7 | 0x49,
-	372 - 161:  jis0212<<14 | 0x09<<7 | 0x50,
-	373 - 161:  jis0212<<14 | 0x0A<<7 | 0x50,
-	374 - 161:  jis0212<<14 | 0x09<<7 | 0x53,
-	375 - 161:  jis0212<<14 | 0x0A<<7 | 0x53,
-	376 - 161:  jis0212<<14 | 0x09<<7 | 0x52,
-	377 - 161:  jis0212<<14 | 0x09<<7 | 0x54,
-	378 - 161:  jis0212<<14 | 0x0A<<7 | 0x54,
-	379 - 161:  jis0212<<14 | 0x09<<7 | 0x56,
-	380 - 161:  jis0212<<14 | 0x0A<<7 | 0x56,
-	381 - 161:  jis0212<<14 | 0x09<<7 | 0x55,
-	382 - 161:  jis0212<<14 | 0x0A<<7 | 0x55,
-	461 - 161:  jis0212<<14 | 0x09<<7 | 0x05,
-	462 - 161:  jis0212<<14 | 0x0A<<7 | 0x05,
-	463 - 161:  jis0212<<14 | 0x09<<7 | 0x22,
-	464 - 161:  jis0212<<14 | 0x0A<<7 | 0x22,
-	465 - 161:  jis0212<<14 | 0x09<<7 | 0x34,
-	466 - 161:  jis0212<<14 | 0x0A<<7 | 0x34,
-	467 - 161:  jis0212<<14 | 0x09<<7 | 0x46,
-	468 - 161:  jis0212<<14 | 0x0A<<7 | 0x46,
-	469 - 161:  jis0212<<14 | 0x09<<7 | 0x4F,
-	470 - 161:  jis0212<<14 | 0x0A<<7 | 0x4F,
-	471 - 161:  jis0212<<14 | 0x09<<7 | 0x4C,
-	472 - 161:  jis0212<<14 | 0x0A<<7 | 0x4C,
-	473 - 161:  jis0212<<14 | 0x09<<7 | 0x4E,
-	474 - 161:  jis0212<<14 | 0x0A<<7 | 0x4E,
-	475 - 161:  jis0212<<14 | 0x09<<7 | 0x4D,
-	476 - 161:  jis0212<<14 | 0x0A<<7 | 0x4D,
-	501 - 161:  jis0212<<14 | 0x0A<<7 | 0x18,
-	711 - 161:  jis0212<<14 | 0x01<<7 | 0x0F,
-	728 - 161:  jis0212<<14 | 0x01<<7 | 0x0E,
-	729 - 161:  jis0212<<14 | 0x01<<7 | 0x11,
-	730 - 161:  jis0212<<14 | 0x01<<7 | 0x15,
-	731 - 161:  jis0212<<14 | 0x01<<7 | 0x14,
-	733 - 161:  jis0212<<14 | 0x01<<7 | 0x12,
-	900 - 161:  jis0212<<14 | 0x01<<7 | 0x17,
-	901 - 161:  jis0212<<14 | 0x01<<7 | 0x18,
-	902 - 161:  jis0212<<14 | 0x05<<7 | 0x40,
-	904 - 161:  jis0212<<14 | 0x05<<7 | 0x41,
-	905 - 161:  jis0212<<14 | 0x05<<7 | 0x42,
-	906 - 161:  jis0212<<14 | 0x05<<7 | 0x43,
-	908 - 161:  jis0212<<14 | 0x05<<7 | 0x46,
-	910 - 161:  jis0212<<14 | 0x05<<7 | 0x48,
-	911 - 161:  jis0212<<14 | 0x05<<7 | 0x4B,
-	912 - 161:  jis0212<<14 | 0x05<<7 | 0x55,
-	913 - 161:  jis0208<<14 | 0x05<<7 | 0x00,
-	914 - 161:  jis0208<<14 | 0x05<<7 | 0x01,
-	915 - 161:  jis0208<<14 | 0x05<<7 | 0x02,
-	916 - 161:  jis0208<<14 | 0x05<<7 | 0x03,
-	917 - 161:  jis0208<<14 | 0x05<<7 | 0x04,
-	918 - 161:  jis0208<<14 | 0x05<<7 | 0x05,
-	919 - 161:  jis0208<<14 | 0x05<<7 | 0x06,
-	920 - 161:  jis0208<<14 | 0x05<<7 | 0x07,
-	921 - 161:  jis0208<<14 | 0x05<<7 | 0x08,
-	922 - 161:  jis0208<<14 | 0x05<<7 | 0x09,
-	923 - 161:  jis0208<<14 | 0x05<<7 | 0x0A,
-	924 - 161:  jis0208<<14 | 0x05<<7 | 0x0B,
-	925 - 161:  jis0208<<14 | 0x05<<7 | 0x0C,
-	926 - 161:  jis0208<<14 | 0x05<<7 | 0x0D,
-	927 - 161:  jis0208<<14 | 0x05<<7 | 0x0E,
-	928 - 161:  jis0208<<14 | 0x05<<7 | 0x0F,
-	929 - 161:  jis0208<<14 | 0x05<<7 | 0x10,
-	931 - 161:  jis0208<<14 | 0x05<<7 | 0x11,
-	932 - 161:  jis0208<<14 | 0x05<<7 | 0x12,
-	933 - 161:  jis0208<<14 | 0x05<<7 | 0x13,
-	934 - 161:  jis0208<<14 | 0x05<<7 | 0x14,
-	935 - 161:  jis0208<<14 | 0x05<<7 | 0x15,
-	936 - 161:  jis0208<<14 | 0x05<<7 | 0x16,
-	937 - 161:  jis0208<<14 | 0x05<<7 | 0x17,
-	938 - 161:  jis0212<<14 | 0x05<<7 | 0x44,
-	939 - 161:  jis0212<<14 | 0x05<<7 | 0x49,
-	940 - 161:  jis0212<<14 | 0x05<<7 | 0x50,
-	941 - 161:  jis0212<<14 | 0x05<<7 | 0x51,
-	942 - 161:  jis0212<<14 | 0x05<<7 | 0x52,
-	943 - 161:  jis0212<<14 | 0x05<<7 | 0x53,
-	944 - 161:  jis0212<<14 | 0x05<<7 | 0x5A,
-	945 - 161:  jis0208<<14 | 0x05<<7 | 0x20,
-	946 - 161:  jis0208<<14 | 0x05<<7 | 0x21,
-	947 - 161:  jis0208<<14 | 0x05<<7 | 0x22,
-	948 - 161:  jis0208<<14 | 0x05<<7 | 0x23,
-	949 - 161:  jis0208<<14 | 0x05<<7 | 0x24,
-	950 - 161:  jis0208<<14 | 0x05<<7 | 0x25,
-	951 - 161:  jis0208<<14 | 0x05<<7 | 0x26,
-	952 - 161:  jis0208<<14 | 0x05<<7 | 0x27,
-	953 - 161:  jis0208<<14 | 0x05<<7 | 0x28,
-	954 - 161:  jis0208<<14 | 0x05<<7 | 0x29,
-	955 - 161:  jis0208<<14 | 0x05<<7 | 0x2A,
-	956 - 161:  jis0208<<14 | 0x05<<7 | 0x2B,
-	957 - 161:  jis0208<<14 | 0x05<<7 | 0x2C,
-	958 - 161:  jis0208<<14 | 0x05<<7 | 0x2D,
-	959 - 161:  jis0208<<14 | 0x05<<7 | 0x2E,
-	960 - 161:  jis0208<<14 | 0x05<<7 | 0x2F,
-	961 - 161:  jis0208<<14 | 0x05<<7 | 0x30,
-	962 - 161:  jis0212<<14 | 0x05<<7 | 0x57,
-	963 - 161:  jis0208<<14 | 0x05<<7 | 0x31,
-	964 - 161:  jis0208<<14 | 0x05<<7 | 0x32,
-	965 - 161:  jis0208<<14 | 0x05<<7 | 0x33,
-	966 - 161:  jis0208<<14 | 0x05<<7 | 0x34,
-	967 - 161:  jis0208<<14 | 0x05<<7 | 0x35,
-	968 - 161:  jis0208<<14 | 0x05<<7 | 0x36,
-	969 - 161:  jis0208<<14 | 0x05<<7 | 0x37,
-	970 - 161:  jis0212<<14 | 0x05<<7 | 0x54,
-	971 - 161:  jis0212<<14 | 0x05<<7 | 0x59,
-	972 - 161:  jis0212<<14 | 0x05<<7 | 0x56,
-	973 - 161:  jis0212<<14 | 0x05<<7 | 0x58,
-	974 - 161:  jis0212<<14 | 0x05<<7 | 0x5B,
-	1025 - 161: jis0208<<14 | 0x06<<7 | 0x06,
-	1026 - 161: jis0212<<14 | 0x06<<7 | 0x21,
-	1027 - 161: jis0212<<14 | 0x06<<7 | 0x22,
-	1028 - 161: jis0212<<14 | 0x06<<7 | 0x23,
-	1029 - 161: jis0212<<14 | 0x06<<7 | 0x24,
-	1030 - 161: jis0212<<14 | 0x06<<7 | 0x25,
-	1031 - 161: jis0212<<14 | 0x06<<7 | 0x26,
-	1032 - 161: jis0212<<14 | 0x06<<7 | 0x27,
-	1033 - 161: jis0212<<14 | 0x06<<7 | 0x28,
-	1034 - 161: jis0212<<14 | 0x06<<7 | 0x29,
-	1035 - 161: jis0212<<14 | 0x06<<7 | 0x2A,
-	1036 - 161: jis0212<<14 | 0x06<<7 | 0x2B,
-	1038 - 161: jis0212<<14 | 0x06<<7 | 0x2C,
-	1039 - 161: jis0212<<14 | 0x06<<7 | 0x2D,
-	1040 - 161: jis0208<<14 | 0x06<<7 | 0x00,
-	1041 - 161: jis0208<<14 | 0x06<<7 | 0x01,
-	1042 - 161: jis0208<<14 | 0x06<<7 | 0x02,
-	1043 - 161: jis0208<<14 | 0x06<<7 | 0x03,
-	1044 - 161: jis0208<<14 | 0x06<<7 | 0x04,
-	1045 - 161: jis0208<<14 | 0x06<<7 | 0x05,
-	1046 - 161: jis0208<<14 | 0x06<<7 | 0x07,
-	1047 - 161: jis0208<<14 | 0x06<<7 | 0x08,
-	1048 - 161: jis0208<<14 | 0x06<<7 | 0x09,
-	1049 - 161: jis0208<<14 | 0x06<<7 | 0x0A,
-	1050 - 161: jis0208<<14 | 0x06<<7 | 0x0B,
-	1051 - 161: jis0208<<14 | 0x06<<7 | 0x0C,
-	1052 - 161: jis0208<<14 | 0x06<<7 | 0x0D,
-	1053 - 161: jis0208<<14 | 0x06<<7 | 0x0E,
-	1054 - 161: jis0208<<14 | 0x06<<7 | 0x0F,
-	1055 - 161: jis0208<<14 | 0x06<<7 | 0x10,
-	1056 - 161: jis0208<<14 | 0x06<<7 | 0x11,
-	1057 - 161: jis0208<<14 | 0x06<<7 | 0x12,
-	1058 - 161: jis0208<<14 | 0x06<<7 | 0x13,
-	1059 - 161: jis0208<<14 | 0x06<<7 | 0x14,
-	1060 - 161: jis0208<<14 | 0x06<<7 | 0x15,
-	1061 - 161: jis0208<<14 | 0x06<<7 | 0x16,
-	1062 - 161: jis0208<<14 | 0x06<<7 | 0x17,
-	1063 - 161: jis0208<<14 | 0x06<<7 | 0x18,
-	1064 - 161: jis0208<<14 | 0x06<<7 | 0x19,
-	1065 - 161: jis0208<<14 | 0x06<<7 | 0x1A,
-	1066 - 161: jis0208<<14 | 0x06<<7 | 0x1B,
-	1067 - 161: jis0208<<14 | 0x06<<7 | 0x1C,
-	1068 - 161: jis0208<<14 | 0x06<<7 | 0x1D,
-	1069 - 161: jis0208<<14 | 0x06<<7 | 0x1E,
-	1070 - 161: jis0208<<14 | 0x06<<7 | 0x1F,
-	1071 - 161: jis0208<<14 | 0x06<<7 | 0x20,
-	1072 - 161: jis0208<<14 | 0x06<<7 | 0x30,
-	1073 - 161: jis0208<<14 | 0x06<<7 | 0x31,
-	1074 - 161: jis0208<<14 | 0x06<<7 | 0x32,
-	1075 - 161: jis0208<<14 | 0x06<<7 | 0x33,
-	1076 - 161: jis0208<<14 | 0x06<<7 | 0x34,
-	1077 - 161: jis0208<<14 | 0x06<<7 | 0x35,
-	1078 - 161: jis0208<<14 | 0x06<<7 | 0x37,
-	1079 - 161: jis0208<<14 | 0x06<<7 | 0x38,
-	1080 - 161: jis0208<<14 | 0x06<<7 | 0x39,
-	1081 - 161: jis0208<<14 | 0x06<<7 | 0x3A,
-	1082 - 161: jis0208<<14 | 0x06<<7 | 0x3B,
-	1083 - 161: jis0208<<14 | 0x06<<7 | 0x3C,
-	1084 - 161: jis0208<<14 | 0x06<<7 | 0x3D,
-	1085 - 161: jis0208<<14 | 0x06<<7 | 0x3E,
-	1086 - 161: jis0208<<14 | 0x06<<7 | 0x3F,
-	1087 - 161: jis0208<<14 | 0x06<<7 | 0x40,
-	1088 - 161: jis0208<<14 | 0x06<<7 | 0x41,
-	1089 - 161: jis0208<<14 | 0x06<<7 | 0x42,
-	1090 - 161: jis0208<<14 | 0x06<<7 | 0x43,
-	1091 - 161: jis0208<<14 | 0x06<<7 | 0x44,
-	1092 - 161: jis0208<<14 | 0x06<<7 | 0x45,
-	1093 - 161: jis0208<<14 | 0x06<<7 | 0x46,
-	1094 - 161: jis0208<<14 | 0x06<<7 | 0x47,
-	1095 - 161: jis0208<<14 | 0x06<<7 | 0x48,
-	1096 - 161: jis0208<<14 | 0x06<<7 | 0x49,
-	1097 - 161: jis0208<<14 | 0x06<<7 | 0x4A,
-	1098 - 161: jis0208<<14 | 0x06<<7 | 0x4B,
-	1099 - 161: jis0208<<14 | 0x06<<7 | 0x4C,
-	1100 - 161: jis0208<<14 | 0x06<<7 | 0x4D,
-	1101 - 161: jis0208<<14 | 0x06<<7 | 0x4E,
-	1102 - 161: jis0208<<14 | 0x06<<7 | 0x4F,
-	1103 - 161: jis0208<<14 | 0x06<<7 | 0x50,
-	1105 - 161: jis0208<<14 | 0x06<<7 | 0x36,
-	1106 - 161: jis0212<<14 | 0x06<<7 | 0x51,
-	1107 - 161: jis0212<<14 | 0x06<<7 | 0x52,
-	1108 - 161: jis0212<<14 | 0x06<<7 | 0x53,
-	1109 - 161: jis0212<<14 | 0x06<<7 | 0x54,
-	1110 - 161: jis0212<<14 | 0x06<<7 | 0x55,
-	1111 - 161: jis0212<<14 | 0x06<<7 | 0x56,
-	1112 - 161: jis0212<<14 | 0x06<<7 | 0x57,
-	1113 - 161: jis0212<<14 | 0x06<<7 | 0x58,
-	1114 - 161: jis0212<<14 | 0x06<<7 | 0x59,
-	1115 - 161: jis0212<<14 | 0x06<<7 | 0x5A,
-	1116 - 161: jis0212<<14 | 0x06<<7 | 0x5B,
-	1118 - 161: jis0212<<14 | 0x06<<7 | 0x5C,
-	1119 - 161: jis0212<<14 | 0x06<<7 | 0x5D,
-}
-
-const encode4Low, encode4High = 63785, 64046
-
-var encode4 = [...]uint16{
-	63785 - 63785: jis0208<<14 | 0x59<<7 | 0x25,
-	63964 - 63785: jis0208<<14 | 0x5B<<7 | 0x2E,
-	64014 - 63785: jis0208<<14 | 0x58<<7 | 0x33,
-	64015 - 63785: jis0208<<14 | 0x58<<7 | 0x3E,
-	64016 - 63785: jis0208<<14 | 0x58<<7 | 0x3F,
-	64017 - 63785: jis0208<<14 | 0x58<<7 | 0x54,
-	64018 - 63785: jis0208<<14 | 0x59<<7 | 0x1D,
-	64019 - 63785: jis0208<<14 | 0x59<<7 | 0x2D,
-	64020 - 63785: jis0208<<14 | 0x59<<7 | 0x2F,
-	64021 - 63785: jis0208<<14 | 0x59<<7 | 0x5A,
-	64022 - 63785: jis0208<<14 | 0x5A<<7 | 0x02,
-	64023 - 63785: jis0208<<14 | 0x5A<<7 | 0x19,
-	64024 - 63785: jis0208<<14 | 0x5A<<7 | 0x21,
-	64025 - 63785: jis0208<<14 | 0x5A<<7 | 0x22,
-	64026 - 63785: jis0208<<14 | 0x5A<<7 | 0x23,
-	64027 - 63785: jis0208<<14 | 0x5A<<7 | 0x25,
-	64028 - 63785: jis0208<<14 | 0x5A<<7 | 0x29,
-	64029 - 63785: jis0208<<14 | 0x5A<<7 | 0x2C,
-	64030 - 63785: jis0208<<14 | 0x5A<<7 | 0x35,
-	64031 - 63785: jis0208<<14 | 0x5A<<7 | 0x40,
-	64032 - 63785: jis0208<<14 | 0x5A<<7 | 0x42,
-	64033 - 63785: jis0208<<14 | 0x5A<<7 | 0x43,
-	64034 - 63785: jis0208<<14 | 0x5A<<7 | 0x4C,
-	64035 - 63785: jis0208<<14 | 0x5A<<7 | 0x54,
-	64036 - 63785: jis0208<<14 | 0x5A<<7 | 0x56,
-	64037 - 63785: jis0208<<14 | 0x5A<<7 | 0x57,
-	64038 - 63785: jis0208<<14 | 0x5A<<7 | 0x5A,
-	64039 - 63785: jis0208<<14 | 0x5B<<7 | 0x18,
-	64040 - 63785: jis0208<<14 | 0x5B<<7 | 0x1F,
-	64041 - 63785: jis0208<<14 | 0x5B<<7 | 0x2F,
-	64042 - 63785: jis0208<<14 | 0x5B<<7 | 0x3B,
-	64043 - 63785: jis0208<<14 | 0x5B<<7 | 0x3C,
-	64044 - 63785: jis0208<<14 | 0x5B<<7 | 0x3E,
-	64045 - 63785: jis0208<<14 | 0x5B<<7 | 0x4B,
-}
-
-const encode5Low, encode5High = 65281, 65510
-
-var encode5 = [...]uint16{
-	65281 - 65281: jis0208<<14 | 0x00<<7 | 0x09,
-	65282 - 65281: jis0208<<14 | 0x5B<<7 | 0x5D,
-	65283 - 65281: jis0208<<14 | 0x00<<7 | 0x53,
-	65284 - 65281: jis0208<<14 | 0x00<<7 | 0x4F,
-	65285 - 65281: jis0208<<14 | 0x00<<7 | 0x52,
-	65286 - 65281: jis0208<<14 | 0x00<<7 | 0x54,
-	65287 - 65281: jis0208<<14 | 0x5B<<7 | 0x5C,
-	65288 - 65281: jis0208<<14 | 0x00<<7 | 0x29,
-	65289 - 65281: jis0208<<14 | 0x00<<7 | 0x2A,
-	65290 - 65281: jis0208<<14 | 0x00<<7 | 0x55,
-	65291 - 65281: jis0208<<14 | 0x00<<7 | 0x3B,
-	65292 - 65281: jis0208<<14 | 0x00<<7 | 0x03,
-	65293 - 65281: jis0208<<14 | 0x00<<7 | 0x3C,
-	65294 - 65281: jis0208<<14 | 0x00<<7 | 0x04,
-	65295 - 65281: jis0208<<14 | 0x00<<7 | 0x1E,
-	65296 - 65281: jis0208<<14 | 0x02<<7 | 0x0F,
-	65297 - 65281: jis0208<<14 | 0x02<<7 | 0x10,
-	65298 - 65281: jis0208<<14 | 0x02<<7 | 0x11,
-	65299 - 65281: jis0208<<14 | 0x02<<7 | 0x12,
-	65300 - 65281: jis0208<<14 | 0x02<<7 | 0x13,
-	65301 - 65281: jis0208<<14 | 0x02<<7 | 0x14,
-	65302 - 65281: jis0208<<14 | 0x02<<7 | 0x15,
-	65303 - 65281: jis0208<<14 | 0x02<<7 | 0x16,
-	65304 - 65281: jis0208<<14 | 0x02<<7 | 0x17,
-	65305 - 65281: jis0208<<14 | 0x02<<7 | 0x18,
-	65306 - 65281: jis0208<<14 | 0x00<<7 | 0x06,
-	65307 - 65281: jis0208<<14 | 0x00<<7 | 0x07,
-	65308 - 65281: jis0208<<14 | 0x00<<7 | 0x42,
-	65309 - 65281: jis0208<<14 | 0x00<<7 | 0x40,
-	65310 - 65281: jis0208<<14 | 0x00<<7 | 0x43,
-	65311 - 65281: jis0208<<14 | 0x00<<7 | 0x08,
-	65312 - 65281: jis0208<<14 | 0x00<<7 | 0x56,
-	65313 - 65281: jis0208<<14 | 0x02<<7 | 0x20,
-	65314 - 65281: jis0208<<14 | 0x02<<7 | 0x21,
-	65315 - 65281: jis0208<<14 | 0x02<<7 | 0x22,
-	65316 - 65281: jis0208<<14 | 0x02<<7 | 0x23,
-	65317 - 65281: jis0208<<14 | 0x02<<7 | 0x24,
-	65318 - 65281: jis0208<<14 | 0x02<<7 | 0x25,
-	65319 - 65281: jis0208<<14 | 0x02<<7 | 0x26,
-	65320 - 65281: jis0208<<14 | 0x02<<7 | 0x27,
-	65321 - 65281: jis0208<<14 | 0x02<<7 | 0x28,
-	65322 - 65281: jis0208<<14 | 0x02<<7 | 0x29,
-	65323 - 65281: jis0208<<14 | 0x02<<7 | 0x2A,
-	65324 - 65281: jis0208<<14 | 0x02<<7 | 0x2B,
-	65325 - 65281: jis0208<<14 | 0x02<<7 | 0x2C,
-	65326 - 65281: jis0208<<14 | 0x02<<7 | 0x2D,
-	65327 - 65281: jis0208<<14 | 0x02<<7 | 0x2E,
-	65328 - 65281: jis0208<<14 | 0x02<<7 | 0x2F,
-	65329 - 65281: jis0208<<14 | 0x02<<7 | 0x30,
-	65330 - 65281: jis0208<<14 | 0x02<<7 | 0x31,
-	65331 - 65281: jis0208<<14 | 0x02<<7 | 0x32,
-	65332 - 65281: jis0208<<14 | 0x02<<7 | 0x33,
-	65333 - 65281: jis0208<<14 | 0x02<<7 | 0x34,
-	65334 - 65281: jis0208<<14 | 0x02<<7 | 0x35,
-	65335 - 65281: jis0208<<14 | 0x02<<7 | 0x36,
-	65336 - 65281: jis0208<<14 | 0x02<<7 | 0x37,
-	65337 - 65281: jis0208<<14 | 0x02<<7 | 0x38,
-	65338 - 65281: jis0208<<14 | 0x02<<7 | 0x39,
-	65339 - 65281: jis0208<<14 | 0x00<<7 | 0x2D,
-	65340 - 65281: jis0208<<14 | 0x00<<7 | 0x1F,
-	65341 - 65281: jis0208<<14 | 0x00<<7 | 0x2E,
-	65342 - 65281: jis0208<<14 | 0x00<<7 | 0x0F,
-	65343 - 65281: jis0208<<14 | 0x00<<7 | 0x11,
-	65344 - 65281: jis0208<<14 | 0x00<<7 | 0x0D,
-	65345 - 65281: jis0208<<14 | 0x02<<7 | 0x40,
-	65346 - 65281: jis0208<<14 | 0x02<<7 | 0x41,
-	65347 - 65281: jis0208<<14 | 0x02<<7 | 0x42,
-	65348 - 65281: jis0208<<14 | 0x02<<7 | 0x43,
-	65349 - 65281: jis0208<<14 | 0x02<<7 | 0x44,
-	65350 - 65281: jis0208<<14 | 0x02<<7 | 0x45,
-	65351 - 65281: jis0208<<14 | 0x02<<7 | 0x46,
-	65352 - 65281: jis0208<<14 | 0x02<<7 | 0x47,
-	65353 - 65281: jis0208<<14 | 0x02<<7 | 0x48,
-	65354 - 65281: jis0208<<14 | 0x02<<7 | 0x49,
-	65355 - 65281: jis0208<<14 | 0x02<<7 | 0x4A,
-	65356 - 65281: jis0208<<14 | 0x02<<7 | 0x4B,
-	65357 - 65281: jis0208<<14 | 0x02<<7 | 0x4C,
-	65358 - 65281: jis0208<<14 | 0x02<<7 | 0x4D,
-	65359 - 65281: jis0208<<14 | 0x02<<7 | 0x4E,
-	65360 - 65281: jis0208<<14 | 0x02<<7 | 0x4F,
-	65361 - 65281: jis0208<<14 | 0x02<<7 | 0x50,
-	65362 - 65281: jis0208<<14 | 0x02<<7 | 0x51,
-	65363 - 65281: jis0208<<14 | 0x02<<7 | 0x52,
-	65364 - 65281: jis0208<<14 | 0x02<<7 | 0x53,
-	65365 - 65281: jis0208<<14 | 0x02<<7 | 0x54,
-	65366 - 65281: jis0208<<14 | 0x02<<7 | 0x55,
-	65367 - 65281: jis0208<<14 | 0x02<<7 | 0x56,
-	65368 - 65281: jis0208<<14 | 0x02<<7 | 0x57,
-	65369 - 65281: jis0208<<14 | 0x02<<7 | 0x58,
-	65370 - 65281: jis0208<<14 | 0x02<<7 | 0x59,
-	65371 - 65281: jis0208<<14 | 0x00<<7 | 0x2F,
-	65372 - 65281: jis0208<<14 | 0x00<<7 | 0x22,
-	65373 - 65281: jis0208<<14 | 0x00<<7 | 0x30,
-	65374 - 65281: jis0208<<14 | 0x00<<7 | 0x20,
-	65504 - 65281: jis0208<<14 | 0x00<<7 | 0x50,
-	65505 - 65281: jis0208<<14 | 0x00<<7 | 0x51,
-	65506 - 65281: jis0208<<14 | 0x01<<7 | 0x2B,
-	65507 - 65281: jis0208<<14 | 0x00<<7 | 0x10,
-	65508 - 65281: jis0208<<14 | 0x5B<<7 | 0x5B,
-	65509 - 65281: jis0208<<14 | 0x00<<7 | 0x4E,
-}
diff --git a/vendor/golang.org/x/text/encoding/korean/euckr.go b/vendor/golang.org/x/text/encoding/korean/euckr.go
deleted file mode 100644
index 034337f5df..0000000000
--- a/vendor/golang.org/x/text/encoding/korean/euckr.go
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package korean
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/internal"
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/transform"
-)
-
-// All is a list of all defined encodings in this package.
-var All = []encoding.Encoding{EUCKR}
-
-// EUCKR is the EUC-KR encoding, also known as Code Page 949.
-var EUCKR encoding.Encoding = &eucKR
-
-var eucKR = internal.Encoding{
-	&internal.SimpleEncoding{eucKRDecoder{}, eucKREncoder{}},
-	"EUC-KR",
-	identifier.EUCKR,
-}
-
-type eucKRDecoder struct{ transform.NopResetter }
-
-func (eucKRDecoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-loop:
-	for ; nSrc < len(src); nSrc += size {
-		switch c0 := src[nSrc]; {
-		case c0 < utf8.RuneSelf:
-			r, size = rune(c0), 1
-
-		case 0x81 <= c0 && c0 < 0xff:
-			if nSrc+1 >= len(src) {
-				if !atEOF {
-					err = transform.ErrShortSrc
-					break loop
-				}
-				r, size = utf8.RuneError, 1
-				break
-			}
-			c1 := src[nSrc+1]
-			size = 2
-			if c0 < 0xc7 {
-				r = 178 * rune(c0-0x81)
-				switch {
-				case 0x41 <= c1 && c1 < 0x5b:
-					r += rune(c1) - (0x41 - 0*26)
-				case 0x61 <= c1 && c1 < 0x7b:
-					r += rune(c1) - (0x61 - 1*26)
-				case 0x81 <= c1 && c1 < 0xff:
-					r += rune(c1) - (0x81 - 2*26)
-				default:
-					goto decError
-				}
-			} else if 0xa1 <= c1 && c1 < 0xff {
-				r = 178*(0xc7-0x81) + rune(c0-0xc7)*94 + rune(c1-0xa1)
-			} else {
-				goto decError
-			}
-			if int(r) < len(decode) {
-				r = rune(decode[r])
-				if r != 0 {
-					break
-				}
-			}
-		decError:
-			r = utf8.RuneError
-			if c1 < utf8.RuneSelf {
-				size = 1
-			}
-
-		default:
-			r, size = utf8.RuneError, 1
-			break
-		}
-
-		if nDst+utf8.RuneLen(r) > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		nDst += utf8.EncodeRune(dst[nDst:], r)
-	}
-	return nDst, nSrc, err
-}
-
-type eucKREncoder struct{ transform.NopResetter }
-
-func (eucKREncoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-	for ; nSrc < len(src); nSrc += size {
-		r = rune(src[nSrc])
-
-		// Decode a 1-byte rune.
-		if r < utf8.RuneSelf {
-			size = 1
-
-			if nDst >= len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			dst[nDst] = uint8(r)
-			nDst++
-			continue
-
-		} else {
-			// Decode a multi-byte rune.
-			r, size = utf8.DecodeRune(src[nSrc:])
-			if size == 1 {
-				// All valid runes of size 1 (those below utf8.RuneSelf) were
-				// handled above. We have invalid UTF-8 or we haven't seen the
-				// full character yet.
-				if !atEOF && !utf8.FullRune(src[nSrc:]) {
-					err = transform.ErrShortSrc
-					break
-				}
-			}
-
-			// func init checks that the switch covers all tables.
-			switch {
-			case encode0Low <= r && r < encode0High:
-				if r = rune(encode0[r-encode0Low]); r != 0 {
-					goto write2
-				}
-			case encode1Low <= r && r < encode1High:
-				if r = rune(encode1[r-encode1Low]); r != 0 {
-					goto write2
-				}
-			case encode2Low <= r && r < encode2High:
-				if r = rune(encode2[r-encode2Low]); r != 0 {
-					goto write2
-				}
-			case encode3Low <= r && r < encode3High:
-				if r = rune(encode3[r-encode3Low]); r != 0 {
-					goto write2
-				}
-			case encode4Low <= r && r < encode4High:
-				if r = rune(encode4[r-encode4Low]); r != 0 {
-					goto write2
-				}
-			case encode5Low <= r && r < encode5High:
-				if r = rune(encode5[r-encode5Low]); r != 0 {
-					goto write2
-				}
-			case encode6Low <= r && r < encode6High:
-				if r = rune(encode6[r-encode6Low]); r != 0 {
-					goto write2
-				}
-			}
-			err = internal.ErrASCIIReplacement
-			break
-		}
-
-	write2:
-		if nDst+2 > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst+0] = uint8(r >> 8)
-		dst[nDst+1] = uint8(r)
-		nDst += 2
-		continue
-	}
-	return nDst, nSrc, err
-}
-
-func init() {
-	// Check that the hard-coded encode switch covers all tables.
-	if numEncodeTables != 7 {
-		panic("bad numEncodeTables")
-	}
-}
diff --git a/vendor/golang.org/x/text/encoding/korean/tables.go b/vendor/golang.org/x/text/encoding/korean/tables.go
deleted file mode 100644
index 0480e85c4a..0000000000
--- a/vendor/golang.org/x/text/encoding/korean/tables.go
+++ /dev/null
@@ -1,34152 +0,0 @@
-// generated by go run maketables.go; DO NOT EDIT
-
-// Package korean provides Korean encodings such as EUC-KR.
-package korean // import "golang.org/x/text/encoding/korean"
-
-// decode is the decoding table from EUC-KR code to Unicode.
-// It is defined at http://encoding.spec.whatwg.org/index-euc-kr.txt
-var decode = [...]uint16{
-	0:     0xAC02,
-	1:     0xAC03,
-	2:     0xAC05,
-	3:     0xAC06,
-	4:     0xAC0B,
-	5:     0xAC0C,
-	6:     0xAC0D,
-	7:     0xAC0E,
-	8:     0xAC0F,
-	9:     0xAC18,
-	10:    0xAC1E,
-	11:    0xAC1F,
-	12:    0xAC21,
-	13:    0xAC22,
-	14:    0xAC23,
-	15:    0xAC25,
-	16:    0xAC26,
-	17:    0xAC27,
-	18:    0xAC28,
-	19:    0xAC29,
-	20:    0xAC2A,
-	21:    0xAC2B,
-	22:    0xAC2E,
-	23:    0xAC32,
-	24:    0xAC33,
-	25:    0xAC34,
-	26:    0xAC35,
-	27:    0xAC36,
-	28:    0xAC37,
-	29:    0xAC3A,
-	30:    0xAC3B,
-	31:    0xAC3D,
-	32:    0xAC3E,
-	33:    0xAC3F,
-	34:    0xAC41,
-	35:    0xAC42,
-	36:    0xAC43,
-	37:    0xAC44,
-	38:    0xAC45,
-	39:    0xAC46,
-	40:    0xAC47,
-	41:    0xAC48,
-	42:    0xAC49,
-	43:    0xAC4A,
-	44:    0xAC4C,
-	45:    0xAC4E,
-	46:    0xAC4F,
-	47:    0xAC50,
-	48:    0xAC51,
-	49:    0xAC52,
-	50:    0xAC53,
-	51:    0xAC55,
-	52:    0xAC56,
-	53:    0xAC57,
-	54:    0xAC59,
-	55:    0xAC5A,
-	56:    0xAC5B,
-	57:    0xAC5D,
-	58:    0xAC5E,
-	59:    0xAC5F,
-	60:    0xAC60,
-	61:    0xAC61,
-	62:    0xAC62,
-	63:    0xAC63,
-	64:    0xAC64,
-	65:    0xAC65,
-	66:    0xAC66,
-	67:    0xAC67,
-	68:    0xAC68,
-	69:    0xAC69,
-	70:    0xAC6A,
-	71:    0xAC6B,
-	72:    0xAC6C,
-	73:    0xAC6D,
-	74:    0xAC6E,
-	75:    0xAC6F,
-	76:    0xAC72,
-	77:    0xAC73,
-	78:    0xAC75,
-	79:    0xAC76,
-	80:    0xAC79,
-	81:    0xAC7B,
-	82:    0xAC7C,
-	83:    0xAC7D,
-	84:    0xAC7E,
-	85:    0xAC7F,
-	86:    0xAC82,
-	87:    0xAC87,
-	88:    0xAC88,
-	89:    0xAC8D,
-	90:    0xAC8E,
-	91:    0xAC8F,
-	92:    0xAC91,
-	93:    0xAC92,
-	94:    0xAC93,
-	95:    0xAC95,
-	96:    0xAC96,
-	97:    0xAC97,
-	98:    0xAC98,
-	99:    0xAC99,
-	100:   0xAC9A,
-	101:   0xAC9B,
-	102:   0xAC9E,
-	103:   0xACA2,
-	104:   0xACA3,
-	105:   0xACA4,
-	106:   0xACA5,
-	107:   0xACA6,
-	108:   0xACA7,
-	109:   0xACAB,
-	110:   0xACAD,
-	111:   0xACAE,
-	112:   0xACB1,
-	113:   0xACB2,
-	114:   0xACB3,
-	115:   0xACB4,
-	116:   0xACB5,
-	117:   0xACB6,
-	118:   0xACB7,
-	119:   0xACBA,
-	120:   0xACBE,
-	121:   0xACBF,
-	122:   0xACC0,
-	123:   0xACC2,
-	124:   0xACC3,
-	125:   0xACC5,
-	126:   0xACC6,
-	127:   0xACC7,
-	128:   0xACC9,
-	129:   0xACCA,
-	130:   0xACCB,
-	131:   0xACCD,
-	132:   0xACCE,
-	133:   0xACCF,
-	134:   0xACD0,
-	135:   0xACD1,
-	136:   0xACD2,
-	137:   0xACD3,
-	138:   0xACD4,
-	139:   0xACD6,
-	140:   0xACD8,
-	141:   0xACD9,
-	142:   0xACDA,
-	143:   0xACDB,
-	144:   0xACDC,
-	145:   0xACDD,
-	146:   0xACDE,
-	147:   0xACDF,
-	148:   0xACE2,
-	149:   0xACE3,
-	150:   0xACE5,
-	151:   0xACE6,
-	152:   0xACE9,
-	153:   0xACEB,
-	154:   0xACED,
-	155:   0xACEE,
-	156:   0xACF2,
-	157:   0xACF4,
-	158:   0xACF7,
-	159:   0xACF8,
-	160:   0xACF9,
-	161:   0xACFA,
-	162:   0xACFB,
-	163:   0xACFE,
-	164:   0xACFF,
-	165:   0xAD01,
-	166:   0xAD02,
-	167:   0xAD03,
-	168:   0xAD05,
-	169:   0xAD07,
-	170:   0xAD08,
-	171:   0xAD09,
-	172:   0xAD0A,
-	173:   0xAD0B,
-	174:   0xAD0E,
-	175:   0xAD10,
-	176:   0xAD12,
-	177:   0xAD13,
-	178:   0xAD14,
-	179:   0xAD15,
-	180:   0xAD16,
-	181:   0xAD17,
-	182:   0xAD19,
-	183:   0xAD1A,
-	184:   0xAD1B,
-	185:   0xAD1D,
-	186:   0xAD1E,
-	187:   0xAD1F,
-	188:   0xAD21,
-	189:   0xAD22,
-	190:   0xAD23,
-	191:   0xAD24,
-	192:   0xAD25,
-	193:   0xAD26,
-	194:   0xAD27,
-	195:   0xAD28,
-	196:   0xAD2A,
-	197:   0xAD2B,
-	198:   0xAD2E,
-	199:   0xAD2F,
-	200:   0xAD30,
-	201:   0xAD31,
-	202:   0xAD32,
-	203:   0xAD33,
-	204:   0xAD36,
-	205:   0xAD37,
-	206:   0xAD39,
-	207:   0xAD3A,
-	208:   0xAD3B,
-	209:   0xAD3D,
-	210:   0xAD3E,
-	211:   0xAD3F,
-	212:   0xAD40,
-	213:   0xAD41,
-	214:   0xAD42,
-	215:   0xAD43,
-	216:   0xAD46,
-	217:   0xAD48,
-	218:   0xAD4A,
-	219:   0xAD4B,
-	220:   0xAD4C,
-	221:   0xAD4D,
-	222:   0xAD4E,
-	223:   0xAD4F,
-	224:   0xAD51,
-	225:   0xAD52,
-	226:   0xAD53,
-	227:   0xAD55,
-	228:   0xAD56,
-	229:   0xAD57,
-	230:   0xAD59,
-	231:   0xAD5A,
-	232:   0xAD5B,
-	233:   0xAD5C,
-	234:   0xAD5D,
-	235:   0xAD5E,
-	236:   0xAD5F,
-	237:   0xAD60,
-	238:   0xAD62,
-	239:   0xAD64,
-	240:   0xAD65,
-	241:   0xAD66,
-	242:   0xAD67,
-	243:   0xAD68,
-	244:   0xAD69,
-	245:   0xAD6A,
-	246:   0xAD6B,
-	247:   0xAD6E,
-	248:   0xAD6F,
-	249:   0xAD71,
-	250:   0xAD72,
-	251:   0xAD77,
-	252:   0xAD78,
-	253:   0xAD79,
-	254:   0xAD7A,
-	255:   0xAD7E,
-	256:   0xAD80,
-	257:   0xAD83,
-	258:   0xAD84,
-	259:   0xAD85,
-	260:   0xAD86,
-	261:   0xAD87,
-	262:   0xAD8A,
-	263:   0xAD8B,
-	264:   0xAD8D,
-	265:   0xAD8E,
-	266:   0xAD8F,
-	267:   0xAD91,
-	268:   0xAD92,
-	269:   0xAD93,
-	270:   0xAD94,
-	271:   0xAD95,
-	272:   0xAD96,
-	273:   0xAD97,
-	274:   0xAD98,
-	275:   0xAD99,
-	276:   0xAD9A,
-	277:   0xAD9B,
-	278:   0xAD9E,
-	279:   0xAD9F,
-	280:   0xADA0,
-	281:   0xADA1,
-	282:   0xADA2,
-	283:   0xADA3,
-	284:   0xADA5,
-	285:   0xADA6,
-	286:   0xADA7,
-	287:   0xADA8,
-	288:   0xADA9,
-	289:   0xADAA,
-	290:   0xADAB,
-	291:   0xADAC,
-	292:   0xADAD,
-	293:   0xADAE,
-	294:   0xADAF,
-	295:   0xADB0,
-	296:   0xADB1,
-	297:   0xADB2,
-	298:   0xADB3,
-	299:   0xADB4,
-	300:   0xADB5,
-	301:   0xADB6,
-	302:   0xADB8,
-	303:   0xADB9,
-	304:   0xADBA,
-	305:   0xADBB,
-	306:   0xADBC,
-	307:   0xADBD,
-	308:   0xADBE,
-	309:   0xADBF,
-	310:   0xADC2,
-	311:   0xADC3,
-	312:   0xADC5,
-	313:   0xADC6,
-	314:   0xADC7,
-	315:   0xADC9,
-	316:   0xADCA,
-	317:   0xADCB,
-	318:   0xADCC,
-	319:   0xADCD,
-	320:   0xADCE,
-	321:   0xADCF,
-	322:   0xADD2,
-	323:   0xADD4,
-	324:   0xADD5,
-	325:   0xADD6,
-	326:   0xADD7,
-	327:   0xADD8,
-	328:   0xADD9,
-	329:   0xADDA,
-	330:   0xADDB,
-	331:   0xADDD,
-	332:   0xADDE,
-	333:   0xADDF,
-	334:   0xADE1,
-	335:   0xADE2,
-	336:   0xADE3,
-	337:   0xADE5,
-	338:   0xADE6,
-	339:   0xADE7,
-	340:   0xADE8,
-	341:   0xADE9,
-	342:   0xADEA,
-	343:   0xADEB,
-	344:   0xADEC,
-	345:   0xADED,
-	346:   0xADEE,
-	347:   0xADEF,
-	348:   0xADF0,
-	349:   0xADF1,
-	350:   0xADF2,
-	351:   0xADF3,
-	352:   0xADF4,
-	353:   0xADF5,
-	354:   0xADF6,
-	355:   0xADF7,
-	356:   0xADFA,
-	357:   0xADFB,
-	358:   0xADFD,
-	359:   0xADFE,
-	360:   0xAE02,
-	361:   0xAE03,
-	362:   0xAE04,
-	363:   0xAE05,
-	364:   0xAE06,
-	365:   0xAE07,
-	366:   0xAE0A,
-	367:   0xAE0C,
-	368:   0xAE0E,
-	369:   0xAE0F,
-	370:   0xAE10,
-	371:   0xAE11,
-	372:   0xAE12,
-	373:   0xAE13,
-	374:   0xAE15,
-	375:   0xAE16,
-	376:   0xAE17,
-	377:   0xAE18,
-	378:   0xAE19,
-	379:   0xAE1A,
-	380:   0xAE1B,
-	381:   0xAE1C,
-	382:   0xAE1D,
-	383:   0xAE1E,
-	384:   0xAE1F,
-	385:   0xAE20,
-	386:   0xAE21,
-	387:   0xAE22,
-	388:   0xAE23,
-	389:   0xAE24,
-	390:   0xAE25,
-	391:   0xAE26,
-	392:   0xAE27,
-	393:   0xAE28,
-	394:   0xAE29,
-	395:   0xAE2A,
-	396:   0xAE2B,
-	397:   0xAE2C,
-	398:   0xAE2D,
-	399:   0xAE2E,
-	400:   0xAE2F,
-	401:   0xAE32,
-	402:   0xAE33,
-	403:   0xAE35,
-	404:   0xAE36,
-	405:   0xAE39,
-	406:   0xAE3B,
-	407:   0xAE3C,
-	408:   0xAE3D,
-	409:   0xAE3E,
-	410:   0xAE3F,
-	411:   0xAE42,
-	412:   0xAE44,
-	413:   0xAE47,
-	414:   0xAE48,
-	415:   0xAE49,
-	416:   0xAE4B,
-	417:   0xAE4F,
-	418:   0xAE51,
-	419:   0xAE52,
-	420:   0xAE53,
-	421:   0xAE55,
-	422:   0xAE57,
-	423:   0xAE58,
-	424:   0xAE59,
-	425:   0xAE5A,
-	426:   0xAE5B,
-	427:   0xAE5E,
-	428:   0xAE62,
-	429:   0xAE63,
-	430:   0xAE64,
-	431:   0xAE66,
-	432:   0xAE67,
-	433:   0xAE6A,
-	434:   0xAE6B,
-	435:   0xAE6D,
-	436:   0xAE6E,
-	437:   0xAE6F,
-	438:   0xAE71,
-	439:   0xAE72,
-	440:   0xAE73,
-	441:   0xAE74,
-	442:   0xAE75,
-	443:   0xAE76,
-	444:   0xAE77,
-	445:   0xAE7A,
-	446:   0xAE7E,
-	447:   0xAE7F,
-	448:   0xAE80,
-	449:   0xAE81,
-	450:   0xAE82,
-	451:   0xAE83,
-	452:   0xAE86,
-	453:   0xAE87,
-	454:   0xAE88,
-	455:   0xAE89,
-	456:   0xAE8A,
-	457:   0xAE8B,
-	458:   0xAE8D,
-	459:   0xAE8E,
-	460:   0xAE8F,
-	461:   0xAE90,
-	462:   0xAE91,
-	463:   0xAE92,
-	464:   0xAE93,
-	465:   0xAE94,
-	466:   0xAE95,
-	467:   0xAE96,
-	468:   0xAE97,
-	469:   0xAE98,
-	470:   0xAE99,
-	471:   0xAE9A,
-	472:   0xAE9B,
-	473:   0xAE9C,
-	474:   0xAE9D,
-	475:   0xAE9E,
-	476:   0xAE9F,
-	477:   0xAEA0,
-	478:   0xAEA1,
-	479:   0xAEA2,
-	480:   0xAEA3,
-	481:   0xAEA4,
-	482:   0xAEA5,
-	483:   0xAEA6,
-	484:   0xAEA7,
-	485:   0xAEA8,
-	486:   0xAEA9,
-	487:   0xAEAA,
-	488:   0xAEAB,
-	489:   0xAEAC,
-	490:   0xAEAD,
-	491:   0xAEAE,
-	492:   0xAEAF,
-	493:   0xAEB0,
-	494:   0xAEB1,
-	495:   0xAEB2,
-	496:   0xAEB3,
-	497:   0xAEB4,
-	498:   0xAEB5,
-	499:   0xAEB6,
-	500:   0xAEB7,
-	501:   0xAEB8,
-	502:   0xAEB9,
-	503:   0xAEBA,
-	504:   0xAEBB,
-	505:   0xAEBF,
-	506:   0xAEC1,
-	507:   0xAEC2,
-	508:   0xAEC3,
-	509:   0xAEC5,
-	510:   0xAEC6,
-	511:   0xAEC7,
-	512:   0xAEC8,
-	513:   0xAEC9,
-	514:   0xAECA,
-	515:   0xAECB,
-	516:   0xAECE,
-	517:   0xAED2,
-	518:   0xAED3,
-	519:   0xAED4,
-	520:   0xAED5,
-	521:   0xAED6,
-	522:   0xAED7,
-	523:   0xAEDA,
-	524:   0xAEDB,
-	525:   0xAEDD,
-	526:   0xAEDE,
-	527:   0xAEDF,
-	528:   0xAEE0,
-	529:   0xAEE1,
-	530:   0xAEE2,
-	531:   0xAEE3,
-	532:   0xAEE4,
-	533:   0xAEE5,
-	534:   0xAEE6,
-	535:   0xAEE7,
-	536:   0xAEE9,
-	537:   0xAEEA,
-	538:   0xAEEC,
-	539:   0xAEEE,
-	540:   0xAEEF,
-	541:   0xAEF0,
-	542:   0xAEF1,
-	543:   0xAEF2,
-	544:   0xAEF3,
-	545:   0xAEF5,
-	546:   0xAEF6,
-	547:   0xAEF7,
-	548:   0xAEF9,
-	549:   0xAEFA,
-	550:   0xAEFB,
-	551:   0xAEFD,
-	552:   0xAEFE,
-	553:   0xAEFF,
-	554:   0xAF00,
-	555:   0xAF01,
-	556:   0xAF02,
-	557:   0xAF03,
-	558:   0xAF04,
-	559:   0xAF05,
-	560:   0xAF06,
-	561:   0xAF09,
-	562:   0xAF0A,
-	563:   0xAF0B,
-	564:   0xAF0C,
-	565:   0xAF0E,
-	566:   0xAF0F,
-	567:   0xAF11,
-	568:   0xAF12,
-	569:   0xAF13,
-	570:   0xAF14,
-	571:   0xAF15,
-	572:   0xAF16,
-	573:   0xAF17,
-	574:   0xAF18,
-	575:   0xAF19,
-	576:   0xAF1A,
-	577:   0xAF1B,
-	578:   0xAF1C,
-	579:   0xAF1D,
-	580:   0xAF1E,
-	581:   0xAF1F,
-	582:   0xAF20,
-	583:   0xAF21,
-	584:   0xAF22,
-	585:   0xAF23,
-	586:   0xAF24,
-	587:   0xAF25,
-	588:   0xAF26,
-	589:   0xAF27,
-	590:   0xAF28,
-	591:   0xAF29,
-	592:   0xAF2A,
-	593:   0xAF2B,
-	594:   0xAF2E,
-	595:   0xAF2F,
-	596:   0xAF31,
-	597:   0xAF33,
-	598:   0xAF35,
-	599:   0xAF36,
-	600:   0xAF37,
-	601:   0xAF38,
-	602:   0xAF39,
-	603:   0xAF3A,
-	604:   0xAF3B,
-	605:   0xAF3E,
-	606:   0xAF40,
-	607:   0xAF44,
-	608:   0xAF45,
-	609:   0xAF46,
-	610:   0xAF47,
-	611:   0xAF4A,
-	612:   0xAF4B,
-	613:   0xAF4C,
-	614:   0xAF4D,
-	615:   0xAF4E,
-	616:   0xAF4F,
-	617:   0xAF51,
-	618:   0xAF52,
-	619:   0xAF53,
-	620:   0xAF54,
-	621:   0xAF55,
-	622:   0xAF56,
-	623:   0xAF57,
-	624:   0xAF58,
-	625:   0xAF59,
-	626:   0xAF5A,
-	627:   0xAF5B,
-	628:   0xAF5E,
-	629:   0xAF5F,
-	630:   0xAF60,
-	631:   0xAF61,
-	632:   0xAF62,
-	633:   0xAF63,
-	634:   0xAF66,
-	635:   0xAF67,
-	636:   0xAF68,
-	637:   0xAF69,
-	638:   0xAF6A,
-	639:   0xAF6B,
-	640:   0xAF6C,
-	641:   0xAF6D,
-	642:   0xAF6E,
-	643:   0xAF6F,
-	644:   0xAF70,
-	645:   0xAF71,
-	646:   0xAF72,
-	647:   0xAF73,
-	648:   0xAF74,
-	649:   0xAF75,
-	650:   0xAF76,
-	651:   0xAF77,
-	652:   0xAF78,
-	653:   0xAF7A,
-	654:   0xAF7B,
-	655:   0xAF7C,
-	656:   0xAF7D,
-	657:   0xAF7E,
-	658:   0xAF7F,
-	659:   0xAF81,
-	660:   0xAF82,
-	661:   0xAF83,
-	662:   0xAF85,
-	663:   0xAF86,
-	664:   0xAF87,
-	665:   0xAF89,
-	666:   0xAF8A,
-	667:   0xAF8B,
-	668:   0xAF8C,
-	669:   0xAF8D,
-	670:   0xAF8E,
-	671:   0xAF8F,
-	672:   0xAF92,
-	673:   0xAF93,
-	674:   0xAF94,
-	675:   0xAF96,
-	676:   0xAF97,
-	677:   0xAF98,
-	678:   0xAF99,
-	679:   0xAF9A,
-	680:   0xAF9B,
-	681:   0xAF9D,
-	682:   0xAF9E,
-	683:   0xAF9F,
-	684:   0xAFA0,
-	685:   0xAFA1,
-	686:   0xAFA2,
-	687:   0xAFA3,
-	688:   0xAFA4,
-	689:   0xAFA5,
-	690:   0xAFA6,
-	691:   0xAFA7,
-	692:   0xAFA8,
-	693:   0xAFA9,
-	694:   0xAFAA,
-	695:   0xAFAB,
-	696:   0xAFAC,
-	697:   0xAFAD,
-	698:   0xAFAE,
-	699:   0xAFAF,
-	700:   0xAFB0,
-	701:   0xAFB1,
-	702:   0xAFB2,
-	703:   0xAFB3,
-	704:   0xAFB4,
-	705:   0xAFB5,
-	706:   0xAFB6,
-	707:   0xAFB7,
-	708:   0xAFBA,
-	709:   0xAFBB,
-	710:   0xAFBD,
-	711:   0xAFBE,
-	712:   0xAFBF,
-	713:   0xAFC1,
-	714:   0xAFC2,
-	715:   0xAFC3,
-	716:   0xAFC4,
-	717:   0xAFC5,
-	718:   0xAFC6,
-	719:   0xAFCA,
-	720:   0xAFCC,
-	721:   0xAFCF,
-	722:   0xAFD0,
-	723:   0xAFD1,
-	724:   0xAFD2,
-	725:   0xAFD3,
-	726:   0xAFD5,
-	727:   0xAFD6,
-	728:   0xAFD7,
-	729:   0xAFD8,
-	730:   0xAFD9,
-	731:   0xAFDA,
-	732:   0xAFDB,
-	733:   0xAFDD,
-	734:   0xAFDE,
-	735:   0xAFDF,
-	736:   0xAFE0,
-	737:   0xAFE1,
-	738:   0xAFE2,
-	739:   0xAFE3,
-	740:   0xAFE4,
-	741:   0xAFE5,
-	742:   0xAFE6,
-	743:   0xAFE7,
-	744:   0xAFEA,
-	745:   0xAFEB,
-	746:   0xAFEC,
-	747:   0xAFED,
-	748:   0xAFEE,
-	749:   0xAFEF,
-	750:   0xAFF2,
-	751:   0xAFF3,
-	752:   0xAFF5,
-	753:   0xAFF6,
-	754:   0xAFF7,
-	755:   0xAFF9,
-	756:   0xAFFA,
-	757:   0xAFFB,
-	758:   0xAFFC,
-	759:   0xAFFD,
-	760:   0xAFFE,
-	761:   0xAFFF,
-	762:   0xB002,
-	763:   0xB003,
-	764:   0xB005,
-	765:   0xB006,
-	766:   0xB007,
-	767:   0xB008,
-	768:   0xB009,
-	769:   0xB00A,
-	770:   0xB00B,
-	771:   0xB00D,
-	772:   0xB00E,
-	773:   0xB00F,
-	774:   0xB011,
-	775:   0xB012,
-	776:   0xB013,
-	777:   0xB015,
-	778:   0xB016,
-	779:   0xB017,
-	780:   0xB018,
-	781:   0xB019,
-	782:   0xB01A,
-	783:   0xB01B,
-	784:   0xB01E,
-	785:   0xB01F,
-	786:   0xB020,
-	787:   0xB021,
-	788:   0xB022,
-	789:   0xB023,
-	790:   0xB024,
-	791:   0xB025,
-	792:   0xB026,
-	793:   0xB027,
-	794:   0xB029,
-	795:   0xB02A,
-	796:   0xB02B,
-	797:   0xB02C,
-	798:   0xB02D,
-	799:   0xB02E,
-	800:   0xB02F,
-	801:   0xB030,
-	802:   0xB031,
-	803:   0xB032,
-	804:   0xB033,
-	805:   0xB034,
-	806:   0xB035,
-	807:   0xB036,
-	808:   0xB037,
-	809:   0xB038,
-	810:   0xB039,
-	811:   0xB03A,
-	812:   0xB03B,
-	813:   0xB03C,
-	814:   0xB03D,
-	815:   0xB03E,
-	816:   0xB03F,
-	817:   0xB040,
-	818:   0xB041,
-	819:   0xB042,
-	820:   0xB043,
-	821:   0xB046,
-	822:   0xB047,
-	823:   0xB049,
-	824:   0xB04B,
-	825:   0xB04D,
-	826:   0xB04F,
-	827:   0xB050,
-	828:   0xB051,
-	829:   0xB052,
-	830:   0xB056,
-	831:   0xB058,
-	832:   0xB05A,
-	833:   0xB05B,
-	834:   0xB05C,
-	835:   0xB05E,
-	836:   0xB05F,
-	837:   0xB060,
-	838:   0xB061,
-	839:   0xB062,
-	840:   0xB063,
-	841:   0xB064,
-	842:   0xB065,
-	843:   0xB066,
-	844:   0xB067,
-	845:   0xB068,
-	846:   0xB069,
-	847:   0xB06A,
-	848:   0xB06B,
-	849:   0xB06C,
-	850:   0xB06D,
-	851:   0xB06E,
-	852:   0xB06F,
-	853:   0xB070,
-	854:   0xB071,
-	855:   0xB072,
-	856:   0xB073,
-	857:   0xB074,
-	858:   0xB075,
-	859:   0xB076,
-	860:   0xB077,
-	861:   0xB078,
-	862:   0xB079,
-	863:   0xB07A,
-	864:   0xB07B,
-	865:   0xB07E,
-	866:   0xB07F,
-	867:   0xB081,
-	868:   0xB082,
-	869:   0xB083,
-	870:   0xB085,
-	871:   0xB086,
-	872:   0xB087,
-	873:   0xB088,
-	874:   0xB089,
-	875:   0xB08A,
-	876:   0xB08B,
-	877:   0xB08E,
-	878:   0xB090,
-	879:   0xB092,
-	880:   0xB093,
-	881:   0xB094,
-	882:   0xB095,
-	883:   0xB096,
-	884:   0xB097,
-	885:   0xB09B,
-	886:   0xB09D,
-	887:   0xB09E,
-	888:   0xB0A3,
-	889:   0xB0A4,
-	890:   0xB0A5,
-	891:   0xB0A6,
-	892:   0xB0A7,
-	893:   0xB0AA,
-	894:   0xB0B0,
-	895:   0xB0B2,
-	896:   0xB0B6,
-	897:   0xB0B7,
-	898:   0xB0B9,
-	899:   0xB0BA,
-	900:   0xB0BB,
-	901:   0xB0BD,
-	902:   0xB0BE,
-	903:   0xB0BF,
-	904:   0xB0C0,
-	905:   0xB0C1,
-	906:   0xB0C2,
-	907:   0xB0C3,
-	908:   0xB0C6,
-	909:   0xB0CA,
-	910:   0xB0CB,
-	911:   0xB0CC,
-	912:   0xB0CD,
-	913:   0xB0CE,
-	914:   0xB0CF,
-	915:   0xB0D2,
-	916:   0xB0D3,
-	917:   0xB0D5,
-	918:   0xB0D6,
-	919:   0xB0D7,
-	920:   0xB0D9,
-	921:   0xB0DA,
-	922:   0xB0DB,
-	923:   0xB0DC,
-	924:   0xB0DD,
-	925:   0xB0DE,
-	926:   0xB0DF,
-	927:   0xB0E1,
-	928:   0xB0E2,
-	929:   0xB0E3,
-	930:   0xB0E4,
-	931:   0xB0E6,
-	932:   0xB0E7,
-	933:   0xB0E8,
-	934:   0xB0E9,
-	935:   0xB0EA,
-	936:   0xB0EB,
-	937:   0xB0EC,
-	938:   0xB0ED,
-	939:   0xB0EE,
-	940:   0xB0EF,
-	941:   0xB0F0,
-	942:   0xB0F1,
-	943:   0xB0F2,
-	944:   0xB0F3,
-	945:   0xB0F4,
-	946:   0xB0F5,
-	947:   0xB0F6,
-	948:   0xB0F7,
-	949:   0xB0F8,
-	950:   0xB0F9,
-	951:   0xB0FA,
-	952:   0xB0FB,
-	953:   0xB0FC,
-	954:   0xB0FD,
-	955:   0xB0FE,
-	956:   0xB0FF,
-	957:   0xB100,
-	958:   0xB101,
-	959:   0xB102,
-	960:   0xB103,
-	961:   0xB104,
-	962:   0xB105,
-	963:   0xB106,
-	964:   0xB107,
-	965:   0xB10A,
-	966:   0xB10D,
-	967:   0xB10E,
-	968:   0xB10F,
-	969:   0xB111,
-	970:   0xB114,
-	971:   0xB115,
-	972:   0xB116,
-	973:   0xB117,
-	974:   0xB11A,
-	975:   0xB11E,
-	976:   0xB11F,
-	977:   0xB120,
-	978:   0xB121,
-	979:   0xB122,
-	980:   0xB126,
-	981:   0xB127,
-	982:   0xB129,
-	983:   0xB12A,
-	984:   0xB12B,
-	985:   0xB12D,
-	986:   0xB12E,
-	987:   0xB12F,
-	988:   0xB130,
-	989:   0xB131,
-	990:   0xB132,
-	991:   0xB133,
-	992:   0xB136,
-	993:   0xB13A,
-	994:   0xB13B,
-	995:   0xB13C,
-	996:   0xB13D,
-	997:   0xB13E,
-	998:   0xB13F,
-	999:   0xB142,
-	1000:  0xB143,
-	1001:  0xB145,
-	1002:  0xB146,
-	1003:  0xB147,
-	1004:  0xB149,
-	1005:  0xB14A,
-	1006:  0xB14B,
-	1007:  0xB14C,
-	1008:  0xB14D,
-	1009:  0xB14E,
-	1010:  0xB14F,
-	1011:  0xB152,
-	1012:  0xB153,
-	1013:  0xB156,
-	1014:  0xB157,
-	1015:  0xB159,
-	1016:  0xB15A,
-	1017:  0xB15B,
-	1018:  0xB15D,
-	1019:  0xB15E,
-	1020:  0xB15F,
-	1021:  0xB161,
-	1022:  0xB162,
-	1023:  0xB163,
-	1024:  0xB164,
-	1025:  0xB165,
-	1026:  0xB166,
-	1027:  0xB167,
-	1028:  0xB168,
-	1029:  0xB169,
-	1030:  0xB16A,
-	1031:  0xB16B,
-	1032:  0xB16C,
-	1033:  0xB16D,
-	1034:  0xB16E,
-	1035:  0xB16F,
-	1036:  0xB170,
-	1037:  0xB171,
-	1038:  0xB172,
-	1039:  0xB173,
-	1040:  0xB174,
-	1041:  0xB175,
-	1042:  0xB176,
-	1043:  0xB177,
-	1044:  0xB17A,
-	1045:  0xB17B,
-	1046:  0xB17D,
-	1047:  0xB17E,
-	1048:  0xB17F,
-	1049:  0xB181,
-	1050:  0xB183,
-	1051:  0xB184,
-	1052:  0xB185,
-	1053:  0xB186,
-	1054:  0xB187,
-	1055:  0xB18A,
-	1056:  0xB18C,
-	1057:  0xB18E,
-	1058:  0xB18F,
-	1059:  0xB190,
-	1060:  0xB191,
-	1061:  0xB195,
-	1062:  0xB196,
-	1063:  0xB197,
-	1064:  0xB199,
-	1065:  0xB19A,
-	1066:  0xB19B,
-	1067:  0xB19D,
-	1068:  0xB19E,
-	1069:  0xB19F,
-	1070:  0xB1A0,
-	1071:  0xB1A1,
-	1072:  0xB1A2,
-	1073:  0xB1A3,
-	1074:  0xB1A4,
-	1075:  0xB1A5,
-	1076:  0xB1A6,
-	1077:  0xB1A7,
-	1078:  0xB1A9,
-	1079:  0xB1AA,
-	1080:  0xB1AB,
-	1081:  0xB1AC,
-	1082:  0xB1AD,
-	1083:  0xB1AE,
-	1084:  0xB1AF,
-	1085:  0xB1B0,
-	1086:  0xB1B1,
-	1087:  0xB1B2,
-	1088:  0xB1B3,
-	1089:  0xB1B4,
-	1090:  0xB1B5,
-	1091:  0xB1B6,
-	1092:  0xB1B7,
-	1093:  0xB1B8,
-	1094:  0xB1B9,
-	1095:  0xB1BA,
-	1096:  0xB1BB,
-	1097:  0xB1BC,
-	1098:  0xB1BD,
-	1099:  0xB1BE,
-	1100:  0xB1BF,
-	1101:  0xB1C0,
-	1102:  0xB1C1,
-	1103:  0xB1C2,
-	1104:  0xB1C3,
-	1105:  0xB1C4,
-	1106:  0xB1C5,
-	1107:  0xB1C6,
-	1108:  0xB1C7,
-	1109:  0xB1C8,
-	1110:  0xB1C9,
-	1111:  0xB1CA,
-	1112:  0xB1CB,
-	1113:  0xB1CD,
-	1114:  0xB1CE,
-	1115:  0xB1CF,
-	1116:  0xB1D1,
-	1117:  0xB1D2,
-	1118:  0xB1D3,
-	1119:  0xB1D5,
-	1120:  0xB1D6,
-	1121:  0xB1D7,
-	1122:  0xB1D8,
-	1123:  0xB1D9,
-	1124:  0xB1DA,
-	1125:  0xB1DB,
-	1126:  0xB1DE,
-	1127:  0xB1E0,
-	1128:  0xB1E1,
-	1129:  0xB1E2,
-	1130:  0xB1E3,
-	1131:  0xB1E4,
-	1132:  0xB1E5,
-	1133:  0xB1E6,
-	1134:  0xB1E7,
-	1135:  0xB1EA,
-	1136:  0xB1EB,
-	1137:  0xB1ED,
-	1138:  0xB1EE,
-	1139:  0xB1EF,
-	1140:  0xB1F1,
-	1141:  0xB1F2,
-	1142:  0xB1F3,
-	1143:  0xB1F4,
-	1144:  0xB1F5,
-	1145:  0xB1F6,
-	1146:  0xB1F7,
-	1147:  0xB1F8,
-	1148:  0xB1FA,
-	1149:  0xB1FC,
-	1150:  0xB1FE,
-	1151:  0xB1FF,
-	1152:  0xB200,
-	1153:  0xB201,
-	1154:  0xB202,
-	1155:  0xB203,
-	1156:  0xB206,
-	1157:  0xB207,
-	1158:  0xB209,
-	1159:  0xB20A,
-	1160:  0xB20D,
-	1161:  0xB20E,
-	1162:  0xB20F,
-	1163:  0xB210,
-	1164:  0xB211,
-	1165:  0xB212,
-	1166:  0xB213,
-	1167:  0xB216,
-	1168:  0xB218,
-	1169:  0xB21A,
-	1170:  0xB21B,
-	1171:  0xB21C,
-	1172:  0xB21D,
-	1173:  0xB21E,
-	1174:  0xB21F,
-	1175:  0xB221,
-	1176:  0xB222,
-	1177:  0xB223,
-	1178:  0xB224,
-	1179:  0xB225,
-	1180:  0xB226,
-	1181:  0xB227,
-	1182:  0xB228,
-	1183:  0xB229,
-	1184:  0xB22A,
-	1185:  0xB22B,
-	1186:  0xB22C,
-	1187:  0xB22D,
-	1188:  0xB22E,
-	1189:  0xB22F,
-	1190:  0xB230,
-	1191:  0xB231,
-	1192:  0xB232,
-	1193:  0xB233,
-	1194:  0xB235,
-	1195:  0xB236,
-	1196:  0xB237,
-	1197:  0xB238,
-	1198:  0xB239,
-	1199:  0xB23A,
-	1200:  0xB23B,
-	1201:  0xB23D,
-	1202:  0xB23E,
-	1203:  0xB23F,
-	1204:  0xB240,
-	1205:  0xB241,
-	1206:  0xB242,
-	1207:  0xB243,
-	1208:  0xB244,
-	1209:  0xB245,
-	1210:  0xB246,
-	1211:  0xB247,
-	1212:  0xB248,
-	1213:  0xB249,
-	1214:  0xB24A,
-	1215:  0xB24B,
-	1216:  0xB24C,
-	1217:  0xB24D,
-	1218:  0xB24E,
-	1219:  0xB24F,
-	1220:  0xB250,
-	1221:  0xB251,
-	1222:  0xB252,
-	1223:  0xB253,
-	1224:  0xB254,
-	1225:  0xB255,
-	1226:  0xB256,
-	1227:  0xB257,
-	1228:  0xB259,
-	1229:  0xB25A,
-	1230:  0xB25B,
-	1231:  0xB25D,
-	1232:  0xB25E,
-	1233:  0xB25F,
-	1234:  0xB261,
-	1235:  0xB262,
-	1236:  0xB263,
-	1237:  0xB264,
-	1238:  0xB265,
-	1239:  0xB266,
-	1240:  0xB267,
-	1241:  0xB26A,
-	1242:  0xB26B,
-	1243:  0xB26C,
-	1244:  0xB26D,
-	1245:  0xB26E,
-	1246:  0xB26F,
-	1247:  0xB270,
-	1248:  0xB271,
-	1249:  0xB272,
-	1250:  0xB273,
-	1251:  0xB276,
-	1252:  0xB277,
-	1253:  0xB278,
-	1254:  0xB279,
-	1255:  0xB27A,
-	1256:  0xB27B,
-	1257:  0xB27D,
-	1258:  0xB27E,
-	1259:  0xB27F,
-	1260:  0xB280,
-	1261:  0xB281,
-	1262:  0xB282,
-	1263:  0xB283,
-	1264:  0xB286,
-	1265:  0xB287,
-	1266:  0xB288,
-	1267:  0xB28A,
-	1268:  0xB28B,
-	1269:  0xB28C,
-	1270:  0xB28D,
-	1271:  0xB28E,
-	1272:  0xB28F,
-	1273:  0xB292,
-	1274:  0xB293,
-	1275:  0xB295,
-	1276:  0xB296,
-	1277:  0xB297,
-	1278:  0xB29B,
-	1279:  0xB29C,
-	1280:  0xB29D,
-	1281:  0xB29E,
-	1282:  0xB29F,
-	1283:  0xB2A2,
-	1284:  0xB2A4,
-	1285:  0xB2A7,
-	1286:  0xB2A8,
-	1287:  0xB2A9,
-	1288:  0xB2AB,
-	1289:  0xB2AD,
-	1290:  0xB2AE,
-	1291:  0xB2AF,
-	1292:  0xB2B1,
-	1293:  0xB2B2,
-	1294:  0xB2B3,
-	1295:  0xB2B5,
-	1296:  0xB2B6,
-	1297:  0xB2B7,
-	1298:  0xB2B8,
-	1299:  0xB2B9,
-	1300:  0xB2BA,
-	1301:  0xB2BB,
-	1302:  0xB2BC,
-	1303:  0xB2BD,
-	1304:  0xB2BE,
-	1305:  0xB2BF,
-	1306:  0xB2C0,
-	1307:  0xB2C1,
-	1308:  0xB2C2,
-	1309:  0xB2C3,
-	1310:  0xB2C4,
-	1311:  0xB2C5,
-	1312:  0xB2C6,
-	1313:  0xB2C7,
-	1314:  0xB2CA,
-	1315:  0xB2CB,
-	1316:  0xB2CD,
-	1317:  0xB2CE,
-	1318:  0xB2CF,
-	1319:  0xB2D1,
-	1320:  0xB2D3,
-	1321:  0xB2D4,
-	1322:  0xB2D5,
-	1323:  0xB2D6,
-	1324:  0xB2D7,
-	1325:  0xB2DA,
-	1326:  0xB2DC,
-	1327:  0xB2DE,
-	1328:  0xB2DF,
-	1329:  0xB2E0,
-	1330:  0xB2E1,
-	1331:  0xB2E3,
-	1332:  0xB2E7,
-	1333:  0xB2E9,
-	1334:  0xB2EA,
-	1335:  0xB2F0,
-	1336:  0xB2F1,
-	1337:  0xB2F2,
-	1338:  0xB2F6,
-	1339:  0xB2FC,
-	1340:  0xB2FD,
-	1341:  0xB2FE,
-	1342:  0xB302,
-	1343:  0xB303,
-	1344:  0xB305,
-	1345:  0xB306,
-	1346:  0xB307,
-	1347:  0xB309,
-	1348:  0xB30A,
-	1349:  0xB30B,
-	1350:  0xB30C,
-	1351:  0xB30D,
-	1352:  0xB30E,
-	1353:  0xB30F,
-	1354:  0xB312,
-	1355:  0xB316,
-	1356:  0xB317,
-	1357:  0xB318,
-	1358:  0xB319,
-	1359:  0xB31A,
-	1360:  0xB31B,
-	1361:  0xB31D,
-	1362:  0xB31E,
-	1363:  0xB31F,
-	1364:  0xB320,
-	1365:  0xB321,
-	1366:  0xB322,
-	1367:  0xB323,
-	1368:  0xB324,
-	1369:  0xB325,
-	1370:  0xB326,
-	1371:  0xB327,
-	1372:  0xB328,
-	1373:  0xB329,
-	1374:  0xB32A,
-	1375:  0xB32B,
-	1376:  0xB32C,
-	1377:  0xB32D,
-	1378:  0xB32E,
-	1379:  0xB32F,
-	1380:  0xB330,
-	1381:  0xB331,
-	1382:  0xB332,
-	1383:  0xB333,
-	1384:  0xB334,
-	1385:  0xB335,
-	1386:  0xB336,
-	1387:  0xB337,
-	1388:  0xB338,
-	1389:  0xB339,
-	1390:  0xB33A,
-	1391:  0xB33B,
-	1392:  0xB33C,
-	1393:  0xB33D,
-	1394:  0xB33E,
-	1395:  0xB33F,
-	1396:  0xB340,
-	1397:  0xB341,
-	1398:  0xB342,
-	1399:  0xB343,
-	1400:  0xB344,
-	1401:  0xB345,
-	1402:  0xB346,
-	1403:  0xB347,
-	1404:  0xB348,
-	1405:  0xB349,
-	1406:  0xB34A,
-	1407:  0xB34B,
-	1408:  0xB34C,
-	1409:  0xB34D,
-	1410:  0xB34E,
-	1411:  0xB34F,
-	1412:  0xB350,
-	1413:  0xB351,
-	1414:  0xB352,
-	1415:  0xB353,
-	1416:  0xB357,
-	1417:  0xB359,
-	1418:  0xB35A,
-	1419:  0xB35D,
-	1420:  0xB360,
-	1421:  0xB361,
-	1422:  0xB362,
-	1423:  0xB363,
-	1424:  0xB366,
-	1425:  0xB368,
-	1426:  0xB36A,
-	1427:  0xB36C,
-	1428:  0xB36D,
-	1429:  0xB36F,
-	1430:  0xB372,
-	1431:  0xB373,
-	1432:  0xB375,
-	1433:  0xB376,
-	1434:  0xB377,
-	1435:  0xB379,
-	1436:  0xB37A,
-	1437:  0xB37B,
-	1438:  0xB37C,
-	1439:  0xB37D,
-	1440:  0xB37E,
-	1441:  0xB37F,
-	1442:  0xB382,
-	1443:  0xB386,
-	1444:  0xB387,
-	1445:  0xB388,
-	1446:  0xB389,
-	1447:  0xB38A,
-	1448:  0xB38B,
-	1449:  0xB38D,
-	1450:  0xB38E,
-	1451:  0xB38F,
-	1452:  0xB391,
-	1453:  0xB392,
-	1454:  0xB393,
-	1455:  0xB395,
-	1456:  0xB396,
-	1457:  0xB397,
-	1458:  0xB398,
-	1459:  0xB399,
-	1460:  0xB39A,
-	1461:  0xB39B,
-	1462:  0xB39C,
-	1463:  0xB39D,
-	1464:  0xB39E,
-	1465:  0xB39F,
-	1466:  0xB3A2,
-	1467:  0xB3A3,
-	1468:  0xB3A4,
-	1469:  0xB3A5,
-	1470:  0xB3A6,
-	1471:  0xB3A7,
-	1472:  0xB3A9,
-	1473:  0xB3AA,
-	1474:  0xB3AB,
-	1475:  0xB3AD,
-	1476:  0xB3AE,
-	1477:  0xB3AF,
-	1478:  0xB3B0,
-	1479:  0xB3B1,
-	1480:  0xB3B2,
-	1481:  0xB3B3,
-	1482:  0xB3B4,
-	1483:  0xB3B5,
-	1484:  0xB3B6,
-	1485:  0xB3B7,
-	1486:  0xB3B8,
-	1487:  0xB3B9,
-	1488:  0xB3BA,
-	1489:  0xB3BB,
-	1490:  0xB3BC,
-	1491:  0xB3BD,
-	1492:  0xB3BE,
-	1493:  0xB3BF,
-	1494:  0xB3C0,
-	1495:  0xB3C1,
-	1496:  0xB3C2,
-	1497:  0xB3C3,
-	1498:  0xB3C6,
-	1499:  0xB3C7,
-	1500:  0xB3C9,
-	1501:  0xB3CA,
-	1502:  0xB3CD,
-	1503:  0xB3CF,
-	1504:  0xB3D1,
-	1505:  0xB3D2,
-	1506:  0xB3D3,
-	1507:  0xB3D6,
-	1508:  0xB3D8,
-	1509:  0xB3DA,
-	1510:  0xB3DC,
-	1511:  0xB3DE,
-	1512:  0xB3DF,
-	1513:  0xB3E1,
-	1514:  0xB3E2,
-	1515:  0xB3E3,
-	1516:  0xB3E5,
-	1517:  0xB3E6,
-	1518:  0xB3E7,
-	1519:  0xB3E9,
-	1520:  0xB3EA,
-	1521:  0xB3EB,
-	1522:  0xB3EC,
-	1523:  0xB3ED,
-	1524:  0xB3EE,
-	1525:  0xB3EF,
-	1526:  0xB3F0,
-	1527:  0xB3F1,
-	1528:  0xB3F2,
-	1529:  0xB3F3,
-	1530:  0xB3F4,
-	1531:  0xB3F5,
-	1532:  0xB3F6,
-	1533:  0xB3F7,
-	1534:  0xB3F8,
-	1535:  0xB3F9,
-	1536:  0xB3FA,
-	1537:  0xB3FB,
-	1538:  0xB3FD,
-	1539:  0xB3FE,
-	1540:  0xB3FF,
-	1541:  0xB400,
-	1542:  0xB401,
-	1543:  0xB402,
-	1544:  0xB403,
-	1545:  0xB404,
-	1546:  0xB405,
-	1547:  0xB406,
-	1548:  0xB407,
-	1549:  0xB408,
-	1550:  0xB409,
-	1551:  0xB40A,
-	1552:  0xB40B,
-	1553:  0xB40C,
-	1554:  0xB40D,
-	1555:  0xB40E,
-	1556:  0xB40F,
-	1557:  0xB411,
-	1558:  0xB412,
-	1559:  0xB413,
-	1560:  0xB414,
-	1561:  0xB415,
-	1562:  0xB416,
-	1563:  0xB417,
-	1564:  0xB419,
-	1565:  0xB41A,
-	1566:  0xB41B,
-	1567:  0xB41D,
-	1568:  0xB41E,
-	1569:  0xB41F,
-	1570:  0xB421,
-	1571:  0xB422,
-	1572:  0xB423,
-	1573:  0xB424,
-	1574:  0xB425,
-	1575:  0xB426,
-	1576:  0xB427,
-	1577:  0xB42A,
-	1578:  0xB42C,
-	1579:  0xB42D,
-	1580:  0xB42E,
-	1581:  0xB42F,
-	1582:  0xB430,
-	1583:  0xB431,
-	1584:  0xB432,
-	1585:  0xB433,
-	1586:  0xB435,
-	1587:  0xB436,
-	1588:  0xB437,
-	1589:  0xB438,
-	1590:  0xB439,
-	1591:  0xB43A,
-	1592:  0xB43B,
-	1593:  0xB43C,
-	1594:  0xB43D,
-	1595:  0xB43E,
-	1596:  0xB43F,
-	1597:  0xB440,
-	1598:  0xB441,
-	1599:  0xB442,
-	1600:  0xB443,
-	1601:  0xB444,
-	1602:  0xB445,
-	1603:  0xB446,
-	1604:  0xB447,
-	1605:  0xB448,
-	1606:  0xB449,
-	1607:  0xB44A,
-	1608:  0xB44B,
-	1609:  0xB44C,
-	1610:  0xB44D,
-	1611:  0xB44E,
-	1612:  0xB44F,
-	1613:  0xB452,
-	1614:  0xB453,
-	1615:  0xB455,
-	1616:  0xB456,
-	1617:  0xB457,
-	1618:  0xB459,
-	1619:  0xB45A,
-	1620:  0xB45B,
-	1621:  0xB45C,
-	1622:  0xB45D,
-	1623:  0xB45E,
-	1624:  0xB45F,
-	1625:  0xB462,
-	1626:  0xB464,
-	1627:  0xB466,
-	1628:  0xB467,
-	1629:  0xB468,
-	1630:  0xB469,
-	1631:  0xB46A,
-	1632:  0xB46B,
-	1633:  0xB46D,
-	1634:  0xB46E,
-	1635:  0xB46F,
-	1636:  0xB470,
-	1637:  0xB471,
-	1638:  0xB472,
-	1639:  0xB473,
-	1640:  0xB474,
-	1641:  0xB475,
-	1642:  0xB476,
-	1643:  0xB477,
-	1644:  0xB478,
-	1645:  0xB479,
-	1646:  0xB47A,
-	1647:  0xB47B,
-	1648:  0xB47C,
-	1649:  0xB47D,
-	1650:  0xB47E,
-	1651:  0xB47F,
-	1652:  0xB481,
-	1653:  0xB482,
-	1654:  0xB483,
-	1655:  0xB484,
-	1656:  0xB485,
-	1657:  0xB486,
-	1658:  0xB487,
-	1659:  0xB489,
-	1660:  0xB48A,
-	1661:  0xB48B,
-	1662:  0xB48C,
-	1663:  0xB48D,
-	1664:  0xB48E,
-	1665:  0xB48F,
-	1666:  0xB490,
-	1667:  0xB491,
-	1668:  0xB492,
-	1669:  0xB493,
-	1670:  0xB494,
-	1671:  0xB495,
-	1672:  0xB496,
-	1673:  0xB497,
-	1674:  0xB498,
-	1675:  0xB499,
-	1676:  0xB49A,
-	1677:  0xB49B,
-	1678:  0xB49C,
-	1679:  0xB49E,
-	1680:  0xB49F,
-	1681:  0xB4A0,
-	1682:  0xB4A1,
-	1683:  0xB4A2,
-	1684:  0xB4A3,
-	1685:  0xB4A5,
-	1686:  0xB4A6,
-	1687:  0xB4A7,
-	1688:  0xB4A9,
-	1689:  0xB4AA,
-	1690:  0xB4AB,
-	1691:  0xB4AD,
-	1692:  0xB4AE,
-	1693:  0xB4AF,
-	1694:  0xB4B0,
-	1695:  0xB4B1,
-	1696:  0xB4B2,
-	1697:  0xB4B3,
-	1698:  0xB4B4,
-	1699:  0xB4B6,
-	1700:  0xB4B8,
-	1701:  0xB4BA,
-	1702:  0xB4BB,
-	1703:  0xB4BC,
-	1704:  0xB4BD,
-	1705:  0xB4BE,
-	1706:  0xB4BF,
-	1707:  0xB4C1,
-	1708:  0xB4C2,
-	1709:  0xB4C3,
-	1710:  0xB4C5,
-	1711:  0xB4C6,
-	1712:  0xB4C7,
-	1713:  0xB4C9,
-	1714:  0xB4CA,
-	1715:  0xB4CB,
-	1716:  0xB4CC,
-	1717:  0xB4CD,
-	1718:  0xB4CE,
-	1719:  0xB4CF,
-	1720:  0xB4D1,
-	1721:  0xB4D2,
-	1722:  0xB4D3,
-	1723:  0xB4D4,
-	1724:  0xB4D6,
-	1725:  0xB4D7,
-	1726:  0xB4D8,
-	1727:  0xB4D9,
-	1728:  0xB4DA,
-	1729:  0xB4DB,
-	1730:  0xB4DE,
-	1731:  0xB4DF,
-	1732:  0xB4E1,
-	1733:  0xB4E2,
-	1734:  0xB4E5,
-	1735:  0xB4E7,
-	1736:  0xB4E8,
-	1737:  0xB4E9,
-	1738:  0xB4EA,
-	1739:  0xB4EB,
-	1740:  0xB4EE,
-	1741:  0xB4F0,
-	1742:  0xB4F2,
-	1743:  0xB4F3,
-	1744:  0xB4F4,
-	1745:  0xB4F5,
-	1746:  0xB4F6,
-	1747:  0xB4F7,
-	1748:  0xB4F9,
-	1749:  0xB4FA,
-	1750:  0xB4FB,
-	1751:  0xB4FC,
-	1752:  0xB4FD,
-	1753:  0xB4FE,
-	1754:  0xB4FF,
-	1755:  0xB500,
-	1756:  0xB501,
-	1757:  0xB502,
-	1758:  0xB503,
-	1759:  0xB504,
-	1760:  0xB505,
-	1761:  0xB506,
-	1762:  0xB507,
-	1763:  0xB508,
-	1764:  0xB509,
-	1765:  0xB50A,
-	1766:  0xB50B,
-	1767:  0xB50C,
-	1768:  0xB50D,
-	1769:  0xB50E,
-	1770:  0xB50F,
-	1771:  0xB510,
-	1772:  0xB511,
-	1773:  0xB512,
-	1774:  0xB513,
-	1775:  0xB516,
-	1776:  0xB517,
-	1777:  0xB519,
-	1778:  0xB51A,
-	1779:  0xB51D,
-	1780:  0xB51E,
-	1781:  0xB51F,
-	1782:  0xB520,
-	1783:  0xB521,
-	1784:  0xB522,
-	1785:  0xB523,
-	1786:  0xB526,
-	1787:  0xB52B,
-	1788:  0xB52C,
-	1789:  0xB52D,
-	1790:  0xB52E,
-	1791:  0xB52F,
-	1792:  0xB532,
-	1793:  0xB533,
-	1794:  0xB535,
-	1795:  0xB536,
-	1796:  0xB537,
-	1797:  0xB539,
-	1798:  0xB53A,
-	1799:  0xB53B,
-	1800:  0xB53C,
-	1801:  0xB53D,
-	1802:  0xB53E,
-	1803:  0xB53F,
-	1804:  0xB542,
-	1805:  0xB546,
-	1806:  0xB547,
-	1807:  0xB548,
-	1808:  0xB549,
-	1809:  0xB54A,
-	1810:  0xB54E,
-	1811:  0xB54F,
-	1812:  0xB551,
-	1813:  0xB552,
-	1814:  0xB553,
-	1815:  0xB555,
-	1816:  0xB556,
-	1817:  0xB557,
-	1818:  0xB558,
-	1819:  0xB559,
-	1820:  0xB55A,
-	1821:  0xB55B,
-	1822:  0xB55E,
-	1823:  0xB562,
-	1824:  0xB563,
-	1825:  0xB564,
-	1826:  0xB565,
-	1827:  0xB566,
-	1828:  0xB567,
-	1829:  0xB568,
-	1830:  0xB569,
-	1831:  0xB56A,
-	1832:  0xB56B,
-	1833:  0xB56C,
-	1834:  0xB56D,
-	1835:  0xB56E,
-	1836:  0xB56F,
-	1837:  0xB570,
-	1838:  0xB571,
-	1839:  0xB572,
-	1840:  0xB573,
-	1841:  0xB574,
-	1842:  0xB575,
-	1843:  0xB576,
-	1844:  0xB577,
-	1845:  0xB578,
-	1846:  0xB579,
-	1847:  0xB57A,
-	1848:  0xB57B,
-	1849:  0xB57C,
-	1850:  0xB57D,
-	1851:  0xB57E,
-	1852:  0xB57F,
-	1853:  0xB580,
-	1854:  0xB581,
-	1855:  0xB582,
-	1856:  0xB583,
-	1857:  0xB584,
-	1858:  0xB585,
-	1859:  0xB586,
-	1860:  0xB587,
-	1861:  0xB588,
-	1862:  0xB589,
-	1863:  0xB58A,
-	1864:  0xB58B,
-	1865:  0xB58C,
-	1866:  0xB58D,
-	1867:  0xB58E,
-	1868:  0xB58F,
-	1869:  0xB590,
-	1870:  0xB591,
-	1871:  0xB592,
-	1872:  0xB593,
-	1873:  0xB594,
-	1874:  0xB595,
-	1875:  0xB596,
-	1876:  0xB597,
-	1877:  0xB598,
-	1878:  0xB599,
-	1879:  0xB59A,
-	1880:  0xB59B,
-	1881:  0xB59C,
-	1882:  0xB59D,
-	1883:  0xB59E,
-	1884:  0xB59F,
-	1885:  0xB5A2,
-	1886:  0xB5A3,
-	1887:  0xB5A5,
-	1888:  0xB5A6,
-	1889:  0xB5A7,
-	1890:  0xB5A9,
-	1891:  0xB5AC,
-	1892:  0xB5AD,
-	1893:  0xB5AE,
-	1894:  0xB5AF,
-	1895:  0xB5B2,
-	1896:  0xB5B6,
-	1897:  0xB5B7,
-	1898:  0xB5B8,
-	1899:  0xB5B9,
-	1900:  0xB5BA,
-	1901:  0xB5BE,
-	1902:  0xB5BF,
-	1903:  0xB5C1,
-	1904:  0xB5C2,
-	1905:  0xB5C3,
-	1906:  0xB5C5,
-	1907:  0xB5C6,
-	1908:  0xB5C7,
-	1909:  0xB5C8,
-	1910:  0xB5C9,
-	1911:  0xB5CA,
-	1912:  0xB5CB,
-	1913:  0xB5CE,
-	1914:  0xB5D2,
-	1915:  0xB5D3,
-	1916:  0xB5D4,
-	1917:  0xB5D5,
-	1918:  0xB5D6,
-	1919:  0xB5D7,
-	1920:  0xB5D9,
-	1921:  0xB5DA,
-	1922:  0xB5DB,
-	1923:  0xB5DC,
-	1924:  0xB5DD,
-	1925:  0xB5DE,
-	1926:  0xB5DF,
-	1927:  0xB5E0,
-	1928:  0xB5E1,
-	1929:  0xB5E2,
-	1930:  0xB5E3,
-	1931:  0xB5E4,
-	1932:  0xB5E5,
-	1933:  0xB5E6,
-	1934:  0xB5E7,
-	1935:  0xB5E8,
-	1936:  0xB5E9,
-	1937:  0xB5EA,
-	1938:  0xB5EB,
-	1939:  0xB5ED,
-	1940:  0xB5EE,
-	1941:  0xB5EF,
-	1942:  0xB5F0,
-	1943:  0xB5F1,
-	1944:  0xB5F2,
-	1945:  0xB5F3,
-	1946:  0xB5F4,
-	1947:  0xB5F5,
-	1948:  0xB5F6,
-	1949:  0xB5F7,
-	1950:  0xB5F8,
-	1951:  0xB5F9,
-	1952:  0xB5FA,
-	1953:  0xB5FB,
-	1954:  0xB5FC,
-	1955:  0xB5FD,
-	1956:  0xB5FE,
-	1957:  0xB5FF,
-	1958:  0xB600,
-	1959:  0xB601,
-	1960:  0xB602,
-	1961:  0xB603,
-	1962:  0xB604,
-	1963:  0xB605,
-	1964:  0xB606,
-	1965:  0xB607,
-	1966:  0xB608,
-	1967:  0xB609,
-	1968:  0xB60A,
-	1969:  0xB60B,
-	1970:  0xB60C,
-	1971:  0xB60D,
-	1972:  0xB60E,
-	1973:  0xB60F,
-	1974:  0xB612,
-	1975:  0xB613,
-	1976:  0xB615,
-	1977:  0xB616,
-	1978:  0xB617,
-	1979:  0xB619,
-	1980:  0xB61A,
-	1981:  0xB61B,
-	1982:  0xB61C,
-	1983:  0xB61D,
-	1984:  0xB61E,
-	1985:  0xB61F,
-	1986:  0xB620,
-	1987:  0xB621,
-	1988:  0xB622,
-	1989:  0xB623,
-	1990:  0xB624,
-	1991:  0xB626,
-	1992:  0xB627,
-	1993:  0xB628,
-	1994:  0xB629,
-	1995:  0xB62A,
-	1996:  0xB62B,
-	1997:  0xB62D,
-	1998:  0xB62E,
-	1999:  0xB62F,
-	2000:  0xB630,
-	2001:  0xB631,
-	2002:  0xB632,
-	2003:  0xB633,
-	2004:  0xB635,
-	2005:  0xB636,
-	2006:  0xB637,
-	2007:  0xB638,
-	2008:  0xB639,
-	2009:  0xB63A,
-	2010:  0xB63B,
-	2011:  0xB63C,
-	2012:  0xB63D,
-	2013:  0xB63E,
-	2014:  0xB63F,
-	2015:  0xB640,
-	2016:  0xB641,
-	2017:  0xB642,
-	2018:  0xB643,
-	2019:  0xB644,
-	2020:  0xB645,
-	2021:  0xB646,
-	2022:  0xB647,
-	2023:  0xB649,
-	2024:  0xB64A,
-	2025:  0xB64B,
-	2026:  0xB64C,
-	2027:  0xB64D,
-	2028:  0xB64E,
-	2029:  0xB64F,
-	2030:  0xB650,
-	2031:  0xB651,
-	2032:  0xB652,
-	2033:  0xB653,
-	2034:  0xB654,
-	2035:  0xB655,
-	2036:  0xB656,
-	2037:  0xB657,
-	2038:  0xB658,
-	2039:  0xB659,
-	2040:  0xB65A,
-	2041:  0xB65B,
-	2042:  0xB65C,
-	2043:  0xB65D,
-	2044:  0xB65E,
-	2045:  0xB65F,
-	2046:  0xB660,
-	2047:  0xB661,
-	2048:  0xB662,
-	2049:  0xB663,
-	2050:  0xB665,
-	2051:  0xB666,
-	2052:  0xB667,
-	2053:  0xB669,
-	2054:  0xB66A,
-	2055:  0xB66B,
-	2056:  0xB66C,
-	2057:  0xB66D,
-	2058:  0xB66E,
-	2059:  0xB66F,
-	2060:  0xB670,
-	2061:  0xB671,
-	2062:  0xB672,
-	2063:  0xB673,
-	2064:  0xB674,
-	2065:  0xB675,
-	2066:  0xB676,
-	2067:  0xB677,
-	2068:  0xB678,
-	2069:  0xB679,
-	2070:  0xB67A,
-	2071:  0xB67B,
-	2072:  0xB67C,
-	2073:  0xB67D,
-	2074:  0xB67E,
-	2075:  0xB67F,
-	2076:  0xB680,
-	2077:  0xB681,
-	2078:  0xB682,
-	2079:  0xB683,
-	2080:  0xB684,
-	2081:  0xB685,
-	2082:  0xB686,
-	2083:  0xB687,
-	2084:  0xB688,
-	2085:  0xB689,
-	2086:  0xB68A,
-	2087:  0xB68B,
-	2088:  0xB68C,
-	2089:  0xB68D,
-	2090:  0xB68E,
-	2091:  0xB68F,
-	2092:  0xB690,
-	2093:  0xB691,
-	2094:  0xB692,
-	2095:  0xB693,
-	2096:  0xB694,
-	2097:  0xB695,
-	2098:  0xB696,
-	2099:  0xB697,
-	2100:  0xB698,
-	2101:  0xB699,
-	2102:  0xB69A,
-	2103:  0xB69B,
-	2104:  0xB69E,
-	2105:  0xB69F,
-	2106:  0xB6A1,
-	2107:  0xB6A2,
-	2108:  0xB6A3,
-	2109:  0xB6A5,
-	2110:  0xB6A6,
-	2111:  0xB6A7,
-	2112:  0xB6A8,
-	2113:  0xB6A9,
-	2114:  0xB6AA,
-	2115:  0xB6AD,
-	2116:  0xB6AE,
-	2117:  0xB6AF,
-	2118:  0xB6B0,
-	2119:  0xB6B2,
-	2120:  0xB6B3,
-	2121:  0xB6B4,
-	2122:  0xB6B5,
-	2123:  0xB6B6,
-	2124:  0xB6B7,
-	2125:  0xB6B8,
-	2126:  0xB6B9,
-	2127:  0xB6BA,
-	2128:  0xB6BB,
-	2129:  0xB6BC,
-	2130:  0xB6BD,
-	2131:  0xB6BE,
-	2132:  0xB6BF,
-	2133:  0xB6C0,
-	2134:  0xB6C1,
-	2135:  0xB6C2,
-	2136:  0xB6C3,
-	2137:  0xB6C4,
-	2138:  0xB6C5,
-	2139:  0xB6C6,
-	2140:  0xB6C7,
-	2141:  0xB6C8,
-	2142:  0xB6C9,
-	2143:  0xB6CA,
-	2144:  0xB6CB,
-	2145:  0xB6CC,
-	2146:  0xB6CD,
-	2147:  0xB6CE,
-	2148:  0xB6CF,
-	2149:  0xB6D0,
-	2150:  0xB6D1,
-	2151:  0xB6D2,
-	2152:  0xB6D3,
-	2153:  0xB6D5,
-	2154:  0xB6D6,
-	2155:  0xB6D7,
-	2156:  0xB6D8,
-	2157:  0xB6D9,
-	2158:  0xB6DA,
-	2159:  0xB6DB,
-	2160:  0xB6DC,
-	2161:  0xB6DD,
-	2162:  0xB6DE,
-	2163:  0xB6DF,
-	2164:  0xB6E0,
-	2165:  0xB6E1,
-	2166:  0xB6E2,
-	2167:  0xB6E3,
-	2168:  0xB6E4,
-	2169:  0xB6E5,
-	2170:  0xB6E6,
-	2171:  0xB6E7,
-	2172:  0xB6E8,
-	2173:  0xB6E9,
-	2174:  0xB6EA,
-	2175:  0xB6EB,
-	2176:  0xB6EC,
-	2177:  0xB6ED,
-	2178:  0xB6EE,
-	2179:  0xB6EF,
-	2180:  0xB6F1,
-	2181:  0xB6F2,
-	2182:  0xB6F3,
-	2183:  0xB6F5,
-	2184:  0xB6F6,
-	2185:  0xB6F7,
-	2186:  0xB6F9,
-	2187:  0xB6FA,
-	2188:  0xB6FB,
-	2189:  0xB6FC,
-	2190:  0xB6FD,
-	2191:  0xB6FE,
-	2192:  0xB6FF,
-	2193:  0xB702,
-	2194:  0xB703,
-	2195:  0xB704,
-	2196:  0xB706,
-	2197:  0xB707,
-	2198:  0xB708,
-	2199:  0xB709,
-	2200:  0xB70A,
-	2201:  0xB70B,
-	2202:  0xB70C,
-	2203:  0xB70D,
-	2204:  0xB70E,
-	2205:  0xB70F,
-	2206:  0xB710,
-	2207:  0xB711,
-	2208:  0xB712,
-	2209:  0xB713,
-	2210:  0xB714,
-	2211:  0xB715,
-	2212:  0xB716,
-	2213:  0xB717,
-	2214:  0xB718,
-	2215:  0xB719,
-	2216:  0xB71A,
-	2217:  0xB71B,
-	2218:  0xB71C,
-	2219:  0xB71D,
-	2220:  0xB71E,
-	2221:  0xB71F,
-	2222:  0xB720,
-	2223:  0xB721,
-	2224:  0xB722,
-	2225:  0xB723,
-	2226:  0xB724,
-	2227:  0xB725,
-	2228:  0xB726,
-	2229:  0xB727,
-	2230:  0xB72A,
-	2231:  0xB72B,
-	2232:  0xB72D,
-	2233:  0xB72E,
-	2234:  0xB731,
-	2235:  0xB732,
-	2236:  0xB733,
-	2237:  0xB734,
-	2238:  0xB735,
-	2239:  0xB736,
-	2240:  0xB737,
-	2241:  0xB73A,
-	2242:  0xB73C,
-	2243:  0xB73D,
-	2244:  0xB73E,
-	2245:  0xB73F,
-	2246:  0xB740,
-	2247:  0xB741,
-	2248:  0xB742,
-	2249:  0xB743,
-	2250:  0xB745,
-	2251:  0xB746,
-	2252:  0xB747,
-	2253:  0xB749,
-	2254:  0xB74A,
-	2255:  0xB74B,
-	2256:  0xB74D,
-	2257:  0xB74E,
-	2258:  0xB74F,
-	2259:  0xB750,
-	2260:  0xB751,
-	2261:  0xB752,
-	2262:  0xB753,
-	2263:  0xB756,
-	2264:  0xB757,
-	2265:  0xB758,
-	2266:  0xB759,
-	2267:  0xB75A,
-	2268:  0xB75B,
-	2269:  0xB75C,
-	2270:  0xB75D,
-	2271:  0xB75E,
-	2272:  0xB75F,
-	2273:  0xB761,
-	2274:  0xB762,
-	2275:  0xB763,
-	2276:  0xB765,
-	2277:  0xB766,
-	2278:  0xB767,
-	2279:  0xB769,
-	2280:  0xB76A,
-	2281:  0xB76B,
-	2282:  0xB76C,
-	2283:  0xB76D,
-	2284:  0xB76E,
-	2285:  0xB76F,
-	2286:  0xB772,
-	2287:  0xB774,
-	2288:  0xB776,
-	2289:  0xB777,
-	2290:  0xB778,
-	2291:  0xB779,
-	2292:  0xB77A,
-	2293:  0xB77B,
-	2294:  0xB77E,
-	2295:  0xB77F,
-	2296:  0xB781,
-	2297:  0xB782,
-	2298:  0xB783,
-	2299:  0xB785,
-	2300:  0xB786,
-	2301:  0xB787,
-	2302:  0xB788,
-	2303:  0xB789,
-	2304:  0xB78A,
-	2305:  0xB78B,
-	2306:  0xB78E,
-	2307:  0xB793,
-	2308:  0xB794,
-	2309:  0xB795,
-	2310:  0xB79A,
-	2311:  0xB79B,
-	2312:  0xB79D,
-	2313:  0xB79E,
-	2314:  0xB79F,
-	2315:  0xB7A1,
-	2316:  0xB7A2,
-	2317:  0xB7A3,
-	2318:  0xB7A4,
-	2319:  0xB7A5,
-	2320:  0xB7A6,
-	2321:  0xB7A7,
-	2322:  0xB7AA,
-	2323:  0xB7AE,
-	2324:  0xB7AF,
-	2325:  0xB7B0,
-	2326:  0xB7B1,
-	2327:  0xB7B2,
-	2328:  0xB7B3,
-	2329:  0xB7B6,
-	2330:  0xB7B7,
-	2331:  0xB7B9,
-	2332:  0xB7BA,
-	2333:  0xB7BB,
-	2334:  0xB7BC,
-	2335:  0xB7BD,
-	2336:  0xB7BE,
-	2337:  0xB7BF,
-	2338:  0xB7C0,
-	2339:  0xB7C1,
-	2340:  0xB7C2,
-	2341:  0xB7C3,
-	2342:  0xB7C4,
-	2343:  0xB7C5,
-	2344:  0xB7C6,
-	2345:  0xB7C8,
-	2346:  0xB7CA,
-	2347:  0xB7CB,
-	2348:  0xB7CC,
-	2349:  0xB7CD,
-	2350:  0xB7CE,
-	2351:  0xB7CF,
-	2352:  0xB7D0,
-	2353:  0xB7D1,
-	2354:  0xB7D2,
-	2355:  0xB7D3,
-	2356:  0xB7D4,
-	2357:  0xB7D5,
-	2358:  0xB7D6,
-	2359:  0xB7D7,
-	2360:  0xB7D8,
-	2361:  0xB7D9,
-	2362:  0xB7DA,
-	2363:  0xB7DB,
-	2364:  0xB7DC,
-	2365:  0xB7DD,
-	2366:  0xB7DE,
-	2367:  0xB7DF,
-	2368:  0xB7E0,
-	2369:  0xB7E1,
-	2370:  0xB7E2,
-	2371:  0xB7E3,
-	2372:  0xB7E4,
-	2373:  0xB7E5,
-	2374:  0xB7E6,
-	2375:  0xB7E7,
-	2376:  0xB7E8,
-	2377:  0xB7E9,
-	2378:  0xB7EA,
-	2379:  0xB7EB,
-	2380:  0xB7EE,
-	2381:  0xB7EF,
-	2382:  0xB7F1,
-	2383:  0xB7F2,
-	2384:  0xB7F3,
-	2385:  0xB7F5,
-	2386:  0xB7F6,
-	2387:  0xB7F7,
-	2388:  0xB7F8,
-	2389:  0xB7F9,
-	2390:  0xB7FA,
-	2391:  0xB7FB,
-	2392:  0xB7FE,
-	2393:  0xB802,
-	2394:  0xB803,
-	2395:  0xB804,
-	2396:  0xB805,
-	2397:  0xB806,
-	2398:  0xB80A,
-	2399:  0xB80B,
-	2400:  0xB80D,
-	2401:  0xB80E,
-	2402:  0xB80F,
-	2403:  0xB811,
-	2404:  0xB812,
-	2405:  0xB813,
-	2406:  0xB814,
-	2407:  0xB815,
-	2408:  0xB816,
-	2409:  0xB817,
-	2410:  0xB81A,
-	2411:  0xB81C,
-	2412:  0xB81E,
-	2413:  0xB81F,
-	2414:  0xB820,
-	2415:  0xB821,
-	2416:  0xB822,
-	2417:  0xB823,
-	2418:  0xB826,
-	2419:  0xB827,
-	2420:  0xB829,
-	2421:  0xB82A,
-	2422:  0xB82B,
-	2423:  0xB82D,
-	2424:  0xB82E,
-	2425:  0xB82F,
-	2426:  0xB830,
-	2427:  0xB831,
-	2428:  0xB832,
-	2429:  0xB833,
-	2430:  0xB836,
-	2431:  0xB83A,
-	2432:  0xB83B,
-	2433:  0xB83C,
-	2434:  0xB83D,
-	2435:  0xB83E,
-	2436:  0xB83F,
-	2437:  0xB841,
-	2438:  0xB842,
-	2439:  0xB843,
-	2440:  0xB845,
-	2441:  0xB846,
-	2442:  0xB847,
-	2443:  0xB848,
-	2444:  0xB849,
-	2445:  0xB84A,
-	2446:  0xB84B,
-	2447:  0xB84C,
-	2448:  0xB84D,
-	2449:  0xB84E,
-	2450:  0xB84F,
-	2451:  0xB850,
-	2452:  0xB852,
-	2453:  0xB854,
-	2454:  0xB855,
-	2455:  0xB856,
-	2456:  0xB857,
-	2457:  0xB858,
-	2458:  0xB859,
-	2459:  0xB85A,
-	2460:  0xB85B,
-	2461:  0xB85E,
-	2462:  0xB85F,
-	2463:  0xB861,
-	2464:  0xB862,
-	2465:  0xB863,
-	2466:  0xB865,
-	2467:  0xB866,
-	2468:  0xB867,
-	2469:  0xB868,
-	2470:  0xB869,
-	2471:  0xB86A,
-	2472:  0xB86B,
-	2473:  0xB86E,
-	2474:  0xB870,
-	2475:  0xB872,
-	2476:  0xB873,
-	2477:  0xB874,
-	2478:  0xB875,
-	2479:  0xB876,
-	2480:  0xB877,
-	2481:  0xB879,
-	2482:  0xB87A,
-	2483:  0xB87B,
-	2484:  0xB87D,
-	2485:  0xB87E,
-	2486:  0xB87F,
-	2487:  0xB880,
-	2488:  0xB881,
-	2489:  0xB882,
-	2490:  0xB883,
-	2491:  0xB884,
-	2492:  0xB885,
-	2493:  0xB886,
-	2494:  0xB887,
-	2495:  0xB888,
-	2496:  0xB889,
-	2497:  0xB88A,
-	2498:  0xB88B,
-	2499:  0xB88C,
-	2500:  0xB88E,
-	2501:  0xB88F,
-	2502:  0xB890,
-	2503:  0xB891,
-	2504:  0xB892,
-	2505:  0xB893,
-	2506:  0xB894,
-	2507:  0xB895,
-	2508:  0xB896,
-	2509:  0xB897,
-	2510:  0xB898,
-	2511:  0xB899,
-	2512:  0xB89A,
-	2513:  0xB89B,
-	2514:  0xB89C,
-	2515:  0xB89D,
-	2516:  0xB89E,
-	2517:  0xB89F,
-	2518:  0xB8A0,
-	2519:  0xB8A1,
-	2520:  0xB8A2,
-	2521:  0xB8A3,
-	2522:  0xB8A4,
-	2523:  0xB8A5,
-	2524:  0xB8A6,
-	2525:  0xB8A7,
-	2526:  0xB8A9,
-	2527:  0xB8AA,
-	2528:  0xB8AB,
-	2529:  0xB8AC,
-	2530:  0xB8AD,
-	2531:  0xB8AE,
-	2532:  0xB8AF,
-	2533:  0xB8B1,
-	2534:  0xB8B2,
-	2535:  0xB8B3,
-	2536:  0xB8B5,
-	2537:  0xB8B6,
-	2538:  0xB8B7,
-	2539:  0xB8B9,
-	2540:  0xB8BA,
-	2541:  0xB8BB,
-	2542:  0xB8BC,
-	2543:  0xB8BD,
-	2544:  0xB8BE,
-	2545:  0xB8BF,
-	2546:  0xB8C2,
-	2547:  0xB8C4,
-	2548:  0xB8C6,
-	2549:  0xB8C7,
-	2550:  0xB8C8,
-	2551:  0xB8C9,
-	2552:  0xB8CA,
-	2553:  0xB8CB,
-	2554:  0xB8CD,
-	2555:  0xB8CE,
-	2556:  0xB8CF,
-	2557:  0xB8D1,
-	2558:  0xB8D2,
-	2559:  0xB8D3,
-	2560:  0xB8D5,
-	2561:  0xB8D6,
-	2562:  0xB8D7,
-	2563:  0xB8D8,
-	2564:  0xB8D9,
-	2565:  0xB8DA,
-	2566:  0xB8DB,
-	2567:  0xB8DC,
-	2568:  0xB8DE,
-	2569:  0xB8E0,
-	2570:  0xB8E2,
-	2571:  0xB8E3,
-	2572:  0xB8E4,
-	2573:  0xB8E5,
-	2574:  0xB8E6,
-	2575:  0xB8E7,
-	2576:  0xB8EA,
-	2577:  0xB8EB,
-	2578:  0xB8ED,
-	2579:  0xB8EE,
-	2580:  0xB8EF,
-	2581:  0xB8F1,
-	2582:  0xB8F2,
-	2583:  0xB8F3,
-	2584:  0xB8F4,
-	2585:  0xB8F5,
-	2586:  0xB8F6,
-	2587:  0xB8F7,
-	2588:  0xB8FA,
-	2589:  0xB8FC,
-	2590:  0xB8FE,
-	2591:  0xB8FF,
-	2592:  0xB900,
-	2593:  0xB901,
-	2594:  0xB902,
-	2595:  0xB903,
-	2596:  0xB905,
-	2597:  0xB906,
-	2598:  0xB907,
-	2599:  0xB908,
-	2600:  0xB909,
-	2601:  0xB90A,
-	2602:  0xB90B,
-	2603:  0xB90C,
-	2604:  0xB90D,
-	2605:  0xB90E,
-	2606:  0xB90F,
-	2607:  0xB910,
-	2608:  0xB911,
-	2609:  0xB912,
-	2610:  0xB913,
-	2611:  0xB914,
-	2612:  0xB915,
-	2613:  0xB916,
-	2614:  0xB917,
-	2615:  0xB919,
-	2616:  0xB91A,
-	2617:  0xB91B,
-	2618:  0xB91C,
-	2619:  0xB91D,
-	2620:  0xB91E,
-	2621:  0xB91F,
-	2622:  0xB921,
-	2623:  0xB922,
-	2624:  0xB923,
-	2625:  0xB924,
-	2626:  0xB925,
-	2627:  0xB926,
-	2628:  0xB927,
-	2629:  0xB928,
-	2630:  0xB929,
-	2631:  0xB92A,
-	2632:  0xB92B,
-	2633:  0xB92C,
-	2634:  0xB92D,
-	2635:  0xB92E,
-	2636:  0xB92F,
-	2637:  0xB930,
-	2638:  0xB931,
-	2639:  0xB932,
-	2640:  0xB933,
-	2641:  0xB934,
-	2642:  0xB935,
-	2643:  0xB936,
-	2644:  0xB937,
-	2645:  0xB938,
-	2646:  0xB939,
-	2647:  0xB93A,
-	2648:  0xB93B,
-	2649:  0xB93E,
-	2650:  0xB93F,
-	2651:  0xB941,
-	2652:  0xB942,
-	2653:  0xB943,
-	2654:  0xB945,
-	2655:  0xB946,
-	2656:  0xB947,
-	2657:  0xB948,
-	2658:  0xB949,
-	2659:  0xB94A,
-	2660:  0xB94B,
-	2661:  0xB94D,
-	2662:  0xB94E,
-	2663:  0xB950,
-	2664:  0xB952,
-	2665:  0xB953,
-	2666:  0xB954,
-	2667:  0xB955,
-	2668:  0xB956,
-	2669:  0xB957,
-	2670:  0xB95A,
-	2671:  0xB95B,
-	2672:  0xB95D,
-	2673:  0xB95E,
-	2674:  0xB95F,
-	2675:  0xB961,
-	2676:  0xB962,
-	2677:  0xB963,
-	2678:  0xB964,
-	2679:  0xB965,
-	2680:  0xB966,
-	2681:  0xB967,
-	2682:  0xB96A,
-	2683:  0xB96C,
-	2684:  0xB96E,
-	2685:  0xB96F,
-	2686:  0xB970,
-	2687:  0xB971,
-	2688:  0xB972,
-	2689:  0xB973,
-	2690:  0xB976,
-	2691:  0xB977,
-	2692:  0xB979,
-	2693:  0xB97A,
-	2694:  0xB97B,
-	2695:  0xB97D,
-	2696:  0xB97E,
-	2697:  0xB97F,
-	2698:  0xB980,
-	2699:  0xB981,
-	2700:  0xB982,
-	2701:  0xB983,
-	2702:  0xB986,
-	2703:  0xB988,
-	2704:  0xB98B,
-	2705:  0xB98C,
-	2706:  0xB98F,
-	2707:  0xB990,
-	2708:  0xB991,
-	2709:  0xB992,
-	2710:  0xB993,
-	2711:  0xB994,
-	2712:  0xB995,
-	2713:  0xB996,
-	2714:  0xB997,
-	2715:  0xB998,
-	2716:  0xB999,
-	2717:  0xB99A,
-	2718:  0xB99B,
-	2719:  0xB99C,
-	2720:  0xB99D,
-	2721:  0xB99E,
-	2722:  0xB99F,
-	2723:  0xB9A0,
-	2724:  0xB9A1,
-	2725:  0xB9A2,
-	2726:  0xB9A3,
-	2727:  0xB9A4,
-	2728:  0xB9A5,
-	2729:  0xB9A6,
-	2730:  0xB9A7,
-	2731:  0xB9A8,
-	2732:  0xB9A9,
-	2733:  0xB9AA,
-	2734:  0xB9AB,
-	2735:  0xB9AE,
-	2736:  0xB9AF,
-	2737:  0xB9B1,
-	2738:  0xB9B2,
-	2739:  0xB9B3,
-	2740:  0xB9B5,
-	2741:  0xB9B6,
-	2742:  0xB9B7,
-	2743:  0xB9B8,
-	2744:  0xB9B9,
-	2745:  0xB9BA,
-	2746:  0xB9BB,
-	2747:  0xB9BE,
-	2748:  0xB9C0,
-	2749:  0xB9C2,
-	2750:  0xB9C3,
-	2751:  0xB9C4,
-	2752:  0xB9C5,
-	2753:  0xB9C6,
-	2754:  0xB9C7,
-	2755:  0xB9CA,
-	2756:  0xB9CB,
-	2757:  0xB9CD,
-	2758:  0xB9D3,
-	2759:  0xB9D4,
-	2760:  0xB9D5,
-	2761:  0xB9D6,
-	2762:  0xB9D7,
-	2763:  0xB9DA,
-	2764:  0xB9DC,
-	2765:  0xB9DF,
-	2766:  0xB9E0,
-	2767:  0xB9E2,
-	2768:  0xB9E6,
-	2769:  0xB9E7,
-	2770:  0xB9E9,
-	2771:  0xB9EA,
-	2772:  0xB9EB,
-	2773:  0xB9ED,
-	2774:  0xB9EE,
-	2775:  0xB9EF,
-	2776:  0xB9F0,
-	2777:  0xB9F1,
-	2778:  0xB9F2,
-	2779:  0xB9F3,
-	2780:  0xB9F6,
-	2781:  0xB9FB,
-	2782:  0xB9FC,
-	2783:  0xB9FD,
-	2784:  0xB9FE,
-	2785:  0xB9FF,
-	2786:  0xBA02,
-	2787:  0xBA03,
-	2788:  0xBA04,
-	2789:  0xBA05,
-	2790:  0xBA06,
-	2791:  0xBA07,
-	2792:  0xBA09,
-	2793:  0xBA0A,
-	2794:  0xBA0B,
-	2795:  0xBA0C,
-	2796:  0xBA0D,
-	2797:  0xBA0E,
-	2798:  0xBA0F,
-	2799:  0xBA10,
-	2800:  0xBA11,
-	2801:  0xBA12,
-	2802:  0xBA13,
-	2803:  0xBA14,
-	2804:  0xBA16,
-	2805:  0xBA17,
-	2806:  0xBA18,
-	2807:  0xBA19,
-	2808:  0xBA1A,
-	2809:  0xBA1B,
-	2810:  0xBA1C,
-	2811:  0xBA1D,
-	2812:  0xBA1E,
-	2813:  0xBA1F,
-	2814:  0xBA20,
-	2815:  0xBA21,
-	2816:  0xBA22,
-	2817:  0xBA23,
-	2818:  0xBA24,
-	2819:  0xBA25,
-	2820:  0xBA26,
-	2821:  0xBA27,
-	2822:  0xBA28,
-	2823:  0xBA29,
-	2824:  0xBA2A,
-	2825:  0xBA2B,
-	2826:  0xBA2C,
-	2827:  0xBA2D,
-	2828:  0xBA2E,
-	2829:  0xBA2F,
-	2830:  0xBA30,
-	2831:  0xBA31,
-	2832:  0xBA32,
-	2833:  0xBA33,
-	2834:  0xBA34,
-	2835:  0xBA35,
-	2836:  0xBA36,
-	2837:  0xBA37,
-	2838:  0xBA3A,
-	2839:  0xBA3B,
-	2840:  0xBA3D,
-	2841:  0xBA3E,
-	2842:  0xBA3F,
-	2843:  0xBA41,
-	2844:  0xBA43,
-	2845:  0xBA44,
-	2846:  0xBA45,
-	2847:  0xBA46,
-	2848:  0xBA47,
-	2849:  0xBA4A,
-	2850:  0xBA4C,
-	2851:  0xBA4F,
-	2852:  0xBA50,
-	2853:  0xBA51,
-	2854:  0xBA52,
-	2855:  0xBA56,
-	2856:  0xBA57,
-	2857:  0xBA59,
-	2858:  0xBA5A,
-	2859:  0xBA5B,
-	2860:  0xBA5D,
-	2861:  0xBA5E,
-	2862:  0xBA5F,
-	2863:  0xBA60,
-	2864:  0xBA61,
-	2865:  0xBA62,
-	2866:  0xBA63,
-	2867:  0xBA66,
-	2868:  0xBA6A,
-	2869:  0xBA6B,
-	2870:  0xBA6C,
-	2871:  0xBA6D,
-	2872:  0xBA6E,
-	2873:  0xBA6F,
-	2874:  0xBA72,
-	2875:  0xBA73,
-	2876:  0xBA75,
-	2877:  0xBA76,
-	2878:  0xBA77,
-	2879:  0xBA79,
-	2880:  0xBA7A,
-	2881:  0xBA7B,
-	2882:  0xBA7C,
-	2883:  0xBA7D,
-	2884:  0xBA7E,
-	2885:  0xBA7F,
-	2886:  0xBA80,
-	2887:  0xBA81,
-	2888:  0xBA82,
-	2889:  0xBA86,
-	2890:  0xBA88,
-	2891:  0xBA89,
-	2892:  0xBA8A,
-	2893:  0xBA8B,
-	2894:  0xBA8D,
-	2895:  0xBA8E,
-	2896:  0xBA8F,
-	2897:  0xBA90,
-	2898:  0xBA91,
-	2899:  0xBA92,
-	2900:  0xBA93,
-	2901:  0xBA94,
-	2902:  0xBA95,
-	2903:  0xBA96,
-	2904:  0xBA97,
-	2905:  0xBA98,
-	2906:  0xBA99,
-	2907:  0xBA9A,
-	2908:  0xBA9B,
-	2909:  0xBA9C,
-	2910:  0xBA9D,
-	2911:  0xBA9E,
-	2912:  0xBA9F,
-	2913:  0xBAA0,
-	2914:  0xBAA1,
-	2915:  0xBAA2,
-	2916:  0xBAA3,
-	2917:  0xBAA4,
-	2918:  0xBAA5,
-	2919:  0xBAA6,
-	2920:  0xBAA7,
-	2921:  0xBAAA,
-	2922:  0xBAAD,
-	2923:  0xBAAE,
-	2924:  0xBAAF,
-	2925:  0xBAB1,
-	2926:  0xBAB3,
-	2927:  0xBAB4,
-	2928:  0xBAB5,
-	2929:  0xBAB6,
-	2930:  0xBAB7,
-	2931:  0xBABA,
-	2932:  0xBABC,
-	2933:  0xBABE,
-	2934:  0xBABF,
-	2935:  0xBAC0,
-	2936:  0xBAC1,
-	2937:  0xBAC2,
-	2938:  0xBAC3,
-	2939:  0xBAC5,
-	2940:  0xBAC6,
-	2941:  0xBAC7,
-	2942:  0xBAC9,
-	2943:  0xBACA,
-	2944:  0xBACB,
-	2945:  0xBACC,
-	2946:  0xBACD,
-	2947:  0xBACE,
-	2948:  0xBACF,
-	2949:  0xBAD0,
-	2950:  0xBAD1,
-	2951:  0xBAD2,
-	2952:  0xBAD3,
-	2953:  0xBAD4,
-	2954:  0xBAD5,
-	2955:  0xBAD6,
-	2956:  0xBAD7,
-	2957:  0xBADA,
-	2958:  0xBADB,
-	2959:  0xBADC,
-	2960:  0xBADD,
-	2961:  0xBADE,
-	2962:  0xBADF,
-	2963:  0xBAE0,
-	2964:  0xBAE1,
-	2965:  0xBAE2,
-	2966:  0xBAE3,
-	2967:  0xBAE4,
-	2968:  0xBAE5,
-	2969:  0xBAE6,
-	2970:  0xBAE7,
-	2971:  0xBAE8,
-	2972:  0xBAE9,
-	2973:  0xBAEA,
-	2974:  0xBAEB,
-	2975:  0xBAEC,
-	2976:  0xBAED,
-	2977:  0xBAEE,
-	2978:  0xBAEF,
-	2979:  0xBAF0,
-	2980:  0xBAF1,
-	2981:  0xBAF2,
-	2982:  0xBAF3,
-	2983:  0xBAF4,
-	2984:  0xBAF5,
-	2985:  0xBAF6,
-	2986:  0xBAF7,
-	2987:  0xBAF8,
-	2988:  0xBAF9,
-	2989:  0xBAFA,
-	2990:  0xBAFB,
-	2991:  0xBAFD,
-	2992:  0xBAFE,
-	2993:  0xBAFF,
-	2994:  0xBB01,
-	2995:  0xBB02,
-	2996:  0xBB03,
-	2997:  0xBB05,
-	2998:  0xBB06,
-	2999:  0xBB07,
-	3000:  0xBB08,
-	3001:  0xBB09,
-	3002:  0xBB0A,
-	3003:  0xBB0B,
-	3004:  0xBB0C,
-	3005:  0xBB0E,
-	3006:  0xBB10,
-	3007:  0xBB12,
-	3008:  0xBB13,
-	3009:  0xBB14,
-	3010:  0xBB15,
-	3011:  0xBB16,
-	3012:  0xBB17,
-	3013:  0xBB19,
-	3014:  0xBB1A,
-	3015:  0xBB1B,
-	3016:  0xBB1D,
-	3017:  0xBB1E,
-	3018:  0xBB1F,
-	3019:  0xBB21,
-	3020:  0xBB22,
-	3021:  0xBB23,
-	3022:  0xBB24,
-	3023:  0xBB25,
-	3024:  0xBB26,
-	3025:  0xBB27,
-	3026:  0xBB28,
-	3027:  0xBB2A,
-	3028:  0xBB2C,
-	3029:  0xBB2D,
-	3030:  0xBB2E,
-	3031:  0xBB2F,
-	3032:  0xBB30,
-	3033:  0xBB31,
-	3034:  0xBB32,
-	3035:  0xBB33,
-	3036:  0xBB37,
-	3037:  0xBB39,
-	3038:  0xBB3A,
-	3039:  0xBB3F,
-	3040:  0xBB40,
-	3041:  0xBB41,
-	3042:  0xBB42,
-	3043:  0xBB43,
-	3044:  0xBB46,
-	3045:  0xBB48,
-	3046:  0xBB4A,
-	3047:  0xBB4B,
-	3048:  0xBB4C,
-	3049:  0xBB4E,
-	3050:  0xBB51,
-	3051:  0xBB52,
-	3052:  0xBB53,
-	3053:  0xBB55,
-	3054:  0xBB56,
-	3055:  0xBB57,
-	3056:  0xBB59,
-	3057:  0xBB5A,
-	3058:  0xBB5B,
-	3059:  0xBB5C,
-	3060:  0xBB5D,
-	3061:  0xBB5E,
-	3062:  0xBB5F,
-	3063:  0xBB60,
-	3064:  0xBB62,
-	3065:  0xBB64,
-	3066:  0xBB65,
-	3067:  0xBB66,
-	3068:  0xBB67,
-	3069:  0xBB68,
-	3070:  0xBB69,
-	3071:  0xBB6A,
-	3072:  0xBB6B,
-	3073:  0xBB6D,
-	3074:  0xBB6E,
-	3075:  0xBB6F,
-	3076:  0xBB70,
-	3077:  0xBB71,
-	3078:  0xBB72,
-	3079:  0xBB73,
-	3080:  0xBB74,
-	3081:  0xBB75,
-	3082:  0xBB76,
-	3083:  0xBB77,
-	3084:  0xBB78,
-	3085:  0xBB79,
-	3086:  0xBB7A,
-	3087:  0xBB7B,
-	3088:  0xBB7C,
-	3089:  0xBB7D,
-	3090:  0xBB7E,
-	3091:  0xBB7F,
-	3092:  0xBB80,
-	3093:  0xBB81,
-	3094:  0xBB82,
-	3095:  0xBB83,
-	3096:  0xBB84,
-	3097:  0xBB85,
-	3098:  0xBB86,
-	3099:  0xBB87,
-	3100:  0xBB89,
-	3101:  0xBB8A,
-	3102:  0xBB8B,
-	3103:  0xBB8D,
-	3104:  0xBB8E,
-	3105:  0xBB8F,
-	3106:  0xBB91,
-	3107:  0xBB92,
-	3108:  0xBB93,
-	3109:  0xBB94,
-	3110:  0xBB95,
-	3111:  0xBB96,
-	3112:  0xBB97,
-	3113:  0xBB98,
-	3114:  0xBB99,
-	3115:  0xBB9A,
-	3116:  0xBB9B,
-	3117:  0xBB9C,
-	3118:  0xBB9D,
-	3119:  0xBB9E,
-	3120:  0xBB9F,
-	3121:  0xBBA0,
-	3122:  0xBBA1,
-	3123:  0xBBA2,
-	3124:  0xBBA3,
-	3125:  0xBBA5,
-	3126:  0xBBA6,
-	3127:  0xBBA7,
-	3128:  0xBBA9,
-	3129:  0xBBAA,
-	3130:  0xBBAB,
-	3131:  0xBBAD,
-	3132:  0xBBAE,
-	3133:  0xBBAF,
-	3134:  0xBBB0,
-	3135:  0xBBB1,
-	3136:  0xBBB2,
-	3137:  0xBBB3,
-	3138:  0xBBB5,
-	3139:  0xBBB6,
-	3140:  0xBBB8,
-	3141:  0xBBB9,
-	3142:  0xBBBA,
-	3143:  0xBBBB,
-	3144:  0xBBBC,
-	3145:  0xBBBD,
-	3146:  0xBBBE,
-	3147:  0xBBBF,
-	3148:  0xBBC1,
-	3149:  0xBBC2,
-	3150:  0xBBC3,
-	3151:  0xBBC5,
-	3152:  0xBBC6,
-	3153:  0xBBC7,
-	3154:  0xBBC9,
-	3155:  0xBBCA,
-	3156:  0xBBCB,
-	3157:  0xBBCC,
-	3158:  0xBBCD,
-	3159:  0xBBCE,
-	3160:  0xBBCF,
-	3161:  0xBBD1,
-	3162:  0xBBD2,
-	3163:  0xBBD4,
-	3164:  0xBBD5,
-	3165:  0xBBD6,
-	3166:  0xBBD7,
-	3167:  0xBBD8,
-	3168:  0xBBD9,
-	3169:  0xBBDA,
-	3170:  0xBBDB,
-	3171:  0xBBDC,
-	3172:  0xBBDD,
-	3173:  0xBBDE,
-	3174:  0xBBDF,
-	3175:  0xBBE0,
-	3176:  0xBBE1,
-	3177:  0xBBE2,
-	3178:  0xBBE3,
-	3179:  0xBBE4,
-	3180:  0xBBE5,
-	3181:  0xBBE6,
-	3182:  0xBBE7,
-	3183:  0xBBE8,
-	3184:  0xBBE9,
-	3185:  0xBBEA,
-	3186:  0xBBEB,
-	3187:  0xBBEC,
-	3188:  0xBBED,
-	3189:  0xBBEE,
-	3190:  0xBBEF,
-	3191:  0xBBF0,
-	3192:  0xBBF1,
-	3193:  0xBBF2,
-	3194:  0xBBF3,
-	3195:  0xBBF4,
-	3196:  0xBBF5,
-	3197:  0xBBF6,
-	3198:  0xBBF7,
-	3199:  0xBBFA,
-	3200:  0xBBFB,
-	3201:  0xBBFD,
-	3202:  0xBBFE,
-	3203:  0xBC01,
-	3204:  0xBC03,
-	3205:  0xBC04,
-	3206:  0xBC05,
-	3207:  0xBC06,
-	3208:  0xBC07,
-	3209:  0xBC0A,
-	3210:  0xBC0E,
-	3211:  0xBC10,
-	3212:  0xBC12,
-	3213:  0xBC13,
-	3214:  0xBC19,
-	3215:  0xBC1A,
-	3216:  0xBC20,
-	3217:  0xBC21,
-	3218:  0xBC22,
-	3219:  0xBC23,
-	3220:  0xBC26,
-	3221:  0xBC28,
-	3222:  0xBC2A,
-	3223:  0xBC2B,
-	3224:  0xBC2C,
-	3225:  0xBC2E,
-	3226:  0xBC2F,
-	3227:  0xBC32,
-	3228:  0xBC33,
-	3229:  0xBC35,
-	3230:  0xBC36,
-	3231:  0xBC37,
-	3232:  0xBC39,
-	3233:  0xBC3A,
-	3234:  0xBC3B,
-	3235:  0xBC3C,
-	3236:  0xBC3D,
-	3237:  0xBC3E,
-	3238:  0xBC3F,
-	3239:  0xBC42,
-	3240:  0xBC46,
-	3241:  0xBC47,
-	3242:  0xBC48,
-	3243:  0xBC4A,
-	3244:  0xBC4B,
-	3245:  0xBC4E,
-	3246:  0xBC4F,
-	3247:  0xBC51,
-	3248:  0xBC52,
-	3249:  0xBC53,
-	3250:  0xBC54,
-	3251:  0xBC55,
-	3252:  0xBC56,
-	3253:  0xBC57,
-	3254:  0xBC58,
-	3255:  0xBC59,
-	3256:  0xBC5A,
-	3257:  0xBC5B,
-	3258:  0xBC5C,
-	3259:  0xBC5E,
-	3260:  0xBC5F,
-	3261:  0xBC60,
-	3262:  0xBC61,
-	3263:  0xBC62,
-	3264:  0xBC63,
-	3265:  0xBC64,
-	3266:  0xBC65,
-	3267:  0xBC66,
-	3268:  0xBC67,
-	3269:  0xBC68,
-	3270:  0xBC69,
-	3271:  0xBC6A,
-	3272:  0xBC6B,
-	3273:  0xBC6C,
-	3274:  0xBC6D,
-	3275:  0xBC6E,
-	3276:  0xBC6F,
-	3277:  0xBC70,
-	3278:  0xBC71,
-	3279:  0xBC72,
-	3280:  0xBC73,
-	3281:  0xBC74,
-	3282:  0xBC75,
-	3283:  0xBC76,
-	3284:  0xBC77,
-	3285:  0xBC78,
-	3286:  0xBC79,
-	3287:  0xBC7A,
-	3288:  0xBC7B,
-	3289:  0xBC7C,
-	3290:  0xBC7D,
-	3291:  0xBC7E,
-	3292:  0xBC7F,
-	3293:  0xBC80,
-	3294:  0xBC81,
-	3295:  0xBC82,
-	3296:  0xBC83,
-	3297:  0xBC86,
-	3298:  0xBC87,
-	3299:  0xBC89,
-	3300:  0xBC8A,
-	3301:  0xBC8D,
-	3302:  0xBC8F,
-	3303:  0xBC90,
-	3304:  0xBC91,
-	3305:  0xBC92,
-	3306:  0xBC93,
-	3307:  0xBC96,
-	3308:  0xBC98,
-	3309:  0xBC9B,
-	3310:  0xBC9C,
-	3311:  0xBC9D,
-	3312:  0xBC9E,
-	3313:  0xBC9F,
-	3314:  0xBCA2,
-	3315:  0xBCA3,
-	3316:  0xBCA5,
-	3317:  0xBCA6,
-	3318:  0xBCA9,
-	3319:  0xBCAA,
-	3320:  0xBCAB,
-	3321:  0xBCAC,
-	3322:  0xBCAD,
-	3323:  0xBCAE,
-	3324:  0xBCAF,
-	3325:  0xBCB2,
-	3326:  0xBCB6,
-	3327:  0xBCB7,
-	3328:  0xBCB8,
-	3329:  0xBCB9,
-	3330:  0xBCBA,
-	3331:  0xBCBB,
-	3332:  0xBCBE,
-	3333:  0xBCBF,
-	3334:  0xBCC1,
-	3335:  0xBCC2,
-	3336:  0xBCC3,
-	3337:  0xBCC5,
-	3338:  0xBCC6,
-	3339:  0xBCC7,
-	3340:  0xBCC8,
-	3341:  0xBCC9,
-	3342:  0xBCCA,
-	3343:  0xBCCB,
-	3344:  0xBCCC,
-	3345:  0xBCCE,
-	3346:  0xBCD2,
-	3347:  0xBCD3,
-	3348:  0xBCD4,
-	3349:  0xBCD6,
-	3350:  0xBCD7,
-	3351:  0xBCD9,
-	3352:  0xBCDA,
-	3353:  0xBCDB,
-	3354:  0xBCDD,
-	3355:  0xBCDE,
-	3356:  0xBCDF,
-	3357:  0xBCE0,
-	3358:  0xBCE1,
-	3359:  0xBCE2,
-	3360:  0xBCE3,
-	3361:  0xBCE4,
-	3362:  0xBCE5,
-	3363:  0xBCE6,
-	3364:  0xBCE7,
-	3365:  0xBCE8,
-	3366:  0xBCE9,
-	3367:  0xBCEA,
-	3368:  0xBCEB,
-	3369:  0xBCEC,
-	3370:  0xBCED,
-	3371:  0xBCEE,
-	3372:  0xBCEF,
-	3373:  0xBCF0,
-	3374:  0xBCF1,
-	3375:  0xBCF2,
-	3376:  0xBCF3,
-	3377:  0xBCF7,
-	3378:  0xBCF9,
-	3379:  0xBCFA,
-	3380:  0xBCFB,
-	3381:  0xBCFD,
-	3382:  0xBCFE,
-	3383:  0xBCFF,
-	3384:  0xBD00,
-	3385:  0xBD01,
-	3386:  0xBD02,
-	3387:  0xBD03,
-	3388:  0xBD06,
-	3389:  0xBD08,
-	3390:  0xBD0A,
-	3391:  0xBD0B,
-	3392:  0xBD0C,
-	3393:  0xBD0D,
-	3394:  0xBD0E,
-	3395:  0xBD0F,
-	3396:  0xBD11,
-	3397:  0xBD12,
-	3398:  0xBD13,
-	3399:  0xBD15,
-	3400:  0xBD16,
-	3401:  0xBD17,
-	3402:  0xBD18,
-	3403:  0xBD19,
-	3404:  0xBD1A,
-	3405:  0xBD1B,
-	3406:  0xBD1C,
-	3407:  0xBD1D,
-	3408:  0xBD1E,
-	3409:  0xBD1F,
-	3410:  0xBD20,
-	3411:  0xBD21,
-	3412:  0xBD22,
-	3413:  0xBD23,
-	3414:  0xBD25,
-	3415:  0xBD26,
-	3416:  0xBD27,
-	3417:  0xBD28,
-	3418:  0xBD29,
-	3419:  0xBD2A,
-	3420:  0xBD2B,
-	3421:  0xBD2D,
-	3422:  0xBD2E,
-	3423:  0xBD2F,
-	3424:  0xBD30,
-	3425:  0xBD31,
-	3426:  0xBD32,
-	3427:  0xBD33,
-	3428:  0xBD34,
-	3429:  0xBD35,
-	3430:  0xBD36,
-	3431:  0xBD37,
-	3432:  0xBD38,
-	3433:  0xBD39,
-	3434:  0xBD3A,
-	3435:  0xBD3B,
-	3436:  0xBD3C,
-	3437:  0xBD3D,
-	3438:  0xBD3E,
-	3439:  0xBD3F,
-	3440:  0xBD41,
-	3441:  0xBD42,
-	3442:  0xBD43,
-	3443:  0xBD44,
-	3444:  0xBD45,
-	3445:  0xBD46,
-	3446:  0xBD47,
-	3447:  0xBD4A,
-	3448:  0xBD4B,
-	3449:  0xBD4D,
-	3450:  0xBD4E,
-	3451:  0xBD4F,
-	3452:  0xBD51,
-	3453:  0xBD52,
-	3454:  0xBD53,
-	3455:  0xBD54,
-	3456:  0xBD55,
-	3457:  0xBD56,
-	3458:  0xBD57,
-	3459:  0xBD5A,
-	3460:  0xBD5B,
-	3461:  0xBD5C,
-	3462:  0xBD5D,
-	3463:  0xBD5E,
-	3464:  0xBD5F,
-	3465:  0xBD60,
-	3466:  0xBD61,
-	3467:  0xBD62,
-	3468:  0xBD63,
-	3469:  0xBD65,
-	3470:  0xBD66,
-	3471:  0xBD67,
-	3472:  0xBD69,
-	3473:  0xBD6A,
-	3474:  0xBD6B,
-	3475:  0xBD6C,
-	3476:  0xBD6D,
-	3477:  0xBD6E,
-	3478:  0xBD6F,
-	3479:  0xBD70,
-	3480:  0xBD71,
-	3481:  0xBD72,
-	3482:  0xBD73,
-	3483:  0xBD74,
-	3484:  0xBD75,
-	3485:  0xBD76,
-	3486:  0xBD77,
-	3487:  0xBD78,
-	3488:  0xBD79,
-	3489:  0xBD7A,
-	3490:  0xBD7B,
-	3491:  0xBD7C,
-	3492:  0xBD7D,
-	3493:  0xBD7E,
-	3494:  0xBD7F,
-	3495:  0xBD82,
-	3496:  0xBD83,
-	3497:  0xBD85,
-	3498:  0xBD86,
-	3499:  0xBD8B,
-	3500:  0xBD8C,
-	3501:  0xBD8D,
-	3502:  0xBD8E,
-	3503:  0xBD8F,
-	3504:  0xBD92,
-	3505:  0xBD94,
-	3506:  0xBD96,
-	3507:  0xBD97,
-	3508:  0xBD98,
-	3509:  0xBD9B,
-	3510:  0xBD9D,
-	3511:  0xBD9E,
-	3512:  0xBD9F,
-	3513:  0xBDA0,
-	3514:  0xBDA1,
-	3515:  0xBDA2,
-	3516:  0xBDA3,
-	3517:  0xBDA5,
-	3518:  0xBDA6,
-	3519:  0xBDA7,
-	3520:  0xBDA8,
-	3521:  0xBDA9,
-	3522:  0xBDAA,
-	3523:  0xBDAB,
-	3524:  0xBDAC,
-	3525:  0xBDAD,
-	3526:  0xBDAE,
-	3527:  0xBDAF,
-	3528:  0xBDB1,
-	3529:  0xBDB2,
-	3530:  0xBDB3,
-	3531:  0xBDB4,
-	3532:  0xBDB5,
-	3533:  0xBDB6,
-	3534:  0xBDB7,
-	3535:  0xBDB9,
-	3536:  0xBDBA,
-	3537:  0xBDBB,
-	3538:  0xBDBC,
-	3539:  0xBDBD,
-	3540:  0xBDBE,
-	3541:  0xBDBF,
-	3542:  0xBDC0,
-	3543:  0xBDC1,
-	3544:  0xBDC2,
-	3545:  0xBDC3,
-	3546:  0xBDC4,
-	3547:  0xBDC5,
-	3548:  0xBDC6,
-	3549:  0xBDC7,
-	3550:  0xBDC8,
-	3551:  0xBDC9,
-	3552:  0xBDCA,
-	3553:  0xBDCB,
-	3554:  0xBDCC,
-	3555:  0xBDCD,
-	3556:  0xBDCE,
-	3557:  0xBDCF,
-	3558:  0xBDD0,
-	3559:  0xBDD1,
-	3560:  0xBDD2,
-	3561:  0xBDD3,
-	3562:  0xBDD6,
-	3563:  0xBDD7,
-	3564:  0xBDD9,
-	3565:  0xBDDA,
-	3566:  0xBDDB,
-	3567:  0xBDDD,
-	3568:  0xBDDE,
-	3569:  0xBDDF,
-	3570:  0xBDE0,
-	3571:  0xBDE1,
-	3572:  0xBDE2,
-	3573:  0xBDE3,
-	3574:  0xBDE4,
-	3575:  0xBDE5,
-	3576:  0xBDE6,
-	3577:  0xBDE7,
-	3578:  0xBDE8,
-	3579:  0xBDEA,
-	3580:  0xBDEB,
-	3581:  0xBDEC,
-	3582:  0xBDED,
-	3583:  0xBDEE,
-	3584:  0xBDEF,
-	3585:  0xBDF1,
-	3586:  0xBDF2,
-	3587:  0xBDF3,
-	3588:  0xBDF5,
-	3589:  0xBDF6,
-	3590:  0xBDF7,
-	3591:  0xBDF9,
-	3592:  0xBDFA,
-	3593:  0xBDFB,
-	3594:  0xBDFC,
-	3595:  0xBDFD,
-	3596:  0xBDFE,
-	3597:  0xBDFF,
-	3598:  0xBE01,
-	3599:  0xBE02,
-	3600:  0xBE04,
-	3601:  0xBE06,
-	3602:  0xBE07,
-	3603:  0xBE08,
-	3604:  0xBE09,
-	3605:  0xBE0A,
-	3606:  0xBE0B,
-	3607:  0xBE0E,
-	3608:  0xBE0F,
-	3609:  0xBE11,
-	3610:  0xBE12,
-	3611:  0xBE13,
-	3612:  0xBE15,
-	3613:  0xBE16,
-	3614:  0xBE17,
-	3615:  0xBE18,
-	3616:  0xBE19,
-	3617:  0xBE1A,
-	3618:  0xBE1B,
-	3619:  0xBE1E,
-	3620:  0xBE20,
-	3621:  0xBE21,
-	3622:  0xBE22,
-	3623:  0xBE23,
-	3624:  0xBE24,
-	3625:  0xBE25,
-	3626:  0xBE26,
-	3627:  0xBE27,
-	3628:  0xBE28,
-	3629:  0xBE29,
-	3630:  0xBE2A,
-	3631:  0xBE2B,
-	3632:  0xBE2C,
-	3633:  0xBE2D,
-	3634:  0xBE2E,
-	3635:  0xBE2F,
-	3636:  0xBE30,
-	3637:  0xBE31,
-	3638:  0xBE32,
-	3639:  0xBE33,
-	3640:  0xBE34,
-	3641:  0xBE35,
-	3642:  0xBE36,
-	3643:  0xBE37,
-	3644:  0xBE38,
-	3645:  0xBE39,
-	3646:  0xBE3A,
-	3647:  0xBE3B,
-	3648:  0xBE3C,
-	3649:  0xBE3D,
-	3650:  0xBE3E,
-	3651:  0xBE3F,
-	3652:  0xBE40,
-	3653:  0xBE41,
-	3654:  0xBE42,
-	3655:  0xBE43,
-	3656:  0xBE46,
-	3657:  0xBE47,
-	3658:  0xBE49,
-	3659:  0xBE4A,
-	3660:  0xBE4B,
-	3661:  0xBE4D,
-	3662:  0xBE4F,
-	3663:  0xBE50,
-	3664:  0xBE51,
-	3665:  0xBE52,
-	3666:  0xBE53,
-	3667:  0xBE56,
-	3668:  0xBE58,
-	3669:  0xBE5C,
-	3670:  0xBE5D,
-	3671:  0xBE5E,
-	3672:  0xBE5F,
-	3673:  0xBE62,
-	3674:  0xBE63,
-	3675:  0xBE65,
-	3676:  0xBE66,
-	3677:  0xBE67,
-	3678:  0xBE69,
-	3679:  0xBE6B,
-	3680:  0xBE6C,
-	3681:  0xBE6D,
-	3682:  0xBE6E,
-	3683:  0xBE6F,
-	3684:  0xBE72,
-	3685:  0xBE76,
-	3686:  0xBE77,
-	3687:  0xBE78,
-	3688:  0xBE79,
-	3689:  0xBE7A,
-	3690:  0xBE7E,
-	3691:  0xBE7F,
-	3692:  0xBE81,
-	3693:  0xBE82,
-	3694:  0xBE83,
-	3695:  0xBE85,
-	3696:  0xBE86,
-	3697:  0xBE87,
-	3698:  0xBE88,
-	3699:  0xBE89,
-	3700:  0xBE8A,
-	3701:  0xBE8B,
-	3702:  0xBE8E,
-	3703:  0xBE92,
-	3704:  0xBE93,
-	3705:  0xBE94,
-	3706:  0xBE95,
-	3707:  0xBE96,
-	3708:  0xBE97,
-	3709:  0xBE9A,
-	3710:  0xBE9B,
-	3711:  0xBE9C,
-	3712:  0xBE9D,
-	3713:  0xBE9E,
-	3714:  0xBE9F,
-	3715:  0xBEA0,
-	3716:  0xBEA1,
-	3717:  0xBEA2,
-	3718:  0xBEA3,
-	3719:  0xBEA4,
-	3720:  0xBEA5,
-	3721:  0xBEA6,
-	3722:  0xBEA7,
-	3723:  0xBEA9,
-	3724:  0xBEAA,
-	3725:  0xBEAB,
-	3726:  0xBEAC,
-	3727:  0xBEAD,
-	3728:  0xBEAE,
-	3729:  0xBEAF,
-	3730:  0xBEB0,
-	3731:  0xBEB1,
-	3732:  0xBEB2,
-	3733:  0xBEB3,
-	3734:  0xBEB4,
-	3735:  0xBEB5,
-	3736:  0xBEB6,
-	3737:  0xBEB7,
-	3738:  0xBEB8,
-	3739:  0xBEB9,
-	3740:  0xBEBA,
-	3741:  0xBEBB,
-	3742:  0xBEBC,
-	3743:  0xBEBD,
-	3744:  0xBEBE,
-	3745:  0xBEBF,
-	3746:  0xBEC0,
-	3747:  0xBEC1,
-	3748:  0xBEC2,
-	3749:  0xBEC3,
-	3750:  0xBEC4,
-	3751:  0xBEC5,
-	3752:  0xBEC6,
-	3753:  0xBEC7,
-	3754:  0xBEC8,
-	3755:  0xBEC9,
-	3756:  0xBECA,
-	3757:  0xBECB,
-	3758:  0xBECC,
-	3759:  0xBECD,
-	3760:  0xBECE,
-	3761:  0xBECF,
-	3762:  0xBED2,
-	3763:  0xBED3,
-	3764:  0xBED5,
-	3765:  0xBED6,
-	3766:  0xBED9,
-	3767:  0xBEDA,
-	3768:  0xBEDB,
-	3769:  0xBEDC,
-	3770:  0xBEDD,
-	3771:  0xBEDE,
-	3772:  0xBEDF,
-	3773:  0xBEE1,
-	3774:  0xBEE2,
-	3775:  0xBEE6,
-	3776:  0xBEE7,
-	3777:  0xBEE8,
-	3778:  0xBEE9,
-	3779:  0xBEEA,
-	3780:  0xBEEB,
-	3781:  0xBEED,
-	3782:  0xBEEE,
-	3783:  0xBEEF,
-	3784:  0xBEF0,
-	3785:  0xBEF1,
-	3786:  0xBEF2,
-	3787:  0xBEF3,
-	3788:  0xBEF4,
-	3789:  0xBEF5,
-	3790:  0xBEF6,
-	3791:  0xBEF7,
-	3792:  0xBEF8,
-	3793:  0xBEF9,
-	3794:  0xBEFA,
-	3795:  0xBEFB,
-	3796:  0xBEFC,
-	3797:  0xBEFD,
-	3798:  0xBEFE,
-	3799:  0xBEFF,
-	3800:  0xBF00,
-	3801:  0xBF02,
-	3802:  0xBF03,
-	3803:  0xBF04,
-	3804:  0xBF05,
-	3805:  0xBF06,
-	3806:  0xBF07,
-	3807:  0xBF0A,
-	3808:  0xBF0B,
-	3809:  0xBF0C,
-	3810:  0xBF0D,
-	3811:  0xBF0E,
-	3812:  0xBF0F,
-	3813:  0xBF10,
-	3814:  0xBF11,
-	3815:  0xBF12,
-	3816:  0xBF13,
-	3817:  0xBF14,
-	3818:  0xBF15,
-	3819:  0xBF16,
-	3820:  0xBF17,
-	3821:  0xBF1A,
-	3822:  0xBF1E,
-	3823:  0xBF1F,
-	3824:  0xBF20,
-	3825:  0xBF21,
-	3826:  0xBF22,
-	3827:  0xBF23,
-	3828:  0xBF24,
-	3829:  0xBF25,
-	3830:  0xBF26,
-	3831:  0xBF27,
-	3832:  0xBF28,
-	3833:  0xBF29,
-	3834:  0xBF2A,
-	3835:  0xBF2B,
-	3836:  0xBF2C,
-	3837:  0xBF2D,
-	3838:  0xBF2E,
-	3839:  0xBF2F,
-	3840:  0xBF30,
-	3841:  0xBF31,
-	3842:  0xBF32,
-	3843:  0xBF33,
-	3844:  0xBF34,
-	3845:  0xBF35,
-	3846:  0xBF36,
-	3847:  0xBF37,
-	3848:  0xBF38,
-	3849:  0xBF39,
-	3850:  0xBF3A,
-	3851:  0xBF3B,
-	3852:  0xBF3C,
-	3853:  0xBF3D,
-	3854:  0xBF3E,
-	3855:  0xBF3F,
-	3856:  0xBF42,
-	3857:  0xBF43,
-	3858:  0xBF45,
-	3859:  0xBF46,
-	3860:  0xBF47,
-	3861:  0xBF49,
-	3862:  0xBF4A,
-	3863:  0xBF4B,
-	3864:  0xBF4C,
-	3865:  0xBF4D,
-	3866:  0xBF4E,
-	3867:  0xBF4F,
-	3868:  0xBF52,
-	3869:  0xBF53,
-	3870:  0xBF54,
-	3871:  0xBF56,
-	3872:  0xBF57,
-	3873:  0xBF58,
-	3874:  0xBF59,
-	3875:  0xBF5A,
-	3876:  0xBF5B,
-	3877:  0xBF5C,
-	3878:  0xBF5D,
-	3879:  0xBF5E,
-	3880:  0xBF5F,
-	3881:  0xBF60,
-	3882:  0xBF61,
-	3883:  0xBF62,
-	3884:  0xBF63,
-	3885:  0xBF64,
-	3886:  0xBF65,
-	3887:  0xBF66,
-	3888:  0xBF67,
-	3889:  0xBF68,
-	3890:  0xBF69,
-	3891:  0xBF6A,
-	3892:  0xBF6B,
-	3893:  0xBF6C,
-	3894:  0xBF6D,
-	3895:  0xBF6E,
-	3896:  0xBF6F,
-	3897:  0xBF70,
-	3898:  0xBF71,
-	3899:  0xBF72,
-	3900:  0xBF73,
-	3901:  0xBF74,
-	3902:  0xBF75,
-	3903:  0xBF76,
-	3904:  0xBF77,
-	3905:  0xBF78,
-	3906:  0xBF79,
-	3907:  0xBF7A,
-	3908:  0xBF7B,
-	3909:  0xBF7C,
-	3910:  0xBF7D,
-	3911:  0xBF7E,
-	3912:  0xBF7F,
-	3913:  0xBF80,
-	3914:  0xBF81,
-	3915:  0xBF82,
-	3916:  0xBF83,
-	3917:  0xBF84,
-	3918:  0xBF85,
-	3919:  0xBF86,
-	3920:  0xBF87,
-	3921:  0xBF88,
-	3922:  0xBF89,
-	3923:  0xBF8A,
-	3924:  0xBF8B,
-	3925:  0xBF8C,
-	3926:  0xBF8D,
-	3927:  0xBF8E,
-	3928:  0xBF8F,
-	3929:  0xBF90,
-	3930:  0xBF91,
-	3931:  0xBF92,
-	3932:  0xBF93,
-	3933:  0xBF95,
-	3934:  0xBF96,
-	3935:  0xBF97,
-	3936:  0xBF98,
-	3937:  0xBF99,
-	3938:  0xBF9A,
-	3939:  0xBF9B,
-	3940:  0xBF9C,
-	3941:  0xBF9D,
-	3942:  0xBF9E,
-	3943:  0xBF9F,
-	3944:  0xBFA0,
-	3945:  0xBFA1,
-	3946:  0xBFA2,
-	3947:  0xBFA3,
-	3948:  0xBFA4,
-	3949:  0xBFA5,
-	3950:  0xBFA6,
-	3951:  0xBFA7,
-	3952:  0xBFA8,
-	3953:  0xBFA9,
-	3954:  0xBFAA,
-	3955:  0xBFAB,
-	3956:  0xBFAC,
-	3957:  0xBFAD,
-	3958:  0xBFAE,
-	3959:  0xBFAF,
-	3960:  0xBFB1,
-	3961:  0xBFB2,
-	3962:  0xBFB3,
-	3963:  0xBFB4,
-	3964:  0xBFB5,
-	3965:  0xBFB6,
-	3966:  0xBFB7,
-	3967:  0xBFB8,
-	3968:  0xBFB9,
-	3969:  0xBFBA,
-	3970:  0xBFBB,
-	3971:  0xBFBC,
-	3972:  0xBFBD,
-	3973:  0xBFBE,
-	3974:  0xBFBF,
-	3975:  0xBFC0,
-	3976:  0xBFC1,
-	3977:  0xBFC2,
-	3978:  0xBFC3,
-	3979:  0xBFC4,
-	3980:  0xBFC6,
-	3981:  0xBFC7,
-	3982:  0xBFC8,
-	3983:  0xBFC9,
-	3984:  0xBFCA,
-	3985:  0xBFCB,
-	3986:  0xBFCE,
-	3987:  0xBFCF,
-	3988:  0xBFD1,
-	3989:  0xBFD2,
-	3990:  0xBFD3,
-	3991:  0xBFD5,
-	3992:  0xBFD6,
-	3993:  0xBFD7,
-	3994:  0xBFD8,
-	3995:  0xBFD9,
-	3996:  0xBFDA,
-	3997:  0xBFDB,
-	3998:  0xBFDD,
-	3999:  0xBFDE,
-	4000:  0xBFE0,
-	4001:  0xBFE2,
-	4002:  0xBFE3,
-	4003:  0xBFE4,
-	4004:  0xBFE5,
-	4005:  0xBFE6,
-	4006:  0xBFE7,
-	4007:  0xBFE8,
-	4008:  0xBFE9,
-	4009:  0xBFEA,
-	4010:  0xBFEB,
-	4011:  0xBFEC,
-	4012:  0xBFED,
-	4013:  0xBFEE,
-	4014:  0xBFEF,
-	4015:  0xBFF0,
-	4016:  0xBFF1,
-	4017:  0xBFF2,
-	4018:  0xBFF3,
-	4019:  0xBFF4,
-	4020:  0xBFF5,
-	4021:  0xBFF6,
-	4022:  0xBFF7,
-	4023:  0xBFF8,
-	4024:  0xBFF9,
-	4025:  0xBFFA,
-	4026:  0xBFFB,
-	4027:  0xBFFC,
-	4028:  0xBFFD,
-	4029:  0xBFFE,
-	4030:  0xBFFF,
-	4031:  0xC000,
-	4032:  0xC001,
-	4033:  0xC002,
-	4034:  0xC003,
-	4035:  0xC004,
-	4036:  0xC005,
-	4037:  0xC006,
-	4038:  0xC007,
-	4039:  0xC008,
-	4040:  0xC009,
-	4041:  0xC00A,
-	4042:  0xC00B,
-	4043:  0xC00C,
-	4044:  0xC00D,
-	4045:  0xC00E,
-	4046:  0xC00F,
-	4047:  0xC010,
-	4048:  0xC011,
-	4049:  0xC012,
-	4050:  0xC013,
-	4051:  0xC014,
-	4052:  0xC015,
-	4053:  0xC016,
-	4054:  0xC017,
-	4055:  0xC018,
-	4056:  0xC019,
-	4057:  0xC01A,
-	4058:  0xC01B,
-	4059:  0xC01C,
-	4060:  0xC01D,
-	4061:  0xC01E,
-	4062:  0xC01F,
-	4063:  0xC020,
-	4064:  0xC021,
-	4065:  0xC022,
-	4066:  0xC023,
-	4067:  0xC024,
-	4068:  0xC025,
-	4069:  0xC026,
-	4070:  0xC027,
-	4071:  0xC028,
-	4072:  0xC029,
-	4073:  0xC02A,
-	4074:  0xC02B,
-	4075:  0xC02C,
-	4076:  0xC02D,
-	4077:  0xC02E,
-	4078:  0xC02F,
-	4079:  0xC030,
-	4080:  0xC031,
-	4081:  0xC032,
-	4082:  0xC033,
-	4083:  0xC034,
-	4084:  0xC035,
-	4085:  0xC036,
-	4086:  0xC037,
-	4087:  0xC038,
-	4088:  0xC039,
-	4089:  0xC03A,
-	4090:  0xC03B,
-	4091:  0xC03D,
-	4092:  0xC03E,
-	4093:  0xC03F,
-	4094:  0xC040,
-	4095:  0xC041,
-	4096:  0xC042,
-	4097:  0xC043,
-	4098:  0xC044,
-	4099:  0xC045,
-	4100:  0xC046,
-	4101:  0xC047,
-	4102:  0xC048,
-	4103:  0xC049,
-	4104:  0xC04A,
-	4105:  0xC04B,
-	4106:  0xC04C,
-	4107:  0xC04D,
-	4108:  0xC04E,
-	4109:  0xC04F,
-	4110:  0xC050,
-	4111:  0xC052,
-	4112:  0xC053,
-	4113:  0xC054,
-	4114:  0xC055,
-	4115:  0xC056,
-	4116:  0xC057,
-	4117:  0xC059,
-	4118:  0xC05A,
-	4119:  0xC05B,
-	4120:  0xC05D,
-	4121:  0xC05E,
-	4122:  0xC05F,
-	4123:  0xC061,
-	4124:  0xC062,
-	4125:  0xC063,
-	4126:  0xC064,
-	4127:  0xC065,
-	4128:  0xC066,
-	4129:  0xC067,
-	4130:  0xC06A,
-	4131:  0xC06B,
-	4132:  0xC06C,
-	4133:  0xC06D,
-	4134:  0xC06E,
-	4135:  0xC06F,
-	4136:  0xC070,
-	4137:  0xC071,
-	4138:  0xC072,
-	4139:  0xC073,
-	4140:  0xC074,
-	4141:  0xC075,
-	4142:  0xC076,
-	4143:  0xC077,
-	4144:  0xC078,
-	4145:  0xC079,
-	4146:  0xC07A,
-	4147:  0xC07B,
-	4148:  0xC07C,
-	4149:  0xC07D,
-	4150:  0xC07E,
-	4151:  0xC07F,
-	4152:  0xC080,
-	4153:  0xC081,
-	4154:  0xC082,
-	4155:  0xC083,
-	4156:  0xC084,
-	4157:  0xC085,
-	4158:  0xC086,
-	4159:  0xC087,
-	4160:  0xC088,
-	4161:  0xC089,
-	4162:  0xC08A,
-	4163:  0xC08B,
-	4164:  0xC08C,
-	4165:  0xC08D,
-	4166:  0xC08E,
-	4167:  0xC08F,
-	4168:  0xC092,
-	4169:  0xC093,
-	4170:  0xC095,
-	4171:  0xC096,
-	4172:  0xC097,
-	4173:  0xC099,
-	4174:  0xC09A,
-	4175:  0xC09B,
-	4176:  0xC09C,
-	4177:  0xC09D,
-	4178:  0xC09E,
-	4179:  0xC09F,
-	4180:  0xC0A2,
-	4181:  0xC0A4,
-	4182:  0xC0A6,
-	4183:  0xC0A7,
-	4184:  0xC0A8,
-	4185:  0xC0A9,
-	4186:  0xC0AA,
-	4187:  0xC0AB,
-	4188:  0xC0AE,
-	4189:  0xC0B1,
-	4190:  0xC0B2,
-	4191:  0xC0B7,
-	4192:  0xC0B8,
-	4193:  0xC0B9,
-	4194:  0xC0BA,
-	4195:  0xC0BB,
-	4196:  0xC0BE,
-	4197:  0xC0C2,
-	4198:  0xC0C3,
-	4199:  0xC0C4,
-	4200:  0xC0C6,
-	4201:  0xC0C7,
-	4202:  0xC0CA,
-	4203:  0xC0CB,
-	4204:  0xC0CD,
-	4205:  0xC0CE,
-	4206:  0xC0CF,
-	4207:  0xC0D1,
-	4208:  0xC0D2,
-	4209:  0xC0D3,
-	4210:  0xC0D4,
-	4211:  0xC0D5,
-	4212:  0xC0D6,
-	4213:  0xC0D7,
-	4214:  0xC0DA,
-	4215:  0xC0DE,
-	4216:  0xC0DF,
-	4217:  0xC0E0,
-	4218:  0xC0E1,
-	4219:  0xC0E2,
-	4220:  0xC0E3,
-	4221:  0xC0E6,
-	4222:  0xC0E7,
-	4223:  0xC0E9,
-	4224:  0xC0EA,
-	4225:  0xC0EB,
-	4226:  0xC0ED,
-	4227:  0xC0EE,
-	4228:  0xC0EF,
-	4229:  0xC0F0,
-	4230:  0xC0F1,
-	4231:  0xC0F2,
-	4232:  0xC0F3,
-	4233:  0xC0F6,
-	4234:  0xC0F8,
-	4235:  0xC0FA,
-	4236:  0xC0FB,
-	4237:  0xC0FC,
-	4238:  0xC0FD,
-	4239:  0xC0FE,
-	4240:  0xC0FF,
-	4241:  0xC101,
-	4242:  0xC102,
-	4243:  0xC103,
-	4244:  0xC105,
-	4245:  0xC106,
-	4246:  0xC107,
-	4247:  0xC109,
-	4248:  0xC10A,
-	4249:  0xC10B,
-	4250:  0xC10C,
-	4251:  0xC10D,
-	4252:  0xC10E,
-	4253:  0xC10F,
-	4254:  0xC111,
-	4255:  0xC112,
-	4256:  0xC113,
-	4257:  0xC114,
-	4258:  0xC116,
-	4259:  0xC117,
-	4260:  0xC118,
-	4261:  0xC119,
-	4262:  0xC11A,
-	4263:  0xC11B,
-	4264:  0xC121,
-	4265:  0xC122,
-	4266:  0xC125,
-	4267:  0xC128,
-	4268:  0xC129,
-	4269:  0xC12A,
-	4270:  0xC12B,
-	4271:  0xC12E,
-	4272:  0xC132,
-	4273:  0xC133,
-	4274:  0xC134,
-	4275:  0xC135,
-	4276:  0xC137,
-	4277:  0xC13A,
-	4278:  0xC13B,
-	4279:  0xC13D,
-	4280:  0xC13E,
-	4281:  0xC13F,
-	4282:  0xC141,
-	4283:  0xC142,
-	4284:  0xC143,
-	4285:  0xC144,
-	4286:  0xC145,
-	4287:  0xC146,
-	4288:  0xC147,
-	4289:  0xC14A,
-	4290:  0xC14E,
-	4291:  0xC14F,
-	4292:  0xC150,
-	4293:  0xC151,
-	4294:  0xC152,
-	4295:  0xC153,
-	4296:  0xC156,
-	4297:  0xC157,
-	4298:  0xC159,
-	4299:  0xC15A,
-	4300:  0xC15B,
-	4301:  0xC15D,
-	4302:  0xC15E,
-	4303:  0xC15F,
-	4304:  0xC160,
-	4305:  0xC161,
-	4306:  0xC162,
-	4307:  0xC163,
-	4308:  0xC166,
-	4309:  0xC16A,
-	4310:  0xC16B,
-	4311:  0xC16C,
-	4312:  0xC16D,
-	4313:  0xC16E,
-	4314:  0xC16F,
-	4315:  0xC171,
-	4316:  0xC172,
-	4317:  0xC173,
-	4318:  0xC175,
-	4319:  0xC176,
-	4320:  0xC177,
-	4321:  0xC179,
-	4322:  0xC17A,
-	4323:  0xC17B,
-	4324:  0xC17C,
-	4325:  0xC17D,
-	4326:  0xC17E,
-	4327:  0xC17F,
-	4328:  0xC180,
-	4329:  0xC181,
-	4330:  0xC182,
-	4331:  0xC183,
-	4332:  0xC184,
-	4333:  0xC186,
-	4334:  0xC187,
-	4335:  0xC188,
-	4336:  0xC189,
-	4337:  0xC18A,
-	4338:  0xC18B,
-	4339:  0xC18F,
-	4340:  0xC191,
-	4341:  0xC192,
-	4342:  0xC193,
-	4343:  0xC195,
-	4344:  0xC197,
-	4345:  0xC198,
-	4346:  0xC199,
-	4347:  0xC19A,
-	4348:  0xC19B,
-	4349:  0xC19E,
-	4350:  0xC1A0,
-	4351:  0xC1A2,
-	4352:  0xC1A3,
-	4353:  0xC1A4,
-	4354:  0xC1A6,
-	4355:  0xC1A7,
-	4356:  0xC1AA,
-	4357:  0xC1AB,
-	4358:  0xC1AD,
-	4359:  0xC1AE,
-	4360:  0xC1AF,
-	4361:  0xC1B1,
-	4362:  0xC1B2,
-	4363:  0xC1B3,
-	4364:  0xC1B4,
-	4365:  0xC1B5,
-	4366:  0xC1B6,
-	4367:  0xC1B7,
-	4368:  0xC1B8,
-	4369:  0xC1B9,
-	4370:  0xC1BA,
-	4371:  0xC1BB,
-	4372:  0xC1BC,
-	4373:  0xC1BE,
-	4374:  0xC1BF,
-	4375:  0xC1C0,
-	4376:  0xC1C1,
-	4377:  0xC1C2,
-	4378:  0xC1C3,
-	4379:  0xC1C5,
-	4380:  0xC1C6,
-	4381:  0xC1C7,
-	4382:  0xC1C9,
-	4383:  0xC1CA,
-	4384:  0xC1CB,
-	4385:  0xC1CD,
-	4386:  0xC1CE,
-	4387:  0xC1CF,
-	4388:  0xC1D0,
-	4389:  0xC1D1,
-	4390:  0xC1D2,
-	4391:  0xC1D3,
-	4392:  0xC1D5,
-	4393:  0xC1D6,
-	4394:  0xC1D9,
-	4395:  0xC1DA,
-	4396:  0xC1DB,
-	4397:  0xC1DC,
-	4398:  0xC1DD,
-	4399:  0xC1DE,
-	4400:  0xC1DF,
-	4401:  0xC1E1,
-	4402:  0xC1E2,
-	4403:  0xC1E3,
-	4404:  0xC1E5,
-	4405:  0xC1E6,
-	4406:  0xC1E7,
-	4407:  0xC1E9,
-	4408:  0xC1EA,
-	4409:  0xC1EB,
-	4410:  0xC1EC,
-	4411:  0xC1ED,
-	4412:  0xC1EE,
-	4413:  0xC1EF,
-	4414:  0xC1F2,
-	4415:  0xC1F4,
-	4416:  0xC1F5,
-	4417:  0xC1F6,
-	4418:  0xC1F7,
-	4419:  0xC1F8,
-	4420:  0xC1F9,
-	4421:  0xC1FA,
-	4422:  0xC1FB,
-	4423:  0xC1FE,
-	4424:  0xC1FF,
-	4425:  0xC201,
-	4426:  0xC202,
-	4427:  0xC203,
-	4428:  0xC205,
-	4429:  0xC206,
-	4430:  0xC207,
-	4431:  0xC208,
-	4432:  0xC209,
-	4433:  0xC20A,
-	4434:  0xC20B,
-	4435:  0xC20E,
-	4436:  0xC210,
-	4437:  0xC212,
-	4438:  0xC213,
-	4439:  0xC214,
-	4440:  0xC215,
-	4441:  0xC216,
-	4442:  0xC217,
-	4443:  0xC21A,
-	4444:  0xC21B,
-	4445:  0xC21D,
-	4446:  0xC21E,
-	4447:  0xC221,
-	4448:  0xC222,
-	4449:  0xC223,
-	4450:  0xC224,
-	4451:  0xC225,
-	4452:  0xC226,
-	4453:  0xC227,
-	4454:  0xC22A,
-	4455:  0xC22C,
-	4456:  0xC22E,
-	4457:  0xC230,
-	4458:  0xC233,
-	4459:  0xC235,
-	4460:  0xC236,
-	4461:  0xC237,
-	4462:  0xC238,
-	4463:  0xC239,
-	4464:  0xC23A,
-	4465:  0xC23B,
-	4466:  0xC23C,
-	4467:  0xC23D,
-	4468:  0xC23E,
-	4469:  0xC23F,
-	4470:  0xC240,
-	4471:  0xC241,
-	4472:  0xC242,
-	4473:  0xC243,
-	4474:  0xC244,
-	4475:  0xC245,
-	4476:  0xC246,
-	4477:  0xC247,
-	4478:  0xC249,
-	4479:  0xC24A,
-	4480:  0xC24B,
-	4481:  0xC24C,
-	4482:  0xC24D,
-	4483:  0xC24E,
-	4484:  0xC24F,
-	4485:  0xC252,
-	4486:  0xC253,
-	4487:  0xC255,
-	4488:  0xC256,
-	4489:  0xC257,
-	4490:  0xC259,
-	4491:  0xC25A,
-	4492:  0xC25B,
-	4493:  0xC25C,
-	4494:  0xC25D,
-	4495:  0xC25E,
-	4496:  0xC25F,
-	4497:  0xC261,
-	4498:  0xC262,
-	4499:  0xC263,
-	4500:  0xC264,
-	4501:  0xC266,
-	4502:  0xC267,
-	4503:  0xC268,
-	4504:  0xC269,
-	4505:  0xC26A,
-	4506:  0xC26B,
-	4507:  0xC26E,
-	4508:  0xC26F,
-	4509:  0xC271,
-	4510:  0xC272,
-	4511:  0xC273,
-	4512:  0xC275,
-	4513:  0xC276,
-	4514:  0xC277,
-	4515:  0xC278,
-	4516:  0xC279,
-	4517:  0xC27A,
-	4518:  0xC27B,
-	4519:  0xC27E,
-	4520:  0xC280,
-	4521:  0xC282,
-	4522:  0xC283,
-	4523:  0xC284,
-	4524:  0xC285,
-	4525:  0xC286,
-	4526:  0xC287,
-	4527:  0xC28A,
-	4528:  0xC28B,
-	4529:  0xC28C,
-	4530:  0xC28D,
-	4531:  0xC28E,
-	4532:  0xC28F,
-	4533:  0xC291,
-	4534:  0xC292,
-	4535:  0xC293,
-	4536:  0xC294,
-	4537:  0xC295,
-	4538:  0xC296,
-	4539:  0xC297,
-	4540:  0xC299,
-	4541:  0xC29A,
-	4542:  0xC29C,
-	4543:  0xC29E,
-	4544:  0xC29F,
-	4545:  0xC2A0,
-	4546:  0xC2A1,
-	4547:  0xC2A2,
-	4548:  0xC2A3,
-	4549:  0xC2A6,
-	4550:  0xC2A7,
-	4551:  0xC2A9,
-	4552:  0xC2AA,
-	4553:  0xC2AB,
-	4554:  0xC2AE,
-	4555:  0xC2AF,
-	4556:  0xC2B0,
-	4557:  0xC2B1,
-	4558:  0xC2B2,
-	4559:  0xC2B3,
-	4560:  0xC2B6,
-	4561:  0xC2B8,
-	4562:  0xC2BA,
-	4563:  0xC2BB,
-	4564:  0xC2BC,
-	4565:  0xC2BD,
-	4566:  0xC2BE,
-	4567:  0xC2BF,
-	4568:  0xC2C0,
-	4569:  0xC2C1,
-	4570:  0xC2C2,
-	4571:  0xC2C3,
-	4572:  0xC2C4,
-	4573:  0xC2C5,
-	4574:  0xC2C6,
-	4575:  0xC2C7,
-	4576:  0xC2C8,
-	4577:  0xC2C9,
-	4578:  0xC2CA,
-	4579:  0xC2CB,
-	4580:  0xC2CC,
-	4581:  0xC2CD,
-	4582:  0xC2CE,
-	4583:  0xC2CF,
-	4584:  0xC2D0,
-	4585:  0xC2D1,
-	4586:  0xC2D2,
-	4587:  0xC2D3,
-	4588:  0xC2D4,
-	4589:  0xC2D5,
-	4590:  0xC2D6,
-	4591:  0xC2D7,
-	4592:  0xC2D8,
-	4593:  0xC2D9,
-	4594:  0xC2DA,
-	4595:  0xC2DB,
-	4596:  0xC2DE,
-	4597:  0xC2DF,
-	4598:  0xC2E1,
-	4599:  0xC2E2,
-	4600:  0xC2E5,
-	4601:  0xC2E6,
-	4602:  0xC2E7,
-	4603:  0xC2E8,
-	4604:  0xC2E9,
-	4605:  0xC2EA,
-	4606:  0xC2EE,
-	4607:  0xC2F0,
-	4608:  0xC2F2,
-	4609:  0xC2F3,
-	4610:  0xC2F4,
-	4611:  0xC2F5,
-	4612:  0xC2F7,
-	4613:  0xC2FA,
-	4614:  0xC2FD,
-	4615:  0xC2FE,
-	4616:  0xC2FF,
-	4617:  0xC301,
-	4618:  0xC302,
-	4619:  0xC303,
-	4620:  0xC304,
-	4621:  0xC305,
-	4622:  0xC306,
-	4623:  0xC307,
-	4624:  0xC30A,
-	4625:  0xC30B,
-	4626:  0xC30E,
-	4627:  0xC30F,
-	4628:  0xC310,
-	4629:  0xC311,
-	4630:  0xC312,
-	4631:  0xC316,
-	4632:  0xC317,
-	4633:  0xC319,
-	4634:  0xC31A,
-	4635:  0xC31B,
-	4636:  0xC31D,
-	4637:  0xC31E,
-	4638:  0xC31F,
-	4639:  0xC320,
-	4640:  0xC321,
-	4641:  0xC322,
-	4642:  0xC323,
-	4643:  0xC326,
-	4644:  0xC327,
-	4645:  0xC32A,
-	4646:  0xC32B,
-	4647:  0xC32C,
-	4648:  0xC32D,
-	4649:  0xC32E,
-	4650:  0xC32F,
-	4651:  0xC330,
-	4652:  0xC331,
-	4653:  0xC332,
-	4654:  0xC333,
-	4655:  0xC334,
-	4656:  0xC335,
-	4657:  0xC336,
-	4658:  0xC337,
-	4659:  0xC338,
-	4660:  0xC339,
-	4661:  0xC33A,
-	4662:  0xC33B,
-	4663:  0xC33C,
-	4664:  0xC33D,
-	4665:  0xC33E,
-	4666:  0xC33F,
-	4667:  0xC340,
-	4668:  0xC341,
-	4669:  0xC342,
-	4670:  0xC343,
-	4671:  0xC344,
-	4672:  0xC346,
-	4673:  0xC347,
-	4674:  0xC348,
-	4675:  0xC349,
-	4676:  0xC34A,
-	4677:  0xC34B,
-	4678:  0xC34C,
-	4679:  0xC34D,
-	4680:  0xC34E,
-	4681:  0xC34F,
-	4682:  0xC350,
-	4683:  0xC351,
-	4684:  0xC352,
-	4685:  0xC353,
-	4686:  0xC354,
-	4687:  0xC355,
-	4688:  0xC356,
-	4689:  0xC357,
-	4690:  0xC358,
-	4691:  0xC359,
-	4692:  0xC35A,
-	4693:  0xC35B,
-	4694:  0xC35C,
-	4695:  0xC35D,
-	4696:  0xC35E,
-	4697:  0xC35F,
-	4698:  0xC360,
-	4699:  0xC361,
-	4700:  0xC362,
-	4701:  0xC363,
-	4702:  0xC364,
-	4703:  0xC365,
-	4704:  0xC366,
-	4705:  0xC367,
-	4706:  0xC36A,
-	4707:  0xC36B,
-	4708:  0xC36D,
-	4709:  0xC36E,
-	4710:  0xC36F,
-	4711:  0xC371,
-	4712:  0xC373,
-	4713:  0xC374,
-	4714:  0xC375,
-	4715:  0xC376,
-	4716:  0xC377,
-	4717:  0xC37A,
-	4718:  0xC37B,
-	4719:  0xC37E,
-	4720:  0xC37F,
-	4721:  0xC380,
-	4722:  0xC381,
-	4723:  0xC382,
-	4724:  0xC383,
-	4725:  0xC385,
-	4726:  0xC386,
-	4727:  0xC387,
-	4728:  0xC389,
-	4729:  0xC38A,
-	4730:  0xC38B,
-	4731:  0xC38D,
-	4732:  0xC38E,
-	4733:  0xC38F,
-	4734:  0xC390,
-	4735:  0xC391,
-	4736:  0xC392,
-	4737:  0xC393,
-	4738:  0xC394,
-	4739:  0xC395,
-	4740:  0xC396,
-	4741:  0xC397,
-	4742:  0xC398,
-	4743:  0xC399,
-	4744:  0xC39A,
-	4745:  0xC39B,
-	4746:  0xC39C,
-	4747:  0xC39D,
-	4748:  0xC39E,
-	4749:  0xC39F,
-	4750:  0xC3A0,
-	4751:  0xC3A1,
-	4752:  0xC3A2,
-	4753:  0xC3A3,
-	4754:  0xC3A4,
-	4755:  0xC3A5,
-	4756:  0xC3A6,
-	4757:  0xC3A7,
-	4758:  0xC3A8,
-	4759:  0xC3A9,
-	4760:  0xC3AA,
-	4761:  0xC3AB,
-	4762:  0xC3AC,
-	4763:  0xC3AD,
-	4764:  0xC3AE,
-	4765:  0xC3AF,
-	4766:  0xC3B0,
-	4767:  0xC3B1,
-	4768:  0xC3B2,
-	4769:  0xC3B3,
-	4770:  0xC3B4,
-	4771:  0xC3B5,
-	4772:  0xC3B6,
-	4773:  0xC3B7,
-	4774:  0xC3B8,
-	4775:  0xC3B9,
-	4776:  0xC3BA,
-	4777:  0xC3BB,
-	4778:  0xC3BC,
-	4779:  0xC3BD,
-	4780:  0xC3BE,
-	4781:  0xC3BF,
-	4782:  0xC3C1,
-	4783:  0xC3C2,
-	4784:  0xC3C3,
-	4785:  0xC3C4,
-	4786:  0xC3C5,
-	4787:  0xC3C6,
-	4788:  0xC3C7,
-	4789:  0xC3C8,
-	4790:  0xC3C9,
-	4791:  0xC3CA,
-	4792:  0xC3CB,
-	4793:  0xC3CC,
-	4794:  0xC3CD,
-	4795:  0xC3CE,
-	4796:  0xC3CF,
-	4797:  0xC3D0,
-	4798:  0xC3D1,
-	4799:  0xC3D2,
-	4800:  0xC3D3,
-	4801:  0xC3D4,
-	4802:  0xC3D5,
-	4803:  0xC3D6,
-	4804:  0xC3D7,
-	4805:  0xC3DA,
-	4806:  0xC3DB,
-	4807:  0xC3DD,
-	4808:  0xC3DE,
-	4809:  0xC3E1,
-	4810:  0xC3E3,
-	4811:  0xC3E4,
-	4812:  0xC3E5,
-	4813:  0xC3E6,
-	4814:  0xC3E7,
-	4815:  0xC3EA,
-	4816:  0xC3EB,
-	4817:  0xC3EC,
-	4818:  0xC3EE,
-	4819:  0xC3EF,
-	4820:  0xC3F0,
-	4821:  0xC3F1,
-	4822:  0xC3F2,
-	4823:  0xC3F3,
-	4824:  0xC3F6,
-	4825:  0xC3F7,
-	4826:  0xC3F9,
-	4827:  0xC3FA,
-	4828:  0xC3FB,
-	4829:  0xC3FC,
-	4830:  0xC3FD,
-	4831:  0xC3FE,
-	4832:  0xC3FF,
-	4833:  0xC400,
-	4834:  0xC401,
-	4835:  0xC402,
-	4836:  0xC403,
-	4837:  0xC404,
-	4838:  0xC405,
-	4839:  0xC406,
-	4840:  0xC407,
-	4841:  0xC409,
-	4842:  0xC40A,
-	4843:  0xC40B,
-	4844:  0xC40C,
-	4845:  0xC40D,
-	4846:  0xC40E,
-	4847:  0xC40F,
-	4848:  0xC411,
-	4849:  0xC412,
-	4850:  0xC413,
-	4851:  0xC414,
-	4852:  0xC415,
-	4853:  0xC416,
-	4854:  0xC417,
-	4855:  0xC418,
-	4856:  0xC419,
-	4857:  0xC41A,
-	4858:  0xC41B,
-	4859:  0xC41C,
-	4860:  0xC41D,
-	4861:  0xC41E,
-	4862:  0xC41F,
-	4863:  0xC420,
-	4864:  0xC421,
-	4865:  0xC422,
-	4866:  0xC423,
-	4867:  0xC425,
-	4868:  0xC426,
-	4869:  0xC427,
-	4870:  0xC428,
-	4871:  0xC429,
-	4872:  0xC42A,
-	4873:  0xC42B,
-	4874:  0xC42D,
-	4875:  0xC42E,
-	4876:  0xC42F,
-	4877:  0xC431,
-	4878:  0xC432,
-	4879:  0xC433,
-	4880:  0xC435,
-	4881:  0xC436,
-	4882:  0xC437,
-	4883:  0xC438,
-	4884:  0xC439,
-	4885:  0xC43A,
-	4886:  0xC43B,
-	4887:  0xC43E,
-	4888:  0xC43F,
-	4889:  0xC440,
-	4890:  0xC441,
-	4891:  0xC442,
-	4892:  0xC443,
-	4893:  0xC444,
-	4894:  0xC445,
-	4895:  0xC446,
-	4896:  0xC447,
-	4897:  0xC449,
-	4898:  0xC44A,
-	4899:  0xC44B,
-	4900:  0xC44C,
-	4901:  0xC44D,
-	4902:  0xC44E,
-	4903:  0xC44F,
-	4904:  0xC450,
-	4905:  0xC451,
-	4906:  0xC452,
-	4907:  0xC453,
-	4908:  0xC454,
-	4909:  0xC455,
-	4910:  0xC456,
-	4911:  0xC457,
-	4912:  0xC458,
-	4913:  0xC459,
-	4914:  0xC45A,
-	4915:  0xC45B,
-	4916:  0xC45C,
-	4917:  0xC45D,
-	4918:  0xC45E,
-	4919:  0xC45F,
-	4920:  0xC460,
-	4921:  0xC461,
-	4922:  0xC462,
-	4923:  0xC463,
-	4924:  0xC466,
-	4925:  0xC467,
-	4926:  0xC469,
-	4927:  0xC46A,
-	4928:  0xC46B,
-	4929:  0xC46D,
-	4930:  0xC46E,
-	4931:  0xC46F,
-	4932:  0xC470,
-	4933:  0xC471,
-	4934:  0xC472,
-	4935:  0xC473,
-	4936:  0xC476,
-	4937:  0xC477,
-	4938:  0xC478,
-	4939:  0xC47A,
-	4940:  0xC47B,
-	4941:  0xC47C,
-	4942:  0xC47D,
-	4943:  0xC47E,
-	4944:  0xC47F,
-	4945:  0xC481,
-	4946:  0xC482,
-	4947:  0xC483,
-	4948:  0xC484,
-	4949:  0xC485,
-	4950:  0xC486,
-	4951:  0xC487,
-	4952:  0xC488,
-	4953:  0xC489,
-	4954:  0xC48A,
-	4955:  0xC48B,
-	4956:  0xC48C,
-	4957:  0xC48D,
-	4958:  0xC48E,
-	4959:  0xC48F,
-	4960:  0xC490,
-	4961:  0xC491,
-	4962:  0xC492,
-	4963:  0xC493,
-	4964:  0xC495,
-	4965:  0xC496,
-	4966:  0xC497,
-	4967:  0xC498,
-	4968:  0xC499,
-	4969:  0xC49A,
-	4970:  0xC49B,
-	4971:  0xC49D,
-	4972:  0xC49E,
-	4973:  0xC49F,
-	4974:  0xC4A0,
-	4975:  0xC4A1,
-	4976:  0xC4A2,
-	4977:  0xC4A3,
-	4978:  0xC4A4,
-	4979:  0xC4A5,
-	4980:  0xC4A6,
-	4981:  0xC4A7,
-	4982:  0xC4A8,
-	4983:  0xC4A9,
-	4984:  0xC4AA,
-	4985:  0xC4AB,
-	4986:  0xC4AC,
-	4987:  0xC4AD,
-	4988:  0xC4AE,
-	4989:  0xC4AF,
-	4990:  0xC4B0,
-	4991:  0xC4B1,
-	4992:  0xC4B2,
-	4993:  0xC4B3,
-	4994:  0xC4B4,
-	4995:  0xC4B5,
-	4996:  0xC4B6,
-	4997:  0xC4B7,
-	4998:  0xC4B9,
-	4999:  0xC4BA,
-	5000:  0xC4BB,
-	5001:  0xC4BD,
-	5002:  0xC4BE,
-	5003:  0xC4BF,
-	5004:  0xC4C0,
-	5005:  0xC4C1,
-	5006:  0xC4C2,
-	5007:  0xC4C3,
-	5008:  0xC4C4,
-	5009:  0xC4C5,
-	5010:  0xC4C6,
-	5011:  0xC4C7,
-	5012:  0xC4C8,
-	5013:  0xC4C9,
-	5014:  0xC4CA,
-	5015:  0xC4CB,
-	5016:  0xC4CC,
-	5017:  0xC4CD,
-	5018:  0xC4CE,
-	5019:  0xC4CF,
-	5020:  0xC4D0,
-	5021:  0xC4D1,
-	5022:  0xC4D2,
-	5023:  0xC4D3,
-	5024:  0xC4D4,
-	5025:  0xC4D5,
-	5026:  0xC4D6,
-	5027:  0xC4D7,
-	5028:  0xC4D8,
-	5029:  0xC4D9,
-	5030:  0xC4DA,
-	5031:  0xC4DB,
-	5032:  0xC4DC,
-	5033:  0xC4DD,
-	5034:  0xC4DE,
-	5035:  0xC4DF,
-	5036:  0xC4E0,
-	5037:  0xC4E1,
-	5038:  0xC4E2,
-	5039:  0xC4E3,
-	5040:  0xC4E4,
-	5041:  0xC4E5,
-	5042:  0xC4E6,
-	5043:  0xC4E7,
-	5044:  0xC4E8,
-	5045:  0xC4EA,
-	5046:  0xC4EB,
-	5047:  0xC4EC,
-	5048:  0xC4ED,
-	5049:  0xC4EE,
-	5050:  0xC4EF,
-	5051:  0xC4F2,
-	5052:  0xC4F3,
-	5053:  0xC4F5,
-	5054:  0xC4F6,
-	5055:  0xC4F7,
-	5056:  0xC4F9,
-	5057:  0xC4FB,
-	5058:  0xC4FC,
-	5059:  0xC4FD,
-	5060:  0xC4FE,
-	5061:  0xC502,
-	5062:  0xC503,
-	5063:  0xC504,
-	5064:  0xC505,
-	5065:  0xC506,
-	5066:  0xC507,
-	5067:  0xC508,
-	5068:  0xC509,
-	5069:  0xC50A,
-	5070:  0xC50B,
-	5071:  0xC50D,
-	5072:  0xC50E,
-	5073:  0xC50F,
-	5074:  0xC511,
-	5075:  0xC512,
-	5076:  0xC513,
-	5077:  0xC515,
-	5078:  0xC516,
-	5079:  0xC517,
-	5080:  0xC518,
-	5081:  0xC519,
-	5082:  0xC51A,
-	5083:  0xC51B,
-	5084:  0xC51D,
-	5085:  0xC51E,
-	5086:  0xC51F,
-	5087:  0xC520,
-	5088:  0xC521,
-	5089:  0xC522,
-	5090:  0xC523,
-	5091:  0xC524,
-	5092:  0xC525,
-	5093:  0xC526,
-	5094:  0xC527,
-	5095:  0xC52A,
-	5096:  0xC52B,
-	5097:  0xC52D,
-	5098:  0xC52E,
-	5099:  0xC52F,
-	5100:  0xC531,
-	5101:  0xC532,
-	5102:  0xC533,
-	5103:  0xC534,
-	5104:  0xC535,
-	5105:  0xC536,
-	5106:  0xC537,
-	5107:  0xC53A,
-	5108:  0xC53C,
-	5109:  0xC53E,
-	5110:  0xC53F,
-	5111:  0xC540,
-	5112:  0xC541,
-	5113:  0xC542,
-	5114:  0xC543,
-	5115:  0xC546,
-	5116:  0xC547,
-	5117:  0xC54B,
-	5118:  0xC54F,
-	5119:  0xC550,
-	5120:  0xC551,
-	5121:  0xC552,
-	5122:  0xC556,
-	5123:  0xC55A,
-	5124:  0xC55B,
-	5125:  0xC55C,
-	5126:  0xC55F,
-	5127:  0xC562,
-	5128:  0xC563,
-	5129:  0xC565,
-	5130:  0xC566,
-	5131:  0xC567,
-	5132:  0xC569,
-	5133:  0xC56A,
-	5134:  0xC56B,
-	5135:  0xC56C,
-	5136:  0xC56D,
-	5137:  0xC56E,
-	5138:  0xC56F,
-	5139:  0xC572,
-	5140:  0xC576,
-	5141:  0xC577,
-	5142:  0xC578,
-	5143:  0xC579,
-	5144:  0xC57A,
-	5145:  0xC57B,
-	5146:  0xC57E,
-	5147:  0xC57F,
-	5148:  0xC581,
-	5149:  0xC582,
-	5150:  0xC583,
-	5151:  0xC585,
-	5152:  0xC586,
-	5153:  0xC588,
-	5154:  0xC589,
-	5155:  0xC58A,
-	5156:  0xC58B,
-	5157:  0xC58E,
-	5158:  0xC590,
-	5159:  0xC592,
-	5160:  0xC593,
-	5161:  0xC594,
-	5162:  0xC596,
-	5163:  0xC599,
-	5164:  0xC59A,
-	5165:  0xC59B,
-	5166:  0xC59D,
-	5167:  0xC59E,
-	5168:  0xC59F,
-	5169:  0xC5A1,
-	5170:  0xC5A2,
-	5171:  0xC5A3,
-	5172:  0xC5A4,
-	5173:  0xC5A5,
-	5174:  0xC5A6,
-	5175:  0xC5A7,
-	5176:  0xC5A8,
-	5177:  0xC5AA,
-	5178:  0xC5AB,
-	5179:  0xC5AC,
-	5180:  0xC5AD,
-	5181:  0xC5AE,
-	5182:  0xC5AF,
-	5183:  0xC5B0,
-	5184:  0xC5B1,
-	5185:  0xC5B2,
-	5186:  0xC5B3,
-	5187:  0xC5B6,
-	5188:  0xC5B7,
-	5189:  0xC5BA,
-	5190:  0xC5BF,
-	5191:  0xC5C0,
-	5192:  0xC5C1,
-	5193:  0xC5C2,
-	5194:  0xC5C3,
-	5195:  0xC5CB,
-	5196:  0xC5CD,
-	5197:  0xC5CF,
-	5198:  0xC5D2,
-	5199:  0xC5D3,
-	5200:  0xC5D5,
-	5201:  0xC5D6,
-	5202:  0xC5D7,
-	5203:  0xC5D9,
-	5204:  0xC5DA,
-	5205:  0xC5DB,
-	5206:  0xC5DC,
-	5207:  0xC5DD,
-	5208:  0xC5DE,
-	5209:  0xC5DF,
-	5210:  0xC5E2,
-	5211:  0xC5E4,
-	5212:  0xC5E6,
-	5213:  0xC5E7,
-	5214:  0xC5E8,
-	5215:  0xC5E9,
-	5216:  0xC5EA,
-	5217:  0xC5EB,
-	5218:  0xC5EF,
-	5219:  0xC5F1,
-	5220:  0xC5F2,
-	5221:  0xC5F3,
-	5222:  0xC5F5,
-	5223:  0xC5F8,
-	5224:  0xC5F9,
-	5225:  0xC5FA,
-	5226:  0xC5FB,
-	5227:  0xC602,
-	5228:  0xC603,
-	5229:  0xC604,
-	5230:  0xC609,
-	5231:  0xC60A,
-	5232:  0xC60B,
-	5233:  0xC60D,
-	5234:  0xC60E,
-	5235:  0xC60F,
-	5236:  0xC611,
-	5237:  0xC612,
-	5238:  0xC613,
-	5239:  0xC614,
-	5240:  0xC615,
-	5241:  0xC616,
-	5242:  0xC617,
-	5243:  0xC61A,
-	5244:  0xC61D,
-	5245:  0xC61E,
-	5246:  0xC61F,
-	5247:  0xC620,
-	5248:  0xC621,
-	5249:  0xC622,
-	5250:  0xC623,
-	5251:  0xC626,
-	5252:  0xC627,
-	5253:  0xC629,
-	5254:  0xC62A,
-	5255:  0xC62B,
-	5256:  0xC62F,
-	5257:  0xC631,
-	5258:  0xC632,
-	5259:  0xC636,
-	5260:  0xC638,
-	5261:  0xC63A,
-	5262:  0xC63C,
-	5263:  0xC63D,
-	5264:  0xC63E,
-	5265:  0xC63F,
-	5266:  0xC642,
-	5267:  0xC643,
-	5268:  0xC645,
-	5269:  0xC646,
-	5270:  0xC647,
-	5271:  0xC649,
-	5272:  0xC64A,
-	5273:  0xC64B,
-	5274:  0xC64C,
-	5275:  0xC64D,
-	5276:  0xC64E,
-	5277:  0xC64F,
-	5278:  0xC652,
-	5279:  0xC656,
-	5280:  0xC657,
-	5281:  0xC658,
-	5282:  0xC659,
-	5283:  0xC65A,
-	5284:  0xC65B,
-	5285:  0xC65E,
-	5286:  0xC65F,
-	5287:  0xC661,
-	5288:  0xC662,
-	5289:  0xC663,
-	5290:  0xC664,
-	5291:  0xC665,
-	5292:  0xC666,
-	5293:  0xC667,
-	5294:  0xC668,
-	5295:  0xC669,
-	5296:  0xC66A,
-	5297:  0xC66B,
-	5298:  0xC66D,
-	5299:  0xC66E,
-	5300:  0xC670,
-	5301:  0xC672,
-	5302:  0xC673,
-	5303:  0xC674,
-	5304:  0xC675,
-	5305:  0xC676,
-	5306:  0xC677,
-	5307:  0xC67A,
-	5308:  0xC67B,
-	5309:  0xC67D,
-	5310:  0xC67E,
-	5311:  0xC67F,
-	5312:  0xC681,
-	5313:  0xC682,
-	5314:  0xC683,
-	5315:  0xC684,
-	5316:  0xC685,
-	5317:  0xC686,
-	5318:  0xC687,
-	5319:  0xC68A,
-	5320:  0xC68C,
-	5321:  0xC68E,
-	5322:  0xC68F,
-	5323:  0xC690,
-	5324:  0xC691,
-	5325:  0xC692,
-	5326:  0xC693,
-	5327:  0xC696,
-	5328:  0xC697,
-	5329:  0xC699,
-	5330:  0xC69A,
-	5331:  0xC69B,
-	5332:  0xC69D,
-	5333:  0xC69E,
-	5334:  0xC69F,
-	5335:  0xC6A0,
-	5336:  0xC6A1,
-	5337:  0xC6A2,
-	5338:  0xC6A3,
-	5339:  0xC6A6,
-	5340:  0xC6A8,
-	5341:  0xC6AA,
-	5342:  0xC6AB,
-	5343:  0xC6AC,
-	5344:  0xC6AD,
-	5345:  0xC6AE,
-	5346:  0xC6AF,
-	5347:  0xC6B2,
-	5348:  0xC6B3,
-	5349:  0xC6B5,
-	5350:  0xC6B6,
-	5351:  0xC6B7,
-	5352:  0xC6BB,
-	5353:  0xC6BC,
-	5354:  0xC6BD,
-	5355:  0xC6BE,
-	5356:  0xC6BF,
-	5357:  0xC6C2,
-	5358:  0xC6C4,
-	5359:  0xC6C6,
-	5360:  0xC6C7,
-	5361:  0xC6C8,
-	5362:  0xC6C9,
-	5363:  0xC6CA,
-	5364:  0xC6CB,
-	5365:  0xC6CE,
-	5366:  0xC6CF,
-	5367:  0xC6D1,
-	5368:  0xC6D2,
-	5369:  0xC6D3,
-	5370:  0xC6D5,
-	5371:  0xC6D6,
-	5372:  0xC6D7,
-	5373:  0xC6D8,
-	5374:  0xC6D9,
-	5375:  0xC6DA,
-	5376:  0xC6DB,
-	5377:  0xC6DE,
-	5378:  0xC6DF,
-	5379:  0xC6E2,
-	5380:  0xC6E3,
-	5381:  0xC6E4,
-	5382:  0xC6E5,
-	5383:  0xC6E6,
-	5384:  0xC6E7,
-	5385:  0xC6EA,
-	5386:  0xC6EB,
-	5387:  0xC6ED,
-	5388:  0xC6EE,
-	5389:  0xC6EF,
-	5390:  0xC6F1,
-	5391:  0xC6F2,
-	5392:  0xC6F3,
-	5393:  0xC6F4,
-	5394:  0xC6F5,
-	5395:  0xC6F6,
-	5396:  0xC6F7,
-	5397:  0xC6FA,
-	5398:  0xC6FB,
-	5399:  0xC6FC,
-	5400:  0xC6FE,
-	5401:  0xC6FF,
-	5402:  0xC700,
-	5403:  0xC701,
-	5404:  0xC702,
-	5405:  0xC703,
-	5406:  0xC706,
-	5407:  0xC707,
-	5408:  0xC709,
-	5409:  0xC70A,
-	5410:  0xC70B,
-	5411:  0xC70D,
-	5412:  0xC70E,
-	5413:  0xC70F,
-	5414:  0xC710,
-	5415:  0xC711,
-	5416:  0xC712,
-	5417:  0xC713,
-	5418:  0xC716,
-	5419:  0xC718,
-	5420:  0xC71A,
-	5421:  0xC71B,
-	5422:  0xC71C,
-	5423:  0xC71D,
-	5424:  0xC71E,
-	5425:  0xC71F,
-	5426:  0xC722,
-	5427:  0xC723,
-	5428:  0xC725,
-	5429:  0xC726,
-	5430:  0xC727,
-	5431:  0xC729,
-	5432:  0xC72A,
-	5433:  0xC72B,
-	5434:  0xC72C,
-	5435:  0xC72D,
-	5436:  0xC72E,
-	5437:  0xC72F,
-	5438:  0xC732,
-	5439:  0xC734,
-	5440:  0xC736,
-	5441:  0xC738,
-	5442:  0xC739,
-	5443:  0xC73A,
-	5444:  0xC73B,
-	5445:  0xC73E,
-	5446:  0xC73F,
-	5447:  0xC741,
-	5448:  0xC742,
-	5449:  0xC743,
-	5450:  0xC745,
-	5451:  0xC746,
-	5452:  0xC747,
-	5453:  0xC748,
-	5454:  0xC749,
-	5455:  0xC74B,
-	5456:  0xC74E,
-	5457:  0xC750,
-	5458:  0xC759,
-	5459:  0xC75A,
-	5460:  0xC75B,
-	5461:  0xC75D,
-	5462:  0xC75E,
-	5463:  0xC75F,
-	5464:  0xC761,
-	5465:  0xC762,
-	5466:  0xC763,
-	5467:  0xC764,
-	5468:  0xC765,
-	5469:  0xC766,
-	5470:  0xC767,
-	5471:  0xC769,
-	5472:  0xC76A,
-	5473:  0xC76C,
-	5474:  0xC76D,
-	5475:  0xC76E,
-	5476:  0xC76F,
-	5477:  0xC770,
-	5478:  0xC771,
-	5479:  0xC772,
-	5480:  0xC773,
-	5481:  0xC776,
-	5482:  0xC777,
-	5483:  0xC779,
-	5484:  0xC77A,
-	5485:  0xC77B,
-	5486:  0xC77F,
-	5487:  0xC780,
-	5488:  0xC781,
-	5489:  0xC782,
-	5490:  0xC786,
-	5491:  0xC78B,
-	5492:  0xC78C,
-	5493:  0xC78D,
-	5494:  0xC78F,
-	5495:  0xC792,
-	5496:  0xC793,
-	5497:  0xC795,
-	5498:  0xC799,
-	5499:  0xC79B,
-	5500:  0xC79C,
-	5501:  0xC79D,
-	5502:  0xC79E,
-	5503:  0xC79F,
-	5504:  0xC7A2,
-	5505:  0xC7A7,
-	5506:  0xC7A8,
-	5507:  0xC7A9,
-	5508:  0xC7AA,
-	5509:  0xC7AB,
-	5510:  0xC7AE,
-	5511:  0xC7AF,
-	5512:  0xC7B1,
-	5513:  0xC7B2,
-	5514:  0xC7B3,
-	5515:  0xC7B5,
-	5516:  0xC7B6,
-	5517:  0xC7B7,
-	5518:  0xC7B8,
-	5519:  0xC7B9,
-	5520:  0xC7BA,
-	5521:  0xC7BB,
-	5522:  0xC7BE,
-	5523:  0xC7C2,
-	5524:  0xC7C3,
-	5525:  0xC7C4,
-	5526:  0xC7C5,
-	5527:  0xC7C6,
-	5528:  0xC7C7,
-	5529:  0xC7CA,
-	5530:  0xC7CB,
-	5531:  0xC7CD,
-	5532:  0xC7CF,
-	5533:  0xC7D1,
-	5534:  0xC7D2,
-	5535:  0xC7D3,
-	5536:  0xC7D4,
-	5537:  0xC7D5,
-	5538:  0xC7D6,
-	5539:  0xC7D7,
-	5540:  0xC7D9,
-	5541:  0xC7DA,
-	5542:  0xC7DB,
-	5543:  0xC7DC,
-	5544:  0xC7DE,
-	5545:  0xC7DF,
-	5546:  0xC7E0,
-	5547:  0xC7E1,
-	5548:  0xC7E2,
-	5549:  0xC7E3,
-	5550:  0xC7E5,
-	5551:  0xC7E6,
-	5552:  0xC7E7,
-	5553:  0xC7E9,
-	5554:  0xC7EA,
-	5555:  0xC7EB,
-	5556:  0xC7ED,
-	5557:  0xC7EE,
-	5558:  0xC7EF,
-	5559:  0xC7F0,
-	5560:  0xC7F1,
-	5561:  0xC7F2,
-	5562:  0xC7F3,
-	5563:  0xC7F4,
-	5564:  0xC7F5,
-	5565:  0xC7F6,
-	5566:  0xC7F7,
-	5567:  0xC7F8,
-	5568:  0xC7F9,
-	5569:  0xC7FA,
-	5570:  0xC7FB,
-	5571:  0xC7FC,
-	5572:  0xC7FD,
-	5573:  0xC7FE,
-	5574:  0xC7FF,
-	5575:  0xC802,
-	5576:  0xC803,
-	5577:  0xC805,
-	5578:  0xC806,
-	5579:  0xC807,
-	5580:  0xC809,
-	5581:  0xC80B,
-	5582:  0xC80C,
-	5583:  0xC80D,
-	5584:  0xC80E,
-	5585:  0xC80F,
-	5586:  0xC812,
-	5587:  0xC814,
-	5588:  0xC817,
-	5589:  0xC818,
-	5590:  0xC819,
-	5591:  0xC81A,
-	5592:  0xC81B,
-	5593:  0xC81E,
-	5594:  0xC81F,
-	5595:  0xC821,
-	5596:  0xC822,
-	5597:  0xC823,
-	5598:  0xC825,
-	5599:  0xC826,
-	5600:  0xC827,
-	5601:  0xC828,
-	5602:  0xC829,
-	5603:  0xC82A,
-	5604:  0xC82B,
-	5605:  0xC82E,
-	5606:  0xC830,
-	5607:  0xC832,
-	5608:  0xC833,
-	5609:  0xC834,
-	5610:  0xC835,
-	5611:  0xC836,
-	5612:  0xC837,
-	5613:  0xC839,
-	5614:  0xC83A,
-	5615:  0xC83B,
-	5616:  0xC83D,
-	5617:  0xC83E,
-	5618:  0xC83F,
-	5619:  0xC841,
-	5620:  0xC842,
-	5621:  0xC843,
-	5622:  0xC844,
-	5623:  0xC845,
-	5624:  0xC846,
-	5625:  0xC847,
-	5626:  0xC84A,
-	5627:  0xC84B,
-	5628:  0xC84E,
-	5629:  0xC84F,
-	5630:  0xC850,
-	5631:  0xC851,
-	5632:  0xC852,
-	5633:  0xC853,
-	5634:  0xC855,
-	5635:  0xC856,
-	5636:  0xC857,
-	5637:  0xC858,
-	5638:  0xC859,
-	5639:  0xC85A,
-	5640:  0xC85B,
-	5641:  0xC85C,
-	5642:  0xC85D,
-	5643:  0xC85E,
-	5644:  0xC85F,
-	5645:  0xC860,
-	5646:  0xC861,
-	5647:  0xC862,
-	5648:  0xC863,
-	5649:  0xC864,
-	5650:  0xC865,
-	5651:  0xC866,
-	5652:  0xC867,
-	5653:  0xC868,
-	5654:  0xC869,
-	5655:  0xC86A,
-	5656:  0xC86B,
-	5657:  0xC86C,
-	5658:  0xC86D,
-	5659:  0xC86E,
-	5660:  0xC86F,
-	5661:  0xC872,
-	5662:  0xC873,
-	5663:  0xC875,
-	5664:  0xC876,
-	5665:  0xC877,
-	5666:  0xC879,
-	5667:  0xC87B,
-	5668:  0xC87C,
-	5669:  0xC87D,
-	5670:  0xC87E,
-	5671:  0xC87F,
-	5672:  0xC882,
-	5673:  0xC884,
-	5674:  0xC888,
-	5675:  0xC889,
-	5676:  0xC88A,
-	5677:  0xC88E,
-	5678:  0xC88F,
-	5679:  0xC890,
-	5680:  0xC891,
-	5681:  0xC892,
-	5682:  0xC893,
-	5683:  0xC895,
-	5684:  0xC896,
-	5685:  0xC897,
-	5686:  0xC898,
-	5687:  0xC899,
-	5688:  0xC89A,
-	5689:  0xC89B,
-	5690:  0xC89C,
-	5691:  0xC89E,
-	5692:  0xC8A0,
-	5693:  0xC8A2,
-	5694:  0xC8A3,
-	5695:  0xC8A4,
-	5696:  0xC8A5,
-	5697:  0xC8A6,
-	5698:  0xC8A7,
-	5699:  0xC8A9,
-	5700:  0xC8AA,
-	5701:  0xC8AB,
-	5702:  0xC8AC,
-	5703:  0xC8AD,
-	5704:  0xC8AE,
-	5705:  0xC8AF,
-	5706:  0xC8B0,
-	5707:  0xC8B1,
-	5708:  0xC8B2,
-	5709:  0xC8B3,
-	5710:  0xC8B4,
-	5711:  0xC8B5,
-	5712:  0xC8B6,
-	5713:  0xC8B7,
-	5714:  0xC8B8,
-	5715:  0xC8B9,
-	5716:  0xC8BA,
-	5717:  0xC8BB,
-	5718:  0xC8BE,
-	5719:  0xC8BF,
-	5720:  0xC8C0,
-	5721:  0xC8C1,
-	5722:  0xC8C2,
-	5723:  0xC8C3,
-	5724:  0xC8C5,
-	5725:  0xC8C6,
-	5726:  0xC8C7,
-	5727:  0xC8C9,
-	5728:  0xC8CA,
-	5729:  0xC8CB,
-	5730:  0xC8CD,
-	5731:  0xC8CE,
-	5732:  0xC8CF,
-	5733:  0xC8D0,
-	5734:  0xC8D1,
-	5735:  0xC8D2,
-	5736:  0xC8D3,
-	5737:  0xC8D6,
-	5738:  0xC8D8,
-	5739:  0xC8DA,
-	5740:  0xC8DB,
-	5741:  0xC8DC,
-	5742:  0xC8DD,
-	5743:  0xC8DE,
-	5744:  0xC8DF,
-	5745:  0xC8E2,
-	5746:  0xC8E3,
-	5747:  0xC8E5,
-	5748:  0xC8E6,
-	5749:  0xC8E7,
-	5750:  0xC8E8,
-	5751:  0xC8E9,
-	5752:  0xC8EA,
-	5753:  0xC8EB,
-	5754:  0xC8EC,
-	5755:  0xC8ED,
-	5756:  0xC8EE,
-	5757:  0xC8EF,
-	5758:  0xC8F0,
-	5759:  0xC8F1,
-	5760:  0xC8F2,
-	5761:  0xC8F3,
-	5762:  0xC8F4,
-	5763:  0xC8F6,
-	5764:  0xC8F7,
-	5765:  0xC8F8,
-	5766:  0xC8F9,
-	5767:  0xC8FA,
-	5768:  0xC8FB,
-	5769:  0xC8FE,
-	5770:  0xC8FF,
-	5771:  0xC901,
-	5772:  0xC902,
-	5773:  0xC903,
-	5774:  0xC907,
-	5775:  0xC908,
-	5776:  0xC909,
-	5777:  0xC90A,
-	5778:  0xC90B,
-	5779:  0xC90E,
-	5780:  0x3000,
-	5781:  0x3001,
-	5782:  0x3002,
-	5783:  0x00B7,
-	5784:  0x2025,
-	5785:  0x2026,
-	5786:  0x00A8,
-	5787:  0x3003,
-	5788:  0x00AD,
-	5789:  0x2015,
-	5790:  0x2225,
-	5791:  0xFF3C,
-	5792:  0x223C,
-	5793:  0x2018,
-	5794:  0x2019,
-	5795:  0x201C,
-	5796:  0x201D,
-	5797:  0x3014,
-	5798:  0x3015,
-	5799:  0x3008,
-	5800:  0x3009,
-	5801:  0x300A,
-	5802:  0x300B,
-	5803:  0x300C,
-	5804:  0x300D,
-	5805:  0x300E,
-	5806:  0x300F,
-	5807:  0x3010,
-	5808:  0x3011,
-	5809:  0x00B1,
-	5810:  0x00D7,
-	5811:  0x00F7,
-	5812:  0x2260,
-	5813:  0x2264,
-	5814:  0x2265,
-	5815:  0x221E,
-	5816:  0x2234,
-	5817:  0x00B0,
-	5818:  0x2032,
-	5819:  0x2033,
-	5820:  0x2103,
-	5821:  0x212B,
-	5822:  0xFFE0,
-	5823:  0xFFE1,
-	5824:  0xFFE5,
-	5825:  0x2642,
-	5826:  0x2640,
-	5827:  0x2220,
-	5828:  0x22A5,
-	5829:  0x2312,
-	5830:  0x2202,
-	5831:  0x2207,
-	5832:  0x2261,
-	5833:  0x2252,
-	5834:  0x00A7,
-	5835:  0x203B,
-	5836:  0x2606,
-	5837:  0x2605,
-	5838:  0x25CB,
-	5839:  0x25CF,
-	5840:  0x25CE,
-	5841:  0x25C7,
-	5842:  0x25C6,
-	5843:  0x25A1,
-	5844:  0x25A0,
-	5845:  0x25B3,
-	5846:  0x25B2,
-	5847:  0x25BD,
-	5848:  0x25BC,
-	5849:  0x2192,
-	5850:  0x2190,
-	5851:  0x2191,
-	5852:  0x2193,
-	5853:  0x2194,
-	5854:  0x3013,
-	5855:  0x226A,
-	5856:  0x226B,
-	5857:  0x221A,
-	5858:  0x223D,
-	5859:  0x221D,
-	5860:  0x2235,
-	5861:  0x222B,
-	5862:  0x222C,
-	5863:  0x2208,
-	5864:  0x220B,
-	5865:  0x2286,
-	5866:  0x2287,
-	5867:  0x2282,
-	5868:  0x2283,
-	5869:  0x222A,
-	5870:  0x2229,
-	5871:  0x2227,
-	5872:  0x2228,
-	5873:  0xFFE2,
-	5874:  0xC910,
-	5875:  0xC912,
-	5876:  0xC913,
-	5877:  0xC914,
-	5878:  0xC915,
-	5879:  0xC916,
-	5880:  0xC917,
-	5881:  0xC919,
-	5882:  0xC91A,
-	5883:  0xC91B,
-	5884:  0xC91C,
-	5885:  0xC91D,
-	5886:  0xC91E,
-	5887:  0xC91F,
-	5888:  0xC920,
-	5889:  0xC921,
-	5890:  0xC922,
-	5891:  0xC923,
-	5892:  0xC924,
-	5893:  0xC925,
-	5894:  0xC926,
-	5895:  0xC927,
-	5896:  0xC928,
-	5897:  0xC929,
-	5898:  0xC92A,
-	5899:  0xC92B,
-	5900:  0xC92D,
-	5901:  0xC92E,
-	5902:  0xC92F,
-	5903:  0xC930,
-	5904:  0xC931,
-	5905:  0xC932,
-	5906:  0xC933,
-	5907:  0xC935,
-	5908:  0xC936,
-	5909:  0xC937,
-	5910:  0xC938,
-	5911:  0xC939,
-	5912:  0xC93A,
-	5913:  0xC93B,
-	5914:  0xC93C,
-	5915:  0xC93D,
-	5916:  0xC93E,
-	5917:  0xC93F,
-	5918:  0xC940,
-	5919:  0xC941,
-	5920:  0xC942,
-	5921:  0xC943,
-	5922:  0xC944,
-	5923:  0xC945,
-	5924:  0xC946,
-	5925:  0xC947,
-	5926:  0xC948,
-	5927:  0xC949,
-	5928:  0xC94A,
-	5929:  0xC94B,
-	5930:  0xC94C,
-	5931:  0xC94D,
-	5932:  0xC94E,
-	5933:  0xC94F,
-	5934:  0xC952,
-	5935:  0xC953,
-	5936:  0xC955,
-	5937:  0xC956,
-	5938:  0xC957,
-	5939:  0xC959,
-	5940:  0xC95A,
-	5941:  0xC95B,
-	5942:  0xC95C,
-	5943:  0xC95D,
-	5944:  0xC95E,
-	5945:  0xC95F,
-	5946:  0xC962,
-	5947:  0xC964,
-	5948:  0xC965,
-	5949:  0xC966,
-	5950:  0xC967,
-	5951:  0xC968,
-	5952:  0xC969,
-	5953:  0xC96A,
-	5954:  0xC96B,
-	5955:  0xC96D,
-	5956:  0xC96E,
-	5957:  0xC96F,
-	5958:  0x21D2,
-	5959:  0x21D4,
-	5960:  0x2200,
-	5961:  0x2203,
-	5962:  0x00B4,
-	5963:  0xFF5E,
-	5964:  0x02C7,
-	5965:  0x02D8,
-	5966:  0x02DD,
-	5967:  0x02DA,
-	5968:  0x02D9,
-	5969:  0x00B8,
-	5970:  0x02DB,
-	5971:  0x00A1,
-	5972:  0x00BF,
-	5973:  0x02D0,
-	5974:  0x222E,
-	5975:  0x2211,
-	5976:  0x220F,
-	5977:  0x00A4,
-	5978:  0x2109,
-	5979:  0x2030,
-	5980:  0x25C1,
-	5981:  0x25C0,
-	5982:  0x25B7,
-	5983:  0x25B6,
-	5984:  0x2664,
-	5985:  0x2660,
-	5986:  0x2661,
-	5987:  0x2665,
-	5988:  0x2667,
-	5989:  0x2663,
-	5990:  0x2299,
-	5991:  0x25C8,
-	5992:  0x25A3,
-	5993:  0x25D0,
-	5994:  0x25D1,
-	5995:  0x2592,
-	5996:  0x25A4,
-	5997:  0x25A5,
-	5998:  0x25A8,
-	5999:  0x25A7,
-	6000:  0x25A6,
-	6001:  0x25A9,
-	6002:  0x2668,
-	6003:  0x260F,
-	6004:  0x260E,
-	6005:  0x261C,
-	6006:  0x261E,
-	6007:  0x00B6,
-	6008:  0x2020,
-	6009:  0x2021,
-	6010:  0x2195,
-	6011:  0x2197,
-	6012:  0x2199,
-	6013:  0x2196,
-	6014:  0x2198,
-	6015:  0x266D,
-	6016:  0x2669,
-	6017:  0x266A,
-	6018:  0x266C,
-	6019:  0x327F,
-	6020:  0x321C,
-	6021:  0x2116,
-	6022:  0x33C7,
-	6023:  0x2122,
-	6024:  0x33C2,
-	6025:  0x33D8,
-	6026:  0x2121,
-	6027:  0x20AC,
-	6028:  0x00AE,
-	6052:  0xC971,
-	6053:  0xC972,
-	6054:  0xC973,
-	6055:  0xC975,
-	6056:  0xC976,
-	6057:  0xC977,
-	6058:  0xC978,
-	6059:  0xC979,
-	6060:  0xC97A,
-	6061:  0xC97B,
-	6062:  0xC97D,
-	6063:  0xC97E,
-	6064:  0xC97F,
-	6065:  0xC980,
-	6066:  0xC981,
-	6067:  0xC982,
-	6068:  0xC983,
-	6069:  0xC984,
-	6070:  0xC985,
-	6071:  0xC986,
-	6072:  0xC987,
-	6073:  0xC98A,
-	6074:  0xC98B,
-	6075:  0xC98D,
-	6076:  0xC98E,
-	6077:  0xC98F,
-	6078:  0xC991,
-	6079:  0xC992,
-	6080:  0xC993,
-	6081:  0xC994,
-	6082:  0xC995,
-	6083:  0xC996,
-	6084:  0xC997,
-	6085:  0xC99A,
-	6086:  0xC99C,
-	6087:  0xC99E,
-	6088:  0xC99F,
-	6089:  0xC9A0,
-	6090:  0xC9A1,
-	6091:  0xC9A2,
-	6092:  0xC9A3,
-	6093:  0xC9A4,
-	6094:  0xC9A5,
-	6095:  0xC9A6,
-	6096:  0xC9A7,
-	6097:  0xC9A8,
-	6098:  0xC9A9,
-	6099:  0xC9AA,
-	6100:  0xC9AB,
-	6101:  0xC9AC,
-	6102:  0xC9AD,
-	6103:  0xC9AE,
-	6104:  0xC9AF,
-	6105:  0xC9B0,
-	6106:  0xC9B1,
-	6107:  0xC9B2,
-	6108:  0xC9B3,
-	6109:  0xC9B4,
-	6110:  0xC9B5,
-	6111:  0xC9B6,
-	6112:  0xC9B7,
-	6113:  0xC9B8,
-	6114:  0xC9B9,
-	6115:  0xC9BA,
-	6116:  0xC9BB,
-	6117:  0xC9BC,
-	6118:  0xC9BD,
-	6119:  0xC9BE,
-	6120:  0xC9BF,
-	6121:  0xC9C2,
-	6122:  0xC9C3,
-	6123:  0xC9C5,
-	6124:  0xC9C6,
-	6125:  0xC9C9,
-	6126:  0xC9CB,
-	6127:  0xC9CC,
-	6128:  0xC9CD,
-	6129:  0xC9CE,
-	6130:  0xC9CF,
-	6131:  0xC9D2,
-	6132:  0xC9D4,
-	6133:  0xC9D7,
-	6134:  0xC9D8,
-	6135:  0xC9DB,
-	6136:  0xFF01,
-	6137:  0xFF02,
-	6138:  0xFF03,
-	6139:  0xFF04,
-	6140:  0xFF05,
-	6141:  0xFF06,
-	6142:  0xFF07,
-	6143:  0xFF08,
-	6144:  0xFF09,
-	6145:  0xFF0A,
-	6146:  0xFF0B,
-	6147:  0xFF0C,
-	6148:  0xFF0D,
-	6149:  0xFF0E,
-	6150:  0xFF0F,
-	6151:  0xFF10,
-	6152:  0xFF11,
-	6153:  0xFF12,
-	6154:  0xFF13,
-	6155:  0xFF14,
-	6156:  0xFF15,
-	6157:  0xFF16,
-	6158:  0xFF17,
-	6159:  0xFF18,
-	6160:  0xFF19,
-	6161:  0xFF1A,
-	6162:  0xFF1B,
-	6163:  0xFF1C,
-	6164:  0xFF1D,
-	6165:  0xFF1E,
-	6166:  0xFF1F,
-	6167:  0xFF20,
-	6168:  0xFF21,
-	6169:  0xFF22,
-	6170:  0xFF23,
-	6171:  0xFF24,
-	6172:  0xFF25,
-	6173:  0xFF26,
-	6174:  0xFF27,
-	6175:  0xFF28,
-	6176:  0xFF29,
-	6177:  0xFF2A,
-	6178:  0xFF2B,
-	6179:  0xFF2C,
-	6180:  0xFF2D,
-	6181:  0xFF2E,
-	6182:  0xFF2F,
-	6183:  0xFF30,
-	6184:  0xFF31,
-	6185:  0xFF32,
-	6186:  0xFF33,
-	6187:  0xFF34,
-	6188:  0xFF35,
-	6189:  0xFF36,
-	6190:  0xFF37,
-	6191:  0xFF38,
-	6192:  0xFF39,
-	6193:  0xFF3A,
-	6194:  0xFF3B,
-	6195:  0xFFE6,
-	6196:  0xFF3D,
-	6197:  0xFF3E,
-	6198:  0xFF3F,
-	6199:  0xFF40,
-	6200:  0xFF41,
-	6201:  0xFF42,
-	6202:  0xFF43,
-	6203:  0xFF44,
-	6204:  0xFF45,
-	6205:  0xFF46,
-	6206:  0xFF47,
-	6207:  0xFF48,
-	6208:  0xFF49,
-	6209:  0xFF4A,
-	6210:  0xFF4B,
-	6211:  0xFF4C,
-	6212:  0xFF4D,
-	6213:  0xFF4E,
-	6214:  0xFF4F,
-	6215:  0xFF50,
-	6216:  0xFF51,
-	6217:  0xFF52,
-	6218:  0xFF53,
-	6219:  0xFF54,
-	6220:  0xFF55,
-	6221:  0xFF56,
-	6222:  0xFF57,
-	6223:  0xFF58,
-	6224:  0xFF59,
-	6225:  0xFF5A,
-	6226:  0xFF5B,
-	6227:  0xFF5C,
-	6228:  0xFF5D,
-	6229:  0xFFE3,
-	6230:  0xC9DE,
-	6231:  0xC9DF,
-	6232:  0xC9E1,
-	6233:  0xC9E3,
-	6234:  0xC9E5,
-	6235:  0xC9E6,
-	6236:  0xC9E8,
-	6237:  0xC9E9,
-	6238:  0xC9EA,
-	6239:  0xC9EB,
-	6240:  0xC9EE,
-	6241:  0xC9F2,
-	6242:  0xC9F3,
-	6243:  0xC9F4,
-	6244:  0xC9F5,
-	6245:  0xC9F6,
-	6246:  0xC9F7,
-	6247:  0xC9FA,
-	6248:  0xC9FB,
-	6249:  0xC9FD,
-	6250:  0xC9FE,
-	6251:  0xC9FF,
-	6252:  0xCA01,
-	6253:  0xCA02,
-	6254:  0xCA03,
-	6255:  0xCA04,
-	6256:  0xCA05,
-	6257:  0xCA06,
-	6258:  0xCA07,
-	6259:  0xCA0A,
-	6260:  0xCA0E,
-	6261:  0xCA0F,
-	6262:  0xCA10,
-	6263:  0xCA11,
-	6264:  0xCA12,
-	6265:  0xCA13,
-	6266:  0xCA15,
-	6267:  0xCA16,
-	6268:  0xCA17,
-	6269:  0xCA19,
-	6270:  0xCA1A,
-	6271:  0xCA1B,
-	6272:  0xCA1C,
-	6273:  0xCA1D,
-	6274:  0xCA1E,
-	6275:  0xCA1F,
-	6276:  0xCA20,
-	6277:  0xCA21,
-	6278:  0xCA22,
-	6279:  0xCA23,
-	6280:  0xCA24,
-	6281:  0xCA25,
-	6282:  0xCA26,
-	6283:  0xCA27,
-	6284:  0xCA28,
-	6285:  0xCA2A,
-	6286:  0xCA2B,
-	6287:  0xCA2C,
-	6288:  0xCA2D,
-	6289:  0xCA2E,
-	6290:  0xCA2F,
-	6291:  0xCA30,
-	6292:  0xCA31,
-	6293:  0xCA32,
-	6294:  0xCA33,
-	6295:  0xCA34,
-	6296:  0xCA35,
-	6297:  0xCA36,
-	6298:  0xCA37,
-	6299:  0xCA38,
-	6300:  0xCA39,
-	6301:  0xCA3A,
-	6302:  0xCA3B,
-	6303:  0xCA3C,
-	6304:  0xCA3D,
-	6305:  0xCA3E,
-	6306:  0xCA3F,
-	6307:  0xCA40,
-	6308:  0xCA41,
-	6309:  0xCA42,
-	6310:  0xCA43,
-	6311:  0xCA44,
-	6312:  0xCA45,
-	6313:  0xCA46,
-	6314:  0x3131,
-	6315:  0x3132,
-	6316:  0x3133,
-	6317:  0x3134,
-	6318:  0x3135,
-	6319:  0x3136,
-	6320:  0x3137,
-	6321:  0x3138,
-	6322:  0x3139,
-	6323:  0x313A,
-	6324:  0x313B,
-	6325:  0x313C,
-	6326:  0x313D,
-	6327:  0x313E,
-	6328:  0x313F,
-	6329:  0x3140,
-	6330:  0x3141,
-	6331:  0x3142,
-	6332:  0x3143,
-	6333:  0x3144,
-	6334:  0x3145,
-	6335:  0x3146,
-	6336:  0x3147,
-	6337:  0x3148,
-	6338:  0x3149,
-	6339:  0x314A,
-	6340:  0x314B,
-	6341:  0x314C,
-	6342:  0x314D,
-	6343:  0x314E,
-	6344:  0x314F,
-	6345:  0x3150,
-	6346:  0x3151,
-	6347:  0x3152,
-	6348:  0x3153,
-	6349:  0x3154,
-	6350:  0x3155,
-	6351:  0x3156,
-	6352:  0x3157,
-	6353:  0x3158,
-	6354:  0x3159,
-	6355:  0x315A,
-	6356:  0x315B,
-	6357:  0x315C,
-	6358:  0x315D,
-	6359:  0x315E,
-	6360:  0x315F,
-	6361:  0x3160,
-	6362:  0x3161,
-	6363:  0x3162,
-	6364:  0x3163,
-	6365:  0x3164,
-	6366:  0x3165,
-	6367:  0x3166,
-	6368:  0x3167,
-	6369:  0x3168,
-	6370:  0x3169,
-	6371:  0x316A,
-	6372:  0x316B,
-	6373:  0x316C,
-	6374:  0x316D,
-	6375:  0x316E,
-	6376:  0x316F,
-	6377:  0x3170,
-	6378:  0x3171,
-	6379:  0x3172,
-	6380:  0x3173,
-	6381:  0x3174,
-	6382:  0x3175,
-	6383:  0x3176,
-	6384:  0x3177,
-	6385:  0x3178,
-	6386:  0x3179,
-	6387:  0x317A,
-	6388:  0x317B,
-	6389:  0x317C,
-	6390:  0x317D,
-	6391:  0x317E,
-	6392:  0x317F,
-	6393:  0x3180,
-	6394:  0x3181,
-	6395:  0x3182,
-	6396:  0x3183,
-	6397:  0x3184,
-	6398:  0x3185,
-	6399:  0x3186,
-	6400:  0x3187,
-	6401:  0x3188,
-	6402:  0x3189,
-	6403:  0x318A,
-	6404:  0x318B,
-	6405:  0x318C,
-	6406:  0x318D,
-	6407:  0x318E,
-	6408:  0xCA47,
-	6409:  0xCA48,
-	6410:  0xCA49,
-	6411:  0xCA4A,
-	6412:  0xCA4B,
-	6413:  0xCA4E,
-	6414:  0xCA4F,
-	6415:  0xCA51,
-	6416:  0xCA52,
-	6417:  0xCA53,
-	6418:  0xCA55,
-	6419:  0xCA56,
-	6420:  0xCA57,
-	6421:  0xCA58,
-	6422:  0xCA59,
-	6423:  0xCA5A,
-	6424:  0xCA5B,
-	6425:  0xCA5E,
-	6426:  0xCA62,
-	6427:  0xCA63,
-	6428:  0xCA64,
-	6429:  0xCA65,
-	6430:  0xCA66,
-	6431:  0xCA67,
-	6432:  0xCA69,
-	6433:  0xCA6A,
-	6434:  0xCA6B,
-	6435:  0xCA6C,
-	6436:  0xCA6D,
-	6437:  0xCA6E,
-	6438:  0xCA6F,
-	6439:  0xCA70,
-	6440:  0xCA71,
-	6441:  0xCA72,
-	6442:  0xCA73,
-	6443:  0xCA74,
-	6444:  0xCA75,
-	6445:  0xCA76,
-	6446:  0xCA77,
-	6447:  0xCA78,
-	6448:  0xCA79,
-	6449:  0xCA7A,
-	6450:  0xCA7B,
-	6451:  0xCA7C,
-	6452:  0xCA7E,
-	6453:  0xCA7F,
-	6454:  0xCA80,
-	6455:  0xCA81,
-	6456:  0xCA82,
-	6457:  0xCA83,
-	6458:  0xCA85,
-	6459:  0xCA86,
-	6460:  0xCA87,
-	6461:  0xCA88,
-	6462:  0xCA89,
-	6463:  0xCA8A,
-	6464:  0xCA8B,
-	6465:  0xCA8C,
-	6466:  0xCA8D,
-	6467:  0xCA8E,
-	6468:  0xCA8F,
-	6469:  0xCA90,
-	6470:  0xCA91,
-	6471:  0xCA92,
-	6472:  0xCA93,
-	6473:  0xCA94,
-	6474:  0xCA95,
-	6475:  0xCA96,
-	6476:  0xCA97,
-	6477:  0xCA99,
-	6478:  0xCA9A,
-	6479:  0xCA9B,
-	6480:  0xCA9C,
-	6481:  0xCA9D,
-	6482:  0xCA9E,
-	6483:  0xCA9F,
-	6484:  0xCAA0,
-	6485:  0xCAA1,
-	6486:  0xCAA2,
-	6487:  0xCAA3,
-	6488:  0xCAA4,
-	6489:  0xCAA5,
-	6490:  0xCAA6,
-	6491:  0xCAA7,
-	6492:  0x2170,
-	6493:  0x2171,
-	6494:  0x2172,
-	6495:  0x2173,
-	6496:  0x2174,
-	6497:  0x2175,
-	6498:  0x2176,
-	6499:  0x2177,
-	6500:  0x2178,
-	6501:  0x2179,
-	6507:  0x2160,
-	6508:  0x2161,
-	6509:  0x2162,
-	6510:  0x2163,
-	6511:  0x2164,
-	6512:  0x2165,
-	6513:  0x2166,
-	6514:  0x2167,
-	6515:  0x2168,
-	6516:  0x2169,
-	6524:  0x0391,
-	6525:  0x0392,
-	6526:  0x0393,
-	6527:  0x0394,
-	6528:  0x0395,
-	6529:  0x0396,
-	6530:  0x0397,
-	6531:  0x0398,
-	6532:  0x0399,
-	6533:  0x039A,
-	6534:  0x039B,
-	6535:  0x039C,
-	6536:  0x039D,
-	6537:  0x039E,
-	6538:  0x039F,
-	6539:  0x03A0,
-	6540:  0x03A1,
-	6541:  0x03A3,
-	6542:  0x03A4,
-	6543:  0x03A5,
-	6544:  0x03A6,
-	6545:  0x03A7,
-	6546:  0x03A8,
-	6547:  0x03A9,
-	6556:  0x03B1,
-	6557:  0x03B2,
-	6558:  0x03B3,
-	6559:  0x03B4,
-	6560:  0x03B5,
-	6561:  0x03B6,
-	6562:  0x03B7,
-	6563:  0x03B8,
-	6564:  0x03B9,
-	6565:  0x03BA,
-	6566:  0x03BB,
-	6567:  0x03BC,
-	6568:  0x03BD,
-	6569:  0x03BE,
-	6570:  0x03BF,
-	6571:  0x03C0,
-	6572:  0x03C1,
-	6573:  0x03C3,
-	6574:  0x03C4,
-	6575:  0x03C5,
-	6576:  0x03C6,
-	6577:  0x03C7,
-	6578:  0x03C8,
-	6579:  0x03C9,
-	6586:  0xCAA8,
-	6587:  0xCAA9,
-	6588:  0xCAAA,
-	6589:  0xCAAB,
-	6590:  0xCAAC,
-	6591:  0xCAAD,
-	6592:  0xCAAE,
-	6593:  0xCAAF,
-	6594:  0xCAB0,
-	6595:  0xCAB1,
-	6596:  0xCAB2,
-	6597:  0xCAB3,
-	6598:  0xCAB4,
-	6599:  0xCAB5,
-	6600:  0xCAB6,
-	6601:  0xCAB7,
-	6602:  0xCAB8,
-	6603:  0xCAB9,
-	6604:  0xCABA,
-	6605:  0xCABB,
-	6606:  0xCABE,
-	6607:  0xCABF,
-	6608:  0xCAC1,
-	6609:  0xCAC2,
-	6610:  0xCAC3,
-	6611:  0xCAC5,
-	6612:  0xCAC6,
-	6613:  0xCAC7,
-	6614:  0xCAC8,
-	6615:  0xCAC9,
-	6616:  0xCACA,
-	6617:  0xCACB,
-	6618:  0xCACE,
-	6619:  0xCAD0,
-	6620:  0xCAD2,
-	6621:  0xCAD4,
-	6622:  0xCAD5,
-	6623:  0xCAD6,
-	6624:  0xCAD7,
-	6625:  0xCADA,
-	6626:  0xCADB,
-	6627:  0xCADC,
-	6628:  0xCADD,
-	6629:  0xCADE,
-	6630:  0xCADF,
-	6631:  0xCAE1,
-	6632:  0xCAE2,
-	6633:  0xCAE3,
-	6634:  0xCAE4,
-	6635:  0xCAE5,
-	6636:  0xCAE6,
-	6637:  0xCAE7,
-	6638:  0xCAE8,
-	6639:  0xCAE9,
-	6640:  0xCAEA,
-	6641:  0xCAEB,
-	6642:  0xCAED,
-	6643:  0xCAEE,
-	6644:  0xCAEF,
-	6645:  0xCAF0,
-	6646:  0xCAF1,
-	6647:  0xCAF2,
-	6648:  0xCAF3,
-	6649:  0xCAF5,
-	6650:  0xCAF6,
-	6651:  0xCAF7,
-	6652:  0xCAF8,
-	6653:  0xCAF9,
-	6654:  0xCAFA,
-	6655:  0xCAFB,
-	6656:  0xCAFC,
-	6657:  0xCAFD,
-	6658:  0xCAFE,
-	6659:  0xCAFF,
-	6660:  0xCB00,
-	6661:  0xCB01,
-	6662:  0xCB02,
-	6663:  0xCB03,
-	6664:  0xCB04,
-	6665:  0xCB05,
-	6666:  0xCB06,
-	6667:  0xCB07,
-	6668:  0xCB09,
-	6669:  0xCB0A,
-	6670:  0x2500,
-	6671:  0x2502,
-	6672:  0x250C,
-	6673:  0x2510,
-	6674:  0x2518,
-	6675:  0x2514,
-	6676:  0x251C,
-	6677:  0x252C,
-	6678:  0x2524,
-	6679:  0x2534,
-	6680:  0x253C,
-	6681:  0x2501,
-	6682:  0x2503,
-	6683:  0x250F,
-	6684:  0x2513,
-	6685:  0x251B,
-	6686:  0x2517,
-	6687:  0x2523,
-	6688:  0x2533,
-	6689:  0x252B,
-	6690:  0x253B,
-	6691:  0x254B,
-	6692:  0x2520,
-	6693:  0x252F,
-	6694:  0x2528,
-	6695:  0x2537,
-	6696:  0x253F,
-	6697:  0x251D,
-	6698:  0x2530,
-	6699:  0x2525,
-	6700:  0x2538,
-	6701:  0x2542,
-	6702:  0x2512,
-	6703:  0x2511,
-	6704:  0x251A,
-	6705:  0x2519,
-	6706:  0x2516,
-	6707:  0x2515,
-	6708:  0x250E,
-	6709:  0x250D,
-	6710:  0x251E,
-	6711:  0x251F,
-	6712:  0x2521,
-	6713:  0x2522,
-	6714:  0x2526,
-	6715:  0x2527,
-	6716:  0x2529,
-	6717:  0x252A,
-	6718:  0x252D,
-	6719:  0x252E,
-	6720:  0x2531,
-	6721:  0x2532,
-	6722:  0x2535,
-	6723:  0x2536,
-	6724:  0x2539,
-	6725:  0x253A,
-	6726:  0x253D,
-	6727:  0x253E,
-	6728:  0x2540,
-	6729:  0x2541,
-	6730:  0x2543,
-	6731:  0x2544,
-	6732:  0x2545,
-	6733:  0x2546,
-	6734:  0x2547,
-	6735:  0x2548,
-	6736:  0x2549,
-	6737:  0x254A,
-	6764:  0xCB0B,
-	6765:  0xCB0C,
-	6766:  0xCB0D,
-	6767:  0xCB0E,
-	6768:  0xCB0F,
-	6769:  0xCB11,
-	6770:  0xCB12,
-	6771:  0xCB13,
-	6772:  0xCB15,
-	6773:  0xCB16,
-	6774:  0xCB17,
-	6775:  0xCB19,
-	6776:  0xCB1A,
-	6777:  0xCB1B,
-	6778:  0xCB1C,
-	6779:  0xCB1D,
-	6780:  0xCB1E,
-	6781:  0xCB1F,
-	6782:  0xCB22,
-	6783:  0xCB23,
-	6784:  0xCB24,
-	6785:  0xCB25,
-	6786:  0xCB26,
-	6787:  0xCB27,
-	6788:  0xCB28,
-	6789:  0xCB29,
-	6790:  0xCB2A,
-	6791:  0xCB2B,
-	6792:  0xCB2C,
-	6793:  0xCB2D,
-	6794:  0xCB2E,
-	6795:  0xCB2F,
-	6796:  0xCB30,
-	6797:  0xCB31,
-	6798:  0xCB32,
-	6799:  0xCB33,
-	6800:  0xCB34,
-	6801:  0xCB35,
-	6802:  0xCB36,
-	6803:  0xCB37,
-	6804:  0xCB38,
-	6805:  0xCB39,
-	6806:  0xCB3A,
-	6807:  0xCB3B,
-	6808:  0xCB3C,
-	6809:  0xCB3D,
-	6810:  0xCB3E,
-	6811:  0xCB3F,
-	6812:  0xCB40,
-	6813:  0xCB42,
-	6814:  0xCB43,
-	6815:  0xCB44,
-	6816:  0xCB45,
-	6817:  0xCB46,
-	6818:  0xCB47,
-	6819:  0xCB4A,
-	6820:  0xCB4B,
-	6821:  0xCB4D,
-	6822:  0xCB4E,
-	6823:  0xCB4F,
-	6824:  0xCB51,
-	6825:  0xCB52,
-	6826:  0xCB53,
-	6827:  0xCB54,
-	6828:  0xCB55,
-	6829:  0xCB56,
-	6830:  0xCB57,
-	6831:  0xCB5A,
-	6832:  0xCB5B,
-	6833:  0xCB5C,
-	6834:  0xCB5E,
-	6835:  0xCB5F,
-	6836:  0xCB60,
-	6837:  0xCB61,
-	6838:  0xCB62,
-	6839:  0xCB63,
-	6840:  0xCB65,
-	6841:  0xCB66,
-	6842:  0xCB67,
-	6843:  0xCB68,
-	6844:  0xCB69,
-	6845:  0xCB6A,
-	6846:  0xCB6B,
-	6847:  0xCB6C,
-	6848:  0x3395,
-	6849:  0x3396,
-	6850:  0x3397,
-	6851:  0x2113,
-	6852:  0x3398,
-	6853:  0x33C4,
-	6854:  0x33A3,
-	6855:  0x33A4,
-	6856:  0x33A5,
-	6857:  0x33A6,
-	6858:  0x3399,
-	6859:  0x339A,
-	6860:  0x339B,
-	6861:  0x339C,
-	6862:  0x339D,
-	6863:  0x339E,
-	6864:  0x339F,
-	6865:  0x33A0,
-	6866:  0x33A1,
-	6867:  0x33A2,
-	6868:  0x33CA,
-	6869:  0x338D,
-	6870:  0x338E,
-	6871:  0x338F,
-	6872:  0x33CF,
-	6873:  0x3388,
-	6874:  0x3389,
-	6875:  0x33C8,
-	6876:  0x33A7,
-	6877:  0x33A8,
-	6878:  0x33B0,
-	6879:  0x33B1,
-	6880:  0x33B2,
-	6881:  0x33B3,
-	6882:  0x33B4,
-	6883:  0x33B5,
-	6884:  0x33B6,
-	6885:  0x33B7,
-	6886:  0x33B8,
-	6887:  0x33B9,
-	6888:  0x3380,
-	6889:  0x3381,
-	6890:  0x3382,
-	6891:  0x3383,
-	6892:  0x3384,
-	6893:  0x33BA,
-	6894:  0x33BB,
-	6895:  0x33BC,
-	6896:  0x33BD,
-	6897:  0x33BE,
-	6898:  0x33BF,
-	6899:  0x3390,
-	6900:  0x3391,
-	6901:  0x3392,
-	6902:  0x3393,
-	6903:  0x3394,
-	6904:  0x2126,
-	6905:  0x33C0,
-	6906:  0x33C1,
-	6907:  0x338A,
-	6908:  0x338B,
-	6909:  0x338C,
-	6910:  0x33D6,
-	6911:  0x33C5,
-	6912:  0x33AD,
-	6913:  0x33AE,
-	6914:  0x33AF,
-	6915:  0x33DB,
-	6916:  0x33A9,
-	6917:  0x33AA,
-	6918:  0x33AB,
-	6919:  0x33AC,
-	6920:  0x33DD,
-	6921:  0x33D0,
-	6922:  0x33D3,
-	6923:  0x33C3,
-	6924:  0x33C9,
-	6925:  0x33DC,
-	6926:  0x33C6,
-	6942:  0xCB6D,
-	6943:  0xCB6E,
-	6944:  0xCB6F,
-	6945:  0xCB70,
-	6946:  0xCB71,
-	6947:  0xCB72,
-	6948:  0xCB73,
-	6949:  0xCB74,
-	6950:  0xCB75,
-	6951:  0xCB76,
-	6952:  0xCB77,
-	6953:  0xCB7A,
-	6954:  0xCB7B,
-	6955:  0xCB7C,
-	6956:  0xCB7D,
-	6957:  0xCB7E,
-	6958:  0xCB7F,
-	6959:  0xCB80,
-	6960:  0xCB81,
-	6961:  0xCB82,
-	6962:  0xCB83,
-	6963:  0xCB84,
-	6964:  0xCB85,
-	6965:  0xCB86,
-	6966:  0xCB87,
-	6967:  0xCB88,
-	6968:  0xCB89,
-	6969:  0xCB8A,
-	6970:  0xCB8B,
-	6971:  0xCB8C,
-	6972:  0xCB8D,
-	6973:  0xCB8E,
-	6974:  0xCB8F,
-	6975:  0xCB90,
-	6976:  0xCB91,
-	6977:  0xCB92,
-	6978:  0xCB93,
-	6979:  0xCB94,
-	6980:  0xCB95,
-	6981:  0xCB96,
-	6982:  0xCB97,
-	6983:  0xCB98,
-	6984:  0xCB99,
-	6985:  0xCB9A,
-	6986:  0xCB9B,
-	6987:  0xCB9D,
-	6988:  0xCB9E,
-	6989:  0xCB9F,
-	6990:  0xCBA0,
-	6991:  0xCBA1,
-	6992:  0xCBA2,
-	6993:  0xCBA3,
-	6994:  0xCBA4,
-	6995:  0xCBA5,
-	6996:  0xCBA6,
-	6997:  0xCBA7,
-	6998:  0xCBA8,
-	6999:  0xCBA9,
-	7000:  0xCBAA,
-	7001:  0xCBAB,
-	7002:  0xCBAC,
-	7003:  0xCBAD,
-	7004:  0xCBAE,
-	7005:  0xCBAF,
-	7006:  0xCBB0,
-	7007:  0xCBB1,
-	7008:  0xCBB2,
-	7009:  0xCBB3,
-	7010:  0xCBB4,
-	7011:  0xCBB5,
-	7012:  0xCBB6,
-	7013:  0xCBB7,
-	7014:  0xCBB9,
-	7015:  0xCBBA,
-	7016:  0xCBBB,
-	7017:  0xCBBC,
-	7018:  0xCBBD,
-	7019:  0xCBBE,
-	7020:  0xCBBF,
-	7021:  0xCBC0,
-	7022:  0xCBC1,
-	7023:  0xCBC2,
-	7024:  0xCBC3,
-	7025:  0xCBC4,
-	7026:  0x00C6,
-	7027:  0x00D0,
-	7028:  0x00AA,
-	7029:  0x0126,
-	7031:  0x0132,
-	7033:  0x013F,
-	7034:  0x0141,
-	7035:  0x00D8,
-	7036:  0x0152,
-	7037:  0x00BA,
-	7038:  0x00DE,
-	7039:  0x0166,
-	7040:  0x014A,
-	7042:  0x3260,
-	7043:  0x3261,
-	7044:  0x3262,
-	7045:  0x3263,
-	7046:  0x3264,
-	7047:  0x3265,
-	7048:  0x3266,
-	7049:  0x3267,
-	7050:  0x3268,
-	7051:  0x3269,
-	7052:  0x326A,
-	7053:  0x326B,
-	7054:  0x326C,
-	7055:  0x326D,
-	7056:  0x326E,
-	7057:  0x326F,
-	7058:  0x3270,
-	7059:  0x3271,
-	7060:  0x3272,
-	7061:  0x3273,
-	7062:  0x3274,
-	7063:  0x3275,
-	7064:  0x3276,
-	7065:  0x3277,
-	7066:  0x3278,
-	7067:  0x3279,
-	7068:  0x327A,
-	7069:  0x327B,
-	7070:  0x24D0,
-	7071:  0x24D1,
-	7072:  0x24D2,
-	7073:  0x24D3,
-	7074:  0x24D4,
-	7075:  0x24D5,
-	7076:  0x24D6,
-	7077:  0x24D7,
-	7078:  0x24D8,
-	7079:  0x24D9,
-	7080:  0x24DA,
-	7081:  0x24DB,
-	7082:  0x24DC,
-	7083:  0x24DD,
-	7084:  0x24DE,
-	7085:  0x24DF,
-	7086:  0x24E0,
-	7087:  0x24E1,
-	7088:  0x24E2,
-	7089:  0x24E3,
-	7090:  0x24E4,
-	7091:  0x24E5,
-	7092:  0x24E6,
-	7093:  0x24E7,
-	7094:  0x24E8,
-	7095:  0x24E9,
-	7096:  0x2460,
-	7097:  0x2461,
-	7098:  0x2462,
-	7099:  0x2463,
-	7100:  0x2464,
-	7101:  0x2465,
-	7102:  0x2466,
-	7103:  0x2467,
-	7104:  0x2468,
-	7105:  0x2469,
-	7106:  0x246A,
-	7107:  0x246B,
-	7108:  0x246C,
-	7109:  0x246D,
-	7110:  0x246E,
-	7111:  0x00BD,
-	7112:  0x2153,
-	7113:  0x2154,
-	7114:  0x00BC,
-	7115:  0x00BE,
-	7116:  0x215B,
-	7117:  0x215C,
-	7118:  0x215D,
-	7119:  0x215E,
-	7120:  0xCBC5,
-	7121:  0xCBC6,
-	7122:  0xCBC7,
-	7123:  0xCBC8,
-	7124:  0xCBC9,
-	7125:  0xCBCA,
-	7126:  0xCBCB,
-	7127:  0xCBCC,
-	7128:  0xCBCD,
-	7129:  0xCBCE,
-	7130:  0xCBCF,
-	7131:  0xCBD0,
-	7132:  0xCBD1,
-	7133:  0xCBD2,
-	7134:  0xCBD3,
-	7135:  0xCBD5,
-	7136:  0xCBD6,
-	7137:  0xCBD7,
-	7138:  0xCBD8,
-	7139:  0xCBD9,
-	7140:  0xCBDA,
-	7141:  0xCBDB,
-	7142:  0xCBDC,
-	7143:  0xCBDD,
-	7144:  0xCBDE,
-	7145:  0xCBDF,
-	7146:  0xCBE0,
-	7147:  0xCBE1,
-	7148:  0xCBE2,
-	7149:  0xCBE3,
-	7150:  0xCBE5,
-	7151:  0xCBE6,
-	7152:  0xCBE8,
-	7153:  0xCBEA,
-	7154:  0xCBEB,
-	7155:  0xCBEC,
-	7156:  0xCBED,
-	7157:  0xCBEE,
-	7158:  0xCBEF,
-	7159:  0xCBF0,
-	7160:  0xCBF1,
-	7161:  0xCBF2,
-	7162:  0xCBF3,
-	7163:  0xCBF4,
-	7164:  0xCBF5,
-	7165:  0xCBF6,
-	7166:  0xCBF7,
-	7167:  0xCBF8,
-	7168:  0xCBF9,
-	7169:  0xCBFA,
-	7170:  0xCBFB,
-	7171:  0xCBFC,
-	7172:  0xCBFD,
-	7173:  0xCBFE,
-	7174:  0xCBFF,
-	7175:  0xCC00,
-	7176:  0xCC01,
-	7177:  0xCC02,
-	7178:  0xCC03,
-	7179:  0xCC04,
-	7180:  0xCC05,
-	7181:  0xCC06,
-	7182:  0xCC07,
-	7183:  0xCC08,
-	7184:  0xCC09,
-	7185:  0xCC0A,
-	7186:  0xCC0B,
-	7187:  0xCC0E,
-	7188:  0xCC0F,
-	7189:  0xCC11,
-	7190:  0xCC12,
-	7191:  0xCC13,
-	7192:  0xCC15,
-	7193:  0xCC16,
-	7194:  0xCC17,
-	7195:  0xCC18,
-	7196:  0xCC19,
-	7197:  0xCC1A,
-	7198:  0xCC1B,
-	7199:  0xCC1E,
-	7200:  0xCC1F,
-	7201:  0xCC20,
-	7202:  0xCC23,
-	7203:  0xCC24,
-	7204:  0x00E6,
-	7205:  0x0111,
-	7206:  0x00F0,
-	7207:  0x0127,
-	7208:  0x0131,
-	7209:  0x0133,
-	7210:  0x0138,
-	7211:  0x0140,
-	7212:  0x0142,
-	7213:  0x00F8,
-	7214:  0x0153,
-	7215:  0x00DF,
-	7216:  0x00FE,
-	7217:  0x0167,
-	7218:  0x014B,
-	7219:  0x0149,
-	7220:  0x3200,
-	7221:  0x3201,
-	7222:  0x3202,
-	7223:  0x3203,
-	7224:  0x3204,
-	7225:  0x3205,
-	7226:  0x3206,
-	7227:  0x3207,
-	7228:  0x3208,
-	7229:  0x3209,
-	7230:  0x320A,
-	7231:  0x320B,
-	7232:  0x320C,
-	7233:  0x320D,
-	7234:  0x320E,
-	7235:  0x320F,
-	7236:  0x3210,
-	7237:  0x3211,
-	7238:  0x3212,
-	7239:  0x3213,
-	7240:  0x3214,
-	7241:  0x3215,
-	7242:  0x3216,
-	7243:  0x3217,
-	7244:  0x3218,
-	7245:  0x3219,
-	7246:  0x321A,
-	7247:  0x321B,
-	7248:  0x249C,
-	7249:  0x249D,
-	7250:  0x249E,
-	7251:  0x249F,
-	7252:  0x24A0,
-	7253:  0x24A1,
-	7254:  0x24A2,
-	7255:  0x24A3,
-	7256:  0x24A4,
-	7257:  0x24A5,
-	7258:  0x24A6,
-	7259:  0x24A7,
-	7260:  0x24A8,
-	7261:  0x24A9,
-	7262:  0x24AA,
-	7263:  0x24AB,
-	7264:  0x24AC,
-	7265:  0x24AD,
-	7266:  0x24AE,
-	7267:  0x24AF,
-	7268:  0x24B0,
-	7269:  0x24B1,
-	7270:  0x24B2,
-	7271:  0x24B3,
-	7272:  0x24B4,
-	7273:  0x24B5,
-	7274:  0x2474,
-	7275:  0x2475,
-	7276:  0x2476,
-	7277:  0x2477,
-	7278:  0x2478,
-	7279:  0x2479,
-	7280:  0x247A,
-	7281:  0x247B,
-	7282:  0x247C,
-	7283:  0x247D,
-	7284:  0x247E,
-	7285:  0x247F,
-	7286:  0x2480,
-	7287:  0x2481,
-	7288:  0x2482,
-	7289:  0x00B9,
-	7290:  0x00B2,
-	7291:  0x00B3,
-	7292:  0x2074,
-	7293:  0x207F,
-	7294:  0x2081,
-	7295:  0x2082,
-	7296:  0x2083,
-	7297:  0x2084,
-	7298:  0xCC25,
-	7299:  0xCC26,
-	7300:  0xCC2A,
-	7301:  0xCC2B,
-	7302:  0xCC2D,
-	7303:  0xCC2F,
-	7304:  0xCC31,
-	7305:  0xCC32,
-	7306:  0xCC33,
-	7307:  0xCC34,
-	7308:  0xCC35,
-	7309:  0xCC36,
-	7310:  0xCC37,
-	7311:  0xCC3A,
-	7312:  0xCC3F,
-	7313:  0xCC40,
-	7314:  0xCC41,
-	7315:  0xCC42,
-	7316:  0xCC43,
-	7317:  0xCC46,
-	7318:  0xCC47,
-	7319:  0xCC49,
-	7320:  0xCC4A,
-	7321:  0xCC4B,
-	7322:  0xCC4D,
-	7323:  0xCC4E,
-	7324:  0xCC4F,
-	7325:  0xCC50,
-	7326:  0xCC51,
-	7327:  0xCC52,
-	7328:  0xCC53,
-	7329:  0xCC56,
-	7330:  0xCC5A,
-	7331:  0xCC5B,
-	7332:  0xCC5C,
-	7333:  0xCC5D,
-	7334:  0xCC5E,
-	7335:  0xCC5F,
-	7336:  0xCC61,
-	7337:  0xCC62,
-	7338:  0xCC63,
-	7339:  0xCC65,
-	7340:  0xCC67,
-	7341:  0xCC69,
-	7342:  0xCC6A,
-	7343:  0xCC6B,
-	7344:  0xCC6C,
-	7345:  0xCC6D,
-	7346:  0xCC6E,
-	7347:  0xCC6F,
-	7348:  0xCC71,
-	7349:  0xCC72,
-	7350:  0xCC73,
-	7351:  0xCC74,
-	7352:  0xCC76,
-	7353:  0xCC77,
-	7354:  0xCC78,
-	7355:  0xCC79,
-	7356:  0xCC7A,
-	7357:  0xCC7B,
-	7358:  0xCC7C,
-	7359:  0xCC7D,
-	7360:  0xCC7E,
-	7361:  0xCC7F,
-	7362:  0xCC80,
-	7363:  0xCC81,
-	7364:  0xCC82,
-	7365:  0xCC83,
-	7366:  0xCC84,
-	7367:  0xCC85,
-	7368:  0xCC86,
-	7369:  0xCC87,
-	7370:  0xCC88,
-	7371:  0xCC89,
-	7372:  0xCC8A,
-	7373:  0xCC8B,
-	7374:  0xCC8C,
-	7375:  0xCC8D,
-	7376:  0xCC8E,
-	7377:  0xCC8F,
-	7378:  0xCC90,
-	7379:  0xCC91,
-	7380:  0xCC92,
-	7381:  0xCC93,
-	7382:  0x3041,
-	7383:  0x3042,
-	7384:  0x3043,
-	7385:  0x3044,
-	7386:  0x3045,
-	7387:  0x3046,
-	7388:  0x3047,
-	7389:  0x3048,
-	7390:  0x3049,
-	7391:  0x304A,
-	7392:  0x304B,
-	7393:  0x304C,
-	7394:  0x304D,
-	7395:  0x304E,
-	7396:  0x304F,
-	7397:  0x3050,
-	7398:  0x3051,
-	7399:  0x3052,
-	7400:  0x3053,
-	7401:  0x3054,
-	7402:  0x3055,
-	7403:  0x3056,
-	7404:  0x3057,
-	7405:  0x3058,
-	7406:  0x3059,
-	7407:  0x305A,
-	7408:  0x305B,
-	7409:  0x305C,
-	7410:  0x305D,
-	7411:  0x305E,
-	7412:  0x305F,
-	7413:  0x3060,
-	7414:  0x3061,
-	7415:  0x3062,
-	7416:  0x3063,
-	7417:  0x3064,
-	7418:  0x3065,
-	7419:  0x3066,
-	7420:  0x3067,
-	7421:  0x3068,
-	7422:  0x3069,
-	7423:  0x306A,
-	7424:  0x306B,
-	7425:  0x306C,
-	7426:  0x306D,
-	7427:  0x306E,
-	7428:  0x306F,
-	7429:  0x3070,
-	7430:  0x3071,
-	7431:  0x3072,
-	7432:  0x3073,
-	7433:  0x3074,
-	7434:  0x3075,
-	7435:  0x3076,
-	7436:  0x3077,
-	7437:  0x3078,
-	7438:  0x3079,
-	7439:  0x307A,
-	7440:  0x307B,
-	7441:  0x307C,
-	7442:  0x307D,
-	7443:  0x307E,
-	7444:  0x307F,
-	7445:  0x3080,
-	7446:  0x3081,
-	7447:  0x3082,
-	7448:  0x3083,
-	7449:  0x3084,
-	7450:  0x3085,
-	7451:  0x3086,
-	7452:  0x3087,
-	7453:  0x3088,
-	7454:  0x3089,
-	7455:  0x308A,
-	7456:  0x308B,
-	7457:  0x308C,
-	7458:  0x308D,
-	7459:  0x308E,
-	7460:  0x308F,
-	7461:  0x3090,
-	7462:  0x3091,
-	7463:  0x3092,
-	7464:  0x3093,
-	7476:  0xCC94,
-	7477:  0xCC95,
-	7478:  0xCC96,
-	7479:  0xCC97,
-	7480:  0xCC9A,
-	7481:  0xCC9B,
-	7482:  0xCC9D,
-	7483:  0xCC9E,
-	7484:  0xCC9F,
-	7485:  0xCCA1,
-	7486:  0xCCA2,
-	7487:  0xCCA3,
-	7488:  0xCCA4,
-	7489:  0xCCA5,
-	7490:  0xCCA6,
-	7491:  0xCCA7,
-	7492:  0xCCAA,
-	7493:  0xCCAE,
-	7494:  0xCCAF,
-	7495:  0xCCB0,
-	7496:  0xCCB1,
-	7497:  0xCCB2,
-	7498:  0xCCB3,
-	7499:  0xCCB6,
-	7500:  0xCCB7,
-	7501:  0xCCB9,
-	7502:  0xCCBA,
-	7503:  0xCCBB,
-	7504:  0xCCBD,
-	7505:  0xCCBE,
-	7506:  0xCCBF,
-	7507:  0xCCC0,
-	7508:  0xCCC1,
-	7509:  0xCCC2,
-	7510:  0xCCC3,
-	7511:  0xCCC6,
-	7512:  0xCCC8,
-	7513:  0xCCCA,
-	7514:  0xCCCB,
-	7515:  0xCCCC,
-	7516:  0xCCCD,
-	7517:  0xCCCE,
-	7518:  0xCCCF,
-	7519:  0xCCD1,
-	7520:  0xCCD2,
-	7521:  0xCCD3,
-	7522:  0xCCD5,
-	7523:  0xCCD6,
-	7524:  0xCCD7,
-	7525:  0xCCD8,
-	7526:  0xCCD9,
-	7527:  0xCCDA,
-	7528:  0xCCDB,
-	7529:  0xCCDC,
-	7530:  0xCCDD,
-	7531:  0xCCDE,
-	7532:  0xCCDF,
-	7533:  0xCCE0,
-	7534:  0xCCE1,
-	7535:  0xCCE2,
-	7536:  0xCCE3,
-	7537:  0xCCE5,
-	7538:  0xCCE6,
-	7539:  0xCCE7,
-	7540:  0xCCE8,
-	7541:  0xCCE9,
-	7542:  0xCCEA,
-	7543:  0xCCEB,
-	7544:  0xCCED,
-	7545:  0xCCEE,
-	7546:  0xCCEF,
-	7547:  0xCCF1,
-	7548:  0xCCF2,
-	7549:  0xCCF3,
-	7550:  0xCCF4,
-	7551:  0xCCF5,
-	7552:  0xCCF6,
-	7553:  0xCCF7,
-	7554:  0xCCF8,
-	7555:  0xCCF9,
-	7556:  0xCCFA,
-	7557:  0xCCFB,
-	7558:  0xCCFC,
-	7559:  0xCCFD,
-	7560:  0x30A1,
-	7561:  0x30A2,
-	7562:  0x30A3,
-	7563:  0x30A4,
-	7564:  0x30A5,
-	7565:  0x30A6,
-	7566:  0x30A7,
-	7567:  0x30A8,
-	7568:  0x30A9,
-	7569:  0x30AA,
-	7570:  0x30AB,
-	7571:  0x30AC,
-	7572:  0x30AD,
-	7573:  0x30AE,
-	7574:  0x30AF,
-	7575:  0x30B0,
-	7576:  0x30B1,
-	7577:  0x30B2,
-	7578:  0x30B3,
-	7579:  0x30B4,
-	7580:  0x30B5,
-	7581:  0x30B6,
-	7582:  0x30B7,
-	7583:  0x30B8,
-	7584:  0x30B9,
-	7585:  0x30BA,
-	7586:  0x30BB,
-	7587:  0x30BC,
-	7588:  0x30BD,
-	7589:  0x30BE,
-	7590:  0x30BF,
-	7591:  0x30C0,
-	7592:  0x30C1,
-	7593:  0x30C2,
-	7594:  0x30C3,
-	7595:  0x30C4,
-	7596:  0x30C5,
-	7597:  0x30C6,
-	7598:  0x30C7,
-	7599:  0x30C8,
-	7600:  0x30C9,
-	7601:  0x30CA,
-	7602:  0x30CB,
-	7603:  0x30CC,
-	7604:  0x30CD,
-	7605:  0x30CE,
-	7606:  0x30CF,
-	7607:  0x30D0,
-	7608:  0x30D1,
-	7609:  0x30D2,
-	7610:  0x30D3,
-	7611:  0x30D4,
-	7612:  0x30D5,
-	7613:  0x30D6,
-	7614:  0x30D7,
-	7615:  0x30D8,
-	7616:  0x30D9,
-	7617:  0x30DA,
-	7618:  0x30DB,
-	7619:  0x30DC,
-	7620:  0x30DD,
-	7621:  0x30DE,
-	7622:  0x30DF,
-	7623:  0x30E0,
-	7624:  0x30E1,
-	7625:  0x30E2,
-	7626:  0x30E3,
-	7627:  0x30E4,
-	7628:  0x30E5,
-	7629:  0x30E6,
-	7630:  0x30E7,
-	7631:  0x30E8,
-	7632:  0x30E9,
-	7633:  0x30EA,
-	7634:  0x30EB,
-	7635:  0x30EC,
-	7636:  0x30ED,
-	7637:  0x30EE,
-	7638:  0x30EF,
-	7639:  0x30F0,
-	7640:  0x30F1,
-	7641:  0x30F2,
-	7642:  0x30F3,
-	7643:  0x30F4,
-	7644:  0x30F5,
-	7645:  0x30F6,
-	7654:  0xCCFE,
-	7655:  0xCCFF,
-	7656:  0xCD00,
-	7657:  0xCD02,
-	7658:  0xCD03,
-	7659:  0xCD04,
-	7660:  0xCD05,
-	7661:  0xCD06,
-	7662:  0xCD07,
-	7663:  0xCD0A,
-	7664:  0xCD0B,
-	7665:  0xCD0D,
-	7666:  0xCD0E,
-	7667:  0xCD0F,
-	7668:  0xCD11,
-	7669:  0xCD12,
-	7670:  0xCD13,
-	7671:  0xCD14,
-	7672:  0xCD15,
-	7673:  0xCD16,
-	7674:  0xCD17,
-	7675:  0xCD1A,
-	7676:  0xCD1C,
-	7677:  0xCD1E,
-	7678:  0xCD1F,
-	7679:  0xCD20,
-	7680:  0xCD21,
-	7681:  0xCD22,
-	7682:  0xCD23,
-	7683:  0xCD25,
-	7684:  0xCD26,
-	7685:  0xCD27,
-	7686:  0xCD29,
-	7687:  0xCD2A,
-	7688:  0xCD2B,
-	7689:  0xCD2D,
-	7690:  0xCD2E,
-	7691:  0xCD2F,
-	7692:  0xCD30,
-	7693:  0xCD31,
-	7694:  0xCD32,
-	7695:  0xCD33,
-	7696:  0xCD34,
-	7697:  0xCD35,
-	7698:  0xCD36,
-	7699:  0xCD37,
-	7700:  0xCD38,
-	7701:  0xCD3A,
-	7702:  0xCD3B,
-	7703:  0xCD3C,
-	7704:  0xCD3D,
-	7705:  0xCD3E,
-	7706:  0xCD3F,
-	7707:  0xCD40,
-	7708:  0xCD41,
-	7709:  0xCD42,
-	7710:  0xCD43,
-	7711:  0xCD44,
-	7712:  0xCD45,
-	7713:  0xCD46,
-	7714:  0xCD47,
-	7715:  0xCD48,
-	7716:  0xCD49,
-	7717:  0xCD4A,
-	7718:  0xCD4B,
-	7719:  0xCD4C,
-	7720:  0xCD4D,
-	7721:  0xCD4E,
-	7722:  0xCD4F,
-	7723:  0xCD50,
-	7724:  0xCD51,
-	7725:  0xCD52,
-	7726:  0xCD53,
-	7727:  0xCD54,
-	7728:  0xCD55,
-	7729:  0xCD56,
-	7730:  0xCD57,
-	7731:  0xCD58,
-	7732:  0xCD59,
-	7733:  0xCD5A,
-	7734:  0xCD5B,
-	7735:  0xCD5D,
-	7736:  0xCD5E,
-	7737:  0xCD5F,
-	7738:  0x0410,
-	7739:  0x0411,
-	7740:  0x0412,
-	7741:  0x0413,
-	7742:  0x0414,
-	7743:  0x0415,
-	7744:  0x0401,
-	7745:  0x0416,
-	7746:  0x0417,
-	7747:  0x0418,
-	7748:  0x0419,
-	7749:  0x041A,
-	7750:  0x041B,
-	7751:  0x041C,
-	7752:  0x041D,
-	7753:  0x041E,
-	7754:  0x041F,
-	7755:  0x0420,
-	7756:  0x0421,
-	7757:  0x0422,
-	7758:  0x0423,
-	7759:  0x0424,
-	7760:  0x0425,
-	7761:  0x0426,
-	7762:  0x0427,
-	7763:  0x0428,
-	7764:  0x0429,
-	7765:  0x042A,
-	7766:  0x042B,
-	7767:  0x042C,
-	7768:  0x042D,
-	7769:  0x042E,
-	7770:  0x042F,
-	7786:  0x0430,
-	7787:  0x0431,
-	7788:  0x0432,
-	7789:  0x0433,
-	7790:  0x0434,
-	7791:  0x0435,
-	7792:  0x0451,
-	7793:  0x0436,
-	7794:  0x0437,
-	7795:  0x0438,
-	7796:  0x0439,
-	7797:  0x043A,
-	7798:  0x043B,
-	7799:  0x043C,
-	7800:  0x043D,
-	7801:  0x043E,
-	7802:  0x043F,
-	7803:  0x0440,
-	7804:  0x0441,
-	7805:  0x0442,
-	7806:  0x0443,
-	7807:  0x0444,
-	7808:  0x0445,
-	7809:  0x0446,
-	7810:  0x0447,
-	7811:  0x0448,
-	7812:  0x0449,
-	7813:  0x044A,
-	7814:  0x044B,
-	7815:  0x044C,
-	7816:  0x044D,
-	7817:  0x044E,
-	7818:  0x044F,
-	7832:  0xCD61,
-	7833:  0xCD62,
-	7834:  0xCD63,
-	7835:  0xCD65,
-	7836:  0xCD66,
-	7837:  0xCD67,
-	7838:  0xCD68,
-	7839:  0xCD69,
-	7840:  0xCD6A,
-	7841:  0xCD6B,
-	7842:  0xCD6E,
-	7843:  0xCD70,
-	7844:  0xCD72,
-	7845:  0xCD73,
-	7846:  0xCD74,
-	7847:  0xCD75,
-	7848:  0xCD76,
-	7849:  0xCD77,
-	7850:  0xCD79,
-	7851:  0xCD7A,
-	7852:  0xCD7B,
-	7853:  0xCD7C,
-	7854:  0xCD7D,
-	7855:  0xCD7E,
-	7856:  0xCD7F,
-	7857:  0xCD80,
-	7858:  0xCD81,
-	7859:  0xCD82,
-	7860:  0xCD83,
-	7861:  0xCD84,
-	7862:  0xCD85,
-	7863:  0xCD86,
-	7864:  0xCD87,
-	7865:  0xCD89,
-	7866:  0xCD8A,
-	7867:  0xCD8B,
-	7868:  0xCD8C,
-	7869:  0xCD8D,
-	7870:  0xCD8E,
-	7871:  0xCD8F,
-	7872:  0xCD90,
-	7873:  0xCD91,
-	7874:  0xCD92,
-	7875:  0xCD93,
-	7876:  0xCD96,
-	7877:  0xCD97,
-	7878:  0xCD99,
-	7879:  0xCD9A,
-	7880:  0xCD9B,
-	7881:  0xCD9D,
-	7882:  0xCD9E,
-	7883:  0xCD9F,
-	7884:  0xCDA0,
-	7885:  0xCDA1,
-	7886:  0xCDA2,
-	7887:  0xCDA3,
-	7888:  0xCDA6,
-	7889:  0xCDA8,
-	7890:  0xCDAA,
-	7891:  0xCDAB,
-	7892:  0xCDAC,
-	7893:  0xCDAD,
-	7894:  0xCDAE,
-	7895:  0xCDAF,
-	7896:  0xCDB1,
-	7897:  0xCDB2,
-	7898:  0xCDB3,
-	7899:  0xCDB4,
-	7900:  0xCDB5,
-	7901:  0xCDB6,
-	7902:  0xCDB7,
-	7903:  0xCDB8,
-	7904:  0xCDB9,
-	7905:  0xCDBA,
-	7906:  0xCDBB,
-	7907:  0xCDBC,
-	7908:  0xCDBD,
-	7909:  0xCDBE,
-	7910:  0xCDBF,
-	7911:  0xCDC0,
-	7912:  0xCDC1,
-	7913:  0xCDC2,
-	7914:  0xCDC3,
-	7915:  0xCDC5,
-	8010:  0xCDC6,
-	8011:  0xCDC7,
-	8012:  0xCDC8,
-	8013:  0xCDC9,
-	8014:  0xCDCA,
-	8015:  0xCDCB,
-	8016:  0xCDCD,
-	8017:  0xCDCE,
-	8018:  0xCDCF,
-	8019:  0xCDD1,
-	8020:  0xCDD2,
-	8021:  0xCDD3,
-	8022:  0xCDD4,
-	8023:  0xCDD5,
-	8024:  0xCDD6,
-	8025:  0xCDD7,
-	8026:  0xCDD8,
-	8027:  0xCDD9,
-	8028:  0xCDDA,
-	8029:  0xCDDB,
-	8030:  0xCDDC,
-	8031:  0xCDDD,
-	8032:  0xCDDE,
-	8033:  0xCDDF,
-	8034:  0xCDE0,
-	8035:  0xCDE1,
-	8036:  0xCDE2,
-	8037:  0xCDE3,
-	8038:  0xCDE4,
-	8039:  0xCDE5,
-	8040:  0xCDE6,
-	8041:  0xCDE7,
-	8042:  0xCDE9,
-	8043:  0xCDEA,
-	8044:  0xCDEB,
-	8045:  0xCDED,
-	8046:  0xCDEE,
-	8047:  0xCDEF,
-	8048:  0xCDF1,
-	8049:  0xCDF2,
-	8050:  0xCDF3,
-	8051:  0xCDF4,
-	8052:  0xCDF5,
-	8053:  0xCDF6,
-	8054:  0xCDF7,
-	8055:  0xCDFA,
-	8056:  0xCDFC,
-	8057:  0xCDFE,
-	8058:  0xCDFF,
-	8059:  0xCE00,
-	8060:  0xCE01,
-	8061:  0xCE02,
-	8062:  0xCE03,
-	8063:  0xCE05,
-	8064:  0xCE06,
-	8065:  0xCE07,
-	8066:  0xCE09,
-	8067:  0xCE0A,
-	8068:  0xCE0B,
-	8069:  0xCE0D,
-	8070:  0xCE0E,
-	8071:  0xCE0F,
-	8072:  0xCE10,
-	8073:  0xCE11,
-	8074:  0xCE12,
-	8075:  0xCE13,
-	8076:  0xCE15,
-	8077:  0xCE16,
-	8078:  0xCE17,
-	8079:  0xCE18,
-	8080:  0xCE1A,
-	8081:  0xCE1B,
-	8082:  0xCE1C,
-	8083:  0xCE1D,
-	8084:  0xCE1E,
-	8085:  0xCE1F,
-	8086:  0xCE22,
-	8087:  0xCE23,
-	8088:  0xCE25,
-	8089:  0xCE26,
-	8090:  0xCE27,
-	8091:  0xCE29,
-	8092:  0xCE2A,
-	8093:  0xCE2B,
-	8188:  0xCE2C,
-	8189:  0xCE2D,
-	8190:  0xCE2E,
-	8191:  0xCE2F,
-	8192:  0xCE32,
-	8193:  0xCE34,
-	8194:  0xCE36,
-	8195:  0xCE37,
-	8196:  0xCE38,
-	8197:  0xCE39,
-	8198:  0xCE3A,
-	8199:  0xCE3B,
-	8200:  0xCE3C,
-	8201:  0xCE3D,
-	8202:  0xCE3E,
-	8203:  0xCE3F,
-	8204:  0xCE40,
-	8205:  0xCE41,
-	8206:  0xCE42,
-	8207:  0xCE43,
-	8208:  0xCE44,
-	8209:  0xCE45,
-	8210:  0xCE46,
-	8211:  0xCE47,
-	8212:  0xCE48,
-	8213:  0xCE49,
-	8214:  0xCE4A,
-	8215:  0xCE4B,
-	8216:  0xCE4C,
-	8217:  0xCE4D,
-	8218:  0xCE4E,
-	8219:  0xCE4F,
-	8220:  0xCE50,
-	8221:  0xCE51,
-	8222:  0xCE52,
-	8223:  0xCE53,
-	8224:  0xCE54,
-	8225:  0xCE55,
-	8226:  0xCE56,
-	8227:  0xCE57,
-	8228:  0xCE5A,
-	8229:  0xCE5B,
-	8230:  0xCE5D,
-	8231:  0xCE5E,
-	8232:  0xCE62,
-	8233:  0xCE63,
-	8234:  0xCE64,
-	8235:  0xCE65,
-	8236:  0xCE66,
-	8237:  0xCE67,
-	8238:  0xCE6A,
-	8239:  0xCE6C,
-	8240:  0xCE6E,
-	8241:  0xCE6F,
-	8242:  0xCE70,
-	8243:  0xCE71,
-	8244:  0xCE72,
-	8245:  0xCE73,
-	8246:  0xCE76,
-	8247:  0xCE77,
-	8248:  0xCE79,
-	8249:  0xCE7A,
-	8250:  0xCE7B,
-	8251:  0xCE7D,
-	8252:  0xCE7E,
-	8253:  0xCE7F,
-	8254:  0xCE80,
-	8255:  0xCE81,
-	8256:  0xCE82,
-	8257:  0xCE83,
-	8258:  0xCE86,
-	8259:  0xCE88,
-	8260:  0xCE8A,
-	8261:  0xCE8B,
-	8262:  0xCE8C,
-	8263:  0xCE8D,
-	8264:  0xCE8E,
-	8265:  0xCE8F,
-	8266:  0xCE92,
-	8267:  0xCE93,
-	8268:  0xCE95,
-	8269:  0xCE96,
-	8270:  0xCE97,
-	8271:  0xCE99,
-	8366:  0xCE9A,
-	8367:  0xCE9B,
-	8368:  0xCE9C,
-	8369:  0xCE9D,
-	8370:  0xCE9E,
-	8371:  0xCE9F,
-	8372:  0xCEA2,
-	8373:  0xCEA6,
-	8374:  0xCEA7,
-	8375:  0xCEA8,
-	8376:  0xCEA9,
-	8377:  0xCEAA,
-	8378:  0xCEAB,
-	8379:  0xCEAE,
-	8380:  0xCEAF,
-	8381:  0xCEB0,
-	8382:  0xCEB1,
-	8383:  0xCEB2,
-	8384:  0xCEB3,
-	8385:  0xCEB4,
-	8386:  0xCEB5,
-	8387:  0xCEB6,
-	8388:  0xCEB7,
-	8389:  0xCEB8,
-	8390:  0xCEB9,
-	8391:  0xCEBA,
-	8392:  0xCEBB,
-	8393:  0xCEBC,
-	8394:  0xCEBD,
-	8395:  0xCEBE,
-	8396:  0xCEBF,
-	8397:  0xCEC0,
-	8398:  0xCEC2,
-	8399:  0xCEC3,
-	8400:  0xCEC4,
-	8401:  0xCEC5,
-	8402:  0xCEC6,
-	8403:  0xCEC7,
-	8404:  0xCEC8,
-	8405:  0xCEC9,
-	8406:  0xCECA,
-	8407:  0xCECB,
-	8408:  0xCECC,
-	8409:  0xCECD,
-	8410:  0xCECE,
-	8411:  0xCECF,
-	8412:  0xCED0,
-	8413:  0xCED1,
-	8414:  0xCED2,
-	8415:  0xCED3,
-	8416:  0xCED4,
-	8417:  0xCED5,
-	8418:  0xCED6,
-	8419:  0xCED7,
-	8420:  0xCED8,
-	8421:  0xCED9,
-	8422:  0xCEDA,
-	8423:  0xCEDB,
-	8424:  0xCEDC,
-	8425:  0xCEDD,
-	8426:  0xCEDE,
-	8427:  0xCEDF,
-	8428:  0xCEE0,
-	8429:  0xCEE1,
-	8430:  0xCEE2,
-	8431:  0xCEE3,
-	8432:  0xCEE6,
-	8433:  0xCEE7,
-	8434:  0xCEE9,
-	8435:  0xCEEA,
-	8436:  0xCEED,
-	8437:  0xCEEE,
-	8438:  0xCEEF,
-	8439:  0xCEF0,
-	8440:  0xCEF1,
-	8441:  0xCEF2,
-	8442:  0xCEF3,
-	8443:  0xCEF6,
-	8444:  0xCEFA,
-	8445:  0xCEFB,
-	8446:  0xCEFC,
-	8447:  0xCEFD,
-	8448:  0xCEFE,
-	8449:  0xCEFF,
-	8450:  0xAC00,
-	8451:  0xAC01,
-	8452:  0xAC04,
-	8453:  0xAC07,
-	8454:  0xAC08,
-	8455:  0xAC09,
-	8456:  0xAC0A,
-	8457:  0xAC10,
-	8458:  0xAC11,
-	8459:  0xAC12,
-	8460:  0xAC13,
-	8461:  0xAC14,
-	8462:  0xAC15,
-	8463:  0xAC16,
-	8464:  0xAC17,
-	8465:  0xAC19,
-	8466:  0xAC1A,
-	8467:  0xAC1B,
-	8468:  0xAC1C,
-	8469:  0xAC1D,
-	8470:  0xAC20,
-	8471:  0xAC24,
-	8472:  0xAC2C,
-	8473:  0xAC2D,
-	8474:  0xAC2F,
-	8475:  0xAC30,
-	8476:  0xAC31,
-	8477:  0xAC38,
-	8478:  0xAC39,
-	8479:  0xAC3C,
-	8480:  0xAC40,
-	8481:  0xAC4B,
-	8482:  0xAC4D,
-	8483:  0xAC54,
-	8484:  0xAC58,
-	8485:  0xAC5C,
-	8486:  0xAC70,
-	8487:  0xAC71,
-	8488:  0xAC74,
-	8489:  0xAC77,
-	8490:  0xAC78,
-	8491:  0xAC7A,
-	8492:  0xAC80,
-	8493:  0xAC81,
-	8494:  0xAC83,
-	8495:  0xAC84,
-	8496:  0xAC85,
-	8497:  0xAC86,
-	8498:  0xAC89,
-	8499:  0xAC8A,
-	8500:  0xAC8B,
-	8501:  0xAC8C,
-	8502:  0xAC90,
-	8503:  0xAC94,
-	8504:  0xAC9C,
-	8505:  0xAC9D,
-	8506:  0xAC9F,
-	8507:  0xACA0,
-	8508:  0xACA1,
-	8509:  0xACA8,
-	8510:  0xACA9,
-	8511:  0xACAA,
-	8512:  0xACAC,
-	8513:  0xACAF,
-	8514:  0xACB0,
-	8515:  0xACB8,
-	8516:  0xACB9,
-	8517:  0xACBB,
-	8518:  0xACBC,
-	8519:  0xACBD,
-	8520:  0xACC1,
-	8521:  0xACC4,
-	8522:  0xACC8,
-	8523:  0xACCC,
-	8524:  0xACD5,
-	8525:  0xACD7,
-	8526:  0xACE0,
-	8527:  0xACE1,
-	8528:  0xACE4,
-	8529:  0xACE7,
-	8530:  0xACE8,
-	8531:  0xACEA,
-	8532:  0xACEC,
-	8533:  0xACEF,
-	8534:  0xACF0,
-	8535:  0xACF1,
-	8536:  0xACF3,
-	8537:  0xACF5,
-	8538:  0xACF6,
-	8539:  0xACFC,
-	8540:  0xACFD,
-	8541:  0xAD00,
-	8542:  0xAD04,
-	8543:  0xAD06,
-	8544:  0xCF02,
-	8545:  0xCF03,
-	8546:  0xCF05,
-	8547:  0xCF06,
-	8548:  0xCF07,
-	8549:  0xCF09,
-	8550:  0xCF0A,
-	8551:  0xCF0B,
-	8552:  0xCF0C,
-	8553:  0xCF0D,
-	8554:  0xCF0E,
-	8555:  0xCF0F,
-	8556:  0xCF12,
-	8557:  0xCF14,
-	8558:  0xCF16,
-	8559:  0xCF17,
-	8560:  0xCF18,
-	8561:  0xCF19,
-	8562:  0xCF1A,
-	8563:  0xCF1B,
-	8564:  0xCF1D,
-	8565:  0xCF1E,
-	8566:  0xCF1F,
-	8567:  0xCF21,
-	8568:  0xCF22,
-	8569:  0xCF23,
-	8570:  0xCF25,
-	8571:  0xCF26,
-	8572:  0xCF27,
-	8573:  0xCF28,
-	8574:  0xCF29,
-	8575:  0xCF2A,
-	8576:  0xCF2B,
-	8577:  0xCF2E,
-	8578:  0xCF32,
-	8579:  0xCF33,
-	8580:  0xCF34,
-	8581:  0xCF35,
-	8582:  0xCF36,
-	8583:  0xCF37,
-	8584:  0xCF39,
-	8585:  0xCF3A,
-	8586:  0xCF3B,
-	8587:  0xCF3C,
-	8588:  0xCF3D,
-	8589:  0xCF3E,
-	8590:  0xCF3F,
-	8591:  0xCF40,
-	8592:  0xCF41,
-	8593:  0xCF42,
-	8594:  0xCF43,
-	8595:  0xCF44,
-	8596:  0xCF45,
-	8597:  0xCF46,
-	8598:  0xCF47,
-	8599:  0xCF48,
-	8600:  0xCF49,
-	8601:  0xCF4A,
-	8602:  0xCF4B,
-	8603:  0xCF4C,
-	8604:  0xCF4D,
-	8605:  0xCF4E,
-	8606:  0xCF4F,
-	8607:  0xCF50,
-	8608:  0xCF51,
-	8609:  0xCF52,
-	8610:  0xCF53,
-	8611:  0xCF56,
-	8612:  0xCF57,
-	8613:  0xCF59,
-	8614:  0xCF5A,
-	8615:  0xCF5B,
-	8616:  0xCF5D,
-	8617:  0xCF5E,
-	8618:  0xCF5F,
-	8619:  0xCF60,
-	8620:  0xCF61,
-	8621:  0xCF62,
-	8622:  0xCF63,
-	8623:  0xCF66,
-	8624:  0xCF68,
-	8625:  0xCF6A,
-	8626:  0xCF6B,
-	8627:  0xCF6C,
-	8628:  0xAD0C,
-	8629:  0xAD0D,
-	8630:  0xAD0F,
-	8631:  0xAD11,
-	8632:  0xAD18,
-	8633:  0xAD1C,
-	8634:  0xAD20,
-	8635:  0xAD29,
-	8636:  0xAD2C,
-	8637:  0xAD2D,
-	8638:  0xAD34,
-	8639:  0xAD35,
-	8640:  0xAD38,
-	8641:  0xAD3C,
-	8642:  0xAD44,
-	8643:  0xAD45,
-	8644:  0xAD47,
-	8645:  0xAD49,
-	8646:  0xAD50,
-	8647:  0xAD54,
-	8648:  0xAD58,
-	8649:  0xAD61,
-	8650:  0xAD63,
-	8651:  0xAD6C,
-	8652:  0xAD6D,
-	8653:  0xAD70,
-	8654:  0xAD73,
-	8655:  0xAD74,
-	8656:  0xAD75,
-	8657:  0xAD76,
-	8658:  0xAD7B,
-	8659:  0xAD7C,
-	8660:  0xAD7D,
-	8661:  0xAD7F,
-	8662:  0xAD81,
-	8663:  0xAD82,
-	8664:  0xAD88,
-	8665:  0xAD89,
-	8666:  0xAD8C,
-	8667:  0xAD90,
-	8668:  0xAD9C,
-	8669:  0xAD9D,
-	8670:  0xADA4,
-	8671:  0xADB7,
-	8672:  0xADC0,
-	8673:  0xADC1,
-	8674:  0xADC4,
-	8675:  0xADC8,
-	8676:  0xADD0,
-	8677:  0xADD1,
-	8678:  0xADD3,
-	8679:  0xADDC,
-	8680:  0xADE0,
-	8681:  0xADE4,
-	8682:  0xADF8,
-	8683:  0xADF9,
-	8684:  0xADFC,
-	8685:  0xADFF,
-	8686:  0xAE00,
-	8687:  0xAE01,
-	8688:  0xAE08,
-	8689:  0xAE09,
-	8690:  0xAE0B,
-	8691:  0xAE0D,
-	8692:  0xAE14,
-	8693:  0xAE30,
-	8694:  0xAE31,
-	8695:  0xAE34,
-	8696:  0xAE37,
-	8697:  0xAE38,
-	8698:  0xAE3A,
-	8699:  0xAE40,
-	8700:  0xAE41,
-	8701:  0xAE43,
-	8702:  0xAE45,
-	8703:  0xAE46,
-	8704:  0xAE4A,
-	8705:  0xAE4C,
-	8706:  0xAE4D,
-	8707:  0xAE4E,
-	8708:  0xAE50,
-	8709:  0xAE54,
-	8710:  0xAE56,
-	8711:  0xAE5C,
-	8712:  0xAE5D,
-	8713:  0xAE5F,
-	8714:  0xAE60,
-	8715:  0xAE61,
-	8716:  0xAE65,
-	8717:  0xAE68,
-	8718:  0xAE69,
-	8719:  0xAE6C,
-	8720:  0xAE70,
-	8721:  0xAE78,
-	8722:  0xCF6D,
-	8723:  0xCF6E,
-	8724:  0xCF6F,
-	8725:  0xCF72,
-	8726:  0xCF73,
-	8727:  0xCF75,
-	8728:  0xCF76,
-	8729:  0xCF77,
-	8730:  0xCF79,
-	8731:  0xCF7A,
-	8732:  0xCF7B,
-	8733:  0xCF7C,
-	8734:  0xCF7D,
-	8735:  0xCF7E,
-	8736:  0xCF7F,
-	8737:  0xCF81,
-	8738:  0xCF82,
-	8739:  0xCF83,
-	8740:  0xCF84,
-	8741:  0xCF86,
-	8742:  0xCF87,
-	8743:  0xCF88,
-	8744:  0xCF89,
-	8745:  0xCF8A,
-	8746:  0xCF8B,
-	8747:  0xCF8D,
-	8748:  0xCF8E,
-	8749:  0xCF8F,
-	8750:  0xCF90,
-	8751:  0xCF91,
-	8752:  0xCF92,
-	8753:  0xCF93,
-	8754:  0xCF94,
-	8755:  0xCF95,
-	8756:  0xCF96,
-	8757:  0xCF97,
-	8758:  0xCF98,
-	8759:  0xCF99,
-	8760:  0xCF9A,
-	8761:  0xCF9B,
-	8762:  0xCF9C,
-	8763:  0xCF9D,
-	8764:  0xCF9E,
-	8765:  0xCF9F,
-	8766:  0xCFA0,
-	8767:  0xCFA2,
-	8768:  0xCFA3,
-	8769:  0xCFA4,
-	8770:  0xCFA5,
-	8771:  0xCFA6,
-	8772:  0xCFA7,
-	8773:  0xCFA9,
-	8774:  0xCFAA,
-	8775:  0xCFAB,
-	8776:  0xCFAC,
-	8777:  0xCFAD,
-	8778:  0xCFAE,
-	8779:  0xCFAF,
-	8780:  0xCFB1,
-	8781:  0xCFB2,
-	8782:  0xCFB3,
-	8783:  0xCFB4,
-	8784:  0xCFB5,
-	8785:  0xCFB6,
-	8786:  0xCFB7,
-	8787:  0xCFB8,
-	8788:  0xCFB9,
-	8789:  0xCFBA,
-	8790:  0xCFBB,
-	8791:  0xCFBC,
-	8792:  0xCFBD,
-	8793:  0xCFBE,
-	8794:  0xCFBF,
-	8795:  0xCFC0,
-	8796:  0xCFC1,
-	8797:  0xCFC2,
-	8798:  0xCFC3,
-	8799:  0xCFC5,
-	8800:  0xCFC6,
-	8801:  0xCFC7,
-	8802:  0xCFC8,
-	8803:  0xCFC9,
-	8804:  0xCFCA,
-	8805:  0xCFCB,
-	8806:  0xAE79,
-	8807:  0xAE7B,
-	8808:  0xAE7C,
-	8809:  0xAE7D,
-	8810:  0xAE84,
-	8811:  0xAE85,
-	8812:  0xAE8C,
-	8813:  0xAEBC,
-	8814:  0xAEBD,
-	8815:  0xAEBE,
-	8816:  0xAEC0,
-	8817:  0xAEC4,
-	8818:  0xAECC,
-	8819:  0xAECD,
-	8820:  0xAECF,
-	8821:  0xAED0,
-	8822:  0xAED1,
-	8823:  0xAED8,
-	8824:  0xAED9,
-	8825:  0xAEDC,
-	8826:  0xAEE8,
-	8827:  0xAEEB,
-	8828:  0xAEED,
-	8829:  0xAEF4,
-	8830:  0xAEF8,
-	8831:  0xAEFC,
-	8832:  0xAF07,
-	8833:  0xAF08,
-	8834:  0xAF0D,
-	8835:  0xAF10,
-	8836:  0xAF2C,
-	8837:  0xAF2D,
-	8838:  0xAF30,
-	8839:  0xAF32,
-	8840:  0xAF34,
-	8841:  0xAF3C,
-	8842:  0xAF3D,
-	8843:  0xAF3F,
-	8844:  0xAF41,
-	8845:  0xAF42,
-	8846:  0xAF43,
-	8847:  0xAF48,
-	8848:  0xAF49,
-	8849:  0xAF50,
-	8850:  0xAF5C,
-	8851:  0xAF5D,
-	8852:  0xAF64,
-	8853:  0xAF65,
-	8854:  0xAF79,
-	8855:  0xAF80,
-	8856:  0xAF84,
-	8857:  0xAF88,
-	8858:  0xAF90,
-	8859:  0xAF91,
-	8860:  0xAF95,
-	8861:  0xAF9C,
-	8862:  0xAFB8,
-	8863:  0xAFB9,
-	8864:  0xAFBC,
-	8865:  0xAFC0,
-	8866:  0xAFC7,
-	8867:  0xAFC8,
-	8868:  0xAFC9,
-	8869:  0xAFCB,
-	8870:  0xAFCD,
-	8871:  0xAFCE,
-	8872:  0xAFD4,
-	8873:  0xAFDC,
-	8874:  0xAFE8,
-	8875:  0xAFE9,
-	8876:  0xAFF0,
-	8877:  0xAFF1,
-	8878:  0xAFF4,
-	8879:  0xAFF8,
-	8880:  0xB000,
-	8881:  0xB001,
-	8882:  0xB004,
-	8883:  0xB00C,
-	8884:  0xB010,
-	8885:  0xB014,
-	8886:  0xB01C,
-	8887:  0xB01D,
-	8888:  0xB028,
-	8889:  0xB044,
-	8890:  0xB045,
-	8891:  0xB048,
-	8892:  0xB04A,
-	8893:  0xB04C,
-	8894:  0xB04E,
-	8895:  0xB053,
-	8896:  0xB054,
-	8897:  0xB055,
-	8898:  0xB057,
-	8899:  0xB059,
-	8900:  0xCFCC,
-	8901:  0xCFCD,
-	8902:  0xCFCE,
-	8903:  0xCFCF,
-	8904:  0xCFD0,
-	8905:  0xCFD1,
-	8906:  0xCFD2,
-	8907:  0xCFD3,
-	8908:  0xCFD4,
-	8909:  0xCFD5,
-	8910:  0xCFD6,
-	8911:  0xCFD7,
-	8912:  0xCFD8,
-	8913:  0xCFD9,
-	8914:  0xCFDA,
-	8915:  0xCFDB,
-	8916:  0xCFDC,
-	8917:  0xCFDD,
-	8918:  0xCFDE,
-	8919:  0xCFDF,
-	8920:  0xCFE2,
-	8921:  0xCFE3,
-	8922:  0xCFE5,
-	8923:  0xCFE6,
-	8924:  0xCFE7,
-	8925:  0xCFE9,
-	8926:  0xCFEA,
-	8927:  0xCFEB,
-	8928:  0xCFEC,
-	8929:  0xCFED,
-	8930:  0xCFEE,
-	8931:  0xCFEF,
-	8932:  0xCFF2,
-	8933:  0xCFF4,
-	8934:  0xCFF6,
-	8935:  0xCFF7,
-	8936:  0xCFF8,
-	8937:  0xCFF9,
-	8938:  0xCFFA,
-	8939:  0xCFFB,
-	8940:  0xCFFD,
-	8941:  0xCFFE,
-	8942:  0xCFFF,
-	8943:  0xD001,
-	8944:  0xD002,
-	8945:  0xD003,
-	8946:  0xD005,
-	8947:  0xD006,
-	8948:  0xD007,
-	8949:  0xD008,
-	8950:  0xD009,
-	8951:  0xD00A,
-	8952:  0xD00B,
-	8953:  0xD00C,
-	8954:  0xD00D,
-	8955:  0xD00E,
-	8956:  0xD00F,
-	8957:  0xD010,
-	8958:  0xD012,
-	8959:  0xD013,
-	8960:  0xD014,
-	8961:  0xD015,
-	8962:  0xD016,
-	8963:  0xD017,
-	8964:  0xD019,
-	8965:  0xD01A,
-	8966:  0xD01B,
-	8967:  0xD01C,
-	8968:  0xD01D,
-	8969:  0xD01E,
-	8970:  0xD01F,
-	8971:  0xD020,
-	8972:  0xD021,
-	8973:  0xD022,
-	8974:  0xD023,
-	8975:  0xD024,
-	8976:  0xD025,
-	8977:  0xD026,
-	8978:  0xD027,
-	8979:  0xD028,
-	8980:  0xD029,
-	8981:  0xD02A,
-	8982:  0xD02B,
-	8983:  0xD02C,
-	8984:  0xB05D,
-	8985:  0xB07C,
-	8986:  0xB07D,
-	8987:  0xB080,
-	8988:  0xB084,
-	8989:  0xB08C,
-	8990:  0xB08D,
-	8991:  0xB08F,
-	8992:  0xB091,
-	8993:  0xB098,
-	8994:  0xB099,
-	8995:  0xB09A,
-	8996:  0xB09C,
-	8997:  0xB09F,
-	8998:  0xB0A0,
-	8999:  0xB0A1,
-	9000:  0xB0A2,
-	9001:  0xB0A8,
-	9002:  0xB0A9,
-	9003:  0xB0AB,
-	9004:  0xB0AC,
-	9005:  0xB0AD,
-	9006:  0xB0AE,
-	9007:  0xB0AF,
-	9008:  0xB0B1,
-	9009:  0xB0B3,
-	9010:  0xB0B4,
-	9011:  0xB0B5,
-	9012:  0xB0B8,
-	9013:  0xB0BC,
-	9014:  0xB0C4,
-	9015:  0xB0C5,
-	9016:  0xB0C7,
-	9017:  0xB0C8,
-	9018:  0xB0C9,
-	9019:  0xB0D0,
-	9020:  0xB0D1,
-	9021:  0xB0D4,
-	9022:  0xB0D8,
-	9023:  0xB0E0,
-	9024:  0xB0E5,
-	9025:  0xB108,
-	9026:  0xB109,
-	9027:  0xB10B,
-	9028:  0xB10C,
-	9029:  0xB110,
-	9030:  0xB112,
-	9031:  0xB113,
-	9032:  0xB118,
-	9033:  0xB119,
-	9034:  0xB11B,
-	9035:  0xB11C,
-	9036:  0xB11D,
-	9037:  0xB123,
-	9038:  0xB124,
-	9039:  0xB125,
-	9040:  0xB128,
-	9041:  0xB12C,
-	9042:  0xB134,
-	9043:  0xB135,
-	9044:  0xB137,
-	9045:  0xB138,
-	9046:  0xB139,
-	9047:  0xB140,
-	9048:  0xB141,
-	9049:  0xB144,
-	9050:  0xB148,
-	9051:  0xB150,
-	9052:  0xB151,
-	9053:  0xB154,
-	9054:  0xB155,
-	9055:  0xB158,
-	9056:  0xB15C,
-	9057:  0xB160,
-	9058:  0xB178,
-	9059:  0xB179,
-	9060:  0xB17C,
-	9061:  0xB180,
-	9062:  0xB182,
-	9063:  0xB188,
-	9064:  0xB189,
-	9065:  0xB18B,
-	9066:  0xB18D,
-	9067:  0xB192,
-	9068:  0xB193,
-	9069:  0xB194,
-	9070:  0xB198,
-	9071:  0xB19C,
-	9072:  0xB1A8,
-	9073:  0xB1CC,
-	9074:  0xB1D0,
-	9075:  0xB1D4,
-	9076:  0xB1DC,
-	9077:  0xB1DD,
-	9078:  0xD02E,
-	9079:  0xD02F,
-	9080:  0xD030,
-	9081:  0xD031,
-	9082:  0xD032,
-	9083:  0xD033,
-	9084:  0xD036,
-	9085:  0xD037,
-	9086:  0xD039,
-	9087:  0xD03A,
-	9088:  0xD03B,
-	9089:  0xD03D,
-	9090:  0xD03E,
-	9091:  0xD03F,
-	9092:  0xD040,
-	9093:  0xD041,
-	9094:  0xD042,
-	9095:  0xD043,
-	9096:  0xD046,
-	9097:  0xD048,
-	9098:  0xD04A,
-	9099:  0xD04B,
-	9100:  0xD04C,
-	9101:  0xD04D,
-	9102:  0xD04E,
-	9103:  0xD04F,
-	9104:  0xD051,
-	9105:  0xD052,
-	9106:  0xD053,
-	9107:  0xD055,
-	9108:  0xD056,
-	9109:  0xD057,
-	9110:  0xD059,
-	9111:  0xD05A,
-	9112:  0xD05B,
-	9113:  0xD05C,
-	9114:  0xD05D,
-	9115:  0xD05E,
-	9116:  0xD05F,
-	9117:  0xD061,
-	9118:  0xD062,
-	9119:  0xD063,
-	9120:  0xD064,
-	9121:  0xD065,
-	9122:  0xD066,
-	9123:  0xD067,
-	9124:  0xD068,
-	9125:  0xD069,
-	9126:  0xD06A,
-	9127:  0xD06B,
-	9128:  0xD06E,
-	9129:  0xD06F,
-	9130:  0xD071,
-	9131:  0xD072,
-	9132:  0xD073,
-	9133:  0xD075,
-	9134:  0xD076,
-	9135:  0xD077,
-	9136:  0xD078,
-	9137:  0xD079,
-	9138:  0xD07A,
-	9139:  0xD07B,
-	9140:  0xD07E,
-	9141:  0xD07F,
-	9142:  0xD080,
-	9143:  0xD082,
-	9144:  0xD083,
-	9145:  0xD084,
-	9146:  0xD085,
-	9147:  0xD086,
-	9148:  0xD087,
-	9149:  0xD088,
-	9150:  0xD089,
-	9151:  0xD08A,
-	9152:  0xD08B,
-	9153:  0xD08C,
-	9154:  0xD08D,
-	9155:  0xD08E,
-	9156:  0xD08F,
-	9157:  0xD090,
-	9158:  0xD091,
-	9159:  0xD092,
-	9160:  0xD093,
-	9161:  0xD094,
-	9162:  0xB1DF,
-	9163:  0xB1E8,
-	9164:  0xB1E9,
-	9165:  0xB1EC,
-	9166:  0xB1F0,
-	9167:  0xB1F9,
-	9168:  0xB1FB,
-	9169:  0xB1FD,
-	9170:  0xB204,
-	9171:  0xB205,
-	9172:  0xB208,
-	9173:  0xB20B,
-	9174:  0xB20C,
-	9175:  0xB214,
-	9176:  0xB215,
-	9177:  0xB217,
-	9178:  0xB219,
-	9179:  0xB220,
-	9180:  0xB234,
-	9181:  0xB23C,
-	9182:  0xB258,
-	9183:  0xB25C,
-	9184:  0xB260,
-	9185:  0xB268,
-	9186:  0xB269,
-	9187:  0xB274,
-	9188:  0xB275,
-	9189:  0xB27C,
-	9190:  0xB284,
-	9191:  0xB285,
-	9192:  0xB289,
-	9193:  0xB290,
-	9194:  0xB291,
-	9195:  0xB294,
-	9196:  0xB298,
-	9197:  0xB299,
-	9198:  0xB29A,
-	9199:  0xB2A0,
-	9200:  0xB2A1,
-	9201:  0xB2A3,
-	9202:  0xB2A5,
-	9203:  0xB2A6,
-	9204:  0xB2AA,
-	9205:  0xB2AC,
-	9206:  0xB2B0,
-	9207:  0xB2B4,
-	9208:  0xB2C8,
-	9209:  0xB2C9,
-	9210:  0xB2CC,
-	9211:  0xB2D0,
-	9212:  0xB2D2,
-	9213:  0xB2D8,
-	9214:  0xB2D9,
-	9215:  0xB2DB,
-	9216:  0xB2DD,
-	9217:  0xB2E2,
-	9218:  0xB2E4,
-	9219:  0xB2E5,
-	9220:  0xB2E6,
-	9221:  0xB2E8,
-	9222:  0xB2EB,
-	9223:  0xB2EC,
-	9224:  0xB2ED,
-	9225:  0xB2EE,
-	9226:  0xB2EF,
-	9227:  0xB2F3,
-	9228:  0xB2F4,
-	9229:  0xB2F5,
-	9230:  0xB2F7,
-	9231:  0xB2F8,
-	9232:  0xB2F9,
-	9233:  0xB2FA,
-	9234:  0xB2FB,
-	9235:  0xB2FF,
-	9236:  0xB300,
-	9237:  0xB301,
-	9238:  0xB304,
-	9239:  0xB308,
-	9240:  0xB310,
-	9241:  0xB311,
-	9242:  0xB313,
-	9243:  0xB314,
-	9244:  0xB315,
-	9245:  0xB31C,
-	9246:  0xB354,
-	9247:  0xB355,
-	9248:  0xB356,
-	9249:  0xB358,
-	9250:  0xB35B,
-	9251:  0xB35C,
-	9252:  0xB35E,
-	9253:  0xB35F,
-	9254:  0xB364,
-	9255:  0xB365,
-	9256:  0xD095,
-	9257:  0xD096,
-	9258:  0xD097,
-	9259:  0xD098,
-	9260:  0xD099,
-	9261:  0xD09A,
-	9262:  0xD09B,
-	9263:  0xD09C,
-	9264:  0xD09D,
-	9265:  0xD09E,
-	9266:  0xD09F,
-	9267:  0xD0A0,
-	9268:  0xD0A1,
-	9269:  0xD0A2,
-	9270:  0xD0A3,
-	9271:  0xD0A6,
-	9272:  0xD0A7,
-	9273:  0xD0A9,
-	9274:  0xD0AA,
-	9275:  0xD0AB,
-	9276:  0xD0AD,
-	9277:  0xD0AE,
-	9278:  0xD0AF,
-	9279:  0xD0B0,
-	9280:  0xD0B1,
-	9281:  0xD0B2,
-	9282:  0xD0B3,
-	9283:  0xD0B6,
-	9284:  0xD0B8,
-	9285:  0xD0BA,
-	9286:  0xD0BB,
-	9287:  0xD0BC,
-	9288:  0xD0BD,
-	9289:  0xD0BE,
-	9290:  0xD0BF,
-	9291:  0xD0C2,
-	9292:  0xD0C3,
-	9293:  0xD0C5,
-	9294:  0xD0C6,
-	9295:  0xD0C7,
-	9296:  0xD0CA,
-	9297:  0xD0CB,
-	9298:  0xD0CC,
-	9299:  0xD0CD,
-	9300:  0xD0CE,
-	9301:  0xD0CF,
-	9302:  0xD0D2,
-	9303:  0xD0D6,
-	9304:  0xD0D7,
-	9305:  0xD0D8,
-	9306:  0xD0D9,
-	9307:  0xD0DA,
-	9308:  0xD0DB,
-	9309:  0xD0DE,
-	9310:  0xD0DF,
-	9311:  0xD0E1,
-	9312:  0xD0E2,
-	9313:  0xD0E3,
-	9314:  0xD0E5,
-	9315:  0xD0E6,
-	9316:  0xD0E7,
-	9317:  0xD0E8,
-	9318:  0xD0E9,
-	9319:  0xD0EA,
-	9320:  0xD0EB,
-	9321:  0xD0EE,
-	9322:  0xD0F2,
-	9323:  0xD0F3,
-	9324:  0xD0F4,
-	9325:  0xD0F5,
-	9326:  0xD0F6,
-	9327:  0xD0F7,
-	9328:  0xD0F9,
-	9329:  0xD0FA,
-	9330:  0xD0FB,
-	9331:  0xD0FC,
-	9332:  0xD0FD,
-	9333:  0xD0FE,
-	9334:  0xD0FF,
-	9335:  0xD100,
-	9336:  0xD101,
-	9337:  0xD102,
-	9338:  0xD103,
-	9339:  0xD104,
-	9340:  0xB367,
-	9341:  0xB369,
-	9342:  0xB36B,
-	9343:  0xB36E,
-	9344:  0xB370,
-	9345:  0xB371,
-	9346:  0xB374,
-	9347:  0xB378,
-	9348:  0xB380,
-	9349:  0xB381,
-	9350:  0xB383,
-	9351:  0xB384,
-	9352:  0xB385,
-	9353:  0xB38C,
-	9354:  0xB390,
-	9355:  0xB394,
-	9356:  0xB3A0,
-	9357:  0xB3A1,
-	9358:  0xB3A8,
-	9359:  0xB3AC,
-	9360:  0xB3C4,
-	9361:  0xB3C5,
-	9362:  0xB3C8,
-	9363:  0xB3CB,
-	9364:  0xB3CC,
-	9365:  0xB3CE,
-	9366:  0xB3D0,
-	9367:  0xB3D4,
-	9368:  0xB3D5,
-	9369:  0xB3D7,
-	9370:  0xB3D9,
-	9371:  0xB3DB,
-	9372:  0xB3DD,
-	9373:  0xB3E0,
-	9374:  0xB3E4,
-	9375:  0xB3E8,
-	9376:  0xB3FC,
-	9377:  0xB410,
-	9378:  0xB418,
-	9379:  0xB41C,
-	9380:  0xB420,
-	9381:  0xB428,
-	9382:  0xB429,
-	9383:  0xB42B,
-	9384:  0xB434,
-	9385:  0xB450,
-	9386:  0xB451,
-	9387:  0xB454,
-	9388:  0xB458,
-	9389:  0xB460,
-	9390:  0xB461,
-	9391:  0xB463,
-	9392:  0xB465,
-	9393:  0xB46C,
-	9394:  0xB480,
-	9395:  0xB488,
-	9396:  0xB49D,
-	9397:  0xB4A4,
-	9398:  0xB4A8,
-	9399:  0xB4AC,
-	9400:  0xB4B5,
-	9401:  0xB4B7,
-	9402:  0xB4B9,
-	9403:  0xB4C0,
-	9404:  0xB4C4,
-	9405:  0xB4C8,
-	9406:  0xB4D0,
-	9407:  0xB4D5,
-	9408:  0xB4DC,
-	9409:  0xB4DD,
-	9410:  0xB4E0,
-	9411:  0xB4E3,
-	9412:  0xB4E4,
-	9413:  0xB4E6,
-	9414:  0xB4EC,
-	9415:  0xB4ED,
-	9416:  0xB4EF,
-	9417:  0xB4F1,
-	9418:  0xB4F8,
-	9419:  0xB514,
-	9420:  0xB515,
-	9421:  0xB518,
-	9422:  0xB51B,
-	9423:  0xB51C,
-	9424:  0xB524,
-	9425:  0xB525,
-	9426:  0xB527,
-	9427:  0xB528,
-	9428:  0xB529,
-	9429:  0xB52A,
-	9430:  0xB530,
-	9431:  0xB531,
-	9432:  0xB534,
-	9433:  0xB538,
-	9434:  0xD105,
-	9435:  0xD106,
-	9436:  0xD107,
-	9437:  0xD108,
-	9438:  0xD109,
-	9439:  0xD10A,
-	9440:  0xD10B,
-	9441:  0xD10C,
-	9442:  0xD10E,
-	9443:  0xD10F,
-	9444:  0xD110,
-	9445:  0xD111,
-	9446:  0xD112,
-	9447:  0xD113,
-	9448:  0xD114,
-	9449:  0xD115,
-	9450:  0xD116,
-	9451:  0xD117,
-	9452:  0xD118,
-	9453:  0xD119,
-	9454:  0xD11A,
-	9455:  0xD11B,
-	9456:  0xD11C,
-	9457:  0xD11D,
-	9458:  0xD11E,
-	9459:  0xD11F,
-	9460:  0xD120,
-	9461:  0xD121,
-	9462:  0xD122,
-	9463:  0xD123,
-	9464:  0xD124,
-	9465:  0xD125,
-	9466:  0xD126,
-	9467:  0xD127,
-	9468:  0xD128,
-	9469:  0xD129,
-	9470:  0xD12A,
-	9471:  0xD12B,
-	9472:  0xD12C,
-	9473:  0xD12D,
-	9474:  0xD12E,
-	9475:  0xD12F,
-	9476:  0xD132,
-	9477:  0xD133,
-	9478:  0xD135,
-	9479:  0xD136,
-	9480:  0xD137,
-	9481:  0xD139,
-	9482:  0xD13B,
-	9483:  0xD13C,
-	9484:  0xD13D,
-	9485:  0xD13E,
-	9486:  0xD13F,
-	9487:  0xD142,
-	9488:  0xD146,
-	9489:  0xD147,
-	9490:  0xD148,
-	9491:  0xD149,
-	9492:  0xD14A,
-	9493:  0xD14B,
-	9494:  0xD14E,
-	9495:  0xD14F,
-	9496:  0xD151,
-	9497:  0xD152,
-	9498:  0xD153,
-	9499:  0xD155,
-	9500:  0xD156,
-	9501:  0xD157,
-	9502:  0xD158,
-	9503:  0xD159,
-	9504:  0xD15A,
-	9505:  0xD15B,
-	9506:  0xD15E,
-	9507:  0xD160,
-	9508:  0xD162,
-	9509:  0xD163,
-	9510:  0xD164,
-	9511:  0xD165,
-	9512:  0xD166,
-	9513:  0xD167,
-	9514:  0xD169,
-	9515:  0xD16A,
-	9516:  0xD16B,
-	9517:  0xD16D,
-	9518:  0xB540,
-	9519:  0xB541,
-	9520:  0xB543,
-	9521:  0xB544,
-	9522:  0xB545,
-	9523:  0xB54B,
-	9524:  0xB54C,
-	9525:  0xB54D,
-	9526:  0xB550,
-	9527:  0xB554,
-	9528:  0xB55C,
-	9529:  0xB55D,
-	9530:  0xB55F,
-	9531:  0xB560,
-	9532:  0xB561,
-	9533:  0xB5A0,
-	9534:  0xB5A1,
-	9535:  0xB5A4,
-	9536:  0xB5A8,
-	9537:  0xB5AA,
-	9538:  0xB5AB,
-	9539:  0xB5B0,
-	9540:  0xB5B1,
-	9541:  0xB5B3,
-	9542:  0xB5B4,
-	9543:  0xB5B5,
-	9544:  0xB5BB,
-	9545:  0xB5BC,
-	9546:  0xB5BD,
-	9547:  0xB5C0,
-	9548:  0xB5C4,
-	9549:  0xB5CC,
-	9550:  0xB5CD,
-	9551:  0xB5CF,
-	9552:  0xB5D0,
-	9553:  0xB5D1,
-	9554:  0xB5D8,
-	9555:  0xB5EC,
-	9556:  0xB610,
-	9557:  0xB611,
-	9558:  0xB614,
-	9559:  0xB618,
-	9560:  0xB625,
-	9561:  0xB62C,
-	9562:  0xB634,
-	9563:  0xB648,
-	9564:  0xB664,
-	9565:  0xB668,
-	9566:  0xB69C,
-	9567:  0xB69D,
-	9568:  0xB6A0,
-	9569:  0xB6A4,
-	9570:  0xB6AB,
-	9571:  0xB6AC,
-	9572:  0xB6B1,
-	9573:  0xB6D4,
-	9574:  0xB6F0,
-	9575:  0xB6F4,
-	9576:  0xB6F8,
-	9577:  0xB700,
-	9578:  0xB701,
-	9579:  0xB705,
-	9580:  0xB728,
-	9581:  0xB729,
-	9582:  0xB72C,
-	9583:  0xB72F,
-	9584:  0xB730,
-	9585:  0xB738,
-	9586:  0xB739,
-	9587:  0xB73B,
-	9588:  0xB744,
-	9589:  0xB748,
-	9590:  0xB74C,
-	9591:  0xB754,
-	9592:  0xB755,
-	9593:  0xB760,
-	9594:  0xB764,
-	9595:  0xB768,
-	9596:  0xB770,
-	9597:  0xB771,
-	9598:  0xB773,
-	9599:  0xB775,
-	9600:  0xB77C,
-	9601:  0xB77D,
-	9602:  0xB780,
-	9603:  0xB784,
-	9604:  0xB78C,
-	9605:  0xB78D,
-	9606:  0xB78F,
-	9607:  0xB790,
-	9608:  0xB791,
-	9609:  0xB792,
-	9610:  0xB796,
-	9611:  0xB797,
-	9612:  0xD16E,
-	9613:  0xD16F,
-	9614:  0xD170,
-	9615:  0xD171,
-	9616:  0xD172,
-	9617:  0xD173,
-	9618:  0xD174,
-	9619:  0xD175,
-	9620:  0xD176,
-	9621:  0xD177,
-	9622:  0xD178,
-	9623:  0xD179,
-	9624:  0xD17A,
-	9625:  0xD17B,
-	9626:  0xD17D,
-	9627:  0xD17E,
-	9628:  0xD17F,
-	9629:  0xD180,
-	9630:  0xD181,
-	9631:  0xD182,
-	9632:  0xD183,
-	9633:  0xD185,
-	9634:  0xD186,
-	9635:  0xD187,
-	9636:  0xD189,
-	9637:  0xD18A,
-	9638:  0xD18B,
-	9639:  0xD18C,
-	9640:  0xD18D,
-	9641:  0xD18E,
-	9642:  0xD18F,
-	9643:  0xD190,
-	9644:  0xD191,
-	9645:  0xD192,
-	9646:  0xD193,
-	9647:  0xD194,
-	9648:  0xD195,
-	9649:  0xD196,
-	9650:  0xD197,
-	9651:  0xD198,
-	9652:  0xD199,
-	9653:  0xD19A,
-	9654:  0xD19B,
-	9655:  0xD19C,
-	9656:  0xD19D,
-	9657:  0xD19E,
-	9658:  0xD19F,
-	9659:  0xD1A2,
-	9660:  0xD1A3,
-	9661:  0xD1A5,
-	9662:  0xD1A6,
-	9663:  0xD1A7,
-	9664:  0xD1A9,
-	9665:  0xD1AA,
-	9666:  0xD1AB,
-	9667:  0xD1AC,
-	9668:  0xD1AD,
-	9669:  0xD1AE,
-	9670:  0xD1AF,
-	9671:  0xD1B2,
-	9672:  0xD1B4,
-	9673:  0xD1B6,
-	9674:  0xD1B7,
-	9675:  0xD1B8,
-	9676:  0xD1B9,
-	9677:  0xD1BB,
-	9678:  0xD1BD,
-	9679:  0xD1BE,
-	9680:  0xD1BF,
-	9681:  0xD1C1,
-	9682:  0xD1C2,
-	9683:  0xD1C3,
-	9684:  0xD1C4,
-	9685:  0xD1C5,
-	9686:  0xD1C6,
-	9687:  0xD1C7,
-	9688:  0xD1C8,
-	9689:  0xD1C9,
-	9690:  0xD1CA,
-	9691:  0xD1CB,
-	9692:  0xD1CC,
-	9693:  0xD1CD,
-	9694:  0xD1CE,
-	9695:  0xD1CF,
-	9696:  0xB798,
-	9697:  0xB799,
-	9698:  0xB79C,
-	9699:  0xB7A0,
-	9700:  0xB7A8,
-	9701:  0xB7A9,
-	9702:  0xB7AB,
-	9703:  0xB7AC,
-	9704:  0xB7AD,
-	9705:  0xB7B4,
-	9706:  0xB7B5,
-	9707:  0xB7B8,
-	9708:  0xB7C7,
-	9709:  0xB7C9,
-	9710:  0xB7EC,
-	9711:  0xB7ED,
-	9712:  0xB7F0,
-	9713:  0xB7F4,
-	9714:  0xB7FC,
-	9715:  0xB7FD,
-	9716:  0xB7FF,
-	9717:  0xB800,
-	9718:  0xB801,
-	9719:  0xB807,
-	9720:  0xB808,
-	9721:  0xB809,
-	9722:  0xB80C,
-	9723:  0xB810,
-	9724:  0xB818,
-	9725:  0xB819,
-	9726:  0xB81B,
-	9727:  0xB81D,
-	9728:  0xB824,
-	9729:  0xB825,
-	9730:  0xB828,
-	9731:  0xB82C,
-	9732:  0xB834,
-	9733:  0xB835,
-	9734:  0xB837,
-	9735:  0xB838,
-	9736:  0xB839,
-	9737:  0xB840,
-	9738:  0xB844,
-	9739:  0xB851,
-	9740:  0xB853,
-	9741:  0xB85C,
-	9742:  0xB85D,
-	9743:  0xB860,
-	9744:  0xB864,
-	9745:  0xB86C,
-	9746:  0xB86D,
-	9747:  0xB86F,
-	9748:  0xB871,
-	9749:  0xB878,
-	9750:  0xB87C,
-	9751:  0xB88D,
-	9752:  0xB8A8,
-	9753:  0xB8B0,
-	9754:  0xB8B4,
-	9755:  0xB8B8,
-	9756:  0xB8C0,
-	9757:  0xB8C1,
-	9758:  0xB8C3,
-	9759:  0xB8C5,
-	9760:  0xB8CC,
-	9761:  0xB8D0,
-	9762:  0xB8D4,
-	9763:  0xB8DD,
-	9764:  0xB8DF,
-	9765:  0xB8E1,
-	9766:  0xB8E8,
-	9767:  0xB8E9,
-	9768:  0xB8EC,
-	9769:  0xB8F0,
-	9770:  0xB8F8,
-	9771:  0xB8F9,
-	9772:  0xB8FB,
-	9773:  0xB8FD,
-	9774:  0xB904,
-	9775:  0xB918,
-	9776:  0xB920,
-	9777:  0xB93C,
-	9778:  0xB93D,
-	9779:  0xB940,
-	9780:  0xB944,
-	9781:  0xB94C,
-	9782:  0xB94F,
-	9783:  0xB951,
-	9784:  0xB958,
-	9785:  0xB959,
-	9786:  0xB95C,
-	9787:  0xB960,
-	9788:  0xB968,
-	9789:  0xB969,
-	9790:  0xD1D0,
-	9791:  0xD1D1,
-	9792:  0xD1D2,
-	9793:  0xD1D3,
-	9794:  0xD1D4,
-	9795:  0xD1D5,
-	9796:  0xD1D6,
-	9797:  0xD1D7,
-	9798:  0xD1D9,
-	9799:  0xD1DA,
-	9800:  0xD1DB,
-	9801:  0xD1DC,
-	9802:  0xD1DD,
-	9803:  0xD1DE,
-	9804:  0xD1DF,
-	9805:  0xD1E0,
-	9806:  0xD1E1,
-	9807:  0xD1E2,
-	9808:  0xD1E3,
-	9809:  0xD1E4,
-	9810:  0xD1E5,
-	9811:  0xD1E6,
-	9812:  0xD1E7,
-	9813:  0xD1E8,
-	9814:  0xD1E9,
-	9815:  0xD1EA,
-	9816:  0xD1EB,
-	9817:  0xD1EC,
-	9818:  0xD1ED,
-	9819:  0xD1EE,
-	9820:  0xD1EF,
-	9821:  0xD1F0,
-	9822:  0xD1F1,
-	9823:  0xD1F2,
-	9824:  0xD1F3,
-	9825:  0xD1F5,
-	9826:  0xD1F6,
-	9827:  0xD1F7,
-	9828:  0xD1F9,
-	9829:  0xD1FA,
-	9830:  0xD1FB,
-	9831:  0xD1FC,
-	9832:  0xD1FD,
-	9833:  0xD1FE,
-	9834:  0xD1FF,
-	9835:  0xD200,
-	9836:  0xD201,
-	9837:  0xD202,
-	9838:  0xD203,
-	9839:  0xD204,
-	9840:  0xD205,
-	9841:  0xD206,
-	9842:  0xD208,
-	9843:  0xD20A,
-	9844:  0xD20B,
-	9845:  0xD20C,
-	9846:  0xD20D,
-	9847:  0xD20E,
-	9848:  0xD20F,
-	9849:  0xD211,
-	9850:  0xD212,
-	9851:  0xD213,
-	9852:  0xD214,
-	9853:  0xD215,
-	9854:  0xD216,
-	9855:  0xD217,
-	9856:  0xD218,
-	9857:  0xD219,
-	9858:  0xD21A,
-	9859:  0xD21B,
-	9860:  0xD21C,
-	9861:  0xD21D,
-	9862:  0xD21E,
-	9863:  0xD21F,
-	9864:  0xD220,
-	9865:  0xD221,
-	9866:  0xD222,
-	9867:  0xD223,
-	9868:  0xD224,
-	9869:  0xD225,
-	9870:  0xD226,
-	9871:  0xD227,
-	9872:  0xD228,
-	9873:  0xD229,
-	9874:  0xB96B,
-	9875:  0xB96D,
-	9876:  0xB974,
-	9877:  0xB975,
-	9878:  0xB978,
-	9879:  0xB97C,
-	9880:  0xB984,
-	9881:  0xB985,
-	9882:  0xB987,
-	9883:  0xB989,
-	9884:  0xB98A,
-	9885:  0xB98D,
-	9886:  0xB98E,
-	9887:  0xB9AC,
-	9888:  0xB9AD,
-	9889:  0xB9B0,
-	9890:  0xB9B4,
-	9891:  0xB9BC,
-	9892:  0xB9BD,
-	9893:  0xB9BF,
-	9894:  0xB9C1,
-	9895:  0xB9C8,
-	9896:  0xB9C9,
-	9897:  0xB9CC,
-	9898:  0xB9CE,
-	9899:  0xB9CF,
-	9900:  0xB9D0,
-	9901:  0xB9D1,
-	9902:  0xB9D2,
-	9903:  0xB9D8,
-	9904:  0xB9D9,
-	9905:  0xB9DB,
-	9906:  0xB9DD,
-	9907:  0xB9DE,
-	9908:  0xB9E1,
-	9909:  0xB9E3,
-	9910:  0xB9E4,
-	9911:  0xB9E5,
-	9912:  0xB9E8,
-	9913:  0xB9EC,
-	9914:  0xB9F4,
-	9915:  0xB9F5,
-	9916:  0xB9F7,
-	9917:  0xB9F8,
-	9918:  0xB9F9,
-	9919:  0xB9FA,
-	9920:  0xBA00,
-	9921:  0xBA01,
-	9922:  0xBA08,
-	9923:  0xBA15,
-	9924:  0xBA38,
-	9925:  0xBA39,
-	9926:  0xBA3C,
-	9927:  0xBA40,
-	9928:  0xBA42,
-	9929:  0xBA48,
-	9930:  0xBA49,
-	9931:  0xBA4B,
-	9932:  0xBA4D,
-	9933:  0xBA4E,
-	9934:  0xBA53,
-	9935:  0xBA54,
-	9936:  0xBA55,
-	9937:  0xBA58,
-	9938:  0xBA5C,
-	9939:  0xBA64,
-	9940:  0xBA65,
-	9941:  0xBA67,
-	9942:  0xBA68,
-	9943:  0xBA69,
-	9944:  0xBA70,
-	9945:  0xBA71,
-	9946:  0xBA74,
-	9947:  0xBA78,
-	9948:  0xBA83,
-	9949:  0xBA84,
-	9950:  0xBA85,
-	9951:  0xBA87,
-	9952:  0xBA8C,
-	9953:  0xBAA8,
-	9954:  0xBAA9,
-	9955:  0xBAAB,
-	9956:  0xBAAC,
-	9957:  0xBAB0,
-	9958:  0xBAB2,
-	9959:  0xBAB8,
-	9960:  0xBAB9,
-	9961:  0xBABB,
-	9962:  0xBABD,
-	9963:  0xBAC4,
-	9964:  0xBAC8,
-	9965:  0xBAD8,
-	9966:  0xBAD9,
-	9967:  0xBAFC,
-	9968:  0xD22A,
-	9969:  0xD22B,
-	9970:  0xD22E,
-	9971:  0xD22F,
-	9972:  0xD231,
-	9973:  0xD232,
-	9974:  0xD233,
-	9975:  0xD235,
-	9976:  0xD236,
-	9977:  0xD237,
-	9978:  0xD238,
-	9979:  0xD239,
-	9980:  0xD23A,
-	9981:  0xD23B,
-	9982:  0xD23E,
-	9983:  0xD240,
-	9984:  0xD242,
-	9985:  0xD243,
-	9986:  0xD244,
-	9987:  0xD245,
-	9988:  0xD246,
-	9989:  0xD247,
-	9990:  0xD249,
-	9991:  0xD24A,
-	9992:  0xD24B,
-	9993:  0xD24C,
-	9994:  0xD24D,
-	9995:  0xD24E,
-	9996:  0xD24F,
-	9997:  0xD250,
-	9998:  0xD251,
-	9999:  0xD252,
-	10000: 0xD253,
-	10001: 0xD254,
-	10002: 0xD255,
-	10003: 0xD256,
-	10004: 0xD257,
-	10005: 0xD258,
-	10006: 0xD259,
-	10007: 0xD25A,
-	10008: 0xD25B,
-	10009: 0xD25D,
-	10010: 0xD25E,
-	10011: 0xD25F,
-	10012: 0xD260,
-	10013: 0xD261,
-	10014: 0xD262,
-	10015: 0xD263,
-	10016: 0xD265,
-	10017: 0xD266,
-	10018: 0xD267,
-	10019: 0xD268,
-	10020: 0xD269,
-	10021: 0xD26A,
-	10022: 0xD26B,
-	10023: 0xD26C,
-	10024: 0xD26D,
-	10025: 0xD26E,
-	10026: 0xD26F,
-	10027: 0xD270,
-	10028: 0xD271,
-	10029: 0xD272,
-	10030: 0xD273,
-	10031: 0xD274,
-	10032: 0xD275,
-	10033: 0xD276,
-	10034: 0xD277,
-	10035: 0xD278,
-	10036: 0xD279,
-	10037: 0xD27A,
-	10038: 0xD27B,
-	10039: 0xD27C,
-	10040: 0xD27D,
-	10041: 0xD27E,
-	10042: 0xD27F,
-	10043: 0xD282,
-	10044: 0xD283,
-	10045: 0xD285,
-	10046: 0xD286,
-	10047: 0xD287,
-	10048: 0xD289,
-	10049: 0xD28A,
-	10050: 0xD28B,
-	10051: 0xD28C,
-	10052: 0xBB00,
-	10053: 0xBB04,
-	10054: 0xBB0D,
-	10055: 0xBB0F,
-	10056: 0xBB11,
-	10057: 0xBB18,
-	10058: 0xBB1C,
-	10059: 0xBB20,
-	10060: 0xBB29,
-	10061: 0xBB2B,
-	10062: 0xBB34,
-	10063: 0xBB35,
-	10064: 0xBB36,
-	10065: 0xBB38,
-	10066: 0xBB3B,
-	10067: 0xBB3C,
-	10068: 0xBB3D,
-	10069: 0xBB3E,
-	10070: 0xBB44,
-	10071: 0xBB45,
-	10072: 0xBB47,
-	10073: 0xBB49,
-	10074: 0xBB4D,
-	10075: 0xBB4F,
-	10076: 0xBB50,
-	10077: 0xBB54,
-	10078: 0xBB58,
-	10079: 0xBB61,
-	10080: 0xBB63,
-	10081: 0xBB6C,
-	10082: 0xBB88,
-	10083: 0xBB8C,
-	10084: 0xBB90,
-	10085: 0xBBA4,
-	10086: 0xBBA8,
-	10087: 0xBBAC,
-	10088: 0xBBB4,
-	10089: 0xBBB7,
-	10090: 0xBBC0,
-	10091: 0xBBC4,
-	10092: 0xBBC8,
-	10093: 0xBBD0,
-	10094: 0xBBD3,
-	10095: 0xBBF8,
-	10096: 0xBBF9,
-	10097: 0xBBFC,
-	10098: 0xBBFF,
-	10099: 0xBC00,
-	10100: 0xBC02,
-	10101: 0xBC08,
-	10102: 0xBC09,
-	10103: 0xBC0B,
-	10104: 0xBC0C,
-	10105: 0xBC0D,
-	10106: 0xBC0F,
-	10107: 0xBC11,
-	10108: 0xBC14,
-	10109: 0xBC15,
-	10110: 0xBC16,
-	10111: 0xBC17,
-	10112: 0xBC18,
-	10113: 0xBC1B,
-	10114: 0xBC1C,
-	10115: 0xBC1D,
-	10116: 0xBC1E,
-	10117: 0xBC1F,
-	10118: 0xBC24,
-	10119: 0xBC25,
-	10120: 0xBC27,
-	10121: 0xBC29,
-	10122: 0xBC2D,
-	10123: 0xBC30,
-	10124: 0xBC31,
-	10125: 0xBC34,
-	10126: 0xBC38,
-	10127: 0xBC40,
-	10128: 0xBC41,
-	10129: 0xBC43,
-	10130: 0xBC44,
-	10131: 0xBC45,
-	10132: 0xBC49,
-	10133: 0xBC4C,
-	10134: 0xBC4D,
-	10135: 0xBC50,
-	10136: 0xBC5D,
-	10137: 0xBC84,
-	10138: 0xBC85,
-	10139: 0xBC88,
-	10140: 0xBC8B,
-	10141: 0xBC8C,
-	10142: 0xBC8E,
-	10143: 0xBC94,
-	10144: 0xBC95,
-	10145: 0xBC97,
-	10146: 0xD28D,
-	10147: 0xD28E,
-	10148: 0xD28F,
-	10149: 0xD292,
-	10150: 0xD293,
-	10151: 0xD294,
-	10152: 0xD296,
-	10153: 0xD297,
-	10154: 0xD298,
-	10155: 0xD299,
-	10156: 0xD29A,
-	10157: 0xD29B,
-	10158: 0xD29D,
-	10159: 0xD29E,
-	10160: 0xD29F,
-	10161: 0xD2A1,
-	10162: 0xD2A2,
-	10163: 0xD2A3,
-	10164: 0xD2A5,
-	10165: 0xD2A6,
-	10166: 0xD2A7,
-	10167: 0xD2A8,
-	10168: 0xD2A9,
-	10169: 0xD2AA,
-	10170: 0xD2AB,
-	10171: 0xD2AD,
-	10172: 0xD2AE,
-	10173: 0xD2AF,
-	10174: 0xD2B0,
-	10175: 0xD2B2,
-	10176: 0xD2B3,
-	10177: 0xD2B4,
-	10178: 0xD2B5,
-	10179: 0xD2B6,
-	10180: 0xD2B7,
-	10181: 0xD2BA,
-	10182: 0xD2BB,
-	10183: 0xD2BD,
-	10184: 0xD2BE,
-	10185: 0xD2C1,
-	10186: 0xD2C3,
-	10187: 0xD2C4,
-	10188: 0xD2C5,
-	10189: 0xD2C6,
-	10190: 0xD2C7,
-	10191: 0xD2CA,
-	10192: 0xD2CC,
-	10193: 0xD2CD,
-	10194: 0xD2CE,
-	10195: 0xD2CF,
-	10196: 0xD2D0,
-	10197: 0xD2D1,
-	10198: 0xD2D2,
-	10199: 0xD2D3,
-	10200: 0xD2D5,
-	10201: 0xD2D6,
-	10202: 0xD2D7,
-	10203: 0xD2D9,
-	10204: 0xD2DA,
-	10205: 0xD2DB,
-	10206: 0xD2DD,
-	10207: 0xD2DE,
-	10208: 0xD2DF,
-	10209: 0xD2E0,
-	10210: 0xD2E1,
-	10211: 0xD2E2,
-	10212: 0xD2E3,
-	10213: 0xD2E6,
-	10214: 0xD2E7,
-	10215: 0xD2E8,
-	10216: 0xD2E9,
-	10217: 0xD2EA,
-	10218: 0xD2EB,
-	10219: 0xD2EC,
-	10220: 0xD2ED,
-	10221: 0xD2EE,
-	10222: 0xD2EF,
-	10223: 0xD2F2,
-	10224: 0xD2F3,
-	10225: 0xD2F5,
-	10226: 0xD2F6,
-	10227: 0xD2F7,
-	10228: 0xD2F9,
-	10229: 0xD2FA,
-	10230: 0xBC99,
-	10231: 0xBC9A,
-	10232: 0xBCA0,
-	10233: 0xBCA1,
-	10234: 0xBCA4,
-	10235: 0xBCA7,
-	10236: 0xBCA8,
-	10237: 0xBCB0,
-	10238: 0xBCB1,
-	10239: 0xBCB3,
-	10240: 0xBCB4,
-	10241: 0xBCB5,
-	10242: 0xBCBC,
-	10243: 0xBCBD,
-	10244: 0xBCC0,
-	10245: 0xBCC4,
-	10246: 0xBCCD,
-	10247: 0xBCCF,
-	10248: 0xBCD0,
-	10249: 0xBCD1,
-	10250: 0xBCD5,
-	10251: 0xBCD8,
-	10252: 0xBCDC,
-	10253: 0xBCF4,
-	10254: 0xBCF5,
-	10255: 0xBCF6,
-	10256: 0xBCF8,
-	10257: 0xBCFC,
-	10258: 0xBD04,
-	10259: 0xBD05,
-	10260: 0xBD07,
-	10261: 0xBD09,
-	10262: 0xBD10,
-	10263: 0xBD14,
-	10264: 0xBD24,
-	10265: 0xBD2C,
-	10266: 0xBD40,
-	10267: 0xBD48,
-	10268: 0xBD49,
-	10269: 0xBD4C,
-	10270: 0xBD50,
-	10271: 0xBD58,
-	10272: 0xBD59,
-	10273: 0xBD64,
-	10274: 0xBD68,
-	10275: 0xBD80,
-	10276: 0xBD81,
-	10277: 0xBD84,
-	10278: 0xBD87,
-	10279: 0xBD88,
-	10280: 0xBD89,
-	10281: 0xBD8A,
-	10282: 0xBD90,
-	10283: 0xBD91,
-	10284: 0xBD93,
-	10285: 0xBD95,
-	10286: 0xBD99,
-	10287: 0xBD9A,
-	10288: 0xBD9C,
-	10289: 0xBDA4,
-	10290: 0xBDB0,
-	10291: 0xBDB8,
-	10292: 0xBDD4,
-	10293: 0xBDD5,
-	10294: 0xBDD8,
-	10295: 0xBDDC,
-	10296: 0xBDE9,
-	10297: 0xBDF0,
-	10298: 0xBDF4,
-	10299: 0xBDF8,
-	10300: 0xBE00,
-	10301: 0xBE03,
-	10302: 0xBE05,
-	10303: 0xBE0C,
-	10304: 0xBE0D,
-	10305: 0xBE10,
-	10306: 0xBE14,
-	10307: 0xBE1C,
-	10308: 0xBE1D,
-	10309: 0xBE1F,
-	10310: 0xBE44,
-	10311: 0xBE45,
-	10312: 0xBE48,
-	10313: 0xBE4C,
-	10314: 0xBE4E,
-	10315: 0xBE54,
-	10316: 0xBE55,
-	10317: 0xBE57,
-	10318: 0xBE59,
-	10319: 0xBE5A,
-	10320: 0xBE5B,
-	10321: 0xBE60,
-	10322: 0xBE61,
-	10323: 0xBE64,
-	10324: 0xD2FB,
-	10325: 0xD2FC,
-	10326: 0xD2FD,
-	10327: 0xD2FE,
-	10328: 0xD2FF,
-	10329: 0xD302,
-	10330: 0xD304,
-	10331: 0xD306,
-	10332: 0xD307,
-	10333: 0xD308,
-	10334: 0xD309,
-	10335: 0xD30A,
-	10336: 0xD30B,
-	10337: 0xD30F,
-	10338: 0xD311,
-	10339: 0xD312,
-	10340: 0xD313,
-	10341: 0xD315,
-	10342: 0xD317,
-	10343: 0xD318,
-	10344: 0xD319,
-	10345: 0xD31A,
-	10346: 0xD31B,
-	10347: 0xD31E,
-	10348: 0xD322,
-	10349: 0xD323,
-	10350: 0xD324,
-	10351: 0xD326,
-	10352: 0xD327,
-	10353: 0xD32A,
-	10354: 0xD32B,
-	10355: 0xD32D,
-	10356: 0xD32E,
-	10357: 0xD32F,
-	10358: 0xD331,
-	10359: 0xD332,
-	10360: 0xD333,
-	10361: 0xD334,
-	10362: 0xD335,
-	10363: 0xD336,
-	10364: 0xD337,
-	10365: 0xD33A,
-	10366: 0xD33E,
-	10367: 0xD33F,
-	10368: 0xD340,
-	10369: 0xD341,
-	10370: 0xD342,
-	10371: 0xD343,
-	10372: 0xD346,
-	10373: 0xD347,
-	10374: 0xD348,
-	10375: 0xD349,
-	10376: 0xD34A,
-	10377: 0xD34B,
-	10378: 0xD34C,
-	10379: 0xD34D,
-	10380: 0xD34E,
-	10381: 0xD34F,
-	10382: 0xD350,
-	10383: 0xD351,
-	10384: 0xD352,
-	10385: 0xD353,
-	10386: 0xD354,
-	10387: 0xD355,
-	10388: 0xD356,
-	10389: 0xD357,
-	10390: 0xD358,
-	10391: 0xD359,
-	10392: 0xD35A,
-	10393: 0xD35B,
-	10394: 0xD35C,
-	10395: 0xD35D,
-	10396: 0xD35E,
-	10397: 0xD35F,
-	10398: 0xD360,
-	10399: 0xD361,
-	10400: 0xD362,
-	10401: 0xD363,
-	10402: 0xD364,
-	10403: 0xD365,
-	10404: 0xD366,
-	10405: 0xD367,
-	10406: 0xD368,
-	10407: 0xD369,
-	10408: 0xBE68,
-	10409: 0xBE6A,
-	10410: 0xBE70,
-	10411: 0xBE71,
-	10412: 0xBE73,
-	10413: 0xBE74,
-	10414: 0xBE75,
-	10415: 0xBE7B,
-	10416: 0xBE7C,
-	10417: 0xBE7D,
-	10418: 0xBE80,
-	10419: 0xBE84,
-	10420: 0xBE8C,
-	10421: 0xBE8D,
-	10422: 0xBE8F,
-	10423: 0xBE90,
-	10424: 0xBE91,
-	10425: 0xBE98,
-	10426: 0xBE99,
-	10427: 0xBEA8,
-	10428: 0xBED0,
-	10429: 0xBED1,
-	10430: 0xBED4,
-	10431: 0xBED7,
-	10432: 0xBED8,
-	10433: 0xBEE0,
-	10434: 0xBEE3,
-	10435: 0xBEE4,
-	10436: 0xBEE5,
-	10437: 0xBEEC,
-	10438: 0xBF01,
-	10439: 0xBF08,
-	10440: 0xBF09,
-	10441: 0xBF18,
-	10442: 0xBF19,
-	10443: 0xBF1B,
-	10444: 0xBF1C,
-	10445: 0xBF1D,
-	10446: 0xBF40,
-	10447: 0xBF41,
-	10448: 0xBF44,
-	10449: 0xBF48,
-	10450: 0xBF50,
-	10451: 0xBF51,
-	10452: 0xBF55,
-	10453: 0xBF94,
-	10454: 0xBFB0,
-	10455: 0xBFC5,
-	10456: 0xBFCC,
-	10457: 0xBFCD,
-	10458: 0xBFD0,
-	10459: 0xBFD4,
-	10460: 0xBFDC,
-	10461: 0xBFDF,
-	10462: 0xBFE1,
-	10463: 0xC03C,
-	10464: 0xC051,
-	10465: 0xC058,
-	10466: 0xC05C,
-	10467: 0xC060,
-	10468: 0xC068,
-	10469: 0xC069,
-	10470: 0xC090,
-	10471: 0xC091,
-	10472: 0xC094,
-	10473: 0xC098,
-	10474: 0xC0A0,
-	10475: 0xC0A1,
-	10476: 0xC0A3,
-	10477: 0xC0A5,
-	10478: 0xC0AC,
-	10479: 0xC0AD,
-	10480: 0xC0AF,
-	10481: 0xC0B0,
-	10482: 0xC0B3,
-	10483: 0xC0B4,
-	10484: 0xC0B5,
-	10485: 0xC0B6,
-	10486: 0xC0BC,
-	10487: 0xC0BD,
-	10488: 0xC0BF,
-	10489: 0xC0C0,
-	10490: 0xC0C1,
-	10491: 0xC0C5,
-	10492: 0xC0C8,
-	10493: 0xC0C9,
-	10494: 0xC0CC,
-	10495: 0xC0D0,
-	10496: 0xC0D8,
-	10497: 0xC0D9,
-	10498: 0xC0DB,
-	10499: 0xC0DC,
-	10500: 0xC0DD,
-	10501: 0xC0E4,
-	10502: 0xD36A,
-	10503: 0xD36B,
-	10504: 0xD36C,
-	10505: 0xD36D,
-	10506: 0xD36E,
-	10507: 0xD36F,
-	10508: 0xD370,
-	10509: 0xD371,
-	10510: 0xD372,
-	10511: 0xD373,
-	10512: 0xD374,
-	10513: 0xD375,
-	10514: 0xD376,
-	10515: 0xD377,
-	10516: 0xD378,
-	10517: 0xD379,
-	10518: 0xD37A,
-	10519: 0xD37B,
-	10520: 0xD37E,
-	10521: 0xD37F,
-	10522: 0xD381,
-	10523: 0xD382,
-	10524: 0xD383,
-	10525: 0xD385,
-	10526: 0xD386,
-	10527: 0xD387,
-	10528: 0xD388,
-	10529: 0xD389,
-	10530: 0xD38A,
-	10531: 0xD38B,
-	10532: 0xD38E,
-	10533: 0xD392,
-	10534: 0xD393,
-	10535: 0xD394,
-	10536: 0xD395,
-	10537: 0xD396,
-	10538: 0xD397,
-	10539: 0xD39A,
-	10540: 0xD39B,
-	10541: 0xD39D,
-	10542: 0xD39E,
-	10543: 0xD39F,
-	10544: 0xD3A1,
-	10545: 0xD3A2,
-	10546: 0xD3A3,
-	10547: 0xD3A4,
-	10548: 0xD3A5,
-	10549: 0xD3A6,
-	10550: 0xD3A7,
-	10551: 0xD3AA,
-	10552: 0xD3AC,
-	10553: 0xD3AE,
-	10554: 0xD3AF,
-	10555: 0xD3B0,
-	10556: 0xD3B1,
-	10557: 0xD3B2,
-	10558: 0xD3B3,
-	10559: 0xD3B5,
-	10560: 0xD3B6,
-	10561: 0xD3B7,
-	10562: 0xD3B9,
-	10563: 0xD3BA,
-	10564: 0xD3BB,
-	10565: 0xD3BD,
-	10566: 0xD3BE,
-	10567: 0xD3BF,
-	10568: 0xD3C0,
-	10569: 0xD3C1,
-	10570: 0xD3C2,
-	10571: 0xD3C3,
-	10572: 0xD3C6,
-	10573: 0xD3C7,
-	10574: 0xD3CA,
-	10575: 0xD3CB,
-	10576: 0xD3CC,
-	10577: 0xD3CD,
-	10578: 0xD3CE,
-	10579: 0xD3CF,
-	10580: 0xD3D1,
-	10581: 0xD3D2,
-	10582: 0xD3D3,
-	10583: 0xD3D4,
-	10584: 0xD3D5,
-	10585: 0xD3D6,
-	10586: 0xC0E5,
-	10587: 0xC0E8,
-	10588: 0xC0EC,
-	10589: 0xC0F4,
-	10590: 0xC0F5,
-	10591: 0xC0F7,
-	10592: 0xC0F9,
-	10593: 0xC100,
-	10594: 0xC104,
-	10595: 0xC108,
-	10596: 0xC110,
-	10597: 0xC115,
-	10598: 0xC11C,
-	10599: 0xC11D,
-	10600: 0xC11E,
-	10601: 0xC11F,
-	10602: 0xC120,
-	10603: 0xC123,
-	10604: 0xC124,
-	10605: 0xC126,
-	10606: 0xC127,
-	10607: 0xC12C,
-	10608: 0xC12D,
-	10609: 0xC12F,
-	10610: 0xC130,
-	10611: 0xC131,
-	10612: 0xC136,
-	10613: 0xC138,
-	10614: 0xC139,
-	10615: 0xC13C,
-	10616: 0xC140,
-	10617: 0xC148,
-	10618: 0xC149,
-	10619: 0xC14B,
-	10620: 0xC14C,
-	10621: 0xC14D,
-	10622: 0xC154,
-	10623: 0xC155,
-	10624: 0xC158,
-	10625: 0xC15C,
-	10626: 0xC164,
-	10627: 0xC165,
-	10628: 0xC167,
-	10629: 0xC168,
-	10630: 0xC169,
-	10631: 0xC170,
-	10632: 0xC174,
-	10633: 0xC178,
-	10634: 0xC185,
-	10635: 0xC18C,
-	10636: 0xC18D,
-	10637: 0xC18E,
-	10638: 0xC190,
-	10639: 0xC194,
-	10640: 0xC196,
-	10641: 0xC19C,
-	10642: 0xC19D,
-	10643: 0xC19F,
-	10644: 0xC1A1,
-	10645: 0xC1A5,
-	10646: 0xC1A8,
-	10647: 0xC1A9,
-	10648: 0xC1AC,
-	10649: 0xC1B0,
-	10650: 0xC1BD,
-	10651: 0xC1C4,
-	10652: 0xC1C8,
-	10653: 0xC1CC,
-	10654: 0xC1D4,
-	10655: 0xC1D7,
-	10656: 0xC1D8,
-	10657: 0xC1E0,
-	10658: 0xC1E4,
-	10659: 0xC1E8,
-	10660: 0xC1F0,
-	10661: 0xC1F1,
-	10662: 0xC1F3,
-	10663: 0xC1FC,
-	10664: 0xC1FD,
-	10665: 0xC200,
-	10666: 0xC204,
-	10667: 0xC20C,
-	10668: 0xC20D,
-	10669: 0xC20F,
-	10670: 0xC211,
-	10671: 0xC218,
-	10672: 0xC219,
-	10673: 0xC21C,
-	10674: 0xC21F,
-	10675: 0xC220,
-	10676: 0xC228,
-	10677: 0xC229,
-	10678: 0xC22B,
-	10679: 0xC22D,
-	10680: 0xD3D7,
-	10681: 0xD3D9,
-	10682: 0xD3DA,
-	10683: 0xD3DB,
-	10684: 0xD3DC,
-	10685: 0xD3DD,
-	10686: 0xD3DE,
-	10687: 0xD3DF,
-	10688: 0xD3E0,
-	10689: 0xD3E2,
-	10690: 0xD3E4,
-	10691: 0xD3E5,
-	10692: 0xD3E6,
-	10693: 0xD3E7,
-	10694: 0xD3E8,
-	10695: 0xD3E9,
-	10696: 0xD3EA,
-	10697: 0xD3EB,
-	10698: 0xD3EE,
-	10699: 0xD3EF,
-	10700: 0xD3F1,
-	10701: 0xD3F2,
-	10702: 0xD3F3,
-	10703: 0xD3F5,
-	10704: 0xD3F6,
-	10705: 0xD3F7,
-	10706: 0xD3F8,
-	10707: 0xD3F9,
-	10708: 0xD3FA,
-	10709: 0xD3FB,
-	10710: 0xD3FE,
-	10711: 0xD400,
-	10712: 0xD402,
-	10713: 0xD403,
-	10714: 0xD404,
-	10715: 0xD405,
-	10716: 0xD406,
-	10717: 0xD407,
-	10718: 0xD409,
-	10719: 0xD40A,
-	10720: 0xD40B,
-	10721: 0xD40C,
-	10722: 0xD40D,
-	10723: 0xD40E,
-	10724: 0xD40F,
-	10725: 0xD410,
-	10726: 0xD411,
-	10727: 0xD412,
-	10728: 0xD413,
-	10729: 0xD414,
-	10730: 0xD415,
-	10731: 0xD416,
-	10732: 0xD417,
-	10733: 0xD418,
-	10734: 0xD419,
-	10735: 0xD41A,
-	10736: 0xD41B,
-	10737: 0xD41C,
-	10738: 0xD41E,
-	10739: 0xD41F,
-	10740: 0xD420,
-	10741: 0xD421,
-	10742: 0xD422,
-	10743: 0xD423,
-	10744: 0xD424,
-	10745: 0xD425,
-	10746: 0xD426,
-	10747: 0xD427,
-	10748: 0xD428,
-	10749: 0xD429,
-	10750: 0xD42A,
-	10751: 0xD42B,
-	10752: 0xD42C,
-	10753: 0xD42D,
-	10754: 0xD42E,
-	10755: 0xD42F,
-	10756: 0xD430,
-	10757: 0xD431,
-	10758: 0xD432,
-	10759: 0xD433,
-	10760: 0xD434,
-	10761: 0xD435,
-	10762: 0xD436,
-	10763: 0xD437,
-	10764: 0xC22F,
-	10765: 0xC231,
-	10766: 0xC232,
-	10767: 0xC234,
-	10768: 0xC248,
-	10769: 0xC250,
-	10770: 0xC251,
-	10771: 0xC254,
-	10772: 0xC258,
-	10773: 0xC260,
-	10774: 0xC265,
-	10775: 0xC26C,
-	10776: 0xC26D,
-	10777: 0xC270,
-	10778: 0xC274,
-	10779: 0xC27C,
-	10780: 0xC27D,
-	10781: 0xC27F,
-	10782: 0xC281,
-	10783: 0xC288,
-	10784: 0xC289,
-	10785: 0xC290,
-	10786: 0xC298,
-	10787: 0xC29B,
-	10788: 0xC29D,
-	10789: 0xC2A4,
-	10790: 0xC2A5,
-	10791: 0xC2A8,
-	10792: 0xC2AC,
-	10793: 0xC2AD,
-	10794: 0xC2B4,
-	10795: 0xC2B5,
-	10796: 0xC2B7,
-	10797: 0xC2B9,
-	10798: 0xC2DC,
-	10799: 0xC2DD,
-	10800: 0xC2E0,
-	10801: 0xC2E3,
-	10802: 0xC2E4,
-	10803: 0xC2EB,
-	10804: 0xC2EC,
-	10805: 0xC2ED,
-	10806: 0xC2EF,
-	10807: 0xC2F1,
-	10808: 0xC2F6,
-	10809: 0xC2F8,
-	10810: 0xC2F9,
-	10811: 0xC2FB,
-	10812: 0xC2FC,
-	10813: 0xC300,
-	10814: 0xC308,
-	10815: 0xC309,
-	10816: 0xC30C,
-	10817: 0xC30D,
-	10818: 0xC313,
-	10819: 0xC314,
-	10820: 0xC315,
-	10821: 0xC318,
-	10822: 0xC31C,
-	10823: 0xC324,
-	10824: 0xC325,
-	10825: 0xC328,
-	10826: 0xC329,
-	10827: 0xC345,
-	10828: 0xC368,
-	10829: 0xC369,
-	10830: 0xC36C,
-	10831: 0xC370,
-	10832: 0xC372,
-	10833: 0xC378,
-	10834: 0xC379,
-	10835: 0xC37C,
-	10836: 0xC37D,
-	10837: 0xC384,
-	10838: 0xC388,
-	10839: 0xC38C,
-	10840: 0xC3C0,
-	10841: 0xC3D8,
-	10842: 0xC3D9,
-	10843: 0xC3DC,
-	10844: 0xC3DF,
-	10845: 0xC3E0,
-	10846: 0xC3E2,
-	10847: 0xC3E8,
-	10848: 0xC3E9,
-	10849: 0xC3ED,
-	10850: 0xC3F4,
-	10851: 0xC3F5,
-	10852: 0xC3F8,
-	10853: 0xC408,
-	10854: 0xC410,
-	10855: 0xC424,
-	10856: 0xC42C,
-	10857: 0xC430,
-	10858: 0xD438,
-	10859: 0xD439,
-	10860: 0xD43A,
-	10861: 0xD43B,
-	10862: 0xD43C,
-	10863: 0xD43D,
-	10864: 0xD43E,
-	10865: 0xD43F,
-	10866: 0xD441,
-	10867: 0xD442,
-	10868: 0xD443,
-	10869: 0xD445,
-	10870: 0xD446,
-	10871: 0xD447,
-	10872: 0xD448,
-	10873: 0xD449,
-	10874: 0xD44A,
-	10875: 0xD44B,
-	10876: 0xD44C,
-	10877: 0xD44D,
-	10878: 0xD44E,
-	10879: 0xD44F,
-	10880: 0xD450,
-	10881: 0xD451,
-	10882: 0xD452,
-	10883: 0xD453,
-	10884: 0xD454,
-	10885: 0xD455,
-	10886: 0xD456,
-	10887: 0xD457,
-	10888: 0xD458,
-	10889: 0xD459,
-	10890: 0xD45A,
-	10891: 0xD45B,
-	10892: 0xD45D,
-	10893: 0xD45E,
-	10894: 0xD45F,
-	10895: 0xD461,
-	10896: 0xD462,
-	10897: 0xD463,
-	10898: 0xD465,
-	10899: 0xD466,
-	10900: 0xD467,
-	10901: 0xD468,
-	10902: 0xD469,
-	10903: 0xD46A,
-	10904: 0xD46B,
-	10905: 0xD46C,
-	10906: 0xD46E,
-	10907: 0xD470,
-	10908: 0xD471,
-	10909: 0xD472,
-	10910: 0xD473,
-	10911: 0xD474,
-	10912: 0xD475,
-	10913: 0xD476,
-	10914: 0xD477,
-	10915: 0xD47A,
-	10916: 0xD47B,
-	10917: 0xD47D,
-	10918: 0xD47E,
-	10919: 0xD481,
-	10920: 0xD483,
-	10921: 0xD484,
-	10922: 0xD485,
-	10923: 0xD486,
-	10924: 0xD487,
-	10925: 0xD48A,
-	10926: 0xD48C,
-	10927: 0xD48E,
-	10928: 0xD48F,
-	10929: 0xD490,
-	10930: 0xD491,
-	10931: 0xD492,
-	10932: 0xD493,
-	10933: 0xD495,
-	10934: 0xD496,
-	10935: 0xD497,
-	10936: 0xD498,
-	10937: 0xD499,
-	10938: 0xD49A,
-	10939: 0xD49B,
-	10940: 0xD49C,
-	10941: 0xD49D,
-	10942: 0xC434,
-	10943: 0xC43C,
-	10944: 0xC43D,
-	10945: 0xC448,
-	10946: 0xC464,
-	10947: 0xC465,
-	10948: 0xC468,
-	10949: 0xC46C,
-	10950: 0xC474,
-	10951: 0xC475,
-	10952: 0xC479,
-	10953: 0xC480,
-	10954: 0xC494,
-	10955: 0xC49C,
-	10956: 0xC4B8,
-	10957: 0xC4BC,
-	10958: 0xC4E9,
-	10959: 0xC4F0,
-	10960: 0xC4F1,
-	10961: 0xC4F4,
-	10962: 0xC4F8,
-	10963: 0xC4FA,
-	10964: 0xC4FF,
-	10965: 0xC500,
-	10966: 0xC501,
-	10967: 0xC50C,
-	10968: 0xC510,
-	10969: 0xC514,
-	10970: 0xC51C,
-	10971: 0xC528,
-	10972: 0xC529,
-	10973: 0xC52C,
-	10974: 0xC530,
-	10975: 0xC538,
-	10976: 0xC539,
-	10977: 0xC53B,
-	10978: 0xC53D,
-	10979: 0xC544,
-	10980: 0xC545,
-	10981: 0xC548,
-	10982: 0xC549,
-	10983: 0xC54A,
-	10984: 0xC54C,
-	10985: 0xC54D,
-	10986: 0xC54E,
-	10987: 0xC553,
-	10988: 0xC554,
-	10989: 0xC555,
-	10990: 0xC557,
-	10991: 0xC558,
-	10992: 0xC559,
-	10993: 0xC55D,
-	10994: 0xC55E,
-	10995: 0xC560,
-	10996: 0xC561,
-	10997: 0xC564,
-	10998: 0xC568,
-	10999: 0xC570,
-	11000: 0xC571,
-	11001: 0xC573,
-	11002: 0xC574,
-	11003: 0xC575,
-	11004: 0xC57C,
-	11005: 0xC57D,
-	11006: 0xC580,
-	11007: 0xC584,
-	11008: 0xC587,
-	11009: 0xC58C,
-	11010: 0xC58D,
-	11011: 0xC58F,
-	11012: 0xC591,
-	11013: 0xC595,
-	11014: 0xC597,
-	11015: 0xC598,
-	11016: 0xC59C,
-	11017: 0xC5A0,
-	11018: 0xC5A9,
-	11019: 0xC5B4,
-	11020: 0xC5B5,
-	11021: 0xC5B8,
-	11022: 0xC5B9,
-	11023: 0xC5BB,
-	11024: 0xC5BC,
-	11025: 0xC5BD,
-	11026: 0xC5BE,
-	11027: 0xC5C4,
-	11028: 0xC5C5,
-	11029: 0xC5C6,
-	11030: 0xC5C7,
-	11031: 0xC5C8,
-	11032: 0xC5C9,
-	11033: 0xC5CA,
-	11034: 0xC5CC,
-	11035: 0xC5CE,
-	11036: 0xD49E,
-	11037: 0xD49F,
-	11038: 0xD4A0,
-	11039: 0xD4A1,
-	11040: 0xD4A2,
-	11041: 0xD4A3,
-	11042: 0xD4A4,
-	11043: 0xD4A5,
-	11044: 0xD4A6,
-	11045: 0xD4A7,
-	11046: 0xD4A8,
-	11047: 0xD4AA,
-	11048: 0xD4AB,
-	11049: 0xD4AC,
-	11050: 0xD4AD,
-	11051: 0xD4AE,
-	11052: 0xD4AF,
-	11053: 0xD4B0,
-	11054: 0xD4B1,
-	11055: 0xD4B2,
-	11056: 0xD4B3,
-	11057: 0xD4B4,
-	11058: 0xD4B5,
-	11059: 0xD4B6,
-	11060: 0xD4B7,
-	11061: 0xD4B8,
-	11062: 0xD4B9,
-	11063: 0xD4BA,
-	11064: 0xD4BB,
-	11065: 0xD4BC,
-	11066: 0xD4BD,
-	11067: 0xD4BE,
-	11068: 0xD4BF,
-	11069: 0xD4C0,
-	11070: 0xD4C1,
-	11071: 0xD4C2,
-	11072: 0xD4C3,
-	11073: 0xD4C4,
-	11074: 0xD4C5,
-	11075: 0xD4C6,
-	11076: 0xD4C7,
-	11077: 0xD4C8,
-	11078: 0xD4C9,
-	11079: 0xD4CA,
-	11080: 0xD4CB,
-	11081: 0xD4CD,
-	11082: 0xD4CE,
-	11083: 0xD4CF,
-	11084: 0xD4D1,
-	11085: 0xD4D2,
-	11086: 0xD4D3,
-	11087: 0xD4D5,
-	11088: 0xD4D6,
-	11089: 0xD4D7,
-	11090: 0xD4D8,
-	11091: 0xD4D9,
-	11092: 0xD4DA,
-	11093: 0xD4DB,
-	11094: 0xD4DD,
-	11095: 0xD4DE,
-	11096: 0xD4E0,
-	11097: 0xD4E1,
-	11098: 0xD4E2,
-	11099: 0xD4E3,
-	11100: 0xD4E4,
-	11101: 0xD4E5,
-	11102: 0xD4E6,
-	11103: 0xD4E7,
-	11104: 0xD4E9,
-	11105: 0xD4EA,
-	11106: 0xD4EB,
-	11107: 0xD4ED,
-	11108: 0xD4EE,
-	11109: 0xD4EF,
-	11110: 0xD4F1,
-	11111: 0xD4F2,
-	11112: 0xD4F3,
-	11113: 0xD4F4,
-	11114: 0xD4F5,
-	11115: 0xD4F6,
-	11116: 0xD4F7,
-	11117: 0xD4F9,
-	11118: 0xD4FA,
-	11119: 0xD4FC,
-	11120: 0xC5D0,
-	11121: 0xC5D1,
-	11122: 0xC5D4,
-	11123: 0xC5D8,
-	11124: 0xC5E0,
-	11125: 0xC5E1,
-	11126: 0xC5E3,
-	11127: 0xC5E5,
-	11128: 0xC5EC,
-	11129: 0xC5ED,
-	11130: 0xC5EE,
-	11131: 0xC5F0,
-	11132: 0xC5F4,
-	11133: 0xC5F6,
-	11134: 0xC5F7,
-	11135: 0xC5FC,
-	11136: 0xC5FD,
-	11137: 0xC5FE,
-	11138: 0xC5FF,
-	11139: 0xC600,
-	11140: 0xC601,
-	11141: 0xC605,
-	11142: 0xC606,
-	11143: 0xC607,
-	11144: 0xC608,
-	11145: 0xC60C,
-	11146: 0xC610,
-	11147: 0xC618,
-	11148: 0xC619,
-	11149: 0xC61B,
-	11150: 0xC61C,
-	11151: 0xC624,
-	11152: 0xC625,
-	11153: 0xC628,
-	11154: 0xC62C,
-	11155: 0xC62D,
-	11156: 0xC62E,
-	11157: 0xC630,
-	11158: 0xC633,
-	11159: 0xC634,
-	11160: 0xC635,
-	11161: 0xC637,
-	11162: 0xC639,
-	11163: 0xC63B,
-	11164: 0xC640,
-	11165: 0xC641,
-	11166: 0xC644,
-	11167: 0xC648,
-	11168: 0xC650,
-	11169: 0xC651,
-	11170: 0xC653,
-	11171: 0xC654,
-	11172: 0xC655,
-	11173: 0xC65C,
-	11174: 0xC65D,
-	11175: 0xC660,
-	11176: 0xC66C,
-	11177: 0xC66F,
-	11178: 0xC671,
-	11179: 0xC678,
-	11180: 0xC679,
-	11181: 0xC67C,
-	11182: 0xC680,
-	11183: 0xC688,
-	11184: 0xC689,
-	11185: 0xC68B,
-	11186: 0xC68D,
-	11187: 0xC694,
-	11188: 0xC695,
-	11189: 0xC698,
-	11190: 0xC69C,
-	11191: 0xC6A4,
-	11192: 0xC6A5,
-	11193: 0xC6A7,
-	11194: 0xC6A9,
-	11195: 0xC6B0,
-	11196: 0xC6B1,
-	11197: 0xC6B4,
-	11198: 0xC6B8,
-	11199: 0xC6B9,
-	11200: 0xC6BA,
-	11201: 0xC6C0,
-	11202: 0xC6C1,
-	11203: 0xC6C3,
-	11204: 0xC6C5,
-	11205: 0xC6CC,
-	11206: 0xC6CD,
-	11207: 0xC6D0,
-	11208: 0xC6D4,
-	11209: 0xC6DC,
-	11210: 0xC6DD,
-	11211: 0xC6E0,
-	11212: 0xC6E1,
-	11213: 0xC6E8,
-	11214: 0xD4FE,
-	11215: 0xD4FF,
-	11216: 0xD500,
-	11217: 0xD501,
-	11218: 0xD502,
-	11219: 0xD503,
-	11220: 0xD505,
-	11221: 0xD506,
-	11222: 0xD507,
-	11223: 0xD509,
-	11224: 0xD50A,
-	11225: 0xD50B,
-	11226: 0xD50D,
-	11227: 0xD50E,
-	11228: 0xD50F,
-	11229: 0xD510,
-	11230: 0xD511,
-	11231: 0xD512,
-	11232: 0xD513,
-	11233: 0xD516,
-	11234: 0xD518,
-	11235: 0xD519,
-	11236: 0xD51A,
-	11237: 0xD51B,
-	11238: 0xD51C,
-	11239: 0xD51D,
-	11240: 0xD51E,
-	11241: 0xD51F,
-	11242: 0xD520,
-	11243: 0xD521,
-	11244: 0xD522,
-	11245: 0xD523,
-	11246: 0xD524,
-	11247: 0xD525,
-	11248: 0xD526,
-	11249: 0xD527,
-	11250: 0xD528,
-	11251: 0xD529,
-	11252: 0xD52A,
-	11253: 0xD52B,
-	11254: 0xD52C,
-	11255: 0xD52D,
-	11256: 0xD52E,
-	11257: 0xD52F,
-	11258: 0xD530,
-	11259: 0xD531,
-	11260: 0xD532,
-	11261: 0xD533,
-	11262: 0xD534,
-	11263: 0xD535,
-	11264: 0xD536,
-	11265: 0xD537,
-	11266: 0xD538,
-	11267: 0xD539,
-	11268: 0xD53A,
-	11269: 0xD53B,
-	11270: 0xD53E,
-	11271: 0xD53F,
-	11272: 0xD541,
-	11273: 0xD542,
-	11274: 0xD543,
-	11275: 0xD545,
-	11276: 0xD546,
-	11277: 0xD547,
-	11278: 0xD548,
-	11279: 0xD549,
-	11280: 0xD54A,
-	11281: 0xD54B,
-	11282: 0xD54E,
-	11283: 0xD550,
-	11284: 0xD552,
-	11285: 0xD553,
-	11286: 0xD554,
-	11287: 0xD555,
-	11288: 0xD556,
-	11289: 0xD557,
-	11290: 0xD55A,
-	11291: 0xD55B,
-	11292: 0xD55D,
-	11293: 0xD55E,
-	11294: 0xD55F,
-	11295: 0xD561,
-	11296: 0xD562,
-	11297: 0xD563,
-	11298: 0xC6E9,
-	11299: 0xC6EC,
-	11300: 0xC6F0,
-	11301: 0xC6F8,
-	11302: 0xC6F9,
-	11303: 0xC6FD,
-	11304: 0xC704,
-	11305: 0xC705,
-	11306: 0xC708,
-	11307: 0xC70C,
-	11308: 0xC714,
-	11309: 0xC715,
-	11310: 0xC717,
-	11311: 0xC719,
-	11312: 0xC720,
-	11313: 0xC721,
-	11314: 0xC724,
-	11315: 0xC728,
-	11316: 0xC730,
-	11317: 0xC731,
-	11318: 0xC733,
-	11319: 0xC735,
-	11320: 0xC737,
-	11321: 0xC73C,
-	11322: 0xC73D,
-	11323: 0xC740,
-	11324: 0xC744,
-	11325: 0xC74A,
-	11326: 0xC74C,
-	11327: 0xC74D,
-	11328: 0xC74F,
-	11329: 0xC751,
-	11330: 0xC752,
-	11331: 0xC753,
-	11332: 0xC754,
-	11333: 0xC755,
-	11334: 0xC756,
-	11335: 0xC757,
-	11336: 0xC758,
-	11337: 0xC75C,
-	11338: 0xC760,
-	11339: 0xC768,
-	11340: 0xC76B,
-	11341: 0xC774,
-	11342: 0xC775,
-	11343: 0xC778,
-	11344: 0xC77C,
-	11345: 0xC77D,
-	11346: 0xC77E,
-	11347: 0xC783,
-	11348: 0xC784,
-	11349: 0xC785,
-	11350: 0xC787,
-	11351: 0xC788,
-	11352: 0xC789,
-	11353: 0xC78A,
-	11354: 0xC78E,
-	11355: 0xC790,
-	11356: 0xC791,
-	11357: 0xC794,
-	11358: 0xC796,
-	11359: 0xC797,
-	11360: 0xC798,
-	11361: 0xC79A,
-	11362: 0xC7A0,
-	11363: 0xC7A1,
-	11364: 0xC7A3,
-	11365: 0xC7A4,
-	11366: 0xC7A5,
-	11367: 0xC7A6,
-	11368: 0xC7AC,
-	11369: 0xC7AD,
-	11370: 0xC7B0,
-	11371: 0xC7B4,
-	11372: 0xC7BC,
-	11373: 0xC7BD,
-	11374: 0xC7BF,
-	11375: 0xC7C0,
-	11376: 0xC7C1,
-	11377: 0xC7C8,
-	11378: 0xC7C9,
-	11379: 0xC7CC,
-	11380: 0xC7CE,
-	11381: 0xC7D0,
-	11382: 0xC7D8,
-	11383: 0xC7DD,
-	11384: 0xC7E4,
-	11385: 0xC7E8,
-	11386: 0xC7EC,
-	11387: 0xC800,
-	11388: 0xC801,
-	11389: 0xC804,
-	11390: 0xC808,
-	11391: 0xC80A,
-	11392: 0xD564,
-	11393: 0xD566,
-	11394: 0xD567,
-	11395: 0xD56A,
-	11396: 0xD56C,
-	11397: 0xD56E,
-	11398: 0xD56F,
-	11399: 0xD570,
-	11400: 0xD571,
-	11401: 0xD572,
-	11402: 0xD573,
-	11403: 0xD576,
-	11404: 0xD577,
-	11405: 0xD579,
-	11406: 0xD57A,
-	11407: 0xD57B,
-	11408: 0xD57D,
-	11409: 0xD57E,
-	11410: 0xD57F,
-	11411: 0xD580,
-	11412: 0xD581,
-	11413: 0xD582,
-	11414: 0xD583,
-	11415: 0xD586,
-	11416: 0xD58A,
-	11417: 0xD58B,
-	11418: 0xD58C,
-	11419: 0xD58D,
-	11420: 0xD58E,
-	11421: 0xD58F,
-	11422: 0xD591,
-	11423: 0xD592,
-	11424: 0xD593,
-	11425: 0xD594,
-	11426: 0xD595,
-	11427: 0xD596,
-	11428: 0xD597,
-	11429: 0xD598,
-	11430: 0xD599,
-	11431: 0xD59A,
-	11432: 0xD59B,
-	11433: 0xD59C,
-	11434: 0xD59D,
-	11435: 0xD59E,
-	11436: 0xD59F,
-	11437: 0xD5A0,
-	11438: 0xD5A1,
-	11439: 0xD5A2,
-	11440: 0xD5A3,
-	11441: 0xD5A4,
-	11442: 0xD5A6,
-	11443: 0xD5A7,
-	11444: 0xD5A8,
-	11445: 0xD5A9,
-	11446: 0xD5AA,
-	11447: 0xD5AB,
-	11448: 0xD5AC,
-	11449: 0xD5AD,
-	11450: 0xD5AE,
-	11451: 0xD5AF,
-	11452: 0xD5B0,
-	11453: 0xD5B1,
-	11454: 0xD5B2,
-	11455: 0xD5B3,
-	11456: 0xD5B4,
-	11457: 0xD5B5,
-	11458: 0xD5B6,
-	11459: 0xD5B7,
-	11460: 0xD5B8,
-	11461: 0xD5B9,
-	11462: 0xD5BA,
-	11463: 0xD5BB,
-	11464: 0xD5BC,
-	11465: 0xD5BD,
-	11466: 0xD5BE,
-	11467: 0xD5BF,
-	11468: 0xD5C0,
-	11469: 0xD5C1,
-	11470: 0xD5C2,
-	11471: 0xD5C3,
-	11472: 0xD5C4,
-	11473: 0xD5C5,
-	11474: 0xD5C6,
-	11475: 0xD5C7,
-	11476: 0xC810,
-	11477: 0xC811,
-	11478: 0xC813,
-	11479: 0xC815,
-	11480: 0xC816,
-	11481: 0xC81C,
-	11482: 0xC81D,
-	11483: 0xC820,
-	11484: 0xC824,
-	11485: 0xC82C,
-	11486: 0xC82D,
-	11487: 0xC82F,
-	11488: 0xC831,
-	11489: 0xC838,
-	11490: 0xC83C,
-	11491: 0xC840,
-	11492: 0xC848,
-	11493: 0xC849,
-	11494: 0xC84C,
-	11495: 0xC84D,
-	11496: 0xC854,
-	11497: 0xC870,
-	11498: 0xC871,
-	11499: 0xC874,
-	11500: 0xC878,
-	11501: 0xC87A,
-	11502: 0xC880,
-	11503: 0xC881,
-	11504: 0xC883,
-	11505: 0xC885,
-	11506: 0xC886,
-	11507: 0xC887,
-	11508: 0xC88B,
-	11509: 0xC88C,
-	11510: 0xC88D,
-	11511: 0xC894,
-	11512: 0xC89D,
-	11513: 0xC89F,
-	11514: 0xC8A1,
-	11515: 0xC8A8,
-	11516: 0xC8BC,
-	11517: 0xC8BD,
-	11518: 0xC8C4,
-	11519: 0xC8C8,
-	11520: 0xC8CC,
-	11521: 0xC8D4,
-	11522: 0xC8D5,
-	11523: 0xC8D7,
-	11524: 0xC8D9,
-	11525: 0xC8E0,
-	11526: 0xC8E1,
-	11527: 0xC8E4,
-	11528: 0xC8F5,
-	11529: 0xC8FC,
-	11530: 0xC8FD,
-	11531: 0xC900,
-	11532: 0xC904,
-	11533: 0xC905,
-	11534: 0xC906,
-	11535: 0xC90C,
-	11536: 0xC90D,
-	11537: 0xC90F,
-	11538: 0xC911,
-	11539: 0xC918,
-	11540: 0xC92C,
-	11541: 0xC934,
-	11542: 0xC950,
-	11543: 0xC951,
-	11544: 0xC954,
-	11545: 0xC958,
-	11546: 0xC960,
-	11547: 0xC961,
-	11548: 0xC963,
-	11549: 0xC96C,
-	11550: 0xC970,
-	11551: 0xC974,
-	11552: 0xC97C,
-	11553: 0xC988,
-	11554: 0xC989,
-	11555: 0xC98C,
-	11556: 0xC990,
-	11557: 0xC998,
-	11558: 0xC999,
-	11559: 0xC99B,
-	11560: 0xC99D,
-	11561: 0xC9C0,
-	11562: 0xC9C1,
-	11563: 0xC9C4,
-	11564: 0xC9C7,
-	11565: 0xC9C8,
-	11566: 0xC9CA,
-	11567: 0xC9D0,
-	11568: 0xC9D1,
-	11569: 0xC9D3,
-	11570: 0xD5CA,
-	11571: 0xD5CB,
-	11572: 0xD5CD,
-	11573: 0xD5CE,
-	11574: 0xD5CF,
-	11575: 0xD5D1,
-	11576: 0xD5D3,
-	11577: 0xD5D4,
-	11578: 0xD5D5,
-	11579: 0xD5D6,
-	11580: 0xD5D7,
-	11581: 0xD5DA,
-	11582: 0xD5DC,
-	11583: 0xD5DE,
-	11584: 0xD5DF,
-	11585: 0xD5E0,
-	11586: 0xD5E1,
-	11587: 0xD5E2,
-	11588: 0xD5E3,
-	11589: 0xD5E6,
-	11590: 0xD5E7,
-	11591: 0xD5E9,
-	11592: 0xD5EA,
-	11593: 0xD5EB,
-	11594: 0xD5ED,
-	11595: 0xD5EE,
-	11596: 0xD5EF,
-	11597: 0xD5F0,
-	11598: 0xD5F1,
-	11599: 0xD5F2,
-	11600: 0xD5F3,
-	11601: 0xD5F6,
-	11602: 0xD5F8,
-	11603: 0xD5FA,
-	11604: 0xD5FB,
-	11605: 0xD5FC,
-	11606: 0xD5FD,
-	11607: 0xD5FE,
-	11608: 0xD5FF,
-	11609: 0xD602,
-	11610: 0xD603,
-	11611: 0xD605,
-	11612: 0xD606,
-	11613: 0xD607,
-	11614: 0xD609,
-	11615: 0xD60A,
-	11616: 0xD60B,
-	11617: 0xD60C,
-	11618: 0xD60D,
-	11619: 0xD60E,
-	11620: 0xD60F,
-	11621: 0xD612,
-	11622: 0xD616,
-	11623: 0xD617,
-	11624: 0xD618,
-	11625: 0xD619,
-	11626: 0xD61A,
-	11627: 0xD61B,
-	11628: 0xD61D,
-	11629: 0xD61E,
-	11630: 0xD61F,
-	11631: 0xD621,
-	11632: 0xD622,
-	11633: 0xD623,
-	11634: 0xD625,
-	11635: 0xD626,
-	11636: 0xD627,
-	11637: 0xD628,
-	11638: 0xD629,
-	11639: 0xD62A,
-	11640: 0xD62B,
-	11641: 0xD62C,
-	11642: 0xD62E,
-	11643: 0xD62F,
-	11644: 0xD630,
-	11645: 0xD631,
-	11646: 0xD632,
-	11647: 0xD633,
-	11648: 0xD634,
-	11649: 0xD635,
-	11650: 0xD636,
-	11651: 0xD637,
-	11652: 0xD63A,
-	11653: 0xD63B,
-	11654: 0xC9D5,
-	11655: 0xC9D6,
-	11656: 0xC9D9,
-	11657: 0xC9DA,
-	11658: 0xC9DC,
-	11659: 0xC9DD,
-	11660: 0xC9E0,
-	11661: 0xC9E2,
-	11662: 0xC9E4,
-	11663: 0xC9E7,
-	11664: 0xC9EC,
-	11665: 0xC9ED,
-	11666: 0xC9EF,
-	11667: 0xC9F0,
-	11668: 0xC9F1,
-	11669: 0xC9F8,
-	11670: 0xC9F9,
-	11671: 0xC9FC,
-	11672: 0xCA00,
-	11673: 0xCA08,
-	11674: 0xCA09,
-	11675: 0xCA0B,
-	11676: 0xCA0C,
-	11677: 0xCA0D,
-	11678: 0xCA14,
-	11679: 0xCA18,
-	11680: 0xCA29,
-	11681: 0xCA4C,
-	11682: 0xCA4D,
-	11683: 0xCA50,
-	11684: 0xCA54,
-	11685: 0xCA5C,
-	11686: 0xCA5D,
-	11687: 0xCA5F,
-	11688: 0xCA60,
-	11689: 0xCA61,
-	11690: 0xCA68,
-	11691: 0xCA7D,
-	11692: 0xCA84,
-	11693: 0xCA98,
-	11694: 0xCABC,
-	11695: 0xCABD,
-	11696: 0xCAC0,
-	11697: 0xCAC4,
-	11698: 0xCACC,
-	11699: 0xCACD,
-	11700: 0xCACF,
-	11701: 0xCAD1,
-	11702: 0xCAD3,
-	11703: 0xCAD8,
-	11704: 0xCAD9,
-	11705: 0xCAE0,
-	11706: 0xCAEC,
-	11707: 0xCAF4,
-	11708: 0xCB08,
-	11709: 0xCB10,
-	11710: 0xCB14,
-	11711: 0xCB18,
-	11712: 0xCB20,
-	11713: 0xCB21,
-	11714: 0xCB41,
-	11715: 0xCB48,
-	11716: 0xCB49,
-	11717: 0xCB4C,
-	11718: 0xCB50,
-	11719: 0xCB58,
-	11720: 0xCB59,
-	11721: 0xCB5D,
-	11722: 0xCB64,
-	11723: 0xCB78,
-	11724: 0xCB79,
-	11725: 0xCB9C,
-	11726: 0xCBB8,
-	11727: 0xCBD4,
-	11728: 0xCBE4,
-	11729: 0xCBE7,
-	11730: 0xCBE9,
-	11731: 0xCC0C,
-	11732: 0xCC0D,
-	11733: 0xCC10,
-	11734: 0xCC14,
-	11735: 0xCC1C,
-	11736: 0xCC1D,
-	11737: 0xCC21,
-	11738: 0xCC22,
-	11739: 0xCC27,
-	11740: 0xCC28,
-	11741: 0xCC29,
-	11742: 0xCC2C,
-	11743: 0xCC2E,
-	11744: 0xCC30,
-	11745: 0xCC38,
-	11746: 0xCC39,
-	11747: 0xCC3B,
-	11748: 0xD63D,
-	11749: 0xD63E,
-	11750: 0xD63F,
-	11751: 0xD641,
-	11752: 0xD642,
-	11753: 0xD643,
-	11754: 0xD644,
-	11755: 0xD646,
-	11756: 0xD647,
-	11757: 0xD64A,
-	11758: 0xD64C,
-	11759: 0xD64E,
-	11760: 0xD64F,
-	11761: 0xD650,
-	11762: 0xD652,
-	11763: 0xD653,
-	11764: 0xD656,
-	11765: 0xD657,
-	11766: 0xD659,
-	11767: 0xD65A,
-	11768: 0xD65B,
-	11769: 0xD65D,
-	11770: 0xD65E,
-	11771: 0xD65F,
-	11772: 0xD660,
-	11773: 0xD661,
-	11774: 0xD662,
-	11775: 0xD663,
-	11776: 0xD664,
-	11777: 0xD665,
-	11778: 0xD666,
-	11779: 0xD668,
-	11780: 0xD66A,
-	11781: 0xD66B,
-	11782: 0xD66C,
-	11783: 0xD66D,
-	11784: 0xD66E,
-	11785: 0xD66F,
-	11786: 0xD672,
-	11787: 0xD673,
-	11788: 0xD675,
-	11789: 0xD676,
-	11790: 0xD677,
-	11791: 0xD678,
-	11792: 0xD679,
-	11793: 0xD67A,
-	11794: 0xD67B,
-	11795: 0xD67C,
-	11796: 0xD67D,
-	11797: 0xD67E,
-	11798: 0xD67F,
-	11799: 0xD680,
-	11800: 0xD681,
-	11801: 0xD682,
-	11802: 0xD684,
-	11803: 0xD686,
-	11804: 0xD687,
-	11805: 0xD688,
-	11806: 0xD689,
-	11807: 0xD68A,
-	11808: 0xD68B,
-	11809: 0xD68E,
-	11810: 0xD68F,
-	11811: 0xD691,
-	11812: 0xD692,
-	11813: 0xD693,
-	11814: 0xD695,
-	11815: 0xD696,
-	11816: 0xD697,
-	11817: 0xD698,
-	11818: 0xD699,
-	11819: 0xD69A,
-	11820: 0xD69B,
-	11821: 0xD69C,
-	11822: 0xD69E,
-	11823: 0xD6A0,
-	11824: 0xD6A2,
-	11825: 0xD6A3,
-	11826: 0xD6A4,
-	11827: 0xD6A5,
-	11828: 0xD6A6,
-	11829: 0xD6A7,
-	11830: 0xD6A9,
-	11831: 0xD6AA,
-	11832: 0xCC3C,
-	11833: 0xCC3D,
-	11834: 0xCC3E,
-	11835: 0xCC44,
-	11836: 0xCC45,
-	11837: 0xCC48,
-	11838: 0xCC4C,
-	11839: 0xCC54,
-	11840: 0xCC55,
-	11841: 0xCC57,
-	11842: 0xCC58,
-	11843: 0xCC59,
-	11844: 0xCC60,
-	11845: 0xCC64,
-	11846: 0xCC66,
-	11847: 0xCC68,
-	11848: 0xCC70,
-	11849: 0xCC75,
-	11850: 0xCC98,
-	11851: 0xCC99,
-	11852: 0xCC9C,
-	11853: 0xCCA0,
-	11854: 0xCCA8,
-	11855: 0xCCA9,
-	11856: 0xCCAB,
-	11857: 0xCCAC,
-	11858: 0xCCAD,
-	11859: 0xCCB4,
-	11860: 0xCCB5,
-	11861: 0xCCB8,
-	11862: 0xCCBC,
-	11863: 0xCCC4,
-	11864: 0xCCC5,
-	11865: 0xCCC7,
-	11866: 0xCCC9,
-	11867: 0xCCD0,
-	11868: 0xCCD4,
-	11869: 0xCCE4,
-	11870: 0xCCEC,
-	11871: 0xCCF0,
-	11872: 0xCD01,
-	11873: 0xCD08,
-	11874: 0xCD09,
-	11875: 0xCD0C,
-	11876: 0xCD10,
-	11877: 0xCD18,
-	11878: 0xCD19,
-	11879: 0xCD1B,
-	11880: 0xCD1D,
-	11881: 0xCD24,
-	11882: 0xCD28,
-	11883: 0xCD2C,
-	11884: 0xCD39,
-	11885: 0xCD5C,
-	11886: 0xCD60,
-	11887: 0xCD64,
-	11888: 0xCD6C,
-	11889: 0xCD6D,
-	11890: 0xCD6F,
-	11891: 0xCD71,
-	11892: 0xCD78,
-	11893: 0xCD88,
-	11894: 0xCD94,
-	11895: 0xCD95,
-	11896: 0xCD98,
-	11897: 0xCD9C,
-	11898: 0xCDA4,
-	11899: 0xCDA5,
-	11900: 0xCDA7,
-	11901: 0xCDA9,
-	11902: 0xCDB0,
-	11903: 0xCDC4,
-	11904: 0xCDCC,
-	11905: 0xCDD0,
-	11906: 0xCDE8,
-	11907: 0xCDEC,
-	11908: 0xCDF0,
-	11909: 0xCDF8,
-	11910: 0xCDF9,
-	11911: 0xCDFB,
-	11912: 0xCDFD,
-	11913: 0xCE04,
-	11914: 0xCE08,
-	11915: 0xCE0C,
-	11916: 0xCE14,
-	11917: 0xCE19,
-	11918: 0xCE20,
-	11919: 0xCE21,
-	11920: 0xCE24,
-	11921: 0xCE28,
-	11922: 0xCE30,
-	11923: 0xCE31,
-	11924: 0xCE33,
-	11925: 0xCE35,
-	11926: 0xD6AB,
-	11927: 0xD6AD,
-	11928: 0xD6AE,
-	11929: 0xD6AF,
-	11930: 0xD6B1,
-	11931: 0xD6B2,
-	11932: 0xD6B3,
-	11933: 0xD6B4,
-	11934: 0xD6B5,
-	11935: 0xD6B6,
-	11936: 0xD6B7,
-	11937: 0xD6B8,
-	11938: 0xD6BA,
-	11939: 0xD6BC,
-	11940: 0xD6BD,
-	11941: 0xD6BE,
-	11942: 0xD6BF,
-	11943: 0xD6C0,
-	11944: 0xD6C1,
-	11945: 0xD6C2,
-	11946: 0xD6C3,
-	11947: 0xD6C6,
-	11948: 0xD6C7,
-	11949: 0xD6C9,
-	11950: 0xD6CA,
-	11951: 0xD6CB,
-	11952: 0xD6CD,
-	11953: 0xD6CE,
-	11954: 0xD6CF,
-	11955: 0xD6D0,
-	11956: 0xD6D2,
-	11957: 0xD6D3,
-	11958: 0xD6D5,
-	11959: 0xD6D6,
-	11960: 0xD6D8,
-	11961: 0xD6DA,
-	11962: 0xD6DB,
-	11963: 0xD6DC,
-	11964: 0xD6DD,
-	11965: 0xD6DE,
-	11966: 0xD6DF,
-	11967: 0xD6E1,
-	11968: 0xD6E2,
-	11969: 0xD6E3,
-	11970: 0xD6E5,
-	11971: 0xD6E6,
-	11972: 0xD6E7,
-	11973: 0xD6E9,
-	11974: 0xD6EA,
-	11975: 0xD6EB,
-	11976: 0xD6EC,
-	11977: 0xD6ED,
-	11978: 0xD6EE,
-	11979: 0xD6EF,
-	11980: 0xD6F1,
-	11981: 0xD6F2,
-	11982: 0xD6F3,
-	11983: 0xD6F4,
-	11984: 0xD6F6,
-	11985: 0xD6F7,
-	11986: 0xD6F8,
-	11987: 0xD6F9,
-	11988: 0xD6FA,
-	11989: 0xD6FB,
-	11990: 0xD6FE,
-	11991: 0xD6FF,
-	11992: 0xD701,
-	11993: 0xD702,
-	11994: 0xD703,
-	11995: 0xD705,
-	11996: 0xD706,
-	11997: 0xD707,
-	11998: 0xD708,
-	11999: 0xD709,
-	12000: 0xD70A,
-	12001: 0xD70B,
-	12002: 0xD70C,
-	12003: 0xD70D,
-	12004: 0xD70E,
-	12005: 0xD70F,
-	12006: 0xD710,
-	12007: 0xD712,
-	12008: 0xD713,
-	12009: 0xD714,
-	12010: 0xCE58,
-	12011: 0xCE59,
-	12012: 0xCE5C,
-	12013: 0xCE5F,
-	12014: 0xCE60,
-	12015: 0xCE61,
-	12016: 0xCE68,
-	12017: 0xCE69,
-	12018: 0xCE6B,
-	12019: 0xCE6D,
-	12020: 0xCE74,
-	12021: 0xCE75,
-	12022: 0xCE78,
-	12023: 0xCE7C,
-	12024: 0xCE84,
-	12025: 0xCE85,
-	12026: 0xCE87,
-	12027: 0xCE89,
-	12028: 0xCE90,
-	12029: 0xCE91,
-	12030: 0xCE94,
-	12031: 0xCE98,
-	12032: 0xCEA0,
-	12033: 0xCEA1,
-	12034: 0xCEA3,
-	12035: 0xCEA4,
-	12036: 0xCEA5,
-	12037: 0xCEAC,
-	12038: 0xCEAD,
-	12039: 0xCEC1,
-	12040: 0xCEE4,
-	12041: 0xCEE5,
-	12042: 0xCEE8,
-	12043: 0xCEEB,
-	12044: 0xCEEC,
-	12045: 0xCEF4,
-	12046: 0xCEF5,
-	12047: 0xCEF7,
-	12048: 0xCEF8,
-	12049: 0xCEF9,
-	12050: 0xCF00,
-	12051: 0xCF01,
-	12052: 0xCF04,
-	12053: 0xCF08,
-	12054: 0xCF10,
-	12055: 0xCF11,
-	12056: 0xCF13,
-	12057: 0xCF15,
-	12058: 0xCF1C,
-	12059: 0xCF20,
-	12060: 0xCF24,
-	12061: 0xCF2C,
-	12062: 0xCF2D,
-	12063: 0xCF2F,
-	12064: 0xCF30,
-	12065: 0xCF31,
-	12066: 0xCF38,
-	12067: 0xCF54,
-	12068: 0xCF55,
-	12069: 0xCF58,
-	12070: 0xCF5C,
-	12071: 0xCF64,
-	12072: 0xCF65,
-	12073: 0xCF67,
-	12074: 0xCF69,
-	12075: 0xCF70,
-	12076: 0xCF71,
-	12077: 0xCF74,
-	12078: 0xCF78,
-	12079: 0xCF80,
-	12080: 0xCF85,
-	12081: 0xCF8C,
-	12082: 0xCFA1,
-	12083: 0xCFA8,
-	12084: 0xCFB0,
-	12085: 0xCFC4,
-	12086: 0xCFE0,
-	12087: 0xCFE1,
-	12088: 0xCFE4,
-	12089: 0xCFE8,
-	12090: 0xCFF0,
-	12091: 0xCFF1,
-	12092: 0xCFF3,
-	12093: 0xCFF5,
-	12094: 0xCFFC,
-	12095: 0xD000,
-	12096: 0xD004,
-	12097: 0xD011,
-	12098: 0xD018,
-	12099: 0xD02D,
-	12100: 0xD034,
-	12101: 0xD035,
-	12102: 0xD038,
-	12103: 0xD03C,
-	12104: 0xD715,
-	12105: 0xD716,
-	12106: 0xD717,
-	12107: 0xD71A,
-	12108: 0xD71B,
-	12109: 0xD71D,
-	12110: 0xD71E,
-	12111: 0xD71F,
-	12112: 0xD721,
-	12113: 0xD722,
-	12114: 0xD723,
-	12115: 0xD724,
-	12116: 0xD725,
-	12117: 0xD726,
-	12118: 0xD727,
-	12119: 0xD72A,
-	12120: 0xD72C,
-	12121: 0xD72E,
-	12122: 0xD72F,
-	12123: 0xD730,
-	12124: 0xD731,
-	12125: 0xD732,
-	12126: 0xD733,
-	12127: 0xD736,
-	12128: 0xD737,
-	12129: 0xD739,
-	12130: 0xD73A,
-	12131: 0xD73B,
-	12132: 0xD73D,
-	12133: 0xD73E,
-	12134: 0xD73F,
-	12135: 0xD740,
-	12136: 0xD741,
-	12137: 0xD742,
-	12138: 0xD743,
-	12139: 0xD745,
-	12140: 0xD746,
-	12141: 0xD748,
-	12142: 0xD74A,
-	12143: 0xD74B,
-	12144: 0xD74C,
-	12145: 0xD74D,
-	12146: 0xD74E,
-	12147: 0xD74F,
-	12148: 0xD752,
-	12149: 0xD753,
-	12150: 0xD755,
-	12151: 0xD75A,
-	12152: 0xD75B,
-	12153: 0xD75C,
-	12154: 0xD75D,
-	12155: 0xD75E,
-	12156: 0xD75F,
-	12157: 0xD762,
-	12158: 0xD764,
-	12159: 0xD766,
-	12160: 0xD767,
-	12161: 0xD768,
-	12162: 0xD76A,
-	12163: 0xD76B,
-	12164: 0xD76D,
-	12165: 0xD76E,
-	12166: 0xD76F,
-	12167: 0xD771,
-	12168: 0xD772,
-	12169: 0xD773,
-	12170: 0xD775,
-	12171: 0xD776,
-	12172: 0xD777,
-	12173: 0xD778,
-	12174: 0xD779,
-	12175: 0xD77A,
-	12176: 0xD77B,
-	12177: 0xD77E,
-	12178: 0xD77F,
-	12179: 0xD780,
-	12180: 0xD782,
-	12181: 0xD783,
-	12182: 0xD784,
-	12183: 0xD785,
-	12184: 0xD786,
-	12185: 0xD787,
-	12186: 0xD78A,
-	12187: 0xD78B,
-	12188: 0xD044,
-	12189: 0xD045,
-	12190: 0xD047,
-	12191: 0xD049,
-	12192: 0xD050,
-	12193: 0xD054,
-	12194: 0xD058,
-	12195: 0xD060,
-	12196: 0xD06C,
-	12197: 0xD06D,
-	12198: 0xD070,
-	12199: 0xD074,
-	12200: 0xD07C,
-	12201: 0xD07D,
-	12202: 0xD081,
-	12203: 0xD0A4,
-	12204: 0xD0A5,
-	12205: 0xD0A8,
-	12206: 0xD0AC,
-	12207: 0xD0B4,
-	12208: 0xD0B5,
-	12209: 0xD0B7,
-	12210: 0xD0B9,
-	12211: 0xD0C0,
-	12212: 0xD0C1,
-	12213: 0xD0C4,
-	12214: 0xD0C8,
-	12215: 0xD0C9,
-	12216: 0xD0D0,
-	12217: 0xD0D1,
-	12218: 0xD0D3,
-	12219: 0xD0D4,
-	12220: 0xD0D5,
-	12221: 0xD0DC,
-	12222: 0xD0DD,
-	12223: 0xD0E0,
-	12224: 0xD0E4,
-	12225: 0xD0EC,
-	12226: 0xD0ED,
-	12227: 0xD0EF,
-	12228: 0xD0F0,
-	12229: 0xD0F1,
-	12230: 0xD0F8,
-	12231: 0xD10D,
-	12232: 0xD130,
-	12233: 0xD131,
-	12234: 0xD134,
-	12235: 0xD138,
-	12236: 0xD13A,
-	12237: 0xD140,
-	12238: 0xD141,
-	12239: 0xD143,
-	12240: 0xD144,
-	12241: 0xD145,
-	12242: 0xD14C,
-	12243: 0xD14D,
-	12244: 0xD150,
-	12245: 0xD154,
-	12246: 0xD15C,
-	12247: 0xD15D,
-	12248: 0xD15F,
-	12249: 0xD161,
-	12250: 0xD168,
-	12251: 0xD16C,
-	12252: 0xD17C,
-	12253: 0xD184,
-	12254: 0xD188,
-	12255: 0xD1A0,
-	12256: 0xD1A1,
-	12257: 0xD1A4,
-	12258: 0xD1A8,
-	12259: 0xD1B0,
-	12260: 0xD1B1,
-	12261: 0xD1B3,
-	12262: 0xD1B5,
-	12263: 0xD1BA,
-	12264: 0xD1BC,
-	12265: 0xD1C0,
-	12266: 0xD1D8,
-	12267: 0xD1F4,
-	12268: 0xD1F8,
-	12269: 0xD207,
-	12270: 0xD209,
-	12271: 0xD210,
-	12272: 0xD22C,
-	12273: 0xD22D,
-	12274: 0xD230,
-	12275: 0xD234,
-	12276: 0xD23C,
-	12277: 0xD23D,
-	12278: 0xD23F,
-	12279: 0xD241,
-	12280: 0xD248,
-	12281: 0xD25C,
-	12282: 0xD78D,
-	12283: 0xD78E,
-	12284: 0xD78F,
-	12285: 0xD791,
-	12286: 0xD792,
-	12287: 0xD793,
-	12288: 0xD794,
-	12289: 0xD795,
-	12290: 0xD796,
-	12291: 0xD797,
-	12292: 0xD79A,
-	12293: 0xD79C,
-	12294: 0xD79E,
-	12295: 0xD79F,
-	12296: 0xD7A0,
-	12297: 0xD7A1,
-	12298: 0xD7A2,
-	12299: 0xD7A3,
-	12366: 0xD264,
-	12367: 0xD280,
-	12368: 0xD281,
-	12369: 0xD284,
-	12370: 0xD288,
-	12371: 0xD290,
-	12372: 0xD291,
-	12373: 0xD295,
-	12374: 0xD29C,
-	12375: 0xD2A0,
-	12376: 0xD2A4,
-	12377: 0xD2AC,
-	12378: 0xD2B1,
-	12379: 0xD2B8,
-	12380: 0xD2B9,
-	12381: 0xD2BC,
-	12382: 0xD2BF,
-	12383: 0xD2C0,
-	12384: 0xD2C2,
-	12385: 0xD2C8,
-	12386: 0xD2C9,
-	12387: 0xD2CB,
-	12388: 0xD2D4,
-	12389: 0xD2D8,
-	12390: 0xD2DC,
-	12391: 0xD2E4,
-	12392: 0xD2E5,
-	12393: 0xD2F0,
-	12394: 0xD2F1,
-	12395: 0xD2F4,
-	12396: 0xD2F8,
-	12397: 0xD300,
-	12398: 0xD301,
-	12399: 0xD303,
-	12400: 0xD305,
-	12401: 0xD30C,
-	12402: 0xD30D,
-	12403: 0xD30E,
-	12404: 0xD310,
-	12405: 0xD314,
-	12406: 0xD316,
-	12407: 0xD31C,
-	12408: 0xD31D,
-	12409: 0xD31F,
-	12410: 0xD320,
-	12411: 0xD321,
-	12412: 0xD325,
-	12413: 0xD328,
-	12414: 0xD329,
-	12415: 0xD32C,
-	12416: 0xD330,
-	12417: 0xD338,
-	12418: 0xD339,
-	12419: 0xD33B,
-	12420: 0xD33C,
-	12421: 0xD33D,
-	12422: 0xD344,
-	12423: 0xD345,
-	12424: 0xD37C,
-	12425: 0xD37D,
-	12426: 0xD380,
-	12427: 0xD384,
-	12428: 0xD38C,
-	12429: 0xD38D,
-	12430: 0xD38F,
-	12431: 0xD390,
-	12432: 0xD391,
-	12433: 0xD398,
-	12434: 0xD399,
-	12435: 0xD39C,
-	12436: 0xD3A0,
-	12437: 0xD3A8,
-	12438: 0xD3A9,
-	12439: 0xD3AB,
-	12440: 0xD3AD,
-	12441: 0xD3B4,
-	12442: 0xD3B8,
-	12443: 0xD3BC,
-	12444: 0xD3C4,
-	12445: 0xD3C5,
-	12446: 0xD3C8,
-	12447: 0xD3C9,
-	12448: 0xD3D0,
-	12449: 0xD3D8,
-	12450: 0xD3E1,
-	12451: 0xD3E3,
-	12452: 0xD3EC,
-	12453: 0xD3ED,
-	12454: 0xD3F0,
-	12455: 0xD3F4,
-	12456: 0xD3FC,
-	12457: 0xD3FD,
-	12458: 0xD3FF,
-	12459: 0xD401,
-	12460: 0xD408,
-	12461: 0xD41D,
-	12462: 0xD440,
-	12463: 0xD444,
-	12464: 0xD45C,
-	12465: 0xD460,
-	12466: 0xD464,
-	12467: 0xD46D,
-	12468: 0xD46F,
-	12469: 0xD478,
-	12470: 0xD479,
-	12471: 0xD47C,
-	12472: 0xD47F,
-	12473: 0xD480,
-	12474: 0xD482,
-	12475: 0xD488,
-	12476: 0xD489,
-	12477: 0xD48B,
-	12478: 0xD48D,
-	12479: 0xD494,
-	12480: 0xD4A9,
-	12481: 0xD4CC,
-	12482: 0xD4D0,
-	12483: 0xD4D4,
-	12484: 0xD4DC,
-	12485: 0xD4DF,
-	12486: 0xD4E8,
-	12487: 0xD4EC,
-	12488: 0xD4F0,
-	12489: 0xD4F8,
-	12490: 0xD4FB,
-	12491: 0xD4FD,
-	12492: 0xD504,
-	12493: 0xD508,
-	12494: 0xD50C,
-	12495: 0xD514,
-	12496: 0xD515,
-	12497: 0xD517,
-	12498: 0xD53C,
-	12499: 0xD53D,
-	12500: 0xD540,
-	12501: 0xD544,
-	12502: 0xD54C,
-	12503: 0xD54D,
-	12504: 0xD54F,
-	12505: 0xD551,
-	12506: 0xD558,
-	12507: 0xD559,
-	12508: 0xD55C,
-	12509: 0xD560,
-	12510: 0xD565,
-	12511: 0xD568,
-	12512: 0xD569,
-	12513: 0xD56B,
-	12514: 0xD56D,
-	12515: 0xD574,
-	12516: 0xD575,
-	12517: 0xD578,
-	12518: 0xD57C,
-	12519: 0xD584,
-	12520: 0xD585,
-	12521: 0xD587,
-	12522: 0xD588,
-	12523: 0xD589,
-	12524: 0xD590,
-	12525: 0xD5A5,
-	12526: 0xD5C8,
-	12527: 0xD5C9,
-	12528: 0xD5CC,
-	12529: 0xD5D0,
-	12530: 0xD5D2,
-	12531: 0xD5D8,
-	12532: 0xD5D9,
-	12533: 0xD5DB,
-	12534: 0xD5DD,
-	12535: 0xD5E4,
-	12536: 0xD5E5,
-	12537: 0xD5E8,
-	12538: 0xD5EC,
-	12539: 0xD5F4,
-	12540: 0xD5F5,
-	12541: 0xD5F7,
-	12542: 0xD5F9,
-	12543: 0xD600,
-	12544: 0xD601,
-	12545: 0xD604,
-	12546: 0xD608,
-	12547: 0xD610,
-	12548: 0xD611,
-	12549: 0xD613,
-	12550: 0xD614,
-	12551: 0xD615,
-	12552: 0xD61C,
-	12553: 0xD620,
-	12554: 0xD624,
-	12555: 0xD62D,
-	12556: 0xD638,
-	12557: 0xD639,
-	12558: 0xD63C,
-	12559: 0xD640,
-	12560: 0xD645,
-	12561: 0xD648,
-	12562: 0xD649,
-	12563: 0xD64B,
-	12564: 0xD64D,
-	12565: 0xD651,
-	12566: 0xD654,
-	12567: 0xD655,
-	12568: 0xD658,
-	12569: 0xD65C,
-	12570: 0xD667,
-	12571: 0xD669,
-	12572: 0xD670,
-	12573: 0xD671,
-	12574: 0xD674,
-	12575: 0xD683,
-	12576: 0xD685,
-	12577: 0xD68C,
-	12578: 0xD68D,
-	12579: 0xD690,
-	12580: 0xD694,
-	12581: 0xD69D,
-	12582: 0xD69F,
-	12583: 0xD6A1,
-	12584: 0xD6A8,
-	12585: 0xD6AC,
-	12586: 0xD6B0,
-	12587: 0xD6B9,
-	12588: 0xD6BB,
-	12589: 0xD6C4,
-	12590: 0xD6C5,
-	12591: 0xD6C8,
-	12592: 0xD6CC,
-	12593: 0xD6D1,
-	12594: 0xD6D4,
-	12595: 0xD6D7,
-	12596: 0xD6D9,
-	12597: 0xD6E0,
-	12598: 0xD6E4,
-	12599: 0xD6E8,
-	12600: 0xD6F0,
-	12601: 0xD6F5,
-	12602: 0xD6FC,
-	12603: 0xD6FD,
-	12604: 0xD700,
-	12605: 0xD704,
-	12606: 0xD711,
-	12607: 0xD718,
-	12608: 0xD719,
-	12609: 0xD71C,
-	12610: 0xD720,
-	12611: 0xD728,
-	12612: 0xD729,
-	12613: 0xD72B,
-	12614: 0xD72D,
-	12615: 0xD734,
-	12616: 0xD735,
-	12617: 0xD738,
-	12618: 0xD73C,
-	12619: 0xD744,
-	12620: 0xD747,
-	12621: 0xD749,
-	12622: 0xD750,
-	12623: 0xD751,
-	12624: 0xD754,
-	12625: 0xD756,
-	12626: 0xD757,
-	12627: 0xD758,
-	12628: 0xD759,
-	12629: 0xD760,
-	12630: 0xD761,
-	12631: 0xD763,
-	12632: 0xD765,
-	12633: 0xD769,
-	12634: 0xD76C,
-	12635: 0xD770,
-	12636: 0xD774,
-	12637: 0xD77C,
-	12638: 0xD77D,
-	12639: 0xD781,
-	12640: 0xD788,
-	12641: 0xD789,
-	12642: 0xD78C,
-	12643: 0xD790,
-	12644: 0xD798,
-	12645: 0xD799,
-	12646: 0xD79B,
-	12647: 0xD79D,
-	12742: 0x4F3D,
-	12743: 0x4F73,
-	12744: 0x5047,
-	12745: 0x50F9,
-	12746: 0x52A0,
-	12747: 0x53EF,
-	12748: 0x5475,
-	12749: 0x54E5,
-	12750: 0x5609,
-	12751: 0x5AC1,
-	12752: 0x5BB6,
-	12753: 0x6687,
-	12754: 0x67B6,
-	12755: 0x67B7,
-	12756: 0x67EF,
-	12757: 0x6B4C,
-	12758: 0x73C2,
-	12759: 0x75C2,
-	12760: 0x7A3C,
-	12761: 0x82DB,
-	12762: 0x8304,
-	12763: 0x8857,
-	12764: 0x8888,
-	12765: 0x8A36,
-	12766: 0x8CC8,
-	12767: 0x8DCF,
-	12768: 0x8EFB,
-	12769: 0x8FE6,
-	12770: 0x99D5,
-	12771: 0x523B,
-	12772: 0x5374,
-	12773: 0x5404,
-	12774: 0x606A,
-	12775: 0x6164,
-	12776: 0x6BBC,
-	12777: 0x73CF,
-	12778: 0x811A,
-	12779: 0x89BA,
-	12780: 0x89D2,
-	12781: 0x95A3,
-	12782: 0x4F83,
-	12783: 0x520A,
-	12784: 0x58BE,
-	12785: 0x5978,
-	12786: 0x59E6,
-	12787: 0x5E72,
-	12788: 0x5E79,
-	12789: 0x61C7,
-	12790: 0x63C0,
-	12791: 0x6746,
-	12792: 0x67EC,
-	12793: 0x687F,
-	12794: 0x6F97,
-	12795: 0x764E,
-	12796: 0x770B,
-	12797: 0x78F5,
-	12798: 0x7A08,
-	12799: 0x7AFF,
-	12800: 0x7C21,
-	12801: 0x809D,
-	12802: 0x826E,
-	12803: 0x8271,
-	12804: 0x8AEB,
-	12805: 0x9593,
-	12806: 0x4E6B,
-	12807: 0x559D,
-	12808: 0x66F7,
-	12809: 0x6E34,
-	12810: 0x78A3,
-	12811: 0x7AED,
-	12812: 0x845B,
-	12813: 0x8910,
-	12814: 0x874E,
-	12815: 0x97A8,
-	12816: 0x52D8,
-	12817: 0x574E,
-	12818: 0x582A,
-	12819: 0x5D4C,
-	12820: 0x611F,
-	12821: 0x61BE,
-	12822: 0x6221,
-	12823: 0x6562,
-	12824: 0x67D1,
-	12825: 0x6A44,
-	12826: 0x6E1B,
-	12827: 0x7518,
-	12828: 0x75B3,
-	12829: 0x76E3,
-	12830: 0x77B0,
-	12831: 0x7D3A,
-	12832: 0x90AF,
-	12833: 0x9451,
-	12834: 0x9452,
-	12835: 0x9F95,
-	12836: 0x5323,
-	12837: 0x5CAC,
-	12838: 0x7532,
-	12839: 0x80DB,
-	12840: 0x9240,
-	12841: 0x9598,
-	12842: 0x525B,
-	12843: 0x5808,
-	12844: 0x59DC,
-	12845: 0x5CA1,
-	12846: 0x5D17,
-	12847: 0x5EB7,
-	12848: 0x5F3A,
-	12849: 0x5F4A,
-	12850: 0x6177,
-	12851: 0x6C5F,
-	12852: 0x757A,
-	12853: 0x7586,
-	12854: 0x7CE0,
-	12855: 0x7D73,
-	12856: 0x7DB1,
-	12857: 0x7F8C,
-	12858: 0x8154,
-	12859: 0x8221,
-	12860: 0x8591,
-	12861: 0x8941,
-	12862: 0x8B1B,
-	12863: 0x92FC,
-	12864: 0x964D,
-	12865: 0x9C47,
-	12866: 0x4ECB,
-	12867: 0x4EF7,
-	12868: 0x500B,
-	12869: 0x51F1,
-	12870: 0x584F,
-	12871: 0x6137,
-	12872: 0x613E,
-	12873: 0x6168,
-	12874: 0x6539,
-	12875: 0x69EA,
-	12876: 0x6F11,
-	12877: 0x75A5,
-	12878: 0x7686,
-	12879: 0x76D6,
-	12880: 0x7B87,
-	12881: 0x82A5,
-	12882: 0x84CB,
-	12883: 0xF900,
-	12884: 0x93A7,
-	12885: 0x958B,
-	12886: 0x5580,
-	12887: 0x5BA2,
-	12888: 0x5751,
-	12889: 0xF901,
-	12890: 0x7CB3,
-	12891: 0x7FB9,
-	12892: 0x91B5,
-	12893: 0x5028,
-	12894: 0x53BB,
-	12895: 0x5C45,
-	12896: 0x5DE8,
-	12897: 0x62D2,
-	12898: 0x636E,
-	12899: 0x64DA,
-	12900: 0x64E7,
-	12901: 0x6E20,
-	12902: 0x70AC,
-	12903: 0x795B,
-	12904: 0x8DDD,
-	12905: 0x8E1E,
-	12906: 0xF902,
-	12907: 0x907D,
-	12908: 0x9245,
-	12909: 0x92F8,
-	12910: 0x4E7E,
-	12911: 0x4EF6,
-	12912: 0x5065,
-	12913: 0x5DFE,
-	12914: 0x5EFA,
-	12915: 0x6106,
-	12916: 0x6957,
-	12917: 0x8171,
-	12918: 0x8654,
-	12919: 0x8E47,
-	12920: 0x9375,
-	12921: 0x9A2B,
-	12922: 0x4E5E,
-	12923: 0x5091,
-	12924: 0x6770,
-	12925: 0x6840,
-	12926: 0x5109,
-	12927: 0x528D,
-	12928: 0x5292,
-	12929: 0x6AA2,
-	12930: 0x77BC,
-	12931: 0x9210,
-	12932: 0x9ED4,
-	12933: 0x52AB,
-	12934: 0x602F,
-	12935: 0x8FF2,
-	12936: 0x5048,
-	12937: 0x61A9,
-	12938: 0x63ED,
-	12939: 0x64CA,
-	12940: 0x683C,
-	12941: 0x6A84,
-	12942: 0x6FC0,
-	12943: 0x8188,
-	12944: 0x89A1,
-	12945: 0x9694,
-	12946: 0x5805,
-	12947: 0x727D,
-	12948: 0x72AC,
-	12949: 0x7504,
-	12950: 0x7D79,
-	12951: 0x7E6D,
-	12952: 0x80A9,
-	12953: 0x898B,
-	12954: 0x8B74,
-	12955: 0x9063,
-	12956: 0x9D51,
-	12957: 0x6289,
-	12958: 0x6C7A,
-	12959: 0x6F54,
-	12960: 0x7D50,
-	12961: 0x7F3A,
-	12962: 0x8A23,
-	12963: 0x517C,
-	12964: 0x614A,
-	12965: 0x7B9D,
-	12966: 0x8B19,
-	12967: 0x9257,
-	12968: 0x938C,
-	12969: 0x4EAC,
-	12970: 0x4FD3,
-	12971: 0x501E,
-	12972: 0x50BE,
-	12973: 0x5106,
-	12974: 0x52C1,
-	12975: 0x52CD,
-	12976: 0x537F,
-	12977: 0x5770,
-	12978: 0x5883,
-	12979: 0x5E9A,
-	12980: 0x5F91,
-	12981: 0x6176,
-	12982: 0x61AC,
-	12983: 0x64CE,
-	12984: 0x656C,
-	12985: 0x666F,
-	12986: 0x66BB,
-	12987: 0x66F4,
-	12988: 0x6897,
-	12989: 0x6D87,
-	12990: 0x7085,
-	12991: 0x70F1,
-	12992: 0x749F,
-	12993: 0x74A5,
-	12994: 0x74CA,
-	12995: 0x75D9,
-	12996: 0x786C,
-	12997: 0x78EC,
-	12998: 0x7ADF,
-	12999: 0x7AF6,
-	13000: 0x7D45,
-	13001: 0x7D93,
-	13002: 0x8015,
-	13003: 0x803F,
-	13004: 0x811B,
-	13005: 0x8396,
-	13006: 0x8B66,
-	13007: 0x8F15,
-	13008: 0x9015,
-	13009: 0x93E1,
-	13010: 0x9803,
-	13011: 0x9838,
-	13012: 0x9A5A,
-	13013: 0x9BE8,
-	13014: 0x4FC2,
-	13015: 0x5553,
-	13016: 0x583A,
-	13017: 0x5951,
-	13018: 0x5B63,
-	13019: 0x5C46,
-	13020: 0x60B8,
-	13021: 0x6212,
-	13022: 0x6842,
-	13023: 0x68B0,
-	13024: 0x68E8,
-	13025: 0x6EAA,
-	13026: 0x754C,
-	13027: 0x7678,
-	13028: 0x78CE,
-	13029: 0x7A3D,
-	13030: 0x7CFB,
-	13031: 0x7E6B,
-	13032: 0x7E7C,
-	13033: 0x8A08,
-	13034: 0x8AA1,
-	13035: 0x8C3F,
-	13036: 0x968E,
-	13037: 0x9DC4,
-	13038: 0x53E4,
-	13039: 0x53E9,
-	13040: 0x544A,
-	13041: 0x5471,
-	13042: 0x56FA,
-	13043: 0x59D1,
-	13044: 0x5B64,
-	13045: 0x5C3B,
-	13046: 0x5EAB,
-	13047: 0x62F7,
-	13048: 0x6537,
-	13049: 0x6545,
-	13050: 0x6572,
-	13051: 0x66A0,
-	13052: 0x67AF,
-	13053: 0x69C1,
-	13054: 0x6CBD,
-	13055: 0x75FC,
-	13056: 0x7690,
-	13057: 0x777E,
-	13058: 0x7A3F,
-	13059: 0x7F94,
-	13060: 0x8003,
-	13061: 0x80A1,
-	13062: 0x818F,
-	13063: 0x82E6,
-	13064: 0x82FD,
-	13065: 0x83F0,
-	13066: 0x85C1,
-	13067: 0x8831,
-	13068: 0x88B4,
-	13069: 0x8AA5,
-	13070: 0xF903,
-	13071: 0x8F9C,
-	13072: 0x932E,
-	13073: 0x96C7,
-	13074: 0x9867,
-	13075: 0x9AD8,
-	13076: 0x9F13,
-	13077: 0x54ED,
-	13078: 0x659B,
-	13079: 0x66F2,
-	13080: 0x688F,
-	13081: 0x7A40,
-	13082: 0x8C37,
-	13083: 0x9D60,
-	13084: 0x56F0,
-	13085: 0x5764,
-	13086: 0x5D11,
-	13087: 0x6606,
-	13088: 0x68B1,
-	13089: 0x68CD,
-	13090: 0x6EFE,
-	13091: 0x7428,
-	13092: 0x889E,
-	13093: 0x9BE4,
-	13094: 0x6C68,
-	13095: 0xF904,
-	13096: 0x9AA8,
-	13097: 0x4F9B,
-	13098: 0x516C,
-	13099: 0x5171,
-	13100: 0x529F,
-	13101: 0x5B54,
-	13102: 0x5DE5,
-	13103: 0x6050,
-	13104: 0x606D,
-	13105: 0x62F1,
-	13106: 0x63A7,
-	13107: 0x653B,
-	13108: 0x73D9,
-	13109: 0x7A7A,
-	13110: 0x86A3,
-	13111: 0x8CA2,
-	13112: 0x978F,
-	13113: 0x4E32,
-	13114: 0x5BE1,
-	13115: 0x6208,
-	13116: 0x679C,
-	13117: 0x74DC,
-	13118: 0x79D1,
-	13119: 0x83D3,
-	13120: 0x8A87,
-	13121: 0x8AB2,
-	13122: 0x8DE8,
-	13123: 0x904E,
-	13124: 0x934B,
-	13125: 0x9846,
-	13126: 0x5ED3,
-	13127: 0x69E8,
-	13128: 0x85FF,
-	13129: 0x90ED,
-	13130: 0xF905,
-	13131: 0x51A0,
-	13132: 0x5B98,
-	13133: 0x5BEC,
-	13134: 0x6163,
-	13135: 0x68FA,
-	13136: 0x6B3E,
-	13137: 0x704C,
-	13138: 0x742F,
-	13139: 0x74D8,
-	13140: 0x7BA1,
-	13141: 0x7F50,
-	13142: 0x83C5,
-	13143: 0x89C0,
-	13144: 0x8CAB,
-	13145: 0x95DC,
-	13146: 0x9928,
-	13147: 0x522E,
-	13148: 0x605D,
-	13149: 0x62EC,
-	13150: 0x9002,
-	13151: 0x4F8A,
-	13152: 0x5149,
-	13153: 0x5321,
-	13154: 0x58D9,
-	13155: 0x5EE3,
-	13156: 0x66E0,
-	13157: 0x6D38,
-	13158: 0x709A,
-	13159: 0x72C2,
-	13160: 0x73D6,
-	13161: 0x7B50,
-	13162: 0x80F1,
-	13163: 0x945B,
-	13164: 0x5366,
-	13165: 0x639B,
-	13166: 0x7F6B,
-	13167: 0x4E56,
-	13168: 0x5080,
-	13169: 0x584A,
-	13170: 0x58DE,
-	13171: 0x602A,
-	13172: 0x6127,
-	13173: 0x62D0,
-	13174: 0x69D0,
-	13175: 0x9B41,
-	13176: 0x5B8F,
-	13177: 0x7D18,
-	13178: 0x80B1,
-	13179: 0x8F5F,
-	13180: 0x4EA4,
-	13181: 0x50D1,
-	13182: 0x54AC,
-	13183: 0x55AC,
-	13184: 0x5B0C,
-	13185: 0x5DA0,
-	13186: 0x5DE7,
-	13187: 0x652A,
-	13188: 0x654E,
-	13189: 0x6821,
-	13190: 0x6A4B,
-	13191: 0x72E1,
-	13192: 0x768E,
-	13193: 0x77EF,
-	13194: 0x7D5E,
-	13195: 0x7FF9,
-	13196: 0x81A0,
-	13197: 0x854E,
-	13198: 0x86DF,
-	13199: 0x8F03,
-	13200: 0x8F4E,
-	13201: 0x90CA,
-	13202: 0x9903,
-	13203: 0x9A55,
-	13204: 0x9BAB,
-	13205: 0x4E18,
-	13206: 0x4E45,
-	13207: 0x4E5D,
-	13208: 0x4EC7,
-	13209: 0x4FF1,
-	13210: 0x5177,
-	13211: 0x52FE,
-	13212: 0x5340,
-	13213: 0x53E3,
-	13214: 0x53E5,
-	13215: 0x548E,
-	13216: 0x5614,
-	13217: 0x5775,
-	13218: 0x57A2,
-	13219: 0x5BC7,
-	13220: 0x5D87,
-	13221: 0x5ED0,
-	13222: 0x61FC,
-	13223: 0x62D8,
-	13224: 0x6551,
-	13225: 0x67B8,
-	13226: 0x67E9,
-	13227: 0x69CB,
-	13228: 0x6B50,
-	13229: 0x6BC6,
-	13230: 0x6BEC,
-	13231: 0x6C42,
-	13232: 0x6E9D,
-	13233: 0x7078,
-	13234: 0x72D7,
-	13235: 0x7396,
-	13236: 0x7403,
-	13237: 0x77BF,
-	13238: 0x77E9,
-	13239: 0x7A76,
-	13240: 0x7D7F,
-	13241: 0x8009,
-	13242: 0x81FC,
-	13243: 0x8205,
-	13244: 0x820A,
-	13245: 0x82DF,
-	13246: 0x8862,
-	13247: 0x8B33,
-	13248: 0x8CFC,
-	13249: 0x8EC0,
-	13250: 0x9011,
-	13251: 0x90B1,
-	13252: 0x9264,
-	13253: 0x92B6,
-	13254: 0x99D2,
-	13255: 0x9A45,
-	13256: 0x9CE9,
-	13257: 0x9DD7,
-	13258: 0x9F9C,
-	13259: 0x570B,
-	13260: 0x5C40,
-	13261: 0x83CA,
-	13262: 0x97A0,
-	13263: 0x97AB,
-	13264: 0x9EB4,
-	13265: 0x541B,
-	13266: 0x7A98,
-	13267: 0x7FA4,
-	13268: 0x88D9,
-	13269: 0x8ECD,
-	13270: 0x90E1,
-	13271: 0x5800,
-	13272: 0x5C48,
-	13273: 0x6398,
-	13274: 0x7A9F,
-	13275: 0x5BAE,
-	13276: 0x5F13,
-	13277: 0x7A79,
-	13278: 0x7AAE,
-	13279: 0x828E,
-	13280: 0x8EAC,
-	13281: 0x5026,
-	13282: 0x5238,
-	13283: 0x52F8,
-	13284: 0x5377,
-	13285: 0x5708,
-	13286: 0x62F3,
-	13287: 0x6372,
-	13288: 0x6B0A,
-	13289: 0x6DC3,
-	13290: 0x7737,
-	13291: 0x53A5,
-	13292: 0x7357,
-	13293: 0x8568,
-	13294: 0x8E76,
-	13295: 0x95D5,
-	13296: 0x673A,
-	13297: 0x6AC3,
-	13298: 0x6F70,
-	13299: 0x8A6D,
-	13300: 0x8ECC,
-	13301: 0x994B,
-	13302: 0xF906,
-	13303: 0x6677,
-	13304: 0x6B78,
-	13305: 0x8CB4,
-	13306: 0x9B3C,
-	13307: 0xF907,
-	13308: 0x53EB,
-	13309: 0x572D,
-	13310: 0x594E,
-	13311: 0x63C6,
-	13312: 0x69FB,
-	13313: 0x73EA,
-	13314: 0x7845,
-	13315: 0x7ABA,
-	13316: 0x7AC5,
-	13317: 0x7CFE,
-	13318: 0x8475,
-	13319: 0x898F,
-	13320: 0x8D73,
-	13321: 0x9035,
-	13322: 0x95A8,
-	13323: 0x52FB,
-	13324: 0x5747,
-	13325: 0x7547,
-	13326: 0x7B60,
-	13327: 0x83CC,
-	13328: 0x921E,
-	13329: 0xF908,
-	13330: 0x6A58,
-	13331: 0x514B,
-	13332: 0x524B,
-	13333: 0x5287,
-	13334: 0x621F,
-	13335: 0x68D8,
-	13336: 0x6975,
-	13337: 0x9699,
-	13338: 0x50C5,
-	13339: 0x52A4,
-	13340: 0x52E4,
-	13341: 0x61C3,
-	13342: 0x65A4,
-	13343: 0x6839,
-	13344: 0x69FF,
-	13345: 0x747E,
-	13346: 0x7B4B,
-	13347: 0x82B9,
-	13348: 0x83EB,
-	13349: 0x89B2,
-	13350: 0x8B39,
-	13351: 0x8FD1,
-	13352: 0x9949,
-	13353: 0xF909,
-	13354: 0x4ECA,
-	13355: 0x5997,
-	13356: 0x64D2,
-	13357: 0x6611,
-	13358: 0x6A8E,
-	13359: 0x7434,
-	13360: 0x7981,
-	13361: 0x79BD,
-	13362: 0x82A9,
-	13363: 0x887E,
-	13364: 0x887F,
-	13365: 0x895F,
-	13366: 0xF90A,
-	13367: 0x9326,
-	13368: 0x4F0B,
-	13369: 0x53CA,
-	13370: 0x6025,
-	13371: 0x6271,
-	13372: 0x6C72,
-	13373: 0x7D1A,
-	13374: 0x7D66,
-	13375: 0x4E98,
-	13376: 0x5162,
-	13377: 0x77DC,
-	13378: 0x80AF,
-	13379: 0x4F01,
-	13380: 0x4F0E,
-	13381: 0x5176,
-	13382: 0x5180,
-	13383: 0x55DC,
-	13384: 0x5668,
-	13385: 0x573B,
-	13386: 0x57FA,
-	13387: 0x57FC,
-	13388: 0x5914,
-	13389: 0x5947,
-	13390: 0x5993,
-	13391: 0x5BC4,
-	13392: 0x5C90,
-	13393: 0x5D0E,
-	13394: 0x5DF1,
-	13395: 0x5E7E,
-	13396: 0x5FCC,
-	13397: 0x6280,
-	13398: 0x65D7,
-	13399: 0x65E3,
-	13400: 0x671E,
-	13401: 0x671F,
-	13402: 0x675E,
-	13403: 0x68CB,
-	13404: 0x68C4,
-	13405: 0x6A5F,
-	13406: 0x6B3A,
-	13407: 0x6C23,
-	13408: 0x6C7D,
-	13409: 0x6C82,
-	13410: 0x6DC7,
-	13411: 0x7398,
-	13412: 0x7426,
-	13413: 0x742A,
-	13414: 0x7482,
-	13415: 0x74A3,
-	13416: 0x7578,
-	13417: 0x757F,
-	13418: 0x7881,
-	13419: 0x78EF,
-	13420: 0x7941,
-	13421: 0x7947,
-	13422: 0x7948,
-	13423: 0x797A,
-	13424: 0x7B95,
-	13425: 0x7D00,
-	13426: 0x7DBA,
-	13427: 0x7F88,
-	13428: 0x8006,
-	13429: 0x802D,
-	13430: 0x808C,
-	13431: 0x8A18,
-	13432: 0x8B4F,
-	13433: 0x8C48,
-	13434: 0x8D77,
-	13435: 0x9321,
-	13436: 0x9324,
-	13437: 0x98E2,
-	13438: 0x9951,
-	13439: 0x9A0E,
-	13440: 0x9A0F,
-	13441: 0x9A65,
-	13442: 0x9E92,
-	13443: 0x7DCA,
-	13444: 0x4F76,
-	13445: 0x5409,
-	13446: 0x62EE,
-	13447: 0x6854,
-	13448: 0x91D1,
-	13449: 0x55AB,
-	13450: 0x513A,
-	13451: 0xF90B,
-	13452: 0xF90C,
-	13453: 0x5A1C,
-	13454: 0x61E6,
-	13455: 0xF90D,
-	13456: 0x62CF,
-	13457: 0x62FF,
-	13458: 0xF90E,
-	13459: 0xF90F,
-	13460: 0xF910,
-	13461: 0xF911,
-	13462: 0xF912,
-	13463: 0xF913,
-	13464: 0x90A3,
-	13465: 0xF914,
-	13466: 0xF915,
-	13467: 0xF916,
-	13468: 0xF917,
-	13469: 0xF918,
-	13470: 0x8AFE,
-	13471: 0xF919,
-	13472: 0xF91A,
-	13473: 0xF91B,
-	13474: 0xF91C,
-	13475: 0x6696,
-	13476: 0xF91D,
-	13477: 0x7156,
-	13478: 0xF91E,
-	13479: 0xF91F,
-	13480: 0x96E3,
-	13481: 0xF920,
-	13482: 0x634F,
-	13483: 0x637A,
-	13484: 0x5357,
-	13485: 0xF921,
-	13486: 0x678F,
-	13487: 0x6960,
-	13488: 0x6E73,
-	13489: 0xF922,
-	13490: 0x7537,
-	13491: 0xF923,
-	13492: 0xF924,
-	13493: 0xF925,
-	13494: 0x7D0D,
-	13495: 0xF926,
-	13496: 0xF927,
-	13497: 0x8872,
-	13498: 0x56CA,
-	13499: 0x5A18,
-	13500: 0xF928,
-	13501: 0xF929,
-	13502: 0xF92A,
-	13503: 0xF92B,
-	13504: 0xF92C,
-	13505: 0x4E43,
-	13506: 0xF92D,
-	13507: 0x5167,
-	13508: 0x5948,
-	13509: 0x67F0,
-	13510: 0x8010,
-	13511: 0xF92E,
-	13512: 0x5973,
-	13513: 0x5E74,
-	13514: 0x649A,
-	13515: 0x79CA,
-	13516: 0x5FF5,
-	13517: 0x606C,
-	13518: 0x62C8,
-	13519: 0x637B,
-	13520: 0x5BE7,
-	13521: 0x5BD7,
-	13522: 0x52AA,
-	13523: 0xF92F,
-	13524: 0x5974,
-	13525: 0x5F29,
-	13526: 0x6012,
-	13527: 0xF930,
-	13528: 0xF931,
-	13529: 0xF932,
-	13530: 0x7459,
-	13531: 0xF933,
-	13532: 0xF934,
-	13533: 0xF935,
-	13534: 0xF936,
-	13535: 0xF937,
-	13536: 0xF938,
-	13537: 0x99D1,
-	13538: 0xF939,
-	13539: 0xF93A,
-	13540: 0xF93B,
-	13541: 0xF93C,
-	13542: 0xF93D,
-	13543: 0xF93E,
-	13544: 0xF93F,
-	13545: 0xF940,
-	13546: 0xF941,
-	13547: 0xF942,
-	13548: 0xF943,
-	13549: 0x6FC3,
-	13550: 0xF944,
-	13551: 0xF945,
-	13552: 0x81BF,
-	13553: 0x8FB2,
-	13554: 0x60F1,
-	13555: 0xF946,
-	13556: 0xF947,
-	13557: 0x8166,
-	13558: 0xF948,
-	13559: 0xF949,
-	13560: 0x5C3F,
-	13561: 0xF94A,
-	13562: 0xF94B,
-	13563: 0xF94C,
-	13564: 0xF94D,
-	13565: 0xF94E,
-	13566: 0xF94F,
-	13567: 0xF950,
-	13568: 0xF951,
-	13569: 0x5AE9,
-	13570: 0x8A25,
-	13571: 0x677B,
-	13572: 0x7D10,
-	13573: 0xF952,
-	13574: 0xF953,
-	13575: 0xF954,
-	13576: 0xF955,
-	13577: 0xF956,
-	13578: 0xF957,
-	13579: 0x80FD,
-	13580: 0xF958,
-	13581: 0xF959,
-	13582: 0x5C3C,
-	13583: 0x6CE5,
-	13584: 0x533F,
-	13585: 0x6EBA,
-	13586: 0x591A,
-	13587: 0x8336,
-	13588: 0x4E39,
-	13589: 0x4EB6,
-	13590: 0x4F46,
-	13591: 0x55AE,
-	13592: 0x5718,
-	13593: 0x58C7,
-	13594: 0x5F56,
-	13595: 0x65B7,
-	13596: 0x65E6,
-	13597: 0x6A80,
-	13598: 0x6BB5,
-	13599: 0x6E4D,
-	13600: 0x77ED,
-	13601: 0x7AEF,
-	13602: 0x7C1E,
-	13603: 0x7DDE,
-	13604: 0x86CB,
-	13605: 0x8892,
-	13606: 0x9132,
-	13607: 0x935B,
-	13608: 0x64BB,
-	13609: 0x6FBE,
-	13610: 0x737A,
-	13611: 0x75B8,
-	13612: 0x9054,
-	13613: 0x5556,
-	13614: 0x574D,
-	13615: 0x61BA,
-	13616: 0x64D4,
-	13617: 0x66C7,
-	13618: 0x6DE1,
-	13619: 0x6E5B,
-	13620: 0x6F6D,
-	13621: 0x6FB9,
-	13622: 0x75F0,
-	13623: 0x8043,
-	13624: 0x81BD,
-	13625: 0x8541,
-	13626: 0x8983,
-	13627: 0x8AC7,
-	13628: 0x8B5A,
-	13629: 0x931F,
-	13630: 0x6C93,
-	13631: 0x7553,
-	13632: 0x7B54,
-	13633: 0x8E0F,
-	13634: 0x905D,
-	13635: 0x5510,
-	13636: 0x5802,
-	13637: 0x5858,
-	13638: 0x5E62,
-	13639: 0x6207,
-	13640: 0x649E,
-	13641: 0x68E0,
-	13642: 0x7576,
-	13643: 0x7CD6,
-	13644: 0x87B3,
-	13645: 0x9EE8,
-	13646: 0x4EE3,
-	13647: 0x5788,
-	13648: 0x576E,
-	13649: 0x5927,
-	13650: 0x5C0D,
-	13651: 0x5CB1,
-	13652: 0x5E36,
-	13653: 0x5F85,
-	13654: 0x6234,
-	13655: 0x64E1,
-	13656: 0x73B3,
-	13657: 0x81FA,
-	13658: 0x888B,
-	13659: 0x8CB8,
-	13660: 0x968A,
-	13661: 0x9EDB,
-	13662: 0x5B85,
-	13663: 0x5FB7,
-	13664: 0x60B3,
-	13665: 0x5012,
-	13666: 0x5200,
-	13667: 0x5230,
-	13668: 0x5716,
-	13669: 0x5835,
-	13670: 0x5857,
-	13671: 0x5C0E,
-	13672: 0x5C60,
-	13673: 0x5CF6,
-	13674: 0x5D8B,
-	13675: 0x5EA6,
-	13676: 0x5F92,
-	13677: 0x60BC,
-	13678: 0x6311,
-	13679: 0x6389,
-	13680: 0x6417,
-	13681: 0x6843,
-	13682: 0x68F9,
-	13683: 0x6AC2,
-	13684: 0x6DD8,
-	13685: 0x6E21,
-	13686: 0x6ED4,
-	13687: 0x6FE4,
-	13688: 0x71FE,
-	13689: 0x76DC,
-	13690: 0x7779,
-	13691: 0x79B1,
-	13692: 0x7A3B,
-	13693: 0x8404,
-	13694: 0x89A9,
-	13695: 0x8CED,
-	13696: 0x8DF3,
-	13697: 0x8E48,
-	13698: 0x9003,
-	13699: 0x9014,
-	13700: 0x9053,
-	13701: 0x90FD,
-	13702: 0x934D,
-	13703: 0x9676,
-	13704: 0x97DC,
-	13705: 0x6BD2,
-	13706: 0x7006,
-	13707: 0x7258,
-	13708: 0x72A2,
-	13709: 0x7368,
-	13710: 0x7763,
-	13711: 0x79BF,
-	13712: 0x7BE4,
-	13713: 0x7E9B,
-	13714: 0x8B80,
-	13715: 0x58A9,
-	13716: 0x60C7,
-	13717: 0x6566,
-	13718: 0x65FD,
-	13719: 0x66BE,
-	13720: 0x6C8C,
-	13721: 0x711E,
-	13722: 0x71C9,
-	13723: 0x8C5A,
-	13724: 0x9813,
-	13725: 0x4E6D,
-	13726: 0x7A81,
-	13727: 0x4EDD,
-	13728: 0x51AC,
-	13729: 0x51CD,
-	13730: 0x52D5,
-	13731: 0x540C,
-	13732: 0x61A7,
-	13733: 0x6771,
-	13734: 0x6850,
-	13735: 0x68DF,
-	13736: 0x6D1E,
-	13737: 0x6F7C,
-	13738: 0x75BC,
-	13739: 0x77B3,
-	13740: 0x7AE5,
-	13741: 0x80F4,
-	13742: 0x8463,
-	13743: 0x9285,
-	13744: 0x515C,
-	13745: 0x6597,
-	13746: 0x675C,
-	13747: 0x6793,
-	13748: 0x75D8,
-	13749: 0x7AC7,
-	13750: 0x8373,
-	13751: 0xF95A,
-	13752: 0x8C46,
-	13753: 0x9017,
-	13754: 0x982D,
-	13755: 0x5C6F,
-	13756: 0x81C0,
-	13757: 0x829A,
-	13758: 0x9041,
-	13759: 0x906F,
-	13760: 0x920D,
-	13761: 0x5F97,
-	13762: 0x5D9D,
-	13763: 0x6A59,
-	13764: 0x71C8,
-	13765: 0x767B,
-	13766: 0x7B49,
-	13767: 0x85E4,
-	13768: 0x8B04,
-	13769: 0x9127,
-	13770: 0x9A30,
-	13771: 0x5587,
-	13772: 0x61F6,
-	13773: 0xF95B,
-	13774: 0x7669,
-	13775: 0x7F85,
-	13776: 0x863F,
-	13777: 0x87BA,
-	13778: 0x88F8,
-	13779: 0x908F,
-	13780: 0xF95C,
-	13781: 0x6D1B,
-	13782: 0x70D9,
-	13783: 0x73DE,
-	13784: 0x7D61,
-	13785: 0x843D,
-	13786: 0xF95D,
-	13787: 0x916A,
-	13788: 0x99F1,
-	13789: 0xF95E,
-	13790: 0x4E82,
-	13791: 0x5375,
-	13792: 0x6B04,
-	13793: 0x6B12,
-	13794: 0x703E,
-	13795: 0x721B,
-	13796: 0x862D,
-	13797: 0x9E1E,
-	13798: 0x524C,
-	13799: 0x8FA3,
-	13800: 0x5D50,
-	13801: 0x64E5,
-	13802: 0x652C,
-	13803: 0x6B16,
-	13804: 0x6FEB,
-	13805: 0x7C43,
-	13806: 0x7E9C,
-	13807: 0x85CD,
-	13808: 0x8964,
-	13809: 0x89BD,
-	13810: 0x62C9,
-	13811: 0x81D8,
-	13812: 0x881F,
-	13813: 0x5ECA,
-	13814: 0x6717,
-	13815: 0x6D6A,
-	13816: 0x72FC,
-	13817: 0x7405,
-	13818: 0x746F,
-	13819: 0x8782,
-	13820: 0x90DE,
-	13821: 0x4F86,
-	13822: 0x5D0D,
-	13823: 0x5FA0,
-	13824: 0x840A,
-	13825: 0x51B7,
-	13826: 0x63A0,
-	13827: 0x7565,
-	13828: 0x4EAE,
-	13829: 0x5006,
-	13830: 0x5169,
-	13831: 0x51C9,
-	13832: 0x6881,
-	13833: 0x6A11,
-	13834: 0x7CAE,
-	13835: 0x7CB1,
-	13836: 0x7CE7,
-	13837: 0x826F,
-	13838: 0x8AD2,
-	13839: 0x8F1B,
-	13840: 0x91CF,
-	13841: 0x4FB6,
-	13842: 0x5137,
-	13843: 0x52F5,
-	13844: 0x5442,
-	13845: 0x5EEC,
-	13846: 0x616E,
-	13847: 0x623E,
-	13848: 0x65C5,
-	13849: 0x6ADA,
-	13850: 0x6FFE,
-	13851: 0x792A,
-	13852: 0x85DC,
-	13853: 0x8823,
-	13854: 0x95AD,
-	13855: 0x9A62,
-	13856: 0x9A6A,
-	13857: 0x9E97,
-	13858: 0x9ECE,
-	13859: 0x529B,
-	13860: 0x66C6,
-	13861: 0x6B77,
-	13862: 0x701D,
-	13863: 0x792B,
-	13864: 0x8F62,
-	13865: 0x9742,
-	13866: 0x6190,
-	13867: 0x6200,
-	13868: 0x6523,
-	13869: 0x6F23,
-	13870: 0x7149,
-	13871: 0x7489,
-	13872: 0x7DF4,
-	13873: 0x806F,
-	13874: 0x84EE,
-	13875: 0x8F26,
-	13876: 0x9023,
-	13877: 0x934A,
-	13878: 0x51BD,
-	13879: 0x5217,
-	13880: 0x52A3,
-	13881: 0x6D0C,
-	13882: 0x70C8,
-	13883: 0x88C2,
-	13884: 0x5EC9,
-	13885: 0x6582,
-	13886: 0x6BAE,
-	13887: 0x6FC2,
-	13888: 0x7C3E,
-	13889: 0x7375,
-	13890: 0x4EE4,
-	13891: 0x4F36,
-	13892: 0x56F9,
-	13893: 0xF95F,
-	13894: 0x5CBA,
-	13895: 0x5DBA,
-	13896: 0x601C,
-	13897: 0x73B2,
-	13898: 0x7B2D,
-	13899: 0x7F9A,
-	13900: 0x7FCE,
-	13901: 0x8046,
-	13902: 0x901E,
-	13903: 0x9234,
-	13904: 0x96F6,
-	13905: 0x9748,
-	13906: 0x9818,
-	13907: 0x9F61,
-	13908: 0x4F8B,
-	13909: 0x6FA7,
-	13910: 0x79AE,
-	13911: 0x91B4,
-	13912: 0x96B7,
-	13913: 0x52DE,
-	13914: 0xF960,
-	13915: 0x6488,
-	13916: 0x64C4,
-	13917: 0x6AD3,
-	13918: 0x6F5E,
-	13919: 0x7018,
-	13920: 0x7210,
-	13921: 0x76E7,
-	13922: 0x8001,
-	13923: 0x8606,
-	13924: 0x865C,
-	13925: 0x8DEF,
-	13926: 0x8F05,
-	13927: 0x9732,
-	13928: 0x9B6F,
-	13929: 0x9DFA,
-	13930: 0x9E75,
-	13931: 0x788C,
-	13932: 0x797F,
-	13933: 0x7DA0,
-	13934: 0x83C9,
-	13935: 0x9304,
-	13936: 0x9E7F,
-	13937: 0x9E93,
-	13938: 0x8AD6,
-	13939: 0x58DF,
-	13940: 0x5F04,
-	13941: 0x6727,
-	13942: 0x7027,
-	13943: 0x74CF,
-	13944: 0x7C60,
-	13945: 0x807E,
-	13946: 0x5121,
-	13947: 0x7028,
-	13948: 0x7262,
-	13949: 0x78CA,
-	13950: 0x8CC2,
-	13951: 0x8CDA,
-	13952: 0x8CF4,
-	13953: 0x96F7,
-	13954: 0x4E86,
-	13955: 0x50DA,
-	13956: 0x5BEE,
-	13957: 0x5ED6,
-	13958: 0x6599,
-	13959: 0x71CE,
-	13960: 0x7642,
-	13961: 0x77AD,
-	13962: 0x804A,
-	13963: 0x84FC,
-	13964: 0x907C,
-	13965: 0x9B27,
-	13966: 0x9F8D,
-	13967: 0x58D8,
-	13968: 0x5A41,
-	13969: 0x5C62,
-	13970: 0x6A13,
-	13971: 0x6DDA,
-	13972: 0x6F0F,
-	13973: 0x763B,
-	13974: 0x7D2F,
-	13975: 0x7E37,
-	13976: 0x851E,
-	13977: 0x8938,
-	13978: 0x93E4,
-	13979: 0x964B,
-	13980: 0x5289,
-	13981: 0x65D2,
-	13982: 0x67F3,
-	13983: 0x69B4,
-	13984: 0x6D41,
-	13985: 0x6E9C,
-	13986: 0x700F,
-	13987: 0x7409,
-	13988: 0x7460,
-	13989: 0x7559,
-	13990: 0x7624,
-	13991: 0x786B,
-	13992: 0x8B2C,
-	13993: 0x985E,
-	13994: 0x516D,
-	13995: 0x622E,
-	13996: 0x9678,
-	13997: 0x4F96,
-	13998: 0x502B,
-	13999: 0x5D19,
-	14000: 0x6DEA,
-	14001: 0x7DB8,
-	14002: 0x8F2A,
-	14003: 0x5F8B,
-	14004: 0x6144,
-	14005: 0x6817,
-	14006: 0xF961,
-	14007: 0x9686,
-	14008: 0x52D2,
-	14009: 0x808B,
-	14010: 0x51DC,
-	14011: 0x51CC,
-	14012: 0x695E,
-	14013: 0x7A1C,
-	14014: 0x7DBE,
-	14015: 0x83F1,
-	14016: 0x9675,
-	14017: 0x4FDA,
-	14018: 0x5229,
-	14019: 0x5398,
-	14020: 0x540F,
-	14021: 0x550E,
-	14022: 0x5C65,
-	14023: 0x60A7,
-	14024: 0x674E,
-	14025: 0x68A8,
-	14026: 0x6D6C,
-	14027: 0x7281,
-	14028: 0x72F8,
-	14029: 0x7406,
-	14030: 0x7483,
-	14031: 0xF962,
-	14032: 0x75E2,
-	14033: 0x7C6C,
-	14034: 0x7F79,
-	14035: 0x7FB8,
-	14036: 0x8389,
-	14037: 0x88CF,
-	14038: 0x88E1,
-	14039: 0x91CC,
-	14040: 0x91D0,
-	14041: 0x96E2,
-	14042: 0x9BC9,
-	14043: 0x541D,
-	14044: 0x6F7E,
-	14045: 0x71D0,
-	14046: 0x7498,
-	14047: 0x85FA,
-	14048: 0x8EAA,
-	14049: 0x96A3,
-	14050: 0x9C57,
-	14051: 0x9E9F,
-	14052: 0x6797,
-	14053: 0x6DCB,
-	14054: 0x7433,
-	14055: 0x81E8,
-	14056: 0x9716,
-	14057: 0x782C,
-	14058: 0x7ACB,
-	14059: 0x7B20,
-	14060: 0x7C92,
-	14061: 0x6469,
-	14062: 0x746A,
-	14063: 0x75F2,
-	14064: 0x78BC,
-	14065: 0x78E8,
-	14066: 0x99AC,
-	14067: 0x9B54,
-	14068: 0x9EBB,
-	14069: 0x5BDE,
-	14070: 0x5E55,
-	14071: 0x6F20,
-	14072: 0x819C,
-	14073: 0x83AB,
-	14074: 0x9088,
-	14075: 0x4E07,
-	14076: 0x534D,
-	14077: 0x5A29,
-	14078: 0x5DD2,
-	14079: 0x5F4E,
-	14080: 0x6162,
-	14081: 0x633D,
-	14082: 0x6669,
-	14083: 0x66FC,
-	14084: 0x6EFF,
-	14085: 0x6F2B,
-	14086: 0x7063,
-	14087: 0x779E,
-	14088: 0x842C,
-	14089: 0x8513,
-	14090: 0x883B,
-	14091: 0x8F13,
-	14092: 0x9945,
-	14093: 0x9C3B,
-	14094: 0x551C,
-	14095: 0x62B9,
-	14096: 0x672B,
-	14097: 0x6CAB,
-	14098: 0x8309,
-	14099: 0x896A,
-	14100: 0x977A,
-	14101: 0x4EA1,
-	14102: 0x5984,
-	14103: 0x5FD8,
-	14104: 0x5FD9,
-	14105: 0x671B,
-	14106: 0x7DB2,
-	14107: 0x7F54,
-	14108: 0x8292,
-	14109: 0x832B,
-	14110: 0x83BD,
-	14111: 0x8F1E,
-	14112: 0x9099,
-	14113: 0x57CB,
-	14114: 0x59B9,
-	14115: 0x5A92,
-	14116: 0x5BD0,
-	14117: 0x6627,
-	14118: 0x679A,
-	14119: 0x6885,
-	14120: 0x6BCF,
-	14121: 0x7164,
-	14122: 0x7F75,
-	14123: 0x8CB7,
-	14124: 0x8CE3,
-	14125: 0x9081,
-	14126: 0x9B45,
-	14127: 0x8108,
-	14128: 0x8C8A,
-	14129: 0x964C,
-	14130: 0x9A40,
-	14131: 0x9EA5,
-	14132: 0x5B5F,
-	14133: 0x6C13,
-	14134: 0x731B,
-	14135: 0x76F2,
-	14136: 0x76DF,
-	14137: 0x840C,
-	14138: 0x51AA,
-	14139: 0x8993,
-	14140: 0x514D,
-	14141: 0x5195,
-	14142: 0x52C9,
-	14143: 0x68C9,
-	14144: 0x6C94,
-	14145: 0x7704,
-	14146: 0x7720,
-	14147: 0x7DBF,
-	14148: 0x7DEC,
-	14149: 0x9762,
-	14150: 0x9EB5,
-	14151: 0x6EC5,
-	14152: 0x8511,
-	14153: 0x51A5,
-	14154: 0x540D,
-	14155: 0x547D,
-	14156: 0x660E,
-	14157: 0x669D,
-	14158: 0x6927,
-	14159: 0x6E9F,
-	14160: 0x76BF,
-	14161: 0x7791,
-	14162: 0x8317,
-	14163: 0x84C2,
-	14164: 0x879F,
-	14165: 0x9169,
-	14166: 0x9298,
-	14167: 0x9CF4,
-	14168: 0x8882,
-	14169: 0x4FAE,
-	14170: 0x5192,
-	14171: 0x52DF,
-	14172: 0x59C6,
-	14173: 0x5E3D,
-	14174: 0x6155,
-	14175: 0x6478,
-	14176: 0x6479,
-	14177: 0x66AE,
-	14178: 0x67D0,
-	14179: 0x6A21,
-	14180: 0x6BCD,
-	14181: 0x6BDB,
-	14182: 0x725F,
-	14183: 0x7261,
-	14184: 0x7441,
-	14185: 0x7738,
-	14186: 0x77DB,
-	14187: 0x8017,
-	14188: 0x82BC,
-	14189: 0x8305,
-	14190: 0x8B00,
-	14191: 0x8B28,
-	14192: 0x8C8C,
-	14193: 0x6728,
-	14194: 0x6C90,
-	14195: 0x7267,
-	14196: 0x76EE,
-	14197: 0x7766,
-	14198: 0x7A46,
-	14199: 0x9DA9,
-	14200: 0x6B7F,
-	14201: 0x6C92,
-	14202: 0x5922,
-	14203: 0x6726,
-	14204: 0x8499,
-	14205: 0x536F,
-	14206: 0x5893,
-	14207: 0x5999,
-	14208: 0x5EDF,
-	14209: 0x63CF,
-	14210: 0x6634,
-	14211: 0x6773,
-	14212: 0x6E3A,
-	14213: 0x732B,
-	14214: 0x7AD7,
-	14215: 0x82D7,
-	14216: 0x9328,
-	14217: 0x52D9,
-	14218: 0x5DEB,
-	14219: 0x61AE,
-	14220: 0x61CB,
-	14221: 0x620A,
-	14222: 0x62C7,
-	14223: 0x64AB,
-	14224: 0x65E0,
-	14225: 0x6959,
-	14226: 0x6B66,
-	14227: 0x6BCB,
-	14228: 0x7121,
-	14229: 0x73F7,
-	14230: 0x755D,
-	14231: 0x7E46,
-	14232: 0x821E,
-	14233: 0x8302,
-	14234: 0x856A,
-	14235: 0x8AA3,
-	14236: 0x8CBF,
-	14237: 0x9727,
-	14238: 0x9D61,
-	14239: 0x58A8,
-	14240: 0x9ED8,
-	14241: 0x5011,
-	14242: 0x520E,
-	14243: 0x543B,
-	14244: 0x554F,
-	14245: 0x6587,
-	14246: 0x6C76,
-	14247: 0x7D0A,
-	14248: 0x7D0B,
-	14249: 0x805E,
-	14250: 0x868A,
-	14251: 0x9580,
-	14252: 0x96EF,
-	14253: 0x52FF,
-	14254: 0x6C95,
-	14255: 0x7269,
-	14256: 0x5473,
-	14257: 0x5A9A,
-	14258: 0x5C3E,
-	14259: 0x5D4B,
-	14260: 0x5F4C,
-	14261: 0x5FAE,
-	14262: 0x672A,
-	14263: 0x68B6,
-	14264: 0x6963,
-	14265: 0x6E3C,
-	14266: 0x6E44,
-	14267: 0x7709,
-	14268: 0x7C73,
-	14269: 0x7F8E,
-	14270: 0x8587,
-	14271: 0x8B0E,
-	14272: 0x8FF7,
-	14273: 0x9761,
-	14274: 0x9EF4,
-	14275: 0x5CB7,
-	14276: 0x60B6,
-	14277: 0x610D,
-	14278: 0x61AB,
-	14279: 0x654F,
-	14280: 0x65FB,
-	14281: 0x65FC,
-	14282: 0x6C11,
-	14283: 0x6CEF,
-	14284: 0x739F,
-	14285: 0x73C9,
-	14286: 0x7DE1,
-	14287: 0x9594,
-	14288: 0x5BC6,
-	14289: 0x871C,
-	14290: 0x8B10,
-	14291: 0x525D,
-	14292: 0x535A,
-	14293: 0x62CD,
-	14294: 0x640F,
-	14295: 0x64B2,
-	14296: 0x6734,
-	14297: 0x6A38,
-	14298: 0x6CCA,
-	14299: 0x73C0,
-	14300: 0x749E,
-	14301: 0x7B94,
-	14302: 0x7C95,
-	14303: 0x7E1B,
-	14304: 0x818A,
-	14305: 0x8236,
-	14306: 0x8584,
-	14307: 0x8FEB,
-	14308: 0x96F9,
-	14309: 0x99C1,
-	14310: 0x4F34,
-	14311: 0x534A,
-	14312: 0x53CD,
-	14313: 0x53DB,
-	14314: 0x62CC,
-	14315: 0x642C,
-	14316: 0x6500,
-	14317: 0x6591,
-	14318: 0x69C3,
-	14319: 0x6CEE,
-	14320: 0x6F58,
-	14321: 0x73ED,
-	14322: 0x7554,
-	14323: 0x7622,
-	14324: 0x76E4,
-	14325: 0x76FC,
-	14326: 0x78D0,
-	14327: 0x78FB,
-	14328: 0x792C,
-	14329: 0x7D46,
-	14330: 0x822C,
-	14331: 0x87E0,
-	14332: 0x8FD4,
-	14333: 0x9812,
-	14334: 0x98EF,
-	14335: 0x52C3,
-	14336: 0x62D4,
-	14337: 0x64A5,
-	14338: 0x6E24,
-	14339: 0x6F51,
-	14340: 0x767C,
-	14341: 0x8DCB,
-	14342: 0x91B1,
-	14343: 0x9262,
-	14344: 0x9AEE,
-	14345: 0x9B43,
-	14346: 0x5023,
-	14347: 0x508D,
-	14348: 0x574A,
-	14349: 0x59A8,
-	14350: 0x5C28,
-	14351: 0x5E47,
-	14352: 0x5F77,
-	14353: 0x623F,
-	14354: 0x653E,
-	14355: 0x65B9,
-	14356: 0x65C1,
-	14357: 0x6609,
-	14358: 0x678B,
-	14359: 0x699C,
-	14360: 0x6EC2,
-	14361: 0x78C5,
-	14362: 0x7D21,
-	14363: 0x80AA,
-	14364: 0x8180,
-	14365: 0x822B,
-	14366: 0x82B3,
-	14367: 0x84A1,
-	14368: 0x868C,
-	14369: 0x8A2A,
-	14370: 0x8B17,
-	14371: 0x90A6,
-	14372: 0x9632,
-	14373: 0x9F90,
-	14374: 0x500D,
-	14375: 0x4FF3,
-	14376: 0xF963,
-	14377: 0x57F9,
-	14378: 0x5F98,
-	14379: 0x62DC,
-	14380: 0x6392,
-	14381: 0x676F,
-	14382: 0x6E43,
-	14383: 0x7119,
-	14384: 0x76C3,
-	14385: 0x80CC,
-	14386: 0x80DA,
-	14387: 0x88F4,
-	14388: 0x88F5,
-	14389: 0x8919,
-	14390: 0x8CE0,
-	14391: 0x8F29,
-	14392: 0x914D,
-	14393: 0x966A,
-	14394: 0x4F2F,
-	14395: 0x4F70,
-	14396: 0x5E1B,
-	14397: 0x67CF,
-	14398: 0x6822,
-	14399: 0x767D,
-	14400: 0x767E,
-	14401: 0x9B44,
-	14402: 0x5E61,
-	14403: 0x6A0A,
-	14404: 0x7169,
-	14405: 0x71D4,
-	14406: 0x756A,
-	14407: 0xF964,
-	14408: 0x7E41,
-	14409: 0x8543,
-	14410: 0x85E9,
-	14411: 0x98DC,
-	14412: 0x4F10,
-	14413: 0x7B4F,
-	14414: 0x7F70,
-	14415: 0x95A5,
-	14416: 0x51E1,
-	14417: 0x5E06,
-	14418: 0x68B5,
-	14419: 0x6C3E,
-	14420: 0x6C4E,
-	14421: 0x6CDB,
-	14422: 0x72AF,
-	14423: 0x7BC4,
-	14424: 0x8303,
-	14425: 0x6CD5,
-	14426: 0x743A,
-	14427: 0x50FB,
-	14428: 0x5288,
-	14429: 0x58C1,
-	14430: 0x64D8,
-	14431: 0x6A97,
-	14432: 0x74A7,
-	14433: 0x7656,
-	14434: 0x78A7,
-	14435: 0x8617,
-	14436: 0x95E2,
-	14437: 0x9739,
-	14438: 0xF965,
-	14439: 0x535E,
-	14440: 0x5F01,
-	14441: 0x8B8A,
-	14442: 0x8FA8,
-	14443: 0x8FAF,
-	14444: 0x908A,
-	14445: 0x5225,
-	14446: 0x77A5,
-	14447: 0x9C49,
-	14448: 0x9F08,
-	14449: 0x4E19,
-	14450: 0x5002,
-	14451: 0x5175,
-	14452: 0x5C5B,
-	14453: 0x5E77,
-	14454: 0x661E,
-	14455: 0x663A,
-	14456: 0x67C4,
-	14457: 0x68C5,
-	14458: 0x70B3,
-	14459: 0x7501,
-	14460: 0x75C5,
-	14461: 0x79C9,
-	14462: 0x7ADD,
-	14463: 0x8F27,
-	14464: 0x9920,
-	14465: 0x9A08,
-	14466: 0x4FDD,
-	14467: 0x5821,
-	14468: 0x5831,
-	14469: 0x5BF6,
-	14470: 0x666E,
-	14471: 0x6B65,
-	14472: 0x6D11,
-	14473: 0x6E7A,
-	14474: 0x6F7D,
-	14475: 0x73E4,
-	14476: 0x752B,
-	14477: 0x83E9,
-	14478: 0x88DC,
-	14479: 0x8913,
-	14480: 0x8B5C,
-	14481: 0x8F14,
-	14482: 0x4F0F,
-	14483: 0x50D5,
-	14484: 0x5310,
-	14485: 0x535C,
-	14486: 0x5B93,
-	14487: 0x5FA9,
-	14488: 0x670D,
-	14489: 0x798F,
-	14490: 0x8179,
-	14491: 0x832F,
-	14492: 0x8514,
-	14493: 0x8907,
-	14494: 0x8986,
-	14495: 0x8F39,
-	14496: 0x8F3B,
-	14497: 0x99A5,
-	14498: 0x9C12,
-	14499: 0x672C,
-	14500: 0x4E76,
-	14501: 0x4FF8,
-	14502: 0x5949,
-	14503: 0x5C01,
-	14504: 0x5CEF,
-	14505: 0x5CF0,
-	14506: 0x6367,
-	14507: 0x68D2,
-	14508: 0x70FD,
-	14509: 0x71A2,
-	14510: 0x742B,
-	14511: 0x7E2B,
-	14512: 0x84EC,
-	14513: 0x8702,
-	14514: 0x9022,
-	14515: 0x92D2,
-	14516: 0x9CF3,
-	14517: 0x4E0D,
-	14518: 0x4ED8,
-	14519: 0x4FEF,
-	14520: 0x5085,
-	14521: 0x5256,
-	14522: 0x526F,
-	14523: 0x5426,
-	14524: 0x5490,
-	14525: 0x57E0,
-	14526: 0x592B,
-	14527: 0x5A66,
-	14528: 0x5B5A,
-	14529: 0x5B75,
-	14530: 0x5BCC,
-	14531: 0x5E9C,
-	14532: 0xF966,
-	14533: 0x6276,
-	14534: 0x6577,
-	14535: 0x65A7,
-	14536: 0x6D6E,
-	14537: 0x6EA5,
-	14538: 0x7236,
-	14539: 0x7B26,
-	14540: 0x7C3F,
-	14541: 0x7F36,
-	14542: 0x8150,
-	14543: 0x8151,
-	14544: 0x819A,
-	14545: 0x8240,
-	14546: 0x8299,
-	14547: 0x83A9,
-	14548: 0x8A03,
-	14549: 0x8CA0,
-	14550: 0x8CE6,
-	14551: 0x8CFB,
-	14552: 0x8D74,
-	14553: 0x8DBA,
-	14554: 0x90E8,
-	14555: 0x91DC,
-	14556: 0x961C,
-	14557: 0x9644,
-	14558: 0x99D9,
-	14559: 0x9CE7,
-	14560: 0x5317,
-	14561: 0x5206,
-	14562: 0x5429,
-	14563: 0x5674,
-	14564: 0x58B3,
-	14565: 0x5954,
-	14566: 0x596E,
-	14567: 0x5FFF,
-	14568: 0x61A4,
-	14569: 0x626E,
-	14570: 0x6610,
-	14571: 0x6C7E,
-	14572: 0x711A,
-	14573: 0x76C6,
-	14574: 0x7C89,
-	14575: 0x7CDE,
-	14576: 0x7D1B,
-	14577: 0x82AC,
-	14578: 0x8CC1,
-	14579: 0x96F0,
-	14580: 0xF967,
-	14581: 0x4F5B,
-	14582: 0x5F17,
-	14583: 0x5F7F,
-	14584: 0x62C2,
-	14585: 0x5D29,
-	14586: 0x670B,
-	14587: 0x68DA,
-	14588: 0x787C,
-	14589: 0x7E43,
-	14590: 0x9D6C,
-	14591: 0x4E15,
-	14592: 0x5099,
-	14593: 0x5315,
-	14594: 0x532A,
-	14595: 0x5351,
-	14596: 0x5983,
-	14597: 0x5A62,
-	14598: 0x5E87,
-	14599: 0x60B2,
-	14600: 0x618A,
-	14601: 0x6249,
-	14602: 0x6279,
-	14603: 0x6590,
-	14604: 0x6787,
-	14605: 0x69A7,
-	14606: 0x6BD4,
-	14607: 0x6BD6,
-	14608: 0x6BD7,
-	14609: 0x6BD8,
-	14610: 0x6CB8,
-	14611: 0xF968,
-	14612: 0x7435,
-	14613: 0x75FA,
-	14614: 0x7812,
-	14615: 0x7891,
-	14616: 0x79D5,
-	14617: 0x79D8,
-	14618: 0x7C83,
-	14619: 0x7DCB,
-	14620: 0x7FE1,
-	14621: 0x80A5,
-	14622: 0x813E,
-	14623: 0x81C2,
-	14624: 0x83F2,
-	14625: 0x871A,
-	14626: 0x88E8,
-	14627: 0x8AB9,
-	14628: 0x8B6C,
-	14629: 0x8CBB,
-	14630: 0x9119,
-	14631: 0x975E,
-	14632: 0x98DB,
-	14633: 0x9F3B,
-	14634: 0x56AC,
-	14635: 0x5B2A,
-	14636: 0x5F6C,
-	14637: 0x658C,
-	14638: 0x6AB3,
-	14639: 0x6BAF,
-	14640: 0x6D5C,
-	14641: 0x6FF1,
-	14642: 0x7015,
-	14643: 0x725D,
-	14644: 0x73AD,
-	14645: 0x8CA7,
-	14646: 0x8CD3,
-	14647: 0x983B,
-	14648: 0x6191,
-	14649: 0x6C37,
-	14650: 0x8058,
-	14651: 0x9A01,
-	14652: 0x4E4D,
-	14653: 0x4E8B,
-	14654: 0x4E9B,
-	14655: 0x4ED5,
-	14656: 0x4F3A,
-	14657: 0x4F3C,
-	14658: 0x4F7F,
-	14659: 0x4FDF,
-	14660: 0x50FF,
-	14661: 0x53F2,
-	14662: 0x53F8,
-	14663: 0x5506,
-	14664: 0x55E3,
-	14665: 0x56DB,
-	14666: 0x58EB,
-	14667: 0x5962,
-	14668: 0x5A11,
-	14669: 0x5BEB,
-	14670: 0x5BFA,
-	14671: 0x5C04,
-	14672: 0x5DF3,
-	14673: 0x5E2B,
-	14674: 0x5F99,
-	14675: 0x601D,
-	14676: 0x6368,
-	14677: 0x659C,
-	14678: 0x65AF,
-	14679: 0x67F6,
-	14680: 0x67FB,
-	14681: 0x68AD,
-	14682: 0x6B7B,
-	14683: 0x6C99,
-	14684: 0x6CD7,
-	14685: 0x6E23,
-	14686: 0x7009,
-	14687: 0x7345,
-	14688: 0x7802,
-	14689: 0x793E,
-	14690: 0x7940,
-	14691: 0x7960,
-	14692: 0x79C1,
-	14693: 0x7BE9,
-	14694: 0x7D17,
-	14695: 0x7D72,
-	14696: 0x8086,
-	14697: 0x820D,
-	14698: 0x838E,
-	14699: 0x84D1,
-	14700: 0x86C7,
-	14701: 0x88DF,
-	14702: 0x8A50,
-	14703: 0x8A5E,
-	14704: 0x8B1D,
-	14705: 0x8CDC,
-	14706: 0x8D66,
-	14707: 0x8FAD,
-	14708: 0x90AA,
-	14709: 0x98FC,
-	14710: 0x99DF,
-	14711: 0x9E9D,
-	14712: 0x524A,
-	14713: 0xF969,
-	14714: 0x6714,
-	14715: 0xF96A,
-	14716: 0x5098,
-	14717: 0x522A,
-	14718: 0x5C71,
-	14719: 0x6563,
-	14720: 0x6C55,
-	14721: 0x73CA,
-	14722: 0x7523,
-	14723: 0x759D,
-	14724: 0x7B97,
-	14725: 0x849C,
-	14726: 0x9178,
-	14727: 0x9730,
-	14728: 0x4E77,
-	14729: 0x6492,
-	14730: 0x6BBA,
-	14731: 0x715E,
-	14732: 0x85A9,
-	14733: 0x4E09,
-	14734: 0xF96B,
-	14735: 0x6749,
-	14736: 0x68EE,
-	14737: 0x6E17,
-	14738: 0x829F,
-	14739: 0x8518,
-	14740: 0x886B,
-	14741: 0x63F7,
-	14742: 0x6F81,
-	14743: 0x9212,
-	14744: 0x98AF,
-	14745: 0x4E0A,
-	14746: 0x50B7,
-	14747: 0x50CF,
-	14748: 0x511F,
-	14749: 0x5546,
-	14750: 0x55AA,
-	14751: 0x5617,
-	14752: 0x5B40,
-	14753: 0x5C19,
-	14754: 0x5CE0,
-	14755: 0x5E38,
-	14756: 0x5E8A,
-	14757: 0x5EA0,
-	14758: 0x5EC2,
-	14759: 0x60F3,
-	14760: 0x6851,
-	14761: 0x6A61,
-	14762: 0x6E58,
-	14763: 0x723D,
-	14764: 0x7240,
-	14765: 0x72C0,
-	14766: 0x76F8,
-	14767: 0x7965,
-	14768: 0x7BB1,
-	14769: 0x7FD4,
-	14770: 0x88F3,
-	14771: 0x89F4,
-	14772: 0x8A73,
-	14773: 0x8C61,
-	14774: 0x8CDE,
-	14775: 0x971C,
-	14776: 0x585E,
-	14777: 0x74BD,
-	14778: 0x8CFD,
-	14779: 0x55C7,
-	14780: 0xF96C,
-	14781: 0x7A61,
-	14782: 0x7D22,
-	14783: 0x8272,
-	14784: 0x7272,
-	14785: 0x751F,
-	14786: 0x7525,
-	14787: 0xF96D,
-	14788: 0x7B19,
-	14789: 0x5885,
-	14790: 0x58FB,
-	14791: 0x5DBC,
-	14792: 0x5E8F,
-	14793: 0x5EB6,
-	14794: 0x5F90,
-	14795: 0x6055,
-	14796: 0x6292,
-	14797: 0x637F,
-	14798: 0x654D,
-	14799: 0x6691,
-	14800: 0x66D9,
-	14801: 0x66F8,
-	14802: 0x6816,
-	14803: 0x68F2,
-	14804: 0x7280,
-	14805: 0x745E,
-	14806: 0x7B6E,
-	14807: 0x7D6E,
-	14808: 0x7DD6,
-	14809: 0x7F72,
-	14810: 0x80E5,
-	14811: 0x8212,
-	14812: 0x85AF,
-	14813: 0x897F,
-	14814: 0x8A93,
-	14815: 0x901D,
-	14816: 0x92E4,
-	14817: 0x9ECD,
-	14818: 0x9F20,
-	14819: 0x5915,
-	14820: 0x596D,
-	14821: 0x5E2D,
-	14822: 0x60DC,
-	14823: 0x6614,
-	14824: 0x6673,
-	14825: 0x6790,
-	14826: 0x6C50,
-	14827: 0x6DC5,
-	14828: 0x6F5F,
-	14829: 0x77F3,
-	14830: 0x78A9,
-	14831: 0x84C6,
-	14832: 0x91CB,
-	14833: 0x932B,
-	14834: 0x4ED9,
-	14835: 0x50CA,
-	14836: 0x5148,
-	14837: 0x5584,
-	14838: 0x5B0B,
-	14839: 0x5BA3,
-	14840: 0x6247,
-	14841: 0x657E,
-	14842: 0x65CB,
-	14843: 0x6E32,
-	14844: 0x717D,
-	14845: 0x7401,
-	14846: 0x7444,
-	14847: 0x7487,
-	14848: 0x74BF,
-	14849: 0x766C,
-	14850: 0x79AA,
-	14851: 0x7DDA,
-	14852: 0x7E55,
-	14853: 0x7FA8,
-	14854: 0x817A,
-	14855: 0x81B3,
-	14856: 0x8239,
-	14857: 0x861A,
-	14858: 0x87EC,
-	14859: 0x8A75,
-	14860: 0x8DE3,
-	14861: 0x9078,
-	14862: 0x9291,
-	14863: 0x9425,
-	14864: 0x994D,
-	14865: 0x9BAE,
-	14866: 0x5368,
-	14867: 0x5C51,
-	14868: 0x6954,
-	14869: 0x6CC4,
-	14870: 0x6D29,
-	14871: 0x6E2B,
-	14872: 0x820C,
-	14873: 0x859B,
-	14874: 0x893B,
-	14875: 0x8A2D,
-	14876: 0x8AAA,
-	14877: 0x96EA,
-	14878: 0x9F67,
-	14879: 0x5261,
-	14880: 0x66B9,
-	14881: 0x6BB2,
-	14882: 0x7E96,
-	14883: 0x87FE,
-	14884: 0x8D0D,
-	14885: 0x9583,
-	14886: 0x965D,
-	14887: 0x651D,
-	14888: 0x6D89,
-	14889: 0x71EE,
-	14890: 0xF96E,
-	14891: 0x57CE,
-	14892: 0x59D3,
-	14893: 0x5BAC,
-	14894: 0x6027,
-	14895: 0x60FA,
-	14896: 0x6210,
-	14897: 0x661F,
-	14898: 0x665F,
-	14899: 0x7329,
-	14900: 0x73F9,
-	14901: 0x76DB,
-	14902: 0x7701,
-	14903: 0x7B6C,
-	14904: 0x8056,
-	14905: 0x8072,
-	14906: 0x8165,
-	14907: 0x8AA0,
-	14908: 0x9192,
-	14909: 0x4E16,
-	14910: 0x52E2,
-	14911: 0x6B72,
-	14912: 0x6D17,
-	14913: 0x7A05,
-	14914: 0x7B39,
-	14915: 0x7D30,
-	14916: 0xF96F,
-	14917: 0x8CB0,
-	14918: 0x53EC,
-	14919: 0x562F,
-	14920: 0x5851,
-	14921: 0x5BB5,
-	14922: 0x5C0F,
-	14923: 0x5C11,
-	14924: 0x5DE2,
-	14925: 0x6240,
-	14926: 0x6383,
-	14927: 0x6414,
-	14928: 0x662D,
-	14929: 0x68B3,
-	14930: 0x6CBC,
-	14931: 0x6D88,
-	14932: 0x6EAF,
-	14933: 0x701F,
-	14934: 0x70A4,
-	14935: 0x71D2,
-	14936: 0x7526,
-	14937: 0x758F,
-	14938: 0x758E,
-	14939: 0x7619,
-	14940: 0x7B11,
-	14941: 0x7BE0,
-	14942: 0x7C2B,
-	14943: 0x7D20,
-	14944: 0x7D39,
-	14945: 0x852C,
-	14946: 0x856D,
-	14947: 0x8607,
-	14948: 0x8A34,
-	14949: 0x900D,
-	14950: 0x9061,
-	14951: 0x90B5,
-	14952: 0x92B7,
-	14953: 0x97F6,
-	14954: 0x9A37,
-	14955: 0x4FD7,
-	14956: 0x5C6C,
-	14957: 0x675F,
-	14958: 0x6D91,
-	14959: 0x7C9F,
-	14960: 0x7E8C,
-	14961: 0x8B16,
-	14962: 0x8D16,
-	14963: 0x901F,
-	14964: 0x5B6B,
-	14965: 0x5DFD,
-	14966: 0x640D,
-	14967: 0x84C0,
-	14968: 0x905C,
-	14969: 0x98E1,
-	14970: 0x7387,
-	14971: 0x5B8B,
-	14972: 0x609A,
-	14973: 0x677E,
-	14974: 0x6DDE,
-	14975: 0x8A1F,
-	14976: 0x8AA6,
-	14977: 0x9001,
-	14978: 0x980C,
-	14979: 0x5237,
-	14980: 0xF970,
-	14981: 0x7051,
-	14982: 0x788E,
-	14983: 0x9396,
-	14984: 0x8870,
-	14985: 0x91D7,
-	14986: 0x4FEE,
-	14987: 0x53D7,
-	14988: 0x55FD,
-	14989: 0x56DA,
-	14990: 0x5782,
-	14991: 0x58FD,
-	14992: 0x5AC2,
-	14993: 0x5B88,
-	14994: 0x5CAB,
-	14995: 0x5CC0,
-	14996: 0x5E25,
-	14997: 0x6101,
-	14998: 0x620D,
-	14999: 0x624B,
-	15000: 0x6388,
-	15001: 0x641C,
-	15002: 0x6536,
-	15003: 0x6578,
-	15004: 0x6A39,
-	15005: 0x6B8A,
-	15006: 0x6C34,
-	15007: 0x6D19,
-	15008: 0x6F31,
-	15009: 0x71E7,
-	15010: 0x72E9,
-	15011: 0x7378,
-	15012: 0x7407,
-	15013: 0x74B2,
-	15014: 0x7626,
-	15015: 0x7761,
-	15016: 0x79C0,
-	15017: 0x7A57,
-	15018: 0x7AEA,
-	15019: 0x7CB9,
-	15020: 0x7D8F,
-	15021: 0x7DAC,
-	15022: 0x7E61,
-	15023: 0x7F9E,
-	15024: 0x8129,
-	15025: 0x8331,
-	15026: 0x8490,
-	15027: 0x84DA,
-	15028: 0x85EA,
-	15029: 0x8896,
-	15030: 0x8AB0,
-	15031: 0x8B90,
-	15032: 0x8F38,
-	15033: 0x9042,
-	15034: 0x9083,
-	15035: 0x916C,
-	15036: 0x9296,
-	15037: 0x92B9,
-	15038: 0x968B,
-	15039: 0x96A7,
-	15040: 0x96A8,
-	15041: 0x96D6,
-	15042: 0x9700,
-	15043: 0x9808,
-	15044: 0x9996,
-	15045: 0x9AD3,
-	15046: 0x9B1A,
-	15047: 0x53D4,
-	15048: 0x587E,
-	15049: 0x5919,
-	15050: 0x5B70,
-	15051: 0x5BBF,
-	15052: 0x6DD1,
-	15053: 0x6F5A,
-	15054: 0x719F,
-	15055: 0x7421,
-	15056: 0x74B9,
-	15057: 0x8085,
-	15058: 0x83FD,
-	15059: 0x5DE1,
-	15060: 0x5F87,
-	15061: 0x5FAA,
-	15062: 0x6042,
-	15063: 0x65EC,
-	15064: 0x6812,
-	15065: 0x696F,
-	15066: 0x6A53,
-	15067: 0x6B89,
-	15068: 0x6D35,
-	15069: 0x6DF3,
-	15070: 0x73E3,
-	15071: 0x76FE,
-	15072: 0x77AC,
-	15073: 0x7B4D,
-	15074: 0x7D14,
-	15075: 0x8123,
-	15076: 0x821C,
-	15077: 0x8340,
-	15078: 0x84F4,
-	15079: 0x8563,
-	15080: 0x8A62,
-	15081: 0x8AC4,
-	15082: 0x9187,
-	15083: 0x931E,
-	15084: 0x9806,
-	15085: 0x99B4,
-	15086: 0x620C,
-	15087: 0x8853,
-	15088: 0x8FF0,
-	15089: 0x9265,
-	15090: 0x5D07,
-	15091: 0x5D27,
-	15092: 0x5D69,
-	15093: 0x745F,
-	15094: 0x819D,
-	15095: 0x8768,
-	15096: 0x6FD5,
-	15097: 0x62FE,
-	15098: 0x7FD2,
-	15099: 0x8936,
-	15100: 0x8972,
-	15101: 0x4E1E,
-	15102: 0x4E58,
-	15103: 0x50E7,
-	15104: 0x52DD,
-	15105: 0x5347,
-	15106: 0x627F,
-	15107: 0x6607,
-	15108: 0x7E69,
-	15109: 0x8805,
-	15110: 0x965E,
-	15111: 0x4F8D,
-	15112: 0x5319,
-	15113: 0x5636,
-	15114: 0x59CB,
-	15115: 0x5AA4,
-	15116: 0x5C38,
-	15117: 0x5C4E,
-	15118: 0x5C4D,
-	15119: 0x5E02,
-	15120: 0x5F11,
-	15121: 0x6043,
-	15122: 0x65BD,
-	15123: 0x662F,
-	15124: 0x6642,
-	15125: 0x67BE,
-	15126: 0x67F4,
-	15127: 0x731C,
-	15128: 0x77E2,
-	15129: 0x793A,
-	15130: 0x7FC5,
-	15131: 0x8494,
-	15132: 0x84CD,
-	15133: 0x8996,
-	15134: 0x8A66,
-	15135: 0x8A69,
-	15136: 0x8AE1,
-	15137: 0x8C55,
-	15138: 0x8C7A,
-	15139: 0x57F4,
-	15140: 0x5BD4,
-	15141: 0x5F0F,
-	15142: 0x606F,
-	15143: 0x62ED,
-	15144: 0x690D,
-	15145: 0x6B96,
-	15146: 0x6E5C,
-	15147: 0x7184,
-	15148: 0x7BD2,
-	15149: 0x8755,
-	15150: 0x8B58,
-	15151: 0x8EFE,
-	15152: 0x98DF,
-	15153: 0x98FE,
-	15154: 0x4F38,
-	15155: 0x4F81,
-	15156: 0x4FE1,
-	15157: 0x547B,
-	15158: 0x5A20,
-	15159: 0x5BB8,
-	15160: 0x613C,
-	15161: 0x65B0,
-	15162: 0x6668,
-	15163: 0x71FC,
-	15164: 0x7533,
-	15165: 0x795E,
-	15166: 0x7D33,
-	15167: 0x814E,
-	15168: 0x81E3,
-	15169: 0x8398,
-	15170: 0x85AA,
-	15171: 0x85CE,
-	15172: 0x8703,
-	15173: 0x8A0A,
-	15174: 0x8EAB,
-	15175: 0x8F9B,
-	15176: 0xF971,
-	15177: 0x8FC5,
-	15178: 0x5931,
-	15179: 0x5BA4,
-	15180: 0x5BE6,
-	15181: 0x6089,
-	15182: 0x5BE9,
-	15183: 0x5C0B,
-	15184: 0x5FC3,
-	15185: 0x6C81,
-	15186: 0xF972,
-	15187: 0x6DF1,
-	15188: 0x700B,
-	15189: 0x751A,
-	15190: 0x82AF,
-	15191: 0x8AF6,
-	15192: 0x4EC0,
-	15193: 0x5341,
-	15194: 0xF973,
-	15195: 0x96D9,
-	15196: 0x6C0F,
-	15197: 0x4E9E,
-	15198: 0x4FC4,
-	15199: 0x5152,
-	15200: 0x555E,
-	15201: 0x5A25,
-	15202: 0x5CE8,
-	15203: 0x6211,
-	15204: 0x7259,
-	15205: 0x82BD,
-	15206: 0x83AA,
-	15207: 0x86FE,
-	15208: 0x8859,
-	15209: 0x8A1D,
-	15210: 0x963F,
-	15211: 0x96C5,
-	15212: 0x9913,
-	15213: 0x9D09,
-	15214: 0x9D5D,
-	15215: 0x580A,
-	15216: 0x5CB3,
-	15217: 0x5DBD,
-	15218: 0x5E44,
-	15219: 0x60E1,
-	15220: 0x6115,
-	15221: 0x63E1,
-	15222: 0x6A02,
-	15223: 0x6E25,
-	15224: 0x9102,
-	15225: 0x9354,
-	15226: 0x984E,
-	15227: 0x9C10,
-	15228: 0x9F77,
-	15229: 0x5B89,
-	15230: 0x5CB8,
-	15231: 0x6309,
-	15232: 0x664F,
-	15233: 0x6848,
-	15234: 0x773C,
-	15235: 0x96C1,
-	15236: 0x978D,
-	15237: 0x9854,
-	15238: 0x9B9F,
-	15239: 0x65A1,
-	15240: 0x8B01,
-	15241: 0x8ECB,
-	15242: 0x95BC,
-	15243: 0x5535,
-	15244: 0x5CA9,
-	15245: 0x5DD6,
-	15246: 0x5EB5,
-	15247: 0x6697,
-	15248: 0x764C,
-	15249: 0x83F4,
-	15250: 0x95C7,
-	15251: 0x58D3,
-	15252: 0x62BC,
-	15253: 0x72CE,
-	15254: 0x9D28,
-	15255: 0x4EF0,
-	15256: 0x592E,
-	15257: 0x600F,
-	15258: 0x663B,
-	15259: 0x6B83,
-	15260: 0x79E7,
-	15261: 0x9D26,
-	15262: 0x5393,
-	15263: 0x54C0,
-	15264: 0x57C3,
-	15265: 0x5D16,
-	15266: 0x611B,
-	15267: 0x66D6,
-	15268: 0x6DAF,
-	15269: 0x788D,
-	15270: 0x827E,
-	15271: 0x9698,
-	15272: 0x9744,
-	15273: 0x5384,
-	15274: 0x627C,
-	15275: 0x6396,
-	15276: 0x6DB2,
-	15277: 0x7E0A,
-	15278: 0x814B,
-	15279: 0x984D,
-	15280: 0x6AFB,
-	15281: 0x7F4C,
-	15282: 0x9DAF,
-	15283: 0x9E1A,
-	15284: 0x4E5F,
-	15285: 0x503B,
-	15286: 0x51B6,
-	15287: 0x591C,
-	15288: 0x60F9,
-	15289: 0x63F6,
-	15290: 0x6930,
-	15291: 0x723A,
-	15292: 0x8036,
-	15293: 0xF974,
-	15294: 0x91CE,
-	15295: 0x5F31,
-	15296: 0xF975,
-	15297: 0xF976,
-	15298: 0x7D04,
-	15299: 0x82E5,
-	15300: 0x846F,
-	15301: 0x84BB,
-	15302: 0x85E5,
-	15303: 0x8E8D,
-	15304: 0xF977,
-	15305: 0x4F6F,
-	15306: 0xF978,
-	15307: 0xF979,
-	15308: 0x58E4,
-	15309: 0x5B43,
-	15310: 0x6059,
-	15311: 0x63DA,
-	15312: 0x6518,
-	15313: 0x656D,
-	15314: 0x6698,
-	15315: 0xF97A,
-	15316: 0x694A,
-	15317: 0x6A23,
-	15318: 0x6D0B,
-	15319: 0x7001,
-	15320: 0x716C,
-	15321: 0x75D2,
-	15322: 0x760D,
-	15323: 0x79B3,
-	15324: 0x7A70,
-	15325: 0xF97B,
-	15326: 0x7F8A,
-	15327: 0xF97C,
-	15328: 0x8944,
-	15329: 0xF97D,
-	15330: 0x8B93,
-	15331: 0x91C0,
-	15332: 0x967D,
-	15333: 0xF97E,
-	15334: 0x990A,
-	15335: 0x5704,
-	15336: 0x5FA1,
-	15337: 0x65BC,
-	15338: 0x6F01,
-	15339: 0x7600,
-	15340: 0x79A6,
-	15341: 0x8A9E,
-	15342: 0x99AD,
-	15343: 0x9B5A,
-	15344: 0x9F6C,
-	15345: 0x5104,
-	15346: 0x61B6,
-	15347: 0x6291,
-	15348: 0x6A8D,
-	15349: 0x81C6,
-	15350: 0x5043,
-	15351: 0x5830,
-	15352: 0x5F66,
-	15353: 0x7109,
-	15354: 0x8A00,
-	15355: 0x8AFA,
-	15356: 0x5B7C,
-	15357: 0x8616,
-	15358: 0x4FFA,
-	15359: 0x513C,
-	15360: 0x56B4,
-	15361: 0x5944,
-	15362: 0x63A9,
-	15363: 0x6DF9,
-	15364: 0x5DAA,
-	15365: 0x696D,
-	15366: 0x5186,
-	15367: 0x4E88,
-	15368: 0x4F59,
-	15369: 0xF97F,
-	15370: 0xF980,
-	15371: 0xF981,
-	15372: 0x5982,
-	15373: 0xF982,
-	15374: 0xF983,
-	15375: 0x6B5F,
-	15376: 0x6C5D,
-	15377: 0xF984,
-	15378: 0x74B5,
-	15379: 0x7916,
-	15380: 0xF985,
-	15381: 0x8207,
-	15382: 0x8245,
-	15383: 0x8339,
-	15384: 0x8F3F,
-	15385: 0x8F5D,
-	15386: 0xF986,
-	15387: 0x9918,
-	15388: 0xF987,
-	15389: 0xF988,
-	15390: 0xF989,
-	15391: 0x4EA6,
-	15392: 0xF98A,
-	15393: 0x57DF,
-	15394: 0x5F79,
-	15395: 0x6613,
-	15396: 0xF98B,
-	15397: 0xF98C,
-	15398: 0x75AB,
-	15399: 0x7E79,
-	15400: 0x8B6F,
-	15401: 0xF98D,
-	15402: 0x9006,
-	15403: 0x9A5B,
-	15404: 0x56A5,
-	15405: 0x5827,
-	15406: 0x59F8,
-	15407: 0x5A1F,
-	15408: 0x5BB4,
-	15409: 0xF98E,
-	15410: 0x5EF6,
-	15411: 0xF98F,
-	15412: 0xF990,
-	15413: 0x6350,
-	15414: 0x633B,
-	15415: 0xF991,
-	15416: 0x693D,
-	15417: 0x6C87,
-	15418: 0x6CBF,
-	15419: 0x6D8E,
-	15420: 0x6D93,
-	15421: 0x6DF5,
-	15422: 0x6F14,
-	15423: 0xF992,
-	15424: 0x70DF,
-	15425: 0x7136,
-	15426: 0x7159,
-	15427: 0xF993,
-	15428: 0x71C3,
-	15429: 0x71D5,
-	15430: 0xF994,
-	15431: 0x784F,
-	15432: 0x786F,
-	15433: 0xF995,
-	15434: 0x7B75,
-	15435: 0x7DE3,
-	15436: 0xF996,
-	15437: 0x7E2F,
-	15438: 0xF997,
-	15439: 0x884D,
-	15440: 0x8EDF,
-	15441: 0xF998,
-	15442: 0xF999,
-	15443: 0xF99A,
-	15444: 0x925B,
-	15445: 0xF99B,
-	15446: 0x9CF6,
-	15447: 0xF99C,
-	15448: 0xF99D,
-	15449: 0xF99E,
-	15450: 0x6085,
-	15451: 0x6D85,
-	15452: 0xF99F,
-	15453: 0x71B1,
-	15454: 0xF9A0,
-	15455: 0xF9A1,
-	15456: 0x95B1,
-	15457: 0x53AD,
-	15458: 0xF9A2,
-	15459: 0xF9A3,
-	15460: 0xF9A4,
-	15461: 0x67D3,
-	15462: 0xF9A5,
-	15463: 0x708E,
-	15464: 0x7130,
-	15465: 0x7430,
-	15466: 0x8276,
-	15467: 0x82D2,
-	15468: 0xF9A6,
-	15469: 0x95BB,
-	15470: 0x9AE5,
-	15471: 0x9E7D,
-	15472: 0x66C4,
-	15473: 0xF9A7,
-	15474: 0x71C1,
-	15475: 0x8449,
-	15476: 0xF9A8,
-	15477: 0xF9A9,
-	15478: 0x584B,
-	15479: 0xF9AA,
-	15480: 0xF9AB,
-	15481: 0x5DB8,
-	15482: 0x5F71,
-	15483: 0xF9AC,
-	15484: 0x6620,
-	15485: 0x668E,
-	15486: 0x6979,
-	15487: 0x69AE,
-	15488: 0x6C38,
-	15489: 0x6CF3,
-	15490: 0x6E36,
-	15491: 0x6F41,
-	15492: 0x6FDA,
-	15493: 0x701B,
-	15494: 0x702F,
-	15495: 0x7150,
-	15496: 0x71DF,
-	15497: 0x7370,
-	15498: 0xF9AD,
-	15499: 0x745B,
-	15500: 0xF9AE,
-	15501: 0x74D4,
-	15502: 0x76C8,
-	15503: 0x7A4E,
-	15504: 0x7E93,
-	15505: 0xF9AF,
-	15506: 0xF9B0,
-	15507: 0x82F1,
-	15508: 0x8A60,
-	15509: 0x8FCE,
-	15510: 0xF9B1,
-	15511: 0x9348,
-	15512: 0xF9B2,
-	15513: 0x9719,
-	15514: 0xF9B3,
-	15515: 0xF9B4,
-	15516: 0x4E42,
-	15517: 0x502A,
-	15518: 0xF9B5,
-	15519: 0x5208,
-	15520: 0x53E1,
-	15521: 0x66F3,
-	15522: 0x6C6D,
-	15523: 0x6FCA,
-	15524: 0x730A,
-	15525: 0x777F,
-	15526: 0x7A62,
-	15527: 0x82AE,
-	15528: 0x85DD,
-	15529: 0x8602,
-	15530: 0xF9B6,
-	15531: 0x88D4,
-	15532: 0x8A63,
-	15533: 0x8B7D,
-	15534: 0x8C6B,
-	15535: 0xF9B7,
-	15536: 0x92B3,
-	15537: 0xF9B8,
-	15538: 0x9713,
-	15539: 0x9810,
-	15540: 0x4E94,
-	15541: 0x4F0D,
-	15542: 0x4FC9,
-	15543: 0x50B2,
-	15544: 0x5348,
-	15545: 0x543E,
-	15546: 0x5433,
-	15547: 0x55DA,
-	15548: 0x5862,
-	15549: 0x58BA,
-	15550: 0x5967,
-	15551: 0x5A1B,
-	15552: 0x5BE4,
-	15553: 0x609F,
-	15554: 0xF9B9,
-	15555: 0x61CA,
-	15556: 0x6556,
-	15557: 0x65FF,
-	15558: 0x6664,
-	15559: 0x68A7,
-	15560: 0x6C5A,
-	15561: 0x6FB3,
-	15562: 0x70CF,
-	15563: 0x71AC,
-	15564: 0x7352,
-	15565: 0x7B7D,
-	15566: 0x8708,
-	15567: 0x8AA4,
-	15568: 0x9C32,
-	15569: 0x9F07,
-	15570: 0x5C4B,
-	15571: 0x6C83,
-	15572: 0x7344,
-	15573: 0x7389,
-	15574: 0x923A,
-	15575: 0x6EAB,
-	15576: 0x7465,
-	15577: 0x761F,
-	15578: 0x7A69,
-	15579: 0x7E15,
-	15580: 0x860A,
-	15581: 0x5140,
-	15582: 0x58C5,
-	15583: 0x64C1,
-	15584: 0x74EE,
-	15585: 0x7515,
-	15586: 0x7670,
-	15587: 0x7FC1,
-	15588: 0x9095,
-	15589: 0x96CD,
-	15590: 0x9954,
-	15591: 0x6E26,
-	15592: 0x74E6,
-	15593: 0x7AA9,
-	15594: 0x7AAA,
-	15595: 0x81E5,
-	15596: 0x86D9,
-	15597: 0x8778,
-	15598: 0x8A1B,
-	15599: 0x5A49,
-	15600: 0x5B8C,
-	15601: 0x5B9B,
-	15602: 0x68A1,
-	15603: 0x6900,
-	15604: 0x6D63,
-	15605: 0x73A9,
-	15606: 0x7413,
-	15607: 0x742C,
-	15608: 0x7897,
-	15609: 0x7DE9,
-	15610: 0x7FEB,
-	15611: 0x8118,
-	15612: 0x8155,
-	15613: 0x839E,
-	15614: 0x8C4C,
-	15615: 0x962E,
-	15616: 0x9811,
-	15617: 0x66F0,
-	15618: 0x5F80,
-	15619: 0x65FA,
-	15620: 0x6789,
-	15621: 0x6C6A,
-	15622: 0x738B,
-	15623: 0x502D,
-	15624: 0x5A03,
-	15625: 0x6B6A,
-	15626: 0x77EE,
-	15627: 0x5916,
-	15628: 0x5D6C,
-	15629: 0x5DCD,
-	15630: 0x7325,
-	15631: 0x754F,
-	15632: 0xF9BA,
-	15633: 0xF9BB,
-	15634: 0x50E5,
-	15635: 0x51F9,
-	15636: 0x582F,
-	15637: 0x592D,
-	15638: 0x5996,
-	15639: 0x59DA,
-	15640: 0x5BE5,
-	15641: 0xF9BC,
-	15642: 0xF9BD,
-	15643: 0x5DA2,
-	15644: 0x62D7,
-	15645: 0x6416,
-	15646: 0x6493,
-	15647: 0x64FE,
-	15648: 0xF9BE,
-	15649: 0x66DC,
-	15650: 0xF9BF,
-	15651: 0x6A48,
-	15652: 0xF9C0,
-	15653: 0x71FF,
-	15654: 0x7464,
-	15655: 0xF9C1,
-	15656: 0x7A88,
-	15657: 0x7AAF,
-	15658: 0x7E47,
-	15659: 0x7E5E,
-	15660: 0x8000,
-	15661: 0x8170,
-	15662: 0xF9C2,
-	15663: 0x87EF,
-	15664: 0x8981,
-	15665: 0x8B20,
-	15666: 0x9059,
-	15667: 0xF9C3,
-	15668: 0x9080,
-	15669: 0x9952,
-	15670: 0x617E,
-	15671: 0x6B32,
-	15672: 0x6D74,
-	15673: 0x7E1F,
-	15674: 0x8925,
-	15675: 0x8FB1,
-	15676: 0x4FD1,
-	15677: 0x50AD,
-	15678: 0x5197,
-	15679: 0x52C7,
-	15680: 0x57C7,
-	15681: 0x5889,
-	15682: 0x5BB9,
-	15683: 0x5EB8,
-	15684: 0x6142,
-	15685: 0x6995,
-	15686: 0x6D8C,
-	15687: 0x6E67,
-	15688: 0x6EB6,
-	15689: 0x7194,
-	15690: 0x7462,
-	15691: 0x7528,
-	15692: 0x752C,
-	15693: 0x8073,
-	15694: 0x8338,
-	15695: 0x84C9,
-	15696: 0x8E0A,
-	15697: 0x9394,
-	15698: 0x93DE,
-	15699: 0xF9C4,
-	15700: 0x4E8E,
-	15701: 0x4F51,
-	15702: 0x5076,
-	15703: 0x512A,
-	15704: 0x53C8,
-	15705: 0x53CB,
-	15706: 0x53F3,
-	15707: 0x5B87,
-	15708: 0x5BD3,
-	15709: 0x5C24,
-	15710: 0x611A,
-	15711: 0x6182,
-	15712: 0x65F4,
-	15713: 0x725B,
-	15714: 0x7397,
-	15715: 0x7440,
-	15716: 0x76C2,
-	15717: 0x7950,
-	15718: 0x7991,
-	15719: 0x79B9,
-	15720: 0x7D06,
-	15721: 0x7FBD,
-	15722: 0x828B,
-	15723: 0x85D5,
-	15724: 0x865E,
-	15725: 0x8FC2,
-	15726: 0x9047,
-	15727: 0x90F5,
-	15728: 0x91EA,
-	15729: 0x9685,
-	15730: 0x96E8,
-	15731: 0x96E9,
-	15732: 0x52D6,
-	15733: 0x5F67,
-	15734: 0x65ED,
-	15735: 0x6631,
-	15736: 0x682F,
-	15737: 0x715C,
-	15738: 0x7A36,
-	15739: 0x90C1,
-	15740: 0x980A,
-	15741: 0x4E91,
-	15742: 0xF9C5,
-	15743: 0x6A52,
-	15744: 0x6B9E,
-	15745: 0x6F90,
-	15746: 0x7189,
-	15747: 0x8018,
-	15748: 0x82B8,
-	15749: 0x8553,
-	15750: 0x904B,
-	15751: 0x9695,
-	15752: 0x96F2,
-	15753: 0x97FB,
-	15754: 0x851A,
-	15755: 0x9B31,
-	15756: 0x4E90,
-	15757: 0x718A,
-	15758: 0x96C4,
-	15759: 0x5143,
-	15760: 0x539F,
-	15761: 0x54E1,
-	15762: 0x5713,
-	15763: 0x5712,
-	15764: 0x57A3,
-	15765: 0x5A9B,
-	15766: 0x5AC4,
-	15767: 0x5BC3,
-	15768: 0x6028,
-	15769: 0x613F,
-	15770: 0x63F4,
-	15771: 0x6C85,
-	15772: 0x6D39,
-	15773: 0x6E72,
-	15774: 0x6E90,
-	15775: 0x7230,
-	15776: 0x733F,
-	15777: 0x7457,
-	15778: 0x82D1,
-	15779: 0x8881,
-	15780: 0x8F45,
-	15781: 0x9060,
-	15782: 0xF9C6,
-	15783: 0x9662,
-	15784: 0x9858,
-	15785: 0x9D1B,
-	15786: 0x6708,
-	15787: 0x8D8A,
-	15788: 0x925E,
-	15789: 0x4F4D,
-	15790: 0x5049,
-	15791: 0x50DE,
-	15792: 0x5371,
-	15793: 0x570D,
-	15794: 0x59D4,
-	15795: 0x5A01,
-	15796: 0x5C09,
-	15797: 0x6170,
-	15798: 0x6690,
-	15799: 0x6E2D,
-	15800: 0x7232,
-	15801: 0x744B,
-	15802: 0x7DEF,
-	15803: 0x80C3,
-	15804: 0x840E,
-	15805: 0x8466,
-	15806: 0x853F,
-	15807: 0x875F,
-	15808: 0x885B,
-	15809: 0x8918,
-	15810: 0x8B02,
-	15811: 0x9055,
-	15812: 0x97CB,
-	15813: 0x9B4F,
-	15814: 0x4E73,
-	15815: 0x4F91,
-	15816: 0x5112,
-	15817: 0x516A,
-	15818: 0xF9C7,
-	15819: 0x552F,
-	15820: 0x55A9,
-	15821: 0x5B7A,
-	15822: 0x5BA5,
-	15823: 0x5E7C,
-	15824: 0x5E7D,
-	15825: 0x5EBE,
-	15826: 0x60A0,
-	15827: 0x60DF,
-	15828: 0x6108,
-	15829: 0x6109,
-	15830: 0x63C4,
-	15831: 0x6538,
-	15832: 0x6709,
-	15833: 0xF9C8,
-	15834: 0x67D4,
-	15835: 0x67DA,
-	15836: 0xF9C9,
-	15837: 0x6961,
-	15838: 0x6962,
-	15839: 0x6CB9,
-	15840: 0x6D27,
-	15841: 0xF9CA,
-	15842: 0x6E38,
-	15843: 0xF9CB,
-	15844: 0x6FE1,
-	15845: 0x7336,
-	15846: 0x7337,
-	15847: 0xF9CC,
-	15848: 0x745C,
-	15849: 0x7531,
-	15850: 0xF9CD,
-	15851: 0x7652,
-	15852: 0xF9CE,
-	15853: 0xF9CF,
-	15854: 0x7DAD,
-	15855: 0x81FE,
-	15856: 0x8438,
-	15857: 0x88D5,
-	15858: 0x8A98,
-	15859: 0x8ADB,
-	15860: 0x8AED,
-	15861: 0x8E30,
-	15862: 0x8E42,
-	15863: 0x904A,
-	15864: 0x903E,
-	15865: 0x907A,
-	15866: 0x9149,
-	15867: 0x91C9,
-	15868: 0x936E,
-	15869: 0xF9D0,
-	15870: 0xF9D1,
-	15871: 0x5809,
-	15872: 0xF9D2,
-	15873: 0x6BD3,
-	15874: 0x8089,
-	15875: 0x80B2,
-	15876: 0xF9D3,
-	15877: 0xF9D4,
-	15878: 0x5141,
-	15879: 0x596B,
-	15880: 0x5C39,
-	15881: 0xF9D5,
-	15882: 0xF9D6,
-	15883: 0x6F64,
-	15884: 0x73A7,
-	15885: 0x80E4,
-	15886: 0x8D07,
-	15887: 0xF9D7,
-	15888: 0x9217,
-	15889: 0x958F,
-	15890: 0xF9D8,
-	15891: 0xF9D9,
-	15892: 0xF9DA,
-	15893: 0xF9DB,
-	15894: 0x807F,
-	15895: 0x620E,
-	15896: 0x701C,
-	15897: 0x7D68,
-	15898: 0x878D,
-	15899: 0xF9DC,
-	15900: 0x57A0,
-	15901: 0x6069,
-	15902: 0x6147,
-	15903: 0x6BB7,
-	15904: 0x8ABE,
-	15905: 0x9280,
-	15906: 0x96B1,
-	15907: 0x4E59,
-	15908: 0x541F,
-	15909: 0x6DEB,
-	15910: 0x852D,
-	15911: 0x9670,
-	15912: 0x97F3,
-	15913: 0x98EE,
-	15914: 0x63D6,
-	15915: 0x6CE3,
-	15916: 0x9091,
-	15917: 0x51DD,
-	15918: 0x61C9,
-	15919: 0x81BA,
-	15920: 0x9DF9,
-	15921: 0x4F9D,
-	15922: 0x501A,
-	15923: 0x5100,
-	15924: 0x5B9C,
-	15925: 0x610F,
-	15926: 0x61FF,
-	15927: 0x64EC,
-	15928: 0x6905,
-	15929: 0x6BC5,
-	15930: 0x7591,
-	15931: 0x77E3,
-	15932: 0x7FA9,
-	15933: 0x8264,
-	15934: 0x858F,
-	15935: 0x87FB,
-	15936: 0x8863,
-	15937: 0x8ABC,
-	15938: 0x8B70,
-	15939: 0x91AB,
-	15940: 0x4E8C,
-	15941: 0x4EE5,
-	15942: 0x4F0A,
-	15943: 0xF9DD,
-	15944: 0xF9DE,
-	15945: 0x5937,
-	15946: 0x59E8,
-	15947: 0xF9DF,
-	15948: 0x5DF2,
-	15949: 0x5F1B,
-	15950: 0x5F5B,
-	15951: 0x6021,
-	15952: 0xF9E0,
-	15953: 0xF9E1,
-	15954: 0xF9E2,
-	15955: 0xF9E3,
-	15956: 0x723E,
-	15957: 0x73E5,
-	15958: 0xF9E4,
-	15959: 0x7570,
-	15960: 0x75CD,
-	15961: 0xF9E5,
-	15962: 0x79FB,
-	15963: 0xF9E6,
-	15964: 0x800C,
-	15965: 0x8033,
-	15966: 0x8084,
-	15967: 0x82E1,
-	15968: 0x8351,
-	15969: 0xF9E7,
-	15970: 0xF9E8,
-	15971: 0x8CBD,
-	15972: 0x8CB3,
-	15973: 0x9087,
-	15974: 0xF9E9,
-	15975: 0xF9EA,
-	15976: 0x98F4,
-	15977: 0x990C,
-	15978: 0xF9EB,
-	15979: 0xF9EC,
-	15980: 0x7037,
-	15981: 0x76CA,
-	15982: 0x7FCA,
-	15983: 0x7FCC,
-	15984: 0x7FFC,
-	15985: 0x8B1A,
-	15986: 0x4EBA,
-	15987: 0x4EC1,
-	15988: 0x5203,
-	15989: 0x5370,
-	15990: 0xF9ED,
-	15991: 0x54BD,
-	15992: 0x56E0,
-	15993: 0x59FB,
-	15994: 0x5BC5,
-	15995: 0x5F15,
-	15996: 0x5FCD,
-	15997: 0x6E6E,
-	15998: 0xF9EE,
-	15999: 0xF9EF,
-	16000: 0x7D6A,
-	16001: 0x8335,
-	16002: 0xF9F0,
-	16003: 0x8693,
-	16004: 0x8A8D,
-	16005: 0xF9F1,
-	16006: 0x976D,
-	16007: 0x9777,
-	16008: 0xF9F2,
-	16009: 0xF9F3,
-	16010: 0x4E00,
-	16011: 0x4F5A,
-	16012: 0x4F7E,
-	16013: 0x58F9,
-	16014: 0x65E5,
-	16015: 0x6EA2,
-	16016: 0x9038,
-	16017: 0x93B0,
-	16018: 0x99B9,
-	16019: 0x4EFB,
-	16020: 0x58EC,
-	16021: 0x598A,
-	16022: 0x59D9,
-	16023: 0x6041,
-	16024: 0xF9F4,
-	16025: 0xF9F5,
-	16026: 0x7A14,
-	16027: 0xF9F6,
-	16028: 0x834F,
-	16029: 0x8CC3,
-	16030: 0x5165,
-	16031: 0x5344,
-	16032: 0xF9F7,
-	16033: 0xF9F8,
-	16034: 0xF9F9,
-	16035: 0x4ECD,
-	16036: 0x5269,
-	16037: 0x5B55,
-	16038: 0x82BF,
-	16039: 0x4ED4,
-	16040: 0x523A,
-	16041: 0x54A8,
-	16042: 0x59C9,
-	16043: 0x59FF,
-	16044: 0x5B50,
-	16045: 0x5B57,
-	16046: 0x5B5C,
-	16047: 0x6063,
-	16048: 0x6148,
-	16049: 0x6ECB,
-	16050: 0x7099,
-	16051: 0x716E,
-	16052: 0x7386,
-	16053: 0x74F7,
-	16054: 0x75B5,
-	16055: 0x78C1,
-	16056: 0x7D2B,
-	16057: 0x8005,
-	16058: 0x81EA,
-	16059: 0x8328,
-	16060: 0x8517,
-	16061: 0x85C9,
-	16062: 0x8AEE,
-	16063: 0x8CC7,
-	16064: 0x96CC,
-	16065: 0x4F5C,
-	16066: 0x52FA,
-	16067: 0x56BC,
-	16068: 0x65AB,
-	16069: 0x6628,
-	16070: 0x707C,
-	16071: 0x70B8,
-	16072: 0x7235,
-	16073: 0x7DBD,
-	16074: 0x828D,
-	16075: 0x914C,
-	16076: 0x96C0,
-	16077: 0x9D72,
-	16078: 0x5B71,
-	16079: 0x68E7,
-	16080: 0x6B98,
-	16081: 0x6F7A,
-	16082: 0x76DE,
-	16083: 0x5C91,
-	16084: 0x66AB,
-	16085: 0x6F5B,
-	16086: 0x7BB4,
-	16087: 0x7C2A,
-	16088: 0x8836,
-	16089: 0x96DC,
-	16090: 0x4E08,
-	16091: 0x4ED7,
-	16092: 0x5320,
-	16093: 0x5834,
-	16094: 0x58BB,
-	16095: 0x58EF,
-	16096: 0x596C,
-	16097: 0x5C07,
-	16098: 0x5E33,
-	16099: 0x5E84,
-	16100: 0x5F35,
-	16101: 0x638C,
-	16102: 0x66B2,
-	16103: 0x6756,
-	16104: 0x6A1F,
-	16105: 0x6AA3,
-	16106: 0x6B0C,
-	16107: 0x6F3F,
-	16108: 0x7246,
-	16109: 0xF9FA,
-	16110: 0x7350,
-	16111: 0x748B,
-	16112: 0x7AE0,
-	16113: 0x7CA7,
-	16114: 0x8178,
-	16115: 0x81DF,
-	16116: 0x81E7,
-	16117: 0x838A,
-	16118: 0x846C,
-	16119: 0x8523,
-	16120: 0x8594,
-	16121: 0x85CF,
-	16122: 0x88DD,
-	16123: 0x8D13,
-	16124: 0x91AC,
-	16125: 0x9577,
-	16126: 0x969C,
-	16127: 0x518D,
-	16128: 0x54C9,
-	16129: 0x5728,
-	16130: 0x5BB0,
-	16131: 0x624D,
-	16132: 0x6750,
-	16133: 0x683D,
-	16134: 0x6893,
-	16135: 0x6E3D,
-	16136: 0x6ED3,
-	16137: 0x707D,
-	16138: 0x7E21,
-	16139: 0x88C1,
-	16140: 0x8CA1,
-	16141: 0x8F09,
-	16142: 0x9F4B,
-	16143: 0x9F4E,
-	16144: 0x722D,
-	16145: 0x7B8F,
-	16146: 0x8ACD,
-	16147: 0x931A,
-	16148: 0x4F47,
-	16149: 0x4F4E,
-	16150: 0x5132,
-	16151: 0x5480,
-	16152: 0x59D0,
-	16153: 0x5E95,
-	16154: 0x62B5,
-	16155: 0x6775,
-	16156: 0x696E,
-	16157: 0x6A17,
-	16158: 0x6CAE,
-	16159: 0x6E1A,
-	16160: 0x72D9,
-	16161: 0x732A,
-	16162: 0x75BD,
-	16163: 0x7BB8,
-	16164: 0x7D35,
-	16165: 0x82E7,
-	16166: 0x83F9,
-	16167: 0x8457,
-	16168: 0x85F7,
-	16169: 0x8A5B,
-	16170: 0x8CAF,
-	16171: 0x8E87,
-	16172: 0x9019,
-	16173: 0x90B8,
-	16174: 0x96CE,
-	16175: 0x9F5F,
-	16176: 0x52E3,
-	16177: 0x540A,
-	16178: 0x5AE1,
-	16179: 0x5BC2,
-	16180: 0x6458,
-	16181: 0x6575,
-	16182: 0x6EF4,
-	16183: 0x72C4,
-	16184: 0xF9FB,
-	16185: 0x7684,
-	16186: 0x7A4D,
-	16187: 0x7B1B,
-	16188: 0x7C4D,
-	16189: 0x7E3E,
-	16190: 0x7FDF,
-	16191: 0x837B,
-	16192: 0x8B2B,
-	16193: 0x8CCA,
-	16194: 0x8D64,
-	16195: 0x8DE1,
-	16196: 0x8E5F,
-	16197: 0x8FEA,
-	16198: 0x8FF9,
-	16199: 0x9069,
-	16200: 0x93D1,
-	16201: 0x4F43,
-	16202: 0x4F7A,
-	16203: 0x50B3,
-	16204: 0x5168,
-	16205: 0x5178,
-	16206: 0x524D,
-	16207: 0x526A,
-	16208: 0x5861,
-	16209: 0x587C,
-	16210: 0x5960,
-	16211: 0x5C08,
-	16212: 0x5C55,
-	16213: 0x5EDB,
-	16214: 0x609B,
-	16215: 0x6230,
-	16216: 0x6813,
-	16217: 0x6BBF,
-	16218: 0x6C08,
-	16219: 0x6FB1,
-	16220: 0x714E,
-	16221: 0x7420,
-	16222: 0x7530,
-	16223: 0x7538,
-	16224: 0x7551,
-	16225: 0x7672,
-	16226: 0x7B4C,
-	16227: 0x7B8B,
-	16228: 0x7BAD,
-	16229: 0x7BC6,
-	16230: 0x7E8F,
-	16231: 0x8A6E,
-	16232: 0x8F3E,
-	16233: 0x8F49,
-	16234: 0x923F,
-	16235: 0x9293,
-	16236: 0x9322,
-	16237: 0x942B,
-	16238: 0x96FB,
-	16239: 0x985A,
-	16240: 0x986B,
-	16241: 0x991E,
-	16242: 0x5207,
-	16243: 0x622A,
-	16244: 0x6298,
-	16245: 0x6D59,
-	16246: 0x7664,
-	16247: 0x7ACA,
-	16248: 0x7BC0,
-	16249: 0x7D76,
-	16250: 0x5360,
-	16251: 0x5CBE,
-	16252: 0x5E97,
-	16253: 0x6F38,
-	16254: 0x70B9,
-	16255: 0x7C98,
-	16256: 0x9711,
-	16257: 0x9B8E,
-	16258: 0x9EDE,
-	16259: 0x63A5,
-	16260: 0x647A,
-	16261: 0x8776,
-	16262: 0x4E01,
-	16263: 0x4E95,
-	16264: 0x4EAD,
-	16265: 0x505C,
-	16266: 0x5075,
-	16267: 0x5448,
-	16268: 0x59C3,
-	16269: 0x5B9A,
-	16270: 0x5E40,
-	16271: 0x5EAD,
-	16272: 0x5EF7,
-	16273: 0x5F81,
-	16274: 0x60C5,
-	16275: 0x633A,
-	16276: 0x653F,
-	16277: 0x6574,
-	16278: 0x65CC,
-	16279: 0x6676,
-	16280: 0x6678,
-	16281: 0x67FE,
-	16282: 0x6968,
-	16283: 0x6A89,
-	16284: 0x6B63,
-	16285: 0x6C40,
-	16286: 0x6DC0,
-	16287: 0x6DE8,
-	16288: 0x6E1F,
-	16289: 0x6E5E,
-	16290: 0x701E,
-	16291: 0x70A1,
-	16292: 0x738E,
-	16293: 0x73FD,
-	16294: 0x753A,
-	16295: 0x775B,
-	16296: 0x7887,
-	16297: 0x798E,
-	16298: 0x7A0B,
-	16299: 0x7A7D,
-	16300: 0x7CBE,
-	16301: 0x7D8E,
-	16302: 0x8247,
-	16303: 0x8A02,
-	16304: 0x8AEA,
-	16305: 0x8C9E,
-	16306: 0x912D,
-	16307: 0x914A,
-	16308: 0x91D8,
-	16309: 0x9266,
-	16310: 0x92CC,
-	16311: 0x9320,
-	16312: 0x9706,
-	16313: 0x9756,
-	16314: 0x975C,
-	16315: 0x9802,
-	16316: 0x9F0E,
-	16317: 0x5236,
-	16318: 0x5291,
-	16319: 0x557C,
-	16320: 0x5824,
-	16321: 0x5E1D,
-	16322: 0x5F1F,
-	16323: 0x608C,
-	16324: 0x63D0,
-	16325: 0x68AF,
-	16326: 0x6FDF,
-	16327: 0x796D,
-	16328: 0x7B2C,
-	16329: 0x81CD,
-	16330: 0x85BA,
-	16331: 0x88FD,
-	16332: 0x8AF8,
-	16333: 0x8E44,
-	16334: 0x918D,
-	16335: 0x9664,
-	16336: 0x969B,
-	16337: 0x973D,
-	16338: 0x984C,
-	16339: 0x9F4A,
-	16340: 0x4FCE,
-	16341: 0x5146,
-	16342: 0x51CB,
-	16343: 0x52A9,
-	16344: 0x5632,
-	16345: 0x5F14,
-	16346: 0x5F6B,
-	16347: 0x63AA,
-	16348: 0x64CD,
-	16349: 0x65E9,
-	16350: 0x6641,
-	16351: 0x66FA,
-	16352: 0x66F9,
-	16353: 0x671D,
-	16354: 0x689D,
-	16355: 0x68D7,
-	16356: 0x69FD,
-	16357: 0x6F15,
-	16358: 0x6F6E,
-	16359: 0x7167,
-	16360: 0x71E5,
-	16361: 0x722A,
-	16362: 0x74AA,
-	16363: 0x773A,
-	16364: 0x7956,
-	16365: 0x795A,
-	16366: 0x79DF,
-	16367: 0x7A20,
-	16368: 0x7A95,
-	16369: 0x7C97,
-	16370: 0x7CDF,
-	16371: 0x7D44,
-	16372: 0x7E70,
-	16373: 0x8087,
-	16374: 0x85FB,
-	16375: 0x86A4,
-	16376: 0x8A54,
-	16377: 0x8ABF,
-	16378: 0x8D99,
-	16379: 0x8E81,
-	16380: 0x9020,
-	16381: 0x906D,
-	16382: 0x91E3,
-	16383: 0x963B,
-	16384: 0x96D5,
-	16385: 0x9CE5,
-	16386: 0x65CF,
-	16387: 0x7C07,
-	16388: 0x8DB3,
-	16389: 0x93C3,
-	16390: 0x5B58,
-	16391: 0x5C0A,
-	16392: 0x5352,
-	16393: 0x62D9,
-	16394: 0x731D,
-	16395: 0x5027,
-	16396: 0x5B97,
-	16397: 0x5F9E,
-	16398: 0x60B0,
-	16399: 0x616B,
-	16400: 0x68D5,
-	16401: 0x6DD9,
-	16402: 0x742E,
-	16403: 0x7A2E,
-	16404: 0x7D42,
-	16405: 0x7D9C,
-	16406: 0x7E31,
-	16407: 0x816B,
-	16408: 0x8E2A,
-	16409: 0x8E35,
-	16410: 0x937E,
-	16411: 0x9418,
-	16412: 0x4F50,
-	16413: 0x5750,
-	16414: 0x5DE6,
-	16415: 0x5EA7,
-	16416: 0x632B,
-	16417: 0x7F6A,
-	16418: 0x4E3B,
-	16419: 0x4F4F,
-	16420: 0x4F8F,
-	16421: 0x505A,
-	16422: 0x59DD,
-	16423: 0x80C4,
-	16424: 0x546A,
-	16425: 0x5468,
-	16426: 0x55FE,
-	16427: 0x594F,
-	16428: 0x5B99,
-	16429: 0x5DDE,
-	16430: 0x5EDA,
-	16431: 0x665D,
-	16432: 0x6731,
-	16433: 0x67F1,
-	16434: 0x682A,
-	16435: 0x6CE8,
-	16436: 0x6D32,
-	16437: 0x6E4A,
-	16438: 0x6F8D,
-	16439: 0x70B7,
-	16440: 0x73E0,
-	16441: 0x7587,
-	16442: 0x7C4C,
-	16443: 0x7D02,
-	16444: 0x7D2C,
-	16445: 0x7DA2,
-	16446: 0x821F,
-	16447: 0x86DB,
-	16448: 0x8A3B,
-	16449: 0x8A85,
-	16450: 0x8D70,
-	16451: 0x8E8A,
-	16452: 0x8F33,
-	16453: 0x9031,
-	16454: 0x914E,
-	16455: 0x9152,
-	16456: 0x9444,
-	16457: 0x99D0,
-	16458: 0x7AF9,
-	16459: 0x7CA5,
-	16460: 0x4FCA,
-	16461: 0x5101,
-	16462: 0x51C6,
-	16463: 0x57C8,
-	16464: 0x5BEF,
-	16465: 0x5CFB,
-	16466: 0x6659,
-	16467: 0x6A3D,
-	16468: 0x6D5A,
-	16469: 0x6E96,
-	16470: 0x6FEC,
-	16471: 0x710C,
-	16472: 0x756F,
-	16473: 0x7AE3,
-	16474: 0x8822,
-	16475: 0x9021,
-	16476: 0x9075,
-	16477: 0x96CB,
-	16478: 0x99FF,
-	16479: 0x8301,
-	16480: 0x4E2D,
-	16481: 0x4EF2,
-	16482: 0x8846,
-	16483: 0x91CD,
-	16484: 0x537D,
-	16485: 0x6ADB,
-	16486: 0x696B,
-	16487: 0x6C41,
-	16488: 0x847A,
-	16489: 0x589E,
-	16490: 0x618E,
-	16491: 0x66FE,
-	16492: 0x62EF,
-	16493: 0x70DD,
-	16494: 0x7511,
-	16495: 0x75C7,
-	16496: 0x7E52,
-	16497: 0x84B8,
-	16498: 0x8B49,
-	16499: 0x8D08,
-	16500: 0x4E4B,
-	16501: 0x53EA,
-	16502: 0x54AB,
-	16503: 0x5730,
-	16504: 0x5740,
-	16505: 0x5FD7,
-	16506: 0x6301,
-	16507: 0x6307,
-	16508: 0x646F,
-	16509: 0x652F,
-	16510: 0x65E8,
-	16511: 0x667A,
-	16512: 0x679D,
-	16513: 0x67B3,
-	16514: 0x6B62,
-	16515: 0x6C60,
-	16516: 0x6C9A,
-	16517: 0x6F2C,
-	16518: 0x77E5,
-	16519: 0x7825,
-	16520: 0x7949,
-	16521: 0x7957,
-	16522: 0x7D19,
-	16523: 0x80A2,
-	16524: 0x8102,
-	16525: 0x81F3,
-	16526: 0x829D,
-	16527: 0x82B7,
-	16528: 0x8718,
-	16529: 0x8A8C,
-	16530: 0xF9FC,
-	16531: 0x8D04,
-	16532: 0x8DBE,
-	16533: 0x9072,
-	16534: 0x76F4,
-	16535: 0x7A19,
-	16536: 0x7A37,
-	16537: 0x7E54,
-	16538: 0x8077,
-	16539: 0x5507,
-	16540: 0x55D4,
-	16541: 0x5875,
-	16542: 0x632F,
-	16543: 0x6422,
-	16544: 0x6649,
-	16545: 0x664B,
-	16546: 0x686D,
-	16547: 0x699B,
-	16548: 0x6B84,
-	16549: 0x6D25,
-	16550: 0x6EB1,
-	16551: 0x73CD,
-	16552: 0x7468,
-	16553: 0x74A1,
-	16554: 0x755B,
-	16555: 0x75B9,
-	16556: 0x76E1,
-	16557: 0x771E,
-	16558: 0x778B,
-	16559: 0x79E6,
-	16560: 0x7E09,
-	16561: 0x7E1D,
-	16562: 0x81FB,
-	16563: 0x852F,
-	16564: 0x8897,
-	16565: 0x8A3A,
-	16566: 0x8CD1,
-	16567: 0x8EEB,
-	16568: 0x8FB0,
-	16569: 0x9032,
-	16570: 0x93AD,
-	16571: 0x9663,
-	16572: 0x9673,
-	16573: 0x9707,
-	16574: 0x4F84,
-	16575: 0x53F1,
-	16576: 0x59EA,
-	16577: 0x5AC9,
-	16578: 0x5E19,
-	16579: 0x684E,
-	16580: 0x74C6,
-	16581: 0x75BE,
-	16582: 0x79E9,
-	16583: 0x7A92,
-	16584: 0x81A3,
-	16585: 0x86ED,
-	16586: 0x8CEA,
-	16587: 0x8DCC,
-	16588: 0x8FED,
-	16589: 0x659F,
-	16590: 0x6715,
-	16591: 0xF9FD,
-	16592: 0x57F7,
-	16593: 0x6F57,
-	16594: 0x7DDD,
-	16595: 0x8F2F,
-	16596: 0x93F6,
-	16597: 0x96C6,
-	16598: 0x5FB5,
-	16599: 0x61F2,
-	16600: 0x6F84,
-	16601: 0x4E14,
-	16602: 0x4F98,
-	16603: 0x501F,
-	16604: 0x53C9,
-	16605: 0x55DF,
-	16606: 0x5D6F,
-	16607: 0x5DEE,
-	16608: 0x6B21,
-	16609: 0x6B64,
-	16610: 0x78CB,
-	16611: 0x7B9A,
-	16612: 0xF9FE,
-	16613: 0x8E49,
-	16614: 0x8ECA,
-	16615: 0x906E,
-	16616: 0x6349,
-	16617: 0x643E,
-	16618: 0x7740,
-	16619: 0x7A84,
-	16620: 0x932F,
-	16621: 0x947F,
-	16622: 0x9F6A,
-	16623: 0x64B0,
-	16624: 0x6FAF,
-	16625: 0x71E6,
-	16626: 0x74A8,
-	16627: 0x74DA,
-	16628: 0x7AC4,
-	16629: 0x7C12,
-	16630: 0x7E82,
-	16631: 0x7CB2,
-	16632: 0x7E98,
-	16633: 0x8B9A,
-	16634: 0x8D0A,
-	16635: 0x947D,
-	16636: 0x9910,
-	16637: 0x994C,
-	16638: 0x5239,
-	16639: 0x5BDF,
-	16640: 0x64E6,
-	16641: 0x672D,
-	16642: 0x7D2E,
-	16643: 0x50ED,
-	16644: 0x53C3,
-	16645: 0x5879,
-	16646: 0x6158,
-	16647: 0x6159,
-	16648: 0x61FA,
-	16649: 0x65AC,
-	16650: 0x7AD9,
-	16651: 0x8B92,
-	16652: 0x8B96,
-	16653: 0x5009,
-	16654: 0x5021,
-	16655: 0x5275,
-	16656: 0x5531,
-	16657: 0x5A3C,
-	16658: 0x5EE0,
-	16659: 0x5F70,
-	16660: 0x6134,
-	16661: 0x655E,
-	16662: 0x660C,
-	16663: 0x6636,
-	16664: 0x66A2,
-	16665: 0x69CD,
-	16666: 0x6EC4,
-	16667: 0x6F32,
-	16668: 0x7316,
-	16669: 0x7621,
-	16670: 0x7A93,
-	16671: 0x8139,
-	16672: 0x8259,
-	16673: 0x83D6,
-	16674: 0x84BC,
-	16675: 0x50B5,
-	16676: 0x57F0,
-	16677: 0x5BC0,
-	16678: 0x5BE8,
-	16679: 0x5F69,
-	16680: 0x63A1,
-	16681: 0x7826,
-	16682: 0x7DB5,
-	16683: 0x83DC,
-	16684: 0x8521,
-	16685: 0x91C7,
-	16686: 0x91F5,
-	16687: 0x518A,
-	16688: 0x67F5,
-	16689: 0x7B56,
-	16690: 0x8CAC,
-	16691: 0x51C4,
-	16692: 0x59BB,
-	16693: 0x60BD,
-	16694: 0x8655,
-	16695: 0x501C,
-	16696: 0xF9FF,
-	16697: 0x5254,
-	16698: 0x5C3A,
-	16699: 0x617D,
-	16700: 0x621A,
-	16701: 0x62D3,
-	16702: 0x64F2,
-	16703: 0x65A5,
-	16704: 0x6ECC,
-	16705: 0x7620,
-	16706: 0x810A,
-	16707: 0x8E60,
-	16708: 0x965F,
-	16709: 0x96BB,
-	16710: 0x4EDF,
-	16711: 0x5343,
-	16712: 0x5598,
-	16713: 0x5929,
-	16714: 0x5DDD,
-	16715: 0x64C5,
-	16716: 0x6CC9,
-	16717: 0x6DFA,
-	16718: 0x7394,
-	16719: 0x7A7F,
-	16720: 0x821B,
-	16721: 0x85A6,
-	16722: 0x8CE4,
-	16723: 0x8E10,
-	16724: 0x9077,
-	16725: 0x91E7,
-	16726: 0x95E1,
-	16727: 0x9621,
-	16728: 0x97C6,
-	16729: 0x51F8,
-	16730: 0x54F2,
-	16731: 0x5586,
-	16732: 0x5FB9,
-	16733: 0x64A4,
-	16734: 0x6F88,
-	16735: 0x7DB4,
-	16736: 0x8F1F,
-	16737: 0x8F4D,
-	16738: 0x9435,
-	16739: 0x50C9,
-	16740: 0x5C16,
-	16741: 0x6CBE,
-	16742: 0x6DFB,
-	16743: 0x751B,
-	16744: 0x77BB,
-	16745: 0x7C3D,
-	16746: 0x7C64,
-	16747: 0x8A79,
-	16748: 0x8AC2,
-	16749: 0x581E,
-	16750: 0x59BE,
-	16751: 0x5E16,
-	16752: 0x6377,
-	16753: 0x7252,
-	16754: 0x758A,
-	16755: 0x776B,
-	16756: 0x8ADC,
-	16757: 0x8CBC,
-	16758: 0x8F12,
-	16759: 0x5EF3,
-	16760: 0x6674,
-	16761: 0x6DF8,
-	16762: 0x807D,
-	16763: 0x83C1,
-	16764: 0x8ACB,
-	16765: 0x9751,
-	16766: 0x9BD6,
-	16767: 0xFA00,
-	16768: 0x5243,
-	16769: 0x66FF,
-	16770: 0x6D95,
-	16771: 0x6EEF,
-	16772: 0x7DE0,
-	16773: 0x8AE6,
-	16774: 0x902E,
-	16775: 0x905E,
-	16776: 0x9AD4,
-	16777: 0x521D,
-	16778: 0x527F,
-	16779: 0x54E8,
-	16780: 0x6194,
-	16781: 0x6284,
-	16782: 0x62DB,
-	16783: 0x68A2,
-	16784: 0x6912,
-	16785: 0x695A,
-	16786: 0x6A35,
-	16787: 0x7092,
-	16788: 0x7126,
-	16789: 0x785D,
-	16790: 0x7901,
-	16791: 0x790E,
-	16792: 0x79D2,
-	16793: 0x7A0D,
-	16794: 0x8096,
-	16795: 0x8278,
-	16796: 0x82D5,
-	16797: 0x8349,
-	16798: 0x8549,
-	16799: 0x8C82,
-	16800: 0x8D85,
-	16801: 0x9162,
-	16802: 0x918B,
-	16803: 0x91AE,
-	16804: 0x4FC3,
-	16805: 0x56D1,
-	16806: 0x71ED,
-	16807: 0x77D7,
-	16808: 0x8700,
-	16809: 0x89F8,
-	16810: 0x5BF8,
-	16811: 0x5FD6,
-	16812: 0x6751,
-	16813: 0x90A8,
-	16814: 0x53E2,
-	16815: 0x585A,
-	16816: 0x5BF5,
-	16817: 0x60A4,
-	16818: 0x6181,
-	16819: 0x6460,
-	16820: 0x7E3D,
-	16821: 0x8070,
-	16822: 0x8525,
-	16823: 0x9283,
-	16824: 0x64AE,
-	16825: 0x50AC,
-	16826: 0x5D14,
-	16827: 0x6700,
-	16828: 0x589C,
-	16829: 0x62BD,
-	16830: 0x63A8,
-	16831: 0x690E,
-	16832: 0x6978,
-	16833: 0x6A1E,
-	16834: 0x6E6B,
-	16835: 0x76BA,
-	16836: 0x79CB,
-	16837: 0x82BB,
-	16838: 0x8429,
-	16839: 0x8ACF,
-	16840: 0x8DA8,
-	16841: 0x8FFD,
-	16842: 0x9112,
-	16843: 0x914B,
-	16844: 0x919C,
-	16845: 0x9310,
-	16846: 0x9318,
-	16847: 0x939A,
-	16848: 0x96DB,
-	16849: 0x9A36,
-	16850: 0x9C0D,
-	16851: 0x4E11,
-	16852: 0x755C,
-	16853: 0x795D,
-	16854: 0x7AFA,
-	16855: 0x7B51,
-	16856: 0x7BC9,
-	16857: 0x7E2E,
-	16858: 0x84C4,
-	16859: 0x8E59,
-	16860: 0x8E74,
-	16861: 0x8EF8,
-	16862: 0x9010,
-	16863: 0x6625,
-	16864: 0x693F,
-	16865: 0x7443,
-	16866: 0x51FA,
-	16867: 0x672E,
-	16868: 0x9EDC,
-	16869: 0x5145,
-	16870: 0x5FE0,
-	16871: 0x6C96,
-	16872: 0x87F2,
-	16873: 0x885D,
-	16874: 0x8877,
-	16875: 0x60B4,
-	16876: 0x81B5,
-	16877: 0x8403,
-	16878: 0x8D05,
-	16879: 0x53D6,
-	16880: 0x5439,
-	16881: 0x5634,
-	16882: 0x5A36,
-	16883: 0x5C31,
-	16884: 0x708A,
-	16885: 0x7FE0,
-	16886: 0x805A,
-	16887: 0x8106,
-	16888: 0x81ED,
-	16889: 0x8DA3,
-	16890: 0x9189,
-	16891: 0x9A5F,
-	16892: 0x9DF2,
-	16893: 0x5074,
-	16894: 0x4EC4,
-	16895: 0x53A0,
-	16896: 0x60FB,
-	16897: 0x6E2C,
-	16898: 0x5C64,
-	16899: 0x4F88,
-	16900: 0x5024,
-	16901: 0x55E4,
-	16902: 0x5CD9,
-	16903: 0x5E5F,
-	16904: 0x6065,
-	16905: 0x6894,
-	16906: 0x6CBB,
-	16907: 0x6DC4,
-	16908: 0x71BE,
-	16909: 0x75D4,
-	16910: 0x75F4,
-	16911: 0x7661,
-	16912: 0x7A1A,
-	16913: 0x7A49,
-	16914: 0x7DC7,
-	16915: 0x7DFB,
-	16916: 0x7F6E,
-	16917: 0x81F4,
-	16918: 0x86A9,
-	16919: 0x8F1C,
-	16920: 0x96C9,
-	16921: 0x99B3,
-	16922: 0x9F52,
-	16923: 0x5247,
-	16924: 0x52C5,
-	16925: 0x98ED,
-	16926: 0x89AA,
-	16927: 0x4E03,
-	16928: 0x67D2,
-	16929: 0x6F06,
-	16930: 0x4FB5,
-	16931: 0x5BE2,
-	16932: 0x6795,
-	16933: 0x6C88,
-	16934: 0x6D78,
-	16935: 0x741B,
-	16936: 0x7827,
-	16937: 0x91DD,
-	16938: 0x937C,
-	16939: 0x87C4,
-	16940: 0x79E4,
-	16941: 0x7A31,
-	16942: 0x5FEB,
-	16943: 0x4ED6,
-	16944: 0x54A4,
-	16945: 0x553E,
-	16946: 0x58AE,
-	16947: 0x59A5,
-	16948: 0x60F0,
-	16949: 0x6253,
-	16950: 0x62D6,
-	16951: 0x6736,
-	16952: 0x6955,
-	16953: 0x8235,
-	16954: 0x9640,
-	16955: 0x99B1,
-	16956: 0x99DD,
-	16957: 0x502C,
-	16958: 0x5353,
-	16959: 0x5544,
-	16960: 0x577C,
-	16961: 0xFA01,
-	16962: 0x6258,
-	16963: 0xFA02,
-	16964: 0x64E2,
-	16965: 0x666B,
-	16966: 0x67DD,
-	16967: 0x6FC1,
-	16968: 0x6FEF,
-	16969: 0x7422,
-	16970: 0x7438,
-	16971: 0x8A17,
-	16972: 0x9438,
-	16973: 0x5451,
-	16974: 0x5606,
-	16975: 0x5766,
-	16976: 0x5F48,
-	16977: 0x619A,
-	16978: 0x6B4E,
-	16979: 0x7058,
-	16980: 0x70AD,
-	16981: 0x7DBB,
-	16982: 0x8A95,
-	16983: 0x596A,
-	16984: 0x812B,
-	16985: 0x63A2,
-	16986: 0x7708,
-	16987: 0x803D,
-	16988: 0x8CAA,
-	16989: 0x5854,
-	16990: 0x642D,
-	16991: 0x69BB,
-	16992: 0x5B95,
-	16993: 0x5E11,
-	16994: 0x6E6F,
-	16995: 0xFA03,
-	16996: 0x8569,
-	16997: 0x514C,
-	16998: 0x53F0,
-	16999: 0x592A,
-	17000: 0x6020,
-	17001: 0x614B,
-	17002: 0x6B86,
-	17003: 0x6C70,
-	17004: 0x6CF0,
-	17005: 0x7B1E,
-	17006: 0x80CE,
-	17007: 0x82D4,
-	17008: 0x8DC6,
-	17009: 0x90B0,
-	17010: 0x98B1,
-	17011: 0xFA04,
-	17012: 0x64C7,
-	17013: 0x6FA4,
-	17014: 0x6491,
-	17015: 0x6504,
-	17016: 0x514E,
-	17017: 0x5410,
-	17018: 0x571F,
-	17019: 0x8A0E,
-	17020: 0x615F,
-	17021: 0x6876,
-	17022: 0xFA05,
-	17023: 0x75DB,
-	17024: 0x7B52,
-	17025: 0x7D71,
-	17026: 0x901A,
-	17027: 0x5806,
-	17028: 0x69CC,
-	17029: 0x817F,
-	17030: 0x892A,
-	17031: 0x9000,
-	17032: 0x9839,
-	17033: 0x5078,
-	17034: 0x5957,
-	17035: 0x59AC,
-	17036: 0x6295,
-	17037: 0x900F,
-	17038: 0x9B2A,
-	17039: 0x615D,
-	17040: 0x7279,
-	17041: 0x95D6,
-	17042: 0x5761,
-	17043: 0x5A46,
-	17044: 0x5DF4,
-	17045: 0x628A,
-	17046: 0x64AD,
-	17047: 0x64FA,
-	17048: 0x6777,
-	17049: 0x6CE2,
-	17050: 0x6D3E,
-	17051: 0x722C,
-	17052: 0x7436,
-	17053: 0x7834,
-	17054: 0x7F77,
-	17055: 0x82AD,
-	17056: 0x8DDB,
-	17057: 0x9817,
-	17058: 0x5224,
-	17059: 0x5742,
-	17060: 0x677F,
-	17061: 0x7248,
-	17062: 0x74E3,
-	17063: 0x8CA9,
-	17064: 0x8FA6,
-	17065: 0x9211,
-	17066: 0x962A,
-	17067: 0x516B,
-	17068: 0x53ED,
-	17069: 0x634C,
-	17070: 0x4F69,
-	17071: 0x5504,
-	17072: 0x6096,
-	17073: 0x6557,
-	17074: 0x6C9B,
-	17075: 0x6D7F,
-	17076: 0x724C,
-	17077: 0x72FD,
-	17078: 0x7A17,
-	17079: 0x8987,
-	17080: 0x8C9D,
-	17081: 0x5F6D,
-	17082: 0x6F8E,
-	17083: 0x70F9,
-	17084: 0x81A8,
-	17085: 0x610E,
-	17086: 0x4FBF,
-	17087: 0x504F,
-	17088: 0x6241,
-	17089: 0x7247,
-	17090: 0x7BC7,
-	17091: 0x7DE8,
-	17092: 0x7FE9,
-	17093: 0x904D,
-	17094: 0x97AD,
-	17095: 0x9A19,
-	17096: 0x8CB6,
-	17097: 0x576A,
-	17098: 0x5E73,
-	17099: 0x67B0,
-	17100: 0x840D,
-	17101: 0x8A55,
-	17102: 0x5420,
-	17103: 0x5B16,
-	17104: 0x5E63,
-	17105: 0x5EE2,
-	17106: 0x5F0A,
-	17107: 0x6583,
-	17108: 0x80BA,
-	17109: 0x853D,
-	17110: 0x9589,
-	17111: 0x965B,
-	17112: 0x4F48,
-	17113: 0x5305,
-	17114: 0x530D,
-	17115: 0x530F,
-	17116: 0x5486,
-	17117: 0x54FA,
-	17118: 0x5703,
-	17119: 0x5E03,
-	17120: 0x6016,
-	17121: 0x629B,
-	17122: 0x62B1,
-	17123: 0x6355,
-	17124: 0xFA06,
-	17125: 0x6CE1,
-	17126: 0x6D66,
-	17127: 0x75B1,
-	17128: 0x7832,
-	17129: 0x80DE,
-	17130: 0x812F,
-	17131: 0x82DE,
-	17132: 0x8461,
-	17133: 0x84B2,
-	17134: 0x888D,
-	17135: 0x8912,
-	17136: 0x900B,
-	17137: 0x92EA,
-	17138: 0x98FD,
-	17139: 0x9B91,
-	17140: 0x5E45,
-	17141: 0x66B4,
-	17142: 0x66DD,
-	17143: 0x7011,
-	17144: 0x7206,
-	17145: 0xFA07,
-	17146: 0x4FF5,
-	17147: 0x527D,
-	17148: 0x5F6A,
-	17149: 0x6153,
-	17150: 0x6753,
-	17151: 0x6A19,
-	17152: 0x6F02,
-	17153: 0x74E2,
-	17154: 0x7968,
-	17155: 0x8868,
-	17156: 0x8C79,
-	17157: 0x98C7,
-	17158: 0x98C4,
-	17159: 0x9A43,
-	17160: 0x54C1,
-	17161: 0x7A1F,
-	17162: 0x6953,
-	17163: 0x8AF7,
-	17164: 0x8C4A,
-	17165: 0x98A8,
-	17166: 0x99AE,
-	17167: 0x5F7C,
-	17168: 0x62AB,
-	17169: 0x75B2,
-	17170: 0x76AE,
-	17171: 0x88AB,
-	17172: 0x907F,
-	17173: 0x9642,
-	17174: 0x5339,
-	17175: 0x5F3C,
-	17176: 0x5FC5,
-	17177: 0x6CCC,
-	17178: 0x73CC,
-	17179: 0x7562,
-	17180: 0x758B,
-	17181: 0x7B46,
-	17182: 0x82FE,
-	17183: 0x999D,
-	17184: 0x4E4F,
-	17185: 0x903C,
-	17186: 0x4E0B,
-	17187: 0x4F55,
-	17188: 0x53A6,
-	17189: 0x590F,
-	17190: 0x5EC8,
-	17191: 0x6630,
-	17192: 0x6CB3,
-	17193: 0x7455,
-	17194: 0x8377,
-	17195: 0x8766,
-	17196: 0x8CC0,
-	17197: 0x9050,
-	17198: 0x971E,
-	17199: 0x9C15,
-	17200: 0x58D1,
-	17201: 0x5B78,
-	17202: 0x8650,
-	17203: 0x8B14,
-	17204: 0x9DB4,
-	17205: 0x5BD2,
-	17206: 0x6068,
-	17207: 0x608D,
-	17208: 0x65F1,
-	17209: 0x6C57,
-	17210: 0x6F22,
-	17211: 0x6FA3,
-	17212: 0x701A,
-	17213: 0x7F55,
-	17214: 0x7FF0,
-	17215: 0x9591,
-	17216: 0x9592,
-	17217: 0x9650,
-	17218: 0x97D3,
-	17219: 0x5272,
-	17220: 0x8F44,
-	17221: 0x51FD,
-	17222: 0x542B,
-	17223: 0x54B8,
-	17224: 0x5563,
-	17225: 0x558A,
-	17226: 0x6ABB,
-	17227: 0x6DB5,
-	17228: 0x7DD8,
-	17229: 0x8266,
-	17230: 0x929C,
-	17231: 0x9677,
-	17232: 0x9E79,
-	17233: 0x5408,
-	17234: 0x54C8,
-	17235: 0x76D2,
-	17236: 0x86E4,
-	17237: 0x95A4,
-	17238: 0x95D4,
-	17239: 0x965C,
-	17240: 0x4EA2,
-	17241: 0x4F09,
-	17242: 0x59EE,
-	17243: 0x5AE6,
-	17244: 0x5DF7,
-	17245: 0x6052,
-	17246: 0x6297,
-	17247: 0x676D,
-	17248: 0x6841,
-	17249: 0x6C86,
-	17250: 0x6E2F,
-	17251: 0x7F38,
-	17252: 0x809B,
-	17253: 0x822A,
-	17254: 0xFA08,
-	17255: 0xFA09,
-	17256: 0x9805,
-	17257: 0x4EA5,
-	17258: 0x5055,
-	17259: 0x54B3,
-	17260: 0x5793,
-	17261: 0x595A,
-	17262: 0x5B69,
-	17263: 0x5BB3,
-	17264: 0x61C8,
-	17265: 0x6977,
-	17266: 0x6D77,
-	17267: 0x7023,
-	17268: 0x87F9,
-	17269: 0x89E3,
-	17270: 0x8A72,
-	17271: 0x8AE7,
-	17272: 0x9082,
-	17273: 0x99ED,
-	17274: 0x9AB8,
-	17275: 0x52BE,
-	17276: 0x6838,
-	17277: 0x5016,
-	17278: 0x5E78,
-	17279: 0x674F,
-	17280: 0x8347,
-	17281: 0x884C,
-	17282: 0x4EAB,
-	17283: 0x5411,
-	17284: 0x56AE,
-	17285: 0x73E6,
-	17286: 0x9115,
-	17287: 0x97FF,
-	17288: 0x9909,
-	17289: 0x9957,
-	17290: 0x9999,
-	17291: 0x5653,
-	17292: 0x589F,
-	17293: 0x865B,
-	17294: 0x8A31,
-	17295: 0x61B2,
-	17296: 0x6AF6,
-	17297: 0x737B,
-	17298: 0x8ED2,
-	17299: 0x6B47,
-	17300: 0x96AA,
-	17301: 0x9A57,
-	17302: 0x5955,
-	17303: 0x7200,
-	17304: 0x8D6B,
-	17305: 0x9769,
-	17306: 0x4FD4,
-	17307: 0x5CF4,
-	17308: 0x5F26,
-	17309: 0x61F8,
-	17310: 0x665B,
-	17311: 0x6CEB,
-	17312: 0x70AB,
-	17313: 0x7384,
-	17314: 0x73B9,
-	17315: 0x73FE,
-	17316: 0x7729,
-	17317: 0x774D,
-	17318: 0x7D43,
-	17319: 0x7D62,
-	17320: 0x7E23,
-	17321: 0x8237,
-	17322: 0x8852,
-	17323: 0xFA0A,
-	17324: 0x8CE2,
-	17325: 0x9249,
-	17326: 0x986F,
-	17327: 0x5B51,
-	17328: 0x7A74,
-	17329: 0x8840,
-	17330: 0x9801,
-	17331: 0x5ACC,
-	17332: 0x4FE0,
-	17333: 0x5354,
-	17334: 0x593E,
-	17335: 0x5CFD,
-	17336: 0x633E,
-	17337: 0x6D79,
-	17338: 0x72F9,
-	17339: 0x8105,
-	17340: 0x8107,
-	17341: 0x83A2,
-	17342: 0x92CF,
-	17343: 0x9830,
-	17344: 0x4EA8,
-	17345: 0x5144,
-	17346: 0x5211,
-	17347: 0x578B,
-	17348: 0x5F62,
-	17349: 0x6CC2,
-	17350: 0x6ECE,
-	17351: 0x7005,
-	17352: 0x7050,
-	17353: 0x70AF,
-	17354: 0x7192,
-	17355: 0x73E9,
-	17356: 0x7469,
-	17357: 0x834A,
-	17358: 0x87A2,
-	17359: 0x8861,
-	17360: 0x9008,
-	17361: 0x90A2,
-	17362: 0x93A3,
-	17363: 0x99A8,
-	17364: 0x516E,
-	17365: 0x5F57,
-	17366: 0x60E0,
-	17367: 0x6167,
-	17368: 0x66B3,
-	17369: 0x8559,
-	17370: 0x8E4A,
-	17371: 0x91AF,
-	17372: 0x978B,
-	17373: 0x4E4E,
-	17374: 0x4E92,
-	17375: 0x547C,
-	17376: 0x58D5,
-	17377: 0x58FA,
-	17378: 0x597D,
-	17379: 0x5CB5,
-	17380: 0x5F27,
-	17381: 0x6236,
-	17382: 0x6248,
-	17383: 0x660A,
-	17384: 0x6667,
-	17385: 0x6BEB,
-	17386: 0x6D69,
-	17387: 0x6DCF,
-	17388: 0x6E56,
-	17389: 0x6EF8,
-	17390: 0x6F94,
-	17391: 0x6FE0,
-	17392: 0x6FE9,
-	17393: 0x705D,
-	17394: 0x72D0,
-	17395: 0x7425,
-	17396: 0x745A,
-	17397: 0x74E0,
-	17398: 0x7693,
-	17399: 0x795C,
-	17400: 0x7CCA,
-	17401: 0x7E1E,
-	17402: 0x80E1,
-	17403: 0x82A6,
-	17404: 0x846B,
-	17405: 0x84BF,
-	17406: 0x864E,
-	17407: 0x865F,
-	17408: 0x8774,
-	17409: 0x8B77,
-	17410: 0x8C6A,
-	17411: 0x93AC,
-	17412: 0x9800,
-	17413: 0x9865,
-	17414: 0x60D1,
-	17415: 0x6216,
-	17416: 0x9177,
-	17417: 0x5A5A,
-	17418: 0x660F,
-	17419: 0x6DF7,
-	17420: 0x6E3E,
-	17421: 0x743F,
-	17422: 0x9B42,
-	17423: 0x5FFD,
-	17424: 0x60DA,
-	17425: 0x7B0F,
-	17426: 0x54C4,
-	17427: 0x5F18,
-	17428: 0x6C5E,
-	17429: 0x6CD3,
-	17430: 0x6D2A,
-	17431: 0x70D8,
-	17432: 0x7D05,
-	17433: 0x8679,
-	17434: 0x8A0C,
-	17435: 0x9D3B,
-	17436: 0x5316,
-	17437: 0x548C,
-	17438: 0x5B05,
-	17439: 0x6A3A,
-	17440: 0x706B,
-	17441: 0x7575,
-	17442: 0x798D,
-	17443: 0x79BE,
-	17444: 0x82B1,
-	17445: 0x83EF,
-	17446: 0x8A71,
-	17447: 0x8B41,
-	17448: 0x8CA8,
-	17449: 0x9774,
-	17450: 0xFA0B,
-	17451: 0x64F4,
-	17452: 0x652B,
-	17453: 0x78BA,
-	17454: 0x78BB,
-	17455: 0x7A6B,
-	17456: 0x4E38,
-	17457: 0x559A,
-	17458: 0x5950,
-	17459: 0x5BA6,
-	17460: 0x5E7B,
-	17461: 0x60A3,
-	17462: 0x63DB,
-	17463: 0x6B61,
-	17464: 0x6665,
-	17465: 0x6853,
-	17466: 0x6E19,
-	17467: 0x7165,
-	17468: 0x74B0,
-	17469: 0x7D08,
-	17470: 0x9084,
-	17471: 0x9A69,
-	17472: 0x9C25,
-	17473: 0x6D3B,
-	17474: 0x6ED1,
-	17475: 0x733E,
-	17476: 0x8C41,
-	17477: 0x95CA,
-	17478: 0x51F0,
-	17479: 0x5E4C,
-	17480: 0x5FA8,
-	17481: 0x604D,
-	17482: 0x60F6,
-	17483: 0x6130,
-	17484: 0x614C,
-	17485: 0x6643,
-	17486: 0x6644,
-	17487: 0x69A5,
-	17488: 0x6CC1,
-	17489: 0x6E5F,
-	17490: 0x6EC9,
-	17491: 0x6F62,
-	17492: 0x714C,
-	17493: 0x749C,
-	17494: 0x7687,
-	17495: 0x7BC1,
-	17496: 0x7C27,
-	17497: 0x8352,
-	17498: 0x8757,
-	17499: 0x9051,
-	17500: 0x968D,
-	17501: 0x9EC3,
-	17502: 0x532F,
-	17503: 0x56DE,
-	17504: 0x5EFB,
-	17505: 0x5F8A,
-	17506: 0x6062,
-	17507: 0x6094,
-	17508: 0x61F7,
-	17509: 0x6666,
-	17510: 0x6703,
-	17511: 0x6A9C,
-	17512: 0x6DEE,
-	17513: 0x6FAE,
-	17514: 0x7070,
-	17515: 0x736A,
-	17516: 0x7E6A,
-	17517: 0x81BE,
-	17518: 0x8334,
-	17519: 0x86D4,
-	17520: 0x8AA8,
-	17521: 0x8CC4,
-	17522: 0x5283,
-	17523: 0x7372,
-	17524: 0x5B96,
-	17525: 0x6A6B,
-	17526: 0x9404,
-	17527: 0x54EE,
-	17528: 0x5686,
-	17529: 0x5B5D,
-	17530: 0x6548,
-	17531: 0x6585,
-	17532: 0x66C9,
-	17533: 0x689F,
-	17534: 0x6D8D,
-	17535: 0x6DC6,
-	17536: 0x723B,
-	17537: 0x80B4,
-	17538: 0x9175,
-	17539: 0x9A4D,
-	17540: 0x4FAF,
-	17541: 0x5019,
-	17542: 0x539A,
-	17543: 0x540E,
-	17544: 0x543C,
-	17545: 0x5589,
-	17546: 0x55C5,
-	17547: 0x5E3F,
-	17548: 0x5F8C,
-	17549: 0x673D,
-	17550: 0x7166,
-	17551: 0x73DD,
-	17552: 0x9005,
-	17553: 0x52DB,
-	17554: 0x52F3,
-	17555: 0x5864,
-	17556: 0x58CE,
-	17557: 0x7104,
-	17558: 0x718F,
-	17559: 0x71FB,
-	17560: 0x85B0,
-	17561: 0x8A13,
-	17562: 0x6688,
-	17563: 0x85A8,
-	17564: 0x55A7,
-	17565: 0x6684,
-	17566: 0x714A,
-	17567: 0x8431,
-	17568: 0x5349,
-	17569: 0x5599,
-	17570: 0x6BC1,
-	17571: 0x5F59,
-	17572: 0x5FBD,
-	17573: 0x63EE,
-	17574: 0x6689,
-	17575: 0x7147,
-	17576: 0x8AF1,
-	17577: 0x8F1D,
-	17578: 0x9EBE,
-	17579: 0x4F11,
-	17580: 0x643A,
-	17581: 0x70CB,
-	17582: 0x7566,
-	17583: 0x8667,
-	17584: 0x6064,
-	17585: 0x8B4E,
-	17586: 0x9DF8,
-	17587: 0x5147,
-	17588: 0x51F6,
-	17589: 0x5308,
-	17590: 0x6D36,
-	17591: 0x80F8,
-	17592: 0x9ED1,
-	17593: 0x6615,
-	17594: 0x6B23,
-	17595: 0x7098,
-	17596: 0x75D5,
-	17597: 0x5403,
-	17598: 0x5C79,
-	17599: 0x7D07,
-	17600: 0x8A16,
-	17601: 0x6B20,
-	17602: 0x6B3D,
-	17603: 0x6B46,
-	17604: 0x5438,
-	17605: 0x6070,
-	17606: 0x6D3D,
-	17607: 0x7FD5,
-	17608: 0x8208,
-	17609: 0x50D6,
-	17610: 0x51DE,
-	17611: 0x559C,
-	17612: 0x566B,
-	17613: 0x56CD,
-	17614: 0x59EC,
-	17615: 0x5B09,
-	17616: 0x5E0C,
-	17617: 0x6199,
-	17618: 0x6198,
-	17619: 0x6231,
-	17620: 0x665E,
-	17621: 0x66E6,
-	17622: 0x7199,
-	17623: 0x71B9,
-	17624: 0x71BA,
-	17625: 0x72A7,
-	17626: 0x79A7,
-	17627: 0x7A00,
-	17628: 0x7FB2,
-	17629: 0x8A70,
-}
-
-const numEncodeTables = 7
-
-// encodeX are the encoding tables from Unicode to EUC-KR code,
-// sorted by decreasing length.
-// encode0: 20893 entries for runes in [19968, 40861).
-// encode1: 11172 entries for runes in [44032, 55204).
-// encode2:  1625 entries for runes in [ 8213,  9838).
-// encode3:   990 entries for runes in [12288, 13278).
-// encode4:   945 entries for runes in [  161,  1106).
-// encode5:   268 entries for runes in [63744, 64012).
-// encode6:   230 entries for runes in [65281, 65511).
-
-const encode0Low, encode0High = 19968, 40861
-
-var encode0 = [...]uint16{
-	19968 - 19968: 0xECE9,
-	19969 - 19968: 0xEFCB,
-	19971 - 19968: 0xF6D2,
-	19975 - 19968: 0xD8B2,
-	19976 - 19968: 0xEDDB,
-	19977 - 19968: 0xDFB2,
-	19978 - 19968: 0xDFBE,
-	19979 - 19968: 0xF9BB,
-	19981 - 19968: 0xDCF4,
-	19985 - 19968: 0xF5E4,
-	19988 - 19968: 0xF3A6,
-	19989 - 19968: 0xDDE0,
-	19990 - 19968: 0xE1A6,
-	19992 - 19968: 0xCEF8,
-	19993 - 19968: 0xDCB0,
-	19998 - 19968: 0xE3AA,
-	20013 - 19968: 0xF1E9,
-	20018 - 19968: 0xCDFA,
-	20024 - 19968: 0xFCAF,
-	20025 - 19968: 0xD3A1,
-	20027 - 19968: 0xF1AB,
-	20034 - 19968: 0xE7D1,
-	20035 - 19968: 0xD2AC,
-	20037 - 19968: 0xCEF9,
-	20043 - 19968: 0xF1FD,
-	20045 - 19968: 0xDEBF,
-	20046 - 19968: 0xFBBA,
-	20047 - 19968: 0xF9B9,
-	20054 - 19968: 0xCED2,
-	20056 - 19968: 0xE3AB,
-	20057 - 19968: 0xEBE0,
-	20061 - 19968: 0xCEFA,
-	20062 - 19968: 0xCBF7,
-	20063 - 19968: 0xE5A5,
-	20075 - 19968: 0xCAE1,
-	20077 - 19968: 0xD4CC,
-	20083 - 19968: 0xEAE1,
-	20086 - 19968: 0xDCE3,
-	20087 - 19968: 0xDFAD,
-	20094 - 19968: 0xCBEB,
-	20098 - 19968: 0xD5AF,
-	20102 - 19968: 0xD6F5,
-	20104 - 19968: 0xE5F8,
-	20107 - 19968: 0xDEC0,
-	20108 - 19968: 0xECA3,
-	20110 - 19968: 0xE9CD,
-	20112 - 19968: 0xEAA7,
-	20113 - 19968: 0xE9F6,
-	20114 - 19968: 0xFBBB,
-	20116 - 19968: 0xE7E9,
-	20117 - 19968: 0xEFCC,
-	20120 - 19968: 0xD0E6,
-	20123 - 19968: 0xDEC1,
-	20126 - 19968: 0xE4AC,
-	20129 - 19968: 0xD8CC,
-	20130 - 19968: 0xF9F1,
-	20132 - 19968: 0xCEDF,
-	20133 - 19968: 0xFAA4,
-	20134 - 19968: 0xE6B2,
-	20136 - 19968: 0xFAFB,
-	20139 - 19968: 0xFABD,
-	20140 - 19968: 0xCCC8,
-	20141 - 19968: 0xEFCD,
-	20142 - 19968: 0xD5D5,
-	20150 - 19968: 0xD3A2,
-	20154 - 19968: 0xECD1,
-	20160 - 19968: 0xE4A7,
-	20161 - 19968: 0xECD2,
-	20164 - 19968: 0xF6B1,
-	20167 - 19968: 0xCEFB,
-	20170 - 19968: 0xD0D1,
-	20171 - 19968: 0xCBBF,
-	20173 - 19968: 0xEDA4,
-	20180 - 19968: 0xEDA8,
-	20181 - 19968: 0xDEC2,
-	20182 - 19968: 0xF6E2,
-	20183 - 19968: 0xEDDC,
-	20184 - 19968: 0xDCF5,
-	20185 - 19968: 0xE0B9,
-	20189 - 19968: 0xD4CE,
-	20191 - 19968: 0xF4B5,
-	20195 - 19968: 0xD3DB,
-	20196 - 19968: 0xD6B5,
-	20197 - 19968: 0xECA4,
-	20208 - 19968: 0xE4E6,
-	20210 - 19968: 0xF1EA,
-	20214 - 19968: 0xCBEC,
-	20215 - 19968: 0xCBC0,
-	20219 - 19968: 0xECF2,
-	20225 - 19968: 0xD0EA,
-	20233 - 19968: 0xF9F2,
-	20234 - 19968: 0xECA5,
-	20235 - 19968: 0xD0DF,
-	20237 - 19968: 0xE7EA,
-	20238 - 19968: 0xD0EB,
-	20239 - 19968: 0xDCD1,
-	20240 - 19968: 0xDBE9,
-	20241 - 19968: 0xFDCC,
-	20271 - 19968: 0xDBD7,
-	20276 - 19968: 0xDAE1,
-	20278 - 19968: 0xD6B6,
-	20280 - 19968: 0xE3DF,
-	20282 - 19968: 0xDEC3,
-	20284 - 19968: 0xDEC4,
-	20285 - 19968: 0xCAA1,
-	20291 - 19968: 0xEEEC,
-	20294 - 19968: 0xD3A3,
-	20295 - 19968: 0xEEB7,
-	20296 - 19968: 0xF8CF,
-	20301 - 19968: 0xEAC8,
-	20302 - 19968: 0xEEB8,
-	20303 - 19968: 0xF1AC,
-	20304 - 19968: 0xF1A5,
-	20305 - 19968: 0xE9CE,
-	20309 - 19968: 0xF9BC,
-	20313 - 19968: 0xE5F9,
-	20314 - 19968: 0xECEA,
-	20315 - 19968: 0xDDD6,
-	20316 - 19968: 0xEDC2,
-	20329 - 19968: 0xF8A5,
-	20335 - 19968: 0xE5BA,
-	20336 - 19968: 0xDBD8,
-	20339 - 19968: 0xCAA2,
-	20342 - 19968: 0xD1CD,
-	20346 - 19968: 0xEEED,
-	20350 - 19968: 0xECEB,
-	20351 - 19968: 0xDEC5,
-	20353 - 19968: 0xE3E0,
-	20355 - 19968: 0xCAC9,
-	20356 - 19968: 0xF2E9,
-	20358 - 19968: 0xD5CE,
-	20360 - 19968: 0xF6B6,
-	20362 - 19968: 0xCEC2,
-	20363 - 19968: 0xD6C7,
-	20365 - 19968: 0xE3B4,
-	20367 - 19968: 0xF1AD,
-	20369 - 19968: 0xEAE2,
-	20374 - 19968: 0xD7C2,
-	20376 - 19968: 0xF3A7,
-	20379 - 19968: 0xCDEA,
-	20381 - 19968: 0xEBEE,
-	20398 - 19968: 0xD9B2,
-	20399 - 19968: 0xFDA5,
-	20405 - 19968: 0xF6D5,
-	20406 - 19968: 0xD5E2,
-	20415 - 19968: 0xF8B5,
-	20418 - 19968: 0xCCF5,
-	20419 - 19968: 0xF5B5,
-	20420 - 19968: 0xE4AD,
-	20425 - 19968: 0xE7EB,
-	20426 - 19968: 0xF1D5,
-	20430 - 19968: 0xF0BB,
-	20433 - 19968: 0xE9B5,
-	20435 - 19968: 0xCCC9,
-	20436 - 19968: 0xFAD5,
-	20439 - 19968: 0xE1D4,
-	20442 - 19968: 0xD7D6,
-	20445 - 19968: 0xDCC1,
-	20447 - 19968: 0xDEC6,
-	20448 - 19968: 0xFAEF,
-	20449 - 19968: 0xE3E1,
-	20462 - 19968: 0xE1F3,
-	20463 - 19968: 0xDCF6,
-	20465 - 19968: 0xCEFC,
-	20467 - 19968: 0xDBC4,
-	20469 - 19968: 0xF8F1,
-	20472 - 19968: 0xDCE4,
-	20474 - 19968: 0xE5EF,
-	20482 - 19968: 0xDCB1,
-	20486 - 19968: 0xD5D6,
-	20489 - 19968: 0xF3DA,
-	20491 - 19968: 0xCBC1,
-	20493 - 19968: 0xDBC3,
-	20497 - 19968: 0xD9FA,
-	20498 - 19968: 0xD3EE,
-	20502 - 19968: 0xFAB8,
-	20505 - 19968: 0xFDA6,
-	20506 - 19968: 0xEBEF,
-	20508 - 19968: 0xF4A6,
-	20510 - 19968: 0xCCCA,
-	20511 - 19968: 0xF3A8,
-	20513 - 19968: 0xF3DB,
-	20515 - 19968: 0xDBA7,
-	20516 - 19968: 0xF6B7,
-	20518 - 19968: 0xCFE6,
-	20519 - 19968: 0xF0F2,
-	20520 - 19968: 0xCBDA,
-	20522 - 19968: 0xE7D2,
-	20523 - 19968: 0xD7C3,
-	20524 - 19968: 0xF6F0,
-	20525 - 19968: 0xE8DE,
-	20539 - 19968: 0xE5A6,
-	20547 - 19968: 0xE5E7,
-	20551 - 19968: 0xCAA3,
-	20552 - 19968: 0xCCA7,
-	20553 - 19968: 0xEAC9,
-	20559 - 19968: 0xF8B6,
-	20565 - 19968: 0xFAA5,
-	20570 - 19968: 0xF1AE,
-	20572 - 19968: 0xEFCE,
-	20581 - 19968: 0xCBED,
-	20596 - 19968: 0xF6B0,
-	20597 - 19968: 0xEFCF,
-	20598 - 19968: 0xE9CF,
-	20600 - 19968: 0xF7DE,
-	20608 - 19968: 0xCED3,
-	20613 - 19968: 0xDCF7,
-	20621 - 19968: 0xDBA8,
-	20625 - 19968: 0xCBF8,
-	20632 - 19968: 0xDFA1,
-	20633 - 19968: 0xDDE1,
-	20652 - 19968: 0xF5CA,
-	20653 - 19968: 0xE9B6,
-	20658 - 19968: 0xE7EC,
-	20659 - 19968: 0xEEEE,
-	20661 - 19968: 0xF3F0,
-	20663 - 19968: 0xDFBF,
-	20670 - 19968: 0xCCCB,
-	20677 - 19968: 0xD0C1,
-	20681 - 19968: 0xF4D2,
-	20682 - 19968: 0xE0BA,
-	20687 - 19968: 0xDFC0,
-	20689 - 19968: 0xCEE0,
-	20693 - 19968: 0xDCD2,
-	20694 - 19968: 0xFDEA,
-	20698 - 19968: 0xD6F6,
-	20702 - 19968: 0xEACA,
-	20709 - 19968: 0xE8E9,
-	20711 - 19968: 0xE3AC,
-	20717 - 19968: 0xF3D0,
-	20729 - 19968: 0xCAA4,
-	20731 - 19968: 0xDBF8,
-	20735 - 19968: 0xDEC7,
-	20736 - 19968: 0xEBF0,
-	20737 - 19968: 0xF1D6,
-	20740 - 19968: 0xE5E2,
-	20742 - 19968: 0xCCCC,
-	20745 - 19968: 0xCBFB,
-	20754 - 19968: 0xEAE3,
-	20767 - 19968: 0xDFC1,
-	20769 - 19968: 0xD6ED,
-	20778 - 19968: 0xE9D0,
-	20786 - 19968: 0xEEB9,
-	20791 - 19968: 0xD5E3,
-	20794 - 19968: 0xD1D3,
-	20796 - 19968: 0xE5F0,
-	20800 - 19968: 0xE8B4,
-	20801 - 19968: 0xEBC3,
-	20803 - 19968: 0xEAAA,
-	20804 - 19968: 0xFAFC,
-	20805 - 19968: 0xF5F6,
-	20806 - 19968: 0xF0BC,
-	20807 - 19968: 0xFDD4,
-	20808 - 19968: 0xE0BB,
-	20809 - 19968: 0xCEC3,
-	20811 - 19968: 0xD0BA,
-	20812 - 19968: 0xF7BA,
-	20813 - 19968: 0xD8F3,
-	20814 - 19968: 0xF7CD,
-	20818 - 19968: 0xE4AE,
-	20828 - 19968: 0xD4DF,
-	20834 - 19968: 0xD0E7,
-	20837 - 19968: 0xECFD,
-	20839 - 19968: 0xD2AE,
-	20840 - 19968: 0xEEEF,
-	20841 - 19968: 0xD5D7,
-	20842 - 19968: 0xEAE4,
-	20843 - 19968: 0xF8A2,
-	20844 - 19968: 0xCDEB,
-	20845 - 19968: 0xD7BF,
-	20846 - 19968: 0xFBB1,
-	20849 - 19968: 0xCDEC,
-	20853 - 19968: 0xDCB2,
-	20854 - 19968: 0xD0EC,
-	20855 - 19968: 0xCEFD,
-	20856 - 19968: 0xEEF0,
-	20860 - 19968: 0xCCC2,
-	20864 - 19968: 0xD0ED,
-	20870 - 19968: 0xE5F7,
-	20874 - 19968: 0xF3FC,
-	20877 - 19968: 0xEEA2,
-	20882 - 19968: 0xD9B3,
-	20885 - 19968: 0xD8F4,
-	20887 - 19968: 0xE9B7,
-	20896 - 19968: 0xCEAE,
-	20901 - 19968: 0xD9A2,
-	20906 - 19968: 0xD8F1,
-	20908 - 19968: 0xD4CF,
-	20918 - 19968: 0xE5A7,
-	20919 - 19968: 0xD5D2,
-	20925 - 19968: 0xD6A9,
-	20932 - 19968: 0xF4A2,
-	20934 - 19968: 0xF1D7,
-	20937 - 19968: 0xD5D8,
-	20939 - 19968: 0xF0BD,
-	20940 - 19968: 0xD7D0,
-	20941 - 19968: 0xD4D0,
-	20956 - 19968: 0xD7CF,
-	20957 - 19968: 0xEBEA,
-	20958 - 19968: 0xFDEB,
-	20961 - 19968: 0xDBED,
-	20976 - 19968: 0xFCC5,
-	20977 - 19968: 0xCBC2,
-	20982 - 19968: 0xFDD5,
-	20984 - 19968: 0xF4C8,
-	20985 - 19968: 0xE8EA,
-	20986 - 19968: 0xF5F3,
-	20989 - 19968: 0xF9DE,
-	20992 - 19968: 0xD3EF,
-	20995 - 19968: 0xECD3,
-	20998 - 19968: 0xDDC2,
-	20999 - 19968: 0xEFB7,
-	21000 - 19968: 0xE7D4,
-	21002 - 19968: 0xCACA,
-	21006 - 19968: 0xD9FB,
-	21009 - 19968: 0xFAFD,
-	21015 - 19968: 0xD6AA,
-	21021 - 19968: 0xF4F8,
-	21028 - 19968: 0xF7F7,
-	21029 - 19968: 0xDCAC,
-	21033 - 19968: 0xD7D7,
-	21034 - 19968: 0xDFA2,
-	21038 - 19968: 0xCEBE,
-	21040 - 19968: 0xD3F0,
-	21046 - 19968: 0xF0A4,
-	21047 - 19968: 0xE1EC,
-	21048 - 19968: 0xCFE7,
-	21049 - 19968: 0xF3CB,
-	21050 - 19968: 0xEDA9,
-	21051 - 19968: 0xCABE,
-	21059 - 19968: 0xF4EF,
-	21063 - 19968: 0xF6CE,
-	21066 - 19968: 0xDEFB,
-	21067 - 19968: 0xD0BB,
-	21068 - 19968: 0xD5B7,
-	21069 - 19968: 0xEEF1,
-	21076 - 19968: 0xF4A8,
-	21078 - 19968: 0xDCF8,
-	21083 - 19968: 0xCBA7,
-	21085 - 19968: 0xDACE,
-	21089 - 19968: 0xE0E6,
-	21097 - 19968: 0xEDA5,
-	21098 - 19968: 0xEEF2,
-	21103 - 19968: 0xDCF9,
-	21106 - 19968: 0xF9DC,
-	21109 - 19968: 0xF3DC,
-	21117 - 19968: 0xF8F2,
-	21119 - 19968: 0xF4F9,
-	21123 - 19968: 0xFCF1,
-	21127 - 19968: 0xD0BC,
-	21128 - 19968: 0xDBF9,
-	21129 - 19968: 0xD7B1,
-	21133 - 19968: 0xCBFC,
-	21137 - 19968: 0xF0A5,
-	21138 - 19968: 0xCBFD,
-	21147 - 19968: 0xD5F4,
-	21151 - 19968: 0xCDED,
-	21152 - 19968: 0xCAA5,
-	21155 - 19968: 0xD6AB,
-	21156 - 19968: 0xD0C2,
-	21161 - 19968: 0xF0BE,
-	21162 - 19968: 0xD2BD,
-	21163 - 19968: 0xCCA4,
-	21182 - 19968: 0xFAB6,
-	21185 - 19968: 0xCCCD,
-	21187 - 19968: 0xDAFA,
-	21189 - 19968: 0xF6CF,
-	21191 - 19968: 0xE9B8,
-	21193 - 19968: 0xD8F5,
-	21197 - 19968: 0xCCCE,
-	21202 - 19968: 0xD7CD,
-	21205 - 19968: 0xD4D1,
-	21206 - 19968: 0xE9ED,
-	21208 - 19968: 0xCAEB,
-	21209 - 19968: 0xD9E2,
-	21211 - 19968: 0xFDB2,
-	21213 - 19968: 0xE3AD,
-	21214 - 19968: 0xD6CC,
-	21215 - 19968: 0xD9B4,
-	21218 - 19968: 0xE1A7,
-	21219 - 19968: 0xEED3,
-	21220 - 19968: 0xD0C3,
-	21235 - 19968: 0xFDB3,
-	21237 - 19968: 0xD5E4,
-	21240 - 19968: 0xCFE8,
-	21242 - 19968: 0xEDC3,
-	21243 - 19968: 0xD0B2,
-	21246 - 19968: 0xCEFE,
-	21247 - 19968: 0xDAA8,
-	21253 - 19968: 0xF8D0,
-	21256 - 19968: 0xFDD6,
-	21261 - 19968: 0xF8D1,
-	21263 - 19968: 0xF8D2,
-	21264 - 19968: 0xDCD3,
-	21269 - 19968: 0xDDE2,
-	21270 - 19968: 0xFBF9,
-	21271 - 19968: 0xDDC1,
-	21273 - 19968: 0xE3B5,
-	21280 - 19968: 0xEDDD,
-	21281 - 19968: 0xCEC4,
-	21283 - 19968: 0xCBA1,
-	21290 - 19968: 0xDDE3,
-	21295 - 19968: 0xFCDD,
-	21305 - 19968: 0xF9AF,
-	21311 - 19968: 0xD2FB,
-	21312 - 19968: 0xCFA1,
-	21313 - 19968: 0xE4A8,
-	21315 - 19968: 0xF4B6,
-	21316 - 19968: 0xECFE,
-	21319 - 19968: 0xE3AE,
-	21320 - 19968: 0xE7ED,
-	21321 - 19968: 0xFDC1,
-	21322 - 19968: 0xDAE2,
-	21325 - 19968: 0xD8B3,
-	21329 - 19968: 0xDDE4,
-	21330 - 19968: 0xF0EF,
-	21331 - 19968: 0xF6F1,
-	21332 - 19968: 0xFAF0,
-	21335 - 19968: 0xD1F5,
-	21338 - 19968: 0xDACF,
-	21340 - 19968: 0xDCD4,
-	21342 - 19968: 0xDCA6,
-	21344 - 19968: 0xEFBF,
-	21350 - 19968: 0xCECF,
-	21352 - 19968: 0xE0D9,
-	21359 - 19968: 0xD9D6,
-	21360 - 19968: 0xECD4,
-	21361 - 19968: 0xEACB,
-	21364 - 19968: 0xCABF,
-	21365 - 19968: 0xD5B0,
-	21367 - 19968: 0xCFE9,
-	21373 - 19968: 0xF1ED,
-	21375 - 19968: 0xCCCF,
-	21380 - 19968: 0xE4F8,
-	21395 - 19968: 0xE4ED,
-	21400 - 19968: 0xD7D8,
-	21402 - 19968: 0xFDA7,
-	21407 - 19968: 0xEAAB,
-	21408 - 19968: 0xF6B2,
-	21413 - 19968: 0xCFF0,
-	21414 - 19968: 0xF9BD,
-	21421 - 19968: 0xE6F4,
-	21435 - 19968: 0xCBDB,
-	21443 - 19968: 0xF3D1,
-	21448 - 19968: 0xE9D1,
-	21449 - 19968: 0xF3A9,
-	21450 - 19968: 0xD0E0,
-	21451 - 19968: 0xE9D2,
-	21453 - 19968: 0xDAE3,
-	21460 - 19968: 0xE2D2,
-	21462 - 19968: 0xF6A2,
-	21463 - 19968: 0xE1F4,
-	21467 - 19968: 0xDAE4,
-	21473 - 19968: 0xE7D5,
-	21474 - 19968: 0xF5BF,
-	21475 - 19968: 0xCFA2,
-	21476 - 19968: 0xCDAF,
-	21477 - 19968: 0xCFA3,
-	21481 - 19968: 0xCDB0,
-	21482 - 19968: 0xF1FE,
-	21483 - 19968: 0xD0A3,
-	21484 - 19968: 0xE1AF,
-	21485 - 19968: 0xF8A3,
-	21487 - 19968: 0xCAA6,
-	21488 - 19968: 0xF7BB,
-	21489 - 19968: 0xF2EA,
-	21490 - 19968: 0xDEC8,
-	21491 - 19968: 0xE9D3,
-	21496 - 19968: 0xDEC9,
-	21507 - 19968: 0xFDDE,
-	21508 - 19968: 0xCAC0,
-	21512 - 19968: 0xF9EA,
-	21513 - 19968: 0xD1CE,
-	21514 - 19968: 0xEED4,
-	21516 - 19968: 0xD4D2,
-	21517 - 19968: 0xD9A3,
-	21518 - 19968: 0xFDA8,
-	21519 - 19968: 0xD7D9,
-	21520 - 19968: 0xF7CE,
-	21521 - 19968: 0xFABE,
-	21531 - 19968: 0xCFD6,
-	21533 - 19968: 0xD7F0,
-	21535 - 19968: 0xEBE1,
-	21536 - 19968: 0xF8C5,
-	21542 - 19968: 0xDCFA,
-	21545 - 19968: 0xDDC3,
-	21547 - 19968: 0xF9DF,
-	21555 - 19968: 0xE7EF,
-	21560 - 19968: 0xFDE5,
-	21561 - 19968: 0xF6A3,
-	21563 - 19968: 0xD9FC,
-	21564 - 19968: 0xFDA9,
-	21566 - 19968: 0xE7EE,
-	21570 - 19968: 0xD5E5,
-	21576 - 19968: 0xEFD0,
-	21578 - 19968: 0xCDB1,
-	21585 - 19968: 0xF7A2,
-	21608 - 19968: 0xF1B2,
-	21610 - 19968: 0xF1B1,
-	21617 - 19968: 0xCDB2,
-	21619 - 19968: 0xDAAB,
-	21621 - 19968: 0xCAA7,
-	21627 - 19968: 0xE3E2,
-	21628 - 19968: 0xFBBC,
-	21629 - 19968: 0xD9A4,
-	21632 - 19968: 0xEEBA,
-	21638 - 19968: 0xF8D3,
-	21644 - 19968: 0xFBFA,
-	21646 - 19968: 0xCFA4,
-	21648 - 19968: 0xDCFB,
-	21668 - 19968: 0xF6E3,
-	21672 - 19968: 0xEDAA,
-	21675 - 19968: 0xF2A1,
-	21676 - 19968: 0xCEE1,
-	21683 - 19968: 0xFAA6,
-	21688 - 19968: 0xF9E0,
-	21693 - 19968: 0xECD6,
-	21696 - 19968: 0xE4EE,
-	21697 - 19968: 0xF9A1,
-	21700 - 19968: 0xFBEF,
-	21704 - 19968: 0xF9EB,
-	21705 - 19968: 0xEEA3,
-	21729 - 19968: 0xEAAC,
-	21733 - 19968: 0xCAA8,
-	21736 - 19968: 0xF4FA,
-	21741 - 19968: 0xCDD6,
-	21742 - 19968: 0xFCF6,
-	21746 - 19968: 0xF4C9,
-	21754 - 19968: 0xF8D4,
-	21764 - 19968: 0xF8A6,
-	21766 - 19968: 0xDECA,
-	21767 - 19968: 0xF2C6,
-	21774 - 19968: 0xD7DA,
-	21776 - 19968: 0xD3D0,
-	21788 - 19968: 0xD8C5,
-	21807 - 19968: 0xEAE6,
-	21809 - 19968: 0xF3DD,
-	21813 - 19968: 0xE4DA,
-	21822 - 19968: 0xF6E4,
-	21828 - 19968: 0xF6F2,
-	21830 - 19968: 0xDFC2,
-	21839 - 19968: 0xD9FD,
-	21843 - 19968: 0xCCF6,
-	21846 - 19968: 0xD3BA,
-	21854 - 19968: 0xE4AF,
-	21859 - 19968: 0xF9E1,
-	21884 - 19968: 0xF0A6,
-	21888 - 19968: 0xCBD3,
-	21892 - 19968: 0xE0BC,
-	21894 - 19968: 0xF4CA,
-	21895 - 19968: 0xD4FA,
-	21897 - 19968: 0xFDAA,
-	21898 - 19968: 0xF9E2,
-	21912 - 19968: 0xF4B7,
-	21913 - 19968: 0xFDC2,
-	21914 - 19968: 0xFCB0,
-	21916 - 19968: 0xFDEC,
-	21917 - 19968: 0xCAE2,
-	21927 - 19968: 0xFDBD,
-	21929 - 19968: 0xEAE7,
-	21930 - 19968: 0xDFC3,
-	21931 - 19968: 0xD1D2,
-	21932 - 19968: 0xCEE2,
-	21934 - 19968: 0xD3A4,
-	21957 - 19968: 0xFDAB,
-	21959 - 19968: 0xDFE0,
-	21972 - 19968: 0xF2C7,
-	21978 - 19968: 0xE7F0,
-	21980 - 19968: 0xD0EE,
-	21983 - 19968: 0xF3AA,
-	21987 - 19968: 0xDECB,
-	21988 - 19968: 0xF6B8,
-	22013 - 19968: 0xE1F5,
-	22014 - 19968: 0xF1B3,
-	22022 - 19968: 0xF7A3,
-	22025 - 19968: 0xCAA9,
-	22036 - 19968: 0xCFA5,
-	22039 - 19968: 0xDFC4,
-	22063 - 19968: 0xE1B0,
-	22066 - 19968: 0xF0BF,
-	22068 - 19968: 0xF6A4,
-	22070 - 19968: 0xE3B6,
-	22099 - 19968: 0xFAC6,
-	22120 - 19968: 0xD0EF,
-	22123 - 19968: 0xFDED,
-	22132 - 19968: 0xDDC4,
-	22150 - 19968: 0xFCF7,
-	22181 - 19968: 0xE6BF,
-	22188 - 19968: 0xDEAD,
-	22190 - 19968: 0xFABF,
-	22196 - 19968: 0xE5F1,
-	22204 - 19968: 0xEDC4,
-	22218 - 19968: 0xD2A5,
-	22221 - 19968: 0xFDEE,
-	22225 - 19968: 0xF5B6,
-	22234 - 19968: 0xE1F6,
-	22235 - 19968: 0xDECC,
-	22238 - 19968: 0xFCDE,
-	22240 - 19968: 0xECD7,
-	22256 - 19968: 0xCDDD,
-	22265 - 19968: 0xD6B7,
-	22266 - 19968: 0xCDB3,
-	22275 - 19968: 0xF8D5,
-	22276 - 19968: 0xE5D8,
-	22280 - 19968: 0xCFEA,
-	22283 - 19968: 0xCFD0,
-	22285 - 19968: 0xEACC,
-	22290 - 19968: 0xEAAE,
-	22291 - 19968: 0xEAAD,
-	22294 - 19968: 0xD3F1,
-	22296 - 19968: 0xD3A5,
-	22303 - 19968: 0xF7CF,
-	22312 - 19968: 0xEEA4,
-	22317 - 19968: 0xD0A4,
-	22320 - 19968: 0xF2A2,
-	22331 - 19968: 0xD0F0,
-	22336 - 19968: 0xF2A3,
-	22338 - 19968: 0xF7F8,
-	22343 - 19968: 0xD0B3,
-	22346 - 19968: 0xDBA9,
-	22349 - 19968: 0xD3BB,
-	22350 - 19968: 0xCAEC,
-	22352 - 19968: 0xF1A6,
-	22353 - 19968: 0xCBD5,
-	22369 - 19968: 0xF7E7,
-	22372 - 19968: 0xCDDE,
-	22374 - 19968: 0xF7A4,
-	22378 - 19968: 0xF8C0,
-	22382 - 19968: 0xD3DD,
-	22384 - 19968: 0xCCD0,
-	22389 - 19968: 0xCFA6,
-	22396 - 19968: 0xF6F3,
-	22402 - 19968: 0xE1F7,
-	22408 - 19968: 0xD3DC,
-	22411 - 19968: 0xFAFE,
-	22419 - 19968: 0xFAA7,
-	22432 - 19968: 0xEBD9,
-	22434 - 19968: 0xCFA7,
-	22435 - 19968: 0xEAAF,
-	22467 - 19968: 0xE4EF,
-	22471 - 19968: 0xE9B9,
-	22472 - 19968: 0xF1D8,
-	22475 - 19968: 0xD8D8,
-	22478 - 19968: 0xE0F2,
-	22495 - 19968: 0xE6B4,
-	22496 - 19968: 0xDCFC,
-	22512 - 19968: 0xF3F1,
-	22516 - 19968: 0xE3D0,
-	22519 - 19968: 0xF2FB,
-	22521 - 19968: 0xDBC6,
-	22522 - 19968: 0xD0F1,
-	22524 - 19968: 0xD0F2,
-	22528 - 19968: 0xCFDC,
-	22530 - 19968: 0xD3D1,
-	22533 - 19968: 0xCCB1,
-	22534 - 19968: 0xF7D8,
-	22536 - 19968: 0xCBA8,
-	22537 - 19968: 0xEBBC,
-	22538 - 19968: 0xE4BE,
-	22558 - 19968: 0xF4DC,
-	22561 - 19968: 0xDCC2,
-	22564 - 19968: 0xF0A7,
-	22567 - 19968: 0xE6C0,
-	22570 - 19968: 0xCAED,
-	22575 - 19968: 0xE8EB,
-	22576 - 19968: 0xE5E8,
-	22577 - 19968: 0xDCC3,
-	22580 - 19968: 0xEDDE,
-	22581 - 19968: 0xD3F2,
-	22586 - 19968: 0xCCF7,
-	22602 - 19968: 0xCED4,
-	22603 - 19968: 0xE7AB,
-	22607 - 19968: 0xCBC3,
-	22609 - 19968: 0xE1B1,
-	22612 - 19968: 0xF7B2,
-	22615 - 19968: 0xD3F3,
-	22616 - 19968: 0xD3D2,
-	22618 - 19968: 0xF5C0,
-	22622 - 19968: 0xDFDD,
-	22625 - 19968: 0xEEF3,
-	22626 - 19968: 0xE7F1,
-	22628 - 19968: 0xFDB4,
-	22645 - 19968: 0xF2C8,
-	22649 - 19968: 0xF3D2,
-	22652 - 19968: 0xEEF4,
-	22654 - 19968: 0xE2D3,
-	22659 - 19968: 0xCCD1,
-	22661 - 19968: 0xDFEA,
-	22665 - 19968: 0xE9BA,
-	22675 - 19968: 0xD9D7,
-	22684 - 19968: 0xF5CD,
-	22686 - 19968: 0xF1F2,
-	22687 - 19968: 0xFAC7,
-	22696 - 19968: 0xD9F8,
-	22697 - 19968: 0xD4C2,
-	22702 - 19968: 0xF6E5,
-	22707 - 19968: 0xDDC5,
-	22714 - 19968: 0xE7F2,
-	22715 - 19968: 0xEDDF,
-	22718 - 19968: 0xCACB,
-	22721 - 19968: 0xDBFA,
-	22725 - 19968: 0xE8B5,
-	22727 - 19968: 0xD3A6,
-	22734 - 19968: 0xFDB5,
-	22737 - 19968: 0xF9C9,
-	22739 - 19968: 0xE4E2,
-	22741 - 19968: 0xFBBD,
-	22744 - 19968: 0xD7A4,
-	22745 - 19968: 0xCEC5,
-	22750 - 19968: 0xCED5,
-	22751 - 19968: 0xD6E6,
-	22756 - 19968: 0xE5BD,
-	22763 - 19968: 0xDECD,
-	22764 - 19968: 0xECF3,
-	22767 - 19968: 0xEDE0,
-	22777 - 19968: 0xECEC,
-	22778 - 19968: 0xFBBE,
-	22779 - 19968: 0xDFEB,
-	22781 - 19968: 0xE1F8,
-	22799 - 19968: 0xF9BE,
-	22804 - 19968: 0xD0F3,
-	22805 - 19968: 0xE0AA,
-	22806 - 19968: 0xE8E2,
-	22809 - 19968: 0xE2D4,
-	22810 - 19968: 0xD2FD,
-	22812 - 19968: 0xE5A8,
-	22818 - 19968: 0xD9D3,
-	22823 - 19968: 0xD3DE,
-	22825 - 19968: 0xF4B8,
-	22826 - 19968: 0xF7BC,
-	22827 - 19968: 0xDCFD,
-	22829 - 19968: 0xE8EC,
-	22830 - 19968: 0xE4E7,
-	22833 - 19968: 0xE3F7,
-	22839 - 19968: 0xECA8,
-	22846 - 19968: 0xFAF1,
-	22852 - 19968: 0xE5F2,
-	22855 - 19968: 0xD0F4,
-	22856 - 19968: 0xD2AF,
-	22857 - 19968: 0xDCE5,
-	22862 - 19968: 0xD0A5,
-	22863 - 19968: 0xF1B4,
-	22864 - 19968: 0xFCB1,
-	22865 - 19968: 0xCCF8,
-	22868 - 19968: 0xDDC6,
-	22869 - 19968: 0xFAD1,
-	22871 - 19968: 0xF7DF,
-	22874 - 19968: 0xFAA8,
-	22880 - 19968: 0xEEF5,
-	22882 - 19968: 0xDECE,
-	22887 - 19968: 0xE7F3,
-	22890 - 19968: 0xF7AC,
-	22891 - 19968: 0xEBC4,
-	22892 - 19968: 0xEDE1,
-	22893 - 19968: 0xE0AB,
-	22894 - 19968: 0xDDC7,
-	22899 - 19968: 0xD2B3,
-	22900 - 19968: 0xD2BF,
-	22904 - 19968: 0xCACC,
-	22909 - 19968: 0xFBBF,
-	22914 - 19968: 0xE5FD,
-	22915 - 19968: 0xDDE5,
-	22916 - 19968: 0xD8CD,
-	22922 - 19968: 0xECF4,
-	22931 - 19968: 0xD0F5,
-	22934 - 19968: 0xE8ED,
-	22935 - 19968: 0xD0D2,
-	22937 - 19968: 0xD9D8,
-	22949 - 19968: 0xF6E6,
-	22952 - 19968: 0xDBAA,
-	22956 - 19968: 0xF7E0,
-	22969 - 19968: 0xD8D9,
-	22971 - 19968: 0xF4A3,
-	22974 - 19968: 0xF4DD,
-	22979 - 19968: 0xEFD1,
-	22982 - 19968: 0xD9B5,
-	22985 - 19968: 0xEDAB,
-	22987 - 19968: 0xE3B7,
-	22992 - 19968: 0xEEBB,
-	22993 - 19968: 0xCDB4,
-	22995 - 19968: 0xE0F3,
-	22996 - 19968: 0xEACD,
-	23001 - 19968: 0xECF5,
-	23002 - 19968: 0xE8EE,
-	23004 - 19968: 0xCBA9,
-	23005 - 19968: 0xF1AF,
-	23014 - 19968: 0xCACD,
-	23016 - 19968: 0xECA9,
-	23018 - 19968: 0xF2EB,
-	23020 - 19968: 0xFDEF,
-	23022 - 19968: 0xF9F3,
-	23032 - 19968: 0xE6C1,
-	23035 - 19968: 0xECD8,
-	23039 - 19968: 0xEDAC,
-	23041 - 19968: 0xEACE,
-	23043 - 19968: 0xE8DF,
-	23057 - 19968: 0xDECF,
-	23064 - 19968: 0xD2A6,
-	23067 - 19968: 0xE7F4,
-	23068 - 19968: 0xD1D6,
-	23071 - 19968: 0xE6C2,
-	23072 - 19968: 0xE3E3,
-	23077 - 19968: 0xE4B0,
-	23081 - 19968: 0xD8B4,
-	23094 - 19968: 0xF6A5,
-	23100 - 19968: 0xF3DE,
-	23105 - 19968: 0xD7A5,
-	23110 - 19968: 0xF7E8,
-	23113 - 19968: 0xE8C6,
-	23130 - 19968: 0xFBE6,
-	23138 - 19968: 0xDDE6,
-	23142 - 19968: 0xDCFE,
-	23186 - 19968: 0xD8DA,
-	23194 - 19968: 0xDAAC,
-	23195 - 19968: 0xEAB0,
-	23204 - 19968: 0xE3B8,
-	23233 - 19968: 0xCAAA,
-	23234 - 19968: 0xE1F9,
-	23236 - 19968: 0xEAB1,
-	23241 - 19968: 0xF2EC,
-	23244 - 19968: 0xFAEE,
-	23265 - 19968: 0xEED5,
-	23270 - 19968: 0xF9F4,
-	23273 - 19968: 0xD2EC,
-	23301 - 19968: 0xFBFB,
-	23305 - 19968: 0xFDF0,
-	23307 - 19968: 0xE0BD,
-	23308 - 19968: 0xCEE3,
-	23318 - 19968: 0xF8C6,
-	23338 - 19968: 0xDEAE,
-	23360 - 19968: 0xDFC5,
-	23363 - 19968: 0xE5BE,
-	23376 - 19968: 0xEDAD,
-	23377 - 19968: 0xFAEA,
-	23380 - 19968: 0xCDEE,
-	23381 - 19968: 0xEDA6,
-	23383 - 19968: 0xEDAE,
-	23384 - 19968: 0xF0ED,
-	23386 - 19968: 0xDDA1,
-	23388 - 19968: 0xEDAF,
-	23389 - 19968: 0xFCF8,
-	23391 - 19968: 0xD8EB,
-	23395 - 19968: 0xCCF9,
-	23396 - 19968: 0xCDB5,
-	23401 - 19968: 0xFAA9,
-	23403 - 19968: 0xE1DD,
-	23408 - 19968: 0xE2D5,
-	23409 - 19968: 0xEDCF,
-	23413 - 19968: 0xDDA2,
-	23416 - 19968: 0xF9CA,
-	23418 - 19968: 0xEAE8,
-	23420 - 19968: 0xE5ED,
-	23429 - 19968: 0xD3EB,
-	23431 - 19968: 0xE9D4,
-	23432 - 19968: 0xE1FA,
-	23433 - 19968: 0xE4CC,
-	23435 - 19968: 0xE1E4,
-	23436 - 19968: 0xE8C7,
-	23439 - 19968: 0xCEDB,
-	23443 - 19968: 0xDCD5,
-	23445 - 19968: 0xF7B5,
-	23446 - 19968: 0xFCF3,
-	23447 - 19968: 0xF0F3,
-	23448 - 19968: 0xCEAF,
-	23449 - 19968: 0xF1B5,
-	23450 - 19968: 0xEFD2,
-	23451 - 19968: 0xE8C8,
-	23452 - 19968: 0xEBF1,
-	23458 - 19968: 0xCBD4,
-	23459 - 19968: 0xE0BE,
-	23460 - 19968: 0xE3F8,
-	23461 - 19968: 0xEAE9,
-	23462 - 19968: 0xFCB2,
-	23468 - 19968: 0xE0F4,
-	23470 - 19968: 0xCFE0,
-	23472 - 19968: 0xEEA5,
-	23475 - 19968: 0xFAAA,
-	23476 - 19968: 0xE6C3,
-	23477 - 19968: 0xE1B2,
-	23478 - 19968: 0xCAAB,
-	23480 - 19968: 0xE3E4,
-	23481 - 19968: 0xE9BB,
-	23487 - 19968: 0xE2D6,
-	23488 - 19968: 0xF3F2,
-	23490 - 19968: 0xEED6,
-	23491 - 19968: 0xEAB2,
-	23492 - 19968: 0xD0F6,
-	23493 - 19968: 0xECD9,
-	23494 - 19968: 0xDACB,
-	23495 - 19968: 0xCFA8,
-	23500 - 19968: 0xDDA3,
-	23504 - 19968: 0xD8DB,
-	23506 - 19968: 0xF9CE,
-	23507 - 19968: 0xE9D5,
-	23508 - 19968: 0xE3D1,
-	23511 - 19968: 0xD2BC,
-	23518 - 19968: 0xD8AC,
-	23519 - 19968: 0xF3CC,
-	23521 - 19968: 0xCDFB,
-	23522 - 19968: 0xF6D6,
-	23524 - 19968: 0xE7F5,
-	23525 - 19968: 0xE8EF,
-	23526 - 19968: 0xE3F9,
-	23527 - 19968: 0xD2BB,
-	23528 - 19968: 0xF3F3,
-	23529 - 19968: 0xE3FB,
-	23531 - 19968: 0xDED0,
-	23532 - 19968: 0xCEB0,
-	23534 - 19968: 0xD6F7,
-	23535 - 19968: 0xF1D9,
-	23541 - 19968: 0xF5C1,
-	23542 - 19968: 0xDCC4,
-	23544 - 19968: 0xF5BB,
-	23546 - 19968: 0xDED1,
-	23553 - 19968: 0xDCE6,
-	23556 - 19968: 0xDED2,
-	23559 - 19968: 0xEDE2,
-	23560 - 19968: 0xEEF6,
-	23561 - 19968: 0xEACF,
-	23562 - 19968: 0xF0EE,
-	23563 - 19968: 0xE3FC,
-	23565 - 19968: 0xD3DF,
-	23566 - 19968: 0xD3F4,
-	23567 - 19968: 0xE1B3,
-	23569 - 19968: 0xE1B4,
-	23574 - 19968: 0xF4D3,
-	23577 - 19968: 0xDFC6,
-	23588 - 19968: 0xE9D6,
-	23592 - 19968: 0xDBAB,
-	23601 - 19968: 0xF6A6,
-	23608 - 19968: 0xE3B9,
-	23609 - 19968: 0xEBC5,
-	23610 - 19968: 0xF4A9,
-	23611 - 19968: 0xCDB6,
-	23612 - 19968: 0xD2F9,
-	23614 - 19968: 0xDAAD,
-	23615 - 19968: 0xD2E3,
-	23616 - 19968: 0xCFD1,
-	23621 - 19968: 0xCBDC,
-	23622 - 19968: 0xCCFA,
-	23624 - 19968: 0xCFDD,
-	23627 - 19968: 0xE8A9,
-	23629 - 19968: 0xE3BB,
-	23630 - 19968: 0xE3BA,
-	23633 - 19968: 0xE0DA,
-	23637 - 19968: 0xEEF7,
-	23643 - 19968: 0xDCB3,
-	23648 - 19968: 0xD3F5,
-	23650 - 19968: 0xD7A6,
-	23652 - 19968: 0xF6B5,
-	23653 - 19968: 0xD7DB,
-	23660 - 19968: 0xE1D5,
-	23663 - 19968: 0xD4EA,
-	23665 - 19968: 0xDFA3,
-	23673 - 19968: 0xFDDF,
-	23696 - 19968: 0xD0F7,
-	23697 - 19968: 0xEDD4,
-	23713 - 19968: 0xCBAA,
-	23721 - 19968: 0xE4DB,
-	23723 - 19968: 0xE1FB,
-	23724 - 19968: 0xCBA2,
-	23729 - 19968: 0xD3E0,
-	23731 - 19968: 0xE4BF,
-	23733 - 19968: 0xFBC0,
-	23735 - 19968: 0xDABE,
-	23736 - 19968: 0xE4CD,
-	23738 - 19968: 0xD6B9,
-	23742 - 19968: 0xEFC0,
-	23744 - 19968: 0xE1FC,
-	23769 - 19968: 0xF6B9,
-	23776 - 19968: 0xDFC7,
-	23784 - 19968: 0xE4B1,
-	23791 - 19968: 0xDCE7,
-	23792 - 19968: 0xDCE8,
-	23796 - 19968: 0xFAD6,
-	23798 - 19968: 0xD3F6,
-	23803 - 19968: 0xF1DA,
-	23805 - 19968: 0xFAF2,
-	23815 - 19968: 0xE2FD,
-	23821 - 19968: 0xD5CF,
-	23822 - 19968: 0xD0F8,
-	23825 - 19968: 0xCDDF,
-	23828 - 19968: 0xF5CB,
-	23830 - 19968: 0xE4F0,
-	23831 - 19968: 0xCBAB,
-	23833 - 19968: 0xD7C4,
-	23847 - 19968: 0xE2FE,
-	23849 - 19968: 0xDDDA,
-	23883 - 19968: 0xDAAE,
-	23884 - 19968: 0xCAEE,
-	23888 - 19968: 0xD5B9,
-	23913 - 19968: 0xE3A1,
-	23916 - 19968: 0xE8E3,
-	23919 - 19968: 0xF3AB,
-	23943 - 19968: 0xCFA9,
-	23947 - 19968: 0xD3F7,
-	23965 - 19968: 0xD4F1,
-	23968 - 19968: 0xCEE4,
-	23970 - 19968: 0xE8F2,
-	23978 - 19968: 0xE5F5,
-	23992 - 19968: 0xE7AE,
-	23994 - 19968: 0xD6BA,
-	23996 - 19968: 0xDFEC,
-	23997 - 19968: 0xE4C0,
-	24013 - 19968: 0xE8E4,
-	24018 - 19968: 0xD8B5,
-	24022 - 19968: 0xE4DC,
-	24029 - 19968: 0xF4B9,
-	24030 - 19968: 0xF1B6,
-	24033 - 19968: 0xE2DE,
-	24034 - 19968: 0xE1B5,
-	24037 - 19968: 0xCDEF,
-	24038 - 19968: 0xF1A7,
-	24039 - 19968: 0xCEE5,
-	24040 - 19968: 0xCBDD,
-	24043 - 19968: 0xD9E3,
-	24046 - 19968: 0xF3AC,
-	24049 - 19968: 0xD0F9,
-	24050 - 19968: 0xECAB,
-	24051 - 19968: 0xDED3,
-	24052 - 19968: 0xF7E9,
-	24055 - 19968: 0xF9F5,
-	24061 - 19968: 0xE1DE,
-	24062 - 19968: 0xCBEE,
-	24066 - 19968: 0xE3BC,
-	24067 - 19968: 0xF8D6,
-	24070 - 19968: 0xDBEE,
-	24076 - 19968: 0xFDF1,
-	24081 - 19968: 0xF7B6,
-	24086 - 19968: 0xF4DE,
-	24089 - 19968: 0xF2ED,
-	24091 - 19968: 0xDBD9,
-	24093 - 19968: 0xF0A8,
-	24101 - 19968: 0xE1FD,
-	24107 - 19968: 0xDED4,
-	24109 - 19968: 0xE0AC,
-	24115 - 19968: 0xEDE3,
-	24118 - 19968: 0xD3E1,
-	24120 - 19968: 0xDFC8,
-	24125 - 19968: 0xD9B6,
-	24127 - 19968: 0xFDAC,
-	24128 - 19968: 0xEFD3,
-	24132 - 19968: 0xE4C1,
-	24133 - 19968: 0xF8EB,
-	24135 - 19968: 0xDBAC,
-	24140 - 19968: 0xFCC6,
-	24149 - 19968: 0xD8AD,
-	24159 - 19968: 0xF6BA,
-	24161 - 19968: 0xDBDF,
-	24162 - 19968: 0xD3D3,
-	24163 - 19968: 0xF8C7,
-	24178 - 19968: 0xCACE,
-	24179 - 19968: 0xF8C1,
-	24180 - 19968: 0xD2B4,
-	24183 - 19968: 0xDCB4,
-	24184 - 19968: 0xFAB9,
-	24185 - 19968: 0xCACF,
-	24187 - 19968: 0xFCB3,
-	24188 - 19968: 0xEAEA,
-	24189 - 19968: 0xEAEB,
-	24190 - 19968: 0xD0FA,
-	24196 - 19968: 0xEDE4,
-	24199 - 19968: 0xDDE7,
-	24202 - 19968: 0xDFC9,
-	24207 - 19968: 0xDFED,
-	24213 - 19968: 0xEEBC,
-	24215 - 19968: 0xEFC1,
-	24218 - 19968: 0xCCD2,
-	24220 - 19968: 0xDDA4,
-	24224 - 19968: 0xDFCA,
-	24230 - 19968: 0xD3F8,
-	24231 - 19968: 0xF1A8,
-	24235 - 19968: 0xCDB7,
-	24237 - 19968: 0xEFD4,
-	24245 - 19968: 0xE4DD,
-	24246 - 19968: 0xDFEE,
-	24247 - 19968: 0xCBAC,
-	24248 - 19968: 0xE9BC,
-	24254 - 19968: 0xEAEC,
-	24258 - 19968: 0xDFCB,
-	24264 - 19968: 0xF9BF,
-	24265 - 19968: 0xD6AF,
-	24266 - 19968: 0xD5C6,
-	24272 - 19968: 0xCFAA,
-	24275 - 19968: 0xCEA9,
-	24278 - 19968: 0xD6F8,
-	24282 - 19968: 0xF1B7,
-	24283 - 19968: 0xEEF8,
-	24287 - 19968: 0xD9D9,
-	24288 - 19968: 0xF3DF,
-	24290 - 19968: 0xF8C8,
-	24291 - 19968: 0xCEC6,
-	24300 - 19968: 0xD5E6,
-	24307 - 19968: 0xF4E6,
-	24310 - 19968: 0xE6C5,
-	24311 - 19968: 0xEFD5,
-	24314 - 19968: 0xCBEF,
-	24315 - 19968: 0xFCDF,
-	24321 - 19968: 0xDCA7,
-	24324 - 19968: 0xD6E7,
-	24330 - 19968: 0xF8C9,
-	24335 - 19968: 0xE3D2,
-	24337 - 19968: 0xE3BD,
-	24339 - 19968: 0xCFE1,
-	24340 - 19968: 0xF0C0,
-	24341 - 19968: 0xECDA,
-	24343 - 19968: 0xDDD7,
-	24344 - 19968: 0xFBF0,
-	24347 - 19968: 0xECAC,
-	24351 - 19968: 0xF0A9,
-	24358 - 19968: 0xFAD7,
-	24359 - 19968: 0xFBC1,
-	24361 - 19968: 0xD2C0,
-	24369 - 19968: 0xE5B0,
-	24373 - 19968: 0xEDE5,
-	24378 - 19968: 0xCBAD,
-	24380 - 19968: 0xF9B0,
-	24392 - 19968: 0xF7A5,
-	24394 - 19968: 0xCBAE,
-	24396 - 19968: 0xDAAF,
-	24398 - 19968: 0xD8B6,
-	24406 - 19968: 0xD3A7,
-	24407 - 19968: 0xFBB2,
-	24409 - 19968: 0xFDC4,
-	24411 - 19968: 0xECAD,
-	24418 - 19968: 0xFBA1,
-	24422 - 19968: 0xE5E9,
-	24423 - 19968: 0xE9EE,
-	24425 - 19968: 0xF3F4,
-	24426 - 19968: 0xF8F3,
-	24427 - 19968: 0xF0C1,
-	24428 - 19968: 0xDEAF,
-	24429 - 19968: 0xF8B0,
-	24432 - 19968: 0xF3E0,
-	24433 - 19968: 0xE7AF,
-	24439 - 19968: 0xDBAD,
-	24441 - 19968: 0xE6B5,
-	24444 - 19968: 0xF9A8,
-	24447 - 19968: 0xDDD8,
-	24448 - 19968: 0xE8D9,
-	24449 - 19968: 0xEFD6,
-	24453 - 19968: 0xD3E2,
-	24455 - 19968: 0xE2DF,
-	24458 - 19968: 0xFCE0,
-	24459 - 19968: 0xD7C8,
-	24460 - 19968: 0xFDAD,
-	24464 - 19968: 0xDFEF,
-	24465 - 19968: 0xCCD3,
-	24466 - 19968: 0xD3F9,
-	24471 - 19968: 0xD4F0,
-	24472 - 19968: 0xDBC7,
-	24473 - 19968: 0xDED5,
-	24478 - 19968: 0xF0F4,
-	24480 - 19968: 0xD5D0,
-	24481 - 19968: 0xE5D9,
-	24488 - 19968: 0xFCC7,
-	24489 - 19968: 0xDCD6,
-	24490 - 19968: 0xE2E0,
-	24494 - 19968: 0xDAB0,
-	24501 - 19968: 0xF3A3,
-	24503 - 19968: 0xD3EC,
-	24505 - 19968: 0xF4CB,
-	24509 - 19968: 0xFDC5,
-	24515 - 19968: 0xE3FD,
-	24517 - 19968: 0xF9B1,
-	24524 - 19968: 0xD0FB,
-	24525 - 19968: 0xECDB,
-	24534 - 19968: 0xF5BC,
-	24535 - 19968: 0xF2A4,
-	24536 - 19968: 0xD8CE,
-	24537 - 19968: 0xD8CF,
-	24544 - 19968: 0xF5F7,
-	24555 - 19968: 0xF6E1,
-	24565 - 19968: 0xD2B7,
-	24573 - 19968: 0xFBEC,
-	24575 - 19968: 0xDDC8,
-	24591 - 19968: 0xE4E8,
-	24594 - 19968: 0xD2C1,
-	24598 - 19968: 0xF8D7,
-	24604 - 19968: 0xD6BB,
-	24605 - 19968: 0xDED6,
-	24608 - 19968: 0xF7BD,
-	24609 - 19968: 0xECAE,
-	24613 - 19968: 0xD0E1,
-	24615 - 19968: 0xE0F5,
-	24616 - 19968: 0xEAB3,
-	24618 - 19968: 0xCED6,
-	24623 - 19968: 0xCCA5,
-	24641 - 19968: 0xECF6,
-	24642 - 19968: 0xE2E1,
-	24643 - 19968: 0xE3BE,
-	24653 - 19968: 0xFCC8,
-	24656 - 19968: 0xCDF0,
-	24658 - 19968: 0xF9F6,
-	24661 - 19968: 0xDFF0,
-	24665 - 19968: 0xE5BF,
-	24669 - 19968: 0xCEBF,
-	24674 - 19968: 0xFCE1,
-	24675 - 19968: 0xEDB0,
-	24676 - 19968: 0xFDD1,
-	24677 - 19968: 0xF6BB,
-	24680 - 19968: 0xF9CF,
-	24681 - 19968: 0xEBDA,
-	24682 - 19968: 0xCAC1,
-	24684 - 19968: 0xD2B8,
-	24685 - 19968: 0xCDF1,
-	24687 - 19968: 0xE3D3,
-	24688 - 19968: 0xFDE6,
-	24709 - 19968: 0xE6ED,
-	24713 - 19968: 0xE3FA,
-	24716 - 19968: 0xF0AA,
-	24717 - 19968: 0xF9D0,
-	24724 - 19968: 0xFCE2,
-	24726 - 19968: 0xF8A7,
-	24730 - 19968: 0xE1E5,
-	24731 - 19968: 0xEEF9,
-	24735 - 19968: 0xE7F6,
-	24736 - 19968: 0xEAED,
-	24739 - 19968: 0xFCB4,
-	24740 - 19968: 0xF5C2,
-	24743 - 19968: 0xD7DC,
-	24752 - 19968: 0xF0F5,
-	24754 - 19968: 0xDDE8,
-	24755 - 19968: 0xD3ED,
-	24756 - 19968: 0xF5FC,
-	24758 - 19968: 0xDABF,
-	24760 - 19968: 0xCCFB,
-	24764 - 19968: 0xD3FA,
-	24765 - 19968: 0xF4A4,
-	24773 - 19968: 0xEFD7,
-	24775 - 19968: 0xD4C3,
-	24785 - 19968: 0xFBE3,
-	24794 - 19968: 0xFBED,
-	24796 - 19968: 0xE0AD,
-	24799 - 19968: 0xEAEE,
-	24800 - 19968: 0xFBB3,
-	24801 - 19968: 0xE4C2,
-	24816 - 19968: 0xF6E7,
-	24817 - 19968: 0xD2DD,
-	24819 - 19968: 0xDFCC,
-	24822 - 19968: 0xFCC9,
-	24825 - 19968: 0xE5A9,
-	24826 - 19968: 0xE0F6,
-	24827 - 19968: 0xF6B3,
-	24833 - 19968: 0xE1FE,
-	24838 - 19968: 0xCBF0,
-	24840 - 19968: 0xEAEF,
-	24841 - 19968: 0xEAF0,
-	24845 - 19968: 0xDAC0,
-	24846 - 19968: 0xF8B4,
-	24847 - 19968: 0xEBF2,
-	24853 - 19968: 0xE4C3,
-	24858 - 19968: 0xE9D7,
-	24859 - 19968: 0xE4F1,
-	24863 - 19968: 0xCAEF,
-	24871 - 19968: 0xCED7,
-	24880 - 19968: 0xFCCA,
-	24884 - 19968: 0xF3E1,
-	24887 - 19968: 0xCBC4,
-	24892 - 19968: 0xE3E5,
-	24894 - 19968: 0xCBC5,
-	24895 - 19968: 0xEAB4,
-	24898 - 19968: 0xE9BD,
-	24900 - 19968: 0xD7C9,
-	24903 - 19968: 0xEBDB,
-	24904 - 19968: 0xEDB1,
-	24906 - 19968: 0xCCC3,
-	24907 - 19968: 0xF7BE,
-	24908 - 19968: 0xFCCB,
-	24915 - 19968: 0xF8F4,
-	24917 - 19968: 0xD9B7,
-	24920 - 19968: 0xF3D3,
-	24921 - 19968: 0xF3D4,
-	24925 - 19968: 0xF7E4,
-	24927 - 19968: 0xF7D1,
-	24930 - 19968: 0xD8B7,
-	24931 - 19968: 0xCEB1,
-	24932 - 19968: 0xCAC2,
-	24935 - 19968: 0xFBB4,
-	24936 - 19968: 0xCBC6,
-	24939 - 19968: 0xF0F6,
-	24942 - 19968: 0xD5E7,
-	24944 - 19968: 0xEAD0,
-	24950 - 19968: 0xCCD4,
-	24951 - 19968: 0xCBAF,
-	24957 - 19968: 0xF4AA,
-	24958 - 19968: 0xE9AF,
-	24961 - 19968: 0xF5C3,
-	24962 - 19968: 0xE9D8,
-	24970 - 19968: 0xDDE9,
-	24974 - 19968: 0xF1F3,
-	24976 - 19968: 0xD5FB,
-	24977 - 19968: 0xDEBB,
-	24980 - 19968: 0xF4FB,
-	24984 - 19968: 0xFDF3,
-	24985 - 19968: 0xFDF2,
-	24986 - 19968: 0xF7A6,
-	24996 - 19968: 0xDDC9,
-	24999 - 19968: 0xD4D3,
-	25001 - 19968: 0xCCA8,
-	25003 - 19968: 0xDAC1,
-	25004 - 19968: 0xCCD5,
-	25006 - 19968: 0xD9E4,
-	25010 - 19968: 0xFACA,
-	25014 - 19968: 0xE5E3,
-	25018 - 19968: 0xD3BC,
-	25022 - 19968: 0xCAF0,
-	25027 - 19968: 0xD0C4,
-	25031 - 19968: 0xCAD0,
-	25032 - 19968: 0xFAAB,
-	25033 - 19968: 0xEBEB,
-	25034 - 19968: 0xE7F8,
-	25035 - 19968: 0xD9E5,
-	25062 - 19968: 0xD1D7,
-	25074 - 19968: 0xF3A4,
-	25078 - 19968: 0xD4FB,
-	25079 - 19968: 0xFCE3,
-	25080 - 19968: 0xFAD8,
-	25082 - 19968: 0xF3D5,
-	25084 - 19968: 0xCFAB,
-	25087 - 19968: 0xEBF3,
-	25088 - 19968: 0xD5FC,
-	25095 - 19968: 0xD3D4,
-	25096 - 19968: 0xCDFC,
-	25098 - 19968: 0xD9E6,
-	25100 - 19968: 0xE2F9,
-	25101 - 19968: 0xE2A1,
-	25102 - 19968: 0xEBD4,
-	25104 - 19968: 0xE0F7,
-	25105 - 19968: 0xE4B2,
-	25106 - 19968: 0xCCFC,
-	25110 - 19968: 0xFBE4,
-	25114 - 19968: 0xF4AB,
-	25119 - 19968: 0xD0BD,
-	25121 - 19968: 0xCAF1,
-	25130 - 19968: 0xEFB8,
-	25134 - 19968: 0xD7C0,
-	25136 - 19968: 0xEEFA,
-	25137 - 19968: 0xFDF4,
-	25140 - 19968: 0xD3E3,
-	25142 - 19968: 0xFBC2,
-	25150 - 19968: 0xD5E8,
-	25151 - 19968: 0xDBAE,
-	25152 - 19968: 0xE1B6,
-	25153 - 19968: 0xF8B7,
-	25159 - 19968: 0xE0BF,
-	25160 - 19968: 0xFBC3,
-	25161 - 19968: 0xDDEA,
-	25163 - 19968: 0xE2A2,
-	25165 - 19968: 0xEEA6,
-	25171 - 19968: 0xF6E8,
-	25176 - 19968: 0xF6F5,
-	25198 - 19968: 0xDDCA,
-	25201 - 19968: 0xD0E2,
-	25206 - 19968: 0xDDA6,
-	25209 - 19968: 0xDDEB,
-	25212 - 19968: 0xE4F9,
-	25215 - 19968: 0xE3AF,
-	25216 - 19968: 0xD0FC,
-	25220 - 19968: 0xF4FC,
-	25225 - 19968: 0xCCBC,
-	25226 - 19968: 0xF7EA,
-	25233 - 19968: 0xE5E4,
-	25234 - 19968: 0xDFF1,
-	25237 - 19968: 0xF7E1,
-	25239 - 19968: 0xF9F7,
-	25240 - 19968: 0xEFB9,
-	25243 - 19968: 0xF8D8,
-	25259 - 19968: 0xF9A9,
-	25265 - 19968: 0xF8D9,
-	25269 - 19968: 0xEEBD,
-	25273 - 19968: 0xD8C6,
-	25276 - 19968: 0xE4E3,
-	25277 - 19968: 0xF5CE,
-	25282 - 19968: 0xDDD9,
-	25287 - 19968: 0xD9E7,
-	25288 - 19968: 0xD2B9,
-	25289 - 19968: 0xD5C3,
-	25292 - 19968: 0xDAE5,
-	25293 - 19968: 0xDAD0,
-	25295 - 19968: 0xD1D9,
-	25296 - 19968: 0xCED8,
-	25298 - 19968: 0xCBDE,
-	25299 - 19968: 0xF4AC,
-	25300 - 19968: 0xDAFB,
-	25302 - 19968: 0xF6E9,
-	25303 - 19968: 0xE8F3,
-	25304 - 19968: 0xCFAC,
-	25305 - 19968: 0xF0F0,
-	25307 - 19968: 0xF4FD,
-	25308 - 19968: 0xDBC8,
-	25324 - 19968: 0xCEC0,
-	25325 - 19968: 0xE3D4,
-	25326 - 19968: 0xD1CF,
-	25327 - 19968: 0xF1F5,
-	25329 - 19968: 0xCDF2,
-	25331 - 19968: 0xCFEB,
-	25335 - 19968: 0xCDB8,
-	25342 - 19968: 0xE3A6,
-	25343 - 19968: 0xD1DA,
-	25345 - 19968: 0xF2A5,
-	25351 - 19968: 0xF2A6,
-	25353 - 19968: 0xE4CE,
-	25361 - 19968: 0xD3FB,
-	25387 - 19968: 0xF1A9,
-	25391 - 19968: 0xF2C9,
-	25402 - 19968: 0xEFD8,
-	25403 - 19968: 0xE6C9,
-	25405 - 19968: 0xD8B8,
-	25406 - 19968: 0xFAF3,
-	25417 - 19968: 0xF3B5,
-	25420 - 19968: 0xF8A4,
-	25423 - 19968: 0xD1F3,
-	25424 - 19968: 0xE6C8,
-	25429 - 19968: 0xF8DA,
-	25447 - 19968: 0xDCE9,
-	25448 - 19968: 0xDED7,
-	25454 - 19968: 0xCBDF,
-	25458 - 19968: 0xCFEC,
-	25463 - 19968: 0xF4DF,
-	25466 - 19968: 0xD1F4,
-	25467 - 19968: 0xD2BA,
-	25471 - 19968: 0xDFF2,
-	25475 - 19968: 0xE1B7,
-	25480 - 19968: 0xE2A3,
-	25481 - 19968: 0xD3FC,
-	25484 - 19968: 0xEDE6,
-	25490 - 19968: 0xDBC9,
-	25494 - 19968: 0xE4FA,
-	25496 - 19968: 0xCFDE,
-	25499 - 19968: 0xCED0,
-	25504 - 19968: 0xD5D3,
-	25505 - 19968: 0xF3F5,
-	25506 - 19968: 0xF7AE,
-	25509 - 19968: 0xEFC8,
-	25511 - 19968: 0xCDF3,
-	25512 - 19968: 0xF5CF,
-	25513 - 19968: 0xE5F3,
-	25514 - 19968: 0xF0C2,
-	25536 - 19968: 0xCAD1,
-	25540 - 19968: 0xEAF1,
-	25542 - 19968: 0xD0A6,
-	25551 - 19968: 0xD9DA,
-	25552 - 19968: 0xF0AB,
-	25558 - 19968: 0xEBE7,
-	25562 - 19968: 0xE5C0,
-	25563 - 19968: 0xFCB5,
-	25569 - 19968: 0xE4C4,
-	25581 - 19968: 0xCCA9,
-	25582 - 19968: 0xFDC6,
-	25588 - 19968: 0xEAB5,
-	25590 - 19968: 0xE5AA,
-	25591 - 19968: 0xDFBA,
-	25613 - 19968: 0xE1DF,
-	25615 - 19968: 0xDAD1,
-	25620 - 19968: 0xE1B8,
-	25622 - 19968: 0xE8F4,
-	25623 - 19968: 0xD3FD,
-	25628 - 19968: 0xE2A4,
-	25634 - 19968: 0xF2CA,
-	25644 - 19968: 0xDAE6,
-	25645 - 19968: 0xF7B3,
-	25658 - 19968: 0xFDCD,
-	25662 - 19968: 0xF3B6,
-	25688 - 19968: 0xEED7,
-	25696 - 19968: 0xF5C4,
-	25705 - 19968: 0xD8A4,
-	25711 - 19968: 0xF2A7,
-	25720 - 19968: 0xD9B8,
-	25721 - 19968: 0xD9B9,
-	25722 - 19968: 0xEFC9,
-	25736 - 19968: 0xD6CE,
-	25745 - 19968: 0xF7CB,
-	25746 - 19968: 0xDFAE,
-	25747 - 19968: 0xE8F5,
-	25754 - 19968: 0xD2B5,
-	25758 - 19968: 0xD3D5,
-	25764 - 19968: 0xF4CC,
-	25765 - 19968: 0xDAFC,
-	25771 - 19968: 0xD9E8,
-	25773 - 19968: 0xF7EB,
-	25774 - 19968: 0xF5C9,
-	25776 - 19968: 0xF3BC,
-	25778 - 19968: 0xDAD2,
-	25787 - 19968: 0xD3B5,
-	25793 - 19968: 0xE8B6,
-	25796 - 19968: 0xD6CF,
-	25797 - 19968: 0xF4BA,
-	25799 - 19968: 0xF7C9,
-	25802 - 19968: 0xCCAA,
-	25805 - 19968: 0xF0C3,
-	25806 - 19968: 0xCCD6,
-	25810 - 19968: 0xD0D3,
-	25812 - 19968: 0xD3BD,
-	25816 - 19968: 0xDBFB,
-	25818 - 19968: 0xCBE0,
-	25825 - 19968: 0xD3E4,
-	25826 - 19968: 0xF6F7,
-	25829 - 19968: 0xD5BA,
-	25830 - 19968: 0xF3CD,
-	25831 - 19968: 0xCBE1,
-	25836 - 19968: 0xEBF4,
-	25842 - 19968: 0xF4AD,
-	25844 - 19968: 0xFCAA,
-	25850 - 19968: 0xF7EC,
-	25854 - 19968: 0xE8F6,
-	25856 - 19968: 0xDAE7,
-	25860 - 19968: 0xF7CC,
-	25880 - 19968: 0xE5C1,
-	25885 - 19968: 0xE0EE,
-	25891 - 19968: 0xD5FD,
-	25898 - 19968: 0xCEE6,
-	25899 - 19968: 0xFCAB,
-	25900 - 19968: 0xD5BB,
-	25903 - 19968: 0xF2A8,
-	25910 - 19968: 0xE2A5,
-	25911 - 19968: 0xCDB9,
-	25912 - 19968: 0xEAF2,
-	25913 - 19968: 0xCBC7,
-	25915 - 19968: 0xCDF4,
-	25918 - 19968: 0xDBAF,
-	25919 - 19968: 0xEFD9,
-	25925 - 19968: 0xCDBA,
-	25928 - 19968: 0xFCF9,
-	25933 - 19968: 0xDFF3,
-	25934 - 19968: 0xCEE7,
-	25935 - 19968: 0xDAC2,
-	25937 - 19968: 0xCFAD,
-	25942 - 19968: 0xE7F9,
-	25943 - 19968: 0xF8A8,
-	25950 - 19968: 0xF3E2,
-	25954 - 19968: 0xCAF2,
-	25955 - 19968: 0xDFA4,
-	25958 - 19968: 0xD4C4,
-	25964 - 19968: 0xCCD7,
-	25965 - 19968: 0xE5C2,
-	25970 - 19968: 0xCDBB,
-	25972 - 19968: 0xEFDA,
-	25973 - 19968: 0xEED8,
-	25975 - 19968: 0xDDA7,
-	25976 - 19968: 0xE2A6,
-	25982 - 19968: 0xE0C0,
-	25986 - 19968: 0xD6B0,
-	25987 - 19968: 0xF8CA,
-	25989 - 19968: 0xFCFA,
-	25991 - 19968: 0xD9FE,
-	25996 - 19968: 0xDEB0,
-	26000 - 19968: 0xDDEC,
-	26001 - 19968: 0xDAE8,
-	26007 - 19968: 0xD4E0,
-	26009 - 19968: 0xD6F9,
-	26011 - 19968: 0xCDD7,
-	26012 - 19968: 0xDED8,
-	26015 - 19968: 0xF2F8,
-	26017 - 19968: 0xE4D6,
-	26020 - 19968: 0xD0C5,
-	26021 - 19968: 0xF4AE,
-	26023 - 19968: 0xDDA8,
-	26027 - 19968: 0xEDC5,
-	26028 - 19968: 0xF3D6,
-	26031 - 19968: 0xDED9,
-	26032 - 19968: 0xE3E6,
-	26039 - 19968: 0xD3A8,
-	26041 - 19968: 0xDBB0,
-	26044 - 19968: 0xE5DA,
-	26045 - 19968: 0xE3BF,
-	26049 - 19968: 0xDBB1,
-	26053 - 19968: 0xD5E9,
-	26059 - 19968: 0xE0C1,
-	26060 - 19968: 0xEFDB,
-	26063 - 19968: 0xF0E9,
-	26066 - 19968: 0xD7B2,
-	26071 - 19968: 0xD0FD,
-	26080 - 19968: 0xD9E9,
-	26083 - 19968: 0xD0FE,
-	26085 - 19968: 0xECED,
-	26086 - 19968: 0xD3A9,
-	26088 - 19968: 0xF2A9,
-	26089 - 19968: 0xF0C4,
-	26092 - 19968: 0xE2E2,
-	26093 - 19968: 0xE9EF,
-	26097 - 19968: 0xF9D1,
-	26100 - 19968: 0xE9D9,
-	26106 - 19968: 0xE8DA,
-	26107 - 19968: 0xDAC3,
-	26108 - 19968: 0xDAC4,
-	26109 - 19968: 0xD4C5,
-	26111 - 19968: 0xE7FA,
-	26118 - 19968: 0xCDE0,
-	26119 - 19968: 0xE3B0,
-	26121 - 19968: 0xDBB2,
-	26122 - 19968: 0xFBC4,
-	26124 - 19968: 0xF3E3,
-	26126 - 19968: 0xD9A5,
-	26127 - 19968: 0xFBE7,
-	26128 - 19968: 0xDDCB,
-	26129 - 19968: 0xD0D4,
-	26131 - 19968: 0xE6B6,
-	26132 - 19968: 0xE0AE,
-	26133 - 19968: 0xFDDA,
-	26142 - 19968: 0xDCB5,
-	26143 - 19968: 0xE0F8,
-	26144 - 19968: 0xE7B1,
-	26149 - 19968: 0xF5F0,
-	26151 - 19968: 0xD8DC,
-	26152 - 19968: 0xEDC6,
-	26157 - 19968: 0xE1B9,
-	26159 - 19968: 0xE3C0,
-	26160 - 19968: 0xF9C0,
-	26161 - 19968: 0xE9F0,
-	26164 - 19968: 0xD9DB,
-	26166 - 19968: 0xF3E4,
-	26170 - 19968: 0xDCB6,
-	26171 - 19968: 0xE4E9,
-	26177 - 19968: 0xF0C5,
-	26178 - 19968: 0xE3C1,
-	26179 - 19968: 0xFCCC,
-	26180 - 19968: 0xFCCD,
-	26185 - 19968: 0xF2CB,
-	26187 - 19968: 0xF2CC,
-	26191 - 19968: 0xE4CF,
-	26201 - 19968: 0xF1DB,
-	26203 - 19968: 0xFAD9,
-	26205 - 19968: 0xF1B8,
-	26206 - 19968: 0xFDF5,
-	26207 - 19968: 0xE0F9,
-	26212 - 19968: 0xE7FB,
-	26213 - 19968: 0xFCB7,
-	26214 - 19968: 0xFCE4,
-	26215 - 19968: 0xFBC5,
-	26216 - 19968: 0xE3E7,
-	26217 - 19968: 0xD8B9,
-	26219 - 19968: 0xF6F8,
-	26222 - 19968: 0xDCC5,
-	26223 - 19968: 0xCCD8,
-	26227 - 19968: 0xE0AF,
-	26228 - 19968: 0xF4E7,
-	26230 - 19968: 0xEFDC,
-	26231 - 19968: 0xCFFC,
-	26232 - 19968: 0xEFDD,
-	26234 - 19968: 0xF2AA,
-	26244 - 19968: 0xFDBE,
-	26247 - 19968: 0xCAAC,
-	26248 - 19968: 0xFDBB,
-	26249 - 19968: 0xFDC7,
-	26254 - 19968: 0xE7B2,
-	26256 - 19968: 0xEAD1,
-	26257 - 19968: 0xDFF4,
-	26262 - 19968: 0xD1EC,
-	26263 - 19968: 0xE4DE,
-	26264 - 19968: 0xE5C3,
-	26269 - 19968: 0xD9A6,
-	26272 - 19968: 0xCDBC,
-	26274 - 19968: 0xF3E5,
-	26283 - 19968: 0xEDD5,
-	26286 - 19968: 0xD9BA,
-	26290 - 19968: 0xEDE7,
-	26291 - 19968: 0xFBB5,
-	26292 - 19968: 0xF8EC,
-	26297 - 19968: 0xE0E7,
-	26299 - 19968: 0xCCD9,
-	26302 - 19968: 0xD4C6,
-	26308 - 19968: 0xE7A5,
-	26310 - 19968: 0xD5F5,
-	26311 - 19968: 0xD3BE,
-	26313 - 19968: 0xFCFB,
-	26326 - 19968: 0xE4F2,
-	26329 - 19968: 0xDFF5,
-	26332 - 19968: 0xE8F8,
-	26333 - 19968: 0xF8ED,
-	26336 - 19968: 0xCEC7,
-	26342 - 19968: 0xFDF6,
-	26352 - 19968: 0xE8D8,
-	26354 - 19968: 0xCDD8,
-	26355 - 19968: 0xE7D6,
-	26356 - 19968: 0xCCDA,
-	26359 - 19968: 0xCAE3,
-	26360 - 19968: 0xDFF6,
-	26361 - 19968: 0xF0C7,
-	26362 - 19968: 0xF0C6,
-	26364 - 19968: 0xD8BA,
-	26366 - 19968: 0xF1F4,
-	26367 - 19968: 0xF4F0,
-	26368 - 19968: 0xF5CC,
-	26371 - 19968: 0xFCE5,
-	26376 - 19968: 0xEAC5,
-	26377 - 19968: 0xEAF3,
-	26379 - 19968: 0xDDDB,
-	26381 - 19968: 0xDCD7,
-	26388 - 19968: 0xDEFD,
-	26389 - 19968: 0xF2F9,
-	26391 - 19968: 0xD5C7,
-	26395 - 19968: 0xD8D0,
-	26397 - 19968: 0xF0C8,
-	26398 - 19968: 0xD1A1,
-	26399 - 19968: 0xD1A2,
-	26406 - 19968: 0xD9D4,
-	26407 - 19968: 0xD6E8,
-	26408 - 19968: 0xD9CA,
-	26410 - 19968: 0xDAB1,
-	26411 - 19968: 0xD8C7,
-	26412 - 19968: 0xDCE2,
-	26413 - 19968: 0xF3CE,
-	26414 - 19968: 0xF5F4,
-	26417 - 19968: 0xF1B9,
-	26420 - 19968: 0xDAD3,
-	26422 - 19968: 0xF6EA,
-	26426 - 19968: 0xCFF5,
-	26429 - 19968: 0xFDAE,
-	26438 - 19968: 0xCAD2,
-	26441 - 19968: 0xDFB4,
-	26446 - 19968: 0xD7DD,
-	26447 - 19968: 0xFABA,
-	26448 - 19968: 0xEEA7,
-	26449 - 19968: 0xF5BD,
-	26451 - 19968: 0xF8F5,
-	26454 - 19968: 0xEDE8,
-	26460 - 19968: 0xD4E1,
-	26462 - 19968: 0xD1A3,
-	26463 - 19968: 0xE1D6,
-	26477 - 19968: 0xF9F8,
-	26479 - 19968: 0xDBCA,
-	26480 - 19968: 0xCBF9,
-	26481 - 19968: 0xD4D4,
-	26483 - 19968: 0xD9DC,
-	26485 - 19968: 0xEEBE,
-	26487 - 19968: 0xF7ED,
-	26491 - 19968: 0xD2EE,
-	26494 - 19968: 0xE1E6,
-	26495 - 19968: 0xF7F9,
-	26503 - 19968: 0xDDED,
-	26505 - 19968: 0xE8DB,
-	26507 - 19968: 0xDBB3,
-	26511 - 19968: 0xD1F7,
-	26512 - 19968: 0xE0B0,
-	26515 - 19968: 0xD4E2,
-	26517 - 19968: 0xF6D7,
-	26519 - 19968: 0xD7F9,
-	26522 - 19968: 0xD8DD,
-	26524 - 19968: 0xCDFD,
-	26525 - 19968: 0xF2AB,
-	26543 - 19968: 0xCDBD,
-	26544 - 19968: 0xF8C2,
-	26547 - 19968: 0xF2AC,
-	26550 - 19968: 0xCAAD,
-	26551 - 19968: 0xCAAE,
-	26552 - 19968: 0xCFAE,
-	26558 - 19968: 0xE3C2,
-	26564 - 19968: 0xDCB7,
-	26575 - 19968: 0xDBDA,
-	26576 - 19968: 0xD9BB,
-	26577 - 19968: 0xCAF3,
-	26578 - 19968: 0xF6D3,
-	26579 - 19968: 0xE6F8,
-	26580 - 19968: 0xEAF5,
-	26586 - 19968: 0xEAF6,
-	26589 - 19968: 0xF6F9,
-	26601 - 19968: 0xCFAF,
-	26604 - 19968: 0xCAD3,
-	26607 - 19968: 0xCAAF,
-	26608 - 19968: 0xD2B0,
-	26609 - 19968: 0xF1BA,
-	26611 - 19968: 0xD7B3,
-	26612 - 19968: 0xE3C3,
-	26613 - 19968: 0xF3FD,
-	26614 - 19968: 0xDEDA,
-	26619 - 19968: 0xDEDB,
-	26622 - 19968: 0xEFDE,
-	26642 - 19968: 0xE2E3,
-	26643 - 19968: 0xEEFB,
-	26646 - 19968: 0xDFF7,
-	26647 - 19968: 0xD7CA,
-	26657 - 19968: 0xCEE8,
-	26658 - 19968: 0xDBDB,
-	26666 - 19968: 0xF1BB,
-	26671 - 19968: 0xE9F1,
-	26680 - 19968: 0xFAB7,
-	26681 - 19968: 0xD0C6,
-	26684 - 19968: 0xCCAB,
-	26685 - 19968: 0xEEA8,
-	26688 - 19968: 0xCBFA,
-	26689 - 19968: 0xF9F9,
-	26690 - 19968: 0xCCFD,
-	26691 - 19968: 0xD3FE,
-	26696 - 19968: 0xE4D0,
-	26702 - 19968: 0xF2EE,
-	26704 - 19968: 0xD4D5,
-	26705 - 19968: 0xDFCD,
-	26707 - 19968: 0xFCB8,
-	26708 - 19968: 0xD1D0,
-	26733 - 19968: 0xF2CD,
-	26742 - 19968: 0xF7D2,
-	26751 - 19968: 0xCAD4,
-	26753 - 19968: 0xD5D9,
-	26757 - 19968: 0xD8DE,
-	26767 - 19968: 0xCDD9,
-	26771 - 19968: 0xEEA9,
-	26772 - 19968: 0xF6BC,
-	26775 - 19968: 0xCCDB,
-	26781 - 19968: 0xF0C9,
-	26783 - 19968: 0xFCFC,
-	26785 - 19968: 0xE8C9,
-	26786 - 19968: 0xF4FE,
-	26791 - 19968: 0xE7FC,
-	26792 - 19968: 0xD7DE,
-	26797 - 19968: 0xDEDC,
-	26799 - 19968: 0xF0AC,
-	26800 - 19968: 0xCCFE,
-	26801 - 19968: 0xCDE1,
-	26803 - 19968: 0xE1BA,
-	26805 - 19968: 0xDBEF,
-	26806 - 19968: 0xDAB2,
-	26820 - 19968: 0xD1A5,
-	26821 - 19968: 0xDCB8,
-	26825 - 19968: 0xD8F6,
-	26827 - 19968: 0xD1A4,
-	26829 - 19968: 0xCDE2,
-	26834 - 19968: 0xDCEA,
-	26837 - 19968: 0xF0F7,
-	26839 - 19968: 0xF0CA,
-	26840 - 19968: 0xD0BE,
-	26842 - 19968: 0xDDDC,
-	26847 - 19968: 0xD4D6,
-	26848 - 19968: 0xD3D6,
-	26855 - 19968: 0xEDD0,
-	26856 - 19968: 0xCDA1,
-	26862 - 19968: 0xDFB5,
-	26866 - 19968: 0xDFF8,
-	26873 - 19968: 0xD4A1,
-	26874 - 19968: 0xCEB2,
-	26880 - 19968: 0xE8CA,
-	26885 - 19968: 0xEBF5,
-	26893 - 19968: 0xE3D5,
-	26894 - 19968: 0xF5D0,
-	26898 - 19968: 0xF5A1,
-	26919 - 19968: 0xD9A7,
-	26928 - 19968: 0xE5AB,
-	26941 - 19968: 0xE6CB,
-	26943 - 19968: 0xF5F1,
-	26954 - 19968: 0xE5C5,
-	26963 - 19968: 0xF9A3,
-	26964 - 19968: 0xE0DB,
-	26965 - 19968: 0xF6EB,
-	26967 - 19968: 0xCBF1,
-	26969 - 19968: 0xD9EA,
-	26970 - 19968: 0xF5A2,
-	26974 - 19968: 0xD7D1,
-	26976 - 19968: 0xD1F8,
-	26977 - 19968: 0xEAF8,
-	26978 - 19968: 0xEAF9,
-	26979 - 19968: 0xDAB3,
-	26984 - 19968: 0xEFDF,
-	26987 - 19968: 0xF1EF,
-	26989 - 19968: 0xE5F6,
-	26990 - 19968: 0xEEBF,
-	26991 - 19968: 0xE2E4,
-	26997 - 19968: 0xD0BF,
-	26999 - 19968: 0xFAAC,
-	27000 - 19968: 0xF5D1,
-	27001 - 19968: 0xE7B3,
-	27029 - 19968: 0xE9BE,
-	27035 - 19968: 0xF2CE,
-	27036 - 19968: 0xDBB4,
-	27045 - 19968: 0xFCCE,
-	27047 - 19968: 0xDDEE,
-	27054 - 19968: 0xE7B4,
-	27060 - 19968: 0xD7B4,
-	27067 - 19968: 0xF7B4,
-	27073 - 19968: 0xCDBE,
-	27075 - 19968: 0xDAE9,
-	27083 - 19968: 0xCFB0,
-	27084 - 19968: 0xF7D9,
-	27085 - 19968: 0xF3E6,
-	27088 - 19968: 0xCED9,
-	27112 - 19968: 0xCEAA,
-	27114 - 19968: 0xCBC8,
-	27131 - 19968: 0xD0A7,
-	27133 - 19968: 0xF0CB,
-	27135 - 19968: 0xD0C7,
-	27138 - 19968: 0xE4C5,
-	27146 - 19968: 0xDBE0,
-	27153 - 19968: 0xD5DA,
-	27155 - 19968: 0xD7A7,
-	27159 - 19968: 0xEEC0,
-	27161 - 19968: 0xF8F6,
-	27166 - 19968: 0xF5D2,
-	27167 - 19968: 0xEDE9,
-	27169 - 19968: 0xD9BC,
-	27171 - 19968: 0xE5C6,
-	27189 - 19968: 0xF5A3,
-	27192 - 19968: 0xDAD4,
-	27193 - 19968: 0xE2A7,
-	27194 - 19968: 0xFBFC,
-	27197 - 19968: 0xF1DC,
-	27204 - 19968: 0xCAF4,
-	27208 - 19968: 0xE8FA,
-	27211 - 19968: 0xCEE9,
-	27218 - 19968: 0xE9F8,
-	27219 - 19968: 0xE2E5,
-	27224 - 19968: 0xD0B9,
-	27225 - 19968: 0xD4F2,
-	27231 - 19968: 0xD1A6,
-	27233 - 19968: 0xDFCE,
-	27243 - 19968: 0xFCF4,
-	27264 - 19968: 0xD3AA,
-	27268 - 19968: 0xCCAC,
-	27273 - 19968: 0xEFE0,
-	27277 - 19968: 0xE5E5,
-	27278 - 19968: 0xD0D5,
-	27287 - 19968: 0xDBFC,
-	27292 - 19968: 0xFCE6,
-	27298 - 19968: 0xCBFE,
-	27299 - 19968: 0xEDEA,
-	27315 - 19968: 0xDEB1,
-	27323 - 19968: 0xF9E3,
-	27330 - 19968: 0xD4A2,
-	27331 - 19968: 0xCFF6,
-	27347 - 19968: 0xD6D0,
-	27354 - 19968: 0xD5EA,
-	27355 - 19968: 0xF1EE,
-	27382 - 19968: 0xFACB,
-	27387 - 19968: 0xE5A1,
-	27396 - 19968: 0xD5B1,
-	27402 - 19968: 0xCFED,
-	27404 - 19968: 0xEDEB,
-	27410 - 19968: 0xD5B2,
-	27414 - 19968: 0xD5BC,
-	27424 - 19968: 0xFDE2,
-	27425 - 19968: 0xF3AD,
-	27427 - 19968: 0xFDDB,
-	27442 - 19968: 0xE9B0,
-	27450 - 19968: 0xD1A7,
-	27453 - 19968: 0xFDE3,
-	27454 - 19968: 0xCEB3,
-	27462 - 19968: 0xFDE4,
-	27463 - 19968: 0xFACE,
-	27468 - 19968: 0xCAB0,
-	27470 - 19968: 0xF7A7,
-	27472 - 19968: 0xCFB1,
-	27487 - 19968: 0xE6A2,
-	27489 - 19968: 0xFCB6,
-	27490 - 19968: 0xF2AD,
-	27491 - 19968: 0xEFE1,
-	27492 - 19968: 0xF3AE,
-	27493 - 19968: 0xDCC6,
-	27494 - 19968: 0xD9EB,
-	27498 - 19968: 0xE8E0,
-	27506 - 19968: 0xE1A8,
-	27511 - 19968: 0xD5F6,
-	27512 - 19968: 0xCFFD,
-	27515 - 19968: 0xDEDD,
-	27519 - 19968: 0xD9D1,
-	27523 - 19968: 0xE4EA,
-	27524 - 19968: 0xF2CF,
-	27526 - 19968: 0xF7BF,
-	27529 - 19968: 0xE2E6,
-	27530 - 19968: 0xE2A8,
-	27542 - 19968: 0xE3D6,
-	27544 - 19968: 0xEDD1,
-	27550 - 19968: 0xE9F9,
-	27566 - 19968: 0xD6B1,
-	27567 - 19968: 0xDEB2,
-	27570 - 19968: 0xE0E8,
-	27573 - 19968: 0xD3AB,
-	27575 - 19968: 0xEBDC,
-	27578 - 19968: 0xDFAF,
-	27580 - 19968: 0xCAC3,
-	27583 - 19968: 0xEEFC,
-	27585 - 19968: 0xFDC3,
-	27589 - 19968: 0xEBF6,
-	27590 - 19968: 0xCFB2,
-	27595 - 19968: 0xD9EC,
-	27597 - 19968: 0xD9BD,
-	27599 - 19968: 0xD8DF,
-	27602 - 19968: 0xD4B8,
-	27603 - 19968: 0xEBBE,
-	27604 - 19968: 0xDDEF,
-	27606 - 19968: 0xDDF0,
-	27607 - 19968: 0xDDF1,
-	27608 - 19968: 0xDDF2,
-	27611 - 19968: 0xD9BE,
-	27627 - 19968: 0xFBC6,
-	27628 - 19968: 0xCFB3,
-	27656 - 19968: 0xEEFD,
-	27663 - 19968: 0xE4AB,
-	27665 - 19968: 0xDAC5,
-	27667 - 19968: 0xD8EC,
-	27683 - 19968: 0xD1A8,
-	27700 - 19968: 0xE2A9,
-	27703 - 19968: 0xDEBC,
-	27704 - 19968: 0xE7B5,
-	27710 - 19968: 0xDBF0,
-	27712 - 19968: 0xEFE2,
-	27713 - 19968: 0xF1F0,
-	27714 - 19968: 0xCFB4,
-	27726 - 19968: 0xDBF1,
-	27728 - 19968: 0xE0B1,
-	27733 - 19968: 0xDFA5,
-	27735 - 19968: 0xF9D2,
-	27738 - 19968: 0xE7FD,
-	27741 - 19968: 0xE6A3,
-	27742 - 19968: 0xFBF1,
-	27743 - 19968: 0xCBB0,
-	27744 - 19968: 0xF2AE,
-	27752 - 19968: 0xCDE7,
-	27754 - 19968: 0xE8DC,
-	27757 - 19968: 0xE7D7,
-	27760 - 19968: 0xF7C0,
-	27762 - 19968: 0xD0E3,
-	27766 - 19968: 0xDAA1,
-	27770 - 19968: 0xCCBD,
-	27773 - 19968: 0xD1A9,
-	27774 - 19968: 0xDDCC,
-	27777 - 19968: 0xE3FE,
-	27778 - 19968: 0xD1AA,
-	27779 - 19968: 0xE8AA,
-	27781 - 19968: 0xEAB6,
-	27782 - 19968: 0xF9FA,
-	27783 - 19968: 0xE6CC,
-	27784 - 19968: 0xF6D8,
-	27788 - 19968: 0xD4C7,
-	27792 - 19968: 0xD9CB,
-	27794 - 19968: 0xD9D2,
-	27795 - 19968: 0xD3CB,
-	27796 - 19968: 0xD8F7,
-	27797 - 19968: 0xDAA9,
-	27798 - 19968: 0xF5F8,
-	27801 - 19968: 0xDEDE,
-	27802 - 19968: 0xF2AF,
-	27803 - 19968: 0xF8A9,
-	27819 - 19968: 0xD8C8,
-	27822 - 19968: 0xEEC1,
-	27827 - 19968: 0xF9C1,
-	27832 - 19968: 0xDDF3,
-	27833 - 19968: 0xEAFA,
-	27835 - 19968: 0xF6BD,
-	27836 - 19968: 0xE1BB,
-	27837 - 19968: 0xCDBF,
-	27838 - 19968: 0xF4D4,
-	27839 - 19968: 0xE6CD,
-	27841 - 19968: 0xFCCF,
-	27842 - 19968: 0xFBA2,
-	27844 - 19968: 0xE0DC,
-	27849 - 19968: 0xF4BB,
-	27850 - 19968: 0xDAD5,
-	27852 - 19968: 0xF9B2,
-	27859 - 19968: 0xFBF2,
-	27861 - 19968: 0xDBF6,
-	27863 - 19968: 0xDEDF,
-	27867 - 19968: 0xDBF2,
-	27873 - 19968: 0xF8DC,
-	27874 - 19968: 0xF7EE,
-	27875 - 19968: 0xEBE8,
-	27877 - 19968: 0xD2FA,
-	27880 - 19968: 0xF1BC,
-	27883 - 19968: 0xFADA,
-	27886 - 19968: 0xDAEA,
-	27887 - 19968: 0xDAC6,
-	27888 - 19968: 0xF7C1,
-	27891 - 19968: 0xE7B6,
-	27915 - 19968: 0xE5C7,
-	27916 - 19968: 0xD6AC,
-	27921 - 19968: 0xDCC7,
-	27927 - 19968: 0xE1A9,
-	27929 - 19968: 0xE2AA,
-	27931 - 19968: 0xD5A6,
-	27934 - 19968: 0xD4D7,
-	27941 - 19968: 0xF2D0,
-	27943 - 19968: 0xEAFB,
-	27945 - 19968: 0xE0DD,
-	27946 - 19968: 0xFBF3,
-	27954 - 19968: 0xF1BD,
-	27957 - 19968: 0xE2E7,
-	27958 - 19968: 0xFDD7,
-	27960 - 19968: 0xCEC8,
-	27961 - 19968: 0xEAB7,
-	27963 - 19968: 0xFCC0,
-	27965 - 19968: 0xFDE7,
-	27966 - 19968: 0xF7EF,
-	27969 - 19968: 0xD7B5,
-	27993 - 19968: 0xEFBA,
-	27994 - 19968: 0xF1DD,
-	27996 - 19968: 0xDEB3,
-	28003 - 19968: 0xE8CB,
-	28006 - 19968: 0xF8DD,
-	28009 - 19968: 0xFBC7,
-	28010 - 19968: 0xD5C8,
-	28012 - 19968: 0xD7DF,
-	28014 - 19968: 0xDDA9,
-	28020 - 19968: 0xE9B1,
-	28023 - 19968: 0xFAAD,
-	28024 - 19968: 0xF6D9,
-	28025 - 19968: 0xFAF4,
-	28031 - 19968: 0xF8AA,
-	28037 - 19968: 0xE6EE,
-	28039 - 19968: 0xCCDC,
-	28040 - 19968: 0xE1BC,
-	28041 - 19968: 0xE0EF,
-	28044 - 19968: 0xE9BF,
-	28045 - 19968: 0xFCFD,
-	28046 - 19968: 0xE6CE,
-	28049 - 19968: 0xE1D7,
-	28051 - 19968: 0xE6CF,
-	28053 - 19968: 0xF4F1,
-	28079 - 19968: 0xE4F3,
-	28082 - 19968: 0xE4FB,
-	28085 - 19968: 0xF9E4,
-	28096 - 19968: 0xEFE3,
-	28099 - 19968: 0xCFEE,
-	28100 - 19968: 0xF6BE,
-	28101 - 19968: 0xE0B2,
-	28102 - 19968: 0xFCFE,
-	28103 - 19968: 0xD1AB,
-	28107 - 19968: 0xD7FA,
-	28111 - 19968: 0xFBC8,
-	28113 - 19968: 0xE2D7,
-	28120 - 19968: 0xD4A3,
-	28121 - 19968: 0xF0F8,
-	28122 - 19968: 0xD7A8,
-	28126 - 19968: 0xE1E7,
-	28129 - 19968: 0xD3BF,
-	28136 - 19968: 0xEFE4,
-	28138 - 19968: 0xD7C5,
-	28139 - 19968: 0xEBE2,
-	28142 - 19968: 0xFCE7,
-	28145 - 19968: 0xE4A2,
-	28147 - 19968: 0xE2E8,
-	28149 - 19968: 0xE6D0,
-	28151 - 19968: 0xFBE8,
-	28152 - 19968: 0xF4E8,
-	28153 - 19968: 0xE5F4,
-	28154 - 19968: 0xF4BC,
-	28155 - 19968: 0xF4D5,
-	28183 - 19968: 0xDFB6,
-	28185 - 19968: 0xFCB9,
-	28186 - 19968: 0xEEC2,
-	28187 - 19968: 0xCAF5,
-	28191 - 19968: 0xEFE5,
-	28192 - 19968: 0xCBE2,
-	28193 - 19968: 0xD4A4,
-	28195 - 19968: 0xDEE0,
-	28196 - 19968: 0xDAFD,
-	28197 - 19968: 0xE4C6,
-	28198 - 19968: 0xE8BE,
-	28203 - 19968: 0xE0DE,
-	28204 - 19968: 0xF6B4,
-	28205 - 19968: 0xEAD2,
-	28207 - 19968: 0xF9FB,
-	28210 - 19968: 0xE0C2,
-	28212 - 19968: 0xCAE4,
-	28214 - 19968: 0xE7B7,
-	28216 - 19968: 0xEAFD,
-	28218 - 19968: 0xD9DD,
-	28220 - 19968: 0xDAB4,
-	28221 - 19968: 0xEEAA,
-	28222 - 19968: 0xFBE9,
-	28227 - 19968: 0xDBCB,
-	28228 - 19968: 0xDAB5,
-	28234 - 19968: 0xF1BE,
-	28237 - 19968: 0xD3AC,
-	28246 - 19968: 0xFBC9,
-	28248 - 19968: 0xDFCF,
-	28251 - 19968: 0xD3C0,
-	28252 - 19968: 0xE3D7,
-	28254 - 19968: 0xEFE6,
-	28255 - 19968: 0xFCD0,
-	28263 - 19968: 0xE9C0,
-	28267 - 19968: 0xF5D3,
-	28270 - 19968: 0xECDC,
-	28271 - 19968: 0xF7B7,
-	28274 - 19968: 0xEAB8,
-	28275 - 19968: 0xD1F9,
-	28282 - 19968: 0xDCC8,
-	28304 - 19968: 0xEAB9,
-	28310 - 19968: 0xF1DE,
-	28316 - 19968: 0xD7B6,
-	28317 - 19968: 0xCFB5,
-	28319 - 19968: 0xD9A8,
-	28322 - 19968: 0xECEE,
-	28325 - 19968: 0xDDAA,
-	28330 - 19968: 0xCDA2,
-	28331 - 19968: 0xE8AE,
-	28335 - 19968: 0xE1BD,
-	28337 - 19968: 0xF2D1,
-	28342 - 19968: 0xE9C1,
-	28346 - 19968: 0xD2FC,
-	28354 - 19968: 0xDBB5,
-	28356 - 19968: 0xF3E7,
-	28357 - 19968: 0xD8FE,
-	28361 - 19968: 0xFCD1,
-	28363 - 19968: 0xEDB2,
-	28364 - 19968: 0xF4AF,
-	28366 - 19968: 0xFBA3,
-	28369 - 19968: 0xFCC1,
-	28371 - 19968: 0xEEAB,
-	28372 - 19968: 0xD4A5,
-	28399 - 19968: 0xF4F2,
-	28404 - 19968: 0xEED9,
-	28408 - 19968: 0xFBCA,
-	28414 - 19968: 0xCDE3,
-	28415 - 19968: 0xD8BB,
-	28417 - 19968: 0xE5DB,
-	28418 - 19968: 0xF8F7,
-	28422 - 19968: 0xF6D4,
-	28431 - 19968: 0xD7A9,
-	28433 - 19968: 0xCBC9,
-	28436 - 19968: 0xE6D1,
-	28437 - 19968: 0xF0CC,
-	28448 - 19968: 0xD8AE,
-	28450 - 19968: 0xF9D3,
-	28451 - 19968: 0xD5FE,
-	28459 - 19968: 0xD8BC,
-	28460 - 19968: 0xF2B0,
-	28465 - 19968: 0xE2AB,
-	28466 - 19968: 0xF3E8,
-	28472 - 19968: 0xEFC2,
-	28479 - 19968: 0xEDEC,
-	28481 - 19968: 0xE7B8,
-	28497 - 19968: 0xDAFE,
-	28500 - 19968: 0xCCBE,
-	28503 - 19968: 0xF2FC,
-	28504 - 19968: 0xDAEB,
-	28506 - 19968: 0xE2D8,
-	28507 - 19968: 0xEDD6,
-	28510 - 19968: 0xD6D1,
-	28511 - 19968: 0xE0B3,
-	28514 - 19968: 0xFCD2,
-	28516 - 19968: 0xEBC8,
-	28525 - 19968: 0xD3C1,
-	28526 - 19968: 0xF0CD,
-	28528 - 19968: 0xCFF7,
-	28538 - 19968: 0xEDD2,
-	28540 - 19968: 0xD4D8,
-	28541 - 19968: 0xDCC9,
-	28542 - 19968: 0xD7F1,
-	28545 - 19968: 0xDFBB,
-	28548 - 19968: 0xF3A5,
-	28552 - 19968: 0xF4CD,
-	28557 - 19968: 0xF1BF,
-	28558 - 19968: 0xF8B1,
-	28560 - 19968: 0xE9FA,
-	28564 - 19968: 0xFBCB,
-	28567 - 19968: 0xCAD5,
-	28579 - 19968: 0xF9D4,
-	28580 - 19968: 0xF7CA,
-	28583 - 19968: 0xD6C8,
-	28590 - 19968: 0xFCE8,
-	28591 - 19968: 0xF3BD,
-	28593 - 19968: 0xEEFE,
-	28595 - 19968: 0xE7FE,
-	28601 - 19968: 0xD3C2,
-	28606 - 19968: 0xD3B6,
-	28608 - 19968: 0xCCAD,
-	28609 - 19968: 0xF6FA,
-	28610 - 19968: 0xD6B2,
-	28611 - 19968: 0xD2D8,
-	28618 - 19968: 0xE7D8,
-	28629 - 19968: 0xE3A5,
-	28634 - 19968: 0xE7B9,
-	28639 - 19968: 0xF0AD,
-	28640 - 19968: 0xFBCC,
-	28641 - 19968: 0xEBA1,
-	28644 - 19968: 0xD4A6,
-	28649 - 19968: 0xFBCD,
-	28651 - 19968: 0xD5BD,
-	28652 - 19968: 0xF1DF,
-	28655 - 19968: 0xF6FB,
-	28657 - 19968: 0xDEB4,
-	28670 - 19968: 0xD5EB,
-	28673 - 19968: 0xE5C8,
-	28677 - 19968: 0xFBA4,
-	28678 - 19968: 0xD4B9,
-	28681 - 19968: 0xDEE1,
-	28683 - 19968: 0xE4A3,
-	28687 - 19968: 0xD7B7,
-	28689 - 19968: 0xF8EE,
-	28693 - 19968: 0xDEB5,
-	28696 - 19968: 0xD6D2,
-	28698 - 19968: 0xF9D5,
-	28699 - 19968: 0xE7BA,
-	28700 - 19968: 0xEBD5,
-	28701 - 19968: 0xD5F7,
-	28702 - 19968: 0xEFE7,
-	28703 - 19968: 0xE1BE,
-	28707 - 19968: 0xFAAE,
-	28711 - 19968: 0xD6E9,
-	28712 - 19968: 0xD6EE,
-	28719 - 19968: 0xE7BB,
-	28727 - 19968: 0xECCB,
-	28734 - 19968: 0xD5B3,
-	28748 - 19968: 0xCEB4,
-	28752 - 19968: 0xFBA5,
-	28753 - 19968: 0xE1EE,
-	28760 - 19968: 0xF7A8,
-	28765 - 19968: 0xFBCE,
-	28771 - 19968: 0xD8BD,
-	28779 - 19968: 0xFBFD,
-	28784 - 19968: 0xFCE9,
-	28792 - 19968: 0xCFB6,
-	28796 - 19968: 0xEDC7,
-	28797 - 19968: 0xEEAC,
-	28805 - 19968: 0xCCDD,
-	28810 - 19968: 0xF6A7,
-	28814 - 19968: 0xE6FA,
-	28818 - 19968: 0xF5A4,
-	28824 - 19968: 0xFDDC,
-	28825 - 19968: 0xEDB3,
-	28826 - 19968: 0xCEC9,
-	28833 - 19968: 0xEFE8,
-	28836 - 19968: 0xE1BF,
-	28843 - 19968: 0xFADB,
-	28844 - 19968: 0xCBE3,
-	28845 - 19968: 0xF7A9,
-	28847 - 19968: 0xFBA6,
-	28851 - 19968: 0xDCB9,
-	28855 - 19968: 0xF1C0,
-	28856 - 19968: 0xEDC8,
-	28857 - 19968: 0xEFC3,
-	28872 - 19968: 0xD6AD,
-	28875 - 19968: 0xFDCE,
-	28879 - 19968: 0xE8A1,
-	28888 - 19968: 0xFBF4,
-	28889 - 19968: 0xD5A7,
-	28893 - 19968: 0xF1F6,
-	28895 - 19968: 0xE6D3,
-	28913 - 19968: 0xCCDE,
-	28921 - 19968: 0xF8B2,
-	28925 - 19968: 0xDCEB,
-	28932 - 19968: 0xFDB6,
-	28937 - 19968: 0xE5EA,
-	28940 - 19968: 0xF1E0,
-	28953 - 19968: 0xDBCC,
-	28954 - 19968: 0xDDCD,
-	28958 - 19968: 0xD4C8,
-	28961 - 19968: 0xD9ED,
-	28966 - 19968: 0xF5A5,
-	28976 - 19968: 0xE6FB,
-	28982 - 19968: 0xE6D4,
-	28999 - 19968: 0xFDC8,
-	29001 - 19968: 0xD6A1,
-	29002 - 19968: 0xFDBF,
-	29004 - 19968: 0xFCD3,
-	29006 - 19968: 0xEFA1,
-	29008 - 19968: 0xE7BC,
-	29014 - 19968: 0xD1EE,
-	29017 - 19968: 0xE6D5,
-	29020 - 19968: 0xE9F2,
-	29022 - 19968: 0xDFB0,
-	29028 - 19968: 0xD8E0,
-	29029 - 19968: 0xFCBA,
-	29030 - 19968: 0xFDAF,
-	29031 - 19968: 0xF0CE,
-	29033 - 19968: 0xDBE1,
-	29036 - 19968: 0xE5C9,
-	29038 - 19968: 0xEDB4,
-	29053 - 19968: 0xE0C3,
-	29060 - 19968: 0xE3D8,
-	29065 - 19968: 0xE9FB,
-	29066 - 19968: 0xEAA8,
-	29071 - 19968: 0xFDB7,
-	29074 - 19968: 0xFBA7,
-	29076 - 19968: 0xE9C2,
-	29081 - 19968: 0xFDF7,
-	29087 - 19968: 0xE2D9,
-	29090 - 19968: 0xDCEC,
-	29100 - 19968: 0xE8A2,
-	29105 - 19968: 0xE6F0,
-	29113 - 19968: 0xFDF8,
-	29114 - 19968: 0xFDF9,
-	29118 - 19968: 0xF6BF,
-	29121 - 19968: 0xE7A7,
-	29123 - 19968: 0xE6D7,
-	29128 - 19968: 0xD4F3,
-	29129 - 19968: 0xD4C9,
-	29134 - 19968: 0xD6FA,
-	29136 - 19968: 0xD7F2,
-	29138 - 19968: 0xE1C0,
-	29140 - 19968: 0xDBE2,
-	29141 - 19968: 0xE6D8,
-	29151 - 19968: 0xE7BD,
-	29157 - 19968: 0xF0CF,
-	29158 - 19968: 0xF3BE,
-	29159 - 19968: 0xE2AC,
-	29165 - 19968: 0xF5B7,
-	29166 - 19968: 0xE0F0,
-	29179 - 19968: 0xFDB8,
-	29180 - 19968: 0xE3E8,
-	29182 - 19968: 0xD4A7,
-	29183 - 19968: 0xE8FC,
-	29184 - 19968: 0xFAD2,
-	29190 - 19968: 0xF8EF,
-	29200 - 19968: 0xD6D3,
-	29211 - 19968: 0xD5B4,
-	29226 - 19968: 0xF0D0,
-	29228 - 19968: 0xF7F0,
-	29229 - 19968: 0xEEB3,
-	29232 - 19968: 0xEABA,
-	29234 - 19968: 0xEAD3,
-	29237 - 19968: 0xEDC9,
-	29238 - 19968: 0xDDAB,
-	29242 - 19968: 0xE5AC,
-	29243 - 19968: 0xFDA1,
-	29245 - 19968: 0xDFD0,
-	29246 - 19968: 0xECB3,
-	29248 - 19968: 0xDFD1,
-	29254 - 19968: 0xEDED,
-	29255 - 19968: 0xF8B8,
-	29256 - 19968: 0xF7FA,
-	29260 - 19968: 0xF8AB,
-	29266 - 19968: 0xF4E0,
-	29272 - 19968: 0xD4BA,
-	29273 - 19968: 0xE4B3,
-	29275 - 19968: 0xE9DA,
-	29277 - 19968: 0xDEB6,
-	29279 - 19968: 0xD9BF,
-	29281 - 19968: 0xD9C0,
-	29282 - 19968: 0xD6EF,
-	29287 - 19968: 0xD9CC,
-	29289 - 19968: 0xDAAA,
-	29298 - 19968: 0xDFE5,
-	29305 - 19968: 0xF7E5,
-	29309 - 19968: 0xCCB2,
-	29312 - 19968: 0xDFF9,
-	29313 - 19968: 0xD7E0,
-	29346 - 19968: 0xD4BB,
-	29351 - 19968: 0xFDFA,
-	29356 - 19968: 0xCCB3,
-	29359 - 19968: 0xDBF3,
-	29376 - 19968: 0xDFD2,
-	29378 - 19968: 0xCECA,
-	29380 - 19968: 0xEEDA,
-	29390 - 19968: 0xE4E4,
-	29392 - 19968: 0xFBCF,
-	29399 - 19968: 0xCFB7,
-	29401 - 19968: 0xEEC3,
-	29409 - 19968: 0xCEEA,
-	29417 - 19968: 0xE2AD,
-	29432 - 19968: 0xD7E1,
-	29433 - 19968: 0xFAF5,
-	29436 - 19968: 0xD5C9,
-	29437 - 19968: 0xF8AC,
-	29450 - 19968: 0xE7D9,
-	29462 - 19968: 0xF3E9,
-	29467 - 19968: 0xD8ED,
-	29468 - 19968: 0xE3C4,
-	29469 - 19968: 0xF0F1,
-	29477 - 19968: 0xE8E5,
-	29481 - 19968: 0xE0FA,
-	29482 - 19968: 0xEEC4,
-	29483 - 19968: 0xD9DE,
-	29494 - 19968: 0xEBA2,
-	29495 - 19968: 0xEBA3,
-	29502 - 19968: 0xFCC2,
-	29503 - 19968: 0xEABB,
-	29508 - 19968: 0xE8AB,
-	29509 - 19968: 0xDEE2,
-	29520 - 19968: 0xEDEF,
-	29522 - 19968: 0xE8A3,
-	29527 - 19968: 0xCFF1,
-	29544 - 19968: 0xD4BC,
-	29546 - 19968: 0xFCEA,
-	29552 - 19968: 0xE7BE,
-	29554 - 19968: 0xFCF2,
-	29557 - 19968: 0xD6B4,
-	29560 - 19968: 0xE2AE,
-	29562 - 19968: 0xD3B7,
-	29563 - 19968: 0xFACC,
-	29572 - 19968: 0xFADC,
-	29574 - 19968: 0xEDB5,
-	29575 - 19968: 0xE1E3,
-	29577 - 19968: 0xE8AC,
-	29579 - 19968: 0xE8DD,
-	29582 - 19968: 0xEFE9,
-	29588 - 19968: 0xF4BD,
-	29590 - 19968: 0xCFB8,
-	29591 - 19968: 0xE9DB,
-	29592 - 19968: 0xD1AC,
-	29599 - 19968: 0xDAC7,
-	29607 - 19968: 0xEBC9,
-	29609 - 19968: 0xE8CC,
-	29613 - 19968: 0xDEB7,
-	29618 - 19968: 0xD6BC,
-	29619 - 19968: 0xD3E5,
-	29625 - 19968: 0xFADD,
-	29632 - 19968: 0xDAD6,
-	29634 - 19968: 0xCAB1,
-	29641 - 19968: 0xDAC8,
-	29642 - 19968: 0xDFA6,
-	29644 - 19968: 0xF9B3,
-	29645 - 19968: 0xF2D2,
-	29647 - 19968: 0xCAC4,
-	29654 - 19968: 0xCECB,
-	29657 - 19968: 0xCDF5,
-	29661 - 19968: 0xFDB0,
-	29662 - 19968: 0xD5A8,
-	29664 - 19968: 0xF1C1,
-	29667 - 19968: 0xE2E9,
-	29668 - 19968: 0xDCCA,
-	29669 - 19968: 0xECB4,
-	29670 - 19968: 0xFAC0,
-	29673 - 19968: 0xFBA8,
-	29674 - 19968: 0xD0A8,
-	29677 - 19968: 0xDAEC,
-	29687 - 19968: 0xD9EE,
-	29689 - 19968: 0xE0FB,
-	29693 - 19968: 0xEFEA,
-	29694 - 19968: 0xFADE,
-	29697 - 19968: 0xE0C4,
-	29699 - 19968: 0xCFB9,
-	29701 - 19968: 0xD5CA,
-	29702 - 19968: 0xD7E2,
-	29703 - 19968: 0xE2AF,
-	29705 - 19968: 0xD7B8,
-	29715 - 19968: 0xE8CD,
-	29723 - 19968: 0xF6DA,
-	29728 - 19968: 0xEFA2,
-	29729 - 19968: 0xE2DA,
-	29730 - 19968: 0xF6FC,
-	29733 - 19968: 0xFBD0,
-	29734 - 19968: 0xD1AD,
-	29736 - 19968: 0xCDE4,
-	29738 - 19968: 0xD1AE,
-	29739 - 19968: 0xDCED,
-	29740 - 19968: 0xE8CE,
-	29742 - 19968: 0xF0F9,
-	29743 - 19968: 0xCEB5,
-	29744 - 19968: 0xE6FC,
-	29747 - 19968: 0xD7FB,
-	29748 - 19968: 0xD0D6,
-	29749 - 19968: 0xDDF5,
-	29750 - 19968: 0xF7F1,
-	29752 - 19968: 0xF6FD,
-	29754 - 19968: 0xDBF7,
-	29759 - 19968: 0xFBEA,
-	29760 - 19968: 0xE9DC,
-	29761 - 19968: 0xD9C1,
-	29763 - 19968: 0xF5F2,
-	29764 - 19968: 0xE0C5,
-	29771 - 19968: 0xEAD4,
-	29781 - 19968: 0xF9C2,
-	29783 - 19968: 0xEABC,
-	29785 - 19968: 0xD2C5,
-	29786 - 19968: 0xFBD1,
-	29787 - 19968: 0xE7C0,
-	29788 - 19968: 0xEBA5,
-	29790 - 19968: 0xDFFA,
-	29791 - 19968: 0xE3A2,
-	29792 - 19968: 0xD7B9,
-	29794 - 19968: 0xE9C3,
-	29796 - 19968: 0xE8FD,
-	29797 - 19968: 0xE8AF,
-	29800 - 19968: 0xF2D3,
-	29801 - 19968: 0xFBA9,
-	29802 - 19968: 0xD8A5,
-	29807 - 19968: 0xD5CB,
-	29822 - 19968: 0xD0C8,
-	29826 - 19968: 0xD1AF,
-	29827 - 19968: 0xD7E3,
-	29831 - 19968: 0xE0C6,
-	29833 - 19968: 0xD6A2,
-	29835 - 19968: 0xEDF0,
-	29848 - 19968: 0xD7F3,
-	29852 - 19968: 0xFCD4,
-	29854 - 19968: 0xDAD7,
-	29855 - 19968: 0xCCDF,
-	29857 - 19968: 0xF2D4,
-	29859 - 19968: 0xD1B0,
-	29861 - 19968: 0xCCE0,
-	29863 - 19968: 0xDBFD,
-	29864 - 19968: 0xF3BF,
-	29866 - 19968: 0xF0D1,
-	29872 - 19968: 0xFCBB,
-	29874 - 19968: 0xE2B0,
-	29877 - 19968: 0xE6A5,
-	29881 - 19968: 0xE2DB,
-	29885 - 19968: 0xDFDE,
-	29887 - 19968: 0xE0C7,
-	29894 - 19968: 0xF2EF,
-	29898 - 19968: 0xCCE1,
-	29903 - 19968: 0xD6EA,
-	29908 - 19968: 0xE7C2,
-	29912 - 19968: 0xCEB6,
-	29914 - 19968: 0xF3C0,
-	29916 - 19968: 0xCDFE,
-	29920 - 19968: 0xFBD2,
-	29922 - 19968: 0xF8F8,
-	29923 - 19968: 0xF7FB,
-	29926 - 19968: 0xE8BF,
-	29934 - 19968: 0xE8B7,
-	29943 - 19968: 0xEDB6,
-	29953 - 19968: 0xDCBA,
-	29956 - 19968: 0xCCB4,
-	29969 - 19968: 0xF1F7,
-	29973 - 19968: 0xE8B8,
-	29976 - 19968: 0xCAF6,
-	29978 - 19968: 0xE4A4,
-	29979 - 19968: 0xF4D6,
-	29983 - 19968: 0xDFE6,
-	29987 - 19968: 0xDFA7,
-	29989 - 19968: 0xDFE7,
-	29990 - 19968: 0xE1C1,
-	29992 - 19968: 0xE9C4,
-	29995 - 19968: 0xDCCB,
-	29996 - 19968: 0xE9C5,
-	30000 - 19968: 0xEFA3,
-	30001 - 19968: 0xEBA6,
-	30002 - 19968: 0xCBA3,
-	30003 - 19968: 0xE3E9,
-	30007 - 19968: 0xD1FB,
-	30008 - 19968: 0xEFA4,
-	30010 - 19968: 0xEFEB,
-	30023 - 19968: 0xD0B4,
-	30028 - 19968: 0xCDA3,
-	30031 - 19968: 0xE8E6,
-	30033 - 19968: 0xEFA5,
-	30035 - 19968: 0xD3CC,
-	30036 - 19968: 0xDAED,
-	30041 - 19968: 0xD7BA,
-	30043 - 19968: 0xF2D5,
-	30044 - 19968: 0xF5E5,
-	30045 - 19968: 0xD9EF,
-	30050 - 19968: 0xF9B4,
-	30053 - 19968: 0xD5D4,
-	30054 - 19968: 0xFDCF,
-	30058 - 19968: 0xDBE3,
-	30063 - 19968: 0xF1E1,
-	30064 - 19968: 0xECB6,
-	30069 - 19968: 0xFBFE,
-	30070 - 19968: 0xD3D7,
-	30072 - 19968: 0xD1B1,
-	30074 - 19968: 0xCBB1,
-	30079 - 19968: 0xD1B2,
-	30086 - 19968: 0xCBB2,
-	30087 - 19968: 0xF1C2,
-	30090 - 19968: 0xF4E1,
-	30091 - 19968: 0xF9B5,
-	30094 - 19968: 0xE1C3,
-	30095 - 19968: 0xE1C2,
-	30097 - 19968: 0xEBF7,
-	30109 - 19968: 0xDFA8,
-	30117 - 19968: 0xCBCA,
-	30123 - 19968: 0xE6B9,
-	30129 - 19968: 0xF8DE,
-	30130 - 19968: 0xF9AA,
-	30131 - 19968: 0xCAF7,
-	30133 - 19968: 0xEDB7,
-	30136 - 19968: 0xD3B8,
-	30137 - 19968: 0xF2D6,
-	30140 - 19968: 0xD4D9,
-	30141 - 19968: 0xEEC5,
-	30142 - 19968: 0xF2F0,
-	30146 - 19968: 0xCAB2,
-	30149 - 19968: 0xDCBB,
-	30151 - 19968: 0xF1F8,
-	30157 - 19968: 0xECB7,
-	30162 - 19968: 0xE5CA,
-	30164 - 19968: 0xF6C0,
-	30165 - 19968: 0xFDDD,
-	30168 - 19968: 0xD4E3,
-	30169 - 19968: 0xCCE2,
-	30171 - 19968: 0xF7D4,
-	30178 - 19968: 0xD7E5,
-	30192 - 19968: 0xD3C3,
-	30194 - 19968: 0xD8A6,
-	30196 - 19968: 0xF6C1,
-	30202 - 19968: 0xDDF6,
-	30204 - 19968: 0xCDC0,
-	30208 - 19968: 0xE5DC,
-	30221 - 19968: 0xE5CB,
-	30233 - 19968: 0xE1C4,
-	30239 - 19968: 0xE8B0,
-	30240 - 19968: 0xF4B0,
-	30241 - 19968: 0xF3EA,
-	30242 - 19968: 0xDAEE,
-	30244 - 19968: 0xD7BB,
-	30246 - 19968: 0xE2B1,
-	30267 - 19968: 0xD7AA,
-	30274 - 19968: 0xD6FB,
-	30284 - 19968: 0xE4DF,
-	30286 - 19968: 0xCAD6,
-	30290 - 19968: 0xEBA8,
-	30294 - 19968: 0xDBFE,
-	30305 - 19968: 0xF6C2,
-	30308 - 19968: 0xEFBB,
-	30313 - 19968: 0xD4FD,
-	30316 - 19968: 0xE0C8,
-	30320 - 19968: 0xE8B9,
-	30322 - 19968: 0xEFA6,
-	30328 - 19968: 0xCDA4,
-	30331 - 19968: 0xD4F4,
-	30332 - 19968: 0xDBA1,
-	30333 - 19968: 0xDBDC,
-	30334 - 19968: 0xDBDD,
-	30340 - 19968: 0xEEDC,
-	30342 - 19968: 0xCBCB,
-	30343 - 19968: 0xFCD5,
-	30350 - 19968: 0xCEEB,
-	30352 - 19968: 0xCDC1,
-	30355 - 19968: 0xFBD3,
-	30382 - 19968: 0xF9AB,
-	30394 - 19968: 0xF5D4,
-	30399 - 19968: 0xD9A9,
-	30402 - 19968: 0xE9DD,
-	30403 - 19968: 0xDBCD,
-	30406 - 19968: 0xDDCE,
-	30408 - 19968: 0xE7C3,
-	30410 - 19968: 0xECCC,
-	30418 - 19968: 0xF9EC,
-	30422 - 19968: 0xCBCC,
-	30427 - 19968: 0xE0FC,
-	30428 - 19968: 0xD4A8,
-	30430 - 19968: 0xEDD3,
-	30431 - 19968: 0xD8EF,
-	30433 - 19968: 0xF2D7,
-	30435 - 19968: 0xCAF8,
-	30436 - 19968: 0xDAEF,
-	30439 - 19968: 0xD6D4,
-	30446 - 19968: 0xD9CD,
-	30450 - 19968: 0xD8EE,
-	30452 - 19968: 0xF2C1,
-	30456 - 19968: 0xDFD3,
-	30460 - 19968: 0xDAF0,
-	30462 - 19968: 0xE2EA,
-	30465 - 19968: 0xE0FD,
-	30468 - 19968: 0xD8F8,
-	30472 - 19968: 0xF7AF,
-	30473 - 19968: 0xDAB6,
-	30475 - 19968: 0xCAD7,
-	30494 - 19968: 0xF2D8,
-	30496 - 19968: 0xD8F9,
-	30505 - 19968: 0xFADF,
-	30519 - 19968: 0xCFEF,
-	30520 - 19968: 0xD9C2,
-	30522 - 19968: 0xF0D2,
-	30524 - 19968: 0xE4D1,
-	30528 - 19968: 0xF3B7,
-	30541 - 19968: 0xFAE0,
-	30555 - 19968: 0xEFEC,
-	30561 - 19968: 0xE2B2,
-	30563 - 19968: 0xD4BD,
-	30566 - 19968: 0xD9CE,
-	30571 - 19968: 0xF4E2,
-	30585 - 19968: 0xD4A9,
-	30590 - 19968: 0xCDC2,
-	30591 - 19968: 0xE7DA,
-	30603 - 19968: 0xF2D9,
-	30609 - 19968: 0xD9AA,
-	30622 - 19968: 0xD8BE,
-	30629 - 19968: 0xDCAD,
-	30636 - 19968: 0xE2EB,
-	30637 - 19968: 0xD6FC,
-	30640 - 19968: 0xCAF9,
-	30643 - 19968: 0xD4DA,
-	30651 - 19968: 0xF4D7,
-	30652 - 19968: 0xCCA1,
-	30655 - 19968: 0xCFBA,
-	30679 - 19968: 0xF5B8,
-	30683 - 19968: 0xD9C3,
-	30684 - 19968: 0xD0E8,
-	30690 - 19968: 0xE3C5,
-	30691 - 19968: 0xEBF8,
-	30693 - 19968: 0xF2B1,
-	30697 - 19968: 0xCFBB,
-	30701 - 19968: 0xD3AD,
-	30702 - 19968: 0xE8E1,
-	30703 - 19968: 0xCEEC,
-	30707 - 19968: 0xE0B4,
-	30722 - 19968: 0xDEE3,
-	30738 - 19968: 0xDDF7,
-	30757 - 19968: 0xF2B2,
-	30758 - 19968: 0xF3F6,
-	30759 - 19968: 0xF6DB,
-	30764 - 19968: 0xD7FE,
-	30770 - 19968: 0xF8DF,
-	30772 - 19968: 0xF7F2,
-	30789 - 19968: 0xD0A9,
-	30799 - 19968: 0xE6DA,
-	30813 - 19968: 0xF5A6,
-	30827 - 19968: 0xD7BC,
-	30828 - 19968: 0xCCE3,
-	30831 - 19968: 0xE6DB,
-	30844 - 19968: 0xDDDD,
-	30849 - 19968: 0xD1B3,
-	30855 - 19968: 0xEFED,
-	30860 - 19968: 0xD6DE,
-	30861 - 19968: 0xE4F4,
-	30862 - 19968: 0xE1EF,
-	30865 - 19968: 0xDDF8,
-	30871 - 19968: 0xE8CF,
-	30883 - 19968: 0xCAE5,
-	30887 - 19968: 0xDCA1,
-	30889 - 19968: 0xE0B5,
-	30906 - 19968: 0xFCAC,
-	30907 - 19968: 0xFCAD,
-	30908 - 19968: 0xD8A7,
-	30913 - 19968: 0xEDB8,
-	30917 - 19968: 0xDBB6,
-	30922 - 19968: 0xD6F0,
-	30923 - 19968: 0xF3AF,
-	30926 - 19968: 0xCDA5,
-	30928 - 19968: 0xDAF1,
-	30952 - 19968: 0xD8A8,
-	30956 - 19968: 0xCCE4,
-	30959 - 19968: 0xD1B4,
-	30965 - 19968: 0xCAD8,
-	30971 - 19968: 0xDAF2,
-	30977 - 19968: 0xF5A7,
-	30990 - 19968: 0xF5A8,
-	30998 - 19968: 0xE6A6,
-	31018 - 19968: 0xD5EC,
-	31019 - 19968: 0xD5F8,
-	31020 - 19968: 0xDAF3,
-	31034 - 19968: 0xE3C6,
-	31038 - 19968: 0xDEE4,
-	31040 - 19968: 0xDEE5,
-	31041 - 19968: 0xD1B5,
-	31047 - 19968: 0xD1B6,
-	31048 - 19968: 0xD1B7,
-	31049 - 19968: 0xF2B3,
-	31056 - 19968: 0xE9DE,
-	31062 - 19968: 0xF0D3,
-	31063 - 19968: 0xF2B4,
-	31066 - 19968: 0xF0D4,
-	31067 - 19968: 0xCBE4,
-	31068 - 19968: 0xFBD4,
-	31069 - 19968: 0xF5E6,
-	31070 - 19968: 0xE3EA,
-	31072 - 19968: 0xDEE6,
-	31077 - 19968: 0xDFD4,
-	31080 - 19968: 0xF8F9,
-	31085 - 19968: 0xF0AE,
-	31098 - 19968: 0xD1B8,
-	31103 - 19968: 0xD6DF,
-	31105 - 19968: 0xD0D7,
-	31117 - 19968: 0xFCA1,
-	31118 - 19968: 0xEFEE,
-	31119 - 19968: 0xDCD8,
-	31121 - 19968: 0xE9DF,
-	31142 - 19968: 0xE5DD,
-	31143 - 19968: 0xFDFB,
-	31146 - 19968: 0xE0C9,
-	31150 - 19968: 0xD6C9,
-	31153 - 19968: 0xD4AA,
-	31155 - 19968: 0xE5CC,
-	31161 - 19968: 0xE9E0,
-	31165 - 19968: 0xD0D8,
-	31166 - 19968: 0xFCA2,
-	31167 - 19968: 0xD4BE,
-	31168 - 19968: 0xE2B3,
-	31169 - 19968: 0xDEE7,
-	31177 - 19968: 0xDCBC,
-	31178 - 19968: 0xD2B6,
-	31179 - 19968: 0xF5D5,
-	31185 - 19968: 0xCEA1,
-	31186 - 19968: 0xF5A9,
-	31189 - 19968: 0xDDF9,
-	31192 - 19968: 0xDDFA,
-	31199 - 19968: 0xF0D5,
-	31204 - 19968: 0xF6DF,
-	31206 - 19968: 0xF2DA,
-	31207 - 19968: 0xE4EB,
-	31209 - 19968: 0xF2F1,
-	31227 - 19968: 0xECB9,
-	31232 - 19968: 0xFDFC,
-	31237 - 19968: 0xE1AA,
-	31240 - 19968: 0xCAD9,
-	31243 - 19968: 0xEFEF,
-	31245 - 19968: 0xF5AA,
-	31252 - 19968: 0xECF9,
-	31255 - 19968: 0xF8AD,
-	31257 - 19968: 0xF2C2,
-	31258 - 19968: 0xF6C3,
-	31260 - 19968: 0xD7D2,
-	31263 - 19968: 0xF9A2,
-	31264 - 19968: 0xF0D6,
-	31278 - 19968: 0xF0FA,
-	31281 - 19968: 0xF6E0,
-	31286 - 19968: 0xE9F3,
-	31287 - 19968: 0xF2C3,
-	31291 - 19968: 0xD4AB,
-	31292 - 19968: 0xCAB3,
-	31293 - 19968: 0xCDA6,
-	31295 - 19968: 0xCDC3,
-	31296 - 19968: 0xCDDA,
-	31302 - 19968: 0xD9CF,
-	31305 - 19968: 0xF6C4,
-	31309 - 19968: 0xEEDD,
-	31310 - 19968: 0xE7C4,
-	31319 - 19968: 0xE2B4,
-	31329 - 19968: 0xDFE2,
-	31330 - 19968: 0xE7DB,
-	31337 - 19968: 0xE8B1,
-	31339 - 19968: 0xFCAE,
-	31344 - 19968: 0xE5CD,
-	31348 - 19968: 0xFAEB,
-	31350 - 19968: 0xCFBC,
-	31353 - 19968: 0xCFE2,
-	31354 - 19968: 0xCDF6,
-	31357 - 19968: 0xEFF0,
-	31359 - 19968: 0xF4BE,
-	31361 - 19968: 0xD4CD,
-	31364 - 19968: 0xF3B8,
-	31368 - 19968: 0xE9A1,
-	31378 - 19968: 0xF2F2,
-	31379 - 19968: 0xF3EB,
-	31381 - 19968: 0xF0D7,
-	31384 - 19968: 0xCFD7,
-	31391 - 19968: 0xCFDF,
-	31401 - 19968: 0xE8C0,
-	31402 - 19968: 0xE8C1,
-	31406 - 19968: 0xCFE3,
-	31407 - 19968: 0xE9A2,
-	31418 - 19968: 0xD0AA,
-	31428 - 19968: 0xF3C1,
-	31429 - 19968: 0xD0AB,
-	31431 - 19968: 0xD4E4,
-	31434 - 19968: 0xEFBC,
-	31435 - 19968: 0xD8A1,
-	31447 - 19968: 0xD9DF,
-	31449 - 19968: 0xF3D7,
-	31453 - 19968: 0xDCBD,
-	31455 - 19968: 0xCCE5,
-	31456 - 19968: 0xEDF1,
-	31459 - 19968: 0xF1E2,
-	31461 - 19968: 0xD4DB,
-	31466 - 19968: 0xE2B5,
-	31469 - 19968: 0xCAE6,
-	31471 - 19968: 0xD3AE,
-	31478 - 19968: 0xCCE6,
-	31481 - 19968: 0xF1D3,
-	31482 - 19968: 0xF5E7,
-	31487 - 19968: 0xCADA,
-	31503 - 19968: 0xFBEE,
-	31505 - 19968: 0xE1C5,
-	31513 - 19968: 0xDFE9,
-	31515 - 19968: 0xEEDE,
-	31518 - 19968: 0xF7C2,
-	31520 - 19968: 0xD8A2,
-	31526 - 19968: 0xDDAC,
-	31532 - 19968: 0xF0AF,
-	31533 - 19968: 0xD6BD,
-	31545 - 19968: 0xE1AB,
-	31558 - 19968: 0xF9B6,
-	31561 - 19968: 0xD4F5,
-	31563 - 19968: 0xD0C9,
-	31564 - 19968: 0xEFA7,
-	31565 - 19968: 0xE2EC,
-	31567 - 19968: 0xDBEA,
-	31568 - 19968: 0xCECC,
-	31569 - 19968: 0xF5E8,
-	31570 - 19968: 0xF7D5,
-	31572 - 19968: 0xD3CD,
-	31574 - 19968: 0xF3FE,
-	31584 - 19968: 0xD0B5,
-	31596 - 19968: 0xE0FE,
-	31598 - 19968: 0xDFFB,
-	31605 - 19968: 0xE6DD,
-	31613 - 19968: 0xE8A4,
-	31623 - 19968: 0xCBCD,
-	31627 - 19968: 0xEFA8,
-	31631 - 19968: 0xEEB4,
-	31636 - 19968: 0xDAD8,
-	31637 - 19968: 0xD1B9,
-	31639 - 19968: 0xDFA9,
-	31642 - 19968: 0xF3B0,
-	31645 - 19968: 0xCCC4,
-	31649 - 19968: 0xCEB7,
-	31661 - 19968: 0xEFA9,
-	31665 - 19968: 0xDFD5,
-	31668 - 19968: 0xEDD7,
-	31672 - 19968: 0xEEC6,
-	31680 - 19968: 0xEFBD,
-	31681 - 19968: 0xFCD6,
-	31684 - 19968: 0xDBF4,
-	31686 - 19968: 0xEFAA,
-	31687 - 19968: 0xF8B9,
-	31689 - 19968: 0xF5E9,
-	31698 - 19968: 0xE3D9,
-	31712 - 19968: 0xE1C6,
-	31716 - 19968: 0xD4BF,
-	31721 - 19968: 0xDEE8,
-	31751 - 19968: 0xF0EA,
-	31762 - 19968: 0xF3C2,
-	31774 - 19968: 0xD3AF,
-	31777 - 19968: 0xCADB,
-	31783 - 19968: 0xFCD7,
-	31786 - 19968: 0xEDD8,
-	31787 - 19968: 0xE1C7,
-	31805 - 19968: 0xF4D8,
-	31806 - 19968: 0xD6B3,
-	31807 - 19968: 0xDDAD,
-	31811 - 19968: 0xD5BE,
-	31820 - 19968: 0xF1C3,
-	31821 - 19968: 0xEEDF,
-	31840 - 19968: 0xD6EB,
-	31844 - 19968: 0xF4D9,
-	31852 - 19968: 0xD7E6,
-	31859 - 19968: 0xDAB7,
-	31875 - 19968: 0xDDFB,
-	31881 - 19968: 0xDDCF,
-	31890 - 19968: 0xD8A3,
-	31893 - 19968: 0xDAD9,
-	31895 - 19968: 0xF0D8,
-	31896 - 19968: 0xEFC4,
-	31903 - 19968: 0xE1D8,
-	31909 - 19968: 0xF1D4,
-	31911 - 19968: 0xEDF2,
-	31918 - 19968: 0xD5DB,
-	31921 - 19968: 0xD5DC,
-	31922 - 19968: 0xF3C4,
-	31923 - 19968: 0xCBD7,
-	31929 - 19968: 0xE2B6,
-	31934 - 19968: 0xEFF1,
-	31946 - 19968: 0xFBD5,
-	31958 - 19968: 0xD3D8,
-	31966 - 19968: 0xDDD0,
-	31967 - 19968: 0xF0D9,
-	31968 - 19968: 0xCBB3,
-	31975 - 19968: 0xD5DD,
-	31995 - 19968: 0xCDA7,
-	31998 - 19968: 0xD0AC,
-	32000 - 19968: 0xD1BA,
-	32002 - 19968: 0xF1C4,
-	32004 - 19968: 0xE5B3,
-	32005 - 19968: 0xFBF5,
-	32006 - 19968: 0xE9E1,
-	32007 - 19968: 0xFDE0,
-	32008 - 19968: 0xFCBC,
-	32010 - 19968: 0xDAA2,
-	32011 - 19968: 0xDAA3,
-	32013 - 19968: 0xD2A1,
-	32016 - 19968: 0xD2EF,
-	32020 - 19968: 0xE2ED,
-	32023 - 19968: 0xDEE9,
-	32024 - 19968: 0xCEDC,
-	32025 - 19968: 0xF2B5,
-	32026 - 19968: 0xD0E4,
-	32027 - 19968: 0xDDD1,
-	32032 - 19968: 0xE1C8,
-	32033 - 19968: 0xDBB7,
-	32034 - 19968: 0xDFE3,
-	32043 - 19968: 0xEDB9,
-	32044 - 19968: 0xF1C5,
-	32046 - 19968: 0xF3CF,
-	32047 - 19968: 0xD7AB,
-	32048 - 19968: 0xE1AC,
-	32051 - 19968: 0xE3EB,
-	32053 - 19968: 0xEEC7,
-	32057 - 19968: 0xE1C9,
-	32058 - 19968: 0xCAFA,
-	32066 - 19968: 0xF0FB,
-	32067 - 19968: 0xFAE1,
-	32068 - 19968: 0xF0DA,
-	32069 - 19968: 0xCCE7,
-	32070 - 19968: 0xDAF4,
-	32080 - 19968: 0xCCBF,
-	32094 - 19968: 0xCEED,
-	32097 - 19968: 0xD5A9,
-	32098 - 19968: 0xFAE2,
-	32102 - 19968: 0xD0E5,
-	32104 - 19968: 0xEBD6,
-	32106 - 19968: 0xECDF,
-	32110 - 19968: 0xDFFC,
-	32113 - 19968: 0xF7D6,
-	32114 - 19968: 0xDEEA,
-	32115 - 19968: 0xCBB4,
-	32118 - 19968: 0xEFBE,
-	32121 - 19968: 0xCCB5,
-	32127 - 19968: 0xCFBD,
-	32142 - 19968: 0xEFF2,
-	32143 - 19968: 0xE2B7,
-	32147 - 19968: 0xCCE8,
-	32156 - 19968: 0xF0FC,
-	32160 - 19968: 0xD6E0,
-	32162 - 19968: 0xF1C6,
-	32172 - 19968: 0xE2B8,
-	32173 - 19968: 0xEBAB,
-	32177 - 19968: 0xCBB5,
-	32178 - 19968: 0xD8D1,
-	32180 - 19968: 0xF4CE,
-	32181 - 19968: 0xF3F7,
-	32184 - 19968: 0xD7C6,
-	32186 - 19968: 0xD1BB,
-	32187 - 19968: 0xF7AA,
-	32189 - 19968: 0xEDCA,
-	32190 - 19968: 0xD7D3,
-	32191 - 19968: 0xD8FA,
-	32199 - 19968: 0xF6C5,
-	32202 - 19968: 0xD1CC,
-	32203 - 19968: 0xDDFC,
-	32214 - 19968: 0xDFFD,
-	32216 - 19968: 0xF9E5,
-	32218 - 19968: 0xE0CA,
-	32221 - 19968: 0xF2FD,
-	32222 - 19968: 0xD3B0,
-	32224 - 19968: 0xF4F3,
-	32225 - 19968: 0xDAC9,
-	32227 - 19968: 0xE6DE,
-	32232 - 19968: 0xF8BA,
-	32233 - 19968: 0xE8D0,
-	32236 - 19968: 0xD8FB,
-	32239 - 19968: 0xEAD5,
-	32244 - 19968: 0xD6A3,
-	32251 - 19968: 0xF6C6,
-	32265 - 19968: 0xF2DB,
-	32266 - 19968: 0xE4FC,
-	32277 - 19968: 0xE8B2,
-	32283 - 19968: 0xDADA,
-	32285 - 19968: 0xF2DC,
-	32286 - 19968: 0xFBD6,
-	32287 - 19968: 0xE9B2,
-	32289 - 19968: 0xEEAD,
-	32291 - 19968: 0xFAE3,
-	32299 - 19968: 0xDCEE,
-	32302 - 19968: 0xF5EA,
-	32303 - 19968: 0xE6E0,
-	32305 - 19968: 0xF0FD,
-	32311 - 19968: 0xD7AC,
-	32317 - 19968: 0xF5C5,
-	32318 - 19968: 0xEEE0,
-	32321 - 19968: 0xDBE5,
-	32323 - 19968: 0xDDDE,
-	32326 - 19968: 0xD9F0,
-	32327 - 19968: 0xE9A3,
-	32338 - 19968: 0xF1F9,
-	32340 - 19968: 0xF2C4,
-	32341 - 19968: 0xE0CB,
-	32350 - 19968: 0xE9A4,
-	32353 - 19968: 0xE2B9,
-	32361 - 19968: 0xE3B1,
-	32362 - 19968: 0xFCEB,
-	32363 - 19968: 0xCDA8,
-	32365 - 19968: 0xCCB6,
-	32368 - 19968: 0xF0DB,
-	32377 - 19968: 0xE6BA,
-	32380 - 19968: 0xCDA9,
-	32386 - 19968: 0xF3C3,
-	32396 - 19968: 0xE1D9,
-	32399 - 19968: 0xEFAB,
-	32403 - 19968: 0xE7C5,
-	32406 - 19968: 0xE0E9,
-	32408 - 19968: 0xF3C5,
-	32411 - 19968: 0xD4C0,
-	32412 - 19968: 0xD5BF,
-	32566 - 19968: 0xDDAE,
-	32568 - 19968: 0xF9FC,
-	32570 - 19968: 0xCCC0,
-	32588 - 19968: 0xE5A2,
-	32592 - 19968: 0xCEB8,
-	32596 - 19968: 0xD8D2,
-	32597 - 19968: 0xF9D6,
-	32618 - 19968: 0xF1AA,
-	32619 - 19968: 0xCED1,
-	32622 - 19968: 0xF6C7,
-	32624 - 19968: 0xDBEB,
-	32626 - 19968: 0xDFFE,
-	32629 - 19968: 0xD8E1,
-	32631 - 19968: 0xF7F3,
-	32633 - 19968: 0xD7E7,
-	32645 - 19968: 0xD4FE,
-	32648 - 19968: 0xD1BC,
-	32650 - 19968: 0xE5CF,
-	32652 - 19968: 0xCBB6,
-	32654 - 19968: 0xDAB8,
-	32660 - 19968: 0xCDC4,
-	32666 - 19968: 0xD6BE,
-	32670 - 19968: 0xE2BA,
-	32676 - 19968: 0xCFD8,
-	32680 - 19968: 0xE0CC,
-	32681 - 19968: 0xEBF9,
-	32690 - 19968: 0xFDFD,
-	32696 - 19968: 0xD7E8,
-	32697 - 19968: 0xCBD8,
-	32701 - 19968: 0xE9E2,
-	32705 - 19968: 0xE8BA,
-	32709 - 19968: 0xE3C7,
-	32714 - 19968: 0xECCD,
-	32716 - 19968: 0xECCE,
-	32718 - 19968: 0xD6BF,
-	32722 - 19968: 0xE3A7,
-	32724 - 19968: 0xDFD6,
-	32725 - 19968: 0xFDE8,
-	32735 - 19968: 0xEEE1,
-	32736 - 19968: 0xF6A8,
-	32737 - 19968: 0xDDFD,
-	32745 - 19968: 0xF8BB,
-	32747 - 19968: 0xE8D1,
-	32752 - 19968: 0xF9D7,
-	32761 - 19968: 0xCEEE,
-	32764 - 19968: 0xECCF,
-	32768 - 19968: 0xE9A5,
-	32769 - 19968: 0xD6D5,
-	32771 - 19968: 0xCDC5,
-	32773 - 19968: 0xEDBA,
-	32774 - 19968: 0xD1BD,
-	32777 - 19968: 0xCFBE,
-	32780 - 19968: 0xECBB,
-	32784 - 19968: 0xD2B1,
-	32789 - 19968: 0xCCE9,
-	32791 - 19968: 0xD9C4,
-	32792 - 19968: 0xE9FC,
-	32813 - 19968: 0xD1BE,
-	32819 - 19968: 0xECBC,
-	32822 - 19968: 0xE5AD,
-	32829 - 19968: 0xF7B0,
-	32831 - 19968: 0xCCEA,
-	32835 - 19968: 0xD3C4,
-	32838 - 19968: 0xD6C0,
-	32842 - 19968: 0xD6FD,
-	32854 - 19968: 0xE1A1,
-	32856 - 19968: 0xDEBD,
-	32858 - 19968: 0xF6A9,
-	32862 - 19968: 0xDAA4,
-	32879 - 19968: 0xD6A4,
-	32880 - 19968: 0xF5C6,
-	32882 - 19968: 0xE1A2,
-	32883 - 19968: 0xE9C6,
-	32887 - 19968: 0xF2C5,
-	32893 - 19968: 0xF4E9,
-	32894 - 19968: 0xD6EC,
-	32895 - 19968: 0xEBD3,
-	32900 - 19968: 0xECBD,
-	32901 - 19968: 0xE2DC,
-	32902 - 19968: 0xDEEB,
-	32903 - 19968: 0xF0DC,
-	32905 - 19968: 0xEBBF,
-	32907 - 19968: 0xD7CE,
-	32908 - 19968: 0xD1BF,
-	32918 - 19968: 0xF5AB,
-	32923 - 19968: 0xF9FD,
-	32925 - 19968: 0xCADC,
-	32929 - 19968: 0xCDC6,
-	32930 - 19968: 0xF2B6,
-	32933 - 19968: 0xDDFE,
-	32937 - 19968: 0xCCB7,
-	32938 - 19968: 0xDBB8,
-	32943 - 19968: 0xD0E9,
-	32945 - 19968: 0xCEDD,
-	32946 - 19968: 0xEBC0,
-	32948 - 19968: 0xFDA2,
-	32954 - 19968: 0xF8CB,
-	32963 - 19968: 0xEAD6,
-	32964 - 19968: 0xF1B0,
-	32972 - 19968: 0xDBCE,
-	32974 - 19968: 0xF7C3,
-	32986 - 19968: 0xDBCF,
-	32987 - 19968: 0xCBA4,
-	32990 - 19968: 0xF8E0,
-	32993 - 19968: 0xFBD7,
-	32996 - 19968: 0xEBCA,
-	32997 - 19968: 0xE0A1,
-	33009 - 19968: 0xCECD,
-	33012 - 19968: 0xD4DC,
-	33016 - 19968: 0xFDD8,
-	33021 - 19968: 0xD2F6,
-	33026 - 19968: 0xF2B7,
-	33029 - 19968: 0xFAF6,
-	33030 - 19968: 0xF6AA,
-	33031 - 19968: 0xFAF7,
-	33032 - 19968: 0xD8E6,
-	33034 - 19968: 0xF4B1,
-	33048 - 19968: 0xE8D2,
-	33050 - 19968: 0xCAC5,
-	33051 - 19968: 0xCCEB,
-	33059 - 19968: 0xE2EE,
-	33065 - 19968: 0xE2BB,
-	33067 - 19968: 0xF7AD,
-	33071 - 19968: 0xF8E1,
-	33081 - 19968: 0xF3EC,
-	33086 - 19968: 0xDEA1,
-	33099 - 19968: 0xE4FD,
-	33102 - 19968: 0xE3EC,
-	33104 - 19968: 0xDDAF,
-	33105 - 19968: 0xDDB0,
-	33108 - 19968: 0xCBB7,
-	33109 - 19968: 0xE8D3,
-	33125 - 19968: 0xE1A3,
-	33126 - 19968: 0xD2E0,
-	33131 - 19968: 0xF0FE,
-	33136 - 19968: 0xE9A6,
-	33137 - 19968: 0xCBF2,
-	33144 - 19968: 0xEDF3,
-	33145 - 19968: 0xDCD9,
-	33146 - 19968: 0xE0CD,
-	33151 - 19968: 0xF7DA,
-	33152 - 19968: 0xDBB9,
-	33160 - 19968: 0xCCAE,
-	33162 - 19968: 0xDADB,
-	33167 - 19968: 0xCDC7,
-	33178 - 19968: 0xDDB1,
-	33180 - 19968: 0xD8AF,
-	33181 - 19968: 0xE3A3,
-	33184 - 19968: 0xCEEF,
-	33187 - 19968: 0xF2F3,
-	33192 - 19968: 0xF8B3,
-	33203 - 19968: 0xE0CE,
-	33205 - 19968: 0xF5FD,
-	33210 - 19968: 0xEBEC,
-	33213 - 19968: 0xD3C5,
-	33214 - 19968: 0xFCEC,
-	33215 - 19968: 0xD2DB,
-	33216 - 19968: 0xD4EB,
-	33218 - 19968: 0xDEA2,
-	33222 - 19968: 0xE5E6,
-	33229 - 19968: 0xF0B0,
-	33240 - 19968: 0xD5C4,
-	33247 - 19968: 0xEDF4,
-	33251 - 19968: 0xE3ED,
-	33253 - 19968: 0xE8C2,
-	33255 - 19968: 0xEDF5,
-	33256 - 19968: 0xD7FC,
-	33258 - 19968: 0xEDBB,
-	33261 - 19968: 0xF6AB,
-	33267 - 19968: 0xF2B8,
-	33268 - 19968: 0xF6C8,
-	33274 - 19968: 0xD3E6,
-	33275 - 19968: 0xF2DD,
-	33276 - 19968: 0xCFBF,
-	33278 - 19968: 0xEBAC,
-	33285 - 19968: 0xCFC0,
-	33287 - 19968: 0xE6A8,
-	33288 - 19968: 0xFDE9,
-	33290 - 19968: 0xCFC1,
-	33292 - 19968: 0xE0DF,
-	33293 - 19968: 0xDEEC,
-	33298 - 19968: 0xE0A2,
-	33307 - 19968: 0xF4BF,
-	33308 - 19968: 0xE2EF,
-	33310 - 19968: 0xD9F1,
-	33311 - 19968: 0xF1C7,
-	33313 - 19968: 0xCBB8,
-	33322 - 19968: 0xF9FE,
-	33323 - 19968: 0xDBBA,
-	33324 - 19968: 0xDAF5,
-	33333 - 19968: 0xF6EC,
-	33334 - 19968: 0xDADC,
-	33335 - 19968: 0xFAE4,
-	33337 - 19968: 0xE0CF,
-	33344 - 19968: 0xDDB2,
-	33349 - 19968: 0xE6A9,
-	33351 - 19968: 0xEFF3,
-	33369 - 19968: 0xF3ED,
-	33380 - 19968: 0xEBFA,
-	33382 - 19968: 0xF9E6,
-	33390 - 19968: 0xCADD,
-	33391 - 19968: 0xD5DE,
-	33393 - 19968: 0xCADE,
-	33394 - 19968: 0xDFE4,
-	33398 - 19968: 0xE6FD,
-	33400 - 19968: 0xF5AC,
-	33406 - 19968: 0xE4F5,
-	33419 - 19968: 0xE9E3,
-	33421 - 19968: 0xEDCB,
-	33422 - 19968: 0xCFE4,
-	33426 - 19968: 0xD8D3,
-	33433 - 19968: 0xDDB3,
-	33434 - 19968: 0xD4EC,
-	33437 - 19968: 0xF2B9,
-	33439 - 19968: 0xDFB7,
-	33445 - 19968: 0xCBCE,
-	33446 - 19968: 0xFBD8,
-	33449 - 19968: 0xD0D9,
-	33452 - 19968: 0xDDD2,
-	33453 - 19968: 0xF7F4,
-	33454 - 19968: 0xE7DC,
-	33455 - 19968: 0xE4A5,
-	33457 - 19968: 0xFCA3,
-	33459 - 19968: 0xDBBB,
-	33463 - 19968: 0xF2BA,
-	33464 - 19968: 0xE9FD,
-	33465 - 19968: 0xD0CA,
-	33467 - 19968: 0xF5D6,
-	33468 - 19968: 0xD9C5,
-	33469 - 19968: 0xE4B4,
-	33471 - 19968: 0xEDA7,
-	33489 - 19968: 0xEABD,
-	33490 - 19968: 0xE6FE,
-	33492 - 19968: 0xF7C4,
-	33493 - 19968: 0xF5AD,
-	33495 - 19968: 0xD9E0,
-	33499 - 19968: 0xCAB4,
-	33502 - 19968: 0xF8E2,
-	33503 - 19968: 0xCFC2,
-	33505 - 19968: 0xECBE,
-	33509 - 19968: 0xE5B4,
-	33510 - 19968: 0xCDC8,
-	33511 - 19968: 0xEEC8,
-	33521 - 19968: 0xE7C8,
-	33533 - 19968: 0xCDC9,
-	33534 - 19968: 0xF9B7,
-	33537 - 19968: 0xF1E8,
-	33538 - 19968: 0xD9F2,
-	33539 - 19968: 0xDBF5,
-	33540 - 19968: 0xCAB5,
-	33541 - 19968: 0xD9C6,
-	33545 - 19968: 0xD8C9,
-	33559 - 19968: 0xD9AB,
-	33576 - 19968: 0xEDBC,
-	33579 - 19968: 0xD8D4,
-	33583 - 19968: 0xDCDA,
-	33585 - 19968: 0xE2BC,
-	33588 - 19968: 0xFCED,
-	33589 - 19968: 0xECE0,
-	33590 - 19968: 0xD2FE,
-	33592 - 19968: 0xE9C7,
-	33593 - 19968: 0xE6AA,
-	33600 - 19968: 0xE2F0,
-	33607 - 19968: 0xFABB,
-	33609 - 19968: 0xF5AE,
-	33610 - 19968: 0xFBAA,
-	33615 - 19968: 0xECFB,
-	33617 - 19968: 0xECBF,
-	33618 - 19968: 0xFCD8,
-	33651 - 19968: 0xD4E5,
-	33655 - 19968: 0xF9C3,
-	33659 - 19968: 0xEEE2,
-	33673 - 19968: 0xD7E9,
-	33674 - 19968: 0xEDF6,
-	33678 - 19968: 0xDEED,
-	33686 - 19968: 0xCCEC,
-	33688 - 19968: 0xE3EE,
-	33694 - 19968: 0xE8D4,
-	33698 - 19968: 0xFAF8,
-	33705 - 19968: 0xDDB4,
-	33706 - 19968: 0xE4B5,
-	33707 - 19968: 0xD8B0,
-	33725 - 19968: 0xD8D5,
-	33729 - 19968: 0xF4EA,
-	33733 - 19968: 0xCEB9,
-	33737 - 19968: 0xD6E1,
-	33738 - 19968: 0xCFD2,
-	33740 - 19968: 0xD0B6,
-	33747 - 19968: 0xCEA2,
-	33750 - 19968: 0xF3EE,
-	33756 - 19968: 0xF3F8,
-	33769 - 19968: 0xDCCC,
-	33771 - 19968: 0xD0CB,
-	33775 - 19968: 0xFCA4,
-	33776 - 19968: 0xCDCA,
-	33777 - 19968: 0xD7D4,
-	33778 - 19968: 0xDEA3,
-	33780 - 19968: 0xE4E0,
-	33785 - 19968: 0xEEC9,
-	33789 - 19968: 0xE2DD,
-	33795 - 19968: 0xF5FE,
-	33796 - 19968: 0xD4AC,
-	33802 - 19968: 0xD5D1,
-	33804 - 19968: 0xD8F0,
-	33805 - 19968: 0xF8C3,
-	33806 - 19968: 0xEAD7,
-	33833 - 19968: 0xF5D7,
-	33836 - 19968: 0xD8BF,
-	33841 - 19968: 0xFDC0,
-	33848 - 19968: 0xEBAD,
-	33853 - 19968: 0xD5AA,
-	33865 - 19968: 0xE7A8,
-	33879 - 19968: 0xEECA,
-	33883 - 19968: 0xCAE7,
-	33889 - 19968: 0xF8E3,
-	33891 - 19968: 0xD4DD,
-	33894 - 19968: 0xEAD8,
-	33899 - 19968: 0xFBD9,
-	33900 - 19968: 0xEDF7,
-	33903 - 19968: 0xE5B5,
-	33909 - 19968: 0xD0AD,
-	33914 - 19968: 0xF1F1,
-	33936 - 19968: 0xE2BD,
-	33940 - 19968: 0xE3C8,
-	33945 - 19968: 0xD9D5,
-	33948 - 19968: 0xDFAA,
-	33953 - 19968: 0xDBBC,
-	33970 - 19968: 0xF8E4,
-	33976 - 19968: 0xF1FA,
-	33979 - 19968: 0xE5B6,
-	33980 - 19968: 0xF3EF,
-	33983 - 19968: 0xFBDA,
-	33984 - 19968: 0xE1E0,
-	33986 - 19968: 0xD9AC,
-	33988 - 19968: 0xF5EB,
-	33990 - 19968: 0xE0B6,
-	33993 - 19968: 0xE9C8,
-	33995 - 19968: 0xCBCF,
-	33997 - 19968: 0xE3C9,
-	34001 - 19968: 0xDEEE,
-	34010 - 19968: 0xE2BE,
-	34028 - 19968: 0xDCEF,
-	34030 - 19968: 0xD6A5,
-	34036 - 19968: 0xE2F1,
-	34044 - 19968: 0xD6FE,
-	34065 - 19968: 0xD9A1,
-	34067 - 19968: 0xD8C0,
-	34068 - 19968: 0xDCDB,
-	34071 - 19968: 0xEDBD,
-	34072 - 19968: 0xDFB8,
-	34074 - 19968: 0xEAA5,
-	34078 - 19968: 0xD7AD,
-	34081 - 19968: 0xF3F9,
-	34083 - 19968: 0xEDF8,
-	34085 - 19968: 0xF5C7,
-	34092 - 19968: 0xE1CA,
-	34093 - 19968: 0xEBE3,
-	34095 - 19968: 0xF2DE,
-	34109 - 19968: 0xF8CC,
-	34111 - 19968: 0xEAD9,
-	34113 - 19968: 0xD3C6,
-	34115 - 19968: 0xDBE6,
-	34121 - 19968: 0xF5AF,
-	34126 - 19968: 0xCEF0,
-	34131 - 19968: 0xE9FE,
-	34137 - 19968: 0xFBB6,
-	34147 - 19968: 0xE2F2,
-	34152 - 19968: 0xCFF2,
-	34153 - 19968: 0xF7B9,
-	34154 - 19968: 0xD9F3,
-	34157 - 19968: 0xE1CB,
-	34180 - 19968: 0xDADD,
-	34183 - 19968: 0xDAB9,
-	34191 - 19968: 0xEBFB,
-	34193 - 19968: 0xCBB9,
-	34196 - 19968: 0xEDF9,
-	34203 - 19968: 0xE0E0,
-	34214 - 19968: 0xF4C0,
-	34216 - 19968: 0xFDBC,
-	34217 - 19968: 0xDFB1,
-	34218 - 19968: 0xE3EF,
-	34223 - 19968: 0xE0A3,
-	34224 - 19968: 0xFDB9,
-	34234 - 19968: 0xF0B1,
-	34241 - 19968: 0xCDCB,
-	34249 - 19968: 0xEDBE,
-	34253 - 19968: 0xD5C0,
-	34254 - 19968: 0xE3F0,
-	34255 - 19968: 0xEDFA,
-	34261 - 19968: 0xE9E4,
-	34268 - 19968: 0xD5ED,
-	34269 - 19968: 0xE7DD,
-	34276 - 19968: 0xD4F6,
-	34277 - 19968: 0xE5B7,
-	34281 - 19968: 0xDBE7,
-	34282 - 19968: 0xE2BF,
-	34295 - 19968: 0xEECB,
-	34298 - 19968: 0xD7F4,
-	34299 - 19968: 0xF0DD,
-	34303 - 19968: 0xCEAB,
-	34306 - 19968: 0xE7DE,
-	34310 - 19968: 0xD6D6,
-	34311 - 19968: 0xE1CC,
-	34314 - 19968: 0xE8B3,
-	34326 - 19968: 0xE5EE,
-	34327 - 19968: 0xDCA2,
-	34330 - 19968: 0xE0D0,
-	34349 - 19968: 0xD5B5,
-	34367 - 19968: 0xD5A1,
-	34382 - 19968: 0xFBDB,
-	34384 - 19968: 0xF9CB,
-	34388 - 19968: 0xCBF3,
-	34389 - 19968: 0xF4A5,
-	34395 - 19968: 0xFAC8,
-	34396 - 19968: 0xD6D7,
-	34398 - 19968: 0xE9E5,
-	34399 - 19968: 0xFBDC,
-	34407 - 19968: 0xFDD0,
-	34425 - 19968: 0xFBF6,
-	34442 - 19968: 0xDAA5,
-	34444 - 19968: 0xDBBD,
-	34451 - 19968: 0xECE2,
-	34467 - 19968: 0xCDF7,
-	34468 - 19968: 0xF0DE,
-	34473 - 19968: 0xF6C9,
-	34503 - 19968: 0xDEEF,
-	34507 - 19968: 0xD3B1,
-	34516 - 19968: 0xFCEE,
-	34521 - 19968: 0xE8C3,
-	34523 - 19968: 0xF1C8,
-	34527 - 19968: 0xCEF1,
-	34532 - 19968: 0xF9ED,
-	34541 - 19968: 0xF2F4,
-	34558 - 19968: 0xE4B6,
-	34560 - 19968: 0xF5B9,
-	34562 - 19968: 0xDCF0,
-	34563 - 19968: 0xE3F1,
-	34568 - 19968: 0xE8A5,
-	34584 - 19968: 0xF2BB,
-	34586 - 19968: 0xDEA4,
-	34588 - 19968: 0xDACC,
-	34638 - 19968: 0xCAE9,
-	34645 - 19968: 0xE3DA,
-	34647 - 19968: 0xFCD9,
-	34655 - 19968: 0xEADA,
-	34662 - 19968: 0xF9C4,
-	34664 - 19968: 0xE3A4,
-	34676 - 19968: 0xFBDD,
-	34678 - 19968: 0xEFCA,
-	34680 - 19968: 0xE8C4,
-	34690 - 19968: 0xD5CC,
-	34701 - 19968: 0xEBD7,
-	34719 - 19968: 0xD9AD,
-	34722 - 19968: 0xFBAB,
-	34739 - 19968: 0xD3D9,
-	34746 - 19968: 0xD5A2,
-	34756 - 19968: 0xF6DE,
-	34784 - 19968: 0xDAF6,
-	34796 - 19968: 0xE0D1,
-	34799 - 19968: 0xE9A8,
-	34802 - 19968: 0xF5F9,
-	34809 - 19968: 0xFAAF,
-	34811 - 19968: 0xEBFC,
-	34814 - 19968: 0xE0EA,
-	34821 - 19968: 0xE3B2,
-	34847 - 19968: 0xD5C5,
-	34850 - 19968: 0xF1E3,
-	34851 - 19968: 0xD5EE,
-	34865 - 19968: 0xCDCC,
-	34870 - 19968: 0xEDD9,
-	34875 - 19968: 0xD8C1,
-	34880 - 19968: 0xFAEC,
-	34886 - 19968: 0xF1EB,
-	34892 - 19968: 0xFABC,
-	34893 - 19968: 0xE6E2,
-	34898 - 19968: 0xFAE5,
-	34899 - 19968: 0xE2FA,
-	34903 - 19968: 0xCAB6,
-	34905 - 19968: 0xE4B7,
-	34907 - 19968: 0xEADB,
-	34909 - 19968: 0xF5FA,
-	34913 - 19968: 0xFBAC,
-	34914 - 19968: 0xCFC3,
-	34915 - 19968: 0xEBFD,
-	34920 - 19968: 0xF8FA,
-	34923 - 19968: 0xDFB9,
-	34928 - 19968: 0xE1F1,
-	34930 - 19968: 0xD2A4,
-	34935 - 19968: 0xF5FB,
-	34942 - 19968: 0xD0DA,
-	34943 - 19968: 0xD0DB,
-	34945 - 19968: 0xEABE,
-	34946 - 19968: 0xD9B1,
-	34952 - 19968: 0xCAB7,
-	34955 - 19968: 0xD3E7,
-	34957 - 19968: 0xF8E5,
-	34962 - 19968: 0xD3B2,
-	34966 - 19968: 0xE2C0,
-	34967 - 19968: 0xF2DF,
-	34974 - 19968: 0xCDE5,
-	34987 - 19968: 0xF9AC,
-	34996 - 19968: 0xCDCD,
-	35009 - 19968: 0xEEAE,
-	35010 - 19968: 0xD6AE,
-	35023 - 19968: 0xD7EA,
-	35028 - 19968: 0xE7E0,
-	35029 - 19968: 0xEBAE,
-	35033 - 19968: 0xCFD9,
-	35036 - 19968: 0xDCCD,
-	35037 - 19968: 0xEDFB,
-	35039 - 19968: 0xDEF0,
-	35041 - 19968: 0xD7EB,
-	35048 - 19968: 0xDEA5,
-	35059 - 19968: 0xDFD7,
-	35060 - 19968: 0xDBD0,
-	35061 - 19968: 0xDBD1,
-	35064 - 19968: 0xD5A3,
-	35069 - 19968: 0xF0B2,
-	35079 - 19968: 0xDCDC,
-	35088 - 19968: 0xCAE8,
-	35090 - 19968: 0xF8E6,
-	35091 - 19968: 0xDCCE,
-	35096 - 19968: 0xEADC,
-	35097 - 19968: 0xDBD2,
-	35109 - 19968: 0xE9B3,
-	35114 - 19968: 0xF7DB,
-	35126 - 19968: 0xE3A8,
-	35128 - 19968: 0xD7AE,
-	35131 - 19968: 0xE0E1,
-	35137 - 19968: 0xCBBA,
-	35140 - 19968: 0xE5D1,
-	35167 - 19968: 0xD0DC,
-	35172 - 19968: 0xD5C1,
-	35178 - 19968: 0xD8CA,
-	35186 - 19968: 0xE3A9,
-	35199 - 19968: 0xE0A4,
-	35201 - 19968: 0xE9A9,
-	35203 - 19968: 0xD3C7,
-	35206 - 19968: 0xDCDD,
-	35207 - 19968: 0xF8AE,
-	35211 - 19968: 0xCCB8,
-	35215 - 19968: 0xD0AE,
-	35219 - 19968: 0xD8F2,
-	35222 - 19968: 0xE3CA,
-	35233 - 19968: 0xCCAF,
-	35241 - 19968: 0xD4AD,
-	35242 - 19968: 0xF6D1,
-	35250 - 19968: 0xD0CC,
-	35258 - 19968: 0xCAC6,
-	35261 - 19968: 0xD5C2,
-	35264 - 19968: 0xCEBA,
-	35282 - 19968: 0xCAC7,
-	35299 - 19968: 0xFAB0,
-	35316 - 19968: 0xDFD8,
-	35320 - 19968: 0xF5BA,
-	35328 - 19968: 0xE5EB,
-	35330 - 19968: 0xEFF4,
-	35331 - 19968: 0xDDB5,
-	35336 - 19968: 0xCDAA,
-	35338 - 19968: 0xE3F2,
-	35340 - 19968: 0xFBF7,
-	35342 - 19968: 0xF7D0,
-	35347 - 19968: 0xFDBA,
-	35350 - 19968: 0xFDE1,
-	35351 - 19968: 0xF6FE,
-	35352 - 19968: 0xD1C0,
-	35355 - 19968: 0xE8C5,
-	35357 - 19968: 0xE4B8,
-	35359 - 19968: 0xE1E8,
-	35363 - 19968: 0xCCC1,
-	35365 - 19968: 0xD2ED,
-	35370 - 19968: 0xDBBE,
-	35373 - 19968: 0xE0E2,
-	35377 - 19968: 0xFAC9,
-	35380 - 19968: 0xE1CD,
-	35382 - 19968: 0xCAB8,
-	35386 - 19968: 0xF2E0,
-	35387 - 19968: 0xF1C9,
-	35408 - 19968: 0xDEF1,
-	35412 - 19968: 0xF0DF,
-	35413 - 19968: 0xF8C4,
-	35419 - 19968: 0xEECC,
-	35422 - 19968: 0xDEF2,
-	35424 - 19968: 0xE7C9,
-	35426 - 19968: 0xE2F3,
-	35427 - 19968: 0xE7E1,
-	35430 - 19968: 0xE3CB,
-	35433 - 19968: 0xE3CC,
-	35437 - 19968: 0xCFF8,
-	35438 - 19968: 0xEFAC,
-	35440 - 19968: 0xFDFE,
-	35441 - 19968: 0xFCA5,
-	35442 - 19968: 0xFAB1,
-	35443 - 19968: 0xDFD9,
-	35445 - 19968: 0xE0D2,
-	35449 - 19968: 0xF4DA,
-	35461 - 19968: 0xF1CA,
-	35463 - 19968: 0xCEA3,
-	35468 - 19968: 0xF2BC,
-	35469 - 19968: 0xECE3,
-	35475 - 19968: 0xE0A5,
-	35477 - 19968: 0xF7AB,
-	35480 - 19968: 0xEBAF,
-	35486 - 19968: 0xE5DE,
-	35488 - 19968: 0xE1A4,
-	35489 - 19968: 0xCDAB,
-	35491 - 19968: 0xD9F4,
-	35492 - 19968: 0xE8A6,
-	35493 - 19968: 0xCDCE,
-	35494 - 19968: 0xE1E9,
-	35496 - 19968: 0xFCEF,
-	35498 - 19968: 0xE0E3,
-	35504 - 19968: 0xE2C1,
-	35506 - 19968: 0xCEA4,
-	35513 - 19968: 0xDEA6,
-	35516 - 19968: 0xEBFE,
-	35518 - 19968: 0xEBDD,
-	35519 - 19968: 0xF0E0,
-	35522 - 19968: 0xF4DB,
-	35524 - 19968: 0xE2F4,
-	35527 - 19968: 0xD3C8,
-	35531 - 19968: 0xF4EB,
-	35533 - 19968: 0xEEB5,
-	35535 - 19968: 0xF5D8,
-	35538 - 19968: 0xD5DF,
-	35542 - 19968: 0xD6E5,
-	35547 - 19968: 0xEBB0,
-	35548 - 19968: 0xF4E3,
-	35553 - 19968: 0xE3CD,
-	35558 - 19968: 0xF4F4,
-	35559 - 19968: 0xFAB2,
-	35562 - 19968: 0xEFF5,
-	35563 - 19968: 0xCADF,
-	35565 - 19968: 0xEBB1,
-	35566 - 19968: 0xEDBF,
-	35569 - 19968: 0xFDC9,
-	35574 - 19968: 0xE4A6,
-	35575 - 19968: 0xF9A4,
-	35576 - 19968: 0xF0B3,
-	35578 - 19968: 0xE5EC,
-	35582 - 19968: 0xD1E7,
-	35584 - 19968: 0xD9C7,
-	35585 - 19968: 0xE4D7,
-	35586 - 19968: 0xEADD,
-	35588 - 19968: 0xD4F7,
-	35598 - 19968: 0xDABA,
-	35600 - 19968: 0xDACD,
-	35604 - 19968: 0xF9CC,
-	35606 - 19968: 0xE1DA,
-	35607 - 19968: 0xDBBF,
-	35609 - 19968: 0xCCC5,
-	35610 - 19968: 0xECD0,
-	35611 - 19968: 0xCBBB,
-	35613 - 19968: 0xDEF3,
-	35616 - 19968: 0xE9AA,
-	35624 - 19968: 0xD9C8,
-	35627 - 19968: 0xEEE3,
-	35628 - 19968: 0xD7BD,
-	35635 - 19968: 0xCFC4,
-	35641 - 19968: 0xD0CD,
-	35649 - 19968: 0xFCA6,
-	35657 - 19968: 0xF1FB,
-	35662 - 19968: 0xFDD2,
-	35663 - 19968: 0xD1C1,
-	35672 - 19968: 0xE3DB,
-	35674 - 19968: 0xD3C9,
-	35676 - 19968: 0xDCCF,
-	35686 - 19968: 0xCCED,
-	35692 - 19968: 0xDEA7,
-	35695 - 19968: 0xE6BB,
-	35696 - 19968: 0xECA1,
-	35700 - 19968: 0xCCB9,
-	35703 - 19968: 0xFBDE,
-	35709 - 19968: 0xE7E2,
-	35712 - 19968: 0xD4C1,
-	35722 - 19968: 0xDCA8,
-	35728 - 19968: 0xE2C2,
-	35730 - 19968: 0xF3D8,
-	35731 - 19968: 0xE5D3,
-	35734 - 19968: 0xF3D9,
-	35738 - 19968: 0xF3C6,
-	35895 - 19968: 0xCDDB,
-	35903 - 19968: 0xCDAC,
-	35905 - 19968: 0xFCC3,
-	35910 - 19968: 0xD4E7,
-	35912 - 19968: 0xD1C2,
-	35914 - 19968: 0xF9A5,
-	35916 - 19968: 0xE8D5,
-	35925 - 19968: 0xE3CE,
-	35930 - 19968: 0xD4CA,
-	35937 - 19968: 0xDFDA,
-	35946 - 19968: 0xFBDF,
-	35947 - 19968: 0xE7E3,
-	35961 - 19968: 0xF8FB,
-	35962 - 19968: 0xE3CF,
-	35970 - 19968: 0xF5B0,
-	35978 - 19968: 0xD8E7,
-	35980 - 19968: 0xD9C9,
-	35997 - 19968: 0xF8AF,
-	35998 - 19968: 0xEFF6,
-	36000 - 19968: 0xDDB6,
-	36001 - 19968: 0xEEAF,
-	36002 - 19968: 0xCDF8,
-	36007 - 19968: 0xDEB8,
-	36008 - 19968: 0xFCA7,
-	36009 - 19968: 0xF7FC,
-	36010 - 19968: 0xF7B1,
-	36011 - 19968: 0xCEBB,
-	36012 - 19968: 0xF4A1,
-	36015 - 19968: 0xEECD,
-	36016 - 19968: 0xE1AE,
-	36019 - 19968: 0xECC3,
-	36020 - 19968: 0xCFFE,
-	36022 - 19968: 0xF8BF,
-	36023 - 19968: 0xD8E2,
-	36024 - 19968: 0xD3E8,
-	36027 - 19968: 0xDEA8,
-	36028 - 19968: 0xF4E4,
-	36029 - 19968: 0xECC2,
-	36031 - 19968: 0xD9F5,
-	36032 - 19968: 0xF9C5,
-	36033 - 19968: 0xDDD3,
-	36034 - 19968: 0xD6F1,
-	36035 - 19968: 0xECFC,
-	36036 - 19968: 0xFCF0,
-	36039 - 19968: 0xEDC0,
-	36040 - 19968: 0xCAB9,
-	36042 - 19968: 0xEEE4,
-	36049 - 19968: 0xF2E1,
-	36051 - 19968: 0xDEB9,
-	36058 - 19968: 0xD6F2,
-	36060 - 19968: 0xDEF4,
-	36062 - 19968: 0xDFDB,
-	36064 - 19968: 0xDBD3,
-	36066 - 19968: 0xFAE7,
-	36067 - 19968: 0xD8E3,
-	36068 - 19968: 0xF4C1,
-	36070 - 19968: 0xDDB7,
-	36074 - 19968: 0xF2F5,
-	36077 - 19968: 0xD4AE,
-	36084 - 19968: 0xD6F3,
-	36091 - 19968: 0xDDB8,
-	36092 - 19968: 0xCFC5,
-	36093 - 19968: 0xDFDF,
-	36100 - 19968: 0xF2BE,
-	36101 - 19968: 0xF6A1,
-	36103 - 19968: 0xEBCB,
-	36104 - 19968: 0xF1FC,
-	36106 - 19968: 0xF3C7,
-	36109 - 19968: 0xE0EB,
-	36115 - 19968: 0xEDFC,
-	36118 - 19968: 0xE1DB,
-	36196 - 19968: 0xEEE5,
-	36198 - 19968: 0xDEF5,
-	36203 - 19968: 0xFAD3,
-	36208 - 19968: 0xF1CB,
-	36211 - 19968: 0xD0AF,
-	36212 - 19968: 0xDDB9,
-	36215 - 19968: 0xD1C3,
-	36229 - 19968: 0xF5B1,
-	36234 - 19968: 0xEAC6,
-	36249 - 19968: 0xF0E1,
-	36259 - 19968: 0xF6AC,
-	36264 - 19968: 0xF5D9,
-	36275 - 19968: 0xF0EB,
-	36282 - 19968: 0xDDBA,
-	36286 - 19968: 0xF2BF,
-	36294 - 19968: 0xF7C5,
-	36299 - 19968: 0xDBA2,
-	36300 - 19968: 0xF2F6,
-	36303 - 19968: 0xCABA,
-	36315 - 19968: 0xF7F5,
-	36317 - 19968: 0xCBE5,
-	36321 - 19968: 0xEEE6,
-	36323 - 19968: 0xE0D3,
-	36328 - 19968: 0xCEA5,
-	36335 - 19968: 0xD6D8,
-	36339 - 19968: 0xD4AF,
-	36362 - 19968: 0xE9C9,
-	36367 - 19968: 0xD3CE,
-	36368 - 19968: 0xF4C2,
-	36382 - 19968: 0xCBE6,
-	36394 - 19968: 0xF1A1,
-	36400 - 19968: 0xEBB2,
-	36405 - 19968: 0xF1A2,
-	36418 - 19968: 0xEBB3,
-	36420 - 19968: 0xF0B4,
-	36423 - 19968: 0xCBF4,
-	36424 - 19968: 0xD4B0,
-	36425 - 19968: 0xF3B2,
-	36426 - 19968: 0xFBB7,
-	36441 - 19968: 0xF5EC,
-	36447 - 19968: 0xEEE7,
-	36448 - 19968: 0xF4B2,
-	36468 - 19968: 0xF5ED,
-	36470 - 19968: 0xCFF3,
-	36481 - 19968: 0xF0E2,
-	36487 - 19968: 0xEECE,
-	36490 - 19968: 0xF1CC,
-	36493 - 19968: 0xE5B8,
-	36522 - 19968: 0xD7F5,
-	36523 - 19968: 0xE3F3,
-	36524 - 19968: 0xCFE5,
-	36544 - 19968: 0xCFC6,
-	36554 - 19968: 0xF3B3,
-	36555 - 19968: 0xE4D8,
-	36556 - 19968: 0xCFF9,
-	36557 - 19968: 0xCFDA,
-	36562 - 19968: 0xFACD,
-	36575 - 19968: 0xE6E3,
-	36587 - 19968: 0xF2E2,
-	36600 - 19968: 0xF5EE,
-	36603 - 19968: 0xCABB,
-	36606 - 19968: 0xE3DC,
-	36611 - 19968: 0xCEF2,
-	36613 - 19968: 0xD6D9,
-	36617 - 19968: 0xEEB0,
-	36626 - 19968: 0xF4E5,
-	36627 - 19968: 0xD8C2,
-	36628 - 19968: 0xDCD0,
-	36629 - 19968: 0xCCEE,
-	36635 - 19968: 0xD5E0,
-	36636 - 19968: 0xF6CA,
-	36637 - 19968: 0xFDCA,
-	36638 - 19968: 0xD8D6,
-	36639 - 19968: 0xF4CF,
-	36646 - 19968: 0xD6A6,
-	36647 - 19968: 0xDCBE,
-	36649 - 19968: 0xDBD4,
-	36650 - 19968: 0xD7C7,
-	36655 - 19968: 0xF2FE,
-	36659 - 19968: 0xF1CD,
-	36664 - 19968: 0xE2C3,
-	36665 - 19968: 0xDCDE,
-	36667 - 19968: 0xDCDF,
-	36670 - 19968: 0xEFAD,
-	36671 - 19968: 0xE6AB,
-	36676 - 19968: 0xF9DD,
-	36677 - 19968: 0xEABF,
-	36681 - 19968: 0xEFAE,
-	36685 - 19968: 0xF4D0,
-	36686 - 19968: 0xCEF3,
-	36701 - 19968: 0xE6AC,
-	36703 - 19968: 0xCEDE,
-	36706 - 19968: 0xD5F9,
-	36763 - 19968: 0xE3F4,
-	36764 - 19968: 0xCDD0,
-	36771 - 19968: 0xD5B8,
-	36774 - 19968: 0xF7FD,
-	36776 - 19968: 0xDCA9,
-	36781 - 19968: 0xDEF6,
-	36783 - 19968: 0xDCAA,
-	36784 - 19968: 0xF2E3,
-	36785 - 19968: 0xE9B4,
-	36786 - 19968: 0xD2DC,
-	36802 - 19968: 0xE9E6,
-	36805 - 19968: 0xE3F6,
-	36814 - 19968: 0xE7CA,
-	36817 - 19968: 0xD0CE,
-	36820 - 19968: 0xDAF7,
-	36838 - 19968: 0xCABC,
-	36842 - 19968: 0xEEE8,
-	36843 - 19968: 0xDADE,
-	36845 - 19968: 0xF2F7,
-	36848 - 19968: 0xE2FB,
-	36850 - 19968: 0xCCA6,
-	36855 - 19968: 0xDABB,
-	36857 - 19968: 0xEEE9,
-	36861 - 19968: 0xF5DA,
-	36864 - 19968: 0xF7DC,
-	36865 - 19968: 0xE1EA,
-	36866 - 19968: 0xCEC1,
-	36867 - 19968: 0xD4B1,
-	36869 - 19968: 0xFDB1,
-	36870 - 19968: 0xE6BD,
-	36872 - 19968: 0xFBAD,
-	36875 - 19968: 0xF8E7,
-	36877 - 19968: 0xE1CE,
-	36879 - 19968: 0xF7E2,
-	36880 - 19968: 0xF5EF,
-	36881 - 19968: 0xCFC7,
-	36884 - 19968: 0xD4B2,
-	36885 - 19968: 0xCCEF,
-	36887 - 19968: 0xD4E8,
-	36889 - 19968: 0xEECF,
-	36890 - 19968: 0xF7D7,
-	36893 - 19968: 0xE0A6,
-	36894 - 19968: 0xD6C1,
-	36895 - 19968: 0xE1DC,
-	36896 - 19968: 0xF0E3,
-	36897 - 19968: 0xF1E4,
-	36898 - 19968: 0xDCF1,
-	36899 - 19968: 0xD6A7,
-	36910 - 19968: 0xF4F5,
-	36913 - 19968: 0xF1CE,
-	36914 - 19968: 0xF2E4,
-	36917 - 19968: 0xD0B0,
-	36920 - 19968: 0xECEF,
-	36924 - 19968: 0xF9BA,
-	36926 - 19968: 0xEBB5,
-	36929 - 19968: 0xD4ED,
-	36930 - 19968: 0xE2C4,
-	36935 - 19968: 0xE9E7,
-	36938 - 19968: 0xEBB4,
-	36939 - 19968: 0xEAA1,
-	36941 - 19968: 0xF8BC,
-	36942 - 19968: 0xCEA6,
-	36944 - 19968: 0xF9C6,
-	36945 - 19968: 0xFCDA,
-	36947 - 19968: 0xD4B3,
-	36948 - 19968: 0xD3B9,
-	36949 - 19968: 0xEADE,
-	36953 - 19968: 0xE9AB,
-	36956 - 19968: 0xE1E1,
-	36957 - 19968: 0xD3CF,
-	36958 - 19968: 0xF4F6,
-	36960 - 19968: 0xEAC0,
-	36961 - 19968: 0xE1CF,
-	36963 - 19968: 0xCCBA,
-	36969 - 19968: 0xEEEA,
-	36973 - 19968: 0xF0E4,
-	36974 - 19968: 0xF3B4,
-	36975 - 19968: 0xD4EE,
-	36978 - 19968: 0xF2C0,
-	36981 - 19968: 0xF1E5,
-	36983 - 19968: 0xF4C3,
-	36984 - 19968: 0xE0D4,
-	36986 - 19968: 0xEBB6,
-	36988 - 19968: 0xD7A1,
-	36989 - 19968: 0xCBE8,
-	36991 - 19968: 0xF9AD,
-	36992 - 19968: 0xE9AD,
-	36993 - 19968: 0xD8E4,
-	36994 - 19968: 0xFAB3,
-	36995 - 19968: 0xE2C5,
-	36996 - 19968: 0xFCBD,
-	36999 - 19968: 0xECC4,
-	37000 - 19968: 0xD8B1,
-	37002 - 19968: 0xDCAB,
-	37007 - 19968: 0xD5A4,
-	37009 - 19968: 0xEBE9,
-	37013 - 19968: 0xE8BB,
-	37017 - 19968: 0xD8D7,
-	37026 - 19968: 0xFBAE,
-	37027 - 19968: 0xD1E1,
-	37030 - 19968: 0xDBC0,
-	37032 - 19968: 0xF5BE,
-	37034 - 19968: 0xDEF7,
-	37039 - 19968: 0xCAFB,
-	37040 - 19968: 0xF7C6,
-	37041 - 19968: 0xCFC8,
-	37045 - 19968: 0xE1D0,
-	37048 - 19968: 0xEED0,
-	37057 - 19968: 0xE9F4,
-	37066 - 19968: 0xCEF4,
-	37086 - 19968: 0xD5CD,
-	37089 - 19968: 0xCFDB,
-	37096 - 19968: 0xDDBB,
-	37101 - 19968: 0xCEAC,
-	37109 - 19968: 0xE9E8,
-	37117 - 19968: 0xD4B4,
-	37122 - 19968: 0xE4C7,
-	37138 - 19968: 0xF5DB,
-	37141 - 19968: 0xFAC1,
-	37145 - 19968: 0xDEA9,
-	37159 - 19968: 0xD4F8,
-	37165 - 19968: 0xEFF7,
-	37170 - 19968: 0xD3B3,
-	37193 - 19968: 0xEBB7,
-	37194 - 19968: 0xEFF8,
-	37195 - 19968: 0xF5DC,
-	37196 - 19968: 0xEDCC,
-	37197 - 19968: 0xDBD5,
-	37198 - 19968: 0xF1CF,
-	37202 - 19968: 0xF1D0,
-	37218 - 19968: 0xF5B2,
-	37225 - 19968: 0xD9AE,
-	37226 - 19968: 0xD5AC,
-	37228 - 19968: 0xE2C6,
-	37237 - 19968: 0xFDA3,
-	37239 - 19968: 0xFBE5,
-	37240 - 19968: 0xDFAB,
-	37255 - 19968: 0xE2F5,
-	37257 - 19968: 0xF6AD,
-	37259 - 19968: 0xF5B3,
-	37261 - 19968: 0xF0B5,
-	37266 - 19968: 0xE1A5,
-	37276 - 19968: 0xF5DD,
-	37291 - 19968: 0xECA2,
-	37292 - 19968: 0xEDFD,
-	37294 - 19968: 0xF5B4,
-	37295 - 19968: 0xFBB8,
-	37297 - 19968: 0xDBA3,
-	37300 - 19968: 0xD6CA,
-	37301 - 19968: 0xCBD9,
-	37312 - 19968: 0xE5D4,
-	37319 - 19968: 0xF3FA,
-	37321 - 19968: 0xEBB8,
-	37323 - 19968: 0xE0B7,
-	37324 - 19968: 0xD7EC,
-	37325 - 19968: 0xF1EC,
-	37326 - 19968: 0xE5AF,
-	37327 - 19968: 0xD5E1,
-	37328 - 19968: 0xD7ED,
-	37329 - 19968: 0xD1D1,
-	37335 - 19968: 0xE1F2,
-	37336 - 19968: 0xEFF9,
-	37340 - 19968: 0xDDBC,
-	37341 - 19968: 0xF6DC,
-	37347 - 19968: 0xF0E5,
-	37351 - 19968: 0xF4C4,
-	37354 - 19968: 0xE9E9,
-	37365 - 19968: 0xF3FB,
-	37389 - 19968: 0xD4EF,
-	37392 - 19968: 0xCCA2,
-	37393 - 19968: 0xF7FE,
-	37394 - 19968: 0xDFBC,
-	37399 - 19968: 0xEBCD,
-	37406 - 19968: 0xD0B7,
-	37428 - 19968: 0xD6C2,
-	37434 - 19968: 0xE8AD,
-	37439 - 19968: 0xEFAF,
-	37440 - 19968: 0xCBA5,
-	37445 - 19968: 0xCBE9,
-	37449 - 19968: 0xFAE8,
-	37463 - 19968: 0xCCC6,
-	37467 - 19968: 0xE6E7,
-	37470 - 19968: 0xEAC7,
-	37474 - 19968: 0xDBA4,
-	37476 - 19968: 0xCFC9,
-	37477 - 19968: 0xE2FC,
-	37478 - 19968: 0xEFFA,
-	37504 - 19968: 0xEBDE,
-	37507 - 19968: 0xF5C8,
-	37509 - 19968: 0xD4DE,
-	37521 - 19968: 0xE0D5,
-	37523 - 19968: 0xEFB0,
-	37526 - 19968: 0xE2C7,
-	37528 - 19968: 0xD9AF,
-	37532 - 19968: 0xF9E7,
-	37555 - 19968: 0xE7E5,
-	37558 - 19968: 0xCFCA,
-	37559 - 19968: 0xE1D1,
-	37561 - 19968: 0xE2C8,
-	37580 - 19968: 0xEFFB,
-	37583 - 19968: 0xFAF9,
-	37586 - 19968: 0xDCF2,
-	37604 - 19968: 0xE0A7,
-	37610 - 19968: 0xF8E8,
-	37624 - 19968: 0xCBEA,
-	37628 - 19968: 0xCBBC,
-	37636 - 19968: 0xD6E2,
-	37648 - 19968: 0xF5DE,
-	37656 - 19968: 0xF5DF,
-	37658 - 19968: 0xEEB6,
-	37662 - 19968: 0xE2F6,
-	37663 - 19968: 0xD3CA,
-	37664 - 19968: 0xEFFC,
-	37665 - 19968: 0xD1C4,
-	37666 - 19968: 0xEFB1,
-	37668 - 19968: 0xD1C5,
-	37670 - 19968: 0xD0DE,
-	37672 - 19968: 0xD9E1,
-	37675 - 19968: 0xE0B8,
-	37678 - 19968: 0xCDD1,
-	37679 - 19968: 0xF3B9,
-	37704 - 19968: 0xE7CC,
-	37706 - 19968: 0xD6A8,
-	37707 - 19968: 0xCEA7,
-	37709 - 19968: 0xD4B5,
-	37716 - 19968: 0xE4C8,
-	37723 - 19968: 0xD3B4,
-	37742 - 19968: 0xEBB9,
-	37749 - 19968: 0xCBF5,
-	37756 - 19968: 0xF6DD,
-	37758 - 19968: 0xF1A3,
-	37772 - 19968: 0xCCC7,
-	37780 - 19968: 0xE9CA,
-	37782 - 19968: 0xE1F0,
-	37786 - 19968: 0xF5E0,
-	37795 - 19968: 0xFBAF,
-	37799 - 19968: 0xCBD1,
-	37804 - 19968: 0xFBE0,
-	37805 - 19968: 0xF2E5,
-	37808 - 19968: 0xECF0,
-	37827 - 19968: 0xF0EC,
-	37841 - 19968: 0xEEEB,
-	37854 - 19968: 0xE9CB,
-	37857 - 19968: 0xCCF0,
-	37860 - 19968: 0xD7AF,
-	37878 - 19968: 0xF3A1,
-	37892 - 19968: 0xFCF5,
-	37912 - 19968: 0xF1A4,
-	37925 - 19968: 0xE0D6,
-	37931 - 19968: 0xEFB2,
-	37941 - 19968: 0xF4D1,
-	37944 - 19968: 0xF7A1,
-	37956 - 19968: 0xF1D1,
-	37969 - 19968: 0xCAFC,
-	37970 - 19968: 0xCAFD,
-	37979 - 19968: 0xCECE,
-	38013 - 19968: 0xF3C8,
-	38015 - 19968: 0xF3BA,
-	38263 - 19968: 0xEDFE,
-	38272 - 19968: 0xDAA6,
-	38275 - 19968: 0xE0EC,
-	38281 - 19968: 0xF8CD,
-	38283 - 19968: 0xCBD2,
-	38287 - 19968: 0xEBCE,
-	38289 - 19968: 0xF9D8,
-	38290 - 19968: 0xF9D9,
-	38291 - 19968: 0xCAE0,
-	38292 - 19968: 0xDACA,
-	38296 - 19968: 0xCBA6,
-	38307 - 19968: 0xCAC8,
-	38308 - 19968: 0xF9EE,
-	38309 - 19968: 0xDBEC,
-	38312 - 19968: 0xD0B1,
-	38317 - 19968: 0xD5EF,
-	38321 - 19968: 0xE6F3,
-	38331 - 19968: 0xE7A2,
-	38332 - 19968: 0xE4D9,
-	38343 - 19968: 0xE4E1,
-	38346 - 19968: 0xFCC4,
-	38356 - 19968: 0xF9EF,
-	38357 - 19968: 0xCFF4,
-	38358 - 19968: 0xF7E6,
-	38364 - 19968: 0xCEBC,
-	38369 - 19968: 0xF4C5,
-	38370 - 19968: 0xDCA3,
-	38428 - 19968: 0xDDBD,
-	38433 - 19968: 0xF4C6,
-	38442 - 19968: 0xF8A1,
-	38446 - 19968: 0xE8D6,
-	38450 - 19968: 0xDBC1,
-	38459 - 19968: 0xF0E6,
-	38463 - 19968: 0xE4B9,
-	38464 - 19968: 0xF6ED,
-	38466 - 19968: 0xF9AE,
-	38468 - 19968: 0xDDBE,
-	38475 - 19968: 0xD7B0,
-	38476 - 19968: 0xD8E8,
-	38477 - 19968: 0xCBBD,
-	38480 - 19968: 0xF9DA,
-	38491 - 19968: 0xF8CE,
-	38492 - 19968: 0xF9F0,
-	38493 - 19968: 0xE0ED,
-	38494 - 19968: 0xE3B3,
-	38495 - 19968: 0xF4B3,
-	38498 - 19968: 0xEAC2,
-	38499 - 19968: 0xF2E6,
-	38500 - 19968: 0xF0B6,
-	38506 - 19968: 0xDBD6,
-	38512 - 19968: 0xEBE4,
-	38515 - 19968: 0xF2E7,
-	38517 - 19968: 0xD7D5,
-	38518 - 19968: 0xD4B6,
-	38519 - 19968: 0xF9E8,
-	38520 - 19968: 0xD7C1,
-	38525 - 19968: 0xE5D5,
-	38533 - 19968: 0xE9EA,
-	38534 - 19968: 0xD7CC,
-	38538 - 19968: 0xD3E9,
-	38539 - 19968: 0xE2C9,
-	38541 - 19968: 0xFCDB,
-	38542 - 19968: 0xCDAD,
-	38548 - 19968: 0xCCB0,
-	38549 - 19968: 0xEAA2,
-	38552 - 19968: 0xE4F6,
-	38553 - 19968: 0xD0C0,
-	38555 - 19968: 0xF0B7,
-	38556 - 19968: 0xEEA1,
-	38563 - 19968: 0xD7F6,
-	38567 - 19968: 0xE2CA,
-	38568 - 19968: 0xE2CB,
-	38570 - 19968: 0xFACF,
-	38577 - 19968: 0xEBDF,
-	38583 - 19968: 0xD6CB,
-	38587 - 19968: 0xF4B4,
-	38592 - 19968: 0xEDCD,
-	38593 - 19968: 0xE4D2,
-	38596 - 19968: 0xEAA9,
-	38597 - 19968: 0xE4BA,
-	38598 - 19968: 0xF3A2,
-	38599 - 19968: 0xCDD2,
-	38601 - 19968: 0xF6CB,
-	38603 - 19968: 0xF1E6,
-	38604 - 19968: 0xEDC1,
-	38605 - 19968: 0xE8BC,
-	38606 - 19968: 0xEED1,
-	38613 - 19968: 0xF0E7,
-	38614 - 19968: 0xE2CC,
-	38617 - 19968: 0xE4AA,
-	38619 - 19968: 0xF5E1,
-	38620 - 19968: 0xEDDA,
-	38626 - 19968: 0xD7EE,
-	38627 - 19968: 0xD1F1,
-	38632 - 19968: 0xE9EB,
-	38633 - 19968: 0xE9EC,
-	38634 - 19968: 0xE0E4,
-	38639 - 19968: 0xDAA7,
-	38640 - 19968: 0xDDD4,
-	38642 - 19968: 0xEAA3,
-	38646 - 19968: 0xD6C3,
-	38647 - 19968: 0xD6F4,
-	38649 - 19968: 0xDADF,
-	38651 - 19968: 0xEFB3,
-	38656 - 19968: 0xE2CD,
-	38662 - 19968: 0xEFFD,
-	38663 - 19968: 0xF2E8,
-	38673 - 19968: 0xEFC5,
-	38675 - 19968: 0xE7E7,
-	38678 - 19968: 0xD7FD,
-	38681 - 19968: 0xE7CE,
-	38684 - 19968: 0xDFDC,
-	38686 - 19968: 0xF9C7,
-	38695 - 19968: 0xD9F6,
-	38704 - 19968: 0xDFAC,
-	38706 - 19968: 0xD6DA,
-	38713 - 19968: 0xDCA4,
-	38717 - 19968: 0xF0B8,
-	38722 - 19968: 0xD5FA,
-	38724 - 19968: 0xE4F7,
-	38728 - 19968: 0xD6C4,
-	38737 - 19968: 0xF4EC,
-	38742 - 19968: 0xEFFE,
-	38748 - 19968: 0xF0A1,
-	38750 - 19968: 0xDEAA,
-	38753 - 19968: 0xDABC,
-	38754 - 19968: 0xD8FC,
-	38761 - 19968: 0xFAD4,
-	38765 - 19968: 0xECE5,
-	38772 - 19968: 0xFCA8,
-	38775 - 19968: 0xECE6,
-	38778 - 19968: 0xD8CB,
-	38795 - 19968: 0xFBB9,
-	38797 - 19968: 0xE4D3,
-	38799 - 19968: 0xCDF9,
-	38816 - 19968: 0xCFD3,
-	38824 - 19968: 0xCAEA,
-	38827 - 19968: 0xCFD4,
-	38829 - 19968: 0xF8BD,
-	38854 - 19968: 0xF4C7,
-	38859 - 19968: 0xEADF,
-	38867 - 19968: 0xF9DB,
-	38876 - 19968: 0xD4B7,
-	38899 - 19968: 0xEBE5,
-	38902 - 19968: 0xE1D2,
-	38907 - 19968: 0xEAA4,
-	38911 - 19968: 0xFAC2,
-	38912 - 19968: 0xFBE1,
-	38913 - 19968: 0xFAED,
-	38914 - 19968: 0xF0A2,
-	38915 - 19968: 0xCCF1,
-	38917 - 19968: 0xFAA3,
-	38918 - 19968: 0xE2F7,
-	38920 - 19968: 0xE2CE,
-	38922 - 19968: 0xE9F5,
-	38924 - 19968: 0xE1EB,
-	38928 - 19968: 0xE7E8,
-	38929 - 19968: 0xE8D7,
-	38930 - 19968: 0xDAF8,
-	38931 - 19968: 0xD4CB,
-	38935 - 19968: 0xF7F6,
-	38936 - 19968: 0xD6C5,
-	38957 - 19968: 0xD4E9,
-	38960 - 19968: 0xFAFA,
-	38968 - 19968: 0xCCF2,
-	38969 - 19968: 0xF7DD,
-	38971 - 19968: 0xDEBA,
-	38982 - 19968: 0xCEA8,
-	38988 - 19968: 0xF0B9,
-	38989 - 19968: 0xE4FE,
-	38990 - 19968: 0xE4C9,
-	38996 - 19968: 0xE4D4,
-	39000 - 19968: 0xEAC3,
-	39002 - 19968: 0xEFB4,
-	39006 - 19968: 0xD7BE,
-	39013 - 19968: 0xFBE2,
-	39015 - 19968: 0xCDD3,
-	39019 - 19968: 0xEFB5,
-	39023 - 19968: 0xFAE9,
-	39080 - 19968: 0xF9A6,
-	39087 - 19968: 0xDFBD,
-	39089 - 19968: 0xF7C7,
-	39108 - 19968: 0xF8FD,
-	39111 - 19968: 0xF8FC,
-	39131 - 19968: 0xDEAB,
-	39132 - 19968: 0xDBE8,
-	39135 - 19968: 0xE3DD,
-	39137 - 19968: 0xE1E2,
-	39138 - 19968: 0xD1C6,
-	39149 - 19968: 0xF6D0,
-	39150 - 19968: 0xEBE6,
-	39151 - 19968: 0xDAF9,
-	39156 - 19968: 0xECC7,
-	39164 - 19968: 0xDEF8,
-	39165 - 19968: 0xF8E9,
-	39166 - 19968: 0xE3DE,
-	39171 - 19968: 0xCEF5,
-	39177 - 19968: 0xFAC3,
-	39178 - 19968: 0xE5D7,
-	39180 - 19968: 0xECC8,
-	39184 - 19968: 0xF3C9,
-	39187 - 19968: 0xE4BB,
-	39192 - 19968: 0xE6AE,
-	39198 - 19968: 0xEFB6,
-	39200 - 19968: 0xDCBF,
-	39208 - 19968: 0xCEBD,
-	39237 - 19968: 0xD8C3,
-	39241 - 19968: 0xD0CF,
-	39243 - 19968: 0xCFFA,
-	39244 - 19968: 0xF3CA,
-	39245 - 19968: 0xE0D7,
-	39249 - 19968: 0xD1C7,
-	39250 - 19968: 0xE9AE,
-	39252 - 19968: 0xE8BD,
-	39255 - 19968: 0xFAC4,
-	39318 - 19968: 0xE2CF,
-	39321 - 19968: 0xFAC5,
-	39325 - 19968: 0xF9B8,
-	39333 - 19968: 0xDCE0,
-	39336 - 19968: 0xFBB0,
-	39340 - 19968: 0xD8A9,
-	39341 - 19968: 0xE5DF,
-	39342 - 19968: 0xF9A7,
-	39345 - 19968: 0xF6EE,
-	39347 - 19968: 0xF6CC,
-	39348 - 19968: 0xE2F8,
-	39353 - 19968: 0xECF1,
-	39361 - 19968: 0xDAE0,
-	39376 - 19968: 0xF1D2,
-	39377 - 19968: 0xD2CC,
-	39378 - 19968: 0xCFCB,
-	39381 - 19968: 0xCABD,
-	39385 - 19968: 0xDDBF,
-	39389 - 19968: 0xF6EF,
-	39391 - 19968: 0xDEF9,
-	39405 - 19968: 0xFAB4,
-	39409 - 19968: 0xD5AD,
-	39423 - 19968: 0xF1E7,
-	39425 - 19968: 0xDEBE,
-	39432 - 19968: 0xDCC0,
-	39438 - 19968: 0xD1C8,
-	39439 - 19968: 0xD1C9,
-	39449 - 19968: 0xF8BE,
-	39467 - 19968: 0xCBF6,
-	39472 - 19968: 0xD4F9,
-	39478 - 19968: 0xF5E2,
-	39479 - 19968: 0xE1D3,
-	39488 - 19968: 0xD8E9,
-	39491 - 19968: 0xF8FE,
-	39493 - 19968: 0xCFCC,
-	39501 - 19968: 0xFDA4,
-	39509 - 19968: 0xCEF6,
-	39511 - 19968: 0xFAD0,
-	39514 - 19968: 0xCCF3,
-	39515 - 19968: 0xE6BE,
-	39519 - 19968: 0xF6AE,
-	39522 - 19968: 0xD5F0,
-	39525 - 19968: 0xD1CA,
-	39529 - 19968: 0xFCBE,
-	39530 - 19968: 0xD5F1,
-	39592 - 19968: 0xCDE9,
-	39608 - 19968: 0xFAB5,
-	39635 - 19968: 0xE2D0,
-	39636 - 19968: 0xF4F7,
-	39640 - 19968: 0xCDD4,
-	39653 - 19968: 0xE7A3,
-	39662 - 19968: 0xDBA5,
-	39706 - 19968: 0xE2D1,
-	39719 - 19968: 0xD7A2,
-	39722 - 19968: 0xF7E3,
-	39729 - 19968: 0xEAA6,
-	39740 - 19968: 0xD0A1,
-	39745 - 19968: 0xCEDA,
-	39746 - 19968: 0xFBEB,
-	39747 - 19968: 0xDBA6,
-	39748 - 19968: 0xDBDE,
-	39749 - 19968: 0xD8E5,
-	39759 - 19968: 0xEAE0,
-	39764 - 19968: 0xD8AA,
-	39770 - 19968: 0xE5E0,
-	39791 - 19968: 0xD6DB,
-	39822 - 19968: 0xEFC6,
-	39825 - 19968: 0xF8EA,
-	39839 - 19968: 0xE4D5,
-	39851 - 19968: 0xCEF7,
-	39854 - 19968: 0xE0D8,
-	39881 - 19968: 0xD7EF,
-	39894 - 19968: 0xF4ED,
-	39908 - 19968: 0xCDE6,
-	39912 - 19968: 0xCCF4,
-	39949 - 19968: 0xF5E3,
-	39952 - 19968: 0xE4CA,
-	39954 - 19968: 0xDCE1,
-	39957 - 19968: 0xF9C8,
-	39973 - 19968: 0xFCBF,
-	39986 - 19968: 0xE8A7,
-	39995 - 19968: 0xD8C4,
-	40007 - 19968: 0xCBBE,
-	40009 - 19968: 0xDCAE,
-	40023 - 19968: 0xD7F7,
-	40165 - 19968: 0xF0E8,
-	40167 - 19968: 0xDDC0,
-	40169 - 19968: 0xCFCD,
-	40179 - 19968: 0xDCF3,
-	40180 - 19968: 0xD9B0,
-	40182 - 19968: 0xE6E9,
-	40201 - 19968: 0xE4BC,
-	40219 - 19968: 0xEAC4,
-	40230 - 19968: 0xE4EC,
-	40232 - 19968: 0xE4E5,
-	40251 - 19968: 0xFBF8,
-	40273 - 19968: 0xCCBB,
-	40285 - 19968: 0xE4BD,
-	40288 - 19968: 0xCDDC,
-	40289 - 19968: 0xD9F7,
-	40300 - 19968: 0xDDDF,
-	40306 - 19968: 0xEDCE,
-	40361 - 19968: 0xD9D0,
-	40367 - 19968: 0xE5A3,
-	40372 - 19968: 0xF9CD,
-	40388 - 19968: 0xCDAE,
-	40407 - 19968: 0xCFCE,
-	40434 - 19968: 0xF6AF,
-	40440 - 19968: 0xFDD3,
-	40441 - 19968: 0xEBED,
-	40442 - 19968: 0xD6DC,
-	40474 - 19968: 0xE5A4,
-	40478 - 19968: 0xD5B6,
-	40565 - 19968: 0xD6DD,
-	40569 - 19968: 0xF9E9,
-	40573 - 19968: 0xE7A4,
-	40575 - 19968: 0xD6E3,
-	40594 - 19968: 0xD1CB,
-	40595 - 19968: 0xD6E4,
-	40599 - 19968: 0xD5F2,
-	40605 - 19968: 0xDEFA,
-	40607 - 19968: 0xD7F8,
-	40613 - 19968: 0xD8EA,
-	40628 - 19968: 0xCFD5,
-	40629 - 19968: 0xD8FD,
-	40635 - 19968: 0xD8AB,
-	40638 - 19968: 0xFDCB,
-	40643 - 19968: 0xFCDC,
-	40653 - 19968: 0xE0A8,
-	40654 - 19968: 0xD5F3,
-	40657 - 19968: 0xFDD9,
-	40660 - 19968: 0xCCA3,
-	40664 - 19968: 0xD9F9,
-	40667 - 19968: 0xD3EA,
-	40668 - 19968: 0xF5F5,
-	40670 - 19968: 0xEFC7,
-	40680 - 19968: 0xD3DA,
-	40692 - 19968: 0xDABD,
-	40711 - 19968: 0xE8A8,
-	40712 - 19968: 0xDCAF,
-	40718 - 19968: 0xF0A3,
-	40723 - 19968: 0xCDD5,
-	40736 - 19968: 0xE0A9,
-	40763 - 19968: 0xDEAC,
-	40778 - 19968: 0xF0BA,
-	40779 - 19968: 0xEEB1,
-	40782 - 19968: 0xEEB2,
-	40786 - 19968: 0xF6CD,
-	40799 - 19968: 0xEED2,
-	40801 - 19968: 0xD6C6,
-	40807 - 19968: 0xE0E5,
-	40810 - 19968: 0xF3BB,
-	40812 - 19968: 0xE5E1,
-	40823 - 19968: 0xE4CB,
-	40845 - 19968: 0xD7A3,
-	40848 - 19968: 0xDBC2,
-	40853 - 19968: 0xCAFE,
-	40860 - 19968: 0xCFCF,
-}
-
-const encode1Low, encode1High = 44032, 55204
-
-var encode1 = [...]uint16{
-	44032 - 44032: 0xB0A1,
-	44033 - 44032: 0xB0A2,
-	44034 - 44032: 0x8141,
-	44035 - 44032: 0x8142,
-	44036 - 44032: 0xB0A3,
-	44037 - 44032: 0x8143,
-	44038 - 44032: 0x8144,
-	44039 - 44032: 0xB0A4,
-	44040 - 44032: 0xB0A5,
-	44041 - 44032: 0xB0A6,
-	44042 - 44032: 0xB0A7,
-	44043 - 44032: 0x8145,
-	44044 - 44032: 0x8146,
-	44045 - 44032: 0x8147,
-	44046 - 44032: 0x8148,
-	44047 - 44032: 0x8149,
-	44048 - 44032: 0xB0A8,
-	44049 - 44032: 0xB0A9,
-	44050 - 44032: 0xB0AA,
-	44051 - 44032: 0xB0AB,
-	44052 - 44032: 0xB0AC,
-	44053 - 44032: 0xB0AD,
-	44054 - 44032: 0xB0AE,
-	44055 - 44032: 0xB0AF,
-	44056 - 44032: 0x814A,
-	44057 - 44032: 0xB0B0,
-	44058 - 44032: 0xB0B1,
-	44059 - 44032: 0xB0B2,
-	44060 - 44032: 0xB0B3,
-	44061 - 44032: 0xB0B4,
-	44062 - 44032: 0x814B,
-	44063 - 44032: 0x814C,
-	44064 - 44032: 0xB0B5,
-	44065 - 44032: 0x814D,
-	44066 - 44032: 0x814E,
-	44067 - 44032: 0x814F,
-	44068 - 44032: 0xB0B6,
-	44069 - 44032: 0x8150,
-	44070 - 44032: 0x8151,
-	44071 - 44032: 0x8152,
-	44072 - 44032: 0x8153,
-	44073 - 44032: 0x8154,
-	44074 - 44032: 0x8155,
-	44075 - 44032: 0x8156,
-	44076 - 44032: 0xB0B7,
-	44077 - 44032: 0xB0B8,
-	44078 - 44032: 0x8157,
-	44079 - 44032: 0xB0B9,
-	44080 - 44032: 0xB0BA,
-	44081 - 44032: 0xB0BB,
-	44082 - 44032: 0x8158,
-	44083 - 44032: 0x8159,
-	44084 - 44032: 0x815A,
-	44085 - 44032: 0x8161,
-	44086 - 44032: 0x8162,
-	44087 - 44032: 0x8163,
-	44088 - 44032: 0xB0BC,
-	44089 - 44032: 0xB0BD,
-	44090 - 44032: 0x8164,
-	44091 - 44032: 0x8165,
-	44092 - 44032: 0xB0BE,
-	44093 - 44032: 0x8166,
-	44094 - 44032: 0x8167,
-	44095 - 44032: 0x8168,
-	44096 - 44032: 0xB0BF,
-	44097 - 44032: 0x8169,
-	44098 - 44032: 0x816A,
-	44099 - 44032: 0x816B,
-	44100 - 44032: 0x816C,
-	44101 - 44032: 0x816D,
-	44102 - 44032: 0x816E,
-	44103 - 44032: 0x816F,
-	44104 - 44032: 0x8170,
-	44105 - 44032: 0x8171,
-	44106 - 44032: 0x8172,
-	44107 - 44032: 0xB0C0,
-	44108 - 44032: 0x8173,
-	44109 - 44032: 0xB0C1,
-	44110 - 44032: 0x8174,
-	44111 - 44032: 0x8175,
-	44112 - 44032: 0x8176,
-	44113 - 44032: 0x8177,
-	44114 - 44032: 0x8178,
-	44115 - 44032: 0x8179,
-	44116 - 44032: 0xB0C2,
-	44117 - 44032: 0x817A,
-	44118 - 44032: 0x8181,
-	44119 - 44032: 0x8182,
-	44120 - 44032: 0xB0C3,
-	44121 - 44032: 0x8183,
-	44122 - 44032: 0x8184,
-	44123 - 44032: 0x8185,
-	44124 - 44032: 0xB0C4,
-	44125 - 44032: 0x8186,
-	44126 - 44032: 0x8187,
-	44127 - 44032: 0x8188,
-	44128 - 44032: 0x8189,
-	44129 - 44032: 0x818A,
-	44130 - 44032: 0x818B,
-	44131 - 44032: 0x818C,
-	44132 - 44032: 0x818D,
-	44133 - 44032: 0x818E,
-	44134 - 44032: 0x818F,
-	44135 - 44032: 0x8190,
-	44136 - 44032: 0x8191,
-	44137 - 44032: 0x8192,
-	44138 - 44032: 0x8193,
-	44139 - 44032: 0x8194,
-	44140 - 44032: 0x8195,
-	44141 - 44032: 0x8196,
-	44142 - 44032: 0x8197,
-	44143 - 44032: 0x8198,
-	44144 - 44032: 0xB0C5,
-	44145 - 44032: 0xB0C6,
-	44146 - 44032: 0x8199,
-	44147 - 44032: 0x819A,
-	44148 - 44032: 0xB0C7,
-	44149 - 44032: 0x819B,
-	44150 - 44032: 0x819C,
-	44151 - 44032: 0xB0C8,
-	44152 - 44032: 0xB0C9,
-	44153 - 44032: 0x819D,
-	44154 - 44032: 0xB0CA,
-	44155 - 44032: 0x819E,
-	44156 - 44032: 0x819F,
-	44157 - 44032: 0x81A0,
-	44158 - 44032: 0x81A1,
-	44159 - 44032: 0x81A2,
-	44160 - 44032: 0xB0CB,
-	44161 - 44032: 0xB0CC,
-	44162 - 44032: 0x81A3,
-	44163 - 44032: 0xB0CD,
-	44164 - 44032: 0xB0CE,
-	44165 - 44032: 0xB0CF,
-	44166 - 44032: 0xB0D0,
-	44167 - 44032: 0x81A4,
-	44168 - 44032: 0x81A5,
-	44169 - 44032: 0xB0D1,
-	44170 - 44032: 0xB0D2,
-	44171 - 44032: 0xB0D3,
-	44172 - 44032: 0xB0D4,
-	44173 - 44032: 0x81A6,
-	44174 - 44032: 0x81A7,
-	44175 - 44032: 0x81A8,
-	44176 - 44032: 0xB0D5,
-	44177 - 44032: 0x81A9,
-	44178 - 44032: 0x81AA,
-	44179 - 44032: 0x81AB,
-	44180 - 44032: 0xB0D6,
-	44181 - 44032: 0x81AC,
-	44182 - 44032: 0x81AD,
-	44183 - 44032: 0x81AE,
-	44184 - 44032: 0x81AF,
-	44185 - 44032: 0x81B0,
-	44186 - 44032: 0x81B1,
-	44187 - 44032: 0x81B2,
-	44188 - 44032: 0xB0D7,
-	44189 - 44032: 0xB0D8,
-	44190 - 44032: 0x81B3,
-	44191 - 44032: 0xB0D9,
-	44192 - 44032: 0xB0DA,
-	44193 - 44032: 0xB0DB,
-	44194 - 44032: 0x81B4,
-	44195 - 44032: 0x81B5,
-	44196 - 44032: 0x81B6,
-	44197 - 44032: 0x81B7,
-	44198 - 44032: 0x81B8,
-	44199 - 44032: 0x81B9,
-	44200 - 44032: 0xB0DC,
-	44201 - 44032: 0xB0DD,
-	44202 - 44032: 0xB0DE,
-	44203 - 44032: 0x81BA,
-	44204 - 44032: 0xB0DF,
-	44205 - 44032: 0x81BB,
-	44206 - 44032: 0x81BC,
-	44207 - 44032: 0xB0E0,
-	44208 - 44032: 0xB0E1,
-	44209 - 44032: 0x81BD,
-	44210 - 44032: 0x81BE,
-	44211 - 44032: 0x81BF,
-	44212 - 44032: 0x81C0,
-	44213 - 44032: 0x81C1,
-	44214 - 44032: 0x81C2,
-	44215 - 44032: 0x81C3,
-	44216 - 44032: 0xB0E2,
-	44217 - 44032: 0xB0E3,
-	44218 - 44032: 0x81C4,
-	44219 - 44032: 0xB0E4,
-	44220 - 44032: 0xB0E5,
-	44221 - 44032: 0xB0E6,
-	44222 - 44032: 0x81C5,
-	44223 - 44032: 0x81C6,
-	44224 - 44032: 0x81C7,
-	44225 - 44032: 0xB0E7,
-	44226 - 44032: 0x81C8,
-	44227 - 44032: 0x81C9,
-	44228 - 44032: 0xB0E8,
-	44229 - 44032: 0x81CA,
-	44230 - 44032: 0x81CB,
-	44231 - 44032: 0x81CC,
-	44232 - 44032: 0xB0E9,
-	44233 - 44032: 0x81CD,
-	44234 - 44032: 0x81CE,
-	44235 - 44032: 0x81CF,
-	44236 - 44032: 0xB0EA,
-	44237 - 44032: 0x81D0,
-	44238 - 44032: 0x81D1,
-	44239 - 44032: 0x81D2,
-	44240 - 44032: 0x81D3,
-	44241 - 44032: 0x81D4,
-	44242 - 44032: 0x81D5,
-	44243 - 44032: 0x81D6,
-	44244 - 44032: 0x81D7,
-	44245 - 44032: 0xB0EB,
-	44246 - 44032: 0x81D8,
-	44247 - 44032: 0xB0EC,
-	44248 - 44032: 0x81D9,
-	44249 - 44032: 0x81DA,
-	44250 - 44032: 0x81DB,
-	44251 - 44032: 0x81DC,
-	44252 - 44032: 0x81DD,
-	44253 - 44032: 0x81DE,
-	44254 - 44032: 0x81DF,
-	44255 - 44032: 0x81E0,
-	44256 - 44032: 0xB0ED,
-	44257 - 44032: 0xB0EE,
-	44258 - 44032: 0x81E1,
-	44259 - 44032: 0x81E2,
-	44260 - 44032: 0xB0EF,
-	44261 - 44032: 0x81E3,
-	44262 - 44032: 0x81E4,
-	44263 - 44032: 0xB0F0,
-	44264 - 44032: 0xB0F1,
-	44265 - 44032: 0x81E5,
-	44266 - 44032: 0xB0F2,
-	44267 - 44032: 0x81E6,
-	44268 - 44032: 0xB0F3,
-	44269 - 44032: 0x81E7,
-	44270 - 44032: 0x81E8,
-	44271 - 44032: 0xB0F4,
-	44272 - 44032: 0xB0F5,
-	44273 - 44032: 0xB0F6,
-	44274 - 44032: 0x81E9,
-	44275 - 44032: 0xB0F7,
-	44276 - 44032: 0x81EA,
-	44277 - 44032: 0xB0F8,
-	44278 - 44032: 0xB0F9,
-	44279 - 44032: 0x81EB,
-	44280 - 44032: 0x81EC,
-	44281 - 44032: 0x81ED,
-	44282 - 44032: 0x81EE,
-	44283 - 44032: 0x81EF,
-	44284 - 44032: 0xB0FA,
-	44285 - 44032: 0xB0FB,
-	44286 - 44032: 0x81F0,
-	44287 - 44032: 0x81F1,
-	44288 - 44032: 0xB0FC,
-	44289 - 44032: 0x81F2,
-	44290 - 44032: 0x81F3,
-	44291 - 44032: 0x81F4,
-	44292 - 44032: 0xB0FD,
-	44293 - 44032: 0x81F5,
-	44294 - 44032: 0xB0FE,
-	44295 - 44032: 0x81F6,
-	44296 - 44032: 0x81F7,
-	44297 - 44032: 0x81F8,
-	44298 - 44032: 0x81F9,
-	44299 - 44032: 0x81FA,
-	44300 - 44032: 0xB1A1,
-	44301 - 44032: 0xB1A2,
-	44302 - 44032: 0x81FB,
-	44303 - 44032: 0xB1A3,
-	44304 - 44032: 0x81FC,
-	44305 - 44032: 0xB1A4,
-	44306 - 44032: 0x81FD,
-	44307 - 44032: 0x81FE,
-	44308 - 44032: 0x8241,
-	44309 - 44032: 0x8242,
-	44310 - 44032: 0x8243,
-	44311 - 44032: 0x8244,
-	44312 - 44032: 0xB1A5,
-	44313 - 44032: 0x8245,
-	44314 - 44032: 0x8246,
-	44315 - 44032: 0x8247,
-	44316 - 44032: 0xB1A6,
-	44317 - 44032: 0x8248,
-	44318 - 44032: 0x8249,
-	44319 - 44032: 0x824A,
-	44320 - 44032: 0xB1A7,
-	44321 - 44032: 0x824B,
-	44322 - 44032: 0x824C,
-	44323 - 44032: 0x824D,
-	44324 - 44032: 0x824E,
-	44325 - 44032: 0x824F,
-	44326 - 44032: 0x8250,
-	44327 - 44032: 0x8251,
-	44328 - 44032: 0x8252,
-	44329 - 44032: 0xB1A8,
-	44330 - 44032: 0x8253,
-	44331 - 44032: 0x8254,
-	44332 - 44032: 0xB1A9,
-	44333 - 44032: 0xB1AA,
-	44334 - 44032: 0x8255,
-	44335 - 44032: 0x8256,
-	44336 - 44032: 0x8257,
-	44337 - 44032: 0x8258,
-	44338 - 44032: 0x8259,
-	44339 - 44032: 0x825A,
-	44340 - 44032: 0xB1AB,
-	44341 - 44032: 0xB1AC,
-	44342 - 44032: 0x8261,
-	44343 - 44032: 0x8262,
-	44344 - 44032: 0xB1AD,
-	44345 - 44032: 0x8263,
-	44346 - 44032: 0x8264,
-	44347 - 44032: 0x8265,
-	44348 - 44032: 0xB1AE,
-	44349 - 44032: 0x8266,
-	44350 - 44032: 0x8267,
-	44351 - 44032: 0x8268,
-	44352 - 44032: 0x8269,
-	44353 - 44032: 0x826A,
-	44354 - 44032: 0x826B,
-	44355 - 44032: 0x826C,
-	44356 - 44032: 0xB1AF,
-	44357 - 44032: 0xB1B0,
-	44358 - 44032: 0x826D,
-	44359 - 44032: 0xB1B1,
-	44360 - 44032: 0x826E,
-	44361 - 44032: 0xB1B2,
-	44362 - 44032: 0x826F,
-	44363 - 44032: 0x8270,
-	44364 - 44032: 0x8271,
-	44365 - 44032: 0x8272,
-	44366 - 44032: 0x8273,
-	44367 - 44032: 0x8274,
-	44368 - 44032: 0xB1B3,
-	44369 - 44032: 0x8275,
-	44370 - 44032: 0x8276,
-	44371 - 44032: 0x8277,
-	44372 - 44032: 0xB1B4,
-	44373 - 44032: 0x8278,
-	44374 - 44032: 0x8279,
-	44375 - 44032: 0x827A,
-	44376 - 44032: 0xB1B5,
-	44377 - 44032: 0x8281,
-	44378 - 44032: 0x8282,
-	44379 - 44032: 0x8283,
-	44380 - 44032: 0x8284,
-	44381 - 44032: 0x8285,
-	44382 - 44032: 0x8286,
-	44383 - 44032: 0x8287,
-	44384 - 44032: 0x8288,
-	44385 - 44032: 0xB1B6,
-	44386 - 44032: 0x8289,
-	44387 - 44032: 0xB1B7,
-	44388 - 44032: 0x828A,
-	44389 - 44032: 0x828B,
-	44390 - 44032: 0x828C,
-	44391 - 44032: 0x828D,
-	44392 - 44032: 0x828E,
-	44393 - 44032: 0x828F,
-	44394 - 44032: 0x8290,
-	44395 - 44032: 0x8291,
-	44396 - 44032: 0xB1B8,
-	44397 - 44032: 0xB1B9,
-	44398 - 44032: 0x8292,
-	44399 - 44032: 0x8293,
-	44400 - 44032: 0xB1BA,
-	44401 - 44032: 0x8294,
-	44402 - 44032: 0x8295,
-	44403 - 44032: 0xB1BB,
-	44404 - 44032: 0xB1BC,
-	44405 - 44032: 0xB1BD,
-	44406 - 44032: 0xB1BE,
-	44407 - 44032: 0x8296,
-	44408 - 44032: 0x8297,
-	44409 - 44032: 0x8298,
-	44410 - 44032: 0x8299,
-	44411 - 44032: 0xB1BF,
-	44412 - 44032: 0xB1C0,
-	44413 - 44032: 0xB1C1,
-	44414 - 44032: 0x829A,
-	44415 - 44032: 0xB1C2,
-	44416 - 44032: 0x829B,
-	44417 - 44032: 0xB1C3,
-	44418 - 44032: 0xB1C4,
-	44419 - 44032: 0x829C,
-	44420 - 44032: 0x829D,
-	44421 - 44032: 0x829E,
-	44422 - 44032: 0x829F,
-	44423 - 44032: 0x82A0,
-	44424 - 44032: 0xB1C5,
-	44425 - 44032: 0xB1C6,
-	44426 - 44032: 0x82A1,
-	44427 - 44032: 0x82A2,
-	44428 - 44032: 0xB1C7,
-	44429 - 44032: 0x82A3,
-	44430 - 44032: 0x82A4,
-	44431 - 44032: 0x82A5,
-	44432 - 44032: 0xB1C8,
-	44433 - 44032: 0x82A6,
-	44434 - 44032: 0x82A7,
-	44435 - 44032: 0x82A8,
-	44436 - 44032: 0x82A9,
-	44437 - 44032: 0x82AA,
-	44438 - 44032: 0x82AB,
-	44439 - 44032: 0x82AC,
-	44440 - 44032: 0x82AD,
-	44441 - 44032: 0x82AE,
-	44442 - 44032: 0x82AF,
-	44443 - 44032: 0x82B0,
-	44444 - 44032: 0xB1C9,
-	44445 - 44032: 0xB1CA,
-	44446 - 44032: 0x82B1,
-	44447 - 44032: 0x82B2,
-	44448 - 44032: 0x82B3,
-	44449 - 44032: 0x82B4,
-	44450 - 44032: 0x82B5,
-	44451 - 44032: 0x82B6,
-	44452 - 44032: 0xB1CB,
-	44453 - 44032: 0x82B7,
-	44454 - 44032: 0x82B8,
-	44455 - 44032: 0x82B9,
-	44456 - 44032: 0x82BA,
-	44457 - 44032: 0x82BB,
-	44458 - 44032: 0x82BC,
-	44459 - 44032: 0x82BD,
-	44460 - 44032: 0x82BE,
-	44461 - 44032: 0x82BF,
-	44462 - 44032: 0x82C0,
-	44463 - 44032: 0x82C1,
-	44464 - 44032: 0x82C2,
-	44465 - 44032: 0x82C3,
-	44466 - 44032: 0x82C4,
-	44467 - 44032: 0x82C5,
-	44468 - 44032: 0x82C6,
-	44469 - 44032: 0x82C7,
-	44470 - 44032: 0x82C8,
-	44471 - 44032: 0xB1CC,
-	44472 - 44032: 0x82C9,
-	44473 - 44032: 0x82CA,
-	44474 - 44032: 0x82CB,
-	44475 - 44032: 0x82CC,
-	44476 - 44032: 0x82CD,
-	44477 - 44032: 0x82CE,
-	44478 - 44032: 0x82CF,
-	44479 - 44032: 0x82D0,
-	44480 - 44032: 0xB1CD,
-	44481 - 44032: 0xB1CE,
-	44482 - 44032: 0x82D1,
-	44483 - 44032: 0x82D2,
-	44484 - 44032: 0xB1CF,
-	44485 - 44032: 0x82D3,
-	44486 - 44032: 0x82D4,
-	44487 - 44032: 0x82D5,
-	44488 - 44032: 0xB1D0,
-	44489 - 44032: 0x82D6,
-	44490 - 44032: 0x82D7,
-	44491 - 44032: 0x82D8,
-	44492 - 44032: 0x82D9,
-	44493 - 44032: 0x82DA,
-	44494 - 44032: 0x82DB,
-	44495 - 44032: 0x82DC,
-	44496 - 44032: 0xB1D1,
-	44497 - 44032: 0xB1D2,
-	44498 - 44032: 0x82DD,
-	44499 - 44032: 0xB1D3,
-	44500 - 44032: 0x82DE,
-	44501 - 44032: 0x82DF,
-	44502 - 44032: 0x82E0,
-	44503 - 44032: 0x82E1,
-	44504 - 44032: 0x82E2,
-	44505 - 44032: 0x82E3,
-	44506 - 44032: 0x82E4,
-	44507 - 44032: 0x82E5,
-	44508 - 44032: 0xB1D4,
-	44509 - 44032: 0x82E6,
-	44510 - 44032: 0x82E7,
-	44511 - 44032: 0x82E8,
-	44512 - 44032: 0xB1D5,
-	44513 - 44032: 0x82E9,
-	44514 - 44032: 0x82EA,
-	44515 - 44032: 0x82EB,
-	44516 - 44032: 0xB1D6,
-	44517 - 44032: 0x82EC,
-	44518 - 44032: 0x82ED,
-	44519 - 44032: 0x82EE,
-	44520 - 44032: 0x82EF,
-	44521 - 44032: 0x82F0,
-	44522 - 44032: 0x82F1,
-	44523 - 44032: 0x82F2,
-	44524 - 44032: 0x82F3,
-	44525 - 44032: 0x82F4,
-	44526 - 44032: 0x82F5,
-	44527 - 44032: 0x82F6,
-	44528 - 44032: 0x82F7,
-	44529 - 44032: 0x82F8,
-	44530 - 44032: 0x82F9,
-	44531 - 44032: 0x82FA,
-	44532 - 44032: 0x82FB,
-	44533 - 44032: 0x82FC,
-	44534 - 44032: 0x82FD,
-	44535 - 44032: 0x82FE,
-	44536 - 44032: 0xB1D7,
-	44537 - 44032: 0xB1D8,
-	44538 - 44032: 0x8341,
-	44539 - 44032: 0x8342,
-	44540 - 44032: 0xB1D9,
-	44541 - 44032: 0x8343,
-	44542 - 44032: 0x8344,
-	44543 - 44032: 0xB1DA,
-	44544 - 44032: 0xB1DB,
-	44545 - 44032: 0xB1DC,
-	44546 - 44032: 0x8345,
-	44547 - 44032: 0x8346,
-	44548 - 44032: 0x8347,
-	44549 - 44032: 0x8348,
-	44550 - 44032: 0x8349,
-	44551 - 44032: 0x834A,
-	44552 - 44032: 0xB1DD,
-	44553 - 44032: 0xB1DE,
-	44554 - 44032: 0x834B,
-	44555 - 44032: 0xB1DF,
-	44556 - 44032: 0x834C,
-	44557 - 44032: 0xB1E0,
-	44558 - 44032: 0x834D,
-	44559 - 44032: 0x834E,
-	44560 - 44032: 0x834F,
-	44561 - 44032: 0x8350,
-	44562 - 44032: 0x8351,
-	44563 - 44032: 0x8352,
-	44564 - 44032: 0xB1E1,
-	44565 - 44032: 0x8353,
-	44566 - 44032: 0x8354,
-	44567 - 44032: 0x8355,
-	44568 - 44032: 0x8356,
-	44569 - 44032: 0x8357,
-	44570 - 44032: 0x8358,
-	44571 - 44032: 0x8359,
-	44572 - 44032: 0x835A,
-	44573 - 44032: 0x8361,
-	44574 - 44032: 0x8362,
-	44575 - 44032: 0x8363,
-	44576 - 44032: 0x8364,
-	44577 - 44032: 0x8365,
-	44578 - 44032: 0x8366,
-	44579 - 44032: 0x8367,
-	44580 - 44032: 0x8368,
-	44581 - 44032: 0x8369,
-	44582 - 44032: 0x836A,
-	44583 - 44032: 0x836B,
-	44584 - 44032: 0x836C,
-	44585 - 44032: 0x836D,
-	44586 - 44032: 0x836E,
-	44587 - 44032: 0x836F,
-	44588 - 44032: 0x8370,
-	44589 - 44032: 0x8371,
-	44590 - 44032: 0x8372,
-	44591 - 44032: 0x8373,
-	44592 - 44032: 0xB1E2,
-	44593 - 44032: 0xB1E3,
-	44594 - 44032: 0x8374,
-	44595 - 44032: 0x8375,
-	44596 - 44032: 0xB1E4,
-	44597 - 44032: 0x8376,
-	44598 - 44032: 0x8377,
-	44599 - 44032: 0xB1E5,
-	44600 - 44032: 0xB1E6,
-	44601 - 44032: 0x8378,
-	44602 - 44032: 0xB1E7,
-	44603 - 44032: 0x8379,
-	44604 - 44032: 0x837A,
-	44605 - 44032: 0x8381,
-	44606 - 44032: 0x8382,
-	44607 - 44032: 0x8383,
-	44608 - 44032: 0xB1E8,
-	44609 - 44032: 0xB1E9,
-	44610 - 44032: 0x8384,
-	44611 - 44032: 0xB1EA,
-	44612 - 44032: 0x8385,
-	44613 - 44032: 0xB1EB,
-	44614 - 44032: 0xB1EC,
-	44615 - 44032: 0x8386,
-	44616 - 44032: 0x8387,
-	44617 - 44032: 0x8388,
-	44618 - 44032: 0xB1ED,
-	44619 - 44032: 0x8389,
-	44620 - 44032: 0xB1EE,
-	44621 - 44032: 0xB1EF,
-	44622 - 44032: 0xB1F0,
-	44623 - 44032: 0x838A,
-	44624 - 44032: 0xB1F1,
-	44625 - 44032: 0x838B,
-	44626 - 44032: 0x838C,
-	44627 - 44032: 0x838D,
-	44628 - 44032: 0xB1F2,
-	44629 - 44032: 0x838E,
-	44630 - 44032: 0xB1F3,
-	44631 - 44032: 0x838F,
-	44632 - 44032: 0x8390,
-	44633 - 44032: 0x8391,
-	44634 - 44032: 0x8392,
-	44635 - 44032: 0x8393,
-	44636 - 44032: 0xB1F4,
-	44637 - 44032: 0xB1F5,
-	44638 - 44032: 0x8394,
-	44639 - 44032: 0xB1F6,
-	44640 - 44032: 0xB1F7,
-	44641 - 44032: 0xB1F8,
-	44642 - 44032: 0x8395,
-	44643 - 44032: 0x8396,
-	44644 - 44032: 0x8397,
-	44645 - 44032: 0xB1F9,
-	44646 - 44032: 0x8398,
-	44647 - 44032: 0x8399,
-	44648 - 44032: 0xB1FA,
-	44649 - 44032: 0xB1FB,
-	44650 - 44032: 0x839A,
-	44651 - 44032: 0x839B,
-	44652 - 44032: 0xB1FC,
-	44653 - 44032: 0x839C,
-	44654 - 44032: 0x839D,
-	44655 - 44032: 0x839E,
-	44656 - 44032: 0xB1FD,
-	44657 - 44032: 0x839F,
-	44658 - 44032: 0x83A0,
-	44659 - 44032: 0x83A1,
-	44660 - 44032: 0x83A2,
-	44661 - 44032: 0x83A3,
-	44662 - 44032: 0x83A4,
-	44663 - 44032: 0x83A5,
-	44664 - 44032: 0xB1FE,
-	44665 - 44032: 0xB2A1,
-	44666 - 44032: 0x83A6,
-	44667 - 44032: 0xB2A2,
-	44668 - 44032: 0xB2A3,
-	44669 - 44032: 0xB2A4,
-	44670 - 44032: 0x83A7,
-	44671 - 44032: 0x83A8,
-	44672 - 44032: 0x83A9,
-	44673 - 44032: 0x83AA,
-	44674 - 44032: 0x83AB,
-	44675 - 44032: 0x83AC,
-	44676 - 44032: 0xB2A5,
-	44677 - 44032: 0xB2A6,
-	44678 - 44032: 0x83AD,
-	44679 - 44032: 0x83AE,
-	44680 - 44032: 0x83AF,
-	44681 - 44032: 0x83B0,
-	44682 - 44032: 0x83B1,
-	44683 - 44032: 0x83B2,
-	44684 - 44032: 0xB2A7,
-	44685 - 44032: 0x83B3,
-	44686 - 44032: 0x83B4,
-	44687 - 44032: 0x83B5,
-	44688 - 44032: 0x83B6,
-	44689 - 44032: 0x83B7,
-	44690 - 44032: 0x83B8,
-	44691 - 44032: 0x83B9,
-	44692 - 44032: 0x83BA,
-	44693 - 44032: 0x83BB,
-	44694 - 44032: 0x83BC,
-	44695 - 44032: 0x83BD,
-	44696 - 44032: 0x83BE,
-	44697 - 44032: 0x83BF,
-	44698 - 44032: 0x83C0,
-	44699 - 44032: 0x83C1,
-	44700 - 44032: 0x83C2,
-	44701 - 44032: 0x83C3,
-	44702 - 44032: 0x83C4,
-	44703 - 44032: 0x83C5,
-	44704 - 44032: 0x83C6,
-	44705 - 44032: 0x83C7,
-	44706 - 44032: 0x83C8,
-	44707 - 44032: 0x83C9,
-	44708 - 44032: 0x83CA,
-	44709 - 44032: 0x83CB,
-	44710 - 44032: 0x83CC,
-	44711 - 44032: 0x83CD,
-	44712 - 44032: 0x83CE,
-	44713 - 44032: 0x83CF,
-	44714 - 44032: 0x83D0,
-	44715 - 44032: 0x83D1,
-	44716 - 44032: 0x83D2,
-	44717 - 44032: 0x83D3,
-	44718 - 44032: 0x83D4,
-	44719 - 44032: 0x83D5,
-	44720 - 44032: 0x83D6,
-	44721 - 44032: 0x83D7,
-	44722 - 44032: 0x83D8,
-	44723 - 44032: 0x83D9,
-	44724 - 44032: 0x83DA,
-	44725 - 44032: 0x83DB,
-	44726 - 44032: 0x83DC,
-	44727 - 44032: 0x83DD,
-	44728 - 44032: 0x83DE,
-	44729 - 44032: 0x83DF,
-	44730 - 44032: 0x83E0,
-	44731 - 44032: 0x83E1,
-	44732 - 44032: 0xB2A8,
-	44733 - 44032: 0xB2A9,
-	44734 - 44032: 0xB2AA,
-	44735 - 44032: 0x83E2,
-	44736 - 44032: 0xB2AB,
-	44737 - 44032: 0x83E3,
-	44738 - 44032: 0x83E4,
-	44739 - 44032: 0x83E5,
-	44740 - 44032: 0xB2AC,
-	44741 - 44032: 0x83E6,
-	44742 - 44032: 0x83E7,
-	44743 - 44032: 0x83E8,
-	44744 - 44032: 0x83E9,
-	44745 - 44032: 0x83EA,
-	44746 - 44032: 0x83EB,
-	44747 - 44032: 0x83EC,
-	44748 - 44032: 0xB2AD,
-	44749 - 44032: 0xB2AE,
-	44750 - 44032: 0x83ED,
-	44751 - 44032: 0xB2AF,
-	44752 - 44032: 0xB2B0,
-	44753 - 44032: 0xB2B1,
-	44754 - 44032: 0x83EE,
-	44755 - 44032: 0x83EF,
-	44756 - 44032: 0x83F0,
-	44757 - 44032: 0x83F1,
-	44758 - 44032: 0x83F2,
-	44759 - 44032: 0x83F3,
-	44760 - 44032: 0xB2B2,
-	44761 - 44032: 0xB2B3,
-	44762 - 44032: 0x83F4,
-	44763 - 44032: 0x83F5,
-	44764 - 44032: 0xB2B4,
-	44765 - 44032: 0x83F6,
-	44766 - 44032: 0x83F7,
-	44767 - 44032: 0x83F8,
-	44768 - 44032: 0x83F9,
-	44769 - 44032: 0x83FA,
-	44770 - 44032: 0x83FB,
-	44771 - 44032: 0x83FC,
-	44772 - 44032: 0x83FD,
-	44773 - 44032: 0x83FE,
-	44774 - 44032: 0x8441,
-	44775 - 44032: 0x8442,
-	44776 - 44032: 0xB2B5,
-	44777 - 44032: 0x8443,
-	44778 - 44032: 0x8444,
-	44779 - 44032: 0xB2B6,
-	44780 - 44032: 0x8445,
-	44781 - 44032: 0xB2B7,
-	44782 - 44032: 0x8446,
-	44783 - 44032: 0x8447,
-	44784 - 44032: 0x8448,
-	44785 - 44032: 0x8449,
-	44786 - 44032: 0x844A,
-	44787 - 44032: 0x844B,
-	44788 - 44032: 0xB2B8,
-	44789 - 44032: 0x844C,
-	44790 - 44032: 0x844D,
-	44791 - 44032: 0x844E,
-	44792 - 44032: 0xB2B9,
-	44793 - 44032: 0x844F,
-	44794 - 44032: 0x8450,
-	44795 - 44032: 0x8451,
-	44796 - 44032: 0xB2BA,
-	44797 - 44032: 0x8452,
-	44798 - 44032: 0x8453,
-	44799 - 44032: 0x8454,
-	44800 - 44032: 0x8455,
-	44801 - 44032: 0x8456,
-	44802 - 44032: 0x8457,
-	44803 - 44032: 0x8458,
-	44804 - 44032: 0x8459,
-	44805 - 44032: 0x845A,
-	44806 - 44032: 0x8461,
-	44807 - 44032: 0xB2BB,
-	44808 - 44032: 0xB2BC,
-	44809 - 44032: 0x8462,
-	44810 - 44032: 0x8463,
-	44811 - 44032: 0x8464,
-	44812 - 44032: 0x8465,
-	44813 - 44032: 0xB2BD,
-	44814 - 44032: 0x8466,
-	44815 - 44032: 0x8467,
-	44816 - 44032: 0xB2BE,
-	44817 - 44032: 0x8468,
-	44818 - 44032: 0x8469,
-	44819 - 44032: 0x846A,
-	44820 - 44032: 0x846B,
-	44821 - 44032: 0x846C,
-	44822 - 44032: 0x846D,
-	44823 - 44032: 0x846E,
-	44824 - 44032: 0x846F,
-	44825 - 44032: 0x8470,
-	44826 - 44032: 0x8471,
-	44827 - 44032: 0x8472,
-	44828 - 44032: 0x8473,
-	44829 - 44032: 0x8474,
-	44830 - 44032: 0x8475,
-	44831 - 44032: 0x8476,
-	44832 - 44032: 0x8477,
-	44833 - 44032: 0x8478,
-	44834 - 44032: 0x8479,
-	44835 - 44032: 0x847A,
-	44836 - 44032: 0x8481,
-	44837 - 44032: 0x8482,
-	44838 - 44032: 0x8483,
-	44839 - 44032: 0x8484,
-	44840 - 44032: 0x8485,
-	44841 - 44032: 0x8486,
-	44842 - 44032: 0x8487,
-	44843 - 44032: 0x8488,
-	44844 - 44032: 0xB2BF,
-	44845 - 44032: 0xB2C0,
-	44846 - 44032: 0x8489,
-	44847 - 44032: 0x848A,
-	44848 - 44032: 0xB2C1,
-	44849 - 44032: 0x848B,
-	44850 - 44032: 0xB2C2,
-	44851 - 44032: 0x848C,
-	44852 - 44032: 0xB2C3,
-	44853 - 44032: 0x848D,
-	44854 - 44032: 0x848E,
-	44855 - 44032: 0x848F,
-	44856 - 44032: 0x8490,
-	44857 - 44032: 0x8491,
-	44858 - 44032: 0x8492,
-	44859 - 44032: 0x8493,
-	44860 - 44032: 0xB2C4,
-	44861 - 44032: 0xB2C5,
-	44862 - 44032: 0x8494,
-	44863 - 44032: 0xB2C6,
-	44864 - 44032: 0x8495,
-	44865 - 44032: 0xB2C7,
-	44866 - 44032: 0xB2C8,
-	44867 - 44032: 0xB2C9,
-	44868 - 44032: 0x8496,
-	44869 - 44032: 0x8497,
-	44870 - 44032: 0x8498,
-	44871 - 44032: 0x8499,
-	44872 - 44032: 0xB2CA,
-	44873 - 44032: 0xB2CB,
-	44874 - 44032: 0x849A,
-	44875 - 44032: 0x849B,
-	44876 - 44032: 0x849C,
-	44877 - 44032: 0x849D,
-	44878 - 44032: 0x849E,
-	44879 - 44032: 0x849F,
-	44880 - 44032: 0xB2CC,
-	44881 - 44032: 0x84A0,
-	44882 - 44032: 0x84A1,
-	44883 - 44032: 0x84A2,
-	44884 - 44032: 0x84A3,
-	44885 - 44032: 0x84A4,
-	44886 - 44032: 0x84A5,
-	44887 - 44032: 0x84A6,
-	44888 - 44032: 0x84A7,
-	44889 - 44032: 0x84A8,
-	44890 - 44032: 0x84A9,
-	44891 - 44032: 0x84AA,
-	44892 - 44032: 0xB2CD,
-	44893 - 44032: 0xB2CE,
-	44894 - 44032: 0x84AB,
-	44895 - 44032: 0x84AC,
-	44896 - 44032: 0x84AD,
-	44897 - 44032: 0x84AE,
-	44898 - 44032: 0x84AF,
-	44899 - 44032: 0x84B0,
-	44900 - 44032: 0xB2CF,
-	44901 - 44032: 0xB2D0,
-	44902 - 44032: 0x84B1,
-	44903 - 44032: 0x84B2,
-	44904 - 44032: 0x84B3,
-	44905 - 44032: 0x84B4,
-	44906 - 44032: 0x84B5,
-	44907 - 44032: 0x84B6,
-	44908 - 44032: 0x84B7,
-	44909 - 44032: 0x84B8,
-	44910 - 44032: 0x84B9,
-	44911 - 44032: 0x84BA,
-	44912 - 44032: 0x84BB,
-	44913 - 44032: 0x84BC,
-	44914 - 44032: 0x84BD,
-	44915 - 44032: 0x84BE,
-	44916 - 44032: 0x84BF,
-	44917 - 44032: 0x84C0,
-	44918 - 44032: 0x84C1,
-	44919 - 44032: 0x84C2,
-	44920 - 44032: 0x84C3,
-	44921 - 44032: 0xB2D1,
-	44922 - 44032: 0x84C4,
-	44923 - 44032: 0x84C5,
-	44924 - 44032: 0x84C6,
-	44925 - 44032: 0x84C7,
-	44926 - 44032: 0x84C8,
-	44927 - 44032: 0x84C9,
-	44928 - 44032: 0xB2D2,
-	44929 - 44032: 0x84CA,
-	44930 - 44032: 0x84CB,
-	44931 - 44032: 0x84CC,
-	44932 - 44032: 0xB2D3,
-	44933 - 44032: 0x84CD,
-	44934 - 44032: 0x84CE,
-	44935 - 44032: 0x84CF,
-	44936 - 44032: 0xB2D4,
-	44937 - 44032: 0x84D0,
-	44938 - 44032: 0x84D1,
-	44939 - 44032: 0x84D2,
-	44940 - 44032: 0x84D3,
-	44941 - 44032: 0x84D4,
-	44942 - 44032: 0x84D5,
-	44943 - 44032: 0x84D6,
-	44944 - 44032: 0xB2D5,
-	44945 - 44032: 0xB2D6,
-	44946 - 44032: 0x84D7,
-	44947 - 44032: 0x84D8,
-	44948 - 44032: 0x84D9,
-	44949 - 44032: 0xB2D7,
-	44950 - 44032: 0x84DA,
-	44951 - 44032: 0x84DB,
-	44952 - 44032: 0x84DC,
-	44953 - 44032: 0x84DD,
-	44954 - 44032: 0x84DE,
-	44955 - 44032: 0x84DF,
-	44956 - 44032: 0xB2D8,
-	44957 - 44032: 0x84E0,
-	44958 - 44032: 0x84E1,
-	44959 - 44032: 0x84E2,
-	44960 - 44032: 0x84E3,
-	44961 - 44032: 0x84E4,
-	44962 - 44032: 0x84E5,
-	44963 - 44032: 0x84E6,
-	44964 - 44032: 0x84E7,
-	44965 - 44032: 0x84E8,
-	44966 - 44032: 0x84E9,
-	44967 - 44032: 0x84EA,
-	44968 - 44032: 0x84EB,
-	44969 - 44032: 0x84EC,
-	44970 - 44032: 0x84ED,
-	44971 - 44032: 0x84EE,
-	44972 - 44032: 0x84EF,
-	44973 - 44032: 0x84F0,
-	44974 - 44032: 0x84F1,
-	44975 - 44032: 0x84F2,
-	44976 - 44032: 0x84F3,
-	44977 - 44032: 0x84F4,
-	44978 - 44032: 0x84F5,
-	44979 - 44032: 0x84F6,
-	44980 - 44032: 0x84F7,
-	44981 - 44032: 0x84F8,
-	44982 - 44032: 0x84F9,
-	44983 - 44032: 0x84FA,
-	44984 - 44032: 0xB2D9,
-	44985 - 44032: 0xB2DA,
-	44986 - 44032: 0x84FB,
-	44987 - 44032: 0x84FC,
-	44988 - 44032: 0xB2DB,
-	44989 - 44032: 0x84FD,
-	44990 - 44032: 0x84FE,
-	44991 - 44032: 0x8541,
-	44992 - 44032: 0xB2DC,
-	44993 - 44032: 0x8542,
-	44994 - 44032: 0x8543,
-	44995 - 44032: 0x8544,
-	44996 - 44032: 0x8545,
-	44997 - 44032: 0x8546,
-	44998 - 44032: 0x8547,
-	44999 - 44032: 0xB2DD,
-	45000 - 44032: 0xB2DE,
-	45001 - 44032: 0xB2DF,
-	45002 - 44032: 0x8548,
-	45003 - 44032: 0xB2E0,
-	45004 - 44032: 0x8549,
-	45005 - 44032: 0xB2E1,
-	45006 - 44032: 0xB2E2,
-	45007 - 44032: 0x854A,
-	45008 - 44032: 0x854B,
-	45009 - 44032: 0x854C,
-	45010 - 44032: 0x854D,
-	45011 - 44032: 0x854E,
-	45012 - 44032: 0xB2E3,
-	45013 - 44032: 0x854F,
-	45014 - 44032: 0x8550,
-	45015 - 44032: 0x8551,
-	45016 - 44032: 0x8552,
-	45017 - 44032: 0x8553,
-	45018 - 44032: 0x8554,
-	45019 - 44032: 0x8555,
-	45020 - 44032: 0xB2E4,
-	45021 - 44032: 0x8556,
-	45022 - 44032: 0x8557,
-	45023 - 44032: 0x8558,
-	45024 - 44032: 0x8559,
-	45025 - 44032: 0x855A,
-	45026 - 44032: 0x8561,
-	45027 - 44032: 0x8562,
-	45028 - 44032: 0x8563,
-	45029 - 44032: 0x8564,
-	45030 - 44032: 0x8565,
-	45031 - 44032: 0x8566,
-	45032 - 44032: 0xB2E5,
-	45033 - 44032: 0xB2E6,
-	45034 - 44032: 0x8567,
-	45035 - 44032: 0x8568,
-	45036 - 44032: 0x8569,
-	45037 - 44032: 0x856A,
-	45038 - 44032: 0x856B,
-	45039 - 44032: 0x856C,
-	45040 - 44032: 0xB2E7,
-	45041 - 44032: 0xB2E8,
-	45042 - 44032: 0x856D,
-	45043 - 44032: 0x856E,
-	45044 - 44032: 0xB2E9,
-	45045 - 44032: 0x856F,
-	45046 - 44032: 0x8570,
-	45047 - 44032: 0x8571,
-	45048 - 44032: 0xB2EA,
-	45049 - 44032: 0x8572,
-	45050 - 44032: 0x8573,
-	45051 - 44032: 0x8574,
-	45052 - 44032: 0x8575,
-	45053 - 44032: 0x8576,
-	45054 - 44032: 0x8577,
-	45055 - 44032: 0x8578,
-	45056 - 44032: 0xB2EB,
-	45057 - 44032: 0xB2EC,
-	45058 - 44032: 0x8579,
-	45059 - 44032: 0x857A,
-	45060 - 44032: 0xB2ED,
-	45061 - 44032: 0x8581,
-	45062 - 44032: 0x8582,
-	45063 - 44032: 0x8583,
-	45064 - 44032: 0x8584,
-	45065 - 44032: 0x8585,
-	45066 - 44032: 0x8586,
-	45067 - 44032: 0x8587,
-	45068 - 44032: 0xB2EE,
-	45069 - 44032: 0x8588,
-	45070 - 44032: 0x8589,
-	45071 - 44032: 0x858A,
-	45072 - 44032: 0xB2EF,
-	45073 - 44032: 0x858B,
-	45074 - 44032: 0x858C,
-	45075 - 44032: 0x858D,
-	45076 - 44032: 0xB2F0,
-	45077 - 44032: 0x858E,
-	45078 - 44032: 0x858F,
-	45079 - 44032: 0x8590,
-	45080 - 44032: 0x8591,
-	45081 - 44032: 0x8592,
-	45082 - 44032: 0x8593,
-	45083 - 44032: 0x8594,
-	45084 - 44032: 0xB2F1,
-	45085 - 44032: 0xB2F2,
-	45086 - 44032: 0x8595,
-	45087 - 44032: 0x8596,
-	45088 - 44032: 0x8597,
-	45089 - 44032: 0x8598,
-	45090 - 44032: 0x8599,
-	45091 - 44032: 0x859A,
-	45092 - 44032: 0x859B,
-	45093 - 44032: 0x859C,
-	45094 - 44032: 0x859D,
-	45095 - 44032: 0x859E,
-	45096 - 44032: 0xB2F3,
-	45097 - 44032: 0x859F,
-	45098 - 44032: 0x85A0,
-	45099 - 44032: 0x85A1,
-	45100 - 44032: 0x85A2,
-	45101 - 44032: 0x85A3,
-	45102 - 44032: 0x85A4,
-	45103 - 44032: 0x85A5,
-	45104 - 44032: 0x85A6,
-	45105 - 44032: 0x85A7,
-	45106 - 44032: 0x85A8,
-	45107 - 44032: 0x85A9,
-	45108 - 44032: 0x85AA,
-	45109 - 44032: 0x85AB,
-	45110 - 44032: 0x85AC,
-	45111 - 44032: 0x85AD,
-	45112 - 44032: 0x85AE,
-	45113 - 44032: 0x85AF,
-	45114 - 44032: 0x85B0,
-	45115 - 44032: 0x85B1,
-	45116 - 44032: 0x85B2,
-	45117 - 44032: 0x85B3,
-	45118 - 44032: 0x85B4,
-	45119 - 44032: 0x85B5,
-	45120 - 44032: 0x85B6,
-	45121 - 44032: 0x85B7,
-	45122 - 44032: 0x85B8,
-	45123 - 44032: 0x85B9,
-	45124 - 44032: 0xB2F4,
-	45125 - 44032: 0xB2F5,
-	45126 - 44032: 0x85BA,
-	45127 - 44032: 0x85BB,
-	45128 - 44032: 0xB2F6,
-	45129 - 44032: 0x85BC,
-	45130 - 44032: 0xB2F7,
-	45131 - 44032: 0x85BD,
-	45132 - 44032: 0xB2F8,
-	45133 - 44032: 0x85BE,
-	45134 - 44032: 0xB2F9,
-	45135 - 44032: 0x85BF,
-	45136 - 44032: 0x85C0,
-	45137 - 44032: 0x85C1,
-	45138 - 44032: 0x85C2,
-	45139 - 44032: 0xB2FA,
-	45140 - 44032: 0xB2FB,
-	45141 - 44032: 0xB2FC,
-	45142 - 44032: 0x85C3,
-	45143 - 44032: 0xB2FD,
-	45144 - 44032: 0x85C4,
-	45145 - 44032: 0xB2FE,
-	45146 - 44032: 0x85C5,
-	45147 - 44032: 0x85C6,
-	45148 - 44032: 0x85C7,
-	45149 - 44032: 0xB3A1,
-	45150 - 44032: 0x85C8,
-	45151 - 44032: 0x85C9,
-	45152 - 44032: 0x85CA,
-	45153 - 44032: 0x85CB,
-	45154 - 44032: 0x85CC,
-	45155 - 44032: 0x85CD,
-	45156 - 44032: 0x85CE,
-	45157 - 44032: 0x85CF,
-	45158 - 44032: 0x85D0,
-	45159 - 44032: 0x85D1,
-	45160 - 44032: 0x85D2,
-	45161 - 44032: 0x85D3,
-	45162 - 44032: 0x85D4,
-	45163 - 44032: 0x85D5,
-	45164 - 44032: 0x85D6,
-	45165 - 44032: 0x85D7,
-	45166 - 44032: 0x85D8,
-	45167 - 44032: 0x85D9,
-	45168 - 44032: 0x85DA,
-	45169 - 44032: 0x85DB,
-	45170 - 44032: 0x85DC,
-	45171 - 44032: 0x85DD,
-	45172 - 44032: 0x85DE,
-	45173 - 44032: 0x85DF,
-	45174 - 44032: 0x85E0,
-	45175 - 44032: 0x85E1,
-	45176 - 44032: 0x85E2,
-	45177 - 44032: 0x85E3,
-	45178 - 44032: 0x85E4,
-	45179 - 44032: 0x85E5,
-	45180 - 44032: 0xB3A2,
-	45181 - 44032: 0xB3A3,
-	45182 - 44032: 0x85E6,
-	45183 - 44032: 0x85E7,
-	45184 - 44032: 0xB3A4,
-	45185 - 44032: 0x85E8,
-	45186 - 44032: 0x85E9,
-	45187 - 44032: 0x85EA,
-	45188 - 44032: 0xB3A5,
-	45189 - 44032: 0x85EB,
-	45190 - 44032: 0x85EC,
-	45191 - 44032: 0x85ED,
-	45192 - 44032: 0x85EE,
-	45193 - 44032: 0x85EF,
-	45194 - 44032: 0x85F0,
-	45195 - 44032: 0x85F1,
-	45196 - 44032: 0xB3A6,
-	45197 - 44032: 0xB3A7,
-	45198 - 44032: 0x85F2,
-	45199 - 44032: 0xB3A8,
-	45200 - 44032: 0x85F3,
-	45201 - 44032: 0xB3A9,
-	45202 - 44032: 0x85F4,
-	45203 - 44032: 0x85F5,
-	45204 - 44032: 0x85F6,
-	45205 - 44032: 0x85F7,
-	45206 - 44032: 0x85F8,
-	45207 - 44032: 0x85F9,
-	45208 - 44032: 0xB3AA,
-	45209 - 44032: 0xB3AB,
-	45210 - 44032: 0xB3AC,
-	45211 - 44032: 0x85FA,
-	45212 - 44032: 0xB3AD,
-	45213 - 44032: 0x85FB,
-	45214 - 44032: 0x85FC,
-	45215 - 44032: 0xB3AE,
-	45216 - 44032: 0xB3AF,
-	45217 - 44032: 0xB3B0,
-	45218 - 44032: 0xB3B1,
-	45219 - 44032: 0x85FD,
-	45220 - 44032: 0x85FE,
-	45221 - 44032: 0x8641,
-	45222 - 44032: 0x8642,
-	45223 - 44032: 0x8643,
-	45224 - 44032: 0xB3B2,
-	45225 - 44032: 0xB3B3,
-	45226 - 44032: 0x8644,
-	45227 - 44032: 0xB3B4,
-	45228 - 44032: 0xB3B5,
-	45229 - 44032: 0xB3B6,
-	45230 - 44032: 0xB3B7,
-	45231 - 44032: 0xB3B8,
-	45232 - 44032: 0x8645,
-	45233 - 44032: 0xB3B9,
-	45234 - 44032: 0x8646,
-	45235 - 44032: 0xB3BA,
-	45236 - 44032: 0xB3BB,
-	45237 - 44032: 0xB3BC,
-	45238 - 44032: 0x8647,
-	45239 - 44032: 0x8648,
-	45240 - 44032: 0xB3BD,
-	45241 - 44032: 0x8649,
-	45242 - 44032: 0x864A,
-	45243 - 44032: 0x864B,
-	45244 - 44032: 0xB3BE,
-	45245 - 44032: 0x864C,
-	45246 - 44032: 0x864D,
-	45247 - 44032: 0x864E,
-	45248 - 44032: 0x864F,
-	45249 - 44032: 0x8650,
-	45250 - 44032: 0x8651,
-	45251 - 44032: 0x8652,
-	45252 - 44032: 0xB3BF,
-	45253 - 44032: 0xB3C0,
-	45254 - 44032: 0x8653,
-	45255 - 44032: 0xB3C1,
-	45256 - 44032: 0xB3C2,
-	45257 - 44032: 0xB3C3,
-	45258 - 44032: 0x8654,
-	45259 - 44032: 0x8655,
-	45260 - 44032: 0x8656,
-	45261 - 44032: 0x8657,
-	45262 - 44032: 0x8658,
-	45263 - 44032: 0x8659,
-	45264 - 44032: 0xB3C4,
-	45265 - 44032: 0xB3C5,
-	45266 - 44032: 0x865A,
-	45267 - 44032: 0x8661,
-	45268 - 44032: 0xB3C6,
-	45269 - 44032: 0x8662,
-	45270 - 44032: 0x8663,
-	45271 - 44032: 0x8664,
-	45272 - 44032: 0xB3C7,
-	45273 - 44032: 0x8665,
-	45274 - 44032: 0x8666,
-	45275 - 44032: 0x8667,
-	45276 - 44032: 0x8668,
-	45277 - 44032: 0x8669,
-	45278 - 44032: 0x866A,
-	45279 - 44032: 0x866B,
-	45280 - 44032: 0xB3C8,
-	45281 - 44032: 0x866C,
-	45282 - 44032: 0x866D,
-	45283 - 44032: 0x866E,
-	45284 - 44032: 0x866F,
-	45285 - 44032: 0xB3C9,
-	45286 - 44032: 0x8670,
-	45287 - 44032: 0x8671,
-	45288 - 44032: 0x8672,
-	45289 - 44032: 0x8673,
-	45290 - 44032: 0x8674,
-	45291 - 44032: 0x8675,
-	45292 - 44032: 0x8676,
-	45293 - 44032: 0x8677,
-	45294 - 44032: 0x8678,
-	45295 - 44032: 0x8679,
-	45296 - 44032: 0x867A,
-	45297 - 44032: 0x8681,
-	45298 - 44032: 0x8682,
-	45299 - 44032: 0x8683,
-	45300 - 44032: 0x8684,
-	45301 - 44032: 0x8685,
-	45302 - 44032: 0x8686,
-	45303 - 44032: 0x8687,
-	45304 - 44032: 0x8688,
-	45305 - 44032: 0x8689,
-	45306 - 44032: 0x868A,
-	45307 - 44032: 0x868B,
-	45308 - 44032: 0x868C,
-	45309 - 44032: 0x868D,
-	45310 - 44032: 0x868E,
-	45311 - 44032: 0x868F,
-	45312 - 44032: 0x8690,
-	45313 - 44032: 0x8691,
-	45314 - 44032: 0x8692,
-	45315 - 44032: 0x8693,
-	45316 - 44032: 0x8694,
-	45317 - 44032: 0x8695,
-	45318 - 44032: 0x8696,
-	45319 - 44032: 0x8697,
-	45320 - 44032: 0xB3CA,
-	45321 - 44032: 0xB3CB,
-	45322 - 44032: 0x8698,
-	45323 - 44032: 0xB3CC,
-	45324 - 44032: 0xB3CD,
-	45325 - 44032: 0x8699,
-	45326 - 44032: 0x869A,
-	45327 - 44032: 0x869B,
-	45328 - 44032: 0xB3CE,
-	45329 - 44032: 0x869C,
-	45330 - 44032: 0xB3CF,
-	45331 - 44032: 0xB3D0,
-	45332 - 44032: 0x869D,
-	45333 - 44032: 0x869E,
-	45334 - 44032: 0x869F,
-	45335 - 44032: 0x86A0,
-	45336 - 44032: 0xB3D1,
-	45337 - 44032: 0xB3D2,
-	45338 - 44032: 0x86A1,
-	45339 - 44032: 0xB3D3,
-	45340 - 44032: 0xB3D4,
-	45341 - 44032: 0xB3D5,
-	45342 - 44032: 0x86A2,
-	45343 - 44032: 0x86A3,
-	45344 - 44032: 0x86A4,
-	45345 - 44032: 0x86A5,
-	45346 - 44032: 0x86A6,
-	45347 - 44032: 0xB3D6,
-	45348 - 44032: 0xB3D7,
-	45349 - 44032: 0xB3D8,
-	45350 - 44032: 0x86A7,
-	45351 - 44032: 0x86A8,
-	45352 - 44032: 0xB3D9,
-	45353 - 44032: 0x86A9,
-	45354 - 44032: 0x86AA,
-	45355 - 44032: 0x86AB,
-	45356 - 44032: 0xB3DA,
-	45357 - 44032: 0x86AC,
-	45358 - 44032: 0x86AD,
-	45359 - 44032: 0x86AE,
-	45360 - 44032: 0x86AF,
-	45361 - 44032: 0x86B0,
-	45362 - 44032: 0x86B1,
-	45363 - 44032: 0x86B2,
-	45364 - 44032: 0xB3DB,
-	45365 - 44032: 0xB3DC,
-	45366 - 44032: 0x86B3,
-	45367 - 44032: 0xB3DD,
-	45368 - 44032: 0xB3DE,
-	45369 - 44032: 0xB3DF,
-	45370 - 44032: 0x86B4,
-	45371 - 44032: 0x86B5,
-	45372 - 44032: 0x86B6,
-	45373 - 44032: 0x86B7,
-	45374 - 44032: 0x86B8,
-	45375 - 44032: 0x86B9,
-	45376 - 44032: 0xB3E0,
-	45377 - 44032: 0xB3E1,
-	45378 - 44032: 0x86BA,
-	45379 - 44032: 0x86BB,
-	45380 - 44032: 0xB3E2,
-	45381 - 44032: 0x86BC,
-	45382 - 44032: 0x86BD,
-	45383 - 44032: 0x86BE,
-	45384 - 44032: 0xB3E3,
-	45385 - 44032: 0x86BF,
-	45386 - 44032: 0x86C0,
-	45387 - 44032: 0x86C1,
-	45388 - 44032: 0x86C2,
-	45389 - 44032: 0x86C3,
-	45390 - 44032: 0x86C4,
-	45391 - 44032: 0x86C5,
-	45392 - 44032: 0xB3E4,
-	45393 - 44032: 0xB3E5,
-	45394 - 44032: 0x86C6,
-	45395 - 44032: 0x86C7,
-	45396 - 44032: 0xB3E6,
-	45397 - 44032: 0xB3E7,
-	45398 - 44032: 0x86C8,
-	45399 - 44032: 0x86C9,
-	45400 - 44032: 0xB3E8,
-	45401 - 44032: 0x86CA,
-	45402 - 44032: 0x86CB,
-	45403 - 44032: 0x86CC,
-	45404 - 44032: 0xB3E9,
-	45405 - 44032: 0x86CD,
-	45406 - 44032: 0x86CE,
-	45407 - 44032: 0x86CF,
-	45408 - 44032: 0xB3EA,
-	45409 - 44032: 0x86D0,
-	45410 - 44032: 0x86D1,
-	45411 - 44032: 0x86D2,
-	45412 - 44032: 0x86D3,
-	45413 - 44032: 0x86D4,
-	45414 - 44032: 0x86D5,
-	45415 - 44032: 0x86D6,
-	45416 - 44032: 0x86D7,
-	45417 - 44032: 0x86D8,
-	45418 - 44032: 0x86D9,
-	45419 - 44032: 0x86DA,
-	45420 - 44032: 0x86DB,
-	45421 - 44032: 0x86DC,
-	45422 - 44032: 0x86DD,
-	45423 - 44032: 0x86DE,
-	45424 - 44032: 0x86DF,
-	45425 - 44032: 0x86E0,
-	45426 - 44032: 0x86E1,
-	45427 - 44032: 0x86E2,
-	45428 - 44032: 0x86E3,
-	45429 - 44032: 0x86E4,
-	45430 - 44032: 0x86E5,
-	45431 - 44032: 0x86E6,
-	45432 - 44032: 0xB3EB,
-	45433 - 44032: 0xB3EC,
-	45434 - 44032: 0x86E7,
-	45435 - 44032: 0x86E8,
-	45436 - 44032: 0xB3ED,
-	45437 - 44032: 0x86E9,
-	45438 - 44032: 0x86EA,
-	45439 - 44032: 0x86EB,
-	45440 - 44032: 0xB3EE,
-	45441 - 44032: 0x86EC,
-	45442 - 44032: 0xB3EF,
-	45443 - 44032: 0x86ED,
-	45444 - 44032: 0x86EE,
-	45445 - 44032: 0x86EF,
-	45446 - 44032: 0x86F0,
-	45447 - 44032: 0x86F1,
-	45448 - 44032: 0xB3F0,
-	45449 - 44032: 0xB3F1,
-	45450 - 44032: 0x86F2,
-	45451 - 44032: 0xB3F2,
-	45452 - 44032: 0x86F3,
-	45453 - 44032: 0xB3F3,
-	45454 - 44032: 0x86F4,
-	45455 - 44032: 0x86F5,
-	45456 - 44032: 0x86F6,
-	45457 - 44032: 0x86F7,
-	45458 - 44032: 0xB3F4,
-	45459 - 44032: 0xB3F5,
-	45460 - 44032: 0xB3F6,
-	45461 - 44032: 0x86F8,
-	45462 - 44032: 0x86F9,
-	45463 - 44032: 0x86FA,
-	45464 - 44032: 0xB3F7,
-	45465 - 44032: 0x86FB,
-	45466 - 44032: 0x86FC,
-	45467 - 44032: 0x86FD,
-	45468 - 44032: 0xB3F8,
-	45469 - 44032: 0x86FE,
-	45470 - 44032: 0x8741,
-	45471 - 44032: 0x8742,
-	45472 - 44032: 0x8743,
-	45473 - 44032: 0x8744,
-	45474 - 44032: 0x8745,
-	45475 - 44032: 0x8746,
-	45476 - 44032: 0x8747,
-	45477 - 44032: 0x8748,
-	45478 - 44032: 0x8749,
-	45479 - 44032: 0x874A,
-	45480 - 44032: 0xB3F9,
-	45481 - 44032: 0x874B,
-	45482 - 44032: 0x874C,
-	45483 - 44032: 0x874D,
-	45484 - 44032: 0x874E,
-	45485 - 44032: 0x874F,
-	45486 - 44032: 0x8750,
-	45487 - 44032: 0x8751,
-	45488 - 44032: 0x8752,
-	45489 - 44032: 0x8753,
-	45490 - 44032: 0x8754,
-	45491 - 44032: 0x8755,
-	45492 - 44032: 0x8756,
-	45493 - 44032: 0x8757,
-	45494 - 44032: 0x8758,
-	45495 - 44032: 0x8759,
-	45496 - 44032: 0x875A,
-	45497 - 44032: 0x8761,
-	45498 - 44032: 0x8762,
-	45499 - 44032: 0x8763,
-	45500 - 44032: 0x8764,
-	45501 - 44032: 0x8765,
-	45502 - 44032: 0x8766,
-	45503 - 44032: 0x8767,
-	45504 - 44032: 0x8768,
-	45505 - 44032: 0x8769,
-	45506 - 44032: 0x876A,
-	45507 - 44032: 0x876B,
-	45508 - 44032: 0x876C,
-	45509 - 44032: 0x876D,
-	45510 - 44032: 0x876E,
-	45511 - 44032: 0x876F,
-	45512 - 44032: 0x8770,
-	45513 - 44032: 0x8771,
-	45514 - 44032: 0x8772,
-	45515 - 44032: 0x8773,
-	45516 - 44032: 0xB3FA,
-	45517 - 44032: 0x8774,
-	45518 - 44032: 0x8775,
-	45519 - 44032: 0x8776,
-	45520 - 44032: 0xB3FB,
-	45521 - 44032: 0x8777,
-	45522 - 44032: 0x8778,
-	45523 - 44032: 0x8779,
-	45524 - 44032: 0xB3FC,
-	45525 - 44032: 0x877A,
-	45526 - 44032: 0x8781,
-	45527 - 44032: 0x8782,
-	45528 - 44032: 0x8783,
-	45529 - 44032: 0x8784,
-	45530 - 44032: 0x8785,
-	45531 - 44032: 0x8786,
-	45532 - 44032: 0xB3FD,
-	45533 - 44032: 0xB3FE,
-	45534 - 44032: 0x8787,
-	45535 - 44032: 0xB4A1,
-	45536 - 44032: 0x8788,
-	45537 - 44032: 0x8789,
-	45538 - 44032: 0x878A,
-	45539 - 44032: 0x878B,
-	45540 - 44032: 0x878C,
-	45541 - 44032: 0x878D,
-	45542 - 44032: 0x878E,
-	45543 - 44032: 0x878F,
-	45544 - 44032: 0xB4A2,
-	45545 - 44032: 0xB4A3,
-	45546 - 44032: 0x8790,
-	45547 - 44032: 0x8791,
-	45548 - 44032: 0xB4A4,
-	45549 - 44032: 0x8792,
-	45550 - 44032: 0x8793,
-	45551 - 44032: 0x8794,
-	45552 - 44032: 0xB4A5,
-	45553 - 44032: 0x8795,
-	45554 - 44032: 0x8796,
-	45555 - 44032: 0x8797,
-	45556 - 44032: 0x8798,
-	45557 - 44032: 0x8799,
-	45558 - 44032: 0x879A,
-	45559 - 44032: 0x879B,
-	45560 - 44032: 0x879C,
-	45561 - 44032: 0xB4A6,
-	45562 - 44032: 0x879D,
-	45563 - 44032: 0xB4A7,
-	45564 - 44032: 0x879E,
-	45565 - 44032: 0xB4A8,
-	45566 - 44032: 0x879F,
-	45567 - 44032: 0x87A0,
-	45568 - 44032: 0x87A1,
-	45569 - 44032: 0x87A2,
-	45570 - 44032: 0x87A3,
-	45571 - 44032: 0x87A4,
-	45572 - 44032: 0xB4A9,
-	45573 - 44032: 0xB4AA,
-	45574 - 44032: 0x87A5,
-	45575 - 44032: 0x87A6,
-	45576 - 44032: 0xB4AB,
-	45577 - 44032: 0x87A7,
-	45578 - 44032: 0x87A8,
-	45579 - 44032: 0xB4AC,
-	45580 - 44032: 0xB4AD,
-	45581 - 44032: 0x87A9,
-	45582 - 44032: 0x87AA,
-	45583 - 44032: 0x87AB,
-	45584 - 44032: 0x87AC,
-	45585 - 44032: 0x87AD,
-	45586 - 44032: 0x87AE,
-	45587 - 44032: 0x87AF,
-	45588 - 44032: 0xB4AE,
-	45589 - 44032: 0xB4AF,
-	45590 - 44032: 0x87B0,
-	45591 - 44032: 0xB4B0,
-	45592 - 44032: 0x87B1,
-	45593 - 44032: 0xB4B1,
-	45594 - 44032: 0x87B2,
-	45595 - 44032: 0x87B3,
-	45596 - 44032: 0x87B4,
-	45597 - 44032: 0x87B5,
-	45598 - 44032: 0x87B6,
-	45599 - 44032: 0x87B7,
-	45600 - 44032: 0xB4B2,
-	45601 - 44032: 0x87B8,
-	45602 - 44032: 0x87B9,
-	45603 - 44032: 0x87BA,
-	45604 - 44032: 0x87BB,
-	45605 - 44032: 0x87BC,
-	45606 - 44032: 0x87BD,
-	45607 - 44032: 0x87BE,
-	45608 - 44032: 0x87BF,
-	45609 - 44032: 0x87C0,
-	45610 - 44032: 0x87C1,
-	45611 - 44032: 0x87C2,
-	45612 - 44032: 0x87C3,
-	45613 - 44032: 0x87C4,
-	45614 - 44032: 0x87C5,
-	45615 - 44032: 0x87C6,
-	45616 - 44032: 0x87C7,
-	45617 - 44032: 0x87C8,
-	45618 - 44032: 0x87C9,
-	45619 - 44032: 0x87CA,
-	45620 - 44032: 0xB4B3,
-	45621 - 44032: 0x87CB,
-	45622 - 44032: 0x87CC,
-	45623 - 44032: 0x87CD,
-	45624 - 44032: 0x87CE,
-	45625 - 44032: 0x87CF,
-	45626 - 44032: 0x87D0,
-	45627 - 44032: 0x87D1,
-	45628 - 44032: 0xB4B4,
-	45629 - 44032: 0x87D2,
-	45630 - 44032: 0x87D3,
-	45631 - 44032: 0x87D4,
-	45632 - 44032: 0x87D5,
-	45633 - 44032: 0x87D6,
-	45634 - 44032: 0x87D7,
-	45635 - 44032: 0x87D8,
-	45636 - 44032: 0x87D9,
-	45637 - 44032: 0x87DA,
-	45638 - 44032: 0x87DB,
-	45639 - 44032: 0x87DC,
-	45640 - 44032: 0x87DD,
-	45641 - 44032: 0x87DE,
-	45642 - 44032: 0x87DF,
-	45643 - 44032: 0x87E0,
-	45644 - 44032: 0x87E1,
-	45645 - 44032: 0x87E2,
-	45646 - 44032: 0x87E3,
-	45647 - 44032: 0x87E4,
-	45648 - 44032: 0x87E5,
-	45649 - 44032: 0x87E6,
-	45650 - 44032: 0x87E7,
-	45651 - 44032: 0x87E8,
-	45652 - 44032: 0x87E9,
-	45653 - 44032: 0x87EA,
-	45654 - 44032: 0x87EB,
-	45655 - 44032: 0x87EC,
-	45656 - 44032: 0xB4B5,
-	45657 - 44032: 0x87ED,
-	45658 - 44032: 0x87EE,
-	45659 - 44032: 0x87EF,
-	45660 - 44032: 0xB4B6,
-	45661 - 44032: 0x87F0,
-	45662 - 44032: 0x87F1,
-	45663 - 44032: 0x87F2,
-	45664 - 44032: 0xB4B7,
-	45665 - 44032: 0x87F3,
-	45666 - 44032: 0x87F4,
-	45667 - 44032: 0x87F5,
-	45668 - 44032: 0x87F6,
-	45669 - 44032: 0x87F7,
-	45670 - 44032: 0x87F8,
-	45671 - 44032: 0x87F9,
-	45672 - 44032: 0xB4B8,
-	45673 - 44032: 0xB4B9,
-	45674 - 44032: 0x87FA,
-	45675 - 44032: 0x87FB,
-	45676 - 44032: 0x87FC,
-	45677 - 44032: 0x87FD,
-	45678 - 44032: 0x87FE,
-	45679 - 44032: 0x8841,
-	45680 - 44032: 0x8842,
-	45681 - 44032: 0x8843,
-	45682 - 44032: 0x8844,
-	45683 - 44032: 0x8845,
-	45684 - 44032: 0xB4BA,
-	45685 - 44032: 0xB4BB,
-	45686 - 44032: 0x8846,
-	45687 - 44032: 0x8847,
-	45688 - 44032: 0x8848,
-	45689 - 44032: 0x8849,
-	45690 - 44032: 0x884A,
-	45691 - 44032: 0x884B,
-	45692 - 44032: 0xB4BC,
-	45693 - 44032: 0x884C,
-	45694 - 44032: 0x884D,
-	45695 - 44032: 0x884E,
-	45696 - 44032: 0x884F,
-	45697 - 44032: 0x8850,
-	45698 - 44032: 0x8851,
-	45699 - 44032: 0x8852,
-	45700 - 44032: 0xB4BD,
-	45701 - 44032: 0xB4BE,
-	45702 - 44032: 0x8853,
-	45703 - 44032: 0x8854,
-	45704 - 44032: 0x8855,
-	45705 - 44032: 0xB4BF,
-	45706 - 44032: 0x8856,
-	45707 - 44032: 0x8857,
-	45708 - 44032: 0x8858,
-	45709 - 44032: 0x8859,
-	45710 - 44032: 0x885A,
-	45711 - 44032: 0x8861,
-	45712 - 44032: 0xB4C0,
-	45713 - 44032: 0xB4C1,
-	45714 - 44032: 0x8862,
-	45715 - 44032: 0x8863,
-	45716 - 44032: 0xB4C2,
-	45717 - 44032: 0x8864,
-	45718 - 44032: 0x8865,
-	45719 - 44032: 0x8866,
-	45720 - 44032: 0xB4C3,
-	45721 - 44032: 0xB4C4,
-	45722 - 44032: 0xB4C5,
-	45723 - 44032: 0x8867,
-	45724 - 44032: 0x8868,
-	45725 - 44032: 0x8869,
-	45726 - 44032: 0x886A,
-	45727 - 44032: 0x886B,
-	45728 - 44032: 0xB4C6,
-	45729 - 44032: 0xB4C7,
-	45730 - 44032: 0x886C,
-	45731 - 44032: 0xB4C8,
-	45732 - 44032: 0x886D,
-	45733 - 44032: 0xB4C9,
-	45734 - 44032: 0xB4CA,
-	45735 - 44032: 0x886E,
-	45736 - 44032: 0x886F,
-	45737 - 44032: 0x8870,
-	45738 - 44032: 0xB4CB,
-	45739 - 44032: 0x8871,
-	45740 - 44032: 0xB4CC,
-	45741 - 44032: 0x8872,
-	45742 - 44032: 0x8873,
-	45743 - 44032: 0x8874,
-	45744 - 44032: 0xB4CD,
-	45745 - 44032: 0x8875,
-	45746 - 44032: 0x8876,
-	45747 - 44032: 0x8877,
-	45748 - 44032: 0xB4CE,
-	45749 - 44032: 0x8878,
-	45750 - 44032: 0x8879,
-	45751 - 44032: 0x887A,
-	45752 - 44032: 0x8881,
-	45753 - 44032: 0x8882,
-	45754 - 44032: 0x8883,
-	45755 - 44032: 0x8884,
-	45756 - 44032: 0x8885,
-	45757 - 44032: 0x8886,
-	45758 - 44032: 0x8887,
-	45759 - 44032: 0x8888,
-	45760 - 44032: 0x8889,
-	45761 - 44032: 0x888A,
-	45762 - 44032: 0x888B,
-	45763 - 44032: 0x888C,
-	45764 - 44032: 0x888D,
-	45765 - 44032: 0x888E,
-	45766 - 44032: 0x888F,
-	45767 - 44032: 0x8890,
-	45768 - 44032: 0xB4CF,
-	45769 - 44032: 0xB4D0,
-	45770 - 44032: 0x8891,
-	45771 - 44032: 0x8892,
-	45772 - 44032: 0xB4D1,
-	45773 - 44032: 0x8893,
-	45774 - 44032: 0x8894,
-	45775 - 44032: 0x8895,
-	45776 - 44032: 0xB4D2,
-	45777 - 44032: 0x8896,
-	45778 - 44032: 0xB4D3,
-	45779 - 44032: 0x8897,
-	45780 - 44032: 0x8898,
-	45781 - 44032: 0x8899,
-	45782 - 44032: 0x889A,
-	45783 - 44032: 0x889B,
-	45784 - 44032: 0xB4D4,
-	45785 - 44032: 0xB4D5,
-	45786 - 44032: 0x889C,
-	45787 - 44032: 0xB4D6,
-	45788 - 44032: 0x889D,
-	45789 - 44032: 0xB4D7,
-	45790 - 44032: 0x889E,
-	45791 - 44032: 0x889F,
-	45792 - 44032: 0x88A0,
-	45793 - 44032: 0x88A1,
-	45794 - 44032: 0xB4D8,
-	45795 - 44032: 0x88A2,
-	45796 - 44032: 0xB4D9,
-	45797 - 44032: 0xB4DA,
-	45798 - 44032: 0xB4DB,
-	45799 - 44032: 0x88A3,
-	45800 - 44032: 0xB4DC,
-	45801 - 44032: 0x88A4,
-	45802 - 44032: 0x88A5,
-	45803 - 44032: 0xB4DD,
-	45804 - 44032: 0xB4DE,
-	45805 - 44032: 0xB4DF,
-	45806 - 44032: 0xB4E0,
-	45807 - 44032: 0xB4E1,
-	45808 - 44032: 0x88A6,
-	45809 - 44032: 0x88A7,
-	45810 - 44032: 0x88A8,
-	45811 - 44032: 0xB4E2,
-	45812 - 44032: 0xB4E3,
-	45813 - 44032: 0xB4E4,
-	45814 - 44032: 0x88A9,
-	45815 - 44032: 0xB4E5,
-	45816 - 44032: 0xB4E6,
-	45817 - 44032: 0xB4E7,
-	45818 - 44032: 0xB4E8,
-	45819 - 44032: 0xB4E9,
-	45820 - 44032: 0x88AA,
-	45821 - 44032: 0x88AB,
-	45822 - 44032: 0x88AC,
-	45823 - 44032: 0xB4EA,
-	45824 - 44032: 0xB4EB,
-	45825 - 44032: 0xB4EC,
-	45826 - 44032: 0x88AD,
-	45827 - 44032: 0x88AE,
-	45828 - 44032: 0xB4ED,
-	45829 - 44032: 0x88AF,
-	45830 - 44032: 0x88B0,
-	45831 - 44032: 0x88B1,
-	45832 - 44032: 0xB4EE,
-	45833 - 44032: 0x88B2,
-	45834 - 44032: 0x88B3,
-	45835 - 44032: 0x88B4,
-	45836 - 44032: 0x88B5,
-	45837 - 44032: 0x88B6,
-	45838 - 44032: 0x88B7,
-	45839 - 44032: 0x88B8,
-	45840 - 44032: 0xB4EF,
-	45841 - 44032: 0xB4F0,
-	45842 - 44032: 0x88B9,
-	45843 - 44032: 0xB4F1,
-	45844 - 44032: 0xB4F2,
-	45845 - 44032: 0xB4F3,
-	45846 - 44032: 0x88BA,
-	45847 - 44032: 0x88BB,
-	45848 - 44032: 0x88BC,
-	45849 - 44032: 0x88BD,
-	45850 - 44032: 0x88BE,
-	45851 - 44032: 0x88BF,
-	45852 - 44032: 0xB4F4,
-	45853 - 44032: 0x88C0,
-	45854 - 44032: 0x88C1,
-	45855 - 44032: 0x88C2,
-	45856 - 44032: 0x88C3,
-	45857 - 44032: 0x88C4,
-	45858 - 44032: 0x88C5,
-	45859 - 44032: 0x88C6,
-	45860 - 44032: 0x88C7,
-	45861 - 44032: 0x88C8,
-	45862 - 44032: 0x88C9,
-	45863 - 44032: 0x88CA,
-	45864 - 44032: 0x88CB,
-	45865 - 44032: 0x88CC,
-	45866 - 44032: 0x88CD,
-	45867 - 44032: 0x88CE,
-	45868 - 44032: 0x88CF,
-	45869 - 44032: 0x88D0,
-	45870 - 44032: 0x88D1,
-	45871 - 44032: 0x88D2,
-	45872 - 44032: 0x88D3,
-	45873 - 44032: 0x88D4,
-	45874 - 44032: 0x88D5,
-	45875 - 44032: 0x88D6,
-	45876 - 44032: 0x88D7,
-	45877 - 44032: 0x88D8,
-	45878 - 44032: 0x88D9,
-	45879 - 44032: 0x88DA,
-	45880 - 44032: 0x88DB,
-	45881 - 44032: 0x88DC,
-	45882 - 44032: 0x88DD,
-	45883 - 44032: 0x88DE,
-	45884 - 44032: 0x88DF,
-	45885 - 44032: 0x88E0,
-	45886 - 44032: 0x88E1,
-	45887 - 44032: 0x88E2,
-	45888 - 44032: 0x88E3,
-	45889 - 44032: 0x88E4,
-	45890 - 44032: 0x88E5,
-	45891 - 44032: 0x88E6,
-	45892 - 44032: 0x88E7,
-	45893 - 44032: 0x88E8,
-	45894 - 44032: 0x88E9,
-	45895 - 44032: 0x88EA,
-	45896 - 44032: 0x88EB,
-	45897 - 44032: 0x88EC,
-	45898 - 44032: 0x88ED,
-	45899 - 44032: 0x88EE,
-	45900 - 44032: 0x88EF,
-	45901 - 44032: 0x88F0,
-	45902 - 44032: 0x88F1,
-	45903 - 44032: 0x88F2,
-	45904 - 44032: 0x88F3,
-	45905 - 44032: 0x88F4,
-	45906 - 44032: 0x88F5,
-	45907 - 44032: 0x88F6,
-	45908 - 44032: 0xB4F5,
-	45909 - 44032: 0xB4F6,
-	45910 - 44032: 0xB4F7,
-	45911 - 44032: 0x88F7,
-	45912 - 44032: 0xB4F8,
-	45913 - 44032: 0x88F8,
-	45914 - 44032: 0x88F9,
-	45915 - 44032: 0xB4F9,
-	45916 - 44032: 0xB4FA,
-	45917 - 44032: 0x88FA,
-	45918 - 44032: 0xB4FB,
-	45919 - 44032: 0xB4FC,
-	45920 - 44032: 0x88FB,
-	45921 - 44032: 0x88FC,
-	45922 - 44032: 0x88FD,
-	45923 - 44032: 0x88FE,
-	45924 - 44032: 0xB4FD,
-	45925 - 44032: 0xB4FE,
-	45926 - 44032: 0x8941,
-	45927 - 44032: 0xB5A1,
-	45928 - 44032: 0x8942,
-	45929 - 44032: 0xB5A2,
-	45930 - 44032: 0x8943,
-	45931 - 44032: 0xB5A3,
-	45932 - 44032: 0x8944,
-	45933 - 44032: 0x8945,
-	45934 - 44032: 0xB5A4,
-	45935 - 44032: 0x8946,
-	45936 - 44032: 0xB5A5,
-	45937 - 44032: 0xB5A6,
-	45938 - 44032: 0x8947,
-	45939 - 44032: 0x8948,
-	45940 - 44032: 0xB5A7,
-	45941 - 44032: 0x8949,
-	45942 - 44032: 0x894A,
-	45943 - 44032: 0x894B,
-	45944 - 44032: 0xB5A8,
-	45945 - 44032: 0x894C,
-	45946 - 44032: 0x894D,
-	45947 - 44032: 0x894E,
-	45948 - 44032: 0x894F,
-	45949 - 44032: 0x8950,
-	45950 - 44032: 0x8951,
-	45951 - 44032: 0x8952,
-	45952 - 44032: 0xB5A9,
-	45953 - 44032: 0xB5AA,
-	45954 - 44032: 0x8953,
-	45955 - 44032: 0xB5AB,
-	45956 - 44032: 0xB5AC,
-	45957 - 44032: 0xB5AD,
-	45958 - 44032: 0x8954,
-	45959 - 44032: 0x8955,
-	45960 - 44032: 0x8956,
-	45961 - 44032: 0x8957,
-	45962 - 44032: 0x8958,
-	45963 - 44032: 0x8959,
-	45964 - 44032: 0xB5AE,
-	45965 - 44032: 0x895A,
-	45966 - 44032: 0x8961,
-	45967 - 44032: 0x8962,
-	45968 - 44032: 0xB5AF,
-	45969 - 44032: 0x8963,
-	45970 - 44032: 0x8964,
-	45971 - 44032: 0x8965,
-	45972 - 44032: 0xB5B0,
-	45973 - 44032: 0x8966,
-	45974 - 44032: 0x8967,
-	45975 - 44032: 0x8968,
-	45976 - 44032: 0x8969,
-	45977 - 44032: 0x896A,
-	45978 - 44032: 0x896B,
-	45979 - 44032: 0x896C,
-	45980 - 44032: 0x896D,
-	45981 - 44032: 0x896E,
-	45982 - 44032: 0x896F,
-	45983 - 44032: 0x8970,
-	45984 - 44032: 0xB5B1,
-	45985 - 44032: 0xB5B2,
-	45986 - 44032: 0x8971,
-	45987 - 44032: 0x8972,
-	45988 - 44032: 0x8973,
-	45989 - 44032: 0x8974,
-	45990 - 44032: 0x8975,
-	45991 - 44032: 0x8976,
-	45992 - 44032: 0xB5B3,
-	45993 - 44032: 0x8977,
-	45994 - 44032: 0x8978,
-	45995 - 44032: 0x8979,
-	45996 - 44032: 0xB5B4,
-	45997 - 44032: 0x897A,
-	45998 - 44032: 0x8981,
-	45999 - 44032: 0x8982,
-	46000 - 44032: 0x8983,
-	46001 - 44032: 0x8984,
-	46002 - 44032: 0x8985,
-	46003 - 44032: 0x8986,
-	46004 - 44032: 0x8987,
-	46005 - 44032: 0x8988,
-	46006 - 44032: 0x8989,
-	46007 - 44032: 0x898A,
-	46008 - 44032: 0x898B,
-	46009 - 44032: 0x898C,
-	46010 - 44032: 0x898D,
-	46011 - 44032: 0x898E,
-	46012 - 44032: 0x898F,
-	46013 - 44032: 0x8990,
-	46014 - 44032: 0x8991,
-	46015 - 44032: 0x8992,
-	46016 - 44032: 0x8993,
-	46017 - 44032: 0x8994,
-	46018 - 44032: 0x8995,
-	46019 - 44032: 0x8996,
-	46020 - 44032: 0xB5B5,
-	46021 - 44032: 0xB5B6,
-	46022 - 44032: 0x8997,
-	46023 - 44032: 0x8998,
-	46024 - 44032: 0xB5B7,
-	46025 - 44032: 0x8999,
-	46026 - 44032: 0x899A,
-	46027 - 44032: 0xB5B8,
-	46028 - 44032: 0xB5B9,
-	46029 - 44032: 0x899B,
-	46030 - 44032: 0xB5BA,
-	46031 - 44032: 0x899C,
-	46032 - 44032: 0xB5BB,
-	46033 - 44032: 0x899D,
-	46034 - 44032: 0x899E,
-	46035 - 44032: 0x899F,
-	46036 - 44032: 0xB5BC,
-	46037 - 44032: 0xB5BD,
-	46038 - 44032: 0x89A0,
-	46039 - 44032: 0xB5BE,
-	46040 - 44032: 0x89A1,
-	46041 - 44032: 0xB5BF,
-	46042 - 44032: 0x89A2,
-	46043 - 44032: 0xB5C0,
-	46044 - 44032: 0x89A3,
-	46045 - 44032: 0xB5C1,
-	46046 - 44032: 0x89A4,
-	46047 - 44032: 0x89A5,
-	46048 - 44032: 0xB5C2,
-	46049 - 44032: 0x89A6,
-	46050 - 44032: 0x89A7,
-	46051 - 44032: 0x89A8,
-	46052 - 44032: 0xB5C3,
-	46053 - 44032: 0x89A9,
-	46054 - 44032: 0x89AA,
-	46055 - 44032: 0x89AB,
-	46056 - 44032: 0xB5C4,
-	46057 - 44032: 0x89AC,
-	46058 - 44032: 0x89AD,
-	46059 - 44032: 0x89AE,
-	46060 - 44032: 0x89AF,
-	46061 - 44032: 0x89B0,
-	46062 - 44032: 0x89B1,
-	46063 - 44032: 0x89B2,
-	46064 - 44032: 0x89B3,
-	46065 - 44032: 0x89B4,
-	46066 - 44032: 0x89B5,
-	46067 - 44032: 0x89B6,
-	46068 - 44032: 0x89B7,
-	46069 - 44032: 0x89B8,
-	46070 - 44032: 0x89B9,
-	46071 - 44032: 0x89BA,
-	46072 - 44032: 0x89BB,
-	46073 - 44032: 0x89BC,
-	46074 - 44032: 0x89BD,
-	46075 - 44032: 0x89BE,
-	46076 - 44032: 0xB5C5,
-	46077 - 44032: 0x89BF,
-	46078 - 44032: 0x89C0,
-	46079 - 44032: 0x89C1,
-	46080 - 44032: 0x89C2,
-	46081 - 44032: 0x89C3,
-	46082 - 44032: 0x89C4,
-	46083 - 44032: 0x89C5,
-	46084 - 44032: 0x89C6,
-	46085 - 44032: 0x89C7,
-	46086 - 44032: 0x89C8,
-	46087 - 44032: 0x89C9,
-	46088 - 44032: 0x89CA,
-	46089 - 44032: 0x89CB,
-	46090 - 44032: 0x89CC,
-	46091 - 44032: 0x89CD,
-	46092 - 44032: 0x89CE,
-	46093 - 44032: 0x89CF,
-	46094 - 44032: 0x89D0,
-	46095 - 44032: 0x89D1,
-	46096 - 44032: 0xB5C6,
-	46097 - 44032: 0x89D2,
-	46098 - 44032: 0x89D3,
-	46099 - 44032: 0x89D4,
-	46100 - 44032: 0x89D5,
-	46101 - 44032: 0x89D6,
-	46102 - 44032: 0x89D7,
-	46103 - 44032: 0x89D8,
-	46104 - 44032: 0xB5C7,
-	46105 - 44032: 0x89D9,
-	46106 - 44032: 0x89DA,
-	46107 - 44032: 0x89DB,
-	46108 - 44032: 0xB5C8,
-	46109 - 44032: 0x89DC,
-	46110 - 44032: 0x89DD,
-	46111 - 44032: 0x89DE,
-	46112 - 44032: 0xB5C9,
-	46113 - 44032: 0x89DF,
-	46114 - 44032: 0x89E0,
-	46115 - 44032: 0x89E1,
-	46116 - 44032: 0x89E2,
-	46117 - 44032: 0x89E3,
-	46118 - 44032: 0x89E4,
-	46119 - 44032: 0x89E5,
-	46120 - 44032: 0xB5CA,
-	46121 - 44032: 0xB5CB,
-	46122 - 44032: 0x89E6,
-	46123 - 44032: 0xB5CC,
-	46124 - 44032: 0x89E7,
-	46125 - 44032: 0x89E8,
-	46126 - 44032: 0x89E9,
-	46127 - 44032: 0x89EA,
-	46128 - 44032: 0x89EB,
-	46129 - 44032: 0x89EC,
-	46130 - 44032: 0x89ED,
-	46131 - 44032: 0x89EE,
-	46132 - 44032: 0xB5CD,
-	46133 - 44032: 0x89EF,
-	46134 - 44032: 0x89F0,
-	46135 - 44032: 0x89F1,
-	46136 - 44032: 0x89F2,
-	46137 - 44032: 0x89F3,
-	46138 - 44032: 0x89F4,
-	46139 - 44032: 0x89F5,
-	46140 - 44032: 0x89F6,
-	46141 - 44032: 0x89F7,
-	46142 - 44032: 0x89F8,
-	46143 - 44032: 0x89F9,
-	46144 - 44032: 0x89FA,
-	46145 - 44032: 0x89FB,
-	46146 - 44032: 0x89FC,
-	46147 - 44032: 0x89FD,
-	46148 - 44032: 0x89FE,
-	46149 - 44032: 0x8A41,
-	46150 - 44032: 0x8A42,
-	46151 - 44032: 0x8A43,
-	46152 - 44032: 0x8A44,
-	46153 - 44032: 0x8A45,
-	46154 - 44032: 0x8A46,
-	46155 - 44032: 0x8A47,
-	46156 - 44032: 0x8A48,
-	46157 - 44032: 0x8A49,
-	46158 - 44032: 0x8A4A,
-	46159 - 44032: 0x8A4B,
-	46160 - 44032: 0xB5CE,
-	46161 - 44032: 0xB5CF,
-	46162 - 44032: 0x8A4C,
-	46163 - 44032: 0x8A4D,
-	46164 - 44032: 0xB5D0,
-	46165 - 44032: 0x8A4E,
-	46166 - 44032: 0x8A4F,
-	46167 - 44032: 0x8A50,
-	46168 - 44032: 0xB5D1,
-	46169 - 44032: 0x8A51,
-	46170 - 44032: 0x8A52,
-	46171 - 44032: 0x8A53,
-	46172 - 44032: 0x8A54,
-	46173 - 44032: 0x8A55,
-	46174 - 44032: 0x8A56,
-	46175 - 44032: 0x8A57,
-	46176 - 44032: 0xB5D2,
-	46177 - 44032: 0xB5D3,
-	46178 - 44032: 0x8A58,
-	46179 - 44032: 0xB5D4,
-	46180 - 44032: 0x8A59,
-	46181 - 44032: 0xB5D5,
-	46182 - 44032: 0x8A5A,
-	46183 - 44032: 0x8A61,
-	46184 - 44032: 0x8A62,
-	46185 - 44032: 0x8A63,
-	46186 - 44032: 0x8A64,
-	46187 - 44032: 0x8A65,
-	46188 - 44032: 0xB5D6,
-	46189 - 44032: 0x8A66,
-	46190 - 44032: 0x8A67,
-	46191 - 44032: 0x8A68,
-	46192 - 44032: 0x8A69,
-	46193 - 44032: 0x8A6A,
-	46194 - 44032: 0x8A6B,
-	46195 - 44032: 0x8A6C,
-	46196 - 44032: 0x8A6D,
-	46197 - 44032: 0x8A6E,
-	46198 - 44032: 0x8A6F,
-	46199 - 44032: 0x8A70,
-	46200 - 44032: 0x8A71,
-	46201 - 44032: 0x8A72,
-	46202 - 44032: 0x8A73,
-	46203 - 44032: 0x8A74,
-	46204 - 44032: 0x8A75,
-	46205 - 44032: 0x8A76,
-	46206 - 44032: 0x8A77,
-	46207 - 44032: 0x8A78,
-	46208 - 44032: 0xB5D7,
-	46209 - 44032: 0x8A79,
-	46210 - 44032: 0x8A7A,
-	46211 - 44032: 0x8A81,
-	46212 - 44032: 0x8A82,
-	46213 - 44032: 0x8A83,
-	46214 - 44032: 0x8A84,
-	46215 - 44032: 0x8A85,
-	46216 - 44032: 0xB5D8,
-	46217 - 44032: 0x8A86,
-	46218 - 44032: 0x8A87,
-	46219 - 44032: 0x8A88,
-	46220 - 44032: 0x8A89,
-	46221 - 44032: 0x8A8A,
-	46222 - 44032: 0x8A8B,
-	46223 - 44032: 0x8A8C,
-	46224 - 44032: 0x8A8D,
-	46225 - 44032: 0x8A8E,
-	46226 - 44032: 0x8A8F,
-	46227 - 44032: 0x8A90,
-	46228 - 44032: 0x8A91,
-	46229 - 44032: 0x8A92,
-	46230 - 44032: 0x8A93,
-	46231 - 44032: 0x8A94,
-	46232 - 44032: 0x8A95,
-	46233 - 44032: 0x8A96,
-	46234 - 44032: 0x8A97,
-	46235 - 44032: 0x8A98,
-	46236 - 44032: 0x8A99,
-	46237 - 44032: 0xB5D9,
-	46238 - 44032: 0x8A9A,
-	46239 - 44032: 0x8A9B,
-	46240 - 44032: 0x8A9C,
-	46241 - 44032: 0x8A9D,
-	46242 - 44032: 0x8A9E,
-	46243 - 44032: 0x8A9F,
-	46244 - 44032: 0xB5DA,
-	46245 - 44032: 0x8AA0,
-	46246 - 44032: 0x8AA1,
-	46247 - 44032: 0x8AA2,
-	46248 - 44032: 0xB5DB,
-	46249 - 44032: 0x8AA3,
-	46250 - 44032: 0x8AA4,
-	46251 - 44032: 0x8AA5,
-	46252 - 44032: 0xB5DC,
-	46253 - 44032: 0x8AA6,
-	46254 - 44032: 0x8AA7,
-	46255 - 44032: 0x8AA8,
-	46256 - 44032: 0x8AA9,
-	46257 - 44032: 0x8AAA,
-	46258 - 44032: 0x8AAB,
-	46259 - 44032: 0x8AAC,
-	46260 - 44032: 0x8AAD,
-	46261 - 44032: 0xB5DD,
-	46262 - 44032: 0x8AAE,
-	46263 - 44032: 0xB5DE,
-	46264 - 44032: 0x8AAF,
-	46265 - 44032: 0xB5DF,
-	46266 - 44032: 0x8AB0,
-	46267 - 44032: 0x8AB1,
-	46268 - 44032: 0x8AB2,
-	46269 - 44032: 0x8AB3,
-	46270 - 44032: 0x8AB4,
-	46271 - 44032: 0x8AB5,
-	46272 - 44032: 0xB5E0,
-	46273 - 44032: 0x8AB6,
-	46274 - 44032: 0x8AB7,
-	46275 - 44032: 0x8AB8,
-	46276 - 44032: 0xB5E1,
-	46277 - 44032: 0x8AB9,
-	46278 - 44032: 0x8ABA,
-	46279 - 44032: 0x8ABB,
-	46280 - 44032: 0xB5E2,
-	46281 - 44032: 0x8ABC,
-	46282 - 44032: 0x8ABD,
-	46283 - 44032: 0x8ABE,
-	46284 - 44032: 0x8ABF,
-	46285 - 44032: 0x8AC0,
-	46286 - 44032: 0x8AC1,
-	46287 - 44032: 0x8AC2,
-	46288 - 44032: 0xB5E3,
-	46289 - 44032: 0x8AC3,
-	46290 - 44032: 0x8AC4,
-	46291 - 44032: 0x8AC5,
-	46292 - 44032: 0x8AC6,
-	46293 - 44032: 0xB5E4,
-	46294 - 44032: 0x8AC7,
-	46295 - 44032: 0x8AC8,
-	46296 - 44032: 0x8AC9,
-	46297 - 44032: 0x8ACA,
-	46298 - 44032: 0x8ACB,
-	46299 - 44032: 0x8ACC,
-	46300 - 44032: 0xB5E5,
-	46301 - 44032: 0xB5E6,
-	46302 - 44032: 0x8ACD,
-	46303 - 44032: 0x8ACE,
-	46304 - 44032: 0xB5E7,
-	46305 - 44032: 0x8ACF,
-	46306 - 44032: 0x8AD0,
-	46307 - 44032: 0xB5E8,
-	46308 - 44032: 0xB5E9,
-	46309 - 44032: 0x8AD1,
-	46310 - 44032: 0xB5EA,
-	46311 - 44032: 0x8AD2,
-	46312 - 44032: 0x8AD3,
-	46313 - 44032: 0x8AD4,
-	46314 - 44032: 0x8AD5,
-	46315 - 44032: 0x8AD6,
-	46316 - 44032: 0xB5EB,
-	46317 - 44032: 0xB5EC,
-	46318 - 44032: 0x8AD7,
-	46319 - 44032: 0xB5ED,
-	46320 - 44032: 0x8AD8,
-	46321 - 44032: 0xB5EE,
-	46322 - 44032: 0x8AD9,
-	46323 - 44032: 0x8ADA,
-	46324 - 44032: 0x8ADB,
-	46325 - 44032: 0x8ADC,
-	46326 - 44032: 0x8ADD,
-	46327 - 44032: 0x8ADE,
-	46328 - 44032: 0xB5EF,
-	46329 - 44032: 0x8ADF,
-	46330 - 44032: 0x8AE0,
-	46331 - 44032: 0x8AE1,
-	46332 - 44032: 0x8AE2,
-	46333 - 44032: 0x8AE3,
-	46334 - 44032: 0x8AE4,
-	46335 - 44032: 0x8AE5,
-	46336 - 44032: 0x8AE6,
-	46337 - 44032: 0x8AE7,
-	46338 - 44032: 0x8AE8,
-	46339 - 44032: 0x8AE9,
-	46340 - 44032: 0x8AEA,
-	46341 - 44032: 0x8AEB,
-	46342 - 44032: 0x8AEC,
-	46343 - 44032: 0x8AED,
-	46344 - 44032: 0x8AEE,
-	46345 - 44032: 0x8AEF,
-	46346 - 44032: 0x8AF0,
-	46347 - 44032: 0x8AF1,
-	46348 - 44032: 0x8AF2,
-	46349 - 44032: 0x8AF3,
-	46350 - 44032: 0x8AF4,
-	46351 - 44032: 0x8AF5,
-	46352 - 44032: 0x8AF6,
-	46353 - 44032: 0x8AF7,
-	46354 - 44032: 0x8AF8,
-	46355 - 44032: 0x8AF9,
-	46356 - 44032: 0xB5F0,
-	46357 - 44032: 0xB5F1,
-	46358 - 44032: 0x8AFA,
-	46359 - 44032: 0x8AFB,
-	46360 - 44032: 0xB5F2,
-	46361 - 44032: 0x8AFC,
-	46362 - 44032: 0x8AFD,
-	46363 - 44032: 0xB5F3,
-	46364 - 44032: 0xB5F4,
-	46365 - 44032: 0x8AFE,
-	46366 - 44032: 0x8B41,
-	46367 - 44032: 0x8B42,
-	46368 - 44032: 0x8B43,
-	46369 - 44032: 0x8B44,
-	46370 - 44032: 0x8B45,
-	46371 - 44032: 0x8B46,
-	46372 - 44032: 0xB5F5,
-	46373 - 44032: 0xB5F6,
-	46374 - 44032: 0x8B47,
-	46375 - 44032: 0xB5F7,
-	46376 - 44032: 0xB5F8,
-	46377 - 44032: 0xB5F9,
-	46378 - 44032: 0xB5FA,
-	46379 - 44032: 0x8B48,
-	46380 - 44032: 0x8B49,
-	46381 - 44032: 0x8B4A,
-	46382 - 44032: 0x8B4B,
-	46383 - 44032: 0x8B4C,
-	46384 - 44032: 0xB5FB,
-	46385 - 44032: 0xB5FC,
-	46386 - 44032: 0x8B4D,
-	46387 - 44032: 0x8B4E,
-	46388 - 44032: 0xB5FD,
-	46389 - 44032: 0x8B4F,
-	46390 - 44032: 0x8B50,
-	46391 - 44032: 0x8B51,
-	46392 - 44032: 0xB5FE,
-	46393 - 44032: 0x8B52,
-	46394 - 44032: 0x8B53,
-	46395 - 44032: 0x8B54,
-	46396 - 44032: 0x8B55,
-	46397 - 44032: 0x8B56,
-	46398 - 44032: 0x8B57,
-	46399 - 44032: 0x8B58,
-	46400 - 44032: 0xB6A1,
-	46401 - 44032: 0xB6A2,
-	46402 - 44032: 0x8B59,
-	46403 - 44032: 0xB6A3,
-	46404 - 44032: 0xB6A4,
-	46405 - 44032: 0xB6A5,
-	46406 - 44032: 0x8B5A,
-	46407 - 44032: 0x8B61,
-	46408 - 44032: 0x8B62,
-	46409 - 44032: 0x8B63,
-	46410 - 44032: 0x8B64,
-	46411 - 44032: 0xB6A6,
-	46412 - 44032: 0xB6A7,
-	46413 - 44032: 0xB6A8,
-	46414 - 44032: 0x8B65,
-	46415 - 44032: 0x8B66,
-	46416 - 44032: 0xB6A9,
-	46417 - 44032: 0x8B67,
-	46418 - 44032: 0x8B68,
-	46419 - 44032: 0x8B69,
-	46420 - 44032: 0xB6AA,
-	46421 - 44032: 0x8B6A,
-	46422 - 44032: 0x8B6B,
-	46423 - 44032: 0x8B6C,
-	46424 - 44032: 0x8B6D,
-	46425 - 44032: 0x8B6E,
-	46426 - 44032: 0x8B6F,
-	46427 - 44032: 0x8B70,
-	46428 - 44032: 0xB6AB,
-	46429 - 44032: 0xB6AC,
-	46430 - 44032: 0x8B71,
-	46431 - 44032: 0xB6AD,
-	46432 - 44032: 0xB6AE,
-	46433 - 44032: 0xB6AF,
-	46434 - 44032: 0x8B72,
-	46435 - 44032: 0x8B73,
-	46436 - 44032: 0x8B74,
-	46437 - 44032: 0x8B75,
-	46438 - 44032: 0x8B76,
-	46439 - 44032: 0x8B77,
-	46440 - 44032: 0x8B78,
-	46441 - 44032: 0x8B79,
-	46442 - 44032: 0x8B7A,
-	46443 - 44032: 0x8B81,
-	46444 - 44032: 0x8B82,
-	46445 - 44032: 0x8B83,
-	46446 - 44032: 0x8B84,
-	46447 - 44032: 0x8B85,
-	46448 - 44032: 0x8B86,
-	46449 - 44032: 0x8B87,
-	46450 - 44032: 0x8B88,
-	46451 - 44032: 0x8B89,
-	46452 - 44032: 0x8B8A,
-	46453 - 44032: 0x8B8B,
-	46454 - 44032: 0x8B8C,
-	46455 - 44032: 0x8B8D,
-	46456 - 44032: 0x8B8E,
-	46457 - 44032: 0x8B8F,
-	46458 - 44032: 0x8B90,
-	46459 - 44032: 0x8B91,
-	46460 - 44032: 0x8B92,
-	46461 - 44032: 0x8B93,
-	46462 - 44032: 0x8B94,
-	46463 - 44032: 0x8B95,
-	46464 - 44032: 0x8B96,
-	46465 - 44032: 0x8B97,
-	46466 - 44032: 0x8B98,
-	46467 - 44032: 0x8B99,
-	46468 - 44032: 0x8B9A,
-	46469 - 44032: 0x8B9B,
-	46470 - 44032: 0x8B9C,
-	46471 - 44032: 0x8B9D,
-	46472 - 44032: 0x8B9E,
-	46473 - 44032: 0x8B9F,
-	46474 - 44032: 0x8BA0,
-	46475 - 44032: 0x8BA1,
-	46476 - 44032: 0x8BA2,
-	46477 - 44032: 0x8BA3,
-	46478 - 44032: 0x8BA4,
-	46479 - 44032: 0x8BA5,
-	46480 - 44032: 0x8BA6,
-	46481 - 44032: 0x8BA7,
-	46482 - 44032: 0x8BA8,
-	46483 - 44032: 0x8BA9,
-	46484 - 44032: 0x8BAA,
-	46485 - 44032: 0x8BAB,
-	46486 - 44032: 0x8BAC,
-	46487 - 44032: 0x8BAD,
-	46488 - 44032: 0x8BAE,
-	46489 - 44032: 0x8BAF,
-	46490 - 44032: 0x8BB0,
-	46491 - 44032: 0x8BB1,
-	46492 - 44032: 0x8BB2,
-	46493 - 44032: 0x8BB3,
-	46494 - 44032: 0x8BB4,
-	46495 - 44032: 0x8BB5,
-	46496 - 44032: 0xB6B0,
-	46497 - 44032: 0xB6B1,
-	46498 - 44032: 0x8BB6,
-	46499 - 44032: 0x8BB7,
-	46500 - 44032: 0xB6B2,
-	46501 - 44032: 0x8BB8,
-	46502 - 44032: 0x8BB9,
-	46503 - 44032: 0x8BBA,
-	46504 - 44032: 0xB6B3,
-	46505 - 44032: 0x8BBB,
-	46506 - 44032: 0xB6B4,
-	46507 - 44032: 0xB6B5,
-	46508 - 44032: 0x8BBC,
-	46509 - 44032: 0x8BBD,
-	46510 - 44032: 0x8BBE,
-	46511 - 44032: 0x8BBF,
-	46512 - 44032: 0xB6B6,
-	46513 - 44032: 0xB6B7,
-	46514 - 44032: 0x8BC0,
-	46515 - 44032: 0xB6B8,
-	46516 - 44032: 0xB6B9,
-	46517 - 44032: 0xB6BA,
-	46518 - 44032: 0x8BC1,
-	46519 - 44032: 0x8BC2,
-	46520 - 44032: 0x8BC3,
-	46521 - 44032: 0x8BC4,
-	46522 - 44032: 0x8BC5,
-	46523 - 44032: 0xB6BB,
-	46524 - 44032: 0xB6BC,
-	46525 - 44032: 0xB6BD,
-	46526 - 44032: 0x8BC6,
-	46527 - 44032: 0x8BC7,
-	46528 - 44032: 0xB6BE,
-	46529 - 44032: 0x8BC8,
-	46530 - 44032: 0x8BC9,
-	46531 - 44032: 0x8BCA,
-	46532 - 44032: 0xB6BF,
-	46533 - 44032: 0x8BCB,
-	46534 - 44032: 0x8BCC,
-	46535 - 44032: 0x8BCD,
-	46536 - 44032: 0x8BCE,
-	46537 - 44032: 0x8BCF,
-	46538 - 44032: 0x8BD0,
-	46539 - 44032: 0x8BD1,
-	46540 - 44032: 0xB6C0,
-	46541 - 44032: 0xB6C1,
-	46542 - 44032: 0x8BD2,
-	46543 - 44032: 0xB6C2,
-	46544 - 44032: 0xB6C3,
-	46545 - 44032: 0xB6C4,
-	46546 - 44032: 0x8BD3,
-	46547 - 44032: 0x8BD4,
-	46548 - 44032: 0x8BD5,
-	46549 - 44032: 0x8BD6,
-	46550 - 44032: 0x8BD7,
-	46551 - 44032: 0x8BD8,
-	46552 - 44032: 0xB6C5,
-	46553 - 44032: 0x8BD9,
-	46554 - 44032: 0x8BDA,
-	46555 - 44032: 0x8BDB,
-	46556 - 44032: 0x8BDC,
-	46557 - 44032: 0x8BDD,
-	46558 - 44032: 0x8BDE,
-	46559 - 44032: 0x8BDF,
-	46560 - 44032: 0x8BE0,
-	46561 - 44032: 0x8BE1,
-	46562 - 44032: 0x8BE2,
-	46563 - 44032: 0x8BE3,
-	46564 - 44032: 0x8BE4,
-	46565 - 44032: 0x8BE5,
-	46566 - 44032: 0x8BE6,
-	46567 - 44032: 0x8BE7,
-	46568 - 44032: 0x8BE8,
-	46569 - 44032: 0x8BE9,
-	46570 - 44032: 0x8BEA,
-	46571 - 44032: 0x8BEB,
-	46572 - 44032: 0xB6C6,
-	46573 - 44032: 0x8BEC,
-	46574 - 44032: 0x8BED,
-	46575 - 44032: 0x8BEE,
-	46576 - 44032: 0x8BEF,
-	46577 - 44032: 0x8BF0,
-	46578 - 44032: 0x8BF1,
-	46579 - 44032: 0x8BF2,
-	46580 - 44032: 0x8BF3,
-	46581 - 44032: 0x8BF4,
-	46582 - 44032: 0x8BF5,
-	46583 - 44032: 0x8BF6,
-	46584 - 44032: 0x8BF7,
-	46585 - 44032: 0x8BF8,
-	46586 - 44032: 0x8BF9,
-	46587 - 44032: 0x8BFA,
-	46588 - 44032: 0x8BFB,
-	46589 - 44032: 0x8BFC,
-	46590 - 44032: 0x8BFD,
-	46591 - 44032: 0x8BFE,
-	46592 - 44032: 0x8C41,
-	46593 - 44032: 0x8C42,
-	46594 - 44032: 0x8C43,
-	46595 - 44032: 0x8C44,
-	46596 - 44032: 0x8C45,
-	46597 - 44032: 0x8C46,
-	46598 - 44032: 0x8C47,
-	46599 - 44032: 0x8C48,
-	46600 - 44032: 0x8C49,
-	46601 - 44032: 0x8C4A,
-	46602 - 44032: 0x8C4B,
-	46603 - 44032: 0x8C4C,
-	46604 - 44032: 0x8C4D,
-	46605 - 44032: 0x8C4E,
-	46606 - 44032: 0x8C4F,
-	46607 - 44032: 0x8C50,
-	46608 - 44032: 0xB6C7,
-	46609 - 44032: 0xB6C8,
-	46610 - 44032: 0x8C51,
-	46611 - 44032: 0x8C52,
-	46612 - 44032: 0xB6C9,
-	46613 - 44032: 0x8C53,
-	46614 - 44032: 0x8C54,
-	46615 - 44032: 0x8C55,
-	46616 - 44032: 0xB6CA,
-	46617 - 44032: 0x8C56,
-	46618 - 44032: 0x8C57,
-	46619 - 44032: 0x8C58,
-	46620 - 44032: 0x8C59,
-	46621 - 44032: 0x8C5A,
-	46622 - 44032: 0x8C61,
-	46623 - 44032: 0x8C62,
-	46624 - 44032: 0x8C63,
-	46625 - 44032: 0x8C64,
-	46626 - 44032: 0x8C65,
-	46627 - 44032: 0x8C66,
-	46628 - 44032: 0x8C67,
-	46629 - 44032: 0xB6CB,
-	46630 - 44032: 0x8C68,
-	46631 - 44032: 0x8C69,
-	46632 - 44032: 0x8C6A,
-	46633 - 44032: 0x8C6B,
-	46634 - 44032: 0x8C6C,
-	46635 - 44032: 0x8C6D,
-	46636 - 44032: 0xB6CC,
-	46637 - 44032: 0x8C6E,
-	46638 - 44032: 0x8C6F,
-	46639 - 44032: 0x8C70,
-	46640 - 44032: 0x8C71,
-	46641 - 44032: 0x8C72,
-	46642 - 44032: 0x8C73,
-	46643 - 44032: 0x8C74,
-	46644 - 44032: 0xB6CD,
-	46645 - 44032: 0x8C75,
-	46646 - 44032: 0x8C76,
-	46647 - 44032: 0x8C77,
-	46648 - 44032: 0x8C78,
-	46649 - 44032: 0x8C79,
-	46650 - 44032: 0x8C7A,
-	46651 - 44032: 0x8C81,
-	46652 - 44032: 0x8C82,
-	46653 - 44032: 0x8C83,
-	46654 - 44032: 0x8C84,
-	46655 - 44032: 0x8C85,
-	46656 - 44032: 0x8C86,
-	46657 - 44032: 0x8C87,
-	46658 - 44032: 0x8C88,
-	46659 - 44032: 0x8C89,
-	46660 - 44032: 0x8C8A,
-	46661 - 44032: 0x8C8B,
-	46662 - 44032: 0x8C8C,
-	46663 - 44032: 0x8C8D,
-	46664 - 44032: 0xB6CE,
-	46665 - 44032: 0x8C8E,
-	46666 - 44032: 0x8C8F,
-	46667 - 44032: 0x8C90,
-	46668 - 44032: 0x8C91,
-	46669 - 44032: 0x8C92,
-	46670 - 44032: 0x8C93,
-	46671 - 44032: 0x8C94,
-	46672 - 44032: 0x8C95,
-	46673 - 44032: 0x8C96,
-	46674 - 44032: 0x8C97,
-	46675 - 44032: 0x8C98,
-	46676 - 44032: 0x8C99,
-	46677 - 44032: 0x8C9A,
-	46678 - 44032: 0x8C9B,
-	46679 - 44032: 0x8C9C,
-	46680 - 44032: 0x8C9D,
-	46681 - 44032: 0x8C9E,
-	46682 - 44032: 0x8C9F,
-	46683 - 44032: 0x8CA0,
-	46684 - 44032: 0x8CA1,
-	46685 - 44032: 0x8CA2,
-	46686 - 44032: 0x8CA3,
-	46687 - 44032: 0x8CA4,
-	46688 - 44032: 0x8CA5,
-	46689 - 44032: 0x8CA6,
-	46690 - 44032: 0x8CA7,
-	46691 - 44032: 0x8CA8,
-	46692 - 44032: 0xB6CF,
-	46693 - 44032: 0x8CA9,
-	46694 - 44032: 0x8CAA,
-	46695 - 44032: 0x8CAB,
-	46696 - 44032: 0xB6D0,
-	46697 - 44032: 0x8CAC,
-	46698 - 44032: 0x8CAD,
-	46699 - 44032: 0x8CAE,
-	46700 - 44032: 0x8CAF,
-	46701 - 44032: 0x8CB0,
-	46702 - 44032: 0x8CB1,
-	46703 - 44032: 0x8CB2,
-	46704 - 44032: 0x8CB3,
-	46705 - 44032: 0x8CB4,
-	46706 - 44032: 0x8CB5,
-	46707 - 44032: 0x8CB6,
-	46708 - 44032: 0x8CB7,
-	46709 - 44032: 0x8CB8,
-	46710 - 44032: 0x8CB9,
-	46711 - 44032: 0x8CBA,
-	46712 - 44032: 0x8CBB,
-	46713 - 44032: 0x8CBC,
-	46714 - 44032: 0x8CBD,
-	46715 - 44032: 0x8CBE,
-	46716 - 44032: 0x8CBF,
-	46717 - 44032: 0x8CC0,
-	46718 - 44032: 0x8CC1,
-	46719 - 44032: 0x8CC2,
-	46720 - 44032: 0x8CC3,
-	46721 - 44032: 0x8CC4,
-	46722 - 44032: 0x8CC5,
-	46723 - 44032: 0x8CC6,
-	46724 - 44032: 0x8CC7,
-	46725 - 44032: 0x8CC8,
-	46726 - 44032: 0x8CC9,
-	46727 - 44032: 0x8CCA,
-	46728 - 44032: 0x8CCB,
-	46729 - 44032: 0x8CCC,
-	46730 - 44032: 0x8CCD,
-	46731 - 44032: 0x8CCE,
-	46732 - 44032: 0x8CCF,
-	46733 - 44032: 0x8CD0,
-	46734 - 44032: 0x8CD1,
-	46735 - 44032: 0x8CD2,
-	46736 - 44032: 0x8CD3,
-	46737 - 44032: 0x8CD4,
-	46738 - 44032: 0x8CD5,
-	46739 - 44032: 0x8CD6,
-	46740 - 44032: 0x8CD7,
-	46741 - 44032: 0x8CD8,
-	46742 - 44032: 0x8CD9,
-	46743 - 44032: 0x8CDA,
-	46744 - 44032: 0x8CDB,
-	46745 - 44032: 0x8CDC,
-	46746 - 44032: 0x8CDD,
-	46747 - 44032: 0x8CDE,
-	46748 - 44032: 0xB6D1,
-	46749 - 44032: 0xB6D2,
-	46750 - 44032: 0x8CDF,
-	46751 - 44032: 0x8CE0,
-	46752 - 44032: 0xB6D3,
-	46753 - 44032: 0x8CE1,
-	46754 - 44032: 0x8CE2,
-	46755 - 44032: 0x8CE3,
-	46756 - 44032: 0xB6D4,
-	46757 - 44032: 0x8CE4,
-	46758 - 44032: 0x8CE5,
-	46759 - 44032: 0x8CE6,
-	46760 - 44032: 0x8CE7,
-	46761 - 44032: 0x8CE8,
-	46762 - 44032: 0x8CE9,
-	46763 - 44032: 0xB6D5,
-	46764 - 44032: 0xB6D6,
-	46765 - 44032: 0x8CEA,
-	46766 - 44032: 0x8CEB,
-	46767 - 44032: 0x8CEC,
-	46768 - 44032: 0x8CED,
-	46769 - 44032: 0xB6D7,
-	46770 - 44032: 0x8CEE,
-	46771 - 44032: 0x8CEF,
-	46772 - 44032: 0x8CF0,
-	46773 - 44032: 0x8CF1,
-	46774 - 44032: 0x8CF2,
-	46775 - 44032: 0x8CF3,
-	46776 - 44032: 0x8CF4,
-	46777 - 44032: 0x8CF5,
-	46778 - 44032: 0x8CF6,
-	46779 - 44032: 0x8CF7,
-	46780 - 44032: 0x8CF8,
-	46781 - 44032: 0x8CF9,
-	46782 - 44032: 0x8CFA,
-	46783 - 44032: 0x8CFB,
-	46784 - 44032: 0x8CFC,
-	46785 - 44032: 0x8CFD,
-	46786 - 44032: 0x8CFE,
-	46787 - 44032: 0x8D41,
-	46788 - 44032: 0x8D42,
-	46789 - 44032: 0x8D43,
-	46790 - 44032: 0x8D44,
-	46791 - 44032: 0x8D45,
-	46792 - 44032: 0x8D46,
-	46793 - 44032: 0x8D47,
-	46794 - 44032: 0x8D48,
-	46795 - 44032: 0x8D49,
-	46796 - 44032: 0x8D4A,
-	46797 - 44032: 0x8D4B,
-	46798 - 44032: 0x8D4C,
-	46799 - 44032: 0x8D4D,
-	46800 - 44032: 0x8D4E,
-	46801 - 44032: 0x8D4F,
-	46802 - 44032: 0x8D50,
-	46803 - 44032: 0x8D51,
-	46804 - 44032: 0xB6D8,
-	46805 - 44032: 0x8D52,
-	46806 - 44032: 0x8D53,
-	46807 - 44032: 0x8D54,
-	46808 - 44032: 0x8D55,
-	46809 - 44032: 0x8D56,
-	46810 - 44032: 0x8D57,
-	46811 - 44032: 0x8D58,
-	46812 - 44032: 0x8D59,
-	46813 - 44032: 0x8D5A,
-	46814 - 44032: 0x8D61,
-	46815 - 44032: 0x8D62,
-	46816 - 44032: 0x8D63,
-	46817 - 44032: 0x8D64,
-	46818 - 44032: 0x8D65,
-	46819 - 44032: 0x8D66,
-	46820 - 44032: 0x8D67,
-	46821 - 44032: 0x8D68,
-	46822 - 44032: 0x8D69,
-	46823 - 44032: 0x8D6A,
-	46824 - 44032: 0x8D6B,
-	46825 - 44032: 0x8D6C,
-	46826 - 44032: 0x8D6D,
-	46827 - 44032: 0x8D6E,
-	46828 - 44032: 0x8D6F,
-	46829 - 44032: 0x8D70,
-	46830 - 44032: 0x8D71,
-	46831 - 44032: 0x8D72,
-	46832 - 44032: 0xB6D9,
-	46833 - 44032: 0x8D73,
-	46834 - 44032: 0x8D74,
-	46835 - 44032: 0x8D75,
-	46836 - 44032: 0xB6DA,
-	46837 - 44032: 0x8D76,
-	46838 - 44032: 0x8D77,
-	46839 - 44032: 0x8D78,
-	46840 - 44032: 0xB6DB,
-	46841 - 44032: 0x8D79,
-	46842 - 44032: 0x8D7A,
-	46843 - 44032: 0x8D81,
-	46844 - 44032: 0x8D82,
-	46845 - 44032: 0x8D83,
-	46846 - 44032: 0x8D84,
-	46847 - 44032: 0x8D85,
-	46848 - 44032: 0xB6DC,
-	46849 - 44032: 0xB6DD,
-	46850 - 44032: 0x8D86,
-	46851 - 44032: 0x8D87,
-	46852 - 44032: 0x8D88,
-	46853 - 44032: 0xB6DE,
-	46854 - 44032: 0x8D89,
-	46855 - 44032: 0x8D8A,
-	46856 - 44032: 0x8D8B,
-	46857 - 44032: 0x8D8C,
-	46858 - 44032: 0x8D8D,
-	46859 - 44032: 0x8D8E,
-	46860 - 44032: 0x8D8F,
-	46861 - 44032: 0x8D90,
-	46862 - 44032: 0x8D91,
-	46863 - 44032: 0x8D92,
-	46864 - 44032: 0x8D93,
-	46865 - 44032: 0x8D94,
-	46866 - 44032: 0x8D95,
-	46867 - 44032: 0x8D96,
-	46868 - 44032: 0x8D97,
-	46869 - 44032: 0x8D98,
-	46870 - 44032: 0x8D99,
-	46871 - 44032: 0x8D9A,
-	46872 - 44032: 0x8D9B,
-	46873 - 44032: 0x8D9C,
-	46874 - 44032: 0x8D9D,
-	46875 - 44032: 0x8D9E,
-	46876 - 44032: 0x8D9F,
-	46877 - 44032: 0x8DA0,
-	46878 - 44032: 0x8DA1,
-	46879 - 44032: 0x8DA2,
-	46880 - 44032: 0x8DA3,
-	46881 - 44032: 0x8DA4,
-	46882 - 44032: 0x8DA5,
-	46883 - 44032: 0x8DA6,
-	46884 - 44032: 0x8DA7,
-	46885 - 44032: 0x8DA8,
-	46886 - 44032: 0x8DA9,
-	46887 - 44032: 0x8DAA,
-	46888 - 44032: 0xB6DF,
-	46889 - 44032: 0xB6E0,
-	46890 - 44032: 0x8DAB,
-	46891 - 44032: 0x8DAC,
-	46892 - 44032: 0xB6E1,
-	46893 - 44032: 0x8DAD,
-	46894 - 44032: 0x8DAE,
-	46895 - 44032: 0xB6E2,
-	46896 - 44032: 0xB6E3,
-	46897 - 44032: 0x8DAF,
-	46898 - 44032: 0x8DB0,
-	46899 - 44032: 0x8DB1,
-	46900 - 44032: 0x8DB2,
-	46901 - 44032: 0x8DB3,
-	46902 - 44032: 0x8DB4,
-	46903 - 44032: 0x8DB5,
-	46904 - 44032: 0xB6E4,
-	46905 - 44032: 0xB6E5,
-	46906 - 44032: 0x8DB6,
-	46907 - 44032: 0xB6E6,
-	46908 - 44032: 0x8DB7,
-	46909 - 44032: 0x8DB8,
-	46910 - 44032: 0x8DB9,
-	46911 - 44032: 0x8DBA,
-	46912 - 44032: 0x8DBB,
-	46913 - 44032: 0x8DBC,
-	46914 - 44032: 0x8DBD,
-	46915 - 44032: 0x8DBE,
-	46916 - 44032: 0xB6E7,
-	46917 - 44032: 0x8DBF,
-	46918 - 44032: 0x8DC0,
-	46919 - 44032: 0x8DC1,
-	46920 - 44032: 0xB6E8,
-	46921 - 44032: 0x8DC2,
-	46922 - 44032: 0x8DC3,
-	46923 - 44032: 0x8DC4,
-	46924 - 44032: 0xB6E9,
-	46925 - 44032: 0x8DC5,
-	46926 - 44032: 0x8DC6,
-	46927 - 44032: 0x8DC7,
-	46928 - 44032: 0x8DC8,
-	46929 - 44032: 0x8DC9,
-	46930 - 44032: 0x8DCA,
-	46931 - 44032: 0x8DCB,
-	46932 - 44032: 0xB6EA,
-	46933 - 44032: 0xB6EB,
-	46934 - 44032: 0x8DCC,
-	46935 - 44032: 0x8DCD,
-	46936 - 44032: 0x8DCE,
-	46937 - 44032: 0x8DCF,
-	46938 - 44032: 0x8DD0,
-	46939 - 44032: 0x8DD1,
-	46940 - 44032: 0x8DD2,
-	46941 - 44032: 0x8DD3,
-	46942 - 44032: 0x8DD4,
-	46943 - 44032: 0x8DD5,
-	46944 - 44032: 0xB6EC,
-	46945 - 44032: 0x8DD6,
-	46946 - 44032: 0x8DD7,
-	46947 - 44032: 0x8DD8,
-	46948 - 44032: 0xB6ED,
-	46949 - 44032: 0x8DD9,
-	46950 - 44032: 0x8DDA,
-	46951 - 44032: 0x8DDB,
-	46952 - 44032: 0xB6EE,
-	46953 - 44032: 0x8DDC,
-	46954 - 44032: 0x8DDD,
-	46955 - 44032: 0x8DDE,
-	46956 - 44032: 0x8DDF,
-	46957 - 44032: 0x8DE0,
-	46958 - 44032: 0x8DE1,
-	46959 - 44032: 0x8DE2,
-	46960 - 44032: 0xB6EF,
-	46961 - 44032: 0xB6F0,
-	46962 - 44032: 0x8DE3,
-	46963 - 44032: 0xB6F1,
-	46964 - 44032: 0x8DE4,
-	46965 - 44032: 0xB6F2,
-	46966 - 44032: 0x8DE5,
-	46967 - 44032: 0x8DE6,
-	46968 - 44032: 0x8DE7,
-	46969 - 44032: 0x8DE8,
-	46970 - 44032: 0x8DE9,
-	46971 - 44032: 0x8DEA,
-	46972 - 44032: 0xB6F3,
-	46973 - 44032: 0xB6F4,
-	46974 - 44032: 0x8DEB,
-	46975 - 44032: 0x8DEC,
-	46976 - 44032: 0xB6F5,
-	46977 - 44032: 0x8DED,
-	46978 - 44032: 0x8DEE,
-	46979 - 44032: 0x8DEF,
-	46980 - 44032: 0xB6F6,
-	46981 - 44032: 0x8DF0,
-	46982 - 44032: 0x8DF1,
-	46983 - 44032: 0x8DF2,
-	46984 - 44032: 0x8DF3,
-	46985 - 44032: 0x8DF4,
-	46986 - 44032: 0x8DF5,
-	46987 - 44032: 0x8DF6,
-	46988 - 44032: 0xB6F7,
-	46989 - 44032: 0xB6F8,
-	46990 - 44032: 0x8DF7,
-	46991 - 44032: 0xB6F9,
-	46992 - 44032: 0xB6FA,
-	46993 - 44032: 0xB6FB,
-	46994 - 44032: 0xB6FC,
-	46995 - 44032: 0x8DF8,
-	46996 - 44032: 0x8DF9,
-	46997 - 44032: 0x8DFA,
-	46998 - 44032: 0xB6FD,
-	46999 - 44032: 0xB6FE,
-	47000 - 44032: 0xB7A1,
-	47001 - 44032: 0xB7A2,
-	47002 - 44032: 0x8DFB,
-	47003 - 44032: 0x8DFC,
-	47004 - 44032: 0xB7A3,
-	47005 - 44032: 0x8DFD,
-	47006 - 44032: 0x8DFE,
-	47007 - 44032: 0x8E41,
-	47008 - 44032: 0xB7A4,
-	47009 - 44032: 0x8E42,
-	47010 - 44032: 0x8E43,
-	47011 - 44032: 0x8E44,
-	47012 - 44032: 0x8E45,
-	47013 - 44032: 0x8E46,
-	47014 - 44032: 0x8E47,
-	47015 - 44032: 0x8E48,
-	47016 - 44032: 0xB7A5,
-	47017 - 44032: 0xB7A6,
-	47018 - 44032: 0x8E49,
-	47019 - 44032: 0xB7A7,
-	47020 - 44032: 0xB7A8,
-	47021 - 44032: 0xB7A9,
-	47022 - 44032: 0x8E4A,
-	47023 - 44032: 0x8E4B,
-	47024 - 44032: 0x8E4C,
-	47025 - 44032: 0x8E4D,
-	47026 - 44032: 0x8E4E,
-	47027 - 44032: 0x8E4F,
-	47028 - 44032: 0xB7AA,
-	47029 - 44032: 0xB7AB,
-	47030 - 44032: 0x8E50,
-	47031 - 44032: 0x8E51,
-	47032 - 44032: 0xB7AC,
-	47033 - 44032: 0x8E52,
-	47034 - 44032: 0x8E53,
-	47035 - 44032: 0x8E54,
-	47036 - 44032: 0x8E55,
-	47037 - 44032: 0x8E56,
-	47038 - 44032: 0x8E57,
-	47039 - 44032: 0x8E58,
-	47040 - 44032: 0x8E59,
-	47041 - 44032: 0x8E5A,
-	47042 - 44032: 0x8E61,
-	47043 - 44032: 0x8E62,
-	47044 - 44032: 0x8E63,
-	47045 - 44032: 0x8E64,
-	47046 - 44032: 0x8E65,
-	47047 - 44032: 0xB7AD,
-	47048 - 44032: 0x8E66,
-	47049 - 44032: 0xB7AE,
-	47050 - 44032: 0x8E67,
-	47051 - 44032: 0x8E68,
-	47052 - 44032: 0x8E69,
-	47053 - 44032: 0x8E6A,
-	47054 - 44032: 0x8E6B,
-	47055 - 44032: 0x8E6C,
-	47056 - 44032: 0x8E6D,
-	47057 - 44032: 0x8E6E,
-	47058 - 44032: 0x8E6F,
-	47059 - 44032: 0x8E70,
-	47060 - 44032: 0x8E71,
-	47061 - 44032: 0x8E72,
-	47062 - 44032: 0x8E73,
-	47063 - 44032: 0x8E74,
-	47064 - 44032: 0x8E75,
-	47065 - 44032: 0x8E76,
-	47066 - 44032: 0x8E77,
-	47067 - 44032: 0x8E78,
-	47068 - 44032: 0x8E79,
-	47069 - 44032: 0x8E7A,
-	47070 - 44032: 0x8E81,
-	47071 - 44032: 0x8E82,
-	47072 - 44032: 0x8E83,
-	47073 - 44032: 0x8E84,
-	47074 - 44032: 0x8E85,
-	47075 - 44032: 0x8E86,
-	47076 - 44032: 0x8E87,
-	47077 - 44032: 0x8E88,
-	47078 - 44032: 0x8E89,
-	47079 - 44032: 0x8E8A,
-	47080 - 44032: 0x8E8B,
-	47081 - 44032: 0x8E8C,
-	47082 - 44032: 0x8E8D,
-	47083 - 44032: 0x8E8E,
-	47084 - 44032: 0xB7AF,
-	47085 - 44032: 0xB7B0,
-	47086 - 44032: 0x8E8F,
-	47087 - 44032: 0x8E90,
-	47088 - 44032: 0xB7B1,
-	47089 - 44032: 0x8E91,
-	47090 - 44032: 0x8E92,
-	47091 - 44032: 0x8E93,
-	47092 - 44032: 0xB7B2,
-	47093 - 44032: 0x8E94,
-	47094 - 44032: 0x8E95,
-	47095 - 44032: 0x8E96,
-	47096 - 44032: 0x8E97,
-	47097 - 44032: 0x8E98,
-	47098 - 44032: 0x8E99,
-	47099 - 44032: 0x8E9A,
-	47100 - 44032: 0xB7B3,
-	47101 - 44032: 0xB7B4,
-	47102 - 44032: 0x8E9B,
-	47103 - 44032: 0xB7B5,
-	47104 - 44032: 0xB7B6,
-	47105 - 44032: 0xB7B7,
-	47106 - 44032: 0x8E9C,
-	47107 - 44032: 0x8E9D,
-	47108 - 44032: 0x8E9E,
-	47109 - 44032: 0x8E9F,
-	47110 - 44032: 0x8EA0,
-	47111 - 44032: 0xB7B8,
-	47112 - 44032: 0xB7B9,
-	47113 - 44032: 0xB7BA,
-	47114 - 44032: 0x8EA1,
-	47115 - 44032: 0x8EA2,
-	47116 - 44032: 0xB7BB,
-	47117 - 44032: 0x8EA3,
-	47118 - 44032: 0x8EA4,
-	47119 - 44032: 0x8EA5,
-	47120 - 44032: 0xB7BC,
-	47121 - 44032: 0x8EA6,
-	47122 - 44032: 0x8EA7,
-	47123 - 44032: 0x8EA8,
-	47124 - 44032: 0x8EA9,
-	47125 - 44032: 0x8EAA,
-	47126 - 44032: 0x8EAB,
-	47127 - 44032: 0x8EAC,
-	47128 - 44032: 0xB7BD,
-	47129 - 44032: 0xB7BE,
-	47130 - 44032: 0x8EAD,
-	47131 - 44032: 0xB7BF,
-	47132 - 44032: 0x8EAE,
-	47133 - 44032: 0xB7C0,
-	47134 - 44032: 0x8EAF,
-	47135 - 44032: 0x8EB0,
-	47136 - 44032: 0x8EB1,
-	47137 - 44032: 0x8EB2,
-	47138 - 44032: 0x8EB3,
-	47139 - 44032: 0x8EB4,
-	47140 - 44032: 0xB7C1,
-	47141 - 44032: 0xB7C2,
-	47142 - 44032: 0x8EB5,
-	47143 - 44032: 0x8EB6,
-	47144 - 44032: 0xB7C3,
-	47145 - 44032: 0x8EB7,
-	47146 - 44032: 0x8EB8,
-	47147 - 44032: 0x8EB9,
-	47148 - 44032: 0xB7C4,
-	47149 - 44032: 0x8EBA,
-	47150 - 44032: 0x8EBB,
-	47151 - 44032: 0x8EBC,
-	47152 - 44032: 0x8EBD,
-	47153 - 44032: 0x8EBE,
-	47154 - 44032: 0x8EBF,
-	47155 - 44032: 0x8EC0,
-	47156 - 44032: 0xB7C5,
-	47157 - 44032: 0xB7C6,
-	47158 - 44032: 0x8EC1,
-	47159 - 44032: 0xB7C7,
-	47160 - 44032: 0xB7C8,
-	47161 - 44032: 0xB7C9,
-	47162 - 44032: 0x8EC2,
-	47163 - 44032: 0x8EC3,
-	47164 - 44032: 0x8EC4,
-	47165 - 44032: 0x8EC5,
-	47166 - 44032: 0x8EC6,
-	47167 - 44032: 0x8EC7,
-	47168 - 44032: 0xB7CA,
-	47169 - 44032: 0x8EC8,
-	47170 - 44032: 0x8EC9,
-	47171 - 44032: 0x8ECA,
-	47172 - 44032: 0xB7CB,
-	47173 - 44032: 0x8ECB,
-	47174 - 44032: 0x8ECC,
-	47175 - 44032: 0x8ECD,
-	47176 - 44032: 0x8ECE,
-	47177 - 44032: 0x8ECF,
-	47178 - 44032: 0x8ED0,
-	47179 - 44032: 0x8ED1,
-	47180 - 44032: 0x8ED2,
-	47181 - 44032: 0x8ED3,
-	47182 - 44032: 0x8ED4,
-	47183 - 44032: 0x8ED5,
-	47184 - 44032: 0x8ED6,
-	47185 - 44032: 0xB7CC,
-	47186 - 44032: 0x8ED7,
-	47187 - 44032: 0xB7CD,
-	47188 - 44032: 0x8ED8,
-	47189 - 44032: 0x8ED9,
-	47190 - 44032: 0x8EDA,
-	47191 - 44032: 0x8EDB,
-	47192 - 44032: 0x8EDC,
-	47193 - 44032: 0x8EDD,
-	47194 - 44032: 0x8EDE,
-	47195 - 44032: 0x8EDF,
-	47196 - 44032: 0xB7CE,
-	47197 - 44032: 0xB7CF,
-	47198 - 44032: 0x8EE0,
-	47199 - 44032: 0x8EE1,
-	47200 - 44032: 0xB7D0,
-	47201 - 44032: 0x8EE2,
-	47202 - 44032: 0x8EE3,
-	47203 - 44032: 0x8EE4,
-	47204 - 44032: 0xB7D1,
-	47205 - 44032: 0x8EE5,
-	47206 - 44032: 0x8EE6,
-	47207 - 44032: 0x8EE7,
-	47208 - 44032: 0x8EE8,
-	47209 - 44032: 0x8EE9,
-	47210 - 44032: 0x8EEA,
-	47211 - 44032: 0x8EEB,
-	47212 - 44032: 0xB7D2,
-	47213 - 44032: 0xB7D3,
-	47214 - 44032: 0x8EEC,
-	47215 - 44032: 0xB7D4,
-	47216 - 44032: 0x8EED,
-	47217 - 44032: 0xB7D5,
-	47218 - 44032: 0x8EEE,
-	47219 - 44032: 0x8EEF,
-	47220 - 44032: 0x8EF0,
-	47221 - 44032: 0x8EF1,
-	47222 - 44032: 0x8EF2,
-	47223 - 44032: 0x8EF3,
-	47224 - 44032: 0xB7D6,
-	47225 - 44032: 0x8EF4,
-	47226 - 44032: 0x8EF5,
-	47227 - 44032: 0x8EF6,
-	47228 - 44032: 0xB7D7,
-	47229 - 44032: 0x8EF7,
-	47230 - 44032: 0x8EF8,
-	47231 - 44032: 0x8EF9,
-	47232 - 44032: 0x8EFA,
-	47233 - 44032: 0x8EFB,
-	47234 - 44032: 0x8EFC,
-	47235 - 44032: 0x8EFD,
-	47236 - 44032: 0x8EFE,
-	47237 - 44032: 0x8F41,
-	47238 - 44032: 0x8F42,
-	47239 - 44032: 0x8F43,
-	47240 - 44032: 0x8F44,
-	47241 - 44032: 0x8F45,
-	47242 - 44032: 0x8F46,
-	47243 - 44032: 0x8F47,
-	47244 - 44032: 0x8F48,
-	47245 - 44032: 0xB7D8,
-	47246 - 44032: 0x8F49,
-	47247 - 44032: 0x8F4A,
-	47248 - 44032: 0x8F4B,
-	47249 - 44032: 0x8F4C,
-	47250 - 44032: 0x8F4D,
-	47251 - 44032: 0x8F4E,
-	47252 - 44032: 0x8F4F,
-	47253 - 44032: 0x8F50,
-	47254 - 44032: 0x8F51,
-	47255 - 44032: 0x8F52,
-	47256 - 44032: 0x8F53,
-	47257 - 44032: 0x8F54,
-	47258 - 44032: 0x8F55,
-	47259 - 44032: 0x8F56,
-	47260 - 44032: 0x8F57,
-	47261 - 44032: 0x8F58,
-	47262 - 44032: 0x8F59,
-	47263 - 44032: 0x8F5A,
-	47264 - 44032: 0x8F61,
-	47265 - 44032: 0x8F62,
-	47266 - 44032: 0x8F63,
-	47267 - 44032: 0x8F64,
-	47268 - 44032: 0x8F65,
-	47269 - 44032: 0x8F66,
-	47270 - 44032: 0x8F67,
-	47271 - 44032: 0x8F68,
-	47272 - 44032: 0xB7D9,
-	47273 - 44032: 0x8F69,
-	47274 - 44032: 0x8F6A,
-	47275 - 44032: 0x8F6B,
-	47276 - 44032: 0x8F6C,
-	47277 - 44032: 0x8F6D,
-	47278 - 44032: 0x8F6E,
-	47279 - 44032: 0x8F6F,
-	47280 - 44032: 0xB7DA,
-	47281 - 44032: 0x8F70,
-	47282 - 44032: 0x8F71,
-	47283 - 44032: 0x8F72,
-	47284 - 44032: 0xB7DB,
-	47285 - 44032: 0x8F73,
-	47286 - 44032: 0x8F74,
-	47287 - 44032: 0x8F75,
-	47288 - 44032: 0xB7DC,
-	47289 - 44032: 0x8F76,
-	47290 - 44032: 0x8F77,
-	47291 - 44032: 0x8F78,
-	47292 - 44032: 0x8F79,
-	47293 - 44032: 0x8F7A,
-	47294 - 44032: 0x8F81,
-	47295 - 44032: 0x8F82,
-	47296 - 44032: 0xB7DD,
-	47297 - 44032: 0xB7DE,
-	47298 - 44032: 0x8F83,
-	47299 - 44032: 0xB7DF,
-	47300 - 44032: 0x8F84,
-	47301 - 44032: 0xB7E0,
-	47302 - 44032: 0x8F85,
-	47303 - 44032: 0x8F86,
-	47304 - 44032: 0x8F87,
-	47305 - 44032: 0x8F88,
-	47306 - 44032: 0x8F89,
-	47307 - 44032: 0x8F8A,
-	47308 - 44032: 0xB7E1,
-	47309 - 44032: 0x8F8B,
-	47310 - 44032: 0x8F8C,
-	47311 - 44032: 0x8F8D,
-	47312 - 44032: 0xB7E2,
-	47313 - 44032: 0x8F8E,
-	47314 - 44032: 0x8F8F,
-	47315 - 44032: 0x8F90,
-	47316 - 44032: 0xB7E3,
-	47317 - 44032: 0x8F91,
-	47318 - 44032: 0x8F92,
-	47319 - 44032: 0x8F93,
-	47320 - 44032: 0x8F94,
-	47321 - 44032: 0x8F95,
-	47322 - 44032: 0x8F96,
-	47323 - 44032: 0x8F97,
-	47324 - 44032: 0x8F98,
-	47325 - 44032: 0xB7E4,
-	47326 - 44032: 0x8F99,
-	47327 - 44032: 0xB7E5,
-	47328 - 44032: 0x8F9A,
-	47329 - 44032: 0xB7E6,
-	47330 - 44032: 0x8F9B,
-	47331 - 44032: 0x8F9C,
-	47332 - 44032: 0x8F9D,
-	47333 - 44032: 0x8F9E,
-	47334 - 44032: 0x8F9F,
-	47335 - 44032: 0x8FA0,
-	47336 - 44032: 0xB7E7,
-	47337 - 44032: 0xB7E8,
-	47338 - 44032: 0x8FA1,
-	47339 - 44032: 0x8FA2,
-	47340 - 44032: 0xB7E9,
-	47341 - 44032: 0x8FA3,
-	47342 - 44032: 0x8FA4,
-	47343 - 44032: 0x8FA5,
-	47344 - 44032: 0xB7EA,
-	47345 - 44032: 0x8FA6,
-	47346 - 44032: 0x8FA7,
-	47347 - 44032: 0x8FA8,
-	47348 - 44032: 0x8FA9,
-	47349 - 44032: 0x8FAA,
-	47350 - 44032: 0x8FAB,
-	47351 - 44032: 0x8FAC,
-	47352 - 44032: 0xB7EB,
-	47353 - 44032: 0xB7EC,
-	47354 - 44032: 0x8FAD,
-	47355 - 44032: 0xB7ED,
-	47356 - 44032: 0x8FAE,
-	47357 - 44032: 0xB7EE,
-	47358 - 44032: 0x8FAF,
-	47359 - 44032: 0x8FB0,
-	47360 - 44032: 0x8FB1,
-	47361 - 44032: 0x8FB2,
-	47362 - 44032: 0x8FB3,
-	47363 - 44032: 0x8FB4,
-	47364 - 44032: 0xB7EF,
-	47365 - 44032: 0x8FB5,
-	47366 - 44032: 0x8FB6,
-	47367 - 44032: 0x8FB7,
-	47368 - 44032: 0x8FB8,
-	47369 - 44032: 0x8FB9,
-	47370 - 44032: 0x8FBA,
-	47371 - 44032: 0x8FBB,
-	47372 - 44032: 0x8FBC,
-	47373 - 44032: 0x8FBD,
-	47374 - 44032: 0x8FBE,
-	47375 - 44032: 0x8FBF,
-	47376 - 44032: 0x8FC0,
-	47377 - 44032: 0x8FC1,
-	47378 - 44032: 0x8FC2,
-	47379 - 44032: 0x8FC3,
-	47380 - 44032: 0x8FC4,
-	47381 - 44032: 0x8FC5,
-	47382 - 44032: 0x8FC6,
-	47383 - 44032: 0x8FC7,
-	47384 - 44032: 0xB7F0,
-	47385 - 44032: 0x8FC8,
-	47386 - 44032: 0x8FC9,
-	47387 - 44032: 0x8FCA,
-	47388 - 44032: 0x8FCB,
-	47389 - 44032: 0x8FCC,
-	47390 - 44032: 0x8FCD,
-	47391 - 44032: 0x8FCE,
-	47392 - 44032: 0xB7F1,
-	47393 - 44032: 0x8FCF,
-	47394 - 44032: 0x8FD0,
-	47395 - 44032: 0x8FD1,
-	47396 - 44032: 0x8FD2,
-	47397 - 44032: 0x8FD3,
-	47398 - 44032: 0x8FD4,
-	47399 - 44032: 0x8FD5,
-	47400 - 44032: 0x8FD6,
-	47401 - 44032: 0x8FD7,
-	47402 - 44032: 0x8FD8,
-	47403 - 44032: 0x8FD9,
-	47404 - 44032: 0x8FDA,
-	47405 - 44032: 0x8FDB,
-	47406 - 44032: 0x8FDC,
-	47407 - 44032: 0x8FDD,
-	47408 - 44032: 0x8FDE,
-	47409 - 44032: 0x8FDF,
-	47410 - 44032: 0x8FE0,
-	47411 - 44032: 0x8FE1,
-	47412 - 44032: 0x8FE2,
-	47413 - 44032: 0x8FE3,
-	47414 - 44032: 0x8FE4,
-	47415 - 44032: 0x8FE5,
-	47416 - 44032: 0x8FE6,
-	47417 - 44032: 0x8FE7,
-	47418 - 44032: 0x8FE8,
-	47419 - 44032: 0x8FE9,
-	47420 - 44032: 0xB7F2,
-	47421 - 44032: 0xB7F3,
-	47422 - 44032: 0x8FEA,
-	47423 - 44032: 0x8FEB,
-	47424 - 44032: 0xB7F4,
-	47425 - 44032: 0x8FEC,
-	47426 - 44032: 0x8FED,
-	47427 - 44032: 0x8FEE,
-	47428 - 44032: 0xB7F5,
-	47429 - 44032: 0x8FEF,
-	47430 - 44032: 0x8FF0,
-	47431 - 44032: 0x8FF1,
-	47432 - 44032: 0x8FF2,
-	47433 - 44032: 0x8FF3,
-	47434 - 44032: 0x8FF4,
-	47435 - 44032: 0x8FF5,
-	47436 - 44032: 0xB7F6,
-	47437 - 44032: 0x8FF6,
-	47438 - 44032: 0x8FF7,
-	47439 - 44032: 0xB7F7,
-	47440 - 44032: 0x8FF8,
-	47441 - 44032: 0xB7F8,
-	47442 - 44032: 0x8FF9,
-	47443 - 44032: 0x8FFA,
-	47444 - 44032: 0x8FFB,
-	47445 - 44032: 0x8FFC,
-	47446 - 44032: 0x8FFD,
-	47447 - 44032: 0x8FFE,
-	47448 - 44032: 0xB7F9,
-	47449 - 44032: 0xB7FA,
-	47450 - 44032: 0x9041,
-	47451 - 44032: 0x9042,
-	47452 - 44032: 0xB7FB,
-	47453 - 44032: 0x9043,
-	47454 - 44032: 0x9044,
-	47455 - 44032: 0x9045,
-	47456 - 44032: 0xB7FC,
-	47457 - 44032: 0x9046,
-	47458 - 44032: 0x9047,
-	47459 - 44032: 0x9048,
-	47460 - 44032: 0x9049,
-	47461 - 44032: 0x904A,
-	47462 - 44032: 0x904B,
-	47463 - 44032: 0x904C,
-	47464 - 44032: 0xB7FD,
-	47465 - 44032: 0xB7FE,
-	47466 - 44032: 0x904D,
-	47467 - 44032: 0xB8A1,
-	47468 - 44032: 0x904E,
-	47469 - 44032: 0xB8A2,
-	47470 - 44032: 0x904F,
-	47471 - 44032: 0x9050,
-	47472 - 44032: 0x9051,
-	47473 - 44032: 0x9052,
-	47474 - 44032: 0x9053,
-	47475 - 44032: 0x9054,
-	47476 - 44032: 0xB8A3,
-	47477 - 44032: 0xB8A4,
-	47478 - 44032: 0x9055,
-	47479 - 44032: 0x9056,
-	47480 - 44032: 0xB8A5,
-	47481 - 44032: 0x9057,
-	47482 - 44032: 0x9058,
-	47483 - 44032: 0x9059,
-	47484 - 44032: 0xB8A6,
-	47485 - 44032: 0x905A,
-	47486 - 44032: 0x9061,
-	47487 - 44032: 0x9062,
-	47488 - 44032: 0x9063,
-	47489 - 44032: 0x9064,
-	47490 - 44032: 0x9065,
-	47491 - 44032: 0x9066,
-	47492 - 44032: 0xB8A7,
-	47493 - 44032: 0xB8A8,
-	47494 - 44032: 0x9067,
-	47495 - 44032: 0xB8A9,
-	47496 - 44032: 0x9068,
-	47497 - 44032: 0xB8AA,
-	47498 - 44032: 0xB8AB,
-	47499 - 44032: 0x9069,
-	47500 - 44032: 0x906A,
-	47501 - 44032: 0xB8AC,
-	47502 - 44032: 0xB8AD,
-	47503 - 44032: 0x906B,
-	47504 - 44032: 0x906C,
-	47505 - 44032: 0x906D,
-	47506 - 44032: 0x906E,
-	47507 - 44032: 0x906F,
-	47508 - 44032: 0x9070,
-	47509 - 44032: 0x9071,
-	47510 - 44032: 0x9072,
-	47511 - 44032: 0x9073,
-	47512 - 44032: 0x9074,
-	47513 - 44032: 0x9075,
-	47514 - 44032: 0x9076,
-	47515 - 44032: 0x9077,
-	47516 - 44032: 0x9078,
-	47517 - 44032: 0x9079,
-	47518 - 44032: 0x907A,
-	47519 - 44032: 0x9081,
-	47520 - 44032: 0x9082,
-	47521 - 44032: 0x9083,
-	47522 - 44032: 0x9084,
-	47523 - 44032: 0x9085,
-	47524 - 44032: 0x9086,
-	47525 - 44032: 0x9087,
-	47526 - 44032: 0x9088,
-	47527 - 44032: 0x9089,
-	47528 - 44032: 0x908A,
-	47529 - 44032: 0x908B,
-	47530 - 44032: 0x908C,
-	47531 - 44032: 0x908D,
-	47532 - 44032: 0xB8AE,
-	47533 - 44032: 0xB8AF,
-	47534 - 44032: 0x908E,
-	47535 - 44032: 0x908F,
-	47536 - 44032: 0xB8B0,
-	47537 - 44032: 0x9090,
-	47538 - 44032: 0x9091,
-	47539 - 44032: 0x9092,
-	47540 - 44032: 0xB8B1,
-	47541 - 44032: 0x9093,
-	47542 - 44032: 0x9094,
-	47543 - 44032: 0x9095,
-	47544 - 44032: 0x9096,
-	47545 - 44032: 0x9097,
-	47546 - 44032: 0x9098,
-	47547 - 44032: 0x9099,
-	47548 - 44032: 0xB8B2,
-	47549 - 44032: 0xB8B3,
-	47550 - 44032: 0x909A,
-	47551 - 44032: 0xB8B4,
-	47552 - 44032: 0x909B,
-	47553 - 44032: 0xB8B5,
-	47554 - 44032: 0x909C,
-	47555 - 44032: 0x909D,
-	47556 - 44032: 0x909E,
-	47557 - 44032: 0x909F,
-	47558 - 44032: 0x90A0,
-	47559 - 44032: 0x90A1,
-	47560 - 44032: 0xB8B6,
-	47561 - 44032: 0xB8B7,
-	47562 - 44032: 0x90A2,
-	47563 - 44032: 0x90A3,
-	47564 - 44032: 0xB8B8,
-	47565 - 44032: 0x90A4,
-	47566 - 44032: 0xB8B9,
-	47567 - 44032: 0xB8BA,
-	47568 - 44032: 0xB8BB,
-	47569 - 44032: 0xB8BC,
-	47570 - 44032: 0xB8BD,
-	47571 - 44032: 0x90A5,
-	47572 - 44032: 0x90A6,
-	47573 - 44032: 0x90A7,
-	47574 - 44032: 0x90A8,
-	47575 - 44032: 0x90A9,
-	47576 - 44032: 0xB8BE,
-	47577 - 44032: 0xB8BF,
-	47578 - 44032: 0x90AA,
-	47579 - 44032: 0xB8C0,
-	47580 - 44032: 0x90AB,
-	47581 - 44032: 0xB8C1,
-	47582 - 44032: 0xB8C2,
-	47583 - 44032: 0x90AC,
-	47584 - 44032: 0x90AD,
-	47585 - 44032: 0xB8C3,
-	47586 - 44032: 0x90AE,
-	47587 - 44032: 0xB8C4,
-	47588 - 44032: 0xB8C5,
-	47589 - 44032: 0xB8C6,
-	47590 - 44032: 0x90AF,
-	47591 - 44032: 0x90B0,
-	47592 - 44032: 0xB8C7,
-	47593 - 44032: 0x90B1,
-	47594 - 44032: 0x90B2,
-	47595 - 44032: 0x90B3,
-	47596 - 44032: 0xB8C8,
-	47597 - 44032: 0x90B4,
-	47598 - 44032: 0x90B5,
-	47599 - 44032: 0x90B6,
-	47600 - 44032: 0x90B7,
-	47601 - 44032: 0x90B8,
-	47602 - 44032: 0x90B9,
-	47603 - 44032: 0x90BA,
-	47604 - 44032: 0xB8C9,
-	47605 - 44032: 0xB8CA,
-	47606 - 44032: 0x90BB,
-	47607 - 44032: 0xB8CB,
-	47608 - 44032: 0xB8CC,
-	47609 - 44032: 0xB8CD,
-	47610 - 44032: 0xB8CE,
-	47611 - 44032: 0x90BC,
-	47612 - 44032: 0x90BD,
-	47613 - 44032: 0x90BE,
-	47614 - 44032: 0x90BF,
-	47615 - 44032: 0x90C0,
-	47616 - 44032: 0xB8CF,
-	47617 - 44032: 0xB8D0,
-	47618 - 44032: 0x90C1,
-	47619 - 44032: 0x90C2,
-	47620 - 44032: 0x90C3,
-	47621 - 44032: 0x90C4,
-	47622 - 44032: 0x90C5,
-	47623 - 44032: 0x90C6,
-	47624 - 44032: 0xB8D1,
-	47625 - 44032: 0x90C7,
-	47626 - 44032: 0x90C8,
-	47627 - 44032: 0x90C9,
-	47628 - 44032: 0x90CA,
-	47629 - 44032: 0x90CB,
-	47630 - 44032: 0x90CC,
-	47631 - 44032: 0x90CD,
-	47632 - 44032: 0x90CE,
-	47633 - 44032: 0x90CF,
-	47634 - 44032: 0x90D0,
-	47635 - 44032: 0x90D1,
-	47636 - 44032: 0x90D2,
-	47637 - 44032: 0xB8D2,
-	47638 - 44032: 0x90D3,
-	47639 - 44032: 0x90D4,
-	47640 - 44032: 0x90D5,
-	47641 - 44032: 0x90D6,
-	47642 - 44032: 0x90D7,
-	47643 - 44032: 0x90D8,
-	47644 - 44032: 0x90D9,
-	47645 - 44032: 0x90DA,
-	47646 - 44032: 0x90DB,
-	47647 - 44032: 0x90DC,
-	47648 - 44032: 0x90DD,
-	47649 - 44032: 0x90DE,
-	47650 - 44032: 0x90DF,
-	47651 - 44032: 0x90E0,
-	47652 - 44032: 0x90E1,
-	47653 - 44032: 0x90E2,
-	47654 - 44032: 0x90E3,
-	47655 - 44032: 0x90E4,
-	47656 - 44032: 0x90E5,
-	47657 - 44032: 0x90E6,
-	47658 - 44032: 0x90E7,
-	47659 - 44032: 0x90E8,
-	47660 - 44032: 0x90E9,
-	47661 - 44032: 0x90EA,
-	47662 - 44032: 0x90EB,
-	47663 - 44032: 0x90EC,
-	47664 - 44032: 0x90ED,
-	47665 - 44032: 0x90EE,
-	47666 - 44032: 0x90EF,
-	47667 - 44032: 0x90F0,
-	47668 - 44032: 0x90F1,
-	47669 - 44032: 0x90F2,
-	47670 - 44032: 0x90F3,
-	47671 - 44032: 0x90F4,
-	47672 - 44032: 0xB8D3,
-	47673 - 44032: 0xB8D4,
-	47674 - 44032: 0x90F5,
-	47675 - 44032: 0x90F6,
-	47676 - 44032: 0xB8D5,
-	47677 - 44032: 0x90F7,
-	47678 - 44032: 0x90F8,
-	47679 - 44032: 0x90F9,
-	47680 - 44032: 0xB8D6,
-	47681 - 44032: 0x90FA,
-	47682 - 44032: 0xB8D7,
-	47683 - 44032: 0x90FB,
-	47684 - 44032: 0x90FC,
-	47685 - 44032: 0x90FD,
-	47686 - 44032: 0x90FE,
-	47687 - 44032: 0x9141,
-	47688 - 44032: 0xB8D8,
-	47689 - 44032: 0xB8D9,
-	47690 - 44032: 0x9142,
-	47691 - 44032: 0xB8DA,
-	47692 - 44032: 0x9143,
-	47693 - 44032: 0xB8DB,
-	47694 - 44032: 0xB8DC,
-	47695 - 44032: 0x9144,
-	47696 - 44032: 0x9145,
-	47697 - 44032: 0x9146,
-	47698 - 44032: 0x9147,
-	47699 - 44032: 0xB8DD,
-	47700 - 44032: 0xB8DE,
-	47701 - 44032: 0xB8DF,
-	47702 - 44032: 0x9148,
-	47703 - 44032: 0x9149,
-	47704 - 44032: 0xB8E0,
-	47705 - 44032: 0x914A,
-	47706 - 44032: 0x914B,
-	47707 - 44032: 0x914C,
-	47708 - 44032: 0xB8E1,
-	47709 - 44032: 0x914D,
-	47710 - 44032: 0x914E,
-	47711 - 44032: 0x914F,
-	47712 - 44032: 0x9150,
-	47713 - 44032: 0x9151,
-	47714 - 44032: 0x9152,
-	47715 - 44032: 0x9153,
-	47716 - 44032: 0xB8E2,
-	47717 - 44032: 0xB8E3,
-	47718 - 44032: 0x9154,
-	47719 - 44032: 0xB8E4,
-	47720 - 44032: 0xB8E5,
-	47721 - 44032: 0xB8E6,
-	47722 - 44032: 0x9155,
-	47723 - 44032: 0x9156,
-	47724 - 44032: 0x9157,
-	47725 - 44032: 0x9158,
-	47726 - 44032: 0x9159,
-	47727 - 44032: 0x915A,
-	47728 - 44032: 0xB8E7,
-	47729 - 44032: 0xB8E8,
-	47730 - 44032: 0x9161,
-	47731 - 44032: 0x9162,
-	47732 - 44032: 0xB8E9,
-	47733 - 44032: 0x9163,
-	47734 - 44032: 0x9164,
-	47735 - 44032: 0x9165,
-	47736 - 44032: 0xB8EA,
-	47737 - 44032: 0x9166,
-	47738 - 44032: 0x9167,
-	47739 - 44032: 0x9168,
-	47740 - 44032: 0x9169,
-	47741 - 44032: 0x916A,
-	47742 - 44032: 0x916B,
-	47743 - 44032: 0x916C,
-	47744 - 44032: 0x916D,
-	47745 - 44032: 0x916E,
-	47746 - 44032: 0x916F,
-	47747 - 44032: 0xB8EB,
-	47748 - 44032: 0xB8EC,
-	47749 - 44032: 0xB8ED,
-	47750 - 44032: 0x9170,
-	47751 - 44032: 0xB8EE,
-	47752 - 44032: 0x9171,
-	47753 - 44032: 0x9172,
-	47754 - 44032: 0x9173,
-	47755 - 44032: 0x9174,
-	47756 - 44032: 0xB8EF,
-	47757 - 44032: 0x9175,
-	47758 - 44032: 0x9176,
-	47759 - 44032: 0x9177,
-	47760 - 44032: 0x9178,
-	47761 - 44032: 0x9179,
-	47762 - 44032: 0x917A,
-	47763 - 44032: 0x9181,
-	47764 - 44032: 0x9182,
-	47765 - 44032: 0x9183,
-	47766 - 44032: 0x9184,
-	47767 - 44032: 0x9185,
-	47768 - 44032: 0x9186,
-	47769 - 44032: 0x9187,
-	47770 - 44032: 0x9188,
-	47771 - 44032: 0x9189,
-	47772 - 44032: 0x918A,
-	47773 - 44032: 0x918B,
-	47774 - 44032: 0x918C,
-	47775 - 44032: 0x918D,
-	47776 - 44032: 0x918E,
-	47777 - 44032: 0x918F,
-	47778 - 44032: 0x9190,
-	47779 - 44032: 0x9191,
-	47780 - 44032: 0x9192,
-	47781 - 44032: 0x9193,
-	47782 - 44032: 0x9194,
-	47783 - 44032: 0x9195,
-	47784 - 44032: 0xB8F0,
-	47785 - 44032: 0xB8F1,
-	47786 - 44032: 0x9196,
-	47787 - 44032: 0xB8F2,
-	47788 - 44032: 0xB8F3,
-	47789 - 44032: 0x9197,
-	47790 - 44032: 0x9198,
-	47791 - 44032: 0x9199,
-	47792 - 44032: 0xB8F4,
-	47793 - 44032: 0x919A,
-	47794 - 44032: 0xB8F5,
-	47795 - 44032: 0x919B,
-	47796 - 44032: 0x919C,
-	47797 - 44032: 0x919D,
-	47798 - 44032: 0x919E,
-	47799 - 44032: 0x919F,
-	47800 - 44032: 0xB8F6,
-	47801 - 44032: 0xB8F7,
-	47802 - 44032: 0x91A0,
-	47803 - 44032: 0xB8F8,
-	47804 - 44032: 0x91A1,
-	47805 - 44032: 0xB8F9,
-	47806 - 44032: 0x91A2,
-	47807 - 44032: 0x91A3,
-	47808 - 44032: 0x91A4,
-	47809 - 44032: 0x91A5,
-	47810 - 44032: 0x91A6,
-	47811 - 44032: 0x91A7,
-	47812 - 44032: 0xB8FA,
-	47813 - 44032: 0x91A8,
-	47814 - 44032: 0x91A9,
-	47815 - 44032: 0x91AA,
-	47816 - 44032: 0xB8FB,
-	47817 - 44032: 0x91AB,
-	47818 - 44032: 0x91AC,
-	47819 - 44032: 0x91AD,
-	47820 - 44032: 0x91AE,
-	47821 - 44032: 0x91AF,
-	47822 - 44032: 0x91B0,
-	47823 - 44032: 0x91B1,
-	47824 - 44032: 0x91B2,
-	47825 - 44032: 0x91B3,
-	47826 - 44032: 0x91B4,
-	47827 - 44032: 0x91B5,
-	47828 - 44032: 0x91B6,
-	47829 - 44032: 0x91B7,
-	47830 - 44032: 0x91B8,
-	47831 - 44032: 0x91B9,
-	47832 - 44032: 0xB8FC,
-	47833 - 44032: 0xB8FD,
-	47834 - 44032: 0x91BA,
-	47835 - 44032: 0x91BB,
-	47836 - 44032: 0x91BC,
-	47837 - 44032: 0x91BD,
-	47838 - 44032: 0x91BE,
-	47839 - 44032: 0x91BF,
-	47840 - 44032: 0x91C0,
-	47841 - 44032: 0x91C1,
-	47842 - 44032: 0x91C2,
-	47843 - 44032: 0x91C3,
-	47844 - 44032: 0x91C4,
-	47845 - 44032: 0x91C5,
-	47846 - 44032: 0x91C6,
-	47847 - 44032: 0x91C7,
-	47848 - 44032: 0x91C8,
-	47849 - 44032: 0x91C9,
-	47850 - 44032: 0x91CA,
-	47851 - 44032: 0x91CB,
-	47852 - 44032: 0x91CC,
-	47853 - 44032: 0x91CD,
-	47854 - 44032: 0x91CE,
-	47855 - 44032: 0x91CF,
-	47856 - 44032: 0x91D0,
-	47857 - 44032: 0x91D1,
-	47858 - 44032: 0x91D2,
-	47859 - 44032: 0x91D3,
-	47860 - 44032: 0x91D4,
-	47861 - 44032: 0x91D5,
-	47862 - 44032: 0x91D6,
-	47863 - 44032: 0x91D7,
-	47864 - 44032: 0x91D8,
-	47865 - 44032: 0x91D9,
-	47866 - 44032: 0x91DA,
-	47867 - 44032: 0x91DB,
-	47868 - 44032: 0xB8FE,
-	47869 - 44032: 0x91DC,
-	47870 - 44032: 0x91DD,
-	47871 - 44032: 0x91DE,
-	47872 - 44032: 0xB9A1,
-	47873 - 44032: 0x91DF,
-	47874 - 44032: 0x91E0,
-	47875 - 44032: 0x91E1,
-	47876 - 44032: 0xB9A2,
-	47877 - 44032: 0x91E2,
-	47878 - 44032: 0x91E3,
-	47879 - 44032: 0x91E4,
-	47880 - 44032: 0x91E5,
-	47881 - 44032: 0x91E6,
-	47882 - 44032: 0x91E7,
-	47883 - 44032: 0x91E8,
-	47884 - 44032: 0x91E9,
-	47885 - 44032: 0xB9A3,
-	47886 - 44032: 0x91EA,
-	47887 - 44032: 0xB9A4,
-	47888 - 44032: 0x91EB,
-	47889 - 44032: 0xB9A5,
-	47890 - 44032: 0x91EC,
-	47891 - 44032: 0x91ED,
-	47892 - 44032: 0x91EE,
-	47893 - 44032: 0x91EF,
-	47894 - 44032: 0x91F0,
-	47895 - 44032: 0x91F1,
-	47896 - 44032: 0xB9A6,
-	47897 - 44032: 0x91F2,
-	47898 - 44032: 0x91F3,
-	47899 - 44032: 0x91F4,
-	47900 - 44032: 0xB9A7,
-	47901 - 44032: 0x91F5,
-	47902 - 44032: 0x91F6,
-	47903 - 44032: 0x91F7,
-	47904 - 44032: 0xB9A8,
-	47905 - 44032: 0x91F8,
-	47906 - 44032: 0x91F9,
-	47907 - 44032: 0x91FA,
-	47908 - 44032: 0x91FB,
-	47909 - 44032: 0x91FC,
-	47910 - 44032: 0x91FD,
-	47911 - 44032: 0x91FE,
-	47912 - 44032: 0x9241,
-	47913 - 44032: 0xB9A9,
-	47914 - 44032: 0x9242,
-	47915 - 44032: 0xB9AA,
-	47916 - 44032: 0x9243,
-	47917 - 44032: 0x9244,
-	47918 - 44032: 0x9245,
-	47919 - 44032: 0x9246,
-	47920 - 44032: 0x9247,
-	47921 - 44032: 0x9248,
-	47922 - 44032: 0x9249,
-	47923 - 44032: 0x924A,
-	47924 - 44032: 0xB9AB,
-	47925 - 44032: 0xB9AC,
-	47926 - 44032: 0xB9AD,
-	47927 - 44032: 0x924B,
-	47928 - 44032: 0xB9AE,
-	47929 - 44032: 0x924C,
-	47930 - 44032: 0x924D,
-	47931 - 44032: 0xB9AF,
-	47932 - 44032: 0xB9B0,
-	47933 - 44032: 0xB9B1,
-	47934 - 44032: 0xB9B2,
-	47935 - 44032: 0x924E,
-	47936 - 44032: 0x924F,
-	47937 - 44032: 0x9250,
-	47938 - 44032: 0x9251,
-	47939 - 44032: 0x9252,
-	47940 - 44032: 0xB9B3,
-	47941 - 44032: 0xB9B4,
-	47942 - 44032: 0x9253,
-	47943 - 44032: 0xB9B5,
-	47944 - 44032: 0x9254,
-	47945 - 44032: 0xB9B6,
-	47946 - 44032: 0x9255,
-	47947 - 44032: 0x9256,
-	47948 - 44032: 0x9257,
-	47949 - 44032: 0xB9B7,
-	47950 - 44032: 0x9258,
-	47951 - 44032: 0xB9B8,
-	47952 - 44032: 0xB9B9,
-	47953 - 44032: 0x9259,
-	47954 - 44032: 0x925A,
-	47955 - 44032: 0x9261,
-	47956 - 44032: 0xB9BA,
-	47957 - 44032: 0x9262,
-	47958 - 44032: 0x9263,
-	47959 - 44032: 0x9264,
-	47960 - 44032: 0xB9BB,
-	47961 - 44032: 0x9265,
-	47962 - 44032: 0x9266,
-	47963 - 44032: 0x9267,
-	47964 - 44032: 0x9268,
-	47965 - 44032: 0x9269,
-	47966 - 44032: 0x926A,
-	47967 - 44032: 0x926B,
-	47968 - 44032: 0x926C,
-	47969 - 44032: 0xB9BC,
-	47970 - 44032: 0x926D,
-	47971 - 44032: 0xB9BD,
-	47972 - 44032: 0x926E,
-	47973 - 44032: 0x926F,
-	47974 - 44032: 0x9270,
-	47975 - 44032: 0x9271,
-	47976 - 44032: 0x9272,
-	47977 - 44032: 0x9273,
-	47978 - 44032: 0x9274,
-	47979 - 44032: 0x9275,
-	47980 - 44032: 0xB9BE,
-	47981 - 44032: 0x9276,
-	47982 - 44032: 0x9277,
-	47983 - 44032: 0x9278,
-	47984 - 44032: 0x9279,
-	47985 - 44032: 0x927A,
-	47986 - 44032: 0x9281,
-	47987 - 44032: 0x9282,
-	47988 - 44032: 0x9283,
-	47989 - 44032: 0x9284,
-	47990 - 44032: 0x9285,
-	47991 - 44032: 0x9286,
-	47992 - 44032: 0x9287,
-	47993 - 44032: 0x9288,
-	47994 - 44032: 0x9289,
-	47995 - 44032: 0x928A,
-	47996 - 44032: 0x928B,
-	47997 - 44032: 0x928C,
-	47998 - 44032: 0x928D,
-	47999 - 44032: 0x928E,
-	48000 - 44032: 0x928F,
-	48001 - 44032: 0x9290,
-	48002 - 44032: 0x9291,
-	48003 - 44032: 0x9292,
-	48004 - 44032: 0x9293,
-	48005 - 44032: 0x9294,
-	48006 - 44032: 0x9295,
-	48007 - 44032: 0x9296,
-	48008 - 44032: 0xB9BF,
-	48009 - 44032: 0x9297,
-	48010 - 44032: 0x9298,
-	48011 - 44032: 0x9299,
-	48012 - 44032: 0xB9C0,
-	48013 - 44032: 0x929A,
-	48014 - 44032: 0x929B,
-	48015 - 44032: 0x929C,
-	48016 - 44032: 0xB9C1,
-	48017 - 44032: 0x929D,
-	48018 - 44032: 0x929E,
-	48019 - 44032: 0x929F,
-	48020 - 44032: 0x92A0,
-	48021 - 44032: 0x92A1,
-	48022 - 44032: 0x92A2,
-	48023 - 44032: 0x92A3,
-	48024 - 44032: 0x92A4,
-	48025 - 44032: 0x92A5,
-	48026 - 44032: 0x92A6,
-	48027 - 44032: 0x92A7,
-	48028 - 44032: 0x92A8,
-	48029 - 44032: 0x92A9,
-	48030 - 44032: 0x92AA,
-	48031 - 44032: 0x92AB,
-	48032 - 44032: 0x92AC,
-	48033 - 44032: 0x92AD,
-	48034 - 44032: 0x92AE,
-	48035 - 44032: 0x92AF,
-	48036 - 44032: 0xB9C2,
-	48037 - 44032: 0x92B0,
-	48038 - 44032: 0x92B1,
-	48039 - 44032: 0x92B2,
-	48040 - 44032: 0xB9C3,
-	48041 - 44032: 0x92B3,
-	48042 - 44032: 0x92B4,
-	48043 - 44032: 0x92B5,
-	48044 - 44032: 0xB9C4,
-	48045 - 44032: 0x92B6,
-	48046 - 44032: 0x92B7,
-	48047 - 44032: 0x92B8,
-	48048 - 44032: 0x92B9,
-	48049 - 44032: 0x92BA,
-	48050 - 44032: 0x92BB,
-	48051 - 44032: 0x92BC,
-	48052 - 44032: 0xB9C5,
-	48053 - 44032: 0x92BD,
-	48054 - 44032: 0x92BE,
-	48055 - 44032: 0xB9C6,
-	48056 - 44032: 0x92BF,
-	48057 - 44032: 0x92C0,
-	48058 - 44032: 0x92C1,
-	48059 - 44032: 0x92C2,
-	48060 - 44032: 0x92C3,
-	48061 - 44032: 0x92C4,
-	48062 - 44032: 0x92C5,
-	48063 - 44032: 0x92C6,
-	48064 - 44032: 0xB9C7,
-	48065 - 44032: 0x92C7,
-	48066 - 44032: 0x92C8,
-	48067 - 44032: 0x92C9,
-	48068 - 44032: 0xB9C8,
-	48069 - 44032: 0x92CA,
-	48070 - 44032: 0x92CB,
-	48071 - 44032: 0x92CC,
-	48072 - 44032: 0xB9C9,
-	48073 - 44032: 0x92CD,
-	48074 - 44032: 0x92CE,
-	48075 - 44032: 0x92CF,
-	48076 - 44032: 0x92D0,
-	48077 - 44032: 0x92D1,
-	48078 - 44032: 0x92D2,
-	48079 - 44032: 0x92D3,
-	48080 - 44032: 0xB9CA,
-	48081 - 44032: 0x92D4,
-	48082 - 44032: 0x92D5,
-	48083 - 44032: 0xB9CB,
-	48084 - 44032: 0x92D6,
-	48085 - 44032: 0x92D7,
-	48086 - 44032: 0x92D8,
-	48087 - 44032: 0x92D9,
-	48088 - 44032: 0x92DA,
-	48089 - 44032: 0x92DB,
-	48090 - 44032: 0x92DC,
-	48091 - 44032: 0x92DD,
-	48092 - 44032: 0x92DE,
-	48093 - 44032: 0x92DF,
-	48094 - 44032: 0x92E0,
-	48095 - 44032: 0x92E1,
-	48096 - 44032: 0x92E2,
-	48097 - 44032: 0x92E3,
-	48098 - 44032: 0x92E4,
-	48099 - 44032: 0x92E5,
-	48100 - 44032: 0x92E6,
-	48101 - 44032: 0x92E7,
-	48102 - 44032: 0x92E8,
-	48103 - 44032: 0x92E9,
-	48104 - 44032: 0x92EA,
-	48105 - 44032: 0x92EB,
-	48106 - 44032: 0x92EC,
-	48107 - 44032: 0x92ED,
-	48108 - 44032: 0x92EE,
-	48109 - 44032: 0x92EF,
-	48110 - 44032: 0x92F0,
-	48111 - 44032: 0x92F1,
-	48112 - 44032: 0x92F2,
-	48113 - 44032: 0x92F3,
-	48114 - 44032: 0x92F4,
-	48115 - 44032: 0x92F5,
-	48116 - 44032: 0x92F6,
-	48117 - 44032: 0x92F7,
-	48118 - 44032: 0x92F8,
-	48119 - 44032: 0x92F9,
-	48120 - 44032: 0xB9CC,
-	48121 - 44032: 0xB9CD,
-	48122 - 44032: 0x92FA,
-	48123 - 44032: 0x92FB,
-	48124 - 44032: 0xB9CE,
-	48125 - 44032: 0x92FC,
-	48126 - 44032: 0x92FD,
-	48127 - 44032: 0xB9CF,
-	48128 - 44032: 0xB9D0,
-	48129 - 44032: 0x92FE,
-	48130 - 44032: 0xB9D1,
-	48131 - 44032: 0x9341,
-	48132 - 44032: 0x9342,
-	48133 - 44032: 0x9343,
-	48134 - 44032: 0x9344,
-	48135 - 44032: 0x9345,
-	48136 - 44032: 0xB9D2,
-	48137 - 44032: 0xB9D3,
-	48138 - 44032: 0x9346,
-	48139 - 44032: 0xB9D4,
-	48140 - 44032: 0xB9D5,
-	48141 - 44032: 0xB9D6,
-	48142 - 44032: 0x9347,
-	48143 - 44032: 0xB9D7,
-	48144 - 44032: 0x9348,
-	48145 - 44032: 0xB9D8,
-	48146 - 44032: 0x9349,
-	48147 - 44032: 0x934A,
-	48148 - 44032: 0xB9D9,
-	48149 - 44032: 0xB9DA,
-	48150 - 44032: 0xB9DB,
-	48151 - 44032: 0xB9DC,
-	48152 - 44032: 0xB9DD,
-	48153 - 44032: 0x934B,
-	48154 - 44032: 0x934C,
-	48155 - 44032: 0xB9DE,
-	48156 - 44032: 0xB9DF,
-	48157 - 44032: 0xB9E0,
-	48158 - 44032: 0xB9E1,
-	48159 - 44032: 0xB9E2,
-	48160 - 44032: 0x934D,
-	48161 - 44032: 0x934E,
-	48162 - 44032: 0x934F,
-	48163 - 44032: 0x9350,
-	48164 - 44032: 0xB9E3,
-	48165 - 44032: 0xB9E4,
-	48166 - 44032: 0x9351,
-	48167 - 44032: 0xB9E5,
-	48168 - 44032: 0x9352,
-	48169 - 44032: 0xB9E6,
-	48170 - 44032: 0x9353,
-	48171 - 44032: 0x9354,
-	48172 - 44032: 0x9355,
-	48173 - 44032: 0xB9E7,
-	48174 - 44032: 0x9356,
-	48175 - 44032: 0x9357,
-	48176 - 44032: 0xB9E8,
-	48177 - 44032: 0xB9E9,
-	48178 - 44032: 0x9358,
-	48179 - 44032: 0x9359,
-	48180 - 44032: 0xB9EA,
-	48181 - 44032: 0x935A,
-	48182 - 44032: 0x9361,
-	48183 - 44032: 0x9362,
-	48184 - 44032: 0xB9EB,
-	48185 - 44032: 0x9363,
-	48186 - 44032: 0x9364,
-	48187 - 44032: 0x9365,
-	48188 - 44032: 0x9366,
-	48189 - 44032: 0x9367,
-	48190 - 44032: 0x9368,
-	48191 - 44032: 0x9369,
-	48192 - 44032: 0xB9EC,
-	48193 - 44032: 0xB9ED,
-	48194 - 44032: 0x936A,
-	48195 - 44032: 0xB9EE,
-	48196 - 44032: 0xB9EF,
-	48197 - 44032: 0xB9F0,
-	48198 - 44032: 0x936B,
-	48199 - 44032: 0x936C,
-	48200 - 44032: 0x936D,
-	48201 - 44032: 0xB9F1,
-	48202 - 44032: 0x936E,
-	48203 - 44032: 0x936F,
-	48204 - 44032: 0xB9F2,
-	48205 - 44032: 0xB9F3,
-	48206 - 44032: 0x9370,
-	48207 - 44032: 0x9371,
-	48208 - 44032: 0xB9F4,
-	48209 - 44032: 0x9372,
-	48210 - 44032: 0x9373,
-	48211 - 44032: 0x9374,
-	48212 - 44032: 0x9375,
-	48213 - 44032: 0x9376,
-	48214 - 44032: 0x9377,
-	48215 - 44032: 0x9378,
-	48216 - 44032: 0x9379,
-	48217 - 44032: 0x937A,
-	48218 - 44032: 0x9381,
-	48219 - 44032: 0x9382,
-	48220 - 44032: 0x9383,
-	48221 - 44032: 0xB9F5,
-	48222 - 44032: 0x9384,
-	48223 - 44032: 0x9385,
-	48224 - 44032: 0x9386,
-	48225 - 44032: 0x9387,
-	48226 - 44032: 0x9388,
-	48227 - 44032: 0x9389,
-	48228 - 44032: 0x938A,
-	48229 - 44032: 0x938B,
-	48230 - 44032: 0x938C,
-	48231 - 44032: 0x938D,
-	48232 - 44032: 0x938E,
-	48233 - 44032: 0x938F,
-	48234 - 44032: 0x9390,
-	48235 - 44032: 0x9391,
-	48236 - 44032: 0x9392,
-	48237 - 44032: 0x9393,
-	48238 - 44032: 0x9394,
-	48239 - 44032: 0x9395,
-	48240 - 44032: 0x9396,
-	48241 - 44032: 0x9397,
-	48242 - 44032: 0x9398,
-	48243 - 44032: 0x9399,
-	48244 - 44032: 0x939A,
-	48245 - 44032: 0x939B,
-	48246 - 44032: 0x939C,
-	48247 - 44032: 0x939D,
-	48248 - 44032: 0x939E,
-	48249 - 44032: 0x939F,
-	48250 - 44032: 0x93A0,
-	48251 - 44032: 0x93A1,
-	48252 - 44032: 0x93A2,
-	48253 - 44032: 0x93A3,
-	48254 - 44032: 0x93A4,
-	48255 - 44032: 0x93A5,
-	48256 - 44032: 0x93A6,
-	48257 - 44032: 0x93A7,
-	48258 - 44032: 0x93A8,
-	48259 - 44032: 0x93A9,
-	48260 - 44032: 0xB9F6,
-	48261 - 44032: 0xB9F7,
-	48262 - 44032: 0x93AA,
-	48263 - 44032: 0x93AB,
-	48264 - 44032: 0xB9F8,
-	48265 - 44032: 0x93AC,
-	48266 - 44032: 0x93AD,
-	48267 - 44032: 0xB9F9,
-	48268 - 44032: 0xB9FA,
-	48269 - 44032: 0x93AE,
-	48270 - 44032: 0xB9FB,
-	48271 - 44032: 0x93AF,
-	48272 - 44032: 0x93B0,
-	48273 - 44032: 0x93B1,
-	48274 - 44032: 0x93B2,
-	48275 - 44032: 0x93B3,
-	48276 - 44032: 0xB9FC,
-	48277 - 44032: 0xB9FD,
-	48278 - 44032: 0x93B4,
-	48279 - 44032: 0xB9FE,
-	48280 - 44032: 0x93B5,
-	48281 - 44032: 0xBAA1,
-	48282 - 44032: 0xBAA2,
-	48283 - 44032: 0x93B6,
-	48284 - 44032: 0x93B7,
-	48285 - 44032: 0x93B8,
-	48286 - 44032: 0x93B9,
-	48287 - 44032: 0x93BA,
-	48288 - 44032: 0xBAA3,
-	48289 - 44032: 0xBAA4,
-	48290 - 44032: 0x93BB,
-	48291 - 44032: 0x93BC,
-	48292 - 44032: 0xBAA5,
-	48293 - 44032: 0x93BD,
-	48294 - 44032: 0x93BE,
-	48295 - 44032: 0xBAA6,
-	48296 - 44032: 0xBAA7,
-	48297 - 44032: 0x93BF,
-	48298 - 44032: 0x93C0,
-	48299 - 44032: 0x93C1,
-	48300 - 44032: 0x93C2,
-	48301 - 44032: 0x93C3,
-	48302 - 44032: 0x93C4,
-	48303 - 44032: 0x93C5,
-	48304 - 44032: 0xBAA8,
-	48305 - 44032: 0xBAA9,
-	48306 - 44032: 0x93C6,
-	48307 - 44032: 0xBAAA,
-	48308 - 44032: 0xBAAB,
-	48309 - 44032: 0xBAAC,
-	48310 - 44032: 0x93C7,
-	48311 - 44032: 0x93C8,
-	48312 - 44032: 0x93C9,
-	48313 - 44032: 0x93CA,
-	48314 - 44032: 0x93CB,
-	48315 - 44032: 0x93CC,
-	48316 - 44032: 0xBAAD,
-	48317 - 44032: 0xBAAE,
-	48318 - 44032: 0x93CD,
-	48319 - 44032: 0x93CE,
-	48320 - 44032: 0xBAAF,
-	48321 - 44032: 0x93CF,
-	48322 - 44032: 0x93D0,
-	48323 - 44032: 0x93D1,
-	48324 - 44032: 0xBAB0,
-	48325 - 44032: 0x93D2,
-	48326 - 44032: 0x93D3,
-	48327 - 44032: 0x93D4,
-	48328 - 44032: 0x93D5,
-	48329 - 44032: 0x93D6,
-	48330 - 44032: 0x93D7,
-	48331 - 44032: 0x93D8,
-	48332 - 44032: 0x93D9,
-	48333 - 44032: 0xBAB1,
-	48334 - 44032: 0x93DA,
-	48335 - 44032: 0xBAB2,
-	48336 - 44032: 0xBAB3,
-	48337 - 44032: 0xBAB4,
-	48338 - 44032: 0x93DB,
-	48339 - 44032: 0x93DC,
-	48340 - 44032: 0x93DD,
-	48341 - 44032: 0xBAB5,
-	48342 - 44032: 0x93DE,
-	48343 - 44032: 0x93DF,
-	48344 - 44032: 0xBAB6,
-	48345 - 44032: 0x93E0,
-	48346 - 44032: 0x93E1,
-	48347 - 44032: 0x93E2,
-	48348 - 44032: 0xBAB7,
-	48349 - 44032: 0x93E3,
-	48350 - 44032: 0x93E4,
-	48351 - 44032: 0x93E5,
-	48352 - 44032: 0x93E6,
-	48353 - 44032: 0x93E7,
-	48354 - 44032: 0x93E8,
-	48355 - 44032: 0x93E9,
-	48356 - 44032: 0x93EA,
-	48357 - 44032: 0x93EB,
-	48358 - 44032: 0x93EC,
-	48359 - 44032: 0x93ED,
-	48360 - 44032: 0x93EE,
-	48361 - 44032: 0x93EF,
-	48362 - 44032: 0x93F0,
-	48363 - 44032: 0x93F1,
-	48364 - 44032: 0x93F2,
-	48365 - 44032: 0x93F3,
-	48366 - 44032: 0x93F4,
-	48367 - 44032: 0x93F5,
-	48368 - 44032: 0x93F6,
-	48369 - 44032: 0x93F7,
-	48370 - 44032: 0x93F8,
-	48371 - 44032: 0x93F9,
-	48372 - 44032: 0xBAB8,
-	48373 - 44032: 0xBAB9,
-	48374 - 44032: 0xBABA,
-	48375 - 44032: 0x93FA,
-	48376 - 44032: 0xBABB,
-	48377 - 44032: 0x93FB,
-	48378 - 44032: 0x93FC,
-	48379 - 44032: 0x93FD,
-	48380 - 44032: 0xBABC,
-	48381 - 44032: 0x93FE,
-	48382 - 44032: 0x9441,
-	48383 - 44032: 0x9442,
-	48384 - 44032: 0x9443,
-	48385 - 44032: 0x9444,
-	48386 - 44032: 0x9445,
-	48387 - 44032: 0x9446,
-	48388 - 44032: 0xBABD,
-	48389 - 44032: 0xBABE,
-	48390 - 44032: 0x9447,
-	48391 - 44032: 0xBABF,
-	48392 - 44032: 0x9448,
-	48393 - 44032: 0xBAC0,
-	48394 - 44032: 0x9449,
-	48395 - 44032: 0x944A,
-	48396 - 44032: 0x944B,
-	48397 - 44032: 0x944C,
-	48398 - 44032: 0x944D,
-	48399 - 44032: 0x944E,
-	48400 - 44032: 0xBAC1,
-	48401 - 44032: 0x944F,
-	48402 - 44032: 0x9450,
-	48403 - 44032: 0x9451,
-	48404 - 44032: 0xBAC2,
-	48405 - 44032: 0x9452,
-	48406 - 44032: 0x9453,
-	48407 - 44032: 0x9454,
-	48408 - 44032: 0x9455,
-	48409 - 44032: 0x9456,
-	48410 - 44032: 0x9457,
-	48411 - 44032: 0x9458,
-	48412 - 44032: 0x9459,
-	48413 - 44032: 0x945A,
-	48414 - 44032: 0x9461,
-	48415 - 44032: 0x9462,
-	48416 - 44032: 0x9463,
-	48417 - 44032: 0x9464,
-	48418 - 44032: 0x9465,
-	48419 - 44032: 0x9466,
-	48420 - 44032: 0xBAC3,
-	48421 - 44032: 0x9467,
-	48422 - 44032: 0x9468,
-	48423 - 44032: 0x9469,
-	48424 - 44032: 0x946A,
-	48425 - 44032: 0x946B,
-	48426 - 44032: 0x946C,
-	48427 - 44032: 0x946D,
-	48428 - 44032: 0xBAC4,
-	48429 - 44032: 0x946E,
-	48430 - 44032: 0x946F,
-	48431 - 44032: 0x9470,
-	48432 - 44032: 0x9471,
-	48433 - 44032: 0x9472,
-	48434 - 44032: 0x9473,
-	48435 - 44032: 0x9474,
-	48436 - 44032: 0x9475,
-	48437 - 44032: 0x9476,
-	48438 - 44032: 0x9477,
-	48439 - 44032: 0x9478,
-	48440 - 44032: 0x9479,
-	48441 - 44032: 0x947A,
-	48442 - 44032: 0x9481,
-	48443 - 44032: 0x9482,
-	48444 - 44032: 0x9483,
-	48445 - 44032: 0x9484,
-	48446 - 44032: 0x9485,
-	48447 - 44032: 0x9486,
-	48448 - 44032: 0xBAC5,
-	48449 - 44032: 0x9487,
-	48450 - 44032: 0x9488,
-	48451 - 44032: 0x9489,
-	48452 - 44032: 0x948A,
-	48453 - 44032: 0x948B,
-	48454 - 44032: 0x948C,
-	48455 - 44032: 0x948D,
-	48456 - 44032: 0xBAC6,
-	48457 - 44032: 0xBAC7,
-	48458 - 44032: 0x948E,
-	48459 - 44032: 0x948F,
-	48460 - 44032: 0xBAC8,
-	48461 - 44032: 0x9490,
-	48462 - 44032: 0x9491,
-	48463 - 44032: 0x9492,
-	48464 - 44032: 0xBAC9,
-	48465 - 44032: 0x9493,
-	48466 - 44032: 0x9494,
-	48467 - 44032: 0x9495,
-	48468 - 44032: 0x9496,
-	48469 - 44032: 0x9497,
-	48470 - 44032: 0x9498,
-	48471 - 44032: 0x9499,
-	48472 - 44032: 0xBACA,
-	48473 - 44032: 0xBACB,
-	48474 - 44032: 0x949A,
-	48475 - 44032: 0x949B,
-	48476 - 44032: 0x949C,
-	48477 - 44032: 0x949D,
-	48478 - 44032: 0x949E,
-	48479 - 44032: 0x949F,
-	48480 - 44032: 0x94A0,
-	48481 - 44032: 0x94A1,
-	48482 - 44032: 0x94A2,
-	48483 - 44032: 0x94A3,
-	48484 - 44032: 0xBACC,
-	48485 - 44032: 0x94A4,
-	48486 - 44032: 0x94A5,
-	48487 - 44032: 0x94A6,
-	48488 - 44032: 0xBACD,
-	48489 - 44032: 0x94A7,
-	48490 - 44032: 0x94A8,
-	48491 - 44032: 0x94A9,
-	48492 - 44032: 0x94AA,
-	48493 - 44032: 0x94AB,
-	48494 - 44032: 0x94AC,
-	48495 - 44032: 0x94AD,
-	48496 - 44032: 0x94AE,
-	48497 - 44032: 0x94AF,
-	48498 - 44032: 0x94B0,
-	48499 - 44032: 0x94B1,
-	48500 - 44032: 0x94B2,
-	48501 - 44032: 0x94B3,
-	48502 - 44032: 0x94B4,
-	48503 - 44032: 0x94B5,
-	48504 - 44032: 0x94B6,
-	48505 - 44032: 0x94B7,
-	48506 - 44032: 0x94B8,
-	48507 - 44032: 0x94B9,
-	48508 - 44032: 0x94BA,
-	48509 - 44032: 0x94BB,
-	48510 - 44032: 0x94BC,
-	48511 - 44032: 0x94BD,
-	48512 - 44032: 0xBACE,
-	48513 - 44032: 0xBACF,
-	48514 - 44032: 0x94BE,
-	48515 - 44032: 0x94BF,
-	48516 - 44032: 0xBAD0,
-	48517 - 44032: 0x94C0,
-	48518 - 44032: 0x94C1,
-	48519 - 44032: 0xBAD1,
-	48520 - 44032: 0xBAD2,
-	48521 - 44032: 0xBAD3,
-	48522 - 44032: 0xBAD4,
-	48523 - 44032: 0x94C2,
-	48524 - 44032: 0x94C3,
-	48525 - 44032: 0x94C4,
-	48526 - 44032: 0x94C5,
-	48527 - 44032: 0x94C6,
-	48528 - 44032: 0xBAD5,
-	48529 - 44032: 0xBAD6,
-	48530 - 44032: 0x94C7,
-	48531 - 44032: 0xBAD7,
-	48532 - 44032: 0x94C8,
-	48533 - 44032: 0xBAD8,
-	48534 - 44032: 0x94C9,
-	48535 - 44032: 0x94CA,
-	48536 - 44032: 0x94CB,
-	48537 - 44032: 0xBAD9,
-	48538 - 44032: 0xBADA,
-	48539 - 44032: 0x94CC,
-	48540 - 44032: 0xBADB,
-	48541 - 44032: 0x94CD,
-	48542 - 44032: 0x94CE,
-	48543 - 44032: 0x94CF,
-	48544 - 44032: 0x94D0,
-	48545 - 44032: 0x94D1,
-	48546 - 44032: 0x94D2,
-	48547 - 44032: 0x94D3,
-	48548 - 44032: 0xBADC,
-	48549 - 44032: 0x94D4,
-	48550 - 44032: 0x94D5,
-	48551 - 44032: 0x94D6,
-	48552 - 44032: 0x94D7,
-	48553 - 44032: 0x94D8,
-	48554 - 44032: 0x94D9,
-	48555 - 44032: 0x94DA,
-	48556 - 44032: 0x94DB,
-	48557 - 44032: 0x94DC,
-	48558 - 44032: 0x94DD,
-	48559 - 44032: 0x94DE,
-	48560 - 44032: 0xBADD,
-	48561 - 44032: 0x94DF,
-	48562 - 44032: 0x94E0,
-	48563 - 44032: 0x94E1,
-	48564 - 44032: 0x94E2,
-	48565 - 44032: 0x94E3,
-	48566 - 44032: 0x94E4,
-	48567 - 44032: 0x94E5,
-	48568 - 44032: 0xBADE,
-	48569 - 44032: 0x94E6,
-	48570 - 44032: 0x94E7,
-	48571 - 44032: 0x94E8,
-	48572 - 44032: 0x94E9,
-	48573 - 44032: 0x94EA,
-	48574 - 44032: 0x94EB,
-	48575 - 44032: 0x94EC,
-	48576 - 44032: 0x94ED,
-	48577 - 44032: 0x94EE,
-	48578 - 44032: 0x94EF,
-	48579 - 44032: 0x94F0,
-	48580 - 44032: 0x94F1,
-	48581 - 44032: 0x94F2,
-	48582 - 44032: 0x94F3,
-	48583 - 44032: 0x94F4,
-	48584 - 44032: 0x94F5,
-	48585 - 44032: 0x94F6,
-	48586 - 44032: 0x94F7,
-	48587 - 44032: 0x94F8,
-	48588 - 44032: 0x94F9,
-	48589 - 44032: 0x94FA,
-	48590 - 44032: 0x94FB,
-	48591 - 44032: 0x94FC,
-	48592 - 44032: 0x94FD,
-	48593 - 44032: 0x94FE,
-	48594 - 44032: 0x9541,
-	48595 - 44032: 0x9542,
-	48596 - 44032: 0xBADF,
-	48597 - 44032: 0xBAE0,
-	48598 - 44032: 0x9543,
-	48599 - 44032: 0x9544,
-	48600 - 44032: 0xBAE1,
-	48601 - 44032: 0x9545,
-	48602 - 44032: 0x9546,
-	48603 - 44032: 0x9547,
-	48604 - 44032: 0xBAE2,
-	48605 - 44032: 0x9548,
-	48606 - 44032: 0x9549,
-	48607 - 44032: 0x954A,
-	48608 - 44032: 0x954B,
-	48609 - 44032: 0x954C,
-	48610 - 44032: 0x954D,
-	48611 - 44032: 0x954E,
-	48612 - 44032: 0x954F,
-	48613 - 44032: 0x9550,
-	48614 - 44032: 0x9551,
-	48615 - 44032: 0x9552,
-	48616 - 44032: 0x9553,
-	48617 - 44032: 0xBAE3,
-	48618 - 44032: 0x9554,
-	48619 - 44032: 0x9555,
-	48620 - 44032: 0x9556,
-	48621 - 44032: 0x9557,
-	48622 - 44032: 0x9558,
-	48623 - 44032: 0x9559,
-	48624 - 44032: 0xBAE4,
-	48625 - 44032: 0x955A,
-	48626 - 44032: 0x9561,
-	48627 - 44032: 0x9562,
-	48628 - 44032: 0xBAE5,
-	48629 - 44032: 0x9563,
-	48630 - 44032: 0x9564,
-	48631 - 44032: 0x9565,
-	48632 - 44032: 0xBAE6,
-	48633 - 44032: 0x9566,
-	48634 - 44032: 0x9567,
-	48635 - 44032: 0x9568,
-	48636 - 44032: 0x9569,
-	48637 - 44032: 0x956A,
-	48638 - 44032: 0x956B,
-	48639 - 44032: 0x956C,
-	48640 - 44032: 0xBAE7,
-	48641 - 44032: 0x956D,
-	48642 - 44032: 0x956E,
-	48643 - 44032: 0xBAE8,
-	48644 - 44032: 0x956F,
-	48645 - 44032: 0xBAE9,
-	48646 - 44032: 0x9570,
-	48647 - 44032: 0x9571,
-	48648 - 44032: 0x9572,
-	48649 - 44032: 0x9573,
-	48650 - 44032: 0x9574,
-	48651 - 44032: 0x9575,
-	48652 - 44032: 0xBAEA,
-	48653 - 44032: 0xBAEB,
-	48654 - 44032: 0x9576,
-	48655 - 44032: 0x9577,
-	48656 - 44032: 0xBAEC,
-	48657 - 44032: 0x9578,
-	48658 - 44032: 0x9579,
-	48659 - 44032: 0x957A,
-	48660 - 44032: 0xBAED,
-	48661 - 44032: 0x9581,
-	48662 - 44032: 0x9582,
-	48663 - 44032: 0x9583,
-	48664 - 44032: 0x9584,
-	48665 - 44032: 0x9585,
-	48666 - 44032: 0x9586,
-	48667 - 44032: 0x9587,
-	48668 - 44032: 0xBAEE,
-	48669 - 44032: 0xBAEF,
-	48670 - 44032: 0x9588,
-	48671 - 44032: 0xBAF0,
-	48672 - 44032: 0x9589,
-	48673 - 44032: 0x958A,
-	48674 - 44032: 0x958B,
-	48675 - 44032: 0x958C,
-	48676 - 44032: 0x958D,
-	48677 - 44032: 0x958E,
-	48678 - 44032: 0x958F,
-	48679 - 44032: 0x9590,
-	48680 - 44032: 0x9591,
-	48681 - 44032: 0x9592,
-	48682 - 44032: 0x9593,
-	48683 - 44032: 0x9594,
-	48684 - 44032: 0x9595,
-	48685 - 44032: 0x9596,
-	48686 - 44032: 0x9597,
-	48687 - 44032: 0x9598,
-	48688 - 44032: 0x9599,
-	48689 - 44032: 0x959A,
-	48690 - 44032: 0x959B,
-	48691 - 44032: 0x959C,
-	48692 - 44032: 0x959D,
-	48693 - 44032: 0x959E,
-	48694 - 44032: 0x959F,
-	48695 - 44032: 0x95A0,
-	48696 - 44032: 0x95A1,
-	48697 - 44032: 0x95A2,
-	48698 - 44032: 0x95A3,
-	48699 - 44032: 0x95A4,
-	48700 - 44032: 0x95A5,
-	48701 - 44032: 0x95A6,
-	48702 - 44032: 0x95A7,
-	48703 - 44032: 0x95A8,
-	48704 - 44032: 0x95A9,
-	48705 - 44032: 0x95AA,
-	48706 - 44032: 0x95AB,
-	48707 - 44032: 0x95AC,
-	48708 - 44032: 0xBAF1,
-	48709 - 44032: 0xBAF2,
-	48710 - 44032: 0x95AD,
-	48711 - 44032: 0x95AE,
-	48712 - 44032: 0xBAF3,
-	48713 - 44032: 0x95AF,
-	48714 - 44032: 0x95B0,
-	48715 - 44032: 0x95B1,
-	48716 - 44032: 0xBAF4,
-	48717 - 44032: 0x95B2,
-	48718 - 44032: 0xBAF5,
-	48719 - 44032: 0x95B3,
-	48720 - 44032: 0x95B4,
-	48721 - 44032: 0x95B5,
-	48722 - 44032: 0x95B6,
-	48723 - 44032: 0x95B7,
-	48724 - 44032: 0xBAF6,
-	48725 - 44032: 0xBAF7,
-	48726 - 44032: 0x95B8,
-	48727 - 44032: 0xBAF8,
-	48728 - 44032: 0x95B9,
-	48729 - 44032: 0xBAF9,
-	48730 - 44032: 0xBAFA,
-	48731 - 44032: 0xBAFB,
-	48732 - 44032: 0x95BA,
-	48733 - 44032: 0x95BB,
-	48734 - 44032: 0x95BC,
-	48735 - 44032: 0x95BD,
-	48736 - 44032: 0xBAFC,
-	48737 - 44032: 0xBAFD,
-	48738 - 44032: 0x95BE,
-	48739 - 44032: 0x95BF,
-	48740 - 44032: 0xBAFE,
-	48741 - 44032: 0x95C0,
-	48742 - 44032: 0x95C1,
-	48743 - 44032: 0x95C2,
-	48744 - 44032: 0xBBA1,
-	48745 - 44032: 0x95C3,
-	48746 - 44032: 0xBBA2,
-	48747 - 44032: 0x95C4,
-	48748 - 44032: 0x95C5,
-	48749 - 44032: 0x95C6,
-	48750 - 44032: 0x95C7,
-	48751 - 44032: 0x95C8,
-	48752 - 44032: 0xBBA3,
-	48753 - 44032: 0xBBA4,
-	48754 - 44032: 0x95C9,
-	48755 - 44032: 0xBBA5,
-	48756 - 44032: 0xBBA6,
-	48757 - 44032: 0xBBA7,
-	48758 - 44032: 0x95CA,
-	48759 - 44032: 0x95CB,
-	48760 - 44032: 0x95CC,
-	48761 - 44032: 0x95CD,
-	48762 - 44032: 0x95CE,
-	48763 - 44032: 0xBBA8,
-	48764 - 44032: 0xBBA9,
-	48765 - 44032: 0xBBAA,
-	48766 - 44032: 0x95CF,
-	48767 - 44032: 0x95D0,
-	48768 - 44032: 0xBBAB,
-	48769 - 44032: 0x95D1,
-	48770 - 44032: 0x95D2,
-	48771 - 44032: 0x95D3,
-	48772 - 44032: 0xBBAC,
-	48773 - 44032: 0x95D4,
-	48774 - 44032: 0x95D5,
-	48775 - 44032: 0x95D6,
-	48776 - 44032: 0x95D7,
-	48777 - 44032: 0x95D8,
-	48778 - 44032: 0x95D9,
-	48779 - 44032: 0x95DA,
-	48780 - 44032: 0xBBAD,
-	48781 - 44032: 0xBBAE,
-	48782 - 44032: 0x95DB,
-	48783 - 44032: 0xBBAF,
-	48784 - 44032: 0xBBB0,
-	48785 - 44032: 0xBBB1,
-	48786 - 44032: 0x95DC,
-	48787 - 44032: 0x95DD,
-	48788 - 44032: 0x95DE,
-	48789 - 44032: 0x95DF,
-	48790 - 44032: 0x95E0,
-	48791 - 44032: 0x95E1,
-	48792 - 44032: 0xBBB2,
-	48793 - 44032: 0xBBB3,
-	48794 - 44032: 0x95E2,
-	48795 - 44032: 0x95E3,
-	48796 - 44032: 0x95E4,
-	48797 - 44032: 0x95E5,
-	48798 - 44032: 0x95E6,
-	48799 - 44032: 0x95E7,
-	48800 - 44032: 0x95E8,
-	48801 - 44032: 0x95E9,
-	48802 - 44032: 0x95EA,
-	48803 - 44032: 0x95EB,
-	48804 - 44032: 0x95EC,
-	48805 - 44032: 0x95ED,
-	48806 - 44032: 0x95EE,
-	48807 - 44032: 0x95EF,
-	48808 - 44032: 0xBBB4,
-	48809 - 44032: 0x95F0,
-	48810 - 44032: 0x95F1,
-	48811 - 44032: 0x95F2,
-	48812 - 44032: 0x95F3,
-	48813 - 44032: 0x95F4,
-	48814 - 44032: 0x95F5,
-	48815 - 44032: 0x95F6,
-	48816 - 44032: 0x95F7,
-	48817 - 44032: 0x95F8,
-	48818 - 44032: 0x95F9,
-	48819 - 44032: 0x95FA,
-	48820 - 44032: 0x95FB,
-	48821 - 44032: 0x95FC,
-	48822 - 44032: 0x95FD,
-	48823 - 44032: 0x95FE,
-	48824 - 44032: 0x9641,
-	48825 - 44032: 0x9642,
-	48826 - 44032: 0x9643,
-	48827 - 44032: 0x9644,
-	48828 - 44032: 0x9645,
-	48829 - 44032: 0x9646,
-	48830 - 44032: 0x9647,
-	48831 - 44032: 0x9648,
-	48832 - 44032: 0x9649,
-	48833 - 44032: 0x964A,
-	48834 - 44032: 0x964B,
-	48835 - 44032: 0x964C,
-	48836 - 44032: 0x964D,
-	48837 - 44032: 0x964E,
-	48838 - 44032: 0x964F,
-	48839 - 44032: 0x9650,
-	48840 - 44032: 0x9651,
-	48841 - 44032: 0x9652,
-	48842 - 44032: 0x9653,
-	48843 - 44032: 0x9654,
-	48844 - 44032: 0x9655,
-	48845 - 44032: 0x9656,
-	48846 - 44032: 0x9657,
-	48847 - 44032: 0x9658,
-	48848 - 44032: 0xBBB5,
-	48849 - 44032: 0xBBB6,
-	48850 - 44032: 0x9659,
-	48851 - 44032: 0x965A,
-	48852 - 44032: 0xBBB7,
-	48853 - 44032: 0x9661,
-	48854 - 44032: 0x9662,
-	48855 - 44032: 0xBBB8,
-	48856 - 44032: 0xBBB9,
-	48857 - 44032: 0x9663,
-	48858 - 44032: 0x9664,
-	48859 - 44032: 0x9665,
-	48860 - 44032: 0x9666,
-	48861 - 44032: 0x9667,
-	48862 - 44032: 0x9668,
-	48863 - 44032: 0x9669,
-	48864 - 44032: 0xBBBA,
-	48865 - 44032: 0x966A,
-	48866 - 44032: 0x966B,
-	48867 - 44032: 0xBBBB,
-	48868 - 44032: 0xBBBC,
-	48869 - 44032: 0xBBBD,
-	48870 - 44032: 0x966C,
-	48871 - 44032: 0x966D,
-	48872 - 44032: 0x966E,
-	48873 - 44032: 0x966F,
-	48874 - 44032: 0x9670,
-	48875 - 44032: 0x9671,
-	48876 - 44032: 0xBBBE,
-	48877 - 44032: 0x9672,
-	48878 - 44032: 0x9673,
-	48879 - 44032: 0x9674,
-	48880 - 44032: 0x9675,
-	48881 - 44032: 0x9676,
-	48882 - 44032: 0x9677,
-	48883 - 44032: 0x9678,
-	48884 - 44032: 0x9679,
-	48885 - 44032: 0x967A,
-	48886 - 44032: 0x9681,
-	48887 - 44032: 0x9682,
-	48888 - 44032: 0x9683,
-	48889 - 44032: 0x9684,
-	48890 - 44032: 0x9685,
-	48891 - 44032: 0x9686,
-	48892 - 44032: 0x9687,
-	48893 - 44032: 0x9688,
-	48894 - 44032: 0x9689,
-	48895 - 44032: 0x968A,
-	48896 - 44032: 0x968B,
-	48897 - 44032: 0xBBBF,
-	48898 - 44032: 0x968C,
-	48899 - 44032: 0x968D,
-	48900 - 44032: 0x968E,
-	48901 - 44032: 0x968F,
-	48902 - 44032: 0x9690,
-	48903 - 44032: 0x9691,
-	48904 - 44032: 0xBBC0,
-	48905 - 44032: 0xBBC1,
-	48906 - 44032: 0x9692,
-	48907 - 44032: 0x9693,
-	48908 - 44032: 0x9694,
-	48909 - 44032: 0x9695,
-	48910 - 44032: 0x9696,
-	48911 - 44032: 0x9697,
-	48912 - 44032: 0x9698,
-	48913 - 44032: 0x9699,
-	48914 - 44032: 0x969A,
-	48915 - 44032: 0x969B,
-	48916 - 44032: 0x969C,
-	48917 - 44032: 0x969D,
-	48918 - 44032: 0x969E,
-	48919 - 44032: 0x969F,
-	48920 - 44032: 0xBBC2,
-	48921 - 44032: 0xBBC3,
-	48922 - 44032: 0x96A0,
-	48923 - 44032: 0xBBC4,
-	48924 - 44032: 0xBBC5,
-	48925 - 44032: 0xBBC6,
-	48926 - 44032: 0x96A1,
-	48927 - 44032: 0x96A2,
-	48928 - 44032: 0x96A3,
-	48929 - 44032: 0x96A4,
-	48930 - 44032: 0x96A5,
-	48931 - 44032: 0x96A6,
-	48932 - 44032: 0x96A7,
-	48933 - 44032: 0x96A8,
-	48934 - 44032: 0x96A9,
-	48935 - 44032: 0x96AA,
-	48936 - 44032: 0x96AB,
-	48937 - 44032: 0x96AC,
-	48938 - 44032: 0x96AD,
-	48939 - 44032: 0x96AE,
-	48940 - 44032: 0x96AF,
-	48941 - 44032: 0x96B0,
-	48942 - 44032: 0x96B1,
-	48943 - 44032: 0x96B2,
-	48944 - 44032: 0x96B3,
-	48945 - 44032: 0x96B4,
-	48946 - 44032: 0x96B5,
-	48947 - 44032: 0x96B6,
-	48948 - 44032: 0x96B7,
-	48949 - 44032: 0x96B8,
-	48950 - 44032: 0x96B9,
-	48951 - 44032: 0x96BA,
-	48952 - 44032: 0x96BB,
-	48953 - 44032: 0x96BC,
-	48954 - 44032: 0x96BD,
-	48955 - 44032: 0x96BE,
-	48956 - 44032: 0x96BF,
-	48957 - 44032: 0x96C0,
-	48958 - 44032: 0x96C1,
-	48959 - 44032: 0x96C2,
-	48960 - 44032: 0xBBC7,
-	48961 - 44032: 0xBBC8,
-	48962 - 44032: 0x96C3,
-	48963 - 44032: 0x96C4,
-	48964 - 44032: 0xBBC9,
-	48965 - 44032: 0x96C5,
-	48966 - 44032: 0x96C6,
-	48967 - 44032: 0x96C7,
-	48968 - 44032: 0xBBCA,
-	48969 - 44032: 0x96C8,
-	48970 - 44032: 0x96C9,
-	48971 - 44032: 0x96CA,
-	48972 - 44032: 0x96CB,
-	48973 - 44032: 0x96CC,
-	48974 - 44032: 0x96CD,
-	48975 - 44032: 0x96CE,
-	48976 - 44032: 0xBBCB,
-	48977 - 44032: 0xBBCC,
-	48978 - 44032: 0x96CF,
-	48979 - 44032: 0x96D0,
-	48980 - 44032: 0x96D1,
-	48981 - 44032: 0xBBCD,
-	48982 - 44032: 0x96D2,
-	48983 - 44032: 0x96D3,
-	48984 - 44032: 0x96D4,
-	48985 - 44032: 0x96D5,
-	48986 - 44032: 0x96D6,
-	48987 - 44032: 0x96D7,
-	48988 - 44032: 0x96D8,
-	48989 - 44032: 0x96D9,
-	48990 - 44032: 0x96DA,
-	48991 - 44032: 0x96DB,
-	48992 - 44032: 0x96DC,
-	48993 - 44032: 0x96DD,
-	48994 - 44032: 0x96DE,
-	48995 - 44032: 0x96DF,
-	48996 - 44032: 0x96E0,
-	48997 - 44032: 0x96E1,
-	48998 - 44032: 0x96E2,
-	48999 - 44032: 0x96E3,
-	49000 - 44032: 0x96E4,
-	49001 - 44032: 0x96E5,
-	49002 - 44032: 0x96E6,
-	49003 - 44032: 0x96E7,
-	49004 - 44032: 0x96E8,
-	49005 - 44032: 0x96E9,
-	49006 - 44032: 0x96EA,
-	49007 - 44032: 0x96EB,
-	49008 - 44032: 0x96EC,
-	49009 - 44032: 0x96ED,
-	49010 - 44032: 0x96EE,
-	49011 - 44032: 0x96EF,
-	49012 - 44032: 0x96F0,
-	49013 - 44032: 0x96F1,
-	49014 - 44032: 0x96F2,
-	49015 - 44032: 0x96F3,
-	49016 - 44032: 0x96F4,
-	49017 - 44032: 0x96F5,
-	49018 - 44032: 0x96F6,
-	49019 - 44032: 0x96F7,
-	49020 - 44032: 0x96F8,
-	49021 - 44032: 0x96F9,
-	49022 - 44032: 0x96FA,
-	49023 - 44032: 0x96FB,
-	49024 - 44032: 0x96FC,
-	49025 - 44032: 0x96FD,
-	49026 - 44032: 0x96FE,
-	49027 - 44032: 0x9741,
-	49028 - 44032: 0x9742,
-	49029 - 44032: 0x9743,
-	49030 - 44032: 0x9744,
-	49031 - 44032: 0x9745,
-	49032 - 44032: 0x9746,
-	49033 - 44032: 0x9747,
-	49034 - 44032: 0x9748,
-	49035 - 44032: 0x9749,
-	49036 - 44032: 0x974A,
-	49037 - 44032: 0x974B,
-	49038 - 44032: 0x974C,
-	49039 - 44032: 0x974D,
-	49040 - 44032: 0x974E,
-	49041 - 44032: 0x974F,
-	49042 - 44032: 0x9750,
-	49043 - 44032: 0x9751,
-	49044 - 44032: 0xBBCE,
-	49045 - 44032: 0x9752,
-	49046 - 44032: 0x9753,
-	49047 - 44032: 0x9754,
-	49048 - 44032: 0x9755,
-	49049 - 44032: 0x9756,
-	49050 - 44032: 0x9757,
-	49051 - 44032: 0x9758,
-	49052 - 44032: 0x9759,
-	49053 - 44032: 0x975A,
-	49054 - 44032: 0x9761,
-	49055 - 44032: 0x9762,
-	49056 - 44032: 0x9763,
-	49057 - 44032: 0x9764,
-	49058 - 44032: 0x9765,
-	49059 - 44032: 0x9766,
-	49060 - 44032: 0x9767,
-	49061 - 44032: 0x9768,
-	49062 - 44032: 0x9769,
-	49063 - 44032: 0x976A,
-	49064 - 44032: 0x976B,
-	49065 - 44032: 0x976C,
-	49066 - 44032: 0x976D,
-	49067 - 44032: 0x976E,
-	49068 - 44032: 0x976F,
-	49069 - 44032: 0x9770,
-	49070 - 44032: 0x9771,
-	49071 - 44032: 0x9772,
-	49072 - 44032: 0xBBCF,
-	49073 - 44032: 0x9773,
-	49074 - 44032: 0x9774,
-	49075 - 44032: 0x9775,
-	49076 - 44032: 0x9776,
-	49077 - 44032: 0x9777,
-	49078 - 44032: 0x9778,
-	49079 - 44032: 0x9779,
-	49080 - 44032: 0x977A,
-	49081 - 44032: 0x9781,
-	49082 - 44032: 0x9782,
-	49083 - 44032: 0x9783,
-	49084 - 44032: 0x9784,
-	49085 - 44032: 0x9785,
-	49086 - 44032: 0x9786,
-	49087 - 44032: 0x9787,
-	49088 - 44032: 0x9788,
-	49089 - 44032: 0x9789,
-	49090 - 44032: 0x978A,
-	49091 - 44032: 0x978B,
-	49092 - 44032: 0x978C,
-	49093 - 44032: 0xBBD0,
-	49094 - 44032: 0x978D,
-	49095 - 44032: 0x978E,
-	49096 - 44032: 0x978F,
-	49097 - 44032: 0x9790,
-	49098 - 44032: 0x9791,
-	49099 - 44032: 0x9792,
-	49100 - 44032: 0xBBD1,
-	49101 - 44032: 0xBBD2,
-	49102 - 44032: 0x9793,
-	49103 - 44032: 0x9794,
-	49104 - 44032: 0xBBD3,
-	49105 - 44032: 0x9795,
-	49106 - 44032: 0x9796,
-	49107 - 44032: 0x9797,
-	49108 - 44032: 0xBBD4,
-	49109 - 44032: 0x9798,
-	49110 - 44032: 0x9799,
-	49111 - 44032: 0x979A,
-	49112 - 44032: 0x979B,
-	49113 - 44032: 0x979C,
-	49114 - 44032: 0x979D,
-	49115 - 44032: 0x979E,
-	49116 - 44032: 0xBBD5,
-	49117 - 44032: 0x979F,
-	49118 - 44032: 0x97A0,
-	49119 - 44032: 0xBBD6,
-	49120 - 44032: 0x97A1,
-	49121 - 44032: 0xBBD7,
-	49122 - 44032: 0x97A2,
-	49123 - 44032: 0x97A3,
-	49124 - 44032: 0x97A4,
-	49125 - 44032: 0x97A5,
-	49126 - 44032: 0x97A6,
-	49127 - 44032: 0x97A7,
-	49128 - 44032: 0x97A8,
-	49129 - 44032: 0x97A9,
-	49130 - 44032: 0x97AA,
-	49131 - 44032: 0x97AB,
-	49132 - 44032: 0x97AC,
-	49133 - 44032: 0x97AD,
-	49134 - 44032: 0x97AE,
-	49135 - 44032: 0x97AF,
-	49136 - 44032: 0x97B0,
-	49137 - 44032: 0x97B1,
-	49138 - 44032: 0x97B2,
-	49139 - 44032: 0x97B3,
-	49140 - 44032: 0x97B4,
-	49141 - 44032: 0x97B5,
-	49142 - 44032: 0x97B6,
-	49143 - 44032: 0x97B7,
-	49144 - 44032: 0x97B8,
-	49145 - 44032: 0x97B9,
-	49146 - 44032: 0x97BA,
-	49147 - 44032: 0x97BB,
-	49148 - 44032: 0x97BC,
-	49149 - 44032: 0x97BD,
-	49150 - 44032: 0x97BE,
-	49151 - 44032: 0x97BF,
-	49152 - 44032: 0x97C0,
-	49153 - 44032: 0x97C1,
-	49154 - 44032: 0x97C2,
-	49155 - 44032: 0x97C3,
-	49156 - 44032: 0x97C4,
-	49157 - 44032: 0x97C5,
-	49158 - 44032: 0x97C6,
-	49159 - 44032: 0x97C7,
-	49160 - 44032: 0x97C8,
-	49161 - 44032: 0x97C9,
-	49162 - 44032: 0x97CA,
-	49163 - 44032: 0x97CB,
-	49164 - 44032: 0x97CC,
-	49165 - 44032: 0x97CD,
-	49166 - 44032: 0x97CE,
-	49167 - 44032: 0x97CF,
-	49168 - 44032: 0x97D0,
-	49169 - 44032: 0x97D1,
-	49170 - 44032: 0x97D2,
-	49171 - 44032: 0x97D3,
-	49172 - 44032: 0x97D4,
-	49173 - 44032: 0x97D5,
-	49174 - 44032: 0x97D6,
-	49175 - 44032: 0x97D7,
-	49176 - 44032: 0x97D8,
-	49177 - 44032: 0x97D9,
-	49178 - 44032: 0x97DA,
-	49179 - 44032: 0x97DB,
-	49180 - 44032: 0x97DC,
-	49181 - 44032: 0x97DD,
-	49182 - 44032: 0x97DE,
-	49183 - 44032: 0x97DF,
-	49184 - 44032: 0x97E0,
-	49185 - 44032: 0x97E1,
-	49186 - 44032: 0x97E2,
-	49187 - 44032: 0x97E3,
-	49188 - 44032: 0x97E4,
-	49189 - 44032: 0x97E5,
-	49190 - 44032: 0x97E6,
-	49191 - 44032: 0x97E7,
-	49192 - 44032: 0x97E8,
-	49193 - 44032: 0x97E9,
-	49194 - 44032: 0x97EA,
-	49195 - 44032: 0x97EB,
-	49196 - 44032: 0x97EC,
-	49197 - 44032: 0x97ED,
-	49198 - 44032: 0x97EE,
-	49199 - 44032: 0x97EF,
-	49200 - 44032: 0x97F0,
-	49201 - 44032: 0x97F1,
-	49202 - 44032: 0x97F2,
-	49203 - 44032: 0x97F3,
-	49204 - 44032: 0x97F4,
-	49205 - 44032: 0x97F5,
-	49206 - 44032: 0x97F6,
-	49207 - 44032: 0x97F7,
-	49208 - 44032: 0x97F8,
-	49209 - 44032: 0x97F9,
-	49210 - 44032: 0x97FA,
-	49211 - 44032: 0x97FB,
-	49212 - 44032: 0xBBD8,
-	49213 - 44032: 0x97FC,
-	49214 - 44032: 0x97FD,
-	49215 - 44032: 0x97FE,
-	49216 - 44032: 0x9841,
-	49217 - 44032: 0x9842,
-	49218 - 44032: 0x9843,
-	49219 - 44032: 0x9844,
-	49220 - 44032: 0x9845,
-	49221 - 44032: 0x9846,
-	49222 - 44032: 0x9847,
-	49223 - 44032: 0x9848,
-	49224 - 44032: 0x9849,
-	49225 - 44032: 0x984A,
-	49226 - 44032: 0x984B,
-	49227 - 44032: 0x984C,
-	49228 - 44032: 0x984D,
-	49229 - 44032: 0x984E,
-	49230 - 44032: 0x984F,
-	49231 - 44032: 0x9850,
-	49232 - 44032: 0x9851,
-	49233 - 44032: 0xBBD9,
-	49234 - 44032: 0x9852,
-	49235 - 44032: 0x9853,
-	49236 - 44032: 0x9854,
-	49237 - 44032: 0x9855,
-	49238 - 44032: 0x9856,
-	49239 - 44032: 0x9857,
-	49240 - 44032: 0xBBDA,
-	49241 - 44032: 0x9858,
-	49242 - 44032: 0x9859,
-	49243 - 44032: 0x985A,
-	49244 - 44032: 0xBBDB,
-	49245 - 44032: 0x9861,
-	49246 - 44032: 0x9862,
-	49247 - 44032: 0x9863,
-	49248 - 44032: 0xBBDC,
-	49249 - 44032: 0x9864,
-	49250 - 44032: 0x9865,
-	49251 - 44032: 0x9866,
-	49252 - 44032: 0x9867,
-	49253 - 44032: 0x9868,
-	49254 - 44032: 0x9869,
-	49255 - 44032: 0x986A,
-	49256 - 44032: 0xBBDD,
-	49257 - 44032: 0xBBDE,
-	49258 - 44032: 0x986B,
-	49259 - 44032: 0x986C,
-	49260 - 44032: 0x986D,
-	49261 - 44032: 0x986E,
-	49262 - 44032: 0x986F,
-	49263 - 44032: 0x9870,
-	49264 - 44032: 0x9871,
-	49265 - 44032: 0x9872,
-	49266 - 44032: 0x9873,
-	49267 - 44032: 0x9874,
-	49268 - 44032: 0x9875,
-	49269 - 44032: 0x9876,
-	49270 - 44032: 0x9877,
-	49271 - 44032: 0x9878,
-	49272 - 44032: 0x9879,
-	49273 - 44032: 0x987A,
-	49274 - 44032: 0x9881,
-	49275 - 44032: 0x9882,
-	49276 - 44032: 0x9883,
-	49277 - 44032: 0x9884,
-	49278 - 44032: 0x9885,
-	49279 - 44032: 0x9886,
-	49280 - 44032: 0x9887,
-	49281 - 44032: 0x9888,
-	49282 - 44032: 0x9889,
-	49283 - 44032: 0x988A,
-	49284 - 44032: 0x988B,
-	49285 - 44032: 0x988C,
-	49286 - 44032: 0x988D,
-	49287 - 44032: 0x988E,
-	49288 - 44032: 0x988F,
-	49289 - 44032: 0x9890,
-	49290 - 44032: 0x9891,
-	49291 - 44032: 0x9892,
-	49292 - 44032: 0x9893,
-	49293 - 44032: 0x9894,
-	49294 - 44032: 0x9895,
-	49295 - 44032: 0x9896,
-	49296 - 44032: 0xBBDF,
-	49297 - 44032: 0xBBE0,
-	49298 - 44032: 0x9897,
-	49299 - 44032: 0x9898,
-	49300 - 44032: 0xBBE1,
-	49301 - 44032: 0x9899,
-	49302 - 44032: 0x989A,
-	49303 - 44032: 0x989B,
-	49304 - 44032: 0xBBE2,
-	49305 - 44032: 0x989C,
-	49306 - 44032: 0x989D,
-	49307 - 44032: 0x989E,
-	49308 - 44032: 0x989F,
-	49309 - 44032: 0x98A0,
-	49310 - 44032: 0x98A1,
-	49311 - 44032: 0x98A2,
-	49312 - 44032: 0xBBE3,
-	49313 - 44032: 0xBBE4,
-	49314 - 44032: 0x98A3,
-	49315 - 44032: 0xBBE5,
-	49316 - 44032: 0x98A4,
-	49317 - 44032: 0xBBE6,
-	49318 - 44032: 0x98A5,
-	49319 - 44032: 0x98A6,
-	49320 - 44032: 0x98A7,
-	49321 - 44032: 0x98A8,
-	49322 - 44032: 0x98A9,
-	49323 - 44032: 0x98AA,
-	49324 - 44032: 0xBBE7,
-	49325 - 44032: 0xBBE8,
-	49326 - 44032: 0x98AB,
-	49327 - 44032: 0xBBE9,
-	49328 - 44032: 0xBBEA,
-	49329 - 44032: 0x98AC,
-	49330 - 44032: 0x98AD,
-	49331 - 44032: 0xBBEB,
-	49332 - 44032: 0xBBEC,
-	49333 - 44032: 0xBBED,
-	49334 - 44032: 0xBBEE,
-	49335 - 44032: 0x98AE,
-	49336 - 44032: 0x98AF,
-	49337 - 44032: 0x98B0,
-	49338 - 44032: 0x98B1,
-	49339 - 44032: 0x98B2,
-	49340 - 44032: 0xBBEF,
-	49341 - 44032: 0xBBF0,
-	49342 - 44032: 0x98B3,
-	49343 - 44032: 0xBBF1,
-	49344 - 44032: 0xBBF2,
-	49345 - 44032: 0xBBF3,
-	49346 - 44032: 0x98B4,
-	49347 - 44032: 0x98B5,
-	49348 - 44032: 0x98B6,
-	49349 - 44032: 0xBBF4,
-	49350 - 44032: 0x98B7,
-	49351 - 44032: 0x98B8,
-	49352 - 44032: 0xBBF5,
-	49353 - 44032: 0xBBF6,
-	49354 - 44032: 0x98B9,
-	49355 - 44032: 0x98BA,
-	49356 - 44032: 0xBBF7,
-	49357 - 44032: 0x98BB,
-	49358 - 44032: 0x98BC,
-	49359 - 44032: 0x98BD,
-	49360 - 44032: 0xBBF8,
-	49361 - 44032: 0x98BE,
-	49362 - 44032: 0x98BF,
-	49363 - 44032: 0x98C0,
-	49364 - 44032: 0x98C1,
-	49365 - 44032: 0x98C2,
-	49366 - 44032: 0x98C3,
-	49367 - 44032: 0x98C4,
-	49368 - 44032: 0xBBF9,
-	49369 - 44032: 0xBBFA,
-	49370 - 44032: 0x98C5,
-	49371 - 44032: 0xBBFB,
-	49372 - 44032: 0xBBFC,
-	49373 - 44032: 0xBBFD,
-	49374 - 44032: 0x98C6,
-	49375 - 44032: 0x98C7,
-	49376 - 44032: 0x98C8,
-	49377 - 44032: 0x98C9,
-	49378 - 44032: 0x98CA,
-	49379 - 44032: 0x98CB,
-	49380 - 44032: 0xBBFE,
-	49381 - 44032: 0xBCA1,
-	49382 - 44032: 0x98CC,
-	49383 - 44032: 0x98CD,
-	49384 - 44032: 0xBCA2,
-	49385 - 44032: 0x98CE,
-	49386 - 44032: 0x98CF,
-	49387 - 44032: 0x98D0,
-	49388 - 44032: 0xBCA3,
-	49389 - 44032: 0x98D1,
-	49390 - 44032: 0x98D2,
-	49391 - 44032: 0x98D3,
-	49392 - 44032: 0x98D4,
-	49393 - 44032: 0x98D5,
-	49394 - 44032: 0x98D6,
-	49395 - 44032: 0x98D7,
-	49396 - 44032: 0xBCA4,
-	49397 - 44032: 0xBCA5,
-	49398 - 44032: 0x98D8,
-	49399 - 44032: 0xBCA6,
-	49400 - 44032: 0x98D9,
-	49401 - 44032: 0xBCA7,
-	49402 - 44032: 0x98DA,
-	49403 - 44032: 0x98DB,
-	49404 - 44032: 0x98DC,
-	49405 - 44032: 0x98DD,
-	49406 - 44032: 0x98DE,
-	49407 - 44032: 0x98DF,
-	49408 - 44032: 0xBCA8,
-	49409 - 44032: 0x98E0,
-	49410 - 44032: 0x98E1,
-	49411 - 44032: 0x98E2,
-	49412 - 44032: 0xBCA9,
-	49413 - 44032: 0x98E3,
-	49414 - 44032: 0x98E4,
-	49415 - 44032: 0x98E5,
-	49416 - 44032: 0xBCAA,
-	49417 - 44032: 0x98E6,
-	49418 - 44032: 0x98E7,
-	49419 - 44032: 0x98E8,
-	49420 - 44032: 0x98E9,
-	49421 - 44032: 0x98EA,
-	49422 - 44032: 0x98EB,
-	49423 - 44032: 0x98EC,
-	49424 - 44032: 0xBCAB,
-	49425 - 44032: 0x98ED,
-	49426 - 44032: 0x98EE,
-	49427 - 44032: 0x98EF,
-	49428 - 44032: 0x98F0,
-	49429 - 44032: 0xBCAC,
-	49430 - 44032: 0x98F1,
-	49431 - 44032: 0x98F2,
-	49432 - 44032: 0x98F3,
-	49433 - 44032: 0x98F4,
-	49434 - 44032: 0x98F5,
-	49435 - 44032: 0x98F6,
-	49436 - 44032: 0xBCAD,
-	49437 - 44032: 0xBCAE,
-	49438 - 44032: 0xBCAF,
-	49439 - 44032: 0xBCB0,
-	49440 - 44032: 0xBCB1,
-	49441 - 44032: 0x98F7,
-	49442 - 44032: 0x98F8,
-	49443 - 44032: 0xBCB2,
-	49444 - 44032: 0xBCB3,
-	49445 - 44032: 0x98F9,
-	49446 - 44032: 0xBCB4,
-	49447 - 44032: 0xBCB5,
-	49448 - 44032: 0x98FA,
-	49449 - 44032: 0x98FB,
-	49450 - 44032: 0x98FC,
-	49451 - 44032: 0x98FD,
-	49452 - 44032: 0xBCB6,
-	49453 - 44032: 0xBCB7,
-	49454 - 44032: 0x98FE,
-	49455 - 44032: 0xBCB8,
-	49456 - 44032: 0xBCB9,
-	49457 - 44032: 0xBCBA,
-	49458 - 44032: 0x9941,
-	49459 - 44032: 0x9942,
-	49460 - 44032: 0x9943,
-	49461 - 44032: 0x9944,
-	49462 - 44032: 0xBCBB,
-	49463 - 44032: 0x9945,
-	49464 - 44032: 0xBCBC,
-	49465 - 44032: 0xBCBD,
-	49466 - 44032: 0x9946,
-	49467 - 44032: 0x9947,
-	49468 - 44032: 0xBCBE,
-	49469 - 44032: 0x9948,
-	49470 - 44032: 0x9949,
-	49471 - 44032: 0x994A,
-	49472 - 44032: 0xBCBF,
-	49473 - 44032: 0x994B,
-	49474 - 44032: 0x994C,
-	49475 - 44032: 0x994D,
-	49476 - 44032: 0x994E,
-	49477 - 44032: 0x994F,
-	49478 - 44032: 0x9950,
-	49479 - 44032: 0x9951,
-	49480 - 44032: 0xBCC0,
-	49481 - 44032: 0xBCC1,
-	49482 - 44032: 0x9952,
-	49483 - 44032: 0xBCC2,
-	49484 - 44032: 0xBCC3,
-	49485 - 44032: 0xBCC4,
-	49486 - 44032: 0x9953,
-	49487 - 44032: 0x9954,
-	49488 - 44032: 0x9955,
-	49489 - 44032: 0x9956,
-	49490 - 44032: 0x9957,
-	49491 - 44032: 0x9958,
-	49492 - 44032: 0xBCC5,
-	49493 - 44032: 0xBCC6,
-	49494 - 44032: 0x9959,
-	49495 - 44032: 0x995A,
-	49496 - 44032: 0xBCC7,
-	49497 - 44032: 0x9961,
-	49498 - 44032: 0x9962,
-	49499 - 44032: 0x9963,
-	49500 - 44032: 0xBCC8,
-	49501 - 44032: 0x9964,
-	49502 - 44032: 0x9965,
-	49503 - 44032: 0x9966,
-	49504 - 44032: 0x9967,
-	49505 - 44032: 0x9968,
-	49506 - 44032: 0x9969,
-	49507 - 44032: 0x996A,
-	49508 - 44032: 0xBCC9,
-	49509 - 44032: 0xBCCA,
-	49510 - 44032: 0x996B,
-	49511 - 44032: 0xBCCB,
-	49512 - 44032: 0xBCCC,
-	49513 - 44032: 0xBCCD,
-	49514 - 44032: 0x996C,
-	49515 - 44032: 0x996D,
-	49516 - 44032: 0x996E,
-	49517 - 44032: 0x996F,
-	49518 - 44032: 0x9970,
-	49519 - 44032: 0x9971,
-	49520 - 44032: 0xBCCE,
-	49521 - 44032: 0x9972,
-	49522 - 44032: 0x9973,
-	49523 - 44032: 0x9974,
-	49524 - 44032: 0xBCCF,
-	49525 - 44032: 0x9975,
-	49526 - 44032: 0x9976,
-	49527 - 44032: 0x9977,
-	49528 - 44032: 0xBCD0,
-	49529 - 44032: 0x9978,
-	49530 - 44032: 0x9979,
-	49531 - 44032: 0x997A,
-	49532 - 44032: 0x9981,
-	49533 - 44032: 0x9982,
-	49534 - 44032: 0x9983,
-	49535 - 44032: 0x9984,
-	49536 - 44032: 0x9985,
-	49537 - 44032: 0x9986,
-	49538 - 44032: 0x9987,
-	49539 - 44032: 0x9988,
-	49540 - 44032: 0x9989,
-	49541 - 44032: 0xBCD1,
-	49542 - 44032: 0x998A,
-	49543 - 44032: 0x998B,
-	49544 - 44032: 0x998C,
-	49545 - 44032: 0x998D,
-	49546 - 44032: 0x998E,
-	49547 - 44032: 0x998F,
-	49548 - 44032: 0xBCD2,
-	49549 - 44032: 0xBCD3,
-	49550 - 44032: 0xBCD4,
-	49551 - 44032: 0x9990,
-	49552 - 44032: 0xBCD5,
-	49553 - 44032: 0x9991,
-	49554 - 44032: 0x9992,
-	49555 - 44032: 0x9993,
-	49556 - 44032: 0xBCD6,
-	49557 - 44032: 0x9994,
-	49558 - 44032: 0xBCD7,
-	49559 - 44032: 0x9995,
-	49560 - 44032: 0x9996,
-	49561 - 44032: 0x9997,
-	49562 - 44032: 0x9998,
-	49563 - 44032: 0x9999,
-	49564 - 44032: 0xBCD8,
-	49565 - 44032: 0xBCD9,
-	49566 - 44032: 0x999A,
-	49567 - 44032: 0xBCDA,
-	49568 - 44032: 0x999B,
-	49569 - 44032: 0xBCDB,
-	49570 - 44032: 0x999C,
-	49571 - 44032: 0x999D,
-	49572 - 44032: 0x999E,
-	49573 - 44032: 0xBCDC,
-	49574 - 44032: 0x999F,
-	49575 - 44032: 0x99A0,
-	49576 - 44032: 0xBCDD,
-	49577 - 44032: 0xBCDE,
-	49578 - 44032: 0x99A1,
-	49579 - 44032: 0x99A2,
-	49580 - 44032: 0xBCDF,
-	49581 - 44032: 0x99A3,
-	49582 - 44032: 0x99A4,
-	49583 - 44032: 0x99A5,
-	49584 - 44032: 0xBCE0,
-	49585 - 44032: 0x99A6,
-	49586 - 44032: 0x99A7,
-	49587 - 44032: 0x99A8,
-	49588 - 44032: 0x99A9,
-	49589 - 44032: 0x99AA,
-	49590 - 44032: 0x99AB,
-	49591 - 44032: 0x99AC,
-	49592 - 44032: 0x99AD,
-	49593 - 44032: 0x99AE,
-	49594 - 44032: 0x99AF,
-	49595 - 44032: 0x99B0,
-	49596 - 44032: 0x99B1,
-	49597 - 44032: 0xBCE1,
-	49598 - 44032: 0x99B2,
-	49599 - 44032: 0x99B3,
-	49600 - 44032: 0x99B4,
-	49601 - 44032: 0x99B5,
-	49602 - 44032: 0x99B6,
-	49603 - 44032: 0x99B7,
-	49604 - 44032: 0xBCE2,
-	49605 - 44032: 0x99B8,
-	49606 - 44032: 0x99B9,
-	49607 - 44032: 0x99BA,
-	49608 - 44032: 0xBCE3,
-	49609 - 44032: 0x99BB,
-	49610 - 44032: 0x99BC,
-	49611 - 44032: 0x99BD,
-	49612 - 44032: 0xBCE4,
-	49613 - 44032: 0x99BE,
-	49614 - 44032: 0x99BF,
-	49615 - 44032: 0x99C0,
-	49616 - 44032: 0x99C1,
-	49617 - 44032: 0x99C2,
-	49618 - 44032: 0x99C3,
-	49619 - 44032: 0x99C4,
-	49620 - 44032: 0xBCE5,
-	49621 - 44032: 0x99C5,
-	49622 - 44032: 0x99C6,
-	49623 - 44032: 0xBCE6,
-	49624 - 44032: 0xBCE7,
-	49625 - 44032: 0x99C7,
-	49626 - 44032: 0x99C8,
-	49627 - 44032: 0x99C9,
-	49628 - 44032: 0x99CA,
-	49629 - 44032: 0x99CB,
-	49630 - 44032: 0x99CC,
-	49631 - 44032: 0x99CD,
-	49632 - 44032: 0xBCE8,
-	49633 - 44032: 0x99CE,
-	49634 - 44032: 0x99CF,
-	49635 - 44032: 0x99D0,
-	49636 - 44032: 0xBCE9,
-	49637 - 44032: 0x99D1,
-	49638 - 44032: 0x99D2,
-	49639 - 44032: 0x99D3,
-	49640 - 44032: 0xBCEA,
-	49641 - 44032: 0x99D4,
-	49642 - 44032: 0x99D5,
-	49643 - 44032: 0x99D6,
-	49644 - 44032: 0x99D7,
-	49645 - 44032: 0x99D8,
-	49646 - 44032: 0x99D9,
-	49647 - 44032: 0x99DA,
-	49648 - 44032: 0xBCEB,
-	49649 - 44032: 0xBCEC,
-	49650 - 44032: 0x99DB,
-	49651 - 44032: 0xBCED,
-	49652 - 44032: 0x99DC,
-	49653 - 44032: 0x99DD,
-	49654 - 44032: 0x99DE,
-	49655 - 44032: 0x99DF,
-	49656 - 44032: 0x99E0,
-	49657 - 44032: 0x99E1,
-	49658 - 44032: 0x99E2,
-	49659 - 44032: 0x99E3,
-	49660 - 44032: 0xBCEE,
-	49661 - 44032: 0xBCEF,
-	49662 - 44032: 0x99E4,
-	49663 - 44032: 0x99E5,
-	49664 - 44032: 0xBCF0,
-	49665 - 44032: 0x99E6,
-	49666 - 44032: 0x99E7,
-	49667 - 44032: 0x99E8,
-	49668 - 44032: 0xBCF1,
-	49669 - 44032: 0x99E9,
-	49670 - 44032: 0x99EA,
-	49671 - 44032: 0x99EB,
-	49672 - 44032: 0x99EC,
-	49673 - 44032: 0x99ED,
-	49674 - 44032: 0x99EE,
-	49675 - 44032: 0x99EF,
-	49676 - 44032: 0xBCF2,
-	49677 - 44032: 0xBCF3,
-	49678 - 44032: 0x99F0,
-	49679 - 44032: 0xBCF4,
-	49680 - 44032: 0x99F1,
-	49681 - 44032: 0xBCF5,
-	49682 - 44032: 0x99F2,
-	49683 - 44032: 0x99F3,
-	49684 - 44032: 0x99F4,
-	49685 - 44032: 0x99F5,
-	49686 - 44032: 0x99F6,
-	49687 - 44032: 0x99F7,
-	49688 - 44032: 0xBCF6,
-	49689 - 44032: 0xBCF7,
-	49690 - 44032: 0x99F8,
-	49691 - 44032: 0x99F9,
-	49692 - 44032: 0xBCF8,
-	49693 - 44032: 0x99FA,
-	49694 - 44032: 0x99FB,
-	49695 - 44032: 0xBCF9,
-	49696 - 44032: 0xBCFA,
-	49697 - 44032: 0x99FC,
-	49698 - 44032: 0x99FD,
-	49699 - 44032: 0x99FE,
-	49700 - 44032: 0x9A41,
-	49701 - 44032: 0x9A42,
-	49702 - 44032: 0x9A43,
-	49703 - 44032: 0x9A44,
-	49704 - 44032: 0xBCFB,
-	49705 - 44032: 0xBCFC,
-	49706 - 44032: 0x9A45,
-	49707 - 44032: 0xBCFD,
-	49708 - 44032: 0x9A46,
-	49709 - 44032: 0xBCFE,
-	49710 - 44032: 0x9A47,
-	49711 - 44032: 0xBDA1,
-	49712 - 44032: 0x9A48,
-	49713 - 44032: 0xBDA2,
-	49714 - 44032: 0xBDA3,
-	49715 - 44032: 0x9A49,
-	49716 - 44032: 0xBDA4,
-	49717 - 44032: 0x9A4A,
-	49718 - 44032: 0x9A4B,
-	49719 - 44032: 0x9A4C,
-	49720 - 44032: 0x9A4D,
-	49721 - 44032: 0x9A4E,
-	49722 - 44032: 0x9A4F,
-	49723 - 44032: 0x9A50,
-	49724 - 44032: 0x9A51,
-	49725 - 44032: 0x9A52,
-	49726 - 44032: 0x9A53,
-	49727 - 44032: 0x9A54,
-	49728 - 44032: 0x9A55,
-	49729 - 44032: 0x9A56,
-	49730 - 44032: 0x9A57,
-	49731 - 44032: 0x9A58,
-	49732 - 44032: 0x9A59,
-	49733 - 44032: 0x9A5A,
-	49734 - 44032: 0x9A61,
-	49735 - 44032: 0x9A62,
-	49736 - 44032: 0xBDA5,
-	49737 - 44032: 0x9A63,
-	49738 - 44032: 0x9A64,
-	49739 - 44032: 0x9A65,
-	49740 - 44032: 0x9A66,
-	49741 - 44032: 0x9A67,
-	49742 - 44032: 0x9A68,
-	49743 - 44032: 0x9A69,
-	49744 - 44032: 0xBDA6,
-	49745 - 44032: 0xBDA7,
-	49746 - 44032: 0x9A6A,
-	49747 - 44032: 0x9A6B,
-	49748 - 44032: 0xBDA8,
-	49749 - 44032: 0x9A6C,
-	49750 - 44032: 0x9A6D,
-	49751 - 44032: 0x9A6E,
-	49752 - 44032: 0xBDA9,
-	49753 - 44032: 0x9A6F,
-	49754 - 44032: 0x9A70,
-	49755 - 44032: 0x9A71,
-	49756 - 44032: 0x9A72,
-	49757 - 44032: 0x9A73,
-	49758 - 44032: 0x9A74,
-	49759 - 44032: 0x9A75,
-	49760 - 44032: 0xBDAA,
-	49761 - 44032: 0x9A76,
-	49762 - 44032: 0x9A77,
-	49763 - 44032: 0x9A78,
-	49764 - 44032: 0x9A79,
-	49765 - 44032: 0xBDAB,
-	49766 - 44032: 0x9A7A,
-	49767 - 44032: 0x9A81,
-	49768 - 44032: 0x9A82,
-	49769 - 44032: 0x9A83,
-	49770 - 44032: 0x9A84,
-	49771 - 44032: 0x9A85,
-	49772 - 44032: 0xBDAC,
-	49773 - 44032: 0xBDAD,
-	49774 - 44032: 0x9A86,
-	49775 - 44032: 0x9A87,
-	49776 - 44032: 0xBDAE,
-	49777 - 44032: 0x9A88,
-	49778 - 44032: 0x9A89,
-	49779 - 44032: 0x9A8A,
-	49780 - 44032: 0xBDAF,
-	49781 - 44032: 0x9A8B,
-	49782 - 44032: 0x9A8C,
-	49783 - 44032: 0x9A8D,
-	49784 - 44032: 0x9A8E,
-	49785 - 44032: 0x9A8F,
-	49786 - 44032: 0x9A90,
-	49787 - 44032: 0x9A91,
-	49788 - 44032: 0xBDB0,
-	49789 - 44032: 0xBDB1,
-	49790 - 44032: 0x9A92,
-	49791 - 44032: 0xBDB2,
-	49792 - 44032: 0x9A93,
-	49793 - 44032: 0xBDB3,
-	49794 - 44032: 0x9A94,
-	49795 - 44032: 0x9A95,
-	49796 - 44032: 0x9A96,
-	49797 - 44032: 0x9A97,
-	49798 - 44032: 0x9A98,
-	49799 - 44032: 0x9A99,
-	49800 - 44032: 0xBDB4,
-	49801 - 44032: 0xBDB5,
-	49802 - 44032: 0x9A9A,
-	49803 - 44032: 0x9A9B,
-	49804 - 44032: 0x9A9C,
-	49805 - 44032: 0x9A9D,
-	49806 - 44032: 0x9A9E,
-	49807 - 44032: 0x9A9F,
-	49808 - 44032: 0xBDB6,
-	49809 - 44032: 0x9AA0,
-	49810 - 44032: 0x9AA1,
-	49811 - 44032: 0x9AA2,
-	49812 - 44032: 0x9AA3,
-	49813 - 44032: 0x9AA4,
-	49814 - 44032: 0x9AA5,
-	49815 - 44032: 0x9AA6,
-	49816 - 44032: 0xBDB7,
-	49817 - 44032: 0x9AA7,
-	49818 - 44032: 0x9AA8,
-	49819 - 44032: 0xBDB8,
-	49820 - 44032: 0x9AA9,
-	49821 - 44032: 0xBDB9,
-	49822 - 44032: 0x9AAA,
-	49823 - 44032: 0x9AAB,
-	49824 - 44032: 0x9AAC,
-	49825 - 44032: 0x9AAD,
-	49826 - 44032: 0x9AAE,
-	49827 - 44032: 0x9AAF,
-	49828 - 44032: 0xBDBA,
-	49829 - 44032: 0xBDBB,
-	49830 - 44032: 0x9AB0,
-	49831 - 44032: 0x9AB1,
-	49832 - 44032: 0xBDBC,
-	49833 - 44032: 0x9AB2,
-	49834 - 44032: 0x9AB3,
-	49835 - 44032: 0x9AB4,
-	49836 - 44032: 0xBDBD,
-	49837 - 44032: 0xBDBE,
-	49838 - 44032: 0x9AB5,
-	49839 - 44032: 0x9AB6,
-	49840 - 44032: 0x9AB7,
-	49841 - 44032: 0x9AB8,
-	49842 - 44032: 0x9AB9,
-	49843 - 44032: 0x9ABA,
-	49844 - 44032: 0xBDBF,
-	49845 - 44032: 0xBDC0,
-	49846 - 44032: 0x9ABB,
-	49847 - 44032: 0xBDC1,
-	49848 - 44032: 0x9ABC,
-	49849 - 44032: 0xBDC2,
-	49850 - 44032: 0x9ABD,
-	49851 - 44032: 0x9ABE,
-	49852 - 44032: 0x9ABF,
-	49853 - 44032: 0x9AC0,
-	49854 - 44032: 0x9AC1,
-	49855 - 44032: 0x9AC2,
-	49856 - 44032: 0x9AC3,
-	49857 - 44032: 0x9AC4,
-	49858 - 44032: 0x9AC5,
-	49859 - 44032: 0x9AC6,
-	49860 - 44032: 0x9AC7,
-	49861 - 44032: 0x9AC8,
-	49862 - 44032: 0x9AC9,
-	49863 - 44032: 0x9ACA,
-	49864 - 44032: 0x9ACB,
-	49865 - 44032: 0x9ACC,
-	49866 - 44032: 0x9ACD,
-	49867 - 44032: 0x9ACE,
-	49868 - 44032: 0x9ACF,
-	49869 - 44032: 0x9AD0,
-	49870 - 44032: 0x9AD1,
-	49871 - 44032: 0x9AD2,
-	49872 - 44032: 0x9AD3,
-	49873 - 44032: 0x9AD4,
-	49874 - 44032: 0x9AD5,
-	49875 - 44032: 0x9AD6,
-	49876 - 44032: 0x9AD7,
-	49877 - 44032: 0x9AD8,
-	49878 - 44032: 0x9AD9,
-	49879 - 44032: 0x9ADA,
-	49880 - 44032: 0x9ADB,
-	49881 - 44032: 0x9ADC,
-	49882 - 44032: 0x9ADD,
-	49883 - 44032: 0x9ADE,
-	49884 - 44032: 0xBDC3,
-	49885 - 44032: 0xBDC4,
-	49886 - 44032: 0x9ADF,
-	49887 - 44032: 0x9AE0,
-	49888 - 44032: 0xBDC5,
-	49889 - 44032: 0x9AE1,
-	49890 - 44032: 0x9AE2,
-	49891 - 44032: 0xBDC6,
-	49892 - 44032: 0xBDC7,
-	49893 - 44032: 0x9AE3,
-	49894 - 44032: 0x9AE4,
-	49895 - 44032: 0x9AE5,
-	49896 - 44032: 0x9AE6,
-	49897 - 44032: 0x9AE7,
-	49898 - 44032: 0x9AE8,
-	49899 - 44032: 0xBDC8,
-	49900 - 44032: 0xBDC9,
-	49901 - 44032: 0xBDCA,
-	49902 - 44032: 0x9AE9,
-	49903 - 44032: 0xBDCB,
-	49904 - 44032: 0x9AEA,
-	49905 - 44032: 0xBDCC,
-	49906 - 44032: 0x9AEB,
-	49907 - 44032: 0x9AEC,
-	49908 - 44032: 0x9AED,
-	49909 - 44032: 0x9AEE,
-	49910 - 44032: 0xBDCD,
-	49911 - 44032: 0x9AEF,
-	49912 - 44032: 0xBDCE,
-	49913 - 44032: 0xBDCF,
-	49914 - 44032: 0x9AF0,
-	49915 - 44032: 0xBDD0,
-	49916 - 44032: 0xBDD1,
-	49917 - 44032: 0x9AF1,
-	49918 - 44032: 0x9AF2,
-	49919 - 44032: 0x9AF3,
-	49920 - 44032: 0xBDD2,
-	49921 - 44032: 0x9AF4,
-	49922 - 44032: 0x9AF5,
-	49923 - 44032: 0x9AF6,
-	49924 - 44032: 0x9AF7,
-	49925 - 44032: 0x9AF8,
-	49926 - 44032: 0x9AF9,
-	49927 - 44032: 0x9AFA,
-	49928 - 44032: 0xBDD3,
-	49929 - 44032: 0xBDD4,
-	49930 - 44032: 0x9AFB,
-	49931 - 44032: 0x9AFC,
-	49932 - 44032: 0xBDD5,
-	49933 - 44032: 0xBDD6,
-	49934 - 44032: 0x9AFD,
-	49935 - 44032: 0x9AFE,
-	49936 - 44032: 0x9B41,
-	49937 - 44032: 0x9B42,
-	49938 - 44032: 0x9B43,
-	49939 - 44032: 0xBDD7,
-	49940 - 44032: 0xBDD8,
-	49941 - 44032: 0xBDD9,
-	49942 - 44032: 0x9B44,
-	49943 - 44032: 0x9B45,
-	49944 - 44032: 0xBDDA,
-	49945 - 44032: 0x9B46,
-	49946 - 44032: 0x9B47,
-	49947 - 44032: 0x9B48,
-	49948 - 44032: 0xBDDB,
-	49949 - 44032: 0x9B49,
-	49950 - 44032: 0x9B4A,
-	49951 - 44032: 0x9B4B,
-	49952 - 44032: 0x9B4C,
-	49953 - 44032: 0x9B4D,
-	49954 - 44032: 0x9B4E,
-	49955 - 44032: 0x9B4F,
-	49956 - 44032: 0xBDDC,
-	49957 - 44032: 0xBDDD,
-	49958 - 44032: 0x9B50,
-	49959 - 44032: 0x9B51,
-	49960 - 44032: 0xBDDE,
-	49961 - 44032: 0xBDDF,
-	49962 - 44032: 0x9B52,
-	49963 - 44032: 0x9B53,
-	49964 - 44032: 0x9B54,
-	49965 - 44032: 0x9B55,
-	49966 - 44032: 0x9B56,
-	49967 - 44032: 0x9B57,
-	49968 - 44032: 0x9B58,
-	49969 - 44032: 0x9B59,
-	49970 - 44032: 0x9B5A,
-	49971 - 44032: 0x9B61,
-	49972 - 44032: 0x9B62,
-	49973 - 44032: 0x9B63,
-	49974 - 44032: 0x9B64,
-	49975 - 44032: 0x9B65,
-	49976 - 44032: 0x9B66,
-	49977 - 44032: 0x9B67,
-	49978 - 44032: 0x9B68,
-	49979 - 44032: 0x9B69,
-	49980 - 44032: 0x9B6A,
-	49981 - 44032: 0x9B6B,
-	49982 - 44032: 0x9B6C,
-	49983 - 44032: 0x9B6D,
-	49984 - 44032: 0x9B6E,
-	49985 - 44032: 0x9B6F,
-	49986 - 44032: 0x9B70,
-	49987 - 44032: 0x9B71,
-	49988 - 44032: 0x9B72,
-	49989 - 44032: 0xBDE0,
-	49990 - 44032: 0x9B73,
-	49991 - 44032: 0x9B74,
-	49992 - 44032: 0x9B75,
-	49993 - 44032: 0x9B76,
-	49994 - 44032: 0x9B77,
-	49995 - 44032: 0x9B78,
-	49996 - 44032: 0x9B79,
-	49997 - 44032: 0x9B7A,
-	49998 - 44032: 0x9B81,
-	49999 - 44032: 0x9B82,
-	50000 - 44032: 0x9B83,
-	50001 - 44032: 0x9B84,
-	50002 - 44032: 0x9B85,
-	50003 - 44032: 0x9B86,
-	50004 - 44032: 0x9B87,
-	50005 - 44032: 0x9B88,
-	50006 - 44032: 0x9B89,
-	50007 - 44032: 0x9B8A,
-	50008 - 44032: 0x9B8B,
-	50009 - 44032: 0x9B8C,
-	50010 - 44032: 0x9B8D,
-	50011 - 44032: 0x9B8E,
-	50012 - 44032: 0x9B8F,
-	50013 - 44032: 0x9B90,
-	50014 - 44032: 0x9B91,
-	50015 - 44032: 0x9B92,
-	50016 - 44032: 0x9B93,
-	50017 - 44032: 0x9B94,
-	50018 - 44032: 0x9B95,
-	50019 - 44032: 0x9B96,
-	50020 - 44032: 0x9B97,
-	50021 - 44032: 0x9B98,
-	50022 - 44032: 0x9B99,
-	50023 - 44032: 0x9B9A,
-	50024 - 44032: 0xBDE1,
-	50025 - 44032: 0xBDE2,
-	50026 - 44032: 0x9B9B,
-	50027 - 44032: 0x9B9C,
-	50028 - 44032: 0xBDE3,
-	50029 - 44032: 0x9B9D,
-	50030 - 44032: 0x9B9E,
-	50031 - 44032: 0x9B9F,
-	50032 - 44032: 0xBDE4,
-	50033 - 44032: 0x9BA0,
-	50034 - 44032: 0xBDE5,
-	50035 - 44032: 0x9BA1,
-	50036 - 44032: 0x9BA2,
-	50037 - 44032: 0x9BA3,
-	50038 - 44032: 0x9BA4,
-	50039 - 44032: 0x9BA5,
-	50040 - 44032: 0xBDE6,
-	50041 - 44032: 0xBDE7,
-	50042 - 44032: 0x9BA6,
-	50043 - 44032: 0x9BA7,
-	50044 - 44032: 0xBDE8,
-	50045 - 44032: 0xBDE9,
-	50046 - 44032: 0x9BA8,
-	50047 - 44032: 0x9BA9,
-	50048 - 44032: 0x9BAA,
-	50049 - 44032: 0x9BAB,
-	50050 - 44032: 0x9BAC,
-	50051 - 44032: 0x9BAD,
-	50052 - 44032: 0xBDEA,
-	50053 - 44032: 0x9BAE,
-	50054 - 44032: 0x9BAF,
-	50055 - 44032: 0x9BB0,
-	50056 - 44032: 0xBDEB,
-	50057 - 44032: 0x9BB1,
-	50058 - 44032: 0x9BB2,
-	50059 - 44032: 0x9BB3,
-	50060 - 44032: 0xBDEC,
-	50061 - 44032: 0x9BB4,
-	50062 - 44032: 0x9BB5,
-	50063 - 44032: 0x9BB6,
-	50064 - 44032: 0x9BB7,
-	50065 - 44032: 0x9BB8,
-	50066 - 44032: 0x9BB9,
-	50067 - 44032: 0x9BBA,
-	50068 - 44032: 0x9BBB,
-	50069 - 44032: 0x9BBC,
-	50070 - 44032: 0x9BBD,
-	50071 - 44032: 0x9BBE,
-	50072 - 44032: 0x9BBF,
-	50073 - 44032: 0x9BC0,
-	50074 - 44032: 0x9BC1,
-	50075 - 44032: 0x9BC2,
-	50076 - 44032: 0x9BC3,
-	50077 - 44032: 0x9BC4,
-	50078 - 44032: 0x9BC5,
-	50079 - 44032: 0x9BC6,
-	50080 - 44032: 0x9BC7,
-	50081 - 44032: 0x9BC8,
-	50082 - 44032: 0x9BC9,
-	50083 - 44032: 0x9BCA,
-	50084 - 44032: 0x9BCB,
-	50085 - 44032: 0x9BCC,
-	50086 - 44032: 0x9BCD,
-	50087 - 44032: 0x9BCE,
-	50088 - 44032: 0x9BCF,
-	50089 - 44032: 0x9BD0,
-	50090 - 44032: 0x9BD1,
-	50091 - 44032: 0x9BD2,
-	50092 - 44032: 0x9BD3,
-	50093 - 44032: 0x9BD4,
-	50094 - 44032: 0x9BD5,
-	50095 - 44032: 0x9BD6,
-	50096 - 44032: 0x9BD7,
-	50097 - 44032: 0x9BD8,
-	50098 - 44032: 0x9BD9,
-	50099 - 44032: 0x9BDA,
-	50100 - 44032: 0x9BDB,
-	50101 - 44032: 0x9BDC,
-	50102 - 44032: 0x9BDD,
-	50103 - 44032: 0x9BDE,
-	50104 - 44032: 0x9BDF,
-	50105 - 44032: 0x9BE0,
-	50106 - 44032: 0x9BE1,
-	50107 - 44032: 0x9BE2,
-	50108 - 44032: 0x9BE3,
-	50109 - 44032: 0x9BE4,
-	50110 - 44032: 0x9BE5,
-	50111 - 44032: 0x9BE6,
-	50112 - 44032: 0xBDED,
-	50113 - 44032: 0x9BE7,
-	50114 - 44032: 0x9BE8,
-	50115 - 44032: 0x9BE9,
-	50116 - 44032: 0x9BEA,
-	50117 - 44032: 0x9BEB,
-	50118 - 44032: 0x9BEC,
-	50119 - 44032: 0x9BED,
-	50120 - 44032: 0x9BEE,
-	50121 - 44032: 0x9BEF,
-	50122 - 44032: 0x9BF0,
-	50123 - 44032: 0x9BF1,
-	50124 - 44032: 0x9BF2,
-	50125 - 44032: 0x9BF3,
-	50126 - 44032: 0x9BF4,
-	50127 - 44032: 0x9BF5,
-	50128 - 44032: 0x9BF6,
-	50129 - 44032: 0x9BF7,
-	50130 - 44032: 0x9BF8,
-	50131 - 44032: 0x9BF9,
-	50132 - 44032: 0x9BFA,
-	50133 - 44032: 0x9BFB,
-	50134 - 44032: 0x9BFC,
-	50135 - 44032: 0x9BFD,
-	50136 - 44032: 0xBDEE,
-	50137 - 44032: 0xBDEF,
-	50138 - 44032: 0x9BFE,
-	50139 - 44032: 0x9C41,
-	50140 - 44032: 0xBDF0,
-	50141 - 44032: 0x9C42,
-	50142 - 44032: 0x9C43,
-	50143 - 44032: 0xBDF1,
-	50144 - 44032: 0xBDF2,
-	50145 - 44032: 0x9C44,
-	50146 - 44032: 0xBDF3,
-	50147 - 44032: 0x9C45,
-	50148 - 44032: 0x9C46,
-	50149 - 44032: 0x9C47,
-	50150 - 44032: 0x9C48,
-	50151 - 44032: 0x9C49,
-	50152 - 44032: 0xBDF4,
-	50153 - 44032: 0xBDF5,
-	50154 - 44032: 0x9C4A,
-	50155 - 44032: 0x9C4B,
-	50156 - 44032: 0x9C4C,
-	50157 - 44032: 0xBDF6,
-	50158 - 44032: 0x9C4D,
-	50159 - 44032: 0x9C4E,
-	50160 - 44032: 0x9C4F,
-	50161 - 44032: 0x9C50,
-	50162 - 44032: 0x9C51,
-	50163 - 44032: 0x9C52,
-	50164 - 44032: 0xBDF7,
-	50165 - 44032: 0xBDF8,
-	50166 - 44032: 0x9C53,
-	50167 - 44032: 0x9C54,
-	50168 - 44032: 0xBDF9,
-	50169 - 44032: 0x9C55,
-	50170 - 44032: 0x9C56,
-	50171 - 44032: 0x9C57,
-	50172 - 44032: 0x9C58,
-	50173 - 44032: 0x9C59,
-	50174 - 44032: 0x9C5A,
-	50175 - 44032: 0x9C61,
-	50176 - 44032: 0x9C62,
-	50177 - 44032: 0x9C63,
-	50178 - 44032: 0x9C64,
-	50179 - 44032: 0x9C65,
-	50180 - 44032: 0x9C66,
-	50181 - 44032: 0x9C67,
-	50182 - 44032: 0x9C68,
-	50183 - 44032: 0x9C69,
-	50184 - 44032: 0xBDFA,
-	50185 - 44032: 0x9C6A,
-	50186 - 44032: 0x9C6B,
-	50187 - 44032: 0x9C6C,
-	50188 - 44032: 0x9C6D,
-	50189 - 44032: 0x9C6E,
-	50190 - 44032: 0x9C6F,
-	50191 - 44032: 0x9C70,
-	50192 - 44032: 0xBDFB,
-	50193 - 44032: 0x9C71,
-	50194 - 44032: 0x9C72,
-	50195 - 44032: 0x9C73,
-	50196 - 44032: 0x9C74,
-	50197 - 44032: 0x9C75,
-	50198 - 44032: 0x9C76,
-	50199 - 44032: 0x9C77,
-	50200 - 44032: 0x9C78,
-	50201 - 44032: 0x9C79,
-	50202 - 44032: 0x9C7A,
-	50203 - 44032: 0x9C81,
-	50204 - 44032: 0x9C82,
-	50205 - 44032: 0x9C83,
-	50206 - 44032: 0x9C84,
-	50207 - 44032: 0x9C85,
-	50208 - 44032: 0x9C86,
-	50209 - 44032: 0x9C87,
-	50210 - 44032: 0x9C88,
-	50211 - 44032: 0x9C89,
-	50212 - 44032: 0xBDFC,
-	50213 - 44032: 0x9C8A,
-	50214 - 44032: 0x9C8B,
-	50215 - 44032: 0x9C8C,
-	50216 - 44032: 0x9C8D,
-	50217 - 44032: 0x9C8E,
-	50218 - 44032: 0x9C8F,
-	50219 - 44032: 0x9C90,
-	50220 - 44032: 0xBDFD,
-	50221 - 44032: 0x9C91,
-	50222 - 44032: 0x9C92,
-	50223 - 44032: 0x9C93,
-	50224 - 44032: 0xBDFE,
-	50225 - 44032: 0x9C94,
-	50226 - 44032: 0x9C95,
-	50227 - 44032: 0x9C96,
-	50228 - 44032: 0xBEA1,
-	50229 - 44032: 0x9C97,
-	50230 - 44032: 0x9C98,
-	50231 - 44032: 0x9C99,
-	50232 - 44032: 0x9C9A,
-	50233 - 44032: 0x9C9B,
-	50234 - 44032: 0x9C9C,
-	50235 - 44032: 0x9C9D,
-	50236 - 44032: 0xBEA2,
-	50237 - 44032: 0xBEA3,
-	50238 - 44032: 0x9C9E,
-	50239 - 44032: 0x9C9F,
-	50240 - 44032: 0x9CA0,
-	50241 - 44032: 0x9CA1,
-	50242 - 44032: 0x9CA2,
-	50243 - 44032: 0x9CA3,
-	50244 - 44032: 0x9CA4,
-	50245 - 44032: 0x9CA5,
-	50246 - 44032: 0x9CA6,
-	50247 - 44032: 0x9CA7,
-	50248 - 44032: 0xBEA4,
-	50249 - 44032: 0x9CA8,
-	50250 - 44032: 0x9CA9,
-	50251 - 44032: 0x9CAA,
-	50252 - 44032: 0x9CAB,
-	50253 - 44032: 0x9CAC,
-	50254 - 44032: 0x9CAD,
-	50255 - 44032: 0x9CAE,
-	50256 - 44032: 0x9CAF,
-	50257 - 44032: 0x9CB0,
-	50258 - 44032: 0x9CB1,
-	50259 - 44032: 0x9CB2,
-	50260 - 44032: 0x9CB3,
-	50261 - 44032: 0x9CB4,
-	50262 - 44032: 0x9CB5,
-	50263 - 44032: 0x9CB6,
-	50264 - 44032: 0x9CB7,
-	50265 - 44032: 0x9CB8,
-	50266 - 44032: 0x9CB9,
-	50267 - 44032: 0x9CBA,
-	50268 - 44032: 0x9CBB,
-	50269 - 44032: 0x9CBC,
-	50270 - 44032: 0x9CBD,
-	50271 - 44032: 0x9CBE,
-	50272 - 44032: 0x9CBF,
-	50273 - 44032: 0x9CC0,
-	50274 - 44032: 0x9CC1,
-	50275 - 44032: 0x9CC2,
-	50276 - 44032: 0xBEA5,
-	50277 - 44032: 0xBEA6,
-	50278 - 44032: 0x9CC3,
-	50279 - 44032: 0x9CC4,
-	50280 - 44032: 0xBEA7,
-	50281 - 44032: 0x9CC5,
-	50282 - 44032: 0x9CC6,
-	50283 - 44032: 0x9CC7,
-	50284 - 44032: 0xBEA8,
-	50285 - 44032: 0x9CC8,
-	50286 - 44032: 0x9CC9,
-	50287 - 44032: 0x9CCA,
-	50288 - 44032: 0x9CCB,
-	50289 - 44032: 0x9CCC,
-	50290 - 44032: 0x9CCD,
-	50291 - 44032: 0x9CCE,
-	50292 - 44032: 0xBEA9,
-	50293 - 44032: 0xBEAA,
-	50294 - 44032: 0x9CCF,
-	50295 - 44032: 0x9CD0,
-	50296 - 44032: 0x9CD1,
-	50297 - 44032: 0xBEAB,
-	50298 - 44032: 0x9CD2,
-	50299 - 44032: 0x9CD3,
-	50300 - 44032: 0x9CD4,
-	50301 - 44032: 0x9CD5,
-	50302 - 44032: 0x9CD6,
-	50303 - 44032: 0x9CD7,
-	50304 - 44032: 0xBEAC,
-	50305 - 44032: 0x9CD8,
-	50306 - 44032: 0x9CD9,
-	50307 - 44032: 0x9CDA,
-	50308 - 44032: 0x9CDB,
-	50309 - 44032: 0x9CDC,
-	50310 - 44032: 0x9CDD,
-	50311 - 44032: 0x9CDE,
-	50312 - 44032: 0x9CDF,
-	50313 - 44032: 0x9CE0,
-	50314 - 44032: 0x9CE1,
-	50315 - 44032: 0x9CE2,
-	50316 - 44032: 0x9CE3,
-	50317 - 44032: 0x9CE4,
-	50318 - 44032: 0x9CE5,
-	50319 - 44032: 0x9CE6,
-	50320 - 44032: 0x9CE7,
-	50321 - 44032: 0x9CE8,
-	50322 - 44032: 0x9CE9,
-	50323 - 44032: 0x9CEA,
-	50324 - 44032: 0xBEAD,
-	50325 - 44032: 0x9CEB,
-	50326 - 44032: 0x9CEC,
-	50327 - 44032: 0x9CED,
-	50328 - 44032: 0x9CEE,
-	50329 - 44032: 0x9CEF,
-	50330 - 44032: 0x9CF0,
-	50331 - 44032: 0x9CF1,
-	50332 - 44032: 0xBEAE,
-	50333 - 44032: 0x9CF2,
-	50334 - 44032: 0x9CF3,
-	50335 - 44032: 0x9CF4,
-	50336 - 44032: 0x9CF5,
-	50337 - 44032: 0x9CF6,
-	50338 - 44032: 0x9CF7,
-	50339 - 44032: 0x9CF8,
-	50340 - 44032: 0x9CF9,
-	50341 - 44032: 0x9CFA,
-	50342 - 44032: 0x9CFB,
-	50343 - 44032: 0x9CFC,
-	50344 - 44032: 0x9CFD,
-	50345 - 44032: 0x9CFE,
-	50346 - 44032: 0x9D41,
-	50347 - 44032: 0x9D42,
-	50348 - 44032: 0x9D43,
-	50349 - 44032: 0x9D44,
-	50350 - 44032: 0x9D45,
-	50351 - 44032: 0x9D46,
-	50352 - 44032: 0x9D47,
-	50353 - 44032: 0x9D48,
-	50354 - 44032: 0x9D49,
-	50355 - 44032: 0x9D4A,
-	50356 - 44032: 0x9D4B,
-	50357 - 44032: 0x9D4C,
-	50358 - 44032: 0x9D4D,
-	50359 - 44032: 0x9D4E,
-	50360 - 44032: 0xBEAF,
-	50361 - 44032: 0x9D4F,
-	50362 - 44032: 0x9D50,
-	50363 - 44032: 0x9D51,
-	50364 - 44032: 0xBEB0,
-	50365 - 44032: 0x9D52,
-	50366 - 44032: 0x9D53,
-	50367 - 44032: 0x9D54,
-	50368 - 44032: 0x9D55,
-	50369 - 44032: 0x9D56,
-	50370 - 44032: 0x9D57,
-	50371 - 44032: 0x9D58,
-	50372 - 44032: 0x9D59,
-	50373 - 44032: 0x9D5A,
-	50374 - 44032: 0x9D61,
-	50375 - 44032: 0x9D62,
-	50376 - 44032: 0x9D63,
-	50377 - 44032: 0x9D64,
-	50378 - 44032: 0x9D65,
-	50379 - 44032: 0x9D66,
-	50380 - 44032: 0x9D67,
-	50381 - 44032: 0x9D68,
-	50382 - 44032: 0x9D69,
-	50383 - 44032: 0x9D6A,
-	50384 - 44032: 0x9D6B,
-	50385 - 44032: 0x9D6C,
-	50386 - 44032: 0x9D6D,
-	50387 - 44032: 0x9D6E,
-	50388 - 44032: 0x9D6F,
-	50389 - 44032: 0x9D70,
-	50390 - 44032: 0x9D71,
-	50391 - 44032: 0x9D72,
-	50392 - 44032: 0x9D73,
-	50393 - 44032: 0x9D74,
-	50394 - 44032: 0x9D75,
-	50395 - 44032: 0x9D76,
-	50396 - 44032: 0x9D77,
-	50397 - 44032: 0x9D78,
-	50398 - 44032: 0x9D79,
-	50399 - 44032: 0x9D7A,
-	50400 - 44032: 0x9D81,
-	50401 - 44032: 0x9D82,
-	50402 - 44032: 0x9D83,
-	50403 - 44032: 0x9D84,
-	50404 - 44032: 0x9D85,
-	50405 - 44032: 0x9D86,
-	50406 - 44032: 0x9D87,
-	50407 - 44032: 0x9D88,
-	50408 - 44032: 0x9D89,
-	50409 - 44032: 0xBEB1,
-	50410 - 44032: 0x9D8A,
-	50411 - 44032: 0x9D8B,
-	50412 - 44032: 0x9D8C,
-	50413 - 44032: 0x9D8D,
-	50414 - 44032: 0x9D8E,
-	50415 - 44032: 0x9D8F,
-	50416 - 44032: 0xBEB2,
-	50417 - 44032: 0xBEB3,
-	50418 - 44032: 0x9D90,
-	50419 - 44032: 0x9D91,
-	50420 - 44032: 0xBEB4,
-	50421 - 44032: 0x9D92,
-	50422 - 44032: 0x9D93,
-	50423 - 44032: 0x9D94,
-	50424 - 44032: 0xBEB5,
-	50425 - 44032: 0x9D95,
-	50426 - 44032: 0xBEB6,
-	50427 - 44032: 0x9D96,
-	50428 - 44032: 0x9D97,
-	50429 - 44032: 0x9D98,
-	50430 - 44032: 0x9D99,
-	50431 - 44032: 0xBEB7,
-	50432 - 44032: 0xBEB8,
-	50433 - 44032: 0xBEB9,
-	50434 - 44032: 0x9D9A,
-	50435 - 44032: 0x9D9B,
-	50436 - 44032: 0x9D9C,
-	50437 - 44032: 0x9D9D,
-	50438 - 44032: 0x9D9E,
-	50439 - 44032: 0x9D9F,
-	50440 - 44032: 0x9DA0,
-	50441 - 44032: 0x9DA1,
-	50442 - 44032: 0x9DA2,
-	50443 - 44032: 0x9DA3,
-	50444 - 44032: 0xBEBA,
-	50445 - 44032: 0x9DA4,
-	50446 - 44032: 0x9DA5,
-	50447 - 44032: 0x9DA6,
-	50448 - 44032: 0xBEBB,
-	50449 - 44032: 0x9DA7,
-	50450 - 44032: 0x9DA8,
-	50451 - 44032: 0x9DA9,
-	50452 - 44032: 0xBEBC,
-	50453 - 44032: 0x9DAA,
-	50454 - 44032: 0x9DAB,
-	50455 - 44032: 0x9DAC,
-	50456 - 44032: 0x9DAD,
-	50457 - 44032: 0x9DAE,
-	50458 - 44032: 0x9DAF,
-	50459 - 44032: 0x9DB0,
-	50460 - 44032: 0xBEBD,
-	50461 - 44032: 0x9DB1,
-	50462 - 44032: 0x9DB2,
-	50463 - 44032: 0x9DB3,
-	50464 - 44032: 0x9DB4,
-	50465 - 44032: 0x9DB5,
-	50466 - 44032: 0x9DB6,
-	50467 - 44032: 0x9DB7,
-	50468 - 44032: 0x9DB8,
-	50469 - 44032: 0x9DB9,
-	50470 - 44032: 0x9DBA,
-	50471 - 44032: 0x9DBB,
-	50472 - 44032: 0xBEBE,
-	50473 - 44032: 0xBEBF,
-	50474 - 44032: 0x9DBC,
-	50475 - 44032: 0x9DBD,
-	50476 - 44032: 0xBEC0,
-	50477 - 44032: 0x9DBE,
-	50478 - 44032: 0x9DBF,
-	50479 - 44032: 0x9DC0,
-	50480 - 44032: 0xBEC1,
-	50481 - 44032: 0x9DC1,
-	50482 - 44032: 0x9DC2,
-	50483 - 44032: 0x9DC3,
-	50484 - 44032: 0x9DC4,
-	50485 - 44032: 0x9DC5,
-	50486 - 44032: 0x9DC6,
-	50487 - 44032: 0x9DC7,
-	50488 - 44032: 0xBEC2,
-	50489 - 44032: 0xBEC3,
-	50490 - 44032: 0x9DC8,
-	50491 - 44032: 0xBEC4,
-	50492 - 44032: 0x9DC9,
-	50493 - 44032: 0xBEC5,
-	50494 - 44032: 0x9DCA,
-	50495 - 44032: 0x9DCB,
-	50496 - 44032: 0x9DCC,
-	50497 - 44032: 0x9DCD,
-	50498 - 44032: 0x9DCE,
-	50499 - 44032: 0x9DCF,
-	50500 - 44032: 0xBEC6,
-	50501 - 44032: 0xBEC7,
-	50502 - 44032: 0x9DD0,
-	50503 - 44032: 0x9DD1,
-	50504 - 44032: 0xBEC8,
-	50505 - 44032: 0xBEC9,
-	50506 - 44032: 0xBECA,
-	50507 - 44032: 0x9DD2,
-	50508 - 44032: 0xBECB,
-	50509 - 44032: 0xBECC,
-	50510 - 44032: 0xBECD,
-	50511 - 44032: 0x9DD3,
-	50512 - 44032: 0x9DD4,
-	50513 - 44032: 0x9DD5,
-	50514 - 44032: 0x9DD6,
-	50515 - 44032: 0xBECE,
-	50516 - 44032: 0xBECF,
-	50517 - 44032: 0xBED0,
-	50518 - 44032: 0x9DD7,
-	50519 - 44032: 0xBED1,
-	50520 - 44032: 0xBED2,
-	50521 - 44032: 0xBED3,
-	50522 - 44032: 0x9DD8,
-	50523 - 44032: 0x9DD9,
-	50524 - 44032: 0x9DDA,
-	50525 - 44032: 0xBED4,
-	50526 - 44032: 0xBED5,
-	50527 - 44032: 0x9DDB,
-	50528 - 44032: 0xBED6,
-	50529 - 44032: 0xBED7,
-	50530 - 44032: 0x9DDC,
-	50531 - 44032: 0x9DDD,
-	50532 - 44032: 0xBED8,
-	50533 - 44032: 0x9DDE,
-	50534 - 44032: 0x9DDF,
-	50535 - 44032: 0x9DE0,
-	50536 - 44032: 0xBED9,
-	50537 - 44032: 0x9DE1,
-	50538 - 44032: 0x9DE2,
-	50539 - 44032: 0x9DE3,
-	50540 - 44032: 0x9DE4,
-	50541 - 44032: 0x9DE5,
-	50542 - 44032: 0x9DE6,
-	50543 - 44032: 0x9DE7,
-	50544 - 44032: 0xBEDA,
-	50545 - 44032: 0xBEDB,
-	50546 - 44032: 0x9DE8,
-	50547 - 44032: 0xBEDC,
-	50548 - 44032: 0xBEDD,
-	50549 - 44032: 0xBEDE,
-	50550 - 44032: 0x9DE9,
-	50551 - 44032: 0x9DEA,
-	50552 - 44032: 0x9DEB,
-	50553 - 44032: 0x9DEC,
-	50554 - 44032: 0x9DED,
-	50555 - 44032: 0x9DEE,
-	50556 - 44032: 0xBEDF,
-	50557 - 44032: 0xBEE0,
-	50558 - 44032: 0x9DEF,
-	50559 - 44032: 0x9DF0,
-	50560 - 44032: 0xBEE1,
-	50561 - 44032: 0x9DF1,
-	50562 - 44032: 0x9DF2,
-	50563 - 44032: 0x9DF3,
-	50564 - 44032: 0xBEE2,
-	50565 - 44032: 0x9DF4,
-	50566 - 44032: 0x9DF5,
-	50567 - 44032: 0xBEE3,
-	50568 - 44032: 0x9DF6,
-	50569 - 44032: 0x9DF7,
-	50570 - 44032: 0x9DF8,
-	50571 - 44032: 0x9DF9,
-	50572 - 44032: 0xBEE4,
-	50573 - 44032: 0xBEE5,
-	50574 - 44032: 0x9DFA,
-	50575 - 44032: 0xBEE6,
-	50576 - 44032: 0x9DFB,
-	50577 - 44032: 0xBEE7,
-	50578 - 44032: 0x9DFC,
-	50579 - 44032: 0x9DFD,
-	50580 - 44032: 0x9DFE,
-	50581 - 44032: 0xBEE8,
-	50582 - 44032: 0x9E41,
-	50583 - 44032: 0xBEE9,
-	50584 - 44032: 0xBEEA,
-	50585 - 44032: 0x9E42,
-	50586 - 44032: 0x9E43,
-	50587 - 44032: 0x9E44,
-	50588 - 44032: 0xBEEB,
-	50589 - 44032: 0x9E45,
-	50590 - 44032: 0x9E46,
-	50591 - 44032: 0x9E47,
-	50592 - 44032: 0xBEEC,
-	50593 - 44032: 0x9E48,
-	50594 - 44032: 0x9E49,
-	50595 - 44032: 0x9E4A,
-	50596 - 44032: 0x9E4B,
-	50597 - 44032: 0x9E4C,
-	50598 - 44032: 0x9E4D,
-	50599 - 44032: 0x9E4E,
-	50600 - 44032: 0x9E4F,
-	50601 - 44032: 0xBEED,
-	50602 - 44032: 0x9E50,
-	50603 - 44032: 0x9E51,
-	50604 - 44032: 0x9E52,
-	50605 - 44032: 0x9E53,
-	50606 - 44032: 0x9E54,
-	50607 - 44032: 0x9E55,
-	50608 - 44032: 0x9E56,
-	50609 - 44032: 0x9E57,
-	50610 - 44032: 0x9E58,
-	50611 - 44032: 0x9E59,
-	50612 - 44032: 0xBEEE,
-	50613 - 44032: 0xBEEF,
-	50614 - 44032: 0x9E5A,
-	50615 - 44032: 0x9E61,
-	50616 - 44032: 0xBEF0,
-	50617 - 44032: 0xBEF1,
-	50618 - 44032: 0x9E62,
-	50619 - 44032: 0xBEF2,
-	50620 - 44032: 0xBEF3,
-	50621 - 44032: 0xBEF4,
-	50622 - 44032: 0xBEF5,
-	50623 - 44032: 0x9E63,
-	50624 - 44032: 0x9E64,
-	50625 - 44032: 0x9E65,
-	50626 - 44032: 0x9E66,
-	50627 - 44032: 0x9E67,
-	50628 - 44032: 0xBEF6,
-	50629 - 44032: 0xBEF7,
-	50630 - 44032: 0xBEF8,
-	50631 - 44032: 0xBEF9,
-	50632 - 44032: 0xBEFA,
-	50633 - 44032: 0xBEFB,
-	50634 - 44032: 0xBEFC,
-	50635 - 44032: 0x9E68,
-	50636 - 44032: 0xBEFD,
-	50637 - 44032: 0x9E69,
-	50638 - 44032: 0xBEFE,
-	50639 - 44032: 0x9E6A,
-	50640 - 44032: 0xBFA1,
-	50641 - 44032: 0xBFA2,
-	50642 - 44032: 0x9E6B,
-	50643 - 44032: 0x9E6C,
-	50644 - 44032: 0xBFA3,
-	50645 - 44032: 0x9E6D,
-	50646 - 44032: 0x9E6E,
-	50647 - 44032: 0x9E6F,
-	50648 - 44032: 0xBFA4,
-	50649 - 44032: 0x9E70,
-	50650 - 44032: 0x9E71,
-	50651 - 44032: 0x9E72,
-	50652 - 44032: 0x9E73,
-	50653 - 44032: 0x9E74,
-	50654 - 44032: 0x9E75,
-	50655 - 44032: 0x9E76,
-	50656 - 44032: 0xBFA5,
-	50657 - 44032: 0xBFA6,
-	50658 - 44032: 0x9E77,
-	50659 - 44032: 0xBFA7,
-	50660 - 44032: 0x9E78,
-	50661 - 44032: 0xBFA8,
-	50662 - 44032: 0x9E79,
-	50663 - 44032: 0x9E7A,
-	50664 - 44032: 0x9E81,
-	50665 - 44032: 0x9E82,
-	50666 - 44032: 0x9E83,
-	50667 - 44032: 0x9E84,
-	50668 - 44032: 0xBFA9,
-	50669 - 44032: 0xBFAA,
-	50670 - 44032: 0xBFAB,
-	50671 - 44032: 0x9E85,
-	50672 - 44032: 0xBFAC,
-	50673 - 44032: 0x9E86,
-	50674 - 44032: 0x9E87,
-	50675 - 44032: 0x9E88,
-	50676 - 44032: 0xBFAD,
-	50677 - 44032: 0x9E89,
-	50678 - 44032: 0xBFAE,
-	50679 - 44032: 0xBFAF,
-	50680 - 44032: 0x9E8A,
-	50681 - 44032: 0x9E8B,
-	50682 - 44032: 0x9E8C,
-	50683 - 44032: 0x9E8D,
-	50684 - 44032: 0xBFB0,
-	50685 - 44032: 0xBFB1,
-	50686 - 44032: 0xBFB2,
-	50687 - 44032: 0xBFB3,
-	50688 - 44032: 0xBFB4,
-	50689 - 44032: 0xBFB5,
-	50690 - 44032: 0x9E8E,
-	50691 - 44032: 0x9E8F,
-	50692 - 44032: 0x9E90,
-	50693 - 44032: 0xBFB6,
-	50694 - 44032: 0xBFB7,
-	50695 - 44032: 0xBFB8,
-	50696 - 44032: 0xBFB9,
-	50697 - 44032: 0x9E91,
-	50698 - 44032: 0x9E92,
-	50699 - 44032: 0x9E93,
-	50700 - 44032: 0xBFBA,
-	50701 - 44032: 0x9E94,
-	50702 - 44032: 0x9E95,
-	50703 - 44032: 0x9E96,
-	50704 - 44032: 0xBFBB,
-	50705 - 44032: 0x9E97,
-	50706 - 44032: 0x9E98,
-	50707 - 44032: 0x9E99,
-	50708 - 44032: 0x9E9A,
-	50709 - 44032: 0x9E9B,
-	50710 - 44032: 0x9E9C,
-	50711 - 44032: 0x9E9D,
-	50712 - 44032: 0xBFBC,
-	50713 - 44032: 0xBFBD,
-	50714 - 44032: 0x9E9E,
-	50715 - 44032: 0xBFBE,
-	50716 - 44032: 0xBFBF,
-	50717 - 44032: 0x9E9F,
-	50718 - 44032: 0x9EA0,
-	50719 - 44032: 0x9EA1,
-	50720 - 44032: 0x9EA2,
-	50721 - 44032: 0x9EA3,
-	50722 - 44032: 0x9EA4,
-	50723 - 44032: 0x9EA5,
-	50724 - 44032: 0xBFC0,
-	50725 - 44032: 0xBFC1,
-	50726 - 44032: 0x9EA6,
-	50727 - 44032: 0x9EA7,
-	50728 - 44032: 0xBFC2,
-	50729 - 44032: 0x9EA8,
-	50730 - 44032: 0x9EA9,
-	50731 - 44032: 0x9EAA,
-	50732 - 44032: 0xBFC3,
-	50733 - 44032: 0xBFC4,
-	50734 - 44032: 0xBFC5,
-	50735 - 44032: 0x9EAB,
-	50736 - 44032: 0xBFC6,
-	50737 - 44032: 0x9EAC,
-	50738 - 44032: 0x9EAD,
-	50739 - 44032: 0xBFC7,
-	50740 - 44032: 0xBFC8,
-	50741 - 44032: 0xBFC9,
-	50742 - 44032: 0x9EAE,
-	50743 - 44032: 0xBFCA,
-	50744 - 44032: 0x9EAF,
-	50745 - 44032: 0xBFCB,
-	50746 - 44032: 0x9EB0,
-	50747 - 44032: 0xBFCC,
-	50748 - 44032: 0x9EB1,
-	50749 - 44032: 0x9EB2,
-	50750 - 44032: 0x9EB3,
-	50751 - 44032: 0x9EB4,
-	50752 - 44032: 0xBFCD,
-	50753 - 44032: 0xBFCE,
-	50754 - 44032: 0x9EB5,
-	50755 - 44032: 0x9EB6,
-	50756 - 44032: 0xBFCF,
-	50757 - 44032: 0x9EB7,
-	50758 - 44032: 0x9EB8,
-	50759 - 44032: 0x9EB9,
-	50760 - 44032: 0xBFD0,
-	50761 - 44032: 0x9EBA,
-	50762 - 44032: 0x9EBB,
-	50763 - 44032: 0x9EBC,
-	50764 - 44032: 0x9EBD,
-	50765 - 44032: 0x9EBE,
-	50766 - 44032: 0x9EBF,
-	50767 - 44032: 0x9EC0,
-	50768 - 44032: 0xBFD1,
-	50769 - 44032: 0xBFD2,
-	50770 - 44032: 0x9EC1,
-	50771 - 44032: 0xBFD3,
-	50772 - 44032: 0xBFD4,
-	50773 - 44032: 0xBFD5,
-	50774 - 44032: 0x9EC2,
-	50775 - 44032: 0x9EC3,
-	50776 - 44032: 0x9EC4,
-	50777 - 44032: 0x9EC5,
-	50778 - 44032: 0x9EC6,
-	50779 - 44032: 0x9EC7,
-	50780 - 44032: 0xBFD6,
-	50781 - 44032: 0xBFD7,
-	50782 - 44032: 0x9EC8,
-	50783 - 44032: 0x9EC9,
-	50784 - 44032: 0xBFD8,
-	50785 - 44032: 0x9ECA,
-	50786 - 44032: 0x9ECB,
-	50787 - 44032: 0x9ECC,
-	50788 - 44032: 0x9ECD,
-	50789 - 44032: 0x9ECE,
-	50790 - 44032: 0x9ECF,
-	50791 - 44032: 0x9ED0,
-	50792 - 44032: 0x9ED1,
-	50793 - 44032: 0x9ED2,
-	50794 - 44032: 0x9ED3,
-	50795 - 44032: 0x9ED4,
-	50796 - 44032: 0xBFD9,
-	50797 - 44032: 0x9ED5,
-	50798 - 44032: 0x9ED6,
-	50799 - 44032: 0xBFDA,
-	50800 - 44032: 0x9ED7,
-	50801 - 44032: 0xBFDB,
-	50802 - 44032: 0x9ED8,
-	50803 - 44032: 0x9ED9,
-	50804 - 44032: 0x9EDA,
-	50805 - 44032: 0x9EDB,
-	50806 - 44032: 0x9EDC,
-	50807 - 44032: 0x9EDD,
-	50808 - 44032: 0xBFDC,
-	50809 - 44032: 0xBFDD,
-	50810 - 44032: 0x9EDE,
-	50811 - 44032: 0x9EDF,
-	50812 - 44032: 0xBFDE,
-	50813 - 44032: 0x9EE0,
-	50814 - 44032: 0x9EE1,
-	50815 - 44032: 0x9EE2,
-	50816 - 44032: 0xBFDF,
-	50817 - 44032: 0x9EE3,
-	50818 - 44032: 0x9EE4,
-	50819 - 44032: 0x9EE5,
-	50820 - 44032: 0x9EE6,
-	50821 - 44032: 0x9EE7,
-	50822 - 44032: 0x9EE8,
-	50823 - 44032: 0x9EE9,
-	50824 - 44032: 0xBFE0,
-	50825 - 44032: 0xBFE1,
-	50826 - 44032: 0x9EEA,
-	50827 - 44032: 0xBFE2,
-	50828 - 44032: 0x9EEB,
-	50829 - 44032: 0xBFE3,
-	50830 - 44032: 0x9EEC,
-	50831 - 44032: 0x9EED,
-	50832 - 44032: 0x9EEE,
-	50833 - 44032: 0x9EEF,
-	50834 - 44032: 0x9EF0,
-	50835 - 44032: 0x9EF1,
-	50836 - 44032: 0xBFE4,
-	50837 - 44032: 0xBFE5,
-	50838 - 44032: 0x9EF2,
-	50839 - 44032: 0x9EF3,
-	50840 - 44032: 0xBFE6,
-	50841 - 44032: 0x9EF4,
-	50842 - 44032: 0x9EF5,
-	50843 - 44032: 0x9EF6,
-	50844 - 44032: 0xBFE7,
-	50845 - 44032: 0x9EF7,
-	50846 - 44032: 0x9EF8,
-	50847 - 44032: 0x9EF9,
-	50848 - 44032: 0x9EFA,
-	50849 - 44032: 0x9EFB,
-	50850 - 44032: 0x9EFC,
-	50851 - 44032: 0x9EFD,
-	50852 - 44032: 0xBFE8,
-	50853 - 44032: 0xBFE9,
-	50854 - 44032: 0x9EFE,
-	50855 - 44032: 0xBFEA,
-	50856 - 44032: 0x9F41,
-	50857 - 44032: 0xBFEB,
-	50858 - 44032: 0x9F42,
-	50859 - 44032: 0x9F43,
-	50860 - 44032: 0x9F44,
-	50861 - 44032: 0x9F45,
-	50862 - 44032: 0x9F46,
-	50863 - 44032: 0x9F47,
-	50864 - 44032: 0xBFEC,
-	50865 - 44032: 0xBFED,
-	50866 - 44032: 0x9F48,
-	50867 - 44032: 0x9F49,
-	50868 - 44032: 0xBFEE,
-	50869 - 44032: 0x9F4A,
-	50870 - 44032: 0x9F4B,
-	50871 - 44032: 0x9F4C,
-	50872 - 44032: 0xBFEF,
-	50873 - 44032: 0xBFF0,
-	50874 - 44032: 0xBFF1,
-	50875 - 44032: 0x9F4D,
-	50876 - 44032: 0x9F4E,
-	50877 - 44032: 0x9F4F,
-	50878 - 44032: 0x9F50,
-	50879 - 44032: 0x9F51,
-	50880 - 44032: 0xBFF2,
-	50881 - 44032: 0xBFF3,
-	50882 - 44032: 0x9F52,
-	50883 - 44032: 0xBFF4,
-	50884 - 44032: 0x9F53,
-	50885 - 44032: 0xBFF5,
-	50886 - 44032: 0x9F54,
-	50887 - 44032: 0x9F55,
-	50888 - 44032: 0x9F56,
-	50889 - 44032: 0x9F57,
-	50890 - 44032: 0x9F58,
-	50891 - 44032: 0x9F59,
-	50892 - 44032: 0xBFF6,
-	50893 - 44032: 0xBFF7,
-	50894 - 44032: 0x9F5A,
-	50895 - 44032: 0x9F61,
-	50896 - 44032: 0xBFF8,
-	50897 - 44032: 0x9F62,
-	50898 - 44032: 0x9F63,
-	50899 - 44032: 0x9F64,
-	50900 - 44032: 0xBFF9,
-	50901 - 44032: 0x9F65,
-	50902 - 44032: 0x9F66,
-	50903 - 44032: 0x9F67,
-	50904 - 44032: 0x9F68,
-	50905 - 44032: 0x9F69,
-	50906 - 44032: 0x9F6A,
-	50907 - 44032: 0x9F6B,
-	50908 - 44032: 0xBFFA,
-	50909 - 44032: 0xBFFB,
-	50910 - 44032: 0x9F6C,
-	50911 - 44032: 0x9F6D,
-	50912 - 44032: 0xBFFC,
-	50913 - 44032: 0xBFFD,
-	50914 - 44032: 0x9F6E,
-	50915 - 44032: 0x9F6F,
-	50916 - 44032: 0x9F70,
-	50917 - 44032: 0x9F71,
-	50918 - 44032: 0x9F72,
-	50919 - 44032: 0x9F73,
-	50920 - 44032: 0xBFFE,
-	50921 - 44032: 0xC0A1,
-	50922 - 44032: 0x9F74,
-	50923 - 44032: 0x9F75,
-	50924 - 44032: 0xC0A2,
-	50925 - 44032: 0x9F76,
-	50926 - 44032: 0x9F77,
-	50927 - 44032: 0x9F78,
-	50928 - 44032: 0xC0A3,
-	50929 - 44032: 0x9F79,
-	50930 - 44032: 0x9F7A,
-	50931 - 44032: 0x9F81,
-	50932 - 44032: 0x9F82,
-	50933 - 44032: 0x9F83,
-	50934 - 44032: 0x9F84,
-	50935 - 44032: 0x9F85,
-	50936 - 44032: 0xC0A4,
-	50937 - 44032: 0xC0A5,
-	50938 - 44032: 0x9F86,
-	50939 - 44032: 0x9F87,
-	50940 - 44032: 0x9F88,
-	50941 - 44032: 0xC0A6,
-	50942 - 44032: 0x9F89,
-	50943 - 44032: 0x9F8A,
-	50944 - 44032: 0x9F8B,
-	50945 - 44032: 0x9F8C,
-	50946 - 44032: 0x9F8D,
-	50947 - 44032: 0x9F8E,
-	50948 - 44032: 0xC0A7,
-	50949 - 44032: 0xC0A8,
-	50950 - 44032: 0x9F8F,
-	50951 - 44032: 0x9F90,
-	50952 - 44032: 0xC0A9,
-	50953 - 44032: 0x9F91,
-	50954 - 44032: 0x9F92,
-	50955 - 44032: 0x9F93,
-	50956 - 44032: 0xC0AA,
-	50957 - 44032: 0x9F94,
-	50958 - 44032: 0x9F95,
-	50959 - 44032: 0x9F96,
-	50960 - 44032: 0x9F97,
-	50961 - 44032: 0x9F98,
-	50962 - 44032: 0x9F99,
-	50963 - 44032: 0x9F9A,
-	50964 - 44032: 0xC0AB,
-	50965 - 44032: 0xC0AC,
-	50966 - 44032: 0x9F9B,
-	50967 - 44032: 0xC0AD,
-	50968 - 44032: 0x9F9C,
-	50969 - 44032: 0xC0AE,
-	50970 - 44032: 0x9F9D,
-	50971 - 44032: 0x9F9E,
-	50972 - 44032: 0x9F9F,
-	50973 - 44032: 0x9FA0,
-	50974 - 44032: 0x9FA1,
-	50975 - 44032: 0x9FA2,
-	50976 - 44032: 0xC0AF,
-	50977 - 44032: 0xC0B0,
-	50978 - 44032: 0x9FA3,
-	50979 - 44032: 0x9FA4,
-	50980 - 44032: 0xC0B1,
-	50981 - 44032: 0x9FA5,
-	50982 - 44032: 0x9FA6,
-	50983 - 44032: 0x9FA7,
-	50984 - 44032: 0xC0B2,
-	50985 - 44032: 0x9FA8,
-	50986 - 44032: 0x9FA9,
-	50987 - 44032: 0x9FAA,
-	50988 - 44032: 0x9FAB,
-	50989 - 44032: 0x9FAC,
-	50990 - 44032: 0x9FAD,
-	50991 - 44032: 0x9FAE,
-	50992 - 44032: 0xC0B3,
-	50993 - 44032: 0xC0B4,
-	50994 - 44032: 0x9FAF,
-	50995 - 44032: 0xC0B5,
-	50996 - 44032: 0x9FB0,
-	50997 - 44032: 0xC0B6,
-	50998 - 44032: 0x9FB1,
-	50999 - 44032: 0xC0B7,
-	51000 - 44032: 0x9FB2,
-	51001 - 44032: 0x9FB3,
-	51002 - 44032: 0x9FB4,
-	51003 - 44032: 0x9FB5,
-	51004 - 44032: 0xC0B8,
-	51005 - 44032: 0xC0B9,
-	51006 - 44032: 0x9FB6,
-	51007 - 44032: 0x9FB7,
-	51008 - 44032: 0xC0BA,
-	51009 - 44032: 0x9FB8,
-	51010 - 44032: 0x9FB9,
-	51011 - 44032: 0x9FBA,
-	51012 - 44032: 0xC0BB,
-	51013 - 44032: 0x9FBB,
-	51014 - 44032: 0x9FBC,
-	51015 - 44032: 0x9FBD,
-	51016 - 44032: 0x9FBE,
-	51017 - 44032: 0x9FBF,
-	51018 - 44032: 0xC0BC,
-	51019 - 44032: 0x9FC0,
-	51020 - 44032: 0xC0BD,
-	51021 - 44032: 0xC0BE,
-	51022 - 44032: 0x9FC1,
-	51023 - 44032: 0xC0BF,
-	51024 - 44032: 0x9FC2,
-	51025 - 44032: 0xC0C0,
-	51026 - 44032: 0xC0C1,
-	51027 - 44032: 0xC0C2,
-	51028 - 44032: 0xC0C3,
-	51029 - 44032: 0xC0C4,
-	51030 - 44032: 0xC0C5,
-	51031 - 44032: 0xC0C6,
-	51032 - 44032: 0xC0C7,
-	51033 - 44032: 0x9FC3,
-	51034 - 44032: 0x9FC4,
-	51035 - 44032: 0x9FC5,
-	51036 - 44032: 0xC0C8,
-	51037 - 44032: 0x9FC6,
-	51038 - 44032: 0x9FC7,
-	51039 - 44032: 0x9FC8,
-	51040 - 44032: 0xC0C9,
-	51041 - 44032: 0x9FC9,
-	51042 - 44032: 0x9FCA,
-	51043 - 44032: 0x9FCB,
-	51044 - 44032: 0x9FCC,
-	51045 - 44032: 0x9FCD,
-	51046 - 44032: 0x9FCE,
-	51047 - 44032: 0x9FCF,
-	51048 - 44032: 0xC0CA,
-	51049 - 44032: 0x9FD0,
-	51050 - 44032: 0x9FD1,
-	51051 - 44032: 0xC0CB,
-	51052 - 44032: 0x9FD2,
-	51053 - 44032: 0x9FD3,
-	51054 - 44032: 0x9FD4,
-	51055 - 44032: 0x9FD5,
-	51056 - 44032: 0x9FD6,
-	51057 - 44032: 0x9FD7,
-	51058 - 44032: 0x9FD8,
-	51059 - 44032: 0x9FD9,
-	51060 - 44032: 0xC0CC,
-	51061 - 44032: 0xC0CD,
-	51062 - 44032: 0x9FDA,
-	51063 - 44032: 0x9FDB,
-	51064 - 44032: 0xC0CE,
-	51065 - 44032: 0x9FDC,
-	51066 - 44032: 0x9FDD,
-	51067 - 44032: 0x9FDE,
-	51068 - 44032: 0xC0CF,
-	51069 - 44032: 0xC0D0,
-	51070 - 44032: 0xC0D1,
-	51071 - 44032: 0x9FDF,
-	51072 - 44032: 0x9FE0,
-	51073 - 44032: 0x9FE1,
-	51074 - 44032: 0x9FE2,
-	51075 - 44032: 0xC0D2,
-	51076 - 44032: 0xC0D3,
-	51077 - 44032: 0xC0D4,
-	51078 - 44032: 0x9FE3,
-	51079 - 44032: 0xC0D5,
-	51080 - 44032: 0xC0D6,
-	51081 - 44032: 0xC0D7,
-	51082 - 44032: 0xC0D8,
-	51083 - 44032: 0x9FE4,
-	51084 - 44032: 0x9FE5,
-	51085 - 44032: 0x9FE6,
-	51086 - 44032: 0xC0D9,
-	51087 - 44032: 0x9FE7,
-	51088 - 44032: 0xC0DA,
-	51089 - 44032: 0xC0DB,
-	51090 - 44032: 0x9FE8,
-	51091 - 44032: 0x9FE9,
-	51092 - 44032: 0xC0DC,
-	51093 - 44032: 0x9FEA,
-	51094 - 44032: 0xC0DD,
-	51095 - 44032: 0xC0DE,
-	51096 - 44032: 0xC0DF,
-	51097 - 44032: 0x9FEB,
-	51098 - 44032: 0xC0E0,
-	51099 - 44032: 0x9FEC,
-	51100 - 44032: 0x9FED,
-	51101 - 44032: 0x9FEE,
-	51102 - 44032: 0x9FEF,
-	51103 - 44032: 0x9FF0,
-	51104 - 44032: 0xC0E1,
-	51105 - 44032: 0xC0E2,
-	51106 - 44032: 0x9FF1,
-	51107 - 44032: 0xC0E3,
-	51108 - 44032: 0xC0E4,
-	51109 - 44032: 0xC0E5,
-	51110 - 44032: 0xC0E6,
-	51111 - 44032: 0x9FF2,
-	51112 - 44032: 0x9FF3,
-	51113 - 44032: 0x9FF4,
-	51114 - 44032: 0x9FF5,
-	51115 - 44032: 0x9FF6,
-	51116 - 44032: 0xC0E7,
-	51117 - 44032: 0xC0E8,
-	51118 - 44032: 0x9FF7,
-	51119 - 44032: 0x9FF8,
-	51120 - 44032: 0xC0E9,
-	51121 - 44032: 0x9FF9,
-	51122 - 44032: 0x9FFA,
-	51123 - 44032: 0x9FFB,
-	51124 - 44032: 0xC0EA,
-	51125 - 44032: 0x9FFC,
-	51126 - 44032: 0x9FFD,
-	51127 - 44032: 0x9FFE,
-	51128 - 44032: 0xA041,
-	51129 - 44032: 0xA042,
-	51130 - 44032: 0xA043,
-	51131 - 44032: 0xA044,
-	51132 - 44032: 0xC0EB,
-	51133 - 44032: 0xC0EC,
-	51134 - 44032: 0xA045,
-	51135 - 44032: 0xC0ED,
-	51136 - 44032: 0xC0EE,
-	51137 - 44032: 0xC0EF,
-	51138 - 44032: 0xA046,
-	51139 - 44032: 0xA047,
-	51140 - 44032: 0xA048,
-	51141 - 44032: 0xA049,
-	51142 - 44032: 0xA04A,
-	51143 - 44032: 0xA04B,
-	51144 - 44032: 0xC0F0,
-	51145 - 44032: 0xC0F1,
-	51146 - 44032: 0xA04C,
-	51147 - 44032: 0xA04D,
-	51148 - 44032: 0xC0F2,
-	51149 - 44032: 0xA04E,
-	51150 - 44032: 0xC0F3,
-	51151 - 44032: 0xA04F,
-	51152 - 44032: 0xC0F4,
-	51153 - 44032: 0xA050,
-	51154 - 44032: 0xA051,
-	51155 - 44032: 0xA052,
-	51156 - 44032: 0xA053,
-	51157 - 44032: 0xA054,
-	51158 - 44032: 0xA055,
-	51159 - 44032: 0xA056,
-	51160 - 44032: 0xC0F5,
-	51161 - 44032: 0xA057,
-	51162 - 44032: 0xA058,
-	51163 - 44032: 0xA059,
-	51164 - 44032: 0xA05A,
-	51165 - 44032: 0xC0F6,
-	51166 - 44032: 0xA061,
-	51167 - 44032: 0xA062,
-	51168 - 44032: 0xA063,
-	51169 - 44032: 0xA064,
-	51170 - 44032: 0xA065,
-	51171 - 44032: 0xA066,
-	51172 - 44032: 0xC0F7,
-	51173 - 44032: 0xA067,
-	51174 - 44032: 0xA068,
-	51175 - 44032: 0xA069,
-	51176 - 44032: 0xC0F8,
-	51177 - 44032: 0xA06A,
-	51178 - 44032: 0xA06B,
-	51179 - 44032: 0xA06C,
-	51180 - 44032: 0xC0F9,
-	51181 - 44032: 0xA06D,
-	51182 - 44032: 0xA06E,
-	51183 - 44032: 0xA06F,
-	51184 - 44032: 0xA070,
-	51185 - 44032: 0xA071,
-	51186 - 44032: 0xA072,
-	51187 - 44032: 0xA073,
-	51188 - 44032: 0xA074,
-	51189 - 44032: 0xA075,
-	51190 - 44032: 0xA076,
-	51191 - 44032: 0xA077,
-	51192 - 44032: 0xA078,
-	51193 - 44032: 0xA079,
-	51194 - 44032: 0xA07A,
-	51195 - 44032: 0xA081,
-	51196 - 44032: 0xA082,
-	51197 - 44032: 0xA083,
-	51198 - 44032: 0xA084,
-	51199 - 44032: 0xA085,
-	51200 - 44032: 0xC0FA,
-	51201 - 44032: 0xC0FB,
-	51202 - 44032: 0xA086,
-	51203 - 44032: 0xA087,
-	51204 - 44032: 0xC0FC,
-	51205 - 44032: 0xA088,
-	51206 - 44032: 0xA089,
-	51207 - 44032: 0xA08A,
-	51208 - 44032: 0xC0FD,
-	51209 - 44032: 0xA08B,
-	51210 - 44032: 0xC0FE,
-	51211 - 44032: 0xA08C,
-	51212 - 44032: 0xA08D,
-	51213 - 44032: 0xA08E,
-	51214 - 44032: 0xA08F,
-	51215 - 44032: 0xA090,
-	51216 - 44032: 0xC1A1,
-	51217 - 44032: 0xC1A2,
-	51218 - 44032: 0xA091,
-	51219 - 44032: 0xC1A3,
-	51220 - 44032: 0xA092,
-	51221 - 44032: 0xC1A4,
-	51222 - 44032: 0xC1A5,
-	51223 - 44032: 0xA093,
-	51224 - 44032: 0xA094,
-	51225 - 44032: 0xA095,
-	51226 - 44032: 0xA096,
-	51227 - 44032: 0xA097,
-	51228 - 44032: 0xC1A6,
-	51229 - 44032: 0xC1A7,
-	51230 - 44032: 0xA098,
-	51231 - 44032: 0xA099,
-	51232 - 44032: 0xC1A8,
-	51233 - 44032: 0xA09A,
-	51234 - 44032: 0xA09B,
-	51235 - 44032: 0xA09C,
-	51236 - 44032: 0xC1A9,
-	51237 - 44032: 0xA09D,
-	51238 - 44032: 0xA09E,
-	51239 - 44032: 0xA09F,
-	51240 - 44032: 0xA0A0,
-	51241 - 44032: 0xA0A1,
-	51242 - 44032: 0xA0A2,
-	51243 - 44032: 0xA0A3,
-	51244 - 44032: 0xC1AA,
-	51245 - 44032: 0xC1AB,
-	51246 - 44032: 0xA0A4,
-	51247 - 44032: 0xC1AC,
-	51248 - 44032: 0xA0A5,
-	51249 - 44032: 0xC1AD,
-	51250 - 44032: 0xA0A6,
-	51251 - 44032: 0xA0A7,
-	51252 - 44032: 0xA0A8,
-	51253 - 44032: 0xA0A9,
-	51254 - 44032: 0xA0AA,
-	51255 - 44032: 0xA0AB,
-	51256 - 44032: 0xC1AE,
-	51257 - 44032: 0xA0AC,
-	51258 - 44032: 0xA0AD,
-	51259 - 44032: 0xA0AE,
-	51260 - 44032: 0xC1AF,
-	51261 - 44032: 0xA0AF,
-	51262 - 44032: 0xA0B0,
-	51263 - 44032: 0xA0B1,
-	51264 - 44032: 0xC1B0,
-	51265 - 44032: 0xA0B2,
-	51266 - 44032: 0xA0B3,
-	51267 - 44032: 0xA0B4,
-	51268 - 44032: 0xA0B5,
-	51269 - 44032: 0xA0B6,
-	51270 - 44032: 0xA0B7,
-	51271 - 44032: 0xA0B8,
-	51272 - 44032: 0xC1B1,
-	51273 - 44032: 0xC1B2,
-	51274 - 44032: 0xA0B9,
-	51275 - 44032: 0xA0BA,
-	51276 - 44032: 0xC1B3,
-	51277 - 44032: 0xC1B4,
-	51278 - 44032: 0xA0BB,
-	51279 - 44032: 0xA0BC,
-	51280 - 44032: 0xA0BD,
-	51281 - 44032: 0xA0BE,
-	51282 - 44032: 0xA0BF,
-	51283 - 44032: 0xA0C0,
-	51284 - 44032: 0xC1B5,
-	51285 - 44032: 0xA0C1,
-	51286 - 44032: 0xA0C2,
-	51287 - 44032: 0xA0C3,
-	51288 - 44032: 0xA0C4,
-	51289 - 44032: 0xA0C5,
-	51290 - 44032: 0xA0C6,
-	51291 - 44032: 0xA0C7,
-	51292 - 44032: 0xA0C8,
-	51293 - 44032: 0xA0C9,
-	51294 - 44032: 0xA0CA,
-	51295 - 44032: 0xA0CB,
-	51296 - 44032: 0xA0CC,
-	51297 - 44032: 0xA0CD,
-	51298 - 44032: 0xA0CE,
-	51299 - 44032: 0xA0CF,
-	51300 - 44032: 0xA0D0,
-	51301 - 44032: 0xA0D1,
-	51302 - 44032: 0xA0D2,
-	51303 - 44032: 0xA0D3,
-	51304 - 44032: 0xA0D4,
-	51305 - 44032: 0xA0D5,
-	51306 - 44032: 0xA0D6,
-	51307 - 44032: 0xA0D7,
-	51308 - 44032: 0xA0D8,
-	51309 - 44032: 0xA0D9,
-	51310 - 44032: 0xA0DA,
-	51311 - 44032: 0xA0DB,
-	51312 - 44032: 0xC1B6,
-	51313 - 44032: 0xC1B7,
-	51314 - 44032: 0xA0DC,
-	51315 - 44032: 0xA0DD,
-	51316 - 44032: 0xC1B8,
-	51317 - 44032: 0xA0DE,
-	51318 - 44032: 0xA0DF,
-	51319 - 44032: 0xA0E0,
-	51320 - 44032: 0xC1B9,
-	51321 - 44032: 0xA0E1,
-	51322 - 44032: 0xC1BA,
-	51323 - 44032: 0xA0E2,
-	51324 - 44032: 0xA0E3,
-	51325 - 44032: 0xA0E4,
-	51326 - 44032: 0xA0E5,
-	51327 - 44032: 0xA0E6,
-	51328 - 44032: 0xC1BB,
-	51329 - 44032: 0xC1BC,
-	51330 - 44032: 0xA0E7,
-	51331 - 44032: 0xC1BD,
-	51332 - 44032: 0xA0E8,
-	51333 - 44032: 0xC1BE,
-	51334 - 44032: 0xC1BF,
-	51335 - 44032: 0xC1C0,
-	51336 - 44032: 0xA0E9,
-	51337 - 44032: 0xA0EA,
-	51338 - 44032: 0xA0EB,
-	51339 - 44032: 0xC1C1,
-	51340 - 44032: 0xC1C2,
-	51341 - 44032: 0xC1C3,
-	51342 - 44032: 0xA0EC,
-	51343 - 44032: 0xA0ED,
-	51344 - 44032: 0xA0EE,
-	51345 - 44032: 0xA0EF,
-	51346 - 44032: 0xA0F0,
-	51347 - 44032: 0xA0F1,
-	51348 - 44032: 0xC1C4,
-	51349 - 44032: 0xA0F2,
-	51350 - 44032: 0xA0F3,
-	51351 - 44032: 0xA0F4,
-	51352 - 44032: 0xA0F5,
-	51353 - 44032: 0xA0F6,
-	51354 - 44032: 0xA0F7,
-	51355 - 44032: 0xA0F8,
-	51356 - 44032: 0xA0F9,
-	51357 - 44032: 0xC1C5,
-	51358 - 44032: 0xA0FA,
-	51359 - 44032: 0xC1C6,
-	51360 - 44032: 0xA0FB,
-	51361 - 44032: 0xC1C7,
-	51362 - 44032: 0xA0FC,
-	51363 - 44032: 0xA0FD,
-	51364 - 44032: 0xA0FE,
-	51365 - 44032: 0xA141,
-	51366 - 44032: 0xA142,
-	51367 - 44032: 0xA143,
-	51368 - 44032: 0xC1C8,
-	51369 - 44032: 0xA144,
-	51370 - 44032: 0xA145,
-	51371 - 44032: 0xA146,
-	51372 - 44032: 0xA147,
-	51373 - 44032: 0xA148,
-	51374 - 44032: 0xA149,
-	51375 - 44032: 0xA14A,
-	51376 - 44032: 0xA14B,
-	51377 - 44032: 0xA14C,
-	51378 - 44032: 0xA14D,
-	51379 - 44032: 0xA14E,
-	51380 - 44032: 0xA14F,
-	51381 - 44032: 0xA150,
-	51382 - 44032: 0xA151,
-	51383 - 44032: 0xA152,
-	51384 - 44032: 0xA153,
-	51385 - 44032: 0xA154,
-	51386 - 44032: 0xA155,
-	51387 - 44032: 0xA156,
-	51388 - 44032: 0xC1C9,
-	51389 - 44032: 0xC1CA,
-	51390 - 44032: 0xA157,
-	51391 - 44032: 0xA158,
-	51392 - 44032: 0xA159,
-	51393 - 44032: 0xA15A,
-	51394 - 44032: 0xA161,
-	51395 - 44032: 0xA162,
-	51396 - 44032: 0xC1CB,
-	51397 - 44032: 0xA163,
-	51398 - 44032: 0xA164,
-	51399 - 44032: 0xA165,
-	51400 - 44032: 0xC1CC,
-	51401 - 44032: 0xA166,
-	51402 - 44032: 0xA167,
-	51403 - 44032: 0xA168,
-	51404 - 44032: 0xC1CD,
-	51405 - 44032: 0xA169,
-	51406 - 44032: 0xA16A,
-	51407 - 44032: 0xA16B,
-	51408 - 44032: 0xA16C,
-	51409 - 44032: 0xA16D,
-	51410 - 44032: 0xA16E,
-	51411 - 44032: 0xA16F,
-	51412 - 44032: 0xC1CE,
-	51413 - 44032: 0xC1CF,
-	51414 - 44032: 0xA170,
-	51415 - 44032: 0xC1D0,
-	51416 - 44032: 0xA171,
-	51417 - 44032: 0xC1D1,
-	51418 - 44032: 0xA172,
-	51419 - 44032: 0xA173,
-	51420 - 44032: 0xA174,
-	51421 - 44032: 0xA175,
-	51422 - 44032: 0xA176,
-	51423 - 44032: 0xA177,
-	51424 - 44032: 0xC1D2,
-	51425 - 44032: 0xC1D3,
-	51426 - 44032: 0xA178,
-	51427 - 44032: 0xA179,
-	51428 - 44032: 0xC1D4,
-	51429 - 44032: 0xA17A,
-	51430 - 44032: 0xA181,
-	51431 - 44032: 0xA182,
-	51432 - 44032: 0xA183,
-	51433 - 44032: 0xA184,
-	51434 - 44032: 0xA185,
-	51435 - 44032: 0xA186,
-	51436 - 44032: 0xA187,
-	51437 - 44032: 0xA188,
-	51438 - 44032: 0xA189,
-	51439 - 44032: 0xA18A,
-	51440 - 44032: 0xA18B,
-	51441 - 44032: 0xA18C,
-	51442 - 44032: 0xA18D,
-	51443 - 44032: 0xA18E,
-	51444 - 44032: 0xA18F,
-	51445 - 44032: 0xC1D5,
-	51446 - 44032: 0xA190,
-	51447 - 44032: 0xA191,
-	51448 - 44032: 0xA192,
-	51449 - 44032: 0xA193,
-	51450 - 44032: 0xA194,
-	51451 - 44032: 0xA195,
-	51452 - 44032: 0xC1D6,
-	51453 - 44032: 0xC1D7,
-	51454 - 44032: 0xA196,
-	51455 - 44032: 0xA197,
-	51456 - 44032: 0xC1D8,
-	51457 - 44032: 0xA198,
-	51458 - 44032: 0xA199,
-	51459 - 44032: 0xA19A,
-	51460 - 44032: 0xC1D9,
-	51461 - 44032: 0xC1DA,
-	51462 - 44032: 0xC1DB,
-	51463 - 44032: 0xA19B,
-	51464 - 44032: 0xA19C,
-	51465 - 44032: 0xA19D,
-	51466 - 44032: 0xA19E,
-	51467 - 44032: 0xA19F,
-	51468 - 44032: 0xC1DC,
-	51469 - 44032: 0xC1DD,
-	51470 - 44032: 0xA1A0,
-	51471 - 44032: 0xC1DE,
-	51472 - 44032: 0xA241,
-	51473 - 44032: 0xC1DF,
-	51474 - 44032: 0xA242,
-	51475 - 44032: 0xA243,
-	51476 - 44032: 0xA244,
-	51477 - 44032: 0xA245,
-	51478 - 44032: 0xA246,
-	51479 - 44032: 0xA247,
-	51480 - 44032: 0xC1E0,
-	51481 - 44032: 0xA248,
-	51482 - 44032: 0xA249,
-	51483 - 44032: 0xA24A,
-	51484 - 44032: 0xA24B,
-	51485 - 44032: 0xA24C,
-	51486 - 44032: 0xA24D,
-	51487 - 44032: 0xA24E,
-	51488 - 44032: 0xA24F,
-	51489 - 44032: 0xA250,
-	51490 - 44032: 0xA251,
-	51491 - 44032: 0xA252,
-	51492 - 44032: 0xA253,
-	51493 - 44032: 0xA254,
-	51494 - 44032: 0xA255,
-	51495 - 44032: 0xA256,
-	51496 - 44032: 0xA257,
-	51497 - 44032: 0xA258,
-	51498 - 44032: 0xA259,
-	51499 - 44032: 0xA25A,
-	51500 - 44032: 0xC1E1,
-	51501 - 44032: 0xA261,
-	51502 - 44032: 0xA262,
-	51503 - 44032: 0xA263,
-	51504 - 44032: 0xA264,
-	51505 - 44032: 0xA265,
-	51506 - 44032: 0xA266,
-	51507 - 44032: 0xA267,
-	51508 - 44032: 0xC1E2,
-	51509 - 44032: 0xA268,
-	51510 - 44032: 0xA269,
-	51511 - 44032: 0xA26A,
-	51512 - 44032: 0xA26B,
-	51513 - 44032: 0xA26C,
-	51514 - 44032: 0xA26D,
-	51515 - 44032: 0xA26E,
-	51516 - 44032: 0xA26F,
-	51517 - 44032: 0xA270,
-	51518 - 44032: 0xA271,
-	51519 - 44032: 0xA272,
-	51520 - 44032: 0xA273,
-	51521 - 44032: 0xA274,
-	51522 - 44032: 0xA275,
-	51523 - 44032: 0xA276,
-	51524 - 44032: 0xA277,
-	51525 - 44032: 0xA278,
-	51526 - 44032: 0xA279,
-	51527 - 44032: 0xA27A,
-	51528 - 44032: 0xA281,
-	51529 - 44032: 0xA282,
-	51530 - 44032: 0xA283,
-	51531 - 44032: 0xA284,
-	51532 - 44032: 0xA285,
-	51533 - 44032: 0xA286,
-	51534 - 44032: 0xA287,
-	51535 - 44032: 0xA288,
-	51536 - 44032: 0xC1E3,
-	51537 - 44032: 0xC1E4,
-	51538 - 44032: 0xA289,
-	51539 - 44032: 0xA28A,
-	51540 - 44032: 0xC1E5,
-	51541 - 44032: 0xA28B,
-	51542 - 44032: 0xA28C,
-	51543 - 44032: 0xA28D,
-	51544 - 44032: 0xC1E6,
-	51545 - 44032: 0xA28E,
-	51546 - 44032: 0xA28F,
-	51547 - 44032: 0xA290,
-	51548 - 44032: 0xA291,
-	51549 - 44032: 0xA292,
-	51550 - 44032: 0xA293,
-	51551 - 44032: 0xA294,
-	51552 - 44032: 0xC1E7,
-	51553 - 44032: 0xC1E8,
-	51554 - 44032: 0xA295,
-	51555 - 44032: 0xC1E9,
-	51556 - 44032: 0xA296,
-	51557 - 44032: 0xA297,
-	51558 - 44032: 0xA298,
-	51559 - 44032: 0xA299,
-	51560 - 44032: 0xA29A,
-	51561 - 44032: 0xA29B,
-	51562 - 44032: 0xA29C,
-	51563 - 44032: 0xA29D,
-	51564 - 44032: 0xC1EA,
-	51565 - 44032: 0xA29E,
-	51566 - 44032: 0xA29F,
-	51567 - 44032: 0xA2A0,
-	51568 - 44032: 0xC1EB,
-	51569 - 44032: 0xA341,
-	51570 - 44032: 0xA342,
-	51571 - 44032: 0xA343,
-	51572 - 44032: 0xC1EC,
-	51573 - 44032: 0xA344,
-	51574 - 44032: 0xA345,
-	51575 - 44032: 0xA346,
-	51576 - 44032: 0xA347,
-	51577 - 44032: 0xA348,
-	51578 - 44032: 0xA349,
-	51579 - 44032: 0xA34A,
-	51580 - 44032: 0xC1ED,
-	51581 - 44032: 0xA34B,
-	51582 - 44032: 0xA34C,
-	51583 - 44032: 0xA34D,
-	51584 - 44032: 0xA34E,
-	51585 - 44032: 0xA34F,
-	51586 - 44032: 0xA350,
-	51587 - 44032: 0xA351,
-	51588 - 44032: 0xA352,
-	51589 - 44032: 0xA353,
-	51590 - 44032: 0xA354,
-	51591 - 44032: 0xA355,
-	51592 - 44032: 0xC1EE,
-	51593 - 44032: 0xC1EF,
-	51594 - 44032: 0xA356,
-	51595 - 44032: 0xA357,
-	51596 - 44032: 0xC1F0,
-	51597 - 44032: 0xA358,
-	51598 - 44032: 0xA359,
-	51599 - 44032: 0xA35A,
-	51600 - 44032: 0xC1F1,
-	51601 - 44032: 0xA361,
-	51602 - 44032: 0xA362,
-	51603 - 44032: 0xA363,
-	51604 - 44032: 0xA364,
-	51605 - 44032: 0xA365,
-	51606 - 44032: 0xA366,
-	51607 - 44032: 0xA367,
-	51608 - 44032: 0xC1F2,
-	51609 - 44032: 0xC1F3,
-	51610 - 44032: 0xA368,
-	51611 - 44032: 0xC1F4,
-	51612 - 44032: 0xA369,
-	51613 - 44032: 0xC1F5,
-	51614 - 44032: 0xA36A,
-	51615 - 44032: 0xA36B,
-	51616 - 44032: 0xA36C,
-	51617 - 44032: 0xA36D,
-	51618 - 44032: 0xA36E,
-	51619 - 44032: 0xA36F,
-	51620 - 44032: 0xA370,
-	51621 - 44032: 0xA371,
-	51622 - 44032: 0xA372,
-	51623 - 44032: 0xA373,
-	51624 - 44032: 0xA374,
-	51625 - 44032: 0xA375,
-	51626 - 44032: 0xA376,
-	51627 - 44032: 0xA377,
-	51628 - 44032: 0xA378,
-	51629 - 44032: 0xA379,
-	51630 - 44032: 0xA37A,
-	51631 - 44032: 0xA381,
-	51632 - 44032: 0xA382,
-	51633 - 44032: 0xA383,
-	51634 - 44032: 0xA384,
-	51635 - 44032: 0xA385,
-	51636 - 44032: 0xA386,
-	51637 - 44032: 0xA387,
-	51638 - 44032: 0xA388,
-	51639 - 44032: 0xA389,
-	51640 - 44032: 0xA38A,
-	51641 - 44032: 0xA38B,
-	51642 - 44032: 0xA38C,
-	51643 - 44032: 0xA38D,
-	51644 - 44032: 0xA38E,
-	51645 - 44032: 0xA38F,
-	51646 - 44032: 0xA390,
-	51647 - 44032: 0xA391,
-	51648 - 44032: 0xC1F6,
-	51649 - 44032: 0xC1F7,
-	51650 - 44032: 0xA392,
-	51651 - 44032: 0xA393,
-	51652 - 44032: 0xC1F8,
-	51653 - 44032: 0xA394,
-	51654 - 44032: 0xA395,
-	51655 - 44032: 0xC1F9,
-	51656 - 44032: 0xC1FA,
-	51657 - 44032: 0xA396,
-	51658 - 44032: 0xC1FB,
-	51659 - 44032: 0xA397,
-	51660 - 44032: 0xA398,
-	51661 - 44032: 0xA399,
-	51662 - 44032: 0xA39A,
-	51663 - 44032: 0xA39B,
-	51664 - 44032: 0xC1FC,
-	51665 - 44032: 0xC1FD,
-	51666 - 44032: 0xA39C,
-	51667 - 44032: 0xC1FE,
-	51668 - 44032: 0xA39D,
-	51669 - 44032: 0xC2A1,
-	51670 - 44032: 0xC2A2,
-	51671 - 44032: 0xA39E,
-	51672 - 44032: 0xA39F,
-	51673 - 44032: 0xC2A3,
-	51674 - 44032: 0xC2A4,
-	51675 - 44032: 0xA3A0,
-	51676 - 44032: 0xC2A5,
-	51677 - 44032: 0xC2A6,
-	51678 - 44032: 0xA441,
-	51679 - 44032: 0xA442,
-	51680 - 44032: 0xC2A7,
-	51681 - 44032: 0xA443,
-	51682 - 44032: 0xC2A8,
-	51683 - 44032: 0xA444,
-	51684 - 44032: 0xC2A9,
-	51685 - 44032: 0xA445,
-	51686 - 44032: 0xA446,
-	51687 - 44032: 0xC2AA,
-	51688 - 44032: 0xA447,
-	51689 - 44032: 0xA448,
-	51690 - 44032: 0xA449,
-	51691 - 44032: 0xA44A,
-	51692 - 44032: 0xC2AB,
-	51693 - 44032: 0xC2AC,
-	51694 - 44032: 0xA44B,
-	51695 - 44032: 0xC2AD,
-	51696 - 44032: 0xC2AE,
-	51697 - 44032: 0xC2AF,
-	51698 - 44032: 0xA44C,
-	51699 - 44032: 0xA44D,
-	51700 - 44032: 0xA44E,
-	51701 - 44032: 0xA44F,
-	51702 - 44032: 0xA450,
-	51703 - 44032: 0xA451,
-	51704 - 44032: 0xC2B0,
-	51705 - 44032: 0xC2B1,
-	51706 - 44032: 0xA452,
-	51707 - 44032: 0xA453,
-	51708 - 44032: 0xC2B2,
-	51709 - 44032: 0xA454,
-	51710 - 44032: 0xA455,
-	51711 - 44032: 0xA456,
-	51712 - 44032: 0xC2B3,
-	51713 - 44032: 0xA457,
-	51714 - 44032: 0xA458,
-	51715 - 44032: 0xA459,
-	51716 - 44032: 0xA45A,
-	51717 - 44032: 0xA461,
-	51718 - 44032: 0xA462,
-	51719 - 44032: 0xA463,
-	51720 - 44032: 0xC2B4,
-	51721 - 44032: 0xC2B5,
-	51722 - 44032: 0xA464,
-	51723 - 44032: 0xC2B6,
-	51724 - 44032: 0xC2B7,
-	51725 - 44032: 0xC2B8,
-	51726 - 44032: 0xA465,
-	51727 - 44032: 0xA466,
-	51728 - 44032: 0xA467,
-	51729 - 44032: 0xA468,
-	51730 - 44032: 0xA469,
-	51731 - 44032: 0xA46A,
-	51732 - 44032: 0xC2B9,
-	51733 - 44032: 0xA46B,
-	51734 - 44032: 0xA46C,
-	51735 - 44032: 0xA46D,
-	51736 - 44032: 0xC2BA,
-	51737 - 44032: 0xA46E,
-	51738 - 44032: 0xA46F,
-	51739 - 44032: 0xA470,
-	51740 - 44032: 0xA471,
-	51741 - 44032: 0xA472,
-	51742 - 44032: 0xA473,
-	51743 - 44032: 0xA474,
-	51744 - 44032: 0xA475,
-	51745 - 44032: 0xA476,
-	51746 - 44032: 0xA477,
-	51747 - 44032: 0xA478,
-	51748 - 44032: 0xA479,
-	51749 - 44032: 0xA47A,
-	51750 - 44032: 0xA481,
-	51751 - 44032: 0xA482,
-	51752 - 44032: 0xA483,
-	51753 - 44032: 0xC2BB,
-	51754 - 44032: 0xA484,
-	51755 - 44032: 0xA485,
-	51756 - 44032: 0xA486,
-	51757 - 44032: 0xA487,
-	51758 - 44032: 0xA488,
-	51759 - 44032: 0xA489,
-	51760 - 44032: 0xA48A,
-	51761 - 44032: 0xA48B,
-	51762 - 44032: 0xA48C,
-	51763 - 44032: 0xA48D,
-	51764 - 44032: 0xA48E,
-	51765 - 44032: 0xA48F,
-	51766 - 44032: 0xA490,
-	51767 - 44032: 0xA491,
-	51768 - 44032: 0xA492,
-	51769 - 44032: 0xA493,
-	51770 - 44032: 0xA494,
-	51771 - 44032: 0xA495,
-	51772 - 44032: 0xA496,
-	51773 - 44032: 0xA497,
-	51774 - 44032: 0xA498,
-	51775 - 44032: 0xA499,
-	51776 - 44032: 0xA49A,
-	51777 - 44032: 0xA49B,
-	51778 - 44032: 0xA49C,
-	51779 - 44032: 0xA49D,
-	51780 - 44032: 0xA49E,
-	51781 - 44032: 0xA49F,
-	51782 - 44032: 0xA4A0,
-	51783 - 44032: 0xA541,
-	51784 - 44032: 0xA542,
-	51785 - 44032: 0xA543,
-	51786 - 44032: 0xA544,
-	51787 - 44032: 0xA545,
-	51788 - 44032: 0xC2BC,
-	51789 - 44032: 0xC2BD,
-	51790 - 44032: 0xA546,
-	51791 - 44032: 0xA547,
-	51792 - 44032: 0xC2BE,
-	51793 - 44032: 0xA548,
-	51794 - 44032: 0xA549,
-	51795 - 44032: 0xA54A,
-	51796 - 44032: 0xC2BF,
-	51797 - 44032: 0xA54B,
-	51798 - 44032: 0xA54C,
-	51799 - 44032: 0xA54D,
-	51800 - 44032: 0xA54E,
-	51801 - 44032: 0xA54F,
-	51802 - 44032: 0xA550,
-	51803 - 44032: 0xA551,
-	51804 - 44032: 0xC2C0,
-	51805 - 44032: 0xC2C1,
-	51806 - 44032: 0xA552,
-	51807 - 44032: 0xC2C2,
-	51808 - 44032: 0xC2C3,
-	51809 - 44032: 0xC2C4,
-	51810 - 44032: 0xA553,
-	51811 - 44032: 0xA554,
-	51812 - 44032: 0xA555,
-	51813 - 44032: 0xA556,
-	51814 - 44032: 0xA557,
-	51815 - 44032: 0xA558,
-	51816 - 44032: 0xC2C5,
-	51817 - 44032: 0xA559,
-	51818 - 44032: 0xA55A,
-	51819 - 44032: 0xA561,
-	51820 - 44032: 0xA562,
-	51821 - 44032: 0xA563,
-	51822 - 44032: 0xA564,
-	51823 - 44032: 0xA565,
-	51824 - 44032: 0xA566,
-	51825 - 44032: 0xA567,
-	51826 - 44032: 0xA568,
-	51827 - 44032: 0xA569,
-	51828 - 44032: 0xA56A,
-	51829 - 44032: 0xA56B,
-	51830 - 44032: 0xA56C,
-	51831 - 44032: 0xA56D,
-	51832 - 44032: 0xA56E,
-	51833 - 44032: 0xA56F,
-	51834 - 44032: 0xA570,
-	51835 - 44032: 0xA571,
-	51836 - 44032: 0xA572,
-	51837 - 44032: 0xC2C6,
-	51838 - 44032: 0xA573,
-	51839 - 44032: 0xA574,
-	51840 - 44032: 0xA575,
-	51841 - 44032: 0xA576,
-	51842 - 44032: 0xA577,
-	51843 - 44032: 0xA578,
-	51844 - 44032: 0xC2C7,
-	51845 - 44032: 0xA579,
-	51846 - 44032: 0xA57A,
-	51847 - 44032: 0xA581,
-	51848 - 44032: 0xA582,
-	51849 - 44032: 0xA583,
-	51850 - 44032: 0xA584,
-	51851 - 44032: 0xA585,
-	51852 - 44032: 0xA586,
-	51853 - 44032: 0xA587,
-	51854 - 44032: 0xA588,
-	51855 - 44032: 0xA589,
-	51856 - 44032: 0xA58A,
-	51857 - 44032: 0xA58B,
-	51858 - 44032: 0xA58C,
-	51859 - 44032: 0xA58D,
-	51860 - 44032: 0xA58E,
-	51861 - 44032: 0xA58F,
-	51862 - 44032: 0xA590,
-	51863 - 44032: 0xA591,
-	51864 - 44032: 0xC2C8,
-	51865 - 44032: 0xA592,
-	51866 - 44032: 0xA593,
-	51867 - 44032: 0xA594,
-	51868 - 44032: 0xA595,
-	51869 - 44032: 0xA596,
-	51870 - 44032: 0xA597,
-	51871 - 44032: 0xA598,
-	51872 - 44032: 0xA599,
-	51873 - 44032: 0xA59A,
-	51874 - 44032: 0xA59B,
-	51875 - 44032: 0xA59C,
-	51876 - 44032: 0xA59D,
-	51877 - 44032: 0xA59E,
-	51878 - 44032: 0xA59F,
-	51879 - 44032: 0xA5A0,
-	51880 - 44032: 0xA641,
-	51881 - 44032: 0xA642,
-	51882 - 44032: 0xA643,
-	51883 - 44032: 0xA644,
-	51884 - 44032: 0xA645,
-	51885 - 44032: 0xA646,
-	51886 - 44032: 0xA647,
-	51887 - 44032: 0xA648,
-	51888 - 44032: 0xA649,
-	51889 - 44032: 0xA64A,
-	51890 - 44032: 0xA64B,
-	51891 - 44032: 0xA64C,
-	51892 - 44032: 0xA64D,
-	51893 - 44032: 0xA64E,
-	51894 - 44032: 0xA64F,
-	51895 - 44032: 0xA650,
-	51896 - 44032: 0xA651,
-	51897 - 44032: 0xA652,
-	51898 - 44032: 0xA653,
-	51899 - 44032: 0xA654,
-	51900 - 44032: 0xC2C9,
-	51901 - 44032: 0xC2CA,
-	51902 - 44032: 0xA655,
-	51903 - 44032: 0xA656,
-	51904 - 44032: 0xC2CB,
-	51905 - 44032: 0xA657,
-	51906 - 44032: 0xA658,
-	51907 - 44032: 0xA659,
-	51908 - 44032: 0xC2CC,
-	51909 - 44032: 0xA65A,
-	51910 - 44032: 0xA661,
-	51911 - 44032: 0xA662,
-	51912 - 44032: 0xA663,
-	51913 - 44032: 0xA664,
-	51914 - 44032: 0xA665,
-	51915 - 44032: 0xA666,
-	51916 - 44032: 0xC2CD,
-	51917 - 44032: 0xC2CE,
-	51918 - 44032: 0xA667,
-	51919 - 44032: 0xC2CF,
-	51920 - 44032: 0xA668,
-	51921 - 44032: 0xC2D0,
-	51922 - 44032: 0xA669,
-	51923 - 44032: 0xC2D1,
-	51924 - 44032: 0xA66A,
-	51925 - 44032: 0xA66B,
-	51926 - 44032: 0xA66C,
-	51927 - 44032: 0xA66D,
-	51928 - 44032: 0xC2D2,
-	51929 - 44032: 0xC2D3,
-	51930 - 44032: 0xA66E,
-	51931 - 44032: 0xA66F,
-	51932 - 44032: 0xA670,
-	51933 - 44032: 0xA671,
-	51934 - 44032: 0xA672,
-	51935 - 44032: 0xA673,
-	51936 - 44032: 0xC2D4,
-	51937 - 44032: 0xA674,
-	51938 - 44032: 0xA675,
-	51939 - 44032: 0xA676,
-	51940 - 44032: 0xA677,
-	51941 - 44032: 0xA678,
-	51942 - 44032: 0xA679,
-	51943 - 44032: 0xA67A,
-	51944 - 44032: 0xA681,
-	51945 - 44032: 0xA682,
-	51946 - 44032: 0xA683,
-	51947 - 44032: 0xA684,
-	51948 - 44032: 0xC2D5,
-	51949 - 44032: 0xA685,
-	51950 - 44032: 0xA686,
-	51951 - 44032: 0xA687,
-	51952 - 44032: 0xA688,
-	51953 - 44032: 0xA689,
-	51954 - 44032: 0xA68A,
-	51955 - 44032: 0xA68B,
-	51956 - 44032: 0xC2D6,
-	51957 - 44032: 0xA68C,
-	51958 - 44032: 0xA68D,
-	51959 - 44032: 0xA68E,
-	51960 - 44032: 0xA68F,
-	51961 - 44032: 0xA690,
-	51962 - 44032: 0xA691,
-	51963 - 44032: 0xA692,
-	51964 - 44032: 0xA693,
-	51965 - 44032: 0xA694,
-	51966 - 44032: 0xA695,
-	51967 - 44032: 0xA696,
-	51968 - 44032: 0xA697,
-	51969 - 44032: 0xA698,
-	51970 - 44032: 0xA699,
-	51971 - 44032: 0xA69A,
-	51972 - 44032: 0xA69B,
-	51973 - 44032: 0xA69C,
-	51974 - 44032: 0xA69D,
-	51975 - 44032: 0xA69E,
-	51976 - 44032: 0xC2D7,
-	51977 - 44032: 0xA69F,
-	51978 - 44032: 0xA6A0,
-	51979 - 44032: 0xA741,
-	51980 - 44032: 0xA742,
-	51981 - 44032: 0xA743,
-	51982 - 44032: 0xA744,
-	51983 - 44032: 0xA745,
-	51984 - 44032: 0xC2D8,
-	51985 - 44032: 0xA746,
-	51986 - 44032: 0xA747,
-	51987 - 44032: 0xA748,
-	51988 - 44032: 0xC2D9,
-	51989 - 44032: 0xA749,
-	51990 - 44032: 0xA74A,
-	51991 - 44032: 0xA74B,
-	51992 - 44032: 0xC2DA,
-	51993 - 44032: 0xA74C,
-	51994 - 44032: 0xA74D,
-	51995 - 44032: 0xA74E,
-	51996 - 44032: 0xA74F,
-	51997 - 44032: 0xA750,
-	51998 - 44032: 0xA751,
-	51999 - 44032: 0xA752,
-	52000 - 44032: 0xC2DB,
-	52001 - 44032: 0xC2DC,
-	52002 - 44032: 0xA753,
-	52003 - 44032: 0xA754,
-	52004 - 44032: 0xA755,
-	52005 - 44032: 0xA756,
-	52006 - 44032: 0xA757,
-	52007 - 44032: 0xA758,
-	52008 - 44032: 0xA759,
-	52009 - 44032: 0xA75A,
-	52010 - 44032: 0xA761,
-	52011 - 44032: 0xA762,
-	52012 - 44032: 0xA763,
-	52013 - 44032: 0xA764,
-	52014 - 44032: 0xA765,
-	52015 - 44032: 0xA766,
-	52016 - 44032: 0xA767,
-	52017 - 44032: 0xA768,
-	52018 - 44032: 0xA769,
-	52019 - 44032: 0xA76A,
-	52020 - 44032: 0xA76B,
-	52021 - 44032: 0xA76C,
-	52022 - 44032: 0xA76D,
-	52023 - 44032: 0xA76E,
-	52024 - 44032: 0xA76F,
-	52025 - 44032: 0xA770,
-	52026 - 44032: 0xA771,
-	52027 - 44032: 0xA772,
-	52028 - 44032: 0xA773,
-	52029 - 44032: 0xA774,
-	52030 - 44032: 0xA775,
-	52031 - 44032: 0xA776,
-	52032 - 44032: 0xA777,
-	52033 - 44032: 0xC2DD,
-	52034 - 44032: 0xA778,
-	52035 - 44032: 0xA779,
-	52036 - 44032: 0xA77A,
-	52037 - 44032: 0xA781,
-	52038 - 44032: 0xA782,
-	52039 - 44032: 0xA783,
-	52040 - 44032: 0xC2DE,
-	52041 - 44032: 0xC2DF,
-	52042 - 44032: 0xA784,
-	52043 - 44032: 0xA785,
-	52044 - 44032: 0xC2E0,
-	52045 - 44032: 0xA786,
-	52046 - 44032: 0xA787,
-	52047 - 44032: 0xA788,
-	52048 - 44032: 0xC2E1,
-	52049 - 44032: 0xA789,
-	52050 - 44032: 0xA78A,
-	52051 - 44032: 0xA78B,
-	52052 - 44032: 0xA78C,
-	52053 - 44032: 0xA78D,
-	52054 - 44032: 0xA78E,
-	52055 - 44032: 0xA78F,
-	52056 - 44032: 0xC2E2,
-	52057 - 44032: 0xC2E3,
-	52058 - 44032: 0xA790,
-	52059 - 44032: 0xA791,
-	52060 - 44032: 0xA792,
-	52061 - 44032: 0xC2E4,
-	52062 - 44032: 0xA793,
-	52063 - 44032: 0xA794,
-	52064 - 44032: 0xA795,
-	52065 - 44032: 0xA796,
-	52066 - 44032: 0xA797,
-	52067 - 44032: 0xA798,
-	52068 - 44032: 0xC2E5,
-	52069 - 44032: 0xA799,
-	52070 - 44032: 0xA79A,
-	52071 - 44032: 0xA79B,
-	52072 - 44032: 0xA79C,
-	52073 - 44032: 0xA79D,
-	52074 - 44032: 0xA79E,
-	52075 - 44032: 0xA79F,
-	52076 - 44032: 0xA7A0,
-	52077 - 44032: 0xA841,
-	52078 - 44032: 0xA842,
-	52079 - 44032: 0xA843,
-	52080 - 44032: 0xA844,
-	52081 - 44032: 0xA845,
-	52082 - 44032: 0xA846,
-	52083 - 44032: 0xA847,
-	52084 - 44032: 0xA848,
-	52085 - 44032: 0xA849,
-	52086 - 44032: 0xA84A,
-	52087 - 44032: 0xA84B,
-	52088 - 44032: 0xC2E6,
-	52089 - 44032: 0xC2E7,
-	52090 - 44032: 0xA84C,
-	52091 - 44032: 0xA84D,
-	52092 - 44032: 0xA84E,
-	52093 - 44032: 0xA84F,
-	52094 - 44032: 0xA850,
-	52095 - 44032: 0xA851,
-	52096 - 44032: 0xA852,
-	52097 - 44032: 0xA853,
-	52098 - 44032: 0xA854,
-	52099 - 44032: 0xA855,
-	52100 - 44032: 0xA856,
-	52101 - 44032: 0xA857,
-	52102 - 44032: 0xA858,
-	52103 - 44032: 0xA859,
-	52104 - 44032: 0xA85A,
-	52105 - 44032: 0xA861,
-	52106 - 44032: 0xA862,
-	52107 - 44032: 0xA863,
-	52108 - 44032: 0xA864,
-	52109 - 44032: 0xA865,
-	52110 - 44032: 0xA866,
-	52111 - 44032: 0xA867,
-	52112 - 44032: 0xA868,
-	52113 - 44032: 0xA869,
-	52114 - 44032: 0xA86A,
-	52115 - 44032: 0xA86B,
-	52116 - 44032: 0xA86C,
-	52117 - 44032: 0xA86D,
-	52118 - 44032: 0xA86E,
-	52119 - 44032: 0xA86F,
-	52120 - 44032: 0xA870,
-	52121 - 44032: 0xA871,
-	52122 - 44032: 0xA872,
-	52123 - 44032: 0xA873,
-	52124 - 44032: 0xC2E8,
-	52125 - 44032: 0xA874,
-	52126 - 44032: 0xA875,
-	52127 - 44032: 0xA876,
-	52128 - 44032: 0xA877,
-	52129 - 44032: 0xA878,
-	52130 - 44032: 0xA879,
-	52131 - 44032: 0xA87A,
-	52132 - 44032: 0xA881,
-	52133 - 44032: 0xA882,
-	52134 - 44032: 0xA883,
-	52135 - 44032: 0xA884,
-	52136 - 44032: 0xA885,
-	52137 - 44032: 0xA886,
-	52138 - 44032: 0xA887,
-	52139 - 44032: 0xA888,
-	52140 - 44032: 0xA889,
-	52141 - 44032: 0xA88A,
-	52142 - 44032: 0xA88B,
-	52143 - 44032: 0xA88C,
-	52144 - 44032: 0xA88D,
-	52145 - 44032: 0xA88E,
-	52146 - 44032: 0xA88F,
-	52147 - 44032: 0xA890,
-	52148 - 44032: 0xA891,
-	52149 - 44032: 0xA892,
-	52150 - 44032: 0xA893,
-	52151 - 44032: 0xA894,
-	52152 - 44032: 0xC2E9,
-	52153 - 44032: 0xA895,
-	52154 - 44032: 0xA896,
-	52155 - 44032: 0xA897,
-	52156 - 44032: 0xA898,
-	52157 - 44032: 0xA899,
-	52158 - 44032: 0xA89A,
-	52159 - 44032: 0xA89B,
-	52160 - 44032: 0xA89C,
-	52161 - 44032: 0xA89D,
-	52162 - 44032: 0xA89E,
-	52163 - 44032: 0xA89F,
-	52164 - 44032: 0xA8A0,
-	52165 - 44032: 0xA941,
-	52166 - 44032: 0xA942,
-	52167 - 44032: 0xA943,
-	52168 - 44032: 0xA944,
-	52169 - 44032: 0xA945,
-	52170 - 44032: 0xA946,
-	52171 - 44032: 0xA947,
-	52172 - 44032: 0xA948,
-	52173 - 44032: 0xA949,
-	52174 - 44032: 0xA94A,
-	52175 - 44032: 0xA94B,
-	52176 - 44032: 0xA94C,
-	52177 - 44032: 0xA94D,
-	52178 - 44032: 0xA94E,
-	52179 - 44032: 0xA94F,
-	52180 - 44032: 0xC2EA,
-	52181 - 44032: 0xA950,
-	52182 - 44032: 0xA951,
-	52183 - 44032: 0xA952,
-	52184 - 44032: 0xA953,
-	52185 - 44032: 0xA954,
-	52186 - 44032: 0xA955,
-	52187 - 44032: 0xA956,
-	52188 - 44032: 0xA957,
-	52189 - 44032: 0xA958,
-	52190 - 44032: 0xA959,
-	52191 - 44032: 0xA95A,
-	52192 - 44032: 0xA961,
-	52193 - 44032: 0xA962,
-	52194 - 44032: 0xA963,
-	52195 - 44032: 0xA964,
-	52196 - 44032: 0xC2EB,
-	52197 - 44032: 0xA965,
-	52198 - 44032: 0xA966,
-	52199 - 44032: 0xC2EC,
-	52200 - 44032: 0xA967,
-	52201 - 44032: 0xC2ED,
-	52202 - 44032: 0xA968,
-	52203 - 44032: 0xA969,
-	52204 - 44032: 0xA96A,
-	52205 - 44032: 0xA96B,
-	52206 - 44032: 0xA96C,
-	52207 - 44032: 0xA96D,
-	52208 - 44032: 0xA96E,
-	52209 - 44032: 0xA96F,
-	52210 - 44032: 0xA970,
-	52211 - 44032: 0xA971,
-	52212 - 44032: 0xA972,
-	52213 - 44032: 0xA973,
-	52214 - 44032: 0xA974,
-	52215 - 44032: 0xA975,
-	52216 - 44032: 0xA976,
-	52217 - 44032: 0xA977,
-	52218 - 44032: 0xA978,
-	52219 - 44032: 0xA979,
-	52220 - 44032: 0xA97A,
-	52221 - 44032: 0xA981,
-	52222 - 44032: 0xA982,
-	52223 - 44032: 0xA983,
-	52224 - 44032: 0xA984,
-	52225 - 44032: 0xA985,
-	52226 - 44032: 0xA986,
-	52227 - 44032: 0xA987,
-	52228 - 44032: 0xA988,
-	52229 - 44032: 0xA989,
-	52230 - 44032: 0xA98A,
-	52231 - 44032: 0xA98B,
-	52232 - 44032: 0xA98C,
-	52233 - 44032: 0xA98D,
-	52234 - 44032: 0xA98E,
-	52235 - 44032: 0xA98F,
-	52236 - 44032: 0xC2EE,
-	52237 - 44032: 0xC2EF,
-	52238 - 44032: 0xA990,
-	52239 - 44032: 0xA991,
-	52240 - 44032: 0xC2F0,
-	52241 - 44032: 0xA992,
-	52242 - 44032: 0xA993,
-	52243 - 44032: 0xA994,
-	52244 - 44032: 0xC2F1,
-	52245 - 44032: 0xA995,
-	52246 - 44032: 0xA996,
-	52247 - 44032: 0xA997,
-	52248 - 44032: 0xA998,
-	52249 - 44032: 0xA999,
-	52250 - 44032: 0xA99A,
-	52251 - 44032: 0xA99B,
-	52252 - 44032: 0xC2F2,
-	52253 - 44032: 0xC2F3,
-	52254 - 44032: 0xA99C,
-	52255 - 44032: 0xA99D,
-	52256 - 44032: 0xA99E,
-	52257 - 44032: 0xC2F4,
-	52258 - 44032: 0xC2F5,
-	52259 - 44032: 0xA99F,
-	52260 - 44032: 0xA9A0,
-	52261 - 44032: 0xAA41,
-	52262 - 44032: 0xAA42,
-	52263 - 44032: 0xC2F6,
-	52264 - 44032: 0xC2F7,
-	52265 - 44032: 0xC2F8,
-	52266 - 44032: 0xAA43,
-	52267 - 44032: 0xAA44,
-	52268 - 44032: 0xC2F9,
-	52269 - 44032: 0xAA45,
-	52270 - 44032: 0xC2FA,
-	52271 - 44032: 0xAA46,
-	52272 - 44032: 0xC2FB,
-	52273 - 44032: 0xAA47,
-	52274 - 44032: 0xAA48,
-	52275 - 44032: 0xAA49,
-	52276 - 44032: 0xAA4A,
-	52277 - 44032: 0xAA4B,
-	52278 - 44032: 0xAA4C,
-	52279 - 44032: 0xAA4D,
-	52280 - 44032: 0xC2FC,
-	52281 - 44032: 0xC2FD,
-	52282 - 44032: 0xAA4E,
-	52283 - 44032: 0xC2FE,
-	52284 - 44032: 0xC3A1,
-	52285 - 44032: 0xC3A2,
-	52286 - 44032: 0xC3A3,
-	52287 - 44032: 0xAA4F,
-	52288 - 44032: 0xAA50,
-	52289 - 44032: 0xAA51,
-	52290 - 44032: 0xAA52,
-	52291 - 44032: 0xAA53,
-	52292 - 44032: 0xC3A4,
-	52293 - 44032: 0xC3A5,
-	52294 - 44032: 0xAA54,
-	52295 - 44032: 0xAA55,
-	52296 - 44032: 0xC3A6,
-	52297 - 44032: 0xAA56,
-	52298 - 44032: 0xAA57,
-	52299 - 44032: 0xAA58,
-	52300 - 44032: 0xC3A7,
-	52301 - 44032: 0xAA59,
-	52302 - 44032: 0xAA5A,
-	52303 - 44032: 0xAA61,
-	52304 - 44032: 0xAA62,
-	52305 - 44032: 0xAA63,
-	52306 - 44032: 0xAA64,
-	52307 - 44032: 0xAA65,
-	52308 - 44032: 0xC3A8,
-	52309 - 44032: 0xC3A9,
-	52310 - 44032: 0xAA66,
-	52311 - 44032: 0xC3AA,
-	52312 - 44032: 0xC3AB,
-	52313 - 44032: 0xC3AC,
-	52314 - 44032: 0xAA67,
-	52315 - 44032: 0xAA68,
-	52316 - 44032: 0xAA69,
-	52317 - 44032: 0xAA6A,
-	52318 - 44032: 0xAA6B,
-	52319 - 44032: 0xAA6C,
-	52320 - 44032: 0xC3AD,
-	52321 - 44032: 0xAA6D,
-	52322 - 44032: 0xAA6E,
-	52323 - 44032: 0xAA6F,
-	52324 - 44032: 0xC3AE,
-	52325 - 44032: 0xAA70,
-	52326 - 44032: 0xC3AF,
-	52327 - 44032: 0xAA71,
-	52328 - 44032: 0xC3B0,
-	52329 - 44032: 0xAA72,
-	52330 - 44032: 0xAA73,
-	52331 - 44032: 0xAA74,
-	52332 - 44032: 0xAA75,
-	52333 - 44032: 0xAA76,
-	52334 - 44032: 0xAA77,
-	52335 - 44032: 0xAA78,
-	52336 - 44032: 0xC3B1,
-	52337 - 44032: 0xAA79,
-	52338 - 44032: 0xAA7A,
-	52339 - 44032: 0xAA81,
-	52340 - 44032: 0xAA82,
-	52341 - 44032: 0xC3B2,
-	52342 - 44032: 0xAA83,
-	52343 - 44032: 0xAA84,
-	52344 - 44032: 0xAA85,
-	52345 - 44032: 0xAA86,
-	52346 - 44032: 0xAA87,
-	52347 - 44032: 0xAA88,
-	52348 - 44032: 0xAA89,
-	52349 - 44032: 0xAA8A,
-	52350 - 44032: 0xAA8B,
-	52351 - 44032: 0xAA8C,
-	52352 - 44032: 0xAA8D,
-	52353 - 44032: 0xAA8E,
-	52354 - 44032: 0xAA8F,
-	52355 - 44032: 0xAA90,
-	52356 - 44032: 0xAA91,
-	52357 - 44032: 0xAA92,
-	52358 - 44032: 0xAA93,
-	52359 - 44032: 0xAA94,
-	52360 - 44032: 0xAA95,
-	52361 - 44032: 0xAA96,
-	52362 - 44032: 0xAA97,
-	52363 - 44032: 0xAA98,
-	52364 - 44032: 0xAA99,
-	52365 - 44032: 0xAA9A,
-	52366 - 44032: 0xAA9B,
-	52367 - 44032: 0xAA9C,
-	52368 - 44032: 0xAA9D,
-	52369 - 44032: 0xAA9E,
-	52370 - 44032: 0xAA9F,
-	52371 - 44032: 0xAAA0,
-	52372 - 44032: 0xAB41,
-	52373 - 44032: 0xAB42,
-	52374 - 44032: 0xAB43,
-	52375 - 44032: 0xAB44,
-	52376 - 44032: 0xC3B3,
-	52377 - 44032: 0xC3B4,
-	52378 - 44032: 0xAB45,
-	52379 - 44032: 0xAB46,
-	52380 - 44032: 0xC3B5,
-	52381 - 44032: 0xAB47,
-	52382 - 44032: 0xAB48,
-	52383 - 44032: 0xAB49,
-	52384 - 44032: 0xC3B6,
-	52385 - 44032: 0xAB4A,
-	52386 - 44032: 0xAB4B,
-	52387 - 44032: 0xAB4C,
-	52388 - 44032: 0xAB4D,
-	52389 - 44032: 0xAB4E,
-	52390 - 44032: 0xAB4F,
-	52391 - 44032: 0xAB50,
-	52392 - 44032: 0xC3B7,
-	52393 - 44032: 0xC3B8,
-	52394 - 44032: 0xAB51,
-	52395 - 44032: 0xC3B9,
-	52396 - 44032: 0xC3BA,
-	52397 - 44032: 0xC3BB,
-	52398 - 44032: 0xAB52,
-	52399 - 44032: 0xAB53,
-	52400 - 44032: 0xAB54,
-	52401 - 44032: 0xAB55,
-	52402 - 44032: 0xAB56,
-	52403 - 44032: 0xAB57,
-	52404 - 44032: 0xC3BC,
-	52405 - 44032: 0xC3BD,
-	52406 - 44032: 0xAB58,
-	52407 - 44032: 0xAB59,
-	52408 - 44032: 0xC3BE,
-	52409 - 44032: 0xAB5A,
-	52410 - 44032: 0xAB61,
-	52411 - 44032: 0xAB62,
-	52412 - 44032: 0xC3BF,
-	52413 - 44032: 0xAB63,
-	52414 - 44032: 0xAB64,
-	52415 - 44032: 0xAB65,
-	52416 - 44032: 0xAB66,
-	52417 - 44032: 0xAB67,
-	52418 - 44032: 0xAB68,
-	52419 - 44032: 0xAB69,
-	52420 - 44032: 0xC3C0,
-	52421 - 44032: 0xC3C1,
-	52422 - 44032: 0xAB6A,
-	52423 - 44032: 0xC3C2,
-	52424 - 44032: 0xAB6B,
-	52425 - 44032: 0xC3C3,
-	52426 - 44032: 0xAB6C,
-	52427 - 44032: 0xAB6D,
-	52428 - 44032: 0xAB6E,
-	52429 - 44032: 0xAB6F,
-	52430 - 44032: 0xAB70,
-	52431 - 44032: 0xAB71,
-	52432 - 44032: 0xC3C4,
-	52433 - 44032: 0xAB72,
-	52434 - 44032: 0xAB73,
-	52435 - 44032: 0xAB74,
-	52436 - 44032: 0xC3C5,
-	52437 - 44032: 0xAB75,
-	52438 - 44032: 0xAB76,
-	52439 - 44032: 0xAB77,
-	52440 - 44032: 0xAB78,
-	52441 - 44032: 0xAB79,
-	52442 - 44032: 0xAB7A,
-	52443 - 44032: 0xAB81,
-	52444 - 44032: 0xAB82,
-	52445 - 44032: 0xAB83,
-	52446 - 44032: 0xAB84,
-	52447 - 44032: 0xAB85,
-	52448 - 44032: 0xAB86,
-	52449 - 44032: 0xAB87,
-	52450 - 44032: 0xAB88,
-	52451 - 44032: 0xAB89,
-	52452 - 44032: 0xC3C6,
-	52453 - 44032: 0xAB8A,
-	52454 - 44032: 0xAB8B,
-	52455 - 44032: 0xAB8C,
-	52456 - 44032: 0xAB8D,
-	52457 - 44032: 0xAB8E,
-	52458 - 44032: 0xAB8F,
-	52459 - 44032: 0xAB90,
-	52460 - 44032: 0xC3C7,
-	52461 - 44032: 0xAB91,
-	52462 - 44032: 0xAB92,
-	52463 - 44032: 0xAB93,
-	52464 - 44032: 0xC3C8,
-	52465 - 44032: 0xAB94,
-	52466 - 44032: 0xAB95,
-	52467 - 44032: 0xAB96,
-	52468 - 44032: 0xAB97,
-	52469 - 44032: 0xAB98,
-	52470 - 44032: 0xAB99,
-	52471 - 44032: 0xAB9A,
-	52472 - 44032: 0xAB9B,
-	52473 - 44032: 0xAB9C,
-	52474 - 44032: 0xAB9D,
-	52475 - 44032: 0xAB9E,
-	52476 - 44032: 0xAB9F,
-	52477 - 44032: 0xABA0,
-	52478 - 44032: 0xAC41,
-	52479 - 44032: 0xAC42,
-	52480 - 44032: 0xAC43,
-	52481 - 44032: 0xC3C9,
-	52482 - 44032: 0xAC44,
-	52483 - 44032: 0xAC45,
-	52484 - 44032: 0xAC46,
-	52485 - 44032: 0xAC47,
-	52486 - 44032: 0xAC48,
-	52487 - 44032: 0xAC49,
-	52488 - 44032: 0xC3CA,
-	52489 - 44032: 0xC3CB,
-	52490 - 44032: 0xAC4A,
-	52491 - 44032: 0xAC4B,
-	52492 - 44032: 0xC3CC,
-	52493 - 44032: 0xAC4C,
-	52494 - 44032: 0xAC4D,
-	52495 - 44032: 0xAC4E,
-	52496 - 44032: 0xC3CD,
-	52497 - 44032: 0xAC4F,
-	52498 - 44032: 0xAC50,
-	52499 - 44032: 0xAC51,
-	52500 - 44032: 0xAC52,
-	52501 - 44032: 0xAC53,
-	52502 - 44032: 0xAC54,
-	52503 - 44032: 0xAC55,
-	52504 - 44032: 0xC3CE,
-	52505 - 44032: 0xC3CF,
-	52506 - 44032: 0xAC56,
-	52507 - 44032: 0xC3D0,
-	52508 - 44032: 0xAC57,
-	52509 - 44032: 0xC3D1,
-	52510 - 44032: 0xAC58,
-	52511 - 44032: 0xAC59,
-	52512 - 44032: 0xAC5A,
-	52513 - 44032: 0xAC61,
-	52514 - 44032: 0xAC62,
-	52515 - 44032: 0xAC63,
-	52516 - 44032: 0xC3D2,
-	52517 - 44032: 0xAC64,
-	52518 - 44032: 0xAC65,
-	52519 - 44032: 0xAC66,
-	52520 - 44032: 0xC3D3,
-	52521 - 44032: 0xAC67,
-	52522 - 44032: 0xAC68,
-	52523 - 44032: 0xAC69,
-	52524 - 44032: 0xC3D4,
-	52525 - 44032: 0xAC6A,
-	52526 - 44032: 0xAC6B,
-	52527 - 44032: 0xAC6C,
-	52528 - 44032: 0xAC6D,
-	52529 - 44032: 0xAC6E,
-	52530 - 44032: 0xAC6F,
-	52531 - 44032: 0xAC70,
-	52532 - 44032: 0xAC71,
-	52533 - 44032: 0xAC72,
-	52534 - 44032: 0xAC73,
-	52535 - 44032: 0xAC74,
-	52536 - 44032: 0xAC75,
-	52537 - 44032: 0xC3D5,
-	52538 - 44032: 0xAC76,
-	52539 - 44032: 0xAC77,
-	52540 - 44032: 0xAC78,
-	52541 - 44032: 0xAC79,
-	52542 - 44032: 0xAC7A,
-	52543 - 44032: 0xAC81,
-	52544 - 44032: 0xAC82,
-	52545 - 44032: 0xAC83,
-	52546 - 44032: 0xAC84,
-	52547 - 44032: 0xAC85,
-	52548 - 44032: 0xAC86,
-	52549 - 44032: 0xAC87,
-	52550 - 44032: 0xAC88,
-	52551 - 44032: 0xAC89,
-	52552 - 44032: 0xAC8A,
-	52553 - 44032: 0xAC8B,
-	52554 - 44032: 0xAC8C,
-	52555 - 44032: 0xAC8D,
-	52556 - 44032: 0xAC8E,
-	52557 - 44032: 0xAC8F,
-	52558 - 44032: 0xAC90,
-	52559 - 44032: 0xAC91,
-	52560 - 44032: 0xAC92,
-	52561 - 44032: 0xAC93,
-	52562 - 44032: 0xAC94,
-	52563 - 44032: 0xAC95,
-	52564 - 44032: 0xAC96,
-	52565 - 44032: 0xAC97,
-	52566 - 44032: 0xAC98,
-	52567 - 44032: 0xAC99,
-	52568 - 44032: 0xAC9A,
-	52569 - 44032: 0xAC9B,
-	52570 - 44032: 0xAC9C,
-	52571 - 44032: 0xAC9D,
-	52572 - 44032: 0xC3D6,
-	52573 - 44032: 0xAC9E,
-	52574 - 44032: 0xAC9F,
-	52575 - 44032: 0xACA0,
-	52576 - 44032: 0xC3D7,
-	52577 - 44032: 0xAD41,
-	52578 - 44032: 0xAD42,
-	52579 - 44032: 0xAD43,
-	52580 - 44032: 0xC3D8,
-	52581 - 44032: 0xAD44,
-	52582 - 44032: 0xAD45,
-	52583 - 44032: 0xAD46,
-	52584 - 44032: 0xAD47,
-	52585 - 44032: 0xAD48,
-	52586 - 44032: 0xAD49,
-	52587 - 44032: 0xAD4A,
-	52588 - 44032: 0xC3D9,
-	52589 - 44032: 0xC3DA,
-	52590 - 44032: 0xAD4B,
-	52591 - 44032: 0xC3DB,
-	52592 - 44032: 0xAD4C,
-	52593 - 44032: 0xC3DC,
-	52594 - 44032: 0xAD4D,
-	52595 - 44032: 0xAD4E,
-	52596 - 44032: 0xAD4F,
-	52597 - 44032: 0xAD50,
-	52598 - 44032: 0xAD51,
-	52599 - 44032: 0xAD52,
-	52600 - 44032: 0xC3DD,
-	52601 - 44032: 0xAD53,
-	52602 - 44032: 0xAD54,
-	52603 - 44032: 0xAD55,
-	52604 - 44032: 0xAD56,
-	52605 - 44032: 0xAD57,
-	52606 - 44032: 0xAD58,
-	52607 - 44032: 0xAD59,
-	52608 - 44032: 0xAD5A,
-	52609 - 44032: 0xAD61,
-	52610 - 44032: 0xAD62,
-	52611 - 44032: 0xAD63,
-	52612 - 44032: 0xAD64,
-	52613 - 44032: 0xAD65,
-	52614 - 44032: 0xAD66,
-	52615 - 44032: 0xAD67,
-	52616 - 44032: 0xC3DE,
-	52617 - 44032: 0xAD68,
-	52618 - 44032: 0xAD69,
-	52619 - 44032: 0xAD6A,
-	52620 - 44032: 0xAD6B,
-	52621 - 44032: 0xAD6C,
-	52622 - 44032: 0xAD6D,
-	52623 - 44032: 0xAD6E,
-	52624 - 44032: 0xAD6F,
-	52625 - 44032: 0xAD70,
-	52626 - 44032: 0xAD71,
-	52627 - 44032: 0xAD72,
-	52628 - 44032: 0xC3DF,
-	52629 - 44032: 0xC3E0,
-	52630 - 44032: 0xAD73,
-	52631 - 44032: 0xAD74,
-	52632 - 44032: 0xC3E1,
-	52633 - 44032: 0xAD75,
-	52634 - 44032: 0xAD76,
-	52635 - 44032: 0xAD77,
-	52636 - 44032: 0xC3E2,
-	52637 - 44032: 0xAD78,
-	52638 - 44032: 0xAD79,
-	52639 - 44032: 0xAD7A,
-	52640 - 44032: 0xAD81,
-	52641 - 44032: 0xAD82,
-	52642 - 44032: 0xAD83,
-	52643 - 44032: 0xAD84,
-	52644 - 44032: 0xC3E3,
-	52645 - 44032: 0xC3E4,
-	52646 - 44032: 0xAD85,
-	52647 - 44032: 0xC3E5,
-	52648 - 44032: 0xAD86,
-	52649 - 44032: 0xC3E6,
-	52650 - 44032: 0xAD87,
-	52651 - 44032: 0xAD88,
-	52652 - 44032: 0xAD89,
-	52653 - 44032: 0xAD8A,
-	52654 - 44032: 0xAD8B,
-	52655 - 44032: 0xAD8C,
-	52656 - 44032: 0xC3E7,
-	52657 - 44032: 0xAD8D,
-	52658 - 44032: 0xAD8E,
-	52659 - 44032: 0xAD8F,
-	52660 - 44032: 0xAD90,
-	52661 - 44032: 0xAD91,
-	52662 - 44032: 0xAD92,
-	52663 - 44032: 0xAD93,
-	52664 - 44032: 0xAD94,
-	52665 - 44032: 0xAD95,
-	52666 - 44032: 0xAD96,
-	52667 - 44032: 0xAD97,
-	52668 - 44032: 0xAD98,
-	52669 - 44032: 0xAD99,
-	52670 - 44032: 0xAD9A,
-	52671 - 44032: 0xAD9B,
-	52672 - 44032: 0xAD9C,
-	52673 - 44032: 0xAD9D,
-	52674 - 44032: 0xAD9E,
-	52675 - 44032: 0xAD9F,
-	52676 - 44032: 0xC3E8,
-	52677 - 44032: 0xADA0,
-	52678 - 44032: 0xAE41,
-	52679 - 44032: 0xAE42,
-	52680 - 44032: 0xAE43,
-	52681 - 44032: 0xAE44,
-	52682 - 44032: 0xAE45,
-	52683 - 44032: 0xAE46,
-	52684 - 44032: 0xC3E9,
-	52685 - 44032: 0xAE47,
-	52686 - 44032: 0xAE48,
-	52687 - 44032: 0xAE49,
-	52688 - 44032: 0xC3EA,
-	52689 - 44032: 0xAE4A,
-	52690 - 44032: 0xAE4B,
-	52691 - 44032: 0xAE4C,
-	52692 - 44032: 0xAE4D,
-	52693 - 44032: 0xAE4E,
-	52694 - 44032: 0xAE4F,
-	52695 - 44032: 0xAE50,
-	52696 - 44032: 0xAE51,
-	52697 - 44032: 0xAE52,
-	52698 - 44032: 0xAE53,
-	52699 - 44032: 0xAE54,
-	52700 - 44032: 0xAE55,
-	52701 - 44032: 0xAE56,
-	52702 - 44032: 0xAE57,
-	52703 - 44032: 0xAE58,
-	52704 - 44032: 0xAE59,
-	52705 - 44032: 0xAE5A,
-	52706 - 44032: 0xAE61,
-	52707 - 44032: 0xAE62,
-	52708 - 44032: 0xAE63,
-	52709 - 44032: 0xAE64,
-	52710 - 44032: 0xAE65,
-	52711 - 44032: 0xAE66,
-	52712 - 44032: 0xC3EB,
-	52713 - 44032: 0xAE67,
-	52714 - 44032: 0xAE68,
-	52715 - 44032: 0xAE69,
-	52716 - 44032: 0xC3EC,
-	52717 - 44032: 0xAE6A,
-	52718 - 44032: 0xAE6B,
-	52719 - 44032: 0xAE6C,
-	52720 - 44032: 0xC3ED,
-	52721 - 44032: 0xAE6D,
-	52722 - 44032: 0xAE6E,
-	52723 - 44032: 0xAE6F,
-	52724 - 44032: 0xAE70,
-	52725 - 44032: 0xAE71,
-	52726 - 44032: 0xAE72,
-	52727 - 44032: 0xAE73,
-	52728 - 44032: 0xC3EE,
-	52729 - 44032: 0xC3EF,
-	52730 - 44032: 0xAE74,
-	52731 - 44032: 0xC3F0,
-	52732 - 44032: 0xAE75,
-	52733 - 44032: 0xC3F1,
-	52734 - 44032: 0xAE76,
-	52735 - 44032: 0xAE77,
-	52736 - 44032: 0xAE78,
-	52737 - 44032: 0xAE79,
-	52738 - 44032: 0xAE7A,
-	52739 - 44032: 0xAE81,
-	52740 - 44032: 0xC3F2,
-	52741 - 44032: 0xAE82,
-	52742 - 44032: 0xAE83,
-	52743 - 44032: 0xAE84,
-	52744 - 44032: 0xC3F3,
-	52745 - 44032: 0xAE85,
-	52746 - 44032: 0xAE86,
-	52747 - 44032: 0xAE87,
-	52748 - 44032: 0xC3F4,
-	52749 - 44032: 0xAE88,
-	52750 - 44032: 0xAE89,
-	52751 - 44032: 0xAE8A,
-	52752 - 44032: 0xAE8B,
-	52753 - 44032: 0xAE8C,
-	52754 - 44032: 0xAE8D,
-	52755 - 44032: 0xAE8E,
-	52756 - 44032: 0xC3F5,
-	52757 - 44032: 0xAE8F,
-	52758 - 44032: 0xAE90,
-	52759 - 44032: 0xAE91,
-	52760 - 44032: 0xAE92,
-	52761 - 44032: 0xC3F6,
-	52762 - 44032: 0xAE93,
-	52763 - 44032: 0xAE94,
-	52764 - 44032: 0xAE95,
-	52765 - 44032: 0xAE96,
-	52766 - 44032: 0xAE97,
-	52767 - 44032: 0xAE98,
-	52768 - 44032: 0xC3F7,
-	52769 - 44032: 0xC3F8,
-	52770 - 44032: 0xAE99,
-	52771 - 44032: 0xAE9A,
-	52772 - 44032: 0xC3F9,
-	52773 - 44032: 0xAE9B,
-	52774 - 44032: 0xAE9C,
-	52775 - 44032: 0xAE9D,
-	52776 - 44032: 0xC3FA,
-	52777 - 44032: 0xAE9E,
-	52778 - 44032: 0xAE9F,
-	52779 - 44032: 0xAEA0,
-	52780 - 44032: 0xAF41,
-	52781 - 44032: 0xAF42,
-	52782 - 44032: 0xAF43,
-	52783 - 44032: 0xAF44,
-	52784 - 44032: 0xC3FB,
-	52785 - 44032: 0xC3FC,
-	52786 - 44032: 0xAF45,
-	52787 - 44032: 0xC3FD,
-	52788 - 44032: 0xAF46,
-	52789 - 44032: 0xC3FE,
-	52790 - 44032: 0xAF47,
-	52791 - 44032: 0xAF48,
-	52792 - 44032: 0xAF49,
-	52793 - 44032: 0xAF4A,
-	52794 - 44032: 0xAF4B,
-	52795 - 44032: 0xAF4C,
-	52796 - 44032: 0xAF4D,
-	52797 - 44032: 0xAF4E,
-	52798 - 44032: 0xAF4F,
-	52799 - 44032: 0xAF50,
-	52800 - 44032: 0xAF51,
-	52801 - 44032: 0xAF52,
-	52802 - 44032: 0xAF53,
-	52803 - 44032: 0xAF54,
-	52804 - 44032: 0xAF55,
-	52805 - 44032: 0xAF56,
-	52806 - 44032: 0xAF57,
-	52807 - 44032: 0xAF58,
-	52808 - 44032: 0xAF59,
-	52809 - 44032: 0xAF5A,
-	52810 - 44032: 0xAF61,
-	52811 - 44032: 0xAF62,
-	52812 - 44032: 0xAF63,
-	52813 - 44032: 0xAF64,
-	52814 - 44032: 0xAF65,
-	52815 - 44032: 0xAF66,
-	52816 - 44032: 0xAF67,
-	52817 - 44032: 0xAF68,
-	52818 - 44032: 0xAF69,
-	52819 - 44032: 0xAF6A,
-	52820 - 44032: 0xAF6B,
-	52821 - 44032: 0xAF6C,
-	52822 - 44032: 0xAF6D,
-	52823 - 44032: 0xAF6E,
-	52824 - 44032: 0xC4A1,
-	52825 - 44032: 0xC4A2,
-	52826 - 44032: 0xAF6F,
-	52827 - 44032: 0xAF70,
-	52828 - 44032: 0xC4A3,
-	52829 - 44032: 0xAF71,
-	52830 - 44032: 0xAF72,
-	52831 - 44032: 0xC4A4,
-	52832 - 44032: 0xC4A5,
-	52833 - 44032: 0xC4A6,
-	52834 - 44032: 0xAF73,
-	52835 - 44032: 0xAF74,
-	52836 - 44032: 0xAF75,
-	52837 - 44032: 0xAF76,
-	52838 - 44032: 0xAF77,
-	52839 - 44032: 0xAF78,
-	52840 - 44032: 0xC4A7,
-	52841 - 44032: 0xC4A8,
-	52842 - 44032: 0xAF79,
-	52843 - 44032: 0xC4A9,
-	52844 - 44032: 0xAF7A,
-	52845 - 44032: 0xC4AA,
-	52846 - 44032: 0xAF81,
-	52847 - 44032: 0xAF82,
-	52848 - 44032: 0xAF83,
-	52849 - 44032: 0xAF84,
-	52850 - 44032: 0xAF85,
-	52851 - 44032: 0xAF86,
-	52852 - 44032: 0xC4AB,
-	52853 - 44032: 0xC4AC,
-	52854 - 44032: 0xAF87,
-	52855 - 44032: 0xAF88,
-	52856 - 44032: 0xC4AD,
-	52857 - 44032: 0xAF89,
-	52858 - 44032: 0xAF8A,
-	52859 - 44032: 0xAF8B,
-	52860 - 44032: 0xC4AE,
-	52861 - 44032: 0xAF8C,
-	52862 - 44032: 0xAF8D,
-	52863 - 44032: 0xAF8E,
-	52864 - 44032: 0xAF8F,
-	52865 - 44032: 0xAF90,
-	52866 - 44032: 0xAF91,
-	52867 - 44032: 0xAF92,
-	52868 - 44032: 0xC4AF,
-	52869 - 44032: 0xC4B0,
-	52870 - 44032: 0xAF93,
-	52871 - 44032: 0xC4B1,
-	52872 - 44032: 0xAF94,
-	52873 - 44032: 0xC4B2,
-	52874 - 44032: 0xAF95,
-	52875 - 44032: 0xAF96,
-	52876 - 44032: 0xAF97,
-	52877 - 44032: 0xAF98,
-	52878 - 44032: 0xAF99,
-	52879 - 44032: 0xAF9A,
-	52880 - 44032: 0xC4B3,
-	52881 - 44032: 0xC4B4,
-	52882 - 44032: 0xAF9B,
-	52883 - 44032: 0xAF9C,
-	52884 - 44032: 0xC4B5,
-	52885 - 44032: 0xAF9D,
-	52886 - 44032: 0xAF9E,
-	52887 - 44032: 0xAF9F,
-	52888 - 44032: 0xC4B6,
-	52889 - 44032: 0xAFA0,
-	52890 - 44032: 0xB041,
-	52891 - 44032: 0xB042,
-	52892 - 44032: 0xB043,
-	52893 - 44032: 0xB044,
-	52894 - 44032: 0xB045,
-	52895 - 44032: 0xB046,
-	52896 - 44032: 0xC4B7,
-	52897 - 44032: 0xC4B8,
-	52898 - 44032: 0xB047,
-	52899 - 44032: 0xC4B9,
-	52900 - 44032: 0xC4BA,
-	52901 - 44032: 0xC4BB,
-	52902 - 44032: 0xB048,
-	52903 - 44032: 0xB049,
-	52904 - 44032: 0xB04A,
-	52905 - 44032: 0xB04B,
-	52906 - 44032: 0xB04C,
-	52907 - 44032: 0xB04D,
-	52908 - 44032: 0xC4BC,
-	52909 - 44032: 0xC4BD,
-	52910 - 44032: 0xB04E,
-	52911 - 44032: 0xB04F,
-	52912 - 44032: 0xB050,
-	52913 - 44032: 0xB051,
-	52914 - 44032: 0xB052,
-	52915 - 44032: 0xB053,
-	52916 - 44032: 0xB054,
-	52917 - 44032: 0xB055,
-	52918 - 44032: 0xB056,
-	52919 - 44032: 0xB057,
-	52920 - 44032: 0xB058,
-	52921 - 44032: 0xB059,
-	52922 - 44032: 0xB05A,
-	52923 - 44032: 0xB061,
-	52924 - 44032: 0xB062,
-	52925 - 44032: 0xB063,
-	52926 - 44032: 0xB064,
-	52927 - 44032: 0xB065,
-	52928 - 44032: 0xB066,
-	52929 - 44032: 0xC4BE,
-	52930 - 44032: 0xB067,
-	52931 - 44032: 0xB068,
-	52932 - 44032: 0xB069,
-	52933 - 44032: 0xB06A,
-	52934 - 44032: 0xB06B,
-	52935 - 44032: 0xB06C,
-	52936 - 44032: 0xB06D,
-	52937 - 44032: 0xB06E,
-	52938 - 44032: 0xB06F,
-	52939 - 44032: 0xB070,
-	52940 - 44032: 0xB071,
-	52941 - 44032: 0xB072,
-	52942 - 44032: 0xB073,
-	52943 - 44032: 0xB074,
-	52944 - 44032: 0xB075,
-	52945 - 44032: 0xB076,
-	52946 - 44032: 0xB077,
-	52947 - 44032: 0xB078,
-	52948 - 44032: 0xB079,
-	52949 - 44032: 0xB07A,
-	52950 - 44032: 0xB081,
-	52951 - 44032: 0xB082,
-	52952 - 44032: 0xB083,
-	52953 - 44032: 0xB084,
-	52954 - 44032: 0xB085,
-	52955 - 44032: 0xB086,
-	52956 - 44032: 0xB087,
-	52957 - 44032: 0xB088,
-	52958 - 44032: 0xB089,
-	52959 - 44032: 0xB08A,
-	52960 - 44032: 0xB08B,
-	52961 - 44032: 0xB08C,
-	52962 - 44032: 0xB08D,
-	52963 - 44032: 0xB08E,
-	52964 - 44032: 0xC4BF,
-	52965 - 44032: 0xC4C0,
-	52966 - 44032: 0xB08F,
-	52967 - 44032: 0xB090,
-	52968 - 44032: 0xC4C1,
-	52969 - 44032: 0xB091,
-	52970 - 44032: 0xB092,
-	52971 - 44032: 0xC4C2,
-	52972 - 44032: 0xC4C3,
-	52973 - 44032: 0xB093,
-	52974 - 44032: 0xB094,
-	52975 - 44032: 0xB095,
-	52976 - 44032: 0xB096,
-	52977 - 44032: 0xB097,
-	52978 - 44032: 0xB098,
-	52979 - 44032: 0xB099,
-	52980 - 44032: 0xC4C4,
-	52981 - 44032: 0xC4C5,
-	52982 - 44032: 0xB09A,
-	52983 - 44032: 0xC4C6,
-	52984 - 44032: 0xC4C7,
-	52985 - 44032: 0xC4C8,
-	52986 - 44032: 0xB09B,
-	52987 - 44032: 0xB09C,
-	52988 - 44032: 0xB09D,
-	52989 - 44032: 0xB09E,
-	52990 - 44032: 0xB09F,
-	52991 - 44032: 0xB0A0,
-	52992 - 44032: 0xC4C9,
-	52993 - 44032: 0xC4CA,
-	52994 - 44032: 0xB141,
-	52995 - 44032: 0xB142,
-	52996 - 44032: 0xC4CB,
-	52997 - 44032: 0xB143,
-	52998 - 44032: 0xB144,
-	52999 - 44032: 0xB145,
-	53000 - 44032: 0xC4CC,
-	53001 - 44032: 0xB146,
-	53002 - 44032: 0xB147,
-	53003 - 44032: 0xB148,
-	53004 - 44032: 0xB149,
-	53005 - 44032: 0xB14A,
-	53006 - 44032: 0xB14B,
-	53007 - 44032: 0xB14C,
-	53008 - 44032: 0xC4CD,
-	53009 - 44032: 0xC4CE,
-	53010 - 44032: 0xB14D,
-	53011 - 44032: 0xC4CF,
-	53012 - 44032: 0xB14E,
-	53013 - 44032: 0xC4D0,
-	53014 - 44032: 0xB14F,
-	53015 - 44032: 0xB150,
-	53016 - 44032: 0xB151,
-	53017 - 44032: 0xB152,
-	53018 - 44032: 0xB153,
-	53019 - 44032: 0xB154,
-	53020 - 44032: 0xC4D1,
-	53021 - 44032: 0xB155,
-	53022 - 44032: 0xB156,
-	53023 - 44032: 0xB157,
-	53024 - 44032: 0xC4D2,
-	53025 - 44032: 0xB158,
-	53026 - 44032: 0xB159,
-	53027 - 44032: 0xB15A,
-	53028 - 44032: 0xC4D3,
-	53029 - 44032: 0xB161,
-	53030 - 44032: 0xB162,
-	53031 - 44032: 0xB163,
-	53032 - 44032: 0xB164,
-	53033 - 44032: 0xB165,
-	53034 - 44032: 0xB166,
-	53035 - 44032: 0xB167,
-	53036 - 44032: 0xC4D4,
-	53037 - 44032: 0xC4D5,
-	53038 - 44032: 0xB168,
-	53039 - 44032: 0xC4D6,
-	53040 - 44032: 0xC4D7,
-	53041 - 44032: 0xC4D8,
-	53042 - 44032: 0xB169,
-	53043 - 44032: 0xB16A,
-	53044 - 44032: 0xB16B,
-	53045 - 44032: 0xB16C,
-	53046 - 44032: 0xB16D,
-	53047 - 44032: 0xB16E,
-	53048 - 44032: 0xC4D9,
-	53049 - 44032: 0xB16F,
-	53050 - 44032: 0xB170,
-	53051 - 44032: 0xB171,
-	53052 - 44032: 0xB172,
-	53053 - 44032: 0xB173,
-	53054 - 44032: 0xB174,
-	53055 - 44032: 0xB175,
-	53056 - 44032: 0xB176,
-	53057 - 44032: 0xB177,
-	53058 - 44032: 0xB178,
-	53059 - 44032: 0xB179,
-	53060 - 44032: 0xB17A,
-	53061 - 44032: 0xB181,
-	53062 - 44032: 0xB182,
-	53063 - 44032: 0xB183,
-	53064 - 44032: 0xB184,
-	53065 - 44032: 0xB185,
-	53066 - 44032: 0xB186,
-	53067 - 44032: 0xB187,
-	53068 - 44032: 0xB188,
-	53069 - 44032: 0xB189,
-	53070 - 44032: 0xB18A,
-	53071 - 44032: 0xB18B,
-	53072 - 44032: 0xB18C,
-	53073 - 44032: 0xB18D,
-	53074 - 44032: 0xB18E,
-	53075 - 44032: 0xB18F,
-	53076 - 44032: 0xC4DA,
-	53077 - 44032: 0xC4DB,
-	53078 - 44032: 0xB190,
-	53079 - 44032: 0xB191,
-	53080 - 44032: 0xC4DC,
-	53081 - 44032: 0xB192,
-	53082 - 44032: 0xB193,
-	53083 - 44032: 0xB194,
-	53084 - 44032: 0xC4DD,
-	53085 - 44032: 0xB195,
-	53086 - 44032: 0xB196,
-	53087 - 44032: 0xB197,
-	53088 - 44032: 0xB198,
-	53089 - 44032: 0xB199,
-	53090 - 44032: 0xB19A,
-	53091 - 44032: 0xB19B,
-	53092 - 44032: 0xC4DE,
-	53093 - 44032: 0xC4DF,
-	53094 - 44032: 0xB19C,
-	53095 - 44032: 0xC4E0,
-	53096 - 44032: 0xB19D,
-	53097 - 44032: 0xC4E1,
-	53098 - 44032: 0xB19E,
-	53099 - 44032: 0xB19F,
-	53100 - 44032: 0xB1A0,
-	53101 - 44032: 0xB241,
-	53102 - 44032: 0xB242,
-	53103 - 44032: 0xB243,
-	53104 - 44032: 0xC4E2,
-	53105 - 44032: 0xC4E3,
-	53106 - 44032: 0xB244,
-	53107 - 44032: 0xB245,
-	53108 - 44032: 0xC4E4,
-	53109 - 44032: 0xB246,
-	53110 - 44032: 0xB247,
-	53111 - 44032: 0xB248,
-	53112 - 44032: 0xC4E5,
-	53113 - 44032: 0xB249,
-	53114 - 44032: 0xB24A,
-	53115 - 44032: 0xB24B,
-	53116 - 44032: 0xB24C,
-	53117 - 44032: 0xB24D,
-	53118 - 44032: 0xB24E,
-	53119 - 44032: 0xB24F,
-	53120 - 44032: 0xC4E6,
-	53121 - 44032: 0xB250,
-	53122 - 44032: 0xB251,
-	53123 - 44032: 0xB252,
-	53124 - 44032: 0xB253,
-	53125 - 44032: 0xC4E7,
-	53126 - 44032: 0xB254,
-	53127 - 44032: 0xB255,
-	53128 - 44032: 0xB256,
-	53129 - 44032: 0xB257,
-	53130 - 44032: 0xB258,
-	53131 - 44032: 0xB259,
-	53132 - 44032: 0xC4E8,
-	53133 - 44032: 0xB25A,
-	53134 - 44032: 0xB261,
-	53135 - 44032: 0xB262,
-	53136 - 44032: 0xB263,
-	53137 - 44032: 0xB264,
-	53138 - 44032: 0xB265,
-	53139 - 44032: 0xB266,
-	53140 - 44032: 0xB267,
-	53141 - 44032: 0xB268,
-	53142 - 44032: 0xB269,
-	53143 - 44032: 0xB26A,
-	53144 - 44032: 0xB26B,
-	53145 - 44032: 0xB26C,
-	53146 - 44032: 0xB26D,
-	53147 - 44032: 0xB26E,
-	53148 - 44032: 0xB26F,
-	53149 - 44032: 0xB270,
-	53150 - 44032: 0xB271,
-	53151 - 44032: 0xB272,
-	53152 - 44032: 0xB273,
-	53153 - 44032: 0xC4E9,
-	53154 - 44032: 0xB274,
-	53155 - 44032: 0xB275,
-	53156 - 44032: 0xB276,
-	53157 - 44032: 0xB277,
-	53158 - 44032: 0xB278,
-	53159 - 44032: 0xB279,
-	53160 - 44032: 0xC4EA,
-	53161 - 44032: 0xB27A,
-	53162 - 44032: 0xB281,
-	53163 - 44032: 0xB282,
-	53164 - 44032: 0xB283,
-	53165 - 44032: 0xB284,
-	53166 - 44032: 0xB285,
-	53167 - 44032: 0xB286,
-	53168 - 44032: 0xC4EB,
-	53169 - 44032: 0xB287,
-	53170 - 44032: 0xB288,
-	53171 - 44032: 0xB289,
-	53172 - 44032: 0xB28A,
-	53173 - 44032: 0xB28B,
-	53174 - 44032: 0xB28C,
-	53175 - 44032: 0xB28D,
-	53176 - 44032: 0xB28E,
-	53177 - 44032: 0xB28F,
-	53178 - 44032: 0xB290,
-	53179 - 44032: 0xB291,
-	53180 - 44032: 0xB292,
-	53181 - 44032: 0xB293,
-	53182 - 44032: 0xB294,
-	53183 - 44032: 0xB295,
-	53184 - 44032: 0xB296,
-	53185 - 44032: 0xB297,
-	53186 - 44032: 0xB298,
-	53187 - 44032: 0xB299,
-	53188 - 44032: 0xC4EC,
-	53189 - 44032: 0xB29A,
-	53190 - 44032: 0xB29B,
-	53191 - 44032: 0xB29C,
-	53192 - 44032: 0xB29D,
-	53193 - 44032: 0xB29E,
-	53194 - 44032: 0xB29F,
-	53195 - 44032: 0xB2A0,
-	53196 - 44032: 0xB341,
-	53197 - 44032: 0xB342,
-	53198 - 44032: 0xB343,
-	53199 - 44032: 0xB344,
-	53200 - 44032: 0xB345,
-	53201 - 44032: 0xB346,
-	53202 - 44032: 0xB347,
-	53203 - 44032: 0xB348,
-	53204 - 44032: 0xB349,
-	53205 - 44032: 0xB34A,
-	53206 - 44032: 0xB34B,
-	53207 - 44032: 0xB34C,
-	53208 - 44032: 0xB34D,
-	53209 - 44032: 0xB34E,
-	53210 - 44032: 0xB34F,
-	53211 - 44032: 0xB350,
-	53212 - 44032: 0xB351,
-	53213 - 44032: 0xB352,
-	53214 - 44032: 0xB353,
-	53215 - 44032: 0xB354,
-	53216 - 44032: 0xC4ED,
-	53217 - 44032: 0xC4EE,
-	53218 - 44032: 0xB355,
-	53219 - 44032: 0xB356,
-	53220 - 44032: 0xC4EF,
-	53221 - 44032: 0xB357,
-	53222 - 44032: 0xB358,
-	53223 - 44032: 0xB359,
-	53224 - 44032: 0xC4F0,
-	53225 - 44032: 0xB35A,
-	53226 - 44032: 0xB361,
-	53227 - 44032: 0xB362,
-	53228 - 44032: 0xB363,
-	53229 - 44032: 0xB364,
-	53230 - 44032: 0xB365,
-	53231 - 44032: 0xB366,
-	53232 - 44032: 0xC4F1,
-	53233 - 44032: 0xC4F2,
-	53234 - 44032: 0xB367,
-	53235 - 44032: 0xC4F3,
-	53236 - 44032: 0xB368,
-	53237 - 44032: 0xC4F4,
-	53238 - 44032: 0xB369,
-	53239 - 44032: 0xB36A,
-	53240 - 44032: 0xB36B,
-	53241 - 44032: 0xB36C,
-	53242 - 44032: 0xB36D,
-	53243 - 44032: 0xB36E,
-	53244 - 44032: 0xC4F5,
-	53245 - 44032: 0xB36F,
-	53246 - 44032: 0xB370,
-	53247 - 44032: 0xB371,
-	53248 - 44032: 0xC4F6,
-	53249 - 44032: 0xB372,
-	53250 - 44032: 0xB373,
-	53251 - 44032: 0xB374,
-	53252 - 44032: 0xC4F7,
-	53253 - 44032: 0xB375,
-	53254 - 44032: 0xB376,
-	53255 - 44032: 0xB377,
-	53256 - 44032: 0xB378,
-	53257 - 44032: 0xB379,
-	53258 - 44032: 0xB37A,
-	53259 - 44032: 0xB381,
-	53260 - 44032: 0xB382,
-	53261 - 44032: 0xB383,
-	53262 - 44032: 0xB384,
-	53263 - 44032: 0xB385,
-	53264 - 44032: 0xB386,
-	53265 - 44032: 0xC4F8,
-	53266 - 44032: 0xB387,
-	53267 - 44032: 0xB388,
-	53268 - 44032: 0xB389,
-	53269 - 44032: 0xB38A,
-	53270 - 44032: 0xB38B,
-	53271 - 44032: 0xB38C,
-	53272 - 44032: 0xC4F9,
-	53273 - 44032: 0xB38D,
-	53274 - 44032: 0xB38E,
-	53275 - 44032: 0xB38F,
-	53276 - 44032: 0xB390,
-	53277 - 44032: 0xB391,
-	53278 - 44032: 0xB392,
-	53279 - 44032: 0xB393,
-	53280 - 44032: 0xB394,
-	53281 - 44032: 0xB395,
-	53282 - 44032: 0xB396,
-	53283 - 44032: 0xB397,
-	53284 - 44032: 0xB398,
-	53285 - 44032: 0xB399,
-	53286 - 44032: 0xB39A,
-	53287 - 44032: 0xB39B,
-	53288 - 44032: 0xB39C,
-	53289 - 44032: 0xB39D,
-	53290 - 44032: 0xB39E,
-	53291 - 44032: 0xB39F,
-	53292 - 44032: 0xB3A0,
-	53293 - 44032: 0xC4FA,
-	53294 - 44032: 0xB441,
-	53295 - 44032: 0xB442,
-	53296 - 44032: 0xB443,
-	53297 - 44032: 0xB444,
-	53298 - 44032: 0xB445,
-	53299 - 44032: 0xB446,
-	53300 - 44032: 0xC4FB,
-	53301 - 44032: 0xC4FC,
-	53302 - 44032: 0xB447,
-	53303 - 44032: 0xB448,
-	53304 - 44032: 0xC4FD,
-	53305 - 44032: 0xB449,
-	53306 - 44032: 0xB44A,
-	53307 - 44032: 0xB44B,
-	53308 - 44032: 0xC4FE,
-	53309 - 44032: 0xB44C,
-	53310 - 44032: 0xB44D,
-	53311 - 44032: 0xB44E,
-	53312 - 44032: 0xB44F,
-	53313 - 44032: 0xB450,
-	53314 - 44032: 0xB451,
-	53315 - 44032: 0xB452,
-	53316 - 44032: 0xC5A1,
-	53317 - 44032: 0xC5A2,
-	53318 - 44032: 0xB453,
-	53319 - 44032: 0xC5A3,
-	53320 - 44032: 0xB454,
-	53321 - 44032: 0xC5A4,
-	53322 - 44032: 0xB455,
-	53323 - 44032: 0xB456,
-	53324 - 44032: 0xB457,
-	53325 - 44032: 0xB458,
-	53326 - 44032: 0xB459,
-	53327 - 44032: 0xB45A,
-	53328 - 44032: 0xC5A5,
-	53329 - 44032: 0xB461,
-	53330 - 44032: 0xB462,
-	53331 - 44032: 0xB463,
-	53332 - 44032: 0xC5A6,
-	53333 - 44032: 0xB464,
-	53334 - 44032: 0xB465,
-	53335 - 44032: 0xB466,
-	53336 - 44032: 0xC5A7,
-	53337 - 44032: 0xB467,
-	53338 - 44032: 0xB468,
-	53339 - 44032: 0xB469,
-	53340 - 44032: 0xB46A,
-	53341 - 44032: 0xB46B,
-	53342 - 44032: 0xB46C,
-	53343 - 44032: 0xB46D,
-	53344 - 44032: 0xC5A8,
-	53345 - 44032: 0xB46E,
-	53346 - 44032: 0xB46F,
-	53347 - 44032: 0xB470,
-	53348 - 44032: 0xB471,
-	53349 - 44032: 0xB472,
-	53350 - 44032: 0xB473,
-	53351 - 44032: 0xB474,
-	53352 - 44032: 0xB475,
-	53353 - 44032: 0xB476,
-	53354 - 44032: 0xB477,
-	53355 - 44032: 0xB478,
-	53356 - 44032: 0xC5A9,
-	53357 - 44032: 0xC5AA,
-	53358 - 44032: 0xB479,
-	53359 - 44032: 0xB47A,
-	53360 - 44032: 0xC5AB,
-	53361 - 44032: 0xB481,
-	53362 - 44032: 0xB482,
-	53363 - 44032: 0xB483,
-	53364 - 44032: 0xC5AC,
-	53365 - 44032: 0xB484,
-	53366 - 44032: 0xB485,
-	53367 - 44032: 0xB486,
-	53368 - 44032: 0xB487,
-	53369 - 44032: 0xB488,
-	53370 - 44032: 0xB489,
-	53371 - 44032: 0xB48A,
-	53372 - 44032: 0xC5AD,
-	53373 - 44032: 0xC5AE,
-	53374 - 44032: 0xB48B,
-	53375 - 44032: 0xB48C,
-	53376 - 44032: 0xB48D,
-	53377 - 44032: 0xC5AF,
-	53378 - 44032: 0xB48E,
-	53379 - 44032: 0xB48F,
-	53380 - 44032: 0xB490,
-	53381 - 44032: 0xB491,
-	53382 - 44032: 0xB492,
-	53383 - 44032: 0xB493,
-	53384 - 44032: 0xB494,
-	53385 - 44032: 0xB495,
-	53386 - 44032: 0xB496,
-	53387 - 44032: 0xB497,
-	53388 - 44032: 0xB498,
-	53389 - 44032: 0xB499,
-	53390 - 44032: 0xB49A,
-	53391 - 44032: 0xB49B,
-	53392 - 44032: 0xB49C,
-	53393 - 44032: 0xB49D,
-	53394 - 44032: 0xB49E,
-	53395 - 44032: 0xB49F,
-	53396 - 44032: 0xB4A0,
-	53397 - 44032: 0xB541,
-	53398 - 44032: 0xB542,
-	53399 - 44032: 0xB543,
-	53400 - 44032: 0xB544,
-	53401 - 44032: 0xB545,
-	53402 - 44032: 0xB546,
-	53403 - 44032: 0xB547,
-	53404 - 44032: 0xB548,
-	53405 - 44032: 0xB549,
-	53406 - 44032: 0xB54A,
-	53407 - 44032: 0xB54B,
-	53408 - 44032: 0xB54C,
-	53409 - 44032: 0xB54D,
-	53410 - 44032: 0xB54E,
-	53411 - 44032: 0xB54F,
-	53412 - 44032: 0xC5B0,
-	53413 - 44032: 0xC5B1,
-	53414 - 44032: 0xB550,
-	53415 - 44032: 0xB551,
-	53416 - 44032: 0xC5B2,
-	53417 - 44032: 0xB552,
-	53418 - 44032: 0xB553,
-	53419 - 44032: 0xB554,
-	53420 - 44032: 0xC5B3,
-	53421 - 44032: 0xB555,
-	53422 - 44032: 0xB556,
-	53423 - 44032: 0xB557,
-	53424 - 44032: 0xB558,
-	53425 - 44032: 0xB559,
-	53426 - 44032: 0xB55A,
-	53427 - 44032: 0xB561,
-	53428 - 44032: 0xC5B4,
-	53429 - 44032: 0xC5B5,
-	53430 - 44032: 0xB562,
-	53431 - 44032: 0xC5B6,
-	53432 - 44032: 0xB563,
-	53433 - 44032: 0xC5B7,
-	53434 - 44032: 0xB564,
-	53435 - 44032: 0xB565,
-	53436 - 44032: 0xB566,
-	53437 - 44032: 0xB567,
-	53438 - 44032: 0xB568,
-	53439 - 44032: 0xB569,
-	53440 - 44032: 0xC5B8,
-	53441 - 44032: 0xC5B9,
-	53442 - 44032: 0xB56A,
-	53443 - 44032: 0xB56B,
-	53444 - 44032: 0xC5BA,
-	53445 - 44032: 0xB56C,
-	53446 - 44032: 0xB56D,
-	53447 - 44032: 0xB56E,
-	53448 - 44032: 0xC5BB,
-	53449 - 44032: 0xC5BC,
-	53450 - 44032: 0xB56F,
-	53451 - 44032: 0xB570,
-	53452 - 44032: 0xB571,
-	53453 - 44032: 0xB572,
-	53454 - 44032: 0xB573,
-	53455 - 44032: 0xB574,
-	53456 - 44032: 0xC5BD,
-	53457 - 44032: 0xC5BE,
-	53458 - 44032: 0xB575,
-	53459 - 44032: 0xC5BF,
-	53460 - 44032: 0xC5C0,
-	53461 - 44032: 0xC5C1,
-	53462 - 44032: 0xB576,
-	53463 - 44032: 0xB577,
-	53464 - 44032: 0xB578,
-	53465 - 44032: 0xB579,
-	53466 - 44032: 0xB57A,
-	53467 - 44032: 0xB581,
-	53468 - 44032: 0xC5C2,
-	53469 - 44032: 0xC5C3,
-	53470 - 44032: 0xB582,
-	53471 - 44032: 0xB583,
-	53472 - 44032: 0xC5C4,
-	53473 - 44032: 0xB584,
-	53474 - 44032: 0xB585,
-	53475 - 44032: 0xB586,
-	53476 - 44032: 0xC5C5,
-	53477 - 44032: 0xB587,
-	53478 - 44032: 0xB588,
-	53479 - 44032: 0xB589,
-	53480 - 44032: 0xB58A,
-	53481 - 44032: 0xB58B,
-	53482 - 44032: 0xB58C,
-	53483 - 44032: 0xB58D,
-	53484 - 44032: 0xC5C6,
-	53485 - 44032: 0xC5C7,
-	53486 - 44032: 0xB58E,
-	53487 - 44032: 0xC5C8,
-	53488 - 44032: 0xC5C9,
-	53489 - 44032: 0xC5CA,
-	53490 - 44032: 0xB58F,
-	53491 - 44032: 0xB590,
-	53492 - 44032: 0xB591,
-	53493 - 44032: 0xB592,
-	53494 - 44032: 0xB593,
-	53495 - 44032: 0xB594,
-	53496 - 44032: 0xC5CB,
-	53497 - 44032: 0xB595,
-	53498 - 44032: 0xB596,
-	53499 - 44032: 0xB597,
-	53500 - 44032: 0xB598,
-	53501 - 44032: 0xB599,
-	53502 - 44032: 0xB59A,
-	53503 - 44032: 0xB59B,
-	53504 - 44032: 0xB59C,
-	53505 - 44032: 0xB59D,
-	53506 - 44032: 0xB59E,
-	53507 - 44032: 0xB59F,
-	53508 - 44032: 0xB5A0,
-	53509 - 44032: 0xB641,
-	53510 - 44032: 0xB642,
-	53511 - 44032: 0xB643,
-	53512 - 44032: 0xB644,
-	53513 - 44032: 0xB645,
-	53514 - 44032: 0xB646,
-	53515 - 44032: 0xB647,
-	53516 - 44032: 0xB648,
-	53517 - 44032: 0xC5CC,
-	53518 - 44032: 0xB649,
-	53519 - 44032: 0xB64A,
-	53520 - 44032: 0xB64B,
-	53521 - 44032: 0xB64C,
-	53522 - 44032: 0xB64D,
-	53523 - 44032: 0xB64E,
-	53524 - 44032: 0xB64F,
-	53525 - 44032: 0xB650,
-	53526 - 44032: 0xB651,
-	53527 - 44032: 0xB652,
-	53528 - 44032: 0xB653,
-	53529 - 44032: 0xB654,
-	53530 - 44032: 0xB655,
-	53531 - 44032: 0xB656,
-	53532 - 44032: 0xB657,
-	53533 - 44032: 0xB658,
-	53534 - 44032: 0xB659,
-	53535 - 44032: 0xB65A,
-	53536 - 44032: 0xB661,
-	53537 - 44032: 0xB662,
-	53538 - 44032: 0xB663,
-	53539 - 44032: 0xB664,
-	53540 - 44032: 0xB665,
-	53541 - 44032: 0xB666,
-	53542 - 44032: 0xB667,
-	53543 - 44032: 0xB668,
-	53544 - 44032: 0xB669,
-	53545 - 44032: 0xB66A,
-	53546 - 44032: 0xB66B,
-	53547 - 44032: 0xB66C,
-	53548 - 44032: 0xB66D,
-	53549 - 44032: 0xB66E,
-	53550 - 44032: 0xB66F,
-	53551 - 44032: 0xB670,
-	53552 - 44032: 0xC5CD,
-	53553 - 44032: 0xC5CE,
-	53554 - 44032: 0xB671,
-	53555 - 44032: 0xB672,
-	53556 - 44032: 0xC5CF,
-	53557 - 44032: 0xB673,
-	53558 - 44032: 0xB674,
-	53559 - 44032: 0xB675,
-	53560 - 44032: 0xC5D0,
-	53561 - 44032: 0xB676,
-	53562 - 44032: 0xC5D1,
-	53563 - 44032: 0xB677,
-	53564 - 44032: 0xB678,
-	53565 - 44032: 0xB679,
-	53566 - 44032: 0xB67A,
-	53567 - 44032: 0xB681,
-	53568 - 44032: 0xC5D2,
-	53569 - 44032: 0xC5D3,
-	53570 - 44032: 0xB682,
-	53571 - 44032: 0xC5D4,
-	53572 - 44032: 0xC5D5,
-	53573 - 44032: 0xC5D6,
-	53574 - 44032: 0xB683,
-	53575 - 44032: 0xB684,
-	53576 - 44032: 0xB685,
-	53577 - 44032: 0xB686,
-	53578 - 44032: 0xB687,
-	53579 - 44032: 0xB688,
-	53580 - 44032: 0xC5D7,
-	53581 - 44032: 0xC5D8,
-	53582 - 44032: 0xB689,
-	53583 - 44032: 0xB68A,
-	53584 - 44032: 0xC5D9,
-	53585 - 44032: 0xB68B,
-	53586 - 44032: 0xB68C,
-	53587 - 44032: 0xB68D,
-	53588 - 44032: 0xC5DA,
-	53589 - 44032: 0xB68E,
-	53590 - 44032: 0xB68F,
-	53591 - 44032: 0xB690,
-	53592 - 44032: 0xB691,
-	53593 - 44032: 0xB692,
-	53594 - 44032: 0xB693,
-	53595 - 44032: 0xB694,
-	53596 - 44032: 0xC5DB,
-	53597 - 44032: 0xC5DC,
-	53598 - 44032: 0xB695,
-	53599 - 44032: 0xC5DD,
-	53600 - 44032: 0xB696,
-	53601 - 44032: 0xC5DE,
-	53602 - 44032: 0xB697,
-	53603 - 44032: 0xB698,
-	53604 - 44032: 0xB699,
-	53605 - 44032: 0xB69A,
-	53606 - 44032: 0xB69B,
-	53607 - 44032: 0xB69C,
-	53608 - 44032: 0xC5DF,
-	53609 - 44032: 0xB69D,
-	53610 - 44032: 0xB69E,
-	53611 - 44032: 0xB69F,
-	53612 - 44032: 0xC5E0,
-	53613 - 44032: 0xB6A0,
-	53614 - 44032: 0xB741,
-	53615 - 44032: 0xB742,
-	53616 - 44032: 0xB743,
-	53617 - 44032: 0xB744,
-	53618 - 44032: 0xB745,
-	53619 - 44032: 0xB746,
-	53620 - 44032: 0xB747,
-	53621 - 44032: 0xB748,
-	53622 - 44032: 0xB749,
-	53623 - 44032: 0xB74A,
-	53624 - 44032: 0xB74B,
-	53625 - 44032: 0xB74C,
-	53626 - 44032: 0xB74D,
-	53627 - 44032: 0xB74E,
-	53628 - 44032: 0xC5E1,
-	53629 - 44032: 0xB74F,
-	53630 - 44032: 0xB750,
-	53631 - 44032: 0xB751,
-	53632 - 44032: 0xB752,
-	53633 - 44032: 0xB753,
-	53634 - 44032: 0xB754,
-	53635 - 44032: 0xB755,
-	53636 - 44032: 0xC5E2,
-	53637 - 44032: 0xB756,
-	53638 - 44032: 0xB757,
-	53639 - 44032: 0xB758,
-	53640 - 44032: 0xC5E3,
-	53641 - 44032: 0xB759,
-	53642 - 44032: 0xB75A,
-	53643 - 44032: 0xB761,
-	53644 - 44032: 0xB762,
-	53645 - 44032: 0xB763,
-	53646 - 44032: 0xB764,
-	53647 - 44032: 0xB765,
-	53648 - 44032: 0xB766,
-	53649 - 44032: 0xB767,
-	53650 - 44032: 0xB768,
-	53651 - 44032: 0xB769,
-	53652 - 44032: 0xB76A,
-	53653 - 44032: 0xB76B,
-	53654 - 44032: 0xB76C,
-	53655 - 44032: 0xB76D,
-	53656 - 44032: 0xB76E,
-	53657 - 44032: 0xB76F,
-	53658 - 44032: 0xB770,
-	53659 - 44032: 0xB771,
-	53660 - 44032: 0xB772,
-	53661 - 44032: 0xB773,
-	53662 - 44032: 0xB774,
-	53663 - 44032: 0xB775,
-	53664 - 44032: 0xC5E4,
-	53665 - 44032: 0xC5E5,
-	53666 - 44032: 0xB776,
-	53667 - 44032: 0xB777,
-	53668 - 44032: 0xC5E6,
-	53669 - 44032: 0xB778,
-	53670 - 44032: 0xB779,
-	53671 - 44032: 0xB77A,
-	53672 - 44032: 0xC5E7,
-	53673 - 44032: 0xB781,
-	53674 - 44032: 0xB782,
-	53675 - 44032: 0xB783,
-	53676 - 44032: 0xB784,
-	53677 - 44032: 0xB785,
-	53678 - 44032: 0xB786,
-	53679 - 44032: 0xB787,
-	53680 - 44032: 0xC5E8,
-	53681 - 44032: 0xC5E9,
-	53682 - 44032: 0xB788,
-	53683 - 44032: 0xC5EA,
-	53684 - 44032: 0xB789,
-	53685 - 44032: 0xC5EB,
-	53686 - 44032: 0xB78A,
-	53687 - 44032: 0xB78B,
-	53688 - 44032: 0xB78C,
-	53689 - 44032: 0xB78D,
-	53690 - 44032: 0xC5EC,
-	53691 - 44032: 0xB78E,
-	53692 - 44032: 0xC5ED,
-	53693 - 44032: 0xB78F,
-	53694 - 44032: 0xB790,
-	53695 - 44032: 0xB791,
-	53696 - 44032: 0xC5EE,
-	53697 - 44032: 0xB792,
-	53698 - 44032: 0xB793,
-	53699 - 44032: 0xB794,
-	53700 - 44032: 0xB795,
-	53701 - 44032: 0xB796,
-	53702 - 44032: 0xB797,
-	53703 - 44032: 0xB798,
-	53704 - 44032: 0xB799,
-	53705 - 44032: 0xB79A,
-	53706 - 44032: 0xB79B,
-	53707 - 44032: 0xB79C,
-	53708 - 44032: 0xB79D,
-	53709 - 44032: 0xB79E,
-	53710 - 44032: 0xB79F,
-	53711 - 44032: 0xB7A0,
-	53712 - 44032: 0xB841,
-	53713 - 44032: 0xB842,
-	53714 - 44032: 0xB843,
-	53715 - 44032: 0xB844,
-	53716 - 44032: 0xB845,
-	53717 - 44032: 0xB846,
-	53718 - 44032: 0xB847,
-	53719 - 44032: 0xB848,
-	53720 - 44032: 0xC5EF,
-	53721 - 44032: 0xB849,
-	53722 - 44032: 0xB84A,
-	53723 - 44032: 0xB84B,
-	53724 - 44032: 0xB84C,
-	53725 - 44032: 0xB84D,
-	53726 - 44032: 0xB84E,
-	53727 - 44032: 0xB84F,
-	53728 - 44032: 0xB850,
-	53729 - 44032: 0xB851,
-	53730 - 44032: 0xB852,
-	53731 - 44032: 0xB853,
-	53732 - 44032: 0xB854,
-	53733 - 44032: 0xB855,
-	53734 - 44032: 0xB856,
-	53735 - 44032: 0xB857,
-	53736 - 44032: 0xB858,
-	53737 - 44032: 0xB859,
-	53738 - 44032: 0xB85A,
-	53739 - 44032: 0xB861,
-	53740 - 44032: 0xB862,
-	53741 - 44032: 0xB863,
-	53742 - 44032: 0xB864,
-	53743 - 44032: 0xB865,
-	53744 - 44032: 0xB866,
-	53745 - 44032: 0xB867,
-	53746 - 44032: 0xB868,
-	53747 - 44032: 0xB869,
-	53748 - 44032: 0xC5F0,
-	53749 - 44032: 0xB86A,
-	53750 - 44032: 0xB86B,
-	53751 - 44032: 0xB86C,
-	53752 - 44032: 0xC5F1,
-	53753 - 44032: 0xB86D,
-	53754 - 44032: 0xB86E,
-	53755 - 44032: 0xB86F,
-	53756 - 44032: 0xB870,
-	53757 - 44032: 0xB871,
-	53758 - 44032: 0xB872,
-	53759 - 44032: 0xB873,
-	53760 - 44032: 0xB874,
-	53761 - 44032: 0xB875,
-	53762 - 44032: 0xB876,
-	53763 - 44032: 0xB877,
-	53764 - 44032: 0xB878,
-	53765 - 44032: 0xB879,
-	53766 - 44032: 0xB87A,
-	53767 - 44032: 0xC5F2,
-	53768 - 44032: 0xB881,
-	53769 - 44032: 0xC5F3,
-	53770 - 44032: 0xB882,
-	53771 - 44032: 0xB883,
-	53772 - 44032: 0xB884,
-	53773 - 44032: 0xB885,
-	53774 - 44032: 0xB886,
-	53775 - 44032: 0xB887,
-	53776 - 44032: 0xC5F4,
-	53777 - 44032: 0xB888,
-	53778 - 44032: 0xB889,
-	53779 - 44032: 0xB88A,
-	53780 - 44032: 0xB88B,
-	53781 - 44032: 0xB88C,
-	53782 - 44032: 0xB88D,
-	53783 - 44032: 0xB88E,
-	53784 - 44032: 0xB88F,
-	53785 - 44032: 0xB890,
-	53786 - 44032: 0xB891,
-	53787 - 44032: 0xB892,
-	53788 - 44032: 0xB893,
-	53789 - 44032: 0xB894,
-	53790 - 44032: 0xB895,
-	53791 - 44032: 0xB896,
-	53792 - 44032: 0xB897,
-	53793 - 44032: 0xB898,
-	53794 - 44032: 0xB899,
-	53795 - 44032: 0xB89A,
-	53796 - 44032: 0xB89B,
-	53797 - 44032: 0xB89C,
-	53798 - 44032: 0xB89D,
-	53799 - 44032: 0xB89E,
-	53800 - 44032: 0xB89F,
-	53801 - 44032: 0xB8A0,
-	53802 - 44032: 0xB941,
-	53803 - 44032: 0xB942,
-	53804 - 44032: 0xC5F5,
-	53805 - 44032: 0xC5F6,
-	53806 - 44032: 0xB943,
-	53807 - 44032: 0xB944,
-	53808 - 44032: 0xC5F7,
-	53809 - 44032: 0xB945,
-	53810 - 44032: 0xB946,
-	53811 - 44032: 0xB947,
-	53812 - 44032: 0xC5F8,
-	53813 - 44032: 0xB948,
-	53814 - 44032: 0xB949,
-	53815 - 44032: 0xB94A,
-	53816 - 44032: 0xB94B,
-	53817 - 44032: 0xB94C,
-	53818 - 44032: 0xB94D,
-	53819 - 44032: 0xB94E,
-	53820 - 44032: 0xC5F9,
-	53821 - 44032: 0xC5FA,
-	53822 - 44032: 0xB94F,
-	53823 - 44032: 0xC5FB,
-	53824 - 44032: 0xB950,
-	53825 - 44032: 0xC5FC,
-	53826 - 44032: 0xB951,
-	53827 - 44032: 0xB952,
-	53828 - 44032: 0xB953,
-	53829 - 44032: 0xB954,
-	53830 - 44032: 0xB955,
-	53831 - 44032: 0xB956,
-	53832 - 44032: 0xC5FD,
-	53833 - 44032: 0xB957,
-	53834 - 44032: 0xB958,
-	53835 - 44032: 0xB959,
-	53836 - 44032: 0xB95A,
-	53837 - 44032: 0xB961,
-	53838 - 44032: 0xB962,
-	53839 - 44032: 0xB963,
-	53840 - 44032: 0xB964,
-	53841 - 44032: 0xB965,
-	53842 - 44032: 0xB966,
-	53843 - 44032: 0xB967,
-	53844 - 44032: 0xB968,
-	53845 - 44032: 0xB969,
-	53846 - 44032: 0xB96A,
-	53847 - 44032: 0xB96B,
-	53848 - 44032: 0xB96C,
-	53849 - 44032: 0xB96D,
-	53850 - 44032: 0xB96E,
-	53851 - 44032: 0xB96F,
-	53852 - 44032: 0xC5FE,
-	53853 - 44032: 0xB970,
-	53854 - 44032: 0xB971,
-	53855 - 44032: 0xB972,
-	53856 - 44032: 0xB973,
-	53857 - 44032: 0xB974,
-	53858 - 44032: 0xB975,
-	53859 - 44032: 0xB976,
-	53860 - 44032: 0xC6A1,
-	53861 - 44032: 0xB977,
-	53862 - 44032: 0xB978,
-	53863 - 44032: 0xB979,
-	53864 - 44032: 0xB97A,
-	53865 - 44032: 0xB981,
-	53866 - 44032: 0xB982,
-	53867 - 44032: 0xB983,
-	53868 - 44032: 0xB984,
-	53869 - 44032: 0xB985,
-	53870 - 44032: 0xB986,
-	53871 - 44032: 0xB987,
-	53872 - 44032: 0xB988,
-	53873 - 44032: 0xB989,
-	53874 - 44032: 0xB98A,
-	53875 - 44032: 0xB98B,
-	53876 - 44032: 0xB98C,
-	53877 - 44032: 0xB98D,
-	53878 - 44032: 0xB98E,
-	53879 - 44032: 0xB98F,
-	53880 - 44032: 0xB990,
-	53881 - 44032: 0xB991,
-	53882 - 44032: 0xB992,
-	53883 - 44032: 0xB993,
-	53884 - 44032: 0xB994,
-	53885 - 44032: 0xB995,
-	53886 - 44032: 0xB996,
-	53887 - 44032: 0xB997,
-	53888 - 44032: 0xC6A2,
-	53889 - 44032: 0xC6A3,
-	53890 - 44032: 0xB998,
-	53891 - 44032: 0xB999,
-	53892 - 44032: 0xC6A4,
-	53893 - 44032: 0xB99A,
-	53894 - 44032: 0xB99B,
-	53895 - 44032: 0xB99C,
-	53896 - 44032: 0xC6A5,
-	53897 - 44032: 0xB99D,
-	53898 - 44032: 0xB99E,
-	53899 - 44032: 0xB99F,
-	53900 - 44032: 0xB9A0,
-	53901 - 44032: 0xBA41,
-	53902 - 44032: 0xBA42,
-	53903 - 44032: 0xBA43,
-	53904 - 44032: 0xC6A6,
-	53905 - 44032: 0xC6A7,
-	53906 - 44032: 0xBA44,
-	53907 - 44032: 0xBA45,
-	53908 - 44032: 0xBA46,
-	53909 - 44032: 0xC6A8,
-	53910 - 44032: 0xBA47,
-	53911 - 44032: 0xBA48,
-	53912 - 44032: 0xBA49,
-	53913 - 44032: 0xBA4A,
-	53914 - 44032: 0xBA4B,
-	53915 - 44032: 0xBA4C,
-	53916 - 44032: 0xC6A9,
-	53917 - 44032: 0xBA4D,
-	53918 - 44032: 0xBA4E,
-	53919 - 44032: 0xBA4F,
-	53920 - 44032: 0xC6AA,
-	53921 - 44032: 0xBA50,
-	53922 - 44032: 0xBA51,
-	53923 - 44032: 0xBA52,
-	53924 - 44032: 0xC6AB,
-	53925 - 44032: 0xBA53,
-	53926 - 44032: 0xBA54,
-	53927 - 44032: 0xBA55,
-	53928 - 44032: 0xBA56,
-	53929 - 44032: 0xBA57,
-	53930 - 44032: 0xBA58,
-	53931 - 44032: 0xBA59,
-	53932 - 44032: 0xC6AC,
-	53933 - 44032: 0xBA5A,
-	53934 - 44032: 0xBA61,
-	53935 - 44032: 0xBA62,
-	53936 - 44032: 0xBA63,
-	53937 - 44032: 0xC6AD,
-	53938 - 44032: 0xBA64,
-	53939 - 44032: 0xBA65,
-	53940 - 44032: 0xBA66,
-	53941 - 44032: 0xBA67,
-	53942 - 44032: 0xBA68,
-	53943 - 44032: 0xBA69,
-	53944 - 44032: 0xC6AE,
-	53945 - 44032: 0xC6AF,
-	53946 - 44032: 0xBA6A,
-	53947 - 44032: 0xBA6B,
-	53948 - 44032: 0xC6B0,
-	53949 - 44032: 0xBA6C,
-	53950 - 44032: 0xBA6D,
-	53951 - 44032: 0xC6B1,
-	53952 - 44032: 0xC6B2,
-	53953 - 44032: 0xBA6E,
-	53954 - 44032: 0xC6B3,
-	53955 - 44032: 0xBA6F,
-	53956 - 44032: 0xBA70,
-	53957 - 44032: 0xBA71,
-	53958 - 44032: 0xBA72,
-	53959 - 44032: 0xBA73,
-	53960 - 44032: 0xC6B4,
-	53961 - 44032: 0xC6B5,
-	53962 - 44032: 0xBA74,
-	53963 - 44032: 0xC6B6,
-	53964 - 44032: 0xBA75,
-	53965 - 44032: 0xBA76,
-	53966 - 44032: 0xBA77,
-	53967 - 44032: 0xBA78,
-	53968 - 44032: 0xBA79,
-	53969 - 44032: 0xBA7A,
-	53970 - 44032: 0xBA81,
-	53971 - 44032: 0xBA82,
-	53972 - 44032: 0xC6B7,
-	53973 - 44032: 0xBA83,
-	53974 - 44032: 0xBA84,
-	53975 - 44032: 0xBA85,
-	53976 - 44032: 0xC6B8,
-	53977 - 44032: 0xBA86,
-	53978 - 44032: 0xBA87,
-	53979 - 44032: 0xBA88,
-	53980 - 44032: 0xC6B9,
-	53981 - 44032: 0xBA89,
-	53982 - 44032: 0xBA8A,
-	53983 - 44032: 0xBA8B,
-	53984 - 44032: 0xBA8C,
-	53985 - 44032: 0xBA8D,
-	53986 - 44032: 0xBA8E,
-	53987 - 44032: 0xBA8F,
-	53988 - 44032: 0xC6BA,
-	53989 - 44032: 0xC6BB,
-	53990 - 44032: 0xBA90,
-	53991 - 44032: 0xBA91,
-	53992 - 44032: 0xBA92,
-	53993 - 44032: 0xBA93,
-	53994 - 44032: 0xBA94,
-	53995 - 44032: 0xBA95,
-	53996 - 44032: 0xBA96,
-	53997 - 44032: 0xBA97,
-	53998 - 44032: 0xBA98,
-	53999 - 44032: 0xBA99,
-	54000 - 44032: 0xC6BC,
-	54001 - 44032: 0xC6BD,
-	54002 - 44032: 0xBA9A,
-	54003 - 44032: 0xBA9B,
-	54004 - 44032: 0xC6BE,
-	54005 - 44032: 0xBA9C,
-	54006 - 44032: 0xBA9D,
-	54007 - 44032: 0xBA9E,
-	54008 - 44032: 0xC6BF,
-	54009 - 44032: 0xBA9F,
-	54010 - 44032: 0xBAA0,
-	54011 - 44032: 0xBB41,
-	54012 - 44032: 0xBB42,
-	54013 - 44032: 0xBB43,
-	54014 - 44032: 0xBB44,
-	54015 - 44032: 0xBB45,
-	54016 - 44032: 0xC6C0,
-	54017 - 44032: 0xC6C1,
-	54018 - 44032: 0xBB46,
-	54019 - 44032: 0xC6C2,
-	54020 - 44032: 0xBB47,
-	54021 - 44032: 0xC6C3,
-	54022 - 44032: 0xBB48,
-	54023 - 44032: 0xBB49,
-	54024 - 44032: 0xBB4A,
-	54025 - 44032: 0xBB4B,
-	54026 - 44032: 0xBB4C,
-	54027 - 44032: 0xBB4D,
-	54028 - 44032: 0xC6C4,
-	54029 - 44032: 0xC6C5,
-	54030 - 44032: 0xC6C6,
-	54031 - 44032: 0xBB4E,
-	54032 - 44032: 0xC6C7,
-	54033 - 44032: 0xBB4F,
-	54034 - 44032: 0xBB50,
-	54035 - 44032: 0xBB51,
-	54036 - 44032: 0xC6C8,
-	54037 - 44032: 0xBB52,
-	54038 - 44032: 0xC6C9,
-	54039 - 44032: 0xBB53,
-	54040 - 44032: 0xBB54,
-	54041 - 44032: 0xBB55,
-	54042 - 44032: 0xBB56,
-	54043 - 44032: 0xBB57,
-	54044 - 44032: 0xC6CA,
-	54045 - 44032: 0xC6CB,
-	54046 - 44032: 0xBB58,
-	54047 - 44032: 0xC6CC,
-	54048 - 44032: 0xC6CD,
-	54049 - 44032: 0xC6CE,
-	54050 - 44032: 0xBB59,
-	54051 - 44032: 0xBB5A,
-	54052 - 44032: 0xBB61,
-	54053 - 44032: 0xC6CF,
-	54054 - 44032: 0xBB62,
-	54055 - 44032: 0xBB63,
-	54056 - 44032: 0xC6D0,
-	54057 - 44032: 0xC6D1,
-	54058 - 44032: 0xBB64,
-	54059 - 44032: 0xBB65,
-	54060 - 44032: 0xC6D2,
-	54061 - 44032: 0xBB66,
-	54062 - 44032: 0xBB67,
-	54063 - 44032: 0xBB68,
-	54064 - 44032: 0xC6D3,
-	54065 - 44032: 0xBB69,
-	54066 - 44032: 0xBB6A,
-	54067 - 44032: 0xBB6B,
-	54068 - 44032: 0xBB6C,
-	54069 - 44032: 0xBB6D,
-	54070 - 44032: 0xBB6E,
-	54071 - 44032: 0xBB6F,
-	54072 - 44032: 0xC6D4,
-	54073 - 44032: 0xC6D5,
-	54074 - 44032: 0xBB70,
-	54075 - 44032: 0xC6D6,
-	54076 - 44032: 0xC6D7,
-	54077 - 44032: 0xC6D8,
-	54078 - 44032: 0xBB71,
-	54079 - 44032: 0xBB72,
-	54080 - 44032: 0xBB73,
-	54081 - 44032: 0xBB74,
-	54082 - 44032: 0xBB75,
-	54083 - 44032: 0xBB76,
-	54084 - 44032: 0xC6D9,
-	54085 - 44032: 0xC6DA,
-	54086 - 44032: 0xBB77,
-	54087 - 44032: 0xBB78,
-	54088 - 44032: 0xBB79,
-	54089 - 44032: 0xBB7A,
-	54090 - 44032: 0xBB81,
-	54091 - 44032: 0xBB82,
-	54092 - 44032: 0xBB83,
-	54093 - 44032: 0xBB84,
-	54094 - 44032: 0xBB85,
-	54095 - 44032: 0xBB86,
-	54096 - 44032: 0xBB87,
-	54097 - 44032: 0xBB88,
-	54098 - 44032: 0xBB89,
-	54099 - 44032: 0xBB8A,
-	54100 - 44032: 0xBB8B,
-	54101 - 44032: 0xBB8C,
-	54102 - 44032: 0xBB8D,
-	54103 - 44032: 0xBB8E,
-	54104 - 44032: 0xBB8F,
-	54105 - 44032: 0xBB90,
-	54106 - 44032: 0xBB91,
-	54107 - 44032: 0xBB92,
-	54108 - 44032: 0xBB93,
-	54109 - 44032: 0xBB94,
-	54110 - 44032: 0xBB95,
-	54111 - 44032: 0xBB96,
-	54112 - 44032: 0xBB97,
-	54113 - 44032: 0xBB98,
-	54114 - 44032: 0xBB99,
-	54115 - 44032: 0xBB9A,
-	54116 - 44032: 0xBB9B,
-	54117 - 44032: 0xBB9C,
-	54118 - 44032: 0xBB9D,
-	54119 - 44032: 0xBB9E,
-	54120 - 44032: 0xBB9F,
-	54121 - 44032: 0xBBA0,
-	54122 - 44032: 0xBC41,
-	54123 - 44032: 0xBC42,
-	54124 - 44032: 0xBC43,
-	54125 - 44032: 0xBC44,
-	54126 - 44032: 0xBC45,
-	54127 - 44032: 0xBC46,
-	54128 - 44032: 0xBC47,
-	54129 - 44032: 0xBC48,
-	54130 - 44032: 0xBC49,
-	54131 - 44032: 0xBC4A,
-	54132 - 44032: 0xBC4B,
-	54133 - 44032: 0xBC4C,
-	54134 - 44032: 0xBC4D,
-	54135 - 44032: 0xBC4E,
-	54136 - 44032: 0xBC4F,
-	54137 - 44032: 0xBC50,
-	54138 - 44032: 0xBC51,
-	54139 - 44032: 0xBC52,
-	54140 - 44032: 0xC6DB,
-	54141 - 44032: 0xC6DC,
-	54142 - 44032: 0xBC53,
-	54143 - 44032: 0xBC54,
-	54144 - 44032: 0xC6DD,
-	54145 - 44032: 0xBC55,
-	54146 - 44032: 0xBC56,
-	54147 - 44032: 0xBC57,
-	54148 - 44032: 0xC6DE,
-	54149 - 44032: 0xBC58,
-	54150 - 44032: 0xBC59,
-	54151 - 44032: 0xBC5A,
-	54152 - 44032: 0xBC61,
-	54153 - 44032: 0xBC62,
-	54154 - 44032: 0xBC63,
-	54155 - 44032: 0xBC64,
-	54156 - 44032: 0xC6DF,
-	54157 - 44032: 0xC6E0,
-	54158 - 44032: 0xBC65,
-	54159 - 44032: 0xC6E1,
-	54160 - 44032: 0xC6E2,
-	54161 - 44032: 0xC6E3,
-	54162 - 44032: 0xBC66,
-	54163 - 44032: 0xBC67,
-	54164 - 44032: 0xBC68,
-	54165 - 44032: 0xBC69,
-	54166 - 44032: 0xBC6A,
-	54167 - 44032: 0xBC6B,
-	54168 - 44032: 0xC6E4,
-	54169 - 44032: 0xC6E5,
-	54170 - 44032: 0xBC6C,
-	54171 - 44032: 0xBC6D,
-	54172 - 44032: 0xC6E6,
-	54173 - 44032: 0xBC6E,
-	54174 - 44032: 0xBC6F,
-	54175 - 44032: 0xBC70,
-	54176 - 44032: 0xC6E7,
-	54177 - 44032: 0xBC71,
-	54178 - 44032: 0xBC72,
-	54179 - 44032: 0xBC73,
-	54180 - 44032: 0xBC74,
-	54181 - 44032: 0xBC75,
-	54182 - 44032: 0xBC76,
-	54183 - 44032: 0xBC77,
-	54184 - 44032: 0xC6E8,
-	54185 - 44032: 0xC6E9,
-	54186 - 44032: 0xBC78,
-	54187 - 44032: 0xC6EA,
-	54188 - 44032: 0xBC79,
-	54189 - 44032: 0xC6EB,
-	54190 - 44032: 0xBC7A,
-	54191 - 44032: 0xBC81,
-	54192 - 44032: 0xBC82,
-	54193 - 44032: 0xBC83,
-	54194 - 44032: 0xBC84,
-	54195 - 44032: 0xBC85,
-	54196 - 44032: 0xC6EC,
-	54197 - 44032: 0xBC86,
-	54198 - 44032: 0xBC87,
-	54199 - 44032: 0xBC88,
-	54200 - 44032: 0xC6ED,
-	54201 - 44032: 0xBC89,
-	54202 - 44032: 0xBC8A,
-	54203 - 44032: 0xBC8B,
-	54204 - 44032: 0xC6EE,
-	54205 - 44032: 0xBC8C,
-	54206 - 44032: 0xBC8D,
-	54207 - 44032: 0xBC8E,
-	54208 - 44032: 0xBC8F,
-	54209 - 44032: 0xBC90,
-	54210 - 44032: 0xBC91,
-	54211 - 44032: 0xBC92,
-	54212 - 44032: 0xC6EF,
-	54213 - 44032: 0xC6F0,
-	54214 - 44032: 0xBC93,
-	54215 - 44032: 0xBC94,
-	54216 - 44032: 0xC6F1,
-	54217 - 44032: 0xC6F2,
-	54218 - 44032: 0xBC95,
-	54219 - 44032: 0xBC96,
-	54220 - 44032: 0xBC97,
-	54221 - 44032: 0xBC98,
-	54222 - 44032: 0xBC99,
-	54223 - 44032: 0xBC9A,
-	54224 - 44032: 0xC6F3,
-	54225 - 44032: 0xBC9B,
-	54226 - 44032: 0xBC9C,
-	54227 - 44032: 0xBC9D,
-	54228 - 44032: 0xBC9E,
-	54229 - 44032: 0xBC9F,
-	54230 - 44032: 0xBCA0,
-	54231 - 44032: 0xBD41,
-	54232 - 44032: 0xC6F4,
-	54233 - 44032: 0xBD42,
-	54234 - 44032: 0xBD43,
-	54235 - 44032: 0xBD44,
-	54236 - 44032: 0xBD45,
-	54237 - 44032: 0xBD46,
-	54238 - 44032: 0xBD47,
-	54239 - 44032: 0xBD48,
-	54240 - 44032: 0xBD49,
-	54241 - 44032: 0xC6F5,
-	54242 - 44032: 0xBD4A,
-	54243 - 44032: 0xC6F6,
-	54244 - 44032: 0xBD4B,
-	54245 - 44032: 0xBD4C,
-	54246 - 44032: 0xBD4D,
-	54247 - 44032: 0xBD4E,
-	54248 - 44032: 0xBD4F,
-	54249 - 44032: 0xBD50,
-	54250 - 44032: 0xBD51,
-	54251 - 44032: 0xBD52,
-	54252 - 44032: 0xC6F7,
-	54253 - 44032: 0xC6F8,
-	54254 - 44032: 0xBD53,
-	54255 - 44032: 0xBD54,
-	54256 - 44032: 0xC6F9,
-	54257 - 44032: 0xBD55,
-	54258 - 44032: 0xBD56,
-	54259 - 44032: 0xBD57,
-	54260 - 44032: 0xC6FA,
-	54261 - 44032: 0xBD58,
-	54262 - 44032: 0xBD59,
-	54263 - 44032: 0xBD5A,
-	54264 - 44032: 0xBD61,
-	54265 - 44032: 0xBD62,
-	54266 - 44032: 0xBD63,
-	54267 - 44032: 0xBD64,
-	54268 - 44032: 0xC6FB,
-	54269 - 44032: 0xC6FC,
-	54270 - 44032: 0xBD65,
-	54271 - 44032: 0xC6FD,
-	54272 - 44032: 0xBD66,
-	54273 - 44032: 0xC6FE,
-	54274 - 44032: 0xBD67,
-	54275 - 44032: 0xBD68,
-	54276 - 44032: 0xBD69,
-	54277 - 44032: 0xBD6A,
-	54278 - 44032: 0xBD6B,
-	54279 - 44032: 0xBD6C,
-	54280 - 44032: 0xC7A1,
-	54281 - 44032: 0xBD6D,
-	54282 - 44032: 0xBD6E,
-	54283 - 44032: 0xBD6F,
-	54284 - 44032: 0xBD70,
-	54285 - 44032: 0xBD71,
-	54286 - 44032: 0xBD72,
-	54287 - 44032: 0xBD73,
-	54288 - 44032: 0xBD74,
-	54289 - 44032: 0xBD75,
-	54290 - 44032: 0xBD76,
-	54291 - 44032: 0xBD77,
-	54292 - 44032: 0xBD78,
-	54293 - 44032: 0xBD79,
-	54294 - 44032: 0xBD7A,
-	54295 - 44032: 0xBD81,
-	54296 - 44032: 0xBD82,
-	54297 - 44032: 0xBD83,
-	54298 - 44032: 0xBD84,
-	54299 - 44032: 0xBD85,
-	54300 - 44032: 0xBD86,
-	54301 - 44032: 0xC7A2,
-	54302 - 44032: 0xBD87,
-	54303 - 44032: 0xBD88,
-	54304 - 44032: 0xBD89,
-	54305 - 44032: 0xBD8A,
-	54306 - 44032: 0xBD8B,
-	54307 - 44032: 0xBD8C,
-	54308 - 44032: 0xBD8D,
-	54309 - 44032: 0xBD8E,
-	54310 - 44032: 0xBD8F,
-	54311 - 44032: 0xBD90,
-	54312 - 44032: 0xBD91,
-	54313 - 44032: 0xBD92,
-	54314 - 44032: 0xBD93,
-	54315 - 44032: 0xBD94,
-	54316 - 44032: 0xBD95,
-	54317 - 44032: 0xBD96,
-	54318 - 44032: 0xBD97,
-	54319 - 44032: 0xBD98,
-	54320 - 44032: 0xBD99,
-	54321 - 44032: 0xBD9A,
-	54322 - 44032: 0xBD9B,
-	54323 - 44032: 0xBD9C,
-	54324 - 44032: 0xBD9D,
-	54325 - 44032: 0xBD9E,
-	54326 - 44032: 0xBD9F,
-	54327 - 44032: 0xBDA0,
-	54328 - 44032: 0xBE41,
-	54329 - 44032: 0xBE42,
-	54330 - 44032: 0xBE43,
-	54331 - 44032: 0xBE44,
-	54332 - 44032: 0xBE45,
-	54333 - 44032: 0xBE46,
-	54334 - 44032: 0xBE47,
-	54335 - 44032: 0xBE48,
-	54336 - 44032: 0xC7A3,
-	54337 - 44032: 0xBE49,
-	54338 - 44032: 0xBE4A,
-	54339 - 44032: 0xBE4B,
-	54340 - 44032: 0xC7A4,
-	54341 - 44032: 0xBE4C,
-	54342 - 44032: 0xBE4D,
-	54343 - 44032: 0xBE4E,
-	54344 - 44032: 0xBE4F,
-	54345 - 44032: 0xBE50,
-	54346 - 44032: 0xBE51,
-	54347 - 44032: 0xBE52,
-	54348 - 44032: 0xBE53,
-	54349 - 44032: 0xBE54,
-	54350 - 44032: 0xBE55,
-	54351 - 44032: 0xBE56,
-	54352 - 44032: 0xBE57,
-	54353 - 44032: 0xBE58,
-	54354 - 44032: 0xBE59,
-	54355 - 44032: 0xBE5A,
-	54356 - 44032: 0xBE61,
-	54357 - 44032: 0xBE62,
-	54358 - 44032: 0xBE63,
-	54359 - 44032: 0xBE64,
-	54360 - 44032: 0xBE65,
-	54361 - 44032: 0xBE66,
-	54362 - 44032: 0xBE67,
-	54363 - 44032: 0xBE68,
-	54364 - 44032: 0xC7A5,
-	54365 - 44032: 0xBE69,
-	54366 - 44032: 0xBE6A,
-	54367 - 44032: 0xBE6B,
-	54368 - 44032: 0xC7A6,
-	54369 - 44032: 0xBE6C,
-	54370 - 44032: 0xBE6D,
-	54371 - 44032: 0xBE6E,
-	54372 - 44032: 0xC7A7,
-	54373 - 44032: 0xBE6F,
-	54374 - 44032: 0xBE70,
-	54375 - 44032: 0xBE71,
-	54376 - 44032: 0xBE72,
-	54377 - 44032: 0xBE73,
-	54378 - 44032: 0xBE74,
-	54379 - 44032: 0xBE75,
-	54380 - 44032: 0xBE76,
-	54381 - 44032: 0xC7A8,
-	54382 - 44032: 0xBE77,
-	54383 - 44032: 0xC7A9,
-	54384 - 44032: 0xBE78,
-	54385 - 44032: 0xBE79,
-	54386 - 44032: 0xBE7A,
-	54387 - 44032: 0xBE81,
-	54388 - 44032: 0xBE82,
-	54389 - 44032: 0xBE83,
-	54390 - 44032: 0xBE84,
-	54391 - 44032: 0xBE85,
-	54392 - 44032: 0xC7AA,
-	54393 - 44032: 0xC7AB,
-	54394 - 44032: 0xBE86,
-	54395 - 44032: 0xBE87,
-	54396 - 44032: 0xC7AC,
-	54397 - 44032: 0xBE88,
-	54398 - 44032: 0xBE89,
-	54399 - 44032: 0xC7AD,
-	54400 - 44032: 0xC7AE,
-	54401 - 44032: 0xBE8A,
-	54402 - 44032: 0xC7AF,
-	54403 - 44032: 0xBE8B,
-	54404 - 44032: 0xBE8C,
-	54405 - 44032: 0xBE8D,
-	54406 - 44032: 0xBE8E,
-	54407 - 44032: 0xBE8F,
-	54408 - 44032: 0xC7B0,
-	54409 - 44032: 0xC7B1,
-	54410 - 44032: 0xBE90,
-	54411 - 44032: 0xC7B2,
-	54412 - 44032: 0xBE91,
-	54413 - 44032: 0xC7B3,
-	54414 - 44032: 0xBE92,
-	54415 - 44032: 0xBE93,
-	54416 - 44032: 0xBE94,
-	54417 - 44032: 0xBE95,
-	54418 - 44032: 0xBE96,
-	54419 - 44032: 0xBE97,
-	54420 - 44032: 0xC7B4,
-	54421 - 44032: 0xBE98,
-	54422 - 44032: 0xBE99,
-	54423 - 44032: 0xBE9A,
-	54424 - 44032: 0xBE9B,
-	54425 - 44032: 0xBE9C,
-	54426 - 44032: 0xBE9D,
-	54427 - 44032: 0xBE9E,
-	54428 - 44032: 0xBE9F,
-	54429 - 44032: 0xBEA0,
-	54430 - 44032: 0xBF41,
-	54431 - 44032: 0xBF42,
-	54432 - 44032: 0xBF43,
-	54433 - 44032: 0xBF44,
-	54434 - 44032: 0xBF45,
-	54435 - 44032: 0xBF46,
-	54436 - 44032: 0xBF47,
-	54437 - 44032: 0xBF48,
-	54438 - 44032: 0xBF49,
-	54439 - 44032: 0xBF4A,
-	54440 - 44032: 0xBF4B,
-	54441 - 44032: 0xC7B5,
-	54442 - 44032: 0xBF4C,
-	54443 - 44032: 0xBF4D,
-	54444 - 44032: 0xBF4E,
-	54445 - 44032: 0xBF4F,
-	54446 - 44032: 0xBF50,
-	54447 - 44032: 0xBF51,
-	54448 - 44032: 0xBF52,
-	54449 - 44032: 0xBF53,
-	54450 - 44032: 0xBF54,
-	54451 - 44032: 0xBF55,
-	54452 - 44032: 0xBF56,
-	54453 - 44032: 0xBF57,
-	54454 - 44032: 0xBF58,
-	54455 - 44032: 0xBF59,
-	54456 - 44032: 0xBF5A,
-	54457 - 44032: 0xBF61,
-	54458 - 44032: 0xBF62,
-	54459 - 44032: 0xBF63,
-	54460 - 44032: 0xBF64,
-	54461 - 44032: 0xBF65,
-	54462 - 44032: 0xBF66,
-	54463 - 44032: 0xBF67,
-	54464 - 44032: 0xBF68,
-	54465 - 44032: 0xBF69,
-	54466 - 44032: 0xBF6A,
-	54467 - 44032: 0xBF6B,
-	54468 - 44032: 0xBF6C,
-	54469 - 44032: 0xBF6D,
-	54470 - 44032: 0xBF6E,
-	54471 - 44032: 0xBF6F,
-	54472 - 44032: 0xBF70,
-	54473 - 44032: 0xBF71,
-	54474 - 44032: 0xBF72,
-	54475 - 44032: 0xBF73,
-	54476 - 44032: 0xC7B6,
-	54477 - 44032: 0xBF74,
-	54478 - 44032: 0xBF75,
-	54479 - 44032: 0xBF76,
-	54480 - 44032: 0xC7B7,
-	54481 - 44032: 0xBF77,
-	54482 - 44032: 0xBF78,
-	54483 - 44032: 0xBF79,
-	54484 - 44032: 0xC7B8,
-	54485 - 44032: 0xBF7A,
-	54486 - 44032: 0xBF81,
-	54487 - 44032: 0xBF82,
-	54488 - 44032: 0xBF83,
-	54489 - 44032: 0xBF84,
-	54490 - 44032: 0xBF85,
-	54491 - 44032: 0xBF86,
-	54492 - 44032: 0xC7B9,
-	54493 - 44032: 0xBF87,
-	54494 - 44032: 0xBF88,
-	54495 - 44032: 0xC7BA,
-	54496 - 44032: 0xBF89,
-	54497 - 44032: 0xBF8A,
-	54498 - 44032: 0xBF8B,
-	54499 - 44032: 0xBF8C,
-	54500 - 44032: 0xBF8D,
-	54501 - 44032: 0xBF8E,
-	54502 - 44032: 0xBF8F,
-	54503 - 44032: 0xBF90,
-	54504 - 44032: 0xC7BB,
-	54505 - 44032: 0xBF91,
-	54506 - 44032: 0xBF92,
-	54507 - 44032: 0xBF93,
-	54508 - 44032: 0xC7BC,
-	54509 - 44032: 0xBF94,
-	54510 - 44032: 0xBF95,
-	54511 - 44032: 0xBF96,
-	54512 - 44032: 0xC7BD,
-	54513 - 44032: 0xBF97,
-	54514 - 44032: 0xBF98,
-	54515 - 44032: 0xBF99,
-	54516 - 44032: 0xBF9A,
-	54517 - 44032: 0xBF9B,
-	54518 - 44032: 0xBF9C,
-	54519 - 44032: 0xBF9D,
-	54520 - 44032: 0xC7BE,
-	54521 - 44032: 0xBF9E,
-	54522 - 44032: 0xBF9F,
-	54523 - 44032: 0xC7BF,
-	54524 - 44032: 0xBFA0,
-	54525 - 44032: 0xC7C0,
-	54526 - 44032: 0xC041,
-	54527 - 44032: 0xC042,
-	54528 - 44032: 0xC043,
-	54529 - 44032: 0xC044,
-	54530 - 44032: 0xC045,
-	54531 - 44032: 0xC046,
-	54532 - 44032: 0xC7C1,
-	54533 - 44032: 0xC047,
-	54534 - 44032: 0xC048,
-	54535 - 44032: 0xC049,
-	54536 - 44032: 0xC7C2,
-	54537 - 44032: 0xC04A,
-	54538 - 44032: 0xC04B,
-	54539 - 44032: 0xC04C,
-	54540 - 44032: 0xC7C3,
-	54541 - 44032: 0xC04D,
-	54542 - 44032: 0xC04E,
-	54543 - 44032: 0xC04F,
-	54544 - 44032: 0xC050,
-	54545 - 44032: 0xC051,
-	54546 - 44032: 0xC052,
-	54547 - 44032: 0xC053,
-	54548 - 44032: 0xC7C4,
-	54549 - 44032: 0xC7C5,
-	54550 - 44032: 0xC054,
-	54551 - 44032: 0xC7C6,
-	54552 - 44032: 0xC055,
-	54553 - 44032: 0xC056,
-	54554 - 44032: 0xC057,
-	54555 - 44032: 0xC058,
-	54556 - 44032: 0xC059,
-	54557 - 44032: 0xC05A,
-	54558 - 44032: 0xC061,
-	54559 - 44032: 0xC062,
-	54560 - 44032: 0xC063,
-	54561 - 44032: 0xC064,
-	54562 - 44032: 0xC065,
-	54563 - 44032: 0xC066,
-	54564 - 44032: 0xC067,
-	54565 - 44032: 0xC068,
-	54566 - 44032: 0xC069,
-	54567 - 44032: 0xC06A,
-	54568 - 44032: 0xC06B,
-	54569 - 44032: 0xC06C,
-	54570 - 44032: 0xC06D,
-	54571 - 44032: 0xC06E,
-	54572 - 44032: 0xC06F,
-	54573 - 44032: 0xC070,
-	54574 - 44032: 0xC071,
-	54575 - 44032: 0xC072,
-	54576 - 44032: 0xC073,
-	54577 - 44032: 0xC074,
-	54578 - 44032: 0xC075,
-	54579 - 44032: 0xC076,
-	54580 - 44032: 0xC077,
-	54581 - 44032: 0xC078,
-	54582 - 44032: 0xC079,
-	54583 - 44032: 0xC07A,
-	54584 - 44032: 0xC081,
-	54585 - 44032: 0xC082,
-	54586 - 44032: 0xC083,
-	54587 - 44032: 0xC084,
-	54588 - 44032: 0xC7C7,
-	54589 - 44032: 0xC7C8,
-	54590 - 44032: 0xC085,
-	54591 - 44032: 0xC086,
-	54592 - 44032: 0xC7C9,
-	54593 - 44032: 0xC087,
-	54594 - 44032: 0xC088,
-	54595 - 44032: 0xC089,
-	54596 - 44032: 0xC7CA,
-	54597 - 44032: 0xC08A,
-	54598 - 44032: 0xC08B,
-	54599 - 44032: 0xC08C,
-	54600 - 44032: 0xC08D,
-	54601 - 44032: 0xC08E,
-	54602 - 44032: 0xC08F,
-	54603 - 44032: 0xC090,
-	54604 - 44032: 0xC7CB,
-	54605 - 44032: 0xC7CC,
-	54606 - 44032: 0xC091,
-	54607 - 44032: 0xC7CD,
-	54608 - 44032: 0xC092,
-	54609 - 44032: 0xC7CE,
-	54610 - 44032: 0xC093,
-	54611 - 44032: 0xC094,
-	54612 - 44032: 0xC095,
-	54613 - 44032: 0xC096,
-	54614 - 44032: 0xC097,
-	54615 - 44032: 0xC098,
-	54616 - 44032: 0xC7CF,
-	54617 - 44032: 0xC7D0,
-	54618 - 44032: 0xC099,
-	54619 - 44032: 0xC09A,
-	54620 - 44032: 0xC7D1,
-	54621 - 44032: 0xC09B,
-	54622 - 44032: 0xC09C,
-	54623 - 44032: 0xC09D,
-	54624 - 44032: 0xC7D2,
-	54625 - 44032: 0xC09E,
-	54626 - 44032: 0xC09F,
-	54627 - 44032: 0xC0A0,
-	54628 - 44032: 0xC141,
-	54629 - 44032: 0xC7D3,
-	54630 - 44032: 0xC142,
-	54631 - 44032: 0xC143,
-	54632 - 44032: 0xC7D4,
-	54633 - 44032: 0xC7D5,
-	54634 - 44032: 0xC144,
-	54635 - 44032: 0xC7D6,
-	54636 - 44032: 0xC145,
-	54637 - 44032: 0xC7D7,
-	54638 - 44032: 0xC146,
-	54639 - 44032: 0xC147,
-	54640 - 44032: 0xC148,
-	54641 - 44032: 0xC149,
-	54642 - 44032: 0xC14A,
-	54643 - 44032: 0xC14B,
-	54644 - 44032: 0xC7D8,
-	54645 - 44032: 0xC7D9,
-	54646 - 44032: 0xC14C,
-	54647 - 44032: 0xC14D,
-	54648 - 44032: 0xC7DA,
-	54649 - 44032: 0xC14E,
-	54650 - 44032: 0xC14F,
-	54651 - 44032: 0xC150,
-	54652 - 44032: 0xC7DB,
-	54653 - 44032: 0xC151,
-	54654 - 44032: 0xC152,
-	54655 - 44032: 0xC153,
-	54656 - 44032: 0xC154,
-	54657 - 44032: 0xC155,
-	54658 - 44032: 0xC156,
-	54659 - 44032: 0xC157,
-	54660 - 44032: 0xC7DC,
-	54661 - 44032: 0xC7DD,
-	54662 - 44032: 0xC158,
-	54663 - 44032: 0xC7DE,
-	54664 - 44032: 0xC7DF,
-	54665 - 44032: 0xC7E0,
-	54666 - 44032: 0xC159,
-	54667 - 44032: 0xC15A,
-	54668 - 44032: 0xC161,
-	54669 - 44032: 0xC162,
-	54670 - 44032: 0xC163,
-	54671 - 44032: 0xC164,
-	54672 - 44032: 0xC7E1,
-	54673 - 44032: 0xC165,
-	54674 - 44032: 0xC166,
-	54675 - 44032: 0xC167,
-	54676 - 44032: 0xC168,
-	54677 - 44032: 0xC169,
-	54678 - 44032: 0xC16A,
-	54679 - 44032: 0xC16B,
-	54680 - 44032: 0xC16C,
-	54681 - 44032: 0xC16D,
-	54682 - 44032: 0xC16E,
-	54683 - 44032: 0xC16F,
-	54684 - 44032: 0xC170,
-	54685 - 44032: 0xC171,
-	54686 - 44032: 0xC172,
-	54687 - 44032: 0xC173,
-	54688 - 44032: 0xC174,
-	54689 - 44032: 0xC175,
-	54690 - 44032: 0xC176,
-	54691 - 44032: 0xC177,
-	54692 - 44032: 0xC178,
-	54693 - 44032: 0xC7E2,
-	54694 - 44032: 0xC179,
-	54695 - 44032: 0xC17A,
-	54696 - 44032: 0xC181,
-	54697 - 44032: 0xC182,
-	54698 - 44032: 0xC183,
-	54699 - 44032: 0xC184,
-	54700 - 44032: 0xC185,
-	54701 - 44032: 0xC186,
-	54702 - 44032: 0xC187,
-	54703 - 44032: 0xC188,
-	54704 - 44032: 0xC189,
-	54705 - 44032: 0xC18A,
-	54706 - 44032: 0xC18B,
-	54707 - 44032: 0xC18C,
-	54708 - 44032: 0xC18D,
-	54709 - 44032: 0xC18E,
-	54710 - 44032: 0xC18F,
-	54711 - 44032: 0xC190,
-	54712 - 44032: 0xC191,
-	54713 - 44032: 0xC192,
-	54714 - 44032: 0xC193,
-	54715 - 44032: 0xC194,
-	54716 - 44032: 0xC195,
-	54717 - 44032: 0xC196,
-	54718 - 44032: 0xC197,
-	54719 - 44032: 0xC198,
-	54720 - 44032: 0xC199,
-	54721 - 44032: 0xC19A,
-	54722 - 44032: 0xC19B,
-	54723 - 44032: 0xC19C,
-	54724 - 44032: 0xC19D,
-	54725 - 44032: 0xC19E,
-	54726 - 44032: 0xC19F,
-	54727 - 44032: 0xC1A0,
-	54728 - 44032: 0xC7E3,
-	54729 - 44032: 0xC7E4,
-	54730 - 44032: 0xC241,
-	54731 - 44032: 0xC242,
-	54732 - 44032: 0xC7E5,
-	54733 - 44032: 0xC243,
-	54734 - 44032: 0xC244,
-	54735 - 44032: 0xC245,
-	54736 - 44032: 0xC7E6,
-	54737 - 44032: 0xC246,
-	54738 - 44032: 0xC7E7,
-	54739 - 44032: 0xC247,
-	54740 - 44032: 0xC248,
-	54741 - 44032: 0xC249,
-	54742 - 44032: 0xC24A,
-	54743 - 44032: 0xC24B,
-	54744 - 44032: 0xC7E8,
-	54745 - 44032: 0xC7E9,
-	54746 - 44032: 0xC24C,
-	54747 - 44032: 0xC7EA,
-	54748 - 44032: 0xC24D,
-	54749 - 44032: 0xC7EB,
-	54750 - 44032: 0xC24E,
-	54751 - 44032: 0xC24F,
-	54752 - 44032: 0xC250,
-	54753 - 44032: 0xC251,
-	54754 - 44032: 0xC252,
-	54755 - 44032: 0xC253,
-	54756 - 44032: 0xC7EC,
-	54757 - 44032: 0xC7ED,
-	54758 - 44032: 0xC254,
-	54759 - 44032: 0xC255,
-	54760 - 44032: 0xC7EE,
-	54761 - 44032: 0xC256,
-	54762 - 44032: 0xC257,
-	54763 - 44032: 0xC258,
-	54764 - 44032: 0xC7EF,
-	54765 - 44032: 0xC259,
-	54766 - 44032: 0xC25A,
-	54767 - 44032: 0xC261,
-	54768 - 44032: 0xC262,
-	54769 - 44032: 0xC263,
-	54770 - 44032: 0xC264,
-	54771 - 44032: 0xC265,
-	54772 - 44032: 0xC7F0,
-	54773 - 44032: 0xC7F1,
-	54774 - 44032: 0xC266,
-	54775 - 44032: 0xC7F2,
-	54776 - 44032: 0xC267,
-	54777 - 44032: 0xC7F3,
-	54778 - 44032: 0xC268,
-	54779 - 44032: 0xC269,
-	54780 - 44032: 0xC26A,
-	54781 - 44032: 0xC26B,
-	54782 - 44032: 0xC26C,
-	54783 - 44032: 0xC26D,
-	54784 - 44032: 0xC7F4,
-	54785 - 44032: 0xC7F5,
-	54786 - 44032: 0xC26E,
-	54787 - 44032: 0xC26F,
-	54788 - 44032: 0xC7F6,
-	54789 - 44032: 0xC270,
-	54790 - 44032: 0xC271,
-	54791 - 44032: 0xC272,
-	54792 - 44032: 0xC7F7,
-	54793 - 44032: 0xC273,
-	54794 - 44032: 0xC274,
-	54795 - 44032: 0xC275,
-	54796 - 44032: 0xC276,
-	54797 - 44032: 0xC277,
-	54798 - 44032: 0xC278,
-	54799 - 44032: 0xC279,
-	54800 - 44032: 0xC7F8,
-	54801 - 44032: 0xC7F9,
-	54802 - 44032: 0xC27A,
-	54803 - 44032: 0xC7FA,
-	54804 - 44032: 0xC7FB,
-	54805 - 44032: 0xC7FC,
-	54806 - 44032: 0xC281,
-	54807 - 44032: 0xC282,
-	54808 - 44032: 0xC283,
-	54809 - 44032: 0xC284,
-	54810 - 44032: 0xC285,
-	54811 - 44032: 0xC286,
-	54812 - 44032: 0xC7FD,
-	54813 - 44032: 0xC287,
-	54814 - 44032: 0xC288,
-	54815 - 44032: 0xC289,
-	54816 - 44032: 0xC7FE,
-	54817 - 44032: 0xC28A,
-	54818 - 44032: 0xC28B,
-	54819 - 44032: 0xC28C,
-	54820 - 44032: 0xC8A1,
-	54821 - 44032: 0xC28D,
-	54822 - 44032: 0xC28E,
-	54823 - 44032: 0xC28F,
-	54824 - 44032: 0xC290,
-	54825 - 44032: 0xC291,
-	54826 - 44032: 0xC292,
-	54827 - 44032: 0xC293,
-	54828 - 44032: 0xC294,
-	54829 - 44032: 0xC8A2,
-	54830 - 44032: 0xC295,
-	54831 - 44032: 0xC296,
-	54832 - 44032: 0xC297,
-	54833 - 44032: 0xC298,
-	54834 - 44032: 0xC299,
-	54835 - 44032: 0xC29A,
-	54836 - 44032: 0xC29B,
-	54837 - 44032: 0xC29C,
-	54838 - 44032: 0xC29D,
-	54839 - 44032: 0xC29E,
-	54840 - 44032: 0xC8A3,
-	54841 - 44032: 0xC8A4,
-	54842 - 44032: 0xC29F,
-	54843 - 44032: 0xC2A0,
-	54844 - 44032: 0xC8A5,
-	54845 - 44032: 0xC341,
-	54846 - 44032: 0xC342,
-	54847 - 44032: 0xC343,
-	54848 - 44032: 0xC8A6,
-	54849 - 44032: 0xC344,
-	54850 - 44032: 0xC345,
-	54851 - 44032: 0xC346,
-	54852 - 44032: 0xC347,
-	54853 - 44032: 0xC8A7,
-	54854 - 44032: 0xC348,
-	54855 - 44032: 0xC349,
-	54856 - 44032: 0xC8A8,
-	54857 - 44032: 0xC8A9,
-	54858 - 44032: 0xC34A,
-	54859 - 44032: 0xC8AA,
-	54860 - 44032: 0xC34B,
-	54861 - 44032: 0xC8AB,
-	54862 - 44032: 0xC34C,
-	54863 - 44032: 0xC34D,
-	54864 - 44032: 0xC34E,
-	54865 - 44032: 0xC8AC,
-	54866 - 44032: 0xC34F,
-	54867 - 44032: 0xC350,
-	54868 - 44032: 0xC8AD,
-	54869 - 44032: 0xC8AE,
-	54870 - 44032: 0xC351,
-	54871 - 44032: 0xC352,
-	54872 - 44032: 0xC8AF,
-	54873 - 44032: 0xC353,
-	54874 - 44032: 0xC354,
-	54875 - 44032: 0xC355,
-	54876 - 44032: 0xC8B0,
-	54877 - 44032: 0xC356,
-	54878 - 44032: 0xC357,
-	54879 - 44032: 0xC358,
-	54880 - 44032: 0xC359,
-	54881 - 44032: 0xC35A,
-	54882 - 44032: 0xC361,
-	54883 - 44032: 0xC362,
-	54884 - 44032: 0xC363,
-	54885 - 44032: 0xC364,
-	54886 - 44032: 0xC365,
-	54887 - 44032: 0xC8B1,
-	54888 - 44032: 0xC366,
-	54889 - 44032: 0xC8B2,
-	54890 - 44032: 0xC367,
-	54891 - 44032: 0xC368,
-	54892 - 44032: 0xC369,
-	54893 - 44032: 0xC36A,
-	54894 - 44032: 0xC36B,
-	54895 - 44032: 0xC36C,
-	54896 - 44032: 0xC8B3,
-	54897 - 44032: 0xC8B4,
-	54898 - 44032: 0xC36D,
-	54899 - 44032: 0xC36E,
-	54900 - 44032: 0xC8B5,
-	54901 - 44032: 0xC36F,
-	54902 - 44032: 0xC370,
-	54903 - 44032: 0xC371,
-	54904 - 44032: 0xC372,
-	54905 - 44032: 0xC373,
-	54906 - 44032: 0xC374,
-	54907 - 44032: 0xC375,
-	54908 - 44032: 0xC376,
-	54909 - 44032: 0xC377,
-	54910 - 44032: 0xC378,
-	54911 - 44032: 0xC379,
-	54912 - 44032: 0xC37A,
-	54913 - 44032: 0xC381,
-	54914 - 44032: 0xC382,
-	54915 - 44032: 0xC8B6,
-	54916 - 44032: 0xC383,
-	54917 - 44032: 0xC8B7,
-	54918 - 44032: 0xC384,
-	54919 - 44032: 0xC385,
-	54920 - 44032: 0xC386,
-	54921 - 44032: 0xC387,
-	54922 - 44032: 0xC388,
-	54923 - 44032: 0xC389,
-	54924 - 44032: 0xC8B8,
-	54925 - 44032: 0xC8B9,
-	54926 - 44032: 0xC38A,
-	54927 - 44032: 0xC38B,
-	54928 - 44032: 0xC8BA,
-	54929 - 44032: 0xC38C,
-	54930 - 44032: 0xC38D,
-	54931 - 44032: 0xC38E,
-	54932 - 44032: 0xC8BB,
-	54933 - 44032: 0xC38F,
-	54934 - 44032: 0xC390,
-	54935 - 44032: 0xC391,
-	54936 - 44032: 0xC392,
-	54937 - 44032: 0xC393,
-	54938 - 44032: 0xC394,
-	54939 - 44032: 0xC395,
-	54940 - 44032: 0xC396,
-	54941 - 44032: 0xC8BC,
-	54942 - 44032: 0xC397,
-	54943 - 44032: 0xC8BD,
-	54944 - 44032: 0xC398,
-	54945 - 44032: 0xC8BE,
-	54946 - 44032: 0xC399,
-	54947 - 44032: 0xC39A,
-	54948 - 44032: 0xC39B,
-	54949 - 44032: 0xC39C,
-	54950 - 44032: 0xC39D,
-	54951 - 44032: 0xC39E,
-	54952 - 44032: 0xC8BF,
-	54953 - 44032: 0xC39F,
-	54954 - 44032: 0xC3A0,
-	54955 - 44032: 0xC441,
-	54956 - 44032: 0xC8C0,
-	54957 - 44032: 0xC442,
-	54958 - 44032: 0xC443,
-	54959 - 44032: 0xC444,
-	54960 - 44032: 0xC8C1,
-	54961 - 44032: 0xC445,
-	54962 - 44032: 0xC446,
-	54963 - 44032: 0xC447,
-	54964 - 44032: 0xC448,
-	54965 - 44032: 0xC449,
-	54966 - 44032: 0xC44A,
-	54967 - 44032: 0xC44B,
-	54968 - 44032: 0xC44C,
-	54969 - 44032: 0xC8C2,
-	54970 - 44032: 0xC44D,
-	54971 - 44032: 0xC8C3,
-	54972 - 44032: 0xC44E,
-	54973 - 44032: 0xC44F,
-	54974 - 44032: 0xC450,
-	54975 - 44032: 0xC451,
-	54976 - 44032: 0xC452,
-	54977 - 44032: 0xC453,
-	54978 - 44032: 0xC454,
-	54979 - 44032: 0xC455,
-	54980 - 44032: 0xC8C4,
-	54981 - 44032: 0xC8C5,
-	54982 - 44032: 0xC456,
-	54983 - 44032: 0xC457,
-	54984 - 44032: 0xC8C6,
-	54985 - 44032: 0xC458,
-	54986 - 44032: 0xC459,
-	54987 - 44032: 0xC45A,
-	54988 - 44032: 0xC8C7,
-	54989 - 44032: 0xC461,
-	54990 - 44032: 0xC462,
-	54991 - 44032: 0xC463,
-	54992 - 44032: 0xC464,
-	54993 - 44032: 0xC8C8,
-	54994 - 44032: 0xC465,
-	54995 - 44032: 0xC466,
-	54996 - 44032: 0xC8C9,
-	54997 - 44032: 0xC467,
-	54998 - 44032: 0xC468,
-	54999 - 44032: 0xC8CA,
-	55000 - 44032: 0xC469,
-	55001 - 44032: 0xC8CB,
-	55002 - 44032: 0xC46A,
-	55003 - 44032: 0xC46B,
-	55004 - 44032: 0xC46C,
-	55005 - 44032: 0xC46D,
-	55006 - 44032: 0xC46E,
-	55007 - 44032: 0xC46F,
-	55008 - 44032: 0xC8CC,
-	55009 - 44032: 0xC470,
-	55010 - 44032: 0xC471,
-	55011 - 44032: 0xC472,
-	55012 - 44032: 0xC8CD,
-	55013 - 44032: 0xC473,
-	55014 - 44032: 0xC474,
-	55015 - 44032: 0xC475,
-	55016 - 44032: 0xC8CE,
-	55017 - 44032: 0xC476,
-	55018 - 44032: 0xC477,
-	55019 - 44032: 0xC478,
-	55020 - 44032: 0xC479,
-	55021 - 44032: 0xC47A,
-	55022 - 44032: 0xC481,
-	55023 - 44032: 0xC482,
-	55024 - 44032: 0xC8CF,
-	55025 - 44032: 0xC483,
-	55026 - 44032: 0xC484,
-	55027 - 44032: 0xC485,
-	55028 - 44032: 0xC486,
-	55029 - 44032: 0xC8D0,
-	55030 - 44032: 0xC487,
-	55031 - 44032: 0xC488,
-	55032 - 44032: 0xC489,
-	55033 - 44032: 0xC48A,
-	55034 - 44032: 0xC48B,
-	55035 - 44032: 0xC48C,
-	55036 - 44032: 0xC8D1,
-	55037 - 44032: 0xC8D2,
-	55038 - 44032: 0xC48D,
-	55039 - 44032: 0xC48E,
-	55040 - 44032: 0xC8D3,
-	55041 - 44032: 0xC48F,
-	55042 - 44032: 0xC490,
-	55043 - 44032: 0xC491,
-	55044 - 44032: 0xC8D4,
-	55045 - 44032: 0xC492,
-	55046 - 44032: 0xC493,
-	55047 - 44032: 0xC494,
-	55048 - 44032: 0xC495,
-	55049 - 44032: 0xC496,
-	55050 - 44032: 0xC497,
-	55051 - 44032: 0xC498,
-	55052 - 44032: 0xC499,
-	55053 - 44032: 0xC49A,
-	55054 - 44032: 0xC49B,
-	55055 - 44032: 0xC49C,
-	55056 - 44032: 0xC49D,
-	55057 - 44032: 0xC8D5,
-	55058 - 44032: 0xC49E,
-	55059 - 44032: 0xC49F,
-	55060 - 44032: 0xC4A0,
-	55061 - 44032: 0xC541,
-	55062 - 44032: 0xC542,
-	55063 - 44032: 0xC543,
-	55064 - 44032: 0xC8D6,
-	55065 - 44032: 0xC8D7,
-	55066 - 44032: 0xC544,
-	55067 - 44032: 0xC545,
-	55068 - 44032: 0xC8D8,
-	55069 - 44032: 0xC546,
-	55070 - 44032: 0xC547,
-	55071 - 44032: 0xC548,
-	55072 - 44032: 0xC8D9,
-	55073 - 44032: 0xC549,
-	55074 - 44032: 0xC54A,
-	55075 - 44032: 0xC54B,
-	55076 - 44032: 0xC54C,
-	55077 - 44032: 0xC54D,
-	55078 - 44032: 0xC54E,
-	55079 - 44032: 0xC54F,
-	55080 - 44032: 0xC8DA,
-	55081 - 44032: 0xC8DB,
-	55082 - 44032: 0xC550,
-	55083 - 44032: 0xC8DC,
-	55084 - 44032: 0xC551,
-	55085 - 44032: 0xC8DD,
-	55086 - 44032: 0xC552,
-	55087 - 44032: 0xC553,
-	55088 - 44032: 0xC554,
-	55089 - 44032: 0xC555,
-	55090 - 44032: 0xC556,
-	55091 - 44032: 0xC557,
-	55092 - 44032: 0xC8DE,
-	55093 - 44032: 0xC8DF,
-	55094 - 44032: 0xC558,
-	55095 - 44032: 0xC559,
-	55096 - 44032: 0xC8E0,
-	55097 - 44032: 0xC55A,
-	55098 - 44032: 0xC561,
-	55099 - 44032: 0xC562,
-	55100 - 44032: 0xC8E1,
-	55101 - 44032: 0xC563,
-	55102 - 44032: 0xC564,
-	55103 - 44032: 0xC565,
-	55104 - 44032: 0xC566,
-	55105 - 44032: 0xC567,
-	55106 - 44032: 0xC568,
-	55107 - 44032: 0xC569,
-	55108 - 44032: 0xC8E2,
-	55109 - 44032: 0xC56A,
-	55110 - 44032: 0xC56B,
-	55111 - 44032: 0xC8E3,
-	55112 - 44032: 0xC56C,
-	55113 - 44032: 0xC8E4,
-	55114 - 44032: 0xC56D,
-	55115 - 44032: 0xC56E,
-	55116 - 44032: 0xC56F,
-	55117 - 44032: 0xC570,
-	55118 - 44032: 0xC571,
-	55119 - 44032: 0xC572,
-	55120 - 44032: 0xC8E5,
-	55121 - 44032: 0xC8E6,
-	55122 - 44032: 0xC573,
-	55123 - 44032: 0xC574,
-	55124 - 44032: 0xC8E7,
-	55125 - 44032: 0xC575,
-	55126 - 44032: 0xC8E8,
-	55127 - 44032: 0xC8E9,
-	55128 - 44032: 0xC8EA,
-	55129 - 44032: 0xC8EB,
-	55130 - 44032: 0xC576,
-	55131 - 44032: 0xC577,
-	55132 - 44032: 0xC578,
-	55133 - 44032: 0xC579,
-	55134 - 44032: 0xC57A,
-	55135 - 44032: 0xC581,
-	55136 - 44032: 0xC8EC,
-	55137 - 44032: 0xC8ED,
-	55138 - 44032: 0xC582,
-	55139 - 44032: 0xC8EE,
-	55140 - 44032: 0xC583,
-	55141 - 44032: 0xC8EF,
-	55142 - 44032: 0xC584,
-	55143 - 44032: 0xC585,
-	55144 - 44032: 0xC586,
-	55145 - 44032: 0xC8F0,
-	55146 - 44032: 0xC587,
-	55147 - 44032: 0xC588,
-	55148 - 44032: 0xC8F1,
-	55149 - 44032: 0xC589,
-	55150 - 44032: 0xC58A,
-	55151 - 44032: 0xC58B,
-	55152 - 44032: 0xC8F2,
-	55153 - 44032: 0xC58C,
-	55154 - 44032: 0xC58D,
-	55155 - 44032: 0xC58E,
-	55156 - 44032: 0xC8F3,
-	55157 - 44032: 0xC58F,
-	55158 - 44032: 0xC590,
-	55159 - 44032: 0xC591,
-	55160 - 44032: 0xC592,
-	55161 - 44032: 0xC593,
-	55162 - 44032: 0xC594,
-	55163 - 44032: 0xC595,
-	55164 - 44032: 0xC8F4,
-	55165 - 44032: 0xC8F5,
-	55166 - 44032: 0xC596,
-	55167 - 44032: 0xC597,
-	55168 - 44032: 0xC598,
-	55169 - 44032: 0xC8F6,
-	55170 - 44032: 0xC599,
-	55171 - 44032: 0xC59A,
-	55172 - 44032: 0xC59B,
-	55173 - 44032: 0xC59C,
-	55174 - 44032: 0xC59D,
-	55175 - 44032: 0xC59E,
-	55176 - 44032: 0xC8F7,
-	55177 - 44032: 0xC8F8,
-	55178 - 44032: 0xC59F,
-	55179 - 44032: 0xC5A0,
-	55180 - 44032: 0xC8F9,
-	55181 - 44032: 0xC641,
-	55182 - 44032: 0xC642,
-	55183 - 44032: 0xC643,
-	55184 - 44032: 0xC8FA,
-	55185 - 44032: 0xC644,
-	55186 - 44032: 0xC645,
-	55187 - 44032: 0xC646,
-	55188 - 44032: 0xC647,
-	55189 - 44032: 0xC648,
-	55190 - 44032: 0xC649,
-	55191 - 44032: 0xC64A,
-	55192 - 44032: 0xC8FB,
-	55193 - 44032: 0xC8FC,
-	55194 - 44032: 0xC64B,
-	55195 - 44032: 0xC8FD,
-	55196 - 44032: 0xC64C,
-	55197 - 44032: 0xC8FE,
-	55198 - 44032: 0xC64D,
-	55199 - 44032: 0xC64E,
-	55200 - 44032: 0xC64F,
-	55201 - 44032: 0xC650,
-	55202 - 44032: 0xC651,
-	55203 - 44032: 0xC652,
-}
-
-const encode2Low, encode2High = 8213, 9838
-
-var encode2 = [...]uint16{
-	8213 - 8213: 0xA1AA,
-	8216 - 8213: 0xA1AE,
-	8217 - 8213: 0xA1AF,
-	8220 - 8213: 0xA1B0,
-	8221 - 8213: 0xA1B1,
-	8224 - 8213: 0xA2D3,
-	8225 - 8213: 0xA2D4,
-	8229 - 8213: 0xA1A5,
-	8230 - 8213: 0xA1A6,
-	8240 - 8213: 0xA2B6,
-	8242 - 8213: 0xA1C7,
-	8243 - 8213: 0xA1C8,
-	8251 - 8213: 0xA1D8,
-	8308 - 8213: 0xA9F9,
-	8319 - 8213: 0xA9FA,
-	8321 - 8213: 0xA9FB,
-	8322 - 8213: 0xA9FC,
-	8323 - 8213: 0xA9FD,
-	8324 - 8213: 0xA9FE,
-	8364 - 8213: 0xA2E6,
-	8451 - 8213: 0xA1C9,
-	8457 - 8213: 0xA2B5,
-	8467 - 8213: 0xA7A4,
-	8470 - 8213: 0xA2E0,
-	8481 - 8213: 0xA2E5,
-	8482 - 8213: 0xA2E2,
-	8486 - 8213: 0xA7D9,
-	8491 - 8213: 0xA1CA,
-	8531 - 8213: 0xA8F7,
-	8532 - 8213: 0xA8F8,
-	8539 - 8213: 0xA8FB,
-	8540 - 8213: 0xA8FC,
-	8541 - 8213: 0xA8FD,
-	8542 - 8213: 0xA8FE,
-	8544 - 8213: 0xA5B0,
-	8545 - 8213: 0xA5B1,
-	8546 - 8213: 0xA5B2,
-	8547 - 8213: 0xA5B3,
-	8548 - 8213: 0xA5B4,
-	8549 - 8213: 0xA5B5,
-	8550 - 8213: 0xA5B6,
-	8551 - 8213: 0xA5B7,
-	8552 - 8213: 0xA5B8,
-	8553 - 8213: 0xA5B9,
-	8560 - 8213: 0xA5A1,
-	8561 - 8213: 0xA5A2,
-	8562 - 8213: 0xA5A3,
-	8563 - 8213: 0xA5A4,
-	8564 - 8213: 0xA5A5,
-	8565 - 8213: 0xA5A6,
-	8566 - 8213: 0xA5A7,
-	8567 - 8213: 0xA5A8,
-	8568 - 8213: 0xA5A9,
-	8569 - 8213: 0xA5AA,
-	8592 - 8213: 0xA1E7,
-	8593 - 8213: 0xA1E8,
-	8594 - 8213: 0xA1E6,
-	8595 - 8213: 0xA1E9,
-	8596 - 8213: 0xA1EA,
-	8597 - 8213: 0xA2D5,
-	8598 - 8213: 0xA2D8,
-	8599 - 8213: 0xA2D6,
-	8600 - 8213: 0xA2D9,
-	8601 - 8213: 0xA2D7,
-	8658 - 8213: 0xA2A1,
-	8660 - 8213: 0xA2A2,
-	8704 - 8213: 0xA2A3,
-	8706 - 8213: 0xA1D3,
-	8707 - 8213: 0xA2A4,
-	8711 - 8213: 0xA1D4,
-	8712 - 8213: 0xA1F4,
-	8715 - 8213: 0xA1F5,
-	8719 - 8213: 0xA2B3,
-	8721 - 8213: 0xA2B2,
-	8730 - 8213: 0xA1EE,
-	8733 - 8213: 0xA1F0,
-	8734 - 8213: 0xA1C4,
-	8736 - 8213: 0xA1D0,
-	8741 - 8213: 0xA1AB,
-	8743 - 8213: 0xA1FC,
-	8744 - 8213: 0xA1FD,
-	8745 - 8213: 0xA1FB,
-	8746 - 8213: 0xA1FA,
-	8747 - 8213: 0xA1F2,
-	8748 - 8213: 0xA1F3,
-	8750 - 8213: 0xA2B1,
-	8756 - 8213: 0xA1C5,
-	8757 - 8213: 0xA1F1,
-	8764 - 8213: 0xA1AD,
-	8765 - 8213: 0xA1EF,
-	8786 - 8213: 0xA1D6,
-	8800 - 8213: 0xA1C1,
-	8801 - 8213: 0xA1D5,
-	8804 - 8213: 0xA1C2,
-	8805 - 8213: 0xA1C3,
-	8810 - 8213: 0xA1EC,
-	8811 - 8213: 0xA1ED,
-	8834 - 8213: 0xA1F8,
-	8835 - 8213: 0xA1F9,
-	8838 - 8213: 0xA1F6,
-	8839 - 8213: 0xA1F7,
-	8857 - 8213: 0xA2C1,
-	8869 - 8213: 0xA1D1,
-	8978 - 8213: 0xA1D2,
-	9312 - 8213: 0xA8E7,
-	9313 - 8213: 0xA8E8,
-	9314 - 8213: 0xA8E9,
-	9315 - 8213: 0xA8EA,
-	9316 - 8213: 0xA8EB,
-	9317 - 8213: 0xA8EC,
-	9318 - 8213: 0xA8ED,
-	9319 - 8213: 0xA8EE,
-	9320 - 8213: 0xA8EF,
-	9321 - 8213: 0xA8F0,
-	9322 - 8213: 0xA8F1,
-	9323 - 8213: 0xA8F2,
-	9324 - 8213: 0xA8F3,
-	9325 - 8213: 0xA8F4,
-	9326 - 8213: 0xA8F5,
-	9332 - 8213: 0xA9E7,
-	9333 - 8213: 0xA9E8,
-	9334 - 8213: 0xA9E9,
-	9335 - 8213: 0xA9EA,
-	9336 - 8213: 0xA9EB,
-	9337 - 8213: 0xA9EC,
-	9338 - 8213: 0xA9ED,
-	9339 - 8213: 0xA9EE,
-	9340 - 8213: 0xA9EF,
-	9341 - 8213: 0xA9F0,
-	9342 - 8213: 0xA9F1,
-	9343 - 8213: 0xA9F2,
-	9344 - 8213: 0xA9F3,
-	9345 - 8213: 0xA9F4,
-	9346 - 8213: 0xA9F5,
-	9372 - 8213: 0xA9CD,
-	9373 - 8213: 0xA9CE,
-	9374 - 8213: 0xA9CF,
-	9375 - 8213: 0xA9D0,
-	9376 - 8213: 0xA9D1,
-	9377 - 8213: 0xA9D2,
-	9378 - 8213: 0xA9D3,
-	9379 - 8213: 0xA9D4,
-	9380 - 8213: 0xA9D5,
-	9381 - 8213: 0xA9D6,
-	9382 - 8213: 0xA9D7,
-	9383 - 8213: 0xA9D8,
-	9384 - 8213: 0xA9D9,
-	9385 - 8213: 0xA9DA,
-	9386 - 8213: 0xA9DB,
-	9387 - 8213: 0xA9DC,
-	9388 - 8213: 0xA9DD,
-	9389 - 8213: 0xA9DE,
-	9390 - 8213: 0xA9DF,
-	9391 - 8213: 0xA9E0,
-	9392 - 8213: 0xA9E1,
-	9393 - 8213: 0xA9E2,
-	9394 - 8213: 0xA9E3,
-	9395 - 8213: 0xA9E4,
-	9396 - 8213: 0xA9E5,
-	9397 - 8213: 0xA9E6,
-	9424 - 8213: 0xA8CD,
-	9425 - 8213: 0xA8CE,
-	9426 - 8213: 0xA8CF,
-	9427 - 8213: 0xA8D0,
-	9428 - 8213: 0xA8D1,
-	9429 - 8213: 0xA8D2,
-	9430 - 8213: 0xA8D3,
-	9431 - 8213: 0xA8D4,
-	9432 - 8213: 0xA8D5,
-	9433 - 8213: 0xA8D6,
-	9434 - 8213: 0xA8D7,
-	9435 - 8213: 0xA8D8,
-	9436 - 8213: 0xA8D9,
-	9437 - 8213: 0xA8DA,
-	9438 - 8213: 0xA8DB,
-	9439 - 8213: 0xA8DC,
-	9440 - 8213: 0xA8DD,
-	9441 - 8213: 0xA8DE,
-	9442 - 8213: 0xA8DF,
-	9443 - 8213: 0xA8E0,
-	9444 - 8213: 0xA8E1,
-	9445 - 8213: 0xA8E2,
-	9446 - 8213: 0xA8E3,
-	9447 - 8213: 0xA8E4,
-	9448 - 8213: 0xA8E5,
-	9449 - 8213: 0xA8E6,
-	9472 - 8213: 0xA6A1,
-	9473 - 8213: 0xA6AC,
-	9474 - 8213: 0xA6A2,
-	9475 - 8213: 0xA6AD,
-	9484 - 8213: 0xA6A3,
-	9485 - 8213: 0xA6C8,
-	9486 - 8213: 0xA6C7,
-	9487 - 8213: 0xA6AE,
-	9488 - 8213: 0xA6A4,
-	9489 - 8213: 0xA6C2,
-	9490 - 8213: 0xA6C1,
-	9491 - 8213: 0xA6AF,
-	9492 - 8213: 0xA6A6,
-	9493 - 8213: 0xA6C6,
-	9494 - 8213: 0xA6C5,
-	9495 - 8213: 0xA6B1,
-	9496 - 8213: 0xA6A5,
-	9497 - 8213: 0xA6C4,
-	9498 - 8213: 0xA6C3,
-	9499 - 8213: 0xA6B0,
-	9500 - 8213: 0xA6A7,
-	9501 - 8213: 0xA6BC,
-	9502 - 8213: 0xA6C9,
-	9503 - 8213: 0xA6CA,
-	9504 - 8213: 0xA6B7,
-	9505 - 8213: 0xA6CB,
-	9506 - 8213: 0xA6CC,
-	9507 - 8213: 0xA6B2,
-	9508 - 8213: 0xA6A9,
-	9509 - 8213: 0xA6BE,
-	9510 - 8213: 0xA6CD,
-	9511 - 8213: 0xA6CE,
-	9512 - 8213: 0xA6B9,
-	9513 - 8213: 0xA6CF,
-	9514 - 8213: 0xA6D0,
-	9515 - 8213: 0xA6B4,
-	9516 - 8213: 0xA6A8,
-	9517 - 8213: 0xA6D1,
-	9518 - 8213: 0xA6D2,
-	9519 - 8213: 0xA6B8,
-	9520 - 8213: 0xA6BD,
-	9521 - 8213: 0xA6D3,
-	9522 - 8213: 0xA6D4,
-	9523 - 8213: 0xA6B3,
-	9524 - 8213: 0xA6AA,
-	9525 - 8213: 0xA6D5,
-	9526 - 8213: 0xA6D6,
-	9527 - 8213: 0xA6BA,
-	9528 - 8213: 0xA6BF,
-	9529 - 8213: 0xA6D7,
-	9530 - 8213: 0xA6D8,
-	9531 - 8213: 0xA6B5,
-	9532 - 8213: 0xA6AB,
-	9533 - 8213: 0xA6D9,
-	9534 - 8213: 0xA6DA,
-	9535 - 8213: 0xA6BB,
-	9536 - 8213: 0xA6DB,
-	9537 - 8213: 0xA6DC,
-	9538 - 8213: 0xA6C0,
-	9539 - 8213: 0xA6DD,
-	9540 - 8213: 0xA6DE,
-	9541 - 8213: 0xA6DF,
-	9542 - 8213: 0xA6E0,
-	9543 - 8213: 0xA6E1,
-	9544 - 8213: 0xA6E2,
-	9545 - 8213: 0xA6E3,
-	9546 - 8213: 0xA6E4,
-	9547 - 8213: 0xA6B6,
-	9618 - 8213: 0xA2C6,
-	9632 - 8213: 0xA1E1,
-	9633 - 8213: 0xA1E0,
-	9635 - 8213: 0xA2C3,
-	9636 - 8213: 0xA2C7,
-	9637 - 8213: 0xA2C8,
-	9638 - 8213: 0xA2CB,
-	9639 - 8213: 0xA2CA,
-	9640 - 8213: 0xA2C9,
-	9641 - 8213: 0xA2CC,
-	9650 - 8213: 0xA1E3,
-	9651 - 8213: 0xA1E2,
-	9654 - 8213: 0xA2BA,
-	9655 - 8213: 0xA2B9,
-	9660 - 8213: 0xA1E5,
-	9661 - 8213: 0xA1E4,
-	9664 - 8213: 0xA2B8,
-	9665 - 8213: 0xA2B7,
-	9670 - 8213: 0xA1DF,
-	9671 - 8213: 0xA1DE,
-	9672 - 8213: 0xA2C2,
-	9675 - 8213: 0xA1DB,
-	9678 - 8213: 0xA1DD,
-	9679 - 8213: 0xA1DC,
-	9680 - 8213: 0xA2C4,
-	9681 - 8213: 0xA2C5,
-	9733 - 8213: 0xA1DA,
-	9734 - 8213: 0xA1D9,
-	9742 - 8213: 0xA2CF,
-	9743 - 8213: 0xA2CE,
-	9756 - 8213: 0xA2D0,
-	9758 - 8213: 0xA2D1,
-	9792 - 8213: 0xA1CF,
-	9794 - 8213: 0xA1CE,
-	9824 - 8213: 0xA2BC,
-	9825 - 8213: 0xA2BD,
-	9827 - 8213: 0xA2C0,
-	9828 - 8213: 0xA2BB,
-	9829 - 8213: 0xA2BE,
-	9831 - 8213: 0xA2BF,
-	9832 - 8213: 0xA2CD,
-	9833 - 8213: 0xA2DB,
-	9834 - 8213: 0xA2DC,
-	9836 - 8213: 0xA2DD,
-	9837 - 8213: 0xA2DA,
-}
-
-const encode3Low, encode3High = 12288, 13278
-
-var encode3 = [...]uint16{
-	12288 - 12288: 0xA1A1,
-	12289 - 12288: 0xA1A2,
-	12290 - 12288: 0xA1A3,
-	12291 - 12288: 0xA1A8,
-	12296 - 12288: 0xA1B4,
-	12297 - 12288: 0xA1B5,
-	12298 - 12288: 0xA1B6,
-	12299 - 12288: 0xA1B7,
-	12300 - 12288: 0xA1B8,
-	12301 - 12288: 0xA1B9,
-	12302 - 12288: 0xA1BA,
-	12303 - 12288: 0xA1BB,
-	12304 - 12288: 0xA1BC,
-	12305 - 12288: 0xA1BD,
-	12307 - 12288: 0xA1EB,
-	12308 - 12288: 0xA1B2,
-	12309 - 12288: 0xA1B3,
-	12353 - 12288: 0xAAA1,
-	12354 - 12288: 0xAAA2,
-	12355 - 12288: 0xAAA3,
-	12356 - 12288: 0xAAA4,
-	12357 - 12288: 0xAAA5,
-	12358 - 12288: 0xAAA6,
-	12359 - 12288: 0xAAA7,
-	12360 - 12288: 0xAAA8,
-	12361 - 12288: 0xAAA9,
-	12362 - 12288: 0xAAAA,
-	12363 - 12288: 0xAAAB,
-	12364 - 12288: 0xAAAC,
-	12365 - 12288: 0xAAAD,
-	12366 - 12288: 0xAAAE,
-	12367 - 12288: 0xAAAF,
-	12368 - 12288: 0xAAB0,
-	12369 - 12288: 0xAAB1,
-	12370 - 12288: 0xAAB2,
-	12371 - 12288: 0xAAB3,
-	12372 - 12288: 0xAAB4,
-	12373 - 12288: 0xAAB5,
-	12374 - 12288: 0xAAB6,
-	12375 - 12288: 0xAAB7,
-	12376 - 12288: 0xAAB8,
-	12377 - 12288: 0xAAB9,
-	12378 - 12288: 0xAABA,
-	12379 - 12288: 0xAABB,
-	12380 - 12288: 0xAABC,
-	12381 - 12288: 0xAABD,
-	12382 - 12288: 0xAABE,
-	12383 - 12288: 0xAABF,
-	12384 - 12288: 0xAAC0,
-	12385 - 12288: 0xAAC1,
-	12386 - 12288: 0xAAC2,
-	12387 - 12288: 0xAAC3,
-	12388 - 12288: 0xAAC4,
-	12389 - 12288: 0xAAC5,
-	12390 - 12288: 0xAAC6,
-	12391 - 12288: 0xAAC7,
-	12392 - 12288: 0xAAC8,
-	12393 - 12288: 0xAAC9,
-	12394 - 12288: 0xAACA,
-	12395 - 12288: 0xAACB,
-	12396 - 12288: 0xAACC,
-	12397 - 12288: 0xAACD,
-	12398 - 12288: 0xAACE,
-	12399 - 12288: 0xAACF,
-	12400 - 12288: 0xAAD0,
-	12401 - 12288: 0xAAD1,
-	12402 - 12288: 0xAAD2,
-	12403 - 12288: 0xAAD3,
-	12404 - 12288: 0xAAD4,
-	12405 - 12288: 0xAAD5,
-	12406 - 12288: 0xAAD6,
-	12407 - 12288: 0xAAD7,
-	12408 - 12288: 0xAAD8,
-	12409 - 12288: 0xAAD9,
-	12410 - 12288: 0xAADA,
-	12411 - 12288: 0xAADB,
-	12412 - 12288: 0xAADC,
-	12413 - 12288: 0xAADD,
-	12414 - 12288: 0xAADE,
-	12415 - 12288: 0xAADF,
-	12416 - 12288: 0xAAE0,
-	12417 - 12288: 0xAAE1,
-	12418 - 12288: 0xAAE2,
-	12419 - 12288: 0xAAE3,
-	12420 - 12288: 0xAAE4,
-	12421 - 12288: 0xAAE5,
-	12422 - 12288: 0xAAE6,
-	12423 - 12288: 0xAAE7,
-	12424 - 12288: 0xAAE8,
-	12425 - 12288: 0xAAE9,
-	12426 - 12288: 0xAAEA,
-	12427 - 12288: 0xAAEB,
-	12428 - 12288: 0xAAEC,
-	12429 - 12288: 0xAAED,
-	12430 - 12288: 0xAAEE,
-	12431 - 12288: 0xAAEF,
-	12432 - 12288: 0xAAF0,
-	12433 - 12288: 0xAAF1,
-	12434 - 12288: 0xAAF2,
-	12435 - 12288: 0xAAF3,
-	12449 - 12288: 0xABA1,
-	12450 - 12288: 0xABA2,
-	12451 - 12288: 0xABA3,
-	12452 - 12288: 0xABA4,
-	12453 - 12288: 0xABA5,
-	12454 - 12288: 0xABA6,
-	12455 - 12288: 0xABA7,
-	12456 - 12288: 0xABA8,
-	12457 - 12288: 0xABA9,
-	12458 - 12288: 0xABAA,
-	12459 - 12288: 0xABAB,
-	12460 - 12288: 0xABAC,
-	12461 - 12288: 0xABAD,
-	12462 - 12288: 0xABAE,
-	12463 - 12288: 0xABAF,
-	12464 - 12288: 0xABB0,
-	12465 - 12288: 0xABB1,
-	12466 - 12288: 0xABB2,
-	12467 - 12288: 0xABB3,
-	12468 - 12288: 0xABB4,
-	12469 - 12288: 0xABB5,
-	12470 - 12288: 0xABB6,
-	12471 - 12288: 0xABB7,
-	12472 - 12288: 0xABB8,
-	12473 - 12288: 0xABB9,
-	12474 - 12288: 0xABBA,
-	12475 - 12288: 0xABBB,
-	12476 - 12288: 0xABBC,
-	12477 - 12288: 0xABBD,
-	12478 - 12288: 0xABBE,
-	12479 - 12288: 0xABBF,
-	12480 - 12288: 0xABC0,
-	12481 - 12288: 0xABC1,
-	12482 - 12288: 0xABC2,
-	12483 - 12288: 0xABC3,
-	12484 - 12288: 0xABC4,
-	12485 - 12288: 0xABC5,
-	12486 - 12288: 0xABC6,
-	12487 - 12288: 0xABC7,
-	12488 - 12288: 0xABC8,
-	12489 - 12288: 0xABC9,
-	12490 - 12288: 0xABCA,
-	12491 - 12288: 0xABCB,
-	12492 - 12288: 0xABCC,
-	12493 - 12288: 0xABCD,
-	12494 - 12288: 0xABCE,
-	12495 - 12288: 0xABCF,
-	12496 - 12288: 0xABD0,
-	12497 - 12288: 0xABD1,
-	12498 - 12288: 0xABD2,
-	12499 - 12288: 0xABD3,
-	12500 - 12288: 0xABD4,
-	12501 - 12288: 0xABD5,
-	12502 - 12288: 0xABD6,
-	12503 - 12288: 0xABD7,
-	12504 - 12288: 0xABD8,
-	12505 - 12288: 0xABD9,
-	12506 - 12288: 0xABDA,
-	12507 - 12288: 0xABDB,
-	12508 - 12288: 0xABDC,
-	12509 - 12288: 0xABDD,
-	12510 - 12288: 0xABDE,
-	12511 - 12288: 0xABDF,
-	12512 - 12288: 0xABE0,
-	12513 - 12288: 0xABE1,
-	12514 - 12288: 0xABE2,
-	12515 - 12288: 0xABE3,
-	12516 - 12288: 0xABE4,
-	12517 - 12288: 0xABE5,
-	12518 - 12288: 0xABE6,
-	12519 - 12288: 0xABE7,
-	12520 - 12288: 0xABE8,
-	12521 - 12288: 0xABE9,
-	12522 - 12288: 0xABEA,
-	12523 - 12288: 0xABEB,
-	12524 - 12288: 0xABEC,
-	12525 - 12288: 0xABED,
-	12526 - 12288: 0xABEE,
-	12527 - 12288: 0xABEF,
-	12528 - 12288: 0xABF0,
-	12529 - 12288: 0xABF1,
-	12530 - 12288: 0xABF2,
-	12531 - 12288: 0xABF3,
-	12532 - 12288: 0xABF4,
-	12533 - 12288: 0xABF5,
-	12534 - 12288: 0xABF6,
-	12593 - 12288: 0xA4A1,
-	12594 - 12288: 0xA4A2,
-	12595 - 12288: 0xA4A3,
-	12596 - 12288: 0xA4A4,
-	12597 - 12288: 0xA4A5,
-	12598 - 12288: 0xA4A6,
-	12599 - 12288: 0xA4A7,
-	12600 - 12288: 0xA4A8,
-	12601 - 12288: 0xA4A9,
-	12602 - 12288: 0xA4AA,
-	12603 - 12288: 0xA4AB,
-	12604 - 12288: 0xA4AC,
-	12605 - 12288: 0xA4AD,
-	12606 - 12288: 0xA4AE,
-	12607 - 12288: 0xA4AF,
-	12608 - 12288: 0xA4B0,
-	12609 - 12288: 0xA4B1,
-	12610 - 12288: 0xA4B2,
-	12611 - 12288: 0xA4B3,
-	12612 - 12288: 0xA4B4,
-	12613 - 12288: 0xA4B5,
-	12614 - 12288: 0xA4B6,
-	12615 - 12288: 0xA4B7,
-	12616 - 12288: 0xA4B8,
-	12617 - 12288: 0xA4B9,
-	12618 - 12288: 0xA4BA,
-	12619 - 12288: 0xA4BB,
-	12620 - 12288: 0xA4BC,
-	12621 - 12288: 0xA4BD,
-	12622 - 12288: 0xA4BE,
-	12623 - 12288: 0xA4BF,
-	12624 - 12288: 0xA4C0,
-	12625 - 12288: 0xA4C1,
-	12626 - 12288: 0xA4C2,
-	12627 - 12288: 0xA4C3,
-	12628 - 12288: 0xA4C4,
-	12629 - 12288: 0xA4C5,
-	12630 - 12288: 0xA4C6,
-	12631 - 12288: 0xA4C7,
-	12632 - 12288: 0xA4C8,
-	12633 - 12288: 0xA4C9,
-	12634 - 12288: 0xA4CA,
-	12635 - 12288: 0xA4CB,
-	12636 - 12288: 0xA4CC,
-	12637 - 12288: 0xA4CD,
-	12638 - 12288: 0xA4CE,
-	12639 - 12288: 0xA4CF,
-	12640 - 12288: 0xA4D0,
-	12641 - 12288: 0xA4D1,
-	12642 - 12288: 0xA4D2,
-	12643 - 12288: 0xA4D3,
-	12644 - 12288: 0xA4D4,
-	12645 - 12288: 0xA4D5,
-	12646 - 12288: 0xA4D6,
-	12647 - 12288: 0xA4D7,
-	12648 - 12288: 0xA4D8,
-	12649 - 12288: 0xA4D9,
-	12650 - 12288: 0xA4DA,
-	12651 - 12288: 0xA4DB,
-	12652 - 12288: 0xA4DC,
-	12653 - 12288: 0xA4DD,
-	12654 - 12288: 0xA4DE,
-	12655 - 12288: 0xA4DF,
-	12656 - 12288: 0xA4E0,
-	12657 - 12288: 0xA4E1,
-	12658 - 12288: 0xA4E2,
-	12659 - 12288: 0xA4E3,
-	12660 - 12288: 0xA4E4,
-	12661 - 12288: 0xA4E5,
-	12662 - 12288: 0xA4E6,
-	12663 - 12288: 0xA4E7,
-	12664 - 12288: 0xA4E8,
-	12665 - 12288: 0xA4E9,
-	12666 - 12288: 0xA4EA,
-	12667 - 12288: 0xA4EB,
-	12668 - 12288: 0xA4EC,
-	12669 - 12288: 0xA4ED,
-	12670 - 12288: 0xA4EE,
-	12671 - 12288: 0xA4EF,
-	12672 - 12288: 0xA4F0,
-	12673 - 12288: 0xA4F1,
-	12674 - 12288: 0xA4F2,
-	12675 - 12288: 0xA4F3,
-	12676 - 12288: 0xA4F4,
-	12677 - 12288: 0xA4F5,
-	12678 - 12288: 0xA4F6,
-	12679 - 12288: 0xA4F7,
-	12680 - 12288: 0xA4F8,
-	12681 - 12288: 0xA4F9,
-	12682 - 12288: 0xA4FA,
-	12683 - 12288: 0xA4FB,
-	12684 - 12288: 0xA4FC,
-	12685 - 12288: 0xA4FD,
-	12686 - 12288: 0xA4FE,
-	12800 - 12288: 0xA9B1,
-	12801 - 12288: 0xA9B2,
-	12802 - 12288: 0xA9B3,
-	12803 - 12288: 0xA9B4,
-	12804 - 12288: 0xA9B5,
-	12805 - 12288: 0xA9B6,
-	12806 - 12288: 0xA9B7,
-	12807 - 12288: 0xA9B8,
-	12808 - 12288: 0xA9B9,
-	12809 - 12288: 0xA9BA,
-	12810 - 12288: 0xA9BB,
-	12811 - 12288: 0xA9BC,
-	12812 - 12288: 0xA9BD,
-	12813 - 12288: 0xA9BE,
-	12814 - 12288: 0xA9BF,
-	12815 - 12288: 0xA9C0,
-	12816 - 12288: 0xA9C1,
-	12817 - 12288: 0xA9C2,
-	12818 - 12288: 0xA9C3,
-	12819 - 12288: 0xA9C4,
-	12820 - 12288: 0xA9C5,
-	12821 - 12288: 0xA9C6,
-	12822 - 12288: 0xA9C7,
-	12823 - 12288: 0xA9C8,
-	12824 - 12288: 0xA9C9,
-	12825 - 12288: 0xA9CA,
-	12826 - 12288: 0xA9CB,
-	12827 - 12288: 0xA9CC,
-	12828 - 12288: 0xA2DF,
-	12896 - 12288: 0xA8B1,
-	12897 - 12288: 0xA8B2,
-	12898 - 12288: 0xA8B3,
-	12899 - 12288: 0xA8B4,
-	12900 - 12288: 0xA8B5,
-	12901 - 12288: 0xA8B6,
-	12902 - 12288: 0xA8B7,
-	12903 - 12288: 0xA8B8,
-	12904 - 12288: 0xA8B9,
-	12905 - 12288: 0xA8BA,
-	12906 - 12288: 0xA8BB,
-	12907 - 12288: 0xA8BC,
-	12908 - 12288: 0xA8BD,
-	12909 - 12288: 0xA8BE,
-	12910 - 12288: 0xA8BF,
-	12911 - 12288: 0xA8C0,
-	12912 - 12288: 0xA8C1,
-	12913 - 12288: 0xA8C2,
-	12914 - 12288: 0xA8C3,
-	12915 - 12288: 0xA8C4,
-	12916 - 12288: 0xA8C5,
-	12917 - 12288: 0xA8C6,
-	12918 - 12288: 0xA8C7,
-	12919 - 12288: 0xA8C8,
-	12920 - 12288: 0xA8C9,
-	12921 - 12288: 0xA8CA,
-	12922 - 12288: 0xA8CB,
-	12923 - 12288: 0xA8CC,
-	12927 - 12288: 0xA2DE,
-	13184 - 12288: 0xA7C9,
-	13185 - 12288: 0xA7CA,
-	13186 - 12288: 0xA7CB,
-	13187 - 12288: 0xA7CC,
-	13188 - 12288: 0xA7CD,
-	13192 - 12288: 0xA7BA,
-	13193 - 12288: 0xA7BB,
-	13194 - 12288: 0xA7DC,
-	13195 - 12288: 0xA7DD,
-	13196 - 12288: 0xA7DE,
-	13197 - 12288: 0xA7B6,
-	13198 - 12288: 0xA7B7,
-	13199 - 12288: 0xA7B8,
-	13200 - 12288: 0xA7D4,
-	13201 - 12288: 0xA7D5,
-	13202 - 12288: 0xA7D6,
-	13203 - 12288: 0xA7D7,
-	13204 - 12288: 0xA7D8,
-	13205 - 12288: 0xA7A1,
-	13206 - 12288: 0xA7A2,
-	13207 - 12288: 0xA7A3,
-	13208 - 12288: 0xA7A5,
-	13209 - 12288: 0xA7AB,
-	13210 - 12288: 0xA7AC,
-	13211 - 12288: 0xA7AD,
-	13212 - 12288: 0xA7AE,
-	13213 - 12288: 0xA7AF,
-	13214 - 12288: 0xA7B0,
-	13215 - 12288: 0xA7B1,
-	13216 - 12288: 0xA7B2,
-	13217 - 12288: 0xA7B3,
-	13218 - 12288: 0xA7B4,
-	13219 - 12288: 0xA7A7,
-	13220 - 12288: 0xA7A8,
-	13221 - 12288: 0xA7A9,
-	13222 - 12288: 0xA7AA,
-	13223 - 12288: 0xA7BD,
-	13224 - 12288: 0xA7BE,
-	13225 - 12288: 0xA7E5,
-	13226 - 12288: 0xA7E6,
-	13227 - 12288: 0xA7E7,
-	13228 - 12288: 0xA7E8,
-	13229 - 12288: 0xA7E1,
-	13230 - 12288: 0xA7E2,
-	13231 - 12288: 0xA7E3,
-	13232 - 12288: 0xA7BF,
-	13233 - 12288: 0xA7C0,
-	13234 - 12288: 0xA7C1,
-	13235 - 12288: 0xA7C2,
-	13236 - 12288: 0xA7C3,
-	13237 - 12288: 0xA7C4,
-	13238 - 12288: 0xA7C5,
-	13239 - 12288: 0xA7C6,
-	13240 - 12288: 0xA7C7,
-	13241 - 12288: 0xA7C8,
-	13242 - 12288: 0xA7CE,
-	13243 - 12288: 0xA7CF,
-	13244 - 12288: 0xA7D0,
-	13245 - 12288: 0xA7D1,
-	13246 - 12288: 0xA7D2,
-	13247 - 12288: 0xA7D3,
-	13248 - 12288: 0xA7DA,
-	13249 - 12288: 0xA7DB,
-	13250 - 12288: 0xA2E3,
-	13251 - 12288: 0xA7EC,
-	13252 - 12288: 0xA7A6,
-	13253 - 12288: 0xA7E0,
-	13254 - 12288: 0xA7EF,
-	13255 - 12288: 0xA2E1,
-	13256 - 12288: 0xA7BC,
-	13257 - 12288: 0xA7ED,
-	13258 - 12288: 0xA7B5,
-	13263 - 12288: 0xA7B9,
-	13264 - 12288: 0xA7EA,
-	13267 - 12288: 0xA7EB,
-	13270 - 12288: 0xA7DF,
-	13272 - 12288: 0xA2E4,
-	13275 - 12288: 0xA7E4,
-	13276 - 12288: 0xA7EE,
-	13277 - 12288: 0xA7E9,
-}
-
-const encode4Low, encode4High = 161, 1106
-
-var encode4 = [...]uint16{
-	161 - 161:  0xA2AE,
-	164 - 161:  0xA2B4,
-	167 - 161:  0xA1D7,
-	168 - 161:  0xA1A7,
-	170 - 161:  0xA8A3,
-	173 - 161:  0xA1A9,
-	174 - 161:  0xA2E7,
-	176 - 161:  0xA1C6,
-	177 - 161:  0xA1BE,
-	178 - 161:  0xA9F7,
-	179 - 161:  0xA9F8,
-	180 - 161:  0xA2A5,
-	182 - 161:  0xA2D2,
-	183 - 161:  0xA1A4,
-	184 - 161:  0xA2AC,
-	185 - 161:  0xA9F6,
-	186 - 161:  0xA8AC,
-	188 - 161:  0xA8F9,
-	189 - 161:  0xA8F6,
-	190 - 161:  0xA8FA,
-	191 - 161:  0xA2AF,
-	198 - 161:  0xA8A1,
-	208 - 161:  0xA8A2,
-	215 - 161:  0xA1BF,
-	216 - 161:  0xA8AA,
-	222 - 161:  0xA8AD,
-	223 - 161:  0xA9AC,
-	230 - 161:  0xA9A1,
-	240 - 161:  0xA9A3,
-	247 - 161:  0xA1C0,
-	248 - 161:  0xA9AA,
-	254 - 161:  0xA9AD,
-	273 - 161:  0xA9A2,
-	294 - 161:  0xA8A4,
-	295 - 161:  0xA9A4,
-	305 - 161:  0xA9A5,
-	306 - 161:  0xA8A6,
-	307 - 161:  0xA9A6,
-	312 - 161:  0xA9A7,
-	319 - 161:  0xA8A8,
-	320 - 161:  0xA9A8,
-	321 - 161:  0xA8A9,
-	322 - 161:  0xA9A9,
-	329 - 161:  0xA9B0,
-	330 - 161:  0xA8AF,
-	331 - 161:  0xA9AF,
-	338 - 161:  0xA8AB,
-	339 - 161:  0xA9AB,
-	358 - 161:  0xA8AE,
-	359 - 161:  0xA9AE,
-	711 - 161:  0xA2A7,
-	720 - 161:  0xA2B0,
-	728 - 161:  0xA2A8,
-	729 - 161:  0xA2AB,
-	730 - 161:  0xA2AA,
-	731 - 161:  0xA2AD,
-	733 - 161:  0xA2A9,
-	913 - 161:  0xA5C1,
-	914 - 161:  0xA5C2,
-	915 - 161:  0xA5C3,
-	916 - 161:  0xA5C4,
-	917 - 161:  0xA5C5,
-	918 - 161:  0xA5C6,
-	919 - 161:  0xA5C7,
-	920 - 161:  0xA5C8,
-	921 - 161:  0xA5C9,
-	922 - 161:  0xA5CA,
-	923 - 161:  0xA5CB,
-	924 - 161:  0xA5CC,
-	925 - 161:  0xA5CD,
-	926 - 161:  0xA5CE,
-	927 - 161:  0xA5CF,
-	928 - 161:  0xA5D0,
-	929 - 161:  0xA5D1,
-	931 - 161:  0xA5D2,
-	932 - 161:  0xA5D3,
-	933 - 161:  0xA5D4,
-	934 - 161:  0xA5D5,
-	935 - 161:  0xA5D6,
-	936 - 161:  0xA5D7,
-	937 - 161:  0xA5D8,
-	945 - 161:  0xA5E1,
-	946 - 161:  0xA5E2,
-	947 - 161:  0xA5E3,
-	948 - 161:  0xA5E4,
-	949 - 161:  0xA5E5,
-	950 - 161:  0xA5E6,
-	951 - 161:  0xA5E7,
-	952 - 161:  0xA5E8,
-	953 - 161:  0xA5E9,
-	954 - 161:  0xA5EA,
-	955 - 161:  0xA5EB,
-	956 - 161:  0xA5EC,
-	957 - 161:  0xA5ED,
-	958 - 161:  0xA5EE,
-	959 - 161:  0xA5EF,
-	960 - 161:  0xA5F0,
-	961 - 161:  0xA5F1,
-	963 - 161:  0xA5F2,
-	964 - 161:  0xA5F3,
-	965 - 161:  0xA5F4,
-	966 - 161:  0xA5F5,
-	967 - 161:  0xA5F6,
-	968 - 161:  0xA5F7,
-	969 - 161:  0xA5F8,
-	1025 - 161: 0xACA7,
-	1040 - 161: 0xACA1,
-	1041 - 161: 0xACA2,
-	1042 - 161: 0xACA3,
-	1043 - 161: 0xACA4,
-	1044 - 161: 0xACA5,
-	1045 - 161: 0xACA6,
-	1046 - 161: 0xACA8,
-	1047 - 161: 0xACA9,
-	1048 - 161: 0xACAA,
-	1049 - 161: 0xACAB,
-	1050 - 161: 0xACAC,
-	1051 - 161: 0xACAD,
-	1052 - 161: 0xACAE,
-	1053 - 161: 0xACAF,
-	1054 - 161: 0xACB0,
-	1055 - 161: 0xACB1,
-	1056 - 161: 0xACB2,
-	1057 - 161: 0xACB3,
-	1058 - 161: 0xACB4,
-	1059 - 161: 0xACB5,
-	1060 - 161: 0xACB6,
-	1061 - 161: 0xACB7,
-	1062 - 161: 0xACB8,
-	1063 - 161: 0xACB9,
-	1064 - 161: 0xACBA,
-	1065 - 161: 0xACBB,
-	1066 - 161: 0xACBC,
-	1067 - 161: 0xACBD,
-	1068 - 161: 0xACBE,
-	1069 - 161: 0xACBF,
-	1070 - 161: 0xACC0,
-	1071 - 161: 0xACC1,
-	1072 - 161: 0xACD1,
-	1073 - 161: 0xACD2,
-	1074 - 161: 0xACD3,
-	1075 - 161: 0xACD4,
-	1076 - 161: 0xACD5,
-	1077 - 161: 0xACD6,
-	1078 - 161: 0xACD8,
-	1079 - 161: 0xACD9,
-	1080 - 161: 0xACDA,
-	1081 - 161: 0xACDB,
-	1082 - 161: 0xACDC,
-	1083 - 161: 0xACDD,
-	1084 - 161: 0xACDE,
-	1085 - 161: 0xACDF,
-	1086 - 161: 0xACE0,
-	1087 - 161: 0xACE1,
-	1088 - 161: 0xACE2,
-	1089 - 161: 0xACE3,
-	1090 - 161: 0xACE4,
-	1091 - 161: 0xACE5,
-	1092 - 161: 0xACE6,
-	1093 - 161: 0xACE7,
-	1094 - 161: 0xACE8,
-	1095 - 161: 0xACE9,
-	1096 - 161: 0xACEA,
-	1097 - 161: 0xACEB,
-	1098 - 161: 0xACEC,
-	1099 - 161: 0xACED,
-	1100 - 161: 0xACEE,
-	1101 - 161: 0xACEF,
-	1102 - 161: 0xACF0,
-	1103 - 161: 0xACF1,
-	1105 - 161: 0xACD7,
-}
-
-const encode5Low, encode5High = 63744, 64012
-
-var encode5 = [...]uint16{
-	63744 - 63744: 0xCBD0,
-	63745 - 63744: 0xCBD6,
-	63746 - 63744: 0xCBE7,
-	63747 - 63744: 0xCDCF,
-	63748 - 63744: 0xCDE8,
-	63749 - 63744: 0xCEAD,
-	63750 - 63744: 0xCFFB,
-	63751 - 63744: 0xD0A2,
-	63752 - 63744: 0xD0B8,
-	63753 - 63744: 0xD0D0,
-	63754 - 63744: 0xD0DD,
-	63755 - 63744: 0xD1D4,
-	63756 - 63744: 0xD1D5,
-	63757 - 63744: 0xD1D8,
-	63758 - 63744: 0xD1DB,
-	63759 - 63744: 0xD1DC,
-	63760 - 63744: 0xD1DD,
-	63761 - 63744: 0xD1DE,
-	63762 - 63744: 0xD1DF,
-	63763 - 63744: 0xD1E0,
-	63764 - 63744: 0xD1E2,
-	63765 - 63744: 0xD1E3,
-	63766 - 63744: 0xD1E4,
-	63767 - 63744: 0xD1E5,
-	63768 - 63744: 0xD1E6,
-	63769 - 63744: 0xD1E8,
-	63770 - 63744: 0xD1E9,
-	63771 - 63744: 0xD1EA,
-	63772 - 63744: 0xD1EB,
-	63773 - 63744: 0xD1ED,
-	63774 - 63744: 0xD1EF,
-	63775 - 63744: 0xD1F0,
-	63776 - 63744: 0xD1F2,
-	63777 - 63744: 0xD1F6,
-	63778 - 63744: 0xD1FA,
-	63779 - 63744: 0xD1FC,
-	63780 - 63744: 0xD1FD,
-	63781 - 63744: 0xD1FE,
-	63782 - 63744: 0xD2A2,
-	63783 - 63744: 0xD2A3,
-	63784 - 63744: 0xD2A7,
-	63785 - 63744: 0xD2A8,
-	63786 - 63744: 0xD2A9,
-	63787 - 63744: 0xD2AA,
-	63788 - 63744: 0xD2AB,
-	63789 - 63744: 0xD2AD,
-	63790 - 63744: 0xD2B2,
-	63791 - 63744: 0xD2BE,
-	63792 - 63744: 0xD2C2,
-	63793 - 63744: 0xD2C3,
-	63794 - 63744: 0xD2C4,
-	63795 - 63744: 0xD2C6,
-	63796 - 63744: 0xD2C7,
-	63797 - 63744: 0xD2C8,
-	63798 - 63744: 0xD2C9,
-	63799 - 63744: 0xD2CA,
-	63800 - 63744: 0xD2CB,
-	63801 - 63744: 0xD2CD,
-	63802 - 63744: 0xD2CE,
-	63803 - 63744: 0xD2CF,
-	63804 - 63744: 0xD2D0,
-	63805 - 63744: 0xD2D1,
-	63806 - 63744: 0xD2D2,
-	63807 - 63744: 0xD2D3,
-	63808 - 63744: 0xD2D4,
-	63809 - 63744: 0xD2D5,
-	63810 - 63744: 0xD2D6,
-	63811 - 63744: 0xD2D7,
-	63812 - 63744: 0xD2D9,
-	63813 - 63744: 0xD2DA,
-	63814 - 63744: 0xD2DE,
-	63815 - 63744: 0xD2DF,
-	63816 - 63744: 0xD2E1,
-	63817 - 63744: 0xD2E2,
-	63818 - 63744: 0xD2E4,
-	63819 - 63744: 0xD2E5,
-	63820 - 63744: 0xD2E6,
-	63821 - 63744: 0xD2E7,
-	63822 - 63744: 0xD2E8,
-	63823 - 63744: 0xD2E9,
-	63824 - 63744: 0xD2EA,
-	63825 - 63744: 0xD2EB,
-	63826 - 63744: 0xD2F0,
-	63827 - 63744: 0xD2F1,
-	63828 - 63744: 0xD2F2,
-	63829 - 63744: 0xD2F3,
-	63830 - 63744: 0xD2F4,
-	63831 - 63744: 0xD2F5,
-	63832 - 63744: 0xD2F7,
-	63833 - 63744: 0xD2F8,
-	63834 - 63744: 0xD4E6,
-	63835 - 63744: 0xD4FC,
-	63836 - 63744: 0xD5A5,
-	63837 - 63744: 0xD5AB,
-	63838 - 63744: 0xD5AE,
-	63839 - 63744: 0xD6B8,
-	63840 - 63744: 0xD6CD,
-	63841 - 63744: 0xD7CB,
-	63842 - 63744: 0xD7E4,
-	63843 - 63744: 0xDBC5,
-	63844 - 63744: 0xDBE4,
-	63845 - 63744: 0xDCA5,
-	63846 - 63744: 0xDDA5,
-	63847 - 63744: 0xDDD5,
-	63848 - 63744: 0xDDF4,
-	63849 - 63744: 0xDEFC,
-	63850 - 63744: 0xDEFE,
-	63851 - 63744: 0xDFB3,
-	63852 - 63744: 0xDFE1,
-	63853 - 63744: 0xDFE8,
-	63854 - 63744: 0xE0F1,
-	63855 - 63744: 0xE1AD,
-	63856 - 63744: 0xE1ED,
-	63857 - 63744: 0xE3F5,
-	63858 - 63744: 0xE4A1,
-	63859 - 63744: 0xE4A9,
-	63860 - 63744: 0xE5AE,
-	63861 - 63744: 0xE5B1,
-	63862 - 63744: 0xE5B2,
-	63863 - 63744: 0xE5B9,
-	63864 - 63744: 0xE5BB,
-	63865 - 63744: 0xE5BC,
-	63866 - 63744: 0xE5C4,
-	63867 - 63744: 0xE5CE,
-	63868 - 63744: 0xE5D0,
-	63869 - 63744: 0xE5D2,
-	63870 - 63744: 0xE5D6,
-	63871 - 63744: 0xE5FA,
-	63872 - 63744: 0xE5FB,
-	63873 - 63744: 0xE5FC,
-	63874 - 63744: 0xE5FE,
-	63875 - 63744: 0xE6A1,
-	63876 - 63744: 0xE6A4,
-	63877 - 63744: 0xE6A7,
-	63878 - 63744: 0xE6AD,
-	63879 - 63744: 0xE6AF,
-	63880 - 63744: 0xE6B0,
-	63881 - 63744: 0xE6B1,
-	63882 - 63744: 0xE6B3,
-	63883 - 63744: 0xE6B7,
-	63884 - 63744: 0xE6B8,
-	63885 - 63744: 0xE6BC,
-	63886 - 63744: 0xE6C4,
-	63887 - 63744: 0xE6C6,
-	63888 - 63744: 0xE6C7,
-	63889 - 63744: 0xE6CA,
-	63890 - 63744: 0xE6D2,
-	63891 - 63744: 0xE6D6,
-	63892 - 63744: 0xE6D9,
-	63893 - 63744: 0xE6DC,
-	63894 - 63744: 0xE6DF,
-	63895 - 63744: 0xE6E1,
-	63896 - 63744: 0xE6E4,
-	63897 - 63744: 0xE6E5,
-	63898 - 63744: 0xE6E6,
-	63899 - 63744: 0xE6E8,
-	63900 - 63744: 0xE6EA,
-	63901 - 63744: 0xE6EB,
-	63902 - 63744: 0xE6EC,
-	63903 - 63744: 0xE6EF,
-	63904 - 63744: 0xE6F1,
-	63905 - 63744: 0xE6F2,
-	63906 - 63744: 0xE6F5,
-	63907 - 63744: 0xE6F6,
-	63908 - 63744: 0xE6F7,
-	63909 - 63744: 0xE6F9,
-	63910 - 63744: 0xE7A1,
-	63911 - 63744: 0xE7A6,
-	63912 - 63744: 0xE7A9,
-	63913 - 63744: 0xE7AA,
-	63914 - 63744: 0xE7AC,
-	63915 - 63744: 0xE7AD,
-	63916 - 63744: 0xE7B0,
-	63917 - 63744: 0xE7BF,
-	63918 - 63744: 0xE7C1,
-	63919 - 63744: 0xE7C6,
-	63920 - 63744: 0xE7C7,
-	63921 - 63744: 0xE7CB,
-	63922 - 63744: 0xE7CD,
-	63923 - 63744: 0xE7CF,
-	63924 - 63744: 0xE7D0,
-	63925 - 63744: 0xE7D3,
-	63926 - 63744: 0xE7DF,
-	63927 - 63744: 0xE7E4,
-	63928 - 63744: 0xE7E6,
-	63929 - 63744: 0xE7F7,
-	63930 - 63744: 0xE8E7,
-	63931 - 63744: 0xE8E8,
-	63932 - 63744: 0xE8F0,
-	63933 - 63744: 0xE8F1,
-	63934 - 63744: 0xE8F7,
-	63935 - 63744: 0xE8F9,
-	63936 - 63744: 0xE8FB,
-	63937 - 63744: 0xE8FE,
-	63938 - 63744: 0xE9A7,
-	63939 - 63744: 0xE9AC,
-	63940 - 63744: 0xE9CC,
-	63941 - 63744: 0xE9F7,
-	63942 - 63744: 0xEAC1,
-	63943 - 63744: 0xEAE5,
-	63944 - 63744: 0xEAF4,
-	63945 - 63744: 0xEAF7,
-	63946 - 63744: 0xEAFC,
-	63947 - 63744: 0xEAFE,
-	63948 - 63744: 0xEBA4,
-	63949 - 63744: 0xEBA7,
-	63950 - 63744: 0xEBA9,
-	63951 - 63744: 0xEBAA,
-	63952 - 63744: 0xEBBA,
-	63953 - 63744: 0xEBBB,
-	63954 - 63744: 0xEBBD,
-	63955 - 63744: 0xEBC1,
-	63956 - 63744: 0xEBC2,
-	63957 - 63744: 0xEBC6,
-	63958 - 63744: 0xEBC7,
-	63959 - 63744: 0xEBCC,
-	63960 - 63744: 0xEBCF,
-	63961 - 63744: 0xEBD0,
-	63962 - 63744: 0xEBD1,
-	63963 - 63744: 0xEBD2,
-	63964 - 63744: 0xEBD8,
-	63965 - 63744: 0xECA6,
-	63966 - 63744: 0xECA7,
-	63967 - 63744: 0xECAA,
-	63968 - 63744: 0xECAF,
-	63969 - 63744: 0xECB0,
-	63970 - 63744: 0xECB1,
-	63971 - 63744: 0xECB2,
-	63972 - 63744: 0xECB5,
-	63973 - 63744: 0xECB8,
-	63974 - 63744: 0xECBA,
-	63975 - 63744: 0xECC0,
-	63976 - 63744: 0xECC1,
-	63977 - 63744: 0xECC5,
-	63978 - 63744: 0xECC6,
-	63979 - 63744: 0xECC9,
-	63980 - 63744: 0xECCA,
-	63981 - 63744: 0xECD5,
-	63982 - 63744: 0xECDD,
-	63983 - 63744: 0xECDE,
-	63984 - 63744: 0xECE1,
-	63985 - 63744: 0xECE4,
-	63986 - 63744: 0xECE7,
-	63987 - 63744: 0xECE8,
-	63988 - 63744: 0xECF7,
-	63989 - 63744: 0xECF8,
-	63990 - 63744: 0xECFA,
-	63991 - 63744: 0xEDA1,
-	63992 - 63744: 0xEDA2,
-	63993 - 63744: 0xEDA3,
-	63994 - 63744: 0xEDEE,
-	63995 - 63744: 0xEEDB,
-	63996 - 63744: 0xF2BD,
-	63997 - 63744: 0xF2FA,
-	63998 - 63744: 0xF3B1,
-	63999 - 63744: 0xF4A7,
-	64000 - 63744: 0xF4EE,
-	64001 - 63744: 0xF6F4,
-	64002 - 63744: 0xF6F6,
-	64003 - 63744: 0xF7B8,
-	64004 - 63744: 0xF7C8,
-	64005 - 63744: 0xF7D3,
-	64006 - 63744: 0xF8DB,
-	64007 - 63744: 0xF8F0,
-	64008 - 63744: 0xFAA1,
-	64009 - 63744: 0xFAA2,
-	64010 - 63744: 0xFAE6,
-	64011 - 63744: 0xFCA9,
-}
-
-const encode6Low, encode6High = 65281, 65511
-
-var encode6 = [...]uint16{
-	65281 - 65281: 0xA3A1,
-	65282 - 65281: 0xA3A2,
-	65283 - 65281: 0xA3A3,
-	65284 - 65281: 0xA3A4,
-	65285 - 65281: 0xA3A5,
-	65286 - 65281: 0xA3A6,
-	65287 - 65281: 0xA3A7,
-	65288 - 65281: 0xA3A8,
-	65289 - 65281: 0xA3A9,
-	65290 - 65281: 0xA3AA,
-	65291 - 65281: 0xA3AB,
-	65292 - 65281: 0xA3AC,
-	65293 - 65281: 0xA3AD,
-	65294 - 65281: 0xA3AE,
-	65295 - 65281: 0xA3AF,
-	65296 - 65281: 0xA3B0,
-	65297 - 65281: 0xA3B1,
-	65298 - 65281: 0xA3B2,
-	65299 - 65281: 0xA3B3,
-	65300 - 65281: 0xA3B4,
-	65301 - 65281: 0xA3B5,
-	65302 - 65281: 0xA3B6,
-	65303 - 65281: 0xA3B7,
-	65304 - 65281: 0xA3B8,
-	65305 - 65281: 0xA3B9,
-	65306 - 65281: 0xA3BA,
-	65307 - 65281: 0xA3BB,
-	65308 - 65281: 0xA3BC,
-	65309 - 65281: 0xA3BD,
-	65310 - 65281: 0xA3BE,
-	65311 - 65281: 0xA3BF,
-	65312 - 65281: 0xA3C0,
-	65313 - 65281: 0xA3C1,
-	65314 - 65281: 0xA3C2,
-	65315 - 65281: 0xA3C3,
-	65316 - 65281: 0xA3C4,
-	65317 - 65281: 0xA3C5,
-	65318 - 65281: 0xA3C6,
-	65319 - 65281: 0xA3C7,
-	65320 - 65281: 0xA3C8,
-	65321 - 65281: 0xA3C9,
-	65322 - 65281: 0xA3CA,
-	65323 - 65281: 0xA3CB,
-	65324 - 65281: 0xA3CC,
-	65325 - 65281: 0xA3CD,
-	65326 - 65281: 0xA3CE,
-	65327 - 65281: 0xA3CF,
-	65328 - 65281: 0xA3D0,
-	65329 - 65281: 0xA3D1,
-	65330 - 65281: 0xA3D2,
-	65331 - 65281: 0xA3D3,
-	65332 - 65281: 0xA3D4,
-	65333 - 65281: 0xA3D5,
-	65334 - 65281: 0xA3D6,
-	65335 - 65281: 0xA3D7,
-	65336 - 65281: 0xA3D8,
-	65337 - 65281: 0xA3D9,
-	65338 - 65281: 0xA3DA,
-	65339 - 65281: 0xA3DB,
-	65340 - 65281: 0xA1AC,
-	65341 - 65281: 0xA3DD,
-	65342 - 65281: 0xA3DE,
-	65343 - 65281: 0xA3DF,
-	65344 - 65281: 0xA3E0,
-	65345 - 65281: 0xA3E1,
-	65346 - 65281: 0xA3E2,
-	65347 - 65281: 0xA3E3,
-	65348 - 65281: 0xA3E4,
-	65349 - 65281: 0xA3E5,
-	65350 - 65281: 0xA3E6,
-	65351 - 65281: 0xA3E7,
-	65352 - 65281: 0xA3E8,
-	65353 - 65281: 0xA3E9,
-	65354 - 65281: 0xA3EA,
-	65355 - 65281: 0xA3EB,
-	65356 - 65281: 0xA3EC,
-	65357 - 65281: 0xA3ED,
-	65358 - 65281: 0xA3EE,
-	65359 - 65281: 0xA3EF,
-	65360 - 65281: 0xA3F0,
-	65361 - 65281: 0xA3F1,
-	65362 - 65281: 0xA3F2,
-	65363 - 65281: 0xA3F3,
-	65364 - 65281: 0xA3F4,
-	65365 - 65281: 0xA3F5,
-	65366 - 65281: 0xA3F6,
-	65367 - 65281: 0xA3F7,
-	65368 - 65281: 0xA3F8,
-	65369 - 65281: 0xA3F9,
-	65370 - 65281: 0xA3FA,
-	65371 - 65281: 0xA3FB,
-	65372 - 65281: 0xA3FC,
-	65373 - 65281: 0xA3FD,
-	65374 - 65281: 0xA2A6,
-	65504 - 65281: 0xA1CB,
-	65505 - 65281: 0xA1CC,
-	65506 - 65281: 0xA1FE,
-	65507 - 65281: 0xA3FE,
-	65509 - 65281: 0xA1CD,
-	65510 - 65281: 0xA3DC,
-}
diff --git a/vendor/golang.org/x/text/encoding/simplifiedchinese/all.go b/vendor/golang.org/x/text/encoding/simplifiedchinese/all.go
deleted file mode 100644
index 5ecc526cf8..0000000000
--- a/vendor/golang.org/x/text/encoding/simplifiedchinese/all.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simplifiedchinese
-
-import (
-	"golang.org/x/text/encoding"
-)
-
-// All is a list of all defined encodings in this package.
-var All = []encoding.Encoding{GB18030, GBK, HZGB2312}
diff --git a/vendor/golang.org/x/text/encoding/simplifiedchinese/gbk.go b/vendor/golang.org/x/text/encoding/simplifiedchinese/gbk.go
deleted file mode 100644
index b89c45b03d..0000000000
--- a/vendor/golang.org/x/text/encoding/simplifiedchinese/gbk.go
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simplifiedchinese
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/internal"
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/transform"
-)
-
-var (
-	// GB18030 is the GB18030 encoding.
-	GB18030 encoding.Encoding = &gbk18030
-	// GBK is the GBK encoding. It encodes an extension of the GB2312 character set
-	// and is also known as Code Page 936.
-	GBK encoding.Encoding = &gbk
-)
-
-var gbk = internal.Encoding{
-	&internal.SimpleEncoding{
-		gbkDecoder{gb18030: false},
-		gbkEncoder{gb18030: false},
-	},
-	"GBK",
-	identifier.GBK,
-}
-
-var gbk18030 = internal.Encoding{
-	&internal.SimpleEncoding{
-		gbkDecoder{gb18030: true},
-		gbkEncoder{gb18030: true},
-	},
-	"GB18030",
-	identifier.GB18030,
-}
-
-type gbkDecoder struct {
-	transform.NopResetter
-	gb18030 bool
-}
-
-func (d gbkDecoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-loop:
-	for ; nSrc < len(src); nSrc += size {
-		switch c0 := src[nSrc]; {
-		case c0 < utf8.RuneSelf:
-			r, size = rune(c0), 1
-
-		// Microsoft's Code Page 936 extends GBK 1.0 to encode the euro sign U+20AC
-		// as 0x80. The HTML5 specification at http://encoding.spec.whatwg.org/#gbk
-		// says to treat "gbk" as Code Page 936.
-		case c0 == 0x80:
-			r, size = '€', 1
-
-		case c0 < 0xff:
-			if nSrc+1 >= len(src) {
-				if !atEOF {
-					err = transform.ErrShortSrc
-					break loop
-				}
-				r, size = utf8.RuneError, 1
-				goto write
-			}
-			c1 := src[nSrc+1]
-			switch {
-			case 0x40 <= c1 && c1 < 0x7f:
-				c1 -= 0x40
-			case 0x80 <= c1 && c1 < 0xff:
-				c1 -= 0x41
-			case d.gb18030 && 0x30 <= c1 && c1 < 0x40:
-				if nSrc+3 >= len(src) {
-					if !atEOF {
-						err = transform.ErrShortSrc
-						break loop
-					}
-					// The second byte here is always ASCII, so we can set size
-					// to 1 in all cases.
-					r, size = utf8.RuneError, 1
-					goto write
-				}
-				c2 := src[nSrc+2]
-				if c2 < 0x81 || 0xff <= c2 {
-					r, size = utf8.RuneError, 1
-					goto write
-				}
-				c3 := src[nSrc+3]
-				if c3 < 0x30 || 0x3a <= c3 {
-					r, size = utf8.RuneError, 1
-					goto write
-				}
-				size = 4
-				r = ((rune(c0-0x81)*10+rune(c1-0x30))*126+rune(c2-0x81))*10 + rune(c3-0x30)
-				if r < 39420 {
-					i, j := 0, len(gb18030)
-					for i < j {
-						h := i + (j-i)/2
-						if r >= rune(gb18030[h][0]) {
-							i = h + 1
-						} else {
-							j = h
-						}
-					}
-					dec := &gb18030[i-1]
-					r += rune(dec[1]) - rune(dec[0])
-					goto write
-				}
-				r -= 189000
-				if 0 <= r && r < 0x100000 {
-					r += 0x10000
-				} else {
-					r, size = utf8.RuneError, 1
-				}
-				goto write
-			default:
-				r, size = utf8.RuneError, 1
-				goto write
-			}
-			r, size = '\ufffd', 2
-			if i := int(c0-0x81)*190 + int(c1); i < len(decode) {
-				r = rune(decode[i])
-				if r == 0 {
-					r = '\ufffd'
-				}
-			}
-
-		default:
-			r, size = utf8.RuneError, 1
-		}
-
-	write:
-		if nDst+utf8.RuneLen(r) > len(dst) {
-			err = transform.ErrShortDst
-			break loop
-		}
-		nDst += utf8.EncodeRune(dst[nDst:], r)
-	}
-	return nDst, nSrc, err
-}
-
-type gbkEncoder struct {
-	transform.NopResetter
-	gb18030 bool
-}
-
-func (e gbkEncoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, r2, size := rune(0), rune(0), 0
-	for ; nSrc < len(src); nSrc += size {
-		r = rune(src[nSrc])
-
-		// Decode a 1-byte rune.
-		if r < utf8.RuneSelf {
-			size = 1
-
-		} else {
-			// Decode a multi-byte rune.
-			r, size = utf8.DecodeRune(src[nSrc:])
-			if size == 1 {
-				// All valid runes of size 1 (those below utf8.RuneSelf) were
-				// handled above. We have invalid UTF-8 or we haven't seen the
-				// full character yet.
-				if !atEOF && !utf8.FullRune(src[nSrc:]) {
-					err = transform.ErrShortSrc
-					break
-				}
-			}
-
-			// func init checks that the switch covers all tables.
-			switch {
-			case encode0Low <= r && r < encode0High:
-				if r2 = rune(encode0[r-encode0Low]); r2 != 0 {
-					goto write2
-				}
-			case encode1Low <= r && r < encode1High:
-				// Microsoft's Code Page 936 extends GBK 1.0 to encode the euro sign U+20AC
-				// as 0x80. The HTML5 specification at http://encoding.spec.whatwg.org/#gbk
-				// says to treat "gbk" as Code Page 936.
-				if r == '€' {
-					r = 0x80
-					goto write1
-				}
-				if r2 = rune(encode1[r-encode1Low]); r2 != 0 {
-					goto write2
-				}
-			case encode2Low <= r && r < encode2High:
-				if r2 = rune(encode2[r-encode2Low]); r2 != 0 {
-					goto write2
-				}
-			case encode3Low <= r && r < encode3High:
-				if r2 = rune(encode3[r-encode3Low]); r2 != 0 {
-					goto write2
-				}
-			case encode4Low <= r && r < encode4High:
-				if r2 = rune(encode4[r-encode4Low]); r2 != 0 {
-					goto write2
-				}
-			}
-
-			if e.gb18030 {
-				if r < 0x10000 {
-					i, j := 0, len(gb18030)
-					for i < j {
-						h := i + (j-i)/2
-						if r >= rune(gb18030[h][1]) {
-							i = h + 1
-						} else {
-							j = h
-						}
-					}
-					dec := &gb18030[i-1]
-					r += rune(dec[0]) - rune(dec[1])
-					goto write4
-				} else if r < 0x110000 {
-					r += 189000 - 0x10000
-					goto write4
-				}
-			}
-			err = internal.ErrASCIIReplacement
-			break
-		}
-
-	write1:
-		if nDst >= len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst] = uint8(r)
-		nDst++
-		continue
-
-	write2:
-		if nDst+2 > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst+0] = uint8(r2 >> 8)
-		dst[nDst+1] = uint8(r2)
-		nDst += 2
-		continue
-
-	write4:
-		if nDst+4 > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst+3] = uint8(r%10 + 0x30)
-		r /= 10
-		dst[nDst+2] = uint8(r%126 + 0x81)
-		r /= 126
-		dst[nDst+1] = uint8(r%10 + 0x30)
-		r /= 10
-		dst[nDst+0] = uint8(r + 0x81)
-		nDst += 4
-		continue
-	}
-	return nDst, nSrc, err
-}
-
-func init() {
-	// Check that the hard-coded encode switch covers all tables.
-	if numEncodeTables != 5 {
-		panic("bad numEncodeTables")
-	}
-}
diff --git a/vendor/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go b/vendor/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go
deleted file mode 100644
index eb3157f0b2..0000000000
--- a/vendor/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simplifiedchinese
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/internal"
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/transform"
-)
-
-// HZGB2312 is the HZ-GB2312 encoding.
-var HZGB2312 encoding.Encoding = &hzGB2312
-
-var hzGB2312 = internal.Encoding{
-	internal.FuncEncoding{hzGB2312NewDecoder, hzGB2312NewEncoder},
-	"HZ-GB2312",
-	identifier.HZGB2312,
-}
-
-func hzGB2312NewDecoder() transform.Transformer {
-	return new(hzGB2312Decoder)
-}
-
-func hzGB2312NewEncoder() transform.Transformer {
-	return new(hzGB2312Encoder)
-}
-
-const (
-	asciiState = iota
-	gbState
-)
-
-type hzGB2312Decoder int
-
-func (d *hzGB2312Decoder) Reset() {
-	*d = asciiState
-}
-
-func (d *hzGB2312Decoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-loop:
-	for ; nSrc < len(src); nSrc += size {
-		c0 := src[nSrc]
-		if c0 >= utf8.RuneSelf {
-			r, size = utf8.RuneError, 1
-			goto write
-		}
-
-		if c0 == '~' {
-			if nSrc+1 >= len(src) {
-				if !atEOF {
-					err = transform.ErrShortSrc
-					break loop
-				}
-				r = utf8.RuneError
-				goto write
-			}
-			size = 2
-			switch src[nSrc+1] {
-			case '{':
-				*d = gbState
-				continue
-			case '}':
-				*d = asciiState
-				continue
-			case '~':
-				if nDst >= len(dst) {
-					err = transform.ErrShortDst
-					break loop
-				}
-				dst[nDst] = '~'
-				nDst++
-				continue
-			case '\n':
-				continue
-			default:
-				r = utf8.RuneError
-				goto write
-			}
-		}
-
-		if *d == asciiState {
-			r, size = rune(c0), 1
-		} else {
-			if nSrc+1 >= len(src) {
-				if !atEOF {
-					err = transform.ErrShortSrc
-					break loop
-				}
-				r, size = utf8.RuneError, 1
-				goto write
-			}
-			size = 2
-			c1 := src[nSrc+1]
-			if c0 < 0x21 || 0x7e <= c0 || c1 < 0x21 || 0x7f <= c1 {
-				// error
-			} else if i := int(c0-0x01)*190 + int(c1+0x3f); i < len(decode) {
-				r = rune(decode[i])
-				if r != 0 {
-					goto write
-				}
-			}
-			if c1 > utf8.RuneSelf {
-				// Be consistent and always treat non-ASCII as a single error.
-				size = 1
-			}
-			r = utf8.RuneError
-		}
-
-	write:
-		if nDst+utf8.RuneLen(r) > len(dst) {
-			err = transform.ErrShortDst
-			break loop
-		}
-		nDst += utf8.EncodeRune(dst[nDst:], r)
-	}
-	return nDst, nSrc, err
-}
-
-type hzGB2312Encoder int
-
-func (d *hzGB2312Encoder) Reset() {
-	*d = asciiState
-}
-
-func (e *hzGB2312Encoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-	for ; nSrc < len(src); nSrc += size {
-		r = rune(src[nSrc])
-
-		// Decode a 1-byte rune.
-		if r < utf8.RuneSelf {
-			size = 1
-			if r == '~' {
-				if nDst+2 > len(dst) {
-					err = transform.ErrShortDst
-					break
-				}
-				dst[nDst+0] = '~'
-				dst[nDst+1] = '~'
-				nDst += 2
-				continue
-			} else if *e != asciiState {
-				if nDst+3 > len(dst) {
-					err = transform.ErrShortDst
-					break
-				}
-				*e = asciiState
-				dst[nDst+0] = '~'
-				dst[nDst+1] = '}'
-				nDst += 2
-			} else if nDst >= len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			dst[nDst] = uint8(r)
-			nDst += 1
-			continue
-
-		}
-
-		// Decode a multi-byte rune.
-		r, size = utf8.DecodeRune(src[nSrc:])
-		if size == 1 {
-			// All valid runes of size 1 (those below utf8.RuneSelf) were
-			// handled above. We have invalid UTF-8 or we haven't seen the
-			// full character yet.
-			if !atEOF && !utf8.FullRune(src[nSrc:]) {
-				err = transform.ErrShortSrc
-				break
-			}
-		}
-
-		// func init checks that the switch covers all tables.
-		switch {
-		case encode0Low <= r && r < encode0High:
-			if r = rune(encode0[r-encode0Low]); r != 0 {
-				goto writeGB
-			}
-		case encode1Low <= r && r < encode1High:
-			if r = rune(encode1[r-encode1Low]); r != 0 {
-				goto writeGB
-			}
-		case encode2Low <= r && r < encode2High:
-			if r = rune(encode2[r-encode2Low]); r != 0 {
-				goto writeGB
-			}
-		case encode3Low <= r && r < encode3High:
-			if r = rune(encode3[r-encode3Low]); r != 0 {
-				goto writeGB
-			}
-		case encode4Low <= r && r < encode4High:
-			if r = rune(encode4[r-encode4Low]); r != 0 {
-				goto writeGB
-			}
-		}
-
-	terminateInASCIIState:
-		// Switch back to ASCII state in case of error so that an ASCII
-		// replacement character can be written in the correct state.
-		if *e != asciiState {
-			if nDst+2 > len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			dst[nDst+0] = '~'
-			dst[nDst+1] = '}'
-			nDst += 2
-		}
-		err = internal.ErrASCIIReplacement
-		break
-
-	writeGB:
-		c0 := uint8(r>>8) - 0x80
-		c1 := uint8(r) - 0x80
-		if c0 < 0x21 || 0x7e <= c0 || c1 < 0x21 || 0x7f <= c1 {
-			goto terminateInASCIIState
-		}
-		if *e == asciiState {
-			if nDst+4 > len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			*e = gbState
-			dst[nDst+0] = '~'
-			dst[nDst+1] = '{'
-			nDst += 2
-		} else if nDst+2 > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst+0] = c0
-		dst[nDst+1] = c1
-		nDst += 2
-		continue
-	}
-	// TODO: should one always terminate in ASCII state to make it safe to
-	// concatenate two HZ-GB2312-encoded strings?
-	return nDst, nSrc, err
-}
diff --git a/vendor/golang.org/x/text/encoding/simplifiedchinese/tables.go b/vendor/golang.org/x/text/encoding/simplifiedchinese/tables.go
deleted file mode 100644
index 415f52a111..0000000000
--- a/vendor/golang.org/x/text/encoding/simplifiedchinese/tables.go
+++ /dev/null
@@ -1,43999 +0,0 @@
-// generated by go run maketables.go; DO NOT EDIT
-
-// Package simplifiedchinese provides Simplified Chinese encodings such as GBK.
-package simplifiedchinese // import "golang.org/x/text/encoding/simplifiedchinese"
-
-// gb18030 is the table from http://encoding.spec.whatwg.org/index-gb18030.txt
-var gb18030 = [...][2]uint16{
-	{0x0000, 0x0080},
-	{0x0024, 0x00a5},
-	{0x0026, 0x00a9},
-	{0x002d, 0x00b2},
-	{0x0032, 0x00b8},
-	{0x0051, 0x00d8},
-	{0x0059, 0x00e2},
-	{0x005f, 0x00eb},
-	{0x0060, 0x00ee},
-	{0x0064, 0x00f4},
-	{0x0067, 0x00f8},
-	{0x0068, 0x00fb},
-	{0x0069, 0x00fd},
-	{0x006d, 0x0102},
-	{0x007e, 0x0114},
-	{0x0085, 0x011c},
-	{0x0094, 0x012c},
-	{0x00ac, 0x0145},
-	{0x00af, 0x0149},
-	{0x00b3, 0x014e},
-	{0x00d0, 0x016c},
-	{0x0132, 0x01cf},
-	{0x0133, 0x01d1},
-	{0x0134, 0x01d3},
-	{0x0135, 0x01d5},
-	{0x0136, 0x01d7},
-	{0x0137, 0x01d9},
-	{0x0138, 0x01db},
-	{0x0139, 0x01dd},
-	{0x0155, 0x01fa},
-	{0x01ac, 0x0252},
-	{0x01bb, 0x0262},
-	{0x0220, 0x02c8},
-	{0x0221, 0x02cc},
-	{0x022e, 0x02da},
-	{0x02e5, 0x03a2},
-	{0x02e6, 0x03aa},
-	{0x02ed, 0x03c2},
-	{0x02ee, 0x03ca},
-	{0x0325, 0x0402},
-	{0x0333, 0x0450},
-	{0x0334, 0x0452},
-	{0x1ef2, 0x2011},
-	{0x1ef4, 0x2017},
-	{0x1ef5, 0x201a},
-	{0x1ef7, 0x201e},
-	{0x1efe, 0x2027},
-	{0x1f07, 0x2031},
-	{0x1f08, 0x2034},
-	{0x1f09, 0x2036},
-	{0x1f0e, 0x203c},
-	{0x1f7e, 0x20ad},
-	{0x1fd4, 0x2104},
-	{0x1fd5, 0x2106},
-	{0x1fd8, 0x210a},
-	{0x1fe4, 0x2117},
-	{0x1fee, 0x2122},
-	{0x202c, 0x216c},
-	{0x2030, 0x217a},
-	{0x2046, 0x2194},
-	{0x2048, 0x219a},
-	{0x20b6, 0x2209},
-	{0x20bc, 0x2210},
-	{0x20bd, 0x2212},
-	{0x20c0, 0x2216},
-	{0x20c4, 0x221b},
-	{0x20c6, 0x2221},
-	{0x20c8, 0x2224},
-	{0x20c9, 0x2226},
-	{0x20ca, 0x222c},
-	{0x20cc, 0x222f},
-	{0x20d1, 0x2238},
-	{0x20d6, 0x223e},
-	{0x20e0, 0x2249},
-	{0x20e3, 0x224d},
-	{0x20e8, 0x2253},
-	{0x20f5, 0x2262},
-	{0x20f7, 0x2268},
-	{0x20fd, 0x2270},
-	{0x2122, 0x2296},
-	{0x2125, 0x229a},
-	{0x2130, 0x22a6},
-	{0x2149, 0x22c0},
-	{0x219b, 0x2313},
-	{0x22e8, 0x246a},
-	{0x22f2, 0x249c},
-	{0x2356, 0x254c},
-	{0x235a, 0x2574},
-	{0x2367, 0x2590},
-	{0x236a, 0x2596},
-	{0x2374, 0x25a2},
-	{0x2384, 0x25b4},
-	{0x238c, 0x25be},
-	{0x2394, 0x25c8},
-	{0x2397, 0x25cc},
-	{0x2399, 0x25d0},
-	{0x23ab, 0x25e6},
-	{0x23ca, 0x2607},
-	{0x23cc, 0x260a},
-	{0x2402, 0x2641},
-	{0x2403, 0x2643},
-	{0x2c41, 0x2e82},
-	{0x2c43, 0x2e85},
-	{0x2c46, 0x2e89},
-	{0x2c48, 0x2e8d},
-	{0x2c52, 0x2e98},
-	{0x2c61, 0x2ea8},
-	{0x2c63, 0x2eab},
-	{0x2c66, 0x2eaf},
-	{0x2c6a, 0x2eb4},
-	{0x2c6c, 0x2eb8},
-	{0x2c6f, 0x2ebc},
-	{0x2c7d, 0x2ecb},
-	{0x2da2, 0x2ffc},
-	{0x2da6, 0x3004},
-	{0x2da7, 0x3018},
-	{0x2dac, 0x301f},
-	{0x2dae, 0x302a},
-	{0x2dc2, 0x303f},
-	{0x2dc4, 0x3094},
-	{0x2dcb, 0x309f},
-	{0x2dcd, 0x30f7},
-	{0x2dd2, 0x30ff},
-	{0x2dd8, 0x312a},
-	{0x2ece, 0x322a},
-	{0x2ed5, 0x3232},
-	{0x2f46, 0x32a4},
-	{0x3030, 0x3390},
-	{0x303c, 0x339f},
-	{0x303e, 0x33a2},
-	{0x3060, 0x33c5},
-	{0x3069, 0x33cf},
-	{0x306b, 0x33d3},
-	{0x306d, 0x33d6},
-	{0x30de, 0x3448},
-	{0x3109, 0x3474},
-	{0x3233, 0x359f},
-	{0x32a2, 0x360f},
-	{0x32ad, 0x361b},
-	{0x35aa, 0x3919},
-	{0x35ff, 0x396f},
-	{0x365f, 0x39d1},
-	{0x366d, 0x39e0},
-	{0x3700, 0x3a74},
-	{0x37da, 0x3b4f},
-	{0x38f9, 0x3c6f},
-	{0x396a, 0x3ce1},
-	{0x3cdf, 0x4057},
-	{0x3de7, 0x4160},
-	{0x3fbe, 0x4338},
-	{0x4032, 0x43ad},
-	{0x4036, 0x43b2},
-	{0x4061, 0x43de},
-	{0x4159, 0x44d7},
-	{0x42ce, 0x464d},
-	{0x42e2, 0x4662},
-	{0x43a3, 0x4724},
-	{0x43a8, 0x472a},
-	{0x43fa, 0x477d},
-	{0x440a, 0x478e},
-	{0x45c3, 0x4948},
-	{0x45f5, 0x497b},
-	{0x45f7, 0x497e},
-	{0x45fb, 0x4984},
-	{0x45fc, 0x4987},
-	{0x4610, 0x499c},
-	{0x4613, 0x49a0},
-	{0x4629, 0x49b8},
-	{0x48e8, 0x4c78},
-	{0x490f, 0x4ca4},
-	{0x497e, 0x4d1a},
-	{0x4a12, 0x4daf},
-	{0x4a63, 0x9fa6},
-	{0x82bd, 0xe76c},
-	{0x82be, 0xe7c8},
-	{0x82bf, 0xe7e7},
-	{0x82cc, 0xe815},
-	{0x82cd, 0xe819},
-	{0x82d2, 0xe81f},
-	{0x82d9, 0xe827},
-	{0x82dd, 0xe82d},
-	{0x82e1, 0xe833},
-	{0x82e9, 0xe83c},
-	{0x82f0, 0xe844},
-	{0x8300, 0xe856},
-	{0x830e, 0xe865},
-	{0x93d5, 0xf92d},
-	{0x9421, 0xf97a},
-	{0x943c, 0xf996},
-	{0x948d, 0xf9e8},
-	{0x9496, 0xf9f2},
-	{0x94b0, 0xfa10},
-	{0x94b1, 0xfa12},
-	{0x94b2, 0xfa15},
-	{0x94b5, 0xfa19},
-	{0x94bb, 0xfa22},
-	{0x94bc, 0xfa25},
-	{0x94be, 0xfa2a},
-	{0x98c4, 0xfe32},
-	{0x98c5, 0xfe45},
-	{0x98c9, 0xfe53},
-	{0x98ca, 0xfe58},
-	{0x98cb, 0xfe67},
-	{0x98cc, 0xfe6c},
-	{0x9961, 0xff5f},
-	{0x99e2, 0xffe6},
-}
-
-// decode is the decoding table from GBK code to Unicode.
-// It is defined at http://encoding.spec.whatwg.org/index-gbk.txt
-var decode = [...]uint16{
-	0:     0x4E02,
-	1:     0x4E04,
-	2:     0x4E05,
-	3:     0x4E06,
-	4:     0x4E0F,
-	5:     0x4E12,
-	6:     0x4E17,
-	7:     0x4E1F,
-	8:     0x4E20,
-	9:     0x4E21,
-	10:    0x4E23,
-	11:    0x4E26,
-	12:    0x4E29,
-	13:    0x4E2E,
-	14:    0x4E2F,
-	15:    0x4E31,
-	16:    0x4E33,
-	17:    0x4E35,
-	18:    0x4E37,
-	19:    0x4E3C,
-	20:    0x4E40,
-	21:    0x4E41,
-	22:    0x4E42,
-	23:    0x4E44,
-	24:    0x4E46,
-	25:    0x4E4A,
-	26:    0x4E51,
-	27:    0x4E55,
-	28:    0x4E57,
-	29:    0x4E5A,
-	30:    0x4E5B,
-	31:    0x4E62,
-	32:    0x4E63,
-	33:    0x4E64,
-	34:    0x4E65,
-	35:    0x4E67,
-	36:    0x4E68,
-	37:    0x4E6A,
-	38:    0x4E6B,
-	39:    0x4E6C,
-	40:    0x4E6D,
-	41:    0x4E6E,
-	42:    0x4E6F,
-	43:    0x4E72,
-	44:    0x4E74,
-	45:    0x4E75,
-	46:    0x4E76,
-	47:    0x4E77,
-	48:    0x4E78,
-	49:    0x4E79,
-	50:    0x4E7A,
-	51:    0x4E7B,
-	52:    0x4E7C,
-	53:    0x4E7D,
-	54:    0x4E7F,
-	55:    0x4E80,
-	56:    0x4E81,
-	57:    0x4E82,
-	58:    0x4E83,
-	59:    0x4E84,
-	60:    0x4E85,
-	61:    0x4E87,
-	62:    0x4E8A,
-	63:    0x4E90,
-	64:    0x4E96,
-	65:    0x4E97,
-	66:    0x4E99,
-	67:    0x4E9C,
-	68:    0x4E9D,
-	69:    0x4E9E,
-	70:    0x4EA3,
-	71:    0x4EAA,
-	72:    0x4EAF,
-	73:    0x4EB0,
-	74:    0x4EB1,
-	75:    0x4EB4,
-	76:    0x4EB6,
-	77:    0x4EB7,
-	78:    0x4EB8,
-	79:    0x4EB9,
-	80:    0x4EBC,
-	81:    0x4EBD,
-	82:    0x4EBE,
-	83:    0x4EC8,
-	84:    0x4ECC,
-	85:    0x4ECF,
-	86:    0x4ED0,
-	87:    0x4ED2,
-	88:    0x4EDA,
-	89:    0x4EDB,
-	90:    0x4EDC,
-	91:    0x4EE0,
-	92:    0x4EE2,
-	93:    0x4EE6,
-	94:    0x4EE7,
-	95:    0x4EE9,
-	96:    0x4EED,
-	97:    0x4EEE,
-	98:    0x4EEF,
-	99:    0x4EF1,
-	100:   0x4EF4,
-	101:   0x4EF8,
-	102:   0x4EF9,
-	103:   0x4EFA,
-	104:   0x4EFC,
-	105:   0x4EFE,
-	106:   0x4F00,
-	107:   0x4F02,
-	108:   0x4F03,
-	109:   0x4F04,
-	110:   0x4F05,
-	111:   0x4F06,
-	112:   0x4F07,
-	113:   0x4F08,
-	114:   0x4F0B,
-	115:   0x4F0C,
-	116:   0x4F12,
-	117:   0x4F13,
-	118:   0x4F14,
-	119:   0x4F15,
-	120:   0x4F16,
-	121:   0x4F1C,
-	122:   0x4F1D,
-	123:   0x4F21,
-	124:   0x4F23,
-	125:   0x4F28,
-	126:   0x4F29,
-	127:   0x4F2C,
-	128:   0x4F2D,
-	129:   0x4F2E,
-	130:   0x4F31,
-	131:   0x4F33,
-	132:   0x4F35,
-	133:   0x4F37,
-	134:   0x4F39,
-	135:   0x4F3B,
-	136:   0x4F3E,
-	137:   0x4F3F,
-	138:   0x4F40,
-	139:   0x4F41,
-	140:   0x4F42,
-	141:   0x4F44,
-	142:   0x4F45,
-	143:   0x4F47,
-	144:   0x4F48,
-	145:   0x4F49,
-	146:   0x4F4A,
-	147:   0x4F4B,
-	148:   0x4F4C,
-	149:   0x4F52,
-	150:   0x4F54,
-	151:   0x4F56,
-	152:   0x4F61,
-	153:   0x4F62,
-	154:   0x4F66,
-	155:   0x4F68,
-	156:   0x4F6A,
-	157:   0x4F6B,
-	158:   0x4F6D,
-	159:   0x4F6E,
-	160:   0x4F71,
-	161:   0x4F72,
-	162:   0x4F75,
-	163:   0x4F77,
-	164:   0x4F78,
-	165:   0x4F79,
-	166:   0x4F7A,
-	167:   0x4F7D,
-	168:   0x4F80,
-	169:   0x4F81,
-	170:   0x4F82,
-	171:   0x4F85,
-	172:   0x4F86,
-	173:   0x4F87,
-	174:   0x4F8A,
-	175:   0x4F8C,
-	176:   0x4F8E,
-	177:   0x4F90,
-	178:   0x4F92,
-	179:   0x4F93,
-	180:   0x4F95,
-	181:   0x4F96,
-	182:   0x4F98,
-	183:   0x4F99,
-	184:   0x4F9A,
-	185:   0x4F9C,
-	186:   0x4F9E,
-	187:   0x4F9F,
-	188:   0x4FA1,
-	189:   0x4FA2,
-	190:   0x4FA4,
-	191:   0x4FAB,
-	192:   0x4FAD,
-	193:   0x4FB0,
-	194:   0x4FB1,
-	195:   0x4FB2,
-	196:   0x4FB3,
-	197:   0x4FB4,
-	198:   0x4FB6,
-	199:   0x4FB7,
-	200:   0x4FB8,
-	201:   0x4FB9,
-	202:   0x4FBA,
-	203:   0x4FBB,
-	204:   0x4FBC,
-	205:   0x4FBD,
-	206:   0x4FBE,
-	207:   0x4FC0,
-	208:   0x4FC1,
-	209:   0x4FC2,
-	210:   0x4FC6,
-	211:   0x4FC7,
-	212:   0x4FC8,
-	213:   0x4FC9,
-	214:   0x4FCB,
-	215:   0x4FCC,
-	216:   0x4FCD,
-	217:   0x4FD2,
-	218:   0x4FD3,
-	219:   0x4FD4,
-	220:   0x4FD5,
-	221:   0x4FD6,
-	222:   0x4FD9,
-	223:   0x4FDB,
-	224:   0x4FE0,
-	225:   0x4FE2,
-	226:   0x4FE4,
-	227:   0x4FE5,
-	228:   0x4FE7,
-	229:   0x4FEB,
-	230:   0x4FEC,
-	231:   0x4FF0,
-	232:   0x4FF2,
-	233:   0x4FF4,
-	234:   0x4FF5,
-	235:   0x4FF6,
-	236:   0x4FF7,
-	237:   0x4FF9,
-	238:   0x4FFB,
-	239:   0x4FFC,
-	240:   0x4FFD,
-	241:   0x4FFF,
-	242:   0x5000,
-	243:   0x5001,
-	244:   0x5002,
-	245:   0x5003,
-	246:   0x5004,
-	247:   0x5005,
-	248:   0x5006,
-	249:   0x5007,
-	250:   0x5008,
-	251:   0x5009,
-	252:   0x500A,
-	253:   0x500B,
-	254:   0x500E,
-	255:   0x5010,
-	256:   0x5011,
-	257:   0x5013,
-	258:   0x5015,
-	259:   0x5016,
-	260:   0x5017,
-	261:   0x501B,
-	262:   0x501D,
-	263:   0x501E,
-	264:   0x5020,
-	265:   0x5022,
-	266:   0x5023,
-	267:   0x5024,
-	268:   0x5027,
-	269:   0x502B,
-	270:   0x502F,
-	271:   0x5030,
-	272:   0x5031,
-	273:   0x5032,
-	274:   0x5033,
-	275:   0x5034,
-	276:   0x5035,
-	277:   0x5036,
-	278:   0x5037,
-	279:   0x5038,
-	280:   0x5039,
-	281:   0x503B,
-	282:   0x503D,
-	283:   0x503F,
-	284:   0x5040,
-	285:   0x5041,
-	286:   0x5042,
-	287:   0x5044,
-	288:   0x5045,
-	289:   0x5046,
-	290:   0x5049,
-	291:   0x504A,
-	292:   0x504B,
-	293:   0x504D,
-	294:   0x5050,
-	295:   0x5051,
-	296:   0x5052,
-	297:   0x5053,
-	298:   0x5054,
-	299:   0x5056,
-	300:   0x5057,
-	301:   0x5058,
-	302:   0x5059,
-	303:   0x505B,
-	304:   0x505D,
-	305:   0x505E,
-	306:   0x505F,
-	307:   0x5060,
-	308:   0x5061,
-	309:   0x5062,
-	310:   0x5063,
-	311:   0x5064,
-	312:   0x5066,
-	313:   0x5067,
-	314:   0x5068,
-	315:   0x5069,
-	316:   0x506A,
-	317:   0x506B,
-	318:   0x506D,
-	319:   0x506E,
-	320:   0x506F,
-	321:   0x5070,
-	322:   0x5071,
-	323:   0x5072,
-	324:   0x5073,
-	325:   0x5074,
-	326:   0x5075,
-	327:   0x5078,
-	328:   0x5079,
-	329:   0x507A,
-	330:   0x507C,
-	331:   0x507D,
-	332:   0x5081,
-	333:   0x5082,
-	334:   0x5083,
-	335:   0x5084,
-	336:   0x5086,
-	337:   0x5087,
-	338:   0x5089,
-	339:   0x508A,
-	340:   0x508B,
-	341:   0x508C,
-	342:   0x508E,
-	343:   0x508F,
-	344:   0x5090,
-	345:   0x5091,
-	346:   0x5092,
-	347:   0x5093,
-	348:   0x5094,
-	349:   0x5095,
-	350:   0x5096,
-	351:   0x5097,
-	352:   0x5098,
-	353:   0x5099,
-	354:   0x509A,
-	355:   0x509B,
-	356:   0x509C,
-	357:   0x509D,
-	358:   0x509E,
-	359:   0x509F,
-	360:   0x50A0,
-	361:   0x50A1,
-	362:   0x50A2,
-	363:   0x50A4,
-	364:   0x50A6,
-	365:   0x50AA,
-	366:   0x50AB,
-	367:   0x50AD,
-	368:   0x50AE,
-	369:   0x50AF,
-	370:   0x50B0,
-	371:   0x50B1,
-	372:   0x50B3,
-	373:   0x50B4,
-	374:   0x50B5,
-	375:   0x50B6,
-	376:   0x50B7,
-	377:   0x50B8,
-	378:   0x50B9,
-	379:   0x50BC,
-	380:   0x50BD,
-	381:   0x50BE,
-	382:   0x50BF,
-	383:   0x50C0,
-	384:   0x50C1,
-	385:   0x50C2,
-	386:   0x50C3,
-	387:   0x50C4,
-	388:   0x50C5,
-	389:   0x50C6,
-	390:   0x50C7,
-	391:   0x50C8,
-	392:   0x50C9,
-	393:   0x50CA,
-	394:   0x50CB,
-	395:   0x50CC,
-	396:   0x50CD,
-	397:   0x50CE,
-	398:   0x50D0,
-	399:   0x50D1,
-	400:   0x50D2,
-	401:   0x50D3,
-	402:   0x50D4,
-	403:   0x50D5,
-	404:   0x50D7,
-	405:   0x50D8,
-	406:   0x50D9,
-	407:   0x50DB,
-	408:   0x50DC,
-	409:   0x50DD,
-	410:   0x50DE,
-	411:   0x50DF,
-	412:   0x50E0,
-	413:   0x50E1,
-	414:   0x50E2,
-	415:   0x50E3,
-	416:   0x50E4,
-	417:   0x50E5,
-	418:   0x50E8,
-	419:   0x50E9,
-	420:   0x50EA,
-	421:   0x50EB,
-	422:   0x50EF,
-	423:   0x50F0,
-	424:   0x50F1,
-	425:   0x50F2,
-	426:   0x50F4,
-	427:   0x50F6,
-	428:   0x50F7,
-	429:   0x50F8,
-	430:   0x50F9,
-	431:   0x50FA,
-	432:   0x50FC,
-	433:   0x50FD,
-	434:   0x50FE,
-	435:   0x50FF,
-	436:   0x5100,
-	437:   0x5101,
-	438:   0x5102,
-	439:   0x5103,
-	440:   0x5104,
-	441:   0x5105,
-	442:   0x5108,
-	443:   0x5109,
-	444:   0x510A,
-	445:   0x510C,
-	446:   0x510D,
-	447:   0x510E,
-	448:   0x510F,
-	449:   0x5110,
-	450:   0x5111,
-	451:   0x5113,
-	452:   0x5114,
-	453:   0x5115,
-	454:   0x5116,
-	455:   0x5117,
-	456:   0x5118,
-	457:   0x5119,
-	458:   0x511A,
-	459:   0x511B,
-	460:   0x511C,
-	461:   0x511D,
-	462:   0x511E,
-	463:   0x511F,
-	464:   0x5120,
-	465:   0x5122,
-	466:   0x5123,
-	467:   0x5124,
-	468:   0x5125,
-	469:   0x5126,
-	470:   0x5127,
-	471:   0x5128,
-	472:   0x5129,
-	473:   0x512A,
-	474:   0x512B,
-	475:   0x512C,
-	476:   0x512D,
-	477:   0x512E,
-	478:   0x512F,
-	479:   0x5130,
-	480:   0x5131,
-	481:   0x5132,
-	482:   0x5133,
-	483:   0x5134,
-	484:   0x5135,
-	485:   0x5136,
-	486:   0x5137,
-	487:   0x5138,
-	488:   0x5139,
-	489:   0x513A,
-	490:   0x513B,
-	491:   0x513C,
-	492:   0x513D,
-	493:   0x513E,
-	494:   0x5142,
-	495:   0x5147,
-	496:   0x514A,
-	497:   0x514C,
-	498:   0x514E,
-	499:   0x514F,
-	500:   0x5150,
-	501:   0x5152,
-	502:   0x5153,
-	503:   0x5157,
-	504:   0x5158,
-	505:   0x5159,
-	506:   0x515B,
-	507:   0x515D,
-	508:   0x515E,
-	509:   0x515F,
-	510:   0x5160,
-	511:   0x5161,
-	512:   0x5163,
-	513:   0x5164,
-	514:   0x5166,
-	515:   0x5167,
-	516:   0x5169,
-	517:   0x516A,
-	518:   0x516F,
-	519:   0x5172,
-	520:   0x517A,
-	521:   0x517E,
-	522:   0x517F,
-	523:   0x5183,
-	524:   0x5184,
-	525:   0x5186,
-	526:   0x5187,
-	527:   0x518A,
-	528:   0x518B,
-	529:   0x518E,
-	530:   0x518F,
-	531:   0x5190,
-	532:   0x5191,
-	533:   0x5193,
-	534:   0x5194,
-	535:   0x5198,
-	536:   0x519A,
-	537:   0x519D,
-	538:   0x519E,
-	539:   0x519F,
-	540:   0x51A1,
-	541:   0x51A3,
-	542:   0x51A6,
-	543:   0x51A7,
-	544:   0x51A8,
-	545:   0x51A9,
-	546:   0x51AA,
-	547:   0x51AD,
-	548:   0x51AE,
-	549:   0x51B4,
-	550:   0x51B8,
-	551:   0x51B9,
-	552:   0x51BA,
-	553:   0x51BE,
-	554:   0x51BF,
-	555:   0x51C1,
-	556:   0x51C2,
-	557:   0x51C3,
-	558:   0x51C5,
-	559:   0x51C8,
-	560:   0x51CA,
-	561:   0x51CD,
-	562:   0x51CE,
-	563:   0x51D0,
-	564:   0x51D2,
-	565:   0x51D3,
-	566:   0x51D4,
-	567:   0x51D5,
-	568:   0x51D6,
-	569:   0x51D7,
-	570:   0x51D8,
-	571:   0x51D9,
-	572:   0x51DA,
-	573:   0x51DC,
-	574:   0x51DE,
-	575:   0x51DF,
-	576:   0x51E2,
-	577:   0x51E3,
-	578:   0x51E5,
-	579:   0x51E6,
-	580:   0x51E7,
-	581:   0x51E8,
-	582:   0x51E9,
-	583:   0x51EA,
-	584:   0x51EC,
-	585:   0x51EE,
-	586:   0x51F1,
-	587:   0x51F2,
-	588:   0x51F4,
-	589:   0x51F7,
-	590:   0x51FE,
-	591:   0x5204,
-	592:   0x5205,
-	593:   0x5209,
-	594:   0x520B,
-	595:   0x520C,
-	596:   0x520F,
-	597:   0x5210,
-	598:   0x5213,
-	599:   0x5214,
-	600:   0x5215,
-	601:   0x521C,
-	602:   0x521E,
-	603:   0x521F,
-	604:   0x5221,
-	605:   0x5222,
-	606:   0x5223,
-	607:   0x5225,
-	608:   0x5226,
-	609:   0x5227,
-	610:   0x522A,
-	611:   0x522C,
-	612:   0x522F,
-	613:   0x5231,
-	614:   0x5232,
-	615:   0x5234,
-	616:   0x5235,
-	617:   0x523C,
-	618:   0x523E,
-	619:   0x5244,
-	620:   0x5245,
-	621:   0x5246,
-	622:   0x5247,
-	623:   0x5248,
-	624:   0x5249,
-	625:   0x524B,
-	626:   0x524E,
-	627:   0x524F,
-	628:   0x5252,
-	629:   0x5253,
-	630:   0x5255,
-	631:   0x5257,
-	632:   0x5258,
-	633:   0x5259,
-	634:   0x525A,
-	635:   0x525B,
-	636:   0x525D,
-	637:   0x525F,
-	638:   0x5260,
-	639:   0x5262,
-	640:   0x5263,
-	641:   0x5264,
-	642:   0x5266,
-	643:   0x5268,
-	644:   0x526B,
-	645:   0x526C,
-	646:   0x526D,
-	647:   0x526E,
-	648:   0x5270,
-	649:   0x5271,
-	650:   0x5273,
-	651:   0x5274,
-	652:   0x5275,
-	653:   0x5276,
-	654:   0x5277,
-	655:   0x5278,
-	656:   0x5279,
-	657:   0x527A,
-	658:   0x527B,
-	659:   0x527C,
-	660:   0x527E,
-	661:   0x5280,
-	662:   0x5283,
-	663:   0x5284,
-	664:   0x5285,
-	665:   0x5286,
-	666:   0x5287,
-	667:   0x5289,
-	668:   0x528A,
-	669:   0x528B,
-	670:   0x528C,
-	671:   0x528D,
-	672:   0x528E,
-	673:   0x528F,
-	674:   0x5291,
-	675:   0x5292,
-	676:   0x5294,
-	677:   0x5295,
-	678:   0x5296,
-	679:   0x5297,
-	680:   0x5298,
-	681:   0x5299,
-	682:   0x529A,
-	683:   0x529C,
-	684:   0x52A4,
-	685:   0x52A5,
-	686:   0x52A6,
-	687:   0x52A7,
-	688:   0x52AE,
-	689:   0x52AF,
-	690:   0x52B0,
-	691:   0x52B4,
-	692:   0x52B5,
-	693:   0x52B6,
-	694:   0x52B7,
-	695:   0x52B8,
-	696:   0x52B9,
-	697:   0x52BA,
-	698:   0x52BB,
-	699:   0x52BC,
-	700:   0x52BD,
-	701:   0x52C0,
-	702:   0x52C1,
-	703:   0x52C2,
-	704:   0x52C4,
-	705:   0x52C5,
-	706:   0x52C6,
-	707:   0x52C8,
-	708:   0x52CA,
-	709:   0x52CC,
-	710:   0x52CD,
-	711:   0x52CE,
-	712:   0x52CF,
-	713:   0x52D1,
-	714:   0x52D3,
-	715:   0x52D4,
-	716:   0x52D5,
-	717:   0x52D7,
-	718:   0x52D9,
-	719:   0x52DA,
-	720:   0x52DB,
-	721:   0x52DC,
-	722:   0x52DD,
-	723:   0x52DE,
-	724:   0x52E0,
-	725:   0x52E1,
-	726:   0x52E2,
-	727:   0x52E3,
-	728:   0x52E5,
-	729:   0x52E6,
-	730:   0x52E7,
-	731:   0x52E8,
-	732:   0x52E9,
-	733:   0x52EA,
-	734:   0x52EB,
-	735:   0x52EC,
-	736:   0x52ED,
-	737:   0x52EE,
-	738:   0x52EF,
-	739:   0x52F1,
-	740:   0x52F2,
-	741:   0x52F3,
-	742:   0x52F4,
-	743:   0x52F5,
-	744:   0x52F6,
-	745:   0x52F7,
-	746:   0x52F8,
-	747:   0x52FB,
-	748:   0x52FC,
-	749:   0x52FD,
-	750:   0x5301,
-	751:   0x5302,
-	752:   0x5303,
-	753:   0x5304,
-	754:   0x5307,
-	755:   0x5309,
-	756:   0x530A,
-	757:   0x530B,
-	758:   0x530C,
-	759:   0x530E,
-	760:   0x5311,
-	761:   0x5312,
-	762:   0x5313,
-	763:   0x5314,
-	764:   0x5318,
-	765:   0x531B,
-	766:   0x531C,
-	767:   0x531E,
-	768:   0x531F,
-	769:   0x5322,
-	770:   0x5324,
-	771:   0x5325,
-	772:   0x5327,
-	773:   0x5328,
-	774:   0x5329,
-	775:   0x532B,
-	776:   0x532C,
-	777:   0x532D,
-	778:   0x532F,
-	779:   0x5330,
-	780:   0x5331,
-	781:   0x5332,
-	782:   0x5333,
-	783:   0x5334,
-	784:   0x5335,
-	785:   0x5336,
-	786:   0x5337,
-	787:   0x5338,
-	788:   0x533C,
-	789:   0x533D,
-	790:   0x5340,
-	791:   0x5342,
-	792:   0x5344,
-	793:   0x5346,
-	794:   0x534B,
-	795:   0x534C,
-	796:   0x534D,
-	797:   0x5350,
-	798:   0x5354,
-	799:   0x5358,
-	800:   0x5359,
-	801:   0x535B,
-	802:   0x535D,
-	803:   0x5365,
-	804:   0x5368,
-	805:   0x536A,
-	806:   0x536C,
-	807:   0x536D,
-	808:   0x5372,
-	809:   0x5376,
-	810:   0x5379,
-	811:   0x537B,
-	812:   0x537C,
-	813:   0x537D,
-	814:   0x537E,
-	815:   0x5380,
-	816:   0x5381,
-	817:   0x5383,
-	818:   0x5387,
-	819:   0x5388,
-	820:   0x538A,
-	821:   0x538E,
-	822:   0x538F,
-	823:   0x5390,
-	824:   0x5391,
-	825:   0x5392,
-	826:   0x5393,
-	827:   0x5394,
-	828:   0x5396,
-	829:   0x5397,
-	830:   0x5399,
-	831:   0x539B,
-	832:   0x539C,
-	833:   0x539E,
-	834:   0x53A0,
-	835:   0x53A1,
-	836:   0x53A4,
-	837:   0x53A7,
-	838:   0x53AA,
-	839:   0x53AB,
-	840:   0x53AC,
-	841:   0x53AD,
-	842:   0x53AF,
-	843:   0x53B0,
-	844:   0x53B1,
-	845:   0x53B2,
-	846:   0x53B3,
-	847:   0x53B4,
-	848:   0x53B5,
-	849:   0x53B7,
-	850:   0x53B8,
-	851:   0x53B9,
-	852:   0x53BA,
-	853:   0x53BC,
-	854:   0x53BD,
-	855:   0x53BE,
-	856:   0x53C0,
-	857:   0x53C3,
-	858:   0x53C4,
-	859:   0x53C5,
-	860:   0x53C6,
-	861:   0x53C7,
-	862:   0x53CE,
-	863:   0x53CF,
-	864:   0x53D0,
-	865:   0x53D2,
-	866:   0x53D3,
-	867:   0x53D5,
-	868:   0x53DA,
-	869:   0x53DC,
-	870:   0x53DD,
-	871:   0x53DE,
-	872:   0x53E1,
-	873:   0x53E2,
-	874:   0x53E7,
-	875:   0x53F4,
-	876:   0x53FA,
-	877:   0x53FE,
-	878:   0x53FF,
-	879:   0x5400,
-	880:   0x5402,
-	881:   0x5405,
-	882:   0x5407,
-	883:   0x540B,
-	884:   0x5414,
-	885:   0x5418,
-	886:   0x5419,
-	887:   0x541A,
-	888:   0x541C,
-	889:   0x5422,
-	890:   0x5424,
-	891:   0x5425,
-	892:   0x542A,
-	893:   0x5430,
-	894:   0x5433,
-	895:   0x5436,
-	896:   0x5437,
-	897:   0x543A,
-	898:   0x543D,
-	899:   0x543F,
-	900:   0x5441,
-	901:   0x5442,
-	902:   0x5444,
-	903:   0x5445,
-	904:   0x5447,
-	905:   0x5449,
-	906:   0x544C,
-	907:   0x544D,
-	908:   0x544E,
-	909:   0x544F,
-	910:   0x5451,
-	911:   0x545A,
-	912:   0x545D,
-	913:   0x545E,
-	914:   0x545F,
-	915:   0x5460,
-	916:   0x5461,
-	917:   0x5463,
-	918:   0x5465,
-	919:   0x5467,
-	920:   0x5469,
-	921:   0x546A,
-	922:   0x546B,
-	923:   0x546C,
-	924:   0x546D,
-	925:   0x546E,
-	926:   0x546F,
-	927:   0x5470,
-	928:   0x5474,
-	929:   0x5479,
-	930:   0x547A,
-	931:   0x547E,
-	932:   0x547F,
-	933:   0x5481,
-	934:   0x5483,
-	935:   0x5485,
-	936:   0x5487,
-	937:   0x5488,
-	938:   0x5489,
-	939:   0x548A,
-	940:   0x548D,
-	941:   0x5491,
-	942:   0x5493,
-	943:   0x5497,
-	944:   0x5498,
-	945:   0x549C,
-	946:   0x549E,
-	947:   0x549F,
-	948:   0x54A0,
-	949:   0x54A1,
-	950:   0x54A2,
-	951:   0x54A5,
-	952:   0x54AE,
-	953:   0x54B0,
-	954:   0x54B2,
-	955:   0x54B5,
-	956:   0x54B6,
-	957:   0x54B7,
-	958:   0x54B9,
-	959:   0x54BA,
-	960:   0x54BC,
-	961:   0x54BE,
-	962:   0x54C3,
-	963:   0x54C5,
-	964:   0x54CA,
-	965:   0x54CB,
-	966:   0x54D6,
-	967:   0x54D8,
-	968:   0x54DB,
-	969:   0x54E0,
-	970:   0x54E1,
-	971:   0x54E2,
-	972:   0x54E3,
-	973:   0x54E4,
-	974:   0x54EB,
-	975:   0x54EC,
-	976:   0x54EF,
-	977:   0x54F0,
-	978:   0x54F1,
-	979:   0x54F4,
-	980:   0x54F5,
-	981:   0x54F6,
-	982:   0x54F7,
-	983:   0x54F8,
-	984:   0x54F9,
-	985:   0x54FB,
-	986:   0x54FE,
-	987:   0x5500,
-	988:   0x5502,
-	989:   0x5503,
-	990:   0x5504,
-	991:   0x5505,
-	992:   0x5508,
-	993:   0x550A,
-	994:   0x550B,
-	995:   0x550C,
-	996:   0x550D,
-	997:   0x550E,
-	998:   0x5512,
-	999:   0x5513,
-	1000:  0x5515,
-	1001:  0x5516,
-	1002:  0x5517,
-	1003:  0x5518,
-	1004:  0x5519,
-	1005:  0x551A,
-	1006:  0x551C,
-	1007:  0x551D,
-	1008:  0x551E,
-	1009:  0x551F,
-	1010:  0x5521,
-	1011:  0x5525,
-	1012:  0x5526,
-	1013:  0x5528,
-	1014:  0x5529,
-	1015:  0x552B,
-	1016:  0x552D,
-	1017:  0x5532,
-	1018:  0x5534,
-	1019:  0x5535,
-	1020:  0x5536,
-	1021:  0x5538,
-	1022:  0x5539,
-	1023:  0x553A,
-	1024:  0x553B,
-	1025:  0x553D,
-	1026:  0x5540,
-	1027:  0x5542,
-	1028:  0x5545,
-	1029:  0x5547,
-	1030:  0x5548,
-	1031:  0x554B,
-	1032:  0x554C,
-	1033:  0x554D,
-	1034:  0x554E,
-	1035:  0x554F,
-	1036:  0x5551,
-	1037:  0x5552,
-	1038:  0x5553,
-	1039:  0x5554,
-	1040:  0x5557,
-	1041:  0x5558,
-	1042:  0x5559,
-	1043:  0x555A,
-	1044:  0x555B,
-	1045:  0x555D,
-	1046:  0x555E,
-	1047:  0x555F,
-	1048:  0x5560,
-	1049:  0x5562,
-	1050:  0x5563,
-	1051:  0x5568,
-	1052:  0x5569,
-	1053:  0x556B,
-	1054:  0x556F,
-	1055:  0x5570,
-	1056:  0x5571,
-	1057:  0x5572,
-	1058:  0x5573,
-	1059:  0x5574,
-	1060:  0x5579,
-	1061:  0x557A,
-	1062:  0x557D,
-	1063:  0x557F,
-	1064:  0x5585,
-	1065:  0x5586,
-	1066:  0x558C,
-	1067:  0x558D,
-	1068:  0x558E,
-	1069:  0x5590,
-	1070:  0x5592,
-	1071:  0x5593,
-	1072:  0x5595,
-	1073:  0x5596,
-	1074:  0x5597,
-	1075:  0x559A,
-	1076:  0x559B,
-	1077:  0x559E,
-	1078:  0x55A0,
-	1079:  0x55A1,
-	1080:  0x55A2,
-	1081:  0x55A3,
-	1082:  0x55A4,
-	1083:  0x55A5,
-	1084:  0x55A6,
-	1085:  0x55A8,
-	1086:  0x55A9,
-	1087:  0x55AA,
-	1088:  0x55AB,
-	1089:  0x55AC,
-	1090:  0x55AD,
-	1091:  0x55AE,
-	1092:  0x55AF,
-	1093:  0x55B0,
-	1094:  0x55B2,
-	1095:  0x55B4,
-	1096:  0x55B6,
-	1097:  0x55B8,
-	1098:  0x55BA,
-	1099:  0x55BC,
-	1100:  0x55BF,
-	1101:  0x55C0,
-	1102:  0x55C1,
-	1103:  0x55C2,
-	1104:  0x55C3,
-	1105:  0x55C6,
-	1106:  0x55C7,
-	1107:  0x55C8,
-	1108:  0x55CA,
-	1109:  0x55CB,
-	1110:  0x55CE,
-	1111:  0x55CF,
-	1112:  0x55D0,
-	1113:  0x55D5,
-	1114:  0x55D7,
-	1115:  0x55D8,
-	1116:  0x55D9,
-	1117:  0x55DA,
-	1118:  0x55DB,
-	1119:  0x55DE,
-	1120:  0x55E0,
-	1121:  0x55E2,
-	1122:  0x55E7,
-	1123:  0x55E9,
-	1124:  0x55ED,
-	1125:  0x55EE,
-	1126:  0x55F0,
-	1127:  0x55F1,
-	1128:  0x55F4,
-	1129:  0x55F6,
-	1130:  0x55F8,
-	1131:  0x55F9,
-	1132:  0x55FA,
-	1133:  0x55FB,
-	1134:  0x55FC,
-	1135:  0x55FF,
-	1136:  0x5602,
-	1137:  0x5603,
-	1138:  0x5604,
-	1139:  0x5605,
-	1140:  0x5606,
-	1141:  0x5607,
-	1142:  0x560A,
-	1143:  0x560B,
-	1144:  0x560D,
-	1145:  0x5610,
-	1146:  0x5611,
-	1147:  0x5612,
-	1148:  0x5613,
-	1149:  0x5614,
-	1150:  0x5615,
-	1151:  0x5616,
-	1152:  0x5617,
-	1153:  0x5619,
-	1154:  0x561A,
-	1155:  0x561C,
-	1156:  0x561D,
-	1157:  0x5620,
-	1158:  0x5621,
-	1159:  0x5622,
-	1160:  0x5625,
-	1161:  0x5626,
-	1162:  0x5628,
-	1163:  0x5629,
-	1164:  0x562A,
-	1165:  0x562B,
-	1166:  0x562E,
-	1167:  0x562F,
-	1168:  0x5630,
-	1169:  0x5633,
-	1170:  0x5635,
-	1171:  0x5637,
-	1172:  0x5638,
-	1173:  0x563A,
-	1174:  0x563C,
-	1175:  0x563D,
-	1176:  0x563E,
-	1177:  0x5640,
-	1178:  0x5641,
-	1179:  0x5642,
-	1180:  0x5643,
-	1181:  0x5644,
-	1182:  0x5645,
-	1183:  0x5646,
-	1184:  0x5647,
-	1185:  0x5648,
-	1186:  0x5649,
-	1187:  0x564A,
-	1188:  0x564B,
-	1189:  0x564F,
-	1190:  0x5650,
-	1191:  0x5651,
-	1192:  0x5652,
-	1193:  0x5653,
-	1194:  0x5655,
-	1195:  0x5656,
-	1196:  0x565A,
-	1197:  0x565B,
-	1198:  0x565D,
-	1199:  0x565E,
-	1200:  0x565F,
-	1201:  0x5660,
-	1202:  0x5661,
-	1203:  0x5663,
-	1204:  0x5665,
-	1205:  0x5666,
-	1206:  0x5667,
-	1207:  0x566D,
-	1208:  0x566E,
-	1209:  0x566F,
-	1210:  0x5670,
-	1211:  0x5672,
-	1212:  0x5673,
-	1213:  0x5674,
-	1214:  0x5675,
-	1215:  0x5677,
-	1216:  0x5678,
-	1217:  0x5679,
-	1218:  0x567A,
-	1219:  0x567D,
-	1220:  0x567E,
-	1221:  0x567F,
-	1222:  0x5680,
-	1223:  0x5681,
-	1224:  0x5682,
-	1225:  0x5683,
-	1226:  0x5684,
-	1227:  0x5687,
-	1228:  0x5688,
-	1229:  0x5689,
-	1230:  0x568A,
-	1231:  0x568B,
-	1232:  0x568C,
-	1233:  0x568D,
-	1234:  0x5690,
-	1235:  0x5691,
-	1236:  0x5692,
-	1237:  0x5694,
-	1238:  0x5695,
-	1239:  0x5696,
-	1240:  0x5697,
-	1241:  0x5698,
-	1242:  0x5699,
-	1243:  0x569A,
-	1244:  0x569B,
-	1245:  0x569C,
-	1246:  0x569D,
-	1247:  0x569E,
-	1248:  0x569F,
-	1249:  0x56A0,
-	1250:  0x56A1,
-	1251:  0x56A2,
-	1252:  0x56A4,
-	1253:  0x56A5,
-	1254:  0x56A6,
-	1255:  0x56A7,
-	1256:  0x56A8,
-	1257:  0x56A9,
-	1258:  0x56AA,
-	1259:  0x56AB,
-	1260:  0x56AC,
-	1261:  0x56AD,
-	1262:  0x56AE,
-	1263:  0x56B0,
-	1264:  0x56B1,
-	1265:  0x56B2,
-	1266:  0x56B3,
-	1267:  0x56B4,
-	1268:  0x56B5,
-	1269:  0x56B6,
-	1270:  0x56B8,
-	1271:  0x56B9,
-	1272:  0x56BA,
-	1273:  0x56BB,
-	1274:  0x56BD,
-	1275:  0x56BE,
-	1276:  0x56BF,
-	1277:  0x56C0,
-	1278:  0x56C1,
-	1279:  0x56C2,
-	1280:  0x56C3,
-	1281:  0x56C4,
-	1282:  0x56C5,
-	1283:  0x56C6,
-	1284:  0x56C7,
-	1285:  0x56C8,
-	1286:  0x56C9,
-	1287:  0x56CB,
-	1288:  0x56CC,
-	1289:  0x56CD,
-	1290:  0x56CE,
-	1291:  0x56CF,
-	1292:  0x56D0,
-	1293:  0x56D1,
-	1294:  0x56D2,
-	1295:  0x56D3,
-	1296:  0x56D5,
-	1297:  0x56D6,
-	1298:  0x56D8,
-	1299:  0x56D9,
-	1300:  0x56DC,
-	1301:  0x56E3,
-	1302:  0x56E5,
-	1303:  0x56E6,
-	1304:  0x56E7,
-	1305:  0x56E8,
-	1306:  0x56E9,
-	1307:  0x56EA,
-	1308:  0x56EC,
-	1309:  0x56EE,
-	1310:  0x56EF,
-	1311:  0x56F2,
-	1312:  0x56F3,
-	1313:  0x56F6,
-	1314:  0x56F7,
-	1315:  0x56F8,
-	1316:  0x56FB,
-	1317:  0x56FC,
-	1318:  0x5700,
-	1319:  0x5701,
-	1320:  0x5702,
-	1321:  0x5705,
-	1322:  0x5707,
-	1323:  0x570B,
-	1324:  0x570C,
-	1325:  0x570D,
-	1326:  0x570E,
-	1327:  0x570F,
-	1328:  0x5710,
-	1329:  0x5711,
-	1330:  0x5712,
-	1331:  0x5713,
-	1332:  0x5714,
-	1333:  0x5715,
-	1334:  0x5716,
-	1335:  0x5717,
-	1336:  0x5718,
-	1337:  0x5719,
-	1338:  0x571A,
-	1339:  0x571B,
-	1340:  0x571D,
-	1341:  0x571E,
-	1342:  0x5720,
-	1343:  0x5721,
-	1344:  0x5722,
-	1345:  0x5724,
-	1346:  0x5725,
-	1347:  0x5726,
-	1348:  0x5727,
-	1349:  0x572B,
-	1350:  0x5731,
-	1351:  0x5732,
-	1352:  0x5734,
-	1353:  0x5735,
-	1354:  0x5736,
-	1355:  0x5737,
-	1356:  0x5738,
-	1357:  0x573C,
-	1358:  0x573D,
-	1359:  0x573F,
-	1360:  0x5741,
-	1361:  0x5743,
-	1362:  0x5744,
-	1363:  0x5745,
-	1364:  0x5746,
-	1365:  0x5748,
-	1366:  0x5749,
-	1367:  0x574B,
-	1368:  0x5752,
-	1369:  0x5753,
-	1370:  0x5754,
-	1371:  0x5755,
-	1372:  0x5756,
-	1373:  0x5758,
-	1374:  0x5759,
-	1375:  0x5762,
-	1376:  0x5763,
-	1377:  0x5765,
-	1378:  0x5767,
-	1379:  0x576C,
-	1380:  0x576E,
-	1381:  0x5770,
-	1382:  0x5771,
-	1383:  0x5772,
-	1384:  0x5774,
-	1385:  0x5775,
-	1386:  0x5778,
-	1387:  0x5779,
-	1388:  0x577A,
-	1389:  0x577D,
-	1390:  0x577E,
-	1391:  0x577F,
-	1392:  0x5780,
-	1393:  0x5781,
-	1394:  0x5787,
-	1395:  0x5788,
-	1396:  0x5789,
-	1397:  0x578A,
-	1398:  0x578D,
-	1399:  0x578E,
-	1400:  0x578F,
-	1401:  0x5790,
-	1402:  0x5791,
-	1403:  0x5794,
-	1404:  0x5795,
-	1405:  0x5796,
-	1406:  0x5797,
-	1407:  0x5798,
-	1408:  0x5799,
-	1409:  0x579A,
-	1410:  0x579C,
-	1411:  0x579D,
-	1412:  0x579E,
-	1413:  0x579F,
-	1414:  0x57A5,
-	1415:  0x57A8,
-	1416:  0x57AA,
-	1417:  0x57AC,
-	1418:  0x57AF,
-	1419:  0x57B0,
-	1420:  0x57B1,
-	1421:  0x57B3,
-	1422:  0x57B5,
-	1423:  0x57B6,
-	1424:  0x57B7,
-	1425:  0x57B9,
-	1426:  0x57BA,
-	1427:  0x57BB,
-	1428:  0x57BC,
-	1429:  0x57BD,
-	1430:  0x57BE,
-	1431:  0x57BF,
-	1432:  0x57C0,
-	1433:  0x57C1,
-	1434:  0x57C4,
-	1435:  0x57C5,
-	1436:  0x57C6,
-	1437:  0x57C7,
-	1438:  0x57C8,
-	1439:  0x57C9,
-	1440:  0x57CA,
-	1441:  0x57CC,
-	1442:  0x57CD,
-	1443:  0x57D0,
-	1444:  0x57D1,
-	1445:  0x57D3,
-	1446:  0x57D6,
-	1447:  0x57D7,
-	1448:  0x57DB,
-	1449:  0x57DC,
-	1450:  0x57DE,
-	1451:  0x57E1,
-	1452:  0x57E2,
-	1453:  0x57E3,
-	1454:  0x57E5,
-	1455:  0x57E6,
-	1456:  0x57E7,
-	1457:  0x57E8,
-	1458:  0x57E9,
-	1459:  0x57EA,
-	1460:  0x57EB,
-	1461:  0x57EC,
-	1462:  0x57EE,
-	1463:  0x57F0,
-	1464:  0x57F1,
-	1465:  0x57F2,
-	1466:  0x57F3,
-	1467:  0x57F5,
-	1468:  0x57F6,
-	1469:  0x57F7,
-	1470:  0x57FB,
-	1471:  0x57FC,
-	1472:  0x57FE,
-	1473:  0x57FF,
-	1474:  0x5801,
-	1475:  0x5803,
-	1476:  0x5804,
-	1477:  0x5805,
-	1478:  0x5808,
-	1479:  0x5809,
-	1480:  0x580A,
-	1481:  0x580C,
-	1482:  0x580E,
-	1483:  0x580F,
-	1484:  0x5810,
-	1485:  0x5812,
-	1486:  0x5813,
-	1487:  0x5814,
-	1488:  0x5816,
-	1489:  0x5817,
-	1490:  0x5818,
-	1491:  0x581A,
-	1492:  0x581B,
-	1493:  0x581C,
-	1494:  0x581D,
-	1495:  0x581F,
-	1496:  0x5822,
-	1497:  0x5823,
-	1498:  0x5825,
-	1499:  0x5826,
-	1500:  0x5827,
-	1501:  0x5828,
-	1502:  0x5829,
-	1503:  0x582B,
-	1504:  0x582C,
-	1505:  0x582D,
-	1506:  0x582E,
-	1507:  0x582F,
-	1508:  0x5831,
-	1509:  0x5832,
-	1510:  0x5833,
-	1511:  0x5834,
-	1512:  0x5836,
-	1513:  0x5837,
-	1514:  0x5838,
-	1515:  0x5839,
-	1516:  0x583A,
-	1517:  0x583B,
-	1518:  0x583C,
-	1519:  0x583D,
-	1520:  0x583E,
-	1521:  0x583F,
-	1522:  0x5840,
-	1523:  0x5841,
-	1524:  0x5842,
-	1525:  0x5843,
-	1526:  0x5845,
-	1527:  0x5846,
-	1528:  0x5847,
-	1529:  0x5848,
-	1530:  0x5849,
-	1531:  0x584A,
-	1532:  0x584B,
-	1533:  0x584E,
-	1534:  0x584F,
-	1535:  0x5850,
-	1536:  0x5852,
-	1537:  0x5853,
-	1538:  0x5855,
-	1539:  0x5856,
-	1540:  0x5857,
-	1541:  0x5859,
-	1542:  0x585A,
-	1543:  0x585B,
-	1544:  0x585C,
-	1545:  0x585D,
-	1546:  0x585F,
-	1547:  0x5860,
-	1548:  0x5861,
-	1549:  0x5862,
-	1550:  0x5863,
-	1551:  0x5864,
-	1552:  0x5866,
-	1553:  0x5867,
-	1554:  0x5868,
-	1555:  0x5869,
-	1556:  0x586A,
-	1557:  0x586D,
-	1558:  0x586E,
-	1559:  0x586F,
-	1560:  0x5870,
-	1561:  0x5871,
-	1562:  0x5872,
-	1563:  0x5873,
-	1564:  0x5874,
-	1565:  0x5875,
-	1566:  0x5876,
-	1567:  0x5877,
-	1568:  0x5878,
-	1569:  0x5879,
-	1570:  0x587A,
-	1571:  0x587B,
-	1572:  0x587C,
-	1573:  0x587D,
-	1574:  0x587F,
-	1575:  0x5882,
-	1576:  0x5884,
-	1577:  0x5886,
-	1578:  0x5887,
-	1579:  0x5888,
-	1580:  0x588A,
-	1581:  0x588B,
-	1582:  0x588C,
-	1583:  0x588D,
-	1584:  0x588E,
-	1585:  0x588F,
-	1586:  0x5890,
-	1587:  0x5891,
-	1588:  0x5894,
-	1589:  0x5895,
-	1590:  0x5896,
-	1591:  0x5897,
-	1592:  0x5898,
-	1593:  0x589B,
-	1594:  0x589C,
-	1595:  0x589D,
-	1596:  0x58A0,
-	1597:  0x58A1,
-	1598:  0x58A2,
-	1599:  0x58A3,
-	1600:  0x58A4,
-	1601:  0x58A5,
-	1602:  0x58A6,
-	1603:  0x58A7,
-	1604:  0x58AA,
-	1605:  0x58AB,
-	1606:  0x58AC,
-	1607:  0x58AD,
-	1608:  0x58AE,
-	1609:  0x58AF,
-	1610:  0x58B0,
-	1611:  0x58B1,
-	1612:  0x58B2,
-	1613:  0x58B3,
-	1614:  0x58B4,
-	1615:  0x58B5,
-	1616:  0x58B6,
-	1617:  0x58B7,
-	1618:  0x58B8,
-	1619:  0x58B9,
-	1620:  0x58BA,
-	1621:  0x58BB,
-	1622:  0x58BD,
-	1623:  0x58BE,
-	1624:  0x58BF,
-	1625:  0x58C0,
-	1626:  0x58C2,
-	1627:  0x58C3,
-	1628:  0x58C4,
-	1629:  0x58C6,
-	1630:  0x58C7,
-	1631:  0x58C8,
-	1632:  0x58C9,
-	1633:  0x58CA,
-	1634:  0x58CB,
-	1635:  0x58CC,
-	1636:  0x58CD,
-	1637:  0x58CE,
-	1638:  0x58CF,
-	1639:  0x58D0,
-	1640:  0x58D2,
-	1641:  0x58D3,
-	1642:  0x58D4,
-	1643:  0x58D6,
-	1644:  0x58D7,
-	1645:  0x58D8,
-	1646:  0x58D9,
-	1647:  0x58DA,
-	1648:  0x58DB,
-	1649:  0x58DC,
-	1650:  0x58DD,
-	1651:  0x58DE,
-	1652:  0x58DF,
-	1653:  0x58E0,
-	1654:  0x58E1,
-	1655:  0x58E2,
-	1656:  0x58E3,
-	1657:  0x58E5,
-	1658:  0x58E6,
-	1659:  0x58E7,
-	1660:  0x58E8,
-	1661:  0x58E9,
-	1662:  0x58EA,
-	1663:  0x58ED,
-	1664:  0x58EF,
-	1665:  0x58F1,
-	1666:  0x58F2,
-	1667:  0x58F4,
-	1668:  0x58F5,
-	1669:  0x58F7,
-	1670:  0x58F8,
-	1671:  0x58FA,
-	1672:  0x58FB,
-	1673:  0x58FC,
-	1674:  0x58FD,
-	1675:  0x58FE,
-	1676:  0x58FF,
-	1677:  0x5900,
-	1678:  0x5901,
-	1679:  0x5903,
-	1680:  0x5905,
-	1681:  0x5906,
-	1682:  0x5908,
-	1683:  0x5909,
-	1684:  0x590A,
-	1685:  0x590B,
-	1686:  0x590C,
-	1687:  0x590E,
-	1688:  0x5910,
-	1689:  0x5911,
-	1690:  0x5912,
-	1691:  0x5913,
-	1692:  0x5917,
-	1693:  0x5918,
-	1694:  0x591B,
-	1695:  0x591D,
-	1696:  0x591E,
-	1697:  0x5920,
-	1698:  0x5921,
-	1699:  0x5922,
-	1700:  0x5923,
-	1701:  0x5926,
-	1702:  0x5928,
-	1703:  0x592C,
-	1704:  0x5930,
-	1705:  0x5932,
-	1706:  0x5933,
-	1707:  0x5935,
-	1708:  0x5936,
-	1709:  0x593B,
-	1710:  0x593D,
-	1711:  0x593E,
-	1712:  0x593F,
-	1713:  0x5940,
-	1714:  0x5943,
-	1715:  0x5945,
-	1716:  0x5946,
-	1717:  0x594A,
-	1718:  0x594C,
-	1719:  0x594D,
-	1720:  0x5950,
-	1721:  0x5952,
-	1722:  0x5953,
-	1723:  0x5959,
-	1724:  0x595B,
-	1725:  0x595C,
-	1726:  0x595D,
-	1727:  0x595E,
-	1728:  0x595F,
-	1729:  0x5961,
-	1730:  0x5963,
-	1731:  0x5964,
-	1732:  0x5966,
-	1733:  0x5967,
-	1734:  0x5968,
-	1735:  0x5969,
-	1736:  0x596A,
-	1737:  0x596B,
-	1738:  0x596C,
-	1739:  0x596D,
-	1740:  0x596E,
-	1741:  0x596F,
-	1742:  0x5970,
-	1743:  0x5971,
-	1744:  0x5972,
-	1745:  0x5975,
-	1746:  0x5977,
-	1747:  0x597A,
-	1748:  0x597B,
-	1749:  0x597C,
-	1750:  0x597E,
-	1751:  0x597F,
-	1752:  0x5980,
-	1753:  0x5985,
-	1754:  0x5989,
-	1755:  0x598B,
-	1756:  0x598C,
-	1757:  0x598E,
-	1758:  0x598F,
-	1759:  0x5990,
-	1760:  0x5991,
-	1761:  0x5994,
-	1762:  0x5995,
-	1763:  0x5998,
-	1764:  0x599A,
-	1765:  0x599B,
-	1766:  0x599C,
-	1767:  0x599D,
-	1768:  0x599F,
-	1769:  0x59A0,
-	1770:  0x59A1,
-	1771:  0x59A2,
-	1772:  0x59A6,
-	1773:  0x59A7,
-	1774:  0x59AC,
-	1775:  0x59AD,
-	1776:  0x59B0,
-	1777:  0x59B1,
-	1778:  0x59B3,
-	1779:  0x59B4,
-	1780:  0x59B5,
-	1781:  0x59B6,
-	1782:  0x59B7,
-	1783:  0x59B8,
-	1784:  0x59BA,
-	1785:  0x59BC,
-	1786:  0x59BD,
-	1787:  0x59BF,
-	1788:  0x59C0,
-	1789:  0x59C1,
-	1790:  0x59C2,
-	1791:  0x59C3,
-	1792:  0x59C4,
-	1793:  0x59C5,
-	1794:  0x59C7,
-	1795:  0x59C8,
-	1796:  0x59C9,
-	1797:  0x59CC,
-	1798:  0x59CD,
-	1799:  0x59CE,
-	1800:  0x59CF,
-	1801:  0x59D5,
-	1802:  0x59D6,
-	1803:  0x59D9,
-	1804:  0x59DB,
-	1805:  0x59DE,
-	1806:  0x59DF,
-	1807:  0x59E0,
-	1808:  0x59E1,
-	1809:  0x59E2,
-	1810:  0x59E4,
-	1811:  0x59E6,
-	1812:  0x59E7,
-	1813:  0x59E9,
-	1814:  0x59EA,
-	1815:  0x59EB,
-	1816:  0x59ED,
-	1817:  0x59EE,
-	1818:  0x59EF,
-	1819:  0x59F0,
-	1820:  0x59F1,
-	1821:  0x59F2,
-	1822:  0x59F3,
-	1823:  0x59F4,
-	1824:  0x59F5,
-	1825:  0x59F6,
-	1826:  0x59F7,
-	1827:  0x59F8,
-	1828:  0x59FA,
-	1829:  0x59FC,
-	1830:  0x59FD,
-	1831:  0x59FE,
-	1832:  0x5A00,
-	1833:  0x5A02,
-	1834:  0x5A0A,
-	1835:  0x5A0B,
-	1836:  0x5A0D,
-	1837:  0x5A0E,
-	1838:  0x5A0F,
-	1839:  0x5A10,
-	1840:  0x5A12,
-	1841:  0x5A14,
-	1842:  0x5A15,
-	1843:  0x5A16,
-	1844:  0x5A17,
-	1845:  0x5A19,
-	1846:  0x5A1A,
-	1847:  0x5A1B,
-	1848:  0x5A1D,
-	1849:  0x5A1E,
-	1850:  0x5A21,
-	1851:  0x5A22,
-	1852:  0x5A24,
-	1853:  0x5A26,
-	1854:  0x5A27,
-	1855:  0x5A28,
-	1856:  0x5A2A,
-	1857:  0x5A2B,
-	1858:  0x5A2C,
-	1859:  0x5A2D,
-	1860:  0x5A2E,
-	1861:  0x5A2F,
-	1862:  0x5A30,
-	1863:  0x5A33,
-	1864:  0x5A35,
-	1865:  0x5A37,
-	1866:  0x5A38,
-	1867:  0x5A39,
-	1868:  0x5A3A,
-	1869:  0x5A3B,
-	1870:  0x5A3D,
-	1871:  0x5A3E,
-	1872:  0x5A3F,
-	1873:  0x5A41,
-	1874:  0x5A42,
-	1875:  0x5A43,
-	1876:  0x5A44,
-	1877:  0x5A45,
-	1878:  0x5A47,
-	1879:  0x5A48,
-	1880:  0x5A4B,
-	1881:  0x5A4C,
-	1882:  0x5A4D,
-	1883:  0x5A4E,
-	1884:  0x5A4F,
-	1885:  0x5A50,
-	1886:  0x5A51,
-	1887:  0x5A52,
-	1888:  0x5A53,
-	1889:  0x5A54,
-	1890:  0x5A56,
-	1891:  0x5A57,
-	1892:  0x5A58,
-	1893:  0x5A59,
-	1894:  0x5A5B,
-	1895:  0x5A5C,
-	1896:  0x5A5D,
-	1897:  0x5A5E,
-	1898:  0x5A5F,
-	1899:  0x5A60,
-	1900:  0x5A61,
-	1901:  0x5A63,
-	1902:  0x5A64,
-	1903:  0x5A65,
-	1904:  0x5A66,
-	1905:  0x5A68,
-	1906:  0x5A69,
-	1907:  0x5A6B,
-	1908:  0x5A6C,
-	1909:  0x5A6D,
-	1910:  0x5A6E,
-	1911:  0x5A6F,
-	1912:  0x5A70,
-	1913:  0x5A71,
-	1914:  0x5A72,
-	1915:  0x5A73,
-	1916:  0x5A78,
-	1917:  0x5A79,
-	1918:  0x5A7B,
-	1919:  0x5A7C,
-	1920:  0x5A7D,
-	1921:  0x5A7E,
-	1922:  0x5A80,
-	1923:  0x5A81,
-	1924:  0x5A82,
-	1925:  0x5A83,
-	1926:  0x5A84,
-	1927:  0x5A85,
-	1928:  0x5A86,
-	1929:  0x5A87,
-	1930:  0x5A88,
-	1931:  0x5A89,
-	1932:  0x5A8A,
-	1933:  0x5A8B,
-	1934:  0x5A8C,
-	1935:  0x5A8D,
-	1936:  0x5A8E,
-	1937:  0x5A8F,
-	1938:  0x5A90,
-	1939:  0x5A91,
-	1940:  0x5A93,
-	1941:  0x5A94,
-	1942:  0x5A95,
-	1943:  0x5A96,
-	1944:  0x5A97,
-	1945:  0x5A98,
-	1946:  0x5A99,
-	1947:  0x5A9C,
-	1948:  0x5A9D,
-	1949:  0x5A9E,
-	1950:  0x5A9F,
-	1951:  0x5AA0,
-	1952:  0x5AA1,
-	1953:  0x5AA2,
-	1954:  0x5AA3,
-	1955:  0x5AA4,
-	1956:  0x5AA5,
-	1957:  0x5AA6,
-	1958:  0x5AA7,
-	1959:  0x5AA8,
-	1960:  0x5AA9,
-	1961:  0x5AAB,
-	1962:  0x5AAC,
-	1963:  0x5AAD,
-	1964:  0x5AAE,
-	1965:  0x5AAF,
-	1966:  0x5AB0,
-	1967:  0x5AB1,
-	1968:  0x5AB4,
-	1969:  0x5AB6,
-	1970:  0x5AB7,
-	1971:  0x5AB9,
-	1972:  0x5ABA,
-	1973:  0x5ABB,
-	1974:  0x5ABC,
-	1975:  0x5ABD,
-	1976:  0x5ABF,
-	1977:  0x5AC0,
-	1978:  0x5AC3,
-	1979:  0x5AC4,
-	1980:  0x5AC5,
-	1981:  0x5AC6,
-	1982:  0x5AC7,
-	1983:  0x5AC8,
-	1984:  0x5ACA,
-	1985:  0x5ACB,
-	1986:  0x5ACD,
-	1987:  0x5ACE,
-	1988:  0x5ACF,
-	1989:  0x5AD0,
-	1990:  0x5AD1,
-	1991:  0x5AD3,
-	1992:  0x5AD5,
-	1993:  0x5AD7,
-	1994:  0x5AD9,
-	1995:  0x5ADA,
-	1996:  0x5ADB,
-	1997:  0x5ADD,
-	1998:  0x5ADE,
-	1999:  0x5ADF,
-	2000:  0x5AE2,
-	2001:  0x5AE4,
-	2002:  0x5AE5,
-	2003:  0x5AE7,
-	2004:  0x5AE8,
-	2005:  0x5AEA,
-	2006:  0x5AEC,
-	2007:  0x5AED,
-	2008:  0x5AEE,
-	2009:  0x5AEF,
-	2010:  0x5AF0,
-	2011:  0x5AF2,
-	2012:  0x5AF3,
-	2013:  0x5AF4,
-	2014:  0x5AF5,
-	2015:  0x5AF6,
-	2016:  0x5AF7,
-	2017:  0x5AF8,
-	2018:  0x5AF9,
-	2019:  0x5AFA,
-	2020:  0x5AFB,
-	2021:  0x5AFC,
-	2022:  0x5AFD,
-	2023:  0x5AFE,
-	2024:  0x5AFF,
-	2025:  0x5B00,
-	2026:  0x5B01,
-	2027:  0x5B02,
-	2028:  0x5B03,
-	2029:  0x5B04,
-	2030:  0x5B05,
-	2031:  0x5B06,
-	2032:  0x5B07,
-	2033:  0x5B08,
-	2034:  0x5B0A,
-	2035:  0x5B0B,
-	2036:  0x5B0C,
-	2037:  0x5B0D,
-	2038:  0x5B0E,
-	2039:  0x5B0F,
-	2040:  0x5B10,
-	2041:  0x5B11,
-	2042:  0x5B12,
-	2043:  0x5B13,
-	2044:  0x5B14,
-	2045:  0x5B15,
-	2046:  0x5B18,
-	2047:  0x5B19,
-	2048:  0x5B1A,
-	2049:  0x5B1B,
-	2050:  0x5B1C,
-	2051:  0x5B1D,
-	2052:  0x5B1E,
-	2053:  0x5B1F,
-	2054:  0x5B20,
-	2055:  0x5B21,
-	2056:  0x5B22,
-	2057:  0x5B23,
-	2058:  0x5B24,
-	2059:  0x5B25,
-	2060:  0x5B26,
-	2061:  0x5B27,
-	2062:  0x5B28,
-	2063:  0x5B29,
-	2064:  0x5B2A,
-	2065:  0x5B2B,
-	2066:  0x5B2C,
-	2067:  0x5B2D,
-	2068:  0x5B2E,
-	2069:  0x5B2F,
-	2070:  0x5B30,
-	2071:  0x5B31,
-	2072:  0x5B33,
-	2073:  0x5B35,
-	2074:  0x5B36,
-	2075:  0x5B38,
-	2076:  0x5B39,
-	2077:  0x5B3A,
-	2078:  0x5B3B,
-	2079:  0x5B3C,
-	2080:  0x5B3D,
-	2081:  0x5B3E,
-	2082:  0x5B3F,
-	2083:  0x5B41,
-	2084:  0x5B42,
-	2085:  0x5B43,
-	2086:  0x5B44,
-	2087:  0x5B45,
-	2088:  0x5B46,
-	2089:  0x5B47,
-	2090:  0x5B48,
-	2091:  0x5B49,
-	2092:  0x5B4A,
-	2093:  0x5B4B,
-	2094:  0x5B4C,
-	2095:  0x5B4D,
-	2096:  0x5B4E,
-	2097:  0x5B4F,
-	2098:  0x5B52,
-	2099:  0x5B56,
-	2100:  0x5B5E,
-	2101:  0x5B60,
-	2102:  0x5B61,
-	2103:  0x5B67,
-	2104:  0x5B68,
-	2105:  0x5B6B,
-	2106:  0x5B6D,
-	2107:  0x5B6E,
-	2108:  0x5B6F,
-	2109:  0x5B72,
-	2110:  0x5B74,
-	2111:  0x5B76,
-	2112:  0x5B77,
-	2113:  0x5B78,
-	2114:  0x5B79,
-	2115:  0x5B7B,
-	2116:  0x5B7C,
-	2117:  0x5B7E,
-	2118:  0x5B7F,
-	2119:  0x5B82,
-	2120:  0x5B86,
-	2121:  0x5B8A,
-	2122:  0x5B8D,
-	2123:  0x5B8E,
-	2124:  0x5B90,
-	2125:  0x5B91,
-	2126:  0x5B92,
-	2127:  0x5B94,
-	2128:  0x5B96,
-	2129:  0x5B9F,
-	2130:  0x5BA7,
-	2131:  0x5BA8,
-	2132:  0x5BA9,
-	2133:  0x5BAC,
-	2134:  0x5BAD,
-	2135:  0x5BAE,
-	2136:  0x5BAF,
-	2137:  0x5BB1,
-	2138:  0x5BB2,
-	2139:  0x5BB7,
-	2140:  0x5BBA,
-	2141:  0x5BBB,
-	2142:  0x5BBC,
-	2143:  0x5BC0,
-	2144:  0x5BC1,
-	2145:  0x5BC3,
-	2146:  0x5BC8,
-	2147:  0x5BC9,
-	2148:  0x5BCA,
-	2149:  0x5BCB,
-	2150:  0x5BCD,
-	2151:  0x5BCE,
-	2152:  0x5BCF,
-	2153:  0x5BD1,
-	2154:  0x5BD4,
-	2155:  0x5BD5,
-	2156:  0x5BD6,
-	2157:  0x5BD7,
-	2158:  0x5BD8,
-	2159:  0x5BD9,
-	2160:  0x5BDA,
-	2161:  0x5BDB,
-	2162:  0x5BDC,
-	2163:  0x5BE0,
-	2164:  0x5BE2,
-	2165:  0x5BE3,
-	2166:  0x5BE6,
-	2167:  0x5BE7,
-	2168:  0x5BE9,
-	2169:  0x5BEA,
-	2170:  0x5BEB,
-	2171:  0x5BEC,
-	2172:  0x5BED,
-	2173:  0x5BEF,
-	2174:  0x5BF1,
-	2175:  0x5BF2,
-	2176:  0x5BF3,
-	2177:  0x5BF4,
-	2178:  0x5BF5,
-	2179:  0x5BF6,
-	2180:  0x5BF7,
-	2181:  0x5BFD,
-	2182:  0x5BFE,
-	2183:  0x5C00,
-	2184:  0x5C02,
-	2185:  0x5C03,
-	2186:  0x5C05,
-	2187:  0x5C07,
-	2188:  0x5C08,
-	2189:  0x5C0B,
-	2190:  0x5C0C,
-	2191:  0x5C0D,
-	2192:  0x5C0E,
-	2193:  0x5C10,
-	2194:  0x5C12,
-	2195:  0x5C13,
-	2196:  0x5C17,
-	2197:  0x5C19,
-	2198:  0x5C1B,
-	2199:  0x5C1E,
-	2200:  0x5C1F,
-	2201:  0x5C20,
-	2202:  0x5C21,
-	2203:  0x5C23,
-	2204:  0x5C26,
-	2205:  0x5C28,
-	2206:  0x5C29,
-	2207:  0x5C2A,
-	2208:  0x5C2B,
-	2209:  0x5C2D,
-	2210:  0x5C2E,
-	2211:  0x5C2F,
-	2212:  0x5C30,
-	2213:  0x5C32,
-	2214:  0x5C33,
-	2215:  0x5C35,
-	2216:  0x5C36,
-	2217:  0x5C37,
-	2218:  0x5C43,
-	2219:  0x5C44,
-	2220:  0x5C46,
-	2221:  0x5C47,
-	2222:  0x5C4C,
-	2223:  0x5C4D,
-	2224:  0x5C52,
-	2225:  0x5C53,
-	2226:  0x5C54,
-	2227:  0x5C56,
-	2228:  0x5C57,
-	2229:  0x5C58,
-	2230:  0x5C5A,
-	2231:  0x5C5B,
-	2232:  0x5C5C,
-	2233:  0x5C5D,
-	2234:  0x5C5F,
-	2235:  0x5C62,
-	2236:  0x5C64,
-	2237:  0x5C67,
-	2238:  0x5C68,
-	2239:  0x5C69,
-	2240:  0x5C6A,
-	2241:  0x5C6B,
-	2242:  0x5C6C,
-	2243:  0x5C6D,
-	2244:  0x5C70,
-	2245:  0x5C72,
-	2246:  0x5C73,
-	2247:  0x5C74,
-	2248:  0x5C75,
-	2249:  0x5C76,
-	2250:  0x5C77,
-	2251:  0x5C78,
-	2252:  0x5C7B,
-	2253:  0x5C7C,
-	2254:  0x5C7D,
-	2255:  0x5C7E,
-	2256:  0x5C80,
-	2257:  0x5C83,
-	2258:  0x5C84,
-	2259:  0x5C85,
-	2260:  0x5C86,
-	2261:  0x5C87,
-	2262:  0x5C89,
-	2263:  0x5C8A,
-	2264:  0x5C8B,
-	2265:  0x5C8E,
-	2266:  0x5C8F,
-	2267:  0x5C92,
-	2268:  0x5C93,
-	2269:  0x5C95,
-	2270:  0x5C9D,
-	2271:  0x5C9E,
-	2272:  0x5C9F,
-	2273:  0x5CA0,
-	2274:  0x5CA1,
-	2275:  0x5CA4,
-	2276:  0x5CA5,
-	2277:  0x5CA6,
-	2278:  0x5CA7,
-	2279:  0x5CA8,
-	2280:  0x5CAA,
-	2281:  0x5CAE,
-	2282:  0x5CAF,
-	2283:  0x5CB0,
-	2284:  0x5CB2,
-	2285:  0x5CB4,
-	2286:  0x5CB6,
-	2287:  0x5CB9,
-	2288:  0x5CBA,
-	2289:  0x5CBB,
-	2290:  0x5CBC,
-	2291:  0x5CBE,
-	2292:  0x5CC0,
-	2293:  0x5CC2,
-	2294:  0x5CC3,
-	2295:  0x5CC5,
-	2296:  0x5CC6,
-	2297:  0x5CC7,
-	2298:  0x5CC8,
-	2299:  0x5CC9,
-	2300:  0x5CCA,
-	2301:  0x5CCC,
-	2302:  0x5CCD,
-	2303:  0x5CCE,
-	2304:  0x5CCF,
-	2305:  0x5CD0,
-	2306:  0x5CD1,
-	2307:  0x5CD3,
-	2308:  0x5CD4,
-	2309:  0x5CD5,
-	2310:  0x5CD6,
-	2311:  0x5CD7,
-	2312:  0x5CD8,
-	2313:  0x5CDA,
-	2314:  0x5CDB,
-	2315:  0x5CDC,
-	2316:  0x5CDD,
-	2317:  0x5CDE,
-	2318:  0x5CDF,
-	2319:  0x5CE0,
-	2320:  0x5CE2,
-	2321:  0x5CE3,
-	2322:  0x5CE7,
-	2323:  0x5CE9,
-	2324:  0x5CEB,
-	2325:  0x5CEC,
-	2326:  0x5CEE,
-	2327:  0x5CEF,
-	2328:  0x5CF1,
-	2329:  0x5CF2,
-	2330:  0x5CF3,
-	2331:  0x5CF4,
-	2332:  0x5CF5,
-	2333:  0x5CF6,
-	2334:  0x5CF7,
-	2335:  0x5CF8,
-	2336:  0x5CF9,
-	2337:  0x5CFA,
-	2338:  0x5CFC,
-	2339:  0x5CFD,
-	2340:  0x5CFE,
-	2341:  0x5CFF,
-	2342:  0x5D00,
-	2343:  0x5D01,
-	2344:  0x5D04,
-	2345:  0x5D05,
-	2346:  0x5D08,
-	2347:  0x5D09,
-	2348:  0x5D0A,
-	2349:  0x5D0B,
-	2350:  0x5D0C,
-	2351:  0x5D0D,
-	2352:  0x5D0F,
-	2353:  0x5D10,
-	2354:  0x5D11,
-	2355:  0x5D12,
-	2356:  0x5D13,
-	2357:  0x5D15,
-	2358:  0x5D17,
-	2359:  0x5D18,
-	2360:  0x5D19,
-	2361:  0x5D1A,
-	2362:  0x5D1C,
-	2363:  0x5D1D,
-	2364:  0x5D1F,
-	2365:  0x5D20,
-	2366:  0x5D21,
-	2367:  0x5D22,
-	2368:  0x5D23,
-	2369:  0x5D25,
-	2370:  0x5D28,
-	2371:  0x5D2A,
-	2372:  0x5D2B,
-	2373:  0x5D2C,
-	2374:  0x5D2F,
-	2375:  0x5D30,
-	2376:  0x5D31,
-	2377:  0x5D32,
-	2378:  0x5D33,
-	2379:  0x5D35,
-	2380:  0x5D36,
-	2381:  0x5D37,
-	2382:  0x5D38,
-	2383:  0x5D39,
-	2384:  0x5D3A,
-	2385:  0x5D3B,
-	2386:  0x5D3C,
-	2387:  0x5D3F,
-	2388:  0x5D40,
-	2389:  0x5D41,
-	2390:  0x5D42,
-	2391:  0x5D43,
-	2392:  0x5D44,
-	2393:  0x5D45,
-	2394:  0x5D46,
-	2395:  0x5D48,
-	2396:  0x5D49,
-	2397:  0x5D4D,
-	2398:  0x5D4E,
-	2399:  0x5D4F,
-	2400:  0x5D50,
-	2401:  0x5D51,
-	2402:  0x5D52,
-	2403:  0x5D53,
-	2404:  0x5D54,
-	2405:  0x5D55,
-	2406:  0x5D56,
-	2407:  0x5D57,
-	2408:  0x5D59,
-	2409:  0x5D5A,
-	2410:  0x5D5C,
-	2411:  0x5D5E,
-	2412:  0x5D5F,
-	2413:  0x5D60,
-	2414:  0x5D61,
-	2415:  0x5D62,
-	2416:  0x5D63,
-	2417:  0x5D64,
-	2418:  0x5D65,
-	2419:  0x5D66,
-	2420:  0x5D67,
-	2421:  0x5D68,
-	2422:  0x5D6A,
-	2423:  0x5D6D,
-	2424:  0x5D6E,
-	2425:  0x5D70,
-	2426:  0x5D71,
-	2427:  0x5D72,
-	2428:  0x5D73,
-	2429:  0x5D75,
-	2430:  0x5D76,
-	2431:  0x5D77,
-	2432:  0x5D78,
-	2433:  0x5D79,
-	2434:  0x5D7A,
-	2435:  0x5D7B,
-	2436:  0x5D7C,
-	2437:  0x5D7D,
-	2438:  0x5D7E,
-	2439:  0x5D7F,
-	2440:  0x5D80,
-	2441:  0x5D81,
-	2442:  0x5D83,
-	2443:  0x5D84,
-	2444:  0x5D85,
-	2445:  0x5D86,
-	2446:  0x5D87,
-	2447:  0x5D88,
-	2448:  0x5D89,
-	2449:  0x5D8A,
-	2450:  0x5D8B,
-	2451:  0x5D8C,
-	2452:  0x5D8D,
-	2453:  0x5D8E,
-	2454:  0x5D8F,
-	2455:  0x5D90,
-	2456:  0x5D91,
-	2457:  0x5D92,
-	2458:  0x5D93,
-	2459:  0x5D94,
-	2460:  0x5D95,
-	2461:  0x5D96,
-	2462:  0x5D97,
-	2463:  0x5D98,
-	2464:  0x5D9A,
-	2465:  0x5D9B,
-	2466:  0x5D9C,
-	2467:  0x5D9E,
-	2468:  0x5D9F,
-	2469:  0x5DA0,
-	2470:  0x5DA1,
-	2471:  0x5DA2,
-	2472:  0x5DA3,
-	2473:  0x5DA4,
-	2474:  0x5DA5,
-	2475:  0x5DA6,
-	2476:  0x5DA7,
-	2477:  0x5DA8,
-	2478:  0x5DA9,
-	2479:  0x5DAA,
-	2480:  0x5DAB,
-	2481:  0x5DAC,
-	2482:  0x5DAD,
-	2483:  0x5DAE,
-	2484:  0x5DAF,
-	2485:  0x5DB0,
-	2486:  0x5DB1,
-	2487:  0x5DB2,
-	2488:  0x5DB3,
-	2489:  0x5DB4,
-	2490:  0x5DB5,
-	2491:  0x5DB6,
-	2492:  0x5DB8,
-	2493:  0x5DB9,
-	2494:  0x5DBA,
-	2495:  0x5DBB,
-	2496:  0x5DBC,
-	2497:  0x5DBD,
-	2498:  0x5DBE,
-	2499:  0x5DBF,
-	2500:  0x5DC0,
-	2501:  0x5DC1,
-	2502:  0x5DC2,
-	2503:  0x5DC3,
-	2504:  0x5DC4,
-	2505:  0x5DC6,
-	2506:  0x5DC7,
-	2507:  0x5DC8,
-	2508:  0x5DC9,
-	2509:  0x5DCA,
-	2510:  0x5DCB,
-	2511:  0x5DCC,
-	2512:  0x5DCE,
-	2513:  0x5DCF,
-	2514:  0x5DD0,
-	2515:  0x5DD1,
-	2516:  0x5DD2,
-	2517:  0x5DD3,
-	2518:  0x5DD4,
-	2519:  0x5DD5,
-	2520:  0x5DD6,
-	2521:  0x5DD7,
-	2522:  0x5DD8,
-	2523:  0x5DD9,
-	2524:  0x5DDA,
-	2525:  0x5DDC,
-	2526:  0x5DDF,
-	2527:  0x5DE0,
-	2528:  0x5DE3,
-	2529:  0x5DE4,
-	2530:  0x5DEA,
-	2531:  0x5DEC,
-	2532:  0x5DED,
-	2533:  0x5DF0,
-	2534:  0x5DF5,
-	2535:  0x5DF6,
-	2536:  0x5DF8,
-	2537:  0x5DF9,
-	2538:  0x5DFA,
-	2539:  0x5DFB,
-	2540:  0x5DFC,
-	2541:  0x5DFF,
-	2542:  0x5E00,
-	2543:  0x5E04,
-	2544:  0x5E07,
-	2545:  0x5E09,
-	2546:  0x5E0A,
-	2547:  0x5E0B,
-	2548:  0x5E0D,
-	2549:  0x5E0E,
-	2550:  0x5E12,
-	2551:  0x5E13,
-	2552:  0x5E17,
-	2553:  0x5E1E,
-	2554:  0x5E1F,
-	2555:  0x5E20,
-	2556:  0x5E21,
-	2557:  0x5E22,
-	2558:  0x5E23,
-	2559:  0x5E24,
-	2560:  0x5E25,
-	2561:  0x5E28,
-	2562:  0x5E29,
-	2563:  0x5E2A,
-	2564:  0x5E2B,
-	2565:  0x5E2C,
-	2566:  0x5E2F,
-	2567:  0x5E30,
-	2568:  0x5E32,
-	2569:  0x5E33,
-	2570:  0x5E34,
-	2571:  0x5E35,
-	2572:  0x5E36,
-	2573:  0x5E39,
-	2574:  0x5E3A,
-	2575:  0x5E3E,
-	2576:  0x5E3F,
-	2577:  0x5E40,
-	2578:  0x5E41,
-	2579:  0x5E43,
-	2580:  0x5E46,
-	2581:  0x5E47,
-	2582:  0x5E48,
-	2583:  0x5E49,
-	2584:  0x5E4A,
-	2585:  0x5E4B,
-	2586:  0x5E4D,
-	2587:  0x5E4E,
-	2588:  0x5E4F,
-	2589:  0x5E50,
-	2590:  0x5E51,
-	2591:  0x5E52,
-	2592:  0x5E53,
-	2593:  0x5E56,
-	2594:  0x5E57,
-	2595:  0x5E58,
-	2596:  0x5E59,
-	2597:  0x5E5A,
-	2598:  0x5E5C,
-	2599:  0x5E5D,
-	2600:  0x5E5F,
-	2601:  0x5E60,
-	2602:  0x5E63,
-	2603:  0x5E64,
-	2604:  0x5E65,
-	2605:  0x5E66,
-	2606:  0x5E67,
-	2607:  0x5E68,
-	2608:  0x5E69,
-	2609:  0x5E6A,
-	2610:  0x5E6B,
-	2611:  0x5E6C,
-	2612:  0x5E6D,
-	2613:  0x5E6E,
-	2614:  0x5E6F,
-	2615:  0x5E70,
-	2616:  0x5E71,
-	2617:  0x5E75,
-	2618:  0x5E77,
-	2619:  0x5E79,
-	2620:  0x5E7E,
-	2621:  0x5E81,
-	2622:  0x5E82,
-	2623:  0x5E83,
-	2624:  0x5E85,
-	2625:  0x5E88,
-	2626:  0x5E89,
-	2627:  0x5E8C,
-	2628:  0x5E8D,
-	2629:  0x5E8E,
-	2630:  0x5E92,
-	2631:  0x5E98,
-	2632:  0x5E9B,
-	2633:  0x5E9D,
-	2634:  0x5EA1,
-	2635:  0x5EA2,
-	2636:  0x5EA3,
-	2637:  0x5EA4,
-	2638:  0x5EA8,
-	2639:  0x5EA9,
-	2640:  0x5EAA,
-	2641:  0x5EAB,
-	2642:  0x5EAC,
-	2643:  0x5EAE,
-	2644:  0x5EAF,
-	2645:  0x5EB0,
-	2646:  0x5EB1,
-	2647:  0x5EB2,
-	2648:  0x5EB4,
-	2649:  0x5EBA,
-	2650:  0x5EBB,
-	2651:  0x5EBC,
-	2652:  0x5EBD,
-	2653:  0x5EBF,
-	2654:  0x5EC0,
-	2655:  0x5EC1,
-	2656:  0x5EC2,
-	2657:  0x5EC3,
-	2658:  0x5EC4,
-	2659:  0x5EC5,
-	2660:  0x5EC6,
-	2661:  0x5EC7,
-	2662:  0x5EC8,
-	2663:  0x5ECB,
-	2664:  0x5ECC,
-	2665:  0x5ECD,
-	2666:  0x5ECE,
-	2667:  0x5ECF,
-	2668:  0x5ED0,
-	2669:  0x5ED4,
-	2670:  0x5ED5,
-	2671:  0x5ED7,
-	2672:  0x5ED8,
-	2673:  0x5ED9,
-	2674:  0x5EDA,
-	2675:  0x5EDC,
-	2676:  0x5EDD,
-	2677:  0x5EDE,
-	2678:  0x5EDF,
-	2679:  0x5EE0,
-	2680:  0x5EE1,
-	2681:  0x5EE2,
-	2682:  0x5EE3,
-	2683:  0x5EE4,
-	2684:  0x5EE5,
-	2685:  0x5EE6,
-	2686:  0x5EE7,
-	2687:  0x5EE9,
-	2688:  0x5EEB,
-	2689:  0x5EEC,
-	2690:  0x5EED,
-	2691:  0x5EEE,
-	2692:  0x5EEF,
-	2693:  0x5EF0,
-	2694:  0x5EF1,
-	2695:  0x5EF2,
-	2696:  0x5EF3,
-	2697:  0x5EF5,
-	2698:  0x5EF8,
-	2699:  0x5EF9,
-	2700:  0x5EFB,
-	2701:  0x5EFC,
-	2702:  0x5EFD,
-	2703:  0x5F05,
-	2704:  0x5F06,
-	2705:  0x5F07,
-	2706:  0x5F09,
-	2707:  0x5F0C,
-	2708:  0x5F0D,
-	2709:  0x5F0E,
-	2710:  0x5F10,
-	2711:  0x5F12,
-	2712:  0x5F14,
-	2713:  0x5F16,
-	2714:  0x5F19,
-	2715:  0x5F1A,
-	2716:  0x5F1C,
-	2717:  0x5F1D,
-	2718:  0x5F1E,
-	2719:  0x5F21,
-	2720:  0x5F22,
-	2721:  0x5F23,
-	2722:  0x5F24,
-	2723:  0x5F28,
-	2724:  0x5F2B,
-	2725:  0x5F2C,
-	2726:  0x5F2E,
-	2727:  0x5F30,
-	2728:  0x5F32,
-	2729:  0x5F33,
-	2730:  0x5F34,
-	2731:  0x5F35,
-	2732:  0x5F36,
-	2733:  0x5F37,
-	2734:  0x5F38,
-	2735:  0x5F3B,
-	2736:  0x5F3D,
-	2737:  0x5F3E,
-	2738:  0x5F3F,
-	2739:  0x5F41,
-	2740:  0x5F42,
-	2741:  0x5F43,
-	2742:  0x5F44,
-	2743:  0x5F45,
-	2744:  0x5F46,
-	2745:  0x5F47,
-	2746:  0x5F48,
-	2747:  0x5F49,
-	2748:  0x5F4A,
-	2749:  0x5F4B,
-	2750:  0x5F4C,
-	2751:  0x5F4D,
-	2752:  0x5F4E,
-	2753:  0x5F4F,
-	2754:  0x5F51,
-	2755:  0x5F54,
-	2756:  0x5F59,
-	2757:  0x5F5A,
-	2758:  0x5F5B,
-	2759:  0x5F5C,
-	2760:  0x5F5E,
-	2761:  0x5F5F,
-	2762:  0x5F60,
-	2763:  0x5F63,
-	2764:  0x5F65,
-	2765:  0x5F67,
-	2766:  0x5F68,
-	2767:  0x5F6B,
-	2768:  0x5F6E,
-	2769:  0x5F6F,
-	2770:  0x5F72,
-	2771:  0x5F74,
-	2772:  0x5F75,
-	2773:  0x5F76,
-	2774:  0x5F78,
-	2775:  0x5F7A,
-	2776:  0x5F7D,
-	2777:  0x5F7E,
-	2778:  0x5F7F,
-	2779:  0x5F83,
-	2780:  0x5F86,
-	2781:  0x5F8D,
-	2782:  0x5F8E,
-	2783:  0x5F8F,
-	2784:  0x5F91,
-	2785:  0x5F93,
-	2786:  0x5F94,
-	2787:  0x5F96,
-	2788:  0x5F9A,
-	2789:  0x5F9B,
-	2790:  0x5F9D,
-	2791:  0x5F9E,
-	2792:  0x5F9F,
-	2793:  0x5FA0,
-	2794:  0x5FA2,
-	2795:  0x5FA3,
-	2796:  0x5FA4,
-	2797:  0x5FA5,
-	2798:  0x5FA6,
-	2799:  0x5FA7,
-	2800:  0x5FA9,
-	2801:  0x5FAB,
-	2802:  0x5FAC,
-	2803:  0x5FAF,
-	2804:  0x5FB0,
-	2805:  0x5FB1,
-	2806:  0x5FB2,
-	2807:  0x5FB3,
-	2808:  0x5FB4,
-	2809:  0x5FB6,
-	2810:  0x5FB8,
-	2811:  0x5FB9,
-	2812:  0x5FBA,
-	2813:  0x5FBB,
-	2814:  0x5FBE,
-	2815:  0x5FBF,
-	2816:  0x5FC0,
-	2817:  0x5FC1,
-	2818:  0x5FC2,
-	2819:  0x5FC7,
-	2820:  0x5FC8,
-	2821:  0x5FCA,
-	2822:  0x5FCB,
-	2823:  0x5FCE,
-	2824:  0x5FD3,
-	2825:  0x5FD4,
-	2826:  0x5FD5,
-	2827:  0x5FDA,
-	2828:  0x5FDB,
-	2829:  0x5FDC,
-	2830:  0x5FDE,
-	2831:  0x5FDF,
-	2832:  0x5FE2,
-	2833:  0x5FE3,
-	2834:  0x5FE5,
-	2835:  0x5FE6,
-	2836:  0x5FE8,
-	2837:  0x5FE9,
-	2838:  0x5FEC,
-	2839:  0x5FEF,
-	2840:  0x5FF0,
-	2841:  0x5FF2,
-	2842:  0x5FF3,
-	2843:  0x5FF4,
-	2844:  0x5FF6,
-	2845:  0x5FF7,
-	2846:  0x5FF9,
-	2847:  0x5FFA,
-	2848:  0x5FFC,
-	2849:  0x6007,
-	2850:  0x6008,
-	2851:  0x6009,
-	2852:  0x600B,
-	2853:  0x600C,
-	2854:  0x6010,
-	2855:  0x6011,
-	2856:  0x6013,
-	2857:  0x6017,
-	2858:  0x6018,
-	2859:  0x601A,
-	2860:  0x601E,
-	2861:  0x601F,
-	2862:  0x6022,
-	2863:  0x6023,
-	2864:  0x6024,
-	2865:  0x602C,
-	2866:  0x602D,
-	2867:  0x602E,
-	2868:  0x6030,
-	2869:  0x6031,
-	2870:  0x6032,
-	2871:  0x6033,
-	2872:  0x6034,
-	2873:  0x6036,
-	2874:  0x6037,
-	2875:  0x6038,
-	2876:  0x6039,
-	2877:  0x603A,
-	2878:  0x603D,
-	2879:  0x603E,
-	2880:  0x6040,
-	2881:  0x6044,
-	2882:  0x6045,
-	2883:  0x6046,
-	2884:  0x6047,
-	2885:  0x6048,
-	2886:  0x6049,
-	2887:  0x604A,
-	2888:  0x604C,
-	2889:  0x604E,
-	2890:  0x604F,
-	2891:  0x6051,
-	2892:  0x6053,
-	2893:  0x6054,
-	2894:  0x6056,
-	2895:  0x6057,
-	2896:  0x6058,
-	2897:  0x605B,
-	2898:  0x605C,
-	2899:  0x605E,
-	2900:  0x605F,
-	2901:  0x6060,
-	2902:  0x6061,
-	2903:  0x6065,
-	2904:  0x6066,
-	2905:  0x606E,
-	2906:  0x6071,
-	2907:  0x6072,
-	2908:  0x6074,
-	2909:  0x6075,
-	2910:  0x6077,
-	2911:  0x607E,
-	2912:  0x6080,
-	2913:  0x6081,
-	2914:  0x6082,
-	2915:  0x6085,
-	2916:  0x6086,
-	2917:  0x6087,
-	2918:  0x6088,
-	2919:  0x608A,
-	2920:  0x608B,
-	2921:  0x608E,
-	2922:  0x608F,
-	2923:  0x6090,
-	2924:  0x6091,
-	2925:  0x6093,
-	2926:  0x6095,
-	2927:  0x6097,
-	2928:  0x6098,
-	2929:  0x6099,
-	2930:  0x609C,
-	2931:  0x609E,
-	2932:  0x60A1,
-	2933:  0x60A2,
-	2934:  0x60A4,
-	2935:  0x60A5,
-	2936:  0x60A7,
-	2937:  0x60A9,
-	2938:  0x60AA,
-	2939:  0x60AE,
-	2940:  0x60B0,
-	2941:  0x60B3,
-	2942:  0x60B5,
-	2943:  0x60B6,
-	2944:  0x60B7,
-	2945:  0x60B9,
-	2946:  0x60BA,
-	2947:  0x60BD,
-	2948:  0x60BE,
-	2949:  0x60BF,
-	2950:  0x60C0,
-	2951:  0x60C1,
-	2952:  0x60C2,
-	2953:  0x60C3,
-	2954:  0x60C4,
-	2955:  0x60C7,
-	2956:  0x60C8,
-	2957:  0x60C9,
-	2958:  0x60CC,
-	2959:  0x60CD,
-	2960:  0x60CE,
-	2961:  0x60CF,
-	2962:  0x60D0,
-	2963:  0x60D2,
-	2964:  0x60D3,
-	2965:  0x60D4,
-	2966:  0x60D6,
-	2967:  0x60D7,
-	2968:  0x60D9,
-	2969:  0x60DB,
-	2970:  0x60DE,
-	2971:  0x60E1,
-	2972:  0x60E2,
-	2973:  0x60E3,
-	2974:  0x60E4,
-	2975:  0x60E5,
-	2976:  0x60EA,
-	2977:  0x60F1,
-	2978:  0x60F2,
-	2979:  0x60F5,
-	2980:  0x60F7,
-	2981:  0x60F8,
-	2982:  0x60FB,
-	2983:  0x60FC,
-	2984:  0x60FD,
-	2985:  0x60FE,
-	2986:  0x60FF,
-	2987:  0x6102,
-	2988:  0x6103,
-	2989:  0x6104,
-	2990:  0x6105,
-	2991:  0x6107,
-	2992:  0x610A,
-	2993:  0x610B,
-	2994:  0x610C,
-	2995:  0x6110,
-	2996:  0x6111,
-	2997:  0x6112,
-	2998:  0x6113,
-	2999:  0x6114,
-	3000:  0x6116,
-	3001:  0x6117,
-	3002:  0x6118,
-	3003:  0x6119,
-	3004:  0x611B,
-	3005:  0x611C,
-	3006:  0x611D,
-	3007:  0x611E,
-	3008:  0x6121,
-	3009:  0x6122,
-	3010:  0x6125,
-	3011:  0x6128,
-	3012:  0x6129,
-	3013:  0x612A,
-	3014:  0x612C,
-	3015:  0x612D,
-	3016:  0x612E,
-	3017:  0x612F,
-	3018:  0x6130,
-	3019:  0x6131,
-	3020:  0x6132,
-	3021:  0x6133,
-	3022:  0x6134,
-	3023:  0x6135,
-	3024:  0x6136,
-	3025:  0x6137,
-	3026:  0x6138,
-	3027:  0x6139,
-	3028:  0x613A,
-	3029:  0x613B,
-	3030:  0x613C,
-	3031:  0x613D,
-	3032:  0x613E,
-	3033:  0x6140,
-	3034:  0x6141,
-	3035:  0x6142,
-	3036:  0x6143,
-	3037:  0x6144,
-	3038:  0x6145,
-	3039:  0x6146,
-	3040:  0x6147,
-	3041:  0x6149,
-	3042:  0x614B,
-	3043:  0x614D,
-	3044:  0x614F,
-	3045:  0x6150,
-	3046:  0x6152,
-	3047:  0x6153,
-	3048:  0x6154,
-	3049:  0x6156,
-	3050:  0x6157,
-	3051:  0x6158,
-	3052:  0x6159,
-	3053:  0x615A,
-	3054:  0x615B,
-	3055:  0x615C,
-	3056:  0x615E,
-	3057:  0x615F,
-	3058:  0x6160,
-	3059:  0x6161,
-	3060:  0x6163,
-	3061:  0x6164,
-	3062:  0x6165,
-	3063:  0x6166,
-	3064:  0x6169,
-	3065:  0x616A,
-	3066:  0x616B,
-	3067:  0x616C,
-	3068:  0x616D,
-	3069:  0x616E,
-	3070:  0x616F,
-	3071:  0x6171,
-	3072:  0x6172,
-	3073:  0x6173,
-	3074:  0x6174,
-	3075:  0x6176,
-	3076:  0x6178,
-	3077:  0x6179,
-	3078:  0x617A,
-	3079:  0x617B,
-	3080:  0x617C,
-	3081:  0x617D,
-	3082:  0x617E,
-	3083:  0x617F,
-	3084:  0x6180,
-	3085:  0x6181,
-	3086:  0x6182,
-	3087:  0x6183,
-	3088:  0x6184,
-	3089:  0x6185,
-	3090:  0x6186,
-	3091:  0x6187,
-	3092:  0x6188,
-	3093:  0x6189,
-	3094:  0x618A,
-	3095:  0x618C,
-	3096:  0x618D,
-	3097:  0x618F,
-	3098:  0x6190,
-	3099:  0x6191,
-	3100:  0x6192,
-	3101:  0x6193,
-	3102:  0x6195,
-	3103:  0x6196,
-	3104:  0x6197,
-	3105:  0x6198,
-	3106:  0x6199,
-	3107:  0x619A,
-	3108:  0x619B,
-	3109:  0x619C,
-	3110:  0x619E,
-	3111:  0x619F,
-	3112:  0x61A0,
-	3113:  0x61A1,
-	3114:  0x61A2,
-	3115:  0x61A3,
-	3116:  0x61A4,
-	3117:  0x61A5,
-	3118:  0x61A6,
-	3119:  0x61AA,
-	3120:  0x61AB,
-	3121:  0x61AD,
-	3122:  0x61AE,
-	3123:  0x61AF,
-	3124:  0x61B0,
-	3125:  0x61B1,
-	3126:  0x61B2,
-	3127:  0x61B3,
-	3128:  0x61B4,
-	3129:  0x61B5,
-	3130:  0x61B6,
-	3131:  0x61B8,
-	3132:  0x61B9,
-	3133:  0x61BA,
-	3134:  0x61BB,
-	3135:  0x61BC,
-	3136:  0x61BD,
-	3137:  0x61BF,
-	3138:  0x61C0,
-	3139:  0x61C1,
-	3140:  0x61C3,
-	3141:  0x61C4,
-	3142:  0x61C5,
-	3143:  0x61C6,
-	3144:  0x61C7,
-	3145:  0x61C9,
-	3146:  0x61CC,
-	3147:  0x61CD,
-	3148:  0x61CE,
-	3149:  0x61CF,
-	3150:  0x61D0,
-	3151:  0x61D3,
-	3152:  0x61D5,
-	3153:  0x61D6,
-	3154:  0x61D7,
-	3155:  0x61D8,
-	3156:  0x61D9,
-	3157:  0x61DA,
-	3158:  0x61DB,
-	3159:  0x61DC,
-	3160:  0x61DD,
-	3161:  0x61DE,
-	3162:  0x61DF,
-	3163:  0x61E0,
-	3164:  0x61E1,
-	3165:  0x61E2,
-	3166:  0x61E3,
-	3167:  0x61E4,
-	3168:  0x61E5,
-	3169:  0x61E7,
-	3170:  0x61E8,
-	3171:  0x61E9,
-	3172:  0x61EA,
-	3173:  0x61EB,
-	3174:  0x61EC,
-	3175:  0x61ED,
-	3176:  0x61EE,
-	3177:  0x61EF,
-	3178:  0x61F0,
-	3179:  0x61F1,
-	3180:  0x61F2,
-	3181:  0x61F3,
-	3182:  0x61F4,
-	3183:  0x61F6,
-	3184:  0x61F7,
-	3185:  0x61F8,
-	3186:  0x61F9,
-	3187:  0x61FA,
-	3188:  0x61FB,
-	3189:  0x61FC,
-	3190:  0x61FD,
-	3191:  0x61FE,
-	3192:  0x6200,
-	3193:  0x6201,
-	3194:  0x6202,
-	3195:  0x6203,
-	3196:  0x6204,
-	3197:  0x6205,
-	3198:  0x6207,
-	3199:  0x6209,
-	3200:  0x6213,
-	3201:  0x6214,
-	3202:  0x6219,
-	3203:  0x621C,
-	3204:  0x621D,
-	3205:  0x621E,
-	3206:  0x6220,
-	3207:  0x6223,
-	3208:  0x6226,
-	3209:  0x6227,
-	3210:  0x6228,
-	3211:  0x6229,
-	3212:  0x622B,
-	3213:  0x622D,
-	3214:  0x622F,
-	3215:  0x6230,
-	3216:  0x6231,
-	3217:  0x6232,
-	3218:  0x6235,
-	3219:  0x6236,
-	3220:  0x6238,
-	3221:  0x6239,
-	3222:  0x623A,
-	3223:  0x623B,
-	3224:  0x623C,
-	3225:  0x6242,
-	3226:  0x6244,
-	3227:  0x6245,
-	3228:  0x6246,
-	3229:  0x624A,
-	3230:  0x624F,
-	3231:  0x6250,
-	3232:  0x6255,
-	3233:  0x6256,
-	3234:  0x6257,
-	3235:  0x6259,
-	3236:  0x625A,
-	3237:  0x625C,
-	3238:  0x625D,
-	3239:  0x625E,
-	3240:  0x625F,
-	3241:  0x6260,
-	3242:  0x6261,
-	3243:  0x6262,
-	3244:  0x6264,
-	3245:  0x6265,
-	3246:  0x6268,
-	3247:  0x6271,
-	3248:  0x6272,
-	3249:  0x6274,
-	3250:  0x6275,
-	3251:  0x6277,
-	3252:  0x6278,
-	3253:  0x627A,
-	3254:  0x627B,
-	3255:  0x627D,
-	3256:  0x6281,
-	3257:  0x6282,
-	3258:  0x6283,
-	3259:  0x6285,
-	3260:  0x6286,
-	3261:  0x6287,
-	3262:  0x6288,
-	3263:  0x628B,
-	3264:  0x628C,
-	3265:  0x628D,
-	3266:  0x628E,
-	3267:  0x628F,
-	3268:  0x6290,
-	3269:  0x6294,
-	3270:  0x6299,
-	3271:  0x629C,
-	3272:  0x629D,
-	3273:  0x629E,
-	3274:  0x62A3,
-	3275:  0x62A6,
-	3276:  0x62A7,
-	3277:  0x62A9,
-	3278:  0x62AA,
-	3279:  0x62AD,
-	3280:  0x62AE,
-	3281:  0x62AF,
-	3282:  0x62B0,
-	3283:  0x62B2,
-	3284:  0x62B3,
-	3285:  0x62B4,
-	3286:  0x62B6,
-	3287:  0x62B7,
-	3288:  0x62B8,
-	3289:  0x62BA,
-	3290:  0x62BE,
-	3291:  0x62C0,
-	3292:  0x62C1,
-	3293:  0x62C3,
-	3294:  0x62CB,
-	3295:  0x62CF,
-	3296:  0x62D1,
-	3297:  0x62D5,
-	3298:  0x62DD,
-	3299:  0x62DE,
-	3300:  0x62E0,
-	3301:  0x62E1,
-	3302:  0x62E4,
-	3303:  0x62EA,
-	3304:  0x62EB,
-	3305:  0x62F0,
-	3306:  0x62F2,
-	3307:  0x62F5,
-	3308:  0x62F8,
-	3309:  0x62F9,
-	3310:  0x62FA,
-	3311:  0x62FB,
-	3312:  0x6300,
-	3313:  0x6303,
-	3314:  0x6304,
-	3315:  0x6305,
-	3316:  0x6306,
-	3317:  0x630A,
-	3318:  0x630B,
-	3319:  0x630C,
-	3320:  0x630D,
-	3321:  0x630F,
-	3322:  0x6310,
-	3323:  0x6312,
-	3324:  0x6313,
-	3325:  0x6314,
-	3326:  0x6315,
-	3327:  0x6317,
-	3328:  0x6318,
-	3329:  0x6319,
-	3330:  0x631C,
-	3331:  0x6326,
-	3332:  0x6327,
-	3333:  0x6329,
-	3334:  0x632C,
-	3335:  0x632D,
-	3336:  0x632E,
-	3337:  0x6330,
-	3338:  0x6331,
-	3339:  0x6333,
-	3340:  0x6334,
-	3341:  0x6335,
-	3342:  0x6336,
-	3343:  0x6337,
-	3344:  0x6338,
-	3345:  0x633B,
-	3346:  0x633C,
-	3347:  0x633E,
-	3348:  0x633F,
-	3349:  0x6340,
-	3350:  0x6341,
-	3351:  0x6344,
-	3352:  0x6347,
-	3353:  0x6348,
-	3354:  0x634A,
-	3355:  0x6351,
-	3356:  0x6352,
-	3357:  0x6353,
-	3358:  0x6354,
-	3359:  0x6356,
-	3360:  0x6357,
-	3361:  0x6358,
-	3362:  0x6359,
-	3363:  0x635A,
-	3364:  0x635B,
-	3365:  0x635C,
-	3366:  0x635D,
-	3367:  0x6360,
-	3368:  0x6364,
-	3369:  0x6365,
-	3370:  0x6366,
-	3371:  0x6368,
-	3372:  0x636A,
-	3373:  0x636B,
-	3374:  0x636C,
-	3375:  0x636F,
-	3376:  0x6370,
-	3377:  0x6372,
-	3378:  0x6373,
-	3379:  0x6374,
-	3380:  0x6375,
-	3381:  0x6378,
-	3382:  0x6379,
-	3383:  0x637C,
-	3384:  0x637D,
-	3385:  0x637E,
-	3386:  0x637F,
-	3387:  0x6381,
-	3388:  0x6383,
-	3389:  0x6384,
-	3390:  0x6385,
-	3391:  0x6386,
-	3392:  0x638B,
-	3393:  0x638D,
-	3394:  0x6391,
-	3395:  0x6393,
-	3396:  0x6394,
-	3397:  0x6395,
-	3398:  0x6397,
-	3399:  0x6399,
-	3400:  0x639A,
-	3401:  0x639B,
-	3402:  0x639C,
-	3403:  0x639D,
-	3404:  0x639E,
-	3405:  0x639F,
-	3406:  0x63A1,
-	3407:  0x63A4,
-	3408:  0x63A6,
-	3409:  0x63AB,
-	3410:  0x63AF,
-	3411:  0x63B1,
-	3412:  0x63B2,
-	3413:  0x63B5,
-	3414:  0x63B6,
-	3415:  0x63B9,
-	3416:  0x63BB,
-	3417:  0x63BD,
-	3418:  0x63BF,
-	3419:  0x63C0,
-	3420:  0x63C1,
-	3421:  0x63C2,
-	3422:  0x63C3,
-	3423:  0x63C5,
-	3424:  0x63C7,
-	3425:  0x63C8,
-	3426:  0x63CA,
-	3427:  0x63CB,
-	3428:  0x63CC,
-	3429:  0x63D1,
-	3430:  0x63D3,
-	3431:  0x63D4,
-	3432:  0x63D5,
-	3433:  0x63D7,
-	3434:  0x63D8,
-	3435:  0x63D9,
-	3436:  0x63DA,
-	3437:  0x63DB,
-	3438:  0x63DC,
-	3439:  0x63DD,
-	3440:  0x63DF,
-	3441:  0x63E2,
-	3442:  0x63E4,
-	3443:  0x63E5,
-	3444:  0x63E6,
-	3445:  0x63E7,
-	3446:  0x63E8,
-	3447:  0x63EB,
-	3448:  0x63EC,
-	3449:  0x63EE,
-	3450:  0x63EF,
-	3451:  0x63F0,
-	3452:  0x63F1,
-	3453:  0x63F3,
-	3454:  0x63F5,
-	3455:  0x63F7,
-	3456:  0x63F9,
-	3457:  0x63FA,
-	3458:  0x63FB,
-	3459:  0x63FC,
-	3460:  0x63FE,
-	3461:  0x6403,
-	3462:  0x6404,
-	3463:  0x6406,
-	3464:  0x6407,
-	3465:  0x6408,
-	3466:  0x6409,
-	3467:  0x640A,
-	3468:  0x640D,
-	3469:  0x640E,
-	3470:  0x6411,
-	3471:  0x6412,
-	3472:  0x6415,
-	3473:  0x6416,
-	3474:  0x6417,
-	3475:  0x6418,
-	3476:  0x6419,
-	3477:  0x641A,
-	3478:  0x641D,
-	3479:  0x641F,
-	3480:  0x6422,
-	3481:  0x6423,
-	3482:  0x6424,
-	3483:  0x6425,
-	3484:  0x6427,
-	3485:  0x6428,
-	3486:  0x6429,
-	3487:  0x642B,
-	3488:  0x642E,
-	3489:  0x642F,
-	3490:  0x6430,
-	3491:  0x6431,
-	3492:  0x6432,
-	3493:  0x6433,
-	3494:  0x6435,
-	3495:  0x6436,
-	3496:  0x6437,
-	3497:  0x6438,
-	3498:  0x6439,
-	3499:  0x643B,
-	3500:  0x643C,
-	3501:  0x643E,
-	3502:  0x6440,
-	3503:  0x6442,
-	3504:  0x6443,
-	3505:  0x6449,
-	3506:  0x644B,
-	3507:  0x644C,
-	3508:  0x644D,
-	3509:  0x644E,
-	3510:  0x644F,
-	3511:  0x6450,
-	3512:  0x6451,
-	3513:  0x6453,
-	3514:  0x6455,
-	3515:  0x6456,
-	3516:  0x6457,
-	3517:  0x6459,
-	3518:  0x645A,
-	3519:  0x645B,
-	3520:  0x645C,
-	3521:  0x645D,
-	3522:  0x645F,
-	3523:  0x6460,
-	3524:  0x6461,
-	3525:  0x6462,
-	3526:  0x6463,
-	3527:  0x6464,
-	3528:  0x6465,
-	3529:  0x6466,
-	3530:  0x6468,
-	3531:  0x646A,
-	3532:  0x646B,
-	3533:  0x646C,
-	3534:  0x646E,
-	3535:  0x646F,
-	3536:  0x6470,
-	3537:  0x6471,
-	3538:  0x6472,
-	3539:  0x6473,
-	3540:  0x6474,
-	3541:  0x6475,
-	3542:  0x6476,
-	3543:  0x6477,
-	3544:  0x647B,
-	3545:  0x647C,
-	3546:  0x647D,
-	3547:  0x647E,
-	3548:  0x647F,
-	3549:  0x6480,
-	3550:  0x6481,
-	3551:  0x6483,
-	3552:  0x6486,
-	3553:  0x6488,
-	3554:  0x6489,
-	3555:  0x648A,
-	3556:  0x648B,
-	3557:  0x648C,
-	3558:  0x648D,
-	3559:  0x648E,
-	3560:  0x648F,
-	3561:  0x6490,
-	3562:  0x6493,
-	3563:  0x6494,
-	3564:  0x6497,
-	3565:  0x6498,
-	3566:  0x649A,
-	3567:  0x649B,
-	3568:  0x649C,
-	3569:  0x649D,
-	3570:  0x649F,
-	3571:  0x64A0,
-	3572:  0x64A1,
-	3573:  0x64A2,
-	3574:  0x64A3,
-	3575:  0x64A5,
-	3576:  0x64A6,
-	3577:  0x64A7,
-	3578:  0x64A8,
-	3579:  0x64AA,
-	3580:  0x64AB,
-	3581:  0x64AF,
-	3582:  0x64B1,
-	3583:  0x64B2,
-	3584:  0x64B3,
-	3585:  0x64B4,
-	3586:  0x64B6,
-	3587:  0x64B9,
-	3588:  0x64BB,
-	3589:  0x64BD,
-	3590:  0x64BE,
-	3591:  0x64BF,
-	3592:  0x64C1,
-	3593:  0x64C3,
-	3594:  0x64C4,
-	3595:  0x64C6,
-	3596:  0x64C7,
-	3597:  0x64C8,
-	3598:  0x64C9,
-	3599:  0x64CA,
-	3600:  0x64CB,
-	3601:  0x64CC,
-	3602:  0x64CF,
-	3603:  0x64D1,
-	3604:  0x64D3,
-	3605:  0x64D4,
-	3606:  0x64D5,
-	3607:  0x64D6,
-	3608:  0x64D9,
-	3609:  0x64DA,
-	3610:  0x64DB,
-	3611:  0x64DC,
-	3612:  0x64DD,
-	3613:  0x64DF,
-	3614:  0x64E0,
-	3615:  0x64E1,
-	3616:  0x64E3,
-	3617:  0x64E5,
-	3618:  0x64E7,
-	3619:  0x64E8,
-	3620:  0x64E9,
-	3621:  0x64EA,
-	3622:  0x64EB,
-	3623:  0x64EC,
-	3624:  0x64ED,
-	3625:  0x64EE,
-	3626:  0x64EF,
-	3627:  0x64F0,
-	3628:  0x64F1,
-	3629:  0x64F2,
-	3630:  0x64F3,
-	3631:  0x64F4,
-	3632:  0x64F5,
-	3633:  0x64F6,
-	3634:  0x64F7,
-	3635:  0x64F8,
-	3636:  0x64F9,
-	3637:  0x64FA,
-	3638:  0x64FB,
-	3639:  0x64FC,
-	3640:  0x64FD,
-	3641:  0x64FE,
-	3642:  0x64FF,
-	3643:  0x6501,
-	3644:  0x6502,
-	3645:  0x6503,
-	3646:  0x6504,
-	3647:  0x6505,
-	3648:  0x6506,
-	3649:  0x6507,
-	3650:  0x6508,
-	3651:  0x650A,
-	3652:  0x650B,
-	3653:  0x650C,
-	3654:  0x650D,
-	3655:  0x650E,
-	3656:  0x650F,
-	3657:  0x6510,
-	3658:  0x6511,
-	3659:  0x6513,
-	3660:  0x6514,
-	3661:  0x6515,
-	3662:  0x6516,
-	3663:  0x6517,
-	3664:  0x6519,
-	3665:  0x651A,
-	3666:  0x651B,
-	3667:  0x651C,
-	3668:  0x651D,
-	3669:  0x651E,
-	3670:  0x651F,
-	3671:  0x6520,
-	3672:  0x6521,
-	3673:  0x6522,
-	3674:  0x6523,
-	3675:  0x6524,
-	3676:  0x6526,
-	3677:  0x6527,
-	3678:  0x6528,
-	3679:  0x6529,
-	3680:  0x652A,
-	3681:  0x652C,
-	3682:  0x652D,
-	3683:  0x6530,
-	3684:  0x6531,
-	3685:  0x6532,
-	3686:  0x6533,
-	3687:  0x6537,
-	3688:  0x653A,
-	3689:  0x653C,
-	3690:  0x653D,
-	3691:  0x6540,
-	3692:  0x6541,
-	3693:  0x6542,
-	3694:  0x6543,
-	3695:  0x6544,
-	3696:  0x6546,
-	3697:  0x6547,
-	3698:  0x654A,
-	3699:  0x654B,
-	3700:  0x654D,
-	3701:  0x654E,
-	3702:  0x6550,
-	3703:  0x6552,
-	3704:  0x6553,
-	3705:  0x6554,
-	3706:  0x6557,
-	3707:  0x6558,
-	3708:  0x655A,
-	3709:  0x655C,
-	3710:  0x655F,
-	3711:  0x6560,
-	3712:  0x6561,
-	3713:  0x6564,
-	3714:  0x6565,
-	3715:  0x6567,
-	3716:  0x6568,
-	3717:  0x6569,
-	3718:  0x656A,
-	3719:  0x656D,
-	3720:  0x656E,
-	3721:  0x656F,
-	3722:  0x6571,
-	3723:  0x6573,
-	3724:  0x6575,
-	3725:  0x6576,
-	3726:  0x6578,
-	3727:  0x6579,
-	3728:  0x657A,
-	3729:  0x657B,
-	3730:  0x657C,
-	3731:  0x657D,
-	3732:  0x657E,
-	3733:  0x657F,
-	3734:  0x6580,
-	3735:  0x6581,
-	3736:  0x6582,
-	3737:  0x6583,
-	3738:  0x6584,
-	3739:  0x6585,
-	3740:  0x6586,
-	3741:  0x6588,
-	3742:  0x6589,
-	3743:  0x658A,
-	3744:  0x658D,
-	3745:  0x658E,
-	3746:  0x658F,
-	3747:  0x6592,
-	3748:  0x6594,
-	3749:  0x6595,
-	3750:  0x6596,
-	3751:  0x6598,
-	3752:  0x659A,
-	3753:  0x659D,
-	3754:  0x659E,
-	3755:  0x65A0,
-	3756:  0x65A2,
-	3757:  0x65A3,
-	3758:  0x65A6,
-	3759:  0x65A8,
-	3760:  0x65AA,
-	3761:  0x65AC,
-	3762:  0x65AE,
-	3763:  0x65B1,
-	3764:  0x65B2,
-	3765:  0x65B3,
-	3766:  0x65B4,
-	3767:  0x65B5,
-	3768:  0x65B6,
-	3769:  0x65B7,
-	3770:  0x65B8,
-	3771:  0x65BA,
-	3772:  0x65BB,
-	3773:  0x65BE,
-	3774:  0x65BF,
-	3775:  0x65C0,
-	3776:  0x65C2,
-	3777:  0x65C7,
-	3778:  0x65C8,
-	3779:  0x65C9,
-	3780:  0x65CA,
-	3781:  0x65CD,
-	3782:  0x65D0,
-	3783:  0x65D1,
-	3784:  0x65D3,
-	3785:  0x65D4,
-	3786:  0x65D5,
-	3787:  0x65D8,
-	3788:  0x65D9,
-	3789:  0x65DA,
-	3790:  0x65DB,
-	3791:  0x65DC,
-	3792:  0x65DD,
-	3793:  0x65DE,
-	3794:  0x65DF,
-	3795:  0x65E1,
-	3796:  0x65E3,
-	3797:  0x65E4,
-	3798:  0x65EA,
-	3799:  0x65EB,
-	3800:  0x65F2,
-	3801:  0x65F3,
-	3802:  0x65F4,
-	3803:  0x65F5,
-	3804:  0x65F8,
-	3805:  0x65F9,
-	3806:  0x65FB,
-	3807:  0x65FC,
-	3808:  0x65FD,
-	3809:  0x65FE,
-	3810:  0x65FF,
-	3811:  0x6601,
-	3812:  0x6604,
-	3813:  0x6605,
-	3814:  0x6607,
-	3815:  0x6608,
-	3816:  0x6609,
-	3817:  0x660B,
-	3818:  0x660D,
-	3819:  0x6610,
-	3820:  0x6611,
-	3821:  0x6612,
-	3822:  0x6616,
-	3823:  0x6617,
-	3824:  0x6618,
-	3825:  0x661A,
-	3826:  0x661B,
-	3827:  0x661C,
-	3828:  0x661E,
-	3829:  0x6621,
-	3830:  0x6622,
-	3831:  0x6623,
-	3832:  0x6624,
-	3833:  0x6626,
-	3834:  0x6629,
-	3835:  0x662A,
-	3836:  0x662B,
-	3837:  0x662C,
-	3838:  0x662E,
-	3839:  0x6630,
-	3840:  0x6632,
-	3841:  0x6633,
-	3842:  0x6637,
-	3843:  0x6638,
-	3844:  0x6639,
-	3845:  0x663A,
-	3846:  0x663B,
-	3847:  0x663D,
-	3848:  0x663F,
-	3849:  0x6640,
-	3850:  0x6642,
-	3851:  0x6644,
-	3852:  0x6645,
-	3853:  0x6646,
-	3854:  0x6647,
-	3855:  0x6648,
-	3856:  0x6649,
-	3857:  0x664A,
-	3858:  0x664D,
-	3859:  0x664E,
-	3860:  0x6650,
-	3861:  0x6651,
-	3862:  0x6658,
-	3863:  0x6659,
-	3864:  0x665B,
-	3865:  0x665C,
-	3866:  0x665D,
-	3867:  0x665E,
-	3868:  0x6660,
-	3869:  0x6662,
-	3870:  0x6663,
-	3871:  0x6665,
-	3872:  0x6667,
-	3873:  0x6669,
-	3874:  0x666A,
-	3875:  0x666B,
-	3876:  0x666C,
-	3877:  0x666D,
-	3878:  0x6671,
-	3879:  0x6672,
-	3880:  0x6673,
-	3881:  0x6675,
-	3882:  0x6678,
-	3883:  0x6679,
-	3884:  0x667B,
-	3885:  0x667C,
-	3886:  0x667D,
-	3887:  0x667F,
-	3888:  0x6680,
-	3889:  0x6681,
-	3890:  0x6683,
-	3891:  0x6685,
-	3892:  0x6686,
-	3893:  0x6688,
-	3894:  0x6689,
-	3895:  0x668A,
-	3896:  0x668B,
-	3897:  0x668D,
-	3898:  0x668E,
-	3899:  0x668F,
-	3900:  0x6690,
-	3901:  0x6692,
-	3902:  0x6693,
-	3903:  0x6694,
-	3904:  0x6695,
-	3905:  0x6698,
-	3906:  0x6699,
-	3907:  0x669A,
-	3908:  0x669B,
-	3909:  0x669C,
-	3910:  0x669E,
-	3911:  0x669F,
-	3912:  0x66A0,
-	3913:  0x66A1,
-	3914:  0x66A2,
-	3915:  0x66A3,
-	3916:  0x66A4,
-	3917:  0x66A5,
-	3918:  0x66A6,
-	3919:  0x66A9,
-	3920:  0x66AA,
-	3921:  0x66AB,
-	3922:  0x66AC,
-	3923:  0x66AD,
-	3924:  0x66AF,
-	3925:  0x66B0,
-	3926:  0x66B1,
-	3927:  0x66B2,
-	3928:  0x66B3,
-	3929:  0x66B5,
-	3930:  0x66B6,
-	3931:  0x66B7,
-	3932:  0x66B8,
-	3933:  0x66BA,
-	3934:  0x66BB,
-	3935:  0x66BC,
-	3936:  0x66BD,
-	3937:  0x66BF,
-	3938:  0x66C0,
-	3939:  0x66C1,
-	3940:  0x66C2,
-	3941:  0x66C3,
-	3942:  0x66C4,
-	3943:  0x66C5,
-	3944:  0x66C6,
-	3945:  0x66C7,
-	3946:  0x66C8,
-	3947:  0x66C9,
-	3948:  0x66CA,
-	3949:  0x66CB,
-	3950:  0x66CC,
-	3951:  0x66CD,
-	3952:  0x66CE,
-	3953:  0x66CF,
-	3954:  0x66D0,
-	3955:  0x66D1,
-	3956:  0x66D2,
-	3957:  0x66D3,
-	3958:  0x66D4,
-	3959:  0x66D5,
-	3960:  0x66D6,
-	3961:  0x66D7,
-	3962:  0x66D8,
-	3963:  0x66DA,
-	3964:  0x66DE,
-	3965:  0x66DF,
-	3966:  0x66E0,
-	3967:  0x66E1,
-	3968:  0x66E2,
-	3969:  0x66E3,
-	3970:  0x66E4,
-	3971:  0x66E5,
-	3972:  0x66E7,
-	3973:  0x66E8,
-	3974:  0x66EA,
-	3975:  0x66EB,
-	3976:  0x66EC,
-	3977:  0x66ED,
-	3978:  0x66EE,
-	3979:  0x66EF,
-	3980:  0x66F1,
-	3981:  0x66F5,
-	3982:  0x66F6,
-	3983:  0x66F8,
-	3984:  0x66FA,
-	3985:  0x66FB,
-	3986:  0x66FD,
-	3987:  0x6701,
-	3988:  0x6702,
-	3989:  0x6703,
-	3990:  0x6704,
-	3991:  0x6705,
-	3992:  0x6706,
-	3993:  0x6707,
-	3994:  0x670C,
-	3995:  0x670E,
-	3996:  0x670F,
-	3997:  0x6711,
-	3998:  0x6712,
-	3999:  0x6713,
-	4000:  0x6716,
-	4001:  0x6718,
-	4002:  0x6719,
-	4003:  0x671A,
-	4004:  0x671C,
-	4005:  0x671E,
-	4006:  0x6720,
-	4007:  0x6721,
-	4008:  0x6722,
-	4009:  0x6723,
-	4010:  0x6724,
-	4011:  0x6725,
-	4012:  0x6727,
-	4013:  0x6729,
-	4014:  0x672E,
-	4015:  0x6730,
-	4016:  0x6732,
-	4017:  0x6733,
-	4018:  0x6736,
-	4019:  0x6737,
-	4020:  0x6738,
-	4021:  0x6739,
-	4022:  0x673B,
-	4023:  0x673C,
-	4024:  0x673E,
-	4025:  0x673F,
-	4026:  0x6741,
-	4027:  0x6744,
-	4028:  0x6745,
-	4029:  0x6747,
-	4030:  0x674A,
-	4031:  0x674B,
-	4032:  0x674D,
-	4033:  0x6752,
-	4034:  0x6754,
-	4035:  0x6755,
-	4036:  0x6757,
-	4037:  0x6758,
-	4038:  0x6759,
-	4039:  0x675A,
-	4040:  0x675B,
-	4041:  0x675D,
-	4042:  0x6762,
-	4043:  0x6763,
-	4044:  0x6764,
-	4045:  0x6766,
-	4046:  0x6767,
-	4047:  0x676B,
-	4048:  0x676C,
-	4049:  0x676E,
-	4050:  0x6771,
-	4051:  0x6774,
-	4052:  0x6776,
-	4053:  0x6778,
-	4054:  0x6779,
-	4055:  0x677A,
-	4056:  0x677B,
-	4057:  0x677D,
-	4058:  0x6780,
-	4059:  0x6782,
-	4060:  0x6783,
-	4061:  0x6785,
-	4062:  0x6786,
-	4063:  0x6788,
-	4064:  0x678A,
-	4065:  0x678C,
-	4066:  0x678D,
-	4067:  0x678E,
-	4068:  0x678F,
-	4069:  0x6791,
-	4070:  0x6792,
-	4071:  0x6793,
-	4072:  0x6794,
-	4073:  0x6796,
-	4074:  0x6799,
-	4075:  0x679B,
-	4076:  0x679F,
-	4077:  0x67A0,
-	4078:  0x67A1,
-	4079:  0x67A4,
-	4080:  0x67A6,
-	4081:  0x67A9,
-	4082:  0x67AC,
-	4083:  0x67AE,
-	4084:  0x67B1,
-	4085:  0x67B2,
-	4086:  0x67B4,
-	4087:  0x67B9,
-	4088:  0x67BA,
-	4089:  0x67BB,
-	4090:  0x67BC,
-	4091:  0x67BD,
-	4092:  0x67BE,
-	4093:  0x67BF,
-	4094:  0x67C0,
-	4095:  0x67C2,
-	4096:  0x67C5,
-	4097:  0x67C6,
-	4098:  0x67C7,
-	4099:  0x67C8,
-	4100:  0x67C9,
-	4101:  0x67CA,
-	4102:  0x67CB,
-	4103:  0x67CC,
-	4104:  0x67CD,
-	4105:  0x67CE,
-	4106:  0x67D5,
-	4107:  0x67D6,
-	4108:  0x67D7,
-	4109:  0x67DB,
-	4110:  0x67DF,
-	4111:  0x67E1,
-	4112:  0x67E3,
-	4113:  0x67E4,
-	4114:  0x67E6,
-	4115:  0x67E7,
-	4116:  0x67E8,
-	4117:  0x67EA,
-	4118:  0x67EB,
-	4119:  0x67ED,
-	4120:  0x67EE,
-	4121:  0x67F2,
-	4122:  0x67F5,
-	4123:  0x67F6,
-	4124:  0x67F7,
-	4125:  0x67F8,
-	4126:  0x67F9,
-	4127:  0x67FA,
-	4128:  0x67FB,
-	4129:  0x67FC,
-	4130:  0x67FE,
-	4131:  0x6801,
-	4132:  0x6802,
-	4133:  0x6803,
-	4134:  0x6804,
-	4135:  0x6806,
-	4136:  0x680D,
-	4137:  0x6810,
-	4138:  0x6812,
-	4139:  0x6814,
-	4140:  0x6815,
-	4141:  0x6818,
-	4142:  0x6819,
-	4143:  0x681A,
-	4144:  0x681B,
-	4145:  0x681C,
-	4146:  0x681E,
-	4147:  0x681F,
-	4148:  0x6820,
-	4149:  0x6822,
-	4150:  0x6823,
-	4151:  0x6824,
-	4152:  0x6825,
-	4153:  0x6826,
-	4154:  0x6827,
-	4155:  0x6828,
-	4156:  0x682B,
-	4157:  0x682C,
-	4158:  0x682D,
-	4159:  0x682E,
-	4160:  0x682F,
-	4161:  0x6830,
-	4162:  0x6831,
-	4163:  0x6834,
-	4164:  0x6835,
-	4165:  0x6836,
-	4166:  0x683A,
-	4167:  0x683B,
-	4168:  0x683F,
-	4169:  0x6847,
-	4170:  0x684B,
-	4171:  0x684D,
-	4172:  0x684F,
-	4173:  0x6852,
-	4174:  0x6856,
-	4175:  0x6857,
-	4176:  0x6858,
-	4177:  0x6859,
-	4178:  0x685A,
-	4179:  0x685B,
-	4180:  0x685C,
-	4181:  0x685D,
-	4182:  0x685E,
-	4183:  0x685F,
-	4184:  0x686A,
-	4185:  0x686C,
-	4186:  0x686D,
-	4187:  0x686E,
-	4188:  0x686F,
-	4189:  0x6870,
-	4190:  0x6871,
-	4191:  0x6872,
-	4192:  0x6873,
-	4193:  0x6875,
-	4194:  0x6878,
-	4195:  0x6879,
-	4196:  0x687A,
-	4197:  0x687B,
-	4198:  0x687C,
-	4199:  0x687D,
-	4200:  0x687E,
-	4201:  0x687F,
-	4202:  0x6880,
-	4203:  0x6882,
-	4204:  0x6884,
-	4205:  0x6887,
-	4206:  0x6888,
-	4207:  0x6889,
-	4208:  0x688A,
-	4209:  0x688B,
-	4210:  0x688C,
-	4211:  0x688D,
-	4212:  0x688E,
-	4213:  0x6890,
-	4214:  0x6891,
-	4215:  0x6892,
-	4216:  0x6894,
-	4217:  0x6895,
-	4218:  0x6896,
-	4219:  0x6898,
-	4220:  0x6899,
-	4221:  0x689A,
-	4222:  0x689B,
-	4223:  0x689C,
-	4224:  0x689D,
-	4225:  0x689E,
-	4226:  0x689F,
-	4227:  0x68A0,
-	4228:  0x68A1,
-	4229:  0x68A3,
-	4230:  0x68A4,
-	4231:  0x68A5,
-	4232:  0x68A9,
-	4233:  0x68AA,
-	4234:  0x68AB,
-	4235:  0x68AC,
-	4236:  0x68AE,
-	4237:  0x68B1,
-	4238:  0x68B2,
-	4239:  0x68B4,
-	4240:  0x68B6,
-	4241:  0x68B7,
-	4242:  0x68B8,
-	4243:  0x68B9,
-	4244:  0x68BA,
-	4245:  0x68BB,
-	4246:  0x68BC,
-	4247:  0x68BD,
-	4248:  0x68BE,
-	4249:  0x68BF,
-	4250:  0x68C1,
-	4251:  0x68C3,
-	4252:  0x68C4,
-	4253:  0x68C5,
-	4254:  0x68C6,
-	4255:  0x68C7,
-	4256:  0x68C8,
-	4257:  0x68CA,
-	4258:  0x68CC,
-	4259:  0x68CE,
-	4260:  0x68CF,
-	4261:  0x68D0,
-	4262:  0x68D1,
-	4263:  0x68D3,
-	4264:  0x68D4,
-	4265:  0x68D6,
-	4266:  0x68D7,
-	4267:  0x68D9,
-	4268:  0x68DB,
-	4269:  0x68DC,
-	4270:  0x68DD,
-	4271:  0x68DE,
-	4272:  0x68DF,
-	4273:  0x68E1,
-	4274:  0x68E2,
-	4275:  0x68E4,
-	4276:  0x68E5,
-	4277:  0x68E6,
-	4278:  0x68E7,
-	4279:  0x68E8,
-	4280:  0x68E9,
-	4281:  0x68EA,
-	4282:  0x68EB,
-	4283:  0x68EC,
-	4284:  0x68ED,
-	4285:  0x68EF,
-	4286:  0x68F2,
-	4287:  0x68F3,
-	4288:  0x68F4,
-	4289:  0x68F6,
-	4290:  0x68F7,
-	4291:  0x68F8,
-	4292:  0x68FB,
-	4293:  0x68FD,
-	4294:  0x68FE,
-	4295:  0x68FF,
-	4296:  0x6900,
-	4297:  0x6902,
-	4298:  0x6903,
-	4299:  0x6904,
-	4300:  0x6906,
-	4301:  0x6907,
-	4302:  0x6908,
-	4303:  0x6909,
-	4304:  0x690A,
-	4305:  0x690C,
-	4306:  0x690F,
-	4307:  0x6911,
-	4308:  0x6913,
-	4309:  0x6914,
-	4310:  0x6915,
-	4311:  0x6916,
-	4312:  0x6917,
-	4313:  0x6918,
-	4314:  0x6919,
-	4315:  0x691A,
-	4316:  0x691B,
-	4317:  0x691C,
-	4318:  0x691D,
-	4319:  0x691E,
-	4320:  0x6921,
-	4321:  0x6922,
-	4322:  0x6923,
-	4323:  0x6925,
-	4324:  0x6926,
-	4325:  0x6927,
-	4326:  0x6928,
-	4327:  0x6929,
-	4328:  0x692A,
-	4329:  0x692B,
-	4330:  0x692C,
-	4331:  0x692E,
-	4332:  0x692F,
-	4333:  0x6931,
-	4334:  0x6932,
-	4335:  0x6933,
-	4336:  0x6935,
-	4337:  0x6936,
-	4338:  0x6937,
-	4339:  0x6938,
-	4340:  0x693A,
-	4341:  0x693B,
-	4342:  0x693C,
-	4343:  0x693E,
-	4344:  0x6940,
-	4345:  0x6941,
-	4346:  0x6943,
-	4347:  0x6944,
-	4348:  0x6945,
-	4349:  0x6946,
-	4350:  0x6947,
-	4351:  0x6948,
-	4352:  0x6949,
-	4353:  0x694A,
-	4354:  0x694B,
-	4355:  0x694C,
-	4356:  0x694D,
-	4357:  0x694E,
-	4358:  0x694F,
-	4359:  0x6950,
-	4360:  0x6951,
-	4361:  0x6952,
-	4362:  0x6953,
-	4363:  0x6955,
-	4364:  0x6956,
-	4365:  0x6958,
-	4366:  0x6959,
-	4367:  0x695B,
-	4368:  0x695C,
-	4369:  0x695F,
-	4370:  0x6961,
-	4371:  0x6962,
-	4372:  0x6964,
-	4373:  0x6965,
-	4374:  0x6967,
-	4375:  0x6968,
-	4376:  0x6969,
-	4377:  0x696A,
-	4378:  0x696C,
-	4379:  0x696D,
-	4380:  0x696F,
-	4381:  0x6970,
-	4382:  0x6972,
-	4383:  0x6973,
-	4384:  0x6974,
-	4385:  0x6975,
-	4386:  0x6976,
-	4387:  0x697A,
-	4388:  0x697B,
-	4389:  0x697D,
-	4390:  0x697E,
-	4391:  0x697F,
-	4392:  0x6981,
-	4393:  0x6983,
-	4394:  0x6985,
-	4395:  0x698A,
-	4396:  0x698B,
-	4397:  0x698C,
-	4398:  0x698E,
-	4399:  0x698F,
-	4400:  0x6990,
-	4401:  0x6991,
-	4402:  0x6992,
-	4403:  0x6993,
-	4404:  0x6996,
-	4405:  0x6997,
-	4406:  0x6999,
-	4407:  0x699A,
-	4408:  0x699D,
-	4409:  0x699E,
-	4410:  0x699F,
-	4411:  0x69A0,
-	4412:  0x69A1,
-	4413:  0x69A2,
-	4414:  0x69A3,
-	4415:  0x69A4,
-	4416:  0x69A5,
-	4417:  0x69A6,
-	4418:  0x69A9,
-	4419:  0x69AA,
-	4420:  0x69AC,
-	4421:  0x69AE,
-	4422:  0x69AF,
-	4423:  0x69B0,
-	4424:  0x69B2,
-	4425:  0x69B3,
-	4426:  0x69B5,
-	4427:  0x69B6,
-	4428:  0x69B8,
-	4429:  0x69B9,
-	4430:  0x69BA,
-	4431:  0x69BC,
-	4432:  0x69BD,
-	4433:  0x69BE,
-	4434:  0x69BF,
-	4435:  0x69C0,
-	4436:  0x69C2,
-	4437:  0x69C3,
-	4438:  0x69C4,
-	4439:  0x69C5,
-	4440:  0x69C6,
-	4441:  0x69C7,
-	4442:  0x69C8,
-	4443:  0x69C9,
-	4444:  0x69CB,
-	4445:  0x69CD,
-	4446:  0x69CF,
-	4447:  0x69D1,
-	4448:  0x69D2,
-	4449:  0x69D3,
-	4450:  0x69D5,
-	4451:  0x69D6,
-	4452:  0x69D7,
-	4453:  0x69D8,
-	4454:  0x69D9,
-	4455:  0x69DA,
-	4456:  0x69DC,
-	4457:  0x69DD,
-	4458:  0x69DE,
-	4459:  0x69E1,
-	4460:  0x69E2,
-	4461:  0x69E3,
-	4462:  0x69E4,
-	4463:  0x69E5,
-	4464:  0x69E6,
-	4465:  0x69E7,
-	4466:  0x69E8,
-	4467:  0x69E9,
-	4468:  0x69EA,
-	4469:  0x69EB,
-	4470:  0x69EC,
-	4471:  0x69EE,
-	4472:  0x69EF,
-	4473:  0x69F0,
-	4474:  0x69F1,
-	4475:  0x69F3,
-	4476:  0x69F4,
-	4477:  0x69F5,
-	4478:  0x69F6,
-	4479:  0x69F7,
-	4480:  0x69F8,
-	4481:  0x69F9,
-	4482:  0x69FA,
-	4483:  0x69FB,
-	4484:  0x69FC,
-	4485:  0x69FE,
-	4486:  0x6A00,
-	4487:  0x6A01,
-	4488:  0x6A02,
-	4489:  0x6A03,
-	4490:  0x6A04,
-	4491:  0x6A05,
-	4492:  0x6A06,
-	4493:  0x6A07,
-	4494:  0x6A08,
-	4495:  0x6A09,
-	4496:  0x6A0B,
-	4497:  0x6A0C,
-	4498:  0x6A0D,
-	4499:  0x6A0E,
-	4500:  0x6A0F,
-	4501:  0x6A10,
-	4502:  0x6A11,
-	4503:  0x6A12,
-	4504:  0x6A13,
-	4505:  0x6A14,
-	4506:  0x6A15,
-	4507:  0x6A16,
-	4508:  0x6A19,
-	4509:  0x6A1A,
-	4510:  0x6A1B,
-	4511:  0x6A1C,
-	4512:  0x6A1D,
-	4513:  0x6A1E,
-	4514:  0x6A20,
-	4515:  0x6A22,
-	4516:  0x6A23,
-	4517:  0x6A24,
-	4518:  0x6A25,
-	4519:  0x6A26,
-	4520:  0x6A27,
-	4521:  0x6A29,
-	4522:  0x6A2B,
-	4523:  0x6A2C,
-	4524:  0x6A2D,
-	4525:  0x6A2E,
-	4526:  0x6A30,
-	4527:  0x6A32,
-	4528:  0x6A33,
-	4529:  0x6A34,
-	4530:  0x6A36,
-	4531:  0x6A37,
-	4532:  0x6A38,
-	4533:  0x6A39,
-	4534:  0x6A3A,
-	4535:  0x6A3B,
-	4536:  0x6A3C,
-	4537:  0x6A3F,
-	4538:  0x6A40,
-	4539:  0x6A41,
-	4540:  0x6A42,
-	4541:  0x6A43,
-	4542:  0x6A45,
-	4543:  0x6A46,
-	4544:  0x6A48,
-	4545:  0x6A49,
-	4546:  0x6A4A,
-	4547:  0x6A4B,
-	4548:  0x6A4C,
-	4549:  0x6A4D,
-	4550:  0x6A4E,
-	4551:  0x6A4F,
-	4552:  0x6A51,
-	4553:  0x6A52,
-	4554:  0x6A53,
-	4555:  0x6A54,
-	4556:  0x6A55,
-	4557:  0x6A56,
-	4558:  0x6A57,
-	4559:  0x6A5A,
-	4560:  0x6A5C,
-	4561:  0x6A5D,
-	4562:  0x6A5E,
-	4563:  0x6A5F,
-	4564:  0x6A60,
-	4565:  0x6A62,
-	4566:  0x6A63,
-	4567:  0x6A64,
-	4568:  0x6A66,
-	4569:  0x6A67,
-	4570:  0x6A68,
-	4571:  0x6A69,
-	4572:  0x6A6A,
-	4573:  0x6A6B,
-	4574:  0x6A6C,
-	4575:  0x6A6D,
-	4576:  0x6A6E,
-	4577:  0x6A6F,
-	4578:  0x6A70,
-	4579:  0x6A72,
-	4580:  0x6A73,
-	4581:  0x6A74,
-	4582:  0x6A75,
-	4583:  0x6A76,
-	4584:  0x6A77,
-	4585:  0x6A78,
-	4586:  0x6A7A,
-	4587:  0x6A7B,
-	4588:  0x6A7D,
-	4589:  0x6A7E,
-	4590:  0x6A7F,
-	4591:  0x6A81,
-	4592:  0x6A82,
-	4593:  0x6A83,
-	4594:  0x6A85,
-	4595:  0x6A86,
-	4596:  0x6A87,
-	4597:  0x6A88,
-	4598:  0x6A89,
-	4599:  0x6A8A,
-	4600:  0x6A8B,
-	4601:  0x6A8C,
-	4602:  0x6A8D,
-	4603:  0x6A8F,
-	4604:  0x6A92,
-	4605:  0x6A93,
-	4606:  0x6A94,
-	4607:  0x6A95,
-	4608:  0x6A96,
-	4609:  0x6A98,
-	4610:  0x6A99,
-	4611:  0x6A9A,
-	4612:  0x6A9B,
-	4613:  0x6A9C,
-	4614:  0x6A9D,
-	4615:  0x6A9E,
-	4616:  0x6A9F,
-	4617:  0x6AA1,
-	4618:  0x6AA2,
-	4619:  0x6AA3,
-	4620:  0x6AA4,
-	4621:  0x6AA5,
-	4622:  0x6AA6,
-	4623:  0x6AA7,
-	4624:  0x6AA8,
-	4625:  0x6AAA,
-	4626:  0x6AAD,
-	4627:  0x6AAE,
-	4628:  0x6AAF,
-	4629:  0x6AB0,
-	4630:  0x6AB1,
-	4631:  0x6AB2,
-	4632:  0x6AB3,
-	4633:  0x6AB4,
-	4634:  0x6AB5,
-	4635:  0x6AB6,
-	4636:  0x6AB7,
-	4637:  0x6AB8,
-	4638:  0x6AB9,
-	4639:  0x6ABA,
-	4640:  0x6ABB,
-	4641:  0x6ABC,
-	4642:  0x6ABD,
-	4643:  0x6ABE,
-	4644:  0x6ABF,
-	4645:  0x6AC0,
-	4646:  0x6AC1,
-	4647:  0x6AC2,
-	4648:  0x6AC3,
-	4649:  0x6AC4,
-	4650:  0x6AC5,
-	4651:  0x6AC6,
-	4652:  0x6AC7,
-	4653:  0x6AC8,
-	4654:  0x6AC9,
-	4655:  0x6ACA,
-	4656:  0x6ACB,
-	4657:  0x6ACC,
-	4658:  0x6ACD,
-	4659:  0x6ACE,
-	4660:  0x6ACF,
-	4661:  0x6AD0,
-	4662:  0x6AD1,
-	4663:  0x6AD2,
-	4664:  0x6AD3,
-	4665:  0x6AD4,
-	4666:  0x6AD5,
-	4667:  0x6AD6,
-	4668:  0x6AD7,
-	4669:  0x6AD8,
-	4670:  0x6AD9,
-	4671:  0x6ADA,
-	4672:  0x6ADB,
-	4673:  0x6ADC,
-	4674:  0x6ADD,
-	4675:  0x6ADE,
-	4676:  0x6ADF,
-	4677:  0x6AE0,
-	4678:  0x6AE1,
-	4679:  0x6AE2,
-	4680:  0x6AE3,
-	4681:  0x6AE4,
-	4682:  0x6AE5,
-	4683:  0x6AE6,
-	4684:  0x6AE7,
-	4685:  0x6AE8,
-	4686:  0x6AE9,
-	4687:  0x6AEA,
-	4688:  0x6AEB,
-	4689:  0x6AEC,
-	4690:  0x6AED,
-	4691:  0x6AEE,
-	4692:  0x6AEF,
-	4693:  0x6AF0,
-	4694:  0x6AF1,
-	4695:  0x6AF2,
-	4696:  0x6AF3,
-	4697:  0x6AF4,
-	4698:  0x6AF5,
-	4699:  0x6AF6,
-	4700:  0x6AF7,
-	4701:  0x6AF8,
-	4702:  0x6AF9,
-	4703:  0x6AFA,
-	4704:  0x6AFB,
-	4705:  0x6AFC,
-	4706:  0x6AFD,
-	4707:  0x6AFE,
-	4708:  0x6AFF,
-	4709:  0x6B00,
-	4710:  0x6B01,
-	4711:  0x6B02,
-	4712:  0x6B03,
-	4713:  0x6B04,
-	4714:  0x6B05,
-	4715:  0x6B06,
-	4716:  0x6B07,
-	4717:  0x6B08,
-	4718:  0x6B09,
-	4719:  0x6B0A,
-	4720:  0x6B0B,
-	4721:  0x6B0C,
-	4722:  0x6B0D,
-	4723:  0x6B0E,
-	4724:  0x6B0F,
-	4725:  0x6B10,
-	4726:  0x6B11,
-	4727:  0x6B12,
-	4728:  0x6B13,
-	4729:  0x6B14,
-	4730:  0x6B15,
-	4731:  0x6B16,
-	4732:  0x6B17,
-	4733:  0x6B18,
-	4734:  0x6B19,
-	4735:  0x6B1A,
-	4736:  0x6B1B,
-	4737:  0x6B1C,
-	4738:  0x6B1D,
-	4739:  0x6B1E,
-	4740:  0x6B1F,
-	4741:  0x6B25,
-	4742:  0x6B26,
-	4743:  0x6B28,
-	4744:  0x6B29,
-	4745:  0x6B2A,
-	4746:  0x6B2B,
-	4747:  0x6B2C,
-	4748:  0x6B2D,
-	4749:  0x6B2E,
-	4750:  0x6B2F,
-	4751:  0x6B30,
-	4752:  0x6B31,
-	4753:  0x6B33,
-	4754:  0x6B34,
-	4755:  0x6B35,
-	4756:  0x6B36,
-	4757:  0x6B38,
-	4758:  0x6B3B,
-	4759:  0x6B3C,
-	4760:  0x6B3D,
-	4761:  0x6B3F,
-	4762:  0x6B40,
-	4763:  0x6B41,
-	4764:  0x6B42,
-	4765:  0x6B44,
-	4766:  0x6B45,
-	4767:  0x6B48,
-	4768:  0x6B4A,
-	4769:  0x6B4B,
-	4770:  0x6B4D,
-	4771:  0x6B4E,
-	4772:  0x6B4F,
-	4773:  0x6B50,
-	4774:  0x6B51,
-	4775:  0x6B52,
-	4776:  0x6B53,
-	4777:  0x6B54,
-	4778:  0x6B55,
-	4779:  0x6B56,
-	4780:  0x6B57,
-	4781:  0x6B58,
-	4782:  0x6B5A,
-	4783:  0x6B5B,
-	4784:  0x6B5C,
-	4785:  0x6B5D,
-	4786:  0x6B5E,
-	4787:  0x6B5F,
-	4788:  0x6B60,
-	4789:  0x6B61,
-	4790:  0x6B68,
-	4791:  0x6B69,
-	4792:  0x6B6B,
-	4793:  0x6B6C,
-	4794:  0x6B6D,
-	4795:  0x6B6E,
-	4796:  0x6B6F,
-	4797:  0x6B70,
-	4798:  0x6B71,
-	4799:  0x6B72,
-	4800:  0x6B73,
-	4801:  0x6B74,
-	4802:  0x6B75,
-	4803:  0x6B76,
-	4804:  0x6B77,
-	4805:  0x6B78,
-	4806:  0x6B7A,
-	4807:  0x6B7D,
-	4808:  0x6B7E,
-	4809:  0x6B7F,
-	4810:  0x6B80,
-	4811:  0x6B85,
-	4812:  0x6B88,
-	4813:  0x6B8C,
-	4814:  0x6B8E,
-	4815:  0x6B8F,
-	4816:  0x6B90,
-	4817:  0x6B91,
-	4818:  0x6B94,
-	4819:  0x6B95,
-	4820:  0x6B97,
-	4821:  0x6B98,
-	4822:  0x6B99,
-	4823:  0x6B9C,
-	4824:  0x6B9D,
-	4825:  0x6B9E,
-	4826:  0x6B9F,
-	4827:  0x6BA0,
-	4828:  0x6BA2,
-	4829:  0x6BA3,
-	4830:  0x6BA4,
-	4831:  0x6BA5,
-	4832:  0x6BA6,
-	4833:  0x6BA7,
-	4834:  0x6BA8,
-	4835:  0x6BA9,
-	4836:  0x6BAB,
-	4837:  0x6BAC,
-	4838:  0x6BAD,
-	4839:  0x6BAE,
-	4840:  0x6BAF,
-	4841:  0x6BB0,
-	4842:  0x6BB1,
-	4843:  0x6BB2,
-	4844:  0x6BB6,
-	4845:  0x6BB8,
-	4846:  0x6BB9,
-	4847:  0x6BBA,
-	4848:  0x6BBB,
-	4849:  0x6BBC,
-	4850:  0x6BBD,
-	4851:  0x6BBE,
-	4852:  0x6BC0,
-	4853:  0x6BC3,
-	4854:  0x6BC4,
-	4855:  0x6BC6,
-	4856:  0x6BC7,
-	4857:  0x6BC8,
-	4858:  0x6BC9,
-	4859:  0x6BCA,
-	4860:  0x6BCC,
-	4861:  0x6BCE,
-	4862:  0x6BD0,
-	4863:  0x6BD1,
-	4864:  0x6BD8,
-	4865:  0x6BDA,
-	4866:  0x6BDC,
-	4867:  0x6BDD,
-	4868:  0x6BDE,
-	4869:  0x6BDF,
-	4870:  0x6BE0,
-	4871:  0x6BE2,
-	4872:  0x6BE3,
-	4873:  0x6BE4,
-	4874:  0x6BE5,
-	4875:  0x6BE6,
-	4876:  0x6BE7,
-	4877:  0x6BE8,
-	4878:  0x6BE9,
-	4879:  0x6BEC,
-	4880:  0x6BED,
-	4881:  0x6BEE,
-	4882:  0x6BF0,
-	4883:  0x6BF1,
-	4884:  0x6BF2,
-	4885:  0x6BF4,
-	4886:  0x6BF6,
-	4887:  0x6BF7,
-	4888:  0x6BF8,
-	4889:  0x6BFA,
-	4890:  0x6BFB,
-	4891:  0x6BFC,
-	4892:  0x6BFE,
-	4893:  0x6BFF,
-	4894:  0x6C00,
-	4895:  0x6C01,
-	4896:  0x6C02,
-	4897:  0x6C03,
-	4898:  0x6C04,
-	4899:  0x6C08,
-	4900:  0x6C09,
-	4901:  0x6C0A,
-	4902:  0x6C0B,
-	4903:  0x6C0C,
-	4904:  0x6C0E,
-	4905:  0x6C12,
-	4906:  0x6C17,
-	4907:  0x6C1C,
-	4908:  0x6C1D,
-	4909:  0x6C1E,
-	4910:  0x6C20,
-	4911:  0x6C23,
-	4912:  0x6C25,
-	4913:  0x6C2B,
-	4914:  0x6C2C,
-	4915:  0x6C2D,
-	4916:  0x6C31,
-	4917:  0x6C33,
-	4918:  0x6C36,
-	4919:  0x6C37,
-	4920:  0x6C39,
-	4921:  0x6C3A,
-	4922:  0x6C3B,
-	4923:  0x6C3C,
-	4924:  0x6C3E,
-	4925:  0x6C3F,
-	4926:  0x6C43,
-	4927:  0x6C44,
-	4928:  0x6C45,
-	4929:  0x6C48,
-	4930:  0x6C4B,
-	4931:  0x6C4C,
-	4932:  0x6C4D,
-	4933:  0x6C4E,
-	4934:  0x6C4F,
-	4935:  0x6C51,
-	4936:  0x6C52,
-	4937:  0x6C53,
-	4938:  0x6C56,
-	4939:  0x6C58,
-	4940:  0x6C59,
-	4941:  0x6C5A,
-	4942:  0x6C62,
-	4943:  0x6C63,
-	4944:  0x6C65,
-	4945:  0x6C66,
-	4946:  0x6C67,
-	4947:  0x6C6B,
-	4948:  0x6C6C,
-	4949:  0x6C6D,
-	4950:  0x6C6E,
-	4951:  0x6C6F,
-	4952:  0x6C71,
-	4953:  0x6C73,
-	4954:  0x6C75,
-	4955:  0x6C77,
-	4956:  0x6C78,
-	4957:  0x6C7A,
-	4958:  0x6C7B,
-	4959:  0x6C7C,
-	4960:  0x6C7F,
-	4961:  0x6C80,
-	4962:  0x6C84,
-	4963:  0x6C87,
-	4964:  0x6C8A,
-	4965:  0x6C8B,
-	4966:  0x6C8D,
-	4967:  0x6C8E,
-	4968:  0x6C91,
-	4969:  0x6C92,
-	4970:  0x6C95,
-	4971:  0x6C96,
-	4972:  0x6C97,
-	4973:  0x6C98,
-	4974:  0x6C9A,
-	4975:  0x6C9C,
-	4976:  0x6C9D,
-	4977:  0x6C9E,
-	4978:  0x6CA0,
-	4979:  0x6CA2,
-	4980:  0x6CA8,
-	4981:  0x6CAC,
-	4982:  0x6CAF,
-	4983:  0x6CB0,
-	4984:  0x6CB4,
-	4985:  0x6CB5,
-	4986:  0x6CB6,
-	4987:  0x6CB7,
-	4988:  0x6CBA,
-	4989:  0x6CC0,
-	4990:  0x6CC1,
-	4991:  0x6CC2,
-	4992:  0x6CC3,
-	4993:  0x6CC6,
-	4994:  0x6CC7,
-	4995:  0x6CC8,
-	4996:  0x6CCB,
-	4997:  0x6CCD,
-	4998:  0x6CCE,
-	4999:  0x6CCF,
-	5000:  0x6CD1,
-	5001:  0x6CD2,
-	5002:  0x6CD8,
-	5003:  0x6CD9,
-	5004:  0x6CDA,
-	5005:  0x6CDC,
-	5006:  0x6CDD,
-	5007:  0x6CDF,
-	5008:  0x6CE4,
-	5009:  0x6CE6,
-	5010:  0x6CE7,
-	5011:  0x6CE9,
-	5012:  0x6CEC,
-	5013:  0x6CED,
-	5014:  0x6CF2,
-	5015:  0x6CF4,
-	5016:  0x6CF9,
-	5017:  0x6CFF,
-	5018:  0x6D00,
-	5019:  0x6D02,
-	5020:  0x6D03,
-	5021:  0x6D05,
-	5022:  0x6D06,
-	5023:  0x6D08,
-	5024:  0x6D09,
-	5025:  0x6D0A,
-	5026:  0x6D0D,
-	5027:  0x6D0F,
-	5028:  0x6D10,
-	5029:  0x6D11,
-	5030:  0x6D13,
-	5031:  0x6D14,
-	5032:  0x6D15,
-	5033:  0x6D16,
-	5034:  0x6D18,
-	5035:  0x6D1C,
-	5036:  0x6D1D,
-	5037:  0x6D1F,
-	5038:  0x6D20,
-	5039:  0x6D21,
-	5040:  0x6D22,
-	5041:  0x6D23,
-	5042:  0x6D24,
-	5043:  0x6D26,
-	5044:  0x6D28,
-	5045:  0x6D29,
-	5046:  0x6D2C,
-	5047:  0x6D2D,
-	5048:  0x6D2F,
-	5049:  0x6D30,
-	5050:  0x6D34,
-	5051:  0x6D36,
-	5052:  0x6D37,
-	5053:  0x6D38,
-	5054:  0x6D3A,
-	5055:  0x6D3F,
-	5056:  0x6D40,
-	5057:  0x6D42,
-	5058:  0x6D44,
-	5059:  0x6D49,
-	5060:  0x6D4C,
-	5061:  0x6D50,
-	5062:  0x6D55,
-	5063:  0x6D56,
-	5064:  0x6D57,
-	5065:  0x6D58,
-	5066:  0x6D5B,
-	5067:  0x6D5D,
-	5068:  0x6D5F,
-	5069:  0x6D61,
-	5070:  0x6D62,
-	5071:  0x6D64,
-	5072:  0x6D65,
-	5073:  0x6D67,
-	5074:  0x6D68,
-	5075:  0x6D6B,
-	5076:  0x6D6C,
-	5077:  0x6D6D,
-	5078:  0x6D70,
-	5079:  0x6D71,
-	5080:  0x6D72,
-	5081:  0x6D73,
-	5082:  0x6D75,
-	5083:  0x6D76,
-	5084:  0x6D79,
-	5085:  0x6D7A,
-	5086:  0x6D7B,
-	5087:  0x6D7D,
-	5088:  0x6D7E,
-	5089:  0x6D7F,
-	5090:  0x6D80,
-	5091:  0x6D81,
-	5092:  0x6D83,
-	5093:  0x6D84,
-	5094:  0x6D86,
-	5095:  0x6D87,
-	5096:  0x6D8A,
-	5097:  0x6D8B,
-	5098:  0x6D8D,
-	5099:  0x6D8F,
-	5100:  0x6D90,
-	5101:  0x6D92,
-	5102:  0x6D96,
-	5103:  0x6D97,
-	5104:  0x6D98,
-	5105:  0x6D99,
-	5106:  0x6D9A,
-	5107:  0x6D9C,
-	5108:  0x6DA2,
-	5109:  0x6DA5,
-	5110:  0x6DAC,
-	5111:  0x6DAD,
-	5112:  0x6DB0,
-	5113:  0x6DB1,
-	5114:  0x6DB3,
-	5115:  0x6DB4,
-	5116:  0x6DB6,
-	5117:  0x6DB7,
-	5118:  0x6DB9,
-	5119:  0x6DBA,
-	5120:  0x6DBB,
-	5121:  0x6DBC,
-	5122:  0x6DBD,
-	5123:  0x6DBE,
-	5124:  0x6DC1,
-	5125:  0x6DC2,
-	5126:  0x6DC3,
-	5127:  0x6DC8,
-	5128:  0x6DC9,
-	5129:  0x6DCA,
-	5130:  0x6DCD,
-	5131:  0x6DCE,
-	5132:  0x6DCF,
-	5133:  0x6DD0,
-	5134:  0x6DD2,
-	5135:  0x6DD3,
-	5136:  0x6DD4,
-	5137:  0x6DD5,
-	5138:  0x6DD7,
-	5139:  0x6DDA,
-	5140:  0x6DDB,
-	5141:  0x6DDC,
-	5142:  0x6DDF,
-	5143:  0x6DE2,
-	5144:  0x6DE3,
-	5145:  0x6DE5,
-	5146:  0x6DE7,
-	5147:  0x6DE8,
-	5148:  0x6DE9,
-	5149:  0x6DEA,
-	5150:  0x6DED,
-	5151:  0x6DEF,
-	5152:  0x6DF0,
-	5153:  0x6DF2,
-	5154:  0x6DF4,
-	5155:  0x6DF5,
-	5156:  0x6DF6,
-	5157:  0x6DF8,
-	5158:  0x6DFA,
-	5159:  0x6DFD,
-	5160:  0x6DFE,
-	5161:  0x6DFF,
-	5162:  0x6E00,
-	5163:  0x6E01,
-	5164:  0x6E02,
-	5165:  0x6E03,
-	5166:  0x6E04,
-	5167:  0x6E06,
-	5168:  0x6E07,
-	5169:  0x6E08,
-	5170:  0x6E09,
-	5171:  0x6E0B,
-	5172:  0x6E0F,
-	5173:  0x6E12,
-	5174:  0x6E13,
-	5175:  0x6E15,
-	5176:  0x6E18,
-	5177:  0x6E19,
-	5178:  0x6E1B,
-	5179:  0x6E1C,
-	5180:  0x6E1E,
-	5181:  0x6E1F,
-	5182:  0x6E22,
-	5183:  0x6E26,
-	5184:  0x6E27,
-	5185:  0x6E28,
-	5186:  0x6E2A,
-	5187:  0x6E2C,
-	5188:  0x6E2E,
-	5189:  0x6E30,
-	5190:  0x6E31,
-	5191:  0x6E33,
-	5192:  0x6E35,
-	5193:  0x6E36,
-	5194:  0x6E37,
-	5195:  0x6E39,
-	5196:  0x6E3B,
-	5197:  0x6E3C,
-	5198:  0x6E3D,
-	5199:  0x6E3E,
-	5200:  0x6E3F,
-	5201:  0x6E40,
-	5202:  0x6E41,
-	5203:  0x6E42,
-	5204:  0x6E45,
-	5205:  0x6E46,
-	5206:  0x6E47,
-	5207:  0x6E48,
-	5208:  0x6E49,
-	5209:  0x6E4A,
-	5210:  0x6E4B,
-	5211:  0x6E4C,
-	5212:  0x6E4F,
-	5213:  0x6E50,
-	5214:  0x6E51,
-	5215:  0x6E52,
-	5216:  0x6E55,
-	5217:  0x6E57,
-	5218:  0x6E59,
-	5219:  0x6E5A,
-	5220:  0x6E5C,
-	5221:  0x6E5D,
-	5222:  0x6E5E,
-	5223:  0x6E60,
-	5224:  0x6E61,
-	5225:  0x6E62,
-	5226:  0x6E63,
-	5227:  0x6E64,
-	5228:  0x6E65,
-	5229:  0x6E66,
-	5230:  0x6E67,
-	5231:  0x6E68,
-	5232:  0x6E69,
-	5233:  0x6E6A,
-	5234:  0x6E6C,
-	5235:  0x6E6D,
-	5236:  0x6E6F,
-	5237:  0x6E70,
-	5238:  0x6E71,
-	5239:  0x6E72,
-	5240:  0x6E73,
-	5241:  0x6E74,
-	5242:  0x6E75,
-	5243:  0x6E76,
-	5244:  0x6E77,
-	5245:  0x6E78,
-	5246:  0x6E79,
-	5247:  0x6E7A,
-	5248:  0x6E7B,
-	5249:  0x6E7C,
-	5250:  0x6E7D,
-	5251:  0x6E80,
-	5252:  0x6E81,
-	5253:  0x6E82,
-	5254:  0x6E84,
-	5255:  0x6E87,
-	5256:  0x6E88,
-	5257:  0x6E8A,
-	5258:  0x6E8B,
-	5259:  0x6E8C,
-	5260:  0x6E8D,
-	5261:  0x6E8E,
-	5262:  0x6E91,
-	5263:  0x6E92,
-	5264:  0x6E93,
-	5265:  0x6E94,
-	5266:  0x6E95,
-	5267:  0x6E96,
-	5268:  0x6E97,
-	5269:  0x6E99,
-	5270:  0x6E9A,
-	5271:  0x6E9B,
-	5272:  0x6E9D,
-	5273:  0x6E9E,
-	5274:  0x6EA0,
-	5275:  0x6EA1,
-	5276:  0x6EA3,
-	5277:  0x6EA4,
-	5278:  0x6EA6,
-	5279:  0x6EA8,
-	5280:  0x6EA9,
-	5281:  0x6EAB,
-	5282:  0x6EAC,
-	5283:  0x6EAD,
-	5284:  0x6EAE,
-	5285:  0x6EB0,
-	5286:  0x6EB3,
-	5287:  0x6EB5,
-	5288:  0x6EB8,
-	5289:  0x6EB9,
-	5290:  0x6EBC,
-	5291:  0x6EBE,
-	5292:  0x6EBF,
-	5293:  0x6EC0,
-	5294:  0x6EC3,
-	5295:  0x6EC4,
-	5296:  0x6EC5,
-	5297:  0x6EC6,
-	5298:  0x6EC8,
-	5299:  0x6EC9,
-	5300:  0x6ECA,
-	5301:  0x6ECC,
-	5302:  0x6ECD,
-	5303:  0x6ECE,
-	5304:  0x6ED0,
-	5305:  0x6ED2,
-	5306:  0x6ED6,
-	5307:  0x6ED8,
-	5308:  0x6ED9,
-	5309:  0x6EDB,
-	5310:  0x6EDC,
-	5311:  0x6EDD,
-	5312:  0x6EE3,
-	5313:  0x6EE7,
-	5314:  0x6EEA,
-	5315:  0x6EEB,
-	5316:  0x6EEC,
-	5317:  0x6EED,
-	5318:  0x6EEE,
-	5319:  0x6EEF,
-	5320:  0x6EF0,
-	5321:  0x6EF1,
-	5322:  0x6EF2,
-	5323:  0x6EF3,
-	5324:  0x6EF5,
-	5325:  0x6EF6,
-	5326:  0x6EF7,
-	5327:  0x6EF8,
-	5328:  0x6EFA,
-	5329:  0x6EFB,
-	5330:  0x6EFC,
-	5331:  0x6EFD,
-	5332:  0x6EFE,
-	5333:  0x6EFF,
-	5334:  0x6F00,
-	5335:  0x6F01,
-	5336:  0x6F03,
-	5337:  0x6F04,
-	5338:  0x6F05,
-	5339:  0x6F07,
-	5340:  0x6F08,
-	5341:  0x6F0A,
-	5342:  0x6F0B,
-	5343:  0x6F0C,
-	5344:  0x6F0D,
-	5345:  0x6F0E,
-	5346:  0x6F10,
-	5347:  0x6F11,
-	5348:  0x6F12,
-	5349:  0x6F16,
-	5350:  0x6F17,
-	5351:  0x6F18,
-	5352:  0x6F19,
-	5353:  0x6F1A,
-	5354:  0x6F1B,
-	5355:  0x6F1C,
-	5356:  0x6F1D,
-	5357:  0x6F1E,
-	5358:  0x6F1F,
-	5359:  0x6F21,
-	5360:  0x6F22,
-	5361:  0x6F23,
-	5362:  0x6F25,
-	5363:  0x6F26,
-	5364:  0x6F27,
-	5365:  0x6F28,
-	5366:  0x6F2C,
-	5367:  0x6F2E,
-	5368:  0x6F30,
-	5369:  0x6F32,
-	5370:  0x6F34,
-	5371:  0x6F35,
-	5372:  0x6F37,
-	5373:  0x6F38,
-	5374:  0x6F39,
-	5375:  0x6F3A,
-	5376:  0x6F3B,
-	5377:  0x6F3C,
-	5378:  0x6F3D,
-	5379:  0x6F3F,
-	5380:  0x6F40,
-	5381:  0x6F41,
-	5382:  0x6F42,
-	5383:  0x6F43,
-	5384:  0x6F44,
-	5385:  0x6F45,
-	5386:  0x6F48,
-	5387:  0x6F49,
-	5388:  0x6F4A,
-	5389:  0x6F4C,
-	5390:  0x6F4E,
-	5391:  0x6F4F,
-	5392:  0x6F50,
-	5393:  0x6F51,
-	5394:  0x6F52,
-	5395:  0x6F53,
-	5396:  0x6F54,
-	5397:  0x6F55,
-	5398:  0x6F56,
-	5399:  0x6F57,
-	5400:  0x6F59,
-	5401:  0x6F5A,
-	5402:  0x6F5B,
-	5403:  0x6F5D,
-	5404:  0x6F5F,
-	5405:  0x6F60,
-	5406:  0x6F61,
-	5407:  0x6F63,
-	5408:  0x6F64,
-	5409:  0x6F65,
-	5410:  0x6F67,
-	5411:  0x6F68,
-	5412:  0x6F69,
-	5413:  0x6F6A,
-	5414:  0x6F6B,
-	5415:  0x6F6C,
-	5416:  0x6F6F,
-	5417:  0x6F70,
-	5418:  0x6F71,
-	5419:  0x6F73,
-	5420:  0x6F75,
-	5421:  0x6F76,
-	5422:  0x6F77,
-	5423:  0x6F79,
-	5424:  0x6F7B,
-	5425:  0x6F7D,
-	5426:  0x6F7E,
-	5427:  0x6F7F,
-	5428:  0x6F80,
-	5429:  0x6F81,
-	5430:  0x6F82,
-	5431:  0x6F83,
-	5432:  0x6F85,
-	5433:  0x6F86,
-	5434:  0x6F87,
-	5435:  0x6F8A,
-	5436:  0x6F8B,
-	5437:  0x6F8F,
-	5438:  0x6F90,
-	5439:  0x6F91,
-	5440:  0x6F92,
-	5441:  0x6F93,
-	5442:  0x6F94,
-	5443:  0x6F95,
-	5444:  0x6F96,
-	5445:  0x6F97,
-	5446:  0x6F98,
-	5447:  0x6F99,
-	5448:  0x6F9A,
-	5449:  0x6F9B,
-	5450:  0x6F9D,
-	5451:  0x6F9E,
-	5452:  0x6F9F,
-	5453:  0x6FA0,
-	5454:  0x6FA2,
-	5455:  0x6FA3,
-	5456:  0x6FA4,
-	5457:  0x6FA5,
-	5458:  0x6FA6,
-	5459:  0x6FA8,
-	5460:  0x6FA9,
-	5461:  0x6FAA,
-	5462:  0x6FAB,
-	5463:  0x6FAC,
-	5464:  0x6FAD,
-	5465:  0x6FAE,
-	5466:  0x6FAF,
-	5467:  0x6FB0,
-	5468:  0x6FB1,
-	5469:  0x6FB2,
-	5470:  0x6FB4,
-	5471:  0x6FB5,
-	5472:  0x6FB7,
-	5473:  0x6FB8,
-	5474:  0x6FBA,
-	5475:  0x6FBB,
-	5476:  0x6FBC,
-	5477:  0x6FBD,
-	5478:  0x6FBE,
-	5479:  0x6FBF,
-	5480:  0x6FC1,
-	5481:  0x6FC3,
-	5482:  0x6FC4,
-	5483:  0x6FC5,
-	5484:  0x6FC6,
-	5485:  0x6FC7,
-	5486:  0x6FC8,
-	5487:  0x6FCA,
-	5488:  0x6FCB,
-	5489:  0x6FCC,
-	5490:  0x6FCD,
-	5491:  0x6FCE,
-	5492:  0x6FCF,
-	5493:  0x6FD0,
-	5494:  0x6FD3,
-	5495:  0x6FD4,
-	5496:  0x6FD5,
-	5497:  0x6FD6,
-	5498:  0x6FD7,
-	5499:  0x6FD8,
-	5500:  0x6FD9,
-	5501:  0x6FDA,
-	5502:  0x6FDB,
-	5503:  0x6FDC,
-	5504:  0x6FDD,
-	5505:  0x6FDF,
-	5506:  0x6FE2,
-	5507:  0x6FE3,
-	5508:  0x6FE4,
-	5509:  0x6FE5,
-	5510:  0x6FE6,
-	5511:  0x6FE7,
-	5512:  0x6FE8,
-	5513:  0x6FE9,
-	5514:  0x6FEA,
-	5515:  0x6FEB,
-	5516:  0x6FEC,
-	5517:  0x6FED,
-	5518:  0x6FF0,
-	5519:  0x6FF1,
-	5520:  0x6FF2,
-	5521:  0x6FF3,
-	5522:  0x6FF4,
-	5523:  0x6FF5,
-	5524:  0x6FF6,
-	5525:  0x6FF7,
-	5526:  0x6FF8,
-	5527:  0x6FF9,
-	5528:  0x6FFA,
-	5529:  0x6FFB,
-	5530:  0x6FFC,
-	5531:  0x6FFD,
-	5532:  0x6FFE,
-	5533:  0x6FFF,
-	5534:  0x7000,
-	5535:  0x7001,
-	5536:  0x7002,
-	5537:  0x7003,
-	5538:  0x7004,
-	5539:  0x7005,
-	5540:  0x7006,
-	5541:  0x7007,
-	5542:  0x7008,
-	5543:  0x7009,
-	5544:  0x700A,
-	5545:  0x700B,
-	5546:  0x700C,
-	5547:  0x700D,
-	5548:  0x700E,
-	5549:  0x700F,
-	5550:  0x7010,
-	5551:  0x7012,
-	5552:  0x7013,
-	5553:  0x7014,
-	5554:  0x7015,
-	5555:  0x7016,
-	5556:  0x7017,
-	5557:  0x7018,
-	5558:  0x7019,
-	5559:  0x701C,
-	5560:  0x701D,
-	5561:  0x701E,
-	5562:  0x701F,
-	5563:  0x7020,
-	5564:  0x7021,
-	5565:  0x7022,
-	5566:  0x7024,
-	5567:  0x7025,
-	5568:  0x7026,
-	5569:  0x7027,
-	5570:  0x7028,
-	5571:  0x7029,
-	5572:  0x702A,
-	5573:  0x702B,
-	5574:  0x702C,
-	5575:  0x702D,
-	5576:  0x702E,
-	5577:  0x702F,
-	5578:  0x7030,
-	5579:  0x7031,
-	5580:  0x7032,
-	5581:  0x7033,
-	5582:  0x7034,
-	5583:  0x7036,
-	5584:  0x7037,
-	5585:  0x7038,
-	5586:  0x703A,
-	5587:  0x703B,
-	5588:  0x703C,
-	5589:  0x703D,
-	5590:  0x703E,
-	5591:  0x703F,
-	5592:  0x7040,
-	5593:  0x7041,
-	5594:  0x7042,
-	5595:  0x7043,
-	5596:  0x7044,
-	5597:  0x7045,
-	5598:  0x7046,
-	5599:  0x7047,
-	5600:  0x7048,
-	5601:  0x7049,
-	5602:  0x704A,
-	5603:  0x704B,
-	5604:  0x704D,
-	5605:  0x704E,
-	5606:  0x7050,
-	5607:  0x7051,
-	5608:  0x7052,
-	5609:  0x7053,
-	5610:  0x7054,
-	5611:  0x7055,
-	5612:  0x7056,
-	5613:  0x7057,
-	5614:  0x7058,
-	5615:  0x7059,
-	5616:  0x705A,
-	5617:  0x705B,
-	5618:  0x705C,
-	5619:  0x705D,
-	5620:  0x705F,
-	5621:  0x7060,
-	5622:  0x7061,
-	5623:  0x7062,
-	5624:  0x7063,
-	5625:  0x7064,
-	5626:  0x7065,
-	5627:  0x7066,
-	5628:  0x7067,
-	5629:  0x7068,
-	5630:  0x7069,
-	5631:  0x706A,
-	5632:  0x706E,
-	5633:  0x7071,
-	5634:  0x7072,
-	5635:  0x7073,
-	5636:  0x7074,
-	5637:  0x7077,
-	5638:  0x7079,
-	5639:  0x707A,
-	5640:  0x707B,
-	5641:  0x707D,
-	5642:  0x7081,
-	5643:  0x7082,
-	5644:  0x7083,
-	5645:  0x7084,
-	5646:  0x7086,
-	5647:  0x7087,
-	5648:  0x7088,
-	5649:  0x708B,
-	5650:  0x708C,
-	5651:  0x708D,
-	5652:  0x708F,
-	5653:  0x7090,
-	5654:  0x7091,
-	5655:  0x7093,
-	5656:  0x7097,
-	5657:  0x7098,
-	5658:  0x709A,
-	5659:  0x709B,
-	5660:  0x709E,
-	5661:  0x709F,
-	5662:  0x70A0,
-	5663:  0x70A1,
-	5664:  0x70A2,
-	5665:  0x70A3,
-	5666:  0x70A4,
-	5667:  0x70A5,
-	5668:  0x70A6,
-	5669:  0x70A7,
-	5670:  0x70A8,
-	5671:  0x70A9,
-	5672:  0x70AA,
-	5673:  0x70B0,
-	5674:  0x70B2,
-	5675:  0x70B4,
-	5676:  0x70B5,
-	5677:  0x70B6,
-	5678:  0x70BA,
-	5679:  0x70BE,
-	5680:  0x70BF,
-	5681:  0x70C4,
-	5682:  0x70C5,
-	5683:  0x70C6,
-	5684:  0x70C7,
-	5685:  0x70C9,
-	5686:  0x70CB,
-	5687:  0x70CC,
-	5688:  0x70CD,
-	5689:  0x70CE,
-	5690:  0x70CF,
-	5691:  0x70D0,
-	5692:  0x70D1,
-	5693:  0x70D2,
-	5694:  0x70D3,
-	5695:  0x70D4,
-	5696:  0x70D5,
-	5697:  0x70D6,
-	5698:  0x70D7,
-	5699:  0x70DA,
-	5700:  0x70DC,
-	5701:  0x70DD,
-	5702:  0x70DE,
-	5703:  0x70E0,
-	5704:  0x70E1,
-	5705:  0x70E2,
-	5706:  0x70E3,
-	5707:  0x70E5,
-	5708:  0x70EA,
-	5709:  0x70EE,
-	5710:  0x70F0,
-	5711:  0x70F1,
-	5712:  0x70F2,
-	5713:  0x70F3,
-	5714:  0x70F4,
-	5715:  0x70F5,
-	5716:  0x70F6,
-	5717:  0x70F8,
-	5718:  0x70FA,
-	5719:  0x70FB,
-	5720:  0x70FC,
-	5721:  0x70FE,
-	5722:  0x70FF,
-	5723:  0x7100,
-	5724:  0x7101,
-	5725:  0x7102,
-	5726:  0x7103,
-	5727:  0x7104,
-	5728:  0x7105,
-	5729:  0x7106,
-	5730:  0x7107,
-	5731:  0x7108,
-	5732:  0x710B,
-	5733:  0x710C,
-	5734:  0x710D,
-	5735:  0x710E,
-	5736:  0x710F,
-	5737:  0x7111,
-	5738:  0x7112,
-	5739:  0x7114,
-	5740:  0x7117,
-	5741:  0x711B,
-	5742:  0x711C,
-	5743:  0x711D,
-	5744:  0x711E,
-	5745:  0x711F,
-	5746:  0x7120,
-	5747:  0x7121,
-	5748:  0x7122,
-	5749:  0x7123,
-	5750:  0x7124,
-	5751:  0x7125,
-	5752:  0x7127,
-	5753:  0x7128,
-	5754:  0x7129,
-	5755:  0x712A,
-	5756:  0x712B,
-	5757:  0x712C,
-	5758:  0x712D,
-	5759:  0x712E,
-	5760:  0x7132,
-	5761:  0x7133,
-	5762:  0x7134,
-	5763:  0x7135,
-	5764:  0x7137,
-	5765:  0x7138,
-	5766:  0x7139,
-	5767:  0x713A,
-	5768:  0x713B,
-	5769:  0x713C,
-	5770:  0x713D,
-	5771:  0x713E,
-	5772:  0x713F,
-	5773:  0x7140,
-	5774:  0x7141,
-	5775:  0x7142,
-	5776:  0x7143,
-	5777:  0x7144,
-	5778:  0x7146,
-	5779:  0x7147,
-	5780:  0x7148,
-	5781:  0x7149,
-	5782:  0x714B,
-	5783:  0x714D,
-	5784:  0x714F,
-	5785:  0x7150,
-	5786:  0x7151,
-	5787:  0x7152,
-	5788:  0x7153,
-	5789:  0x7154,
-	5790:  0x7155,
-	5791:  0x7156,
-	5792:  0x7157,
-	5793:  0x7158,
-	5794:  0x7159,
-	5795:  0x715A,
-	5796:  0x715B,
-	5797:  0x715D,
-	5798:  0x715F,
-	5799:  0x7160,
-	5800:  0x7161,
-	5801:  0x7162,
-	5802:  0x7163,
-	5803:  0x7165,
-	5804:  0x7169,
-	5805:  0x716A,
-	5806:  0x716B,
-	5807:  0x716C,
-	5808:  0x716D,
-	5809:  0x716F,
-	5810:  0x7170,
-	5811:  0x7171,
-	5812:  0x7174,
-	5813:  0x7175,
-	5814:  0x7176,
-	5815:  0x7177,
-	5816:  0x7179,
-	5817:  0x717B,
-	5818:  0x717C,
-	5819:  0x717E,
-	5820:  0x717F,
-	5821:  0x7180,
-	5822:  0x7181,
-	5823:  0x7182,
-	5824:  0x7183,
-	5825:  0x7185,
-	5826:  0x7186,
-	5827:  0x7187,
-	5828:  0x7188,
-	5829:  0x7189,
-	5830:  0x718B,
-	5831:  0x718C,
-	5832:  0x718D,
-	5833:  0x718E,
-	5834:  0x7190,
-	5835:  0x7191,
-	5836:  0x7192,
-	5837:  0x7193,
-	5838:  0x7195,
-	5839:  0x7196,
-	5840:  0x7197,
-	5841:  0x719A,
-	5842:  0x719B,
-	5843:  0x719C,
-	5844:  0x719D,
-	5845:  0x719E,
-	5846:  0x71A1,
-	5847:  0x71A2,
-	5848:  0x71A3,
-	5849:  0x71A4,
-	5850:  0x71A5,
-	5851:  0x71A6,
-	5852:  0x71A7,
-	5853:  0x71A9,
-	5854:  0x71AA,
-	5855:  0x71AB,
-	5856:  0x71AD,
-	5857:  0x71AE,
-	5858:  0x71AF,
-	5859:  0x71B0,
-	5860:  0x71B1,
-	5861:  0x71B2,
-	5862:  0x71B4,
-	5863:  0x71B6,
-	5864:  0x71B7,
-	5865:  0x71B8,
-	5866:  0x71BA,
-	5867:  0x71BB,
-	5868:  0x71BC,
-	5869:  0x71BD,
-	5870:  0x71BE,
-	5871:  0x71BF,
-	5872:  0x71C0,
-	5873:  0x71C1,
-	5874:  0x71C2,
-	5875:  0x71C4,
-	5876:  0x71C5,
-	5877:  0x71C6,
-	5878:  0x71C7,
-	5879:  0x71C8,
-	5880:  0x71C9,
-	5881:  0x71CA,
-	5882:  0x71CB,
-	5883:  0x71CC,
-	5884:  0x71CD,
-	5885:  0x71CF,
-	5886:  0x71D0,
-	5887:  0x71D1,
-	5888:  0x71D2,
-	5889:  0x71D3,
-	5890:  0x71D6,
-	5891:  0x71D7,
-	5892:  0x71D8,
-	5893:  0x71D9,
-	5894:  0x71DA,
-	5895:  0x71DB,
-	5896:  0x71DC,
-	5897:  0x71DD,
-	5898:  0x71DE,
-	5899:  0x71DF,
-	5900:  0x71E1,
-	5901:  0x71E2,
-	5902:  0x71E3,
-	5903:  0x71E4,
-	5904:  0x71E6,
-	5905:  0x71E8,
-	5906:  0x71E9,
-	5907:  0x71EA,
-	5908:  0x71EB,
-	5909:  0x71EC,
-	5910:  0x71ED,
-	5911:  0x71EF,
-	5912:  0x71F0,
-	5913:  0x71F1,
-	5914:  0x71F2,
-	5915:  0x71F3,
-	5916:  0x71F4,
-	5917:  0x71F5,
-	5918:  0x71F6,
-	5919:  0x71F7,
-	5920:  0x71F8,
-	5921:  0x71FA,
-	5922:  0x71FB,
-	5923:  0x71FC,
-	5924:  0x71FD,
-	5925:  0x71FE,
-	5926:  0x71FF,
-	5927:  0x7200,
-	5928:  0x7201,
-	5929:  0x7202,
-	5930:  0x7203,
-	5931:  0x7204,
-	5932:  0x7205,
-	5933:  0x7207,
-	5934:  0x7208,
-	5935:  0x7209,
-	5936:  0x720A,
-	5937:  0x720B,
-	5938:  0x720C,
-	5939:  0x720D,
-	5940:  0x720E,
-	5941:  0x720F,
-	5942:  0x7210,
-	5943:  0x7211,
-	5944:  0x7212,
-	5945:  0x7213,
-	5946:  0x7214,
-	5947:  0x7215,
-	5948:  0x7216,
-	5949:  0x7217,
-	5950:  0x7218,
-	5951:  0x7219,
-	5952:  0x721A,
-	5953:  0x721B,
-	5954:  0x721C,
-	5955:  0x721E,
-	5956:  0x721F,
-	5957:  0x7220,
-	5958:  0x7221,
-	5959:  0x7222,
-	5960:  0x7223,
-	5961:  0x7224,
-	5962:  0x7225,
-	5963:  0x7226,
-	5964:  0x7227,
-	5965:  0x7229,
-	5966:  0x722B,
-	5967:  0x722D,
-	5968:  0x722E,
-	5969:  0x722F,
-	5970:  0x7232,
-	5971:  0x7233,
-	5972:  0x7234,
-	5973:  0x723A,
-	5974:  0x723C,
-	5975:  0x723E,
-	5976:  0x7240,
-	5977:  0x7241,
-	5978:  0x7242,
-	5979:  0x7243,
-	5980:  0x7244,
-	5981:  0x7245,
-	5982:  0x7246,
-	5983:  0x7249,
-	5984:  0x724A,
-	5985:  0x724B,
-	5986:  0x724E,
-	5987:  0x724F,
-	5988:  0x7250,
-	5989:  0x7251,
-	5990:  0x7253,
-	5991:  0x7254,
-	5992:  0x7255,
-	5993:  0x7257,
-	5994:  0x7258,
-	5995:  0x725A,
-	5996:  0x725C,
-	5997:  0x725E,
-	5998:  0x7260,
-	5999:  0x7263,
-	6000:  0x7264,
-	6001:  0x7265,
-	6002:  0x7268,
-	6003:  0x726A,
-	6004:  0x726B,
-	6005:  0x726C,
-	6006:  0x726D,
-	6007:  0x7270,
-	6008:  0x7271,
-	6009:  0x7273,
-	6010:  0x7274,
-	6011:  0x7276,
-	6012:  0x7277,
-	6013:  0x7278,
-	6014:  0x727B,
-	6015:  0x727C,
-	6016:  0x727D,
-	6017:  0x7282,
-	6018:  0x7283,
-	6019:  0x7285,
-	6020:  0x7286,
-	6021:  0x7287,
-	6022:  0x7288,
-	6023:  0x7289,
-	6024:  0x728C,
-	6025:  0x728E,
-	6026:  0x7290,
-	6027:  0x7291,
-	6028:  0x7293,
-	6029:  0x7294,
-	6030:  0x7295,
-	6031:  0x7296,
-	6032:  0x7297,
-	6033:  0x7298,
-	6034:  0x7299,
-	6035:  0x729A,
-	6036:  0x729B,
-	6037:  0x729C,
-	6038:  0x729D,
-	6039:  0x729E,
-	6040:  0x72A0,
-	6041:  0x72A1,
-	6042:  0x72A2,
-	6043:  0x72A3,
-	6044:  0x72A4,
-	6045:  0x72A5,
-	6046:  0x72A6,
-	6047:  0x72A7,
-	6048:  0x72A8,
-	6049:  0x72A9,
-	6050:  0x72AA,
-	6051:  0x72AB,
-	6052:  0x72AE,
-	6053:  0x72B1,
-	6054:  0x72B2,
-	6055:  0x72B3,
-	6056:  0x72B5,
-	6057:  0x72BA,
-	6058:  0x72BB,
-	6059:  0x72BC,
-	6060:  0x72BD,
-	6061:  0x72BE,
-	6062:  0x72BF,
-	6063:  0x72C0,
-	6064:  0x72C5,
-	6065:  0x72C6,
-	6066:  0x72C7,
-	6067:  0x72C9,
-	6068:  0x72CA,
-	6069:  0x72CB,
-	6070:  0x72CC,
-	6071:  0x72CF,
-	6072:  0x72D1,
-	6073:  0x72D3,
-	6074:  0x72D4,
-	6075:  0x72D5,
-	6076:  0x72D6,
-	6077:  0x72D8,
-	6078:  0x72DA,
-	6079:  0x72DB,
-	6176:  0x3000,
-	6177:  0x3001,
-	6178:  0x3002,
-	6179:  0x00B7,
-	6180:  0x02C9,
-	6181:  0x02C7,
-	6182:  0x00A8,
-	6183:  0x3003,
-	6184:  0x3005,
-	6185:  0x2014,
-	6186:  0xFF5E,
-	6187:  0x2016,
-	6188:  0x2026,
-	6189:  0x2018,
-	6190:  0x2019,
-	6191:  0x201C,
-	6192:  0x201D,
-	6193:  0x3014,
-	6194:  0x3015,
-	6195:  0x3008,
-	6196:  0x3009,
-	6197:  0x300A,
-	6198:  0x300B,
-	6199:  0x300C,
-	6200:  0x300D,
-	6201:  0x300E,
-	6202:  0x300F,
-	6203:  0x3016,
-	6204:  0x3017,
-	6205:  0x3010,
-	6206:  0x3011,
-	6207:  0x00B1,
-	6208:  0x00D7,
-	6209:  0x00F7,
-	6210:  0x2236,
-	6211:  0x2227,
-	6212:  0x2228,
-	6213:  0x2211,
-	6214:  0x220F,
-	6215:  0x222A,
-	6216:  0x2229,
-	6217:  0x2208,
-	6218:  0x2237,
-	6219:  0x221A,
-	6220:  0x22A5,
-	6221:  0x2225,
-	6222:  0x2220,
-	6223:  0x2312,
-	6224:  0x2299,
-	6225:  0x222B,
-	6226:  0x222E,
-	6227:  0x2261,
-	6228:  0x224C,
-	6229:  0x2248,
-	6230:  0x223D,
-	6231:  0x221D,
-	6232:  0x2260,
-	6233:  0x226E,
-	6234:  0x226F,
-	6235:  0x2264,
-	6236:  0x2265,
-	6237:  0x221E,
-	6238:  0x2235,
-	6239:  0x2234,
-	6240:  0x2642,
-	6241:  0x2640,
-	6242:  0x00B0,
-	6243:  0x2032,
-	6244:  0x2033,
-	6245:  0x2103,
-	6246:  0xFF04,
-	6247:  0x00A4,
-	6248:  0xFFE0,
-	6249:  0xFFE1,
-	6250:  0x2030,
-	6251:  0x00A7,
-	6252:  0x2116,
-	6253:  0x2606,
-	6254:  0x2605,
-	6255:  0x25CB,
-	6256:  0x25CF,
-	6257:  0x25CE,
-	6258:  0x25C7,
-	6259:  0x25C6,
-	6260:  0x25A1,
-	6261:  0x25A0,
-	6262:  0x25B3,
-	6263:  0x25B2,
-	6264:  0x203B,
-	6265:  0x2192,
-	6266:  0x2190,
-	6267:  0x2191,
-	6268:  0x2193,
-	6269:  0x3013,
-	6366:  0x2170,
-	6367:  0x2171,
-	6368:  0x2172,
-	6369:  0x2173,
-	6370:  0x2174,
-	6371:  0x2175,
-	6372:  0x2176,
-	6373:  0x2177,
-	6374:  0x2178,
-	6375:  0x2179,
-	6382:  0x2488,
-	6383:  0x2489,
-	6384:  0x248A,
-	6385:  0x248B,
-	6386:  0x248C,
-	6387:  0x248D,
-	6388:  0x248E,
-	6389:  0x248F,
-	6390:  0x2490,
-	6391:  0x2491,
-	6392:  0x2492,
-	6393:  0x2493,
-	6394:  0x2494,
-	6395:  0x2495,
-	6396:  0x2496,
-	6397:  0x2497,
-	6398:  0x2498,
-	6399:  0x2499,
-	6400:  0x249A,
-	6401:  0x249B,
-	6402:  0x2474,
-	6403:  0x2475,
-	6404:  0x2476,
-	6405:  0x2477,
-	6406:  0x2478,
-	6407:  0x2479,
-	6408:  0x247A,
-	6409:  0x247B,
-	6410:  0x247C,
-	6411:  0x247D,
-	6412:  0x247E,
-	6413:  0x247F,
-	6414:  0x2480,
-	6415:  0x2481,
-	6416:  0x2482,
-	6417:  0x2483,
-	6418:  0x2484,
-	6419:  0x2485,
-	6420:  0x2486,
-	6421:  0x2487,
-	6422:  0x2460,
-	6423:  0x2461,
-	6424:  0x2462,
-	6425:  0x2463,
-	6426:  0x2464,
-	6427:  0x2465,
-	6428:  0x2466,
-	6429:  0x2467,
-	6430:  0x2468,
-	6431:  0x2469,
-	6432:  0x20AC,
-	6434:  0x3220,
-	6435:  0x3221,
-	6436:  0x3222,
-	6437:  0x3223,
-	6438:  0x3224,
-	6439:  0x3225,
-	6440:  0x3226,
-	6441:  0x3227,
-	6442:  0x3228,
-	6443:  0x3229,
-	6446:  0x2160,
-	6447:  0x2161,
-	6448:  0x2162,
-	6449:  0x2163,
-	6450:  0x2164,
-	6451:  0x2165,
-	6452:  0x2166,
-	6453:  0x2167,
-	6454:  0x2168,
-	6455:  0x2169,
-	6456:  0x216A,
-	6457:  0x216B,
-	6555:  0x3000,
-	6556:  0xFF01,
-	6557:  0xFF02,
-	6558:  0xFF03,
-	6559:  0xFFE5,
-	6560:  0xFF05,
-	6561:  0xFF06,
-	6562:  0xFF07,
-	6563:  0xFF08,
-	6564:  0xFF09,
-	6565:  0xFF0A,
-	6566:  0xFF0B,
-	6567:  0xFF0C,
-	6568:  0xFF0D,
-	6569:  0xFF0E,
-	6570:  0xFF0F,
-	6571:  0xFF10,
-	6572:  0xFF11,
-	6573:  0xFF12,
-	6574:  0xFF13,
-	6575:  0xFF14,
-	6576:  0xFF15,
-	6577:  0xFF16,
-	6578:  0xFF17,
-	6579:  0xFF18,
-	6580:  0xFF19,
-	6581:  0xFF1A,
-	6582:  0xFF1B,
-	6583:  0xFF1C,
-	6584:  0xFF1D,
-	6585:  0xFF1E,
-	6586:  0xFF1F,
-	6587:  0xFF20,
-	6588:  0xFF21,
-	6589:  0xFF22,
-	6590:  0xFF23,
-	6591:  0xFF24,
-	6592:  0xFF25,
-	6593:  0xFF26,
-	6594:  0xFF27,
-	6595:  0xFF28,
-	6596:  0xFF29,
-	6597:  0xFF2A,
-	6598:  0xFF2B,
-	6599:  0xFF2C,
-	6600:  0xFF2D,
-	6601:  0xFF2E,
-	6602:  0xFF2F,
-	6603:  0xFF30,
-	6604:  0xFF31,
-	6605:  0xFF32,
-	6606:  0xFF33,
-	6607:  0xFF34,
-	6608:  0xFF35,
-	6609:  0xFF36,
-	6610:  0xFF37,
-	6611:  0xFF38,
-	6612:  0xFF39,
-	6613:  0xFF3A,
-	6614:  0xFF3B,
-	6615:  0xFF3C,
-	6616:  0xFF3D,
-	6617:  0xFF3E,
-	6618:  0xFF3F,
-	6619:  0xFF40,
-	6620:  0xFF41,
-	6621:  0xFF42,
-	6622:  0xFF43,
-	6623:  0xFF44,
-	6624:  0xFF45,
-	6625:  0xFF46,
-	6626:  0xFF47,
-	6627:  0xFF48,
-	6628:  0xFF49,
-	6629:  0xFF4A,
-	6630:  0xFF4B,
-	6631:  0xFF4C,
-	6632:  0xFF4D,
-	6633:  0xFF4E,
-	6634:  0xFF4F,
-	6635:  0xFF50,
-	6636:  0xFF51,
-	6637:  0xFF52,
-	6638:  0xFF53,
-	6639:  0xFF54,
-	6640:  0xFF55,
-	6641:  0xFF56,
-	6642:  0xFF57,
-	6643:  0xFF58,
-	6644:  0xFF59,
-	6645:  0xFF5A,
-	6646:  0xFF5B,
-	6647:  0xFF5C,
-	6648:  0xFF5D,
-	6649:  0xFFE3,
-	6746:  0x3041,
-	6747:  0x3042,
-	6748:  0x3043,
-	6749:  0x3044,
-	6750:  0x3045,
-	6751:  0x3046,
-	6752:  0x3047,
-	6753:  0x3048,
-	6754:  0x3049,
-	6755:  0x304A,
-	6756:  0x304B,
-	6757:  0x304C,
-	6758:  0x304D,
-	6759:  0x304E,
-	6760:  0x304F,
-	6761:  0x3050,
-	6762:  0x3051,
-	6763:  0x3052,
-	6764:  0x3053,
-	6765:  0x3054,
-	6766:  0x3055,
-	6767:  0x3056,
-	6768:  0x3057,
-	6769:  0x3058,
-	6770:  0x3059,
-	6771:  0x305A,
-	6772:  0x305B,
-	6773:  0x305C,
-	6774:  0x305D,
-	6775:  0x305E,
-	6776:  0x305F,
-	6777:  0x3060,
-	6778:  0x3061,
-	6779:  0x3062,
-	6780:  0x3063,
-	6781:  0x3064,
-	6782:  0x3065,
-	6783:  0x3066,
-	6784:  0x3067,
-	6785:  0x3068,
-	6786:  0x3069,
-	6787:  0x306A,
-	6788:  0x306B,
-	6789:  0x306C,
-	6790:  0x306D,
-	6791:  0x306E,
-	6792:  0x306F,
-	6793:  0x3070,
-	6794:  0x3071,
-	6795:  0x3072,
-	6796:  0x3073,
-	6797:  0x3074,
-	6798:  0x3075,
-	6799:  0x3076,
-	6800:  0x3077,
-	6801:  0x3078,
-	6802:  0x3079,
-	6803:  0x307A,
-	6804:  0x307B,
-	6805:  0x307C,
-	6806:  0x307D,
-	6807:  0x307E,
-	6808:  0x307F,
-	6809:  0x3080,
-	6810:  0x3081,
-	6811:  0x3082,
-	6812:  0x3083,
-	6813:  0x3084,
-	6814:  0x3085,
-	6815:  0x3086,
-	6816:  0x3087,
-	6817:  0x3088,
-	6818:  0x3089,
-	6819:  0x308A,
-	6820:  0x308B,
-	6821:  0x308C,
-	6822:  0x308D,
-	6823:  0x308E,
-	6824:  0x308F,
-	6825:  0x3090,
-	6826:  0x3091,
-	6827:  0x3092,
-	6828:  0x3093,
-	6936:  0x30A1,
-	6937:  0x30A2,
-	6938:  0x30A3,
-	6939:  0x30A4,
-	6940:  0x30A5,
-	6941:  0x30A6,
-	6942:  0x30A7,
-	6943:  0x30A8,
-	6944:  0x30A9,
-	6945:  0x30AA,
-	6946:  0x30AB,
-	6947:  0x30AC,
-	6948:  0x30AD,
-	6949:  0x30AE,
-	6950:  0x30AF,
-	6951:  0x30B0,
-	6952:  0x30B1,
-	6953:  0x30B2,
-	6954:  0x30B3,
-	6955:  0x30B4,
-	6956:  0x30B5,
-	6957:  0x30B6,
-	6958:  0x30B7,
-	6959:  0x30B8,
-	6960:  0x30B9,
-	6961:  0x30BA,
-	6962:  0x30BB,
-	6963:  0x30BC,
-	6964:  0x30BD,
-	6965:  0x30BE,
-	6966:  0x30BF,
-	6967:  0x30C0,
-	6968:  0x30C1,
-	6969:  0x30C2,
-	6970:  0x30C3,
-	6971:  0x30C4,
-	6972:  0x30C5,
-	6973:  0x30C6,
-	6974:  0x30C7,
-	6975:  0x30C8,
-	6976:  0x30C9,
-	6977:  0x30CA,
-	6978:  0x30CB,
-	6979:  0x30CC,
-	6980:  0x30CD,
-	6981:  0x30CE,
-	6982:  0x30CF,
-	6983:  0x30D0,
-	6984:  0x30D1,
-	6985:  0x30D2,
-	6986:  0x30D3,
-	6987:  0x30D4,
-	6988:  0x30D5,
-	6989:  0x30D6,
-	6990:  0x30D7,
-	6991:  0x30D8,
-	6992:  0x30D9,
-	6993:  0x30DA,
-	6994:  0x30DB,
-	6995:  0x30DC,
-	6996:  0x30DD,
-	6997:  0x30DE,
-	6998:  0x30DF,
-	6999:  0x30E0,
-	7000:  0x30E1,
-	7001:  0x30E2,
-	7002:  0x30E3,
-	7003:  0x30E4,
-	7004:  0x30E5,
-	7005:  0x30E6,
-	7006:  0x30E7,
-	7007:  0x30E8,
-	7008:  0x30E9,
-	7009:  0x30EA,
-	7010:  0x30EB,
-	7011:  0x30EC,
-	7012:  0x30ED,
-	7013:  0x30EE,
-	7014:  0x30EF,
-	7015:  0x30F0,
-	7016:  0x30F1,
-	7017:  0x30F2,
-	7018:  0x30F3,
-	7019:  0x30F4,
-	7020:  0x30F5,
-	7021:  0x30F6,
-	7126:  0x0391,
-	7127:  0x0392,
-	7128:  0x0393,
-	7129:  0x0394,
-	7130:  0x0395,
-	7131:  0x0396,
-	7132:  0x0397,
-	7133:  0x0398,
-	7134:  0x0399,
-	7135:  0x039A,
-	7136:  0x039B,
-	7137:  0x039C,
-	7138:  0x039D,
-	7139:  0x039E,
-	7140:  0x039F,
-	7141:  0x03A0,
-	7142:  0x03A1,
-	7143:  0x03A3,
-	7144:  0x03A4,
-	7145:  0x03A5,
-	7146:  0x03A6,
-	7147:  0x03A7,
-	7148:  0x03A8,
-	7149:  0x03A9,
-	7158:  0x03B1,
-	7159:  0x03B2,
-	7160:  0x03B3,
-	7161:  0x03B4,
-	7162:  0x03B5,
-	7163:  0x03B6,
-	7164:  0x03B7,
-	7165:  0x03B8,
-	7166:  0x03B9,
-	7167:  0x03BA,
-	7168:  0x03BB,
-	7169:  0x03BC,
-	7170:  0x03BD,
-	7171:  0x03BE,
-	7172:  0x03BF,
-	7173:  0x03C0,
-	7174:  0x03C1,
-	7175:  0x03C3,
-	7176:  0x03C4,
-	7177:  0x03C5,
-	7178:  0x03C6,
-	7179:  0x03C7,
-	7180:  0x03C8,
-	7181:  0x03C9,
-	7189:  0xFE35,
-	7190:  0xFE36,
-	7191:  0xFE39,
-	7192:  0xFE3A,
-	7193:  0xFE3F,
-	7194:  0xFE40,
-	7195:  0xFE3D,
-	7196:  0xFE3E,
-	7197:  0xFE41,
-	7198:  0xFE42,
-	7199:  0xFE43,
-	7200:  0xFE44,
-	7203:  0xFE3B,
-	7204:  0xFE3C,
-	7205:  0xFE37,
-	7206:  0xFE38,
-	7207:  0xFE31,
-	7209:  0xFE33,
-	7210:  0xFE34,
-	7316:  0x0410,
-	7317:  0x0411,
-	7318:  0x0412,
-	7319:  0x0413,
-	7320:  0x0414,
-	7321:  0x0415,
-	7322:  0x0401,
-	7323:  0x0416,
-	7324:  0x0417,
-	7325:  0x0418,
-	7326:  0x0419,
-	7327:  0x041A,
-	7328:  0x041B,
-	7329:  0x041C,
-	7330:  0x041D,
-	7331:  0x041E,
-	7332:  0x041F,
-	7333:  0x0420,
-	7334:  0x0421,
-	7335:  0x0422,
-	7336:  0x0423,
-	7337:  0x0424,
-	7338:  0x0425,
-	7339:  0x0426,
-	7340:  0x0427,
-	7341:  0x0428,
-	7342:  0x0429,
-	7343:  0x042A,
-	7344:  0x042B,
-	7345:  0x042C,
-	7346:  0x042D,
-	7347:  0x042E,
-	7348:  0x042F,
-	7364:  0x0430,
-	7365:  0x0431,
-	7366:  0x0432,
-	7367:  0x0433,
-	7368:  0x0434,
-	7369:  0x0435,
-	7370:  0x0451,
-	7371:  0x0436,
-	7372:  0x0437,
-	7373:  0x0438,
-	7374:  0x0439,
-	7375:  0x043A,
-	7376:  0x043B,
-	7377:  0x043C,
-	7378:  0x043D,
-	7379:  0x043E,
-	7380:  0x043F,
-	7381:  0x0440,
-	7382:  0x0441,
-	7383:  0x0442,
-	7384:  0x0443,
-	7385:  0x0444,
-	7386:  0x0445,
-	7387:  0x0446,
-	7388:  0x0447,
-	7389:  0x0448,
-	7390:  0x0449,
-	7391:  0x044A,
-	7392:  0x044B,
-	7393:  0x044C,
-	7394:  0x044D,
-	7395:  0x044E,
-	7396:  0x044F,
-	7410:  0x02CA,
-	7411:  0x02CB,
-	7412:  0x02D9,
-	7413:  0x2013,
-	7414:  0x2015,
-	7415:  0x2025,
-	7416:  0x2035,
-	7417:  0x2105,
-	7418:  0x2109,
-	7419:  0x2196,
-	7420:  0x2197,
-	7421:  0x2198,
-	7422:  0x2199,
-	7423:  0x2215,
-	7424:  0x221F,
-	7425:  0x2223,
-	7426:  0x2252,
-	7427:  0x2266,
-	7428:  0x2267,
-	7429:  0x22BF,
-	7430:  0x2550,
-	7431:  0x2551,
-	7432:  0x2552,
-	7433:  0x2553,
-	7434:  0x2554,
-	7435:  0x2555,
-	7436:  0x2556,
-	7437:  0x2557,
-	7438:  0x2558,
-	7439:  0x2559,
-	7440:  0x255A,
-	7441:  0x255B,
-	7442:  0x255C,
-	7443:  0x255D,
-	7444:  0x255E,
-	7445:  0x255F,
-	7446:  0x2560,
-	7447:  0x2561,
-	7448:  0x2562,
-	7449:  0x2563,
-	7450:  0x2564,
-	7451:  0x2565,
-	7452:  0x2566,
-	7453:  0x2567,
-	7454:  0x2568,
-	7455:  0x2569,
-	7456:  0x256A,
-	7457:  0x256B,
-	7458:  0x256C,
-	7459:  0x256D,
-	7460:  0x256E,
-	7461:  0x256F,
-	7462:  0x2570,
-	7463:  0x2571,
-	7464:  0x2572,
-	7465:  0x2573,
-	7466:  0x2581,
-	7467:  0x2582,
-	7468:  0x2583,
-	7469:  0x2584,
-	7470:  0x2585,
-	7471:  0x2586,
-	7472:  0x2587,
-	7473:  0x2588,
-	7474:  0x2589,
-	7475:  0x258A,
-	7476:  0x258B,
-	7477:  0x258C,
-	7478:  0x258D,
-	7479:  0x258E,
-	7480:  0x258F,
-	7481:  0x2593,
-	7482:  0x2594,
-	7483:  0x2595,
-	7484:  0x25BC,
-	7485:  0x25BD,
-	7486:  0x25E2,
-	7487:  0x25E3,
-	7488:  0x25E4,
-	7489:  0x25E5,
-	7490:  0x2609,
-	7491:  0x2295,
-	7492:  0x3012,
-	7493:  0x301D,
-	7494:  0x301E,
-	7506:  0x0101,
-	7507:  0x00E1,
-	7508:  0x01CE,
-	7509:  0x00E0,
-	7510:  0x0113,
-	7511:  0x00E9,
-	7512:  0x011B,
-	7513:  0x00E8,
-	7514:  0x012B,
-	7515:  0x00ED,
-	7516:  0x01D0,
-	7517:  0x00EC,
-	7518:  0x014D,
-	7519:  0x00F3,
-	7520:  0x01D2,
-	7521:  0x00F2,
-	7522:  0x016B,
-	7523:  0x00FA,
-	7524:  0x01D4,
-	7525:  0x00F9,
-	7526:  0x01D6,
-	7527:  0x01D8,
-	7528:  0x01DA,
-	7529:  0x01DC,
-	7530:  0x00FC,
-	7531:  0x00EA,
-	7532:  0x0251,
-	7534:  0x0144,
-	7535:  0x0148,
-	7536:  0x01F9,
-	7537:  0x0261,
-	7542:  0x3105,
-	7543:  0x3106,
-	7544:  0x3107,
-	7545:  0x3108,
-	7546:  0x3109,
-	7547:  0x310A,
-	7548:  0x310B,
-	7549:  0x310C,
-	7550:  0x310D,
-	7551:  0x310E,
-	7552:  0x310F,
-	7553:  0x3110,
-	7554:  0x3111,
-	7555:  0x3112,
-	7556:  0x3113,
-	7557:  0x3114,
-	7558:  0x3115,
-	7559:  0x3116,
-	7560:  0x3117,
-	7561:  0x3118,
-	7562:  0x3119,
-	7563:  0x311A,
-	7564:  0x311B,
-	7565:  0x311C,
-	7566:  0x311D,
-	7567:  0x311E,
-	7568:  0x311F,
-	7569:  0x3120,
-	7570:  0x3121,
-	7571:  0x3122,
-	7572:  0x3123,
-	7573:  0x3124,
-	7574:  0x3125,
-	7575:  0x3126,
-	7576:  0x3127,
-	7577:  0x3128,
-	7578:  0x3129,
-	7600:  0x3021,
-	7601:  0x3022,
-	7602:  0x3023,
-	7603:  0x3024,
-	7604:  0x3025,
-	7605:  0x3026,
-	7606:  0x3027,
-	7607:  0x3028,
-	7608:  0x3029,
-	7609:  0x32A3,
-	7610:  0x338E,
-	7611:  0x338F,
-	7612:  0x339C,
-	7613:  0x339D,
-	7614:  0x339E,
-	7615:  0x33A1,
-	7616:  0x33C4,
-	7617:  0x33CE,
-	7618:  0x33D1,
-	7619:  0x33D2,
-	7620:  0x33D5,
-	7621:  0xFE30,
-	7622:  0xFFE2,
-	7623:  0xFFE4,
-	7625:  0x2121,
-	7626:  0x3231,
-	7628:  0x2010,
-	7632:  0x30FC,
-	7633:  0x309B,
-	7634:  0x309C,
-	7635:  0x30FD,
-	7636:  0x30FE,
-	7637:  0x3006,
-	7638:  0x309D,
-	7639:  0x309E,
-	7640:  0xFE49,
-	7641:  0xFE4A,
-	7642:  0xFE4B,
-	7643:  0xFE4C,
-	7644:  0xFE4D,
-	7645:  0xFE4E,
-	7646:  0xFE4F,
-	7647:  0xFE50,
-	7648:  0xFE51,
-	7649:  0xFE52,
-	7650:  0xFE54,
-	7651:  0xFE55,
-	7652:  0xFE56,
-	7653:  0xFE57,
-	7654:  0xFE59,
-	7655:  0xFE5A,
-	7656:  0xFE5B,
-	7657:  0xFE5C,
-	7658:  0xFE5D,
-	7659:  0xFE5E,
-	7660:  0xFE5F,
-	7661:  0xFE60,
-	7662:  0xFE61,
-	7663:  0xFE62,
-	7664:  0xFE63,
-	7665:  0xFE64,
-	7666:  0xFE65,
-	7667:  0xFE66,
-	7668:  0xFE68,
-	7669:  0xFE69,
-	7670:  0xFE6A,
-	7671:  0xFE6B,
-	7672:  0x303E,
-	7673:  0x2FF0,
-	7674:  0x2FF1,
-	7675:  0x2FF2,
-	7676:  0x2FF3,
-	7677:  0x2FF4,
-	7678:  0x2FF5,
-	7679:  0x2FF6,
-	7680:  0x2FF7,
-	7681:  0x2FF8,
-	7682:  0x2FF9,
-	7683:  0x2FFA,
-	7684:  0x2FFB,
-	7685:  0x3007,
-	7699:  0x2500,
-	7700:  0x2501,
-	7701:  0x2502,
-	7702:  0x2503,
-	7703:  0x2504,
-	7704:  0x2505,
-	7705:  0x2506,
-	7706:  0x2507,
-	7707:  0x2508,
-	7708:  0x2509,
-	7709:  0x250A,
-	7710:  0x250B,
-	7711:  0x250C,
-	7712:  0x250D,
-	7713:  0x250E,
-	7714:  0x250F,
-	7715:  0x2510,
-	7716:  0x2511,
-	7717:  0x2512,
-	7718:  0x2513,
-	7719:  0x2514,
-	7720:  0x2515,
-	7721:  0x2516,
-	7722:  0x2517,
-	7723:  0x2518,
-	7724:  0x2519,
-	7725:  0x251A,
-	7726:  0x251B,
-	7727:  0x251C,
-	7728:  0x251D,
-	7729:  0x251E,
-	7730:  0x251F,
-	7731:  0x2520,
-	7732:  0x2521,
-	7733:  0x2522,
-	7734:  0x2523,
-	7735:  0x2524,
-	7736:  0x2525,
-	7737:  0x2526,
-	7738:  0x2527,
-	7739:  0x2528,
-	7740:  0x2529,
-	7741:  0x252A,
-	7742:  0x252B,
-	7743:  0x252C,
-	7744:  0x252D,
-	7745:  0x252E,
-	7746:  0x252F,
-	7747:  0x2530,
-	7748:  0x2531,
-	7749:  0x2532,
-	7750:  0x2533,
-	7751:  0x2534,
-	7752:  0x2535,
-	7753:  0x2536,
-	7754:  0x2537,
-	7755:  0x2538,
-	7756:  0x2539,
-	7757:  0x253A,
-	7758:  0x253B,
-	7759:  0x253C,
-	7760:  0x253D,
-	7761:  0x253E,
-	7762:  0x253F,
-	7763:  0x2540,
-	7764:  0x2541,
-	7765:  0x2542,
-	7766:  0x2543,
-	7767:  0x2544,
-	7768:  0x2545,
-	7769:  0x2546,
-	7770:  0x2547,
-	7771:  0x2548,
-	7772:  0x2549,
-	7773:  0x254A,
-	7774:  0x254B,
-	7790:  0x72DC,
-	7791:  0x72DD,
-	7792:  0x72DF,
-	7793:  0x72E2,
-	7794:  0x72E3,
-	7795:  0x72E4,
-	7796:  0x72E5,
-	7797:  0x72E6,
-	7798:  0x72E7,
-	7799:  0x72EA,
-	7800:  0x72EB,
-	7801:  0x72F5,
-	7802:  0x72F6,
-	7803:  0x72F9,
-	7804:  0x72FD,
-	7805:  0x72FE,
-	7806:  0x72FF,
-	7807:  0x7300,
-	7808:  0x7302,
-	7809:  0x7304,
-	7810:  0x7305,
-	7811:  0x7306,
-	7812:  0x7307,
-	7813:  0x7308,
-	7814:  0x7309,
-	7815:  0x730B,
-	7816:  0x730C,
-	7817:  0x730D,
-	7818:  0x730F,
-	7819:  0x7310,
-	7820:  0x7311,
-	7821:  0x7312,
-	7822:  0x7314,
-	7823:  0x7318,
-	7824:  0x7319,
-	7825:  0x731A,
-	7826:  0x731F,
-	7827:  0x7320,
-	7828:  0x7323,
-	7829:  0x7324,
-	7830:  0x7326,
-	7831:  0x7327,
-	7832:  0x7328,
-	7833:  0x732D,
-	7834:  0x732F,
-	7835:  0x7330,
-	7836:  0x7332,
-	7837:  0x7333,
-	7838:  0x7335,
-	7839:  0x7336,
-	7840:  0x733A,
-	7841:  0x733B,
-	7842:  0x733C,
-	7843:  0x733D,
-	7844:  0x7340,
-	7845:  0x7341,
-	7846:  0x7342,
-	7847:  0x7343,
-	7848:  0x7344,
-	7849:  0x7345,
-	7850:  0x7346,
-	7851:  0x7347,
-	7852:  0x7348,
-	7853:  0x7349,
-	7854:  0x734A,
-	7855:  0x734B,
-	7856:  0x734C,
-	7857:  0x734E,
-	7858:  0x734F,
-	7859:  0x7351,
-	7860:  0x7353,
-	7861:  0x7354,
-	7862:  0x7355,
-	7863:  0x7356,
-	7864:  0x7358,
-	7865:  0x7359,
-	7866:  0x735A,
-	7867:  0x735B,
-	7868:  0x735C,
-	7869:  0x735D,
-	7870:  0x735E,
-	7871:  0x735F,
-	7872:  0x7361,
-	7873:  0x7362,
-	7874:  0x7363,
-	7875:  0x7364,
-	7876:  0x7365,
-	7877:  0x7366,
-	7878:  0x7367,
-	7879:  0x7368,
-	7880:  0x7369,
-	7881:  0x736A,
-	7882:  0x736B,
-	7883:  0x736E,
-	7884:  0x7370,
-	7885:  0x7371,
-	7980:  0x7372,
-	7981:  0x7373,
-	7982:  0x7374,
-	7983:  0x7375,
-	7984:  0x7376,
-	7985:  0x7377,
-	7986:  0x7378,
-	7987:  0x7379,
-	7988:  0x737A,
-	7989:  0x737B,
-	7990:  0x737C,
-	7991:  0x737D,
-	7992:  0x737F,
-	7993:  0x7380,
-	7994:  0x7381,
-	7995:  0x7382,
-	7996:  0x7383,
-	7997:  0x7385,
-	7998:  0x7386,
-	7999:  0x7388,
-	8000:  0x738A,
-	8001:  0x738C,
-	8002:  0x738D,
-	8003:  0x738F,
-	8004:  0x7390,
-	8005:  0x7392,
-	8006:  0x7393,
-	8007:  0x7394,
-	8008:  0x7395,
-	8009:  0x7397,
-	8010:  0x7398,
-	8011:  0x7399,
-	8012:  0x739A,
-	8013:  0x739C,
-	8014:  0x739D,
-	8015:  0x739E,
-	8016:  0x73A0,
-	8017:  0x73A1,
-	8018:  0x73A3,
-	8019:  0x73A4,
-	8020:  0x73A5,
-	8021:  0x73A6,
-	8022:  0x73A7,
-	8023:  0x73A8,
-	8024:  0x73AA,
-	8025:  0x73AC,
-	8026:  0x73AD,
-	8027:  0x73B1,
-	8028:  0x73B4,
-	8029:  0x73B5,
-	8030:  0x73B6,
-	8031:  0x73B8,
-	8032:  0x73B9,
-	8033:  0x73BC,
-	8034:  0x73BD,
-	8035:  0x73BE,
-	8036:  0x73BF,
-	8037:  0x73C1,
-	8038:  0x73C3,
-	8039:  0x73C4,
-	8040:  0x73C5,
-	8041:  0x73C6,
-	8042:  0x73C7,
-	8043:  0x73CB,
-	8044:  0x73CC,
-	8045:  0x73CE,
-	8046:  0x73D2,
-	8047:  0x73D3,
-	8048:  0x73D4,
-	8049:  0x73D5,
-	8050:  0x73D6,
-	8051:  0x73D7,
-	8052:  0x73D8,
-	8053:  0x73DA,
-	8054:  0x73DB,
-	8055:  0x73DC,
-	8056:  0x73DD,
-	8057:  0x73DF,
-	8058:  0x73E1,
-	8059:  0x73E2,
-	8060:  0x73E3,
-	8061:  0x73E4,
-	8062:  0x73E6,
-	8063:  0x73E8,
-	8064:  0x73EA,
-	8065:  0x73EB,
-	8066:  0x73EC,
-	8067:  0x73EE,
-	8068:  0x73EF,
-	8069:  0x73F0,
-	8070:  0x73F1,
-	8071:  0x73F3,
-	8072:  0x73F4,
-	8073:  0x73F5,
-	8074:  0x73F6,
-	8075:  0x73F7,
-	8170:  0x73F8,
-	8171:  0x73F9,
-	8172:  0x73FA,
-	8173:  0x73FB,
-	8174:  0x73FC,
-	8175:  0x73FD,
-	8176:  0x73FE,
-	8177:  0x73FF,
-	8178:  0x7400,
-	8179:  0x7401,
-	8180:  0x7402,
-	8181:  0x7404,
-	8182:  0x7407,
-	8183:  0x7408,
-	8184:  0x740B,
-	8185:  0x740C,
-	8186:  0x740D,
-	8187:  0x740E,
-	8188:  0x7411,
-	8189:  0x7412,
-	8190:  0x7413,
-	8191:  0x7414,
-	8192:  0x7415,
-	8193:  0x7416,
-	8194:  0x7417,
-	8195:  0x7418,
-	8196:  0x7419,
-	8197:  0x741C,
-	8198:  0x741D,
-	8199:  0x741E,
-	8200:  0x741F,
-	8201:  0x7420,
-	8202:  0x7421,
-	8203:  0x7423,
-	8204:  0x7424,
-	8205:  0x7427,
-	8206:  0x7429,
-	8207:  0x742B,
-	8208:  0x742D,
-	8209:  0x742F,
-	8210:  0x7431,
-	8211:  0x7432,
-	8212:  0x7437,
-	8213:  0x7438,
-	8214:  0x7439,
-	8215:  0x743A,
-	8216:  0x743B,
-	8217:  0x743D,
-	8218:  0x743E,
-	8219:  0x743F,
-	8220:  0x7440,
-	8221:  0x7442,
-	8222:  0x7443,
-	8223:  0x7444,
-	8224:  0x7445,
-	8225:  0x7446,
-	8226:  0x7447,
-	8227:  0x7448,
-	8228:  0x7449,
-	8229:  0x744A,
-	8230:  0x744B,
-	8231:  0x744C,
-	8232:  0x744D,
-	8233:  0x744E,
-	8234:  0x744F,
-	8235:  0x7450,
-	8236:  0x7451,
-	8237:  0x7452,
-	8238:  0x7453,
-	8239:  0x7454,
-	8240:  0x7456,
-	8241:  0x7458,
-	8242:  0x745D,
-	8243:  0x7460,
-	8244:  0x7461,
-	8245:  0x7462,
-	8246:  0x7463,
-	8247:  0x7464,
-	8248:  0x7465,
-	8249:  0x7466,
-	8250:  0x7467,
-	8251:  0x7468,
-	8252:  0x7469,
-	8253:  0x746A,
-	8254:  0x746B,
-	8255:  0x746C,
-	8256:  0x746E,
-	8257:  0x746F,
-	8258:  0x7471,
-	8259:  0x7472,
-	8260:  0x7473,
-	8261:  0x7474,
-	8262:  0x7475,
-	8263:  0x7478,
-	8264:  0x7479,
-	8265:  0x747A,
-	8360:  0x747B,
-	8361:  0x747C,
-	8362:  0x747D,
-	8363:  0x747F,
-	8364:  0x7482,
-	8365:  0x7484,
-	8366:  0x7485,
-	8367:  0x7486,
-	8368:  0x7488,
-	8369:  0x7489,
-	8370:  0x748A,
-	8371:  0x748C,
-	8372:  0x748D,
-	8373:  0x748F,
-	8374:  0x7491,
-	8375:  0x7492,
-	8376:  0x7493,
-	8377:  0x7494,
-	8378:  0x7495,
-	8379:  0x7496,
-	8380:  0x7497,
-	8381:  0x7498,
-	8382:  0x7499,
-	8383:  0x749A,
-	8384:  0x749B,
-	8385:  0x749D,
-	8386:  0x749F,
-	8387:  0x74A0,
-	8388:  0x74A1,
-	8389:  0x74A2,
-	8390:  0x74A3,
-	8391:  0x74A4,
-	8392:  0x74A5,
-	8393:  0x74A6,
-	8394:  0x74AA,
-	8395:  0x74AB,
-	8396:  0x74AC,
-	8397:  0x74AD,
-	8398:  0x74AE,
-	8399:  0x74AF,
-	8400:  0x74B0,
-	8401:  0x74B1,
-	8402:  0x74B2,
-	8403:  0x74B3,
-	8404:  0x74B4,
-	8405:  0x74B5,
-	8406:  0x74B6,
-	8407:  0x74B7,
-	8408:  0x74B8,
-	8409:  0x74B9,
-	8410:  0x74BB,
-	8411:  0x74BC,
-	8412:  0x74BD,
-	8413:  0x74BE,
-	8414:  0x74BF,
-	8415:  0x74C0,
-	8416:  0x74C1,
-	8417:  0x74C2,
-	8418:  0x74C3,
-	8419:  0x74C4,
-	8420:  0x74C5,
-	8421:  0x74C6,
-	8422:  0x74C7,
-	8423:  0x74C8,
-	8424:  0x74C9,
-	8425:  0x74CA,
-	8426:  0x74CB,
-	8427:  0x74CC,
-	8428:  0x74CD,
-	8429:  0x74CE,
-	8430:  0x74CF,
-	8431:  0x74D0,
-	8432:  0x74D1,
-	8433:  0x74D3,
-	8434:  0x74D4,
-	8435:  0x74D5,
-	8436:  0x74D6,
-	8437:  0x74D7,
-	8438:  0x74D8,
-	8439:  0x74D9,
-	8440:  0x74DA,
-	8441:  0x74DB,
-	8442:  0x74DD,
-	8443:  0x74DF,
-	8444:  0x74E1,
-	8445:  0x74E5,
-	8446:  0x74E7,
-	8447:  0x74E8,
-	8448:  0x74E9,
-	8449:  0x74EA,
-	8450:  0x74EB,
-	8451:  0x74EC,
-	8452:  0x74ED,
-	8453:  0x74F0,
-	8454:  0x74F1,
-	8455:  0x74F2,
-	8550:  0x74F3,
-	8551:  0x74F5,
-	8552:  0x74F8,
-	8553:  0x74F9,
-	8554:  0x74FA,
-	8555:  0x74FB,
-	8556:  0x74FC,
-	8557:  0x74FD,
-	8558:  0x74FE,
-	8559:  0x7500,
-	8560:  0x7501,
-	8561:  0x7502,
-	8562:  0x7503,
-	8563:  0x7505,
-	8564:  0x7506,
-	8565:  0x7507,
-	8566:  0x7508,
-	8567:  0x7509,
-	8568:  0x750A,
-	8569:  0x750B,
-	8570:  0x750C,
-	8571:  0x750E,
-	8572:  0x7510,
-	8573:  0x7512,
-	8574:  0x7514,
-	8575:  0x7515,
-	8576:  0x7516,
-	8577:  0x7517,
-	8578:  0x751B,
-	8579:  0x751D,
-	8580:  0x751E,
-	8581:  0x7520,
-	8582:  0x7521,
-	8583:  0x7522,
-	8584:  0x7523,
-	8585:  0x7524,
-	8586:  0x7526,
-	8587:  0x7527,
-	8588:  0x752A,
-	8589:  0x752E,
-	8590:  0x7534,
-	8591:  0x7536,
-	8592:  0x7539,
-	8593:  0x753C,
-	8594:  0x753D,
-	8595:  0x753F,
-	8596:  0x7541,
-	8597:  0x7542,
-	8598:  0x7543,
-	8599:  0x7544,
-	8600:  0x7546,
-	8601:  0x7547,
-	8602:  0x7549,
-	8603:  0x754A,
-	8604:  0x754D,
-	8605:  0x7550,
-	8606:  0x7551,
-	8607:  0x7552,
-	8608:  0x7553,
-	8609:  0x7555,
-	8610:  0x7556,
-	8611:  0x7557,
-	8612:  0x7558,
-	8613:  0x755D,
-	8614:  0x755E,
-	8615:  0x755F,
-	8616:  0x7560,
-	8617:  0x7561,
-	8618:  0x7562,
-	8619:  0x7563,
-	8620:  0x7564,
-	8621:  0x7567,
-	8622:  0x7568,
-	8623:  0x7569,
-	8624:  0x756B,
-	8625:  0x756C,
-	8626:  0x756D,
-	8627:  0x756E,
-	8628:  0x756F,
-	8629:  0x7570,
-	8630:  0x7571,
-	8631:  0x7573,
-	8632:  0x7575,
-	8633:  0x7576,
-	8634:  0x7577,
-	8635:  0x757A,
-	8636:  0x757B,
-	8637:  0x757C,
-	8638:  0x757D,
-	8639:  0x757E,
-	8640:  0x7580,
-	8641:  0x7581,
-	8642:  0x7582,
-	8643:  0x7584,
-	8644:  0x7585,
-	8645:  0x7587,
-	8740:  0x7588,
-	8741:  0x7589,
-	8742:  0x758A,
-	8743:  0x758C,
-	8744:  0x758D,
-	8745:  0x758E,
-	8746:  0x7590,
-	8747:  0x7593,
-	8748:  0x7595,
-	8749:  0x7598,
-	8750:  0x759B,
-	8751:  0x759C,
-	8752:  0x759E,
-	8753:  0x75A2,
-	8754:  0x75A6,
-	8755:  0x75A7,
-	8756:  0x75A8,
-	8757:  0x75A9,
-	8758:  0x75AA,
-	8759:  0x75AD,
-	8760:  0x75B6,
-	8761:  0x75B7,
-	8762:  0x75BA,
-	8763:  0x75BB,
-	8764:  0x75BF,
-	8765:  0x75C0,
-	8766:  0x75C1,
-	8767:  0x75C6,
-	8768:  0x75CB,
-	8769:  0x75CC,
-	8770:  0x75CE,
-	8771:  0x75CF,
-	8772:  0x75D0,
-	8773:  0x75D1,
-	8774:  0x75D3,
-	8775:  0x75D7,
-	8776:  0x75D9,
-	8777:  0x75DA,
-	8778:  0x75DC,
-	8779:  0x75DD,
-	8780:  0x75DF,
-	8781:  0x75E0,
-	8782:  0x75E1,
-	8783:  0x75E5,
-	8784:  0x75E9,
-	8785:  0x75EC,
-	8786:  0x75ED,
-	8787:  0x75EE,
-	8788:  0x75EF,
-	8789:  0x75F2,
-	8790:  0x75F3,
-	8791:  0x75F5,
-	8792:  0x75F6,
-	8793:  0x75F7,
-	8794:  0x75F8,
-	8795:  0x75FA,
-	8796:  0x75FB,
-	8797:  0x75FD,
-	8798:  0x75FE,
-	8799:  0x7602,
-	8800:  0x7604,
-	8801:  0x7606,
-	8802:  0x7607,
-	8803:  0x7608,
-	8804:  0x7609,
-	8805:  0x760B,
-	8806:  0x760D,
-	8807:  0x760E,
-	8808:  0x760F,
-	8809:  0x7611,
-	8810:  0x7612,
-	8811:  0x7613,
-	8812:  0x7614,
-	8813:  0x7616,
-	8814:  0x761A,
-	8815:  0x761C,
-	8816:  0x761D,
-	8817:  0x761E,
-	8818:  0x7621,
-	8819:  0x7623,
-	8820:  0x7627,
-	8821:  0x7628,
-	8822:  0x762C,
-	8823:  0x762E,
-	8824:  0x762F,
-	8825:  0x7631,
-	8826:  0x7632,
-	8827:  0x7636,
-	8828:  0x7637,
-	8829:  0x7639,
-	8830:  0x763A,
-	8831:  0x763B,
-	8832:  0x763D,
-	8833:  0x7641,
-	8834:  0x7642,
-	8835:  0x7644,
-	8930:  0x7645,
-	8931:  0x7646,
-	8932:  0x7647,
-	8933:  0x7648,
-	8934:  0x7649,
-	8935:  0x764A,
-	8936:  0x764B,
-	8937:  0x764E,
-	8938:  0x764F,
-	8939:  0x7650,
-	8940:  0x7651,
-	8941:  0x7652,
-	8942:  0x7653,
-	8943:  0x7655,
-	8944:  0x7657,
-	8945:  0x7658,
-	8946:  0x7659,
-	8947:  0x765A,
-	8948:  0x765B,
-	8949:  0x765D,
-	8950:  0x765F,
-	8951:  0x7660,
-	8952:  0x7661,
-	8953:  0x7662,
-	8954:  0x7664,
-	8955:  0x7665,
-	8956:  0x7666,
-	8957:  0x7667,
-	8958:  0x7668,
-	8959:  0x7669,
-	8960:  0x766A,
-	8961:  0x766C,
-	8962:  0x766D,
-	8963:  0x766E,
-	8964:  0x7670,
-	8965:  0x7671,
-	8966:  0x7672,
-	8967:  0x7673,
-	8968:  0x7674,
-	8969:  0x7675,
-	8970:  0x7676,
-	8971:  0x7677,
-	8972:  0x7679,
-	8973:  0x767A,
-	8974:  0x767C,
-	8975:  0x767F,
-	8976:  0x7680,
-	8977:  0x7681,
-	8978:  0x7683,
-	8979:  0x7685,
-	8980:  0x7689,
-	8981:  0x768A,
-	8982:  0x768C,
-	8983:  0x768D,
-	8984:  0x768F,
-	8985:  0x7690,
-	8986:  0x7692,
-	8987:  0x7694,
-	8988:  0x7695,
-	8989:  0x7697,
-	8990:  0x7698,
-	8991:  0x769A,
-	8992:  0x769B,
-	8993:  0x769C,
-	8994:  0x769D,
-	8995:  0x769E,
-	8996:  0x769F,
-	8997:  0x76A0,
-	8998:  0x76A1,
-	8999:  0x76A2,
-	9000:  0x76A3,
-	9001:  0x76A5,
-	9002:  0x76A6,
-	9003:  0x76A7,
-	9004:  0x76A8,
-	9005:  0x76A9,
-	9006:  0x76AA,
-	9007:  0x76AB,
-	9008:  0x76AC,
-	9009:  0x76AD,
-	9010:  0x76AF,
-	9011:  0x76B0,
-	9012:  0x76B3,
-	9013:  0x76B5,
-	9014:  0x76B6,
-	9015:  0x76B7,
-	9016:  0x76B8,
-	9017:  0x76B9,
-	9018:  0x76BA,
-	9019:  0x76BB,
-	9020:  0x76BC,
-	9021:  0x76BD,
-	9022:  0x76BE,
-	9023:  0x76C0,
-	9024:  0x76C1,
-	9025:  0x76C3,
-	9026:  0x554A,
-	9027:  0x963F,
-	9028:  0x57C3,
-	9029:  0x6328,
-	9030:  0x54CE,
-	9031:  0x5509,
-	9032:  0x54C0,
-	9033:  0x7691,
-	9034:  0x764C,
-	9035:  0x853C,
-	9036:  0x77EE,
-	9037:  0x827E,
-	9038:  0x788D,
-	9039:  0x7231,
-	9040:  0x9698,
-	9041:  0x978D,
-	9042:  0x6C28,
-	9043:  0x5B89,
-	9044:  0x4FFA,
-	9045:  0x6309,
-	9046:  0x6697,
-	9047:  0x5CB8,
-	9048:  0x80FA,
-	9049:  0x6848,
-	9050:  0x80AE,
-	9051:  0x6602,
-	9052:  0x76CE,
-	9053:  0x51F9,
-	9054:  0x6556,
-	9055:  0x71AC,
-	9056:  0x7FF1,
-	9057:  0x8884,
-	9058:  0x50B2,
-	9059:  0x5965,
-	9060:  0x61CA,
-	9061:  0x6FB3,
-	9062:  0x82AD,
-	9063:  0x634C,
-	9064:  0x6252,
-	9065:  0x53ED,
-	9066:  0x5427,
-	9067:  0x7B06,
-	9068:  0x516B,
-	9069:  0x75A4,
-	9070:  0x5DF4,
-	9071:  0x62D4,
-	9072:  0x8DCB,
-	9073:  0x9776,
-	9074:  0x628A,
-	9075:  0x8019,
-	9076:  0x575D,
-	9077:  0x9738,
-	9078:  0x7F62,
-	9079:  0x7238,
-	9080:  0x767D,
-	9081:  0x67CF,
-	9082:  0x767E,
-	9083:  0x6446,
-	9084:  0x4F70,
-	9085:  0x8D25,
-	9086:  0x62DC,
-	9087:  0x7A17,
-	9088:  0x6591,
-	9089:  0x73ED,
-	9090:  0x642C,
-	9091:  0x6273,
-	9092:  0x822C,
-	9093:  0x9881,
-	9094:  0x677F,
-	9095:  0x7248,
-	9096:  0x626E,
-	9097:  0x62CC,
-	9098:  0x4F34,
-	9099:  0x74E3,
-	9100:  0x534A,
-	9101:  0x529E,
-	9102:  0x7ECA,
-	9103:  0x90A6,
-	9104:  0x5E2E,
-	9105:  0x6886,
-	9106:  0x699C,
-	9107:  0x8180,
-	9108:  0x7ED1,
-	9109:  0x68D2,
-	9110:  0x78C5,
-	9111:  0x868C,
-	9112:  0x9551,
-	9113:  0x508D,
-	9114:  0x8C24,
-	9115:  0x82DE,
-	9116:  0x80DE,
-	9117:  0x5305,
-	9118:  0x8912,
-	9119:  0x5265,
-	9120:  0x76C4,
-	9121:  0x76C7,
-	9122:  0x76C9,
-	9123:  0x76CB,
-	9124:  0x76CC,
-	9125:  0x76D3,
-	9126:  0x76D5,
-	9127:  0x76D9,
-	9128:  0x76DA,
-	9129:  0x76DC,
-	9130:  0x76DD,
-	9131:  0x76DE,
-	9132:  0x76E0,
-	9133:  0x76E1,
-	9134:  0x76E2,
-	9135:  0x76E3,
-	9136:  0x76E4,
-	9137:  0x76E6,
-	9138:  0x76E7,
-	9139:  0x76E8,
-	9140:  0x76E9,
-	9141:  0x76EA,
-	9142:  0x76EB,
-	9143:  0x76EC,
-	9144:  0x76ED,
-	9145:  0x76F0,
-	9146:  0x76F3,
-	9147:  0x76F5,
-	9148:  0x76F6,
-	9149:  0x76F7,
-	9150:  0x76FA,
-	9151:  0x76FB,
-	9152:  0x76FD,
-	9153:  0x76FF,
-	9154:  0x7700,
-	9155:  0x7702,
-	9156:  0x7703,
-	9157:  0x7705,
-	9158:  0x7706,
-	9159:  0x770A,
-	9160:  0x770C,
-	9161:  0x770E,
-	9162:  0x770F,
-	9163:  0x7710,
-	9164:  0x7711,
-	9165:  0x7712,
-	9166:  0x7713,
-	9167:  0x7714,
-	9168:  0x7715,
-	9169:  0x7716,
-	9170:  0x7717,
-	9171:  0x7718,
-	9172:  0x771B,
-	9173:  0x771C,
-	9174:  0x771D,
-	9175:  0x771E,
-	9176:  0x7721,
-	9177:  0x7723,
-	9178:  0x7724,
-	9179:  0x7725,
-	9180:  0x7727,
-	9181:  0x772A,
-	9182:  0x772B,
-	9183:  0x772C,
-	9184:  0x772E,
-	9185:  0x7730,
-	9186:  0x7731,
-	9187:  0x7732,
-	9188:  0x7733,
-	9189:  0x7734,
-	9190:  0x7739,
-	9191:  0x773B,
-	9192:  0x773D,
-	9193:  0x773E,
-	9194:  0x773F,
-	9195:  0x7742,
-	9196:  0x7744,
-	9197:  0x7745,
-	9198:  0x7746,
-	9199:  0x7748,
-	9200:  0x7749,
-	9201:  0x774A,
-	9202:  0x774B,
-	9203:  0x774C,
-	9204:  0x774D,
-	9205:  0x774E,
-	9206:  0x774F,
-	9207:  0x7752,
-	9208:  0x7753,
-	9209:  0x7754,
-	9210:  0x7755,
-	9211:  0x7756,
-	9212:  0x7757,
-	9213:  0x7758,
-	9214:  0x7759,
-	9215:  0x775C,
-	9216:  0x8584,
-	9217:  0x96F9,
-	9218:  0x4FDD,
-	9219:  0x5821,
-	9220:  0x9971,
-	9221:  0x5B9D,
-	9222:  0x62B1,
-	9223:  0x62A5,
-	9224:  0x66B4,
-	9225:  0x8C79,
-	9226:  0x9C8D,
-	9227:  0x7206,
-	9228:  0x676F,
-	9229:  0x7891,
-	9230:  0x60B2,
-	9231:  0x5351,
-	9232:  0x5317,
-	9233:  0x8F88,
-	9234:  0x80CC,
-	9235:  0x8D1D,
-	9236:  0x94A1,
-	9237:  0x500D,
-	9238:  0x72C8,
-	9239:  0x5907,
-	9240:  0x60EB,
-	9241:  0x7119,
-	9242:  0x88AB,
-	9243:  0x5954,
-	9244:  0x82EF,
-	9245:  0x672C,
-	9246:  0x7B28,
-	9247:  0x5D29,
-	9248:  0x7EF7,
-	9249:  0x752D,
-	9250:  0x6CF5,
-	9251:  0x8E66,
-	9252:  0x8FF8,
-	9253:  0x903C,
-	9254:  0x9F3B,
-	9255:  0x6BD4,
-	9256:  0x9119,
-	9257:  0x7B14,
-	9258:  0x5F7C,
-	9259:  0x78A7,
-	9260:  0x84D6,
-	9261:  0x853D,
-	9262:  0x6BD5,
-	9263:  0x6BD9,
-	9264:  0x6BD6,
-	9265:  0x5E01,
-	9266:  0x5E87,
-	9267:  0x75F9,
-	9268:  0x95ED,
-	9269:  0x655D,
-	9270:  0x5F0A,
-	9271:  0x5FC5,
-	9272:  0x8F9F,
-	9273:  0x58C1,
-	9274:  0x81C2,
-	9275:  0x907F,
-	9276:  0x965B,
-	9277:  0x97AD,
-	9278:  0x8FB9,
-	9279:  0x7F16,
-	9280:  0x8D2C,
-	9281:  0x6241,
-	9282:  0x4FBF,
-	9283:  0x53D8,
-	9284:  0x535E,
-	9285:  0x8FA8,
-	9286:  0x8FA9,
-	9287:  0x8FAB,
-	9288:  0x904D,
-	9289:  0x6807,
-	9290:  0x5F6A,
-	9291:  0x8198,
-	9292:  0x8868,
-	9293:  0x9CD6,
-	9294:  0x618B,
-	9295:  0x522B,
-	9296:  0x762A,
-	9297:  0x5F6C,
-	9298:  0x658C,
-	9299:  0x6FD2,
-	9300:  0x6EE8,
-	9301:  0x5BBE,
-	9302:  0x6448,
-	9303:  0x5175,
-	9304:  0x51B0,
-	9305:  0x67C4,
-	9306:  0x4E19,
-	9307:  0x79C9,
-	9308:  0x997C,
-	9309:  0x70B3,
-	9310:  0x775D,
-	9311:  0x775E,
-	9312:  0x775F,
-	9313:  0x7760,
-	9314:  0x7764,
-	9315:  0x7767,
-	9316:  0x7769,
-	9317:  0x776A,
-	9318:  0x776D,
-	9319:  0x776E,
-	9320:  0x776F,
-	9321:  0x7770,
-	9322:  0x7771,
-	9323:  0x7772,
-	9324:  0x7773,
-	9325:  0x7774,
-	9326:  0x7775,
-	9327:  0x7776,
-	9328:  0x7777,
-	9329:  0x7778,
-	9330:  0x777A,
-	9331:  0x777B,
-	9332:  0x777C,
-	9333:  0x7781,
-	9334:  0x7782,
-	9335:  0x7783,
-	9336:  0x7786,
-	9337:  0x7787,
-	9338:  0x7788,
-	9339:  0x7789,
-	9340:  0x778A,
-	9341:  0x778B,
-	9342:  0x778F,
-	9343:  0x7790,
-	9344:  0x7793,
-	9345:  0x7794,
-	9346:  0x7795,
-	9347:  0x7796,
-	9348:  0x7797,
-	9349:  0x7798,
-	9350:  0x7799,
-	9351:  0x779A,
-	9352:  0x779B,
-	9353:  0x779C,
-	9354:  0x779D,
-	9355:  0x779E,
-	9356:  0x77A1,
-	9357:  0x77A3,
-	9358:  0x77A4,
-	9359:  0x77A6,
-	9360:  0x77A8,
-	9361:  0x77AB,
-	9362:  0x77AD,
-	9363:  0x77AE,
-	9364:  0x77AF,
-	9365:  0x77B1,
-	9366:  0x77B2,
-	9367:  0x77B4,
-	9368:  0x77B6,
-	9369:  0x77B7,
-	9370:  0x77B8,
-	9371:  0x77B9,
-	9372:  0x77BA,
-	9373:  0x77BC,
-	9374:  0x77BE,
-	9375:  0x77C0,
-	9376:  0x77C1,
-	9377:  0x77C2,
-	9378:  0x77C3,
-	9379:  0x77C4,
-	9380:  0x77C5,
-	9381:  0x77C6,
-	9382:  0x77C7,
-	9383:  0x77C8,
-	9384:  0x77C9,
-	9385:  0x77CA,
-	9386:  0x77CB,
-	9387:  0x77CC,
-	9388:  0x77CE,
-	9389:  0x77CF,
-	9390:  0x77D0,
-	9391:  0x77D1,
-	9392:  0x77D2,
-	9393:  0x77D3,
-	9394:  0x77D4,
-	9395:  0x77D5,
-	9396:  0x77D6,
-	9397:  0x77D8,
-	9398:  0x77D9,
-	9399:  0x77DA,
-	9400:  0x77DD,
-	9401:  0x77DE,
-	9402:  0x77DF,
-	9403:  0x77E0,
-	9404:  0x77E1,
-	9405:  0x77E4,
-	9406:  0x75C5,
-	9407:  0x5E76,
-	9408:  0x73BB,
-	9409:  0x83E0,
-	9410:  0x64AD,
-	9411:  0x62E8,
-	9412:  0x94B5,
-	9413:  0x6CE2,
-	9414:  0x535A,
-	9415:  0x52C3,
-	9416:  0x640F,
-	9417:  0x94C2,
-	9418:  0x7B94,
-	9419:  0x4F2F,
-	9420:  0x5E1B,
-	9421:  0x8236,
-	9422:  0x8116,
-	9423:  0x818A,
-	9424:  0x6E24,
-	9425:  0x6CCA,
-	9426:  0x9A73,
-	9427:  0x6355,
-	9428:  0x535C,
-	9429:  0x54FA,
-	9430:  0x8865,
-	9431:  0x57E0,
-	9432:  0x4E0D,
-	9433:  0x5E03,
-	9434:  0x6B65,
-	9435:  0x7C3F,
-	9436:  0x90E8,
-	9437:  0x6016,
-	9438:  0x64E6,
-	9439:  0x731C,
-	9440:  0x88C1,
-	9441:  0x6750,
-	9442:  0x624D,
-	9443:  0x8D22,
-	9444:  0x776C,
-	9445:  0x8E29,
-	9446:  0x91C7,
-	9447:  0x5F69,
-	9448:  0x83DC,
-	9449:  0x8521,
-	9450:  0x9910,
-	9451:  0x53C2,
-	9452:  0x8695,
-	9453:  0x6B8B,
-	9454:  0x60ED,
-	9455:  0x60E8,
-	9456:  0x707F,
-	9457:  0x82CD,
-	9458:  0x8231,
-	9459:  0x4ED3,
-	9460:  0x6CA7,
-	9461:  0x85CF,
-	9462:  0x64CD,
-	9463:  0x7CD9,
-	9464:  0x69FD,
-	9465:  0x66F9,
-	9466:  0x8349,
-	9467:  0x5395,
-	9468:  0x7B56,
-	9469:  0x4FA7,
-	9470:  0x518C,
-	9471:  0x6D4B,
-	9472:  0x5C42,
-	9473:  0x8E6D,
-	9474:  0x63D2,
-	9475:  0x53C9,
-	9476:  0x832C,
-	9477:  0x8336,
-	9478:  0x67E5,
-	9479:  0x78B4,
-	9480:  0x643D,
-	9481:  0x5BDF,
-	9482:  0x5C94,
-	9483:  0x5DEE,
-	9484:  0x8BE7,
-	9485:  0x62C6,
-	9486:  0x67F4,
-	9487:  0x8C7A,
-	9488:  0x6400,
-	9489:  0x63BA,
-	9490:  0x8749,
-	9491:  0x998B,
-	9492:  0x8C17,
-	9493:  0x7F20,
-	9494:  0x94F2,
-	9495:  0x4EA7,
-	9496:  0x9610,
-	9497:  0x98A4,
-	9498:  0x660C,
-	9499:  0x7316,
-	9500:  0x77E6,
-	9501:  0x77E8,
-	9502:  0x77EA,
-	9503:  0x77EF,
-	9504:  0x77F0,
-	9505:  0x77F1,
-	9506:  0x77F2,
-	9507:  0x77F4,
-	9508:  0x77F5,
-	9509:  0x77F7,
-	9510:  0x77F9,
-	9511:  0x77FA,
-	9512:  0x77FB,
-	9513:  0x77FC,
-	9514:  0x7803,
-	9515:  0x7804,
-	9516:  0x7805,
-	9517:  0x7806,
-	9518:  0x7807,
-	9519:  0x7808,
-	9520:  0x780A,
-	9521:  0x780B,
-	9522:  0x780E,
-	9523:  0x780F,
-	9524:  0x7810,
-	9525:  0x7813,
-	9526:  0x7815,
-	9527:  0x7819,
-	9528:  0x781B,
-	9529:  0x781E,
-	9530:  0x7820,
-	9531:  0x7821,
-	9532:  0x7822,
-	9533:  0x7824,
-	9534:  0x7828,
-	9535:  0x782A,
-	9536:  0x782B,
-	9537:  0x782E,
-	9538:  0x782F,
-	9539:  0x7831,
-	9540:  0x7832,
-	9541:  0x7833,
-	9542:  0x7835,
-	9543:  0x7836,
-	9544:  0x783D,
-	9545:  0x783F,
-	9546:  0x7841,
-	9547:  0x7842,
-	9548:  0x7843,
-	9549:  0x7844,
-	9550:  0x7846,
-	9551:  0x7848,
-	9552:  0x7849,
-	9553:  0x784A,
-	9554:  0x784B,
-	9555:  0x784D,
-	9556:  0x784F,
-	9557:  0x7851,
-	9558:  0x7853,
-	9559:  0x7854,
-	9560:  0x7858,
-	9561:  0x7859,
-	9562:  0x785A,
-	9563:  0x785B,
-	9564:  0x785C,
-	9565:  0x785E,
-	9566:  0x785F,
-	9567:  0x7860,
-	9568:  0x7861,
-	9569:  0x7862,
-	9570:  0x7863,
-	9571:  0x7864,
-	9572:  0x7865,
-	9573:  0x7866,
-	9574:  0x7867,
-	9575:  0x7868,
-	9576:  0x7869,
-	9577:  0x786F,
-	9578:  0x7870,
-	9579:  0x7871,
-	9580:  0x7872,
-	9581:  0x7873,
-	9582:  0x7874,
-	9583:  0x7875,
-	9584:  0x7876,
-	9585:  0x7878,
-	9586:  0x7879,
-	9587:  0x787A,
-	9588:  0x787B,
-	9589:  0x787D,
-	9590:  0x787E,
-	9591:  0x787F,
-	9592:  0x7880,
-	9593:  0x7881,
-	9594:  0x7882,
-	9595:  0x7883,
-	9596:  0x573A,
-	9597:  0x5C1D,
-	9598:  0x5E38,
-	9599:  0x957F,
-	9600:  0x507F,
-	9601:  0x80A0,
-	9602:  0x5382,
-	9603:  0x655E,
-	9604:  0x7545,
-	9605:  0x5531,
-	9606:  0x5021,
-	9607:  0x8D85,
-	9608:  0x6284,
-	9609:  0x949E,
-	9610:  0x671D,
-	9611:  0x5632,
-	9612:  0x6F6E,
-	9613:  0x5DE2,
-	9614:  0x5435,
-	9615:  0x7092,
-	9616:  0x8F66,
-	9617:  0x626F,
-	9618:  0x64A4,
-	9619:  0x63A3,
-	9620:  0x5F7B,
-	9621:  0x6F88,
-	9622:  0x90F4,
-	9623:  0x81E3,
-	9624:  0x8FB0,
-	9625:  0x5C18,
-	9626:  0x6668,
-	9627:  0x5FF1,
-	9628:  0x6C89,
-	9629:  0x9648,
-	9630:  0x8D81,
-	9631:  0x886C,
-	9632:  0x6491,
-	9633:  0x79F0,
-	9634:  0x57CE,
-	9635:  0x6A59,
-	9636:  0x6210,
-	9637:  0x5448,
-	9638:  0x4E58,
-	9639:  0x7A0B,
-	9640:  0x60E9,
-	9641:  0x6F84,
-	9642:  0x8BDA,
-	9643:  0x627F,
-	9644:  0x901E,
-	9645:  0x9A8B,
-	9646:  0x79E4,
-	9647:  0x5403,
-	9648:  0x75F4,
-	9649:  0x6301,
-	9650:  0x5319,
-	9651:  0x6C60,
-	9652:  0x8FDF,
-	9653:  0x5F1B,
-	9654:  0x9A70,
-	9655:  0x803B,
-	9656:  0x9F7F,
-	9657:  0x4F88,
-	9658:  0x5C3A,
-	9659:  0x8D64,
-	9660:  0x7FC5,
-	9661:  0x65A5,
-	9662:  0x70BD,
-	9663:  0x5145,
-	9664:  0x51B2,
-	9665:  0x866B,
-	9666:  0x5D07,
-	9667:  0x5BA0,
-	9668:  0x62BD,
-	9669:  0x916C,
-	9670:  0x7574,
-	9671:  0x8E0C,
-	9672:  0x7A20,
-	9673:  0x6101,
-	9674:  0x7B79,
-	9675:  0x4EC7,
-	9676:  0x7EF8,
-	9677:  0x7785,
-	9678:  0x4E11,
-	9679:  0x81ED,
-	9680:  0x521D,
-	9681:  0x51FA,
-	9682:  0x6A71,
-	9683:  0x53A8,
-	9684:  0x8E87,
-	9685:  0x9504,
-	9686:  0x96CF,
-	9687:  0x6EC1,
-	9688:  0x9664,
-	9689:  0x695A,
-	9690:  0x7884,
-	9691:  0x7885,
-	9692:  0x7886,
-	9693:  0x7888,
-	9694:  0x788A,
-	9695:  0x788B,
-	9696:  0x788F,
-	9697:  0x7890,
-	9698:  0x7892,
-	9699:  0x7894,
-	9700:  0x7895,
-	9701:  0x7896,
-	9702:  0x7899,
-	9703:  0x789D,
-	9704:  0x789E,
-	9705:  0x78A0,
-	9706:  0x78A2,
-	9707:  0x78A4,
-	9708:  0x78A6,
-	9709:  0x78A8,
-	9710:  0x78A9,
-	9711:  0x78AA,
-	9712:  0x78AB,
-	9713:  0x78AC,
-	9714:  0x78AD,
-	9715:  0x78AE,
-	9716:  0x78AF,
-	9717:  0x78B5,
-	9718:  0x78B6,
-	9719:  0x78B7,
-	9720:  0x78B8,
-	9721:  0x78BA,
-	9722:  0x78BB,
-	9723:  0x78BC,
-	9724:  0x78BD,
-	9725:  0x78BF,
-	9726:  0x78C0,
-	9727:  0x78C2,
-	9728:  0x78C3,
-	9729:  0x78C4,
-	9730:  0x78C6,
-	9731:  0x78C7,
-	9732:  0x78C8,
-	9733:  0x78CC,
-	9734:  0x78CD,
-	9735:  0x78CE,
-	9736:  0x78CF,
-	9737:  0x78D1,
-	9738:  0x78D2,
-	9739:  0x78D3,
-	9740:  0x78D6,
-	9741:  0x78D7,
-	9742:  0x78D8,
-	9743:  0x78DA,
-	9744:  0x78DB,
-	9745:  0x78DC,
-	9746:  0x78DD,
-	9747:  0x78DE,
-	9748:  0x78DF,
-	9749:  0x78E0,
-	9750:  0x78E1,
-	9751:  0x78E2,
-	9752:  0x78E3,
-	9753:  0x78E4,
-	9754:  0x78E5,
-	9755:  0x78E6,
-	9756:  0x78E7,
-	9757:  0x78E9,
-	9758:  0x78EA,
-	9759:  0x78EB,
-	9760:  0x78ED,
-	9761:  0x78EE,
-	9762:  0x78EF,
-	9763:  0x78F0,
-	9764:  0x78F1,
-	9765:  0x78F3,
-	9766:  0x78F5,
-	9767:  0x78F6,
-	9768:  0x78F8,
-	9769:  0x78F9,
-	9770:  0x78FB,
-	9771:  0x78FC,
-	9772:  0x78FD,
-	9773:  0x78FE,
-	9774:  0x78FF,
-	9775:  0x7900,
-	9776:  0x7902,
-	9777:  0x7903,
-	9778:  0x7904,
-	9779:  0x7906,
-	9780:  0x7907,
-	9781:  0x7908,
-	9782:  0x7909,
-	9783:  0x790A,
-	9784:  0x790B,
-	9785:  0x790C,
-	9786:  0x7840,
-	9787:  0x50A8,
-	9788:  0x77D7,
-	9789:  0x6410,
-	9790:  0x89E6,
-	9791:  0x5904,
-	9792:  0x63E3,
-	9793:  0x5DDD,
-	9794:  0x7A7F,
-	9795:  0x693D,
-	9796:  0x4F20,
-	9797:  0x8239,
-	9798:  0x5598,
-	9799:  0x4E32,
-	9800:  0x75AE,
-	9801:  0x7A97,
-	9802:  0x5E62,
-	9803:  0x5E8A,
-	9804:  0x95EF,
-	9805:  0x521B,
-	9806:  0x5439,
-	9807:  0x708A,
-	9808:  0x6376,
-	9809:  0x9524,
-	9810:  0x5782,
-	9811:  0x6625,
-	9812:  0x693F,
-	9813:  0x9187,
-	9814:  0x5507,
-	9815:  0x6DF3,
-	9816:  0x7EAF,
-	9817:  0x8822,
-	9818:  0x6233,
-	9819:  0x7EF0,
-	9820:  0x75B5,
-	9821:  0x8328,
-	9822:  0x78C1,
-	9823:  0x96CC,
-	9824:  0x8F9E,
-	9825:  0x6148,
-	9826:  0x74F7,
-	9827:  0x8BCD,
-	9828:  0x6B64,
-	9829:  0x523A,
-	9830:  0x8D50,
-	9831:  0x6B21,
-	9832:  0x806A,
-	9833:  0x8471,
-	9834:  0x56F1,
-	9835:  0x5306,
-	9836:  0x4ECE,
-	9837:  0x4E1B,
-	9838:  0x51D1,
-	9839:  0x7C97,
-	9840:  0x918B,
-	9841:  0x7C07,
-	9842:  0x4FC3,
-	9843:  0x8E7F,
-	9844:  0x7BE1,
-	9845:  0x7A9C,
-	9846:  0x6467,
-	9847:  0x5D14,
-	9848:  0x50AC,
-	9849:  0x8106,
-	9850:  0x7601,
-	9851:  0x7CB9,
-	9852:  0x6DEC,
-	9853:  0x7FE0,
-	9854:  0x6751,
-	9855:  0x5B58,
-	9856:  0x5BF8,
-	9857:  0x78CB,
-	9858:  0x64AE,
-	9859:  0x6413,
-	9860:  0x63AA,
-	9861:  0x632B,
-	9862:  0x9519,
-	9863:  0x642D,
-	9864:  0x8FBE,
-	9865:  0x7B54,
-	9866:  0x7629,
-	9867:  0x6253,
-	9868:  0x5927,
-	9869:  0x5446,
-	9870:  0x6B79,
-	9871:  0x50A3,
-	9872:  0x6234,
-	9873:  0x5E26,
-	9874:  0x6B86,
-	9875:  0x4EE3,
-	9876:  0x8D37,
-	9877:  0x888B,
-	9878:  0x5F85,
-	9879:  0x902E,
-	9880:  0x790D,
-	9881:  0x790E,
-	9882:  0x790F,
-	9883:  0x7910,
-	9884:  0x7911,
-	9885:  0x7912,
-	9886:  0x7914,
-	9887:  0x7915,
-	9888:  0x7916,
-	9889:  0x7917,
-	9890:  0x7918,
-	9891:  0x7919,
-	9892:  0x791A,
-	9893:  0x791B,
-	9894:  0x791C,
-	9895:  0x791D,
-	9896:  0x791F,
-	9897:  0x7920,
-	9898:  0x7921,
-	9899:  0x7922,
-	9900:  0x7923,
-	9901:  0x7925,
-	9902:  0x7926,
-	9903:  0x7927,
-	9904:  0x7928,
-	9905:  0x7929,
-	9906:  0x792A,
-	9907:  0x792B,
-	9908:  0x792C,
-	9909:  0x792D,
-	9910:  0x792E,
-	9911:  0x792F,
-	9912:  0x7930,
-	9913:  0x7931,
-	9914:  0x7932,
-	9915:  0x7933,
-	9916:  0x7935,
-	9917:  0x7936,
-	9918:  0x7937,
-	9919:  0x7938,
-	9920:  0x7939,
-	9921:  0x793D,
-	9922:  0x793F,
-	9923:  0x7942,
-	9924:  0x7943,
-	9925:  0x7944,
-	9926:  0x7945,
-	9927:  0x7947,
-	9928:  0x794A,
-	9929:  0x794B,
-	9930:  0x794C,
-	9931:  0x794D,
-	9932:  0x794E,
-	9933:  0x794F,
-	9934:  0x7950,
-	9935:  0x7951,
-	9936:  0x7952,
-	9937:  0x7954,
-	9938:  0x7955,
-	9939:  0x7958,
-	9940:  0x7959,
-	9941:  0x7961,
-	9942:  0x7963,
-	9943:  0x7964,
-	9944:  0x7966,
-	9945:  0x7969,
-	9946:  0x796A,
-	9947:  0x796B,
-	9948:  0x796C,
-	9949:  0x796E,
-	9950:  0x7970,
-	9951:  0x7971,
-	9952:  0x7972,
-	9953:  0x7973,
-	9954:  0x7974,
-	9955:  0x7975,
-	9956:  0x7976,
-	9957:  0x7979,
-	9958:  0x797B,
-	9959:  0x797C,
-	9960:  0x797D,
-	9961:  0x797E,
-	9962:  0x797F,
-	9963:  0x7982,
-	9964:  0x7983,
-	9965:  0x7986,
-	9966:  0x7987,
-	9967:  0x7988,
-	9968:  0x7989,
-	9969:  0x798B,
-	9970:  0x798C,
-	9971:  0x798D,
-	9972:  0x798E,
-	9973:  0x7990,
-	9974:  0x7991,
-	9975:  0x7992,
-	9976:  0x6020,
-	9977:  0x803D,
-	9978:  0x62C5,
-	9979:  0x4E39,
-	9980:  0x5355,
-	9981:  0x90F8,
-	9982:  0x63B8,
-	9983:  0x80C6,
-	9984:  0x65E6,
-	9985:  0x6C2E,
-	9986:  0x4F46,
-	9987:  0x60EE,
-	9988:  0x6DE1,
-	9989:  0x8BDE,
-	9990:  0x5F39,
-	9991:  0x86CB,
-	9992:  0x5F53,
-	9993:  0x6321,
-	9994:  0x515A,
-	9995:  0x8361,
-	9996:  0x6863,
-	9997:  0x5200,
-	9998:  0x6363,
-	9999:  0x8E48,
-	10000: 0x5012,
-	10001: 0x5C9B,
-	10002: 0x7977,
-	10003: 0x5BFC,
-	10004: 0x5230,
-	10005: 0x7A3B,
-	10006: 0x60BC,
-	10007: 0x9053,
-	10008: 0x76D7,
-	10009: 0x5FB7,
-	10010: 0x5F97,
-	10011: 0x7684,
-	10012: 0x8E6C,
-	10013: 0x706F,
-	10014: 0x767B,
-	10015: 0x7B49,
-	10016: 0x77AA,
-	10017: 0x51F3,
-	10018: 0x9093,
-	10019: 0x5824,
-	10020: 0x4F4E,
-	10021: 0x6EF4,
-	10022: 0x8FEA,
-	10023: 0x654C,
-	10024: 0x7B1B,
-	10025: 0x72C4,
-	10026: 0x6DA4,
-	10027: 0x7FDF,
-	10028: 0x5AE1,
-	10029: 0x62B5,
-	10030: 0x5E95,
-	10031: 0x5730,
-	10032: 0x8482,
-	10033: 0x7B2C,
-	10034: 0x5E1D,
-	10035: 0x5F1F,
-	10036: 0x9012,
-	10037: 0x7F14,
-	10038: 0x98A0,
-	10039: 0x6382,
-	10040: 0x6EC7,
-	10041: 0x7898,
-	10042: 0x70B9,
-	10043: 0x5178,
-	10044: 0x975B,
-	10045: 0x57AB,
-	10046: 0x7535,
-	10047: 0x4F43,
-	10048: 0x7538,
-	10049: 0x5E97,
-	10050: 0x60E6,
-	10051: 0x5960,
-	10052: 0x6DC0,
-	10053: 0x6BBF,
-	10054: 0x7889,
-	10055: 0x53FC,
-	10056: 0x96D5,
-	10057: 0x51CB,
-	10058: 0x5201,
-	10059: 0x6389,
-	10060: 0x540A,
-	10061: 0x9493,
-	10062: 0x8C03,
-	10063: 0x8DCC,
-	10064: 0x7239,
-	10065: 0x789F,
-	10066: 0x8776,
-	10067: 0x8FED,
-	10068: 0x8C0D,
-	10069: 0x53E0,
-	10070: 0x7993,
-	10071: 0x7994,
-	10072: 0x7995,
-	10073: 0x7996,
-	10074: 0x7997,
-	10075: 0x7998,
-	10076: 0x7999,
-	10077: 0x799B,
-	10078: 0x799C,
-	10079: 0x799D,
-	10080: 0x799E,
-	10081: 0x799F,
-	10082: 0x79A0,
-	10083: 0x79A1,
-	10084: 0x79A2,
-	10085: 0x79A3,
-	10086: 0x79A4,
-	10087: 0x79A5,
-	10088: 0x79A6,
-	10089: 0x79A8,
-	10090: 0x79A9,
-	10091: 0x79AA,
-	10092: 0x79AB,
-	10093: 0x79AC,
-	10094: 0x79AD,
-	10095: 0x79AE,
-	10096: 0x79AF,
-	10097: 0x79B0,
-	10098: 0x79B1,
-	10099: 0x79B2,
-	10100: 0x79B4,
-	10101: 0x79B5,
-	10102: 0x79B6,
-	10103: 0x79B7,
-	10104: 0x79B8,
-	10105: 0x79BC,
-	10106: 0x79BF,
-	10107: 0x79C2,
-	10108: 0x79C4,
-	10109: 0x79C5,
-	10110: 0x79C7,
-	10111: 0x79C8,
-	10112: 0x79CA,
-	10113: 0x79CC,
-	10114: 0x79CE,
-	10115: 0x79CF,
-	10116: 0x79D0,
-	10117: 0x79D3,
-	10118: 0x79D4,
-	10119: 0x79D6,
-	10120: 0x79D7,
-	10121: 0x79D9,
-	10122: 0x79DA,
-	10123: 0x79DB,
-	10124: 0x79DC,
-	10125: 0x79DD,
-	10126: 0x79DE,
-	10127: 0x79E0,
-	10128: 0x79E1,
-	10129: 0x79E2,
-	10130: 0x79E5,
-	10131: 0x79E8,
-	10132: 0x79EA,
-	10133: 0x79EC,
-	10134: 0x79EE,
-	10135: 0x79F1,
-	10136: 0x79F2,
-	10137: 0x79F3,
-	10138: 0x79F4,
-	10139: 0x79F5,
-	10140: 0x79F6,
-	10141: 0x79F7,
-	10142: 0x79F9,
-	10143: 0x79FA,
-	10144: 0x79FC,
-	10145: 0x79FE,
-	10146: 0x79FF,
-	10147: 0x7A01,
-	10148: 0x7A04,
-	10149: 0x7A05,
-	10150: 0x7A07,
-	10151: 0x7A08,
-	10152: 0x7A09,
-	10153: 0x7A0A,
-	10154: 0x7A0C,
-	10155: 0x7A0F,
-	10156: 0x7A10,
-	10157: 0x7A11,
-	10158: 0x7A12,
-	10159: 0x7A13,
-	10160: 0x7A15,
-	10161: 0x7A16,
-	10162: 0x7A18,
-	10163: 0x7A19,
-	10164: 0x7A1B,
-	10165: 0x7A1C,
-	10166: 0x4E01,
-	10167: 0x76EF,
-	10168: 0x53EE,
-	10169: 0x9489,
-	10170: 0x9876,
-	10171: 0x9F0E,
-	10172: 0x952D,
-	10173: 0x5B9A,
-	10174: 0x8BA2,
-	10175: 0x4E22,
-	10176: 0x4E1C,
-	10177: 0x51AC,
-	10178: 0x8463,
-	10179: 0x61C2,
-	10180: 0x52A8,
-	10181: 0x680B,
-	10182: 0x4F97,
-	10183: 0x606B,
-	10184: 0x51BB,
-	10185: 0x6D1E,
-	10186: 0x515C,
-	10187: 0x6296,
-	10188: 0x6597,
-	10189: 0x9661,
-	10190: 0x8C46,
-	10191: 0x9017,
-	10192: 0x75D8,
-	10193: 0x90FD,
-	10194: 0x7763,
-	10195: 0x6BD2,
-	10196: 0x728A,
-	10197: 0x72EC,
-	10198: 0x8BFB,
-	10199: 0x5835,
-	10200: 0x7779,
-	10201: 0x8D4C,
-	10202: 0x675C,
-	10203: 0x9540,
-	10204: 0x809A,
-	10205: 0x5EA6,
-	10206: 0x6E21,
-	10207: 0x5992,
-	10208: 0x7AEF,
-	10209: 0x77ED,
-	10210: 0x953B,
-	10211: 0x6BB5,
-	10212: 0x65AD,
-	10213: 0x7F0E,
-	10214: 0x5806,
-	10215: 0x5151,
-	10216: 0x961F,
-	10217: 0x5BF9,
-	10218: 0x58A9,
-	10219: 0x5428,
-	10220: 0x8E72,
-	10221: 0x6566,
-	10222: 0x987F,
-	10223: 0x56E4,
-	10224: 0x949D,
-	10225: 0x76FE,
-	10226: 0x9041,
-	10227: 0x6387,
-	10228: 0x54C6,
-	10229: 0x591A,
-	10230: 0x593A,
-	10231: 0x579B,
-	10232: 0x8EB2,
-	10233: 0x6735,
-	10234: 0x8DFA,
-	10235: 0x8235,
-	10236: 0x5241,
-	10237: 0x60F0,
-	10238: 0x5815,
-	10239: 0x86FE,
-	10240: 0x5CE8,
-	10241: 0x9E45,
-	10242: 0x4FC4,
-	10243: 0x989D,
-	10244: 0x8BB9,
-	10245: 0x5A25,
-	10246: 0x6076,
-	10247: 0x5384,
-	10248: 0x627C,
-	10249: 0x904F,
-	10250: 0x9102,
-	10251: 0x997F,
-	10252: 0x6069,
-	10253: 0x800C,
-	10254: 0x513F,
-	10255: 0x8033,
-	10256: 0x5C14,
-	10257: 0x9975,
-	10258: 0x6D31,
-	10259: 0x4E8C,
-	10260: 0x7A1D,
-	10261: 0x7A1F,
-	10262: 0x7A21,
-	10263: 0x7A22,
-	10264: 0x7A24,
-	10265: 0x7A25,
-	10266: 0x7A26,
-	10267: 0x7A27,
-	10268: 0x7A28,
-	10269: 0x7A29,
-	10270: 0x7A2A,
-	10271: 0x7A2B,
-	10272: 0x7A2C,
-	10273: 0x7A2D,
-	10274: 0x7A2E,
-	10275: 0x7A2F,
-	10276: 0x7A30,
-	10277: 0x7A31,
-	10278: 0x7A32,
-	10279: 0x7A34,
-	10280: 0x7A35,
-	10281: 0x7A36,
-	10282: 0x7A38,
-	10283: 0x7A3A,
-	10284: 0x7A3E,
-	10285: 0x7A40,
-	10286: 0x7A41,
-	10287: 0x7A42,
-	10288: 0x7A43,
-	10289: 0x7A44,
-	10290: 0x7A45,
-	10291: 0x7A47,
-	10292: 0x7A48,
-	10293: 0x7A49,
-	10294: 0x7A4A,
-	10295: 0x7A4B,
-	10296: 0x7A4C,
-	10297: 0x7A4D,
-	10298: 0x7A4E,
-	10299: 0x7A4F,
-	10300: 0x7A50,
-	10301: 0x7A52,
-	10302: 0x7A53,
-	10303: 0x7A54,
-	10304: 0x7A55,
-	10305: 0x7A56,
-	10306: 0x7A58,
-	10307: 0x7A59,
-	10308: 0x7A5A,
-	10309: 0x7A5B,
-	10310: 0x7A5C,
-	10311: 0x7A5D,
-	10312: 0x7A5E,
-	10313: 0x7A5F,
-	10314: 0x7A60,
-	10315: 0x7A61,
-	10316: 0x7A62,
-	10317: 0x7A63,
-	10318: 0x7A64,
-	10319: 0x7A65,
-	10320: 0x7A66,
-	10321: 0x7A67,
-	10322: 0x7A68,
-	10323: 0x7A69,
-	10324: 0x7A6A,
-	10325: 0x7A6B,
-	10326: 0x7A6C,
-	10327: 0x7A6D,
-	10328: 0x7A6E,
-	10329: 0x7A6F,
-	10330: 0x7A71,
-	10331: 0x7A72,
-	10332: 0x7A73,
-	10333: 0x7A75,
-	10334: 0x7A7B,
-	10335: 0x7A7C,
-	10336: 0x7A7D,
-	10337: 0x7A7E,
-	10338: 0x7A82,
-	10339: 0x7A85,
-	10340: 0x7A87,
-	10341: 0x7A89,
-	10342: 0x7A8A,
-	10343: 0x7A8B,
-	10344: 0x7A8C,
-	10345: 0x7A8E,
-	10346: 0x7A8F,
-	10347: 0x7A90,
-	10348: 0x7A93,
-	10349: 0x7A94,
-	10350: 0x7A99,
-	10351: 0x7A9A,
-	10352: 0x7A9B,
-	10353: 0x7A9E,
-	10354: 0x7AA1,
-	10355: 0x7AA2,
-	10356: 0x8D30,
-	10357: 0x53D1,
-	10358: 0x7F5A,
-	10359: 0x7B4F,
-	10360: 0x4F10,
-	10361: 0x4E4F,
-	10362: 0x9600,
-	10363: 0x6CD5,
-	10364: 0x73D0,
-	10365: 0x85E9,
-	10366: 0x5E06,
-	10367: 0x756A,
-	10368: 0x7FFB,
-	10369: 0x6A0A,
-	10370: 0x77FE,
-	10371: 0x9492,
-	10372: 0x7E41,
-	10373: 0x51E1,
-	10374: 0x70E6,
-	10375: 0x53CD,
-	10376: 0x8FD4,
-	10377: 0x8303,
-	10378: 0x8D29,
-	10379: 0x72AF,
-	10380: 0x996D,
-	10381: 0x6CDB,
-	10382: 0x574A,
-	10383: 0x82B3,
-	10384: 0x65B9,
-	10385: 0x80AA,
-	10386: 0x623F,
-	10387: 0x9632,
-	10388: 0x59A8,
-	10389: 0x4EFF,
-	10390: 0x8BBF,
-	10391: 0x7EBA,
-	10392: 0x653E,
-	10393: 0x83F2,
-	10394: 0x975E,
-	10395: 0x5561,
-	10396: 0x98DE,
-	10397: 0x80A5,
-	10398: 0x532A,
-	10399: 0x8BFD,
-	10400: 0x5420,
-	10401: 0x80BA,
-	10402: 0x5E9F,
-	10403: 0x6CB8,
-	10404: 0x8D39,
-	10405: 0x82AC,
-	10406: 0x915A,
-	10407: 0x5429,
-	10408: 0x6C1B,
-	10409: 0x5206,
-	10410: 0x7EB7,
-	10411: 0x575F,
-	10412: 0x711A,
-	10413: 0x6C7E,
-	10414: 0x7C89,
-	10415: 0x594B,
-	10416: 0x4EFD,
-	10417: 0x5FFF,
-	10418: 0x6124,
-	10419: 0x7CAA,
-	10420: 0x4E30,
-	10421: 0x5C01,
-	10422: 0x67AB,
-	10423: 0x8702,
-	10424: 0x5CF0,
-	10425: 0x950B,
-	10426: 0x98CE,
-	10427: 0x75AF,
-	10428: 0x70FD,
-	10429: 0x9022,
-	10430: 0x51AF,
-	10431: 0x7F1D,
-	10432: 0x8BBD,
-	10433: 0x5949,
-	10434: 0x51E4,
-	10435: 0x4F5B,
-	10436: 0x5426,
-	10437: 0x592B,
-	10438: 0x6577,
-	10439: 0x80A4,
-	10440: 0x5B75,
-	10441: 0x6276,
-	10442: 0x62C2,
-	10443: 0x8F90,
-	10444: 0x5E45,
-	10445: 0x6C1F,
-	10446: 0x7B26,
-	10447: 0x4F0F,
-	10448: 0x4FD8,
-	10449: 0x670D,
-	10450: 0x7AA3,
-	10451: 0x7AA4,
-	10452: 0x7AA7,
-	10453: 0x7AA9,
-	10454: 0x7AAA,
-	10455: 0x7AAB,
-	10456: 0x7AAE,
-	10457: 0x7AAF,
-	10458: 0x7AB0,
-	10459: 0x7AB1,
-	10460: 0x7AB2,
-	10461: 0x7AB4,
-	10462: 0x7AB5,
-	10463: 0x7AB6,
-	10464: 0x7AB7,
-	10465: 0x7AB8,
-	10466: 0x7AB9,
-	10467: 0x7ABA,
-	10468: 0x7ABB,
-	10469: 0x7ABC,
-	10470: 0x7ABD,
-	10471: 0x7ABE,
-	10472: 0x7AC0,
-	10473: 0x7AC1,
-	10474: 0x7AC2,
-	10475: 0x7AC3,
-	10476: 0x7AC4,
-	10477: 0x7AC5,
-	10478: 0x7AC6,
-	10479: 0x7AC7,
-	10480: 0x7AC8,
-	10481: 0x7AC9,
-	10482: 0x7ACA,
-	10483: 0x7ACC,
-	10484: 0x7ACD,
-	10485: 0x7ACE,
-	10486: 0x7ACF,
-	10487: 0x7AD0,
-	10488: 0x7AD1,
-	10489: 0x7AD2,
-	10490: 0x7AD3,
-	10491: 0x7AD4,
-	10492: 0x7AD5,
-	10493: 0x7AD7,
-	10494: 0x7AD8,
-	10495: 0x7ADA,
-	10496: 0x7ADB,
-	10497: 0x7ADC,
-	10498: 0x7ADD,
-	10499: 0x7AE1,
-	10500: 0x7AE2,
-	10501: 0x7AE4,
-	10502: 0x7AE7,
-	10503: 0x7AE8,
-	10504: 0x7AE9,
-	10505: 0x7AEA,
-	10506: 0x7AEB,
-	10507: 0x7AEC,
-	10508: 0x7AEE,
-	10509: 0x7AF0,
-	10510: 0x7AF1,
-	10511: 0x7AF2,
-	10512: 0x7AF3,
-	10513: 0x7AF4,
-	10514: 0x7AF5,
-	10515: 0x7AF6,
-	10516: 0x7AF7,
-	10517: 0x7AF8,
-	10518: 0x7AFB,
-	10519: 0x7AFC,
-	10520: 0x7AFE,
-	10521: 0x7B00,
-	10522: 0x7B01,
-	10523: 0x7B02,
-	10524: 0x7B05,
-	10525: 0x7B07,
-	10526: 0x7B09,
-	10527: 0x7B0C,
-	10528: 0x7B0D,
-	10529: 0x7B0E,
-	10530: 0x7B10,
-	10531: 0x7B12,
-	10532: 0x7B13,
-	10533: 0x7B16,
-	10534: 0x7B17,
-	10535: 0x7B18,
-	10536: 0x7B1A,
-	10537: 0x7B1C,
-	10538: 0x7B1D,
-	10539: 0x7B1F,
-	10540: 0x7B21,
-	10541: 0x7B22,
-	10542: 0x7B23,
-	10543: 0x7B27,
-	10544: 0x7B29,
-	10545: 0x7B2D,
-	10546: 0x6D6E,
-	10547: 0x6DAA,
-	10548: 0x798F,
-	10549: 0x88B1,
-	10550: 0x5F17,
-	10551: 0x752B,
-	10552: 0x629A,
-	10553: 0x8F85,
-	10554: 0x4FEF,
-	10555: 0x91DC,
-	10556: 0x65A7,
-	10557: 0x812F,
-	10558: 0x8151,
-	10559: 0x5E9C,
-	10560: 0x8150,
-	10561: 0x8D74,
-	10562: 0x526F,
-	10563: 0x8986,
-	10564: 0x8D4B,
-	10565: 0x590D,
-	10566: 0x5085,
-	10567: 0x4ED8,
-	10568: 0x961C,
-	10569: 0x7236,
-	10570: 0x8179,
-	10571: 0x8D1F,
-	10572: 0x5BCC,
-	10573: 0x8BA3,
-	10574: 0x9644,
-	10575: 0x5987,
-	10576: 0x7F1A,
-	10577: 0x5490,
-	10578: 0x5676,
-	10579: 0x560E,
-	10580: 0x8BE5,
-	10581: 0x6539,
-	10582: 0x6982,
-	10583: 0x9499,
-	10584: 0x76D6,
-	10585: 0x6E89,
-	10586: 0x5E72,
-	10587: 0x7518,
-	10588: 0x6746,
-	10589: 0x67D1,
-	10590: 0x7AFF,
-	10591: 0x809D,
-	10592: 0x8D76,
-	10593: 0x611F,
-	10594: 0x79C6,
-	10595: 0x6562,
-	10596: 0x8D63,
-	10597: 0x5188,
-	10598: 0x521A,
-	10599: 0x94A2,
-	10600: 0x7F38,
-	10601: 0x809B,
-	10602: 0x7EB2,
-	10603: 0x5C97,
-	10604: 0x6E2F,
-	10605: 0x6760,
-	10606: 0x7BD9,
-	10607: 0x768B,
-	10608: 0x9AD8,
-	10609: 0x818F,
-	10610: 0x7F94,
-	10611: 0x7CD5,
-	10612: 0x641E,
-	10613: 0x9550,
-	10614: 0x7A3F,
-	10615: 0x544A,
-	10616: 0x54E5,
-	10617: 0x6B4C,
-	10618: 0x6401,
-	10619: 0x6208,
-	10620: 0x9E3D,
-	10621: 0x80F3,
-	10622: 0x7599,
-	10623: 0x5272,
-	10624: 0x9769,
-	10625: 0x845B,
-	10626: 0x683C,
-	10627: 0x86E4,
-	10628: 0x9601,
-	10629: 0x9694,
-	10630: 0x94EC,
-	10631: 0x4E2A,
-	10632: 0x5404,
-	10633: 0x7ED9,
-	10634: 0x6839,
-	10635: 0x8DDF,
-	10636: 0x8015,
-	10637: 0x66F4,
-	10638: 0x5E9A,
-	10639: 0x7FB9,
-	10640: 0x7B2F,
-	10641: 0x7B30,
-	10642: 0x7B32,
-	10643: 0x7B34,
-	10644: 0x7B35,
-	10645: 0x7B36,
-	10646: 0x7B37,
-	10647: 0x7B39,
-	10648: 0x7B3B,
-	10649: 0x7B3D,
-	10650: 0x7B3F,
-	10651: 0x7B40,
-	10652: 0x7B41,
-	10653: 0x7B42,
-	10654: 0x7B43,
-	10655: 0x7B44,
-	10656: 0x7B46,
-	10657: 0x7B48,
-	10658: 0x7B4A,
-	10659: 0x7B4D,
-	10660: 0x7B4E,
-	10661: 0x7B53,
-	10662: 0x7B55,
-	10663: 0x7B57,
-	10664: 0x7B59,
-	10665: 0x7B5C,
-	10666: 0x7B5E,
-	10667: 0x7B5F,
-	10668: 0x7B61,
-	10669: 0x7B63,
-	10670: 0x7B64,
-	10671: 0x7B65,
-	10672: 0x7B66,
-	10673: 0x7B67,
-	10674: 0x7B68,
-	10675: 0x7B69,
-	10676: 0x7B6A,
-	10677: 0x7B6B,
-	10678: 0x7B6C,
-	10679: 0x7B6D,
-	10680: 0x7B6F,
-	10681: 0x7B70,
-	10682: 0x7B73,
-	10683: 0x7B74,
-	10684: 0x7B76,
-	10685: 0x7B78,
-	10686: 0x7B7A,
-	10687: 0x7B7C,
-	10688: 0x7B7D,
-	10689: 0x7B7F,
-	10690: 0x7B81,
-	10691: 0x7B82,
-	10692: 0x7B83,
-	10693: 0x7B84,
-	10694: 0x7B86,
-	10695: 0x7B87,
-	10696: 0x7B88,
-	10697: 0x7B89,
-	10698: 0x7B8A,
-	10699: 0x7B8B,
-	10700: 0x7B8C,
-	10701: 0x7B8E,
-	10702: 0x7B8F,
-	10703: 0x7B91,
-	10704: 0x7B92,
-	10705: 0x7B93,
-	10706: 0x7B96,
-	10707: 0x7B98,
-	10708: 0x7B99,
-	10709: 0x7B9A,
-	10710: 0x7B9B,
-	10711: 0x7B9E,
-	10712: 0x7B9F,
-	10713: 0x7BA0,
-	10714: 0x7BA3,
-	10715: 0x7BA4,
-	10716: 0x7BA5,
-	10717: 0x7BAE,
-	10718: 0x7BAF,
-	10719: 0x7BB0,
-	10720: 0x7BB2,
-	10721: 0x7BB3,
-	10722: 0x7BB5,
-	10723: 0x7BB6,
-	10724: 0x7BB7,
-	10725: 0x7BB9,
-	10726: 0x7BBA,
-	10727: 0x7BBB,
-	10728: 0x7BBC,
-	10729: 0x7BBD,
-	10730: 0x7BBE,
-	10731: 0x7BBF,
-	10732: 0x7BC0,
-	10733: 0x7BC2,
-	10734: 0x7BC3,
-	10735: 0x7BC4,
-	10736: 0x57C2,
-	10737: 0x803F,
-	10738: 0x6897,
-	10739: 0x5DE5,
-	10740: 0x653B,
-	10741: 0x529F,
-	10742: 0x606D,
-	10743: 0x9F9A,
-	10744: 0x4F9B,
-	10745: 0x8EAC,
-	10746: 0x516C,
-	10747: 0x5BAB,
-	10748: 0x5F13,
-	10749: 0x5DE9,
-	10750: 0x6C5E,
-	10751: 0x62F1,
-	10752: 0x8D21,
-	10753: 0x5171,
-	10754: 0x94A9,
-	10755: 0x52FE,
-	10756: 0x6C9F,
-	10757: 0x82DF,
-	10758: 0x72D7,
-	10759: 0x57A2,
-	10760: 0x6784,
-	10761: 0x8D2D,
-	10762: 0x591F,
-	10763: 0x8F9C,
-	10764: 0x83C7,
-	10765: 0x5495,
-	10766: 0x7B8D,
-	10767: 0x4F30,
-	10768: 0x6CBD,
-	10769: 0x5B64,
-	10770: 0x59D1,
-	10771: 0x9F13,
-	10772: 0x53E4,
-	10773: 0x86CA,
-	10774: 0x9AA8,
-	10775: 0x8C37,
-	10776: 0x80A1,
-	10777: 0x6545,
-	10778: 0x987E,
-	10779: 0x56FA,
-	10780: 0x96C7,
-	10781: 0x522E,
-	10782: 0x74DC,
-	10783: 0x5250,
-	10784: 0x5BE1,
-	10785: 0x6302,
-	10786: 0x8902,
-	10787: 0x4E56,
-	10788: 0x62D0,
-	10789: 0x602A,
-	10790: 0x68FA,
-	10791: 0x5173,
-	10792: 0x5B98,
-	10793: 0x51A0,
-	10794: 0x89C2,
-	10795: 0x7BA1,
-	10796: 0x9986,
-	10797: 0x7F50,
-	10798: 0x60EF,
-	10799: 0x704C,
-	10800: 0x8D2F,
-	10801: 0x5149,
-	10802: 0x5E7F,
-	10803: 0x901B,
-	10804: 0x7470,
-	10805: 0x89C4,
-	10806: 0x572D,
-	10807: 0x7845,
-	10808: 0x5F52,
-	10809: 0x9F9F,
-	10810: 0x95FA,
-	10811: 0x8F68,
-	10812: 0x9B3C,
-	10813: 0x8BE1,
-	10814: 0x7678,
-	10815: 0x6842,
-	10816: 0x67DC,
-	10817: 0x8DEA,
-	10818: 0x8D35,
-	10819: 0x523D,
-	10820: 0x8F8A,
-	10821: 0x6EDA,
-	10822: 0x68CD,
-	10823: 0x9505,
-	10824: 0x90ED,
-	10825: 0x56FD,
-	10826: 0x679C,
-	10827: 0x88F9,
-	10828: 0x8FC7,
-	10829: 0x54C8,
-	10830: 0x7BC5,
-	10831: 0x7BC8,
-	10832: 0x7BC9,
-	10833: 0x7BCA,
-	10834: 0x7BCB,
-	10835: 0x7BCD,
-	10836: 0x7BCE,
-	10837: 0x7BCF,
-	10838: 0x7BD0,
-	10839: 0x7BD2,
-	10840: 0x7BD4,
-	10841: 0x7BD5,
-	10842: 0x7BD6,
-	10843: 0x7BD7,
-	10844: 0x7BD8,
-	10845: 0x7BDB,
-	10846: 0x7BDC,
-	10847: 0x7BDE,
-	10848: 0x7BDF,
-	10849: 0x7BE0,
-	10850: 0x7BE2,
-	10851: 0x7BE3,
-	10852: 0x7BE4,
-	10853: 0x7BE7,
-	10854: 0x7BE8,
-	10855: 0x7BE9,
-	10856: 0x7BEB,
-	10857: 0x7BEC,
-	10858: 0x7BED,
-	10859: 0x7BEF,
-	10860: 0x7BF0,
-	10861: 0x7BF2,
-	10862: 0x7BF3,
-	10863: 0x7BF4,
-	10864: 0x7BF5,
-	10865: 0x7BF6,
-	10866: 0x7BF8,
-	10867: 0x7BF9,
-	10868: 0x7BFA,
-	10869: 0x7BFB,
-	10870: 0x7BFD,
-	10871: 0x7BFF,
-	10872: 0x7C00,
-	10873: 0x7C01,
-	10874: 0x7C02,
-	10875: 0x7C03,
-	10876: 0x7C04,
-	10877: 0x7C05,
-	10878: 0x7C06,
-	10879: 0x7C08,
-	10880: 0x7C09,
-	10881: 0x7C0A,
-	10882: 0x7C0D,
-	10883: 0x7C0E,
-	10884: 0x7C10,
-	10885: 0x7C11,
-	10886: 0x7C12,
-	10887: 0x7C13,
-	10888: 0x7C14,
-	10889: 0x7C15,
-	10890: 0x7C17,
-	10891: 0x7C18,
-	10892: 0x7C19,
-	10893: 0x7C1A,
-	10894: 0x7C1B,
-	10895: 0x7C1C,
-	10896: 0x7C1D,
-	10897: 0x7C1E,
-	10898: 0x7C20,
-	10899: 0x7C21,
-	10900: 0x7C22,
-	10901: 0x7C23,
-	10902: 0x7C24,
-	10903: 0x7C25,
-	10904: 0x7C28,
-	10905: 0x7C29,
-	10906: 0x7C2B,
-	10907: 0x7C2C,
-	10908: 0x7C2D,
-	10909: 0x7C2E,
-	10910: 0x7C2F,
-	10911: 0x7C30,
-	10912: 0x7C31,
-	10913: 0x7C32,
-	10914: 0x7C33,
-	10915: 0x7C34,
-	10916: 0x7C35,
-	10917: 0x7C36,
-	10918: 0x7C37,
-	10919: 0x7C39,
-	10920: 0x7C3A,
-	10921: 0x7C3B,
-	10922: 0x7C3C,
-	10923: 0x7C3D,
-	10924: 0x7C3E,
-	10925: 0x7C42,
-	10926: 0x9AB8,
-	10927: 0x5B69,
-	10928: 0x6D77,
-	10929: 0x6C26,
-	10930: 0x4EA5,
-	10931: 0x5BB3,
-	10932: 0x9A87,
-	10933: 0x9163,
-	10934: 0x61A8,
-	10935: 0x90AF,
-	10936: 0x97E9,
-	10937: 0x542B,
-	10938: 0x6DB5,
-	10939: 0x5BD2,
-	10940: 0x51FD,
-	10941: 0x558A,
-	10942: 0x7F55,
-	10943: 0x7FF0,
-	10944: 0x64BC,
-	10945: 0x634D,
-	10946: 0x65F1,
-	10947: 0x61BE,
-	10948: 0x608D,
-	10949: 0x710A,
-	10950: 0x6C57,
-	10951: 0x6C49,
-	10952: 0x592F,
-	10953: 0x676D,
-	10954: 0x822A,
-	10955: 0x58D5,
-	10956: 0x568E,
-	10957: 0x8C6A,
-	10958: 0x6BEB,
-	10959: 0x90DD,
-	10960: 0x597D,
-	10961: 0x8017,
-	10962: 0x53F7,
-	10963: 0x6D69,
-	10964: 0x5475,
-	10965: 0x559D,
-	10966: 0x8377,
-	10967: 0x83CF,
-	10968: 0x6838,
-	10969: 0x79BE,
-	10970: 0x548C,
-	10971: 0x4F55,
-	10972: 0x5408,
-	10973: 0x76D2,
-	10974: 0x8C89,
-	10975: 0x9602,
-	10976: 0x6CB3,
-	10977: 0x6DB8,
-	10978: 0x8D6B,
-	10979: 0x8910,
-	10980: 0x9E64,
-	10981: 0x8D3A,
-	10982: 0x563F,
-	10983: 0x9ED1,
-	10984: 0x75D5,
-	10985: 0x5F88,
-	10986: 0x72E0,
-	10987: 0x6068,
-	10988: 0x54FC,
-	10989: 0x4EA8,
-	10990: 0x6A2A,
-	10991: 0x8861,
-	10992: 0x6052,
-	10993: 0x8F70,
-	10994: 0x54C4,
-	10995: 0x70D8,
-	10996: 0x8679,
-	10997: 0x9E3F,
-	10998: 0x6D2A,
-	10999: 0x5B8F,
-	11000: 0x5F18,
-	11001: 0x7EA2,
-	11002: 0x5589,
-	11003: 0x4FAF,
-	11004: 0x7334,
-	11005: 0x543C,
-	11006: 0x539A,
-	11007: 0x5019,
-	11008: 0x540E,
-	11009: 0x547C,
-	11010: 0x4E4E,
-	11011: 0x5FFD,
-	11012: 0x745A,
-	11013: 0x58F6,
-	11014: 0x846B,
-	11015: 0x80E1,
-	11016: 0x8774,
-	11017: 0x72D0,
-	11018: 0x7CCA,
-	11019: 0x6E56,
-	11020: 0x7C43,
-	11021: 0x7C44,
-	11022: 0x7C45,
-	11023: 0x7C46,
-	11024: 0x7C47,
-	11025: 0x7C48,
-	11026: 0x7C49,
-	11027: 0x7C4A,
-	11028: 0x7C4B,
-	11029: 0x7C4C,
-	11030: 0x7C4E,
-	11031: 0x7C4F,
-	11032: 0x7C50,
-	11033: 0x7C51,
-	11034: 0x7C52,
-	11035: 0x7C53,
-	11036: 0x7C54,
-	11037: 0x7C55,
-	11038: 0x7C56,
-	11039: 0x7C57,
-	11040: 0x7C58,
-	11041: 0x7C59,
-	11042: 0x7C5A,
-	11043: 0x7C5B,
-	11044: 0x7C5C,
-	11045: 0x7C5D,
-	11046: 0x7C5E,
-	11047: 0x7C5F,
-	11048: 0x7C60,
-	11049: 0x7C61,
-	11050: 0x7C62,
-	11051: 0x7C63,
-	11052: 0x7C64,
-	11053: 0x7C65,
-	11054: 0x7C66,
-	11055: 0x7C67,
-	11056: 0x7C68,
-	11057: 0x7C69,
-	11058: 0x7C6A,
-	11059: 0x7C6B,
-	11060: 0x7C6C,
-	11061: 0x7C6D,
-	11062: 0x7C6E,
-	11063: 0x7C6F,
-	11064: 0x7C70,
-	11065: 0x7C71,
-	11066: 0x7C72,
-	11067: 0x7C75,
-	11068: 0x7C76,
-	11069: 0x7C77,
-	11070: 0x7C78,
-	11071: 0x7C79,
-	11072: 0x7C7A,
-	11073: 0x7C7E,
-	11074: 0x7C7F,
-	11075: 0x7C80,
-	11076: 0x7C81,
-	11077: 0x7C82,
-	11078: 0x7C83,
-	11079: 0x7C84,
-	11080: 0x7C85,
-	11081: 0x7C86,
-	11082: 0x7C87,
-	11083: 0x7C88,
-	11084: 0x7C8A,
-	11085: 0x7C8B,
-	11086: 0x7C8C,
-	11087: 0x7C8D,
-	11088: 0x7C8E,
-	11089: 0x7C8F,
-	11090: 0x7C90,
-	11091: 0x7C93,
-	11092: 0x7C94,
-	11093: 0x7C96,
-	11094: 0x7C99,
-	11095: 0x7C9A,
-	11096: 0x7C9B,
-	11097: 0x7CA0,
-	11098: 0x7CA1,
-	11099: 0x7CA3,
-	11100: 0x7CA6,
-	11101: 0x7CA7,
-	11102: 0x7CA8,
-	11103: 0x7CA9,
-	11104: 0x7CAB,
-	11105: 0x7CAC,
-	11106: 0x7CAD,
-	11107: 0x7CAF,
-	11108: 0x7CB0,
-	11109: 0x7CB4,
-	11110: 0x7CB5,
-	11111: 0x7CB6,
-	11112: 0x7CB7,
-	11113: 0x7CB8,
-	11114: 0x7CBA,
-	11115: 0x7CBB,
-	11116: 0x5F27,
-	11117: 0x864E,
-	11118: 0x552C,
-	11119: 0x62A4,
-	11120: 0x4E92,
-	11121: 0x6CAA,
-	11122: 0x6237,
-	11123: 0x82B1,
-	11124: 0x54D7,
-	11125: 0x534E,
-	11126: 0x733E,
-	11127: 0x6ED1,
-	11128: 0x753B,
-	11129: 0x5212,
-	11130: 0x5316,
-	11131: 0x8BDD,
-	11132: 0x69D0,
-	11133: 0x5F8A,
-	11134: 0x6000,
-	11135: 0x6DEE,
-	11136: 0x574F,
-	11137: 0x6B22,
-	11138: 0x73AF,
-	11139: 0x6853,
-	11140: 0x8FD8,
-	11141: 0x7F13,
-	11142: 0x6362,
-	11143: 0x60A3,
-	11144: 0x5524,
-	11145: 0x75EA,
-	11146: 0x8C62,
-	11147: 0x7115,
-	11148: 0x6DA3,
-	11149: 0x5BA6,
-	11150: 0x5E7B,
-	11151: 0x8352,
-	11152: 0x614C,
-	11153: 0x9EC4,
-	11154: 0x78FA,
-	11155: 0x8757,
-	11156: 0x7C27,
-	11157: 0x7687,
-	11158: 0x51F0,
-	11159: 0x60F6,
-	11160: 0x714C,
-	11161: 0x6643,
-	11162: 0x5E4C,
-	11163: 0x604D,
-	11164: 0x8C0E,
-	11165: 0x7070,
-	11166: 0x6325,
-	11167: 0x8F89,
-	11168: 0x5FBD,
-	11169: 0x6062,
-	11170: 0x86D4,
-	11171: 0x56DE,
-	11172: 0x6BC1,
-	11173: 0x6094,
-	11174: 0x6167,
-	11175: 0x5349,
-	11176: 0x60E0,
-	11177: 0x6666,
-	11178: 0x8D3F,
-	11179: 0x79FD,
-	11180: 0x4F1A,
-	11181: 0x70E9,
-	11182: 0x6C47,
-	11183: 0x8BB3,
-	11184: 0x8BF2,
-	11185: 0x7ED8,
-	11186: 0x8364,
-	11187: 0x660F,
-	11188: 0x5A5A,
-	11189: 0x9B42,
-	11190: 0x6D51,
-	11191: 0x6DF7,
-	11192: 0x8C41,
-	11193: 0x6D3B,
-	11194: 0x4F19,
-	11195: 0x706B,
-	11196: 0x83B7,
-	11197: 0x6216,
-	11198: 0x60D1,
-	11199: 0x970D,
-	11200: 0x8D27,
-	11201: 0x7978,
-	11202: 0x51FB,
-	11203: 0x573E,
-	11204: 0x57FA,
-	11205: 0x673A,
-	11206: 0x7578,
-	11207: 0x7A3D,
-	11208: 0x79EF,
-	11209: 0x7B95,
-	11210: 0x7CBF,
-	11211: 0x7CC0,
-	11212: 0x7CC2,
-	11213: 0x7CC3,
-	11214: 0x7CC4,
-	11215: 0x7CC6,
-	11216: 0x7CC9,
-	11217: 0x7CCB,
-	11218: 0x7CCE,
-	11219: 0x7CCF,
-	11220: 0x7CD0,
-	11221: 0x7CD1,
-	11222: 0x7CD2,
-	11223: 0x7CD3,
-	11224: 0x7CD4,
-	11225: 0x7CD8,
-	11226: 0x7CDA,
-	11227: 0x7CDB,
-	11228: 0x7CDD,
-	11229: 0x7CDE,
-	11230: 0x7CE1,
-	11231: 0x7CE2,
-	11232: 0x7CE3,
-	11233: 0x7CE4,
-	11234: 0x7CE5,
-	11235: 0x7CE6,
-	11236: 0x7CE7,
-	11237: 0x7CE9,
-	11238: 0x7CEA,
-	11239: 0x7CEB,
-	11240: 0x7CEC,
-	11241: 0x7CED,
-	11242: 0x7CEE,
-	11243: 0x7CF0,
-	11244: 0x7CF1,
-	11245: 0x7CF2,
-	11246: 0x7CF3,
-	11247: 0x7CF4,
-	11248: 0x7CF5,
-	11249: 0x7CF6,
-	11250: 0x7CF7,
-	11251: 0x7CF9,
-	11252: 0x7CFA,
-	11253: 0x7CFC,
-	11254: 0x7CFD,
-	11255: 0x7CFE,
-	11256: 0x7CFF,
-	11257: 0x7D00,
-	11258: 0x7D01,
-	11259: 0x7D02,
-	11260: 0x7D03,
-	11261: 0x7D04,
-	11262: 0x7D05,
-	11263: 0x7D06,
-	11264: 0x7D07,
-	11265: 0x7D08,
-	11266: 0x7D09,
-	11267: 0x7D0B,
-	11268: 0x7D0C,
-	11269: 0x7D0D,
-	11270: 0x7D0E,
-	11271: 0x7D0F,
-	11272: 0x7D10,
-	11273: 0x7D11,
-	11274: 0x7D12,
-	11275: 0x7D13,
-	11276: 0x7D14,
-	11277: 0x7D15,
-	11278: 0x7D16,
-	11279: 0x7D17,
-	11280: 0x7D18,
-	11281: 0x7D19,
-	11282: 0x7D1A,
-	11283: 0x7D1B,
-	11284: 0x7D1C,
-	11285: 0x7D1D,
-	11286: 0x7D1E,
-	11287: 0x7D1F,
-	11288: 0x7D21,
-	11289: 0x7D23,
-	11290: 0x7D24,
-	11291: 0x7D25,
-	11292: 0x7D26,
-	11293: 0x7D28,
-	11294: 0x7D29,
-	11295: 0x7D2A,
-	11296: 0x7D2C,
-	11297: 0x7D2D,
-	11298: 0x7D2E,
-	11299: 0x7D30,
-	11300: 0x7D31,
-	11301: 0x7D32,
-	11302: 0x7D33,
-	11303: 0x7D34,
-	11304: 0x7D35,
-	11305: 0x7D36,
-	11306: 0x808C,
-	11307: 0x9965,
-	11308: 0x8FF9,
-	11309: 0x6FC0,
-	11310: 0x8BA5,
-	11311: 0x9E21,
-	11312: 0x59EC,
-	11313: 0x7EE9,
-	11314: 0x7F09,
-	11315: 0x5409,
-	11316: 0x6781,
-	11317: 0x68D8,
-	11318: 0x8F91,
-	11319: 0x7C4D,
-	11320: 0x96C6,
-	11321: 0x53CA,
-	11322: 0x6025,
-	11323: 0x75BE,
-	11324: 0x6C72,
-	11325: 0x5373,
-	11326: 0x5AC9,
-	11327: 0x7EA7,
-	11328: 0x6324,
-	11329: 0x51E0,
-	11330: 0x810A,
-	11331: 0x5DF1,
-	11332: 0x84DF,
-	11333: 0x6280,
-	11334: 0x5180,
-	11335: 0x5B63,
-	11336: 0x4F0E,
-	11337: 0x796D,
-	11338: 0x5242,
-	11339: 0x60B8,
-	11340: 0x6D4E,
-	11341: 0x5BC4,
-	11342: 0x5BC2,
-	11343: 0x8BA1,
-	11344: 0x8BB0,
-	11345: 0x65E2,
-	11346: 0x5FCC,
-	11347: 0x9645,
-	11348: 0x5993,
-	11349: 0x7EE7,
-	11350: 0x7EAA,
-	11351: 0x5609,
-	11352: 0x67B7,
-	11353: 0x5939,
-	11354: 0x4F73,
-	11355: 0x5BB6,
-	11356: 0x52A0,
-	11357: 0x835A,
-	11358: 0x988A,
-	11359: 0x8D3E,
-	11360: 0x7532,
-	11361: 0x94BE,
-	11362: 0x5047,
-	11363: 0x7A3C,
-	11364: 0x4EF7,
-	11365: 0x67B6,
-	11366: 0x9A7E,
-	11367: 0x5AC1,
-	11368: 0x6B7C,
-	11369: 0x76D1,
-	11370: 0x575A,
-	11371: 0x5C16,
-	11372: 0x7B3A,
-	11373: 0x95F4,
-	11374: 0x714E,
-	11375: 0x517C,
-	11376: 0x80A9,
-	11377: 0x8270,
-	11378: 0x5978,
-	11379: 0x7F04,
-	11380: 0x8327,
-	11381: 0x68C0,
-	11382: 0x67EC,
-	11383: 0x78B1,
-	11384: 0x7877,
-	11385: 0x62E3,
-	11386: 0x6361,
-	11387: 0x7B80,
-	11388: 0x4FED,
-	11389: 0x526A,
-	11390: 0x51CF,
-	11391: 0x8350,
-	11392: 0x69DB,
-	11393: 0x9274,
-	11394: 0x8DF5,
-	11395: 0x8D31,
-	11396: 0x89C1,
-	11397: 0x952E,
-	11398: 0x7BAD,
-	11399: 0x4EF6,
-	11400: 0x7D37,
-	11401: 0x7D38,
-	11402: 0x7D39,
-	11403: 0x7D3A,
-	11404: 0x7D3B,
-	11405: 0x7D3C,
-	11406: 0x7D3D,
-	11407: 0x7D3E,
-	11408: 0x7D3F,
-	11409: 0x7D40,
-	11410: 0x7D41,
-	11411: 0x7D42,
-	11412: 0x7D43,
-	11413: 0x7D44,
-	11414: 0x7D45,
-	11415: 0x7D46,
-	11416: 0x7D47,
-	11417: 0x7D48,
-	11418: 0x7D49,
-	11419: 0x7D4A,
-	11420: 0x7D4B,
-	11421: 0x7D4C,
-	11422: 0x7D4D,
-	11423: 0x7D4E,
-	11424: 0x7D4F,
-	11425: 0x7D50,
-	11426: 0x7D51,
-	11427: 0x7D52,
-	11428: 0x7D53,
-	11429: 0x7D54,
-	11430: 0x7D55,
-	11431: 0x7D56,
-	11432: 0x7D57,
-	11433: 0x7D58,
-	11434: 0x7D59,
-	11435: 0x7D5A,
-	11436: 0x7D5B,
-	11437: 0x7D5C,
-	11438: 0x7D5D,
-	11439: 0x7D5E,
-	11440: 0x7D5F,
-	11441: 0x7D60,
-	11442: 0x7D61,
-	11443: 0x7D62,
-	11444: 0x7D63,
-	11445: 0x7D64,
-	11446: 0x7D65,
-	11447: 0x7D66,
-	11448: 0x7D67,
-	11449: 0x7D68,
-	11450: 0x7D69,
-	11451: 0x7D6A,
-	11452: 0x7D6B,
-	11453: 0x7D6C,
-	11454: 0x7D6D,
-	11455: 0x7D6F,
-	11456: 0x7D70,
-	11457: 0x7D71,
-	11458: 0x7D72,
-	11459: 0x7D73,
-	11460: 0x7D74,
-	11461: 0x7D75,
-	11462: 0x7D76,
-	11463: 0x7D78,
-	11464: 0x7D79,
-	11465: 0x7D7A,
-	11466: 0x7D7B,
-	11467: 0x7D7C,
-	11468: 0x7D7D,
-	11469: 0x7D7E,
-	11470: 0x7D7F,
-	11471: 0x7D80,
-	11472: 0x7D81,
-	11473: 0x7D82,
-	11474: 0x7D83,
-	11475: 0x7D84,
-	11476: 0x7D85,
-	11477: 0x7D86,
-	11478: 0x7D87,
-	11479: 0x7D88,
-	11480: 0x7D89,
-	11481: 0x7D8A,
-	11482: 0x7D8B,
-	11483: 0x7D8C,
-	11484: 0x7D8D,
-	11485: 0x7D8E,
-	11486: 0x7D8F,
-	11487: 0x7D90,
-	11488: 0x7D91,
-	11489: 0x7D92,
-	11490: 0x7D93,
-	11491: 0x7D94,
-	11492: 0x7D95,
-	11493: 0x7D96,
-	11494: 0x7D97,
-	11495: 0x7D98,
-	11496: 0x5065,
-	11497: 0x8230,
-	11498: 0x5251,
-	11499: 0x996F,
-	11500: 0x6E10,
-	11501: 0x6E85,
-	11502: 0x6DA7,
-	11503: 0x5EFA,
-	11504: 0x50F5,
-	11505: 0x59DC,
-	11506: 0x5C06,
-	11507: 0x6D46,
-	11508: 0x6C5F,
-	11509: 0x7586,
-	11510: 0x848B,
-	11511: 0x6868,
-	11512: 0x5956,
-	11513: 0x8BB2,
-	11514: 0x5320,
-	11515: 0x9171,
-	11516: 0x964D,
-	11517: 0x8549,
-	11518: 0x6912,
-	11519: 0x7901,
-	11520: 0x7126,
-	11521: 0x80F6,
-	11522: 0x4EA4,
-	11523: 0x90CA,
-	11524: 0x6D47,
-	11525: 0x9A84,
-	11526: 0x5A07,
-	11527: 0x56BC,
-	11528: 0x6405,
-	11529: 0x94F0,
-	11530: 0x77EB,
-	11531: 0x4FA5,
-	11532: 0x811A,
-	11533: 0x72E1,
-	11534: 0x89D2,
-	11535: 0x997A,
-	11536: 0x7F34,
-	11537: 0x7EDE,
-	11538: 0x527F,
-	11539: 0x6559,
-	11540: 0x9175,
-	11541: 0x8F7F,
-	11542: 0x8F83,
-	11543: 0x53EB,
-	11544: 0x7A96,
-	11545: 0x63ED,
-	11546: 0x63A5,
-	11547: 0x7686,
-	11548: 0x79F8,
-	11549: 0x8857,
-	11550: 0x9636,
-	11551: 0x622A,
-	11552: 0x52AB,
-	11553: 0x8282,
-	11554: 0x6854,
-	11555: 0x6770,
-	11556: 0x6377,
-	11557: 0x776B,
-	11558: 0x7AED,
-	11559: 0x6D01,
-	11560: 0x7ED3,
-	11561: 0x89E3,
-	11562: 0x59D0,
-	11563: 0x6212,
-	11564: 0x85C9,
-	11565: 0x82A5,
-	11566: 0x754C,
-	11567: 0x501F,
-	11568: 0x4ECB,
-	11569: 0x75A5,
-	11570: 0x8BEB,
-	11571: 0x5C4A,
-	11572: 0x5DFE,
-	11573: 0x7B4B,
-	11574: 0x65A4,
-	11575: 0x91D1,
-	11576: 0x4ECA,
-	11577: 0x6D25,
-	11578: 0x895F,
-	11579: 0x7D27,
-	11580: 0x9526,
-	11581: 0x4EC5,
-	11582: 0x8C28,
-	11583: 0x8FDB,
-	11584: 0x9773,
-	11585: 0x664B,
-	11586: 0x7981,
-	11587: 0x8FD1,
-	11588: 0x70EC,
-	11589: 0x6D78,
-	11590: 0x7D99,
-	11591: 0x7D9A,
-	11592: 0x7D9B,
-	11593: 0x7D9C,
-	11594: 0x7D9D,
-	11595: 0x7D9E,
-	11596: 0x7D9F,
-	11597: 0x7DA0,
-	11598: 0x7DA1,
-	11599: 0x7DA2,
-	11600: 0x7DA3,
-	11601: 0x7DA4,
-	11602: 0x7DA5,
-	11603: 0x7DA7,
-	11604: 0x7DA8,
-	11605: 0x7DA9,
-	11606: 0x7DAA,
-	11607: 0x7DAB,
-	11608: 0x7DAC,
-	11609: 0x7DAD,
-	11610: 0x7DAF,
-	11611: 0x7DB0,
-	11612: 0x7DB1,
-	11613: 0x7DB2,
-	11614: 0x7DB3,
-	11615: 0x7DB4,
-	11616: 0x7DB5,
-	11617: 0x7DB6,
-	11618: 0x7DB7,
-	11619: 0x7DB8,
-	11620: 0x7DB9,
-	11621: 0x7DBA,
-	11622: 0x7DBB,
-	11623: 0x7DBC,
-	11624: 0x7DBD,
-	11625: 0x7DBE,
-	11626: 0x7DBF,
-	11627: 0x7DC0,
-	11628: 0x7DC1,
-	11629: 0x7DC2,
-	11630: 0x7DC3,
-	11631: 0x7DC4,
-	11632: 0x7DC5,
-	11633: 0x7DC6,
-	11634: 0x7DC7,
-	11635: 0x7DC8,
-	11636: 0x7DC9,
-	11637: 0x7DCA,
-	11638: 0x7DCB,
-	11639: 0x7DCC,
-	11640: 0x7DCD,
-	11641: 0x7DCE,
-	11642: 0x7DCF,
-	11643: 0x7DD0,
-	11644: 0x7DD1,
-	11645: 0x7DD2,
-	11646: 0x7DD3,
-	11647: 0x7DD4,
-	11648: 0x7DD5,
-	11649: 0x7DD6,
-	11650: 0x7DD7,
-	11651: 0x7DD8,
-	11652: 0x7DD9,
-	11653: 0x7DDA,
-	11654: 0x7DDB,
-	11655: 0x7DDC,
-	11656: 0x7DDD,
-	11657: 0x7DDE,
-	11658: 0x7DDF,
-	11659: 0x7DE0,
-	11660: 0x7DE1,
-	11661: 0x7DE2,
-	11662: 0x7DE3,
-	11663: 0x7DE4,
-	11664: 0x7DE5,
-	11665: 0x7DE6,
-	11666: 0x7DE7,
-	11667: 0x7DE8,
-	11668: 0x7DE9,
-	11669: 0x7DEA,
-	11670: 0x7DEB,
-	11671: 0x7DEC,
-	11672: 0x7DED,
-	11673: 0x7DEE,
-	11674: 0x7DEF,
-	11675: 0x7DF0,
-	11676: 0x7DF1,
-	11677: 0x7DF2,
-	11678: 0x7DF3,
-	11679: 0x7DF4,
-	11680: 0x7DF5,
-	11681: 0x7DF6,
-	11682: 0x7DF7,
-	11683: 0x7DF8,
-	11684: 0x7DF9,
-	11685: 0x7DFA,
-	11686: 0x5C3D,
-	11687: 0x52B2,
-	11688: 0x8346,
-	11689: 0x5162,
-	11690: 0x830E,
-	11691: 0x775B,
-	11692: 0x6676,
-	11693: 0x9CB8,
-	11694: 0x4EAC,
-	11695: 0x60CA,
-	11696: 0x7CBE,
-	11697: 0x7CB3,
-	11698: 0x7ECF,
-	11699: 0x4E95,
-	11700: 0x8B66,
-	11701: 0x666F,
-	11702: 0x9888,
-	11703: 0x9759,
-	11704: 0x5883,
-	11705: 0x656C,
-	11706: 0x955C,
-	11707: 0x5F84,
-	11708: 0x75C9,
-	11709: 0x9756,
-	11710: 0x7ADF,
-	11711: 0x7ADE,
-	11712: 0x51C0,
-	11713: 0x70AF,
-	11714: 0x7A98,
-	11715: 0x63EA,
-	11716: 0x7A76,
-	11717: 0x7EA0,
-	11718: 0x7396,
-	11719: 0x97ED,
-	11720: 0x4E45,
-	11721: 0x7078,
-	11722: 0x4E5D,
-	11723: 0x9152,
-	11724: 0x53A9,
-	11725: 0x6551,
-	11726: 0x65E7,
-	11727: 0x81FC,
-	11728: 0x8205,
-	11729: 0x548E,
-	11730: 0x5C31,
-	11731: 0x759A,
-	11732: 0x97A0,
-	11733: 0x62D8,
-	11734: 0x72D9,
-	11735: 0x75BD,
-	11736: 0x5C45,
-	11737: 0x9A79,
-	11738: 0x83CA,
-	11739: 0x5C40,
-	11740: 0x5480,
-	11741: 0x77E9,
-	11742: 0x4E3E,
-	11743: 0x6CAE,
-	11744: 0x805A,
-	11745: 0x62D2,
-	11746: 0x636E,
-	11747: 0x5DE8,
-	11748: 0x5177,
-	11749: 0x8DDD,
-	11750: 0x8E1E,
-	11751: 0x952F,
-	11752: 0x4FF1,
-	11753: 0x53E5,
-	11754: 0x60E7,
-	11755: 0x70AC,
-	11756: 0x5267,
-	11757: 0x6350,
-	11758: 0x9E43,
-	11759: 0x5A1F,
-	11760: 0x5026,
-	11761: 0x7737,
-	11762: 0x5377,
-	11763: 0x7EE2,
-	11764: 0x6485,
-	11765: 0x652B,
-	11766: 0x6289,
-	11767: 0x6398,
-	11768: 0x5014,
-	11769: 0x7235,
-	11770: 0x89C9,
-	11771: 0x51B3,
-	11772: 0x8BC0,
-	11773: 0x7EDD,
-	11774: 0x5747,
-	11775: 0x83CC,
-	11776: 0x94A7,
-	11777: 0x519B,
-	11778: 0x541B,
-	11779: 0x5CFB,
-	11780: 0x7DFB,
-	11781: 0x7DFC,
-	11782: 0x7DFD,
-	11783: 0x7DFE,
-	11784: 0x7DFF,
-	11785: 0x7E00,
-	11786: 0x7E01,
-	11787: 0x7E02,
-	11788: 0x7E03,
-	11789: 0x7E04,
-	11790: 0x7E05,
-	11791: 0x7E06,
-	11792: 0x7E07,
-	11793: 0x7E08,
-	11794: 0x7E09,
-	11795: 0x7E0A,
-	11796: 0x7E0B,
-	11797: 0x7E0C,
-	11798: 0x7E0D,
-	11799: 0x7E0E,
-	11800: 0x7E0F,
-	11801: 0x7E10,
-	11802: 0x7E11,
-	11803: 0x7E12,
-	11804: 0x7E13,
-	11805: 0x7E14,
-	11806: 0x7E15,
-	11807: 0x7E16,
-	11808: 0x7E17,
-	11809: 0x7E18,
-	11810: 0x7E19,
-	11811: 0x7E1A,
-	11812: 0x7E1B,
-	11813: 0x7E1C,
-	11814: 0x7E1D,
-	11815: 0x7E1E,
-	11816: 0x7E1F,
-	11817: 0x7E20,
-	11818: 0x7E21,
-	11819: 0x7E22,
-	11820: 0x7E23,
-	11821: 0x7E24,
-	11822: 0x7E25,
-	11823: 0x7E26,
-	11824: 0x7E27,
-	11825: 0x7E28,
-	11826: 0x7E29,
-	11827: 0x7E2A,
-	11828: 0x7E2B,
-	11829: 0x7E2C,
-	11830: 0x7E2D,
-	11831: 0x7E2E,
-	11832: 0x7E2F,
-	11833: 0x7E30,
-	11834: 0x7E31,
-	11835: 0x7E32,
-	11836: 0x7E33,
-	11837: 0x7E34,
-	11838: 0x7E35,
-	11839: 0x7E36,
-	11840: 0x7E37,
-	11841: 0x7E38,
-	11842: 0x7E39,
-	11843: 0x7E3A,
-	11844: 0x7E3C,
-	11845: 0x7E3D,
-	11846: 0x7E3E,
-	11847: 0x7E3F,
-	11848: 0x7E40,
-	11849: 0x7E42,
-	11850: 0x7E43,
-	11851: 0x7E44,
-	11852: 0x7E45,
-	11853: 0x7E46,
-	11854: 0x7E48,
-	11855: 0x7E49,
-	11856: 0x7E4A,
-	11857: 0x7E4B,
-	11858: 0x7E4C,
-	11859: 0x7E4D,
-	11860: 0x7E4E,
-	11861: 0x7E4F,
-	11862: 0x7E50,
-	11863: 0x7E51,
-	11864: 0x7E52,
-	11865: 0x7E53,
-	11866: 0x7E54,
-	11867: 0x7E55,
-	11868: 0x7E56,
-	11869: 0x7E57,
-	11870: 0x7E58,
-	11871: 0x7E59,
-	11872: 0x7E5A,
-	11873: 0x7E5B,
-	11874: 0x7E5C,
-	11875: 0x7E5D,
-	11876: 0x4FCA,
-	11877: 0x7AE3,
-	11878: 0x6D5A,
-	11879: 0x90E1,
-	11880: 0x9A8F,
-	11881: 0x5580,
-	11882: 0x5496,
-	11883: 0x5361,
-	11884: 0x54AF,
-	11885: 0x5F00,
-	11886: 0x63E9,
-	11887: 0x6977,
-	11888: 0x51EF,
-	11889: 0x6168,
-	11890: 0x520A,
-	11891: 0x582A,
-	11892: 0x52D8,
-	11893: 0x574E,
-	11894: 0x780D,
-	11895: 0x770B,
-	11896: 0x5EB7,
-	11897: 0x6177,
-	11898: 0x7CE0,
-	11899: 0x625B,
-	11900: 0x6297,
-	11901: 0x4EA2,
-	11902: 0x7095,
-	11903: 0x8003,
-	11904: 0x62F7,
-	11905: 0x70E4,
-	11906: 0x9760,
-	11907: 0x5777,
-	11908: 0x82DB,
-	11909: 0x67EF,
-	11910: 0x68F5,
-	11911: 0x78D5,
-	11912: 0x9897,
-	11913: 0x79D1,
-	11914: 0x58F3,
-	11915: 0x54B3,
-	11916: 0x53EF,
-	11917: 0x6E34,
-	11918: 0x514B,
-	11919: 0x523B,
-	11920: 0x5BA2,
-	11921: 0x8BFE,
-	11922: 0x80AF,
-	11923: 0x5543,
-	11924: 0x57A6,
-	11925: 0x6073,
-	11926: 0x5751,
-	11927: 0x542D,
-	11928: 0x7A7A,
-	11929: 0x6050,
-	11930: 0x5B54,
-	11931: 0x63A7,
-	11932: 0x62A0,
-	11933: 0x53E3,
-	11934: 0x6263,
-	11935: 0x5BC7,
-	11936: 0x67AF,
-	11937: 0x54ED,
-	11938: 0x7A9F,
-	11939: 0x82E6,
-	11940: 0x9177,
-	11941: 0x5E93,
-	11942: 0x88E4,
-	11943: 0x5938,
-	11944: 0x57AE,
-	11945: 0x630E,
-	11946: 0x8DE8,
-	11947: 0x80EF,
-	11948: 0x5757,
-	11949: 0x7B77,
-	11950: 0x4FA9,
-	11951: 0x5FEB,
-	11952: 0x5BBD,
-	11953: 0x6B3E,
-	11954: 0x5321,
-	11955: 0x7B50,
-	11956: 0x72C2,
-	11957: 0x6846,
-	11958: 0x77FF,
-	11959: 0x7736,
-	11960: 0x65F7,
-	11961: 0x51B5,
-	11962: 0x4E8F,
-	11963: 0x76D4,
-	11964: 0x5CBF,
-	11965: 0x7AA5,
-	11966: 0x8475,
-	11967: 0x594E,
-	11968: 0x9B41,
-	11969: 0x5080,
-	11970: 0x7E5E,
-	11971: 0x7E5F,
-	11972: 0x7E60,
-	11973: 0x7E61,
-	11974: 0x7E62,
-	11975: 0x7E63,
-	11976: 0x7E64,
-	11977: 0x7E65,
-	11978: 0x7E66,
-	11979: 0x7E67,
-	11980: 0x7E68,
-	11981: 0x7E69,
-	11982: 0x7E6A,
-	11983: 0x7E6B,
-	11984: 0x7E6C,
-	11985: 0x7E6D,
-	11986: 0x7E6E,
-	11987: 0x7E6F,
-	11988: 0x7E70,
-	11989: 0x7E71,
-	11990: 0x7E72,
-	11991: 0x7E73,
-	11992: 0x7E74,
-	11993: 0x7E75,
-	11994: 0x7E76,
-	11995: 0x7E77,
-	11996: 0x7E78,
-	11997: 0x7E79,
-	11998: 0x7E7A,
-	11999: 0x7E7B,
-	12000: 0x7E7C,
-	12001: 0x7E7D,
-	12002: 0x7E7E,
-	12003: 0x7E7F,
-	12004: 0x7E80,
-	12005: 0x7E81,
-	12006: 0x7E83,
-	12007: 0x7E84,
-	12008: 0x7E85,
-	12009: 0x7E86,
-	12010: 0x7E87,
-	12011: 0x7E88,
-	12012: 0x7E89,
-	12013: 0x7E8A,
-	12014: 0x7E8B,
-	12015: 0x7E8C,
-	12016: 0x7E8D,
-	12017: 0x7E8E,
-	12018: 0x7E8F,
-	12019: 0x7E90,
-	12020: 0x7E91,
-	12021: 0x7E92,
-	12022: 0x7E93,
-	12023: 0x7E94,
-	12024: 0x7E95,
-	12025: 0x7E96,
-	12026: 0x7E97,
-	12027: 0x7E98,
-	12028: 0x7E99,
-	12029: 0x7E9A,
-	12030: 0x7E9C,
-	12031: 0x7E9D,
-	12032: 0x7E9E,
-	12033: 0x7EAE,
-	12034: 0x7EB4,
-	12035: 0x7EBB,
-	12036: 0x7EBC,
-	12037: 0x7ED6,
-	12038: 0x7EE4,
-	12039: 0x7EEC,
-	12040: 0x7EF9,
-	12041: 0x7F0A,
-	12042: 0x7F10,
-	12043: 0x7F1E,
-	12044: 0x7F37,
-	12045: 0x7F39,
-	12046: 0x7F3B,
-	12047: 0x7F3C,
-	12048: 0x7F3D,
-	12049: 0x7F3E,
-	12050: 0x7F3F,
-	12051: 0x7F40,
-	12052: 0x7F41,
-	12053: 0x7F43,
-	12054: 0x7F46,
-	12055: 0x7F47,
-	12056: 0x7F48,
-	12057: 0x7F49,
-	12058: 0x7F4A,
-	12059: 0x7F4B,
-	12060: 0x7F4C,
-	12061: 0x7F4D,
-	12062: 0x7F4E,
-	12063: 0x7F4F,
-	12064: 0x7F52,
-	12065: 0x7F53,
-	12066: 0x9988,
-	12067: 0x6127,
-	12068: 0x6E83,
-	12069: 0x5764,
-	12070: 0x6606,
-	12071: 0x6346,
-	12072: 0x56F0,
-	12073: 0x62EC,
-	12074: 0x6269,
-	12075: 0x5ED3,
-	12076: 0x9614,
-	12077: 0x5783,
-	12078: 0x62C9,
-	12079: 0x5587,
-	12080: 0x8721,
-	12081: 0x814A,
-	12082: 0x8FA3,
-	12083: 0x5566,
-	12084: 0x83B1,
-	12085: 0x6765,
-	12086: 0x8D56,
-	12087: 0x84DD,
-	12088: 0x5A6A,
-	12089: 0x680F,
-	12090: 0x62E6,
-	12091: 0x7BEE,
-	12092: 0x9611,
-	12093: 0x5170,
-	12094: 0x6F9C,
-	12095: 0x8C30,
-	12096: 0x63FD,
-	12097: 0x89C8,
-	12098: 0x61D2,
-	12099: 0x7F06,
-	12100: 0x70C2,
-	12101: 0x6EE5,
-	12102: 0x7405,
-	12103: 0x6994,
-	12104: 0x72FC,
-	12105: 0x5ECA,
-	12106: 0x90CE,
-	12107: 0x6717,
-	12108: 0x6D6A,
-	12109: 0x635E,
-	12110: 0x52B3,
-	12111: 0x7262,
-	12112: 0x8001,
-	12113: 0x4F6C,
-	12114: 0x59E5,
-	12115: 0x916A,
-	12116: 0x70D9,
-	12117: 0x6D9D,
-	12118: 0x52D2,
-	12119: 0x4E50,
-	12120: 0x96F7,
-	12121: 0x956D,
-	12122: 0x857E,
-	12123: 0x78CA,
-	12124: 0x7D2F,
-	12125: 0x5121,
-	12126: 0x5792,
-	12127: 0x64C2,
-	12128: 0x808B,
-	12129: 0x7C7B,
-	12130: 0x6CEA,
-	12131: 0x68F1,
-	12132: 0x695E,
-	12133: 0x51B7,
-	12134: 0x5398,
-	12135: 0x68A8,
-	12136: 0x7281,
-	12137: 0x9ECE,
-	12138: 0x7BF1,
-	12139: 0x72F8,
-	12140: 0x79BB,
-	12141: 0x6F13,
-	12142: 0x7406,
-	12143: 0x674E,
-	12144: 0x91CC,
-	12145: 0x9CA4,
-	12146: 0x793C,
-	12147: 0x8389,
-	12148: 0x8354,
-	12149: 0x540F,
-	12150: 0x6817,
-	12151: 0x4E3D,
-	12152: 0x5389,
-	12153: 0x52B1,
-	12154: 0x783E,
-	12155: 0x5386,
-	12156: 0x5229,
-	12157: 0x5088,
-	12158: 0x4F8B,
-	12159: 0x4FD0,
-	12160: 0x7F56,
-	12161: 0x7F59,
-	12162: 0x7F5B,
-	12163: 0x7F5C,
-	12164: 0x7F5D,
-	12165: 0x7F5E,
-	12166: 0x7F60,
-	12167: 0x7F63,
-	12168: 0x7F64,
-	12169: 0x7F65,
-	12170: 0x7F66,
-	12171: 0x7F67,
-	12172: 0x7F6B,
-	12173: 0x7F6C,
-	12174: 0x7F6D,
-	12175: 0x7F6F,
-	12176: 0x7F70,
-	12177: 0x7F73,
-	12178: 0x7F75,
-	12179: 0x7F76,
-	12180: 0x7F77,
-	12181: 0x7F78,
-	12182: 0x7F7A,
-	12183: 0x7F7B,
-	12184: 0x7F7C,
-	12185: 0x7F7D,
-	12186: 0x7F7F,
-	12187: 0x7F80,
-	12188: 0x7F82,
-	12189: 0x7F83,
-	12190: 0x7F84,
-	12191: 0x7F85,
-	12192: 0x7F86,
-	12193: 0x7F87,
-	12194: 0x7F88,
-	12195: 0x7F89,
-	12196: 0x7F8B,
-	12197: 0x7F8D,
-	12198: 0x7F8F,
-	12199: 0x7F90,
-	12200: 0x7F91,
-	12201: 0x7F92,
-	12202: 0x7F93,
-	12203: 0x7F95,
-	12204: 0x7F96,
-	12205: 0x7F97,
-	12206: 0x7F98,
-	12207: 0x7F99,
-	12208: 0x7F9B,
-	12209: 0x7F9C,
-	12210: 0x7FA0,
-	12211: 0x7FA2,
-	12212: 0x7FA3,
-	12213: 0x7FA5,
-	12214: 0x7FA6,
-	12215: 0x7FA8,
-	12216: 0x7FA9,
-	12217: 0x7FAA,
-	12218: 0x7FAB,
-	12219: 0x7FAC,
-	12220: 0x7FAD,
-	12221: 0x7FAE,
-	12222: 0x7FB1,
-	12223: 0x7FB3,
-	12224: 0x7FB4,
-	12225: 0x7FB5,
-	12226: 0x7FB6,
-	12227: 0x7FB7,
-	12228: 0x7FBA,
-	12229: 0x7FBB,
-	12230: 0x7FBE,
-	12231: 0x7FC0,
-	12232: 0x7FC2,
-	12233: 0x7FC3,
-	12234: 0x7FC4,
-	12235: 0x7FC6,
-	12236: 0x7FC7,
-	12237: 0x7FC8,
-	12238: 0x7FC9,
-	12239: 0x7FCB,
-	12240: 0x7FCD,
-	12241: 0x7FCF,
-	12242: 0x7FD0,
-	12243: 0x7FD1,
-	12244: 0x7FD2,
-	12245: 0x7FD3,
-	12246: 0x7FD6,
-	12247: 0x7FD7,
-	12248: 0x7FD9,
-	12249: 0x7FDA,
-	12250: 0x7FDB,
-	12251: 0x7FDC,
-	12252: 0x7FDD,
-	12253: 0x7FDE,
-	12254: 0x7FE2,
-	12255: 0x7FE3,
-	12256: 0x75E2,
-	12257: 0x7ACB,
-	12258: 0x7C92,
-	12259: 0x6CA5,
-	12260: 0x96B6,
-	12261: 0x529B,
-	12262: 0x7483,
-	12263: 0x54E9,
-	12264: 0x4FE9,
-	12265: 0x8054,
-	12266: 0x83B2,
-	12267: 0x8FDE,
-	12268: 0x9570,
-	12269: 0x5EC9,
-	12270: 0x601C,
-	12271: 0x6D9F,
-	12272: 0x5E18,
-	12273: 0x655B,
-	12274: 0x8138,
-	12275: 0x94FE,
-	12276: 0x604B,
-	12277: 0x70BC,
-	12278: 0x7EC3,
-	12279: 0x7CAE,
-	12280: 0x51C9,
-	12281: 0x6881,
-	12282: 0x7CB1,
-	12283: 0x826F,
-	12284: 0x4E24,
-	12285: 0x8F86,
-	12286: 0x91CF,
-	12287: 0x667E,
-	12288: 0x4EAE,
-	12289: 0x8C05,
-	12290: 0x64A9,
-	12291: 0x804A,
-	12292: 0x50DA,
-	12293: 0x7597,
-	12294: 0x71CE,
-	12295: 0x5BE5,
-	12296: 0x8FBD,
-	12297: 0x6F66,
-	12298: 0x4E86,
-	12299: 0x6482,
-	12300: 0x9563,
-	12301: 0x5ED6,
-	12302: 0x6599,
-	12303: 0x5217,
-	12304: 0x88C2,
-	12305: 0x70C8,
-	12306: 0x52A3,
-	12307: 0x730E,
-	12308: 0x7433,
-	12309: 0x6797,
-	12310: 0x78F7,
-	12311: 0x9716,
-	12312: 0x4E34,
-	12313: 0x90BB,
-	12314: 0x9CDE,
-	12315: 0x6DCB,
-	12316: 0x51DB,
-	12317: 0x8D41,
-	12318: 0x541D,
-	12319: 0x62CE,
-	12320: 0x73B2,
-	12321: 0x83F1,
-	12322: 0x96F6,
-	12323: 0x9F84,
-	12324: 0x94C3,
-	12325: 0x4F36,
-	12326: 0x7F9A,
-	12327: 0x51CC,
-	12328: 0x7075,
-	12329: 0x9675,
-	12330: 0x5CAD,
-	12331: 0x9886,
-	12332: 0x53E6,
-	12333: 0x4EE4,
-	12334: 0x6E9C,
-	12335: 0x7409,
-	12336: 0x69B4,
-	12337: 0x786B,
-	12338: 0x998F,
-	12339: 0x7559,
-	12340: 0x5218,
-	12341: 0x7624,
-	12342: 0x6D41,
-	12343: 0x67F3,
-	12344: 0x516D,
-	12345: 0x9F99,
-	12346: 0x804B,
-	12347: 0x5499,
-	12348: 0x7B3C,
-	12349: 0x7ABF,
-	12350: 0x7FE4,
-	12351: 0x7FE7,
-	12352: 0x7FE8,
-	12353: 0x7FEA,
-	12354: 0x7FEB,
-	12355: 0x7FEC,
-	12356: 0x7FED,
-	12357: 0x7FEF,
-	12358: 0x7FF2,
-	12359: 0x7FF4,
-	12360: 0x7FF5,
-	12361: 0x7FF6,
-	12362: 0x7FF7,
-	12363: 0x7FF8,
-	12364: 0x7FF9,
-	12365: 0x7FFA,
-	12366: 0x7FFD,
-	12367: 0x7FFE,
-	12368: 0x7FFF,
-	12369: 0x8002,
-	12370: 0x8007,
-	12371: 0x8008,
-	12372: 0x8009,
-	12373: 0x800A,
-	12374: 0x800E,
-	12375: 0x800F,
-	12376: 0x8011,
-	12377: 0x8013,
-	12378: 0x801A,
-	12379: 0x801B,
-	12380: 0x801D,
-	12381: 0x801E,
-	12382: 0x801F,
-	12383: 0x8021,
-	12384: 0x8023,
-	12385: 0x8024,
-	12386: 0x802B,
-	12387: 0x802C,
-	12388: 0x802D,
-	12389: 0x802E,
-	12390: 0x802F,
-	12391: 0x8030,
-	12392: 0x8032,
-	12393: 0x8034,
-	12394: 0x8039,
-	12395: 0x803A,
-	12396: 0x803C,
-	12397: 0x803E,
-	12398: 0x8040,
-	12399: 0x8041,
-	12400: 0x8044,
-	12401: 0x8045,
-	12402: 0x8047,
-	12403: 0x8048,
-	12404: 0x8049,
-	12405: 0x804E,
-	12406: 0x804F,
-	12407: 0x8050,
-	12408: 0x8051,
-	12409: 0x8053,
-	12410: 0x8055,
-	12411: 0x8056,
-	12412: 0x8057,
-	12413: 0x8059,
-	12414: 0x805B,
-	12415: 0x805C,
-	12416: 0x805D,
-	12417: 0x805E,
-	12418: 0x805F,
-	12419: 0x8060,
-	12420: 0x8061,
-	12421: 0x8062,
-	12422: 0x8063,
-	12423: 0x8064,
-	12424: 0x8065,
-	12425: 0x8066,
-	12426: 0x8067,
-	12427: 0x8068,
-	12428: 0x806B,
-	12429: 0x806C,
-	12430: 0x806D,
-	12431: 0x806E,
-	12432: 0x806F,
-	12433: 0x8070,
-	12434: 0x8072,
-	12435: 0x8073,
-	12436: 0x8074,
-	12437: 0x8075,
-	12438: 0x8076,
-	12439: 0x8077,
-	12440: 0x8078,
-	12441: 0x8079,
-	12442: 0x807A,
-	12443: 0x807B,
-	12444: 0x807C,
-	12445: 0x807D,
-	12446: 0x9686,
-	12447: 0x5784,
-	12448: 0x62E2,
-	12449: 0x9647,
-	12450: 0x697C,
-	12451: 0x5A04,
-	12452: 0x6402,
-	12453: 0x7BD3,
-	12454: 0x6F0F,
-	12455: 0x964B,
-	12456: 0x82A6,
-	12457: 0x5362,
-	12458: 0x9885,
-	12459: 0x5E90,
-	12460: 0x7089,
-	12461: 0x63B3,
-	12462: 0x5364,
-	12463: 0x864F,
-	12464: 0x9C81,
-	12465: 0x9E93,
-	12466: 0x788C,
-	12467: 0x9732,
-	12468: 0x8DEF,
-	12469: 0x8D42,
-	12470: 0x9E7F,
-	12471: 0x6F5E,
-	12472: 0x7984,
-	12473: 0x5F55,
-	12474: 0x9646,
-	12475: 0x622E,
-	12476: 0x9A74,
-	12477: 0x5415,
-	12478: 0x94DD,
-	12479: 0x4FA3,
-	12480: 0x65C5,
-	12481: 0x5C65,
-	12482: 0x5C61,
-	12483: 0x7F15,
-	12484: 0x8651,
-	12485: 0x6C2F,
-	12486: 0x5F8B,
-	12487: 0x7387,
-	12488: 0x6EE4,
-	12489: 0x7EFF,
-	12490: 0x5CE6,
-	12491: 0x631B,
-	12492: 0x5B6A,
-	12493: 0x6EE6,
-	12494: 0x5375,
-	12495: 0x4E71,
-	12496: 0x63A0,
-	12497: 0x7565,
-	12498: 0x62A1,
-	12499: 0x8F6E,
-	12500: 0x4F26,
-	12501: 0x4ED1,
-	12502: 0x6CA6,
-	12503: 0x7EB6,
-	12504: 0x8BBA,
-	12505: 0x841D,
-	12506: 0x87BA,
-	12507: 0x7F57,
-	12508: 0x903B,
-	12509: 0x9523,
-	12510: 0x7BA9,
-	12511: 0x9AA1,
-	12512: 0x88F8,
-	12513: 0x843D,
-	12514: 0x6D1B,
-	12515: 0x9A86,
-	12516: 0x7EDC,
-	12517: 0x5988,
-	12518: 0x9EBB,
-	12519: 0x739B,
-	12520: 0x7801,
-	12521: 0x8682,
-	12522: 0x9A6C,
-	12523: 0x9A82,
-	12524: 0x561B,
-	12525: 0x5417,
-	12526: 0x57CB,
-	12527: 0x4E70,
-	12528: 0x9EA6,
-	12529: 0x5356,
-	12530: 0x8FC8,
-	12531: 0x8109,
-	12532: 0x7792,
-	12533: 0x9992,
-	12534: 0x86EE,
-	12535: 0x6EE1,
-	12536: 0x8513,
-	12537: 0x66FC,
-	12538: 0x6162,
-	12539: 0x6F2B,
-	12540: 0x807E,
-	12541: 0x8081,
-	12542: 0x8082,
-	12543: 0x8085,
-	12544: 0x8088,
-	12545: 0x808A,
-	12546: 0x808D,
-	12547: 0x808E,
-	12548: 0x808F,
-	12549: 0x8090,
-	12550: 0x8091,
-	12551: 0x8092,
-	12552: 0x8094,
-	12553: 0x8095,
-	12554: 0x8097,
-	12555: 0x8099,
-	12556: 0x809E,
-	12557: 0x80A3,
-	12558: 0x80A6,
-	12559: 0x80A7,
-	12560: 0x80A8,
-	12561: 0x80AC,
-	12562: 0x80B0,
-	12563: 0x80B3,
-	12564: 0x80B5,
-	12565: 0x80B6,
-	12566: 0x80B8,
-	12567: 0x80B9,
-	12568: 0x80BB,
-	12569: 0x80C5,
-	12570: 0x80C7,
-	12571: 0x80C8,
-	12572: 0x80C9,
-	12573: 0x80CA,
-	12574: 0x80CB,
-	12575: 0x80CF,
-	12576: 0x80D0,
-	12577: 0x80D1,
-	12578: 0x80D2,
-	12579: 0x80D3,
-	12580: 0x80D4,
-	12581: 0x80D5,
-	12582: 0x80D8,
-	12583: 0x80DF,
-	12584: 0x80E0,
-	12585: 0x80E2,
-	12586: 0x80E3,
-	12587: 0x80E6,
-	12588: 0x80EE,
-	12589: 0x80F5,
-	12590: 0x80F7,
-	12591: 0x80F9,
-	12592: 0x80FB,
-	12593: 0x80FE,
-	12594: 0x80FF,
-	12595: 0x8100,
-	12596: 0x8101,
-	12597: 0x8103,
-	12598: 0x8104,
-	12599: 0x8105,
-	12600: 0x8107,
-	12601: 0x8108,
-	12602: 0x810B,
-	12603: 0x810C,
-	12604: 0x8115,
-	12605: 0x8117,
-	12606: 0x8119,
-	12607: 0x811B,
-	12608: 0x811C,
-	12609: 0x811D,
-	12610: 0x811F,
-	12611: 0x8120,
-	12612: 0x8121,
-	12613: 0x8122,
-	12614: 0x8123,
-	12615: 0x8124,
-	12616: 0x8125,
-	12617: 0x8126,
-	12618: 0x8127,
-	12619: 0x8128,
-	12620: 0x8129,
-	12621: 0x812A,
-	12622: 0x812B,
-	12623: 0x812D,
-	12624: 0x812E,
-	12625: 0x8130,
-	12626: 0x8133,
-	12627: 0x8134,
-	12628: 0x8135,
-	12629: 0x8137,
-	12630: 0x8139,
-	12631: 0x813A,
-	12632: 0x813B,
-	12633: 0x813C,
-	12634: 0x813D,
-	12635: 0x813F,
-	12636: 0x8C29,
-	12637: 0x8292,
-	12638: 0x832B,
-	12639: 0x76F2,
-	12640: 0x6C13,
-	12641: 0x5FD9,
-	12642: 0x83BD,
-	12643: 0x732B,
-	12644: 0x8305,
-	12645: 0x951A,
-	12646: 0x6BDB,
-	12647: 0x77DB,
-	12648: 0x94C6,
-	12649: 0x536F,
-	12650: 0x8302,
-	12651: 0x5192,
-	12652: 0x5E3D,
-	12653: 0x8C8C,
-	12654: 0x8D38,
-	12655: 0x4E48,
-	12656: 0x73AB,
-	12657: 0x679A,
-	12658: 0x6885,
-	12659: 0x9176,
-	12660: 0x9709,
-	12661: 0x7164,
-	12662: 0x6CA1,
-	12663: 0x7709,
-	12664: 0x5A92,
-	12665: 0x9541,
-	12666: 0x6BCF,
-	12667: 0x7F8E,
-	12668: 0x6627,
-	12669: 0x5BD0,
-	12670: 0x59B9,
-	12671: 0x5A9A,
-	12672: 0x95E8,
-	12673: 0x95F7,
-	12674: 0x4EEC,
-	12675: 0x840C,
-	12676: 0x8499,
-	12677: 0x6AAC,
-	12678: 0x76DF,
-	12679: 0x9530,
-	12680: 0x731B,
-	12681: 0x68A6,
-	12682: 0x5B5F,
-	12683: 0x772F,
-	12684: 0x919A,
-	12685: 0x9761,
-	12686: 0x7CDC,
-	12687: 0x8FF7,
-	12688: 0x8C1C,
-	12689: 0x5F25,
-	12690: 0x7C73,
-	12691: 0x79D8,
-	12692: 0x89C5,
-	12693: 0x6CCC,
-	12694: 0x871C,
-	12695: 0x5BC6,
-	12696: 0x5E42,
-	12697: 0x68C9,
-	12698: 0x7720,
-	12699: 0x7EF5,
-	12700: 0x5195,
-	12701: 0x514D,
-	12702: 0x52C9,
-	12703: 0x5A29,
-	12704: 0x7F05,
-	12705: 0x9762,
-	12706: 0x82D7,
-	12707: 0x63CF,
-	12708: 0x7784,
-	12709: 0x85D0,
-	12710: 0x79D2,
-	12711: 0x6E3A,
-	12712: 0x5E99,
-	12713: 0x5999,
-	12714: 0x8511,
-	12715: 0x706D,
-	12716: 0x6C11,
-	12717: 0x62BF,
-	12718: 0x76BF,
-	12719: 0x654F,
-	12720: 0x60AF,
-	12721: 0x95FD,
-	12722: 0x660E,
-	12723: 0x879F,
-	12724: 0x9E23,
-	12725: 0x94ED,
-	12726: 0x540D,
-	12727: 0x547D,
-	12728: 0x8C2C,
-	12729: 0x6478,
-	12730: 0x8140,
-	12731: 0x8141,
-	12732: 0x8142,
-	12733: 0x8143,
-	12734: 0x8144,
-	12735: 0x8145,
-	12736: 0x8147,
-	12737: 0x8149,
-	12738: 0x814D,
-	12739: 0x814E,
-	12740: 0x814F,
-	12741: 0x8152,
-	12742: 0x8156,
-	12743: 0x8157,
-	12744: 0x8158,
-	12745: 0x815B,
-	12746: 0x815C,
-	12747: 0x815D,
-	12748: 0x815E,
-	12749: 0x815F,
-	12750: 0x8161,
-	12751: 0x8162,
-	12752: 0x8163,
-	12753: 0x8164,
-	12754: 0x8166,
-	12755: 0x8168,
-	12756: 0x816A,
-	12757: 0x816B,
-	12758: 0x816C,
-	12759: 0x816F,
-	12760: 0x8172,
-	12761: 0x8173,
-	12762: 0x8175,
-	12763: 0x8176,
-	12764: 0x8177,
-	12765: 0x8178,
-	12766: 0x8181,
-	12767: 0x8183,
-	12768: 0x8184,
-	12769: 0x8185,
-	12770: 0x8186,
-	12771: 0x8187,
-	12772: 0x8189,
-	12773: 0x818B,
-	12774: 0x818C,
-	12775: 0x818D,
-	12776: 0x818E,
-	12777: 0x8190,
-	12778: 0x8192,
-	12779: 0x8193,
-	12780: 0x8194,
-	12781: 0x8195,
-	12782: 0x8196,
-	12783: 0x8197,
-	12784: 0x8199,
-	12785: 0x819A,
-	12786: 0x819E,
-	12787: 0x819F,
-	12788: 0x81A0,
-	12789: 0x81A1,
-	12790: 0x81A2,
-	12791: 0x81A4,
-	12792: 0x81A5,
-	12793: 0x81A7,
-	12794: 0x81A9,
-	12795: 0x81AB,
-	12796: 0x81AC,
-	12797: 0x81AD,
-	12798: 0x81AE,
-	12799: 0x81AF,
-	12800: 0x81B0,
-	12801: 0x81B1,
-	12802: 0x81B2,
-	12803: 0x81B4,
-	12804: 0x81B5,
-	12805: 0x81B6,
-	12806: 0x81B7,
-	12807: 0x81B8,
-	12808: 0x81B9,
-	12809: 0x81BC,
-	12810: 0x81BD,
-	12811: 0x81BE,
-	12812: 0x81BF,
-	12813: 0x81C4,
-	12814: 0x81C5,
-	12815: 0x81C7,
-	12816: 0x81C8,
-	12817: 0x81C9,
-	12818: 0x81CB,
-	12819: 0x81CD,
-	12820: 0x81CE,
-	12821: 0x81CF,
-	12822: 0x81D0,
-	12823: 0x81D1,
-	12824: 0x81D2,
-	12825: 0x81D3,
-	12826: 0x6479,
-	12827: 0x8611,
-	12828: 0x6A21,
-	12829: 0x819C,
-	12830: 0x78E8,
-	12831: 0x6469,
-	12832: 0x9B54,
-	12833: 0x62B9,
-	12834: 0x672B,
-	12835: 0x83AB,
-	12836: 0x58A8,
-	12837: 0x9ED8,
-	12838: 0x6CAB,
-	12839: 0x6F20,
-	12840: 0x5BDE,
-	12841: 0x964C,
-	12842: 0x8C0B,
-	12843: 0x725F,
-	12844: 0x67D0,
-	12845: 0x62C7,
-	12846: 0x7261,
-	12847: 0x4EA9,
-	12848: 0x59C6,
-	12849: 0x6BCD,
-	12850: 0x5893,
-	12851: 0x66AE,
-	12852: 0x5E55,
-	12853: 0x52DF,
-	12854: 0x6155,
-	12855: 0x6728,
-	12856: 0x76EE,
-	12857: 0x7766,
-	12858: 0x7267,
-	12859: 0x7A46,
-	12860: 0x62FF,
-	12861: 0x54EA,
-	12862: 0x5450,
-	12863: 0x94A0,
-	12864: 0x90A3,
-	12865: 0x5A1C,
-	12866: 0x7EB3,
-	12867: 0x6C16,
-	12868: 0x4E43,
-	12869: 0x5976,
-	12870: 0x8010,
-	12871: 0x5948,
-	12872: 0x5357,
-	12873: 0x7537,
-	12874: 0x96BE,
-	12875: 0x56CA,
-	12876: 0x6320,
-	12877: 0x8111,
-	12878: 0x607C,
-	12879: 0x95F9,
-	12880: 0x6DD6,
-	12881: 0x5462,
-	12882: 0x9981,
-	12883: 0x5185,
-	12884: 0x5AE9,
-	12885: 0x80FD,
-	12886: 0x59AE,
-	12887: 0x9713,
-	12888: 0x502A,
-	12889: 0x6CE5,
-	12890: 0x5C3C,
-	12891: 0x62DF,
-	12892: 0x4F60,
-	12893: 0x533F,
-	12894: 0x817B,
-	12895: 0x9006,
-	12896: 0x6EBA,
-	12897: 0x852B,
-	12898: 0x62C8,
-	12899: 0x5E74,
-	12900: 0x78BE,
-	12901: 0x64B5,
-	12902: 0x637B,
-	12903: 0x5FF5,
-	12904: 0x5A18,
-	12905: 0x917F,
-	12906: 0x9E1F,
-	12907: 0x5C3F,
-	12908: 0x634F,
-	12909: 0x8042,
-	12910: 0x5B7D,
-	12911: 0x556E,
-	12912: 0x954A,
-	12913: 0x954D,
-	12914: 0x6D85,
-	12915: 0x60A8,
-	12916: 0x67E0,
-	12917: 0x72DE,
-	12918: 0x51DD,
-	12919: 0x5B81,
-	12920: 0x81D4,
-	12921: 0x81D5,
-	12922: 0x81D6,
-	12923: 0x81D7,
-	12924: 0x81D8,
-	12925: 0x81D9,
-	12926: 0x81DA,
-	12927: 0x81DB,
-	12928: 0x81DC,
-	12929: 0x81DD,
-	12930: 0x81DE,
-	12931: 0x81DF,
-	12932: 0x81E0,
-	12933: 0x81E1,
-	12934: 0x81E2,
-	12935: 0x81E4,
-	12936: 0x81E5,
-	12937: 0x81E6,
-	12938: 0x81E8,
-	12939: 0x81E9,
-	12940: 0x81EB,
-	12941: 0x81EE,
-	12942: 0x81EF,
-	12943: 0x81F0,
-	12944: 0x81F1,
-	12945: 0x81F2,
-	12946: 0x81F5,
-	12947: 0x81F6,
-	12948: 0x81F7,
-	12949: 0x81F8,
-	12950: 0x81F9,
-	12951: 0x81FA,
-	12952: 0x81FD,
-	12953: 0x81FF,
-	12954: 0x8203,
-	12955: 0x8207,
-	12956: 0x8208,
-	12957: 0x8209,
-	12958: 0x820A,
-	12959: 0x820B,
-	12960: 0x820E,
-	12961: 0x820F,
-	12962: 0x8211,
-	12963: 0x8213,
-	12964: 0x8215,
-	12965: 0x8216,
-	12966: 0x8217,
-	12967: 0x8218,
-	12968: 0x8219,
-	12969: 0x821A,
-	12970: 0x821D,
-	12971: 0x8220,
-	12972: 0x8224,
-	12973: 0x8225,
-	12974: 0x8226,
-	12975: 0x8227,
-	12976: 0x8229,
-	12977: 0x822E,
-	12978: 0x8232,
-	12979: 0x823A,
-	12980: 0x823C,
-	12981: 0x823D,
-	12982: 0x823F,
-	12983: 0x8240,
-	12984: 0x8241,
-	12985: 0x8242,
-	12986: 0x8243,
-	12987: 0x8245,
-	12988: 0x8246,
-	12989: 0x8248,
-	12990: 0x824A,
-	12991: 0x824C,
-	12992: 0x824D,
-	12993: 0x824E,
-	12994: 0x8250,
-	12995: 0x8251,
-	12996: 0x8252,
-	12997: 0x8253,
-	12998: 0x8254,
-	12999: 0x8255,
-	13000: 0x8256,
-	13001: 0x8257,
-	13002: 0x8259,
-	13003: 0x825B,
-	13004: 0x825C,
-	13005: 0x825D,
-	13006: 0x825E,
-	13007: 0x8260,
-	13008: 0x8261,
-	13009: 0x8262,
-	13010: 0x8263,
-	13011: 0x8264,
-	13012: 0x8265,
-	13013: 0x8266,
-	13014: 0x8267,
-	13015: 0x8269,
-	13016: 0x62E7,
-	13017: 0x6CDE,
-	13018: 0x725B,
-	13019: 0x626D,
-	13020: 0x94AE,
-	13021: 0x7EBD,
-	13022: 0x8113,
-	13023: 0x6D53,
-	13024: 0x519C,
-	13025: 0x5F04,
-	13026: 0x5974,
-	13027: 0x52AA,
-	13028: 0x6012,
-	13029: 0x5973,
-	13030: 0x6696,
-	13031: 0x8650,
-	13032: 0x759F,
-	13033: 0x632A,
-	13034: 0x61E6,
-	13035: 0x7CEF,
-	13036: 0x8BFA,
-	13037: 0x54E6,
-	13038: 0x6B27,
-	13039: 0x9E25,
-	13040: 0x6BB4,
-	13041: 0x85D5,
-	13042: 0x5455,
-	13043: 0x5076,
-	13044: 0x6CA4,
-	13045: 0x556A,
-	13046: 0x8DB4,
-	13047: 0x722C,
-	13048: 0x5E15,
-	13049: 0x6015,
-	13050: 0x7436,
-	13051: 0x62CD,
-	13052: 0x6392,
-	13053: 0x724C,
-	13054: 0x5F98,
-	13055: 0x6E43,
-	13056: 0x6D3E,
-	13057: 0x6500,
-	13058: 0x6F58,
-	13059: 0x76D8,
-	13060: 0x78D0,
-	13061: 0x76FC,
-	13062: 0x7554,
-	13063: 0x5224,
-	13064: 0x53DB,
-	13065: 0x4E53,
-	13066: 0x5E9E,
-	13067: 0x65C1,
-	13068: 0x802A,
-	13069: 0x80D6,
-	13070: 0x629B,
-	13071: 0x5486,
-	13072: 0x5228,
-	13073: 0x70AE,
-	13074: 0x888D,
-	13075: 0x8DD1,
-	13076: 0x6CE1,
-	13077: 0x5478,
-	13078: 0x80DA,
-	13079: 0x57F9,
-	13080: 0x88F4,
-	13081: 0x8D54,
-	13082: 0x966A,
-	13083: 0x914D,
-	13084: 0x4F69,
-	13085: 0x6C9B,
-	13086: 0x55B7,
-	13087: 0x76C6,
-	13088: 0x7830,
-	13089: 0x62A8,
-	13090: 0x70F9,
-	13091: 0x6F8E,
-	13092: 0x5F6D,
-	13093: 0x84EC,
-	13094: 0x68DA,
-	13095: 0x787C,
-	13096: 0x7BF7,
-	13097: 0x81A8,
-	13098: 0x670B,
-	13099: 0x9E4F,
-	13100: 0x6367,
-	13101: 0x78B0,
-	13102: 0x576F,
-	13103: 0x7812,
-	13104: 0x9739,
-	13105: 0x6279,
-	13106: 0x62AB,
-	13107: 0x5288,
-	13108: 0x7435,
-	13109: 0x6BD7,
-	13110: 0x826A,
-	13111: 0x826B,
-	13112: 0x826C,
-	13113: 0x826D,
-	13114: 0x8271,
-	13115: 0x8275,
-	13116: 0x8276,
-	13117: 0x8277,
-	13118: 0x8278,
-	13119: 0x827B,
-	13120: 0x827C,
-	13121: 0x8280,
-	13122: 0x8281,
-	13123: 0x8283,
-	13124: 0x8285,
-	13125: 0x8286,
-	13126: 0x8287,
-	13127: 0x8289,
-	13128: 0x828C,
-	13129: 0x8290,
-	13130: 0x8293,
-	13131: 0x8294,
-	13132: 0x8295,
-	13133: 0x8296,
-	13134: 0x829A,
-	13135: 0x829B,
-	13136: 0x829E,
-	13137: 0x82A0,
-	13138: 0x82A2,
-	13139: 0x82A3,
-	13140: 0x82A7,
-	13141: 0x82B2,
-	13142: 0x82B5,
-	13143: 0x82B6,
-	13144: 0x82BA,
-	13145: 0x82BB,
-	13146: 0x82BC,
-	13147: 0x82BF,
-	13148: 0x82C0,
-	13149: 0x82C2,
-	13150: 0x82C3,
-	13151: 0x82C5,
-	13152: 0x82C6,
-	13153: 0x82C9,
-	13154: 0x82D0,
-	13155: 0x82D6,
-	13156: 0x82D9,
-	13157: 0x82DA,
-	13158: 0x82DD,
-	13159: 0x82E2,
-	13160: 0x82E7,
-	13161: 0x82E8,
-	13162: 0x82E9,
-	13163: 0x82EA,
-	13164: 0x82EC,
-	13165: 0x82ED,
-	13166: 0x82EE,
-	13167: 0x82F0,
-	13168: 0x82F2,
-	13169: 0x82F3,
-	13170: 0x82F5,
-	13171: 0x82F6,
-	13172: 0x82F8,
-	13173: 0x82FA,
-	13174: 0x82FC,
-	13175: 0x82FD,
-	13176: 0x82FE,
-	13177: 0x82FF,
-	13178: 0x8300,
-	13179: 0x830A,
-	13180: 0x830B,
-	13181: 0x830D,
-	13182: 0x8310,
-	13183: 0x8312,
-	13184: 0x8313,
-	13185: 0x8316,
-	13186: 0x8318,
-	13187: 0x8319,
-	13188: 0x831D,
-	13189: 0x831E,
-	13190: 0x831F,
-	13191: 0x8320,
-	13192: 0x8321,
-	13193: 0x8322,
-	13194: 0x8323,
-	13195: 0x8324,
-	13196: 0x8325,
-	13197: 0x8326,
-	13198: 0x8329,
-	13199: 0x832A,
-	13200: 0x832E,
-	13201: 0x8330,
-	13202: 0x8332,
-	13203: 0x8337,
-	13204: 0x833B,
-	13205: 0x833D,
-	13206: 0x5564,
-	13207: 0x813E,
-	13208: 0x75B2,
-	13209: 0x76AE,
-	13210: 0x5339,
-	13211: 0x75DE,
-	13212: 0x50FB,
-	13213: 0x5C41,
-	13214: 0x8B6C,
-	13215: 0x7BC7,
-	13216: 0x504F,
-	13217: 0x7247,
-	13218: 0x9A97,
-	13219: 0x98D8,
-	13220: 0x6F02,
-	13221: 0x74E2,
-	13222: 0x7968,
-	13223: 0x6487,
-	13224: 0x77A5,
-	13225: 0x62FC,
-	13226: 0x9891,
-	13227: 0x8D2B,
-	13228: 0x54C1,
-	13229: 0x8058,
-	13230: 0x4E52,
-	13231: 0x576A,
-	13232: 0x82F9,
-	13233: 0x840D,
-	13234: 0x5E73,
-	13235: 0x51ED,
-	13236: 0x74F6,
-	13237: 0x8BC4,
-	13238: 0x5C4F,
-	13239: 0x5761,
-	13240: 0x6CFC,
-	13241: 0x9887,
-	13242: 0x5A46,
-	13243: 0x7834,
-	13244: 0x9B44,
-	13245: 0x8FEB,
-	13246: 0x7C95,
-	13247: 0x5256,
-	13248: 0x6251,
-	13249: 0x94FA,
-	13250: 0x4EC6,
-	13251: 0x8386,
-	13252: 0x8461,
-	13253: 0x83E9,
-	13254: 0x84B2,
-	13255: 0x57D4,
-	13256: 0x6734,
-	13257: 0x5703,
-	13258: 0x666E,
-	13259: 0x6D66,
-	13260: 0x8C31,
-	13261: 0x66DD,
-	13262: 0x7011,
-	13263: 0x671F,
-	13264: 0x6B3A,
-	13265: 0x6816,
-	13266: 0x621A,
-	13267: 0x59BB,
-	13268: 0x4E03,
-	13269: 0x51C4,
-	13270: 0x6F06,
-	13271: 0x67D2,
-	13272: 0x6C8F,
-	13273: 0x5176,
-	13274: 0x68CB,
-	13275: 0x5947,
-	13276: 0x6B67,
-	13277: 0x7566,
-	13278: 0x5D0E,
-	13279: 0x8110,
-	13280: 0x9F50,
-	13281: 0x65D7,
-	13282: 0x7948,
-	13283: 0x7941,
-	13284: 0x9A91,
-	13285: 0x8D77,
-	13286: 0x5C82,
-	13287: 0x4E5E,
-	13288: 0x4F01,
-	13289: 0x542F,
-	13290: 0x5951,
-	13291: 0x780C,
-	13292: 0x5668,
-	13293: 0x6C14,
-	13294: 0x8FC4,
-	13295: 0x5F03,
-	13296: 0x6C7D,
-	13297: 0x6CE3,
-	13298: 0x8BAB,
-	13299: 0x6390,
-	13300: 0x833E,
-	13301: 0x833F,
-	13302: 0x8341,
-	13303: 0x8342,
-	13304: 0x8344,
-	13305: 0x8345,
-	13306: 0x8348,
-	13307: 0x834A,
-	13308: 0x834B,
-	13309: 0x834C,
-	13310: 0x834D,
-	13311: 0x834E,
-	13312: 0x8353,
-	13313: 0x8355,
-	13314: 0x8356,
-	13315: 0x8357,
-	13316: 0x8358,
-	13317: 0x8359,
-	13318: 0x835D,
-	13319: 0x8362,
-	13320: 0x8370,
-	13321: 0x8371,
-	13322: 0x8372,
-	13323: 0x8373,
-	13324: 0x8374,
-	13325: 0x8375,
-	13326: 0x8376,
-	13327: 0x8379,
-	13328: 0x837A,
-	13329: 0x837E,
-	13330: 0x837F,
-	13331: 0x8380,
-	13332: 0x8381,
-	13333: 0x8382,
-	13334: 0x8383,
-	13335: 0x8384,
-	13336: 0x8387,
-	13337: 0x8388,
-	13338: 0x838A,
-	13339: 0x838B,
-	13340: 0x838C,
-	13341: 0x838D,
-	13342: 0x838F,
-	13343: 0x8390,
-	13344: 0x8391,
-	13345: 0x8394,
-	13346: 0x8395,
-	13347: 0x8396,
-	13348: 0x8397,
-	13349: 0x8399,
-	13350: 0x839A,
-	13351: 0x839D,
-	13352: 0x839F,
-	13353: 0x83A1,
-	13354: 0x83A2,
-	13355: 0x83A3,
-	13356: 0x83A4,
-	13357: 0x83A5,
-	13358: 0x83A6,
-	13359: 0x83A7,
-	13360: 0x83AC,
-	13361: 0x83AD,
-	13362: 0x83AE,
-	13363: 0x83AF,
-	13364: 0x83B5,
-	13365: 0x83BB,
-	13366: 0x83BE,
-	13367: 0x83BF,
-	13368: 0x83C2,
-	13369: 0x83C3,
-	13370: 0x83C4,
-	13371: 0x83C6,
-	13372: 0x83C8,
-	13373: 0x83C9,
-	13374: 0x83CB,
-	13375: 0x83CD,
-	13376: 0x83CE,
-	13377: 0x83D0,
-	13378: 0x83D1,
-	13379: 0x83D2,
-	13380: 0x83D3,
-	13381: 0x83D5,
-	13382: 0x83D7,
-	13383: 0x83D9,
-	13384: 0x83DA,
-	13385: 0x83DB,
-	13386: 0x83DE,
-	13387: 0x83E2,
-	13388: 0x83E3,
-	13389: 0x83E4,
-	13390: 0x83E6,
-	13391: 0x83E7,
-	13392: 0x83E8,
-	13393: 0x83EB,
-	13394: 0x83EC,
-	13395: 0x83ED,
-	13396: 0x6070,
-	13397: 0x6D3D,
-	13398: 0x7275,
-	13399: 0x6266,
-	13400: 0x948E,
-	13401: 0x94C5,
-	13402: 0x5343,
-	13403: 0x8FC1,
-	13404: 0x7B7E,
-	13405: 0x4EDF,
-	13406: 0x8C26,
-	13407: 0x4E7E,
-	13408: 0x9ED4,
-	13409: 0x94B1,
-	13410: 0x94B3,
-	13411: 0x524D,
-	13412: 0x6F5C,
-	13413: 0x9063,
-	13414: 0x6D45,
-	13415: 0x8C34,
-	13416: 0x5811,
-	13417: 0x5D4C,
-	13418: 0x6B20,
-	13419: 0x6B49,
-	13420: 0x67AA,
-	13421: 0x545B,
-	13422: 0x8154,
-	13423: 0x7F8C,
-	13424: 0x5899,
-	13425: 0x8537,
-	13426: 0x5F3A,
-	13427: 0x62A2,
-	13428: 0x6A47,
-	13429: 0x9539,
-	13430: 0x6572,
-	13431: 0x6084,
-	13432: 0x6865,
-	13433: 0x77A7,
-	13434: 0x4E54,
-	13435: 0x4FA8,
-	13436: 0x5DE7,
-	13437: 0x9798,
-	13438: 0x64AC,
-	13439: 0x7FD8,
-	13440: 0x5CED,
-	13441: 0x4FCF,
-	13442: 0x7A8D,
-	13443: 0x5207,
-	13444: 0x8304,
-	13445: 0x4E14,
-	13446: 0x602F,
-	13447: 0x7A83,
-	13448: 0x94A6,
-	13449: 0x4FB5,
-	13450: 0x4EB2,
-	13451: 0x79E6,
-	13452: 0x7434,
-	13453: 0x52E4,
-	13454: 0x82B9,
-	13455: 0x64D2,
-	13456: 0x79BD,
-	13457: 0x5BDD,
-	13458: 0x6C81,
-	13459: 0x9752,
-	13460: 0x8F7B,
-	13461: 0x6C22,
-	13462: 0x503E,
-	13463: 0x537F,
-	13464: 0x6E05,
-	13465: 0x64CE,
-	13466: 0x6674,
-	13467: 0x6C30,
-	13468: 0x60C5,
-	13469: 0x9877,
-	13470: 0x8BF7,
-	13471: 0x5E86,
-	13472: 0x743C,
-	13473: 0x7A77,
-	13474: 0x79CB,
-	13475: 0x4E18,
-	13476: 0x90B1,
-	13477: 0x7403,
-	13478: 0x6C42,
-	13479: 0x56DA,
-	13480: 0x914B,
-	13481: 0x6CC5,
-	13482: 0x8D8B,
-	13483: 0x533A,
-	13484: 0x86C6,
-	13485: 0x66F2,
-	13486: 0x8EAF,
-	13487: 0x5C48,
-	13488: 0x9A71,
-	13489: 0x6E20,
-	13490: 0x83EE,
-	13491: 0x83EF,
-	13492: 0x83F3,
-	13493: 0x83F4,
-	13494: 0x83F5,
-	13495: 0x83F6,
-	13496: 0x83F7,
-	13497: 0x83FA,
-	13498: 0x83FB,
-	13499: 0x83FC,
-	13500: 0x83FE,
-	13501: 0x83FF,
-	13502: 0x8400,
-	13503: 0x8402,
-	13504: 0x8405,
-	13505: 0x8407,
-	13506: 0x8408,
-	13507: 0x8409,
-	13508: 0x840A,
-	13509: 0x8410,
-	13510: 0x8412,
-	13511: 0x8413,
-	13512: 0x8414,
-	13513: 0x8415,
-	13514: 0x8416,
-	13515: 0x8417,
-	13516: 0x8419,
-	13517: 0x841A,
-	13518: 0x841B,
-	13519: 0x841E,
-	13520: 0x841F,
-	13521: 0x8420,
-	13522: 0x8421,
-	13523: 0x8422,
-	13524: 0x8423,
-	13525: 0x8429,
-	13526: 0x842A,
-	13527: 0x842B,
-	13528: 0x842C,
-	13529: 0x842D,
-	13530: 0x842E,
-	13531: 0x842F,
-	13532: 0x8430,
-	13533: 0x8432,
-	13534: 0x8433,
-	13535: 0x8434,
-	13536: 0x8435,
-	13537: 0x8436,
-	13538: 0x8437,
-	13539: 0x8439,
-	13540: 0x843A,
-	13541: 0x843B,
-	13542: 0x843E,
-	13543: 0x843F,
-	13544: 0x8440,
-	13545: 0x8441,
-	13546: 0x8442,
-	13547: 0x8443,
-	13548: 0x8444,
-	13549: 0x8445,
-	13550: 0x8447,
-	13551: 0x8448,
-	13552: 0x8449,
-	13553: 0x844A,
-	13554: 0x844B,
-	13555: 0x844C,
-	13556: 0x844D,
-	13557: 0x844E,
-	13558: 0x844F,
-	13559: 0x8450,
-	13560: 0x8452,
-	13561: 0x8453,
-	13562: 0x8454,
-	13563: 0x8455,
-	13564: 0x8456,
-	13565: 0x8458,
-	13566: 0x845D,
-	13567: 0x845E,
-	13568: 0x845F,
-	13569: 0x8460,
-	13570: 0x8462,
-	13571: 0x8464,
-	13572: 0x8465,
-	13573: 0x8466,
-	13574: 0x8467,
-	13575: 0x8468,
-	13576: 0x846A,
-	13577: 0x846E,
-	13578: 0x846F,
-	13579: 0x8470,
-	13580: 0x8472,
-	13581: 0x8474,
-	13582: 0x8477,
-	13583: 0x8479,
-	13584: 0x847B,
-	13585: 0x847C,
-	13586: 0x53D6,
-	13587: 0x5A36,
-	13588: 0x9F8B,
-	13589: 0x8DA3,
-	13590: 0x53BB,
-	13591: 0x5708,
-	13592: 0x98A7,
-	13593: 0x6743,
-	13594: 0x919B,
-	13595: 0x6CC9,
-	13596: 0x5168,
-	13597: 0x75CA,
-	13598: 0x62F3,
-	13599: 0x72AC,
-	13600: 0x5238,
-	13601: 0x529D,
-	13602: 0x7F3A,
-	13603: 0x7094,
-	13604: 0x7638,
-	13605: 0x5374,
-	13606: 0x9E4A,
-	13607: 0x69B7,
-	13608: 0x786E,
-	13609: 0x96C0,
-	13610: 0x88D9,
-	13611: 0x7FA4,
-	13612: 0x7136,
-	13613: 0x71C3,
-	13614: 0x5189,
-	13615: 0x67D3,
-	13616: 0x74E4,
-	13617: 0x58E4,
-	13618: 0x6518,
-	13619: 0x56B7,
-	13620: 0x8BA9,
-	13621: 0x9976,
-	13622: 0x6270,
-	13623: 0x7ED5,
-	13624: 0x60F9,
-	13625: 0x70ED,
-	13626: 0x58EC,
-	13627: 0x4EC1,
-	13628: 0x4EBA,
-	13629: 0x5FCD,
-	13630: 0x97E7,
-	13631: 0x4EFB,
-	13632: 0x8BA4,
-	13633: 0x5203,
-	13634: 0x598A,
-	13635: 0x7EAB,
-	13636: 0x6254,
-	13637: 0x4ECD,
-	13638: 0x65E5,
-	13639: 0x620E,
-	13640: 0x8338,
-	13641: 0x84C9,
-	13642: 0x8363,
-	13643: 0x878D,
-	13644: 0x7194,
-	13645: 0x6EB6,
-	13646: 0x5BB9,
-	13647: 0x7ED2,
-	13648: 0x5197,
-	13649: 0x63C9,
-	13650: 0x67D4,
-	13651: 0x8089,
-	13652: 0x8339,
-	13653: 0x8815,
-	13654: 0x5112,
-	13655: 0x5B7A,
-	13656: 0x5982,
-	13657: 0x8FB1,
-	13658: 0x4E73,
-	13659: 0x6C5D,
-	13660: 0x5165,
-	13661: 0x8925,
-	13662: 0x8F6F,
-	13663: 0x962E,
-	13664: 0x854A,
-	13665: 0x745E,
-	13666: 0x9510,
-	13667: 0x95F0,
-	13668: 0x6DA6,
-	13669: 0x82E5,
-	13670: 0x5F31,
-	13671: 0x6492,
-	13672: 0x6D12,
-	13673: 0x8428,
-	13674: 0x816E,
-	13675: 0x9CC3,
-	13676: 0x585E,
-	13677: 0x8D5B,
-	13678: 0x4E09,
-	13679: 0x53C1,
-	13680: 0x847D,
-	13681: 0x847E,
-	13682: 0x847F,
-	13683: 0x8480,
-	13684: 0x8481,
-	13685: 0x8483,
-	13686: 0x8484,
-	13687: 0x8485,
-	13688: 0x8486,
-	13689: 0x848A,
-	13690: 0x848D,
-	13691: 0x848F,
-	13692: 0x8490,
-	13693: 0x8491,
-	13694: 0x8492,
-	13695: 0x8493,
-	13696: 0x8494,
-	13697: 0x8495,
-	13698: 0x8496,
-	13699: 0x8498,
-	13700: 0x849A,
-	13701: 0x849B,
-	13702: 0x849D,
-	13703: 0x849E,
-	13704: 0x849F,
-	13705: 0x84A0,
-	13706: 0x84A2,
-	13707: 0x84A3,
-	13708: 0x84A4,
-	13709: 0x84A5,
-	13710: 0x84A6,
-	13711: 0x84A7,
-	13712: 0x84A8,
-	13713: 0x84A9,
-	13714: 0x84AA,
-	13715: 0x84AB,
-	13716: 0x84AC,
-	13717: 0x84AD,
-	13718: 0x84AE,
-	13719: 0x84B0,
-	13720: 0x84B1,
-	13721: 0x84B3,
-	13722: 0x84B5,
-	13723: 0x84B6,
-	13724: 0x84B7,
-	13725: 0x84BB,
-	13726: 0x84BC,
-	13727: 0x84BE,
-	13728: 0x84C0,
-	13729: 0x84C2,
-	13730: 0x84C3,
-	13731: 0x84C5,
-	13732: 0x84C6,
-	13733: 0x84C7,
-	13734: 0x84C8,
-	13735: 0x84CB,
-	13736: 0x84CC,
-	13737: 0x84CE,
-	13738: 0x84CF,
-	13739: 0x84D2,
-	13740: 0x84D4,
-	13741: 0x84D5,
-	13742: 0x84D7,
-	13743: 0x84D8,
-	13744: 0x84D9,
-	13745: 0x84DA,
-	13746: 0x84DB,
-	13747: 0x84DC,
-	13748: 0x84DE,
-	13749: 0x84E1,
-	13750: 0x84E2,
-	13751: 0x84E4,
-	13752: 0x84E7,
-	13753: 0x84E8,
-	13754: 0x84E9,
-	13755: 0x84EA,
-	13756: 0x84EB,
-	13757: 0x84ED,
-	13758: 0x84EE,
-	13759: 0x84EF,
-	13760: 0x84F1,
-	13761: 0x84F2,
-	13762: 0x84F3,
-	13763: 0x84F4,
-	13764: 0x84F5,
-	13765: 0x84F6,
-	13766: 0x84F7,
-	13767: 0x84F8,
-	13768: 0x84F9,
-	13769: 0x84FA,
-	13770: 0x84FB,
-	13771: 0x84FD,
-	13772: 0x84FE,
-	13773: 0x8500,
-	13774: 0x8501,
-	13775: 0x8502,
-	13776: 0x4F1E,
-	13777: 0x6563,
-	13778: 0x6851,
-	13779: 0x55D3,
-	13780: 0x4E27,
-	13781: 0x6414,
-	13782: 0x9A9A,
-	13783: 0x626B,
-	13784: 0x5AC2,
-	13785: 0x745F,
-	13786: 0x8272,
-	13787: 0x6DA9,
-	13788: 0x68EE,
-	13789: 0x50E7,
-	13790: 0x838E,
-	13791: 0x7802,
-	13792: 0x6740,
-	13793: 0x5239,
-	13794: 0x6C99,
-	13795: 0x7EB1,
-	13796: 0x50BB,
-	13797: 0x5565,
-	13798: 0x715E,
-	13799: 0x7B5B,
-	13800: 0x6652,
-	13801: 0x73CA,
-	13802: 0x82EB,
-	13803: 0x6749,
-	13804: 0x5C71,
-	13805: 0x5220,
-	13806: 0x717D,
-	13807: 0x886B,
-	13808: 0x95EA,
-	13809: 0x9655,
-	13810: 0x64C5,
-	13811: 0x8D61,
-	13812: 0x81B3,
-	13813: 0x5584,
-	13814: 0x6C55,
-	13815: 0x6247,
-	13816: 0x7F2E,
-	13817: 0x5892,
-	13818: 0x4F24,
-	13819: 0x5546,
-	13820: 0x8D4F,
-	13821: 0x664C,
-	13822: 0x4E0A,
-	13823: 0x5C1A,
-	13824: 0x88F3,
-	13825: 0x68A2,
-	13826: 0x634E,
-	13827: 0x7A0D,
-	13828: 0x70E7,
-	13829: 0x828D,
-	13830: 0x52FA,
-	13831: 0x97F6,
-	13832: 0x5C11,
-	13833: 0x54E8,
-	13834: 0x90B5,
-	13835: 0x7ECD,
-	13836: 0x5962,
-	13837: 0x8D4A,
-	13838: 0x86C7,
-	13839: 0x820C,
-	13840: 0x820D,
-	13841: 0x8D66,
-	13842: 0x6444,
-	13843: 0x5C04,
-	13844: 0x6151,
-	13845: 0x6D89,
-	13846: 0x793E,
-	13847: 0x8BBE,
-	13848: 0x7837,
-	13849: 0x7533,
-	13850: 0x547B,
-	13851: 0x4F38,
-	13852: 0x8EAB,
-	13853: 0x6DF1,
-	13854: 0x5A20,
-	13855: 0x7EC5,
-	13856: 0x795E,
-	13857: 0x6C88,
-	13858: 0x5BA1,
-	13859: 0x5A76,
-	13860: 0x751A,
-	13861: 0x80BE,
-	13862: 0x614E,
-	13863: 0x6E17,
-	13864: 0x58F0,
-	13865: 0x751F,
-	13866: 0x7525,
-	13867: 0x7272,
-	13868: 0x5347,
-	13869: 0x7EF3,
-	13870: 0x8503,
-	13871: 0x8504,
-	13872: 0x8505,
-	13873: 0x8506,
-	13874: 0x8507,
-	13875: 0x8508,
-	13876: 0x8509,
-	13877: 0x850A,
-	13878: 0x850B,
-	13879: 0x850D,
-	13880: 0x850E,
-	13881: 0x850F,
-	13882: 0x8510,
-	13883: 0x8512,
-	13884: 0x8514,
-	13885: 0x8515,
-	13886: 0x8516,
-	13887: 0x8518,
-	13888: 0x8519,
-	13889: 0x851B,
-	13890: 0x851C,
-	13891: 0x851D,
-	13892: 0x851E,
-	13893: 0x8520,
-	13894: 0x8522,
-	13895: 0x8523,
-	13896: 0x8524,
-	13897: 0x8525,
-	13898: 0x8526,
-	13899: 0x8527,
-	13900: 0x8528,
-	13901: 0x8529,
-	13902: 0x852A,
-	13903: 0x852D,
-	13904: 0x852E,
-	13905: 0x852F,
-	13906: 0x8530,
-	13907: 0x8531,
-	13908: 0x8532,
-	13909: 0x8533,
-	13910: 0x8534,
-	13911: 0x8535,
-	13912: 0x8536,
-	13913: 0x853E,
-	13914: 0x853F,
-	13915: 0x8540,
-	13916: 0x8541,
-	13917: 0x8542,
-	13918: 0x8544,
-	13919: 0x8545,
-	13920: 0x8546,
-	13921: 0x8547,
-	13922: 0x854B,
-	13923: 0x854C,
-	13924: 0x854D,
-	13925: 0x854E,
-	13926: 0x854F,
-	13927: 0x8550,
-	13928: 0x8551,
-	13929: 0x8552,
-	13930: 0x8553,
-	13931: 0x8554,
-	13932: 0x8555,
-	13933: 0x8557,
-	13934: 0x8558,
-	13935: 0x855A,
-	13936: 0x855B,
-	13937: 0x855C,
-	13938: 0x855D,
-	13939: 0x855F,
-	13940: 0x8560,
-	13941: 0x8561,
-	13942: 0x8562,
-	13943: 0x8563,
-	13944: 0x8565,
-	13945: 0x8566,
-	13946: 0x8567,
-	13947: 0x8569,
-	13948: 0x856A,
-	13949: 0x856B,
-	13950: 0x856C,
-	13951: 0x856D,
-	13952: 0x856E,
-	13953: 0x856F,
-	13954: 0x8570,
-	13955: 0x8571,
-	13956: 0x8573,
-	13957: 0x8575,
-	13958: 0x8576,
-	13959: 0x8577,
-	13960: 0x8578,
-	13961: 0x857C,
-	13962: 0x857D,
-	13963: 0x857F,
-	13964: 0x8580,
-	13965: 0x8581,
-	13966: 0x7701,
-	13967: 0x76DB,
-	13968: 0x5269,
-	13969: 0x80DC,
-	13970: 0x5723,
-	13971: 0x5E08,
-	13972: 0x5931,
-	13973: 0x72EE,
-	13974: 0x65BD,
-	13975: 0x6E7F,
-	13976: 0x8BD7,
-	13977: 0x5C38,
-	13978: 0x8671,
-	13979: 0x5341,
-	13980: 0x77F3,
-	13981: 0x62FE,
-	13982: 0x65F6,
-	13983: 0x4EC0,
-	13984: 0x98DF,
-	13985: 0x8680,
-	13986: 0x5B9E,
-	13987: 0x8BC6,
-	13988: 0x53F2,
-	13989: 0x77E2,
-	13990: 0x4F7F,
-	13991: 0x5C4E,
-	13992: 0x9A76,
-	13993: 0x59CB,
-	13994: 0x5F0F,
-	13995: 0x793A,
-	13996: 0x58EB,
-	13997: 0x4E16,
-	13998: 0x67FF,
-	13999: 0x4E8B,
-	14000: 0x62ED,
-	14001: 0x8A93,
-	14002: 0x901D,
-	14003: 0x52BF,
-	14004: 0x662F,
-	14005: 0x55DC,
-	14006: 0x566C,
-	14007: 0x9002,
-	14008: 0x4ED5,
-	14009: 0x4F8D,
-	14010: 0x91CA,
-	14011: 0x9970,
-	14012: 0x6C0F,
-	14013: 0x5E02,
-	14014: 0x6043,
-	14015: 0x5BA4,
-	14016: 0x89C6,
-	14017: 0x8BD5,
-	14018: 0x6536,
-	14019: 0x624B,
-	14020: 0x9996,
-	14021: 0x5B88,
-	14022: 0x5BFF,
-	14023: 0x6388,
-	14024: 0x552E,
-	14025: 0x53D7,
-	14026: 0x7626,
-	14027: 0x517D,
-	14028: 0x852C,
-	14029: 0x67A2,
-	14030: 0x68B3,
-	14031: 0x6B8A,
-	14032: 0x6292,
-	14033: 0x8F93,
-	14034: 0x53D4,
-	14035: 0x8212,
-	14036: 0x6DD1,
-	14037: 0x758F,
-	14038: 0x4E66,
-	14039: 0x8D4E,
-	14040: 0x5B70,
-	14041: 0x719F,
-	14042: 0x85AF,
-	14043: 0x6691,
-	14044: 0x66D9,
-	14045: 0x7F72,
-	14046: 0x8700,
-	14047: 0x9ECD,
-	14048: 0x9F20,
-	14049: 0x5C5E,
-	14050: 0x672F,
-	14051: 0x8FF0,
-	14052: 0x6811,
-	14053: 0x675F,
-	14054: 0x620D,
-	14055: 0x7AD6,
-	14056: 0x5885,
-	14057: 0x5EB6,
-	14058: 0x6570,
-	14059: 0x6F31,
-	14060: 0x8582,
-	14061: 0x8583,
-	14062: 0x8586,
-	14063: 0x8588,
-	14064: 0x8589,
-	14065: 0x858A,
-	14066: 0x858B,
-	14067: 0x858C,
-	14068: 0x858D,
-	14069: 0x858E,
-	14070: 0x8590,
-	14071: 0x8591,
-	14072: 0x8592,
-	14073: 0x8593,
-	14074: 0x8594,
-	14075: 0x8595,
-	14076: 0x8596,
-	14077: 0x8597,
-	14078: 0x8598,
-	14079: 0x8599,
-	14080: 0x859A,
-	14081: 0x859D,
-	14082: 0x859E,
-	14083: 0x859F,
-	14084: 0x85A0,
-	14085: 0x85A1,
-	14086: 0x85A2,
-	14087: 0x85A3,
-	14088: 0x85A5,
-	14089: 0x85A6,
-	14090: 0x85A7,
-	14091: 0x85A9,
-	14092: 0x85AB,
-	14093: 0x85AC,
-	14094: 0x85AD,
-	14095: 0x85B1,
-	14096: 0x85B2,
-	14097: 0x85B3,
-	14098: 0x85B4,
-	14099: 0x85B5,
-	14100: 0x85B6,
-	14101: 0x85B8,
-	14102: 0x85BA,
-	14103: 0x85BB,
-	14104: 0x85BC,
-	14105: 0x85BD,
-	14106: 0x85BE,
-	14107: 0x85BF,
-	14108: 0x85C0,
-	14109: 0x85C2,
-	14110: 0x85C3,
-	14111: 0x85C4,
-	14112: 0x85C5,
-	14113: 0x85C6,
-	14114: 0x85C7,
-	14115: 0x85C8,
-	14116: 0x85CA,
-	14117: 0x85CB,
-	14118: 0x85CC,
-	14119: 0x85CD,
-	14120: 0x85CE,
-	14121: 0x85D1,
-	14122: 0x85D2,
-	14123: 0x85D4,
-	14124: 0x85D6,
-	14125: 0x85D7,
-	14126: 0x85D8,
-	14127: 0x85D9,
-	14128: 0x85DA,
-	14129: 0x85DB,
-	14130: 0x85DD,
-	14131: 0x85DE,
-	14132: 0x85DF,
-	14133: 0x85E0,
-	14134: 0x85E1,
-	14135: 0x85E2,
-	14136: 0x85E3,
-	14137: 0x85E5,
-	14138: 0x85E6,
-	14139: 0x85E7,
-	14140: 0x85E8,
-	14141: 0x85EA,
-	14142: 0x85EB,
-	14143: 0x85EC,
-	14144: 0x85ED,
-	14145: 0x85EE,
-	14146: 0x85EF,
-	14147: 0x85F0,
-	14148: 0x85F1,
-	14149: 0x85F2,
-	14150: 0x85F3,
-	14151: 0x85F4,
-	14152: 0x85F5,
-	14153: 0x85F6,
-	14154: 0x85F7,
-	14155: 0x85F8,
-	14156: 0x6055,
-	14157: 0x5237,
-	14158: 0x800D,
-	14159: 0x6454,
-	14160: 0x8870,
-	14161: 0x7529,
-	14162: 0x5E05,
-	14163: 0x6813,
-	14164: 0x62F4,
-	14165: 0x971C,
-	14166: 0x53CC,
-	14167: 0x723D,
-	14168: 0x8C01,
-	14169: 0x6C34,
-	14170: 0x7761,
-	14171: 0x7A0E,
-	14172: 0x542E,
-	14173: 0x77AC,
-	14174: 0x987A,
-	14175: 0x821C,
-	14176: 0x8BF4,
-	14177: 0x7855,
-	14178: 0x6714,
-	14179: 0x70C1,
-	14180: 0x65AF,
-	14181: 0x6495,
-	14182: 0x5636,
-	14183: 0x601D,
-	14184: 0x79C1,
-	14185: 0x53F8,
-	14186: 0x4E1D,
-	14187: 0x6B7B,
-	14188: 0x8086,
-	14189: 0x5BFA,
-	14190: 0x55E3,
-	14191: 0x56DB,
-	14192: 0x4F3A,
-	14193: 0x4F3C,
-	14194: 0x9972,
-	14195: 0x5DF3,
-	14196: 0x677E,
-	14197: 0x8038,
-	14198: 0x6002,
-	14199: 0x9882,
-	14200: 0x9001,
-	14201: 0x5B8B,
-	14202: 0x8BBC,
-	14203: 0x8BF5,
-	14204: 0x641C,
-	14205: 0x8258,
-	14206: 0x64DE,
-	14207: 0x55FD,
-	14208: 0x82CF,
-	14209: 0x9165,
-	14210: 0x4FD7,
-	14211: 0x7D20,
-	14212: 0x901F,
-	14213: 0x7C9F,
-	14214: 0x50F3,
-	14215: 0x5851,
-	14216: 0x6EAF,
-	14217: 0x5BBF,
-	14218: 0x8BC9,
-	14219: 0x8083,
-	14220: 0x9178,
-	14221: 0x849C,
-	14222: 0x7B97,
-	14223: 0x867D,
-	14224: 0x968B,
-	14225: 0x968F,
-	14226: 0x7EE5,
-	14227: 0x9AD3,
-	14228: 0x788E,
-	14229: 0x5C81,
-	14230: 0x7A57,
-	14231: 0x9042,
-	14232: 0x96A7,
-	14233: 0x795F,
-	14234: 0x5B59,
-	14235: 0x635F,
-	14236: 0x7B0B,
-	14237: 0x84D1,
-	14238: 0x68AD,
-	14239: 0x5506,
-	14240: 0x7F29,
-	14241: 0x7410,
-	14242: 0x7D22,
-	14243: 0x9501,
-	14244: 0x6240,
-	14245: 0x584C,
-	14246: 0x4ED6,
-	14247: 0x5B83,
-	14248: 0x5979,
-	14249: 0x5854,
-	14250: 0x85F9,
-	14251: 0x85FA,
-	14252: 0x85FC,
-	14253: 0x85FD,
-	14254: 0x85FE,
-	14255: 0x8600,
-	14256: 0x8601,
-	14257: 0x8602,
-	14258: 0x8603,
-	14259: 0x8604,
-	14260: 0x8606,
-	14261: 0x8607,
-	14262: 0x8608,
-	14263: 0x8609,
-	14264: 0x860A,
-	14265: 0x860B,
-	14266: 0x860C,
-	14267: 0x860D,
-	14268: 0x860E,
-	14269: 0x860F,
-	14270: 0x8610,
-	14271: 0x8612,
-	14272: 0x8613,
-	14273: 0x8614,
-	14274: 0x8615,
-	14275: 0x8617,
-	14276: 0x8618,
-	14277: 0x8619,
-	14278: 0x861A,
-	14279: 0x861B,
-	14280: 0x861C,
-	14281: 0x861D,
-	14282: 0x861E,
-	14283: 0x861F,
-	14284: 0x8620,
-	14285: 0x8621,
-	14286: 0x8622,
-	14287: 0x8623,
-	14288: 0x8624,
-	14289: 0x8625,
-	14290: 0x8626,
-	14291: 0x8628,
-	14292: 0x862A,
-	14293: 0x862B,
-	14294: 0x862C,
-	14295: 0x862D,
-	14296: 0x862E,
-	14297: 0x862F,
-	14298: 0x8630,
-	14299: 0x8631,
-	14300: 0x8632,
-	14301: 0x8633,
-	14302: 0x8634,
-	14303: 0x8635,
-	14304: 0x8636,
-	14305: 0x8637,
-	14306: 0x8639,
-	14307: 0x863A,
-	14308: 0x863B,
-	14309: 0x863D,
-	14310: 0x863E,
-	14311: 0x863F,
-	14312: 0x8640,
-	14313: 0x8641,
-	14314: 0x8642,
-	14315: 0x8643,
-	14316: 0x8644,
-	14317: 0x8645,
-	14318: 0x8646,
-	14319: 0x8647,
-	14320: 0x8648,
-	14321: 0x8649,
-	14322: 0x864A,
-	14323: 0x864B,
-	14324: 0x864C,
-	14325: 0x8652,
-	14326: 0x8653,
-	14327: 0x8655,
-	14328: 0x8656,
-	14329: 0x8657,
-	14330: 0x8658,
-	14331: 0x8659,
-	14332: 0x865B,
-	14333: 0x865C,
-	14334: 0x865D,
-	14335: 0x865F,
-	14336: 0x8660,
-	14337: 0x8661,
-	14338: 0x8663,
-	14339: 0x8664,
-	14340: 0x8665,
-	14341: 0x8666,
-	14342: 0x8667,
-	14343: 0x8668,
-	14344: 0x8669,
-	14345: 0x866A,
-	14346: 0x736D,
-	14347: 0x631E,
-	14348: 0x8E4B,
-	14349: 0x8E0F,
-	14350: 0x80CE,
-	14351: 0x82D4,
-	14352: 0x62AC,
-	14353: 0x53F0,
-	14354: 0x6CF0,
-	14355: 0x915E,
-	14356: 0x592A,
-	14357: 0x6001,
-	14358: 0x6C70,
-	14359: 0x574D,
-	14360: 0x644A,
-	14361: 0x8D2A,
-	14362: 0x762B,
-	14363: 0x6EE9,
-	14364: 0x575B,
-	14365: 0x6A80,
-	14366: 0x75F0,
-	14367: 0x6F6D,
-	14368: 0x8C2D,
-	14369: 0x8C08,
-	14370: 0x5766,
-	14371: 0x6BEF,
-	14372: 0x8892,
-	14373: 0x78B3,
-	14374: 0x63A2,
-	14375: 0x53F9,
-	14376: 0x70AD,
-	14377: 0x6C64,
-	14378: 0x5858,
-	14379: 0x642A,
-	14380: 0x5802,
-	14381: 0x68E0,
-	14382: 0x819B,
-	14383: 0x5510,
-	14384: 0x7CD6,
-	14385: 0x5018,
-	14386: 0x8EBA,
-	14387: 0x6DCC,
-	14388: 0x8D9F,
-	14389: 0x70EB,
-	14390: 0x638F,
-	14391: 0x6D9B,
-	14392: 0x6ED4,
-	14393: 0x7EE6,
-	14394: 0x8404,
-	14395: 0x6843,
-	14396: 0x9003,
-	14397: 0x6DD8,
-	14398: 0x9676,
-	14399: 0x8BA8,
-	14400: 0x5957,
-	14401: 0x7279,
-	14402: 0x85E4,
-	14403: 0x817E,
-	14404: 0x75BC,
-	14405: 0x8A8A,
-	14406: 0x68AF,
-	14407: 0x5254,
-	14408: 0x8E22,
-	14409: 0x9511,
-	14410: 0x63D0,
-	14411: 0x9898,
-	14412: 0x8E44,
-	14413: 0x557C,
-	14414: 0x4F53,
-	14415: 0x66FF,
-	14416: 0x568F,
-	14417: 0x60D5,
-	14418: 0x6D95,
-	14419: 0x5243,
-	14420: 0x5C49,
-	14421: 0x5929,
-	14422: 0x6DFB,
-	14423: 0x586B,
-	14424: 0x7530,
-	14425: 0x751C,
-	14426: 0x606C,
-	14427: 0x8214,
-	14428: 0x8146,
-	14429: 0x6311,
-	14430: 0x6761,
-	14431: 0x8FE2,
-	14432: 0x773A,
-	14433: 0x8DF3,
-	14434: 0x8D34,
-	14435: 0x94C1,
-	14436: 0x5E16,
-	14437: 0x5385,
-	14438: 0x542C,
-	14439: 0x70C3,
-	14440: 0x866D,
-	14441: 0x866F,
-	14442: 0x8670,
-	14443: 0x8672,
-	14444: 0x8673,
-	14445: 0x8674,
-	14446: 0x8675,
-	14447: 0x8676,
-	14448: 0x8677,
-	14449: 0x8678,
-	14450: 0x8683,
-	14451: 0x8684,
-	14452: 0x8685,
-	14453: 0x8686,
-	14454: 0x8687,
-	14455: 0x8688,
-	14456: 0x8689,
-	14457: 0x868E,
-	14458: 0x868F,
-	14459: 0x8690,
-	14460: 0x8691,
-	14461: 0x8692,
-	14462: 0x8694,
-	14463: 0x8696,
-	14464: 0x8697,
-	14465: 0x8698,
-	14466: 0x8699,
-	14467: 0x869A,
-	14468: 0x869B,
-	14469: 0x869E,
-	14470: 0x869F,
-	14471: 0x86A0,
-	14472: 0x86A1,
-	14473: 0x86A2,
-	14474: 0x86A5,
-	14475: 0x86A6,
-	14476: 0x86AB,
-	14477: 0x86AD,
-	14478: 0x86AE,
-	14479: 0x86B2,
-	14480: 0x86B3,
-	14481: 0x86B7,
-	14482: 0x86B8,
-	14483: 0x86B9,
-	14484: 0x86BB,
-	14485: 0x86BC,
-	14486: 0x86BD,
-	14487: 0x86BE,
-	14488: 0x86BF,
-	14489: 0x86C1,
-	14490: 0x86C2,
-	14491: 0x86C3,
-	14492: 0x86C5,
-	14493: 0x86C8,
-	14494: 0x86CC,
-	14495: 0x86CD,
-	14496: 0x86D2,
-	14497: 0x86D3,
-	14498: 0x86D5,
-	14499: 0x86D6,
-	14500: 0x86D7,
-	14501: 0x86DA,
-	14502: 0x86DC,
-	14503: 0x86DD,
-	14504: 0x86E0,
-	14505: 0x86E1,
-	14506: 0x86E2,
-	14507: 0x86E3,
-	14508: 0x86E5,
-	14509: 0x86E6,
-	14510: 0x86E7,
-	14511: 0x86E8,
-	14512: 0x86EA,
-	14513: 0x86EB,
-	14514: 0x86EC,
-	14515: 0x86EF,
-	14516: 0x86F5,
-	14517: 0x86F6,
-	14518: 0x86F7,
-	14519: 0x86FA,
-	14520: 0x86FB,
-	14521: 0x86FC,
-	14522: 0x86FD,
-	14523: 0x86FF,
-	14524: 0x8701,
-	14525: 0x8704,
-	14526: 0x8705,
-	14527: 0x8706,
-	14528: 0x870B,
-	14529: 0x870C,
-	14530: 0x870E,
-	14531: 0x870F,
-	14532: 0x8710,
-	14533: 0x8711,
-	14534: 0x8714,
-	14535: 0x8716,
-	14536: 0x6C40,
-	14537: 0x5EF7,
-	14538: 0x505C,
-	14539: 0x4EAD,
-	14540: 0x5EAD,
-	14541: 0x633A,
-	14542: 0x8247,
-	14543: 0x901A,
-	14544: 0x6850,
-	14545: 0x916E,
-	14546: 0x77B3,
-	14547: 0x540C,
-	14548: 0x94DC,
-	14549: 0x5F64,
-	14550: 0x7AE5,
-	14551: 0x6876,
-	14552: 0x6345,
-	14553: 0x7B52,
-	14554: 0x7EDF,
-	14555: 0x75DB,
-	14556: 0x5077,
-	14557: 0x6295,
-	14558: 0x5934,
-	14559: 0x900F,
-	14560: 0x51F8,
-	14561: 0x79C3,
-	14562: 0x7A81,
-	14563: 0x56FE,
-	14564: 0x5F92,
-	14565: 0x9014,
-	14566: 0x6D82,
-	14567: 0x5C60,
-	14568: 0x571F,
-	14569: 0x5410,
-	14570: 0x5154,
-	14571: 0x6E4D,
-	14572: 0x56E2,
-	14573: 0x63A8,
-	14574: 0x9893,
-	14575: 0x817F,
-	14576: 0x8715,
-	14577: 0x892A,
-	14578: 0x9000,
-	14579: 0x541E,
-	14580: 0x5C6F,
-	14581: 0x81C0,
-	14582: 0x62D6,
-	14583: 0x6258,
-	14584: 0x8131,
-	14585: 0x9E35,
-	14586: 0x9640,
-	14587: 0x9A6E,
-	14588: 0x9A7C,
-	14589: 0x692D,
-	14590: 0x59A5,
-	14591: 0x62D3,
-	14592: 0x553E,
-	14593: 0x6316,
-	14594: 0x54C7,
-	14595: 0x86D9,
-	14596: 0x6D3C,
-	14597: 0x5A03,
-	14598: 0x74E6,
-	14599: 0x889C,
-	14600: 0x6B6A,
-	14601: 0x5916,
-	14602: 0x8C4C,
-	14603: 0x5F2F,
-	14604: 0x6E7E,
-	14605: 0x73A9,
-	14606: 0x987D,
-	14607: 0x4E38,
-	14608: 0x70F7,
-	14609: 0x5B8C,
-	14610: 0x7897,
-	14611: 0x633D,
-	14612: 0x665A,
-	14613: 0x7696,
-	14614: 0x60CB,
-	14615: 0x5B9B,
-	14616: 0x5A49,
-	14617: 0x4E07,
-	14618: 0x8155,
-	14619: 0x6C6A,
-	14620: 0x738B,
-	14621: 0x4EA1,
-	14622: 0x6789,
-	14623: 0x7F51,
-	14624: 0x5F80,
-	14625: 0x65FA,
-	14626: 0x671B,
-	14627: 0x5FD8,
-	14628: 0x5984,
-	14629: 0x5A01,
-	14630: 0x8719,
-	14631: 0x871B,
-	14632: 0x871D,
-	14633: 0x871F,
-	14634: 0x8720,
-	14635: 0x8724,
-	14636: 0x8726,
-	14637: 0x8727,
-	14638: 0x8728,
-	14639: 0x872A,
-	14640: 0x872B,
-	14641: 0x872C,
-	14642: 0x872D,
-	14643: 0x872F,
-	14644: 0x8730,
-	14645: 0x8732,
-	14646: 0x8733,
-	14647: 0x8735,
-	14648: 0x8736,
-	14649: 0x8738,
-	14650: 0x8739,
-	14651: 0x873A,
-	14652: 0x873C,
-	14653: 0x873D,
-	14654: 0x8740,
-	14655: 0x8741,
-	14656: 0x8742,
-	14657: 0x8743,
-	14658: 0x8744,
-	14659: 0x8745,
-	14660: 0x8746,
-	14661: 0x874A,
-	14662: 0x874B,
-	14663: 0x874D,
-	14664: 0x874F,
-	14665: 0x8750,
-	14666: 0x8751,
-	14667: 0x8752,
-	14668: 0x8754,
-	14669: 0x8755,
-	14670: 0x8756,
-	14671: 0x8758,
-	14672: 0x875A,
-	14673: 0x875B,
-	14674: 0x875C,
-	14675: 0x875D,
-	14676: 0x875E,
-	14677: 0x875F,
-	14678: 0x8761,
-	14679: 0x8762,
-	14680: 0x8766,
-	14681: 0x8767,
-	14682: 0x8768,
-	14683: 0x8769,
-	14684: 0x876A,
-	14685: 0x876B,
-	14686: 0x876C,
-	14687: 0x876D,
-	14688: 0x876F,
-	14689: 0x8771,
-	14690: 0x8772,
-	14691: 0x8773,
-	14692: 0x8775,
-	14693: 0x8777,
-	14694: 0x8778,
-	14695: 0x8779,
-	14696: 0x877A,
-	14697: 0x877F,
-	14698: 0x8780,
-	14699: 0x8781,
-	14700: 0x8784,
-	14701: 0x8786,
-	14702: 0x8787,
-	14703: 0x8789,
-	14704: 0x878A,
-	14705: 0x878C,
-	14706: 0x878E,
-	14707: 0x878F,
-	14708: 0x8790,
-	14709: 0x8791,
-	14710: 0x8792,
-	14711: 0x8794,
-	14712: 0x8795,
-	14713: 0x8796,
-	14714: 0x8798,
-	14715: 0x8799,
-	14716: 0x879A,
-	14717: 0x879B,
-	14718: 0x879C,
-	14719: 0x879D,
-	14720: 0x879E,
-	14721: 0x87A0,
-	14722: 0x87A1,
-	14723: 0x87A2,
-	14724: 0x87A3,
-	14725: 0x87A4,
-	14726: 0x5DCD,
-	14727: 0x5FAE,
-	14728: 0x5371,
-	14729: 0x97E6,
-	14730: 0x8FDD,
-	14731: 0x6845,
-	14732: 0x56F4,
-	14733: 0x552F,
-	14734: 0x60DF,
-	14735: 0x4E3A,
-	14736: 0x6F4D,
-	14737: 0x7EF4,
-	14738: 0x82C7,
-	14739: 0x840E,
-	14740: 0x59D4,
-	14741: 0x4F1F,
-	14742: 0x4F2A,
-	14743: 0x5C3E,
-	14744: 0x7EAC,
-	14745: 0x672A,
-	14746: 0x851A,
-	14747: 0x5473,
-	14748: 0x754F,
-	14749: 0x80C3,
-	14750: 0x5582,
-	14751: 0x9B4F,
-	14752: 0x4F4D,
-	14753: 0x6E2D,
-	14754: 0x8C13,
-	14755: 0x5C09,
-	14756: 0x6170,
-	14757: 0x536B,
-	14758: 0x761F,
-	14759: 0x6E29,
-	14760: 0x868A,
-	14761: 0x6587,
-	14762: 0x95FB,
-	14763: 0x7EB9,
-	14764: 0x543B,
-	14765: 0x7A33,
-	14766: 0x7D0A,
-	14767: 0x95EE,
-	14768: 0x55E1,
-	14769: 0x7FC1,
-	14770: 0x74EE,
-	14771: 0x631D,
-	14772: 0x8717,
-	14773: 0x6DA1,
-	14774: 0x7A9D,
-	14775: 0x6211,
-	14776: 0x65A1,
-	14777: 0x5367,
-	14778: 0x63E1,
-	14779: 0x6C83,
-	14780: 0x5DEB,
-	14781: 0x545C,
-	14782: 0x94A8,
-	14783: 0x4E4C,
-	14784: 0x6C61,
-	14785: 0x8BEC,
-	14786: 0x5C4B,
-	14787: 0x65E0,
-	14788: 0x829C,
-	14789: 0x68A7,
-	14790: 0x543E,
-	14791: 0x5434,
-	14792: 0x6BCB,
-	14793: 0x6B66,
-	14794: 0x4E94,
-	14795: 0x6342,
-	14796: 0x5348,
-	14797: 0x821E,
-	14798: 0x4F0D,
-	14799: 0x4FAE,
-	14800: 0x575E,
-	14801: 0x620A,
-	14802: 0x96FE,
-	14803: 0x6664,
-	14804: 0x7269,
-	14805: 0x52FF,
-	14806: 0x52A1,
-	14807: 0x609F,
-	14808: 0x8BEF,
-	14809: 0x6614,
-	14810: 0x7199,
-	14811: 0x6790,
-	14812: 0x897F,
-	14813: 0x7852,
-	14814: 0x77FD,
-	14815: 0x6670,
-	14816: 0x563B,
-	14817: 0x5438,
-	14818: 0x9521,
-	14819: 0x727A,
-	14820: 0x87A5,
-	14821: 0x87A6,
-	14822: 0x87A7,
-	14823: 0x87A9,
-	14824: 0x87AA,
-	14825: 0x87AE,
-	14826: 0x87B0,
-	14827: 0x87B1,
-	14828: 0x87B2,
-	14829: 0x87B4,
-	14830: 0x87B6,
-	14831: 0x87B7,
-	14832: 0x87B8,
-	14833: 0x87B9,
-	14834: 0x87BB,
-	14835: 0x87BC,
-	14836: 0x87BE,
-	14837: 0x87BF,
-	14838: 0x87C1,
-	14839: 0x87C2,
-	14840: 0x87C3,
-	14841: 0x87C4,
-	14842: 0x87C5,
-	14843: 0x87C7,
-	14844: 0x87C8,
-	14845: 0x87C9,
-	14846: 0x87CC,
-	14847: 0x87CD,
-	14848: 0x87CE,
-	14849: 0x87CF,
-	14850: 0x87D0,
-	14851: 0x87D4,
-	14852: 0x87D5,
-	14853: 0x87D6,
-	14854: 0x87D7,
-	14855: 0x87D8,
-	14856: 0x87D9,
-	14857: 0x87DA,
-	14858: 0x87DC,
-	14859: 0x87DD,
-	14860: 0x87DE,
-	14861: 0x87DF,
-	14862: 0x87E1,
-	14863: 0x87E2,
-	14864: 0x87E3,
-	14865: 0x87E4,
-	14866: 0x87E6,
-	14867: 0x87E7,
-	14868: 0x87E8,
-	14869: 0x87E9,
-	14870: 0x87EB,
-	14871: 0x87EC,
-	14872: 0x87ED,
-	14873: 0x87EF,
-	14874: 0x87F0,
-	14875: 0x87F1,
-	14876: 0x87F2,
-	14877: 0x87F3,
-	14878: 0x87F4,
-	14879: 0x87F5,
-	14880: 0x87F6,
-	14881: 0x87F7,
-	14882: 0x87F8,
-	14883: 0x87FA,
-	14884: 0x87FB,
-	14885: 0x87FC,
-	14886: 0x87FD,
-	14887: 0x87FF,
-	14888: 0x8800,
-	14889: 0x8801,
-	14890: 0x8802,
-	14891: 0x8804,
-	14892: 0x8805,
-	14893: 0x8806,
-	14894: 0x8807,
-	14895: 0x8808,
-	14896: 0x8809,
-	14897: 0x880B,
-	14898: 0x880C,
-	14899: 0x880D,
-	14900: 0x880E,
-	14901: 0x880F,
-	14902: 0x8810,
-	14903: 0x8811,
-	14904: 0x8812,
-	14905: 0x8814,
-	14906: 0x8817,
-	14907: 0x8818,
-	14908: 0x8819,
-	14909: 0x881A,
-	14910: 0x881C,
-	14911: 0x881D,
-	14912: 0x881E,
-	14913: 0x881F,
-	14914: 0x8820,
-	14915: 0x8823,
-	14916: 0x7A00,
-	14917: 0x606F,
-	14918: 0x5E0C,
-	14919: 0x6089,
-	14920: 0x819D,
-	14921: 0x5915,
-	14922: 0x60DC,
-	14923: 0x7184,
-	14924: 0x70EF,
-	14925: 0x6EAA,
-	14926: 0x6C50,
-	14927: 0x7280,
-	14928: 0x6A84,
-	14929: 0x88AD,
-	14930: 0x5E2D,
-	14931: 0x4E60,
-	14932: 0x5AB3,
-	14933: 0x559C,
-	14934: 0x94E3,
-	14935: 0x6D17,
-	14936: 0x7CFB,
-	14937: 0x9699,
-	14938: 0x620F,
-	14939: 0x7EC6,
-	14940: 0x778E,
-	14941: 0x867E,
-	14942: 0x5323,
-	14943: 0x971E,
-	14944: 0x8F96,
-	14945: 0x6687,
-	14946: 0x5CE1,
-	14947: 0x4FA0,
-	14948: 0x72ED,
-	14949: 0x4E0B,
-	14950: 0x53A6,
-	14951: 0x590F,
-	14952: 0x5413,
-	14953: 0x6380,
-	14954: 0x9528,
-	14955: 0x5148,
-	14956: 0x4ED9,
-	14957: 0x9C9C,
-	14958: 0x7EA4,
-	14959: 0x54B8,
-	14960: 0x8D24,
-	14961: 0x8854,
-	14962: 0x8237,
-	14963: 0x95F2,
-	14964: 0x6D8E,
-	14965: 0x5F26,
-	14966: 0x5ACC,
-	14967: 0x663E,
-	14968: 0x9669,
-	14969: 0x73B0,
-	14970: 0x732E,
-	14971: 0x53BF,
-	14972: 0x817A,
-	14973: 0x9985,
-	14974: 0x7FA1,
-	14975: 0x5BAA,
-	14976: 0x9677,
-	14977: 0x9650,
-	14978: 0x7EBF,
-	14979: 0x76F8,
-	14980: 0x53A2,
-	14981: 0x9576,
-	14982: 0x9999,
-	14983: 0x7BB1,
-	14984: 0x8944,
-	14985: 0x6E58,
-	14986: 0x4E61,
-	14987: 0x7FD4,
-	14988: 0x7965,
-	14989: 0x8BE6,
-	14990: 0x60F3,
-	14991: 0x54CD,
-	14992: 0x4EAB,
-	14993: 0x9879,
-	14994: 0x5DF7,
-	14995: 0x6A61,
-	14996: 0x50CF,
-	14997: 0x5411,
-	14998: 0x8C61,
-	14999: 0x8427,
-	15000: 0x785D,
-	15001: 0x9704,
-	15002: 0x524A,
-	15003: 0x54EE,
-	15004: 0x56A3,
-	15005: 0x9500,
-	15006: 0x6D88,
-	15007: 0x5BB5,
-	15008: 0x6DC6,
-	15009: 0x6653,
-	15010: 0x8824,
-	15011: 0x8825,
-	15012: 0x8826,
-	15013: 0x8827,
-	15014: 0x8828,
-	15015: 0x8829,
-	15016: 0x882A,
-	15017: 0x882B,
-	15018: 0x882C,
-	15019: 0x882D,
-	15020: 0x882E,
-	15021: 0x882F,
-	15022: 0x8830,
-	15023: 0x8831,
-	15024: 0x8833,
-	15025: 0x8834,
-	15026: 0x8835,
-	15027: 0x8836,
-	15028: 0x8837,
-	15029: 0x8838,
-	15030: 0x883A,
-	15031: 0x883B,
-	15032: 0x883D,
-	15033: 0x883E,
-	15034: 0x883F,
-	15035: 0x8841,
-	15036: 0x8842,
-	15037: 0x8843,
-	15038: 0x8846,
-	15039: 0x8847,
-	15040: 0x8848,
-	15041: 0x8849,
-	15042: 0x884A,
-	15043: 0x884B,
-	15044: 0x884E,
-	15045: 0x884F,
-	15046: 0x8850,
-	15047: 0x8851,
-	15048: 0x8852,
-	15049: 0x8853,
-	15050: 0x8855,
-	15051: 0x8856,
-	15052: 0x8858,
-	15053: 0x885A,
-	15054: 0x885B,
-	15055: 0x885C,
-	15056: 0x885D,
-	15057: 0x885E,
-	15058: 0x885F,
-	15059: 0x8860,
-	15060: 0x8866,
-	15061: 0x8867,
-	15062: 0x886A,
-	15063: 0x886D,
-	15064: 0x886F,
-	15065: 0x8871,
-	15066: 0x8873,
-	15067: 0x8874,
-	15068: 0x8875,
-	15069: 0x8876,
-	15070: 0x8878,
-	15071: 0x8879,
-	15072: 0x887A,
-	15073: 0x887B,
-	15074: 0x887C,
-	15075: 0x8880,
-	15076: 0x8883,
-	15077: 0x8886,
-	15078: 0x8887,
-	15079: 0x8889,
-	15080: 0x888A,
-	15081: 0x888C,
-	15082: 0x888E,
-	15083: 0x888F,
-	15084: 0x8890,
-	15085: 0x8891,
-	15086: 0x8893,
-	15087: 0x8894,
-	15088: 0x8895,
-	15089: 0x8897,
-	15090: 0x8898,
-	15091: 0x8899,
-	15092: 0x889A,
-	15093: 0x889B,
-	15094: 0x889D,
-	15095: 0x889E,
-	15096: 0x889F,
-	15097: 0x88A0,
-	15098: 0x88A1,
-	15099: 0x88A3,
-	15100: 0x88A5,
-	15101: 0x88A6,
-	15102: 0x88A7,
-	15103: 0x88A8,
-	15104: 0x88A9,
-	15105: 0x88AA,
-	15106: 0x5C0F,
-	15107: 0x5B5D,
-	15108: 0x6821,
-	15109: 0x8096,
-	15110: 0x5578,
-	15111: 0x7B11,
-	15112: 0x6548,
-	15113: 0x6954,
-	15114: 0x4E9B,
-	15115: 0x6B47,
-	15116: 0x874E,
-	15117: 0x978B,
-	15118: 0x534F,
-	15119: 0x631F,
-	15120: 0x643A,
-	15121: 0x90AA,
-	15122: 0x659C,
-	15123: 0x80C1,
-	15124: 0x8C10,
-	15125: 0x5199,
-	15126: 0x68B0,
-	15127: 0x5378,
-	15128: 0x87F9,
-	15129: 0x61C8,
-	15130: 0x6CC4,
-	15131: 0x6CFB,
-	15132: 0x8C22,
-	15133: 0x5C51,
-	15134: 0x85AA,
-	15135: 0x82AF,
-	15136: 0x950C,
-	15137: 0x6B23,
-	15138: 0x8F9B,
-	15139: 0x65B0,
-	15140: 0x5FFB,
-	15141: 0x5FC3,
-	15142: 0x4FE1,
-	15143: 0x8845,
-	15144: 0x661F,
-	15145: 0x8165,
-	15146: 0x7329,
-	15147: 0x60FA,
-	15148: 0x5174,
-	15149: 0x5211,
-	15150: 0x578B,
-	15151: 0x5F62,
-	15152: 0x90A2,
-	15153: 0x884C,
-	15154: 0x9192,
-	15155: 0x5E78,
-	15156: 0x674F,
-	15157: 0x6027,
-	15158: 0x59D3,
-	15159: 0x5144,
-	15160: 0x51F6,
-	15161: 0x80F8,
-	15162: 0x5308,
-	15163: 0x6C79,
-	15164: 0x96C4,
-	15165: 0x718A,
-	15166: 0x4F11,
-	15167: 0x4FEE,
-	15168: 0x7F9E,
-	15169: 0x673D,
-	15170: 0x55C5,
-	15171: 0x9508,
-	15172: 0x79C0,
-	15173: 0x8896,
-	15174: 0x7EE3,
-	15175: 0x589F,
-	15176: 0x620C,
-	15177: 0x9700,
-	15178: 0x865A,
-	15179: 0x5618,
-	15180: 0x987B,
-	15181: 0x5F90,
-	15182: 0x8BB8,
-	15183: 0x84C4,
-	15184: 0x9157,
-	15185: 0x53D9,
-	15186: 0x65ED,
-	15187: 0x5E8F,
-	15188: 0x755C,
-	15189: 0x6064,
-	15190: 0x7D6E,
-	15191: 0x5A7F,
-	15192: 0x7EEA,
-	15193: 0x7EED,
-	15194: 0x8F69,
-	15195: 0x55A7,
-	15196: 0x5BA3,
-	15197: 0x60AC,
-	15198: 0x65CB,
-	15199: 0x7384,
-	15200: 0x88AC,
-	15201: 0x88AE,
-	15202: 0x88AF,
-	15203: 0x88B0,
-	15204: 0x88B2,
-	15205: 0x88B3,
-	15206: 0x88B4,
-	15207: 0x88B5,
-	15208: 0x88B6,
-	15209: 0x88B8,
-	15210: 0x88B9,
-	15211: 0x88BA,
-	15212: 0x88BB,
-	15213: 0x88BD,
-	15214: 0x88BE,
-	15215: 0x88BF,
-	15216: 0x88C0,
-	15217: 0x88C3,
-	15218: 0x88C4,
-	15219: 0x88C7,
-	15220: 0x88C8,
-	15221: 0x88CA,
-	15222: 0x88CB,
-	15223: 0x88CC,
-	15224: 0x88CD,
-	15225: 0x88CF,
-	15226: 0x88D0,
-	15227: 0x88D1,
-	15228: 0x88D3,
-	15229: 0x88D6,
-	15230: 0x88D7,
-	15231: 0x88DA,
-	15232: 0x88DB,
-	15233: 0x88DC,
-	15234: 0x88DD,
-	15235: 0x88DE,
-	15236: 0x88E0,
-	15237: 0x88E1,
-	15238: 0x88E6,
-	15239: 0x88E7,
-	15240: 0x88E9,
-	15241: 0x88EA,
-	15242: 0x88EB,
-	15243: 0x88EC,
-	15244: 0x88ED,
-	15245: 0x88EE,
-	15246: 0x88EF,
-	15247: 0x88F2,
-	15248: 0x88F5,
-	15249: 0x88F6,
-	15250: 0x88F7,
-	15251: 0x88FA,
-	15252: 0x88FB,
-	15253: 0x88FD,
-	15254: 0x88FF,
-	15255: 0x8900,
-	15256: 0x8901,
-	15257: 0x8903,
-	15258: 0x8904,
-	15259: 0x8905,
-	15260: 0x8906,
-	15261: 0x8907,
-	15262: 0x8908,
-	15263: 0x8909,
-	15264: 0x890B,
-	15265: 0x890C,
-	15266: 0x890D,
-	15267: 0x890E,
-	15268: 0x890F,
-	15269: 0x8911,
-	15270: 0x8914,
-	15271: 0x8915,
-	15272: 0x8916,
-	15273: 0x8917,
-	15274: 0x8918,
-	15275: 0x891C,
-	15276: 0x891D,
-	15277: 0x891E,
-	15278: 0x891F,
-	15279: 0x8920,
-	15280: 0x8922,
-	15281: 0x8923,
-	15282: 0x8924,
-	15283: 0x8926,
-	15284: 0x8927,
-	15285: 0x8928,
-	15286: 0x8929,
-	15287: 0x892C,
-	15288: 0x892D,
-	15289: 0x892E,
-	15290: 0x892F,
-	15291: 0x8931,
-	15292: 0x8932,
-	15293: 0x8933,
-	15294: 0x8935,
-	15295: 0x8937,
-	15296: 0x9009,
-	15297: 0x7663,
-	15298: 0x7729,
-	15299: 0x7EDA,
-	15300: 0x9774,
-	15301: 0x859B,
-	15302: 0x5B66,
-	15303: 0x7A74,
-	15304: 0x96EA,
-	15305: 0x8840,
-	15306: 0x52CB,
-	15307: 0x718F,
-	15308: 0x5FAA,
-	15309: 0x65EC,
-	15310: 0x8BE2,
-	15311: 0x5BFB,
-	15312: 0x9A6F,
-	15313: 0x5DE1,
-	15314: 0x6B89,
-	15315: 0x6C5B,
-	15316: 0x8BAD,
-	15317: 0x8BAF,
-	15318: 0x900A,
-	15319: 0x8FC5,
-	15320: 0x538B,
-	15321: 0x62BC,
-	15322: 0x9E26,
-	15323: 0x9E2D,
-	15324: 0x5440,
-	15325: 0x4E2B,
-	15326: 0x82BD,
-	15327: 0x7259,
-	15328: 0x869C,
-	15329: 0x5D16,
-	15330: 0x8859,
-	15331: 0x6DAF,
-	15332: 0x96C5,
-	15333: 0x54D1,
-	15334: 0x4E9A,
-	15335: 0x8BB6,
-	15336: 0x7109,
-	15337: 0x54BD,
-	15338: 0x9609,
-	15339: 0x70DF,
-	15340: 0x6DF9,
-	15341: 0x76D0,
-	15342: 0x4E25,
-	15343: 0x7814,
-	15344: 0x8712,
-	15345: 0x5CA9,
-	15346: 0x5EF6,
-	15347: 0x8A00,
-	15348: 0x989C,
-	15349: 0x960E,
-	15350: 0x708E,
-	15351: 0x6CBF,
-	15352: 0x5944,
-	15353: 0x63A9,
-	15354: 0x773C,
-	15355: 0x884D,
-	15356: 0x6F14,
-	15357: 0x8273,
-	15358: 0x5830,
-	15359: 0x71D5,
-	15360: 0x538C,
-	15361: 0x781A,
-	15362: 0x96C1,
-	15363: 0x5501,
-	15364: 0x5F66,
-	15365: 0x7130,
-	15366: 0x5BB4,
-	15367: 0x8C1A,
-	15368: 0x9A8C,
-	15369: 0x6B83,
-	15370: 0x592E,
-	15371: 0x9E2F,
-	15372: 0x79E7,
-	15373: 0x6768,
-	15374: 0x626C,
-	15375: 0x4F6F,
-	15376: 0x75A1,
-	15377: 0x7F8A,
-	15378: 0x6D0B,
-	15379: 0x9633,
-	15380: 0x6C27,
-	15381: 0x4EF0,
-	15382: 0x75D2,
-	15383: 0x517B,
-	15384: 0x6837,
-	15385: 0x6F3E,
-	15386: 0x9080,
-	15387: 0x8170,
-	15388: 0x5996,
-	15389: 0x7476,
-	15390: 0x8938,
-	15391: 0x8939,
-	15392: 0x893A,
-	15393: 0x893B,
-	15394: 0x893C,
-	15395: 0x893D,
-	15396: 0x893E,
-	15397: 0x893F,
-	15398: 0x8940,
-	15399: 0x8942,
-	15400: 0x8943,
-	15401: 0x8945,
-	15402: 0x8946,
-	15403: 0x8947,
-	15404: 0x8948,
-	15405: 0x8949,
-	15406: 0x894A,
-	15407: 0x894B,
-	15408: 0x894C,
-	15409: 0x894D,
-	15410: 0x894E,
-	15411: 0x894F,
-	15412: 0x8950,
-	15413: 0x8951,
-	15414: 0x8952,
-	15415: 0x8953,
-	15416: 0x8954,
-	15417: 0x8955,
-	15418: 0x8956,
-	15419: 0x8957,
-	15420: 0x8958,
-	15421: 0x8959,
-	15422: 0x895A,
-	15423: 0x895B,
-	15424: 0x895C,
-	15425: 0x895D,
-	15426: 0x8960,
-	15427: 0x8961,
-	15428: 0x8962,
-	15429: 0x8963,
-	15430: 0x8964,
-	15431: 0x8965,
-	15432: 0x8967,
-	15433: 0x8968,
-	15434: 0x8969,
-	15435: 0x896A,
-	15436: 0x896B,
-	15437: 0x896C,
-	15438: 0x896D,
-	15439: 0x896E,
-	15440: 0x896F,
-	15441: 0x8970,
-	15442: 0x8971,
-	15443: 0x8972,
-	15444: 0x8973,
-	15445: 0x8974,
-	15446: 0x8975,
-	15447: 0x8976,
-	15448: 0x8977,
-	15449: 0x8978,
-	15450: 0x8979,
-	15451: 0x897A,
-	15452: 0x897C,
-	15453: 0x897D,
-	15454: 0x897E,
-	15455: 0x8980,
-	15456: 0x8982,
-	15457: 0x8984,
-	15458: 0x8985,
-	15459: 0x8987,
-	15460: 0x8988,
-	15461: 0x8989,
-	15462: 0x898A,
-	15463: 0x898B,
-	15464: 0x898C,
-	15465: 0x898D,
-	15466: 0x898E,
-	15467: 0x898F,
-	15468: 0x8990,
-	15469: 0x8991,
-	15470: 0x8992,
-	15471: 0x8993,
-	15472: 0x8994,
-	15473: 0x8995,
-	15474: 0x8996,
-	15475: 0x8997,
-	15476: 0x8998,
-	15477: 0x8999,
-	15478: 0x899A,
-	15479: 0x899B,
-	15480: 0x899C,
-	15481: 0x899D,
-	15482: 0x899E,
-	15483: 0x899F,
-	15484: 0x89A0,
-	15485: 0x89A1,
-	15486: 0x6447,
-	15487: 0x5C27,
-	15488: 0x9065,
-	15489: 0x7A91,
-	15490: 0x8C23,
-	15491: 0x59DA,
-	15492: 0x54AC,
-	15493: 0x8200,
-	15494: 0x836F,
-	15495: 0x8981,
-	15496: 0x8000,
-	15497: 0x6930,
-	15498: 0x564E,
-	15499: 0x8036,
-	15500: 0x7237,
-	15501: 0x91CE,
-	15502: 0x51B6,
-	15503: 0x4E5F,
-	15504: 0x9875,
-	15505: 0x6396,
-	15506: 0x4E1A,
-	15507: 0x53F6,
-	15508: 0x66F3,
-	15509: 0x814B,
-	15510: 0x591C,
-	15511: 0x6DB2,
-	15512: 0x4E00,
-	15513: 0x58F9,
-	15514: 0x533B,
-	15515: 0x63D6,
-	15516: 0x94F1,
-	15517: 0x4F9D,
-	15518: 0x4F0A,
-	15519: 0x8863,
-	15520: 0x9890,
-	15521: 0x5937,
-	15522: 0x9057,
-	15523: 0x79FB,
-	15524: 0x4EEA,
-	15525: 0x80F0,
-	15526: 0x7591,
-	15527: 0x6C82,
-	15528: 0x5B9C,
-	15529: 0x59E8,
-	15530: 0x5F5D,
-	15531: 0x6905,
-	15532: 0x8681,
-	15533: 0x501A,
-	15534: 0x5DF2,
-	15535: 0x4E59,
-	15536: 0x77E3,
-	15537: 0x4EE5,
-	15538: 0x827A,
-	15539: 0x6291,
-	15540: 0x6613,
-	15541: 0x9091,
-	15542: 0x5C79,
-	15543: 0x4EBF,
-	15544: 0x5F79,
-	15545: 0x81C6,
-	15546: 0x9038,
-	15547: 0x8084,
-	15548: 0x75AB,
-	15549: 0x4EA6,
-	15550: 0x88D4,
-	15551: 0x610F,
-	15552: 0x6BC5,
-	15553: 0x5FC6,
-	15554: 0x4E49,
-	15555: 0x76CA,
-	15556: 0x6EA2,
-	15557: 0x8BE3,
-	15558: 0x8BAE,
-	15559: 0x8C0A,
-	15560: 0x8BD1,
-	15561: 0x5F02,
-	15562: 0x7FFC,
-	15563: 0x7FCC,
-	15564: 0x7ECE,
-	15565: 0x8335,
-	15566: 0x836B,
-	15567: 0x56E0,
-	15568: 0x6BB7,
-	15569: 0x97F3,
-	15570: 0x9634,
-	15571: 0x59FB,
-	15572: 0x541F,
-	15573: 0x94F6,
-	15574: 0x6DEB,
-	15575: 0x5BC5,
-	15576: 0x996E,
-	15577: 0x5C39,
-	15578: 0x5F15,
-	15579: 0x9690,
-	15580: 0x89A2,
-	15581: 0x89A3,
-	15582: 0x89A4,
-	15583: 0x89A5,
-	15584: 0x89A6,
-	15585: 0x89A7,
-	15586: 0x89A8,
-	15587: 0x89A9,
-	15588: 0x89AA,
-	15589: 0x89AB,
-	15590: 0x89AC,
-	15591: 0x89AD,
-	15592: 0x89AE,
-	15593: 0x89AF,
-	15594: 0x89B0,
-	15595: 0x89B1,
-	15596: 0x89B2,
-	15597: 0x89B3,
-	15598: 0x89B4,
-	15599: 0x89B5,
-	15600: 0x89B6,
-	15601: 0x89B7,
-	15602: 0x89B8,
-	15603: 0x89B9,
-	15604: 0x89BA,
-	15605: 0x89BB,
-	15606: 0x89BC,
-	15607: 0x89BD,
-	15608: 0x89BE,
-	15609: 0x89BF,
-	15610: 0x89C0,
-	15611: 0x89C3,
-	15612: 0x89CD,
-	15613: 0x89D3,
-	15614: 0x89D4,
-	15615: 0x89D5,
-	15616: 0x89D7,
-	15617: 0x89D8,
-	15618: 0x89D9,
-	15619: 0x89DB,
-	15620: 0x89DD,
-	15621: 0x89DF,
-	15622: 0x89E0,
-	15623: 0x89E1,
-	15624: 0x89E2,
-	15625: 0x89E4,
-	15626: 0x89E7,
-	15627: 0x89E8,
-	15628: 0x89E9,
-	15629: 0x89EA,
-	15630: 0x89EC,
-	15631: 0x89ED,
-	15632: 0x89EE,
-	15633: 0x89F0,
-	15634: 0x89F1,
-	15635: 0x89F2,
-	15636: 0x89F4,
-	15637: 0x89F5,
-	15638: 0x89F6,
-	15639: 0x89F7,
-	15640: 0x89F8,
-	15641: 0x89F9,
-	15642: 0x89FA,
-	15643: 0x89FB,
-	15644: 0x89FC,
-	15645: 0x89FD,
-	15646: 0x89FE,
-	15647: 0x89FF,
-	15648: 0x8A01,
-	15649: 0x8A02,
-	15650: 0x8A03,
-	15651: 0x8A04,
-	15652: 0x8A05,
-	15653: 0x8A06,
-	15654: 0x8A08,
-	15655: 0x8A09,
-	15656: 0x8A0A,
-	15657: 0x8A0B,
-	15658: 0x8A0C,
-	15659: 0x8A0D,
-	15660: 0x8A0E,
-	15661: 0x8A0F,
-	15662: 0x8A10,
-	15663: 0x8A11,
-	15664: 0x8A12,
-	15665: 0x8A13,
-	15666: 0x8A14,
-	15667: 0x8A15,
-	15668: 0x8A16,
-	15669: 0x8A17,
-	15670: 0x8A18,
-	15671: 0x8A19,
-	15672: 0x8A1A,
-	15673: 0x8A1B,
-	15674: 0x8A1C,
-	15675: 0x8A1D,
-	15676: 0x5370,
-	15677: 0x82F1,
-	15678: 0x6A31,
-	15679: 0x5A74,
-	15680: 0x9E70,
-	15681: 0x5E94,
-	15682: 0x7F28,
-	15683: 0x83B9,
-	15684: 0x8424,
-	15685: 0x8425,
-	15686: 0x8367,
-	15687: 0x8747,
-	15688: 0x8FCE,
-	15689: 0x8D62,
-	15690: 0x76C8,
-	15691: 0x5F71,
-	15692: 0x9896,
-	15693: 0x786C,
-	15694: 0x6620,
-	15695: 0x54DF,
-	15696: 0x62E5,
-	15697: 0x4F63,
-	15698: 0x81C3,
-	15699: 0x75C8,
-	15700: 0x5EB8,
-	15701: 0x96CD,
-	15702: 0x8E0A,
-	15703: 0x86F9,
-	15704: 0x548F,
-	15705: 0x6CF3,
-	15706: 0x6D8C,
-	15707: 0x6C38,
-	15708: 0x607F,
-	15709: 0x52C7,
-	15710: 0x7528,
-	15711: 0x5E7D,
-	15712: 0x4F18,
-	15713: 0x60A0,
-	15714: 0x5FE7,
-	15715: 0x5C24,
-	15716: 0x7531,
-	15717: 0x90AE,
-	15718: 0x94C0,
-	15719: 0x72B9,
-	15720: 0x6CB9,
-	15721: 0x6E38,
-	15722: 0x9149,
-	15723: 0x6709,
-	15724: 0x53CB,
-	15725: 0x53F3,
-	15726: 0x4F51,
-	15727: 0x91C9,
-	15728: 0x8BF1,
-	15729: 0x53C8,
-	15730: 0x5E7C,
-	15731: 0x8FC2,
-	15732: 0x6DE4,
-	15733: 0x4E8E,
-	15734: 0x76C2,
-	15735: 0x6986,
-	15736: 0x865E,
-	15737: 0x611A,
-	15738: 0x8206,
-	15739: 0x4F59,
-	15740: 0x4FDE,
-	15741: 0x903E,
-	15742: 0x9C7C,
-	15743: 0x6109,
-	15744: 0x6E1D,
-	15745: 0x6E14,
-	15746: 0x9685,
-	15747: 0x4E88,
-	15748: 0x5A31,
-	15749: 0x96E8,
-	15750: 0x4E0E,
-	15751: 0x5C7F,
-	15752: 0x79B9,
-	15753: 0x5B87,
-	15754: 0x8BED,
-	15755: 0x7FBD,
-	15756: 0x7389,
-	15757: 0x57DF,
-	15758: 0x828B,
-	15759: 0x90C1,
-	15760: 0x5401,
-	15761: 0x9047,
-	15762: 0x55BB,
-	15763: 0x5CEA,
-	15764: 0x5FA1,
-	15765: 0x6108,
-	15766: 0x6B32,
-	15767: 0x72F1,
-	15768: 0x80B2,
-	15769: 0x8A89,
-	15770: 0x8A1E,
-	15771: 0x8A1F,
-	15772: 0x8A20,
-	15773: 0x8A21,
-	15774: 0x8A22,
-	15775: 0x8A23,
-	15776: 0x8A24,
-	15777: 0x8A25,
-	15778: 0x8A26,
-	15779: 0x8A27,
-	15780: 0x8A28,
-	15781: 0x8A29,
-	15782: 0x8A2A,
-	15783: 0x8A2B,
-	15784: 0x8A2C,
-	15785: 0x8A2D,
-	15786: 0x8A2E,
-	15787: 0x8A2F,
-	15788: 0x8A30,
-	15789: 0x8A31,
-	15790: 0x8A32,
-	15791: 0x8A33,
-	15792: 0x8A34,
-	15793: 0x8A35,
-	15794: 0x8A36,
-	15795: 0x8A37,
-	15796: 0x8A38,
-	15797: 0x8A39,
-	15798: 0x8A3A,
-	15799: 0x8A3B,
-	15800: 0x8A3C,
-	15801: 0x8A3D,
-	15802: 0x8A3F,
-	15803: 0x8A40,
-	15804: 0x8A41,
-	15805: 0x8A42,
-	15806: 0x8A43,
-	15807: 0x8A44,
-	15808: 0x8A45,
-	15809: 0x8A46,
-	15810: 0x8A47,
-	15811: 0x8A49,
-	15812: 0x8A4A,
-	15813: 0x8A4B,
-	15814: 0x8A4C,
-	15815: 0x8A4D,
-	15816: 0x8A4E,
-	15817: 0x8A4F,
-	15818: 0x8A50,
-	15819: 0x8A51,
-	15820: 0x8A52,
-	15821: 0x8A53,
-	15822: 0x8A54,
-	15823: 0x8A55,
-	15824: 0x8A56,
-	15825: 0x8A57,
-	15826: 0x8A58,
-	15827: 0x8A59,
-	15828: 0x8A5A,
-	15829: 0x8A5B,
-	15830: 0x8A5C,
-	15831: 0x8A5D,
-	15832: 0x8A5E,
-	15833: 0x8A5F,
-	15834: 0x8A60,
-	15835: 0x8A61,
-	15836: 0x8A62,
-	15837: 0x8A63,
-	15838: 0x8A64,
-	15839: 0x8A65,
-	15840: 0x8A66,
-	15841: 0x8A67,
-	15842: 0x8A68,
-	15843: 0x8A69,
-	15844: 0x8A6A,
-	15845: 0x8A6B,
-	15846: 0x8A6C,
-	15847: 0x8A6D,
-	15848: 0x8A6E,
-	15849: 0x8A6F,
-	15850: 0x8A70,
-	15851: 0x8A71,
-	15852: 0x8A72,
-	15853: 0x8A73,
-	15854: 0x8A74,
-	15855: 0x8A75,
-	15856: 0x8A76,
-	15857: 0x8A77,
-	15858: 0x8A78,
-	15859: 0x8A7A,
-	15860: 0x8A7B,
-	15861: 0x8A7C,
-	15862: 0x8A7D,
-	15863: 0x8A7E,
-	15864: 0x8A7F,
-	15865: 0x8A80,
-	15866: 0x6D74,
-	15867: 0x5BD3,
-	15868: 0x88D5,
-	15869: 0x9884,
-	15870: 0x8C6B,
-	15871: 0x9A6D,
-	15872: 0x9E33,
-	15873: 0x6E0A,
-	15874: 0x51A4,
-	15875: 0x5143,
-	15876: 0x57A3,
-	15877: 0x8881,
-	15878: 0x539F,
-	15879: 0x63F4,
-	15880: 0x8F95,
-	15881: 0x56ED,
-	15882: 0x5458,
-	15883: 0x5706,
-	15884: 0x733F,
-	15885: 0x6E90,
-	15886: 0x7F18,
-	15887: 0x8FDC,
-	15888: 0x82D1,
-	15889: 0x613F,
-	15890: 0x6028,
-	15891: 0x9662,
-	15892: 0x66F0,
-	15893: 0x7EA6,
-	15894: 0x8D8A,
-	15895: 0x8DC3,
-	15896: 0x94A5,
-	15897: 0x5CB3,
-	15898: 0x7CA4,
-	15899: 0x6708,
-	15900: 0x60A6,
-	15901: 0x9605,
-	15902: 0x8018,
-	15903: 0x4E91,
-	15904: 0x90E7,
-	15905: 0x5300,
-	15906: 0x9668,
-	15907: 0x5141,
-	15908: 0x8FD0,
-	15909: 0x8574,
-	15910: 0x915D,
-	15911: 0x6655,
-	15912: 0x97F5,
-	15913: 0x5B55,
-	15914: 0x531D,
-	15915: 0x7838,
-	15916: 0x6742,
-	15917: 0x683D,
-	15918: 0x54C9,
-	15919: 0x707E,
-	15920: 0x5BB0,
-	15921: 0x8F7D,
-	15922: 0x518D,
-	15923: 0x5728,
-	15924: 0x54B1,
-	15925: 0x6512,
-	15926: 0x6682,
-	15927: 0x8D5E,
-	15928: 0x8D43,
-	15929: 0x810F,
-	15930: 0x846C,
-	15931: 0x906D,
-	15932: 0x7CDF,
-	15933: 0x51FF,
-	15934: 0x85FB,
-	15935: 0x67A3,
-	15936: 0x65E9,
-	15937: 0x6FA1,
-	15938: 0x86A4,
-	15939: 0x8E81,
-	15940: 0x566A,
-	15941: 0x9020,
-	15942: 0x7682,
-	15943: 0x7076,
-	15944: 0x71E5,
-	15945: 0x8D23,
-	15946: 0x62E9,
-	15947: 0x5219,
-	15948: 0x6CFD,
-	15949: 0x8D3C,
-	15950: 0x600E,
-	15951: 0x589E,
-	15952: 0x618E,
-	15953: 0x66FE,
-	15954: 0x8D60,
-	15955: 0x624E,
-	15956: 0x55B3,
-	15957: 0x6E23,
-	15958: 0x672D,
-	15959: 0x8F67,
-	15960: 0x8A81,
-	15961: 0x8A82,
-	15962: 0x8A83,
-	15963: 0x8A84,
-	15964: 0x8A85,
-	15965: 0x8A86,
-	15966: 0x8A87,
-	15967: 0x8A88,
-	15968: 0x8A8B,
-	15969: 0x8A8C,
-	15970: 0x8A8D,
-	15971: 0x8A8E,
-	15972: 0x8A8F,
-	15973: 0x8A90,
-	15974: 0x8A91,
-	15975: 0x8A92,
-	15976: 0x8A94,
-	15977: 0x8A95,
-	15978: 0x8A96,
-	15979: 0x8A97,
-	15980: 0x8A98,
-	15981: 0x8A99,
-	15982: 0x8A9A,
-	15983: 0x8A9B,
-	15984: 0x8A9C,
-	15985: 0x8A9D,
-	15986: 0x8A9E,
-	15987: 0x8A9F,
-	15988: 0x8AA0,
-	15989: 0x8AA1,
-	15990: 0x8AA2,
-	15991: 0x8AA3,
-	15992: 0x8AA4,
-	15993: 0x8AA5,
-	15994: 0x8AA6,
-	15995: 0x8AA7,
-	15996: 0x8AA8,
-	15997: 0x8AA9,
-	15998: 0x8AAA,
-	15999: 0x8AAB,
-	16000: 0x8AAC,
-	16001: 0x8AAD,
-	16002: 0x8AAE,
-	16003: 0x8AAF,
-	16004: 0x8AB0,
-	16005: 0x8AB1,
-	16006: 0x8AB2,
-	16007: 0x8AB3,
-	16008: 0x8AB4,
-	16009: 0x8AB5,
-	16010: 0x8AB6,
-	16011: 0x8AB7,
-	16012: 0x8AB8,
-	16013: 0x8AB9,
-	16014: 0x8ABA,
-	16015: 0x8ABB,
-	16016: 0x8ABC,
-	16017: 0x8ABD,
-	16018: 0x8ABE,
-	16019: 0x8ABF,
-	16020: 0x8AC0,
-	16021: 0x8AC1,
-	16022: 0x8AC2,
-	16023: 0x8AC3,
-	16024: 0x8AC4,
-	16025: 0x8AC5,
-	16026: 0x8AC6,
-	16027: 0x8AC7,
-	16028: 0x8AC8,
-	16029: 0x8AC9,
-	16030: 0x8ACA,
-	16031: 0x8ACB,
-	16032: 0x8ACC,
-	16033: 0x8ACD,
-	16034: 0x8ACE,
-	16035: 0x8ACF,
-	16036: 0x8AD0,
-	16037: 0x8AD1,
-	16038: 0x8AD2,
-	16039: 0x8AD3,
-	16040: 0x8AD4,
-	16041: 0x8AD5,
-	16042: 0x8AD6,
-	16043: 0x8AD7,
-	16044: 0x8AD8,
-	16045: 0x8AD9,
-	16046: 0x8ADA,
-	16047: 0x8ADB,
-	16048: 0x8ADC,
-	16049: 0x8ADD,
-	16050: 0x8ADE,
-	16051: 0x8ADF,
-	16052: 0x8AE0,
-	16053: 0x8AE1,
-	16054: 0x8AE2,
-	16055: 0x8AE3,
-	16056: 0x94E1,
-	16057: 0x95F8,
-	16058: 0x7728,
-	16059: 0x6805,
-	16060: 0x69A8,
-	16061: 0x548B,
-	16062: 0x4E4D,
-	16063: 0x70B8,
-	16064: 0x8BC8,
-	16065: 0x6458,
-	16066: 0x658B,
-	16067: 0x5B85,
-	16068: 0x7A84,
-	16069: 0x503A,
-	16070: 0x5BE8,
-	16071: 0x77BB,
-	16072: 0x6BE1,
-	16073: 0x8A79,
-	16074: 0x7C98,
-	16075: 0x6CBE,
-	16076: 0x76CF,
-	16077: 0x65A9,
-	16078: 0x8F97,
-	16079: 0x5D2D,
-	16080: 0x5C55,
-	16081: 0x8638,
-	16082: 0x6808,
-	16083: 0x5360,
-	16084: 0x6218,
-	16085: 0x7AD9,
-	16086: 0x6E5B,
-	16087: 0x7EFD,
-	16088: 0x6A1F,
-	16089: 0x7AE0,
-	16090: 0x5F70,
-	16091: 0x6F33,
-	16092: 0x5F20,
-	16093: 0x638C,
-	16094: 0x6DA8,
-	16095: 0x6756,
-	16096: 0x4E08,
-	16097: 0x5E10,
-	16098: 0x8D26,
-	16099: 0x4ED7,
-	16100: 0x80C0,
-	16101: 0x7634,
-	16102: 0x969C,
-	16103: 0x62DB,
-	16104: 0x662D,
-	16105: 0x627E,
-	16106: 0x6CBC,
-	16107: 0x8D75,
-	16108: 0x7167,
-	16109: 0x7F69,
-	16110: 0x5146,
-	16111: 0x8087,
-	16112: 0x53EC,
-	16113: 0x906E,
-	16114: 0x6298,
-	16115: 0x54F2,
-	16116: 0x86F0,
-	16117: 0x8F99,
-	16118: 0x8005,
-	16119: 0x9517,
-	16120: 0x8517,
-	16121: 0x8FD9,
-	16122: 0x6D59,
-	16123: 0x73CD,
-	16124: 0x659F,
-	16125: 0x771F,
-	16126: 0x7504,
-	16127: 0x7827,
-	16128: 0x81FB,
-	16129: 0x8D1E,
-	16130: 0x9488,
-	16131: 0x4FA6,
-	16132: 0x6795,
-	16133: 0x75B9,
-	16134: 0x8BCA,
-	16135: 0x9707,
-	16136: 0x632F,
-	16137: 0x9547,
-	16138: 0x9635,
-	16139: 0x84B8,
-	16140: 0x6323,
-	16141: 0x7741,
-	16142: 0x5F81,
-	16143: 0x72F0,
-	16144: 0x4E89,
-	16145: 0x6014,
-	16146: 0x6574,
-	16147: 0x62EF,
-	16148: 0x6B63,
-	16149: 0x653F,
-	16150: 0x8AE4,
-	16151: 0x8AE5,
-	16152: 0x8AE6,
-	16153: 0x8AE7,
-	16154: 0x8AE8,
-	16155: 0x8AE9,
-	16156: 0x8AEA,
-	16157: 0x8AEB,
-	16158: 0x8AEC,
-	16159: 0x8AED,
-	16160: 0x8AEE,
-	16161: 0x8AEF,
-	16162: 0x8AF0,
-	16163: 0x8AF1,
-	16164: 0x8AF2,
-	16165: 0x8AF3,
-	16166: 0x8AF4,
-	16167: 0x8AF5,
-	16168: 0x8AF6,
-	16169: 0x8AF7,
-	16170: 0x8AF8,
-	16171: 0x8AF9,
-	16172: 0x8AFA,
-	16173: 0x8AFB,
-	16174: 0x8AFC,
-	16175: 0x8AFD,
-	16176: 0x8AFE,
-	16177: 0x8AFF,
-	16178: 0x8B00,
-	16179: 0x8B01,
-	16180: 0x8B02,
-	16181: 0x8B03,
-	16182: 0x8B04,
-	16183: 0x8B05,
-	16184: 0x8B06,
-	16185: 0x8B08,
-	16186: 0x8B09,
-	16187: 0x8B0A,
-	16188: 0x8B0B,
-	16189: 0x8B0C,
-	16190: 0x8B0D,
-	16191: 0x8B0E,
-	16192: 0x8B0F,
-	16193: 0x8B10,
-	16194: 0x8B11,
-	16195: 0x8B12,
-	16196: 0x8B13,
-	16197: 0x8B14,
-	16198: 0x8B15,
-	16199: 0x8B16,
-	16200: 0x8B17,
-	16201: 0x8B18,
-	16202: 0x8B19,
-	16203: 0x8B1A,
-	16204: 0x8B1B,
-	16205: 0x8B1C,
-	16206: 0x8B1D,
-	16207: 0x8B1E,
-	16208: 0x8B1F,
-	16209: 0x8B20,
-	16210: 0x8B21,
-	16211: 0x8B22,
-	16212: 0x8B23,
-	16213: 0x8B24,
-	16214: 0x8B25,
-	16215: 0x8B27,
-	16216: 0x8B28,
-	16217: 0x8B29,
-	16218: 0x8B2A,
-	16219: 0x8B2B,
-	16220: 0x8B2C,
-	16221: 0x8B2D,
-	16222: 0x8B2E,
-	16223: 0x8B2F,
-	16224: 0x8B30,
-	16225: 0x8B31,
-	16226: 0x8B32,
-	16227: 0x8B33,
-	16228: 0x8B34,
-	16229: 0x8B35,
-	16230: 0x8B36,
-	16231: 0x8B37,
-	16232: 0x8B38,
-	16233: 0x8B39,
-	16234: 0x8B3A,
-	16235: 0x8B3B,
-	16236: 0x8B3C,
-	16237: 0x8B3D,
-	16238: 0x8B3E,
-	16239: 0x8B3F,
-	16240: 0x8B40,
-	16241: 0x8B41,
-	16242: 0x8B42,
-	16243: 0x8B43,
-	16244: 0x8B44,
-	16245: 0x8B45,
-	16246: 0x5E27,
-	16247: 0x75C7,
-	16248: 0x90D1,
-	16249: 0x8BC1,
-	16250: 0x829D,
-	16251: 0x679D,
-	16252: 0x652F,
-	16253: 0x5431,
-	16254: 0x8718,
-	16255: 0x77E5,
-	16256: 0x80A2,
-	16257: 0x8102,
-	16258: 0x6C41,
-	16259: 0x4E4B,
-	16260: 0x7EC7,
-	16261: 0x804C,
-	16262: 0x76F4,
-	16263: 0x690D,
-	16264: 0x6B96,
-	16265: 0x6267,
-	16266: 0x503C,
-	16267: 0x4F84,
-	16268: 0x5740,
-	16269: 0x6307,
-	16270: 0x6B62,
-	16271: 0x8DBE,
-	16272: 0x53EA,
-	16273: 0x65E8,
-	16274: 0x7EB8,
-	16275: 0x5FD7,
-	16276: 0x631A,
-	16277: 0x63B7,
-	16278: 0x81F3,
-	16279: 0x81F4,
-	16280: 0x7F6E,
-	16281: 0x5E1C,
-	16282: 0x5CD9,
-	16283: 0x5236,
-	16284: 0x667A,
-	16285: 0x79E9,
-	16286: 0x7A1A,
-	16287: 0x8D28,
-	16288: 0x7099,
-	16289: 0x75D4,
-	16290: 0x6EDE,
-	16291: 0x6CBB,
-	16292: 0x7A92,
-	16293: 0x4E2D,
-	16294: 0x76C5,
-	16295: 0x5FE0,
-	16296: 0x949F,
-	16297: 0x8877,
-	16298: 0x7EC8,
-	16299: 0x79CD,
-	16300: 0x80BF,
-	16301: 0x91CD,
-	16302: 0x4EF2,
-	16303: 0x4F17,
-	16304: 0x821F,
-	16305: 0x5468,
-	16306: 0x5DDE,
-	16307: 0x6D32,
-	16308: 0x8BCC,
-	16309: 0x7CA5,
-	16310: 0x8F74,
-	16311: 0x8098,
-	16312: 0x5E1A,
-	16313: 0x5492,
-	16314: 0x76B1,
-	16315: 0x5B99,
-	16316: 0x663C,
-	16317: 0x9AA4,
-	16318: 0x73E0,
-	16319: 0x682A,
-	16320: 0x86DB,
-	16321: 0x6731,
-	16322: 0x732A,
-	16323: 0x8BF8,
-	16324: 0x8BDB,
-	16325: 0x9010,
-	16326: 0x7AF9,
-	16327: 0x70DB,
-	16328: 0x716E,
-	16329: 0x62C4,
-	16330: 0x77A9,
-	16331: 0x5631,
-	16332: 0x4E3B,
-	16333: 0x8457,
-	16334: 0x67F1,
-	16335: 0x52A9,
-	16336: 0x86C0,
-	16337: 0x8D2E,
-	16338: 0x94F8,
-	16339: 0x7B51,
-	16340: 0x8B46,
-	16341: 0x8B47,
-	16342: 0x8B48,
-	16343: 0x8B49,
-	16344: 0x8B4A,
-	16345: 0x8B4B,
-	16346: 0x8B4C,
-	16347: 0x8B4D,
-	16348: 0x8B4E,
-	16349: 0x8B4F,
-	16350: 0x8B50,
-	16351: 0x8B51,
-	16352: 0x8B52,
-	16353: 0x8B53,
-	16354: 0x8B54,
-	16355: 0x8B55,
-	16356: 0x8B56,
-	16357: 0x8B57,
-	16358: 0x8B58,
-	16359: 0x8B59,
-	16360: 0x8B5A,
-	16361: 0x8B5B,
-	16362: 0x8B5C,
-	16363: 0x8B5D,
-	16364: 0x8B5E,
-	16365: 0x8B5F,
-	16366: 0x8B60,
-	16367: 0x8B61,
-	16368: 0x8B62,
-	16369: 0x8B63,
-	16370: 0x8B64,
-	16371: 0x8B65,
-	16372: 0x8B67,
-	16373: 0x8B68,
-	16374: 0x8B69,
-	16375: 0x8B6A,
-	16376: 0x8B6B,
-	16377: 0x8B6D,
-	16378: 0x8B6E,
-	16379: 0x8B6F,
-	16380: 0x8B70,
-	16381: 0x8B71,
-	16382: 0x8B72,
-	16383: 0x8B73,
-	16384: 0x8B74,
-	16385: 0x8B75,
-	16386: 0x8B76,
-	16387: 0x8B77,
-	16388: 0x8B78,
-	16389: 0x8B79,
-	16390: 0x8B7A,
-	16391: 0x8B7B,
-	16392: 0x8B7C,
-	16393: 0x8B7D,
-	16394: 0x8B7E,
-	16395: 0x8B7F,
-	16396: 0x8B80,
-	16397: 0x8B81,
-	16398: 0x8B82,
-	16399: 0x8B83,
-	16400: 0x8B84,
-	16401: 0x8B85,
-	16402: 0x8B86,
-	16403: 0x8B87,
-	16404: 0x8B88,
-	16405: 0x8B89,
-	16406: 0x8B8A,
-	16407: 0x8B8B,
-	16408: 0x8B8C,
-	16409: 0x8B8D,
-	16410: 0x8B8E,
-	16411: 0x8B8F,
-	16412: 0x8B90,
-	16413: 0x8B91,
-	16414: 0x8B92,
-	16415: 0x8B93,
-	16416: 0x8B94,
-	16417: 0x8B95,
-	16418: 0x8B96,
-	16419: 0x8B97,
-	16420: 0x8B98,
-	16421: 0x8B99,
-	16422: 0x8B9A,
-	16423: 0x8B9B,
-	16424: 0x8B9C,
-	16425: 0x8B9D,
-	16426: 0x8B9E,
-	16427: 0x8B9F,
-	16428: 0x8BAC,
-	16429: 0x8BB1,
-	16430: 0x8BBB,
-	16431: 0x8BC7,
-	16432: 0x8BD0,
-	16433: 0x8BEA,
-	16434: 0x8C09,
-	16435: 0x8C1E,
-	16436: 0x4F4F,
-	16437: 0x6CE8,
-	16438: 0x795D,
-	16439: 0x9A7B,
-	16440: 0x6293,
-	16441: 0x722A,
-	16442: 0x62FD,
-	16443: 0x4E13,
-	16444: 0x7816,
-	16445: 0x8F6C,
-	16446: 0x64B0,
-	16447: 0x8D5A,
-	16448: 0x7BC6,
-	16449: 0x6869,
-	16450: 0x5E84,
-	16451: 0x88C5,
-	16452: 0x5986,
-	16453: 0x649E,
-	16454: 0x58EE,
-	16455: 0x72B6,
-	16456: 0x690E,
-	16457: 0x9525,
-	16458: 0x8FFD,
-	16459: 0x8D58,
-	16460: 0x5760,
-	16461: 0x7F00,
-	16462: 0x8C06,
-	16463: 0x51C6,
-	16464: 0x6349,
-	16465: 0x62D9,
-	16466: 0x5353,
-	16467: 0x684C,
-	16468: 0x7422,
-	16469: 0x8301,
-	16470: 0x914C,
-	16471: 0x5544,
-	16472: 0x7740,
-	16473: 0x707C,
-	16474: 0x6D4A,
-	16475: 0x5179,
-	16476: 0x54A8,
-	16477: 0x8D44,
-	16478: 0x59FF,
-	16479: 0x6ECB,
-	16480: 0x6DC4,
-	16481: 0x5B5C,
-	16482: 0x7D2B,
-	16483: 0x4ED4,
-	16484: 0x7C7D,
-	16485: 0x6ED3,
-	16486: 0x5B50,
-	16487: 0x81EA,
-	16488: 0x6E0D,
-	16489: 0x5B57,
-	16490: 0x9B03,
-	16491: 0x68D5,
-	16492: 0x8E2A,
-	16493: 0x5B97,
-	16494: 0x7EFC,
-	16495: 0x603B,
-	16496: 0x7EB5,
-	16497: 0x90B9,
-	16498: 0x8D70,
-	16499: 0x594F,
-	16500: 0x63CD,
-	16501: 0x79DF,
-	16502: 0x8DB3,
-	16503: 0x5352,
-	16504: 0x65CF,
-	16505: 0x7956,
-	16506: 0x8BC5,
-	16507: 0x963B,
-	16508: 0x7EC4,
-	16509: 0x94BB,
-	16510: 0x7E82,
-	16511: 0x5634,
-	16512: 0x9189,
-	16513: 0x6700,
-	16514: 0x7F6A,
-	16515: 0x5C0A,
-	16516: 0x9075,
-	16517: 0x6628,
-	16518: 0x5DE6,
-	16519: 0x4F50,
-	16520: 0x67DE,
-	16521: 0x505A,
-	16522: 0x4F5C,
-	16523: 0x5750,
-	16524: 0x5EA7,
-	16530: 0x8C38,
-	16531: 0x8C39,
-	16532: 0x8C3A,
-	16533: 0x8C3B,
-	16534: 0x8C3C,
-	16535: 0x8C3D,
-	16536: 0x8C3E,
-	16537: 0x8C3F,
-	16538: 0x8C40,
-	16539: 0x8C42,
-	16540: 0x8C43,
-	16541: 0x8C44,
-	16542: 0x8C45,
-	16543: 0x8C48,
-	16544: 0x8C4A,
-	16545: 0x8C4B,
-	16546: 0x8C4D,
-	16547: 0x8C4E,
-	16548: 0x8C4F,
-	16549: 0x8C50,
-	16550: 0x8C51,
-	16551: 0x8C52,
-	16552: 0x8C53,
-	16553: 0x8C54,
-	16554: 0x8C56,
-	16555: 0x8C57,
-	16556: 0x8C58,
-	16557: 0x8C59,
-	16558: 0x8C5B,
-	16559: 0x8C5C,
-	16560: 0x8C5D,
-	16561: 0x8C5E,
-	16562: 0x8C5F,
-	16563: 0x8C60,
-	16564: 0x8C63,
-	16565: 0x8C64,
-	16566: 0x8C65,
-	16567: 0x8C66,
-	16568: 0x8C67,
-	16569: 0x8C68,
-	16570: 0x8C69,
-	16571: 0x8C6C,
-	16572: 0x8C6D,
-	16573: 0x8C6E,
-	16574: 0x8C6F,
-	16575: 0x8C70,
-	16576: 0x8C71,
-	16577: 0x8C72,
-	16578: 0x8C74,
-	16579: 0x8C75,
-	16580: 0x8C76,
-	16581: 0x8C77,
-	16582: 0x8C7B,
-	16583: 0x8C7C,
-	16584: 0x8C7D,
-	16585: 0x8C7E,
-	16586: 0x8C7F,
-	16587: 0x8C80,
-	16588: 0x8C81,
-	16589: 0x8C83,
-	16590: 0x8C84,
-	16591: 0x8C86,
-	16592: 0x8C87,
-	16593: 0x8C88,
-	16594: 0x8C8B,
-	16595: 0x8C8D,
-	16596: 0x8C8E,
-	16597: 0x8C8F,
-	16598: 0x8C90,
-	16599: 0x8C91,
-	16600: 0x8C92,
-	16601: 0x8C93,
-	16602: 0x8C95,
-	16603: 0x8C96,
-	16604: 0x8C97,
-	16605: 0x8C99,
-	16606: 0x8C9A,
-	16607: 0x8C9B,
-	16608: 0x8C9C,
-	16609: 0x8C9D,
-	16610: 0x8C9E,
-	16611: 0x8C9F,
-	16612: 0x8CA0,
-	16613: 0x8CA1,
-	16614: 0x8CA2,
-	16615: 0x8CA3,
-	16616: 0x8CA4,
-	16617: 0x8CA5,
-	16618: 0x8CA6,
-	16619: 0x8CA7,
-	16620: 0x8CA8,
-	16621: 0x8CA9,
-	16622: 0x8CAA,
-	16623: 0x8CAB,
-	16624: 0x8CAC,
-	16625: 0x8CAD,
-	16626: 0x4E8D,
-	16627: 0x4E0C,
-	16628: 0x5140,
-	16629: 0x4E10,
-	16630: 0x5EFF,
-	16631: 0x5345,
-	16632: 0x4E15,
-	16633: 0x4E98,
-	16634: 0x4E1E,
-	16635: 0x9B32,
-	16636: 0x5B6C,
-	16637: 0x5669,
-	16638: 0x4E28,
-	16639: 0x79BA,
-	16640: 0x4E3F,
-	16641: 0x5315,
-	16642: 0x4E47,
-	16643: 0x592D,
-	16644: 0x723B,
-	16645: 0x536E,
-	16646: 0x6C10,
-	16647: 0x56DF,
-	16648: 0x80E4,
-	16649: 0x9997,
-	16650: 0x6BD3,
-	16651: 0x777E,
-	16652: 0x9F17,
-	16653: 0x4E36,
-	16654: 0x4E9F,
-	16655: 0x9F10,
-	16656: 0x4E5C,
-	16657: 0x4E69,
-	16658: 0x4E93,
-	16659: 0x8288,
-	16660: 0x5B5B,
-	16661: 0x556C,
-	16662: 0x560F,
-	16663: 0x4EC4,
-	16664: 0x538D,
-	16665: 0x539D,
-	16666: 0x53A3,
-	16667: 0x53A5,
-	16668: 0x53AE,
-	16669: 0x9765,
-	16670: 0x8D5D,
-	16671: 0x531A,
-	16672: 0x53F5,
-	16673: 0x5326,
-	16674: 0x532E,
-	16675: 0x533E,
-	16676: 0x8D5C,
-	16677: 0x5366,
-	16678: 0x5363,
-	16679: 0x5202,
-	16680: 0x5208,
-	16681: 0x520E,
-	16682: 0x522D,
-	16683: 0x5233,
-	16684: 0x523F,
-	16685: 0x5240,
-	16686: 0x524C,
-	16687: 0x525E,
-	16688: 0x5261,
-	16689: 0x525C,
-	16690: 0x84AF,
-	16691: 0x527D,
-	16692: 0x5282,
-	16693: 0x5281,
-	16694: 0x5290,
-	16695: 0x5293,
-	16696: 0x5182,
-	16697: 0x7F54,
-	16698: 0x4EBB,
-	16699: 0x4EC3,
-	16700: 0x4EC9,
-	16701: 0x4EC2,
-	16702: 0x4EE8,
-	16703: 0x4EE1,
-	16704: 0x4EEB,
-	16705: 0x4EDE,
-	16706: 0x4F1B,
-	16707: 0x4EF3,
-	16708: 0x4F22,
-	16709: 0x4F64,
-	16710: 0x4EF5,
-	16711: 0x4F25,
-	16712: 0x4F27,
-	16713: 0x4F09,
-	16714: 0x4F2B,
-	16715: 0x4F5E,
-	16716: 0x4F67,
-	16717: 0x6538,
-	16718: 0x4F5A,
-	16719: 0x4F5D,
-	16720: 0x8CAE,
-	16721: 0x8CAF,
-	16722: 0x8CB0,
-	16723: 0x8CB1,
-	16724: 0x8CB2,
-	16725: 0x8CB3,
-	16726: 0x8CB4,
-	16727: 0x8CB5,
-	16728: 0x8CB6,
-	16729: 0x8CB7,
-	16730: 0x8CB8,
-	16731: 0x8CB9,
-	16732: 0x8CBA,
-	16733: 0x8CBB,
-	16734: 0x8CBC,
-	16735: 0x8CBD,
-	16736: 0x8CBE,
-	16737: 0x8CBF,
-	16738: 0x8CC0,
-	16739: 0x8CC1,
-	16740: 0x8CC2,
-	16741: 0x8CC3,
-	16742: 0x8CC4,
-	16743: 0x8CC5,
-	16744: 0x8CC6,
-	16745: 0x8CC7,
-	16746: 0x8CC8,
-	16747: 0x8CC9,
-	16748: 0x8CCA,
-	16749: 0x8CCB,
-	16750: 0x8CCC,
-	16751: 0x8CCD,
-	16752: 0x8CCE,
-	16753: 0x8CCF,
-	16754: 0x8CD0,
-	16755: 0x8CD1,
-	16756: 0x8CD2,
-	16757: 0x8CD3,
-	16758: 0x8CD4,
-	16759: 0x8CD5,
-	16760: 0x8CD6,
-	16761: 0x8CD7,
-	16762: 0x8CD8,
-	16763: 0x8CD9,
-	16764: 0x8CDA,
-	16765: 0x8CDB,
-	16766: 0x8CDC,
-	16767: 0x8CDD,
-	16768: 0x8CDE,
-	16769: 0x8CDF,
-	16770: 0x8CE0,
-	16771: 0x8CE1,
-	16772: 0x8CE2,
-	16773: 0x8CE3,
-	16774: 0x8CE4,
-	16775: 0x8CE5,
-	16776: 0x8CE6,
-	16777: 0x8CE7,
-	16778: 0x8CE8,
-	16779: 0x8CE9,
-	16780: 0x8CEA,
-	16781: 0x8CEB,
-	16782: 0x8CEC,
-	16783: 0x8CED,
-	16784: 0x8CEE,
-	16785: 0x8CEF,
-	16786: 0x8CF0,
-	16787: 0x8CF1,
-	16788: 0x8CF2,
-	16789: 0x8CF3,
-	16790: 0x8CF4,
-	16791: 0x8CF5,
-	16792: 0x8CF6,
-	16793: 0x8CF7,
-	16794: 0x8CF8,
-	16795: 0x8CF9,
-	16796: 0x8CFA,
-	16797: 0x8CFB,
-	16798: 0x8CFC,
-	16799: 0x8CFD,
-	16800: 0x8CFE,
-	16801: 0x8CFF,
-	16802: 0x8D00,
-	16803: 0x8D01,
-	16804: 0x8D02,
-	16805: 0x8D03,
-	16806: 0x8D04,
-	16807: 0x8D05,
-	16808: 0x8D06,
-	16809: 0x8D07,
-	16810: 0x8D08,
-	16811: 0x8D09,
-	16812: 0x8D0A,
-	16813: 0x8D0B,
-	16814: 0x8D0C,
-	16815: 0x8D0D,
-	16816: 0x4F5F,
-	16817: 0x4F57,
-	16818: 0x4F32,
-	16819: 0x4F3D,
-	16820: 0x4F76,
-	16821: 0x4F74,
-	16822: 0x4F91,
-	16823: 0x4F89,
-	16824: 0x4F83,
-	16825: 0x4F8F,
-	16826: 0x4F7E,
-	16827: 0x4F7B,
-	16828: 0x4FAA,
-	16829: 0x4F7C,
-	16830: 0x4FAC,
-	16831: 0x4F94,
-	16832: 0x4FE6,
-	16833: 0x4FE8,
-	16834: 0x4FEA,
-	16835: 0x4FC5,
-	16836: 0x4FDA,
-	16837: 0x4FE3,
-	16838: 0x4FDC,
-	16839: 0x4FD1,
-	16840: 0x4FDF,
-	16841: 0x4FF8,
-	16842: 0x5029,
-	16843: 0x504C,
-	16844: 0x4FF3,
-	16845: 0x502C,
-	16846: 0x500F,
-	16847: 0x502E,
-	16848: 0x502D,
-	16849: 0x4FFE,
-	16850: 0x501C,
-	16851: 0x500C,
-	16852: 0x5025,
-	16853: 0x5028,
-	16854: 0x507E,
-	16855: 0x5043,
-	16856: 0x5055,
-	16857: 0x5048,
-	16858: 0x504E,
-	16859: 0x506C,
-	16860: 0x507B,
-	16861: 0x50A5,
-	16862: 0x50A7,
-	16863: 0x50A9,
-	16864: 0x50BA,
-	16865: 0x50D6,
-	16866: 0x5106,
-	16867: 0x50ED,
-	16868: 0x50EC,
-	16869: 0x50E6,
-	16870: 0x50EE,
-	16871: 0x5107,
-	16872: 0x510B,
-	16873: 0x4EDD,
-	16874: 0x6C3D,
-	16875: 0x4F58,
-	16876: 0x4F65,
-	16877: 0x4FCE,
-	16878: 0x9FA0,
-	16879: 0x6C46,
-	16880: 0x7C74,
-	16881: 0x516E,
-	16882: 0x5DFD,
-	16883: 0x9EC9,
-	16884: 0x9998,
-	16885: 0x5181,
-	16886: 0x5914,
-	16887: 0x52F9,
-	16888: 0x530D,
-	16889: 0x8A07,
-	16890: 0x5310,
-	16891: 0x51EB,
-	16892: 0x5919,
-	16893: 0x5155,
-	16894: 0x4EA0,
-	16895: 0x5156,
-	16896: 0x4EB3,
-	16897: 0x886E,
-	16898: 0x88A4,
-	16899: 0x4EB5,
-	16900: 0x8114,
-	16901: 0x88D2,
-	16902: 0x7980,
-	16903: 0x5B34,
-	16904: 0x8803,
-	16905: 0x7FB8,
-	16906: 0x51AB,
-	16907: 0x51B1,
-	16908: 0x51BD,
-	16909: 0x51BC,
-	16910: 0x8D0E,
-	16911: 0x8D0F,
-	16912: 0x8D10,
-	16913: 0x8D11,
-	16914: 0x8D12,
-	16915: 0x8D13,
-	16916: 0x8D14,
-	16917: 0x8D15,
-	16918: 0x8D16,
-	16919: 0x8D17,
-	16920: 0x8D18,
-	16921: 0x8D19,
-	16922: 0x8D1A,
-	16923: 0x8D1B,
-	16924: 0x8D1C,
-	16925: 0x8D20,
-	16926: 0x8D51,
-	16927: 0x8D52,
-	16928: 0x8D57,
-	16929: 0x8D5F,
-	16930: 0x8D65,
-	16931: 0x8D68,
-	16932: 0x8D69,
-	16933: 0x8D6A,
-	16934: 0x8D6C,
-	16935: 0x8D6E,
-	16936: 0x8D6F,
-	16937: 0x8D71,
-	16938: 0x8D72,
-	16939: 0x8D78,
-	16940: 0x8D79,
-	16941: 0x8D7A,
-	16942: 0x8D7B,
-	16943: 0x8D7C,
-	16944: 0x8D7D,
-	16945: 0x8D7E,
-	16946: 0x8D7F,
-	16947: 0x8D80,
-	16948: 0x8D82,
-	16949: 0x8D83,
-	16950: 0x8D86,
-	16951: 0x8D87,
-	16952: 0x8D88,
-	16953: 0x8D89,
-	16954: 0x8D8C,
-	16955: 0x8D8D,
-	16956: 0x8D8E,
-	16957: 0x8D8F,
-	16958: 0x8D90,
-	16959: 0x8D92,
-	16960: 0x8D93,
-	16961: 0x8D95,
-	16962: 0x8D96,
-	16963: 0x8D97,
-	16964: 0x8D98,
-	16965: 0x8D99,
-	16966: 0x8D9A,
-	16967: 0x8D9B,
-	16968: 0x8D9C,
-	16969: 0x8D9D,
-	16970: 0x8D9E,
-	16971: 0x8DA0,
-	16972: 0x8DA1,
-	16973: 0x8DA2,
-	16974: 0x8DA4,
-	16975: 0x8DA5,
-	16976: 0x8DA6,
-	16977: 0x8DA7,
-	16978: 0x8DA8,
-	16979: 0x8DA9,
-	16980: 0x8DAA,
-	16981: 0x8DAB,
-	16982: 0x8DAC,
-	16983: 0x8DAD,
-	16984: 0x8DAE,
-	16985: 0x8DAF,
-	16986: 0x8DB0,
-	16987: 0x8DB2,
-	16988: 0x8DB6,
-	16989: 0x8DB7,
-	16990: 0x8DB9,
-	16991: 0x8DBB,
-	16992: 0x8DBD,
-	16993: 0x8DC0,
-	16994: 0x8DC1,
-	16995: 0x8DC2,
-	16996: 0x8DC5,
-	16997: 0x8DC7,
-	16998: 0x8DC8,
-	16999: 0x8DC9,
-	17000: 0x8DCA,
-	17001: 0x8DCD,
-	17002: 0x8DD0,
-	17003: 0x8DD2,
-	17004: 0x8DD3,
-	17005: 0x8DD4,
-	17006: 0x51C7,
-	17007: 0x5196,
-	17008: 0x51A2,
-	17009: 0x51A5,
-	17010: 0x8BA0,
-	17011: 0x8BA6,
-	17012: 0x8BA7,
-	17013: 0x8BAA,
-	17014: 0x8BB4,
-	17015: 0x8BB5,
-	17016: 0x8BB7,
-	17017: 0x8BC2,
-	17018: 0x8BC3,
-	17019: 0x8BCB,
-	17020: 0x8BCF,
-	17021: 0x8BCE,
-	17022: 0x8BD2,
-	17023: 0x8BD3,
-	17024: 0x8BD4,
-	17025: 0x8BD6,
-	17026: 0x8BD8,
-	17027: 0x8BD9,
-	17028: 0x8BDC,
-	17029: 0x8BDF,
-	17030: 0x8BE0,
-	17031: 0x8BE4,
-	17032: 0x8BE8,
-	17033: 0x8BE9,
-	17034: 0x8BEE,
-	17035: 0x8BF0,
-	17036: 0x8BF3,
-	17037: 0x8BF6,
-	17038: 0x8BF9,
-	17039: 0x8BFC,
-	17040: 0x8BFF,
-	17041: 0x8C00,
-	17042: 0x8C02,
-	17043: 0x8C04,
-	17044: 0x8C07,
-	17045: 0x8C0C,
-	17046: 0x8C0F,
-	17047: 0x8C11,
-	17048: 0x8C12,
-	17049: 0x8C14,
-	17050: 0x8C15,
-	17051: 0x8C16,
-	17052: 0x8C19,
-	17053: 0x8C1B,
-	17054: 0x8C18,
-	17055: 0x8C1D,
-	17056: 0x8C1F,
-	17057: 0x8C20,
-	17058: 0x8C21,
-	17059: 0x8C25,
-	17060: 0x8C27,
-	17061: 0x8C2A,
-	17062: 0x8C2B,
-	17063: 0x8C2E,
-	17064: 0x8C2F,
-	17065: 0x8C32,
-	17066: 0x8C33,
-	17067: 0x8C35,
-	17068: 0x8C36,
-	17069: 0x5369,
-	17070: 0x537A,
-	17071: 0x961D,
-	17072: 0x9622,
-	17073: 0x9621,
-	17074: 0x9631,
-	17075: 0x962A,
-	17076: 0x963D,
-	17077: 0x963C,
-	17078: 0x9642,
-	17079: 0x9649,
-	17080: 0x9654,
-	17081: 0x965F,
-	17082: 0x9667,
-	17083: 0x966C,
-	17084: 0x9672,
-	17085: 0x9674,
-	17086: 0x9688,
-	17087: 0x968D,
-	17088: 0x9697,
-	17089: 0x96B0,
-	17090: 0x9097,
-	17091: 0x909B,
-	17092: 0x909D,
-	17093: 0x9099,
-	17094: 0x90AC,
-	17095: 0x90A1,
-	17096: 0x90B4,
-	17097: 0x90B3,
-	17098: 0x90B6,
-	17099: 0x90BA,
-	17100: 0x8DD5,
-	17101: 0x8DD8,
-	17102: 0x8DD9,
-	17103: 0x8DDC,
-	17104: 0x8DE0,
-	17105: 0x8DE1,
-	17106: 0x8DE2,
-	17107: 0x8DE5,
-	17108: 0x8DE6,
-	17109: 0x8DE7,
-	17110: 0x8DE9,
-	17111: 0x8DED,
-	17112: 0x8DEE,
-	17113: 0x8DF0,
-	17114: 0x8DF1,
-	17115: 0x8DF2,
-	17116: 0x8DF4,
-	17117: 0x8DF6,
-	17118: 0x8DFC,
-	17119: 0x8DFE,
-	17120: 0x8DFF,
-	17121: 0x8E00,
-	17122: 0x8E01,
-	17123: 0x8E02,
-	17124: 0x8E03,
-	17125: 0x8E04,
-	17126: 0x8E06,
-	17127: 0x8E07,
-	17128: 0x8E08,
-	17129: 0x8E0B,
-	17130: 0x8E0D,
-	17131: 0x8E0E,
-	17132: 0x8E10,
-	17133: 0x8E11,
-	17134: 0x8E12,
-	17135: 0x8E13,
-	17136: 0x8E15,
-	17137: 0x8E16,
-	17138: 0x8E17,
-	17139: 0x8E18,
-	17140: 0x8E19,
-	17141: 0x8E1A,
-	17142: 0x8E1B,
-	17143: 0x8E1C,
-	17144: 0x8E20,
-	17145: 0x8E21,
-	17146: 0x8E24,
-	17147: 0x8E25,
-	17148: 0x8E26,
-	17149: 0x8E27,
-	17150: 0x8E28,
-	17151: 0x8E2B,
-	17152: 0x8E2D,
-	17153: 0x8E30,
-	17154: 0x8E32,
-	17155: 0x8E33,
-	17156: 0x8E34,
-	17157: 0x8E36,
-	17158: 0x8E37,
-	17159: 0x8E38,
-	17160: 0x8E3B,
-	17161: 0x8E3C,
-	17162: 0x8E3E,
-	17163: 0x8E3F,
-	17164: 0x8E43,
-	17165: 0x8E45,
-	17166: 0x8E46,
-	17167: 0x8E4C,
-	17168: 0x8E4D,
-	17169: 0x8E4E,
-	17170: 0x8E4F,
-	17171: 0x8E50,
-	17172: 0x8E53,
-	17173: 0x8E54,
-	17174: 0x8E55,
-	17175: 0x8E56,
-	17176: 0x8E57,
-	17177: 0x8E58,
-	17178: 0x8E5A,
-	17179: 0x8E5B,
-	17180: 0x8E5C,
-	17181: 0x8E5D,
-	17182: 0x8E5E,
-	17183: 0x8E5F,
-	17184: 0x8E60,
-	17185: 0x8E61,
-	17186: 0x8E62,
-	17187: 0x8E63,
-	17188: 0x8E64,
-	17189: 0x8E65,
-	17190: 0x8E67,
-	17191: 0x8E68,
-	17192: 0x8E6A,
-	17193: 0x8E6B,
-	17194: 0x8E6E,
-	17195: 0x8E71,
-	17196: 0x90B8,
-	17197: 0x90B0,
-	17198: 0x90CF,
-	17199: 0x90C5,
-	17200: 0x90BE,
-	17201: 0x90D0,
-	17202: 0x90C4,
-	17203: 0x90C7,
-	17204: 0x90D3,
-	17205: 0x90E6,
-	17206: 0x90E2,
-	17207: 0x90DC,
-	17208: 0x90D7,
-	17209: 0x90DB,
-	17210: 0x90EB,
-	17211: 0x90EF,
-	17212: 0x90FE,
-	17213: 0x9104,
-	17214: 0x9122,
-	17215: 0x911E,
-	17216: 0x9123,
-	17217: 0x9131,
-	17218: 0x912F,
-	17219: 0x9139,
-	17220: 0x9143,
-	17221: 0x9146,
-	17222: 0x520D,
-	17223: 0x5942,
-	17224: 0x52A2,
-	17225: 0x52AC,
-	17226: 0x52AD,
-	17227: 0x52BE,
-	17228: 0x54FF,
-	17229: 0x52D0,
-	17230: 0x52D6,
-	17231: 0x52F0,
-	17232: 0x53DF,
-	17233: 0x71EE,
-	17234: 0x77CD,
-	17235: 0x5EF4,
-	17236: 0x51F5,
-	17237: 0x51FC,
-	17238: 0x9B2F,
-	17239: 0x53B6,
-	17240: 0x5F01,
-	17241: 0x755A,
-	17242: 0x5DEF,
-	17243: 0x574C,
-	17244: 0x57A9,
-	17245: 0x57A1,
-	17246: 0x587E,
-	17247: 0x58BC,
-	17248: 0x58C5,
-	17249: 0x58D1,
-	17250: 0x5729,
-	17251: 0x572C,
-	17252: 0x572A,
-	17253: 0x5733,
-	17254: 0x5739,
-	17255: 0x572E,
-	17256: 0x572F,
-	17257: 0x575C,
-	17258: 0x573B,
-	17259: 0x5742,
-	17260: 0x5769,
-	17261: 0x5785,
-	17262: 0x576B,
-	17263: 0x5786,
-	17264: 0x577C,
-	17265: 0x577B,
-	17266: 0x5768,
-	17267: 0x576D,
-	17268: 0x5776,
-	17269: 0x5773,
-	17270: 0x57AD,
-	17271: 0x57A4,
-	17272: 0x578C,
-	17273: 0x57B2,
-	17274: 0x57CF,
-	17275: 0x57A7,
-	17276: 0x57B4,
-	17277: 0x5793,
-	17278: 0x57A0,
-	17279: 0x57D5,
-	17280: 0x57D8,
-	17281: 0x57DA,
-	17282: 0x57D9,
-	17283: 0x57D2,
-	17284: 0x57B8,
-	17285: 0x57F4,
-	17286: 0x57EF,
-	17287: 0x57F8,
-	17288: 0x57E4,
-	17289: 0x57DD,
-	17290: 0x8E73,
-	17291: 0x8E75,
-	17292: 0x8E77,
-	17293: 0x8E78,
-	17294: 0x8E79,
-	17295: 0x8E7A,
-	17296: 0x8E7B,
-	17297: 0x8E7D,
-	17298: 0x8E7E,
-	17299: 0x8E80,
-	17300: 0x8E82,
-	17301: 0x8E83,
-	17302: 0x8E84,
-	17303: 0x8E86,
-	17304: 0x8E88,
-	17305: 0x8E89,
-	17306: 0x8E8A,
-	17307: 0x8E8B,
-	17308: 0x8E8C,
-	17309: 0x8E8D,
-	17310: 0x8E8E,
-	17311: 0x8E91,
-	17312: 0x8E92,
-	17313: 0x8E93,
-	17314: 0x8E95,
-	17315: 0x8E96,
-	17316: 0x8E97,
-	17317: 0x8E98,
-	17318: 0x8E99,
-	17319: 0x8E9A,
-	17320: 0x8E9B,
-	17321: 0x8E9D,
-	17322: 0x8E9F,
-	17323: 0x8EA0,
-	17324: 0x8EA1,
-	17325: 0x8EA2,
-	17326: 0x8EA3,
-	17327: 0x8EA4,
-	17328: 0x8EA5,
-	17329: 0x8EA6,
-	17330: 0x8EA7,
-	17331: 0x8EA8,
-	17332: 0x8EA9,
-	17333: 0x8EAA,
-	17334: 0x8EAD,
-	17335: 0x8EAE,
-	17336: 0x8EB0,
-	17337: 0x8EB1,
-	17338: 0x8EB3,
-	17339: 0x8EB4,
-	17340: 0x8EB5,
-	17341: 0x8EB6,
-	17342: 0x8EB7,
-	17343: 0x8EB8,
-	17344: 0x8EB9,
-	17345: 0x8EBB,
-	17346: 0x8EBC,
-	17347: 0x8EBD,
-	17348: 0x8EBE,
-	17349: 0x8EBF,
-	17350: 0x8EC0,
-	17351: 0x8EC1,
-	17352: 0x8EC2,
-	17353: 0x8EC3,
-	17354: 0x8EC4,
-	17355: 0x8EC5,
-	17356: 0x8EC6,
-	17357: 0x8EC7,
-	17358: 0x8EC8,
-	17359: 0x8EC9,
-	17360: 0x8ECA,
-	17361: 0x8ECB,
-	17362: 0x8ECC,
-	17363: 0x8ECD,
-	17364: 0x8ECF,
-	17365: 0x8ED0,
-	17366: 0x8ED1,
-	17367: 0x8ED2,
-	17368: 0x8ED3,
-	17369: 0x8ED4,
-	17370: 0x8ED5,
-	17371: 0x8ED6,
-	17372: 0x8ED7,
-	17373: 0x8ED8,
-	17374: 0x8ED9,
-	17375: 0x8EDA,
-	17376: 0x8EDB,
-	17377: 0x8EDC,
-	17378: 0x8EDD,
-	17379: 0x8EDE,
-	17380: 0x8EDF,
-	17381: 0x8EE0,
-	17382: 0x8EE1,
-	17383: 0x8EE2,
-	17384: 0x8EE3,
-	17385: 0x8EE4,
-	17386: 0x580B,
-	17387: 0x580D,
-	17388: 0x57FD,
-	17389: 0x57ED,
-	17390: 0x5800,
-	17391: 0x581E,
-	17392: 0x5819,
-	17393: 0x5844,
-	17394: 0x5820,
-	17395: 0x5865,
-	17396: 0x586C,
-	17397: 0x5881,
-	17398: 0x5889,
-	17399: 0x589A,
-	17400: 0x5880,
-	17401: 0x99A8,
-	17402: 0x9F19,
-	17403: 0x61FF,
-	17404: 0x8279,
-	17405: 0x827D,
-	17406: 0x827F,
-	17407: 0x828F,
-	17408: 0x828A,
-	17409: 0x82A8,
-	17410: 0x8284,
-	17411: 0x828E,
-	17412: 0x8291,
-	17413: 0x8297,
-	17414: 0x8299,
-	17415: 0x82AB,
-	17416: 0x82B8,
-	17417: 0x82BE,
-	17418: 0x82B0,
-	17419: 0x82C8,
-	17420: 0x82CA,
-	17421: 0x82E3,
-	17422: 0x8298,
-	17423: 0x82B7,
-	17424: 0x82AE,
-	17425: 0x82CB,
-	17426: 0x82CC,
-	17427: 0x82C1,
-	17428: 0x82A9,
-	17429: 0x82B4,
-	17430: 0x82A1,
-	17431: 0x82AA,
-	17432: 0x829F,
-	17433: 0x82C4,
-	17434: 0x82CE,
-	17435: 0x82A4,
-	17436: 0x82E1,
-	17437: 0x8309,
-	17438: 0x82F7,
-	17439: 0x82E4,
-	17440: 0x830F,
-	17441: 0x8307,
-	17442: 0x82DC,
-	17443: 0x82F4,
-	17444: 0x82D2,
-	17445: 0x82D8,
-	17446: 0x830C,
-	17447: 0x82FB,
-	17448: 0x82D3,
-	17449: 0x8311,
-	17450: 0x831A,
-	17451: 0x8306,
-	17452: 0x8314,
-	17453: 0x8315,
-	17454: 0x82E0,
-	17455: 0x82D5,
-	17456: 0x831C,
-	17457: 0x8351,
-	17458: 0x835B,
-	17459: 0x835C,
-	17460: 0x8308,
-	17461: 0x8392,
-	17462: 0x833C,
-	17463: 0x8334,
-	17464: 0x8331,
-	17465: 0x839B,
-	17466: 0x835E,
-	17467: 0x832F,
-	17468: 0x834F,
-	17469: 0x8347,
-	17470: 0x8343,
-	17471: 0x835F,
-	17472: 0x8340,
-	17473: 0x8317,
-	17474: 0x8360,
-	17475: 0x832D,
-	17476: 0x833A,
-	17477: 0x8333,
-	17478: 0x8366,
-	17479: 0x8365,
-	17480: 0x8EE5,
-	17481: 0x8EE6,
-	17482: 0x8EE7,
-	17483: 0x8EE8,
-	17484: 0x8EE9,
-	17485: 0x8EEA,
-	17486: 0x8EEB,
-	17487: 0x8EEC,
-	17488: 0x8EED,
-	17489: 0x8EEE,
-	17490: 0x8EEF,
-	17491: 0x8EF0,
-	17492: 0x8EF1,
-	17493: 0x8EF2,
-	17494: 0x8EF3,
-	17495: 0x8EF4,
-	17496: 0x8EF5,
-	17497: 0x8EF6,
-	17498: 0x8EF7,
-	17499: 0x8EF8,
-	17500: 0x8EF9,
-	17501: 0x8EFA,
-	17502: 0x8EFB,
-	17503: 0x8EFC,
-	17504: 0x8EFD,
-	17505: 0x8EFE,
-	17506: 0x8EFF,
-	17507: 0x8F00,
-	17508: 0x8F01,
-	17509: 0x8F02,
-	17510: 0x8F03,
-	17511: 0x8F04,
-	17512: 0x8F05,
-	17513: 0x8F06,
-	17514: 0x8F07,
-	17515: 0x8F08,
-	17516: 0x8F09,
-	17517: 0x8F0A,
-	17518: 0x8F0B,
-	17519: 0x8F0C,
-	17520: 0x8F0D,
-	17521: 0x8F0E,
-	17522: 0x8F0F,
-	17523: 0x8F10,
-	17524: 0x8F11,
-	17525: 0x8F12,
-	17526: 0x8F13,
-	17527: 0x8F14,
-	17528: 0x8F15,
-	17529: 0x8F16,
-	17530: 0x8F17,
-	17531: 0x8F18,
-	17532: 0x8F19,
-	17533: 0x8F1A,
-	17534: 0x8F1B,
-	17535: 0x8F1C,
-	17536: 0x8F1D,
-	17537: 0x8F1E,
-	17538: 0x8F1F,
-	17539: 0x8F20,
-	17540: 0x8F21,
-	17541: 0x8F22,
-	17542: 0x8F23,
-	17543: 0x8F24,
-	17544: 0x8F25,
-	17545: 0x8F26,
-	17546: 0x8F27,
-	17547: 0x8F28,
-	17548: 0x8F29,
-	17549: 0x8F2A,
-	17550: 0x8F2B,
-	17551: 0x8F2C,
-	17552: 0x8F2D,
-	17553: 0x8F2E,
-	17554: 0x8F2F,
-	17555: 0x8F30,
-	17556: 0x8F31,
-	17557: 0x8F32,
-	17558: 0x8F33,
-	17559: 0x8F34,
-	17560: 0x8F35,
-	17561: 0x8F36,
-	17562: 0x8F37,
-	17563: 0x8F38,
-	17564: 0x8F39,
-	17565: 0x8F3A,
-	17566: 0x8F3B,
-	17567: 0x8F3C,
-	17568: 0x8F3D,
-	17569: 0x8F3E,
-	17570: 0x8F3F,
-	17571: 0x8F40,
-	17572: 0x8F41,
-	17573: 0x8F42,
-	17574: 0x8F43,
-	17575: 0x8F44,
-	17576: 0x8368,
-	17577: 0x831B,
-	17578: 0x8369,
-	17579: 0x836C,
-	17580: 0x836A,
-	17581: 0x836D,
-	17582: 0x836E,
-	17583: 0x83B0,
-	17584: 0x8378,
-	17585: 0x83B3,
-	17586: 0x83B4,
-	17587: 0x83A0,
-	17588: 0x83AA,
-	17589: 0x8393,
-	17590: 0x839C,
-	17591: 0x8385,
-	17592: 0x837C,
-	17593: 0x83B6,
-	17594: 0x83A9,
-	17595: 0x837D,
-	17596: 0x83B8,
-	17597: 0x837B,
-	17598: 0x8398,
-	17599: 0x839E,
-	17600: 0x83A8,
-	17601: 0x83BA,
-	17602: 0x83BC,
-	17603: 0x83C1,
-	17604: 0x8401,
-	17605: 0x83E5,
-	17606: 0x83D8,
-	17607: 0x5807,
-	17608: 0x8418,
-	17609: 0x840B,
-	17610: 0x83DD,
-	17611: 0x83FD,
-	17612: 0x83D6,
-	17613: 0x841C,
-	17614: 0x8438,
-	17615: 0x8411,
-	17616: 0x8406,
-	17617: 0x83D4,
-	17618: 0x83DF,
-	17619: 0x840F,
-	17620: 0x8403,
-	17621: 0x83F8,
-	17622: 0x83F9,
-	17623: 0x83EA,
-	17624: 0x83C5,
-	17625: 0x83C0,
-	17626: 0x8426,
-	17627: 0x83F0,
-	17628: 0x83E1,
-	17629: 0x845C,
-	17630: 0x8451,
-	17631: 0x845A,
-	17632: 0x8459,
-	17633: 0x8473,
-	17634: 0x8487,
-	17635: 0x8488,
-	17636: 0x847A,
-	17637: 0x8489,
-	17638: 0x8478,
-	17639: 0x843C,
-	17640: 0x8446,
-	17641: 0x8469,
-	17642: 0x8476,
-	17643: 0x848C,
-	17644: 0x848E,
-	17645: 0x8431,
-	17646: 0x846D,
-	17647: 0x84C1,
-	17648: 0x84CD,
-	17649: 0x84D0,
-	17650: 0x84E6,
-	17651: 0x84BD,
-	17652: 0x84D3,
-	17653: 0x84CA,
-	17654: 0x84BF,
-	17655: 0x84BA,
-	17656: 0x84E0,
-	17657: 0x84A1,
-	17658: 0x84B9,
-	17659: 0x84B4,
-	17660: 0x8497,
-	17661: 0x84E5,
-	17662: 0x84E3,
-	17663: 0x850C,
-	17664: 0x750D,
-	17665: 0x8538,
-	17666: 0x84F0,
-	17667: 0x8539,
-	17668: 0x851F,
-	17669: 0x853A,
-	17670: 0x8F45,
-	17671: 0x8F46,
-	17672: 0x8F47,
-	17673: 0x8F48,
-	17674: 0x8F49,
-	17675: 0x8F4A,
-	17676: 0x8F4B,
-	17677: 0x8F4C,
-	17678: 0x8F4D,
-	17679: 0x8F4E,
-	17680: 0x8F4F,
-	17681: 0x8F50,
-	17682: 0x8F51,
-	17683: 0x8F52,
-	17684: 0x8F53,
-	17685: 0x8F54,
-	17686: 0x8F55,
-	17687: 0x8F56,
-	17688: 0x8F57,
-	17689: 0x8F58,
-	17690: 0x8F59,
-	17691: 0x8F5A,
-	17692: 0x8F5B,
-	17693: 0x8F5C,
-	17694: 0x8F5D,
-	17695: 0x8F5E,
-	17696: 0x8F5F,
-	17697: 0x8F60,
-	17698: 0x8F61,
-	17699: 0x8F62,
-	17700: 0x8F63,
-	17701: 0x8F64,
-	17702: 0x8F65,
-	17703: 0x8F6A,
-	17704: 0x8F80,
-	17705: 0x8F8C,
-	17706: 0x8F92,
-	17707: 0x8F9D,
-	17708: 0x8FA0,
-	17709: 0x8FA1,
-	17710: 0x8FA2,
-	17711: 0x8FA4,
-	17712: 0x8FA5,
-	17713: 0x8FA6,
-	17714: 0x8FA7,
-	17715: 0x8FAA,
-	17716: 0x8FAC,
-	17717: 0x8FAD,
-	17718: 0x8FAE,
-	17719: 0x8FAF,
-	17720: 0x8FB2,
-	17721: 0x8FB3,
-	17722: 0x8FB4,
-	17723: 0x8FB5,
-	17724: 0x8FB7,
-	17725: 0x8FB8,
-	17726: 0x8FBA,
-	17727: 0x8FBB,
-	17728: 0x8FBC,
-	17729: 0x8FBF,
-	17730: 0x8FC0,
-	17731: 0x8FC3,
-	17732: 0x8FC6,
-	17733: 0x8FC9,
-	17734: 0x8FCA,
-	17735: 0x8FCB,
-	17736: 0x8FCC,
-	17737: 0x8FCD,
-	17738: 0x8FCF,
-	17739: 0x8FD2,
-	17740: 0x8FD6,
-	17741: 0x8FD7,
-	17742: 0x8FDA,
-	17743: 0x8FE0,
-	17744: 0x8FE1,
-	17745: 0x8FE3,
-	17746: 0x8FE7,
-	17747: 0x8FEC,
-	17748: 0x8FEF,
-	17749: 0x8FF1,
-	17750: 0x8FF2,
-	17751: 0x8FF4,
-	17752: 0x8FF5,
-	17753: 0x8FF6,
-	17754: 0x8FFA,
-	17755: 0x8FFB,
-	17756: 0x8FFC,
-	17757: 0x8FFE,
-	17758: 0x8FFF,
-	17759: 0x9007,
-	17760: 0x9008,
-	17761: 0x900C,
-	17762: 0x900E,
-	17763: 0x9013,
-	17764: 0x9015,
-	17765: 0x9018,
-	17766: 0x8556,
-	17767: 0x853B,
-	17768: 0x84FF,
-	17769: 0x84FC,
-	17770: 0x8559,
-	17771: 0x8548,
-	17772: 0x8568,
-	17773: 0x8564,
-	17774: 0x855E,
-	17775: 0x857A,
-	17776: 0x77A2,
-	17777: 0x8543,
-	17778: 0x8572,
-	17779: 0x857B,
-	17780: 0x85A4,
-	17781: 0x85A8,
-	17782: 0x8587,
-	17783: 0x858F,
-	17784: 0x8579,
-	17785: 0x85AE,
-	17786: 0x859C,
-	17787: 0x8585,
-	17788: 0x85B9,
-	17789: 0x85B7,
-	17790: 0x85B0,
-	17791: 0x85D3,
-	17792: 0x85C1,
-	17793: 0x85DC,
-	17794: 0x85FF,
-	17795: 0x8627,
-	17796: 0x8605,
-	17797: 0x8629,
-	17798: 0x8616,
-	17799: 0x863C,
-	17800: 0x5EFE,
-	17801: 0x5F08,
-	17802: 0x593C,
-	17803: 0x5941,
-	17804: 0x8037,
-	17805: 0x5955,
-	17806: 0x595A,
-	17807: 0x5958,
-	17808: 0x530F,
-	17809: 0x5C22,
-	17810: 0x5C25,
-	17811: 0x5C2C,
-	17812: 0x5C34,
-	17813: 0x624C,
-	17814: 0x626A,
-	17815: 0x629F,
-	17816: 0x62BB,
-	17817: 0x62CA,
-	17818: 0x62DA,
-	17819: 0x62D7,
-	17820: 0x62EE,
-	17821: 0x6322,
-	17822: 0x62F6,
-	17823: 0x6339,
-	17824: 0x634B,
-	17825: 0x6343,
-	17826: 0x63AD,
-	17827: 0x63F6,
-	17828: 0x6371,
-	17829: 0x637A,
-	17830: 0x638E,
-	17831: 0x63B4,
-	17832: 0x636D,
-	17833: 0x63AC,
-	17834: 0x638A,
-	17835: 0x6369,
-	17836: 0x63AE,
-	17837: 0x63BC,
-	17838: 0x63F2,
-	17839: 0x63F8,
-	17840: 0x63E0,
-	17841: 0x63FF,
-	17842: 0x63C4,
-	17843: 0x63DE,
-	17844: 0x63CE,
-	17845: 0x6452,
-	17846: 0x63C6,
-	17847: 0x63BE,
-	17848: 0x6445,
-	17849: 0x6441,
-	17850: 0x640B,
-	17851: 0x641B,
-	17852: 0x6420,
-	17853: 0x640C,
-	17854: 0x6426,
-	17855: 0x6421,
-	17856: 0x645E,
-	17857: 0x6484,
-	17858: 0x646D,
-	17859: 0x6496,
-	17860: 0x9019,
-	17861: 0x901C,
-	17862: 0x9023,
-	17863: 0x9024,
-	17864: 0x9025,
-	17865: 0x9027,
-	17866: 0x9028,
-	17867: 0x9029,
-	17868: 0x902A,
-	17869: 0x902B,
-	17870: 0x902C,
-	17871: 0x9030,
-	17872: 0x9031,
-	17873: 0x9032,
-	17874: 0x9033,
-	17875: 0x9034,
-	17876: 0x9037,
-	17877: 0x9039,
-	17878: 0x903A,
-	17879: 0x903D,
-	17880: 0x903F,
-	17881: 0x9040,
-	17882: 0x9043,
-	17883: 0x9045,
-	17884: 0x9046,
-	17885: 0x9048,
-	17886: 0x9049,
-	17887: 0x904A,
-	17888: 0x904B,
-	17889: 0x904C,
-	17890: 0x904E,
-	17891: 0x9054,
-	17892: 0x9055,
-	17893: 0x9056,
-	17894: 0x9059,
-	17895: 0x905A,
-	17896: 0x905C,
-	17897: 0x905D,
-	17898: 0x905E,
-	17899: 0x905F,
-	17900: 0x9060,
-	17901: 0x9061,
-	17902: 0x9064,
-	17903: 0x9066,
-	17904: 0x9067,
-	17905: 0x9069,
-	17906: 0x906A,
-	17907: 0x906B,
-	17908: 0x906C,
-	17909: 0x906F,
-	17910: 0x9070,
-	17911: 0x9071,
-	17912: 0x9072,
-	17913: 0x9073,
-	17914: 0x9076,
-	17915: 0x9077,
-	17916: 0x9078,
-	17917: 0x9079,
-	17918: 0x907A,
-	17919: 0x907B,
-	17920: 0x907C,
-	17921: 0x907E,
-	17922: 0x9081,
-	17923: 0x9084,
-	17924: 0x9085,
-	17925: 0x9086,
-	17926: 0x9087,
-	17927: 0x9089,
-	17928: 0x908A,
-	17929: 0x908C,
-	17930: 0x908D,
-	17931: 0x908E,
-	17932: 0x908F,
-	17933: 0x9090,
-	17934: 0x9092,
-	17935: 0x9094,
-	17936: 0x9096,
-	17937: 0x9098,
-	17938: 0x909A,
-	17939: 0x909C,
-	17940: 0x909E,
-	17941: 0x909F,
-	17942: 0x90A0,
-	17943: 0x90A4,
-	17944: 0x90A5,
-	17945: 0x90A7,
-	17946: 0x90A8,
-	17947: 0x90A9,
-	17948: 0x90AB,
-	17949: 0x90AD,
-	17950: 0x90B2,
-	17951: 0x90B7,
-	17952: 0x90BC,
-	17953: 0x90BD,
-	17954: 0x90BF,
-	17955: 0x90C0,
-	17956: 0x647A,
-	17957: 0x64B7,
-	17958: 0x64B8,
-	17959: 0x6499,
-	17960: 0x64BA,
-	17961: 0x64C0,
-	17962: 0x64D0,
-	17963: 0x64D7,
-	17964: 0x64E4,
-	17965: 0x64E2,
-	17966: 0x6509,
-	17967: 0x6525,
-	17968: 0x652E,
-	17969: 0x5F0B,
-	17970: 0x5FD2,
-	17971: 0x7519,
-	17972: 0x5F11,
-	17973: 0x535F,
-	17974: 0x53F1,
-	17975: 0x53FD,
-	17976: 0x53E9,
-	17977: 0x53E8,
-	17978: 0x53FB,
-	17979: 0x5412,
-	17980: 0x5416,
-	17981: 0x5406,
-	17982: 0x544B,
-	17983: 0x5452,
-	17984: 0x5453,
-	17985: 0x5454,
-	17986: 0x5456,
-	17987: 0x5443,
-	17988: 0x5421,
-	17989: 0x5457,
-	17990: 0x5459,
-	17991: 0x5423,
-	17992: 0x5432,
-	17993: 0x5482,
-	17994: 0x5494,
-	17995: 0x5477,
-	17996: 0x5471,
-	17997: 0x5464,
-	17998: 0x549A,
-	17999: 0x549B,
-	18000: 0x5484,
-	18001: 0x5476,
-	18002: 0x5466,
-	18003: 0x549D,
-	18004: 0x54D0,
-	18005: 0x54AD,
-	18006: 0x54C2,
-	18007: 0x54B4,
-	18008: 0x54D2,
-	18009: 0x54A7,
-	18010: 0x54A6,
-	18011: 0x54D3,
-	18012: 0x54D4,
-	18013: 0x5472,
-	18014: 0x54A3,
-	18015: 0x54D5,
-	18016: 0x54BB,
-	18017: 0x54BF,
-	18018: 0x54CC,
-	18019: 0x54D9,
-	18020: 0x54DA,
-	18021: 0x54DC,
-	18022: 0x54A9,
-	18023: 0x54AA,
-	18024: 0x54A4,
-	18025: 0x54DD,
-	18026: 0x54CF,
-	18027: 0x54DE,
-	18028: 0x551B,
-	18029: 0x54E7,
-	18030: 0x5520,
-	18031: 0x54FD,
-	18032: 0x5514,
-	18033: 0x54F3,
-	18034: 0x5522,
-	18035: 0x5523,
-	18036: 0x550F,
-	18037: 0x5511,
-	18038: 0x5527,
-	18039: 0x552A,
-	18040: 0x5567,
-	18041: 0x558F,
-	18042: 0x55B5,
-	18043: 0x5549,
-	18044: 0x556D,
-	18045: 0x5541,
-	18046: 0x5555,
-	18047: 0x553F,
-	18048: 0x5550,
-	18049: 0x553C,
-	18050: 0x90C2,
-	18051: 0x90C3,
-	18052: 0x90C6,
-	18053: 0x90C8,
-	18054: 0x90C9,
-	18055: 0x90CB,
-	18056: 0x90CC,
-	18057: 0x90CD,
-	18058: 0x90D2,
-	18059: 0x90D4,
-	18060: 0x90D5,
-	18061: 0x90D6,
-	18062: 0x90D8,
-	18063: 0x90D9,
-	18064: 0x90DA,
-	18065: 0x90DE,
-	18066: 0x90DF,
-	18067: 0x90E0,
-	18068: 0x90E3,
-	18069: 0x90E4,
-	18070: 0x90E5,
-	18071: 0x90E9,
-	18072: 0x90EA,
-	18073: 0x90EC,
-	18074: 0x90EE,
-	18075: 0x90F0,
-	18076: 0x90F1,
-	18077: 0x90F2,
-	18078: 0x90F3,
-	18079: 0x90F5,
-	18080: 0x90F6,
-	18081: 0x90F7,
-	18082: 0x90F9,
-	18083: 0x90FA,
-	18084: 0x90FB,
-	18085: 0x90FC,
-	18086: 0x90FF,
-	18087: 0x9100,
-	18088: 0x9101,
-	18089: 0x9103,
-	18090: 0x9105,
-	18091: 0x9106,
-	18092: 0x9107,
-	18093: 0x9108,
-	18094: 0x9109,
-	18095: 0x910A,
-	18096: 0x910B,
-	18097: 0x910C,
-	18098: 0x910D,
-	18099: 0x910E,
-	18100: 0x910F,
-	18101: 0x9110,
-	18102: 0x9111,
-	18103: 0x9112,
-	18104: 0x9113,
-	18105: 0x9114,
-	18106: 0x9115,
-	18107: 0x9116,
-	18108: 0x9117,
-	18109: 0x9118,
-	18110: 0x911A,
-	18111: 0x911B,
-	18112: 0x911C,
-	18113: 0x911D,
-	18114: 0x911F,
-	18115: 0x9120,
-	18116: 0x9121,
-	18117: 0x9124,
-	18118: 0x9125,
-	18119: 0x9126,
-	18120: 0x9127,
-	18121: 0x9128,
-	18122: 0x9129,
-	18123: 0x912A,
-	18124: 0x912B,
-	18125: 0x912C,
-	18126: 0x912D,
-	18127: 0x912E,
-	18128: 0x9130,
-	18129: 0x9132,
-	18130: 0x9133,
-	18131: 0x9134,
-	18132: 0x9135,
-	18133: 0x9136,
-	18134: 0x9137,
-	18135: 0x9138,
-	18136: 0x913A,
-	18137: 0x913B,
-	18138: 0x913C,
-	18139: 0x913D,
-	18140: 0x913E,
-	18141: 0x913F,
-	18142: 0x9140,
-	18143: 0x9141,
-	18144: 0x9142,
-	18145: 0x9144,
-	18146: 0x5537,
-	18147: 0x5556,
-	18148: 0x5575,
-	18149: 0x5576,
-	18150: 0x5577,
-	18151: 0x5533,
-	18152: 0x5530,
-	18153: 0x555C,
-	18154: 0x558B,
-	18155: 0x55D2,
-	18156: 0x5583,
-	18157: 0x55B1,
-	18158: 0x55B9,
-	18159: 0x5588,
-	18160: 0x5581,
-	18161: 0x559F,
-	18162: 0x557E,
-	18163: 0x55D6,
-	18164: 0x5591,
-	18165: 0x557B,
-	18166: 0x55DF,
-	18167: 0x55BD,
-	18168: 0x55BE,
-	18169: 0x5594,
-	18170: 0x5599,
-	18171: 0x55EA,
-	18172: 0x55F7,
-	18173: 0x55C9,
-	18174: 0x561F,
-	18175: 0x55D1,
-	18176: 0x55EB,
-	18177: 0x55EC,
-	18178: 0x55D4,
-	18179: 0x55E6,
-	18180: 0x55DD,
-	18181: 0x55C4,
-	18182: 0x55EF,
-	18183: 0x55E5,
-	18184: 0x55F2,
-	18185: 0x55F3,
-	18186: 0x55CC,
-	18187: 0x55CD,
-	18188: 0x55E8,
-	18189: 0x55F5,
-	18190: 0x55E4,
-	18191: 0x8F94,
-	18192: 0x561E,
-	18193: 0x5608,
-	18194: 0x560C,
-	18195: 0x5601,
-	18196: 0x5624,
-	18197: 0x5623,
-	18198: 0x55FE,
-	18199: 0x5600,
-	18200: 0x5627,
-	18201: 0x562D,
-	18202: 0x5658,
-	18203: 0x5639,
-	18204: 0x5657,
-	18205: 0x562C,
-	18206: 0x564D,
-	18207: 0x5662,
-	18208: 0x5659,
-	18209: 0x565C,
-	18210: 0x564C,
-	18211: 0x5654,
-	18212: 0x5686,
-	18213: 0x5664,
-	18214: 0x5671,
-	18215: 0x566B,
-	18216: 0x567B,
-	18217: 0x567C,
-	18218: 0x5685,
-	18219: 0x5693,
-	18220: 0x56AF,
-	18221: 0x56D4,
-	18222: 0x56D7,
-	18223: 0x56DD,
-	18224: 0x56E1,
-	18225: 0x56F5,
-	18226: 0x56EB,
-	18227: 0x56F9,
-	18228: 0x56FF,
-	18229: 0x5704,
-	18230: 0x570A,
-	18231: 0x5709,
-	18232: 0x571C,
-	18233: 0x5E0F,
-	18234: 0x5E19,
-	18235: 0x5E14,
-	18236: 0x5E11,
-	18237: 0x5E31,
-	18238: 0x5E3B,
-	18239: 0x5E3C,
-	18240: 0x9145,
-	18241: 0x9147,
-	18242: 0x9148,
-	18243: 0x9151,
-	18244: 0x9153,
-	18245: 0x9154,
-	18246: 0x9155,
-	18247: 0x9156,
-	18248: 0x9158,
-	18249: 0x9159,
-	18250: 0x915B,
-	18251: 0x915C,
-	18252: 0x915F,
-	18253: 0x9160,
-	18254: 0x9166,
-	18255: 0x9167,
-	18256: 0x9168,
-	18257: 0x916B,
-	18258: 0x916D,
-	18259: 0x9173,
-	18260: 0x917A,
-	18261: 0x917B,
-	18262: 0x917C,
-	18263: 0x9180,
-	18264: 0x9181,
-	18265: 0x9182,
-	18266: 0x9183,
-	18267: 0x9184,
-	18268: 0x9186,
-	18269: 0x9188,
-	18270: 0x918A,
-	18271: 0x918E,
-	18272: 0x918F,
-	18273: 0x9193,
-	18274: 0x9194,
-	18275: 0x9195,
-	18276: 0x9196,
-	18277: 0x9197,
-	18278: 0x9198,
-	18279: 0x9199,
-	18280: 0x919C,
-	18281: 0x919D,
-	18282: 0x919E,
-	18283: 0x919F,
-	18284: 0x91A0,
-	18285: 0x91A1,
-	18286: 0x91A4,
-	18287: 0x91A5,
-	18288: 0x91A6,
-	18289: 0x91A7,
-	18290: 0x91A8,
-	18291: 0x91A9,
-	18292: 0x91AB,
-	18293: 0x91AC,
-	18294: 0x91B0,
-	18295: 0x91B1,
-	18296: 0x91B2,
-	18297: 0x91B3,
-	18298: 0x91B6,
-	18299: 0x91B7,
-	18300: 0x91B8,
-	18301: 0x91B9,
-	18302: 0x91BB,
-	18303: 0x91BC,
-	18304: 0x91BD,
-	18305: 0x91BE,
-	18306: 0x91BF,
-	18307: 0x91C0,
-	18308: 0x91C1,
-	18309: 0x91C2,
-	18310: 0x91C3,
-	18311: 0x91C4,
-	18312: 0x91C5,
-	18313: 0x91C6,
-	18314: 0x91C8,
-	18315: 0x91CB,
-	18316: 0x91D0,
-	18317: 0x91D2,
-	18318: 0x91D3,
-	18319: 0x91D4,
-	18320: 0x91D5,
-	18321: 0x91D6,
-	18322: 0x91D7,
-	18323: 0x91D8,
-	18324: 0x91D9,
-	18325: 0x91DA,
-	18326: 0x91DB,
-	18327: 0x91DD,
-	18328: 0x91DE,
-	18329: 0x91DF,
-	18330: 0x91E0,
-	18331: 0x91E1,
-	18332: 0x91E2,
-	18333: 0x91E3,
-	18334: 0x91E4,
-	18335: 0x91E5,
-	18336: 0x5E37,
-	18337: 0x5E44,
-	18338: 0x5E54,
-	18339: 0x5E5B,
-	18340: 0x5E5E,
-	18341: 0x5E61,
-	18342: 0x5C8C,
-	18343: 0x5C7A,
-	18344: 0x5C8D,
-	18345: 0x5C90,
-	18346: 0x5C96,
-	18347: 0x5C88,
-	18348: 0x5C98,
-	18349: 0x5C99,
-	18350: 0x5C91,
-	18351: 0x5C9A,
-	18352: 0x5C9C,
-	18353: 0x5CB5,
-	18354: 0x5CA2,
-	18355: 0x5CBD,
-	18356: 0x5CAC,
-	18357: 0x5CAB,
-	18358: 0x5CB1,
-	18359: 0x5CA3,
-	18360: 0x5CC1,
-	18361: 0x5CB7,
-	18362: 0x5CC4,
-	18363: 0x5CD2,
-	18364: 0x5CE4,
-	18365: 0x5CCB,
-	18366: 0x5CE5,
-	18367: 0x5D02,
-	18368: 0x5D03,
-	18369: 0x5D27,
-	18370: 0x5D26,
-	18371: 0x5D2E,
-	18372: 0x5D24,
-	18373: 0x5D1E,
-	18374: 0x5D06,
-	18375: 0x5D1B,
-	18376: 0x5D58,
-	18377: 0x5D3E,
-	18378: 0x5D34,
-	18379: 0x5D3D,
-	18380: 0x5D6C,
-	18381: 0x5D5B,
-	18382: 0x5D6F,
-	18383: 0x5D5D,
-	18384: 0x5D6B,
-	18385: 0x5D4B,
-	18386: 0x5D4A,
-	18387: 0x5D69,
-	18388: 0x5D74,
-	18389: 0x5D82,
-	18390: 0x5D99,
-	18391: 0x5D9D,
-	18392: 0x8C73,
-	18393: 0x5DB7,
-	18394: 0x5DC5,
-	18395: 0x5F73,
-	18396: 0x5F77,
-	18397: 0x5F82,
-	18398: 0x5F87,
-	18399: 0x5F89,
-	18400: 0x5F8C,
-	18401: 0x5F95,
-	18402: 0x5F99,
-	18403: 0x5F9C,
-	18404: 0x5FA8,
-	18405: 0x5FAD,
-	18406: 0x5FB5,
-	18407: 0x5FBC,
-	18408: 0x8862,
-	18409: 0x5F61,
-	18410: 0x72AD,
-	18411: 0x72B0,
-	18412: 0x72B4,
-	18413: 0x72B7,
-	18414: 0x72B8,
-	18415: 0x72C3,
-	18416: 0x72C1,
-	18417: 0x72CE,
-	18418: 0x72CD,
-	18419: 0x72D2,
-	18420: 0x72E8,
-	18421: 0x72EF,
-	18422: 0x72E9,
-	18423: 0x72F2,
-	18424: 0x72F4,
-	18425: 0x72F7,
-	18426: 0x7301,
-	18427: 0x72F3,
-	18428: 0x7303,
-	18429: 0x72FA,
-	18430: 0x91E6,
-	18431: 0x91E7,
-	18432: 0x91E8,
-	18433: 0x91E9,
-	18434: 0x91EA,
-	18435: 0x91EB,
-	18436: 0x91EC,
-	18437: 0x91ED,
-	18438: 0x91EE,
-	18439: 0x91EF,
-	18440: 0x91F0,
-	18441: 0x91F1,
-	18442: 0x91F2,
-	18443: 0x91F3,
-	18444: 0x91F4,
-	18445: 0x91F5,
-	18446: 0x91F6,
-	18447: 0x91F7,
-	18448: 0x91F8,
-	18449: 0x91F9,
-	18450: 0x91FA,
-	18451: 0x91FB,
-	18452: 0x91FC,
-	18453: 0x91FD,
-	18454: 0x91FE,
-	18455: 0x91FF,
-	18456: 0x9200,
-	18457: 0x9201,
-	18458: 0x9202,
-	18459: 0x9203,
-	18460: 0x9204,
-	18461: 0x9205,
-	18462: 0x9206,
-	18463: 0x9207,
-	18464: 0x9208,
-	18465: 0x9209,
-	18466: 0x920A,
-	18467: 0x920B,
-	18468: 0x920C,
-	18469: 0x920D,
-	18470: 0x920E,
-	18471: 0x920F,
-	18472: 0x9210,
-	18473: 0x9211,
-	18474: 0x9212,
-	18475: 0x9213,
-	18476: 0x9214,
-	18477: 0x9215,
-	18478: 0x9216,
-	18479: 0x9217,
-	18480: 0x9218,
-	18481: 0x9219,
-	18482: 0x921A,
-	18483: 0x921B,
-	18484: 0x921C,
-	18485: 0x921D,
-	18486: 0x921E,
-	18487: 0x921F,
-	18488: 0x9220,
-	18489: 0x9221,
-	18490: 0x9222,
-	18491: 0x9223,
-	18492: 0x9224,
-	18493: 0x9225,
-	18494: 0x9226,
-	18495: 0x9227,
-	18496: 0x9228,
-	18497: 0x9229,
-	18498: 0x922A,
-	18499: 0x922B,
-	18500: 0x922C,
-	18501: 0x922D,
-	18502: 0x922E,
-	18503: 0x922F,
-	18504: 0x9230,
-	18505: 0x9231,
-	18506: 0x9232,
-	18507: 0x9233,
-	18508: 0x9234,
-	18509: 0x9235,
-	18510: 0x9236,
-	18511: 0x9237,
-	18512: 0x9238,
-	18513: 0x9239,
-	18514: 0x923A,
-	18515: 0x923B,
-	18516: 0x923C,
-	18517: 0x923D,
-	18518: 0x923E,
-	18519: 0x923F,
-	18520: 0x9240,
-	18521: 0x9241,
-	18522: 0x9242,
-	18523: 0x9243,
-	18524: 0x9244,
-	18525: 0x9245,
-	18526: 0x72FB,
-	18527: 0x7317,
-	18528: 0x7313,
-	18529: 0x7321,
-	18530: 0x730A,
-	18531: 0x731E,
-	18532: 0x731D,
-	18533: 0x7315,
-	18534: 0x7322,
-	18535: 0x7339,
-	18536: 0x7325,
-	18537: 0x732C,
-	18538: 0x7338,
-	18539: 0x7331,
-	18540: 0x7350,
-	18541: 0x734D,
-	18542: 0x7357,
-	18543: 0x7360,
-	18544: 0x736C,
-	18545: 0x736F,
-	18546: 0x737E,
-	18547: 0x821B,
-	18548: 0x5925,
-	18549: 0x98E7,
-	18550: 0x5924,
-	18551: 0x5902,
-	18552: 0x9963,
-	18553: 0x9967,
-	18554: 0x9968,
-	18555: 0x9969,
-	18556: 0x996A,
-	18557: 0x996B,
-	18558: 0x996C,
-	18559: 0x9974,
-	18560: 0x9977,
-	18561: 0x997D,
-	18562: 0x9980,
-	18563: 0x9984,
-	18564: 0x9987,
-	18565: 0x998A,
-	18566: 0x998D,
-	18567: 0x9990,
-	18568: 0x9991,
-	18569: 0x9993,
-	18570: 0x9994,
-	18571: 0x9995,
-	18572: 0x5E80,
-	18573: 0x5E91,
-	18574: 0x5E8B,
-	18575: 0x5E96,
-	18576: 0x5EA5,
-	18577: 0x5EA0,
-	18578: 0x5EB9,
-	18579: 0x5EB5,
-	18580: 0x5EBE,
-	18581: 0x5EB3,
-	18582: 0x8D53,
-	18583: 0x5ED2,
-	18584: 0x5ED1,
-	18585: 0x5EDB,
-	18586: 0x5EE8,
-	18587: 0x5EEA,
-	18588: 0x81BA,
-	18589: 0x5FC4,
-	18590: 0x5FC9,
-	18591: 0x5FD6,
-	18592: 0x5FCF,
-	18593: 0x6003,
-	18594: 0x5FEE,
-	18595: 0x6004,
-	18596: 0x5FE1,
-	18597: 0x5FE4,
-	18598: 0x5FFE,
-	18599: 0x6005,
-	18600: 0x6006,
-	18601: 0x5FEA,
-	18602: 0x5FED,
-	18603: 0x5FF8,
-	18604: 0x6019,
-	18605: 0x6035,
-	18606: 0x6026,
-	18607: 0x601B,
-	18608: 0x600F,
-	18609: 0x600D,
-	18610: 0x6029,
-	18611: 0x602B,
-	18612: 0x600A,
-	18613: 0x603F,
-	18614: 0x6021,
-	18615: 0x6078,
-	18616: 0x6079,
-	18617: 0x607B,
-	18618: 0x607A,
-	18619: 0x6042,
-	18620: 0x9246,
-	18621: 0x9247,
-	18622: 0x9248,
-	18623: 0x9249,
-	18624: 0x924A,
-	18625: 0x924B,
-	18626: 0x924C,
-	18627: 0x924D,
-	18628: 0x924E,
-	18629: 0x924F,
-	18630: 0x9250,
-	18631: 0x9251,
-	18632: 0x9252,
-	18633: 0x9253,
-	18634: 0x9254,
-	18635: 0x9255,
-	18636: 0x9256,
-	18637: 0x9257,
-	18638: 0x9258,
-	18639: 0x9259,
-	18640: 0x925A,
-	18641: 0x925B,
-	18642: 0x925C,
-	18643: 0x925D,
-	18644: 0x925E,
-	18645: 0x925F,
-	18646: 0x9260,
-	18647: 0x9261,
-	18648: 0x9262,
-	18649: 0x9263,
-	18650: 0x9264,
-	18651: 0x9265,
-	18652: 0x9266,
-	18653: 0x9267,
-	18654: 0x9268,
-	18655: 0x9269,
-	18656: 0x926A,
-	18657: 0x926B,
-	18658: 0x926C,
-	18659: 0x926D,
-	18660: 0x926E,
-	18661: 0x926F,
-	18662: 0x9270,
-	18663: 0x9271,
-	18664: 0x9272,
-	18665: 0x9273,
-	18666: 0x9275,
-	18667: 0x9276,
-	18668: 0x9277,
-	18669: 0x9278,
-	18670: 0x9279,
-	18671: 0x927A,
-	18672: 0x927B,
-	18673: 0x927C,
-	18674: 0x927D,
-	18675: 0x927E,
-	18676: 0x927F,
-	18677: 0x9280,
-	18678: 0x9281,
-	18679: 0x9282,
-	18680: 0x9283,
-	18681: 0x9284,
-	18682: 0x9285,
-	18683: 0x9286,
-	18684: 0x9287,
-	18685: 0x9288,
-	18686: 0x9289,
-	18687: 0x928A,
-	18688: 0x928B,
-	18689: 0x928C,
-	18690: 0x928D,
-	18691: 0x928F,
-	18692: 0x9290,
-	18693: 0x9291,
-	18694: 0x9292,
-	18695: 0x9293,
-	18696: 0x9294,
-	18697: 0x9295,
-	18698: 0x9296,
-	18699: 0x9297,
-	18700: 0x9298,
-	18701: 0x9299,
-	18702: 0x929A,
-	18703: 0x929B,
-	18704: 0x929C,
-	18705: 0x929D,
-	18706: 0x929E,
-	18707: 0x929F,
-	18708: 0x92A0,
-	18709: 0x92A1,
-	18710: 0x92A2,
-	18711: 0x92A3,
-	18712: 0x92A4,
-	18713: 0x92A5,
-	18714: 0x92A6,
-	18715: 0x92A7,
-	18716: 0x606A,
-	18717: 0x607D,
-	18718: 0x6096,
-	18719: 0x609A,
-	18720: 0x60AD,
-	18721: 0x609D,
-	18722: 0x6083,
-	18723: 0x6092,
-	18724: 0x608C,
-	18725: 0x609B,
-	18726: 0x60EC,
-	18727: 0x60BB,
-	18728: 0x60B1,
-	18729: 0x60DD,
-	18730: 0x60D8,
-	18731: 0x60C6,
-	18732: 0x60DA,
-	18733: 0x60B4,
-	18734: 0x6120,
-	18735: 0x6126,
-	18736: 0x6115,
-	18737: 0x6123,
-	18738: 0x60F4,
-	18739: 0x6100,
-	18740: 0x610E,
-	18741: 0x612B,
-	18742: 0x614A,
-	18743: 0x6175,
-	18744: 0x61AC,
-	18745: 0x6194,
-	18746: 0x61A7,
-	18747: 0x61B7,
-	18748: 0x61D4,
-	18749: 0x61F5,
-	18750: 0x5FDD,
-	18751: 0x96B3,
-	18752: 0x95E9,
-	18753: 0x95EB,
-	18754: 0x95F1,
-	18755: 0x95F3,
-	18756: 0x95F5,
-	18757: 0x95F6,
-	18758: 0x95FC,
-	18759: 0x95FE,
-	18760: 0x9603,
-	18761: 0x9604,
-	18762: 0x9606,
-	18763: 0x9608,
-	18764: 0x960A,
-	18765: 0x960B,
-	18766: 0x960C,
-	18767: 0x960D,
-	18768: 0x960F,
-	18769: 0x9612,
-	18770: 0x9615,
-	18771: 0x9616,
-	18772: 0x9617,
-	18773: 0x9619,
-	18774: 0x961A,
-	18775: 0x4E2C,
-	18776: 0x723F,
-	18777: 0x6215,
-	18778: 0x6C35,
-	18779: 0x6C54,
-	18780: 0x6C5C,
-	18781: 0x6C4A,
-	18782: 0x6CA3,
-	18783: 0x6C85,
-	18784: 0x6C90,
-	18785: 0x6C94,
-	18786: 0x6C8C,
-	18787: 0x6C68,
-	18788: 0x6C69,
-	18789: 0x6C74,
-	18790: 0x6C76,
-	18791: 0x6C86,
-	18792: 0x6CA9,
-	18793: 0x6CD0,
-	18794: 0x6CD4,
-	18795: 0x6CAD,
-	18796: 0x6CF7,
-	18797: 0x6CF8,
-	18798: 0x6CF1,
-	18799: 0x6CD7,
-	18800: 0x6CB2,
-	18801: 0x6CE0,
-	18802: 0x6CD6,
-	18803: 0x6CFA,
-	18804: 0x6CEB,
-	18805: 0x6CEE,
-	18806: 0x6CB1,
-	18807: 0x6CD3,
-	18808: 0x6CEF,
-	18809: 0x6CFE,
-	18810: 0x92A8,
-	18811: 0x92A9,
-	18812: 0x92AA,
-	18813: 0x92AB,
-	18814: 0x92AC,
-	18815: 0x92AD,
-	18816: 0x92AF,
-	18817: 0x92B0,
-	18818: 0x92B1,
-	18819: 0x92B2,
-	18820: 0x92B3,
-	18821: 0x92B4,
-	18822: 0x92B5,
-	18823: 0x92B6,
-	18824: 0x92B7,
-	18825: 0x92B8,
-	18826: 0x92B9,
-	18827: 0x92BA,
-	18828: 0x92BB,
-	18829: 0x92BC,
-	18830: 0x92BD,
-	18831: 0x92BE,
-	18832: 0x92BF,
-	18833: 0x92C0,
-	18834: 0x92C1,
-	18835: 0x92C2,
-	18836: 0x92C3,
-	18837: 0x92C4,
-	18838: 0x92C5,
-	18839: 0x92C6,
-	18840: 0x92C7,
-	18841: 0x92C9,
-	18842: 0x92CA,
-	18843: 0x92CB,
-	18844: 0x92CC,
-	18845: 0x92CD,
-	18846: 0x92CE,
-	18847: 0x92CF,
-	18848: 0x92D0,
-	18849: 0x92D1,
-	18850: 0x92D2,
-	18851: 0x92D3,
-	18852: 0x92D4,
-	18853: 0x92D5,
-	18854: 0x92D6,
-	18855: 0x92D7,
-	18856: 0x92D8,
-	18857: 0x92D9,
-	18858: 0x92DA,
-	18859: 0x92DB,
-	18860: 0x92DC,
-	18861: 0x92DD,
-	18862: 0x92DE,
-	18863: 0x92DF,
-	18864: 0x92E0,
-	18865: 0x92E1,
-	18866: 0x92E2,
-	18867: 0x92E3,
-	18868: 0x92E4,
-	18869: 0x92E5,
-	18870: 0x92E6,
-	18871: 0x92E7,
-	18872: 0x92E8,
-	18873: 0x92E9,
-	18874: 0x92EA,
-	18875: 0x92EB,
-	18876: 0x92EC,
-	18877: 0x92ED,
-	18878: 0x92EE,
-	18879: 0x92EF,
-	18880: 0x92F0,
-	18881: 0x92F1,
-	18882: 0x92F2,
-	18883: 0x92F3,
-	18884: 0x92F4,
-	18885: 0x92F5,
-	18886: 0x92F6,
-	18887: 0x92F7,
-	18888: 0x92F8,
-	18889: 0x92F9,
-	18890: 0x92FA,
-	18891: 0x92FB,
-	18892: 0x92FC,
-	18893: 0x92FD,
-	18894: 0x92FE,
-	18895: 0x92FF,
-	18896: 0x9300,
-	18897: 0x9301,
-	18898: 0x9302,
-	18899: 0x9303,
-	18900: 0x9304,
-	18901: 0x9305,
-	18902: 0x9306,
-	18903: 0x9307,
-	18904: 0x9308,
-	18905: 0x9309,
-	18906: 0x6D39,
-	18907: 0x6D27,
-	18908: 0x6D0C,
-	18909: 0x6D43,
-	18910: 0x6D48,
-	18911: 0x6D07,
-	18912: 0x6D04,
-	18913: 0x6D19,
-	18914: 0x6D0E,
-	18915: 0x6D2B,
-	18916: 0x6D4D,
-	18917: 0x6D2E,
-	18918: 0x6D35,
-	18919: 0x6D1A,
-	18920: 0x6D4F,
-	18921: 0x6D52,
-	18922: 0x6D54,
-	18923: 0x6D33,
-	18924: 0x6D91,
-	18925: 0x6D6F,
-	18926: 0x6D9E,
-	18927: 0x6DA0,
-	18928: 0x6D5E,
-	18929: 0x6D93,
-	18930: 0x6D94,
-	18931: 0x6D5C,
-	18932: 0x6D60,
-	18933: 0x6D7C,
-	18934: 0x6D63,
-	18935: 0x6E1A,
-	18936: 0x6DC7,
-	18937: 0x6DC5,
-	18938: 0x6DDE,
-	18939: 0x6E0E,
-	18940: 0x6DBF,
-	18941: 0x6DE0,
-	18942: 0x6E11,
-	18943: 0x6DE6,
-	18944: 0x6DDD,
-	18945: 0x6DD9,
-	18946: 0x6E16,
-	18947: 0x6DAB,
-	18948: 0x6E0C,
-	18949: 0x6DAE,
-	18950: 0x6E2B,
-	18951: 0x6E6E,
-	18952: 0x6E4E,
-	18953: 0x6E6B,
-	18954: 0x6EB2,
-	18955: 0x6E5F,
-	18956: 0x6E86,
-	18957: 0x6E53,
-	18958: 0x6E54,
-	18959: 0x6E32,
-	18960: 0x6E25,
-	18961: 0x6E44,
-	18962: 0x6EDF,
-	18963: 0x6EB1,
-	18964: 0x6E98,
-	18965: 0x6EE0,
-	18966: 0x6F2D,
-	18967: 0x6EE2,
-	18968: 0x6EA5,
-	18969: 0x6EA7,
-	18970: 0x6EBD,
-	18971: 0x6EBB,
-	18972: 0x6EB7,
-	18973: 0x6ED7,
-	18974: 0x6EB4,
-	18975: 0x6ECF,
-	18976: 0x6E8F,
-	18977: 0x6EC2,
-	18978: 0x6E9F,
-	18979: 0x6F62,
-	18980: 0x6F46,
-	18981: 0x6F47,
-	18982: 0x6F24,
-	18983: 0x6F15,
-	18984: 0x6EF9,
-	18985: 0x6F2F,
-	18986: 0x6F36,
-	18987: 0x6F4B,
-	18988: 0x6F74,
-	18989: 0x6F2A,
-	18990: 0x6F09,
-	18991: 0x6F29,
-	18992: 0x6F89,
-	18993: 0x6F8D,
-	18994: 0x6F8C,
-	18995: 0x6F78,
-	18996: 0x6F72,
-	18997: 0x6F7C,
-	18998: 0x6F7A,
-	18999: 0x6FD1,
-	19000: 0x930A,
-	19001: 0x930B,
-	19002: 0x930C,
-	19003: 0x930D,
-	19004: 0x930E,
-	19005: 0x930F,
-	19006: 0x9310,
-	19007: 0x9311,
-	19008: 0x9312,
-	19009: 0x9313,
-	19010: 0x9314,
-	19011: 0x9315,
-	19012: 0x9316,
-	19013: 0x9317,
-	19014: 0x9318,
-	19015: 0x9319,
-	19016: 0x931A,
-	19017: 0x931B,
-	19018: 0x931C,
-	19019: 0x931D,
-	19020: 0x931E,
-	19021: 0x931F,
-	19022: 0x9320,
-	19023: 0x9321,
-	19024: 0x9322,
-	19025: 0x9323,
-	19026: 0x9324,
-	19027: 0x9325,
-	19028: 0x9326,
-	19029: 0x9327,
-	19030: 0x9328,
-	19031: 0x9329,
-	19032: 0x932A,
-	19033: 0x932B,
-	19034: 0x932C,
-	19035: 0x932D,
-	19036: 0x932E,
-	19037: 0x932F,
-	19038: 0x9330,
-	19039: 0x9331,
-	19040: 0x9332,
-	19041: 0x9333,
-	19042: 0x9334,
-	19043: 0x9335,
-	19044: 0x9336,
-	19045: 0x9337,
-	19046: 0x9338,
-	19047: 0x9339,
-	19048: 0x933A,
-	19049: 0x933B,
-	19050: 0x933C,
-	19051: 0x933D,
-	19052: 0x933F,
-	19053: 0x9340,
-	19054: 0x9341,
-	19055: 0x9342,
-	19056: 0x9343,
-	19057: 0x9344,
-	19058: 0x9345,
-	19059: 0x9346,
-	19060: 0x9347,
-	19061: 0x9348,
-	19062: 0x9349,
-	19063: 0x934A,
-	19064: 0x934B,
-	19065: 0x934C,
-	19066: 0x934D,
-	19067: 0x934E,
-	19068: 0x934F,
-	19069: 0x9350,
-	19070: 0x9351,
-	19071: 0x9352,
-	19072: 0x9353,
-	19073: 0x9354,
-	19074: 0x9355,
-	19075: 0x9356,
-	19076: 0x9357,
-	19077: 0x9358,
-	19078: 0x9359,
-	19079: 0x935A,
-	19080: 0x935B,
-	19081: 0x935C,
-	19082: 0x935D,
-	19083: 0x935E,
-	19084: 0x935F,
-	19085: 0x9360,
-	19086: 0x9361,
-	19087: 0x9362,
-	19088: 0x9363,
-	19089: 0x9364,
-	19090: 0x9365,
-	19091: 0x9366,
-	19092: 0x9367,
-	19093: 0x9368,
-	19094: 0x9369,
-	19095: 0x936B,
-	19096: 0x6FC9,
-	19097: 0x6FA7,
-	19098: 0x6FB9,
-	19099: 0x6FB6,
-	19100: 0x6FC2,
-	19101: 0x6FE1,
-	19102: 0x6FEE,
-	19103: 0x6FDE,
-	19104: 0x6FE0,
-	19105: 0x6FEF,
-	19106: 0x701A,
-	19107: 0x7023,
-	19108: 0x701B,
-	19109: 0x7039,
-	19110: 0x7035,
-	19111: 0x704F,
-	19112: 0x705E,
-	19113: 0x5B80,
-	19114: 0x5B84,
-	19115: 0x5B95,
-	19116: 0x5B93,
-	19117: 0x5BA5,
-	19118: 0x5BB8,
-	19119: 0x752F,
-	19120: 0x9A9E,
-	19121: 0x6434,
-	19122: 0x5BE4,
-	19123: 0x5BEE,
-	19124: 0x8930,
-	19125: 0x5BF0,
-	19126: 0x8E47,
-	19127: 0x8B07,
-	19128: 0x8FB6,
-	19129: 0x8FD3,
-	19130: 0x8FD5,
-	19131: 0x8FE5,
-	19132: 0x8FEE,
-	19133: 0x8FE4,
-	19134: 0x8FE9,
-	19135: 0x8FE6,
-	19136: 0x8FF3,
-	19137: 0x8FE8,
-	19138: 0x9005,
-	19139: 0x9004,
-	19140: 0x900B,
-	19141: 0x9026,
-	19142: 0x9011,
-	19143: 0x900D,
-	19144: 0x9016,
-	19145: 0x9021,
-	19146: 0x9035,
-	19147: 0x9036,
-	19148: 0x902D,
-	19149: 0x902F,
-	19150: 0x9044,
-	19151: 0x9051,
-	19152: 0x9052,
-	19153: 0x9050,
-	19154: 0x9068,
-	19155: 0x9058,
-	19156: 0x9062,
-	19157: 0x905B,
-	19158: 0x66B9,
-	19159: 0x9074,
-	19160: 0x907D,
-	19161: 0x9082,
-	19162: 0x9088,
-	19163: 0x9083,
-	19164: 0x908B,
-	19165: 0x5F50,
-	19166: 0x5F57,
-	19167: 0x5F56,
-	19168: 0x5F58,
-	19169: 0x5C3B,
-	19170: 0x54AB,
-	19171: 0x5C50,
-	19172: 0x5C59,
-	19173: 0x5B71,
-	19174: 0x5C63,
-	19175: 0x5C66,
-	19176: 0x7FBC,
-	19177: 0x5F2A,
-	19178: 0x5F29,
-	19179: 0x5F2D,
-	19180: 0x8274,
-	19181: 0x5F3C,
-	19182: 0x9B3B,
-	19183: 0x5C6E,
-	19184: 0x5981,
-	19185: 0x5983,
-	19186: 0x598D,
-	19187: 0x59A9,
-	19188: 0x59AA,
-	19189: 0x59A3,
-	19190: 0x936C,
-	19191: 0x936D,
-	19192: 0x936E,
-	19193: 0x936F,
-	19194: 0x9370,
-	19195: 0x9371,
-	19196: 0x9372,
-	19197: 0x9373,
-	19198: 0x9374,
-	19199: 0x9375,
-	19200: 0x9376,
-	19201: 0x9377,
-	19202: 0x9378,
-	19203: 0x9379,
-	19204: 0x937A,
-	19205: 0x937B,
-	19206: 0x937C,
-	19207: 0x937D,
-	19208: 0x937E,
-	19209: 0x937F,
-	19210: 0x9380,
-	19211: 0x9381,
-	19212: 0x9382,
-	19213: 0x9383,
-	19214: 0x9384,
-	19215: 0x9385,
-	19216: 0x9386,
-	19217: 0x9387,
-	19218: 0x9388,
-	19219: 0x9389,
-	19220: 0x938A,
-	19221: 0x938B,
-	19222: 0x938C,
-	19223: 0x938D,
-	19224: 0x938E,
-	19225: 0x9390,
-	19226: 0x9391,
-	19227: 0x9392,
-	19228: 0x9393,
-	19229: 0x9394,
-	19230: 0x9395,
-	19231: 0x9396,
-	19232: 0x9397,
-	19233: 0x9398,
-	19234: 0x9399,
-	19235: 0x939A,
-	19236: 0x939B,
-	19237: 0x939C,
-	19238: 0x939D,
-	19239: 0x939E,
-	19240: 0x939F,
-	19241: 0x93A0,
-	19242: 0x93A1,
-	19243: 0x93A2,
-	19244: 0x93A3,
-	19245: 0x93A4,
-	19246: 0x93A5,
-	19247: 0x93A6,
-	19248: 0x93A7,
-	19249: 0x93A8,
-	19250: 0x93A9,
-	19251: 0x93AA,
-	19252: 0x93AB,
-	19253: 0x93AC,
-	19254: 0x93AD,
-	19255: 0x93AE,
-	19256: 0x93AF,
-	19257: 0x93B0,
-	19258: 0x93B1,
-	19259: 0x93B2,
-	19260: 0x93B3,
-	19261: 0x93B4,
-	19262: 0x93B5,
-	19263: 0x93B6,
-	19264: 0x93B7,
-	19265: 0x93B8,
-	19266: 0x93B9,
-	19267: 0x93BA,
-	19268: 0x93BB,
-	19269: 0x93BC,
-	19270: 0x93BD,
-	19271: 0x93BE,
-	19272: 0x93BF,
-	19273: 0x93C0,
-	19274: 0x93C1,
-	19275: 0x93C2,
-	19276: 0x93C3,
-	19277: 0x93C4,
-	19278: 0x93C5,
-	19279: 0x93C6,
-	19280: 0x93C7,
-	19281: 0x93C8,
-	19282: 0x93C9,
-	19283: 0x93CB,
-	19284: 0x93CC,
-	19285: 0x93CD,
-	19286: 0x5997,
-	19287: 0x59CA,
-	19288: 0x59AB,
-	19289: 0x599E,
-	19290: 0x59A4,
-	19291: 0x59D2,
-	19292: 0x59B2,
-	19293: 0x59AF,
-	19294: 0x59D7,
-	19295: 0x59BE,
-	19296: 0x5A05,
-	19297: 0x5A06,
-	19298: 0x59DD,
-	19299: 0x5A08,
-	19300: 0x59E3,
-	19301: 0x59D8,
-	19302: 0x59F9,
-	19303: 0x5A0C,
-	19304: 0x5A09,
-	19305: 0x5A32,
-	19306: 0x5A34,
-	19307: 0x5A11,
-	19308: 0x5A23,
-	19309: 0x5A13,
-	19310: 0x5A40,
-	19311: 0x5A67,
-	19312: 0x5A4A,
-	19313: 0x5A55,
-	19314: 0x5A3C,
-	19315: 0x5A62,
-	19316: 0x5A75,
-	19317: 0x80EC,
-	19318: 0x5AAA,
-	19319: 0x5A9B,
-	19320: 0x5A77,
-	19321: 0x5A7A,
-	19322: 0x5ABE,
-	19323: 0x5AEB,
-	19324: 0x5AB2,
-	19325: 0x5AD2,
-	19326: 0x5AD4,
-	19327: 0x5AB8,
-	19328: 0x5AE0,
-	19329: 0x5AE3,
-	19330: 0x5AF1,
-	19331: 0x5AD6,
-	19332: 0x5AE6,
-	19333: 0x5AD8,
-	19334: 0x5ADC,
-	19335: 0x5B09,
-	19336: 0x5B17,
-	19337: 0x5B16,
-	19338: 0x5B32,
-	19339: 0x5B37,
-	19340: 0x5B40,
-	19341: 0x5C15,
-	19342: 0x5C1C,
-	19343: 0x5B5A,
-	19344: 0x5B65,
-	19345: 0x5B73,
-	19346: 0x5B51,
-	19347: 0x5B53,
-	19348: 0x5B62,
-	19349: 0x9A75,
-	19350: 0x9A77,
-	19351: 0x9A78,
-	19352: 0x9A7A,
-	19353: 0x9A7F,
-	19354: 0x9A7D,
-	19355: 0x9A80,
-	19356: 0x9A81,
-	19357: 0x9A85,
-	19358: 0x9A88,
-	19359: 0x9A8A,
-	19360: 0x9A90,
-	19361: 0x9A92,
-	19362: 0x9A93,
-	19363: 0x9A96,
-	19364: 0x9A98,
-	19365: 0x9A9B,
-	19366: 0x9A9C,
-	19367: 0x9A9D,
-	19368: 0x9A9F,
-	19369: 0x9AA0,
-	19370: 0x9AA2,
-	19371: 0x9AA3,
-	19372: 0x9AA5,
-	19373: 0x9AA7,
-	19374: 0x7E9F,
-	19375: 0x7EA1,
-	19376: 0x7EA3,
-	19377: 0x7EA5,
-	19378: 0x7EA8,
-	19379: 0x7EA9,
-	19380: 0x93CE,
-	19381: 0x93CF,
-	19382: 0x93D0,
-	19383: 0x93D1,
-	19384: 0x93D2,
-	19385: 0x93D3,
-	19386: 0x93D4,
-	19387: 0x93D5,
-	19388: 0x93D7,
-	19389: 0x93D8,
-	19390: 0x93D9,
-	19391: 0x93DA,
-	19392: 0x93DB,
-	19393: 0x93DC,
-	19394: 0x93DD,
-	19395: 0x93DE,
-	19396: 0x93DF,
-	19397: 0x93E0,
-	19398: 0x93E1,
-	19399: 0x93E2,
-	19400: 0x93E3,
-	19401: 0x93E4,
-	19402: 0x93E5,
-	19403: 0x93E6,
-	19404: 0x93E7,
-	19405: 0x93E8,
-	19406: 0x93E9,
-	19407: 0x93EA,
-	19408: 0x93EB,
-	19409: 0x93EC,
-	19410: 0x93ED,
-	19411: 0x93EE,
-	19412: 0x93EF,
-	19413: 0x93F0,
-	19414: 0x93F1,
-	19415: 0x93F2,
-	19416: 0x93F3,
-	19417: 0x93F4,
-	19418: 0x93F5,
-	19419: 0x93F6,
-	19420: 0x93F7,
-	19421: 0x93F8,
-	19422: 0x93F9,
-	19423: 0x93FA,
-	19424: 0x93FB,
-	19425: 0x93FC,
-	19426: 0x93FD,
-	19427: 0x93FE,
-	19428: 0x93FF,
-	19429: 0x9400,
-	19430: 0x9401,
-	19431: 0x9402,
-	19432: 0x9403,
-	19433: 0x9404,
-	19434: 0x9405,
-	19435: 0x9406,
-	19436: 0x9407,
-	19437: 0x9408,
-	19438: 0x9409,
-	19439: 0x940A,
-	19440: 0x940B,
-	19441: 0x940C,
-	19442: 0x940D,
-	19443: 0x940E,
-	19444: 0x940F,
-	19445: 0x9410,
-	19446: 0x9411,
-	19447: 0x9412,
-	19448: 0x9413,
-	19449: 0x9414,
-	19450: 0x9415,
-	19451: 0x9416,
-	19452: 0x9417,
-	19453: 0x9418,
-	19454: 0x9419,
-	19455: 0x941A,
-	19456: 0x941B,
-	19457: 0x941C,
-	19458: 0x941D,
-	19459: 0x941E,
-	19460: 0x941F,
-	19461: 0x9420,
-	19462: 0x9421,
-	19463: 0x9422,
-	19464: 0x9423,
-	19465: 0x9424,
-	19466: 0x9425,
-	19467: 0x9426,
-	19468: 0x9427,
-	19469: 0x9428,
-	19470: 0x9429,
-	19471: 0x942A,
-	19472: 0x942B,
-	19473: 0x942C,
-	19474: 0x942D,
-	19475: 0x942E,
-	19476: 0x7EAD,
-	19477: 0x7EB0,
-	19478: 0x7EBE,
-	19479: 0x7EC0,
-	19480: 0x7EC1,
-	19481: 0x7EC2,
-	19482: 0x7EC9,
-	19483: 0x7ECB,
-	19484: 0x7ECC,
-	19485: 0x7ED0,
-	19486: 0x7ED4,
-	19487: 0x7ED7,
-	19488: 0x7EDB,
-	19489: 0x7EE0,
-	19490: 0x7EE1,
-	19491: 0x7EE8,
-	19492: 0x7EEB,
-	19493: 0x7EEE,
-	19494: 0x7EEF,
-	19495: 0x7EF1,
-	19496: 0x7EF2,
-	19497: 0x7F0D,
-	19498: 0x7EF6,
-	19499: 0x7EFA,
-	19500: 0x7EFB,
-	19501: 0x7EFE,
-	19502: 0x7F01,
-	19503: 0x7F02,
-	19504: 0x7F03,
-	19505: 0x7F07,
-	19506: 0x7F08,
-	19507: 0x7F0B,
-	19508: 0x7F0C,
-	19509: 0x7F0F,
-	19510: 0x7F11,
-	19511: 0x7F12,
-	19512: 0x7F17,
-	19513: 0x7F19,
-	19514: 0x7F1C,
-	19515: 0x7F1B,
-	19516: 0x7F1F,
-	19517: 0x7F21,
-	19518: 0x7F22,
-	19519: 0x7F23,
-	19520: 0x7F24,
-	19521: 0x7F25,
-	19522: 0x7F26,
-	19523: 0x7F27,
-	19524: 0x7F2A,
-	19525: 0x7F2B,
-	19526: 0x7F2C,
-	19527: 0x7F2D,
-	19528: 0x7F2F,
-	19529: 0x7F30,
-	19530: 0x7F31,
-	19531: 0x7F32,
-	19532: 0x7F33,
-	19533: 0x7F35,
-	19534: 0x5E7A,
-	19535: 0x757F,
-	19536: 0x5DDB,
-	19537: 0x753E,
-	19538: 0x9095,
-	19539: 0x738E,
-	19540: 0x7391,
-	19541: 0x73AE,
-	19542: 0x73A2,
-	19543: 0x739F,
-	19544: 0x73CF,
-	19545: 0x73C2,
-	19546: 0x73D1,
-	19547: 0x73B7,
-	19548: 0x73B3,
-	19549: 0x73C0,
-	19550: 0x73C9,
-	19551: 0x73C8,
-	19552: 0x73E5,
-	19553: 0x73D9,
-	19554: 0x987C,
-	19555: 0x740A,
-	19556: 0x73E9,
-	19557: 0x73E7,
-	19558: 0x73DE,
-	19559: 0x73BA,
-	19560: 0x73F2,
-	19561: 0x740F,
-	19562: 0x742A,
-	19563: 0x745B,
-	19564: 0x7426,
-	19565: 0x7425,
-	19566: 0x7428,
-	19567: 0x7430,
-	19568: 0x742E,
-	19569: 0x742C,
-	19570: 0x942F,
-	19571: 0x9430,
-	19572: 0x9431,
-	19573: 0x9432,
-	19574: 0x9433,
-	19575: 0x9434,
-	19576: 0x9435,
-	19577: 0x9436,
-	19578: 0x9437,
-	19579: 0x9438,
-	19580: 0x9439,
-	19581: 0x943A,
-	19582: 0x943B,
-	19583: 0x943C,
-	19584: 0x943D,
-	19585: 0x943F,
-	19586: 0x9440,
-	19587: 0x9441,
-	19588: 0x9442,
-	19589: 0x9443,
-	19590: 0x9444,
-	19591: 0x9445,
-	19592: 0x9446,
-	19593: 0x9447,
-	19594: 0x9448,
-	19595: 0x9449,
-	19596: 0x944A,
-	19597: 0x944B,
-	19598: 0x944C,
-	19599: 0x944D,
-	19600: 0x944E,
-	19601: 0x944F,
-	19602: 0x9450,
-	19603: 0x9451,
-	19604: 0x9452,
-	19605: 0x9453,
-	19606: 0x9454,
-	19607: 0x9455,
-	19608: 0x9456,
-	19609: 0x9457,
-	19610: 0x9458,
-	19611: 0x9459,
-	19612: 0x945A,
-	19613: 0x945B,
-	19614: 0x945C,
-	19615: 0x945D,
-	19616: 0x945E,
-	19617: 0x945F,
-	19618: 0x9460,
-	19619: 0x9461,
-	19620: 0x9462,
-	19621: 0x9463,
-	19622: 0x9464,
-	19623: 0x9465,
-	19624: 0x9466,
-	19625: 0x9467,
-	19626: 0x9468,
-	19627: 0x9469,
-	19628: 0x946A,
-	19629: 0x946C,
-	19630: 0x946D,
-	19631: 0x946E,
-	19632: 0x946F,
-	19633: 0x9470,
-	19634: 0x9471,
-	19635: 0x9472,
-	19636: 0x9473,
-	19637: 0x9474,
-	19638: 0x9475,
-	19639: 0x9476,
-	19640: 0x9477,
-	19641: 0x9478,
-	19642: 0x9479,
-	19643: 0x947A,
-	19644: 0x947B,
-	19645: 0x947C,
-	19646: 0x947D,
-	19647: 0x947E,
-	19648: 0x947F,
-	19649: 0x9480,
-	19650: 0x9481,
-	19651: 0x9482,
-	19652: 0x9483,
-	19653: 0x9484,
-	19654: 0x9491,
-	19655: 0x9496,
-	19656: 0x9498,
-	19657: 0x94C7,
-	19658: 0x94CF,
-	19659: 0x94D3,
-	19660: 0x94D4,
-	19661: 0x94DA,
-	19662: 0x94E6,
-	19663: 0x94FB,
-	19664: 0x951C,
-	19665: 0x9520,
-	19666: 0x741B,
-	19667: 0x741A,
-	19668: 0x7441,
-	19669: 0x745C,
-	19670: 0x7457,
-	19671: 0x7455,
-	19672: 0x7459,
-	19673: 0x7477,
-	19674: 0x746D,
-	19675: 0x747E,
-	19676: 0x749C,
-	19677: 0x748E,
-	19678: 0x7480,
-	19679: 0x7481,
-	19680: 0x7487,
-	19681: 0x748B,
-	19682: 0x749E,
-	19683: 0x74A8,
-	19684: 0x74A9,
-	19685: 0x7490,
-	19686: 0x74A7,
-	19687: 0x74D2,
-	19688: 0x74BA,
-	19689: 0x97EA,
-	19690: 0x97EB,
-	19691: 0x97EC,
-	19692: 0x674C,
-	19693: 0x6753,
-	19694: 0x675E,
-	19695: 0x6748,
-	19696: 0x6769,
-	19697: 0x67A5,
-	19698: 0x6787,
-	19699: 0x676A,
-	19700: 0x6773,
-	19701: 0x6798,
-	19702: 0x67A7,
-	19703: 0x6775,
-	19704: 0x67A8,
-	19705: 0x679E,
-	19706: 0x67AD,
-	19707: 0x678B,
-	19708: 0x6777,
-	19709: 0x677C,
-	19710: 0x67F0,
-	19711: 0x6809,
-	19712: 0x67D8,
-	19713: 0x680A,
-	19714: 0x67E9,
-	19715: 0x67B0,
-	19716: 0x680C,
-	19717: 0x67D9,
-	19718: 0x67B5,
-	19719: 0x67DA,
-	19720: 0x67B3,
-	19721: 0x67DD,
-	19722: 0x6800,
-	19723: 0x67C3,
-	19724: 0x67B8,
-	19725: 0x67E2,
-	19726: 0x680E,
-	19727: 0x67C1,
-	19728: 0x67FD,
-	19729: 0x6832,
-	19730: 0x6833,
-	19731: 0x6860,
-	19732: 0x6861,
-	19733: 0x684E,
-	19734: 0x6862,
-	19735: 0x6844,
-	19736: 0x6864,
-	19737: 0x6883,
-	19738: 0x681D,
-	19739: 0x6855,
-	19740: 0x6866,
-	19741: 0x6841,
-	19742: 0x6867,
-	19743: 0x6840,
-	19744: 0x683E,
-	19745: 0x684A,
-	19746: 0x6849,
-	19747: 0x6829,
-	19748: 0x68B5,
-	19749: 0x688F,
-	19750: 0x6874,
-	19751: 0x6877,
-	19752: 0x6893,
-	19753: 0x686B,
-	19754: 0x68C2,
-	19755: 0x696E,
-	19756: 0x68FC,
-	19757: 0x691F,
-	19758: 0x6920,
-	19759: 0x68F9,
-	19760: 0x9527,
-	19761: 0x9533,
-	19762: 0x953D,
-	19763: 0x9543,
-	19764: 0x9548,
-	19765: 0x954B,
-	19766: 0x9555,
-	19767: 0x955A,
-	19768: 0x9560,
-	19769: 0x956E,
-	19770: 0x9574,
-	19771: 0x9575,
-	19772: 0x9577,
-	19773: 0x9578,
-	19774: 0x9579,
-	19775: 0x957A,
-	19776: 0x957B,
-	19777: 0x957C,
-	19778: 0x957D,
-	19779: 0x957E,
-	19780: 0x9580,
-	19781: 0x9581,
-	19782: 0x9582,
-	19783: 0x9583,
-	19784: 0x9584,
-	19785: 0x9585,
-	19786: 0x9586,
-	19787: 0x9587,
-	19788: 0x9588,
-	19789: 0x9589,
-	19790: 0x958A,
-	19791: 0x958B,
-	19792: 0x958C,
-	19793: 0x958D,
-	19794: 0x958E,
-	19795: 0x958F,
-	19796: 0x9590,
-	19797: 0x9591,
-	19798: 0x9592,
-	19799: 0x9593,
-	19800: 0x9594,
-	19801: 0x9595,
-	19802: 0x9596,
-	19803: 0x9597,
-	19804: 0x9598,
-	19805: 0x9599,
-	19806: 0x959A,
-	19807: 0x959B,
-	19808: 0x959C,
-	19809: 0x959D,
-	19810: 0x959E,
-	19811: 0x959F,
-	19812: 0x95A0,
-	19813: 0x95A1,
-	19814: 0x95A2,
-	19815: 0x95A3,
-	19816: 0x95A4,
-	19817: 0x95A5,
-	19818: 0x95A6,
-	19819: 0x95A7,
-	19820: 0x95A8,
-	19821: 0x95A9,
-	19822: 0x95AA,
-	19823: 0x95AB,
-	19824: 0x95AC,
-	19825: 0x95AD,
-	19826: 0x95AE,
-	19827: 0x95AF,
-	19828: 0x95B0,
-	19829: 0x95B1,
-	19830: 0x95B2,
-	19831: 0x95B3,
-	19832: 0x95B4,
-	19833: 0x95B5,
-	19834: 0x95B6,
-	19835: 0x95B7,
-	19836: 0x95B8,
-	19837: 0x95B9,
-	19838: 0x95BA,
-	19839: 0x95BB,
-	19840: 0x95BC,
-	19841: 0x95BD,
-	19842: 0x95BE,
-	19843: 0x95BF,
-	19844: 0x95C0,
-	19845: 0x95C1,
-	19846: 0x95C2,
-	19847: 0x95C3,
-	19848: 0x95C4,
-	19849: 0x95C5,
-	19850: 0x95C6,
-	19851: 0x95C7,
-	19852: 0x95C8,
-	19853: 0x95C9,
-	19854: 0x95CA,
-	19855: 0x95CB,
-	19856: 0x6924,
-	19857: 0x68F0,
-	19858: 0x690B,
-	19859: 0x6901,
-	19860: 0x6957,
-	19861: 0x68E3,
-	19862: 0x6910,
-	19863: 0x6971,
-	19864: 0x6939,
-	19865: 0x6960,
-	19866: 0x6942,
-	19867: 0x695D,
-	19868: 0x6984,
-	19869: 0x696B,
-	19870: 0x6980,
-	19871: 0x6998,
-	19872: 0x6978,
-	19873: 0x6934,
-	19874: 0x69CC,
-	19875: 0x6987,
-	19876: 0x6988,
-	19877: 0x69CE,
-	19878: 0x6989,
-	19879: 0x6966,
-	19880: 0x6963,
-	19881: 0x6979,
-	19882: 0x699B,
-	19883: 0x69A7,
-	19884: 0x69BB,
-	19885: 0x69AB,
-	19886: 0x69AD,
-	19887: 0x69D4,
-	19888: 0x69B1,
-	19889: 0x69C1,
-	19890: 0x69CA,
-	19891: 0x69DF,
-	19892: 0x6995,
-	19893: 0x69E0,
-	19894: 0x698D,
-	19895: 0x69FF,
-	19896: 0x6A2F,
-	19897: 0x69ED,
-	19898: 0x6A17,
-	19899: 0x6A18,
-	19900: 0x6A65,
-	19901: 0x69F2,
-	19902: 0x6A44,
-	19903: 0x6A3E,
-	19904: 0x6AA0,
-	19905: 0x6A50,
-	19906: 0x6A5B,
-	19907: 0x6A35,
-	19908: 0x6A8E,
-	19909: 0x6A79,
-	19910: 0x6A3D,
-	19911: 0x6A28,
-	19912: 0x6A58,
-	19913: 0x6A7C,
-	19914: 0x6A91,
-	19915: 0x6A90,
-	19916: 0x6AA9,
-	19917: 0x6A97,
-	19918: 0x6AAB,
-	19919: 0x7337,
-	19920: 0x7352,
-	19921: 0x6B81,
-	19922: 0x6B82,
-	19923: 0x6B87,
-	19924: 0x6B84,
-	19925: 0x6B92,
-	19926: 0x6B93,
-	19927: 0x6B8D,
-	19928: 0x6B9A,
-	19929: 0x6B9B,
-	19930: 0x6BA1,
-	19931: 0x6BAA,
-	19932: 0x8F6B,
-	19933: 0x8F6D,
-	19934: 0x8F71,
-	19935: 0x8F72,
-	19936: 0x8F73,
-	19937: 0x8F75,
-	19938: 0x8F76,
-	19939: 0x8F78,
-	19940: 0x8F77,
-	19941: 0x8F79,
-	19942: 0x8F7A,
-	19943: 0x8F7C,
-	19944: 0x8F7E,
-	19945: 0x8F81,
-	19946: 0x8F82,
-	19947: 0x8F84,
-	19948: 0x8F87,
-	19949: 0x8F8B,
-	19950: 0x95CC,
-	19951: 0x95CD,
-	19952: 0x95CE,
-	19953: 0x95CF,
-	19954: 0x95D0,
-	19955: 0x95D1,
-	19956: 0x95D2,
-	19957: 0x95D3,
-	19958: 0x95D4,
-	19959: 0x95D5,
-	19960: 0x95D6,
-	19961: 0x95D7,
-	19962: 0x95D8,
-	19963: 0x95D9,
-	19964: 0x95DA,
-	19965: 0x95DB,
-	19966: 0x95DC,
-	19967: 0x95DD,
-	19968: 0x95DE,
-	19969: 0x95DF,
-	19970: 0x95E0,
-	19971: 0x95E1,
-	19972: 0x95E2,
-	19973: 0x95E3,
-	19974: 0x95E4,
-	19975: 0x95E5,
-	19976: 0x95E6,
-	19977: 0x95E7,
-	19978: 0x95EC,
-	19979: 0x95FF,
-	19980: 0x9607,
-	19981: 0x9613,
-	19982: 0x9618,
-	19983: 0x961B,
-	19984: 0x961E,
-	19985: 0x9620,
-	19986: 0x9623,
-	19987: 0x9624,
-	19988: 0x9625,
-	19989: 0x9626,
-	19990: 0x9627,
-	19991: 0x9628,
-	19992: 0x9629,
-	19993: 0x962B,
-	19994: 0x962C,
-	19995: 0x962D,
-	19996: 0x962F,
-	19997: 0x9630,
-	19998: 0x9637,
-	19999: 0x9638,
-	20000: 0x9639,
-	20001: 0x963A,
-	20002: 0x963E,
-	20003: 0x9641,
-	20004: 0x9643,
-	20005: 0x964A,
-	20006: 0x964E,
-	20007: 0x964F,
-	20008: 0x9651,
-	20009: 0x9652,
-	20010: 0x9653,
-	20011: 0x9656,
-	20012: 0x9657,
-	20013: 0x9658,
-	20014: 0x9659,
-	20015: 0x965A,
-	20016: 0x965C,
-	20017: 0x965D,
-	20018: 0x965E,
-	20019: 0x9660,
-	20020: 0x9663,
-	20021: 0x9665,
-	20022: 0x9666,
-	20023: 0x966B,
-	20024: 0x966D,
-	20025: 0x966E,
-	20026: 0x966F,
-	20027: 0x9670,
-	20028: 0x9671,
-	20029: 0x9673,
-	20030: 0x9678,
-	20031: 0x9679,
-	20032: 0x967A,
-	20033: 0x967B,
-	20034: 0x967C,
-	20035: 0x967D,
-	20036: 0x967E,
-	20037: 0x967F,
-	20038: 0x9680,
-	20039: 0x9681,
-	20040: 0x9682,
-	20041: 0x9683,
-	20042: 0x9684,
-	20043: 0x9687,
-	20044: 0x9689,
-	20045: 0x968A,
-	20046: 0x8F8D,
-	20047: 0x8F8E,
-	20048: 0x8F8F,
-	20049: 0x8F98,
-	20050: 0x8F9A,
-	20051: 0x8ECE,
-	20052: 0x620B,
-	20053: 0x6217,
-	20054: 0x621B,
-	20055: 0x621F,
-	20056: 0x6222,
-	20057: 0x6221,
-	20058: 0x6225,
-	20059: 0x6224,
-	20060: 0x622C,
-	20061: 0x81E7,
-	20062: 0x74EF,
-	20063: 0x74F4,
-	20064: 0x74FF,
-	20065: 0x750F,
-	20066: 0x7511,
-	20067: 0x7513,
-	20068: 0x6534,
-	20069: 0x65EE,
-	20070: 0x65EF,
-	20071: 0x65F0,
-	20072: 0x660A,
-	20073: 0x6619,
-	20074: 0x6772,
-	20075: 0x6603,
-	20076: 0x6615,
-	20077: 0x6600,
-	20078: 0x7085,
-	20079: 0x66F7,
-	20080: 0x661D,
-	20081: 0x6634,
-	20082: 0x6631,
-	20083: 0x6636,
-	20084: 0x6635,
-	20085: 0x8006,
-	20086: 0x665F,
-	20087: 0x6654,
-	20088: 0x6641,
-	20089: 0x664F,
-	20090: 0x6656,
-	20091: 0x6661,
-	20092: 0x6657,
-	20093: 0x6677,
-	20094: 0x6684,
-	20095: 0x668C,
-	20096: 0x66A7,
-	20097: 0x669D,
-	20098: 0x66BE,
-	20099: 0x66DB,
-	20100: 0x66DC,
-	20101: 0x66E6,
-	20102: 0x66E9,
-	20103: 0x8D32,
-	20104: 0x8D33,
-	20105: 0x8D36,
-	20106: 0x8D3B,
-	20107: 0x8D3D,
-	20108: 0x8D40,
-	20109: 0x8D45,
-	20110: 0x8D46,
-	20111: 0x8D48,
-	20112: 0x8D49,
-	20113: 0x8D47,
-	20114: 0x8D4D,
-	20115: 0x8D55,
-	20116: 0x8D59,
-	20117: 0x89C7,
-	20118: 0x89CA,
-	20119: 0x89CB,
-	20120: 0x89CC,
-	20121: 0x89CE,
-	20122: 0x89CF,
-	20123: 0x89D0,
-	20124: 0x89D1,
-	20125: 0x726E,
-	20126: 0x729F,
-	20127: 0x725D,
-	20128: 0x7266,
-	20129: 0x726F,
-	20130: 0x727E,
-	20131: 0x727F,
-	20132: 0x7284,
-	20133: 0x728B,
-	20134: 0x728D,
-	20135: 0x728F,
-	20136: 0x7292,
-	20137: 0x6308,
-	20138: 0x6332,
-	20139: 0x63B0,
-	20140: 0x968C,
-	20141: 0x968E,
-	20142: 0x9691,
-	20143: 0x9692,
-	20144: 0x9693,
-	20145: 0x9695,
-	20146: 0x9696,
-	20147: 0x969A,
-	20148: 0x969B,
-	20149: 0x969D,
-	20150: 0x969E,
-	20151: 0x969F,
-	20152: 0x96A0,
-	20153: 0x96A1,
-	20154: 0x96A2,
-	20155: 0x96A3,
-	20156: 0x96A4,
-	20157: 0x96A5,
-	20158: 0x96A6,
-	20159: 0x96A8,
-	20160: 0x96A9,
-	20161: 0x96AA,
-	20162: 0x96AB,
-	20163: 0x96AC,
-	20164: 0x96AD,
-	20165: 0x96AE,
-	20166: 0x96AF,
-	20167: 0x96B1,
-	20168: 0x96B2,
-	20169: 0x96B4,
-	20170: 0x96B5,
-	20171: 0x96B7,
-	20172: 0x96B8,
-	20173: 0x96BA,
-	20174: 0x96BB,
-	20175: 0x96BF,
-	20176: 0x96C2,
-	20177: 0x96C3,
-	20178: 0x96C8,
-	20179: 0x96CA,
-	20180: 0x96CB,
-	20181: 0x96D0,
-	20182: 0x96D1,
-	20183: 0x96D3,
-	20184: 0x96D4,
-	20185: 0x96D6,
-	20186: 0x96D7,
-	20187: 0x96D8,
-	20188: 0x96D9,
-	20189: 0x96DA,
-	20190: 0x96DB,
-	20191: 0x96DC,
-	20192: 0x96DD,
-	20193: 0x96DE,
-	20194: 0x96DF,
-	20195: 0x96E1,
-	20196: 0x96E2,
-	20197: 0x96E3,
-	20198: 0x96E4,
-	20199: 0x96E5,
-	20200: 0x96E6,
-	20201: 0x96E7,
-	20202: 0x96EB,
-	20203: 0x96EC,
-	20204: 0x96ED,
-	20205: 0x96EE,
-	20206: 0x96F0,
-	20207: 0x96F1,
-	20208: 0x96F2,
-	20209: 0x96F4,
-	20210: 0x96F5,
-	20211: 0x96F8,
-	20212: 0x96FA,
-	20213: 0x96FB,
-	20214: 0x96FC,
-	20215: 0x96FD,
-	20216: 0x96FF,
-	20217: 0x9702,
-	20218: 0x9703,
-	20219: 0x9705,
-	20220: 0x970A,
-	20221: 0x970B,
-	20222: 0x970C,
-	20223: 0x9710,
-	20224: 0x9711,
-	20225: 0x9712,
-	20226: 0x9714,
-	20227: 0x9715,
-	20228: 0x9717,
-	20229: 0x9718,
-	20230: 0x9719,
-	20231: 0x971A,
-	20232: 0x971B,
-	20233: 0x971D,
-	20234: 0x971F,
-	20235: 0x9720,
-	20236: 0x643F,
-	20237: 0x64D8,
-	20238: 0x8004,
-	20239: 0x6BEA,
-	20240: 0x6BF3,
-	20241: 0x6BFD,
-	20242: 0x6BF5,
-	20243: 0x6BF9,
-	20244: 0x6C05,
-	20245: 0x6C07,
-	20246: 0x6C06,
-	20247: 0x6C0D,
-	20248: 0x6C15,
-	20249: 0x6C18,
-	20250: 0x6C19,
-	20251: 0x6C1A,
-	20252: 0x6C21,
-	20253: 0x6C29,
-	20254: 0x6C24,
-	20255: 0x6C2A,
-	20256: 0x6C32,
-	20257: 0x6535,
-	20258: 0x6555,
-	20259: 0x656B,
-	20260: 0x724D,
-	20261: 0x7252,
-	20262: 0x7256,
-	20263: 0x7230,
-	20264: 0x8662,
-	20265: 0x5216,
-	20266: 0x809F,
-	20267: 0x809C,
-	20268: 0x8093,
-	20269: 0x80BC,
-	20270: 0x670A,
-	20271: 0x80BD,
-	20272: 0x80B1,
-	20273: 0x80AB,
-	20274: 0x80AD,
-	20275: 0x80B4,
-	20276: 0x80B7,
-	20277: 0x80E7,
-	20278: 0x80E8,
-	20279: 0x80E9,
-	20280: 0x80EA,
-	20281: 0x80DB,
-	20282: 0x80C2,
-	20283: 0x80C4,
-	20284: 0x80D9,
-	20285: 0x80CD,
-	20286: 0x80D7,
-	20287: 0x6710,
-	20288: 0x80DD,
-	20289: 0x80EB,
-	20290: 0x80F1,
-	20291: 0x80F4,
-	20292: 0x80ED,
-	20293: 0x810D,
-	20294: 0x810E,
-	20295: 0x80F2,
-	20296: 0x80FC,
-	20297: 0x6715,
-	20298: 0x8112,
-	20299: 0x8C5A,
-	20300: 0x8136,
-	20301: 0x811E,
-	20302: 0x812C,
-	20303: 0x8118,
-	20304: 0x8132,
-	20305: 0x8148,
-	20306: 0x814C,
-	20307: 0x8153,
-	20308: 0x8174,
-	20309: 0x8159,
-	20310: 0x815A,
-	20311: 0x8171,
-	20312: 0x8160,
-	20313: 0x8169,
-	20314: 0x817C,
-	20315: 0x817D,
-	20316: 0x816D,
-	20317: 0x8167,
-	20318: 0x584D,
-	20319: 0x5AB5,
-	20320: 0x8188,
-	20321: 0x8182,
-	20322: 0x8191,
-	20323: 0x6ED5,
-	20324: 0x81A3,
-	20325: 0x81AA,
-	20326: 0x81CC,
-	20327: 0x6726,
-	20328: 0x81CA,
-	20329: 0x81BB,
-	20330: 0x9721,
-	20331: 0x9722,
-	20332: 0x9723,
-	20333: 0x9724,
-	20334: 0x9725,
-	20335: 0x9726,
-	20336: 0x9727,
-	20337: 0x9728,
-	20338: 0x9729,
-	20339: 0x972B,
-	20340: 0x972C,
-	20341: 0x972E,
-	20342: 0x972F,
-	20343: 0x9731,
-	20344: 0x9733,
-	20345: 0x9734,
-	20346: 0x9735,
-	20347: 0x9736,
-	20348: 0x9737,
-	20349: 0x973A,
-	20350: 0x973B,
-	20351: 0x973C,
-	20352: 0x973D,
-	20353: 0x973F,
-	20354: 0x9740,
-	20355: 0x9741,
-	20356: 0x9742,
-	20357: 0x9743,
-	20358: 0x9744,
-	20359: 0x9745,
-	20360: 0x9746,
-	20361: 0x9747,
-	20362: 0x9748,
-	20363: 0x9749,
-	20364: 0x974A,
-	20365: 0x974B,
-	20366: 0x974C,
-	20367: 0x974D,
-	20368: 0x974E,
-	20369: 0x974F,
-	20370: 0x9750,
-	20371: 0x9751,
-	20372: 0x9754,
-	20373: 0x9755,
-	20374: 0x9757,
-	20375: 0x9758,
-	20376: 0x975A,
-	20377: 0x975C,
-	20378: 0x975D,
-	20379: 0x975F,
-	20380: 0x9763,
-	20381: 0x9764,
-	20382: 0x9766,
-	20383: 0x9767,
-	20384: 0x9768,
-	20385: 0x976A,
-	20386: 0x976B,
-	20387: 0x976C,
-	20388: 0x976D,
-	20389: 0x976E,
-	20390: 0x976F,
-	20391: 0x9770,
-	20392: 0x9771,
-	20393: 0x9772,
-	20394: 0x9775,
-	20395: 0x9777,
-	20396: 0x9778,
-	20397: 0x9779,
-	20398: 0x977A,
-	20399: 0x977B,
-	20400: 0x977D,
-	20401: 0x977E,
-	20402: 0x977F,
-	20403: 0x9780,
-	20404: 0x9781,
-	20405: 0x9782,
-	20406: 0x9783,
-	20407: 0x9784,
-	20408: 0x9786,
-	20409: 0x9787,
-	20410: 0x9788,
-	20411: 0x9789,
-	20412: 0x978A,
-	20413: 0x978C,
-	20414: 0x978E,
-	20415: 0x978F,
-	20416: 0x9790,
-	20417: 0x9793,
-	20418: 0x9795,
-	20419: 0x9796,
-	20420: 0x9797,
-	20421: 0x9799,
-	20422: 0x979A,
-	20423: 0x979B,
-	20424: 0x979C,
-	20425: 0x979D,
-	20426: 0x81C1,
-	20427: 0x81A6,
-	20428: 0x6B24,
-	20429: 0x6B37,
-	20430: 0x6B39,
-	20431: 0x6B43,
-	20432: 0x6B46,
-	20433: 0x6B59,
-	20434: 0x98D1,
-	20435: 0x98D2,
-	20436: 0x98D3,
-	20437: 0x98D5,
-	20438: 0x98D9,
-	20439: 0x98DA,
-	20440: 0x6BB3,
-	20441: 0x5F40,
-	20442: 0x6BC2,
-	20443: 0x89F3,
-	20444: 0x6590,
-	20445: 0x9F51,
-	20446: 0x6593,
-	20447: 0x65BC,
-	20448: 0x65C6,
-	20449: 0x65C4,
-	20450: 0x65C3,
-	20451: 0x65CC,
-	20452: 0x65CE,
-	20453: 0x65D2,
-	20454: 0x65D6,
-	20455: 0x7080,
-	20456: 0x709C,
-	20457: 0x7096,
-	20458: 0x709D,
-	20459: 0x70BB,
-	20460: 0x70C0,
-	20461: 0x70B7,
-	20462: 0x70AB,
-	20463: 0x70B1,
-	20464: 0x70E8,
-	20465: 0x70CA,
-	20466: 0x7110,
-	20467: 0x7113,
-	20468: 0x7116,
-	20469: 0x712F,
-	20470: 0x7131,
-	20471: 0x7173,
-	20472: 0x715C,
-	20473: 0x7168,
-	20474: 0x7145,
-	20475: 0x7172,
-	20476: 0x714A,
-	20477: 0x7178,
-	20478: 0x717A,
-	20479: 0x7198,
-	20480: 0x71B3,
-	20481: 0x71B5,
-	20482: 0x71A8,
-	20483: 0x71A0,
-	20484: 0x71E0,
-	20485: 0x71D4,
-	20486: 0x71E7,
-	20487: 0x71F9,
-	20488: 0x721D,
-	20489: 0x7228,
-	20490: 0x706C,
-	20491: 0x7118,
-	20492: 0x7166,
-	20493: 0x71B9,
-	20494: 0x623E,
-	20495: 0x623D,
-	20496: 0x6243,
-	20497: 0x6248,
-	20498: 0x6249,
-	20499: 0x793B,
-	20500: 0x7940,
-	20501: 0x7946,
-	20502: 0x7949,
-	20503: 0x795B,
-	20504: 0x795C,
-	20505: 0x7953,
-	20506: 0x795A,
-	20507: 0x7962,
-	20508: 0x7957,
-	20509: 0x7960,
-	20510: 0x796F,
-	20511: 0x7967,
-	20512: 0x797A,
-	20513: 0x7985,
-	20514: 0x798A,
-	20515: 0x799A,
-	20516: 0x79A7,
-	20517: 0x79B3,
-	20518: 0x5FD1,
-	20519: 0x5FD0,
-	20520: 0x979E,
-	20521: 0x979F,
-	20522: 0x97A1,
-	20523: 0x97A2,
-	20524: 0x97A4,
-	20525: 0x97A5,
-	20526: 0x97A6,
-	20527: 0x97A7,
-	20528: 0x97A8,
-	20529: 0x97A9,
-	20530: 0x97AA,
-	20531: 0x97AC,
-	20532: 0x97AE,
-	20533: 0x97B0,
-	20534: 0x97B1,
-	20535: 0x97B3,
-	20536: 0x97B5,
-	20537: 0x97B6,
-	20538: 0x97B7,
-	20539: 0x97B8,
-	20540: 0x97B9,
-	20541: 0x97BA,
-	20542: 0x97BB,
-	20543: 0x97BC,
-	20544: 0x97BD,
-	20545: 0x97BE,
-	20546: 0x97BF,
-	20547: 0x97C0,
-	20548: 0x97C1,
-	20549: 0x97C2,
-	20550: 0x97C3,
-	20551: 0x97C4,
-	20552: 0x97C5,
-	20553: 0x97C6,
-	20554: 0x97C7,
-	20555: 0x97C8,
-	20556: 0x97C9,
-	20557: 0x97CA,
-	20558: 0x97CB,
-	20559: 0x97CC,
-	20560: 0x97CD,
-	20561: 0x97CE,
-	20562: 0x97CF,
-	20563: 0x97D0,
-	20564: 0x97D1,
-	20565: 0x97D2,
-	20566: 0x97D3,
-	20567: 0x97D4,
-	20568: 0x97D5,
-	20569: 0x97D6,
-	20570: 0x97D7,
-	20571: 0x97D8,
-	20572: 0x97D9,
-	20573: 0x97DA,
-	20574: 0x97DB,
-	20575: 0x97DC,
-	20576: 0x97DD,
-	20577: 0x97DE,
-	20578: 0x97DF,
-	20579: 0x97E0,
-	20580: 0x97E1,
-	20581: 0x97E2,
-	20582: 0x97E3,
-	20583: 0x97E4,
-	20584: 0x97E5,
-	20585: 0x97E8,
-	20586: 0x97EE,
-	20587: 0x97EF,
-	20588: 0x97F0,
-	20589: 0x97F1,
-	20590: 0x97F2,
-	20591: 0x97F4,
-	20592: 0x97F7,
-	20593: 0x97F8,
-	20594: 0x97F9,
-	20595: 0x97FA,
-	20596: 0x97FB,
-	20597: 0x97FC,
-	20598: 0x97FD,
-	20599: 0x97FE,
-	20600: 0x97FF,
-	20601: 0x9800,
-	20602: 0x9801,
-	20603: 0x9802,
-	20604: 0x9803,
-	20605: 0x9804,
-	20606: 0x9805,
-	20607: 0x9806,
-	20608: 0x9807,
-	20609: 0x9808,
-	20610: 0x9809,
-	20611: 0x980A,
-	20612: 0x980B,
-	20613: 0x980C,
-	20614: 0x980D,
-	20615: 0x980E,
-	20616: 0x603C,
-	20617: 0x605D,
-	20618: 0x605A,
-	20619: 0x6067,
-	20620: 0x6041,
-	20621: 0x6059,
-	20622: 0x6063,
-	20623: 0x60AB,
-	20624: 0x6106,
-	20625: 0x610D,
-	20626: 0x615D,
-	20627: 0x61A9,
-	20628: 0x619D,
-	20629: 0x61CB,
-	20630: 0x61D1,
-	20631: 0x6206,
-	20632: 0x8080,
-	20633: 0x807F,
-	20634: 0x6C93,
-	20635: 0x6CF6,
-	20636: 0x6DFC,
-	20637: 0x77F6,
-	20638: 0x77F8,
-	20639: 0x7800,
-	20640: 0x7809,
-	20641: 0x7817,
-	20642: 0x7818,
-	20643: 0x7811,
-	20644: 0x65AB,
-	20645: 0x782D,
-	20646: 0x781C,
-	20647: 0x781D,
-	20648: 0x7839,
-	20649: 0x783A,
-	20650: 0x783B,
-	20651: 0x781F,
-	20652: 0x783C,
-	20653: 0x7825,
-	20654: 0x782C,
-	20655: 0x7823,
-	20656: 0x7829,
-	20657: 0x784E,
-	20658: 0x786D,
-	20659: 0x7856,
-	20660: 0x7857,
-	20661: 0x7826,
-	20662: 0x7850,
-	20663: 0x7847,
-	20664: 0x784C,
-	20665: 0x786A,
-	20666: 0x789B,
-	20667: 0x7893,
-	20668: 0x789A,
-	20669: 0x7887,
-	20670: 0x789C,
-	20671: 0x78A1,
-	20672: 0x78A3,
-	20673: 0x78B2,
-	20674: 0x78B9,
-	20675: 0x78A5,
-	20676: 0x78D4,
-	20677: 0x78D9,
-	20678: 0x78C9,
-	20679: 0x78EC,
-	20680: 0x78F2,
-	20681: 0x7905,
-	20682: 0x78F4,
-	20683: 0x7913,
-	20684: 0x7924,
-	20685: 0x791E,
-	20686: 0x7934,
-	20687: 0x9F9B,
-	20688: 0x9EF9,
-	20689: 0x9EFB,
-	20690: 0x9EFC,
-	20691: 0x76F1,
-	20692: 0x7704,
-	20693: 0x770D,
-	20694: 0x76F9,
-	20695: 0x7707,
-	20696: 0x7708,
-	20697: 0x771A,
-	20698: 0x7722,
-	20699: 0x7719,
-	20700: 0x772D,
-	20701: 0x7726,
-	20702: 0x7735,
-	20703: 0x7738,
-	20704: 0x7750,
-	20705: 0x7751,
-	20706: 0x7747,
-	20707: 0x7743,
-	20708: 0x775A,
-	20709: 0x7768,
-	20710: 0x980F,
-	20711: 0x9810,
-	20712: 0x9811,
-	20713: 0x9812,
-	20714: 0x9813,
-	20715: 0x9814,
-	20716: 0x9815,
-	20717: 0x9816,
-	20718: 0x9817,
-	20719: 0x9818,
-	20720: 0x9819,
-	20721: 0x981A,
-	20722: 0x981B,
-	20723: 0x981C,
-	20724: 0x981D,
-	20725: 0x981E,
-	20726: 0x981F,
-	20727: 0x9820,
-	20728: 0x9821,
-	20729: 0x9822,
-	20730: 0x9823,
-	20731: 0x9824,
-	20732: 0x9825,
-	20733: 0x9826,
-	20734: 0x9827,
-	20735: 0x9828,
-	20736: 0x9829,
-	20737: 0x982A,
-	20738: 0x982B,
-	20739: 0x982C,
-	20740: 0x982D,
-	20741: 0x982E,
-	20742: 0x982F,
-	20743: 0x9830,
-	20744: 0x9831,
-	20745: 0x9832,
-	20746: 0x9833,
-	20747: 0x9834,
-	20748: 0x9835,
-	20749: 0x9836,
-	20750: 0x9837,
-	20751: 0x9838,
-	20752: 0x9839,
-	20753: 0x983A,
-	20754: 0x983B,
-	20755: 0x983C,
-	20756: 0x983D,
-	20757: 0x983E,
-	20758: 0x983F,
-	20759: 0x9840,
-	20760: 0x9841,
-	20761: 0x9842,
-	20762: 0x9843,
-	20763: 0x9844,
-	20764: 0x9845,
-	20765: 0x9846,
-	20766: 0x9847,
-	20767: 0x9848,
-	20768: 0x9849,
-	20769: 0x984A,
-	20770: 0x984B,
-	20771: 0x984C,
-	20772: 0x984D,
-	20773: 0x984E,
-	20774: 0x984F,
-	20775: 0x9850,
-	20776: 0x9851,
-	20777: 0x9852,
-	20778: 0x9853,
-	20779: 0x9854,
-	20780: 0x9855,
-	20781: 0x9856,
-	20782: 0x9857,
-	20783: 0x9858,
-	20784: 0x9859,
-	20785: 0x985A,
-	20786: 0x985B,
-	20787: 0x985C,
-	20788: 0x985D,
-	20789: 0x985E,
-	20790: 0x985F,
-	20791: 0x9860,
-	20792: 0x9861,
-	20793: 0x9862,
-	20794: 0x9863,
-	20795: 0x9864,
-	20796: 0x9865,
-	20797: 0x9866,
-	20798: 0x9867,
-	20799: 0x9868,
-	20800: 0x9869,
-	20801: 0x986A,
-	20802: 0x986B,
-	20803: 0x986C,
-	20804: 0x986D,
-	20805: 0x986E,
-	20806: 0x7762,
-	20807: 0x7765,
-	20808: 0x777F,
-	20809: 0x778D,
-	20810: 0x777D,
-	20811: 0x7780,
-	20812: 0x778C,
-	20813: 0x7791,
-	20814: 0x779F,
-	20815: 0x77A0,
-	20816: 0x77B0,
-	20817: 0x77B5,
-	20818: 0x77BD,
-	20819: 0x753A,
-	20820: 0x7540,
-	20821: 0x754E,
-	20822: 0x754B,
-	20823: 0x7548,
-	20824: 0x755B,
-	20825: 0x7572,
-	20826: 0x7579,
-	20827: 0x7583,
-	20828: 0x7F58,
-	20829: 0x7F61,
-	20830: 0x7F5F,
-	20831: 0x8A48,
-	20832: 0x7F68,
-	20833: 0x7F74,
-	20834: 0x7F71,
-	20835: 0x7F79,
-	20836: 0x7F81,
-	20837: 0x7F7E,
-	20838: 0x76CD,
-	20839: 0x76E5,
-	20840: 0x8832,
-	20841: 0x9485,
-	20842: 0x9486,
-	20843: 0x9487,
-	20844: 0x948B,
-	20845: 0x948A,
-	20846: 0x948C,
-	20847: 0x948D,
-	20848: 0x948F,
-	20849: 0x9490,
-	20850: 0x9494,
-	20851: 0x9497,
-	20852: 0x9495,
-	20853: 0x949A,
-	20854: 0x949B,
-	20855: 0x949C,
-	20856: 0x94A3,
-	20857: 0x94A4,
-	20858: 0x94AB,
-	20859: 0x94AA,
-	20860: 0x94AD,
-	20861: 0x94AC,
-	20862: 0x94AF,
-	20863: 0x94B0,
-	20864: 0x94B2,
-	20865: 0x94B4,
-	20866: 0x94B6,
-	20867: 0x94B7,
-	20868: 0x94B8,
-	20869: 0x94B9,
-	20870: 0x94BA,
-	20871: 0x94BC,
-	20872: 0x94BD,
-	20873: 0x94BF,
-	20874: 0x94C4,
-	20875: 0x94C8,
-	20876: 0x94C9,
-	20877: 0x94CA,
-	20878: 0x94CB,
-	20879: 0x94CC,
-	20880: 0x94CD,
-	20881: 0x94CE,
-	20882: 0x94D0,
-	20883: 0x94D1,
-	20884: 0x94D2,
-	20885: 0x94D5,
-	20886: 0x94D6,
-	20887: 0x94D7,
-	20888: 0x94D9,
-	20889: 0x94D8,
-	20890: 0x94DB,
-	20891: 0x94DE,
-	20892: 0x94DF,
-	20893: 0x94E0,
-	20894: 0x94E2,
-	20895: 0x94E4,
-	20896: 0x94E5,
-	20897: 0x94E7,
-	20898: 0x94E8,
-	20899: 0x94EA,
-	20900: 0x986F,
-	20901: 0x9870,
-	20902: 0x9871,
-	20903: 0x9872,
-	20904: 0x9873,
-	20905: 0x9874,
-	20906: 0x988B,
-	20907: 0x988E,
-	20908: 0x9892,
-	20909: 0x9895,
-	20910: 0x9899,
-	20911: 0x98A3,
-	20912: 0x98A8,
-	20913: 0x98A9,
-	20914: 0x98AA,
-	20915: 0x98AB,
-	20916: 0x98AC,
-	20917: 0x98AD,
-	20918: 0x98AE,
-	20919: 0x98AF,
-	20920: 0x98B0,
-	20921: 0x98B1,
-	20922: 0x98B2,
-	20923: 0x98B3,
-	20924: 0x98B4,
-	20925: 0x98B5,
-	20926: 0x98B6,
-	20927: 0x98B7,
-	20928: 0x98B8,
-	20929: 0x98B9,
-	20930: 0x98BA,
-	20931: 0x98BB,
-	20932: 0x98BC,
-	20933: 0x98BD,
-	20934: 0x98BE,
-	20935: 0x98BF,
-	20936: 0x98C0,
-	20937: 0x98C1,
-	20938: 0x98C2,
-	20939: 0x98C3,
-	20940: 0x98C4,
-	20941: 0x98C5,
-	20942: 0x98C6,
-	20943: 0x98C7,
-	20944: 0x98C8,
-	20945: 0x98C9,
-	20946: 0x98CA,
-	20947: 0x98CB,
-	20948: 0x98CC,
-	20949: 0x98CD,
-	20950: 0x98CF,
-	20951: 0x98D0,
-	20952: 0x98D4,
-	20953: 0x98D6,
-	20954: 0x98D7,
-	20955: 0x98DB,
-	20956: 0x98DC,
-	20957: 0x98DD,
-	20958: 0x98E0,
-	20959: 0x98E1,
-	20960: 0x98E2,
-	20961: 0x98E3,
-	20962: 0x98E4,
-	20963: 0x98E5,
-	20964: 0x98E6,
-	20965: 0x98E9,
-	20966: 0x98EA,
-	20967: 0x98EB,
-	20968: 0x98EC,
-	20969: 0x98ED,
-	20970: 0x98EE,
-	20971: 0x98EF,
-	20972: 0x98F0,
-	20973: 0x98F1,
-	20974: 0x98F2,
-	20975: 0x98F3,
-	20976: 0x98F4,
-	20977: 0x98F5,
-	20978: 0x98F6,
-	20979: 0x98F7,
-	20980: 0x98F8,
-	20981: 0x98F9,
-	20982: 0x98FA,
-	20983: 0x98FB,
-	20984: 0x98FC,
-	20985: 0x98FD,
-	20986: 0x98FE,
-	20987: 0x98FF,
-	20988: 0x9900,
-	20989: 0x9901,
-	20990: 0x9902,
-	20991: 0x9903,
-	20992: 0x9904,
-	20993: 0x9905,
-	20994: 0x9906,
-	20995: 0x9907,
-	20996: 0x94E9,
-	20997: 0x94EB,
-	20998: 0x94EE,
-	20999: 0x94EF,
-	21000: 0x94F3,
-	21001: 0x94F4,
-	21002: 0x94F5,
-	21003: 0x94F7,
-	21004: 0x94F9,
-	21005: 0x94FC,
-	21006: 0x94FD,
-	21007: 0x94FF,
-	21008: 0x9503,
-	21009: 0x9502,
-	21010: 0x9506,
-	21011: 0x9507,
-	21012: 0x9509,
-	21013: 0x950A,
-	21014: 0x950D,
-	21015: 0x950E,
-	21016: 0x950F,
-	21017: 0x9512,
-	21018: 0x9513,
-	21019: 0x9514,
-	21020: 0x9515,
-	21021: 0x9516,
-	21022: 0x9518,
-	21023: 0x951B,
-	21024: 0x951D,
-	21025: 0x951E,
-	21026: 0x951F,
-	21027: 0x9522,
-	21028: 0x952A,
-	21029: 0x952B,
-	21030: 0x9529,
-	21031: 0x952C,
-	21032: 0x9531,
-	21033: 0x9532,
-	21034: 0x9534,
-	21035: 0x9536,
-	21036: 0x9537,
-	21037: 0x9538,
-	21038: 0x953C,
-	21039: 0x953E,
-	21040: 0x953F,
-	21041: 0x9542,
-	21042: 0x9535,
-	21043: 0x9544,
-	21044: 0x9545,
-	21045: 0x9546,
-	21046: 0x9549,
-	21047: 0x954C,
-	21048: 0x954E,
-	21049: 0x954F,
-	21050: 0x9552,
-	21051: 0x9553,
-	21052: 0x9554,
-	21053: 0x9556,
-	21054: 0x9557,
-	21055: 0x9558,
-	21056: 0x9559,
-	21057: 0x955B,
-	21058: 0x955E,
-	21059: 0x955F,
-	21060: 0x955D,
-	21061: 0x9561,
-	21062: 0x9562,
-	21063: 0x9564,
-	21064: 0x9565,
-	21065: 0x9566,
-	21066: 0x9567,
-	21067: 0x9568,
-	21068: 0x9569,
-	21069: 0x956A,
-	21070: 0x956B,
-	21071: 0x956C,
-	21072: 0x956F,
-	21073: 0x9571,
-	21074: 0x9572,
-	21075: 0x9573,
-	21076: 0x953A,
-	21077: 0x77E7,
-	21078: 0x77EC,
-	21079: 0x96C9,
-	21080: 0x79D5,
-	21081: 0x79ED,
-	21082: 0x79E3,
-	21083: 0x79EB,
-	21084: 0x7A06,
-	21085: 0x5D47,
-	21086: 0x7A03,
-	21087: 0x7A02,
-	21088: 0x7A1E,
-	21089: 0x7A14,
-	21090: 0x9908,
-	21091: 0x9909,
-	21092: 0x990A,
-	21093: 0x990B,
-	21094: 0x990C,
-	21095: 0x990E,
-	21096: 0x990F,
-	21097: 0x9911,
-	21098: 0x9912,
-	21099: 0x9913,
-	21100: 0x9914,
-	21101: 0x9915,
-	21102: 0x9916,
-	21103: 0x9917,
-	21104: 0x9918,
-	21105: 0x9919,
-	21106: 0x991A,
-	21107: 0x991B,
-	21108: 0x991C,
-	21109: 0x991D,
-	21110: 0x991E,
-	21111: 0x991F,
-	21112: 0x9920,
-	21113: 0x9921,
-	21114: 0x9922,
-	21115: 0x9923,
-	21116: 0x9924,
-	21117: 0x9925,
-	21118: 0x9926,
-	21119: 0x9927,
-	21120: 0x9928,
-	21121: 0x9929,
-	21122: 0x992A,
-	21123: 0x992B,
-	21124: 0x992C,
-	21125: 0x992D,
-	21126: 0x992F,
-	21127: 0x9930,
-	21128: 0x9931,
-	21129: 0x9932,
-	21130: 0x9933,
-	21131: 0x9934,
-	21132: 0x9935,
-	21133: 0x9936,
-	21134: 0x9937,
-	21135: 0x9938,
-	21136: 0x9939,
-	21137: 0x993A,
-	21138: 0x993B,
-	21139: 0x993C,
-	21140: 0x993D,
-	21141: 0x993E,
-	21142: 0x993F,
-	21143: 0x9940,
-	21144: 0x9941,
-	21145: 0x9942,
-	21146: 0x9943,
-	21147: 0x9944,
-	21148: 0x9945,
-	21149: 0x9946,
-	21150: 0x9947,
-	21151: 0x9948,
-	21152: 0x9949,
-	21153: 0x994A,
-	21154: 0x994B,
-	21155: 0x994C,
-	21156: 0x994D,
-	21157: 0x994E,
-	21158: 0x994F,
-	21159: 0x9950,
-	21160: 0x9951,
-	21161: 0x9952,
-	21162: 0x9953,
-	21163: 0x9956,
-	21164: 0x9957,
-	21165: 0x9958,
-	21166: 0x9959,
-	21167: 0x995A,
-	21168: 0x995B,
-	21169: 0x995C,
-	21170: 0x995D,
-	21171: 0x995E,
-	21172: 0x995F,
-	21173: 0x9960,
-	21174: 0x9961,
-	21175: 0x9962,
-	21176: 0x9964,
-	21177: 0x9966,
-	21178: 0x9973,
-	21179: 0x9978,
-	21180: 0x9979,
-	21181: 0x997B,
-	21182: 0x997E,
-	21183: 0x9982,
-	21184: 0x9983,
-	21185: 0x9989,
-	21186: 0x7A39,
-	21187: 0x7A37,
-	21188: 0x7A51,
-	21189: 0x9ECF,
-	21190: 0x99A5,
-	21191: 0x7A70,
-	21192: 0x7688,
-	21193: 0x768E,
-	21194: 0x7693,
-	21195: 0x7699,
-	21196: 0x76A4,
-	21197: 0x74DE,
-	21198: 0x74E0,
-	21199: 0x752C,
-	21200: 0x9E20,
-	21201: 0x9E22,
-	21202: 0x9E28,
-	21203: 0x9E29,
-	21204: 0x9E2A,
-	21205: 0x9E2B,
-	21206: 0x9E2C,
-	21207: 0x9E32,
-	21208: 0x9E31,
-	21209: 0x9E36,
-	21210: 0x9E38,
-	21211: 0x9E37,
-	21212: 0x9E39,
-	21213: 0x9E3A,
-	21214: 0x9E3E,
-	21215: 0x9E41,
-	21216: 0x9E42,
-	21217: 0x9E44,
-	21218: 0x9E46,
-	21219: 0x9E47,
-	21220: 0x9E48,
-	21221: 0x9E49,
-	21222: 0x9E4B,
-	21223: 0x9E4C,
-	21224: 0x9E4E,
-	21225: 0x9E51,
-	21226: 0x9E55,
-	21227: 0x9E57,
-	21228: 0x9E5A,
-	21229: 0x9E5B,
-	21230: 0x9E5C,
-	21231: 0x9E5E,
-	21232: 0x9E63,
-	21233: 0x9E66,
-	21234: 0x9E67,
-	21235: 0x9E68,
-	21236: 0x9E69,
-	21237: 0x9E6A,
-	21238: 0x9E6B,
-	21239: 0x9E6C,
-	21240: 0x9E71,
-	21241: 0x9E6D,
-	21242: 0x9E73,
-	21243: 0x7592,
-	21244: 0x7594,
-	21245: 0x7596,
-	21246: 0x75A0,
-	21247: 0x759D,
-	21248: 0x75AC,
-	21249: 0x75A3,
-	21250: 0x75B3,
-	21251: 0x75B4,
-	21252: 0x75B8,
-	21253: 0x75C4,
-	21254: 0x75B1,
-	21255: 0x75B0,
-	21256: 0x75C3,
-	21257: 0x75C2,
-	21258: 0x75D6,
-	21259: 0x75CD,
-	21260: 0x75E3,
-	21261: 0x75E8,
-	21262: 0x75E6,
-	21263: 0x75E4,
-	21264: 0x75EB,
-	21265: 0x75E7,
-	21266: 0x7603,
-	21267: 0x75F1,
-	21268: 0x75FC,
-	21269: 0x75FF,
-	21270: 0x7610,
-	21271: 0x7600,
-	21272: 0x7605,
-	21273: 0x760C,
-	21274: 0x7617,
-	21275: 0x760A,
-	21276: 0x7625,
-	21277: 0x7618,
-	21278: 0x7615,
-	21279: 0x7619,
-	21280: 0x998C,
-	21281: 0x998E,
-	21282: 0x999A,
-	21283: 0x999B,
-	21284: 0x999C,
-	21285: 0x999D,
-	21286: 0x999E,
-	21287: 0x999F,
-	21288: 0x99A0,
-	21289: 0x99A1,
-	21290: 0x99A2,
-	21291: 0x99A3,
-	21292: 0x99A4,
-	21293: 0x99A6,
-	21294: 0x99A7,
-	21295: 0x99A9,
-	21296: 0x99AA,
-	21297: 0x99AB,
-	21298: 0x99AC,
-	21299: 0x99AD,
-	21300: 0x99AE,
-	21301: 0x99AF,
-	21302: 0x99B0,
-	21303: 0x99B1,
-	21304: 0x99B2,
-	21305: 0x99B3,
-	21306: 0x99B4,
-	21307: 0x99B5,
-	21308: 0x99B6,
-	21309: 0x99B7,
-	21310: 0x99B8,
-	21311: 0x99B9,
-	21312: 0x99BA,
-	21313: 0x99BB,
-	21314: 0x99BC,
-	21315: 0x99BD,
-	21316: 0x99BE,
-	21317: 0x99BF,
-	21318: 0x99C0,
-	21319: 0x99C1,
-	21320: 0x99C2,
-	21321: 0x99C3,
-	21322: 0x99C4,
-	21323: 0x99C5,
-	21324: 0x99C6,
-	21325: 0x99C7,
-	21326: 0x99C8,
-	21327: 0x99C9,
-	21328: 0x99CA,
-	21329: 0x99CB,
-	21330: 0x99CC,
-	21331: 0x99CD,
-	21332: 0x99CE,
-	21333: 0x99CF,
-	21334: 0x99D0,
-	21335: 0x99D1,
-	21336: 0x99D2,
-	21337: 0x99D3,
-	21338: 0x99D4,
-	21339: 0x99D5,
-	21340: 0x99D6,
-	21341: 0x99D7,
-	21342: 0x99D8,
-	21343: 0x99D9,
-	21344: 0x99DA,
-	21345: 0x99DB,
-	21346: 0x99DC,
-	21347: 0x99DD,
-	21348: 0x99DE,
-	21349: 0x99DF,
-	21350: 0x99E0,
-	21351: 0x99E1,
-	21352: 0x99E2,
-	21353: 0x99E3,
-	21354: 0x99E4,
-	21355: 0x99E5,
-	21356: 0x99E6,
-	21357: 0x99E7,
-	21358: 0x99E8,
-	21359: 0x99E9,
-	21360: 0x99EA,
-	21361: 0x99EB,
-	21362: 0x99EC,
-	21363: 0x99ED,
-	21364: 0x99EE,
-	21365: 0x99EF,
-	21366: 0x99F0,
-	21367: 0x99F1,
-	21368: 0x99F2,
-	21369: 0x99F3,
-	21370: 0x99F4,
-	21371: 0x99F5,
-	21372: 0x99F6,
-	21373: 0x99F7,
-	21374: 0x99F8,
-	21375: 0x99F9,
-	21376: 0x761B,
-	21377: 0x763C,
-	21378: 0x7622,
-	21379: 0x7620,
-	21380: 0x7640,
-	21381: 0x762D,
-	21382: 0x7630,
-	21383: 0x763F,
-	21384: 0x7635,
-	21385: 0x7643,
-	21386: 0x763E,
-	21387: 0x7633,
-	21388: 0x764D,
-	21389: 0x765E,
-	21390: 0x7654,
-	21391: 0x765C,
-	21392: 0x7656,
-	21393: 0x766B,
-	21394: 0x766F,
-	21395: 0x7FCA,
-	21396: 0x7AE6,
-	21397: 0x7A78,
-	21398: 0x7A79,
-	21399: 0x7A80,
-	21400: 0x7A86,
-	21401: 0x7A88,
-	21402: 0x7A95,
-	21403: 0x7AA6,
-	21404: 0x7AA0,
-	21405: 0x7AAC,
-	21406: 0x7AA8,
-	21407: 0x7AAD,
-	21408: 0x7AB3,
-	21409: 0x8864,
-	21410: 0x8869,
-	21411: 0x8872,
-	21412: 0x887D,
-	21413: 0x887F,
-	21414: 0x8882,
-	21415: 0x88A2,
-	21416: 0x88C6,
-	21417: 0x88B7,
-	21418: 0x88BC,
-	21419: 0x88C9,
-	21420: 0x88E2,
-	21421: 0x88CE,
-	21422: 0x88E3,
-	21423: 0x88E5,
-	21424: 0x88F1,
-	21425: 0x891A,
-	21426: 0x88FC,
-	21427: 0x88E8,
-	21428: 0x88FE,
-	21429: 0x88F0,
-	21430: 0x8921,
-	21431: 0x8919,
-	21432: 0x8913,
-	21433: 0x891B,
-	21434: 0x890A,
-	21435: 0x8934,
-	21436: 0x892B,
-	21437: 0x8936,
-	21438: 0x8941,
-	21439: 0x8966,
-	21440: 0x897B,
-	21441: 0x758B,
-	21442: 0x80E5,
-	21443: 0x76B2,
-	21444: 0x76B4,
-	21445: 0x77DC,
-	21446: 0x8012,
-	21447: 0x8014,
-	21448: 0x8016,
-	21449: 0x801C,
-	21450: 0x8020,
-	21451: 0x8022,
-	21452: 0x8025,
-	21453: 0x8026,
-	21454: 0x8027,
-	21455: 0x8029,
-	21456: 0x8028,
-	21457: 0x8031,
-	21458: 0x800B,
-	21459: 0x8035,
-	21460: 0x8043,
-	21461: 0x8046,
-	21462: 0x804D,
-	21463: 0x8052,
-	21464: 0x8069,
-	21465: 0x8071,
-	21466: 0x8983,
-	21467: 0x9878,
-	21468: 0x9880,
-	21469: 0x9883,
-	21470: 0x99FA,
-	21471: 0x99FB,
-	21472: 0x99FC,
-	21473: 0x99FD,
-	21474: 0x99FE,
-	21475: 0x99FF,
-	21476: 0x9A00,
-	21477: 0x9A01,
-	21478: 0x9A02,
-	21479: 0x9A03,
-	21480: 0x9A04,
-	21481: 0x9A05,
-	21482: 0x9A06,
-	21483: 0x9A07,
-	21484: 0x9A08,
-	21485: 0x9A09,
-	21486: 0x9A0A,
-	21487: 0x9A0B,
-	21488: 0x9A0C,
-	21489: 0x9A0D,
-	21490: 0x9A0E,
-	21491: 0x9A0F,
-	21492: 0x9A10,
-	21493: 0x9A11,
-	21494: 0x9A12,
-	21495: 0x9A13,
-	21496: 0x9A14,
-	21497: 0x9A15,
-	21498: 0x9A16,
-	21499: 0x9A17,
-	21500: 0x9A18,
-	21501: 0x9A19,
-	21502: 0x9A1A,
-	21503: 0x9A1B,
-	21504: 0x9A1C,
-	21505: 0x9A1D,
-	21506: 0x9A1E,
-	21507: 0x9A1F,
-	21508: 0x9A20,
-	21509: 0x9A21,
-	21510: 0x9A22,
-	21511: 0x9A23,
-	21512: 0x9A24,
-	21513: 0x9A25,
-	21514: 0x9A26,
-	21515: 0x9A27,
-	21516: 0x9A28,
-	21517: 0x9A29,
-	21518: 0x9A2A,
-	21519: 0x9A2B,
-	21520: 0x9A2C,
-	21521: 0x9A2D,
-	21522: 0x9A2E,
-	21523: 0x9A2F,
-	21524: 0x9A30,
-	21525: 0x9A31,
-	21526: 0x9A32,
-	21527: 0x9A33,
-	21528: 0x9A34,
-	21529: 0x9A35,
-	21530: 0x9A36,
-	21531: 0x9A37,
-	21532: 0x9A38,
-	21533: 0x9A39,
-	21534: 0x9A3A,
-	21535: 0x9A3B,
-	21536: 0x9A3C,
-	21537: 0x9A3D,
-	21538: 0x9A3E,
-	21539: 0x9A3F,
-	21540: 0x9A40,
-	21541: 0x9A41,
-	21542: 0x9A42,
-	21543: 0x9A43,
-	21544: 0x9A44,
-	21545: 0x9A45,
-	21546: 0x9A46,
-	21547: 0x9A47,
-	21548: 0x9A48,
-	21549: 0x9A49,
-	21550: 0x9A4A,
-	21551: 0x9A4B,
-	21552: 0x9A4C,
-	21553: 0x9A4D,
-	21554: 0x9A4E,
-	21555: 0x9A4F,
-	21556: 0x9A50,
-	21557: 0x9A51,
-	21558: 0x9A52,
-	21559: 0x9A53,
-	21560: 0x9A54,
-	21561: 0x9A55,
-	21562: 0x9A56,
-	21563: 0x9A57,
-	21564: 0x9A58,
-	21565: 0x9A59,
-	21566: 0x9889,
-	21567: 0x988C,
-	21568: 0x988D,
-	21569: 0x988F,
-	21570: 0x9894,
-	21571: 0x989A,
-	21572: 0x989B,
-	21573: 0x989E,
-	21574: 0x989F,
-	21575: 0x98A1,
-	21576: 0x98A2,
-	21577: 0x98A5,
-	21578: 0x98A6,
-	21579: 0x864D,
-	21580: 0x8654,
-	21581: 0x866C,
-	21582: 0x866E,
-	21583: 0x867F,
-	21584: 0x867A,
-	21585: 0x867C,
-	21586: 0x867B,
-	21587: 0x86A8,
-	21588: 0x868D,
-	21589: 0x868B,
-	21590: 0x86AC,
-	21591: 0x869D,
-	21592: 0x86A7,
-	21593: 0x86A3,
-	21594: 0x86AA,
-	21595: 0x8693,
-	21596: 0x86A9,
-	21597: 0x86B6,
-	21598: 0x86C4,
-	21599: 0x86B5,
-	21600: 0x86CE,
-	21601: 0x86B0,
-	21602: 0x86BA,
-	21603: 0x86B1,
-	21604: 0x86AF,
-	21605: 0x86C9,
-	21606: 0x86CF,
-	21607: 0x86B4,
-	21608: 0x86E9,
-	21609: 0x86F1,
-	21610: 0x86F2,
-	21611: 0x86ED,
-	21612: 0x86F3,
-	21613: 0x86D0,
-	21614: 0x8713,
-	21615: 0x86DE,
-	21616: 0x86F4,
-	21617: 0x86DF,
-	21618: 0x86D8,
-	21619: 0x86D1,
-	21620: 0x8703,
-	21621: 0x8707,
-	21622: 0x86F8,
-	21623: 0x8708,
-	21624: 0x870A,
-	21625: 0x870D,
-	21626: 0x8709,
-	21627: 0x8723,
-	21628: 0x873B,
-	21629: 0x871E,
-	21630: 0x8725,
-	21631: 0x872E,
-	21632: 0x871A,
-	21633: 0x873E,
-	21634: 0x8748,
-	21635: 0x8734,
-	21636: 0x8731,
-	21637: 0x8729,
-	21638: 0x8737,
-	21639: 0x873F,
-	21640: 0x8782,
-	21641: 0x8722,
-	21642: 0x877D,
-	21643: 0x877E,
-	21644: 0x877B,
-	21645: 0x8760,
-	21646: 0x8770,
-	21647: 0x874C,
-	21648: 0x876E,
-	21649: 0x878B,
-	21650: 0x8753,
-	21651: 0x8763,
-	21652: 0x877C,
-	21653: 0x8764,
-	21654: 0x8759,
-	21655: 0x8765,
-	21656: 0x8793,
-	21657: 0x87AF,
-	21658: 0x87A8,
-	21659: 0x87D2,
-	21660: 0x9A5A,
-	21661: 0x9A5B,
-	21662: 0x9A5C,
-	21663: 0x9A5D,
-	21664: 0x9A5E,
-	21665: 0x9A5F,
-	21666: 0x9A60,
-	21667: 0x9A61,
-	21668: 0x9A62,
-	21669: 0x9A63,
-	21670: 0x9A64,
-	21671: 0x9A65,
-	21672: 0x9A66,
-	21673: 0x9A67,
-	21674: 0x9A68,
-	21675: 0x9A69,
-	21676: 0x9A6A,
-	21677: 0x9A6B,
-	21678: 0x9A72,
-	21679: 0x9A83,
-	21680: 0x9A89,
-	21681: 0x9A8D,
-	21682: 0x9A8E,
-	21683: 0x9A94,
-	21684: 0x9A95,
-	21685: 0x9A99,
-	21686: 0x9AA6,
-	21687: 0x9AA9,
-	21688: 0x9AAA,
-	21689: 0x9AAB,
-	21690: 0x9AAC,
-	21691: 0x9AAD,
-	21692: 0x9AAE,
-	21693: 0x9AAF,
-	21694: 0x9AB2,
-	21695: 0x9AB3,
-	21696: 0x9AB4,
-	21697: 0x9AB5,
-	21698: 0x9AB9,
-	21699: 0x9ABB,
-	21700: 0x9ABD,
-	21701: 0x9ABE,
-	21702: 0x9ABF,
-	21703: 0x9AC3,
-	21704: 0x9AC4,
-	21705: 0x9AC6,
-	21706: 0x9AC7,
-	21707: 0x9AC8,
-	21708: 0x9AC9,
-	21709: 0x9ACA,
-	21710: 0x9ACD,
-	21711: 0x9ACE,
-	21712: 0x9ACF,
-	21713: 0x9AD0,
-	21714: 0x9AD2,
-	21715: 0x9AD4,
-	21716: 0x9AD5,
-	21717: 0x9AD6,
-	21718: 0x9AD7,
-	21719: 0x9AD9,
-	21720: 0x9ADA,
-	21721: 0x9ADB,
-	21722: 0x9ADC,
-	21723: 0x9ADD,
-	21724: 0x9ADE,
-	21725: 0x9AE0,
-	21726: 0x9AE2,
-	21727: 0x9AE3,
-	21728: 0x9AE4,
-	21729: 0x9AE5,
-	21730: 0x9AE7,
-	21731: 0x9AE8,
-	21732: 0x9AE9,
-	21733: 0x9AEA,
-	21734: 0x9AEC,
-	21735: 0x9AEE,
-	21736: 0x9AF0,
-	21737: 0x9AF1,
-	21738: 0x9AF2,
-	21739: 0x9AF3,
-	21740: 0x9AF4,
-	21741: 0x9AF5,
-	21742: 0x9AF6,
-	21743: 0x9AF7,
-	21744: 0x9AF8,
-	21745: 0x9AFA,
-	21746: 0x9AFC,
-	21747: 0x9AFD,
-	21748: 0x9AFE,
-	21749: 0x9AFF,
-	21750: 0x9B00,
-	21751: 0x9B01,
-	21752: 0x9B02,
-	21753: 0x9B04,
-	21754: 0x9B05,
-	21755: 0x9B06,
-	21756: 0x87C6,
-	21757: 0x8788,
-	21758: 0x8785,
-	21759: 0x87AD,
-	21760: 0x8797,
-	21761: 0x8783,
-	21762: 0x87AB,
-	21763: 0x87E5,
-	21764: 0x87AC,
-	21765: 0x87B5,
-	21766: 0x87B3,
-	21767: 0x87CB,
-	21768: 0x87D3,
-	21769: 0x87BD,
-	21770: 0x87D1,
-	21771: 0x87C0,
-	21772: 0x87CA,
-	21773: 0x87DB,
-	21774: 0x87EA,
-	21775: 0x87E0,
-	21776: 0x87EE,
-	21777: 0x8816,
-	21778: 0x8813,
-	21779: 0x87FE,
-	21780: 0x880A,
-	21781: 0x881B,
-	21782: 0x8821,
-	21783: 0x8839,
-	21784: 0x883C,
-	21785: 0x7F36,
-	21786: 0x7F42,
-	21787: 0x7F44,
-	21788: 0x7F45,
-	21789: 0x8210,
-	21790: 0x7AFA,
-	21791: 0x7AFD,
-	21792: 0x7B08,
-	21793: 0x7B03,
-	21794: 0x7B04,
-	21795: 0x7B15,
-	21796: 0x7B0A,
-	21797: 0x7B2B,
-	21798: 0x7B0F,
-	21799: 0x7B47,
-	21800: 0x7B38,
-	21801: 0x7B2A,
-	21802: 0x7B19,
-	21803: 0x7B2E,
-	21804: 0x7B31,
-	21805: 0x7B20,
-	21806: 0x7B25,
-	21807: 0x7B24,
-	21808: 0x7B33,
-	21809: 0x7B3E,
-	21810: 0x7B1E,
-	21811: 0x7B58,
-	21812: 0x7B5A,
-	21813: 0x7B45,
-	21814: 0x7B75,
-	21815: 0x7B4C,
-	21816: 0x7B5D,
-	21817: 0x7B60,
-	21818: 0x7B6E,
-	21819: 0x7B7B,
-	21820: 0x7B62,
-	21821: 0x7B72,
-	21822: 0x7B71,
-	21823: 0x7B90,
-	21824: 0x7BA6,
-	21825: 0x7BA7,
-	21826: 0x7BB8,
-	21827: 0x7BAC,
-	21828: 0x7B9D,
-	21829: 0x7BA8,
-	21830: 0x7B85,
-	21831: 0x7BAA,
-	21832: 0x7B9C,
-	21833: 0x7BA2,
-	21834: 0x7BAB,
-	21835: 0x7BB4,
-	21836: 0x7BD1,
-	21837: 0x7BC1,
-	21838: 0x7BCC,
-	21839: 0x7BDD,
-	21840: 0x7BDA,
-	21841: 0x7BE5,
-	21842: 0x7BE6,
-	21843: 0x7BEA,
-	21844: 0x7C0C,
-	21845: 0x7BFE,
-	21846: 0x7BFC,
-	21847: 0x7C0F,
-	21848: 0x7C16,
-	21849: 0x7C0B,
-	21850: 0x9B07,
-	21851: 0x9B09,
-	21852: 0x9B0A,
-	21853: 0x9B0B,
-	21854: 0x9B0C,
-	21855: 0x9B0D,
-	21856: 0x9B0E,
-	21857: 0x9B10,
-	21858: 0x9B11,
-	21859: 0x9B12,
-	21860: 0x9B14,
-	21861: 0x9B15,
-	21862: 0x9B16,
-	21863: 0x9B17,
-	21864: 0x9B18,
-	21865: 0x9B19,
-	21866: 0x9B1A,
-	21867: 0x9B1B,
-	21868: 0x9B1C,
-	21869: 0x9B1D,
-	21870: 0x9B1E,
-	21871: 0x9B20,
-	21872: 0x9B21,
-	21873: 0x9B22,
-	21874: 0x9B24,
-	21875: 0x9B25,
-	21876: 0x9B26,
-	21877: 0x9B27,
-	21878: 0x9B28,
-	21879: 0x9B29,
-	21880: 0x9B2A,
-	21881: 0x9B2B,
-	21882: 0x9B2C,
-	21883: 0x9B2D,
-	21884: 0x9B2E,
-	21885: 0x9B30,
-	21886: 0x9B31,
-	21887: 0x9B33,
-	21888: 0x9B34,
-	21889: 0x9B35,
-	21890: 0x9B36,
-	21891: 0x9B37,
-	21892: 0x9B38,
-	21893: 0x9B39,
-	21894: 0x9B3A,
-	21895: 0x9B3D,
-	21896: 0x9B3E,
-	21897: 0x9B3F,
-	21898: 0x9B40,
-	21899: 0x9B46,
-	21900: 0x9B4A,
-	21901: 0x9B4B,
-	21902: 0x9B4C,
-	21903: 0x9B4E,
-	21904: 0x9B50,
-	21905: 0x9B52,
-	21906: 0x9B53,
-	21907: 0x9B55,
-	21908: 0x9B56,
-	21909: 0x9B57,
-	21910: 0x9B58,
-	21911: 0x9B59,
-	21912: 0x9B5A,
-	21913: 0x9B5B,
-	21914: 0x9B5C,
-	21915: 0x9B5D,
-	21916: 0x9B5E,
-	21917: 0x9B5F,
-	21918: 0x9B60,
-	21919: 0x9B61,
-	21920: 0x9B62,
-	21921: 0x9B63,
-	21922: 0x9B64,
-	21923: 0x9B65,
-	21924: 0x9B66,
-	21925: 0x9B67,
-	21926: 0x9B68,
-	21927: 0x9B69,
-	21928: 0x9B6A,
-	21929: 0x9B6B,
-	21930: 0x9B6C,
-	21931: 0x9B6D,
-	21932: 0x9B6E,
-	21933: 0x9B6F,
-	21934: 0x9B70,
-	21935: 0x9B71,
-	21936: 0x9B72,
-	21937: 0x9B73,
-	21938: 0x9B74,
-	21939: 0x9B75,
-	21940: 0x9B76,
-	21941: 0x9B77,
-	21942: 0x9B78,
-	21943: 0x9B79,
-	21944: 0x9B7A,
-	21945: 0x9B7B,
-	21946: 0x7C1F,
-	21947: 0x7C2A,
-	21948: 0x7C26,
-	21949: 0x7C38,
-	21950: 0x7C41,
-	21951: 0x7C40,
-	21952: 0x81FE,
-	21953: 0x8201,
-	21954: 0x8202,
-	21955: 0x8204,
-	21956: 0x81EC,
-	21957: 0x8844,
-	21958: 0x8221,
-	21959: 0x8222,
-	21960: 0x8223,
-	21961: 0x822D,
-	21962: 0x822F,
-	21963: 0x8228,
-	21964: 0x822B,
-	21965: 0x8238,
-	21966: 0x823B,
-	21967: 0x8233,
-	21968: 0x8234,
-	21969: 0x823E,
-	21970: 0x8244,
-	21971: 0x8249,
-	21972: 0x824B,
-	21973: 0x824F,
-	21974: 0x825A,
-	21975: 0x825F,
-	21976: 0x8268,
-	21977: 0x887E,
-	21978: 0x8885,
-	21979: 0x8888,
-	21980: 0x88D8,
-	21981: 0x88DF,
-	21982: 0x895E,
-	21983: 0x7F9D,
-	21984: 0x7F9F,
-	21985: 0x7FA7,
-	21986: 0x7FAF,
-	21987: 0x7FB0,
-	21988: 0x7FB2,
-	21989: 0x7C7C,
-	21990: 0x6549,
-	21991: 0x7C91,
-	21992: 0x7C9D,
-	21993: 0x7C9C,
-	21994: 0x7C9E,
-	21995: 0x7CA2,
-	21996: 0x7CB2,
-	21997: 0x7CBC,
-	21998: 0x7CBD,
-	21999: 0x7CC1,
-	22000: 0x7CC7,
-	22001: 0x7CCC,
-	22002: 0x7CCD,
-	22003: 0x7CC8,
-	22004: 0x7CC5,
-	22005: 0x7CD7,
-	22006: 0x7CE8,
-	22007: 0x826E,
-	22008: 0x66A8,
-	22009: 0x7FBF,
-	22010: 0x7FCE,
-	22011: 0x7FD5,
-	22012: 0x7FE5,
-	22013: 0x7FE1,
-	22014: 0x7FE6,
-	22015: 0x7FE9,
-	22016: 0x7FEE,
-	22017: 0x7FF3,
-	22018: 0x7CF8,
-	22019: 0x7D77,
-	22020: 0x7DA6,
-	22021: 0x7DAE,
-	22022: 0x7E47,
-	22023: 0x7E9B,
-	22024: 0x9EB8,
-	22025: 0x9EB4,
-	22026: 0x8D73,
-	22027: 0x8D84,
-	22028: 0x8D94,
-	22029: 0x8D91,
-	22030: 0x8DB1,
-	22031: 0x8D67,
-	22032: 0x8D6D,
-	22033: 0x8C47,
-	22034: 0x8C49,
-	22035: 0x914A,
-	22036: 0x9150,
-	22037: 0x914E,
-	22038: 0x914F,
-	22039: 0x9164,
-	22040: 0x9B7C,
-	22041: 0x9B7D,
-	22042: 0x9B7E,
-	22043: 0x9B7F,
-	22044: 0x9B80,
-	22045: 0x9B81,
-	22046: 0x9B82,
-	22047: 0x9B83,
-	22048: 0x9B84,
-	22049: 0x9B85,
-	22050: 0x9B86,
-	22051: 0x9B87,
-	22052: 0x9B88,
-	22053: 0x9B89,
-	22054: 0x9B8A,
-	22055: 0x9B8B,
-	22056: 0x9B8C,
-	22057: 0x9B8D,
-	22058: 0x9B8E,
-	22059: 0x9B8F,
-	22060: 0x9B90,
-	22061: 0x9B91,
-	22062: 0x9B92,
-	22063: 0x9B93,
-	22064: 0x9B94,
-	22065: 0x9B95,
-	22066: 0x9B96,
-	22067: 0x9B97,
-	22068: 0x9B98,
-	22069: 0x9B99,
-	22070: 0x9B9A,
-	22071: 0x9B9B,
-	22072: 0x9B9C,
-	22073: 0x9B9D,
-	22074: 0x9B9E,
-	22075: 0x9B9F,
-	22076: 0x9BA0,
-	22077: 0x9BA1,
-	22078: 0x9BA2,
-	22079: 0x9BA3,
-	22080: 0x9BA4,
-	22081: 0x9BA5,
-	22082: 0x9BA6,
-	22083: 0x9BA7,
-	22084: 0x9BA8,
-	22085: 0x9BA9,
-	22086: 0x9BAA,
-	22087: 0x9BAB,
-	22088: 0x9BAC,
-	22089: 0x9BAD,
-	22090: 0x9BAE,
-	22091: 0x9BAF,
-	22092: 0x9BB0,
-	22093: 0x9BB1,
-	22094: 0x9BB2,
-	22095: 0x9BB3,
-	22096: 0x9BB4,
-	22097: 0x9BB5,
-	22098: 0x9BB6,
-	22099: 0x9BB7,
-	22100: 0x9BB8,
-	22101: 0x9BB9,
-	22102: 0x9BBA,
-	22103: 0x9BBB,
-	22104: 0x9BBC,
-	22105: 0x9BBD,
-	22106: 0x9BBE,
-	22107: 0x9BBF,
-	22108: 0x9BC0,
-	22109: 0x9BC1,
-	22110: 0x9BC2,
-	22111: 0x9BC3,
-	22112: 0x9BC4,
-	22113: 0x9BC5,
-	22114: 0x9BC6,
-	22115: 0x9BC7,
-	22116: 0x9BC8,
-	22117: 0x9BC9,
-	22118: 0x9BCA,
-	22119: 0x9BCB,
-	22120: 0x9BCC,
-	22121: 0x9BCD,
-	22122: 0x9BCE,
-	22123: 0x9BCF,
-	22124: 0x9BD0,
-	22125: 0x9BD1,
-	22126: 0x9BD2,
-	22127: 0x9BD3,
-	22128: 0x9BD4,
-	22129: 0x9BD5,
-	22130: 0x9BD6,
-	22131: 0x9BD7,
-	22132: 0x9BD8,
-	22133: 0x9BD9,
-	22134: 0x9BDA,
-	22135: 0x9BDB,
-	22136: 0x9162,
-	22137: 0x9161,
-	22138: 0x9170,
-	22139: 0x9169,
-	22140: 0x916F,
-	22141: 0x917D,
-	22142: 0x917E,
-	22143: 0x9172,
-	22144: 0x9174,
-	22145: 0x9179,
-	22146: 0x918C,
-	22147: 0x9185,
-	22148: 0x9190,
-	22149: 0x918D,
-	22150: 0x9191,
-	22151: 0x91A2,
-	22152: 0x91A3,
-	22153: 0x91AA,
-	22154: 0x91AD,
-	22155: 0x91AE,
-	22156: 0x91AF,
-	22157: 0x91B5,
-	22158: 0x91B4,
-	22159: 0x91BA,
-	22160: 0x8C55,
-	22161: 0x9E7E,
-	22162: 0x8DB8,
-	22163: 0x8DEB,
-	22164: 0x8E05,
-	22165: 0x8E59,
-	22166: 0x8E69,
-	22167: 0x8DB5,
-	22168: 0x8DBF,
-	22169: 0x8DBC,
-	22170: 0x8DBA,
-	22171: 0x8DC4,
-	22172: 0x8DD6,
-	22173: 0x8DD7,
-	22174: 0x8DDA,
-	22175: 0x8DDE,
-	22176: 0x8DCE,
-	22177: 0x8DCF,
-	22178: 0x8DDB,
-	22179: 0x8DC6,
-	22180: 0x8DEC,
-	22181: 0x8DF7,
-	22182: 0x8DF8,
-	22183: 0x8DE3,
-	22184: 0x8DF9,
-	22185: 0x8DFB,
-	22186: 0x8DE4,
-	22187: 0x8E09,
-	22188: 0x8DFD,
-	22189: 0x8E14,
-	22190: 0x8E1D,
-	22191: 0x8E1F,
-	22192: 0x8E2C,
-	22193: 0x8E2E,
-	22194: 0x8E23,
-	22195: 0x8E2F,
-	22196: 0x8E3A,
-	22197: 0x8E40,
-	22198: 0x8E39,
-	22199: 0x8E35,
-	22200: 0x8E3D,
-	22201: 0x8E31,
-	22202: 0x8E49,
-	22203: 0x8E41,
-	22204: 0x8E42,
-	22205: 0x8E51,
-	22206: 0x8E52,
-	22207: 0x8E4A,
-	22208: 0x8E70,
-	22209: 0x8E76,
-	22210: 0x8E7C,
-	22211: 0x8E6F,
-	22212: 0x8E74,
-	22213: 0x8E85,
-	22214: 0x8E8F,
-	22215: 0x8E94,
-	22216: 0x8E90,
-	22217: 0x8E9C,
-	22218: 0x8E9E,
-	22219: 0x8C78,
-	22220: 0x8C82,
-	22221: 0x8C8A,
-	22222: 0x8C85,
-	22223: 0x8C98,
-	22224: 0x8C94,
-	22225: 0x659B,
-	22226: 0x89D6,
-	22227: 0x89DE,
-	22228: 0x89DA,
-	22229: 0x89DC,
-	22230: 0x9BDC,
-	22231: 0x9BDD,
-	22232: 0x9BDE,
-	22233: 0x9BDF,
-	22234: 0x9BE0,
-	22235: 0x9BE1,
-	22236: 0x9BE2,
-	22237: 0x9BE3,
-	22238: 0x9BE4,
-	22239: 0x9BE5,
-	22240: 0x9BE6,
-	22241: 0x9BE7,
-	22242: 0x9BE8,
-	22243: 0x9BE9,
-	22244: 0x9BEA,
-	22245: 0x9BEB,
-	22246: 0x9BEC,
-	22247: 0x9BED,
-	22248: 0x9BEE,
-	22249: 0x9BEF,
-	22250: 0x9BF0,
-	22251: 0x9BF1,
-	22252: 0x9BF2,
-	22253: 0x9BF3,
-	22254: 0x9BF4,
-	22255: 0x9BF5,
-	22256: 0x9BF6,
-	22257: 0x9BF7,
-	22258: 0x9BF8,
-	22259: 0x9BF9,
-	22260: 0x9BFA,
-	22261: 0x9BFB,
-	22262: 0x9BFC,
-	22263: 0x9BFD,
-	22264: 0x9BFE,
-	22265: 0x9BFF,
-	22266: 0x9C00,
-	22267: 0x9C01,
-	22268: 0x9C02,
-	22269: 0x9C03,
-	22270: 0x9C04,
-	22271: 0x9C05,
-	22272: 0x9C06,
-	22273: 0x9C07,
-	22274: 0x9C08,
-	22275: 0x9C09,
-	22276: 0x9C0A,
-	22277: 0x9C0B,
-	22278: 0x9C0C,
-	22279: 0x9C0D,
-	22280: 0x9C0E,
-	22281: 0x9C0F,
-	22282: 0x9C10,
-	22283: 0x9C11,
-	22284: 0x9C12,
-	22285: 0x9C13,
-	22286: 0x9C14,
-	22287: 0x9C15,
-	22288: 0x9C16,
-	22289: 0x9C17,
-	22290: 0x9C18,
-	22291: 0x9C19,
-	22292: 0x9C1A,
-	22293: 0x9C1B,
-	22294: 0x9C1C,
-	22295: 0x9C1D,
-	22296: 0x9C1E,
-	22297: 0x9C1F,
-	22298: 0x9C20,
-	22299: 0x9C21,
-	22300: 0x9C22,
-	22301: 0x9C23,
-	22302: 0x9C24,
-	22303: 0x9C25,
-	22304: 0x9C26,
-	22305: 0x9C27,
-	22306: 0x9C28,
-	22307: 0x9C29,
-	22308: 0x9C2A,
-	22309: 0x9C2B,
-	22310: 0x9C2C,
-	22311: 0x9C2D,
-	22312: 0x9C2E,
-	22313: 0x9C2F,
-	22314: 0x9C30,
-	22315: 0x9C31,
-	22316: 0x9C32,
-	22317: 0x9C33,
-	22318: 0x9C34,
-	22319: 0x9C35,
-	22320: 0x9C36,
-	22321: 0x9C37,
-	22322: 0x9C38,
-	22323: 0x9C39,
-	22324: 0x9C3A,
-	22325: 0x9C3B,
-	22326: 0x89E5,
-	22327: 0x89EB,
-	22328: 0x89EF,
-	22329: 0x8A3E,
-	22330: 0x8B26,
-	22331: 0x9753,
-	22332: 0x96E9,
-	22333: 0x96F3,
-	22334: 0x96EF,
-	22335: 0x9706,
-	22336: 0x9701,
-	22337: 0x9708,
-	22338: 0x970F,
-	22339: 0x970E,
-	22340: 0x972A,
-	22341: 0x972D,
-	22342: 0x9730,
-	22343: 0x973E,
-	22344: 0x9F80,
-	22345: 0x9F83,
-	22346: 0x9F85,
-	22347: 0x9F86,
-	22348: 0x9F87,
-	22349: 0x9F88,
-	22350: 0x9F89,
-	22351: 0x9F8A,
-	22352: 0x9F8C,
-	22353: 0x9EFE,
-	22354: 0x9F0B,
-	22355: 0x9F0D,
-	22356: 0x96B9,
-	22357: 0x96BC,
-	22358: 0x96BD,
-	22359: 0x96CE,
-	22360: 0x96D2,
-	22361: 0x77BF,
-	22362: 0x96E0,
-	22363: 0x928E,
-	22364: 0x92AE,
-	22365: 0x92C8,
-	22366: 0x933E,
-	22367: 0x936A,
-	22368: 0x93CA,
-	22369: 0x938F,
-	22370: 0x943E,
-	22371: 0x946B,
-	22372: 0x9C7F,
-	22373: 0x9C82,
-	22374: 0x9C85,
-	22375: 0x9C86,
-	22376: 0x9C87,
-	22377: 0x9C88,
-	22378: 0x7A23,
-	22379: 0x9C8B,
-	22380: 0x9C8E,
-	22381: 0x9C90,
-	22382: 0x9C91,
-	22383: 0x9C92,
-	22384: 0x9C94,
-	22385: 0x9C95,
-	22386: 0x9C9A,
-	22387: 0x9C9B,
-	22388: 0x9C9E,
-	22389: 0x9C9F,
-	22390: 0x9CA0,
-	22391: 0x9CA1,
-	22392: 0x9CA2,
-	22393: 0x9CA3,
-	22394: 0x9CA5,
-	22395: 0x9CA6,
-	22396: 0x9CA7,
-	22397: 0x9CA8,
-	22398: 0x9CA9,
-	22399: 0x9CAB,
-	22400: 0x9CAD,
-	22401: 0x9CAE,
-	22402: 0x9CB0,
-	22403: 0x9CB1,
-	22404: 0x9CB2,
-	22405: 0x9CB3,
-	22406: 0x9CB4,
-	22407: 0x9CB5,
-	22408: 0x9CB6,
-	22409: 0x9CB7,
-	22410: 0x9CBA,
-	22411: 0x9CBB,
-	22412: 0x9CBC,
-	22413: 0x9CBD,
-	22414: 0x9CC4,
-	22415: 0x9CC5,
-	22416: 0x9CC6,
-	22417: 0x9CC7,
-	22418: 0x9CCA,
-	22419: 0x9CCB,
-	22420: 0x9C3C,
-	22421: 0x9C3D,
-	22422: 0x9C3E,
-	22423: 0x9C3F,
-	22424: 0x9C40,
-	22425: 0x9C41,
-	22426: 0x9C42,
-	22427: 0x9C43,
-	22428: 0x9C44,
-	22429: 0x9C45,
-	22430: 0x9C46,
-	22431: 0x9C47,
-	22432: 0x9C48,
-	22433: 0x9C49,
-	22434: 0x9C4A,
-	22435: 0x9C4B,
-	22436: 0x9C4C,
-	22437: 0x9C4D,
-	22438: 0x9C4E,
-	22439: 0x9C4F,
-	22440: 0x9C50,
-	22441: 0x9C51,
-	22442: 0x9C52,
-	22443: 0x9C53,
-	22444: 0x9C54,
-	22445: 0x9C55,
-	22446: 0x9C56,
-	22447: 0x9C57,
-	22448: 0x9C58,
-	22449: 0x9C59,
-	22450: 0x9C5A,
-	22451: 0x9C5B,
-	22452: 0x9C5C,
-	22453: 0x9C5D,
-	22454: 0x9C5E,
-	22455: 0x9C5F,
-	22456: 0x9C60,
-	22457: 0x9C61,
-	22458: 0x9C62,
-	22459: 0x9C63,
-	22460: 0x9C64,
-	22461: 0x9C65,
-	22462: 0x9C66,
-	22463: 0x9C67,
-	22464: 0x9C68,
-	22465: 0x9C69,
-	22466: 0x9C6A,
-	22467: 0x9C6B,
-	22468: 0x9C6C,
-	22469: 0x9C6D,
-	22470: 0x9C6E,
-	22471: 0x9C6F,
-	22472: 0x9C70,
-	22473: 0x9C71,
-	22474: 0x9C72,
-	22475: 0x9C73,
-	22476: 0x9C74,
-	22477: 0x9C75,
-	22478: 0x9C76,
-	22479: 0x9C77,
-	22480: 0x9C78,
-	22481: 0x9C79,
-	22482: 0x9C7A,
-	22483: 0x9C7B,
-	22484: 0x9C7D,
-	22485: 0x9C7E,
-	22486: 0x9C80,
-	22487: 0x9C83,
-	22488: 0x9C84,
-	22489: 0x9C89,
-	22490: 0x9C8A,
-	22491: 0x9C8C,
-	22492: 0x9C8F,
-	22493: 0x9C93,
-	22494: 0x9C96,
-	22495: 0x9C97,
-	22496: 0x9C98,
-	22497: 0x9C99,
-	22498: 0x9C9D,
-	22499: 0x9CAA,
-	22500: 0x9CAC,
-	22501: 0x9CAF,
-	22502: 0x9CB9,
-	22503: 0x9CBE,
-	22504: 0x9CBF,
-	22505: 0x9CC0,
-	22506: 0x9CC1,
-	22507: 0x9CC2,
-	22508: 0x9CC8,
-	22509: 0x9CC9,
-	22510: 0x9CD1,
-	22511: 0x9CD2,
-	22512: 0x9CDA,
-	22513: 0x9CDB,
-	22514: 0x9CE0,
-	22515: 0x9CE1,
-	22516: 0x9CCC,
-	22517: 0x9CCD,
-	22518: 0x9CCE,
-	22519: 0x9CCF,
-	22520: 0x9CD0,
-	22521: 0x9CD3,
-	22522: 0x9CD4,
-	22523: 0x9CD5,
-	22524: 0x9CD7,
-	22525: 0x9CD8,
-	22526: 0x9CD9,
-	22527: 0x9CDC,
-	22528: 0x9CDD,
-	22529: 0x9CDF,
-	22530: 0x9CE2,
-	22531: 0x977C,
-	22532: 0x9785,
-	22533: 0x9791,
-	22534: 0x9792,
-	22535: 0x9794,
-	22536: 0x97AF,
-	22537: 0x97AB,
-	22538: 0x97A3,
-	22539: 0x97B2,
-	22540: 0x97B4,
-	22541: 0x9AB1,
-	22542: 0x9AB0,
-	22543: 0x9AB7,
-	22544: 0x9E58,
-	22545: 0x9AB6,
-	22546: 0x9ABA,
-	22547: 0x9ABC,
-	22548: 0x9AC1,
-	22549: 0x9AC0,
-	22550: 0x9AC5,
-	22551: 0x9AC2,
-	22552: 0x9ACB,
-	22553: 0x9ACC,
-	22554: 0x9AD1,
-	22555: 0x9B45,
-	22556: 0x9B43,
-	22557: 0x9B47,
-	22558: 0x9B49,
-	22559: 0x9B48,
-	22560: 0x9B4D,
-	22561: 0x9B51,
-	22562: 0x98E8,
-	22563: 0x990D,
-	22564: 0x992E,
-	22565: 0x9955,
-	22566: 0x9954,
-	22567: 0x9ADF,
-	22568: 0x9AE1,
-	22569: 0x9AE6,
-	22570: 0x9AEF,
-	22571: 0x9AEB,
-	22572: 0x9AFB,
-	22573: 0x9AED,
-	22574: 0x9AF9,
-	22575: 0x9B08,
-	22576: 0x9B0F,
-	22577: 0x9B13,
-	22578: 0x9B1F,
-	22579: 0x9B23,
-	22580: 0x9EBD,
-	22581: 0x9EBE,
-	22582: 0x7E3B,
-	22583: 0x9E82,
-	22584: 0x9E87,
-	22585: 0x9E88,
-	22586: 0x9E8B,
-	22587: 0x9E92,
-	22588: 0x93D6,
-	22589: 0x9E9D,
-	22590: 0x9E9F,
-	22591: 0x9EDB,
-	22592: 0x9EDC,
-	22593: 0x9EDD,
-	22594: 0x9EE0,
-	22595: 0x9EDF,
-	22596: 0x9EE2,
-	22597: 0x9EE9,
-	22598: 0x9EE7,
-	22599: 0x9EE5,
-	22600: 0x9EEA,
-	22601: 0x9EEF,
-	22602: 0x9F22,
-	22603: 0x9F2C,
-	22604: 0x9F2F,
-	22605: 0x9F39,
-	22606: 0x9F37,
-	22607: 0x9F3D,
-	22608: 0x9F3E,
-	22609: 0x9F44,
-	22610: 0x9CE3,
-	22611: 0x9CE4,
-	22612: 0x9CE5,
-	22613: 0x9CE6,
-	22614: 0x9CE7,
-	22615: 0x9CE8,
-	22616: 0x9CE9,
-	22617: 0x9CEA,
-	22618: 0x9CEB,
-	22619: 0x9CEC,
-	22620: 0x9CED,
-	22621: 0x9CEE,
-	22622: 0x9CEF,
-	22623: 0x9CF0,
-	22624: 0x9CF1,
-	22625: 0x9CF2,
-	22626: 0x9CF3,
-	22627: 0x9CF4,
-	22628: 0x9CF5,
-	22629: 0x9CF6,
-	22630: 0x9CF7,
-	22631: 0x9CF8,
-	22632: 0x9CF9,
-	22633: 0x9CFA,
-	22634: 0x9CFB,
-	22635: 0x9CFC,
-	22636: 0x9CFD,
-	22637: 0x9CFE,
-	22638: 0x9CFF,
-	22639: 0x9D00,
-	22640: 0x9D01,
-	22641: 0x9D02,
-	22642: 0x9D03,
-	22643: 0x9D04,
-	22644: 0x9D05,
-	22645: 0x9D06,
-	22646: 0x9D07,
-	22647: 0x9D08,
-	22648: 0x9D09,
-	22649: 0x9D0A,
-	22650: 0x9D0B,
-	22651: 0x9D0C,
-	22652: 0x9D0D,
-	22653: 0x9D0E,
-	22654: 0x9D0F,
-	22655: 0x9D10,
-	22656: 0x9D11,
-	22657: 0x9D12,
-	22658: 0x9D13,
-	22659: 0x9D14,
-	22660: 0x9D15,
-	22661: 0x9D16,
-	22662: 0x9D17,
-	22663: 0x9D18,
-	22664: 0x9D19,
-	22665: 0x9D1A,
-	22666: 0x9D1B,
-	22667: 0x9D1C,
-	22668: 0x9D1D,
-	22669: 0x9D1E,
-	22670: 0x9D1F,
-	22671: 0x9D20,
-	22672: 0x9D21,
-	22673: 0x9D22,
-	22674: 0x9D23,
-	22675: 0x9D24,
-	22676: 0x9D25,
-	22677: 0x9D26,
-	22678: 0x9D27,
-	22679: 0x9D28,
-	22680: 0x9D29,
-	22681: 0x9D2A,
-	22682: 0x9D2B,
-	22683: 0x9D2C,
-	22684: 0x9D2D,
-	22685: 0x9D2E,
-	22686: 0x9D2F,
-	22687: 0x9D30,
-	22688: 0x9D31,
-	22689: 0x9D32,
-	22690: 0x9D33,
-	22691: 0x9D34,
-	22692: 0x9D35,
-	22693: 0x9D36,
-	22694: 0x9D37,
-	22695: 0x9D38,
-	22696: 0x9D39,
-	22697: 0x9D3A,
-	22698: 0x9D3B,
-	22699: 0x9D3C,
-	22700: 0x9D3D,
-	22701: 0x9D3E,
-	22702: 0x9D3F,
-	22703: 0x9D40,
-	22704: 0x9D41,
-	22705: 0x9D42,
-	22800: 0x9D43,
-	22801: 0x9D44,
-	22802: 0x9D45,
-	22803: 0x9D46,
-	22804: 0x9D47,
-	22805: 0x9D48,
-	22806: 0x9D49,
-	22807: 0x9D4A,
-	22808: 0x9D4B,
-	22809: 0x9D4C,
-	22810: 0x9D4D,
-	22811: 0x9D4E,
-	22812: 0x9D4F,
-	22813: 0x9D50,
-	22814: 0x9D51,
-	22815: 0x9D52,
-	22816: 0x9D53,
-	22817: 0x9D54,
-	22818: 0x9D55,
-	22819: 0x9D56,
-	22820: 0x9D57,
-	22821: 0x9D58,
-	22822: 0x9D59,
-	22823: 0x9D5A,
-	22824: 0x9D5B,
-	22825: 0x9D5C,
-	22826: 0x9D5D,
-	22827: 0x9D5E,
-	22828: 0x9D5F,
-	22829: 0x9D60,
-	22830: 0x9D61,
-	22831: 0x9D62,
-	22832: 0x9D63,
-	22833: 0x9D64,
-	22834: 0x9D65,
-	22835: 0x9D66,
-	22836: 0x9D67,
-	22837: 0x9D68,
-	22838: 0x9D69,
-	22839: 0x9D6A,
-	22840: 0x9D6B,
-	22841: 0x9D6C,
-	22842: 0x9D6D,
-	22843: 0x9D6E,
-	22844: 0x9D6F,
-	22845: 0x9D70,
-	22846: 0x9D71,
-	22847: 0x9D72,
-	22848: 0x9D73,
-	22849: 0x9D74,
-	22850: 0x9D75,
-	22851: 0x9D76,
-	22852: 0x9D77,
-	22853: 0x9D78,
-	22854: 0x9D79,
-	22855: 0x9D7A,
-	22856: 0x9D7B,
-	22857: 0x9D7C,
-	22858: 0x9D7D,
-	22859: 0x9D7E,
-	22860: 0x9D7F,
-	22861: 0x9D80,
-	22862: 0x9D81,
-	22863: 0x9D82,
-	22864: 0x9D83,
-	22865: 0x9D84,
-	22866: 0x9D85,
-	22867: 0x9D86,
-	22868: 0x9D87,
-	22869: 0x9D88,
-	22870: 0x9D89,
-	22871: 0x9D8A,
-	22872: 0x9D8B,
-	22873: 0x9D8C,
-	22874: 0x9D8D,
-	22875: 0x9D8E,
-	22876: 0x9D8F,
-	22877: 0x9D90,
-	22878: 0x9D91,
-	22879: 0x9D92,
-	22880: 0x9D93,
-	22881: 0x9D94,
-	22882: 0x9D95,
-	22883: 0x9D96,
-	22884: 0x9D97,
-	22885: 0x9D98,
-	22886: 0x9D99,
-	22887: 0x9D9A,
-	22888: 0x9D9B,
-	22889: 0x9D9C,
-	22890: 0x9D9D,
-	22891: 0x9D9E,
-	22892: 0x9D9F,
-	22893: 0x9DA0,
-	22894: 0x9DA1,
-	22895: 0x9DA2,
-	22990: 0x9DA3,
-	22991: 0x9DA4,
-	22992: 0x9DA5,
-	22993: 0x9DA6,
-	22994: 0x9DA7,
-	22995: 0x9DA8,
-	22996: 0x9DA9,
-	22997: 0x9DAA,
-	22998: 0x9DAB,
-	22999: 0x9DAC,
-	23000: 0x9DAD,
-	23001: 0x9DAE,
-	23002: 0x9DAF,
-	23003: 0x9DB0,
-	23004: 0x9DB1,
-	23005: 0x9DB2,
-	23006: 0x9DB3,
-	23007: 0x9DB4,
-	23008: 0x9DB5,
-	23009: 0x9DB6,
-	23010: 0x9DB7,
-	23011: 0x9DB8,
-	23012: 0x9DB9,
-	23013: 0x9DBA,
-	23014: 0x9DBB,
-	23015: 0x9DBC,
-	23016: 0x9DBD,
-	23017: 0x9DBE,
-	23018: 0x9DBF,
-	23019: 0x9DC0,
-	23020: 0x9DC1,
-	23021: 0x9DC2,
-	23022: 0x9DC3,
-	23023: 0x9DC4,
-	23024: 0x9DC5,
-	23025: 0x9DC6,
-	23026: 0x9DC7,
-	23027: 0x9DC8,
-	23028: 0x9DC9,
-	23029: 0x9DCA,
-	23030: 0x9DCB,
-	23031: 0x9DCC,
-	23032: 0x9DCD,
-	23033: 0x9DCE,
-	23034: 0x9DCF,
-	23035: 0x9DD0,
-	23036: 0x9DD1,
-	23037: 0x9DD2,
-	23038: 0x9DD3,
-	23039: 0x9DD4,
-	23040: 0x9DD5,
-	23041: 0x9DD6,
-	23042: 0x9DD7,
-	23043: 0x9DD8,
-	23044: 0x9DD9,
-	23045: 0x9DDA,
-	23046: 0x9DDB,
-	23047: 0x9DDC,
-	23048: 0x9DDD,
-	23049: 0x9DDE,
-	23050: 0x9DDF,
-	23051: 0x9DE0,
-	23052: 0x9DE1,
-	23053: 0x9DE2,
-	23054: 0x9DE3,
-	23055: 0x9DE4,
-	23056: 0x9DE5,
-	23057: 0x9DE6,
-	23058: 0x9DE7,
-	23059: 0x9DE8,
-	23060: 0x9DE9,
-	23061: 0x9DEA,
-	23062: 0x9DEB,
-	23063: 0x9DEC,
-	23064: 0x9DED,
-	23065: 0x9DEE,
-	23066: 0x9DEF,
-	23067: 0x9DF0,
-	23068: 0x9DF1,
-	23069: 0x9DF2,
-	23070: 0x9DF3,
-	23071: 0x9DF4,
-	23072: 0x9DF5,
-	23073: 0x9DF6,
-	23074: 0x9DF7,
-	23075: 0x9DF8,
-	23076: 0x9DF9,
-	23077: 0x9DFA,
-	23078: 0x9DFB,
-	23079: 0x9DFC,
-	23080: 0x9DFD,
-	23081: 0x9DFE,
-	23082: 0x9DFF,
-	23083: 0x9E00,
-	23084: 0x9E01,
-	23085: 0x9E02,
-	23180: 0x9E03,
-	23181: 0x9E04,
-	23182: 0x9E05,
-	23183: 0x9E06,
-	23184: 0x9E07,
-	23185: 0x9E08,
-	23186: 0x9E09,
-	23187: 0x9E0A,
-	23188: 0x9E0B,
-	23189: 0x9E0C,
-	23190: 0x9E0D,
-	23191: 0x9E0E,
-	23192: 0x9E0F,
-	23193: 0x9E10,
-	23194: 0x9E11,
-	23195: 0x9E12,
-	23196: 0x9E13,
-	23197: 0x9E14,
-	23198: 0x9E15,
-	23199: 0x9E16,
-	23200: 0x9E17,
-	23201: 0x9E18,
-	23202: 0x9E19,
-	23203: 0x9E1A,
-	23204: 0x9E1B,
-	23205: 0x9E1C,
-	23206: 0x9E1D,
-	23207: 0x9E1E,
-	23208: 0x9E24,
-	23209: 0x9E27,
-	23210: 0x9E2E,
-	23211: 0x9E30,
-	23212: 0x9E34,
-	23213: 0x9E3B,
-	23214: 0x9E3C,
-	23215: 0x9E40,
-	23216: 0x9E4D,
-	23217: 0x9E50,
-	23218: 0x9E52,
-	23219: 0x9E53,
-	23220: 0x9E54,
-	23221: 0x9E56,
-	23222: 0x9E59,
-	23223: 0x9E5D,
-	23224: 0x9E5F,
-	23225: 0x9E60,
-	23226: 0x9E61,
-	23227: 0x9E62,
-	23228: 0x9E65,
-	23229: 0x9E6E,
-	23230: 0x9E6F,
-	23231: 0x9E72,
-	23232: 0x9E74,
-	23233: 0x9E75,
-	23234: 0x9E76,
-	23235: 0x9E77,
-	23236: 0x9E78,
-	23237: 0x9E79,
-	23238: 0x9E7A,
-	23239: 0x9E7B,
-	23240: 0x9E7C,
-	23241: 0x9E7D,
-	23242: 0x9E80,
-	23243: 0x9E81,
-	23244: 0x9E83,
-	23245: 0x9E84,
-	23246: 0x9E85,
-	23247: 0x9E86,
-	23248: 0x9E89,
-	23249: 0x9E8A,
-	23250: 0x9E8C,
-	23251: 0x9E8D,
-	23252: 0x9E8E,
-	23253: 0x9E8F,
-	23254: 0x9E90,
-	23255: 0x9E91,
-	23256: 0x9E94,
-	23257: 0x9E95,
-	23258: 0x9E96,
-	23259: 0x9E97,
-	23260: 0x9E98,
-	23261: 0x9E99,
-	23262: 0x9E9A,
-	23263: 0x9E9B,
-	23264: 0x9E9C,
-	23265: 0x9E9E,
-	23266: 0x9EA0,
-	23267: 0x9EA1,
-	23268: 0x9EA2,
-	23269: 0x9EA3,
-	23270: 0x9EA4,
-	23271: 0x9EA5,
-	23272: 0x9EA7,
-	23273: 0x9EA8,
-	23274: 0x9EA9,
-	23275: 0x9EAA,
-	23370: 0x9EAB,
-	23371: 0x9EAC,
-	23372: 0x9EAD,
-	23373: 0x9EAE,
-	23374: 0x9EAF,
-	23375: 0x9EB0,
-	23376: 0x9EB1,
-	23377: 0x9EB2,
-	23378: 0x9EB3,
-	23379: 0x9EB5,
-	23380: 0x9EB6,
-	23381: 0x9EB7,
-	23382: 0x9EB9,
-	23383: 0x9EBA,
-	23384: 0x9EBC,
-	23385: 0x9EBF,
-	23386: 0x9EC0,
-	23387: 0x9EC1,
-	23388: 0x9EC2,
-	23389: 0x9EC3,
-	23390: 0x9EC5,
-	23391: 0x9EC6,
-	23392: 0x9EC7,
-	23393: 0x9EC8,
-	23394: 0x9ECA,
-	23395: 0x9ECB,
-	23396: 0x9ECC,
-	23397: 0x9ED0,
-	23398: 0x9ED2,
-	23399: 0x9ED3,
-	23400: 0x9ED5,
-	23401: 0x9ED6,
-	23402: 0x9ED7,
-	23403: 0x9ED9,
-	23404: 0x9EDA,
-	23405: 0x9EDE,
-	23406: 0x9EE1,
-	23407: 0x9EE3,
-	23408: 0x9EE4,
-	23409: 0x9EE6,
-	23410: 0x9EE8,
-	23411: 0x9EEB,
-	23412: 0x9EEC,
-	23413: 0x9EED,
-	23414: 0x9EEE,
-	23415: 0x9EF0,
-	23416: 0x9EF1,
-	23417: 0x9EF2,
-	23418: 0x9EF3,
-	23419: 0x9EF4,
-	23420: 0x9EF5,
-	23421: 0x9EF6,
-	23422: 0x9EF7,
-	23423: 0x9EF8,
-	23424: 0x9EFA,
-	23425: 0x9EFD,
-	23426: 0x9EFF,
-	23427: 0x9F00,
-	23428: 0x9F01,
-	23429: 0x9F02,
-	23430: 0x9F03,
-	23431: 0x9F04,
-	23432: 0x9F05,
-	23433: 0x9F06,
-	23434: 0x9F07,
-	23435: 0x9F08,
-	23436: 0x9F09,
-	23437: 0x9F0A,
-	23438: 0x9F0C,
-	23439: 0x9F0F,
-	23440: 0x9F11,
-	23441: 0x9F12,
-	23442: 0x9F14,
-	23443: 0x9F15,
-	23444: 0x9F16,
-	23445: 0x9F18,
-	23446: 0x9F1A,
-	23447: 0x9F1B,
-	23448: 0x9F1C,
-	23449: 0x9F1D,
-	23450: 0x9F1E,
-	23451: 0x9F1F,
-	23452: 0x9F21,
-	23453: 0x9F23,
-	23454: 0x9F24,
-	23455: 0x9F25,
-	23456: 0x9F26,
-	23457: 0x9F27,
-	23458: 0x9F28,
-	23459: 0x9F29,
-	23460: 0x9F2A,
-	23461: 0x9F2B,
-	23462: 0x9F2D,
-	23463: 0x9F2E,
-	23464: 0x9F30,
-	23465: 0x9F31,
-	23560: 0x9F32,
-	23561: 0x9F33,
-	23562: 0x9F34,
-	23563: 0x9F35,
-	23564: 0x9F36,
-	23565: 0x9F38,
-	23566: 0x9F3A,
-	23567: 0x9F3C,
-	23568: 0x9F3F,
-	23569: 0x9F40,
-	23570: 0x9F41,
-	23571: 0x9F42,
-	23572: 0x9F43,
-	23573: 0x9F45,
-	23574: 0x9F46,
-	23575: 0x9F47,
-	23576: 0x9F48,
-	23577: 0x9F49,
-	23578: 0x9F4A,
-	23579: 0x9F4B,
-	23580: 0x9F4C,
-	23581: 0x9F4D,
-	23582: 0x9F4E,
-	23583: 0x9F4F,
-	23584: 0x9F52,
-	23585: 0x9F53,
-	23586: 0x9F54,
-	23587: 0x9F55,
-	23588: 0x9F56,
-	23589: 0x9F57,
-	23590: 0x9F58,
-	23591: 0x9F59,
-	23592: 0x9F5A,
-	23593: 0x9F5B,
-	23594: 0x9F5C,
-	23595: 0x9F5D,
-	23596: 0x9F5E,
-	23597: 0x9F5F,
-	23598: 0x9F60,
-	23599: 0x9F61,
-	23600: 0x9F62,
-	23601: 0x9F63,
-	23602: 0x9F64,
-	23603: 0x9F65,
-	23604: 0x9F66,
-	23605: 0x9F67,
-	23606: 0x9F68,
-	23607: 0x9F69,
-	23608: 0x9F6A,
-	23609: 0x9F6B,
-	23610: 0x9F6C,
-	23611: 0x9F6D,
-	23612: 0x9F6E,
-	23613: 0x9F6F,
-	23614: 0x9F70,
-	23615: 0x9F71,
-	23616: 0x9F72,
-	23617: 0x9F73,
-	23618: 0x9F74,
-	23619: 0x9F75,
-	23620: 0x9F76,
-	23621: 0x9F77,
-	23622: 0x9F78,
-	23623: 0x9F79,
-	23624: 0x9F7A,
-	23625: 0x9F7B,
-	23626: 0x9F7C,
-	23627: 0x9F7D,
-	23628: 0x9F7E,
-	23629: 0x9F81,
-	23630: 0x9F82,
-	23631: 0x9F8D,
-	23632: 0x9F8E,
-	23633: 0x9F8F,
-	23634: 0x9F90,
-	23635: 0x9F91,
-	23636: 0x9F92,
-	23637: 0x9F93,
-	23638: 0x9F94,
-	23639: 0x9F95,
-	23640: 0x9F96,
-	23641: 0x9F97,
-	23642: 0x9F98,
-	23643: 0x9F9C,
-	23644: 0x9F9D,
-	23645: 0x9F9E,
-	23646: 0x9FA1,
-	23647: 0x9FA2,
-	23648: 0x9FA3,
-	23649: 0x9FA4,
-	23650: 0x9FA5,
-	23651: 0xF92C,
-	23652: 0xF979,
-	23653: 0xF995,
-	23654: 0xF9E7,
-	23655: 0xF9F1,
-	23750: 0xFA0C,
-	23751: 0xFA0D,
-	23752: 0xFA0E,
-	23753: 0xFA0F,
-	23754: 0xFA11,
-	23755: 0xFA13,
-	23756: 0xFA14,
-	23757: 0xFA18,
-	23758: 0xFA1F,
-	23759: 0xFA20,
-	23760: 0xFA21,
-	23761: 0xFA23,
-	23762: 0xFA24,
-	23763: 0xFA27,
-	23764: 0xFA28,
-	23765: 0xFA29,
-	23766: 0x2E81,
-	23770: 0x2E84,
-	23771: 0x3473,
-	23772: 0x3447,
-	23773: 0x2E88,
-	23774: 0x2E8B,
-	23776: 0x359E,
-	23777: 0x361A,
-	23778: 0x360E,
-	23779: 0x2E8C,
-	23780: 0x2E97,
-	23781: 0x396E,
-	23782: 0x3918,
-	23784: 0x39CF,
-	23785: 0x39DF,
-	23786: 0x3A73,
-	23787: 0x39D0,
-	23790: 0x3B4E,
-	23791: 0x3C6E,
-	23792: 0x3CE0,
-	23793: 0x2EA7,
-	23796: 0x2EAA,
-	23797: 0x4056,
-	23798: 0x415F,
-	23799: 0x2EAE,
-	23800: 0x4337,
-	23801: 0x2EB3,
-	23802: 0x2EB6,
-	23803: 0x2EB7,
-	23805: 0x43B1,
-	23806: 0x43AC,
-	23807: 0x2EBB,
-	23808: 0x43DD,
-	23809: 0x44D6,
-	23810: 0x4661,
-	23811: 0x464C,
-	23813: 0x4723,
-	23814: 0x4729,
-	23815: 0x477C,
-	23816: 0x478D,
-	23817: 0x2ECA,
-	23818: 0x4947,
-	23819: 0x497A,
-	23820: 0x497D,
-	23821: 0x4982,
-	23822: 0x4983,
-	23823: 0x4985,
-	23824: 0x4986,
-	23825: 0x499F,
-	23826: 0x499B,
-	23827: 0x49B7,
-	23828: 0x49B6,
-	23831: 0x4CA3,
-	23832: 0x4C9F,
-	23833: 0x4CA0,
-	23834: 0x4CA1,
-	23835: 0x4C77,
-	23836: 0x4CA2,
-	23837: 0x4D13,
-	23838: 0x4D14,
-	23839: 0x4D15,
-	23840: 0x4D16,
-	23841: 0x4D17,
-	23842: 0x4D18,
-	23843: 0x4D19,
-	23844: 0x4DAE,
-}
-
-const numEncodeTables = 5
-
-// encodeX are the encoding tables from Unicode to GBK code,
-// sorted by decreasing length.
-// encode0: 28965 entries for runes in [11905, 40870).
-// encode1:  1587 entries for runes in [ 8208,  9795).
-// encode2:   942 entries for runes in [  164,  1106).
-// encode3:   438 entries for runes in [65072, 65510).
-// encode4:   254 entries for runes in [63788, 64042).
-
-const encode0Low, encode0High = 11905, 40870
-
-var encode0 = [...]uint16{
-	11905 - 11905: 0xFE50,
-	11908 - 11905: 0xFE54,
-	11912 - 11905: 0xFE57,
-	11915 - 11905: 0xFE58,
-	11916 - 11905: 0xFE5D,
-	11927 - 11905: 0xFE5E,
-	11943 - 11905: 0xFE6B,
-	11946 - 11905: 0xFE6E,
-	11950 - 11905: 0xFE71,
-	11955 - 11905: 0xFE73,
-	11958 - 11905: 0xFE74,
-	11959 - 11905: 0xFE75,
-	11963 - 11905: 0xFE79,
-	11978 - 11905: 0xFE84,
-	12272 - 11905: 0xA98A,
-	12273 - 11905: 0xA98B,
-	12274 - 11905: 0xA98C,
-	12275 - 11905: 0xA98D,
-	12276 - 11905: 0xA98E,
-	12277 - 11905: 0xA98F,
-	12278 - 11905: 0xA990,
-	12279 - 11905: 0xA991,
-	12280 - 11905: 0xA992,
-	12281 - 11905: 0xA993,
-	12282 - 11905: 0xA994,
-	12283 - 11905: 0xA995,
-	12288 - 11905: 0xA1A1,
-	12289 - 11905: 0xA1A2,
-	12290 - 11905: 0xA1A3,
-	12291 - 11905: 0xA1A8,
-	12293 - 11905: 0xA1A9,
-	12294 - 11905: 0xA965,
-	12295 - 11905: 0xA996,
-	12296 - 11905: 0xA1B4,
-	12297 - 11905: 0xA1B5,
-	12298 - 11905: 0xA1B6,
-	12299 - 11905: 0xA1B7,
-	12300 - 11905: 0xA1B8,
-	12301 - 11905: 0xA1B9,
-	12302 - 11905: 0xA1BA,
-	12303 - 11905: 0xA1BB,
-	12304 - 11905: 0xA1BE,
-	12305 - 11905: 0xA1BF,
-	12306 - 11905: 0xA893,
-	12307 - 11905: 0xA1FE,
-	12308 - 11905: 0xA1B2,
-	12309 - 11905: 0xA1B3,
-	12310 - 11905: 0xA1BC,
-	12311 - 11905: 0xA1BD,
-	12317 - 11905: 0xA894,
-	12318 - 11905: 0xA895,
-	12321 - 11905: 0xA940,
-	12322 - 11905: 0xA941,
-	12323 - 11905: 0xA942,
-	12324 - 11905: 0xA943,
-	12325 - 11905: 0xA944,
-	12326 - 11905: 0xA945,
-	12327 - 11905: 0xA946,
-	12328 - 11905: 0xA947,
-	12329 - 11905: 0xA948,
-	12350 - 11905: 0xA989,
-	12353 - 11905: 0xA4A1,
-	12354 - 11905: 0xA4A2,
-	12355 - 11905: 0xA4A3,
-	12356 - 11905: 0xA4A4,
-	12357 - 11905: 0xA4A5,
-	12358 - 11905: 0xA4A6,
-	12359 - 11905: 0xA4A7,
-	12360 - 11905: 0xA4A8,
-	12361 - 11905: 0xA4A9,
-	12362 - 11905: 0xA4AA,
-	12363 - 11905: 0xA4AB,
-	12364 - 11905: 0xA4AC,
-	12365 - 11905: 0xA4AD,
-	12366 - 11905: 0xA4AE,
-	12367 - 11905: 0xA4AF,
-	12368 - 11905: 0xA4B0,
-	12369 - 11905: 0xA4B1,
-	12370 - 11905: 0xA4B2,
-	12371 - 11905: 0xA4B3,
-	12372 - 11905: 0xA4B4,
-	12373 - 11905: 0xA4B5,
-	12374 - 11905: 0xA4B6,
-	12375 - 11905: 0xA4B7,
-	12376 - 11905: 0xA4B8,
-	12377 - 11905: 0xA4B9,
-	12378 - 11905: 0xA4BA,
-	12379 - 11905: 0xA4BB,
-	12380 - 11905: 0xA4BC,
-	12381 - 11905: 0xA4BD,
-	12382 - 11905: 0xA4BE,
-	12383 - 11905: 0xA4BF,
-	12384 - 11905: 0xA4C0,
-	12385 - 11905: 0xA4C1,
-	12386 - 11905: 0xA4C2,
-	12387 - 11905: 0xA4C3,
-	12388 - 11905: 0xA4C4,
-	12389 - 11905: 0xA4C5,
-	12390 - 11905: 0xA4C6,
-	12391 - 11905: 0xA4C7,
-	12392 - 11905: 0xA4C8,
-	12393 - 11905: 0xA4C9,
-	12394 - 11905: 0xA4CA,
-	12395 - 11905: 0xA4CB,
-	12396 - 11905: 0xA4CC,
-	12397 - 11905: 0xA4CD,
-	12398 - 11905: 0xA4CE,
-	12399 - 11905: 0xA4CF,
-	12400 - 11905: 0xA4D0,
-	12401 - 11905: 0xA4D1,
-	12402 - 11905: 0xA4D2,
-	12403 - 11905: 0xA4D3,
-	12404 - 11905: 0xA4D4,
-	12405 - 11905: 0xA4D5,
-	12406 - 11905: 0xA4D6,
-	12407 - 11905: 0xA4D7,
-	12408 - 11905: 0xA4D8,
-	12409 - 11905: 0xA4D9,
-	12410 - 11905: 0xA4DA,
-	12411 - 11905: 0xA4DB,
-	12412 - 11905: 0xA4DC,
-	12413 - 11905: 0xA4DD,
-	12414 - 11905: 0xA4DE,
-	12415 - 11905: 0xA4DF,
-	12416 - 11905: 0xA4E0,
-	12417 - 11905: 0xA4E1,
-	12418 - 11905: 0xA4E2,
-	12419 - 11905: 0xA4E3,
-	12420 - 11905: 0xA4E4,
-	12421 - 11905: 0xA4E5,
-	12422 - 11905: 0xA4E6,
-	12423 - 11905: 0xA4E7,
-	12424 - 11905: 0xA4E8,
-	12425 - 11905: 0xA4E9,
-	12426 - 11905: 0xA4EA,
-	12427 - 11905: 0xA4EB,
-	12428 - 11905: 0xA4EC,
-	12429 - 11905: 0xA4ED,
-	12430 - 11905: 0xA4EE,
-	12431 - 11905: 0xA4EF,
-	12432 - 11905: 0xA4F0,
-	12433 - 11905: 0xA4F1,
-	12434 - 11905: 0xA4F2,
-	12435 - 11905: 0xA4F3,
-	12443 - 11905: 0xA961,
-	12444 - 11905: 0xA962,
-	12445 - 11905: 0xA966,
-	12446 - 11905: 0xA967,
-	12449 - 11905: 0xA5A1,
-	12450 - 11905: 0xA5A2,
-	12451 - 11905: 0xA5A3,
-	12452 - 11905: 0xA5A4,
-	12453 - 11905: 0xA5A5,
-	12454 - 11905: 0xA5A6,
-	12455 - 11905: 0xA5A7,
-	12456 - 11905: 0xA5A8,
-	12457 - 11905: 0xA5A9,
-	12458 - 11905: 0xA5AA,
-	12459 - 11905: 0xA5AB,
-	12460 - 11905: 0xA5AC,
-	12461 - 11905: 0xA5AD,
-	12462 - 11905: 0xA5AE,
-	12463 - 11905: 0xA5AF,
-	12464 - 11905: 0xA5B0,
-	12465 - 11905: 0xA5B1,
-	12466 - 11905: 0xA5B2,
-	12467 - 11905: 0xA5B3,
-	12468 - 11905: 0xA5B4,
-	12469 - 11905: 0xA5B5,
-	12470 - 11905: 0xA5B6,
-	12471 - 11905: 0xA5B7,
-	12472 - 11905: 0xA5B8,
-	12473 - 11905: 0xA5B9,
-	12474 - 11905: 0xA5BA,
-	12475 - 11905: 0xA5BB,
-	12476 - 11905: 0xA5BC,
-	12477 - 11905: 0xA5BD,
-	12478 - 11905: 0xA5BE,
-	12479 - 11905: 0xA5BF,
-	12480 - 11905: 0xA5C0,
-	12481 - 11905: 0xA5C1,
-	12482 - 11905: 0xA5C2,
-	12483 - 11905: 0xA5C3,
-	12484 - 11905: 0xA5C4,
-	12485 - 11905: 0xA5C5,
-	12486 - 11905: 0xA5C6,
-	12487 - 11905: 0xA5C7,
-	12488 - 11905: 0xA5C8,
-	12489 - 11905: 0xA5C9,
-	12490 - 11905: 0xA5CA,
-	12491 - 11905: 0xA5CB,
-	12492 - 11905: 0xA5CC,
-	12493 - 11905: 0xA5CD,
-	12494 - 11905: 0xA5CE,
-	12495 - 11905: 0xA5CF,
-	12496 - 11905: 0xA5D0,
-	12497 - 11905: 0xA5D1,
-	12498 - 11905: 0xA5D2,
-	12499 - 11905: 0xA5D3,
-	12500 - 11905: 0xA5D4,
-	12501 - 11905: 0xA5D5,
-	12502 - 11905: 0xA5D6,
-	12503 - 11905: 0xA5D7,
-	12504 - 11905: 0xA5D8,
-	12505 - 11905: 0xA5D9,
-	12506 - 11905: 0xA5DA,
-	12507 - 11905: 0xA5DB,
-	12508 - 11905: 0xA5DC,
-	12509 - 11905: 0xA5DD,
-	12510 - 11905: 0xA5DE,
-	12511 - 11905: 0xA5DF,
-	12512 - 11905: 0xA5E0,
-	12513 - 11905: 0xA5E1,
-	12514 - 11905: 0xA5E2,
-	12515 - 11905: 0xA5E3,
-	12516 - 11905: 0xA5E4,
-	12517 - 11905: 0xA5E5,
-	12518 - 11905: 0xA5E6,
-	12519 - 11905: 0xA5E7,
-	12520 - 11905: 0xA5E8,
-	12521 - 11905: 0xA5E9,
-	12522 - 11905: 0xA5EA,
-	12523 - 11905: 0xA5EB,
-	12524 - 11905: 0xA5EC,
-	12525 - 11905: 0xA5ED,
-	12526 - 11905: 0xA5EE,
-	12527 - 11905: 0xA5EF,
-	12528 - 11905: 0xA5F0,
-	12529 - 11905: 0xA5F1,
-	12530 - 11905: 0xA5F2,
-	12531 - 11905: 0xA5F3,
-	12532 - 11905: 0xA5F4,
-	12533 - 11905: 0xA5F5,
-	12534 - 11905: 0xA5F6,
-	12540 - 11905: 0xA960,
-	12541 - 11905: 0xA963,
-	12542 - 11905: 0xA964,
-	12549 - 11905: 0xA8C5,
-	12550 - 11905: 0xA8C6,
-	12551 - 11905: 0xA8C7,
-	12552 - 11905: 0xA8C8,
-	12553 - 11905: 0xA8C9,
-	12554 - 11905: 0xA8CA,
-	12555 - 11905: 0xA8CB,
-	12556 - 11905: 0xA8CC,
-	12557 - 11905: 0xA8CD,
-	12558 - 11905: 0xA8CE,
-	12559 - 11905: 0xA8CF,
-	12560 - 11905: 0xA8D0,
-	12561 - 11905: 0xA8D1,
-	12562 - 11905: 0xA8D2,
-	12563 - 11905: 0xA8D3,
-	12564 - 11905: 0xA8D4,
-	12565 - 11905: 0xA8D5,
-	12566 - 11905: 0xA8D6,
-	12567 - 11905: 0xA8D7,
-	12568 - 11905: 0xA8D8,
-	12569 - 11905: 0xA8D9,
-	12570 - 11905: 0xA8DA,
-	12571 - 11905: 0xA8DB,
-	12572 - 11905: 0xA8DC,
-	12573 - 11905: 0xA8DD,
-	12574 - 11905: 0xA8DE,
-	12575 - 11905: 0xA8DF,
-	12576 - 11905: 0xA8E0,
-	12577 - 11905: 0xA8E1,
-	12578 - 11905: 0xA8E2,
-	12579 - 11905: 0xA8E3,
-	12580 - 11905: 0xA8E4,
-	12581 - 11905: 0xA8E5,
-	12582 - 11905: 0xA8E6,
-	12583 - 11905: 0xA8E7,
-	12584 - 11905: 0xA8E8,
-	12585 - 11905: 0xA8E9,
-	12832 - 11905: 0xA2E5,
-	12833 - 11905: 0xA2E6,
-	12834 - 11905: 0xA2E7,
-	12835 - 11905: 0xA2E8,
-	12836 - 11905: 0xA2E9,
-	12837 - 11905: 0xA2EA,
-	12838 - 11905: 0xA2EB,
-	12839 - 11905: 0xA2EC,
-	12840 - 11905: 0xA2ED,
-	12841 - 11905: 0xA2EE,
-	12849 - 11905: 0xA95A,
-	12963 - 11905: 0xA949,
-	13198 - 11905: 0xA94A,
-	13199 - 11905: 0xA94B,
-	13212 - 11905: 0xA94C,
-	13213 - 11905: 0xA94D,
-	13214 - 11905: 0xA94E,
-	13217 - 11905: 0xA94F,
-	13252 - 11905: 0xA950,
-	13262 - 11905: 0xA951,
-	13265 - 11905: 0xA952,
-	13266 - 11905: 0xA953,
-	13269 - 11905: 0xA954,
-	13383 - 11905: 0xFE56,
-	13427 - 11905: 0xFE55,
-	13726 - 11905: 0xFE5A,
-	13838 - 11905: 0xFE5C,
-	13850 - 11905: 0xFE5B,
-	14616 - 11905: 0xFE60,
-	14702 - 11905: 0xFE5F,
-	14799 - 11905: 0xFE62,
-	14800 - 11905: 0xFE65,
-	14815 - 11905: 0xFE63,
-	14963 - 11905: 0xFE64,
-	15182 - 11905: 0xFE68,
-	15470 - 11905: 0xFE69,
-	15584 - 11905: 0xFE6A,
-	16470 - 11905: 0xFE6F,
-	16735 - 11905: 0xFE70,
-	17207 - 11905: 0xFE72,
-	17324 - 11905: 0xFE78,
-	17329 - 11905: 0xFE77,
-	17373 - 11905: 0xFE7A,
-	17622 - 11905: 0xFE7B,
-	17996 - 11905: 0xFE7D,
-	18017 - 11905: 0xFE7C,
-	18211 - 11905: 0xFE80,
-	18217 - 11905: 0xFE81,
-	18300 - 11905: 0xFE82,
-	18317 - 11905: 0xFE83,
-	18759 - 11905: 0xFE85,
-	18810 - 11905: 0xFE86,
-	18813 - 11905: 0xFE87,
-	18818 - 11905: 0xFE88,
-	18819 - 11905: 0xFE89,
-	18821 - 11905: 0xFE8A,
-	18822 - 11905: 0xFE8B,
-	18843 - 11905: 0xFE8D,
-	18847 - 11905: 0xFE8C,
-	18870 - 11905: 0xFE8F,
-	18871 - 11905: 0xFE8E,
-	19575 - 11905: 0xFE96,
-	19615 - 11905: 0xFE93,
-	19616 - 11905: 0xFE94,
-	19617 - 11905: 0xFE95,
-	19618 - 11905: 0xFE97,
-	19619 - 11905: 0xFE92,
-	19731 - 11905: 0xFE98,
-	19732 - 11905: 0xFE99,
-	19733 - 11905: 0xFE9A,
-	19734 - 11905: 0xFE9B,
-	19735 - 11905: 0xFE9C,
-	19736 - 11905: 0xFE9D,
-	19737 - 11905: 0xFE9E,
-	19886 - 11905: 0xFE9F,
-	19968 - 11905: 0xD2BB,
-	19969 - 11905: 0xB6A1,
-	19970 - 11905: 0x8140,
-	19971 - 11905: 0xC6DF,
-	19972 - 11905: 0x8141,
-	19973 - 11905: 0x8142,
-	19974 - 11905: 0x8143,
-	19975 - 11905: 0xCDF2,
-	19976 - 11905: 0xD5C9,
-	19977 - 11905: 0xC8FD,
-	19978 - 11905: 0xC9CF,
-	19979 - 11905: 0xCFC2,
-	19980 - 11905: 0xD8A2,
-	19981 - 11905: 0xB2BB,
-	19982 - 11905: 0xD3EB,
-	19983 - 11905: 0x8144,
-	19984 - 11905: 0xD8A4,
-	19985 - 11905: 0xB3F3,
-	19986 - 11905: 0x8145,
-	19987 - 11905: 0xD7A8,
-	19988 - 11905: 0xC7D2,
-	19989 - 11905: 0xD8A7,
-	19990 - 11905: 0xCAC0,
-	19991 - 11905: 0x8146,
-	19992 - 11905: 0xC7F0,
-	19993 - 11905: 0xB1FB,
-	19994 - 11905: 0xD2B5,
-	19995 - 11905: 0xB4D4,
-	19996 - 11905: 0xB6AB,
-	19997 - 11905: 0xCBBF,
-	19998 - 11905: 0xD8A9,
-	19999 - 11905: 0x8147,
-	20000 - 11905: 0x8148,
-	20001 - 11905: 0x8149,
-	20002 - 11905: 0xB6AA,
-	20003 - 11905: 0x814A,
-	20004 - 11905: 0xC1BD,
-	20005 - 11905: 0xD1CF,
-	20006 - 11905: 0x814B,
-	20007 - 11905: 0xC9A5,
-	20008 - 11905: 0xD8AD,
-	20009 - 11905: 0x814C,
-	20010 - 11905: 0xB8F6,
-	20011 - 11905: 0xD1BE,
-	20012 - 11905: 0xE3DC,
-	20013 - 11905: 0xD6D0,
-	20014 - 11905: 0x814D,
-	20015 - 11905: 0x814E,
-	20016 - 11905: 0xB7E1,
-	20017 - 11905: 0x814F,
-	20018 - 11905: 0xB4AE,
-	20019 - 11905: 0x8150,
-	20020 - 11905: 0xC1D9,
-	20021 - 11905: 0x8151,
-	20022 - 11905: 0xD8BC,
-	20023 - 11905: 0x8152,
-	20024 - 11905: 0xCDE8,
-	20025 - 11905: 0xB5A4,
-	20026 - 11905: 0xCEAA,
-	20027 - 11905: 0xD6F7,
-	20028 - 11905: 0x8153,
-	20029 - 11905: 0xC0F6,
-	20030 - 11905: 0xBED9,
-	20031 - 11905: 0xD8AF,
-	20032 - 11905: 0x8154,
-	20033 - 11905: 0x8155,
-	20034 - 11905: 0x8156,
-	20035 - 11905: 0xC4CB,
-	20036 - 11905: 0x8157,
-	20037 - 11905: 0xBEC3,
-	20038 - 11905: 0x8158,
-	20039 - 11905: 0xD8B1,
-	20040 - 11905: 0xC3B4,
-	20041 - 11905: 0xD2E5,
-	20042 - 11905: 0x8159,
-	20043 - 11905: 0xD6AE,
-	20044 - 11905: 0xCEDA,
-	20045 - 11905: 0xD5A7,
-	20046 - 11905: 0xBAF5,
-	20047 - 11905: 0xB7A6,
-	20048 - 11905: 0xC0D6,
-	20049 - 11905: 0x815A,
-	20050 - 11905: 0xC6B9,
-	20051 - 11905: 0xC5D2,
-	20052 - 11905: 0xC7C7,
-	20053 - 11905: 0x815B,
-	20054 - 11905: 0xB9D4,
-	20055 - 11905: 0x815C,
-	20056 - 11905: 0xB3CB,
-	20057 - 11905: 0xD2D2,
-	20058 - 11905: 0x815D,
-	20059 - 11905: 0x815E,
-	20060 - 11905: 0xD8BF,
-	20061 - 11905: 0xBEC5,
-	20062 - 11905: 0xC6F2,
-	20063 - 11905: 0xD2B2,
-	20064 - 11905: 0xCFB0,
-	20065 - 11905: 0xCFE7,
-	20066 - 11905: 0x815F,
-	20067 - 11905: 0x8160,
-	20068 - 11905: 0x8161,
-	20069 - 11905: 0x8162,
-	20070 - 11905: 0xCAE9,
-	20071 - 11905: 0x8163,
-	20072 - 11905: 0x8164,
-	20073 - 11905: 0xD8C0,
-	20074 - 11905: 0x8165,
-	20075 - 11905: 0x8166,
-	20076 - 11905: 0x8167,
-	20077 - 11905: 0x8168,
-	20078 - 11905: 0x8169,
-	20079 - 11905: 0x816A,
-	20080 - 11905: 0xC2F2,
-	20081 - 11905: 0xC2D2,
-	20082 - 11905: 0x816B,
-	20083 - 11905: 0xC8E9,
-	20084 - 11905: 0x816C,
-	20085 - 11905: 0x816D,
-	20086 - 11905: 0x816E,
-	20087 - 11905: 0x816F,
-	20088 - 11905: 0x8170,
-	20089 - 11905: 0x8171,
-	20090 - 11905: 0x8172,
-	20091 - 11905: 0x8173,
-	20092 - 11905: 0x8174,
-	20093 - 11905: 0x8175,
-	20094 - 11905: 0xC7AC,
-	20095 - 11905: 0x8176,
-	20096 - 11905: 0x8177,
-	20097 - 11905: 0x8178,
-	20098 - 11905: 0x8179,
-	20099 - 11905: 0x817A,
-	20100 - 11905: 0x817B,
-	20101 - 11905: 0x817C,
-	20102 - 11905: 0xC1CB,
-	20103 - 11905: 0x817D,
-	20104 - 11905: 0xD3E8,
-	20105 - 11905: 0xD5F9,
-	20106 - 11905: 0x817E,
-	20107 - 11905: 0xCAC2,
-	20108 - 11905: 0xB6FE,
-	20109 - 11905: 0xD8A1,
-	20110 - 11905: 0xD3DA,
-	20111 - 11905: 0xBFF7,
-	20112 - 11905: 0x8180,
-	20113 - 11905: 0xD4C6,
-	20114 - 11905: 0xBBA5,
-	20115 - 11905: 0xD8C1,
-	20116 - 11905: 0xCEE5,
-	20117 - 11905: 0xBEAE,
-	20118 - 11905: 0x8181,
-	20119 - 11905: 0x8182,
-	20120 - 11905: 0xD8A8,
-	20121 - 11905: 0x8183,
-	20122 - 11905: 0xD1C7,
-	20123 - 11905: 0xD0A9,
-	20124 - 11905: 0x8184,
-	20125 - 11905: 0x8185,
-	20126 - 11905: 0x8186,
-	20127 - 11905: 0xD8BD,
-	20128 - 11905: 0xD9EF,
-	20129 - 11905: 0xCDF6,
-	20130 - 11905: 0xBFBA,
-	20131 - 11905: 0x8187,
-	20132 - 11905: 0xBDBB,
-	20133 - 11905: 0xBAA5,
-	20134 - 11905: 0xD2E0,
-	20135 - 11905: 0xB2FA,
-	20136 - 11905: 0xBAE0,
-	20137 - 11905: 0xC4B6,
-	20138 - 11905: 0x8188,
-	20139 - 11905: 0xCFED,
-	20140 - 11905: 0xBEA9,
-	20141 - 11905: 0xCDA4,
-	20142 - 11905: 0xC1C1,
-	20143 - 11905: 0x8189,
-	20144 - 11905: 0x818A,
-	20145 - 11905: 0x818B,
-	20146 - 11905: 0xC7D7,
-	20147 - 11905: 0xD9F1,
-	20148 - 11905: 0x818C,
-	20149 - 11905: 0xD9F4,
-	20150 - 11905: 0x818D,
-	20151 - 11905: 0x818E,
-	20152 - 11905: 0x818F,
-	20153 - 11905: 0x8190,
-	20154 - 11905: 0xC8CB,
-	20155 - 11905: 0xD8E9,
-	20156 - 11905: 0x8191,
-	20157 - 11905: 0x8192,
-	20158 - 11905: 0x8193,
-	20159 - 11905: 0xD2DA,
-	20160 - 11905: 0xCAB2,
-	20161 - 11905: 0xC8CA,
-	20162 - 11905: 0xD8EC,
-	20163 - 11905: 0xD8EA,
-	20164 - 11905: 0xD8C6,
-	20165 - 11905: 0xBDF6,
-	20166 - 11905: 0xC6CD,
-	20167 - 11905: 0xB3F0,
-	20168 - 11905: 0x8194,
-	20169 - 11905: 0xD8EB,
-	20170 - 11905: 0xBDF1,
-	20171 - 11905: 0xBDE9,
-	20172 - 11905: 0x8195,
-	20173 - 11905: 0xC8D4,
-	20174 - 11905: 0xB4D3,
-	20175 - 11905: 0x8196,
-	20176 - 11905: 0x8197,
-	20177 - 11905: 0xC2D8,
-	20178 - 11905: 0x8198,
-	20179 - 11905: 0xB2D6,
-	20180 - 11905: 0xD7D0,
-	20181 - 11905: 0xCACB,
-	20182 - 11905: 0xCBFB,
-	20183 - 11905: 0xD5CC,
-	20184 - 11905: 0xB8B6,
-	20185 - 11905: 0xCFC9,
-	20186 - 11905: 0x8199,
-	20187 - 11905: 0x819A,
-	20188 - 11905: 0x819B,
-	20189 - 11905: 0xD9DA,
-	20190 - 11905: 0xD8F0,
-	20191 - 11905: 0xC7AA,
-	20192 - 11905: 0x819C,
-	20193 - 11905: 0xD8EE,
-	20194 - 11905: 0x819D,
-	20195 - 11905: 0xB4FA,
-	20196 - 11905: 0xC1EE,
-	20197 - 11905: 0xD2D4,
-	20198 - 11905: 0x819E,
-	20199 - 11905: 0x819F,
-	20200 - 11905: 0xD8ED,
-	20201 - 11905: 0x81A0,
-	20202 - 11905: 0xD2C7,
-	20203 - 11905: 0xD8EF,
-	20204 - 11905: 0xC3C7,
-	20205 - 11905: 0x81A1,
-	20206 - 11905: 0x81A2,
-	20207 - 11905: 0x81A3,
-	20208 - 11905: 0xD1F6,
-	20209 - 11905: 0x81A4,
-	20210 - 11905: 0xD6D9,
-	20211 - 11905: 0xD8F2,
-	20212 - 11905: 0x81A5,
-	20213 - 11905: 0xD8F5,
-	20214 - 11905: 0xBCFE,
-	20215 - 11905: 0xBCDB,
-	20216 - 11905: 0x81A6,
-	20217 - 11905: 0x81A7,
-	20218 - 11905: 0x81A8,
-	20219 - 11905: 0xC8CE,
-	20220 - 11905: 0x81A9,
-	20221 - 11905: 0xB7DD,
-	20222 - 11905: 0x81AA,
-	20223 - 11905: 0xB7C2,
-	20224 - 11905: 0x81AB,
-	20225 - 11905: 0xC6F3,
-	20226 - 11905: 0x81AC,
-	20227 - 11905: 0x81AD,
-	20228 - 11905: 0x81AE,
-	20229 - 11905: 0x81AF,
-	20230 - 11905: 0x81B0,
-	20231 - 11905: 0x81B1,
-	20232 - 11905: 0x81B2,
-	20233 - 11905: 0xD8F8,
-	20234 - 11905: 0xD2C1,
-	20235 - 11905: 0x81B3,
-	20236 - 11905: 0x81B4,
-	20237 - 11905: 0xCEE9,
-	20238 - 11905: 0xBCBF,
-	20239 - 11905: 0xB7FC,
-	20240 - 11905: 0xB7A5,
-	20241 - 11905: 0xD0DD,
-	20242 - 11905: 0x81B5,
-	20243 - 11905: 0x81B6,
-	20244 - 11905: 0x81B7,
-	20245 - 11905: 0x81B8,
-	20246 - 11905: 0x81B9,
-	20247 - 11905: 0xD6DA,
-	20248 - 11905: 0xD3C5,
-	20249 - 11905: 0xBBEF,
-	20250 - 11905: 0xBBE1,
-	20251 - 11905: 0xD8F1,
-	20252 - 11905: 0x81BA,
-	20253 - 11905: 0x81BB,
-	20254 - 11905: 0xC9A1,
-	20255 - 11905: 0xCEB0,
-	20256 - 11905: 0xB4AB,
-	20257 - 11905: 0x81BC,
-	20258 - 11905: 0xD8F3,
-	20259 - 11905: 0x81BD,
-	20260 - 11905: 0xC9CB,
-	20261 - 11905: 0xD8F6,
-	20262 - 11905: 0xC2D7,
-	20263 - 11905: 0xD8F7,
-	20264 - 11905: 0x81BE,
-	20265 - 11905: 0x81BF,
-	20266 - 11905: 0xCEB1,
-	20267 - 11905: 0xD8F9,
-	20268 - 11905: 0x81C0,
-	20269 - 11905: 0x81C1,
-	20270 - 11905: 0x81C2,
-	20271 - 11905: 0xB2AE,
-	20272 - 11905: 0xB9C0,
-	20273 - 11905: 0x81C3,
-	20274 - 11905: 0xD9A3,
-	20275 - 11905: 0x81C4,
-	20276 - 11905: 0xB0E9,
-	20277 - 11905: 0x81C5,
-	20278 - 11905: 0xC1E6,
-	20279 - 11905: 0x81C6,
-	20280 - 11905: 0xC9EC,
-	20281 - 11905: 0x81C7,
-	20282 - 11905: 0xCBC5,
-	20283 - 11905: 0x81C8,
-	20284 - 11905: 0xCBC6,
-	20285 - 11905: 0xD9A4,
-	20286 - 11905: 0x81C9,
-	20287 - 11905: 0x81CA,
-	20288 - 11905: 0x81CB,
-	20289 - 11905: 0x81CC,
-	20290 - 11905: 0x81CD,
-	20291 - 11905: 0xB5E8,
-	20292 - 11905: 0x81CE,
-	20293 - 11905: 0x81CF,
-	20294 - 11905: 0xB5AB,
-	20295 - 11905: 0x81D0,
-	20296 - 11905: 0x81D1,
-	20297 - 11905: 0x81D2,
-	20298 - 11905: 0x81D3,
-	20299 - 11905: 0x81D4,
-	20300 - 11905: 0x81D5,
-	20301 - 11905: 0xCEBB,
-	20302 - 11905: 0xB5CD,
-	20303 - 11905: 0xD7A1,
-	20304 - 11905: 0xD7F4,
-	20305 - 11905: 0xD3D3,
-	20306 - 11905: 0x81D6,
-	20307 - 11905: 0xCCE5,
-	20308 - 11905: 0x81D7,
-	20309 - 11905: 0xBACE,
-	20310 - 11905: 0x81D8,
-	20311 - 11905: 0xD9A2,
-	20312 - 11905: 0xD9DC,
-	20313 - 11905: 0xD3E0,
-	20314 - 11905: 0xD8FD,
-	20315 - 11905: 0xB7F0,
-	20316 - 11905: 0xD7F7,
-	20317 - 11905: 0xD8FE,
-	20318 - 11905: 0xD8FA,
-	20319 - 11905: 0xD9A1,
-	20320 - 11905: 0xC4E3,
-	20321 - 11905: 0x81D9,
-	20322 - 11905: 0x81DA,
-	20323 - 11905: 0xD3B6,
-	20324 - 11905: 0xD8F4,
-	20325 - 11905: 0xD9DD,
-	20326 - 11905: 0x81DB,
-	20327 - 11905: 0xD8FB,
-	20328 - 11905: 0x81DC,
-	20329 - 11905: 0xC5E5,
-	20330 - 11905: 0x81DD,
-	20331 - 11905: 0x81DE,
-	20332 - 11905: 0xC0D0,
-	20333 - 11905: 0x81DF,
-	20334 - 11905: 0x81E0,
-	20335 - 11905: 0xD1F0,
-	20336 - 11905: 0xB0DB,
-	20337 - 11905: 0x81E1,
-	20338 - 11905: 0x81E2,
-	20339 - 11905: 0xBCD1,
-	20340 - 11905: 0xD9A6,
-	20341 - 11905: 0x81E3,
-	20342 - 11905: 0xD9A5,
-	20343 - 11905: 0x81E4,
-	20344 - 11905: 0x81E5,
-	20345 - 11905: 0x81E6,
-	20346 - 11905: 0x81E7,
-	20347 - 11905: 0xD9AC,
-	20348 - 11905: 0xD9AE,
-	20349 - 11905: 0x81E8,
-	20350 - 11905: 0xD9AB,
-	20351 - 11905: 0xCAB9,
-	20352 - 11905: 0x81E9,
-	20353 - 11905: 0x81EA,
-	20354 - 11905: 0x81EB,
-	20355 - 11905: 0xD9A9,
-	20356 - 11905: 0xD6B6,
-	20357 - 11905: 0x81EC,
-	20358 - 11905: 0x81ED,
-	20359 - 11905: 0x81EE,
-	20360 - 11905: 0xB3DE,
-	20361 - 11905: 0xD9A8,
-	20362 - 11905: 0x81EF,
-	20363 - 11905: 0xC0FD,
-	20364 - 11905: 0x81F0,
-	20365 - 11905: 0xCACC,
-	20366 - 11905: 0x81F1,
-	20367 - 11905: 0xD9AA,
-	20368 - 11905: 0x81F2,
-	20369 - 11905: 0xD9A7,
-	20370 - 11905: 0x81F3,
-	20371 - 11905: 0x81F4,
-	20372 - 11905: 0xD9B0,
-	20373 - 11905: 0x81F5,
-	20374 - 11905: 0x81F6,
-	20375 - 11905: 0xB6B1,
-	20376 - 11905: 0x81F7,
-	20377 - 11905: 0x81F8,
-	20378 - 11905: 0x81F9,
-	20379 - 11905: 0xB9A9,
-	20380 - 11905: 0x81FA,
-	20381 - 11905: 0xD2C0,
-	20382 - 11905: 0x81FB,
-	20383 - 11905: 0x81FC,
-	20384 - 11905: 0xCFC0,
-	20385 - 11905: 0x81FD,
-	20386 - 11905: 0x81FE,
-	20387 - 11905: 0xC2C2,
-	20388 - 11905: 0x8240,
-	20389 - 11905: 0xBDC4,
-	20390 - 11905: 0xD5EC,
-	20391 - 11905: 0xB2E0,
-	20392 - 11905: 0xC7C8,
-	20393 - 11905: 0xBFEB,
-	20394 - 11905: 0xD9AD,
-	20395 - 11905: 0x8241,
-	20396 - 11905: 0xD9AF,
-	20397 - 11905: 0x8242,
-	20398 - 11905: 0xCEEA,
-	20399 - 11905: 0xBAEE,
-	20400 - 11905: 0x8243,
-	20401 - 11905: 0x8244,
-	20402 - 11905: 0x8245,
-	20403 - 11905: 0x8246,
-	20404 - 11905: 0x8247,
-	20405 - 11905: 0xC7D6,
-	20406 - 11905: 0x8248,
-	20407 - 11905: 0x8249,
-	20408 - 11905: 0x824A,
-	20409 - 11905: 0x824B,
-	20410 - 11905: 0x824C,
-	20411 - 11905: 0x824D,
-	20412 - 11905: 0x824E,
-	20413 - 11905: 0x824F,
-	20414 - 11905: 0x8250,
-	20415 - 11905: 0xB1E3,
-	20416 - 11905: 0x8251,
-	20417 - 11905: 0x8252,
-	20418 - 11905: 0x8253,
-	20419 - 11905: 0xB4D9,
-	20420 - 11905: 0xB6ED,
-	20421 - 11905: 0xD9B4,
-	20422 - 11905: 0x8254,
-	20423 - 11905: 0x8255,
-	20424 - 11905: 0x8256,
-	20425 - 11905: 0x8257,
-	20426 - 11905: 0xBFA1,
-	20427 - 11905: 0x8258,
-	20428 - 11905: 0x8259,
-	20429 - 11905: 0x825A,
-	20430 - 11905: 0xD9DE,
-	20431 - 11905: 0xC7CE,
-	20432 - 11905: 0xC0FE,
-	20433 - 11905: 0xD9B8,
-	20434 - 11905: 0x825B,
-	20435 - 11905: 0x825C,
-	20436 - 11905: 0x825D,
-	20437 - 11905: 0x825E,
-	20438 - 11905: 0x825F,
-	20439 - 11905: 0xCBD7,
-	20440 - 11905: 0xB7FD,
-	20441 - 11905: 0x8260,
-	20442 - 11905: 0xD9B5,
-	20443 - 11905: 0x8261,
-	20444 - 11905: 0xD9B7,
-	20445 - 11905: 0xB1A3,
-	20446 - 11905: 0xD3E1,
-	20447 - 11905: 0xD9B9,
-	20448 - 11905: 0x8262,
-	20449 - 11905: 0xD0C5,
-	20450 - 11905: 0x8263,
-	20451 - 11905: 0xD9B6,
-	20452 - 11905: 0x8264,
-	20453 - 11905: 0x8265,
-	20454 - 11905: 0xD9B1,
-	20455 - 11905: 0x8266,
-	20456 - 11905: 0xD9B2,
-	20457 - 11905: 0xC1A9,
-	20458 - 11905: 0xD9B3,
-	20459 - 11905: 0x8267,
-	20460 - 11905: 0x8268,
-	20461 - 11905: 0xBCF3,
-	20462 - 11905: 0xD0DE,
-	20463 - 11905: 0xB8A9,
-	20464 - 11905: 0x8269,
-	20465 - 11905: 0xBEE3,
-	20466 - 11905: 0x826A,
-	20467 - 11905: 0xD9BD,
-	20468 - 11905: 0x826B,
-	20469 - 11905: 0x826C,
-	20470 - 11905: 0x826D,
-	20471 - 11905: 0x826E,
-	20472 - 11905: 0xD9BA,
-	20473 - 11905: 0x826F,
-	20474 - 11905: 0xB0B3,
-	20475 - 11905: 0x8270,
-	20476 - 11905: 0x8271,
-	20477 - 11905: 0x8272,
-	20478 - 11905: 0xD9C2,
-	20479 - 11905: 0x8273,
-	20480 - 11905: 0x8274,
-	20481 - 11905: 0x8275,
-	20482 - 11905: 0x8276,
-	20483 - 11905: 0x8277,
-	20484 - 11905: 0x8278,
-	20485 - 11905: 0x8279,
-	20486 - 11905: 0x827A,
-	20487 - 11905: 0x827B,
-	20488 - 11905: 0x827C,
-	20489 - 11905: 0x827D,
-	20490 - 11905: 0x827E,
-	20491 - 11905: 0x8280,
-	20492 - 11905: 0xD9C4,
-	20493 - 11905: 0xB1B6,
-	20494 - 11905: 0x8281,
-	20495 - 11905: 0xD9BF,
-	20496 - 11905: 0x8282,
-	20497 - 11905: 0x8283,
-	20498 - 11905: 0xB5B9,
-	20499 - 11905: 0x8284,
-	20500 - 11905: 0xBEF3,
-	20501 - 11905: 0x8285,
-	20502 - 11905: 0x8286,
-	20503 - 11905: 0x8287,
-	20504 - 11905: 0xCCC8,
-	20505 - 11905: 0xBAF2,
-	20506 - 11905: 0xD2D0,
-	20507 - 11905: 0x8288,
-	20508 - 11905: 0xD9C3,
-	20509 - 11905: 0x8289,
-	20510 - 11905: 0x828A,
-	20511 - 11905: 0xBDE8,
-	20512 - 11905: 0x828B,
-	20513 - 11905: 0xB3AB,
-	20514 - 11905: 0x828C,
-	20515 - 11905: 0x828D,
-	20516 - 11905: 0x828E,
-	20517 - 11905: 0xD9C5,
-	20518 - 11905: 0xBEEB,
-	20519 - 11905: 0x828F,
-	20520 - 11905: 0xD9C6,
-	20521 - 11905: 0xD9BB,
-	20522 - 11905: 0xC4DF,
-	20523 - 11905: 0x8290,
-	20524 - 11905: 0xD9BE,
-	20525 - 11905: 0xD9C1,
-	20526 - 11905: 0xD9C0,
-	20527 - 11905: 0x8291,
-	20528 - 11905: 0x8292,
-	20529 - 11905: 0x8293,
-	20530 - 11905: 0x8294,
-	20531 - 11905: 0x8295,
-	20532 - 11905: 0x8296,
-	20533 - 11905: 0x8297,
-	20534 - 11905: 0x8298,
-	20535 - 11905: 0x8299,
-	20536 - 11905: 0x829A,
-	20537 - 11905: 0x829B,
-	20538 - 11905: 0xD5AE,
-	20539 - 11905: 0x829C,
-	20540 - 11905: 0xD6B5,
-	20541 - 11905: 0x829D,
-	20542 - 11905: 0xC7E3,
-	20543 - 11905: 0x829E,
-	20544 - 11905: 0x829F,
-	20545 - 11905: 0x82A0,
-	20546 - 11905: 0x82A1,
-	20547 - 11905: 0xD9C8,
-	20548 - 11905: 0x82A2,
-	20549 - 11905: 0x82A3,
-	20550 - 11905: 0x82A4,
-	20551 - 11905: 0xBCD9,
-	20552 - 11905: 0xD9CA,
-	20553 - 11905: 0x82A5,
-	20554 - 11905: 0x82A6,
-	20555 - 11905: 0x82A7,
-	20556 - 11905: 0xD9BC,
-	20557 - 11905: 0x82A8,
-	20558 - 11905: 0xD9CB,
-	20559 - 11905: 0xC6AB,
-	20560 - 11905: 0x82A9,
-	20561 - 11905: 0x82AA,
-	20562 - 11905: 0x82AB,
-	20563 - 11905: 0x82AC,
-	20564 - 11905: 0x82AD,
-	20565 - 11905: 0xD9C9,
-	20566 - 11905: 0x82AE,
-	20567 - 11905: 0x82AF,
-	20568 - 11905: 0x82B0,
-	20569 - 11905: 0x82B1,
-	20570 - 11905: 0xD7F6,
-	20571 - 11905: 0x82B2,
-	20572 - 11905: 0xCDA3,
-	20573 - 11905: 0x82B3,
-	20574 - 11905: 0x82B4,
-	20575 - 11905: 0x82B5,
-	20576 - 11905: 0x82B6,
-	20577 - 11905: 0x82B7,
-	20578 - 11905: 0x82B8,
-	20579 - 11905: 0x82B9,
-	20580 - 11905: 0x82BA,
-	20581 - 11905: 0xBDA1,
-	20582 - 11905: 0x82BB,
-	20583 - 11905: 0x82BC,
-	20584 - 11905: 0x82BD,
-	20585 - 11905: 0x82BE,
-	20586 - 11905: 0x82BF,
-	20587 - 11905: 0x82C0,
-	20588 - 11905: 0xD9CC,
-	20589 - 11905: 0x82C1,
-	20590 - 11905: 0x82C2,
-	20591 - 11905: 0x82C3,
-	20592 - 11905: 0x82C4,
-	20593 - 11905: 0x82C5,
-	20594 - 11905: 0x82C6,
-	20595 - 11905: 0x82C7,
-	20596 - 11905: 0x82C8,
-	20597 - 11905: 0x82C9,
-	20598 - 11905: 0xC5BC,
-	20599 - 11905: 0xCDB5,
-	20600 - 11905: 0x82CA,
-	20601 - 11905: 0x82CB,
-	20602 - 11905: 0x82CC,
-	20603 - 11905: 0xD9CD,
-	20604 - 11905: 0x82CD,
-	20605 - 11905: 0x82CE,
-	20606 - 11905: 0xD9C7,
-	20607 - 11905: 0xB3A5,
-	20608 - 11905: 0xBFFE,
-	20609 - 11905: 0x82CF,
-	20610 - 11905: 0x82D0,
-	20611 - 11905: 0x82D1,
-	20612 - 11905: 0x82D2,
-	20613 - 11905: 0xB8B5,
-	20614 - 11905: 0x82D3,
-	20615 - 11905: 0x82D4,
-	20616 - 11905: 0xC0FC,
-	20617 - 11905: 0x82D5,
-	20618 - 11905: 0x82D6,
-	20619 - 11905: 0x82D7,
-	20620 - 11905: 0x82D8,
-	20621 - 11905: 0xB0F8,
-	20622 - 11905: 0x82D9,
-	20623 - 11905: 0x82DA,
-	20624 - 11905: 0x82DB,
-	20625 - 11905: 0x82DC,
-	20626 - 11905: 0x82DD,
-	20627 - 11905: 0x82DE,
-	20628 - 11905: 0x82DF,
-	20629 - 11905: 0x82E0,
-	20630 - 11905: 0x82E1,
-	20631 - 11905: 0x82E2,
-	20632 - 11905: 0x82E3,
-	20633 - 11905: 0x82E4,
-	20634 - 11905: 0x82E5,
-	20635 - 11905: 0x82E6,
-	20636 - 11905: 0x82E7,
-	20637 - 11905: 0x82E8,
-	20638 - 11905: 0x82E9,
-	20639 - 11905: 0x82EA,
-	20640 - 11905: 0x82EB,
-	20641 - 11905: 0x82EC,
-	20642 - 11905: 0x82ED,
-	20643 - 11905: 0xB4F6,
-	20644 - 11905: 0x82EE,
-	20645 - 11905: 0xD9CE,
-	20646 - 11905: 0x82EF,
-	20647 - 11905: 0xD9CF,
-	20648 - 11905: 0xB4A2,
-	20649 - 11905: 0xD9D0,
-	20650 - 11905: 0x82F0,
-	20651 - 11905: 0x82F1,
-	20652 - 11905: 0xB4DF,
-	20653 - 11905: 0x82F2,
-	20654 - 11905: 0x82F3,
-	20655 - 11905: 0x82F4,
-	20656 - 11905: 0x82F5,
-	20657 - 11905: 0x82F6,
-	20658 - 11905: 0xB0C1,
-	20659 - 11905: 0x82F7,
-	20660 - 11905: 0x82F8,
-	20661 - 11905: 0x82F9,
-	20662 - 11905: 0x82FA,
-	20663 - 11905: 0x82FB,
-	20664 - 11905: 0x82FC,
-	20665 - 11905: 0x82FD,
-	20666 - 11905: 0xD9D1,
-	20667 - 11905: 0xC9B5,
-	20668 - 11905: 0x82FE,
-	20669 - 11905: 0x8340,
-	20670 - 11905: 0x8341,
-	20671 - 11905: 0x8342,
-	20672 - 11905: 0x8343,
-	20673 - 11905: 0x8344,
-	20674 - 11905: 0x8345,
-	20675 - 11905: 0x8346,
-	20676 - 11905: 0x8347,
-	20677 - 11905: 0x8348,
-	20678 - 11905: 0x8349,
-	20679 - 11905: 0x834A,
-	20680 - 11905: 0x834B,
-	20681 - 11905: 0x834C,
-	20682 - 11905: 0x834D,
-	20683 - 11905: 0x834E,
-	20684 - 11905: 0x834F,
-	20685 - 11905: 0x8350,
-	20686 - 11905: 0x8351,
-	20687 - 11905: 0xCFF1,
-	20688 - 11905: 0x8352,
-	20689 - 11905: 0x8353,
-	20690 - 11905: 0x8354,
-	20691 - 11905: 0x8355,
-	20692 - 11905: 0x8356,
-	20693 - 11905: 0x8357,
-	20694 - 11905: 0xD9D2,
-	20695 - 11905: 0x8358,
-	20696 - 11905: 0x8359,
-	20697 - 11905: 0x835A,
-	20698 - 11905: 0xC1C5,
-	20699 - 11905: 0x835B,
-	20700 - 11905: 0x835C,
-	20701 - 11905: 0x835D,
-	20702 - 11905: 0x835E,
-	20703 - 11905: 0x835F,
-	20704 - 11905: 0x8360,
-	20705 - 11905: 0x8361,
-	20706 - 11905: 0x8362,
-	20707 - 11905: 0x8363,
-	20708 - 11905: 0x8364,
-	20709 - 11905: 0x8365,
-	20710 - 11905: 0xD9D6,
-	20711 - 11905: 0xC9AE,
-	20712 - 11905: 0x8366,
-	20713 - 11905: 0x8367,
-	20714 - 11905: 0x8368,
-	20715 - 11905: 0x8369,
-	20716 - 11905: 0xD9D5,
-	20717 - 11905: 0xD9D4,
-	20718 - 11905: 0xD9D7,
-	20719 - 11905: 0x836A,
-	20720 - 11905: 0x836B,
-	20721 - 11905: 0x836C,
-	20722 - 11905: 0x836D,
-	20723 - 11905: 0xCBDB,
-	20724 - 11905: 0x836E,
-	20725 - 11905: 0xBDA9,
-	20726 - 11905: 0x836F,
-	20727 - 11905: 0x8370,
-	20728 - 11905: 0x8371,
-	20729 - 11905: 0x8372,
-	20730 - 11905: 0x8373,
-	20731 - 11905: 0xC6A7,
-	20732 - 11905: 0x8374,
-	20733 - 11905: 0x8375,
-	20734 - 11905: 0x8376,
-	20735 - 11905: 0x8377,
-	20736 - 11905: 0x8378,
-	20737 - 11905: 0x8379,
-	20738 - 11905: 0x837A,
-	20739 - 11905: 0x837B,
-	20740 - 11905: 0x837C,
-	20741 - 11905: 0x837D,
-	20742 - 11905: 0xD9D3,
-	20743 - 11905: 0xD9D8,
-	20744 - 11905: 0x837E,
-	20745 - 11905: 0x8380,
-	20746 - 11905: 0x8381,
-	20747 - 11905: 0xD9D9,
-	20748 - 11905: 0x8382,
-	20749 - 11905: 0x8383,
-	20750 - 11905: 0x8384,
-	20751 - 11905: 0x8385,
-	20752 - 11905: 0x8386,
-	20753 - 11905: 0x8387,
-	20754 - 11905: 0xC8E5,
-	20755 - 11905: 0x8388,
-	20756 - 11905: 0x8389,
-	20757 - 11905: 0x838A,
-	20758 - 11905: 0x838B,
-	20759 - 11905: 0x838C,
-	20760 - 11905: 0x838D,
-	20761 - 11905: 0x838E,
-	20762 - 11905: 0x838F,
-	20763 - 11905: 0x8390,
-	20764 - 11905: 0x8391,
-	20765 - 11905: 0x8392,
-	20766 - 11905: 0x8393,
-	20767 - 11905: 0x8394,
-	20768 - 11905: 0x8395,
-	20769 - 11905: 0xC0DC,
-	20770 - 11905: 0x8396,
-	20771 - 11905: 0x8397,
-	20772 - 11905: 0x8398,
-	20773 - 11905: 0x8399,
-	20774 - 11905: 0x839A,
-	20775 - 11905: 0x839B,
-	20776 - 11905: 0x839C,
-	20777 - 11905: 0x839D,
-	20778 - 11905: 0x839E,
-	20779 - 11905: 0x839F,
-	20780 - 11905: 0x83A0,
-	20781 - 11905: 0x83A1,
-	20782 - 11905: 0x83A2,
-	20783 - 11905: 0x83A3,
-	20784 - 11905: 0x83A4,
-	20785 - 11905: 0x83A5,
-	20786 - 11905: 0x83A6,
-	20787 - 11905: 0x83A7,
-	20788 - 11905: 0x83A8,
-	20789 - 11905: 0x83A9,
-	20790 - 11905: 0x83AA,
-	20791 - 11905: 0x83AB,
-	20792 - 11905: 0x83AC,
-	20793 - 11905: 0x83AD,
-	20794 - 11905: 0x83AE,
-	20795 - 11905: 0x83AF,
-	20796 - 11905: 0x83B0,
-	20797 - 11905: 0x83B1,
-	20798 - 11905: 0x83B2,
-	20799 - 11905: 0xB6F9,
-	20800 - 11905: 0xD8A3,
-	20801 - 11905: 0xD4CA,
-	20802 - 11905: 0x83B3,
-	20803 - 11905: 0xD4AA,
-	20804 - 11905: 0xD0D6,
-	20805 - 11905: 0xB3E4,
-	20806 - 11905: 0xD5D7,
-	20807 - 11905: 0x83B4,
-	20808 - 11905: 0xCFC8,
-	20809 - 11905: 0xB9E2,
-	20810 - 11905: 0x83B5,
-	20811 - 11905: 0xBFCB,
-	20812 - 11905: 0x83B6,
-	20813 - 11905: 0xC3E2,
-	20814 - 11905: 0x83B7,
-	20815 - 11905: 0x83B8,
-	20816 - 11905: 0x83B9,
-	20817 - 11905: 0xB6D2,
-	20818 - 11905: 0x83BA,
-	20819 - 11905: 0x83BB,
-	20820 - 11905: 0xCDC3,
-	20821 - 11905: 0xD9EE,
-	20822 - 11905: 0xD9F0,
-	20823 - 11905: 0x83BC,
-	20824 - 11905: 0x83BD,
-	20825 - 11905: 0x83BE,
-	20826 - 11905: 0xB5B3,
-	20827 - 11905: 0x83BF,
-	20828 - 11905: 0xB6B5,
-	20829 - 11905: 0x83C0,
-	20830 - 11905: 0x83C1,
-	20831 - 11905: 0x83C2,
-	20832 - 11905: 0x83C3,
-	20833 - 11905: 0x83C4,
-	20834 - 11905: 0xBEA4,
-	20835 - 11905: 0x83C5,
-	20836 - 11905: 0x83C6,
-	20837 - 11905: 0xC8EB,
-	20838 - 11905: 0x83C7,
-	20839 - 11905: 0x83C8,
-	20840 - 11905: 0xC8AB,
-	20841 - 11905: 0x83C9,
-	20842 - 11905: 0x83CA,
-	20843 - 11905: 0xB0CB,
-	20844 - 11905: 0xB9AB,
-	20845 - 11905: 0xC1F9,
-	20846 - 11905: 0xD9E2,
-	20847 - 11905: 0x83CB,
-	20848 - 11905: 0xC0BC,
-	20849 - 11905: 0xB9B2,
-	20850 - 11905: 0x83CC,
-	20851 - 11905: 0xB9D8,
-	20852 - 11905: 0xD0CB,
-	20853 - 11905: 0xB1F8,
-	20854 - 11905: 0xC6E4,
-	20855 - 11905: 0xBEDF,
-	20856 - 11905: 0xB5E4,
-	20857 - 11905: 0xD7C8,
-	20858 - 11905: 0x83CD,
-	20859 - 11905: 0xD1F8,
-	20860 - 11905: 0xBCE6,
-	20861 - 11905: 0xCADE,
-	20862 - 11905: 0x83CE,
-	20863 - 11905: 0x83CF,
-	20864 - 11905: 0xBCBD,
-	20865 - 11905: 0xD9E6,
-	20866 - 11905: 0xD8E7,
-	20867 - 11905: 0x83D0,
-	20868 - 11905: 0x83D1,
-	20869 - 11905: 0xC4DA,
-	20870 - 11905: 0x83D2,
-	20871 - 11905: 0x83D3,
-	20872 - 11905: 0xB8D4,
-	20873 - 11905: 0xC8BD,
-	20874 - 11905: 0x83D4,
-	20875 - 11905: 0x83D5,
-	20876 - 11905: 0xB2E1,
-	20877 - 11905: 0xD4D9,
-	20878 - 11905: 0x83D6,
-	20879 - 11905: 0x83D7,
-	20880 - 11905: 0x83D8,
-	20881 - 11905: 0x83D9,
-	20882 - 11905: 0xC3B0,
-	20883 - 11905: 0x83DA,
-	20884 - 11905: 0x83DB,
-	20885 - 11905: 0xC3E1,
-	20886 - 11905: 0xDAA2,
-	20887 - 11905: 0xC8DF,
-	20888 - 11905: 0x83DC,
-	20889 - 11905: 0xD0B4,
-	20890 - 11905: 0x83DD,
-	20891 - 11905: 0xBEFC,
-	20892 - 11905: 0xC5A9,
-	20893 - 11905: 0x83DE,
-	20894 - 11905: 0x83DF,
-	20895 - 11905: 0x83E0,
-	20896 - 11905: 0xB9DA,
-	20897 - 11905: 0x83E1,
-	20898 - 11905: 0xDAA3,
-	20899 - 11905: 0x83E2,
-	20900 - 11905: 0xD4A9,
-	20901 - 11905: 0xDAA4,
-	20902 - 11905: 0x83E3,
-	20903 - 11905: 0x83E4,
-	20904 - 11905: 0x83E5,
-	20905 - 11905: 0x83E6,
-	20906 - 11905: 0x83E7,
-	20907 - 11905: 0xD9FB,
-	20908 - 11905: 0xB6AC,
-	20909 - 11905: 0x83E8,
-	20910 - 11905: 0x83E9,
-	20911 - 11905: 0xB7EB,
-	20912 - 11905: 0xB1F9,
-	20913 - 11905: 0xD9FC,
-	20914 - 11905: 0xB3E5,
-	20915 - 11905: 0xBEF6,
-	20916 - 11905: 0x83EA,
-	20917 - 11905: 0xBFF6,
-	20918 - 11905: 0xD2B1,
-	20919 - 11905: 0xC0E4,
-	20920 - 11905: 0x83EB,
-	20921 - 11905: 0x83EC,
-	20922 - 11905: 0x83ED,
-	20923 - 11905: 0xB6B3,
-	20924 - 11905: 0xD9FE,
-	20925 - 11905: 0xD9FD,
-	20926 - 11905: 0x83EE,
-	20927 - 11905: 0x83EF,
-	20928 - 11905: 0xBEBB,
-	20929 - 11905: 0x83F0,
-	20930 - 11905: 0x83F1,
-	20931 - 11905: 0x83F2,
-	20932 - 11905: 0xC6E0,
-	20933 - 11905: 0x83F3,
-	20934 - 11905: 0xD7BC,
-	20935 - 11905: 0xDAA1,
-	20936 - 11905: 0x83F4,
-	20937 - 11905: 0xC1B9,
-	20938 - 11905: 0x83F5,
-	20939 - 11905: 0xB5F2,
-	20940 - 11905: 0xC1E8,
-	20941 - 11905: 0x83F6,
-	20942 - 11905: 0x83F7,
-	20943 - 11905: 0xBCF5,
-	20944 - 11905: 0x83F8,
-	20945 - 11905: 0xB4D5,
-	20946 - 11905: 0x83F9,
-	20947 - 11905: 0x83FA,
-	20948 - 11905: 0x83FB,
-	20949 - 11905: 0x83FC,
-	20950 - 11905: 0x83FD,
-	20951 - 11905: 0x83FE,
-	20952 - 11905: 0x8440,
-	20953 - 11905: 0x8441,
-	20954 - 11905: 0x8442,
-	20955 - 11905: 0xC1DD,
-	20956 - 11905: 0x8443,
-	20957 - 11905: 0xC4FD,
-	20958 - 11905: 0x8444,
-	20959 - 11905: 0x8445,
-	20960 - 11905: 0xBCB8,
-	20961 - 11905: 0xB7B2,
-	20962 - 11905: 0x8446,
-	20963 - 11905: 0x8447,
-	20964 - 11905: 0xB7EF,
-	20965 - 11905: 0x8448,
-	20966 - 11905: 0x8449,
-	20967 - 11905: 0x844A,
-	20968 - 11905: 0x844B,
-	20969 - 11905: 0x844C,
-	20970 - 11905: 0x844D,
-	20971 - 11905: 0xD9EC,
-	20972 - 11905: 0x844E,
-	20973 - 11905: 0xC6BE,
-	20974 - 11905: 0x844F,
-	20975 - 11905: 0xBFAD,
-	20976 - 11905: 0xBBCB,
-	20977 - 11905: 0x8450,
-	20978 - 11905: 0x8451,
-	20979 - 11905: 0xB5CA,
-	20980 - 11905: 0x8452,
-	20981 - 11905: 0xDBC9,
-	20982 - 11905: 0xD0D7,
-	20983 - 11905: 0x8453,
-	20984 - 11905: 0xCDB9,
-	20985 - 11905: 0xB0BC,
-	20986 - 11905: 0xB3F6,
-	20987 - 11905: 0xBBF7,
-	20988 - 11905: 0xDBCA,
-	20989 - 11905: 0xBAAF,
-	20990 - 11905: 0x8454,
-	20991 - 11905: 0xD4E4,
-	20992 - 11905: 0xB5B6,
-	20993 - 11905: 0xB5F3,
-	20994 - 11905: 0xD8D6,
-	20995 - 11905: 0xC8D0,
-	20996 - 11905: 0x8455,
-	20997 - 11905: 0x8456,
-	20998 - 11905: 0xB7D6,
-	20999 - 11905: 0xC7D0,
-	21000 - 11905: 0xD8D7,
-	21001 - 11905: 0x8457,
-	21002 - 11905: 0xBFAF,
-	21003 - 11905: 0x8458,
-	21004 - 11905: 0x8459,
-	21005 - 11905: 0xDBBB,
-	21006 - 11905: 0xD8D8,
-	21007 - 11905: 0x845A,
-	21008 - 11905: 0x845B,
-	21009 - 11905: 0xD0CC,
-	21010 - 11905: 0xBBAE,
-	21011 - 11905: 0x845C,
-	21012 - 11905: 0x845D,
-	21013 - 11905: 0x845E,
-	21014 - 11905: 0xEBBE,
-	21015 - 11905: 0xC1D0,
-	21016 - 11905: 0xC1F5,
-	21017 - 11905: 0xD4F2,
-	21018 - 11905: 0xB8D5,
-	21019 - 11905: 0xB4B4,
-	21020 - 11905: 0x845F,
-	21021 - 11905: 0xB3F5,
-	21022 - 11905: 0x8460,
-	21023 - 11905: 0x8461,
-	21024 - 11905: 0xC9BE,
-	21025 - 11905: 0x8462,
-	21026 - 11905: 0x8463,
-	21027 - 11905: 0x8464,
-	21028 - 11905: 0xC5D0,
-	21029 - 11905: 0x8465,
-	21030 - 11905: 0x8466,
-	21031 - 11905: 0x8467,
-	21032 - 11905: 0xC5D9,
-	21033 - 11905: 0xC0FB,
-	21034 - 11905: 0x8468,
-	21035 - 11905: 0xB1F0,
-	21036 - 11905: 0x8469,
-	21037 - 11905: 0xD8D9,
-	21038 - 11905: 0xB9CE,
-	21039 - 11905: 0x846A,
-	21040 - 11905: 0xB5BD,
-	21041 - 11905: 0x846B,
-	21042 - 11905: 0x846C,
-	21043 - 11905: 0xD8DA,
-	21044 - 11905: 0x846D,
-	21045 - 11905: 0x846E,
-	21046 - 11905: 0xD6C6,
-	21047 - 11905: 0xCBA2,
-	21048 - 11905: 0xC8AF,
-	21049 - 11905: 0xC9B2,
-	21050 - 11905: 0xB4CC,
-	21051 - 11905: 0xBFCC,
-	21052 - 11905: 0x846F,
-	21053 - 11905: 0xB9F4,
-	21054 - 11905: 0x8470,
-	21055 - 11905: 0xD8DB,
-	21056 - 11905: 0xD8DC,
-	21057 - 11905: 0xB6E7,
-	21058 - 11905: 0xBCC1,
-	21059 - 11905: 0xCCEA,
-	21060 - 11905: 0x8471,
-	21061 - 11905: 0x8472,
-	21062 - 11905: 0x8473,
-	21063 - 11905: 0x8474,
-	21064 - 11905: 0x8475,
-	21065 - 11905: 0x8476,
-	21066 - 11905: 0xCFF7,
-	21067 - 11905: 0x8477,
-	21068 - 11905: 0xD8DD,
-	21069 - 11905: 0xC7B0,
-	21070 - 11905: 0x8478,
-	21071 - 11905: 0x8479,
-	21072 - 11905: 0xB9D0,
-	21073 - 11905: 0xBDA3,
-	21074 - 11905: 0x847A,
-	21075 - 11905: 0x847B,
-	21076 - 11905: 0xCCDE,
-	21077 - 11905: 0x847C,
-	21078 - 11905: 0xC6CA,
-	21079 - 11905: 0x847D,
-	21080 - 11905: 0x847E,
-	21081 - 11905: 0x8480,
-	21082 - 11905: 0x8481,
-	21083 - 11905: 0x8482,
-	21084 - 11905: 0xD8E0,
-	21085 - 11905: 0x8483,
-	21086 - 11905: 0xD8DE,
-	21087 - 11905: 0x8484,
-	21088 - 11905: 0x8485,
-	21089 - 11905: 0xD8DF,
-	21090 - 11905: 0x8486,
-	21091 - 11905: 0x8487,
-	21092 - 11905: 0x8488,
-	21093 - 11905: 0xB0FE,
-	21094 - 11905: 0x8489,
-	21095 - 11905: 0xBEE7,
-	21096 - 11905: 0x848A,
-	21097 - 11905: 0xCAA3,
-	21098 - 11905: 0xBCF4,
-	21099 - 11905: 0x848B,
-	21100 - 11905: 0x848C,
-	21101 - 11905: 0x848D,
-	21102 - 11905: 0x848E,
-	21103 - 11905: 0xB8B1,
-	21104 - 11905: 0x848F,
-	21105 - 11905: 0x8490,
-	21106 - 11905: 0xB8EE,
-	21107 - 11905: 0x8491,
-	21108 - 11905: 0x8492,
-	21109 - 11905: 0x8493,
-	21110 - 11905: 0x8494,
-	21111 - 11905: 0x8495,
-	21112 - 11905: 0x8496,
-	21113 - 11905: 0x8497,
-	21114 - 11905: 0x8498,
-	21115 - 11905: 0x8499,
-	21116 - 11905: 0x849A,
-	21117 - 11905: 0xD8E2,
-	21118 - 11905: 0x849B,
-	21119 - 11905: 0xBDCB,
-	21120 - 11905: 0x849C,
-	21121 - 11905: 0xD8E4,
-	21122 - 11905: 0xD8E3,
-	21123 - 11905: 0x849D,
-	21124 - 11905: 0x849E,
-	21125 - 11905: 0x849F,
-	21126 - 11905: 0x84A0,
-	21127 - 11905: 0x84A1,
-	21128 - 11905: 0xC5FC,
-	21129 - 11905: 0x84A2,
-	21130 - 11905: 0x84A3,
-	21131 - 11905: 0x84A4,
-	21132 - 11905: 0x84A5,
-	21133 - 11905: 0x84A6,
-	21134 - 11905: 0x84A7,
-	21135 - 11905: 0x84A8,
-	21136 - 11905: 0xD8E5,
-	21137 - 11905: 0x84A9,
-	21138 - 11905: 0x84AA,
-	21139 - 11905: 0xD8E6,
-	21140 - 11905: 0x84AB,
-	21141 - 11905: 0x84AC,
-	21142 - 11905: 0x84AD,
-	21143 - 11905: 0x84AE,
-	21144 - 11905: 0x84AF,
-	21145 - 11905: 0x84B0,
-	21146 - 11905: 0x84B1,
-	21147 - 11905: 0xC1A6,
-	21148 - 11905: 0x84B2,
-	21149 - 11905: 0xC8B0,
-	21150 - 11905: 0xB0EC,
-	21151 - 11905: 0xB9A6,
-	21152 - 11905: 0xBCD3,
-	21153 - 11905: 0xCEF1,
-	21154 - 11905: 0xDBBD,
-	21155 - 11905: 0xC1D3,
-	21156 - 11905: 0x84B3,
-	21157 - 11905: 0x84B4,
-	21158 - 11905: 0x84B5,
-	21159 - 11905: 0x84B6,
-	21160 - 11905: 0xB6AF,
-	21161 - 11905: 0xD6FA,
-	21162 - 11905: 0xC5AC,
-	21163 - 11905: 0xBDD9,
-	21164 - 11905: 0xDBBE,
-	21165 - 11905: 0xDBBF,
-	21166 - 11905: 0x84B7,
-	21167 - 11905: 0x84B8,
-	21168 - 11905: 0x84B9,
-	21169 - 11905: 0xC0F8,
-	21170 - 11905: 0xBEA2,
-	21171 - 11905: 0xC0CD,
-	21172 - 11905: 0x84BA,
-	21173 - 11905: 0x84BB,
-	21174 - 11905: 0x84BC,
-	21175 - 11905: 0x84BD,
-	21176 - 11905: 0x84BE,
-	21177 - 11905: 0x84BF,
-	21178 - 11905: 0x84C0,
-	21179 - 11905: 0x84C1,
-	21180 - 11905: 0x84C2,
-	21181 - 11905: 0x84C3,
-	21182 - 11905: 0xDBC0,
-	21183 - 11905: 0xCAC6,
-	21184 - 11905: 0x84C4,
-	21185 - 11905: 0x84C5,
-	21186 - 11905: 0x84C6,
-	21187 - 11905: 0xB2AA,
-	21188 - 11905: 0x84C7,
-	21189 - 11905: 0x84C8,
-	21190 - 11905: 0x84C9,
-	21191 - 11905: 0xD3C2,
-	21192 - 11905: 0x84CA,
-	21193 - 11905: 0xC3E3,
-	21194 - 11905: 0x84CB,
-	21195 - 11905: 0xD1AB,
-	21196 - 11905: 0x84CC,
-	21197 - 11905: 0x84CD,
-	21198 - 11905: 0x84CE,
-	21199 - 11905: 0x84CF,
-	21200 - 11905: 0xDBC2,
-	21201 - 11905: 0x84D0,
-	21202 - 11905: 0xC0D5,
-	21203 - 11905: 0x84D1,
-	21204 - 11905: 0x84D2,
-	21205 - 11905: 0x84D3,
-	21206 - 11905: 0xDBC3,
-	21207 - 11905: 0x84D4,
-	21208 - 11905: 0xBFB1,
-	21209 - 11905: 0x84D5,
-	21210 - 11905: 0x84D6,
-	21211 - 11905: 0x84D7,
-	21212 - 11905: 0x84D8,
-	21213 - 11905: 0x84D9,
-	21214 - 11905: 0x84DA,
-	21215 - 11905: 0xC4BC,
-	21216 - 11905: 0x84DB,
-	21217 - 11905: 0x84DC,
-	21218 - 11905: 0x84DD,
-	21219 - 11905: 0x84DE,
-	21220 - 11905: 0xC7DA,
-	21221 - 11905: 0x84DF,
-	21222 - 11905: 0x84E0,
-	21223 - 11905: 0x84E1,
-	21224 - 11905: 0x84E2,
-	21225 - 11905: 0x84E3,
-	21226 - 11905: 0x84E4,
-	21227 - 11905: 0x84E5,
-	21228 - 11905: 0x84E6,
-	21229 - 11905: 0x84E7,
-	21230 - 11905: 0x84E8,
-	21231 - 11905: 0x84E9,
-	21232 - 11905: 0xDBC4,
-	21233 - 11905: 0x84EA,
-	21234 - 11905: 0x84EB,
-	21235 - 11905: 0x84EC,
-	21236 - 11905: 0x84ED,
-	21237 - 11905: 0x84EE,
-	21238 - 11905: 0x84EF,
-	21239 - 11905: 0x84F0,
-	21240 - 11905: 0x84F1,
-	21241 - 11905: 0xD9E8,
-	21242 - 11905: 0xC9D7,
-	21243 - 11905: 0x84F2,
-	21244 - 11905: 0x84F3,
-	21245 - 11905: 0x84F4,
-	21246 - 11905: 0xB9B4,
-	21247 - 11905: 0xCEF0,
-	21248 - 11905: 0xD4C8,
-	21249 - 11905: 0x84F5,
-	21250 - 11905: 0x84F6,
-	21251 - 11905: 0x84F7,
-	21252 - 11905: 0x84F8,
-	21253 - 11905: 0xB0FC,
-	21254 - 11905: 0xB4D2,
-	21255 - 11905: 0x84F9,
-	21256 - 11905: 0xD0D9,
-	21257 - 11905: 0x84FA,
-	21258 - 11905: 0x84FB,
-	21259 - 11905: 0x84FC,
-	21260 - 11905: 0x84FD,
-	21261 - 11905: 0xD9E9,
-	21262 - 11905: 0x84FE,
-	21263 - 11905: 0xDECB,
-	21264 - 11905: 0xD9EB,
-	21265 - 11905: 0x8540,
-	21266 - 11905: 0x8541,
-	21267 - 11905: 0x8542,
-	21268 - 11905: 0x8543,
-	21269 - 11905: 0xD8B0,
-	21270 - 11905: 0xBBAF,
-	21271 - 11905: 0xB1B1,
-	21272 - 11905: 0x8544,
-	21273 - 11905: 0xB3D7,
-	21274 - 11905: 0xD8CE,
-	21275 - 11905: 0x8545,
-	21276 - 11905: 0x8546,
-	21277 - 11905: 0xD4D1,
-	21278 - 11905: 0x8547,
-	21279 - 11905: 0x8548,
-	21280 - 11905: 0xBDB3,
-	21281 - 11905: 0xBFEF,
-	21282 - 11905: 0x8549,
-	21283 - 11905: 0xCFBB,
-	21284 - 11905: 0x854A,
-	21285 - 11905: 0x854B,
-	21286 - 11905: 0xD8D0,
-	21287 - 11905: 0x854C,
-	21288 - 11905: 0x854D,
-	21289 - 11905: 0x854E,
-	21290 - 11905: 0xB7CB,
-	21291 - 11905: 0x854F,
-	21292 - 11905: 0x8550,
-	21293 - 11905: 0x8551,
-	21294 - 11905: 0xD8D1,
-	21295 - 11905: 0x8552,
-	21296 - 11905: 0x8553,
-	21297 - 11905: 0x8554,
-	21298 - 11905: 0x8555,
-	21299 - 11905: 0x8556,
-	21300 - 11905: 0x8557,
-	21301 - 11905: 0x8558,
-	21302 - 11905: 0x8559,
-	21303 - 11905: 0x855A,
-	21304 - 11905: 0x855B,
-	21305 - 11905: 0xC6A5,
-	21306 - 11905: 0xC7F8,
-	21307 - 11905: 0xD2BD,
-	21308 - 11905: 0x855C,
-	21309 - 11905: 0x855D,
-	21310 - 11905: 0xD8D2,
-	21311 - 11905: 0xC4E4,
-	21312 - 11905: 0x855E,
-	21313 - 11905: 0xCAAE,
-	21314 - 11905: 0x855F,
-	21315 - 11905: 0xC7A7,
-	21316 - 11905: 0x8560,
-	21317 - 11905: 0xD8A6,
-	21318 - 11905: 0x8561,
-	21319 - 11905: 0xC9FD,
-	21320 - 11905: 0xCEE7,
-	21321 - 11905: 0xBBDC,
-	21322 - 11905: 0xB0EB,
-	21323 - 11905: 0x8562,
-	21324 - 11905: 0x8563,
-	21325 - 11905: 0x8564,
-	21326 - 11905: 0xBBAA,
-	21327 - 11905: 0xD0AD,
-	21328 - 11905: 0x8565,
-	21329 - 11905: 0xB1B0,
-	21330 - 11905: 0xD7E4,
-	21331 - 11905: 0xD7BF,
-	21332 - 11905: 0x8566,
-	21333 - 11905: 0xB5A5,
-	21334 - 11905: 0xC2F4,
-	21335 - 11905: 0xC4CF,
-	21336 - 11905: 0x8567,
-	21337 - 11905: 0x8568,
-	21338 - 11905: 0xB2A9,
-	21339 - 11905: 0x8569,
-	21340 - 11905: 0xB2B7,
-	21341 - 11905: 0x856A,
-	21342 - 11905: 0xB1E5,
-	21343 - 11905: 0xDFB2,
-	21344 - 11905: 0xD5BC,
-	21345 - 11905: 0xBFA8,
-	21346 - 11905: 0xC2AC,
-	21347 - 11905: 0xD8D5,
-	21348 - 11905: 0xC2B1,
-	21349 - 11905: 0x856B,
-	21350 - 11905: 0xD8D4,
-	21351 - 11905: 0xCED4,
-	21352 - 11905: 0x856C,
-	21353 - 11905: 0xDAE0,
-	21354 - 11905: 0x856D,
-	21355 - 11905: 0xCEC0,
-	21356 - 11905: 0x856E,
-	21357 - 11905: 0x856F,
-	21358 - 11905: 0xD8B4,
-	21359 - 11905: 0xC3AE,
-	21360 - 11905: 0xD3A1,
-	21361 - 11905: 0xCEA3,
-	21362 - 11905: 0x8570,
-	21363 - 11905: 0xBCB4,
-	21364 - 11905: 0xC8B4,
-	21365 - 11905: 0xC2D1,
-	21366 - 11905: 0x8571,
-	21367 - 11905: 0xBEED,
-	21368 - 11905: 0xD0B6,
-	21369 - 11905: 0x8572,
-	21370 - 11905: 0xDAE1,
-	21371 - 11905: 0x8573,
-	21372 - 11905: 0x8574,
-	21373 - 11905: 0x8575,
-	21374 - 11905: 0x8576,
-	21375 - 11905: 0xC7E4,
-	21376 - 11905: 0x8577,
-	21377 - 11905: 0x8578,
-	21378 - 11905: 0xB3A7,
-	21379 - 11905: 0x8579,
-	21380 - 11905: 0xB6F2,
-	21381 - 11905: 0xCCFC,
-	21382 - 11905: 0xC0FA,
-	21383 - 11905: 0x857A,
-	21384 - 11905: 0x857B,
-	21385 - 11905: 0xC0F7,
-	21386 - 11905: 0x857C,
-	21387 - 11905: 0xD1B9,
-	21388 - 11905: 0xD1E1,
-	21389 - 11905: 0xD8C7,
-	21390 - 11905: 0x857D,
-	21391 - 11905: 0x857E,
-	21392 - 11905: 0x8580,
-	21393 - 11905: 0x8581,
-	21394 - 11905: 0x8582,
-	21395 - 11905: 0x8583,
-	21396 - 11905: 0x8584,
-	21397 - 11905: 0xB2DE,
-	21398 - 11905: 0x8585,
-	21399 - 11905: 0x8586,
-	21400 - 11905: 0xC0E5,
-	21401 - 11905: 0x8587,
-	21402 - 11905: 0xBAF1,
-	21403 - 11905: 0x8588,
-	21404 - 11905: 0x8589,
-	21405 - 11905: 0xD8C8,
-	21406 - 11905: 0x858A,
-	21407 - 11905: 0xD4AD,
-	21408 - 11905: 0x858B,
-	21409 - 11905: 0x858C,
-	21410 - 11905: 0xCFE1,
-	21411 - 11905: 0xD8C9,
-	21412 - 11905: 0x858D,
-	21413 - 11905: 0xD8CA,
-	21414 - 11905: 0xCFC3,
-	21415 - 11905: 0x858E,
-	21416 - 11905: 0xB3F8,
-	21417 - 11905: 0xBEC7,
-	21418 - 11905: 0x858F,
-	21419 - 11905: 0x8590,
-	21420 - 11905: 0x8591,
-	21421 - 11905: 0x8592,
-	21422 - 11905: 0xD8CB,
-	21423 - 11905: 0x8593,
-	21424 - 11905: 0x8594,
-	21425 - 11905: 0x8595,
-	21426 - 11905: 0x8596,
-	21427 - 11905: 0x8597,
-	21428 - 11905: 0x8598,
-	21429 - 11905: 0x8599,
-	21430 - 11905: 0xDBCC,
-	21431 - 11905: 0x859A,
-	21432 - 11905: 0x859B,
-	21433 - 11905: 0x859C,
-	21434 - 11905: 0x859D,
-	21435 - 11905: 0xC8A5,
-	21436 - 11905: 0x859E,
-	21437 - 11905: 0x859F,
-	21438 - 11905: 0x85A0,
-	21439 - 11905: 0xCFD8,
-	21440 - 11905: 0x85A1,
-	21441 - 11905: 0xC8FE,
-	21442 - 11905: 0xB2CE,
-	21443 - 11905: 0x85A2,
-	21444 - 11905: 0x85A3,
-	21445 - 11905: 0x85A4,
-	21446 - 11905: 0x85A5,
-	21447 - 11905: 0x85A6,
-	21448 - 11905: 0xD3D6,
-	21449 - 11905: 0xB2E6,
-	21450 - 11905: 0xBCB0,
-	21451 - 11905: 0xD3D1,
-	21452 - 11905: 0xCBAB,
-	21453 - 11905: 0xB7B4,
-	21454 - 11905: 0x85A7,
-	21455 - 11905: 0x85A8,
-	21456 - 11905: 0x85A9,
-	21457 - 11905: 0xB7A2,
-	21458 - 11905: 0x85AA,
-	21459 - 11905: 0x85AB,
-	21460 - 11905: 0xCAE5,
-	21461 - 11905: 0x85AC,
-	21462 - 11905: 0xC8A1,
-	21463 - 11905: 0xCADC,
-	21464 - 11905: 0xB1E4,
-	21465 - 11905: 0xD0F0,
-	21466 - 11905: 0x85AD,
-	21467 - 11905: 0xC5D1,
-	21468 - 11905: 0x85AE,
-	21469 - 11905: 0x85AF,
-	21470 - 11905: 0x85B0,
-	21471 - 11905: 0xDBC5,
-	21472 - 11905: 0xB5FE,
-	21473 - 11905: 0x85B1,
-	21474 - 11905: 0x85B2,
-	21475 - 11905: 0xBFDA,
-	21476 - 11905: 0xB9C5,
-	21477 - 11905: 0xBEE4,
-	21478 - 11905: 0xC1ED,
-	21479 - 11905: 0x85B3,
-	21480 - 11905: 0xDFB6,
-	21481 - 11905: 0xDFB5,
-	21482 - 11905: 0xD6BB,
-	21483 - 11905: 0xBDD0,
-	21484 - 11905: 0xD5D9,
-	21485 - 11905: 0xB0C8,
-	21486 - 11905: 0xB6A3,
-	21487 - 11905: 0xBFC9,
-	21488 - 11905: 0xCCA8,
-	21489 - 11905: 0xDFB3,
-	21490 - 11905: 0xCAB7,
-	21491 - 11905: 0xD3D2,
-	21492 - 11905: 0x85B4,
-	21493 - 11905: 0xD8CF,
-	21494 - 11905: 0xD2B6,
-	21495 - 11905: 0xBAC5,
-	21496 - 11905: 0xCBBE,
-	21497 - 11905: 0xCCBE,
-	21498 - 11905: 0x85B5,
-	21499 - 11905: 0xDFB7,
-	21500 - 11905: 0xB5F0,
-	21501 - 11905: 0xDFB4,
-	21502 - 11905: 0x85B6,
-	21503 - 11905: 0x85B7,
-	21504 - 11905: 0x85B8,
-	21505 - 11905: 0xD3F5,
-	21506 - 11905: 0x85B9,
-	21507 - 11905: 0xB3D4,
-	21508 - 11905: 0xB8F7,
-	21509 - 11905: 0x85BA,
-	21510 - 11905: 0xDFBA,
-	21511 - 11905: 0x85BB,
-	21512 - 11905: 0xBACF,
-	21513 - 11905: 0xBCAA,
-	21514 - 11905: 0xB5F5,
-	21515 - 11905: 0x85BC,
-	21516 - 11905: 0xCDAC,
-	21517 - 11905: 0xC3FB,
-	21518 - 11905: 0xBAF3,
-	21519 - 11905: 0xC0F4,
-	21520 - 11905: 0xCDC2,
-	21521 - 11905: 0xCFF2,
-	21522 - 11905: 0xDFB8,
-	21523 - 11905: 0xCFC5,
-	21524 - 11905: 0x85BD,
-	21525 - 11905: 0xC2C0,
-	21526 - 11905: 0xDFB9,
-	21527 - 11905: 0xC2F0,
-	21528 - 11905: 0x85BE,
-	21529 - 11905: 0x85BF,
-	21530 - 11905: 0x85C0,
-	21531 - 11905: 0xBEFD,
-	21532 - 11905: 0x85C1,
-	21533 - 11905: 0xC1DF,
-	21534 - 11905: 0xCDCC,
-	21535 - 11905: 0xD2F7,
-	21536 - 11905: 0xB7CD,
-	21537 - 11905: 0xDFC1,
-	21538 - 11905: 0x85C2,
-	21539 - 11905: 0xDFC4,
-	21540 - 11905: 0x85C3,
-	21541 - 11905: 0x85C4,
-	21542 - 11905: 0xB7F1,
-	21543 - 11905: 0xB0C9,
-	21544 - 11905: 0xB6D6,
-	21545 - 11905: 0xB7D4,
-	21546 - 11905: 0x85C5,
-	21547 - 11905: 0xBAAC,
-	21548 - 11905: 0xCCFD,
-	21549 - 11905: 0xBFD4,
-	21550 - 11905: 0xCBB1,
-	21551 - 11905: 0xC6F4,
-	21552 - 11905: 0x85C6,
-	21553 - 11905: 0xD6A8,
-	21554 - 11905: 0xDFC5,
-	21555 - 11905: 0x85C7,
-	21556 - 11905: 0xCEE2,
-	21557 - 11905: 0xB3B3,
-	21558 - 11905: 0x85C8,
-	21559 - 11905: 0x85C9,
-	21560 - 11905: 0xCEFC,
-	21561 - 11905: 0xB4B5,
-	21562 - 11905: 0x85CA,
-	21563 - 11905: 0xCEC7,
-	21564 - 11905: 0xBAF0,
-	21565 - 11905: 0x85CB,
-	21566 - 11905: 0xCEE1,
-	21567 - 11905: 0x85CC,
-	21568 - 11905: 0xD1BD,
-	21569 - 11905: 0x85CD,
-	21570 - 11905: 0x85CE,
-	21571 - 11905: 0xDFC0,
-	21572 - 11905: 0x85CF,
-	21573 - 11905: 0x85D0,
-	21574 - 11905: 0xB4F4,
-	21575 - 11905: 0x85D1,
-	21576 - 11905: 0xB3CA,
-	21577 - 11905: 0x85D2,
-	21578 - 11905: 0xB8E6,
-	21579 - 11905: 0xDFBB,
-	21580 - 11905: 0x85D3,
-	21581 - 11905: 0x85D4,
-	21582 - 11905: 0x85D5,
-	21583 - 11905: 0x85D6,
-	21584 - 11905: 0xC4C5,
-	21585 - 11905: 0x85D7,
-	21586 - 11905: 0xDFBC,
-	21587 - 11905: 0xDFBD,
-	21588 - 11905: 0xDFBE,
-	21589 - 11905: 0xC5BB,
-	21590 - 11905: 0xDFBF,
-	21591 - 11905: 0xDFC2,
-	21592 - 11905: 0xD4B1,
-	21593 - 11905: 0xDFC3,
-	21594 - 11905: 0x85D8,
-	21595 - 11905: 0xC7BA,
-	21596 - 11905: 0xCED8,
-	21597 - 11905: 0x85D9,
-	21598 - 11905: 0x85DA,
-	21599 - 11905: 0x85DB,
-	21600 - 11905: 0x85DC,
-	21601 - 11905: 0x85DD,
-	21602 - 11905: 0xC4D8,
-	21603 - 11905: 0x85DE,
-	21604 - 11905: 0xDFCA,
-	21605 - 11905: 0x85DF,
-	21606 - 11905: 0xDFCF,
-	21607 - 11905: 0x85E0,
-	21608 - 11905: 0xD6DC,
-	21609 - 11905: 0x85E1,
-	21610 - 11905: 0x85E2,
-	21611 - 11905: 0x85E3,
-	21612 - 11905: 0x85E4,
-	21613 - 11905: 0x85E5,
-	21614 - 11905: 0x85E6,
-	21615 - 11905: 0x85E7,
-	21616 - 11905: 0x85E8,
-	21617 - 11905: 0xDFC9,
-	21618 - 11905: 0xDFDA,
-	21619 - 11905: 0xCEB6,
-	21620 - 11905: 0x85E9,
-	21621 - 11905: 0xBAC7,
-	21622 - 11905: 0xDFCE,
-	21623 - 11905: 0xDFC8,
-	21624 - 11905: 0xC5DE,
-	21625 - 11905: 0x85EA,
-	21626 - 11905: 0x85EB,
-	21627 - 11905: 0xC9EB,
-	21628 - 11905: 0xBAF4,
-	21629 - 11905: 0xC3FC,
-	21630 - 11905: 0x85EC,
-	21631 - 11905: 0x85ED,
-	21632 - 11905: 0xBED7,
-	21633 - 11905: 0x85EE,
-	21634 - 11905: 0xDFC6,
-	21635 - 11905: 0x85EF,
-	21636 - 11905: 0xDFCD,
-	21637 - 11905: 0x85F0,
-	21638 - 11905: 0xC5D8,
-	21639 - 11905: 0x85F1,
-	21640 - 11905: 0x85F2,
-	21641 - 11905: 0x85F3,
-	21642 - 11905: 0x85F4,
-	21643 - 11905: 0xD5A6,
-	21644 - 11905: 0xBACD,
-	21645 - 11905: 0x85F5,
-	21646 - 11905: 0xBECC,
-	21647 - 11905: 0xD3BD,
-	21648 - 11905: 0xB8C0,
-	21649 - 11905: 0x85F6,
-	21650 - 11905: 0xD6E4,
-	21651 - 11905: 0x85F7,
-	21652 - 11905: 0xDFC7,
-	21653 - 11905: 0xB9BE,
-	21654 - 11905: 0xBFA7,
-	21655 - 11905: 0x85F8,
-	21656 - 11905: 0x85F9,
-	21657 - 11905: 0xC1FC,
-	21658 - 11905: 0xDFCB,
-	21659 - 11905: 0xDFCC,
-	21660 - 11905: 0x85FA,
-	21661 - 11905: 0xDFD0,
-	21662 - 11905: 0x85FB,
-	21663 - 11905: 0x85FC,
-	21664 - 11905: 0x85FD,
-	21665 - 11905: 0x85FE,
-	21666 - 11905: 0x8640,
-	21667 - 11905: 0xDFDB,
-	21668 - 11905: 0xDFE5,
-	21669 - 11905: 0x8641,
-	21670 - 11905: 0xDFD7,
-	21671 - 11905: 0xDFD6,
-	21672 - 11905: 0xD7C9,
-	21673 - 11905: 0xDFE3,
-	21674 - 11905: 0xDFE4,
-	21675 - 11905: 0xE5EB,
-	21676 - 11905: 0xD2A7,
-	21677 - 11905: 0xDFD2,
-	21678 - 11905: 0x8642,
-	21679 - 11905: 0xBFA9,
-	21680 - 11905: 0x8643,
-	21681 - 11905: 0xD4DB,
-	21682 - 11905: 0x8644,
-	21683 - 11905: 0xBFC8,
-	21684 - 11905: 0xDFD4,
-	21685 - 11905: 0x8645,
-	21686 - 11905: 0x8646,
-	21687 - 11905: 0x8647,
-	21688 - 11905: 0xCFCC,
-	21689 - 11905: 0x8648,
-	21690 - 11905: 0x8649,
-	21691 - 11905: 0xDFDD,
-	21692 - 11905: 0x864A,
-	21693 - 11905: 0xD1CA,
-	21694 - 11905: 0x864B,
-	21695 - 11905: 0xDFDE,
-	21696 - 11905: 0xB0A7,
-	21697 - 11905: 0xC6B7,
-	21698 - 11905: 0xDFD3,
-	21699 - 11905: 0x864C,
-	21700 - 11905: 0xBAE5,
-	21701 - 11905: 0x864D,
-	21702 - 11905: 0xB6DF,
-	21703 - 11905: 0xCDDB,
-	21704 - 11905: 0xB9FE,
-	21705 - 11905: 0xD4D5,
-	21706 - 11905: 0x864E,
-	21707 - 11905: 0x864F,
-	21708 - 11905: 0xDFDF,
-	21709 - 11905: 0xCFEC,
-	21710 - 11905: 0xB0A5,
-	21711 - 11905: 0xDFE7,
-	21712 - 11905: 0xDFD1,
-	21713 - 11905: 0xD1C6,
-	21714 - 11905: 0xDFD5,
-	21715 - 11905: 0xDFD8,
-	21716 - 11905: 0xDFD9,
-	21717 - 11905: 0xDFDC,
-	21718 - 11905: 0x8650,
-	21719 - 11905: 0xBBA9,
-	21720 - 11905: 0x8651,
-	21721 - 11905: 0xDFE0,
-	21722 - 11905: 0xDFE1,
-	21723 - 11905: 0x8652,
-	21724 - 11905: 0xDFE2,
-	21725 - 11905: 0xDFE6,
-	21726 - 11905: 0xDFE8,
-	21727 - 11905: 0xD3B4,
-	21728 - 11905: 0x8653,
-	21729 - 11905: 0x8654,
-	21730 - 11905: 0x8655,
-	21731 - 11905: 0x8656,
-	21732 - 11905: 0x8657,
-	21733 - 11905: 0xB8E7,
-	21734 - 11905: 0xC5B6,
-	21735 - 11905: 0xDFEA,
-	21736 - 11905: 0xC9DA,
-	21737 - 11905: 0xC1A8,
-	21738 - 11905: 0xC4C4,
-	21739 - 11905: 0x8658,
-	21740 - 11905: 0x8659,
-	21741 - 11905: 0xBFDE,
-	21742 - 11905: 0xCFF8,
-	21743 - 11905: 0x865A,
-	21744 - 11905: 0x865B,
-	21745 - 11905: 0x865C,
-	21746 - 11905: 0xD5DC,
-	21747 - 11905: 0xDFEE,
-	21748 - 11905: 0x865D,
-	21749 - 11905: 0x865E,
-	21750 - 11905: 0x865F,
-	21751 - 11905: 0x8660,
-	21752 - 11905: 0x8661,
-	21753 - 11905: 0x8662,
-	21754 - 11905: 0xB2B8,
-	21755 - 11905: 0x8663,
-	21756 - 11905: 0xBADF,
-	21757 - 11905: 0xDFEC,
-	21758 - 11905: 0x8664,
-	21759 - 11905: 0xDBC1,
-	21760 - 11905: 0x8665,
-	21761 - 11905: 0xD1E4,
-	21762 - 11905: 0x8666,
-	21763 - 11905: 0x8667,
-	21764 - 11905: 0x8668,
-	21765 - 11905: 0x8669,
-	21766 - 11905: 0xCBF4,
-	21767 - 11905: 0xB4BD,
-	21768 - 11905: 0x866A,
-	21769 - 11905: 0xB0A6,
-	21770 - 11905: 0x866B,
-	21771 - 11905: 0x866C,
-	21772 - 11905: 0x866D,
-	21773 - 11905: 0x866E,
-	21774 - 11905: 0x866F,
-	21775 - 11905: 0xDFF1,
-	21776 - 11905: 0xCCC6,
-	21777 - 11905: 0xDFF2,
-	21778 - 11905: 0x8670,
-	21779 - 11905: 0x8671,
-	21780 - 11905: 0xDFED,
-	21781 - 11905: 0x8672,
-	21782 - 11905: 0x8673,
-	21783 - 11905: 0x8674,
-	21784 - 11905: 0x8675,
-	21785 - 11905: 0x8676,
-	21786 - 11905: 0x8677,
-	21787 - 11905: 0xDFE9,
-	21788 - 11905: 0x8678,
-	21789 - 11905: 0x8679,
-	21790 - 11905: 0x867A,
-	21791 - 11905: 0x867B,
-	21792 - 11905: 0xDFEB,
-	21793 - 11905: 0x867C,
-	21794 - 11905: 0xDFEF,
-	21795 - 11905: 0xDFF0,
-	21796 - 11905: 0xBBBD,
-	21797 - 11905: 0x867D,
-	21798 - 11905: 0x867E,
-	21799 - 11905: 0xDFF3,
-	21800 - 11905: 0x8680,
-	21801 - 11905: 0x8681,
-	21802 - 11905: 0xDFF4,
-	21803 - 11905: 0x8682,
-	21804 - 11905: 0xBBA3,
-	21805 - 11905: 0x8683,
-	21806 - 11905: 0xCADB,
-	21807 - 11905: 0xCEA8,
-	21808 - 11905: 0xE0A7,
-	21809 - 11905: 0xB3AA,
-	21810 - 11905: 0x8684,
-	21811 - 11905: 0xE0A6,
-	21812 - 11905: 0x8685,
-	21813 - 11905: 0x8686,
-	21814 - 11905: 0x8687,
-	21815 - 11905: 0xE0A1,
-	21816 - 11905: 0x8688,
-	21817 - 11905: 0x8689,
-	21818 - 11905: 0x868A,
-	21819 - 11905: 0x868B,
-	21820 - 11905: 0xDFFE,
-	21821 - 11905: 0x868C,
-	21822 - 11905: 0xCDD9,
-	21823 - 11905: 0xDFFC,
-	21824 - 11905: 0x868D,
-	21825 - 11905: 0xDFFA,
-	21826 - 11905: 0x868E,
-	21827 - 11905: 0xBFD0,
-	21828 - 11905: 0xD7C4,
-	21829 - 11905: 0x868F,
-	21830 - 11905: 0xC9CC,
-	21831 - 11905: 0x8690,
-	21832 - 11905: 0x8691,
-	21833 - 11905: 0xDFF8,
-	21834 - 11905: 0xB0A1,
-	21835 - 11905: 0x8692,
-	21836 - 11905: 0x8693,
-	21837 - 11905: 0x8694,
-	21838 - 11905: 0x8695,
-	21839 - 11905: 0x8696,
-	21840 - 11905: 0xDFFD,
-	21841 - 11905: 0x8697,
-	21842 - 11905: 0x8698,
-	21843 - 11905: 0x8699,
-	21844 - 11905: 0x869A,
-	21845 - 11905: 0xDFFB,
-	21846 - 11905: 0xE0A2,
-	21847 - 11905: 0x869B,
-	21848 - 11905: 0x869C,
-	21849 - 11905: 0x869D,
-	21850 - 11905: 0x869E,
-	21851 - 11905: 0x869F,
-	21852 - 11905: 0xE0A8,
-	21853 - 11905: 0x86A0,
-	21854 - 11905: 0x86A1,
-	21855 - 11905: 0x86A2,
-	21856 - 11905: 0x86A3,
-	21857 - 11905: 0xB7C8,
-	21858 - 11905: 0x86A4,
-	21859 - 11905: 0x86A5,
-	21860 - 11905: 0xC6A1,
-	21861 - 11905: 0xC9B6,
-	21862 - 11905: 0xC0B2,
-	21863 - 11905: 0xDFF5,
-	21864 - 11905: 0x86A6,
-	21865 - 11905: 0x86A7,
-	21866 - 11905: 0xC5BE,
-	21867 - 11905: 0x86A8,
-	21868 - 11905: 0xD8C4,
-	21869 - 11905: 0xDFF9,
-	21870 - 11905: 0xC4F6,
-	21871 - 11905: 0x86A9,
-	21872 - 11905: 0x86AA,
-	21873 - 11905: 0x86AB,
-	21874 - 11905: 0x86AC,
-	21875 - 11905: 0x86AD,
-	21876 - 11905: 0x86AE,
-	21877 - 11905: 0xE0A3,
-	21878 - 11905: 0xE0A4,
-	21879 - 11905: 0xE0A5,
-	21880 - 11905: 0xD0A5,
-	21881 - 11905: 0x86AF,
-	21882 - 11905: 0x86B0,
-	21883 - 11905: 0xE0B4,
-	21884 - 11905: 0xCCE4,
-	21885 - 11905: 0x86B1,
-	21886 - 11905: 0xE0B1,
-	21887 - 11905: 0x86B2,
-	21888 - 11905: 0xBFA6,
-	21889 - 11905: 0xE0AF,
-	21890 - 11905: 0xCEB9,
-	21891 - 11905: 0xE0AB,
-	21892 - 11905: 0xC9C6,
-	21893 - 11905: 0x86B3,
-	21894 - 11905: 0x86B4,
-	21895 - 11905: 0xC0AE,
-	21896 - 11905: 0xE0AE,
-	21897 - 11905: 0xBAED,
-	21898 - 11905: 0xBAB0,
-	21899 - 11905: 0xE0A9,
-	21900 - 11905: 0x86B5,
-	21901 - 11905: 0x86B6,
-	21902 - 11905: 0x86B7,
-	21903 - 11905: 0xDFF6,
-	21904 - 11905: 0x86B8,
-	21905 - 11905: 0xE0B3,
-	21906 - 11905: 0x86B9,
-	21907 - 11905: 0x86BA,
-	21908 - 11905: 0xE0B8,
-	21909 - 11905: 0x86BB,
-	21910 - 11905: 0x86BC,
-	21911 - 11905: 0x86BD,
-	21912 - 11905: 0xB4AD,
-	21913 - 11905: 0xE0B9,
-	21914 - 11905: 0x86BE,
-	21915 - 11905: 0x86BF,
-	21916 - 11905: 0xCFB2,
-	21917 - 11905: 0xBAC8,
-	21918 - 11905: 0x86C0,
-	21919 - 11905: 0xE0B0,
-	21920 - 11905: 0x86C1,
-	21921 - 11905: 0x86C2,
-	21922 - 11905: 0x86C3,
-	21923 - 11905: 0x86C4,
-	21924 - 11905: 0x86C5,
-	21925 - 11905: 0x86C6,
-	21926 - 11905: 0x86C7,
-	21927 - 11905: 0xD0FA,
-	21928 - 11905: 0x86C8,
-	21929 - 11905: 0x86C9,
-	21930 - 11905: 0x86CA,
-	21931 - 11905: 0x86CB,
-	21932 - 11905: 0x86CC,
-	21933 - 11905: 0x86CD,
-	21934 - 11905: 0x86CE,
-	21935 - 11905: 0x86CF,
-	21936 - 11905: 0x86D0,
-	21937 - 11905: 0xE0AC,
-	21938 - 11905: 0x86D1,
-	21939 - 11905: 0xD4FB,
-	21940 - 11905: 0x86D2,
-	21941 - 11905: 0xDFF7,
-	21942 - 11905: 0x86D3,
-	21943 - 11905: 0xC5E7,
-	21944 - 11905: 0x86D4,
-	21945 - 11905: 0xE0AD,
-	21946 - 11905: 0x86D5,
-	21947 - 11905: 0xD3F7,
-	21948 - 11905: 0x86D6,
-	21949 - 11905: 0xE0B6,
-	21950 - 11905: 0xE0B7,
-	21951 - 11905: 0x86D7,
-	21952 - 11905: 0x86D8,
-	21953 - 11905: 0x86D9,
-	21954 - 11905: 0x86DA,
-	21955 - 11905: 0x86DB,
-	21956 - 11905: 0xE0C4,
-	21957 - 11905: 0xD0E1,
-	21958 - 11905: 0x86DC,
-	21959 - 11905: 0x86DD,
-	21960 - 11905: 0x86DE,
-	21961 - 11905: 0xE0BC,
-	21962 - 11905: 0x86DF,
-	21963 - 11905: 0x86E0,
-	21964 - 11905: 0xE0C9,
-	21965 - 11905: 0xE0CA,
-	21966 - 11905: 0x86E1,
-	21967 - 11905: 0x86E2,
-	21968 - 11905: 0x86E3,
-	21969 - 11905: 0xE0BE,
-	21970 - 11905: 0xE0AA,
-	21971 - 11905: 0xC9A4,
-	21972 - 11905: 0xE0C1,
-	21973 - 11905: 0x86E4,
-	21974 - 11905: 0xE0B2,
-	21975 - 11905: 0x86E5,
-	21976 - 11905: 0x86E6,
-	21977 - 11905: 0x86E7,
-	21978 - 11905: 0x86E8,
-	21979 - 11905: 0x86E9,
-	21980 - 11905: 0xCAC8,
-	21981 - 11905: 0xE0C3,
-	21982 - 11905: 0x86EA,
-	21983 - 11905: 0xE0B5,
-	21984 - 11905: 0x86EB,
-	21985 - 11905: 0xCECB,
-	21986 - 11905: 0x86EC,
-	21987 - 11905: 0xCBC3,
-	21988 - 11905: 0xE0CD,
-	21989 - 11905: 0xE0C6,
-	21990 - 11905: 0xE0C2,
-	21991 - 11905: 0x86ED,
-	21992 - 11905: 0xE0CB,
-	21993 - 11905: 0x86EE,
-	21994 - 11905: 0xE0BA,
-	21995 - 11905: 0xE0BF,
-	21996 - 11905: 0xE0C0,
-	21997 - 11905: 0x86EF,
-	21998 - 11905: 0x86F0,
-	21999 - 11905: 0xE0C5,
-	22000 - 11905: 0x86F1,
-	22001 - 11905: 0x86F2,
-	22002 - 11905: 0xE0C7,
-	22003 - 11905: 0xE0C8,
-	22004 - 11905: 0x86F3,
-	22005 - 11905: 0xE0CC,
-	22006 - 11905: 0x86F4,
-	22007 - 11905: 0xE0BB,
-	22008 - 11905: 0x86F5,
-	22009 - 11905: 0x86F6,
-	22010 - 11905: 0x86F7,
-	22011 - 11905: 0x86F8,
-	22012 - 11905: 0x86F9,
-	22013 - 11905: 0xCBD4,
-	22014 - 11905: 0xE0D5,
-	22015 - 11905: 0x86FA,
-	22016 - 11905: 0xE0D6,
-	22017 - 11905: 0xE0D2,
-	22018 - 11905: 0x86FB,
-	22019 - 11905: 0x86FC,
-	22020 - 11905: 0x86FD,
-	22021 - 11905: 0x86FE,
-	22022 - 11905: 0x8740,
-	22023 - 11905: 0x8741,
-	22024 - 11905: 0xE0D0,
-	22025 - 11905: 0xBCCE,
-	22026 - 11905: 0x8742,
-	22027 - 11905: 0x8743,
-	22028 - 11905: 0xE0D1,
-	22029 - 11905: 0x8744,
-	22030 - 11905: 0xB8C2,
-	22031 - 11905: 0xD8C5,
-	22032 - 11905: 0x8745,
-	22033 - 11905: 0x8746,
-	22034 - 11905: 0x8747,
-	22035 - 11905: 0x8748,
-	22036 - 11905: 0x8749,
-	22037 - 11905: 0x874A,
-	22038 - 11905: 0x874B,
-	22039 - 11905: 0x874C,
-	22040 - 11905: 0xD0EA,
-	22041 - 11905: 0x874D,
-	22042 - 11905: 0x874E,
-	22043 - 11905: 0xC2EF,
-	22044 - 11905: 0x874F,
-	22045 - 11905: 0x8750,
-	22046 - 11905: 0xE0CF,
-	22047 - 11905: 0xE0BD,
-	22048 - 11905: 0x8751,
-	22049 - 11905: 0x8752,
-	22050 - 11905: 0x8753,
-	22051 - 11905: 0xE0D4,
-	22052 - 11905: 0xE0D3,
-	22053 - 11905: 0x8754,
-	22054 - 11905: 0x8755,
-	22055 - 11905: 0xE0D7,
-	22056 - 11905: 0x8756,
-	22057 - 11905: 0x8757,
-	22058 - 11905: 0x8758,
-	22059 - 11905: 0x8759,
-	22060 - 11905: 0xE0DC,
-	22061 - 11905: 0xE0D8,
-	22062 - 11905: 0x875A,
-	22063 - 11905: 0x875B,
-	22064 - 11905: 0x875C,
-	22065 - 11905: 0xD6F6,
-	22066 - 11905: 0xB3B0,
-	22067 - 11905: 0x875D,
-	22068 - 11905: 0xD7EC,
-	22069 - 11905: 0x875E,
-	22070 - 11905: 0xCBBB,
-	22071 - 11905: 0x875F,
-	22072 - 11905: 0x8760,
-	22073 - 11905: 0xE0DA,
-	22074 - 11905: 0x8761,
-	22075 - 11905: 0xCEFB,
-	22076 - 11905: 0x8762,
-	22077 - 11905: 0x8763,
-	22078 - 11905: 0x8764,
-	22079 - 11905: 0xBAD9,
-	22080 - 11905: 0x8765,
-	22081 - 11905: 0x8766,
-	22082 - 11905: 0x8767,
-	22083 - 11905: 0x8768,
-	22084 - 11905: 0x8769,
-	22085 - 11905: 0x876A,
-	22086 - 11905: 0x876B,
-	22087 - 11905: 0x876C,
-	22088 - 11905: 0x876D,
-	22089 - 11905: 0x876E,
-	22090 - 11905: 0x876F,
-	22091 - 11905: 0x8770,
-	22092 - 11905: 0xE0E1,
-	22093 - 11905: 0xE0DD,
-	22094 - 11905: 0xD2AD,
-	22095 - 11905: 0x8771,
-	22096 - 11905: 0x8772,
-	22097 - 11905: 0x8773,
-	22098 - 11905: 0x8774,
-	22099 - 11905: 0x8775,
-	22100 - 11905: 0xE0E2,
-	22101 - 11905: 0x8776,
-	22102 - 11905: 0x8777,
-	22103 - 11905: 0xE0DB,
-	22104 - 11905: 0xE0D9,
-	22105 - 11905: 0xE0DF,
-	22106 - 11905: 0x8778,
-	22107 - 11905: 0x8779,
-	22108 - 11905: 0xE0E0,
-	22109 - 11905: 0x877A,
-	22110 - 11905: 0x877B,
-	22111 - 11905: 0x877C,
-	22112 - 11905: 0x877D,
-	22113 - 11905: 0x877E,
-	22114 - 11905: 0xE0DE,
-	22115 - 11905: 0x8780,
-	22116 - 11905: 0xE0E4,
-	22117 - 11905: 0x8781,
-	22118 - 11905: 0x8782,
-	22119 - 11905: 0x8783,
-	22120 - 11905: 0xC6F7,
-	22121 - 11905: 0xD8AC,
-	22122 - 11905: 0xD4EB,
-	22123 - 11905: 0xE0E6,
-	22124 - 11905: 0xCAC9,
-	22125 - 11905: 0x8784,
-	22126 - 11905: 0x8785,
-	22127 - 11905: 0x8786,
-	22128 - 11905: 0x8787,
-	22129 - 11905: 0xE0E5,
-	22130 - 11905: 0x8788,
-	22131 - 11905: 0x8789,
-	22132 - 11905: 0x878A,
-	22133 - 11905: 0x878B,
-	22134 - 11905: 0xB8C1,
-	22135 - 11905: 0x878C,
-	22136 - 11905: 0x878D,
-	22137 - 11905: 0x878E,
-	22138 - 11905: 0x878F,
-	22139 - 11905: 0xE0E7,
-	22140 - 11905: 0xE0E8,
-	22141 - 11905: 0x8790,
-	22142 - 11905: 0x8791,
-	22143 - 11905: 0x8792,
-	22144 - 11905: 0x8793,
-	22145 - 11905: 0x8794,
-	22146 - 11905: 0x8795,
-	22147 - 11905: 0x8796,
-	22148 - 11905: 0x8797,
-	22149 - 11905: 0xE0E9,
-	22150 - 11905: 0xE0E3,
-	22151 - 11905: 0x8798,
-	22152 - 11905: 0x8799,
-	22153 - 11905: 0x879A,
-	22154 - 11905: 0x879B,
-	22155 - 11905: 0x879C,
-	22156 - 11905: 0x879D,
-	22157 - 11905: 0x879E,
-	22158 - 11905: 0xBABF,
-	22159 - 11905: 0xCCE7,
-	22160 - 11905: 0x879F,
-	22161 - 11905: 0x87A0,
-	22162 - 11905: 0x87A1,
-	22163 - 11905: 0xE0EA,
-	22164 - 11905: 0x87A2,
-	22165 - 11905: 0x87A3,
-	22166 - 11905: 0x87A4,
-	22167 - 11905: 0x87A5,
-	22168 - 11905: 0x87A6,
-	22169 - 11905: 0x87A7,
-	22170 - 11905: 0x87A8,
-	22171 - 11905: 0x87A9,
-	22172 - 11905: 0x87AA,
-	22173 - 11905: 0x87AB,
-	22174 - 11905: 0x87AC,
-	22175 - 11905: 0x87AD,
-	22176 - 11905: 0x87AE,
-	22177 - 11905: 0x87AF,
-	22178 - 11905: 0x87B0,
-	22179 - 11905: 0xCFF9,
-	22180 - 11905: 0x87B1,
-	22181 - 11905: 0x87B2,
-	22182 - 11905: 0x87B3,
-	22183 - 11905: 0x87B4,
-	22184 - 11905: 0x87B5,
-	22185 - 11905: 0x87B6,
-	22186 - 11905: 0x87B7,
-	22187 - 11905: 0x87B8,
-	22188 - 11905: 0x87B9,
-	22189 - 11905: 0x87BA,
-	22190 - 11905: 0x87BB,
-	22191 - 11905: 0xE0EB,
-	22192 - 11905: 0x87BC,
-	22193 - 11905: 0x87BD,
-	22194 - 11905: 0x87BE,
-	22195 - 11905: 0x87BF,
-	22196 - 11905: 0x87C0,
-	22197 - 11905: 0x87C1,
-	22198 - 11905: 0x87C2,
-	22199 - 11905: 0xC8C2,
-	22200 - 11905: 0x87C3,
-	22201 - 11905: 0x87C4,
-	22202 - 11905: 0x87C5,
-	22203 - 11905: 0x87C6,
-	22204 - 11905: 0xBDC0,
-	22205 - 11905: 0x87C7,
-	22206 - 11905: 0x87C8,
-	22207 - 11905: 0x87C9,
-	22208 - 11905: 0x87CA,
-	22209 - 11905: 0x87CB,
-	22210 - 11905: 0x87CC,
-	22211 - 11905: 0x87CD,
-	22212 - 11905: 0x87CE,
-	22213 - 11905: 0x87CF,
-	22214 - 11905: 0x87D0,
-	22215 - 11905: 0x87D1,
-	22216 - 11905: 0x87D2,
-	22217 - 11905: 0x87D3,
-	22218 - 11905: 0xC4D2,
-	22219 - 11905: 0x87D4,
-	22220 - 11905: 0x87D5,
-	22221 - 11905: 0x87D6,
-	22222 - 11905: 0x87D7,
-	22223 - 11905: 0x87D8,
-	22224 - 11905: 0x87D9,
-	22225 - 11905: 0x87DA,
-	22226 - 11905: 0x87DB,
-	22227 - 11905: 0x87DC,
-	22228 - 11905: 0xE0EC,
-	22229 - 11905: 0x87DD,
-	22230 - 11905: 0x87DE,
-	22231 - 11905: 0xE0ED,
-	22232 - 11905: 0x87DF,
-	22233 - 11905: 0x87E0,
-	22234 - 11905: 0xC7F4,
-	22235 - 11905: 0xCBC4,
-	22236 - 11905: 0x87E1,
-	22237 - 11905: 0xE0EE,
-	22238 - 11905: 0xBBD8,
-	22239 - 11905: 0xD8B6,
-	22240 - 11905: 0xD2F2,
-	22241 - 11905: 0xE0EF,
-	22242 - 11905: 0xCDC5,
-	22243 - 11905: 0x87E2,
-	22244 - 11905: 0xB6DA,
-	22245 - 11905: 0x87E3,
-	22246 - 11905: 0x87E4,
-	22247 - 11905: 0x87E5,
-	22248 - 11905: 0x87E6,
-	22249 - 11905: 0x87E7,
-	22250 - 11905: 0x87E8,
-	22251 - 11905: 0xE0F1,
-	22252 - 11905: 0x87E9,
-	22253 - 11905: 0xD4B0,
-	22254 - 11905: 0x87EA,
-	22255 - 11905: 0x87EB,
-	22256 - 11905: 0xC0A7,
-	22257 - 11905: 0xB4D1,
-	22258 - 11905: 0x87EC,
-	22259 - 11905: 0x87ED,
-	22260 - 11905: 0xCEA7,
-	22261 - 11905: 0xE0F0,
-	22262 - 11905: 0x87EE,
-	22263 - 11905: 0x87EF,
-	22264 - 11905: 0x87F0,
-	22265 - 11905: 0xE0F2,
-	22266 - 11905: 0xB9CC,
-	22267 - 11905: 0x87F1,
-	22268 - 11905: 0x87F2,
-	22269 - 11905: 0xB9FA,
-	22270 - 11905: 0xCDBC,
-	22271 - 11905: 0xE0F3,
-	22272 - 11905: 0x87F3,
-	22273 - 11905: 0x87F4,
-	22274 - 11905: 0x87F5,
-	22275 - 11905: 0xC6D4,
-	22276 - 11905: 0xE0F4,
-	22277 - 11905: 0x87F6,
-	22278 - 11905: 0xD4B2,
-	22279 - 11905: 0x87F7,
-	22280 - 11905: 0xC8A6,
-	22281 - 11905: 0xE0F6,
-	22282 - 11905: 0xE0F5,
-	22283 - 11905: 0x87F8,
-	22284 - 11905: 0x87F9,
-	22285 - 11905: 0x87FA,
-	22286 - 11905: 0x87FB,
-	22287 - 11905: 0x87FC,
-	22288 - 11905: 0x87FD,
-	22289 - 11905: 0x87FE,
-	22290 - 11905: 0x8840,
-	22291 - 11905: 0x8841,
-	22292 - 11905: 0x8842,
-	22293 - 11905: 0x8843,
-	22294 - 11905: 0x8844,
-	22295 - 11905: 0x8845,
-	22296 - 11905: 0x8846,
-	22297 - 11905: 0x8847,
-	22298 - 11905: 0x8848,
-	22299 - 11905: 0x8849,
-	22300 - 11905: 0xE0F7,
-	22301 - 11905: 0x884A,
-	22302 - 11905: 0x884B,
-	22303 - 11905: 0xCDC1,
-	22304 - 11905: 0x884C,
-	22305 - 11905: 0x884D,
-	22306 - 11905: 0x884E,
-	22307 - 11905: 0xCAA5,
-	22308 - 11905: 0x884F,
-	22309 - 11905: 0x8850,
-	22310 - 11905: 0x8851,
-	22311 - 11905: 0x8852,
-	22312 - 11905: 0xD4DA,
-	22313 - 11905: 0xDBD7,
-	22314 - 11905: 0xDBD9,
-	22315 - 11905: 0x8853,
-	22316 - 11905: 0xDBD8,
-	22317 - 11905: 0xB9E7,
-	22318 - 11905: 0xDBDC,
-	22319 - 11905: 0xDBDD,
-	22320 - 11905: 0xB5D8,
-	22321 - 11905: 0x8854,
-	22322 - 11905: 0x8855,
-	22323 - 11905: 0xDBDA,
-	22324 - 11905: 0x8856,
-	22325 - 11905: 0x8857,
-	22326 - 11905: 0x8858,
-	22327 - 11905: 0x8859,
-	22328 - 11905: 0x885A,
-	22329 - 11905: 0xDBDB,
-	22330 - 11905: 0xB3A1,
-	22331 - 11905: 0xDBDF,
-	22332 - 11905: 0x885B,
-	22333 - 11905: 0x885C,
-	22334 - 11905: 0xBBF8,
-	22335 - 11905: 0x885D,
-	22336 - 11905: 0xD6B7,
-	22337 - 11905: 0x885E,
-	22338 - 11905: 0xDBE0,
-	22339 - 11905: 0x885F,
-	22340 - 11905: 0x8860,
-	22341 - 11905: 0x8861,
-	22342 - 11905: 0x8862,
-	22343 - 11905: 0xBEF9,
-	22344 - 11905: 0x8863,
-	22345 - 11905: 0x8864,
-	22346 - 11905: 0xB7BB,
-	22347 - 11905: 0x8865,
-	22348 - 11905: 0xDBD0,
-	22349 - 11905: 0xCCAE,
-	22350 - 11905: 0xBFB2,
-	22351 - 11905: 0xBBB5,
-	22352 - 11905: 0xD7F8,
-	22353 - 11905: 0xBFD3,
-	22354 - 11905: 0x8866,
-	22355 - 11905: 0x8867,
-	22356 - 11905: 0x8868,
-	22357 - 11905: 0x8869,
-	22358 - 11905: 0x886A,
-	22359 - 11905: 0xBFE9,
-	22360 - 11905: 0x886B,
-	22361 - 11905: 0x886C,
-	22362 - 11905: 0xBCE1,
-	22363 - 11905: 0xCCB3,
-	22364 - 11905: 0xDBDE,
-	22365 - 11905: 0xB0D3,
-	22366 - 11905: 0xCEEB,
-	22367 - 11905: 0xB7D8,
-	22368 - 11905: 0xD7B9,
-	22369 - 11905: 0xC6C2,
-	22370 - 11905: 0x886D,
-	22371 - 11905: 0x886E,
-	22372 - 11905: 0xC0A4,
-	22373 - 11905: 0x886F,
-	22374 - 11905: 0xCCB9,
-	22375 - 11905: 0x8870,
-	22376 - 11905: 0xDBE7,
-	22377 - 11905: 0xDBE1,
-	22378 - 11905: 0xC6BA,
-	22379 - 11905: 0xDBE3,
-	22380 - 11905: 0x8871,
-	22381 - 11905: 0xDBE8,
-	22382 - 11905: 0x8872,
-	22383 - 11905: 0xC5F7,
-	22384 - 11905: 0x8873,
-	22385 - 11905: 0x8874,
-	22386 - 11905: 0x8875,
-	22387 - 11905: 0xDBEA,
-	22388 - 11905: 0x8876,
-	22389 - 11905: 0x8877,
-	22390 - 11905: 0xDBE9,
-	22391 - 11905: 0xBFC0,
-	22392 - 11905: 0x8878,
-	22393 - 11905: 0x8879,
-	22394 - 11905: 0x887A,
-	22395 - 11905: 0xDBE6,
-	22396 - 11905: 0xDBE5,
-	22397 - 11905: 0x887B,
-	22398 - 11905: 0x887C,
-	22399 - 11905: 0x887D,
-	22400 - 11905: 0x887E,
-	22401 - 11905: 0x8880,
-	22402 - 11905: 0xB4B9,
-	22403 - 11905: 0xC0AC,
-	22404 - 11905: 0xC2A2,
-	22405 - 11905: 0xDBE2,
-	22406 - 11905: 0xDBE4,
-	22407 - 11905: 0x8881,
-	22408 - 11905: 0x8882,
-	22409 - 11905: 0x8883,
-	22410 - 11905: 0x8884,
-	22411 - 11905: 0xD0CD,
-	22412 - 11905: 0xDBED,
-	22413 - 11905: 0x8885,
-	22414 - 11905: 0x8886,
-	22415 - 11905: 0x8887,
-	22416 - 11905: 0x8888,
-	22417 - 11905: 0x8889,
-	22418 - 11905: 0xC0DD,
-	22419 - 11905: 0xDBF2,
-	22420 - 11905: 0x888A,
-	22421 - 11905: 0x888B,
-	22422 - 11905: 0x888C,
-	22423 - 11905: 0x888D,
-	22424 - 11905: 0x888E,
-	22425 - 11905: 0x888F,
-	22426 - 11905: 0x8890,
-	22427 - 11905: 0xB6E2,
-	22428 - 11905: 0x8891,
-	22429 - 11905: 0x8892,
-	22430 - 11905: 0x8893,
-	22431 - 11905: 0x8894,
-	22432 - 11905: 0xDBF3,
-	22433 - 11905: 0xDBD2,
-	22434 - 11905: 0xB9B8,
-	22435 - 11905: 0xD4AB,
-	22436 - 11905: 0xDBEC,
-	22437 - 11905: 0x8895,
-	22438 - 11905: 0xBFD1,
-	22439 - 11905: 0xDBF0,
-	22440 - 11905: 0x8896,
-	22441 - 11905: 0xDBD1,
-	22442 - 11905: 0x8897,
-	22443 - 11905: 0xB5E6,
-	22444 - 11905: 0x8898,
-	22445 - 11905: 0xDBEB,
-	22446 - 11905: 0xBFE5,
-	22447 - 11905: 0x8899,
-	22448 - 11905: 0x889A,
-	22449 - 11905: 0x889B,
-	22450 - 11905: 0xDBEE,
-	22451 - 11905: 0x889C,
-	22452 - 11905: 0xDBF1,
-	22453 - 11905: 0x889D,
-	22454 - 11905: 0x889E,
-	22455 - 11905: 0x889F,
-	22456 - 11905: 0xDBF9,
-	22457 - 11905: 0x88A0,
-	22458 - 11905: 0x88A1,
-	22459 - 11905: 0x88A2,
-	22460 - 11905: 0x88A3,
-	22461 - 11905: 0x88A4,
-	22462 - 11905: 0x88A5,
-	22463 - 11905: 0x88A6,
-	22464 - 11905: 0x88A7,
-	22465 - 11905: 0x88A8,
-	22466 - 11905: 0xB9A1,
-	22467 - 11905: 0xB0A3,
-	22468 - 11905: 0x88A9,
-	22469 - 11905: 0x88AA,
-	22470 - 11905: 0x88AB,
-	22471 - 11905: 0x88AC,
-	22472 - 11905: 0x88AD,
-	22473 - 11905: 0x88AE,
-	22474 - 11905: 0x88AF,
-	22475 - 11905: 0xC2F1,
-	22476 - 11905: 0x88B0,
-	22477 - 11905: 0x88B1,
-	22478 - 11905: 0xB3C7,
-	22479 - 11905: 0xDBEF,
-	22480 - 11905: 0x88B2,
-	22481 - 11905: 0x88B3,
-	22482 - 11905: 0xDBF8,
-	22483 - 11905: 0x88B4,
-	22484 - 11905: 0xC6D2,
-	22485 - 11905: 0xDBF4,
-	22486 - 11905: 0x88B5,
-	22487 - 11905: 0x88B6,
-	22488 - 11905: 0xDBF5,
-	22489 - 11905: 0xDBF7,
-	22490 - 11905: 0xDBF6,
-	22491 - 11905: 0x88B7,
-	22492 - 11905: 0x88B8,
-	22493 - 11905: 0xDBFE,
-	22494 - 11905: 0x88B9,
-	22495 - 11905: 0xD3F2,
-	22496 - 11905: 0xB2BA,
-	22497 - 11905: 0x88BA,
-	22498 - 11905: 0x88BB,
-	22499 - 11905: 0x88BC,
-	22500 - 11905: 0xDBFD,
-	22501 - 11905: 0x88BD,
-	22502 - 11905: 0x88BE,
-	22503 - 11905: 0x88BF,
-	22504 - 11905: 0x88C0,
-	22505 - 11905: 0x88C1,
-	22506 - 11905: 0x88C2,
-	22507 - 11905: 0x88C3,
-	22508 - 11905: 0x88C4,
-	22509 - 11905: 0xDCA4,
-	22510 - 11905: 0x88C5,
-	22511 - 11905: 0xDBFB,
-	22512 - 11905: 0x88C6,
-	22513 - 11905: 0x88C7,
-	22514 - 11905: 0x88C8,
-	22515 - 11905: 0x88C9,
-	22516 - 11905: 0xDBFA,
-	22517 - 11905: 0x88CA,
-	22518 - 11905: 0x88CB,
-	22519 - 11905: 0x88CC,
-	22520 - 11905: 0xDBFC,
-	22521 - 11905: 0xC5E0,
-	22522 - 11905: 0xBBF9,
-	22523 - 11905: 0x88CD,
-	22524 - 11905: 0x88CE,
-	22525 - 11905: 0xDCA3,
-	22526 - 11905: 0x88CF,
-	22527 - 11905: 0x88D0,
-	22528 - 11905: 0xDCA5,
-	22529 - 11905: 0x88D1,
-	22530 - 11905: 0xCCC3,
-	22531 - 11905: 0x88D2,
-	22532 - 11905: 0x88D3,
-	22533 - 11905: 0x88D4,
-	22534 - 11905: 0xB6D1,
-	22535 - 11905: 0xDDC0,
-	22536 - 11905: 0x88D5,
-	22537 - 11905: 0x88D6,
-	22538 - 11905: 0x88D7,
-	22539 - 11905: 0xDCA1,
-	22540 - 11905: 0x88D8,
-	22541 - 11905: 0xDCA2,
-	22542 - 11905: 0x88D9,
-	22543 - 11905: 0x88DA,
-	22544 - 11905: 0x88DB,
-	22545 - 11905: 0xC7B5,
-	22546 - 11905: 0x88DC,
-	22547 - 11905: 0x88DD,
-	22548 - 11905: 0x88DE,
-	22549 - 11905: 0xB6E9,
-	22550 - 11905: 0x88DF,
-	22551 - 11905: 0x88E0,
-	22552 - 11905: 0x88E1,
-	22553 - 11905: 0xDCA7,
-	22554 - 11905: 0x88E2,
-	22555 - 11905: 0x88E3,
-	22556 - 11905: 0x88E4,
-	22557 - 11905: 0x88E5,
-	22558 - 11905: 0xDCA6,
-	22559 - 11905: 0x88E6,
-	22560 - 11905: 0xDCA9,
-	22561 - 11905: 0xB1A4,
-	22562 - 11905: 0x88E7,
-	22563 - 11905: 0x88E8,
-	22564 - 11905: 0xB5CC,
-	22565 - 11905: 0x88E9,
-	22566 - 11905: 0x88EA,
-	22567 - 11905: 0x88EB,
-	22568 - 11905: 0x88EC,
-	22569 - 11905: 0x88ED,
-	22570 - 11905: 0xBFB0,
-	22571 - 11905: 0x88EE,
-	22572 - 11905: 0x88EF,
-	22573 - 11905: 0x88F0,
-	22574 - 11905: 0x88F1,
-	22575 - 11905: 0x88F2,
-	22576 - 11905: 0xD1DF,
-	22577 - 11905: 0x88F3,
-	22578 - 11905: 0x88F4,
-	22579 - 11905: 0x88F5,
-	22580 - 11905: 0x88F6,
-	22581 - 11905: 0xB6C2,
-	22582 - 11905: 0x88F7,
-	22583 - 11905: 0x88F8,
-	22584 - 11905: 0x88F9,
-	22585 - 11905: 0x88FA,
-	22586 - 11905: 0x88FB,
-	22587 - 11905: 0x88FC,
-	22588 - 11905: 0x88FD,
-	22589 - 11905: 0x88FE,
-	22590 - 11905: 0x8940,
-	22591 - 11905: 0x8941,
-	22592 - 11905: 0x8942,
-	22593 - 11905: 0x8943,
-	22594 - 11905: 0x8944,
-	22595 - 11905: 0x8945,
-	22596 - 11905: 0xDCA8,
-	22597 - 11905: 0x8946,
-	22598 - 11905: 0x8947,
-	22599 - 11905: 0x8948,
-	22600 - 11905: 0x8949,
-	22601 - 11905: 0x894A,
-	22602 - 11905: 0x894B,
-	22603 - 11905: 0x894C,
-	22604 - 11905: 0xCBFA,
-	22605 - 11905: 0xEBF3,
-	22606 - 11905: 0x894D,
-	22607 - 11905: 0x894E,
-	22608 - 11905: 0x894F,
-	22609 - 11905: 0xCBDC,
-	22610 - 11905: 0x8950,
-	22611 - 11905: 0x8951,
-	22612 - 11905: 0xCBFE,
-	22613 - 11905: 0x8952,
-	22614 - 11905: 0x8953,
-	22615 - 11905: 0x8954,
-	22616 - 11905: 0xCCC1,
-	22617 - 11905: 0x8955,
-	22618 - 11905: 0x8956,
-	22619 - 11905: 0x8957,
-	22620 - 11905: 0x8958,
-	22621 - 11905: 0x8959,
-	22622 - 11905: 0xC8FB,
-	22623 - 11905: 0x895A,
-	22624 - 11905: 0x895B,
-	22625 - 11905: 0x895C,
-	22626 - 11905: 0x895D,
-	22627 - 11905: 0x895E,
-	22628 - 11905: 0x895F,
-	22629 - 11905: 0xDCAA,
-	22630 - 11905: 0x8960,
-	22631 - 11905: 0x8961,
-	22632 - 11905: 0x8962,
-	22633 - 11905: 0x8963,
-	22634 - 11905: 0x8964,
-	22635 - 11905: 0xCCEE,
-	22636 - 11905: 0xDCAB,
-	22637 - 11905: 0x8965,
-	22638 - 11905: 0x8966,
-	22639 - 11905: 0x8967,
-	22640 - 11905: 0x8968,
-	22641 - 11905: 0x8969,
-	22642 - 11905: 0x896A,
-	22643 - 11905: 0x896B,
-	22644 - 11905: 0x896C,
-	22645 - 11905: 0x896D,
-	22646 - 11905: 0x896E,
-	22647 - 11905: 0x896F,
-	22648 - 11905: 0x8970,
-	22649 - 11905: 0x8971,
-	22650 - 11905: 0x8972,
-	22651 - 11905: 0x8973,
-	22652 - 11905: 0x8974,
-	22653 - 11905: 0x8975,
-	22654 - 11905: 0xDBD3,
-	22655 - 11905: 0x8976,
-	22656 - 11905: 0xDCAF,
-	22657 - 11905: 0xDCAC,
-	22658 - 11905: 0x8977,
-	22659 - 11905: 0xBEB3,
-	22660 - 11905: 0x8978,
-	22661 - 11905: 0xCAFB,
-	22662 - 11905: 0x8979,
-	22663 - 11905: 0x897A,
-	22664 - 11905: 0x897B,
-	22665 - 11905: 0xDCAD,
-	22666 - 11905: 0x897C,
-	22667 - 11905: 0x897D,
-	22668 - 11905: 0x897E,
-	22669 - 11905: 0x8980,
-	22670 - 11905: 0x8981,
-	22671 - 11905: 0x8982,
-	22672 - 11905: 0x8983,
-	22673 - 11905: 0x8984,
-	22674 - 11905: 0xC9CA,
-	22675 - 11905: 0xC4B9,
-	22676 - 11905: 0x8985,
-	22677 - 11905: 0x8986,
-	22678 - 11905: 0x8987,
-	22679 - 11905: 0x8988,
-	22680 - 11905: 0x8989,
-	22681 - 11905: 0xC7BD,
-	22682 - 11905: 0xDCAE,
-	22683 - 11905: 0x898A,
-	22684 - 11905: 0x898B,
-	22685 - 11905: 0x898C,
-	22686 - 11905: 0xD4F6,
-	22687 - 11905: 0xD0E6,
-	22688 - 11905: 0x898D,
-	22689 - 11905: 0x898E,
-	22690 - 11905: 0x898F,
-	22691 - 11905: 0x8990,
-	22692 - 11905: 0x8991,
-	22693 - 11905: 0x8992,
-	22694 - 11905: 0x8993,
-	22695 - 11905: 0x8994,
-	22696 - 11905: 0xC4AB,
-	22697 - 11905: 0xB6D5,
-	22698 - 11905: 0x8995,
-	22699 - 11905: 0x8996,
-	22700 - 11905: 0x8997,
-	22701 - 11905: 0x8998,
-	22702 - 11905: 0x8999,
-	22703 - 11905: 0x899A,
-	22704 - 11905: 0x899B,
-	22705 - 11905: 0x899C,
-	22706 - 11905: 0x899D,
-	22707 - 11905: 0x899E,
-	22708 - 11905: 0x899F,
-	22709 - 11905: 0x89A0,
-	22710 - 11905: 0x89A1,
-	22711 - 11905: 0x89A2,
-	22712 - 11905: 0x89A3,
-	22713 - 11905: 0x89A4,
-	22714 - 11905: 0x89A5,
-	22715 - 11905: 0x89A6,
-	22716 - 11905: 0xDBD4,
-	22717 - 11905: 0x89A7,
-	22718 - 11905: 0x89A8,
-	22719 - 11905: 0x89A9,
-	22720 - 11905: 0x89AA,
-	22721 - 11905: 0xB1DA,
-	22722 - 11905: 0x89AB,
-	22723 - 11905: 0x89AC,
-	22724 - 11905: 0x89AD,
-	22725 - 11905: 0xDBD5,
-	22726 - 11905: 0x89AE,
-	22727 - 11905: 0x89AF,
-	22728 - 11905: 0x89B0,
-	22729 - 11905: 0x89B1,
-	22730 - 11905: 0x89B2,
-	22731 - 11905: 0x89B3,
-	22732 - 11905: 0x89B4,
-	22733 - 11905: 0x89B5,
-	22734 - 11905: 0x89B6,
-	22735 - 11905: 0x89B7,
-	22736 - 11905: 0x89B8,
-	22737 - 11905: 0xDBD6,
-	22738 - 11905: 0x89B9,
-	22739 - 11905: 0x89BA,
-	22740 - 11905: 0x89BB,
-	22741 - 11905: 0xBABE,
-	22742 - 11905: 0x89BC,
-	22743 - 11905: 0x89BD,
-	22744 - 11905: 0x89BE,
-	22745 - 11905: 0x89BF,
-	22746 - 11905: 0x89C0,
-	22747 - 11905: 0x89C1,
-	22748 - 11905: 0x89C2,
-	22749 - 11905: 0x89C3,
-	22750 - 11905: 0x89C4,
-	22751 - 11905: 0x89C5,
-	22752 - 11905: 0x89C6,
-	22753 - 11905: 0x89C7,
-	22754 - 11905: 0x89C8,
-	22755 - 11905: 0x89C9,
-	22756 - 11905: 0xC8C0,
-	22757 - 11905: 0x89CA,
-	22758 - 11905: 0x89CB,
-	22759 - 11905: 0x89CC,
-	22760 - 11905: 0x89CD,
-	22761 - 11905: 0x89CE,
-	22762 - 11905: 0x89CF,
-	22763 - 11905: 0xCABF,
-	22764 - 11905: 0xC8C9,
-	22765 - 11905: 0x89D0,
-	22766 - 11905: 0xD7B3,
-	22767 - 11905: 0x89D1,
-	22768 - 11905: 0xC9F9,
-	22769 - 11905: 0x89D2,
-	22770 - 11905: 0x89D3,
-	22771 - 11905: 0xBFC7,
-	22772 - 11905: 0x89D4,
-	22773 - 11905: 0x89D5,
-	22774 - 11905: 0xBAF8,
-	22775 - 11905: 0x89D6,
-	22776 - 11905: 0x89D7,
-	22777 - 11905: 0xD2BC,
-	22778 - 11905: 0x89D8,
-	22779 - 11905: 0x89D9,
-	22780 - 11905: 0x89DA,
-	22781 - 11905: 0x89DB,
-	22782 - 11905: 0x89DC,
-	22783 - 11905: 0x89DD,
-	22784 - 11905: 0x89DE,
-	22785 - 11905: 0x89DF,
-	22786 - 11905: 0xE2BA,
-	22787 - 11905: 0x89E0,
-	22788 - 11905: 0xB4A6,
-	22789 - 11905: 0x89E1,
-	22790 - 11905: 0x89E2,
-	22791 - 11905: 0xB1B8,
-	22792 - 11905: 0x89E3,
-	22793 - 11905: 0x89E4,
-	22794 - 11905: 0x89E5,
-	22795 - 11905: 0x89E6,
-	22796 - 11905: 0x89E7,
-	22797 - 11905: 0xB8B4,
-	22798 - 11905: 0x89E8,
-	22799 - 11905: 0xCFC4,
-	22800 - 11905: 0x89E9,
-	22801 - 11905: 0x89EA,
-	22802 - 11905: 0x89EB,
-	22803 - 11905: 0x89EC,
-	22804 - 11905: 0xD9E7,
-	22805 - 11905: 0xCFA6,
-	22806 - 11905: 0xCDE2,
-	22807 - 11905: 0x89ED,
-	22808 - 11905: 0x89EE,
-	22809 - 11905: 0xD9ED,
-	22810 - 11905: 0xB6E0,
-	22811 - 11905: 0x89EF,
-	22812 - 11905: 0xD2B9,
-	22813 - 11905: 0x89F0,
-	22814 - 11905: 0x89F1,
-	22815 - 11905: 0xB9BB,
-	22816 - 11905: 0x89F2,
-	22817 - 11905: 0x89F3,
-	22818 - 11905: 0x89F4,
-	22819 - 11905: 0x89F5,
-	22820 - 11905: 0xE2B9,
-	22821 - 11905: 0xE2B7,
-	22822 - 11905: 0x89F6,
-	22823 - 11905: 0xB4F3,
-	22824 - 11905: 0x89F7,
-	22825 - 11905: 0xCCEC,
-	22826 - 11905: 0xCCAB,
-	22827 - 11905: 0xB7F2,
-	22828 - 11905: 0x89F8,
-	22829 - 11905: 0xD8B2,
-	22830 - 11905: 0xD1EB,
-	22831 - 11905: 0xBABB,
-	22832 - 11905: 0x89F9,
-	22833 - 11905: 0xCAA7,
-	22834 - 11905: 0x89FA,
-	22835 - 11905: 0x89FB,
-	22836 - 11905: 0xCDB7,
-	22837 - 11905: 0x89FC,
-	22838 - 11905: 0x89FD,
-	22839 - 11905: 0xD2C4,
-	22840 - 11905: 0xBFE4,
-	22841 - 11905: 0xBCD0,
-	22842 - 11905: 0xB6E1,
-	22843 - 11905: 0x89FE,
-	22844 - 11905: 0xDEC5,
-	22845 - 11905: 0x8A40,
-	22846 - 11905: 0x8A41,
-	22847 - 11905: 0x8A42,
-	22848 - 11905: 0x8A43,
-	22849 - 11905: 0xDEC6,
-	22850 - 11905: 0xDBBC,
-	22851 - 11905: 0x8A44,
-	22852 - 11905: 0xD1D9,
-	22853 - 11905: 0x8A45,
-	22854 - 11905: 0x8A46,
-	22855 - 11905: 0xC6E6,
-	22856 - 11905: 0xC4CE,
-	22857 - 11905: 0xB7EE,
-	22858 - 11905: 0x8A47,
-	22859 - 11905: 0xB7DC,
-	22860 - 11905: 0x8A48,
-	22861 - 11905: 0x8A49,
-	22862 - 11905: 0xBFFC,
-	22863 - 11905: 0xD7E0,
-	22864 - 11905: 0x8A4A,
-	22865 - 11905: 0xC6F5,
-	22866 - 11905: 0x8A4B,
-	22867 - 11905: 0x8A4C,
-	22868 - 11905: 0xB1BC,
-	22869 - 11905: 0xDEC8,
-	22870 - 11905: 0xBDB1,
-	22871 - 11905: 0xCCD7,
-	22872 - 11905: 0xDECA,
-	22873 - 11905: 0x8A4D,
-	22874 - 11905: 0xDEC9,
-	22875 - 11905: 0x8A4E,
-	22876 - 11905: 0x8A4F,
-	22877 - 11905: 0x8A50,
-	22878 - 11905: 0x8A51,
-	22879 - 11905: 0x8A52,
-	22880 - 11905: 0xB5EC,
-	22881 - 11905: 0x8A53,
-	22882 - 11905: 0xC9DD,
-	22883 - 11905: 0x8A54,
-	22884 - 11905: 0x8A55,
-	22885 - 11905: 0xB0C2,
-	22886 - 11905: 0x8A56,
-	22887 - 11905: 0x8A57,
-	22888 - 11905: 0x8A58,
-	22889 - 11905: 0x8A59,
-	22890 - 11905: 0x8A5A,
-	22891 - 11905: 0x8A5B,
-	22892 - 11905: 0x8A5C,
-	22893 - 11905: 0x8A5D,
-	22894 - 11905: 0x8A5E,
-	22895 - 11905: 0x8A5F,
-	22896 - 11905: 0x8A60,
-	22897 - 11905: 0x8A61,
-	22898 - 11905: 0x8A62,
-	22899 - 11905: 0xC5AE,
-	22900 - 11905: 0xC5AB,
-	22901 - 11905: 0x8A63,
-	22902 - 11905: 0xC4CC,
-	22903 - 11905: 0x8A64,
-	22904 - 11905: 0xBCE9,
-	22905 - 11905: 0xCBFD,
-	22906 - 11905: 0x8A65,
-	22907 - 11905: 0x8A66,
-	22908 - 11905: 0x8A67,
-	22909 - 11905: 0xBAC3,
-	22910 - 11905: 0x8A68,
-	22911 - 11905: 0x8A69,
-	22912 - 11905: 0x8A6A,
-	22913 - 11905: 0xE5F9,
-	22914 - 11905: 0xC8E7,
-	22915 - 11905: 0xE5FA,
-	22916 - 11905: 0xCDFD,
-	22917 - 11905: 0x8A6B,
-	22918 - 11905: 0xD7B1,
-	22919 - 11905: 0xB8BE,
-	22920 - 11905: 0xC2E8,
-	22921 - 11905: 0x8A6C,
-	22922 - 11905: 0xC8D1,
-	22923 - 11905: 0x8A6D,
-	22924 - 11905: 0x8A6E,
-	22925 - 11905: 0xE5FB,
-	22926 - 11905: 0x8A6F,
-	22927 - 11905: 0x8A70,
-	22928 - 11905: 0x8A71,
-	22929 - 11905: 0x8A72,
-	22930 - 11905: 0xB6CA,
-	22931 - 11905: 0xBCCB,
-	22932 - 11905: 0x8A73,
-	22933 - 11905: 0x8A74,
-	22934 - 11905: 0xD1FD,
-	22935 - 11905: 0xE6A1,
-	22936 - 11905: 0x8A75,
-	22937 - 11905: 0xC3EE,
-	22938 - 11905: 0x8A76,
-	22939 - 11905: 0x8A77,
-	22940 - 11905: 0x8A78,
-	22941 - 11905: 0x8A79,
-	22942 - 11905: 0xE6A4,
-	22943 - 11905: 0x8A7A,
-	22944 - 11905: 0x8A7B,
-	22945 - 11905: 0x8A7C,
-	22946 - 11905: 0x8A7D,
-	22947 - 11905: 0xE5FE,
-	22948 - 11905: 0xE6A5,
-	22949 - 11905: 0xCDD7,
-	22950 - 11905: 0x8A7E,
-	22951 - 11905: 0x8A80,
-	22952 - 11905: 0xB7C1,
-	22953 - 11905: 0xE5FC,
-	22954 - 11905: 0xE5FD,
-	22955 - 11905: 0xE6A3,
-	22956 - 11905: 0x8A81,
-	22957 - 11905: 0x8A82,
-	22958 - 11905: 0xC4DD,
-	22959 - 11905: 0xE6A8,
-	22960 - 11905: 0x8A83,
-	22961 - 11905: 0x8A84,
-	22962 - 11905: 0xE6A7,
-	22963 - 11905: 0x8A85,
-	22964 - 11905: 0x8A86,
-	22965 - 11905: 0x8A87,
-	22966 - 11905: 0x8A88,
-	22967 - 11905: 0x8A89,
-	22968 - 11905: 0x8A8A,
-	22969 - 11905: 0xC3C3,
-	22970 - 11905: 0x8A8B,
-	22971 - 11905: 0xC6DE,
-	22972 - 11905: 0x8A8C,
-	22973 - 11905: 0x8A8D,
-	22974 - 11905: 0xE6AA,
-	22975 - 11905: 0x8A8E,
-	22976 - 11905: 0x8A8F,
-	22977 - 11905: 0x8A90,
-	22978 - 11905: 0x8A91,
-	22979 - 11905: 0x8A92,
-	22980 - 11905: 0x8A93,
-	22981 - 11905: 0x8A94,
-	22982 - 11905: 0xC4B7,
-	22983 - 11905: 0x8A95,
-	22984 - 11905: 0x8A96,
-	22985 - 11905: 0x8A97,
-	22986 - 11905: 0xE6A2,
-	22987 - 11905: 0xCABC,
-	22988 - 11905: 0x8A98,
-	22989 - 11905: 0x8A99,
-	22990 - 11905: 0x8A9A,
-	22991 - 11905: 0x8A9B,
-	22992 - 11905: 0xBDE3,
-	22993 - 11905: 0xB9C3,
-	22994 - 11905: 0xE6A6,
-	22995 - 11905: 0xD0D5,
-	22996 - 11905: 0xCEAF,
-	22997 - 11905: 0x8A9C,
-	22998 - 11905: 0x8A9D,
-	22999 - 11905: 0xE6A9,
-	23000 - 11905: 0xE6B0,
-	23001 - 11905: 0x8A9E,
-	23002 - 11905: 0xD2A6,
-	23003 - 11905: 0x8A9F,
-	23004 - 11905: 0xBDAA,
-	23005 - 11905: 0xE6AD,
-	23006 - 11905: 0x8AA0,
-	23007 - 11905: 0x8AA1,
-	23008 - 11905: 0x8AA2,
-	23009 - 11905: 0x8AA3,
-	23010 - 11905: 0x8AA4,
-	23011 - 11905: 0xE6AF,
-	23012 - 11905: 0x8AA5,
-	23013 - 11905: 0xC0D1,
-	23014 - 11905: 0x8AA6,
-	23015 - 11905: 0x8AA7,
-	23016 - 11905: 0xD2CC,
-	23017 - 11905: 0x8AA8,
-	23018 - 11905: 0x8AA9,
-	23019 - 11905: 0x8AAA,
-	23020 - 11905: 0xBCA7,
-	23021 - 11905: 0x8AAB,
-	23022 - 11905: 0x8AAC,
-	23023 - 11905: 0x8AAD,
-	23024 - 11905: 0x8AAE,
-	23025 - 11905: 0x8AAF,
-	23026 - 11905: 0x8AB0,
-	23027 - 11905: 0x8AB1,
-	23028 - 11905: 0x8AB2,
-	23029 - 11905: 0x8AB3,
-	23030 - 11905: 0x8AB4,
-	23031 - 11905: 0x8AB5,
-	23032 - 11905: 0x8AB6,
-	23033 - 11905: 0xE6B1,
-	23034 - 11905: 0x8AB7,
-	23035 - 11905: 0xD2F6,
-	23036 - 11905: 0x8AB8,
-	23037 - 11905: 0x8AB9,
-	23038 - 11905: 0x8ABA,
-	23039 - 11905: 0xD7CB,
-	23040 - 11905: 0x8ABB,
-	23041 - 11905: 0xCDFE,
-	23042 - 11905: 0x8ABC,
-	23043 - 11905: 0xCDDE,
-	23044 - 11905: 0xC2A6,
-	23045 - 11905: 0xE6AB,
-	23046 - 11905: 0xE6AC,
-	23047 - 11905: 0xBDBF,
-	23048 - 11905: 0xE6AE,
-	23049 - 11905: 0xE6B3,
-	23050 - 11905: 0x8ABD,
-	23051 - 11905: 0x8ABE,
-	23052 - 11905: 0xE6B2,
-	23053 - 11905: 0x8ABF,
-	23054 - 11905: 0x8AC0,
-	23055 - 11905: 0x8AC1,
-	23056 - 11905: 0x8AC2,
-	23057 - 11905: 0xE6B6,
-	23058 - 11905: 0x8AC3,
-	23059 - 11905: 0xE6B8,
-	23060 - 11905: 0x8AC4,
-	23061 - 11905: 0x8AC5,
-	23062 - 11905: 0x8AC6,
-	23063 - 11905: 0x8AC7,
-	23064 - 11905: 0xC4EF,
-	23065 - 11905: 0x8AC8,
-	23066 - 11905: 0x8AC9,
-	23067 - 11905: 0x8ACA,
-	23068 - 11905: 0xC4C8,
-	23069 - 11905: 0x8ACB,
-	23070 - 11905: 0x8ACC,
-	23071 - 11905: 0xBEEA,
-	23072 - 11905: 0xC9EF,
-	23073 - 11905: 0x8ACD,
-	23074 - 11905: 0x8ACE,
-	23075 - 11905: 0xE6B7,
-	23076 - 11905: 0x8ACF,
-	23077 - 11905: 0xB6F0,
-	23078 - 11905: 0x8AD0,
-	23079 - 11905: 0x8AD1,
-	23080 - 11905: 0x8AD2,
-	23081 - 11905: 0xC3E4,
-	23082 - 11905: 0x8AD3,
-	23083 - 11905: 0x8AD4,
-	23084 - 11905: 0x8AD5,
-	23085 - 11905: 0x8AD6,
-	23086 - 11905: 0x8AD7,
-	23087 - 11905: 0x8AD8,
-	23088 - 11905: 0x8AD9,
-	23089 - 11905: 0xD3E9,
-	23090 - 11905: 0xE6B4,
-	23091 - 11905: 0x8ADA,
-	23092 - 11905: 0xE6B5,
-	23093 - 11905: 0x8ADB,
-	23094 - 11905: 0xC8A2,
-	23095 - 11905: 0x8ADC,
-	23096 - 11905: 0x8ADD,
-	23097 - 11905: 0x8ADE,
-	23098 - 11905: 0x8ADF,
-	23099 - 11905: 0x8AE0,
-	23100 - 11905: 0xE6BD,
-	23101 - 11905: 0x8AE1,
-	23102 - 11905: 0x8AE2,
-	23103 - 11905: 0x8AE3,
-	23104 - 11905: 0xE6B9,
-	23105 - 11905: 0x8AE4,
-	23106 - 11905: 0x8AE5,
-	23107 - 11905: 0x8AE6,
-	23108 - 11905: 0x8AE7,
-	23109 - 11905: 0x8AE8,
-	23110 - 11905: 0xC6C5,
-	23111 - 11905: 0x8AE9,
-	23112 - 11905: 0x8AEA,
-	23113 - 11905: 0xCDF1,
-	23114 - 11905: 0xE6BB,
-	23115 - 11905: 0x8AEB,
-	23116 - 11905: 0x8AEC,
-	23117 - 11905: 0x8AED,
-	23118 - 11905: 0x8AEE,
-	23119 - 11905: 0x8AEF,
-	23120 - 11905: 0x8AF0,
-	23121 - 11905: 0x8AF1,
-	23122 - 11905: 0x8AF2,
-	23123 - 11905: 0x8AF3,
-	23124 - 11905: 0x8AF4,
-	23125 - 11905: 0xE6BC,
-	23126 - 11905: 0x8AF5,
-	23127 - 11905: 0x8AF6,
-	23128 - 11905: 0x8AF7,
-	23129 - 11905: 0x8AF8,
-	23130 - 11905: 0xBBE9,
-	23131 - 11905: 0x8AF9,
-	23132 - 11905: 0x8AFA,
-	23133 - 11905: 0x8AFB,
-	23134 - 11905: 0x8AFC,
-	23135 - 11905: 0x8AFD,
-	23136 - 11905: 0x8AFE,
-	23137 - 11905: 0x8B40,
-	23138 - 11905: 0xE6BE,
-	23139 - 11905: 0x8B41,
-	23140 - 11905: 0x8B42,
-	23141 - 11905: 0x8B43,
-	23142 - 11905: 0x8B44,
-	23143 - 11905: 0xE6BA,
-	23144 - 11905: 0x8B45,
-	23145 - 11905: 0x8B46,
-	23146 - 11905: 0xC0B7,
-	23147 - 11905: 0x8B47,
-	23148 - 11905: 0x8B48,
-	23149 - 11905: 0x8B49,
-	23150 - 11905: 0x8B4A,
-	23151 - 11905: 0x8B4B,
-	23152 - 11905: 0x8B4C,
-	23153 - 11905: 0x8B4D,
-	23154 - 11905: 0x8B4E,
-	23155 - 11905: 0x8B4F,
-	23156 - 11905: 0xD3A4,
-	23157 - 11905: 0xE6BF,
-	23158 - 11905: 0xC9F4,
-	23159 - 11905: 0xE6C3,
-	23160 - 11905: 0x8B50,
-	23161 - 11905: 0x8B51,
-	23162 - 11905: 0xE6C4,
-	23163 - 11905: 0x8B52,
-	23164 - 11905: 0x8B53,
-	23165 - 11905: 0x8B54,
-	23166 - 11905: 0x8B55,
-	23167 - 11905: 0xD0F6,
-	23168 - 11905: 0x8B56,
-	23169 - 11905: 0x8B57,
-	23170 - 11905: 0x8B58,
-	23171 - 11905: 0x8B59,
-	23172 - 11905: 0x8B5A,
-	23173 - 11905: 0x8B5B,
-	23174 - 11905: 0x8B5C,
-	23175 - 11905: 0x8B5D,
-	23176 - 11905: 0x8B5E,
-	23177 - 11905: 0x8B5F,
-	23178 - 11905: 0x8B60,
-	23179 - 11905: 0x8B61,
-	23180 - 11905: 0x8B62,
-	23181 - 11905: 0x8B63,
-	23182 - 11905: 0x8B64,
-	23183 - 11905: 0x8B65,
-	23184 - 11905: 0x8B66,
-	23185 - 11905: 0x8B67,
-	23186 - 11905: 0xC3BD,
-	23187 - 11905: 0x8B68,
-	23188 - 11905: 0x8B69,
-	23189 - 11905: 0x8B6A,
-	23190 - 11905: 0x8B6B,
-	23191 - 11905: 0x8B6C,
-	23192 - 11905: 0x8B6D,
-	23193 - 11905: 0x8B6E,
-	23194 - 11905: 0xC3C4,
-	23195 - 11905: 0xE6C2,
-	23196 - 11905: 0x8B6F,
-	23197 - 11905: 0x8B70,
-	23198 - 11905: 0x8B71,
-	23199 - 11905: 0x8B72,
-	23200 - 11905: 0x8B73,
-	23201 - 11905: 0x8B74,
-	23202 - 11905: 0x8B75,
-	23203 - 11905: 0x8B76,
-	23204 - 11905: 0x8B77,
-	23205 - 11905: 0x8B78,
-	23206 - 11905: 0x8B79,
-	23207 - 11905: 0x8B7A,
-	23208 - 11905: 0x8B7B,
-	23209 - 11905: 0x8B7C,
-	23210 - 11905: 0xE6C1,
-	23211 - 11905: 0x8B7D,
-	23212 - 11905: 0x8B7E,
-	23213 - 11905: 0x8B80,
-	23214 - 11905: 0x8B81,
-	23215 - 11905: 0x8B82,
-	23216 - 11905: 0x8B83,
-	23217 - 11905: 0x8B84,
-	23218 - 11905: 0xE6C7,
-	23219 - 11905: 0xCFB1,
-	23220 - 11905: 0x8B85,
-	23221 - 11905: 0xEBF4,
-	23222 - 11905: 0x8B86,
-	23223 - 11905: 0x8B87,
-	23224 - 11905: 0xE6CA,
-	23225 - 11905: 0x8B88,
-	23226 - 11905: 0x8B89,
-	23227 - 11905: 0x8B8A,
-	23228 - 11905: 0x8B8B,
-	23229 - 11905: 0x8B8C,
-	23230 - 11905: 0xE6C5,
-	23231 - 11905: 0x8B8D,
-	23232 - 11905: 0x8B8E,
-	23233 - 11905: 0xBCDE,
-	23234 - 11905: 0xC9A9,
-	23235 - 11905: 0x8B8F,
-	23236 - 11905: 0x8B90,
-	23237 - 11905: 0x8B91,
-	23238 - 11905: 0x8B92,
-	23239 - 11905: 0x8B93,
-	23240 - 11905: 0x8B94,
-	23241 - 11905: 0xBCB5,
-	23242 - 11905: 0x8B95,
-	23243 - 11905: 0x8B96,
-	23244 - 11905: 0xCFD3,
-	23245 - 11905: 0x8B97,
-	23246 - 11905: 0x8B98,
-	23247 - 11905: 0x8B99,
-	23248 - 11905: 0x8B9A,
-	23249 - 11905: 0x8B9B,
-	23250 - 11905: 0xE6C8,
-	23251 - 11905: 0x8B9C,
-	23252 - 11905: 0xE6C9,
-	23253 - 11905: 0x8B9D,
-	23254 - 11905: 0xE6CE,
-	23255 - 11905: 0x8B9E,
-	23256 - 11905: 0xE6D0,
-	23257 - 11905: 0x8B9F,
-	23258 - 11905: 0x8BA0,
-	23259 - 11905: 0x8BA1,
-	23260 - 11905: 0xE6D1,
-	23261 - 11905: 0x8BA2,
-	23262 - 11905: 0x8BA3,
-	23263 - 11905: 0x8BA4,
-	23264 - 11905: 0xE6CB,
-	23265 - 11905: 0xB5D5,
-	23266 - 11905: 0x8BA5,
-	23267 - 11905: 0xE6CC,
-	23268 - 11905: 0x8BA6,
-	23269 - 11905: 0x8BA7,
-	23270 - 11905: 0xE6CF,
-	23271 - 11905: 0x8BA8,
-	23272 - 11905: 0x8BA9,
-	23273 - 11905: 0xC4DB,
-	23274 - 11905: 0x8BAA,
-	23275 - 11905: 0xE6C6,
-	23276 - 11905: 0x8BAB,
-	23277 - 11905: 0x8BAC,
-	23278 - 11905: 0x8BAD,
-	23279 - 11905: 0x8BAE,
-	23280 - 11905: 0x8BAF,
-	23281 - 11905: 0xE6CD,
-	23282 - 11905: 0x8BB0,
-	23283 - 11905: 0x8BB1,
-	23284 - 11905: 0x8BB2,
-	23285 - 11905: 0x8BB3,
-	23286 - 11905: 0x8BB4,
-	23287 - 11905: 0x8BB5,
-	23288 - 11905: 0x8BB6,
-	23289 - 11905: 0x8BB7,
-	23290 - 11905: 0x8BB8,
-	23291 - 11905: 0x8BB9,
-	23292 - 11905: 0x8BBA,
-	23293 - 11905: 0x8BBB,
-	23294 - 11905: 0x8BBC,
-	23295 - 11905: 0x8BBD,
-	23296 - 11905: 0x8BBE,
-	23297 - 11905: 0x8BBF,
-	23298 - 11905: 0x8BC0,
-	23299 - 11905: 0x8BC1,
-	23300 - 11905: 0x8BC2,
-	23301 - 11905: 0x8BC3,
-	23302 - 11905: 0x8BC4,
-	23303 - 11905: 0x8BC5,
-	23304 - 11905: 0x8BC6,
-	23305 - 11905: 0xE6D2,
-	23306 - 11905: 0x8BC7,
-	23307 - 11905: 0x8BC8,
-	23308 - 11905: 0x8BC9,
-	23309 - 11905: 0x8BCA,
-	23310 - 11905: 0x8BCB,
-	23311 - 11905: 0x8BCC,
-	23312 - 11905: 0x8BCD,
-	23313 - 11905: 0x8BCE,
-	23314 - 11905: 0x8BCF,
-	23315 - 11905: 0x8BD0,
-	23316 - 11905: 0x8BD1,
-	23317 - 11905: 0x8BD2,
-	23318 - 11905: 0xE6D4,
-	23319 - 11905: 0xE6D3,
-	23320 - 11905: 0x8BD3,
-	23321 - 11905: 0x8BD4,
-	23322 - 11905: 0x8BD5,
-	23323 - 11905: 0x8BD6,
-	23324 - 11905: 0x8BD7,
-	23325 - 11905: 0x8BD8,
-	23326 - 11905: 0x8BD9,
-	23327 - 11905: 0x8BDA,
-	23328 - 11905: 0x8BDB,
-	23329 - 11905: 0x8BDC,
-	23330 - 11905: 0x8BDD,
-	23331 - 11905: 0x8BDE,
-	23332 - 11905: 0x8BDF,
-	23333 - 11905: 0x8BE0,
-	23334 - 11905: 0x8BE1,
-	23335 - 11905: 0x8BE2,
-	23336 - 11905: 0x8BE3,
-	23337 - 11905: 0x8BE4,
-	23338 - 11905: 0x8BE5,
-	23339 - 11905: 0x8BE6,
-	23340 - 11905: 0x8BE7,
-	23341 - 11905: 0x8BE8,
-	23342 - 11905: 0x8BE9,
-	23343 - 11905: 0x8BEA,
-	23344 - 11905: 0x8BEB,
-	23345 - 11905: 0x8BEC,
-	23346 - 11905: 0xE6D5,
-	23347 - 11905: 0x8BED,
-	23348 - 11905: 0xD9F8,
-	23349 - 11905: 0x8BEE,
-	23350 - 11905: 0x8BEF,
-	23351 - 11905: 0xE6D6,
-	23352 - 11905: 0x8BF0,
-	23353 - 11905: 0x8BF1,
-	23354 - 11905: 0x8BF2,
-	23355 - 11905: 0x8BF3,
-	23356 - 11905: 0x8BF4,
-	23357 - 11905: 0x8BF5,
-	23358 - 11905: 0x8BF6,
-	23359 - 11905: 0x8BF7,
-	23360 - 11905: 0xE6D7,
-	23361 - 11905: 0x8BF8,
-	23362 - 11905: 0x8BF9,
-	23363 - 11905: 0x8BFA,
-	23364 - 11905: 0x8BFB,
-	23365 - 11905: 0x8BFC,
-	23366 - 11905: 0x8BFD,
-	23367 - 11905: 0x8BFE,
-	23368 - 11905: 0x8C40,
-	23369 - 11905: 0x8C41,
-	23370 - 11905: 0x8C42,
-	23371 - 11905: 0x8C43,
-	23372 - 11905: 0x8C44,
-	23373 - 11905: 0x8C45,
-	23374 - 11905: 0x8C46,
-	23375 - 11905: 0x8C47,
-	23376 - 11905: 0xD7D3,
-	23377 - 11905: 0xE6DD,
-	23378 - 11905: 0x8C48,
-	23379 - 11905: 0xE6DE,
-	23380 - 11905: 0xBFD7,
-	23381 - 11905: 0xD4D0,
-	23382 - 11905: 0x8C49,
-	23383 - 11905: 0xD7D6,
-	23384 - 11905: 0xB4E6,
-	23385 - 11905: 0xCBEF,
-	23386 - 11905: 0xE6DA,
-	23387 - 11905: 0xD8C3,
-	23388 - 11905: 0xD7CE,
-	23389 - 11905: 0xD0A2,
-	23390 - 11905: 0x8C4A,
-	23391 - 11905: 0xC3CF,
-	23392 - 11905: 0x8C4B,
-	23393 - 11905: 0x8C4C,
-	23394 - 11905: 0xE6DF,
-	23395 - 11905: 0xBCBE,
-	23396 - 11905: 0xB9C2,
-	23397 - 11905: 0xE6DB,
-	23398 - 11905: 0xD1A7,
-	23399 - 11905: 0x8C4D,
-	23400 - 11905: 0x8C4E,
-	23401 - 11905: 0xBAA2,
-	23402 - 11905: 0xC2CF,
-	23403 - 11905: 0x8C4F,
-	23404 - 11905: 0xD8AB,
-	23405 - 11905: 0x8C50,
-	23406 - 11905: 0x8C51,
-	23407 - 11905: 0x8C52,
-	23408 - 11905: 0xCAEB,
-	23409 - 11905: 0xE5EE,
-	23410 - 11905: 0x8C53,
-	23411 - 11905: 0xE6DC,
-	23412 - 11905: 0x8C54,
-	23413 - 11905: 0xB7F5,
-	23414 - 11905: 0x8C55,
-	23415 - 11905: 0x8C56,
-	23416 - 11905: 0x8C57,
-	23417 - 11905: 0x8C58,
-	23418 - 11905: 0xC8E6,
-	23419 - 11905: 0x8C59,
-	23420 - 11905: 0x8C5A,
-	23421 - 11905: 0xC4F5,
-	23422 - 11905: 0x8C5B,
-	23423 - 11905: 0x8C5C,
-	23424 - 11905: 0xE5B2,
-	23425 - 11905: 0xC4FE,
-	23426 - 11905: 0x8C5D,
-	23427 - 11905: 0xCBFC,
-	23428 - 11905: 0xE5B3,
-	23429 - 11905: 0xD5AC,
-	23430 - 11905: 0x8C5E,
-	23431 - 11905: 0xD3EE,
-	23432 - 11905: 0xCAD8,
-	23433 - 11905: 0xB0B2,
-	23434 - 11905: 0x8C5F,
-	23435 - 11905: 0xCBCE,
-	23436 - 11905: 0xCDEA,
-	23437 - 11905: 0x8C60,
-	23438 - 11905: 0x8C61,
-	23439 - 11905: 0xBAEA,
-	23440 - 11905: 0x8C62,
-	23441 - 11905: 0x8C63,
-	23442 - 11905: 0x8C64,
-	23443 - 11905: 0xE5B5,
-	23444 - 11905: 0x8C65,
-	23445 - 11905: 0xE5B4,
-	23446 - 11905: 0x8C66,
-	23447 - 11905: 0xD7DA,
-	23448 - 11905: 0xB9D9,
-	23449 - 11905: 0xD6E6,
-	23450 - 11905: 0xB6A8,
-	23451 - 11905: 0xCDF0,
-	23452 - 11905: 0xD2CB,
-	23453 - 11905: 0xB1A6,
-	23454 - 11905: 0xCAB5,
-	23455 - 11905: 0x8C67,
-	23456 - 11905: 0xB3E8,
-	23457 - 11905: 0xC9F3,
-	23458 - 11905: 0xBFCD,
-	23459 - 11905: 0xD0FB,
-	23460 - 11905: 0xCAD2,
-	23461 - 11905: 0xE5B6,
-	23462 - 11905: 0xBBC2,
-	23463 - 11905: 0x8C68,
-	23464 - 11905: 0x8C69,
-	23465 - 11905: 0x8C6A,
-	23466 - 11905: 0xCFDC,
-	23467 - 11905: 0xB9AC,
-	23468 - 11905: 0x8C6B,
-	23469 - 11905: 0x8C6C,
-	23470 - 11905: 0x8C6D,
-	23471 - 11905: 0x8C6E,
-	23472 - 11905: 0xD4D7,
-	23473 - 11905: 0x8C6F,
-	23474 - 11905: 0x8C70,
-	23475 - 11905: 0xBAA6,
-	23476 - 11905: 0xD1E7,
-	23477 - 11905: 0xCFFC,
-	23478 - 11905: 0xBCD2,
-	23479 - 11905: 0x8C71,
-	23480 - 11905: 0xE5B7,
-	23481 - 11905: 0xC8DD,
-	23482 - 11905: 0x8C72,
-	23483 - 11905: 0x8C73,
-	23484 - 11905: 0x8C74,
-	23485 - 11905: 0xBFED,
-	23486 - 11905: 0xB1F6,
-	23487 - 11905: 0xCBDE,
-	23488 - 11905: 0x8C75,
-	23489 - 11905: 0x8C76,
-	23490 - 11905: 0xBCC5,
-	23491 - 11905: 0x8C77,
-	23492 - 11905: 0xBCC4,
-	23493 - 11905: 0xD2FA,
-	23494 - 11905: 0xC3DC,
-	23495 - 11905: 0xBFDC,
-	23496 - 11905: 0x8C78,
-	23497 - 11905: 0x8C79,
-	23498 - 11905: 0x8C7A,
-	23499 - 11905: 0x8C7B,
-	23500 - 11905: 0xB8BB,
-	23501 - 11905: 0x8C7C,
-	23502 - 11905: 0x8C7D,
-	23503 - 11905: 0x8C7E,
-	23504 - 11905: 0xC3C2,
-	23505 - 11905: 0x8C80,
-	23506 - 11905: 0xBAAE,
-	23507 - 11905: 0xD4A2,
-	23508 - 11905: 0x8C81,
-	23509 - 11905: 0x8C82,
-	23510 - 11905: 0x8C83,
-	23511 - 11905: 0x8C84,
-	23512 - 11905: 0x8C85,
-	23513 - 11905: 0x8C86,
-	23514 - 11905: 0x8C87,
-	23515 - 11905: 0x8C88,
-	23516 - 11905: 0x8C89,
-	23517 - 11905: 0xC7DE,
-	23518 - 11905: 0xC4AF,
-	23519 - 11905: 0xB2EC,
-	23520 - 11905: 0x8C8A,
-	23521 - 11905: 0xB9D1,
-	23522 - 11905: 0x8C8B,
-	23523 - 11905: 0x8C8C,
-	23524 - 11905: 0xE5BB,
-	23525 - 11905: 0xC1C8,
-	23526 - 11905: 0x8C8D,
-	23527 - 11905: 0x8C8E,
-	23528 - 11905: 0xD5AF,
-	23529 - 11905: 0x8C8F,
-	23530 - 11905: 0x8C90,
-	23531 - 11905: 0x8C91,
-	23532 - 11905: 0x8C92,
-	23533 - 11905: 0x8C93,
-	23534 - 11905: 0xE5BC,
-	23535 - 11905: 0x8C94,
-	23536 - 11905: 0xE5BE,
-	23537 - 11905: 0x8C95,
-	23538 - 11905: 0x8C96,
-	23539 - 11905: 0x8C97,
-	23540 - 11905: 0x8C98,
-	23541 - 11905: 0x8C99,
-	23542 - 11905: 0x8C9A,
-	23543 - 11905: 0x8C9B,
-	23544 - 11905: 0xB4E7,
-	23545 - 11905: 0xB6D4,
-	23546 - 11905: 0xCBC2,
-	23547 - 11905: 0xD1B0,
-	23548 - 11905: 0xB5BC,
-	23549 - 11905: 0x8C9C,
-	23550 - 11905: 0x8C9D,
-	23551 - 11905: 0xCAD9,
-	23552 - 11905: 0x8C9E,
-	23553 - 11905: 0xB7E2,
-	23554 - 11905: 0x8C9F,
-	23555 - 11905: 0x8CA0,
-	23556 - 11905: 0xC9E4,
-	23557 - 11905: 0x8CA1,
-	23558 - 11905: 0xBDAB,
-	23559 - 11905: 0x8CA2,
-	23560 - 11905: 0x8CA3,
-	23561 - 11905: 0xCEBE,
-	23562 - 11905: 0xD7F0,
-	23563 - 11905: 0x8CA4,
-	23564 - 11905: 0x8CA5,
-	23565 - 11905: 0x8CA6,
-	23566 - 11905: 0x8CA7,
-	23567 - 11905: 0xD0A1,
-	23568 - 11905: 0x8CA8,
-	23569 - 11905: 0xC9D9,
-	23570 - 11905: 0x8CA9,
-	23571 - 11905: 0x8CAA,
-	23572 - 11905: 0xB6FB,
-	23573 - 11905: 0xE6D8,
-	23574 - 11905: 0xBCE2,
-	23575 - 11905: 0x8CAB,
-	23576 - 11905: 0xB3BE,
-	23577 - 11905: 0x8CAC,
-	23578 - 11905: 0xC9D0,
-	23579 - 11905: 0x8CAD,
-	23580 - 11905: 0xE6D9,
-	23581 - 11905: 0xB3A2,
-	23582 - 11905: 0x8CAE,
-	23583 - 11905: 0x8CAF,
-	23584 - 11905: 0x8CB0,
-	23585 - 11905: 0x8CB1,
-	23586 - 11905: 0xDECC,
-	23587 - 11905: 0x8CB2,
-	23588 - 11905: 0xD3C8,
-	23589 - 11905: 0xDECD,
-	23590 - 11905: 0x8CB3,
-	23591 - 11905: 0xD2A2,
-	23592 - 11905: 0x8CB4,
-	23593 - 11905: 0x8CB5,
-	23594 - 11905: 0x8CB6,
-	23595 - 11905: 0x8CB7,
-	23596 - 11905: 0xDECE,
-	23597 - 11905: 0x8CB8,
-	23598 - 11905: 0x8CB9,
-	23599 - 11905: 0x8CBA,
-	23600 - 11905: 0x8CBB,
-	23601 - 11905: 0xBECD,
-	23602 - 11905: 0x8CBC,
-	23603 - 11905: 0x8CBD,
-	23604 - 11905: 0xDECF,
-	23605 - 11905: 0x8CBE,
-	23606 - 11905: 0x8CBF,
-	23607 - 11905: 0x8CC0,
-	23608 - 11905: 0xCAAC,
-	23609 - 11905: 0xD2FC,
-	23610 - 11905: 0xB3DF,
-	23611 - 11905: 0xE5EA,
-	23612 - 11905: 0xC4E1,
-	23613 - 11905: 0xBEA1,
-	23614 - 11905: 0xCEB2,
-	23615 - 11905: 0xC4F2,
-	23616 - 11905: 0xBED6,
-	23617 - 11905: 0xC6A8,
-	23618 - 11905: 0xB2E3,
-	23619 - 11905: 0x8CC1,
-	23620 - 11905: 0x8CC2,
-	23621 - 11905: 0xBED3,
-	23622 - 11905: 0x8CC3,
-	23623 - 11905: 0x8CC4,
-	23624 - 11905: 0xC7FC,
-	23625 - 11905: 0xCCEB,
-	23626 - 11905: 0xBDEC,
-	23627 - 11905: 0xCEDD,
-	23628 - 11905: 0x8CC5,
-	23629 - 11905: 0x8CC6,
-	23630 - 11905: 0xCABA,
-	23631 - 11905: 0xC6C1,
-	23632 - 11905: 0xE5EC,
-	23633 - 11905: 0xD0BC,
-	23634 - 11905: 0x8CC7,
-	23635 - 11905: 0x8CC8,
-	23636 - 11905: 0x8CC9,
-	23637 - 11905: 0xD5B9,
-	23638 - 11905: 0x8CCA,
-	23639 - 11905: 0x8CCB,
-	23640 - 11905: 0x8CCC,
-	23641 - 11905: 0xE5ED,
-	23642 - 11905: 0x8CCD,
-	23643 - 11905: 0x8CCE,
-	23644 - 11905: 0x8CCF,
-	23645 - 11905: 0x8CD0,
-	23646 - 11905: 0xCAF4,
-	23647 - 11905: 0x8CD1,
-	23648 - 11905: 0xCDC0,
-	23649 - 11905: 0xC2C5,
-	23650 - 11905: 0x8CD2,
-	23651 - 11905: 0xE5EF,
-	23652 - 11905: 0x8CD3,
-	23653 - 11905: 0xC2C4,
-	23654 - 11905: 0xE5F0,
-	23655 - 11905: 0x8CD4,
-	23656 - 11905: 0x8CD5,
-	23657 - 11905: 0x8CD6,
-	23658 - 11905: 0x8CD7,
-	23659 - 11905: 0x8CD8,
-	23660 - 11905: 0x8CD9,
-	23661 - 11905: 0x8CDA,
-	23662 - 11905: 0xE5F8,
-	23663 - 11905: 0xCDCD,
-	23664 - 11905: 0x8CDB,
-	23665 - 11905: 0xC9BD,
-	23666 - 11905: 0x8CDC,
-	23667 - 11905: 0x8CDD,
-	23668 - 11905: 0x8CDE,
-	23669 - 11905: 0x8CDF,
-	23670 - 11905: 0x8CE0,
-	23671 - 11905: 0x8CE1,
-	23672 - 11905: 0x8CE2,
-	23673 - 11905: 0xD2D9,
-	23674 - 11905: 0xE1A8,
-	23675 - 11905: 0x8CE3,
-	23676 - 11905: 0x8CE4,
-	23677 - 11905: 0x8CE5,
-	23678 - 11905: 0x8CE6,
-	23679 - 11905: 0xD3EC,
-	23680 - 11905: 0x8CE7,
-	23681 - 11905: 0xCBEA,
-	23682 - 11905: 0xC6F1,
-	23683 - 11905: 0x8CE8,
-	23684 - 11905: 0x8CE9,
-	23685 - 11905: 0x8CEA,
-	23686 - 11905: 0x8CEB,
-	23687 - 11905: 0x8CEC,
-	23688 - 11905: 0xE1AC,
-	23689 - 11905: 0x8CED,
-	23690 - 11905: 0x8CEE,
-	23691 - 11905: 0x8CEF,
-	23692 - 11905: 0xE1A7,
-	23693 - 11905: 0xE1A9,
-	23694 - 11905: 0x8CF0,
-	23695 - 11905: 0x8CF1,
-	23696 - 11905: 0xE1AA,
-	23697 - 11905: 0xE1AF,
-	23698 - 11905: 0x8CF2,
-	23699 - 11905: 0x8CF3,
-	23700 - 11905: 0xB2ED,
-	23701 - 11905: 0x8CF4,
-	23702 - 11905: 0xE1AB,
-	23703 - 11905: 0xB8DA,
-	23704 - 11905: 0xE1AD,
-	23705 - 11905: 0xE1AE,
-	23706 - 11905: 0xE1B0,
-	23707 - 11905: 0xB5BA,
-	23708 - 11905: 0xE1B1,
-	23709 - 11905: 0x8CF5,
-	23710 - 11905: 0x8CF6,
-	23711 - 11905: 0x8CF7,
-	23712 - 11905: 0x8CF8,
-	23713 - 11905: 0x8CF9,
-	23714 - 11905: 0xE1B3,
-	23715 - 11905: 0xE1B8,
-	23716 - 11905: 0x8CFA,
-	23717 - 11905: 0x8CFB,
-	23718 - 11905: 0x8CFC,
-	23719 - 11905: 0x8CFD,
-	23720 - 11905: 0x8CFE,
-	23721 - 11905: 0xD1D2,
-	23722 - 11905: 0x8D40,
-	23723 - 11905: 0xE1B6,
-	23724 - 11905: 0xE1B5,
-	23725 - 11905: 0xC1EB,
-	23726 - 11905: 0x8D41,
-	23727 - 11905: 0x8D42,
-	23728 - 11905: 0x8D43,
-	23729 - 11905: 0xE1B7,
-	23730 - 11905: 0x8D44,
-	23731 - 11905: 0xD4C0,
-	23732 - 11905: 0x8D45,
-	23733 - 11905: 0xE1B2,
-	23734 - 11905: 0x8D46,
-	23735 - 11905: 0xE1BA,
-	23736 - 11905: 0xB0B6,
-	23737 - 11905: 0x8D47,
-	23738 - 11905: 0x8D48,
-	23739 - 11905: 0x8D49,
-	23740 - 11905: 0x8D4A,
-	23741 - 11905: 0xE1B4,
-	23742 - 11905: 0x8D4B,
-	23743 - 11905: 0xBFF9,
-	23744 - 11905: 0x8D4C,
-	23745 - 11905: 0xE1B9,
-	23746 - 11905: 0x8D4D,
-	23747 - 11905: 0x8D4E,
-	23748 - 11905: 0xE1BB,
-	23749 - 11905: 0x8D4F,
-	23750 - 11905: 0x8D50,
-	23751 - 11905: 0x8D51,
-	23752 - 11905: 0x8D52,
-	23753 - 11905: 0x8D53,
-	23754 - 11905: 0x8D54,
-	23755 - 11905: 0xE1BE,
-	23756 - 11905: 0x8D55,
-	23757 - 11905: 0x8D56,
-	23758 - 11905: 0x8D57,
-	23759 - 11905: 0x8D58,
-	23760 - 11905: 0x8D59,
-	23761 - 11905: 0x8D5A,
-	23762 - 11905: 0xE1BC,
-	23763 - 11905: 0x8D5B,
-	23764 - 11905: 0x8D5C,
-	23765 - 11905: 0x8D5D,
-	23766 - 11905: 0x8D5E,
-	23767 - 11905: 0x8D5F,
-	23768 - 11905: 0x8D60,
-	23769 - 11905: 0xD6C5,
-	23770 - 11905: 0x8D61,
-	23771 - 11905: 0x8D62,
-	23772 - 11905: 0x8D63,
-	23773 - 11905: 0x8D64,
-	23774 - 11905: 0x8D65,
-	23775 - 11905: 0x8D66,
-	23776 - 11905: 0x8D67,
-	23777 - 11905: 0xCFBF,
-	23778 - 11905: 0x8D68,
-	23779 - 11905: 0x8D69,
-	23780 - 11905: 0xE1BD,
-	23781 - 11905: 0xE1BF,
-	23782 - 11905: 0xC2CD,
-	23783 - 11905: 0x8D6A,
-	23784 - 11905: 0xB6EB,
-	23785 - 11905: 0x8D6B,
-	23786 - 11905: 0xD3F8,
-	23787 - 11905: 0x8D6C,
-	23788 - 11905: 0x8D6D,
-	23789 - 11905: 0xC7CD,
-	23790 - 11905: 0x8D6E,
-	23791 - 11905: 0x8D6F,
-	23792 - 11905: 0xB7E5,
-	23793 - 11905: 0x8D70,
-	23794 - 11905: 0x8D71,
-	23795 - 11905: 0x8D72,
-	23796 - 11905: 0x8D73,
-	23797 - 11905: 0x8D74,
-	23798 - 11905: 0x8D75,
-	23799 - 11905: 0x8D76,
-	23800 - 11905: 0x8D77,
-	23801 - 11905: 0x8D78,
-	23802 - 11905: 0x8D79,
-	23803 - 11905: 0xBEFE,
-	23804 - 11905: 0x8D7A,
-	23805 - 11905: 0x8D7B,
-	23806 - 11905: 0x8D7C,
-	23807 - 11905: 0x8D7D,
-	23808 - 11905: 0x8D7E,
-	23809 - 11905: 0x8D80,
-	23810 - 11905: 0xE1C0,
-	23811 - 11905: 0xE1C1,
-	23812 - 11905: 0x8D81,
-	23813 - 11905: 0x8D82,
-	23814 - 11905: 0xE1C7,
-	23815 - 11905: 0xB3E7,
-	23816 - 11905: 0x8D83,
-	23817 - 11905: 0x8D84,
-	23818 - 11905: 0x8D85,
-	23819 - 11905: 0x8D86,
-	23820 - 11905: 0x8D87,
-	23821 - 11905: 0x8D88,
-	23822 - 11905: 0xC6E9,
-	23823 - 11905: 0x8D89,
-	23824 - 11905: 0x8D8A,
-	23825 - 11905: 0x8D8B,
-	23826 - 11905: 0x8D8C,
-	23827 - 11905: 0x8D8D,
-	23828 - 11905: 0xB4DE,
-	23829 - 11905: 0x8D8E,
-	23830 - 11905: 0xD1C2,
-	23831 - 11905: 0x8D8F,
-	23832 - 11905: 0x8D90,
-	23833 - 11905: 0x8D91,
-	23834 - 11905: 0x8D92,
-	23835 - 11905: 0xE1C8,
-	23836 - 11905: 0x8D93,
-	23837 - 11905: 0x8D94,
-	23838 - 11905: 0xE1C6,
-	23839 - 11905: 0x8D95,
-	23840 - 11905: 0x8D96,
-	23841 - 11905: 0x8D97,
-	23842 - 11905: 0x8D98,
-	23843 - 11905: 0x8D99,
-	23844 - 11905: 0xE1C5,
-	23845 - 11905: 0x8D9A,
-	23846 - 11905: 0xE1C3,
-	23847 - 11905: 0xE1C2,
-	23848 - 11905: 0x8D9B,
-	23849 - 11905: 0xB1C0,
-	23850 - 11905: 0x8D9C,
-	23851 - 11905: 0x8D9D,
-	23852 - 11905: 0x8D9E,
-	23853 - 11905: 0xD5B8,
-	23854 - 11905: 0xE1C4,
-	23855 - 11905: 0x8D9F,
-	23856 - 11905: 0x8DA0,
-	23857 - 11905: 0x8DA1,
-	23858 - 11905: 0x8DA2,
-	23859 - 11905: 0x8DA3,
-	23860 - 11905: 0xE1CB,
-	23861 - 11905: 0x8DA4,
-	23862 - 11905: 0x8DA5,
-	23863 - 11905: 0x8DA6,
-	23864 - 11905: 0x8DA7,
-	23865 - 11905: 0x8DA8,
-	23866 - 11905: 0x8DA9,
-	23867 - 11905: 0x8DAA,
-	23868 - 11905: 0x8DAB,
-	23869 - 11905: 0xE1CC,
-	23870 - 11905: 0xE1CA,
-	23871 - 11905: 0x8DAC,
-	23872 - 11905: 0x8DAD,
-	23873 - 11905: 0x8DAE,
-	23874 - 11905: 0x8DAF,
-	23875 - 11905: 0x8DB0,
-	23876 - 11905: 0x8DB1,
-	23877 - 11905: 0x8DB2,
-	23878 - 11905: 0x8DB3,
-	23879 - 11905: 0xEFFA,
-	23880 - 11905: 0x8DB4,
-	23881 - 11905: 0x8DB5,
-	23882 - 11905: 0xE1D3,
-	23883 - 11905: 0xE1D2,
-	23884 - 11905: 0xC7B6,
-	23885 - 11905: 0x8DB6,
-	23886 - 11905: 0x8DB7,
-	23887 - 11905: 0x8DB8,
-	23888 - 11905: 0x8DB9,
-	23889 - 11905: 0x8DBA,
-	23890 - 11905: 0x8DBB,
-	23891 - 11905: 0x8DBC,
-	23892 - 11905: 0x8DBD,
-	23893 - 11905: 0x8DBE,
-	23894 - 11905: 0x8DBF,
-	23895 - 11905: 0x8DC0,
-	23896 - 11905: 0xE1C9,
-	23897 - 11905: 0x8DC1,
-	23898 - 11905: 0x8DC2,
-	23899 - 11905: 0xE1CE,
-	23900 - 11905: 0x8DC3,
-	23901 - 11905: 0xE1D0,
-	23902 - 11905: 0x8DC4,
-	23903 - 11905: 0x8DC5,
-	23904 - 11905: 0x8DC6,
-	23905 - 11905: 0x8DC7,
-	23906 - 11905: 0x8DC8,
-	23907 - 11905: 0x8DC9,
-	23908 - 11905: 0x8DCA,
-	23909 - 11905: 0x8DCB,
-	23910 - 11905: 0x8DCC,
-	23911 - 11905: 0x8DCD,
-	23912 - 11905: 0x8DCE,
-	23913 - 11905: 0xE1D4,
-	23914 - 11905: 0x8DCF,
-	23915 - 11905: 0xE1D1,
-	23916 - 11905: 0xE1CD,
-	23917 - 11905: 0x8DD0,
-	23918 - 11905: 0x8DD1,
-	23919 - 11905: 0xE1CF,
-	23920 - 11905: 0x8DD2,
-	23921 - 11905: 0x8DD3,
-	23922 - 11905: 0x8DD4,
-	23923 - 11905: 0x8DD5,
-	23924 - 11905: 0xE1D5,
-	23925 - 11905: 0x8DD6,
-	23926 - 11905: 0x8DD7,
-	23927 - 11905: 0x8DD8,
-	23928 - 11905: 0x8DD9,
-	23929 - 11905: 0x8DDA,
-	23930 - 11905: 0x8DDB,
-	23931 - 11905: 0x8DDC,
-	23932 - 11905: 0x8DDD,
-	23933 - 11905: 0x8DDE,
-	23934 - 11905: 0x8DDF,
-	23935 - 11905: 0x8DE0,
-	23936 - 11905: 0x8DE1,
-	23937 - 11905: 0x8DE2,
-	23938 - 11905: 0xE1D6,
-	23939 - 11905: 0x8DE3,
-	23940 - 11905: 0x8DE4,
-	23941 - 11905: 0x8DE5,
-	23942 - 11905: 0x8DE6,
-	23943 - 11905: 0x8DE7,
-	23944 - 11905: 0x8DE8,
-	23945 - 11905: 0x8DE9,
-	23946 - 11905: 0x8DEA,
-	23947 - 11905: 0x8DEB,
-	23948 - 11905: 0x8DEC,
-	23949 - 11905: 0x8DED,
-	23950 - 11905: 0x8DEE,
-	23951 - 11905: 0x8DEF,
-	23952 - 11905: 0x8DF0,
-	23953 - 11905: 0x8DF1,
-	23954 - 11905: 0x8DF2,
-	23955 - 11905: 0x8DF3,
-	23956 - 11905: 0x8DF4,
-	23957 - 11905: 0x8DF5,
-	23958 - 11905: 0x8DF6,
-	23959 - 11905: 0x8DF7,
-	23960 - 11905: 0x8DF8,
-	23961 - 11905: 0xE1D7,
-	23962 - 11905: 0x8DF9,
-	23963 - 11905: 0x8DFA,
-	23964 - 11905: 0x8DFB,
-	23965 - 11905: 0xE1D8,
-	23966 - 11905: 0x8DFC,
-	23967 - 11905: 0x8DFD,
-	23968 - 11905: 0x8DFE,
-	23969 - 11905: 0x8E40,
-	23970 - 11905: 0x8E41,
-	23971 - 11905: 0x8E42,
-	23972 - 11905: 0x8E43,
-	23973 - 11905: 0x8E44,
-	23974 - 11905: 0x8E45,
-	23975 - 11905: 0x8E46,
-	23976 - 11905: 0x8E47,
-	23977 - 11905: 0x8E48,
-	23978 - 11905: 0x8E49,
-	23979 - 11905: 0x8E4A,
-	23980 - 11905: 0x8E4B,
-	23981 - 11905: 0x8E4C,
-	23982 - 11905: 0x8E4D,
-	23983 - 11905: 0x8E4E,
-	23984 - 11905: 0x8E4F,
-	23985 - 11905: 0x8E50,
-	23986 - 11905: 0x8E51,
-	23987 - 11905: 0x8E52,
-	23988 - 11905: 0x8E53,
-	23989 - 11905: 0x8E54,
-	23990 - 11905: 0x8E55,
-	23991 - 11905: 0xE1DA,
-	23992 - 11905: 0x8E56,
-	23993 - 11905: 0x8E57,
-	23994 - 11905: 0x8E58,
-	23995 - 11905: 0x8E59,
-	23996 - 11905: 0x8E5A,
-	23997 - 11905: 0x8E5B,
-	23998 - 11905: 0x8E5C,
-	23999 - 11905: 0x8E5D,
-	24000 - 11905: 0x8E5E,
-	24001 - 11905: 0x8E5F,
-	24002 - 11905: 0x8E60,
-	24003 - 11905: 0x8E61,
-	24004 - 11905: 0x8E62,
-	24005 - 11905: 0xE1DB,
-	24006 - 11905: 0x8E63,
-	24007 - 11905: 0x8E64,
-	24008 - 11905: 0x8E65,
-	24009 - 11905: 0x8E66,
-	24010 - 11905: 0x8E67,
-	24011 - 11905: 0x8E68,
-	24012 - 11905: 0x8E69,
-	24013 - 11905: 0xCEA1,
-	24014 - 11905: 0x8E6A,
-	24015 - 11905: 0x8E6B,
-	24016 - 11905: 0x8E6C,
-	24017 - 11905: 0x8E6D,
-	24018 - 11905: 0x8E6E,
-	24019 - 11905: 0x8E6F,
-	24020 - 11905: 0x8E70,
-	24021 - 11905: 0x8E71,
-	24022 - 11905: 0x8E72,
-	24023 - 11905: 0x8E73,
-	24024 - 11905: 0x8E74,
-	24025 - 11905: 0x8E75,
-	24026 - 11905: 0x8E76,
-	24027 - 11905: 0xE7DD,
-	24028 - 11905: 0x8E77,
-	24029 - 11905: 0xB4A8,
-	24030 - 11905: 0xD6DD,
-	24031 - 11905: 0x8E78,
-	24032 - 11905: 0x8E79,
-	24033 - 11905: 0xD1B2,
-	24034 - 11905: 0xB3B2,
-	24035 - 11905: 0x8E7A,
-	24036 - 11905: 0x8E7B,
-	24037 - 11905: 0xB9A4,
-	24038 - 11905: 0xD7F3,
-	24039 - 11905: 0xC7C9,
-	24040 - 11905: 0xBEDE,
-	24041 - 11905: 0xB9AE,
-	24042 - 11905: 0x8E7C,
-	24043 - 11905: 0xCED7,
-	24044 - 11905: 0x8E7D,
-	24045 - 11905: 0x8E7E,
-	24046 - 11905: 0xB2EE,
-	24047 - 11905: 0xDBCF,
-	24048 - 11905: 0x8E80,
-	24049 - 11905: 0xBCBA,
-	24050 - 11905: 0xD2D1,
-	24051 - 11905: 0xCBC8,
-	24052 - 11905: 0xB0CD,
-	24053 - 11905: 0x8E81,
-	24054 - 11905: 0x8E82,
-	24055 - 11905: 0xCFEF,
-	24056 - 11905: 0x8E83,
-	24057 - 11905: 0x8E84,
-	24058 - 11905: 0x8E85,
-	24059 - 11905: 0x8E86,
-	24060 - 11905: 0x8E87,
-	24061 - 11905: 0xD9E3,
-	24062 - 11905: 0xBDED,
-	24063 - 11905: 0x8E88,
-	24064 - 11905: 0x8E89,
-	24065 - 11905: 0xB1D2,
-	24066 - 11905: 0xCAD0,
-	24067 - 11905: 0xB2BC,
-	24068 - 11905: 0x8E8A,
-	24069 - 11905: 0xCBA7,
-	24070 - 11905: 0xB7AB,
-	24071 - 11905: 0x8E8B,
-	24072 - 11905: 0xCAA6,
-	24073 - 11905: 0x8E8C,
-	24074 - 11905: 0x8E8D,
-	24075 - 11905: 0x8E8E,
-	24076 - 11905: 0xCFA3,
-	24077 - 11905: 0x8E8F,
-	24078 - 11905: 0x8E90,
-	24079 - 11905: 0xE0F8,
-	24080 - 11905: 0xD5CA,
-	24081 - 11905: 0xE0FB,
-	24082 - 11905: 0x8E91,
-	24083 - 11905: 0x8E92,
-	24084 - 11905: 0xE0FA,
-	24085 - 11905: 0xC5C1,
-	24086 - 11905: 0xCCFB,
-	24087 - 11905: 0x8E93,
-	24088 - 11905: 0xC1B1,
-	24089 - 11905: 0xE0F9,
-	24090 - 11905: 0xD6E3,
-	24091 - 11905: 0xB2AF,
-	24092 - 11905: 0xD6C4,
-	24093 - 11905: 0xB5DB,
-	24094 - 11905: 0x8E94,
-	24095 - 11905: 0x8E95,
-	24096 - 11905: 0x8E96,
-	24097 - 11905: 0x8E97,
-	24098 - 11905: 0x8E98,
-	24099 - 11905: 0x8E99,
-	24100 - 11905: 0x8E9A,
-	24101 - 11905: 0x8E9B,
-	24102 - 11905: 0xB4F8,
-	24103 - 11905: 0xD6A1,
-	24104 - 11905: 0x8E9C,
-	24105 - 11905: 0x8E9D,
-	24106 - 11905: 0x8E9E,
-	24107 - 11905: 0x8E9F,
-	24108 - 11905: 0x8EA0,
-	24109 - 11905: 0xCFAF,
-	24110 - 11905: 0xB0EF,
-	24111 - 11905: 0x8EA1,
-	24112 - 11905: 0x8EA2,
-	24113 - 11905: 0xE0FC,
-	24114 - 11905: 0x8EA3,
-	24115 - 11905: 0x8EA4,
-	24116 - 11905: 0x8EA5,
-	24117 - 11905: 0x8EA6,
-	24118 - 11905: 0x8EA7,
-	24119 - 11905: 0xE1A1,
-	24120 - 11905: 0xB3A3,
-	24121 - 11905: 0x8EA8,
-	24122 - 11905: 0x8EA9,
-	24123 - 11905: 0xE0FD,
-	24124 - 11905: 0xE0FE,
-	24125 - 11905: 0xC3B1,
-	24126 - 11905: 0x8EAA,
-	24127 - 11905: 0x8EAB,
-	24128 - 11905: 0x8EAC,
-	24129 - 11905: 0x8EAD,
-	24130 - 11905: 0xC3DD,
-	24131 - 11905: 0x8EAE,
-	24132 - 11905: 0xE1A2,
-	24133 - 11905: 0xB7F9,
-	24134 - 11905: 0x8EAF,
-	24135 - 11905: 0x8EB0,
-	24136 - 11905: 0x8EB1,
-	24137 - 11905: 0x8EB2,
-	24138 - 11905: 0x8EB3,
-	24139 - 11905: 0x8EB4,
-	24140 - 11905: 0xBBCF,
-	24141 - 11905: 0x8EB5,
-	24142 - 11905: 0x8EB6,
-	24143 - 11905: 0x8EB7,
-	24144 - 11905: 0x8EB8,
-	24145 - 11905: 0x8EB9,
-	24146 - 11905: 0x8EBA,
-	24147 - 11905: 0x8EBB,
-	24148 - 11905: 0xE1A3,
-	24149 - 11905: 0xC4BB,
-	24150 - 11905: 0x8EBC,
-	24151 - 11905: 0x8EBD,
-	24152 - 11905: 0x8EBE,
-	24153 - 11905: 0x8EBF,
-	24154 - 11905: 0x8EC0,
-	24155 - 11905: 0xE1A4,
-	24156 - 11905: 0x8EC1,
-	24157 - 11905: 0x8EC2,
-	24158 - 11905: 0xE1A5,
-	24159 - 11905: 0x8EC3,
-	24160 - 11905: 0x8EC4,
-	24161 - 11905: 0xE1A6,
-	24162 - 11905: 0xB4B1,
-	24163 - 11905: 0x8EC5,
-	24164 - 11905: 0x8EC6,
-	24165 - 11905: 0x8EC7,
-	24166 - 11905: 0x8EC8,
-	24167 - 11905: 0x8EC9,
-	24168 - 11905: 0x8ECA,
-	24169 - 11905: 0x8ECB,
-	24170 - 11905: 0x8ECC,
-	24171 - 11905: 0x8ECD,
-	24172 - 11905: 0x8ECE,
-	24173 - 11905: 0x8ECF,
-	24174 - 11905: 0x8ED0,
-	24175 - 11905: 0x8ED1,
-	24176 - 11905: 0x8ED2,
-	24177 - 11905: 0x8ED3,
-	24178 - 11905: 0xB8C9,
-	24179 - 11905: 0xC6BD,
-	24180 - 11905: 0xC4EA,
-	24181 - 11905: 0x8ED4,
-	24182 - 11905: 0xB2A2,
-	24183 - 11905: 0x8ED5,
-	24184 - 11905: 0xD0D2,
-	24185 - 11905: 0x8ED6,
-	24186 - 11905: 0xE7DB,
-	24187 - 11905: 0xBBC3,
-	24188 - 11905: 0xD3D7,
-	24189 - 11905: 0xD3C4,
-	24190 - 11905: 0x8ED7,
-	24191 - 11905: 0xB9E3,
-	24192 - 11905: 0xE2CF,
-	24193 - 11905: 0x8ED8,
-	24194 - 11905: 0x8ED9,
-	24195 - 11905: 0x8EDA,
-	24196 - 11905: 0xD7AF,
-	24197 - 11905: 0x8EDB,
-	24198 - 11905: 0xC7EC,
-	24199 - 11905: 0xB1D3,
-	24200 - 11905: 0x8EDC,
-	24201 - 11905: 0x8EDD,
-	24202 - 11905: 0xB4B2,
-	24203 - 11905: 0xE2D1,
-	24204 - 11905: 0x8EDE,
-	24205 - 11905: 0x8EDF,
-	24206 - 11905: 0x8EE0,
-	24207 - 11905: 0xD0F2,
-	24208 - 11905: 0xC2AE,
-	24209 - 11905: 0xE2D0,
-	24210 - 11905: 0x8EE1,
-	24211 - 11905: 0xBFE2,
-	24212 - 11905: 0xD3A6,
-	24213 - 11905: 0xB5D7,
-	24214 - 11905: 0xE2D2,
-	24215 - 11905: 0xB5EA,
-	24216 - 11905: 0x8EE2,
-	24217 - 11905: 0xC3ED,
-	24218 - 11905: 0xB8FD,
-	24219 - 11905: 0x8EE3,
-	24220 - 11905: 0xB8AE,
-	24221 - 11905: 0x8EE4,
-	24222 - 11905: 0xC5D3,
-	24223 - 11905: 0xB7CF,
-	24224 - 11905: 0xE2D4,
-	24225 - 11905: 0x8EE5,
-	24226 - 11905: 0x8EE6,
-	24227 - 11905: 0x8EE7,
-	24228 - 11905: 0x8EE8,
-	24229 - 11905: 0xE2D3,
-	24230 - 11905: 0xB6C8,
-	24231 - 11905: 0xD7F9,
-	24232 - 11905: 0x8EE9,
-	24233 - 11905: 0x8EEA,
-	24234 - 11905: 0x8EEB,
-	24235 - 11905: 0x8EEC,
-	24236 - 11905: 0x8EED,
-	24237 - 11905: 0xCDA5,
-	24238 - 11905: 0x8EEE,
-	24239 - 11905: 0x8EEF,
-	24240 - 11905: 0x8EF0,
-	24241 - 11905: 0x8EF1,
-	24242 - 11905: 0x8EF2,
-	24243 - 11905: 0xE2D8,
-	24244 - 11905: 0x8EF3,
-	24245 - 11905: 0xE2D6,
-	24246 - 11905: 0xCAFC,
-	24247 - 11905: 0xBFB5,
-	24248 - 11905: 0xD3B9,
-	24249 - 11905: 0xE2D5,
-	24250 - 11905: 0x8EF4,
-	24251 - 11905: 0x8EF5,
-	24252 - 11905: 0x8EF6,
-	24253 - 11905: 0x8EF7,
-	24254 - 11905: 0xE2D7,
-	24255 - 11905: 0x8EF8,
-	24256 - 11905: 0x8EF9,
-	24257 - 11905: 0x8EFA,
-	24258 - 11905: 0x8EFB,
-	24259 - 11905: 0x8EFC,
-	24260 - 11905: 0x8EFD,
-	24261 - 11905: 0x8EFE,
-	24262 - 11905: 0x8F40,
-	24263 - 11905: 0x8F41,
-	24264 - 11905: 0x8F42,
-	24265 - 11905: 0xC1AE,
-	24266 - 11905: 0xC0C8,
-	24267 - 11905: 0x8F43,
-	24268 - 11905: 0x8F44,
-	24269 - 11905: 0x8F45,
-	24270 - 11905: 0x8F46,
-	24271 - 11905: 0x8F47,
-	24272 - 11905: 0x8F48,
-	24273 - 11905: 0xE2DB,
-	24274 - 11905: 0xE2DA,
-	24275 - 11905: 0xC0AA,
-	24276 - 11905: 0x8F49,
-	24277 - 11905: 0x8F4A,
-	24278 - 11905: 0xC1CE,
-	24279 - 11905: 0x8F4B,
-	24280 - 11905: 0x8F4C,
-	24281 - 11905: 0x8F4D,
-	24282 - 11905: 0x8F4E,
-	24283 - 11905: 0xE2DC,
-	24284 - 11905: 0x8F4F,
-	24285 - 11905: 0x8F50,
-	24286 - 11905: 0x8F51,
-	24287 - 11905: 0x8F52,
-	24288 - 11905: 0x8F53,
-	24289 - 11905: 0x8F54,
-	24290 - 11905: 0x8F55,
-	24291 - 11905: 0x8F56,
-	24292 - 11905: 0x8F57,
-	24293 - 11905: 0x8F58,
-	24294 - 11905: 0x8F59,
-	24295 - 11905: 0x8F5A,
-	24296 - 11905: 0xE2DD,
-	24297 - 11905: 0x8F5B,
-	24298 - 11905: 0xE2DE,
-	24299 - 11905: 0x8F5C,
-	24300 - 11905: 0x8F5D,
-	24301 - 11905: 0x8F5E,
-	24302 - 11905: 0x8F5F,
-	24303 - 11905: 0x8F60,
-	24304 - 11905: 0x8F61,
-	24305 - 11905: 0x8F62,
-	24306 - 11905: 0x8F63,
-	24307 - 11905: 0x8F64,
-	24308 - 11905: 0xDBC8,
-	24309 - 11905: 0x8F65,
-	24310 - 11905: 0xD1D3,
-	24311 - 11905: 0xCDA2,
-	24312 - 11905: 0x8F66,
-	24313 - 11905: 0x8F67,
-	24314 - 11905: 0xBDA8,
-	24315 - 11905: 0x8F68,
-	24316 - 11905: 0x8F69,
-	24317 - 11905: 0x8F6A,
-	24318 - 11905: 0xDEC3,
-	24319 - 11905: 0xD8A5,
-	24320 - 11905: 0xBFAA,
-	24321 - 11905: 0xDBCD,
-	24322 - 11905: 0xD2EC,
-	24323 - 11905: 0xC6FA,
-	24324 - 11905: 0xC5AA,
-	24325 - 11905: 0x8F6B,
-	24326 - 11905: 0x8F6C,
-	24327 - 11905: 0x8F6D,
-	24328 - 11905: 0xDEC4,
-	24329 - 11905: 0x8F6E,
-	24330 - 11905: 0xB1D7,
-	24331 - 11905: 0xDFAE,
-	24332 - 11905: 0x8F6F,
-	24333 - 11905: 0x8F70,
-	24334 - 11905: 0x8F71,
-	24335 - 11905: 0xCABD,
-	24336 - 11905: 0x8F72,
-	24337 - 11905: 0xDFB1,
-	24338 - 11905: 0x8F73,
-	24339 - 11905: 0xB9AD,
-	24340 - 11905: 0x8F74,
-	24341 - 11905: 0xD2FD,
-	24342 - 11905: 0x8F75,
-	24343 - 11905: 0xB8A5,
-	24344 - 11905: 0xBAEB,
-	24345 - 11905: 0x8F76,
-	24346 - 11905: 0x8F77,
-	24347 - 11905: 0xB3DA,
-	24348 - 11905: 0x8F78,
-	24349 - 11905: 0x8F79,
-	24350 - 11905: 0x8F7A,
-	24351 - 11905: 0xB5DC,
-	24352 - 11905: 0xD5C5,
-	24353 - 11905: 0x8F7B,
-	24354 - 11905: 0x8F7C,
-	24355 - 11905: 0x8F7D,
-	24356 - 11905: 0x8F7E,
-	24357 - 11905: 0xC3D6,
-	24358 - 11905: 0xCFD2,
-	24359 - 11905: 0xBBA1,
-	24360 - 11905: 0x8F80,
-	24361 - 11905: 0xE5F3,
-	24362 - 11905: 0xE5F2,
-	24363 - 11905: 0x8F81,
-	24364 - 11905: 0x8F82,
-	24365 - 11905: 0xE5F4,
-	24366 - 11905: 0x8F83,
-	24367 - 11905: 0xCDE4,
-	24368 - 11905: 0x8F84,
-	24369 - 11905: 0xC8F5,
-	24370 - 11905: 0x8F85,
-	24371 - 11905: 0x8F86,
-	24372 - 11905: 0x8F87,
-	24373 - 11905: 0x8F88,
-	24374 - 11905: 0x8F89,
-	24375 - 11905: 0x8F8A,
-	24376 - 11905: 0x8F8B,
-	24377 - 11905: 0xB5AF,
-	24378 - 11905: 0xC7BF,
-	24379 - 11905: 0x8F8C,
-	24380 - 11905: 0xE5F6,
-	24381 - 11905: 0x8F8D,
-	24382 - 11905: 0x8F8E,
-	24383 - 11905: 0x8F8F,
-	24384 - 11905: 0xECB0,
-	24385 - 11905: 0x8F90,
-	24386 - 11905: 0x8F91,
-	24387 - 11905: 0x8F92,
-	24388 - 11905: 0x8F93,
-	24389 - 11905: 0x8F94,
-	24390 - 11905: 0x8F95,
-	24391 - 11905: 0x8F96,
-	24392 - 11905: 0x8F97,
-	24393 - 11905: 0x8F98,
-	24394 - 11905: 0x8F99,
-	24395 - 11905: 0x8F9A,
-	24396 - 11905: 0x8F9B,
-	24397 - 11905: 0x8F9C,
-	24398 - 11905: 0x8F9D,
-	24399 - 11905: 0x8F9E,
-	24400 - 11905: 0xE5E6,
-	24401 - 11905: 0x8F9F,
-	24402 - 11905: 0xB9E9,
-	24403 - 11905: 0xB5B1,
-	24404 - 11905: 0x8FA0,
-	24405 - 11905: 0xC2BC,
-	24406 - 11905: 0xE5E8,
-	24407 - 11905: 0xE5E7,
-	24408 - 11905: 0xE5E9,
-	24409 - 11905: 0x8FA1,
-	24410 - 11905: 0x8FA2,
-	24411 - 11905: 0x8FA3,
-	24412 - 11905: 0x8FA4,
-	24413 - 11905: 0xD2CD,
-	24414 - 11905: 0x8FA5,
-	24415 - 11905: 0x8FA6,
-	24416 - 11905: 0x8FA7,
-	24417 - 11905: 0xE1EA,
-	24418 - 11905: 0xD0CE,
-	24419 - 11905: 0x8FA8,
-	24420 - 11905: 0xCDAE,
-	24421 - 11905: 0x8FA9,
-	24422 - 11905: 0xD1E5,
-	24423 - 11905: 0x8FAA,
-	24424 - 11905: 0x8FAB,
-	24425 - 11905: 0xB2CA,
-	24426 - 11905: 0xB1EB,
-	24427 - 11905: 0x8FAC,
-	24428 - 11905: 0xB1F2,
-	24429 - 11905: 0xC5ED,
-	24430 - 11905: 0x8FAD,
-	24431 - 11905: 0x8FAE,
-	24432 - 11905: 0xD5C3,
-	24433 - 11905: 0xD3B0,
-	24434 - 11905: 0x8FAF,
-	24435 - 11905: 0xE1DC,
-	24436 - 11905: 0x8FB0,
-	24437 - 11905: 0x8FB1,
-	24438 - 11905: 0x8FB2,
-	24439 - 11905: 0xE1DD,
-	24440 - 11905: 0x8FB3,
-	24441 - 11905: 0xD2DB,
-	24442 - 11905: 0x8FB4,
-	24443 - 11905: 0xB3B9,
-	24444 - 11905: 0xB1CB,
-	24445 - 11905: 0x8FB5,
-	24446 - 11905: 0x8FB6,
-	24447 - 11905: 0x8FB7,
-	24448 - 11905: 0xCDF9,
-	24449 - 11905: 0xD5F7,
-	24450 - 11905: 0xE1DE,
-	24451 - 11905: 0x8FB8,
-	24452 - 11905: 0xBEB6,
-	24453 - 11905: 0xB4FD,
-	24454 - 11905: 0x8FB9,
-	24455 - 11905: 0xE1DF,
-	24456 - 11905: 0xBADC,
-	24457 - 11905: 0xE1E0,
-	24458 - 11905: 0xBBB2,
-	24459 - 11905: 0xC2C9,
-	24460 - 11905: 0xE1E1,
-	24461 - 11905: 0x8FBA,
-	24462 - 11905: 0x8FBB,
-	24463 - 11905: 0x8FBC,
-	24464 - 11905: 0xD0EC,
-	24465 - 11905: 0x8FBD,
-	24466 - 11905: 0xCDBD,
-	24467 - 11905: 0x8FBE,
-	24468 - 11905: 0x8FBF,
-	24469 - 11905: 0xE1E2,
-	24470 - 11905: 0x8FC0,
-	24471 - 11905: 0xB5C3,
-	24472 - 11905: 0xC5C7,
-	24473 - 11905: 0xE1E3,
-	24474 - 11905: 0x8FC1,
-	24475 - 11905: 0x8FC2,
-	24476 - 11905: 0xE1E4,
-	24477 - 11905: 0x8FC3,
-	24478 - 11905: 0x8FC4,
-	24479 - 11905: 0x8FC5,
-	24480 - 11905: 0x8FC6,
-	24481 - 11905: 0xD3F9,
-	24482 - 11905: 0x8FC7,
-	24483 - 11905: 0x8FC8,
-	24484 - 11905: 0x8FC9,
-	24485 - 11905: 0x8FCA,
-	24486 - 11905: 0x8FCB,
-	24487 - 11905: 0x8FCC,
-	24488 - 11905: 0xE1E5,
-	24489 - 11905: 0x8FCD,
-	24490 - 11905: 0xD1AD,
-	24491 - 11905: 0x8FCE,
-	24492 - 11905: 0x8FCF,
-	24493 - 11905: 0xE1E6,
-	24494 - 11905: 0xCEA2,
-	24495 - 11905: 0x8FD0,
-	24496 - 11905: 0x8FD1,
-	24497 - 11905: 0x8FD2,
-	24498 - 11905: 0x8FD3,
-	24499 - 11905: 0x8FD4,
-	24500 - 11905: 0x8FD5,
-	24501 - 11905: 0xE1E7,
-	24502 - 11905: 0x8FD6,
-	24503 - 11905: 0xB5C2,
-	24504 - 11905: 0x8FD7,
-	24505 - 11905: 0x8FD8,
-	24506 - 11905: 0x8FD9,
-	24507 - 11905: 0x8FDA,
-	24508 - 11905: 0xE1E8,
-	24509 - 11905: 0xBBD5,
-	24510 - 11905: 0x8FDB,
-	24511 - 11905: 0x8FDC,
-	24512 - 11905: 0x8FDD,
-	24513 - 11905: 0x8FDE,
-	24514 - 11905: 0x8FDF,
-	24515 - 11905: 0xD0C4,
-	24516 - 11905: 0xE2E0,
-	24517 - 11905: 0xB1D8,
-	24518 - 11905: 0xD2E4,
-	24519 - 11905: 0x8FE0,
-	24520 - 11905: 0x8FE1,
-	24521 - 11905: 0xE2E1,
-	24522 - 11905: 0x8FE2,
-	24523 - 11905: 0x8FE3,
-	24524 - 11905: 0xBCC9,
-	24525 - 11905: 0xC8CC,
-	24526 - 11905: 0x8FE4,
-	24527 - 11905: 0xE2E3,
-	24528 - 11905: 0xECFE,
-	24529 - 11905: 0xECFD,
-	24530 - 11905: 0xDFAF,
-	24531 - 11905: 0x8FE5,
-	24532 - 11905: 0x8FE6,
-	24533 - 11905: 0x8FE7,
-	24534 - 11905: 0xE2E2,
-	24535 - 11905: 0xD6BE,
-	24536 - 11905: 0xCDFC,
-	24537 - 11905: 0xC3A6,
-	24538 - 11905: 0x8FE8,
-	24539 - 11905: 0x8FE9,
-	24540 - 11905: 0x8FEA,
-	24541 - 11905: 0xE3C3,
-	24542 - 11905: 0x8FEB,
-	24543 - 11905: 0x8FEC,
-	24544 - 11905: 0xD6D2,
-	24545 - 11905: 0xE2E7,
-	24546 - 11905: 0x8FED,
-	24547 - 11905: 0x8FEE,
-	24548 - 11905: 0xE2E8,
-	24549 - 11905: 0x8FEF,
-	24550 - 11905: 0x8FF0,
-	24551 - 11905: 0xD3C7,
-	24552 - 11905: 0x8FF1,
-	24553 - 11905: 0x8FF2,
-	24554 - 11905: 0xE2EC,
-	24555 - 11905: 0xBFEC,
-	24556 - 11905: 0x8FF3,
-	24557 - 11905: 0xE2ED,
-	24558 - 11905: 0xE2E5,
-	24559 - 11905: 0x8FF4,
-	24560 - 11905: 0x8FF5,
-	24561 - 11905: 0xB3C0,
-	24562 - 11905: 0x8FF6,
-	24563 - 11905: 0x8FF7,
-	24564 - 11905: 0x8FF8,
-	24565 - 11905: 0xC4EE,
-	24566 - 11905: 0x8FF9,
-	24567 - 11905: 0x8FFA,
-	24568 - 11905: 0xE2EE,
-	24569 - 11905: 0x8FFB,
-	24570 - 11905: 0x8FFC,
-	24571 - 11905: 0xD0C3,
-	24572 - 11905: 0x8FFD,
-	24573 - 11905: 0xBAF6,
-	24574 - 11905: 0xE2E9,
-	24575 - 11905: 0xB7DE,
-	24576 - 11905: 0xBBB3,
-	24577 - 11905: 0xCCAC,
-	24578 - 11905: 0xCBCB,
-	24579 - 11905: 0xE2E4,
-	24580 - 11905: 0xE2E6,
-	24581 - 11905: 0xE2EA,
-	24582 - 11905: 0xE2EB,
-	24583 - 11905: 0x8FFE,
-	24584 - 11905: 0x9040,
-	24585 - 11905: 0x9041,
-	24586 - 11905: 0xE2F7,
-	24587 - 11905: 0x9042,
-	24588 - 11905: 0x9043,
-	24589 - 11905: 0xE2F4,
-	24590 - 11905: 0xD4F5,
-	24591 - 11905: 0xE2F3,
-	24592 - 11905: 0x9044,
-	24593 - 11905: 0x9045,
-	24594 - 11905: 0xC5AD,
-	24595 - 11905: 0x9046,
-	24596 - 11905: 0xD5FA,
-	24597 - 11905: 0xC5C2,
-	24598 - 11905: 0xB2C0,
-	24599 - 11905: 0x9047,
-	24600 - 11905: 0x9048,
-	24601 - 11905: 0xE2EF,
-	24602 - 11905: 0x9049,
-	24603 - 11905: 0xE2F2,
-	24604 - 11905: 0xC1AF,
-	24605 - 11905: 0xCBBC,
-	24606 - 11905: 0x904A,
-	24607 - 11905: 0x904B,
-	24608 - 11905: 0xB5A1,
-	24609 - 11905: 0xE2F9,
-	24610 - 11905: 0x904C,
-	24611 - 11905: 0x904D,
-	24612 - 11905: 0x904E,
-	24613 - 11905: 0xBCB1,
-	24614 - 11905: 0xE2F1,
-	24615 - 11905: 0xD0D4,
-	24616 - 11905: 0xD4B9,
-	24617 - 11905: 0xE2F5,
-	24618 - 11905: 0xB9D6,
-	24619 - 11905: 0xE2F6,
-	24620 - 11905: 0x904F,
-	24621 - 11905: 0x9050,
-	24622 - 11905: 0x9051,
-	24623 - 11905: 0xC7D3,
-	24624 - 11905: 0x9052,
-	24625 - 11905: 0x9053,
-	24626 - 11905: 0x9054,
-	24627 - 11905: 0x9055,
-	24628 - 11905: 0x9056,
-	24629 - 11905: 0xE2F0,
-	24630 - 11905: 0x9057,
-	24631 - 11905: 0x9058,
-	24632 - 11905: 0x9059,
-	24633 - 11905: 0x905A,
-	24634 - 11905: 0x905B,
-	24635 - 11905: 0xD7DC,
-	24636 - 11905: 0xEDA1,
-	24637 - 11905: 0x905C,
-	24638 - 11905: 0x905D,
-	24639 - 11905: 0xE2F8,
-	24640 - 11905: 0x905E,
-	24641 - 11905: 0xEDA5,
-	24642 - 11905: 0xE2FE,
-	24643 - 11905: 0xCAD1,
-	24644 - 11905: 0x905F,
-	24645 - 11905: 0x9060,
-	24646 - 11905: 0x9061,
-	24647 - 11905: 0x9062,
-	24648 - 11905: 0x9063,
-	24649 - 11905: 0x9064,
-	24650 - 11905: 0x9065,
-	24651 - 11905: 0xC1B5,
-	24652 - 11905: 0x9066,
-	24653 - 11905: 0xBBD0,
-	24654 - 11905: 0x9067,
-	24655 - 11905: 0x9068,
-	24656 - 11905: 0xBFD6,
-	24657 - 11905: 0x9069,
-	24658 - 11905: 0xBAE3,
-	24659 - 11905: 0x906A,
-	24660 - 11905: 0x906B,
-	24661 - 11905: 0xCBA1,
-	24662 - 11905: 0x906C,
-	24663 - 11905: 0x906D,
-	24664 - 11905: 0x906E,
-	24665 - 11905: 0xEDA6,
-	24666 - 11905: 0xEDA3,
-	24667 - 11905: 0x906F,
-	24668 - 11905: 0x9070,
-	24669 - 11905: 0xEDA2,
-	24670 - 11905: 0x9071,
-	24671 - 11905: 0x9072,
-	24672 - 11905: 0x9073,
-	24673 - 11905: 0x9074,
-	24674 - 11905: 0xBBD6,
-	24675 - 11905: 0xEDA7,
-	24676 - 11905: 0xD0F4,
-	24677 - 11905: 0x9075,
-	24678 - 11905: 0x9076,
-	24679 - 11905: 0xEDA4,
-	24680 - 11905: 0xBADE,
-	24681 - 11905: 0xB6F7,
-	24682 - 11905: 0xE3A1,
-	24683 - 11905: 0xB6B2,
-	24684 - 11905: 0xCCF1,
-	24685 - 11905: 0xB9A7,
-	24686 - 11905: 0x9077,
-	24687 - 11905: 0xCFA2,
-	24688 - 11905: 0xC7A1,
-	24689 - 11905: 0x9078,
-	24690 - 11905: 0x9079,
-	24691 - 11905: 0xBFD2,
-	24692 - 11905: 0x907A,
-	24693 - 11905: 0x907B,
-	24694 - 11905: 0xB6F1,
-	24695 - 11905: 0x907C,
-	24696 - 11905: 0xE2FA,
-	24697 - 11905: 0xE2FB,
-	24698 - 11905: 0xE2FD,
-	24699 - 11905: 0xE2FC,
-	24700 - 11905: 0xC4D5,
-	24701 - 11905: 0xE3A2,
-	24702 - 11905: 0x907D,
-	24703 - 11905: 0xD3C1,
-	24704 - 11905: 0x907E,
-	24705 - 11905: 0x9080,
-	24706 - 11905: 0x9081,
-	24707 - 11905: 0xE3A7,
-	24708 - 11905: 0xC7C4,
-	24709 - 11905: 0x9082,
-	24710 - 11905: 0x9083,
-	24711 - 11905: 0x9084,
-	24712 - 11905: 0x9085,
-	24713 - 11905: 0xCFA4,
-	24714 - 11905: 0x9086,
-	24715 - 11905: 0x9087,
-	24716 - 11905: 0xE3A9,
-	24717 - 11905: 0xBAB7,
-	24718 - 11905: 0x9088,
-	24719 - 11905: 0x9089,
-	24720 - 11905: 0x908A,
-	24721 - 11905: 0x908B,
-	24722 - 11905: 0xE3A8,
-	24723 - 11905: 0x908C,
-	24724 - 11905: 0xBBDA,
-	24725 - 11905: 0x908D,
-	24726 - 11905: 0xE3A3,
-	24727 - 11905: 0x908E,
-	24728 - 11905: 0x908F,
-	24729 - 11905: 0x9090,
-	24730 - 11905: 0xE3A4,
-	24731 - 11905: 0xE3AA,
-	24732 - 11905: 0x9091,
-	24733 - 11905: 0xE3A6,
-	24734 - 11905: 0x9092,
-	24735 - 11905: 0xCEF2,
-	24736 - 11905: 0xD3C6,
-	24737 - 11905: 0x9093,
-	24738 - 11905: 0x9094,
-	24739 - 11905: 0xBBBC,
-	24740 - 11905: 0x9095,
-	24741 - 11905: 0x9096,
-	24742 - 11905: 0xD4C3,
-	24743 - 11905: 0x9097,
-	24744 - 11905: 0xC4FA,
-	24745 - 11905: 0x9098,
-	24746 - 11905: 0x9099,
-	24747 - 11905: 0xEDA8,
-	24748 - 11905: 0xD0FC,
-	24749 - 11905: 0xE3A5,
-	24750 - 11905: 0x909A,
-	24751 - 11905: 0xC3F5,
-	24752 - 11905: 0x909B,
-	24753 - 11905: 0xE3AD,
-	24754 - 11905: 0xB1AF,
-	24755 - 11905: 0x909C,
-	24756 - 11905: 0xE3B2,
-	24757 - 11905: 0x909D,
-	24758 - 11905: 0x909E,
-	24759 - 11905: 0x909F,
-	24760 - 11905: 0xBCC2,
-	24761 - 11905: 0x90A0,
-	24762 - 11905: 0x90A1,
-	24763 - 11905: 0xE3AC,
-	24764 - 11905: 0xB5BF,
-	24765 - 11905: 0x90A2,
-	24766 - 11905: 0x90A3,
-	24767 - 11905: 0x90A4,
-	24768 - 11905: 0x90A5,
-	24769 - 11905: 0x90A6,
-	24770 - 11905: 0x90A7,
-	24771 - 11905: 0x90A8,
-	24772 - 11905: 0x90A9,
-	24773 - 11905: 0xC7E9,
-	24774 - 11905: 0xE3B0,
-	24775 - 11905: 0x90AA,
-	24776 - 11905: 0x90AB,
-	24777 - 11905: 0x90AC,
-	24778 - 11905: 0xBEAA,
-	24779 - 11905: 0xCDEF,
-	24780 - 11905: 0x90AD,
-	24781 - 11905: 0x90AE,
-	24782 - 11905: 0x90AF,
-	24783 - 11905: 0x90B0,
-	24784 - 11905: 0x90B1,
-	24785 - 11905: 0xBBF3,
-	24786 - 11905: 0x90B2,
-	24787 - 11905: 0x90B3,
-	24788 - 11905: 0x90B4,
-	24789 - 11905: 0xCCE8,
-	24790 - 11905: 0x90B5,
-	24791 - 11905: 0x90B6,
-	24792 - 11905: 0xE3AF,
-	24793 - 11905: 0x90B7,
-	24794 - 11905: 0xE3B1,
-	24795 - 11905: 0x90B8,
-	24796 - 11905: 0xCFA7,
-	24797 - 11905: 0xE3AE,
-	24798 - 11905: 0x90B9,
-	24799 - 11905: 0xCEA9,
-	24800 - 11905: 0xBBDD,
-	24801 - 11905: 0x90BA,
-	24802 - 11905: 0x90BB,
-	24803 - 11905: 0x90BC,
-	24804 - 11905: 0x90BD,
-	24805 - 11905: 0x90BE,
-	24806 - 11905: 0xB5EB,
-	24807 - 11905: 0xBEE5,
-	24808 - 11905: 0xB2D2,
-	24809 - 11905: 0xB3CD,
-	24810 - 11905: 0x90BF,
-	24811 - 11905: 0xB1B9,
-	24812 - 11905: 0xE3AB,
-	24813 - 11905: 0xB2D1,
-	24814 - 11905: 0xB5AC,
-	24815 - 11905: 0xB9DF,
-	24816 - 11905: 0xB6E8,
-	24817 - 11905: 0x90C0,
-	24818 - 11905: 0x90C1,
-	24819 - 11905: 0xCFEB,
-	24820 - 11905: 0xE3B7,
-	24821 - 11905: 0x90C2,
-	24822 - 11905: 0xBBCC,
-	24823 - 11905: 0x90C3,
-	24824 - 11905: 0x90C4,
-	24825 - 11905: 0xC8C7,
-	24826 - 11905: 0xD0CA,
-	24827 - 11905: 0x90C5,
-	24828 - 11905: 0x90C6,
-	24829 - 11905: 0x90C7,
-	24830 - 11905: 0x90C8,
-	24831 - 11905: 0x90C9,
-	24832 - 11905: 0xE3B8,
-	24833 - 11905: 0xB3EE,
-	24834 - 11905: 0x90CA,
-	24835 - 11905: 0x90CB,
-	24836 - 11905: 0x90CC,
-	24837 - 11905: 0x90CD,
-	24838 - 11905: 0xEDA9,
-	24839 - 11905: 0x90CE,
-	24840 - 11905: 0xD3FA,
-	24841 - 11905: 0xD3E4,
-	24842 - 11905: 0x90CF,
-	24843 - 11905: 0x90D0,
-	24844 - 11905: 0x90D1,
-	24845 - 11905: 0xEDAA,
-	24846 - 11905: 0xE3B9,
-	24847 - 11905: 0xD2E2,
-	24848 - 11905: 0x90D2,
-	24849 - 11905: 0x90D3,
-	24850 - 11905: 0x90D4,
-	24851 - 11905: 0x90D5,
-	24852 - 11905: 0x90D6,
-	24853 - 11905: 0xE3B5,
-	24854 - 11905: 0x90D7,
-	24855 - 11905: 0x90D8,
-	24856 - 11905: 0x90D9,
-	24857 - 11905: 0x90DA,
-	24858 - 11905: 0xD3DE,
-	24859 - 11905: 0x90DB,
-	24860 - 11905: 0x90DC,
-	24861 - 11905: 0x90DD,
-	24862 - 11905: 0x90DE,
-	24863 - 11905: 0xB8D0,
-	24864 - 11905: 0xE3B3,
-	24865 - 11905: 0x90DF,
-	24866 - 11905: 0x90E0,
-	24867 - 11905: 0xE3B6,
-	24868 - 11905: 0xB7DF,
-	24869 - 11905: 0x90E1,
-	24870 - 11905: 0xE3B4,
-	24871 - 11905: 0xC0A2,
-	24872 - 11905: 0x90E2,
-	24873 - 11905: 0x90E3,
-	24874 - 11905: 0x90E4,
-	24875 - 11905: 0xE3BA,
-	24876 - 11905: 0x90E5,
-	24877 - 11905: 0x90E6,
-	24878 - 11905: 0x90E7,
-	24879 - 11905: 0x90E8,
-	24880 - 11905: 0x90E9,
-	24881 - 11905: 0x90EA,
-	24882 - 11905: 0x90EB,
-	24883 - 11905: 0x90EC,
-	24884 - 11905: 0x90ED,
-	24885 - 11905: 0x90EE,
-	24886 - 11905: 0x90EF,
-	24887 - 11905: 0x90F0,
-	24888 - 11905: 0x90F1,
-	24889 - 11905: 0x90F2,
-	24890 - 11905: 0x90F3,
-	24891 - 11905: 0x90F4,
-	24892 - 11905: 0x90F5,
-	24893 - 11905: 0x90F6,
-	24894 - 11905: 0x90F7,
-	24895 - 11905: 0xD4B8,
-	24896 - 11905: 0x90F8,
-	24897 - 11905: 0x90F9,
-	24898 - 11905: 0x90FA,
-	24899 - 11905: 0x90FB,
-	24900 - 11905: 0x90FC,
-	24901 - 11905: 0x90FD,
-	24902 - 11905: 0x90FE,
-	24903 - 11905: 0x9140,
-	24904 - 11905: 0xB4C8,
-	24905 - 11905: 0x9141,
-	24906 - 11905: 0xE3BB,
-	24907 - 11905: 0x9142,
-	24908 - 11905: 0xBBC5,
-	24909 - 11905: 0x9143,
-	24910 - 11905: 0xC9F7,
-	24911 - 11905: 0x9144,
-	24912 - 11905: 0x9145,
-	24913 - 11905: 0xC9E5,
-	24914 - 11905: 0x9146,
-	24915 - 11905: 0x9147,
-	24916 - 11905: 0x9148,
-	24917 - 11905: 0xC4BD,
-	24918 - 11905: 0x9149,
-	24919 - 11905: 0x914A,
-	24920 - 11905: 0x914B,
-	24921 - 11905: 0x914C,
-	24922 - 11905: 0x914D,
-	24923 - 11905: 0x914E,
-	24924 - 11905: 0x914F,
-	24925 - 11905: 0xEDAB,
-	24926 - 11905: 0x9150,
-	24927 - 11905: 0x9151,
-	24928 - 11905: 0x9152,
-	24929 - 11905: 0x9153,
-	24930 - 11905: 0xC2FD,
-	24931 - 11905: 0x9154,
-	24932 - 11905: 0x9155,
-	24933 - 11905: 0x9156,
-	24934 - 11905: 0x9157,
-	24935 - 11905: 0xBBDB,
-	24936 - 11905: 0xBFAE,
-	24937 - 11905: 0x9158,
-	24938 - 11905: 0x9159,
-	24939 - 11905: 0x915A,
-	24940 - 11905: 0x915B,
-	24941 - 11905: 0x915C,
-	24942 - 11905: 0x915D,
-	24943 - 11905: 0x915E,
-	24944 - 11905: 0xCEBF,
-	24945 - 11905: 0x915F,
-	24946 - 11905: 0x9160,
-	24947 - 11905: 0x9161,
-	24948 - 11905: 0x9162,
-	24949 - 11905: 0xE3BC,
-	24950 - 11905: 0x9163,
-	24951 - 11905: 0xBFB6,
-	24952 - 11905: 0x9164,
-	24953 - 11905: 0x9165,
-	24954 - 11905: 0x9166,
-	24955 - 11905: 0x9167,
-	24956 - 11905: 0x9168,
-	24957 - 11905: 0x9169,
-	24958 - 11905: 0x916A,
-	24959 - 11905: 0x916B,
-	24960 - 11905: 0x916C,
-	24961 - 11905: 0x916D,
-	24962 - 11905: 0x916E,
-	24963 - 11905: 0x916F,
-	24964 - 11905: 0x9170,
-	24965 - 11905: 0x9171,
-	24966 - 11905: 0x9172,
-	24967 - 11905: 0x9173,
-	24968 - 11905: 0x9174,
-	24969 - 11905: 0x9175,
-	24970 - 11905: 0x9176,
-	24971 - 11905: 0xB1EF,
-	24972 - 11905: 0x9177,
-	24973 - 11905: 0x9178,
-	24974 - 11905: 0xD4F7,
-	24975 - 11905: 0x9179,
-	24976 - 11905: 0x917A,
-	24977 - 11905: 0x917B,
-	24978 - 11905: 0x917C,
-	24979 - 11905: 0x917D,
-	24980 - 11905: 0xE3BE,
-	24981 - 11905: 0x917E,
-	24982 - 11905: 0x9180,
-	24983 - 11905: 0x9181,
-	24984 - 11905: 0x9182,
-	24985 - 11905: 0x9183,
-	24986 - 11905: 0x9184,
-	24987 - 11905: 0x9185,
-	24988 - 11905: 0x9186,
-	24989 - 11905: 0xEDAD,
-	24990 - 11905: 0x9187,
-	24991 - 11905: 0x9188,
-	24992 - 11905: 0x9189,
-	24993 - 11905: 0x918A,
-	24994 - 11905: 0x918B,
-	24995 - 11905: 0x918C,
-	24996 - 11905: 0x918D,
-	24997 - 11905: 0x918E,
-	24998 - 11905: 0x918F,
-	24999 - 11905: 0xE3BF,
-	25000 - 11905: 0xBAA9,
-	25001 - 11905: 0xEDAC,
-	25002 - 11905: 0x9190,
-	25003 - 11905: 0x9191,
-	25004 - 11905: 0xE3BD,
-	25005 - 11905: 0x9192,
-	25006 - 11905: 0x9193,
-	25007 - 11905: 0x9194,
-	25008 - 11905: 0x9195,
-	25009 - 11905: 0x9196,
-	25010 - 11905: 0x9197,
-	25011 - 11905: 0x9198,
-	25012 - 11905: 0x9199,
-	25013 - 11905: 0x919A,
-	25014 - 11905: 0x919B,
-	25015 - 11905: 0xE3C0,
-	25016 - 11905: 0x919C,
-	25017 - 11905: 0x919D,
-	25018 - 11905: 0x919E,
-	25019 - 11905: 0x919F,
-	25020 - 11905: 0x91A0,
-	25021 - 11905: 0x91A1,
-	25022 - 11905: 0xBAB6,
-	25023 - 11905: 0x91A2,
-	25024 - 11905: 0x91A3,
-	25025 - 11905: 0x91A4,
-	25026 - 11905: 0xB6AE,
-	25027 - 11905: 0x91A5,
-	25028 - 11905: 0x91A6,
-	25029 - 11905: 0x91A7,
-	25030 - 11905: 0x91A8,
-	25031 - 11905: 0x91A9,
-	25032 - 11905: 0xD0B8,
-	25033 - 11905: 0x91AA,
-	25034 - 11905: 0xB0C3,
-	25035 - 11905: 0xEDAE,
-	25036 - 11905: 0x91AB,
-	25037 - 11905: 0x91AC,
-	25038 - 11905: 0x91AD,
-	25039 - 11905: 0x91AE,
-	25040 - 11905: 0x91AF,
-	25041 - 11905: 0xEDAF,
-	25042 - 11905: 0xC0C1,
-	25043 - 11905: 0x91B0,
-	25044 - 11905: 0xE3C1,
-	25045 - 11905: 0x91B1,
-	25046 - 11905: 0x91B2,
-	25047 - 11905: 0x91B3,
-	25048 - 11905: 0x91B4,
-	25049 - 11905: 0x91B5,
-	25050 - 11905: 0x91B6,
-	25051 - 11905: 0x91B7,
-	25052 - 11905: 0x91B8,
-	25053 - 11905: 0x91B9,
-	25054 - 11905: 0x91BA,
-	25055 - 11905: 0x91BB,
-	25056 - 11905: 0x91BC,
-	25057 - 11905: 0x91BD,
-	25058 - 11905: 0x91BE,
-	25059 - 11905: 0x91BF,
-	25060 - 11905: 0x91C0,
-	25061 - 11905: 0x91C1,
-	25062 - 11905: 0xC5B3,
-	25063 - 11905: 0x91C2,
-	25064 - 11905: 0x91C3,
-	25065 - 11905: 0x91C4,
-	25066 - 11905: 0x91C5,
-	25067 - 11905: 0x91C6,
-	25068 - 11905: 0x91C7,
-	25069 - 11905: 0x91C8,
-	25070 - 11905: 0x91C9,
-	25071 - 11905: 0x91CA,
-	25072 - 11905: 0x91CB,
-	25073 - 11905: 0x91CC,
-	25074 - 11905: 0x91CD,
-	25075 - 11905: 0x91CE,
-	25076 - 11905: 0x91CF,
-	25077 - 11905: 0xE3C2,
-	25078 - 11905: 0x91D0,
-	25079 - 11905: 0x91D1,
-	25080 - 11905: 0x91D2,
-	25081 - 11905: 0x91D3,
-	25082 - 11905: 0x91D4,
-	25083 - 11905: 0x91D5,
-	25084 - 11905: 0x91D6,
-	25085 - 11905: 0x91D7,
-	25086 - 11905: 0x91D8,
-	25087 - 11905: 0xDCB2,
-	25088 - 11905: 0x91D9,
-	25089 - 11905: 0x91DA,
-	25090 - 11905: 0x91DB,
-	25091 - 11905: 0x91DC,
-	25092 - 11905: 0x91DD,
-	25093 - 11905: 0x91DE,
-	25094 - 11905: 0xEDB0,
-	25095 - 11905: 0x91DF,
-	25096 - 11905: 0xB8EA,
-	25097 - 11905: 0x91E0,
-	25098 - 11905: 0xCEEC,
-	25099 - 11905: 0xEAA7,
-	25100 - 11905: 0xD0E7,
-	25101 - 11905: 0xCAF9,
-	25102 - 11905: 0xC8D6,
-	25103 - 11905: 0xCFB7,
-	25104 - 11905: 0xB3C9,
-	25105 - 11905: 0xCED2,
-	25106 - 11905: 0xBDE4,
-	25107 - 11905: 0x91E1,
-	25108 - 11905: 0x91E2,
-	25109 - 11905: 0xE3DE,
-	25110 - 11905: 0xBBF2,
-	25111 - 11905: 0xEAA8,
-	25112 - 11905: 0xD5BD,
-	25113 - 11905: 0x91E3,
-	25114 - 11905: 0xC6DD,
-	25115 - 11905: 0xEAA9,
-	25116 - 11905: 0x91E4,
-	25117 - 11905: 0x91E5,
-	25118 - 11905: 0x91E6,
-	25119 - 11905: 0xEAAA,
-	25120 - 11905: 0x91E7,
-	25121 - 11905: 0xEAAC,
-	25122 - 11905: 0xEAAB,
-	25123 - 11905: 0x91E8,
-	25124 - 11905: 0xEAAE,
-	25125 - 11905: 0xEAAD,
-	25126 - 11905: 0x91E9,
-	25127 - 11905: 0x91EA,
-	25128 - 11905: 0x91EB,
-	25129 - 11905: 0x91EC,
-	25130 - 11905: 0xBDD8,
-	25131 - 11905: 0x91ED,
-	25132 - 11905: 0xEAAF,
-	25133 - 11905: 0x91EE,
-	25134 - 11905: 0xC2BE,
-	25135 - 11905: 0x91EF,
-	25136 - 11905: 0x91F0,
-	25137 - 11905: 0x91F1,
-	25138 - 11905: 0x91F2,
-	25139 - 11905: 0xB4C1,
-	25140 - 11905: 0xB4F7,
-	25141 - 11905: 0x91F3,
-	25142 - 11905: 0x91F4,
-	25143 - 11905: 0xBBA7,
-	25144 - 11905: 0x91F5,
-	25145 - 11905: 0x91F6,
-	25146 - 11905: 0x91F7,
-	25147 - 11905: 0x91F8,
-	25148 - 11905: 0x91F9,
-	25149 - 11905: 0xECE6,
-	25150 - 11905: 0xECE5,
-	25151 - 11905: 0xB7BF,
-	25152 - 11905: 0xCBF9,
-	25153 - 11905: 0xB1E2,
-	25154 - 11905: 0x91FA,
-	25155 - 11905: 0xECE7,
-	25156 - 11905: 0x91FB,
-	25157 - 11905: 0x91FC,
-	25158 - 11905: 0x91FD,
-	25159 - 11905: 0xC9C8,
-	25160 - 11905: 0xECE8,
-	25161 - 11905: 0xECE9,
-	25162 - 11905: 0x91FE,
-	25163 - 11905: 0xCAD6,
-	25164 - 11905: 0xDED0,
-	25165 - 11905: 0xB2C5,
-	25166 - 11905: 0xD4FA,
-	25167 - 11905: 0x9240,
-	25168 - 11905: 0x9241,
-	25169 - 11905: 0xC6CB,
-	25170 - 11905: 0xB0C7,
-	25171 - 11905: 0xB4F2,
-	25172 - 11905: 0xC8D3,
-	25173 - 11905: 0x9242,
-	25174 - 11905: 0x9243,
-	25175 - 11905: 0x9244,
-	25176 - 11905: 0xCDD0,
-	25177 - 11905: 0x9245,
-	25178 - 11905: 0x9246,
-	25179 - 11905: 0xBFB8,
-	25180 - 11905: 0x9247,
-	25181 - 11905: 0x9248,
-	25182 - 11905: 0x9249,
-	25183 - 11905: 0x924A,
-	25184 - 11905: 0x924B,
-	25185 - 11905: 0x924C,
-	25186 - 11905: 0x924D,
-	25187 - 11905: 0xBFDB,
-	25188 - 11905: 0x924E,
-	25189 - 11905: 0x924F,
-	25190 - 11905: 0xC7A4,
-	25191 - 11905: 0xD6B4,
-	25192 - 11905: 0x9250,
-	25193 - 11905: 0xC0A9,
-	25194 - 11905: 0xDED1,
-	25195 - 11905: 0xC9A8,
-	25196 - 11905: 0xD1EF,
-	25197 - 11905: 0xC5A4,
-	25198 - 11905: 0xB0E7,
-	25199 - 11905: 0xB3B6,
-	25200 - 11905: 0xC8C5,
-	25201 - 11905: 0x9251,
-	25202 - 11905: 0x9252,
-	25203 - 11905: 0xB0E2,
-	25204 - 11905: 0x9253,
-	25205 - 11905: 0x9254,
-	25206 - 11905: 0xB7F6,
-	25207 - 11905: 0x9255,
-	25208 - 11905: 0x9256,
-	25209 - 11905: 0xC5FA,
-	25210 - 11905: 0x9257,
-	25211 - 11905: 0x9258,
-	25212 - 11905: 0xB6F3,
-	25213 - 11905: 0x9259,
-	25214 - 11905: 0xD5D2,
-	25215 - 11905: 0xB3D0,
-	25216 - 11905: 0xBCBC,
-	25217 - 11905: 0x925A,
-	25218 - 11905: 0x925B,
-	25219 - 11905: 0x925C,
-	25220 - 11905: 0xB3AD,
-	25221 - 11905: 0x925D,
-	25222 - 11905: 0x925E,
-	25223 - 11905: 0x925F,
-	25224 - 11905: 0x9260,
-	25225 - 11905: 0xBEF1,
-	25226 - 11905: 0xB0D1,
-	25227 - 11905: 0x9261,
-	25228 - 11905: 0x9262,
-	25229 - 11905: 0x9263,
-	25230 - 11905: 0x9264,
-	25231 - 11905: 0x9265,
-	25232 - 11905: 0x9266,
-	25233 - 11905: 0xD2D6,
-	25234 - 11905: 0xCAE3,
-	25235 - 11905: 0xD7A5,
-	25236 - 11905: 0x9267,
-	25237 - 11905: 0xCDB6,
-	25238 - 11905: 0xB6B6,
-	25239 - 11905: 0xBFB9,
-	25240 - 11905: 0xD5DB,
-	25241 - 11905: 0x9268,
-	25242 - 11905: 0xB8A7,
-	25243 - 11905: 0xC5D7,
-	25244 - 11905: 0x9269,
-	25245 - 11905: 0x926A,
-	25246 - 11905: 0x926B,
-	25247 - 11905: 0xDED2,
-	25248 - 11905: 0xBFD9,
-	25249 - 11905: 0xC2D5,
-	25250 - 11905: 0xC7C0,
-	25251 - 11905: 0x926C,
-	25252 - 11905: 0xBBA4,
-	25253 - 11905: 0xB1A8,
-	25254 - 11905: 0x926D,
-	25255 - 11905: 0x926E,
-	25256 - 11905: 0xC5EA,
-	25257 - 11905: 0x926F,
-	25258 - 11905: 0x9270,
-	25259 - 11905: 0xC5FB,
-	25260 - 11905: 0xCCA7,
-	25261 - 11905: 0x9271,
-	25262 - 11905: 0x9272,
-	25263 - 11905: 0x9273,
-	25264 - 11905: 0x9274,
-	25265 - 11905: 0xB1A7,
-	25266 - 11905: 0x9275,
-	25267 - 11905: 0x9276,
-	25268 - 11905: 0x9277,
-	25269 - 11905: 0xB5D6,
-	25270 - 11905: 0x9278,
-	25271 - 11905: 0x9279,
-	25272 - 11905: 0x927A,
-	25273 - 11905: 0xC4A8,
-	25274 - 11905: 0x927B,
-	25275 - 11905: 0xDED3,
-	25276 - 11905: 0xD1BA,
-	25277 - 11905: 0xB3E9,
-	25278 - 11905: 0x927C,
-	25279 - 11905: 0xC3F2,
-	25280 - 11905: 0x927D,
-	25281 - 11905: 0x927E,
-	25282 - 11905: 0xB7F7,
-	25283 - 11905: 0x9280,
-	25284 - 11905: 0xD6F4,
-	25285 - 11905: 0xB5A3,
-	25286 - 11905: 0xB2F0,
-	25287 - 11905: 0xC4B4,
-	25288 - 11905: 0xC4E9,
-	25289 - 11905: 0xC0AD,
-	25290 - 11905: 0xDED4,
-	25291 - 11905: 0x9281,
-	25292 - 11905: 0xB0E8,
-	25293 - 11905: 0xC5C4,
-	25294 - 11905: 0xC1E0,
-	25295 - 11905: 0x9282,
-	25296 - 11905: 0xB9D5,
-	25297 - 11905: 0x9283,
-	25298 - 11905: 0xBEDC,
-	25299 - 11905: 0xCDD8,
-	25300 - 11905: 0xB0CE,
-	25301 - 11905: 0x9284,
-	25302 - 11905: 0xCDCF,
-	25303 - 11905: 0xDED6,
-	25304 - 11905: 0xBED0,
-	25305 - 11905: 0xD7BE,
-	25306 - 11905: 0xDED5,
-	25307 - 11905: 0xD5D0,
-	25308 - 11905: 0xB0DD,
-	25309 - 11905: 0x9285,
-	25310 - 11905: 0x9286,
-	25311 - 11905: 0xC4E2,
-	25312 - 11905: 0x9287,
-	25313 - 11905: 0x9288,
-	25314 - 11905: 0xC2A3,
-	25315 - 11905: 0xBCF0,
-	25316 - 11905: 0x9289,
-	25317 - 11905: 0xD3B5,
-	25318 - 11905: 0xC0B9,
-	25319 - 11905: 0xC5A1,
-	25320 - 11905: 0xB2A6,
-	25321 - 11905: 0xD4F1,
-	25322 - 11905: 0x928A,
-	25323 - 11905: 0x928B,
-	25324 - 11905: 0xC0A8,
-	25325 - 11905: 0xCAC3,
-	25326 - 11905: 0xDED7,
-	25327 - 11905: 0xD5FC,
-	25328 - 11905: 0x928C,
-	25329 - 11905: 0xB9B0,
-	25330 - 11905: 0x928D,
-	25331 - 11905: 0xC8AD,
-	25332 - 11905: 0xCBA9,
-	25333 - 11905: 0x928E,
-	25334 - 11905: 0xDED9,
-	25335 - 11905: 0xBFBD,
-	25336 - 11905: 0x928F,
-	25337 - 11905: 0x9290,
-	25338 - 11905: 0x9291,
-	25339 - 11905: 0x9292,
-	25340 - 11905: 0xC6B4,
-	25341 - 11905: 0xD7A7,
-	25342 - 11905: 0xCAB0,
-	25343 - 11905: 0xC4C3,
-	25344 - 11905: 0x9293,
-	25345 - 11905: 0xB3D6,
-	25346 - 11905: 0xB9D2,
-	25347 - 11905: 0x9294,
-	25348 - 11905: 0x9295,
-	25349 - 11905: 0x9296,
-	25350 - 11905: 0x9297,
-	25351 - 11905: 0xD6B8,
-	25352 - 11905: 0xEAFC,
-	25353 - 11905: 0xB0B4,
-	25354 - 11905: 0x9298,
-	25355 - 11905: 0x9299,
-	25356 - 11905: 0x929A,
-	25357 - 11905: 0x929B,
-	25358 - 11905: 0xBFE6,
-	25359 - 11905: 0x929C,
-	25360 - 11905: 0x929D,
-	25361 - 11905: 0xCCF4,
-	25362 - 11905: 0x929E,
-	25363 - 11905: 0x929F,
-	25364 - 11905: 0x92A0,
-	25365 - 11905: 0x92A1,
-	25366 - 11905: 0xCDDA,
-	25367 - 11905: 0x92A2,
-	25368 - 11905: 0x92A3,
-	25369 - 11905: 0x92A4,
-	25370 - 11905: 0xD6BF,
-	25371 - 11905: 0xC2CE,
-	25372 - 11905: 0x92A5,
-	25373 - 11905: 0xCECE,
-	25374 - 11905: 0xCCA2,
-	25375 - 11905: 0xD0AE,
-	25376 - 11905: 0xC4D3,
-	25377 - 11905: 0xB5B2,
-	25378 - 11905: 0xDED8,
-	25379 - 11905: 0xD5F5,
-	25380 - 11905: 0xBCB7,
-	25381 - 11905: 0xBBD3,
-	25382 - 11905: 0x92A6,
-	25383 - 11905: 0x92A7,
-	25384 - 11905: 0xB0A4,
-	25385 - 11905: 0x92A8,
-	25386 - 11905: 0xC5B2,
-	25387 - 11905: 0xB4EC,
-	25388 - 11905: 0x92A9,
-	25389 - 11905: 0x92AA,
-	25390 - 11905: 0x92AB,
-	25391 - 11905: 0xD5F1,
-	25392 - 11905: 0x92AC,
-	25393 - 11905: 0x92AD,
-	25394 - 11905: 0xEAFD,
-	25395 - 11905: 0x92AE,
-	25396 - 11905: 0x92AF,
-	25397 - 11905: 0x92B0,
-	25398 - 11905: 0x92B1,
-	25399 - 11905: 0x92B2,
-	25400 - 11905: 0x92B3,
-	25401 - 11905: 0xDEDA,
-	25402 - 11905: 0xCDA6,
-	25403 - 11905: 0x92B4,
-	25404 - 11905: 0x92B5,
-	25405 - 11905: 0xCDEC,
-	25406 - 11905: 0x92B6,
-	25407 - 11905: 0x92B7,
-	25408 - 11905: 0x92B8,
-	25409 - 11905: 0x92B9,
-	25410 - 11905: 0xCEE6,
-	25411 - 11905: 0xDEDC,
-	25412 - 11905: 0x92BA,
-	25413 - 11905: 0xCDB1,
-	25414 - 11905: 0xC0A6,
-	25415 - 11905: 0x92BB,
-	25416 - 11905: 0x92BC,
-	25417 - 11905: 0xD7BD,
-	25418 - 11905: 0x92BD,
-	25419 - 11905: 0xDEDB,
-	25420 - 11905: 0xB0C6,
-	25421 - 11905: 0xBAB4,
-	25422 - 11905: 0xC9D3,
-	25423 - 11905: 0xC4F3,
-	25424 - 11905: 0xBEE8,
-	25425 - 11905: 0x92BE,
-	25426 - 11905: 0x92BF,
-	25427 - 11905: 0x92C0,
-	25428 - 11905: 0x92C1,
-	25429 - 11905: 0xB2B6,
-	25430 - 11905: 0x92C2,
-	25431 - 11905: 0x92C3,
-	25432 - 11905: 0x92C4,
-	25433 - 11905: 0x92C5,
-	25434 - 11905: 0x92C6,
-	25435 - 11905: 0x92C7,
-	25436 - 11905: 0x92C8,
-	25437 - 11905: 0x92C9,
-	25438 - 11905: 0xC0CC,
-	25439 - 11905: 0xCBF0,
-	25440 - 11905: 0x92CA,
-	25441 - 11905: 0xBCF1,
-	25442 - 11905: 0xBBBB,
-	25443 - 11905: 0xB5B7,
-	25444 - 11905: 0x92CB,
-	25445 - 11905: 0x92CC,
-	25446 - 11905: 0x92CD,
-	25447 - 11905: 0xC5F5,
-	25448 - 11905: 0x92CE,
-	25449 - 11905: 0xDEE6,
-	25450 - 11905: 0x92CF,
-	25451 - 11905: 0x92D0,
-	25452 - 11905: 0x92D1,
-	25453 - 11905: 0xDEE3,
-	25454 - 11905: 0xBEDD,
-	25455 - 11905: 0x92D2,
-	25456 - 11905: 0x92D3,
-	25457 - 11905: 0xDEDF,
-	25458 - 11905: 0x92D4,
-	25459 - 11905: 0x92D5,
-	25460 - 11905: 0x92D6,
-	25461 - 11905: 0x92D7,
-	25462 - 11905: 0xB4B7,
-	25463 - 11905: 0xBDDD,
-	25464 - 11905: 0x92D8,
-	25465 - 11905: 0x92D9,
-	25466 - 11905: 0xDEE0,
-	25467 - 11905: 0xC4ED,
-	25468 - 11905: 0x92DA,
-	25469 - 11905: 0x92DB,
-	25470 - 11905: 0x92DC,
-	25471 - 11905: 0x92DD,
-	25472 - 11905: 0xCFC6,
-	25473 - 11905: 0x92DE,
-	25474 - 11905: 0xB5E0,
-	25475 - 11905: 0x92DF,
-	25476 - 11905: 0x92E0,
-	25477 - 11905: 0x92E1,
-	25478 - 11905: 0x92E2,
-	25479 - 11905: 0xB6DE,
-	25480 - 11905: 0xCADA,
-	25481 - 11905: 0xB5F4,
-	25482 - 11905: 0xDEE5,
-	25483 - 11905: 0x92E3,
-	25484 - 11905: 0xD5C6,
-	25485 - 11905: 0x92E4,
-	25486 - 11905: 0xDEE1,
-	25487 - 11905: 0xCCCD,
-	25488 - 11905: 0xC6FE,
-	25489 - 11905: 0x92E5,
-	25490 - 11905: 0xC5C5,
-	25491 - 11905: 0x92E6,
-	25492 - 11905: 0x92E7,
-	25493 - 11905: 0x92E8,
-	25494 - 11905: 0xD2B4,
-	25495 - 11905: 0x92E9,
-	25496 - 11905: 0xBEF2,
-	25497 - 11905: 0x92EA,
-	25498 - 11905: 0x92EB,
-	25499 - 11905: 0x92EC,
-	25500 - 11905: 0x92ED,
-	25501 - 11905: 0x92EE,
-	25502 - 11905: 0x92EF,
-	25503 - 11905: 0x92F0,
-	25504 - 11905: 0xC2D3,
-	25505 - 11905: 0x92F1,
-	25506 - 11905: 0xCCBD,
-	25507 - 11905: 0xB3B8,
-	25508 - 11905: 0x92F2,
-	25509 - 11905: 0xBDD3,
-	25510 - 11905: 0x92F3,
-	25511 - 11905: 0xBFD8,
-	25512 - 11905: 0xCDC6,
-	25513 - 11905: 0xD1DA,
-	25514 - 11905: 0xB4EB,
-	25515 - 11905: 0x92F4,
-	25516 - 11905: 0xDEE4,
-	25517 - 11905: 0xDEDD,
-	25518 - 11905: 0xDEE7,
-	25519 - 11905: 0x92F5,
-	25520 - 11905: 0xEAFE,
-	25521 - 11905: 0x92F6,
-	25522 - 11905: 0x92F7,
-	25523 - 11905: 0xC2B0,
-	25524 - 11905: 0xDEE2,
-	25525 - 11905: 0x92F8,
-	25526 - 11905: 0x92F9,
-	25527 - 11905: 0xD6C0,
-	25528 - 11905: 0xB5A7,
-	25529 - 11905: 0x92FA,
-	25530 - 11905: 0xB2F4,
-	25531 - 11905: 0x92FB,
-	25532 - 11905: 0xDEE8,
-	25533 - 11905: 0x92FC,
-	25534 - 11905: 0xDEF2,
-	25535 - 11905: 0x92FD,
-	25536 - 11905: 0x92FE,
-	25537 - 11905: 0x9340,
-	25538 - 11905: 0x9341,
-	25539 - 11905: 0x9342,
-	25540 - 11905: 0xDEED,
-	25541 - 11905: 0x9343,
-	25542 - 11905: 0xDEF1,
-	25543 - 11905: 0x9344,
-	25544 - 11905: 0x9345,
-	25545 - 11905: 0xC8E0,
-	25546 - 11905: 0x9346,
-	25547 - 11905: 0x9347,
-	25548 - 11905: 0x9348,
-	25549 - 11905: 0xD7E1,
-	25550 - 11905: 0xDEEF,
-	25551 - 11905: 0xC3E8,
-	25552 - 11905: 0xCCE1,
-	25553 - 11905: 0x9349,
-	25554 - 11905: 0xB2E5,
-	25555 - 11905: 0x934A,
-	25556 - 11905: 0x934B,
-	25557 - 11905: 0x934C,
-	25558 - 11905: 0xD2BE,
-	25559 - 11905: 0x934D,
-	25560 - 11905: 0x934E,
-	25561 - 11905: 0x934F,
-	25562 - 11905: 0x9350,
-	25563 - 11905: 0x9351,
-	25564 - 11905: 0x9352,
-	25565 - 11905: 0x9353,
-	25566 - 11905: 0xDEEE,
-	25567 - 11905: 0x9354,
-	25568 - 11905: 0xDEEB,
-	25569 - 11905: 0xCED5,
-	25570 - 11905: 0x9355,
-	25571 - 11905: 0xB4A7,
-	25572 - 11905: 0x9356,
-	25573 - 11905: 0x9357,
-	25574 - 11905: 0x9358,
-	25575 - 11905: 0x9359,
-	25576 - 11905: 0x935A,
-	25577 - 11905: 0xBFAB,
-	25578 - 11905: 0xBEBE,
-	25579 - 11905: 0x935B,
-	25580 - 11905: 0x935C,
-	25581 - 11905: 0xBDD2,
-	25582 - 11905: 0x935D,
-	25583 - 11905: 0x935E,
-	25584 - 11905: 0x935F,
-	25585 - 11905: 0x9360,
-	25586 - 11905: 0xDEE9,
-	25587 - 11905: 0x9361,
-	25588 - 11905: 0xD4AE,
-	25589 - 11905: 0x9362,
-	25590 - 11905: 0xDEDE,
-	25591 - 11905: 0x9363,
-	25592 - 11905: 0xDEEA,
-	25593 - 11905: 0x9364,
-	25594 - 11905: 0x9365,
-	25595 - 11905: 0x9366,
-	25596 - 11905: 0x9367,
-	25597 - 11905: 0xC0BF,
-	25598 - 11905: 0x9368,
-	25599 - 11905: 0xDEEC,
-	25600 - 11905: 0xB2F3,
-	25601 - 11905: 0xB8E9,
-	25602 - 11905: 0xC2A7,
-	25603 - 11905: 0x9369,
-	25604 - 11905: 0x936A,
-	25605 - 11905: 0xBDC1,
-	25606 - 11905: 0x936B,
-	25607 - 11905: 0x936C,
-	25608 - 11905: 0x936D,
-	25609 - 11905: 0x936E,
-	25610 - 11905: 0x936F,
-	25611 - 11905: 0xDEF5,
-	25612 - 11905: 0xDEF8,
-	25613 - 11905: 0x9370,
-	25614 - 11905: 0x9371,
-	25615 - 11905: 0xB2AB,
-	25616 - 11905: 0xB4A4,
-	25617 - 11905: 0x9372,
-	25618 - 11905: 0x9373,
-	25619 - 11905: 0xB4EA,
-	25620 - 11905: 0xC9A6,
-	25621 - 11905: 0x9374,
-	25622 - 11905: 0x9375,
-	25623 - 11905: 0x9376,
-	25624 - 11905: 0x9377,
-	25625 - 11905: 0x9378,
-	25626 - 11905: 0x9379,
-	25627 - 11905: 0xDEF6,
-	25628 - 11905: 0xCBD1,
-	25629 - 11905: 0x937A,
-	25630 - 11905: 0xB8E3,
-	25631 - 11905: 0x937B,
-	25632 - 11905: 0xDEF7,
-	25633 - 11905: 0xDEFA,
-	25634 - 11905: 0x937C,
-	25635 - 11905: 0x937D,
-	25636 - 11905: 0x937E,
-	25637 - 11905: 0x9380,
-	25638 - 11905: 0xDEF9,
-	25639 - 11905: 0x9381,
-	25640 - 11905: 0x9382,
-	25641 - 11905: 0x9383,
-	25642 - 11905: 0xCCC2,
-	25643 - 11905: 0x9384,
-	25644 - 11905: 0xB0E1,
-	25645 - 11905: 0xB4EE,
-	25646 - 11905: 0x9385,
-	25647 - 11905: 0x9386,
-	25648 - 11905: 0x9387,
-	25649 - 11905: 0x9388,
-	25650 - 11905: 0x9389,
-	25651 - 11905: 0x938A,
-	25652 - 11905: 0xE5BA,
-	25653 - 11905: 0x938B,
-	25654 - 11905: 0x938C,
-	25655 - 11905: 0x938D,
-	25656 - 11905: 0x938E,
-	25657 - 11905: 0x938F,
-	25658 - 11905: 0xD0AF,
-	25659 - 11905: 0x9390,
-	25660 - 11905: 0x9391,
-	25661 - 11905: 0xB2EB,
-	25662 - 11905: 0x9392,
-	25663 - 11905: 0xEBA1,
-	25664 - 11905: 0x9393,
-	25665 - 11905: 0xDEF4,
-	25666 - 11905: 0x9394,
-	25667 - 11905: 0x9395,
-	25668 - 11905: 0xC9E3,
-	25669 - 11905: 0xDEF3,
-	25670 - 11905: 0xB0DA,
-	25671 - 11905: 0xD2A1,
-	25672 - 11905: 0xB1F7,
-	25673 - 11905: 0x9396,
-	25674 - 11905: 0xCCAF,
-	25675 - 11905: 0x9397,
-	25676 - 11905: 0x9398,
-	25677 - 11905: 0x9399,
-	25678 - 11905: 0x939A,
-	25679 - 11905: 0x939B,
-	25680 - 11905: 0x939C,
-	25681 - 11905: 0x939D,
-	25682 - 11905: 0xDEF0,
-	25683 - 11905: 0x939E,
-	25684 - 11905: 0xCBA4,
-	25685 - 11905: 0x939F,
-	25686 - 11905: 0x93A0,
-	25687 - 11905: 0x93A1,
-	25688 - 11905: 0xD5AA,
-	25689 - 11905: 0x93A2,
-	25690 - 11905: 0x93A3,
-	25691 - 11905: 0x93A4,
-	25692 - 11905: 0x93A5,
-	25693 - 11905: 0x93A6,
-	25694 - 11905: 0xDEFB,
-	25695 - 11905: 0x93A7,
-	25696 - 11905: 0x93A8,
-	25697 - 11905: 0x93A9,
-	25698 - 11905: 0x93AA,
-	25699 - 11905: 0x93AB,
-	25700 - 11905: 0x93AC,
-	25701 - 11905: 0x93AD,
-	25702 - 11905: 0x93AE,
-	25703 - 11905: 0xB4DD,
-	25704 - 11905: 0x93AF,
-	25705 - 11905: 0xC4A6,
-	25706 - 11905: 0x93B0,
-	25707 - 11905: 0x93B1,
-	25708 - 11905: 0x93B2,
-	25709 - 11905: 0xDEFD,
-	25710 - 11905: 0x93B3,
-	25711 - 11905: 0x93B4,
-	25712 - 11905: 0x93B5,
-	25713 - 11905: 0x93B6,
-	25714 - 11905: 0x93B7,
-	25715 - 11905: 0x93B8,
-	25716 - 11905: 0x93B9,
-	25717 - 11905: 0x93BA,
-	25718 - 11905: 0x93BB,
-	25719 - 11905: 0x93BC,
-	25720 - 11905: 0xC3FE,
-	25721 - 11905: 0xC4A1,
-	25722 - 11905: 0xDFA1,
-	25723 - 11905: 0x93BD,
-	25724 - 11905: 0x93BE,
-	25725 - 11905: 0x93BF,
-	25726 - 11905: 0x93C0,
-	25727 - 11905: 0x93C1,
-	25728 - 11905: 0x93C2,
-	25729 - 11905: 0x93C3,
-	25730 - 11905: 0xC1CC,
-	25731 - 11905: 0x93C4,
-	25732 - 11905: 0xDEFC,
-	25733 - 11905: 0xBEEF,
-	25734 - 11905: 0x93C5,
-	25735 - 11905: 0xC6B2,
-	25736 - 11905: 0x93C6,
-	25737 - 11905: 0x93C7,
-	25738 - 11905: 0x93C8,
-	25739 - 11905: 0x93C9,
-	25740 - 11905: 0x93CA,
-	25741 - 11905: 0x93CB,
-	25742 - 11905: 0x93CC,
-	25743 - 11905: 0x93CD,
-	25744 - 11905: 0x93CE,
-	25745 - 11905: 0xB3C5,
-	25746 - 11905: 0xC8F6,
-	25747 - 11905: 0x93CF,
-	25748 - 11905: 0x93D0,
-	25749 - 11905: 0xCBBA,
-	25750 - 11905: 0xDEFE,
-	25751 - 11905: 0x93D1,
-	25752 - 11905: 0x93D2,
-	25753 - 11905: 0xDFA4,
-	25754 - 11905: 0x93D3,
-	25755 - 11905: 0x93D4,
-	25756 - 11905: 0x93D5,
-	25757 - 11905: 0x93D6,
-	25758 - 11905: 0xD7B2,
-	25759 - 11905: 0x93D7,
-	25760 - 11905: 0x93D8,
-	25761 - 11905: 0x93D9,
-	25762 - 11905: 0x93DA,
-	25763 - 11905: 0x93DB,
-	25764 - 11905: 0xB3B7,
-	25765 - 11905: 0x93DC,
-	25766 - 11905: 0x93DD,
-	25767 - 11905: 0x93DE,
-	25768 - 11905: 0x93DF,
-	25769 - 11905: 0xC1C3,
-	25770 - 11905: 0x93E0,
-	25771 - 11905: 0x93E1,
-	25772 - 11905: 0xC7CB,
-	25773 - 11905: 0xB2A5,
-	25774 - 11905: 0xB4E9,
-	25775 - 11905: 0x93E2,
-	25776 - 11905: 0xD7AB,
-	25777 - 11905: 0x93E3,
-	25778 - 11905: 0x93E4,
-	25779 - 11905: 0x93E5,
-	25780 - 11905: 0x93E6,
-	25781 - 11905: 0xC4EC,
-	25782 - 11905: 0x93E7,
-	25783 - 11905: 0xDFA2,
-	25784 - 11905: 0xDFA3,
-	25785 - 11905: 0x93E8,
-	25786 - 11905: 0xDFA5,
-	25787 - 11905: 0x93E9,
-	25788 - 11905: 0xBAB3,
-	25789 - 11905: 0x93EA,
-	25790 - 11905: 0x93EB,
-	25791 - 11905: 0x93EC,
-	25792 - 11905: 0xDFA6,
-	25793 - 11905: 0x93ED,
-	25794 - 11905: 0xC0DE,
-	25795 - 11905: 0x93EE,
-	25796 - 11905: 0x93EF,
-	25797 - 11905: 0xC9C3,
-	25798 - 11905: 0x93F0,
-	25799 - 11905: 0x93F1,
-	25800 - 11905: 0x93F2,
-	25801 - 11905: 0x93F3,
-	25802 - 11905: 0x93F4,
-	25803 - 11905: 0x93F5,
-	25804 - 11905: 0x93F6,
-	25805 - 11905: 0xB2D9,
-	25806 - 11905: 0xC7E6,
-	25807 - 11905: 0x93F7,
-	25808 - 11905: 0xDFA7,
-	25809 - 11905: 0x93F8,
-	25810 - 11905: 0xC7DC,
-	25811 - 11905: 0x93F9,
-	25812 - 11905: 0x93FA,
-	25813 - 11905: 0x93FB,
-	25814 - 11905: 0x93FC,
-	25815 - 11905: 0xDFA8,
-	25816 - 11905: 0xEBA2,
-	25817 - 11905: 0x93FD,
-	25818 - 11905: 0x93FE,
-	25819 - 11905: 0x9440,
-	25820 - 11905: 0x9441,
-	25821 - 11905: 0x9442,
-	25822 - 11905: 0xCBD3,
-	25823 - 11905: 0x9443,
-	25824 - 11905: 0x9444,
-	25825 - 11905: 0x9445,
-	25826 - 11905: 0xDFAA,
-	25827 - 11905: 0x9446,
-	25828 - 11905: 0xDFA9,
-	25829 - 11905: 0x9447,
-	25830 - 11905: 0xB2C1,
-	25831 - 11905: 0x9448,
-	25832 - 11905: 0x9449,
-	25833 - 11905: 0x944A,
-	25834 - 11905: 0x944B,
-	25835 - 11905: 0x944C,
-	25836 - 11905: 0x944D,
-	25837 - 11905: 0x944E,
-	25838 - 11905: 0x944F,
-	25839 - 11905: 0x9450,
-	25840 - 11905: 0x9451,
-	25841 - 11905: 0x9452,
-	25842 - 11905: 0x9453,
-	25843 - 11905: 0x9454,
-	25844 - 11905: 0x9455,
-	25845 - 11905: 0x9456,
-	25846 - 11905: 0x9457,
-	25847 - 11905: 0x9458,
-	25848 - 11905: 0x9459,
-	25849 - 11905: 0x945A,
-	25850 - 11905: 0x945B,
-	25851 - 11905: 0x945C,
-	25852 - 11905: 0x945D,
-	25853 - 11905: 0x945E,
-	25854 - 11905: 0x945F,
-	25855 - 11905: 0x9460,
-	25856 - 11905: 0xC5CA,
-	25857 - 11905: 0x9461,
-	25858 - 11905: 0x9462,
-	25859 - 11905: 0x9463,
-	25860 - 11905: 0x9464,
-	25861 - 11905: 0x9465,
-	25862 - 11905: 0x9466,
-	25863 - 11905: 0x9467,
-	25864 - 11905: 0x9468,
-	25865 - 11905: 0xDFAB,
-	25866 - 11905: 0x9469,
-	25867 - 11905: 0x946A,
-	25868 - 11905: 0x946B,
-	25869 - 11905: 0x946C,
-	25870 - 11905: 0x946D,
-	25871 - 11905: 0x946E,
-	25872 - 11905: 0x946F,
-	25873 - 11905: 0x9470,
-	25874 - 11905: 0xD4DC,
-	25875 - 11905: 0x9471,
-	25876 - 11905: 0x9472,
-	25877 - 11905: 0x9473,
-	25878 - 11905: 0x9474,
-	25879 - 11905: 0x9475,
-	25880 - 11905: 0xC8C1,
-	25881 - 11905: 0x9476,
-	25882 - 11905: 0x9477,
-	25883 - 11905: 0x9478,
-	25884 - 11905: 0x9479,
-	25885 - 11905: 0x947A,
-	25886 - 11905: 0x947B,
-	25887 - 11905: 0x947C,
-	25888 - 11905: 0x947D,
-	25889 - 11905: 0x947E,
-	25890 - 11905: 0x9480,
-	25891 - 11905: 0x9481,
-	25892 - 11905: 0x9482,
-	25893 - 11905: 0xDFAC,
-	25894 - 11905: 0x9483,
-	25895 - 11905: 0x9484,
-	25896 - 11905: 0x9485,
-	25897 - 11905: 0x9486,
-	25898 - 11905: 0x9487,
-	25899 - 11905: 0xBEF0,
-	25900 - 11905: 0x9488,
-	25901 - 11905: 0x9489,
-	25902 - 11905: 0xDFAD,
-	25903 - 11905: 0xD6A7,
-	25904 - 11905: 0x948A,
-	25905 - 11905: 0x948B,
-	25906 - 11905: 0x948C,
-	25907 - 11905: 0x948D,
-	25908 - 11905: 0xEAB7,
-	25909 - 11905: 0xEBB6,
-	25910 - 11905: 0xCAD5,
-	25911 - 11905: 0x948E,
-	25912 - 11905: 0xD8FC,
-	25913 - 11905: 0xB8C4,
-	25914 - 11905: 0x948F,
-	25915 - 11905: 0xB9A5,
-	25916 - 11905: 0x9490,
-	25917 - 11905: 0x9491,
-	25918 - 11905: 0xB7C5,
-	25919 - 11905: 0xD5FE,
-	25920 - 11905: 0x9492,
-	25921 - 11905: 0x9493,
-	25922 - 11905: 0x9494,
-	25923 - 11905: 0x9495,
-	25924 - 11905: 0x9496,
-	25925 - 11905: 0xB9CA,
-	25926 - 11905: 0x9497,
-	25927 - 11905: 0x9498,
-	25928 - 11905: 0xD0A7,
-	25929 - 11905: 0xF4CD,
-	25930 - 11905: 0x9499,
-	25931 - 11905: 0x949A,
-	25932 - 11905: 0xB5D0,
-	25933 - 11905: 0x949B,
-	25934 - 11905: 0x949C,
-	25935 - 11905: 0xC3F4,
-	25936 - 11905: 0x949D,
-	25937 - 11905: 0xBEC8,
-	25938 - 11905: 0x949E,
-	25939 - 11905: 0x949F,
-	25940 - 11905: 0x94A0,
-	25941 - 11905: 0xEBB7,
-	25942 - 11905: 0xB0BD,
-	25943 - 11905: 0x94A1,
-	25944 - 11905: 0x94A2,
-	25945 - 11905: 0xBDCC,
-	25946 - 11905: 0x94A3,
-	25947 - 11905: 0xC1B2,
-	25948 - 11905: 0x94A4,
-	25949 - 11905: 0xB1D6,
-	25950 - 11905: 0xB3A8,
-	25951 - 11905: 0x94A5,
-	25952 - 11905: 0x94A6,
-	25953 - 11905: 0x94A7,
-	25954 - 11905: 0xB8D2,
-	25955 - 11905: 0xC9A2,
-	25956 - 11905: 0x94A8,
-	25957 - 11905: 0x94A9,
-	25958 - 11905: 0xB6D8,
-	25959 - 11905: 0x94AA,
-	25960 - 11905: 0x94AB,
-	25961 - 11905: 0x94AC,
-	25962 - 11905: 0x94AD,
-	25963 - 11905: 0xEBB8,
-	25964 - 11905: 0xBEB4,
-	25965 - 11905: 0x94AE,
-	25966 - 11905: 0x94AF,
-	25967 - 11905: 0x94B0,
-	25968 - 11905: 0xCAFD,
-	25969 - 11905: 0x94B1,
-	25970 - 11905: 0xC7C3,
-	25971 - 11905: 0x94B2,
-	25972 - 11905: 0xD5FB,
-	25973 - 11905: 0x94B3,
-	25974 - 11905: 0x94B4,
-	25975 - 11905: 0xB7F3,
-	25976 - 11905: 0x94B5,
-	25977 - 11905: 0x94B6,
-	25978 - 11905: 0x94B7,
-	25979 - 11905: 0x94B8,
-	25980 - 11905: 0x94B9,
-	25981 - 11905: 0x94BA,
-	25982 - 11905: 0x94BB,
-	25983 - 11905: 0x94BC,
-	25984 - 11905: 0x94BD,
-	25985 - 11905: 0x94BE,
-	25986 - 11905: 0x94BF,
-	25987 - 11905: 0x94C0,
-	25988 - 11905: 0x94C1,
-	25989 - 11905: 0x94C2,
-	25990 - 11905: 0x94C3,
-	25991 - 11905: 0xCEC4,
-	25992 - 11905: 0x94C4,
-	25993 - 11905: 0x94C5,
-	25994 - 11905: 0x94C6,
-	25995 - 11905: 0xD5AB,
-	25996 - 11905: 0xB1F3,
-	25997 - 11905: 0x94C7,
-	25998 - 11905: 0x94C8,
-	25999 - 11905: 0x94C9,
-	26000 - 11905: 0xECB3,
-	26001 - 11905: 0xB0DF,
-	26002 - 11905: 0x94CA,
-	26003 - 11905: 0xECB5,
-	26004 - 11905: 0x94CB,
-	26005 - 11905: 0x94CC,
-	26006 - 11905: 0x94CD,
-	26007 - 11905: 0xB6B7,
-	26008 - 11905: 0x94CE,
-	26009 - 11905: 0xC1CF,
-	26010 - 11905: 0x94CF,
-	26011 - 11905: 0xF5FA,
-	26012 - 11905: 0xD0B1,
-	26013 - 11905: 0x94D0,
-	26014 - 11905: 0x94D1,
-	26015 - 11905: 0xD5E5,
-	26016 - 11905: 0x94D2,
-	26017 - 11905: 0xCED3,
-	26018 - 11905: 0x94D3,
-	26019 - 11905: 0x94D4,
-	26020 - 11905: 0xBDEF,
-	26021 - 11905: 0xB3E2,
-	26022 - 11905: 0x94D5,
-	26023 - 11905: 0xB8AB,
-	26024 - 11905: 0x94D6,
-	26025 - 11905: 0xD5B6,
-	26026 - 11905: 0x94D7,
-	26027 - 11905: 0xEDBD,
-	26028 - 11905: 0x94D8,
-	26029 - 11905: 0xB6CF,
-	26030 - 11905: 0x94D9,
-	26031 - 11905: 0xCBB9,
-	26032 - 11905: 0xD0C2,
-	26033 - 11905: 0x94DA,
-	26034 - 11905: 0x94DB,
-	26035 - 11905: 0x94DC,
-	26036 - 11905: 0x94DD,
-	26037 - 11905: 0x94DE,
-	26038 - 11905: 0x94DF,
-	26039 - 11905: 0x94E0,
-	26040 - 11905: 0x94E1,
-	26041 - 11905: 0xB7BD,
-	26042 - 11905: 0x94E2,
-	26043 - 11905: 0x94E3,
-	26044 - 11905: 0xECB6,
-	26045 - 11905: 0xCAA9,
-	26046 - 11905: 0x94E4,
-	26047 - 11905: 0x94E5,
-	26048 - 11905: 0x94E6,
-	26049 - 11905: 0xC5D4,
-	26050 - 11905: 0x94E7,
-	26051 - 11905: 0xECB9,
-	26052 - 11905: 0xECB8,
-	26053 - 11905: 0xC2C3,
-	26054 - 11905: 0xECB7,
-	26055 - 11905: 0x94E8,
-	26056 - 11905: 0x94E9,
-	26057 - 11905: 0x94EA,
-	26058 - 11905: 0x94EB,
-	26059 - 11905: 0xD0FD,
-	26060 - 11905: 0xECBA,
-	26061 - 11905: 0x94EC,
-	26062 - 11905: 0xECBB,
-	26063 - 11905: 0xD7E5,
-	26064 - 11905: 0x94ED,
-	26065 - 11905: 0x94EE,
-	26066 - 11905: 0xECBC,
-	26067 - 11905: 0x94EF,
-	26068 - 11905: 0x94F0,
-	26069 - 11905: 0x94F1,
-	26070 - 11905: 0xECBD,
-	26071 - 11905: 0xC6EC,
-	26072 - 11905: 0x94F2,
-	26073 - 11905: 0x94F3,
-	26074 - 11905: 0x94F4,
-	26075 - 11905: 0x94F5,
-	26076 - 11905: 0x94F6,
-	26077 - 11905: 0x94F7,
-	26078 - 11905: 0x94F8,
-	26079 - 11905: 0x94F9,
-	26080 - 11905: 0xCEDE,
-	26081 - 11905: 0x94FA,
-	26082 - 11905: 0xBCC8,
-	26083 - 11905: 0x94FB,
-	26084 - 11905: 0x94FC,
-	26085 - 11905: 0xC8D5,
-	26086 - 11905: 0xB5A9,
-	26087 - 11905: 0xBEC9,
-	26088 - 11905: 0xD6BC,
-	26089 - 11905: 0xD4E7,
-	26090 - 11905: 0x94FD,
-	26091 - 11905: 0x94FE,
-	26092 - 11905: 0xD1AE,
-	26093 - 11905: 0xD0F1,
-	26094 - 11905: 0xEAB8,
-	26095 - 11905: 0xEAB9,
-	26096 - 11905: 0xEABA,
-	26097 - 11905: 0xBAB5,
-	26098 - 11905: 0x9540,
-	26099 - 11905: 0x9541,
-	26100 - 11905: 0x9542,
-	26101 - 11905: 0x9543,
-	26102 - 11905: 0xCAB1,
-	26103 - 11905: 0xBFF5,
-	26104 - 11905: 0x9544,
-	26105 - 11905: 0x9545,
-	26106 - 11905: 0xCDFA,
-	26107 - 11905: 0x9546,
-	26108 - 11905: 0x9547,
-	26109 - 11905: 0x9548,
-	26110 - 11905: 0x9549,
-	26111 - 11905: 0x954A,
-	26112 - 11905: 0xEAC0,
-	26113 - 11905: 0x954B,
-	26114 - 11905: 0xB0BA,
-	26115 - 11905: 0xEABE,
-	26116 - 11905: 0x954C,
-	26117 - 11905: 0x954D,
-	26118 - 11905: 0xC0A5,
-	26119 - 11905: 0x954E,
-	26120 - 11905: 0x954F,
-	26121 - 11905: 0x9550,
-	26122 - 11905: 0xEABB,
-	26123 - 11905: 0x9551,
-	26124 - 11905: 0xB2FD,
-	26125 - 11905: 0x9552,
-	26126 - 11905: 0xC3F7,
-	26127 - 11905: 0xBBE8,
-	26128 - 11905: 0x9553,
-	26129 - 11905: 0x9554,
-	26130 - 11905: 0x9555,
-	26131 - 11905: 0xD2D7,
-	26132 - 11905: 0xCEF4,
-	26133 - 11905: 0xEABF,
-	26134 - 11905: 0x9556,
-	26135 - 11905: 0x9557,
-	26136 - 11905: 0x9558,
-	26137 - 11905: 0xEABC,
-	26138 - 11905: 0x9559,
-	26139 - 11905: 0x955A,
-	26140 - 11905: 0x955B,
-	26141 - 11905: 0xEAC3,
-	26142 - 11905: 0x955C,
-	26143 - 11905: 0xD0C7,
-	26144 - 11905: 0xD3B3,
-	26145 - 11905: 0x955D,
-	26146 - 11905: 0x955E,
-	26147 - 11905: 0x955F,
-	26148 - 11905: 0x9560,
-	26149 - 11905: 0xB4BA,
-	26150 - 11905: 0x9561,
-	26151 - 11905: 0xC3C1,
-	26152 - 11905: 0xD7F2,
-	26153 - 11905: 0x9562,
-	26154 - 11905: 0x9563,
-	26155 - 11905: 0x9564,
-	26156 - 11905: 0x9565,
-	26157 - 11905: 0xD5D1,
-	26158 - 11905: 0x9566,
-	26159 - 11905: 0xCAC7,
-	26160 - 11905: 0x9567,
-	26161 - 11905: 0xEAC5,
-	26162 - 11905: 0x9568,
-	26163 - 11905: 0x9569,
-	26164 - 11905: 0xEAC4,
-	26165 - 11905: 0xEAC7,
-	26166 - 11905: 0xEAC6,
-	26167 - 11905: 0x956A,
-	26168 - 11905: 0x956B,
-	26169 - 11905: 0x956C,
-	26170 - 11905: 0x956D,
-	26171 - 11905: 0x956E,
-	26172 - 11905: 0xD6E7,
-	26173 - 11905: 0x956F,
-	26174 - 11905: 0xCFD4,
-	26175 - 11905: 0x9570,
-	26176 - 11905: 0x9571,
-	26177 - 11905: 0xEACB,
-	26178 - 11905: 0x9572,
-	26179 - 11905: 0xBBCE,
-	26180 - 11905: 0x9573,
-	26181 - 11905: 0x9574,
-	26182 - 11905: 0x9575,
-	26183 - 11905: 0x9576,
-	26184 - 11905: 0x9577,
-	26185 - 11905: 0x9578,
-	26186 - 11905: 0x9579,
-	26187 - 11905: 0xBDFA,
-	26188 - 11905: 0xC9CE,
-	26189 - 11905: 0x957A,
-	26190 - 11905: 0x957B,
-	26191 - 11905: 0xEACC,
-	26192 - 11905: 0x957C,
-	26193 - 11905: 0x957D,
-	26194 - 11905: 0xC9B9,
-	26195 - 11905: 0xCFFE,
-	26196 - 11905: 0xEACA,
-	26197 - 11905: 0xD4CE,
-	26198 - 11905: 0xEACD,
-	26199 - 11905: 0xEACF,
-	26200 - 11905: 0x957E,
-	26201 - 11905: 0x9580,
-	26202 - 11905: 0xCDED,
-	26203 - 11905: 0x9581,
-	26204 - 11905: 0x9582,
-	26205 - 11905: 0x9583,
-	26206 - 11905: 0x9584,
-	26207 - 11905: 0xEAC9,
-	26208 - 11905: 0x9585,
-	26209 - 11905: 0xEACE,
-	26210 - 11905: 0x9586,
-	26211 - 11905: 0x9587,
-	26212 - 11905: 0xCEEE,
-	26213 - 11905: 0x9588,
-	26214 - 11905: 0xBBDE,
-	26215 - 11905: 0x9589,
-	26216 - 11905: 0xB3BF,
-	26217 - 11905: 0x958A,
-	26218 - 11905: 0x958B,
-	26219 - 11905: 0x958C,
-	26220 - 11905: 0x958D,
-	26221 - 11905: 0x958E,
-	26222 - 11905: 0xC6D5,
-	26223 - 11905: 0xBEB0,
-	26224 - 11905: 0xCEFA,
-	26225 - 11905: 0x958F,
-	26226 - 11905: 0x9590,
-	26227 - 11905: 0x9591,
-	26228 - 11905: 0xC7E7,
-	26229 - 11905: 0x9592,
-	26230 - 11905: 0xBEA7,
-	26231 - 11905: 0xEAD0,
-	26232 - 11905: 0x9593,
-	26233 - 11905: 0x9594,
-	26234 - 11905: 0xD6C7,
-	26235 - 11905: 0x9595,
-	26236 - 11905: 0x9596,
-	26237 - 11905: 0x9597,
-	26238 - 11905: 0xC1C0,
-	26239 - 11905: 0x9598,
-	26240 - 11905: 0x9599,
-	26241 - 11905: 0x959A,
-	26242 - 11905: 0xD4DD,
-	26243 - 11905: 0x959B,
-	26244 - 11905: 0xEAD1,
-	26245 - 11905: 0x959C,
-	26246 - 11905: 0x959D,
-	26247 - 11905: 0xCFBE,
-	26248 - 11905: 0x959E,
-	26249 - 11905: 0x959F,
-	26250 - 11905: 0x95A0,
-	26251 - 11905: 0x95A1,
-	26252 - 11905: 0xEAD2,
-	26253 - 11905: 0x95A2,
-	26254 - 11905: 0x95A3,
-	26255 - 11905: 0x95A4,
-	26256 - 11905: 0x95A5,
-	26257 - 11905: 0xCAEE,
-	26258 - 11905: 0x95A6,
-	26259 - 11905: 0x95A7,
-	26260 - 11905: 0x95A8,
-	26261 - 11905: 0x95A9,
-	26262 - 11905: 0xC5AF,
-	26263 - 11905: 0xB0B5,
-	26264 - 11905: 0x95AA,
-	26265 - 11905: 0x95AB,
-	26266 - 11905: 0x95AC,
-	26267 - 11905: 0x95AD,
-	26268 - 11905: 0x95AE,
-	26269 - 11905: 0xEAD4,
-	26270 - 11905: 0x95AF,
-	26271 - 11905: 0x95B0,
-	26272 - 11905: 0x95B1,
-	26273 - 11905: 0x95B2,
-	26274 - 11905: 0x95B3,
-	26275 - 11905: 0x95B4,
-	26276 - 11905: 0x95B5,
-	26277 - 11905: 0x95B6,
-	26278 - 11905: 0x95B7,
-	26279 - 11905: 0xEAD3,
-	26280 - 11905: 0xF4DF,
-	26281 - 11905: 0x95B8,
-	26282 - 11905: 0x95B9,
-	26283 - 11905: 0x95BA,
-	26284 - 11905: 0x95BB,
-	26285 - 11905: 0x95BC,
-	26286 - 11905: 0xC4BA,
-	26287 - 11905: 0x95BD,
-	26288 - 11905: 0x95BE,
-	26289 - 11905: 0x95BF,
-	26290 - 11905: 0x95C0,
-	26291 - 11905: 0x95C1,
-	26292 - 11905: 0xB1A9,
-	26293 - 11905: 0x95C2,
-	26294 - 11905: 0x95C3,
-	26295 - 11905: 0x95C4,
-	26296 - 11905: 0x95C5,
-	26297 - 11905: 0xE5DF,
-	26298 - 11905: 0x95C6,
-	26299 - 11905: 0x95C7,
-	26300 - 11905: 0x95C8,
-	26301 - 11905: 0x95C9,
-	26302 - 11905: 0xEAD5,
-	26303 - 11905: 0x95CA,
-	26304 - 11905: 0x95CB,
-	26305 - 11905: 0x95CC,
-	26306 - 11905: 0x95CD,
-	26307 - 11905: 0x95CE,
-	26308 - 11905: 0x95CF,
-	26309 - 11905: 0x95D0,
-	26310 - 11905: 0x95D1,
-	26311 - 11905: 0x95D2,
-	26312 - 11905: 0x95D3,
-	26313 - 11905: 0x95D4,
-	26314 - 11905: 0x95D5,
-	26315 - 11905: 0x95D6,
-	26316 - 11905: 0x95D7,
-	26317 - 11905: 0x95D8,
-	26318 - 11905: 0x95D9,
-	26319 - 11905: 0x95DA,
-	26320 - 11905: 0x95DB,
-	26321 - 11905: 0x95DC,
-	26322 - 11905: 0x95DD,
-	26323 - 11905: 0x95DE,
-	26324 - 11905: 0x95DF,
-	26325 - 11905: 0x95E0,
-	26326 - 11905: 0x95E1,
-	26327 - 11905: 0x95E2,
-	26328 - 11905: 0x95E3,
-	26329 - 11905: 0xCAEF,
-	26330 - 11905: 0x95E4,
-	26331 - 11905: 0xEAD6,
-	26332 - 11905: 0xEAD7,
-	26333 - 11905: 0xC6D8,
-	26334 - 11905: 0x95E5,
-	26335 - 11905: 0x95E6,
-	26336 - 11905: 0x95E7,
-	26337 - 11905: 0x95E8,
-	26338 - 11905: 0x95E9,
-	26339 - 11905: 0x95EA,
-	26340 - 11905: 0x95EB,
-	26341 - 11905: 0x95EC,
-	26342 - 11905: 0xEAD8,
-	26343 - 11905: 0x95ED,
-	26344 - 11905: 0x95EE,
-	26345 - 11905: 0xEAD9,
-	26346 - 11905: 0x95EF,
-	26347 - 11905: 0x95F0,
-	26348 - 11905: 0x95F1,
-	26349 - 11905: 0x95F2,
-	26350 - 11905: 0x95F3,
-	26351 - 11905: 0x95F4,
-	26352 - 11905: 0xD4BB,
-	26353 - 11905: 0x95F5,
-	26354 - 11905: 0xC7FA,
-	26355 - 11905: 0xD2B7,
-	26356 - 11905: 0xB8FC,
-	26357 - 11905: 0x95F6,
-	26358 - 11905: 0x95F7,
-	26359 - 11905: 0xEAC2,
-	26360 - 11905: 0x95F8,
-	26361 - 11905: 0xB2DC,
-	26362 - 11905: 0x95F9,
-	26363 - 11905: 0x95FA,
-	26364 - 11905: 0xC2FC,
-	26365 - 11905: 0x95FB,
-	26366 - 11905: 0xD4F8,
-	26367 - 11905: 0xCCE6,
-	26368 - 11905: 0xD7EE,
-	26369 - 11905: 0x95FC,
-	26370 - 11905: 0x95FD,
-	26371 - 11905: 0x95FE,
-	26372 - 11905: 0x9640,
-	26373 - 11905: 0x9641,
-	26374 - 11905: 0x9642,
-	26375 - 11905: 0x9643,
-	26376 - 11905: 0xD4C2,
-	26377 - 11905: 0xD3D0,
-	26378 - 11905: 0xEBC3,
-	26379 - 11905: 0xC5F3,
-	26380 - 11905: 0x9644,
-	26381 - 11905: 0xB7FE,
-	26382 - 11905: 0x9645,
-	26383 - 11905: 0x9646,
-	26384 - 11905: 0xEBD4,
-	26385 - 11905: 0x9647,
-	26386 - 11905: 0x9648,
-	26387 - 11905: 0x9649,
-	26388 - 11905: 0xCBB7,
-	26389 - 11905: 0xEBDE,
-	26390 - 11905: 0x964A,
-	26391 - 11905: 0xC0CA,
-	26392 - 11905: 0x964B,
-	26393 - 11905: 0x964C,
-	26394 - 11905: 0x964D,
-	26395 - 11905: 0xCDFB,
-	26396 - 11905: 0x964E,
-	26397 - 11905: 0xB3AF,
-	26398 - 11905: 0x964F,
-	26399 - 11905: 0xC6DA,
-	26400 - 11905: 0x9650,
-	26401 - 11905: 0x9651,
-	26402 - 11905: 0x9652,
-	26403 - 11905: 0x9653,
-	26404 - 11905: 0x9654,
-	26405 - 11905: 0x9655,
-	26406 - 11905: 0xEBFC,
-	26407 - 11905: 0x9656,
-	26408 - 11905: 0xC4BE,
-	26409 - 11905: 0x9657,
-	26410 - 11905: 0xCEB4,
-	26411 - 11905: 0xC4A9,
-	26412 - 11905: 0xB1BE,
-	26413 - 11905: 0xD4FD,
-	26414 - 11905: 0x9658,
-	26415 - 11905: 0xCAF5,
-	26416 - 11905: 0x9659,
-	26417 - 11905: 0xD6EC,
-	26418 - 11905: 0x965A,
-	26419 - 11905: 0x965B,
-	26420 - 11905: 0xC6D3,
-	26421 - 11905: 0xB6E4,
-	26422 - 11905: 0x965C,
-	26423 - 11905: 0x965D,
-	26424 - 11905: 0x965E,
-	26425 - 11905: 0x965F,
-	26426 - 11905: 0xBBFA,
-	26427 - 11905: 0x9660,
-	26428 - 11905: 0x9661,
-	26429 - 11905: 0xD0E0,
-	26430 - 11905: 0x9662,
-	26431 - 11905: 0x9663,
-	26432 - 11905: 0xC9B1,
-	26433 - 11905: 0x9664,
-	26434 - 11905: 0xD4D3,
-	26435 - 11905: 0xC8A8,
-	26436 - 11905: 0x9665,
-	26437 - 11905: 0x9666,
-	26438 - 11905: 0xB8CB,
-	26439 - 11905: 0x9667,
-	26440 - 11905: 0xE8BE,
-	26441 - 11905: 0xC9BC,
-	26442 - 11905: 0x9668,
-	26443 - 11905: 0x9669,
-	26444 - 11905: 0xE8BB,
-	26445 - 11905: 0x966A,
-	26446 - 11905: 0xC0EE,
-	26447 - 11905: 0xD0D3,
-	26448 - 11905: 0xB2C4,
-	26449 - 11905: 0xB4E5,
-	26450 - 11905: 0x966B,
-	26451 - 11905: 0xE8BC,
-	26452 - 11905: 0x966C,
-	26453 - 11905: 0x966D,
-	26454 - 11905: 0xD5C8,
-	26455 - 11905: 0x966E,
-	26456 - 11905: 0x966F,
-	26457 - 11905: 0x9670,
-	26458 - 11905: 0x9671,
-	26459 - 11905: 0x9672,
-	26460 - 11905: 0xB6C5,
-	26461 - 11905: 0x9673,
-	26462 - 11905: 0xE8BD,
-	26463 - 11905: 0xCAF8,
-	26464 - 11905: 0xB8DC,
-	26465 - 11905: 0xCCF5,
-	26466 - 11905: 0x9674,
-	26467 - 11905: 0x9675,
-	26468 - 11905: 0x9676,
-	26469 - 11905: 0xC0B4,
-	26470 - 11905: 0x9677,
-	26471 - 11905: 0x9678,
-	26472 - 11905: 0xD1EE,
-	26473 - 11905: 0xE8BF,
-	26474 - 11905: 0xE8C2,
-	26475 - 11905: 0x9679,
-	26476 - 11905: 0x967A,
-	26477 - 11905: 0xBABC,
-	26478 - 11905: 0x967B,
-	26479 - 11905: 0xB1AD,
-	26480 - 11905: 0xBDDC,
-	26481 - 11905: 0x967C,
-	26482 - 11905: 0xEABD,
-	26483 - 11905: 0xE8C3,
-	26484 - 11905: 0x967D,
-	26485 - 11905: 0xE8C6,
-	26486 - 11905: 0x967E,
-	26487 - 11905: 0xE8CB,
-	26488 - 11905: 0x9680,
-	26489 - 11905: 0x9681,
-	26490 - 11905: 0x9682,
-	26491 - 11905: 0x9683,
-	26492 - 11905: 0xE8CC,
-	26493 - 11905: 0x9684,
-	26494 - 11905: 0xCBC9,
-	26495 - 11905: 0xB0E5,
-	26496 - 11905: 0x9685,
-	26497 - 11905: 0xBCAB,
-	26498 - 11905: 0x9686,
-	26499 - 11905: 0x9687,
-	26500 - 11905: 0xB9B9,
-	26501 - 11905: 0x9688,
-	26502 - 11905: 0x9689,
-	26503 - 11905: 0xE8C1,
-	26504 - 11905: 0x968A,
-	26505 - 11905: 0xCDF7,
-	26506 - 11905: 0x968B,
-	26507 - 11905: 0xE8CA,
-	26508 - 11905: 0x968C,
-	26509 - 11905: 0x968D,
-	26510 - 11905: 0x968E,
-	26511 - 11905: 0x968F,
-	26512 - 11905: 0xCEF6,
-	26513 - 11905: 0x9690,
-	26514 - 11905: 0x9691,
-	26515 - 11905: 0x9692,
-	26516 - 11905: 0x9693,
-	26517 - 11905: 0xD5ED,
-	26518 - 11905: 0x9694,
-	26519 - 11905: 0xC1D6,
-	26520 - 11905: 0xE8C4,
-	26521 - 11905: 0x9695,
-	26522 - 11905: 0xC3B6,
-	26523 - 11905: 0x9696,
-	26524 - 11905: 0xB9FB,
-	26525 - 11905: 0xD6A6,
-	26526 - 11905: 0xE8C8,
-	26527 - 11905: 0x9697,
-	26528 - 11905: 0x9698,
-	26529 - 11905: 0x9699,
-	26530 - 11905: 0xCAE0,
-	26531 - 11905: 0xD4E6,
-	26532 - 11905: 0x969A,
-	26533 - 11905: 0xE8C0,
-	26534 - 11905: 0x969B,
-	26535 - 11905: 0xE8C5,
-	26536 - 11905: 0xE8C7,
-	26537 - 11905: 0x969C,
-	26538 - 11905: 0xC7B9,
-	26539 - 11905: 0xB7E3,
-	26540 - 11905: 0x969D,
-	26541 - 11905: 0xE8C9,
-	26542 - 11905: 0x969E,
-	26543 - 11905: 0xBFDD,
-	26544 - 11905: 0xE8D2,
-	26545 - 11905: 0x969F,
-	26546 - 11905: 0x96A0,
-	26547 - 11905: 0xE8D7,
-	26548 - 11905: 0x96A1,
-	26549 - 11905: 0xE8D5,
-	26550 - 11905: 0xBCDC,
-	26551 - 11905: 0xBCCF,
-	26552 - 11905: 0xE8DB,
-	26553 - 11905: 0x96A2,
-	26554 - 11905: 0x96A3,
-	26555 - 11905: 0x96A4,
-	26556 - 11905: 0x96A5,
-	26557 - 11905: 0x96A6,
-	26558 - 11905: 0x96A7,
-	26559 - 11905: 0x96A8,
-	26560 - 11905: 0x96A9,
-	26561 - 11905: 0xE8DE,
-	26562 - 11905: 0x96AA,
-	26563 - 11905: 0xE8DA,
-	26564 - 11905: 0xB1FA,
-	26565 - 11905: 0x96AB,
-	26566 - 11905: 0x96AC,
-	26567 - 11905: 0x96AD,
-	26568 - 11905: 0x96AE,
-	26569 - 11905: 0x96AF,
-	26570 - 11905: 0x96B0,
-	26571 - 11905: 0x96B1,
-	26572 - 11905: 0x96B2,
-	26573 - 11905: 0x96B3,
-	26574 - 11905: 0x96B4,
-	26575 - 11905: 0xB0D8,
-	26576 - 11905: 0xC4B3,
-	26577 - 11905: 0xB8CC,
-	26578 - 11905: 0xC6E2,
-	26579 - 11905: 0xC8BE,
-	26580 - 11905: 0xC8E1,
-	26581 - 11905: 0x96B5,
-	26582 - 11905: 0x96B6,
-	26583 - 11905: 0x96B7,
-	26584 - 11905: 0xE8CF,
-	26585 - 11905: 0xE8D4,
-	26586 - 11905: 0xE8D6,
-	26587 - 11905: 0x96B8,
-	26588 - 11905: 0xB9F1,
-	26589 - 11905: 0xE8D8,
-	26590 - 11905: 0xD7F5,
-	26591 - 11905: 0x96B9,
-	26592 - 11905: 0xC4FB,
-	26593 - 11905: 0x96BA,
-	26594 - 11905: 0xE8DC,
-	26595 - 11905: 0x96BB,
-	26596 - 11905: 0x96BC,
-	26597 - 11905: 0xB2E9,
-	26598 - 11905: 0x96BD,
-	26599 - 11905: 0x96BE,
-	26600 - 11905: 0x96BF,
-	26601 - 11905: 0xE8D1,
-	26602 - 11905: 0x96C0,
-	26603 - 11905: 0x96C1,
-	26604 - 11905: 0xBCED,
-	26605 - 11905: 0x96C2,
-	26606 - 11905: 0x96C3,
-	26607 - 11905: 0xBFC2,
-	26608 - 11905: 0xE8CD,
-	26609 - 11905: 0xD6F9,
-	26610 - 11905: 0x96C4,
-	26611 - 11905: 0xC1F8,
-	26612 - 11905: 0xB2F1,
-	26613 - 11905: 0x96C5,
-	26614 - 11905: 0x96C6,
-	26615 - 11905: 0x96C7,
-	26616 - 11905: 0x96C8,
-	26617 - 11905: 0x96C9,
-	26618 - 11905: 0x96CA,
-	26619 - 11905: 0x96CB,
-	26620 - 11905: 0x96CC,
-	26621 - 11905: 0xE8DF,
-	26622 - 11905: 0x96CD,
-	26623 - 11905: 0xCAC1,
-	26624 - 11905: 0xE8D9,
-	26625 - 11905: 0x96CE,
-	26626 - 11905: 0x96CF,
-	26627 - 11905: 0x96D0,
-	26628 - 11905: 0x96D1,
-	26629 - 11905: 0xD5A4,
-	26630 - 11905: 0x96D2,
-	26631 - 11905: 0xB1EA,
-	26632 - 11905: 0xD5BB,
-	26633 - 11905: 0xE8CE,
-	26634 - 11905: 0xE8D0,
-	26635 - 11905: 0xB6B0,
-	26636 - 11905: 0xE8D3,
-	26637 - 11905: 0x96D3,
-	26638 - 11905: 0xE8DD,
-	26639 - 11905: 0xC0B8,
-	26640 - 11905: 0x96D4,
-	26641 - 11905: 0xCAF7,
-	26642 - 11905: 0x96D5,
-	26643 - 11905: 0xCBA8,
-	26644 - 11905: 0x96D6,
-	26645 - 11905: 0x96D7,
-	26646 - 11905: 0xC6DC,
-	26647 - 11905: 0xC0F5,
-	26648 - 11905: 0x96D8,
-	26649 - 11905: 0x96D9,
-	26650 - 11905: 0x96DA,
-	26651 - 11905: 0x96DB,
-	26652 - 11905: 0x96DC,
-	26653 - 11905: 0xE8E9,
-	26654 - 11905: 0x96DD,
-	26655 - 11905: 0x96DE,
-	26656 - 11905: 0x96DF,
-	26657 - 11905: 0xD0A3,
-	26658 - 11905: 0x96E0,
-	26659 - 11905: 0x96E1,
-	26660 - 11905: 0x96E2,
-	26661 - 11905: 0x96E3,
-	26662 - 11905: 0x96E4,
-	26663 - 11905: 0x96E5,
-	26664 - 11905: 0x96E6,
-	26665 - 11905: 0xE8F2,
-	26666 - 11905: 0xD6EA,
-	26667 - 11905: 0x96E7,
-	26668 - 11905: 0x96E8,
-	26669 - 11905: 0x96E9,
-	26670 - 11905: 0x96EA,
-	26671 - 11905: 0x96EB,
-	26672 - 11905: 0x96EC,
-	26673 - 11905: 0x96ED,
-	26674 - 11905: 0xE8E0,
-	26675 - 11905: 0xE8E1,
-	26676 - 11905: 0x96EE,
-	26677 - 11905: 0x96EF,
-	26678 - 11905: 0x96F0,
-	26679 - 11905: 0xD1F9,
-	26680 - 11905: 0xBACB,
-	26681 - 11905: 0xB8F9,
-	26682 - 11905: 0x96F1,
-	26683 - 11905: 0x96F2,
-	26684 - 11905: 0xB8F1,
-	26685 - 11905: 0xD4D4,
-	26686 - 11905: 0xE8EF,
-	26687 - 11905: 0x96F3,
-	26688 - 11905: 0xE8EE,
-	26689 - 11905: 0xE8EC,
-	26690 - 11905: 0xB9F0,
-	26691 - 11905: 0xCCD2,
-	26692 - 11905: 0xE8E6,
-	26693 - 11905: 0xCEA6,
-	26694 - 11905: 0xBFF2,
-	26695 - 11905: 0x96F4,
-	26696 - 11905: 0xB0B8,
-	26697 - 11905: 0xE8F1,
-	26698 - 11905: 0xE8F0,
-	26699 - 11905: 0x96F5,
-	26700 - 11905: 0xD7C0,
-	26701 - 11905: 0x96F6,
-	26702 - 11905: 0xE8E4,
-	26703 - 11905: 0x96F7,
-	26704 - 11905: 0xCDA9,
-	26705 - 11905: 0xC9A3,
-	26706 - 11905: 0x96F8,
-	26707 - 11905: 0xBBB8,
-	26708 - 11905: 0xBDDB,
-	26709 - 11905: 0xE8EA,
-	26710 - 11905: 0x96F9,
-	26711 - 11905: 0x96FA,
-	26712 - 11905: 0x96FB,
-	26713 - 11905: 0x96FC,
-	26714 - 11905: 0x96FD,
-	26715 - 11905: 0x96FE,
-	26716 - 11905: 0x9740,
-	26717 - 11905: 0x9741,
-	26718 - 11905: 0x9742,
-	26719 - 11905: 0x9743,
-	26720 - 11905: 0xE8E2,
-	26721 - 11905: 0xE8E3,
-	26722 - 11905: 0xE8E5,
-	26723 - 11905: 0xB5B5,
-	26724 - 11905: 0xE8E7,
-	26725 - 11905: 0xC7C5,
-	26726 - 11905: 0xE8EB,
-	26727 - 11905: 0xE8ED,
-	26728 - 11905: 0xBDB0,
-	26729 - 11905: 0xD7AE,
-	26730 - 11905: 0x9744,
-	26731 - 11905: 0xE8F8,
-	26732 - 11905: 0x9745,
-	26733 - 11905: 0x9746,
-	26734 - 11905: 0x9747,
-	26735 - 11905: 0x9748,
-	26736 - 11905: 0x9749,
-	26737 - 11905: 0x974A,
-	26738 - 11905: 0x974B,
-	26739 - 11905: 0x974C,
-	26740 - 11905: 0xE8F5,
-	26741 - 11905: 0x974D,
-	26742 - 11905: 0xCDB0,
-	26743 - 11905: 0xE8F6,
-	26744 - 11905: 0x974E,
-	26745 - 11905: 0x974F,
-	26746 - 11905: 0x9750,
-	26747 - 11905: 0x9751,
-	26748 - 11905: 0x9752,
-	26749 - 11905: 0x9753,
-	26750 - 11905: 0x9754,
-	26751 - 11905: 0x9755,
-	26752 - 11905: 0x9756,
-	26753 - 11905: 0xC1BA,
-	26754 - 11905: 0x9757,
-	26755 - 11905: 0xE8E8,
-	26756 - 11905: 0x9758,
-	26757 - 11905: 0xC3B7,
-	26758 - 11905: 0xB0F0,
-	26759 - 11905: 0x9759,
-	26760 - 11905: 0x975A,
-	26761 - 11905: 0x975B,
-	26762 - 11905: 0x975C,
-	26763 - 11905: 0x975D,
-	26764 - 11905: 0x975E,
-	26765 - 11905: 0x975F,
-	26766 - 11905: 0x9760,
-	26767 - 11905: 0xE8F4,
-	26768 - 11905: 0x9761,
-	26769 - 11905: 0x9762,
-	26770 - 11905: 0x9763,
-	26771 - 11905: 0xE8F7,
-	26772 - 11905: 0x9764,
-	26773 - 11905: 0x9765,
-	26774 - 11905: 0x9766,
-	26775 - 11905: 0xB9A3,
-	26776 - 11905: 0x9767,
-	26777 - 11905: 0x9768,
-	26778 - 11905: 0x9769,
-	26779 - 11905: 0x976A,
-	26780 - 11905: 0x976B,
-	26781 - 11905: 0x976C,
-	26782 - 11905: 0x976D,
-	26783 - 11905: 0x976E,
-	26784 - 11905: 0x976F,
-	26785 - 11905: 0x9770,
-	26786 - 11905: 0xC9D2,
-	26787 - 11905: 0x9771,
-	26788 - 11905: 0x9772,
-	26789 - 11905: 0x9773,
-	26790 - 11905: 0xC3CE,
-	26791 - 11905: 0xCEE0,
-	26792 - 11905: 0xC0E6,
-	26793 - 11905: 0x9774,
-	26794 - 11905: 0x9775,
-	26795 - 11905: 0x9776,
-	26796 - 11905: 0x9777,
-	26797 - 11905: 0xCBF3,
-	26798 - 11905: 0x9778,
-	26799 - 11905: 0xCCDD,
-	26800 - 11905: 0xD0B5,
-	26801 - 11905: 0x9779,
-	26802 - 11905: 0x977A,
-	26803 - 11905: 0xCAE1,
-	26804 - 11905: 0x977B,
-	26805 - 11905: 0xE8F3,
-	26806 - 11905: 0x977C,
-	26807 - 11905: 0x977D,
-	26808 - 11905: 0x977E,
-	26809 - 11905: 0x9780,
-	26810 - 11905: 0x9781,
-	26811 - 11905: 0x9782,
-	26812 - 11905: 0x9783,
-	26813 - 11905: 0x9784,
-	26814 - 11905: 0x9785,
-	26815 - 11905: 0x9786,
-	26816 - 11905: 0xBCEC,
-	26817 - 11905: 0x9787,
-	26818 - 11905: 0xE8F9,
-	26819 - 11905: 0x9788,
-	26820 - 11905: 0x9789,
-	26821 - 11905: 0x978A,
-	26822 - 11905: 0x978B,
-	26823 - 11905: 0x978C,
-	26824 - 11905: 0x978D,
-	26825 - 11905: 0xC3DE,
-	26826 - 11905: 0x978E,
-	26827 - 11905: 0xC6E5,
-	26828 - 11905: 0x978F,
-	26829 - 11905: 0xB9F7,
-	26830 - 11905: 0x9790,
-	26831 - 11905: 0x9791,
-	26832 - 11905: 0x9792,
-	26833 - 11905: 0x9793,
-	26834 - 11905: 0xB0F4,
-	26835 - 11905: 0x9794,
-	26836 - 11905: 0x9795,
-	26837 - 11905: 0xD7D8,
-	26838 - 11905: 0x9796,
-	26839 - 11905: 0x9797,
-	26840 - 11905: 0xBCAC,
-	26841 - 11905: 0x9798,
-	26842 - 11905: 0xC5EF,
-	26843 - 11905: 0x9799,
-	26844 - 11905: 0x979A,
-	26845 - 11905: 0x979B,
-	26846 - 11905: 0x979C,
-	26847 - 11905: 0x979D,
-	26848 - 11905: 0xCCC4,
-	26849 - 11905: 0x979E,
-	26850 - 11905: 0x979F,
-	26851 - 11905: 0xE9A6,
-	26852 - 11905: 0x97A0,
-	26853 - 11905: 0x97A1,
-	26854 - 11905: 0x97A2,
-	26855 - 11905: 0x97A3,
-	26856 - 11905: 0x97A4,
-	26857 - 11905: 0x97A5,
-	26858 - 11905: 0x97A6,
-	26859 - 11905: 0x97A7,
-	26860 - 11905: 0x97A8,
-	26861 - 11905: 0x97A9,
-	26862 - 11905: 0xC9AD,
-	26863 - 11905: 0x97AA,
-	26864 - 11905: 0xE9A2,
-	26865 - 11905: 0xC0E2,
-	26866 - 11905: 0x97AB,
-	26867 - 11905: 0x97AC,
-	26868 - 11905: 0x97AD,
-	26869 - 11905: 0xBFC3,
-	26870 - 11905: 0x97AE,
-	26871 - 11905: 0x97AF,
-	26872 - 11905: 0x97B0,
-	26873 - 11905: 0xE8FE,
-	26874 - 11905: 0xB9D7,
-	26875 - 11905: 0x97B1,
-	26876 - 11905: 0xE8FB,
-	26877 - 11905: 0x97B2,
-	26878 - 11905: 0x97B3,
-	26879 - 11905: 0x97B4,
-	26880 - 11905: 0x97B5,
-	26881 - 11905: 0xE9A4,
-	26882 - 11905: 0x97B6,
-	26883 - 11905: 0x97B7,
-	26884 - 11905: 0x97B8,
-	26885 - 11905: 0xD2CE,
-	26886 - 11905: 0x97B9,
-	26887 - 11905: 0x97BA,
-	26888 - 11905: 0x97BB,
-	26889 - 11905: 0x97BC,
-	26890 - 11905: 0x97BD,
-	26891 - 11905: 0xE9A3,
-	26892 - 11905: 0x97BE,
-	26893 - 11905: 0xD6B2,
-	26894 - 11905: 0xD7B5,
-	26895 - 11905: 0x97BF,
-	26896 - 11905: 0xE9A7,
-	26897 - 11905: 0x97C0,
-	26898 - 11905: 0xBDB7,
-	26899 - 11905: 0x97C1,
-	26900 - 11905: 0x97C2,
-	26901 - 11905: 0x97C3,
-	26902 - 11905: 0x97C4,
-	26903 - 11905: 0x97C5,
-	26904 - 11905: 0x97C6,
-	26905 - 11905: 0x97C7,
-	26906 - 11905: 0x97C8,
-	26907 - 11905: 0x97C9,
-	26908 - 11905: 0x97CA,
-	26909 - 11905: 0x97CB,
-	26910 - 11905: 0x97CC,
-	26911 - 11905: 0xE8FC,
-	26912 - 11905: 0xE8FD,
-	26913 - 11905: 0x97CD,
-	26914 - 11905: 0x97CE,
-	26915 - 11905: 0x97CF,
-	26916 - 11905: 0xE9A1,
-	26917 - 11905: 0x97D0,
-	26918 - 11905: 0x97D1,
-	26919 - 11905: 0x97D2,
-	26920 - 11905: 0x97D3,
-	26921 - 11905: 0x97D4,
-	26922 - 11905: 0x97D5,
-	26923 - 11905: 0x97D6,
-	26924 - 11905: 0x97D7,
-	26925 - 11905: 0xCDD6,
-	26926 - 11905: 0x97D8,
-	26927 - 11905: 0x97D9,
-	26928 - 11905: 0xD2AC,
-	26929 - 11905: 0x97DA,
-	26930 - 11905: 0x97DB,
-	26931 - 11905: 0x97DC,
-	26932 - 11905: 0xE9B2,
-	26933 - 11905: 0x97DD,
-	26934 - 11905: 0x97DE,
-	26935 - 11905: 0x97DF,
-	26936 - 11905: 0x97E0,
-	26937 - 11905: 0xE9A9,
-	26938 - 11905: 0x97E1,
-	26939 - 11905: 0x97E2,
-	26940 - 11905: 0x97E3,
-	26941 - 11905: 0xB4AA,
-	26942 - 11905: 0x97E4,
-	26943 - 11905: 0xB4BB,
-	26944 - 11905: 0x97E5,
-	26945 - 11905: 0x97E6,
-	26946 - 11905: 0xE9AB,
-	26947 - 11905: 0x97E7,
-	26948 - 11905: 0x97E8,
-	26949 - 11905: 0x97E9,
-	26950 - 11905: 0x97EA,
-	26951 - 11905: 0x97EB,
-	26952 - 11905: 0x97EC,
-	26953 - 11905: 0x97ED,
-	26954 - 11905: 0x97EE,
-	26955 - 11905: 0x97EF,
-	26956 - 11905: 0x97F0,
-	26957 - 11905: 0x97F1,
-	26958 - 11905: 0x97F2,
-	26959 - 11905: 0x97F3,
-	26960 - 11905: 0x97F4,
-	26961 - 11905: 0x97F5,
-	26962 - 11905: 0x97F6,
-	26963 - 11905: 0x97F7,
-	26964 - 11905: 0xD0A8,
-	26965 - 11905: 0x97F8,
-	26966 - 11905: 0x97F9,
-	26967 - 11905: 0xE9A5,
-	26968 - 11905: 0x97FA,
-	26969 - 11905: 0x97FB,
-	26970 - 11905: 0xB3FE,
-	26971 - 11905: 0x97FC,
-	26972 - 11905: 0x97FD,
-	26973 - 11905: 0xE9AC,
-	26974 - 11905: 0xC0E3,
-	26975 - 11905: 0x97FE,
-	26976 - 11905: 0xE9AA,
-	26977 - 11905: 0x9840,
-	26978 - 11905: 0x9841,
-	26979 - 11905: 0xE9B9,
-	26980 - 11905: 0x9842,
-	26981 - 11905: 0x9843,
-	26982 - 11905: 0xE9B8,
-	26983 - 11905: 0x9844,
-	26984 - 11905: 0x9845,
-	26985 - 11905: 0x9846,
-	26986 - 11905: 0x9847,
-	26987 - 11905: 0xE9AE,
-	26988 - 11905: 0x9848,
-	26989 - 11905: 0x9849,
-	26990 - 11905: 0xE8FA,
-	26991 - 11905: 0x984A,
-	26992 - 11905: 0x984B,
-	26993 - 11905: 0xE9A8,
-	26994 - 11905: 0x984C,
-	26995 - 11905: 0x984D,
-	26996 - 11905: 0x984E,
-	26997 - 11905: 0x984F,
-	26998 - 11905: 0x9850,
-	26999 - 11905: 0xBFAC,
-	27000 - 11905: 0xE9B1,
-	27001 - 11905: 0xE9BA,
-	27002 - 11905: 0x9851,
-	27003 - 11905: 0x9852,
-	27004 - 11905: 0xC2A5,
-	27005 - 11905: 0x9853,
-	27006 - 11905: 0x9854,
-	27007 - 11905: 0x9855,
-	27008 - 11905: 0xE9AF,
-	27009 - 11905: 0x9856,
-	27010 - 11905: 0xB8C5,
-	27011 - 11905: 0x9857,
-	27012 - 11905: 0xE9AD,
-	27013 - 11905: 0x9858,
-	27014 - 11905: 0xD3DC,
-	27015 - 11905: 0xE9B4,
-	27016 - 11905: 0xE9B5,
-	27017 - 11905: 0xE9B7,
-	27018 - 11905: 0x9859,
-	27019 - 11905: 0x985A,
-	27020 - 11905: 0x985B,
-	27021 - 11905: 0xE9C7,
-	27022 - 11905: 0x985C,
-	27023 - 11905: 0x985D,
-	27024 - 11905: 0x985E,
-	27025 - 11905: 0x985F,
-	27026 - 11905: 0x9860,
-	27027 - 11905: 0x9861,
-	27028 - 11905: 0xC0C6,
-	27029 - 11905: 0xE9C5,
-	27030 - 11905: 0x9862,
-	27031 - 11905: 0x9863,
-	27032 - 11905: 0xE9B0,
-	27033 - 11905: 0x9864,
-	27034 - 11905: 0x9865,
-	27035 - 11905: 0xE9BB,
-	27036 - 11905: 0xB0F1,
-	27037 - 11905: 0x9866,
-	27038 - 11905: 0x9867,
-	27039 - 11905: 0x9868,
-	27040 - 11905: 0x9869,
-	27041 - 11905: 0x986A,
-	27042 - 11905: 0x986B,
-	27043 - 11905: 0x986C,
-	27044 - 11905: 0x986D,
-	27045 - 11905: 0x986E,
-	27046 - 11905: 0x986F,
-	27047 - 11905: 0xE9BC,
-	27048 - 11905: 0xD5A5,
-	27049 - 11905: 0x9870,
-	27050 - 11905: 0x9871,
-	27051 - 11905: 0xE9BE,
-	27052 - 11905: 0x9872,
-	27053 - 11905: 0xE9BF,
-	27054 - 11905: 0x9873,
-	27055 - 11905: 0x9874,
-	27056 - 11905: 0x9875,
-	27057 - 11905: 0xE9C1,
-	27058 - 11905: 0x9876,
-	27059 - 11905: 0x9877,
-	27060 - 11905: 0xC1F1,
-	27061 - 11905: 0x9878,
-	27062 - 11905: 0x9879,
-	27063 - 11905: 0xC8B6,
-	27064 - 11905: 0x987A,
-	27065 - 11905: 0x987B,
-	27066 - 11905: 0x987C,
-	27067 - 11905: 0xE9BD,
-	27068 - 11905: 0x987D,
-	27069 - 11905: 0x987E,
-	27070 - 11905: 0x9880,
-	27071 - 11905: 0x9881,
-	27072 - 11905: 0x9882,
-	27073 - 11905: 0xE9C2,
-	27074 - 11905: 0x9883,
-	27075 - 11905: 0x9884,
-	27076 - 11905: 0x9885,
-	27077 - 11905: 0x9886,
-	27078 - 11905: 0x9887,
-	27079 - 11905: 0x9888,
-	27080 - 11905: 0x9889,
-	27081 - 11905: 0x988A,
-	27082 - 11905: 0xE9C3,
-	27083 - 11905: 0x988B,
-	27084 - 11905: 0xE9B3,
-	27085 - 11905: 0x988C,
-	27086 - 11905: 0xE9B6,
-	27087 - 11905: 0x988D,
-	27088 - 11905: 0xBBB1,
-	27089 - 11905: 0x988E,
-	27090 - 11905: 0x988F,
-	27091 - 11905: 0x9890,
-	27092 - 11905: 0xE9C0,
-	27093 - 11905: 0x9891,
-	27094 - 11905: 0x9892,
-	27095 - 11905: 0x9893,
-	27096 - 11905: 0x9894,
-	27097 - 11905: 0x9895,
-	27098 - 11905: 0x9896,
-	27099 - 11905: 0xBCF7,
-	27100 - 11905: 0x9897,
-	27101 - 11905: 0x9898,
-	27102 - 11905: 0x9899,
-	27103 - 11905: 0xE9C4,
-	27104 - 11905: 0xE9C6,
-	27105 - 11905: 0x989A,
-	27106 - 11905: 0x989B,
-	27107 - 11905: 0x989C,
-	27108 - 11905: 0x989D,
-	27109 - 11905: 0x989E,
-	27110 - 11905: 0x989F,
-	27111 - 11905: 0x98A0,
-	27112 - 11905: 0x98A1,
-	27113 - 11905: 0x98A2,
-	27114 - 11905: 0x98A3,
-	27115 - 11905: 0x98A4,
-	27116 - 11905: 0x98A5,
-	27117 - 11905: 0xE9CA,
-	27118 - 11905: 0x98A6,
-	27119 - 11905: 0x98A7,
-	27120 - 11905: 0x98A8,
-	27121 - 11905: 0x98A9,
-	27122 - 11905: 0xE9CE,
-	27123 - 11905: 0x98AA,
-	27124 - 11905: 0x98AB,
-	27125 - 11905: 0x98AC,
-	27126 - 11905: 0x98AD,
-	27127 - 11905: 0x98AE,
-	27128 - 11905: 0x98AF,
-	27129 - 11905: 0x98B0,
-	27130 - 11905: 0x98B1,
-	27131 - 11905: 0x98B2,
-	27132 - 11905: 0x98B3,
-	27133 - 11905: 0xB2DB,
-	27134 - 11905: 0x98B4,
-	27135 - 11905: 0xE9C8,
-	27136 - 11905: 0x98B5,
-	27137 - 11905: 0x98B6,
-	27138 - 11905: 0x98B7,
-	27139 - 11905: 0x98B8,
-	27140 - 11905: 0x98B9,
-	27141 - 11905: 0x98BA,
-	27142 - 11905: 0x98BB,
-	27143 - 11905: 0x98BC,
-	27144 - 11905: 0x98BD,
-	27145 - 11905: 0x98BE,
-	27146 - 11905: 0xB7AE,
-	27147 - 11905: 0x98BF,
-	27148 - 11905: 0x98C0,
-	27149 - 11905: 0x98C1,
-	27150 - 11905: 0x98C2,
-	27151 - 11905: 0x98C3,
-	27152 - 11905: 0x98C4,
-	27153 - 11905: 0x98C5,
-	27154 - 11905: 0x98C6,
-	27155 - 11905: 0x98C7,
-	27156 - 11905: 0x98C8,
-	27157 - 11905: 0x98C9,
-	27158 - 11905: 0x98CA,
-	27159 - 11905: 0xE9CB,
-	27160 - 11905: 0xE9CC,
-	27161 - 11905: 0x98CB,
-	27162 - 11905: 0x98CC,
-	27163 - 11905: 0x98CD,
-	27164 - 11905: 0x98CE,
-	27165 - 11905: 0x98CF,
-	27166 - 11905: 0x98D0,
-	27167 - 11905: 0xD5C1,
-	27168 - 11905: 0x98D1,
-	27169 - 11905: 0xC4A3,
-	27170 - 11905: 0x98D2,
-	27171 - 11905: 0x98D3,
-	27172 - 11905: 0x98D4,
-	27173 - 11905: 0x98D5,
-	27174 - 11905: 0x98D6,
-	27175 - 11905: 0x98D7,
-	27176 - 11905: 0xE9D8,
-	27177 - 11905: 0x98D8,
-	27178 - 11905: 0xBAE1,
-	27179 - 11905: 0x98D9,
-	27180 - 11905: 0x98DA,
-	27181 - 11905: 0x98DB,
-	27182 - 11905: 0x98DC,
-	27183 - 11905: 0xE9C9,
-	27184 - 11905: 0x98DD,
-	27185 - 11905: 0xD3A3,
-	27186 - 11905: 0x98DE,
-	27187 - 11905: 0x98DF,
-	27188 - 11905: 0x98E0,
-	27189 - 11905: 0xE9D4,
-	27190 - 11905: 0x98E1,
-	27191 - 11905: 0x98E2,
-	27192 - 11905: 0x98E3,
-	27193 - 11905: 0x98E4,
-	27194 - 11905: 0x98E5,
-	27195 - 11905: 0x98E6,
-	27196 - 11905: 0x98E7,
-	27197 - 11905: 0xE9D7,
-	27198 - 11905: 0xE9D0,
-	27199 - 11905: 0x98E8,
-	27200 - 11905: 0x98E9,
-	27201 - 11905: 0x98EA,
-	27202 - 11905: 0x98EB,
-	27203 - 11905: 0x98EC,
-	27204 - 11905: 0xE9CF,
-	27205 - 11905: 0x98ED,
-	27206 - 11905: 0x98EE,
-	27207 - 11905: 0xC7C1,
-	27208 - 11905: 0x98EF,
-	27209 - 11905: 0x98F0,
-	27210 - 11905: 0x98F1,
-	27211 - 11905: 0x98F2,
-	27212 - 11905: 0x98F3,
-	27213 - 11905: 0x98F4,
-	27214 - 11905: 0x98F5,
-	27215 - 11905: 0x98F6,
-	27216 - 11905: 0xE9D2,
-	27217 - 11905: 0x98F7,
-	27218 - 11905: 0x98F8,
-	27219 - 11905: 0x98F9,
-	27220 - 11905: 0x98FA,
-	27221 - 11905: 0x98FB,
-	27222 - 11905: 0x98FC,
-	27223 - 11905: 0x98FD,
-	27224 - 11905: 0xE9D9,
-	27225 - 11905: 0xB3C8,
-	27226 - 11905: 0x98FE,
-	27227 - 11905: 0xE9D3,
-	27228 - 11905: 0x9940,
-	27229 - 11905: 0x9941,
-	27230 - 11905: 0x9942,
-	27231 - 11905: 0x9943,
-	27232 - 11905: 0x9944,
-	27233 - 11905: 0xCFF0,
-	27234 - 11905: 0x9945,
-	27235 - 11905: 0x9946,
-	27236 - 11905: 0x9947,
-	27237 - 11905: 0xE9CD,
-	27238 - 11905: 0x9948,
-	27239 - 11905: 0x9949,
-	27240 - 11905: 0x994A,
-	27241 - 11905: 0x994B,
-	27242 - 11905: 0x994C,
-	27243 - 11905: 0x994D,
-	27244 - 11905: 0x994E,
-	27245 - 11905: 0x994F,
-	27246 - 11905: 0x9950,
-	27247 - 11905: 0x9951,
-	27248 - 11905: 0x9952,
-	27249 - 11905: 0xB3F7,
-	27250 - 11905: 0x9953,
-	27251 - 11905: 0x9954,
-	27252 - 11905: 0x9955,
-	27253 - 11905: 0x9956,
-	27254 - 11905: 0x9957,
-	27255 - 11905: 0x9958,
-	27256 - 11905: 0x9959,
-	27257 - 11905: 0xE9D6,
-	27258 - 11905: 0x995A,
-	27259 - 11905: 0x995B,
-	27260 - 11905: 0xE9DA,
-	27261 - 11905: 0x995C,
-	27262 - 11905: 0x995D,
-	27263 - 11905: 0x995E,
-	27264 - 11905: 0xCCB4,
-	27265 - 11905: 0x995F,
-	27266 - 11905: 0x9960,
-	27267 - 11905: 0x9961,
-	27268 - 11905: 0xCFAD,
-	27269 - 11905: 0x9962,
-	27270 - 11905: 0x9963,
-	27271 - 11905: 0x9964,
-	27272 - 11905: 0x9965,
-	27273 - 11905: 0x9966,
-	27274 - 11905: 0x9967,
-	27275 - 11905: 0x9968,
-	27276 - 11905: 0x9969,
-	27277 - 11905: 0x996A,
-	27278 - 11905: 0xE9D5,
-	27279 - 11905: 0x996B,
-	27280 - 11905: 0xE9DC,
-	27281 - 11905: 0xE9DB,
-	27282 - 11905: 0x996C,
-	27283 - 11905: 0x996D,
-	27284 - 11905: 0x996E,
-	27285 - 11905: 0x996F,
-	27286 - 11905: 0x9970,
-	27287 - 11905: 0xE9DE,
-	27288 - 11905: 0x9971,
-	27289 - 11905: 0x9972,
-	27290 - 11905: 0x9973,
-	27291 - 11905: 0x9974,
-	27292 - 11905: 0x9975,
-	27293 - 11905: 0x9976,
-	27294 - 11905: 0x9977,
-	27295 - 11905: 0x9978,
-	27296 - 11905: 0xE9D1,
-	27297 - 11905: 0x9979,
-	27298 - 11905: 0x997A,
-	27299 - 11905: 0x997B,
-	27300 - 11905: 0x997C,
-	27301 - 11905: 0x997D,
-	27302 - 11905: 0x997E,
-	27303 - 11905: 0x9980,
-	27304 - 11905: 0x9981,
-	27305 - 11905: 0xE9DD,
-	27306 - 11905: 0x9982,
-	27307 - 11905: 0xE9DF,
-	27308 - 11905: 0xC3CA,
-	27309 - 11905: 0x9983,
-	27310 - 11905: 0x9984,
-	27311 - 11905: 0x9985,
-	27312 - 11905: 0x9986,
-	27313 - 11905: 0x9987,
-	27314 - 11905: 0x9988,
-	27315 - 11905: 0x9989,
-	27316 - 11905: 0x998A,
-	27317 - 11905: 0x998B,
-	27318 - 11905: 0x998C,
-	27319 - 11905: 0x998D,
-	27320 - 11905: 0x998E,
-	27321 - 11905: 0x998F,
-	27322 - 11905: 0x9990,
-	27323 - 11905: 0x9991,
-	27324 - 11905: 0x9992,
-	27325 - 11905: 0x9993,
-	27326 - 11905: 0x9994,
-	27327 - 11905: 0x9995,
-	27328 - 11905: 0x9996,
-	27329 - 11905: 0x9997,
-	27330 - 11905: 0x9998,
-	27331 - 11905: 0x9999,
-	27332 - 11905: 0x999A,
-	27333 - 11905: 0x999B,
-	27334 - 11905: 0x999C,
-	27335 - 11905: 0x999D,
-	27336 - 11905: 0x999E,
-	27337 - 11905: 0x999F,
-	27338 - 11905: 0x99A0,
-	27339 - 11905: 0x99A1,
-	27340 - 11905: 0x99A2,
-	27341 - 11905: 0x99A3,
-	27342 - 11905: 0x99A4,
-	27343 - 11905: 0x99A5,
-	27344 - 11905: 0x99A6,
-	27345 - 11905: 0x99A7,
-	27346 - 11905: 0x99A8,
-	27347 - 11905: 0x99A9,
-	27348 - 11905: 0x99AA,
-	27349 - 11905: 0x99AB,
-	27350 - 11905: 0x99AC,
-	27351 - 11905: 0x99AD,
-	27352 - 11905: 0x99AE,
-	27353 - 11905: 0x99AF,
-	27354 - 11905: 0x99B0,
-	27355 - 11905: 0x99B1,
-	27356 - 11905: 0x99B2,
-	27357 - 11905: 0x99B3,
-	27358 - 11905: 0x99B4,
-	27359 - 11905: 0x99B5,
-	27360 - 11905: 0x99B6,
-	27361 - 11905: 0x99B7,
-	27362 - 11905: 0x99B8,
-	27363 - 11905: 0x99B9,
-	27364 - 11905: 0x99BA,
-	27365 - 11905: 0x99BB,
-	27366 - 11905: 0x99BC,
-	27367 - 11905: 0x99BD,
-	27368 - 11905: 0x99BE,
-	27369 - 11905: 0x99BF,
-	27370 - 11905: 0x99C0,
-	27371 - 11905: 0x99C1,
-	27372 - 11905: 0x99C2,
-	27373 - 11905: 0x99C3,
-	27374 - 11905: 0x99C4,
-	27375 - 11905: 0x99C5,
-	27376 - 11905: 0x99C6,
-	27377 - 11905: 0x99C7,
-	27378 - 11905: 0x99C8,
-	27379 - 11905: 0x99C9,
-	27380 - 11905: 0x99CA,
-	27381 - 11905: 0x99CB,
-	27382 - 11905: 0x99CC,
-	27383 - 11905: 0x99CD,
-	27384 - 11905: 0x99CE,
-	27385 - 11905: 0x99CF,
-	27386 - 11905: 0x99D0,
-	27387 - 11905: 0x99D1,
-	27388 - 11905: 0x99D2,
-	27389 - 11905: 0x99D3,
-	27390 - 11905: 0x99D4,
-	27391 - 11905: 0x99D5,
-	27392 - 11905: 0x99D6,
-	27393 - 11905: 0x99D7,
-	27394 - 11905: 0x99D8,
-	27395 - 11905: 0x99D9,
-	27396 - 11905: 0x99DA,
-	27397 - 11905: 0x99DB,
-	27398 - 11905: 0x99DC,
-	27399 - 11905: 0x99DD,
-	27400 - 11905: 0x99DE,
-	27401 - 11905: 0x99DF,
-	27402 - 11905: 0x99E0,
-	27403 - 11905: 0x99E1,
-	27404 - 11905: 0x99E2,
-	27405 - 11905: 0x99E3,
-	27406 - 11905: 0x99E4,
-	27407 - 11905: 0x99E5,
-	27408 - 11905: 0x99E6,
-	27409 - 11905: 0x99E7,
-	27410 - 11905: 0x99E8,
-	27411 - 11905: 0x99E9,
-	27412 - 11905: 0x99EA,
-	27413 - 11905: 0x99EB,
-	27414 - 11905: 0x99EC,
-	27415 - 11905: 0x99ED,
-	27416 - 11905: 0x99EE,
-	27417 - 11905: 0x99EF,
-	27418 - 11905: 0x99F0,
-	27419 - 11905: 0x99F1,
-	27420 - 11905: 0x99F2,
-	27421 - 11905: 0x99F3,
-	27422 - 11905: 0x99F4,
-	27423 - 11905: 0x99F5,
-	27424 - 11905: 0xC7B7,
-	27425 - 11905: 0xB4CE,
-	27426 - 11905: 0xBBB6,
-	27427 - 11905: 0xD0C0,
-	27428 - 11905: 0xECA3,
-	27429 - 11905: 0x99F6,
-	27430 - 11905: 0x99F7,
-	27431 - 11905: 0xC5B7,
-	27432 - 11905: 0x99F8,
-	27433 - 11905: 0x99F9,
-	27434 - 11905: 0x99FA,
-	27435 - 11905: 0x99FB,
-	27436 - 11905: 0x99FC,
-	27437 - 11905: 0x99FD,
-	27438 - 11905: 0x99FE,
-	27439 - 11905: 0x9A40,
-	27440 - 11905: 0x9A41,
-	27441 - 11905: 0x9A42,
-	27442 - 11905: 0xD3FB,
-	27443 - 11905: 0x9A43,
-	27444 - 11905: 0x9A44,
-	27445 - 11905: 0x9A45,
-	27446 - 11905: 0x9A46,
-	27447 - 11905: 0xECA4,
-	27448 - 11905: 0x9A47,
-	27449 - 11905: 0xECA5,
-	27450 - 11905: 0xC6DB,
-	27451 - 11905: 0x9A48,
-	27452 - 11905: 0x9A49,
-	27453 - 11905: 0x9A4A,
-	27454 - 11905: 0xBFEE,
-	27455 - 11905: 0x9A4B,
-	27456 - 11905: 0x9A4C,
-	27457 - 11905: 0x9A4D,
-	27458 - 11905: 0x9A4E,
-	27459 - 11905: 0xECA6,
-	27460 - 11905: 0x9A4F,
-	27461 - 11905: 0x9A50,
-	27462 - 11905: 0xECA7,
-	27463 - 11905: 0xD0AA,
-	27464 - 11905: 0x9A51,
-	27465 - 11905: 0xC7B8,
-	27466 - 11905: 0x9A52,
-	27467 - 11905: 0x9A53,
-	27468 - 11905: 0xB8E8,
-	27469 - 11905: 0x9A54,
-	27470 - 11905: 0x9A55,
-	27471 - 11905: 0x9A56,
-	27472 - 11905: 0x9A57,
-	27473 - 11905: 0x9A58,
-	27474 - 11905: 0x9A59,
-	27475 - 11905: 0x9A5A,
-	27476 - 11905: 0x9A5B,
-	27477 - 11905: 0x9A5C,
-	27478 - 11905: 0x9A5D,
-	27479 - 11905: 0x9A5E,
-	27480 - 11905: 0x9A5F,
-	27481 - 11905: 0xECA8,
-	27482 - 11905: 0x9A60,
-	27483 - 11905: 0x9A61,
-	27484 - 11905: 0x9A62,
-	27485 - 11905: 0x9A63,
-	27486 - 11905: 0x9A64,
-	27487 - 11905: 0x9A65,
-	27488 - 11905: 0x9A66,
-	27489 - 11905: 0x9A67,
-	27490 - 11905: 0xD6B9,
-	27491 - 11905: 0xD5FD,
-	27492 - 11905: 0xB4CB,
-	27493 - 11905: 0xB2BD,
-	27494 - 11905: 0xCEE4,
-	27495 - 11905: 0xC6E7,
-	27496 - 11905: 0x9A68,
-	27497 - 11905: 0x9A69,
-	27498 - 11905: 0xCDE1,
-	27499 - 11905: 0x9A6A,
-	27500 - 11905: 0x9A6B,
-	27501 - 11905: 0x9A6C,
-	27502 - 11905: 0x9A6D,
-	27503 - 11905: 0x9A6E,
-	27504 - 11905: 0x9A6F,
-	27505 - 11905: 0x9A70,
-	27506 - 11905: 0x9A71,
-	27507 - 11905: 0x9A72,
-	27508 - 11905: 0x9A73,
-	27509 - 11905: 0x9A74,
-	27510 - 11905: 0x9A75,
-	27511 - 11905: 0x9A76,
-	27512 - 11905: 0x9A77,
-	27513 - 11905: 0xB4F5,
-	27514 - 11905: 0x9A78,
-	27515 - 11905: 0xCBC0,
-	27516 - 11905: 0xBCDF,
-	27517 - 11905: 0x9A79,
-	27518 - 11905: 0x9A7A,
-	27519 - 11905: 0x9A7B,
-	27520 - 11905: 0x9A7C,
-	27521 - 11905: 0xE9E2,
-	27522 - 11905: 0xE9E3,
-	27523 - 11905: 0xD1EA,
-	27524 - 11905: 0xE9E5,
-	27525 - 11905: 0x9A7D,
-	27526 - 11905: 0xB4F9,
-	27527 - 11905: 0xE9E4,
-	27528 - 11905: 0x9A7E,
-	27529 - 11905: 0xD1B3,
-	27530 - 11905: 0xCAE2,
-	27531 - 11905: 0xB2D0,
-	27532 - 11905: 0x9A80,
-	27533 - 11905: 0xE9E8,
-	27534 - 11905: 0x9A81,
-	27535 - 11905: 0x9A82,
-	27536 - 11905: 0x9A83,
-	27537 - 11905: 0x9A84,
-	27538 - 11905: 0xE9E6,
-	27539 - 11905: 0xE9E7,
-	27540 - 11905: 0x9A85,
-	27541 - 11905: 0x9A86,
-	27542 - 11905: 0xD6B3,
-	27543 - 11905: 0x9A87,
-	27544 - 11905: 0x9A88,
-	27545 - 11905: 0x9A89,
-	27546 - 11905: 0xE9E9,
-	27547 - 11905: 0xE9EA,
-	27548 - 11905: 0x9A8A,
-	27549 - 11905: 0x9A8B,
-	27550 - 11905: 0x9A8C,
-	27551 - 11905: 0x9A8D,
-	27552 - 11905: 0x9A8E,
-	27553 - 11905: 0xE9EB,
-	27554 - 11905: 0x9A8F,
-	27555 - 11905: 0x9A90,
-	27556 - 11905: 0x9A91,
-	27557 - 11905: 0x9A92,
-	27558 - 11905: 0x9A93,
-	27559 - 11905: 0x9A94,
-	27560 - 11905: 0x9A95,
-	27561 - 11905: 0x9A96,
-	27562 - 11905: 0xE9EC,
-	27563 - 11905: 0x9A97,
-	27564 - 11905: 0x9A98,
-	27565 - 11905: 0x9A99,
-	27566 - 11905: 0x9A9A,
-	27567 - 11905: 0x9A9B,
-	27568 - 11905: 0x9A9C,
-	27569 - 11905: 0x9A9D,
-	27570 - 11905: 0x9A9E,
-	27571 - 11905: 0xECAF,
-	27572 - 11905: 0xC5B9,
-	27573 - 11905: 0xB6CE,
-	27574 - 11905: 0x9A9F,
-	27575 - 11905: 0xD2F3,
-	27576 - 11905: 0x9AA0,
-	27577 - 11905: 0x9AA1,
-	27578 - 11905: 0x9AA2,
-	27579 - 11905: 0x9AA3,
-	27580 - 11905: 0x9AA4,
-	27581 - 11905: 0x9AA5,
-	27582 - 11905: 0x9AA6,
-	27583 - 11905: 0xB5EE,
-	27584 - 11905: 0x9AA7,
-	27585 - 11905: 0xBBD9,
-	27586 - 11905: 0xECB1,
-	27587 - 11905: 0x9AA8,
-	27588 - 11905: 0x9AA9,
-	27589 - 11905: 0xD2E3,
-	27590 - 11905: 0x9AAA,
-	27591 - 11905: 0x9AAB,
-	27592 - 11905: 0x9AAC,
-	27593 - 11905: 0x9AAD,
-	27594 - 11905: 0x9AAE,
-	27595 - 11905: 0xCEE3,
-	27596 - 11905: 0x9AAF,
-	27597 - 11905: 0xC4B8,
-	27598 - 11905: 0x9AB0,
-	27599 - 11905: 0xC3BF,
-	27600 - 11905: 0x9AB1,
-	27601 - 11905: 0x9AB2,
-	27602 - 11905: 0xB6BE,
-	27603 - 11905: 0xD8B9,
-	27604 - 11905: 0xB1C8,
-	27605 - 11905: 0xB1CF,
-	27606 - 11905: 0xB1D1,
-	27607 - 11905: 0xC5FE,
-	27608 - 11905: 0x9AB3,
-	27609 - 11905: 0xB1D0,
-	27610 - 11905: 0x9AB4,
-	27611 - 11905: 0xC3AB,
-	27612 - 11905: 0x9AB5,
-	27613 - 11905: 0x9AB6,
-	27614 - 11905: 0x9AB7,
-	27615 - 11905: 0x9AB8,
-	27616 - 11905: 0x9AB9,
-	27617 - 11905: 0xD5B1,
-	27618 - 11905: 0x9ABA,
-	27619 - 11905: 0x9ABB,
-	27620 - 11905: 0x9ABC,
-	27621 - 11905: 0x9ABD,
-	27622 - 11905: 0x9ABE,
-	27623 - 11905: 0x9ABF,
-	27624 - 11905: 0x9AC0,
-	27625 - 11905: 0x9AC1,
-	27626 - 11905: 0xEBA4,
-	27627 - 11905: 0xBAC1,
-	27628 - 11905: 0x9AC2,
-	27629 - 11905: 0x9AC3,
-	27630 - 11905: 0x9AC4,
-	27631 - 11905: 0xCCBA,
-	27632 - 11905: 0x9AC5,
-	27633 - 11905: 0x9AC6,
-	27634 - 11905: 0x9AC7,
-	27635 - 11905: 0xEBA5,
-	27636 - 11905: 0x9AC8,
-	27637 - 11905: 0xEBA7,
-	27638 - 11905: 0x9AC9,
-	27639 - 11905: 0x9ACA,
-	27640 - 11905: 0x9ACB,
-	27641 - 11905: 0xEBA8,
-	27642 - 11905: 0x9ACC,
-	27643 - 11905: 0x9ACD,
-	27644 - 11905: 0x9ACE,
-	27645 - 11905: 0xEBA6,
-	27646 - 11905: 0x9ACF,
-	27647 - 11905: 0x9AD0,
-	27648 - 11905: 0x9AD1,
-	27649 - 11905: 0x9AD2,
-	27650 - 11905: 0x9AD3,
-	27651 - 11905: 0x9AD4,
-	27652 - 11905: 0x9AD5,
-	27653 - 11905: 0xEBA9,
-	27654 - 11905: 0xEBAB,
-	27655 - 11905: 0xEBAA,
-	27656 - 11905: 0x9AD6,
-	27657 - 11905: 0x9AD7,
-	27658 - 11905: 0x9AD8,
-	27659 - 11905: 0x9AD9,
-	27660 - 11905: 0x9ADA,
-	27661 - 11905: 0xEBAC,
-	27662 - 11905: 0x9ADB,
-	27663 - 11905: 0xCACF,
-	27664 - 11905: 0xD8B5,
-	27665 - 11905: 0xC3F1,
-	27666 - 11905: 0x9ADC,
-	27667 - 11905: 0xC3A5,
-	27668 - 11905: 0xC6F8,
-	27669 - 11905: 0xEBAD,
-	27670 - 11905: 0xC4CA,
-	27671 - 11905: 0x9ADD,
-	27672 - 11905: 0xEBAE,
-	27673 - 11905: 0xEBAF,
-	27674 - 11905: 0xEBB0,
-	27675 - 11905: 0xB7D5,
-	27676 - 11905: 0x9ADE,
-	27677 - 11905: 0x9ADF,
-	27678 - 11905: 0x9AE0,
-	27679 - 11905: 0xB7FA,
-	27680 - 11905: 0x9AE1,
-	27681 - 11905: 0xEBB1,
-	27682 - 11905: 0xC7E2,
-	27683 - 11905: 0x9AE2,
-	27684 - 11905: 0xEBB3,
-	27685 - 11905: 0x9AE3,
-	27686 - 11905: 0xBAA4,
-	27687 - 11905: 0xD1F5,
-	27688 - 11905: 0xB0B1,
-	27689 - 11905: 0xEBB2,
-	27690 - 11905: 0xEBB4,
-	27691 - 11905: 0x9AE4,
-	27692 - 11905: 0x9AE5,
-	27693 - 11905: 0x9AE6,
-	27694 - 11905: 0xB5AA,
-	27695 - 11905: 0xC2C8,
-	27696 - 11905: 0xC7E8,
-	27697 - 11905: 0x9AE7,
-	27698 - 11905: 0xEBB5,
-	27699 - 11905: 0x9AE8,
-	27700 - 11905: 0xCBAE,
-	27701 - 11905: 0xE3DF,
-	27702 - 11905: 0x9AE9,
-	27703 - 11905: 0x9AEA,
-	27704 - 11905: 0xD3C0,
-	27705 - 11905: 0x9AEB,
-	27706 - 11905: 0x9AEC,
-	27707 - 11905: 0x9AED,
-	27708 - 11905: 0x9AEE,
-	27709 - 11905: 0xD9DB,
-	27710 - 11905: 0x9AEF,
-	27711 - 11905: 0x9AF0,
-	27712 - 11905: 0xCDA1,
-	27713 - 11905: 0xD6AD,
-	27714 - 11905: 0xC7F3,
-	27715 - 11905: 0x9AF1,
-	27716 - 11905: 0x9AF2,
-	27717 - 11905: 0x9AF3,
-	27718 - 11905: 0xD9E0,
-	27719 - 11905: 0xBBE3,
-	27720 - 11905: 0x9AF4,
-	27721 - 11905: 0xBABA,
-	27722 - 11905: 0xE3E2,
-	27723 - 11905: 0x9AF5,
-	27724 - 11905: 0x9AF6,
-	27725 - 11905: 0x9AF7,
-	27726 - 11905: 0x9AF8,
-	27727 - 11905: 0x9AF9,
-	27728 - 11905: 0xCFAB,
-	27729 - 11905: 0x9AFA,
-	27730 - 11905: 0x9AFB,
-	27731 - 11905: 0x9AFC,
-	27732 - 11905: 0xE3E0,
-	27733 - 11905: 0xC9C7,
-	27734 - 11905: 0x9AFD,
-	27735 - 11905: 0xBAB9,
-	27736 - 11905: 0x9AFE,
-	27737 - 11905: 0x9B40,
-	27738 - 11905: 0x9B41,
-	27739 - 11905: 0xD1B4,
-	27740 - 11905: 0xE3E1,
-	27741 - 11905: 0xC8EA,
-	27742 - 11905: 0xB9AF,
-	27743 - 11905: 0xBDAD,
-	27744 - 11905: 0xB3D8,
-	27745 - 11905: 0xCEDB,
-	27746 - 11905: 0x9B42,
-	27747 - 11905: 0x9B43,
-	27748 - 11905: 0xCCC0,
-	27749 - 11905: 0x9B44,
-	27750 - 11905: 0x9B45,
-	27751 - 11905: 0x9B46,
-	27752 - 11905: 0xE3E8,
-	27753 - 11905: 0xE3E9,
-	27754 - 11905: 0xCDF4,
-	27755 - 11905: 0x9B47,
-	27756 - 11905: 0x9B48,
-	27757 - 11905: 0x9B49,
-	27758 - 11905: 0x9B4A,
-	27759 - 11905: 0x9B4B,
-	27760 - 11905: 0xCCAD,
-	27761 - 11905: 0x9B4C,
-	27762 - 11905: 0xBCB3,
-	27763 - 11905: 0x9B4D,
-	27764 - 11905: 0xE3EA,
-	27765 - 11905: 0x9B4E,
-	27766 - 11905: 0xE3EB,
-	27767 - 11905: 0x9B4F,
-	27768 - 11905: 0x9B50,
-	27769 - 11905: 0xD0DA,
-	27770 - 11905: 0x9B51,
-	27771 - 11905: 0x9B52,
-	27772 - 11905: 0x9B53,
-	27773 - 11905: 0xC6FB,
-	27774 - 11905: 0xB7DA,
-	27775 - 11905: 0x9B54,
-	27776 - 11905: 0x9B55,
-	27777 - 11905: 0xC7DF,
-	27778 - 11905: 0xD2CA,
-	27779 - 11905: 0xCED6,
-	27780 - 11905: 0x9B56,
-	27781 - 11905: 0xE3E4,
-	27782 - 11905: 0xE3EC,
-	27783 - 11905: 0x9B57,
-	27784 - 11905: 0xC9F2,
-	27785 - 11905: 0xB3C1,
-	27786 - 11905: 0x9B58,
-	27787 - 11905: 0x9B59,
-	27788 - 11905: 0xE3E7,
-	27789 - 11905: 0x9B5A,
-	27790 - 11905: 0x9B5B,
-	27791 - 11905: 0xC6E3,
-	27792 - 11905: 0xE3E5,
-	27793 - 11905: 0x9B5C,
-	27794 - 11905: 0x9B5D,
-	27795 - 11905: 0xEDB3,
-	27796 - 11905: 0xE3E6,
-	27797 - 11905: 0x9B5E,
-	27798 - 11905: 0x9B5F,
-	27799 - 11905: 0x9B60,
-	27800 - 11905: 0x9B61,
-	27801 - 11905: 0xC9B3,
-	27802 - 11905: 0x9B62,
-	27803 - 11905: 0xC5E6,
-	27804 - 11905: 0x9B63,
-	27805 - 11905: 0x9B64,
-	27806 - 11905: 0x9B65,
-	27807 - 11905: 0xB9B5,
-	27808 - 11905: 0x9B66,
-	27809 - 11905: 0xC3BB,
-	27810 - 11905: 0x9B67,
-	27811 - 11905: 0xE3E3,
-	27812 - 11905: 0xC5BD,
-	27813 - 11905: 0xC1A4,
-	27814 - 11905: 0xC2D9,
-	27815 - 11905: 0xB2D7,
-	27816 - 11905: 0x9B68,
-	27817 - 11905: 0xE3ED,
-	27818 - 11905: 0xBBA6,
-	27819 - 11905: 0xC4AD,
-	27820 - 11905: 0x9B69,
-	27821 - 11905: 0xE3F0,
-	27822 - 11905: 0xBEDA,
-	27823 - 11905: 0x9B6A,
-	27824 - 11905: 0x9B6B,
-	27825 - 11905: 0xE3FB,
-	27826 - 11905: 0xE3F5,
-	27827 - 11905: 0xBAD3,
-	27828 - 11905: 0x9B6C,
-	27829 - 11905: 0x9B6D,
-	27830 - 11905: 0x9B6E,
-	27831 - 11905: 0x9B6F,
-	27832 - 11905: 0xB7D0,
-	27833 - 11905: 0xD3CD,
-	27834 - 11905: 0x9B70,
-	27835 - 11905: 0xD6CE,
-	27836 - 11905: 0xD5D3,
-	27837 - 11905: 0xB9C1,
-	27838 - 11905: 0xD5B4,
-	27839 - 11905: 0xD1D8,
-	27840 - 11905: 0x9B71,
-	27841 - 11905: 0x9B72,
-	27842 - 11905: 0x9B73,
-	27843 - 11905: 0x9B74,
-	27844 - 11905: 0xD0B9,
-	27845 - 11905: 0xC7F6,
-	27846 - 11905: 0x9B75,
-	27847 - 11905: 0x9B76,
-	27848 - 11905: 0x9B77,
-	27849 - 11905: 0xC8AA,
-	27850 - 11905: 0xB2B4,
-	27851 - 11905: 0x9B78,
-	27852 - 11905: 0xC3DA,
-	27853 - 11905: 0x9B79,
-	27854 - 11905: 0x9B7A,
-	27855 - 11905: 0x9B7B,
-	27856 - 11905: 0xE3EE,
-	27857 - 11905: 0x9B7C,
-	27858 - 11905: 0x9B7D,
-	27859 - 11905: 0xE3FC,
-	27860 - 11905: 0xE3EF,
-	27861 - 11905: 0xB7A8,
-	27862 - 11905: 0xE3F7,
-	27863 - 11905: 0xE3F4,
-	27864 - 11905: 0x9B7E,
-	27865 - 11905: 0x9B80,
-	27866 - 11905: 0x9B81,
-	27867 - 11905: 0xB7BA,
-	27868 - 11905: 0x9B82,
-	27869 - 11905: 0x9B83,
-	27870 - 11905: 0xC5A2,
-	27871 - 11905: 0x9B84,
-	27872 - 11905: 0xE3F6,
-	27873 - 11905: 0xC5DD,
-	27874 - 11905: 0xB2A8,
-	27875 - 11905: 0xC6FC,
-	27876 - 11905: 0x9B85,
-	27877 - 11905: 0xC4E0,
-	27878 - 11905: 0x9B86,
-	27879 - 11905: 0x9B87,
-	27880 - 11905: 0xD7A2,
-	27881 - 11905: 0x9B88,
-	27882 - 11905: 0xC0E1,
-	27883 - 11905: 0xE3F9,
-	27884 - 11905: 0x9B89,
-	27885 - 11905: 0x9B8A,
-	27886 - 11905: 0xE3FA,
-	27887 - 11905: 0xE3FD,
-	27888 - 11905: 0xCCA9,
-	27889 - 11905: 0xE3F3,
-	27890 - 11905: 0x9B8B,
-	27891 - 11905: 0xD3BE,
-	27892 - 11905: 0x9B8C,
-	27893 - 11905: 0xB1C3,
-	27894 - 11905: 0xEDB4,
-	27895 - 11905: 0xE3F1,
-	27896 - 11905: 0xE3F2,
-	27897 - 11905: 0x9B8D,
-	27898 - 11905: 0xE3F8,
-	27899 - 11905: 0xD0BA,
-	27900 - 11905: 0xC6C3,
-	27901 - 11905: 0xD4F3,
-	27902 - 11905: 0xE3FE,
-	27903 - 11905: 0x9B8E,
-	27904 - 11905: 0x9B8F,
-	27905 - 11905: 0xBDE0,
-	27906 - 11905: 0x9B90,
-	27907 - 11905: 0x9B91,
-	27908 - 11905: 0xE4A7,
-	27909 - 11905: 0x9B92,
-	27910 - 11905: 0x9B93,
-	27911 - 11905: 0xE4A6,
-	27912 - 11905: 0x9B94,
-	27913 - 11905: 0x9B95,
-	27914 - 11905: 0x9B96,
-	27915 - 11905: 0xD1F3,
-	27916 - 11905: 0xE4A3,
-	27917 - 11905: 0x9B97,
-	27918 - 11905: 0xE4A9,
-	27919 - 11905: 0x9B98,
-	27920 - 11905: 0x9B99,
-	27921 - 11905: 0x9B9A,
-	27922 - 11905: 0xC8F7,
-	27923 - 11905: 0x9B9B,
-	27924 - 11905: 0x9B9C,
-	27925 - 11905: 0x9B9D,
-	27926 - 11905: 0x9B9E,
-	27927 - 11905: 0xCFB4,
-	27928 - 11905: 0x9B9F,
-	27929 - 11905: 0xE4A8,
-	27930 - 11905: 0xE4AE,
-	27931 - 11905: 0xC2E5,
-	27932 - 11905: 0x9BA0,
-	27933 - 11905: 0x9BA1,
-	27934 - 11905: 0xB6B4,
-	27935 - 11905: 0x9BA2,
-	27936 - 11905: 0x9BA3,
-	27937 - 11905: 0x9BA4,
-	27938 - 11905: 0x9BA5,
-	27939 - 11905: 0x9BA6,
-	27940 - 11905: 0x9BA7,
-	27941 - 11905: 0xBDF2,
-	27942 - 11905: 0x9BA8,
-	27943 - 11905: 0xE4A2,
-	27944 - 11905: 0x9BA9,
-	27945 - 11905: 0x9BAA,
-	27946 - 11905: 0xBAE9,
-	27947 - 11905: 0xE4AA,
-	27948 - 11905: 0x9BAB,
-	27949 - 11905: 0x9BAC,
-	27950 - 11905: 0xE4AC,
-	27951 - 11905: 0x9BAD,
-	27952 - 11905: 0x9BAE,
-	27953 - 11905: 0xB6FD,
-	27954 - 11905: 0xD6DE,
-	27955 - 11905: 0xE4B2,
-	27956 - 11905: 0x9BAF,
-	27957 - 11905: 0xE4AD,
-	27958 - 11905: 0x9BB0,
-	27959 - 11905: 0x9BB1,
-	27960 - 11905: 0x9BB2,
-	27961 - 11905: 0xE4A1,
-	27962 - 11905: 0x9BB3,
-	27963 - 11905: 0xBBEE,
-	27964 - 11905: 0xCDDD,
-	27965 - 11905: 0xC7A2,
-	27966 - 11905: 0xC5C9,
-	27967 - 11905: 0x9BB4,
-	27968 - 11905: 0x9BB5,
-	27969 - 11905: 0xC1F7,
-	27970 - 11905: 0x9BB6,
-	27971 - 11905: 0xE4A4,
-	27972 - 11905: 0x9BB7,
-	27973 - 11905: 0xC7B3,
-	27974 - 11905: 0xBDAC,
-	27975 - 11905: 0xBDBD,
-	27976 - 11905: 0xE4A5,
-	27977 - 11905: 0x9BB8,
-	27978 - 11905: 0xD7C7,
-	27979 - 11905: 0xB2E2,
-	27980 - 11905: 0x9BB9,
-	27981 - 11905: 0xE4AB,
-	27982 - 11905: 0xBCC3,
-	27983 - 11905: 0xE4AF,
-	27984 - 11905: 0x9BBA,
-	27985 - 11905: 0xBBEB,
-	27986 - 11905: 0xE4B0,
-	27987 - 11905: 0xC5A8,
-	27988 - 11905: 0xE4B1,
-	27989 - 11905: 0x9BBB,
-	27990 - 11905: 0x9BBC,
-	27991 - 11905: 0x9BBD,
-	27992 - 11905: 0x9BBE,
-	27993 - 11905: 0xD5E3,
-	27994 - 11905: 0xBFA3,
-	27995 - 11905: 0x9BBF,
-	27996 - 11905: 0xE4BA,
-	27997 - 11905: 0x9BC0,
-	27998 - 11905: 0xE4B7,
-	27999 - 11905: 0x9BC1,
-	28000 - 11905: 0xE4BB,
-	28001 - 11905: 0x9BC2,
-	28002 - 11905: 0x9BC3,
-	28003 - 11905: 0xE4BD,
-	28004 - 11905: 0x9BC4,
-	28005 - 11905: 0x9BC5,
-	28006 - 11905: 0xC6D6,
-	28007 - 11905: 0x9BC6,
-	28008 - 11905: 0x9BC7,
-	28009 - 11905: 0xBAC6,
-	28010 - 11905: 0xC0CB,
-	28011 - 11905: 0x9BC8,
-	28012 - 11905: 0x9BC9,
-	28013 - 11905: 0x9BCA,
-	28014 - 11905: 0xB8A1,
-	28015 - 11905: 0xE4B4,
-	28016 - 11905: 0x9BCB,
-	28017 - 11905: 0x9BCC,
-	28018 - 11905: 0x9BCD,
-	28019 - 11905: 0x9BCE,
-	28020 - 11905: 0xD4A1,
-	28021 - 11905: 0x9BCF,
-	28022 - 11905: 0x9BD0,
-	28023 - 11905: 0xBAA3,
-	28024 - 11905: 0xBDFE,
-	28025 - 11905: 0x9BD1,
-	28026 - 11905: 0x9BD2,
-	28027 - 11905: 0x9BD3,
-	28028 - 11905: 0xE4BC,
-	28029 - 11905: 0x9BD4,
-	28030 - 11905: 0x9BD5,
-	28031 - 11905: 0x9BD6,
-	28032 - 11905: 0x9BD7,
-	28033 - 11905: 0x9BD8,
-	28034 - 11905: 0xCDBF,
-	28035 - 11905: 0x9BD9,
-	28036 - 11905: 0x9BDA,
-	28037 - 11905: 0xC4F9,
-	28038 - 11905: 0x9BDB,
-	28039 - 11905: 0x9BDC,
-	28040 - 11905: 0xCFFB,
-	28041 - 11905: 0xC9E6,
-	28042 - 11905: 0x9BDD,
-	28043 - 11905: 0x9BDE,
-	28044 - 11905: 0xD3BF,
-	28045 - 11905: 0x9BDF,
-	28046 - 11905: 0xCFD1,
-	28047 - 11905: 0x9BE0,
-	28048 - 11905: 0x9BE1,
-	28049 - 11905: 0xE4B3,
-	28050 - 11905: 0x9BE2,
-	28051 - 11905: 0xE4B8,
-	28052 - 11905: 0xE4B9,
-	28053 - 11905: 0xCCE9,
-	28054 - 11905: 0x9BE3,
-	28055 - 11905: 0x9BE4,
-	28056 - 11905: 0x9BE5,
-	28057 - 11905: 0x9BE6,
-	28058 - 11905: 0x9BE7,
-	28059 - 11905: 0xCCCE,
-	28060 - 11905: 0x9BE8,
-	28061 - 11905: 0xC0D4,
-	28062 - 11905: 0xE4B5,
-	28063 - 11905: 0xC1B0,
-	28064 - 11905: 0xE4B6,
-	28065 - 11905: 0xCED0,
-	28066 - 11905: 0x9BE9,
-	28067 - 11905: 0xBBC1,
-	28068 - 11905: 0xB5D3,
-	28069 - 11905: 0x9BEA,
-	28070 - 11905: 0xC8F3,
-	28071 - 11905: 0xBDA7,
-	28072 - 11905: 0xD5C7,
-	28073 - 11905: 0xC9AC,
-	28074 - 11905: 0xB8A2,
-	28075 - 11905: 0xE4CA,
-	28076 - 11905: 0x9BEB,
-	28077 - 11905: 0x9BEC,
-	28078 - 11905: 0xE4CC,
-	28079 - 11905: 0xD1C4,
-	28080 - 11905: 0x9BED,
-	28081 - 11905: 0x9BEE,
-	28082 - 11905: 0xD2BA,
-	28083 - 11905: 0x9BEF,
-	28084 - 11905: 0x9BF0,
-	28085 - 11905: 0xBAAD,
-	28086 - 11905: 0x9BF1,
-	28087 - 11905: 0x9BF2,
-	28088 - 11905: 0xBAD4,
-	28089 - 11905: 0x9BF3,
-	28090 - 11905: 0x9BF4,
-	28091 - 11905: 0x9BF5,
-	28092 - 11905: 0x9BF6,
-	28093 - 11905: 0x9BF7,
-	28094 - 11905: 0x9BF8,
-	28095 - 11905: 0xE4C3,
-	28096 - 11905: 0xB5ED,
-	28097 - 11905: 0x9BF9,
-	28098 - 11905: 0x9BFA,
-	28099 - 11905: 0x9BFB,
-	28100 - 11905: 0xD7CD,
-	28101 - 11905: 0xE4C0,
-	28102 - 11905: 0xCFFD,
-	28103 - 11905: 0xE4BF,
-	28104 - 11905: 0x9BFC,
-	28105 - 11905: 0x9BFD,
-	28106 - 11905: 0x9BFE,
-	28107 - 11905: 0xC1DC,
-	28108 - 11905: 0xCCCA,
-	28109 - 11905: 0x9C40,
-	28110 - 11905: 0x9C41,
-	28111 - 11905: 0x9C42,
-	28112 - 11905: 0x9C43,
-	28113 - 11905: 0xCAE7,
-	28114 - 11905: 0x9C44,
-	28115 - 11905: 0x9C45,
-	28116 - 11905: 0x9C46,
-	28117 - 11905: 0x9C47,
-	28118 - 11905: 0xC4D7,
-	28119 - 11905: 0x9C48,
-	28120 - 11905: 0xCCD4,
-	28121 - 11905: 0xE4C8,
-	28122 - 11905: 0x9C49,
-	28123 - 11905: 0x9C4A,
-	28124 - 11905: 0x9C4B,
-	28125 - 11905: 0xE4C7,
-	28126 - 11905: 0xE4C1,
-	28127 - 11905: 0x9C4C,
-	28128 - 11905: 0xE4C4,
-	28129 - 11905: 0xB5AD,
-	28130 - 11905: 0x9C4D,
-	28131 - 11905: 0x9C4E,
-	28132 - 11905: 0xD3D9,
-	28133 - 11905: 0x9C4F,
-	28134 - 11905: 0xE4C6,
-	28135 - 11905: 0x9C50,
-	28136 - 11905: 0x9C51,
-	28137 - 11905: 0x9C52,
-	28138 - 11905: 0x9C53,
-	28139 - 11905: 0xD2F9,
-	28140 - 11905: 0xB4E3,
-	28141 - 11905: 0x9C54,
-	28142 - 11905: 0xBBB4,
-	28143 - 11905: 0x9C55,
-	28144 - 11905: 0x9C56,
-	28145 - 11905: 0xC9EE,
-	28146 - 11905: 0x9C57,
-	28147 - 11905: 0xB4BE,
-	28148 - 11905: 0x9C58,
-	28149 - 11905: 0x9C59,
-	28150 - 11905: 0x9C5A,
-	28151 - 11905: 0xBBEC,
-	28152 - 11905: 0x9C5B,
-	28153 - 11905: 0xD1CD,
-	28154 - 11905: 0x9C5C,
-	28155 - 11905: 0xCCED,
-	28156 - 11905: 0xEDB5,
-	28157 - 11905: 0x9C5D,
-	28158 - 11905: 0x9C5E,
-	28159 - 11905: 0x9C5F,
-	28160 - 11905: 0x9C60,
-	28161 - 11905: 0x9C61,
-	28162 - 11905: 0x9C62,
-	28163 - 11905: 0x9C63,
-	28164 - 11905: 0x9C64,
-	28165 - 11905: 0xC7E5,
-	28166 - 11905: 0x9C65,
-	28167 - 11905: 0x9C66,
-	28168 - 11905: 0x9C67,
-	28169 - 11905: 0x9C68,
-	28170 - 11905: 0xD4A8,
-	28171 - 11905: 0x9C69,
-	28172 - 11905: 0xE4CB,
-	28173 - 11905: 0xD7D5,
-	28174 - 11905: 0xE4C2,
-	28175 - 11905: 0x9C6A,
-	28176 - 11905: 0xBDA5,
-	28177 - 11905: 0xE4C5,
-	28178 - 11905: 0x9C6B,
-	28179 - 11905: 0x9C6C,
-	28180 - 11905: 0xD3E6,
-	28181 - 11905: 0x9C6D,
-	28182 - 11905: 0xE4C9,
-	28183 - 11905: 0xC9F8,
-	28184 - 11905: 0x9C6E,
-	28185 - 11905: 0x9C6F,
-	28186 - 11905: 0xE4BE,
-	28187 - 11905: 0x9C70,
-	28188 - 11905: 0x9C71,
-	28189 - 11905: 0xD3E5,
-	28190 - 11905: 0x9C72,
-	28191 - 11905: 0x9C73,
-	28192 - 11905: 0xC7FE,
-	28193 - 11905: 0xB6C9,
-	28194 - 11905: 0x9C74,
-	28195 - 11905: 0xD4FC,
-	28196 - 11905: 0xB2B3,
-	28197 - 11905: 0xE4D7,
-	28198 - 11905: 0x9C75,
-	28199 - 11905: 0x9C76,
-	28200 - 11905: 0x9C77,
-	28201 - 11905: 0xCEC2,
-	28202 - 11905: 0x9C78,
-	28203 - 11905: 0xE4CD,
-	28204 - 11905: 0x9C79,
-	28205 - 11905: 0xCEBC,
-	28206 - 11905: 0x9C7A,
-	28207 - 11905: 0xB8DB,
-	28208 - 11905: 0x9C7B,
-	28209 - 11905: 0x9C7C,
-	28210 - 11905: 0xE4D6,
-	28211 - 11905: 0x9C7D,
-	28212 - 11905: 0xBFCA,
-	28213 - 11905: 0x9C7E,
-	28214 - 11905: 0x9C80,
-	28215 - 11905: 0x9C81,
-	28216 - 11905: 0xD3CE,
-	28217 - 11905: 0x9C82,
-	28218 - 11905: 0xC3EC,
-	28219 - 11905: 0x9C83,
-	28220 - 11905: 0x9C84,
-	28221 - 11905: 0x9C85,
-	28222 - 11905: 0x9C86,
-	28223 - 11905: 0x9C87,
-	28224 - 11905: 0x9C88,
-	28225 - 11905: 0x9C89,
-	28226 - 11905: 0x9C8A,
-	28227 - 11905: 0xC5C8,
-	28228 - 11905: 0xE4D8,
-	28229 - 11905: 0x9C8B,
-	28230 - 11905: 0x9C8C,
-	28231 - 11905: 0x9C8D,
-	28232 - 11905: 0x9C8E,
-	28233 - 11905: 0x9C8F,
-	28234 - 11905: 0x9C90,
-	28235 - 11905: 0x9C91,
-	28236 - 11905: 0x9C92,
-	28237 - 11905: 0xCDC4,
-	28238 - 11905: 0xE4CF,
-	28239 - 11905: 0x9C93,
-	28240 - 11905: 0x9C94,
-	28241 - 11905: 0x9C95,
-	28242 - 11905: 0x9C96,
-	28243 - 11905: 0xE4D4,
-	28244 - 11905: 0xE4D5,
-	28245 - 11905: 0x9C97,
-	28246 - 11905: 0xBAFE,
-	28247 - 11905: 0x9C98,
-	28248 - 11905: 0xCFE6,
-	28249 - 11905: 0x9C99,
-	28250 - 11905: 0x9C9A,
-	28251 - 11905: 0xD5BF,
-	28252 - 11905: 0x9C9B,
-	28253 - 11905: 0x9C9C,
-	28254 - 11905: 0x9C9D,
-	28255 - 11905: 0xE4D2,
-	28256 - 11905: 0x9C9E,
-	28257 - 11905: 0x9C9F,
-	28258 - 11905: 0x9CA0,
-	28259 - 11905: 0x9CA1,
-	28260 - 11905: 0x9CA2,
-	28261 - 11905: 0x9CA3,
-	28262 - 11905: 0x9CA4,
-	28263 - 11905: 0x9CA5,
-	28264 - 11905: 0x9CA6,
-	28265 - 11905: 0x9CA7,
-	28266 - 11905: 0x9CA8,
-	28267 - 11905: 0xE4D0,
-	28268 - 11905: 0x9CA9,
-	28269 - 11905: 0x9CAA,
-	28270 - 11905: 0xE4CE,
-	28271 - 11905: 0x9CAB,
-	28272 - 11905: 0x9CAC,
-	28273 - 11905: 0x9CAD,
-	28274 - 11905: 0x9CAE,
-	28275 - 11905: 0x9CAF,
-	28276 - 11905: 0x9CB0,
-	28277 - 11905: 0x9CB1,
-	28278 - 11905: 0x9CB2,
-	28279 - 11905: 0x9CB3,
-	28280 - 11905: 0x9CB4,
-	28281 - 11905: 0x9CB5,
-	28282 - 11905: 0x9CB6,
-	28283 - 11905: 0x9CB7,
-	28284 - 11905: 0x9CB8,
-	28285 - 11905: 0x9CB9,
-	28286 - 11905: 0xCDE5,
-	28287 - 11905: 0xCAAA,
-	28288 - 11905: 0x9CBA,
-	28289 - 11905: 0x9CBB,
-	28290 - 11905: 0x9CBC,
-	28291 - 11905: 0xC0A3,
-	28292 - 11905: 0x9CBD,
-	28293 - 11905: 0xBDA6,
-	28294 - 11905: 0xE4D3,
-	28295 - 11905: 0x9CBE,
-	28296 - 11905: 0x9CBF,
-	28297 - 11905: 0xB8C8,
-	28298 - 11905: 0x9CC0,
-	28299 - 11905: 0x9CC1,
-	28300 - 11905: 0x9CC2,
-	28301 - 11905: 0x9CC3,
-	28302 - 11905: 0x9CC4,
-	28303 - 11905: 0xE4E7,
-	28304 - 11905: 0xD4B4,
-	28305 - 11905: 0x9CC5,
-	28306 - 11905: 0x9CC6,
-	28307 - 11905: 0x9CC7,
-	28308 - 11905: 0x9CC8,
-	28309 - 11905: 0x9CC9,
-	28310 - 11905: 0x9CCA,
-	28311 - 11905: 0x9CCB,
-	28312 - 11905: 0xE4DB,
-	28313 - 11905: 0x9CCC,
-	28314 - 11905: 0x9CCD,
-	28315 - 11905: 0x9CCE,
-	28316 - 11905: 0xC1EF,
-	28317 - 11905: 0x9CCF,
-	28318 - 11905: 0x9CD0,
-	28319 - 11905: 0xE4E9,
-	28320 - 11905: 0x9CD1,
-	28321 - 11905: 0x9CD2,
-	28322 - 11905: 0xD2E7,
-	28323 - 11905: 0x9CD3,
-	28324 - 11905: 0x9CD4,
-	28325 - 11905: 0xE4DF,
-	28326 - 11905: 0x9CD5,
-	28327 - 11905: 0xE4E0,
-	28328 - 11905: 0x9CD6,
-	28329 - 11905: 0x9CD7,
-	28330 - 11905: 0xCFAA,
-	28331 - 11905: 0x9CD8,
-	28332 - 11905: 0x9CD9,
-	28333 - 11905: 0x9CDA,
-	28334 - 11905: 0x9CDB,
-	28335 - 11905: 0xCBDD,
-	28336 - 11905: 0x9CDC,
-	28337 - 11905: 0xE4DA,
-	28338 - 11905: 0xE4D1,
-	28339 - 11905: 0x9CDD,
-	28340 - 11905: 0xE4E5,
-	28341 - 11905: 0x9CDE,
-	28342 - 11905: 0xC8DC,
-	28343 - 11905: 0xE4E3,
-	28344 - 11905: 0x9CDF,
-	28345 - 11905: 0x9CE0,
-	28346 - 11905: 0xC4E7,
-	28347 - 11905: 0xE4E2,
-	28348 - 11905: 0x9CE1,
-	28349 - 11905: 0xE4E1,
-	28350 - 11905: 0x9CE2,
-	28351 - 11905: 0x9CE3,
-	28352 - 11905: 0x9CE4,
-	28353 - 11905: 0xB3FC,
-	28354 - 11905: 0xE4E8,
-	28355 - 11905: 0x9CE5,
-	28356 - 11905: 0x9CE6,
-	28357 - 11905: 0x9CE7,
-	28358 - 11905: 0x9CE8,
-	28359 - 11905: 0xB5E1,
-	28360 - 11905: 0x9CE9,
-	28361 - 11905: 0x9CEA,
-	28362 - 11905: 0x9CEB,
-	28363 - 11905: 0xD7CC,
-	28364 - 11905: 0x9CEC,
-	28365 - 11905: 0x9CED,
-	28366 - 11905: 0x9CEE,
-	28367 - 11905: 0xE4E6,
-	28368 - 11905: 0x9CEF,
-	28369 - 11905: 0xBBAC,
-	28370 - 11905: 0x9CF0,
-	28371 - 11905: 0xD7D2,
-	28372 - 11905: 0xCCCF,
-	28373 - 11905: 0xEBF8,
-	28374 - 11905: 0x9CF1,
-	28375 - 11905: 0xE4E4,
-	28376 - 11905: 0x9CF2,
-	28377 - 11905: 0x9CF3,
-	28378 - 11905: 0xB9F6,
-	28379 - 11905: 0x9CF4,
-	28380 - 11905: 0x9CF5,
-	28381 - 11905: 0x9CF6,
-	28382 - 11905: 0xD6CD,
-	28383 - 11905: 0xE4D9,
-	28384 - 11905: 0xE4DC,
-	28385 - 11905: 0xC2FA,
-	28386 - 11905: 0xE4DE,
-	28387 - 11905: 0x9CF7,
-	28388 - 11905: 0xC2CB,
-	28389 - 11905: 0xC0C4,
-	28390 - 11905: 0xC2D0,
-	28391 - 11905: 0x9CF8,
-	28392 - 11905: 0xB1F5,
-	28393 - 11905: 0xCCB2,
-	28394 - 11905: 0x9CF9,
-	28395 - 11905: 0x9CFA,
-	28396 - 11905: 0x9CFB,
-	28397 - 11905: 0x9CFC,
-	28398 - 11905: 0x9CFD,
-	28399 - 11905: 0x9CFE,
-	28400 - 11905: 0x9D40,
-	28401 - 11905: 0x9D41,
-	28402 - 11905: 0x9D42,
-	28403 - 11905: 0x9D43,
-	28404 - 11905: 0xB5CE,
-	28405 - 11905: 0x9D44,
-	28406 - 11905: 0x9D45,
-	28407 - 11905: 0x9D46,
-	28408 - 11905: 0x9D47,
-	28409 - 11905: 0xE4EF,
-	28410 - 11905: 0x9D48,
-	28411 - 11905: 0x9D49,
-	28412 - 11905: 0x9D4A,
-	28413 - 11905: 0x9D4B,
-	28414 - 11905: 0x9D4C,
-	28415 - 11905: 0x9D4D,
-	28416 - 11905: 0x9D4E,
-	28417 - 11905: 0x9D4F,
-	28418 - 11905: 0xC6AF,
-	28419 - 11905: 0x9D50,
-	28420 - 11905: 0x9D51,
-	28421 - 11905: 0x9D52,
-	28422 - 11905: 0xC6E1,
-	28423 - 11905: 0x9D53,
-	28424 - 11905: 0x9D54,
-	28425 - 11905: 0xE4F5,
-	28426 - 11905: 0x9D55,
-	28427 - 11905: 0x9D56,
-	28428 - 11905: 0x9D57,
-	28429 - 11905: 0x9D58,
-	28430 - 11905: 0x9D59,
-	28431 - 11905: 0xC2A9,
-	28432 - 11905: 0x9D5A,
-	28433 - 11905: 0x9D5B,
-	28434 - 11905: 0x9D5C,
-	28435 - 11905: 0xC0EC,
-	28436 - 11905: 0xD1DD,
-	28437 - 11905: 0xE4EE,
-	28438 - 11905: 0x9D5D,
-	28439 - 11905: 0x9D5E,
-	28440 - 11905: 0x9D5F,
-	28441 - 11905: 0x9D60,
-	28442 - 11905: 0x9D61,
-	28443 - 11905: 0x9D62,
-	28444 - 11905: 0x9D63,
-	28445 - 11905: 0x9D64,
-	28446 - 11905: 0x9D65,
-	28447 - 11905: 0x9D66,
-	28448 - 11905: 0xC4AE,
-	28449 - 11905: 0x9D67,
-	28450 - 11905: 0x9D68,
-	28451 - 11905: 0x9D69,
-	28452 - 11905: 0xE4ED,
-	28453 - 11905: 0x9D6A,
-	28454 - 11905: 0x9D6B,
-	28455 - 11905: 0x9D6C,
-	28456 - 11905: 0x9D6D,
-	28457 - 11905: 0xE4F6,
-	28458 - 11905: 0xE4F4,
-	28459 - 11905: 0xC2FE,
-	28460 - 11905: 0x9D6E,
-	28461 - 11905: 0xE4DD,
-	28462 - 11905: 0x9D6F,
-	28463 - 11905: 0xE4F0,
-	28464 - 11905: 0x9D70,
-	28465 - 11905: 0xCAFE,
-	28466 - 11905: 0x9D71,
-	28467 - 11905: 0xD5C4,
-	28468 - 11905: 0x9D72,
-	28469 - 11905: 0x9D73,
-	28470 - 11905: 0xE4F1,
-	28471 - 11905: 0x9D74,
-	28472 - 11905: 0x9D75,
-	28473 - 11905: 0x9D76,
-	28474 - 11905: 0x9D77,
-	28475 - 11905: 0x9D78,
-	28476 - 11905: 0x9D79,
-	28477 - 11905: 0x9D7A,
-	28478 - 11905: 0xD1FA,
-	28479 - 11905: 0x9D7B,
-	28480 - 11905: 0x9D7C,
-	28481 - 11905: 0x9D7D,
-	28482 - 11905: 0x9D7E,
-	28483 - 11905: 0x9D80,
-	28484 - 11905: 0x9D81,
-	28485 - 11905: 0x9D82,
-	28486 - 11905: 0xE4EB,
-	28487 - 11905: 0xE4EC,
-	28488 - 11905: 0x9D83,
-	28489 - 11905: 0x9D84,
-	28490 - 11905: 0x9D85,
-	28491 - 11905: 0xE4F2,
-	28492 - 11905: 0x9D86,
-	28493 - 11905: 0xCEAB,
-	28494 - 11905: 0x9D87,
-	28495 - 11905: 0x9D88,
-	28496 - 11905: 0x9D89,
-	28497 - 11905: 0x9D8A,
-	28498 - 11905: 0x9D8B,
-	28499 - 11905: 0x9D8C,
-	28500 - 11905: 0x9D8D,
-	28501 - 11905: 0x9D8E,
-	28502 - 11905: 0x9D8F,
-	28503 - 11905: 0x9D90,
-	28504 - 11905: 0xC5CB,
-	28505 - 11905: 0x9D91,
-	28506 - 11905: 0x9D92,
-	28507 - 11905: 0x9D93,
-	28508 - 11905: 0xC7B1,
-	28509 - 11905: 0x9D94,
-	28510 - 11905: 0xC2BA,
-	28511 - 11905: 0x9D95,
-	28512 - 11905: 0x9D96,
-	28513 - 11905: 0x9D97,
-	28514 - 11905: 0xE4EA,
-	28515 - 11905: 0x9D98,
-	28516 - 11905: 0x9D99,
-	28517 - 11905: 0x9D9A,
-	28518 - 11905: 0xC1CA,
-	28519 - 11905: 0x9D9B,
-	28520 - 11905: 0x9D9C,
-	28521 - 11905: 0x9D9D,
-	28522 - 11905: 0x9D9E,
-	28523 - 11905: 0x9D9F,
-	28524 - 11905: 0x9DA0,
-	28525 - 11905: 0xCCB6,
-	28526 - 11905: 0xB3B1,
-	28527 - 11905: 0x9DA1,
-	28528 - 11905: 0x9DA2,
-	28529 - 11905: 0x9DA3,
-	28530 - 11905: 0xE4FB,
-	28531 - 11905: 0x9DA4,
-	28532 - 11905: 0xE4F3,
-	28533 - 11905: 0x9DA5,
-	28534 - 11905: 0x9DA6,
-	28535 - 11905: 0x9DA7,
-	28536 - 11905: 0xE4FA,
-	28537 - 11905: 0x9DA8,
-	28538 - 11905: 0xE4FD,
-	28539 - 11905: 0x9DA9,
-	28540 - 11905: 0xE4FC,
-	28541 - 11905: 0x9DAA,
-	28542 - 11905: 0x9DAB,
-	28543 - 11905: 0x9DAC,
-	28544 - 11905: 0x9DAD,
-	28545 - 11905: 0x9DAE,
-	28546 - 11905: 0x9DAF,
-	28547 - 11905: 0x9DB0,
-	28548 - 11905: 0xB3CE,
-	28549 - 11905: 0x9DB1,
-	28550 - 11905: 0x9DB2,
-	28551 - 11905: 0x9DB3,
-	28552 - 11905: 0xB3BA,
-	28553 - 11905: 0xE4F7,
-	28554 - 11905: 0x9DB4,
-	28555 - 11905: 0x9DB5,
-	28556 - 11905: 0xE4F9,
-	28557 - 11905: 0xE4F8,
-	28558 - 11905: 0xC5EC,
-	28559 - 11905: 0x9DB6,
-	28560 - 11905: 0x9DB7,
-	28561 - 11905: 0x9DB8,
-	28562 - 11905: 0x9DB9,
-	28563 - 11905: 0x9DBA,
-	28564 - 11905: 0x9DBB,
-	28565 - 11905: 0x9DBC,
-	28566 - 11905: 0x9DBD,
-	28567 - 11905: 0x9DBE,
-	28568 - 11905: 0x9DBF,
-	28569 - 11905: 0x9DC0,
-	28570 - 11905: 0x9DC1,
-	28571 - 11905: 0x9DC2,
-	28572 - 11905: 0xC0BD,
-	28573 - 11905: 0x9DC3,
-	28574 - 11905: 0x9DC4,
-	28575 - 11905: 0x9DC5,
-	28576 - 11905: 0x9DC6,
-	28577 - 11905: 0xD4E8,
-	28578 - 11905: 0x9DC7,
-	28579 - 11905: 0x9DC8,
-	28580 - 11905: 0x9DC9,
-	28581 - 11905: 0x9DCA,
-	28582 - 11905: 0x9DCB,
-	28583 - 11905: 0xE5A2,
-	28584 - 11905: 0x9DCC,
-	28585 - 11905: 0x9DCD,
-	28586 - 11905: 0x9DCE,
-	28587 - 11905: 0x9DCF,
-	28588 - 11905: 0x9DD0,
-	28589 - 11905: 0x9DD1,
-	28590 - 11905: 0x9DD2,
-	28591 - 11905: 0x9DD3,
-	28592 - 11905: 0x9DD4,
-	28593 - 11905: 0x9DD5,
-	28594 - 11905: 0x9DD6,
-	28595 - 11905: 0xB0C4,
-	28596 - 11905: 0x9DD7,
-	28597 - 11905: 0x9DD8,
-	28598 - 11905: 0xE5A4,
-	28599 - 11905: 0x9DD9,
-	28600 - 11905: 0x9DDA,
-	28601 - 11905: 0xE5A3,
-	28602 - 11905: 0x9DDB,
-	28603 - 11905: 0x9DDC,
-	28604 - 11905: 0x9DDD,
-	28605 - 11905: 0x9DDE,
-	28606 - 11905: 0x9DDF,
-	28607 - 11905: 0x9DE0,
-	28608 - 11905: 0xBCA4,
-	28609 - 11905: 0x9DE1,
-	28610 - 11905: 0xE5A5,
-	28611 - 11905: 0x9DE2,
-	28612 - 11905: 0x9DE3,
-	28613 - 11905: 0x9DE4,
-	28614 - 11905: 0x9DE5,
-	28615 - 11905: 0x9DE6,
-	28616 - 11905: 0x9DE7,
-	28617 - 11905: 0xE5A1,
-	28618 - 11905: 0x9DE8,
-	28619 - 11905: 0x9DE9,
-	28620 - 11905: 0x9DEA,
-	28621 - 11905: 0x9DEB,
-	28622 - 11905: 0x9DEC,
-	28623 - 11905: 0x9DED,
-	28624 - 11905: 0x9DEE,
-	28625 - 11905: 0xE4FE,
-	28626 - 11905: 0xB1F4,
-	28627 - 11905: 0x9DEF,
-	28628 - 11905: 0x9DF0,
-	28629 - 11905: 0x9DF1,
-	28630 - 11905: 0x9DF2,
-	28631 - 11905: 0x9DF3,
-	28632 - 11905: 0x9DF4,
-	28633 - 11905: 0x9DF5,
-	28634 - 11905: 0x9DF6,
-	28635 - 11905: 0x9DF7,
-	28636 - 11905: 0x9DF8,
-	28637 - 11905: 0x9DF9,
-	28638 - 11905: 0xE5A8,
-	28639 - 11905: 0x9DFA,
-	28640 - 11905: 0xE5A9,
-	28641 - 11905: 0xE5A6,
-	28642 - 11905: 0x9DFB,
-	28643 - 11905: 0x9DFC,
-	28644 - 11905: 0x9DFD,
-	28645 - 11905: 0x9DFE,
-	28646 - 11905: 0x9E40,
-	28647 - 11905: 0x9E41,
-	28648 - 11905: 0x9E42,
-	28649 - 11905: 0x9E43,
-	28650 - 11905: 0x9E44,
-	28651 - 11905: 0x9E45,
-	28652 - 11905: 0x9E46,
-	28653 - 11905: 0x9E47,
-	28654 - 11905: 0xE5A7,
-	28655 - 11905: 0xE5AA,
-	28656 - 11905: 0x9E48,
-	28657 - 11905: 0x9E49,
-	28658 - 11905: 0x9E4A,
-	28659 - 11905: 0x9E4B,
-	28660 - 11905: 0x9E4C,
-	28661 - 11905: 0x9E4D,
-	28662 - 11905: 0x9E4E,
-	28663 - 11905: 0x9E4F,
-	28664 - 11905: 0x9E50,
-	28665 - 11905: 0x9E51,
-	28666 - 11905: 0x9E52,
-	28667 - 11905: 0x9E53,
-	28668 - 11905: 0x9E54,
-	28669 - 11905: 0x9E55,
-	28670 - 11905: 0x9E56,
-	28671 - 11905: 0x9E57,
-	28672 - 11905: 0x9E58,
-	28673 - 11905: 0x9E59,
-	28674 - 11905: 0x9E5A,
-	28675 - 11905: 0x9E5B,
-	28676 - 11905: 0x9E5C,
-	28677 - 11905: 0x9E5D,
-	28678 - 11905: 0x9E5E,
-	28679 - 11905: 0x9E5F,
-	28680 - 11905: 0x9E60,
-	28681 - 11905: 0x9E61,
-	28682 - 11905: 0x9E62,
-	28683 - 11905: 0x9E63,
-	28684 - 11905: 0x9E64,
-	28685 - 11905: 0x9E65,
-	28686 - 11905: 0x9E66,
-	28687 - 11905: 0x9E67,
-	28688 - 11905: 0x9E68,
-	28689 - 11905: 0xC6D9,
-	28690 - 11905: 0x9E69,
-	28691 - 11905: 0x9E6A,
-	28692 - 11905: 0x9E6B,
-	28693 - 11905: 0x9E6C,
-	28694 - 11905: 0x9E6D,
-	28695 - 11905: 0x9E6E,
-	28696 - 11905: 0x9E6F,
-	28697 - 11905: 0x9E70,
-	28698 - 11905: 0xE5AB,
-	28699 - 11905: 0xE5AD,
-	28700 - 11905: 0x9E71,
-	28701 - 11905: 0x9E72,
-	28702 - 11905: 0x9E73,
-	28703 - 11905: 0x9E74,
-	28704 - 11905: 0x9E75,
-	28705 - 11905: 0x9E76,
-	28706 - 11905: 0x9E77,
-	28707 - 11905: 0xE5AC,
-	28708 - 11905: 0x9E78,
-	28709 - 11905: 0x9E79,
-	28710 - 11905: 0x9E7A,
-	28711 - 11905: 0x9E7B,
-	28712 - 11905: 0x9E7C,
-	28713 - 11905: 0x9E7D,
-	28714 - 11905: 0x9E7E,
-	28715 - 11905: 0x9E80,
-	28716 - 11905: 0x9E81,
-	28717 - 11905: 0x9E82,
-	28718 - 11905: 0x9E83,
-	28719 - 11905: 0x9E84,
-	28720 - 11905: 0x9E85,
-	28721 - 11905: 0x9E86,
-	28722 - 11905: 0x9E87,
-	28723 - 11905: 0x9E88,
-	28724 - 11905: 0x9E89,
-	28725 - 11905: 0xE5AF,
-	28726 - 11905: 0x9E8A,
-	28727 - 11905: 0x9E8B,
-	28728 - 11905: 0x9E8C,
-	28729 - 11905: 0xE5AE,
-	28730 - 11905: 0x9E8D,
-	28731 - 11905: 0x9E8E,
-	28732 - 11905: 0x9E8F,
-	28733 - 11905: 0x9E90,
-	28734 - 11905: 0x9E91,
-	28735 - 11905: 0x9E92,
-	28736 - 11905: 0x9E93,
-	28737 - 11905: 0x9E94,
-	28738 - 11905: 0x9E95,
-	28739 - 11905: 0x9E96,
-	28740 - 11905: 0x9E97,
-	28741 - 11905: 0x9E98,
-	28742 - 11905: 0x9E99,
-	28743 - 11905: 0x9E9A,
-	28744 - 11905: 0x9E9B,
-	28745 - 11905: 0x9E9C,
-	28746 - 11905: 0x9E9D,
-	28747 - 11905: 0x9E9E,
-	28748 - 11905: 0xB9E0,
-	28749 - 11905: 0x9E9F,
-	28750 - 11905: 0x9EA0,
-	28751 - 11905: 0xE5B0,
-	28752 - 11905: 0x9EA1,
-	28753 - 11905: 0x9EA2,
-	28754 - 11905: 0x9EA3,
-	28755 - 11905: 0x9EA4,
-	28756 - 11905: 0x9EA5,
-	28757 - 11905: 0x9EA6,
-	28758 - 11905: 0x9EA7,
-	28759 - 11905: 0x9EA8,
-	28760 - 11905: 0x9EA9,
-	28761 - 11905: 0x9EAA,
-	28762 - 11905: 0x9EAB,
-	28763 - 11905: 0x9EAC,
-	28764 - 11905: 0x9EAD,
-	28765 - 11905: 0x9EAE,
-	28766 - 11905: 0xE5B1,
-	28767 - 11905: 0x9EAF,
-	28768 - 11905: 0x9EB0,
-	28769 - 11905: 0x9EB1,
-	28770 - 11905: 0x9EB2,
-	28771 - 11905: 0x9EB3,
-	28772 - 11905: 0x9EB4,
-	28773 - 11905: 0x9EB5,
-	28774 - 11905: 0x9EB6,
-	28775 - 11905: 0x9EB7,
-	28776 - 11905: 0x9EB8,
-	28777 - 11905: 0x9EB9,
-	28778 - 11905: 0x9EBA,
-	28779 - 11905: 0xBBF0,
-	28780 - 11905: 0xECE1,
-	28781 - 11905: 0xC3F0,
-	28782 - 11905: 0x9EBB,
-	28783 - 11905: 0xB5C6,
-	28784 - 11905: 0xBBD2,
-	28785 - 11905: 0x9EBC,
-	28786 - 11905: 0x9EBD,
-	28787 - 11905: 0x9EBE,
-	28788 - 11905: 0x9EBF,
-	28789 - 11905: 0xC1E9,
-	28790 - 11905: 0xD4EE,
-	28791 - 11905: 0x9EC0,
-	28792 - 11905: 0xBEC4,
-	28793 - 11905: 0x9EC1,
-	28794 - 11905: 0x9EC2,
-	28795 - 11905: 0x9EC3,
-	28796 - 11905: 0xD7C6,
-	28797 - 11905: 0x9EC4,
-	28798 - 11905: 0xD4D6,
-	28799 - 11905: 0xB2D3,
-	28800 - 11905: 0xECBE,
-	28801 - 11905: 0x9EC5,
-	28802 - 11905: 0x9EC6,
-	28803 - 11905: 0x9EC7,
-	28804 - 11905: 0x9EC8,
-	28805 - 11905: 0xEAC1,
-	28806 - 11905: 0x9EC9,
-	28807 - 11905: 0x9ECA,
-	28808 - 11905: 0x9ECB,
-	28809 - 11905: 0xC2AF,
-	28810 - 11905: 0xB4B6,
-	28811 - 11905: 0x9ECC,
-	28812 - 11905: 0x9ECD,
-	28813 - 11905: 0x9ECE,
-	28814 - 11905: 0xD1D7,
-	28815 - 11905: 0x9ECF,
-	28816 - 11905: 0x9ED0,
-	28817 - 11905: 0x9ED1,
-	28818 - 11905: 0xB3B4,
-	28819 - 11905: 0x9ED2,
-	28820 - 11905: 0xC8B2,
-	28821 - 11905: 0xBFBB,
-	28822 - 11905: 0xECC0,
-	28823 - 11905: 0x9ED3,
-	28824 - 11905: 0x9ED4,
-	28825 - 11905: 0xD6CB,
-	28826 - 11905: 0x9ED5,
-	28827 - 11905: 0x9ED6,
-	28828 - 11905: 0xECBF,
-	28829 - 11905: 0xECC1,
-	28830 - 11905: 0x9ED7,
-	28831 - 11905: 0x9ED8,
-	28832 - 11905: 0x9ED9,
-	28833 - 11905: 0x9EDA,
-	28834 - 11905: 0x9EDB,
-	28835 - 11905: 0x9EDC,
-	28836 - 11905: 0x9EDD,
-	28837 - 11905: 0x9EDE,
-	28838 - 11905: 0x9EDF,
-	28839 - 11905: 0x9EE0,
-	28840 - 11905: 0x9EE1,
-	28841 - 11905: 0x9EE2,
-	28842 - 11905: 0x9EE3,
-	28843 - 11905: 0xECC5,
-	28844 - 11905: 0xBEE6,
-	28845 - 11905: 0xCCBF,
-	28846 - 11905: 0xC5DA,
-	28847 - 11905: 0xBEBC,
-	28848 - 11905: 0x9EE4,
-	28849 - 11905: 0xECC6,
-	28850 - 11905: 0x9EE5,
-	28851 - 11905: 0xB1FE,
-	28852 - 11905: 0x9EE6,
-	28853 - 11905: 0x9EE7,
-	28854 - 11905: 0x9EE8,
-	28855 - 11905: 0xECC4,
-	28856 - 11905: 0xD5A8,
-	28857 - 11905: 0xB5E3,
-	28858 - 11905: 0x9EE9,
-	28859 - 11905: 0xECC2,
-	28860 - 11905: 0xC1B6,
-	28861 - 11905: 0xB3E3,
-	28862 - 11905: 0x9EEA,
-	28863 - 11905: 0x9EEB,
-	28864 - 11905: 0xECC3,
-	28865 - 11905: 0xCBB8,
-	28866 - 11905: 0xC0C3,
-	28867 - 11905: 0xCCFE,
-	28868 - 11905: 0x9EEC,
-	28869 - 11905: 0x9EED,
-	28870 - 11905: 0x9EEE,
-	28871 - 11905: 0x9EEF,
-	28872 - 11905: 0xC1D2,
-	28873 - 11905: 0x9EF0,
-	28874 - 11905: 0xECC8,
-	28875 - 11905: 0x9EF1,
-	28876 - 11905: 0x9EF2,
-	28877 - 11905: 0x9EF3,
-	28878 - 11905: 0x9EF4,
-	28879 - 11905: 0x9EF5,
-	28880 - 11905: 0x9EF6,
-	28881 - 11905: 0x9EF7,
-	28882 - 11905: 0x9EF8,
-	28883 - 11905: 0x9EF9,
-	28884 - 11905: 0x9EFA,
-	28885 - 11905: 0x9EFB,
-	28886 - 11905: 0x9EFC,
-	28887 - 11905: 0x9EFD,
-	28888 - 11905: 0xBAE6,
-	28889 - 11905: 0xC0D3,
-	28890 - 11905: 0x9EFE,
-	28891 - 11905: 0xD6F2,
-	28892 - 11905: 0x9F40,
-	28893 - 11905: 0x9F41,
-	28894 - 11905: 0x9F42,
-	28895 - 11905: 0xD1CC,
-	28896 - 11905: 0x9F43,
-	28897 - 11905: 0x9F44,
-	28898 - 11905: 0x9F45,
-	28899 - 11905: 0x9F46,
-	28900 - 11905: 0xBFBE,
-	28901 - 11905: 0x9F47,
-	28902 - 11905: 0xB7B3,
-	28903 - 11905: 0xC9D5,
-	28904 - 11905: 0xECC7,
-	28905 - 11905: 0xBBE2,
-	28906 - 11905: 0x9F48,
-	28907 - 11905: 0xCCCC,
-	28908 - 11905: 0xBDFD,
-	28909 - 11905: 0xC8C8,
-	28910 - 11905: 0x9F49,
-	28911 - 11905: 0xCFA9,
-	28912 - 11905: 0x9F4A,
-	28913 - 11905: 0x9F4B,
-	28914 - 11905: 0x9F4C,
-	28915 - 11905: 0x9F4D,
-	28916 - 11905: 0x9F4E,
-	28917 - 11905: 0x9F4F,
-	28918 - 11905: 0x9F50,
-	28919 - 11905: 0xCDE9,
-	28920 - 11905: 0x9F51,
-	28921 - 11905: 0xC5EB,
-	28922 - 11905: 0x9F52,
-	28923 - 11905: 0x9F53,
-	28924 - 11905: 0x9F54,
-	28925 - 11905: 0xB7E9,
-	28926 - 11905: 0x9F55,
-	28927 - 11905: 0x9F56,
-	28928 - 11905: 0x9F57,
-	28929 - 11905: 0x9F58,
-	28930 - 11905: 0x9F59,
-	28931 - 11905: 0x9F5A,
-	28932 - 11905: 0x9F5B,
-	28933 - 11905: 0x9F5C,
-	28934 - 11905: 0x9F5D,
-	28935 - 11905: 0x9F5E,
-	28936 - 11905: 0x9F5F,
-	28937 - 11905: 0xD1C9,
-	28938 - 11905: 0xBAB8,
-	28939 - 11905: 0x9F60,
-	28940 - 11905: 0x9F61,
-	28941 - 11905: 0x9F62,
-	28942 - 11905: 0x9F63,
-	28943 - 11905: 0x9F64,
-	28944 - 11905: 0xECC9,
-	28945 - 11905: 0x9F65,
-	28946 - 11905: 0x9F66,
-	28947 - 11905: 0xECCA,
-	28948 - 11905: 0x9F67,
-	28949 - 11905: 0xBBC0,
-	28950 - 11905: 0xECCB,
-	28951 - 11905: 0x9F68,
-	28952 - 11905: 0xECE2,
-	28953 - 11905: 0xB1BA,
-	28954 - 11905: 0xB7D9,
-	28955 - 11905: 0x9F69,
-	28956 - 11905: 0x9F6A,
-	28957 - 11905: 0x9F6B,
-	28958 - 11905: 0x9F6C,
-	28959 - 11905: 0x9F6D,
-	28960 - 11905: 0x9F6E,
-	28961 - 11905: 0x9F6F,
-	28962 - 11905: 0x9F70,
-	28963 - 11905: 0x9F71,
-	28964 - 11905: 0x9F72,
-	28965 - 11905: 0x9F73,
-	28966 - 11905: 0xBDB9,
-	28967 - 11905: 0x9F74,
-	28968 - 11905: 0x9F75,
-	28969 - 11905: 0x9F76,
-	28970 - 11905: 0x9F77,
-	28971 - 11905: 0x9F78,
-	28972 - 11905: 0x9F79,
-	28973 - 11905: 0x9F7A,
-	28974 - 11905: 0x9F7B,
-	28975 - 11905: 0xECCC,
-	28976 - 11905: 0xD1E6,
-	28977 - 11905: 0xECCD,
-	28978 - 11905: 0x9F7C,
-	28979 - 11905: 0x9F7D,
-	28980 - 11905: 0x9F7E,
-	28981 - 11905: 0x9F80,
-	28982 - 11905: 0xC8BB,
-	28983 - 11905: 0x9F81,
-	28984 - 11905: 0x9F82,
-	28985 - 11905: 0x9F83,
-	28986 - 11905: 0x9F84,
-	28987 - 11905: 0x9F85,
-	28988 - 11905: 0x9F86,
-	28989 - 11905: 0x9F87,
-	28990 - 11905: 0x9F88,
-	28991 - 11905: 0x9F89,
-	28992 - 11905: 0x9F8A,
-	28993 - 11905: 0x9F8B,
-	28994 - 11905: 0x9F8C,
-	28995 - 11905: 0x9F8D,
-	28996 - 11905: 0x9F8E,
-	28997 - 11905: 0xECD1,
-	28998 - 11905: 0x9F8F,
-	28999 - 11905: 0x9F90,
-	29000 - 11905: 0x9F91,
-	29001 - 11905: 0x9F92,
-	29002 - 11905: 0xECD3,
-	29003 - 11905: 0x9F93,
-	29004 - 11905: 0xBBCD,
-	29005 - 11905: 0x9F94,
-	29006 - 11905: 0xBCE5,
-	29007 - 11905: 0x9F95,
-	29008 - 11905: 0x9F96,
-	29009 - 11905: 0x9F97,
-	29010 - 11905: 0x9F98,
-	29011 - 11905: 0x9F99,
-	29012 - 11905: 0x9F9A,
-	29013 - 11905: 0x9F9B,
-	29014 - 11905: 0x9F9C,
-	29015 - 11905: 0x9F9D,
-	29016 - 11905: 0x9F9E,
-	29017 - 11905: 0x9F9F,
-	29018 - 11905: 0x9FA0,
-	29019 - 11905: 0x9FA1,
-	29020 - 11905: 0xECCF,
-	29021 - 11905: 0x9FA2,
-	29022 - 11905: 0xC9B7,
-	29023 - 11905: 0x9FA3,
-	29024 - 11905: 0x9FA4,
-	29025 - 11905: 0x9FA5,
-	29026 - 11905: 0x9FA6,
-	29027 - 11905: 0x9FA7,
-	29028 - 11905: 0xC3BA,
-	29029 - 11905: 0x9FA8,
-	29030 - 11905: 0xECE3,
-	29031 - 11905: 0xD5D5,
-	29032 - 11905: 0xECD0,
-	29033 - 11905: 0x9FA9,
-	29034 - 11905: 0x9FAA,
-	29035 - 11905: 0x9FAB,
-	29036 - 11905: 0x9FAC,
-	29037 - 11905: 0x9FAD,
-	29038 - 11905: 0xD6F3,
-	29039 - 11905: 0x9FAE,
-	29040 - 11905: 0x9FAF,
-	29041 - 11905: 0x9FB0,
-	29042 - 11905: 0xECD2,
-	29043 - 11905: 0xECCE,
-	29044 - 11905: 0x9FB1,
-	29045 - 11905: 0x9FB2,
-	29046 - 11905: 0x9FB3,
-	29047 - 11905: 0x9FB4,
-	29048 - 11905: 0xECD4,
-	29049 - 11905: 0x9FB5,
-	29050 - 11905: 0xECD5,
-	29051 - 11905: 0x9FB6,
-	29052 - 11905: 0x9FB7,
-	29053 - 11905: 0xC9BF,
-	29054 - 11905: 0x9FB8,
-	29055 - 11905: 0x9FB9,
-	29056 - 11905: 0x9FBA,
-	29057 - 11905: 0x9FBB,
-	29058 - 11905: 0x9FBC,
-	29059 - 11905: 0x9FBD,
-	29060 - 11905: 0xCFA8,
-	29061 - 11905: 0x9FBE,
-	29062 - 11905: 0x9FBF,
-	29063 - 11905: 0x9FC0,
-	29064 - 11905: 0x9FC1,
-	29065 - 11905: 0x9FC2,
-	29066 - 11905: 0xD0DC,
-	29067 - 11905: 0x9FC3,
-	29068 - 11905: 0x9FC4,
-	29069 - 11905: 0x9FC5,
-	29070 - 11905: 0x9FC6,
-	29071 - 11905: 0xD1AC,
-	29072 - 11905: 0x9FC7,
-	29073 - 11905: 0x9FC8,
-	29074 - 11905: 0x9FC9,
-	29075 - 11905: 0x9FCA,
-	29076 - 11905: 0xC8DB,
-	29077 - 11905: 0x9FCB,
-	29078 - 11905: 0x9FCC,
-	29079 - 11905: 0x9FCD,
-	29080 - 11905: 0xECD6,
-	29081 - 11905: 0xCEF5,
-	29082 - 11905: 0x9FCE,
-	29083 - 11905: 0x9FCF,
-	29084 - 11905: 0x9FD0,
-	29085 - 11905: 0x9FD1,
-	29086 - 11905: 0x9FD2,
-	29087 - 11905: 0xCAEC,
-	29088 - 11905: 0xECDA,
-	29089 - 11905: 0x9FD3,
-	29090 - 11905: 0x9FD4,
-	29091 - 11905: 0x9FD5,
-	29092 - 11905: 0x9FD6,
-	29093 - 11905: 0x9FD7,
-	29094 - 11905: 0x9FD8,
-	29095 - 11905: 0x9FD9,
-	29096 - 11905: 0xECD9,
-	29097 - 11905: 0x9FDA,
-	29098 - 11905: 0x9FDB,
-	29099 - 11905: 0x9FDC,
-	29100 - 11905: 0xB0BE,
-	29101 - 11905: 0x9FDD,
-	29102 - 11905: 0x9FDE,
-	29103 - 11905: 0x9FDF,
-	29104 - 11905: 0x9FE0,
-	29105 - 11905: 0x9FE1,
-	29106 - 11905: 0x9FE2,
-	29107 - 11905: 0xECD7,
-	29108 - 11905: 0x9FE3,
-	29109 - 11905: 0xECD8,
-	29110 - 11905: 0x9FE4,
-	29111 - 11905: 0x9FE5,
-	29112 - 11905: 0x9FE6,
-	29113 - 11905: 0xECE4,
-	29114 - 11905: 0x9FE7,
-	29115 - 11905: 0x9FE8,
-	29116 - 11905: 0x9FE9,
-	29117 - 11905: 0x9FEA,
-	29118 - 11905: 0x9FEB,
-	29119 - 11905: 0x9FEC,
-	29120 - 11905: 0x9FED,
-	29121 - 11905: 0x9FEE,
-	29122 - 11905: 0x9FEF,
-	29123 - 11905: 0xC8BC,
-	29124 - 11905: 0x9FF0,
-	29125 - 11905: 0x9FF1,
-	29126 - 11905: 0x9FF2,
-	29127 - 11905: 0x9FF3,
-	29128 - 11905: 0x9FF4,
-	29129 - 11905: 0x9FF5,
-	29130 - 11905: 0x9FF6,
-	29131 - 11905: 0x9FF7,
-	29132 - 11905: 0x9FF8,
-	29133 - 11905: 0x9FF9,
-	29134 - 11905: 0xC1C7,
-	29135 - 11905: 0x9FFA,
-	29136 - 11905: 0x9FFB,
-	29137 - 11905: 0x9FFC,
-	29138 - 11905: 0x9FFD,
-	29139 - 11905: 0x9FFE,
-	29140 - 11905: 0xECDC,
-	29141 - 11905: 0xD1E0,
-	29142 - 11905: 0xA040,
-	29143 - 11905: 0xA041,
-	29144 - 11905: 0xA042,
-	29145 - 11905: 0xA043,
-	29146 - 11905: 0xA044,
-	29147 - 11905: 0xA045,
-	29148 - 11905: 0xA046,
-	29149 - 11905: 0xA047,
-	29150 - 11905: 0xA048,
-	29151 - 11905: 0xA049,
-	29152 - 11905: 0xECDB,
-	29153 - 11905: 0xA04A,
-	29154 - 11905: 0xA04B,
-	29155 - 11905: 0xA04C,
-	29156 - 11905: 0xA04D,
-	29157 - 11905: 0xD4EF,
-	29158 - 11905: 0xA04E,
-	29159 - 11905: 0xECDD,
-	29160 - 11905: 0xA04F,
-	29161 - 11905: 0xA050,
-	29162 - 11905: 0xA051,
-	29163 - 11905: 0xA052,
-	29164 - 11905: 0xA053,
-	29165 - 11905: 0xA054,
-	29166 - 11905: 0xDBC6,
-	29167 - 11905: 0xA055,
-	29168 - 11905: 0xA056,
-	29169 - 11905: 0xA057,
-	29170 - 11905: 0xA058,
-	29171 - 11905: 0xA059,
-	29172 - 11905: 0xA05A,
-	29173 - 11905: 0xA05B,
-	29174 - 11905: 0xA05C,
-	29175 - 11905: 0xA05D,
-	29176 - 11905: 0xA05E,
-	29177 - 11905: 0xECDE,
-	29178 - 11905: 0xA05F,
-	29179 - 11905: 0xA060,
-	29180 - 11905: 0xA061,
-	29181 - 11905: 0xA062,
-	29182 - 11905: 0xA063,
-	29183 - 11905: 0xA064,
-	29184 - 11905: 0xA065,
-	29185 - 11905: 0xA066,
-	29186 - 11905: 0xA067,
-	29187 - 11905: 0xA068,
-	29188 - 11905: 0xA069,
-	29189 - 11905: 0xA06A,
-	29190 - 11905: 0xB1AC,
-	29191 - 11905: 0xA06B,
-	29192 - 11905: 0xA06C,
-	29193 - 11905: 0xA06D,
-	29194 - 11905: 0xA06E,
-	29195 - 11905: 0xA06F,
-	29196 - 11905: 0xA070,
-	29197 - 11905: 0xA071,
-	29198 - 11905: 0xA072,
-	29199 - 11905: 0xA073,
-	29200 - 11905: 0xA074,
-	29201 - 11905: 0xA075,
-	29202 - 11905: 0xA076,
-	29203 - 11905: 0xA077,
-	29204 - 11905: 0xA078,
-	29205 - 11905: 0xA079,
-	29206 - 11905: 0xA07A,
-	29207 - 11905: 0xA07B,
-	29208 - 11905: 0xA07C,
-	29209 - 11905: 0xA07D,
-	29210 - 11905: 0xA07E,
-	29211 - 11905: 0xA080,
-	29212 - 11905: 0xA081,
-	29213 - 11905: 0xECDF,
-	29214 - 11905: 0xA082,
-	29215 - 11905: 0xA083,
-	29216 - 11905: 0xA084,
-	29217 - 11905: 0xA085,
-	29218 - 11905: 0xA086,
-	29219 - 11905: 0xA087,
-	29220 - 11905: 0xA088,
-	29221 - 11905: 0xA089,
-	29222 - 11905: 0xA08A,
-	29223 - 11905: 0xA08B,
-	29224 - 11905: 0xECE0,
-	29225 - 11905: 0xA08C,
-	29226 - 11905: 0xD7A6,
-	29227 - 11905: 0xA08D,
-	29228 - 11905: 0xC5C0,
-	29229 - 11905: 0xA08E,
-	29230 - 11905: 0xA08F,
-	29231 - 11905: 0xA090,
-	29232 - 11905: 0xEBBC,
-	29233 - 11905: 0xB0AE,
-	29234 - 11905: 0xA091,
-	29235 - 11905: 0xA092,
-	29236 - 11905: 0xA093,
-	29237 - 11905: 0xBEF4,
-	29238 - 11905: 0xB8B8,
-	29239 - 11905: 0xD2AF,
-	29240 - 11905: 0xB0D6,
-	29241 - 11905: 0xB5F9,
-	29242 - 11905: 0xA094,
-	29243 - 11905: 0xD8B3,
-	29244 - 11905: 0xA095,
-	29245 - 11905: 0xCBAC,
-	29246 - 11905: 0xA096,
-	29247 - 11905: 0xE3DD,
-	29248 - 11905: 0xA097,
-	29249 - 11905: 0xA098,
-	29250 - 11905: 0xA099,
-	29251 - 11905: 0xA09A,
-	29252 - 11905: 0xA09B,
-	29253 - 11905: 0xA09C,
-	29254 - 11905: 0xA09D,
-	29255 - 11905: 0xC6AC,
-	29256 - 11905: 0xB0E6,
-	29257 - 11905: 0xA09E,
-	29258 - 11905: 0xA09F,
-	29259 - 11905: 0xA0A0,
-	29260 - 11905: 0xC5C6,
-	29261 - 11905: 0xEBB9,
-	29262 - 11905: 0xA0A1,
-	29263 - 11905: 0xA0A2,
-	29264 - 11905: 0xA0A3,
-	29265 - 11905: 0xA0A4,
-	29266 - 11905: 0xEBBA,
-	29267 - 11905: 0xA0A5,
-	29268 - 11905: 0xA0A6,
-	29269 - 11905: 0xA0A7,
-	29270 - 11905: 0xEBBB,
-	29271 - 11905: 0xA0A8,
-	29272 - 11905: 0xA0A9,
-	29273 - 11905: 0xD1C0,
-	29274 - 11905: 0xA0AA,
-	29275 - 11905: 0xC5A3,
-	29276 - 11905: 0xA0AB,
-	29277 - 11905: 0xEAF2,
-	29278 - 11905: 0xA0AC,
-	29279 - 11905: 0xC4B2,
-	29280 - 11905: 0xA0AD,
-	29281 - 11905: 0xC4B5,
-	29282 - 11905: 0xC0CE,
-	29283 - 11905: 0xA0AE,
-	29284 - 11905: 0xA0AF,
-	29285 - 11905: 0xA0B0,
-	29286 - 11905: 0xEAF3,
-	29287 - 11905: 0xC4C1,
-	29288 - 11905: 0xA0B1,
-	29289 - 11905: 0xCEEF,
-	29290 - 11905: 0xA0B2,
-	29291 - 11905: 0xA0B3,
-	29292 - 11905: 0xA0B4,
-	29293 - 11905: 0xA0B5,
-	29294 - 11905: 0xEAF0,
-	29295 - 11905: 0xEAF4,
-	29296 - 11905: 0xA0B6,
-	29297 - 11905: 0xA0B7,
-	29298 - 11905: 0xC9FC,
-	29299 - 11905: 0xA0B8,
-	29300 - 11905: 0xA0B9,
-	29301 - 11905: 0xC7A3,
-	29302 - 11905: 0xA0BA,
-	29303 - 11905: 0xA0BB,
-	29304 - 11905: 0xA0BC,
-	29305 - 11905: 0xCCD8,
-	29306 - 11905: 0xCEFE,
-	29307 - 11905: 0xA0BD,
-	29308 - 11905: 0xA0BE,
-	29309 - 11905: 0xA0BF,
-	29310 - 11905: 0xEAF5,
-	29311 - 11905: 0xEAF6,
-	29312 - 11905: 0xCFAC,
-	29313 - 11905: 0xC0E7,
-	29314 - 11905: 0xA0C0,
-	29315 - 11905: 0xA0C1,
-	29316 - 11905: 0xEAF7,
-	29317 - 11905: 0xA0C2,
-	29318 - 11905: 0xA0C3,
-	29319 - 11905: 0xA0C4,
-	29320 - 11905: 0xA0C5,
-	29321 - 11905: 0xA0C6,
-	29322 - 11905: 0xB6BF,
-	29323 - 11905: 0xEAF8,
-	29324 - 11905: 0xA0C7,
-	29325 - 11905: 0xEAF9,
-	29326 - 11905: 0xA0C8,
-	29327 - 11905: 0xEAFA,
-	29328 - 11905: 0xA0C9,
-	29329 - 11905: 0xA0CA,
-	29330 - 11905: 0xEAFB,
-	29331 - 11905: 0xA0CB,
-	29332 - 11905: 0xA0CC,
-	29333 - 11905: 0xA0CD,
-	29334 - 11905: 0xA0CE,
-	29335 - 11905: 0xA0CF,
-	29336 - 11905: 0xA0D0,
-	29337 - 11905: 0xA0D1,
-	29338 - 11905: 0xA0D2,
-	29339 - 11905: 0xA0D3,
-	29340 - 11905: 0xA0D4,
-	29341 - 11905: 0xA0D5,
-	29342 - 11905: 0xA0D6,
-	29343 - 11905: 0xEAF1,
-	29344 - 11905: 0xA0D7,
-	29345 - 11905: 0xA0D8,
-	29346 - 11905: 0xA0D9,
-	29347 - 11905: 0xA0DA,
-	29348 - 11905: 0xA0DB,
-	29349 - 11905: 0xA0DC,
-	29350 - 11905: 0xA0DD,
-	29351 - 11905: 0xA0DE,
-	29352 - 11905: 0xA0DF,
-	29353 - 11905: 0xA0E0,
-	29354 - 11905: 0xA0E1,
-	29355 - 11905: 0xA0E2,
-	29356 - 11905: 0xC8AE,
-	29357 - 11905: 0xE1EB,
-	29358 - 11905: 0xA0E3,
-	29359 - 11905: 0xB7B8,
-	29360 - 11905: 0xE1EC,
-	29361 - 11905: 0xA0E4,
-	29362 - 11905: 0xA0E5,
-	29363 - 11905: 0xA0E6,
-	29364 - 11905: 0xE1ED,
-	29365 - 11905: 0xA0E7,
-	29366 - 11905: 0xD7B4,
-	29367 - 11905: 0xE1EE,
-	29368 - 11905: 0xE1EF,
-	29369 - 11905: 0xD3CC,
-	29370 - 11905: 0xA0E8,
-	29371 - 11905: 0xA0E9,
-	29372 - 11905: 0xA0EA,
-	29373 - 11905: 0xA0EB,
-	29374 - 11905: 0xA0EC,
-	29375 - 11905: 0xA0ED,
-	29376 - 11905: 0xA0EE,
-	29377 - 11905: 0xE1F1,
-	29378 - 11905: 0xBFF1,
-	29379 - 11905: 0xE1F0,
-	29380 - 11905: 0xB5D2,
-	29381 - 11905: 0xA0EF,
-	29382 - 11905: 0xA0F0,
-	29383 - 11905: 0xA0F1,
-	29384 - 11905: 0xB1B7,
-	29385 - 11905: 0xA0F2,
-	29386 - 11905: 0xA0F3,
-	29387 - 11905: 0xA0F4,
-	29388 - 11905: 0xA0F5,
-	29389 - 11905: 0xE1F3,
-	29390 - 11905: 0xE1F2,
-	29391 - 11905: 0xA0F6,
-	29392 - 11905: 0xBAFC,
-	29393 - 11905: 0xA0F7,
-	29394 - 11905: 0xE1F4,
-	29395 - 11905: 0xA0F8,
-	29396 - 11905: 0xA0F9,
-	29397 - 11905: 0xA0FA,
-	29398 - 11905: 0xA0FB,
-	29399 - 11905: 0xB9B7,
-	29400 - 11905: 0xA0FC,
-	29401 - 11905: 0xBED1,
-	29402 - 11905: 0xA0FD,
-	29403 - 11905: 0xA0FE,
-	29404 - 11905: 0xAA40,
-	29405 - 11905: 0xAA41,
-	29406 - 11905: 0xC4FC,
-	29407 - 11905: 0xAA42,
-	29408 - 11905: 0xBADD,
-	29409 - 11905: 0xBDC6,
-	29410 - 11905: 0xAA43,
-	29411 - 11905: 0xAA44,
-	29412 - 11905: 0xAA45,
-	29413 - 11905: 0xAA46,
-	29414 - 11905: 0xAA47,
-	29415 - 11905: 0xAA48,
-	29416 - 11905: 0xE1F5,
-	29417 - 11905: 0xE1F7,
-	29418 - 11905: 0xAA49,
-	29419 - 11905: 0xAA4A,
-	29420 - 11905: 0xB6C0,
-	29421 - 11905: 0xCFC1,
-	29422 - 11905: 0xCAA8,
-	29423 - 11905: 0xE1F6,
-	29424 - 11905: 0xD5F8,
-	29425 - 11905: 0xD3FC,
-	29426 - 11905: 0xE1F8,
-	29427 - 11905: 0xE1FC,
-	29428 - 11905: 0xE1F9,
-	29429 - 11905: 0xAA4B,
-	29430 - 11905: 0xAA4C,
-	29431 - 11905: 0xE1FA,
-	29432 - 11905: 0xC0EA,
-	29433 - 11905: 0xAA4D,
-	29434 - 11905: 0xE1FE,
-	29435 - 11905: 0xE2A1,
-	29436 - 11905: 0xC0C7,
-	29437 - 11905: 0xAA4E,
-	29438 - 11905: 0xAA4F,
-	29439 - 11905: 0xAA50,
-	29440 - 11905: 0xAA51,
-	29441 - 11905: 0xE1FB,
-	29442 - 11905: 0xAA52,
-	29443 - 11905: 0xE1FD,
-	29444 - 11905: 0xAA53,
-	29445 - 11905: 0xAA54,
-	29446 - 11905: 0xAA55,
-	29447 - 11905: 0xAA56,
-	29448 - 11905: 0xAA57,
-	29449 - 11905: 0xAA58,
-	29450 - 11905: 0xE2A5,
-	29451 - 11905: 0xAA59,
-	29452 - 11905: 0xAA5A,
-	29453 - 11905: 0xAA5B,
-	29454 - 11905: 0xC1D4,
-	29455 - 11905: 0xAA5C,
-	29456 - 11905: 0xAA5D,
-	29457 - 11905: 0xAA5E,
-	29458 - 11905: 0xAA5F,
-	29459 - 11905: 0xE2A3,
-	29460 - 11905: 0xAA60,
-	29461 - 11905: 0xE2A8,
-	29462 - 11905: 0xB2FE,
-	29463 - 11905: 0xE2A2,
-	29464 - 11905: 0xAA61,
-	29465 - 11905: 0xAA62,
-	29466 - 11905: 0xAA63,
-	29467 - 11905: 0xC3CD,
-	29468 - 11905: 0xB2C2,
-	29469 - 11905: 0xE2A7,
-	29470 - 11905: 0xE2A6,
-	29471 - 11905: 0xAA64,
-	29472 - 11905: 0xAA65,
-	29473 - 11905: 0xE2A4,
-	29474 - 11905: 0xE2A9,
-	29475 - 11905: 0xAA66,
-	29476 - 11905: 0xAA67,
-	29477 - 11905: 0xE2AB,
-	29478 - 11905: 0xAA68,
-	29479 - 11905: 0xAA69,
-	29480 - 11905: 0xAA6A,
-	29481 - 11905: 0xD0C9,
-	29482 - 11905: 0xD6ED,
-	29483 - 11905: 0xC3A8,
-	29484 - 11905: 0xE2AC,
-	29485 - 11905: 0xAA6B,
-	29486 - 11905: 0xCFD7,
-	29487 - 11905: 0xAA6C,
-	29488 - 11905: 0xAA6D,
-	29489 - 11905: 0xE2AE,
-	29490 - 11905: 0xAA6E,
-	29491 - 11905: 0xAA6F,
-	29492 - 11905: 0xBAEF,
-	29493 - 11905: 0xAA70,
-	29494 - 11905: 0xAA71,
-	29495 - 11905: 0xE9E0,
-	29496 - 11905: 0xE2AD,
-	29497 - 11905: 0xE2AA,
-	29498 - 11905: 0xAA72,
-	29499 - 11905: 0xAA73,
-	29500 - 11905: 0xAA74,
-	29501 - 11905: 0xAA75,
-	29502 - 11905: 0xBBAB,
-	29503 - 11905: 0xD4B3,
-	29504 - 11905: 0xAA76,
-	29505 - 11905: 0xAA77,
-	29506 - 11905: 0xAA78,
-	29507 - 11905: 0xAA79,
-	29508 - 11905: 0xAA7A,
-	29509 - 11905: 0xAA7B,
-	29510 - 11905: 0xAA7C,
-	29511 - 11905: 0xAA7D,
-	29512 - 11905: 0xAA7E,
-	29513 - 11905: 0xAA80,
-	29514 - 11905: 0xAA81,
-	29515 - 11905: 0xAA82,
-	29516 - 11905: 0xAA83,
-	29517 - 11905: 0xE2B0,
-	29518 - 11905: 0xAA84,
-	29519 - 11905: 0xAA85,
-	29520 - 11905: 0xE2AF,
-	29521 - 11905: 0xAA86,
-	29522 - 11905: 0xE9E1,
-	29523 - 11905: 0xAA87,
-	29524 - 11905: 0xAA88,
-	29525 - 11905: 0xAA89,
-	29526 - 11905: 0xAA8A,
-	29527 - 11905: 0xE2B1,
-	29528 - 11905: 0xAA8B,
-	29529 - 11905: 0xAA8C,
-	29530 - 11905: 0xAA8D,
-	29531 - 11905: 0xAA8E,
-	29532 - 11905: 0xAA8F,
-	29533 - 11905: 0xAA90,
-	29534 - 11905: 0xAA91,
-	29535 - 11905: 0xAA92,
-	29536 - 11905: 0xE2B2,
-	29537 - 11905: 0xAA93,
-	29538 - 11905: 0xAA94,
-	29539 - 11905: 0xAA95,
-	29540 - 11905: 0xAA96,
-	29541 - 11905: 0xAA97,
-	29542 - 11905: 0xAA98,
-	29543 - 11905: 0xAA99,
-	29544 - 11905: 0xAA9A,
-	29545 - 11905: 0xAA9B,
-	29546 - 11905: 0xAA9C,
-	29547 - 11905: 0xAA9D,
-	29548 - 11905: 0xE2B3,
-	29549 - 11905: 0xCCA1,
-	29550 - 11905: 0xAA9E,
-	29551 - 11905: 0xE2B4,
-	29552 - 11905: 0xAA9F,
-	29553 - 11905: 0xAAA0,
-	29554 - 11905: 0xAB40,
-	29555 - 11905: 0xAB41,
-	29556 - 11905: 0xAB42,
-	29557 - 11905: 0xAB43,
-	29558 - 11905: 0xAB44,
-	29559 - 11905: 0xAB45,
-	29560 - 11905: 0xAB46,
-	29561 - 11905: 0xAB47,
-	29562 - 11905: 0xAB48,
-	29563 - 11905: 0xAB49,
-	29564 - 11905: 0xAB4A,
-	29565 - 11905: 0xAB4B,
-	29566 - 11905: 0xE2B5,
-	29567 - 11905: 0xAB4C,
-	29568 - 11905: 0xAB4D,
-	29569 - 11905: 0xAB4E,
-	29570 - 11905: 0xAB4F,
-	29571 - 11905: 0xAB50,
-	29572 - 11905: 0xD0FE,
-	29573 - 11905: 0xAB51,
-	29574 - 11905: 0xAB52,
-	29575 - 11905: 0xC2CA,
-	29576 - 11905: 0xAB53,
-	29577 - 11905: 0xD3F1,
-	29578 - 11905: 0xAB54,
-	29579 - 11905: 0xCDF5,
-	29580 - 11905: 0xAB55,
-	29581 - 11905: 0xAB56,
-	29582 - 11905: 0xE7E0,
-	29583 - 11905: 0xAB57,
-	29584 - 11905: 0xAB58,
-	29585 - 11905: 0xE7E1,
-	29586 - 11905: 0xAB59,
-	29587 - 11905: 0xAB5A,
-	29588 - 11905: 0xAB5B,
-	29589 - 11905: 0xAB5C,
-	29590 - 11905: 0xBEC1,
-	29591 - 11905: 0xAB5D,
-	29592 - 11905: 0xAB5E,
-	29593 - 11905: 0xAB5F,
-	29594 - 11905: 0xAB60,
-	29595 - 11905: 0xC2EA,
-	29596 - 11905: 0xAB61,
-	29597 - 11905: 0xAB62,
-	29598 - 11905: 0xAB63,
-	29599 - 11905: 0xE7E4,
-	29600 - 11905: 0xAB64,
-	29601 - 11905: 0xAB65,
-	29602 - 11905: 0xE7E3,
-	29603 - 11905: 0xAB66,
-	29604 - 11905: 0xAB67,
-	29605 - 11905: 0xAB68,
-	29606 - 11905: 0xAB69,
-	29607 - 11905: 0xAB6A,
-	29608 - 11905: 0xAB6B,
-	29609 - 11905: 0xCDE6,
-	29610 - 11905: 0xAB6C,
-	29611 - 11905: 0xC3B5,
-	29612 - 11905: 0xAB6D,
-	29613 - 11905: 0xAB6E,
-	29614 - 11905: 0xE7E2,
-	29615 - 11905: 0xBBB7,
-	29616 - 11905: 0xCFD6,
-	29617 - 11905: 0xAB6F,
-	29618 - 11905: 0xC1E1,
-	29619 - 11905: 0xE7E9,
-	29620 - 11905: 0xAB70,
-	29621 - 11905: 0xAB71,
-	29622 - 11905: 0xAB72,
-	29623 - 11905: 0xE7E8,
-	29624 - 11905: 0xAB73,
-	29625 - 11905: 0xAB74,
-	29626 - 11905: 0xE7F4,
-	29627 - 11905: 0xB2A3,
-	29628 - 11905: 0xAB75,
-	29629 - 11905: 0xAB76,
-	29630 - 11905: 0xAB77,
-	29631 - 11905: 0xAB78,
-	29632 - 11905: 0xE7EA,
-	29633 - 11905: 0xAB79,
-	29634 - 11905: 0xE7E6,
-	29635 - 11905: 0xAB7A,
-	29636 - 11905: 0xAB7B,
-	29637 - 11905: 0xAB7C,
-	29638 - 11905: 0xAB7D,
-	29639 - 11905: 0xAB7E,
-	29640 - 11905: 0xE7EC,
-	29641 - 11905: 0xE7EB,
-	29642 - 11905: 0xC9BA,
-	29643 - 11905: 0xAB80,
-	29644 - 11905: 0xAB81,
-	29645 - 11905: 0xD5E4,
-	29646 - 11905: 0xAB82,
-	29647 - 11905: 0xE7E5,
-	29648 - 11905: 0xB7A9,
-	29649 - 11905: 0xE7E7,
-	29650 - 11905: 0xAB83,
-	29651 - 11905: 0xAB84,
-	29652 - 11905: 0xAB85,
-	29653 - 11905: 0xAB86,
-	29654 - 11905: 0xAB87,
-	29655 - 11905: 0xAB88,
-	29656 - 11905: 0xAB89,
-	29657 - 11905: 0xE7EE,
-	29658 - 11905: 0xAB8A,
-	29659 - 11905: 0xAB8B,
-	29660 - 11905: 0xAB8C,
-	29661 - 11905: 0xAB8D,
-	29662 - 11905: 0xE7F3,
-	29663 - 11905: 0xAB8E,
-	29664 - 11905: 0xD6E9,
-	29665 - 11905: 0xAB8F,
-	29666 - 11905: 0xAB90,
-	29667 - 11905: 0xAB91,
-	29668 - 11905: 0xAB92,
-	29669 - 11905: 0xE7ED,
-	29670 - 11905: 0xAB93,
-	29671 - 11905: 0xE7F2,
-	29672 - 11905: 0xAB94,
-	29673 - 11905: 0xE7F1,
-	29674 - 11905: 0xAB95,
-	29675 - 11905: 0xAB96,
-	29676 - 11905: 0xAB97,
-	29677 - 11905: 0xB0E0,
-	29678 - 11905: 0xAB98,
-	29679 - 11905: 0xAB99,
-	29680 - 11905: 0xAB9A,
-	29681 - 11905: 0xAB9B,
-	29682 - 11905: 0xE7F5,
-	29683 - 11905: 0xAB9C,
-	29684 - 11905: 0xAB9D,
-	29685 - 11905: 0xAB9E,
-	29686 - 11905: 0xAB9F,
-	29687 - 11905: 0xABA0,
-	29688 - 11905: 0xAC40,
-	29689 - 11905: 0xAC41,
-	29690 - 11905: 0xAC42,
-	29691 - 11905: 0xAC43,
-	29692 - 11905: 0xAC44,
-	29693 - 11905: 0xAC45,
-	29694 - 11905: 0xAC46,
-	29695 - 11905: 0xAC47,
-	29696 - 11905: 0xAC48,
-	29697 - 11905: 0xAC49,
-	29698 - 11905: 0xAC4A,
-	29699 - 11905: 0xC7F2,
-	29700 - 11905: 0xAC4B,
-	29701 - 11905: 0xC0C5,
-	29702 - 11905: 0xC0ED,
-	29703 - 11905: 0xAC4C,
-	29704 - 11905: 0xAC4D,
-	29705 - 11905: 0xC1F0,
-	29706 - 11905: 0xE7F0,
-	29707 - 11905: 0xAC4E,
-	29708 - 11905: 0xAC4F,
-	29709 - 11905: 0xAC50,
-	29710 - 11905: 0xAC51,
-	29711 - 11905: 0xE7F6,
-	29712 - 11905: 0xCBF6,
-	29713 - 11905: 0xAC52,
-	29714 - 11905: 0xAC53,
-	29715 - 11905: 0xAC54,
-	29716 - 11905: 0xAC55,
-	29717 - 11905: 0xAC56,
-	29718 - 11905: 0xAC57,
-	29719 - 11905: 0xAC58,
-	29720 - 11905: 0xAC59,
-	29721 - 11905: 0xAC5A,
-	29722 - 11905: 0xE8A2,
-	29723 - 11905: 0xE8A1,
-	29724 - 11905: 0xAC5B,
-	29725 - 11905: 0xAC5C,
-	29726 - 11905: 0xAC5D,
-	29727 - 11905: 0xAC5E,
-	29728 - 11905: 0xAC5F,
-	29729 - 11905: 0xAC60,
-	29730 - 11905: 0xD7C1,
-	29731 - 11905: 0xAC61,
-	29732 - 11905: 0xAC62,
-	29733 - 11905: 0xE7FA,
-	29734 - 11905: 0xE7F9,
-	29735 - 11905: 0xAC63,
-	29736 - 11905: 0xE7FB,
-	29737 - 11905: 0xAC64,
-	29738 - 11905: 0xE7F7,
-	29739 - 11905: 0xAC65,
-	29740 - 11905: 0xE7FE,
-	29741 - 11905: 0xAC66,
-	29742 - 11905: 0xE7FD,
-	29743 - 11905: 0xAC67,
-	29744 - 11905: 0xE7FC,
-	29745 - 11905: 0xAC68,
-	29746 - 11905: 0xAC69,
-	29747 - 11905: 0xC1D5,
-	29748 - 11905: 0xC7D9,
-	29749 - 11905: 0xC5FD,
-	29750 - 11905: 0xC5C3,
-	29751 - 11905: 0xAC6A,
-	29752 - 11905: 0xAC6B,
-	29753 - 11905: 0xAC6C,
-	29754 - 11905: 0xAC6D,
-	29755 - 11905: 0xAC6E,
-	29756 - 11905: 0xC7ED,
-	29757 - 11905: 0xAC6F,
-	29758 - 11905: 0xAC70,
-	29759 - 11905: 0xAC71,
-	29760 - 11905: 0xAC72,
-	29761 - 11905: 0xE8A3,
-	29762 - 11905: 0xAC73,
-	29763 - 11905: 0xAC74,
-	29764 - 11905: 0xAC75,
-	29765 - 11905: 0xAC76,
-	29766 - 11905: 0xAC77,
-	29767 - 11905: 0xAC78,
-	29768 - 11905: 0xAC79,
-	29769 - 11905: 0xAC7A,
-	29770 - 11905: 0xAC7B,
-	29771 - 11905: 0xAC7C,
-	29772 - 11905: 0xAC7D,
-	29773 - 11905: 0xAC7E,
-	29774 - 11905: 0xAC80,
-	29775 - 11905: 0xAC81,
-	29776 - 11905: 0xAC82,
-	29777 - 11905: 0xAC83,
-	29778 - 11905: 0xAC84,
-	29779 - 11905: 0xAC85,
-	29780 - 11905: 0xAC86,
-	29781 - 11905: 0xE8A6,
-	29782 - 11905: 0xAC87,
-	29783 - 11905: 0xE8A5,
-	29784 - 11905: 0xAC88,
-	29785 - 11905: 0xE8A7,
-	29786 - 11905: 0xBAF7,
-	29787 - 11905: 0xE7F8,
-	29788 - 11905: 0xE8A4,
-	29789 - 11905: 0xAC89,
-	29790 - 11905: 0xC8F0,
-	29791 - 11905: 0xC9AA,
-	29792 - 11905: 0xAC8A,
-	29793 - 11905: 0xAC8B,
-	29794 - 11905: 0xAC8C,
-	29795 - 11905: 0xAC8D,
-	29796 - 11905: 0xAC8E,
-	29797 - 11905: 0xAC8F,
-	29798 - 11905: 0xAC90,
-	29799 - 11905: 0xAC91,
-	29800 - 11905: 0xAC92,
-	29801 - 11905: 0xAC93,
-	29802 - 11905: 0xAC94,
-	29803 - 11905: 0xAC95,
-	29804 - 11905: 0xAC96,
-	29805 - 11905: 0xE8A9,
-	29806 - 11905: 0xAC97,
-	29807 - 11905: 0xAC98,
-	29808 - 11905: 0xB9E5,
-	29809 - 11905: 0xAC99,
-	29810 - 11905: 0xAC9A,
-	29811 - 11905: 0xAC9B,
-	29812 - 11905: 0xAC9C,
-	29813 - 11905: 0xAC9D,
-	29814 - 11905: 0xD1FE,
-	29815 - 11905: 0xE8A8,
-	29816 - 11905: 0xAC9E,
-	29817 - 11905: 0xAC9F,
-	29818 - 11905: 0xACA0,
-	29819 - 11905: 0xAD40,
-	29820 - 11905: 0xAD41,
-	29821 - 11905: 0xAD42,
-	29822 - 11905: 0xE8AA,
-	29823 - 11905: 0xAD43,
-	29824 - 11905: 0xE8AD,
-	29825 - 11905: 0xE8AE,
-	29826 - 11905: 0xAD44,
-	29827 - 11905: 0xC1A7,
-	29828 - 11905: 0xAD45,
-	29829 - 11905: 0xAD46,
-	29830 - 11905: 0xAD47,
-	29831 - 11905: 0xE8AF,
-	29832 - 11905: 0xAD48,
-	29833 - 11905: 0xAD49,
-	29834 - 11905: 0xAD4A,
-	29835 - 11905: 0xE8B0,
-	29836 - 11905: 0xAD4B,
-	29837 - 11905: 0xAD4C,
-	29838 - 11905: 0xE8AC,
-	29839 - 11905: 0xAD4D,
-	29840 - 11905: 0xE8B4,
-	29841 - 11905: 0xAD4E,
-	29842 - 11905: 0xAD4F,
-	29843 - 11905: 0xAD50,
-	29844 - 11905: 0xAD51,
-	29845 - 11905: 0xAD52,
-	29846 - 11905: 0xAD53,
-	29847 - 11905: 0xAD54,
-	29848 - 11905: 0xAD55,
-	29849 - 11905: 0xAD56,
-	29850 - 11905: 0xAD57,
-	29851 - 11905: 0xAD58,
-	29852 - 11905: 0xE8AB,
-	29853 - 11905: 0xAD59,
-	29854 - 11905: 0xE8B1,
-	29855 - 11905: 0xAD5A,
-	29856 - 11905: 0xAD5B,
-	29857 - 11905: 0xAD5C,
-	29858 - 11905: 0xAD5D,
-	29859 - 11905: 0xAD5E,
-	29860 - 11905: 0xAD5F,
-	29861 - 11905: 0xAD60,
-	29862 - 11905: 0xAD61,
-	29863 - 11905: 0xE8B5,
-	29864 - 11905: 0xE8B2,
-	29865 - 11905: 0xE8B3,
-	29866 - 11905: 0xAD62,
-	29867 - 11905: 0xAD63,
-	29868 - 11905: 0xAD64,
-	29869 - 11905: 0xAD65,
-	29870 - 11905: 0xAD66,
-	29871 - 11905: 0xAD67,
-	29872 - 11905: 0xAD68,
-	29873 - 11905: 0xAD69,
-	29874 - 11905: 0xAD6A,
-	29875 - 11905: 0xAD6B,
-	29876 - 11905: 0xAD6C,
-	29877 - 11905: 0xAD6D,
-	29878 - 11905: 0xAD6E,
-	29879 - 11905: 0xAD6F,
-	29880 - 11905: 0xAD70,
-	29881 - 11905: 0xAD71,
-	29882 - 11905: 0xE8B7,
-	29883 - 11905: 0xAD72,
-	29884 - 11905: 0xAD73,
-	29885 - 11905: 0xAD74,
-	29886 - 11905: 0xAD75,
-	29887 - 11905: 0xAD76,
-	29888 - 11905: 0xAD77,
-	29889 - 11905: 0xAD78,
-	29890 - 11905: 0xAD79,
-	29891 - 11905: 0xAD7A,
-	29892 - 11905: 0xAD7B,
-	29893 - 11905: 0xAD7C,
-	29894 - 11905: 0xAD7D,
-	29895 - 11905: 0xAD7E,
-	29896 - 11905: 0xAD80,
-	29897 - 11905: 0xAD81,
-	29898 - 11905: 0xAD82,
-	29899 - 11905: 0xAD83,
-	29900 - 11905: 0xAD84,
-	29901 - 11905: 0xAD85,
-	29902 - 11905: 0xAD86,
-	29903 - 11905: 0xAD87,
-	29904 - 11905: 0xAD88,
-	29905 - 11905: 0xAD89,
-	29906 - 11905: 0xE8B6,
-	29907 - 11905: 0xAD8A,
-	29908 - 11905: 0xAD8B,
-	29909 - 11905: 0xAD8C,
-	29910 - 11905: 0xAD8D,
-	29911 - 11905: 0xAD8E,
-	29912 - 11905: 0xAD8F,
-	29913 - 11905: 0xAD90,
-	29914 - 11905: 0xAD91,
-	29915 - 11905: 0xAD92,
-	29916 - 11905: 0xB9CF,
-	29917 - 11905: 0xAD93,
-	29918 - 11905: 0xF0AC,
-	29919 - 11905: 0xAD94,
-	29920 - 11905: 0xF0AD,
-	29921 - 11905: 0xAD95,
-	29922 - 11905: 0xC6B0,
-	29923 - 11905: 0xB0EA,
-	29924 - 11905: 0xC8BF,
-	29925 - 11905: 0xAD96,
-	29926 - 11905: 0xCDDF,
-	29927 - 11905: 0xAD97,
-	29928 - 11905: 0xAD98,
-	29929 - 11905: 0xAD99,
-	29930 - 11905: 0xAD9A,
-	29931 - 11905: 0xAD9B,
-	29932 - 11905: 0xAD9C,
-	29933 - 11905: 0xAD9D,
-	29934 - 11905: 0xCECD,
-	29935 - 11905: 0xEAB1,
-	29936 - 11905: 0xAD9E,
-	29937 - 11905: 0xAD9F,
-	29938 - 11905: 0xADA0,
-	29939 - 11905: 0xAE40,
-	29940 - 11905: 0xEAB2,
-	29941 - 11905: 0xAE41,
-	29942 - 11905: 0xC6BF,
-	29943 - 11905: 0xB4C9,
-	29944 - 11905: 0xAE42,
-	29945 - 11905: 0xAE43,
-	29946 - 11905: 0xAE44,
-	29947 - 11905: 0xAE45,
-	29948 - 11905: 0xAE46,
-	29949 - 11905: 0xAE47,
-	29950 - 11905: 0xAE48,
-	29951 - 11905: 0xEAB3,
-	29952 - 11905: 0xAE49,
-	29953 - 11905: 0xAE4A,
-	29954 - 11905: 0xAE4B,
-	29955 - 11905: 0xAE4C,
-	29956 - 11905: 0xD5E7,
-	29957 - 11905: 0xAE4D,
-	29958 - 11905: 0xAE4E,
-	29959 - 11905: 0xAE4F,
-	29960 - 11905: 0xAE50,
-	29961 - 11905: 0xAE51,
-	29962 - 11905: 0xAE52,
-	29963 - 11905: 0xAE53,
-	29964 - 11905: 0xAE54,
-	29965 - 11905: 0xDDF9,
-	29966 - 11905: 0xAE55,
-	29967 - 11905: 0xEAB4,
-	29968 - 11905: 0xAE56,
-	29969 - 11905: 0xEAB5,
-	29970 - 11905: 0xAE57,
-	29971 - 11905: 0xEAB6,
-	29972 - 11905: 0xAE58,
-	29973 - 11905: 0xAE59,
-	29974 - 11905: 0xAE5A,
-	29975 - 11905: 0xAE5B,
-	29976 - 11905: 0xB8CA,
-	29977 - 11905: 0xDFB0,
-	29978 - 11905: 0xC9F5,
-	29979 - 11905: 0xAE5C,
-	29980 - 11905: 0xCCF0,
-	29981 - 11905: 0xAE5D,
-	29982 - 11905: 0xAE5E,
-	29983 - 11905: 0xC9FA,
-	29984 - 11905: 0xAE5F,
-	29985 - 11905: 0xAE60,
-	29986 - 11905: 0xAE61,
-	29987 - 11905: 0xAE62,
-	29988 - 11905: 0xAE63,
-	29989 - 11905: 0xC9FB,
-	29990 - 11905: 0xAE64,
-	29991 - 11905: 0xAE65,
-	29992 - 11905: 0xD3C3,
-	29993 - 11905: 0xCBA6,
-	29994 - 11905: 0xAE66,
-	29995 - 11905: 0xB8A6,
-	29996 - 11905: 0xF0AE,
-	29997 - 11905: 0xB1C2,
-	29998 - 11905: 0xAE67,
-	29999 - 11905: 0xE5B8,
-	30000 - 11905: 0xCCEF,
-	30001 - 11905: 0xD3C9,
-	30002 - 11905: 0xBCD7,
-	30003 - 11905: 0xC9EA,
-	30004 - 11905: 0xAE68,
-	30005 - 11905: 0xB5E7,
-	30006 - 11905: 0xAE69,
-	30007 - 11905: 0xC4D0,
-	30008 - 11905: 0xB5E9,
-	30009 - 11905: 0xAE6A,
-	30010 - 11905: 0xEEAE,
-	30011 - 11905: 0xBBAD,
-	30012 - 11905: 0xAE6B,
-	30013 - 11905: 0xAE6C,
-	30014 - 11905: 0xE7DE,
-	30015 - 11905: 0xAE6D,
-	30016 - 11905: 0xEEAF,
-	30017 - 11905: 0xAE6E,
-	30018 - 11905: 0xAE6F,
-	30019 - 11905: 0xAE70,
-	30020 - 11905: 0xAE71,
-	30021 - 11905: 0xB3A9,
-	30022 - 11905: 0xAE72,
-	30023 - 11905: 0xAE73,
-	30024 - 11905: 0xEEB2,
-	30025 - 11905: 0xAE74,
-	30026 - 11905: 0xAE75,
-	30027 - 11905: 0xEEB1,
-	30028 - 11905: 0xBDE7,
-	30029 - 11905: 0xAE76,
-	30030 - 11905: 0xEEB0,
-	30031 - 11905: 0xCEB7,
-	30032 - 11905: 0xAE77,
-	30033 - 11905: 0xAE78,
-	30034 - 11905: 0xAE79,
-	30035 - 11905: 0xAE7A,
-	30036 - 11905: 0xC5CF,
-	30037 - 11905: 0xAE7B,
-	30038 - 11905: 0xAE7C,
-	30039 - 11905: 0xAE7D,
-	30040 - 11905: 0xAE7E,
-	30041 - 11905: 0xC1F4,
-	30042 - 11905: 0xDBCE,
-	30043 - 11905: 0xEEB3,
-	30044 - 11905: 0xD0F3,
-	30045 - 11905: 0xAE80,
-	30046 - 11905: 0xAE81,
-	30047 - 11905: 0xAE82,
-	30048 - 11905: 0xAE83,
-	30049 - 11905: 0xAE84,
-	30050 - 11905: 0xAE85,
-	30051 - 11905: 0xAE86,
-	30052 - 11905: 0xAE87,
-	30053 - 11905: 0xC2D4,
-	30054 - 11905: 0xC6E8,
-	30055 - 11905: 0xAE88,
-	30056 - 11905: 0xAE89,
-	30057 - 11905: 0xAE8A,
-	30058 - 11905: 0xB7AC,
-	30059 - 11905: 0xAE8B,
-	30060 - 11905: 0xAE8C,
-	30061 - 11905: 0xAE8D,
-	30062 - 11905: 0xAE8E,
-	30063 - 11905: 0xAE8F,
-	30064 - 11905: 0xAE90,
-	30065 - 11905: 0xAE91,
-	30066 - 11905: 0xEEB4,
-	30067 - 11905: 0xAE92,
-	30068 - 11905: 0xB3EB,
-	30069 - 11905: 0xAE93,
-	30070 - 11905: 0xAE94,
-	30071 - 11905: 0xAE95,
-	30072 - 11905: 0xBBFB,
-	30073 - 11905: 0xEEB5,
-	30074 - 11905: 0xAE96,
-	30075 - 11905: 0xAE97,
-	30076 - 11905: 0xAE98,
-	30077 - 11905: 0xAE99,
-	30078 - 11905: 0xAE9A,
-	30079 - 11905: 0xE7DC,
-	30080 - 11905: 0xAE9B,
-	30081 - 11905: 0xAE9C,
-	30082 - 11905: 0xAE9D,
-	30083 - 11905: 0xEEB6,
-	30084 - 11905: 0xAE9E,
-	30085 - 11905: 0xAE9F,
-	30086 - 11905: 0xBDAE,
-	30087 - 11905: 0xAEA0,
-	30088 - 11905: 0xAF40,
-	30089 - 11905: 0xAF41,
-	30090 - 11905: 0xAF42,
-	30091 - 11905: 0xF1E2,
-	30092 - 11905: 0xAF43,
-	30093 - 11905: 0xAF44,
-	30094 - 11905: 0xAF45,
-	30095 - 11905: 0xCAE8,
-	30096 - 11905: 0xAF46,
-	30097 - 11905: 0xD2C9,
-	30098 - 11905: 0xF0DA,
-	30099 - 11905: 0xAF47,
-	30100 - 11905: 0xF0DB,
-	30101 - 11905: 0xAF48,
-	30102 - 11905: 0xF0DC,
-	30103 - 11905: 0xC1C6,
-	30104 - 11905: 0xAF49,
-	30105 - 11905: 0xB8ED,
-	30106 - 11905: 0xBECE,
-	30107 - 11905: 0xAF4A,
-	30108 - 11905: 0xAF4B,
-	30109 - 11905: 0xF0DE,
-	30110 - 11905: 0xAF4C,
-	30111 - 11905: 0xC5B1,
-	30112 - 11905: 0xF0DD,
-	30113 - 11905: 0xD1F1,
-	30114 - 11905: 0xAF4D,
-	30115 - 11905: 0xF0E0,
-	30116 - 11905: 0xB0CC,
-	30117 - 11905: 0xBDEA,
-	30118 - 11905: 0xAF4E,
-	30119 - 11905: 0xAF4F,
-	30120 - 11905: 0xAF50,
-	30121 - 11905: 0xAF51,
-	30122 - 11905: 0xAF52,
-	30123 - 11905: 0xD2DF,
-	30124 - 11905: 0xF0DF,
-	30125 - 11905: 0xAF53,
-	30126 - 11905: 0xB4AF,
-	30127 - 11905: 0xB7E8,
-	30128 - 11905: 0xF0E6,
-	30129 - 11905: 0xF0E5,
-	30130 - 11905: 0xC6A3,
-	30131 - 11905: 0xF0E1,
-	30132 - 11905: 0xF0E2,
-	30133 - 11905: 0xB4C3,
-	30134 - 11905: 0xAF54,
-	30135 - 11905: 0xAF55,
-	30136 - 11905: 0xF0E3,
-	30137 - 11905: 0xD5EE,
-	30138 - 11905: 0xAF56,
-	30139 - 11905: 0xAF57,
-	30140 - 11905: 0xCCDB,
-	30141 - 11905: 0xBED2,
-	30142 - 11905: 0xBCB2,
-	30143 - 11905: 0xAF58,
-	30144 - 11905: 0xAF59,
-	30145 - 11905: 0xAF5A,
-	30146 - 11905: 0xF0E8,
-	30147 - 11905: 0xF0E7,
-	30148 - 11905: 0xF0E4,
-	30149 - 11905: 0xB2A1,
-	30150 - 11905: 0xAF5B,
-	30151 - 11905: 0xD6A2,
-	30152 - 11905: 0xD3B8,
-	30153 - 11905: 0xBEB7,
-	30154 - 11905: 0xC8AC,
-	30155 - 11905: 0xAF5C,
-	30156 - 11905: 0xAF5D,
-	30157 - 11905: 0xF0EA,
-	30158 - 11905: 0xAF5E,
-	30159 - 11905: 0xAF5F,
-	30160 - 11905: 0xAF60,
-	30161 - 11905: 0xAF61,
-	30162 - 11905: 0xD1F7,
-	30163 - 11905: 0xAF62,
-	30164 - 11905: 0xD6CC,
-	30165 - 11905: 0xBADB,
-	30166 - 11905: 0xF0E9,
-	30167 - 11905: 0xAF63,
-	30168 - 11905: 0xB6BB,
-	30169 - 11905: 0xAF64,
-	30170 - 11905: 0xAF65,
-	30171 - 11905: 0xCDB4,
-	30172 - 11905: 0xAF66,
-	30173 - 11905: 0xAF67,
-	30174 - 11905: 0xC6A6,
-	30175 - 11905: 0xAF68,
-	30176 - 11905: 0xAF69,
-	30177 - 11905: 0xAF6A,
-	30178 - 11905: 0xC1A1,
-	30179 - 11905: 0xF0EB,
-	30180 - 11905: 0xF0EE,
-	30181 - 11905: 0xAF6B,
-	30182 - 11905: 0xF0ED,
-	30183 - 11905: 0xF0F0,
-	30184 - 11905: 0xF0EC,
-	30185 - 11905: 0xAF6C,
-	30186 - 11905: 0xBBBE,
-	30187 - 11905: 0xF0EF,
-	30188 - 11905: 0xAF6D,
-	30189 - 11905: 0xAF6E,
-	30190 - 11905: 0xAF6F,
-	30191 - 11905: 0xAF70,
-	30192 - 11905: 0xCCB5,
-	30193 - 11905: 0xF0F2,
-	30194 - 11905: 0xAF71,
-	30195 - 11905: 0xAF72,
-	30196 - 11905: 0xB3D5,
-	30197 - 11905: 0xAF73,
-	30198 - 11905: 0xAF74,
-	30199 - 11905: 0xAF75,
-	30200 - 11905: 0xAF76,
-	30201 - 11905: 0xB1D4,
-	30202 - 11905: 0xAF77,
-	30203 - 11905: 0xAF78,
-	30204 - 11905: 0xF0F3,
-	30205 - 11905: 0xAF79,
-	30206 - 11905: 0xAF7A,
-	30207 - 11905: 0xF0F4,
-	30208 - 11905: 0xF0F6,
-	30209 - 11905: 0xB4E1,
-	30210 - 11905: 0xAF7B,
-	30211 - 11905: 0xF0F1,
-	30212 - 11905: 0xAF7C,
-	30213 - 11905: 0xF0F7,
-	30214 - 11905: 0xAF7D,
-	30215 - 11905: 0xAF7E,
-	30216 - 11905: 0xAF80,
-	30217 - 11905: 0xAF81,
-	30218 - 11905: 0xF0FA,
-	30219 - 11905: 0xAF82,
-	30220 - 11905: 0xF0F8,
-	30221 - 11905: 0xAF83,
-	30222 - 11905: 0xAF84,
-	30223 - 11905: 0xAF85,
-	30224 - 11905: 0xF0F5,
-	30225 - 11905: 0xAF86,
-	30226 - 11905: 0xAF87,
-	30227 - 11905: 0xAF88,
-	30228 - 11905: 0xAF89,
-	30229 - 11905: 0xF0FD,
-	30230 - 11905: 0xAF8A,
-	30231 - 11905: 0xF0F9,
-	30232 - 11905: 0xF0FC,
-	30233 - 11905: 0xF0FE,
-	30234 - 11905: 0xAF8B,
-	30235 - 11905: 0xF1A1,
-	30236 - 11905: 0xAF8C,
-	30237 - 11905: 0xAF8D,
-	30238 - 11905: 0xAF8E,
-	30239 - 11905: 0xCEC1,
-	30240 - 11905: 0xF1A4,
-	30241 - 11905: 0xAF8F,
-	30242 - 11905: 0xF1A3,
-	30243 - 11905: 0xAF90,
-	30244 - 11905: 0xC1F6,
-	30245 - 11905: 0xF0FB,
-	30246 - 11905: 0xCADD,
-	30247 - 11905: 0xAF91,
-	30248 - 11905: 0xAF92,
-	30249 - 11905: 0xB4F1,
-	30250 - 11905: 0xB1F1,
-	30251 - 11905: 0xCCB1,
-	30252 - 11905: 0xAF93,
-	30253 - 11905: 0xF1A6,
-	30254 - 11905: 0xAF94,
-	30255 - 11905: 0xAF95,
-	30256 - 11905: 0xF1A7,
-	30257 - 11905: 0xAF96,
-	30258 - 11905: 0xAF97,
-	30259 - 11905: 0xF1AC,
-	30260 - 11905: 0xD5CE,
-	30261 - 11905: 0xF1A9,
-	30262 - 11905: 0xAF98,
-	30263 - 11905: 0xAF99,
-	30264 - 11905: 0xC8B3,
-	30265 - 11905: 0xAF9A,
-	30266 - 11905: 0xAF9B,
-	30267 - 11905: 0xAF9C,
-	30268 - 11905: 0xF1A2,
-	30269 - 11905: 0xAF9D,
-	30270 - 11905: 0xF1AB,
-	30271 - 11905: 0xF1A8,
-	30272 - 11905: 0xF1A5,
-	30273 - 11905: 0xAF9E,
-	30274 - 11905: 0xAF9F,
-	30275 - 11905: 0xF1AA,
-	30276 - 11905: 0xAFA0,
-	30277 - 11905: 0xB040,
-	30278 - 11905: 0xB041,
-	30279 - 11905: 0xB042,
-	30280 - 11905: 0xB043,
-	30281 - 11905: 0xB044,
-	30282 - 11905: 0xB045,
-	30283 - 11905: 0xB046,
-	30284 - 11905: 0xB0A9,
-	30285 - 11905: 0xF1AD,
-	30286 - 11905: 0xB047,
-	30287 - 11905: 0xB048,
-	30288 - 11905: 0xB049,
-	30289 - 11905: 0xB04A,
-	30290 - 11905: 0xB04B,
-	30291 - 11905: 0xB04C,
-	30292 - 11905: 0xF1AF,
-	30293 - 11905: 0xB04D,
-	30294 - 11905: 0xF1B1,
-	30295 - 11905: 0xB04E,
-	30296 - 11905: 0xB04F,
-	30297 - 11905: 0xB050,
-	30298 - 11905: 0xB051,
-	30299 - 11905: 0xB052,
-	30300 - 11905: 0xF1B0,
-	30301 - 11905: 0xB053,
-	30302 - 11905: 0xF1AE,
-	30303 - 11905: 0xB054,
-	30304 - 11905: 0xB055,
-	30305 - 11905: 0xB056,
-	30306 - 11905: 0xB057,
-	30307 - 11905: 0xD1A2,
-	30308 - 11905: 0xB058,
-	30309 - 11905: 0xB059,
-	30310 - 11905: 0xB05A,
-	30311 - 11905: 0xB05B,
-	30312 - 11905: 0xB05C,
-	30313 - 11905: 0xB05D,
-	30314 - 11905: 0xB05E,
-	30315 - 11905: 0xF1B2,
-	30316 - 11905: 0xB05F,
-	30317 - 11905: 0xB060,
-	30318 - 11905: 0xB061,
-	30319 - 11905: 0xF1B3,
-	30320 - 11905: 0xB062,
-	30321 - 11905: 0xB063,
-	30322 - 11905: 0xB064,
-	30323 - 11905: 0xB065,
-	30324 - 11905: 0xB066,
-	30325 - 11905: 0xB067,
-	30326 - 11905: 0xB068,
-	30327 - 11905: 0xB069,
-	30328 - 11905: 0xB9EF,
-	30329 - 11905: 0xB06A,
-	30330 - 11905: 0xB06B,
-	30331 - 11905: 0xB5C7,
-	30332 - 11905: 0xB06C,
-	30333 - 11905: 0xB0D7,
-	30334 - 11905: 0xB0D9,
-	30335 - 11905: 0xB06D,
-	30336 - 11905: 0xB06E,
-	30337 - 11905: 0xB06F,
-	30338 - 11905: 0xD4ED,
-	30339 - 11905: 0xB070,
-	30340 - 11905: 0xB5C4,
-	30341 - 11905: 0xB071,
-	30342 - 11905: 0xBDD4,
-	30343 - 11905: 0xBBCA,
-	30344 - 11905: 0xF0A7,
-	30345 - 11905: 0xB072,
-	30346 - 11905: 0xB073,
-	30347 - 11905: 0xB8DE,
-	30348 - 11905: 0xB074,
-	30349 - 11905: 0xB075,
-	30350 - 11905: 0xF0A8,
-	30351 - 11905: 0xB076,
-	30352 - 11905: 0xB077,
-	30353 - 11905: 0xB0A8,
-	30354 - 11905: 0xB078,
-	30355 - 11905: 0xF0A9,
-	30356 - 11905: 0xB079,
-	30357 - 11905: 0xB07A,
-	30358 - 11905: 0xCDEE,
-	30359 - 11905: 0xB07B,
-	30360 - 11905: 0xB07C,
-	30361 - 11905: 0xF0AA,
-	30362 - 11905: 0xB07D,
-	30363 - 11905: 0xB07E,
-	30364 - 11905: 0xB080,
-	30365 - 11905: 0xB081,
-	30366 - 11905: 0xB082,
-	30367 - 11905: 0xB083,
-	30368 - 11905: 0xB084,
-	30369 - 11905: 0xB085,
-	30370 - 11905: 0xB086,
-	30371 - 11905: 0xB087,
-	30372 - 11905: 0xF0AB,
-	30373 - 11905: 0xB088,
-	30374 - 11905: 0xB089,
-	30375 - 11905: 0xB08A,
-	30376 - 11905: 0xB08B,
-	30377 - 11905: 0xB08C,
-	30378 - 11905: 0xB08D,
-	30379 - 11905: 0xB08E,
-	30380 - 11905: 0xB08F,
-	30381 - 11905: 0xB090,
-	30382 - 11905: 0xC6A4,
-	30383 - 11905: 0xB091,
-	30384 - 11905: 0xB092,
-	30385 - 11905: 0xD6E5,
-	30386 - 11905: 0xF1E4,
-	30387 - 11905: 0xB093,
-	30388 - 11905: 0xF1E5,
-	30389 - 11905: 0xB094,
-	30390 - 11905: 0xB095,
-	30391 - 11905: 0xB096,
-	30392 - 11905: 0xB097,
-	30393 - 11905: 0xB098,
-	30394 - 11905: 0xB099,
-	30395 - 11905: 0xB09A,
-	30396 - 11905: 0xB09B,
-	30397 - 11905: 0xB09C,
-	30398 - 11905: 0xB09D,
-	30399 - 11905: 0xC3F3,
-	30400 - 11905: 0xB09E,
-	30401 - 11905: 0xB09F,
-	30402 - 11905: 0xD3DB,
-	30403 - 11905: 0xB0A0,
-	30404 - 11905: 0xB140,
-	30405 - 11905: 0xD6D1,
-	30406 - 11905: 0xC5E8,
-	30407 - 11905: 0xB141,
-	30408 - 11905: 0xD3AF,
-	30409 - 11905: 0xB142,
-	30410 - 11905: 0xD2E6,
-	30411 - 11905: 0xB143,
-	30412 - 11905: 0xB144,
-	30413 - 11905: 0xEEC1,
-	30414 - 11905: 0xB0BB,
-	30415 - 11905: 0xD5B5,
-	30416 - 11905: 0xD1CE,
-	30417 - 11905: 0xBCE0,
-	30418 - 11905: 0xBAD0,
-	30419 - 11905: 0xB145,
-	30420 - 11905: 0xBFF8,
-	30421 - 11905: 0xB146,
-	30422 - 11905: 0xB8C7,
-	30423 - 11905: 0xB5C1,
-	30424 - 11905: 0xC5CC,
-	30425 - 11905: 0xB147,
-	30426 - 11905: 0xB148,
-	30427 - 11905: 0xCAA2,
-	30428 - 11905: 0xB149,
-	30429 - 11905: 0xB14A,
-	30430 - 11905: 0xB14B,
-	30431 - 11905: 0xC3CB,
-	30432 - 11905: 0xB14C,
-	30433 - 11905: 0xB14D,
-	30434 - 11905: 0xB14E,
-	30435 - 11905: 0xB14F,
-	30436 - 11905: 0xB150,
-	30437 - 11905: 0xEEC2,
-	30438 - 11905: 0xB151,
-	30439 - 11905: 0xB152,
-	30440 - 11905: 0xB153,
-	30441 - 11905: 0xB154,
-	30442 - 11905: 0xB155,
-	30443 - 11905: 0xB156,
-	30444 - 11905: 0xB157,
-	30445 - 11905: 0xB158,
-	30446 - 11905: 0xC4BF,
-	30447 - 11905: 0xB6A2,
-	30448 - 11905: 0xB159,
-	30449 - 11905: 0xEDEC,
-	30450 - 11905: 0xC3A4,
-	30451 - 11905: 0xB15A,
-	30452 - 11905: 0xD6B1,
-	30453 - 11905: 0xB15B,
-	30454 - 11905: 0xB15C,
-	30455 - 11905: 0xB15D,
-	30456 - 11905: 0xCFE0,
-	30457 - 11905: 0xEDEF,
-	30458 - 11905: 0xB15E,
-	30459 - 11905: 0xB15F,
-	30460 - 11905: 0xC5CE,
-	30461 - 11905: 0xB160,
-	30462 - 11905: 0xB6DC,
-	30463 - 11905: 0xB161,
-	30464 - 11905: 0xB162,
-	30465 - 11905: 0xCAA1,
-	30466 - 11905: 0xB163,
-	30467 - 11905: 0xB164,
-	30468 - 11905: 0xEDED,
-	30469 - 11905: 0xB165,
-	30470 - 11905: 0xB166,
-	30471 - 11905: 0xEDF0,
-	30472 - 11905: 0xEDF1,
-	30473 - 11905: 0xC3BC,
-	30474 - 11905: 0xB167,
-	30475 - 11905: 0xBFB4,
-	30476 - 11905: 0xB168,
-	30477 - 11905: 0xEDEE,
-	30478 - 11905: 0xB169,
-	30479 - 11905: 0xB16A,
-	30480 - 11905: 0xB16B,
-	30481 - 11905: 0xB16C,
-	30482 - 11905: 0xB16D,
-	30483 - 11905: 0xB16E,
-	30484 - 11905: 0xB16F,
-	30485 - 11905: 0xB170,
-	30486 - 11905: 0xB171,
-	30487 - 11905: 0xB172,
-	30488 - 11905: 0xB173,
-	30489 - 11905: 0xEDF4,
-	30490 - 11905: 0xEDF2,
-	30491 - 11905: 0xB174,
-	30492 - 11905: 0xB175,
-	30493 - 11905: 0xB176,
-	30494 - 11905: 0xB177,
-	30495 - 11905: 0xD5E6,
-	30496 - 11905: 0xC3DF,
-	30497 - 11905: 0xB178,
-	30498 - 11905: 0xEDF3,
-	30499 - 11905: 0xB179,
-	30500 - 11905: 0xB17A,
-	30501 - 11905: 0xB17B,
-	30502 - 11905: 0xEDF6,
-	30503 - 11905: 0xB17C,
-	30504 - 11905: 0xD5A3,
-	30505 - 11905: 0xD1A3,
-	30506 - 11905: 0xB17D,
-	30507 - 11905: 0xB17E,
-	30508 - 11905: 0xB180,
-	30509 - 11905: 0xEDF5,
-	30510 - 11905: 0xB181,
-	30511 - 11905: 0xC3D0,
-	30512 - 11905: 0xB182,
-	30513 - 11905: 0xB183,
-	30514 - 11905: 0xB184,
-	30515 - 11905: 0xB185,
-	30516 - 11905: 0xB186,
-	30517 - 11905: 0xEDF7,
-	30518 - 11905: 0xBFF4,
-	30519 - 11905: 0xBEEC,
-	30520 - 11905: 0xEDF8,
-	30521 - 11905: 0xB187,
-	30522 - 11905: 0xCCF7,
-	30523 - 11905: 0xB188,
-	30524 - 11905: 0xD1DB,
-	30525 - 11905: 0xB189,
-	30526 - 11905: 0xB18A,
-	30527 - 11905: 0xB18B,
-	30528 - 11905: 0xD7C5,
-	30529 - 11905: 0xD5F6,
-	30530 - 11905: 0xB18C,
-	30531 - 11905: 0xEDFC,
-	30532 - 11905: 0xB18D,
-	30533 - 11905: 0xB18E,
-	30534 - 11905: 0xB18F,
-	30535 - 11905: 0xEDFB,
-	30536 - 11905: 0xB190,
-	30537 - 11905: 0xB191,
-	30538 - 11905: 0xB192,
-	30539 - 11905: 0xB193,
-	30540 - 11905: 0xB194,
-	30541 - 11905: 0xB195,
-	30542 - 11905: 0xB196,
-	30543 - 11905: 0xB197,
-	30544 - 11905: 0xEDF9,
-	30545 - 11905: 0xEDFA,
-	30546 - 11905: 0xB198,
-	30547 - 11905: 0xB199,
-	30548 - 11905: 0xB19A,
-	30549 - 11905: 0xB19B,
-	30550 - 11905: 0xB19C,
-	30551 - 11905: 0xB19D,
-	30552 - 11905: 0xB19E,
-	30553 - 11905: 0xB19F,
-	30554 - 11905: 0xEDFD,
-	30555 - 11905: 0xBEA6,
-	30556 - 11905: 0xB1A0,
-	30557 - 11905: 0xB240,
-	30558 - 11905: 0xB241,
-	30559 - 11905: 0xB242,
-	30560 - 11905: 0xB243,
-	30561 - 11905: 0xCBAF,
-	30562 - 11905: 0xEEA1,
-	30563 - 11905: 0xB6BD,
-	30564 - 11905: 0xB244,
-	30565 - 11905: 0xEEA2,
-	30566 - 11905: 0xC4C0,
-	30567 - 11905: 0xB245,
-	30568 - 11905: 0xEDFE,
-	30569 - 11905: 0xB246,
-	30570 - 11905: 0xB247,
-	30571 - 11905: 0xBDDE,
-	30572 - 11905: 0xB2C7,
-	30573 - 11905: 0xB248,
-	30574 - 11905: 0xB249,
-	30575 - 11905: 0xB24A,
-	30576 - 11905: 0xB24B,
-	30577 - 11905: 0xB24C,
-	30578 - 11905: 0xB24D,
-	30579 - 11905: 0xB24E,
-	30580 - 11905: 0xB24F,
-	30581 - 11905: 0xB250,
-	30582 - 11905: 0xB251,
-	30583 - 11905: 0xB252,
-	30584 - 11905: 0xB253,
-	30585 - 11905: 0xB6C3,
-	30586 - 11905: 0xB254,
-	30587 - 11905: 0xB255,
-	30588 - 11905: 0xB256,
-	30589 - 11905: 0xEEA5,
-	30590 - 11905: 0xD8BA,
-	30591 - 11905: 0xEEA3,
-	30592 - 11905: 0xEEA6,
-	30593 - 11905: 0xB257,
-	30594 - 11905: 0xB258,
-	30595 - 11905: 0xB259,
-	30596 - 11905: 0xC3E9,
-	30597 - 11905: 0xB3F2,
-	30598 - 11905: 0xB25A,
-	30599 - 11905: 0xB25B,
-	30600 - 11905: 0xB25C,
-	30601 - 11905: 0xB25D,
-	30602 - 11905: 0xB25E,
-	30603 - 11905: 0xB25F,
-	30604 - 11905: 0xEEA7,
-	30605 - 11905: 0xEEA4,
-	30606 - 11905: 0xCFB9,
-	30607 - 11905: 0xB260,
-	30608 - 11905: 0xB261,
-	30609 - 11905: 0xEEA8,
-	30610 - 11905: 0xC2F7,
-	30611 - 11905: 0xB262,
-	30612 - 11905: 0xB263,
-	30613 - 11905: 0xB264,
-	30614 - 11905: 0xB265,
-	30615 - 11905: 0xB266,
-	30616 - 11905: 0xB267,
-	30617 - 11905: 0xB268,
-	30618 - 11905: 0xB269,
-	30619 - 11905: 0xB26A,
-	30620 - 11905: 0xB26B,
-	30621 - 11905: 0xB26C,
-	30622 - 11905: 0xB26D,
-	30623 - 11905: 0xEEA9,
-	30624 - 11905: 0xEEAA,
-	30625 - 11905: 0xB26E,
-	30626 - 11905: 0xDEAB,
-	30627 - 11905: 0xB26F,
-	30628 - 11905: 0xB270,
-	30629 - 11905: 0xC6B3,
-	30630 - 11905: 0xB271,
-	30631 - 11905: 0xC7C6,
-	30632 - 11905: 0xB272,
-	30633 - 11905: 0xD6F5,
-	30634 - 11905: 0xB5C9,
-	30635 - 11905: 0xB273,
-	30636 - 11905: 0xCBB2,
-	30637 - 11905: 0xB274,
-	30638 - 11905: 0xB275,
-	30639 - 11905: 0xB276,
-	30640 - 11905: 0xEEAB,
-	30641 - 11905: 0xB277,
-	30642 - 11905: 0xB278,
-	30643 - 11905: 0xCDAB,
-	30644 - 11905: 0xB279,
-	30645 - 11905: 0xEEAC,
-	30646 - 11905: 0xB27A,
-	30647 - 11905: 0xB27B,
-	30648 - 11905: 0xB27C,
-	30649 - 11905: 0xB27D,
-	30650 - 11905: 0xB27E,
-	30651 - 11905: 0xD5B0,
-	30652 - 11905: 0xB280,
-	30653 - 11905: 0xEEAD,
-	30654 - 11905: 0xB281,
-	30655 - 11905: 0xF6C4,
-	30656 - 11905: 0xB282,
-	30657 - 11905: 0xB283,
-	30658 - 11905: 0xB284,
-	30659 - 11905: 0xB285,
-	30660 - 11905: 0xB286,
-	30661 - 11905: 0xB287,
-	30662 - 11905: 0xB288,
-	30663 - 11905: 0xB289,
-	30664 - 11905: 0xB28A,
-	30665 - 11905: 0xB28B,
-	30666 - 11905: 0xB28C,
-	30667 - 11905: 0xB28D,
-	30668 - 11905: 0xB28E,
-	30669 - 11905: 0xDBC7,
-	30670 - 11905: 0xB28F,
-	30671 - 11905: 0xB290,
-	30672 - 11905: 0xB291,
-	30673 - 11905: 0xB292,
-	30674 - 11905: 0xB293,
-	30675 - 11905: 0xB294,
-	30676 - 11905: 0xB295,
-	30677 - 11905: 0xB296,
-	30678 - 11905: 0xB297,
-	30679 - 11905: 0xB4A3,
-	30680 - 11905: 0xB298,
-	30681 - 11905: 0xB299,
-	30682 - 11905: 0xB29A,
-	30683 - 11905: 0xC3AC,
-	30684 - 11905: 0xF1E6,
-	30685 - 11905: 0xB29B,
-	30686 - 11905: 0xB29C,
-	30687 - 11905: 0xB29D,
-	30688 - 11905: 0xB29E,
-	30689 - 11905: 0xB29F,
-	30690 - 11905: 0xCAB8,
-	30691 - 11905: 0xD2D3,
-	30692 - 11905: 0xB2A0,
-	30693 - 11905: 0xD6AA,
-	30694 - 11905: 0xB340,
-	30695 - 11905: 0xEFF2,
-	30696 - 11905: 0xB341,
-	30697 - 11905: 0xBED8,
-	30698 - 11905: 0xB342,
-	30699 - 11905: 0xBDC3,
-	30700 - 11905: 0xEFF3,
-	30701 - 11905: 0xB6CC,
-	30702 - 11905: 0xB0AB,
-	30703 - 11905: 0xB343,
-	30704 - 11905: 0xB344,
-	30705 - 11905: 0xB345,
-	30706 - 11905: 0xB346,
-	30707 - 11905: 0xCAAF,
-	30708 - 11905: 0xB347,
-	30709 - 11905: 0xB348,
-	30710 - 11905: 0xEDB6,
-	30711 - 11905: 0xB349,
-	30712 - 11905: 0xEDB7,
-	30713 - 11905: 0xB34A,
-	30714 - 11905: 0xB34B,
-	30715 - 11905: 0xB34C,
-	30716 - 11905: 0xB34D,
-	30717 - 11905: 0xCEF9,
-	30718 - 11905: 0xB7AF,
-	30719 - 11905: 0xBFF3,
-	30720 - 11905: 0xEDB8,
-	30721 - 11905: 0xC2EB,
-	30722 - 11905: 0xC9B0,
-	30723 - 11905: 0xB34E,
-	30724 - 11905: 0xB34F,
-	30725 - 11905: 0xB350,
-	30726 - 11905: 0xB351,
-	30727 - 11905: 0xB352,
-	30728 - 11905: 0xB353,
-	30729 - 11905: 0xEDB9,
-	30730 - 11905: 0xB354,
-	30731 - 11905: 0xB355,
-	30732 - 11905: 0xC6F6,
-	30733 - 11905: 0xBFB3,
-	30734 - 11905: 0xB356,
-	30735 - 11905: 0xB357,
-	30736 - 11905: 0xB358,
-	30737 - 11905: 0xEDBC,
-	30738 - 11905: 0xC5F8,
-	30739 - 11905: 0xB359,
-	30740 - 11905: 0xD1D0,
-	30741 - 11905: 0xB35A,
-	30742 - 11905: 0xD7A9,
-	30743 - 11905: 0xEDBA,
-	30744 - 11905: 0xEDBB,
-	30745 - 11905: 0xB35B,
-	30746 - 11905: 0xD1E2,
-	30747 - 11905: 0xB35C,
-	30748 - 11905: 0xEDBF,
-	30749 - 11905: 0xEDC0,
-	30750 - 11905: 0xB35D,
-	30751 - 11905: 0xEDC4,
-	30752 - 11905: 0xB35E,
-	30753 - 11905: 0xB35F,
-	30754 - 11905: 0xB360,
-	30755 - 11905: 0xEDC8,
-	30756 - 11905: 0xB361,
-	30757 - 11905: 0xEDC6,
-	30758 - 11905: 0xEDCE,
-	30759 - 11905: 0xD5E8,
-	30760 - 11905: 0xB362,
-	30761 - 11905: 0xEDC9,
-	30762 - 11905: 0xB363,
-	30763 - 11905: 0xB364,
-	30764 - 11905: 0xEDC7,
-	30765 - 11905: 0xEDBE,
-	30766 - 11905: 0xB365,
-	30767 - 11905: 0xB366,
-	30768 - 11905: 0xC5E9,
-	30769 - 11905: 0xB367,
-	30770 - 11905: 0xB368,
-	30771 - 11905: 0xB369,
-	30772 - 11905: 0xC6C6,
-	30773 - 11905: 0xB36A,
-	30774 - 11905: 0xB36B,
-	30775 - 11905: 0xC9E9,
-	30776 - 11905: 0xD4D2,
-	30777 - 11905: 0xEDC1,
-	30778 - 11905: 0xEDC2,
-	30779 - 11905: 0xEDC3,
-	30780 - 11905: 0xEDC5,
-	30781 - 11905: 0xB36C,
-	30782 - 11905: 0xC0F9,
-	30783 - 11905: 0xB36D,
-	30784 - 11905: 0xB4A1,
-	30785 - 11905: 0xB36E,
-	30786 - 11905: 0xB36F,
-	30787 - 11905: 0xB370,
-	30788 - 11905: 0xB371,
-	30789 - 11905: 0xB9E8,
-	30790 - 11905: 0xB372,
-	30791 - 11905: 0xEDD0,
-	30792 - 11905: 0xB373,
-	30793 - 11905: 0xB374,
-	30794 - 11905: 0xB375,
-	30795 - 11905: 0xB376,
-	30796 - 11905: 0xEDD1,
-	30797 - 11905: 0xB377,
-	30798 - 11905: 0xEDCA,
-	30799 - 11905: 0xB378,
-	30800 - 11905: 0xEDCF,
-	30801 - 11905: 0xB379,
-	30802 - 11905: 0xCEF8,
-	30803 - 11905: 0xB37A,
-	30804 - 11905: 0xB37B,
-	30805 - 11905: 0xCBB6,
-	30806 - 11905: 0xEDCC,
-	30807 - 11905: 0xEDCD,
-	30808 - 11905: 0xB37C,
-	30809 - 11905: 0xB37D,
-	30810 - 11905: 0xB37E,
-	30811 - 11905: 0xB380,
-	30812 - 11905: 0xB381,
-	30813 - 11905: 0xCFF5,
-	30814 - 11905: 0xB382,
-	30815 - 11905: 0xB383,
-	30816 - 11905: 0xB384,
-	30817 - 11905: 0xB385,
-	30818 - 11905: 0xB386,
-	30819 - 11905: 0xB387,
-	30820 - 11905: 0xB388,
-	30821 - 11905: 0xB389,
-	30822 - 11905: 0xB38A,
-	30823 - 11905: 0xB38B,
-	30824 - 11905: 0xB38C,
-	30825 - 11905: 0xB38D,
-	30826 - 11905: 0xEDD2,
-	30827 - 11905: 0xC1F2,
-	30828 - 11905: 0xD3B2,
-	30829 - 11905: 0xEDCB,
-	30830 - 11905: 0xC8B7,
-	30831 - 11905: 0xB38E,
-	30832 - 11905: 0xB38F,
-	30833 - 11905: 0xB390,
-	30834 - 11905: 0xB391,
-	30835 - 11905: 0xB392,
-	30836 - 11905: 0xB393,
-	30837 - 11905: 0xB394,
-	30838 - 11905: 0xB395,
-	30839 - 11905: 0xBCEF,
-	30840 - 11905: 0xB396,
-	30841 - 11905: 0xB397,
-	30842 - 11905: 0xB398,
-	30843 - 11905: 0xB399,
-	30844 - 11905: 0xC5F0,
-	30845 - 11905: 0xB39A,
-	30846 - 11905: 0xB39B,
-	30847 - 11905: 0xB39C,
-	30848 - 11905: 0xB39D,
-	30849 - 11905: 0xB39E,
-	30850 - 11905: 0xB39F,
-	30851 - 11905: 0xB3A0,
-	30852 - 11905: 0xB440,
-	30853 - 11905: 0xB441,
-	30854 - 11905: 0xB442,
-	30855 - 11905: 0xEDD6,
-	30856 - 11905: 0xB443,
-	30857 - 11905: 0xB5EF,
-	30858 - 11905: 0xB444,
-	30859 - 11905: 0xB445,
-	30860 - 11905: 0xC2B5,
-	30861 - 11905: 0xB0AD,
-	30862 - 11905: 0xCBE9,
-	30863 - 11905: 0xB446,
-	30864 - 11905: 0xB447,
-	30865 - 11905: 0xB1AE,
-	30866 - 11905: 0xB448,
-	30867 - 11905: 0xEDD4,
-	30868 - 11905: 0xB449,
-	30869 - 11905: 0xB44A,
-	30870 - 11905: 0xB44B,
-	30871 - 11905: 0xCDEB,
-	30872 - 11905: 0xB5E2,
-	30873 - 11905: 0xB44C,
-	30874 - 11905: 0xEDD5,
-	30875 - 11905: 0xEDD3,
-	30876 - 11905: 0xEDD7,
-	30877 - 11905: 0xB44D,
-	30878 - 11905: 0xB44E,
-	30879 - 11905: 0xB5FA,
-	30880 - 11905: 0xB44F,
-	30881 - 11905: 0xEDD8,
-	30882 - 11905: 0xB450,
-	30883 - 11905: 0xEDD9,
-	30884 - 11905: 0xB451,
-	30885 - 11905: 0xEDDC,
-	30886 - 11905: 0xB452,
-	30887 - 11905: 0xB1CC,
-	30888 - 11905: 0xB453,
-	30889 - 11905: 0xB454,
-	30890 - 11905: 0xB455,
-	30891 - 11905: 0xB456,
-	30892 - 11905: 0xB457,
-	30893 - 11905: 0xB458,
-	30894 - 11905: 0xB459,
-	30895 - 11905: 0xB45A,
-	30896 - 11905: 0xC5F6,
-	30897 - 11905: 0xBCEE,
-	30898 - 11905: 0xEDDA,
-	30899 - 11905: 0xCCBC,
-	30900 - 11905: 0xB2EA,
-	30901 - 11905: 0xB45B,
-	30902 - 11905: 0xB45C,
-	30903 - 11905: 0xB45D,
-	30904 - 11905: 0xB45E,
-	30905 - 11905: 0xEDDB,
-	30906 - 11905: 0xB45F,
-	30907 - 11905: 0xB460,
-	30908 - 11905: 0xB461,
-	30909 - 11905: 0xB462,
-	30910 - 11905: 0xC4EB,
-	30911 - 11905: 0xB463,
-	30912 - 11905: 0xB464,
-	30913 - 11905: 0xB4C5,
-	30914 - 11905: 0xB465,
-	30915 - 11905: 0xB466,
-	30916 - 11905: 0xB467,
-	30917 - 11905: 0xB0F5,
-	30918 - 11905: 0xB468,
-	30919 - 11905: 0xB469,
-	30920 - 11905: 0xB46A,
-	30921 - 11905: 0xEDDF,
-	30922 - 11905: 0xC0DA,
-	30923 - 11905: 0xB4E8,
-	30924 - 11905: 0xB46B,
-	30925 - 11905: 0xB46C,
-	30926 - 11905: 0xB46D,
-	30927 - 11905: 0xB46E,
-	30928 - 11905: 0xC5CD,
-	30929 - 11905: 0xB46F,
-	30930 - 11905: 0xB470,
-	30931 - 11905: 0xB471,
-	30932 - 11905: 0xEDDD,
-	30933 - 11905: 0xBFC4,
-	30934 - 11905: 0xB472,
-	30935 - 11905: 0xB473,
-	30936 - 11905: 0xB474,
-	30937 - 11905: 0xEDDE,
-	30938 - 11905: 0xB475,
-	30939 - 11905: 0xB476,
-	30940 - 11905: 0xB477,
-	30941 - 11905: 0xB478,
-	30942 - 11905: 0xB479,
-	30943 - 11905: 0xB47A,
-	30944 - 11905: 0xB47B,
-	30945 - 11905: 0xB47C,
-	30946 - 11905: 0xB47D,
-	30947 - 11905: 0xB47E,
-	30948 - 11905: 0xB480,
-	30949 - 11905: 0xB481,
-	30950 - 11905: 0xB482,
-	30951 - 11905: 0xB483,
-	30952 - 11905: 0xC4A5,
-	30953 - 11905: 0xB484,
-	30954 - 11905: 0xB485,
-	30955 - 11905: 0xB486,
-	30956 - 11905: 0xEDE0,
-	30957 - 11905: 0xB487,
-	30958 - 11905: 0xB488,
-	30959 - 11905: 0xB489,
-	30960 - 11905: 0xB48A,
-	30961 - 11905: 0xB48B,
-	30962 - 11905: 0xEDE1,
-	30963 - 11905: 0xB48C,
-	30964 - 11905: 0xEDE3,
-	30965 - 11905: 0xB48D,
-	30966 - 11905: 0xB48E,
-	30967 - 11905: 0xC1D7,
-	30968 - 11905: 0xB48F,
-	30969 - 11905: 0xB490,
-	30970 - 11905: 0xBBC7,
-	30971 - 11905: 0xB491,
-	30972 - 11905: 0xB492,
-	30973 - 11905: 0xB493,
-	30974 - 11905: 0xB494,
-	30975 - 11905: 0xB495,
-	30976 - 11905: 0xB496,
-	30977 - 11905: 0xBDB8,
-	30978 - 11905: 0xB497,
-	30979 - 11905: 0xB498,
-	30980 - 11905: 0xB499,
-	30981 - 11905: 0xEDE2,
-	30982 - 11905: 0xB49A,
-	30983 - 11905: 0xB49B,
-	30984 - 11905: 0xB49C,
-	30985 - 11905: 0xB49D,
-	30986 - 11905: 0xB49E,
-	30987 - 11905: 0xB49F,
-	30988 - 11905: 0xB4A0,
-	30989 - 11905: 0xB540,
-	30990 - 11905: 0xB541,
-	30991 - 11905: 0xB542,
-	30992 - 11905: 0xB543,
-	30993 - 11905: 0xB544,
-	30994 - 11905: 0xB545,
-	30995 - 11905: 0xEDE4,
-	30996 - 11905: 0xB546,
-	30997 - 11905: 0xB547,
-	30998 - 11905: 0xB548,
-	30999 - 11905: 0xB549,
-	31000 - 11905: 0xB54A,
-	31001 - 11905: 0xB54B,
-	31002 - 11905: 0xB54C,
-	31003 - 11905: 0xB54D,
-	31004 - 11905: 0xB54E,
-	31005 - 11905: 0xB54F,
-	31006 - 11905: 0xEDE6,
-	31007 - 11905: 0xB550,
-	31008 - 11905: 0xB551,
-	31009 - 11905: 0xB552,
-	31010 - 11905: 0xB553,
-	31011 - 11905: 0xB554,
-	31012 - 11905: 0xEDE5,
-	31013 - 11905: 0xB555,
-	31014 - 11905: 0xB556,
-	31015 - 11905: 0xB557,
-	31016 - 11905: 0xB558,
-	31017 - 11905: 0xB559,
-	31018 - 11905: 0xB55A,
-	31019 - 11905: 0xB55B,
-	31020 - 11905: 0xB55C,
-	31021 - 11905: 0xB55D,
-	31022 - 11905: 0xB55E,
-	31023 - 11905: 0xB55F,
-	31024 - 11905: 0xB560,
-	31025 - 11905: 0xB561,
-	31026 - 11905: 0xB562,
-	31027 - 11905: 0xB563,
-	31028 - 11905: 0xEDE7,
-	31029 - 11905: 0xB564,
-	31030 - 11905: 0xB565,
-	31031 - 11905: 0xB566,
-	31032 - 11905: 0xB567,
-	31033 - 11905: 0xB568,
-	31034 - 11905: 0xCABE,
-	31035 - 11905: 0xECEA,
-	31036 - 11905: 0xC0F1,
-	31037 - 11905: 0xB569,
-	31038 - 11905: 0xC9E7,
-	31039 - 11905: 0xB56A,
-	31040 - 11905: 0xECEB,
-	31041 - 11905: 0xC6EE,
-	31042 - 11905: 0xB56B,
-	31043 - 11905: 0xB56C,
-	31044 - 11905: 0xB56D,
-	31045 - 11905: 0xB56E,
-	31046 - 11905: 0xECEC,
-	31047 - 11905: 0xB56F,
-	31048 - 11905: 0xC6ED,
-	31049 - 11905: 0xECED,
-	31050 - 11905: 0xB570,
-	31051 - 11905: 0xB571,
-	31052 - 11905: 0xB572,
-	31053 - 11905: 0xB573,
-	31054 - 11905: 0xB574,
-	31055 - 11905: 0xB575,
-	31056 - 11905: 0xB576,
-	31057 - 11905: 0xB577,
-	31058 - 11905: 0xB578,
-	31059 - 11905: 0xECF0,
-	31060 - 11905: 0xB579,
-	31061 - 11905: 0xB57A,
-	31062 - 11905: 0xD7E6,
-	31063 - 11905: 0xECF3,
-	31064 - 11905: 0xB57B,
-	31065 - 11905: 0xB57C,
-	31066 - 11905: 0xECF1,
-	31067 - 11905: 0xECEE,
-	31068 - 11905: 0xECEF,
-	31069 - 11905: 0xD7A3,
-	31070 - 11905: 0xC9F1,
-	31071 - 11905: 0xCBEE,
-	31072 - 11905: 0xECF4,
-	31073 - 11905: 0xB57D,
-	31074 - 11905: 0xECF2,
-	31075 - 11905: 0xB57E,
-	31076 - 11905: 0xB580,
-	31077 - 11905: 0xCFE9,
-	31078 - 11905: 0xB581,
-	31079 - 11905: 0xECF6,
-	31080 - 11905: 0xC6B1,
-	31081 - 11905: 0xB582,
-	31082 - 11905: 0xB583,
-	31083 - 11905: 0xB584,
-	31084 - 11905: 0xB585,
-	31085 - 11905: 0xBCC0,
-	31086 - 11905: 0xB586,
-	31087 - 11905: 0xECF5,
-	31088 - 11905: 0xB587,
-	31089 - 11905: 0xB588,
-	31090 - 11905: 0xB589,
-	31091 - 11905: 0xB58A,
-	31092 - 11905: 0xB58B,
-	31093 - 11905: 0xB58C,
-	31094 - 11905: 0xB58D,
-	31095 - 11905: 0xB5BB,
-	31096 - 11905: 0xBBF6,
-	31097 - 11905: 0xB58E,
-	31098 - 11905: 0xECF7,
-	31099 - 11905: 0xB58F,
-	31100 - 11905: 0xB590,
-	31101 - 11905: 0xB591,
-	31102 - 11905: 0xB592,
-	31103 - 11905: 0xB593,
-	31104 - 11905: 0xD9F7,
-	31105 - 11905: 0xBDFB,
-	31106 - 11905: 0xB594,
-	31107 - 11905: 0xB595,
-	31108 - 11905: 0xC2BB,
-	31109 - 11905: 0xECF8,
-	31110 - 11905: 0xB596,
-	31111 - 11905: 0xB597,
-	31112 - 11905: 0xB598,
-	31113 - 11905: 0xB599,
-	31114 - 11905: 0xECF9,
-	31115 - 11905: 0xB59A,
-	31116 - 11905: 0xB59B,
-	31117 - 11905: 0xB59C,
-	31118 - 11905: 0xB59D,
-	31119 - 11905: 0xB8A3,
-	31120 - 11905: 0xB59E,
-	31121 - 11905: 0xB59F,
-	31122 - 11905: 0xB5A0,
-	31123 - 11905: 0xB640,
-	31124 - 11905: 0xB641,
-	31125 - 11905: 0xB642,
-	31126 - 11905: 0xB643,
-	31127 - 11905: 0xB644,
-	31128 - 11905: 0xB645,
-	31129 - 11905: 0xB646,
-	31130 - 11905: 0xECFA,
-	31131 - 11905: 0xB647,
-	31132 - 11905: 0xB648,
-	31133 - 11905: 0xB649,
-	31134 - 11905: 0xB64A,
-	31135 - 11905: 0xB64B,
-	31136 - 11905: 0xB64C,
-	31137 - 11905: 0xB64D,
-	31138 - 11905: 0xB64E,
-	31139 - 11905: 0xB64F,
-	31140 - 11905: 0xB650,
-	31141 - 11905: 0xB651,
-	31142 - 11905: 0xB652,
-	31143 - 11905: 0xECFB,
-	31144 - 11905: 0xB653,
-	31145 - 11905: 0xB654,
-	31146 - 11905: 0xB655,
-	31147 - 11905: 0xB656,
-	31148 - 11905: 0xB657,
-	31149 - 11905: 0xB658,
-	31150 - 11905: 0xB659,
-	31151 - 11905: 0xB65A,
-	31152 - 11905: 0xB65B,
-	31153 - 11905: 0xB65C,
-	31154 - 11905: 0xB65D,
-	31155 - 11905: 0xECFC,
-	31156 - 11905: 0xB65E,
-	31157 - 11905: 0xB65F,
-	31158 - 11905: 0xB660,
-	31159 - 11905: 0xB661,
-	31160 - 11905: 0xB662,
-	31161 - 11905: 0xD3ED,
-	31162 - 11905: 0xD8AE,
-	31163 - 11905: 0xC0EB,
-	31164 - 11905: 0xB663,
-	31165 - 11905: 0xC7DD,
-	31166 - 11905: 0xBACC,
-	31167 - 11905: 0xB664,
-	31168 - 11905: 0xD0E3,
-	31169 - 11905: 0xCBBD,
-	31170 - 11905: 0xB665,
-	31171 - 11905: 0xCDBA,
-	31172 - 11905: 0xB666,
-	31173 - 11905: 0xB667,
-	31174 - 11905: 0xB8D1,
-	31175 - 11905: 0xB668,
-	31176 - 11905: 0xB669,
-	31177 - 11905: 0xB1FC,
-	31178 - 11905: 0xB66A,
-	31179 - 11905: 0xC7EF,
-	31180 - 11905: 0xB66B,
-	31181 - 11905: 0xD6D6,
-	31182 - 11905: 0xB66C,
-	31183 - 11905: 0xB66D,
-	31184 - 11905: 0xB66E,
-	31185 - 11905: 0xBFC6,
-	31186 - 11905: 0xC3EB,
-	31187 - 11905: 0xB66F,
-	31188 - 11905: 0xB670,
-	31189 - 11905: 0xEFF5,
-	31190 - 11905: 0xB671,
-	31191 - 11905: 0xB672,
-	31192 - 11905: 0xC3D8,
-	31193 - 11905: 0xB673,
-	31194 - 11905: 0xB674,
-	31195 - 11905: 0xB675,
-	31196 - 11905: 0xB676,
-	31197 - 11905: 0xB677,
-	31198 - 11905: 0xB678,
-	31199 - 11905: 0xD7E2,
-	31200 - 11905: 0xB679,
-	31201 - 11905: 0xB67A,
-	31202 - 11905: 0xB67B,
-	31203 - 11905: 0xEFF7,
-	31204 - 11905: 0xB3D3,
-	31205 - 11905: 0xB67C,
-	31206 - 11905: 0xC7D8,
-	31207 - 11905: 0xD1ED,
-	31208 - 11905: 0xB67D,
-	31209 - 11905: 0xD6C8,
-	31210 - 11905: 0xB67E,
-	31211 - 11905: 0xEFF8,
-	31212 - 11905: 0xB680,
-	31213 - 11905: 0xEFF6,
-	31214 - 11905: 0xB681,
-	31215 - 11905: 0xBBFD,
-	31216 - 11905: 0xB3C6,
-	31217 - 11905: 0xB682,
-	31218 - 11905: 0xB683,
-	31219 - 11905: 0xB684,
-	31220 - 11905: 0xB685,
-	31221 - 11905: 0xB686,
-	31222 - 11905: 0xB687,
-	31223 - 11905: 0xB688,
-	31224 - 11905: 0xBDD5,
-	31225 - 11905: 0xB689,
-	31226 - 11905: 0xB68A,
-	31227 - 11905: 0xD2C6,
-	31228 - 11905: 0xB68B,
-	31229 - 11905: 0xBBE0,
-	31230 - 11905: 0xB68C,
-	31231 - 11905: 0xB68D,
-	31232 - 11905: 0xCFA1,
-	31233 - 11905: 0xB68E,
-	31234 - 11905: 0xEFFC,
-	31235 - 11905: 0xEFFB,
-	31236 - 11905: 0xB68F,
-	31237 - 11905: 0xB690,
-	31238 - 11905: 0xEFF9,
-	31239 - 11905: 0xB691,
-	31240 - 11905: 0xB692,
-	31241 - 11905: 0xB693,
-	31242 - 11905: 0xB694,
-	31243 - 11905: 0xB3CC,
-	31244 - 11905: 0xB695,
-	31245 - 11905: 0xC9D4,
-	31246 - 11905: 0xCBB0,
-	31247 - 11905: 0xB696,
-	31248 - 11905: 0xB697,
-	31249 - 11905: 0xB698,
-	31250 - 11905: 0xB699,
-	31251 - 11905: 0xB69A,
-	31252 - 11905: 0xEFFE,
-	31253 - 11905: 0xB69B,
-	31254 - 11905: 0xB69C,
-	31255 - 11905: 0xB0DE,
-	31256 - 11905: 0xB69D,
-	31257 - 11905: 0xB69E,
-	31258 - 11905: 0xD6C9,
-	31259 - 11905: 0xB69F,
-	31260 - 11905: 0xB6A0,
-	31261 - 11905: 0xB740,
-	31262 - 11905: 0xEFFD,
-	31263 - 11905: 0xB741,
-	31264 - 11905: 0xB3ED,
-	31265 - 11905: 0xB742,
-	31266 - 11905: 0xB743,
-	31267 - 11905: 0xF6D5,
-	31268 - 11905: 0xB744,
-	31269 - 11905: 0xB745,
-	31270 - 11905: 0xB746,
-	31271 - 11905: 0xB747,
-	31272 - 11905: 0xB748,
-	31273 - 11905: 0xB749,
-	31274 - 11905: 0xB74A,
-	31275 - 11905: 0xB74B,
-	31276 - 11905: 0xB74C,
-	31277 - 11905: 0xB74D,
-	31278 - 11905: 0xB74E,
-	31279 - 11905: 0xB74F,
-	31280 - 11905: 0xB750,
-	31281 - 11905: 0xB751,
-	31282 - 11905: 0xB752,
-	31283 - 11905: 0xCEC8,
-	31284 - 11905: 0xB753,
-	31285 - 11905: 0xB754,
-	31286 - 11905: 0xB755,
-	31287 - 11905: 0xF0A2,
-	31288 - 11905: 0xB756,
-	31289 - 11905: 0xF0A1,
-	31290 - 11905: 0xB757,
-	31291 - 11905: 0xB5BE,
-	31292 - 11905: 0xBCDA,
-	31293 - 11905: 0xBBFC,
-	31294 - 11905: 0xB758,
-	31295 - 11905: 0xB8E5,
-	31296 - 11905: 0xB759,
-	31297 - 11905: 0xB75A,
-	31298 - 11905: 0xB75B,
-	31299 - 11905: 0xB75C,
-	31300 - 11905: 0xB75D,
-	31301 - 11905: 0xB75E,
-	31302 - 11905: 0xC4C2,
-	31303 - 11905: 0xB75F,
-	31304 - 11905: 0xB760,
-	31305 - 11905: 0xB761,
-	31306 - 11905: 0xB762,
-	31307 - 11905: 0xB763,
-	31308 - 11905: 0xB764,
-	31309 - 11905: 0xB765,
-	31310 - 11905: 0xB766,
-	31311 - 11905: 0xB767,
-	31312 - 11905: 0xB768,
-	31313 - 11905: 0xF0A3,
-	31314 - 11905: 0xB769,
-	31315 - 11905: 0xB76A,
-	31316 - 11905: 0xB76B,
-	31317 - 11905: 0xB76C,
-	31318 - 11905: 0xB76D,
-	31319 - 11905: 0xCBEB,
-	31320 - 11905: 0xB76E,
-	31321 - 11905: 0xB76F,
-	31322 - 11905: 0xB770,
-	31323 - 11905: 0xB771,
-	31324 - 11905: 0xB772,
-	31325 - 11905: 0xB773,
-	31326 - 11905: 0xB774,
-	31327 - 11905: 0xB775,
-	31328 - 11905: 0xB776,
-	31329 - 11905: 0xB777,
-	31330 - 11905: 0xB778,
-	31331 - 11905: 0xB779,
-	31332 - 11905: 0xB77A,
-	31333 - 11905: 0xB77B,
-	31334 - 11905: 0xB77C,
-	31335 - 11905: 0xB77D,
-	31336 - 11905: 0xB77E,
-	31337 - 11905: 0xB780,
-	31338 - 11905: 0xB781,
-	31339 - 11905: 0xB782,
-	31340 - 11905: 0xB783,
-	31341 - 11905: 0xB784,
-	31342 - 11905: 0xB785,
-	31343 - 11905: 0xB786,
-	31344 - 11905: 0xF0A6,
-	31345 - 11905: 0xB787,
-	31346 - 11905: 0xB788,
-	31347 - 11905: 0xB789,
-	31348 - 11905: 0xD1A8,
-	31349 - 11905: 0xB78A,
-	31350 - 11905: 0xBEBF,
-	31351 - 11905: 0xC7EE,
-	31352 - 11905: 0xF1B6,
-	31353 - 11905: 0xF1B7,
-	31354 - 11905: 0xBFD5,
-	31355 - 11905: 0xB78B,
-	31356 - 11905: 0xB78C,
-	31357 - 11905: 0xB78D,
-	31358 - 11905: 0xB78E,
-	31359 - 11905: 0xB4A9,
-	31360 - 11905: 0xF1B8,
-	31361 - 11905: 0xCDBB,
-	31362 - 11905: 0xB78F,
-	31363 - 11905: 0xC7D4,
-	31364 - 11905: 0xD5AD,
-	31365 - 11905: 0xB790,
-	31366 - 11905: 0xF1B9,
-	31367 - 11905: 0xB791,
-	31368 - 11905: 0xF1BA,
-	31369 - 11905: 0xB792,
-	31370 - 11905: 0xB793,
-	31371 - 11905: 0xB794,
-	31372 - 11905: 0xB795,
-	31373 - 11905: 0xC7CF,
-	31374 - 11905: 0xB796,
-	31375 - 11905: 0xB797,
-	31376 - 11905: 0xB798,
-	31377 - 11905: 0xD2A4,
-	31378 - 11905: 0xD6CF,
-	31379 - 11905: 0xB799,
-	31380 - 11905: 0xB79A,
-	31381 - 11905: 0xF1BB,
-	31382 - 11905: 0xBDD1,
-	31383 - 11905: 0xB4B0,
-	31384 - 11905: 0xBEBD,
-	31385 - 11905: 0xB79B,
-	31386 - 11905: 0xB79C,
-	31387 - 11905: 0xB79D,
-	31388 - 11905: 0xB4DC,
-	31389 - 11905: 0xCED1,
-	31390 - 11905: 0xB79E,
-	31391 - 11905: 0xBFDF,
-	31392 - 11905: 0xF1BD,
-	31393 - 11905: 0xB79F,
-	31394 - 11905: 0xB7A0,
-	31395 - 11905: 0xB840,
-	31396 - 11905: 0xB841,
-	31397 - 11905: 0xBFFA,
-	31398 - 11905: 0xF1BC,
-	31399 - 11905: 0xB842,
-	31400 - 11905: 0xF1BF,
-	31401 - 11905: 0xB843,
-	31402 - 11905: 0xB844,
-	31403 - 11905: 0xB845,
-	31404 - 11905: 0xF1BE,
-	31405 - 11905: 0xF1C0,
-	31406 - 11905: 0xB846,
-	31407 - 11905: 0xB847,
-	31408 - 11905: 0xB848,
-	31409 - 11905: 0xB849,
-	31410 - 11905: 0xB84A,
-	31411 - 11905: 0xF1C1,
-	31412 - 11905: 0xB84B,
-	31413 - 11905: 0xB84C,
-	31414 - 11905: 0xB84D,
-	31415 - 11905: 0xB84E,
-	31416 - 11905: 0xB84F,
-	31417 - 11905: 0xB850,
-	31418 - 11905: 0xB851,
-	31419 - 11905: 0xB852,
-	31420 - 11905: 0xB853,
-	31421 - 11905: 0xB854,
-	31422 - 11905: 0xB855,
-	31423 - 11905: 0xC1FE,
-	31424 - 11905: 0xB856,
-	31425 - 11905: 0xB857,
-	31426 - 11905: 0xB858,
-	31427 - 11905: 0xB859,
-	31428 - 11905: 0xB85A,
-	31429 - 11905: 0xB85B,
-	31430 - 11905: 0xB85C,
-	31431 - 11905: 0xB85D,
-	31432 - 11905: 0xB85E,
-	31433 - 11905: 0xB85F,
-	31434 - 11905: 0xB860,
-	31435 - 11905: 0xC1A2,
-	31436 - 11905: 0xB861,
-	31437 - 11905: 0xB862,
-	31438 - 11905: 0xB863,
-	31439 - 11905: 0xB864,
-	31440 - 11905: 0xB865,
-	31441 - 11905: 0xB866,
-	31442 - 11905: 0xB867,
-	31443 - 11905: 0xB868,
-	31444 - 11905: 0xB869,
-	31445 - 11905: 0xB86A,
-	31446 - 11905: 0xCAFA,
-	31447 - 11905: 0xB86B,
-	31448 - 11905: 0xB86C,
-	31449 - 11905: 0xD5BE,
-	31450 - 11905: 0xB86D,
-	31451 - 11905: 0xB86E,
-	31452 - 11905: 0xB86F,
-	31453 - 11905: 0xB870,
-	31454 - 11905: 0xBEBA,
-	31455 - 11905: 0xBEB9,
-	31456 - 11905: 0xD5C2,
-	31457 - 11905: 0xB871,
-	31458 - 11905: 0xB872,
-	31459 - 11905: 0xBFA2,
-	31460 - 11905: 0xB873,
-	31461 - 11905: 0xCDAF,
-	31462 - 11905: 0xF1B5,
-	31463 - 11905: 0xB874,
-	31464 - 11905: 0xB875,
-	31465 - 11905: 0xB876,
-	31466 - 11905: 0xB877,
-	31467 - 11905: 0xB878,
-	31468 - 11905: 0xB879,
-	31469 - 11905: 0xBDDF,
-	31470 - 11905: 0xB87A,
-	31471 - 11905: 0xB6CB,
-	31472 - 11905: 0xB87B,
-	31473 - 11905: 0xB87C,
-	31474 - 11905: 0xB87D,
-	31475 - 11905: 0xB87E,
-	31476 - 11905: 0xB880,
-	31477 - 11905: 0xB881,
-	31478 - 11905: 0xB882,
-	31479 - 11905: 0xB883,
-	31480 - 11905: 0xB884,
-	31481 - 11905: 0xD6F1,
-	31482 - 11905: 0xF3C3,
-	31483 - 11905: 0xB885,
-	31484 - 11905: 0xB886,
-	31485 - 11905: 0xF3C4,
-	31486 - 11905: 0xB887,
-	31487 - 11905: 0xB8CD,
-	31488 - 11905: 0xB888,
-	31489 - 11905: 0xB889,
-	31490 - 11905: 0xB88A,
-	31491 - 11905: 0xF3C6,
-	31492 - 11905: 0xF3C7,
-	31493 - 11905: 0xB88B,
-	31494 - 11905: 0xB0CA,
-	31495 - 11905: 0xB88C,
-	31496 - 11905: 0xF3C5,
-	31497 - 11905: 0xB88D,
-	31498 - 11905: 0xF3C9,
-	31499 - 11905: 0xCBF1,
-	31500 - 11905: 0xB88E,
-	31501 - 11905: 0xB88F,
-	31502 - 11905: 0xB890,
-	31503 - 11905: 0xF3CB,
-	31504 - 11905: 0xB891,
-	31505 - 11905: 0xD0A6,
-	31506 - 11905: 0xB892,
-	31507 - 11905: 0xB893,
-	31508 - 11905: 0xB1CA,
-	31509 - 11905: 0xF3C8,
-	31510 - 11905: 0xB894,
-	31511 - 11905: 0xB895,
-	31512 - 11905: 0xB896,
-	31513 - 11905: 0xF3CF,
-	31514 - 11905: 0xB897,
-	31515 - 11905: 0xB5D1,
-	31516 - 11905: 0xB898,
-	31517 - 11905: 0xB899,
-	31518 - 11905: 0xF3D7,
-	31519 - 11905: 0xB89A,
-	31520 - 11905: 0xF3D2,
-	31521 - 11905: 0xB89B,
-	31522 - 11905: 0xB89C,
-	31523 - 11905: 0xB89D,
-	31524 - 11905: 0xF3D4,
-	31525 - 11905: 0xF3D3,
-	31526 - 11905: 0xB7FB,
-	31527 - 11905: 0xB89E,
-	31528 - 11905: 0xB1BF,
-	31529 - 11905: 0xB89F,
-	31530 - 11905: 0xF3CE,
-	31531 - 11905: 0xF3CA,
-	31532 - 11905: 0xB5DA,
-	31533 - 11905: 0xB8A0,
-	31534 - 11905: 0xF3D0,
-	31535 - 11905: 0xB940,
-	31536 - 11905: 0xB941,
-	31537 - 11905: 0xF3D1,
-	31538 - 11905: 0xB942,
-	31539 - 11905: 0xF3D5,
-	31540 - 11905: 0xB943,
-	31541 - 11905: 0xB944,
-	31542 - 11905: 0xB945,
-	31543 - 11905: 0xB946,
-	31544 - 11905: 0xF3CD,
-	31545 - 11905: 0xB947,
-	31546 - 11905: 0xBCE3,
-	31547 - 11905: 0xB948,
-	31548 - 11905: 0xC1FD,
-	31549 - 11905: 0xB949,
-	31550 - 11905: 0xF3D6,
-	31551 - 11905: 0xB94A,
-	31552 - 11905: 0xB94B,
-	31553 - 11905: 0xB94C,
-	31554 - 11905: 0xB94D,
-	31555 - 11905: 0xB94E,
-	31556 - 11905: 0xB94F,
-	31557 - 11905: 0xF3DA,
-	31558 - 11905: 0xB950,
-	31559 - 11905: 0xF3CC,
-	31560 - 11905: 0xB951,
-	31561 - 11905: 0xB5C8,
-	31562 - 11905: 0xB952,
-	31563 - 11905: 0xBDEE,
-	31564 - 11905: 0xF3DC,
-	31565 - 11905: 0xB953,
-	31566 - 11905: 0xB954,
-	31567 - 11905: 0xB7A4,
-	31568 - 11905: 0xBFF0,
-	31569 - 11905: 0xD6FE,
-	31570 - 11905: 0xCDB2,
-	31571 - 11905: 0xB955,
-	31572 - 11905: 0xB4F0,
-	31573 - 11905: 0xB956,
-	31574 - 11905: 0xB2DF,
-	31575 - 11905: 0xB957,
-	31576 - 11905: 0xF3D8,
-	31577 - 11905: 0xB958,
-	31578 - 11905: 0xF3D9,
-	31579 - 11905: 0xC9B8,
-	31580 - 11905: 0xB959,
-	31581 - 11905: 0xF3DD,
-	31582 - 11905: 0xB95A,
-	31583 - 11905: 0xB95B,
-	31584 - 11905: 0xF3DE,
-	31585 - 11905: 0xB95C,
-	31586 - 11905: 0xF3E1,
-	31587 - 11905: 0xB95D,
-	31588 - 11905: 0xB95E,
-	31589 - 11905: 0xB95F,
-	31590 - 11905: 0xB960,
-	31591 - 11905: 0xB961,
-	31592 - 11905: 0xB962,
-	31593 - 11905: 0xB963,
-	31594 - 11905: 0xB964,
-	31595 - 11905: 0xB965,
-	31596 - 11905: 0xB966,
-	31597 - 11905: 0xB967,
-	31598 - 11905: 0xF3DF,
-	31599 - 11905: 0xB968,
-	31600 - 11905: 0xB969,
-	31601 - 11905: 0xF3E3,
-	31602 - 11905: 0xF3E2,
-	31603 - 11905: 0xB96A,
-	31604 - 11905: 0xB96B,
-	31605 - 11905: 0xF3DB,
-	31606 - 11905: 0xB96C,
-	31607 - 11905: 0xBFEA,
-	31608 - 11905: 0xB96D,
-	31609 - 11905: 0xB3EF,
-	31610 - 11905: 0xB96E,
-	31611 - 11905: 0xF3E0,
-	31612 - 11905: 0xB96F,
-	31613 - 11905: 0xB970,
-	31614 - 11905: 0xC7A9,
-	31615 - 11905: 0xB971,
-	31616 - 11905: 0xBCF2,
-	31617 - 11905: 0xB972,
-	31618 - 11905: 0xB973,
-	31619 - 11905: 0xB974,
-	31620 - 11905: 0xB975,
-	31621 - 11905: 0xF3EB,
-	31622 - 11905: 0xB976,
-	31623 - 11905: 0xB977,
-	31624 - 11905: 0xB978,
-	31625 - 11905: 0xB979,
-	31626 - 11905: 0xB97A,
-	31627 - 11905: 0xB97B,
-	31628 - 11905: 0xB97C,
-	31629 - 11905: 0xB9BF,
-	31630 - 11905: 0xB97D,
-	31631 - 11905: 0xB97E,
-	31632 - 11905: 0xF3E4,
-	31633 - 11905: 0xB980,
-	31634 - 11905: 0xB981,
-	31635 - 11905: 0xB982,
-	31636 - 11905: 0xB2AD,
-	31637 - 11905: 0xBBFE,
-	31638 - 11905: 0xB983,
-	31639 - 11905: 0xCBE3,
-	31640 - 11905: 0xB984,
-	31641 - 11905: 0xB985,
-	31642 - 11905: 0xB986,
-	31643 - 11905: 0xB987,
-	31644 - 11905: 0xF3ED,
-	31645 - 11905: 0xF3E9,
-	31646 - 11905: 0xB988,
-	31647 - 11905: 0xB989,
-	31648 - 11905: 0xB98A,
-	31649 - 11905: 0xB9DC,
-	31650 - 11905: 0xF3EE,
-	31651 - 11905: 0xB98B,
-	31652 - 11905: 0xB98C,
-	31653 - 11905: 0xB98D,
-	31654 - 11905: 0xF3E5,
-	31655 - 11905: 0xF3E6,
-	31656 - 11905: 0xF3EA,
-	31657 - 11905: 0xC2E1,
-	31658 - 11905: 0xF3EC,
-	31659 - 11905: 0xF3EF,
-	31660 - 11905: 0xF3E8,
-	31661 - 11905: 0xBCFD,
-	31662 - 11905: 0xB98E,
-	31663 - 11905: 0xB98F,
-	31664 - 11905: 0xB990,
-	31665 - 11905: 0xCFE4,
-	31666 - 11905: 0xB991,
-	31667 - 11905: 0xB992,
-	31668 - 11905: 0xF3F0,
-	31669 - 11905: 0xB993,
-	31670 - 11905: 0xB994,
-	31671 - 11905: 0xB995,
-	31672 - 11905: 0xF3E7,
-	31673 - 11905: 0xB996,
-	31674 - 11905: 0xB997,
-	31675 - 11905: 0xB998,
-	31676 - 11905: 0xB999,
-	31677 - 11905: 0xB99A,
-	31678 - 11905: 0xB99B,
-	31679 - 11905: 0xB99C,
-	31680 - 11905: 0xB99D,
-	31681 - 11905: 0xF3F2,
-	31682 - 11905: 0xB99E,
-	31683 - 11905: 0xB99F,
-	31684 - 11905: 0xB9A0,
-	31685 - 11905: 0xBA40,
-	31686 - 11905: 0xD7AD,
-	31687 - 11905: 0xC6AA,
-	31688 - 11905: 0xBA41,
-	31689 - 11905: 0xBA42,
-	31690 - 11905: 0xBA43,
-	31691 - 11905: 0xBA44,
-	31692 - 11905: 0xF3F3,
-	31693 - 11905: 0xBA45,
-	31694 - 11905: 0xBA46,
-	31695 - 11905: 0xBA47,
-	31696 - 11905: 0xBA48,
-	31697 - 11905: 0xF3F1,
-	31698 - 11905: 0xBA49,
-	31699 - 11905: 0xC2A8,
-	31700 - 11905: 0xBA4A,
-	31701 - 11905: 0xBA4B,
-	31702 - 11905: 0xBA4C,
-	31703 - 11905: 0xBA4D,
-	31704 - 11905: 0xBA4E,
-	31705 - 11905: 0xB8DD,
-	31706 - 11905: 0xF3F5,
-	31707 - 11905: 0xBA4F,
-	31708 - 11905: 0xBA50,
-	31709 - 11905: 0xF3F4,
-	31710 - 11905: 0xBA51,
-	31711 - 11905: 0xBA52,
-	31712 - 11905: 0xBA53,
-	31713 - 11905: 0xB4DB,
-	31714 - 11905: 0xBA54,
-	31715 - 11905: 0xBA55,
-	31716 - 11905: 0xBA56,
-	31717 - 11905: 0xF3F6,
-	31718 - 11905: 0xF3F7,
-	31719 - 11905: 0xBA57,
-	31720 - 11905: 0xBA58,
-	31721 - 11905: 0xBA59,
-	31722 - 11905: 0xF3F8,
-	31723 - 11905: 0xBA5A,
-	31724 - 11905: 0xBA5B,
-	31725 - 11905: 0xBA5C,
-	31726 - 11905: 0xC0BA,
-	31727 - 11905: 0xBA5D,
-	31728 - 11905: 0xBA5E,
-	31729 - 11905: 0xC0E9,
-	31730 - 11905: 0xBA5F,
-	31731 - 11905: 0xBA60,
-	31732 - 11905: 0xBA61,
-	31733 - 11905: 0xBA62,
-	31734 - 11905: 0xBA63,
-	31735 - 11905: 0xC5F1,
-	31736 - 11905: 0xBA64,
-	31737 - 11905: 0xBA65,
-	31738 - 11905: 0xBA66,
-	31739 - 11905: 0xBA67,
-	31740 - 11905: 0xF3FB,
-	31741 - 11905: 0xBA68,
-	31742 - 11905: 0xF3FA,
-	31743 - 11905: 0xBA69,
-	31744 - 11905: 0xBA6A,
-	31745 - 11905: 0xBA6B,
-	31746 - 11905: 0xBA6C,
-	31747 - 11905: 0xBA6D,
-	31748 - 11905: 0xBA6E,
-	31749 - 11905: 0xBA6F,
-	31750 - 11905: 0xBA70,
-	31751 - 11905: 0xB4D8,
-	31752 - 11905: 0xBA71,
-	31753 - 11905: 0xBA72,
-	31754 - 11905: 0xBA73,
-	31755 - 11905: 0xF3FE,
-	31756 - 11905: 0xF3F9,
-	31757 - 11905: 0xBA74,
-	31758 - 11905: 0xBA75,
-	31759 - 11905: 0xF3FC,
-	31760 - 11905: 0xBA76,
-	31761 - 11905: 0xBA77,
-	31762 - 11905: 0xBA78,
-	31763 - 11905: 0xBA79,
-	31764 - 11905: 0xBA7A,
-	31765 - 11905: 0xBA7B,
-	31766 - 11905: 0xF3FD,
-	31767 - 11905: 0xBA7C,
-	31768 - 11905: 0xBA7D,
-	31769 - 11905: 0xBA7E,
-	31770 - 11905: 0xBA80,
-	31771 - 11905: 0xBA81,
-	31772 - 11905: 0xBA82,
-	31773 - 11905: 0xBA83,
-	31774 - 11905: 0xBA84,
-	31775 - 11905: 0xF4A1,
-	31776 - 11905: 0xBA85,
-	31777 - 11905: 0xBA86,
-	31778 - 11905: 0xBA87,
-	31779 - 11905: 0xBA88,
-	31780 - 11905: 0xBA89,
-	31781 - 11905: 0xBA8A,
-	31782 - 11905: 0xF4A3,
-	31783 - 11905: 0xBBC9,
-	31784 - 11905: 0xBA8B,
-	31785 - 11905: 0xBA8C,
-	31786 - 11905: 0xF4A2,
-	31787 - 11905: 0xBA8D,
-	31788 - 11905: 0xBA8E,
-	31789 - 11905: 0xBA8F,
-	31790 - 11905: 0xBA90,
-	31791 - 11905: 0xBA91,
-	31792 - 11905: 0xBA92,
-	31793 - 11905: 0xBA93,
-	31794 - 11905: 0xBA94,
-	31795 - 11905: 0xBA95,
-	31796 - 11905: 0xBA96,
-	31797 - 11905: 0xBA97,
-	31798 - 11905: 0xBA98,
-	31799 - 11905: 0xBA99,
-	31800 - 11905: 0xF4A4,
-	31801 - 11905: 0xBA9A,
-	31802 - 11905: 0xBA9B,
-	31803 - 11905: 0xBA9C,
-	31804 - 11905: 0xBA9D,
-	31805 - 11905: 0xBA9E,
-	31806 - 11905: 0xBA9F,
-	31807 - 11905: 0xB2BE,
-	31808 - 11905: 0xF4A6,
-	31809 - 11905: 0xF4A5,
-	31810 - 11905: 0xBAA0,
-	31811 - 11905: 0xBB40,
-	31812 - 11905: 0xBB41,
-	31813 - 11905: 0xBB42,
-	31814 - 11905: 0xBB43,
-	31815 - 11905: 0xBB44,
-	31816 - 11905: 0xBB45,
-	31817 - 11905: 0xBB46,
-	31818 - 11905: 0xBB47,
-	31819 - 11905: 0xBB48,
-	31820 - 11905: 0xBB49,
-	31821 - 11905: 0xBCAE,
-	31822 - 11905: 0xBB4A,
-	31823 - 11905: 0xBB4B,
-	31824 - 11905: 0xBB4C,
-	31825 - 11905: 0xBB4D,
-	31826 - 11905: 0xBB4E,
-	31827 - 11905: 0xBB4F,
-	31828 - 11905: 0xBB50,
-	31829 - 11905: 0xBB51,
-	31830 - 11905: 0xBB52,
-	31831 - 11905: 0xBB53,
-	31832 - 11905: 0xBB54,
-	31833 - 11905: 0xBB55,
-	31834 - 11905: 0xBB56,
-	31835 - 11905: 0xBB57,
-	31836 - 11905: 0xBB58,
-	31837 - 11905: 0xBB59,
-	31838 - 11905: 0xBB5A,
-	31839 - 11905: 0xBB5B,
-	31840 - 11905: 0xBB5C,
-	31841 - 11905: 0xBB5D,
-	31842 - 11905: 0xBB5E,
-	31843 - 11905: 0xBB5F,
-	31844 - 11905: 0xBB60,
-	31845 - 11905: 0xBB61,
-	31846 - 11905: 0xBB62,
-	31847 - 11905: 0xBB63,
-	31848 - 11905: 0xBB64,
-	31849 - 11905: 0xBB65,
-	31850 - 11905: 0xBB66,
-	31851 - 11905: 0xBB67,
-	31852 - 11905: 0xBB68,
-	31853 - 11905: 0xBB69,
-	31854 - 11905: 0xBB6A,
-	31855 - 11905: 0xBB6B,
-	31856 - 11905: 0xBB6C,
-	31857 - 11905: 0xBB6D,
-	31858 - 11905: 0xBB6E,
-	31859 - 11905: 0xC3D7,
-	31860 - 11905: 0xD9E1,
-	31861 - 11905: 0xBB6F,
-	31862 - 11905: 0xBB70,
-	31863 - 11905: 0xBB71,
-	31864 - 11905: 0xBB72,
-	31865 - 11905: 0xBB73,
-	31866 - 11905: 0xBB74,
-	31867 - 11905: 0xC0E0,
-	31868 - 11905: 0xF4CC,
-	31869 - 11905: 0xD7D1,
-	31870 - 11905: 0xBB75,
-	31871 - 11905: 0xBB76,
-	31872 - 11905: 0xBB77,
-	31873 - 11905: 0xBB78,
-	31874 - 11905: 0xBB79,
-	31875 - 11905: 0xBB7A,
-	31876 - 11905: 0xBB7B,
-	31877 - 11905: 0xBB7C,
-	31878 - 11905: 0xBB7D,
-	31879 - 11905: 0xBB7E,
-	31880 - 11905: 0xBB80,
-	31881 - 11905: 0xB7DB,
-	31882 - 11905: 0xBB81,
-	31883 - 11905: 0xBB82,
-	31884 - 11905: 0xBB83,
-	31885 - 11905: 0xBB84,
-	31886 - 11905: 0xBB85,
-	31887 - 11905: 0xBB86,
-	31888 - 11905: 0xBB87,
-	31889 - 11905: 0xF4CE,
-	31890 - 11905: 0xC1A3,
-	31891 - 11905: 0xBB88,
-	31892 - 11905: 0xBB89,
-	31893 - 11905: 0xC6C9,
-	31894 - 11905: 0xBB8A,
-	31895 - 11905: 0xB4D6,
-	31896 - 11905: 0xD5B3,
-	31897 - 11905: 0xBB8B,
-	31898 - 11905: 0xBB8C,
-	31899 - 11905: 0xBB8D,
-	31900 - 11905: 0xF4D0,
-	31901 - 11905: 0xF4CF,
-	31902 - 11905: 0xF4D1,
-	31903 - 11905: 0xCBDA,
-	31904 - 11905: 0xBB8E,
-	31905 - 11905: 0xBB8F,
-	31906 - 11905: 0xF4D2,
-	31907 - 11905: 0xBB90,
-	31908 - 11905: 0xD4C1,
-	31909 - 11905: 0xD6E0,
-	31910 - 11905: 0xBB91,
-	31911 - 11905: 0xBB92,
-	31912 - 11905: 0xBB93,
-	31913 - 11905: 0xBB94,
-	31914 - 11905: 0xB7E0,
-	31915 - 11905: 0xBB95,
-	31916 - 11905: 0xBB96,
-	31917 - 11905: 0xBB97,
-	31918 - 11905: 0xC1B8,
-	31919 - 11905: 0xBB98,
-	31920 - 11905: 0xBB99,
-	31921 - 11905: 0xC1BB,
-	31922 - 11905: 0xF4D3,
-	31923 - 11905: 0xBEAC,
-	31924 - 11905: 0xBB9A,
-	31925 - 11905: 0xBB9B,
-	31926 - 11905: 0xBB9C,
-	31927 - 11905: 0xBB9D,
-	31928 - 11905: 0xBB9E,
-	31929 - 11905: 0xB4E2,
-	31930 - 11905: 0xBB9F,
-	31931 - 11905: 0xBBA0,
-	31932 - 11905: 0xF4D4,
-	31933 - 11905: 0xF4D5,
-	31934 - 11905: 0xBEAB,
-	31935 - 11905: 0xBC40,
-	31936 - 11905: 0xBC41,
-	31937 - 11905: 0xF4D6,
-	31938 - 11905: 0xBC42,
-	31939 - 11905: 0xBC43,
-	31940 - 11905: 0xBC44,
-	31941 - 11905: 0xF4DB,
-	31942 - 11905: 0xBC45,
-	31943 - 11905: 0xF4D7,
-	31944 - 11905: 0xF4DA,
-	31945 - 11905: 0xBC46,
-	31946 - 11905: 0xBAFD,
-	31947 - 11905: 0xBC47,
-	31948 - 11905: 0xF4D8,
-	31949 - 11905: 0xF4D9,
-	31950 - 11905: 0xBC48,
-	31951 - 11905: 0xBC49,
-	31952 - 11905: 0xBC4A,
-	31953 - 11905: 0xBC4B,
-	31954 - 11905: 0xBC4C,
-	31955 - 11905: 0xBC4D,
-	31956 - 11905: 0xBC4E,
-	31957 - 11905: 0xB8E2,
-	31958 - 11905: 0xCCC7,
-	31959 - 11905: 0xF4DC,
-	31960 - 11905: 0xBC4F,
-	31961 - 11905: 0xB2DA,
-	31962 - 11905: 0xBC50,
-	31963 - 11905: 0xBC51,
-	31964 - 11905: 0xC3D3,
-	31965 - 11905: 0xBC52,
-	31966 - 11905: 0xBC53,
-	31967 - 11905: 0xD4E3,
-	31968 - 11905: 0xBFB7,
-	31969 - 11905: 0xBC54,
-	31970 - 11905: 0xBC55,
-	31971 - 11905: 0xBC56,
-	31972 - 11905: 0xBC57,
-	31973 - 11905: 0xBC58,
-	31974 - 11905: 0xBC59,
-	31975 - 11905: 0xBC5A,
-	31976 - 11905: 0xF4DD,
-	31977 - 11905: 0xBC5B,
-	31978 - 11905: 0xBC5C,
-	31979 - 11905: 0xBC5D,
-	31980 - 11905: 0xBC5E,
-	31981 - 11905: 0xBC5F,
-	31982 - 11905: 0xBC60,
-	31983 - 11905: 0xC5B4,
-	31984 - 11905: 0xBC61,
-	31985 - 11905: 0xBC62,
-	31986 - 11905: 0xBC63,
-	31987 - 11905: 0xBC64,
-	31988 - 11905: 0xBC65,
-	31989 - 11905: 0xBC66,
-	31990 - 11905: 0xBC67,
-	31991 - 11905: 0xBC68,
-	31992 - 11905: 0xF4E9,
-	31993 - 11905: 0xBC69,
-	31994 - 11905: 0xBC6A,
-	31995 - 11905: 0xCFB5,
-	31996 - 11905: 0xBC6B,
-	31997 - 11905: 0xBC6C,
-	31998 - 11905: 0xBC6D,
-	31999 - 11905: 0xBC6E,
-	32000 - 11905: 0xBC6F,
-	32001 - 11905: 0xBC70,
-	32002 - 11905: 0xBC71,
-	32003 - 11905: 0xBC72,
-	32004 - 11905: 0xBC73,
-	32005 - 11905: 0xBC74,
-	32006 - 11905: 0xBC75,
-	32007 - 11905: 0xBC76,
-	32008 - 11905: 0xBC77,
-	32009 - 11905: 0xBC78,
-	32010 - 11905: 0xCEC9,
-	32011 - 11905: 0xBC79,
-	32012 - 11905: 0xBC7A,
-	32013 - 11905: 0xBC7B,
-	32014 - 11905: 0xBC7C,
-	32015 - 11905: 0xBC7D,
-	32016 - 11905: 0xBC7E,
-	32017 - 11905: 0xBC80,
-	32018 - 11905: 0xBC81,
-	32019 - 11905: 0xBC82,
-	32020 - 11905: 0xBC83,
-	32021 - 11905: 0xBC84,
-	32022 - 11905: 0xBC85,
-	32023 - 11905: 0xBC86,
-	32024 - 11905: 0xBC87,
-	32025 - 11905: 0xBC88,
-	32026 - 11905: 0xBC89,
-	32027 - 11905: 0xBC8A,
-	32028 - 11905: 0xBC8B,
-	32029 - 11905: 0xBC8C,
-	32030 - 11905: 0xBC8D,
-	32031 - 11905: 0xBC8E,
-	32032 - 11905: 0xCBD8,
-	32033 - 11905: 0xBC8F,
-	32034 - 11905: 0xCBF7,
-	32035 - 11905: 0xBC90,
-	32036 - 11905: 0xBC91,
-	32037 - 11905: 0xBC92,
-	32038 - 11905: 0xBC93,
-	32039 - 11905: 0xBDF4,
-	32040 - 11905: 0xBC94,
-	32041 - 11905: 0xBC95,
-	32042 - 11905: 0xBC96,
-	32043 - 11905: 0xD7CF,
-	32044 - 11905: 0xBC97,
-	32045 - 11905: 0xBC98,
-	32046 - 11905: 0xBC99,
-	32047 - 11905: 0xC0DB,
-	32048 - 11905: 0xBC9A,
-	32049 - 11905: 0xBC9B,
-	32050 - 11905: 0xBC9C,
-	32051 - 11905: 0xBC9D,
-	32052 - 11905: 0xBC9E,
-	32053 - 11905: 0xBC9F,
-	32054 - 11905: 0xBCA0,
-	32055 - 11905: 0xBD40,
-	32056 - 11905: 0xBD41,
-	32057 - 11905: 0xBD42,
-	32058 - 11905: 0xBD43,
-	32059 - 11905: 0xBD44,
-	32060 - 11905: 0xBD45,
-	32061 - 11905: 0xBD46,
-	32062 - 11905: 0xBD47,
-	32063 - 11905: 0xBD48,
-	32064 - 11905: 0xBD49,
-	32065 - 11905: 0xBD4A,
-	32066 - 11905: 0xBD4B,
-	32067 - 11905: 0xBD4C,
-	32068 - 11905: 0xBD4D,
-	32069 - 11905: 0xBD4E,
-	32070 - 11905: 0xBD4F,
-	32071 - 11905: 0xBD50,
-	32072 - 11905: 0xBD51,
-	32073 - 11905: 0xBD52,
-	32074 - 11905: 0xBD53,
-	32075 - 11905: 0xBD54,
-	32076 - 11905: 0xBD55,
-	32077 - 11905: 0xBD56,
-	32078 - 11905: 0xBD57,
-	32079 - 11905: 0xBD58,
-	32080 - 11905: 0xBD59,
-	32081 - 11905: 0xBD5A,
-	32082 - 11905: 0xBD5B,
-	32083 - 11905: 0xBD5C,
-	32084 - 11905: 0xBD5D,
-	32085 - 11905: 0xBD5E,
-	32086 - 11905: 0xBD5F,
-	32087 - 11905: 0xBD60,
-	32088 - 11905: 0xBD61,
-	32089 - 11905: 0xBD62,
-	32090 - 11905: 0xBD63,
-	32091 - 11905: 0xBD64,
-	32092 - 11905: 0xBD65,
-	32093 - 11905: 0xBD66,
-	32094 - 11905: 0xBD67,
-	32095 - 11905: 0xBD68,
-	32096 - 11905: 0xBD69,
-	32097 - 11905: 0xBD6A,
-	32098 - 11905: 0xBD6B,
-	32099 - 11905: 0xBD6C,
-	32100 - 11905: 0xBD6D,
-	32101 - 11905: 0xBD6E,
-	32102 - 11905: 0xBD6F,
-	32103 - 11905: 0xBD70,
-	32104 - 11905: 0xBD71,
-	32105 - 11905: 0xBD72,
-	32106 - 11905: 0xBD73,
-	32107 - 11905: 0xBD74,
-	32108 - 11905: 0xBD75,
-	32109 - 11905: 0xBD76,
-	32110 - 11905: 0xD0F5,
-	32111 - 11905: 0xBD77,
-	32112 - 11905: 0xBD78,
-	32113 - 11905: 0xBD79,
-	32114 - 11905: 0xBD7A,
-	32115 - 11905: 0xBD7B,
-	32116 - 11905: 0xBD7C,
-	32117 - 11905: 0xBD7D,
-	32118 - 11905: 0xBD7E,
-	32119 - 11905: 0xF4EA,
-	32120 - 11905: 0xBD80,
-	32121 - 11905: 0xBD81,
-	32122 - 11905: 0xBD82,
-	32123 - 11905: 0xBD83,
-	32124 - 11905: 0xBD84,
-	32125 - 11905: 0xBD85,
-	32126 - 11905: 0xBD86,
-	32127 - 11905: 0xBD87,
-	32128 - 11905: 0xBD88,
-	32129 - 11905: 0xBD89,
-	32130 - 11905: 0xBD8A,
-	32131 - 11905: 0xBD8B,
-	32132 - 11905: 0xBD8C,
-	32133 - 11905: 0xBD8D,
-	32134 - 11905: 0xBD8E,
-	32135 - 11905: 0xBD8F,
-	32136 - 11905: 0xBD90,
-	32137 - 11905: 0xBD91,
-	32138 - 11905: 0xBD92,
-	32139 - 11905: 0xBD93,
-	32140 - 11905: 0xBD94,
-	32141 - 11905: 0xBD95,
-	32142 - 11905: 0xBD96,
-	32143 - 11905: 0xBD97,
-	32144 - 11905: 0xBD98,
-	32145 - 11905: 0xBD99,
-	32146 - 11905: 0xBD9A,
-	32147 - 11905: 0xBD9B,
-	32148 - 11905: 0xBD9C,
-	32149 - 11905: 0xBD9D,
-	32150 - 11905: 0xBD9E,
-	32151 - 11905: 0xBD9F,
-	32152 - 11905: 0xBDA0,
-	32153 - 11905: 0xBE40,
-	32154 - 11905: 0xBE41,
-	32155 - 11905: 0xBE42,
-	32156 - 11905: 0xBE43,
-	32157 - 11905: 0xBE44,
-	32158 - 11905: 0xBE45,
-	32159 - 11905: 0xBE46,
-	32160 - 11905: 0xBE47,
-	32161 - 11905: 0xBE48,
-	32162 - 11905: 0xBE49,
-	32163 - 11905: 0xBE4A,
-	32164 - 11905: 0xBE4B,
-	32165 - 11905: 0xBE4C,
-	32166 - 11905: 0xF4EB,
-	32167 - 11905: 0xBE4D,
-	32168 - 11905: 0xBE4E,
-	32169 - 11905: 0xBE4F,
-	32170 - 11905: 0xBE50,
-	32171 - 11905: 0xBE51,
-	32172 - 11905: 0xBE52,
-	32173 - 11905: 0xBE53,
-	32174 - 11905: 0xF4EC,
-	32175 - 11905: 0xBE54,
-	32176 - 11905: 0xBE55,
-	32177 - 11905: 0xBE56,
-	32178 - 11905: 0xBE57,
-	32179 - 11905: 0xBE58,
-	32180 - 11905: 0xBE59,
-	32181 - 11905: 0xBE5A,
-	32182 - 11905: 0xBE5B,
-	32183 - 11905: 0xBE5C,
-	32184 - 11905: 0xBE5D,
-	32185 - 11905: 0xBE5E,
-	32186 - 11905: 0xBE5F,
-	32187 - 11905: 0xBE60,
-	32188 - 11905: 0xBE61,
-	32189 - 11905: 0xBE62,
-	32190 - 11905: 0xBE63,
-	32191 - 11905: 0xBE64,
-	32192 - 11905: 0xBE65,
-	32193 - 11905: 0xBE66,
-	32194 - 11905: 0xBE67,
-	32195 - 11905: 0xBE68,
-	32196 - 11905: 0xBE69,
-	32197 - 11905: 0xBE6A,
-	32198 - 11905: 0xBE6B,
-	32199 - 11905: 0xBE6C,
-	32200 - 11905: 0xBE6D,
-	32201 - 11905: 0xBE6E,
-	32202 - 11905: 0xBE6F,
-	32203 - 11905: 0xBE70,
-	32204 - 11905: 0xBE71,
-	32205 - 11905: 0xBE72,
-	32206 - 11905: 0xBE73,
-	32207 - 11905: 0xBE74,
-	32208 - 11905: 0xBE75,
-	32209 - 11905: 0xBE76,
-	32210 - 11905: 0xBE77,
-	32211 - 11905: 0xBE78,
-	32212 - 11905: 0xBE79,
-	32213 - 11905: 0xBE7A,
-	32214 - 11905: 0xBE7B,
-	32215 - 11905: 0xBE7C,
-	32216 - 11905: 0xBE7D,
-	32217 - 11905: 0xBE7E,
-	32218 - 11905: 0xBE80,
-	32219 - 11905: 0xBE81,
-	32220 - 11905: 0xBE82,
-	32221 - 11905: 0xBE83,
-	32222 - 11905: 0xBE84,
-	32223 - 11905: 0xBE85,
-	32224 - 11905: 0xBE86,
-	32225 - 11905: 0xBE87,
-	32226 - 11905: 0xBE88,
-	32227 - 11905: 0xBE89,
-	32228 - 11905: 0xBE8A,
-	32229 - 11905: 0xBE8B,
-	32230 - 11905: 0xBE8C,
-	32231 - 11905: 0xBE8D,
-	32232 - 11905: 0xBE8E,
-	32233 - 11905: 0xBE8F,
-	32234 - 11905: 0xBE90,
-	32235 - 11905: 0xBE91,
-	32236 - 11905: 0xBE92,
-	32237 - 11905: 0xBE93,
-	32238 - 11905: 0xBE94,
-	32239 - 11905: 0xBE95,
-	32240 - 11905: 0xBE96,
-	32241 - 11905: 0xBE97,
-	32242 - 11905: 0xBE98,
-	32243 - 11905: 0xBE99,
-	32244 - 11905: 0xBE9A,
-	32245 - 11905: 0xBE9B,
-	32246 - 11905: 0xBE9C,
-	32247 - 11905: 0xBE9D,
-	32248 - 11905: 0xBE9E,
-	32249 - 11905: 0xBE9F,
-	32250 - 11905: 0xBEA0,
-	32251 - 11905: 0xBF40,
-	32252 - 11905: 0xBF41,
-	32253 - 11905: 0xBF42,
-	32254 - 11905: 0xBF43,
-	32255 - 11905: 0xBF44,
-	32256 - 11905: 0xBF45,
-	32257 - 11905: 0xBF46,
-	32258 - 11905: 0xBF47,
-	32259 - 11905: 0xBF48,
-	32260 - 11905: 0xBF49,
-	32261 - 11905: 0xBF4A,
-	32262 - 11905: 0xBF4B,
-	32263 - 11905: 0xBF4C,
-	32264 - 11905: 0xBF4D,
-	32265 - 11905: 0xBF4E,
-	32266 - 11905: 0xBF4F,
-	32267 - 11905: 0xBF50,
-	32268 - 11905: 0xBF51,
-	32269 - 11905: 0xBF52,
-	32270 - 11905: 0xBF53,
-	32271 - 11905: 0xBF54,
-	32272 - 11905: 0xBF55,
-	32273 - 11905: 0xBF56,
-	32274 - 11905: 0xBF57,
-	32275 - 11905: 0xBF58,
-	32276 - 11905: 0xBF59,
-	32277 - 11905: 0xBF5A,
-	32278 - 11905: 0xBF5B,
-	32279 - 11905: 0xBF5C,
-	32280 - 11905: 0xBF5D,
-	32281 - 11905: 0xBF5E,
-	32282 - 11905: 0xBF5F,
-	32283 - 11905: 0xBF60,
-	32284 - 11905: 0xBF61,
-	32285 - 11905: 0xBF62,
-	32286 - 11905: 0xBF63,
-	32287 - 11905: 0xBF64,
-	32288 - 11905: 0xBF65,
-	32289 - 11905: 0xBF66,
-	32290 - 11905: 0xBF67,
-	32291 - 11905: 0xBF68,
-	32292 - 11905: 0xBF69,
-	32293 - 11905: 0xBF6A,
-	32294 - 11905: 0xBF6B,
-	32295 - 11905: 0xBF6C,
-	32296 - 11905: 0xBF6D,
-	32297 - 11905: 0xBF6E,
-	32298 - 11905: 0xBF6F,
-	32299 - 11905: 0xBF70,
-	32300 - 11905: 0xBF71,
-	32301 - 11905: 0xBF72,
-	32302 - 11905: 0xBF73,
-	32303 - 11905: 0xBF74,
-	32304 - 11905: 0xBF75,
-	32305 - 11905: 0xBF76,
-	32306 - 11905: 0xBF77,
-	32307 - 11905: 0xBF78,
-	32308 - 11905: 0xBF79,
-	32309 - 11905: 0xBF7A,
-	32310 - 11905: 0xBF7B,
-	32311 - 11905: 0xBF7C,
-	32312 - 11905: 0xBF7D,
-	32313 - 11905: 0xBF7E,
-	32314 - 11905: 0xBF80,
-	32315 - 11905: 0xF7E3,
-	32316 - 11905: 0xBF81,
-	32317 - 11905: 0xBF82,
-	32318 - 11905: 0xBF83,
-	32319 - 11905: 0xBF84,
-	32320 - 11905: 0xBF85,
-	32321 - 11905: 0xB7B1,
-	32322 - 11905: 0xBF86,
-	32323 - 11905: 0xBF87,
-	32324 - 11905: 0xBF88,
-	32325 - 11905: 0xBF89,
-	32326 - 11905: 0xBF8A,
-	32327 - 11905: 0xF4ED,
-	32328 - 11905: 0xBF8B,
-	32329 - 11905: 0xBF8C,
-	32330 - 11905: 0xBF8D,
-	32331 - 11905: 0xBF8E,
-	32332 - 11905: 0xBF8F,
-	32333 - 11905: 0xBF90,
-	32334 - 11905: 0xBF91,
-	32335 - 11905: 0xBF92,
-	32336 - 11905: 0xBF93,
-	32337 - 11905: 0xBF94,
-	32338 - 11905: 0xBF95,
-	32339 - 11905: 0xBF96,
-	32340 - 11905: 0xBF97,
-	32341 - 11905: 0xBF98,
-	32342 - 11905: 0xBF99,
-	32343 - 11905: 0xBF9A,
-	32344 - 11905: 0xBF9B,
-	32345 - 11905: 0xBF9C,
-	32346 - 11905: 0xBF9D,
-	32347 - 11905: 0xBF9E,
-	32348 - 11905: 0xBF9F,
-	32349 - 11905: 0xBFA0,
-	32350 - 11905: 0xC040,
-	32351 - 11905: 0xC041,
-	32352 - 11905: 0xC042,
-	32353 - 11905: 0xC043,
-	32354 - 11905: 0xC044,
-	32355 - 11905: 0xC045,
-	32356 - 11905: 0xC046,
-	32357 - 11905: 0xC047,
-	32358 - 11905: 0xC048,
-	32359 - 11905: 0xC049,
-	32360 - 11905: 0xC04A,
-	32361 - 11905: 0xC04B,
-	32362 - 11905: 0xC04C,
-	32363 - 11905: 0xC04D,
-	32364 - 11905: 0xC04E,
-	32365 - 11905: 0xC04F,
-	32366 - 11905: 0xC050,
-	32367 - 11905: 0xC051,
-	32368 - 11905: 0xC052,
-	32369 - 11905: 0xC053,
-	32370 - 11905: 0xC054,
-	32371 - 11905: 0xC055,
-	32372 - 11905: 0xC056,
-	32373 - 11905: 0xC057,
-	32374 - 11905: 0xC058,
-	32375 - 11905: 0xC059,
-	32376 - 11905: 0xC05A,
-	32377 - 11905: 0xC05B,
-	32378 - 11905: 0xC05C,
-	32379 - 11905: 0xC05D,
-	32380 - 11905: 0xC05E,
-	32381 - 11905: 0xC05F,
-	32382 - 11905: 0xC060,
-	32383 - 11905: 0xC061,
-	32384 - 11905: 0xC062,
-	32385 - 11905: 0xC063,
-	32386 - 11905: 0xD7EB,
-	32387 - 11905: 0xC064,
-	32388 - 11905: 0xC065,
-	32389 - 11905: 0xC066,
-	32390 - 11905: 0xC067,
-	32391 - 11905: 0xC068,
-	32392 - 11905: 0xC069,
-	32393 - 11905: 0xC06A,
-	32394 - 11905: 0xC06B,
-	32395 - 11905: 0xC06C,
-	32396 - 11905: 0xC06D,
-	32397 - 11905: 0xC06E,
-	32398 - 11905: 0xC06F,
-	32399 - 11905: 0xC070,
-	32400 - 11905: 0xC071,
-	32401 - 11905: 0xC072,
-	32402 - 11905: 0xC073,
-	32403 - 11905: 0xC074,
-	32404 - 11905: 0xC075,
-	32405 - 11905: 0xC076,
-	32406 - 11905: 0xC077,
-	32407 - 11905: 0xC078,
-	32408 - 11905: 0xC079,
-	32409 - 11905: 0xC07A,
-	32410 - 11905: 0xC07B,
-	32411 - 11905: 0xF4EE,
-	32412 - 11905: 0xC07C,
-	32413 - 11905: 0xC07D,
-	32414 - 11905: 0xC07E,
-	32415 - 11905: 0xE6F9,
-	32416 - 11905: 0xBEC0,
-	32417 - 11905: 0xE6FA,
-	32418 - 11905: 0xBAEC,
-	32419 - 11905: 0xE6FB,
-	32420 - 11905: 0xCFCB,
-	32421 - 11905: 0xE6FC,
-	32422 - 11905: 0xD4BC,
-	32423 - 11905: 0xBCB6,
-	32424 - 11905: 0xE6FD,
-	32425 - 11905: 0xE6FE,
-	32426 - 11905: 0xBCCD,
-	32427 - 11905: 0xC8D2,
-	32428 - 11905: 0xCEB3,
-	32429 - 11905: 0xE7A1,
-	32430 - 11905: 0xC080,
-	32431 - 11905: 0xB4BF,
-	32432 - 11905: 0xE7A2,
-	32433 - 11905: 0xC9B4,
-	32434 - 11905: 0xB8D9,
-	32435 - 11905: 0xC4C9,
-	32436 - 11905: 0xC081,
-	32437 - 11905: 0xD7DD,
-	32438 - 11905: 0xC2DA,
-	32439 - 11905: 0xB7D7,
-	32440 - 11905: 0xD6BD,
-	32441 - 11905: 0xCEC6,
-	32442 - 11905: 0xB7C4,
-	32443 - 11905: 0xC082,
-	32444 - 11905: 0xC083,
-	32445 - 11905: 0xC5A6,
-	32446 - 11905: 0xE7A3,
-	32447 - 11905: 0xCFDF,
-	32448 - 11905: 0xE7A4,
-	32449 - 11905: 0xE7A5,
-	32450 - 11905: 0xE7A6,
-	32451 - 11905: 0xC1B7,
-	32452 - 11905: 0xD7E9,
-	32453 - 11905: 0xC9F0,
-	32454 - 11905: 0xCFB8,
-	32455 - 11905: 0xD6AF,
-	32456 - 11905: 0xD6D5,
-	32457 - 11905: 0xE7A7,
-	32458 - 11905: 0xB0ED,
-	32459 - 11905: 0xE7A8,
-	32460 - 11905: 0xE7A9,
-	32461 - 11905: 0xC9DC,
-	32462 - 11905: 0xD2EF,
-	32463 - 11905: 0xBEAD,
-	32464 - 11905: 0xE7AA,
-	32465 - 11905: 0xB0F3,
-	32466 - 11905: 0xC8DE,
-	32467 - 11905: 0xBDE1,
-	32468 - 11905: 0xE7AB,
-	32469 - 11905: 0xC8C6,
-	32470 - 11905: 0xC084,
-	32471 - 11905: 0xE7AC,
-	32472 - 11905: 0xBBE6,
-	32473 - 11905: 0xB8F8,
-	32474 - 11905: 0xD1A4,
-	32475 - 11905: 0xE7AD,
-	32476 - 11905: 0xC2E7,
-	32477 - 11905: 0xBEF8,
-	32478 - 11905: 0xBDCA,
-	32479 - 11905: 0xCDB3,
-	32480 - 11905: 0xE7AE,
-	32481 - 11905: 0xE7AF,
-	32482 - 11905: 0xBEEE,
-	32483 - 11905: 0xD0E5,
-	32484 - 11905: 0xC085,
-	32485 - 11905: 0xCBE7,
-	32486 - 11905: 0xCCD0,
-	32487 - 11905: 0xBCCC,
-	32488 - 11905: 0xE7B0,
-	32489 - 11905: 0xBCA8,
-	32490 - 11905: 0xD0F7,
-	32491 - 11905: 0xE7B1,
-	32492 - 11905: 0xC086,
-	32493 - 11905: 0xD0F8,
-	32494 - 11905: 0xE7B2,
-	32495 - 11905: 0xE7B3,
-	32496 - 11905: 0xB4C2,
-	32497 - 11905: 0xE7B4,
-	32498 - 11905: 0xE7B5,
-	32499 - 11905: 0xC9FE,
-	32500 - 11905: 0xCEAC,
-	32501 - 11905: 0xC3E0,
-	32502 - 11905: 0xE7B7,
-	32503 - 11905: 0xB1C1,
-	32504 - 11905: 0xB3F1,
-	32505 - 11905: 0xC087,
-	32506 - 11905: 0xE7B8,
-	32507 - 11905: 0xE7B9,
-	32508 - 11905: 0xD7DB,
-	32509 - 11905: 0xD5C0,
-	32510 - 11905: 0xE7BA,
-	32511 - 11905: 0xC2CC,
-	32512 - 11905: 0xD7BA,
-	32513 - 11905: 0xE7BB,
-	32514 - 11905: 0xE7BC,
-	32515 - 11905: 0xE7BD,
-	32516 - 11905: 0xBCEA,
-	32517 - 11905: 0xC3E5,
-	32518 - 11905: 0xC0C2,
-	32519 - 11905: 0xE7BE,
-	32520 - 11905: 0xE7BF,
-	32521 - 11905: 0xBCA9,
-	32522 - 11905: 0xC088,
-	32523 - 11905: 0xE7C0,
-	32524 - 11905: 0xE7C1,
-	32525 - 11905: 0xE7B6,
-	32526 - 11905: 0xB6D0,
-	32527 - 11905: 0xE7C2,
-	32528 - 11905: 0xC089,
-	32529 - 11905: 0xE7C3,
-	32530 - 11905: 0xE7C4,
-	32531 - 11905: 0xBBBA,
-	32532 - 11905: 0xB5DE,
-	32533 - 11905: 0xC2C6,
-	32534 - 11905: 0xB1E0,
-	32535 - 11905: 0xE7C5,
-	32536 - 11905: 0xD4B5,
-	32537 - 11905: 0xE7C6,
-	32538 - 11905: 0xB8BF,
-	32539 - 11905: 0xE7C8,
-	32540 - 11905: 0xE7C7,
-	32541 - 11905: 0xB7EC,
-	32542 - 11905: 0xC08A,
-	32543 - 11905: 0xE7C9,
-	32544 - 11905: 0xB2F8,
-	32545 - 11905: 0xE7CA,
-	32546 - 11905: 0xE7CB,
-	32547 - 11905: 0xE7CC,
-	32548 - 11905: 0xE7CD,
-	32549 - 11905: 0xE7CE,
-	32550 - 11905: 0xE7CF,
-	32551 - 11905: 0xE7D0,
-	32552 - 11905: 0xD3A7,
-	32553 - 11905: 0xCBF5,
-	32554 - 11905: 0xE7D1,
-	32555 - 11905: 0xE7D2,
-	32556 - 11905: 0xE7D3,
-	32557 - 11905: 0xE7D4,
-	32558 - 11905: 0xC9C9,
-	32559 - 11905: 0xE7D5,
-	32560 - 11905: 0xE7D6,
-	32561 - 11905: 0xE7D7,
-	32562 - 11905: 0xE7D8,
-	32563 - 11905: 0xE7D9,
-	32564 - 11905: 0xBDC9,
-	32565 - 11905: 0xE7DA,
-	32566 - 11905: 0xF3BE,
-	32567 - 11905: 0xC08B,
-	32568 - 11905: 0xB8D7,
-	32569 - 11905: 0xC08C,
-	32570 - 11905: 0xC8B1,
-	32571 - 11905: 0xC08D,
-	32572 - 11905: 0xC08E,
-	32573 - 11905: 0xC08F,
-	32574 - 11905: 0xC090,
-	32575 - 11905: 0xC091,
-	32576 - 11905: 0xC092,
-	32577 - 11905: 0xC093,
-	32578 - 11905: 0xF3BF,
-	32579 - 11905: 0xC094,
-	32580 - 11905: 0xF3C0,
-	32581 - 11905: 0xF3C1,
-	32582 - 11905: 0xC095,
-	32583 - 11905: 0xC096,
-	32584 - 11905: 0xC097,
-	32585 - 11905: 0xC098,
-	32586 - 11905: 0xC099,
-	32587 - 11905: 0xC09A,
-	32588 - 11905: 0xC09B,
-	32589 - 11905: 0xC09C,
-	32590 - 11905: 0xC09D,
-	32591 - 11905: 0xC09E,
-	32592 - 11905: 0xB9DE,
-	32593 - 11905: 0xCDF8,
-	32594 - 11905: 0xC09F,
-	32595 - 11905: 0xC0A0,
-	32596 - 11905: 0xD8E8,
-	32597 - 11905: 0xBAB1,
-	32598 - 11905: 0xC140,
-	32599 - 11905: 0xC2DE,
-	32600 - 11905: 0xEEB7,
-	32601 - 11905: 0xC141,
-	32602 - 11905: 0xB7A3,
-	32603 - 11905: 0xC142,
-	32604 - 11905: 0xC143,
-	32605 - 11905: 0xC144,
-	32606 - 11905: 0xC145,
-	32607 - 11905: 0xEEB9,
-	32608 - 11905: 0xC146,
-	32609 - 11905: 0xEEB8,
-	32610 - 11905: 0xB0D5,
-	32611 - 11905: 0xC147,
-	32612 - 11905: 0xC148,
-	32613 - 11905: 0xC149,
-	32614 - 11905: 0xC14A,
-	32615 - 11905: 0xC14B,
-	32616 - 11905: 0xEEBB,
-	32617 - 11905: 0xD5D6,
-	32618 - 11905: 0xD7EF,
-	32619 - 11905: 0xC14C,
-	32620 - 11905: 0xC14D,
-	32621 - 11905: 0xC14E,
-	32622 - 11905: 0xD6C3,
-	32623 - 11905: 0xC14F,
-	32624 - 11905: 0xC150,
-	32625 - 11905: 0xEEBD,
-	32626 - 11905: 0xCAF0,
-	32627 - 11905: 0xC151,
-	32628 - 11905: 0xEEBC,
-	32629 - 11905: 0xC152,
-	32630 - 11905: 0xC153,
-	32631 - 11905: 0xC154,
-	32632 - 11905: 0xC155,
-	32633 - 11905: 0xEEBE,
-	32634 - 11905: 0xC156,
-	32635 - 11905: 0xC157,
-	32636 - 11905: 0xC158,
-	32637 - 11905: 0xC159,
-	32638 - 11905: 0xEEC0,
-	32639 - 11905: 0xC15A,
-	32640 - 11905: 0xC15B,
-	32641 - 11905: 0xEEBF,
-	32642 - 11905: 0xC15C,
-	32643 - 11905: 0xC15D,
-	32644 - 11905: 0xC15E,
-	32645 - 11905: 0xC15F,
-	32646 - 11905: 0xC160,
-	32647 - 11905: 0xC161,
-	32648 - 11905: 0xC162,
-	32649 - 11905: 0xC163,
-	32650 - 11905: 0xD1F2,
-	32651 - 11905: 0xC164,
-	32652 - 11905: 0xC7BC,
-	32653 - 11905: 0xC165,
-	32654 - 11905: 0xC3C0,
-	32655 - 11905: 0xC166,
-	32656 - 11905: 0xC167,
-	32657 - 11905: 0xC168,
-	32658 - 11905: 0xC169,
-	32659 - 11905: 0xC16A,
-	32660 - 11905: 0xB8E1,
-	32661 - 11905: 0xC16B,
-	32662 - 11905: 0xC16C,
-	32663 - 11905: 0xC16D,
-	32664 - 11905: 0xC16E,
-	32665 - 11905: 0xC16F,
-	32666 - 11905: 0xC1E7,
-	32667 - 11905: 0xC170,
-	32668 - 11905: 0xC171,
-	32669 - 11905: 0xF4C6,
-	32670 - 11905: 0xD0DF,
-	32671 - 11905: 0xF4C7,
-	32672 - 11905: 0xC172,
-	32673 - 11905: 0xCFDB,
-	32674 - 11905: 0xC173,
-	32675 - 11905: 0xC174,
-	32676 - 11905: 0xC8BA,
-	32677 - 11905: 0xC175,
-	32678 - 11905: 0xC176,
-	32679 - 11905: 0xF4C8,
-	32680 - 11905: 0xC177,
-	32681 - 11905: 0xC178,
-	32682 - 11905: 0xC179,
-	32683 - 11905: 0xC17A,
-	32684 - 11905: 0xC17B,
-	32685 - 11905: 0xC17C,
-	32686 - 11905: 0xC17D,
-	32687 - 11905: 0xF4C9,
-	32688 - 11905: 0xF4CA,
-	32689 - 11905: 0xC17E,
-	32690 - 11905: 0xF4CB,
-	32691 - 11905: 0xC180,
-	32692 - 11905: 0xC181,
-	32693 - 11905: 0xC182,
-	32694 - 11905: 0xC183,
-	32695 - 11905: 0xC184,
-	32696 - 11905: 0xD9FA,
-	32697 - 11905: 0xB8FE,
-	32698 - 11905: 0xC185,
-	32699 - 11905: 0xC186,
-	32700 - 11905: 0xE5F1,
-	32701 - 11905: 0xD3F0,
-	32702 - 11905: 0xC187,
-	32703 - 11905: 0xF4E0,
-	32704 - 11905: 0xC188,
-	32705 - 11905: 0xCECC,
-	32706 - 11905: 0xC189,
-	32707 - 11905: 0xC18A,
-	32708 - 11905: 0xC18B,
-	32709 - 11905: 0xB3E1,
-	32710 - 11905: 0xC18C,
-	32711 - 11905: 0xC18D,
-	32712 - 11905: 0xC18E,
-	32713 - 11905: 0xC18F,
-	32714 - 11905: 0xF1B4,
-	32715 - 11905: 0xC190,
-	32716 - 11905: 0xD2EE,
-	32717 - 11905: 0xC191,
-	32718 - 11905: 0xF4E1,
-	32719 - 11905: 0xC192,
-	32720 - 11905: 0xC193,
-	32721 - 11905: 0xC194,
-	32722 - 11905: 0xC195,
-	32723 - 11905: 0xC196,
-	32724 - 11905: 0xCFE8,
-	32725 - 11905: 0xF4E2,
-	32726 - 11905: 0xC197,
-	32727 - 11905: 0xC198,
-	32728 - 11905: 0xC7CC,
-	32729 - 11905: 0xC199,
-	32730 - 11905: 0xC19A,
-	32731 - 11905: 0xC19B,
-	32732 - 11905: 0xC19C,
-	32733 - 11905: 0xC19D,
-	32734 - 11905: 0xC19E,
-	32735 - 11905: 0xB5D4,
-	32736 - 11905: 0xB4E4,
-	32737 - 11905: 0xF4E4,
-	32738 - 11905: 0xC19F,
-	32739 - 11905: 0xC1A0,
-	32740 - 11905: 0xC240,
-	32741 - 11905: 0xF4E3,
-	32742 - 11905: 0xF4E5,
-	32743 - 11905: 0xC241,
-	32744 - 11905: 0xC242,
-	32745 - 11905: 0xF4E6,
-	32746 - 11905: 0xC243,
-	32747 - 11905: 0xC244,
-	32748 - 11905: 0xC245,
-	32749 - 11905: 0xC246,
-	32750 - 11905: 0xF4E7,
-	32751 - 11905: 0xC247,
-	32752 - 11905: 0xBAB2,
-	32753 - 11905: 0xB0BF,
-	32754 - 11905: 0xC248,
-	32755 - 11905: 0xF4E8,
-	32756 - 11905: 0xC249,
-	32757 - 11905: 0xC24A,
-	32758 - 11905: 0xC24B,
-	32759 - 11905: 0xC24C,
-	32760 - 11905: 0xC24D,
-	32761 - 11905: 0xC24E,
-	32762 - 11905: 0xC24F,
-	32763 - 11905: 0xB7AD,
-	32764 - 11905: 0xD2ED,
-	32765 - 11905: 0xC250,
-	32766 - 11905: 0xC251,
-	32767 - 11905: 0xC252,
-	32768 - 11905: 0xD2AB,
-	32769 - 11905: 0xC0CF,
-	32770 - 11905: 0xC253,
-	32771 - 11905: 0xBFBC,
-	32772 - 11905: 0xEBA3,
-	32773 - 11905: 0xD5DF,
-	32774 - 11905: 0xEAC8,
-	32775 - 11905: 0xC254,
-	32776 - 11905: 0xC255,
-	32777 - 11905: 0xC256,
-	32778 - 11905: 0xC257,
-	32779 - 11905: 0xF1F3,
-	32780 - 11905: 0xB6F8,
-	32781 - 11905: 0xCBA3,
-	32782 - 11905: 0xC258,
-	32783 - 11905: 0xC259,
-	32784 - 11905: 0xC4CD,
-	32785 - 11905: 0xC25A,
-	32786 - 11905: 0xF1E7,
-	32787 - 11905: 0xC25B,
-	32788 - 11905: 0xF1E8,
-	32789 - 11905: 0xB8FB,
-	32790 - 11905: 0xF1E9,
-	32791 - 11905: 0xBAC4,
-	32792 - 11905: 0xD4C5,
-	32793 - 11905: 0xB0D2,
-	32794 - 11905: 0xC25C,
-	32795 - 11905: 0xC25D,
-	32796 - 11905: 0xF1EA,
-	32797 - 11905: 0xC25E,
-	32798 - 11905: 0xC25F,
-	32799 - 11905: 0xC260,
-	32800 - 11905: 0xF1EB,
-	32801 - 11905: 0xC261,
-	32802 - 11905: 0xF1EC,
-	32803 - 11905: 0xC262,
-	32804 - 11905: 0xC263,
-	32805 - 11905: 0xF1ED,
-	32806 - 11905: 0xF1EE,
-	32807 - 11905: 0xF1EF,
-	32808 - 11905: 0xF1F1,
-	32809 - 11905: 0xF1F0,
-	32810 - 11905: 0xC5D5,
-	32811 - 11905: 0xC264,
-	32812 - 11905: 0xC265,
-	32813 - 11905: 0xC266,
-	32814 - 11905: 0xC267,
-	32815 - 11905: 0xC268,
-	32816 - 11905: 0xC269,
-	32817 - 11905: 0xF1F2,
-	32818 - 11905: 0xC26A,
-	32819 - 11905: 0xB6FA,
-	32820 - 11905: 0xC26B,
-	32821 - 11905: 0xF1F4,
-	32822 - 11905: 0xD2AE,
-	32823 - 11905: 0xDEC7,
-	32824 - 11905: 0xCBCA,
-	32825 - 11905: 0xC26C,
-	32826 - 11905: 0xC26D,
-	32827 - 11905: 0xB3DC,
-	32828 - 11905: 0xC26E,
-	32829 - 11905: 0xB5A2,
-	32830 - 11905: 0xC26F,
-	32831 - 11905: 0xB9A2,
-	32832 - 11905: 0xC270,
-	32833 - 11905: 0xC271,
-	32834 - 11905: 0xC4F4,
-	32835 - 11905: 0xF1F5,
-	32836 - 11905: 0xC272,
-	32837 - 11905: 0xC273,
-	32838 - 11905: 0xF1F6,
-	32839 - 11905: 0xC274,
-	32840 - 11905: 0xC275,
-	32841 - 11905: 0xC276,
-	32842 - 11905: 0xC1C4,
-	32843 - 11905: 0xC1FB,
-	32844 - 11905: 0xD6B0,
-	32845 - 11905: 0xF1F7,
-	32846 - 11905: 0xC277,
-	32847 - 11905: 0xC278,
-	32848 - 11905: 0xC279,
-	32849 - 11905: 0xC27A,
-	32850 - 11905: 0xF1F8,
-	32851 - 11905: 0xC27B,
-	32852 - 11905: 0xC1AA,
-	32853 - 11905: 0xC27C,
-	32854 - 11905: 0xC27D,
-	32855 - 11905: 0xC27E,
-	32856 - 11905: 0xC6B8,
-	32857 - 11905: 0xC280,
-	32858 - 11905: 0xBEDB,
-	32859 - 11905: 0xC281,
-	32860 - 11905: 0xC282,
-	32861 - 11905: 0xC283,
-	32862 - 11905: 0xC284,
-	32863 - 11905: 0xC285,
-	32864 - 11905: 0xC286,
-	32865 - 11905: 0xC287,
-	32866 - 11905: 0xC288,
-	32867 - 11905: 0xC289,
-	32868 - 11905: 0xC28A,
-	32869 - 11905: 0xC28B,
-	32870 - 11905: 0xC28C,
-	32871 - 11905: 0xC28D,
-	32872 - 11905: 0xC28E,
-	32873 - 11905: 0xF1F9,
-	32874 - 11905: 0xB4CF,
-	32875 - 11905: 0xC28F,
-	32876 - 11905: 0xC290,
-	32877 - 11905: 0xC291,
-	32878 - 11905: 0xC292,
-	32879 - 11905: 0xC293,
-	32880 - 11905: 0xC294,
-	32881 - 11905: 0xF1FA,
-	32882 - 11905: 0xC295,
-	32883 - 11905: 0xC296,
-	32884 - 11905: 0xC297,
-	32885 - 11905: 0xC298,
-	32886 - 11905: 0xC299,
-	32887 - 11905: 0xC29A,
-	32888 - 11905: 0xC29B,
-	32889 - 11905: 0xC29C,
-	32890 - 11905: 0xC29D,
-	32891 - 11905: 0xC29E,
-	32892 - 11905: 0xC29F,
-	32893 - 11905: 0xC2A0,
-	32894 - 11905: 0xC340,
-	32895 - 11905: 0xEDB2,
-	32896 - 11905: 0xEDB1,
-	32897 - 11905: 0xC341,
-	32898 - 11905: 0xC342,
-	32899 - 11905: 0xCBE0,
-	32900 - 11905: 0xD2DE,
-	32901 - 11905: 0xC343,
-	32902 - 11905: 0xCBC1,
-	32903 - 11905: 0xD5D8,
-	32904 - 11905: 0xC344,
-	32905 - 11905: 0xC8E2,
-	32906 - 11905: 0xC345,
-	32907 - 11905: 0xC0DF,
-	32908 - 11905: 0xBCA1,
-	32909 - 11905: 0xC346,
-	32910 - 11905: 0xC347,
-	32911 - 11905: 0xC348,
-	32912 - 11905: 0xC349,
-	32913 - 11905: 0xC34A,
-	32914 - 11905: 0xC34B,
-	32915 - 11905: 0xEBC1,
-	32916 - 11905: 0xC34C,
-	32917 - 11905: 0xC34D,
-	32918 - 11905: 0xD0A4,
-	32919 - 11905: 0xC34E,
-	32920 - 11905: 0xD6E2,
-	32921 - 11905: 0xC34F,
-	32922 - 11905: 0xB6C7,
-	32923 - 11905: 0xB8D8,
-	32924 - 11905: 0xEBC0,
-	32925 - 11905: 0xB8CE,
-	32926 - 11905: 0xC350,
-	32927 - 11905: 0xEBBF,
-	32928 - 11905: 0xB3A6,
-	32929 - 11905: 0xB9C9,
-	32930 - 11905: 0xD6AB,
-	32931 - 11905: 0xC351,
-	32932 - 11905: 0xB7F4,
-	32933 - 11905: 0xB7CA,
-	32934 - 11905: 0xC352,
-	32935 - 11905: 0xC353,
-	32936 - 11905: 0xC354,
-	32937 - 11905: 0xBCE7,
-	32938 - 11905: 0xB7BE,
-	32939 - 11905: 0xEBC6,
-	32940 - 11905: 0xC355,
-	32941 - 11905: 0xEBC7,
-	32942 - 11905: 0xB0B9,
-	32943 - 11905: 0xBFCF,
-	32944 - 11905: 0xC356,
-	32945 - 11905: 0xEBC5,
-	32946 - 11905: 0xD3FD,
-	32947 - 11905: 0xC357,
-	32948 - 11905: 0xEBC8,
-	32949 - 11905: 0xC358,
-	32950 - 11905: 0xC359,
-	32951 - 11905: 0xEBC9,
-	32952 - 11905: 0xC35A,
-	32953 - 11905: 0xC35B,
-	32954 - 11905: 0xB7CE,
-	32955 - 11905: 0xC35C,
-	32956 - 11905: 0xEBC2,
-	32957 - 11905: 0xEBC4,
-	32958 - 11905: 0xC9F6,
-	32959 - 11905: 0xD6D7,
-	32960 - 11905: 0xD5CD,
-	32961 - 11905: 0xD0B2,
-	32962 - 11905: 0xEBCF,
-	32963 - 11905: 0xCEB8,
-	32964 - 11905: 0xEBD0,
-	32965 - 11905: 0xC35D,
-	32966 - 11905: 0xB5A8,
-	32967 - 11905: 0xC35E,
-	32968 - 11905: 0xC35F,
-	32969 - 11905: 0xC360,
-	32970 - 11905: 0xC361,
-	32971 - 11905: 0xC362,
-	32972 - 11905: 0xB1B3,
-	32973 - 11905: 0xEBD2,
-	32974 - 11905: 0xCCA5,
-	32975 - 11905: 0xC363,
-	32976 - 11905: 0xC364,
-	32977 - 11905: 0xC365,
-	32978 - 11905: 0xC366,
-	32979 - 11905: 0xC367,
-	32980 - 11905: 0xC368,
-	32981 - 11905: 0xC369,
-	32982 - 11905: 0xC5D6,
-	32983 - 11905: 0xEBD3,
-	32984 - 11905: 0xC36A,
-	32985 - 11905: 0xEBD1,
-	32986 - 11905: 0xC5DF,
-	32987 - 11905: 0xEBCE,
-	32988 - 11905: 0xCAA4,
-	32989 - 11905: 0xEBD5,
-	32990 - 11905: 0xB0FB,
-	32991 - 11905: 0xC36B,
-	32992 - 11905: 0xC36C,
-	32993 - 11905: 0xBAFA,
-	32994 - 11905: 0xC36D,
-	32995 - 11905: 0xC36E,
-	32996 - 11905: 0xD8B7,
-	32997 - 11905: 0xF1E3,
-	32998 - 11905: 0xC36F,
-	32999 - 11905: 0xEBCA,
-	33000 - 11905: 0xEBCB,
-	33001 - 11905: 0xEBCC,
-	33002 - 11905: 0xEBCD,
-	33003 - 11905: 0xEBD6,
-	33004 - 11905: 0xE6C0,
-	33005 - 11905: 0xEBD9,
-	33006 - 11905: 0xC370,
-	33007 - 11905: 0xBFE8,
-	33008 - 11905: 0xD2C8,
-	33009 - 11905: 0xEBD7,
-	33010 - 11905: 0xEBDC,
-	33011 - 11905: 0xB8EC,
-	33012 - 11905: 0xEBD8,
-	33013 - 11905: 0xC371,
-	33014 - 11905: 0xBDBA,
-	33015 - 11905: 0xC372,
-	33016 - 11905: 0xD0D8,
-	33017 - 11905: 0xC373,
-	33018 - 11905: 0xB0B7,
-	33019 - 11905: 0xC374,
-	33020 - 11905: 0xEBDD,
-	33021 - 11905: 0xC4DC,
-	33022 - 11905: 0xC375,
-	33023 - 11905: 0xC376,
-	33024 - 11905: 0xC377,
-	33025 - 11905: 0xC378,
-	33026 - 11905: 0xD6AC,
-	33027 - 11905: 0xC379,
-	33028 - 11905: 0xC37A,
-	33029 - 11905: 0xC37B,
-	33030 - 11905: 0xB4E0,
-	33031 - 11905: 0xC37C,
-	33032 - 11905: 0xC37D,
-	33033 - 11905: 0xC2F6,
-	33034 - 11905: 0xBCB9,
-	33035 - 11905: 0xC37E,
-	33036 - 11905: 0xC380,
-	33037 - 11905: 0xEBDA,
-	33038 - 11905: 0xEBDB,
-	33039 - 11905: 0xD4E0,
-	33040 - 11905: 0xC6EA,
-	33041 - 11905: 0xC4D4,
-	33042 - 11905: 0xEBDF,
-	33043 - 11905: 0xC5A7,
-	33044 - 11905: 0xD9F5,
-	33045 - 11905: 0xC381,
-	33046 - 11905: 0xB2B1,
-	33047 - 11905: 0xC382,
-	33048 - 11905: 0xEBE4,
-	33049 - 11905: 0xC383,
-	33050 - 11905: 0xBDC5,
-	33051 - 11905: 0xC384,
-	33052 - 11905: 0xC385,
-	33053 - 11905: 0xC386,
-	33054 - 11905: 0xEBE2,
-	33055 - 11905: 0xC387,
-	33056 - 11905: 0xC388,
-	33057 - 11905: 0xC389,
-	33058 - 11905: 0xC38A,
-	33059 - 11905: 0xC38B,
-	33060 - 11905: 0xC38C,
-	33061 - 11905: 0xC38D,
-	33062 - 11905: 0xC38E,
-	33063 - 11905: 0xC38F,
-	33064 - 11905: 0xC390,
-	33065 - 11905: 0xC391,
-	33066 - 11905: 0xC392,
-	33067 - 11905: 0xC393,
-	33068 - 11905: 0xEBE3,
-	33069 - 11905: 0xC394,
-	33070 - 11905: 0xC395,
-	33071 - 11905: 0xB8AC,
-	33072 - 11905: 0xC396,
-	33073 - 11905: 0xCDD1,
-	33074 - 11905: 0xEBE5,
-	33075 - 11905: 0xC397,
-	33076 - 11905: 0xC398,
-	33077 - 11905: 0xC399,
-	33078 - 11905: 0xEBE1,
-	33079 - 11905: 0xC39A,
-	33080 - 11905: 0xC1B3,
-	33081 - 11905: 0xC39B,
-	33082 - 11905: 0xC39C,
-	33083 - 11905: 0xC39D,
-	33084 - 11905: 0xC39E,
-	33085 - 11905: 0xC39F,
-	33086 - 11905: 0xC6A2,
-	33087 - 11905: 0xC3A0,
-	33088 - 11905: 0xC440,
-	33089 - 11905: 0xC441,
-	33090 - 11905: 0xC442,
-	33091 - 11905: 0xC443,
-	33092 - 11905: 0xC444,
-	33093 - 11905: 0xC445,
-	33094 - 11905: 0xCCF3,
-	33095 - 11905: 0xC446,
-	33096 - 11905: 0xEBE6,
-	33097 - 11905: 0xC447,
-	33098 - 11905: 0xC0B0,
-	33099 - 11905: 0xD2B8,
-	33100 - 11905: 0xEBE7,
-	33101 - 11905: 0xC448,
-	33102 - 11905: 0xC449,
-	33103 - 11905: 0xC44A,
-	33104 - 11905: 0xB8AF,
-	33105 - 11905: 0xB8AD,
-	33106 - 11905: 0xC44B,
-	33107 - 11905: 0xEBE8,
-	33108 - 11905: 0xC7BB,
-	33109 - 11905: 0xCDF3,
-	33110 - 11905: 0xC44C,
-	33111 - 11905: 0xC44D,
-	33112 - 11905: 0xC44E,
-	33113 - 11905: 0xEBEA,
-	33114 - 11905: 0xEBEB,
-	33115 - 11905: 0xC44F,
-	33116 - 11905: 0xC450,
-	33117 - 11905: 0xC451,
-	33118 - 11905: 0xC452,
-	33119 - 11905: 0xC453,
-	33120 - 11905: 0xEBED,
-	33121 - 11905: 0xC454,
-	33122 - 11905: 0xC455,
-	33123 - 11905: 0xC456,
-	33124 - 11905: 0xC457,
-	33125 - 11905: 0xD0C8,
-	33126 - 11905: 0xC458,
-	33127 - 11905: 0xEBF2,
-	33128 - 11905: 0xC459,
-	33129 - 11905: 0xEBEE,
-	33130 - 11905: 0xC45A,
-	33131 - 11905: 0xC45B,
-	33132 - 11905: 0xC45C,
-	33133 - 11905: 0xEBF1,
-	33134 - 11905: 0xC8F9,
-	33135 - 11905: 0xC45D,
-	33136 - 11905: 0xD1FC,
-	33137 - 11905: 0xEBEC,
-	33138 - 11905: 0xC45E,
-	33139 - 11905: 0xC45F,
-	33140 - 11905: 0xEBE9,
-	33141 - 11905: 0xC460,
-	33142 - 11905: 0xC461,
-	33143 - 11905: 0xC462,
-	33144 - 11905: 0xC463,
-	33145 - 11905: 0xB8B9,
-	33146 - 11905: 0xCFD9,
-	33147 - 11905: 0xC4E5,
-	33148 - 11905: 0xEBEF,
-	33149 - 11905: 0xEBF0,
-	33150 - 11905: 0xCCDA,
-	33151 - 11905: 0xCDC8,
-	33152 - 11905: 0xB0F2,
-	33153 - 11905: 0xC464,
-	33154 - 11905: 0xEBF6,
-	33155 - 11905: 0xC465,
-	33156 - 11905: 0xC466,
-	33157 - 11905: 0xC467,
-	33158 - 11905: 0xC468,
-	33159 - 11905: 0xC469,
-	33160 - 11905: 0xEBF5,
-	33161 - 11905: 0xC46A,
-	33162 - 11905: 0xB2B2,
-	33163 - 11905: 0xC46B,
-	33164 - 11905: 0xC46C,
-	33165 - 11905: 0xC46D,
-	33166 - 11905: 0xC46E,
-	33167 - 11905: 0xB8E0,
-	33168 - 11905: 0xC46F,
-	33169 - 11905: 0xEBF7,
-	33170 - 11905: 0xC470,
-	33171 - 11905: 0xC471,
-	33172 - 11905: 0xC472,
-	33173 - 11905: 0xC473,
-	33174 - 11905: 0xC474,
-	33175 - 11905: 0xC475,
-	33176 - 11905: 0xB1EC,
-	33177 - 11905: 0xC476,
-	33178 - 11905: 0xC477,
-	33179 - 11905: 0xCCC5,
-	33180 - 11905: 0xC4A4,
-	33181 - 11905: 0xCFA5,
-	33182 - 11905: 0xC478,
-	33183 - 11905: 0xC479,
-	33184 - 11905: 0xC47A,
-	33185 - 11905: 0xC47B,
-	33186 - 11905: 0xC47C,
-	33187 - 11905: 0xEBF9,
-	33188 - 11905: 0xC47D,
-	33189 - 11905: 0xC47E,
-	33190 - 11905: 0xECA2,
-	33191 - 11905: 0xC480,
-	33192 - 11905: 0xC5F2,
-	33193 - 11905: 0xC481,
-	33194 - 11905: 0xEBFA,
-	33195 - 11905: 0xC482,
-	33196 - 11905: 0xC483,
-	33197 - 11905: 0xC484,
-	33198 - 11905: 0xC485,
-	33199 - 11905: 0xC486,
-	33200 - 11905: 0xC487,
-	33201 - 11905: 0xC488,
-	33202 - 11905: 0xC489,
-	33203 - 11905: 0xC9C5,
-	33204 - 11905: 0xC48A,
-	33205 - 11905: 0xC48B,
-	33206 - 11905: 0xC48C,
-	33207 - 11905: 0xC48D,
-	33208 - 11905: 0xC48E,
-	33209 - 11905: 0xC48F,
-	33210 - 11905: 0xE2DF,
-	33211 - 11905: 0xEBFE,
-	33212 - 11905: 0xC490,
-	33213 - 11905: 0xC491,
-	33214 - 11905: 0xC492,
-	33215 - 11905: 0xC493,
-	33216 - 11905: 0xCDCE,
-	33217 - 11905: 0xECA1,
-	33218 - 11905: 0xB1DB,
-	33219 - 11905: 0xD3B7,
-	33220 - 11905: 0xC494,
-	33221 - 11905: 0xC495,
-	33222 - 11905: 0xD2DC,
-	33223 - 11905: 0xC496,
-	33224 - 11905: 0xC497,
-	33225 - 11905: 0xC498,
-	33226 - 11905: 0xEBFD,
-	33227 - 11905: 0xC499,
-	33228 - 11905: 0xEBFB,
-	33229 - 11905: 0xC49A,
-	33230 - 11905: 0xC49B,
-	33231 - 11905: 0xC49C,
-	33232 - 11905: 0xC49D,
-	33233 - 11905: 0xC49E,
-	33234 - 11905: 0xC49F,
-	33235 - 11905: 0xC4A0,
-	33236 - 11905: 0xC540,
-	33237 - 11905: 0xC541,
-	33238 - 11905: 0xC542,
-	33239 - 11905: 0xC543,
-	33240 - 11905: 0xC544,
-	33241 - 11905: 0xC545,
-	33242 - 11905: 0xC546,
-	33243 - 11905: 0xC547,
-	33244 - 11905: 0xC548,
-	33245 - 11905: 0xC549,
-	33246 - 11905: 0xC54A,
-	33247 - 11905: 0xC54B,
-	33248 - 11905: 0xC54C,
-	33249 - 11905: 0xC54D,
-	33250 - 11905: 0xC54E,
-	33251 - 11905: 0xB3BC,
-	33252 - 11905: 0xC54F,
-	33253 - 11905: 0xC550,
-	33254 - 11905: 0xC551,
-	33255 - 11905: 0xEAB0,
-	33256 - 11905: 0xC552,
-	33257 - 11905: 0xC553,
-	33258 - 11905: 0xD7D4,
-	33259 - 11905: 0xC554,
-	33260 - 11905: 0xF4AB,
-	33261 - 11905: 0xB3F4,
-	33262 - 11905: 0xC555,
-	33263 - 11905: 0xC556,
-	33264 - 11905: 0xC557,
-	33265 - 11905: 0xC558,
-	33266 - 11905: 0xC559,
-	33267 - 11905: 0xD6C1,
-	33268 - 11905: 0xD6C2,
-	33269 - 11905: 0xC55A,
-	33270 - 11905: 0xC55B,
-	33271 - 11905: 0xC55C,
-	33272 - 11905: 0xC55D,
-	33273 - 11905: 0xC55E,
-	33274 - 11905: 0xC55F,
-	33275 - 11905: 0xD5E9,
-	33276 - 11905: 0xBECA,
-	33277 - 11905: 0xC560,
-	33278 - 11905: 0xF4A7,
-	33279 - 11905: 0xC561,
-	33280 - 11905: 0xD2A8,
-	33281 - 11905: 0xF4A8,
-	33282 - 11905: 0xF4A9,
-	33283 - 11905: 0xC562,
-	33284 - 11905: 0xF4AA,
-	33285 - 11905: 0xBECB,
-	33286 - 11905: 0xD3DF,
-	33287 - 11905: 0xC563,
-	33288 - 11905: 0xC564,
-	33289 - 11905: 0xC565,
-	33290 - 11905: 0xC566,
-	33291 - 11905: 0xC567,
-	33292 - 11905: 0xC9E0,
-	33293 - 11905: 0xC9E1,
-	33294 - 11905: 0xC568,
-	33295 - 11905: 0xC569,
-	33296 - 11905: 0xF3C2,
-	33297 - 11905: 0xC56A,
-	33298 - 11905: 0xCAE6,
-	33299 - 11905: 0xC56B,
-	33300 - 11905: 0xCCF2,
-	33301 - 11905: 0xC56C,
-	33302 - 11905: 0xC56D,
-	33303 - 11905: 0xC56E,
-	33304 - 11905: 0xC56F,
-	33305 - 11905: 0xC570,
-	33306 - 11905: 0xC571,
-	33307 - 11905: 0xE2B6,
-	33308 - 11905: 0xCBB4,
-	33309 - 11905: 0xC572,
-	33310 - 11905: 0xCEE8,
-	33311 - 11905: 0xD6DB,
-	33312 - 11905: 0xC573,
-	33313 - 11905: 0xF4AD,
-	33314 - 11905: 0xF4AE,
-	33315 - 11905: 0xF4AF,
-	33316 - 11905: 0xC574,
-	33317 - 11905: 0xC575,
-	33318 - 11905: 0xC576,
-	33319 - 11905: 0xC577,
-	33320 - 11905: 0xF4B2,
-	33321 - 11905: 0xC578,
-	33322 - 11905: 0xBABD,
-	33323 - 11905: 0xF4B3,
-	33324 - 11905: 0xB0E3,
-	33325 - 11905: 0xF4B0,
-	33326 - 11905: 0xC579,
-	33327 - 11905: 0xF4B1,
-	33328 - 11905: 0xBDA2,
-	33329 - 11905: 0xB2D5,
-	33330 - 11905: 0xC57A,
-	33331 - 11905: 0xF4B6,
-	33332 - 11905: 0xF4B7,
-	33333 - 11905: 0xB6E6,
-	33334 - 11905: 0xB2B0,
-	33335 - 11905: 0xCFCF,
-	33336 - 11905: 0xF4B4,
-	33337 - 11905: 0xB4AC,
-	33338 - 11905: 0xC57B,
-	33339 - 11905: 0xF4B5,
-	33340 - 11905: 0xC57C,
-	33341 - 11905: 0xC57D,
-	33342 - 11905: 0xF4B8,
-	33343 - 11905: 0xC57E,
-	33344 - 11905: 0xC580,
-	33345 - 11905: 0xC581,
-	33346 - 11905: 0xC582,
-	33347 - 11905: 0xC583,
-	33348 - 11905: 0xF4B9,
-	33349 - 11905: 0xC584,
-	33350 - 11905: 0xC585,
-	33351 - 11905: 0xCDA7,
-	33352 - 11905: 0xC586,
-	33353 - 11905: 0xF4BA,
-	33354 - 11905: 0xC587,
-	33355 - 11905: 0xF4BB,
-	33356 - 11905: 0xC588,
-	33357 - 11905: 0xC589,
-	33358 - 11905: 0xC58A,
-	33359 - 11905: 0xF4BC,
-	33360 - 11905: 0xC58B,
-	33361 - 11905: 0xC58C,
-	33362 - 11905: 0xC58D,
-	33363 - 11905: 0xC58E,
-	33364 - 11905: 0xC58F,
-	33365 - 11905: 0xC590,
-	33366 - 11905: 0xC591,
-	33367 - 11905: 0xC592,
-	33368 - 11905: 0xCBD2,
-	33369 - 11905: 0xC593,
-	33370 - 11905: 0xF4BD,
-	33371 - 11905: 0xC594,
-	33372 - 11905: 0xC595,
-	33373 - 11905: 0xC596,
-	33374 - 11905: 0xC597,
-	33375 - 11905: 0xF4BE,
-	33376 - 11905: 0xC598,
-	33377 - 11905: 0xC599,
-	33378 - 11905: 0xC59A,
-	33379 - 11905: 0xC59B,
-	33380 - 11905: 0xC59C,
-	33381 - 11905: 0xC59D,
-	33382 - 11905: 0xC59E,
-	33383 - 11905: 0xC59F,
-	33384 - 11905: 0xF4BF,
-	33385 - 11905: 0xC5A0,
-	33386 - 11905: 0xC640,
-	33387 - 11905: 0xC641,
-	33388 - 11905: 0xC642,
-	33389 - 11905: 0xC643,
-	33390 - 11905: 0xF4DE,
-	33391 - 11905: 0xC1BC,
-	33392 - 11905: 0xBCE8,
-	33393 - 11905: 0xC644,
-	33394 - 11905: 0xC9AB,
-	33395 - 11905: 0xD1DE,
-	33396 - 11905: 0xE5F5,
-	33397 - 11905: 0xC645,
-	33398 - 11905: 0xC646,
-	33399 - 11905: 0xC647,
-	33400 - 11905: 0xC648,
-	33401 - 11905: 0xDCB3,
-	33402 - 11905: 0xD2D5,
-	33403 - 11905: 0xC649,
-	33404 - 11905: 0xC64A,
-	33405 - 11905: 0xDCB4,
-	33406 - 11905: 0xB0AC,
-	33407 - 11905: 0xDCB5,
-	33408 - 11905: 0xC64B,
-	33409 - 11905: 0xC64C,
-	33410 - 11905: 0xBDDA,
-	33411 - 11905: 0xC64D,
-	33412 - 11905: 0xDCB9,
-	33413 - 11905: 0xC64E,
-	33414 - 11905: 0xC64F,
-	33415 - 11905: 0xC650,
-	33416 - 11905: 0xD8C2,
-	33417 - 11905: 0xC651,
-	33418 - 11905: 0xDCB7,
-	33419 - 11905: 0xD3F3,
-	33420 - 11905: 0xC652,
-	33421 - 11905: 0xC9D6,
-	33422 - 11905: 0xDCBA,
-	33423 - 11905: 0xDCB6,
-	33424 - 11905: 0xC653,
-	33425 - 11905: 0xDCBB,
-	33426 - 11905: 0xC3A2,
-	33427 - 11905: 0xC654,
-	33428 - 11905: 0xC655,
-	33429 - 11905: 0xC656,
-	33430 - 11905: 0xC657,
-	33431 - 11905: 0xDCBC,
-	33432 - 11905: 0xDCC5,
-	33433 - 11905: 0xDCBD,
-	33434 - 11905: 0xC658,
-	33435 - 11905: 0xC659,
-	33436 - 11905: 0xCEDF,
-	33437 - 11905: 0xD6A5,
-	33438 - 11905: 0xC65A,
-	33439 - 11905: 0xDCCF,
-	33440 - 11905: 0xC65B,
-	33441 - 11905: 0xDCCD,
-	33442 - 11905: 0xC65C,
-	33443 - 11905: 0xC65D,
-	33444 - 11905: 0xDCD2,
-	33445 - 11905: 0xBDE6,
-	33446 - 11905: 0xC2AB,
-	33447 - 11905: 0xC65E,
-	33448 - 11905: 0xDCB8,
-	33449 - 11905: 0xDCCB,
-	33450 - 11905: 0xDCCE,
-	33451 - 11905: 0xDCBE,
-	33452 - 11905: 0xB7D2,
-	33453 - 11905: 0xB0C5,
-	33454 - 11905: 0xDCC7,
-	33455 - 11905: 0xD0BE,
-	33456 - 11905: 0xDCC1,
-	33457 - 11905: 0xBBA8,
-	33458 - 11905: 0xC65F,
-	33459 - 11905: 0xB7BC,
-	33460 - 11905: 0xDCCC,
-	33461 - 11905: 0xC660,
-	33462 - 11905: 0xC661,
-	33463 - 11905: 0xDCC6,
-	33464 - 11905: 0xDCBF,
-	33465 - 11905: 0xC7DB,
-	33466 - 11905: 0xC662,
-	33467 - 11905: 0xC663,
-	33468 - 11905: 0xC664,
-	33469 - 11905: 0xD1BF,
-	33470 - 11905: 0xDCC0,
-	33471 - 11905: 0xC665,
-	33472 - 11905: 0xC666,
-	33473 - 11905: 0xDCCA,
-	33474 - 11905: 0xC667,
-	33475 - 11905: 0xC668,
-	33476 - 11905: 0xDCD0,
-	33477 - 11905: 0xC669,
-	33478 - 11905: 0xC66A,
-	33479 - 11905: 0xCEAD,
-	33480 - 11905: 0xDCC2,
-	33481 - 11905: 0xC66B,
-	33482 - 11905: 0xDCC3,
-	33483 - 11905: 0xDCC8,
-	33484 - 11905: 0xDCC9,
-	33485 - 11905: 0xB2D4,
-	33486 - 11905: 0xDCD1,
-	33487 - 11905: 0xCBD5,
-	33488 - 11905: 0xC66C,
-	33489 - 11905: 0xD4B7,
-	33490 - 11905: 0xDCDB,
-	33491 - 11905: 0xDCDF,
-	33492 - 11905: 0xCCA6,
-	33493 - 11905: 0xDCE6,
-	33494 - 11905: 0xC66D,
-	33495 - 11905: 0xC3E7,
-	33496 - 11905: 0xDCDC,
-	33497 - 11905: 0xC66E,
-	33498 - 11905: 0xC66F,
-	33499 - 11905: 0xBFC1,
-	33500 - 11905: 0xDCD9,
-	33501 - 11905: 0xC670,
-	33502 - 11905: 0xB0FA,
-	33503 - 11905: 0xB9B6,
-	33504 - 11905: 0xDCE5,
-	33505 - 11905: 0xDCD3,
-	33506 - 11905: 0xC671,
-	33507 - 11905: 0xDCC4,
-	33508 - 11905: 0xDCD6,
-	33509 - 11905: 0xC8F4,
-	33510 - 11905: 0xBFE0,
-	33511 - 11905: 0xC672,
-	33512 - 11905: 0xC673,
-	33513 - 11905: 0xC674,
-	33514 - 11905: 0xC675,
-	33515 - 11905: 0xC9BB,
-	33516 - 11905: 0xC676,
-	33517 - 11905: 0xC677,
-	33518 - 11905: 0xC678,
-	33519 - 11905: 0xB1BD,
-	33520 - 11905: 0xC679,
-	33521 - 11905: 0xD3A2,
-	33522 - 11905: 0xC67A,
-	33523 - 11905: 0xC67B,
-	33524 - 11905: 0xDCDA,
-	33525 - 11905: 0xC67C,
-	33526 - 11905: 0xC67D,
-	33527 - 11905: 0xDCD5,
-	33528 - 11905: 0xC67E,
-	33529 - 11905: 0xC6BB,
-	33530 - 11905: 0xC680,
-	33531 - 11905: 0xDCDE,
-	33532 - 11905: 0xC681,
-	33533 - 11905: 0xC682,
-	33534 - 11905: 0xC683,
-	33535 - 11905: 0xC684,
-	33536 - 11905: 0xC685,
-	33537 - 11905: 0xD7C2,
-	33538 - 11905: 0xC3AF,
-	33539 - 11905: 0xB7B6,
-	33540 - 11905: 0xC7D1,
-	33541 - 11905: 0xC3A9,
-	33542 - 11905: 0xDCE2,
-	33543 - 11905: 0xDCD8,
-	33544 - 11905: 0xDCEB,
-	33545 - 11905: 0xDCD4,
-	33546 - 11905: 0xC686,
-	33547 - 11905: 0xC687,
-	33548 - 11905: 0xDCDD,
-	33549 - 11905: 0xC688,
-	33550 - 11905: 0xBEA5,
-	33551 - 11905: 0xDCD7,
-	33552 - 11905: 0xC689,
-	33553 - 11905: 0xDCE0,
-	33554 - 11905: 0xC68A,
-	33555 - 11905: 0xC68B,
-	33556 - 11905: 0xDCE3,
-	33557 - 11905: 0xDCE4,
-	33558 - 11905: 0xC68C,
-	33559 - 11905: 0xDCF8,
-	33560 - 11905: 0xC68D,
-	33561 - 11905: 0xC68E,
-	33562 - 11905: 0xDCE1,
-	33563 - 11905: 0xDDA2,
-	33564 - 11905: 0xDCE7,
-	33565 - 11905: 0xC68F,
-	33566 - 11905: 0xC690,
-	33567 - 11905: 0xC691,
-	33568 - 11905: 0xC692,
-	33569 - 11905: 0xC693,
-	33570 - 11905: 0xC694,
-	33571 - 11905: 0xC695,
-	33572 - 11905: 0xC696,
-	33573 - 11905: 0xC697,
-	33574 - 11905: 0xC698,
-	33575 - 11905: 0xBCEB,
-	33576 - 11905: 0xB4C4,
-	33577 - 11905: 0xC699,
-	33578 - 11905: 0xC69A,
-	33579 - 11905: 0xC3A3,
-	33580 - 11905: 0xB2E7,
-	33581 - 11905: 0xDCFA,
-	33582 - 11905: 0xC69B,
-	33583 - 11905: 0xDCF2,
-	33584 - 11905: 0xC69C,
-	33585 - 11905: 0xDCEF,
-	33586 - 11905: 0xC69D,
-	33587 - 11905: 0xDCFC,
-	33588 - 11905: 0xDCEE,
-	33589 - 11905: 0xD2F0,
-	33590 - 11905: 0xB2E8,
-	33591 - 11905: 0xC69E,
-	33592 - 11905: 0xC8D7,
-	33593 - 11905: 0xC8E3,
-	33594 - 11905: 0xDCFB,
-	33595 - 11905: 0xC69F,
-	33596 - 11905: 0xDCED,
-	33597 - 11905: 0xC6A0,
-	33598 - 11905: 0xC740,
-	33599 - 11905: 0xC741,
-	33600 - 11905: 0xDCF7,
-	33601 - 11905: 0xC742,
-	33602 - 11905: 0xC743,
-	33603 - 11905: 0xDCF5,
-	33604 - 11905: 0xC744,
-	33605 - 11905: 0xC745,
-	33606 - 11905: 0xBEA3,
-	33607 - 11905: 0xDCF4,
-	33608 - 11905: 0xC746,
-	33609 - 11905: 0xB2DD,
-	33610 - 11905: 0xC747,
-	33611 - 11905: 0xC748,
-	33612 - 11905: 0xC749,
-	33613 - 11905: 0xC74A,
-	33614 - 11905: 0xC74B,
-	33615 - 11905: 0xDCF3,
-	33616 - 11905: 0xBCF6,
-	33617 - 11905: 0xDCE8,
-	33618 - 11905: 0xBBC4,
-	33619 - 11905: 0xC74C,
-	33620 - 11905: 0xC0F3,
-	33621 - 11905: 0xC74D,
-	33622 - 11905: 0xC74E,
-	33623 - 11905: 0xC74F,
-	33624 - 11905: 0xC750,
-	33625 - 11905: 0xC751,
-	33626 - 11905: 0xBCD4,
-	33627 - 11905: 0xDCE9,
-	33628 - 11905: 0xDCEA,
-	33629 - 11905: 0xC752,
-	33630 - 11905: 0xDCF1,
-	33631 - 11905: 0xDCF6,
-	33632 - 11905: 0xDCF9,
-	33633 - 11905: 0xB5B4,
-	33634 - 11905: 0xC753,
-	33635 - 11905: 0xC8D9,
-	33636 - 11905: 0xBBE7,
-	33637 - 11905: 0xDCFE,
-	33638 - 11905: 0xDCFD,
-	33639 - 11905: 0xD3AB,
-	33640 - 11905: 0xDDA1,
-	33641 - 11905: 0xDDA3,
-	33642 - 11905: 0xDDA5,
-	33643 - 11905: 0xD2F1,
-	33644 - 11905: 0xDDA4,
-	33645 - 11905: 0xDDA6,
-	33646 - 11905: 0xDDA7,
-	33647 - 11905: 0xD2A9,
-	33648 - 11905: 0xC754,
-	33649 - 11905: 0xC755,
-	33650 - 11905: 0xC756,
-	33651 - 11905: 0xC757,
-	33652 - 11905: 0xC758,
-	33653 - 11905: 0xC759,
-	33654 - 11905: 0xC75A,
-	33655 - 11905: 0xBAC9,
-	33656 - 11905: 0xDDA9,
-	33657 - 11905: 0xC75B,
-	33658 - 11905: 0xC75C,
-	33659 - 11905: 0xDDB6,
-	33660 - 11905: 0xDDB1,
-	33661 - 11905: 0xDDB4,
-	33662 - 11905: 0xC75D,
-	33663 - 11905: 0xC75E,
-	33664 - 11905: 0xC75F,
-	33665 - 11905: 0xC760,
-	33666 - 11905: 0xC761,
-	33667 - 11905: 0xC762,
-	33668 - 11905: 0xC763,
-	33669 - 11905: 0xDDB0,
-	33670 - 11905: 0xC6CE,
-	33671 - 11905: 0xC764,
-	33672 - 11905: 0xC765,
-	33673 - 11905: 0xC0F2,
-	33674 - 11905: 0xC766,
-	33675 - 11905: 0xC767,
-	33676 - 11905: 0xC768,
-	33677 - 11905: 0xC769,
-	33678 - 11905: 0xC9AF,
-	33679 - 11905: 0xC76A,
-	33680 - 11905: 0xC76B,
-	33681 - 11905: 0xC76C,
-	33682 - 11905: 0xDCEC,
-	33683 - 11905: 0xDDAE,
-	33684 - 11905: 0xC76D,
-	33685 - 11905: 0xC76E,
-	33686 - 11905: 0xC76F,
-	33687 - 11905: 0xC770,
-	33688 - 11905: 0xDDB7,
-	33689 - 11905: 0xC771,
-	33690 - 11905: 0xC772,
-	33691 - 11905: 0xDCF0,
-	33692 - 11905: 0xDDAF,
-	33693 - 11905: 0xC773,
-	33694 - 11905: 0xDDB8,
-	33695 - 11905: 0xC774,
-	33696 - 11905: 0xDDAC,
-	33697 - 11905: 0xC775,
-	33698 - 11905: 0xC776,
-	33699 - 11905: 0xC777,
-	33700 - 11905: 0xC778,
-	33701 - 11905: 0xC779,
-	33702 - 11905: 0xC77A,
-	33703 - 11905: 0xC77B,
-	33704 - 11905: 0xDDB9,
-	33705 - 11905: 0xDDB3,
-	33706 - 11905: 0xDDAD,
-	33707 - 11905: 0xC4AA,
-	33708 - 11905: 0xC77C,
-	33709 - 11905: 0xC77D,
-	33710 - 11905: 0xC77E,
-	33711 - 11905: 0xC780,
-	33712 - 11905: 0xDDA8,
-	33713 - 11905: 0xC0B3,
-	33714 - 11905: 0xC1AB,
-	33715 - 11905: 0xDDAA,
-	33716 - 11905: 0xDDAB,
-	33717 - 11905: 0xC781,
-	33718 - 11905: 0xDDB2,
-	33719 - 11905: 0xBBF1,
-	33720 - 11905: 0xDDB5,
-	33721 - 11905: 0xD3A8,
-	33722 - 11905: 0xDDBA,
-	33723 - 11905: 0xC782,
-	33724 - 11905: 0xDDBB,
-	33725 - 11905: 0xC3A7,
-	33726 - 11905: 0xC783,
-	33727 - 11905: 0xC784,
-	33728 - 11905: 0xDDD2,
-	33729 - 11905: 0xDDBC,
-	33730 - 11905: 0xC785,
-	33731 - 11905: 0xC786,
-	33732 - 11905: 0xC787,
-	33733 - 11905: 0xDDD1,
-	33734 - 11905: 0xC788,
-	33735 - 11905: 0xB9BD,
-	33736 - 11905: 0xC789,
-	33737 - 11905: 0xC78A,
-	33738 - 11905: 0xBED5,
-	33739 - 11905: 0xC78B,
-	33740 - 11905: 0xBEFA,
-	33741 - 11905: 0xC78C,
-	33742 - 11905: 0xC78D,
-	33743 - 11905: 0xBACA,
-	33744 - 11905: 0xC78E,
-	33745 - 11905: 0xC78F,
-	33746 - 11905: 0xC790,
-	33747 - 11905: 0xC791,
-	33748 - 11905: 0xDDCA,
-	33749 - 11905: 0xC792,
-	33750 - 11905: 0xDDC5,
-	33751 - 11905: 0xC793,
-	33752 - 11905: 0xDDBF,
-	33753 - 11905: 0xC794,
-	33754 - 11905: 0xC795,
-	33755 - 11905: 0xC796,
-	33756 - 11905: 0xB2CB,
-	33757 - 11905: 0xDDC3,
-	33758 - 11905: 0xC797,
-	33759 - 11905: 0xDDCB,
-	33760 - 11905: 0xB2A4,
-	33761 - 11905: 0xDDD5,
-	33762 - 11905: 0xC798,
-	33763 - 11905: 0xC799,
-	33764 - 11905: 0xC79A,
-	33765 - 11905: 0xDDBE,
-	33766 - 11905: 0xC79B,
-	33767 - 11905: 0xC79C,
-	33768 - 11905: 0xC79D,
-	33769 - 11905: 0xC6D0,
-	33770 - 11905: 0xDDD0,
-	33771 - 11905: 0xC79E,
-	33772 - 11905: 0xC79F,
-	33773 - 11905: 0xC7A0,
-	33774 - 11905: 0xC840,
-	33775 - 11905: 0xC841,
-	33776 - 11905: 0xDDD4,
-	33777 - 11905: 0xC1E2,
-	33778 - 11905: 0xB7C6,
-	33779 - 11905: 0xC842,
-	33780 - 11905: 0xC843,
-	33781 - 11905: 0xC844,
-	33782 - 11905: 0xC845,
-	33783 - 11905: 0xC846,
-	33784 - 11905: 0xDDCE,
-	33785 - 11905: 0xDDCF,
-	33786 - 11905: 0xC847,
-	33787 - 11905: 0xC848,
-	33788 - 11905: 0xC849,
-	33789 - 11905: 0xDDC4,
-	33790 - 11905: 0xC84A,
-	33791 - 11905: 0xC84B,
-	33792 - 11905: 0xC84C,
-	33793 - 11905: 0xDDBD,
-	33794 - 11905: 0xC84D,
-	33795 - 11905: 0xDDCD,
-	33796 - 11905: 0xCCD1,
-	33797 - 11905: 0xC84E,
-	33798 - 11905: 0xDDC9,
-	33799 - 11905: 0xC84F,
-	33800 - 11905: 0xC850,
-	33801 - 11905: 0xC851,
-	33802 - 11905: 0xC852,
-	33803 - 11905: 0xDDC2,
-	33804 - 11905: 0xC3C8,
-	33805 - 11905: 0xC6BC,
-	33806 - 11905: 0xCEAE,
-	33807 - 11905: 0xDDCC,
-	33808 - 11905: 0xC853,
-	33809 - 11905: 0xDDC8,
-	33810 - 11905: 0xC854,
-	33811 - 11905: 0xC855,
-	33812 - 11905: 0xC856,
-	33813 - 11905: 0xC857,
-	33814 - 11905: 0xC858,
-	33815 - 11905: 0xC859,
-	33816 - 11905: 0xDDC1,
-	33817 - 11905: 0xC85A,
-	33818 - 11905: 0xC85B,
-	33819 - 11905: 0xC85C,
-	33820 - 11905: 0xDDC6,
-	33821 - 11905: 0xC2DC,
-	33822 - 11905: 0xC85D,
-	33823 - 11905: 0xC85E,
-	33824 - 11905: 0xC85F,
-	33825 - 11905: 0xC860,
-	33826 - 11905: 0xC861,
-	33827 - 11905: 0xC862,
-	33828 - 11905: 0xD3A9,
-	33829 - 11905: 0xD3AA,
-	33830 - 11905: 0xDDD3,
-	33831 - 11905: 0xCFF4,
-	33832 - 11905: 0xC8F8,
-	33833 - 11905: 0xC863,
-	33834 - 11905: 0xC864,
-	33835 - 11905: 0xC865,
-	33836 - 11905: 0xC866,
-	33837 - 11905: 0xC867,
-	33838 - 11905: 0xC868,
-	33839 - 11905: 0xC869,
-	33840 - 11905: 0xC86A,
-	33841 - 11905: 0xDDE6,
-	33842 - 11905: 0xC86B,
-	33843 - 11905: 0xC86C,
-	33844 - 11905: 0xC86D,
-	33845 - 11905: 0xC86E,
-	33846 - 11905: 0xC86F,
-	33847 - 11905: 0xC870,
-	33848 - 11905: 0xDDC7,
-	33849 - 11905: 0xC871,
-	33850 - 11905: 0xC872,
-	33851 - 11905: 0xC873,
-	33852 - 11905: 0xDDE0,
-	33853 - 11905: 0xC2E4,
-	33854 - 11905: 0xC874,
-	33855 - 11905: 0xC875,
-	33856 - 11905: 0xC876,
-	33857 - 11905: 0xC877,
-	33858 - 11905: 0xC878,
-	33859 - 11905: 0xC879,
-	33860 - 11905: 0xC87A,
-	33861 - 11905: 0xC87B,
-	33862 - 11905: 0xDDE1,
-	33863 - 11905: 0xC87C,
-	33864 - 11905: 0xC87D,
-	33865 - 11905: 0xC87E,
-	33866 - 11905: 0xC880,
-	33867 - 11905: 0xC881,
-	33868 - 11905: 0xC882,
-	33869 - 11905: 0xC883,
-	33870 - 11905: 0xC884,
-	33871 - 11905: 0xC885,
-	33872 - 11905: 0xC886,
-	33873 - 11905: 0xDDD7,
-	33874 - 11905: 0xC887,
-	33875 - 11905: 0xC888,
-	33876 - 11905: 0xC889,
-	33877 - 11905: 0xC88A,
-	33878 - 11905: 0xC88B,
-	33879 - 11905: 0xD6F8,
-	33880 - 11905: 0xC88C,
-	33881 - 11905: 0xDDD9,
-	33882 - 11905: 0xDDD8,
-	33883 - 11905: 0xB8F0,
-	33884 - 11905: 0xDDD6,
-	33885 - 11905: 0xC88D,
-	33886 - 11905: 0xC88E,
-	33887 - 11905: 0xC88F,
-	33888 - 11905: 0xC890,
-	33889 - 11905: 0xC6CF,
-	33890 - 11905: 0xC891,
-	33891 - 11905: 0xB6AD,
-	33892 - 11905: 0xC892,
-	33893 - 11905: 0xC893,
-	33894 - 11905: 0xC894,
-	33895 - 11905: 0xC895,
-	33896 - 11905: 0xC896,
-	33897 - 11905: 0xDDE2,
-	33898 - 11905: 0xC897,
-	33899 - 11905: 0xBAF9,
-	33900 - 11905: 0xD4E1,
-	33901 - 11905: 0xDDE7,
-	33902 - 11905: 0xC898,
-	33903 - 11905: 0xC899,
-	33904 - 11905: 0xC89A,
-	33905 - 11905: 0xB4D0,
-	33906 - 11905: 0xC89B,
-	33907 - 11905: 0xDDDA,
-	33908 - 11905: 0xC89C,
-	33909 - 11905: 0xBFFB,
-	33910 - 11905: 0xDDE3,
-	33911 - 11905: 0xC89D,
-	33912 - 11905: 0xDDDF,
-	33913 - 11905: 0xC89E,
-	33914 - 11905: 0xDDDD,
-	33915 - 11905: 0xC89F,
-	33916 - 11905: 0xC8A0,
-	33917 - 11905: 0xC940,
-	33918 - 11905: 0xC941,
-	33919 - 11905: 0xC942,
-	33920 - 11905: 0xC943,
-	33921 - 11905: 0xC944,
-	33922 - 11905: 0xB5D9,
-	33923 - 11905: 0xC945,
-	33924 - 11905: 0xC946,
-	33925 - 11905: 0xC947,
-	33926 - 11905: 0xC948,
-	33927 - 11905: 0xDDDB,
-	33928 - 11905: 0xDDDC,
-	33929 - 11905: 0xDDDE,
-	33930 - 11905: 0xC949,
-	33931 - 11905: 0xBDAF,
-	33932 - 11905: 0xDDE4,
-	33933 - 11905: 0xC94A,
-	33934 - 11905: 0xDDE5,
-	33935 - 11905: 0xC94B,
-	33936 - 11905: 0xC94C,
-	33937 - 11905: 0xC94D,
-	33938 - 11905: 0xC94E,
-	33939 - 11905: 0xC94F,
-	33940 - 11905: 0xC950,
-	33941 - 11905: 0xC951,
-	33942 - 11905: 0xC952,
-	33943 - 11905: 0xDDF5,
-	33944 - 11905: 0xC953,
-	33945 - 11905: 0xC3C9,
-	33946 - 11905: 0xC954,
-	33947 - 11905: 0xC955,
-	33948 - 11905: 0xCBE2,
-	33949 - 11905: 0xC956,
-	33950 - 11905: 0xC957,
-	33951 - 11905: 0xC958,
-	33952 - 11905: 0xC959,
-	33953 - 11905: 0xDDF2,
-	33954 - 11905: 0xC95A,
-	33955 - 11905: 0xC95B,
-	33956 - 11905: 0xC95C,
-	33957 - 11905: 0xC95D,
-	33958 - 11905: 0xC95E,
-	33959 - 11905: 0xC95F,
-	33960 - 11905: 0xC960,
-	33961 - 11905: 0xC961,
-	33962 - 11905: 0xC962,
-	33963 - 11905: 0xC963,
-	33964 - 11905: 0xC964,
-	33965 - 11905: 0xC965,
-	33966 - 11905: 0xC966,
-	33967 - 11905: 0xD8E1,
-	33968 - 11905: 0xC967,
-	33969 - 11905: 0xC968,
-	33970 - 11905: 0xC6D1,
-	33971 - 11905: 0xC969,
-	33972 - 11905: 0xDDF4,
-	33973 - 11905: 0xC96A,
-	33974 - 11905: 0xC96B,
-	33975 - 11905: 0xC96C,
-	33976 - 11905: 0xD5F4,
-	33977 - 11905: 0xDDF3,
-	33978 - 11905: 0xDDF0,
-	33979 - 11905: 0xC96D,
-	33980 - 11905: 0xC96E,
-	33981 - 11905: 0xDDEC,
-	33982 - 11905: 0xC96F,
-	33983 - 11905: 0xDDEF,
-	33984 - 11905: 0xC970,
-	33985 - 11905: 0xDDE8,
-	33986 - 11905: 0xC971,
-	33987 - 11905: 0xC972,
-	33988 - 11905: 0xD0EE,
-	33989 - 11905: 0xC973,
-	33990 - 11905: 0xC974,
-	33991 - 11905: 0xC975,
-	33992 - 11905: 0xC976,
-	33993 - 11905: 0xC8D8,
-	33994 - 11905: 0xDDEE,
-	33995 - 11905: 0xC977,
-	33996 - 11905: 0xC978,
-	33997 - 11905: 0xDDE9,
-	33998 - 11905: 0xC979,
-	33999 - 11905: 0xC97A,
-	34000 - 11905: 0xDDEA,
-	34001 - 11905: 0xCBF2,
-	34002 - 11905: 0xC97B,
-	34003 - 11905: 0xDDED,
-	34004 - 11905: 0xC97C,
-	34005 - 11905: 0xC97D,
-	34006 - 11905: 0xB1CD,
-	34007 - 11905: 0xC97E,
-	34008 - 11905: 0xC980,
-	34009 - 11905: 0xC981,
-	34010 - 11905: 0xC982,
-	34011 - 11905: 0xC983,
-	34012 - 11905: 0xC984,
-	34013 - 11905: 0xC0B6,
-	34014 - 11905: 0xC985,
-	34015 - 11905: 0xBCBB,
-	34016 - 11905: 0xDDF1,
-	34017 - 11905: 0xC986,
-	34018 - 11905: 0xC987,
-	34019 - 11905: 0xDDF7,
-	34020 - 11905: 0xC988,
-	34021 - 11905: 0xDDF6,
-	34022 - 11905: 0xDDEB,
-	34023 - 11905: 0xC989,
-	34024 - 11905: 0xC98A,
-	34025 - 11905: 0xC98B,
-	34026 - 11905: 0xC98C,
-	34027 - 11905: 0xC98D,
-	34028 - 11905: 0xC5EE,
-	34029 - 11905: 0xC98E,
-	34030 - 11905: 0xC98F,
-	34031 - 11905: 0xC990,
-	34032 - 11905: 0xDDFB,
-	34033 - 11905: 0xC991,
-	34034 - 11905: 0xC992,
-	34035 - 11905: 0xC993,
-	34036 - 11905: 0xC994,
-	34037 - 11905: 0xC995,
-	34038 - 11905: 0xC996,
-	34039 - 11905: 0xC997,
-	34040 - 11905: 0xC998,
-	34041 - 11905: 0xC999,
-	34042 - 11905: 0xC99A,
-	34043 - 11905: 0xC99B,
-	34044 - 11905: 0xDEA4,
-	34045 - 11905: 0xC99C,
-	34046 - 11905: 0xC99D,
-	34047 - 11905: 0xDEA3,
-	34048 - 11905: 0xC99E,
-	34049 - 11905: 0xC99F,
-	34050 - 11905: 0xC9A0,
-	34051 - 11905: 0xCA40,
-	34052 - 11905: 0xCA41,
-	34053 - 11905: 0xCA42,
-	34054 - 11905: 0xCA43,
-	34055 - 11905: 0xCA44,
-	34056 - 11905: 0xCA45,
-	34057 - 11905: 0xCA46,
-	34058 - 11905: 0xCA47,
-	34059 - 11905: 0xCA48,
-	34060 - 11905: 0xDDF8,
-	34061 - 11905: 0xCA49,
-	34062 - 11905: 0xCA4A,
-	34063 - 11905: 0xCA4B,
-	34064 - 11905: 0xCA4C,
-	34065 - 11905: 0xC3EF,
-	34066 - 11905: 0xCA4D,
-	34067 - 11905: 0xC2FB,
-	34068 - 11905: 0xCA4E,
-	34069 - 11905: 0xCA4F,
-	34070 - 11905: 0xCA50,
-	34071 - 11905: 0xD5E1,
-	34072 - 11905: 0xCA51,
-	34073 - 11905: 0xCA52,
-	34074 - 11905: 0xCEB5,
-	34075 - 11905: 0xCA53,
-	34076 - 11905: 0xCA54,
-	34077 - 11905: 0xCA55,
-	34078 - 11905: 0xCA56,
-	34079 - 11905: 0xDDFD,
-	34080 - 11905: 0xCA57,
-	34081 - 11905: 0xB2CC,
-	34082 - 11905: 0xCA58,
-	34083 - 11905: 0xCA59,
-	34084 - 11905: 0xCA5A,
-	34085 - 11905: 0xCA5B,
-	34086 - 11905: 0xCA5C,
-	34087 - 11905: 0xCA5D,
-	34088 - 11905: 0xCA5E,
-	34089 - 11905: 0xCA5F,
-	34090 - 11905: 0xCA60,
-	34091 - 11905: 0xC4E8,
-	34092 - 11905: 0xCADF,
-	34093 - 11905: 0xCA61,
-	34094 - 11905: 0xCA62,
-	34095 - 11905: 0xCA63,
-	34096 - 11905: 0xCA64,
-	34097 - 11905: 0xCA65,
-	34098 - 11905: 0xCA66,
-	34099 - 11905: 0xCA67,
-	34100 - 11905: 0xCA68,
-	34101 - 11905: 0xCA69,
-	34102 - 11905: 0xCA6A,
-	34103 - 11905: 0xC7BE,
-	34104 - 11905: 0xDDFA,
-	34105 - 11905: 0xDDFC,
-	34106 - 11905: 0xDDFE,
-	34107 - 11905: 0xDEA2,
-	34108 - 11905: 0xB0AA,
-	34109 - 11905: 0xB1CE,
-	34110 - 11905: 0xCA6B,
-	34111 - 11905: 0xCA6C,
-	34112 - 11905: 0xCA6D,
-	34113 - 11905: 0xCA6E,
-	34114 - 11905: 0xCA6F,
-	34115 - 11905: 0xDEAC,
-	34116 - 11905: 0xCA70,
-	34117 - 11905: 0xCA71,
-	34118 - 11905: 0xCA72,
-	34119 - 11905: 0xCA73,
-	34120 - 11905: 0xDEA6,
-	34121 - 11905: 0xBDB6,
-	34122 - 11905: 0xC8EF,
-	34123 - 11905: 0xCA74,
-	34124 - 11905: 0xCA75,
-	34125 - 11905: 0xCA76,
-	34126 - 11905: 0xCA77,
-	34127 - 11905: 0xCA78,
-	34128 - 11905: 0xCA79,
-	34129 - 11905: 0xCA7A,
-	34130 - 11905: 0xCA7B,
-	34131 - 11905: 0xCA7C,
-	34132 - 11905: 0xCA7D,
-	34133 - 11905: 0xCA7E,
-	34134 - 11905: 0xDEA1,
-	34135 - 11905: 0xCA80,
-	34136 - 11905: 0xCA81,
-	34137 - 11905: 0xDEA5,
-	34138 - 11905: 0xCA82,
-	34139 - 11905: 0xCA83,
-	34140 - 11905: 0xCA84,
-	34141 - 11905: 0xCA85,
-	34142 - 11905: 0xDEA9,
-	34143 - 11905: 0xCA86,
-	34144 - 11905: 0xCA87,
-	34145 - 11905: 0xCA88,
-	34146 - 11905: 0xCA89,
-	34147 - 11905: 0xCA8A,
-	34148 - 11905: 0xDEA8,
-	34149 - 11905: 0xCA8B,
-	34150 - 11905: 0xCA8C,
-	34151 - 11905: 0xCA8D,
-	34152 - 11905: 0xDEA7,
-	34153 - 11905: 0xCA8E,
-	34154 - 11905: 0xCA8F,
-	34155 - 11905: 0xCA90,
-	34156 - 11905: 0xCA91,
-	34157 - 11905: 0xCA92,
-	34158 - 11905: 0xCA93,
-	34159 - 11905: 0xCA94,
-	34160 - 11905: 0xCA95,
-	34161 - 11905: 0xCA96,
-	34162 - 11905: 0xDEAD,
-	34163 - 11905: 0xCA97,
-	34164 - 11905: 0xD4CC,
-	34165 - 11905: 0xCA98,
-	34166 - 11905: 0xCA99,
-	34167 - 11905: 0xCA9A,
-	34168 - 11905: 0xCA9B,
-	34169 - 11905: 0xDEB3,
-	34170 - 11905: 0xDEAA,
-	34171 - 11905: 0xDEAE,
-	34172 - 11905: 0xCA9C,
-	34173 - 11905: 0xCA9D,
-	34174 - 11905: 0xC0D9,
-	34175 - 11905: 0xCA9E,
-	34176 - 11905: 0xCA9F,
-	34177 - 11905: 0xCAA0,
-	34178 - 11905: 0xCB40,
-	34179 - 11905: 0xCB41,
-	34180 - 11905: 0xB1A1,
-	34181 - 11905: 0xDEB6,
-	34182 - 11905: 0xCB42,
-	34183 - 11905: 0xDEB1,
-	34184 - 11905: 0xCB43,
-	34185 - 11905: 0xCB44,
-	34186 - 11905: 0xCB45,
-	34187 - 11905: 0xCB46,
-	34188 - 11905: 0xCB47,
-	34189 - 11905: 0xCB48,
-	34190 - 11905: 0xCB49,
-	34191 - 11905: 0xDEB2,
-	34192 - 11905: 0xCB4A,
-	34193 - 11905: 0xCB4B,
-	34194 - 11905: 0xCB4C,
-	34195 - 11905: 0xCB4D,
-	34196 - 11905: 0xCB4E,
-	34197 - 11905: 0xCB4F,
-	34198 - 11905: 0xCB50,
-	34199 - 11905: 0xCB51,
-	34200 - 11905: 0xCB52,
-	34201 - 11905: 0xCB53,
-	34202 - 11905: 0xCB54,
-	34203 - 11905: 0xD1A6,
-	34204 - 11905: 0xDEB5,
-	34205 - 11905: 0xCB55,
-	34206 - 11905: 0xCB56,
-	34207 - 11905: 0xCB57,
-	34208 - 11905: 0xCB58,
-	34209 - 11905: 0xCB59,
-	34210 - 11905: 0xCB5A,
-	34211 - 11905: 0xCB5B,
-	34212 - 11905: 0xDEAF,
-	34213 - 11905: 0xCB5C,
-	34214 - 11905: 0xCB5D,
-	34215 - 11905: 0xCB5E,
-	34216 - 11905: 0xDEB0,
-	34217 - 11905: 0xCB5F,
-	34218 - 11905: 0xD0BD,
-	34219 - 11905: 0xCB60,
-	34220 - 11905: 0xCB61,
-	34221 - 11905: 0xCB62,
-	34222 - 11905: 0xDEB4,
-	34223 - 11905: 0xCAED,
-	34224 - 11905: 0xDEB9,
-	34225 - 11905: 0xCB63,
-	34226 - 11905: 0xCB64,
-	34227 - 11905: 0xCB65,
-	34228 - 11905: 0xCB66,
-	34229 - 11905: 0xCB67,
-	34230 - 11905: 0xCB68,
-	34231 - 11905: 0xDEB8,
-	34232 - 11905: 0xCB69,
-	34233 - 11905: 0xDEB7,
-	34234 - 11905: 0xCB6A,
-	34235 - 11905: 0xCB6B,
-	34236 - 11905: 0xCB6C,
-	34237 - 11905: 0xCB6D,
-	34238 - 11905: 0xCB6E,
-	34239 - 11905: 0xCB6F,
-	34240 - 11905: 0xCB70,
-	34241 - 11905: 0xDEBB,
-	34242 - 11905: 0xCB71,
-	34243 - 11905: 0xCB72,
-	34244 - 11905: 0xCB73,
-	34245 - 11905: 0xCB74,
-	34246 - 11905: 0xCB75,
-	34247 - 11905: 0xCB76,
-	34248 - 11905: 0xCB77,
-	34249 - 11905: 0xBDE5,
-	34250 - 11905: 0xCB78,
-	34251 - 11905: 0xCB79,
-	34252 - 11905: 0xCB7A,
-	34253 - 11905: 0xCB7B,
-	34254 - 11905: 0xCB7C,
-	34255 - 11905: 0xB2D8,
-	34256 - 11905: 0xC3EA,
-	34257 - 11905: 0xCB7D,
-	34258 - 11905: 0xCB7E,
-	34259 - 11905: 0xDEBA,
-	34260 - 11905: 0xCB80,
-	34261 - 11905: 0xC5BA,
-	34262 - 11905: 0xCB81,
-	34263 - 11905: 0xCB82,
-	34264 - 11905: 0xCB83,
-	34265 - 11905: 0xCB84,
-	34266 - 11905: 0xCB85,
-	34267 - 11905: 0xCB86,
-	34268 - 11905: 0xDEBC,
-	34269 - 11905: 0xCB87,
-	34270 - 11905: 0xCB88,
-	34271 - 11905: 0xCB89,
-	34272 - 11905: 0xCB8A,
-	34273 - 11905: 0xCB8B,
-	34274 - 11905: 0xCB8C,
-	34275 - 11905: 0xCB8D,
-	34276 - 11905: 0xCCD9,
-	34277 - 11905: 0xCB8E,
-	34278 - 11905: 0xCB8F,
-	34279 - 11905: 0xCB90,
-	34280 - 11905: 0xCB91,
-	34281 - 11905: 0xB7AA,
-	34282 - 11905: 0xCB92,
-	34283 - 11905: 0xCB93,
-	34284 - 11905: 0xCB94,
-	34285 - 11905: 0xCB95,
-	34286 - 11905: 0xCB96,
-	34287 - 11905: 0xCB97,
-	34288 - 11905: 0xCB98,
-	34289 - 11905: 0xCB99,
-	34290 - 11905: 0xCB9A,
-	34291 - 11905: 0xCB9B,
-	34292 - 11905: 0xCB9C,
-	34293 - 11905: 0xCB9D,
-	34294 - 11905: 0xCB9E,
-	34295 - 11905: 0xCB9F,
-	34296 - 11905: 0xCBA0,
-	34297 - 11905: 0xCC40,
-	34298 - 11905: 0xCC41,
-	34299 - 11905: 0xD4E5,
-	34300 - 11905: 0xCC42,
-	34301 - 11905: 0xCC43,
-	34302 - 11905: 0xCC44,
-	34303 - 11905: 0xDEBD,
-	34304 - 11905: 0xCC45,
-	34305 - 11905: 0xCC46,
-	34306 - 11905: 0xCC47,
-	34307 - 11905: 0xCC48,
-	34308 - 11905: 0xCC49,
-	34309 - 11905: 0xDEBF,
-	34310 - 11905: 0xCC4A,
-	34311 - 11905: 0xCC4B,
-	34312 - 11905: 0xCC4C,
-	34313 - 11905: 0xCC4D,
-	34314 - 11905: 0xCC4E,
-	34315 - 11905: 0xCC4F,
-	34316 - 11905: 0xCC50,
-	34317 - 11905: 0xCC51,
-	34318 - 11905: 0xCC52,
-	34319 - 11905: 0xCC53,
-	34320 - 11905: 0xCC54,
-	34321 - 11905: 0xC4A2,
-	34322 - 11905: 0xCC55,
-	34323 - 11905: 0xCC56,
-	34324 - 11905: 0xCC57,
-	34325 - 11905: 0xCC58,
-	34326 - 11905: 0xDEC1,
-	34327 - 11905: 0xCC59,
-	34328 - 11905: 0xCC5A,
-	34329 - 11905: 0xCC5B,
-	34330 - 11905: 0xCC5C,
-	34331 - 11905: 0xCC5D,
-	34332 - 11905: 0xCC5E,
-	34333 - 11905: 0xCC5F,
-	34334 - 11905: 0xCC60,
-	34335 - 11905: 0xCC61,
-	34336 - 11905: 0xCC62,
-	34337 - 11905: 0xCC63,
-	34338 - 11905: 0xCC64,
-	34339 - 11905: 0xCC65,
-	34340 - 11905: 0xCC66,
-	34341 - 11905: 0xCC67,
-	34342 - 11905: 0xCC68,
-	34343 - 11905: 0xDEBE,
-	34344 - 11905: 0xCC69,
-	34345 - 11905: 0xDEC0,
-	34346 - 11905: 0xCC6A,
-	34347 - 11905: 0xCC6B,
-	34348 - 11905: 0xCC6C,
-	34349 - 11905: 0xCC6D,
-	34350 - 11905: 0xCC6E,
-	34351 - 11905: 0xCC6F,
-	34352 - 11905: 0xCC70,
-	34353 - 11905: 0xCC71,
-	34354 - 11905: 0xCC72,
-	34355 - 11905: 0xCC73,
-	34356 - 11905: 0xCC74,
-	34357 - 11905: 0xCC75,
-	34358 - 11905: 0xCC76,
-	34359 - 11905: 0xCC77,
-	34360 - 11905: 0xD5BA,
-	34361 - 11905: 0xCC78,
-	34362 - 11905: 0xCC79,
-	34363 - 11905: 0xCC7A,
-	34364 - 11905: 0xDEC2,
-	34365 - 11905: 0xCC7B,
-	34366 - 11905: 0xCC7C,
-	34367 - 11905: 0xCC7D,
-	34368 - 11905: 0xCC7E,
-	34369 - 11905: 0xCC80,
-	34370 - 11905: 0xCC81,
-	34371 - 11905: 0xCC82,
-	34372 - 11905: 0xCC83,
-	34373 - 11905: 0xCC84,
-	34374 - 11905: 0xCC85,
-	34375 - 11905: 0xCC86,
-	34376 - 11905: 0xCC87,
-	34377 - 11905: 0xCC88,
-	34378 - 11905: 0xCC89,
-	34379 - 11905: 0xCC8A,
-	34380 - 11905: 0xCC8B,
-	34381 - 11905: 0xF2AE,
-	34382 - 11905: 0xBBA2,
-	34383 - 11905: 0xC2B2,
-	34384 - 11905: 0xC5B0,
-	34385 - 11905: 0xC2C7,
-	34386 - 11905: 0xCC8C,
-	34387 - 11905: 0xCC8D,
-	34388 - 11905: 0xF2AF,
-	34389 - 11905: 0xCC8E,
-	34390 - 11905: 0xCC8F,
-	34391 - 11905: 0xCC90,
-	34392 - 11905: 0xCC91,
-	34393 - 11905: 0xCC92,
-	34394 - 11905: 0xD0E9,
-	34395 - 11905: 0xCC93,
-	34396 - 11905: 0xCC94,
-	34397 - 11905: 0xCC95,
-	34398 - 11905: 0xD3DD,
-	34399 - 11905: 0xCC96,
-	34400 - 11905: 0xCC97,
-	34401 - 11905: 0xCC98,
-	34402 - 11905: 0xEBBD,
-	34403 - 11905: 0xCC99,
-	34404 - 11905: 0xCC9A,
-	34405 - 11905: 0xCC9B,
-	34406 - 11905: 0xCC9C,
-	34407 - 11905: 0xCC9D,
-	34408 - 11905: 0xCC9E,
-	34409 - 11905: 0xCC9F,
-	34410 - 11905: 0xCCA0,
-	34411 - 11905: 0xB3E6,
-	34412 - 11905: 0xF2B0,
-	34413 - 11905: 0xCD40,
-	34414 - 11905: 0xF2B1,
-	34415 - 11905: 0xCD41,
-	34416 - 11905: 0xCD42,
-	34417 - 11905: 0xCAAD,
-	34418 - 11905: 0xCD43,
-	34419 - 11905: 0xCD44,
-	34420 - 11905: 0xCD45,
-	34421 - 11905: 0xCD46,
-	34422 - 11905: 0xCD47,
-	34423 - 11905: 0xCD48,
-	34424 - 11905: 0xCD49,
-	34425 - 11905: 0xBAE7,
-	34426 - 11905: 0xF2B3,
-	34427 - 11905: 0xF2B5,
-	34428 - 11905: 0xF2B4,
-	34429 - 11905: 0xCBE4,
-	34430 - 11905: 0xCFBA,
-	34431 - 11905: 0xF2B2,
-	34432 - 11905: 0xCAB4,
-	34433 - 11905: 0xD2CF,
-	34434 - 11905: 0xC2EC,
-	34435 - 11905: 0xCD4A,
-	34436 - 11905: 0xCD4B,
-	34437 - 11905: 0xCD4C,
-	34438 - 11905: 0xCD4D,
-	34439 - 11905: 0xCD4E,
-	34440 - 11905: 0xCD4F,
-	34441 - 11905: 0xCD50,
-	34442 - 11905: 0xCEC3,
-	34443 - 11905: 0xF2B8,
-	34444 - 11905: 0xB0F6,
-	34445 - 11905: 0xF2B7,
-	34446 - 11905: 0xCD51,
-	34447 - 11905: 0xCD52,
-	34448 - 11905: 0xCD53,
-	34449 - 11905: 0xCD54,
-	34450 - 11905: 0xCD55,
-	34451 - 11905: 0xF2BE,
-	34452 - 11905: 0xCD56,
-	34453 - 11905: 0xB2CF,
-	34454 - 11905: 0xCD57,
-	34455 - 11905: 0xCD58,
-	34456 - 11905: 0xCD59,
-	34457 - 11905: 0xCD5A,
-	34458 - 11905: 0xCD5B,
-	34459 - 11905: 0xCD5C,
-	34460 - 11905: 0xD1C1,
-	34461 - 11905: 0xF2BA,
-	34462 - 11905: 0xCD5D,
-	34463 - 11905: 0xCD5E,
-	34464 - 11905: 0xCD5F,
-	34465 - 11905: 0xCD60,
-	34466 - 11905: 0xCD61,
-	34467 - 11905: 0xF2BC,
-	34468 - 11905: 0xD4E9,
-	34469 - 11905: 0xCD62,
-	34470 - 11905: 0xCD63,
-	34471 - 11905: 0xF2BB,
-	34472 - 11905: 0xF2B6,
-	34473 - 11905: 0xF2BF,
-	34474 - 11905: 0xF2BD,
-	34475 - 11905: 0xCD64,
-	34476 - 11905: 0xF2B9,
-	34477 - 11905: 0xCD65,
-	34478 - 11905: 0xCD66,
-	34479 - 11905: 0xF2C7,
-	34480 - 11905: 0xF2C4,
-	34481 - 11905: 0xF2C6,
-	34482 - 11905: 0xCD67,
-	34483 - 11905: 0xCD68,
-	34484 - 11905: 0xF2CA,
-	34485 - 11905: 0xF2C2,
-	34486 - 11905: 0xF2C0,
-	34487 - 11905: 0xCD69,
-	34488 - 11905: 0xCD6A,
-	34489 - 11905: 0xCD6B,
-	34490 - 11905: 0xF2C5,
-	34491 - 11905: 0xCD6C,
-	34492 - 11905: 0xCD6D,
-	34493 - 11905: 0xCD6E,
-	34494 - 11905: 0xCD6F,
-	34495 - 11905: 0xCD70,
-	34496 - 11905: 0xD6FB,
-	34497 - 11905: 0xCD71,
-	34498 - 11905: 0xCD72,
-	34499 - 11905: 0xCD73,
-	34500 - 11905: 0xF2C1,
-	34501 - 11905: 0xCD74,
-	34502 - 11905: 0xC7F9,
-	34503 - 11905: 0xC9DF,
-	34504 - 11905: 0xCD75,
-	34505 - 11905: 0xF2C8,
-	34506 - 11905: 0xB9C6,
-	34507 - 11905: 0xB5B0,
-	34508 - 11905: 0xCD76,
-	34509 - 11905: 0xCD77,
-	34510 - 11905: 0xF2C3,
-	34511 - 11905: 0xF2C9,
-	34512 - 11905: 0xF2D0,
-	34513 - 11905: 0xF2D6,
-	34514 - 11905: 0xCD78,
-	34515 - 11905: 0xCD79,
-	34516 - 11905: 0xBBD7,
-	34517 - 11905: 0xCD7A,
-	34518 - 11905: 0xCD7B,
-	34519 - 11905: 0xCD7C,
-	34520 - 11905: 0xF2D5,
-	34521 - 11905: 0xCDDC,
-	34522 - 11905: 0xCD7D,
-	34523 - 11905: 0xD6EB,
-	34524 - 11905: 0xCD7E,
-	34525 - 11905: 0xCD80,
-	34526 - 11905: 0xF2D2,
-	34527 - 11905: 0xF2D4,
-	34528 - 11905: 0xCD81,
-	34529 - 11905: 0xCD82,
-	34530 - 11905: 0xCD83,
-	34531 - 11905: 0xCD84,
-	34532 - 11905: 0xB8F2,
-	34533 - 11905: 0xCD85,
-	34534 - 11905: 0xCD86,
-	34535 - 11905: 0xCD87,
-	34536 - 11905: 0xCD88,
-	34537 - 11905: 0xF2CB,
-	34538 - 11905: 0xCD89,
-	34539 - 11905: 0xCD8A,
-	34540 - 11905: 0xCD8B,
-	34541 - 11905: 0xF2CE,
-	34542 - 11905: 0xC2F9,
-	34543 - 11905: 0xCD8C,
-	34544 - 11905: 0xD5DD,
-	34545 - 11905: 0xF2CC,
-	34546 - 11905: 0xF2CD,
-	34547 - 11905: 0xF2CF,
-	34548 - 11905: 0xF2D3,
-	34549 - 11905: 0xCD8D,
-	34550 - 11905: 0xCD8E,
-	34551 - 11905: 0xCD8F,
-	34552 - 11905: 0xF2D9,
-	34553 - 11905: 0xD3BC,
-	34554 - 11905: 0xCD90,
-	34555 - 11905: 0xCD91,
-	34556 - 11905: 0xCD92,
-	34557 - 11905: 0xCD93,
-	34558 - 11905: 0xB6EA,
-	34559 - 11905: 0xCD94,
-	34560 - 11905: 0xCAF1,
-	34561 - 11905: 0xCD95,
-	34562 - 11905: 0xB7E4,
-	34563 - 11905: 0xF2D7,
-	34564 - 11905: 0xCD96,
-	34565 - 11905: 0xCD97,
-	34566 - 11905: 0xCD98,
-	34567 - 11905: 0xF2D8,
-	34568 - 11905: 0xF2DA,
-	34569 - 11905: 0xF2DD,
-	34570 - 11905: 0xF2DB,
-	34571 - 11905: 0xCD99,
-	34572 - 11905: 0xCD9A,
-	34573 - 11905: 0xF2DC,
-	34574 - 11905: 0xCD9B,
-	34575 - 11905: 0xCD9C,
-	34576 - 11905: 0xCD9D,
-	34577 - 11905: 0xCD9E,
-	34578 - 11905: 0xD1D1,
-	34579 - 11905: 0xF2D1,
-	34580 - 11905: 0xCD9F,
-	34581 - 11905: 0xCDC9,
-	34582 - 11905: 0xCDA0,
-	34583 - 11905: 0xCECF,
-	34584 - 11905: 0xD6A9,
-	34585 - 11905: 0xCE40,
-	34586 - 11905: 0xF2E3,
-	34587 - 11905: 0xCE41,
-	34588 - 11905: 0xC3DB,
-	34589 - 11905: 0xCE42,
-	34590 - 11905: 0xF2E0,
-	34591 - 11905: 0xCE43,
-	34592 - 11905: 0xCE44,
-	34593 - 11905: 0xC0AF,
-	34594 - 11905: 0xF2EC,
-	34595 - 11905: 0xF2DE,
-	34596 - 11905: 0xCE45,
-	34597 - 11905: 0xF2E1,
-	34598 - 11905: 0xCE46,
-	34599 - 11905: 0xCE47,
-	34600 - 11905: 0xCE48,
-	34601 - 11905: 0xF2E8,
-	34602 - 11905: 0xCE49,
-	34603 - 11905: 0xCE4A,
-	34604 - 11905: 0xCE4B,
-	34605 - 11905: 0xCE4C,
-	34606 - 11905: 0xF2E2,
-	34607 - 11905: 0xCE4D,
-	34608 - 11905: 0xCE4E,
-	34609 - 11905: 0xF2E7,
-	34610 - 11905: 0xCE4F,
-	34611 - 11905: 0xCE50,
-	34612 - 11905: 0xF2E6,
-	34613 - 11905: 0xCE51,
-	34614 - 11905: 0xCE52,
-	34615 - 11905: 0xF2E9,
-	34616 - 11905: 0xCE53,
-	34617 - 11905: 0xCE54,
-	34618 - 11905: 0xCE55,
-	34619 - 11905: 0xF2DF,
-	34620 - 11905: 0xCE56,
-	34621 - 11905: 0xCE57,
-	34622 - 11905: 0xF2E4,
-	34623 - 11905: 0xF2EA,
-	34624 - 11905: 0xCE58,
-	34625 - 11905: 0xCE59,
-	34626 - 11905: 0xCE5A,
-	34627 - 11905: 0xCE5B,
-	34628 - 11905: 0xCE5C,
-	34629 - 11905: 0xCE5D,
-	34630 - 11905: 0xCE5E,
-	34631 - 11905: 0xD3AC,
-	34632 - 11905: 0xF2E5,
-	34633 - 11905: 0xB2F5,
-	34634 - 11905: 0xCE5F,
-	34635 - 11905: 0xCE60,
-	34636 - 11905: 0xF2F2,
-	34637 - 11905: 0xCE61,
-	34638 - 11905: 0xD0AB,
-	34639 - 11905: 0xCE62,
-	34640 - 11905: 0xCE63,
-	34641 - 11905: 0xCE64,
-	34642 - 11905: 0xCE65,
-	34643 - 11905: 0xF2F5,
-	34644 - 11905: 0xCE66,
-	34645 - 11905: 0xCE67,
-	34646 - 11905: 0xCE68,
-	34647 - 11905: 0xBBC8,
-	34648 - 11905: 0xCE69,
-	34649 - 11905: 0xF2F9,
-	34650 - 11905: 0xCE6A,
-	34651 - 11905: 0xCE6B,
-	34652 - 11905: 0xCE6C,
-	34653 - 11905: 0xCE6D,
-	34654 - 11905: 0xCE6E,
-	34655 - 11905: 0xCE6F,
-	34656 - 11905: 0xF2F0,
-	34657 - 11905: 0xCE70,
-	34658 - 11905: 0xCE71,
-	34659 - 11905: 0xF2F6,
-	34660 - 11905: 0xF2F8,
-	34661 - 11905: 0xF2FA,
-	34662 - 11905: 0xCE72,
-	34663 - 11905: 0xCE73,
-	34664 - 11905: 0xCE74,
-	34665 - 11905: 0xCE75,
-	34666 - 11905: 0xCE76,
-	34667 - 11905: 0xCE77,
-	34668 - 11905: 0xCE78,
-	34669 - 11905: 0xCE79,
-	34670 - 11905: 0xF2F3,
-	34671 - 11905: 0xCE7A,
-	34672 - 11905: 0xF2F1,
-	34673 - 11905: 0xCE7B,
-	34674 - 11905: 0xCE7C,
-	34675 - 11905: 0xCE7D,
-	34676 - 11905: 0xBAFB,
-	34677 - 11905: 0xCE7E,
-	34678 - 11905: 0xB5FB,
-	34679 - 11905: 0xCE80,
-	34680 - 11905: 0xCE81,
-	34681 - 11905: 0xCE82,
-	34682 - 11905: 0xCE83,
-	34683 - 11905: 0xF2EF,
-	34684 - 11905: 0xF2F7,
-	34685 - 11905: 0xF2ED,
-	34686 - 11905: 0xF2EE,
-	34687 - 11905: 0xCE84,
-	34688 - 11905: 0xCE85,
-	34689 - 11905: 0xCE86,
-	34690 - 11905: 0xF2EB,
-	34691 - 11905: 0xF3A6,
-	34692 - 11905: 0xCE87,
-	34693 - 11905: 0xF3A3,
-	34694 - 11905: 0xCE88,
-	34695 - 11905: 0xCE89,
-	34696 - 11905: 0xF3A2,
-	34697 - 11905: 0xCE8A,
-	34698 - 11905: 0xCE8B,
-	34699 - 11905: 0xF2F4,
-	34700 - 11905: 0xCE8C,
-	34701 - 11905: 0xC8DA,
-	34702 - 11905: 0xCE8D,
-	34703 - 11905: 0xCE8E,
-	34704 - 11905: 0xCE8F,
-	34705 - 11905: 0xCE90,
-	34706 - 11905: 0xCE91,
-	34707 - 11905: 0xF2FB,
-	34708 - 11905: 0xCE92,
-	34709 - 11905: 0xCE93,
-	34710 - 11905: 0xCE94,
-	34711 - 11905: 0xF3A5,
-	34712 - 11905: 0xCE95,
-	34713 - 11905: 0xCE96,
-	34714 - 11905: 0xCE97,
-	34715 - 11905: 0xCE98,
-	34716 - 11905: 0xCE99,
-	34717 - 11905: 0xCE9A,
-	34718 - 11905: 0xCE9B,
-	34719 - 11905: 0xC3F8,
-	34720 - 11905: 0xCE9C,
-	34721 - 11905: 0xCE9D,
-	34722 - 11905: 0xCE9E,
-	34723 - 11905: 0xCE9F,
-	34724 - 11905: 0xCEA0,
-	34725 - 11905: 0xCF40,
-	34726 - 11905: 0xCF41,
-	34727 - 11905: 0xCF42,
-	34728 - 11905: 0xF2FD,
-	34729 - 11905: 0xCF43,
-	34730 - 11905: 0xCF44,
-	34731 - 11905: 0xF3A7,
-	34732 - 11905: 0xF3A9,
-	34733 - 11905: 0xF3A4,
-	34734 - 11905: 0xCF45,
-	34735 - 11905: 0xF2FC,
-	34736 - 11905: 0xCF46,
-	34737 - 11905: 0xCF47,
-	34738 - 11905: 0xCF48,
-	34739 - 11905: 0xF3AB,
-	34740 - 11905: 0xCF49,
-	34741 - 11905: 0xF3AA,
-	34742 - 11905: 0xCF4A,
-	34743 - 11905: 0xCF4B,
-	34744 - 11905: 0xCF4C,
-	34745 - 11905: 0xCF4D,
-	34746 - 11905: 0xC2DD,
-	34747 - 11905: 0xCF4E,
-	34748 - 11905: 0xCF4F,
-	34749 - 11905: 0xF3AE,
-	34750 - 11905: 0xCF50,
-	34751 - 11905: 0xCF51,
-	34752 - 11905: 0xF3B0,
-	34753 - 11905: 0xCF52,
-	34754 - 11905: 0xCF53,
-	34755 - 11905: 0xCF54,
-	34756 - 11905: 0xCF55,
-	34757 - 11905: 0xCF56,
-	34758 - 11905: 0xF3A1,
-	34759 - 11905: 0xCF57,
-	34760 - 11905: 0xCF58,
-	34761 - 11905: 0xCF59,
-	34762 - 11905: 0xF3B1,
-	34763 - 11905: 0xF3AC,
-	34764 - 11905: 0xCF5A,
-	34765 - 11905: 0xCF5B,
-	34766 - 11905: 0xCF5C,
-	34767 - 11905: 0xCF5D,
-	34768 - 11905: 0xCF5E,
-	34769 - 11905: 0xF3AF,
-	34770 - 11905: 0xF2FE,
-	34771 - 11905: 0xF3AD,
-	34772 - 11905: 0xCF5F,
-	34773 - 11905: 0xCF60,
-	34774 - 11905: 0xCF61,
-	34775 - 11905: 0xCF62,
-	34776 - 11905: 0xCF63,
-	34777 - 11905: 0xCF64,
-	34778 - 11905: 0xCF65,
-	34779 - 11905: 0xF3B2,
-	34780 - 11905: 0xCF66,
-	34781 - 11905: 0xCF67,
-	34782 - 11905: 0xCF68,
-	34783 - 11905: 0xCF69,
-	34784 - 11905: 0xF3B4,
-	34785 - 11905: 0xCF6A,
-	34786 - 11905: 0xCF6B,
-	34787 - 11905: 0xCF6C,
-	34788 - 11905: 0xCF6D,
-	34789 - 11905: 0xF3A8,
-	34790 - 11905: 0xCF6E,
-	34791 - 11905: 0xCF6F,
-	34792 - 11905: 0xCF70,
-	34793 - 11905: 0xCF71,
-	34794 - 11905: 0xF3B3,
-	34795 - 11905: 0xCF72,
-	34796 - 11905: 0xCF73,
-	34797 - 11905: 0xCF74,
-	34798 - 11905: 0xF3B5,
-	34799 - 11905: 0xCF75,
-	34800 - 11905: 0xCF76,
-	34801 - 11905: 0xCF77,
-	34802 - 11905: 0xCF78,
-	34803 - 11905: 0xCF79,
-	34804 - 11905: 0xCF7A,
-	34805 - 11905: 0xCF7B,
-	34806 - 11905: 0xCF7C,
-	34807 - 11905: 0xCF7D,
-	34808 - 11905: 0xCF7E,
-	34809 - 11905: 0xD0B7,
-	34810 - 11905: 0xCF80,
-	34811 - 11905: 0xCF81,
-	34812 - 11905: 0xCF82,
-	34813 - 11905: 0xCF83,
-	34814 - 11905: 0xF3B8,
-	34815 - 11905: 0xCF84,
-	34816 - 11905: 0xCF85,
-	34817 - 11905: 0xCF86,
-	34818 - 11905: 0xCF87,
-	34819 - 11905: 0xD9F9,
-	34820 - 11905: 0xCF88,
-	34821 - 11905: 0xCF89,
-	34822 - 11905: 0xCF8A,
-	34823 - 11905: 0xCF8B,
-	34824 - 11905: 0xCF8C,
-	34825 - 11905: 0xCF8D,
-	34826 - 11905: 0xF3B9,
-	34827 - 11905: 0xCF8E,
-	34828 - 11905: 0xCF8F,
-	34829 - 11905: 0xCF90,
-	34830 - 11905: 0xCF91,
-	34831 - 11905: 0xCF92,
-	34832 - 11905: 0xCF93,
-	34833 - 11905: 0xCF94,
-	34834 - 11905: 0xCF95,
-	34835 - 11905: 0xF3B7,
-	34836 - 11905: 0xCF96,
-	34837 - 11905: 0xC8E4,
-	34838 - 11905: 0xF3B6,
-	34839 - 11905: 0xCF97,
-	34840 - 11905: 0xCF98,
-	34841 - 11905: 0xCF99,
-	34842 - 11905: 0xCF9A,
-	34843 - 11905: 0xF3BA,
-	34844 - 11905: 0xCF9B,
-	34845 - 11905: 0xCF9C,
-	34846 - 11905: 0xCF9D,
-	34847 - 11905: 0xCF9E,
-	34848 - 11905: 0xCF9F,
-	34849 - 11905: 0xF3BB,
-	34850 - 11905: 0xB4C0,
-	34851 - 11905: 0xCFA0,
-	34852 - 11905: 0xD040,
-	34853 - 11905: 0xD041,
-	34854 - 11905: 0xD042,
-	34855 - 11905: 0xD043,
-	34856 - 11905: 0xD044,
-	34857 - 11905: 0xD045,
-	34858 - 11905: 0xD046,
-	34859 - 11905: 0xD047,
-	34860 - 11905: 0xD048,
-	34861 - 11905: 0xD049,
-	34862 - 11905: 0xD04A,
-	34863 - 11905: 0xD04B,
-	34864 - 11905: 0xD04C,
-	34865 - 11905: 0xD04D,
-	34866 - 11905: 0xEEC3,
-	34867 - 11905: 0xD04E,
-	34868 - 11905: 0xD04F,
-	34869 - 11905: 0xD050,
-	34870 - 11905: 0xD051,
-	34871 - 11905: 0xD052,
-	34872 - 11905: 0xD053,
-	34873 - 11905: 0xF3BC,
-	34874 - 11905: 0xD054,
-	34875 - 11905: 0xD055,
-	34876 - 11905: 0xF3BD,
-	34877 - 11905: 0xD056,
-	34878 - 11905: 0xD057,
-	34879 - 11905: 0xD058,
-	34880 - 11905: 0xD1AA,
-	34881 - 11905: 0xD059,
-	34882 - 11905: 0xD05A,
-	34883 - 11905: 0xD05B,
-	34884 - 11905: 0xF4AC,
-	34885 - 11905: 0xD0C6,
-	34886 - 11905: 0xD05C,
-	34887 - 11905: 0xD05D,
-	34888 - 11905: 0xD05E,
-	34889 - 11905: 0xD05F,
-	34890 - 11905: 0xD060,
-	34891 - 11905: 0xD061,
-	34892 - 11905: 0xD0D0,
-	34893 - 11905: 0xD1DC,
-	34894 - 11905: 0xD062,
-	34895 - 11905: 0xD063,
-	34896 - 11905: 0xD064,
-	34897 - 11905: 0xD065,
-	34898 - 11905: 0xD066,
-	34899 - 11905: 0xD067,
-	34900 - 11905: 0xCFCE,
-	34901 - 11905: 0xD068,
-	34902 - 11905: 0xD069,
-	34903 - 11905: 0xBDD6,
-	34904 - 11905: 0xD06A,
-	34905 - 11905: 0xD1C3,
-	34906 - 11905: 0xD06B,
-	34907 - 11905: 0xD06C,
-	34908 - 11905: 0xD06D,
-	34909 - 11905: 0xD06E,
-	34910 - 11905: 0xD06F,
-	34911 - 11905: 0xD070,
-	34912 - 11905: 0xD071,
-	34913 - 11905: 0xBAE2,
-	34914 - 11905: 0xE1E9,
-	34915 - 11905: 0xD2C2,
-	34916 - 11905: 0xF1C2,
-	34917 - 11905: 0xB2B9,
-	34918 - 11905: 0xD072,
-	34919 - 11905: 0xD073,
-	34920 - 11905: 0xB1ED,
-	34921 - 11905: 0xF1C3,
-	34922 - 11905: 0xD074,
-	34923 - 11905: 0xC9C0,
-	34924 - 11905: 0xB3C4,
-	34925 - 11905: 0xD075,
-	34926 - 11905: 0xD9F2,
-	34927 - 11905: 0xD076,
-	34928 - 11905: 0xCBA5,
-	34929 - 11905: 0xD077,
-	34930 - 11905: 0xF1C4,
-	34931 - 11905: 0xD078,
-	34932 - 11905: 0xD079,
-	34933 - 11905: 0xD07A,
-	34934 - 11905: 0xD07B,
-	34935 - 11905: 0xD6D4,
-	34936 - 11905: 0xD07C,
-	34937 - 11905: 0xD07D,
-	34938 - 11905: 0xD07E,
-	34939 - 11905: 0xD080,
-	34940 - 11905: 0xD081,
-	34941 - 11905: 0xF1C5,
-	34942 - 11905: 0xF4C0,
-	34943 - 11905: 0xF1C6,
-	34944 - 11905: 0xD082,
-	34945 - 11905: 0xD4AC,
-	34946 - 11905: 0xF1C7,
-	34947 - 11905: 0xD083,
-	34948 - 11905: 0xB0C0,
-	34949 - 11905: 0xF4C1,
-	34950 - 11905: 0xD084,
-	34951 - 11905: 0xD085,
-	34952 - 11905: 0xF4C2,
-	34953 - 11905: 0xD086,
-	34954 - 11905: 0xD087,
-	34955 - 11905: 0xB4FC,
-	34956 - 11905: 0xD088,
-	34957 - 11905: 0xC5DB,
-	34958 - 11905: 0xD089,
-	34959 - 11905: 0xD08A,
-	34960 - 11905: 0xD08B,
-	34961 - 11905: 0xD08C,
-	34962 - 11905: 0xCCBB,
-	34963 - 11905: 0xD08D,
-	34964 - 11905: 0xD08E,
-	34965 - 11905: 0xD08F,
-	34966 - 11905: 0xD0E4,
-	34967 - 11905: 0xD090,
-	34968 - 11905: 0xD091,
-	34969 - 11905: 0xD092,
-	34970 - 11905: 0xD093,
-	34971 - 11905: 0xD094,
-	34972 - 11905: 0xCDE0,
-	34973 - 11905: 0xD095,
-	34974 - 11905: 0xD096,
-	34975 - 11905: 0xD097,
-	34976 - 11905: 0xD098,
-	34977 - 11905: 0xD099,
-	34978 - 11905: 0xF1C8,
-	34979 - 11905: 0xD09A,
-	34980 - 11905: 0xD9F3,
-	34981 - 11905: 0xD09B,
-	34982 - 11905: 0xD09C,
-	34983 - 11905: 0xD09D,
-	34984 - 11905: 0xD09E,
-	34985 - 11905: 0xD09F,
-	34986 - 11905: 0xD0A0,
-	34987 - 11905: 0xB1BB,
-	34988 - 11905: 0xD140,
-	34989 - 11905: 0xCFAE,
-	34990 - 11905: 0xD141,
-	34991 - 11905: 0xD142,
-	34992 - 11905: 0xD143,
-	34993 - 11905: 0xB8A4,
-	34994 - 11905: 0xD144,
-	34995 - 11905: 0xD145,
-	34996 - 11905: 0xD146,
-	34997 - 11905: 0xD147,
-	34998 - 11905: 0xD148,
-	34999 - 11905: 0xF1CA,
-	35000 - 11905: 0xD149,
-	35001 - 11905: 0xD14A,
-	35002 - 11905: 0xD14B,
-	35003 - 11905: 0xD14C,
-	35004 - 11905: 0xF1CB,
-	35005 - 11905: 0xD14D,
-	35006 - 11905: 0xD14E,
-	35007 - 11905: 0xD14F,
-	35008 - 11905: 0xD150,
-	35009 - 11905: 0xB2C3,
-	35010 - 11905: 0xC1D1,
-	35011 - 11905: 0xD151,
-	35012 - 11905: 0xD152,
-	35013 - 11905: 0xD7B0,
-	35014 - 11905: 0xF1C9,
-	35015 - 11905: 0xD153,
-	35016 - 11905: 0xD154,
-	35017 - 11905: 0xF1CC,
-	35018 - 11905: 0xD155,
-	35019 - 11905: 0xD156,
-	35020 - 11905: 0xD157,
-	35021 - 11905: 0xD158,
-	35022 - 11905: 0xF1CE,
-	35023 - 11905: 0xD159,
-	35024 - 11905: 0xD15A,
-	35025 - 11905: 0xD15B,
-	35026 - 11905: 0xD9F6,
-	35027 - 11905: 0xD15C,
-	35028 - 11905: 0xD2E1,
-	35029 - 11905: 0xD4A3,
-	35030 - 11905: 0xD15D,
-	35031 - 11905: 0xD15E,
-	35032 - 11905: 0xF4C3,
-	35033 - 11905: 0xC8B9,
-	35034 - 11905: 0xD15F,
-	35035 - 11905: 0xD160,
-	35036 - 11905: 0xD161,
-	35037 - 11905: 0xD162,
-	35038 - 11905: 0xD163,
-	35039 - 11905: 0xF4C4,
-	35040 - 11905: 0xD164,
-	35041 - 11905: 0xD165,
-	35042 - 11905: 0xF1CD,
-	35043 - 11905: 0xF1CF,
-	35044 - 11905: 0xBFE3,
-	35045 - 11905: 0xF1D0,
-	35046 - 11905: 0xD166,
-	35047 - 11905: 0xD167,
-	35048 - 11905: 0xF1D4,
-	35049 - 11905: 0xD168,
-	35050 - 11905: 0xD169,
-	35051 - 11905: 0xD16A,
-	35052 - 11905: 0xD16B,
-	35053 - 11905: 0xD16C,
-	35054 - 11905: 0xD16D,
-	35055 - 11905: 0xD16E,
-	35056 - 11905: 0xF1D6,
-	35057 - 11905: 0xF1D1,
-	35058 - 11905: 0xD16F,
-	35059 - 11905: 0xC9D1,
-	35060 - 11905: 0xC5E1,
-	35061 - 11905: 0xD170,
-	35062 - 11905: 0xD171,
-	35063 - 11905: 0xD172,
-	35064 - 11905: 0xC2E3,
-	35065 - 11905: 0xB9FC,
-	35066 - 11905: 0xD173,
-	35067 - 11905: 0xD174,
-	35068 - 11905: 0xF1D3,
-	35069 - 11905: 0xD175,
-	35070 - 11905: 0xF1D5,
-	35071 - 11905: 0xD176,
-	35072 - 11905: 0xD177,
-	35073 - 11905: 0xD178,
-	35074 - 11905: 0xB9D3,
-	35075 - 11905: 0xD179,
-	35076 - 11905: 0xD17A,
-	35077 - 11905: 0xD17B,
-	35078 - 11905: 0xD17C,
-	35079 - 11905: 0xD17D,
-	35080 - 11905: 0xD17E,
-	35081 - 11905: 0xD180,
-	35082 - 11905: 0xF1DB,
-	35083 - 11905: 0xD181,
-	35084 - 11905: 0xD182,
-	35085 - 11905: 0xD183,
-	35086 - 11905: 0xD184,
-	35087 - 11905: 0xD185,
-	35088 - 11905: 0xBAD6,
-	35089 - 11905: 0xD186,
-	35090 - 11905: 0xB0FD,
-	35091 - 11905: 0xF1D9,
-	35092 - 11905: 0xD187,
-	35093 - 11905: 0xD188,
-	35094 - 11905: 0xD189,
-	35095 - 11905: 0xD18A,
-	35096 - 11905: 0xD18B,
-	35097 - 11905: 0xF1D8,
-	35098 - 11905: 0xF1D2,
-	35099 - 11905: 0xF1DA,
-	35100 - 11905: 0xD18C,
-	35101 - 11905: 0xD18D,
-	35102 - 11905: 0xD18E,
-	35103 - 11905: 0xD18F,
-	35104 - 11905: 0xD190,
-	35105 - 11905: 0xF1D7,
-	35106 - 11905: 0xD191,
-	35107 - 11905: 0xD192,
-	35108 - 11905: 0xD193,
-	35109 - 11905: 0xC8EC,
-	35110 - 11905: 0xD194,
-	35111 - 11905: 0xD195,
-	35112 - 11905: 0xD196,
-	35113 - 11905: 0xD197,
-	35114 - 11905: 0xCDCA,
-	35115 - 11905: 0xF1DD,
-	35116 - 11905: 0xD198,
-	35117 - 11905: 0xD199,
-	35118 - 11905: 0xD19A,
-	35119 - 11905: 0xD19B,
-	35120 - 11905: 0xE5BD,
-	35121 - 11905: 0xD19C,
-	35122 - 11905: 0xD19D,
-	35123 - 11905: 0xD19E,
-	35124 - 11905: 0xF1DC,
-	35125 - 11905: 0xD19F,
-	35126 - 11905: 0xF1DE,
-	35127 - 11905: 0xD1A0,
-	35128 - 11905: 0xD240,
-	35129 - 11905: 0xD241,
-	35130 - 11905: 0xD242,
-	35131 - 11905: 0xD243,
-	35132 - 11905: 0xD244,
-	35133 - 11905: 0xD245,
-	35134 - 11905: 0xD246,
-	35135 - 11905: 0xD247,
-	35136 - 11905: 0xD248,
-	35137 - 11905: 0xF1DF,
-	35138 - 11905: 0xD249,
-	35139 - 11905: 0xD24A,
-	35140 - 11905: 0xCFE5,
-	35141 - 11905: 0xD24B,
-	35142 - 11905: 0xD24C,
-	35143 - 11905: 0xD24D,
-	35144 - 11905: 0xD24E,
-	35145 - 11905: 0xD24F,
-	35146 - 11905: 0xD250,
-	35147 - 11905: 0xD251,
-	35148 - 11905: 0xD252,
-	35149 - 11905: 0xD253,
-	35150 - 11905: 0xD254,
-	35151 - 11905: 0xD255,
-	35152 - 11905: 0xD256,
-	35153 - 11905: 0xD257,
-	35154 - 11905: 0xD258,
-	35155 - 11905: 0xD259,
-	35156 - 11905: 0xD25A,
-	35157 - 11905: 0xD25B,
-	35158 - 11905: 0xD25C,
-	35159 - 11905: 0xD25D,
-	35160 - 11905: 0xD25E,
-	35161 - 11905: 0xD25F,
-	35162 - 11905: 0xD260,
-	35163 - 11905: 0xD261,
-	35164 - 11905: 0xD262,
-	35165 - 11905: 0xD263,
-	35166 - 11905: 0xF4C5,
-	35167 - 11905: 0xBDF3,
-	35168 - 11905: 0xD264,
-	35169 - 11905: 0xD265,
-	35170 - 11905: 0xD266,
-	35171 - 11905: 0xD267,
-	35172 - 11905: 0xD268,
-	35173 - 11905: 0xD269,
-	35174 - 11905: 0xF1E0,
-	35175 - 11905: 0xD26A,
-	35176 - 11905: 0xD26B,
-	35177 - 11905: 0xD26C,
-	35178 - 11905: 0xD26D,
-	35179 - 11905: 0xD26E,
-	35180 - 11905: 0xD26F,
-	35181 - 11905: 0xD270,
-	35182 - 11905: 0xD271,
-	35183 - 11905: 0xD272,
-	35184 - 11905: 0xD273,
-	35185 - 11905: 0xD274,
-	35186 - 11905: 0xD275,
-	35187 - 11905: 0xD276,
-	35188 - 11905: 0xD277,
-	35189 - 11905: 0xD278,
-	35190 - 11905: 0xD279,
-	35191 - 11905: 0xD27A,
-	35192 - 11905: 0xD27B,
-	35193 - 11905: 0xD27C,
-	35194 - 11905: 0xD27D,
-	35195 - 11905: 0xF1E1,
-	35196 - 11905: 0xD27E,
-	35197 - 11905: 0xD280,
-	35198 - 11905: 0xD281,
-	35199 - 11905: 0xCEF7,
-	35200 - 11905: 0xD282,
-	35201 - 11905: 0xD2AA,
-	35202 - 11905: 0xD283,
-	35203 - 11905: 0xF1FB,
-	35204 - 11905: 0xD284,
-	35205 - 11905: 0xD285,
-	35206 - 11905: 0xB8B2,
-	35207 - 11905: 0xD286,
-	35208 - 11905: 0xD287,
-	35209 - 11905: 0xD288,
-	35210 - 11905: 0xD289,
-	35211 - 11905: 0xD28A,
-	35212 - 11905: 0xD28B,
-	35213 - 11905: 0xD28C,
-	35214 - 11905: 0xD28D,
-	35215 - 11905: 0xD28E,
-	35216 - 11905: 0xD28F,
-	35217 - 11905: 0xD290,
-	35218 - 11905: 0xD291,
-	35219 - 11905: 0xD292,
-	35220 - 11905: 0xD293,
-	35221 - 11905: 0xD294,
-	35222 - 11905: 0xD295,
-	35223 - 11905: 0xD296,
-	35224 - 11905: 0xD297,
-	35225 - 11905: 0xD298,
-	35226 - 11905: 0xD299,
-	35227 - 11905: 0xD29A,
-	35228 - 11905: 0xD29B,
-	35229 - 11905: 0xD29C,
-	35230 - 11905: 0xD29D,
-	35231 - 11905: 0xD29E,
-	35232 - 11905: 0xD29F,
-	35233 - 11905: 0xD2A0,
-	35234 - 11905: 0xD340,
-	35235 - 11905: 0xD341,
-	35236 - 11905: 0xD342,
-	35237 - 11905: 0xD343,
-	35238 - 11905: 0xD344,
-	35239 - 11905: 0xD345,
-	35240 - 11905: 0xD346,
-	35241 - 11905: 0xD347,
-	35242 - 11905: 0xD348,
-	35243 - 11905: 0xD349,
-	35244 - 11905: 0xD34A,
-	35245 - 11905: 0xD34B,
-	35246 - 11905: 0xD34C,
-	35247 - 11905: 0xD34D,
-	35248 - 11905: 0xD34E,
-	35249 - 11905: 0xD34F,
-	35250 - 11905: 0xD350,
-	35251 - 11905: 0xD351,
-	35252 - 11905: 0xD352,
-	35253 - 11905: 0xD353,
-	35254 - 11905: 0xD354,
-	35255 - 11905: 0xD355,
-	35256 - 11905: 0xD356,
-	35257 - 11905: 0xD357,
-	35258 - 11905: 0xD358,
-	35259 - 11905: 0xD359,
-	35260 - 11905: 0xD35A,
-	35261 - 11905: 0xD35B,
-	35262 - 11905: 0xD35C,
-	35263 - 11905: 0xD35D,
-	35264 - 11905: 0xD35E,
-	35265 - 11905: 0xBCFB,
-	35266 - 11905: 0xB9DB,
-	35267 - 11905: 0xD35F,
-	35268 - 11905: 0xB9E6,
-	35269 - 11905: 0xC3D9,
-	35270 - 11905: 0xCAD3,
-	35271 - 11905: 0xEAE8,
-	35272 - 11905: 0xC0C0,
-	35273 - 11905: 0xBEF5,
-	35274 - 11905: 0xEAE9,
-	35275 - 11905: 0xEAEA,
-	35276 - 11905: 0xEAEB,
-	35277 - 11905: 0xD360,
-	35278 - 11905: 0xEAEC,
-	35279 - 11905: 0xEAED,
-	35280 - 11905: 0xEAEE,
-	35281 - 11905: 0xEAEF,
-	35282 - 11905: 0xBDC7,
-	35283 - 11905: 0xD361,
-	35284 - 11905: 0xD362,
-	35285 - 11905: 0xD363,
-	35286 - 11905: 0xF5FB,
-	35287 - 11905: 0xD364,
-	35288 - 11905: 0xD365,
-	35289 - 11905: 0xD366,
-	35290 - 11905: 0xF5FD,
-	35291 - 11905: 0xD367,
-	35292 - 11905: 0xF5FE,
-	35293 - 11905: 0xD368,
-	35294 - 11905: 0xF5FC,
-	35295 - 11905: 0xD369,
-	35296 - 11905: 0xD36A,
-	35297 - 11905: 0xD36B,
-	35298 - 11905: 0xD36C,
-	35299 - 11905: 0xBDE2,
-	35300 - 11905: 0xD36D,
-	35301 - 11905: 0xF6A1,
-	35302 - 11905: 0xB4A5,
-	35303 - 11905: 0xD36E,
-	35304 - 11905: 0xD36F,
-	35305 - 11905: 0xD370,
-	35306 - 11905: 0xD371,
-	35307 - 11905: 0xF6A2,
-	35308 - 11905: 0xD372,
-	35309 - 11905: 0xD373,
-	35310 - 11905: 0xD374,
-	35311 - 11905: 0xF6A3,
-	35312 - 11905: 0xD375,
-	35313 - 11905: 0xD376,
-	35314 - 11905: 0xD377,
-	35315 - 11905: 0xECB2,
-	35316 - 11905: 0xD378,
-	35317 - 11905: 0xD379,
-	35318 - 11905: 0xD37A,
-	35319 - 11905: 0xD37B,
-	35320 - 11905: 0xD37C,
-	35321 - 11905: 0xD37D,
-	35322 - 11905: 0xD37E,
-	35323 - 11905: 0xD380,
-	35324 - 11905: 0xD381,
-	35325 - 11905: 0xD382,
-	35326 - 11905: 0xD383,
-	35327 - 11905: 0xD384,
-	35328 - 11905: 0xD1D4,
-	35329 - 11905: 0xD385,
-	35330 - 11905: 0xD386,
-	35331 - 11905: 0xD387,
-	35332 - 11905: 0xD388,
-	35333 - 11905: 0xD389,
-	35334 - 11905: 0xD38A,
-	35335 - 11905: 0xD9EA,
-	35336 - 11905: 0xD38B,
-	35337 - 11905: 0xD38C,
-	35338 - 11905: 0xD38D,
-	35339 - 11905: 0xD38E,
-	35340 - 11905: 0xD38F,
-	35341 - 11905: 0xD390,
-	35342 - 11905: 0xD391,
-	35343 - 11905: 0xD392,
-	35344 - 11905: 0xD393,
-	35345 - 11905: 0xD394,
-	35346 - 11905: 0xD395,
-	35347 - 11905: 0xD396,
-	35348 - 11905: 0xD397,
-	35349 - 11905: 0xD398,
-	35350 - 11905: 0xD399,
-	35351 - 11905: 0xD39A,
-	35352 - 11905: 0xD39B,
-	35353 - 11905: 0xD39C,
-	35354 - 11905: 0xD39D,
-	35355 - 11905: 0xD39E,
-	35356 - 11905: 0xD39F,
-	35357 - 11905: 0xD3A0,
-	35358 - 11905: 0xD440,
-	35359 - 11905: 0xD441,
-	35360 - 11905: 0xD442,
-	35361 - 11905: 0xD443,
-	35362 - 11905: 0xD444,
-	35363 - 11905: 0xD445,
-	35364 - 11905: 0xD446,
-	35365 - 11905: 0xD447,
-	35366 - 11905: 0xD448,
-	35367 - 11905: 0xD449,
-	35368 - 11905: 0xD44A,
-	35369 - 11905: 0xD44B,
-	35370 - 11905: 0xD44C,
-	35371 - 11905: 0xD44D,
-	35372 - 11905: 0xD44E,
-	35373 - 11905: 0xD44F,
-	35374 - 11905: 0xD450,
-	35375 - 11905: 0xD451,
-	35376 - 11905: 0xD452,
-	35377 - 11905: 0xD453,
-	35378 - 11905: 0xD454,
-	35379 - 11905: 0xD455,
-	35380 - 11905: 0xD456,
-	35381 - 11905: 0xD457,
-	35382 - 11905: 0xD458,
-	35383 - 11905: 0xD459,
-	35384 - 11905: 0xD45A,
-	35385 - 11905: 0xD45B,
-	35386 - 11905: 0xD45C,
-	35387 - 11905: 0xD45D,
-	35388 - 11905: 0xD45E,
-	35389 - 11905: 0xD45F,
-	35390 - 11905: 0xF6A4,
-	35391 - 11905: 0xD460,
-	35392 - 11905: 0xD461,
-	35393 - 11905: 0xD462,
-	35394 - 11905: 0xD463,
-	35395 - 11905: 0xD464,
-	35396 - 11905: 0xD465,
-	35397 - 11905: 0xD466,
-	35398 - 11905: 0xD467,
-	35399 - 11905: 0xD468,
-	35400 - 11905: 0xEEBA,
-	35401 - 11905: 0xD469,
-	35402 - 11905: 0xD46A,
-	35403 - 11905: 0xD46B,
-	35404 - 11905: 0xD46C,
-	35405 - 11905: 0xD46D,
-	35406 - 11905: 0xD46E,
-	35407 - 11905: 0xD46F,
-	35408 - 11905: 0xD470,
-	35409 - 11905: 0xD471,
-	35410 - 11905: 0xD472,
-	35411 - 11905: 0xD473,
-	35412 - 11905: 0xD474,
-	35413 - 11905: 0xD475,
-	35414 - 11905: 0xD476,
-	35415 - 11905: 0xD477,
-	35416 - 11905: 0xD478,
-	35417 - 11905: 0xD479,
-	35418 - 11905: 0xD47A,
-	35419 - 11905: 0xD47B,
-	35420 - 11905: 0xD47C,
-	35421 - 11905: 0xD47D,
-	35422 - 11905: 0xD47E,
-	35423 - 11905: 0xD480,
-	35424 - 11905: 0xD481,
-	35425 - 11905: 0xD482,
-	35426 - 11905: 0xD483,
-	35427 - 11905: 0xD484,
-	35428 - 11905: 0xD485,
-	35429 - 11905: 0xD486,
-	35430 - 11905: 0xD487,
-	35431 - 11905: 0xD488,
-	35432 - 11905: 0xD489,
-	35433 - 11905: 0xD48A,
-	35434 - 11905: 0xD48B,
-	35435 - 11905: 0xD48C,
-	35436 - 11905: 0xD48D,
-	35437 - 11905: 0xD48E,
-	35438 - 11905: 0xD48F,
-	35439 - 11905: 0xD490,
-	35440 - 11905: 0xD491,
-	35441 - 11905: 0xD492,
-	35442 - 11905: 0xD493,
-	35443 - 11905: 0xD494,
-	35444 - 11905: 0xD495,
-	35445 - 11905: 0xD496,
-	35446 - 11905: 0xD497,
-	35447 - 11905: 0xD498,
-	35448 - 11905: 0xD499,
-	35449 - 11905: 0xD5B2,
-	35450 - 11905: 0xD49A,
-	35451 - 11905: 0xD49B,
-	35452 - 11905: 0xD49C,
-	35453 - 11905: 0xD49D,
-	35454 - 11905: 0xD49E,
-	35455 - 11905: 0xD49F,
-	35456 - 11905: 0xD4A0,
-	35457 - 11905: 0xD540,
-	35458 - 11905: 0xD541,
-	35459 - 11905: 0xD542,
-	35460 - 11905: 0xD543,
-	35461 - 11905: 0xD544,
-	35462 - 11905: 0xD545,
-	35463 - 11905: 0xD546,
-	35464 - 11905: 0xD547,
-	35465 - 11905: 0xD3FE,
-	35466 - 11905: 0xCCDC,
-	35467 - 11905: 0xD548,
-	35468 - 11905: 0xD549,
-	35469 - 11905: 0xD54A,
-	35470 - 11905: 0xD54B,
-	35471 - 11905: 0xD54C,
-	35472 - 11905: 0xD54D,
-	35473 - 11905: 0xD54E,
-	35474 - 11905: 0xD54F,
-	35475 - 11905: 0xCAC4,
-	35476 - 11905: 0xD550,
-	35477 - 11905: 0xD551,
-	35478 - 11905: 0xD552,
-	35479 - 11905: 0xD553,
-	35480 - 11905: 0xD554,
-	35481 - 11905: 0xD555,
-	35482 - 11905: 0xD556,
-	35483 - 11905: 0xD557,
-	35484 - 11905: 0xD558,
-	35485 - 11905: 0xD559,
-	35486 - 11905: 0xD55A,
-	35487 - 11905: 0xD55B,
-	35488 - 11905: 0xD55C,
-	35489 - 11905: 0xD55D,
-	35490 - 11905: 0xD55E,
-	35491 - 11905: 0xD55F,
-	35492 - 11905: 0xD560,
-	35493 - 11905: 0xD561,
-	35494 - 11905: 0xD562,
-	35495 - 11905: 0xD563,
-	35496 - 11905: 0xD564,
-	35497 - 11905: 0xD565,
-	35498 - 11905: 0xD566,
-	35499 - 11905: 0xD567,
-	35500 - 11905: 0xD568,
-	35501 - 11905: 0xD569,
-	35502 - 11905: 0xD56A,
-	35503 - 11905: 0xD56B,
-	35504 - 11905: 0xD56C,
-	35505 - 11905: 0xD56D,
-	35506 - 11905: 0xD56E,
-	35507 - 11905: 0xD56F,
-	35508 - 11905: 0xD570,
-	35509 - 11905: 0xD571,
-	35510 - 11905: 0xD572,
-	35511 - 11905: 0xD573,
-	35512 - 11905: 0xD574,
-	35513 - 11905: 0xD575,
-	35514 - 11905: 0xD576,
-	35515 - 11905: 0xD577,
-	35516 - 11905: 0xD578,
-	35517 - 11905: 0xD579,
-	35518 - 11905: 0xD57A,
-	35519 - 11905: 0xD57B,
-	35520 - 11905: 0xD57C,
-	35521 - 11905: 0xD57D,
-	35522 - 11905: 0xD57E,
-	35523 - 11905: 0xD580,
-	35524 - 11905: 0xD581,
-	35525 - 11905: 0xD582,
-	35526 - 11905: 0xD583,
-	35527 - 11905: 0xD584,
-	35528 - 11905: 0xD585,
-	35529 - 11905: 0xD586,
-	35530 - 11905: 0xD587,
-	35531 - 11905: 0xD588,
-	35532 - 11905: 0xD589,
-	35533 - 11905: 0xD58A,
-	35534 - 11905: 0xD58B,
-	35535 - 11905: 0xD58C,
-	35536 - 11905: 0xD58D,
-	35537 - 11905: 0xD58E,
-	35538 - 11905: 0xD58F,
-	35539 - 11905: 0xD590,
-	35540 - 11905: 0xD591,
-	35541 - 11905: 0xD592,
-	35542 - 11905: 0xD593,
-	35543 - 11905: 0xD594,
-	35544 - 11905: 0xD595,
-	35545 - 11905: 0xD596,
-	35546 - 11905: 0xD597,
-	35547 - 11905: 0xD598,
-	35548 - 11905: 0xD599,
-	35549 - 11905: 0xD59A,
-	35550 - 11905: 0xD59B,
-	35551 - 11905: 0xD59C,
-	35552 - 11905: 0xD59D,
-	35553 - 11905: 0xD59E,
-	35554 - 11905: 0xD59F,
-	35555 - 11905: 0xD5A0,
-	35556 - 11905: 0xD640,
-	35557 - 11905: 0xD641,
-	35558 - 11905: 0xD642,
-	35559 - 11905: 0xD643,
-	35560 - 11905: 0xD644,
-	35561 - 11905: 0xD645,
-	35562 - 11905: 0xD646,
-	35563 - 11905: 0xD647,
-	35564 - 11905: 0xD648,
-	35565 - 11905: 0xD649,
-	35566 - 11905: 0xD64A,
-	35567 - 11905: 0xD64B,
-	35568 - 11905: 0xD64C,
-	35569 - 11905: 0xD64D,
-	35570 - 11905: 0xD64E,
-	35571 - 11905: 0xD64F,
-	35572 - 11905: 0xD650,
-	35573 - 11905: 0xD651,
-	35574 - 11905: 0xD652,
-	35575 - 11905: 0xD653,
-	35576 - 11905: 0xD654,
-	35577 - 11905: 0xD655,
-	35578 - 11905: 0xD656,
-	35579 - 11905: 0xD657,
-	35580 - 11905: 0xD658,
-	35581 - 11905: 0xD659,
-	35582 - 11905: 0xD65A,
-	35583 - 11905: 0xD65B,
-	35584 - 11905: 0xD65C,
-	35585 - 11905: 0xD65D,
-	35586 - 11905: 0xD65E,
-	35587 - 11905: 0xD65F,
-	35588 - 11905: 0xD660,
-	35589 - 11905: 0xD661,
-	35590 - 11905: 0xD662,
-	35591 - 11905: 0xE5C0,
-	35592 - 11905: 0xD663,
-	35593 - 11905: 0xD664,
-	35594 - 11905: 0xD665,
-	35595 - 11905: 0xD666,
-	35596 - 11905: 0xD667,
-	35597 - 11905: 0xD668,
-	35598 - 11905: 0xD669,
-	35599 - 11905: 0xD66A,
-	35600 - 11905: 0xD66B,
-	35601 - 11905: 0xD66C,
-	35602 - 11905: 0xD66D,
-	35603 - 11905: 0xD66E,
-	35604 - 11905: 0xD66F,
-	35605 - 11905: 0xD670,
-	35606 - 11905: 0xD671,
-	35607 - 11905: 0xD672,
-	35608 - 11905: 0xD673,
-	35609 - 11905: 0xD674,
-	35610 - 11905: 0xD675,
-	35611 - 11905: 0xD676,
-	35612 - 11905: 0xD677,
-	35613 - 11905: 0xD678,
-	35614 - 11905: 0xD679,
-	35615 - 11905: 0xD67A,
-	35616 - 11905: 0xD67B,
-	35617 - 11905: 0xD67C,
-	35618 - 11905: 0xD67D,
-	35619 - 11905: 0xD67E,
-	35620 - 11905: 0xD680,
-	35621 - 11905: 0xD681,
-	35622 - 11905: 0xF6A5,
-	35623 - 11905: 0xD682,
-	35624 - 11905: 0xD683,
-	35625 - 11905: 0xD684,
-	35626 - 11905: 0xD685,
-	35627 - 11905: 0xD686,
-	35628 - 11905: 0xD687,
-	35629 - 11905: 0xD688,
-	35630 - 11905: 0xD689,
-	35631 - 11905: 0xD68A,
-	35632 - 11905: 0xD68B,
-	35633 - 11905: 0xD68C,
-	35634 - 11905: 0xD68D,
-	35635 - 11905: 0xD68E,
-	35636 - 11905: 0xD68F,
-	35637 - 11905: 0xD690,
-	35638 - 11905: 0xD691,
-	35639 - 11905: 0xD692,
-	35640 - 11905: 0xD693,
-	35641 - 11905: 0xD694,
-	35642 - 11905: 0xD695,
-	35643 - 11905: 0xD696,
-	35644 - 11905: 0xD697,
-	35645 - 11905: 0xD698,
-	35646 - 11905: 0xD699,
-	35647 - 11905: 0xD69A,
-	35648 - 11905: 0xD69B,
-	35649 - 11905: 0xD69C,
-	35650 - 11905: 0xD69D,
-	35651 - 11905: 0xD69E,
-	35652 - 11905: 0xD69F,
-	35653 - 11905: 0xD6A0,
-	35654 - 11905: 0xD740,
-	35655 - 11905: 0xD741,
-	35656 - 11905: 0xD742,
-	35657 - 11905: 0xD743,
-	35658 - 11905: 0xD744,
-	35659 - 11905: 0xD745,
-	35660 - 11905: 0xD746,
-	35661 - 11905: 0xD747,
-	35662 - 11905: 0xD748,
-	35663 - 11905: 0xD749,
-	35664 - 11905: 0xD74A,
-	35665 - 11905: 0xD74B,
-	35666 - 11905: 0xD74C,
-	35667 - 11905: 0xD74D,
-	35668 - 11905: 0xD74E,
-	35669 - 11905: 0xD74F,
-	35670 - 11905: 0xD750,
-	35671 - 11905: 0xD751,
-	35672 - 11905: 0xD752,
-	35673 - 11905: 0xD753,
-	35674 - 11905: 0xD754,
-	35675 - 11905: 0xD755,
-	35676 - 11905: 0xD756,
-	35677 - 11905: 0xD757,
-	35678 - 11905: 0xD758,
-	35679 - 11905: 0xD759,
-	35680 - 11905: 0xD75A,
-	35681 - 11905: 0xD75B,
-	35682 - 11905: 0xD75C,
-	35683 - 11905: 0xD75D,
-	35684 - 11905: 0xD75E,
-	35685 - 11905: 0xD75F,
-	35686 - 11905: 0xBEAF,
-	35687 - 11905: 0xD760,
-	35688 - 11905: 0xD761,
-	35689 - 11905: 0xD762,
-	35690 - 11905: 0xD763,
-	35691 - 11905: 0xD764,
-	35692 - 11905: 0xC6A9,
-	35693 - 11905: 0xD765,
-	35694 - 11905: 0xD766,
-	35695 - 11905: 0xD767,
-	35696 - 11905: 0xD768,
-	35697 - 11905: 0xD769,
-	35698 - 11905: 0xD76A,
-	35699 - 11905: 0xD76B,
-	35700 - 11905: 0xD76C,
-	35701 - 11905: 0xD76D,
-	35702 - 11905: 0xD76E,
-	35703 - 11905: 0xD76F,
-	35704 - 11905: 0xD770,
-	35705 - 11905: 0xD771,
-	35706 - 11905: 0xD772,
-	35707 - 11905: 0xD773,
-	35708 - 11905: 0xD774,
-	35709 - 11905: 0xD775,
-	35710 - 11905: 0xD776,
-	35711 - 11905: 0xD777,
-	35712 - 11905: 0xD778,
-	35713 - 11905: 0xD779,
-	35714 - 11905: 0xD77A,
-	35715 - 11905: 0xD77B,
-	35716 - 11905: 0xD77C,
-	35717 - 11905: 0xD77D,
-	35718 - 11905: 0xD77E,
-	35719 - 11905: 0xD780,
-	35720 - 11905: 0xD781,
-	35721 - 11905: 0xD782,
-	35722 - 11905: 0xD783,
-	35723 - 11905: 0xD784,
-	35724 - 11905: 0xD785,
-	35725 - 11905: 0xD786,
-	35726 - 11905: 0xD787,
-	35727 - 11905: 0xD788,
-	35728 - 11905: 0xD789,
-	35729 - 11905: 0xD78A,
-	35730 - 11905: 0xD78B,
-	35731 - 11905: 0xD78C,
-	35732 - 11905: 0xD78D,
-	35733 - 11905: 0xD78E,
-	35734 - 11905: 0xD78F,
-	35735 - 11905: 0xD790,
-	35736 - 11905: 0xD791,
-	35737 - 11905: 0xD792,
-	35738 - 11905: 0xD793,
-	35739 - 11905: 0xD794,
-	35740 - 11905: 0xD795,
-	35741 - 11905: 0xD796,
-	35742 - 11905: 0xD797,
-	35743 - 11905: 0xD798,
-	35744 - 11905: 0xDAA5,
-	35745 - 11905: 0xBCC6,
-	35746 - 11905: 0xB6A9,
-	35747 - 11905: 0xB8BC,
-	35748 - 11905: 0xC8CF,
-	35749 - 11905: 0xBCA5,
-	35750 - 11905: 0xDAA6,
-	35751 - 11905: 0xDAA7,
-	35752 - 11905: 0xCCD6,
-	35753 - 11905: 0xC8C3,
-	35754 - 11905: 0xDAA8,
-	35755 - 11905: 0xC6FD,
-	35756 - 11905: 0xD799,
-	35757 - 11905: 0xD1B5,
-	35758 - 11905: 0xD2E9,
-	35759 - 11905: 0xD1B6,
-	35760 - 11905: 0xBCC7,
-	35761 - 11905: 0xD79A,
-	35762 - 11905: 0xBDB2,
-	35763 - 11905: 0xBBE4,
-	35764 - 11905: 0xDAA9,
-	35765 - 11905: 0xDAAA,
-	35766 - 11905: 0xD1C8,
-	35767 - 11905: 0xDAAB,
-	35768 - 11905: 0xD0ED,
-	35769 - 11905: 0xB6EF,
-	35770 - 11905: 0xC2DB,
-	35771 - 11905: 0xD79B,
-	35772 - 11905: 0xCBCF,
-	35773 - 11905: 0xB7ED,
-	35774 - 11905: 0xC9E8,
-	35775 - 11905: 0xB7C3,
-	35776 - 11905: 0xBEF7,
-	35777 - 11905: 0xD6A4,
-	35778 - 11905: 0xDAAC,
-	35779 - 11905: 0xDAAD,
-	35780 - 11905: 0xC6C0,
-	35781 - 11905: 0xD7E7,
-	35782 - 11905: 0xCAB6,
-	35783 - 11905: 0xD79C,
-	35784 - 11905: 0xD5A9,
-	35785 - 11905: 0xCBDF,
-	35786 - 11905: 0xD5EF,
-	35787 - 11905: 0xDAAE,
-	35788 - 11905: 0xD6DF,
-	35789 - 11905: 0xB4CA,
-	35790 - 11905: 0xDAB0,
-	35791 - 11905: 0xDAAF,
-	35792 - 11905: 0xD79D,
-	35793 - 11905: 0xD2EB,
-	35794 - 11905: 0xDAB1,
-	35795 - 11905: 0xDAB2,
-	35796 - 11905: 0xDAB3,
-	35797 - 11905: 0xCAD4,
-	35798 - 11905: 0xDAB4,
-	35799 - 11905: 0xCAAB,
-	35800 - 11905: 0xDAB5,
-	35801 - 11905: 0xDAB6,
-	35802 - 11905: 0xB3CF,
-	35803 - 11905: 0xD6EF,
-	35804 - 11905: 0xDAB7,
-	35805 - 11905: 0xBBB0,
-	35806 - 11905: 0xB5AE,
-	35807 - 11905: 0xDAB8,
-	35808 - 11905: 0xDAB9,
-	35809 - 11905: 0xB9EE,
-	35810 - 11905: 0xD1AF,
-	35811 - 11905: 0xD2E8,
-	35812 - 11905: 0xDABA,
-	35813 - 11905: 0xB8C3,
-	35814 - 11905: 0xCFEA,
-	35815 - 11905: 0xB2EF,
-	35816 - 11905: 0xDABB,
-	35817 - 11905: 0xDABC,
-	35818 - 11905: 0xD79E,
-	35819 - 11905: 0xBDEB,
-	35820 - 11905: 0xCEDC,
-	35821 - 11905: 0xD3EF,
-	35822 - 11905: 0xDABD,
-	35823 - 11905: 0xCEF3,
-	35824 - 11905: 0xDABE,
-	35825 - 11905: 0xD3D5,
-	35826 - 11905: 0xBBE5,
-	35827 - 11905: 0xDABF,
-	35828 - 11905: 0xCBB5,
-	35829 - 11905: 0xCBD0,
-	35830 - 11905: 0xDAC0,
-	35831 - 11905: 0xC7EB,
-	35832 - 11905: 0xD6EE,
-	35833 - 11905: 0xDAC1,
-	35834 - 11905: 0xC5B5,
-	35835 - 11905: 0xB6C1,
-	35836 - 11905: 0xDAC2,
-	35837 - 11905: 0xB7CC,
-	35838 - 11905: 0xBFCE,
-	35839 - 11905: 0xDAC3,
-	35840 - 11905: 0xDAC4,
-	35841 - 11905: 0xCBAD,
-	35842 - 11905: 0xDAC5,
-	35843 - 11905: 0xB5F7,
-	35844 - 11905: 0xDAC6,
-	35845 - 11905: 0xC1C2,
-	35846 - 11905: 0xD7BB,
-	35847 - 11905: 0xDAC7,
-	35848 - 11905: 0xCCB8,
-	35849 - 11905: 0xD79F,
-	35850 - 11905: 0xD2EA,
-	35851 - 11905: 0xC4B1,
-	35852 - 11905: 0xDAC8,
-	35853 - 11905: 0xB5FD,
-	35854 - 11905: 0xBBD1,
-	35855 - 11905: 0xDAC9,
-	35856 - 11905: 0xD0B3,
-	35857 - 11905: 0xDACA,
-	35858 - 11905: 0xDACB,
-	35859 - 11905: 0xCEBD,
-	35860 - 11905: 0xDACC,
-	35861 - 11905: 0xDACD,
-	35862 - 11905: 0xDACE,
-	35863 - 11905: 0xB2F7,
-	35864 - 11905: 0xDAD1,
-	35865 - 11905: 0xDACF,
-	35866 - 11905: 0xD1E8,
-	35867 - 11905: 0xDAD0,
-	35868 - 11905: 0xC3D5,
-	35869 - 11905: 0xDAD2,
-	35870 - 11905: 0xD7A0,
-	35871 - 11905: 0xDAD3,
-	35872 - 11905: 0xDAD4,
-	35873 - 11905: 0xDAD5,
-	35874 - 11905: 0xD0BB,
-	35875 - 11905: 0xD2A5,
-	35876 - 11905: 0xB0F9,
-	35877 - 11905: 0xDAD6,
-	35878 - 11905: 0xC7AB,
-	35879 - 11905: 0xDAD7,
-	35880 - 11905: 0xBDF7,
-	35881 - 11905: 0xC3A1,
-	35882 - 11905: 0xDAD8,
-	35883 - 11905: 0xDAD9,
-	35884 - 11905: 0xC3FD,
-	35885 - 11905: 0xCCB7,
-	35886 - 11905: 0xDADA,
-	35887 - 11905: 0xDADB,
-	35888 - 11905: 0xC0BE,
-	35889 - 11905: 0xC6D7,
-	35890 - 11905: 0xDADC,
-	35891 - 11905: 0xDADD,
-	35892 - 11905: 0xC7B4,
-	35893 - 11905: 0xDADE,
-	35894 - 11905: 0xDADF,
-	35895 - 11905: 0xB9C8,
-	35896 - 11905: 0xD840,
-	35897 - 11905: 0xD841,
-	35898 - 11905: 0xD842,
-	35899 - 11905: 0xD843,
-	35900 - 11905: 0xD844,
-	35901 - 11905: 0xD845,
-	35902 - 11905: 0xD846,
-	35903 - 11905: 0xD847,
-	35904 - 11905: 0xD848,
-	35905 - 11905: 0xBBED,
-	35906 - 11905: 0xD849,
-	35907 - 11905: 0xD84A,
-	35908 - 11905: 0xD84B,
-	35909 - 11905: 0xD84C,
-	35910 - 11905: 0xB6B9,
-	35911 - 11905: 0xF4F8,
-	35912 - 11905: 0xD84D,
-	35913 - 11905: 0xF4F9,
-	35914 - 11905: 0xD84E,
-	35915 - 11905: 0xD84F,
-	35916 - 11905: 0xCDE3,
-	35917 - 11905: 0xD850,
-	35918 - 11905: 0xD851,
-	35919 - 11905: 0xD852,
-	35920 - 11905: 0xD853,
-	35921 - 11905: 0xD854,
-	35922 - 11905: 0xD855,
-	35923 - 11905: 0xD856,
-	35924 - 11905: 0xD857,
-	35925 - 11905: 0xF5B9,
-	35926 - 11905: 0xD858,
-	35927 - 11905: 0xD859,
-	35928 - 11905: 0xD85A,
-	35929 - 11905: 0xD85B,
-	35930 - 11905: 0xEBE0,
-	35931 - 11905: 0xD85C,
-	35932 - 11905: 0xD85D,
-	35933 - 11905: 0xD85E,
-	35934 - 11905: 0xD85F,
-	35935 - 11905: 0xD860,
-	35936 - 11905: 0xD861,
-	35937 - 11905: 0xCFF3,
-	35938 - 11905: 0xBBBF,
-	35939 - 11905: 0xD862,
-	35940 - 11905: 0xD863,
-	35941 - 11905: 0xD864,
-	35942 - 11905: 0xD865,
-	35943 - 11905: 0xD866,
-	35944 - 11905: 0xD867,
-	35945 - 11905: 0xD868,
-	35946 - 11905: 0xBAC0,
-	35947 - 11905: 0xD4A5,
-	35948 - 11905: 0xD869,
-	35949 - 11905: 0xD86A,
-	35950 - 11905: 0xD86B,
-	35951 - 11905: 0xD86C,
-	35952 - 11905: 0xD86D,
-	35953 - 11905: 0xD86E,
-	35954 - 11905: 0xD86F,
-	35955 - 11905: 0xE1D9,
-	35956 - 11905: 0xD870,
-	35957 - 11905: 0xD871,
-	35958 - 11905: 0xD872,
-	35959 - 11905: 0xD873,
-	35960 - 11905: 0xF5F4,
-	35961 - 11905: 0xB1AA,
-	35962 - 11905: 0xB2F2,
-	35963 - 11905: 0xD874,
-	35964 - 11905: 0xD875,
-	35965 - 11905: 0xD876,
-	35966 - 11905: 0xD877,
-	35967 - 11905: 0xD878,
-	35968 - 11905: 0xD879,
-	35969 - 11905: 0xD87A,
-	35970 - 11905: 0xF5F5,
-	35971 - 11905: 0xD87B,
-	35972 - 11905: 0xD87C,
-	35973 - 11905: 0xF5F7,
-	35974 - 11905: 0xD87D,
-	35975 - 11905: 0xD87E,
-	35976 - 11905: 0xD880,
-	35977 - 11905: 0xBAD1,
-	35978 - 11905: 0xF5F6,
-	35979 - 11905: 0xD881,
-	35980 - 11905: 0xC3B2,
-	35981 - 11905: 0xD882,
-	35982 - 11905: 0xD883,
-	35983 - 11905: 0xD884,
-	35984 - 11905: 0xD885,
-	35985 - 11905: 0xD886,
-	35986 - 11905: 0xD887,
-	35987 - 11905: 0xD888,
-	35988 - 11905: 0xF5F9,
-	35989 - 11905: 0xD889,
-	35990 - 11905: 0xD88A,
-	35991 - 11905: 0xD88B,
-	35992 - 11905: 0xF5F8,
-	35993 - 11905: 0xD88C,
-	35994 - 11905: 0xD88D,
-	35995 - 11905: 0xD88E,
-	35996 - 11905: 0xD88F,
-	35997 - 11905: 0xD890,
-	35998 - 11905: 0xD891,
-	35999 - 11905: 0xD892,
-	36000 - 11905: 0xD893,
-	36001 - 11905: 0xD894,
-	36002 - 11905: 0xD895,
-	36003 - 11905: 0xD896,
-	36004 - 11905: 0xD897,
-	36005 - 11905: 0xD898,
-	36006 - 11905: 0xD899,
-	36007 - 11905: 0xD89A,
-	36008 - 11905: 0xD89B,
-	36009 - 11905: 0xD89C,
-	36010 - 11905: 0xD89D,
-	36011 - 11905: 0xD89E,
-	36012 - 11905: 0xD89F,
-	36013 - 11905: 0xD8A0,
-	36014 - 11905: 0xD940,
-	36015 - 11905: 0xD941,
-	36016 - 11905: 0xD942,
-	36017 - 11905: 0xD943,
-	36018 - 11905: 0xD944,
-	36019 - 11905: 0xD945,
-	36020 - 11905: 0xD946,
-	36021 - 11905: 0xD947,
-	36022 - 11905: 0xD948,
-	36023 - 11905: 0xD949,
-	36024 - 11905: 0xD94A,
-	36025 - 11905: 0xD94B,
-	36026 - 11905: 0xD94C,
-	36027 - 11905: 0xD94D,
-	36028 - 11905: 0xD94E,
-	36029 - 11905: 0xD94F,
-	36030 - 11905: 0xD950,
-	36031 - 11905: 0xD951,
-	36032 - 11905: 0xD952,
-	36033 - 11905: 0xD953,
-	36034 - 11905: 0xD954,
-	36035 - 11905: 0xD955,
-	36036 - 11905: 0xD956,
-	36037 - 11905: 0xD957,
-	36038 - 11905: 0xD958,
-	36039 - 11905: 0xD959,
-	36040 - 11905: 0xD95A,
-	36041 - 11905: 0xD95B,
-	36042 - 11905: 0xD95C,
-	36043 - 11905: 0xD95D,
-	36044 - 11905: 0xD95E,
-	36045 - 11905: 0xD95F,
-	36046 - 11905: 0xD960,
-	36047 - 11905: 0xD961,
-	36048 - 11905: 0xD962,
-	36049 - 11905: 0xD963,
-	36050 - 11905: 0xD964,
-	36051 - 11905: 0xD965,
-	36052 - 11905: 0xD966,
-	36053 - 11905: 0xD967,
-	36054 - 11905: 0xD968,
-	36055 - 11905: 0xD969,
-	36056 - 11905: 0xD96A,
-	36057 - 11905: 0xD96B,
-	36058 - 11905: 0xD96C,
-	36059 - 11905: 0xD96D,
-	36060 - 11905: 0xD96E,
-	36061 - 11905: 0xD96F,
-	36062 - 11905: 0xD970,
-	36063 - 11905: 0xD971,
-	36064 - 11905: 0xD972,
-	36065 - 11905: 0xD973,
-	36066 - 11905: 0xD974,
-	36067 - 11905: 0xD975,
-	36068 - 11905: 0xD976,
-	36069 - 11905: 0xD977,
-	36070 - 11905: 0xD978,
-	36071 - 11905: 0xD979,
-	36072 - 11905: 0xD97A,
-	36073 - 11905: 0xD97B,
-	36074 - 11905: 0xD97C,
-	36075 - 11905: 0xD97D,
-	36076 - 11905: 0xD97E,
-	36077 - 11905: 0xD980,
-	36078 - 11905: 0xD981,
-	36079 - 11905: 0xD982,
-	36080 - 11905: 0xD983,
-	36081 - 11905: 0xD984,
-	36082 - 11905: 0xD985,
-	36083 - 11905: 0xD986,
-	36084 - 11905: 0xD987,
-	36085 - 11905: 0xD988,
-	36086 - 11905: 0xD989,
-	36087 - 11905: 0xD98A,
-	36088 - 11905: 0xD98B,
-	36089 - 11905: 0xD98C,
-	36090 - 11905: 0xD98D,
-	36091 - 11905: 0xD98E,
-	36092 - 11905: 0xD98F,
-	36093 - 11905: 0xD990,
-	36094 - 11905: 0xD991,
-	36095 - 11905: 0xD992,
-	36096 - 11905: 0xD993,
-	36097 - 11905: 0xD994,
-	36098 - 11905: 0xD995,
-	36099 - 11905: 0xD996,
-	36100 - 11905: 0xD997,
-	36101 - 11905: 0xD998,
-	36102 - 11905: 0xD999,
-	36103 - 11905: 0xD99A,
-	36104 - 11905: 0xD99B,
-	36105 - 11905: 0xD99C,
-	36106 - 11905: 0xD99D,
-	36107 - 11905: 0xD99E,
-	36108 - 11905: 0xD99F,
-	36109 - 11905: 0xD9A0,
-	36110 - 11905: 0xDA40,
-	36111 - 11905: 0xDA41,
-	36112 - 11905: 0xDA42,
-	36113 - 11905: 0xDA43,
-	36114 - 11905: 0xDA44,
-	36115 - 11905: 0xDA45,
-	36116 - 11905: 0xDA46,
-	36117 - 11905: 0xDA47,
-	36118 - 11905: 0xDA48,
-	36119 - 11905: 0xDA49,
-	36120 - 11905: 0xDA4A,
-	36121 - 11905: 0xDA4B,
-	36122 - 11905: 0xDA4C,
-	36123 - 11905: 0xDA4D,
-	36124 - 11905: 0xDA4E,
-	36125 - 11905: 0xB1B4,
-	36126 - 11905: 0xD5EA,
-	36127 - 11905: 0xB8BA,
-	36128 - 11905: 0xDA4F,
-	36129 - 11905: 0xB9B1,
-	36130 - 11905: 0xB2C6,
-	36131 - 11905: 0xD4F0,
-	36132 - 11905: 0xCFCD,
-	36133 - 11905: 0xB0DC,
-	36134 - 11905: 0xD5CB,
-	36135 - 11905: 0xBBF5,
-	36136 - 11905: 0xD6CA,
-	36137 - 11905: 0xB7B7,
-	36138 - 11905: 0xCCB0,
-	36139 - 11905: 0xC6B6,
-	36140 - 11905: 0xB1E1,
-	36141 - 11905: 0xB9BA,
-	36142 - 11905: 0xD6FC,
-	36143 - 11905: 0xB9E1,
-	36144 - 11905: 0xB7A1,
-	36145 - 11905: 0xBCFA,
-	36146 - 11905: 0xEADA,
-	36147 - 11905: 0xEADB,
-	36148 - 11905: 0xCCF9,
-	36149 - 11905: 0xB9F3,
-	36150 - 11905: 0xEADC,
-	36151 - 11905: 0xB4FB,
-	36152 - 11905: 0xC3B3,
-	36153 - 11905: 0xB7D1,
-	36154 - 11905: 0xBAD8,
-	36155 - 11905: 0xEADD,
-	36156 - 11905: 0xD4F4,
-	36157 - 11905: 0xEADE,
-	36158 - 11905: 0xBCD6,
-	36159 - 11905: 0xBBDF,
-	36160 - 11905: 0xEADF,
-	36161 - 11905: 0xC1DE,
-	36162 - 11905: 0xC2B8,
-	36163 - 11905: 0xD4DF,
-	36164 - 11905: 0xD7CA,
-	36165 - 11905: 0xEAE0,
-	36166 - 11905: 0xEAE1,
-	36167 - 11905: 0xEAE4,
-	36168 - 11905: 0xEAE2,
-	36169 - 11905: 0xEAE3,
-	36170 - 11905: 0xC9DE,
-	36171 - 11905: 0xB8B3,
-	36172 - 11905: 0xB6C4,
-	36173 - 11905: 0xEAE5,
-	36174 - 11905: 0xCAEA,
-	36175 - 11905: 0xC9CD,
-	36176 - 11905: 0xB4CD,
-	36177 - 11905: 0xDA50,
-	36178 - 11905: 0xDA51,
-	36179 - 11905: 0xE2D9,
-	36180 - 11905: 0xC5E2,
-	36181 - 11905: 0xEAE6,
-	36182 - 11905: 0xC0B5,
-	36183 - 11905: 0xDA52,
-	36184 - 11905: 0xD7B8,
-	36185 - 11905: 0xEAE7,
-	36186 - 11905: 0xD7AC,
-	36187 - 11905: 0xC8FC,
-	36188 - 11905: 0xD8D3,
-	36189 - 11905: 0xD8CD,
-	36190 - 11905: 0xD4DE,
-	36191 - 11905: 0xDA53,
-	36192 - 11905: 0xD4F9,
-	36193 - 11905: 0xC9C4,
-	36194 - 11905: 0xD3AE,
-	36195 - 11905: 0xB8D3,
-	36196 - 11905: 0xB3E0,
-	36197 - 11905: 0xDA54,
-	36198 - 11905: 0xC9E2,
-	36199 - 11905: 0xF4F6,
-	36200 - 11905: 0xDA55,
-	36201 - 11905: 0xDA56,
-	36202 - 11905: 0xDA57,
-	36203 - 11905: 0xBAD5,
-	36204 - 11905: 0xDA58,
-	36205 - 11905: 0xF4F7,
-	36206 - 11905: 0xDA59,
-	36207 - 11905: 0xDA5A,
-	36208 - 11905: 0xD7DF,
-	36209 - 11905: 0xDA5B,
-	36210 - 11905: 0xDA5C,
-	36211 - 11905: 0xF4F1,
-	36212 - 11905: 0xB8B0,
-	36213 - 11905: 0xD5D4,
-	36214 - 11905: 0xB8CF,
-	36215 - 11905: 0xC6F0,
-	36216 - 11905: 0xDA5D,
-	36217 - 11905: 0xDA5E,
-	36218 - 11905: 0xDA5F,
-	36219 - 11905: 0xDA60,
-	36220 - 11905: 0xDA61,
-	36221 - 11905: 0xDA62,
-	36222 - 11905: 0xDA63,
-	36223 - 11905: 0xDA64,
-	36224 - 11905: 0xDA65,
-	36225 - 11905: 0xB3C3,
-	36226 - 11905: 0xDA66,
-	36227 - 11905: 0xDA67,
-	36228 - 11905: 0xF4F2,
-	36229 - 11905: 0xB3AC,
-	36230 - 11905: 0xDA68,
-	36231 - 11905: 0xDA69,
-	36232 - 11905: 0xDA6A,
-	36233 - 11905: 0xDA6B,
-	36234 - 11905: 0xD4BD,
-	36235 - 11905: 0xC7F7,
-	36236 - 11905: 0xDA6C,
-	36237 - 11905: 0xDA6D,
-	36238 - 11905: 0xDA6E,
-	36239 - 11905: 0xDA6F,
-	36240 - 11905: 0xDA70,
-	36241 - 11905: 0xF4F4,
-	36242 - 11905: 0xDA71,
-	36243 - 11905: 0xDA72,
-	36244 - 11905: 0xF4F3,
-	36245 - 11905: 0xDA73,
-	36246 - 11905: 0xDA74,
-	36247 - 11905: 0xDA75,
-	36248 - 11905: 0xDA76,
-	36249 - 11905: 0xDA77,
-	36250 - 11905: 0xDA78,
-	36251 - 11905: 0xDA79,
-	36252 - 11905: 0xDA7A,
-	36253 - 11905: 0xDA7B,
-	36254 - 11905: 0xDA7C,
-	36255 - 11905: 0xCCCB,
-	36256 - 11905: 0xDA7D,
-	36257 - 11905: 0xDA7E,
-	36258 - 11905: 0xDA80,
-	36259 - 11905: 0xC8A4,
-	36260 - 11905: 0xDA81,
-	36261 - 11905: 0xDA82,
-	36262 - 11905: 0xDA83,
-	36263 - 11905: 0xDA84,
-	36264 - 11905: 0xDA85,
-	36265 - 11905: 0xDA86,
-	36266 - 11905: 0xDA87,
-	36267 - 11905: 0xDA88,
-	36268 - 11905: 0xDA89,
-	36269 - 11905: 0xDA8A,
-	36270 - 11905: 0xDA8B,
-	36271 - 11905: 0xDA8C,
-	36272 - 11905: 0xDA8D,
-	36273 - 11905: 0xF4F5,
-	36274 - 11905: 0xDA8E,
-	36275 - 11905: 0xD7E3,
-	36276 - 11905: 0xC5BF,
-	36277 - 11905: 0xF5C0,
-	36278 - 11905: 0xDA8F,
-	36279 - 11905: 0xDA90,
-	36280 - 11905: 0xF5BB,
-	36281 - 11905: 0xDA91,
-	36282 - 11905: 0xF5C3,
-	36283 - 11905: 0xDA92,
-	36284 - 11905: 0xF5C2,
-	36285 - 11905: 0xDA93,
-	36286 - 11905: 0xD6BA,
-	36287 - 11905: 0xF5C1,
-	36288 - 11905: 0xDA94,
-	36289 - 11905: 0xDA95,
-	36290 - 11905: 0xDA96,
-	36291 - 11905: 0xD4BE,
-	36292 - 11905: 0xF5C4,
-	36293 - 11905: 0xDA97,
-	36294 - 11905: 0xF5CC,
-	36295 - 11905: 0xDA98,
-	36296 - 11905: 0xDA99,
-	36297 - 11905: 0xDA9A,
-	36298 - 11905: 0xDA9B,
-	36299 - 11905: 0xB0CF,
-	36300 - 11905: 0xB5F8,
-	36301 - 11905: 0xDA9C,
-	36302 - 11905: 0xF5C9,
-	36303 - 11905: 0xF5CA,
-	36304 - 11905: 0xDA9D,
-	36305 - 11905: 0xC5DC,
-	36306 - 11905: 0xDA9E,
-	36307 - 11905: 0xDA9F,
-	36308 - 11905: 0xDAA0,
-	36309 - 11905: 0xDB40,
-	36310 - 11905: 0xF5C5,
-	36311 - 11905: 0xF5C6,
-	36312 - 11905: 0xDB41,
-	36313 - 11905: 0xDB42,
-	36314 - 11905: 0xF5C7,
-	36315 - 11905: 0xF5CB,
-	36316 - 11905: 0xDB43,
-	36317 - 11905: 0xBEE0,
-	36318 - 11905: 0xF5C8,
-	36319 - 11905: 0xB8FA,
-	36320 - 11905: 0xDB44,
-	36321 - 11905: 0xDB45,
-	36322 - 11905: 0xDB46,
-	36323 - 11905: 0xF5D0,
-	36324 - 11905: 0xF5D3,
-	36325 - 11905: 0xDB47,
-	36326 - 11905: 0xDB48,
-	36327 - 11905: 0xDB49,
-	36328 - 11905: 0xBFE7,
-	36329 - 11905: 0xDB4A,
-	36330 - 11905: 0xB9F2,
-	36331 - 11905: 0xF5BC,
-	36332 - 11905: 0xF5CD,
-	36333 - 11905: 0xDB4B,
-	36334 - 11905: 0xDB4C,
-	36335 - 11905: 0xC2B7,
-	36336 - 11905: 0xDB4D,
-	36337 - 11905: 0xDB4E,
-	36338 - 11905: 0xDB4F,
-	36339 - 11905: 0xCCF8,
-	36340 - 11905: 0xDB50,
-	36341 - 11905: 0xBCF9,
-	36342 - 11905: 0xDB51,
-	36343 - 11905: 0xF5CE,
-	36344 - 11905: 0xF5CF,
-	36345 - 11905: 0xF5D1,
-	36346 - 11905: 0xB6E5,
-	36347 - 11905: 0xF5D2,
-	36348 - 11905: 0xDB52,
-	36349 - 11905: 0xF5D5,
-	36350 - 11905: 0xDB53,
-	36351 - 11905: 0xDB54,
-	36352 - 11905: 0xDB55,
-	36353 - 11905: 0xDB56,
-	36354 - 11905: 0xDB57,
-	36355 - 11905: 0xDB58,
-	36356 - 11905: 0xDB59,
-	36357 - 11905: 0xF5BD,
-	36358 - 11905: 0xDB5A,
-	36359 - 11905: 0xDB5B,
-	36360 - 11905: 0xDB5C,
-	36361 - 11905: 0xF5D4,
-	36362 - 11905: 0xD3BB,
-	36363 - 11905: 0xDB5D,
-	36364 - 11905: 0xB3EC,
-	36365 - 11905: 0xDB5E,
-	36366 - 11905: 0xDB5F,
-	36367 - 11905: 0xCCA4,
-	36368 - 11905: 0xDB60,
-	36369 - 11905: 0xDB61,
-	36370 - 11905: 0xDB62,
-	36371 - 11905: 0xDB63,
-	36372 - 11905: 0xF5D6,
-	36373 - 11905: 0xDB64,
-	36374 - 11905: 0xDB65,
-	36375 - 11905: 0xDB66,
-	36376 - 11905: 0xDB67,
-	36377 - 11905: 0xDB68,
-	36378 - 11905: 0xDB69,
-	36379 - 11905: 0xDB6A,
-	36380 - 11905: 0xDB6B,
-	36381 - 11905: 0xF5D7,
-	36382 - 11905: 0xBEE1,
-	36383 - 11905: 0xF5D8,
-	36384 - 11905: 0xDB6C,
-	36385 - 11905: 0xDB6D,
-	36386 - 11905: 0xCCDF,
-	36387 - 11905: 0xF5DB,
-	36388 - 11905: 0xDB6E,
-	36389 - 11905: 0xDB6F,
-	36390 - 11905: 0xDB70,
-	36391 - 11905: 0xDB71,
-	36392 - 11905: 0xDB72,
-	36393 - 11905: 0xB2C8,
-	36394 - 11905: 0xD7D9,
-	36395 - 11905: 0xDB73,
-	36396 - 11905: 0xF5D9,
-	36397 - 11905: 0xDB74,
-	36398 - 11905: 0xF5DA,
-	36399 - 11905: 0xF5DC,
-	36400 - 11905: 0xDB75,
-	36401 - 11905: 0xF5E2,
-	36402 - 11905: 0xDB76,
-	36403 - 11905: 0xDB77,
-	36404 - 11905: 0xDB78,
-	36405 - 11905: 0xF5E0,
-	36406 - 11905: 0xDB79,
-	36407 - 11905: 0xDB7A,
-	36408 - 11905: 0xDB7B,
-	36409 - 11905: 0xF5DF,
-	36410 - 11905: 0xF5DD,
-	36411 - 11905: 0xDB7C,
-	36412 - 11905: 0xDB7D,
-	36413 - 11905: 0xF5E1,
-	36414 - 11905: 0xDB7E,
-	36415 - 11905: 0xDB80,
-	36416 - 11905: 0xF5DE,
-	36417 - 11905: 0xF5E4,
-	36418 - 11905: 0xF5E5,
-	36419 - 11905: 0xDB81,
-	36420 - 11905: 0xCCE3,
-	36421 - 11905: 0xDB82,
-	36422 - 11905: 0xDB83,
-	36423 - 11905: 0xE5BF,
-	36424 - 11905: 0xB5B8,
-	36425 - 11905: 0xF5E3,
-	36426 - 11905: 0xF5E8,
-	36427 - 11905: 0xCCA3,
-	36428 - 11905: 0xDB84,
-	36429 - 11905: 0xDB85,
-	36430 - 11905: 0xDB86,
-	36431 - 11905: 0xDB87,
-	36432 - 11905: 0xDB88,
-	36433 - 11905: 0xF5E6,
-	36434 - 11905: 0xF5E7,
-	36435 - 11905: 0xDB89,
-	36436 - 11905: 0xDB8A,
-	36437 - 11905: 0xDB8B,
-	36438 - 11905: 0xDB8C,
-	36439 - 11905: 0xDB8D,
-	36440 - 11905: 0xDB8E,
-	36441 - 11905: 0xF5BE,
-	36442 - 11905: 0xDB8F,
-	36443 - 11905: 0xDB90,
-	36444 - 11905: 0xDB91,
-	36445 - 11905: 0xDB92,
-	36446 - 11905: 0xDB93,
-	36447 - 11905: 0xDB94,
-	36448 - 11905: 0xDB95,
-	36449 - 11905: 0xDB96,
-	36450 - 11905: 0xDB97,
-	36451 - 11905: 0xDB98,
-	36452 - 11905: 0xDB99,
-	36453 - 11905: 0xDB9A,
-	36454 - 11905: 0xB1C4,
-	36455 - 11905: 0xDB9B,
-	36456 - 11905: 0xDB9C,
-	36457 - 11905: 0xF5BF,
-	36458 - 11905: 0xDB9D,
-	36459 - 11905: 0xDB9E,
-	36460 - 11905: 0xB5C5,
-	36461 - 11905: 0xB2E4,
-	36462 - 11905: 0xDB9F,
-	36463 - 11905: 0xF5EC,
-	36464 - 11905: 0xF5E9,
-	36465 - 11905: 0xDBA0,
-	36466 - 11905: 0xB6D7,
-	36467 - 11905: 0xDC40,
-	36468 - 11905: 0xF5ED,
-	36469 - 11905: 0xDC41,
-	36470 - 11905: 0xF5EA,
-	36471 - 11905: 0xDC42,
-	36472 - 11905: 0xDC43,
-	36473 - 11905: 0xDC44,
-	36474 - 11905: 0xDC45,
-	36475 - 11905: 0xDC46,
-	36476 - 11905: 0xF5EB,
-	36477 - 11905: 0xDC47,
-	36478 - 11905: 0xDC48,
-	36479 - 11905: 0xB4DA,
-	36480 - 11905: 0xDC49,
-	36481 - 11905: 0xD4EA,
-	36482 - 11905: 0xDC4A,
-	36483 - 11905: 0xDC4B,
-	36484 - 11905: 0xDC4C,
-	36485 - 11905: 0xF5EE,
-	36486 - 11905: 0xDC4D,
-	36487 - 11905: 0xB3F9,
-	36488 - 11905: 0xDC4E,
-	36489 - 11905: 0xDC4F,
-	36490 - 11905: 0xDC50,
-	36491 - 11905: 0xDC51,
-	36492 - 11905: 0xDC52,
-	36493 - 11905: 0xDC53,
-	36494 - 11905: 0xDC54,
-	36495 - 11905: 0xF5EF,
-	36496 - 11905: 0xF5F1,
-	36497 - 11905: 0xDC55,
-	36498 - 11905: 0xDC56,
-	36499 - 11905: 0xDC57,
-	36500 - 11905: 0xF5F0,
-	36501 - 11905: 0xDC58,
-	36502 - 11905: 0xDC59,
-	36503 - 11905: 0xDC5A,
-	36504 - 11905: 0xDC5B,
-	36505 - 11905: 0xDC5C,
-	36506 - 11905: 0xDC5D,
-	36507 - 11905: 0xDC5E,
-	36508 - 11905: 0xF5F2,
-	36509 - 11905: 0xDC5F,
-	36510 - 11905: 0xF5F3,
-	36511 - 11905: 0xDC60,
-	36512 - 11905: 0xDC61,
-	36513 - 11905: 0xDC62,
-	36514 - 11905: 0xDC63,
-	36515 - 11905: 0xDC64,
-	36516 - 11905: 0xDC65,
-	36517 - 11905: 0xDC66,
-	36518 - 11905: 0xDC67,
-	36519 - 11905: 0xDC68,
-	36520 - 11905: 0xDC69,
-	36521 - 11905: 0xDC6A,
-	36522 - 11905: 0xDC6B,
-	36523 - 11905: 0xC9ED,
-	36524 - 11905: 0xB9AA,
-	36525 - 11905: 0xDC6C,
-	36526 - 11905: 0xDC6D,
-	36527 - 11905: 0xC7FB,
-	36528 - 11905: 0xDC6E,
-	36529 - 11905: 0xDC6F,
-	36530 - 11905: 0xB6E3,
-	36531 - 11905: 0xDC70,
-	36532 - 11905: 0xDC71,
-	36533 - 11905: 0xDC72,
-	36534 - 11905: 0xDC73,
-	36535 - 11905: 0xDC74,
-	36536 - 11905: 0xDC75,
-	36537 - 11905: 0xDC76,
-	36538 - 11905: 0xCCC9,
-	36539 - 11905: 0xDC77,
-	36540 - 11905: 0xDC78,
-	36541 - 11905: 0xDC79,
-	36542 - 11905: 0xDC7A,
-	36543 - 11905: 0xDC7B,
-	36544 - 11905: 0xDC7C,
-	36545 - 11905: 0xDC7D,
-	36546 - 11905: 0xDC7E,
-	36547 - 11905: 0xDC80,
-	36548 - 11905: 0xDC81,
-	36549 - 11905: 0xDC82,
-	36550 - 11905: 0xDC83,
-	36551 - 11905: 0xDC84,
-	36552 - 11905: 0xDC85,
-	36553 - 11905: 0xDC86,
-	36554 - 11905: 0xDC87,
-	36555 - 11905: 0xDC88,
-	36556 - 11905: 0xDC89,
-	36557 - 11905: 0xDC8A,
-	36558 - 11905: 0xEAA6,
-	36559 - 11905: 0xDC8B,
-	36560 - 11905: 0xDC8C,
-	36561 - 11905: 0xDC8D,
-	36562 - 11905: 0xDC8E,
-	36563 - 11905: 0xDC8F,
-	36564 - 11905: 0xDC90,
-	36565 - 11905: 0xDC91,
-	36566 - 11905: 0xDC92,
-	36567 - 11905: 0xDC93,
-	36568 - 11905: 0xDC94,
-	36569 - 11905: 0xDC95,
-	36570 - 11905: 0xDC96,
-	36571 - 11905: 0xDC97,
-	36572 - 11905: 0xDC98,
-	36573 - 11905: 0xDC99,
-	36574 - 11905: 0xDC9A,
-	36575 - 11905: 0xDC9B,
-	36576 - 11905: 0xDC9C,
-	36577 - 11905: 0xDC9D,
-	36578 - 11905: 0xDC9E,
-	36579 - 11905: 0xDC9F,
-	36580 - 11905: 0xDCA0,
-	36581 - 11905: 0xDD40,
-	36582 - 11905: 0xDD41,
-	36583 - 11905: 0xDD42,
-	36584 - 11905: 0xDD43,
-	36585 - 11905: 0xDD44,
-	36586 - 11905: 0xDD45,
-	36587 - 11905: 0xDD46,
-	36588 - 11905: 0xDD47,
-	36589 - 11905: 0xDD48,
-	36590 - 11905: 0xDD49,
-	36591 - 11905: 0xDD4A,
-	36592 - 11905: 0xDD4B,
-	36593 - 11905: 0xDD4C,
-	36594 - 11905: 0xDD4D,
-	36595 - 11905: 0xDD4E,
-	36596 - 11905: 0xDD4F,
-	36597 - 11905: 0xDD50,
-	36598 - 11905: 0xDD51,
-	36599 - 11905: 0xDD52,
-	36600 - 11905: 0xDD53,
-	36601 - 11905: 0xDD54,
-	36602 - 11905: 0xDD55,
-	36603 - 11905: 0xDD56,
-	36604 - 11905: 0xDD57,
-	36605 - 11905: 0xDD58,
-	36606 - 11905: 0xDD59,
-	36607 - 11905: 0xDD5A,
-	36608 - 11905: 0xDD5B,
-	36609 - 11905: 0xDD5C,
-	36610 - 11905: 0xDD5D,
-	36611 - 11905: 0xDD5E,
-	36612 - 11905: 0xDD5F,
-	36613 - 11905: 0xDD60,
-	36614 - 11905: 0xDD61,
-	36615 - 11905: 0xDD62,
-	36616 - 11905: 0xDD63,
-	36617 - 11905: 0xDD64,
-	36618 - 11905: 0xDD65,
-	36619 - 11905: 0xDD66,
-	36620 - 11905: 0xDD67,
-	36621 - 11905: 0xDD68,
-	36622 - 11905: 0xDD69,
-	36623 - 11905: 0xDD6A,
-	36624 - 11905: 0xDD6B,
-	36625 - 11905: 0xDD6C,
-	36626 - 11905: 0xDD6D,
-	36627 - 11905: 0xDD6E,
-	36628 - 11905: 0xDD6F,
-	36629 - 11905: 0xDD70,
-	36630 - 11905: 0xDD71,
-	36631 - 11905: 0xDD72,
-	36632 - 11905: 0xDD73,
-	36633 - 11905: 0xDD74,
-	36634 - 11905: 0xDD75,
-	36635 - 11905: 0xDD76,
-	36636 - 11905: 0xDD77,
-	36637 - 11905: 0xDD78,
-	36638 - 11905: 0xDD79,
-	36639 - 11905: 0xDD7A,
-	36640 - 11905: 0xDD7B,
-	36641 - 11905: 0xDD7C,
-	36642 - 11905: 0xDD7D,
-	36643 - 11905: 0xDD7E,
-	36644 - 11905: 0xDD80,
-	36645 - 11905: 0xDD81,
-	36646 - 11905: 0xDD82,
-	36647 - 11905: 0xDD83,
-	36648 - 11905: 0xDD84,
-	36649 - 11905: 0xDD85,
-	36650 - 11905: 0xDD86,
-	36651 - 11905: 0xDD87,
-	36652 - 11905: 0xDD88,
-	36653 - 11905: 0xDD89,
-	36654 - 11905: 0xDD8A,
-	36655 - 11905: 0xDD8B,
-	36656 - 11905: 0xDD8C,
-	36657 - 11905: 0xDD8D,
-	36658 - 11905: 0xDD8E,
-	36659 - 11905: 0xDD8F,
-	36660 - 11905: 0xDD90,
-	36661 - 11905: 0xDD91,
-	36662 - 11905: 0xDD92,
-	36663 - 11905: 0xDD93,
-	36664 - 11905: 0xDD94,
-	36665 - 11905: 0xDD95,
-	36666 - 11905: 0xDD96,
-	36667 - 11905: 0xDD97,
-	36668 - 11905: 0xDD98,
-	36669 - 11905: 0xDD99,
-	36670 - 11905: 0xDD9A,
-	36671 - 11905: 0xDD9B,
-	36672 - 11905: 0xDD9C,
-	36673 - 11905: 0xDD9D,
-	36674 - 11905: 0xDD9E,
-	36675 - 11905: 0xDD9F,
-	36676 - 11905: 0xDDA0,
-	36677 - 11905: 0xDE40,
-	36678 - 11905: 0xDE41,
-	36679 - 11905: 0xDE42,
-	36680 - 11905: 0xDE43,
-	36681 - 11905: 0xDE44,
-	36682 - 11905: 0xDE45,
-	36683 - 11905: 0xDE46,
-	36684 - 11905: 0xDE47,
-	36685 - 11905: 0xDE48,
-	36686 - 11905: 0xDE49,
-	36687 - 11905: 0xDE4A,
-	36688 - 11905: 0xDE4B,
-	36689 - 11905: 0xDE4C,
-	36690 - 11905: 0xDE4D,
-	36691 - 11905: 0xDE4E,
-	36692 - 11905: 0xDE4F,
-	36693 - 11905: 0xDE50,
-	36694 - 11905: 0xDE51,
-	36695 - 11905: 0xDE52,
-	36696 - 11905: 0xDE53,
-	36697 - 11905: 0xDE54,
-	36698 - 11905: 0xDE55,
-	36699 - 11905: 0xDE56,
-	36700 - 11905: 0xDE57,
-	36701 - 11905: 0xDE58,
-	36702 - 11905: 0xDE59,
-	36703 - 11905: 0xDE5A,
-	36704 - 11905: 0xDE5B,
-	36705 - 11905: 0xDE5C,
-	36706 - 11905: 0xDE5D,
-	36707 - 11905: 0xDE5E,
-	36708 - 11905: 0xDE5F,
-	36709 - 11905: 0xDE60,
-	36710 - 11905: 0xB3B5,
-	36711 - 11905: 0xD4FE,
-	36712 - 11905: 0xB9EC,
-	36713 - 11905: 0xD0F9,
-	36714 - 11905: 0xDE61,
-	36715 - 11905: 0xE9ED,
-	36716 - 11905: 0xD7AA,
-	36717 - 11905: 0xE9EE,
-	36718 - 11905: 0xC2D6,
-	36719 - 11905: 0xC8ED,
-	36720 - 11905: 0xBAE4,
-	36721 - 11905: 0xE9EF,
-	36722 - 11905: 0xE9F0,
-	36723 - 11905: 0xE9F1,
-	36724 - 11905: 0xD6E1,
-	36725 - 11905: 0xE9F2,
-	36726 - 11905: 0xE9F3,
-	36727 - 11905: 0xE9F5,
-	36728 - 11905: 0xE9F4,
-	36729 - 11905: 0xE9F6,
-	36730 - 11905: 0xE9F7,
-	36731 - 11905: 0xC7E1,
-	36732 - 11905: 0xE9F8,
-	36733 - 11905: 0xD4D8,
-	36734 - 11905: 0xE9F9,
-	36735 - 11905: 0xBDCE,
-	36736 - 11905: 0xDE62,
-	36737 - 11905: 0xE9FA,
-	36738 - 11905: 0xE9FB,
-	36739 - 11905: 0xBDCF,
-	36740 - 11905: 0xE9FC,
-	36741 - 11905: 0xB8A8,
-	36742 - 11905: 0xC1BE,
-	36743 - 11905: 0xE9FD,
-	36744 - 11905: 0xB1B2,
-	36745 - 11905: 0xBBD4,
-	36746 - 11905: 0xB9F5,
-	36747 - 11905: 0xE9FE,
-	36748 - 11905: 0xDE63,
-	36749 - 11905: 0xEAA1,
-	36750 - 11905: 0xEAA2,
-	36751 - 11905: 0xEAA3,
-	36752 - 11905: 0xB7F8,
-	36753 - 11905: 0xBCAD,
-	36754 - 11905: 0xDE64,
-	36755 - 11905: 0xCAE4,
-	36756 - 11905: 0xE0CE,
-	36757 - 11905: 0xD4AF,
-	36758 - 11905: 0xCFBD,
-	36759 - 11905: 0xD5B7,
-	36760 - 11905: 0xEAA4,
-	36761 - 11905: 0xD5DE,
-	36762 - 11905: 0xEAA5,
-	36763 - 11905: 0xD0C1,
-	36764 - 11905: 0xB9BC,
-	36765 - 11905: 0xDE65,
-	36766 - 11905: 0xB4C7,
-	36767 - 11905: 0xB1D9,
-	36768 - 11905: 0xDE66,
-	36769 - 11905: 0xDE67,
-	36770 - 11905: 0xDE68,
-	36771 - 11905: 0xC0B1,
-	36772 - 11905: 0xDE69,
-	36773 - 11905: 0xDE6A,
-	36774 - 11905: 0xDE6B,
-	36775 - 11905: 0xDE6C,
-	36776 - 11905: 0xB1E6,
-	36777 - 11905: 0xB1E7,
-	36778 - 11905: 0xDE6D,
-	36779 - 11905: 0xB1E8,
-	36780 - 11905: 0xDE6E,
-	36781 - 11905: 0xDE6F,
-	36782 - 11905: 0xDE70,
-	36783 - 11905: 0xDE71,
-	36784 - 11905: 0xB3BD,
-	36785 - 11905: 0xC8E8,
-	36786 - 11905: 0xDE72,
-	36787 - 11905: 0xDE73,
-	36788 - 11905: 0xDE74,
-	36789 - 11905: 0xDE75,
-	36790 - 11905: 0xE5C1,
-	36791 - 11905: 0xDE76,
-	36792 - 11905: 0xDE77,
-	36793 - 11905: 0xB1DF,
-	36794 - 11905: 0xDE78,
-	36795 - 11905: 0xDE79,
-	36796 - 11905: 0xDE7A,
-	36797 - 11905: 0xC1C9,
-	36798 - 11905: 0xB4EF,
-	36799 - 11905: 0xDE7B,
-	36800 - 11905: 0xDE7C,
-	36801 - 11905: 0xC7A8,
-	36802 - 11905: 0xD3D8,
-	36803 - 11905: 0xDE7D,
-	36804 - 11905: 0xC6F9,
-	36805 - 11905: 0xD1B8,
-	36806 - 11905: 0xDE7E,
-	36807 - 11905: 0xB9FD,
-	36808 - 11905: 0xC2F5,
-	36809 - 11905: 0xDE80,
-	36810 - 11905: 0xDE81,
-	36811 - 11905: 0xDE82,
-	36812 - 11905: 0xDE83,
-	36813 - 11905: 0xDE84,
-	36814 - 11905: 0xD3AD,
-	36815 - 11905: 0xDE85,
-	36816 - 11905: 0xD4CB,
-	36817 - 11905: 0xBDFC,
-	36818 - 11905: 0xDE86,
-	36819 - 11905: 0xE5C2,
-	36820 - 11905: 0xB7B5,
-	36821 - 11905: 0xE5C3,
-	36822 - 11905: 0xDE87,
-	36823 - 11905: 0xDE88,
-	36824 - 11905: 0xBBB9,
-	36825 - 11905: 0xD5E2,
-	36826 - 11905: 0xDE89,
-	36827 - 11905: 0xBDF8,
-	36828 - 11905: 0xD4B6,
-	36829 - 11905: 0xCEA5,
-	36830 - 11905: 0xC1AC,
-	36831 - 11905: 0xB3D9,
-	36832 - 11905: 0xDE8A,
-	36833 - 11905: 0xDE8B,
-	36834 - 11905: 0xCCF6,
-	36835 - 11905: 0xDE8C,
-	36836 - 11905: 0xE5C6,
-	36837 - 11905: 0xE5C4,
-	36838 - 11905: 0xE5C8,
-	36839 - 11905: 0xDE8D,
-	36840 - 11905: 0xE5CA,
-	36841 - 11905: 0xE5C7,
-	36842 - 11905: 0xB5CF,
-	36843 - 11905: 0xC6C8,
-	36844 - 11905: 0xDE8E,
-	36845 - 11905: 0xB5FC,
-	36846 - 11905: 0xE5C5,
-	36847 - 11905: 0xDE8F,
-	36848 - 11905: 0xCAF6,
-	36849 - 11905: 0xDE90,
-	36850 - 11905: 0xDE91,
-	36851 - 11905: 0xE5C9,
-	36852 - 11905: 0xDE92,
-	36853 - 11905: 0xDE93,
-	36854 - 11905: 0xDE94,
-	36855 - 11905: 0xC3D4,
-	36856 - 11905: 0xB1C5,
-	36857 - 11905: 0xBCA3,
-	36858 - 11905: 0xDE95,
-	36859 - 11905: 0xDE96,
-	36860 - 11905: 0xDE97,
-	36861 - 11905: 0xD7B7,
-	36862 - 11905: 0xDE98,
-	36863 - 11905: 0xDE99,
-	36864 - 11905: 0xCDCB,
-	36865 - 11905: 0xCBCD,
-	36866 - 11905: 0xCACA,
-	36867 - 11905: 0xCCD3,
-	36868 - 11905: 0xE5CC,
-	36869 - 11905: 0xE5CB,
-	36870 - 11905: 0xC4E6,
-	36871 - 11905: 0xDE9A,
-	36872 - 11905: 0xDE9B,
-	36873 - 11905: 0xD1A1,
-	36874 - 11905: 0xD1B7,
-	36875 - 11905: 0xE5CD,
-	36876 - 11905: 0xDE9C,
-	36877 - 11905: 0xE5D0,
-	36878 - 11905: 0xDE9D,
-	36879 - 11905: 0xCDB8,
-	36880 - 11905: 0xD6F0,
-	36881 - 11905: 0xE5CF,
-	36882 - 11905: 0xB5DD,
-	36883 - 11905: 0xDE9E,
-	36884 - 11905: 0xCDBE,
-	36885 - 11905: 0xDE9F,
-	36886 - 11905: 0xE5D1,
-	36887 - 11905: 0xB6BA,
-	36888 - 11905: 0xDEA0,
-	36889 - 11905: 0xDF40,
-	36890 - 11905: 0xCDA8,
-	36891 - 11905: 0xB9E4,
-	36892 - 11905: 0xDF41,
-	36893 - 11905: 0xCAC5,
-	36894 - 11905: 0xB3D1,
-	36895 - 11905: 0xCBD9,
-	36896 - 11905: 0xD4EC,
-	36897 - 11905: 0xE5D2,
-	36898 - 11905: 0xB7EA,
-	36899 - 11905: 0xDF42,
-	36900 - 11905: 0xDF43,
-	36901 - 11905: 0xDF44,
-	36902 - 11905: 0xE5CE,
-	36903 - 11905: 0xDF45,
-	36904 - 11905: 0xDF46,
-	36905 - 11905: 0xDF47,
-	36906 - 11905: 0xDF48,
-	36907 - 11905: 0xDF49,
-	36908 - 11905: 0xDF4A,
-	36909 - 11905: 0xE5D5,
-	36910 - 11905: 0xB4FE,
-	36911 - 11905: 0xE5D6,
-	36912 - 11905: 0xDF4B,
-	36913 - 11905: 0xDF4C,
-	36914 - 11905: 0xDF4D,
-	36915 - 11905: 0xDF4E,
-	36916 - 11905: 0xDF4F,
-	36917 - 11905: 0xE5D3,
-	36918 - 11905: 0xE5D4,
-	36919 - 11905: 0xDF50,
-	36920 - 11905: 0xD2DD,
-	36921 - 11905: 0xDF51,
-	36922 - 11905: 0xDF52,
-	36923 - 11905: 0xC2DF,
-	36924 - 11905: 0xB1C6,
-	36925 - 11905: 0xDF53,
-	36926 - 11905: 0xD3E2,
-	36927 - 11905: 0xDF54,
-	36928 - 11905: 0xDF55,
-	36929 - 11905: 0xB6DD,
-	36930 - 11905: 0xCBEC,
-	36931 - 11905: 0xDF56,
-	36932 - 11905: 0xE5D7,
-	36933 - 11905: 0xDF57,
-	36934 - 11905: 0xDF58,
-	36935 - 11905: 0xD3F6,
-	36936 - 11905: 0xDF59,
-	36937 - 11905: 0xDF5A,
-	36938 - 11905: 0xDF5B,
-	36939 - 11905: 0xDF5C,
-	36940 - 11905: 0xDF5D,
-	36941 - 11905: 0xB1E9,
-	36942 - 11905: 0xDF5E,
-	36943 - 11905: 0xB6F4,
-	36944 - 11905: 0xE5DA,
-	36945 - 11905: 0xE5D8,
-	36946 - 11905: 0xE5D9,
-	36947 - 11905: 0xB5C0,
-	36948 - 11905: 0xDF5F,
-	36949 - 11905: 0xDF60,
-	36950 - 11905: 0xDF61,
-	36951 - 11905: 0xD2C5,
-	36952 - 11905: 0xE5DC,
-	36953 - 11905: 0xDF62,
-	36954 - 11905: 0xDF63,
-	36955 - 11905: 0xE5DE,
-	36956 - 11905: 0xDF64,
-	36957 - 11905: 0xDF65,
-	36958 - 11905: 0xDF66,
-	36959 - 11905: 0xDF67,
-	36960 - 11905: 0xDF68,
-	36961 - 11905: 0xDF69,
-	36962 - 11905: 0xE5DD,
-	36963 - 11905: 0xC7B2,
-	36964 - 11905: 0xDF6A,
-	36965 - 11905: 0xD2A3,
-	36966 - 11905: 0xDF6B,
-	36967 - 11905: 0xDF6C,
-	36968 - 11905: 0xE5DB,
-	36969 - 11905: 0xDF6D,
-	36970 - 11905: 0xDF6E,
-	36971 - 11905: 0xDF6F,
-	36972 - 11905: 0xDF70,
-	36973 - 11905: 0xD4E2,
-	36974 - 11905: 0xD5DA,
-	36975 - 11905: 0xDF71,
-	36976 - 11905: 0xDF72,
-	36977 - 11905: 0xDF73,
-	36978 - 11905: 0xDF74,
-	36979 - 11905: 0xDF75,
-	36980 - 11905: 0xE5E0,
-	36981 - 11905: 0xD7F1,
-	36982 - 11905: 0xDF76,
-	36983 - 11905: 0xDF77,
-	36984 - 11905: 0xDF78,
-	36985 - 11905: 0xDF79,
-	36986 - 11905: 0xDF7A,
-	36987 - 11905: 0xDF7B,
-	36988 - 11905: 0xDF7C,
-	36989 - 11905: 0xE5E1,
-	36990 - 11905: 0xDF7D,
-	36991 - 11905: 0xB1DC,
-	36992 - 11905: 0xD1FB,
-	36993 - 11905: 0xDF7E,
-	36994 - 11905: 0xE5E2,
-	36995 - 11905: 0xE5E4,
-	36996 - 11905: 0xDF80,
-	36997 - 11905: 0xDF81,
-	36998 - 11905: 0xDF82,
-	36999 - 11905: 0xDF83,
-	37000 - 11905: 0xE5E3,
-	37001 - 11905: 0xDF84,
-	37002 - 11905: 0xDF85,
-	37003 - 11905: 0xE5E5,
-	37004 - 11905: 0xDF86,
-	37005 - 11905: 0xDF87,
-	37006 - 11905: 0xDF88,
-	37007 - 11905: 0xDF89,
-	37008 - 11905: 0xDF8A,
-	37009 - 11905: 0xD2D8,
-	37010 - 11905: 0xDF8B,
-	37011 - 11905: 0xB5CB,
-	37012 - 11905: 0xDF8C,
-	37013 - 11905: 0xE7DF,
-	37014 - 11905: 0xDF8D,
-	37015 - 11905: 0xDAF5,
-	37016 - 11905: 0xDF8E,
-	37017 - 11905: 0xDAF8,
-	37018 - 11905: 0xDF8F,
-	37019 - 11905: 0xDAF6,
-	37020 - 11905: 0xDF90,
-	37021 - 11905: 0xDAF7,
-	37022 - 11905: 0xDF91,
-	37023 - 11905: 0xDF92,
-	37024 - 11905: 0xDF93,
-	37025 - 11905: 0xDAFA,
-	37026 - 11905: 0xD0CF,
-	37027 - 11905: 0xC4C7,
-	37028 - 11905: 0xDF94,
-	37029 - 11905: 0xDF95,
-	37030 - 11905: 0xB0EE,
-	37031 - 11905: 0xDF96,
-	37032 - 11905: 0xDF97,
-	37033 - 11905: 0xDF98,
-	37034 - 11905: 0xD0B0,
-	37035 - 11905: 0xDF99,
-	37036 - 11905: 0xDAF9,
-	37037 - 11905: 0xDF9A,
-	37038 - 11905: 0xD3CA,
-	37039 - 11905: 0xBAAA,
-	37040 - 11905: 0xDBA2,
-	37041 - 11905: 0xC7F1,
-	37042 - 11905: 0xDF9B,
-	37043 - 11905: 0xDAFC,
-	37044 - 11905: 0xDAFB,
-	37045 - 11905: 0xC9DB,
-	37046 - 11905: 0xDAFD,
-	37047 - 11905: 0xDF9C,
-	37048 - 11905: 0xDBA1,
-	37049 - 11905: 0xD7DE,
-	37050 - 11905: 0xDAFE,
-	37051 - 11905: 0xC1DA,
-	37052 - 11905: 0xDF9D,
-	37053 - 11905: 0xDF9E,
-	37054 - 11905: 0xDBA5,
-	37055 - 11905: 0xDF9F,
-	37056 - 11905: 0xDFA0,
-	37057 - 11905: 0xD3F4,
-	37058 - 11905: 0xE040,
-	37059 - 11905: 0xE041,
-	37060 - 11905: 0xDBA7,
-	37061 - 11905: 0xDBA4,
-	37062 - 11905: 0xE042,
-	37063 - 11905: 0xDBA8,
-	37064 - 11905: 0xE043,
-	37065 - 11905: 0xE044,
-	37066 - 11905: 0xBDBC,
-	37067 - 11905: 0xE045,
-	37068 - 11905: 0xE046,
-	37069 - 11905: 0xE047,
-	37070 - 11905: 0xC0C9,
-	37071 - 11905: 0xDBA3,
-	37072 - 11905: 0xDBA6,
-	37073 - 11905: 0xD6A3,
-	37074 - 11905: 0xE048,
-	37075 - 11905: 0xDBA9,
-	37076 - 11905: 0xE049,
-	37077 - 11905: 0xE04A,
-	37078 - 11905: 0xE04B,
-	37079 - 11905: 0xDBAD,
-	37080 - 11905: 0xE04C,
-	37081 - 11905: 0xE04D,
-	37082 - 11905: 0xE04E,
-	37083 - 11905: 0xDBAE,
-	37084 - 11905: 0xDBAC,
-	37085 - 11905: 0xBAC2,
-	37086 - 11905: 0xE04F,
-	37087 - 11905: 0xE050,
-	37088 - 11905: 0xE051,
-	37089 - 11905: 0xBFA4,
-	37090 - 11905: 0xDBAB,
-	37091 - 11905: 0xE052,
-	37092 - 11905: 0xE053,
-	37093 - 11905: 0xE054,
-	37094 - 11905: 0xDBAA,
-	37095 - 11905: 0xD4C7,
-	37096 - 11905: 0xB2BF,
-	37097 - 11905: 0xE055,
-	37098 - 11905: 0xE056,
-	37099 - 11905: 0xDBAF,
-	37100 - 11905: 0xE057,
-	37101 - 11905: 0xB9F9,
-	37102 - 11905: 0xE058,
-	37103 - 11905: 0xDBB0,
-	37104 - 11905: 0xE059,
-	37105 - 11905: 0xE05A,
-	37106 - 11905: 0xE05B,
-	37107 - 11905: 0xE05C,
-	37108 - 11905: 0xB3BB,
-	37109 - 11905: 0xE05D,
-	37110 - 11905: 0xE05E,
-	37111 - 11905: 0xE05F,
-	37112 - 11905: 0xB5A6,
-	37113 - 11905: 0xE060,
-	37114 - 11905: 0xE061,
-	37115 - 11905: 0xE062,
-	37116 - 11905: 0xE063,
-	37117 - 11905: 0xB6BC,
-	37118 - 11905: 0xDBB1,
-	37119 - 11905: 0xE064,
-	37120 - 11905: 0xE065,
-	37121 - 11905: 0xE066,
-	37122 - 11905: 0xB6F5,
-	37123 - 11905: 0xE067,
-	37124 - 11905: 0xDBB2,
-	37125 - 11905: 0xE068,
-	37126 - 11905: 0xE069,
-	37127 - 11905: 0xE06A,
-	37128 - 11905: 0xE06B,
-	37129 - 11905: 0xE06C,
-	37130 - 11905: 0xE06D,
-	37131 - 11905: 0xE06E,
-	37132 - 11905: 0xE06F,
-	37133 - 11905: 0xE070,
-	37134 - 11905: 0xE071,
-	37135 - 11905: 0xE072,
-	37136 - 11905: 0xE073,
-	37137 - 11905: 0xE074,
-	37138 - 11905: 0xE075,
-	37139 - 11905: 0xE076,
-	37140 - 11905: 0xE077,
-	37141 - 11905: 0xE078,
-	37142 - 11905: 0xE079,
-	37143 - 11905: 0xE07A,
-	37144 - 11905: 0xE07B,
-	37145 - 11905: 0xB1C9,
-	37146 - 11905: 0xE07C,
-	37147 - 11905: 0xE07D,
-	37148 - 11905: 0xE07E,
-	37149 - 11905: 0xE080,
-	37150 - 11905: 0xDBB4,
-	37151 - 11905: 0xE081,
-	37152 - 11905: 0xE082,
-	37153 - 11905: 0xE083,
-	37154 - 11905: 0xDBB3,
-	37155 - 11905: 0xDBB5,
-	37156 - 11905: 0xE084,
-	37157 - 11905: 0xE085,
-	37158 - 11905: 0xE086,
-	37159 - 11905: 0xE087,
-	37160 - 11905: 0xE088,
-	37161 - 11905: 0xE089,
-	37162 - 11905: 0xE08A,
-	37163 - 11905: 0xE08B,
-	37164 - 11905: 0xE08C,
-	37165 - 11905: 0xE08D,
-	37166 - 11905: 0xE08E,
-	37167 - 11905: 0xDBB7,
-	37168 - 11905: 0xE08F,
-	37169 - 11905: 0xDBB6,
-	37170 - 11905: 0xE090,
-	37171 - 11905: 0xE091,
-	37172 - 11905: 0xE092,
-	37173 - 11905: 0xE093,
-	37174 - 11905: 0xE094,
-	37175 - 11905: 0xE095,
-	37176 - 11905: 0xE096,
-	37177 - 11905: 0xDBB8,
-	37178 - 11905: 0xE097,
-	37179 - 11905: 0xE098,
-	37180 - 11905: 0xE099,
-	37181 - 11905: 0xE09A,
-	37182 - 11905: 0xE09B,
-	37183 - 11905: 0xE09C,
-	37184 - 11905: 0xE09D,
-	37185 - 11905: 0xE09E,
-	37186 - 11905: 0xE09F,
-	37187 - 11905: 0xDBB9,
-	37188 - 11905: 0xE0A0,
-	37189 - 11905: 0xE140,
-	37190 - 11905: 0xDBBA,
-	37191 - 11905: 0xE141,
-	37192 - 11905: 0xE142,
-	37193 - 11905: 0xD3CF,
-	37194 - 11905: 0xF4FA,
-	37195 - 11905: 0xC7F5,
-	37196 - 11905: 0xD7C3,
-	37197 - 11905: 0xC5E4,
-	37198 - 11905: 0xF4FC,
-	37199 - 11905: 0xF4FD,
-	37200 - 11905: 0xF4FB,
-	37201 - 11905: 0xE143,
-	37202 - 11905: 0xBEC6,
-	37203 - 11905: 0xE144,
-	37204 - 11905: 0xE145,
-	37205 - 11905: 0xE146,
-	37206 - 11905: 0xE147,
-	37207 - 11905: 0xD0EF,
-	37208 - 11905: 0xE148,
-	37209 - 11905: 0xE149,
-	37210 - 11905: 0xB7D3,
-	37211 - 11905: 0xE14A,
-	37212 - 11905: 0xE14B,
-	37213 - 11905: 0xD4CD,
-	37214 - 11905: 0xCCAA,
-	37215 - 11905: 0xE14C,
-	37216 - 11905: 0xE14D,
-	37217 - 11905: 0xF5A2,
-	37218 - 11905: 0xF5A1,
-	37219 - 11905: 0xBAA8,
-	37220 - 11905: 0xF4FE,
-	37221 - 11905: 0xCBD6,
-	37222 - 11905: 0xE14E,
-	37223 - 11905: 0xE14F,
-	37224 - 11905: 0xE150,
-	37225 - 11905: 0xF5A4,
-	37226 - 11905: 0xC0D2,
-	37227 - 11905: 0xE151,
-	37228 - 11905: 0xB3EA,
-	37229 - 11905: 0xE152,
-	37230 - 11905: 0xCDAA,
-	37231 - 11905: 0xF5A5,
-	37232 - 11905: 0xF5A3,
-	37233 - 11905: 0xBDB4,
-	37234 - 11905: 0xF5A8,
-	37235 - 11905: 0xE153,
-	37236 - 11905: 0xF5A9,
-	37237 - 11905: 0xBDCD,
-	37238 - 11905: 0xC3B8,
-	37239 - 11905: 0xBFE1,
-	37240 - 11905: 0xCBE1,
-	37241 - 11905: 0xF5AA,
-	37242 - 11905: 0xE154,
-	37243 - 11905: 0xE155,
-	37244 - 11905: 0xE156,
-	37245 - 11905: 0xF5A6,
-	37246 - 11905: 0xF5A7,
-	37247 - 11905: 0xC4F0,
-	37248 - 11905: 0xE157,
-	37249 - 11905: 0xE158,
-	37250 - 11905: 0xE159,
-	37251 - 11905: 0xE15A,
-	37252 - 11905: 0xE15B,
-	37253 - 11905: 0xF5AC,
-	37254 - 11905: 0xE15C,
-	37255 - 11905: 0xB4BC,
-	37256 - 11905: 0xE15D,
-	37257 - 11905: 0xD7ED,
-	37258 - 11905: 0xE15E,
-	37259 - 11905: 0xB4D7,
-	37260 - 11905: 0xF5AB,
-	37261 - 11905: 0xF5AE,
-	37262 - 11905: 0xE15F,
-	37263 - 11905: 0xE160,
-	37264 - 11905: 0xF5AD,
-	37265 - 11905: 0xF5AF,
-	37266 - 11905: 0xD0D1,
-	37267 - 11905: 0xE161,
-	37268 - 11905: 0xE162,
-	37269 - 11905: 0xE163,
-	37270 - 11905: 0xE164,
-	37271 - 11905: 0xE165,
-	37272 - 11905: 0xE166,
-	37273 - 11905: 0xE167,
-	37274 - 11905: 0xC3D1,
-	37275 - 11905: 0xC8A9,
-	37276 - 11905: 0xE168,
-	37277 - 11905: 0xE169,
-	37278 - 11905: 0xE16A,
-	37279 - 11905: 0xE16B,
-	37280 - 11905: 0xE16C,
-	37281 - 11905: 0xE16D,
-	37282 - 11905: 0xF5B0,
-	37283 - 11905: 0xF5B1,
-	37284 - 11905: 0xE16E,
-	37285 - 11905: 0xE16F,
-	37286 - 11905: 0xE170,
-	37287 - 11905: 0xE171,
-	37288 - 11905: 0xE172,
-	37289 - 11905: 0xE173,
-	37290 - 11905: 0xF5B2,
-	37291 - 11905: 0xE174,
-	37292 - 11905: 0xE175,
-	37293 - 11905: 0xF5B3,
-	37294 - 11905: 0xF5B4,
-	37295 - 11905: 0xF5B5,
-	37296 - 11905: 0xE176,
-	37297 - 11905: 0xE177,
-	37298 - 11905: 0xE178,
-	37299 - 11905: 0xE179,
-	37300 - 11905: 0xF5B7,
-	37301 - 11905: 0xF5B6,
-	37302 - 11905: 0xE17A,
-	37303 - 11905: 0xE17B,
-	37304 - 11905: 0xE17C,
-	37305 - 11905: 0xE17D,
-	37306 - 11905: 0xF5B8,
-	37307 - 11905: 0xE17E,
-	37308 - 11905: 0xE180,
-	37309 - 11905: 0xE181,
-	37310 - 11905: 0xE182,
-	37311 - 11905: 0xE183,
-	37312 - 11905: 0xE184,
-	37313 - 11905: 0xE185,
-	37314 - 11905: 0xE186,
-	37315 - 11905: 0xE187,
-	37316 - 11905: 0xE188,
-	37317 - 11905: 0xE189,
-	37318 - 11905: 0xE18A,
-	37319 - 11905: 0xB2C9,
-	37320 - 11905: 0xE18B,
-	37321 - 11905: 0xD3D4,
-	37322 - 11905: 0xCACD,
-	37323 - 11905: 0xE18C,
-	37324 - 11905: 0xC0EF,
-	37325 - 11905: 0xD6D8,
-	37326 - 11905: 0xD2B0,
-	37327 - 11905: 0xC1BF,
-	37328 - 11905: 0xE18D,
-	37329 - 11905: 0xBDF0,
-	37330 - 11905: 0xE18E,
-	37331 - 11905: 0xE18F,
-	37332 - 11905: 0xE190,
-	37333 - 11905: 0xE191,
-	37334 - 11905: 0xE192,
-	37335 - 11905: 0xE193,
-	37336 - 11905: 0xE194,
-	37337 - 11905: 0xE195,
-	37338 - 11905: 0xE196,
-	37339 - 11905: 0xE197,
-	37340 - 11905: 0xB8AA,
-	37341 - 11905: 0xE198,
-	37342 - 11905: 0xE199,
-	37343 - 11905: 0xE19A,
-	37344 - 11905: 0xE19B,
-	37345 - 11905: 0xE19C,
-	37346 - 11905: 0xE19D,
-	37347 - 11905: 0xE19E,
-	37348 - 11905: 0xE19F,
-	37349 - 11905: 0xE1A0,
-	37350 - 11905: 0xE240,
-	37351 - 11905: 0xE241,
-	37352 - 11905: 0xE242,
-	37353 - 11905: 0xE243,
-	37354 - 11905: 0xE244,
-	37355 - 11905: 0xE245,
-	37356 - 11905: 0xE246,
-	37357 - 11905: 0xE247,
-	37358 - 11905: 0xE248,
-	37359 - 11905: 0xE249,
-	37360 - 11905: 0xE24A,
-	37361 - 11905: 0xE24B,
-	37362 - 11905: 0xE24C,
-	37363 - 11905: 0xE24D,
-	37364 - 11905: 0xE24E,
-	37365 - 11905: 0xE24F,
-	37366 - 11905: 0xE250,
-	37367 - 11905: 0xE251,
-	37368 - 11905: 0xE252,
-	37369 - 11905: 0xE253,
-	37370 - 11905: 0xE254,
-	37371 - 11905: 0xE255,
-	37372 - 11905: 0xE256,
-	37373 - 11905: 0xE257,
-	37374 - 11905: 0xE258,
-	37375 - 11905: 0xE259,
-	37376 - 11905: 0xE25A,
-	37377 - 11905: 0xE25B,
-	37378 - 11905: 0xE25C,
-	37379 - 11905: 0xE25D,
-	37380 - 11905: 0xE25E,
-	37381 - 11905: 0xE25F,
-	37382 - 11905: 0xE260,
-	37383 - 11905: 0xE261,
-	37384 - 11905: 0xE262,
-	37385 - 11905: 0xE263,
-	37386 - 11905: 0xE264,
-	37387 - 11905: 0xE265,
-	37388 - 11905: 0xE266,
-	37389 - 11905: 0xE267,
-	37390 - 11905: 0xE268,
-	37391 - 11905: 0xE269,
-	37392 - 11905: 0xE26A,
-	37393 - 11905: 0xE26B,
-	37394 - 11905: 0xE26C,
-	37395 - 11905: 0xE26D,
-	37396 - 11905: 0xE26E,
-	37397 - 11905: 0xE26F,
-	37398 - 11905: 0xE270,
-	37399 - 11905: 0xE271,
-	37400 - 11905: 0xE272,
-	37401 - 11905: 0xE273,
-	37402 - 11905: 0xE274,
-	37403 - 11905: 0xE275,
-	37404 - 11905: 0xE276,
-	37405 - 11905: 0xE277,
-	37406 - 11905: 0xE278,
-	37407 - 11905: 0xE279,
-	37408 - 11905: 0xE27A,
-	37409 - 11905: 0xE27B,
-	37410 - 11905: 0xE27C,
-	37411 - 11905: 0xE27D,
-	37412 - 11905: 0xE27E,
-	37413 - 11905: 0xE280,
-	37414 - 11905: 0xE281,
-	37415 - 11905: 0xE282,
-	37416 - 11905: 0xE283,
-	37417 - 11905: 0xE284,
-	37418 - 11905: 0xE285,
-	37419 - 11905: 0xE286,
-	37420 - 11905: 0xE287,
-	37421 - 11905: 0xE288,
-	37422 - 11905: 0xE289,
-	37423 - 11905: 0xE28A,
-	37424 - 11905: 0xE28B,
-	37425 - 11905: 0xE28C,
-	37426 - 11905: 0xE28D,
-	37427 - 11905: 0xE28E,
-	37428 - 11905: 0xE28F,
-	37429 - 11905: 0xE290,
-	37430 - 11905: 0xE291,
-	37431 - 11905: 0xE292,
-	37432 - 11905: 0xE293,
-	37433 - 11905: 0xE294,
-	37434 - 11905: 0xE295,
-	37435 - 11905: 0xE296,
-	37436 - 11905: 0xE297,
-	37437 - 11905: 0xE298,
-	37438 - 11905: 0xE299,
-	37439 - 11905: 0xE29A,
-	37440 - 11905: 0xE29B,
-	37441 - 11905: 0xE29C,
-	37442 - 11905: 0xE29D,
-	37443 - 11905: 0xE29E,
-	37444 - 11905: 0xE29F,
-	37445 - 11905: 0xE2A0,
-	37446 - 11905: 0xE340,
-	37447 - 11905: 0xE341,
-	37448 - 11905: 0xE342,
-	37449 - 11905: 0xE343,
-	37450 - 11905: 0xE344,
-	37451 - 11905: 0xE345,
-	37452 - 11905: 0xE346,
-	37453 - 11905: 0xE347,
-	37454 - 11905: 0xE348,
-	37455 - 11905: 0xE349,
-	37456 - 11905: 0xE34A,
-	37457 - 11905: 0xE34B,
-	37458 - 11905: 0xE34C,
-	37459 - 11905: 0xE34D,
-	37460 - 11905: 0xE34E,
-	37461 - 11905: 0xE34F,
-	37462 - 11905: 0xE350,
-	37463 - 11905: 0xE351,
-	37464 - 11905: 0xE352,
-	37465 - 11905: 0xE353,
-	37466 - 11905: 0xE354,
-	37467 - 11905: 0xE355,
-	37468 - 11905: 0xE356,
-	37469 - 11905: 0xE357,
-	37470 - 11905: 0xE358,
-	37471 - 11905: 0xE359,
-	37472 - 11905: 0xE35A,
-	37473 - 11905: 0xE35B,
-	37474 - 11905: 0xE35C,
-	37475 - 11905: 0xE35D,
-	37476 - 11905: 0xE35E,
-	37477 - 11905: 0xE35F,
-	37478 - 11905: 0xE360,
-	37479 - 11905: 0xE361,
-	37480 - 11905: 0xE362,
-	37481 - 11905: 0xE363,
-	37482 - 11905: 0xE364,
-	37483 - 11905: 0xE365,
-	37484 - 11905: 0xE366,
-	37485 - 11905: 0xE367,
-	37486 - 11905: 0xE368,
-	37487 - 11905: 0xE369,
-	37488 - 11905: 0xE36A,
-	37489 - 11905: 0xE36B,
-	37490 - 11905: 0xE36C,
-	37491 - 11905: 0xE36D,
-	37492 - 11905: 0xBCF8,
-	37493 - 11905: 0xE36E,
-	37494 - 11905: 0xE36F,
-	37495 - 11905: 0xE370,
-	37496 - 11905: 0xE371,
-	37497 - 11905: 0xE372,
-	37498 - 11905: 0xE373,
-	37499 - 11905: 0xE374,
-	37500 - 11905: 0xE375,
-	37501 - 11905: 0xE376,
-	37502 - 11905: 0xE377,
-	37503 - 11905: 0xE378,
-	37504 - 11905: 0xE379,
-	37505 - 11905: 0xE37A,
-	37506 - 11905: 0xE37B,
-	37507 - 11905: 0xE37C,
-	37508 - 11905: 0xE37D,
-	37509 - 11905: 0xE37E,
-	37510 - 11905: 0xE380,
-	37511 - 11905: 0xE381,
-	37512 - 11905: 0xE382,
-	37513 - 11905: 0xE383,
-	37514 - 11905: 0xE384,
-	37515 - 11905: 0xE385,
-	37516 - 11905: 0xE386,
-	37517 - 11905: 0xE387,
-	37518 - 11905: 0xF6C6,
-	37519 - 11905: 0xE388,
-	37520 - 11905: 0xE389,
-	37521 - 11905: 0xE38A,
-	37522 - 11905: 0xE38B,
-	37523 - 11905: 0xE38C,
-	37524 - 11905: 0xE38D,
-	37525 - 11905: 0xE38E,
-	37526 - 11905: 0xE38F,
-	37527 - 11905: 0xE390,
-	37528 - 11905: 0xE391,
-	37529 - 11905: 0xE392,
-	37530 - 11905: 0xE393,
-	37531 - 11905: 0xE394,
-	37532 - 11905: 0xE395,
-	37533 - 11905: 0xE396,
-	37534 - 11905: 0xE397,
-	37535 - 11905: 0xE398,
-	37536 - 11905: 0xE399,
-	37537 - 11905: 0xE39A,
-	37538 - 11905: 0xE39B,
-	37539 - 11905: 0xE39C,
-	37540 - 11905: 0xE39D,
-	37541 - 11905: 0xE39E,
-	37542 - 11905: 0xE39F,
-	37543 - 11905: 0xE3A0,
-	37544 - 11905: 0xE440,
-	37545 - 11905: 0xE441,
-	37546 - 11905: 0xE442,
-	37547 - 11905: 0xE443,
-	37548 - 11905: 0xE444,
-	37549 - 11905: 0xE445,
-	37550 - 11905: 0xF6C7,
-	37551 - 11905: 0xE446,
-	37552 - 11905: 0xE447,
-	37553 - 11905: 0xE448,
-	37554 - 11905: 0xE449,
-	37555 - 11905: 0xE44A,
-	37556 - 11905: 0xE44B,
-	37557 - 11905: 0xE44C,
-	37558 - 11905: 0xE44D,
-	37559 - 11905: 0xE44E,
-	37560 - 11905: 0xE44F,
-	37561 - 11905: 0xE450,
-	37562 - 11905: 0xE451,
-	37563 - 11905: 0xE452,
-	37564 - 11905: 0xE453,
-	37565 - 11905: 0xE454,
-	37566 - 11905: 0xE455,
-	37567 - 11905: 0xE456,
-	37568 - 11905: 0xE457,
-	37569 - 11905: 0xE458,
-	37570 - 11905: 0xE459,
-	37571 - 11905: 0xE45A,
-	37572 - 11905: 0xE45B,
-	37573 - 11905: 0xE45C,
-	37574 - 11905: 0xE45D,
-	37575 - 11905: 0xE45E,
-	37576 - 11905: 0xF6C8,
-	37577 - 11905: 0xE45F,
-	37578 - 11905: 0xE460,
-	37579 - 11905: 0xE461,
-	37580 - 11905: 0xE462,
-	37581 - 11905: 0xE463,
-	37582 - 11905: 0xE464,
-	37583 - 11905: 0xE465,
-	37584 - 11905: 0xE466,
-	37585 - 11905: 0xE467,
-	37586 - 11905: 0xE468,
-	37587 - 11905: 0xE469,
-	37588 - 11905: 0xE46A,
-	37589 - 11905: 0xE46B,
-	37590 - 11905: 0xE46C,
-	37591 - 11905: 0xE46D,
-	37592 - 11905: 0xE46E,
-	37593 - 11905: 0xE46F,
-	37594 - 11905: 0xE470,
-	37595 - 11905: 0xE471,
-	37596 - 11905: 0xE472,
-	37597 - 11905: 0xE473,
-	37598 - 11905: 0xE474,
-	37599 - 11905: 0xE475,
-	37600 - 11905: 0xE476,
-	37601 - 11905: 0xE477,
-	37602 - 11905: 0xE478,
-	37603 - 11905: 0xE479,
-	37604 - 11905: 0xE47A,
-	37605 - 11905: 0xE47B,
-	37606 - 11905: 0xE47C,
-	37607 - 11905: 0xE47D,
-	37608 - 11905: 0xE47E,
-	37609 - 11905: 0xE480,
-	37610 - 11905: 0xE481,
-	37611 - 11905: 0xE482,
-	37612 - 11905: 0xE483,
-	37613 - 11905: 0xE484,
-	37614 - 11905: 0xE485,
-	37615 - 11905: 0xE486,
-	37616 - 11905: 0xE487,
-	37617 - 11905: 0xE488,
-	37618 - 11905: 0xE489,
-	37619 - 11905: 0xE48A,
-	37620 - 11905: 0xE48B,
-	37621 - 11905: 0xE48C,
-	37622 - 11905: 0xE48D,
-	37623 - 11905: 0xE48E,
-	37624 - 11905: 0xE48F,
-	37625 - 11905: 0xE490,
-	37626 - 11905: 0xE491,
-	37627 - 11905: 0xE492,
-	37628 - 11905: 0xE493,
-	37629 - 11905: 0xE494,
-	37630 - 11905: 0xE495,
-	37631 - 11905: 0xE496,
-	37632 - 11905: 0xE497,
-	37633 - 11905: 0xE498,
-	37634 - 11905: 0xE499,
-	37635 - 11905: 0xE49A,
-	37636 - 11905: 0xE49B,
-	37637 - 11905: 0xE49C,
-	37638 - 11905: 0xE49D,
-	37639 - 11905: 0xE49E,
-	37640 - 11905: 0xE49F,
-	37641 - 11905: 0xE4A0,
-	37642 - 11905: 0xE540,
-	37643 - 11905: 0xE541,
-	37644 - 11905: 0xE542,
-	37645 - 11905: 0xE543,
-	37646 - 11905: 0xE544,
-	37647 - 11905: 0xE545,
-	37648 - 11905: 0xE546,
-	37649 - 11905: 0xE547,
-	37650 - 11905: 0xE548,
-	37651 - 11905: 0xE549,
-	37652 - 11905: 0xE54A,
-	37653 - 11905: 0xE54B,
-	37654 - 11905: 0xE54C,
-	37655 - 11905: 0xE54D,
-	37656 - 11905: 0xE54E,
-	37657 - 11905: 0xE54F,
-	37658 - 11905: 0xE550,
-	37659 - 11905: 0xE551,
-	37660 - 11905: 0xE552,
-	37661 - 11905: 0xE553,
-	37662 - 11905: 0xE554,
-	37663 - 11905: 0xE555,
-	37664 - 11905: 0xE556,
-	37665 - 11905: 0xE557,
-	37666 - 11905: 0xE558,
-	37667 - 11905: 0xE559,
-	37668 - 11905: 0xE55A,
-	37669 - 11905: 0xE55B,
-	37670 - 11905: 0xE55C,
-	37671 - 11905: 0xE55D,
-	37672 - 11905: 0xE55E,
-	37673 - 11905: 0xE55F,
-	37674 - 11905: 0xE560,
-	37675 - 11905: 0xE561,
-	37676 - 11905: 0xE562,
-	37677 - 11905: 0xE563,
-	37678 - 11905: 0xE564,
-	37679 - 11905: 0xE565,
-	37680 - 11905: 0xE566,
-	37681 - 11905: 0xE567,
-	37682 - 11905: 0xE568,
-	37683 - 11905: 0xE569,
-	37684 - 11905: 0xE56A,
-	37685 - 11905: 0xE56B,
-	37686 - 11905: 0xE56C,
-	37687 - 11905: 0xE56D,
-	37688 - 11905: 0xE56E,
-	37689 - 11905: 0xE56F,
-	37690 - 11905: 0xE570,
-	37691 - 11905: 0xE571,
-	37692 - 11905: 0xE572,
-	37693 - 11905: 0xE573,
-	37694 - 11905: 0xF6C9,
-	37695 - 11905: 0xE574,
-	37696 - 11905: 0xE575,
-	37697 - 11905: 0xE576,
-	37698 - 11905: 0xE577,
-	37699 - 11905: 0xE578,
-	37700 - 11905: 0xE579,
-	37701 - 11905: 0xE57A,
-	37702 - 11905: 0xE57B,
-	37703 - 11905: 0xE57C,
-	37704 - 11905: 0xE57D,
-	37705 - 11905: 0xE57E,
-	37706 - 11905: 0xE580,
-	37707 - 11905: 0xE581,
-	37708 - 11905: 0xE582,
-	37709 - 11905: 0xE583,
-	37710 - 11905: 0xE584,
-	37711 - 11905: 0xE585,
-	37712 - 11905: 0xE586,
-	37713 - 11905: 0xE587,
-	37714 - 11905: 0xE588,
-	37715 - 11905: 0xE589,
-	37716 - 11905: 0xE58A,
-	37717 - 11905: 0xE58B,
-	37718 - 11905: 0xE58C,
-	37719 - 11905: 0xE58D,
-	37720 - 11905: 0xE58E,
-	37721 - 11905: 0xE58F,
-	37722 - 11905: 0xE590,
-	37723 - 11905: 0xE591,
-	37724 - 11905: 0xE592,
-	37725 - 11905: 0xE593,
-	37726 - 11905: 0xE594,
-	37727 - 11905: 0xE595,
-	37728 - 11905: 0xE596,
-	37729 - 11905: 0xE597,
-	37730 - 11905: 0xE598,
-	37731 - 11905: 0xE599,
-	37732 - 11905: 0xE59A,
-	37733 - 11905: 0xE59B,
-	37734 - 11905: 0xE59C,
-	37735 - 11905: 0xE59D,
-	37736 - 11905: 0xE59E,
-	37737 - 11905: 0xE59F,
-	37738 - 11905: 0xF6CA,
-	37739 - 11905: 0xE5A0,
-	37740 - 11905: 0xE640,
-	37741 - 11905: 0xE641,
-	37742 - 11905: 0xE642,
-	37743 - 11905: 0xE643,
-	37744 - 11905: 0xE644,
-	37745 - 11905: 0xE645,
-	37746 - 11905: 0xE646,
-	37747 - 11905: 0xE647,
-	37748 - 11905: 0xE648,
-	37749 - 11905: 0xE649,
-	37750 - 11905: 0xE64A,
-	37751 - 11905: 0xE64B,
-	37752 - 11905: 0xE64C,
-	37753 - 11905: 0xE64D,
-	37754 - 11905: 0xE64E,
-	37755 - 11905: 0xE64F,
-	37756 - 11905: 0xE650,
-	37757 - 11905: 0xE651,
-	37758 - 11905: 0xE652,
-	37759 - 11905: 0xE653,
-	37760 - 11905: 0xE654,
-	37761 - 11905: 0xE655,
-	37762 - 11905: 0xE656,
-	37763 - 11905: 0xE657,
-	37764 - 11905: 0xE658,
-	37765 - 11905: 0xE659,
-	37766 - 11905: 0xE65A,
-	37767 - 11905: 0xE65B,
-	37768 - 11905: 0xE65C,
-	37769 - 11905: 0xE65D,
-	37770 - 11905: 0xE65E,
-	37771 - 11905: 0xE65F,
-	37772 - 11905: 0xE660,
-	37773 - 11905: 0xE661,
-	37774 - 11905: 0xE662,
-	37775 - 11905: 0xF6CC,
-	37776 - 11905: 0xE663,
-	37777 - 11905: 0xE664,
-	37778 - 11905: 0xE665,
-	37779 - 11905: 0xE666,
-	37780 - 11905: 0xE667,
-	37781 - 11905: 0xE668,
-	37782 - 11905: 0xE669,
-	37783 - 11905: 0xE66A,
-	37784 - 11905: 0xE66B,
-	37785 - 11905: 0xE66C,
-	37786 - 11905: 0xE66D,
-	37787 - 11905: 0xE66E,
-	37788 - 11905: 0xE66F,
-	37789 - 11905: 0xE670,
-	37790 - 11905: 0xE671,
-	37791 - 11905: 0xE672,
-	37792 - 11905: 0xE673,
-	37793 - 11905: 0xE674,
-	37794 - 11905: 0xE675,
-	37795 - 11905: 0xE676,
-	37796 - 11905: 0xE677,
-	37797 - 11905: 0xE678,
-	37798 - 11905: 0xE679,
-	37799 - 11905: 0xE67A,
-	37800 - 11905: 0xE67B,
-	37801 - 11905: 0xE67C,
-	37802 - 11905: 0xE67D,
-	37803 - 11905: 0xE67E,
-	37804 - 11905: 0xE680,
-	37805 - 11905: 0xE681,
-	37806 - 11905: 0xE682,
-	37807 - 11905: 0xE683,
-	37808 - 11905: 0xE684,
-	37809 - 11905: 0xE685,
-	37810 - 11905: 0xE686,
-	37811 - 11905: 0xE687,
-	37812 - 11905: 0xE688,
-	37813 - 11905: 0xE689,
-	37814 - 11905: 0xE68A,
-	37815 - 11905: 0xE68B,
-	37816 - 11905: 0xE68C,
-	37817 - 11905: 0xE68D,
-	37818 - 11905: 0xE68E,
-	37819 - 11905: 0xE68F,
-	37820 - 11905: 0xE690,
-	37821 - 11905: 0xE691,
-	37822 - 11905: 0xE692,
-	37823 - 11905: 0xE693,
-	37824 - 11905: 0xE694,
-	37825 - 11905: 0xE695,
-	37826 - 11905: 0xE696,
-	37827 - 11905: 0xE697,
-	37828 - 11905: 0xE698,
-	37829 - 11905: 0xE699,
-	37830 - 11905: 0xE69A,
-	37831 - 11905: 0xE69B,
-	37832 - 11905: 0xE69C,
-	37833 - 11905: 0xE69D,
-	37834 - 11905: 0xF6CB,
-	37835 - 11905: 0xE69E,
-	37836 - 11905: 0xE69F,
-	37837 - 11905: 0xE6A0,
-	37838 - 11905: 0xE740,
-	37839 - 11905: 0xE741,
-	37840 - 11905: 0xE742,
-	37841 - 11905: 0xE743,
-	37842 - 11905: 0xE744,
-	37843 - 11905: 0xE745,
-	37844 - 11905: 0xE746,
-	37845 - 11905: 0xE747,
-	37846 - 11905: 0xF7E9,
-	37847 - 11905: 0xE748,
-	37848 - 11905: 0xE749,
-	37849 - 11905: 0xE74A,
-	37850 - 11905: 0xE74B,
-	37851 - 11905: 0xE74C,
-	37852 - 11905: 0xE74D,
-	37853 - 11905: 0xE74E,
-	37854 - 11905: 0xE74F,
-	37855 - 11905: 0xE750,
-	37856 - 11905: 0xE751,
-	37857 - 11905: 0xE752,
-	37858 - 11905: 0xE753,
-	37859 - 11905: 0xE754,
-	37860 - 11905: 0xE755,
-	37861 - 11905: 0xE756,
-	37862 - 11905: 0xE757,
-	37863 - 11905: 0xE758,
-	37864 - 11905: 0xE759,
-	37865 - 11905: 0xE75A,
-	37866 - 11905: 0xE75B,
-	37867 - 11905: 0xE75C,
-	37868 - 11905: 0xE75D,
-	37869 - 11905: 0xE75E,
-	37870 - 11905: 0xE75F,
-	37871 - 11905: 0xE760,
-	37872 - 11905: 0xE761,
-	37873 - 11905: 0xE762,
-	37874 - 11905: 0xE763,
-	37875 - 11905: 0xE764,
-	37876 - 11905: 0xE765,
-	37877 - 11905: 0xE766,
-	37878 - 11905: 0xE767,
-	37879 - 11905: 0xE768,
-	37880 - 11905: 0xE769,
-	37881 - 11905: 0xE76A,
-	37882 - 11905: 0xE76B,
-	37883 - 11905: 0xE76C,
-	37884 - 11905: 0xE76D,
-	37885 - 11905: 0xE76E,
-	37886 - 11905: 0xE76F,
-	37887 - 11905: 0xE770,
-	37888 - 11905: 0xE771,
-	37889 - 11905: 0xE772,
-	37890 - 11905: 0xE773,
-	37891 - 11905: 0xE774,
-	37892 - 11905: 0xE775,
-	37893 - 11905: 0xE776,
-	37894 - 11905: 0xE777,
-	37895 - 11905: 0xE778,
-	37896 - 11905: 0xE779,
-	37897 - 11905: 0xE77A,
-	37898 - 11905: 0xE77B,
-	37899 - 11905: 0xE77C,
-	37900 - 11905: 0xE77D,
-	37901 - 11905: 0xE77E,
-	37902 - 11905: 0xE780,
-	37903 - 11905: 0xE781,
-	37904 - 11905: 0xE782,
-	37905 - 11905: 0xE783,
-	37906 - 11905: 0xE784,
-	37907 - 11905: 0xE785,
-	37908 - 11905: 0xE786,
-	37909 - 11905: 0xE787,
-	37910 - 11905: 0xE788,
-	37911 - 11905: 0xE789,
-	37912 - 11905: 0xE78A,
-	37913 - 11905: 0xE78B,
-	37914 - 11905: 0xE78C,
-	37915 - 11905: 0xE78D,
-	37916 - 11905: 0xE78E,
-	37917 - 11905: 0xE78F,
-	37918 - 11905: 0xE790,
-	37919 - 11905: 0xE791,
-	37920 - 11905: 0xE792,
-	37921 - 11905: 0xE793,
-	37922 - 11905: 0xE794,
-	37923 - 11905: 0xE795,
-	37924 - 11905: 0xE796,
-	37925 - 11905: 0xE797,
-	37926 - 11905: 0xE798,
-	37927 - 11905: 0xE799,
-	37928 - 11905: 0xE79A,
-	37929 - 11905: 0xE79B,
-	37930 - 11905: 0xE79C,
-	37931 - 11905: 0xE79D,
-	37932 - 11905: 0xE79E,
-	37933 - 11905: 0xE79F,
-	37934 - 11905: 0xE7A0,
-	37935 - 11905: 0xE840,
-	37936 - 11905: 0xE841,
-	37937 - 11905: 0xE842,
-	37938 - 11905: 0xE843,
-	37939 - 11905: 0xE844,
-	37940 - 11905: 0xE845,
-	37941 - 11905: 0xE846,
-	37942 - 11905: 0xE847,
-	37943 - 11905: 0xE848,
-	37944 - 11905: 0xE849,
-	37945 - 11905: 0xE84A,
-	37946 - 11905: 0xE84B,
-	37947 - 11905: 0xE84C,
-	37948 - 11905: 0xE84D,
-	37949 - 11905: 0xE84E,
-	37950 - 11905: 0xF6CD,
-	37951 - 11905: 0xE84F,
-	37952 - 11905: 0xE850,
-	37953 - 11905: 0xE851,
-	37954 - 11905: 0xE852,
-	37955 - 11905: 0xE853,
-	37956 - 11905: 0xE854,
-	37957 - 11905: 0xE855,
-	37958 - 11905: 0xE856,
-	37959 - 11905: 0xE857,
-	37960 - 11905: 0xE858,
-	37961 - 11905: 0xE859,
-	37962 - 11905: 0xE85A,
-	37963 - 11905: 0xE85B,
-	37964 - 11905: 0xE85C,
-	37965 - 11905: 0xE85D,
-	37966 - 11905: 0xE85E,
-	37967 - 11905: 0xE85F,
-	37968 - 11905: 0xE860,
-	37969 - 11905: 0xE861,
-	37970 - 11905: 0xE862,
-	37971 - 11905: 0xE863,
-	37972 - 11905: 0xE864,
-	37973 - 11905: 0xE865,
-	37974 - 11905: 0xE866,
-	37975 - 11905: 0xE867,
-	37976 - 11905: 0xE868,
-	37977 - 11905: 0xE869,
-	37978 - 11905: 0xE86A,
-	37979 - 11905: 0xE86B,
-	37980 - 11905: 0xE86C,
-	37981 - 11905: 0xE86D,
-	37982 - 11905: 0xE86E,
-	37983 - 11905: 0xE86F,
-	37984 - 11905: 0xE870,
-	37985 - 11905: 0xE871,
-	37986 - 11905: 0xE872,
-	37987 - 11905: 0xE873,
-	37988 - 11905: 0xE874,
-	37989 - 11905: 0xE875,
-	37990 - 11905: 0xE876,
-	37991 - 11905: 0xE877,
-	37992 - 11905: 0xE878,
-	37993 - 11905: 0xE879,
-	37994 - 11905: 0xE87A,
-	37995 - 11905: 0xF6CE,
-	37996 - 11905: 0xE87B,
-	37997 - 11905: 0xE87C,
-	37998 - 11905: 0xE87D,
-	37999 - 11905: 0xE87E,
-	38000 - 11905: 0xE880,
-	38001 - 11905: 0xE881,
-	38002 - 11905: 0xE882,
-	38003 - 11905: 0xE883,
-	38004 - 11905: 0xE884,
-	38005 - 11905: 0xE885,
-	38006 - 11905: 0xE886,
-	38007 - 11905: 0xE887,
-	38008 - 11905: 0xE888,
-	38009 - 11905: 0xE889,
-	38010 - 11905: 0xE88A,
-	38011 - 11905: 0xE88B,
-	38012 - 11905: 0xE88C,
-	38013 - 11905: 0xE88D,
-	38014 - 11905: 0xE88E,
-	38015 - 11905: 0xE88F,
-	38016 - 11905: 0xE890,
-	38017 - 11905: 0xE891,
-	38018 - 11905: 0xE892,
-	38019 - 11905: 0xE893,
-	38020 - 11905: 0xE894,
-	38021 - 11905: 0xEEC4,
-	38022 - 11905: 0xEEC5,
-	38023 - 11905: 0xEEC6,
-	38024 - 11905: 0xD5EB,
-	38025 - 11905: 0xB6A4,
-	38026 - 11905: 0xEEC8,
-	38027 - 11905: 0xEEC7,
-	38028 - 11905: 0xEEC9,
-	38029 - 11905: 0xEECA,
-	38030 - 11905: 0xC7A5,
-	38031 - 11905: 0xEECB,
-	38032 - 11905: 0xEECC,
-	38033 - 11905: 0xE895,
-	38034 - 11905: 0xB7B0,
-	38035 - 11905: 0xB5F6,
-	38036 - 11905: 0xEECD,
-	38037 - 11905: 0xEECF,
-	38038 - 11905: 0xE896,
-	38039 - 11905: 0xEECE,
-	38040 - 11905: 0xE897,
-	38041 - 11905: 0xB8C6,
-	38042 - 11905: 0xEED0,
-	38043 - 11905: 0xEED1,
-	38044 - 11905: 0xEED2,
-	38045 - 11905: 0xB6DB,
-	38046 - 11905: 0xB3AE,
-	38047 - 11905: 0xD6D3,
-	38048 - 11905: 0xC4C6,
-	38049 - 11905: 0xB1B5,
-	38050 - 11905: 0xB8D6,
-	38051 - 11905: 0xEED3,
-	38052 - 11905: 0xEED4,
-	38053 - 11905: 0xD4BF,
-	38054 - 11905: 0xC7D5,
-	38055 - 11905: 0xBEFB,
-	38056 - 11905: 0xCED9,
-	38057 - 11905: 0xB9B3,
-	38058 - 11905: 0xEED6,
-	38059 - 11905: 0xEED5,
-	38060 - 11905: 0xEED8,
-	38061 - 11905: 0xEED7,
-	38062 - 11905: 0xC5A5,
-	38063 - 11905: 0xEED9,
-	38064 - 11905: 0xEEDA,
-	38065 - 11905: 0xC7AE,
-	38066 - 11905: 0xEEDB,
-	38067 - 11905: 0xC7AF,
-	38068 - 11905: 0xEEDC,
-	38069 - 11905: 0xB2A7,
-	38070 - 11905: 0xEEDD,
-	38071 - 11905: 0xEEDE,
-	38072 - 11905: 0xEEDF,
-	38073 - 11905: 0xEEE0,
-	38074 - 11905: 0xEEE1,
-	38075 - 11905: 0xD7EA,
-	38076 - 11905: 0xEEE2,
-	38077 - 11905: 0xEEE3,
-	38078 - 11905: 0xBCD8,
-	38079 - 11905: 0xEEE4,
-	38080 - 11905: 0xD3CB,
-	38081 - 11905: 0xCCFA,
-	38082 - 11905: 0xB2AC,
-	38083 - 11905: 0xC1E5,
-	38084 - 11905: 0xEEE5,
-	38085 - 11905: 0xC7A6,
-	38086 - 11905: 0xC3AD,
-	38087 - 11905: 0xE898,
-	38088 - 11905: 0xEEE6,
-	38089 - 11905: 0xEEE7,
-	38090 - 11905: 0xEEE8,
-	38091 - 11905: 0xEEE9,
-	38092 - 11905: 0xEEEA,
-	38093 - 11905: 0xEEEB,
-	38094 - 11905: 0xEEEC,
-	38095 - 11905: 0xE899,
-	38096 - 11905: 0xEEED,
-	38097 - 11905: 0xEEEE,
-	38098 - 11905: 0xEEEF,
-	38099 - 11905: 0xE89A,
-	38100 - 11905: 0xE89B,
-	38101 - 11905: 0xEEF0,
-	38102 - 11905: 0xEEF1,
-	38103 - 11905: 0xEEF2,
-	38104 - 11905: 0xEEF4,
-	38105 - 11905: 0xEEF3,
-	38106 - 11905: 0xE89C,
-	38107 - 11905: 0xEEF5,
-	38108 - 11905: 0xCDAD,
-	38109 - 11905: 0xC2C1,
-	38110 - 11905: 0xEEF6,
-	38111 - 11905: 0xEEF7,
-	38112 - 11905: 0xEEF8,
-	38113 - 11905: 0xD5A1,
-	38114 - 11905: 0xEEF9,
-	38115 - 11905: 0xCFB3,
-	38116 - 11905: 0xEEFA,
-	38117 - 11905: 0xEEFB,
-	38118 - 11905: 0xE89D,
-	38119 - 11905: 0xEEFC,
-	38120 - 11905: 0xEEFD,
-	38121 - 11905: 0xEFA1,
-	38122 - 11905: 0xEEFE,
-	38123 - 11905: 0xEFA2,
-	38124 - 11905: 0xB8F5,
-	38125 - 11905: 0xC3FA,
-	38126 - 11905: 0xEFA3,
-	38127 - 11905: 0xEFA4,
-	38128 - 11905: 0xBDC2,
-	38129 - 11905: 0xD2BF,
-	38130 - 11905: 0xB2F9,
-	38131 - 11905: 0xEFA5,
-	38132 - 11905: 0xEFA6,
-	38133 - 11905: 0xEFA7,
-	38134 - 11905: 0xD2F8,
-	38135 - 11905: 0xEFA8,
-	38136 - 11905: 0xD6FD,
-	38137 - 11905: 0xEFA9,
-	38138 - 11905: 0xC6CC,
-	38139 - 11905: 0xE89E,
-	38140 - 11905: 0xEFAA,
-	38141 - 11905: 0xEFAB,
-	38142 - 11905: 0xC1B4,
-	38143 - 11905: 0xEFAC,
-	38144 - 11905: 0xCFFA,
-	38145 - 11905: 0xCBF8,
-	38146 - 11905: 0xEFAE,
-	38147 - 11905: 0xEFAD,
-	38148 - 11905: 0xB3FA,
-	38149 - 11905: 0xB9F8,
-	38150 - 11905: 0xEFAF,
-	38151 - 11905: 0xEFB0,
-	38152 - 11905: 0xD0E2,
-	38153 - 11905: 0xEFB1,
-	38154 - 11905: 0xEFB2,
-	38155 - 11905: 0xB7E6,
-	38156 - 11905: 0xD0BF,
-	38157 - 11905: 0xEFB3,
-	38158 - 11905: 0xEFB4,
-	38159 - 11905: 0xEFB5,
-	38160 - 11905: 0xC8F1,
-	38161 - 11905: 0xCCE0,
-	38162 - 11905: 0xEFB6,
-	38163 - 11905: 0xEFB7,
-	38164 - 11905: 0xEFB8,
-	38165 - 11905: 0xEFB9,
-	38166 - 11905: 0xEFBA,
-	38167 - 11905: 0xD5E0,
-	38168 - 11905: 0xEFBB,
-	38169 - 11905: 0xB4ED,
-	38170 - 11905: 0xC3AA,
-	38171 - 11905: 0xEFBC,
-	38172 - 11905: 0xE89F,
-	38173 - 11905: 0xEFBD,
-	38174 - 11905: 0xEFBE,
-	38175 - 11905: 0xEFBF,
-	38176 - 11905: 0xE8A0,
-	38177 - 11905: 0xCEFD,
-	38178 - 11905: 0xEFC0,
-	38179 - 11905: 0xC2E0,
-	38180 - 11905: 0xB4B8,
-	38181 - 11905: 0xD7B6,
-	38182 - 11905: 0xBDF5,
-	38183 - 11905: 0xE940,
-	38184 - 11905: 0xCFC7,
-	38185 - 11905: 0xEFC3,
-	38186 - 11905: 0xEFC1,
-	38187 - 11905: 0xEFC2,
-	38188 - 11905: 0xEFC4,
-	38189 - 11905: 0xB6A7,
-	38190 - 11905: 0xBCFC,
-	38191 - 11905: 0xBEE2,
-	38192 - 11905: 0xC3CC,
-	38193 - 11905: 0xEFC5,
-	38194 - 11905: 0xEFC6,
-	38195 - 11905: 0xE941,
-	38196 - 11905: 0xEFC7,
-	38197 - 11905: 0xEFCF,
-	38198 - 11905: 0xEFC8,
-	38199 - 11905: 0xEFC9,
-	38200 - 11905: 0xEFCA,
-	38201 - 11905: 0xC7C2,
-	38202 - 11905: 0xEFF1,
-	38203 - 11905: 0xB6CD,
-	38204 - 11905: 0xEFCB,
-	38205 - 11905: 0xE942,
-	38206 - 11905: 0xEFCC,
-	38207 - 11905: 0xEFCD,
-	38208 - 11905: 0xB6C6,
-	38209 - 11905: 0xC3BE,
-	38210 - 11905: 0xEFCE,
-	38211 - 11905: 0xE943,
-	38212 - 11905: 0xEFD0,
-	38213 - 11905: 0xEFD1,
-	38214 - 11905: 0xEFD2,
-	38215 - 11905: 0xD5F2,
-	38216 - 11905: 0xE944,
-	38217 - 11905: 0xEFD3,
-	38218 - 11905: 0xC4F7,
-	38219 - 11905: 0xE945,
-	38220 - 11905: 0xEFD4,
-	38221 - 11905: 0xC4F8,
-	38222 - 11905: 0xEFD5,
-	38223 - 11905: 0xEFD6,
-	38224 - 11905: 0xB8E4,
-	38225 - 11905: 0xB0F7,
-	38226 - 11905: 0xEFD7,
-	38227 - 11905: 0xEFD8,
-	38228 - 11905: 0xEFD9,
-	38229 - 11905: 0xE946,
-	38230 - 11905: 0xEFDA,
-	38231 - 11905: 0xEFDB,
-	38232 - 11905: 0xEFDC,
-	38233 - 11905: 0xEFDD,
-	38234 - 11905: 0xE947,
-	38235 - 11905: 0xEFDE,
-	38236 - 11905: 0xBEB5,
-	38237 - 11905: 0xEFE1,
-	38238 - 11905: 0xEFDF,
-	38239 - 11905: 0xEFE0,
-	38240 - 11905: 0xE948,
-	38241 - 11905: 0xEFE2,
-	38242 - 11905: 0xEFE3,
-	38243 - 11905: 0xC1CD,
-	38244 - 11905: 0xEFE4,
-	38245 - 11905: 0xEFE5,
-	38246 - 11905: 0xEFE6,
-	38247 - 11905: 0xEFE7,
-	38248 - 11905: 0xEFE8,
-	38249 - 11905: 0xEFE9,
-	38250 - 11905: 0xEFEA,
-	38251 - 11905: 0xEFEB,
-	38252 - 11905: 0xEFEC,
-	38253 - 11905: 0xC0D8,
-	38254 - 11905: 0xE949,
-	38255 - 11905: 0xEFED,
-	38256 - 11905: 0xC1AD,
-	38257 - 11905: 0xEFEE,
-	38258 - 11905: 0xEFEF,
-	38259 - 11905: 0xEFF0,
-	38260 - 11905: 0xE94A,
-	38261 - 11905: 0xE94B,
-	38262 - 11905: 0xCFE2,
-	38263 - 11905: 0xE94C,
-	38264 - 11905: 0xE94D,
-	38265 - 11905: 0xE94E,
-	38266 - 11905: 0xE94F,
-	38267 - 11905: 0xE950,
-	38268 - 11905: 0xE951,
-	38269 - 11905: 0xE952,
-	38270 - 11905: 0xE953,
-	38271 - 11905: 0xB3A4,
-	38272 - 11905: 0xE954,
-	38273 - 11905: 0xE955,
-	38274 - 11905: 0xE956,
-	38275 - 11905: 0xE957,
-	38276 - 11905: 0xE958,
-	38277 - 11905: 0xE959,
-	38278 - 11905: 0xE95A,
-	38279 - 11905: 0xE95B,
-	38280 - 11905: 0xE95C,
-	38281 - 11905: 0xE95D,
-	38282 - 11905: 0xE95E,
-	38283 - 11905: 0xE95F,
-	38284 - 11905: 0xE960,
-	38285 - 11905: 0xE961,
-	38286 - 11905: 0xE962,
-	38287 - 11905: 0xE963,
-	38288 - 11905: 0xE964,
-	38289 - 11905: 0xE965,
-	38290 - 11905: 0xE966,
-	38291 - 11905: 0xE967,
-	38292 - 11905: 0xE968,
-	38293 - 11905: 0xE969,
-	38294 - 11905: 0xE96A,
-	38295 - 11905: 0xE96B,
-	38296 - 11905: 0xE96C,
-	38297 - 11905: 0xE96D,
-	38298 - 11905: 0xE96E,
-	38299 - 11905: 0xE96F,
-	38300 - 11905: 0xE970,
-	38301 - 11905: 0xE971,
-	38302 - 11905: 0xE972,
-	38303 - 11905: 0xE973,
-	38304 - 11905: 0xE974,
-	38305 - 11905: 0xE975,
-	38306 - 11905: 0xE976,
-	38307 - 11905: 0xE977,
-	38308 - 11905: 0xE978,
-	38309 - 11905: 0xE979,
-	38310 - 11905: 0xE97A,
-	38311 - 11905: 0xE97B,
-	38312 - 11905: 0xE97C,
-	38313 - 11905: 0xE97D,
-	38314 - 11905: 0xE97E,
-	38315 - 11905: 0xE980,
-	38316 - 11905: 0xE981,
-	38317 - 11905: 0xE982,
-	38318 - 11905: 0xE983,
-	38319 - 11905: 0xE984,
-	38320 - 11905: 0xE985,
-	38321 - 11905: 0xE986,
-	38322 - 11905: 0xE987,
-	38323 - 11905: 0xE988,
-	38324 - 11905: 0xE989,
-	38325 - 11905: 0xE98A,
-	38326 - 11905: 0xE98B,
-	38327 - 11905: 0xE98C,
-	38328 - 11905: 0xE98D,
-	38329 - 11905: 0xE98E,
-	38330 - 11905: 0xE98F,
-	38331 - 11905: 0xE990,
-	38332 - 11905: 0xE991,
-	38333 - 11905: 0xE992,
-	38334 - 11905: 0xE993,
-	38335 - 11905: 0xE994,
-	38336 - 11905: 0xE995,
-	38337 - 11905: 0xE996,
-	38338 - 11905: 0xE997,
-	38339 - 11905: 0xE998,
-	38340 - 11905: 0xE999,
-	38341 - 11905: 0xE99A,
-	38342 - 11905: 0xE99B,
-	38343 - 11905: 0xE99C,
-	38344 - 11905: 0xE99D,
-	38345 - 11905: 0xE99E,
-	38346 - 11905: 0xE99F,
-	38347 - 11905: 0xE9A0,
-	38348 - 11905: 0xEA40,
-	38349 - 11905: 0xEA41,
-	38350 - 11905: 0xEA42,
-	38351 - 11905: 0xEA43,
-	38352 - 11905: 0xEA44,
-	38353 - 11905: 0xEA45,
-	38354 - 11905: 0xEA46,
-	38355 - 11905: 0xEA47,
-	38356 - 11905: 0xEA48,
-	38357 - 11905: 0xEA49,
-	38358 - 11905: 0xEA4A,
-	38359 - 11905: 0xEA4B,
-	38360 - 11905: 0xEA4C,
-	38361 - 11905: 0xEA4D,
-	38362 - 11905: 0xEA4E,
-	38363 - 11905: 0xEA4F,
-	38364 - 11905: 0xEA50,
-	38365 - 11905: 0xEA51,
-	38366 - 11905: 0xEA52,
-	38367 - 11905: 0xEA53,
-	38368 - 11905: 0xEA54,
-	38369 - 11905: 0xEA55,
-	38370 - 11905: 0xEA56,
-	38371 - 11905: 0xEA57,
-	38372 - 11905: 0xEA58,
-	38373 - 11905: 0xEA59,
-	38374 - 11905: 0xEA5A,
-	38375 - 11905: 0xEA5B,
-	38376 - 11905: 0xC3C5,
-	38377 - 11905: 0xE3C5,
-	38378 - 11905: 0xC9C1,
-	38379 - 11905: 0xE3C6,
-	38380 - 11905: 0xEA5C,
-	38381 - 11905: 0xB1D5,
-	38382 - 11905: 0xCECA,
-	38383 - 11905: 0xB4B3,
-	38384 - 11905: 0xC8F2,
-	38385 - 11905: 0xE3C7,
-	38386 - 11905: 0xCFD0,
-	38387 - 11905: 0xE3C8,
-	38388 - 11905: 0xBCE4,
-	38389 - 11905: 0xE3C9,
-	38390 - 11905: 0xE3CA,
-	38391 - 11905: 0xC3C6,
-	38392 - 11905: 0xD5A2,
-	38393 - 11905: 0xC4D6,
-	38394 - 11905: 0xB9EB,
-	38395 - 11905: 0xCEC5,
-	38396 - 11905: 0xE3CB,
-	38397 - 11905: 0xC3F6,
-	38398 - 11905: 0xE3CC,
-	38399 - 11905: 0xEA5D,
-	38400 - 11905: 0xB7A7,
-	38401 - 11905: 0xB8F3,
-	38402 - 11905: 0xBAD2,
-	38403 - 11905: 0xE3CD,
-	38404 - 11905: 0xE3CE,
-	38405 - 11905: 0xD4C4,
-	38406 - 11905: 0xE3CF,
-	38407 - 11905: 0xEA5E,
-	38408 - 11905: 0xE3D0,
-	38409 - 11905: 0xD1CB,
-	38410 - 11905: 0xE3D1,
-	38411 - 11905: 0xE3D2,
-	38412 - 11905: 0xE3D3,
-	38413 - 11905: 0xE3D4,
-	38414 - 11905: 0xD1D6,
-	38415 - 11905: 0xE3D5,
-	38416 - 11905: 0xB2FB,
-	38417 - 11905: 0xC0BB,
-	38418 - 11905: 0xE3D6,
-	38419 - 11905: 0xEA5F,
-	38420 - 11905: 0xC0AB,
-	38421 - 11905: 0xE3D7,
-	38422 - 11905: 0xE3D8,
-	38423 - 11905: 0xE3D9,
-	38424 - 11905: 0xEA60,
-	38425 - 11905: 0xE3DA,
-	38426 - 11905: 0xE3DB,
-	38427 - 11905: 0xEA61,
-	38428 - 11905: 0xB8B7,
-	38429 - 11905: 0xDAE2,
-	38430 - 11905: 0xEA62,
-	38431 - 11905: 0xB6D3,
-	38432 - 11905: 0xEA63,
-	38433 - 11905: 0xDAE4,
-	38434 - 11905: 0xDAE3,
-	38435 - 11905: 0xEA64,
-	38436 - 11905: 0xEA65,
-	38437 - 11905: 0xEA66,
-	38438 - 11905: 0xEA67,
-	38439 - 11905: 0xEA68,
-	38440 - 11905: 0xEA69,
-	38441 - 11905: 0xEA6A,
-	38442 - 11905: 0xDAE6,
-	38443 - 11905: 0xEA6B,
-	38444 - 11905: 0xEA6C,
-	38445 - 11905: 0xEA6D,
-	38446 - 11905: 0xC8EE,
-	38447 - 11905: 0xEA6E,
-	38448 - 11905: 0xEA6F,
-	38449 - 11905: 0xDAE5,
-	38450 - 11905: 0xB7C0,
-	38451 - 11905: 0xD1F4,
-	38452 - 11905: 0xD2F5,
-	38453 - 11905: 0xD5F3,
-	38454 - 11905: 0xBDD7,
-	38455 - 11905: 0xEA70,
-	38456 - 11905: 0xEA71,
-	38457 - 11905: 0xEA72,
-	38458 - 11905: 0xEA73,
-	38459 - 11905: 0xD7E8,
-	38460 - 11905: 0xDAE8,
-	38461 - 11905: 0xDAE7,
-	38462 - 11905: 0xEA74,
-	38463 - 11905: 0xB0A2,
-	38464 - 11905: 0xCDD3,
-	38465 - 11905: 0xEA75,
-	38466 - 11905: 0xDAE9,
-	38467 - 11905: 0xEA76,
-	38468 - 11905: 0xB8BD,
-	38469 - 11905: 0xBCCA,
-	38470 - 11905: 0xC2BD,
-	38471 - 11905: 0xC2A4,
-	38472 - 11905: 0xB3C2,
-	38473 - 11905: 0xDAEA,
-	38474 - 11905: 0xEA77,
-	38475 - 11905: 0xC2AA,
-	38476 - 11905: 0xC4B0,
-	38477 - 11905: 0xBDB5,
-	38478 - 11905: 0xEA78,
-	38479 - 11905: 0xEA79,
-	38480 - 11905: 0xCFDE,
-	38481 - 11905: 0xEA7A,
-	38482 - 11905: 0xEA7B,
-	38483 - 11905: 0xEA7C,
-	38484 - 11905: 0xDAEB,
-	38485 - 11905: 0xC9C2,
-	38486 - 11905: 0xEA7D,
-	38487 - 11905: 0xEA7E,
-	38488 - 11905: 0xEA80,
-	38489 - 11905: 0xEA81,
-	38490 - 11905: 0xEA82,
-	38491 - 11905: 0xB1DD,
-	38492 - 11905: 0xEA83,
-	38493 - 11905: 0xEA84,
-	38494 - 11905: 0xEA85,
-	38495 - 11905: 0xDAEC,
-	38496 - 11905: 0xEA86,
-	38497 - 11905: 0xB6B8,
-	38498 - 11905: 0xD4BA,
-	38499 - 11905: 0xEA87,
-	38500 - 11905: 0xB3FD,
-	38501 - 11905: 0xEA88,
-	38502 - 11905: 0xEA89,
-	38503 - 11905: 0xDAED,
-	38504 - 11905: 0xD4C9,
-	38505 - 11905: 0xCFD5,
-	38506 - 11905: 0xC5E3,
-	38507 - 11905: 0xEA8A,
-	38508 - 11905: 0xDAEE,
-	38509 - 11905: 0xEA8B,
-	38510 - 11905: 0xEA8C,
-	38511 - 11905: 0xEA8D,
-	38512 - 11905: 0xEA8E,
-	38513 - 11905: 0xEA8F,
-	38514 - 11905: 0xDAEF,
-	38515 - 11905: 0xEA90,
-	38516 - 11905: 0xDAF0,
-	38517 - 11905: 0xC1EA,
-	38518 - 11905: 0xCCD5,
-	38519 - 11905: 0xCFDD,
-	38520 - 11905: 0xEA91,
-	38521 - 11905: 0xEA92,
-	38522 - 11905: 0xEA93,
-	38523 - 11905: 0xEA94,
-	38524 - 11905: 0xEA95,
-	38525 - 11905: 0xEA96,
-	38526 - 11905: 0xEA97,
-	38527 - 11905: 0xEA98,
-	38528 - 11905: 0xEA99,
-	38529 - 11905: 0xEA9A,
-	38530 - 11905: 0xEA9B,
-	38531 - 11905: 0xEA9C,
-	38532 - 11905: 0xEA9D,
-	38533 - 11905: 0xD3E7,
-	38534 - 11905: 0xC2A1,
-	38535 - 11905: 0xEA9E,
-	38536 - 11905: 0xDAF1,
-	38537 - 11905: 0xEA9F,
-	38538 - 11905: 0xEAA0,
-	38539 - 11905: 0xCBE5,
-	38540 - 11905: 0xEB40,
-	38541 - 11905: 0xDAF2,
-	38542 - 11905: 0xEB41,
-	38543 - 11905: 0xCBE6,
-	38544 - 11905: 0xD2FE,
-	38545 - 11905: 0xEB42,
-	38546 - 11905: 0xEB43,
-	38547 - 11905: 0xEB44,
-	38548 - 11905: 0xB8F4,
-	38549 - 11905: 0xEB45,
-	38550 - 11905: 0xEB46,
-	38551 - 11905: 0xDAF3,
-	38552 - 11905: 0xB0AF,
-	38553 - 11905: 0xCFB6,
-	38554 - 11905: 0xEB47,
-	38555 - 11905: 0xEB48,
-	38556 - 11905: 0xD5CF,
-	38557 - 11905: 0xEB49,
-	38558 - 11905: 0xEB4A,
-	38559 - 11905: 0xEB4B,
-	38560 - 11905: 0xEB4C,
-	38561 - 11905: 0xEB4D,
-	38562 - 11905: 0xEB4E,
-	38563 - 11905: 0xEB4F,
-	38564 - 11905: 0xEB50,
-	38565 - 11905: 0xEB51,
-	38566 - 11905: 0xEB52,
-	38567 - 11905: 0xCBED,
-	38568 - 11905: 0xEB53,
-	38569 - 11905: 0xEB54,
-	38570 - 11905: 0xEB55,
-	38571 - 11905: 0xEB56,
-	38572 - 11905: 0xEB57,
-	38573 - 11905: 0xEB58,
-	38574 - 11905: 0xEB59,
-	38575 - 11905: 0xEB5A,
-	38576 - 11905: 0xDAF4,
-	38577 - 11905: 0xEB5B,
-	38578 - 11905: 0xEB5C,
-	38579 - 11905: 0xE3C4,
-	38580 - 11905: 0xEB5D,
-	38581 - 11905: 0xEB5E,
-	38582 - 11905: 0xC1A5,
-	38583 - 11905: 0xEB5F,
-	38584 - 11905: 0xEB60,
-	38585 - 11905: 0xF6BF,
-	38586 - 11905: 0xEB61,
-	38587 - 11905: 0xEB62,
-	38588 - 11905: 0xF6C0,
-	38589 - 11905: 0xF6C1,
-	38590 - 11905: 0xC4D1,
-	38591 - 11905: 0xEB63,
-	38592 - 11905: 0xC8B8,
-	38593 - 11905: 0xD1E3,
-	38594 - 11905: 0xEB64,
-	38595 - 11905: 0xEB65,
-	38596 - 11905: 0xD0DB,
-	38597 - 11905: 0xD1C5,
-	38598 - 11905: 0xBCAF,
-	38599 - 11905: 0xB9CD,
-	38600 - 11905: 0xEB66,
-	38601 - 11905: 0xEFF4,
-	38602 - 11905: 0xEB67,
-	38603 - 11905: 0xEB68,
-	38604 - 11905: 0xB4C6,
-	38605 - 11905: 0xD3BA,
-	38606 - 11905: 0xF6C2,
-	38607 - 11905: 0xB3FB,
-	38608 - 11905: 0xEB69,
-	38609 - 11905: 0xEB6A,
-	38610 - 11905: 0xF6C3,
-	38611 - 11905: 0xEB6B,
-	38612 - 11905: 0xEB6C,
-	38613 - 11905: 0xB5F1,
-	38614 - 11905: 0xEB6D,
-	38615 - 11905: 0xEB6E,
-	38616 - 11905: 0xEB6F,
-	38617 - 11905: 0xEB70,
-	38618 - 11905: 0xEB71,
-	38619 - 11905: 0xEB72,
-	38620 - 11905: 0xEB73,
-	38621 - 11905: 0xEB74,
-	38622 - 11905: 0xEB75,
-	38623 - 11905: 0xEB76,
-	38624 - 11905: 0xF6C5,
-	38625 - 11905: 0xEB77,
-	38626 - 11905: 0xEB78,
-	38627 - 11905: 0xEB79,
-	38628 - 11905: 0xEB7A,
-	38629 - 11905: 0xEB7B,
-	38630 - 11905: 0xEB7C,
-	38631 - 11905: 0xEB7D,
-	38632 - 11905: 0xD3EA,
-	38633 - 11905: 0xF6A7,
-	38634 - 11905: 0xD1A9,
-	38635 - 11905: 0xEB7E,
-	38636 - 11905: 0xEB80,
-	38637 - 11905: 0xEB81,
-	38638 - 11905: 0xEB82,
-	38639 - 11905: 0xF6A9,
-	38640 - 11905: 0xEB83,
-	38641 - 11905: 0xEB84,
-	38642 - 11905: 0xEB85,
-	38643 - 11905: 0xF6A8,
-	38644 - 11905: 0xEB86,
-	38645 - 11905: 0xEB87,
-	38646 - 11905: 0xC1E3,
-	38647 - 11905: 0xC0D7,
-	38648 - 11905: 0xEB88,
-	38649 - 11905: 0xB1A2,
-	38650 - 11905: 0xEB89,
-	38651 - 11905: 0xEB8A,
-	38652 - 11905: 0xEB8B,
-	38653 - 11905: 0xEB8C,
-	38654 - 11905: 0xCEED,
-	38655 - 11905: 0xEB8D,
-	38656 - 11905: 0xD0E8,
-	38657 - 11905: 0xF6AB,
-	38658 - 11905: 0xEB8E,
-	38659 - 11905: 0xEB8F,
-	38660 - 11905: 0xCFF6,
-	38661 - 11905: 0xEB90,
-	38662 - 11905: 0xF6AA,
-	38663 - 11905: 0xD5F0,
-	38664 - 11905: 0xF6AC,
-	38665 - 11905: 0xC3B9,
-	38666 - 11905: 0xEB91,
-	38667 - 11905: 0xEB92,
-	38668 - 11905: 0xEB93,
-	38669 - 11905: 0xBBF4,
-	38670 - 11905: 0xF6AE,
-	38671 - 11905: 0xF6AD,
-	38672 - 11905: 0xEB94,
-	38673 - 11905: 0xEB95,
-	38674 - 11905: 0xEB96,
-	38675 - 11905: 0xC4DE,
-	38676 - 11905: 0xEB97,
-	38677 - 11905: 0xEB98,
-	38678 - 11905: 0xC1D8,
-	38679 - 11905: 0xEB99,
-	38680 - 11905: 0xEB9A,
-	38681 - 11905: 0xEB9B,
-	38682 - 11905: 0xEB9C,
-	38683 - 11905: 0xEB9D,
-	38684 - 11905: 0xCBAA,
-	38685 - 11905: 0xEB9E,
-	38686 - 11905: 0xCFBC,
-	38687 - 11905: 0xEB9F,
-	38688 - 11905: 0xEBA0,
-	38689 - 11905: 0xEC40,
-	38690 - 11905: 0xEC41,
-	38691 - 11905: 0xEC42,
-	38692 - 11905: 0xEC43,
-	38693 - 11905: 0xEC44,
-	38694 - 11905: 0xEC45,
-	38695 - 11905: 0xEC46,
-	38696 - 11905: 0xEC47,
-	38697 - 11905: 0xEC48,
-	38698 - 11905: 0xF6AF,
-	38699 - 11905: 0xEC49,
-	38700 - 11905: 0xEC4A,
-	38701 - 11905: 0xF6B0,
-	38702 - 11905: 0xEC4B,
-	38703 - 11905: 0xEC4C,
-	38704 - 11905: 0xF6B1,
-	38705 - 11905: 0xEC4D,
-	38706 - 11905: 0xC2B6,
-	38707 - 11905: 0xEC4E,
-	38708 - 11905: 0xEC4F,
-	38709 - 11905: 0xEC50,
-	38710 - 11905: 0xEC51,
-	38711 - 11905: 0xEC52,
-	38712 - 11905: 0xB0D4,
-	38713 - 11905: 0xC5F9,
-	38714 - 11905: 0xEC53,
-	38715 - 11905: 0xEC54,
-	38716 - 11905: 0xEC55,
-	38717 - 11905: 0xEC56,
-	38718 - 11905: 0xF6B2,
-	38719 - 11905: 0xEC57,
-	38720 - 11905: 0xEC58,
-	38721 - 11905: 0xEC59,
-	38722 - 11905: 0xEC5A,
-	38723 - 11905: 0xEC5B,
-	38724 - 11905: 0xEC5C,
-	38725 - 11905: 0xEC5D,
-	38726 - 11905: 0xEC5E,
-	38727 - 11905: 0xEC5F,
-	38728 - 11905: 0xEC60,
-	38729 - 11905: 0xEC61,
-	38730 - 11905: 0xEC62,
-	38731 - 11905: 0xEC63,
-	38732 - 11905: 0xEC64,
-	38733 - 11905: 0xEC65,
-	38734 - 11905: 0xEC66,
-	38735 - 11905: 0xEC67,
-	38736 - 11905: 0xEC68,
-	38737 - 11905: 0xEC69,
-	38738 - 11905: 0xC7E0,
-	38739 - 11905: 0xF6A6,
-	38740 - 11905: 0xEC6A,
-	38741 - 11905: 0xEC6B,
-	38742 - 11905: 0xBEB8,
-	38743 - 11905: 0xEC6C,
-	38744 - 11905: 0xEC6D,
-	38745 - 11905: 0xBEB2,
-	38746 - 11905: 0xEC6E,
-	38747 - 11905: 0xB5E5,
-	38748 - 11905: 0xEC6F,
-	38749 - 11905: 0xEC70,
-	38750 - 11905: 0xB7C7,
-	38751 - 11905: 0xEC71,
-	38752 - 11905: 0xBFBF,
-	38753 - 11905: 0xC3D2,
-	38754 - 11905: 0xC3E6,
-	38755 - 11905: 0xEC72,
-	38756 - 11905: 0xEC73,
-	38757 - 11905: 0xD8CC,
-	38758 - 11905: 0xEC74,
-	38759 - 11905: 0xEC75,
-	38760 - 11905: 0xEC76,
-	38761 - 11905: 0xB8EF,
-	38762 - 11905: 0xEC77,
-	38763 - 11905: 0xEC78,
-	38764 - 11905: 0xEC79,
-	38765 - 11905: 0xEC7A,
-	38766 - 11905: 0xEC7B,
-	38767 - 11905: 0xEC7C,
-	38768 - 11905: 0xEC7D,
-	38769 - 11905: 0xEC7E,
-	38770 - 11905: 0xEC80,
-	38771 - 11905: 0xBDF9,
-	38772 - 11905: 0xD1A5,
-	38773 - 11905: 0xEC81,
-	38774 - 11905: 0xB0D0,
-	38775 - 11905: 0xEC82,
-	38776 - 11905: 0xEC83,
-	38777 - 11905: 0xEC84,
-	38778 - 11905: 0xEC85,
-	38779 - 11905: 0xEC86,
-	38780 - 11905: 0xF7B0,
-	38781 - 11905: 0xEC87,
-	38782 - 11905: 0xEC88,
-	38783 - 11905: 0xEC89,
-	38784 - 11905: 0xEC8A,
-	38785 - 11905: 0xEC8B,
-	38786 - 11905: 0xEC8C,
-	38787 - 11905: 0xEC8D,
-	38788 - 11905: 0xEC8E,
-	38789 - 11905: 0xF7B1,
-	38790 - 11905: 0xEC8F,
-	38791 - 11905: 0xEC90,
-	38792 - 11905: 0xEC91,
-	38793 - 11905: 0xEC92,
-	38794 - 11905: 0xEC93,
-	38795 - 11905: 0xD0AC,
-	38796 - 11905: 0xEC94,
-	38797 - 11905: 0xB0B0,
-	38798 - 11905: 0xEC95,
-	38799 - 11905: 0xEC96,
-	38800 - 11905: 0xEC97,
-	38801 - 11905: 0xF7B2,
-	38802 - 11905: 0xF7B3,
-	38803 - 11905: 0xEC98,
-	38804 - 11905: 0xF7B4,
-	38805 - 11905: 0xEC99,
-	38806 - 11905: 0xEC9A,
-	38807 - 11905: 0xEC9B,
-	38808 - 11905: 0xC7CA,
-	38809 - 11905: 0xEC9C,
-	38810 - 11905: 0xEC9D,
-	38811 - 11905: 0xEC9E,
-	38812 - 11905: 0xEC9F,
-	38813 - 11905: 0xECA0,
-	38814 - 11905: 0xED40,
-	38815 - 11905: 0xED41,
-	38816 - 11905: 0xBECF,
-	38817 - 11905: 0xED42,
-	38818 - 11905: 0xED43,
-	38819 - 11905: 0xF7B7,
-	38820 - 11905: 0xED44,
-	38821 - 11905: 0xED45,
-	38822 - 11905: 0xED46,
-	38823 - 11905: 0xED47,
-	38824 - 11905: 0xED48,
-	38825 - 11905: 0xED49,
-	38826 - 11905: 0xED4A,
-	38827 - 11905: 0xF7B6,
-	38828 - 11905: 0xED4B,
-	38829 - 11905: 0xB1DE,
-	38830 - 11905: 0xED4C,
-	38831 - 11905: 0xF7B5,
-	38832 - 11905: 0xED4D,
-	38833 - 11905: 0xED4E,
-	38834 - 11905: 0xF7B8,
-	38835 - 11905: 0xED4F,
-	38836 - 11905: 0xF7B9,
-	38837 - 11905: 0xED50,
-	38838 - 11905: 0xED51,
-	38839 - 11905: 0xED52,
-	38840 - 11905: 0xED53,
-	38841 - 11905: 0xED54,
-	38842 - 11905: 0xED55,
-	38843 - 11905: 0xED56,
-	38844 - 11905: 0xED57,
-	38845 - 11905: 0xED58,
-	38846 - 11905: 0xED59,
-	38847 - 11905: 0xED5A,
-	38848 - 11905: 0xED5B,
-	38849 - 11905: 0xED5C,
-	38850 - 11905: 0xED5D,
-	38851 - 11905: 0xED5E,
-	38852 - 11905: 0xED5F,
-	38853 - 11905: 0xED60,
-	38854 - 11905: 0xED61,
-	38855 - 11905: 0xED62,
-	38856 - 11905: 0xED63,
-	38857 - 11905: 0xED64,
-	38858 - 11905: 0xED65,
-	38859 - 11905: 0xED66,
-	38860 - 11905: 0xED67,
-	38861 - 11905: 0xED68,
-	38862 - 11905: 0xED69,
-	38863 - 11905: 0xED6A,
-	38864 - 11905: 0xED6B,
-	38865 - 11905: 0xED6C,
-	38866 - 11905: 0xED6D,
-	38867 - 11905: 0xED6E,
-	38868 - 11905: 0xED6F,
-	38869 - 11905: 0xED70,
-	38870 - 11905: 0xED71,
-	38871 - 11905: 0xED72,
-	38872 - 11905: 0xED73,
-	38873 - 11905: 0xED74,
-	38874 - 11905: 0xED75,
-	38875 - 11905: 0xED76,
-	38876 - 11905: 0xED77,
-	38877 - 11905: 0xED78,
-	38878 - 11905: 0xED79,
-	38879 - 11905: 0xED7A,
-	38880 - 11905: 0xED7B,
-	38881 - 11905: 0xED7C,
-	38882 - 11905: 0xED7D,
-	38883 - 11905: 0xED7E,
-	38884 - 11905: 0xED80,
-	38885 - 11905: 0xED81,
-	38886 - 11905: 0xCEA4,
-	38887 - 11905: 0xC8CD,
-	38888 - 11905: 0xED82,
-	38889 - 11905: 0xBAAB,
-	38890 - 11905: 0xE8B8,
-	38891 - 11905: 0xE8B9,
-	38892 - 11905: 0xE8BA,
-	38893 - 11905: 0xBEC2,
-	38894 - 11905: 0xED83,
-	38895 - 11905: 0xED84,
-	38896 - 11905: 0xED85,
-	38897 - 11905: 0xED86,
-	38898 - 11905: 0xED87,
-	38899 - 11905: 0xD2F4,
-	38900 - 11905: 0xED88,
-	38901 - 11905: 0xD4CF,
-	38902 - 11905: 0xC9D8,
-	38903 - 11905: 0xED89,
-	38904 - 11905: 0xED8A,
-	38905 - 11905: 0xED8B,
-	38906 - 11905: 0xED8C,
-	38907 - 11905: 0xED8D,
-	38908 - 11905: 0xED8E,
-	38909 - 11905: 0xED8F,
-	38910 - 11905: 0xED90,
-	38911 - 11905: 0xED91,
-	38912 - 11905: 0xED92,
-	38913 - 11905: 0xED93,
-	38914 - 11905: 0xED94,
-	38915 - 11905: 0xED95,
-	38916 - 11905: 0xED96,
-	38917 - 11905: 0xED97,
-	38918 - 11905: 0xED98,
-	38919 - 11905: 0xED99,
-	38920 - 11905: 0xED9A,
-	38921 - 11905: 0xED9B,
-	38922 - 11905: 0xED9C,
-	38923 - 11905: 0xED9D,
-	38924 - 11905: 0xED9E,
-	38925 - 11905: 0xED9F,
-	38926 - 11905: 0xEDA0,
-	38927 - 11905: 0xEE40,
-	38928 - 11905: 0xEE41,
-	38929 - 11905: 0xEE42,
-	38930 - 11905: 0xEE43,
-	38931 - 11905: 0xEE44,
-	38932 - 11905: 0xEE45,
-	38933 - 11905: 0xEE46,
-	38934 - 11905: 0xEE47,
-	38935 - 11905: 0xEE48,
-	38936 - 11905: 0xEE49,
-	38937 - 11905: 0xEE4A,
-	38938 - 11905: 0xEE4B,
-	38939 - 11905: 0xEE4C,
-	38940 - 11905: 0xEE4D,
-	38941 - 11905: 0xEE4E,
-	38942 - 11905: 0xEE4F,
-	38943 - 11905: 0xEE50,
-	38944 - 11905: 0xEE51,
-	38945 - 11905: 0xEE52,
-	38946 - 11905: 0xEE53,
-	38947 - 11905: 0xEE54,
-	38948 - 11905: 0xEE55,
-	38949 - 11905: 0xEE56,
-	38950 - 11905: 0xEE57,
-	38951 - 11905: 0xEE58,
-	38952 - 11905: 0xEE59,
-	38953 - 11905: 0xEE5A,
-	38954 - 11905: 0xEE5B,
-	38955 - 11905: 0xEE5C,
-	38956 - 11905: 0xEE5D,
-	38957 - 11905: 0xEE5E,
-	38958 - 11905: 0xEE5F,
-	38959 - 11905: 0xEE60,
-	38960 - 11905: 0xEE61,
-	38961 - 11905: 0xEE62,
-	38962 - 11905: 0xEE63,
-	38963 - 11905: 0xEE64,
-	38964 - 11905: 0xEE65,
-	38965 - 11905: 0xEE66,
-	38966 - 11905: 0xEE67,
-	38967 - 11905: 0xEE68,
-	38968 - 11905: 0xEE69,
-	38969 - 11905: 0xEE6A,
-	38970 - 11905: 0xEE6B,
-	38971 - 11905: 0xEE6C,
-	38972 - 11905: 0xEE6D,
-	38973 - 11905: 0xEE6E,
-	38974 - 11905: 0xEE6F,
-	38975 - 11905: 0xEE70,
-	38976 - 11905: 0xEE71,
-	38977 - 11905: 0xEE72,
-	38978 - 11905: 0xEE73,
-	38979 - 11905: 0xEE74,
-	38980 - 11905: 0xEE75,
-	38981 - 11905: 0xEE76,
-	38982 - 11905: 0xEE77,
-	38983 - 11905: 0xEE78,
-	38984 - 11905: 0xEE79,
-	38985 - 11905: 0xEE7A,
-	38986 - 11905: 0xEE7B,
-	38987 - 11905: 0xEE7C,
-	38988 - 11905: 0xEE7D,
-	38989 - 11905: 0xEE7E,
-	38990 - 11905: 0xEE80,
-	38991 - 11905: 0xEE81,
-	38992 - 11905: 0xEE82,
-	38993 - 11905: 0xEE83,
-	38994 - 11905: 0xEE84,
-	38995 - 11905: 0xEE85,
-	38996 - 11905: 0xEE86,
-	38997 - 11905: 0xEE87,
-	38998 - 11905: 0xEE88,
-	38999 - 11905: 0xEE89,
-	39000 - 11905: 0xEE8A,
-	39001 - 11905: 0xEE8B,
-	39002 - 11905: 0xEE8C,
-	39003 - 11905: 0xEE8D,
-	39004 - 11905: 0xEE8E,
-	39005 - 11905: 0xEE8F,
-	39006 - 11905: 0xEE90,
-	39007 - 11905: 0xEE91,
-	39008 - 11905: 0xEE92,
-	39009 - 11905: 0xEE93,
-	39010 - 11905: 0xEE94,
-	39011 - 11905: 0xEE95,
-	39012 - 11905: 0xEE96,
-	39013 - 11905: 0xEE97,
-	39014 - 11905: 0xEE98,
-	39015 - 11905: 0xEE99,
-	39016 - 11905: 0xEE9A,
-	39017 - 11905: 0xEE9B,
-	39018 - 11905: 0xEE9C,
-	39019 - 11905: 0xEE9D,
-	39020 - 11905: 0xEE9E,
-	39021 - 11905: 0xEE9F,
-	39022 - 11905: 0xEEA0,
-	39023 - 11905: 0xEF40,
-	39024 - 11905: 0xEF41,
-	39025 - 11905: 0xEF42,
-	39026 - 11905: 0xEF43,
-	39027 - 11905: 0xEF44,
-	39028 - 11905: 0xEF45,
-	39029 - 11905: 0xD2B3,
-	39030 - 11905: 0xB6A5,
-	39031 - 11905: 0xC7EA,
-	39032 - 11905: 0xF1FC,
-	39033 - 11905: 0xCFEE,
-	39034 - 11905: 0xCBB3,
-	39035 - 11905: 0xD0EB,
-	39036 - 11905: 0xE7EF,
-	39037 - 11905: 0xCDE7,
-	39038 - 11905: 0xB9CB,
-	39039 - 11905: 0xB6D9,
-	39040 - 11905: 0xF1FD,
-	39041 - 11905: 0xB0E4,
-	39042 - 11905: 0xCBCC,
-	39043 - 11905: 0xF1FE,
-	39044 - 11905: 0xD4A4,
-	39045 - 11905: 0xC2AD,
-	39046 - 11905: 0xC1EC,
-	39047 - 11905: 0xC6C4,
-	39048 - 11905: 0xBEB1,
-	39049 - 11905: 0xF2A1,
-	39050 - 11905: 0xBCD5,
-	39051 - 11905: 0xEF46,
-	39052 - 11905: 0xF2A2,
-	39053 - 11905: 0xF2A3,
-	39054 - 11905: 0xEF47,
-	39055 - 11905: 0xF2A4,
-	39056 - 11905: 0xD2C3,
-	39057 - 11905: 0xC6B5,
-	39058 - 11905: 0xEF48,
-	39059 - 11905: 0xCDC7,
-	39060 - 11905: 0xF2A5,
-	39061 - 11905: 0xEF49,
-	39062 - 11905: 0xD3B1,
-	39063 - 11905: 0xBFC5,
-	39064 - 11905: 0xCCE2,
-	39065 - 11905: 0xEF4A,
-	39066 - 11905: 0xF2A6,
-	39067 - 11905: 0xF2A7,
-	39068 - 11905: 0xD1D5,
-	39069 - 11905: 0xB6EE,
-	39070 - 11905: 0xF2A8,
-	39071 - 11905: 0xF2A9,
-	39072 - 11905: 0xB5DF,
-	39073 - 11905: 0xF2AA,
-	39074 - 11905: 0xF2AB,
-	39075 - 11905: 0xEF4B,
-	39076 - 11905: 0xB2FC,
-	39077 - 11905: 0xF2AC,
-	39078 - 11905: 0xF2AD,
-	39079 - 11905: 0xC8A7,
-	39080 - 11905: 0xEF4C,
-	39081 - 11905: 0xEF4D,
-	39082 - 11905: 0xEF4E,
-	39083 - 11905: 0xEF4F,
-	39084 - 11905: 0xEF50,
-	39085 - 11905: 0xEF51,
-	39086 - 11905: 0xEF52,
-	39087 - 11905: 0xEF53,
-	39088 - 11905: 0xEF54,
-	39089 - 11905: 0xEF55,
-	39090 - 11905: 0xEF56,
-	39091 - 11905: 0xEF57,
-	39092 - 11905: 0xEF58,
-	39093 - 11905: 0xEF59,
-	39094 - 11905: 0xEF5A,
-	39095 - 11905: 0xEF5B,
-	39096 - 11905: 0xEF5C,
-	39097 - 11905: 0xEF5D,
-	39098 - 11905: 0xEF5E,
-	39099 - 11905: 0xEF5F,
-	39100 - 11905: 0xEF60,
-	39101 - 11905: 0xEF61,
-	39102 - 11905: 0xEF62,
-	39103 - 11905: 0xEF63,
-	39104 - 11905: 0xEF64,
-	39105 - 11905: 0xEF65,
-	39106 - 11905: 0xEF66,
-	39107 - 11905: 0xEF67,
-	39108 - 11905: 0xEF68,
-	39109 - 11905: 0xEF69,
-	39110 - 11905: 0xEF6A,
-	39111 - 11905: 0xEF6B,
-	39112 - 11905: 0xEF6C,
-	39113 - 11905: 0xEF6D,
-	39114 - 11905: 0xEF6E,
-	39115 - 11905: 0xEF6F,
-	39116 - 11905: 0xEF70,
-	39117 - 11905: 0xEF71,
-	39118 - 11905: 0xB7E7,
-	39119 - 11905: 0xEF72,
-	39120 - 11905: 0xEF73,
-	39121 - 11905: 0xECA9,
-	39122 - 11905: 0xECAA,
-	39123 - 11905: 0xECAB,
-	39124 - 11905: 0xEF74,
-	39125 - 11905: 0xECAC,
-	39126 - 11905: 0xEF75,
-	39127 - 11905: 0xEF76,
-	39128 - 11905: 0xC6AE,
-	39129 - 11905: 0xECAD,
-	39130 - 11905: 0xECAE,
-	39131 - 11905: 0xEF77,
-	39132 - 11905: 0xEF78,
-	39133 - 11905: 0xEF79,
-	39134 - 11905: 0xB7C9,
-	39135 - 11905: 0xCAB3,
-	39136 - 11905: 0xEF7A,
-	39137 - 11905: 0xEF7B,
-	39138 - 11905: 0xEF7C,
-	39139 - 11905: 0xEF7D,
-	39140 - 11905: 0xEF7E,
-	39141 - 11905: 0xEF80,
-	39142 - 11905: 0xEF81,
-	39143 - 11905: 0xE2B8,
-	39144 - 11905: 0xF7CF,
-	39145 - 11905: 0xEF82,
-	39146 - 11905: 0xEF83,
-	39147 - 11905: 0xEF84,
-	39148 - 11905: 0xEF85,
-	39149 - 11905: 0xEF86,
-	39150 - 11905: 0xEF87,
-	39151 - 11905: 0xEF88,
-	39152 - 11905: 0xEF89,
-	39153 - 11905: 0xEF8A,
-	39154 - 11905: 0xEF8B,
-	39155 - 11905: 0xEF8C,
-	39156 - 11905: 0xEF8D,
-	39157 - 11905: 0xEF8E,
-	39158 - 11905: 0xEF8F,
-	39159 - 11905: 0xEF90,
-	39160 - 11905: 0xEF91,
-	39161 - 11905: 0xEF92,
-	39162 - 11905: 0xEF93,
-	39163 - 11905: 0xEF94,
-	39164 - 11905: 0xEF95,
-	39165 - 11905: 0xEF96,
-	39166 - 11905: 0xEF97,
-	39167 - 11905: 0xEF98,
-	39168 - 11905: 0xEF99,
-	39169 - 11905: 0xEF9A,
-	39170 - 11905: 0xEF9B,
-	39171 - 11905: 0xEF9C,
-	39172 - 11905: 0xEF9D,
-	39173 - 11905: 0xEF9E,
-	39174 - 11905: 0xEF9F,
-	39175 - 11905: 0xEFA0,
-	39176 - 11905: 0xF040,
-	39177 - 11905: 0xF041,
-	39178 - 11905: 0xF042,
-	39179 - 11905: 0xF043,
-	39180 - 11905: 0xF044,
-	39181 - 11905: 0xF7D0,
-	39182 - 11905: 0xF045,
-	39183 - 11905: 0xF046,
-	39184 - 11905: 0xB2CD,
-	39185 - 11905: 0xF047,
-	39186 - 11905: 0xF048,
-	39187 - 11905: 0xF049,
-	39188 - 11905: 0xF04A,
-	39189 - 11905: 0xF04B,
-	39190 - 11905: 0xF04C,
-	39191 - 11905: 0xF04D,
-	39192 - 11905: 0xF04E,
-	39193 - 11905: 0xF04F,
-	39194 - 11905: 0xF050,
-	39195 - 11905: 0xF051,
-	39196 - 11905: 0xF052,
-	39197 - 11905: 0xF053,
-	39198 - 11905: 0xF054,
-	39199 - 11905: 0xF055,
-	39200 - 11905: 0xF056,
-	39201 - 11905: 0xF057,
-	39202 - 11905: 0xF058,
-	39203 - 11905: 0xF059,
-	39204 - 11905: 0xF05A,
-	39205 - 11905: 0xF05B,
-	39206 - 11905: 0xF05C,
-	39207 - 11905: 0xF05D,
-	39208 - 11905: 0xF05E,
-	39209 - 11905: 0xF05F,
-	39210 - 11905: 0xF060,
-	39211 - 11905: 0xF061,
-	39212 - 11905: 0xF062,
-	39213 - 11905: 0xF063,
-	39214 - 11905: 0xF7D1,
-	39215 - 11905: 0xF064,
-	39216 - 11905: 0xF065,
-	39217 - 11905: 0xF066,
-	39218 - 11905: 0xF067,
-	39219 - 11905: 0xF068,
-	39220 - 11905: 0xF069,
-	39221 - 11905: 0xF06A,
-	39222 - 11905: 0xF06B,
-	39223 - 11905: 0xF06C,
-	39224 - 11905: 0xF06D,
-	39225 - 11905: 0xF06E,
-	39226 - 11905: 0xF06F,
-	39227 - 11905: 0xF070,
-	39228 - 11905: 0xF071,
-	39229 - 11905: 0xF072,
-	39230 - 11905: 0xF073,
-	39231 - 11905: 0xF074,
-	39232 - 11905: 0xF075,
-	39233 - 11905: 0xF076,
-	39234 - 11905: 0xF077,
-	39235 - 11905: 0xF078,
-	39236 - 11905: 0xF079,
-	39237 - 11905: 0xF07A,
-	39238 - 11905: 0xF07B,
-	39239 - 11905: 0xF07C,
-	39240 - 11905: 0xF07D,
-	39241 - 11905: 0xF07E,
-	39242 - 11905: 0xF080,
-	39243 - 11905: 0xF081,
-	39244 - 11905: 0xF082,
-	39245 - 11905: 0xF083,
-	39246 - 11905: 0xF084,
-	39247 - 11905: 0xF085,
-	39248 - 11905: 0xF086,
-	39249 - 11905: 0xF087,
-	39250 - 11905: 0xF088,
-	39251 - 11905: 0xF089,
-	39252 - 11905: 0xF7D3,
-	39253 - 11905: 0xF7D2,
-	39254 - 11905: 0xF08A,
-	39255 - 11905: 0xF08B,
-	39256 - 11905: 0xF08C,
-	39257 - 11905: 0xF08D,
-	39258 - 11905: 0xF08E,
-	39259 - 11905: 0xF08F,
-	39260 - 11905: 0xF090,
-	39261 - 11905: 0xF091,
-	39262 - 11905: 0xF092,
-	39263 - 11905: 0xF093,
-	39264 - 11905: 0xF094,
-	39265 - 11905: 0xF095,
-	39266 - 11905: 0xF096,
-	39267 - 11905: 0xE2BB,
-	39268 - 11905: 0xF097,
-	39269 - 11905: 0xBCA2,
-	39270 - 11905: 0xF098,
-	39271 - 11905: 0xE2BC,
-	39272 - 11905: 0xE2BD,
-	39273 - 11905: 0xE2BE,
-	39274 - 11905: 0xE2BF,
-	39275 - 11905: 0xE2C0,
-	39276 - 11905: 0xE2C1,
-	39277 - 11905: 0xB7B9,
-	39278 - 11905: 0xD2FB,
-	39279 - 11905: 0xBDA4,
-	39280 - 11905: 0xCACE,
-	39281 - 11905: 0xB1A5,
-	39282 - 11905: 0xCBC7,
-	39283 - 11905: 0xF099,
-	39284 - 11905: 0xE2C2,
-	39285 - 11905: 0xB6FC,
-	39286 - 11905: 0xC8C4,
-	39287 - 11905: 0xE2C3,
-	39288 - 11905: 0xF09A,
-	39289 - 11905: 0xF09B,
-	39290 - 11905: 0xBDC8,
-	39291 - 11905: 0xF09C,
-	39292 - 11905: 0xB1FD,
-	39293 - 11905: 0xE2C4,
-	39294 - 11905: 0xF09D,
-	39295 - 11905: 0xB6F6,
-	39296 - 11905: 0xE2C5,
-	39297 - 11905: 0xC4D9,
-	39298 - 11905: 0xF09E,
-	39299 - 11905: 0xF09F,
-	39300 - 11905: 0xE2C6,
-	39301 - 11905: 0xCFDA,
-	39302 - 11905: 0xB9DD,
-	39303 - 11905: 0xE2C7,
-	39304 - 11905: 0xC0A1,
-	39305 - 11905: 0xF0A0,
-	39306 - 11905: 0xE2C8,
-	39307 - 11905: 0xB2F6,
-	39308 - 11905: 0xF140,
-	39309 - 11905: 0xE2C9,
-	39310 - 11905: 0xF141,
-	39311 - 11905: 0xC1F3,
-	39312 - 11905: 0xE2CA,
-	39313 - 11905: 0xE2CB,
-	39314 - 11905: 0xC2F8,
-	39315 - 11905: 0xE2CC,
-	39316 - 11905: 0xE2CD,
-	39317 - 11905: 0xE2CE,
-	39318 - 11905: 0xCAD7,
-	39319 - 11905: 0xD8B8,
-	39320 - 11905: 0xD9E5,
-	39321 - 11905: 0xCFE3,
-	39322 - 11905: 0xF142,
-	39323 - 11905: 0xF143,
-	39324 - 11905: 0xF144,
-	39325 - 11905: 0xF145,
-	39326 - 11905: 0xF146,
-	39327 - 11905: 0xF147,
-	39328 - 11905: 0xF148,
-	39329 - 11905: 0xF149,
-	39330 - 11905: 0xF14A,
-	39331 - 11905: 0xF14B,
-	39332 - 11905: 0xF14C,
-	39333 - 11905: 0xF0A5,
-	39334 - 11905: 0xF14D,
-	39335 - 11905: 0xF14E,
-	39336 - 11905: 0xDCB0,
-	39337 - 11905: 0xF14F,
-	39338 - 11905: 0xF150,
-	39339 - 11905: 0xF151,
-	39340 - 11905: 0xF152,
-	39341 - 11905: 0xF153,
-	39342 - 11905: 0xF154,
-	39343 - 11905: 0xF155,
-	39344 - 11905: 0xF156,
-	39345 - 11905: 0xF157,
-	39346 - 11905: 0xF158,
-	39347 - 11905: 0xF159,
-	39348 - 11905: 0xF15A,
-	39349 - 11905: 0xF15B,
-	39350 - 11905: 0xF15C,
-	39351 - 11905: 0xF15D,
-	39352 - 11905: 0xF15E,
-	39353 - 11905: 0xF15F,
-	39354 - 11905: 0xF160,
-	39355 - 11905: 0xF161,
-	39356 - 11905: 0xF162,
-	39357 - 11905: 0xF163,
-	39358 - 11905: 0xF164,
-	39359 - 11905: 0xF165,
-	39360 - 11905: 0xF166,
-	39361 - 11905: 0xF167,
-	39362 - 11905: 0xF168,
-	39363 - 11905: 0xF169,
-	39364 - 11905: 0xF16A,
-	39365 - 11905: 0xF16B,
-	39366 - 11905: 0xF16C,
-	39367 - 11905: 0xF16D,
-	39368 - 11905: 0xF16E,
-	39369 - 11905: 0xF16F,
-	39370 - 11905: 0xF170,
-	39371 - 11905: 0xF171,
-	39372 - 11905: 0xF172,
-	39373 - 11905: 0xF173,
-	39374 - 11905: 0xF174,
-	39375 - 11905: 0xF175,
-	39376 - 11905: 0xF176,
-	39377 - 11905: 0xF177,
-	39378 - 11905: 0xF178,
-	39379 - 11905: 0xF179,
-	39380 - 11905: 0xF17A,
-	39381 - 11905: 0xF17B,
-	39382 - 11905: 0xF17C,
-	39383 - 11905: 0xF17D,
-	39384 - 11905: 0xF17E,
-	39385 - 11905: 0xF180,
-	39386 - 11905: 0xF181,
-	39387 - 11905: 0xF182,
-	39388 - 11905: 0xF183,
-	39389 - 11905: 0xF184,
-	39390 - 11905: 0xF185,
-	39391 - 11905: 0xF186,
-	39392 - 11905: 0xF187,
-	39393 - 11905: 0xF188,
-	39394 - 11905: 0xF189,
-	39395 - 11905: 0xF18A,
-	39396 - 11905: 0xF18B,
-	39397 - 11905: 0xF18C,
-	39398 - 11905: 0xF18D,
-	39399 - 11905: 0xF18E,
-	39400 - 11905: 0xF18F,
-	39401 - 11905: 0xF190,
-	39402 - 11905: 0xF191,
-	39403 - 11905: 0xF192,
-	39404 - 11905: 0xF193,
-	39405 - 11905: 0xF194,
-	39406 - 11905: 0xF195,
-	39407 - 11905: 0xF196,
-	39408 - 11905: 0xF197,
-	39409 - 11905: 0xF198,
-	39410 - 11905: 0xF199,
-	39411 - 11905: 0xF19A,
-	39412 - 11905: 0xF19B,
-	39413 - 11905: 0xF19C,
-	39414 - 11905: 0xF19D,
-	39415 - 11905: 0xF19E,
-	39416 - 11905: 0xF19F,
-	39417 - 11905: 0xF1A0,
-	39418 - 11905: 0xF240,
-	39419 - 11905: 0xF241,
-	39420 - 11905: 0xF242,
-	39421 - 11905: 0xF243,
-	39422 - 11905: 0xF244,
-	39423 - 11905: 0xF245,
-	39424 - 11905: 0xF246,
-	39425 - 11905: 0xF247,
-	39426 - 11905: 0xF248,
-	39427 - 11905: 0xF249,
-	39428 - 11905: 0xF24A,
-	39429 - 11905: 0xF24B,
-	39430 - 11905: 0xF24C,
-	39431 - 11905: 0xF24D,
-	39432 - 11905: 0xF24E,
-	39433 - 11905: 0xF24F,
-	39434 - 11905: 0xF250,
-	39435 - 11905: 0xF251,
-	39436 - 11905: 0xF252,
-	39437 - 11905: 0xF253,
-	39438 - 11905: 0xF254,
-	39439 - 11905: 0xF255,
-	39440 - 11905: 0xF256,
-	39441 - 11905: 0xF257,
-	39442 - 11905: 0xF258,
-	39443 - 11905: 0xF259,
-	39444 - 11905: 0xF25A,
-	39445 - 11905: 0xF25B,
-	39446 - 11905: 0xF25C,
-	39447 - 11905: 0xF25D,
-	39448 - 11905: 0xF25E,
-	39449 - 11905: 0xF25F,
-	39450 - 11905: 0xF260,
-	39451 - 11905: 0xF261,
-	39452 - 11905: 0xF262,
-	39453 - 11905: 0xF263,
-	39454 - 11905: 0xF264,
-	39455 - 11905: 0xF265,
-	39456 - 11905: 0xF266,
-	39457 - 11905: 0xF267,
-	39458 - 11905: 0xF268,
-	39459 - 11905: 0xF269,
-	39460 - 11905: 0xF26A,
-	39461 - 11905: 0xF26B,
-	39462 - 11905: 0xF26C,
-	39463 - 11905: 0xF26D,
-	39464 - 11905: 0xF26E,
-	39465 - 11905: 0xF26F,
-	39466 - 11905: 0xF270,
-	39467 - 11905: 0xF271,
-	39468 - 11905: 0xF272,
-	39469 - 11905: 0xF273,
-	39470 - 11905: 0xF274,
-	39471 - 11905: 0xF275,
-	39472 - 11905: 0xF276,
-	39473 - 11905: 0xF277,
-	39474 - 11905: 0xF278,
-	39475 - 11905: 0xF279,
-	39476 - 11905: 0xF27A,
-	39477 - 11905: 0xF27B,
-	39478 - 11905: 0xF27C,
-	39479 - 11905: 0xF27D,
-	39480 - 11905: 0xF27E,
-	39481 - 11905: 0xF280,
-	39482 - 11905: 0xF281,
-	39483 - 11905: 0xF282,
-	39484 - 11905: 0xF283,
-	39485 - 11905: 0xF284,
-	39486 - 11905: 0xF285,
-	39487 - 11905: 0xF286,
-	39488 - 11905: 0xF287,
-	39489 - 11905: 0xF288,
-	39490 - 11905: 0xF289,
-	39491 - 11905: 0xF28A,
-	39492 - 11905: 0xF28B,
-	39493 - 11905: 0xF28C,
-	39494 - 11905: 0xF28D,
-	39495 - 11905: 0xF28E,
-	39496 - 11905: 0xF28F,
-	39497 - 11905: 0xF290,
-	39498 - 11905: 0xF291,
-	39499 - 11905: 0xF292,
-	39500 - 11905: 0xF293,
-	39501 - 11905: 0xF294,
-	39502 - 11905: 0xF295,
-	39503 - 11905: 0xF296,
-	39504 - 11905: 0xF297,
-	39505 - 11905: 0xF298,
-	39506 - 11905: 0xF299,
-	39507 - 11905: 0xF29A,
-	39508 - 11905: 0xF29B,
-	39509 - 11905: 0xF29C,
-	39510 - 11905: 0xF29D,
-	39511 - 11905: 0xF29E,
-	39512 - 11905: 0xF29F,
-	39513 - 11905: 0xF2A0,
-	39514 - 11905: 0xF340,
-	39515 - 11905: 0xF341,
-	39516 - 11905: 0xF342,
-	39517 - 11905: 0xF343,
-	39518 - 11905: 0xF344,
-	39519 - 11905: 0xF345,
-	39520 - 11905: 0xF346,
-	39521 - 11905: 0xF347,
-	39522 - 11905: 0xF348,
-	39523 - 11905: 0xF349,
-	39524 - 11905: 0xF34A,
-	39525 - 11905: 0xF34B,
-	39526 - 11905: 0xF34C,
-	39527 - 11905: 0xF34D,
-	39528 - 11905: 0xF34E,
-	39529 - 11905: 0xF34F,
-	39530 - 11905: 0xF350,
-	39531 - 11905: 0xF351,
-	39532 - 11905: 0xC2ED,
-	39533 - 11905: 0xD4A6,
-	39534 - 11905: 0xCDD4,
-	39535 - 11905: 0xD1B1,
-	39536 - 11905: 0xB3DB,
-	39537 - 11905: 0xC7FD,
-	39538 - 11905: 0xF352,
-	39539 - 11905: 0xB2B5,
-	39540 - 11905: 0xC2BF,
-	39541 - 11905: 0xE6E0,
-	39542 - 11905: 0xCABB,
-	39543 - 11905: 0xE6E1,
-	39544 - 11905: 0xE6E2,
-	39545 - 11905: 0xBED4,
-	39546 - 11905: 0xE6E3,
-	39547 - 11905: 0xD7A4,
-	39548 - 11905: 0xCDD5,
-	39549 - 11905: 0xE6E5,
-	39550 - 11905: 0xBCDD,
-	39551 - 11905: 0xE6E4,
-	39552 - 11905: 0xE6E6,
-	39553 - 11905: 0xE6E7,
-	39554 - 11905: 0xC2EE,
-	39555 - 11905: 0xF353,
-	39556 - 11905: 0xBDBE,
-	39557 - 11905: 0xE6E8,
-	39558 - 11905: 0xC2E6,
-	39559 - 11905: 0xBAA7,
-	39560 - 11905: 0xE6E9,
-	39561 - 11905: 0xF354,
-	39562 - 11905: 0xE6EA,
-	39563 - 11905: 0xB3D2,
-	39564 - 11905: 0xD1E9,
-	39565 - 11905: 0xF355,
-	39566 - 11905: 0xF356,
-	39567 - 11905: 0xBFA5,
-	39568 - 11905: 0xE6EB,
-	39569 - 11905: 0xC6EF,
-	39570 - 11905: 0xE6EC,
-	39571 - 11905: 0xE6ED,
-	39572 - 11905: 0xF357,
-	39573 - 11905: 0xF358,
-	39574 - 11905: 0xE6EE,
-	39575 - 11905: 0xC6AD,
-	39576 - 11905: 0xE6EF,
-	39577 - 11905: 0xF359,
-	39578 - 11905: 0xC9A7,
-	39579 - 11905: 0xE6F0,
-	39580 - 11905: 0xE6F1,
-	39581 - 11905: 0xE6F2,
-	39582 - 11905: 0xE5B9,
-	39583 - 11905: 0xE6F3,
-	39584 - 11905: 0xE6F4,
-	39585 - 11905: 0xC2E2,
-	39586 - 11905: 0xE6F5,
-	39587 - 11905: 0xE6F6,
-	39588 - 11905: 0xD6E8,
-	39589 - 11905: 0xE6F7,
-	39590 - 11905: 0xF35A,
-	39591 - 11905: 0xE6F8,
-	39592 - 11905: 0xB9C7,
-	39593 - 11905: 0xF35B,
-	39594 - 11905: 0xF35C,
-	39595 - 11905: 0xF35D,
-	39596 - 11905: 0xF35E,
-	39597 - 11905: 0xF35F,
-	39598 - 11905: 0xF360,
-	39599 - 11905: 0xF361,
-	39600 - 11905: 0xF7BB,
-	39601 - 11905: 0xF7BA,
-	39602 - 11905: 0xF362,
-	39603 - 11905: 0xF363,
-	39604 - 11905: 0xF364,
-	39605 - 11905: 0xF365,
-	39606 - 11905: 0xF7BE,
-	39607 - 11905: 0xF7BC,
-	39608 - 11905: 0xBAA1,
-	39609 - 11905: 0xF366,
-	39610 - 11905: 0xF7BF,
-	39611 - 11905: 0xF367,
-	39612 - 11905: 0xF7C0,
-	39613 - 11905: 0xF368,
-	39614 - 11905: 0xF369,
-	39615 - 11905: 0xF36A,
-	39616 - 11905: 0xF7C2,
-	39617 - 11905: 0xF7C1,
-	39618 - 11905: 0xF7C4,
-	39619 - 11905: 0xF36B,
-	39620 - 11905: 0xF36C,
-	39621 - 11905: 0xF7C3,
-	39622 - 11905: 0xF36D,
-	39623 - 11905: 0xF36E,
-	39624 - 11905: 0xF36F,
-	39625 - 11905: 0xF370,
-	39626 - 11905: 0xF371,
-	39627 - 11905: 0xF7C5,
-	39628 - 11905: 0xF7C6,
-	39629 - 11905: 0xF372,
-	39630 - 11905: 0xF373,
-	39631 - 11905: 0xF374,
-	39632 - 11905: 0xF375,
-	39633 - 11905: 0xF7C7,
-	39634 - 11905: 0xF376,
-	39635 - 11905: 0xCBE8,
-	39636 - 11905: 0xF377,
-	39637 - 11905: 0xF378,
-	39638 - 11905: 0xF379,
-	39639 - 11905: 0xF37A,
-	39640 - 11905: 0xB8DF,
-	39641 - 11905: 0xF37B,
-	39642 - 11905: 0xF37C,
-	39643 - 11905: 0xF37D,
-	39644 - 11905: 0xF37E,
-	39645 - 11905: 0xF380,
-	39646 - 11905: 0xF381,
-	39647 - 11905: 0xF7D4,
-	39648 - 11905: 0xF382,
-	39649 - 11905: 0xF7D5,
-	39650 - 11905: 0xF383,
-	39651 - 11905: 0xF384,
-	39652 - 11905: 0xF385,
-	39653 - 11905: 0xF386,
-	39654 - 11905: 0xF7D6,
-	39655 - 11905: 0xF387,
-	39656 - 11905: 0xF388,
-	39657 - 11905: 0xF389,
-	39658 - 11905: 0xF38A,
-	39659 - 11905: 0xF7D8,
-	39660 - 11905: 0xF38B,
-	39661 - 11905: 0xF7DA,
-	39662 - 11905: 0xF38C,
-	39663 - 11905: 0xF7D7,
-	39664 - 11905: 0xF38D,
-	39665 - 11905: 0xF38E,
-	39666 - 11905: 0xF38F,
-	39667 - 11905: 0xF390,
-	39668 - 11905: 0xF391,
-	39669 - 11905: 0xF392,
-	39670 - 11905: 0xF393,
-	39671 - 11905: 0xF394,
-	39672 - 11905: 0xF395,
-	39673 - 11905: 0xF7DB,
-	39674 - 11905: 0xF396,
-	39675 - 11905: 0xF7D9,
-	39676 - 11905: 0xF397,
-	39677 - 11905: 0xF398,
-	39678 - 11905: 0xF399,
-	39679 - 11905: 0xF39A,
-	39680 - 11905: 0xF39B,
-	39681 - 11905: 0xF39C,
-	39682 - 11905: 0xF39D,
-	39683 - 11905: 0xD7D7,
-	39684 - 11905: 0xF39E,
-	39685 - 11905: 0xF39F,
-	39686 - 11905: 0xF3A0,
-	39687 - 11905: 0xF440,
-	39688 - 11905: 0xF7DC,
-	39689 - 11905: 0xF441,
-	39690 - 11905: 0xF442,
-	39691 - 11905: 0xF443,
-	39692 - 11905: 0xF444,
-	39693 - 11905: 0xF445,
-	39694 - 11905: 0xF446,
-	39695 - 11905: 0xF7DD,
-	39696 - 11905: 0xF447,
-	39697 - 11905: 0xF448,
-	39698 - 11905: 0xF449,
-	39699 - 11905: 0xF7DE,
-	39700 - 11905: 0xF44A,
-	39701 - 11905: 0xF44B,
-	39702 - 11905: 0xF44C,
-	39703 - 11905: 0xF44D,
-	39704 - 11905: 0xF44E,
-	39705 - 11905: 0xF44F,
-	39706 - 11905: 0xF450,
-	39707 - 11905: 0xF451,
-	39708 - 11905: 0xF452,
-	39709 - 11905: 0xF453,
-	39710 - 11905: 0xF454,
-	39711 - 11905: 0xF7DF,
-	39712 - 11905: 0xF455,
-	39713 - 11905: 0xF456,
-	39714 - 11905: 0xF457,
-	39715 - 11905: 0xF7E0,
-	39716 - 11905: 0xF458,
-	39717 - 11905: 0xF459,
-	39718 - 11905: 0xF45A,
-	39719 - 11905: 0xF45B,
-	39720 - 11905: 0xF45C,
-	39721 - 11905: 0xF45D,
-	39722 - 11905: 0xF45E,
-	39723 - 11905: 0xF45F,
-	39724 - 11905: 0xF460,
-	39725 - 11905: 0xF461,
-	39726 - 11905: 0xF462,
-	39727 - 11905: 0xDBCB,
-	39728 - 11905: 0xF463,
-	39729 - 11905: 0xF464,
-	39730 - 11905: 0xD8AA,
-	39731 - 11905: 0xF465,
-	39732 - 11905: 0xF466,
-	39733 - 11905: 0xF467,
-	39734 - 11905: 0xF468,
-	39735 - 11905: 0xF469,
-	39736 - 11905: 0xF46A,
-	39737 - 11905: 0xF46B,
-	39738 - 11905: 0xF46C,
-	39739 - 11905: 0xE5F7,
-	39740 - 11905: 0xB9ED,
-	39741 - 11905: 0xF46D,
-	39742 - 11905: 0xF46E,
-	39743 - 11905: 0xF46F,
-	39744 - 11905: 0xF470,
-	39745 - 11905: 0xBFFD,
-	39746 - 11905: 0xBBEA,
-	39747 - 11905: 0xF7C9,
-	39748 - 11905: 0xC6C7,
-	39749 - 11905: 0xF7C8,
-	39750 - 11905: 0xF471,
-	39751 - 11905: 0xF7CA,
-	39752 - 11905: 0xF7CC,
-	39753 - 11905: 0xF7CB,
-	39754 - 11905: 0xF472,
-	39755 - 11905: 0xF473,
-	39756 - 11905: 0xF474,
-	39757 - 11905: 0xF7CD,
-	39758 - 11905: 0xF475,
-	39759 - 11905: 0xCEBA,
-	39760 - 11905: 0xF476,
-	39761 - 11905: 0xF7CE,
-	39762 - 11905: 0xF477,
-	39763 - 11905: 0xF478,
-	39764 - 11905: 0xC4A7,
-	39765 - 11905: 0xF479,
-	39766 - 11905: 0xF47A,
-	39767 - 11905: 0xF47B,
-	39768 - 11905: 0xF47C,
-	39769 - 11905: 0xF47D,
-	39770 - 11905: 0xF47E,
-	39771 - 11905: 0xF480,
-	39772 - 11905: 0xF481,
-	39773 - 11905: 0xF482,
-	39774 - 11905: 0xF483,
-	39775 - 11905: 0xF484,
-	39776 - 11905: 0xF485,
-	39777 - 11905: 0xF486,
-	39778 - 11905: 0xF487,
-	39779 - 11905: 0xF488,
-	39780 - 11905: 0xF489,
-	39781 - 11905: 0xF48A,
-	39782 - 11905: 0xF48B,
-	39783 - 11905: 0xF48C,
-	39784 - 11905: 0xF48D,
-	39785 - 11905: 0xF48E,
-	39786 - 11905: 0xF48F,
-	39787 - 11905: 0xF490,
-	39788 - 11905: 0xF491,
-	39789 - 11905: 0xF492,
-	39790 - 11905: 0xF493,
-	39791 - 11905: 0xF494,
-	39792 - 11905: 0xF495,
-	39793 - 11905: 0xF496,
-	39794 - 11905: 0xF497,
-	39795 - 11905: 0xF498,
-	39796 - 11905: 0xF499,
-	39797 - 11905: 0xF49A,
-	39798 - 11905: 0xF49B,
-	39799 - 11905: 0xF49C,
-	39800 - 11905: 0xF49D,
-	39801 - 11905: 0xF49E,
-	39802 - 11905: 0xF49F,
-	39803 - 11905: 0xF4A0,
-	39804 - 11905: 0xF540,
-	39805 - 11905: 0xF541,
-	39806 - 11905: 0xF542,
-	39807 - 11905: 0xF543,
-	39808 - 11905: 0xF544,
-	39809 - 11905: 0xF545,
-	39810 - 11905: 0xF546,
-	39811 - 11905: 0xF547,
-	39812 - 11905: 0xF548,
-	39813 - 11905: 0xF549,
-	39814 - 11905: 0xF54A,
-	39815 - 11905: 0xF54B,
-	39816 - 11905: 0xF54C,
-	39817 - 11905: 0xF54D,
-	39818 - 11905: 0xF54E,
-	39819 - 11905: 0xF54F,
-	39820 - 11905: 0xF550,
-	39821 - 11905: 0xF551,
-	39822 - 11905: 0xF552,
-	39823 - 11905: 0xF553,
-	39824 - 11905: 0xF554,
-	39825 - 11905: 0xF555,
-	39826 - 11905: 0xF556,
-	39827 - 11905: 0xF557,
-	39828 - 11905: 0xF558,
-	39829 - 11905: 0xF559,
-	39830 - 11905: 0xF55A,
-	39831 - 11905: 0xF55B,
-	39832 - 11905: 0xF55C,
-	39833 - 11905: 0xF55D,
-	39834 - 11905: 0xF55E,
-	39835 - 11905: 0xF55F,
-	39836 - 11905: 0xF560,
-	39837 - 11905: 0xF561,
-	39838 - 11905: 0xF562,
-	39839 - 11905: 0xF563,
-	39840 - 11905: 0xF564,
-	39841 - 11905: 0xF565,
-	39842 - 11905: 0xF566,
-	39843 - 11905: 0xF567,
-	39844 - 11905: 0xF568,
-	39845 - 11905: 0xF569,
-	39846 - 11905: 0xF56A,
-	39847 - 11905: 0xF56B,
-	39848 - 11905: 0xF56C,
-	39849 - 11905: 0xF56D,
-	39850 - 11905: 0xF56E,
-	39851 - 11905: 0xF56F,
-	39852 - 11905: 0xF570,
-	39853 - 11905: 0xF571,
-	39854 - 11905: 0xF572,
-	39855 - 11905: 0xF573,
-	39856 - 11905: 0xF574,
-	39857 - 11905: 0xF575,
-	39858 - 11905: 0xF576,
-	39859 - 11905: 0xF577,
-	39860 - 11905: 0xF578,
-	39861 - 11905: 0xF579,
-	39862 - 11905: 0xF57A,
-	39863 - 11905: 0xF57B,
-	39864 - 11905: 0xF57C,
-	39865 - 11905: 0xF57D,
-	39866 - 11905: 0xF57E,
-	39867 - 11905: 0xF580,
-	39868 - 11905: 0xF581,
-	39869 - 11905: 0xF582,
-	39870 - 11905: 0xF583,
-	39871 - 11905: 0xF584,
-	39872 - 11905: 0xF585,
-	39873 - 11905: 0xF586,
-	39874 - 11905: 0xF587,
-	39875 - 11905: 0xF588,
-	39876 - 11905: 0xF589,
-	39877 - 11905: 0xF58A,
-	39878 - 11905: 0xF58B,
-	39879 - 11905: 0xF58C,
-	39880 - 11905: 0xF58D,
-	39881 - 11905: 0xF58E,
-	39882 - 11905: 0xF58F,
-	39883 - 11905: 0xF590,
-	39884 - 11905: 0xF591,
-	39885 - 11905: 0xF592,
-	39886 - 11905: 0xF593,
-	39887 - 11905: 0xF594,
-	39888 - 11905: 0xF595,
-	39889 - 11905: 0xF596,
-	39890 - 11905: 0xF597,
-	39891 - 11905: 0xF598,
-	39892 - 11905: 0xF599,
-	39893 - 11905: 0xF59A,
-	39894 - 11905: 0xF59B,
-	39895 - 11905: 0xF59C,
-	39896 - 11905: 0xF59D,
-	39897 - 11905: 0xF59E,
-	39898 - 11905: 0xF59F,
-	39899 - 11905: 0xF5A0,
-	39900 - 11905: 0xF640,
-	39901 - 11905: 0xF641,
-	39902 - 11905: 0xF642,
-	39903 - 11905: 0xF643,
-	39904 - 11905: 0xF644,
-	39905 - 11905: 0xF645,
-	39906 - 11905: 0xF646,
-	39907 - 11905: 0xF647,
-	39908 - 11905: 0xF648,
-	39909 - 11905: 0xF649,
-	39910 - 11905: 0xF64A,
-	39911 - 11905: 0xF64B,
-	39912 - 11905: 0xF64C,
-	39913 - 11905: 0xF64D,
-	39914 - 11905: 0xF64E,
-	39915 - 11905: 0xF64F,
-	39916 - 11905: 0xF650,
-	39917 - 11905: 0xF651,
-	39918 - 11905: 0xF652,
-	39919 - 11905: 0xF653,
-	39920 - 11905: 0xF654,
-	39921 - 11905: 0xF655,
-	39922 - 11905: 0xF656,
-	39923 - 11905: 0xF657,
-	39924 - 11905: 0xF658,
-	39925 - 11905: 0xF659,
-	39926 - 11905: 0xF65A,
-	39927 - 11905: 0xF65B,
-	39928 - 11905: 0xF65C,
-	39929 - 11905: 0xF65D,
-	39930 - 11905: 0xF65E,
-	39931 - 11905: 0xF65F,
-	39932 - 11905: 0xF660,
-	39933 - 11905: 0xF661,
-	39934 - 11905: 0xF662,
-	39935 - 11905: 0xF663,
-	39936 - 11905: 0xF664,
-	39937 - 11905: 0xF665,
-	39938 - 11905: 0xF666,
-	39939 - 11905: 0xF667,
-	39940 - 11905: 0xF668,
-	39941 - 11905: 0xF669,
-	39942 - 11905: 0xF66A,
-	39943 - 11905: 0xF66B,
-	39944 - 11905: 0xF66C,
-	39945 - 11905: 0xF66D,
-	39946 - 11905: 0xF66E,
-	39947 - 11905: 0xF66F,
-	39948 - 11905: 0xF670,
-	39949 - 11905: 0xF671,
-	39950 - 11905: 0xF672,
-	39951 - 11905: 0xF673,
-	39952 - 11905: 0xF674,
-	39953 - 11905: 0xF675,
-	39954 - 11905: 0xF676,
-	39955 - 11905: 0xF677,
-	39956 - 11905: 0xF678,
-	39957 - 11905: 0xF679,
-	39958 - 11905: 0xF67A,
-	39959 - 11905: 0xF67B,
-	39960 - 11905: 0xF67C,
-	39961 - 11905: 0xF67D,
-	39962 - 11905: 0xF67E,
-	39963 - 11905: 0xF680,
-	39964 - 11905: 0xF681,
-	39965 - 11905: 0xF682,
-	39966 - 11905: 0xF683,
-	39967 - 11905: 0xF684,
-	39968 - 11905: 0xF685,
-	39969 - 11905: 0xF686,
-	39970 - 11905: 0xF687,
-	39971 - 11905: 0xF688,
-	39972 - 11905: 0xF689,
-	39973 - 11905: 0xF68A,
-	39974 - 11905: 0xF68B,
-	39975 - 11905: 0xF68C,
-	39976 - 11905: 0xF68D,
-	39977 - 11905: 0xF68E,
-	39978 - 11905: 0xF68F,
-	39979 - 11905: 0xF690,
-	39980 - 11905: 0xF691,
-	39981 - 11905: 0xF692,
-	39982 - 11905: 0xF693,
-	39983 - 11905: 0xF694,
-	39984 - 11905: 0xF695,
-	39985 - 11905: 0xF696,
-	39986 - 11905: 0xF697,
-	39987 - 11905: 0xF698,
-	39988 - 11905: 0xF699,
-	39989 - 11905: 0xF69A,
-	39990 - 11905: 0xF69B,
-	39991 - 11905: 0xF69C,
-	39992 - 11905: 0xF69D,
-	39993 - 11905: 0xF69E,
-	39994 - 11905: 0xF69F,
-	39995 - 11905: 0xF6A0,
-	39996 - 11905: 0xF740,
-	39997 - 11905: 0xF741,
-	39998 - 11905: 0xF742,
-	39999 - 11905: 0xF743,
-	40000 - 11905: 0xF744,
-	40001 - 11905: 0xF745,
-	40002 - 11905: 0xF746,
-	40003 - 11905: 0xF747,
-	40004 - 11905: 0xF748,
-	40005 - 11905: 0xF749,
-	40006 - 11905: 0xF74A,
-	40007 - 11905: 0xF74B,
-	40008 - 11905: 0xF74C,
-	40009 - 11905: 0xF74D,
-	40010 - 11905: 0xF74E,
-	40011 - 11905: 0xF74F,
-	40012 - 11905: 0xF750,
-	40013 - 11905: 0xF751,
-	40014 - 11905: 0xF752,
-	40015 - 11905: 0xF753,
-	40016 - 11905: 0xF754,
-	40017 - 11905: 0xF755,
-	40018 - 11905: 0xF756,
-	40019 - 11905: 0xF757,
-	40020 - 11905: 0xF758,
-	40021 - 11905: 0xF759,
-	40022 - 11905: 0xF75A,
-	40023 - 11905: 0xF75B,
-	40024 - 11905: 0xF75C,
-	40025 - 11905: 0xF75D,
-	40026 - 11905: 0xF75E,
-	40027 - 11905: 0xF75F,
-	40028 - 11905: 0xF760,
-	40029 - 11905: 0xF761,
-	40030 - 11905: 0xF762,
-	40031 - 11905: 0xF763,
-	40032 - 11905: 0xF764,
-	40033 - 11905: 0xF765,
-	40034 - 11905: 0xF766,
-	40035 - 11905: 0xF767,
-	40036 - 11905: 0xF768,
-	40037 - 11905: 0xF769,
-	40038 - 11905: 0xF76A,
-	40039 - 11905: 0xF76B,
-	40040 - 11905: 0xF76C,
-	40041 - 11905: 0xF76D,
-	40042 - 11905: 0xF76E,
-	40043 - 11905: 0xF76F,
-	40044 - 11905: 0xF770,
-	40045 - 11905: 0xF771,
-	40046 - 11905: 0xF772,
-	40047 - 11905: 0xF773,
-	40048 - 11905: 0xF774,
-	40049 - 11905: 0xF775,
-	40050 - 11905: 0xF776,
-	40051 - 11905: 0xF777,
-	40052 - 11905: 0xF778,
-	40053 - 11905: 0xF779,
-	40054 - 11905: 0xF77A,
-	40055 - 11905: 0xF77B,
-	40056 - 11905: 0xF77C,
-	40057 - 11905: 0xF77D,
-	40058 - 11905: 0xF77E,
-	40059 - 11905: 0xF780,
-	40060 - 11905: 0xD3E3,
-	40061 - 11905: 0xF781,
-	40062 - 11905: 0xF782,
-	40063 - 11905: 0xF6CF,
-	40064 - 11905: 0xF783,
-	40065 - 11905: 0xC2B3,
-	40066 - 11905: 0xF6D0,
-	40067 - 11905: 0xF784,
-	40068 - 11905: 0xF785,
-	40069 - 11905: 0xF6D1,
-	40070 - 11905: 0xF6D2,
-	40071 - 11905: 0xF6D3,
-	40072 - 11905: 0xF6D4,
-	40073 - 11905: 0xF786,
-	40074 - 11905: 0xF787,
-	40075 - 11905: 0xF6D6,
-	40076 - 11905: 0xF788,
-	40077 - 11905: 0xB1AB,
-	40078 - 11905: 0xF6D7,
-	40079 - 11905: 0xF789,
-	40080 - 11905: 0xF6D8,
-	40081 - 11905: 0xF6D9,
-	40082 - 11905: 0xF6DA,
-	40083 - 11905: 0xF78A,
-	40084 - 11905: 0xF6DB,
-	40085 - 11905: 0xF6DC,
-	40086 - 11905: 0xF78B,
-	40087 - 11905: 0xF78C,
-	40088 - 11905: 0xF78D,
-	40089 - 11905: 0xF78E,
-	40090 - 11905: 0xF6DD,
-	40091 - 11905: 0xF6DE,
-	40092 - 11905: 0xCFCA,
-	40093 - 11905: 0xF78F,
-	40094 - 11905: 0xF6DF,
-	40095 - 11905: 0xF6E0,
-	40096 - 11905: 0xF6E1,
-	40097 - 11905: 0xF6E2,
-	40098 - 11905: 0xF6E3,
-	40099 - 11905: 0xF6E4,
-	40100 - 11905: 0xC0F0,
-	40101 - 11905: 0xF6E5,
-	40102 - 11905: 0xF6E6,
-	40103 - 11905: 0xF6E7,
-	40104 - 11905: 0xF6E8,
-	40105 - 11905: 0xF6E9,
-	40106 - 11905: 0xF790,
-	40107 - 11905: 0xF6EA,
-	40108 - 11905: 0xF791,
-	40109 - 11905: 0xF6EB,
-	40110 - 11905: 0xF6EC,
-	40111 - 11905: 0xF792,
-	40112 - 11905: 0xF6ED,
-	40113 - 11905: 0xF6EE,
-	40114 - 11905: 0xF6EF,
-	40115 - 11905: 0xF6F0,
-	40116 - 11905: 0xF6F1,
-	40117 - 11905: 0xF6F2,
-	40118 - 11905: 0xF6F3,
-	40119 - 11905: 0xF6F4,
-	40120 - 11905: 0xBEA8,
-	40121 - 11905: 0xF793,
-	40122 - 11905: 0xF6F5,
-	40123 - 11905: 0xF6F6,
-	40124 - 11905: 0xF6F7,
-	40125 - 11905: 0xF6F8,
-	40126 - 11905: 0xF794,
-	40127 - 11905: 0xF795,
-	40128 - 11905: 0xF796,
-	40129 - 11905: 0xF797,
-	40130 - 11905: 0xF798,
-	40131 - 11905: 0xC8FA,
-	40132 - 11905: 0xF6F9,
-	40133 - 11905: 0xF6FA,
-	40134 - 11905: 0xF6FB,
-	40135 - 11905: 0xF6FC,
-	40136 - 11905: 0xF799,
-	40137 - 11905: 0xF79A,
-	40138 - 11905: 0xF6FD,
-	40139 - 11905: 0xF6FE,
-	40140 - 11905: 0xF7A1,
-	40141 - 11905: 0xF7A2,
-	40142 - 11905: 0xF7A3,
-	40143 - 11905: 0xF7A4,
-	40144 - 11905: 0xF7A5,
-	40145 - 11905: 0xF79B,
-	40146 - 11905: 0xF79C,
-	40147 - 11905: 0xF7A6,
-	40148 - 11905: 0xF7A7,
-	40149 - 11905: 0xF7A8,
-	40150 - 11905: 0xB1EE,
-	40151 - 11905: 0xF7A9,
-	40152 - 11905: 0xF7AA,
-	40153 - 11905: 0xF7AB,
-	40154 - 11905: 0xF79D,
-	40155 - 11905: 0xF79E,
-	40156 - 11905: 0xF7AC,
-	40157 - 11905: 0xF7AD,
-	40158 - 11905: 0xC1DB,
-	40159 - 11905: 0xF7AE,
-	40160 - 11905: 0xF79F,
-	40161 - 11905: 0xF7A0,
-	40162 - 11905: 0xF7AF,
-	40163 - 11905: 0xF840,
-	40164 - 11905: 0xF841,
-	40165 - 11905: 0xF842,
-	40166 - 11905: 0xF843,
-	40167 - 11905: 0xF844,
-	40168 - 11905: 0xF845,
-	40169 - 11905: 0xF846,
-	40170 - 11905: 0xF847,
-	40171 - 11905: 0xF848,
-	40172 - 11905: 0xF849,
-	40173 - 11905: 0xF84A,
-	40174 - 11905: 0xF84B,
-	40175 - 11905: 0xF84C,
-	40176 - 11905: 0xF84D,
-	40177 - 11905: 0xF84E,
-	40178 - 11905: 0xF84F,
-	40179 - 11905: 0xF850,
-	40180 - 11905: 0xF851,
-	40181 - 11905: 0xF852,
-	40182 - 11905: 0xF853,
-	40183 - 11905: 0xF854,
-	40184 - 11905: 0xF855,
-	40185 - 11905: 0xF856,
-	40186 - 11905: 0xF857,
-	40187 - 11905: 0xF858,
-	40188 - 11905: 0xF859,
-	40189 - 11905: 0xF85A,
-	40190 - 11905: 0xF85B,
-	40191 - 11905: 0xF85C,
-	40192 - 11905: 0xF85D,
-	40193 - 11905: 0xF85E,
-	40194 - 11905: 0xF85F,
-	40195 - 11905: 0xF860,
-	40196 - 11905: 0xF861,
-	40197 - 11905: 0xF862,
-	40198 - 11905: 0xF863,
-	40199 - 11905: 0xF864,
-	40200 - 11905: 0xF865,
-	40201 - 11905: 0xF866,
-	40202 - 11905: 0xF867,
-	40203 - 11905: 0xF868,
-	40204 - 11905: 0xF869,
-	40205 - 11905: 0xF86A,
-	40206 - 11905: 0xF86B,
-	40207 - 11905: 0xF86C,
-	40208 - 11905: 0xF86D,
-	40209 - 11905: 0xF86E,
-	40210 - 11905: 0xF86F,
-	40211 - 11905: 0xF870,
-	40212 - 11905: 0xF871,
-	40213 - 11905: 0xF872,
-	40214 - 11905: 0xF873,
-	40215 - 11905: 0xF874,
-	40216 - 11905: 0xF875,
-	40217 - 11905: 0xF876,
-	40218 - 11905: 0xF877,
-	40219 - 11905: 0xF878,
-	40220 - 11905: 0xF879,
-	40221 - 11905: 0xF87A,
-	40222 - 11905: 0xF87B,
-	40223 - 11905: 0xF87C,
-	40224 - 11905: 0xF87D,
-	40225 - 11905: 0xF87E,
-	40226 - 11905: 0xF880,
-	40227 - 11905: 0xF881,
-	40228 - 11905: 0xF882,
-	40229 - 11905: 0xF883,
-	40230 - 11905: 0xF884,
-	40231 - 11905: 0xF885,
-	40232 - 11905: 0xF886,
-	40233 - 11905: 0xF887,
-	40234 - 11905: 0xF888,
-	40235 - 11905: 0xF889,
-	40236 - 11905: 0xF88A,
-	40237 - 11905: 0xF88B,
-	40238 - 11905: 0xF88C,
-	40239 - 11905: 0xF88D,
-	40240 - 11905: 0xF88E,
-	40241 - 11905: 0xF88F,
-	40242 - 11905: 0xF890,
-	40243 - 11905: 0xF891,
-	40244 - 11905: 0xF892,
-	40245 - 11905: 0xF893,
-	40246 - 11905: 0xF894,
-	40247 - 11905: 0xF895,
-	40248 - 11905: 0xF896,
-	40249 - 11905: 0xF897,
-	40250 - 11905: 0xF898,
-	40251 - 11905: 0xF899,
-	40252 - 11905: 0xF89A,
-	40253 - 11905: 0xF89B,
-	40254 - 11905: 0xF89C,
-	40255 - 11905: 0xF89D,
-	40256 - 11905: 0xF89E,
-	40257 - 11905: 0xF89F,
-	40258 - 11905: 0xF8A0,
-	40259 - 11905: 0xF940,
-	40260 - 11905: 0xF941,
-	40261 - 11905: 0xF942,
-	40262 - 11905: 0xF943,
-	40263 - 11905: 0xF944,
-	40264 - 11905: 0xF945,
-	40265 - 11905: 0xF946,
-	40266 - 11905: 0xF947,
-	40267 - 11905: 0xF948,
-	40268 - 11905: 0xF949,
-	40269 - 11905: 0xF94A,
-	40270 - 11905: 0xF94B,
-	40271 - 11905: 0xF94C,
-	40272 - 11905: 0xF94D,
-	40273 - 11905: 0xF94E,
-	40274 - 11905: 0xF94F,
-	40275 - 11905: 0xF950,
-	40276 - 11905: 0xF951,
-	40277 - 11905: 0xF952,
-	40278 - 11905: 0xF953,
-	40279 - 11905: 0xF954,
-	40280 - 11905: 0xF955,
-	40281 - 11905: 0xF956,
-	40282 - 11905: 0xF957,
-	40283 - 11905: 0xF958,
-	40284 - 11905: 0xF959,
-	40285 - 11905: 0xF95A,
-	40286 - 11905: 0xF95B,
-	40287 - 11905: 0xF95C,
-	40288 - 11905: 0xF95D,
-	40289 - 11905: 0xF95E,
-	40290 - 11905: 0xF95F,
-	40291 - 11905: 0xF960,
-	40292 - 11905: 0xF961,
-	40293 - 11905: 0xF962,
-	40294 - 11905: 0xF963,
-	40295 - 11905: 0xF964,
-	40296 - 11905: 0xF965,
-	40297 - 11905: 0xF966,
-	40298 - 11905: 0xF967,
-	40299 - 11905: 0xF968,
-	40300 - 11905: 0xF969,
-	40301 - 11905: 0xF96A,
-	40302 - 11905: 0xF96B,
-	40303 - 11905: 0xF96C,
-	40304 - 11905: 0xF96D,
-	40305 - 11905: 0xF96E,
-	40306 - 11905: 0xF96F,
-	40307 - 11905: 0xF970,
-	40308 - 11905: 0xF971,
-	40309 - 11905: 0xF972,
-	40310 - 11905: 0xF973,
-	40311 - 11905: 0xF974,
-	40312 - 11905: 0xF975,
-	40313 - 11905: 0xF976,
-	40314 - 11905: 0xF977,
-	40315 - 11905: 0xF978,
-	40316 - 11905: 0xF979,
-	40317 - 11905: 0xF97A,
-	40318 - 11905: 0xF97B,
-	40319 - 11905: 0xF97C,
-	40320 - 11905: 0xF97D,
-	40321 - 11905: 0xF97E,
-	40322 - 11905: 0xF980,
-	40323 - 11905: 0xF981,
-	40324 - 11905: 0xF982,
-	40325 - 11905: 0xF983,
-	40326 - 11905: 0xF984,
-	40327 - 11905: 0xF985,
-	40328 - 11905: 0xF986,
-	40329 - 11905: 0xF987,
-	40330 - 11905: 0xF988,
-	40331 - 11905: 0xF989,
-	40332 - 11905: 0xF98A,
-	40333 - 11905: 0xF98B,
-	40334 - 11905: 0xF98C,
-	40335 - 11905: 0xF98D,
-	40336 - 11905: 0xF98E,
-	40337 - 11905: 0xF98F,
-	40338 - 11905: 0xF990,
-	40339 - 11905: 0xF991,
-	40340 - 11905: 0xF992,
-	40341 - 11905: 0xF993,
-	40342 - 11905: 0xF994,
-	40343 - 11905: 0xF995,
-	40344 - 11905: 0xF996,
-	40345 - 11905: 0xF997,
-	40346 - 11905: 0xF998,
-	40347 - 11905: 0xF999,
-	40348 - 11905: 0xF99A,
-	40349 - 11905: 0xF99B,
-	40350 - 11905: 0xF99C,
-	40351 - 11905: 0xF99D,
-	40352 - 11905: 0xF99E,
-	40353 - 11905: 0xF99F,
-	40354 - 11905: 0xF9A0,
-	40355 - 11905: 0xFA40,
-	40356 - 11905: 0xFA41,
-	40357 - 11905: 0xFA42,
-	40358 - 11905: 0xFA43,
-	40359 - 11905: 0xFA44,
-	40360 - 11905: 0xFA45,
-	40361 - 11905: 0xFA46,
-	40362 - 11905: 0xFA47,
-	40363 - 11905: 0xFA48,
-	40364 - 11905: 0xFA49,
-	40365 - 11905: 0xFA4A,
-	40366 - 11905: 0xFA4B,
-	40367 - 11905: 0xFA4C,
-	40368 - 11905: 0xFA4D,
-	40369 - 11905: 0xFA4E,
-	40370 - 11905: 0xFA4F,
-	40371 - 11905: 0xFA50,
-	40372 - 11905: 0xFA51,
-	40373 - 11905: 0xFA52,
-	40374 - 11905: 0xFA53,
-	40375 - 11905: 0xFA54,
-	40376 - 11905: 0xFA55,
-	40377 - 11905: 0xFA56,
-	40378 - 11905: 0xFA57,
-	40379 - 11905: 0xFA58,
-	40380 - 11905: 0xFA59,
-	40381 - 11905: 0xFA5A,
-	40382 - 11905: 0xFA5B,
-	40383 - 11905: 0xFA5C,
-	40384 - 11905: 0xFA5D,
-	40385 - 11905: 0xFA5E,
-	40386 - 11905: 0xFA5F,
-	40387 - 11905: 0xFA60,
-	40388 - 11905: 0xFA61,
-	40389 - 11905: 0xFA62,
-	40390 - 11905: 0xFA63,
-	40391 - 11905: 0xFA64,
-	40392 - 11905: 0xFA65,
-	40393 - 11905: 0xFA66,
-	40394 - 11905: 0xFA67,
-	40395 - 11905: 0xFA68,
-	40396 - 11905: 0xFA69,
-	40397 - 11905: 0xFA6A,
-	40398 - 11905: 0xFA6B,
-	40399 - 11905: 0xFA6C,
-	40400 - 11905: 0xFA6D,
-	40401 - 11905: 0xFA6E,
-	40402 - 11905: 0xFA6F,
-	40403 - 11905: 0xFA70,
-	40404 - 11905: 0xFA71,
-	40405 - 11905: 0xFA72,
-	40406 - 11905: 0xFA73,
-	40407 - 11905: 0xFA74,
-	40408 - 11905: 0xFA75,
-	40409 - 11905: 0xFA76,
-	40410 - 11905: 0xFA77,
-	40411 - 11905: 0xFA78,
-	40412 - 11905: 0xFA79,
-	40413 - 11905: 0xFA7A,
-	40414 - 11905: 0xFA7B,
-	40415 - 11905: 0xFA7C,
-	40416 - 11905: 0xFA7D,
-	40417 - 11905: 0xFA7E,
-	40418 - 11905: 0xFA80,
-	40419 - 11905: 0xFA81,
-	40420 - 11905: 0xFA82,
-	40421 - 11905: 0xFA83,
-	40422 - 11905: 0xFA84,
-	40423 - 11905: 0xFA85,
-	40424 - 11905: 0xFA86,
-	40425 - 11905: 0xFA87,
-	40426 - 11905: 0xFA88,
-	40427 - 11905: 0xFA89,
-	40428 - 11905: 0xFA8A,
-	40429 - 11905: 0xFA8B,
-	40430 - 11905: 0xFA8C,
-	40431 - 11905: 0xFA8D,
-	40432 - 11905: 0xFA8E,
-	40433 - 11905: 0xFA8F,
-	40434 - 11905: 0xFA90,
-	40435 - 11905: 0xFA91,
-	40436 - 11905: 0xFA92,
-	40437 - 11905: 0xFA93,
-	40438 - 11905: 0xFA94,
-	40439 - 11905: 0xFA95,
-	40440 - 11905: 0xFA96,
-	40441 - 11905: 0xFA97,
-	40442 - 11905: 0xFA98,
-	40443 - 11905: 0xFA99,
-	40444 - 11905: 0xFA9A,
-	40445 - 11905: 0xFA9B,
-	40446 - 11905: 0xFA9C,
-	40447 - 11905: 0xFA9D,
-	40448 - 11905: 0xFA9E,
-	40449 - 11905: 0xFA9F,
-	40450 - 11905: 0xFAA0,
-	40451 - 11905: 0xFB40,
-	40452 - 11905: 0xFB41,
-	40453 - 11905: 0xFB42,
-	40454 - 11905: 0xFB43,
-	40455 - 11905: 0xFB44,
-	40456 - 11905: 0xFB45,
-	40457 - 11905: 0xFB46,
-	40458 - 11905: 0xFB47,
-	40459 - 11905: 0xFB48,
-	40460 - 11905: 0xFB49,
-	40461 - 11905: 0xFB4A,
-	40462 - 11905: 0xFB4B,
-	40463 - 11905: 0xFB4C,
-	40464 - 11905: 0xFB4D,
-	40465 - 11905: 0xFB4E,
-	40466 - 11905: 0xFB4F,
-	40467 - 11905: 0xFB50,
-	40468 - 11905: 0xFB51,
-	40469 - 11905: 0xFB52,
-	40470 - 11905: 0xFB53,
-	40471 - 11905: 0xFB54,
-	40472 - 11905: 0xFB55,
-	40473 - 11905: 0xFB56,
-	40474 - 11905: 0xFB57,
-	40475 - 11905: 0xFB58,
-	40476 - 11905: 0xFB59,
-	40477 - 11905: 0xFB5A,
-	40478 - 11905: 0xFB5B,
-	40479 - 11905: 0xC4F1,
-	40480 - 11905: 0xF0AF,
-	40481 - 11905: 0xBCA6,
-	40482 - 11905: 0xF0B0,
-	40483 - 11905: 0xC3F9,
-	40484 - 11905: 0xFB5C,
-	40485 - 11905: 0xC5B8,
-	40486 - 11905: 0xD1BB,
-	40487 - 11905: 0xFB5D,
-	40488 - 11905: 0xF0B1,
-	40489 - 11905: 0xF0B2,
-	40490 - 11905: 0xF0B3,
-	40491 - 11905: 0xF0B4,
-	40492 - 11905: 0xF0B5,
-	40493 - 11905: 0xD1BC,
-	40494 - 11905: 0xFB5E,
-	40495 - 11905: 0xD1EC,
-	40496 - 11905: 0xFB5F,
-	40497 - 11905: 0xF0B7,
-	40498 - 11905: 0xF0B6,
-	40499 - 11905: 0xD4A7,
-	40500 - 11905: 0xFB60,
-	40501 - 11905: 0xCDD2,
-	40502 - 11905: 0xF0B8,
-	40503 - 11905: 0xF0BA,
-	40504 - 11905: 0xF0B9,
-	40505 - 11905: 0xF0BB,
-	40506 - 11905: 0xF0BC,
-	40507 - 11905: 0xFB61,
-	40508 - 11905: 0xFB62,
-	40509 - 11905: 0xB8EB,
-	40510 - 11905: 0xF0BD,
-	40511 - 11905: 0xBAE8,
-	40512 - 11905: 0xFB63,
-	40513 - 11905: 0xF0BE,
-	40514 - 11905: 0xF0BF,
-	40515 - 11905: 0xBEE9,
-	40516 - 11905: 0xF0C0,
-	40517 - 11905: 0xB6EC,
-	40518 - 11905: 0xF0C1,
-	40519 - 11905: 0xF0C2,
-	40520 - 11905: 0xF0C3,
-	40521 - 11905: 0xF0C4,
-	40522 - 11905: 0xC8B5,
-	40523 - 11905: 0xF0C5,
-	40524 - 11905: 0xF0C6,
-	40525 - 11905: 0xFB64,
-	40526 - 11905: 0xF0C7,
-	40527 - 11905: 0xC5F4,
-	40528 - 11905: 0xFB65,
-	40529 - 11905: 0xF0C8,
-	40530 - 11905: 0xFB66,
-	40531 - 11905: 0xFB67,
-	40532 - 11905: 0xFB68,
-	40533 - 11905: 0xF0C9,
-	40534 - 11905: 0xFB69,
-	40535 - 11905: 0xF0CA,
-	40536 - 11905: 0xF7BD,
-	40537 - 11905: 0xFB6A,
-	40538 - 11905: 0xF0CB,
-	40539 - 11905: 0xF0CC,
-	40540 - 11905: 0xF0CD,
-	40541 - 11905: 0xFB6B,
-	40542 - 11905: 0xF0CE,
-	40543 - 11905: 0xFB6C,
-	40544 - 11905: 0xFB6D,
-	40545 - 11905: 0xFB6E,
-	40546 - 11905: 0xFB6F,
-	40547 - 11905: 0xF0CF,
-	40548 - 11905: 0xBAD7,
-	40549 - 11905: 0xFB70,
-	40550 - 11905: 0xF0D0,
-	40551 - 11905: 0xF0D1,
-	40552 - 11905: 0xF0D2,
-	40553 - 11905: 0xF0D3,
-	40554 - 11905: 0xF0D4,
-	40555 - 11905: 0xF0D5,
-	40556 - 11905: 0xF0D6,
-	40557 - 11905: 0xF0D8,
-	40558 - 11905: 0xFB71,
-	40559 - 11905: 0xFB72,
-	40560 - 11905: 0xD3A5,
-	40561 - 11905: 0xF0D7,
-	40562 - 11905: 0xFB73,
-	40563 - 11905: 0xF0D9,
-	40564 - 11905: 0xFB74,
-	40565 - 11905: 0xFB75,
-	40566 - 11905: 0xFB76,
-	40567 - 11905: 0xFB77,
-	40568 - 11905: 0xFB78,
-	40569 - 11905: 0xFB79,
-	40570 - 11905: 0xFB7A,
-	40571 - 11905: 0xFB7B,
-	40572 - 11905: 0xFB7C,
-	40573 - 11905: 0xFB7D,
-	40574 - 11905: 0xF5BA,
-	40575 - 11905: 0xC2B9,
-	40576 - 11905: 0xFB7E,
-	40577 - 11905: 0xFB80,
-	40578 - 11905: 0xF7E4,
-	40579 - 11905: 0xFB81,
-	40580 - 11905: 0xFB82,
-	40581 - 11905: 0xFB83,
-	40582 - 11905: 0xFB84,
-	40583 - 11905: 0xF7E5,
-	40584 - 11905: 0xF7E6,
-	40585 - 11905: 0xFB85,
-	40586 - 11905: 0xFB86,
-	40587 - 11905: 0xF7E7,
-	40588 - 11905: 0xFB87,
-	40589 - 11905: 0xFB88,
-	40590 - 11905: 0xFB89,
-	40591 - 11905: 0xFB8A,
-	40592 - 11905: 0xFB8B,
-	40593 - 11905: 0xFB8C,
-	40594 - 11905: 0xF7E8,
-	40595 - 11905: 0xC2B4,
-	40596 - 11905: 0xFB8D,
-	40597 - 11905: 0xFB8E,
-	40598 - 11905: 0xFB8F,
-	40599 - 11905: 0xFB90,
-	40600 - 11905: 0xFB91,
-	40601 - 11905: 0xFB92,
-	40602 - 11905: 0xFB93,
-	40603 - 11905: 0xFB94,
-	40604 - 11905: 0xFB95,
-	40605 - 11905: 0xF7EA,
-	40606 - 11905: 0xFB96,
-	40607 - 11905: 0xF7EB,
-	40608 - 11905: 0xFB97,
-	40609 - 11905: 0xFB98,
-	40610 - 11905: 0xFB99,
-	40611 - 11905: 0xFB9A,
-	40612 - 11905: 0xFB9B,
-	40613 - 11905: 0xFB9C,
-	40614 - 11905: 0xC2F3,
-	40615 - 11905: 0xFB9D,
-	40616 - 11905: 0xFB9E,
-	40617 - 11905: 0xFB9F,
-	40618 - 11905: 0xFBA0,
-	40619 - 11905: 0xFC40,
-	40620 - 11905: 0xFC41,
-	40621 - 11905: 0xFC42,
-	40622 - 11905: 0xFC43,
-	40623 - 11905: 0xFC44,
-	40624 - 11905: 0xFC45,
-	40625 - 11905: 0xFC46,
-	40626 - 11905: 0xFC47,
-	40627 - 11905: 0xFC48,
-	40628 - 11905: 0xF4F0,
-	40629 - 11905: 0xFC49,
-	40630 - 11905: 0xFC4A,
-	40631 - 11905: 0xFC4B,
-	40632 - 11905: 0xF4EF,
-	40633 - 11905: 0xFC4C,
-	40634 - 11905: 0xFC4D,
-	40635 - 11905: 0xC2E9,
-	40636 - 11905: 0xFC4E,
-	40637 - 11905: 0xF7E1,
-	40638 - 11905: 0xF7E2,
-	40639 - 11905: 0xFC4F,
-	40640 - 11905: 0xFC50,
-	40641 - 11905: 0xFC51,
-	40642 - 11905: 0xFC52,
-	40643 - 11905: 0xFC53,
-	40644 - 11905: 0xBBC6,
-	40645 - 11905: 0xFC54,
-	40646 - 11905: 0xFC55,
-	40647 - 11905: 0xFC56,
-	40648 - 11905: 0xFC57,
-	40649 - 11905: 0xD9E4,
-	40650 - 11905: 0xFC58,
-	40651 - 11905: 0xFC59,
-	40652 - 11905: 0xFC5A,
-	40653 - 11905: 0xCAF2,
-	40654 - 11905: 0xC0E8,
-	40655 - 11905: 0xF0A4,
-	40656 - 11905: 0xFC5B,
-	40657 - 11905: 0xBADA,
-	40658 - 11905: 0xFC5C,
-	40659 - 11905: 0xFC5D,
-	40660 - 11905: 0xC7AD,
-	40661 - 11905: 0xFC5E,
-	40662 - 11905: 0xFC5F,
-	40663 - 11905: 0xFC60,
-	40664 - 11905: 0xC4AC,
-	40665 - 11905: 0xFC61,
-	40666 - 11905: 0xFC62,
-	40667 - 11905: 0xF7EC,
-	40668 - 11905: 0xF7ED,
-	40669 - 11905: 0xF7EE,
-	40670 - 11905: 0xFC63,
-	40671 - 11905: 0xF7F0,
-	40672 - 11905: 0xF7EF,
-	40673 - 11905: 0xFC64,
-	40674 - 11905: 0xF7F1,
-	40675 - 11905: 0xFC65,
-	40676 - 11905: 0xFC66,
-	40677 - 11905: 0xF7F4,
-	40678 - 11905: 0xFC67,
-	40679 - 11905: 0xF7F3,
-	40680 - 11905: 0xFC68,
-	40681 - 11905: 0xF7F2,
-	40682 - 11905: 0xF7F5,
-	40683 - 11905: 0xFC69,
-	40684 - 11905: 0xFC6A,
-	40685 - 11905: 0xFC6B,
-	40686 - 11905: 0xFC6C,
-	40687 - 11905: 0xF7F6,
-	40688 - 11905: 0xFC6D,
-	40689 - 11905: 0xFC6E,
-	40690 - 11905: 0xFC6F,
-	40691 - 11905: 0xFC70,
-	40692 - 11905: 0xFC71,
-	40693 - 11905: 0xFC72,
-	40694 - 11905: 0xFC73,
-	40695 - 11905: 0xFC74,
-	40696 - 11905: 0xFC75,
-	40697 - 11905: 0xEDE9,
-	40698 - 11905: 0xFC76,
-	40699 - 11905: 0xEDEA,
-	40700 - 11905: 0xEDEB,
-	40701 - 11905: 0xFC77,
-	40702 - 11905: 0xF6BC,
-	40703 - 11905: 0xFC78,
-	40704 - 11905: 0xFC79,
-	40705 - 11905: 0xFC7A,
-	40706 - 11905: 0xFC7B,
-	40707 - 11905: 0xFC7C,
-	40708 - 11905: 0xFC7D,
-	40709 - 11905: 0xFC7E,
-	40710 - 11905: 0xFC80,
-	40711 - 11905: 0xFC81,
-	40712 - 11905: 0xFC82,
-	40713 - 11905: 0xFC83,
-	40714 - 11905: 0xFC84,
-	40715 - 11905: 0xF6BD,
-	40716 - 11905: 0xFC85,
-	40717 - 11905: 0xF6BE,
-	40718 - 11905: 0xB6A6,
-	40719 - 11905: 0xFC86,
-	40720 - 11905: 0xD8BE,
-	40721 - 11905: 0xFC87,
-	40722 - 11905: 0xFC88,
-	40723 - 11905: 0xB9C4,
-	40724 - 11905: 0xFC89,
-	40725 - 11905: 0xFC8A,
-	40726 - 11905: 0xFC8B,
-	40727 - 11905: 0xD8BB,
-	40728 - 11905: 0xFC8C,
-	40729 - 11905: 0xDCB1,
-	40730 - 11905: 0xFC8D,
-	40731 - 11905: 0xFC8E,
-	40732 - 11905: 0xFC8F,
-	40733 - 11905: 0xFC90,
-	40734 - 11905: 0xFC91,
-	40735 - 11905: 0xFC92,
-	40736 - 11905: 0xCAF3,
-	40737 - 11905: 0xFC93,
-	40738 - 11905: 0xF7F7,
-	40739 - 11905: 0xFC94,
-	40740 - 11905: 0xFC95,
-	40741 - 11905: 0xFC96,
-	40742 - 11905: 0xFC97,
-	40743 - 11905: 0xFC98,
-	40744 - 11905: 0xFC99,
-	40745 - 11905: 0xFC9A,
-	40746 - 11905: 0xFC9B,
-	40747 - 11905: 0xFC9C,
-	40748 - 11905: 0xF7F8,
-	40749 - 11905: 0xFC9D,
-	40750 - 11905: 0xFC9E,
-	40751 - 11905: 0xF7F9,
-	40752 - 11905: 0xFC9F,
-	40753 - 11905: 0xFCA0,
-	40754 - 11905: 0xFD40,
-	40755 - 11905: 0xFD41,
-	40756 - 11905: 0xFD42,
-	40757 - 11905: 0xFD43,
-	40758 - 11905: 0xFD44,
-	40759 - 11905: 0xF7FB,
-	40760 - 11905: 0xFD45,
-	40761 - 11905: 0xF7FA,
-	40762 - 11905: 0xFD46,
-	40763 - 11905: 0xB1C7,
-	40764 - 11905: 0xFD47,
-	40765 - 11905: 0xF7FC,
-	40766 - 11905: 0xF7FD,
-	40767 - 11905: 0xFD48,
-	40768 - 11905: 0xFD49,
-	40769 - 11905: 0xFD4A,
-	40770 - 11905: 0xFD4B,
-	40771 - 11905: 0xFD4C,
-	40772 - 11905: 0xF7FE,
-	40773 - 11905: 0xFD4D,
-	40774 - 11905: 0xFD4E,
-	40775 - 11905: 0xFD4F,
-	40776 - 11905: 0xFD50,
-	40777 - 11905: 0xFD51,
-	40778 - 11905: 0xFD52,
-	40779 - 11905: 0xFD53,
-	40780 - 11905: 0xFD54,
-	40781 - 11905: 0xFD55,
-	40782 - 11905: 0xFD56,
-	40783 - 11905: 0xFD57,
-	40784 - 11905: 0xC6EB,
-	40785 - 11905: 0xECB4,
-	40786 - 11905: 0xFD58,
-	40787 - 11905: 0xFD59,
-	40788 - 11905: 0xFD5A,
-	40789 - 11905: 0xFD5B,
-	40790 - 11905: 0xFD5C,
-	40791 - 11905: 0xFD5D,
-	40792 - 11905: 0xFD5E,
-	40793 - 11905: 0xFD5F,
-	40794 - 11905: 0xFD60,
-	40795 - 11905: 0xFD61,
-	40796 - 11905: 0xFD62,
-	40797 - 11905: 0xFD63,
-	40798 - 11905: 0xFD64,
-	40799 - 11905: 0xFD65,
-	40800 - 11905: 0xFD66,
-	40801 - 11905: 0xFD67,
-	40802 - 11905: 0xFD68,
-	40803 - 11905: 0xFD69,
-	40804 - 11905: 0xFD6A,
-	40805 - 11905: 0xFD6B,
-	40806 - 11905: 0xFD6C,
-	40807 - 11905: 0xFD6D,
-	40808 - 11905: 0xFD6E,
-	40809 - 11905: 0xFD6F,
-	40810 - 11905: 0xFD70,
-	40811 - 11905: 0xFD71,
-	40812 - 11905: 0xFD72,
-	40813 - 11905: 0xFD73,
-	40814 - 11905: 0xFD74,
-	40815 - 11905: 0xFD75,
-	40816 - 11905: 0xFD76,
-	40817 - 11905: 0xFD77,
-	40818 - 11905: 0xFD78,
-	40819 - 11905: 0xFD79,
-	40820 - 11905: 0xFD7A,
-	40821 - 11905: 0xFD7B,
-	40822 - 11905: 0xFD7C,
-	40823 - 11905: 0xFD7D,
-	40824 - 11905: 0xFD7E,
-	40825 - 11905: 0xFD80,
-	40826 - 11905: 0xFD81,
-	40827 - 11905: 0xFD82,
-	40828 - 11905: 0xFD83,
-	40829 - 11905: 0xFD84,
-	40830 - 11905: 0xFD85,
-	40831 - 11905: 0xB3DD,
-	40832 - 11905: 0xF6B3,
-	40833 - 11905: 0xFD86,
-	40834 - 11905: 0xFD87,
-	40835 - 11905: 0xF6B4,
-	40836 - 11905: 0xC1E4,
-	40837 - 11905: 0xF6B5,
-	40838 - 11905: 0xF6B6,
-	40839 - 11905: 0xF6B7,
-	40840 - 11905: 0xF6B8,
-	40841 - 11905: 0xF6B9,
-	40842 - 11905: 0xF6BA,
-	40843 - 11905: 0xC8A3,
-	40844 - 11905: 0xF6BB,
-	40845 - 11905: 0xFD88,
-	40846 - 11905: 0xFD89,
-	40847 - 11905: 0xFD8A,
-	40848 - 11905: 0xFD8B,
-	40849 - 11905: 0xFD8C,
-	40850 - 11905: 0xFD8D,
-	40851 - 11905: 0xFD8E,
-	40852 - 11905: 0xFD8F,
-	40853 - 11905: 0xFD90,
-	40854 - 11905: 0xFD91,
-	40855 - 11905: 0xFD92,
-	40856 - 11905: 0xFD93,
-	40857 - 11905: 0xC1FA,
-	40858 - 11905: 0xB9A8,
-	40859 - 11905: 0xEDE8,
-	40860 - 11905: 0xFD94,
-	40861 - 11905: 0xFD95,
-	40862 - 11905: 0xFD96,
-	40863 - 11905: 0xB9EA,
-	40864 - 11905: 0xD9DF,
-	40865 - 11905: 0xFD97,
-	40866 - 11905: 0xFD98,
-	40867 - 11905: 0xFD99,
-	40868 - 11905: 0xFD9A,
-	40869 - 11905: 0xFD9B,
-}
-
-const encode1Low, encode1High = 8208, 9795
-
-var encode1 = [...]uint16{
-	8208 - 8208: 0xA95C,
-	8211 - 8208: 0xA843,
-	8212 - 8208: 0xA1AA,
-	8213 - 8208: 0xA844,
-	8214 - 8208: 0xA1AC,
-	8216 - 8208: 0xA1AE,
-	8217 - 8208: 0xA1AF,
-	8220 - 8208: 0xA1B0,
-	8221 - 8208: 0xA1B1,
-	8229 - 8208: 0xA845,
-	8230 - 8208: 0xA1AD,
-	8240 - 8208: 0xA1EB,
-	8242 - 8208: 0xA1E4,
-	8243 - 8208: 0xA1E5,
-	8245 - 8208: 0xA846,
-	8251 - 8208: 0xA1F9,
-	8364 - 8208: 0xA2E3,
-	8451 - 8208: 0xA1E6,
-	8453 - 8208: 0xA847,
-	8457 - 8208: 0xA848,
-	8470 - 8208: 0xA1ED,
-	8481 - 8208: 0xA959,
-	8544 - 8208: 0xA2F1,
-	8545 - 8208: 0xA2F2,
-	8546 - 8208: 0xA2F3,
-	8547 - 8208: 0xA2F4,
-	8548 - 8208: 0xA2F5,
-	8549 - 8208: 0xA2F6,
-	8550 - 8208: 0xA2F7,
-	8551 - 8208: 0xA2F8,
-	8552 - 8208: 0xA2F9,
-	8553 - 8208: 0xA2FA,
-	8554 - 8208: 0xA2FB,
-	8555 - 8208: 0xA2FC,
-	8560 - 8208: 0xA2A1,
-	8561 - 8208: 0xA2A2,
-	8562 - 8208: 0xA2A3,
-	8563 - 8208: 0xA2A4,
-	8564 - 8208: 0xA2A5,
-	8565 - 8208: 0xA2A6,
-	8566 - 8208: 0xA2A7,
-	8567 - 8208: 0xA2A8,
-	8568 - 8208: 0xA2A9,
-	8569 - 8208: 0xA2AA,
-	8592 - 8208: 0xA1FB,
-	8593 - 8208: 0xA1FC,
-	8594 - 8208: 0xA1FA,
-	8595 - 8208: 0xA1FD,
-	8598 - 8208: 0xA849,
-	8599 - 8208: 0xA84A,
-	8600 - 8208: 0xA84B,
-	8601 - 8208: 0xA84C,
-	8712 - 8208: 0xA1CA,
-	8719 - 8208: 0xA1C7,
-	8721 - 8208: 0xA1C6,
-	8725 - 8208: 0xA84D,
-	8730 - 8208: 0xA1CC,
-	8733 - 8208: 0xA1D8,
-	8734 - 8208: 0xA1DE,
-	8735 - 8208: 0xA84E,
-	8736 - 8208: 0xA1CF,
-	8739 - 8208: 0xA84F,
-	8741 - 8208: 0xA1CE,
-	8743 - 8208: 0xA1C4,
-	8744 - 8208: 0xA1C5,
-	8745 - 8208: 0xA1C9,
-	8746 - 8208: 0xA1C8,
-	8747 - 8208: 0xA1D2,
-	8750 - 8208: 0xA1D3,
-	8756 - 8208: 0xA1E0,
-	8757 - 8208: 0xA1DF,
-	8758 - 8208: 0xA1C3,
-	8759 - 8208: 0xA1CB,
-	8765 - 8208: 0xA1D7,
-	8776 - 8208: 0xA1D6,
-	8780 - 8208: 0xA1D5,
-	8786 - 8208: 0xA850,
-	8800 - 8208: 0xA1D9,
-	8801 - 8208: 0xA1D4,
-	8804 - 8208: 0xA1DC,
-	8805 - 8208: 0xA1DD,
-	8806 - 8208: 0xA851,
-	8807 - 8208: 0xA852,
-	8814 - 8208: 0xA1DA,
-	8815 - 8208: 0xA1DB,
-	8853 - 8208: 0xA892,
-	8857 - 8208: 0xA1D1,
-	8869 - 8208: 0xA1CD,
-	8895 - 8208: 0xA853,
-	8978 - 8208: 0xA1D0,
-	9312 - 8208: 0xA2D9,
-	9313 - 8208: 0xA2DA,
-	9314 - 8208: 0xA2DB,
-	9315 - 8208: 0xA2DC,
-	9316 - 8208: 0xA2DD,
-	9317 - 8208: 0xA2DE,
-	9318 - 8208: 0xA2DF,
-	9319 - 8208: 0xA2E0,
-	9320 - 8208: 0xA2E1,
-	9321 - 8208: 0xA2E2,
-	9332 - 8208: 0xA2C5,
-	9333 - 8208: 0xA2C6,
-	9334 - 8208: 0xA2C7,
-	9335 - 8208: 0xA2C8,
-	9336 - 8208: 0xA2C9,
-	9337 - 8208: 0xA2CA,
-	9338 - 8208: 0xA2CB,
-	9339 - 8208: 0xA2CC,
-	9340 - 8208: 0xA2CD,
-	9341 - 8208: 0xA2CE,
-	9342 - 8208: 0xA2CF,
-	9343 - 8208: 0xA2D0,
-	9344 - 8208: 0xA2D1,
-	9345 - 8208: 0xA2D2,
-	9346 - 8208: 0xA2D3,
-	9347 - 8208: 0xA2D4,
-	9348 - 8208: 0xA2D5,
-	9349 - 8208: 0xA2D6,
-	9350 - 8208: 0xA2D7,
-	9351 - 8208: 0xA2D8,
-	9352 - 8208: 0xA2B1,
-	9353 - 8208: 0xA2B2,
-	9354 - 8208: 0xA2B3,
-	9355 - 8208: 0xA2B4,
-	9356 - 8208: 0xA2B5,
-	9357 - 8208: 0xA2B6,
-	9358 - 8208: 0xA2B7,
-	9359 - 8208: 0xA2B8,
-	9360 - 8208: 0xA2B9,
-	9361 - 8208: 0xA2BA,
-	9362 - 8208: 0xA2BB,
-	9363 - 8208: 0xA2BC,
-	9364 - 8208: 0xA2BD,
-	9365 - 8208: 0xA2BE,
-	9366 - 8208: 0xA2BF,
-	9367 - 8208: 0xA2C0,
-	9368 - 8208: 0xA2C1,
-	9369 - 8208: 0xA2C2,
-	9370 - 8208: 0xA2C3,
-	9371 - 8208: 0xA2C4,
-	9472 - 8208: 0xA9A4,
-	9473 - 8208: 0xA9A5,
-	9474 - 8208: 0xA9A6,
-	9475 - 8208: 0xA9A7,
-	9476 - 8208: 0xA9A8,
-	9477 - 8208: 0xA9A9,
-	9478 - 8208: 0xA9AA,
-	9479 - 8208: 0xA9AB,
-	9480 - 8208: 0xA9AC,
-	9481 - 8208: 0xA9AD,
-	9482 - 8208: 0xA9AE,
-	9483 - 8208: 0xA9AF,
-	9484 - 8208: 0xA9B0,
-	9485 - 8208: 0xA9B1,
-	9486 - 8208: 0xA9B2,
-	9487 - 8208: 0xA9B3,
-	9488 - 8208: 0xA9B4,
-	9489 - 8208: 0xA9B5,
-	9490 - 8208: 0xA9B6,
-	9491 - 8208: 0xA9B7,
-	9492 - 8208: 0xA9B8,
-	9493 - 8208: 0xA9B9,
-	9494 - 8208: 0xA9BA,
-	9495 - 8208: 0xA9BB,
-	9496 - 8208: 0xA9BC,
-	9497 - 8208: 0xA9BD,
-	9498 - 8208: 0xA9BE,
-	9499 - 8208: 0xA9BF,
-	9500 - 8208: 0xA9C0,
-	9501 - 8208: 0xA9C1,
-	9502 - 8208: 0xA9C2,
-	9503 - 8208: 0xA9C3,
-	9504 - 8208: 0xA9C4,
-	9505 - 8208: 0xA9C5,
-	9506 - 8208: 0xA9C6,
-	9507 - 8208: 0xA9C7,
-	9508 - 8208: 0xA9C8,
-	9509 - 8208: 0xA9C9,
-	9510 - 8208: 0xA9CA,
-	9511 - 8208: 0xA9CB,
-	9512 - 8208: 0xA9CC,
-	9513 - 8208: 0xA9CD,
-	9514 - 8208: 0xA9CE,
-	9515 - 8208: 0xA9CF,
-	9516 - 8208: 0xA9D0,
-	9517 - 8208: 0xA9D1,
-	9518 - 8208: 0xA9D2,
-	9519 - 8208: 0xA9D3,
-	9520 - 8208: 0xA9D4,
-	9521 - 8208: 0xA9D5,
-	9522 - 8208: 0xA9D6,
-	9523 - 8208: 0xA9D7,
-	9524 - 8208: 0xA9D8,
-	9525 - 8208: 0xA9D9,
-	9526 - 8208: 0xA9DA,
-	9527 - 8208: 0xA9DB,
-	9528 - 8208: 0xA9DC,
-	9529 - 8208: 0xA9DD,
-	9530 - 8208: 0xA9DE,
-	9531 - 8208: 0xA9DF,
-	9532 - 8208: 0xA9E0,
-	9533 - 8208: 0xA9E1,
-	9534 - 8208: 0xA9E2,
-	9535 - 8208: 0xA9E3,
-	9536 - 8208: 0xA9E4,
-	9537 - 8208: 0xA9E5,
-	9538 - 8208: 0xA9E6,
-	9539 - 8208: 0xA9E7,
-	9540 - 8208: 0xA9E8,
-	9541 - 8208: 0xA9E9,
-	9542 - 8208: 0xA9EA,
-	9543 - 8208: 0xA9EB,
-	9544 - 8208: 0xA9EC,
-	9545 - 8208: 0xA9ED,
-	9546 - 8208: 0xA9EE,
-	9547 - 8208: 0xA9EF,
-	9552 - 8208: 0xA854,
-	9553 - 8208: 0xA855,
-	9554 - 8208: 0xA856,
-	9555 - 8208: 0xA857,
-	9556 - 8208: 0xA858,
-	9557 - 8208: 0xA859,
-	9558 - 8208: 0xA85A,
-	9559 - 8208: 0xA85B,
-	9560 - 8208: 0xA85C,
-	9561 - 8208: 0xA85D,
-	9562 - 8208: 0xA85E,
-	9563 - 8208: 0xA85F,
-	9564 - 8208: 0xA860,
-	9565 - 8208: 0xA861,
-	9566 - 8208: 0xA862,
-	9567 - 8208: 0xA863,
-	9568 - 8208: 0xA864,
-	9569 - 8208: 0xA865,
-	9570 - 8208: 0xA866,
-	9571 - 8208: 0xA867,
-	9572 - 8208: 0xA868,
-	9573 - 8208: 0xA869,
-	9574 - 8208: 0xA86A,
-	9575 - 8208: 0xA86B,
-	9576 - 8208: 0xA86C,
-	9577 - 8208: 0xA86D,
-	9578 - 8208: 0xA86E,
-	9579 - 8208: 0xA86F,
-	9580 - 8208: 0xA870,
-	9581 - 8208: 0xA871,
-	9582 - 8208: 0xA872,
-	9583 - 8208: 0xA873,
-	9584 - 8208: 0xA874,
-	9585 - 8208: 0xA875,
-	9586 - 8208: 0xA876,
-	9587 - 8208: 0xA877,
-	9601 - 8208: 0xA878,
-	9602 - 8208: 0xA879,
-	9603 - 8208: 0xA87A,
-	9604 - 8208: 0xA87B,
-	9605 - 8208: 0xA87C,
-	9606 - 8208: 0xA87D,
-	9607 - 8208: 0xA87E,
-	9608 - 8208: 0xA880,
-	9609 - 8208: 0xA881,
-	9610 - 8208: 0xA882,
-	9611 - 8208: 0xA883,
-	9612 - 8208: 0xA884,
-	9613 - 8208: 0xA885,
-	9614 - 8208: 0xA886,
-	9615 - 8208: 0xA887,
-	9619 - 8208: 0xA888,
-	9620 - 8208: 0xA889,
-	9621 - 8208: 0xA88A,
-	9632 - 8208: 0xA1F6,
-	9633 - 8208: 0xA1F5,
-	9650 - 8208: 0xA1F8,
-	9651 - 8208: 0xA1F7,
-	9660 - 8208: 0xA88B,
-	9661 - 8208: 0xA88C,
-	9670 - 8208: 0xA1F4,
-	9671 - 8208: 0xA1F3,
-	9675 - 8208: 0xA1F0,
-	9678 - 8208: 0xA1F2,
-	9679 - 8208: 0xA1F1,
-	9698 - 8208: 0xA88D,
-	9699 - 8208: 0xA88E,
-	9700 - 8208: 0xA88F,
-	9701 - 8208: 0xA890,
-	9733 - 8208: 0xA1EF,
-	9734 - 8208: 0xA1EE,
-	9737 - 8208: 0xA891,
-	9792 - 8208: 0xA1E2,
-	9794 - 8208: 0xA1E1,
-}
-
-const encode2Low, encode2High = 164, 1106
-
-var encode2 = [...]uint16{
-	164 - 164:  0xA1E8,
-	167 - 164:  0xA1EC,
-	168 - 164:  0xA1A7,
-	176 - 164:  0xA1E3,
-	177 - 164:  0xA1C0,
-	183 - 164:  0xA1A4,
-	215 - 164:  0xA1C1,
-	224 - 164:  0xA8A4,
-	225 - 164:  0xA8A2,
-	232 - 164:  0xA8A8,
-	233 - 164:  0xA8A6,
-	234 - 164:  0xA8BA,
-	236 - 164:  0xA8AC,
-	237 - 164:  0xA8AA,
-	242 - 164:  0xA8B0,
-	243 - 164:  0xA8AE,
-	247 - 164:  0xA1C2,
-	249 - 164:  0xA8B4,
-	250 - 164:  0xA8B2,
-	252 - 164:  0xA8B9,
-	257 - 164:  0xA8A1,
-	275 - 164:  0xA8A5,
-	283 - 164:  0xA8A7,
-	299 - 164:  0xA8A9,
-	324 - 164:  0xA8BD,
-	328 - 164:  0xA8BE,
-	333 - 164:  0xA8AD,
-	363 - 164:  0xA8B1,
-	462 - 164:  0xA8A3,
-	464 - 164:  0xA8AB,
-	466 - 164:  0xA8AF,
-	468 - 164:  0xA8B3,
-	470 - 164:  0xA8B5,
-	472 - 164:  0xA8B6,
-	474 - 164:  0xA8B7,
-	476 - 164:  0xA8B8,
-	505 - 164:  0xA8BF,
-	593 - 164:  0xA8BB,
-	609 - 164:  0xA8C0,
-	711 - 164:  0xA1A6,
-	713 - 164:  0xA1A5,
-	714 - 164:  0xA840,
-	715 - 164:  0xA841,
-	729 - 164:  0xA842,
-	913 - 164:  0xA6A1,
-	914 - 164:  0xA6A2,
-	915 - 164:  0xA6A3,
-	916 - 164:  0xA6A4,
-	917 - 164:  0xA6A5,
-	918 - 164:  0xA6A6,
-	919 - 164:  0xA6A7,
-	920 - 164:  0xA6A8,
-	921 - 164:  0xA6A9,
-	922 - 164:  0xA6AA,
-	923 - 164:  0xA6AB,
-	924 - 164:  0xA6AC,
-	925 - 164:  0xA6AD,
-	926 - 164:  0xA6AE,
-	927 - 164:  0xA6AF,
-	928 - 164:  0xA6B0,
-	929 - 164:  0xA6B1,
-	931 - 164:  0xA6B2,
-	932 - 164:  0xA6B3,
-	933 - 164:  0xA6B4,
-	934 - 164:  0xA6B5,
-	935 - 164:  0xA6B6,
-	936 - 164:  0xA6B7,
-	937 - 164:  0xA6B8,
-	945 - 164:  0xA6C1,
-	946 - 164:  0xA6C2,
-	947 - 164:  0xA6C3,
-	948 - 164:  0xA6C4,
-	949 - 164:  0xA6C5,
-	950 - 164:  0xA6C6,
-	951 - 164:  0xA6C7,
-	952 - 164:  0xA6C8,
-	953 - 164:  0xA6C9,
-	954 - 164:  0xA6CA,
-	955 - 164:  0xA6CB,
-	956 - 164:  0xA6CC,
-	957 - 164:  0xA6CD,
-	958 - 164:  0xA6CE,
-	959 - 164:  0xA6CF,
-	960 - 164:  0xA6D0,
-	961 - 164:  0xA6D1,
-	963 - 164:  0xA6D2,
-	964 - 164:  0xA6D3,
-	965 - 164:  0xA6D4,
-	966 - 164:  0xA6D5,
-	967 - 164:  0xA6D6,
-	968 - 164:  0xA6D7,
-	969 - 164:  0xA6D8,
-	1025 - 164: 0xA7A7,
-	1040 - 164: 0xA7A1,
-	1041 - 164: 0xA7A2,
-	1042 - 164: 0xA7A3,
-	1043 - 164: 0xA7A4,
-	1044 - 164: 0xA7A5,
-	1045 - 164: 0xA7A6,
-	1046 - 164: 0xA7A8,
-	1047 - 164: 0xA7A9,
-	1048 - 164: 0xA7AA,
-	1049 - 164: 0xA7AB,
-	1050 - 164: 0xA7AC,
-	1051 - 164: 0xA7AD,
-	1052 - 164: 0xA7AE,
-	1053 - 164: 0xA7AF,
-	1054 - 164: 0xA7B0,
-	1055 - 164: 0xA7B1,
-	1056 - 164: 0xA7B2,
-	1057 - 164: 0xA7B3,
-	1058 - 164: 0xA7B4,
-	1059 - 164: 0xA7B5,
-	1060 - 164: 0xA7B6,
-	1061 - 164: 0xA7B7,
-	1062 - 164: 0xA7B8,
-	1063 - 164: 0xA7B9,
-	1064 - 164: 0xA7BA,
-	1065 - 164: 0xA7BB,
-	1066 - 164: 0xA7BC,
-	1067 - 164: 0xA7BD,
-	1068 - 164: 0xA7BE,
-	1069 - 164: 0xA7BF,
-	1070 - 164: 0xA7C0,
-	1071 - 164: 0xA7C1,
-	1072 - 164: 0xA7D1,
-	1073 - 164: 0xA7D2,
-	1074 - 164: 0xA7D3,
-	1075 - 164: 0xA7D4,
-	1076 - 164: 0xA7D5,
-	1077 - 164: 0xA7D6,
-	1078 - 164: 0xA7D8,
-	1079 - 164: 0xA7D9,
-	1080 - 164: 0xA7DA,
-	1081 - 164: 0xA7DB,
-	1082 - 164: 0xA7DC,
-	1083 - 164: 0xA7DD,
-	1084 - 164: 0xA7DE,
-	1085 - 164: 0xA7DF,
-	1086 - 164: 0xA7E0,
-	1087 - 164: 0xA7E1,
-	1088 - 164: 0xA7E2,
-	1089 - 164: 0xA7E3,
-	1090 - 164: 0xA7E4,
-	1091 - 164: 0xA7E5,
-	1092 - 164: 0xA7E6,
-	1093 - 164: 0xA7E7,
-	1094 - 164: 0xA7E8,
-	1095 - 164: 0xA7E9,
-	1096 - 164: 0xA7EA,
-	1097 - 164: 0xA7EB,
-	1098 - 164: 0xA7EC,
-	1099 - 164: 0xA7ED,
-	1100 - 164: 0xA7EE,
-	1101 - 164: 0xA7EF,
-	1102 - 164: 0xA7F0,
-	1103 - 164: 0xA7F1,
-	1105 - 164: 0xA7D7,
-}
-
-const encode3Low, encode3High = 65072, 65510
-
-var encode3 = [...]uint16{
-	65072 - 65072: 0xA955,
-	65073 - 65072: 0xA6F2,
-	65075 - 65072: 0xA6F4,
-	65076 - 65072: 0xA6F5,
-	65077 - 65072: 0xA6E0,
-	65078 - 65072: 0xA6E1,
-	65079 - 65072: 0xA6F0,
-	65080 - 65072: 0xA6F1,
-	65081 - 65072: 0xA6E2,
-	65082 - 65072: 0xA6E3,
-	65083 - 65072: 0xA6EE,
-	65084 - 65072: 0xA6EF,
-	65085 - 65072: 0xA6E6,
-	65086 - 65072: 0xA6E7,
-	65087 - 65072: 0xA6E4,
-	65088 - 65072: 0xA6E5,
-	65089 - 65072: 0xA6E8,
-	65090 - 65072: 0xA6E9,
-	65091 - 65072: 0xA6EA,
-	65092 - 65072: 0xA6EB,
-	65097 - 65072: 0xA968,
-	65098 - 65072: 0xA969,
-	65099 - 65072: 0xA96A,
-	65100 - 65072: 0xA96B,
-	65101 - 65072: 0xA96C,
-	65102 - 65072: 0xA96D,
-	65103 - 65072: 0xA96E,
-	65104 - 65072: 0xA96F,
-	65105 - 65072: 0xA970,
-	65106 - 65072: 0xA971,
-	65108 - 65072: 0xA972,
-	65109 - 65072: 0xA973,
-	65110 - 65072: 0xA974,
-	65111 - 65072: 0xA975,
-	65113 - 65072: 0xA976,
-	65114 - 65072: 0xA977,
-	65115 - 65072: 0xA978,
-	65116 - 65072: 0xA979,
-	65117 - 65072: 0xA97A,
-	65118 - 65072: 0xA97B,
-	65119 - 65072: 0xA97C,
-	65120 - 65072: 0xA97D,
-	65121 - 65072: 0xA97E,
-	65122 - 65072: 0xA980,
-	65123 - 65072: 0xA981,
-	65124 - 65072: 0xA982,
-	65125 - 65072: 0xA983,
-	65126 - 65072: 0xA984,
-	65128 - 65072: 0xA985,
-	65129 - 65072: 0xA986,
-	65130 - 65072: 0xA987,
-	65131 - 65072: 0xA988,
-	65281 - 65072: 0xA3A1,
-	65282 - 65072: 0xA3A2,
-	65283 - 65072: 0xA3A3,
-	65284 - 65072: 0xA1E7,
-	65285 - 65072: 0xA3A5,
-	65286 - 65072: 0xA3A6,
-	65287 - 65072: 0xA3A7,
-	65288 - 65072: 0xA3A8,
-	65289 - 65072: 0xA3A9,
-	65290 - 65072: 0xA3AA,
-	65291 - 65072: 0xA3AB,
-	65292 - 65072: 0xA3AC,
-	65293 - 65072: 0xA3AD,
-	65294 - 65072: 0xA3AE,
-	65295 - 65072: 0xA3AF,
-	65296 - 65072: 0xA3B0,
-	65297 - 65072: 0xA3B1,
-	65298 - 65072: 0xA3B2,
-	65299 - 65072: 0xA3B3,
-	65300 - 65072: 0xA3B4,
-	65301 - 65072: 0xA3B5,
-	65302 - 65072: 0xA3B6,
-	65303 - 65072: 0xA3B7,
-	65304 - 65072: 0xA3B8,
-	65305 - 65072: 0xA3B9,
-	65306 - 65072: 0xA3BA,
-	65307 - 65072: 0xA3BB,
-	65308 - 65072: 0xA3BC,
-	65309 - 65072: 0xA3BD,
-	65310 - 65072: 0xA3BE,
-	65311 - 65072: 0xA3BF,
-	65312 - 65072: 0xA3C0,
-	65313 - 65072: 0xA3C1,
-	65314 - 65072: 0xA3C2,
-	65315 - 65072: 0xA3C3,
-	65316 - 65072: 0xA3C4,
-	65317 - 65072: 0xA3C5,
-	65318 - 65072: 0xA3C6,
-	65319 - 65072: 0xA3C7,
-	65320 - 65072: 0xA3C8,
-	65321 - 65072: 0xA3C9,
-	65322 - 65072: 0xA3CA,
-	65323 - 65072: 0xA3CB,
-	65324 - 65072: 0xA3CC,
-	65325 - 65072: 0xA3CD,
-	65326 - 65072: 0xA3CE,
-	65327 - 65072: 0xA3CF,
-	65328 - 65072: 0xA3D0,
-	65329 - 65072: 0xA3D1,
-	65330 - 65072: 0xA3D2,
-	65331 - 65072: 0xA3D3,
-	65332 - 65072: 0xA3D4,
-	65333 - 65072: 0xA3D5,
-	65334 - 65072: 0xA3D6,
-	65335 - 65072: 0xA3D7,
-	65336 - 65072: 0xA3D8,
-	65337 - 65072: 0xA3D9,
-	65338 - 65072: 0xA3DA,
-	65339 - 65072: 0xA3DB,
-	65340 - 65072: 0xA3DC,
-	65341 - 65072: 0xA3DD,
-	65342 - 65072: 0xA3DE,
-	65343 - 65072: 0xA3DF,
-	65344 - 65072: 0xA3E0,
-	65345 - 65072: 0xA3E1,
-	65346 - 65072: 0xA3E2,
-	65347 - 65072: 0xA3E3,
-	65348 - 65072: 0xA3E4,
-	65349 - 65072: 0xA3E5,
-	65350 - 65072: 0xA3E6,
-	65351 - 65072: 0xA3E7,
-	65352 - 65072: 0xA3E8,
-	65353 - 65072: 0xA3E9,
-	65354 - 65072: 0xA3EA,
-	65355 - 65072: 0xA3EB,
-	65356 - 65072: 0xA3EC,
-	65357 - 65072: 0xA3ED,
-	65358 - 65072: 0xA3EE,
-	65359 - 65072: 0xA3EF,
-	65360 - 65072: 0xA3F0,
-	65361 - 65072: 0xA3F1,
-	65362 - 65072: 0xA3F2,
-	65363 - 65072: 0xA3F3,
-	65364 - 65072: 0xA3F4,
-	65365 - 65072: 0xA3F5,
-	65366 - 65072: 0xA3F6,
-	65367 - 65072: 0xA3F7,
-	65368 - 65072: 0xA3F8,
-	65369 - 65072: 0xA3F9,
-	65370 - 65072: 0xA3FA,
-	65371 - 65072: 0xA3FB,
-	65372 - 65072: 0xA3FC,
-	65373 - 65072: 0xA3FD,
-	65374 - 65072: 0xA1AB,
-	65504 - 65072: 0xA1E9,
-	65505 - 65072: 0xA1EA,
-	65506 - 65072: 0xA956,
-	65507 - 65072: 0xA3FE,
-	65508 - 65072: 0xA957,
-	65509 - 65072: 0xA3A4,
-}
-
-const encode4Low, encode4High = 63788, 64042
-
-var encode4 = [...]uint16{
-	63788 - 63788: 0xFD9C,
-	63865 - 63788: 0xFD9D,
-	63893 - 63788: 0xFD9E,
-	63975 - 63788: 0xFD9F,
-	63985 - 63788: 0xFDA0,
-	64012 - 63788: 0xFE40,
-	64013 - 63788: 0xFE41,
-	64014 - 63788: 0xFE42,
-	64015 - 63788: 0xFE43,
-	64017 - 63788: 0xFE44,
-	64019 - 63788: 0xFE45,
-	64020 - 63788: 0xFE46,
-	64024 - 63788: 0xFE47,
-	64031 - 63788: 0xFE48,
-	64032 - 63788: 0xFE49,
-	64033 - 63788: 0xFE4A,
-	64035 - 63788: 0xFE4B,
-	64036 - 63788: 0xFE4C,
-	64039 - 63788: 0xFE4D,
-	64040 - 63788: 0xFE4E,
-	64041 - 63788: 0xFE4F,
-}
diff --git a/vendor/golang.org/x/text/encoding/traditionalchinese/big5.go b/vendor/golang.org/x/text/encoding/traditionalchinese/big5.go
deleted file mode 100644
index 1fcddde082..0000000000
--- a/vendor/golang.org/x/text/encoding/traditionalchinese/big5.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package traditionalchinese
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/internal"
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/transform"
-)
-
-// All is a list of all defined encodings in this package.
-var All = []encoding.Encoding{Big5}
-
-// Big5 is the Big5 encoding, also known as Code Page 950.
-var Big5 encoding.Encoding = &big5
-
-var big5 = internal.Encoding{
-	&internal.SimpleEncoding{big5Decoder{}, big5Encoder{}},
-	"Big5",
-	identifier.Big5,
-}
-
-type big5Decoder struct{ transform.NopResetter }
-
-func (big5Decoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size, s := rune(0), 0, ""
-loop:
-	for ; nSrc < len(src); nSrc += size {
-		switch c0 := src[nSrc]; {
-		case c0 < utf8.RuneSelf:
-			r, size = rune(c0), 1
-
-		case 0x81 <= c0 && c0 < 0xff:
-			if nSrc+1 >= len(src) {
-				if !atEOF {
-					err = transform.ErrShortSrc
-					break loop
-				}
-				r, size = utf8.RuneError, 1
-				goto write
-			}
-			c1 := src[nSrc+1]
-			switch {
-			case 0x40 <= c1 && c1 < 0x7f:
-				c1 -= 0x40
-			case 0xa1 <= c1 && c1 < 0xff:
-				c1 -= 0x62
-			case c1 < 0x40:
-				r, size = utf8.RuneError, 1
-				goto write
-			default:
-				r, size = utf8.RuneError, 2
-				goto write
-			}
-			r, size = '\ufffd', 2
-			if i := int(c0-0x81)*157 + int(c1); i < len(decode) {
-				if 1133 <= i && i < 1167 {
-					// The two-rune special cases for LATIN CAPITAL / SMALL E WITH CIRCUMFLEX
-					// AND MACRON / CARON are from http://encoding.spec.whatwg.org/#big5
-					switch i {
-					case 1133:
-						s = "\u00CA\u0304"
-						goto writeStr
-					case 1135:
-						s = "\u00CA\u030C"
-						goto writeStr
-					case 1164:
-						s = "\u00EA\u0304"
-						goto writeStr
-					case 1166:
-						s = "\u00EA\u030C"
-						goto writeStr
-					}
-				}
-				r = rune(decode[i])
-				if r == 0 {
-					r = '\ufffd'
-				}
-			}
-
-		default:
-			r, size = utf8.RuneError, 1
-		}
-
-	write:
-		if nDst+utf8.RuneLen(r) > len(dst) {
-			err = transform.ErrShortDst
-			break loop
-		}
-		nDst += utf8.EncodeRune(dst[nDst:], r)
-		continue loop
-
-	writeStr:
-		if nDst+len(s) > len(dst) {
-			err = transform.ErrShortDst
-			break loop
-		}
-		nDst += copy(dst[nDst:], s)
-		continue loop
-	}
-	return nDst, nSrc, err
-}
-
-type big5Encoder struct{ transform.NopResetter }
-
-func (big5Encoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	r, size := rune(0), 0
-	for ; nSrc < len(src); nSrc += size {
-		r = rune(src[nSrc])
-
-		// Decode a 1-byte rune.
-		if r < utf8.RuneSelf {
-			size = 1
-			if nDst >= len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			dst[nDst] = uint8(r)
-			nDst++
-			continue
-
-		} else {
-			// Decode a multi-byte rune.
-			r, size = utf8.DecodeRune(src[nSrc:])
-			if size == 1 {
-				// All valid runes of size 1 (those below utf8.RuneSelf) were
-				// handled above. We have invalid UTF-8 or we haven't seen the
-				// full character yet.
-				if !atEOF && !utf8.FullRune(src[nSrc:]) {
-					err = transform.ErrShortSrc
-					break
-				}
-			}
-		}
-
-		if r >= utf8.RuneSelf {
-			// func init checks that the switch covers all tables.
-			switch {
-			case encode0Low <= r && r < encode0High:
-				if r = rune(encode0[r-encode0Low]); r != 0 {
-					goto write2
-				}
-			case encode1Low <= r && r < encode1High:
-				if r = rune(encode1[r-encode1Low]); r != 0 {
-					goto write2
-				}
-			case encode2Low <= r && r < encode2High:
-				if r = rune(encode2[r-encode2Low]); r != 0 {
-					goto write2
-				}
-			case encode3Low <= r && r < encode3High:
-				if r = rune(encode3[r-encode3Low]); r != 0 {
-					goto write2
-				}
-			case encode4Low <= r && r < encode4High:
-				if r = rune(encode4[r-encode4Low]); r != 0 {
-					goto write2
-				}
-			case encode5Low <= r && r < encode5High:
-				if r = rune(encode5[r-encode5Low]); r != 0 {
-					goto write2
-				}
-			case encode6Low <= r && r < encode6High:
-				if r = rune(encode6[r-encode6Low]); r != 0 {
-					goto write2
-				}
-			case encode7Low <= r && r < encode7High:
-				if r = rune(encode7[r-encode7Low]); r != 0 {
-					goto write2
-				}
-			}
-			err = internal.ErrASCIIReplacement
-			break
-		}
-
-	write2:
-		if nDst+2 > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst+0] = uint8(r >> 8)
-		dst[nDst+1] = uint8(r)
-		nDst += 2
-		continue
-	}
-	return nDst, nSrc, err
-}
-
-func init() {
-	// Check that the hard-coded encode switch covers all tables.
-	if numEncodeTables != 8 {
-		panic("bad numEncodeTables")
-	}
-}
diff --git a/vendor/golang.org/x/text/encoding/traditionalchinese/tables.go b/vendor/golang.org/x/text/encoding/traditionalchinese/tables.go
deleted file mode 100644
index d909e38e5e..0000000000
--- a/vendor/golang.org/x/text/encoding/traditionalchinese/tables.go
+++ /dev/null
@@ -1,37142 +0,0 @@
-// generated by go run maketables.go; DO NOT EDIT
-
-// Package traditionalchinese provides Traditional Chinese encodings such as Big5.
-package traditionalchinese // import "golang.org/x/text/encoding/traditionalchinese"
-
-// decode is the decoding table from Big5 code to Unicode.
-// It is defined at http://encoding.spec.whatwg.org/index-big5.txt
-var decode = [...]uint32{
-	942:   0x000043F0,
-	943:   0x00004C32,
-	944:   0x00004603,
-	945:   0x000045A6,
-	946:   0x00004578,
-	947:   0x00027267,
-	948:   0x00004D77,
-	949:   0x000045B3,
-	950:   0x00027CB1,
-	951:   0x00004CE2,
-	952:   0x00027CC5,
-	953:   0x00003B95,
-	954:   0x00004736,
-	955:   0x00004744,
-	956:   0x00004C47,
-	957:   0x00004C40,
-	958:   0x000242BF,
-	959:   0x00023617,
-	960:   0x00027352,
-	961:   0x00026E8B,
-	962:   0x000270D2,
-	963:   0x00004C57,
-	964:   0x0002A351,
-	965:   0x0000474F,
-	966:   0x000045DA,
-	967:   0x00004C85,
-	968:   0x00027C6C,
-	969:   0x00004D07,
-	970:   0x00004AA4,
-	971:   0x000046A1,
-	972:   0x00026B23,
-	973:   0x00007225,
-	974:   0x00025A54,
-	975:   0x00021A63,
-	976:   0x00023E06,
-	977:   0x00023F61,
-	978:   0x0000664D,
-	979:   0x000056FB,
-	981:   0x00007D95,
-	982:   0x0000591D,
-	983:   0x00028BB9,
-	984:   0x00003DF4,
-	985:   0x00009734,
-	986:   0x00027BEF,
-	987:   0x00005BDB,
-	988:   0x00021D5E,
-	989:   0x00005AA4,
-	990:   0x00003625,
-	991:   0x00029EB0,
-	992:   0x00005AD1,
-	993:   0x00005BB7,
-	994:   0x00005CFC,
-	995:   0x0000676E,
-	996:   0x00008593,
-	997:   0x00029945,
-	998:   0x00007461,
-	999:   0x0000749D,
-	1000:  0x00003875,
-	1001:  0x00021D53,
-	1002:  0x0002369E,
-	1003:  0x00026021,
-	1004:  0x00003EEC,
-	1005:  0x000258DE,
-	1006:  0x00003AF5,
-	1007:  0x00007AFC,
-	1008:  0x00009F97,
-	1009:  0x00024161,
-	1010:  0x0002890D,
-	1011:  0x000231EA,
-	1012:  0x00020A8A,
-	1013:  0x0002325E,
-	1014:  0x0000430A,
-	1015:  0x00008484,
-	1016:  0x00009F96,
-	1017:  0x0000942F,
-	1018:  0x00004930,
-	1019:  0x00008613,
-	1020:  0x00005896,
-	1021:  0x0000974A,
-	1022:  0x00009218,
-	1023:  0x000079D0,
-	1024:  0x00007A32,
-	1025:  0x00006660,
-	1026:  0x00006A29,
-	1027:  0x0000889D,
-	1028:  0x0000744C,
-	1029:  0x00007BC5,
-	1030:  0x00006782,
-	1031:  0x00007A2C,
-	1032:  0x0000524F,
-	1033:  0x00009046,
-	1034:  0x000034E6,
-	1035:  0x000073C4,
-	1036:  0x00025DB9,
-	1037:  0x000074C6,
-	1038:  0x00009FC7,
-	1039:  0x000057B3,
-	1040:  0x0000492F,
-	1041:  0x0000544C,
-	1042:  0x00004131,
-	1043:  0x0002368E,
-	1044:  0x00005818,
-	1045:  0x00007A72,
-	1046:  0x00027B65,
-	1047:  0x00008B8F,
-	1048:  0x000046AE,
-	1049:  0x00026E88,
-	1050:  0x00004181,
-	1051:  0x00025D99,
-	1052:  0x00007BAE,
-	1053:  0x000224BC,
-	1054:  0x00009FC8,
-	1055:  0x000224C1,
-	1056:  0x000224C9,
-	1057:  0x000224CC,
-	1058:  0x00009FC9,
-	1059:  0x00008504,
-	1060:  0x000235BB,
-	1061:  0x000040B4,
-	1062:  0x00009FCA,
-	1063:  0x000044E1,
-	1064:  0x0002ADFF,
-	1065:  0x000062C1,
-	1066:  0x0000706E,
-	1067:  0x00009FCB,
-	1099:  0x000031C0,
-	1100:  0x000031C1,
-	1101:  0x000031C2,
-	1102:  0x000031C3,
-	1103:  0x000031C4,
-	1104:  0x0002010C,
-	1105:  0x000031C5,
-	1106:  0x000200D1,
-	1107:  0x000200CD,
-	1108:  0x000031C6,
-	1109:  0x000031C7,
-	1110:  0x000200CB,
-	1111:  0x00021FE8,
-	1112:  0x000031C8,
-	1113:  0x000200CA,
-	1114:  0x000031C9,
-	1115:  0x000031CA,
-	1116:  0x000031CB,
-	1117:  0x000031CC,
-	1118:  0x0002010E,
-	1119:  0x000031CD,
-	1120:  0x000031CE,
-	1121:  0x00000100,
-	1122:  0x000000C1,
-	1123:  0x000001CD,
-	1124:  0x000000C0,
-	1125:  0x00000112,
-	1126:  0x000000C9,
-	1127:  0x0000011A,
-	1128:  0x000000C8,
-	1129:  0x0000014C,
-	1130:  0x000000D3,
-	1131:  0x000001D1,
-	1132:  0x000000D2,
-	1134:  0x00001EBE,
-	1136:  0x00001EC0,
-	1137:  0x000000CA,
-	1138:  0x00000101,
-	1139:  0x000000E1,
-	1140:  0x000001CE,
-	1141:  0x000000E0,
-	1142:  0x00000251,
-	1143:  0x00000113,
-	1144:  0x000000E9,
-	1145:  0x0000011B,
-	1146:  0x000000E8,
-	1147:  0x0000012B,
-	1148:  0x000000ED,
-	1149:  0x000001D0,
-	1150:  0x000000EC,
-	1151:  0x0000014D,
-	1152:  0x000000F3,
-	1153:  0x000001D2,
-	1154:  0x000000F2,
-	1155:  0x0000016B,
-	1156:  0x000000FA,
-	1157:  0x000001D4,
-	1158:  0x000000F9,
-	1159:  0x000001D6,
-	1160:  0x000001D8,
-	1161:  0x000001DA,
-	1162:  0x000001DC,
-	1163:  0x000000FC,
-	1165:  0x00001EBF,
-	1167:  0x00001EC1,
-	1168:  0x000000EA,
-	1169:  0x00000261,
-	1170:  0x000023DA,
-	1171:  0x000023DB,
-	1256:  0x0002A3A9,
-	1257:  0x00021145,
-	1259:  0x0000650A,
-	1262:  0x00004E3D,
-	1263:  0x00006EDD,
-	1264:  0x00009D4E,
-	1265:  0x000091DF,
-	1268:  0x00027735,
-	1269:  0x00006491,
-	1270:  0x00004F1A,
-	1271:  0x00004F28,
-	1272:  0x00004FA8,
-	1273:  0x00005156,
-	1274:  0x00005174,
-	1275:  0x0000519C,
-	1276:  0x000051E4,
-	1277:  0x000052A1,
-	1278:  0x000052A8,
-	1279:  0x0000533B,
-	1280:  0x0000534E,
-	1281:  0x000053D1,
-	1282:  0x000053D8,
-	1283:  0x000056E2,
-	1284:  0x000058F0,
-	1285:  0x00005904,
-	1286:  0x00005907,
-	1287:  0x00005932,
-	1288:  0x00005934,
-	1289:  0x00005B66,
-	1290:  0x00005B9E,
-	1291:  0x00005B9F,
-	1292:  0x00005C9A,
-	1293:  0x00005E86,
-	1294:  0x0000603B,
-	1295:  0x00006589,
-	1296:  0x000067FE,
-	1297:  0x00006804,
-	1298:  0x00006865,
-	1299:  0x00006D4E,
-	1300:  0x000070BC,
-	1301:  0x00007535,
-	1302:  0x00007EA4,
-	1303:  0x00007EAC,
-	1304:  0x00007EBA,
-	1305:  0x00007EC7,
-	1306:  0x00007ECF,
-	1307:  0x00007EDF,
-	1308:  0x00007F06,
-	1309:  0x00007F37,
-	1310:  0x0000827A,
-	1311:  0x000082CF,
-	1312:  0x0000836F,
-	1313:  0x000089C6,
-	1314:  0x00008BBE,
-	1315:  0x00008BE2,
-	1316:  0x00008F66,
-	1317:  0x00008F67,
-	1318:  0x00008F6E,
-	1319:  0x00007411,
-	1320:  0x00007CFC,
-	1321:  0x00007DCD,
-	1322:  0x00006946,
-	1323:  0x00007AC9,
-	1324:  0x00005227,
-	1329:  0x0000918C,
-	1330:  0x000078B8,
-	1331:  0x0000915E,
-	1332:  0x000080BC,
-	1334:  0x00008D0B,
-	1335:  0x000080F6,
-	1336:  0x000209E7,
-	1339:  0x0000809F,
-	1340:  0x00009EC7,
-	1341:  0x00004CCD,
-	1342:  0x00009DC9,
-	1343:  0x00009E0C,
-	1344:  0x00004C3E,
-	1345:  0x00029DF6,
-	1346:  0x0002700E,
-	1347:  0x00009E0A,
-	1348:  0x0002A133,
-	1349:  0x000035C1,
-	1351:  0x00006E9A,
-	1352:  0x0000823E,
-	1353:  0x00007519,
-	1355:  0x00004911,
-	1356:  0x00009A6C,
-	1357:  0x00009A8F,
-	1358:  0x00009F99,
-	1359:  0x00007987,
-	1360:  0x0002846C,
-	1361:  0x00021DCA,
-	1362:  0x000205D0,
-	1363:  0x00022AE6,
-	1364:  0x00004E24,
-	1365:  0x00004E81,
-	1366:  0x00004E80,
-	1367:  0x00004E87,
-	1368:  0x00004EBF,
-	1369:  0x00004EEB,
-	1370:  0x00004F37,
-	1371:  0x0000344C,
-	1372:  0x00004FBD,
-	1373:  0x00003E48,
-	1374:  0x00005003,
-	1375:  0x00005088,
-	1376:  0x0000347D,
-	1377:  0x00003493,
-	1378:  0x000034A5,
-	1379:  0x00005186,
-	1380:  0x00005905,
-	1381:  0x000051DB,
-	1382:  0x000051FC,
-	1383:  0x00005205,
-	1384:  0x00004E89,
-	1385:  0x00005279,
-	1386:  0x00005290,
-	1387:  0x00005327,
-	1388:  0x000035C7,
-	1389:  0x000053A9,
-	1390:  0x00003551,
-	1391:  0x000053B0,
-	1392:  0x00003553,
-	1393:  0x000053C2,
-	1394:  0x00005423,
-	1395:  0x0000356D,
-	1396:  0x00003572,
-	1397:  0x00003681,
-	1398:  0x00005493,
-	1399:  0x000054A3,
-	1400:  0x000054B4,
-	1401:  0x000054B9,
-	1402:  0x000054D0,
-	1403:  0x000054EF,
-	1404:  0x00005518,
-	1405:  0x00005523,
-	1406:  0x00005528,
-	1407:  0x00003598,
-	1408:  0x0000553F,
-	1409:  0x000035A5,
-	1410:  0x000035BF,
-	1411:  0x000055D7,
-	1412:  0x000035C5,
-	1413:  0x00027D84,
-	1414:  0x00005525,
-	1416:  0x00020C42,
-	1417:  0x00020D15,
-	1418:  0x0002512B,
-	1419:  0x00005590,
-	1420:  0x00022CC6,
-	1421:  0x000039EC,
-	1422:  0x00020341,
-	1423:  0x00008E46,
-	1424:  0x00024DB8,
-	1425:  0x000294E5,
-	1426:  0x00004053,
-	1427:  0x000280BE,
-	1428:  0x0000777A,
-	1429:  0x00022C38,
-	1430:  0x00003A34,
-	1431:  0x000047D5,
-	1432:  0x0002815D,
-	1433:  0x000269F2,
-	1434:  0x00024DEA,
-	1435:  0x000064DD,
-	1436:  0x00020D7C,
-	1437:  0x00020FB4,
-	1438:  0x00020CD5,
-	1439:  0x000210F4,
-	1440:  0x0000648D,
-	1441:  0x00008E7E,
-	1442:  0x00020E96,
-	1443:  0x00020C0B,
-	1444:  0x00020F64,
-	1445:  0x00022CA9,
-	1446:  0x00028256,
-	1447:  0x000244D3,
-	1449:  0x00020D46,
-	1450:  0x00029A4D,
-	1451:  0x000280E9,
-	1452:  0x000047F4,
-	1453:  0x00024EA7,
-	1454:  0x00022CC2,
-	1455:  0x00009AB2,
-	1456:  0x00003A67,
-	1457:  0x000295F4,
-	1458:  0x00003FED,
-	1459:  0x00003506,
-	1460:  0x000252C7,
-	1461:  0x000297D4,
-	1462:  0x000278C8,
-	1463:  0x00022D44,
-	1464:  0x00009D6E,
-	1465:  0x00009815,
-	1467:  0x000043D9,
-	1468:  0x000260A5,
-	1469:  0x000064B4,
-	1470:  0x000054E3,
-	1471:  0x00022D4C,
-	1472:  0x00022BCA,
-	1473:  0x00021077,
-	1474:  0x000039FB,
-	1475:  0x0002106F,
-	1476:  0x000266DA,
-	1477:  0x00026716,
-	1478:  0x000279A0,
-	1479:  0x000064EA,
-	1480:  0x00025052,
-	1481:  0x00020C43,
-	1482:  0x00008E68,
-	1483:  0x000221A1,
-	1484:  0x00028B4C,
-	1485:  0x00020731,
-	1487:  0x0000480B,
-	1488:  0x000201A9,
-	1489:  0x00003FFA,
-	1490:  0x00005873,
-	1491:  0x00022D8D,
-	1493:  0x000245C8,
-	1494:  0x000204FC,
-	1495:  0x00026097,
-	1496:  0x00020F4C,
-	1497:  0x00020D96,
-	1498:  0x00005579,
-	1499:  0x000040BB,
-	1500:  0x000043BA,
-	1502:  0x00004AB4,
-	1503:  0x00022A66,
-	1504:  0x0002109D,
-	1505:  0x000081AA,
-	1506:  0x000098F5,
-	1507:  0x00020D9C,
-	1508:  0x00006379,
-	1509:  0x000039FE,
-	1510:  0x00022775,
-	1511:  0x00008DC0,
-	1512:  0x000056A1,
-	1513:  0x0000647C,
-	1514:  0x00003E43,
-	1516:  0x0002A601,
-	1517:  0x00020E09,
-	1518:  0x00022ACF,
-	1519:  0x00022CC9,
-	1521:  0x000210C8,
-	1522:  0x000239C2,
-	1523:  0x00003992,
-	1524:  0x00003A06,
-	1525:  0x0002829B,
-	1526:  0x00003578,
-	1527:  0x00025E49,
-	1528:  0x000220C7,
-	1529:  0x00005652,
-	1530:  0x00020F31,
-	1531:  0x00022CB2,
-	1532:  0x00029720,
-	1533:  0x000034BC,
-	1534:  0x00006C3D,
-	1535:  0x00024E3B,
-	1538:  0x00027574,
-	1539:  0x00022E8B,
-	1540:  0x00022208,
-	1541:  0x0002A65B,
-	1542:  0x00028CCD,
-	1543:  0x00020E7A,
-	1544:  0x00020C34,
-	1545:  0x0002681C,
-	1546:  0x00007F93,
-	1547:  0x000210CF,
-	1548:  0x00022803,
-	1549:  0x00022939,
-	1550:  0x000035FB,
-	1551:  0x000251E3,
-	1552:  0x00020E8C,
-	1553:  0x00020F8D,
-	1554:  0x00020EAA,
-	1555:  0x00003F93,
-	1556:  0x00020F30,
-	1557:  0x00020D47,
-	1558:  0x0002114F,
-	1559:  0x00020E4C,
-	1561:  0x00020EAB,
-	1562:  0x00020BA9,
-	1563:  0x00020D48,
-	1564:  0x000210C0,
-	1565:  0x0002113D,
-	1566:  0x00003FF9,
-	1567:  0x00022696,
-	1568:  0x00006432,
-	1569:  0x00020FAD,
-	1570:  0x000233F4,
-	1571:  0x00027639,
-	1572:  0x00022BCE,
-	1573:  0x00020D7E,
-	1574:  0x00020D7F,
-	1575:  0x00022C51,
-	1576:  0x00022C55,
-	1577:  0x00003A18,
-	1578:  0x00020E98,
-	1579:  0x000210C7,
-	1580:  0x00020F2E,
-	1581:  0x0002A632,
-	1582:  0x00026B50,
-	1583:  0x00028CD2,
-	1584:  0x00028D99,
-	1585:  0x00028CCA,
-	1586:  0x000095AA,
-	1587:  0x000054CC,
-	1588:  0x000082C4,
-	1589:  0x000055B9,
-	1591:  0x00029EC3,
-	1592:  0x00009C26,
-	1593:  0x00009AB6,
-	1594:  0x0002775E,
-	1595:  0x00022DEE,
-	1596:  0x00007140,
-	1597:  0x0000816D,
-	1598:  0x000080EC,
-	1599:  0x00005C1C,
-	1600:  0x00026572,
-	1601:  0x00008134,
-	1602:  0x00003797,
-	1603:  0x0000535F,
-	1604:  0x000280BD,
-	1605:  0x000091B6,
-	1606:  0x00020EFA,
-	1607:  0x00020E0F,
-	1608:  0x00020E77,
-	1609:  0x00020EFB,
-	1610:  0x000035DD,
-	1611:  0x00024DEB,
-	1612:  0x00003609,
-	1613:  0x00020CD6,
-	1614:  0x000056AF,
-	1615:  0x000227B5,
-	1616:  0x000210C9,
-	1617:  0x00020E10,
-	1618:  0x00020E78,
-	1619:  0x00021078,
-	1620:  0x00021148,
-	1621:  0x00028207,
-	1622:  0x00021455,
-	1623:  0x00020E79,
-	1624:  0x00024E50,
-	1625:  0x00022DA4,
-	1626:  0x00005A54,
-	1627:  0x0002101D,
-	1628:  0x0002101E,
-	1629:  0x000210F5,
-	1630:  0x000210F6,
-	1631:  0x0000579C,
-	1632:  0x00020E11,
-	1633:  0x00027694,
-	1634:  0x000282CD,
-	1635:  0x00020FB5,
-	1636:  0x00020E7B,
-	1637:  0x0002517E,
-	1638:  0x00003703,
-	1639:  0x00020FB6,
-	1640:  0x00021180,
-	1641:  0x000252D8,
-	1642:  0x0002A2BD,
-	1643:  0x000249DA,
-	1644:  0x0002183A,
-	1645:  0x00024177,
-	1646:  0x0002827C,
-	1647:  0x00005899,
-	1648:  0x00005268,
-	1649:  0x0000361A,
-	1650:  0x0002573D,
-	1651:  0x00007BB2,
-	1652:  0x00005B68,
-	1653:  0x00004800,
-	1654:  0x00004B2C,
-	1655:  0x00009F27,
-	1656:  0x000049E7,
-	1657:  0x00009C1F,
-	1658:  0x00009B8D,
-	1659:  0x00025B74,
-	1660:  0x0002313D,
-	1661:  0x000055FB,
-	1662:  0x000035F2,
-	1663:  0x00005689,
-	1664:  0x00004E28,
-	1665:  0x00005902,
-	1666:  0x00021BC1,
-	1667:  0x0002F878,
-	1668:  0x00009751,
-	1669:  0x00020086,
-	1670:  0x00004E5B,
-	1671:  0x00004EBB,
-	1672:  0x0000353E,
-	1673:  0x00005C23,
-	1674:  0x00005F51,
-	1675:  0x00005FC4,
-	1676:  0x000038FA,
-	1677:  0x0000624C,
-	1678:  0x00006535,
-	1679:  0x00006B7A,
-	1680:  0x00006C35,
-	1681:  0x00006C3A,
-	1682:  0x0000706C,
-	1683:  0x0000722B,
-	1684:  0x00004E2C,
-	1685:  0x000072AD,
-	1686:  0x000248E9,
-	1687:  0x00007F52,
-	1688:  0x0000793B,
-	1689:  0x00007CF9,
-	1690:  0x00007F53,
-	1691:  0x0002626A,
-	1692:  0x000034C1,
-	1694:  0x0002634B,
-	1695:  0x00008002,
-	1696:  0x00008080,
-	1697:  0x00026612,
-	1698:  0x00026951,
-	1699:  0x0000535D,
-	1700:  0x00008864,
-	1701:  0x000089C1,
-	1702:  0x000278B2,
-	1703:  0x00008BA0,
-	1704:  0x00008D1D,
-	1705:  0x00009485,
-	1706:  0x00009578,
-	1707:  0x0000957F,
-	1708:  0x000095E8,
-	1709:  0x00028E0F,
-	1710:  0x000097E6,
-	1711:  0x00009875,
-	1712:  0x000098CE,
-	1713:  0x000098DE,
-	1714:  0x00009963,
-	1715:  0x00029810,
-	1716:  0x00009C7C,
-	1717:  0x00009E1F,
-	1718:  0x00009EC4,
-	1719:  0x00006B6F,
-	1720:  0x0000F907,
-	1721:  0x00004E37,
-	1722:  0x00020087,
-	1723:  0x0000961D,
-	1724:  0x00006237,
-	1725:  0x000094A2,
-	1727:  0x0000503B,
-	1728:  0x00006DFE,
-	1729:  0x00029C73,
-	1730:  0x00009FA6,
-	1731:  0x00003DC9,
-	1732:  0x0000888F,
-	1733:  0x0002414E,
-	1734:  0x00007077,
-	1735:  0x00005CF5,
-	1736:  0x00004B20,
-	1737:  0x000251CD,
-	1738:  0x00003559,
-	1739:  0x00025D30,
-	1740:  0x00006122,
-	1741:  0x00028A32,
-	1742:  0x00008FA7,
-	1743:  0x000091F6,
-	1744:  0x00007191,
-	1745:  0x00006719,
-	1746:  0x000073BA,
-	1747:  0x00023281,
-	1748:  0x0002A107,
-	1749:  0x00003C8B,
-	1750:  0x00021980,
-	1751:  0x00004B10,
-	1752:  0x000078E4,
-	1753:  0x00007402,
-	1754:  0x000051AE,
-	1755:  0x0002870F,
-	1756:  0x00004009,
-	1757:  0x00006A63,
-	1758:  0x0002A2BA,
-	1759:  0x00004223,
-	1760:  0x0000860F,
-	1761:  0x00020A6F,
-	1762:  0x00007A2A,
-	1763:  0x00029947,
-	1764:  0x00028AEA,
-	1765:  0x00009755,
-	1766:  0x0000704D,
-	1767:  0x00005324,
-	1768:  0x0002207E,
-	1769:  0x000093F4,
-	1770:  0x000076D9,
-	1771:  0x000289E3,
-	1772:  0x00009FA7,
-	1773:  0x000077DD,
-	1774:  0x00004EA3,
-	1775:  0x00004FF0,
-	1776:  0x000050BC,
-	1777:  0x00004E2F,
-	1778:  0x00004F17,
-	1779:  0x00009FA8,
-	1780:  0x00005434,
-	1781:  0x00007D8B,
-	1782:  0x00005892,
-	1783:  0x000058D0,
-	1784:  0x00021DB6,
-	1785:  0x00005E92,
-	1786:  0x00005E99,
-	1787:  0x00005FC2,
-	1788:  0x00022712,
-	1789:  0x0000658B,
-	1790:  0x000233F9,
-	1791:  0x00006919,
-	1792:  0x00006A43,
-	1793:  0x00023C63,
-	1794:  0x00006CFF,
-	1796:  0x00007200,
-	1797:  0x00024505,
-	1798:  0x0000738C,
-	1799:  0x00003EDB,
-	1800:  0x00024A13,
-	1801:  0x00005B15,
-	1802:  0x000074B9,
-	1803:  0x00008B83,
-	1804:  0x00025CA4,
-	1805:  0x00025695,
-	1806:  0x00007A93,
-	1807:  0x00007BEC,
-	1808:  0x00007CC3,
-	1809:  0x00007E6C,
-	1810:  0x000082F8,
-	1811:  0x00008597,
-	1812:  0x00009FA9,
-	1813:  0x00008890,
-	1814:  0x00009FAA,
-	1815:  0x00008EB9,
-	1816:  0x00009FAB,
-	1817:  0x00008FCF,
-	1818:  0x0000855F,
-	1819:  0x000099E0,
-	1820:  0x00009221,
-	1821:  0x00009FAC,
-	1822:  0x00028DB9,
-	1823:  0x0002143F,
-	1824:  0x00004071,
-	1825:  0x000042A2,
-	1826:  0x00005A1A,
-	1830:  0x00009868,
-	1831:  0x0000676B,
-	1832:  0x00004276,
-	1833:  0x0000573D,
-	1835:  0x000085D6,
-	1836:  0x0002497B,
-	1837:  0x000082BF,
-	1838:  0x0002710D,
-	1839:  0x00004C81,
-	1840:  0x00026D74,
-	1841:  0x00005D7B,
-	1842:  0x00026B15,
-	1843:  0x00026FBE,
-	1844:  0x00009FAD,
-	1845:  0x00009FAE,
-	1846:  0x00005B96,
-	1847:  0x00009FAF,
-	1848:  0x000066E7,
-	1849:  0x00007E5B,
-	1850:  0x00006E57,
-	1851:  0x000079CA,
-	1852:  0x00003D88,
-	1853:  0x000044C3,
-	1854:  0x00023256,
-	1855:  0x00022796,
-	1856:  0x0000439A,
-	1857:  0x00004536,
-	1859:  0x00005CD5,
-	1860:  0x00023B1A,
-	1861:  0x00008AF9,
-	1862:  0x00005C78,
-	1863:  0x00003D12,
-	1864:  0x00023551,
-	1865:  0x00005D78,
-	1866:  0x00009FB2,
-	1867:  0x00007157,
-	1868:  0x00004558,
-	1869:  0x000240EC,
-	1870:  0x00021E23,
-	1871:  0x00004C77,
-	1872:  0x00003978,
-	1873:  0x0000344A,
-	1874:  0x000201A4,
-	1875:  0x00026C41,
-	1876:  0x00008ACC,
-	1877:  0x00004FB4,
-	1878:  0x00020239,
-	1879:  0x000059BF,
-	1880:  0x0000816C,
-	1881:  0x00009856,
-	1882:  0x000298FA,
-	1883:  0x00005F3B,
-	1884:  0x00020B9F,
-	1886:  0x000221C1,
-	1887:  0x0002896D,
-	1888:  0x00004102,
-	1889:  0x000046BB,
-	1890:  0x00029079,
-	1891:  0x00003F07,
-	1892:  0x00009FB3,
-	1893:  0x0002A1B5,
-	1894:  0x000040F8,
-	1895:  0x000037D6,
-	1896:  0x000046F7,
-	1897:  0x00026C46,
-	1898:  0x0000417C,
-	1899:  0x000286B2,
-	1900:  0x000273FF,
-	1901:  0x0000456D,
-	1902:  0x000038D4,
-	1903:  0x0002549A,
-	1904:  0x00004561,
-	1905:  0x0000451B,
-	1906:  0x00004D89,
-	1907:  0x00004C7B,
-	1908:  0x00004D76,
-	1909:  0x000045EA,
-	1910:  0x00003FC8,
-	1911:  0x00024B0F,
-	1912:  0x00003661,
-	1913:  0x000044DE,
-	1914:  0x000044BD,
-	1915:  0x000041ED,
-	1916:  0x00005D3E,
-	1917:  0x00005D48,
-	1918:  0x00005D56,
-	1919:  0x00003DFC,
-	1920:  0x0000380F,
-	1921:  0x00005DA4,
-	1922:  0x00005DB9,
-	1923:  0x00003820,
-	1924:  0x00003838,
-	1925:  0x00005E42,
-	1926:  0x00005EBD,
-	1927:  0x00005F25,
-	1928:  0x00005F83,
-	1929:  0x00003908,
-	1930:  0x00003914,
-	1931:  0x0000393F,
-	1932:  0x0000394D,
-	1933:  0x000060D7,
-	1934:  0x0000613D,
-	1935:  0x00005CE5,
-	1936:  0x00003989,
-	1937:  0x000061B7,
-	1938:  0x000061B9,
-	1939:  0x000061CF,
-	1940:  0x000039B8,
-	1941:  0x0000622C,
-	1942:  0x00006290,
-	1943:  0x000062E5,
-	1944:  0x00006318,
-	1945:  0x000039F8,
-	1946:  0x000056B1,
-	1947:  0x00003A03,
-	1948:  0x000063E2,
-	1949:  0x000063FB,
-	1950:  0x00006407,
-	1951:  0x0000645A,
-	1952:  0x00003A4B,
-	1953:  0x000064C0,
-	1954:  0x00005D15,
-	1955:  0x00005621,
-	1956:  0x00009F9F,
-	1957:  0x00003A97,
-	1958:  0x00006586,
-	1959:  0x00003ABD,
-	1960:  0x000065FF,
-	1961:  0x00006653,
-	1962:  0x00003AF2,
-	1963:  0x00006692,
-	1964:  0x00003B22,
-	1965:  0x00006716,
-	1966:  0x00003B42,
-	1967:  0x000067A4,
-	1968:  0x00006800,
-	1969:  0x00003B58,
-	1970:  0x0000684A,
-	1971:  0x00006884,
-	1972:  0x00003B72,
-	1973:  0x00003B71,
-	1974:  0x00003B7B,
-	1975:  0x00006909,
-	1976:  0x00006943,
-	1977:  0x0000725C,
-	1978:  0x00006964,
-	1979:  0x0000699F,
-	1980:  0x00006985,
-	1981:  0x00003BBC,
-	1982:  0x000069D6,
-	1983:  0x00003BDD,
-	1984:  0x00006A65,
-	1985:  0x00006A74,
-	1986:  0x00006A71,
-	1987:  0x00006A82,
-	1988:  0x00003BEC,
-	1989:  0x00006A99,
-	1990:  0x00003BF2,
-	1991:  0x00006AAB,
-	1992:  0x00006AB5,
-	1993:  0x00006AD4,
-	1994:  0x00006AF6,
-	1995:  0x00006B81,
-	1996:  0x00006BC1,
-	1997:  0x00006BEA,
-	1998:  0x00006C75,
-	1999:  0x00006CAA,
-	2000:  0x00003CCB,
-	2001:  0x00006D02,
-	2002:  0x00006D06,
-	2003:  0x00006D26,
-	2004:  0x00006D81,
-	2005:  0x00003CEF,
-	2006:  0x00006DA4,
-	2007:  0x00006DB1,
-	2008:  0x00006E15,
-	2009:  0x00006E18,
-	2010:  0x00006E29,
-	2011:  0x00006E86,
-	2012:  0x000289C0,
-	2013:  0x00006EBB,
-	2014:  0x00006EE2,
-	2015:  0x00006EDA,
-	2016:  0x00009F7F,
-	2017:  0x00006EE8,
-	2018:  0x00006EE9,
-	2019:  0x00006F24,
-	2020:  0x00006F34,
-	2021:  0x00003D46,
-	2022:  0x00023F41,
-	2023:  0x00006F81,
-	2024:  0x00006FBE,
-	2025:  0x00003D6A,
-	2026:  0x00003D75,
-	2027:  0x000071B7,
-	2028:  0x00005C99,
-	2029:  0x00003D8A,
-	2030:  0x0000702C,
-	2031:  0x00003D91,
-	2032:  0x00007050,
-	2033:  0x00007054,
-	2034:  0x0000706F,
-	2035:  0x0000707F,
-	2036:  0x00007089,
-	2037:  0x00020325,
-	2038:  0x000043C1,
-	2039:  0x000035F1,
-	2040:  0x00020ED8,
-	2041:  0x00023ED7,
-	2042:  0x000057BE,
-	2043:  0x00026ED3,
-	2044:  0x0000713E,
-	2045:  0x000257E0,
-	2046:  0x0000364E,
-	2047:  0x000069A2,
-	2048:  0x00028BE9,
-	2049:  0x00005B74,
-	2050:  0x00007A49,
-	2051:  0x000258E1,
-	2052:  0x000294D9,
-	2053:  0x00007A65,
-	2054:  0x00007A7D,
-	2055:  0x000259AC,
-	2056:  0x00007ABB,
-	2057:  0x00007AB0,
-	2058:  0x00007AC2,
-	2059:  0x00007AC3,
-	2060:  0x000071D1,
-	2061:  0x0002648D,
-	2062:  0x000041CA,
-	2063:  0x00007ADA,
-	2064:  0x00007ADD,
-	2065:  0x00007AEA,
-	2066:  0x000041EF,
-	2067:  0x000054B2,
-	2068:  0x00025C01,
-	2069:  0x00007B0B,
-	2070:  0x00007B55,
-	2071:  0x00007B29,
-	2072:  0x0002530E,
-	2073:  0x00025CFE,
-	2074:  0x00007BA2,
-	2075:  0x00007B6F,
-	2076:  0x0000839C,
-	2077:  0x00025BB4,
-	2078:  0x00026C7F,
-	2079:  0x00007BD0,
-	2080:  0x00008421,
-	2081:  0x00007B92,
-	2082:  0x00007BB8,
-	2083:  0x00025D20,
-	2084:  0x00003DAD,
-	2085:  0x00025C65,
-	2086:  0x00008492,
-	2087:  0x00007BFA,
-	2088:  0x00007C06,
-	2089:  0x00007C35,
-	2090:  0x00025CC1,
-	2091:  0x00007C44,
-	2092:  0x00007C83,
-	2093:  0x00024882,
-	2094:  0x00007CA6,
-	2095:  0x0000667D,
-	2096:  0x00024578,
-	2097:  0x00007CC9,
-	2098:  0x00007CC7,
-	2099:  0x00007CE6,
-	2100:  0x00007C74,
-	2101:  0x00007CF3,
-	2102:  0x00007CF5,
-	2103:  0x00007CCE,
-	2104:  0x00007E67,
-	2105:  0x0000451D,
-	2106:  0x00026E44,
-	2107:  0x00007D5D,
-	2108:  0x00026ED6,
-	2109:  0x0000748D,
-	2110:  0x00007D89,
-	2111:  0x00007DAB,
-	2112:  0x00007135,
-	2113:  0x00007DB3,
-	2114:  0x00007DD2,
-	2115:  0x00024057,
-	2116:  0x00026029,
-	2117:  0x00007DE4,
-	2118:  0x00003D13,
-	2119:  0x00007DF5,
-	2120:  0x000217F9,
-	2121:  0x00007DE5,
-	2122:  0x0002836D,
-	2123:  0x00007E1D,
-	2124:  0x00026121,
-	2125:  0x0002615A,
-	2126:  0x00007E6E,
-	2127:  0x00007E92,
-	2128:  0x0000432B,
-	2129:  0x0000946C,
-	2130:  0x00007E27,
-	2131:  0x00007F40,
-	2132:  0x00007F41,
-	2133:  0x00007F47,
-	2134:  0x00007936,
-	2135:  0x000262D0,
-	2136:  0x000099E1,
-	2137:  0x00007F97,
-	2138:  0x00026351,
-	2139:  0x00007FA3,
-	2140:  0x00021661,
-	2141:  0x00020068,
-	2142:  0x0000455C,
-	2143:  0x00023766,
-	2144:  0x00004503,
-	2145:  0x0002833A,
-	2146:  0x00007FFA,
-	2147:  0x00026489,
-	2148:  0x00008005,
-	2149:  0x00008008,
-	2150:  0x0000801D,
-	2151:  0x00008028,
-	2152:  0x0000802F,
-	2153:  0x0002A087,
-	2154:  0x00026CC3,
-	2155:  0x0000803B,
-	2156:  0x0000803C,
-	2157:  0x00008061,
-	2158:  0x00022714,
-	2159:  0x00004989,
-	2160:  0x00026626,
-	2161:  0x00023DE3,
-	2162:  0x000266E8,
-	2163:  0x00006725,
-	2164:  0x000080A7,
-	2165:  0x00028A48,
-	2166:  0x00008107,
-	2167:  0x0000811A,
-	2168:  0x000058B0,
-	2169:  0x000226F6,
-	2170:  0x00006C7F,
-	2171:  0x00026498,
-	2172:  0x00024FB8,
-	2173:  0x000064E7,
-	2174:  0x0002148A,
-	2175:  0x00008218,
-	2176:  0x0002185E,
-	2177:  0x00006A53,
-	2178:  0x00024A65,
-	2179:  0x00024A95,
-	2180:  0x0000447A,
-	2181:  0x00008229,
-	2182:  0x00020B0D,
-	2183:  0x00026A52,
-	2184:  0x00023D7E,
-	2185:  0x00004FF9,
-	2186:  0x000214FD,
-	2187:  0x000084E2,
-	2188:  0x00008362,
-	2189:  0x00026B0A,
-	2190:  0x000249A7,
-	2191:  0x00023530,
-	2192:  0x00021773,
-	2193:  0x00023DF8,
-	2194:  0x000082AA,
-	2195:  0x0000691B,
-	2196:  0x0002F994,
-	2197:  0x000041DB,
-	2198:  0x0000854B,
-	2199:  0x000082D0,
-	2200:  0x0000831A,
-	2201:  0x00020E16,
-	2202:  0x000217B4,
-	2203:  0x000036C1,
-	2204:  0x0002317D,
-	2205:  0x0002355A,
-	2206:  0x0000827B,
-	2207:  0x000082E2,
-	2208:  0x00008318,
-	2209:  0x00023E8B,
-	2210:  0x00026DA3,
-	2211:  0x00026B05,
-	2212:  0x00026B97,
-	2213:  0x000235CE,
-	2214:  0x00003DBF,
-	2215:  0x0000831D,
-	2216:  0x000055EC,
-	2217:  0x00008385,
-	2218:  0x0000450B,
-	2219:  0x00026DA5,
-	2220:  0x000083AC,
-	2221:  0x000083C1,
-	2222:  0x000083D3,
-	2223:  0x0000347E,
-	2224:  0x00026ED4,
-	2225:  0x00006A57,
-	2226:  0x0000855A,
-	2227:  0x00003496,
-	2228:  0x00026E42,
-	2229:  0x00022EEF,
-	2230:  0x00008458,
-	2231:  0x00025BE4,
-	2232:  0x00008471,
-	2233:  0x00003DD3,
-	2234:  0x000044E4,
-	2235:  0x00006AA7,
-	2236:  0x0000844A,
-	2237:  0x00023CB5,
-	2238:  0x00007958,
-	2239:  0x000084A8,
-	2240:  0x00026B96,
-	2241:  0x00026E77,
-	2242:  0x00026E43,
-	2243:  0x000084DE,
-	2244:  0x0000840F,
-	2245:  0x00008391,
-	2246:  0x000044A0,
-	2247:  0x00008493,
-	2248:  0x000084E4,
-	2249:  0x00025C91,
-	2250:  0x00004240,
-	2251:  0x00025CC0,
-	2252:  0x00004543,
-	2253:  0x00008534,
-	2254:  0x00005AF2,
-	2255:  0x00026E99,
-	2256:  0x00004527,
-	2257:  0x00008573,
-	2258:  0x00004516,
-	2259:  0x000067BF,
-	2260:  0x00008616,
-	2261:  0x00028625,
-	2262:  0x0002863B,
-	2263:  0x000085C1,
-	2264:  0x00027088,
-	2265:  0x00008602,
-	2266:  0x00021582,
-	2267:  0x000270CD,
-	2268:  0x0002F9B2,
-	2269:  0x0000456A,
-	2270:  0x00008628,
-	2271:  0x00003648,
-	2272:  0x000218A2,
-	2273:  0x000053F7,
-	2274:  0x0002739A,
-	2275:  0x0000867E,
-	2276:  0x00008771,
-	2277:  0x0002A0F8,
-	2278:  0x000087EE,
-	2279:  0x00022C27,
-	2280:  0x000087B1,
-	2281:  0x000087DA,
-	2282:  0x0000880F,
-	2283:  0x00005661,
-	2284:  0x0000866C,
-	2285:  0x00006856,
-	2286:  0x0000460F,
-	2287:  0x00008845,
-	2288:  0x00008846,
-	2289:  0x000275E0,
-	2290:  0x00023DB9,
-	2291:  0x000275E4,
-	2292:  0x0000885E,
-	2293:  0x0000889C,
-	2294:  0x0000465B,
-	2295:  0x000088B4,
-	2296:  0x000088B5,
-	2297:  0x000063C1,
-	2298:  0x000088C5,
-	2299:  0x00007777,
-	2300:  0x0002770F,
-	2301:  0x00008987,
-	2302:  0x0000898A,
-	2303:  0x000089A6,
-	2304:  0x000089A9,
-	2305:  0x000089A7,
-	2306:  0x000089BC,
-	2307:  0x00028A25,
-	2308:  0x000089E7,
-	2309:  0x00027924,
-	2310:  0x00027ABD,
-	2311:  0x00008A9C,
-	2312:  0x00007793,
-	2313:  0x000091FE,
-	2314:  0x00008A90,
-	2315:  0x00027A59,
-	2316:  0x00007AE9,
-	2317:  0x00027B3A,
-	2318:  0x00023F8F,
-	2319:  0x00004713,
-	2320:  0x00027B38,
-	2321:  0x0000717C,
-	2322:  0x00008B0C,
-	2323:  0x00008B1F,
-	2324:  0x00025430,
-	2325:  0x00025565,
-	2326:  0x00008B3F,
-	2327:  0x00008B4C,
-	2328:  0x00008B4D,
-	2329:  0x00008AA9,
-	2330:  0x00024A7A,
-	2331:  0x00008B90,
-	2332:  0x00008B9B,
-	2333:  0x00008AAF,
-	2334:  0x000216DF,
-	2335:  0x00004615,
-	2336:  0x0000884F,
-	2337:  0x00008C9B,
-	2338:  0x00027D54,
-	2339:  0x00027D8F,
-	2340:  0x0002F9D4,
-	2341:  0x00003725,
-	2342:  0x00027D53,
-	2343:  0x00008CD6,
-	2344:  0x00027D98,
-	2345:  0x00027DBD,
-	2346:  0x00008D12,
-	2347:  0x00008D03,
-	2348:  0x00021910,
-	2349:  0x00008CDB,
-	2350:  0x0000705C,
-	2351:  0x00008D11,
-	2352:  0x00024CC9,
-	2353:  0x00003ED0,
-	2354:  0x00008D77,
-	2355:  0x00008DA9,
-	2356:  0x00028002,
-	2357:  0x00021014,
-	2358:  0x0002498A,
-	2359:  0x00003B7C,
-	2360:  0x000281BC,
-	2361:  0x0002710C,
-	2362:  0x00007AE7,
-	2363:  0x00008EAD,
-	2364:  0x00008EB6,
-	2365:  0x00008EC3,
-	2366:  0x000092D4,
-	2367:  0x00008F19,
-	2368:  0x00008F2D,
-	2369:  0x00028365,
-	2370:  0x00028412,
-	2371:  0x00008FA5,
-	2372:  0x00009303,
-	2373:  0x0002A29F,
-	2374:  0x00020A50,
-	2375:  0x00008FB3,
-	2376:  0x0000492A,
-	2377:  0x000289DE,
-	2378:  0x0002853D,
-	2379:  0x00023DBB,
-	2380:  0x00005EF8,
-	2381:  0x00023262,
-	2382:  0x00008FF9,
-	2383:  0x0002A014,
-	2384:  0x000286BC,
-	2385:  0x00028501,
-	2386:  0x00022325,
-	2387:  0x00003980,
-	2388:  0x00026ED7,
-	2389:  0x00009037,
-	2390:  0x0002853C,
-	2391:  0x00027ABE,
-	2392:  0x00009061,
-	2393:  0x0002856C,
-	2394:  0x0002860B,
-	2395:  0x000090A8,
-	2396:  0x00028713,
-	2397:  0x000090C4,
-	2398:  0x000286E6,
-	2399:  0x000090AE,
-	2400:  0x000090FD,
-	2401:  0x00009167,
-	2402:  0x00003AF0,
-	2403:  0x000091A9,
-	2404:  0x000091C4,
-	2405:  0x00007CAC,
-	2406:  0x00028933,
-	2407:  0x00021E89,
-	2408:  0x0000920E,
-	2409:  0x00006C9F,
-	2410:  0x00009241,
-	2411:  0x00009262,
-	2412:  0x000255B9,
-	2413:  0x000092B9,
-	2414:  0x00028AC6,
-	2415:  0x00023C9B,
-	2416:  0x00028B0C,
-	2417:  0x000255DB,
-	2418:  0x00020D31,
-	2419:  0x0000932C,
-	2420:  0x0000936B,
-	2421:  0x00028AE1,
-	2422:  0x00028BEB,
-	2423:  0x0000708F,
-	2424:  0x00005AC3,
-	2425:  0x00028AE2,
-	2426:  0x00028AE5,
-	2427:  0x00004965,
-	2428:  0x00009244,
-	2429:  0x00028BEC,
-	2430:  0x00028C39,
-	2431:  0x00028BFF,
-	2432:  0x00009373,
-	2433:  0x0000945B,
-	2434:  0x00008EBC,
-	2435:  0x00009585,
-	2436:  0x000095A6,
-	2437:  0x00009426,
-	2438:  0x000095A0,
-	2439:  0x00006FF6,
-	2440:  0x000042B9,
-	2441:  0x0002267A,
-	2442:  0x000286D8,
-	2443:  0x0002127C,
-	2444:  0x00023E2E,
-	2445:  0x000049DF,
-	2446:  0x00006C1C,
-	2447:  0x0000967B,
-	2448:  0x00009696,
-	2449:  0x0000416C,
-	2450:  0x000096A3,
-	2451:  0x00026ED5,
-	2452:  0x000061DA,
-	2453:  0x000096B6,
-	2454:  0x000078F5,
-	2455:  0x00028AE0,
-	2456:  0x000096BD,
-	2457:  0x000053CC,
-	2458:  0x000049A1,
-	2459:  0x00026CB8,
-	2460:  0x00020274,
-	2461:  0x00026410,
-	2462:  0x000290AF,
-	2463:  0x000290E5,
-	2464:  0x00024AD1,
-	2465:  0x00021915,
-	2466:  0x0002330A,
-	2467:  0x00009731,
-	2468:  0x00008642,
-	2469:  0x00009736,
-	2470:  0x00004A0F,
-	2471:  0x0000453D,
-	2472:  0x00004585,
-	2473:  0x00024AE9,
-	2474:  0x00007075,
-	2475:  0x00005B41,
-	2476:  0x0000971B,
-	2477:  0x0000975C,
-	2478:  0x000291D5,
-	2479:  0x00009757,
-	2480:  0x00005B4A,
-	2481:  0x000291EB,
-	2482:  0x0000975F,
-	2483:  0x00009425,
-	2484:  0x000050D0,
-	2485:  0x000230B7,
-	2486:  0x000230BC,
-	2487:  0x00009789,
-	2488:  0x0000979F,
-	2489:  0x000097B1,
-	2490:  0x000097BE,
-	2491:  0x000097C0,
-	2492:  0x000097D2,
-	2493:  0x000097E0,
-	2494:  0x0002546C,
-	2495:  0x000097EE,
-	2496:  0x0000741C,
-	2497:  0x00029433,
-	2498:  0x000097FF,
-	2499:  0x000097F5,
-	2500:  0x0002941D,
-	2501:  0x0002797A,
-	2502:  0x00004AD1,
-	2503:  0x00009834,
-	2504:  0x00009833,
-	2505:  0x0000984B,
-	2506:  0x00009866,
-	2507:  0x00003B0E,
-	2508:  0x00027175,
-	2509:  0x00003D51,
-	2510:  0x00020630,
-	2511:  0x0002415C,
-	2512:  0x00025706,
-	2513:  0x000098CA,
-	2514:  0x000098B7,
-	2515:  0x000098C8,
-	2516:  0x000098C7,
-	2517:  0x00004AFF,
-	2518:  0x00026D27,
-	2519:  0x000216D3,
-	2520:  0x000055B0,
-	2521:  0x000098E1,
-	2522:  0x000098E6,
-	2523:  0x000098EC,
-	2524:  0x00009378,
-	2525:  0x00009939,
-	2526:  0x00024A29,
-	2527:  0x00004B72,
-	2528:  0x00029857,
-	2529:  0x00029905,
-	2530:  0x000099F5,
-	2531:  0x00009A0C,
-	2532:  0x00009A3B,
-	2533:  0x00009A10,
-	2534:  0x00009A58,
-	2535:  0x00025725,
-	2536:  0x000036C4,
-	2537:  0x000290B1,
-	2538:  0x00029BD5,
-	2539:  0x00009AE0,
-	2540:  0x00009AE2,
-	2541:  0x00029B05,
-	2542:  0x00009AF4,
-	2543:  0x00004C0E,
-	2544:  0x00009B14,
-	2545:  0x00009B2D,
-	2546:  0x00028600,
-	2547:  0x00005034,
-	2548:  0x00009B34,
-	2549:  0x000269A8,
-	2550:  0x000038C3,
-	2551:  0x0002307D,
-	2552:  0x00009B50,
-	2553:  0x00009B40,
-	2554:  0x00029D3E,
-	2555:  0x00005A45,
-	2556:  0x00021863,
-	2557:  0x00009B8E,
-	2558:  0x0002424B,
-	2559:  0x00009C02,
-	2560:  0x00009BFF,
-	2561:  0x00009C0C,
-	2562:  0x00029E68,
-	2563:  0x00009DD4,
-	2564:  0x00029FB7,
-	2565:  0x0002A192,
-	2566:  0x0002A1AB,
-	2567:  0x0002A0E1,
-	2568:  0x0002A123,
-	2569:  0x0002A1DF,
-	2570:  0x00009D7E,
-	2571:  0x00009D83,
-	2572:  0x0002A134,
-	2573:  0x00009E0E,
-	2574:  0x00006888,
-	2575:  0x00009DC4,
-	2576:  0x0002215B,
-	2577:  0x0002A193,
-	2578:  0x0002A220,
-	2579:  0x0002193B,
-	2580:  0x0002A233,
-	2581:  0x00009D39,
-	2582:  0x0002A0B9,
-	2583:  0x0002A2B4,
-	2584:  0x00009E90,
-	2585:  0x00009E95,
-	2586:  0x00009E9E,
-	2587:  0x00009EA2,
-	2588:  0x00004D34,
-	2589:  0x00009EAA,
-	2590:  0x00009EAF,
-	2591:  0x00024364,
-	2592:  0x00009EC1,
-	2593:  0x00003B60,
-	2594:  0x000039E5,
-	2595:  0x00003D1D,
-	2596:  0x00004F32,
-	2597:  0x000037BE,
-	2598:  0x00028C2B,
-	2599:  0x00009F02,
-	2600:  0x00009F08,
-	2601:  0x00004B96,
-	2602:  0x00009424,
-	2603:  0x00026DA2,
-	2604:  0x00009F17,
-	2605:  0x00009F16,
-	2606:  0x00009F39,
-	2607:  0x0000569F,
-	2608:  0x0000568A,
-	2609:  0x00009F45,
-	2610:  0x000099B8,
-	2611:  0x0002908B,
-	2612:  0x000097F2,
-	2613:  0x0000847F,
-	2614:  0x00009F62,
-	2615:  0x00009F69,
-	2616:  0x00007ADC,
-	2617:  0x00009F8E,
-	2618:  0x00007216,
-	2619:  0x00004BBE,
-	2620:  0x00024975,
-	2621:  0x000249BB,
-	2622:  0x00007177,
-	2623:  0x000249F8,
-	2624:  0x00024348,
-	2625:  0x00024A51,
-	2626:  0x0000739E,
-	2627:  0x00028BDA,
-	2628:  0x000218FA,
-	2629:  0x0000799F,
-	2630:  0x0002897E,
-	2631:  0x00028E36,
-	2632:  0x00009369,
-	2633:  0x000093F3,
-	2634:  0x00028A44,
-	2635:  0x000092EC,
-	2636:  0x00009381,
-	2637:  0x000093CB,
-	2638:  0x0002896C,
-	2639:  0x000244B9,
-	2640:  0x00007217,
-	2641:  0x00003EEB,
-	2642:  0x00007772,
-	2643:  0x00007A43,
-	2644:  0x000070D0,
-	2645:  0x00024473,
-	2646:  0x000243F8,
-	2647:  0x0000717E,
-	2648:  0x000217EF,
-	2649:  0x000070A3,
-	2650:  0x000218BE,
-	2651:  0x00023599,
-	2652:  0x00003EC7,
-	2653:  0x00021885,
-	2654:  0x0002542F,
-	2655:  0x000217F8,
-	2656:  0x00003722,
-	2657:  0x000216FB,
-	2658:  0x00021839,
-	2659:  0x000036E1,
-	2660:  0x00021774,
-	2661:  0x000218D1,
-	2662:  0x00025F4B,
-	2663:  0x00003723,
-	2664:  0x000216C0,
-	2665:  0x0000575B,
-	2666:  0x00024A25,
-	2667:  0x000213FE,
-	2668:  0x000212A8,
-	2669:  0x000213C6,
-	2670:  0x000214B6,
-	2671:  0x00008503,
-	2672:  0x000236A6,
-	2673:  0x00008503,
-	2674:  0x00008455,
-	2675:  0x00024994,
-	2676:  0x00027165,
-	2677:  0x00023E31,
-	2678:  0x0002555C,
-	2679:  0x00023EFB,
-	2680:  0x00027052,
-	2681:  0x000044F4,
-	2682:  0x000236EE,
-	2683:  0x0002999D,
-	2684:  0x00026F26,
-	2685:  0x000067F9,
-	2686:  0x00003733,
-	2687:  0x00003C15,
-	2688:  0x00003DE7,
-	2689:  0x0000586C,
-	2690:  0x00021922,
-	2691:  0x00006810,
-	2692:  0x00004057,
-	2693:  0x0002373F,
-	2694:  0x000240E1,
-	2695:  0x0002408B,
-	2696:  0x0002410F,
-	2697:  0x00026C21,
-	2698:  0x000054CB,
-	2699:  0x0000569E,
-	2700:  0x000266B1,
-	2701:  0x00005692,
-	2702:  0x00020FDF,
-	2703:  0x00020BA8,
-	2704:  0x00020E0D,
-	2705:  0x000093C6,
-	2706:  0x00028B13,
-	2707:  0x0000939C,
-	2708:  0x00004EF8,
-	2709:  0x0000512B,
-	2710:  0x00003819,
-	2711:  0x00024436,
-	2712:  0x00004EBC,
-	2713:  0x00020465,
-	2714:  0x0002037F,
-	2715:  0x00004F4B,
-	2716:  0x00004F8A,
-	2717:  0x00025651,
-	2718:  0x00005A68,
-	2719:  0x000201AB,
-	2720:  0x000203CB,
-	2721:  0x00003999,
-	2722:  0x0002030A,
-	2723:  0x00020414,
-	2724:  0x00003435,
-	2725:  0x00004F29,
-	2726:  0x000202C0,
-	2727:  0x00028EB3,
-	2728:  0x00020275,
-	2729:  0x00008ADA,
-	2730:  0x0002020C,
-	2731:  0x00004E98,
-	2732:  0x000050CD,
-	2733:  0x0000510D,
-	2734:  0x00004FA2,
-	2735:  0x00004F03,
-	2736:  0x00024A0E,
-	2737:  0x00023E8A,
-	2738:  0x00004F42,
-	2739:  0x0000502E,
-	2740:  0x0000506C,
-	2741:  0x00005081,
-	2742:  0x00004FCC,
-	2743:  0x00004FE5,
-	2744:  0x00005058,
-	2745:  0x000050FC,
-	2746:  0x00005159,
-	2747:  0x0000515B,
-	2748:  0x0000515D,
-	2749:  0x0000515E,
-	2750:  0x00006E76,
-	2751:  0x00023595,
-	2752:  0x00023E39,
-	2753:  0x00023EBF,
-	2754:  0x00006D72,
-	2755:  0x00021884,
-	2756:  0x00023E89,
-	2757:  0x000051A8,
-	2758:  0x000051C3,
-	2759:  0x000205E0,
-	2760:  0x000044DD,
-	2761:  0x000204A3,
-	2762:  0x00020492,
-	2763:  0x00020491,
-	2764:  0x00008D7A,
-	2765:  0x00028A9C,
-	2766:  0x0002070E,
-	2767:  0x00005259,
-	2768:  0x000052A4,
-	2769:  0x00020873,
-	2770:  0x000052E1,
-	2771:  0x0000936E,
-	2772:  0x0000467A,
-	2773:  0x0000718C,
-	2774:  0x0002438C,
-	2775:  0x00020C20,
-	2776:  0x000249AC,
-	2777:  0x000210E4,
-	2778:  0x000069D1,
-	2779:  0x00020E1D,
-	2780:  0x00007479,
-	2781:  0x00003EDE,
-	2782:  0x00007499,
-	2783:  0x00007414,
-	2784:  0x00007456,
-	2785:  0x00007398,
-	2786:  0x00004B8E,
-	2787:  0x00024ABC,
-	2788:  0x0002408D,
-	2789:  0x000053D0,
-	2790:  0x00003584,
-	2791:  0x0000720F,
-	2792:  0x000240C9,
-	2793:  0x000055B4,
-	2794:  0x00020345,
-	2795:  0x000054CD,
-	2796:  0x00020BC6,
-	2797:  0x0000571D,
-	2798:  0x0000925D,
-	2799:  0x000096F4,
-	2800:  0x00009366,
-	2801:  0x000057DD,
-	2802:  0x0000578D,
-	2803:  0x0000577F,
-	2804:  0x0000363E,
-	2805:  0x000058CB,
-	2806:  0x00005A99,
-	2807:  0x00028A46,
-	2808:  0x000216FA,
-	2809:  0x0002176F,
-	2810:  0x00021710,
-	2811:  0x00005A2C,
-	2812:  0x000059B8,
-	2813:  0x0000928F,
-	2814:  0x00005A7E,
-	2815:  0x00005ACF,
-	2816:  0x00005A12,
-	2817:  0x00025946,
-	2818:  0x000219F3,
-	2819:  0x00021861,
-	2820:  0x00024295,
-	2821:  0x000036F5,
-	2822:  0x00006D05,
-	2823:  0x00007443,
-	2824:  0x00005A21,
-	2825:  0x00025E83,
-	2826:  0x00005A81,
-	2827:  0x00028BD7,
-	2828:  0x00020413,
-	2829:  0x000093E0,
-	2830:  0x0000748C,
-	2831:  0x00021303,
-	2832:  0x00007105,
-	2833:  0x00004972,
-	2834:  0x00009408,
-	2835:  0x000289FB,
-	2836:  0x000093BD,
-	2837:  0x000037A0,
-	2838:  0x00005C1E,
-	2839:  0x00005C9E,
-	2840:  0x00005E5E,
-	2841:  0x00005E48,
-	2842:  0x00021996,
-	2843:  0x0002197C,
-	2844:  0x00023AEE,
-	2845:  0x00005ECD,
-	2846:  0x00005B4F,
-	2847:  0x00021903,
-	2848:  0x00021904,
-	2849:  0x00003701,
-	2850:  0x000218A0,
-	2851:  0x000036DD,
-	2852:  0x000216FE,
-	2853:  0x000036D3,
-	2854:  0x0000812A,
-	2855:  0x00028A47,
-	2856:  0x00021DBA,
-	2857:  0x00023472,
-	2858:  0x000289A8,
-	2859:  0x00005F0C,
-	2860:  0x00005F0E,
-	2861:  0x00021927,
-	2862:  0x000217AB,
-	2863:  0x00005A6B,
-	2864:  0x0002173B,
-	2865:  0x00005B44,
-	2866:  0x00008614,
-	2867:  0x000275FD,
-	2868:  0x00008860,
-	2869:  0x0000607E,
-	2870:  0x00022860,
-	2871:  0x0002262B,
-	2872:  0x00005FDB,
-	2873:  0x00003EB8,
-	2874:  0x000225AF,
-	2875:  0x000225BE,
-	2876:  0x00029088,
-	2877:  0x00026F73,
-	2878:  0x000061C0,
-	2879:  0x0002003E,
-	2880:  0x00020046,
-	2881:  0x0002261B,
-	2882:  0x00006199,
-	2883:  0x00006198,
-	2884:  0x00006075,
-	2885:  0x00022C9B,
-	2886:  0x00022D07,
-	2887:  0x000246D4,
-	2888:  0x0002914D,
-	2889:  0x00006471,
-	2890:  0x00024665,
-	2891:  0x00022B6A,
-	2892:  0x00003A29,
-	2893:  0x00022B22,
-	2894:  0x00023450,
-	2895:  0x000298EA,
-	2896:  0x00022E78,
-	2897:  0x00006337,
-	2898:  0x0002A45B,
-	2899:  0x000064B6,
-	2900:  0x00006331,
-	2901:  0x000063D1,
-	2902:  0x000249E3,
-	2903:  0x00022D67,
-	2904:  0x000062A4,
-	2905:  0x00022CA1,
-	2906:  0x0000643B,
-	2907:  0x0000656B,
-	2908:  0x00006972,
-	2909:  0x00003BF4,
-	2910:  0x0002308E,
-	2911:  0x000232AD,
-	2912:  0x00024989,
-	2913:  0x000232AB,
-	2914:  0x0000550D,
-	2915:  0x000232E0,
-	2916:  0x000218D9,
-	2917:  0x0002943F,
-	2918:  0x000066CE,
-	2919:  0x00023289,
-	2920:  0x000231B3,
-	2921:  0x00003AE0,
-	2922:  0x00004190,
-	2923:  0x00025584,
-	2924:  0x00028B22,
-	2925:  0x0002558F,
-	2926:  0x000216FC,
-	2927:  0x0002555B,
-	2928:  0x00025425,
-	2929:  0x000078EE,
-	2930:  0x00023103,
-	2931:  0x0002182A,
-	2932:  0x00023234,
-	2933:  0x00003464,
-	2934:  0x0002320F,
-	2935:  0x00023182,
-	2936:  0x000242C9,
-	2937:  0x0000668E,
-	2938:  0x00026D24,
-	2939:  0x0000666B,
-	2940:  0x00004B93,
-	2941:  0x00006630,
-	2942:  0x00027870,
-	2943:  0x00021DEB,
-	2944:  0x00006663,
-	2945:  0x000232D2,
-	2946:  0x000232E1,
-	2947:  0x0000661E,
-	2948:  0x00025872,
-	2949:  0x000038D1,
-	2950:  0x0002383A,
-	2951:  0x000237BC,
-	2952:  0x00003B99,
-	2953:  0x000237A2,
-	2954:  0x000233FE,
-	2955:  0x000074D0,
-	2956:  0x00003B96,
-	2957:  0x0000678F,
-	2958:  0x0002462A,
-	2959:  0x000068B6,
-	2960:  0x0000681E,
-	2961:  0x00003BC4,
-	2962:  0x00006ABE,
-	2963:  0x00003863,
-	2964:  0x000237D5,
-	2965:  0x00024487,
-	2966:  0x00006A33,
-	2967:  0x00006A52,
-	2968:  0x00006AC9,
-	2969:  0x00006B05,
-	2970:  0x00021912,
-	2971:  0x00006511,
-	2972:  0x00006898,
-	2973:  0x00006A4C,
-	2974:  0x00003BD7,
-	2975:  0x00006A7A,
-	2976:  0x00006B57,
-	2977:  0x00023FC0,
-	2978:  0x00023C9A,
-	2979:  0x000093A0,
-	2980:  0x000092F2,
-	2981:  0x00028BEA,
-	2982:  0x00028ACB,
-	2983:  0x00009289,
-	2984:  0x0002801E,
-	2985:  0x000289DC,
-	2986:  0x00009467,
-	2987:  0x00006DA5,
-	2988:  0x00006F0B,
-	2989:  0x000249EC,
-	2990:  0x00006D67,
-	2991:  0x00023F7F,
-	2992:  0x00003D8F,
-	2993:  0x00006E04,
-	2994:  0x0002403C,
-	2995:  0x00005A3D,
-	2996:  0x00006E0A,
-	2997:  0x00005847,
-	2998:  0x00006D24,
-	2999:  0x00007842,
-	3000:  0x0000713B,
-	3001:  0x0002431A,
-	3002:  0x00024276,
-	3003:  0x000070F1,
-	3004:  0x00007250,
-	3005:  0x00007287,
-	3006:  0x00007294,
-	3007:  0x0002478F,
-	3008:  0x00024725,
-	3009:  0x00005179,
-	3010:  0x00024AA4,
-	3011:  0x000205EB,
-	3012:  0x0000747A,
-	3013:  0x00023EF8,
-	3014:  0x0002365F,
-	3015:  0x00024A4A,
-	3016:  0x00024917,
-	3017:  0x00025FE1,
-	3018:  0x00003F06,
-	3019:  0x00003EB1,
-	3020:  0x00024ADF,
-	3021:  0x00028C23,
-	3022:  0x00023F35,
-	3023:  0x000060A7,
-	3024:  0x00003EF3,
-	3025:  0x000074CC,
-	3026:  0x0000743C,
-	3027:  0x00009387,
-	3028:  0x00007437,
-	3029:  0x0000449F,
-	3030:  0x00026DEA,
-	3031:  0x00004551,
-	3032:  0x00007583,
-	3033:  0x00003F63,
-	3034:  0x00024CD9,
-	3035:  0x00024D06,
-	3036:  0x00003F58,
-	3037:  0x00007555,
-	3038:  0x00007673,
-	3039:  0x0002A5C6,
-	3040:  0x00003B19,
-	3041:  0x00007468,
-	3042:  0x00028ACC,
-	3043:  0x000249AB,
-	3044:  0x0002498E,
-	3045:  0x00003AFB,
-	3046:  0x00003DCD,
-	3047:  0x00024A4E,
-	3048:  0x00003EFF,
-	3049:  0x000249C5,
-	3050:  0x000248F3,
-	3051:  0x000091FA,
-	3052:  0x00005732,
-	3053:  0x00009342,
-	3054:  0x00028AE3,
-	3055:  0x00021864,
-	3056:  0x000050DF,
-	3057:  0x00025221,
-	3058:  0x000251E7,
-	3059:  0x00007778,
-	3060:  0x00023232,
-	3061:  0x0000770E,
-	3062:  0x0000770F,
-	3063:  0x0000777B,
-	3064:  0x00024697,
-	3065:  0x00023781,
-	3066:  0x00003A5E,
-	3067:  0x000248F0,
-	3068:  0x00007438,
-	3069:  0x0000749B,
-	3070:  0x00003EBF,
-	3071:  0x00024ABA,
-	3072:  0x00024AC7,
-	3073:  0x000040C8,
-	3074:  0x00024A96,
-	3075:  0x000261AE,
-	3076:  0x00009307,
-	3077:  0x00025581,
-	3078:  0x0000781E,
-	3079:  0x0000788D,
-	3080:  0x00007888,
-	3081:  0x000078D2,
-	3082:  0x000073D0,
-	3083:  0x00007959,
-	3084:  0x00027741,
-	3085:  0x000256E3,
-	3086:  0x0000410E,
-	3087:  0x0000799B,
-	3088:  0x00008496,
-	3089:  0x000079A5,
-	3090:  0x00006A2D,
-	3091:  0x00023EFA,
-	3092:  0x00007A3A,
-	3093:  0x000079F4,
-	3094:  0x0000416E,
-	3095:  0x000216E6,
-	3096:  0x00004132,
-	3097:  0x00009235,
-	3098:  0x000079F1,
-	3099:  0x00020D4C,
-	3100:  0x0002498C,
-	3101:  0x00020299,
-	3102:  0x00023DBA,
-	3103:  0x0002176E,
-	3104:  0x00003597,
-	3105:  0x0000556B,
-	3106:  0x00003570,
-	3107:  0x000036AA,
-	3108:  0x000201D4,
-	3109:  0x00020C0D,
-	3110:  0x00007AE2,
-	3111:  0x00005A59,
-	3112:  0x000226F5,
-	3113:  0x00025AAF,
-	3114:  0x00025A9C,
-	3115:  0x00005A0D,
-	3116:  0x0002025B,
-	3117:  0x000078F0,
-	3118:  0x00005A2A,
-	3119:  0x00025BC6,
-	3120:  0x00007AFE,
-	3121:  0x000041F9,
-	3122:  0x00007C5D,
-	3123:  0x00007C6D,
-	3124:  0x00004211,
-	3125:  0x00025BB3,
-	3126:  0x00025EBC,
-	3127:  0x00025EA6,
-	3128:  0x00007CCD,
-	3129:  0x000249F9,
-	3130:  0x000217B0,
-	3131:  0x00007C8E,
-	3132:  0x00007C7C,
-	3133:  0x00007CAE,
-	3134:  0x00006AB2,
-	3135:  0x00007DDC,
-	3136:  0x00007E07,
-	3137:  0x00007DD3,
-	3138:  0x00007F4E,
-	3139:  0x00026261,
-	3140:  0x0002615C,
-	3141:  0x00027B48,
-	3142:  0x00007D97,
-	3143:  0x00025E82,
-	3144:  0x0000426A,
-	3145:  0x00026B75,
-	3146:  0x00020916,
-	3147:  0x000067D6,
-	3148:  0x0002004E,
-	3149:  0x000235CF,
-	3150:  0x000057C4,
-	3151:  0x00026412,
-	3152:  0x000263F8,
-	3153:  0x00024962,
-	3154:  0x00007FDD,
-	3155:  0x00007B27,
-	3156:  0x0002082C,
-	3157:  0x00025AE9,
-	3158:  0x00025D43,
-	3159:  0x00007B0C,
-	3160:  0x00025E0E,
-	3161:  0x000099E6,
-	3162:  0x00008645,
-	3163:  0x00009A63,
-	3164:  0x00006A1C,
-	3165:  0x0002343F,
-	3166:  0x000039E2,
-	3167:  0x000249F7,
-	3168:  0x000265AD,
-	3169:  0x00009A1F,
-	3170:  0x000265A0,
-	3171:  0x00008480,
-	3172:  0x00027127,
-	3173:  0x00026CD1,
-	3174:  0x000044EA,
-	3175:  0x00008137,
-	3176:  0x00004402,
-	3177:  0x000080C6,
-	3178:  0x00008109,
-	3179:  0x00008142,
-	3180:  0x000267B4,
-	3181:  0x000098C3,
-	3182:  0x00026A42,
-	3183:  0x00008262,
-	3184:  0x00008265,
-	3185:  0x00026A51,
-	3186:  0x00008453,
-	3187:  0x00026DA7,
-	3188:  0x00008610,
-	3189:  0x0002721B,
-	3190:  0x00005A86,
-	3191:  0x0000417F,
-	3192:  0x00021840,
-	3193:  0x00005B2B,
-	3194:  0x000218A1,
-	3195:  0x00005AE4,
-	3196:  0x000218D8,
-	3197:  0x000086A0,
-	3198:  0x0002F9BC,
-	3199:  0x00023D8F,
-	3200:  0x0000882D,
-	3201:  0x00027422,
-	3202:  0x00005A02,
-	3203:  0x0000886E,
-	3204:  0x00004F45,
-	3205:  0x00008887,
-	3206:  0x000088BF,
-	3207:  0x000088E6,
-	3208:  0x00008965,
-	3209:  0x0000894D,
-	3210:  0x00025683,
-	3211:  0x00008954,
-	3212:  0x00027785,
-	3213:  0x00027784,
-	3214:  0x00028BF5,
-	3215:  0x00028BD9,
-	3216:  0x00028B9C,
-	3217:  0x000289F9,
-	3218:  0x00003EAD,
-	3219:  0x000084A3,
-	3220:  0x000046F5,
-	3221:  0x000046CF,
-	3222:  0x000037F2,
-	3223:  0x00008A3D,
-	3224:  0x00008A1C,
-	3225:  0x00029448,
-	3226:  0x00005F4D,
-	3227:  0x0000922B,
-	3228:  0x00024284,
-	3229:  0x000065D4,
-	3230:  0x00007129,
-	3231:  0x000070C4,
-	3232:  0x00021845,
-	3233:  0x00009D6D,
-	3234:  0x00008C9F,
-	3235:  0x00008CE9,
-	3236:  0x00027DDC,
-	3237:  0x0000599A,
-	3238:  0x000077C3,
-	3239:  0x000059F0,
-	3240:  0x0000436E,
-	3241:  0x000036D4,
-	3242:  0x00008E2A,
-	3243:  0x00008EA7,
-	3244:  0x00024C09,
-	3245:  0x00008F30,
-	3246:  0x00008F4A,
-	3247:  0x000042F4,
-	3248:  0x00006C58,
-	3249:  0x00006FBB,
-	3250:  0x00022321,
-	3251:  0x0000489B,
-	3252:  0x00006F79,
-	3253:  0x00006E8B,
-	3254:  0x000217DA,
-	3255:  0x00009BE9,
-	3256:  0x000036B5,
-	3257:  0x0002492F,
-	3258:  0x000090BB,
-	3259:  0x00009097,
-	3260:  0x00005571,
-	3261:  0x00004906,
-	3262:  0x000091BB,
-	3263:  0x00009404,
-	3264:  0x00028A4B,
-	3265:  0x00004062,
-	3266:  0x00028AFC,
-	3267:  0x00009427,
-	3268:  0x00028C1D,
-	3269:  0x00028C3B,
-	3270:  0x000084E5,
-	3271:  0x00008A2B,
-	3272:  0x00009599,
-	3273:  0x000095A7,
-	3274:  0x00009597,
-	3275:  0x00009596,
-	3276:  0x00028D34,
-	3277:  0x00007445,
-	3278:  0x00003EC2,
-	3279:  0x000248FF,
-	3280:  0x00024A42,
-	3281:  0x000243EA,
-	3282:  0x00003EE7,
-	3283:  0x00023225,
-	3284:  0x0000968F,
-	3285:  0x00028EE7,
-	3286:  0x00028E66,
-	3287:  0x00028E65,
-	3288:  0x00003ECC,
-	3289:  0x000249ED,
-	3290:  0x00024A78,
-	3291:  0x00023FEE,
-	3292:  0x00007412,
-	3293:  0x0000746B,
-	3294:  0x00003EFC,
-	3295:  0x00009741,
-	3296:  0x000290B0,
-	3297:  0x00006847,
-	3298:  0x00004A1D,
-	3299:  0x00029093,
-	3300:  0x000257DF,
-	3301:  0x0000975D,
-	3302:  0x00009368,
-	3303:  0x00028989,
-	3304:  0x00028C26,
-	3305:  0x00028B2F,
-	3306:  0x000263BE,
-	3307:  0x000092BA,
-	3308:  0x00005B11,
-	3309:  0x00008B69,
-	3310:  0x0000493C,
-	3311:  0x000073F9,
-	3312:  0x0002421B,
-	3313:  0x0000979B,
-	3314:  0x00009771,
-	3315:  0x00009938,
-	3316:  0x00020F26,
-	3317:  0x00005DC1,
-	3318:  0x00028BC5,
-	3319:  0x00024AB2,
-	3320:  0x0000981F,
-	3321:  0x000294DA,
-	3322:  0x000092F6,
-	3323:  0x000295D7,
-	3324:  0x000091E5,
-	3325:  0x000044C0,
-	3326:  0x00028B50,
-	3327:  0x00024A67,
-	3328:  0x00028B64,
-	3329:  0x000098DC,
-	3330:  0x00028A45,
-	3331:  0x00003F00,
-	3332:  0x0000922A,
-	3333:  0x00004925,
-	3334:  0x00008414,
-	3335:  0x0000993B,
-	3336:  0x0000994D,
-	3337:  0x00027B06,
-	3338:  0x00003DFD,
-	3339:  0x0000999B,
-	3340:  0x00004B6F,
-	3341:  0x000099AA,
-	3342:  0x00009A5C,
-	3343:  0x00028B65,
-	3344:  0x000258C8,
-	3345:  0x00006A8F,
-	3346:  0x00009A21,
-	3347:  0x00005AFE,
-	3348:  0x00009A2F,
-	3349:  0x000298F1,
-	3350:  0x00004B90,
-	3351:  0x00029948,
-	3352:  0x000099BC,
-	3353:  0x00004BBD,
-	3354:  0x00004B97,
-	3355:  0x0000937D,
-	3356:  0x00005872,
-	3357:  0x00021302,
-	3358:  0x00005822,
-	3359:  0x000249B8,
-	3360:  0x000214E8,
-	3361:  0x00007844,
-	3362:  0x0002271F,
-	3363:  0x00023DB8,
-	3364:  0x000068C5,
-	3365:  0x00003D7D,
-	3366:  0x00009458,
-	3367:  0x00003927,
-	3368:  0x00006150,
-	3369:  0x00022781,
-	3370:  0x0002296B,
-	3371:  0x00006107,
-	3372:  0x00009C4F,
-	3373:  0x00009C53,
-	3374:  0x00009C7B,
-	3375:  0x00009C35,
-	3376:  0x00009C10,
-	3377:  0x00009B7F,
-	3378:  0x00009BCF,
-	3379:  0x00029E2D,
-	3380:  0x00009B9F,
-	3381:  0x0002A1F5,
-	3382:  0x0002A0FE,
-	3383:  0x00009D21,
-	3384:  0x00004CAE,
-	3385:  0x00024104,
-	3386:  0x00009E18,
-	3387:  0x00004CB0,
-	3388:  0x00009D0C,
-	3389:  0x0002A1B4,
-	3390:  0x0002A0ED,
-	3391:  0x0002A0F3,
-	3392:  0x0002992F,
-	3393:  0x00009DA5,
-	3394:  0x000084BD,
-	3395:  0x00026E12,
-	3396:  0x00026FDF,
-	3397:  0x00026B82,
-	3398:  0x000085FC,
-	3399:  0x00004533,
-	3400:  0x00026DA4,
-	3401:  0x00026E84,
-	3402:  0x00026DF0,
-	3403:  0x00008420,
-	3404:  0x000085EE,
-	3405:  0x00026E00,
-	3406:  0x000237D7,
-	3407:  0x00026064,
-	3408:  0x000079E2,
-	3409:  0x0002359C,
-	3410:  0x00023640,
-	3411:  0x0000492D,
-	3412:  0x000249DE,
-	3413:  0x00003D62,
-	3414:  0x000093DB,
-	3415:  0x000092BE,
-	3416:  0x00009348,
-	3417:  0x000202BF,
-	3418:  0x000078B9,
-	3419:  0x00009277,
-	3420:  0x0000944D,
-	3421:  0x00004FE4,
-	3422:  0x00003440,
-	3423:  0x00009064,
-	3424:  0x0002555D,
-	3425:  0x0000783D,
-	3426:  0x00007854,
-	3427:  0x000078B6,
-	3428:  0x0000784B,
-	3429:  0x00021757,
-	3430:  0x000231C9,
-	3431:  0x00024941,
-	3432:  0x0000369A,
-	3433:  0x00004F72,
-	3434:  0x00006FDA,
-	3435:  0x00006FD9,
-	3436:  0x0000701E,
-	3437:  0x0000701E,
-	3438:  0x00005414,
-	3439:  0x000241B5,
-	3440:  0x000057BB,
-	3441:  0x000058F3,
-	3442:  0x0000578A,
-	3443:  0x00009D16,
-	3444:  0x000057D7,
-	3445:  0x00007134,
-	3446:  0x000034AF,
-	3447:  0x000241AC,
-	3448:  0x000071EB,
-	3449:  0x00026C40,
-	3450:  0x00024F97,
-	3451:  0x00005B28,
-	3452:  0x000217B5,
-	3453:  0x00028A49,
-	3454:  0x0000610C,
-	3455:  0x00005ACE,
-	3456:  0x00005A0B,
-	3457:  0x000042BC,
-	3458:  0x00024488,
-	3459:  0x0000372C,
-	3460:  0x00004B7B,
-	3461:  0x000289FC,
-	3462:  0x000093BB,
-	3463:  0x000093B8,
-	3464:  0x000218D6,
-	3465:  0x00020F1D,
-	3466:  0x00008472,
-	3467:  0x00026CC0,
-	3468:  0x00021413,
-	3469:  0x000242FA,
-	3470:  0x00022C26,
-	3471:  0x000243C1,
-	3472:  0x00005994,
-	3473:  0x00023DB7,
-	3474:  0x00026741,
-	3475:  0x00007DA8,
-	3476:  0x0002615B,
-	3477:  0x000260A4,
-	3478:  0x000249B9,
-	3479:  0x0002498B,
-	3480:  0x000289FA,
-	3481:  0x000092E5,
-	3482:  0x000073E2,
-	3483:  0x00003EE9,
-	3484:  0x000074B4,
-	3485:  0x00028B63,
-	3486:  0x0002189F,
-	3487:  0x00003EE1,
-	3488:  0x00024AB3,
-	3489:  0x00006AD8,
-	3490:  0x000073F3,
-	3491:  0x000073FB,
-	3492:  0x00003ED6,
-	3493:  0x00024A3E,
-	3494:  0x00024A94,
-	3495:  0x000217D9,
-	3496:  0x00024A66,
-	3497:  0x000203A7,
-	3498:  0x00021424,
-	3499:  0x000249E5,
-	3500:  0x00007448,
-	3501:  0x00024916,
-	3502:  0x000070A5,
-	3503:  0x00024976,
-	3504:  0x00009284,
-	3505:  0x000073E6,
-	3506:  0x0000935F,
-	3507:  0x000204FE,
-	3508:  0x00009331,
-	3509:  0x00028ACE,
-	3510:  0x00028A16,
-	3511:  0x00009386,
-	3512:  0x00028BE7,
-	3513:  0x000255D5,
-	3514:  0x00004935,
-	3515:  0x00028A82,
-	3516:  0x0000716B,
-	3517:  0x00024943,
-	3518:  0x00020CFF,
-	3519:  0x000056A4,
-	3520:  0x0002061A,
-	3521:  0x00020BEB,
-	3522:  0x00020CB8,
-	3523:  0x00005502,
-	3524:  0x000079C4,
-	3525:  0x000217FA,
-	3526:  0x00007DFE,
-	3527:  0x000216C2,
-	3528:  0x00024A50,
-	3529:  0x00021852,
-	3530:  0x0000452E,
-	3531:  0x00009401,
-	3532:  0x0000370A,
-	3533:  0x00028AC0,
-	3534:  0x000249AD,
-	3535:  0x000059B0,
-	3536:  0x000218BF,
-	3537:  0x00021883,
-	3538:  0x00027484,
-	3539:  0x00005AA1,
-	3540:  0x000036E2,
-	3541:  0x00023D5B,
-	3542:  0x000036B0,
-	3543:  0x0000925F,
-	3544:  0x00005A79,
-	3545:  0x00028A81,
-	3546:  0x00021862,
-	3547:  0x00009374,
-	3548:  0x00003CCD,
-	3549:  0x00020AB4,
-	3550:  0x00004A96,
-	3551:  0x0000398A,
-	3552:  0x000050F4,
-	3553:  0x00003D69,
-	3554:  0x00003D4C,
-	3555:  0x0002139C,
-	3556:  0x00007175,
-	3557:  0x000042FB,
-	3558:  0x00028218,
-	3559:  0x00006E0F,
-	3560:  0x000290E4,
-	3561:  0x000044EB,
-	3562:  0x00006D57,
-	3563:  0x00027E4F,
-	3564:  0x00007067,
-	3565:  0x00006CAF,
-	3566:  0x00003CD6,
-	3567:  0x00023FED,
-	3568:  0x00023E2D,
-	3569:  0x00006E02,
-	3570:  0x00006F0C,
-	3571:  0x00003D6F,
-	3572:  0x000203F5,
-	3573:  0x00007551,
-	3574:  0x000036BC,
-	3575:  0x000034C8,
-	3576:  0x00004680,
-	3577:  0x00003EDA,
-	3578:  0x00004871,
-	3579:  0x000059C4,
-	3580:  0x0000926E,
-	3581:  0x0000493E,
-	3582:  0x00008F41,
-	3583:  0x00028C1C,
-	3584:  0x00026BC0,
-	3585:  0x00005812,
-	3586:  0x000057C8,
-	3587:  0x000036D6,
-	3588:  0x00021452,
-	3589:  0x000070FE,
-	3590:  0x00024362,
-	3591:  0x00024A71,
-	3592:  0x00022FE3,
-	3593:  0x000212B0,
-	3594:  0x000223BD,
-	3595:  0x000068B9,
-	3596:  0x00006967,
-	3597:  0x00021398,
-	3598:  0x000234E5,
-	3599:  0x00027BF4,
-	3600:  0x000236DF,
-	3601:  0x00028A83,
-	3602:  0x000237D6,
-	3603:  0x000233FA,
-	3604:  0x00024C9F,
-	3605:  0x00006A1A,
-	3606:  0x000236AD,
-	3607:  0x00026CB7,
-	3608:  0x0000843E,
-	3609:  0x000044DF,
-	3610:  0x000044CE,
-	3611:  0x00026D26,
-	3612:  0x00026D51,
-	3613:  0x00026C82,
-	3614:  0x00026FDE,
-	3615:  0x00006F17,
-	3616:  0x00027109,
-	3617:  0x0000833D,
-	3618:  0x0002173A,
-	3619:  0x000083ED,
-	3620:  0x00026C80,
-	3621:  0x00027053,
-	3622:  0x000217DB,
-	3623:  0x00005989,
-	3624:  0x00005A82,
-	3625:  0x000217B3,
-	3626:  0x00005A61,
-	3627:  0x00005A71,
-	3628:  0x00021905,
-	3629:  0x000241FC,
-	3630:  0x0000372D,
-	3631:  0x000059EF,
-	3632:  0x0002173C,
-	3633:  0x000036C7,
-	3634:  0x0000718E,
-	3635:  0x00009390,
-	3636:  0x0000669A,
-	3637:  0x000242A5,
-	3638:  0x00005A6E,
-	3639:  0x00005A2B,
-	3640:  0x00024293,
-	3641:  0x00006A2B,
-	3642:  0x00023EF9,
-	3643:  0x00027736,
-	3644:  0x0002445B,
-	3645:  0x000242CA,
-	3646:  0x0000711D,
-	3647:  0x00024259,
-	3648:  0x000289E1,
-	3649:  0x00004FB0,
-	3650:  0x00026D28,
-	3651:  0x00005CC2,
-	3652:  0x000244CE,
-	3653:  0x00027E4D,
-	3654:  0x000243BD,
-	3655:  0x00006A0C,
-	3656:  0x00024256,
-	3657:  0x00021304,
-	3658:  0x000070A6,
-	3659:  0x00007133,
-	3660:  0x000243E9,
-	3661:  0x00003DA5,
-	3662:  0x00006CDF,
-	3663:  0x0002F825,
-	3664:  0x00024A4F,
-	3665:  0x00007E65,
-	3666:  0x000059EB,
-	3667:  0x00005D2F,
-	3668:  0x00003DF3,
-	3669:  0x00005F5C,
-	3670:  0x00024A5D,
-	3671:  0x000217DF,
-	3672:  0x00007DA4,
-	3673:  0x00008426,
-	3674:  0x00005485,
-	3675:  0x00023AFA,
-	3676:  0x00023300,
-	3677:  0x00020214,
-	3678:  0x0000577E,
-	3679:  0x000208D5,
-	3680:  0x00020619,
-	3681:  0x00003FE5,
-	3682:  0x00021F9E,
-	3683:  0x0002A2B6,
-	3684:  0x00007003,
-	3685:  0x0002915B,
-	3686:  0x00005D70,
-	3687:  0x0000738F,
-	3688:  0x00007CD3,
-	3689:  0x00028A59,
-	3690:  0x00029420,
-	3691:  0x00004FC8,
-	3692:  0x00007FE7,
-	3693:  0x000072CD,
-	3694:  0x00007310,
-	3695:  0x00027AF4,
-	3696:  0x00007338,
-	3697:  0x00007339,
-	3698:  0x000256F6,
-	3699:  0x00007341,
-	3700:  0x00007348,
-	3701:  0x00003EA9,
-	3702:  0x00027B18,
-	3703:  0x0000906C,
-	3704:  0x000071F5,
-	3705:  0x000248F2,
-	3706:  0x000073E1,
-	3707:  0x000081F6,
-	3708:  0x00003ECA,
-	3709:  0x0000770C,
-	3710:  0x00003ED1,
-	3711:  0x00006CA2,
-	3712:  0x000056FD,
-	3713:  0x00007419,
-	3714:  0x0000741E,
-	3715:  0x0000741F,
-	3716:  0x00003EE2,
-	3717:  0x00003EF0,
-	3718:  0x00003EF4,
-	3719:  0x00003EFA,
-	3720:  0x000074D3,
-	3721:  0x00003F0E,
-	3722:  0x00003F53,
-	3723:  0x00007542,
-	3724:  0x0000756D,
-	3725:  0x00007572,
-	3726:  0x0000758D,
-	3727:  0x00003F7C,
-	3728:  0x000075C8,
-	3729:  0x000075DC,
-	3730:  0x00003FC0,
-	3731:  0x0000764D,
-	3732:  0x00003FD7,
-	3733:  0x00007674,
-	3734:  0x00003FDC,
-	3735:  0x0000767A,
-	3736:  0x00024F5C,
-	3737:  0x00007188,
-	3738:  0x00005623,
-	3739:  0x00008980,
-	3740:  0x00005869,
-	3741:  0x0000401D,
-	3742:  0x00007743,
-	3743:  0x00004039,
-	3744:  0x00006761,
-	3745:  0x00004045,
-	3746:  0x000035DB,
-	3747:  0x00007798,
-	3748:  0x0000406A,
-	3749:  0x0000406F,
-	3750:  0x00005C5E,
-	3751:  0x000077BE,
-	3752:  0x000077CB,
-	3753:  0x000058F2,
-	3754:  0x00007818,
-	3755:  0x000070B9,
-	3756:  0x0000781C,
-	3757:  0x000040A8,
-	3758:  0x00007839,
-	3759:  0x00007847,
-	3760:  0x00007851,
-	3761:  0x00007866,
-	3762:  0x00008448,
-	3763:  0x00025535,
-	3764:  0x00007933,
-	3765:  0x00006803,
-	3766:  0x00007932,
-	3767:  0x00004103,
-	3768:  0x00004109,
-	3769:  0x00007991,
-	3770:  0x00007999,
-	3771:  0x00008FBB,
-	3772:  0x00007A06,
-	3773:  0x00008FBC,
-	3774:  0x00004167,
-	3775:  0x00007A91,
-	3776:  0x000041B2,
-	3777:  0x00007ABC,
-	3778:  0x00008279,
-	3779:  0x000041C4,
-	3780:  0x00007ACF,
-	3781:  0x00007ADB,
-	3782:  0x000041CF,
-	3783:  0x00004E21,
-	3784:  0x00007B62,
-	3785:  0x00007B6C,
-	3786:  0x00007B7B,
-	3787:  0x00007C12,
-	3788:  0x00007C1B,
-	3789:  0x00004260,
-	3790:  0x0000427A,
-	3791:  0x00007C7B,
-	3792:  0x00007C9C,
-	3793:  0x0000428C,
-	3794:  0x00007CB8,
-	3795:  0x00004294,
-	3796:  0x00007CED,
-	3797:  0x00008F93,
-	3798:  0x000070C0,
-	3799:  0x00020CCF,
-	3800:  0x00007DCF,
-	3801:  0x00007DD4,
-	3802:  0x00007DD0,
-	3803:  0x00007DFD,
-	3804:  0x00007FAE,
-	3805:  0x00007FB4,
-	3806:  0x0000729F,
-	3807:  0x00004397,
-	3808:  0x00008020,
-	3809:  0x00008025,
-	3810:  0x00007B39,
-	3811:  0x0000802E,
-	3812:  0x00008031,
-	3813:  0x00008054,
-	3814:  0x00003DCC,
-	3815:  0x000057B4,
-	3816:  0x000070A0,
-	3817:  0x000080B7,
-	3818:  0x000080E9,
-	3819:  0x000043ED,
-	3820:  0x0000810C,
-	3821:  0x0000732A,
-	3822:  0x0000810E,
-	3823:  0x00008112,
-	3824:  0x00007560,
-	3825:  0x00008114,
-	3826:  0x00004401,
-	3827:  0x00003B39,
-	3828:  0x00008156,
-	3829:  0x00008159,
-	3830:  0x0000815A,
-	3831:  0x00004413,
-	3832:  0x0000583A,
-	3833:  0x0000817C,
-	3834:  0x00008184,
-	3835:  0x00004425,
-	3836:  0x00008193,
-	3837:  0x0000442D,
-	3838:  0x000081A5,
-	3839:  0x000057EF,
-	3840:  0x000081C1,
-	3841:  0x000081E4,
-	3842:  0x00008254,
-	3843:  0x0000448F,
-	3844:  0x000082A6,
-	3845:  0x00008276,
-	3846:  0x000082CA,
-	3847:  0x000082D8,
-	3848:  0x000082FF,
-	3849:  0x000044B0,
-	3850:  0x00008357,
-	3851:  0x00009669,
-	3852:  0x0000698A,
-	3853:  0x00008405,
-	3854:  0x000070F5,
-	3855:  0x00008464,
-	3856:  0x000060E3,
-	3857:  0x00008488,
-	3858:  0x00004504,
-	3859:  0x000084BE,
-	3860:  0x000084E1,
-	3861:  0x000084F8,
-	3862:  0x00008510,
-	3863:  0x00008538,
-	3864:  0x00008552,
-	3865:  0x0000453B,
-	3866:  0x0000856F,
-	3867:  0x00008570,
-	3868:  0x000085E0,
-	3869:  0x00004577,
-	3870:  0x00008672,
-	3871:  0x00008692,
-	3872:  0x000086B2,
-	3873:  0x000086EF,
-	3874:  0x00009645,
-	3875:  0x0000878B,
-	3876:  0x00004606,
-	3877:  0x00004617,
-	3878:  0x000088AE,
-	3879:  0x000088FF,
-	3880:  0x00008924,
-	3881:  0x00008947,
-	3882:  0x00008991,
-	3883:  0x00027967,
-	3884:  0x00008A29,
-	3885:  0x00008A38,
-	3886:  0x00008A94,
-	3887:  0x00008AB4,
-	3888:  0x00008C51,
-	3889:  0x00008CD4,
-	3890:  0x00008CF2,
-	3891:  0x00008D1C,
-	3892:  0x00004798,
-	3893:  0x0000585F,
-	3894:  0x00008DC3,
-	3895:  0x000047ED,
-	3896:  0x00004EEE,
-	3897:  0x00008E3A,
-	3898:  0x000055D8,
-	3899:  0x00005754,
-	3900:  0x00008E71,
-	3901:  0x000055F5,
-	3902:  0x00008EB0,
-	3903:  0x00004837,
-	3904:  0x00008ECE,
-	3905:  0x00008EE2,
-	3906:  0x00008EE4,
-	3907:  0x00008EED,
-	3908:  0x00008EF2,
-	3909:  0x00008FB7,
-	3910:  0x00008FC1,
-	3911:  0x00008FCA,
-	3912:  0x00008FCC,
-	3913:  0x00009033,
-	3914:  0x000099C4,
-	3915:  0x000048AD,
-	3916:  0x000098E0,
-	3917:  0x00009213,
-	3918:  0x0000491E,
-	3919:  0x00009228,
-	3920:  0x00009258,
-	3921:  0x0000926B,
-	3922:  0x000092B1,
-	3923:  0x000092AE,
-	3924:  0x000092BF,
-	3925:  0x000092E3,
-	3926:  0x000092EB,
-	3927:  0x000092F3,
-	3928:  0x000092F4,
-	3929:  0x000092FD,
-	3930:  0x00009343,
-	3931:  0x00009384,
-	3932:  0x000093AD,
-	3933:  0x00004945,
-	3934:  0x00004951,
-	3935:  0x00009EBF,
-	3936:  0x00009417,
-	3937:  0x00005301,
-	3938:  0x0000941D,
-	3939:  0x0000942D,
-	3940:  0x0000943E,
-	3941:  0x0000496A,
-	3942:  0x00009454,
-	3943:  0x00009479,
-	3944:  0x0000952D,
-	3945:  0x000095A2,
-	3946:  0x000049A7,
-	3947:  0x000095F4,
-	3948:  0x00009633,
-	3949:  0x000049E5,
-	3950:  0x000067A0,
-	3951:  0x00004A24,
-	3952:  0x00009740,
-	3953:  0x00004A35,
-	3954:  0x000097B2,
-	3955:  0x000097C2,
-	3956:  0x00005654,
-	3957:  0x00004AE4,
-	3958:  0x000060E8,
-	3959:  0x000098B9,
-	3960:  0x00004B19,
-	3961:  0x000098F1,
-	3962:  0x00005844,
-	3963:  0x0000990E,
-	3964:  0x00009919,
-	3965:  0x000051B4,
-	3966:  0x0000991C,
-	3967:  0x00009937,
-	3968:  0x00009942,
-	3969:  0x0000995D,
-	3970:  0x00009962,
-	3971:  0x00004B70,
-	3972:  0x000099C5,
-	3973:  0x00004B9D,
-	3974:  0x00009A3C,
-	3975:  0x00009B0F,
-	3976:  0x00007A83,
-	3977:  0x00009B69,
-	3978:  0x00009B81,
-	3979:  0x00009BDD,
-	3980:  0x00009BF1,
-	3981:  0x00009BF4,
-	3982:  0x00004C6D,
-	3983:  0x00009C20,
-	3984:  0x0000376F,
-	3985:  0x00021BC2,
-	3986:  0x00009D49,
-	3987:  0x00009C3A,
-	3988:  0x00009EFE,
-	3989:  0x00005650,
-	3990:  0x00009D93,
-	3991:  0x00009DBD,
-	3992:  0x00009DC0,
-	3993:  0x00009DFC,
-	3994:  0x000094F6,
-	3995:  0x00008FB6,
-	3996:  0x00009E7B,
-	3997:  0x00009EAC,
-	3998:  0x00009EB1,
-	3999:  0x00009EBD,
-	4000:  0x00009EC6,
-	4001:  0x000094DC,
-	4002:  0x00009EE2,
-	4003:  0x00009EF1,
-	4004:  0x00009EF8,
-	4005:  0x00007AC8,
-	4006:  0x00009F44,
-	4007:  0x00020094,
-	4008:  0x000202B7,
-	4009:  0x000203A0,
-	4010:  0x0000691A,
-	4011:  0x000094C3,
-	4012:  0x000059AC,
-	4013:  0x000204D7,
-	4014:  0x00005840,
-	4015:  0x000094C1,
-	4016:  0x000037B9,
-	4017:  0x000205D5,
-	4018:  0x00020615,
-	4019:  0x00020676,
-	4020:  0x000216BA,
-	4021:  0x00005757,
-	4022:  0x00007173,
-	4023:  0x00020AC2,
-	4024:  0x00020ACD,
-	4025:  0x00020BBF,
-	4026:  0x0000546A,
-	4027:  0x0002F83B,
-	4028:  0x00020BCB,
-	4029:  0x0000549E,
-	4030:  0x00020BFB,
-	4031:  0x00020C3B,
-	4032:  0x00020C53,
-	4033:  0x00020C65,
-	4034:  0x00020C7C,
-	4035:  0x000060E7,
-	4036:  0x00020C8D,
-	4037:  0x0000567A,
-	4038:  0x00020CB5,
-	4039:  0x00020CDD,
-	4040:  0x00020CED,
-	4041:  0x00020D6F,
-	4042:  0x00020DB2,
-	4043:  0x00020DC8,
-	4044:  0x00006955,
-	4045:  0x00009C2F,
-	4046:  0x000087A5,
-	4047:  0x00020E04,
-	4048:  0x00020E0E,
-	4049:  0x00020ED7,
-	4050:  0x00020F90,
-	4051:  0x00020F2D,
-	4052:  0x00020E73,
-	4053:  0x00005C20,
-	4054:  0x00020FBC,
-	4055:  0x00005E0B,
-	4056:  0x0002105C,
-	4057:  0x0002104F,
-	4058:  0x00021076,
-	4059:  0x0000671E,
-	4060:  0x0002107B,
-	4061:  0x00021088,
-	4062:  0x00021096,
-	4063:  0x00003647,
-	4064:  0x000210BF,
-	4065:  0x000210D3,
-	4066:  0x0002112F,
-	4067:  0x0002113B,
-	4068:  0x00005364,
-	4069:  0x000084AD,
-	4070:  0x000212E3,
-	4071:  0x00021375,
-	4072:  0x00021336,
-	4073:  0x00008B81,
-	4074:  0x00021577,
-	4075:  0x00021619,
-	4076:  0x000217C3,
-	4077:  0x000217C7,
-	4078:  0x00004E78,
-	4079:  0x000070BB,
-	4080:  0x0002182D,
-	4081:  0x0002196A,
-	4082:  0x00021A2D,
-	4083:  0x00021A45,
-	4084:  0x00021C2A,
-	4085:  0x00021C70,
-	4086:  0x00021CAC,
-	4087:  0x00021EC8,
-	4088:  0x000062C3,
-	4089:  0x00021ED5,
-	4090:  0x00021F15,
-	4091:  0x00007198,
-	4092:  0x00006855,
-	4093:  0x00022045,
-	4094:  0x000069E9,
-	4095:  0x000036C8,
-	4096:  0x0002227C,
-	4097:  0x000223D7,
-	4098:  0x000223FA,
-	4099:  0x0002272A,
-	4100:  0x00022871,
-	4101:  0x0002294F,
-	4102:  0x000082FD,
-	4103:  0x00022967,
-	4104:  0x00022993,
-	4105:  0x00022AD5,
-	4106:  0x000089A5,
-	4107:  0x00022AE8,
-	4108:  0x00008FA0,
-	4109:  0x00022B0E,
-	4110:  0x000097B8,
-	4111:  0x00022B3F,
-	4112:  0x00009847,
-	4113:  0x00009ABD,
-	4114:  0x00022C4C,
-	4116:  0x00022C88,
-	4117:  0x00022CB7,
-	4118:  0x00025BE8,
-	4119:  0x00022D08,
-	4120:  0x00022D12,
-	4121:  0x00022DB7,
-	4122:  0x00022D95,
-	4123:  0x00022E42,
-	4124:  0x00022F74,
-	4125:  0x00022FCC,
-	4126:  0x00023033,
-	4127:  0x00023066,
-	4128:  0x0002331F,
-	4129:  0x000233DE,
-	4130:  0x00005FB1,
-	4131:  0x00006648,
-	4132:  0x000066BF,
-	4133:  0x00027A79,
-	4134:  0x00023567,
-	4135:  0x000235F3,
-	4136:  0x00007201,
-	4137:  0x000249BA,
-	4138:  0x000077D7,
-	4139:  0x0002361A,
-	4140:  0x00023716,
-	4141:  0x00007E87,
-	4142:  0x00020346,
-	4143:  0x000058B5,
-	4144:  0x0000670E,
-	4145:  0x00006918,
-	4146:  0x00023AA7,
-	4147:  0x00027657,
-	4148:  0x00025FE2,
-	4149:  0x00023E11,
-	4150:  0x00023EB9,
-	4151:  0x000275FE,
-	4152:  0x0002209A,
-	4153:  0x000048D0,
-	4154:  0x00004AB8,
-	4155:  0x00024119,
-	4156:  0x00028A9A,
-	4157:  0x000242EE,
-	4158:  0x0002430D,
-	4159:  0x0002403B,
-	4160:  0x00024334,
-	4161:  0x00024396,
-	4162:  0x00024A45,
-	4163:  0x000205CA,
-	4164:  0x000051D2,
-	4165:  0x00020611,
-	4166:  0x0000599F,
-	4167:  0x00021EA8,
-	4168:  0x00003BBE,
-	4169:  0x00023CFF,
-	4170:  0x00024404,
-	4171:  0x000244D6,
-	4172:  0x00005788,
-	4173:  0x00024674,
-	4174:  0x0000399B,
-	4175:  0x0002472F,
-	4176:  0x000285E8,
-	4177:  0x000299C9,
-	4178:  0x00003762,
-	4179:  0x000221C3,
-	4180:  0x00008B5E,
-	4181:  0x00028B4E,
-	4182:  0x000099D6,
-	4183:  0x00024812,
-	4184:  0x000248FB,
-	4185:  0x00024A15,
-	4186:  0x00007209,
-	4187:  0x00024AC0,
-	4188:  0x00020C78,
-	4189:  0x00005965,
-	4190:  0x00024EA5,
-	4191:  0x00024F86,
-	4192:  0x00020779,
-	4193:  0x00008EDA,
-	4194:  0x0002502C,
-	4195:  0x0000528F,
-	4196:  0x0000573F,
-	4197:  0x00007171,
-	4198:  0x00025299,
-	4199:  0x00025419,
-	4200:  0x00023F4A,
-	4201:  0x00024AA7,
-	4202:  0x000055BC,
-	4203:  0x00025446,
-	4204:  0x0002546E,
-	4205:  0x00026B52,
-	4206:  0x000091D4,
-	4207:  0x00003473,
-	4208:  0x0002553F,
-	4209:  0x00027632,
-	4210:  0x0002555E,
-	4211:  0x00004718,
-	4212:  0x00025562,
-	4213:  0x00025566,
-	4214:  0x000257C7,
-	4215:  0x0002493F,
-	4216:  0x0002585D,
-	4217:  0x00005066,
-	4218:  0x000034FB,
-	4219:  0x000233CC,
-	4220:  0x000060DE,
-	4221:  0x00025903,
-	4222:  0x0000477C,
-	4223:  0x00028948,
-	4224:  0x00025AAE,
-	4225:  0x00025B89,
-	4226:  0x00025C06,
-	4227:  0x00021D90,
-	4228:  0x000057A1,
-	4229:  0x00007151,
-	4230:  0x00006FB6,
-	4231:  0x00026102,
-	4232:  0x00027C12,
-	4233:  0x00009056,
-	4234:  0x000261B2,
-	4235:  0x00024F9A,
-	4236:  0x00008B62,
-	4237:  0x00026402,
-	4238:  0x0002644A,
-	4239:  0x00005D5B,
-	4240:  0x00026BF7,
-	4241:  0x00008F36,
-	4242:  0x00026484,
-	4243:  0x0002191C,
-	4244:  0x00008AEA,
-	4245:  0x000249F6,
-	4246:  0x00026488,
-	4247:  0x00023FEF,
-	4248:  0x00026512,
-	4249:  0x00004BC0,
-	4250:  0x000265BF,
-	4251:  0x000266B5,
-	4252:  0x0002271B,
-	4253:  0x00009465,
-	4254:  0x000257E1,
-	4255:  0x00006195,
-	4256:  0x00005A27,
-	4257:  0x0002F8CD,
-	4258:  0x00004FBB,
-	4259:  0x000056B9,
-	4260:  0x00024521,
-	4261:  0x000266FC,
-	4262:  0x00004E6A,
-	4263:  0x00024934,
-	4264:  0x00009656,
-	4265:  0x00006D8F,
-	4266:  0x00026CBD,
-	4267:  0x00003618,
-	4268:  0x00008977,
-	4269:  0x00026799,
-	4270:  0x0002686E,
-	4271:  0x00026411,
-	4272:  0x0002685E,
-	4273:  0x000071DF,
-	4274:  0x000268C7,
-	4275:  0x00007B42,
-	4276:  0x000290C0,
-	4277:  0x00020A11,
-	4278:  0x00026926,
-	4279:  0x00009104,
-	4280:  0x00026939,
-	4281:  0x00007A45,
-	4282:  0x00009DF0,
-	4283:  0x000269FA,
-	4284:  0x00009A26,
-	4285:  0x00026A2D,
-	4286:  0x0000365F,
-	4287:  0x00026469,
-	4288:  0x00020021,
-	4289:  0x00007983,
-	4290:  0x00026A34,
-	4291:  0x00026B5B,
-	4292:  0x00005D2C,
-	4293:  0x00023519,
-	4294:  0x000083CF,
-	4295:  0x00026B9D,
-	4296:  0x000046D0,
-	4297:  0x00026CA4,
-	4298:  0x0000753B,
-	4299:  0x00008865,
-	4300:  0x00026DAE,
-	4301:  0x000058B6,
-	4302:  0x0000371C,
-	4303:  0x0002258D,
-	4304:  0x0002704B,
-	4305:  0x000271CD,
-	4306:  0x00003C54,
-	4307:  0x00027280,
-	4308:  0x00027285,
-	4309:  0x00009281,
-	4310:  0x0002217A,
-	4311:  0x0002728B,
-	4312:  0x00009330,
-	4313:  0x000272E6,
-	4314:  0x000249D0,
-	4315:  0x00006C39,
-	4316:  0x0000949F,
-	4317:  0x00027450,
-	4318:  0x00020EF8,
-	4319:  0x00008827,
-	4320:  0x000088F5,
-	4321:  0x00022926,
-	4322:  0x00028473,
-	4323:  0x000217B1,
-	4324:  0x00006EB8,
-	4325:  0x00024A2A,
-	4326:  0x00021820,
-	4327:  0x000039A4,
-	4328:  0x000036B9,
-	4329:  0x00005C10,
-	4330:  0x000079E3,
-	4331:  0x0000453F,
-	4332:  0x000066B6,
-	4333:  0x00029CAD,
-	4334:  0x000298A4,
-	4335:  0x00008943,
-	4336:  0x000277CC,
-	4337:  0x00027858,
-	4338:  0x000056D6,
-	4339:  0x000040DF,
-	4340:  0x0002160A,
-	4341:  0x000039A1,
-	4342:  0x0002372F,
-	4343:  0x000280E8,
-	4344:  0x000213C5,
-	4345:  0x000071AD,
-	4346:  0x00008366,
-	4347:  0x000279DD,
-	4348:  0x000291A8,
-	4349:  0x00005A67,
-	4350:  0x00004CB7,
-	4351:  0x000270AF,
-	4352:  0x000289AB,
-	4353:  0x000279FD,
-	4354:  0x00027A0A,
-	4355:  0x00027B0B,
-	4356:  0x00027D66,
-	4357:  0x0002417A,
-	4358:  0x00007B43,
-	4359:  0x0000797E,
-	4360:  0x00028009,
-	4361:  0x00006FB5,
-	4362:  0x0002A2DF,
-	4363:  0x00006A03,
-	4364:  0x00028318,
-	4365:  0x000053A2,
-	4366:  0x00026E07,
-	4367:  0x000093BF,
-	4368:  0x00006836,
-	4369:  0x0000975D,
-	4370:  0x0002816F,
-	4371:  0x00028023,
-	4372:  0x000269B5,
-	4373:  0x000213ED,
-	4374:  0x0002322F,
-	4375:  0x00028048,
-	4376:  0x00005D85,
-	4377:  0x00028C30,
-	4378:  0x00028083,
-	4379:  0x00005715,
-	4380:  0x00009823,
-	4381:  0x00028949,
-	4382:  0x00005DAB,
-	4383:  0x00024988,
-	4384:  0x000065BE,
-	4385:  0x000069D5,
-	4386:  0x000053D2,
-	4387:  0x00024AA5,
-	4388:  0x00023F81,
-	4389:  0x00003C11,
-	4390:  0x00006736,
-	4391:  0x00028090,
-	4392:  0x000280F4,
-	4393:  0x0002812E,
-	4394:  0x00021FA1,
-	4395:  0x0002814F,
-	4396:  0x00028189,
-	4397:  0x000281AF,
-	4398:  0x0002821A,
-	4399:  0x00028306,
-	4400:  0x0002832F,
-	4401:  0x0002838A,
-	4402:  0x000035CA,
-	4403:  0x00028468,
-	4404:  0x000286AA,
-	4405:  0x000048FA,
-	4406:  0x000063E6,
-	4407:  0x00028956,
-	4408:  0x00007808,
-	4409:  0x00009255,
-	4410:  0x000289B8,
-	4411:  0x000043F2,
-	4412:  0x000289E7,
-	4413:  0x000043DF,
-	4414:  0x000289E8,
-	4415:  0x00028B46,
-	4416:  0x00028BD4,
-	4417:  0x000059F8,
-	4418:  0x00028C09,
-	4419:  0x00008F0B,
-	4420:  0x00028FC5,
-	4421:  0x000290EC,
-	4422:  0x00007B51,
-	4423:  0x00029110,
-	4424:  0x0002913C,
-	4425:  0x00003DF7,
-	4426:  0x0002915E,
-	4427:  0x00024ACA,
-	4428:  0x00008FD0,
-	4429:  0x0000728F,
-	4430:  0x0000568B,
-	4431:  0x000294E7,
-	4432:  0x000295E9,
-	4433:  0x000295B0,
-	4434:  0x000295B8,
-	4435:  0x00029732,
-	4436:  0x000298D1,
-	4437:  0x00029949,
-	4438:  0x0002996A,
-	4439:  0x000299C3,
-	4440:  0x00029A28,
-	4441:  0x00029B0E,
-	4442:  0x00029D5A,
-	4443:  0x00029D9B,
-	4444:  0x00007E9F,
-	4445:  0x00029EF8,
-	4446:  0x00029F23,
-	4447:  0x00004CA4,
-	4448:  0x00009547,
-	4449:  0x0002A293,
-	4450:  0x000071A2,
-	4451:  0x0002A2FF,
-	4452:  0x00004D91,
-	4453:  0x00009012,
-	4454:  0x0002A5CB,
-	4455:  0x00004D9C,
-	4456:  0x00020C9C,
-	4457:  0x00008FBE,
-	4458:  0x000055C1,
-	4459:  0x00008FBA,
-	4460:  0x000224B0,
-	4461:  0x00008FB9,
-	4462:  0x00024A93,
-	4463:  0x00004509,
-	4464:  0x00007E7F,
-	4465:  0x00006F56,
-	4466:  0x00006AB1,
-	4467:  0x00004EEA,
-	4468:  0x000034E4,
-	4469:  0x00028B2C,
-	4470:  0x0002789D,
-	4471:  0x0000373A,
-	4472:  0x00008E80,
-	4473:  0x000217F5,
-	4474:  0x00028024,
-	4475:  0x00028B6C,
-	4476:  0x00028B99,
-	4477:  0x00027A3E,
-	4478:  0x000266AF,
-	4479:  0x00003DEB,
-	4480:  0x00027655,
-	4481:  0x00023CB7,
-	4482:  0x00025635,
-	4483:  0x00025956,
-	4484:  0x00004E9A,
-	4485:  0x00025E81,
-	4486:  0x00026258,
-	4487:  0x000056BF,
-	4488:  0x00020E6D,
-	4489:  0x00008E0E,
-	4490:  0x00005B6D,
-	4491:  0x00023E88,
-	4492:  0x00024C9E,
-	4493:  0x000063DE,
-	4494:  0x000062D0,
-	4495:  0x000217F6,
-	4496:  0x0002187B,
-	4497:  0x00006530,
-	4498:  0x0000562D,
-	4499:  0x00025C4A,
-	4500:  0x0000541A,
-	4501:  0x00025311,
-	4502:  0x00003DC6,
-	4503:  0x00029D98,
-	4504:  0x00004C7D,
-	4505:  0x00005622,
-	4506:  0x0000561E,
-	4507:  0x00007F49,
-	4508:  0x00025ED8,
-	4509:  0x00005975,
-	4510:  0x00023D40,
-	4511:  0x00008770,
-	4512:  0x00004E1C,
-	4513:  0x00020FEA,
-	4514:  0x00020D49,
-	4515:  0x000236BA,
-	4516:  0x00008117,
-	4517:  0x00009D5E,
-	4518:  0x00008D18,
-	4519:  0x0000763B,
-	4520:  0x00009C45,
-	4521:  0x0000764E,
-	4522:  0x000077B9,
-	4523:  0x00009345,
-	4524:  0x00005432,
-	4525:  0x00008148,
-	4526:  0x000082F7,
-	4527:  0x00005625,
-	4528:  0x00008132,
-	4529:  0x00008418,
-	4530:  0x000080BD,
-	4531:  0x000055EA,
-	4532:  0x00007962,
-	4533:  0x00005643,
-	4534:  0x00005416,
-	4535:  0x00020E9D,
-	4536:  0x000035CE,
-	4537:  0x00005605,
-	4538:  0x000055F1,
-	4539:  0x000066F1,
-	4540:  0x000282E2,
-	4541:  0x0000362D,
-	4542:  0x00007534,
-	4543:  0x000055F0,
-	4544:  0x000055BA,
-	4545:  0x00005497,
-	4546:  0x00005572,
-	4547:  0x00020C41,
-	4548:  0x00020C96,
-	4549:  0x00005ED0,
-	4550:  0x00025148,
-	4551:  0x00020E76,
-	4552:  0x00022C62,
-	4553:  0x00020EA2,
-	4554:  0x00009EAB,
-	4555:  0x00007D5A,
-	4556:  0x000055DE,
-	4557:  0x00021075,
-	4558:  0x0000629D,
-	4559:  0x0000976D,
-	4560:  0x00005494,
-	4561:  0x00008CCD,
-	4562:  0x000071F6,
-	4563:  0x00009176,
-	4564:  0x000063FC,
-	4565:  0x000063B9,
-	4566:  0x000063FE,
-	4567:  0x00005569,
-	4568:  0x00022B43,
-	4569:  0x00009C72,
-	4570:  0x00022EB3,
-	4571:  0x0000519A,
-	4572:  0x000034DF,
-	4573:  0x00020DA7,
-	4574:  0x000051A7,
-	4575:  0x0000544D,
-	4576:  0x0000551E,
-	4577:  0x00005513,
-	4578:  0x00007666,
-	4579:  0x00008E2D,
-	4580:  0x0002688A,
-	4581:  0x000075B1,
-	4582:  0x000080B6,
-	4583:  0x00008804,
-	4584:  0x00008786,
-	4585:  0x000088C7,
-	4586:  0x000081B6,
-	4587:  0x0000841C,
-	4588:  0x000210C1,
-	4589:  0x000044EC,
-	4590:  0x00007304,
-	4591:  0x00024706,
-	4592:  0x00005B90,
-	4593:  0x0000830B,
-	4594:  0x00026893,
-	4595:  0x0000567B,
-	4596:  0x000226F4,
-	4597:  0x00027D2F,
-	4598:  0x000241A3,
-	4599:  0x00027D73,
-	4600:  0x00026ED0,
-	4601:  0x000272B6,
-	4602:  0x00009170,
-	4603:  0x000211D9,
-	4604:  0x00009208,
-	4605:  0x00023CFC,
-	4606:  0x0002A6A9,
-	4607:  0x00020EAC,
-	4608:  0x00020EF9,
-	4609:  0x00007266,
-	4610:  0x00021CA2,
-	4611:  0x0000474E,
-	4612:  0x00024FC2,
-	4613:  0x00027FF9,
-	4614:  0x00020FEB,
-	4615:  0x000040FA,
-	4616:  0x00009C5D,
-	4617:  0x0000651F,
-	4618:  0x00022DA0,
-	4619:  0x000048F3,
-	4620:  0x000247E0,
-	4621:  0x00029D7C,
-	4622:  0x00020FEC,
-	4623:  0x00020E0A,
-	4624:  0x00006062,
-	4625:  0x000275A3,
-	4626:  0x00020FED,
-	4628:  0x00026048,
-	4629:  0x00021187,
-	4630:  0x000071A3,
-	4631:  0x00007E8E,
-	4632:  0x00009D50,
-	4633:  0x00004E1A,
-	4634:  0x00004E04,
-	4635:  0x00003577,
-	4636:  0x00005B0D,
-	4637:  0x00006CB2,
-	4638:  0x00005367,
-	4639:  0x000036AC,
-	4640:  0x000039DC,
-	4641:  0x0000537D,
-	4642:  0x000036A5,
-	4643:  0x00024618,
-	4644:  0x0000589A,
-	4645:  0x00024B6E,
-	4646:  0x0000822D,
-	4647:  0x0000544B,
-	4648:  0x000057AA,
-	4649:  0x00025A95,
-	4650:  0x00020979,
-	4652:  0x00003A52,
-	4653:  0x00022465,
-	4654:  0x00007374,
-	4655:  0x00029EAC,
-	4656:  0x00004D09,
-	4657:  0x00009BED,
-	4658:  0x00023CFE,
-	4659:  0x00029F30,
-	4660:  0x00004C5B,
-	4661:  0x00024FA9,
-	4662:  0x0002959E,
-	4663:  0x00029FDE,
-	4664:  0x0000845C,
-	4665:  0x00023DB6,
-	4666:  0x000272B2,
-	4667:  0x000267B3,
-	4668:  0x00023720,
-	4669:  0x0000632E,
-	4670:  0x00007D25,
-	4671:  0x00023EF7,
-	4672:  0x00023E2C,
-	4673:  0x00003A2A,
-	4674:  0x00009008,
-	4675:  0x000052CC,
-	4676:  0x00003E74,
-	4677:  0x0000367A,
-	4678:  0x000045E9,
-	4679:  0x0002048E,
-	4680:  0x00007640,
-	4681:  0x00005AF0,
-	4682:  0x00020EB6,
-	4683:  0x0000787A,
-	4684:  0x00027F2E,
-	4685:  0x000058A7,
-	4686:  0x000040BF,
-	4687:  0x0000567C,
-	4688:  0x00009B8B,
-	4689:  0x00005D74,
-	4690:  0x00007654,
-	4691:  0x0002A434,
-	4692:  0x00009E85,
-	4693:  0x00004CE1,
-	4694:  0x000075F9,
-	4695:  0x000037FB,
-	4696:  0x00006119,
-	4697:  0x000230DA,
-	4698:  0x000243F2,
-	4700:  0x0000565D,
-	4701:  0x000212A9,
-	4702:  0x000057A7,
-	4703:  0x00024963,
-	4704:  0x00029E06,
-	4705:  0x00005234,
-	4706:  0x000270AE,
-	4707:  0x000035AD,
-	4708:  0x00006C4A,
-	4709:  0x00009D7C,
-	4710:  0x00007C56,
-	4711:  0x00009B39,
-	4712:  0x000057DE,
-	4713:  0x0002176C,
-	4714:  0x00005C53,
-	4715:  0x000064D3,
-	4716:  0x000294D0,
-	4717:  0x00026335,
-	4718:  0x00027164,
-	4719:  0x000086AD,
-	4720:  0x00020D28,
-	4721:  0x00026D22,
-	4722:  0x00024AE2,
-	4723:  0x00020D71,
-	4725:  0x000051FE,
-	4726:  0x00021F0F,
-	4727:  0x00005D8E,
-	4728:  0x00009703,
-	4729:  0x00021DD1,
-	4730:  0x00009E81,
-	4731:  0x0000904C,
-	4732:  0x00007B1F,
-	4733:  0x00009B02,
-	4734:  0x00005CD1,
-	4735:  0x00007BA3,
-	4736:  0x00006268,
-	4737:  0x00006335,
-	4738:  0x00009AFF,
-	4739:  0x00007BCF,
-	4740:  0x00009B2A,
-	4741:  0x00007C7E,
-	4742:  0x00009B2E,
-	4743:  0x00007C42,
-	4744:  0x00007C86,
-	4745:  0x00009C15,
-	4746:  0x00007BFC,
-	4747:  0x00009B09,
-	4748:  0x00009F17,
-	4749:  0x00009C1B,
-	4750:  0x0002493E,
-	4751:  0x00009F5A,
-	4752:  0x00005573,
-	4753:  0x00005BC3,
-	4754:  0x00004FFD,
-	4755:  0x00009E98,
-	4756:  0x00004FF2,
-	4757:  0x00005260,
-	4758:  0x00003E06,
-	4759:  0x000052D1,
-	4760:  0x00005767,
-	4761:  0x00005056,
-	4762:  0x000059B7,
-	4763:  0x00005E12,
-	4764:  0x000097C8,
-	4765:  0x00009DAB,
-	4766:  0x00008F5C,
-	4767:  0x00005469,
-	4768:  0x000097B4,
-	4769:  0x00009940,
-	4770:  0x000097BA,
-	4771:  0x0000532C,
-	4772:  0x00006130,
-	4773:  0x0000692C,
-	4774:  0x000053DA,
-	4775:  0x00009C0A,
-	4776:  0x00009D02,
-	4777:  0x00004C3B,
-	4778:  0x00009641,
-	4779:  0x00006980,
-	4780:  0x000050A6,
-	4781:  0x00007546,
-	4782:  0x0002176D,
-	4783:  0x000099DA,
-	4784:  0x00005273,
-	4786:  0x00009159,
-	4787:  0x00009681,
-	4788:  0x0000915C,
-	4790:  0x00009151,
-	4791:  0x00028E97,
-	4792:  0x0000637F,
-	4793:  0x00026D23,
-	4794:  0x00006ACA,
-	4795:  0x00005611,
-	4796:  0x0000918E,
-	4797:  0x0000757A,
-	4798:  0x00006285,
-	4799:  0x000203FC,
-	4800:  0x0000734F,
-	4801:  0x00007C70,
-	4802:  0x00025C21,
-	4803:  0x00023CFD,
-	4805:  0x00024919,
-	4806:  0x000076D6,
-	4807:  0x00009B9D,
-	4808:  0x00004E2A,
-	4809:  0x00020CD4,
-	4810:  0x000083BE,
-	4811:  0x00008842,
-	4813:  0x00005C4A,
-	4814:  0x000069C0,
-	4815:  0x000050ED,
-	4816:  0x0000577A,
-	4817:  0x0000521F,
-	4818:  0x00005DF5,
-	4819:  0x00004ECE,
-	4820:  0x00006C31,
-	4821:  0x000201F2,
-	4822:  0x00004F39,
-	4823:  0x0000549C,
-	4824:  0x000054DA,
-	4825:  0x0000529A,
-	4826:  0x00008D82,
-	4827:  0x000035FE,
-	4828:  0x00005F0C,
-	4829:  0x000035F3,
-	4831:  0x00006B52,
-	4832:  0x0000917C,
-	4833:  0x00009FA5,
-	4834:  0x00009B97,
-	4835:  0x0000982E,
-	4836:  0x000098B4,
-	4837:  0x00009ABA,
-	4838:  0x00009EA8,
-	4839:  0x00009E84,
-	4840:  0x0000717A,
-	4841:  0x00007B14,
-	4843:  0x00006BFA,
-	4844:  0x00008818,
-	4845:  0x00007F78,
-	4847:  0x00005620,
-	4848:  0x0002A64A,
-	4849:  0x00008E77,
-	4850:  0x00009F53,
-	4852:  0x00008DD4,
-	4853:  0x00008E4F,
-	4854:  0x00009E1C,
-	4855:  0x00008E01,
-	4856:  0x00006282,
-	4857:  0x0002837D,
-	4858:  0x00008E28,
-	4859:  0x00008E75,
-	4860:  0x00007AD3,
-	4861:  0x00024A77,
-	4862:  0x00007A3E,
-	4863:  0x000078D8,
-	4864:  0x00006CEA,
-	4865:  0x00008A67,
-	4866:  0x00007607,
-	4867:  0x00028A5A,
-	4868:  0x00009F26,
-	4869:  0x00006CCE,
-	4870:  0x000087D6,
-	4871:  0x000075C3,
-	4872:  0x0002A2B2,
-	4873:  0x00007853,
-	4874:  0x0002F840,
-	4875:  0x00008D0C,
-	4876:  0x000072E2,
-	4877:  0x00007371,
-	4878:  0x00008B2D,
-	4879:  0x00007302,
-	4880:  0x000074F1,
-	4881:  0x00008CEB,
-	4882:  0x00024ABB,
-	4883:  0x0000862F,
-	4884:  0x00005FBA,
-	4885:  0x000088A0,
-	4886:  0x000044B7,
-	4888:  0x0002183B,
-	4889:  0x00026E05,
-	4891:  0x00008A7E,
-	4892:  0x0002251B,
-	4894:  0x000060FD,
-	4895:  0x00007667,
-	4896:  0x00009AD7,
-	4897:  0x00009D44,
-	4898:  0x0000936E,
-	4899:  0x00009B8F,
-	4900:  0x000087F5,
-	4902:  0x0000880F,
-	4903:  0x00008CF7,
-	4904:  0x0000732C,
-	4905:  0x00009721,
-	4906:  0x00009BB0,
-	4907:  0x000035D6,
-	4908:  0x000072B2,
-	4909:  0x00004C07,
-	4910:  0x00007C51,
-	4911:  0x0000994A,
-	4912:  0x00026159,
-	4913:  0x00006159,
-	4914:  0x00004C04,
-	4915:  0x00009E96,
-	4916:  0x0000617D,
-	4918:  0x0000575F,
-	4919:  0x0000616F,
-	4920:  0x000062A6,
-	4921:  0x00006239,
-	4922:  0x000062CE,
-	4923:  0x00003A5C,
-	4924:  0x000061E2,
-	4925:  0x000053AA,
-	4926:  0x000233F5,
-	4927:  0x00006364,
-	4928:  0x00006802,
-	4929:  0x000035D2,
-	4930:  0x00005D57,
-	4931:  0x00028BC2,
-	4932:  0x00008FDA,
-	4933:  0x00028E39,
-	4935:  0x000050D9,
-	4936:  0x00021D46,
-	4937:  0x00007906,
-	4938:  0x00005332,
-	4939:  0x00009638,
-	4940:  0x00020F3B,
-	4941:  0x00004065,
-	4943:  0x000077FE,
-	4945:  0x00007CC2,
-	4946:  0x00025F1A,
-	4947:  0x00007CDA,
-	4948:  0x00007A2D,
-	4949:  0x00008066,
-	4950:  0x00008063,
-	4951:  0x00007D4D,
-	4952:  0x00007505,
-	4953:  0x000074F2,
-	4954:  0x00008994,
-	4955:  0x0000821A,
-	4956:  0x0000670C,
-	4957:  0x00008062,
-	4958:  0x00027486,
-	4959:  0x0000805B,
-	4960:  0x000074F0,
-	4961:  0x00008103,
-	4962:  0x00007724,
-	4963:  0x00008989,
-	4964:  0x000267CC,
-	4965:  0x00007553,
-	4966:  0x00026ED1,
-	4967:  0x000087A9,
-	4968:  0x000087CE,
-	4969:  0x000081C8,
-	4970:  0x0000878C,
-	4971:  0x00008A49,
-	4972:  0x00008CAD,
-	4973:  0x00008B43,
-	4974:  0x0000772B,
-	4975:  0x000074F8,
-	4976:  0x000084DA,
-	4977:  0x00003635,
-	4978:  0x000069B2,
-	4979:  0x00008DA6,
-	4981:  0x000089A9,
-	4982:  0x00007468,
-	4983:  0x00006DB9,
-	4984:  0x000087C1,
-	4985:  0x00024011,
-	4986:  0x000074E7,
-	4987:  0x00003DDB,
-	4988:  0x00007176,
-	4989:  0x000060A4,
-	4990:  0x0000619C,
-	4991:  0x00003CD1,
-	4992:  0x00007162,
-	4993:  0x00006077,
-	4995:  0x00007F71,
-	4996:  0x00028B2D,
-	4997:  0x00007250,
-	4998:  0x000060E9,
-	4999:  0x00004B7E,
-	5000:  0x00005220,
-	5001:  0x00003C18,
-	5002:  0x00023CC7,
-	5003:  0x00025ED7,
-	5004:  0x00027656,
-	5005:  0x00025531,
-	5006:  0x00021944,
-	5007:  0x000212FE,
-	5008:  0x00029903,
-	5009:  0x00026DDC,
-	5010:  0x000270AD,
-	5011:  0x00005CC1,
-	5012:  0x000261AD,
-	5013:  0x00028A0F,
-	5014:  0x00023677,
-	5015:  0x000200EE,
-	5016:  0x00026846,
-	5017:  0x00024F0E,
-	5018:  0x00004562,
-	5019:  0x00005B1F,
-	5020:  0x0002634C,
-	5021:  0x00009F50,
-	5022:  0x00009EA6,
-	5023:  0x0002626B,
-	5024:  0x00003000,
-	5025:  0x0000FF0C,
-	5026:  0x00003001,
-	5027:  0x00003002,
-	5028:  0x0000FF0E,
-	5029:  0x00002027,
-	5030:  0x0000FF1B,
-	5031:  0x0000FF1A,
-	5032:  0x0000FF1F,
-	5033:  0x0000FF01,
-	5034:  0x0000FE30,
-	5035:  0x00002026,
-	5036:  0x00002025,
-	5037:  0x0000FE50,
-	5038:  0x0000FE51,
-	5039:  0x0000FE52,
-	5040:  0x000000B7,
-	5041:  0x0000FE54,
-	5042:  0x0000FE55,
-	5043:  0x0000FE56,
-	5044:  0x0000FE57,
-	5045:  0x0000FF5C,
-	5046:  0x00002013,
-	5047:  0x0000FE31,
-	5048:  0x00002014,
-	5049:  0x0000FE33,
-	5050:  0x00002574,
-	5051:  0x0000FE34,
-	5052:  0x0000FE4F,
-	5053:  0x0000FF08,
-	5054:  0x0000FF09,
-	5055:  0x0000FE35,
-	5056:  0x0000FE36,
-	5057:  0x0000FF5B,
-	5058:  0x0000FF5D,
-	5059:  0x0000FE37,
-	5060:  0x0000FE38,
-	5061:  0x00003014,
-	5062:  0x00003015,
-	5063:  0x0000FE39,
-	5064:  0x0000FE3A,
-	5065:  0x00003010,
-	5066:  0x00003011,
-	5067:  0x0000FE3B,
-	5068:  0x0000FE3C,
-	5069:  0x0000300A,
-	5070:  0x0000300B,
-	5071:  0x0000FE3D,
-	5072:  0x0000FE3E,
-	5073:  0x00003008,
-	5074:  0x00003009,
-	5075:  0x0000FE3F,
-	5076:  0x0000FE40,
-	5077:  0x0000300C,
-	5078:  0x0000300D,
-	5079:  0x0000FE41,
-	5080:  0x0000FE42,
-	5081:  0x0000300E,
-	5082:  0x0000300F,
-	5083:  0x0000FE43,
-	5084:  0x0000FE44,
-	5085:  0x0000FE59,
-	5086:  0x0000FE5A,
-	5087:  0x0000FE5B,
-	5088:  0x0000FE5C,
-	5089:  0x0000FE5D,
-	5090:  0x0000FE5E,
-	5091:  0x00002018,
-	5092:  0x00002019,
-	5093:  0x0000201C,
-	5094:  0x0000201D,
-	5095:  0x0000301D,
-	5096:  0x0000301E,
-	5097:  0x00002035,
-	5098:  0x00002032,
-	5099:  0x0000FF03,
-	5100:  0x0000FF06,
-	5101:  0x0000FF0A,
-	5102:  0x0000203B,
-	5103:  0x000000A7,
-	5104:  0x00003003,
-	5105:  0x000025CB,
-	5106:  0x000025CF,
-	5107:  0x000025B3,
-	5108:  0x000025B2,
-	5109:  0x000025CE,
-	5110:  0x00002606,
-	5111:  0x00002605,
-	5112:  0x000025C7,
-	5113:  0x000025C6,
-	5114:  0x000025A1,
-	5115:  0x000025A0,
-	5116:  0x000025BD,
-	5117:  0x000025BC,
-	5118:  0x000032A3,
-	5119:  0x00002105,
-	5120:  0x000000AF,
-	5121:  0x0000FFE3,
-	5122:  0x0000FF3F,
-	5123:  0x000002CD,
-	5124:  0x0000FE49,
-	5125:  0x0000FE4A,
-	5126:  0x0000FE4D,
-	5127:  0x0000FE4E,
-	5128:  0x0000FE4B,
-	5129:  0x0000FE4C,
-	5130:  0x0000FE5F,
-	5131:  0x0000FE60,
-	5132:  0x0000FE61,
-	5133:  0x0000FF0B,
-	5134:  0x0000FF0D,
-	5135:  0x000000D7,
-	5136:  0x000000F7,
-	5137:  0x000000B1,
-	5138:  0x0000221A,
-	5139:  0x0000FF1C,
-	5140:  0x0000FF1E,
-	5141:  0x0000FF1D,
-	5142:  0x00002266,
-	5143:  0x00002267,
-	5144:  0x00002260,
-	5145:  0x0000221E,
-	5146:  0x00002252,
-	5147:  0x00002261,
-	5148:  0x0000FE62,
-	5149:  0x0000FE63,
-	5150:  0x0000FE64,
-	5151:  0x0000FE65,
-	5152:  0x0000FE66,
-	5153:  0x0000FF5E,
-	5154:  0x00002229,
-	5155:  0x0000222A,
-	5156:  0x000022A5,
-	5157:  0x00002220,
-	5158:  0x0000221F,
-	5159:  0x000022BF,
-	5160:  0x000033D2,
-	5161:  0x000033D1,
-	5162:  0x0000222B,
-	5163:  0x0000222E,
-	5164:  0x00002235,
-	5165:  0x00002234,
-	5166:  0x00002640,
-	5167:  0x00002642,
-	5168:  0x00002295,
-	5169:  0x00002299,
-	5170:  0x00002191,
-	5171:  0x00002193,
-	5172:  0x00002190,
-	5173:  0x00002192,
-	5174:  0x00002196,
-	5175:  0x00002197,
-	5176:  0x00002199,
-	5177:  0x00002198,
-	5178:  0x00002225,
-	5179:  0x00002223,
-	5180:  0x0000FF0F,
-	5181:  0x0000FF3C,
-	5182:  0x00002215,
-	5183:  0x0000FE68,
-	5184:  0x0000FF04,
-	5185:  0x0000FFE5,
-	5186:  0x00003012,
-	5187:  0x0000FFE0,
-	5188:  0x0000FFE1,
-	5189:  0x0000FF05,
-	5190:  0x0000FF20,
-	5191:  0x00002103,
-	5192:  0x00002109,
-	5193:  0x0000FE69,
-	5194:  0x0000FE6A,
-	5195:  0x0000FE6B,
-	5196:  0x000033D5,
-	5197:  0x0000339C,
-	5198:  0x0000339D,
-	5199:  0x0000339E,
-	5200:  0x000033CE,
-	5201:  0x000033A1,
-	5202:  0x0000338E,
-	5203:  0x0000338F,
-	5204:  0x000033C4,
-	5205:  0x000000B0,
-	5206:  0x00005159,
-	5207:  0x0000515B,
-	5208:  0x0000515E,
-	5209:  0x0000515D,
-	5210:  0x00005161,
-	5211:  0x00005163,
-	5212:  0x000055E7,
-	5213:  0x000074E9,
-	5214:  0x00007CCE,
-	5215:  0x00002581,
-	5216:  0x00002582,
-	5217:  0x00002583,
-	5218:  0x00002584,
-	5219:  0x00002585,
-	5220:  0x00002586,
-	5221:  0x00002587,
-	5222:  0x00002588,
-	5223:  0x0000258F,
-	5224:  0x0000258E,
-	5225:  0x0000258D,
-	5226:  0x0000258C,
-	5227:  0x0000258B,
-	5228:  0x0000258A,
-	5229:  0x00002589,
-	5230:  0x0000253C,
-	5231:  0x00002534,
-	5232:  0x0000252C,
-	5233:  0x00002524,
-	5234:  0x0000251C,
-	5235:  0x00002594,
-	5236:  0x00002500,
-	5237:  0x00002502,
-	5238:  0x00002595,
-	5239:  0x0000250C,
-	5240:  0x00002510,
-	5241:  0x00002514,
-	5242:  0x00002518,
-	5243:  0x0000256D,
-	5244:  0x0000256E,
-	5245:  0x00002570,
-	5246:  0x0000256F,
-	5247:  0x00002550,
-	5248:  0x0000255E,
-	5249:  0x0000256A,
-	5250:  0x00002561,
-	5251:  0x000025E2,
-	5252:  0x000025E3,
-	5253:  0x000025E5,
-	5254:  0x000025E4,
-	5255:  0x00002571,
-	5256:  0x00002572,
-	5257:  0x00002573,
-	5258:  0x0000FF10,
-	5259:  0x0000FF11,
-	5260:  0x0000FF12,
-	5261:  0x0000FF13,
-	5262:  0x0000FF14,
-	5263:  0x0000FF15,
-	5264:  0x0000FF16,
-	5265:  0x0000FF17,
-	5266:  0x0000FF18,
-	5267:  0x0000FF19,
-	5268:  0x00002160,
-	5269:  0x00002161,
-	5270:  0x00002162,
-	5271:  0x00002163,
-	5272:  0x00002164,
-	5273:  0x00002165,
-	5274:  0x00002166,
-	5275:  0x00002167,
-	5276:  0x00002168,
-	5277:  0x00002169,
-	5278:  0x00003021,
-	5279:  0x00003022,
-	5280:  0x00003023,
-	5281:  0x00003024,
-	5282:  0x00003025,
-	5283:  0x00003026,
-	5284:  0x00003027,
-	5285:  0x00003028,
-	5286:  0x00003029,
-	5287:  0x00005341,
-	5288:  0x00005344,
-	5289:  0x00005345,
-	5290:  0x0000FF21,
-	5291:  0x0000FF22,
-	5292:  0x0000FF23,
-	5293:  0x0000FF24,
-	5294:  0x0000FF25,
-	5295:  0x0000FF26,
-	5296:  0x0000FF27,
-	5297:  0x0000FF28,
-	5298:  0x0000FF29,
-	5299:  0x0000FF2A,
-	5300:  0x0000FF2B,
-	5301:  0x0000FF2C,
-	5302:  0x0000FF2D,
-	5303:  0x0000FF2E,
-	5304:  0x0000FF2F,
-	5305:  0x0000FF30,
-	5306:  0x0000FF31,
-	5307:  0x0000FF32,
-	5308:  0x0000FF33,
-	5309:  0x0000FF34,
-	5310:  0x0000FF35,
-	5311:  0x0000FF36,
-	5312:  0x0000FF37,
-	5313:  0x0000FF38,
-	5314:  0x0000FF39,
-	5315:  0x0000FF3A,
-	5316:  0x0000FF41,
-	5317:  0x0000FF42,
-	5318:  0x0000FF43,
-	5319:  0x0000FF44,
-	5320:  0x0000FF45,
-	5321:  0x0000FF46,
-	5322:  0x0000FF47,
-	5323:  0x0000FF48,
-	5324:  0x0000FF49,
-	5325:  0x0000FF4A,
-	5326:  0x0000FF4B,
-	5327:  0x0000FF4C,
-	5328:  0x0000FF4D,
-	5329:  0x0000FF4E,
-	5330:  0x0000FF4F,
-	5331:  0x0000FF50,
-	5332:  0x0000FF51,
-	5333:  0x0000FF52,
-	5334:  0x0000FF53,
-	5335:  0x0000FF54,
-	5336:  0x0000FF55,
-	5337:  0x0000FF56,
-	5338:  0x0000FF57,
-	5339:  0x0000FF58,
-	5340:  0x0000FF59,
-	5341:  0x0000FF5A,
-	5342:  0x00000391,
-	5343:  0x00000392,
-	5344:  0x00000393,
-	5345:  0x00000394,
-	5346:  0x00000395,
-	5347:  0x00000396,
-	5348:  0x00000397,
-	5349:  0x00000398,
-	5350:  0x00000399,
-	5351:  0x0000039A,
-	5352:  0x0000039B,
-	5353:  0x0000039C,
-	5354:  0x0000039D,
-	5355:  0x0000039E,
-	5356:  0x0000039F,
-	5357:  0x000003A0,
-	5358:  0x000003A1,
-	5359:  0x000003A3,
-	5360:  0x000003A4,
-	5361:  0x000003A5,
-	5362:  0x000003A6,
-	5363:  0x000003A7,
-	5364:  0x000003A8,
-	5365:  0x000003A9,
-	5366:  0x000003B1,
-	5367:  0x000003B2,
-	5368:  0x000003B3,
-	5369:  0x000003B4,
-	5370:  0x000003B5,
-	5371:  0x000003B6,
-	5372:  0x000003B7,
-	5373:  0x000003B8,
-	5374:  0x000003B9,
-	5375:  0x000003BA,
-	5376:  0x000003BB,
-	5377:  0x000003BC,
-	5378:  0x000003BD,
-	5379:  0x000003BE,
-	5380:  0x000003BF,
-	5381:  0x000003C0,
-	5382:  0x000003C1,
-	5383:  0x000003C3,
-	5384:  0x000003C4,
-	5385:  0x000003C5,
-	5386:  0x000003C6,
-	5387:  0x000003C7,
-	5388:  0x000003C8,
-	5389:  0x000003C9,
-	5390:  0x00003105,
-	5391:  0x00003106,
-	5392:  0x00003107,
-	5393:  0x00003108,
-	5394:  0x00003109,
-	5395:  0x0000310A,
-	5396:  0x0000310B,
-	5397:  0x0000310C,
-	5398:  0x0000310D,
-	5399:  0x0000310E,
-	5400:  0x0000310F,
-	5401:  0x00003110,
-	5402:  0x00003111,
-	5403:  0x00003112,
-	5404:  0x00003113,
-	5405:  0x00003114,
-	5406:  0x00003115,
-	5407:  0x00003116,
-	5408:  0x00003117,
-	5409:  0x00003118,
-	5410:  0x00003119,
-	5411:  0x0000311A,
-	5412:  0x0000311B,
-	5413:  0x0000311C,
-	5414:  0x0000311D,
-	5415:  0x0000311E,
-	5416:  0x0000311F,
-	5417:  0x00003120,
-	5418:  0x00003121,
-	5419:  0x00003122,
-	5420:  0x00003123,
-	5421:  0x00003124,
-	5422:  0x00003125,
-	5423:  0x00003126,
-	5424:  0x00003127,
-	5425:  0x00003128,
-	5426:  0x00003129,
-	5427:  0x000002D9,
-	5428:  0x000002C9,
-	5429:  0x000002CA,
-	5430:  0x000002C7,
-	5431:  0x000002CB,
-	5432:  0x00002400,
-	5433:  0x00002401,
-	5434:  0x00002402,
-	5435:  0x00002403,
-	5436:  0x00002404,
-	5437:  0x00002405,
-	5438:  0x00002406,
-	5439:  0x00002407,
-	5440:  0x00002408,
-	5441:  0x00002409,
-	5442:  0x0000240A,
-	5443:  0x0000240B,
-	5444:  0x0000240C,
-	5445:  0x0000240D,
-	5446:  0x0000240E,
-	5447:  0x0000240F,
-	5448:  0x00002410,
-	5449:  0x00002411,
-	5450:  0x00002412,
-	5451:  0x00002413,
-	5452:  0x00002414,
-	5453:  0x00002415,
-	5454:  0x00002416,
-	5455:  0x00002417,
-	5456:  0x00002418,
-	5457:  0x00002419,
-	5458:  0x0000241A,
-	5459:  0x0000241B,
-	5460:  0x0000241C,
-	5461:  0x0000241D,
-	5462:  0x0000241E,
-	5463:  0x0000241F,
-	5464:  0x00002421,
-	5465:  0x000020AC,
-	5495:  0x00004E00,
-	5496:  0x00004E59,
-	5497:  0x00004E01,
-	5498:  0x00004E03,
-	5499:  0x00004E43,
-	5500:  0x00004E5D,
-	5501:  0x00004E86,
-	5502:  0x00004E8C,
-	5503:  0x00004EBA,
-	5504:  0x0000513F,
-	5505:  0x00005165,
-	5506:  0x0000516B,
-	5507:  0x000051E0,
-	5508:  0x00005200,
-	5509:  0x00005201,
-	5510:  0x0000529B,
-	5511:  0x00005315,
-	5512:  0x00005341,
-	5513:  0x0000535C,
-	5514:  0x000053C8,
-	5515:  0x00004E09,
-	5516:  0x00004E0B,
-	5517:  0x00004E08,
-	5518:  0x00004E0A,
-	5519:  0x00004E2B,
-	5520:  0x00004E38,
-	5521:  0x000051E1,
-	5522:  0x00004E45,
-	5523:  0x00004E48,
-	5524:  0x00004E5F,
-	5525:  0x00004E5E,
-	5526:  0x00004E8E,
-	5527:  0x00004EA1,
-	5528:  0x00005140,
-	5529:  0x00005203,
-	5530:  0x000052FA,
-	5531:  0x00005343,
-	5532:  0x000053C9,
-	5533:  0x000053E3,
-	5534:  0x0000571F,
-	5535:  0x000058EB,
-	5536:  0x00005915,
-	5537:  0x00005927,
-	5538:  0x00005973,
-	5539:  0x00005B50,
-	5540:  0x00005B51,
-	5541:  0x00005B53,
-	5542:  0x00005BF8,
-	5543:  0x00005C0F,
-	5544:  0x00005C22,
-	5545:  0x00005C38,
-	5546:  0x00005C71,
-	5547:  0x00005DDD,
-	5548:  0x00005DE5,
-	5549:  0x00005DF1,
-	5550:  0x00005DF2,
-	5551:  0x00005DF3,
-	5552:  0x00005DFE,
-	5553:  0x00005E72,
-	5554:  0x00005EFE,
-	5555:  0x00005F0B,
-	5556:  0x00005F13,
-	5557:  0x0000624D,
-	5558:  0x00004E11,
-	5559:  0x00004E10,
-	5560:  0x00004E0D,
-	5561:  0x00004E2D,
-	5562:  0x00004E30,
-	5563:  0x00004E39,
-	5564:  0x00004E4B,
-	5565:  0x00005C39,
-	5566:  0x00004E88,
-	5567:  0x00004E91,
-	5568:  0x00004E95,
-	5569:  0x00004E92,
-	5570:  0x00004E94,
-	5571:  0x00004EA2,
-	5572:  0x00004EC1,
-	5573:  0x00004EC0,
-	5574:  0x00004EC3,
-	5575:  0x00004EC6,
-	5576:  0x00004EC7,
-	5577:  0x00004ECD,
-	5578:  0x00004ECA,
-	5579:  0x00004ECB,
-	5580:  0x00004EC4,
-	5581:  0x00005143,
-	5582:  0x00005141,
-	5583:  0x00005167,
-	5584:  0x0000516D,
-	5585:  0x0000516E,
-	5586:  0x0000516C,
-	5587:  0x00005197,
-	5588:  0x000051F6,
-	5589:  0x00005206,
-	5590:  0x00005207,
-	5591:  0x00005208,
-	5592:  0x000052FB,
-	5593:  0x000052FE,
-	5594:  0x000052FF,
-	5595:  0x00005316,
-	5596:  0x00005339,
-	5597:  0x00005348,
-	5598:  0x00005347,
-	5599:  0x00005345,
-	5600:  0x0000535E,
-	5601:  0x00005384,
-	5602:  0x000053CB,
-	5603:  0x000053CA,
-	5604:  0x000053CD,
-	5605:  0x000058EC,
-	5606:  0x00005929,
-	5607:  0x0000592B,
-	5608:  0x0000592A,
-	5609:  0x0000592D,
-	5610:  0x00005B54,
-	5611:  0x00005C11,
-	5612:  0x00005C24,
-	5613:  0x00005C3A,
-	5614:  0x00005C6F,
-	5615:  0x00005DF4,
-	5616:  0x00005E7B,
-	5617:  0x00005EFF,
-	5618:  0x00005F14,
-	5619:  0x00005F15,
-	5620:  0x00005FC3,
-	5621:  0x00006208,
-	5622:  0x00006236,
-	5623:  0x0000624B,
-	5624:  0x0000624E,
-	5625:  0x0000652F,
-	5626:  0x00006587,
-	5627:  0x00006597,
-	5628:  0x000065A4,
-	5629:  0x000065B9,
-	5630:  0x000065E5,
-	5631:  0x000066F0,
-	5632:  0x00006708,
-	5633:  0x00006728,
-	5634:  0x00006B20,
-	5635:  0x00006B62,
-	5636:  0x00006B79,
-	5637:  0x00006BCB,
-	5638:  0x00006BD4,
-	5639:  0x00006BDB,
-	5640:  0x00006C0F,
-	5641:  0x00006C34,
-	5642:  0x0000706B,
-	5643:  0x0000722A,
-	5644:  0x00007236,
-	5645:  0x0000723B,
-	5646:  0x00007247,
-	5647:  0x00007259,
-	5648:  0x0000725B,
-	5649:  0x000072AC,
-	5650:  0x0000738B,
-	5651:  0x00004E19,
-	5652:  0x00004E16,
-	5653:  0x00004E15,
-	5654:  0x00004E14,
-	5655:  0x00004E18,
-	5656:  0x00004E3B,
-	5657:  0x00004E4D,
-	5658:  0x00004E4F,
-	5659:  0x00004E4E,
-	5660:  0x00004EE5,
-	5661:  0x00004ED8,
-	5662:  0x00004ED4,
-	5663:  0x00004ED5,
-	5664:  0x00004ED6,
-	5665:  0x00004ED7,
-	5666:  0x00004EE3,
-	5667:  0x00004EE4,
-	5668:  0x00004ED9,
-	5669:  0x00004EDE,
-	5670:  0x00005145,
-	5671:  0x00005144,
-	5672:  0x00005189,
-	5673:  0x0000518A,
-	5674:  0x000051AC,
-	5675:  0x000051F9,
-	5676:  0x000051FA,
-	5677:  0x000051F8,
-	5678:  0x0000520A,
-	5679:  0x000052A0,
-	5680:  0x0000529F,
-	5681:  0x00005305,
-	5682:  0x00005306,
-	5683:  0x00005317,
-	5684:  0x0000531D,
-	5685:  0x00004EDF,
-	5686:  0x0000534A,
-	5687:  0x00005349,
-	5688:  0x00005361,
-	5689:  0x00005360,
-	5690:  0x0000536F,
-	5691:  0x0000536E,
-	5692:  0x000053BB,
-	5693:  0x000053EF,
-	5694:  0x000053E4,
-	5695:  0x000053F3,
-	5696:  0x000053EC,
-	5697:  0x000053EE,
-	5698:  0x000053E9,
-	5699:  0x000053E8,
-	5700:  0x000053FC,
-	5701:  0x000053F8,
-	5702:  0x000053F5,
-	5703:  0x000053EB,
-	5704:  0x000053E6,
-	5705:  0x000053EA,
-	5706:  0x000053F2,
-	5707:  0x000053F1,
-	5708:  0x000053F0,
-	5709:  0x000053E5,
-	5710:  0x000053ED,
-	5711:  0x000053FB,
-	5712:  0x000056DB,
-	5713:  0x000056DA,
-	5714:  0x00005916,
-	5715:  0x0000592E,
-	5716:  0x00005931,
-	5717:  0x00005974,
-	5718:  0x00005976,
-	5719:  0x00005B55,
-	5720:  0x00005B83,
-	5721:  0x00005C3C,
-	5722:  0x00005DE8,
-	5723:  0x00005DE7,
-	5724:  0x00005DE6,
-	5725:  0x00005E02,
-	5726:  0x00005E03,
-	5727:  0x00005E73,
-	5728:  0x00005E7C,
-	5729:  0x00005F01,
-	5730:  0x00005F18,
-	5731:  0x00005F17,
-	5732:  0x00005FC5,
-	5733:  0x0000620A,
-	5734:  0x00006253,
-	5735:  0x00006254,
-	5736:  0x00006252,
-	5737:  0x00006251,
-	5738:  0x000065A5,
-	5739:  0x000065E6,
-	5740:  0x0000672E,
-	5741:  0x0000672C,
-	5742:  0x0000672A,
-	5743:  0x0000672B,
-	5744:  0x0000672D,
-	5745:  0x00006B63,
-	5746:  0x00006BCD,
-	5747:  0x00006C11,
-	5748:  0x00006C10,
-	5749:  0x00006C38,
-	5750:  0x00006C41,
-	5751:  0x00006C40,
-	5752:  0x00006C3E,
-	5753:  0x000072AF,
-	5754:  0x00007384,
-	5755:  0x00007389,
-	5756:  0x000074DC,
-	5757:  0x000074E6,
-	5758:  0x00007518,
-	5759:  0x0000751F,
-	5760:  0x00007528,
-	5761:  0x00007529,
-	5762:  0x00007530,
-	5763:  0x00007531,
-	5764:  0x00007532,
-	5765:  0x00007533,
-	5766:  0x0000758B,
-	5767:  0x0000767D,
-	5768:  0x000076AE,
-	5769:  0x000076BF,
-	5770:  0x000076EE,
-	5771:  0x000077DB,
-	5772:  0x000077E2,
-	5773:  0x000077F3,
-	5774:  0x0000793A,
-	5775:  0x000079BE,
-	5776:  0x00007A74,
-	5777:  0x00007ACB,
-	5778:  0x00004E1E,
-	5779:  0x00004E1F,
-	5780:  0x00004E52,
-	5781:  0x00004E53,
-	5782:  0x00004E69,
-	5783:  0x00004E99,
-	5784:  0x00004EA4,
-	5785:  0x00004EA6,
-	5786:  0x00004EA5,
-	5787:  0x00004EFF,
-	5788:  0x00004F09,
-	5789:  0x00004F19,
-	5790:  0x00004F0A,
-	5791:  0x00004F15,
-	5792:  0x00004F0D,
-	5793:  0x00004F10,
-	5794:  0x00004F11,
-	5795:  0x00004F0F,
-	5796:  0x00004EF2,
-	5797:  0x00004EF6,
-	5798:  0x00004EFB,
-	5799:  0x00004EF0,
-	5800:  0x00004EF3,
-	5801:  0x00004EFD,
-	5802:  0x00004F01,
-	5803:  0x00004F0B,
-	5804:  0x00005149,
-	5805:  0x00005147,
-	5806:  0x00005146,
-	5807:  0x00005148,
-	5808:  0x00005168,
-	5809:  0x00005171,
-	5810:  0x0000518D,
-	5811:  0x000051B0,
-	5812:  0x00005217,
-	5813:  0x00005211,
-	5814:  0x00005212,
-	5815:  0x0000520E,
-	5816:  0x00005216,
-	5817:  0x000052A3,
-	5818:  0x00005308,
-	5819:  0x00005321,
-	5820:  0x00005320,
-	5821:  0x00005370,
-	5822:  0x00005371,
-	5823:  0x00005409,
-	5824:  0x0000540F,
-	5825:  0x0000540C,
-	5826:  0x0000540A,
-	5827:  0x00005410,
-	5828:  0x00005401,
-	5829:  0x0000540B,
-	5830:  0x00005404,
-	5831:  0x00005411,
-	5832:  0x0000540D,
-	5833:  0x00005408,
-	5834:  0x00005403,
-	5835:  0x0000540E,
-	5836:  0x00005406,
-	5837:  0x00005412,
-	5838:  0x000056E0,
-	5839:  0x000056DE,
-	5840:  0x000056DD,
-	5841:  0x00005733,
-	5842:  0x00005730,
-	5843:  0x00005728,
-	5844:  0x0000572D,
-	5845:  0x0000572C,
-	5846:  0x0000572F,
-	5847:  0x00005729,
-	5848:  0x00005919,
-	5849:  0x0000591A,
-	5850:  0x00005937,
-	5851:  0x00005938,
-	5852:  0x00005984,
-	5853:  0x00005978,
-	5854:  0x00005983,
-	5855:  0x0000597D,
-	5856:  0x00005979,
-	5857:  0x00005982,
-	5858:  0x00005981,
-	5859:  0x00005B57,
-	5860:  0x00005B58,
-	5861:  0x00005B87,
-	5862:  0x00005B88,
-	5863:  0x00005B85,
-	5864:  0x00005B89,
-	5865:  0x00005BFA,
-	5866:  0x00005C16,
-	5867:  0x00005C79,
-	5868:  0x00005DDE,
-	5869:  0x00005E06,
-	5870:  0x00005E76,
-	5871:  0x00005E74,
-	5872:  0x00005F0F,
-	5873:  0x00005F1B,
-	5874:  0x00005FD9,
-	5875:  0x00005FD6,
-	5876:  0x0000620E,
-	5877:  0x0000620C,
-	5878:  0x0000620D,
-	5879:  0x00006210,
-	5880:  0x00006263,
-	5881:  0x0000625B,
-	5882:  0x00006258,
-	5883:  0x00006536,
-	5884:  0x000065E9,
-	5885:  0x000065E8,
-	5886:  0x000065EC,
-	5887:  0x000065ED,
-	5888:  0x000066F2,
-	5889:  0x000066F3,
-	5890:  0x00006709,
-	5891:  0x0000673D,
-	5892:  0x00006734,
-	5893:  0x00006731,
-	5894:  0x00006735,
-	5895:  0x00006B21,
-	5896:  0x00006B64,
-	5897:  0x00006B7B,
-	5898:  0x00006C16,
-	5899:  0x00006C5D,
-	5900:  0x00006C57,
-	5901:  0x00006C59,
-	5902:  0x00006C5F,
-	5903:  0x00006C60,
-	5904:  0x00006C50,
-	5905:  0x00006C55,
-	5906:  0x00006C61,
-	5907:  0x00006C5B,
-	5908:  0x00006C4D,
-	5909:  0x00006C4E,
-	5910:  0x00007070,
-	5911:  0x0000725F,
-	5912:  0x0000725D,
-	5913:  0x0000767E,
-	5914:  0x00007AF9,
-	5915:  0x00007C73,
-	5916:  0x00007CF8,
-	5917:  0x00007F36,
-	5918:  0x00007F8A,
-	5919:  0x00007FBD,
-	5920:  0x00008001,
-	5921:  0x00008003,
-	5922:  0x0000800C,
-	5923:  0x00008012,
-	5924:  0x00008033,
-	5925:  0x0000807F,
-	5926:  0x00008089,
-	5927:  0x0000808B,
-	5928:  0x0000808C,
-	5929:  0x000081E3,
-	5930:  0x000081EA,
-	5931:  0x000081F3,
-	5932:  0x000081FC,
-	5933:  0x0000820C,
-	5934:  0x0000821B,
-	5935:  0x0000821F,
-	5936:  0x0000826E,
-	5937:  0x00008272,
-	5938:  0x0000827E,
-	5939:  0x0000866B,
-	5940:  0x00008840,
-	5941:  0x0000884C,
-	5942:  0x00008863,
-	5943:  0x0000897F,
-	5944:  0x00009621,
-	5945:  0x00004E32,
-	5946:  0x00004EA8,
-	5947:  0x00004F4D,
-	5948:  0x00004F4F,
-	5949:  0x00004F47,
-	5950:  0x00004F57,
-	5951:  0x00004F5E,
-	5952:  0x00004F34,
-	5953:  0x00004F5B,
-	5954:  0x00004F55,
-	5955:  0x00004F30,
-	5956:  0x00004F50,
-	5957:  0x00004F51,
-	5958:  0x00004F3D,
-	5959:  0x00004F3A,
-	5960:  0x00004F38,
-	5961:  0x00004F43,
-	5962:  0x00004F54,
-	5963:  0x00004F3C,
-	5964:  0x00004F46,
-	5965:  0x00004F63,
-	5966:  0x00004F5C,
-	5967:  0x00004F60,
-	5968:  0x00004F2F,
-	5969:  0x00004F4E,
-	5970:  0x00004F36,
-	5971:  0x00004F59,
-	5972:  0x00004F5D,
-	5973:  0x00004F48,
-	5974:  0x00004F5A,
-	5975:  0x0000514C,
-	5976:  0x0000514B,
-	5977:  0x0000514D,
-	5978:  0x00005175,
-	5979:  0x000051B6,
-	5980:  0x000051B7,
-	5981:  0x00005225,
-	5982:  0x00005224,
-	5983:  0x00005229,
-	5984:  0x0000522A,
-	5985:  0x00005228,
-	5986:  0x000052AB,
-	5987:  0x000052A9,
-	5988:  0x000052AA,
-	5989:  0x000052AC,
-	5990:  0x00005323,
-	5991:  0x00005373,
-	5992:  0x00005375,
-	5993:  0x0000541D,
-	5994:  0x0000542D,
-	5995:  0x0000541E,
-	5996:  0x0000543E,
-	5997:  0x00005426,
-	5998:  0x0000544E,
-	5999:  0x00005427,
-	6000:  0x00005446,
-	6001:  0x00005443,
-	6002:  0x00005433,
-	6003:  0x00005448,
-	6004:  0x00005442,
-	6005:  0x0000541B,
-	6006:  0x00005429,
-	6007:  0x0000544A,
-	6008:  0x00005439,
-	6009:  0x0000543B,
-	6010:  0x00005438,
-	6011:  0x0000542E,
-	6012:  0x00005435,
-	6013:  0x00005436,
-	6014:  0x00005420,
-	6015:  0x0000543C,
-	6016:  0x00005440,
-	6017:  0x00005431,
-	6018:  0x0000542B,
-	6019:  0x0000541F,
-	6020:  0x0000542C,
-	6021:  0x000056EA,
-	6022:  0x000056F0,
-	6023:  0x000056E4,
-	6024:  0x000056EB,
-	6025:  0x0000574A,
-	6026:  0x00005751,
-	6027:  0x00005740,
-	6028:  0x0000574D,
-	6029:  0x00005747,
-	6030:  0x0000574E,
-	6031:  0x0000573E,
-	6032:  0x00005750,
-	6033:  0x0000574F,
-	6034:  0x0000573B,
-	6035:  0x000058EF,
-	6036:  0x0000593E,
-	6037:  0x0000599D,
-	6038:  0x00005992,
-	6039:  0x000059A8,
-	6040:  0x0000599E,
-	6041:  0x000059A3,
-	6042:  0x00005999,
-	6043:  0x00005996,
-	6044:  0x0000598D,
-	6045:  0x000059A4,
-	6046:  0x00005993,
-	6047:  0x0000598A,
-	6048:  0x000059A5,
-	6049:  0x00005B5D,
-	6050:  0x00005B5C,
-	6051:  0x00005B5A,
-	6052:  0x00005B5B,
-	6053:  0x00005B8C,
-	6054:  0x00005B8B,
-	6055:  0x00005B8F,
-	6056:  0x00005C2C,
-	6057:  0x00005C40,
-	6058:  0x00005C41,
-	6059:  0x00005C3F,
-	6060:  0x00005C3E,
-	6061:  0x00005C90,
-	6062:  0x00005C91,
-	6063:  0x00005C94,
-	6064:  0x00005C8C,
-	6065:  0x00005DEB,
-	6066:  0x00005E0C,
-	6067:  0x00005E8F,
-	6068:  0x00005E87,
-	6069:  0x00005E8A,
-	6070:  0x00005EF7,
-	6071:  0x00005F04,
-	6072:  0x00005F1F,
-	6073:  0x00005F64,
-	6074:  0x00005F62,
-	6075:  0x00005F77,
-	6076:  0x00005F79,
-	6077:  0x00005FD8,
-	6078:  0x00005FCC,
-	6079:  0x00005FD7,
-	6080:  0x00005FCD,
-	6081:  0x00005FF1,
-	6082:  0x00005FEB,
-	6083:  0x00005FF8,
-	6084:  0x00005FEA,
-	6085:  0x00006212,
-	6086:  0x00006211,
-	6087:  0x00006284,
-	6088:  0x00006297,
-	6089:  0x00006296,
-	6090:  0x00006280,
-	6091:  0x00006276,
-	6092:  0x00006289,
-	6093:  0x0000626D,
-	6094:  0x0000628A,
-	6095:  0x0000627C,
-	6096:  0x0000627E,
-	6097:  0x00006279,
-	6098:  0x00006273,
-	6099:  0x00006292,
-	6100:  0x0000626F,
-	6101:  0x00006298,
-	6102:  0x0000626E,
-	6103:  0x00006295,
-	6104:  0x00006293,
-	6105:  0x00006291,
-	6106:  0x00006286,
-	6107:  0x00006539,
-	6108:  0x0000653B,
-	6109:  0x00006538,
-	6110:  0x000065F1,
-	6111:  0x000066F4,
-	6112:  0x0000675F,
-	6113:  0x0000674E,
-	6114:  0x0000674F,
-	6115:  0x00006750,
-	6116:  0x00006751,
-	6117:  0x0000675C,
-	6118:  0x00006756,
-	6119:  0x0000675E,
-	6120:  0x00006749,
-	6121:  0x00006746,
-	6122:  0x00006760,
-	6123:  0x00006753,
-	6124:  0x00006757,
-	6125:  0x00006B65,
-	6126:  0x00006BCF,
-	6127:  0x00006C42,
-	6128:  0x00006C5E,
-	6129:  0x00006C99,
-	6130:  0x00006C81,
-	6131:  0x00006C88,
-	6132:  0x00006C89,
-	6133:  0x00006C85,
-	6134:  0x00006C9B,
-	6135:  0x00006C6A,
-	6136:  0x00006C7A,
-	6137:  0x00006C90,
-	6138:  0x00006C70,
-	6139:  0x00006C8C,
-	6140:  0x00006C68,
-	6141:  0x00006C96,
-	6142:  0x00006C92,
-	6143:  0x00006C7D,
-	6144:  0x00006C83,
-	6145:  0x00006C72,
-	6146:  0x00006C7E,
-	6147:  0x00006C74,
-	6148:  0x00006C86,
-	6149:  0x00006C76,
-	6150:  0x00006C8D,
-	6151:  0x00006C94,
-	6152:  0x00006C98,
-	6153:  0x00006C82,
-	6154:  0x00007076,
-	6155:  0x0000707C,
-	6156:  0x0000707D,
-	6157:  0x00007078,
-	6158:  0x00007262,
-	6159:  0x00007261,
-	6160:  0x00007260,
-	6161:  0x000072C4,
-	6162:  0x000072C2,
-	6163:  0x00007396,
-	6164:  0x0000752C,
-	6165:  0x0000752B,
-	6166:  0x00007537,
-	6167:  0x00007538,
-	6168:  0x00007682,
-	6169:  0x000076EF,
-	6170:  0x000077E3,
-	6171:  0x000079C1,
-	6172:  0x000079C0,
-	6173:  0x000079BF,
-	6174:  0x00007A76,
-	6175:  0x00007CFB,
-	6176:  0x00007F55,
-	6177:  0x00008096,
-	6178:  0x00008093,
-	6179:  0x0000809D,
-	6180:  0x00008098,
-	6181:  0x0000809B,
-	6182:  0x0000809A,
-	6183:  0x000080B2,
-	6184:  0x0000826F,
-	6185:  0x00008292,
-	6186:  0x0000828B,
-	6187:  0x0000828D,
-	6188:  0x0000898B,
-	6189:  0x000089D2,
-	6190:  0x00008A00,
-	6191:  0x00008C37,
-	6192:  0x00008C46,
-	6193:  0x00008C55,
-	6194:  0x00008C9D,
-	6195:  0x00008D64,
-	6196:  0x00008D70,
-	6197:  0x00008DB3,
-	6198:  0x00008EAB,
-	6199:  0x00008ECA,
-	6200:  0x00008F9B,
-	6201:  0x00008FB0,
-	6202:  0x00008FC2,
-	6203:  0x00008FC6,
-	6204:  0x00008FC5,
-	6205:  0x00008FC4,
-	6206:  0x00005DE1,
-	6207:  0x00009091,
-	6208:  0x000090A2,
-	6209:  0x000090AA,
-	6210:  0x000090A6,
-	6211:  0x000090A3,
-	6212:  0x00009149,
-	6213:  0x000091C6,
-	6214:  0x000091CC,
-	6215:  0x00009632,
-	6216:  0x0000962E,
-	6217:  0x00009631,
-	6218:  0x0000962A,
-	6219:  0x0000962C,
-	6220:  0x00004E26,
-	6221:  0x00004E56,
-	6222:  0x00004E73,
-	6223:  0x00004E8B,
-	6224:  0x00004E9B,
-	6225:  0x00004E9E,
-	6226:  0x00004EAB,
-	6227:  0x00004EAC,
-	6228:  0x00004F6F,
-	6229:  0x00004F9D,
-	6230:  0x00004F8D,
-	6231:  0x00004F73,
-	6232:  0x00004F7F,
-	6233:  0x00004F6C,
-	6234:  0x00004F9B,
-	6235:  0x00004F8B,
-	6236:  0x00004F86,
-	6237:  0x00004F83,
-	6238:  0x00004F70,
-	6239:  0x00004F75,
-	6240:  0x00004F88,
-	6241:  0x00004F69,
-	6242:  0x00004F7B,
-	6243:  0x00004F96,
-	6244:  0x00004F7E,
-	6245:  0x00004F8F,
-	6246:  0x00004F91,
-	6247:  0x00004F7A,
-	6248:  0x00005154,
-	6249:  0x00005152,
-	6250:  0x00005155,
-	6251:  0x00005169,
-	6252:  0x00005177,
-	6253:  0x00005176,
-	6254:  0x00005178,
-	6255:  0x000051BD,
-	6256:  0x000051FD,
-	6257:  0x0000523B,
-	6258:  0x00005238,
-	6259:  0x00005237,
-	6260:  0x0000523A,
-	6261:  0x00005230,
-	6262:  0x0000522E,
-	6263:  0x00005236,
-	6264:  0x00005241,
-	6265:  0x000052BE,
-	6266:  0x000052BB,
-	6267:  0x00005352,
-	6268:  0x00005354,
-	6269:  0x00005353,
-	6270:  0x00005351,
-	6271:  0x00005366,
-	6272:  0x00005377,
-	6273:  0x00005378,
-	6274:  0x00005379,
-	6275:  0x000053D6,
-	6276:  0x000053D4,
-	6277:  0x000053D7,
-	6278:  0x00005473,
-	6279:  0x00005475,
-	6280:  0x00005496,
-	6281:  0x00005478,
-	6282:  0x00005495,
-	6283:  0x00005480,
-	6284:  0x0000547B,
-	6285:  0x00005477,
-	6286:  0x00005484,
-	6287:  0x00005492,
-	6288:  0x00005486,
-	6289:  0x0000547C,
-	6290:  0x00005490,
-	6291:  0x00005471,
-	6292:  0x00005476,
-	6293:  0x0000548C,
-	6294:  0x0000549A,
-	6295:  0x00005462,
-	6296:  0x00005468,
-	6297:  0x0000548B,
-	6298:  0x0000547D,
-	6299:  0x0000548E,
-	6300:  0x000056FA,
-	6301:  0x00005783,
-	6302:  0x00005777,
-	6303:  0x0000576A,
-	6304:  0x00005769,
-	6305:  0x00005761,
-	6306:  0x00005766,
-	6307:  0x00005764,
-	6308:  0x0000577C,
-	6309:  0x0000591C,
-	6310:  0x00005949,
-	6311:  0x00005947,
-	6312:  0x00005948,
-	6313:  0x00005944,
-	6314:  0x00005954,
-	6315:  0x000059BE,
-	6316:  0x000059BB,
-	6317:  0x000059D4,
-	6318:  0x000059B9,
-	6319:  0x000059AE,
-	6320:  0x000059D1,
-	6321:  0x000059C6,
-	6322:  0x000059D0,
-	6323:  0x000059CD,
-	6324:  0x000059CB,
-	6325:  0x000059D3,
-	6326:  0x000059CA,
-	6327:  0x000059AF,
-	6328:  0x000059B3,
-	6329:  0x000059D2,
-	6330:  0x000059C5,
-	6331:  0x00005B5F,
-	6332:  0x00005B64,
-	6333:  0x00005B63,
-	6334:  0x00005B97,
-	6335:  0x00005B9A,
-	6336:  0x00005B98,
-	6337:  0x00005B9C,
-	6338:  0x00005B99,
-	6339:  0x00005B9B,
-	6340:  0x00005C1A,
-	6341:  0x00005C48,
-	6342:  0x00005C45,
-	6343:  0x00005C46,
-	6344:  0x00005CB7,
-	6345:  0x00005CA1,
-	6346:  0x00005CB8,
-	6347:  0x00005CA9,
-	6348:  0x00005CAB,
-	6349:  0x00005CB1,
-	6350:  0x00005CB3,
-	6351:  0x00005E18,
-	6352:  0x00005E1A,
-	6353:  0x00005E16,
-	6354:  0x00005E15,
-	6355:  0x00005E1B,
-	6356:  0x00005E11,
-	6357:  0x00005E78,
-	6358:  0x00005E9A,
-	6359:  0x00005E97,
-	6360:  0x00005E9C,
-	6361:  0x00005E95,
-	6362:  0x00005E96,
-	6363:  0x00005EF6,
-	6364:  0x00005F26,
-	6365:  0x00005F27,
-	6366:  0x00005F29,
-	6367:  0x00005F80,
-	6368:  0x00005F81,
-	6369:  0x00005F7F,
-	6370:  0x00005F7C,
-	6371:  0x00005FDD,
-	6372:  0x00005FE0,
-	6373:  0x00005FFD,
-	6374:  0x00005FF5,
-	6375:  0x00005FFF,
-	6376:  0x0000600F,
-	6377:  0x00006014,
-	6378:  0x0000602F,
-	6379:  0x00006035,
-	6380:  0x00006016,
-	6381:  0x0000602A,
-	6382:  0x00006015,
-	6383:  0x00006021,
-	6384:  0x00006027,
-	6385:  0x00006029,
-	6386:  0x0000602B,
-	6387:  0x0000601B,
-	6388:  0x00006216,
-	6389:  0x00006215,
-	6390:  0x0000623F,
-	6391:  0x0000623E,
-	6392:  0x00006240,
-	6393:  0x0000627F,
-	6394:  0x000062C9,
-	6395:  0x000062CC,
-	6396:  0x000062C4,
-	6397:  0x000062BF,
-	6398:  0x000062C2,
-	6399:  0x000062B9,
-	6400:  0x000062D2,
-	6401:  0x000062DB,
-	6402:  0x000062AB,
-	6403:  0x000062D3,
-	6404:  0x000062D4,
-	6405:  0x000062CB,
-	6406:  0x000062C8,
-	6407:  0x000062A8,
-	6408:  0x000062BD,
-	6409:  0x000062BC,
-	6410:  0x000062D0,
-	6411:  0x000062D9,
-	6412:  0x000062C7,
-	6413:  0x000062CD,
-	6414:  0x000062B5,
-	6415:  0x000062DA,
-	6416:  0x000062B1,
-	6417:  0x000062D8,
-	6418:  0x000062D6,
-	6419:  0x000062D7,
-	6420:  0x000062C6,
-	6421:  0x000062AC,
-	6422:  0x000062CE,
-	6423:  0x0000653E,
-	6424:  0x000065A7,
-	6425:  0x000065BC,
-	6426:  0x000065FA,
-	6427:  0x00006614,
-	6428:  0x00006613,
-	6429:  0x0000660C,
-	6430:  0x00006606,
-	6431:  0x00006602,
-	6432:  0x0000660E,
-	6433:  0x00006600,
-	6434:  0x0000660F,
-	6435:  0x00006615,
-	6436:  0x0000660A,
-	6437:  0x00006607,
-	6438:  0x0000670D,
-	6439:  0x0000670B,
-	6440:  0x0000676D,
-	6441:  0x0000678B,
-	6442:  0x00006795,
-	6443:  0x00006771,
-	6444:  0x0000679C,
-	6445:  0x00006773,
-	6446:  0x00006777,
-	6447:  0x00006787,
-	6448:  0x0000679D,
-	6449:  0x00006797,
-	6450:  0x0000676F,
-	6451:  0x00006770,
-	6452:  0x0000677F,
-	6453:  0x00006789,
-	6454:  0x0000677E,
-	6455:  0x00006790,
-	6456:  0x00006775,
-	6457:  0x0000679A,
-	6458:  0x00006793,
-	6459:  0x0000677C,
-	6460:  0x0000676A,
-	6461:  0x00006772,
-	6462:  0x00006B23,
-	6463:  0x00006B66,
-	6464:  0x00006B67,
-	6465:  0x00006B7F,
-	6466:  0x00006C13,
-	6467:  0x00006C1B,
-	6468:  0x00006CE3,
-	6469:  0x00006CE8,
-	6470:  0x00006CF3,
-	6471:  0x00006CB1,
-	6472:  0x00006CCC,
-	6473:  0x00006CE5,
-	6474:  0x00006CB3,
-	6475:  0x00006CBD,
-	6476:  0x00006CBE,
-	6477:  0x00006CBC,
-	6478:  0x00006CE2,
-	6479:  0x00006CAB,
-	6480:  0x00006CD5,
-	6481:  0x00006CD3,
-	6482:  0x00006CB8,
-	6483:  0x00006CC4,
-	6484:  0x00006CB9,
-	6485:  0x00006CC1,
-	6486:  0x00006CAE,
-	6487:  0x00006CD7,
-	6488:  0x00006CC5,
-	6489:  0x00006CF1,
-	6490:  0x00006CBF,
-	6491:  0x00006CBB,
-	6492:  0x00006CE1,
-	6493:  0x00006CDB,
-	6494:  0x00006CCA,
-	6495:  0x00006CAC,
-	6496:  0x00006CEF,
-	6497:  0x00006CDC,
-	6498:  0x00006CD6,
-	6499:  0x00006CE0,
-	6500:  0x00007095,
-	6501:  0x0000708E,
-	6502:  0x00007092,
-	6503:  0x0000708A,
-	6504:  0x00007099,
-	6505:  0x0000722C,
-	6506:  0x0000722D,
-	6507:  0x00007238,
-	6508:  0x00007248,
-	6509:  0x00007267,
-	6510:  0x00007269,
-	6511:  0x000072C0,
-	6512:  0x000072CE,
-	6513:  0x000072D9,
-	6514:  0x000072D7,
-	6515:  0x000072D0,
-	6516:  0x000073A9,
-	6517:  0x000073A8,
-	6518:  0x0000739F,
-	6519:  0x000073AB,
-	6520:  0x000073A5,
-	6521:  0x0000753D,
-	6522:  0x0000759D,
-	6523:  0x00007599,
-	6524:  0x0000759A,
-	6525:  0x00007684,
-	6526:  0x000076C2,
-	6527:  0x000076F2,
-	6528:  0x000076F4,
-	6529:  0x000077E5,
-	6530:  0x000077FD,
-	6531:  0x0000793E,
-	6532:  0x00007940,
-	6533:  0x00007941,
-	6534:  0x000079C9,
-	6535:  0x000079C8,
-	6536:  0x00007A7A,
-	6537:  0x00007A79,
-	6538:  0x00007AFA,
-	6539:  0x00007CFE,
-	6540:  0x00007F54,
-	6541:  0x00007F8C,
-	6542:  0x00007F8B,
-	6543:  0x00008005,
-	6544:  0x000080BA,
-	6545:  0x000080A5,
-	6546:  0x000080A2,
-	6547:  0x000080B1,
-	6548:  0x000080A1,
-	6549:  0x000080AB,
-	6550:  0x000080A9,
-	6551:  0x000080B4,
-	6552:  0x000080AA,
-	6553:  0x000080AF,
-	6554:  0x000081E5,
-	6555:  0x000081FE,
-	6556:  0x0000820D,
-	6557:  0x000082B3,
-	6558:  0x0000829D,
-	6559:  0x00008299,
-	6560:  0x000082AD,
-	6561:  0x000082BD,
-	6562:  0x0000829F,
-	6563:  0x000082B9,
-	6564:  0x000082B1,
-	6565:  0x000082AC,
-	6566:  0x000082A5,
-	6567:  0x000082AF,
-	6568:  0x000082B8,
-	6569:  0x000082A3,
-	6570:  0x000082B0,
-	6571:  0x000082BE,
-	6572:  0x000082B7,
-	6573:  0x0000864E,
-	6574:  0x00008671,
-	6575:  0x0000521D,
-	6576:  0x00008868,
-	6577:  0x00008ECB,
-	6578:  0x00008FCE,
-	6579:  0x00008FD4,
-	6580:  0x00008FD1,
-	6581:  0x000090B5,
-	6582:  0x000090B8,
-	6583:  0x000090B1,
-	6584:  0x000090B6,
-	6585:  0x000091C7,
-	6586:  0x000091D1,
-	6587:  0x00009577,
-	6588:  0x00009580,
-	6589:  0x0000961C,
-	6590:  0x00009640,
-	6591:  0x0000963F,
-	6592:  0x0000963B,
-	6593:  0x00009644,
-	6594:  0x00009642,
-	6595:  0x000096B9,
-	6596:  0x000096E8,
-	6597:  0x00009752,
-	6598:  0x0000975E,
-	6599:  0x00004E9F,
-	6600:  0x00004EAD,
-	6601:  0x00004EAE,
-	6602:  0x00004FE1,
-	6603:  0x00004FB5,
-	6604:  0x00004FAF,
-	6605:  0x00004FBF,
-	6606:  0x00004FE0,
-	6607:  0x00004FD1,
-	6608:  0x00004FCF,
-	6609:  0x00004FDD,
-	6610:  0x00004FC3,
-	6611:  0x00004FB6,
-	6612:  0x00004FD8,
-	6613:  0x00004FDF,
-	6614:  0x00004FCA,
-	6615:  0x00004FD7,
-	6616:  0x00004FAE,
-	6617:  0x00004FD0,
-	6618:  0x00004FC4,
-	6619:  0x00004FC2,
-	6620:  0x00004FDA,
-	6621:  0x00004FCE,
-	6622:  0x00004FDE,
-	6623:  0x00004FB7,
-	6624:  0x00005157,
-	6625:  0x00005192,
-	6626:  0x00005191,
-	6627:  0x000051A0,
-	6628:  0x0000524E,
-	6629:  0x00005243,
-	6630:  0x0000524A,
-	6631:  0x0000524D,
-	6632:  0x0000524C,
-	6633:  0x0000524B,
-	6634:  0x00005247,
-	6635:  0x000052C7,
-	6636:  0x000052C9,
-	6637:  0x000052C3,
-	6638:  0x000052C1,
-	6639:  0x0000530D,
-	6640:  0x00005357,
-	6641:  0x0000537B,
-	6642:  0x0000539A,
-	6643:  0x000053DB,
-	6644:  0x000054AC,
-	6645:  0x000054C0,
-	6646:  0x000054A8,
-	6647:  0x000054CE,
-	6648:  0x000054C9,
-	6649:  0x000054B8,
-	6650:  0x000054A6,
-	6651:  0x000054B3,
-	6652:  0x000054C7,
-	6653:  0x000054C2,
-	6654:  0x000054BD,
-	6655:  0x000054AA,
-	6656:  0x000054C1,
-	6657:  0x000054C4,
-	6658:  0x000054C8,
-	6659:  0x000054AF,
-	6660:  0x000054AB,
-	6661:  0x000054B1,
-	6662:  0x000054BB,
-	6663:  0x000054A9,
-	6664:  0x000054A7,
-	6665:  0x000054BF,
-	6666:  0x000056FF,
-	6667:  0x00005782,
-	6668:  0x0000578B,
-	6669:  0x000057A0,
-	6670:  0x000057A3,
-	6671:  0x000057A2,
-	6672:  0x000057CE,
-	6673:  0x000057AE,
-	6674:  0x00005793,
-	6675:  0x00005955,
-	6676:  0x00005951,
-	6677:  0x0000594F,
-	6678:  0x0000594E,
-	6679:  0x00005950,
-	6680:  0x000059DC,
-	6681:  0x000059D8,
-	6682:  0x000059FF,
-	6683:  0x000059E3,
-	6684:  0x000059E8,
-	6685:  0x00005A03,
-	6686:  0x000059E5,
-	6687:  0x000059EA,
-	6688:  0x000059DA,
-	6689:  0x000059E6,
-	6690:  0x00005A01,
-	6691:  0x000059FB,
-	6692:  0x00005B69,
-	6693:  0x00005BA3,
-	6694:  0x00005BA6,
-	6695:  0x00005BA4,
-	6696:  0x00005BA2,
-	6697:  0x00005BA5,
-	6698:  0x00005C01,
-	6699:  0x00005C4E,
-	6700:  0x00005C4F,
-	6701:  0x00005C4D,
-	6702:  0x00005C4B,
-	6703:  0x00005CD9,
-	6704:  0x00005CD2,
-	6705:  0x00005DF7,
-	6706:  0x00005E1D,
-	6707:  0x00005E25,
-	6708:  0x00005E1F,
-	6709:  0x00005E7D,
-	6710:  0x00005EA0,
-	6711:  0x00005EA6,
-	6712:  0x00005EFA,
-	6713:  0x00005F08,
-	6714:  0x00005F2D,
-	6715:  0x00005F65,
-	6716:  0x00005F88,
-	6717:  0x00005F85,
-	6718:  0x00005F8A,
-	6719:  0x00005F8B,
-	6720:  0x00005F87,
-	6721:  0x00005F8C,
-	6722:  0x00005F89,
-	6723:  0x00006012,
-	6724:  0x0000601D,
-	6725:  0x00006020,
-	6726:  0x00006025,
-	6727:  0x0000600E,
-	6728:  0x00006028,
-	6729:  0x0000604D,
-	6730:  0x00006070,
-	6731:  0x00006068,
-	6732:  0x00006062,
-	6733:  0x00006046,
-	6734:  0x00006043,
-	6735:  0x0000606C,
-	6736:  0x0000606B,
-	6737:  0x0000606A,
-	6738:  0x00006064,
-	6739:  0x00006241,
-	6740:  0x000062DC,
-	6741:  0x00006316,
-	6742:  0x00006309,
-	6743:  0x000062FC,
-	6744:  0x000062ED,
-	6745:  0x00006301,
-	6746:  0x000062EE,
-	6747:  0x000062FD,
-	6748:  0x00006307,
-	6749:  0x000062F1,
-	6750:  0x000062F7,
-	6751:  0x000062EF,
-	6752:  0x000062EC,
-	6753:  0x000062FE,
-	6754:  0x000062F4,
-	6755:  0x00006311,
-	6756:  0x00006302,
-	6757:  0x0000653F,
-	6758:  0x00006545,
-	6759:  0x000065AB,
-	6760:  0x000065BD,
-	6761:  0x000065E2,
-	6762:  0x00006625,
-	6763:  0x0000662D,
-	6764:  0x00006620,
-	6765:  0x00006627,
-	6766:  0x0000662F,
-	6767:  0x0000661F,
-	6768:  0x00006628,
-	6769:  0x00006631,
-	6770:  0x00006624,
-	6771:  0x000066F7,
-	6772:  0x000067FF,
-	6773:  0x000067D3,
-	6774:  0x000067F1,
-	6775:  0x000067D4,
-	6776:  0x000067D0,
-	6777:  0x000067EC,
-	6778:  0x000067B6,
-	6779:  0x000067AF,
-	6780:  0x000067F5,
-	6781:  0x000067E9,
-	6782:  0x000067EF,
-	6783:  0x000067C4,
-	6784:  0x000067D1,
-	6785:  0x000067B4,
-	6786:  0x000067DA,
-	6787:  0x000067E5,
-	6788:  0x000067B8,
-	6789:  0x000067CF,
-	6790:  0x000067DE,
-	6791:  0x000067F3,
-	6792:  0x000067B0,
-	6793:  0x000067D9,
-	6794:  0x000067E2,
-	6795:  0x000067DD,
-	6796:  0x000067D2,
-	6797:  0x00006B6A,
-	6798:  0x00006B83,
-	6799:  0x00006B86,
-	6800:  0x00006BB5,
-	6801:  0x00006BD2,
-	6802:  0x00006BD7,
-	6803:  0x00006C1F,
-	6804:  0x00006CC9,
-	6805:  0x00006D0B,
-	6806:  0x00006D32,
-	6807:  0x00006D2A,
-	6808:  0x00006D41,
-	6809:  0x00006D25,
-	6810:  0x00006D0C,
-	6811:  0x00006D31,
-	6812:  0x00006D1E,
-	6813:  0x00006D17,
-	6814:  0x00006D3B,
-	6815:  0x00006D3D,
-	6816:  0x00006D3E,
-	6817:  0x00006D36,
-	6818:  0x00006D1B,
-	6819:  0x00006CF5,
-	6820:  0x00006D39,
-	6821:  0x00006D27,
-	6822:  0x00006D38,
-	6823:  0x00006D29,
-	6824:  0x00006D2E,
-	6825:  0x00006D35,
-	6826:  0x00006D0E,
-	6827:  0x00006D2B,
-	6828:  0x000070AB,
-	6829:  0x000070BA,
-	6830:  0x000070B3,
-	6831:  0x000070AC,
-	6832:  0x000070AF,
-	6833:  0x000070AD,
-	6834:  0x000070B8,
-	6835:  0x000070AE,
-	6836:  0x000070A4,
-	6837:  0x00007230,
-	6838:  0x00007272,
-	6839:  0x0000726F,
-	6840:  0x00007274,
-	6841:  0x000072E9,
-	6842:  0x000072E0,
-	6843:  0x000072E1,
-	6844:  0x000073B7,
-	6845:  0x000073CA,
-	6846:  0x000073BB,
-	6847:  0x000073B2,
-	6848:  0x000073CD,
-	6849:  0x000073C0,
-	6850:  0x000073B3,
-	6851:  0x0000751A,
-	6852:  0x0000752D,
-	6853:  0x0000754F,
-	6854:  0x0000754C,
-	6855:  0x0000754E,
-	6856:  0x0000754B,
-	6857:  0x000075AB,
-	6858:  0x000075A4,
-	6859:  0x000075A5,
-	6860:  0x000075A2,
-	6861:  0x000075A3,
-	6862:  0x00007678,
-	6863:  0x00007686,
-	6864:  0x00007687,
-	6865:  0x00007688,
-	6866:  0x000076C8,
-	6867:  0x000076C6,
-	6868:  0x000076C3,
-	6869:  0x000076C5,
-	6870:  0x00007701,
-	6871:  0x000076F9,
-	6872:  0x000076F8,
-	6873:  0x00007709,
-	6874:  0x0000770B,
-	6875:  0x000076FE,
-	6876:  0x000076FC,
-	6877:  0x00007707,
-	6878:  0x000077DC,
-	6879:  0x00007802,
-	6880:  0x00007814,
-	6881:  0x0000780C,
-	6882:  0x0000780D,
-	6883:  0x00007946,
-	6884:  0x00007949,
-	6885:  0x00007948,
-	6886:  0x00007947,
-	6887:  0x000079B9,
-	6888:  0x000079BA,
-	6889:  0x000079D1,
-	6890:  0x000079D2,
-	6891:  0x000079CB,
-	6892:  0x00007A7F,
-	6893:  0x00007A81,
-	6894:  0x00007AFF,
-	6895:  0x00007AFD,
-	6896:  0x00007C7D,
-	6897:  0x00007D02,
-	6898:  0x00007D05,
-	6899:  0x00007D00,
-	6900:  0x00007D09,
-	6901:  0x00007D07,
-	6902:  0x00007D04,
-	6903:  0x00007D06,
-	6904:  0x00007F38,
-	6905:  0x00007F8E,
-	6906:  0x00007FBF,
-	6907:  0x00008004,
-	6908:  0x00008010,
-	6909:  0x0000800D,
-	6910:  0x00008011,
-	6911:  0x00008036,
-	6912:  0x000080D6,
-	6913:  0x000080E5,
-	6914:  0x000080DA,
-	6915:  0x000080C3,
-	6916:  0x000080C4,
-	6917:  0x000080CC,
-	6918:  0x000080E1,
-	6919:  0x000080DB,
-	6920:  0x000080CE,
-	6921:  0x000080DE,
-	6922:  0x000080E4,
-	6923:  0x000080DD,
-	6924:  0x000081F4,
-	6925:  0x00008222,
-	6926:  0x000082E7,
-	6927:  0x00008303,
-	6928:  0x00008305,
-	6929:  0x000082E3,
-	6930:  0x000082DB,
-	6931:  0x000082E6,
-	6932:  0x00008304,
-	6933:  0x000082E5,
-	6934:  0x00008302,
-	6935:  0x00008309,
-	6936:  0x000082D2,
-	6937:  0x000082D7,
-	6938:  0x000082F1,
-	6939:  0x00008301,
-	6940:  0x000082DC,
-	6941:  0x000082D4,
-	6942:  0x000082D1,
-	6943:  0x000082DE,
-	6944:  0x000082D3,
-	6945:  0x000082DF,
-	6946:  0x000082EF,
-	6947:  0x00008306,
-	6948:  0x00008650,
-	6949:  0x00008679,
-	6950:  0x0000867B,
-	6951:  0x0000867A,
-	6952:  0x0000884D,
-	6953:  0x0000886B,
-	6954:  0x00008981,
-	6955:  0x000089D4,
-	6956:  0x00008A08,
-	6957:  0x00008A02,
-	6958:  0x00008A03,
-	6959:  0x00008C9E,
-	6960:  0x00008CA0,
-	6961:  0x00008D74,
-	6962:  0x00008D73,
-	6963:  0x00008DB4,
-	6964:  0x00008ECD,
-	6965:  0x00008ECC,
-	6966:  0x00008FF0,
-	6967:  0x00008FE6,
-	6968:  0x00008FE2,
-	6969:  0x00008FEA,
-	6970:  0x00008FE5,
-	6971:  0x00008FED,
-	6972:  0x00008FEB,
-	6973:  0x00008FE4,
-	6974:  0x00008FE8,
-	6975:  0x000090CA,
-	6976:  0x000090CE,
-	6977:  0x000090C1,
-	6978:  0x000090C3,
-	6979:  0x0000914B,
-	6980:  0x0000914A,
-	6981:  0x000091CD,
-	6982:  0x00009582,
-	6983:  0x00009650,
-	6984:  0x0000964B,
-	6985:  0x0000964C,
-	6986:  0x0000964D,
-	6987:  0x00009762,
-	6988:  0x00009769,
-	6989:  0x000097CB,
-	6990:  0x000097ED,
-	6991:  0x000097F3,
-	6992:  0x00009801,
-	6993:  0x000098A8,
-	6994:  0x000098DB,
-	6995:  0x000098DF,
-	6996:  0x00009996,
-	6997:  0x00009999,
-	6998:  0x00004E58,
-	6999:  0x00004EB3,
-	7000:  0x0000500C,
-	7001:  0x0000500D,
-	7002:  0x00005023,
-	7003:  0x00004FEF,
-	7004:  0x00005026,
-	7005:  0x00005025,
-	7006:  0x00004FF8,
-	7007:  0x00005029,
-	7008:  0x00005016,
-	7009:  0x00005006,
-	7010:  0x0000503C,
-	7011:  0x0000501F,
-	7012:  0x0000501A,
-	7013:  0x00005012,
-	7014:  0x00005011,
-	7015:  0x00004FFA,
-	7016:  0x00005000,
-	7017:  0x00005014,
-	7018:  0x00005028,
-	7019:  0x00004FF1,
-	7020:  0x00005021,
-	7021:  0x0000500B,
-	7022:  0x00005019,
-	7023:  0x00005018,
-	7024:  0x00004FF3,
-	7025:  0x00004FEE,
-	7026:  0x0000502D,
-	7027:  0x0000502A,
-	7028:  0x00004FFE,
-	7029:  0x0000502B,
-	7030:  0x00005009,
-	7031:  0x0000517C,
-	7032:  0x000051A4,
-	7033:  0x000051A5,
-	7034:  0x000051A2,
-	7035:  0x000051CD,
-	7036:  0x000051CC,
-	7037:  0x000051C6,
-	7038:  0x000051CB,
-	7039:  0x00005256,
-	7040:  0x0000525C,
-	7041:  0x00005254,
-	7042:  0x0000525B,
-	7043:  0x0000525D,
-	7044:  0x0000532A,
-	7045:  0x0000537F,
-	7046:  0x0000539F,
-	7047:  0x0000539D,
-	7048:  0x000053DF,
-	7049:  0x000054E8,
-	7050:  0x00005510,
-	7051:  0x00005501,
-	7052:  0x00005537,
-	7053:  0x000054FC,
-	7054:  0x000054E5,
-	7055:  0x000054F2,
-	7056:  0x00005506,
-	7057:  0x000054FA,
-	7058:  0x00005514,
-	7059:  0x000054E9,
-	7060:  0x000054ED,
-	7061:  0x000054E1,
-	7062:  0x00005509,
-	7063:  0x000054EE,
-	7064:  0x000054EA,
-	7065:  0x000054E6,
-	7066:  0x00005527,
-	7067:  0x00005507,
-	7068:  0x000054FD,
-	7069:  0x0000550F,
-	7070:  0x00005703,
-	7071:  0x00005704,
-	7072:  0x000057C2,
-	7073:  0x000057D4,
-	7074:  0x000057CB,
-	7075:  0x000057C3,
-	7076:  0x00005809,
-	7077:  0x0000590F,
-	7078:  0x00005957,
-	7079:  0x00005958,
-	7080:  0x0000595A,
-	7081:  0x00005A11,
-	7082:  0x00005A18,
-	7083:  0x00005A1C,
-	7084:  0x00005A1F,
-	7085:  0x00005A1B,
-	7086:  0x00005A13,
-	7087:  0x000059EC,
-	7088:  0x00005A20,
-	7089:  0x00005A23,
-	7090:  0x00005A29,
-	7091:  0x00005A25,
-	7092:  0x00005A0C,
-	7093:  0x00005A09,
-	7094:  0x00005B6B,
-	7095:  0x00005C58,
-	7096:  0x00005BB0,
-	7097:  0x00005BB3,
-	7098:  0x00005BB6,
-	7099:  0x00005BB4,
-	7100:  0x00005BAE,
-	7101:  0x00005BB5,
-	7102:  0x00005BB9,
-	7103:  0x00005BB8,
-	7104:  0x00005C04,
-	7105:  0x00005C51,
-	7106:  0x00005C55,
-	7107:  0x00005C50,
-	7108:  0x00005CED,
-	7109:  0x00005CFD,
-	7110:  0x00005CFB,
-	7111:  0x00005CEA,
-	7112:  0x00005CE8,
-	7113:  0x00005CF0,
-	7114:  0x00005CF6,
-	7115:  0x00005D01,
-	7116:  0x00005CF4,
-	7117:  0x00005DEE,
-	7118:  0x00005E2D,
-	7119:  0x00005E2B,
-	7120:  0x00005EAB,
-	7121:  0x00005EAD,
-	7122:  0x00005EA7,
-	7123:  0x00005F31,
-	7124:  0x00005F92,
-	7125:  0x00005F91,
-	7126:  0x00005F90,
-	7127:  0x00006059,
-	7128:  0x00006063,
-	7129:  0x00006065,
-	7130:  0x00006050,
-	7131:  0x00006055,
-	7132:  0x0000606D,
-	7133:  0x00006069,
-	7134:  0x0000606F,
-	7135:  0x00006084,
-	7136:  0x0000609F,
-	7137:  0x0000609A,
-	7138:  0x0000608D,
-	7139:  0x00006094,
-	7140:  0x0000608C,
-	7141:  0x00006085,
-	7142:  0x00006096,
-	7143:  0x00006247,
-	7144:  0x000062F3,
-	7145:  0x00006308,
-	7146:  0x000062FF,
-	7147:  0x0000634E,
-	7148:  0x0000633E,
-	7149:  0x0000632F,
-	7150:  0x00006355,
-	7151:  0x00006342,
-	7152:  0x00006346,
-	7153:  0x0000634F,
-	7154:  0x00006349,
-	7155:  0x0000633A,
-	7156:  0x00006350,
-	7157:  0x0000633D,
-	7158:  0x0000632A,
-	7159:  0x0000632B,
-	7160:  0x00006328,
-	7161:  0x0000634D,
-	7162:  0x0000634C,
-	7163:  0x00006548,
-	7164:  0x00006549,
-	7165:  0x00006599,
-	7166:  0x000065C1,
-	7167:  0x000065C5,
-	7168:  0x00006642,
-	7169:  0x00006649,
-	7170:  0x0000664F,
-	7171:  0x00006643,
-	7172:  0x00006652,
-	7173:  0x0000664C,
-	7174:  0x00006645,
-	7175:  0x00006641,
-	7176:  0x000066F8,
-	7177:  0x00006714,
-	7178:  0x00006715,
-	7179:  0x00006717,
-	7180:  0x00006821,
-	7181:  0x00006838,
-	7182:  0x00006848,
-	7183:  0x00006846,
-	7184:  0x00006853,
-	7185:  0x00006839,
-	7186:  0x00006842,
-	7187:  0x00006854,
-	7188:  0x00006829,
-	7189:  0x000068B3,
-	7190:  0x00006817,
-	7191:  0x0000684C,
-	7192:  0x00006851,
-	7193:  0x0000683D,
-	7194:  0x000067F4,
-	7195:  0x00006850,
-	7196:  0x00006840,
-	7197:  0x0000683C,
-	7198:  0x00006843,
-	7199:  0x0000682A,
-	7200:  0x00006845,
-	7201:  0x00006813,
-	7202:  0x00006818,
-	7203:  0x00006841,
-	7204:  0x00006B8A,
-	7205:  0x00006B89,
-	7206:  0x00006BB7,
-	7207:  0x00006C23,
-	7208:  0x00006C27,
-	7209:  0x00006C28,
-	7210:  0x00006C26,
-	7211:  0x00006C24,
-	7212:  0x00006CF0,
-	7213:  0x00006D6A,
-	7214:  0x00006D95,
-	7215:  0x00006D88,
-	7216:  0x00006D87,
-	7217:  0x00006D66,
-	7218:  0x00006D78,
-	7219:  0x00006D77,
-	7220:  0x00006D59,
-	7221:  0x00006D93,
-	7222:  0x00006D6C,
-	7223:  0x00006D89,
-	7224:  0x00006D6E,
-	7225:  0x00006D5A,
-	7226:  0x00006D74,
-	7227:  0x00006D69,
-	7228:  0x00006D8C,
-	7229:  0x00006D8A,
-	7230:  0x00006D79,
-	7231:  0x00006D85,
-	7232:  0x00006D65,
-	7233:  0x00006D94,
-	7234:  0x000070CA,
-	7235:  0x000070D8,
-	7236:  0x000070E4,
-	7237:  0x000070D9,
-	7238:  0x000070C8,
-	7239:  0x000070CF,
-	7240:  0x00007239,
-	7241:  0x00007279,
-	7242:  0x000072FC,
-	7243:  0x000072F9,
-	7244:  0x000072FD,
-	7245:  0x000072F8,
-	7246:  0x000072F7,
-	7247:  0x00007386,
-	7248:  0x000073ED,
-	7249:  0x00007409,
-	7250:  0x000073EE,
-	7251:  0x000073E0,
-	7252:  0x000073EA,
-	7253:  0x000073DE,
-	7254:  0x00007554,
-	7255:  0x0000755D,
-	7256:  0x0000755C,
-	7257:  0x0000755A,
-	7258:  0x00007559,
-	7259:  0x000075BE,
-	7260:  0x000075C5,
-	7261:  0x000075C7,
-	7262:  0x000075B2,
-	7263:  0x000075B3,
-	7264:  0x000075BD,
-	7265:  0x000075BC,
-	7266:  0x000075B9,
-	7267:  0x000075C2,
-	7268:  0x000075B8,
-	7269:  0x0000768B,
-	7270:  0x000076B0,
-	7271:  0x000076CA,
-	7272:  0x000076CD,
-	7273:  0x000076CE,
-	7274:  0x00007729,
-	7275:  0x0000771F,
-	7276:  0x00007720,
-	7277:  0x00007728,
-	7278:  0x000077E9,
-	7279:  0x00007830,
-	7280:  0x00007827,
-	7281:  0x00007838,
-	7282:  0x0000781D,
-	7283:  0x00007834,
-	7284:  0x00007837,
-	7285:  0x00007825,
-	7286:  0x0000782D,
-	7287:  0x00007820,
-	7288:  0x0000781F,
-	7289:  0x00007832,
-	7290:  0x00007955,
-	7291:  0x00007950,
-	7292:  0x00007960,
-	7293:  0x0000795F,
-	7294:  0x00007956,
-	7295:  0x0000795E,
-	7296:  0x0000795D,
-	7297:  0x00007957,
-	7298:  0x0000795A,
-	7299:  0x000079E4,
-	7300:  0x000079E3,
-	7301:  0x000079E7,
-	7302:  0x000079DF,
-	7303:  0x000079E6,
-	7304:  0x000079E9,
-	7305:  0x000079D8,
-	7306:  0x00007A84,
-	7307:  0x00007A88,
-	7308:  0x00007AD9,
-	7309:  0x00007B06,
-	7310:  0x00007B11,
-	7311:  0x00007C89,
-	7312:  0x00007D21,
-	7313:  0x00007D17,
-	7314:  0x00007D0B,
-	7315:  0x00007D0A,
-	7316:  0x00007D20,
-	7317:  0x00007D22,
-	7318:  0x00007D14,
-	7319:  0x00007D10,
-	7320:  0x00007D15,
-	7321:  0x00007D1A,
-	7322:  0x00007D1C,
-	7323:  0x00007D0D,
-	7324:  0x00007D19,
-	7325:  0x00007D1B,
-	7326:  0x00007F3A,
-	7327:  0x00007F5F,
-	7328:  0x00007F94,
-	7329:  0x00007FC5,
-	7330:  0x00007FC1,
-	7331:  0x00008006,
-	7332:  0x00008018,
-	7333:  0x00008015,
-	7334:  0x00008019,
-	7335:  0x00008017,
-	7336:  0x0000803D,
-	7337:  0x0000803F,
-	7338:  0x000080F1,
-	7339:  0x00008102,
-	7340:  0x000080F0,
-	7341:  0x00008105,
-	7342:  0x000080ED,
-	7343:  0x000080F4,
-	7344:  0x00008106,
-	7345:  0x000080F8,
-	7346:  0x000080F3,
-	7347:  0x00008108,
-	7348:  0x000080FD,
-	7349:  0x0000810A,
-	7350:  0x000080FC,
-	7351:  0x000080EF,
-	7352:  0x000081ED,
-	7353:  0x000081EC,
-	7354:  0x00008200,
-	7355:  0x00008210,
-	7356:  0x0000822A,
-	7357:  0x0000822B,
-	7358:  0x00008228,
-	7359:  0x0000822C,
-	7360:  0x000082BB,
-	7361:  0x0000832B,
-	7362:  0x00008352,
-	7363:  0x00008354,
-	7364:  0x0000834A,
-	7365:  0x00008338,
-	7366:  0x00008350,
-	7367:  0x00008349,
-	7368:  0x00008335,
-	7369:  0x00008334,
-	7370:  0x0000834F,
-	7371:  0x00008332,
-	7372:  0x00008339,
-	7373:  0x00008336,
-	7374:  0x00008317,
-	7375:  0x00008340,
-	7376:  0x00008331,
-	7377:  0x00008328,
-	7378:  0x00008343,
-	7379:  0x00008654,
-	7380:  0x0000868A,
-	7381:  0x000086AA,
-	7382:  0x00008693,
-	7383:  0x000086A4,
-	7384:  0x000086A9,
-	7385:  0x0000868C,
-	7386:  0x000086A3,
-	7387:  0x0000869C,
-	7388:  0x00008870,
-	7389:  0x00008877,
-	7390:  0x00008881,
-	7391:  0x00008882,
-	7392:  0x0000887D,
-	7393:  0x00008879,
-	7394:  0x00008A18,
-	7395:  0x00008A10,
-	7396:  0x00008A0E,
-	7397:  0x00008A0C,
-	7398:  0x00008A15,
-	7399:  0x00008A0A,
-	7400:  0x00008A17,
-	7401:  0x00008A13,
-	7402:  0x00008A16,
-	7403:  0x00008A0F,
-	7404:  0x00008A11,
-	7405:  0x00008C48,
-	7406:  0x00008C7A,
-	7407:  0x00008C79,
-	7408:  0x00008CA1,
-	7409:  0x00008CA2,
-	7410:  0x00008D77,
-	7411:  0x00008EAC,
-	7412:  0x00008ED2,
-	7413:  0x00008ED4,
-	7414:  0x00008ECF,
-	7415:  0x00008FB1,
-	7416:  0x00009001,
-	7417:  0x00009006,
-	7418:  0x00008FF7,
-	7419:  0x00009000,
-	7420:  0x00008FFA,
-	7421:  0x00008FF4,
-	7422:  0x00009003,
-	7423:  0x00008FFD,
-	7424:  0x00009005,
-	7425:  0x00008FF8,
-	7426:  0x00009095,
-	7427:  0x000090E1,
-	7428:  0x000090DD,
-	7429:  0x000090E2,
-	7430:  0x00009152,
-	7431:  0x0000914D,
-	7432:  0x0000914C,
-	7433:  0x000091D8,
-	7434:  0x000091DD,
-	7435:  0x000091D7,
-	7436:  0x000091DC,
-	7437:  0x000091D9,
-	7438:  0x00009583,
-	7439:  0x00009662,
-	7440:  0x00009663,
-	7441:  0x00009661,
-	7442:  0x0000965B,
-	7443:  0x0000965D,
-	7444:  0x00009664,
-	7445:  0x00009658,
-	7446:  0x0000965E,
-	7447:  0x000096BB,
-	7448:  0x000098E2,
-	7449:  0x000099AC,
-	7450:  0x00009AA8,
-	7451:  0x00009AD8,
-	7452:  0x00009B25,
-	7453:  0x00009B32,
-	7454:  0x00009B3C,
-	7455:  0x00004E7E,
-	7456:  0x0000507A,
-	7457:  0x0000507D,
-	7458:  0x0000505C,
-	7459:  0x00005047,
-	7460:  0x00005043,
-	7461:  0x0000504C,
-	7462:  0x0000505A,
-	7463:  0x00005049,
-	7464:  0x00005065,
-	7465:  0x00005076,
-	7466:  0x0000504E,
-	7467:  0x00005055,
-	7468:  0x00005075,
-	7469:  0x00005074,
-	7470:  0x00005077,
-	7471:  0x0000504F,
-	7472:  0x0000500F,
-	7473:  0x0000506F,
-	7474:  0x0000506D,
-	7475:  0x0000515C,
-	7476:  0x00005195,
-	7477:  0x000051F0,
-	7478:  0x0000526A,
-	7479:  0x0000526F,
-	7480:  0x000052D2,
-	7481:  0x000052D9,
-	7482:  0x000052D8,
-	7483:  0x000052D5,
-	7484:  0x00005310,
-	7485:  0x0000530F,
-	7486:  0x00005319,
-	7487:  0x0000533F,
-	7488:  0x00005340,
-	7489:  0x0000533E,
-	7490:  0x000053C3,
-	7491:  0x000066FC,
-	7492:  0x00005546,
-	7493:  0x0000556A,
-	7494:  0x00005566,
-	7495:  0x00005544,
-	7496:  0x0000555E,
-	7497:  0x00005561,
-	7498:  0x00005543,
-	7499:  0x0000554A,
-	7500:  0x00005531,
-	7501:  0x00005556,
-	7502:  0x0000554F,
-	7503:  0x00005555,
-	7504:  0x0000552F,
-	7505:  0x00005564,
-	7506:  0x00005538,
-	7507:  0x0000552E,
-	7508:  0x0000555C,
-	7509:  0x0000552C,
-	7510:  0x00005563,
-	7511:  0x00005533,
-	7512:  0x00005541,
-	7513:  0x00005557,
-	7514:  0x00005708,
-	7515:  0x0000570B,
-	7516:  0x00005709,
-	7517:  0x000057DF,
-	7518:  0x00005805,
-	7519:  0x0000580A,
-	7520:  0x00005806,
-	7521:  0x000057E0,
-	7522:  0x000057E4,
-	7523:  0x000057FA,
-	7524:  0x00005802,
-	7525:  0x00005835,
-	7526:  0x000057F7,
-	7527:  0x000057F9,
-	7528:  0x00005920,
-	7529:  0x00005962,
-	7530:  0x00005A36,
-	7531:  0x00005A41,
-	7532:  0x00005A49,
-	7533:  0x00005A66,
-	7534:  0x00005A6A,
-	7535:  0x00005A40,
-	7536:  0x00005A3C,
-	7537:  0x00005A62,
-	7538:  0x00005A5A,
-	7539:  0x00005A46,
-	7540:  0x00005A4A,
-	7541:  0x00005B70,
-	7542:  0x00005BC7,
-	7543:  0x00005BC5,
-	7544:  0x00005BC4,
-	7545:  0x00005BC2,
-	7546:  0x00005BBF,
-	7547:  0x00005BC6,
-	7548:  0x00005C09,
-	7549:  0x00005C08,
-	7550:  0x00005C07,
-	7551:  0x00005C60,
-	7552:  0x00005C5C,
-	7553:  0x00005C5D,
-	7554:  0x00005D07,
-	7555:  0x00005D06,
-	7556:  0x00005D0E,
-	7557:  0x00005D1B,
-	7558:  0x00005D16,
-	7559:  0x00005D22,
-	7560:  0x00005D11,
-	7561:  0x00005D29,
-	7562:  0x00005D14,
-	7563:  0x00005D19,
-	7564:  0x00005D24,
-	7565:  0x00005D27,
-	7566:  0x00005D17,
-	7567:  0x00005DE2,
-	7568:  0x00005E38,
-	7569:  0x00005E36,
-	7570:  0x00005E33,
-	7571:  0x00005E37,
-	7572:  0x00005EB7,
-	7573:  0x00005EB8,
-	7574:  0x00005EB6,
-	7575:  0x00005EB5,
-	7576:  0x00005EBE,
-	7577:  0x00005F35,
-	7578:  0x00005F37,
-	7579:  0x00005F57,
-	7580:  0x00005F6C,
-	7581:  0x00005F69,
-	7582:  0x00005F6B,
-	7583:  0x00005F97,
-	7584:  0x00005F99,
-	7585:  0x00005F9E,
-	7586:  0x00005F98,
-	7587:  0x00005FA1,
-	7588:  0x00005FA0,
-	7589:  0x00005F9C,
-	7590:  0x0000607F,
-	7591:  0x000060A3,
-	7592:  0x00006089,
-	7593:  0x000060A0,
-	7594:  0x000060A8,
-	7595:  0x000060CB,
-	7596:  0x000060B4,
-	7597:  0x000060E6,
-	7598:  0x000060BD,
-	7599:  0x000060C5,
-	7600:  0x000060BB,
-	7601:  0x000060B5,
-	7602:  0x000060DC,
-	7603:  0x000060BC,
-	7604:  0x000060D8,
-	7605:  0x000060D5,
-	7606:  0x000060C6,
-	7607:  0x000060DF,
-	7608:  0x000060B8,
-	7609:  0x000060DA,
-	7610:  0x000060C7,
-	7611:  0x0000621A,
-	7612:  0x0000621B,
-	7613:  0x00006248,
-	7614:  0x000063A0,
-	7615:  0x000063A7,
-	7616:  0x00006372,
-	7617:  0x00006396,
-	7618:  0x000063A2,
-	7619:  0x000063A5,
-	7620:  0x00006377,
-	7621:  0x00006367,
-	7622:  0x00006398,
-	7623:  0x000063AA,
-	7624:  0x00006371,
-	7625:  0x000063A9,
-	7626:  0x00006389,
-	7627:  0x00006383,
-	7628:  0x0000639B,
-	7629:  0x0000636B,
-	7630:  0x000063A8,
-	7631:  0x00006384,
-	7632:  0x00006388,
-	7633:  0x00006399,
-	7634:  0x000063A1,
-	7635:  0x000063AC,
-	7636:  0x00006392,
-	7637:  0x0000638F,
-	7638:  0x00006380,
-	7639:  0x0000637B,
-	7640:  0x00006369,
-	7641:  0x00006368,
-	7642:  0x0000637A,
-	7643:  0x0000655D,
-	7644:  0x00006556,
-	7645:  0x00006551,
-	7646:  0x00006559,
-	7647:  0x00006557,
-	7648:  0x0000555F,
-	7649:  0x0000654F,
-	7650:  0x00006558,
-	7651:  0x00006555,
-	7652:  0x00006554,
-	7653:  0x0000659C,
-	7654:  0x0000659B,
-	7655:  0x000065AC,
-	7656:  0x000065CF,
-	7657:  0x000065CB,
-	7658:  0x000065CC,
-	7659:  0x000065CE,
-	7660:  0x0000665D,
-	7661:  0x0000665A,
-	7662:  0x00006664,
-	7663:  0x00006668,
-	7664:  0x00006666,
-	7665:  0x0000665E,
-	7666:  0x000066F9,
-	7667:  0x000052D7,
-	7668:  0x0000671B,
-	7669:  0x00006881,
-	7670:  0x000068AF,
-	7671:  0x000068A2,
-	7672:  0x00006893,
-	7673:  0x000068B5,
-	7674:  0x0000687F,
-	7675:  0x00006876,
-	7676:  0x000068B1,
-	7677:  0x000068A7,
-	7678:  0x00006897,
-	7679:  0x000068B0,
-	7680:  0x00006883,
-	7681:  0x000068C4,
-	7682:  0x000068AD,
-	7683:  0x00006886,
-	7684:  0x00006885,
-	7685:  0x00006894,
-	7686:  0x0000689D,
-	7687:  0x000068A8,
-	7688:  0x0000689F,
-	7689:  0x000068A1,
-	7690:  0x00006882,
-	7691:  0x00006B32,
-	7692:  0x00006BBA,
-	7693:  0x00006BEB,
-	7694:  0x00006BEC,
-	7695:  0x00006C2B,
-	7696:  0x00006D8E,
-	7697:  0x00006DBC,
-	7698:  0x00006DF3,
-	7699:  0x00006DD9,
-	7700:  0x00006DB2,
-	7701:  0x00006DE1,
-	7702:  0x00006DCC,
-	7703:  0x00006DE4,
-	7704:  0x00006DFB,
-	7705:  0x00006DFA,
-	7706:  0x00006E05,
-	7707:  0x00006DC7,
-	7708:  0x00006DCB,
-	7709:  0x00006DAF,
-	7710:  0x00006DD1,
-	7711:  0x00006DAE,
-	7712:  0x00006DDE,
-	7713:  0x00006DF9,
-	7714:  0x00006DB8,
-	7715:  0x00006DF7,
-	7716:  0x00006DF5,
-	7717:  0x00006DC5,
-	7718:  0x00006DD2,
-	7719:  0x00006E1A,
-	7720:  0x00006DB5,
-	7721:  0x00006DDA,
-	7722:  0x00006DEB,
-	7723:  0x00006DD8,
-	7724:  0x00006DEA,
-	7725:  0x00006DF1,
-	7726:  0x00006DEE,
-	7727:  0x00006DE8,
-	7728:  0x00006DC6,
-	7729:  0x00006DC4,
-	7730:  0x00006DAA,
-	7731:  0x00006DEC,
-	7732:  0x00006DBF,
-	7733:  0x00006DE6,
-	7734:  0x000070F9,
-	7735:  0x00007109,
-	7736:  0x0000710A,
-	7737:  0x000070FD,
-	7738:  0x000070EF,
-	7739:  0x0000723D,
-	7740:  0x0000727D,
-	7741:  0x00007281,
-	7742:  0x0000731C,
-	7743:  0x0000731B,
-	7744:  0x00007316,
-	7745:  0x00007313,
-	7746:  0x00007319,
-	7747:  0x00007387,
-	7748:  0x00007405,
-	7749:  0x0000740A,
-	7750:  0x00007403,
-	7751:  0x00007406,
-	7752:  0x000073FE,
-	7753:  0x0000740D,
-	7754:  0x000074E0,
-	7755:  0x000074F6,
-	7756:  0x000074F7,
-	7757:  0x0000751C,
-	7758:  0x00007522,
-	7759:  0x00007565,
-	7760:  0x00007566,
-	7761:  0x00007562,
-	7762:  0x00007570,
-	7763:  0x0000758F,
-	7764:  0x000075D4,
-	7765:  0x000075D5,
-	7766:  0x000075B5,
-	7767:  0x000075CA,
-	7768:  0x000075CD,
-	7769:  0x0000768E,
-	7770:  0x000076D4,
-	7771:  0x000076D2,
-	7772:  0x000076DB,
-	7773:  0x00007737,
-	7774:  0x0000773E,
-	7775:  0x0000773C,
-	7776:  0x00007736,
-	7777:  0x00007738,
-	7778:  0x0000773A,
-	7779:  0x0000786B,
-	7780:  0x00007843,
-	7781:  0x0000784E,
-	7782:  0x00007965,
-	7783:  0x00007968,
-	7784:  0x0000796D,
-	7785:  0x000079FB,
-	7786:  0x00007A92,
-	7787:  0x00007A95,
-	7788:  0x00007B20,
-	7789:  0x00007B28,
-	7790:  0x00007B1B,
-	7791:  0x00007B2C,
-	7792:  0x00007B26,
-	7793:  0x00007B19,
-	7794:  0x00007B1E,
-	7795:  0x00007B2E,
-	7796:  0x00007C92,
-	7797:  0x00007C97,
-	7798:  0x00007C95,
-	7799:  0x00007D46,
-	7800:  0x00007D43,
-	7801:  0x00007D71,
-	7802:  0x00007D2E,
-	7803:  0x00007D39,
-	7804:  0x00007D3C,
-	7805:  0x00007D40,
-	7806:  0x00007D30,
-	7807:  0x00007D33,
-	7808:  0x00007D44,
-	7809:  0x00007D2F,
-	7810:  0x00007D42,
-	7811:  0x00007D32,
-	7812:  0x00007D31,
-	7813:  0x00007F3D,
-	7814:  0x00007F9E,
-	7815:  0x00007F9A,
-	7816:  0x00007FCC,
-	7817:  0x00007FCE,
-	7818:  0x00007FD2,
-	7819:  0x0000801C,
-	7820:  0x0000804A,
-	7821:  0x00008046,
-	7822:  0x0000812F,
-	7823:  0x00008116,
-	7824:  0x00008123,
-	7825:  0x0000812B,
-	7826:  0x00008129,
-	7827:  0x00008130,
-	7828:  0x00008124,
-	7829:  0x00008202,
-	7830:  0x00008235,
-	7831:  0x00008237,
-	7832:  0x00008236,
-	7833:  0x00008239,
-	7834:  0x0000838E,
-	7835:  0x0000839E,
-	7836:  0x00008398,
-	7837:  0x00008378,
-	7838:  0x000083A2,
-	7839:  0x00008396,
-	7840:  0x000083BD,
-	7841:  0x000083AB,
-	7842:  0x00008392,
-	7843:  0x0000838A,
-	7844:  0x00008393,
-	7845:  0x00008389,
-	7846:  0x000083A0,
-	7847:  0x00008377,
-	7848:  0x0000837B,
-	7849:  0x0000837C,
-	7850:  0x00008386,
-	7851:  0x000083A7,
-	7852:  0x00008655,
-	7853:  0x00005F6A,
-	7854:  0x000086C7,
-	7855:  0x000086C0,
-	7856:  0x000086B6,
-	7857:  0x000086C4,
-	7858:  0x000086B5,
-	7859:  0x000086C6,
-	7860:  0x000086CB,
-	7861:  0x000086B1,
-	7862:  0x000086AF,
-	7863:  0x000086C9,
-	7864:  0x00008853,
-	7865:  0x0000889E,
-	7866:  0x00008888,
-	7867:  0x000088AB,
-	7868:  0x00008892,
-	7869:  0x00008896,
-	7870:  0x0000888D,
-	7871:  0x0000888B,
-	7872:  0x00008993,
-	7873:  0x0000898F,
-	7874:  0x00008A2A,
-	7875:  0x00008A1D,
-	7876:  0x00008A23,
-	7877:  0x00008A25,
-	7878:  0x00008A31,
-	7879:  0x00008A2D,
-	7880:  0x00008A1F,
-	7881:  0x00008A1B,
-	7882:  0x00008A22,
-	7883:  0x00008C49,
-	7884:  0x00008C5A,
-	7885:  0x00008CA9,
-	7886:  0x00008CAC,
-	7887:  0x00008CAB,
-	7888:  0x00008CA8,
-	7889:  0x00008CAA,
-	7890:  0x00008CA7,
-	7891:  0x00008D67,
-	7892:  0x00008D66,
-	7893:  0x00008DBE,
-	7894:  0x00008DBA,
-	7895:  0x00008EDB,
-	7896:  0x00008EDF,
-	7897:  0x00009019,
-	7898:  0x0000900D,
-	7899:  0x0000901A,
-	7900:  0x00009017,
-	7901:  0x00009023,
-	7902:  0x0000901F,
-	7903:  0x0000901D,
-	7904:  0x00009010,
-	7905:  0x00009015,
-	7906:  0x0000901E,
-	7907:  0x00009020,
-	7908:  0x0000900F,
-	7909:  0x00009022,
-	7910:  0x00009016,
-	7911:  0x0000901B,
-	7912:  0x00009014,
-	7913:  0x000090E8,
-	7914:  0x000090ED,
-	7915:  0x000090FD,
-	7916:  0x00009157,
-	7917:  0x000091CE,
-	7918:  0x000091F5,
-	7919:  0x000091E6,
-	7920:  0x000091E3,
-	7921:  0x000091E7,
-	7922:  0x000091ED,
-	7923:  0x000091E9,
-	7924:  0x00009589,
-	7925:  0x0000966A,
-	7926:  0x00009675,
-	7927:  0x00009673,
-	7928:  0x00009678,
-	7929:  0x00009670,
-	7930:  0x00009674,
-	7931:  0x00009676,
-	7932:  0x00009677,
-	7933:  0x0000966C,
-	7934:  0x000096C0,
-	7935:  0x000096EA,
-	7936:  0x000096E9,
-	7937:  0x00007AE0,
-	7938:  0x00007ADF,
-	7939:  0x00009802,
-	7940:  0x00009803,
-	7941:  0x00009B5A,
-	7942:  0x00009CE5,
-	7943:  0x00009E75,
-	7944:  0x00009E7F,
-	7945:  0x00009EA5,
-	7946:  0x00009EBB,
-	7947:  0x000050A2,
-	7948:  0x0000508D,
-	7949:  0x00005085,
-	7950:  0x00005099,
-	7951:  0x00005091,
-	7952:  0x00005080,
-	7953:  0x00005096,
-	7954:  0x00005098,
-	7955:  0x0000509A,
-	7956:  0x00006700,
-	7957:  0x000051F1,
-	7958:  0x00005272,
-	7959:  0x00005274,
-	7960:  0x00005275,
-	7961:  0x00005269,
-	7962:  0x000052DE,
-	7963:  0x000052DD,
-	7964:  0x000052DB,
-	7965:  0x0000535A,
-	7966:  0x000053A5,
-	7967:  0x0000557B,
-	7968:  0x00005580,
-	7969:  0x000055A7,
-	7970:  0x0000557C,
-	7971:  0x0000558A,
-	7972:  0x0000559D,
-	7973:  0x00005598,
-	7974:  0x00005582,
-	7975:  0x0000559C,
-	7976:  0x000055AA,
-	7977:  0x00005594,
-	7978:  0x00005587,
-	7979:  0x0000558B,
-	7980:  0x00005583,
-	7981:  0x000055B3,
-	7982:  0x000055AE,
-	7983:  0x0000559F,
-	7984:  0x0000553E,
-	7985:  0x000055B2,
-	7986:  0x0000559A,
-	7987:  0x000055BB,
-	7988:  0x000055AC,
-	7989:  0x000055B1,
-	7990:  0x0000557E,
-	7991:  0x00005589,
-	7992:  0x000055AB,
-	7993:  0x00005599,
-	7994:  0x0000570D,
-	7995:  0x0000582F,
-	7996:  0x0000582A,
-	7997:  0x00005834,
-	7998:  0x00005824,
-	7999:  0x00005830,
-	8000:  0x00005831,
-	8001:  0x00005821,
-	8002:  0x0000581D,
-	8003:  0x00005820,
-	8004:  0x000058F9,
-	8005:  0x000058FA,
-	8006:  0x00005960,
-	8007:  0x00005A77,
-	8008:  0x00005A9A,
-	8009:  0x00005A7F,
-	8010:  0x00005A92,
-	8011:  0x00005A9B,
-	8012:  0x00005AA7,
-	8013:  0x00005B73,
-	8014:  0x00005B71,
-	8015:  0x00005BD2,
-	8016:  0x00005BCC,
-	8017:  0x00005BD3,
-	8018:  0x00005BD0,
-	8019:  0x00005C0A,
-	8020:  0x00005C0B,
-	8021:  0x00005C31,
-	8022:  0x00005D4C,
-	8023:  0x00005D50,
-	8024:  0x00005D34,
-	8025:  0x00005D47,
-	8026:  0x00005DFD,
-	8027:  0x00005E45,
-	8028:  0x00005E3D,
-	8029:  0x00005E40,
-	8030:  0x00005E43,
-	8031:  0x00005E7E,
-	8032:  0x00005ECA,
-	8033:  0x00005EC1,
-	8034:  0x00005EC2,
-	8035:  0x00005EC4,
-	8036:  0x00005F3C,
-	8037:  0x00005F6D,
-	8038:  0x00005FA9,
-	8039:  0x00005FAA,
-	8040:  0x00005FA8,
-	8041:  0x000060D1,
-	8042:  0x000060E1,
-	8043:  0x000060B2,
-	8044:  0x000060B6,
-	8045:  0x000060E0,
-	8046:  0x0000611C,
-	8047:  0x00006123,
-	8048:  0x000060FA,
-	8049:  0x00006115,
-	8050:  0x000060F0,
-	8051:  0x000060FB,
-	8052:  0x000060F4,
-	8053:  0x00006168,
-	8054:  0x000060F1,
-	8055:  0x0000610E,
-	8056:  0x000060F6,
-	8057:  0x00006109,
-	8058:  0x00006100,
-	8059:  0x00006112,
-	8060:  0x0000621F,
-	8061:  0x00006249,
-	8062:  0x000063A3,
-	8063:  0x0000638C,
-	8064:  0x000063CF,
-	8065:  0x000063C0,
-	8066:  0x000063E9,
-	8067:  0x000063C9,
-	8068:  0x000063C6,
-	8069:  0x000063CD,
-	8070:  0x000063D2,
-	8071:  0x000063E3,
-	8072:  0x000063D0,
-	8073:  0x000063E1,
-	8074:  0x000063D6,
-	8075:  0x000063ED,
-	8076:  0x000063EE,
-	8077:  0x00006376,
-	8078:  0x000063F4,
-	8079:  0x000063EA,
-	8080:  0x000063DB,
-	8081:  0x00006452,
-	8082:  0x000063DA,
-	8083:  0x000063F9,
-	8084:  0x0000655E,
-	8085:  0x00006566,
-	8086:  0x00006562,
-	8087:  0x00006563,
-	8088:  0x00006591,
-	8089:  0x00006590,
-	8090:  0x000065AF,
-	8091:  0x0000666E,
-	8092:  0x00006670,
-	8093:  0x00006674,
-	8094:  0x00006676,
-	8095:  0x0000666F,
-	8096:  0x00006691,
-	8097:  0x0000667A,
-	8098:  0x0000667E,
-	8099:  0x00006677,
-	8100:  0x000066FE,
-	8101:  0x000066FF,
-	8102:  0x0000671F,
-	8103:  0x0000671D,
-	8104:  0x000068FA,
-	8105:  0x000068D5,
-	8106:  0x000068E0,
-	8107:  0x000068D8,
-	8108:  0x000068D7,
-	8109:  0x00006905,
-	8110:  0x000068DF,
-	8111:  0x000068F5,
-	8112:  0x000068EE,
-	8113:  0x000068E7,
-	8114:  0x000068F9,
-	8115:  0x000068D2,
-	8116:  0x000068F2,
-	8117:  0x000068E3,
-	8118:  0x000068CB,
-	8119:  0x000068CD,
-	8120:  0x0000690D,
-	8121:  0x00006912,
-	8122:  0x0000690E,
-	8123:  0x000068C9,
-	8124:  0x000068DA,
-	8125:  0x0000696E,
-	8126:  0x000068FB,
-	8127:  0x00006B3E,
-	8128:  0x00006B3A,
-	8129:  0x00006B3D,
-	8130:  0x00006B98,
-	8131:  0x00006B96,
-	8132:  0x00006BBC,
-	8133:  0x00006BEF,
-	8134:  0x00006C2E,
-	8135:  0x00006C2F,
-	8136:  0x00006C2C,
-	8137:  0x00006E2F,
-	8138:  0x00006E38,
-	8139:  0x00006E54,
-	8140:  0x00006E21,
-	8141:  0x00006E32,
-	8142:  0x00006E67,
-	8143:  0x00006E4A,
-	8144:  0x00006E20,
-	8145:  0x00006E25,
-	8146:  0x00006E23,
-	8147:  0x00006E1B,
-	8148:  0x00006E5B,
-	8149:  0x00006E58,
-	8150:  0x00006E24,
-	8151:  0x00006E56,
-	8152:  0x00006E6E,
-	8153:  0x00006E2D,
-	8154:  0x00006E26,
-	8155:  0x00006E6F,
-	8156:  0x00006E34,
-	8157:  0x00006E4D,
-	8158:  0x00006E3A,
-	8159:  0x00006E2C,
-	8160:  0x00006E43,
-	8161:  0x00006E1D,
-	8162:  0x00006E3E,
-	8163:  0x00006ECB,
-	8164:  0x00006E89,
-	8165:  0x00006E19,
-	8166:  0x00006E4E,
-	8167:  0x00006E63,
-	8168:  0x00006E44,
-	8169:  0x00006E72,
-	8170:  0x00006E69,
-	8171:  0x00006E5F,
-	8172:  0x00007119,
-	8173:  0x0000711A,
-	8174:  0x00007126,
-	8175:  0x00007130,
-	8176:  0x00007121,
-	8177:  0x00007136,
-	8178:  0x0000716E,
-	8179:  0x0000711C,
-	8180:  0x0000724C,
-	8181:  0x00007284,
-	8182:  0x00007280,
-	8183:  0x00007336,
-	8184:  0x00007325,
-	8185:  0x00007334,
-	8186:  0x00007329,
-	8187:  0x0000743A,
-	8188:  0x0000742A,
-	8189:  0x00007433,
-	8190:  0x00007422,
-	8191:  0x00007425,
-	8192:  0x00007435,
-	8193:  0x00007436,
-	8194:  0x00007434,
-	8195:  0x0000742F,
-	8196:  0x0000741B,
-	8197:  0x00007426,
-	8198:  0x00007428,
-	8199:  0x00007525,
-	8200:  0x00007526,
-	8201:  0x0000756B,
-	8202:  0x0000756A,
-	8203:  0x000075E2,
-	8204:  0x000075DB,
-	8205:  0x000075E3,
-	8206:  0x000075D9,
-	8207:  0x000075D8,
-	8208:  0x000075DE,
-	8209:  0x000075E0,
-	8210:  0x0000767B,
-	8211:  0x0000767C,
-	8212:  0x00007696,
-	8213:  0x00007693,
-	8214:  0x000076B4,
-	8215:  0x000076DC,
-	8216:  0x0000774F,
-	8217:  0x000077ED,
-	8218:  0x0000785D,
-	8219:  0x0000786C,
-	8220:  0x0000786F,
-	8221:  0x00007A0D,
-	8222:  0x00007A08,
-	8223:  0x00007A0B,
-	8224:  0x00007A05,
-	8225:  0x00007A00,
-	8226:  0x00007A98,
-	8227:  0x00007A97,
-	8228:  0x00007A96,
-	8229:  0x00007AE5,
-	8230:  0x00007AE3,
-	8231:  0x00007B49,
-	8232:  0x00007B56,
-	8233:  0x00007B46,
-	8234:  0x00007B50,
-	8235:  0x00007B52,
-	8236:  0x00007B54,
-	8237:  0x00007B4D,
-	8238:  0x00007B4B,
-	8239:  0x00007B4F,
-	8240:  0x00007B51,
-	8241:  0x00007C9F,
-	8242:  0x00007CA5,
-	8243:  0x00007D5E,
-	8244:  0x00007D50,
-	8245:  0x00007D68,
-	8246:  0x00007D55,
-	8247:  0x00007D2B,
-	8248:  0x00007D6E,
-	8249:  0x00007D72,
-	8250:  0x00007D61,
-	8251:  0x00007D66,
-	8252:  0x00007D62,
-	8253:  0x00007D70,
-	8254:  0x00007D73,
-	8255:  0x00005584,
-	8256:  0x00007FD4,
-	8257:  0x00007FD5,
-	8258:  0x0000800B,
-	8259:  0x00008052,
-	8260:  0x00008085,
-	8261:  0x00008155,
-	8262:  0x00008154,
-	8263:  0x0000814B,
-	8264:  0x00008151,
-	8265:  0x0000814E,
-	8266:  0x00008139,
-	8267:  0x00008146,
-	8268:  0x0000813E,
-	8269:  0x0000814C,
-	8270:  0x00008153,
-	8271:  0x00008174,
-	8272:  0x00008212,
-	8273:  0x0000821C,
-	8274:  0x000083E9,
-	8275:  0x00008403,
-	8276:  0x000083F8,
-	8277:  0x0000840D,
-	8278:  0x000083E0,
-	8279:  0x000083C5,
-	8280:  0x0000840B,
-	8281:  0x000083C1,
-	8282:  0x000083EF,
-	8283:  0x000083F1,
-	8284:  0x000083F4,
-	8285:  0x00008457,
-	8286:  0x0000840A,
-	8287:  0x000083F0,
-	8288:  0x0000840C,
-	8289:  0x000083CC,
-	8290:  0x000083FD,
-	8291:  0x000083F2,
-	8292:  0x000083CA,
-	8293:  0x00008438,
-	8294:  0x0000840E,
-	8295:  0x00008404,
-	8296:  0x000083DC,
-	8297:  0x00008407,
-	8298:  0x000083D4,
-	8299:  0x000083DF,
-	8300:  0x0000865B,
-	8301:  0x000086DF,
-	8302:  0x000086D9,
-	8303:  0x000086ED,
-	8304:  0x000086D4,
-	8305:  0x000086DB,
-	8306:  0x000086E4,
-	8307:  0x000086D0,
-	8308:  0x000086DE,
-	8309:  0x00008857,
-	8310:  0x000088C1,
-	8311:  0x000088C2,
-	8312:  0x000088B1,
-	8313:  0x00008983,
-	8314:  0x00008996,
-	8315:  0x00008A3B,
-	8316:  0x00008A60,
-	8317:  0x00008A55,
-	8318:  0x00008A5E,
-	8319:  0x00008A3C,
-	8320:  0x00008A41,
-	8321:  0x00008A54,
-	8322:  0x00008A5B,
-	8323:  0x00008A50,
-	8324:  0x00008A46,
-	8325:  0x00008A34,
-	8326:  0x00008A3A,
-	8327:  0x00008A36,
-	8328:  0x00008A56,
-	8329:  0x00008C61,
-	8330:  0x00008C82,
-	8331:  0x00008CAF,
-	8332:  0x00008CBC,
-	8333:  0x00008CB3,
-	8334:  0x00008CBD,
-	8335:  0x00008CC1,
-	8336:  0x00008CBB,
-	8337:  0x00008CC0,
-	8338:  0x00008CB4,
-	8339:  0x00008CB7,
-	8340:  0x00008CB6,
-	8341:  0x00008CBF,
-	8342:  0x00008CB8,
-	8343:  0x00008D8A,
-	8344:  0x00008D85,
-	8345:  0x00008D81,
-	8346:  0x00008DCE,
-	8347:  0x00008DDD,
-	8348:  0x00008DCB,
-	8349:  0x00008DDA,
-	8350:  0x00008DD1,
-	8351:  0x00008DCC,
-	8352:  0x00008DDB,
-	8353:  0x00008DC6,
-	8354:  0x00008EFB,
-	8355:  0x00008EF8,
-	8356:  0x00008EFC,
-	8357:  0x00008F9C,
-	8358:  0x0000902E,
-	8359:  0x00009035,
-	8360:  0x00009031,
-	8361:  0x00009038,
-	8362:  0x00009032,
-	8363:  0x00009036,
-	8364:  0x00009102,
-	8365:  0x000090F5,
-	8366:  0x00009109,
-	8367:  0x000090FE,
-	8368:  0x00009163,
-	8369:  0x00009165,
-	8370:  0x000091CF,
-	8371:  0x00009214,
-	8372:  0x00009215,
-	8373:  0x00009223,
-	8374:  0x00009209,
-	8375:  0x0000921E,
-	8376:  0x0000920D,
-	8377:  0x00009210,
-	8378:  0x00009207,
-	8379:  0x00009211,
-	8380:  0x00009594,
-	8381:  0x0000958F,
-	8382:  0x0000958B,
-	8383:  0x00009591,
-	8384:  0x00009593,
-	8385:  0x00009592,
-	8386:  0x0000958E,
-	8387:  0x0000968A,
-	8388:  0x0000968E,
-	8389:  0x0000968B,
-	8390:  0x0000967D,
-	8391:  0x00009685,
-	8392:  0x00009686,
-	8393:  0x0000968D,
-	8394:  0x00009672,
-	8395:  0x00009684,
-	8396:  0x000096C1,
-	8397:  0x000096C5,
-	8398:  0x000096C4,
-	8399:  0x000096C6,
-	8400:  0x000096C7,
-	8401:  0x000096EF,
-	8402:  0x000096F2,
-	8403:  0x000097CC,
-	8404:  0x00009805,
-	8405:  0x00009806,
-	8406:  0x00009808,
-	8407:  0x000098E7,
-	8408:  0x000098EA,
-	8409:  0x000098EF,
-	8410:  0x000098E9,
-	8411:  0x000098F2,
-	8412:  0x000098ED,
-	8413:  0x000099AE,
-	8414:  0x000099AD,
-	8415:  0x00009EC3,
-	8416:  0x00009ECD,
-	8417:  0x00009ED1,
-	8418:  0x00004E82,
-	8419:  0x000050AD,
-	8420:  0x000050B5,
-	8421:  0x000050B2,
-	8422:  0x000050B3,
-	8423:  0x000050C5,
-	8424:  0x000050BE,
-	8425:  0x000050AC,
-	8426:  0x000050B7,
-	8427:  0x000050BB,
-	8428:  0x000050AF,
-	8429:  0x000050C7,
-	8430:  0x0000527F,
-	8431:  0x00005277,
-	8432:  0x0000527D,
-	8433:  0x000052DF,
-	8434:  0x000052E6,
-	8435:  0x000052E4,
-	8436:  0x000052E2,
-	8437:  0x000052E3,
-	8438:  0x0000532F,
-	8439:  0x000055DF,
-	8440:  0x000055E8,
-	8441:  0x000055D3,
-	8442:  0x000055E6,
-	8443:  0x000055CE,
-	8444:  0x000055DC,
-	8445:  0x000055C7,
-	8446:  0x000055D1,
-	8447:  0x000055E3,
-	8448:  0x000055E4,
-	8449:  0x000055EF,
-	8450:  0x000055DA,
-	8451:  0x000055E1,
-	8452:  0x000055C5,
-	8453:  0x000055C6,
-	8454:  0x000055E5,
-	8455:  0x000055C9,
-	8456:  0x00005712,
-	8457:  0x00005713,
-	8458:  0x0000585E,
-	8459:  0x00005851,
-	8460:  0x00005858,
-	8461:  0x00005857,
-	8462:  0x0000585A,
-	8463:  0x00005854,
-	8464:  0x0000586B,
-	8465:  0x0000584C,
-	8466:  0x0000586D,
-	8467:  0x0000584A,
-	8468:  0x00005862,
-	8469:  0x00005852,
-	8470:  0x0000584B,
-	8471:  0x00005967,
-	8472:  0x00005AC1,
-	8473:  0x00005AC9,
-	8474:  0x00005ACC,
-	8475:  0x00005ABE,
-	8476:  0x00005ABD,
-	8477:  0x00005ABC,
-	8478:  0x00005AB3,
-	8479:  0x00005AC2,
-	8480:  0x00005AB2,
-	8481:  0x00005D69,
-	8482:  0x00005D6F,
-	8483:  0x00005E4C,
-	8484:  0x00005E79,
-	8485:  0x00005EC9,
-	8486:  0x00005EC8,
-	8487:  0x00005F12,
-	8488:  0x00005F59,
-	8489:  0x00005FAC,
-	8490:  0x00005FAE,
-	8491:  0x0000611A,
-	8492:  0x0000610F,
-	8493:  0x00006148,
-	8494:  0x0000611F,
-	8495:  0x000060F3,
-	8496:  0x0000611B,
-	8497:  0x000060F9,
-	8498:  0x00006101,
-	8499:  0x00006108,
-	8500:  0x0000614E,
-	8501:  0x0000614C,
-	8502:  0x00006144,
-	8503:  0x0000614D,
-	8504:  0x0000613E,
-	8505:  0x00006134,
-	8506:  0x00006127,
-	8507:  0x0000610D,
-	8508:  0x00006106,
-	8509:  0x00006137,
-	8510:  0x00006221,
-	8511:  0x00006222,
-	8512:  0x00006413,
-	8513:  0x0000643E,
-	8514:  0x0000641E,
-	8515:  0x0000642A,
-	8516:  0x0000642D,
-	8517:  0x0000643D,
-	8518:  0x0000642C,
-	8519:  0x0000640F,
-	8520:  0x0000641C,
-	8521:  0x00006414,
-	8522:  0x0000640D,
-	8523:  0x00006436,
-	8524:  0x00006416,
-	8525:  0x00006417,
-	8526:  0x00006406,
-	8527:  0x0000656C,
-	8528:  0x0000659F,
-	8529:  0x000065B0,
-	8530:  0x00006697,
-	8531:  0x00006689,
-	8532:  0x00006687,
-	8533:  0x00006688,
-	8534:  0x00006696,
-	8535:  0x00006684,
-	8536:  0x00006698,
-	8537:  0x0000668D,
-	8538:  0x00006703,
-	8539:  0x00006994,
-	8540:  0x0000696D,
-	8541:  0x0000695A,
-	8542:  0x00006977,
-	8543:  0x00006960,
-	8544:  0x00006954,
-	8545:  0x00006975,
-	8546:  0x00006930,
-	8547:  0x00006982,
-	8548:  0x0000694A,
-	8549:  0x00006968,
-	8550:  0x0000696B,
-	8551:  0x0000695E,
-	8552:  0x00006953,
-	8553:  0x00006979,
-	8554:  0x00006986,
-	8555:  0x0000695D,
-	8556:  0x00006963,
-	8557:  0x0000695B,
-	8558:  0x00006B47,
-	8559:  0x00006B72,
-	8560:  0x00006BC0,
-	8561:  0x00006BBF,
-	8562:  0x00006BD3,
-	8563:  0x00006BFD,
-	8564:  0x00006EA2,
-	8565:  0x00006EAF,
-	8566:  0x00006ED3,
-	8567:  0x00006EB6,
-	8568:  0x00006EC2,
-	8569:  0x00006E90,
-	8570:  0x00006E9D,
-	8571:  0x00006EC7,
-	8572:  0x00006EC5,
-	8573:  0x00006EA5,
-	8574:  0x00006E98,
-	8575:  0x00006EBC,
-	8576:  0x00006EBA,
-	8577:  0x00006EAB,
-	8578:  0x00006ED1,
-	8579:  0x00006E96,
-	8580:  0x00006E9C,
-	8581:  0x00006EC4,
-	8582:  0x00006ED4,
-	8583:  0x00006EAA,
-	8584:  0x00006EA7,
-	8585:  0x00006EB4,
-	8586:  0x0000714E,
-	8587:  0x00007159,
-	8588:  0x00007169,
-	8589:  0x00007164,
-	8590:  0x00007149,
-	8591:  0x00007167,
-	8592:  0x0000715C,
-	8593:  0x0000716C,
-	8594:  0x00007166,
-	8595:  0x0000714C,
-	8596:  0x00007165,
-	8597:  0x0000715E,
-	8598:  0x00007146,
-	8599:  0x00007168,
-	8600:  0x00007156,
-	8601:  0x0000723A,
-	8602:  0x00007252,
-	8603:  0x00007337,
-	8604:  0x00007345,
-	8605:  0x0000733F,
-	8606:  0x0000733E,
-	8607:  0x0000746F,
-	8608:  0x0000745A,
-	8609:  0x00007455,
-	8610:  0x0000745F,
-	8611:  0x0000745E,
-	8612:  0x00007441,
-	8613:  0x0000743F,
-	8614:  0x00007459,
-	8615:  0x0000745B,
-	8616:  0x0000745C,
-	8617:  0x00007576,
-	8618:  0x00007578,
-	8619:  0x00007600,
-	8620:  0x000075F0,
-	8621:  0x00007601,
-	8622:  0x000075F2,
-	8623:  0x000075F1,
-	8624:  0x000075FA,
-	8625:  0x000075FF,
-	8626:  0x000075F4,
-	8627:  0x000075F3,
-	8628:  0x000076DE,
-	8629:  0x000076DF,
-	8630:  0x0000775B,
-	8631:  0x0000776B,
-	8632:  0x00007766,
-	8633:  0x0000775E,
-	8634:  0x00007763,
-	8635:  0x00007779,
-	8636:  0x0000776A,
-	8637:  0x0000776C,
-	8638:  0x0000775C,
-	8639:  0x00007765,
-	8640:  0x00007768,
-	8641:  0x00007762,
-	8642:  0x000077EE,
-	8643:  0x0000788E,
-	8644:  0x000078B0,
-	8645:  0x00007897,
-	8646:  0x00007898,
-	8647:  0x0000788C,
-	8648:  0x00007889,
-	8649:  0x0000787C,
-	8650:  0x00007891,
-	8651:  0x00007893,
-	8652:  0x0000787F,
-	8653:  0x0000797A,
-	8654:  0x0000797F,
-	8655:  0x00007981,
-	8656:  0x0000842C,
-	8657:  0x000079BD,
-	8658:  0x00007A1C,
-	8659:  0x00007A1A,
-	8660:  0x00007A20,
-	8661:  0x00007A14,
-	8662:  0x00007A1F,
-	8663:  0x00007A1E,
-	8664:  0x00007A9F,
-	8665:  0x00007AA0,
-	8666:  0x00007B77,
-	8667:  0x00007BC0,
-	8668:  0x00007B60,
-	8669:  0x00007B6E,
-	8670:  0x00007B67,
-	8671:  0x00007CB1,
-	8672:  0x00007CB3,
-	8673:  0x00007CB5,
-	8674:  0x00007D93,
-	8675:  0x00007D79,
-	8676:  0x00007D91,
-	8677:  0x00007D81,
-	8678:  0x00007D8F,
-	8679:  0x00007D5B,
-	8680:  0x00007F6E,
-	8681:  0x00007F69,
-	8682:  0x00007F6A,
-	8683:  0x00007F72,
-	8684:  0x00007FA9,
-	8685:  0x00007FA8,
-	8686:  0x00007FA4,
-	8687:  0x00008056,
-	8688:  0x00008058,
-	8689:  0x00008086,
-	8690:  0x00008084,
-	8691:  0x00008171,
-	8692:  0x00008170,
-	8693:  0x00008178,
-	8694:  0x00008165,
-	8695:  0x0000816E,
-	8696:  0x00008173,
-	8697:  0x0000816B,
-	8698:  0x00008179,
-	8699:  0x0000817A,
-	8700:  0x00008166,
-	8701:  0x00008205,
-	8702:  0x00008247,
-	8703:  0x00008482,
-	8704:  0x00008477,
-	8705:  0x0000843D,
-	8706:  0x00008431,
-	8707:  0x00008475,
-	8708:  0x00008466,
-	8709:  0x0000846B,
-	8710:  0x00008449,
-	8711:  0x0000846C,
-	8712:  0x0000845B,
-	8713:  0x0000843C,
-	8714:  0x00008435,
-	8715:  0x00008461,
-	8716:  0x00008463,
-	8717:  0x00008469,
-	8718:  0x0000846D,
-	8719:  0x00008446,
-	8720:  0x0000865E,
-	8721:  0x0000865C,
-	8722:  0x0000865F,
-	8723:  0x000086F9,
-	8724:  0x00008713,
-	8725:  0x00008708,
-	8726:  0x00008707,
-	8727:  0x00008700,
-	8728:  0x000086FE,
-	8729:  0x000086FB,
-	8730:  0x00008702,
-	8731:  0x00008703,
-	8732:  0x00008706,
-	8733:  0x0000870A,
-	8734:  0x00008859,
-	8735:  0x000088DF,
-	8736:  0x000088D4,
-	8737:  0x000088D9,
-	8738:  0x000088DC,
-	8739:  0x000088D8,
-	8740:  0x000088DD,
-	8741:  0x000088E1,
-	8742:  0x000088CA,
-	8743:  0x000088D5,
-	8744:  0x000088D2,
-	8745:  0x0000899C,
-	8746:  0x000089E3,
-	8747:  0x00008A6B,
-	8748:  0x00008A72,
-	8749:  0x00008A73,
-	8750:  0x00008A66,
-	8751:  0x00008A69,
-	8752:  0x00008A70,
-	8753:  0x00008A87,
-	8754:  0x00008A7C,
-	8755:  0x00008A63,
-	8756:  0x00008AA0,
-	8757:  0x00008A71,
-	8758:  0x00008A85,
-	8759:  0x00008A6D,
-	8760:  0x00008A62,
-	8761:  0x00008A6E,
-	8762:  0x00008A6C,
-	8763:  0x00008A79,
-	8764:  0x00008A7B,
-	8765:  0x00008A3E,
-	8766:  0x00008A68,
-	8767:  0x00008C62,
-	8768:  0x00008C8A,
-	8769:  0x00008C89,
-	8770:  0x00008CCA,
-	8771:  0x00008CC7,
-	8772:  0x00008CC8,
-	8773:  0x00008CC4,
-	8774:  0x00008CB2,
-	8775:  0x00008CC3,
-	8776:  0x00008CC2,
-	8777:  0x00008CC5,
-	8778:  0x00008DE1,
-	8779:  0x00008DDF,
-	8780:  0x00008DE8,
-	8781:  0x00008DEF,
-	8782:  0x00008DF3,
-	8783:  0x00008DFA,
-	8784:  0x00008DEA,
-	8785:  0x00008DE4,
-	8786:  0x00008DE6,
-	8787:  0x00008EB2,
-	8788:  0x00008F03,
-	8789:  0x00008F09,
-	8790:  0x00008EFE,
-	8791:  0x00008F0A,
-	8792:  0x00008F9F,
-	8793:  0x00008FB2,
-	8794:  0x0000904B,
-	8795:  0x0000904A,
-	8796:  0x00009053,
-	8797:  0x00009042,
-	8798:  0x00009054,
-	8799:  0x0000903C,
-	8800:  0x00009055,
-	8801:  0x00009050,
-	8802:  0x00009047,
-	8803:  0x0000904F,
-	8804:  0x0000904E,
-	8805:  0x0000904D,
-	8806:  0x00009051,
-	8807:  0x0000903E,
-	8808:  0x00009041,
-	8809:  0x00009112,
-	8810:  0x00009117,
-	8811:  0x0000916C,
-	8812:  0x0000916A,
-	8813:  0x00009169,
-	8814:  0x000091C9,
-	8815:  0x00009237,
-	8816:  0x00009257,
-	8817:  0x00009238,
-	8818:  0x0000923D,
-	8819:  0x00009240,
-	8820:  0x0000923E,
-	8821:  0x0000925B,
-	8822:  0x0000924B,
-	8823:  0x00009264,
-	8824:  0x00009251,
-	8825:  0x00009234,
-	8826:  0x00009249,
-	8827:  0x0000924D,
-	8828:  0x00009245,
-	8829:  0x00009239,
-	8830:  0x0000923F,
-	8831:  0x0000925A,
-	8832:  0x00009598,
-	8833:  0x00009698,
-	8834:  0x00009694,
-	8835:  0x00009695,
-	8836:  0x000096CD,
-	8837:  0x000096CB,
-	8838:  0x000096C9,
-	8839:  0x000096CA,
-	8840:  0x000096F7,
-	8841:  0x000096FB,
-	8842:  0x000096F9,
-	8843:  0x000096F6,
-	8844:  0x00009756,
-	8845:  0x00009774,
-	8846:  0x00009776,
-	8847:  0x00009810,
-	8848:  0x00009811,
-	8849:  0x00009813,
-	8850:  0x0000980A,
-	8851:  0x00009812,
-	8852:  0x0000980C,
-	8853:  0x000098FC,
-	8854:  0x000098F4,
-	8855:  0x000098FD,
-	8856:  0x000098FE,
-	8857:  0x000099B3,
-	8858:  0x000099B1,
-	8859:  0x000099B4,
-	8860:  0x00009AE1,
-	8861:  0x00009CE9,
-	8862:  0x00009E82,
-	8863:  0x00009F0E,
-	8864:  0x00009F13,
-	8865:  0x00009F20,
-	8866:  0x000050E7,
-	8867:  0x000050EE,
-	8868:  0x000050E5,
-	8869:  0x000050D6,
-	8870:  0x000050ED,
-	8871:  0x000050DA,
-	8872:  0x000050D5,
-	8873:  0x000050CF,
-	8874:  0x000050D1,
-	8875:  0x000050F1,
-	8876:  0x000050CE,
-	8877:  0x000050E9,
-	8878:  0x00005162,
-	8879:  0x000051F3,
-	8880:  0x00005283,
-	8881:  0x00005282,
-	8882:  0x00005331,
-	8883:  0x000053AD,
-	8884:  0x000055FE,
-	8885:  0x00005600,
-	8886:  0x0000561B,
-	8887:  0x00005617,
-	8888:  0x000055FD,
-	8889:  0x00005614,
-	8890:  0x00005606,
-	8891:  0x00005609,
-	8892:  0x0000560D,
-	8893:  0x0000560E,
-	8894:  0x000055F7,
-	8895:  0x00005616,
-	8896:  0x0000561F,
-	8897:  0x00005608,
-	8898:  0x00005610,
-	8899:  0x000055F6,
-	8900:  0x00005718,
-	8901:  0x00005716,
-	8902:  0x00005875,
-	8903:  0x0000587E,
-	8904:  0x00005883,
-	8905:  0x00005893,
-	8906:  0x0000588A,
-	8907:  0x00005879,
-	8908:  0x00005885,
-	8909:  0x0000587D,
-	8910:  0x000058FD,
-	8911:  0x00005925,
-	8912:  0x00005922,
-	8913:  0x00005924,
-	8914:  0x0000596A,
-	8915:  0x00005969,
-	8916:  0x00005AE1,
-	8917:  0x00005AE6,
-	8918:  0x00005AE9,
-	8919:  0x00005AD7,
-	8920:  0x00005AD6,
-	8921:  0x00005AD8,
-	8922:  0x00005AE3,
-	8923:  0x00005B75,
-	8924:  0x00005BDE,
-	8925:  0x00005BE7,
-	8926:  0x00005BE1,
-	8927:  0x00005BE5,
-	8928:  0x00005BE6,
-	8929:  0x00005BE8,
-	8930:  0x00005BE2,
-	8931:  0x00005BE4,
-	8932:  0x00005BDF,
-	8933:  0x00005C0D,
-	8934:  0x00005C62,
-	8935:  0x00005D84,
-	8936:  0x00005D87,
-	8937:  0x00005E5B,
-	8938:  0x00005E63,
-	8939:  0x00005E55,
-	8940:  0x00005E57,
-	8941:  0x00005E54,
-	8942:  0x00005ED3,
-	8943:  0x00005ED6,
-	8944:  0x00005F0A,
-	8945:  0x00005F46,
-	8946:  0x00005F70,
-	8947:  0x00005FB9,
-	8948:  0x00006147,
-	8949:  0x0000613F,
-	8950:  0x0000614B,
-	8951:  0x00006177,
-	8952:  0x00006162,
-	8953:  0x00006163,
-	8954:  0x0000615F,
-	8955:  0x0000615A,
-	8956:  0x00006158,
-	8957:  0x00006175,
-	8958:  0x0000622A,
-	8959:  0x00006487,
-	8960:  0x00006458,
-	8961:  0x00006454,
-	8962:  0x000064A4,
-	8963:  0x00006478,
-	8964:  0x0000645F,
-	8965:  0x0000647A,
-	8966:  0x00006451,
-	8967:  0x00006467,
-	8968:  0x00006434,
-	8969:  0x0000646D,
-	8970:  0x0000647B,
-	8971:  0x00006572,
-	8972:  0x000065A1,
-	8973:  0x000065D7,
-	8974:  0x000065D6,
-	8975:  0x000066A2,
-	8976:  0x000066A8,
-	8977:  0x0000669D,
-	8978:  0x0000699C,
-	8979:  0x000069A8,
-	8980:  0x00006995,
-	8981:  0x000069C1,
-	8982:  0x000069AE,
-	8983:  0x000069D3,
-	8984:  0x000069CB,
-	8985:  0x0000699B,
-	8986:  0x000069B7,
-	8987:  0x000069BB,
-	8988:  0x000069AB,
-	8989:  0x000069B4,
-	8990:  0x000069D0,
-	8991:  0x000069CD,
-	8992:  0x000069AD,
-	8993:  0x000069CC,
-	8994:  0x000069A6,
-	8995:  0x000069C3,
-	8996:  0x000069A3,
-	8997:  0x00006B49,
-	8998:  0x00006B4C,
-	8999:  0x00006C33,
-	9000:  0x00006F33,
-	9001:  0x00006F14,
-	9002:  0x00006EFE,
-	9003:  0x00006F13,
-	9004:  0x00006EF4,
-	9005:  0x00006F29,
-	9006:  0x00006F3E,
-	9007:  0x00006F20,
-	9008:  0x00006F2C,
-	9009:  0x00006F0F,
-	9010:  0x00006F02,
-	9011:  0x00006F22,
-	9012:  0x00006EFF,
-	9013:  0x00006EEF,
-	9014:  0x00006F06,
-	9015:  0x00006F31,
-	9016:  0x00006F38,
-	9017:  0x00006F32,
-	9018:  0x00006F23,
-	9019:  0x00006F15,
-	9020:  0x00006F2B,
-	9021:  0x00006F2F,
-	9022:  0x00006F88,
-	9023:  0x00006F2A,
-	9024:  0x00006EEC,
-	9025:  0x00006F01,
-	9026:  0x00006EF2,
-	9027:  0x00006ECC,
-	9028:  0x00006EF7,
-	9029:  0x00007194,
-	9030:  0x00007199,
-	9031:  0x0000717D,
-	9032:  0x0000718A,
-	9033:  0x00007184,
-	9034:  0x00007192,
-	9035:  0x0000723E,
-	9036:  0x00007292,
-	9037:  0x00007296,
-	9038:  0x00007344,
-	9039:  0x00007350,
-	9040:  0x00007464,
-	9041:  0x00007463,
-	9042:  0x0000746A,
-	9043:  0x00007470,
-	9044:  0x0000746D,
-	9045:  0x00007504,
-	9046:  0x00007591,
-	9047:  0x00007627,
-	9048:  0x0000760D,
-	9049:  0x0000760B,
-	9050:  0x00007609,
-	9051:  0x00007613,
-	9052:  0x000076E1,
-	9053:  0x000076E3,
-	9054:  0x00007784,
-	9055:  0x0000777D,
-	9056:  0x0000777F,
-	9057:  0x00007761,
-	9058:  0x000078C1,
-	9059:  0x0000789F,
-	9060:  0x000078A7,
-	9061:  0x000078B3,
-	9062:  0x000078A9,
-	9063:  0x000078A3,
-	9064:  0x0000798E,
-	9065:  0x0000798F,
-	9066:  0x0000798D,
-	9067:  0x00007A2E,
-	9068:  0x00007A31,
-	9069:  0x00007AAA,
-	9070:  0x00007AA9,
-	9071:  0x00007AED,
-	9072:  0x00007AEF,
-	9073:  0x00007BA1,
-	9074:  0x00007B95,
-	9075:  0x00007B8B,
-	9076:  0x00007B75,
-	9077:  0x00007B97,
-	9078:  0x00007B9D,
-	9079:  0x00007B94,
-	9080:  0x00007B8F,
-	9081:  0x00007BB8,
-	9082:  0x00007B87,
-	9083:  0x00007B84,
-	9084:  0x00007CB9,
-	9085:  0x00007CBD,
-	9086:  0x00007CBE,
-	9087:  0x00007DBB,
-	9088:  0x00007DB0,
-	9089:  0x00007D9C,
-	9090:  0x00007DBD,
-	9091:  0x00007DBE,
-	9092:  0x00007DA0,
-	9093:  0x00007DCA,
-	9094:  0x00007DB4,
-	9095:  0x00007DB2,
-	9096:  0x00007DB1,
-	9097:  0x00007DBA,
-	9098:  0x00007DA2,
-	9099:  0x00007DBF,
-	9100:  0x00007DB5,
-	9101:  0x00007DB8,
-	9102:  0x00007DAD,
-	9103:  0x00007DD2,
-	9104:  0x00007DC7,
-	9105:  0x00007DAC,
-	9106:  0x00007F70,
-	9107:  0x00007FE0,
-	9108:  0x00007FE1,
-	9109:  0x00007FDF,
-	9110:  0x0000805E,
-	9111:  0x0000805A,
-	9112:  0x00008087,
-	9113:  0x00008150,
-	9114:  0x00008180,
-	9115:  0x0000818F,
-	9116:  0x00008188,
-	9117:  0x0000818A,
-	9118:  0x0000817F,
-	9119:  0x00008182,
-	9120:  0x000081E7,
-	9121:  0x000081FA,
-	9122:  0x00008207,
-	9123:  0x00008214,
-	9124:  0x0000821E,
-	9125:  0x0000824B,
-	9126:  0x000084C9,
-	9127:  0x000084BF,
-	9128:  0x000084C6,
-	9129:  0x000084C4,
-	9130:  0x00008499,
-	9131:  0x0000849E,
-	9132:  0x000084B2,
-	9133:  0x0000849C,
-	9134:  0x000084CB,
-	9135:  0x000084B8,
-	9136:  0x000084C0,
-	9137:  0x000084D3,
-	9138:  0x00008490,
-	9139:  0x000084BC,
-	9140:  0x000084D1,
-	9141:  0x000084CA,
-	9142:  0x0000873F,
-	9143:  0x0000871C,
-	9144:  0x0000873B,
-	9145:  0x00008722,
-	9146:  0x00008725,
-	9147:  0x00008734,
-	9148:  0x00008718,
-	9149:  0x00008755,
-	9150:  0x00008737,
-	9151:  0x00008729,
-	9152:  0x000088F3,
-	9153:  0x00008902,
-	9154:  0x000088F4,
-	9155:  0x000088F9,
-	9156:  0x000088F8,
-	9157:  0x000088FD,
-	9158:  0x000088E8,
-	9159:  0x0000891A,
-	9160:  0x000088EF,
-	9161:  0x00008AA6,
-	9162:  0x00008A8C,
-	9163:  0x00008A9E,
-	9164:  0x00008AA3,
-	9165:  0x00008A8D,
-	9166:  0x00008AA1,
-	9167:  0x00008A93,
-	9168:  0x00008AA4,
-	9169:  0x00008AAA,
-	9170:  0x00008AA5,
-	9171:  0x00008AA8,
-	9172:  0x00008A98,
-	9173:  0x00008A91,
-	9174:  0x00008A9A,
-	9175:  0x00008AA7,
-	9176:  0x00008C6A,
-	9177:  0x00008C8D,
-	9178:  0x00008C8C,
-	9179:  0x00008CD3,
-	9180:  0x00008CD1,
-	9181:  0x00008CD2,
-	9182:  0x00008D6B,
-	9183:  0x00008D99,
-	9184:  0x00008D95,
-	9185:  0x00008DFC,
-	9186:  0x00008F14,
-	9187:  0x00008F12,
-	9188:  0x00008F15,
-	9189:  0x00008F13,
-	9190:  0x00008FA3,
-	9191:  0x00009060,
-	9192:  0x00009058,
-	9193:  0x0000905C,
-	9194:  0x00009063,
-	9195:  0x00009059,
-	9196:  0x0000905E,
-	9197:  0x00009062,
-	9198:  0x0000905D,
-	9199:  0x0000905B,
-	9200:  0x00009119,
-	9201:  0x00009118,
-	9202:  0x0000911E,
-	9203:  0x00009175,
-	9204:  0x00009178,
-	9205:  0x00009177,
-	9206:  0x00009174,
-	9207:  0x00009278,
-	9208:  0x00009280,
-	9209:  0x00009285,
-	9210:  0x00009298,
-	9211:  0x00009296,
-	9212:  0x0000927B,
-	9213:  0x00009293,
-	9214:  0x0000929C,
-	9215:  0x000092A8,
-	9216:  0x0000927C,
-	9217:  0x00009291,
-	9218:  0x000095A1,
-	9219:  0x000095A8,
-	9220:  0x000095A9,
-	9221:  0x000095A3,
-	9222:  0x000095A5,
-	9223:  0x000095A4,
-	9224:  0x00009699,
-	9225:  0x0000969C,
-	9226:  0x0000969B,
-	9227:  0x000096CC,
-	9228:  0x000096D2,
-	9229:  0x00009700,
-	9230:  0x0000977C,
-	9231:  0x00009785,
-	9232:  0x000097F6,
-	9233:  0x00009817,
-	9234:  0x00009818,
-	9235:  0x000098AF,
-	9236:  0x000098B1,
-	9237:  0x00009903,
-	9238:  0x00009905,
-	9239:  0x0000990C,
-	9240:  0x00009909,
-	9241:  0x000099C1,
-	9242:  0x00009AAF,
-	9243:  0x00009AB0,
-	9244:  0x00009AE6,
-	9245:  0x00009B41,
-	9246:  0x00009B42,
-	9247:  0x00009CF4,
-	9248:  0x00009CF6,
-	9249:  0x00009CF3,
-	9250:  0x00009EBC,
-	9251:  0x00009F3B,
-	9252:  0x00009F4A,
-	9253:  0x00005104,
-	9254:  0x00005100,
-	9255:  0x000050FB,
-	9256:  0x000050F5,
-	9257:  0x000050F9,
-	9258:  0x00005102,
-	9259:  0x00005108,
-	9260:  0x00005109,
-	9261:  0x00005105,
-	9262:  0x000051DC,
-	9263:  0x00005287,
-	9264:  0x00005288,
-	9265:  0x00005289,
-	9266:  0x0000528D,
-	9267:  0x0000528A,
-	9268:  0x000052F0,
-	9269:  0x000053B2,
-	9270:  0x0000562E,
-	9271:  0x0000563B,
-	9272:  0x00005639,
-	9273:  0x00005632,
-	9274:  0x0000563F,
-	9275:  0x00005634,
-	9276:  0x00005629,
-	9277:  0x00005653,
-	9278:  0x0000564E,
-	9279:  0x00005657,
-	9280:  0x00005674,
-	9281:  0x00005636,
-	9282:  0x0000562F,
-	9283:  0x00005630,
-	9284:  0x00005880,
-	9285:  0x0000589F,
-	9286:  0x0000589E,
-	9287:  0x000058B3,
-	9288:  0x0000589C,
-	9289:  0x000058AE,
-	9290:  0x000058A9,
-	9291:  0x000058A6,
-	9292:  0x0000596D,
-	9293:  0x00005B09,
-	9294:  0x00005AFB,
-	9295:  0x00005B0B,
-	9296:  0x00005AF5,
-	9297:  0x00005B0C,
-	9298:  0x00005B08,
-	9299:  0x00005BEE,
-	9300:  0x00005BEC,
-	9301:  0x00005BE9,
-	9302:  0x00005BEB,
-	9303:  0x00005C64,
-	9304:  0x00005C65,
-	9305:  0x00005D9D,
-	9306:  0x00005D94,
-	9307:  0x00005E62,
-	9308:  0x00005E5F,
-	9309:  0x00005E61,
-	9310:  0x00005EE2,
-	9311:  0x00005EDA,
-	9312:  0x00005EDF,
-	9313:  0x00005EDD,
-	9314:  0x00005EE3,
-	9315:  0x00005EE0,
-	9316:  0x00005F48,
-	9317:  0x00005F71,
-	9318:  0x00005FB7,
-	9319:  0x00005FB5,
-	9320:  0x00006176,
-	9321:  0x00006167,
-	9322:  0x0000616E,
-	9323:  0x0000615D,
-	9324:  0x00006155,
-	9325:  0x00006182,
-	9326:  0x0000617C,
-	9327:  0x00006170,
-	9328:  0x0000616B,
-	9329:  0x0000617E,
-	9330:  0x000061A7,
-	9331:  0x00006190,
-	9332:  0x000061AB,
-	9333:  0x0000618E,
-	9334:  0x000061AC,
-	9335:  0x0000619A,
-	9336:  0x000061A4,
-	9337:  0x00006194,
-	9338:  0x000061AE,
-	9339:  0x0000622E,
-	9340:  0x00006469,
-	9341:  0x0000646F,
-	9342:  0x00006479,
-	9343:  0x0000649E,
-	9344:  0x000064B2,
-	9345:  0x00006488,
-	9346:  0x00006490,
-	9347:  0x000064B0,
-	9348:  0x000064A5,
-	9349:  0x00006493,
-	9350:  0x00006495,
-	9351:  0x000064A9,
-	9352:  0x00006492,
-	9353:  0x000064AE,
-	9354:  0x000064AD,
-	9355:  0x000064AB,
-	9356:  0x0000649A,
-	9357:  0x000064AC,
-	9358:  0x00006499,
-	9359:  0x000064A2,
-	9360:  0x000064B3,
-	9361:  0x00006575,
-	9362:  0x00006577,
-	9363:  0x00006578,
-	9364:  0x000066AE,
-	9365:  0x000066AB,
-	9366:  0x000066B4,
-	9367:  0x000066B1,
-	9368:  0x00006A23,
-	9369:  0x00006A1F,
-	9370:  0x000069E8,
-	9371:  0x00006A01,
-	9372:  0x00006A1E,
-	9373:  0x00006A19,
-	9374:  0x000069FD,
-	9375:  0x00006A21,
-	9376:  0x00006A13,
-	9377:  0x00006A0A,
-	9378:  0x000069F3,
-	9379:  0x00006A02,
-	9380:  0x00006A05,
-	9381:  0x000069ED,
-	9382:  0x00006A11,
-	9383:  0x00006B50,
-	9384:  0x00006B4E,
-	9385:  0x00006BA4,
-	9386:  0x00006BC5,
-	9387:  0x00006BC6,
-	9388:  0x00006F3F,
-	9389:  0x00006F7C,
-	9390:  0x00006F84,
-	9391:  0x00006F51,
-	9392:  0x00006F66,
-	9393:  0x00006F54,
-	9394:  0x00006F86,
-	9395:  0x00006F6D,
-	9396:  0x00006F5B,
-	9397:  0x00006F78,
-	9398:  0x00006F6E,
-	9399:  0x00006F8E,
-	9400:  0x00006F7A,
-	9401:  0x00006F70,
-	9402:  0x00006F64,
-	9403:  0x00006F97,
-	9404:  0x00006F58,
-	9405:  0x00006ED5,
-	9406:  0x00006F6F,
-	9407:  0x00006F60,
-	9408:  0x00006F5F,
-	9409:  0x0000719F,
-	9410:  0x000071AC,
-	9411:  0x000071B1,
-	9412:  0x000071A8,
-	9413:  0x00007256,
-	9414:  0x0000729B,
-	9415:  0x0000734E,
-	9416:  0x00007357,
-	9417:  0x00007469,
-	9418:  0x0000748B,
-	9419:  0x00007483,
-	9420:  0x0000747E,
-	9421:  0x00007480,
-	9422:  0x0000757F,
-	9423:  0x00007620,
-	9424:  0x00007629,
-	9425:  0x0000761F,
-	9426:  0x00007624,
-	9427:  0x00007626,
-	9428:  0x00007621,
-	9429:  0x00007622,
-	9430:  0x0000769A,
-	9431:  0x000076BA,
-	9432:  0x000076E4,
-	9433:  0x0000778E,
-	9434:  0x00007787,
-	9435:  0x0000778C,
-	9436:  0x00007791,
-	9437:  0x0000778B,
-	9438:  0x000078CB,
-	9439:  0x000078C5,
-	9440:  0x000078BA,
-	9441:  0x000078CA,
-	9442:  0x000078BE,
-	9443:  0x000078D5,
-	9444:  0x000078BC,
-	9445:  0x000078D0,
-	9446:  0x00007A3F,
-	9447:  0x00007A3C,
-	9448:  0x00007A40,
-	9449:  0x00007A3D,
-	9450:  0x00007A37,
-	9451:  0x00007A3B,
-	9452:  0x00007AAF,
-	9453:  0x00007AAE,
-	9454:  0x00007BAD,
-	9455:  0x00007BB1,
-	9456:  0x00007BC4,
-	9457:  0x00007BB4,
-	9458:  0x00007BC6,
-	9459:  0x00007BC7,
-	9460:  0x00007BC1,
-	9461:  0x00007BA0,
-	9462:  0x00007BCC,
-	9463:  0x00007CCA,
-	9464:  0x00007DE0,
-	9465:  0x00007DF4,
-	9466:  0x00007DEF,
-	9467:  0x00007DFB,
-	9468:  0x00007DD8,
-	9469:  0x00007DEC,
-	9470:  0x00007DDD,
-	9471:  0x00007DE8,
-	9472:  0x00007DE3,
-	9473:  0x00007DDA,
-	9474:  0x00007DDE,
-	9475:  0x00007DE9,
-	9476:  0x00007D9E,
-	9477:  0x00007DD9,
-	9478:  0x00007DF2,
-	9479:  0x00007DF9,
-	9480:  0x00007F75,
-	9481:  0x00007F77,
-	9482:  0x00007FAF,
-	9483:  0x00007FE9,
-	9484:  0x00008026,
-	9485:  0x0000819B,
-	9486:  0x0000819C,
-	9487:  0x0000819D,
-	9488:  0x000081A0,
-	9489:  0x0000819A,
-	9490:  0x00008198,
-	9491:  0x00008517,
-	9492:  0x0000853D,
-	9493:  0x0000851A,
-	9494:  0x000084EE,
-	9495:  0x0000852C,
-	9496:  0x0000852D,
-	9497:  0x00008513,
-	9498:  0x00008511,
-	9499:  0x00008523,
-	9500:  0x00008521,
-	9501:  0x00008514,
-	9502:  0x000084EC,
-	9503:  0x00008525,
-	9504:  0x000084FF,
-	9505:  0x00008506,
-	9506:  0x00008782,
-	9507:  0x00008774,
-	9508:  0x00008776,
-	9509:  0x00008760,
-	9510:  0x00008766,
-	9511:  0x00008778,
-	9512:  0x00008768,
-	9513:  0x00008759,
-	9514:  0x00008757,
-	9515:  0x0000874C,
-	9516:  0x00008753,
-	9517:  0x0000885B,
-	9518:  0x0000885D,
-	9519:  0x00008910,
-	9520:  0x00008907,
-	9521:  0x00008912,
-	9522:  0x00008913,
-	9523:  0x00008915,
-	9524:  0x0000890A,
-	9525:  0x00008ABC,
-	9526:  0x00008AD2,
-	9527:  0x00008AC7,
-	9528:  0x00008AC4,
-	9529:  0x00008A95,
-	9530:  0x00008ACB,
-	9531:  0x00008AF8,
-	9532:  0x00008AB2,
-	9533:  0x00008AC9,
-	9534:  0x00008AC2,
-	9535:  0x00008ABF,
-	9536:  0x00008AB0,
-	9537:  0x00008AD6,
-	9538:  0x00008ACD,
-	9539:  0x00008AB6,
-	9540:  0x00008AB9,
-	9541:  0x00008ADB,
-	9542:  0x00008C4C,
-	9543:  0x00008C4E,
-	9544:  0x00008C6C,
-	9545:  0x00008CE0,
-	9546:  0x00008CDE,
-	9547:  0x00008CE6,
-	9548:  0x00008CE4,
-	9549:  0x00008CEC,
-	9550:  0x00008CED,
-	9551:  0x00008CE2,
-	9552:  0x00008CE3,
-	9553:  0x00008CDC,
-	9554:  0x00008CEA,
-	9555:  0x00008CE1,
-	9556:  0x00008D6D,
-	9557:  0x00008D9F,
-	9558:  0x00008DA3,
-	9559:  0x00008E2B,
-	9560:  0x00008E10,
-	9561:  0x00008E1D,
-	9562:  0x00008E22,
-	9563:  0x00008E0F,
-	9564:  0x00008E29,
-	9565:  0x00008E1F,
-	9566:  0x00008E21,
-	9567:  0x00008E1E,
-	9568:  0x00008EBA,
-	9569:  0x00008F1D,
-	9570:  0x00008F1B,
-	9571:  0x00008F1F,
-	9572:  0x00008F29,
-	9573:  0x00008F26,
-	9574:  0x00008F2A,
-	9575:  0x00008F1C,
-	9576:  0x00008F1E,
-	9577:  0x00008F25,
-	9578:  0x00009069,
-	9579:  0x0000906E,
-	9580:  0x00009068,
-	9581:  0x0000906D,
-	9582:  0x00009077,
-	9583:  0x00009130,
-	9584:  0x0000912D,
-	9585:  0x00009127,
-	9586:  0x00009131,
-	9587:  0x00009187,
-	9588:  0x00009189,
-	9589:  0x0000918B,
-	9590:  0x00009183,
-	9591:  0x000092C5,
-	9592:  0x000092BB,
-	9593:  0x000092B7,
-	9594:  0x000092EA,
-	9595:  0x000092AC,
-	9596:  0x000092E4,
-	9597:  0x000092C1,
-	9598:  0x000092B3,
-	9599:  0x000092BC,
-	9600:  0x000092D2,
-	9601:  0x000092C7,
-	9602:  0x000092F0,
-	9603:  0x000092B2,
-	9604:  0x000095AD,
-	9605:  0x000095B1,
-	9606:  0x00009704,
-	9607:  0x00009706,
-	9608:  0x00009707,
-	9609:  0x00009709,
-	9610:  0x00009760,
-	9611:  0x0000978D,
-	9612:  0x0000978B,
-	9613:  0x0000978F,
-	9614:  0x00009821,
-	9615:  0x0000982B,
-	9616:  0x0000981C,
-	9617:  0x000098B3,
-	9618:  0x0000990A,
-	9619:  0x00009913,
-	9620:  0x00009912,
-	9621:  0x00009918,
-	9622:  0x000099DD,
-	9623:  0x000099D0,
-	9624:  0x000099DF,
-	9625:  0x000099DB,
-	9626:  0x000099D1,
-	9627:  0x000099D5,
-	9628:  0x000099D2,
-	9629:  0x000099D9,
-	9630:  0x00009AB7,
-	9631:  0x00009AEE,
-	9632:  0x00009AEF,
-	9633:  0x00009B27,
-	9634:  0x00009B45,
-	9635:  0x00009B44,
-	9636:  0x00009B77,
-	9637:  0x00009B6F,
-	9638:  0x00009D06,
-	9639:  0x00009D09,
-	9640:  0x00009D03,
-	9641:  0x00009EA9,
-	9642:  0x00009EBE,
-	9643:  0x00009ECE,
-	9644:  0x000058A8,
-	9645:  0x00009F52,
-	9646:  0x00005112,
-	9647:  0x00005118,
-	9648:  0x00005114,
-	9649:  0x00005110,
-	9650:  0x00005115,
-	9651:  0x00005180,
-	9652:  0x000051AA,
-	9653:  0x000051DD,
-	9654:  0x00005291,
-	9655:  0x00005293,
-	9656:  0x000052F3,
-	9657:  0x00005659,
-	9658:  0x0000566B,
-	9659:  0x00005679,
-	9660:  0x00005669,
-	9661:  0x00005664,
-	9662:  0x00005678,
-	9663:  0x0000566A,
-	9664:  0x00005668,
-	9665:  0x00005665,
-	9666:  0x00005671,
-	9667:  0x0000566F,
-	9668:  0x0000566C,
-	9669:  0x00005662,
-	9670:  0x00005676,
-	9671:  0x000058C1,
-	9672:  0x000058BE,
-	9673:  0x000058C7,
-	9674:  0x000058C5,
-	9675:  0x0000596E,
-	9676:  0x00005B1D,
-	9677:  0x00005B34,
-	9678:  0x00005B78,
-	9679:  0x00005BF0,
-	9680:  0x00005C0E,
-	9681:  0x00005F4A,
-	9682:  0x000061B2,
-	9683:  0x00006191,
-	9684:  0x000061A9,
-	9685:  0x0000618A,
-	9686:  0x000061CD,
-	9687:  0x000061B6,
-	9688:  0x000061BE,
-	9689:  0x000061CA,
-	9690:  0x000061C8,
-	9691:  0x00006230,
-	9692:  0x000064C5,
-	9693:  0x000064C1,
-	9694:  0x000064CB,
-	9695:  0x000064BB,
-	9696:  0x000064BC,
-	9697:  0x000064DA,
-	9698:  0x000064C4,
-	9699:  0x000064C7,
-	9700:  0x000064C2,
-	9701:  0x000064CD,
-	9702:  0x000064BF,
-	9703:  0x000064D2,
-	9704:  0x000064D4,
-	9705:  0x000064BE,
-	9706:  0x00006574,
-	9707:  0x000066C6,
-	9708:  0x000066C9,
-	9709:  0x000066B9,
-	9710:  0x000066C4,
-	9711:  0x000066C7,
-	9712:  0x000066B8,
-	9713:  0x00006A3D,
-	9714:  0x00006A38,
-	9715:  0x00006A3A,
-	9716:  0x00006A59,
-	9717:  0x00006A6B,
-	9718:  0x00006A58,
-	9719:  0x00006A39,
-	9720:  0x00006A44,
-	9721:  0x00006A62,
-	9722:  0x00006A61,
-	9723:  0x00006A4B,
-	9724:  0x00006A47,
-	9725:  0x00006A35,
-	9726:  0x00006A5F,
-	9727:  0x00006A48,
-	9728:  0x00006B59,
-	9729:  0x00006B77,
-	9730:  0x00006C05,
-	9731:  0x00006FC2,
-	9732:  0x00006FB1,
-	9733:  0x00006FA1,
-	9734:  0x00006FC3,
-	9735:  0x00006FA4,
-	9736:  0x00006FC1,
-	9737:  0x00006FA7,
-	9738:  0x00006FB3,
-	9739:  0x00006FC0,
-	9740:  0x00006FB9,
-	9741:  0x00006FB6,
-	9742:  0x00006FA6,
-	9743:  0x00006FA0,
-	9744:  0x00006FB4,
-	9745:  0x000071BE,
-	9746:  0x000071C9,
-	9747:  0x000071D0,
-	9748:  0x000071D2,
-	9749:  0x000071C8,
-	9750:  0x000071D5,
-	9751:  0x000071B9,
-	9752:  0x000071CE,
-	9753:  0x000071D9,
-	9754:  0x000071DC,
-	9755:  0x000071C3,
-	9756:  0x000071C4,
-	9757:  0x00007368,
-	9758:  0x0000749C,
-	9759:  0x000074A3,
-	9760:  0x00007498,
-	9761:  0x0000749F,
-	9762:  0x0000749E,
-	9763:  0x000074E2,
-	9764:  0x0000750C,
-	9765:  0x0000750D,
-	9766:  0x00007634,
-	9767:  0x00007638,
-	9768:  0x0000763A,
-	9769:  0x000076E7,
-	9770:  0x000076E5,
-	9771:  0x000077A0,
-	9772:  0x0000779E,
-	9773:  0x0000779F,
-	9774:  0x000077A5,
-	9775:  0x000078E8,
-	9776:  0x000078DA,
-	9777:  0x000078EC,
-	9778:  0x000078E7,
-	9779:  0x000079A6,
-	9780:  0x00007A4D,
-	9781:  0x00007A4E,
-	9782:  0x00007A46,
-	9783:  0x00007A4C,
-	9784:  0x00007A4B,
-	9785:  0x00007ABA,
-	9786:  0x00007BD9,
-	9787:  0x00007C11,
-	9788:  0x00007BC9,
-	9789:  0x00007BE4,
-	9790:  0x00007BDB,
-	9791:  0x00007BE1,
-	9792:  0x00007BE9,
-	9793:  0x00007BE6,
-	9794:  0x00007CD5,
-	9795:  0x00007CD6,
-	9796:  0x00007E0A,
-	9797:  0x00007E11,
-	9798:  0x00007E08,
-	9799:  0x00007E1B,
-	9800:  0x00007E23,
-	9801:  0x00007E1E,
-	9802:  0x00007E1D,
-	9803:  0x00007E09,
-	9804:  0x00007E10,
-	9805:  0x00007F79,
-	9806:  0x00007FB2,
-	9807:  0x00007FF0,
-	9808:  0x00007FF1,
-	9809:  0x00007FEE,
-	9810:  0x00008028,
-	9811:  0x000081B3,
-	9812:  0x000081A9,
-	9813:  0x000081A8,
-	9814:  0x000081FB,
-	9815:  0x00008208,
-	9816:  0x00008258,
-	9817:  0x00008259,
-	9818:  0x0000854A,
-	9819:  0x00008559,
-	9820:  0x00008548,
-	9821:  0x00008568,
-	9822:  0x00008569,
-	9823:  0x00008543,
-	9824:  0x00008549,
-	9825:  0x0000856D,
-	9826:  0x0000856A,
-	9827:  0x0000855E,
-	9828:  0x00008783,
-	9829:  0x0000879F,
-	9830:  0x0000879E,
-	9831:  0x000087A2,
-	9832:  0x0000878D,
-	9833:  0x00008861,
-	9834:  0x0000892A,
-	9835:  0x00008932,
-	9836:  0x00008925,
-	9837:  0x0000892B,
-	9838:  0x00008921,
-	9839:  0x000089AA,
-	9840:  0x000089A6,
-	9841:  0x00008AE6,
-	9842:  0x00008AFA,
-	9843:  0x00008AEB,
-	9844:  0x00008AF1,
-	9845:  0x00008B00,
-	9846:  0x00008ADC,
-	9847:  0x00008AE7,
-	9848:  0x00008AEE,
-	9849:  0x00008AFE,
-	9850:  0x00008B01,
-	9851:  0x00008B02,
-	9852:  0x00008AF7,
-	9853:  0x00008AED,
-	9854:  0x00008AF3,
-	9855:  0x00008AF6,
-	9856:  0x00008AFC,
-	9857:  0x00008C6B,
-	9858:  0x00008C6D,
-	9859:  0x00008C93,
-	9860:  0x00008CF4,
-	9861:  0x00008E44,
-	9862:  0x00008E31,
-	9863:  0x00008E34,
-	9864:  0x00008E42,
-	9865:  0x00008E39,
-	9866:  0x00008E35,
-	9867:  0x00008F3B,
-	9868:  0x00008F2F,
-	9869:  0x00008F38,
-	9870:  0x00008F33,
-	9871:  0x00008FA8,
-	9872:  0x00008FA6,
-	9873:  0x00009075,
-	9874:  0x00009074,
-	9875:  0x00009078,
-	9876:  0x00009072,
-	9877:  0x0000907C,
-	9878:  0x0000907A,
-	9879:  0x00009134,
-	9880:  0x00009192,
-	9881:  0x00009320,
-	9882:  0x00009336,
-	9883:  0x000092F8,
-	9884:  0x00009333,
-	9885:  0x0000932F,
-	9886:  0x00009322,
-	9887:  0x000092FC,
-	9888:  0x0000932B,
-	9889:  0x00009304,
-	9890:  0x0000931A,
-	9891:  0x00009310,
-	9892:  0x00009326,
-	9893:  0x00009321,
-	9894:  0x00009315,
-	9895:  0x0000932E,
-	9896:  0x00009319,
-	9897:  0x000095BB,
-	9898:  0x000096A7,
-	9899:  0x000096A8,
-	9900:  0x000096AA,
-	9901:  0x000096D5,
-	9902:  0x0000970E,
-	9903:  0x00009711,
-	9904:  0x00009716,
-	9905:  0x0000970D,
-	9906:  0x00009713,
-	9907:  0x0000970F,
-	9908:  0x0000975B,
-	9909:  0x0000975C,
-	9910:  0x00009766,
-	9911:  0x00009798,
-	9912:  0x00009830,
-	9913:  0x00009838,
-	9914:  0x0000983B,
-	9915:  0x00009837,
-	9916:  0x0000982D,
-	9917:  0x00009839,
-	9918:  0x00009824,
-	9919:  0x00009910,
-	9920:  0x00009928,
-	9921:  0x0000991E,
-	9922:  0x0000991B,
-	9923:  0x00009921,
-	9924:  0x0000991A,
-	9925:  0x000099ED,
-	9926:  0x000099E2,
-	9927:  0x000099F1,
-	9928:  0x00009AB8,
-	9929:  0x00009ABC,
-	9930:  0x00009AFB,
-	9931:  0x00009AED,
-	9932:  0x00009B28,
-	9933:  0x00009B91,
-	9934:  0x00009D15,
-	9935:  0x00009D23,
-	9936:  0x00009D26,
-	9937:  0x00009D28,
-	9938:  0x00009D12,
-	9939:  0x00009D1B,
-	9940:  0x00009ED8,
-	9941:  0x00009ED4,
-	9942:  0x00009F8D,
-	9943:  0x00009F9C,
-	9944:  0x0000512A,
-	9945:  0x0000511F,
-	9946:  0x00005121,
-	9947:  0x00005132,
-	9948:  0x000052F5,
-	9949:  0x0000568E,
-	9950:  0x00005680,
-	9951:  0x00005690,
-	9952:  0x00005685,
-	9953:  0x00005687,
-	9954:  0x0000568F,
-	9955:  0x000058D5,
-	9956:  0x000058D3,
-	9957:  0x000058D1,
-	9958:  0x000058CE,
-	9959:  0x00005B30,
-	9960:  0x00005B2A,
-	9961:  0x00005B24,
-	9962:  0x00005B7A,
-	9963:  0x00005C37,
-	9964:  0x00005C68,
-	9965:  0x00005DBC,
-	9966:  0x00005DBA,
-	9967:  0x00005DBD,
-	9968:  0x00005DB8,
-	9969:  0x00005E6B,
-	9970:  0x00005F4C,
-	9971:  0x00005FBD,
-	9972:  0x000061C9,
-	9973:  0x000061C2,
-	9974:  0x000061C7,
-	9975:  0x000061E6,
-	9976:  0x000061CB,
-	9977:  0x00006232,
-	9978:  0x00006234,
-	9979:  0x000064CE,
-	9980:  0x000064CA,
-	9981:  0x000064D8,
-	9982:  0x000064E0,
-	9983:  0x000064F0,
-	9984:  0x000064E6,
-	9985:  0x000064EC,
-	9986:  0x000064F1,
-	9987:  0x000064E2,
-	9988:  0x000064ED,
-	9989:  0x00006582,
-	9990:  0x00006583,
-	9991:  0x000066D9,
-	9992:  0x000066D6,
-	9993:  0x00006A80,
-	9994:  0x00006A94,
-	9995:  0x00006A84,
-	9996:  0x00006AA2,
-	9997:  0x00006A9C,
-	9998:  0x00006ADB,
-	9999:  0x00006AA3,
-	10000: 0x00006A7E,
-	10001: 0x00006A97,
-	10002: 0x00006A90,
-	10003: 0x00006AA0,
-	10004: 0x00006B5C,
-	10005: 0x00006BAE,
-	10006: 0x00006BDA,
-	10007: 0x00006C08,
-	10008: 0x00006FD8,
-	10009: 0x00006FF1,
-	10010: 0x00006FDF,
-	10011: 0x00006FE0,
-	10012: 0x00006FDB,
-	10013: 0x00006FE4,
-	10014: 0x00006FEB,
-	10015: 0x00006FEF,
-	10016: 0x00006F80,
-	10017: 0x00006FEC,
-	10018: 0x00006FE1,
-	10019: 0x00006FE9,
-	10020: 0x00006FD5,
-	10021: 0x00006FEE,
-	10022: 0x00006FF0,
-	10023: 0x000071E7,
-	10024: 0x000071DF,
-	10025: 0x000071EE,
-	10026: 0x000071E6,
-	10027: 0x000071E5,
-	10028: 0x000071ED,
-	10029: 0x000071EC,
-	10030: 0x000071F4,
-	10031: 0x000071E0,
-	10032: 0x00007235,
-	10033: 0x00007246,
-	10034: 0x00007370,
-	10035: 0x00007372,
-	10036: 0x000074A9,
-	10037: 0x000074B0,
-	10038: 0x000074A6,
-	10039: 0x000074A8,
-	10040: 0x00007646,
-	10041: 0x00007642,
-	10042: 0x0000764C,
-	10043: 0x000076EA,
-	10044: 0x000077B3,
-	10045: 0x000077AA,
-	10046: 0x000077B0,
-	10047: 0x000077AC,
-	10048: 0x000077A7,
-	10049: 0x000077AD,
-	10050: 0x000077EF,
-	10051: 0x000078F7,
-	10052: 0x000078FA,
-	10053: 0x000078F4,
-	10054: 0x000078EF,
-	10055: 0x00007901,
-	10056: 0x000079A7,
-	10057: 0x000079AA,
-	10058: 0x00007A57,
-	10059: 0x00007ABF,
-	10060: 0x00007C07,
-	10061: 0x00007C0D,
-	10062: 0x00007BFE,
-	10063: 0x00007BF7,
-	10064: 0x00007C0C,
-	10065: 0x00007BE0,
-	10066: 0x00007CE0,
-	10067: 0x00007CDC,
-	10068: 0x00007CDE,
-	10069: 0x00007CE2,
-	10070: 0x00007CDF,
-	10071: 0x00007CD9,
-	10072: 0x00007CDD,
-	10073: 0x00007E2E,
-	10074: 0x00007E3E,
-	10075: 0x00007E46,
-	10076: 0x00007E37,
-	10077: 0x00007E32,
-	10078: 0x00007E43,
-	10079: 0x00007E2B,
-	10080: 0x00007E3D,
-	10081: 0x00007E31,
-	10082: 0x00007E45,
-	10083: 0x00007E41,
-	10084: 0x00007E34,
-	10085: 0x00007E39,
-	10086: 0x00007E48,
-	10087: 0x00007E35,
-	10088: 0x00007E3F,
-	10089: 0x00007E2F,
-	10090: 0x00007F44,
-	10091: 0x00007FF3,
-	10092: 0x00007FFC,
-	10093: 0x00008071,
-	10094: 0x00008072,
-	10095: 0x00008070,
-	10096: 0x0000806F,
-	10097: 0x00008073,
-	10098: 0x000081C6,
-	10099: 0x000081C3,
-	10100: 0x000081BA,
-	10101: 0x000081C2,
-	10102: 0x000081C0,
-	10103: 0x000081BF,
-	10104: 0x000081BD,
-	10105: 0x000081C9,
-	10106: 0x000081BE,
-	10107: 0x000081E8,
-	10108: 0x00008209,
-	10109: 0x00008271,
-	10110: 0x000085AA,
-	10111: 0x00008584,
-	10112: 0x0000857E,
-	10113: 0x0000859C,
-	10114: 0x00008591,
-	10115: 0x00008594,
-	10116: 0x000085AF,
-	10117: 0x0000859B,
-	10118: 0x00008587,
-	10119: 0x000085A8,
-	10120: 0x0000858A,
-	10121: 0x00008667,
-	10122: 0x000087C0,
-	10123: 0x000087D1,
-	10124: 0x000087B3,
-	10125: 0x000087D2,
-	10126: 0x000087C6,
-	10127: 0x000087AB,
-	10128: 0x000087BB,
-	10129: 0x000087BA,
-	10130: 0x000087C8,
-	10131: 0x000087CB,
-	10132: 0x0000893B,
-	10133: 0x00008936,
-	10134: 0x00008944,
-	10135: 0x00008938,
-	10136: 0x0000893D,
-	10137: 0x000089AC,
-	10138: 0x00008B0E,
-	10139: 0x00008B17,
-	10140: 0x00008B19,
-	10141: 0x00008B1B,
-	10142: 0x00008B0A,
-	10143: 0x00008B20,
-	10144: 0x00008B1D,
-	10145: 0x00008B04,
-	10146: 0x00008B10,
-	10147: 0x00008C41,
-	10148: 0x00008C3F,
-	10149: 0x00008C73,
-	10150: 0x00008CFA,
-	10151: 0x00008CFD,
-	10152: 0x00008CFC,
-	10153: 0x00008CF8,
-	10154: 0x00008CFB,
-	10155: 0x00008DA8,
-	10156: 0x00008E49,
-	10157: 0x00008E4B,
-	10158: 0x00008E48,
-	10159: 0x00008E4A,
-	10160: 0x00008F44,
-	10161: 0x00008F3E,
-	10162: 0x00008F42,
-	10163: 0x00008F45,
-	10164: 0x00008F3F,
-	10165: 0x0000907F,
-	10166: 0x0000907D,
-	10167: 0x00009084,
-	10168: 0x00009081,
-	10169: 0x00009082,
-	10170: 0x00009080,
-	10171: 0x00009139,
-	10172: 0x000091A3,
-	10173: 0x0000919E,
-	10174: 0x0000919C,
-	10175: 0x0000934D,
-	10176: 0x00009382,
-	10177: 0x00009328,
-	10178: 0x00009375,
-	10179: 0x0000934A,
-	10180: 0x00009365,
-	10181: 0x0000934B,
-	10182: 0x00009318,
-	10183: 0x0000937E,
-	10184: 0x0000936C,
-	10185: 0x0000935B,
-	10186: 0x00009370,
-	10187: 0x0000935A,
-	10188: 0x00009354,
-	10189: 0x000095CA,
-	10190: 0x000095CB,
-	10191: 0x000095CC,
-	10192: 0x000095C8,
-	10193: 0x000095C6,
-	10194: 0x000096B1,
-	10195: 0x000096B8,
-	10196: 0x000096D6,
-	10197: 0x0000971C,
-	10198: 0x0000971E,
-	10199: 0x000097A0,
-	10200: 0x000097D3,
-	10201: 0x00009846,
-	10202: 0x000098B6,
-	10203: 0x00009935,
-	10204: 0x00009A01,
-	10205: 0x000099FF,
-	10206: 0x00009BAE,
-	10207: 0x00009BAB,
-	10208: 0x00009BAA,
-	10209: 0x00009BAD,
-	10210: 0x00009D3B,
-	10211: 0x00009D3F,
-	10212: 0x00009E8B,
-	10213: 0x00009ECF,
-	10214: 0x00009EDE,
-	10215: 0x00009EDC,
-	10216: 0x00009EDD,
-	10217: 0x00009EDB,
-	10218: 0x00009F3E,
-	10219: 0x00009F4B,
-	10220: 0x000053E2,
-	10221: 0x00005695,
-	10222: 0x000056AE,
-	10223: 0x000058D9,
-	10224: 0x000058D8,
-	10225: 0x00005B38,
-	10226: 0x00005F5D,
-	10227: 0x000061E3,
-	10228: 0x00006233,
-	10229: 0x000064F4,
-	10230: 0x000064F2,
-	10231: 0x000064FE,
-	10232: 0x00006506,
-	10233: 0x000064FA,
-	10234: 0x000064FB,
-	10235: 0x000064F7,
-	10236: 0x000065B7,
-	10237: 0x000066DC,
-	10238: 0x00006726,
-	10239: 0x00006AB3,
-	10240: 0x00006AAC,
-	10241: 0x00006AC3,
-	10242: 0x00006ABB,
-	10243: 0x00006AB8,
-	10244: 0x00006AC2,
-	10245: 0x00006AAE,
-	10246: 0x00006AAF,
-	10247: 0x00006B5F,
-	10248: 0x00006B78,
-	10249: 0x00006BAF,
-	10250: 0x00007009,
-	10251: 0x0000700B,
-	10252: 0x00006FFE,
-	10253: 0x00007006,
-	10254: 0x00006FFA,
-	10255: 0x00007011,
-	10256: 0x0000700F,
-	10257: 0x000071FB,
-	10258: 0x000071FC,
-	10259: 0x000071FE,
-	10260: 0x000071F8,
-	10261: 0x00007377,
-	10262: 0x00007375,
-	10263: 0x000074A7,
-	10264: 0x000074BF,
-	10265: 0x00007515,
-	10266: 0x00007656,
-	10267: 0x00007658,
-	10268: 0x00007652,
-	10269: 0x000077BD,
-	10270: 0x000077BF,
-	10271: 0x000077BB,
-	10272: 0x000077BC,
-	10273: 0x0000790E,
-	10274: 0x000079AE,
-	10275: 0x00007A61,
-	10276: 0x00007A62,
-	10277: 0x00007A60,
-	10278: 0x00007AC4,
-	10279: 0x00007AC5,
-	10280: 0x00007C2B,
-	10281: 0x00007C27,
-	10282: 0x00007C2A,
-	10283: 0x00007C1E,
-	10284: 0x00007C23,
-	10285: 0x00007C21,
-	10286: 0x00007CE7,
-	10287: 0x00007E54,
-	10288: 0x00007E55,
-	10289: 0x00007E5E,
-	10290: 0x00007E5A,
-	10291: 0x00007E61,
-	10292: 0x00007E52,
-	10293: 0x00007E59,
-	10294: 0x00007F48,
-	10295: 0x00007FF9,
-	10296: 0x00007FFB,
-	10297: 0x00008077,
-	10298: 0x00008076,
-	10299: 0x000081CD,
-	10300: 0x000081CF,
-	10301: 0x0000820A,
-	10302: 0x000085CF,
-	10303: 0x000085A9,
-	10304: 0x000085CD,
-	10305: 0x000085D0,
-	10306: 0x000085C9,
-	10307: 0x000085B0,
-	10308: 0x000085BA,
-	10309: 0x000085B9,
-	10310: 0x000085A6,
-	10311: 0x000087EF,
-	10312: 0x000087EC,
-	10313: 0x000087F2,
-	10314: 0x000087E0,
-	10315: 0x00008986,
-	10316: 0x000089B2,
-	10317: 0x000089F4,
-	10318: 0x00008B28,
-	10319: 0x00008B39,
-	10320: 0x00008B2C,
-	10321: 0x00008B2B,
-	10322: 0x00008C50,
-	10323: 0x00008D05,
-	10324: 0x00008E59,
-	10325: 0x00008E63,
-	10326: 0x00008E66,
-	10327: 0x00008E64,
-	10328: 0x00008E5F,
-	10329: 0x00008E55,
-	10330: 0x00008EC0,
-	10331: 0x00008F49,
-	10332: 0x00008F4D,
-	10333: 0x00009087,
-	10334: 0x00009083,
-	10335: 0x00009088,
-	10336: 0x000091AB,
-	10337: 0x000091AC,
-	10338: 0x000091D0,
-	10339: 0x00009394,
-	10340: 0x0000938A,
-	10341: 0x00009396,
-	10342: 0x000093A2,
-	10343: 0x000093B3,
-	10344: 0x000093AE,
-	10345: 0x000093AC,
-	10346: 0x000093B0,
-	10347: 0x00009398,
-	10348: 0x0000939A,
-	10349: 0x00009397,
-	10350: 0x000095D4,
-	10351: 0x000095D6,
-	10352: 0x000095D0,
-	10353: 0x000095D5,
-	10354: 0x000096E2,
-	10355: 0x000096DC,
-	10356: 0x000096D9,
-	10357: 0x000096DB,
-	10358: 0x000096DE,
-	10359: 0x00009724,
-	10360: 0x000097A3,
-	10361: 0x000097A6,
-	10362: 0x000097AD,
-	10363: 0x000097F9,
-	10364: 0x0000984D,
-	10365: 0x0000984F,
-	10366: 0x0000984C,
-	10367: 0x0000984E,
-	10368: 0x00009853,
-	10369: 0x000098BA,
-	10370: 0x0000993E,
-	10371: 0x0000993F,
-	10372: 0x0000993D,
-	10373: 0x0000992E,
-	10374: 0x000099A5,
-	10375: 0x00009A0E,
-	10376: 0x00009AC1,
-	10377: 0x00009B03,
-	10378: 0x00009B06,
-	10379: 0x00009B4F,
-	10380: 0x00009B4E,
-	10381: 0x00009B4D,
-	10382: 0x00009BCA,
-	10383: 0x00009BC9,
-	10384: 0x00009BFD,
-	10385: 0x00009BC8,
-	10386: 0x00009BC0,
-	10387: 0x00009D51,
-	10388: 0x00009D5D,
-	10389: 0x00009D60,
-	10390: 0x00009EE0,
-	10391: 0x00009F15,
-	10392: 0x00009F2C,
-	10393: 0x00005133,
-	10394: 0x000056A5,
-	10395: 0x000058DE,
-	10396: 0x000058DF,
-	10397: 0x000058E2,
-	10398: 0x00005BF5,
-	10399: 0x00009F90,
-	10400: 0x00005EEC,
-	10401: 0x000061F2,
-	10402: 0x000061F7,
-	10403: 0x000061F6,
-	10404: 0x000061F5,
-	10405: 0x00006500,
-	10406: 0x0000650F,
-	10407: 0x000066E0,
-	10408: 0x000066DD,
-	10409: 0x00006AE5,
-	10410: 0x00006ADD,
-	10411: 0x00006ADA,
-	10412: 0x00006AD3,
-	10413: 0x0000701B,
-	10414: 0x0000701F,
-	10415: 0x00007028,
-	10416: 0x0000701A,
-	10417: 0x0000701D,
-	10418: 0x00007015,
-	10419: 0x00007018,
-	10420: 0x00007206,
-	10421: 0x0000720D,
-	10422: 0x00007258,
-	10423: 0x000072A2,
-	10424: 0x00007378,
-	10425: 0x0000737A,
-	10426: 0x000074BD,
-	10427: 0x000074CA,
-	10428: 0x000074E3,
-	10429: 0x00007587,
-	10430: 0x00007586,
-	10431: 0x0000765F,
-	10432: 0x00007661,
-	10433: 0x000077C7,
-	10434: 0x00007919,
-	10435: 0x000079B1,
-	10436: 0x00007A6B,
-	10437: 0x00007A69,
-	10438: 0x00007C3E,
-	10439: 0x00007C3F,
-	10440: 0x00007C38,
-	10441: 0x00007C3D,
-	10442: 0x00007C37,
-	10443: 0x00007C40,
-	10444: 0x00007E6B,
-	10445: 0x00007E6D,
-	10446: 0x00007E79,
-	10447: 0x00007E69,
-	10448: 0x00007E6A,
-	10449: 0x00007F85,
-	10450: 0x00007E73,
-	10451: 0x00007FB6,
-	10452: 0x00007FB9,
-	10453: 0x00007FB8,
-	10454: 0x000081D8,
-	10455: 0x000085E9,
-	10456: 0x000085DD,
-	10457: 0x000085EA,
-	10458: 0x000085D5,
-	10459: 0x000085E4,
-	10460: 0x000085E5,
-	10461: 0x000085F7,
-	10462: 0x000087FB,
-	10463: 0x00008805,
-	10464: 0x0000880D,
-	10465: 0x000087F9,
-	10466: 0x000087FE,
-	10467: 0x00008960,
-	10468: 0x0000895F,
-	10469: 0x00008956,
-	10470: 0x0000895E,
-	10471: 0x00008B41,
-	10472: 0x00008B5C,
-	10473: 0x00008B58,
-	10474: 0x00008B49,
-	10475: 0x00008B5A,
-	10476: 0x00008B4E,
-	10477: 0x00008B4F,
-	10478: 0x00008B46,
-	10479: 0x00008B59,
-	10480: 0x00008D08,
-	10481: 0x00008D0A,
-	10482: 0x00008E7C,
-	10483: 0x00008E72,
-	10484: 0x00008E87,
-	10485: 0x00008E76,
-	10486: 0x00008E6C,
-	10487: 0x00008E7A,
-	10488: 0x00008E74,
-	10489: 0x00008F54,
-	10490: 0x00008F4E,
-	10491: 0x00008FAD,
-	10492: 0x0000908A,
-	10493: 0x0000908B,
-	10494: 0x000091B1,
-	10495: 0x000091AE,
-	10496: 0x000093E1,
-	10497: 0x000093D1,
-	10498: 0x000093DF,
-	10499: 0x000093C3,
-	10500: 0x000093C8,
-	10501: 0x000093DC,
-	10502: 0x000093DD,
-	10503: 0x000093D6,
-	10504: 0x000093E2,
-	10505: 0x000093CD,
-	10506: 0x000093D8,
-	10507: 0x000093E4,
-	10508: 0x000093D7,
-	10509: 0x000093E8,
-	10510: 0x000095DC,
-	10511: 0x000096B4,
-	10512: 0x000096E3,
-	10513: 0x0000972A,
-	10514: 0x00009727,
-	10515: 0x00009761,
-	10516: 0x000097DC,
-	10517: 0x000097FB,
-	10518: 0x0000985E,
-	10519: 0x00009858,
-	10520: 0x0000985B,
-	10521: 0x000098BC,
-	10522: 0x00009945,
-	10523: 0x00009949,
-	10524: 0x00009A16,
-	10525: 0x00009A19,
-	10526: 0x00009B0D,
-	10527: 0x00009BE8,
-	10528: 0x00009BE7,
-	10529: 0x00009BD6,
-	10530: 0x00009BDB,
-	10531: 0x00009D89,
-	10532: 0x00009D61,
-	10533: 0x00009D72,
-	10534: 0x00009D6A,
-	10535: 0x00009D6C,
-	10536: 0x00009E92,
-	10537: 0x00009E97,
-	10538: 0x00009E93,
-	10539: 0x00009EB4,
-	10540: 0x000052F8,
-	10541: 0x000056A8,
-	10542: 0x000056B7,
-	10543: 0x000056B6,
-	10544: 0x000056B4,
-	10545: 0x000056BC,
-	10546: 0x000058E4,
-	10547: 0x00005B40,
-	10548: 0x00005B43,
-	10549: 0x00005B7D,
-	10550: 0x00005BF6,
-	10551: 0x00005DC9,
-	10552: 0x000061F8,
-	10553: 0x000061FA,
-	10554: 0x00006518,
-	10555: 0x00006514,
-	10556: 0x00006519,
-	10557: 0x000066E6,
-	10558: 0x00006727,
-	10559: 0x00006AEC,
-	10560: 0x0000703E,
-	10561: 0x00007030,
-	10562: 0x00007032,
-	10563: 0x00007210,
-	10564: 0x0000737B,
-	10565: 0x000074CF,
-	10566: 0x00007662,
-	10567: 0x00007665,
-	10568: 0x00007926,
-	10569: 0x0000792A,
-	10570: 0x0000792C,
-	10571: 0x0000792B,
-	10572: 0x00007AC7,
-	10573: 0x00007AF6,
-	10574: 0x00007C4C,
-	10575: 0x00007C43,
-	10576: 0x00007C4D,
-	10577: 0x00007CEF,
-	10578: 0x00007CF0,
-	10579: 0x00008FAE,
-	10580: 0x00007E7D,
-	10581: 0x00007E7C,
-	10582: 0x00007E82,
-	10583: 0x00007F4C,
-	10584: 0x00008000,
-	10585: 0x000081DA,
-	10586: 0x00008266,
-	10587: 0x000085FB,
-	10588: 0x000085F9,
-	10589: 0x00008611,
-	10590: 0x000085FA,
-	10591: 0x00008606,
-	10592: 0x0000860B,
-	10593: 0x00008607,
-	10594: 0x0000860A,
-	10595: 0x00008814,
-	10596: 0x00008815,
-	10597: 0x00008964,
-	10598: 0x000089BA,
-	10599: 0x000089F8,
-	10600: 0x00008B70,
-	10601: 0x00008B6C,
-	10602: 0x00008B66,
-	10603: 0x00008B6F,
-	10604: 0x00008B5F,
-	10605: 0x00008B6B,
-	10606: 0x00008D0F,
-	10607: 0x00008D0D,
-	10608: 0x00008E89,
-	10609: 0x00008E81,
-	10610: 0x00008E85,
-	10611: 0x00008E82,
-	10612: 0x000091B4,
-	10613: 0x000091CB,
-	10614: 0x00009418,
-	10615: 0x00009403,
-	10616: 0x000093FD,
-	10617: 0x000095E1,
-	10618: 0x00009730,
-	10619: 0x000098C4,
-	10620: 0x00009952,
-	10621: 0x00009951,
-	10622: 0x000099A8,
-	10623: 0x00009A2B,
-	10624: 0x00009A30,
-	10625: 0x00009A37,
-	10626: 0x00009A35,
-	10627: 0x00009C13,
-	10628: 0x00009C0D,
-	10629: 0x00009E79,
-	10630: 0x00009EB5,
-	10631: 0x00009EE8,
-	10632: 0x00009F2F,
-	10633: 0x00009F5F,
-	10634: 0x00009F63,
-	10635: 0x00009F61,
-	10636: 0x00005137,
-	10637: 0x00005138,
-	10638: 0x000056C1,
-	10639: 0x000056C0,
-	10640: 0x000056C2,
-	10641: 0x00005914,
-	10642: 0x00005C6C,
-	10643: 0x00005DCD,
-	10644: 0x000061FC,
-	10645: 0x000061FE,
-	10646: 0x0000651D,
-	10647: 0x0000651C,
-	10648: 0x00006595,
-	10649: 0x000066E9,
-	10650: 0x00006AFB,
-	10651: 0x00006B04,
-	10652: 0x00006AFA,
-	10653: 0x00006BB2,
-	10654: 0x0000704C,
-	10655: 0x0000721B,
-	10656: 0x000072A7,
-	10657: 0x000074D6,
-	10658: 0x000074D4,
-	10659: 0x00007669,
-	10660: 0x000077D3,
-	10661: 0x00007C50,
-	10662: 0x00007E8F,
-	10663: 0x00007E8C,
-	10664: 0x00007FBC,
-	10665: 0x00008617,
-	10666: 0x0000862D,
-	10667: 0x0000861A,
-	10668: 0x00008823,
-	10669: 0x00008822,
-	10670: 0x00008821,
-	10671: 0x0000881F,
-	10672: 0x0000896A,
-	10673: 0x0000896C,
-	10674: 0x000089BD,
-	10675: 0x00008B74,
-	10676: 0x00008B77,
-	10677: 0x00008B7D,
-	10678: 0x00008D13,
-	10679: 0x00008E8A,
-	10680: 0x00008E8D,
-	10681: 0x00008E8B,
-	10682: 0x00008F5F,
-	10683: 0x00008FAF,
-	10684: 0x000091BA,
-	10685: 0x0000942E,
-	10686: 0x00009433,
-	10687: 0x00009435,
-	10688: 0x0000943A,
-	10689: 0x00009438,
-	10690: 0x00009432,
-	10691: 0x0000942B,
-	10692: 0x000095E2,
-	10693: 0x00009738,
-	10694: 0x00009739,
-	10695: 0x00009732,
-	10696: 0x000097FF,
-	10697: 0x00009867,
-	10698: 0x00009865,
-	10699: 0x00009957,
-	10700: 0x00009A45,
-	10701: 0x00009A43,
-	10702: 0x00009A40,
-	10703: 0x00009A3E,
-	10704: 0x00009ACF,
-	10705: 0x00009B54,
-	10706: 0x00009B51,
-	10707: 0x00009C2D,
-	10708: 0x00009C25,
-	10709: 0x00009DAF,
-	10710: 0x00009DB4,
-	10711: 0x00009DC2,
-	10712: 0x00009DB8,
-	10713: 0x00009E9D,
-	10714: 0x00009EEF,
-	10715: 0x00009F19,
-	10716: 0x00009F5C,
-	10717: 0x00009F66,
-	10718: 0x00009F67,
-	10719: 0x0000513C,
-	10720: 0x0000513B,
-	10721: 0x000056C8,
-	10722: 0x000056CA,
-	10723: 0x000056C9,
-	10724: 0x00005B7F,
-	10725: 0x00005DD4,
-	10726: 0x00005DD2,
-	10727: 0x00005F4E,
-	10728: 0x000061FF,
-	10729: 0x00006524,
-	10730: 0x00006B0A,
-	10731: 0x00006B61,
-	10732: 0x00007051,
-	10733: 0x00007058,
-	10734: 0x00007380,
-	10735: 0x000074E4,
-	10736: 0x0000758A,
-	10737: 0x0000766E,
-	10738: 0x0000766C,
-	10739: 0x000079B3,
-	10740: 0x00007C60,
-	10741: 0x00007C5F,
-	10742: 0x0000807E,
-	10743: 0x0000807D,
-	10744: 0x000081DF,
-	10745: 0x00008972,
-	10746: 0x0000896F,
-	10747: 0x000089FC,
-	10748: 0x00008B80,
-	10749: 0x00008D16,
-	10750: 0x00008D17,
-	10751: 0x00008E91,
-	10752: 0x00008E93,
-	10753: 0x00008F61,
-	10754: 0x00009148,
-	10755: 0x00009444,
-	10756: 0x00009451,
-	10757: 0x00009452,
-	10758: 0x0000973D,
-	10759: 0x0000973E,
-	10760: 0x000097C3,
-	10761: 0x000097C1,
-	10762: 0x0000986B,
-	10763: 0x00009955,
-	10764: 0x00009A55,
-	10765: 0x00009A4D,
-	10766: 0x00009AD2,
-	10767: 0x00009B1A,
-	10768: 0x00009C49,
-	10769: 0x00009C31,
-	10770: 0x00009C3E,
-	10771: 0x00009C3B,
-	10772: 0x00009DD3,
-	10773: 0x00009DD7,
-	10774: 0x00009F34,
-	10775: 0x00009F6C,
-	10776: 0x00009F6A,
-	10777: 0x00009F94,
-	10778: 0x000056CC,
-	10779: 0x00005DD6,
-	10780: 0x00006200,
-	10781: 0x00006523,
-	10782: 0x0000652B,
-	10783: 0x0000652A,
-	10784: 0x000066EC,
-	10785: 0x00006B10,
-	10786: 0x000074DA,
-	10787: 0x00007ACA,
-	10788: 0x00007C64,
-	10789: 0x00007C63,
-	10790: 0x00007C65,
-	10791: 0x00007E93,
-	10792: 0x00007E96,
-	10793: 0x00007E94,
-	10794: 0x000081E2,
-	10795: 0x00008638,
-	10796: 0x0000863F,
-	10797: 0x00008831,
-	10798: 0x00008B8A,
-	10799: 0x00009090,
-	10800: 0x0000908F,
-	10801: 0x00009463,
-	10802: 0x00009460,
-	10803: 0x00009464,
-	10804: 0x00009768,
-	10805: 0x0000986F,
-	10806: 0x0000995C,
-	10807: 0x00009A5A,
-	10808: 0x00009A5B,
-	10809: 0x00009A57,
-	10810: 0x00009AD3,
-	10811: 0x00009AD4,
-	10812: 0x00009AD1,
-	10813: 0x00009C54,
-	10814: 0x00009C57,
-	10815: 0x00009C56,
-	10816: 0x00009DE5,
-	10817: 0x00009E9F,
-	10818: 0x00009EF4,
-	10819: 0x000056D1,
-	10820: 0x000058E9,
-	10821: 0x0000652C,
-	10822: 0x0000705E,
-	10823: 0x00007671,
-	10824: 0x00007672,
-	10825: 0x000077D7,
-	10826: 0x00007F50,
-	10827: 0x00007F88,
-	10828: 0x00008836,
-	10829: 0x00008839,
-	10830: 0x00008862,
-	10831: 0x00008B93,
-	10832: 0x00008B92,
-	10833: 0x00008B96,
-	10834: 0x00008277,
-	10835: 0x00008D1B,
-	10836: 0x000091C0,
-	10837: 0x0000946A,
-	10838: 0x00009742,
-	10839: 0x00009748,
-	10840: 0x00009744,
-	10841: 0x000097C6,
-	10842: 0x00009870,
-	10843: 0x00009A5F,
-	10844: 0x00009B22,
-	10845: 0x00009B58,
-	10846: 0x00009C5F,
-	10847: 0x00009DF9,
-	10848: 0x00009DFA,
-	10849: 0x00009E7C,
-	10850: 0x00009E7D,
-	10851: 0x00009F07,
-	10852: 0x00009F77,
-	10853: 0x00009F72,
-	10854: 0x00005EF3,
-	10855: 0x00006B16,
-	10856: 0x00007063,
-	10857: 0x00007C6C,
-	10858: 0x00007C6E,
-	10859: 0x0000883B,
-	10860: 0x000089C0,
-	10861: 0x00008EA1,
-	10862: 0x000091C1,
-	10863: 0x00009472,
-	10864: 0x00009470,
-	10865: 0x00009871,
-	10866: 0x0000995E,
-	10867: 0x00009AD6,
-	10868: 0x00009B23,
-	10869: 0x00009ECC,
-	10870: 0x00007064,
-	10871: 0x000077DA,
-	10872: 0x00008B9A,
-	10873: 0x00009477,
-	10874: 0x000097C9,
-	10875: 0x00009A62,
-	10876: 0x00009A65,
-	10877: 0x00007E9C,
-	10878: 0x00008B9C,
-	10879: 0x00008EAA,
-	10880: 0x000091C5,
-	10881: 0x0000947D,
-	10882: 0x0000947E,
-	10883: 0x0000947C,
-	10884: 0x00009C77,
-	10885: 0x00009C78,
-	10886: 0x00009EF7,
-	10887: 0x00008C54,
-	10888: 0x0000947F,
-	10889: 0x00009E1A,
-	10890: 0x00007228,
-	10891: 0x00009A6A,
-	10892: 0x00009B31,
-	10893: 0x00009E1B,
-	10894: 0x00009E1E,
-	10895: 0x00007C72,
-	10896: 0x00002460,
-	10897: 0x00002461,
-	10898: 0x00002462,
-	10899: 0x00002463,
-	10900: 0x00002464,
-	10901: 0x00002465,
-	10902: 0x00002466,
-	10903: 0x00002467,
-	10904: 0x00002468,
-	10905: 0x00002469,
-	10906: 0x00002474,
-	10907: 0x00002475,
-	10908: 0x00002476,
-	10909: 0x00002477,
-	10910: 0x00002478,
-	10911: 0x00002479,
-	10912: 0x0000247A,
-	10913: 0x0000247B,
-	10914: 0x0000247C,
-	10915: 0x0000247D,
-	10916: 0x00002170,
-	10917: 0x00002171,
-	10918: 0x00002172,
-	10919: 0x00002173,
-	10920: 0x00002174,
-	10921: 0x00002175,
-	10922: 0x00002176,
-	10923: 0x00002177,
-	10924: 0x00002178,
-	10925: 0x00002179,
-	10926: 0x00004E36,
-	10927: 0x00004E3F,
-	10928: 0x00004E85,
-	10929: 0x00004EA0,
-	10930: 0x00005182,
-	10931: 0x00005196,
-	10932: 0x000051AB,
-	10933: 0x000052F9,
-	10934: 0x00005338,
-	10935: 0x00005369,
-	10936: 0x000053B6,
-	10937: 0x0000590A,
-	10938: 0x00005B80,
-	10939: 0x00005DDB,
-	10940: 0x00002F33,
-	10941: 0x00005E7F,
-	10942: 0x00005EF4,
-	10943: 0x00005F50,
-	10944: 0x00005F61,
-	10945: 0x00006534,
-	10946: 0x000065E0,
-	10947: 0x00007592,
-	10948: 0x00007676,
-	10949: 0x00008FB5,
-	10950: 0x000096B6,
-	10951: 0x000000A8,
-	10952: 0x000002C6,
-	10953: 0x000030FD,
-	10954: 0x000030FE,
-	10955: 0x0000309D,
-	10956: 0x0000309E,
-	10957: 0x00003003,
-	10958: 0x00004EDD,
-	10959: 0x00003005,
-	10960: 0x00003006,
-	10961: 0x00003007,
-	10962: 0x000030FC,
-	10963: 0x0000FF3B,
-	10964: 0x0000FF3D,
-	10965: 0x0000273D,
-	10966: 0x00003041,
-	10967: 0x00003042,
-	10968: 0x00003043,
-	10969: 0x00003044,
-	10970: 0x00003045,
-	10971: 0x00003046,
-	10972: 0x00003047,
-	10973: 0x00003048,
-	10974: 0x00003049,
-	10975: 0x0000304A,
-	10976: 0x0000304B,
-	10977: 0x0000304C,
-	10978: 0x0000304D,
-	10979: 0x0000304E,
-	10980: 0x0000304F,
-	10981: 0x00003050,
-	10982: 0x00003051,
-	10983: 0x00003052,
-	10984: 0x00003053,
-	10985: 0x00003054,
-	10986: 0x00003055,
-	10987: 0x00003056,
-	10988: 0x00003057,
-	10989: 0x00003058,
-	10990: 0x00003059,
-	10991: 0x0000305A,
-	10992: 0x0000305B,
-	10993: 0x0000305C,
-	10994: 0x0000305D,
-	10995: 0x0000305E,
-	10996: 0x0000305F,
-	10997: 0x00003060,
-	10998: 0x00003061,
-	10999: 0x00003062,
-	11000: 0x00003063,
-	11001: 0x00003064,
-	11002: 0x00003065,
-	11003: 0x00003066,
-	11004: 0x00003067,
-	11005: 0x00003068,
-	11006: 0x00003069,
-	11007: 0x0000306A,
-	11008: 0x0000306B,
-	11009: 0x0000306C,
-	11010: 0x0000306D,
-	11011: 0x0000306E,
-	11012: 0x0000306F,
-	11013: 0x00003070,
-	11014: 0x00003071,
-	11015: 0x00003072,
-	11016: 0x00003073,
-	11017: 0x00003074,
-	11018: 0x00003075,
-	11019: 0x00003076,
-	11020: 0x00003077,
-	11021: 0x00003078,
-	11022: 0x00003079,
-	11023: 0x0000307A,
-	11024: 0x0000307B,
-	11025: 0x0000307C,
-	11026: 0x0000307D,
-	11027: 0x0000307E,
-	11028: 0x0000307F,
-	11029: 0x00003080,
-	11030: 0x00003081,
-	11031: 0x00003082,
-	11032: 0x00003083,
-	11033: 0x00003084,
-	11034: 0x00003085,
-	11035: 0x00003086,
-	11036: 0x00003087,
-	11037: 0x00003088,
-	11038: 0x00003089,
-	11039: 0x0000308A,
-	11040: 0x0000308B,
-	11041: 0x0000308C,
-	11042: 0x0000308D,
-	11043: 0x0000308E,
-	11044: 0x0000308F,
-	11045: 0x00003090,
-	11046: 0x00003091,
-	11047: 0x00003092,
-	11048: 0x00003093,
-	11049: 0x000030A1,
-	11050: 0x000030A2,
-	11051: 0x000030A3,
-	11052: 0x000030A4,
-	11053: 0x000030A5,
-	11054: 0x000030A6,
-	11055: 0x000030A7,
-	11056: 0x000030A8,
-	11057: 0x000030A9,
-	11058: 0x000030AA,
-	11059: 0x000030AB,
-	11060: 0x000030AC,
-	11061: 0x000030AD,
-	11062: 0x000030AE,
-	11063: 0x000030AF,
-	11064: 0x000030B0,
-	11065: 0x000030B1,
-	11066: 0x000030B2,
-	11067: 0x000030B3,
-	11068: 0x000030B4,
-	11069: 0x000030B5,
-	11070: 0x000030B6,
-	11071: 0x000030B7,
-	11072: 0x000030B8,
-	11073: 0x000030B9,
-	11074: 0x000030BA,
-	11075: 0x000030BB,
-	11076: 0x000030BC,
-	11077: 0x000030BD,
-	11078: 0x000030BE,
-	11079: 0x000030BF,
-	11080: 0x000030C0,
-	11081: 0x000030C1,
-	11082: 0x000030C2,
-	11083: 0x000030C3,
-	11084: 0x000030C4,
-	11085: 0x000030C5,
-	11086: 0x000030C6,
-	11087: 0x000030C7,
-	11088: 0x000030C8,
-	11089: 0x000030C9,
-	11090: 0x000030CA,
-	11091: 0x000030CB,
-	11092: 0x000030CC,
-	11093: 0x000030CD,
-	11094: 0x000030CE,
-	11095: 0x000030CF,
-	11096: 0x000030D0,
-	11097: 0x000030D1,
-	11098: 0x000030D2,
-	11099: 0x000030D3,
-	11100: 0x000030D4,
-	11101: 0x000030D5,
-	11102: 0x000030D6,
-	11103: 0x000030D7,
-	11104: 0x000030D8,
-	11105: 0x000030D9,
-	11106: 0x000030DA,
-	11107: 0x000030DB,
-	11108: 0x000030DC,
-	11109: 0x000030DD,
-	11110: 0x000030DE,
-	11111: 0x000030DF,
-	11112: 0x000030E0,
-	11113: 0x000030E1,
-	11114: 0x000030E2,
-	11115: 0x000030E3,
-	11116: 0x000030E4,
-	11117: 0x000030E5,
-	11118: 0x000030E6,
-	11119: 0x000030E7,
-	11120: 0x000030E8,
-	11121: 0x000030E9,
-	11122: 0x000030EA,
-	11123: 0x000030EB,
-	11124: 0x000030EC,
-	11125: 0x000030ED,
-	11126: 0x000030EE,
-	11127: 0x000030EF,
-	11128: 0x000030F0,
-	11129: 0x000030F1,
-	11130: 0x000030F2,
-	11131: 0x000030F3,
-	11132: 0x000030F4,
-	11133: 0x000030F5,
-	11134: 0x000030F6,
-	11135: 0x00000410,
-	11136: 0x00000411,
-	11137: 0x00000412,
-	11138: 0x00000413,
-	11139: 0x00000414,
-	11140: 0x00000415,
-	11141: 0x00000401,
-	11142: 0x00000416,
-	11143: 0x00000417,
-	11144: 0x00000418,
-	11145: 0x00000419,
-	11146: 0x0000041A,
-	11147: 0x0000041B,
-	11148: 0x0000041C,
-	11149: 0x0000041D,
-	11150: 0x0000041E,
-	11151: 0x0000041F,
-	11152: 0x00000420,
-	11153: 0x00000421,
-	11154: 0x00000422,
-	11155: 0x00000423,
-	11156: 0x00000424,
-	11157: 0x00000425,
-	11158: 0x00000426,
-	11159: 0x00000427,
-	11160: 0x00000428,
-	11161: 0x00000429,
-	11162: 0x0000042A,
-	11163: 0x0000042B,
-	11164: 0x0000042C,
-	11165: 0x0000042D,
-	11166: 0x0000042E,
-	11167: 0x0000042F,
-	11168: 0x00000430,
-	11169: 0x00000431,
-	11170: 0x00000432,
-	11171: 0x00000433,
-	11172: 0x00000434,
-	11173: 0x00000435,
-	11174: 0x00000451,
-	11175: 0x00000436,
-	11176: 0x00000437,
-	11177: 0x00000438,
-	11178: 0x00000439,
-	11179: 0x0000043A,
-	11180: 0x0000043B,
-	11181: 0x0000043C,
-	11182: 0x0000043D,
-	11183: 0x0000043E,
-	11184: 0x0000043F,
-	11185: 0x00000440,
-	11186: 0x00000441,
-	11187: 0x00000442,
-	11188: 0x00000443,
-	11189: 0x00000444,
-	11190: 0x00000445,
-	11191: 0x00000446,
-	11192: 0x00000447,
-	11193: 0x00000448,
-	11194: 0x00000449,
-	11195: 0x0000044A,
-	11196: 0x0000044B,
-	11197: 0x0000044C,
-	11198: 0x0000044D,
-	11199: 0x0000044E,
-	11200: 0x0000044F,
-	11201: 0x000021E7,
-	11202: 0x000021B8,
-	11203: 0x000021B9,
-	11204: 0x000031CF,
-	11205: 0x000200CC,
-	11206: 0x00004E5A,
-	11207: 0x0002008A,
-	11208: 0x00005202,
-	11209: 0x00004491,
-	11210: 0x00009FB0,
-	11211: 0x00005188,
-	11212: 0x00009FB1,
-	11213: 0x00027607,
-	11254: 0x0000FFE2,
-	11255: 0x0000FFE4,
-	11256: 0x0000FF07,
-	11257: 0x0000FF02,
-	11258: 0x00003231,
-	11259: 0x00002116,
-	11260: 0x00002121,
-	11261: 0x0000309B,
-	11262: 0x0000309C,
-	11263: 0x00002E80,
-	11264: 0x00002E84,
-	11265: 0x00002E86,
-	11266: 0x00002E87,
-	11267: 0x00002E88,
-	11268: 0x00002E8A,
-	11269: 0x00002E8C,
-	11270: 0x00002E8D,
-	11271: 0x00002E95,
-	11272: 0x00002E9C,
-	11273: 0x00002E9D,
-	11274: 0x00002EA5,
-	11275: 0x00002EA7,
-	11276: 0x00002EAA,
-	11277: 0x00002EAC,
-	11278: 0x00002EAE,
-	11279: 0x00002EB6,
-	11280: 0x00002EBC,
-	11281: 0x00002EBE,
-	11282: 0x00002EC6,
-	11283: 0x00002ECA,
-	11284: 0x00002ECC,
-	11285: 0x00002ECD,
-	11286: 0x00002ECF,
-	11287: 0x00002ED6,
-	11288: 0x00002ED7,
-	11289: 0x00002EDE,
-	11290: 0x00002EE3,
-	11294: 0x00000283,
-	11295: 0x00000250,
-	11296: 0x0000025B,
-	11297: 0x00000254,
-	11298: 0x00000275,
-	11299: 0x00000153,
-	11300: 0x000000F8,
-	11301: 0x0000014B,
-	11302: 0x0000028A,
-	11303: 0x0000026A,
-	11304: 0x00004E42,
-	11305: 0x00004E5C,
-	11306: 0x000051F5,
-	11307: 0x0000531A,
-	11308: 0x00005382,
-	11309: 0x00004E07,
-	11310: 0x00004E0C,
-	11311: 0x00004E47,
-	11312: 0x00004E8D,
-	11313: 0x000056D7,
-	11314: 0x0000FA0C,
-	11315: 0x00005C6E,
-	11316: 0x00005F73,
-	11317: 0x00004E0F,
-	11318: 0x00005187,
-	11319: 0x00004E0E,
-	11320: 0x00004E2E,
-	11321: 0x00004E93,
-	11322: 0x00004EC2,
-	11323: 0x00004EC9,
-	11324: 0x00004EC8,
-	11325: 0x00005198,
-	11326: 0x000052FC,
-	11327: 0x0000536C,
-	11328: 0x000053B9,
-	11329: 0x00005720,
-	11330: 0x00005903,
-	11331: 0x0000592C,
-	11332: 0x00005C10,
-	11333: 0x00005DFF,
-	11334: 0x000065E1,
-	11335: 0x00006BB3,
-	11336: 0x00006BCC,
-	11337: 0x00006C14,
-	11338: 0x0000723F,
-	11339: 0x00004E31,
-	11340: 0x00004E3C,
-	11341: 0x00004EE8,
-	11342: 0x00004EDC,
-	11343: 0x00004EE9,
-	11344: 0x00004EE1,
-	11345: 0x00004EDD,
-	11346: 0x00004EDA,
-	11347: 0x0000520C,
-	11348: 0x0000531C,
-	11349: 0x0000534C,
-	11350: 0x00005722,
-	11351: 0x00005723,
-	11352: 0x00005917,
-	11353: 0x0000592F,
-	11354: 0x00005B81,
-	11355: 0x00005B84,
-	11356: 0x00005C12,
-	11357: 0x00005C3B,
-	11358: 0x00005C74,
-	11359: 0x00005C73,
-	11360: 0x00005E04,
-	11361: 0x00005E80,
-	11362: 0x00005E82,
-	11363: 0x00005FC9,
-	11364: 0x00006209,
-	11365: 0x00006250,
-	11366: 0x00006C15,
-	11367: 0x00006C36,
-	11368: 0x00006C43,
-	11369: 0x00006C3F,
-	11370: 0x00006C3B,
-	11371: 0x000072AE,
-	11372: 0x000072B0,
-	11373: 0x0000738A,
-	11374: 0x000079B8,
-	11375: 0x0000808A,
-	11376: 0x0000961E,
-	11377: 0x00004F0E,
-	11378: 0x00004F18,
-	11379: 0x00004F2C,
-	11380: 0x00004EF5,
-	11381: 0x00004F14,
-	11382: 0x00004EF1,
-	11383: 0x00004F00,
-	11384: 0x00004EF7,
-	11385: 0x00004F08,
-	11386: 0x00004F1D,
-	11387: 0x00004F02,
-	11388: 0x00004F05,
-	11389: 0x00004F22,
-	11390: 0x00004F13,
-	11391: 0x00004F04,
-	11392: 0x00004EF4,
-	11393: 0x00004F12,
-	11394: 0x000051B1,
-	11395: 0x00005213,
-	11396: 0x00005209,
-	11397: 0x00005210,
-	11398: 0x000052A6,
-	11399: 0x00005322,
-	11400: 0x0000531F,
-	11401: 0x0000534D,
-	11402: 0x0000538A,
-	11403: 0x00005407,
-	11404: 0x000056E1,
-	11405: 0x000056DF,
-	11406: 0x0000572E,
-	11407: 0x0000572A,
-	11408: 0x00005734,
-	11409: 0x0000593C,
-	11410: 0x00005980,
-	11411: 0x0000597C,
-	11412: 0x00005985,
-	11413: 0x0000597B,
-	11414: 0x0000597E,
-	11415: 0x00005977,
-	11416: 0x0000597F,
-	11417: 0x00005B56,
-	11418: 0x00005C15,
-	11419: 0x00005C25,
-	11420: 0x00005C7C,
-	11421: 0x00005C7A,
-	11422: 0x00005C7B,
-	11423: 0x00005C7E,
-	11424: 0x00005DDF,
-	11425: 0x00005E75,
-	11426: 0x00005E84,
-	11427: 0x00005F02,
-	11428: 0x00005F1A,
-	11429: 0x00005F74,
-	11430: 0x00005FD5,
-	11431: 0x00005FD4,
-	11432: 0x00005FCF,
-	11433: 0x0000625C,
-	11434: 0x0000625E,
-	11435: 0x00006264,
-	11436: 0x00006261,
-	11437: 0x00006266,
-	11438: 0x00006262,
-	11439: 0x00006259,
-	11440: 0x00006260,
-	11441: 0x0000625A,
-	11442: 0x00006265,
-	11443: 0x000065EF,
-	11444: 0x000065EE,
-	11445: 0x0000673E,
-	11446: 0x00006739,
-	11447: 0x00006738,
-	11448: 0x0000673B,
-	11449: 0x0000673A,
-	11450: 0x0000673F,
-	11451: 0x0000673C,
-	11452: 0x00006733,
-	11453: 0x00006C18,
-	11454: 0x00006C46,
-	11455: 0x00006C52,
-	11456: 0x00006C5C,
-	11457: 0x00006C4F,
-	11458: 0x00006C4A,
-	11459: 0x00006C54,
-	11460: 0x00006C4B,
-	11461: 0x00006C4C,
-	11462: 0x00007071,
-	11463: 0x0000725E,
-	11464: 0x000072B4,
-	11465: 0x000072B5,
-	11466: 0x0000738E,
-	11467: 0x0000752A,
-	11468: 0x0000767F,
-	11469: 0x00007A75,
-	11470: 0x00007F51,
-	11471: 0x00008278,
-	11472: 0x0000827C,
-	11473: 0x00008280,
-	11474: 0x0000827D,
-	11475: 0x0000827F,
-	11476: 0x0000864D,
-	11477: 0x0000897E,
-	11478: 0x00009099,
-	11479: 0x00009097,
-	11480: 0x00009098,
-	11481: 0x0000909B,
-	11482: 0x00009094,
-	11483: 0x00009622,
-	11484: 0x00009624,
-	11485: 0x00009620,
-	11486: 0x00009623,
-	11487: 0x00004F56,
-	11488: 0x00004F3B,
-	11489: 0x00004F62,
-	11490: 0x00004F49,
-	11491: 0x00004F53,
-	11492: 0x00004F64,
-	11493: 0x00004F3E,
-	11494: 0x00004F67,
-	11495: 0x00004F52,
-	11496: 0x00004F5F,
-	11497: 0x00004F41,
-	11498: 0x00004F58,
-	11499: 0x00004F2D,
-	11500: 0x00004F33,
-	11501: 0x00004F3F,
-	11502: 0x00004F61,
-	11503: 0x0000518F,
-	11504: 0x000051B9,
-	11505: 0x0000521C,
-	11506: 0x0000521E,
-	11507: 0x00005221,
-	11508: 0x000052AD,
-	11509: 0x000052AE,
-	11510: 0x00005309,
-	11511: 0x00005363,
-	11512: 0x00005372,
-	11513: 0x0000538E,
-	11514: 0x0000538F,
-	11515: 0x00005430,
-	11516: 0x00005437,
-	11517: 0x0000542A,
-	11518: 0x00005454,
-	11519: 0x00005445,
-	11520: 0x00005419,
-	11521: 0x0000541C,
-	11522: 0x00005425,
-	11523: 0x00005418,
-	11524: 0x0000543D,
-	11525: 0x0000544F,
-	11526: 0x00005441,
-	11527: 0x00005428,
-	11528: 0x00005424,
-	11529: 0x00005447,
-	11530: 0x000056EE,
-	11531: 0x000056E7,
-	11532: 0x000056E5,
-	11533: 0x00005741,
-	11534: 0x00005745,
-	11535: 0x0000574C,
-	11536: 0x00005749,
-	11537: 0x0000574B,
-	11538: 0x00005752,
-	11539: 0x00005906,
-	11540: 0x00005940,
-	11541: 0x000059A6,
-	11542: 0x00005998,
-	11543: 0x000059A0,
-	11544: 0x00005997,
-	11545: 0x0000598E,
-	11546: 0x000059A2,
-	11547: 0x00005990,
-	11548: 0x0000598F,
-	11549: 0x000059A7,
-	11550: 0x000059A1,
-	11551: 0x00005B8E,
-	11552: 0x00005B92,
-	11553: 0x00005C28,
-	11554: 0x00005C2A,
-	11555: 0x00005C8D,
-	11556: 0x00005C8F,
-	11557: 0x00005C88,
-	11558: 0x00005C8B,
-	11559: 0x00005C89,
-	11560: 0x00005C92,
-	11561: 0x00005C8A,
-	11562: 0x00005C86,
-	11563: 0x00005C93,
-	11564: 0x00005C95,
-	11565: 0x00005DE0,
-	11566: 0x00005E0A,
-	11567: 0x00005E0E,
-	11568: 0x00005E8B,
-	11569: 0x00005E89,
-	11570: 0x00005E8C,
-	11571: 0x00005E88,
-	11572: 0x00005E8D,
-	11573: 0x00005F05,
-	11574: 0x00005F1D,
-	11575: 0x00005F78,
-	11576: 0x00005F76,
-	11577: 0x00005FD2,
-	11578: 0x00005FD1,
-	11579: 0x00005FD0,
-	11580: 0x00005FED,
-	11581: 0x00005FE8,
-	11582: 0x00005FEE,
-	11583: 0x00005FF3,
-	11584: 0x00005FE1,
-	11585: 0x00005FE4,
-	11586: 0x00005FE3,
-	11587: 0x00005FFA,
-	11588: 0x00005FEF,
-	11589: 0x00005FF7,
-	11590: 0x00005FFB,
-	11591: 0x00006000,
-	11592: 0x00005FF4,
-	11593: 0x0000623A,
-	11594: 0x00006283,
-	11595: 0x0000628C,
-	11596: 0x0000628E,
-	11597: 0x0000628F,
-	11598: 0x00006294,
-	11599: 0x00006287,
-	11600: 0x00006271,
-	11601: 0x0000627B,
-	11602: 0x0000627A,
-	11603: 0x00006270,
-	11604: 0x00006281,
-	11605: 0x00006288,
-	11606: 0x00006277,
-	11607: 0x0000627D,
-	11608: 0x00006272,
-	11609: 0x00006274,
-	11610: 0x00006537,
-	11611: 0x000065F0,
-	11612: 0x000065F4,
-	11613: 0x000065F3,
-	11614: 0x000065F2,
-	11615: 0x000065F5,
-	11616: 0x00006745,
-	11617: 0x00006747,
-	11618: 0x00006759,
-	11619: 0x00006755,
-	11620: 0x0000674C,
-	11621: 0x00006748,
-	11622: 0x0000675D,
-	11623: 0x0000674D,
-	11624: 0x0000675A,
-	11625: 0x0000674B,
-	11626: 0x00006BD0,
-	11627: 0x00006C19,
-	11628: 0x00006C1A,
-	11629: 0x00006C78,
-	11630: 0x00006C67,
-	11631: 0x00006C6B,
-	11632: 0x00006C84,
-	11633: 0x00006C8B,
-	11634: 0x00006C8F,
-	11635: 0x00006C71,
-	11636: 0x00006C6F,
-	11637: 0x00006C69,
-	11638: 0x00006C9A,
-	11639: 0x00006C6D,
-	11640: 0x00006C87,
-	11641: 0x00006C95,
-	11642: 0x00006C9C,
-	11643: 0x00006C66,
-	11644: 0x00006C73,
-	11645: 0x00006C65,
-	11646: 0x00006C7B,
-	11647: 0x00006C8E,
-	11648: 0x00007074,
-	11649: 0x0000707A,
-	11650: 0x00007263,
-	11651: 0x000072BF,
-	11652: 0x000072BD,
-	11653: 0x000072C3,
-	11654: 0x000072C6,
-	11655: 0x000072C1,
-	11656: 0x000072BA,
-	11657: 0x000072C5,
-	11658: 0x00007395,
-	11659: 0x00007397,
-	11660: 0x00007393,
-	11661: 0x00007394,
-	11662: 0x00007392,
-	11663: 0x0000753A,
-	11664: 0x00007539,
-	11665: 0x00007594,
-	11666: 0x00007595,
-	11667: 0x00007681,
-	11668: 0x0000793D,
-	11669: 0x00008034,
-	11670: 0x00008095,
-	11671: 0x00008099,
-	11672: 0x00008090,
-	11673: 0x00008092,
-	11674: 0x0000809C,
-	11675: 0x00008290,
-	11676: 0x0000828F,
-	11677: 0x00008285,
-	11678: 0x0000828E,
-	11679: 0x00008291,
-	11680: 0x00008293,
-	11681: 0x0000828A,
-	11682: 0x00008283,
-	11683: 0x00008284,
-	11684: 0x00008C78,
-	11685: 0x00008FC9,
-	11686: 0x00008FBF,
-	11687: 0x0000909F,
-	11688: 0x000090A1,
-	11689: 0x000090A5,
-	11690: 0x0000909E,
-	11691: 0x000090A7,
-	11692: 0x000090A0,
-	11693: 0x00009630,
-	11694: 0x00009628,
-	11695: 0x0000962F,
-	11696: 0x0000962D,
-	11697: 0x00004E33,
-	11698: 0x00004F98,
-	11699: 0x00004F7C,
-	11700: 0x00004F85,
-	11701: 0x00004F7D,
-	11702: 0x00004F80,
-	11703: 0x00004F87,
-	11704: 0x00004F76,
-	11705: 0x00004F74,
-	11706: 0x00004F89,
-	11707: 0x00004F84,
-	11708: 0x00004F77,
-	11709: 0x00004F4C,
-	11710: 0x00004F97,
-	11711: 0x00004F6A,
-	11712: 0x00004F9A,
-	11713: 0x00004F79,
-	11714: 0x00004F81,
-	11715: 0x00004F78,
-	11716: 0x00004F90,
-	11717: 0x00004F9C,
-	11718: 0x00004F94,
-	11719: 0x00004F9E,
-	11720: 0x00004F92,
-	11721: 0x00004F82,
-	11722: 0x00004F95,
-	11723: 0x00004F6B,
-	11724: 0x00004F6E,
-	11725: 0x0000519E,
-	11726: 0x000051BC,
-	11727: 0x000051BE,
-	11728: 0x00005235,
-	11729: 0x00005232,
-	11730: 0x00005233,
-	11731: 0x00005246,
-	11732: 0x00005231,
-	11733: 0x000052BC,
-	11734: 0x0000530A,
-	11735: 0x0000530B,
-	11736: 0x0000533C,
-	11737: 0x00005392,
-	11738: 0x00005394,
-	11739: 0x00005487,
-	11740: 0x0000547F,
-	11741: 0x00005481,
-	11742: 0x00005491,
-	11743: 0x00005482,
-	11744: 0x00005488,
-	11745: 0x0000546B,
-	11746: 0x0000547A,
-	11747: 0x0000547E,
-	11748: 0x00005465,
-	11749: 0x0000546C,
-	11750: 0x00005474,
-	11751: 0x00005466,
-	11752: 0x0000548D,
-	11753: 0x0000546F,
-	11754: 0x00005461,
-	11755: 0x00005460,
-	11756: 0x00005498,
-	11757: 0x00005463,
-	11758: 0x00005467,
-	11759: 0x00005464,
-	11760: 0x000056F7,
-	11761: 0x000056F9,
-	11762: 0x0000576F,
-	11763: 0x00005772,
-	11764: 0x0000576D,
-	11765: 0x0000576B,
-	11766: 0x00005771,
-	11767: 0x00005770,
-	11768: 0x00005776,
-	11769: 0x00005780,
-	11770: 0x00005775,
-	11771: 0x0000577B,
-	11772: 0x00005773,
-	11773: 0x00005774,
-	11774: 0x00005762,
-	11775: 0x00005768,
-	11776: 0x0000577D,
-	11777: 0x0000590C,
-	11778: 0x00005945,
-	11779: 0x000059B5,
-	11780: 0x000059BA,
-	11781: 0x000059CF,
-	11782: 0x000059CE,
-	11783: 0x000059B2,
-	11784: 0x000059CC,
-	11785: 0x000059C1,
-	11786: 0x000059B6,
-	11787: 0x000059BC,
-	11788: 0x000059C3,
-	11789: 0x000059D6,
-	11790: 0x000059B1,
-	11791: 0x000059BD,
-	11792: 0x000059C0,
-	11793: 0x000059C8,
-	11794: 0x000059B4,
-	11795: 0x000059C7,
-	11796: 0x00005B62,
-	11797: 0x00005B65,
-	11798: 0x00005B93,
-	11799: 0x00005B95,
-	11800: 0x00005C44,
-	11801: 0x00005C47,
-	11802: 0x00005CAE,
-	11803: 0x00005CA4,
-	11804: 0x00005CA0,
-	11805: 0x00005CB5,
-	11806: 0x00005CAF,
-	11807: 0x00005CA8,
-	11808: 0x00005CAC,
-	11809: 0x00005C9F,
-	11810: 0x00005CA3,
-	11811: 0x00005CAD,
-	11812: 0x00005CA2,
-	11813: 0x00005CAA,
-	11814: 0x00005CA7,
-	11815: 0x00005C9D,
-	11816: 0x00005CA5,
-	11817: 0x00005CB6,
-	11818: 0x00005CB0,
-	11819: 0x00005CA6,
-	11820: 0x00005E17,
-	11821: 0x00005E14,
-	11822: 0x00005E19,
-	11823: 0x00005F28,
-	11824: 0x00005F22,
-	11825: 0x00005F23,
-	11826: 0x00005F24,
-	11827: 0x00005F54,
-	11828: 0x00005F82,
-	11829: 0x00005F7E,
-	11830: 0x00005F7D,
-	11831: 0x00005FDE,
-	11832: 0x00005FE5,
-	11833: 0x0000602D,
-	11834: 0x00006026,
-	11835: 0x00006019,
-	11836: 0x00006032,
-	11837: 0x0000600B,
-	11838: 0x00006034,
-	11839: 0x0000600A,
-	11840: 0x00006017,
-	11841: 0x00006033,
-	11842: 0x0000601A,
-	11843: 0x0000601E,
-	11844: 0x0000602C,
-	11845: 0x00006022,
-	11846: 0x0000600D,
-	11847: 0x00006010,
-	11848: 0x0000602E,
-	11849: 0x00006013,
-	11850: 0x00006011,
-	11851: 0x0000600C,
-	11852: 0x00006009,
-	11853: 0x0000601C,
-	11854: 0x00006214,
-	11855: 0x0000623D,
-	11856: 0x000062AD,
-	11857: 0x000062B4,
-	11858: 0x000062D1,
-	11859: 0x000062BE,
-	11860: 0x000062AA,
-	11861: 0x000062B6,
-	11862: 0x000062CA,
-	11863: 0x000062AE,
-	11864: 0x000062B3,
-	11865: 0x000062AF,
-	11866: 0x000062BB,
-	11867: 0x000062A9,
-	11868: 0x000062B0,
-	11869: 0x000062B8,
-	11870: 0x0000653D,
-	11871: 0x000065A8,
-	11872: 0x000065BB,
-	11873: 0x00006609,
-	11874: 0x000065FC,
-	11875: 0x00006604,
-	11876: 0x00006612,
-	11877: 0x00006608,
-	11878: 0x000065FB,
-	11879: 0x00006603,
-	11880: 0x0000660B,
-	11881: 0x0000660D,
-	11882: 0x00006605,
-	11883: 0x000065FD,
-	11884: 0x00006611,
-	11885: 0x00006610,
-	11886: 0x000066F6,
-	11887: 0x0000670A,
-	11888: 0x00006785,
-	11889: 0x0000676C,
-	11890: 0x0000678E,
-	11891: 0x00006792,
-	11892: 0x00006776,
-	11893: 0x0000677B,
-	11894: 0x00006798,
-	11895: 0x00006786,
-	11896: 0x00006784,
-	11897: 0x00006774,
-	11898: 0x0000678D,
-	11899: 0x0000678C,
-	11900: 0x0000677A,
-	11901: 0x0000679F,
-	11902: 0x00006791,
-	11903: 0x00006799,
-	11904: 0x00006783,
-	11905: 0x0000677D,
-	11906: 0x00006781,
-	11907: 0x00006778,
-	11908: 0x00006779,
-	11909: 0x00006794,
-	11910: 0x00006B25,
-	11911: 0x00006B80,
-	11912: 0x00006B7E,
-	11913: 0x00006BDE,
-	11914: 0x00006C1D,
-	11915: 0x00006C93,
-	11916: 0x00006CEC,
-	11917: 0x00006CEB,
-	11918: 0x00006CEE,
-	11919: 0x00006CD9,
-	11920: 0x00006CB6,
-	11921: 0x00006CD4,
-	11922: 0x00006CAD,
-	11923: 0x00006CE7,
-	11924: 0x00006CB7,
-	11925: 0x00006CD0,
-	11926: 0x00006CC2,
-	11927: 0x00006CBA,
-	11928: 0x00006CC3,
-	11929: 0x00006CC6,
-	11930: 0x00006CED,
-	11931: 0x00006CF2,
-	11932: 0x00006CD2,
-	11933: 0x00006CDD,
-	11934: 0x00006CB4,
-	11935: 0x00006C8A,
-	11936: 0x00006C9D,
-	11937: 0x00006C80,
-	11938: 0x00006CDE,
-	11939: 0x00006CC0,
-	11940: 0x00006D30,
-	11941: 0x00006CCD,
-	11942: 0x00006CC7,
-	11943: 0x00006CB0,
-	11944: 0x00006CF9,
-	11945: 0x00006CCF,
-	11946: 0x00006CE9,
-	11947: 0x00006CD1,
-	11948: 0x00007094,
-	11949: 0x00007098,
-	11950: 0x00007085,
-	11951: 0x00007093,
-	11952: 0x00007086,
-	11953: 0x00007084,
-	11954: 0x00007091,
-	11955: 0x00007096,
-	11956: 0x00007082,
-	11957: 0x0000709A,
-	11958: 0x00007083,
-	11959: 0x0000726A,
-	11960: 0x000072D6,
-	11961: 0x000072CB,
-	11962: 0x000072D8,
-	11963: 0x000072C9,
-	11964: 0x000072DC,
-	11965: 0x000072D2,
-	11966: 0x000072D4,
-	11967: 0x000072DA,
-	11968: 0x000072CC,
-	11969: 0x000072D1,
-	11970: 0x000073A4,
-	11971: 0x000073A1,
-	11972: 0x000073AD,
-	11973: 0x000073A6,
-	11974: 0x000073A2,
-	11975: 0x000073A0,
-	11976: 0x000073AC,
-	11977: 0x0000739D,
-	11978: 0x000074DD,
-	11979: 0x000074E8,
-	11980: 0x0000753F,
-	11981: 0x00007540,
-	11982: 0x0000753E,
-	11983: 0x0000758C,
-	11984: 0x00007598,
-	11985: 0x000076AF,
-	11986: 0x000076F3,
-	11987: 0x000076F1,
-	11988: 0x000076F0,
-	11989: 0x000076F5,
-	11990: 0x000077F8,
-	11991: 0x000077FC,
-	11992: 0x000077F9,
-	11993: 0x000077FB,
-	11994: 0x000077FA,
-	11995: 0x000077F7,
-	11996: 0x00007942,
-	11997: 0x0000793F,
-	11998: 0x000079C5,
-	11999: 0x00007A78,
-	12000: 0x00007A7B,
-	12001: 0x00007AFB,
-	12002: 0x00007C75,
-	12003: 0x00007CFD,
-	12004: 0x00008035,
-	12005: 0x0000808F,
-	12006: 0x000080AE,
-	12007: 0x000080A3,
-	12008: 0x000080B8,
-	12009: 0x000080B5,
-	12010: 0x000080AD,
-	12011: 0x00008220,
-	12012: 0x000082A0,
-	12013: 0x000082C0,
-	12014: 0x000082AB,
-	12015: 0x0000829A,
-	12016: 0x00008298,
-	12017: 0x0000829B,
-	12018: 0x000082B5,
-	12019: 0x000082A7,
-	12020: 0x000082AE,
-	12021: 0x000082BC,
-	12022: 0x0000829E,
-	12023: 0x000082BA,
-	12024: 0x000082B4,
-	12025: 0x000082A8,
-	12026: 0x000082A1,
-	12027: 0x000082A9,
-	12028: 0x000082C2,
-	12029: 0x000082A4,
-	12030: 0x000082C3,
-	12031: 0x000082B6,
-	12032: 0x000082A2,
-	12033: 0x00008670,
-	12034: 0x0000866F,
-	12035: 0x0000866D,
-	12036: 0x0000866E,
-	12037: 0x00008C56,
-	12038: 0x00008FD2,
-	12039: 0x00008FCB,
-	12040: 0x00008FD3,
-	12041: 0x00008FCD,
-	12042: 0x00008FD6,
-	12043: 0x00008FD5,
-	12044: 0x00008FD7,
-	12045: 0x000090B2,
-	12046: 0x000090B4,
-	12047: 0x000090AF,
-	12048: 0x000090B3,
-	12049: 0x000090B0,
-	12050: 0x00009639,
-	12051: 0x0000963D,
-	12052: 0x0000963C,
-	12053: 0x0000963A,
-	12054: 0x00009643,
-	12055: 0x00004FCD,
-	12056: 0x00004FC5,
-	12057: 0x00004FD3,
-	12058: 0x00004FB2,
-	12059: 0x00004FC9,
-	12060: 0x00004FCB,
-	12061: 0x00004FC1,
-	12062: 0x00004FD4,
-	12063: 0x00004FDC,
-	12064: 0x00004FD9,
-	12065: 0x00004FBB,
-	12066: 0x00004FB3,
-	12067: 0x00004FDB,
-	12068: 0x00004FC7,
-	12069: 0x00004FD6,
-	12070: 0x00004FBA,
-	12071: 0x00004FC0,
-	12072: 0x00004FB9,
-	12073: 0x00004FEC,
-	12074: 0x00005244,
-	12075: 0x00005249,
-	12076: 0x000052C0,
-	12077: 0x000052C2,
-	12078: 0x0000533D,
-	12079: 0x0000537C,
-	12080: 0x00005397,
-	12081: 0x00005396,
-	12082: 0x00005399,
-	12083: 0x00005398,
-	12084: 0x000054BA,
-	12085: 0x000054A1,
-	12086: 0x000054AD,
-	12087: 0x000054A5,
-	12088: 0x000054CF,
-	12089: 0x000054C3,
-	12090: 0x0000830D,
-	12091: 0x000054B7,
-	12092: 0x000054AE,
-	12093: 0x000054D6,
-	12094: 0x000054B6,
-	12095: 0x000054C5,
-	12096: 0x000054C6,
-	12097: 0x000054A0,
-	12098: 0x00005470,
-	12099: 0x000054BC,
-	12100: 0x000054A2,
-	12101: 0x000054BE,
-	12102: 0x00005472,
-	12103: 0x000054DE,
-	12104: 0x000054B0,
-	12105: 0x000057B5,
-	12106: 0x0000579E,
-	12107: 0x0000579F,
-	12108: 0x000057A4,
-	12109: 0x0000578C,
-	12110: 0x00005797,
-	12111: 0x0000579D,
-	12112: 0x0000579B,
-	12113: 0x00005794,
-	12114: 0x00005798,
-	12115: 0x0000578F,
-	12116: 0x00005799,
-	12117: 0x000057A5,
-	12118: 0x0000579A,
-	12119: 0x00005795,
-	12120: 0x000058F4,
-	12121: 0x0000590D,
-	12122: 0x00005953,
-	12123: 0x000059E1,
-	12124: 0x000059DE,
-	12125: 0x000059EE,
-	12126: 0x00005A00,
-	12127: 0x000059F1,
-	12128: 0x000059DD,
-	12129: 0x000059FA,
-	12130: 0x000059FD,
-	12131: 0x000059FC,
-	12132: 0x000059F6,
-	12133: 0x000059E4,
-	12134: 0x000059F2,
-	12135: 0x000059F7,
-	12136: 0x000059DB,
-	12137: 0x000059E9,
-	12138: 0x000059F3,
-	12139: 0x000059F5,
-	12140: 0x000059E0,
-	12141: 0x000059FE,
-	12142: 0x000059F4,
-	12143: 0x000059ED,
-	12144: 0x00005BA8,
-	12145: 0x00005C4C,
-	12146: 0x00005CD0,
-	12147: 0x00005CD8,
-	12148: 0x00005CCC,
-	12149: 0x00005CD7,
-	12150: 0x00005CCB,
-	12151: 0x00005CDB,
-	12152: 0x00005CDE,
-	12153: 0x00005CDA,
-	12154: 0x00005CC9,
-	12155: 0x00005CC7,
-	12156: 0x00005CCA,
-	12157: 0x00005CD6,
-	12158: 0x00005CD3,
-	12159: 0x00005CD4,
-	12160: 0x00005CCF,
-	12161: 0x00005CC8,
-	12162: 0x00005CC6,
-	12163: 0x00005CCE,
-	12164: 0x00005CDF,
-	12165: 0x00005CF8,
-	12166: 0x00005DF9,
-	12167: 0x00005E21,
-	12168: 0x00005E22,
-	12169: 0x00005E23,
-	12170: 0x00005E20,
-	12171: 0x00005E24,
-	12172: 0x00005EB0,
-	12173: 0x00005EA4,
-	12174: 0x00005EA2,
-	12175: 0x00005E9B,
-	12176: 0x00005EA3,
-	12177: 0x00005EA5,
-	12178: 0x00005F07,
-	12179: 0x00005F2E,
-	12180: 0x00005F56,
-	12181: 0x00005F86,
-	12182: 0x00006037,
-	12183: 0x00006039,
-	12184: 0x00006054,
-	12185: 0x00006072,
-	12186: 0x0000605E,
-	12187: 0x00006045,
-	12188: 0x00006053,
-	12189: 0x00006047,
-	12190: 0x00006049,
-	12191: 0x0000605B,
-	12192: 0x0000604C,
-	12193: 0x00006040,
-	12194: 0x00006042,
-	12195: 0x0000605F,
-	12196: 0x00006024,
-	12197: 0x00006044,
-	12198: 0x00006058,
-	12199: 0x00006066,
-	12200: 0x0000606E,
-	12201: 0x00006242,
-	12202: 0x00006243,
-	12203: 0x000062CF,
-	12204: 0x0000630D,
-	12205: 0x0000630B,
-	12206: 0x000062F5,
-	12207: 0x0000630E,
-	12208: 0x00006303,
-	12209: 0x000062EB,
-	12210: 0x000062F9,
-	12211: 0x0000630F,
-	12212: 0x0000630C,
-	12213: 0x000062F8,
-	12214: 0x000062F6,
-	12215: 0x00006300,
-	12216: 0x00006313,
-	12217: 0x00006314,
-	12218: 0x000062FA,
-	12219: 0x00006315,
-	12220: 0x000062FB,
-	12221: 0x000062F0,
-	12222: 0x00006541,
-	12223: 0x00006543,
-	12224: 0x000065AA,
-	12225: 0x000065BF,
-	12226: 0x00006636,
-	12227: 0x00006621,
-	12228: 0x00006632,
-	12229: 0x00006635,
-	12230: 0x0000661C,
-	12231: 0x00006626,
-	12232: 0x00006622,
-	12233: 0x00006633,
-	12234: 0x0000662B,
-	12235: 0x0000663A,
-	12236: 0x0000661D,
-	12237: 0x00006634,
-	12238: 0x00006639,
-	12239: 0x0000662E,
-	12240: 0x0000670F,
-	12241: 0x00006710,
-	12242: 0x000067C1,
-	12243: 0x000067F2,
-	12244: 0x000067C8,
-	12245: 0x000067BA,
-	12246: 0x000067DC,
-	12247: 0x000067BB,
-	12248: 0x000067F8,
-	12249: 0x000067D8,
-	12250: 0x000067C0,
-	12251: 0x000067B7,
-	12252: 0x000067C5,
-	12253: 0x000067EB,
-	12254: 0x000067E4,
-	12255: 0x000067DF,
-	12256: 0x000067B5,
-	12257: 0x000067CD,
-	12258: 0x000067B3,
-	12259: 0x000067F7,
-	12260: 0x000067F6,
-	12261: 0x000067EE,
-	12262: 0x000067E3,
-	12263: 0x000067C2,
-	12264: 0x000067B9,
-	12265: 0x000067CE,
-	12266: 0x000067E7,
-	12267: 0x000067F0,
-	12268: 0x000067B2,
-	12269: 0x000067FC,
-	12270: 0x000067C6,
-	12271: 0x000067ED,
-	12272: 0x000067CC,
-	12273: 0x000067AE,
-	12274: 0x000067E6,
-	12275: 0x000067DB,
-	12276: 0x000067FA,
-	12277: 0x000067C9,
-	12278: 0x000067CA,
-	12279: 0x000067C3,
-	12280: 0x000067EA,
-	12281: 0x000067CB,
-	12282: 0x00006B28,
-	12283: 0x00006B82,
-	12284: 0x00006B84,
-	12285: 0x00006BB6,
-	12286: 0x00006BD6,
-	12287: 0x00006BD8,
-	12288: 0x00006BE0,
-	12289: 0x00006C20,
-	12290: 0x00006C21,
-	12291: 0x00006D28,
-	12292: 0x00006D34,
-	12293: 0x00006D2D,
-	12294: 0x00006D1F,
-	12295: 0x00006D3C,
-	12296: 0x00006D3F,
-	12297: 0x00006D12,
-	12298: 0x00006D0A,
-	12299: 0x00006CDA,
-	12300: 0x00006D33,
-	12301: 0x00006D04,
-	12302: 0x00006D19,
-	12303: 0x00006D3A,
-	12304: 0x00006D1A,
-	12305: 0x00006D11,
-	12306: 0x00006D00,
-	12307: 0x00006D1D,
-	12308: 0x00006D42,
-	12309: 0x00006D01,
-	12310: 0x00006D18,
-	12311: 0x00006D37,
-	12312: 0x00006D03,
-	12313: 0x00006D0F,
-	12314: 0x00006D40,
-	12315: 0x00006D07,
-	12316: 0x00006D20,
-	12317: 0x00006D2C,
-	12318: 0x00006D08,
-	12319: 0x00006D22,
-	12320: 0x00006D09,
-	12321: 0x00006D10,
-	12322: 0x000070B7,
-	12323: 0x0000709F,
-	12324: 0x000070BE,
-	12325: 0x000070B1,
-	12326: 0x000070B0,
-	12327: 0x000070A1,
-	12328: 0x000070B4,
-	12329: 0x000070B5,
-	12330: 0x000070A9,
-	12331: 0x00007241,
-	12332: 0x00007249,
-	12333: 0x0000724A,
-	12334: 0x0000726C,
-	12335: 0x00007270,
-	12336: 0x00007273,
-	12337: 0x0000726E,
-	12338: 0x000072CA,
-	12339: 0x000072E4,
-	12340: 0x000072E8,
-	12341: 0x000072EB,
-	12342: 0x000072DF,
-	12343: 0x000072EA,
-	12344: 0x000072E6,
-	12345: 0x000072E3,
-	12346: 0x00007385,
-	12347: 0x000073CC,
-	12348: 0x000073C2,
-	12349: 0x000073C8,
-	12350: 0x000073C5,
-	12351: 0x000073B9,
-	12352: 0x000073B6,
-	12353: 0x000073B5,
-	12354: 0x000073B4,
-	12355: 0x000073EB,
-	12356: 0x000073BF,
-	12357: 0x000073C7,
-	12358: 0x000073BE,
-	12359: 0x000073C3,
-	12360: 0x000073C6,
-	12361: 0x000073B8,
-	12362: 0x000073CB,
-	12363: 0x000074EC,
-	12364: 0x000074EE,
-	12365: 0x0000752E,
-	12366: 0x00007547,
-	12367: 0x00007548,
-	12368: 0x000075A7,
-	12369: 0x000075AA,
-	12370: 0x00007679,
-	12371: 0x000076C4,
-	12372: 0x00007708,
-	12373: 0x00007703,
-	12374: 0x00007704,
-	12375: 0x00007705,
-	12376: 0x0000770A,
-	12377: 0x000076F7,
-	12378: 0x000076FB,
-	12379: 0x000076FA,
-	12380: 0x000077E7,
-	12381: 0x000077E8,
-	12382: 0x00007806,
-	12383: 0x00007811,
-	12384: 0x00007812,
-	12385: 0x00007805,
-	12386: 0x00007810,
-	12387: 0x0000780F,
-	12388: 0x0000780E,
-	12389: 0x00007809,
-	12390: 0x00007803,
-	12391: 0x00007813,
-	12392: 0x0000794A,
-	12393: 0x0000794C,
-	12394: 0x0000794B,
-	12395: 0x00007945,
-	12396: 0x00007944,
-	12397: 0x000079D5,
-	12398: 0x000079CD,
-	12399: 0x000079CF,
-	12400: 0x000079D6,
-	12401: 0x000079CE,
-	12402: 0x00007A80,
-	12403: 0x00007A7E,
-	12404: 0x00007AD1,
-	12405: 0x00007B00,
-	12406: 0x00007B01,
-	12407: 0x00007C7A,
-	12408: 0x00007C78,
-	12409: 0x00007C79,
-	12410: 0x00007C7F,
-	12411: 0x00007C80,
-	12412: 0x00007C81,
-	12413: 0x00007D03,
-	12414: 0x00007D08,
-	12415: 0x00007D01,
-	12416: 0x00007F58,
-	12417: 0x00007F91,
-	12418: 0x00007F8D,
-	12419: 0x00007FBE,
-	12420: 0x00008007,
-	12421: 0x0000800E,
-	12422: 0x0000800F,
-	12423: 0x00008014,
-	12424: 0x00008037,
-	12425: 0x000080D8,
-	12426: 0x000080C7,
-	12427: 0x000080E0,
-	12428: 0x000080D1,
-	12429: 0x000080C8,
-	12430: 0x000080C2,
-	12431: 0x000080D0,
-	12432: 0x000080C5,
-	12433: 0x000080E3,
-	12434: 0x000080D9,
-	12435: 0x000080DC,
-	12436: 0x000080CA,
-	12437: 0x000080D5,
-	12438: 0x000080C9,
-	12439: 0x000080CF,
-	12440: 0x000080D7,
-	12441: 0x000080E6,
-	12442: 0x000080CD,
-	12443: 0x000081FF,
-	12444: 0x00008221,
-	12445: 0x00008294,
-	12446: 0x000082D9,
-	12447: 0x000082FE,
-	12448: 0x000082F9,
-	12449: 0x00008307,
-	12450: 0x000082E8,
-	12451: 0x00008300,
-	12452: 0x000082D5,
-	12453: 0x0000833A,
-	12454: 0x000082EB,
-	12455: 0x000082D6,
-	12456: 0x000082F4,
-	12457: 0x000082EC,
-	12458: 0x000082E1,
-	12459: 0x000082F2,
-	12460: 0x000082F5,
-	12461: 0x0000830C,
-	12462: 0x000082FB,
-	12463: 0x000082F6,
-	12464: 0x000082F0,
-	12465: 0x000082EA,
-	12466: 0x000082E4,
-	12467: 0x000082E0,
-	12468: 0x000082FA,
-	12469: 0x000082F3,
-	12470: 0x000082ED,
-	12471: 0x00008677,
-	12472: 0x00008674,
-	12473: 0x0000867C,
-	12474: 0x00008673,
-	12475: 0x00008841,
-	12476: 0x0000884E,
-	12477: 0x00008867,
-	12478: 0x0000886A,
-	12479: 0x00008869,
-	12480: 0x000089D3,
-	12481: 0x00008A04,
-	12482: 0x00008A07,
-	12483: 0x00008D72,
-	12484: 0x00008FE3,
-	12485: 0x00008FE1,
-	12486: 0x00008FEE,
-	12487: 0x00008FE0,
-	12488: 0x000090F1,
-	12489: 0x000090BD,
-	12490: 0x000090BF,
-	12491: 0x000090D5,
-	12492: 0x000090C5,
-	12493: 0x000090BE,
-	12494: 0x000090C7,
-	12495: 0x000090CB,
-	12496: 0x000090C8,
-	12497: 0x000091D4,
-	12498: 0x000091D3,
-	12499: 0x00009654,
-	12500: 0x0000964F,
-	12501: 0x00009651,
-	12502: 0x00009653,
-	12503: 0x0000964A,
-	12504: 0x0000964E,
-	12505: 0x0000501E,
-	12506: 0x00005005,
-	12507: 0x00005007,
-	12508: 0x00005013,
-	12509: 0x00005022,
-	12510: 0x00005030,
-	12511: 0x0000501B,
-	12512: 0x00004FF5,
-	12513: 0x00004FF4,
-	12514: 0x00005033,
-	12515: 0x00005037,
-	12516: 0x0000502C,
-	12517: 0x00004FF6,
-	12518: 0x00004FF7,
-	12519: 0x00005017,
-	12520: 0x0000501C,
-	12521: 0x00005020,
-	12522: 0x00005027,
-	12523: 0x00005035,
-	12524: 0x0000502F,
-	12525: 0x00005031,
-	12526: 0x0000500E,
-	12527: 0x0000515A,
-	12528: 0x00005194,
-	12529: 0x00005193,
-	12530: 0x000051CA,
-	12531: 0x000051C4,
-	12532: 0x000051C5,
-	12533: 0x000051C8,
-	12534: 0x000051CE,
-	12535: 0x00005261,
-	12536: 0x0000525A,
-	12537: 0x00005252,
-	12538: 0x0000525E,
-	12539: 0x0000525F,
-	12540: 0x00005255,
-	12541: 0x00005262,
-	12542: 0x000052CD,
-	12543: 0x0000530E,
-	12544: 0x0000539E,
-	12545: 0x00005526,
-	12546: 0x000054E2,
-	12547: 0x00005517,
-	12548: 0x00005512,
-	12549: 0x000054E7,
-	12550: 0x000054F3,
-	12551: 0x000054E4,
-	12552: 0x0000551A,
-	12553: 0x000054FF,
-	12554: 0x00005504,
-	12555: 0x00005508,
-	12556: 0x000054EB,
-	12557: 0x00005511,
-	12558: 0x00005505,
-	12559: 0x000054F1,
-	12560: 0x0000550A,
-	12561: 0x000054FB,
-	12562: 0x000054F7,
-	12563: 0x000054F8,
-	12564: 0x000054E0,
-	12565: 0x0000550E,
-	12566: 0x00005503,
-	12567: 0x0000550B,
-	12568: 0x00005701,
-	12569: 0x00005702,
-	12570: 0x000057CC,
-	12571: 0x00005832,
-	12572: 0x000057D5,
-	12573: 0x000057D2,
-	12574: 0x000057BA,
-	12575: 0x000057C6,
-	12576: 0x000057BD,
-	12577: 0x000057BC,
-	12578: 0x000057B8,
-	12579: 0x000057B6,
-	12580: 0x000057BF,
-	12581: 0x000057C7,
-	12582: 0x000057D0,
-	12583: 0x000057B9,
-	12584: 0x000057C1,
-	12585: 0x0000590E,
-	12586: 0x0000594A,
-	12587: 0x00005A19,
-	12588: 0x00005A16,
-	12589: 0x00005A2D,
-	12590: 0x00005A2E,
-	12591: 0x00005A15,
-	12592: 0x00005A0F,
-	12593: 0x00005A17,
-	12594: 0x00005A0A,
-	12595: 0x00005A1E,
-	12596: 0x00005A33,
-	12597: 0x00005B6C,
-	12598: 0x00005BA7,
-	12599: 0x00005BAD,
-	12600: 0x00005BAC,
-	12601: 0x00005C03,
-	12602: 0x00005C56,
-	12603: 0x00005C54,
-	12604: 0x00005CEC,
-	12605: 0x00005CFF,
-	12606: 0x00005CEE,
-	12607: 0x00005CF1,
-	12608: 0x00005CF7,
-	12609: 0x00005D00,
-	12610: 0x00005CF9,
-	12611: 0x00005E29,
-	12612: 0x00005E28,
-	12613: 0x00005EA8,
-	12614: 0x00005EAE,
-	12615: 0x00005EAA,
-	12616: 0x00005EAC,
-	12617: 0x00005F33,
-	12618: 0x00005F30,
-	12619: 0x00005F67,
-	12620: 0x0000605D,
-	12621: 0x0000605A,
-	12622: 0x00006067,
-	12623: 0x00006041,
-	12624: 0x000060A2,
-	12625: 0x00006088,
-	12626: 0x00006080,
-	12627: 0x00006092,
-	12628: 0x00006081,
-	12629: 0x0000609D,
-	12630: 0x00006083,
-	12631: 0x00006095,
-	12632: 0x0000609B,
-	12633: 0x00006097,
-	12634: 0x00006087,
-	12635: 0x0000609C,
-	12636: 0x0000608E,
-	12637: 0x00006219,
-	12638: 0x00006246,
-	12639: 0x000062F2,
-	12640: 0x00006310,
-	12641: 0x00006356,
-	12642: 0x0000632C,
-	12643: 0x00006344,
-	12644: 0x00006345,
-	12645: 0x00006336,
-	12646: 0x00006343,
-	12647: 0x000063E4,
-	12648: 0x00006339,
-	12649: 0x0000634B,
-	12650: 0x0000634A,
-	12651: 0x0000633C,
-	12652: 0x00006329,
-	12653: 0x00006341,
-	12654: 0x00006334,
-	12655: 0x00006358,
-	12656: 0x00006354,
-	12657: 0x00006359,
-	12658: 0x0000632D,
-	12659: 0x00006347,
-	12660: 0x00006333,
-	12661: 0x0000635A,
-	12662: 0x00006351,
-	12663: 0x00006338,
-	12664: 0x00006357,
-	12665: 0x00006340,
-	12666: 0x00006348,
-	12667: 0x0000654A,
-	12668: 0x00006546,
-	12669: 0x000065C6,
-	12670: 0x000065C3,
-	12671: 0x000065C4,
-	12672: 0x000065C2,
-	12673: 0x0000664A,
-	12674: 0x0000665F,
-	12675: 0x00006647,
-	12676: 0x00006651,
-	12677: 0x00006712,
-	12678: 0x00006713,
-	12679: 0x0000681F,
-	12680: 0x0000681A,
-	12681: 0x00006849,
-	12682: 0x00006832,
-	12683: 0x00006833,
-	12684: 0x0000683B,
-	12685: 0x0000684B,
-	12686: 0x0000684F,
-	12687: 0x00006816,
-	12688: 0x00006831,
-	12689: 0x0000681C,
-	12690: 0x00006835,
-	12691: 0x0000682B,
-	12692: 0x0000682D,
-	12693: 0x0000682F,
-	12694: 0x0000684E,
-	12695: 0x00006844,
-	12696: 0x00006834,
-	12697: 0x0000681D,
-	12698: 0x00006812,
-	12699: 0x00006814,
-	12700: 0x00006826,
-	12701: 0x00006828,
-	12702: 0x0000682E,
-	12703: 0x0000684D,
-	12704: 0x0000683A,
-	12705: 0x00006825,
-	12706: 0x00006820,
-	12707: 0x00006B2C,
-	12708: 0x00006B2F,
-	12709: 0x00006B2D,
-	12710: 0x00006B31,
-	12711: 0x00006B34,
-	12712: 0x00006B6D,
-	12713: 0x00008082,
-	12714: 0x00006B88,
-	12715: 0x00006BE6,
-	12716: 0x00006BE4,
-	12717: 0x00006BE8,
-	12718: 0x00006BE3,
-	12719: 0x00006BE2,
-	12720: 0x00006BE7,
-	12721: 0x00006C25,
-	12722: 0x00006D7A,
-	12723: 0x00006D63,
-	12724: 0x00006D64,
-	12725: 0x00006D76,
-	12726: 0x00006D0D,
-	12727: 0x00006D61,
-	12728: 0x00006D92,
-	12729: 0x00006D58,
-	12730: 0x00006D62,
-	12731: 0x00006D6D,
-	12732: 0x00006D6F,
-	12733: 0x00006D91,
-	12734: 0x00006D8D,
-	12735: 0x00006DEF,
-	12736: 0x00006D7F,
-	12737: 0x00006D86,
-	12738: 0x00006D5E,
-	12739: 0x00006D67,
-	12740: 0x00006D60,
-	12741: 0x00006D97,
-	12742: 0x00006D70,
-	12743: 0x00006D7C,
-	12744: 0x00006D5F,
-	12745: 0x00006D82,
-	12746: 0x00006D98,
-	12747: 0x00006D2F,
-	12748: 0x00006D68,
-	12749: 0x00006D8B,
-	12750: 0x00006D7E,
-	12751: 0x00006D80,
-	12752: 0x00006D84,
-	12753: 0x00006D16,
-	12754: 0x00006D83,
-	12755: 0x00006D7B,
-	12756: 0x00006D7D,
-	12757: 0x00006D75,
-	12758: 0x00006D90,
-	12759: 0x000070DC,
-	12760: 0x000070D3,
-	12761: 0x000070D1,
-	12762: 0x000070DD,
-	12763: 0x000070CB,
-	12764: 0x00007F39,
-	12765: 0x000070E2,
-	12766: 0x000070D7,
-	12767: 0x000070D2,
-	12768: 0x000070DE,
-	12769: 0x000070E0,
-	12770: 0x000070D4,
-	12771: 0x000070CD,
-	12772: 0x000070C5,
-	12773: 0x000070C6,
-	12774: 0x000070C7,
-	12775: 0x000070DA,
-	12776: 0x000070CE,
-	12777: 0x000070E1,
-	12778: 0x00007242,
-	12779: 0x00007278,
-	12780: 0x00007277,
-	12781: 0x00007276,
-	12782: 0x00007300,
-	12783: 0x000072FA,
-	12784: 0x000072F4,
-	12785: 0x000072FE,
-	12786: 0x000072F6,
-	12787: 0x000072F3,
-	12788: 0x000072FB,
-	12789: 0x00007301,
-	12790: 0x000073D3,
-	12791: 0x000073D9,
-	12792: 0x000073E5,
-	12793: 0x000073D6,
-	12794: 0x000073BC,
-	12795: 0x000073E7,
-	12796: 0x000073E3,
-	12797: 0x000073E9,
-	12798: 0x000073DC,
-	12799: 0x000073D2,
-	12800: 0x000073DB,
-	12801: 0x000073D4,
-	12802: 0x000073DD,
-	12803: 0x000073DA,
-	12804: 0x000073D7,
-	12805: 0x000073D8,
-	12806: 0x000073E8,
-	12807: 0x000074DE,
-	12808: 0x000074DF,
-	12809: 0x000074F4,
-	12810: 0x000074F5,
-	12811: 0x00007521,
-	12812: 0x0000755B,
-	12813: 0x0000755F,
-	12814: 0x000075B0,
-	12815: 0x000075C1,
-	12816: 0x000075BB,
-	12817: 0x000075C4,
-	12818: 0x000075C0,
-	12819: 0x000075BF,
-	12820: 0x000075B6,
-	12821: 0x000075BA,
-	12822: 0x0000768A,
-	12823: 0x000076C9,
-	12824: 0x0000771D,
-	12825: 0x0000771B,
-	12826: 0x00007710,
-	12827: 0x00007713,
-	12828: 0x00007712,
-	12829: 0x00007723,
-	12830: 0x00007711,
-	12831: 0x00007715,
-	12832: 0x00007719,
-	12833: 0x0000771A,
-	12834: 0x00007722,
-	12835: 0x00007727,
-	12836: 0x00007823,
-	12837: 0x0000782C,
-	12838: 0x00007822,
-	12839: 0x00007835,
-	12840: 0x0000782F,
-	12841: 0x00007828,
-	12842: 0x0000782E,
-	12843: 0x0000782B,
-	12844: 0x00007821,
-	12845: 0x00007829,
-	12846: 0x00007833,
-	12847: 0x0000782A,
-	12848: 0x00007831,
-	12849: 0x00007954,
-	12850: 0x0000795B,
-	12851: 0x0000794F,
-	12852: 0x0000795C,
-	12853: 0x00007953,
-	12854: 0x00007952,
-	12855: 0x00007951,
-	12856: 0x000079EB,
-	12857: 0x000079EC,
-	12858: 0x000079E0,
-	12859: 0x000079EE,
-	12860: 0x000079ED,
-	12861: 0x000079EA,
-	12862: 0x000079DC,
-	12863: 0x000079DE,
-	12864: 0x000079DD,
-	12865: 0x00007A86,
-	12866: 0x00007A89,
-	12867: 0x00007A85,
-	12868: 0x00007A8B,
-	12869: 0x00007A8C,
-	12870: 0x00007A8A,
-	12871: 0x00007A87,
-	12872: 0x00007AD8,
-	12873: 0x00007B10,
-	12874: 0x00007B04,
-	12875: 0x00007B13,
-	12876: 0x00007B05,
-	12877: 0x00007B0F,
-	12878: 0x00007B08,
-	12879: 0x00007B0A,
-	12880: 0x00007B0E,
-	12881: 0x00007B09,
-	12882: 0x00007B12,
-	12883: 0x00007C84,
-	12884: 0x00007C91,
-	12885: 0x00007C8A,
-	12886: 0x00007C8C,
-	12887: 0x00007C88,
-	12888: 0x00007C8D,
-	12889: 0x00007C85,
-	12890: 0x00007D1E,
-	12891: 0x00007D1D,
-	12892: 0x00007D11,
-	12893: 0x00007D0E,
-	12894: 0x00007D18,
-	12895: 0x00007D16,
-	12896: 0x00007D13,
-	12897: 0x00007D1F,
-	12898: 0x00007D12,
-	12899: 0x00007D0F,
-	12900: 0x00007D0C,
-	12901: 0x00007F5C,
-	12902: 0x00007F61,
-	12903: 0x00007F5E,
-	12904: 0x00007F60,
-	12905: 0x00007F5D,
-	12906: 0x00007F5B,
-	12907: 0x00007F96,
-	12908: 0x00007F92,
-	12909: 0x00007FC3,
-	12910: 0x00007FC2,
-	12911: 0x00007FC0,
-	12912: 0x00008016,
-	12913: 0x0000803E,
-	12914: 0x00008039,
-	12915: 0x000080FA,
-	12916: 0x000080F2,
-	12917: 0x000080F9,
-	12918: 0x000080F5,
-	12919: 0x00008101,
-	12920: 0x000080FB,
-	12921: 0x00008100,
-	12922: 0x00008201,
-	12923: 0x0000822F,
-	12924: 0x00008225,
-	12925: 0x00008333,
-	12926: 0x0000832D,
-	12927: 0x00008344,
-	12928: 0x00008319,
-	12929: 0x00008351,
-	12930: 0x00008325,
-	12931: 0x00008356,
-	12932: 0x0000833F,
-	12933: 0x00008341,
-	12934: 0x00008326,
-	12935: 0x0000831C,
-	12936: 0x00008322,
-	12937: 0x00008342,
-	12938: 0x0000834E,
-	12939: 0x0000831B,
-	12940: 0x0000832A,
-	12941: 0x00008308,
-	12942: 0x0000833C,
-	12943: 0x0000834D,
-	12944: 0x00008316,
-	12945: 0x00008324,
-	12946: 0x00008320,
-	12947: 0x00008337,
-	12948: 0x0000832F,
-	12949: 0x00008329,
-	12950: 0x00008347,
-	12951: 0x00008345,
-	12952: 0x0000834C,
-	12953: 0x00008353,
-	12954: 0x0000831E,
-	12955: 0x0000832C,
-	12956: 0x0000834B,
-	12957: 0x00008327,
-	12958: 0x00008348,
-	12959: 0x00008653,
-	12960: 0x00008652,
-	12961: 0x000086A2,
-	12962: 0x000086A8,
-	12963: 0x00008696,
-	12964: 0x0000868D,
-	12965: 0x00008691,
-	12966: 0x0000869E,
-	12967: 0x00008687,
-	12968: 0x00008697,
-	12969: 0x00008686,
-	12970: 0x0000868B,
-	12971: 0x0000869A,
-	12972: 0x00008685,
-	12973: 0x000086A5,
-	12974: 0x00008699,
-	12975: 0x000086A1,
-	12976: 0x000086A7,
-	12977: 0x00008695,
-	12978: 0x00008698,
-	12979: 0x0000868E,
-	12980: 0x0000869D,
-	12981: 0x00008690,
-	12982: 0x00008694,
-	12983: 0x00008843,
-	12984: 0x00008844,
-	12985: 0x0000886D,
-	12986: 0x00008875,
-	12987: 0x00008876,
-	12988: 0x00008872,
-	12989: 0x00008880,
-	12990: 0x00008871,
-	12991: 0x0000887F,
-	12992: 0x0000886F,
-	12993: 0x00008883,
-	12994: 0x0000887E,
-	12995: 0x00008874,
-	12996: 0x0000887C,
-	12997: 0x00008A12,
-	12998: 0x00008C47,
-	12999: 0x00008C57,
-	13000: 0x00008C7B,
-	13001: 0x00008CA4,
-	13002: 0x00008CA3,
-	13003: 0x00008D76,
-	13004: 0x00008D78,
-	13005: 0x00008DB5,
-	13006: 0x00008DB7,
-	13007: 0x00008DB6,
-	13008: 0x00008ED1,
-	13009: 0x00008ED3,
-	13010: 0x00008FFE,
-	13011: 0x00008FF5,
-	13012: 0x00009002,
-	13013: 0x00008FFF,
-	13014: 0x00008FFB,
-	13015: 0x00009004,
-	13016: 0x00008FFC,
-	13017: 0x00008FF6,
-	13018: 0x000090D6,
-	13019: 0x000090E0,
-	13020: 0x000090D9,
-	13021: 0x000090DA,
-	13022: 0x000090E3,
-	13023: 0x000090DF,
-	13024: 0x000090E5,
-	13025: 0x000090D8,
-	13026: 0x000090DB,
-	13027: 0x000090D7,
-	13028: 0x000090DC,
-	13029: 0x000090E4,
-	13030: 0x00009150,
-	13031: 0x0000914E,
-	13032: 0x0000914F,
-	13033: 0x000091D5,
-	13034: 0x000091E2,
-	13035: 0x000091DA,
-	13036: 0x0000965C,
-	13037: 0x0000965F,
-	13038: 0x000096BC,
-	13039: 0x000098E3,
-	13040: 0x00009ADF,
-	13041: 0x00009B2F,
-	13042: 0x00004E7F,
-	13043: 0x00005070,
-	13044: 0x0000506A,
-	13045: 0x00005061,
-	13046: 0x0000505E,
-	13047: 0x00005060,
-	13048: 0x00005053,
-	13049: 0x0000504B,
-	13050: 0x0000505D,
-	13051: 0x00005072,
-	13052: 0x00005048,
-	13053: 0x0000504D,
-	13054: 0x00005041,
-	13055: 0x0000505B,
-	13056: 0x0000504A,
-	13057: 0x00005062,
-	13058: 0x00005015,
-	13059: 0x00005045,
-	13060: 0x0000505F,
-	13061: 0x00005069,
-	13062: 0x0000506B,
-	13063: 0x00005063,
-	13064: 0x00005064,
-	13065: 0x00005046,
-	13066: 0x00005040,
-	13067: 0x0000506E,
-	13068: 0x00005073,
-	13069: 0x00005057,
-	13070: 0x00005051,
-	13071: 0x000051D0,
-	13072: 0x0000526B,
-	13073: 0x0000526D,
-	13074: 0x0000526C,
-	13075: 0x0000526E,
-	13076: 0x000052D6,
-	13077: 0x000052D3,
-	13078: 0x0000532D,
-	13079: 0x0000539C,
-	13080: 0x00005575,
-	13081: 0x00005576,
-	13082: 0x0000553C,
-	13083: 0x0000554D,
-	13084: 0x00005550,
-	13085: 0x00005534,
-	13086: 0x0000552A,
-	13087: 0x00005551,
-	13088: 0x00005562,
-	13089: 0x00005536,
-	13090: 0x00005535,
-	13091: 0x00005530,
-	13092: 0x00005552,
-	13093: 0x00005545,
-	13094: 0x0000550C,
-	13095: 0x00005532,
-	13096: 0x00005565,
-	13097: 0x0000554E,
-	13098: 0x00005539,
-	13099: 0x00005548,
-	13100: 0x0000552D,
-	13101: 0x0000553B,
-	13102: 0x00005540,
-	13103: 0x0000554B,
-	13104: 0x0000570A,
-	13105: 0x00005707,
-	13106: 0x000057FB,
-	13107: 0x00005814,
-	13108: 0x000057E2,
-	13109: 0x000057F6,
-	13110: 0x000057DC,
-	13111: 0x000057F4,
-	13112: 0x00005800,
-	13113: 0x000057ED,
-	13114: 0x000057FD,
-	13115: 0x00005808,
-	13116: 0x000057F8,
-	13117: 0x0000580B,
-	13118: 0x000057F3,
-	13119: 0x000057CF,
-	13120: 0x00005807,
-	13121: 0x000057EE,
-	13122: 0x000057E3,
-	13123: 0x000057F2,
-	13124: 0x000057E5,
-	13125: 0x000057EC,
-	13126: 0x000057E1,
-	13127: 0x0000580E,
-	13128: 0x000057FC,
-	13129: 0x00005810,
-	13130: 0x000057E7,
-	13131: 0x00005801,
-	13132: 0x0000580C,
-	13133: 0x000057F1,
-	13134: 0x000057E9,
-	13135: 0x000057F0,
-	13136: 0x0000580D,
-	13137: 0x00005804,
-	13138: 0x0000595C,
-	13139: 0x00005A60,
-	13140: 0x00005A58,
-	13141: 0x00005A55,
-	13142: 0x00005A67,
-	13143: 0x00005A5E,
-	13144: 0x00005A38,
-	13145: 0x00005A35,
-	13146: 0x00005A6D,
-	13147: 0x00005A50,
-	13148: 0x00005A5F,
-	13149: 0x00005A65,
-	13150: 0x00005A6C,
-	13151: 0x00005A53,
-	13152: 0x00005A64,
-	13153: 0x00005A57,
-	13154: 0x00005A43,
-	13155: 0x00005A5D,
-	13156: 0x00005A52,
-	13157: 0x00005A44,
-	13158: 0x00005A5B,
-	13159: 0x00005A48,
-	13160: 0x00005A8E,
-	13161: 0x00005A3E,
-	13162: 0x00005A4D,
-	13163: 0x00005A39,
-	13164: 0x00005A4C,
-	13165: 0x00005A70,
-	13166: 0x00005A69,
-	13167: 0x00005A47,
-	13168: 0x00005A51,
-	13169: 0x00005A56,
-	13170: 0x00005A42,
-	13171: 0x00005A5C,
-	13172: 0x00005B72,
-	13173: 0x00005B6E,
-	13174: 0x00005BC1,
-	13175: 0x00005BC0,
-	13176: 0x00005C59,
-	13177: 0x00005D1E,
-	13178: 0x00005D0B,
-	13179: 0x00005D1D,
-	13180: 0x00005D1A,
-	13181: 0x00005D20,
-	13182: 0x00005D0C,
-	13183: 0x00005D28,
-	13184: 0x00005D0D,
-	13185: 0x00005D26,
-	13186: 0x00005D25,
-	13187: 0x00005D0F,
-	13188: 0x00005D30,
-	13189: 0x00005D12,
-	13190: 0x00005D23,
-	13191: 0x00005D1F,
-	13192: 0x00005D2E,
-	13193: 0x00005E3E,
-	13194: 0x00005E34,
-	13195: 0x00005EB1,
-	13196: 0x00005EB4,
-	13197: 0x00005EB9,
-	13198: 0x00005EB2,
-	13199: 0x00005EB3,
-	13200: 0x00005F36,
-	13201: 0x00005F38,
-	13202: 0x00005F9B,
-	13203: 0x00005F96,
-	13204: 0x00005F9F,
-	13205: 0x0000608A,
-	13206: 0x00006090,
-	13207: 0x00006086,
-	13208: 0x000060BE,
-	13209: 0x000060B0,
-	13210: 0x000060BA,
-	13211: 0x000060D3,
-	13212: 0x000060D4,
-	13213: 0x000060CF,
-	13214: 0x000060E4,
-	13215: 0x000060D9,
-	13216: 0x000060DD,
-	13217: 0x000060C8,
-	13218: 0x000060B1,
-	13219: 0x000060DB,
-	13220: 0x000060B7,
-	13221: 0x000060CA,
-	13222: 0x000060BF,
-	13223: 0x000060C3,
-	13224: 0x000060CD,
-	13225: 0x000060C0,
-	13226: 0x00006332,
-	13227: 0x00006365,
-	13228: 0x0000638A,
-	13229: 0x00006382,
-	13230: 0x0000637D,
-	13231: 0x000063BD,
-	13232: 0x0000639E,
-	13233: 0x000063AD,
-	13234: 0x0000639D,
-	13235: 0x00006397,
-	13236: 0x000063AB,
-	13237: 0x0000638E,
-	13238: 0x0000636F,
-	13239: 0x00006387,
-	13240: 0x00006390,
-	13241: 0x0000636E,
-	13242: 0x000063AF,
-	13243: 0x00006375,
-	13244: 0x0000639C,
-	13245: 0x0000636D,
-	13246: 0x000063AE,
-	13247: 0x0000637C,
-	13248: 0x000063A4,
-	13249: 0x0000633B,
-	13250: 0x0000639F,
-	13251: 0x00006378,
-	13252: 0x00006385,
-	13253: 0x00006381,
-	13254: 0x00006391,
-	13255: 0x0000638D,
-	13256: 0x00006370,
-	13257: 0x00006553,
-	13258: 0x000065CD,
-	13259: 0x00006665,
-	13260: 0x00006661,
-	13261: 0x0000665B,
-	13262: 0x00006659,
-	13263: 0x0000665C,
-	13264: 0x00006662,
-	13265: 0x00006718,
-	13266: 0x00006879,
-	13267: 0x00006887,
-	13268: 0x00006890,
-	13269: 0x0000689C,
-	13270: 0x0000686D,
-	13271: 0x0000686E,
-	13272: 0x000068AE,
-	13273: 0x000068AB,
-	13274: 0x00006956,
-	13275: 0x0000686F,
-	13276: 0x000068A3,
-	13277: 0x000068AC,
-	13278: 0x000068A9,
-	13279: 0x00006875,
-	13280: 0x00006874,
-	13281: 0x000068B2,
-	13282: 0x0000688F,
-	13283: 0x00006877,
-	13284: 0x00006892,
-	13285: 0x0000687C,
-	13286: 0x0000686B,
-	13287: 0x00006872,
-	13288: 0x000068AA,
-	13289: 0x00006880,
-	13290: 0x00006871,
-	13291: 0x0000687E,
-	13292: 0x0000689B,
-	13293: 0x00006896,
-	13294: 0x0000688B,
-	13295: 0x000068A0,
-	13296: 0x00006889,
-	13297: 0x000068A4,
-	13298: 0x00006878,
-	13299: 0x0000687B,
-	13300: 0x00006891,
-	13301: 0x0000688C,
-	13302: 0x0000688A,
-	13303: 0x0000687D,
-	13304: 0x00006B36,
-	13305: 0x00006B33,
-	13306: 0x00006B37,
-	13307: 0x00006B38,
-	13308: 0x00006B91,
-	13309: 0x00006B8F,
-	13310: 0x00006B8D,
-	13311: 0x00006B8E,
-	13312: 0x00006B8C,
-	13313: 0x00006C2A,
-	13314: 0x00006DC0,
-	13315: 0x00006DAB,
-	13316: 0x00006DB4,
-	13317: 0x00006DB3,
-	13318: 0x00006E74,
-	13319: 0x00006DAC,
-	13320: 0x00006DE9,
-	13321: 0x00006DE2,
-	13322: 0x00006DB7,
-	13323: 0x00006DF6,
-	13324: 0x00006DD4,
-	13325: 0x00006E00,
-	13326: 0x00006DC8,
-	13327: 0x00006DE0,
-	13328: 0x00006DDF,
-	13329: 0x00006DD6,
-	13330: 0x00006DBE,
-	13331: 0x00006DE5,
-	13332: 0x00006DDC,
-	13333: 0x00006DDD,
-	13334: 0x00006DDB,
-	13335: 0x00006DF4,
-	13336: 0x00006DCA,
-	13337: 0x00006DBD,
-	13338: 0x00006DED,
-	13339: 0x00006DF0,
-	13340: 0x00006DBA,
-	13341: 0x00006DD5,
-	13342: 0x00006DC2,
-	13343: 0x00006DCF,
-	13344: 0x00006DC9,
-	13345: 0x00006DD0,
-	13346: 0x00006DF2,
-	13347: 0x00006DD3,
-	13348: 0x00006DFD,
-	13349: 0x00006DD7,
-	13350: 0x00006DCD,
-	13351: 0x00006DE3,
-	13352: 0x00006DBB,
-	13353: 0x000070FA,
-	13354: 0x0000710D,
-	13355: 0x000070F7,
-	13356: 0x00007117,
-	13357: 0x000070F4,
-	13358: 0x0000710C,
-	13359: 0x000070F0,
-	13360: 0x00007104,
-	13361: 0x000070F3,
-	13362: 0x00007110,
-	13363: 0x000070FC,
-	13364: 0x000070FF,
-	13365: 0x00007106,
-	13366: 0x00007113,
-	13367: 0x00007100,
-	13368: 0x000070F8,
-	13369: 0x000070F6,
-	13370: 0x0000710B,
-	13371: 0x00007102,
-	13372: 0x0000710E,
-	13373: 0x0000727E,
-	13374: 0x0000727B,
-	13375: 0x0000727C,
-	13376: 0x0000727F,
-	13377: 0x0000731D,
-	13378: 0x00007317,
-	13379: 0x00007307,
-	13380: 0x00007311,
-	13381: 0x00007318,
-	13382: 0x0000730A,
-	13383: 0x00007308,
-	13384: 0x000072FF,
-	13385: 0x0000730F,
-	13386: 0x0000731E,
-	13387: 0x00007388,
-	13388: 0x000073F6,
-	13389: 0x000073F8,
-	13390: 0x000073F5,
-	13391: 0x00007404,
-	13392: 0x00007401,
-	13393: 0x000073FD,
-	13394: 0x00007407,
-	13395: 0x00007400,
-	13396: 0x000073FA,
-	13397: 0x000073FC,
-	13398: 0x000073FF,
-	13399: 0x0000740C,
-	13400: 0x0000740B,
-	13401: 0x000073F4,
-	13402: 0x00007408,
-	13403: 0x00007564,
-	13404: 0x00007563,
-	13405: 0x000075CE,
-	13406: 0x000075D2,
-	13407: 0x000075CF,
-	13408: 0x000075CB,
-	13409: 0x000075CC,
-	13410: 0x000075D1,
-	13411: 0x000075D0,
-	13412: 0x0000768F,
-	13413: 0x00007689,
-	13414: 0x000076D3,
-	13415: 0x00007739,
-	13416: 0x0000772F,
-	13417: 0x0000772D,
-	13418: 0x00007731,
-	13419: 0x00007732,
-	13420: 0x00007734,
-	13421: 0x00007733,
-	13422: 0x0000773D,
-	13423: 0x00007725,
-	13424: 0x0000773B,
-	13425: 0x00007735,
-	13426: 0x00007848,
-	13427: 0x00007852,
-	13428: 0x00007849,
-	13429: 0x0000784D,
-	13430: 0x0000784A,
-	13431: 0x0000784C,
-	13432: 0x00007826,
-	13433: 0x00007845,
-	13434: 0x00007850,
-	13435: 0x00007964,
-	13436: 0x00007967,
-	13437: 0x00007969,
-	13438: 0x0000796A,
-	13439: 0x00007963,
-	13440: 0x0000796B,
-	13441: 0x00007961,
-	13442: 0x000079BB,
-	13443: 0x000079FA,
-	13444: 0x000079F8,
-	13445: 0x000079F6,
-	13446: 0x000079F7,
-	13447: 0x00007A8F,
-	13448: 0x00007A94,
-	13449: 0x00007A90,
-	13450: 0x00007B35,
-	13451: 0x00007B47,
-	13452: 0x00007B34,
-	13453: 0x00007B25,
-	13454: 0x00007B30,
-	13455: 0x00007B22,
-	13456: 0x00007B24,
-	13457: 0x00007B33,
-	13458: 0x00007B18,
-	13459: 0x00007B2A,
-	13460: 0x00007B1D,
-	13461: 0x00007B31,
-	13462: 0x00007B2B,
-	13463: 0x00007B2D,
-	13464: 0x00007B2F,
-	13465: 0x00007B32,
-	13466: 0x00007B38,
-	13467: 0x00007B1A,
-	13468: 0x00007B23,
-	13469: 0x00007C94,
-	13470: 0x00007C98,
-	13471: 0x00007C96,
-	13472: 0x00007CA3,
-	13473: 0x00007D35,
-	13474: 0x00007D3D,
-	13475: 0x00007D38,
-	13476: 0x00007D36,
-	13477: 0x00007D3A,
-	13478: 0x00007D45,
-	13479: 0x00007D2C,
-	13480: 0x00007D29,
-	13481: 0x00007D41,
-	13482: 0x00007D47,
-	13483: 0x00007D3E,
-	13484: 0x00007D3F,
-	13485: 0x00007D4A,
-	13486: 0x00007D3B,
-	13487: 0x00007D28,
-	13488: 0x00007F63,
-	13489: 0x00007F95,
-	13490: 0x00007F9C,
-	13491: 0x00007F9D,
-	13492: 0x00007F9B,
-	13493: 0x00007FCA,
-	13494: 0x00007FCB,
-	13495: 0x00007FCD,
-	13496: 0x00007FD0,
-	13497: 0x00007FD1,
-	13498: 0x00007FC7,
-	13499: 0x00007FCF,
-	13500: 0x00007FC9,
-	13501: 0x0000801F,
-	13502: 0x0000801E,
-	13503: 0x0000801B,
-	13504: 0x00008047,
-	13505: 0x00008043,
-	13506: 0x00008048,
-	13507: 0x00008118,
-	13508: 0x00008125,
-	13509: 0x00008119,
-	13510: 0x0000811B,
-	13511: 0x0000812D,
-	13512: 0x0000811F,
-	13513: 0x0000812C,
-	13514: 0x0000811E,
-	13515: 0x00008121,
-	13516: 0x00008115,
-	13517: 0x00008127,
-	13518: 0x0000811D,
-	13519: 0x00008122,
-	13520: 0x00008211,
-	13521: 0x00008238,
-	13522: 0x00008233,
-	13523: 0x0000823A,
-	13524: 0x00008234,
-	13525: 0x00008232,
-	13526: 0x00008274,
-	13527: 0x00008390,
-	13528: 0x000083A3,
-	13529: 0x000083A8,
-	13530: 0x0000838D,
-	13531: 0x0000837A,
-	13532: 0x00008373,
-	13533: 0x000083A4,
-	13534: 0x00008374,
-	13535: 0x0000838F,
-	13536: 0x00008381,
-	13537: 0x00008395,
-	13538: 0x00008399,
-	13539: 0x00008375,
-	13540: 0x00008394,
-	13541: 0x000083A9,
-	13542: 0x0000837D,
-	13543: 0x00008383,
-	13544: 0x0000838C,
-	13545: 0x0000839D,
-	13546: 0x0000839B,
-	13547: 0x000083AA,
-	13548: 0x0000838B,
-	13549: 0x0000837E,
-	13550: 0x000083A5,
-	13551: 0x000083AF,
-	13552: 0x00008388,
-	13553: 0x00008397,
-	13554: 0x000083B0,
-	13555: 0x0000837F,
-	13556: 0x000083A6,
-	13557: 0x00008387,
-	13558: 0x000083AE,
-	13559: 0x00008376,
-	13560: 0x0000839A,
-	13561: 0x00008659,
-	13562: 0x00008656,
-	13563: 0x000086BF,
-	13564: 0x000086B7,
-	13565: 0x000086C2,
-	13566: 0x000086C1,
-	13567: 0x000086C5,
-	13568: 0x000086BA,
-	13569: 0x000086B0,
-	13570: 0x000086C8,
-	13571: 0x000086B9,
-	13572: 0x000086B3,
-	13573: 0x000086B8,
-	13574: 0x000086CC,
-	13575: 0x000086B4,
-	13576: 0x000086BB,
-	13577: 0x000086BC,
-	13578: 0x000086C3,
-	13579: 0x000086BD,
-	13580: 0x000086BE,
-	13581: 0x00008852,
-	13582: 0x00008889,
-	13583: 0x00008895,
-	13584: 0x000088A8,
-	13585: 0x000088A2,
-	13586: 0x000088AA,
-	13587: 0x0000889A,
-	13588: 0x00008891,
-	13589: 0x000088A1,
-	13590: 0x0000889F,
-	13591: 0x00008898,
-	13592: 0x000088A7,
-	13593: 0x00008899,
-	13594: 0x0000889B,
-	13595: 0x00008897,
-	13596: 0x000088A4,
-	13597: 0x000088AC,
-	13598: 0x0000888C,
-	13599: 0x00008893,
-	13600: 0x0000888E,
-	13601: 0x00008982,
-	13602: 0x000089D6,
-	13603: 0x000089D9,
-	13604: 0x000089D5,
-	13605: 0x00008A30,
-	13606: 0x00008A27,
-	13607: 0x00008A2C,
-	13608: 0x00008A1E,
-	13609: 0x00008C39,
-	13610: 0x00008C3B,
-	13611: 0x00008C5C,
-	13612: 0x00008C5D,
-	13613: 0x00008C7D,
-	13614: 0x00008CA5,
-	13615: 0x00008D7D,
-	13616: 0x00008D7B,
-	13617: 0x00008D79,
-	13618: 0x00008DBC,
-	13619: 0x00008DC2,
-	13620: 0x00008DB9,
-	13621: 0x00008DBF,
-	13622: 0x00008DC1,
-	13623: 0x00008ED8,
-	13624: 0x00008EDE,
-	13625: 0x00008EDD,
-	13626: 0x00008EDC,
-	13627: 0x00008ED7,
-	13628: 0x00008EE0,
-	13629: 0x00008EE1,
-	13630: 0x00009024,
-	13631: 0x0000900B,
-	13632: 0x00009011,
-	13633: 0x0000901C,
-	13634: 0x0000900C,
-	13635: 0x00009021,
-	13636: 0x000090EF,
-	13637: 0x000090EA,
-	13638: 0x000090F0,
-	13639: 0x000090F4,
-	13640: 0x000090F2,
-	13641: 0x000090F3,
-	13642: 0x000090D4,
-	13643: 0x000090EB,
-	13644: 0x000090EC,
-	13645: 0x000090E9,
-	13646: 0x00009156,
-	13647: 0x00009158,
-	13648: 0x0000915A,
-	13649: 0x00009153,
-	13650: 0x00009155,
-	13651: 0x000091EC,
-	13652: 0x000091F4,
-	13653: 0x000091F1,
-	13654: 0x000091F3,
-	13655: 0x000091F8,
-	13656: 0x000091E4,
-	13657: 0x000091F9,
-	13658: 0x000091EA,
-	13659: 0x000091EB,
-	13660: 0x000091F7,
-	13661: 0x000091E8,
-	13662: 0x000091EE,
-	13663: 0x0000957A,
-	13664: 0x00009586,
-	13665: 0x00009588,
-	13666: 0x0000967C,
-	13667: 0x0000966D,
-	13668: 0x0000966B,
-	13669: 0x00009671,
-	13670: 0x0000966F,
-	13671: 0x000096BF,
-	13672: 0x0000976A,
-	13673: 0x00009804,
-	13674: 0x000098E5,
-	13675: 0x00009997,
-	13676: 0x0000509B,
-	13677: 0x00005095,
-	13678: 0x00005094,
-	13679: 0x0000509E,
-	13680: 0x0000508B,
-	13681: 0x000050A3,
-	13682: 0x00005083,
-	13683: 0x0000508C,
-	13684: 0x0000508E,
-	13685: 0x0000509D,
-	13686: 0x00005068,
-	13687: 0x0000509C,
-	13688: 0x00005092,
-	13689: 0x00005082,
-	13690: 0x00005087,
-	13691: 0x0000515F,
-	13692: 0x000051D4,
-	13693: 0x00005312,
-	13694: 0x00005311,
-	13695: 0x000053A4,
-	13696: 0x000053A7,
-	13697: 0x00005591,
-	13698: 0x000055A8,
-	13699: 0x000055A5,
-	13700: 0x000055AD,
-	13701: 0x00005577,
-	13702: 0x00005645,
-	13703: 0x000055A2,
-	13704: 0x00005593,
-	13705: 0x00005588,
-	13706: 0x0000558F,
-	13707: 0x000055B5,
-	13708: 0x00005581,
-	13709: 0x000055A3,
-	13710: 0x00005592,
-	13711: 0x000055A4,
-	13712: 0x0000557D,
-	13713: 0x0000558C,
-	13714: 0x000055A6,
-	13715: 0x0000557F,
-	13716: 0x00005595,
-	13717: 0x000055A1,
-	13718: 0x0000558E,
-	13719: 0x0000570C,
-	13720: 0x00005829,
-	13721: 0x00005837,
-	13722: 0x00005819,
-	13723: 0x0000581E,
-	13724: 0x00005827,
-	13725: 0x00005823,
-	13726: 0x00005828,
-	13727: 0x000057F5,
-	13728: 0x00005848,
-	13729: 0x00005825,
-	13730: 0x0000581C,
-	13731: 0x0000581B,
-	13732: 0x00005833,
-	13733: 0x0000583F,
-	13734: 0x00005836,
-	13735: 0x0000582E,
-	13736: 0x00005839,
-	13737: 0x00005838,
-	13738: 0x0000582D,
-	13739: 0x0000582C,
-	13740: 0x0000583B,
-	13741: 0x00005961,
-	13742: 0x00005AAF,
-	13743: 0x00005A94,
-	13744: 0x00005A9F,
-	13745: 0x00005A7A,
-	13746: 0x00005AA2,
-	13747: 0x00005A9E,
-	13748: 0x00005A78,
-	13749: 0x00005AA6,
-	13750: 0x00005A7C,
-	13751: 0x00005AA5,
-	13752: 0x00005AAC,
-	13753: 0x00005A95,
-	13754: 0x00005AAE,
-	13755: 0x00005A37,
-	13756: 0x00005A84,
-	13757: 0x00005A8A,
-	13758: 0x00005A97,
-	13759: 0x00005A83,
-	13760: 0x00005A8B,
-	13761: 0x00005AA9,
-	13762: 0x00005A7B,
-	13763: 0x00005A7D,
-	13764: 0x00005A8C,
-	13765: 0x00005A9C,
-	13766: 0x00005A8F,
-	13767: 0x00005A93,
-	13768: 0x00005A9D,
-	13769: 0x00005BEA,
-	13770: 0x00005BCD,
-	13771: 0x00005BCB,
-	13772: 0x00005BD4,
-	13773: 0x00005BD1,
-	13774: 0x00005BCA,
-	13775: 0x00005BCE,
-	13776: 0x00005C0C,
-	13777: 0x00005C30,
-	13778: 0x00005D37,
-	13779: 0x00005D43,
-	13780: 0x00005D6B,
-	13781: 0x00005D41,
-	13782: 0x00005D4B,
-	13783: 0x00005D3F,
-	13784: 0x00005D35,
-	13785: 0x00005D51,
-	13786: 0x00005D4E,
-	13787: 0x00005D55,
-	13788: 0x00005D33,
-	13789: 0x00005D3A,
-	13790: 0x00005D52,
-	13791: 0x00005D3D,
-	13792: 0x00005D31,
-	13793: 0x00005D59,
-	13794: 0x00005D42,
-	13795: 0x00005D39,
-	13796: 0x00005D49,
-	13797: 0x00005D38,
-	13798: 0x00005D3C,
-	13799: 0x00005D32,
-	13800: 0x00005D36,
-	13801: 0x00005D40,
-	13802: 0x00005D45,
-	13803: 0x00005E44,
-	13804: 0x00005E41,
-	13805: 0x00005F58,
-	13806: 0x00005FA6,
-	13807: 0x00005FA5,
-	13808: 0x00005FAB,
-	13809: 0x000060C9,
-	13810: 0x000060B9,
-	13811: 0x000060CC,
-	13812: 0x000060E2,
-	13813: 0x000060CE,
-	13814: 0x000060C4,
-	13815: 0x00006114,
-	13816: 0x000060F2,
-	13817: 0x0000610A,
-	13818: 0x00006116,
-	13819: 0x00006105,
-	13820: 0x000060F5,
-	13821: 0x00006113,
-	13822: 0x000060F8,
-	13823: 0x000060FC,
-	13824: 0x000060FE,
-	13825: 0x000060C1,
-	13826: 0x00006103,
-	13827: 0x00006118,
-	13828: 0x0000611D,
-	13829: 0x00006110,
-	13830: 0x000060FF,
-	13831: 0x00006104,
-	13832: 0x0000610B,
-	13833: 0x0000624A,
-	13834: 0x00006394,
-	13835: 0x000063B1,
-	13836: 0x000063B0,
-	13837: 0x000063CE,
-	13838: 0x000063E5,
-	13839: 0x000063E8,
-	13840: 0x000063EF,
-	13841: 0x000063C3,
-	13842: 0x0000649D,
-	13843: 0x000063F3,
-	13844: 0x000063CA,
-	13845: 0x000063E0,
-	13846: 0x000063F6,
-	13847: 0x000063D5,
-	13848: 0x000063F2,
-	13849: 0x000063F5,
-	13850: 0x00006461,
-	13851: 0x000063DF,
-	13852: 0x000063BE,
-	13853: 0x000063DD,
-	13854: 0x000063DC,
-	13855: 0x000063C4,
-	13856: 0x000063D8,
-	13857: 0x000063D3,
-	13858: 0x000063C2,
-	13859: 0x000063C7,
-	13860: 0x000063CC,
-	13861: 0x000063CB,
-	13862: 0x000063C8,
-	13863: 0x000063F0,
-	13864: 0x000063D7,
-	13865: 0x000063D9,
-	13866: 0x00006532,
-	13867: 0x00006567,
-	13868: 0x0000656A,
-	13869: 0x00006564,
-	13870: 0x0000655C,
-	13871: 0x00006568,
-	13872: 0x00006565,
-	13873: 0x0000658C,
-	13874: 0x0000659D,
-	13875: 0x0000659E,
-	13876: 0x000065AE,
-	13877: 0x000065D0,
-	13878: 0x000065D2,
-	13879: 0x0000667C,
-	13880: 0x0000666C,
-	13881: 0x0000667B,
-	13882: 0x00006680,
-	13883: 0x00006671,
-	13884: 0x00006679,
-	13885: 0x0000666A,
-	13886: 0x00006672,
-	13887: 0x00006701,
-	13888: 0x0000690C,
-	13889: 0x000068D3,
-	13890: 0x00006904,
-	13891: 0x000068DC,
-	13892: 0x0000692A,
-	13893: 0x000068EC,
-	13894: 0x000068EA,
-	13895: 0x000068F1,
-	13896: 0x0000690F,
-	13897: 0x000068D6,
-	13898: 0x000068F7,
-	13899: 0x000068EB,
-	13900: 0x000068E4,
-	13901: 0x000068F6,
-	13902: 0x00006913,
-	13903: 0x00006910,
-	13904: 0x000068F3,
-	13905: 0x000068E1,
-	13906: 0x00006907,
-	13907: 0x000068CC,
-	13908: 0x00006908,
-	13909: 0x00006970,
-	13910: 0x000068B4,
-	13911: 0x00006911,
-	13912: 0x000068EF,
-	13913: 0x000068C6,
-	13914: 0x00006914,
-	13915: 0x000068F8,
-	13916: 0x000068D0,
-	13917: 0x000068FD,
-	13918: 0x000068FC,
-	13919: 0x000068E8,
-	13920: 0x0000690B,
-	13921: 0x0000690A,
-	13922: 0x00006917,
-	13923: 0x000068CE,
-	13924: 0x000068C8,
-	13925: 0x000068DD,
-	13926: 0x000068DE,
-	13927: 0x000068E6,
-	13928: 0x000068F4,
-	13929: 0x000068D1,
-	13930: 0x00006906,
-	13931: 0x000068D4,
-	13932: 0x000068E9,
-	13933: 0x00006915,
-	13934: 0x00006925,
-	13935: 0x000068C7,
-	13936: 0x00006B39,
-	13937: 0x00006B3B,
-	13938: 0x00006B3F,
-	13939: 0x00006B3C,
-	13940: 0x00006B94,
-	13941: 0x00006B97,
-	13942: 0x00006B99,
-	13943: 0x00006B95,
-	13944: 0x00006BBD,
-	13945: 0x00006BF0,
-	13946: 0x00006BF2,
-	13947: 0x00006BF3,
-	13948: 0x00006C30,
-	13949: 0x00006DFC,
-	13950: 0x00006E46,
-	13951: 0x00006E47,
-	13952: 0x00006E1F,
-	13953: 0x00006E49,
-	13954: 0x00006E88,
-	13955: 0x00006E3C,
-	13956: 0x00006E3D,
-	13957: 0x00006E45,
-	13958: 0x00006E62,
-	13959: 0x00006E2B,
-	13960: 0x00006E3F,
-	13961: 0x00006E41,
-	13962: 0x00006E5D,
-	13963: 0x00006E73,
-	13964: 0x00006E1C,
-	13965: 0x00006E33,
-	13966: 0x00006E4B,
-	13967: 0x00006E40,
-	13968: 0x00006E51,
-	13969: 0x00006E3B,
-	13970: 0x00006E03,
-	13971: 0x00006E2E,
-	13972: 0x00006E5E,
-	13973: 0x00006E68,
-	13974: 0x00006E5C,
-	13975: 0x00006E61,
-	13976: 0x00006E31,
-	13977: 0x00006E28,
-	13978: 0x00006E60,
-	13979: 0x00006E71,
-	13980: 0x00006E6B,
-	13981: 0x00006E39,
-	13982: 0x00006E22,
-	13983: 0x00006E30,
-	13984: 0x00006E53,
-	13985: 0x00006E65,
-	13986: 0x00006E27,
-	13987: 0x00006E78,
-	13988: 0x00006E64,
-	13989: 0x00006E77,
-	13990: 0x00006E55,
-	13991: 0x00006E79,
-	13992: 0x00006E52,
-	13993: 0x00006E66,
-	13994: 0x00006E35,
-	13995: 0x00006E36,
-	13996: 0x00006E5A,
-	13997: 0x00007120,
-	13998: 0x0000711E,
-	13999: 0x0000712F,
-	14000: 0x000070FB,
-	14001: 0x0000712E,
-	14002: 0x00007131,
-	14003: 0x00007123,
-	14004: 0x00007125,
-	14005: 0x00007122,
-	14006: 0x00007132,
-	14007: 0x0000711F,
-	14008: 0x00007128,
-	14009: 0x0000713A,
-	14010: 0x0000711B,
-	14011: 0x0000724B,
-	14012: 0x0000725A,
-	14013: 0x00007288,
-	14014: 0x00007289,
-	14015: 0x00007286,
-	14016: 0x00007285,
-	14017: 0x0000728B,
-	14018: 0x00007312,
-	14019: 0x0000730B,
-	14020: 0x00007330,
-	14021: 0x00007322,
-	14022: 0x00007331,
-	14023: 0x00007333,
-	14024: 0x00007327,
-	14025: 0x00007332,
-	14026: 0x0000732D,
-	14027: 0x00007326,
-	14028: 0x00007323,
-	14029: 0x00007335,
-	14030: 0x0000730C,
-	14031: 0x0000742E,
-	14032: 0x0000742C,
-	14033: 0x00007430,
-	14034: 0x0000742B,
-	14035: 0x00007416,
-	14036: 0x0000741A,
-	14037: 0x00007421,
-	14038: 0x0000742D,
-	14039: 0x00007431,
-	14040: 0x00007424,
-	14041: 0x00007423,
-	14042: 0x0000741D,
-	14043: 0x00007429,
-	14044: 0x00007420,
-	14045: 0x00007432,
-	14046: 0x000074FB,
-	14047: 0x0000752F,
-	14048: 0x0000756F,
-	14049: 0x0000756C,
-	14050: 0x000075E7,
-	14051: 0x000075DA,
-	14052: 0x000075E1,
-	14053: 0x000075E6,
-	14054: 0x000075DD,
-	14055: 0x000075DF,
-	14056: 0x000075E4,
-	14057: 0x000075D7,
-	14058: 0x00007695,
-	14059: 0x00007692,
-	14060: 0x000076DA,
-	14061: 0x00007746,
-	14062: 0x00007747,
-	14063: 0x00007744,
-	14064: 0x0000774D,
-	14065: 0x00007745,
-	14066: 0x0000774A,
-	14067: 0x0000774E,
-	14068: 0x0000774B,
-	14069: 0x0000774C,
-	14070: 0x000077DE,
-	14071: 0x000077EC,
-	14072: 0x00007860,
-	14073: 0x00007864,
-	14074: 0x00007865,
-	14075: 0x0000785C,
-	14076: 0x0000786D,
-	14077: 0x00007871,
-	14078: 0x0000786A,
-	14079: 0x0000786E,
-	14080: 0x00007870,
-	14081: 0x00007869,
-	14082: 0x00007868,
-	14083: 0x0000785E,
-	14084: 0x00007862,
-	14085: 0x00007974,
-	14086: 0x00007973,
-	14087: 0x00007972,
-	14088: 0x00007970,
-	14089: 0x00007A02,
-	14090: 0x00007A0A,
-	14091: 0x00007A03,
-	14092: 0x00007A0C,
-	14093: 0x00007A04,
-	14094: 0x00007A99,
-	14095: 0x00007AE6,
-	14096: 0x00007AE4,
-	14097: 0x00007B4A,
-	14098: 0x00007B3B,
-	14099: 0x00007B44,
-	14100: 0x00007B48,
-	14101: 0x00007B4C,
-	14102: 0x00007B4E,
-	14103: 0x00007B40,
-	14104: 0x00007B58,
-	14105: 0x00007B45,
-	14106: 0x00007CA2,
-	14107: 0x00007C9E,
-	14108: 0x00007CA8,
-	14109: 0x00007CA1,
-	14110: 0x00007D58,
-	14111: 0x00007D6F,
-	14112: 0x00007D63,
-	14113: 0x00007D53,
-	14114: 0x00007D56,
-	14115: 0x00007D67,
-	14116: 0x00007D6A,
-	14117: 0x00007D4F,
-	14118: 0x00007D6D,
-	14119: 0x00007D5C,
-	14120: 0x00007D6B,
-	14121: 0x00007D52,
-	14122: 0x00007D54,
-	14123: 0x00007D69,
-	14124: 0x00007D51,
-	14125: 0x00007D5F,
-	14126: 0x00007D4E,
-	14127: 0x00007F3E,
-	14128: 0x00007F3F,
-	14129: 0x00007F65,
-	14130: 0x00007F66,
-	14131: 0x00007FA2,
-	14132: 0x00007FA0,
-	14133: 0x00007FA1,
-	14134: 0x00007FD7,
-	14135: 0x00008051,
-	14136: 0x0000804F,
-	14137: 0x00008050,
-	14138: 0x000080FE,
-	14139: 0x000080D4,
-	14140: 0x00008143,
-	14141: 0x0000814A,
-	14142: 0x00008152,
-	14143: 0x0000814F,
-	14144: 0x00008147,
-	14145: 0x0000813D,
-	14146: 0x0000814D,
-	14147: 0x0000813A,
-	14148: 0x000081E6,
-	14149: 0x000081EE,
-	14150: 0x000081F7,
-	14151: 0x000081F8,
-	14152: 0x000081F9,
-	14153: 0x00008204,
-	14154: 0x0000823C,
-	14155: 0x0000823D,
-	14156: 0x0000823F,
-	14157: 0x00008275,
-	14158: 0x0000833B,
-	14159: 0x000083CF,
-	14160: 0x000083F9,
-	14161: 0x00008423,
-	14162: 0x000083C0,
-	14163: 0x000083E8,
-	14164: 0x00008412,
-	14165: 0x000083E7,
-	14166: 0x000083E4,
-	14167: 0x000083FC,
-	14168: 0x000083F6,
-	14169: 0x00008410,
-	14170: 0x000083C6,
-	14171: 0x000083C8,
-	14172: 0x000083EB,
-	14173: 0x000083E3,
-	14174: 0x000083BF,
-	14175: 0x00008401,
-	14176: 0x000083DD,
-	14177: 0x000083E5,
-	14178: 0x000083D8,
-	14179: 0x000083FF,
-	14180: 0x000083E1,
-	14181: 0x000083CB,
-	14182: 0x000083CE,
-	14183: 0x000083D6,
-	14184: 0x000083F5,
-	14185: 0x000083C9,
-	14186: 0x00008409,
-	14187: 0x0000840F,
-	14188: 0x000083DE,
-	14189: 0x00008411,
-	14190: 0x00008406,
-	14191: 0x000083C2,
-	14192: 0x000083F3,
-	14193: 0x000083D5,
-	14194: 0x000083FA,
-	14195: 0x000083C7,
-	14196: 0x000083D1,
-	14197: 0x000083EA,
-	14198: 0x00008413,
-	14199: 0x000083C3,
-	14200: 0x000083EC,
-	14201: 0x000083EE,
-	14202: 0x000083C4,
-	14203: 0x000083FB,
-	14204: 0x000083D7,
-	14205: 0x000083E2,
-	14206: 0x0000841B,
-	14207: 0x000083DB,
-	14208: 0x000083FE,
-	14209: 0x000086D8,
-	14210: 0x000086E2,
-	14211: 0x000086E6,
-	14212: 0x000086D3,
-	14213: 0x000086E3,
-	14214: 0x000086DA,
-	14215: 0x000086EA,
-	14216: 0x000086DD,
-	14217: 0x000086EB,
-	14218: 0x000086DC,
-	14219: 0x000086EC,
-	14220: 0x000086E9,
-	14221: 0x000086D7,
-	14222: 0x000086E8,
-	14223: 0x000086D1,
-	14224: 0x00008848,
-	14225: 0x00008856,
-	14226: 0x00008855,
-	14227: 0x000088BA,
-	14228: 0x000088D7,
-	14229: 0x000088B9,
-	14230: 0x000088B8,
-	14231: 0x000088C0,
-	14232: 0x000088BE,
-	14233: 0x000088B6,
-	14234: 0x000088BC,
-	14235: 0x000088B7,
-	14236: 0x000088BD,
-	14237: 0x000088B2,
-	14238: 0x00008901,
-	14239: 0x000088C9,
-	14240: 0x00008995,
-	14241: 0x00008998,
-	14242: 0x00008997,
-	14243: 0x000089DD,
-	14244: 0x000089DA,
-	14245: 0x000089DB,
-	14246: 0x00008A4E,
-	14247: 0x00008A4D,
-	14248: 0x00008A39,
-	14249: 0x00008A59,
-	14250: 0x00008A40,
-	14251: 0x00008A57,
-	14252: 0x00008A58,
-	14253: 0x00008A44,
-	14254: 0x00008A45,
-	14255: 0x00008A52,
-	14256: 0x00008A48,
-	14257: 0x00008A51,
-	14258: 0x00008A4A,
-	14259: 0x00008A4C,
-	14260: 0x00008A4F,
-	14261: 0x00008C5F,
-	14262: 0x00008C81,
-	14263: 0x00008C80,
-	14264: 0x00008CBA,
-	14265: 0x00008CBE,
-	14266: 0x00008CB0,
-	14267: 0x00008CB9,
-	14268: 0x00008CB5,
-	14269: 0x00008D84,
-	14270: 0x00008D80,
-	14271: 0x00008D89,
-	14272: 0x00008DD8,
-	14273: 0x00008DD3,
-	14274: 0x00008DCD,
-	14275: 0x00008DC7,
-	14276: 0x00008DD6,
-	14277: 0x00008DDC,
-	14278: 0x00008DCF,
-	14279: 0x00008DD5,
-	14280: 0x00008DD9,
-	14281: 0x00008DC8,
-	14282: 0x00008DD7,
-	14283: 0x00008DC5,
-	14284: 0x00008EEF,
-	14285: 0x00008EF7,
-	14286: 0x00008EFA,
-	14287: 0x00008EF9,
-	14288: 0x00008EE6,
-	14289: 0x00008EEE,
-	14290: 0x00008EE5,
-	14291: 0x00008EF5,
-	14292: 0x00008EE7,
-	14293: 0x00008EE8,
-	14294: 0x00008EF6,
-	14295: 0x00008EEB,
-	14296: 0x00008EF1,
-	14297: 0x00008EEC,
-	14298: 0x00008EF4,
-	14299: 0x00008EE9,
-	14300: 0x0000902D,
-	14301: 0x00009034,
-	14302: 0x0000902F,
-	14303: 0x00009106,
-	14304: 0x0000912C,
-	14305: 0x00009104,
-	14306: 0x000090FF,
-	14307: 0x000090FC,
-	14308: 0x00009108,
-	14309: 0x000090F9,
-	14310: 0x000090FB,
-	14311: 0x00009101,
-	14312: 0x00009100,
-	14313: 0x00009107,
-	14314: 0x00009105,
-	14315: 0x00009103,
-	14316: 0x00009161,
-	14317: 0x00009164,
-	14318: 0x0000915F,
-	14319: 0x00009162,
-	14320: 0x00009160,
-	14321: 0x00009201,
-	14322: 0x0000920A,
-	14323: 0x00009225,
-	14324: 0x00009203,
-	14325: 0x0000921A,
-	14326: 0x00009226,
-	14327: 0x0000920F,
-	14328: 0x0000920C,
-	14329: 0x00009200,
-	14330: 0x00009212,
-	14331: 0x000091FF,
-	14332: 0x000091FD,
-	14333: 0x00009206,
-	14334: 0x00009204,
-	14335: 0x00009227,
-	14336: 0x00009202,
-	14337: 0x0000921C,
-	14338: 0x00009224,
-	14339: 0x00009219,
-	14340: 0x00009217,
-	14341: 0x00009205,
-	14342: 0x00009216,
-	14343: 0x0000957B,
-	14344: 0x0000958D,
-	14345: 0x0000958C,
-	14346: 0x00009590,
-	14347: 0x00009687,
-	14348: 0x0000967E,
-	14349: 0x00009688,
-	14350: 0x00009689,
-	14351: 0x00009683,
-	14352: 0x00009680,
-	14353: 0x000096C2,
-	14354: 0x000096C8,
-	14355: 0x000096C3,
-	14356: 0x000096F1,
-	14357: 0x000096F0,
-	14358: 0x0000976C,
-	14359: 0x00009770,
-	14360: 0x0000976E,
-	14361: 0x00009807,
-	14362: 0x000098A9,
-	14363: 0x000098EB,
-	14364: 0x00009CE6,
-	14365: 0x00009EF9,
-	14366: 0x00004E83,
-	14367: 0x00004E84,
-	14368: 0x00004EB6,
-	14369: 0x000050BD,
-	14370: 0x000050BF,
-	14371: 0x000050C6,
-	14372: 0x000050AE,
-	14373: 0x000050C4,
-	14374: 0x000050CA,
-	14375: 0x000050B4,
-	14376: 0x000050C8,
-	14377: 0x000050C2,
-	14378: 0x000050B0,
-	14379: 0x000050C1,
-	14380: 0x000050BA,
-	14381: 0x000050B1,
-	14382: 0x000050CB,
-	14383: 0x000050C9,
-	14384: 0x000050B6,
-	14385: 0x000050B8,
-	14386: 0x000051D7,
-	14387: 0x0000527A,
-	14388: 0x00005278,
-	14389: 0x0000527B,
-	14390: 0x0000527C,
-	14391: 0x000055C3,
-	14392: 0x000055DB,
-	14393: 0x000055CC,
-	14394: 0x000055D0,
-	14395: 0x000055CB,
-	14396: 0x000055CA,
-	14397: 0x000055DD,
-	14398: 0x000055C0,
-	14399: 0x000055D4,
-	14400: 0x000055C4,
-	14401: 0x000055E9,
-	14402: 0x000055BF,
-	14403: 0x000055D2,
-	14404: 0x0000558D,
-	14405: 0x000055CF,
-	14406: 0x000055D5,
-	14407: 0x000055E2,
-	14408: 0x000055D6,
-	14409: 0x000055C8,
-	14410: 0x000055F2,
-	14411: 0x000055CD,
-	14412: 0x000055D9,
-	14413: 0x000055C2,
-	14414: 0x00005714,
-	14415: 0x00005853,
-	14416: 0x00005868,
-	14417: 0x00005864,
-	14418: 0x0000584F,
-	14419: 0x0000584D,
-	14420: 0x00005849,
-	14421: 0x0000586F,
-	14422: 0x00005855,
-	14423: 0x0000584E,
-	14424: 0x0000585D,
-	14425: 0x00005859,
-	14426: 0x00005865,
-	14427: 0x0000585B,
-	14428: 0x0000583D,
-	14429: 0x00005863,
-	14430: 0x00005871,
-	14431: 0x000058FC,
-	14432: 0x00005AC7,
-	14433: 0x00005AC4,
-	14434: 0x00005ACB,
-	14435: 0x00005ABA,
-	14436: 0x00005AB8,
-	14437: 0x00005AB1,
-	14438: 0x00005AB5,
-	14439: 0x00005AB0,
-	14440: 0x00005ABF,
-	14441: 0x00005AC8,
-	14442: 0x00005ABB,
-	14443: 0x00005AC6,
-	14444: 0x00005AB7,
-	14445: 0x00005AC0,
-	14446: 0x00005ACA,
-	14447: 0x00005AB4,
-	14448: 0x00005AB6,
-	14449: 0x00005ACD,
-	14450: 0x00005AB9,
-	14451: 0x00005A90,
-	14452: 0x00005BD6,
-	14453: 0x00005BD8,
-	14454: 0x00005BD9,
-	14455: 0x00005C1F,
-	14456: 0x00005C33,
-	14457: 0x00005D71,
-	14458: 0x00005D63,
-	14459: 0x00005D4A,
-	14460: 0x00005D65,
-	14461: 0x00005D72,
-	14462: 0x00005D6C,
-	14463: 0x00005D5E,
-	14464: 0x00005D68,
-	14465: 0x00005D67,
-	14466: 0x00005D62,
-	14467: 0x00005DF0,
-	14468: 0x00005E4F,
-	14469: 0x00005E4E,
-	14470: 0x00005E4A,
-	14471: 0x00005E4D,
-	14472: 0x00005E4B,
-	14473: 0x00005EC5,
-	14474: 0x00005ECC,
-	14475: 0x00005EC6,
-	14476: 0x00005ECB,
-	14477: 0x00005EC7,
-	14478: 0x00005F40,
-	14479: 0x00005FAF,
-	14480: 0x00005FAD,
-	14481: 0x000060F7,
-	14482: 0x00006149,
-	14483: 0x0000614A,
-	14484: 0x0000612B,
-	14485: 0x00006145,
-	14486: 0x00006136,
-	14487: 0x00006132,
-	14488: 0x0000612E,
-	14489: 0x00006146,
-	14490: 0x0000612F,
-	14491: 0x0000614F,
-	14492: 0x00006129,
-	14493: 0x00006140,
-	14494: 0x00006220,
-	14495: 0x00009168,
-	14496: 0x00006223,
-	14497: 0x00006225,
-	14498: 0x00006224,
-	14499: 0x000063C5,
-	14500: 0x000063F1,
-	14501: 0x000063EB,
-	14502: 0x00006410,
-	14503: 0x00006412,
-	14504: 0x00006409,
-	14505: 0x00006420,
-	14506: 0x00006424,
-	14507: 0x00006433,
-	14508: 0x00006443,
-	14509: 0x0000641F,
-	14510: 0x00006415,
-	14511: 0x00006418,
-	14512: 0x00006439,
-	14513: 0x00006437,
-	14514: 0x00006422,
-	14515: 0x00006423,
-	14516: 0x0000640C,
-	14517: 0x00006426,
-	14518: 0x00006430,
-	14519: 0x00006428,
-	14520: 0x00006441,
-	14521: 0x00006435,
-	14522: 0x0000642F,
-	14523: 0x0000640A,
-	14524: 0x0000641A,
-	14525: 0x00006440,
-	14526: 0x00006425,
-	14527: 0x00006427,
-	14528: 0x0000640B,
-	14529: 0x000063E7,
-	14530: 0x0000641B,
-	14531: 0x0000642E,
-	14532: 0x00006421,
-	14533: 0x0000640E,
-	14534: 0x0000656F,
-	14535: 0x00006592,
-	14536: 0x000065D3,
-	14537: 0x00006686,
-	14538: 0x0000668C,
-	14539: 0x00006695,
-	14540: 0x00006690,
-	14541: 0x0000668B,
-	14542: 0x0000668A,
-	14543: 0x00006699,
-	14544: 0x00006694,
-	14545: 0x00006678,
-	14546: 0x00006720,
-	14547: 0x00006966,
-	14548: 0x0000695F,
-	14549: 0x00006938,
-	14550: 0x0000694E,
-	14551: 0x00006962,
-	14552: 0x00006971,
-	14553: 0x0000693F,
-	14554: 0x00006945,
-	14555: 0x0000696A,
-	14556: 0x00006939,
-	14557: 0x00006942,
-	14558: 0x00006957,
-	14559: 0x00006959,
-	14560: 0x0000697A,
-	14561: 0x00006948,
-	14562: 0x00006949,
-	14563: 0x00006935,
-	14564: 0x0000696C,
-	14565: 0x00006933,
-	14566: 0x0000693D,
-	14567: 0x00006965,
-	14568: 0x000068F0,
-	14569: 0x00006978,
-	14570: 0x00006934,
-	14571: 0x00006969,
-	14572: 0x00006940,
-	14573: 0x0000696F,
-	14574: 0x00006944,
-	14575: 0x00006976,
-	14576: 0x00006958,
-	14577: 0x00006941,
-	14578: 0x00006974,
-	14579: 0x0000694C,
-	14580: 0x0000693B,
-	14581: 0x0000694B,
-	14582: 0x00006937,
-	14583: 0x0000695C,
-	14584: 0x0000694F,
-	14585: 0x00006951,
-	14586: 0x00006932,
-	14587: 0x00006952,
-	14588: 0x0000692F,
-	14589: 0x0000697B,
-	14590: 0x0000693C,
-	14591: 0x00006B46,
-	14592: 0x00006B45,
-	14593: 0x00006B43,
-	14594: 0x00006B42,
-	14595: 0x00006B48,
-	14596: 0x00006B41,
-	14597: 0x00006B9B,
-	14598: 0x0000FA0D,
-	14599: 0x00006BFB,
-	14600: 0x00006BFC,
-	14601: 0x00006BF9,
-	14602: 0x00006BF7,
-	14603: 0x00006BF8,
-	14604: 0x00006E9B,
-	14605: 0x00006ED6,
-	14606: 0x00006EC8,
-	14607: 0x00006E8F,
-	14608: 0x00006EC0,
-	14609: 0x00006E9F,
-	14610: 0x00006E93,
-	14611: 0x00006E94,
-	14612: 0x00006EA0,
-	14613: 0x00006EB1,
-	14614: 0x00006EB9,
-	14615: 0x00006EC6,
-	14616: 0x00006ED2,
-	14617: 0x00006EBD,
-	14618: 0x00006EC1,
-	14619: 0x00006E9E,
-	14620: 0x00006EC9,
-	14621: 0x00006EB7,
-	14622: 0x00006EB0,
-	14623: 0x00006ECD,
-	14624: 0x00006EA6,
-	14625: 0x00006ECF,
-	14626: 0x00006EB2,
-	14627: 0x00006EBE,
-	14628: 0x00006EC3,
-	14629: 0x00006EDC,
-	14630: 0x00006ED8,
-	14631: 0x00006E99,
-	14632: 0x00006E92,
-	14633: 0x00006E8E,
-	14634: 0x00006E8D,
-	14635: 0x00006EA4,
-	14636: 0x00006EA1,
-	14637: 0x00006EBF,
-	14638: 0x00006EB3,
-	14639: 0x00006ED0,
-	14640: 0x00006ECA,
-	14641: 0x00006E97,
-	14642: 0x00006EAE,
-	14643: 0x00006EA3,
-	14644: 0x00007147,
-	14645: 0x00007154,
-	14646: 0x00007152,
-	14647: 0x00007163,
-	14648: 0x00007160,
-	14649: 0x00007141,
-	14650: 0x0000715D,
-	14651: 0x00007162,
-	14652: 0x00007172,
-	14653: 0x00007178,
-	14654: 0x0000716A,
-	14655: 0x00007161,
-	14656: 0x00007142,
-	14657: 0x00007158,
-	14658: 0x00007143,
-	14659: 0x0000714B,
-	14660: 0x00007170,
-	14661: 0x0000715F,
-	14662: 0x00007150,
-	14663: 0x00007153,
-	14664: 0x00007144,
-	14665: 0x0000714D,
-	14666: 0x0000715A,
-	14667: 0x0000724F,
-	14668: 0x0000728D,
-	14669: 0x0000728C,
-	14670: 0x00007291,
-	14671: 0x00007290,
-	14672: 0x0000728E,
-	14673: 0x0000733C,
-	14674: 0x00007342,
-	14675: 0x0000733B,
-	14676: 0x0000733A,
-	14677: 0x00007340,
-	14678: 0x0000734A,
-	14679: 0x00007349,
-	14680: 0x00007444,
-	14681: 0x0000744A,
-	14682: 0x0000744B,
-	14683: 0x00007452,
-	14684: 0x00007451,
-	14685: 0x00007457,
-	14686: 0x00007440,
-	14687: 0x0000744F,
-	14688: 0x00007450,
-	14689: 0x0000744E,
-	14690: 0x00007442,
-	14691: 0x00007446,
-	14692: 0x0000744D,
-	14693: 0x00007454,
-	14694: 0x000074E1,
-	14695: 0x000074FF,
-	14696: 0x000074FE,
-	14697: 0x000074FD,
-	14698: 0x0000751D,
-	14699: 0x00007579,
-	14700: 0x00007577,
-	14701: 0x00006983,
-	14702: 0x000075EF,
-	14703: 0x0000760F,
-	14704: 0x00007603,
-	14705: 0x000075F7,
-	14706: 0x000075FE,
-	14707: 0x000075FC,
-	14708: 0x000075F9,
-	14709: 0x000075F8,
-	14710: 0x00007610,
-	14711: 0x000075FB,
-	14712: 0x000075F6,
-	14713: 0x000075ED,
-	14714: 0x000075F5,
-	14715: 0x000075FD,
-	14716: 0x00007699,
-	14717: 0x000076B5,
-	14718: 0x000076DD,
-	14719: 0x00007755,
-	14720: 0x0000775F,
-	14721: 0x00007760,
-	14722: 0x00007752,
-	14723: 0x00007756,
-	14724: 0x0000775A,
-	14725: 0x00007769,
-	14726: 0x00007767,
-	14727: 0x00007754,
-	14728: 0x00007759,
-	14729: 0x0000776D,
-	14730: 0x000077E0,
-	14731: 0x00007887,
-	14732: 0x0000789A,
-	14733: 0x00007894,
-	14734: 0x0000788F,
-	14735: 0x00007884,
-	14736: 0x00007895,
-	14737: 0x00007885,
-	14738: 0x00007886,
-	14739: 0x000078A1,
-	14740: 0x00007883,
-	14741: 0x00007879,
-	14742: 0x00007899,
-	14743: 0x00007880,
-	14744: 0x00007896,
-	14745: 0x0000787B,
-	14746: 0x0000797C,
-	14747: 0x00007982,
-	14748: 0x0000797D,
-	14749: 0x00007979,
-	14750: 0x00007A11,
-	14751: 0x00007A18,
-	14752: 0x00007A19,
-	14753: 0x00007A12,
-	14754: 0x00007A17,
-	14755: 0x00007A15,
-	14756: 0x00007A22,
-	14757: 0x00007A13,
-	14758: 0x00007A1B,
-	14759: 0x00007A10,
-	14760: 0x00007AA3,
-	14761: 0x00007AA2,
-	14762: 0x00007A9E,
-	14763: 0x00007AEB,
-	14764: 0x00007B66,
-	14765: 0x00007B64,
-	14766: 0x00007B6D,
-	14767: 0x00007B74,
-	14768: 0x00007B69,
-	14769: 0x00007B72,
-	14770: 0x00007B65,
-	14771: 0x00007B73,
-	14772: 0x00007B71,
-	14773: 0x00007B70,
-	14774: 0x00007B61,
-	14775: 0x00007B78,
-	14776: 0x00007B76,
-	14777: 0x00007B63,
-	14778: 0x00007CB2,
-	14779: 0x00007CB4,
-	14780: 0x00007CAF,
-	14781: 0x00007D88,
-	14782: 0x00007D86,
-	14783: 0x00007D80,
-	14784: 0x00007D8D,
-	14785: 0x00007D7F,
-	14786: 0x00007D85,
-	14787: 0x00007D7A,
-	14788: 0x00007D8E,
-	14789: 0x00007D7B,
-	14790: 0x00007D83,
-	14791: 0x00007D7C,
-	14792: 0x00007D8C,
-	14793: 0x00007D94,
-	14794: 0x00007D84,
-	14795: 0x00007D7D,
-	14796: 0x00007D92,
-	14797: 0x00007F6D,
-	14798: 0x00007F6B,
-	14799: 0x00007F67,
-	14800: 0x00007F68,
-	14801: 0x00007F6C,
-	14802: 0x00007FA6,
-	14803: 0x00007FA5,
-	14804: 0x00007FA7,
-	14805: 0x00007FDB,
-	14806: 0x00007FDC,
-	14807: 0x00008021,
-	14808: 0x00008164,
-	14809: 0x00008160,
-	14810: 0x00008177,
-	14811: 0x0000815C,
-	14812: 0x00008169,
-	14813: 0x0000815B,
-	14814: 0x00008162,
-	14815: 0x00008172,
-	14816: 0x00006721,
-	14817: 0x0000815E,
-	14818: 0x00008176,
-	14819: 0x00008167,
-	14820: 0x0000816F,
-	14821: 0x00008144,
-	14822: 0x00008161,
-	14823: 0x0000821D,
-	14824: 0x00008249,
-	14825: 0x00008244,
-	14826: 0x00008240,
-	14827: 0x00008242,
-	14828: 0x00008245,
-	14829: 0x000084F1,
-	14830: 0x0000843F,
-	14831: 0x00008456,
-	14832: 0x00008476,
-	14833: 0x00008479,
-	14834: 0x0000848F,
-	14835: 0x0000848D,
-	14836: 0x00008465,
-	14837: 0x00008451,
-	14838: 0x00008440,
-	14839: 0x00008486,
-	14840: 0x00008467,
-	14841: 0x00008430,
-	14842: 0x0000844D,
-	14843: 0x0000847D,
-	14844: 0x0000845A,
-	14845: 0x00008459,
-	14846: 0x00008474,
-	14847: 0x00008473,
-	14848: 0x0000845D,
-	14849: 0x00008507,
-	14850: 0x0000845E,
-	14851: 0x00008437,
-	14852: 0x0000843A,
-	14853: 0x00008434,
-	14854: 0x0000847A,
-	14855: 0x00008443,
-	14856: 0x00008478,
-	14857: 0x00008432,
-	14858: 0x00008445,
-	14859: 0x00008429,
-	14860: 0x000083D9,
-	14861: 0x0000844B,
-	14862: 0x0000842F,
-	14863: 0x00008442,
-	14864: 0x0000842D,
-	14865: 0x0000845F,
-	14866: 0x00008470,
-	14867: 0x00008439,
-	14868: 0x0000844E,
-	14869: 0x0000844C,
-	14870: 0x00008452,
-	14871: 0x0000846F,
-	14872: 0x000084C5,
-	14873: 0x0000848E,
-	14874: 0x0000843B,
-	14875: 0x00008447,
-	14876: 0x00008436,
-	14877: 0x00008433,
-	14878: 0x00008468,
-	14879: 0x0000847E,
-	14880: 0x00008444,
-	14881: 0x0000842B,
-	14882: 0x00008460,
-	14883: 0x00008454,
-	14884: 0x0000846E,
-	14885: 0x00008450,
-	14886: 0x0000870B,
-	14887: 0x00008704,
-	14888: 0x000086F7,
-	14889: 0x0000870C,
-	14890: 0x000086FA,
-	14891: 0x000086D6,
-	14892: 0x000086F5,
-	14893: 0x0000874D,
-	14894: 0x000086F8,
-	14895: 0x0000870E,
-	14896: 0x00008709,
-	14897: 0x00008701,
-	14898: 0x000086F6,
-	14899: 0x0000870D,
-	14900: 0x00008705,
-	14901: 0x000088D6,
-	14902: 0x000088CB,
-	14903: 0x000088CD,
-	14904: 0x000088CE,
-	14905: 0x000088DE,
-	14906: 0x000088DB,
-	14907: 0x000088DA,
-	14908: 0x000088CC,
-	14909: 0x000088D0,
-	14910: 0x00008985,
-	14911: 0x0000899B,
-	14912: 0x000089DF,
-	14913: 0x000089E5,
-	14914: 0x000089E4,
-	14915: 0x000089E1,
-	14916: 0x000089E0,
-	14917: 0x000089E2,
-	14918: 0x000089DC,
-	14919: 0x000089E6,
-	14920: 0x00008A76,
-	14921: 0x00008A86,
-	14922: 0x00008A7F,
-	14923: 0x00008A61,
-	14924: 0x00008A3F,
-	14925: 0x00008A77,
-	14926: 0x00008A82,
-	14927: 0x00008A84,
-	14928: 0x00008A75,
-	14929: 0x00008A83,
-	14930: 0x00008A81,
-	14931: 0x00008A74,
-	14932: 0x00008A7A,
-	14933: 0x00008C3C,
-	14934: 0x00008C4B,
-	14935: 0x00008C4A,
-	14936: 0x00008C65,
-	14937: 0x00008C64,
-	14938: 0x00008C66,
-	14939: 0x00008C86,
-	14940: 0x00008C84,
-	14941: 0x00008C85,
-	14942: 0x00008CCC,
-	14943: 0x00008D68,
-	14944: 0x00008D69,
-	14945: 0x00008D91,
-	14946: 0x00008D8C,
-	14947: 0x00008D8E,
-	14948: 0x00008D8F,
-	14949: 0x00008D8D,
-	14950: 0x00008D93,
-	14951: 0x00008D94,
-	14952: 0x00008D90,
-	14953: 0x00008D92,
-	14954: 0x00008DF0,
-	14955: 0x00008DE0,
-	14956: 0x00008DEC,
-	14957: 0x00008DF1,
-	14958: 0x00008DEE,
-	14959: 0x00008DD0,
-	14960: 0x00008DE9,
-	14961: 0x00008DE3,
-	14962: 0x00008DE2,
-	14963: 0x00008DE7,
-	14964: 0x00008DF2,
-	14965: 0x00008DEB,
-	14966: 0x00008DF4,
-	14967: 0x00008F06,
-	14968: 0x00008EFF,
-	14969: 0x00008F01,
-	14970: 0x00008F00,
-	14971: 0x00008F05,
-	14972: 0x00008F07,
-	14973: 0x00008F08,
-	14974: 0x00008F02,
-	14975: 0x00008F0B,
-	14976: 0x00009052,
-	14977: 0x0000903F,
-	14978: 0x00009044,
-	14979: 0x00009049,
-	14980: 0x0000903D,
-	14981: 0x00009110,
-	14982: 0x0000910D,
-	14983: 0x0000910F,
-	14984: 0x00009111,
-	14985: 0x00009116,
-	14986: 0x00009114,
-	14987: 0x0000910B,
-	14988: 0x0000910E,
-	14989: 0x0000916E,
-	14990: 0x0000916F,
-	14991: 0x00009248,
-	14992: 0x00009252,
-	14993: 0x00009230,
-	14994: 0x0000923A,
-	14995: 0x00009266,
-	14996: 0x00009233,
-	14997: 0x00009265,
-	14998: 0x0000925E,
-	14999: 0x00009283,
-	15000: 0x0000922E,
-	15001: 0x0000924A,
-	15002: 0x00009246,
-	15003: 0x0000926D,
-	15004: 0x0000926C,
-	15005: 0x0000924F,
-	15006: 0x00009260,
-	15007: 0x00009267,
-	15008: 0x0000926F,
-	15009: 0x00009236,
-	15010: 0x00009261,
-	15011: 0x00009270,
-	15012: 0x00009231,
-	15013: 0x00009254,
-	15014: 0x00009263,
-	15015: 0x00009250,
-	15016: 0x00009272,
-	15017: 0x0000924E,
-	15018: 0x00009253,
-	15019: 0x0000924C,
-	15020: 0x00009256,
-	15021: 0x00009232,
-	15022: 0x0000959F,
-	15023: 0x0000959C,
-	15024: 0x0000959E,
-	15025: 0x0000959B,
-	15026: 0x00009692,
-	15027: 0x00009693,
-	15028: 0x00009691,
-	15029: 0x00009697,
-	15030: 0x000096CE,
-	15031: 0x000096FA,
-	15032: 0x000096FD,
-	15033: 0x000096F8,
-	15034: 0x000096F5,
-	15035: 0x00009773,
-	15036: 0x00009777,
-	15037: 0x00009778,
-	15038: 0x00009772,
-	15039: 0x0000980F,
-	15040: 0x0000980D,
-	15041: 0x0000980E,
-	15042: 0x000098AC,
-	15043: 0x000098F6,
-	15044: 0x000098F9,
-	15045: 0x000099AF,
-	15046: 0x000099B2,
-	15047: 0x000099B0,
-	15048: 0x000099B5,
-	15049: 0x00009AAD,
-	15050: 0x00009AAB,
-	15051: 0x00009B5B,
-	15052: 0x00009CEA,
-	15053: 0x00009CED,
-	15054: 0x00009CE7,
-	15055: 0x00009E80,
-	15056: 0x00009EFD,
-	15057: 0x000050E6,
-	15058: 0x000050D4,
-	15059: 0x000050D7,
-	15060: 0x000050E8,
-	15061: 0x000050F3,
-	15062: 0x000050DB,
-	15063: 0x000050EA,
-	15064: 0x000050DD,
-	15065: 0x000050E4,
-	15066: 0x000050D3,
-	15067: 0x000050EC,
-	15068: 0x000050F0,
-	15069: 0x000050EF,
-	15070: 0x000050E3,
-	15071: 0x000050E0,
-	15072: 0x000051D8,
-	15073: 0x00005280,
-	15074: 0x00005281,
-	15075: 0x000052E9,
-	15076: 0x000052EB,
-	15077: 0x00005330,
-	15078: 0x000053AC,
-	15079: 0x00005627,
-	15080: 0x00005615,
-	15081: 0x0000560C,
-	15082: 0x00005612,
-	15083: 0x000055FC,
-	15084: 0x0000560F,
-	15085: 0x0000561C,
-	15086: 0x00005601,
-	15087: 0x00005613,
-	15088: 0x00005602,
-	15089: 0x000055FA,
-	15090: 0x0000561D,
-	15091: 0x00005604,
-	15092: 0x000055FF,
-	15093: 0x000055F9,
-	15094: 0x00005889,
-	15095: 0x0000587C,
-	15096: 0x00005890,
-	15097: 0x00005898,
-	15098: 0x00005886,
-	15099: 0x00005881,
-	15100: 0x0000587F,
-	15101: 0x00005874,
-	15102: 0x0000588B,
-	15103: 0x0000587A,
-	15104: 0x00005887,
-	15105: 0x00005891,
-	15106: 0x0000588E,
-	15107: 0x00005876,
-	15108: 0x00005882,
-	15109: 0x00005888,
-	15110: 0x0000587B,
-	15111: 0x00005894,
-	15112: 0x0000588F,
-	15113: 0x000058FE,
-	15114: 0x0000596B,
-	15115: 0x00005ADC,
-	15116: 0x00005AEE,
-	15117: 0x00005AE5,
-	15118: 0x00005AD5,
-	15119: 0x00005AEA,
-	15120: 0x00005ADA,
-	15121: 0x00005AED,
-	15122: 0x00005AEB,
-	15123: 0x00005AF3,
-	15124: 0x00005AE2,
-	15125: 0x00005AE0,
-	15126: 0x00005ADB,
-	15127: 0x00005AEC,
-	15128: 0x00005ADE,
-	15129: 0x00005ADD,
-	15130: 0x00005AD9,
-	15131: 0x00005AE8,
-	15132: 0x00005ADF,
-	15133: 0x00005B77,
-	15134: 0x00005BE0,
-	15135: 0x00005BE3,
-	15136: 0x00005C63,
-	15137: 0x00005D82,
-	15138: 0x00005D80,
-	15139: 0x00005D7D,
-	15140: 0x00005D86,
-	15141: 0x00005D7A,
-	15142: 0x00005D81,
-	15143: 0x00005D77,
-	15144: 0x00005D8A,
-	15145: 0x00005D89,
-	15146: 0x00005D88,
-	15147: 0x00005D7E,
-	15148: 0x00005D7C,
-	15149: 0x00005D8D,
-	15150: 0x00005D79,
-	15151: 0x00005D7F,
-	15152: 0x00005E58,
-	15153: 0x00005E59,
-	15154: 0x00005E53,
-	15155: 0x00005ED8,
-	15156: 0x00005ED1,
-	15157: 0x00005ED7,
-	15158: 0x00005ECE,
-	15159: 0x00005EDC,
-	15160: 0x00005ED5,
-	15161: 0x00005ED9,
-	15162: 0x00005ED2,
-	15163: 0x00005ED4,
-	15164: 0x00005F44,
-	15165: 0x00005F43,
-	15166: 0x00005F6F,
-	15167: 0x00005FB6,
-	15168: 0x0000612C,
-	15169: 0x00006128,
-	15170: 0x00006141,
-	15171: 0x0000615E,
-	15172: 0x00006171,
-	15173: 0x00006173,
-	15174: 0x00006152,
-	15175: 0x00006153,
-	15176: 0x00006172,
-	15177: 0x0000616C,
-	15178: 0x00006180,
-	15179: 0x00006174,
-	15180: 0x00006154,
-	15181: 0x0000617A,
-	15182: 0x0000615B,
-	15183: 0x00006165,
-	15184: 0x0000613B,
-	15185: 0x0000616A,
-	15186: 0x00006161,
-	15187: 0x00006156,
-	15188: 0x00006229,
-	15189: 0x00006227,
-	15190: 0x0000622B,
-	15191: 0x0000642B,
-	15192: 0x0000644D,
-	15193: 0x0000645B,
-	15194: 0x0000645D,
-	15195: 0x00006474,
-	15196: 0x00006476,
-	15197: 0x00006472,
-	15198: 0x00006473,
-	15199: 0x0000647D,
-	15200: 0x00006475,
-	15201: 0x00006466,
-	15202: 0x000064A6,
-	15203: 0x0000644E,
-	15204: 0x00006482,
-	15205: 0x0000645E,
-	15206: 0x0000645C,
-	15207: 0x0000644B,
-	15208: 0x00006453,
-	15209: 0x00006460,
-	15210: 0x00006450,
-	15211: 0x0000647F,
-	15212: 0x0000643F,
-	15213: 0x0000646C,
-	15214: 0x0000646B,
-	15215: 0x00006459,
-	15216: 0x00006465,
-	15217: 0x00006477,
-	15218: 0x00006573,
-	15219: 0x000065A0,
-	15220: 0x000066A1,
-	15221: 0x000066A0,
-	15222: 0x0000669F,
-	15223: 0x00006705,
-	15224: 0x00006704,
-	15225: 0x00006722,
-	15226: 0x000069B1,
-	15227: 0x000069B6,
-	15228: 0x000069C9,
-	15229: 0x000069A0,
-	15230: 0x000069CE,
-	15231: 0x00006996,
-	15232: 0x000069B0,
-	15233: 0x000069AC,
-	15234: 0x000069BC,
-	15235: 0x00006991,
-	15236: 0x00006999,
-	15237: 0x0000698E,
-	15238: 0x000069A7,
-	15239: 0x0000698D,
-	15240: 0x000069A9,
-	15241: 0x000069BE,
-	15242: 0x000069AF,
-	15243: 0x000069BF,
-	15244: 0x000069C4,
-	15245: 0x000069BD,
-	15246: 0x000069A4,
-	15247: 0x000069D4,
-	15248: 0x000069B9,
-	15249: 0x000069CA,
-	15250: 0x0000699A,
-	15251: 0x000069CF,
-	15252: 0x000069B3,
-	15253: 0x00006993,
-	15254: 0x000069AA,
-	15255: 0x000069A1,
-	15256: 0x0000699E,
-	15257: 0x000069D9,
-	15258: 0x00006997,
-	15259: 0x00006990,
-	15260: 0x000069C2,
-	15261: 0x000069B5,
-	15262: 0x000069A5,
-	15263: 0x000069C6,
-	15264: 0x00006B4A,
-	15265: 0x00006B4D,
-	15266: 0x00006B4B,
-	15267: 0x00006B9E,
-	15268: 0x00006B9F,
-	15269: 0x00006BA0,
-	15270: 0x00006BC3,
-	15271: 0x00006BC4,
-	15272: 0x00006BFE,
-	15273: 0x00006ECE,
-	15274: 0x00006EF5,
-	15275: 0x00006EF1,
-	15276: 0x00006F03,
-	15277: 0x00006F25,
-	15278: 0x00006EF8,
-	15279: 0x00006F37,
-	15280: 0x00006EFB,
-	15281: 0x00006F2E,
-	15282: 0x00006F09,
-	15283: 0x00006F4E,
-	15284: 0x00006F19,
-	15285: 0x00006F1A,
-	15286: 0x00006F27,
-	15287: 0x00006F18,
-	15288: 0x00006F3B,
-	15289: 0x00006F12,
-	15290: 0x00006EED,
-	15291: 0x00006F0A,
-	15292: 0x00006F36,
-	15293: 0x00006F73,
-	15294: 0x00006EF9,
-	15295: 0x00006EEE,
-	15296: 0x00006F2D,
-	15297: 0x00006F40,
-	15298: 0x00006F30,
-	15299: 0x00006F3C,
-	15300: 0x00006F35,
-	15301: 0x00006EEB,
-	15302: 0x00006F07,
-	15303: 0x00006F0E,
-	15304: 0x00006F43,
-	15305: 0x00006F05,
-	15306: 0x00006EFD,
-	15307: 0x00006EF6,
-	15308: 0x00006F39,
-	15309: 0x00006F1C,
-	15310: 0x00006EFC,
-	15311: 0x00006F3A,
-	15312: 0x00006F1F,
-	15313: 0x00006F0D,
-	15314: 0x00006F1E,
-	15315: 0x00006F08,
-	15316: 0x00006F21,
-	15317: 0x00007187,
-	15318: 0x00007190,
-	15319: 0x00007189,
-	15320: 0x00007180,
-	15321: 0x00007185,
-	15322: 0x00007182,
-	15323: 0x0000718F,
-	15324: 0x0000717B,
-	15325: 0x00007186,
-	15326: 0x00007181,
-	15327: 0x00007197,
-	15328: 0x00007244,
-	15329: 0x00007253,
-	15330: 0x00007297,
-	15331: 0x00007295,
-	15332: 0x00007293,
-	15333: 0x00007343,
-	15334: 0x0000734D,
-	15335: 0x00007351,
-	15336: 0x0000734C,
-	15337: 0x00007462,
-	15338: 0x00007473,
-	15339: 0x00007471,
-	15340: 0x00007475,
-	15341: 0x00007472,
-	15342: 0x00007467,
-	15343: 0x0000746E,
-	15344: 0x00007500,
-	15345: 0x00007502,
-	15346: 0x00007503,
-	15347: 0x0000757D,
-	15348: 0x00007590,
-	15349: 0x00007616,
-	15350: 0x00007608,
-	15351: 0x0000760C,
-	15352: 0x00007615,
-	15353: 0x00007611,
-	15354: 0x0000760A,
-	15355: 0x00007614,
-	15356: 0x000076B8,
-	15357: 0x00007781,
-	15358: 0x0000777C,
-	15359: 0x00007785,
-	15360: 0x00007782,
-	15361: 0x0000776E,
-	15362: 0x00007780,
-	15363: 0x0000776F,
-	15364: 0x0000777E,
-	15365: 0x00007783,
-	15366: 0x000078B2,
-	15367: 0x000078AA,
-	15368: 0x000078B4,
-	15369: 0x000078AD,
-	15370: 0x000078A8,
-	15371: 0x0000787E,
-	15372: 0x000078AB,
-	15373: 0x0000789E,
-	15374: 0x000078A5,
-	15375: 0x000078A0,
-	15376: 0x000078AC,
-	15377: 0x000078A2,
-	15378: 0x000078A4,
-	15379: 0x00007998,
-	15380: 0x0000798A,
-	15381: 0x0000798B,
-	15382: 0x00007996,
-	15383: 0x00007995,
-	15384: 0x00007994,
-	15385: 0x00007993,
-	15386: 0x00007997,
-	15387: 0x00007988,
-	15388: 0x00007992,
-	15389: 0x00007990,
-	15390: 0x00007A2B,
-	15391: 0x00007A4A,
-	15392: 0x00007A30,
-	15393: 0x00007A2F,
-	15394: 0x00007A28,
-	15395: 0x00007A26,
-	15396: 0x00007AA8,
-	15397: 0x00007AAB,
-	15398: 0x00007AAC,
-	15399: 0x00007AEE,
-	15400: 0x00007B88,
-	15401: 0x00007B9C,
-	15402: 0x00007B8A,
-	15403: 0x00007B91,
-	15404: 0x00007B90,
-	15405: 0x00007B96,
-	15406: 0x00007B8D,
-	15407: 0x00007B8C,
-	15408: 0x00007B9B,
-	15409: 0x00007B8E,
-	15410: 0x00007B85,
-	15411: 0x00007B98,
-	15412: 0x00005284,
-	15413: 0x00007B99,
-	15414: 0x00007BA4,
-	15415: 0x00007B82,
-	15416: 0x00007CBB,
-	15417: 0x00007CBF,
-	15418: 0x00007CBC,
-	15419: 0x00007CBA,
-	15420: 0x00007DA7,
-	15421: 0x00007DB7,
-	15422: 0x00007DC2,
-	15423: 0x00007DA3,
-	15424: 0x00007DAA,
-	15425: 0x00007DC1,
-	15426: 0x00007DC0,
-	15427: 0x00007DC5,
-	15428: 0x00007D9D,
-	15429: 0x00007DCE,
-	15430: 0x00007DC4,
-	15431: 0x00007DC6,
-	15432: 0x00007DCB,
-	15433: 0x00007DCC,
-	15434: 0x00007DAF,
-	15435: 0x00007DB9,
-	15436: 0x00007D96,
-	15437: 0x00007DBC,
-	15438: 0x00007D9F,
-	15439: 0x00007DA6,
-	15440: 0x00007DAE,
-	15441: 0x00007DA9,
-	15442: 0x00007DA1,
-	15443: 0x00007DC9,
-	15444: 0x00007F73,
-	15445: 0x00007FE2,
-	15446: 0x00007FE3,
-	15447: 0x00007FE5,
-	15448: 0x00007FDE,
-	15449: 0x00008024,
-	15450: 0x0000805D,
-	15451: 0x0000805C,
-	15452: 0x00008189,
-	15453: 0x00008186,
-	15454: 0x00008183,
-	15455: 0x00008187,
-	15456: 0x0000818D,
-	15457: 0x0000818C,
-	15458: 0x0000818B,
-	15459: 0x00008215,
-	15460: 0x00008497,
-	15461: 0x000084A4,
-	15462: 0x000084A1,
-	15463: 0x0000849F,
-	15464: 0x000084BA,
-	15465: 0x000084CE,
-	15466: 0x000084C2,
-	15467: 0x000084AC,
-	15468: 0x000084AE,
-	15469: 0x000084AB,
-	15470: 0x000084B9,
-	15471: 0x000084B4,
-	15472: 0x000084C1,
-	15473: 0x000084CD,
-	15474: 0x000084AA,
-	15475: 0x0000849A,
-	15476: 0x000084B1,
-	15477: 0x000084D0,
-	15478: 0x0000849D,
-	15479: 0x000084A7,
-	15480: 0x000084BB,
-	15481: 0x000084A2,
-	15482: 0x00008494,
-	15483: 0x000084C7,
-	15484: 0x000084CC,
-	15485: 0x0000849B,
-	15486: 0x000084A9,
-	15487: 0x000084AF,
-	15488: 0x000084A8,
-	15489: 0x000084D6,
-	15490: 0x00008498,
-	15491: 0x000084B6,
-	15492: 0x000084CF,
-	15493: 0x000084A0,
-	15494: 0x000084D7,
-	15495: 0x000084D4,
-	15496: 0x000084D2,
-	15497: 0x000084DB,
-	15498: 0x000084B0,
-	15499: 0x00008491,
-	15500: 0x00008661,
-	15501: 0x00008733,
-	15502: 0x00008723,
-	15503: 0x00008728,
-	15504: 0x0000876B,
-	15505: 0x00008740,
-	15506: 0x0000872E,
-	15507: 0x0000871E,
-	15508: 0x00008721,
-	15509: 0x00008719,
-	15510: 0x0000871B,
-	15511: 0x00008743,
-	15512: 0x0000872C,
-	15513: 0x00008741,
-	15514: 0x0000873E,
-	15515: 0x00008746,
-	15516: 0x00008720,
-	15517: 0x00008732,
-	15518: 0x0000872A,
-	15519: 0x0000872D,
-	15520: 0x0000873C,
-	15521: 0x00008712,
-	15522: 0x0000873A,
-	15523: 0x00008731,
-	15524: 0x00008735,
-	15525: 0x00008742,
-	15526: 0x00008726,
-	15527: 0x00008727,
-	15528: 0x00008738,
-	15529: 0x00008724,
-	15530: 0x0000871A,
-	15531: 0x00008730,
-	15532: 0x00008711,
-	15533: 0x000088F7,
-	15534: 0x000088E7,
-	15535: 0x000088F1,
-	15536: 0x000088F2,
-	15537: 0x000088FA,
-	15538: 0x000088FE,
-	15539: 0x000088EE,
-	15540: 0x000088FC,
-	15541: 0x000088F6,
-	15542: 0x000088FB,
-	15543: 0x000088F0,
-	15544: 0x000088EC,
-	15545: 0x000088EB,
-	15546: 0x0000899D,
-	15547: 0x000089A1,
-	15548: 0x0000899F,
-	15549: 0x0000899E,
-	15550: 0x000089E9,
-	15551: 0x000089EB,
-	15552: 0x000089E8,
-	15553: 0x00008AAB,
-	15554: 0x00008A99,
-	15555: 0x00008A8B,
-	15556: 0x00008A92,
-	15557: 0x00008A8F,
-	15558: 0x00008A96,
-	15559: 0x00008C3D,
-	15560: 0x00008C68,
-	15561: 0x00008C69,
-	15562: 0x00008CD5,
-	15563: 0x00008CCF,
-	15564: 0x00008CD7,
-	15565: 0x00008D96,
-	15566: 0x00008E09,
-	15567: 0x00008E02,
-	15568: 0x00008DFF,
-	15569: 0x00008E0D,
-	15570: 0x00008DFD,
-	15571: 0x00008E0A,
-	15572: 0x00008E03,
-	15573: 0x00008E07,
-	15574: 0x00008E06,
-	15575: 0x00008E05,
-	15576: 0x00008DFE,
-	15577: 0x00008E00,
-	15578: 0x00008E04,
-	15579: 0x00008F10,
-	15580: 0x00008F11,
-	15581: 0x00008F0E,
-	15582: 0x00008F0D,
-	15583: 0x00009123,
-	15584: 0x0000911C,
-	15585: 0x00009120,
-	15586: 0x00009122,
-	15587: 0x0000911F,
-	15588: 0x0000911D,
-	15589: 0x0000911A,
-	15590: 0x00009124,
-	15591: 0x00009121,
-	15592: 0x0000911B,
-	15593: 0x0000917A,
-	15594: 0x00009172,
-	15595: 0x00009179,
-	15596: 0x00009173,
-	15597: 0x000092A5,
-	15598: 0x000092A4,
-	15599: 0x00009276,
-	15600: 0x0000929B,
-	15601: 0x0000927A,
-	15602: 0x000092A0,
-	15603: 0x00009294,
-	15604: 0x000092AA,
-	15605: 0x0000928D,
-	15606: 0x000092A6,
-	15607: 0x0000929A,
-	15608: 0x000092AB,
-	15609: 0x00009279,
-	15610: 0x00009297,
-	15611: 0x0000927F,
-	15612: 0x000092A3,
-	15613: 0x000092EE,
-	15614: 0x0000928E,
-	15615: 0x00009282,
-	15616: 0x00009295,
-	15617: 0x000092A2,
-	15618: 0x0000927D,
-	15619: 0x00009288,
-	15620: 0x000092A1,
-	15621: 0x0000928A,
-	15622: 0x00009286,
-	15623: 0x0000928C,
-	15624: 0x00009299,
-	15625: 0x000092A7,
-	15626: 0x0000927E,
-	15627: 0x00009287,
-	15628: 0x000092A9,
-	15629: 0x0000929D,
-	15630: 0x0000928B,
-	15631: 0x0000922D,
-	15632: 0x0000969E,
-	15633: 0x000096A1,
-	15634: 0x000096FF,
-	15635: 0x00009758,
-	15636: 0x0000977D,
-	15637: 0x0000977A,
-	15638: 0x0000977E,
-	15639: 0x00009783,
-	15640: 0x00009780,
-	15641: 0x00009782,
-	15642: 0x0000977B,
-	15643: 0x00009784,
-	15644: 0x00009781,
-	15645: 0x0000977F,
-	15646: 0x000097CE,
-	15647: 0x000097CD,
-	15648: 0x00009816,
-	15649: 0x000098AD,
-	15650: 0x000098AE,
-	15651: 0x00009902,
-	15652: 0x00009900,
-	15653: 0x00009907,
-	15654: 0x0000999D,
-	15655: 0x0000999C,
-	15656: 0x000099C3,
-	15657: 0x000099B9,
-	15658: 0x000099BB,
-	15659: 0x000099BA,
-	15660: 0x000099C2,
-	15661: 0x000099BD,
-	15662: 0x000099C7,
-	15663: 0x00009AB1,
-	15664: 0x00009AE3,
-	15665: 0x00009AE7,
-	15666: 0x00009B3E,
-	15667: 0x00009B3F,
-	15668: 0x00009B60,
-	15669: 0x00009B61,
-	15670: 0x00009B5F,
-	15671: 0x00009CF1,
-	15672: 0x00009CF2,
-	15673: 0x00009CF5,
-	15674: 0x00009EA7,
-	15675: 0x000050FF,
-	15676: 0x00005103,
-	15677: 0x00005130,
-	15678: 0x000050F8,
-	15679: 0x00005106,
-	15680: 0x00005107,
-	15681: 0x000050F6,
-	15682: 0x000050FE,
-	15683: 0x0000510B,
-	15684: 0x0000510C,
-	15685: 0x000050FD,
-	15686: 0x0000510A,
-	15687: 0x0000528B,
-	15688: 0x0000528C,
-	15689: 0x000052F1,
-	15690: 0x000052EF,
-	15691: 0x00005648,
-	15692: 0x00005642,
-	15693: 0x0000564C,
-	15694: 0x00005635,
-	15695: 0x00005641,
-	15696: 0x0000564A,
-	15697: 0x00005649,
-	15698: 0x00005646,
-	15699: 0x00005658,
-	15700: 0x0000565A,
-	15701: 0x00005640,
-	15702: 0x00005633,
-	15703: 0x0000563D,
-	15704: 0x0000562C,
-	15705: 0x0000563E,
-	15706: 0x00005638,
-	15707: 0x0000562A,
-	15708: 0x0000563A,
-	15709: 0x0000571A,
-	15710: 0x000058AB,
-	15711: 0x0000589D,
-	15712: 0x000058B1,
-	15713: 0x000058A0,
-	15714: 0x000058A3,
-	15715: 0x000058AF,
-	15716: 0x000058AC,
-	15717: 0x000058A5,
-	15718: 0x000058A1,
-	15719: 0x000058FF,
-	15720: 0x00005AFF,
-	15721: 0x00005AF4,
-	15722: 0x00005AFD,
-	15723: 0x00005AF7,
-	15724: 0x00005AF6,
-	15725: 0x00005B03,
-	15726: 0x00005AF8,
-	15727: 0x00005B02,
-	15728: 0x00005AF9,
-	15729: 0x00005B01,
-	15730: 0x00005B07,
-	15731: 0x00005B05,
-	15732: 0x00005B0F,
-	15733: 0x00005C67,
-	15734: 0x00005D99,
-	15735: 0x00005D97,
-	15736: 0x00005D9F,
-	15737: 0x00005D92,
-	15738: 0x00005DA2,
-	15739: 0x00005D93,
-	15740: 0x00005D95,
-	15741: 0x00005DA0,
-	15742: 0x00005D9C,
-	15743: 0x00005DA1,
-	15744: 0x00005D9A,
-	15745: 0x00005D9E,
-	15746: 0x00005E69,
-	15747: 0x00005E5D,
-	15748: 0x00005E60,
-	15749: 0x00005E5C,
-	15750: 0x00007DF3,
-	15751: 0x00005EDB,
-	15752: 0x00005EDE,
-	15753: 0x00005EE1,
-	15754: 0x00005F49,
-	15755: 0x00005FB2,
-	15756: 0x0000618B,
-	15757: 0x00006183,
-	15758: 0x00006179,
-	15759: 0x000061B1,
-	15760: 0x000061B0,
-	15761: 0x000061A2,
-	15762: 0x00006189,
-	15763: 0x0000619B,
-	15764: 0x00006193,
-	15765: 0x000061AF,
-	15766: 0x000061AD,
-	15767: 0x0000619F,
-	15768: 0x00006192,
-	15769: 0x000061AA,
-	15770: 0x000061A1,
-	15771: 0x0000618D,
-	15772: 0x00006166,
-	15773: 0x000061B3,
-	15774: 0x0000622D,
-	15775: 0x0000646E,
-	15776: 0x00006470,
-	15777: 0x00006496,
-	15778: 0x000064A0,
-	15779: 0x00006485,
-	15780: 0x00006497,
-	15781: 0x0000649C,
-	15782: 0x0000648F,
-	15783: 0x0000648B,
-	15784: 0x0000648A,
-	15785: 0x0000648C,
-	15786: 0x000064A3,
-	15787: 0x0000649F,
-	15788: 0x00006468,
-	15789: 0x000064B1,
-	15790: 0x00006498,
-	15791: 0x00006576,
-	15792: 0x0000657A,
-	15793: 0x00006579,
-	15794: 0x0000657B,
-	15795: 0x000065B2,
-	15796: 0x000065B3,
-	15797: 0x000066B5,
-	15798: 0x000066B0,
-	15799: 0x000066A9,
-	15800: 0x000066B2,
-	15801: 0x000066B7,
-	15802: 0x000066AA,
-	15803: 0x000066AF,
-	15804: 0x00006A00,
-	15805: 0x00006A06,
-	15806: 0x00006A17,
-	15807: 0x000069E5,
-	15808: 0x000069F8,
-	15809: 0x00006A15,
-	15810: 0x000069F1,
-	15811: 0x000069E4,
-	15812: 0x00006A20,
-	15813: 0x000069FF,
-	15814: 0x000069EC,
-	15815: 0x000069E2,
-	15816: 0x00006A1B,
-	15817: 0x00006A1D,
-	15818: 0x000069FE,
-	15819: 0x00006A27,
-	15820: 0x000069F2,
-	15821: 0x000069EE,
-	15822: 0x00006A14,
-	15823: 0x000069F7,
-	15824: 0x000069E7,
-	15825: 0x00006A40,
-	15826: 0x00006A08,
-	15827: 0x000069E6,
-	15828: 0x000069FB,
-	15829: 0x00006A0D,
-	15830: 0x000069FC,
-	15831: 0x000069EB,
-	15832: 0x00006A09,
-	15833: 0x00006A04,
-	15834: 0x00006A18,
-	15835: 0x00006A25,
-	15836: 0x00006A0F,
-	15837: 0x000069F6,
-	15838: 0x00006A26,
-	15839: 0x00006A07,
-	15840: 0x000069F4,
-	15841: 0x00006A16,
-	15842: 0x00006B51,
-	15843: 0x00006BA5,
-	15844: 0x00006BA3,
-	15845: 0x00006BA2,
-	15846: 0x00006BA6,
-	15847: 0x00006C01,
-	15848: 0x00006C00,
-	15849: 0x00006BFF,
-	15850: 0x00006C02,
-	15851: 0x00006F41,
-	15852: 0x00006F26,
-	15853: 0x00006F7E,
-	15854: 0x00006F87,
-	15855: 0x00006FC6,
-	15856: 0x00006F92,
-	15857: 0x00006F8D,
-	15858: 0x00006F89,
-	15859: 0x00006F8C,
-	15860: 0x00006F62,
-	15861: 0x00006F4F,
-	15862: 0x00006F85,
-	15863: 0x00006F5A,
-	15864: 0x00006F96,
-	15865: 0x00006F76,
-	15866: 0x00006F6C,
-	15867: 0x00006F82,
-	15868: 0x00006F55,
-	15869: 0x00006F72,
-	15870: 0x00006F52,
-	15871: 0x00006F50,
-	15872: 0x00006F57,
-	15873: 0x00006F94,
-	15874: 0x00006F93,
-	15875: 0x00006F5D,
-	15876: 0x00006F00,
-	15877: 0x00006F61,
-	15878: 0x00006F6B,
-	15879: 0x00006F7D,
-	15880: 0x00006F67,
-	15881: 0x00006F90,
-	15882: 0x00006F53,
-	15883: 0x00006F8B,
-	15884: 0x00006F69,
-	15885: 0x00006F7F,
-	15886: 0x00006F95,
-	15887: 0x00006F63,
-	15888: 0x00006F77,
-	15889: 0x00006F6A,
-	15890: 0x00006F7B,
-	15891: 0x000071B2,
-	15892: 0x000071AF,
-	15893: 0x0000719B,
-	15894: 0x000071B0,
-	15895: 0x000071A0,
-	15896: 0x0000719A,
-	15897: 0x000071A9,
-	15898: 0x000071B5,
-	15899: 0x0000719D,
-	15900: 0x000071A5,
-	15901: 0x0000719E,
-	15902: 0x000071A4,
-	15903: 0x000071A1,
-	15904: 0x000071AA,
-	15905: 0x0000719C,
-	15906: 0x000071A7,
-	15907: 0x000071B3,
-	15908: 0x00007298,
-	15909: 0x0000729A,
-	15910: 0x00007358,
-	15911: 0x00007352,
-	15912: 0x0000735E,
-	15913: 0x0000735F,
-	15914: 0x00007360,
-	15915: 0x0000735D,
-	15916: 0x0000735B,
-	15917: 0x00007361,
-	15918: 0x0000735A,
-	15919: 0x00007359,
-	15920: 0x00007362,
-	15921: 0x00007487,
-	15922: 0x00007489,
-	15923: 0x0000748A,
-	15924: 0x00007486,
-	15925: 0x00007481,
-	15926: 0x0000747D,
-	15927: 0x00007485,
-	15928: 0x00007488,
-	15929: 0x0000747C,
-	15930: 0x00007479,
-	15931: 0x00007508,
-	15932: 0x00007507,
-	15933: 0x0000757E,
-	15934: 0x00007625,
-	15935: 0x0000761E,
-	15936: 0x00007619,
-	15937: 0x0000761D,
-	15938: 0x0000761C,
-	15939: 0x00007623,
-	15940: 0x0000761A,
-	15941: 0x00007628,
-	15942: 0x0000761B,
-	15943: 0x0000769C,
-	15944: 0x0000769D,
-	15945: 0x0000769E,
-	15946: 0x0000769B,
-	15947: 0x0000778D,
-	15948: 0x0000778F,
-	15949: 0x00007789,
-	15950: 0x00007788,
-	15951: 0x000078CD,
-	15952: 0x000078BB,
-	15953: 0x000078CF,
-	15954: 0x000078CC,
-	15955: 0x000078D1,
-	15956: 0x000078CE,
-	15957: 0x000078D4,
-	15958: 0x000078C8,
-	15959: 0x000078C3,
-	15960: 0x000078C4,
-	15961: 0x000078C9,
-	15962: 0x0000799A,
-	15963: 0x000079A1,
-	15964: 0x000079A0,
-	15965: 0x0000799C,
-	15966: 0x000079A2,
-	15967: 0x0000799B,
-	15968: 0x00006B76,
-	15969: 0x00007A39,
-	15970: 0x00007AB2,
-	15971: 0x00007AB4,
-	15972: 0x00007AB3,
-	15973: 0x00007BB7,
-	15974: 0x00007BCB,
-	15975: 0x00007BBE,
-	15976: 0x00007BAC,
-	15977: 0x00007BCE,
-	15978: 0x00007BAF,
-	15979: 0x00007BB9,
-	15980: 0x00007BCA,
-	15981: 0x00007BB5,
-	15982: 0x00007CC5,
-	15983: 0x00007CC8,
-	15984: 0x00007CCC,
-	15985: 0x00007CCB,
-	15986: 0x00007DF7,
-	15987: 0x00007DDB,
-	15988: 0x00007DEA,
-	15989: 0x00007DE7,
-	15990: 0x00007DD7,
-	15991: 0x00007DE1,
-	15992: 0x00007E03,
-	15993: 0x00007DFA,
-	15994: 0x00007DE6,
-	15995: 0x00007DF6,
-	15996: 0x00007DF1,
-	15997: 0x00007DF0,
-	15998: 0x00007DEE,
-	15999: 0x00007DDF,
-	16000: 0x00007F76,
-	16001: 0x00007FAC,
-	16002: 0x00007FB0,
-	16003: 0x00007FAD,
-	16004: 0x00007FED,
-	16005: 0x00007FEB,
-	16006: 0x00007FEA,
-	16007: 0x00007FEC,
-	16008: 0x00007FE6,
-	16009: 0x00007FE8,
-	16010: 0x00008064,
-	16011: 0x00008067,
-	16012: 0x000081A3,
-	16013: 0x0000819F,
-	16014: 0x0000819E,
-	16015: 0x00008195,
-	16016: 0x000081A2,
-	16017: 0x00008199,
-	16018: 0x00008197,
-	16019: 0x00008216,
-	16020: 0x0000824F,
-	16021: 0x00008253,
-	16022: 0x00008252,
-	16023: 0x00008250,
-	16024: 0x0000824E,
-	16025: 0x00008251,
-	16026: 0x00008524,
-	16027: 0x0000853B,
-	16028: 0x0000850F,
-	16029: 0x00008500,
-	16030: 0x00008529,
-	16031: 0x0000850E,
-	16032: 0x00008509,
-	16033: 0x0000850D,
-	16034: 0x0000851F,
-	16035: 0x0000850A,
-	16036: 0x00008527,
-	16037: 0x0000851C,
-	16038: 0x000084FB,
-	16039: 0x0000852B,
-	16040: 0x000084FA,
-	16041: 0x00008508,
-	16042: 0x0000850C,
-	16043: 0x000084F4,
-	16044: 0x0000852A,
-	16045: 0x000084F2,
-	16046: 0x00008515,
-	16047: 0x000084F7,
-	16048: 0x000084EB,
-	16049: 0x000084F3,
-	16050: 0x000084FC,
-	16051: 0x00008512,
-	16052: 0x000084EA,
-	16053: 0x000084E9,
-	16054: 0x00008516,
-	16055: 0x000084FE,
-	16056: 0x00008528,
-	16057: 0x0000851D,
-	16058: 0x0000852E,
-	16059: 0x00008502,
-	16060: 0x000084FD,
-	16061: 0x0000851E,
-	16062: 0x000084F6,
-	16063: 0x00008531,
-	16064: 0x00008526,
-	16065: 0x000084E7,
-	16066: 0x000084E8,
-	16067: 0x000084F0,
-	16068: 0x000084EF,
-	16069: 0x000084F9,
-	16070: 0x00008518,
-	16071: 0x00008520,
-	16072: 0x00008530,
-	16073: 0x0000850B,
-	16074: 0x00008519,
-	16075: 0x0000852F,
-	16076: 0x00008662,
-	16077: 0x00008756,
-	16078: 0x00008763,
-	16079: 0x00008764,
-	16080: 0x00008777,
-	16081: 0x000087E1,
-	16082: 0x00008773,
-	16083: 0x00008758,
-	16084: 0x00008754,
-	16085: 0x0000875B,
-	16086: 0x00008752,
-	16087: 0x00008761,
-	16088: 0x0000875A,
-	16089: 0x00008751,
-	16090: 0x0000875E,
-	16091: 0x0000876D,
-	16092: 0x0000876A,
-	16093: 0x00008750,
-	16094: 0x0000874E,
-	16095: 0x0000875F,
-	16096: 0x0000875D,
-	16097: 0x0000876F,
-	16098: 0x0000876C,
-	16099: 0x0000877A,
-	16100: 0x0000876E,
-	16101: 0x0000875C,
-	16102: 0x00008765,
-	16103: 0x0000874F,
-	16104: 0x0000877B,
-	16105: 0x00008775,
-	16106: 0x00008762,
-	16107: 0x00008767,
-	16108: 0x00008769,
-	16109: 0x0000885A,
-	16110: 0x00008905,
-	16111: 0x0000890C,
-	16112: 0x00008914,
-	16113: 0x0000890B,
-	16114: 0x00008917,
-	16115: 0x00008918,
-	16116: 0x00008919,
-	16117: 0x00008906,
-	16118: 0x00008916,
-	16119: 0x00008911,
-	16120: 0x0000890E,
-	16121: 0x00008909,
-	16122: 0x000089A2,
-	16123: 0x000089A4,
-	16124: 0x000089A3,
-	16125: 0x000089ED,
-	16126: 0x000089F0,
-	16127: 0x000089EC,
-	16128: 0x00008ACF,
-	16129: 0x00008AC6,
-	16130: 0x00008AB8,
-	16131: 0x00008AD3,
-	16132: 0x00008AD1,
-	16133: 0x00008AD4,
-	16134: 0x00008AD5,
-	16135: 0x00008ABB,
-	16136: 0x00008AD7,
-	16137: 0x00008ABE,
-	16138: 0x00008AC0,
-	16139: 0x00008AC5,
-	16140: 0x00008AD8,
-	16141: 0x00008AC3,
-	16142: 0x00008ABA,
-	16143: 0x00008ABD,
-	16144: 0x00008AD9,
-	16145: 0x00008C3E,
-	16146: 0x00008C4D,
-	16147: 0x00008C8F,
-	16148: 0x00008CE5,
-	16149: 0x00008CDF,
-	16150: 0x00008CD9,
-	16151: 0x00008CE8,
-	16152: 0x00008CDA,
-	16153: 0x00008CDD,
-	16154: 0x00008CE7,
-	16155: 0x00008DA0,
-	16156: 0x00008D9C,
-	16157: 0x00008DA1,
-	16158: 0x00008D9B,
-	16159: 0x00008E20,
-	16160: 0x00008E23,
-	16161: 0x00008E25,
-	16162: 0x00008E24,
-	16163: 0x00008E2E,
-	16164: 0x00008E15,
-	16165: 0x00008E1B,
-	16166: 0x00008E16,
-	16167: 0x00008E11,
-	16168: 0x00008E19,
-	16169: 0x00008E26,
-	16170: 0x00008E27,
-	16171: 0x00008E14,
-	16172: 0x00008E12,
-	16173: 0x00008E18,
-	16174: 0x00008E13,
-	16175: 0x00008E1C,
-	16176: 0x00008E17,
-	16177: 0x00008E1A,
-	16178: 0x00008F2C,
-	16179: 0x00008F24,
-	16180: 0x00008F18,
-	16181: 0x00008F1A,
-	16182: 0x00008F20,
-	16183: 0x00008F23,
-	16184: 0x00008F16,
-	16185: 0x00008F17,
-	16186: 0x00009073,
-	16187: 0x00009070,
-	16188: 0x0000906F,
-	16189: 0x00009067,
-	16190: 0x0000906B,
-	16191: 0x0000912F,
-	16192: 0x0000912B,
-	16193: 0x00009129,
-	16194: 0x0000912A,
-	16195: 0x00009132,
-	16196: 0x00009126,
-	16197: 0x0000912E,
-	16198: 0x00009185,
-	16199: 0x00009186,
-	16200: 0x0000918A,
-	16201: 0x00009181,
-	16202: 0x00009182,
-	16203: 0x00009184,
-	16204: 0x00009180,
-	16205: 0x000092D0,
-	16206: 0x000092C3,
-	16207: 0x000092C4,
-	16208: 0x000092C0,
-	16209: 0x000092D9,
-	16210: 0x000092B6,
-	16211: 0x000092CF,
-	16212: 0x000092F1,
-	16213: 0x000092DF,
-	16214: 0x000092D8,
-	16215: 0x000092E9,
-	16216: 0x000092D7,
-	16217: 0x000092DD,
-	16218: 0x000092CC,
-	16219: 0x000092EF,
-	16220: 0x000092C2,
-	16221: 0x000092E8,
-	16222: 0x000092CA,
-	16223: 0x000092C8,
-	16224: 0x000092CE,
-	16225: 0x000092E6,
-	16226: 0x000092CD,
-	16227: 0x000092D5,
-	16228: 0x000092C9,
-	16229: 0x000092E0,
-	16230: 0x000092DE,
-	16231: 0x000092E7,
-	16232: 0x000092D1,
-	16233: 0x000092D3,
-	16234: 0x000092B5,
-	16235: 0x000092E1,
-	16236: 0x000092C6,
-	16237: 0x000092B4,
-	16238: 0x0000957C,
-	16239: 0x000095AC,
-	16240: 0x000095AB,
-	16241: 0x000095AE,
-	16242: 0x000095B0,
-	16243: 0x000096A4,
-	16244: 0x000096A2,
-	16245: 0x000096D3,
-	16246: 0x00009705,
-	16247: 0x00009708,
-	16248: 0x00009702,
-	16249: 0x0000975A,
-	16250: 0x0000978A,
-	16251: 0x0000978E,
-	16252: 0x00009788,
-	16253: 0x000097D0,
-	16254: 0x000097CF,
-	16255: 0x0000981E,
-	16256: 0x0000981D,
-	16257: 0x00009826,
-	16258: 0x00009829,
-	16259: 0x00009828,
-	16260: 0x00009820,
-	16261: 0x0000981B,
-	16262: 0x00009827,
-	16263: 0x000098B2,
-	16264: 0x00009908,
-	16265: 0x000098FA,
-	16266: 0x00009911,
-	16267: 0x00009914,
-	16268: 0x00009916,
-	16269: 0x00009917,
-	16270: 0x00009915,
-	16271: 0x000099DC,
-	16272: 0x000099CD,
-	16273: 0x000099CF,
-	16274: 0x000099D3,
-	16275: 0x000099D4,
-	16276: 0x000099CE,
-	16277: 0x000099C9,
-	16278: 0x000099D6,
-	16279: 0x000099D8,
-	16280: 0x000099CB,
-	16281: 0x000099D7,
-	16282: 0x000099CC,
-	16283: 0x00009AB3,
-	16284: 0x00009AEC,
-	16285: 0x00009AEB,
-	16286: 0x00009AF3,
-	16287: 0x00009AF2,
-	16288: 0x00009AF1,
-	16289: 0x00009B46,
-	16290: 0x00009B43,
-	16291: 0x00009B67,
-	16292: 0x00009B74,
-	16293: 0x00009B71,
-	16294: 0x00009B66,
-	16295: 0x00009B76,
-	16296: 0x00009B75,
-	16297: 0x00009B70,
-	16298: 0x00009B68,
-	16299: 0x00009B64,
-	16300: 0x00009B6C,
-	16301: 0x00009CFC,
-	16302: 0x00009CFA,
-	16303: 0x00009CFD,
-	16304: 0x00009CFF,
-	16305: 0x00009CF7,
-	16306: 0x00009D07,
-	16307: 0x00009D00,
-	16308: 0x00009CF9,
-	16309: 0x00009CFB,
-	16310: 0x00009D08,
-	16311: 0x00009D05,
-	16312: 0x00009D04,
-	16313: 0x00009E83,
-	16314: 0x00009ED3,
-	16315: 0x00009F0F,
-	16316: 0x00009F10,
-	16317: 0x0000511C,
-	16318: 0x00005113,
-	16319: 0x00005117,
-	16320: 0x0000511A,
-	16321: 0x00005111,
-	16322: 0x000051DE,
-	16323: 0x00005334,
-	16324: 0x000053E1,
-	16325: 0x00005670,
-	16326: 0x00005660,
-	16327: 0x0000566E,
-	16328: 0x00005673,
-	16329: 0x00005666,
-	16330: 0x00005663,
-	16331: 0x0000566D,
-	16332: 0x00005672,
-	16333: 0x0000565E,
-	16334: 0x00005677,
-	16335: 0x0000571C,
-	16336: 0x0000571B,
-	16337: 0x000058C8,
-	16338: 0x000058BD,
-	16339: 0x000058C9,
-	16340: 0x000058BF,
-	16341: 0x000058BA,
-	16342: 0x000058C2,
-	16343: 0x000058BC,
-	16344: 0x000058C6,
-	16345: 0x00005B17,
-	16346: 0x00005B19,
-	16347: 0x00005B1B,
-	16348: 0x00005B21,
-	16349: 0x00005B14,
-	16350: 0x00005B13,
-	16351: 0x00005B10,
-	16352: 0x00005B16,
-	16353: 0x00005B28,
-	16354: 0x00005B1A,
-	16355: 0x00005B20,
-	16356: 0x00005B1E,
-	16357: 0x00005BEF,
-	16358: 0x00005DAC,
-	16359: 0x00005DB1,
-	16360: 0x00005DA9,
-	16361: 0x00005DA7,
-	16362: 0x00005DB5,
-	16363: 0x00005DB0,
-	16364: 0x00005DAE,
-	16365: 0x00005DAA,
-	16366: 0x00005DA8,
-	16367: 0x00005DB2,
-	16368: 0x00005DAD,
-	16369: 0x00005DAF,
-	16370: 0x00005DB4,
-	16371: 0x00005E67,
-	16372: 0x00005E68,
-	16373: 0x00005E66,
-	16374: 0x00005E6F,
-	16375: 0x00005EE9,
-	16376: 0x00005EE7,
-	16377: 0x00005EE6,
-	16378: 0x00005EE8,
-	16379: 0x00005EE5,
-	16380: 0x00005F4B,
-	16381: 0x00005FBC,
-	16382: 0x0000619D,
-	16383: 0x000061A8,
-	16384: 0x00006196,
-	16385: 0x000061C5,
-	16386: 0x000061B4,
-	16387: 0x000061C6,
-	16388: 0x000061C1,
-	16389: 0x000061CC,
-	16390: 0x000061BA,
-	16391: 0x000061BF,
-	16392: 0x000061B8,
-	16393: 0x0000618C,
-	16394: 0x000064D7,
-	16395: 0x000064D6,
-	16396: 0x000064D0,
-	16397: 0x000064CF,
-	16398: 0x000064C9,
-	16399: 0x000064BD,
-	16400: 0x00006489,
-	16401: 0x000064C3,
-	16402: 0x000064DB,
-	16403: 0x000064F3,
-	16404: 0x000064D9,
-	16405: 0x00006533,
-	16406: 0x0000657F,
-	16407: 0x0000657C,
-	16408: 0x000065A2,
-	16409: 0x000066C8,
-	16410: 0x000066BE,
-	16411: 0x000066C0,
-	16412: 0x000066CA,
-	16413: 0x000066CB,
-	16414: 0x000066CF,
-	16415: 0x000066BD,
-	16416: 0x000066BB,
-	16417: 0x000066BA,
-	16418: 0x000066CC,
-	16419: 0x00006723,
-	16420: 0x00006A34,
-	16421: 0x00006A66,
-	16422: 0x00006A49,
-	16423: 0x00006A67,
-	16424: 0x00006A32,
-	16425: 0x00006A68,
-	16426: 0x00006A3E,
-	16427: 0x00006A5D,
-	16428: 0x00006A6D,
-	16429: 0x00006A76,
-	16430: 0x00006A5B,
-	16431: 0x00006A51,
-	16432: 0x00006A28,
-	16433: 0x00006A5A,
-	16434: 0x00006A3B,
-	16435: 0x00006A3F,
-	16436: 0x00006A41,
-	16437: 0x00006A6A,
-	16438: 0x00006A64,
-	16439: 0x00006A50,
-	16440: 0x00006A4F,
-	16441: 0x00006A54,
-	16442: 0x00006A6F,
-	16443: 0x00006A69,
-	16444: 0x00006A60,
-	16445: 0x00006A3C,
-	16446: 0x00006A5E,
-	16447: 0x00006A56,
-	16448: 0x00006A55,
-	16449: 0x00006A4D,
-	16450: 0x00006A4E,
-	16451: 0x00006A46,
-	16452: 0x00006B55,
-	16453: 0x00006B54,
-	16454: 0x00006B56,
-	16455: 0x00006BA7,
-	16456: 0x00006BAA,
-	16457: 0x00006BAB,
-	16458: 0x00006BC8,
-	16459: 0x00006BC7,
-	16460: 0x00006C04,
-	16461: 0x00006C03,
-	16462: 0x00006C06,
-	16463: 0x00006FAD,
-	16464: 0x00006FCB,
-	16465: 0x00006FA3,
-	16466: 0x00006FC7,
-	16467: 0x00006FBC,
-	16468: 0x00006FCE,
-	16469: 0x00006FC8,
-	16470: 0x00006F5E,
-	16471: 0x00006FC4,
-	16472: 0x00006FBD,
-	16473: 0x00006F9E,
-	16474: 0x00006FCA,
-	16475: 0x00006FA8,
-	16476: 0x00007004,
-	16477: 0x00006FA5,
-	16478: 0x00006FAE,
-	16479: 0x00006FBA,
-	16480: 0x00006FAC,
-	16481: 0x00006FAA,
-	16482: 0x00006FCF,
-	16483: 0x00006FBF,
-	16484: 0x00006FB8,
-	16485: 0x00006FA2,
-	16486: 0x00006FC9,
-	16487: 0x00006FAB,
-	16488: 0x00006FCD,
-	16489: 0x00006FAF,
-	16490: 0x00006FB2,
-	16491: 0x00006FB0,
-	16492: 0x000071C5,
-	16493: 0x000071C2,
-	16494: 0x000071BF,
-	16495: 0x000071B8,
-	16496: 0x000071D6,
-	16497: 0x000071C0,
-	16498: 0x000071C1,
-	16499: 0x000071CB,
-	16500: 0x000071D4,
-	16501: 0x000071CA,
-	16502: 0x000071C7,
-	16503: 0x000071CF,
-	16504: 0x000071BD,
-	16505: 0x000071D8,
-	16506: 0x000071BC,
-	16507: 0x000071C6,
-	16508: 0x000071DA,
-	16509: 0x000071DB,
-	16510: 0x0000729D,
-	16511: 0x0000729E,
-	16512: 0x00007369,
-	16513: 0x00007366,
-	16514: 0x00007367,
-	16515: 0x0000736C,
-	16516: 0x00007365,
-	16517: 0x0000736B,
-	16518: 0x0000736A,
-	16519: 0x0000747F,
-	16520: 0x0000749A,
-	16521: 0x000074A0,
-	16522: 0x00007494,
-	16523: 0x00007492,
-	16524: 0x00007495,
-	16525: 0x000074A1,
-	16526: 0x0000750B,
-	16527: 0x00007580,
-	16528: 0x0000762F,
-	16529: 0x0000762D,
-	16530: 0x00007631,
-	16531: 0x0000763D,
-	16532: 0x00007633,
-	16533: 0x0000763C,
-	16534: 0x00007635,
-	16535: 0x00007632,
-	16536: 0x00007630,
-	16537: 0x000076BB,
-	16538: 0x000076E6,
-	16539: 0x0000779A,
-	16540: 0x0000779D,
-	16541: 0x000077A1,
-	16542: 0x0000779C,
-	16543: 0x0000779B,
-	16544: 0x000077A2,
-	16545: 0x000077A3,
-	16546: 0x00007795,
-	16547: 0x00007799,
-	16548: 0x00007797,
-	16549: 0x000078DD,
-	16550: 0x000078E9,
-	16551: 0x000078E5,
-	16552: 0x000078EA,
-	16553: 0x000078DE,
-	16554: 0x000078E3,
-	16555: 0x000078DB,
-	16556: 0x000078E1,
-	16557: 0x000078E2,
-	16558: 0x000078ED,
-	16559: 0x000078DF,
-	16560: 0x000078E0,
-	16561: 0x000079A4,
-	16562: 0x00007A44,
-	16563: 0x00007A48,
-	16564: 0x00007A47,
-	16565: 0x00007AB6,
-	16566: 0x00007AB8,
-	16567: 0x00007AB5,
-	16568: 0x00007AB1,
-	16569: 0x00007AB7,
-	16570: 0x00007BDE,
-	16571: 0x00007BE3,
-	16572: 0x00007BE7,
-	16573: 0x00007BDD,
-	16574: 0x00007BD5,
-	16575: 0x00007BE5,
-	16576: 0x00007BDA,
-	16577: 0x00007BE8,
-	16578: 0x00007BF9,
-	16579: 0x00007BD4,
-	16580: 0x00007BEA,
-	16581: 0x00007BE2,
-	16582: 0x00007BDC,
-	16583: 0x00007BEB,
-	16584: 0x00007BD8,
-	16585: 0x00007BDF,
-	16586: 0x00007CD2,
-	16587: 0x00007CD4,
-	16588: 0x00007CD7,
-	16589: 0x00007CD0,
-	16590: 0x00007CD1,
-	16591: 0x00007E12,
-	16592: 0x00007E21,
-	16593: 0x00007E17,
-	16594: 0x00007E0C,
-	16595: 0x00007E1F,
-	16596: 0x00007E20,
-	16597: 0x00007E13,
-	16598: 0x00007E0E,
-	16599: 0x00007E1C,
-	16600: 0x00007E15,
-	16601: 0x00007E1A,
-	16602: 0x00007E22,
-	16603: 0x00007E0B,
-	16604: 0x00007E0F,
-	16605: 0x00007E16,
-	16606: 0x00007E0D,
-	16607: 0x00007E14,
-	16608: 0x00007E25,
-	16609: 0x00007E24,
-	16610: 0x00007F43,
-	16611: 0x00007F7B,
-	16612: 0x00007F7C,
-	16613: 0x00007F7A,
-	16614: 0x00007FB1,
-	16615: 0x00007FEF,
-	16616: 0x0000802A,
-	16617: 0x00008029,
-	16618: 0x0000806C,
-	16619: 0x000081B1,
-	16620: 0x000081A6,
-	16621: 0x000081AE,
-	16622: 0x000081B9,
-	16623: 0x000081B5,
-	16624: 0x000081AB,
-	16625: 0x000081B0,
-	16626: 0x000081AC,
-	16627: 0x000081B4,
-	16628: 0x000081B2,
-	16629: 0x000081B7,
-	16630: 0x000081A7,
-	16631: 0x000081F2,
-	16632: 0x00008255,
-	16633: 0x00008256,
-	16634: 0x00008257,
-	16635: 0x00008556,
-	16636: 0x00008545,
-	16637: 0x0000856B,
-	16638: 0x0000854D,
-	16639: 0x00008553,
-	16640: 0x00008561,
-	16641: 0x00008558,
-	16642: 0x00008540,
-	16643: 0x00008546,
-	16644: 0x00008564,
-	16645: 0x00008541,
-	16646: 0x00008562,
-	16647: 0x00008544,
-	16648: 0x00008551,
-	16649: 0x00008547,
-	16650: 0x00008563,
-	16651: 0x0000853E,
-	16652: 0x0000855B,
-	16653: 0x00008571,
-	16654: 0x0000854E,
-	16655: 0x0000856E,
-	16656: 0x00008575,
-	16657: 0x00008555,
-	16658: 0x00008567,
-	16659: 0x00008560,
-	16660: 0x0000858C,
-	16661: 0x00008566,
-	16662: 0x0000855D,
-	16663: 0x00008554,
-	16664: 0x00008565,
-	16665: 0x0000856C,
-	16666: 0x00008663,
-	16667: 0x00008665,
-	16668: 0x00008664,
-	16669: 0x0000879B,
-	16670: 0x0000878F,
-	16671: 0x00008797,
-	16672: 0x00008793,
-	16673: 0x00008792,
-	16674: 0x00008788,
-	16675: 0x00008781,
-	16676: 0x00008796,
-	16677: 0x00008798,
-	16678: 0x00008779,
-	16679: 0x00008787,
-	16680: 0x000087A3,
-	16681: 0x00008785,
-	16682: 0x00008790,
-	16683: 0x00008791,
-	16684: 0x0000879D,
-	16685: 0x00008784,
-	16686: 0x00008794,
-	16687: 0x0000879C,
-	16688: 0x0000879A,
-	16689: 0x00008789,
-	16690: 0x0000891E,
-	16691: 0x00008926,
-	16692: 0x00008930,
-	16693: 0x0000892D,
-	16694: 0x0000892E,
-	16695: 0x00008927,
-	16696: 0x00008931,
-	16697: 0x00008922,
-	16698: 0x00008929,
-	16699: 0x00008923,
-	16700: 0x0000892F,
-	16701: 0x0000892C,
-	16702: 0x0000891F,
-	16703: 0x000089F1,
-	16704: 0x00008AE0,
-	16705: 0x00008AE2,
-	16706: 0x00008AF2,
-	16707: 0x00008AF4,
-	16708: 0x00008AF5,
-	16709: 0x00008ADD,
-	16710: 0x00008B14,
-	16711: 0x00008AE4,
-	16712: 0x00008ADF,
-	16713: 0x00008AF0,
-	16714: 0x00008AC8,
-	16715: 0x00008ADE,
-	16716: 0x00008AE1,
-	16717: 0x00008AE8,
-	16718: 0x00008AFF,
-	16719: 0x00008AEF,
-	16720: 0x00008AFB,
-	16721: 0x00008C91,
-	16722: 0x00008C92,
-	16723: 0x00008C90,
-	16724: 0x00008CF5,
-	16725: 0x00008CEE,
-	16726: 0x00008CF1,
-	16727: 0x00008CF0,
-	16728: 0x00008CF3,
-	16729: 0x00008D6C,
-	16730: 0x00008D6E,
-	16731: 0x00008DA5,
-	16732: 0x00008DA7,
-	16733: 0x00008E33,
-	16734: 0x00008E3E,
-	16735: 0x00008E38,
-	16736: 0x00008E40,
-	16737: 0x00008E45,
-	16738: 0x00008E36,
-	16739: 0x00008E3C,
-	16740: 0x00008E3D,
-	16741: 0x00008E41,
-	16742: 0x00008E30,
-	16743: 0x00008E3F,
-	16744: 0x00008EBD,
-	16745: 0x00008F36,
-	16746: 0x00008F2E,
-	16747: 0x00008F35,
-	16748: 0x00008F32,
-	16749: 0x00008F39,
-	16750: 0x00008F37,
-	16751: 0x00008F34,
-	16752: 0x00009076,
-	16753: 0x00009079,
-	16754: 0x0000907B,
-	16755: 0x00009086,
-	16756: 0x000090FA,
-	16757: 0x00009133,
-	16758: 0x00009135,
-	16759: 0x00009136,
-	16760: 0x00009193,
-	16761: 0x00009190,
-	16762: 0x00009191,
-	16763: 0x0000918D,
-	16764: 0x0000918F,
-	16765: 0x00009327,
-	16766: 0x0000931E,
-	16767: 0x00009308,
-	16768: 0x0000931F,
-	16769: 0x00009306,
-	16770: 0x0000930F,
-	16771: 0x0000937A,
-	16772: 0x00009338,
-	16773: 0x0000933C,
-	16774: 0x0000931B,
-	16775: 0x00009323,
-	16776: 0x00009312,
-	16777: 0x00009301,
-	16778: 0x00009346,
-	16779: 0x0000932D,
-	16780: 0x0000930E,
-	16781: 0x0000930D,
-	16782: 0x000092CB,
-	16783: 0x0000931D,
-	16784: 0x000092FA,
-	16785: 0x00009325,
-	16786: 0x00009313,
-	16787: 0x000092F9,
-	16788: 0x000092F7,
-	16789: 0x00009334,
-	16790: 0x00009302,
-	16791: 0x00009324,
-	16792: 0x000092FF,
-	16793: 0x00009329,
-	16794: 0x00009339,
-	16795: 0x00009335,
-	16796: 0x0000932A,
-	16797: 0x00009314,
-	16798: 0x0000930C,
-	16799: 0x0000930B,
-	16800: 0x000092FE,
-	16801: 0x00009309,
-	16802: 0x00009300,
-	16803: 0x000092FB,
-	16804: 0x00009316,
-	16805: 0x000095BC,
-	16806: 0x000095CD,
-	16807: 0x000095BE,
-	16808: 0x000095B9,
-	16809: 0x000095BA,
-	16810: 0x000095B6,
-	16811: 0x000095BF,
-	16812: 0x000095B5,
-	16813: 0x000095BD,
-	16814: 0x000096A9,
-	16815: 0x000096D4,
-	16816: 0x0000970B,
-	16817: 0x00009712,
-	16818: 0x00009710,
-	16819: 0x00009799,
-	16820: 0x00009797,
-	16821: 0x00009794,
-	16822: 0x000097F0,
-	16823: 0x000097F8,
-	16824: 0x00009835,
-	16825: 0x0000982F,
-	16826: 0x00009832,
-	16827: 0x00009924,
-	16828: 0x0000991F,
-	16829: 0x00009927,
-	16830: 0x00009929,
-	16831: 0x0000999E,
-	16832: 0x000099EE,
-	16833: 0x000099EC,
-	16834: 0x000099E5,
-	16835: 0x000099E4,
-	16836: 0x000099F0,
-	16837: 0x000099E3,
-	16838: 0x000099EA,
-	16839: 0x000099E9,
-	16840: 0x000099E7,
-	16841: 0x00009AB9,
-	16842: 0x00009ABF,
-	16843: 0x00009AB4,
-	16844: 0x00009ABB,
-	16845: 0x00009AF6,
-	16846: 0x00009AFA,
-	16847: 0x00009AF9,
-	16848: 0x00009AF7,
-	16849: 0x00009B33,
-	16850: 0x00009B80,
-	16851: 0x00009B85,
-	16852: 0x00009B87,
-	16853: 0x00009B7C,
-	16854: 0x00009B7E,
-	16855: 0x00009B7B,
-	16856: 0x00009B82,
-	16857: 0x00009B93,
-	16858: 0x00009B92,
-	16859: 0x00009B90,
-	16860: 0x00009B7A,
-	16861: 0x00009B95,
-	16862: 0x00009B7D,
-	16863: 0x00009B88,
-	16864: 0x00009D25,
-	16865: 0x00009D17,
-	16866: 0x00009D20,
-	16867: 0x00009D1E,
-	16868: 0x00009D14,
-	16869: 0x00009D29,
-	16870: 0x00009D1D,
-	16871: 0x00009D18,
-	16872: 0x00009D22,
-	16873: 0x00009D10,
-	16874: 0x00009D19,
-	16875: 0x00009D1F,
-	16876: 0x00009E88,
-	16877: 0x00009E86,
-	16878: 0x00009E87,
-	16879: 0x00009EAE,
-	16880: 0x00009EAD,
-	16881: 0x00009ED5,
-	16882: 0x00009ED6,
-	16883: 0x00009EFA,
-	16884: 0x00009F12,
-	16885: 0x00009F3D,
-	16886: 0x00005126,
-	16887: 0x00005125,
-	16888: 0x00005122,
-	16889: 0x00005124,
-	16890: 0x00005120,
-	16891: 0x00005129,
-	16892: 0x000052F4,
-	16893: 0x00005693,
-	16894: 0x0000568C,
-	16895: 0x0000568D,
-	16896: 0x00005686,
-	16897: 0x00005684,
-	16898: 0x00005683,
-	16899: 0x0000567E,
-	16900: 0x00005682,
-	16901: 0x0000567F,
-	16902: 0x00005681,
-	16903: 0x000058D6,
-	16904: 0x000058D4,
-	16905: 0x000058CF,
-	16906: 0x000058D2,
-	16907: 0x00005B2D,
-	16908: 0x00005B25,
-	16909: 0x00005B32,
-	16910: 0x00005B23,
-	16911: 0x00005B2C,
-	16912: 0x00005B27,
-	16913: 0x00005B26,
-	16914: 0x00005B2F,
-	16915: 0x00005B2E,
-	16916: 0x00005B7B,
-	16917: 0x00005BF1,
-	16918: 0x00005BF2,
-	16919: 0x00005DB7,
-	16920: 0x00005E6C,
-	16921: 0x00005E6A,
-	16922: 0x00005FBE,
-	16923: 0x00005FBB,
-	16924: 0x000061C3,
-	16925: 0x000061B5,
-	16926: 0x000061BC,
-	16927: 0x000061E7,
-	16928: 0x000061E0,
-	16929: 0x000061E5,
-	16930: 0x000061E4,
-	16931: 0x000061E8,
-	16932: 0x000061DE,
-	16933: 0x000064EF,
-	16934: 0x000064E9,
-	16935: 0x000064E3,
-	16936: 0x000064EB,
-	16937: 0x000064E4,
-	16938: 0x000064E8,
-	16939: 0x00006581,
-	16940: 0x00006580,
-	16941: 0x000065B6,
-	16942: 0x000065DA,
-	16943: 0x000066D2,
-	16944: 0x00006A8D,
-	16945: 0x00006A96,
-	16946: 0x00006A81,
-	16947: 0x00006AA5,
-	16948: 0x00006A89,
-	16949: 0x00006A9F,
-	16950: 0x00006A9B,
-	16951: 0x00006AA1,
-	16952: 0x00006A9E,
-	16953: 0x00006A87,
-	16954: 0x00006A93,
-	16955: 0x00006A8E,
-	16956: 0x00006A95,
-	16957: 0x00006A83,
-	16958: 0x00006AA8,
-	16959: 0x00006AA4,
-	16960: 0x00006A91,
-	16961: 0x00006A7F,
-	16962: 0x00006AA6,
-	16963: 0x00006A9A,
-	16964: 0x00006A85,
-	16965: 0x00006A8C,
-	16966: 0x00006A92,
-	16967: 0x00006B5B,
-	16968: 0x00006BAD,
-	16969: 0x00006C09,
-	16970: 0x00006FCC,
-	16971: 0x00006FA9,
-	16972: 0x00006FF4,
-	16973: 0x00006FD4,
-	16974: 0x00006FE3,
-	16975: 0x00006FDC,
-	16976: 0x00006FED,
-	16977: 0x00006FE7,
-	16978: 0x00006FE6,
-	16979: 0x00006FDE,
-	16980: 0x00006FF2,
-	16981: 0x00006FDD,
-	16982: 0x00006FE2,
-	16983: 0x00006FE8,
-	16984: 0x000071E1,
-	16985: 0x000071F1,
-	16986: 0x000071E8,
-	16987: 0x000071F2,
-	16988: 0x000071E4,
-	16989: 0x000071F0,
-	16990: 0x000071E2,
-	16991: 0x00007373,
-	16992: 0x0000736E,
-	16993: 0x0000736F,
-	16994: 0x00007497,
-	16995: 0x000074B2,
-	16996: 0x000074AB,
-	16997: 0x00007490,
-	16998: 0x000074AA,
-	16999: 0x000074AD,
-	17000: 0x000074B1,
-	17001: 0x000074A5,
-	17002: 0x000074AF,
-	17003: 0x00007510,
-	17004: 0x00007511,
-	17005: 0x00007512,
-	17006: 0x0000750F,
-	17007: 0x00007584,
-	17008: 0x00007643,
-	17009: 0x00007648,
-	17010: 0x00007649,
-	17011: 0x00007647,
-	17012: 0x000076A4,
-	17013: 0x000076E9,
-	17014: 0x000077B5,
-	17015: 0x000077AB,
-	17016: 0x000077B2,
-	17017: 0x000077B7,
-	17018: 0x000077B6,
-	17019: 0x000077B4,
-	17020: 0x000077B1,
-	17021: 0x000077A8,
-	17022: 0x000077F0,
-	17023: 0x000078F3,
-	17024: 0x000078FD,
-	17025: 0x00007902,
-	17026: 0x000078FB,
-	17027: 0x000078FC,
-	17028: 0x000078F2,
-	17029: 0x00007905,
-	17030: 0x000078F9,
-	17031: 0x000078FE,
-	17032: 0x00007904,
-	17033: 0x000079AB,
-	17034: 0x000079A8,
-	17035: 0x00007A5C,
-	17036: 0x00007A5B,
-	17037: 0x00007A56,
-	17038: 0x00007A58,
-	17039: 0x00007A54,
-	17040: 0x00007A5A,
-	17041: 0x00007ABE,
-	17042: 0x00007AC0,
-	17043: 0x00007AC1,
-	17044: 0x00007C05,
-	17045: 0x00007C0F,
-	17046: 0x00007BF2,
-	17047: 0x00007C00,
-	17048: 0x00007BFF,
-	17049: 0x00007BFB,
-	17050: 0x00007C0E,
-	17051: 0x00007BF4,
-	17052: 0x00007C0B,
-	17053: 0x00007BF3,
-	17054: 0x00007C02,
-	17055: 0x00007C09,
-	17056: 0x00007C03,
-	17057: 0x00007C01,
-	17058: 0x00007BF8,
-	17059: 0x00007BFD,
-	17060: 0x00007C06,
-	17061: 0x00007BF0,
-	17062: 0x00007BF1,
-	17063: 0x00007C10,
-	17064: 0x00007C0A,
-	17065: 0x00007CE8,
-	17066: 0x00007E2D,
-	17067: 0x00007E3C,
-	17068: 0x00007E42,
-	17069: 0x00007E33,
-	17070: 0x00009848,
-	17071: 0x00007E38,
-	17072: 0x00007E2A,
-	17073: 0x00007E49,
-	17074: 0x00007E40,
-	17075: 0x00007E47,
-	17076: 0x00007E29,
-	17077: 0x00007E4C,
-	17078: 0x00007E30,
-	17079: 0x00007E3B,
-	17080: 0x00007E36,
-	17081: 0x00007E44,
-	17082: 0x00007E3A,
-	17083: 0x00007F45,
-	17084: 0x00007F7F,
-	17085: 0x00007F7E,
-	17086: 0x00007F7D,
-	17087: 0x00007FF4,
-	17088: 0x00007FF2,
-	17089: 0x0000802C,
-	17090: 0x000081BB,
-	17091: 0x000081C4,
-	17092: 0x000081CC,
-	17093: 0x000081CA,
-	17094: 0x000081C5,
-	17095: 0x000081C7,
-	17096: 0x000081BC,
-	17097: 0x000081E9,
-	17098: 0x0000825B,
-	17099: 0x0000825A,
-	17100: 0x0000825C,
-	17101: 0x00008583,
-	17102: 0x00008580,
-	17103: 0x0000858F,
-	17104: 0x000085A7,
-	17105: 0x00008595,
-	17106: 0x000085A0,
-	17107: 0x0000858B,
-	17108: 0x000085A3,
-	17109: 0x0000857B,
-	17110: 0x000085A4,
-	17111: 0x0000859A,
-	17112: 0x0000859E,
-	17113: 0x00008577,
-	17114: 0x0000857C,
-	17115: 0x00008589,
-	17116: 0x000085A1,
-	17117: 0x0000857A,
-	17118: 0x00008578,
-	17119: 0x00008557,
-	17120: 0x0000858E,
-	17121: 0x00008596,
-	17122: 0x00008586,
-	17123: 0x0000858D,
-	17124: 0x00008599,
-	17125: 0x0000859D,
-	17126: 0x00008581,
-	17127: 0x000085A2,
-	17128: 0x00008582,
-	17129: 0x00008588,
-	17130: 0x00008585,
-	17131: 0x00008579,
-	17132: 0x00008576,
-	17133: 0x00008598,
-	17134: 0x00008590,
-	17135: 0x0000859F,
-	17136: 0x00008668,
-	17137: 0x000087BE,
-	17138: 0x000087AA,
-	17139: 0x000087AD,
-	17140: 0x000087C5,
-	17141: 0x000087B0,
-	17142: 0x000087AC,
-	17143: 0x000087B9,
-	17144: 0x000087B5,
-	17145: 0x000087BC,
-	17146: 0x000087AE,
-	17147: 0x000087C9,
-	17148: 0x000087C3,
-	17149: 0x000087C2,
-	17150: 0x000087CC,
-	17151: 0x000087B7,
-	17152: 0x000087AF,
-	17153: 0x000087C4,
-	17154: 0x000087CA,
-	17155: 0x000087B4,
-	17156: 0x000087B6,
-	17157: 0x000087BF,
-	17158: 0x000087B8,
-	17159: 0x000087BD,
-	17160: 0x000087DE,
-	17161: 0x000087B2,
-	17162: 0x00008935,
-	17163: 0x00008933,
-	17164: 0x0000893C,
-	17165: 0x0000893E,
-	17166: 0x00008941,
-	17167: 0x00008952,
-	17168: 0x00008937,
-	17169: 0x00008942,
-	17170: 0x000089AD,
-	17171: 0x000089AF,
-	17172: 0x000089AE,
-	17173: 0x000089F2,
-	17174: 0x000089F3,
-	17175: 0x00008B1E,
-	17176: 0x00008B18,
-	17177: 0x00008B16,
-	17178: 0x00008B11,
-	17179: 0x00008B05,
-	17180: 0x00008B0B,
-	17181: 0x00008B22,
-	17182: 0x00008B0F,
-	17183: 0x00008B12,
-	17184: 0x00008B15,
-	17185: 0x00008B07,
-	17186: 0x00008B0D,
-	17187: 0x00008B08,
-	17188: 0x00008B06,
-	17189: 0x00008B1C,
-	17190: 0x00008B13,
-	17191: 0x00008B1A,
-	17192: 0x00008C4F,
-	17193: 0x00008C70,
-	17194: 0x00008C72,
-	17195: 0x00008C71,
-	17196: 0x00008C6F,
-	17197: 0x00008C95,
-	17198: 0x00008C94,
-	17199: 0x00008CF9,
-	17200: 0x00008D6F,
-	17201: 0x00008E4E,
-	17202: 0x00008E4D,
-	17203: 0x00008E53,
-	17204: 0x00008E50,
-	17205: 0x00008E4C,
-	17206: 0x00008E47,
-	17207: 0x00008F43,
-	17208: 0x00008F40,
-	17209: 0x00009085,
-	17210: 0x0000907E,
-	17211: 0x00009138,
-	17212: 0x0000919A,
-	17213: 0x000091A2,
-	17214: 0x0000919B,
-	17215: 0x00009199,
-	17216: 0x0000919F,
-	17217: 0x000091A1,
-	17218: 0x0000919D,
-	17219: 0x000091A0,
-	17220: 0x000093A1,
-	17221: 0x00009383,
-	17222: 0x000093AF,
-	17223: 0x00009364,
-	17224: 0x00009356,
-	17225: 0x00009347,
-	17226: 0x0000937C,
-	17227: 0x00009358,
-	17228: 0x0000935C,
-	17229: 0x00009376,
-	17230: 0x00009349,
-	17231: 0x00009350,
-	17232: 0x00009351,
-	17233: 0x00009360,
-	17234: 0x0000936D,
-	17235: 0x0000938F,
-	17236: 0x0000934C,
-	17237: 0x0000936A,
-	17238: 0x00009379,
-	17239: 0x00009357,
-	17240: 0x00009355,
-	17241: 0x00009352,
-	17242: 0x0000934F,
-	17243: 0x00009371,
-	17244: 0x00009377,
-	17245: 0x0000937B,
-	17246: 0x00009361,
-	17247: 0x0000935E,
-	17248: 0x00009363,
-	17249: 0x00009367,
-	17250: 0x00009380,
-	17251: 0x0000934E,
-	17252: 0x00009359,
-	17253: 0x000095C7,
-	17254: 0x000095C0,
-	17255: 0x000095C9,
-	17256: 0x000095C3,
-	17257: 0x000095C5,
-	17258: 0x000095B7,
-	17259: 0x000096AE,
-	17260: 0x000096B0,
-	17261: 0x000096AC,
-	17262: 0x00009720,
-	17263: 0x0000971F,
-	17264: 0x00009718,
-	17265: 0x0000971D,
-	17266: 0x00009719,
-	17267: 0x0000979A,
-	17268: 0x000097A1,
-	17269: 0x0000979C,
-	17270: 0x0000979E,
-	17271: 0x0000979D,
-	17272: 0x000097D5,
-	17273: 0x000097D4,
-	17274: 0x000097F1,
-	17275: 0x00009841,
-	17276: 0x00009844,
-	17277: 0x0000984A,
-	17278: 0x00009849,
-	17279: 0x00009845,
-	17280: 0x00009843,
-	17281: 0x00009925,
-	17282: 0x0000992B,
-	17283: 0x0000992C,
-	17284: 0x0000992A,
-	17285: 0x00009933,
-	17286: 0x00009932,
-	17287: 0x0000992F,
-	17288: 0x0000992D,
-	17289: 0x00009931,
-	17290: 0x00009930,
-	17291: 0x00009998,
-	17292: 0x000099A3,
-	17293: 0x000099A1,
-	17294: 0x00009A02,
-	17295: 0x000099FA,
-	17296: 0x000099F4,
-	17297: 0x000099F7,
-	17298: 0x000099F9,
-	17299: 0x000099F8,
-	17300: 0x000099F6,
-	17301: 0x000099FB,
-	17302: 0x000099FD,
-	17303: 0x000099FE,
-	17304: 0x000099FC,
-	17305: 0x00009A03,
-	17306: 0x00009ABE,
-	17307: 0x00009AFE,
-	17308: 0x00009AFD,
-	17309: 0x00009B01,
-	17310: 0x00009AFC,
-	17311: 0x00009B48,
-	17312: 0x00009B9A,
-	17313: 0x00009BA8,
-	17314: 0x00009B9E,
-	17315: 0x00009B9B,
-	17316: 0x00009BA6,
-	17317: 0x00009BA1,
-	17318: 0x00009BA5,
-	17319: 0x00009BA4,
-	17320: 0x00009B86,
-	17321: 0x00009BA2,
-	17322: 0x00009BA0,
-	17323: 0x00009BAF,
-	17324: 0x00009D33,
-	17325: 0x00009D41,
-	17326: 0x00009D67,
-	17327: 0x00009D36,
-	17328: 0x00009D2E,
-	17329: 0x00009D2F,
-	17330: 0x00009D31,
-	17331: 0x00009D38,
-	17332: 0x00009D30,
-	17333: 0x00009D45,
-	17334: 0x00009D42,
-	17335: 0x00009D43,
-	17336: 0x00009D3E,
-	17337: 0x00009D37,
-	17338: 0x00009D40,
-	17339: 0x00009D3D,
-	17340: 0x00007FF5,
-	17341: 0x00009D2D,
-	17342: 0x00009E8A,
-	17343: 0x00009E89,
-	17344: 0x00009E8D,
-	17345: 0x00009EB0,
-	17346: 0x00009EC8,
-	17347: 0x00009EDA,
-	17348: 0x00009EFB,
-	17349: 0x00009EFF,
-	17350: 0x00009F24,
-	17351: 0x00009F23,
-	17352: 0x00009F22,
-	17353: 0x00009F54,
-	17354: 0x00009FA0,
-	17355: 0x00005131,
-	17356: 0x0000512D,
-	17357: 0x0000512E,
-	17358: 0x00005698,
-	17359: 0x0000569C,
-	17360: 0x00005697,
-	17361: 0x0000569A,
-	17362: 0x0000569D,
-	17363: 0x00005699,
-	17364: 0x00005970,
-	17365: 0x00005B3C,
-	17366: 0x00005C69,
-	17367: 0x00005C6A,
-	17368: 0x00005DC0,
-	17369: 0x00005E6D,
-	17370: 0x00005E6E,
-	17371: 0x000061D8,
-	17372: 0x000061DF,
-	17373: 0x000061ED,
-	17374: 0x000061EE,
-	17375: 0x000061F1,
-	17376: 0x000061EA,
-	17377: 0x000061F0,
-	17378: 0x000061EB,
-	17379: 0x000061D6,
-	17380: 0x000061E9,
-	17381: 0x000064FF,
-	17382: 0x00006504,
-	17383: 0x000064FD,
-	17384: 0x000064F8,
-	17385: 0x00006501,
-	17386: 0x00006503,
-	17387: 0x000064FC,
-	17388: 0x00006594,
-	17389: 0x000065DB,
-	17390: 0x000066DA,
-	17391: 0x000066DB,
-	17392: 0x000066D8,
-	17393: 0x00006AC5,
-	17394: 0x00006AB9,
-	17395: 0x00006ABD,
-	17396: 0x00006AE1,
-	17397: 0x00006AC6,
-	17398: 0x00006ABA,
-	17399: 0x00006AB6,
-	17400: 0x00006AB7,
-	17401: 0x00006AC7,
-	17402: 0x00006AB4,
-	17403: 0x00006AAD,
-	17404: 0x00006B5E,
-	17405: 0x00006BC9,
-	17406: 0x00006C0B,
-	17407: 0x00007007,
-	17408: 0x0000700C,
-	17409: 0x0000700D,
-	17410: 0x00007001,
-	17411: 0x00007005,
-	17412: 0x00007014,
-	17413: 0x0000700E,
-	17414: 0x00006FFF,
-	17415: 0x00007000,
-	17416: 0x00006FFB,
-	17417: 0x00007026,
-	17418: 0x00006FFC,
-	17419: 0x00006FF7,
-	17420: 0x0000700A,
-	17421: 0x00007201,
-	17422: 0x000071FF,
-	17423: 0x000071F9,
-	17424: 0x00007203,
-	17425: 0x000071FD,
-	17426: 0x00007376,
-	17427: 0x000074B8,
-	17428: 0x000074C0,
-	17429: 0x000074B5,
-	17430: 0x000074C1,
-	17431: 0x000074BE,
-	17432: 0x000074B6,
-	17433: 0x000074BB,
-	17434: 0x000074C2,
-	17435: 0x00007514,
-	17436: 0x00007513,
-	17437: 0x0000765C,
-	17438: 0x00007664,
-	17439: 0x00007659,
-	17440: 0x00007650,
-	17441: 0x00007653,
-	17442: 0x00007657,
-	17443: 0x0000765A,
-	17444: 0x000076A6,
-	17445: 0x000076BD,
-	17446: 0x000076EC,
-	17447: 0x000077C2,
-	17448: 0x000077BA,
-	17449: 0x000078FF,
-	17450: 0x0000790C,
-	17451: 0x00007913,
-	17452: 0x00007914,
-	17453: 0x00007909,
-	17454: 0x00007910,
-	17455: 0x00007912,
-	17456: 0x00007911,
-	17457: 0x000079AD,
-	17458: 0x000079AC,
-	17459: 0x00007A5F,
-	17460: 0x00007C1C,
-	17461: 0x00007C29,
-	17462: 0x00007C19,
-	17463: 0x00007C20,
-	17464: 0x00007C1F,
-	17465: 0x00007C2D,
-	17466: 0x00007C1D,
-	17467: 0x00007C26,
-	17468: 0x00007C28,
-	17469: 0x00007C22,
-	17470: 0x00007C25,
-	17471: 0x00007C30,
-	17472: 0x00007E5C,
-	17473: 0x00007E50,
-	17474: 0x00007E56,
-	17475: 0x00007E63,
-	17476: 0x00007E58,
-	17477: 0x00007E62,
-	17478: 0x00007E5F,
-	17479: 0x00007E51,
-	17480: 0x00007E60,
-	17481: 0x00007E57,
-	17482: 0x00007E53,
-	17483: 0x00007FB5,
-	17484: 0x00007FB3,
-	17485: 0x00007FF7,
-	17486: 0x00007FF8,
-	17487: 0x00008075,
-	17488: 0x000081D1,
-	17489: 0x000081D2,
-	17490: 0x000081D0,
-	17491: 0x0000825F,
-	17492: 0x0000825E,
-	17493: 0x000085B4,
-	17494: 0x000085C6,
-	17495: 0x000085C0,
-	17496: 0x000085C3,
-	17497: 0x000085C2,
-	17498: 0x000085B3,
-	17499: 0x000085B5,
-	17500: 0x000085BD,
-	17501: 0x000085C7,
-	17502: 0x000085C4,
-	17503: 0x000085BF,
-	17504: 0x000085CB,
-	17505: 0x000085CE,
-	17506: 0x000085C8,
-	17507: 0x000085C5,
-	17508: 0x000085B1,
-	17509: 0x000085B6,
-	17510: 0x000085D2,
-	17511: 0x00008624,
-	17512: 0x000085B8,
-	17513: 0x000085B7,
-	17514: 0x000085BE,
-	17515: 0x00008669,
-	17516: 0x000087E7,
-	17517: 0x000087E6,
-	17518: 0x000087E2,
-	17519: 0x000087DB,
-	17520: 0x000087EB,
-	17521: 0x000087EA,
-	17522: 0x000087E5,
-	17523: 0x000087DF,
-	17524: 0x000087F3,
-	17525: 0x000087E4,
-	17526: 0x000087D4,
-	17527: 0x000087DC,
-	17528: 0x000087D3,
-	17529: 0x000087ED,
-	17530: 0x000087D8,
-	17531: 0x000087E3,
-	17532: 0x000087A4,
-	17533: 0x000087D7,
-	17534: 0x000087D9,
-	17535: 0x00008801,
-	17536: 0x000087F4,
-	17537: 0x000087E8,
-	17538: 0x000087DD,
-	17539: 0x00008953,
-	17540: 0x0000894B,
-	17541: 0x0000894F,
-	17542: 0x0000894C,
-	17543: 0x00008946,
-	17544: 0x00008950,
-	17545: 0x00008951,
-	17546: 0x00008949,
-	17547: 0x00008B2A,
-	17548: 0x00008B27,
-	17549: 0x00008B23,
-	17550: 0x00008B33,
-	17551: 0x00008B30,
-	17552: 0x00008B35,
-	17553: 0x00008B47,
-	17554: 0x00008B2F,
-	17555: 0x00008B3C,
-	17556: 0x00008B3E,
-	17557: 0x00008B31,
-	17558: 0x00008B25,
-	17559: 0x00008B37,
-	17560: 0x00008B26,
-	17561: 0x00008B36,
-	17562: 0x00008B2E,
-	17563: 0x00008B24,
-	17564: 0x00008B3B,
-	17565: 0x00008B3D,
-	17566: 0x00008B3A,
-	17567: 0x00008C42,
-	17568: 0x00008C75,
-	17569: 0x00008C99,
-	17570: 0x00008C98,
-	17571: 0x00008C97,
-	17572: 0x00008CFE,
-	17573: 0x00008D04,
-	17574: 0x00008D02,
-	17575: 0x00008D00,
-	17576: 0x00008E5C,
-	17577: 0x00008E62,
-	17578: 0x00008E60,
-	17579: 0x00008E57,
-	17580: 0x00008E56,
-	17581: 0x00008E5E,
-	17582: 0x00008E65,
-	17583: 0x00008E67,
-	17584: 0x00008E5B,
-	17585: 0x00008E5A,
-	17586: 0x00008E61,
-	17587: 0x00008E5D,
-	17588: 0x00008E69,
-	17589: 0x00008E54,
-	17590: 0x00008F46,
-	17591: 0x00008F47,
-	17592: 0x00008F48,
-	17593: 0x00008F4B,
-	17594: 0x00009128,
-	17595: 0x0000913A,
-	17596: 0x0000913B,
-	17597: 0x0000913E,
-	17598: 0x000091A8,
-	17599: 0x000091A5,
-	17600: 0x000091A7,
-	17601: 0x000091AF,
-	17602: 0x000091AA,
-	17603: 0x000093B5,
-	17604: 0x0000938C,
-	17605: 0x00009392,
-	17606: 0x000093B7,
-	17607: 0x0000939B,
-	17608: 0x0000939D,
-	17609: 0x00009389,
-	17610: 0x000093A7,
-	17611: 0x0000938E,
-	17612: 0x000093AA,
-	17613: 0x0000939E,
-	17614: 0x000093A6,
-	17615: 0x00009395,
-	17616: 0x00009388,
-	17617: 0x00009399,
-	17618: 0x0000939F,
-	17619: 0x0000938D,
-	17620: 0x000093B1,
-	17621: 0x00009391,
-	17622: 0x000093B2,
-	17623: 0x000093A4,
-	17624: 0x000093A8,
-	17625: 0x000093B4,
-	17626: 0x000093A3,
-	17627: 0x000093A5,
-	17628: 0x000095D2,
-	17629: 0x000095D3,
-	17630: 0x000095D1,
-	17631: 0x000096B3,
-	17632: 0x000096D7,
-	17633: 0x000096DA,
-	17634: 0x00005DC2,
-	17635: 0x000096DF,
-	17636: 0x000096D8,
-	17637: 0x000096DD,
-	17638: 0x00009723,
-	17639: 0x00009722,
-	17640: 0x00009725,
-	17641: 0x000097AC,
-	17642: 0x000097AE,
-	17643: 0x000097A8,
-	17644: 0x000097AB,
-	17645: 0x000097A4,
-	17646: 0x000097AA,
-	17647: 0x000097A2,
-	17648: 0x000097A5,
-	17649: 0x000097D7,
-	17650: 0x000097D9,
-	17651: 0x000097D6,
-	17652: 0x000097D8,
-	17653: 0x000097FA,
-	17654: 0x00009850,
-	17655: 0x00009851,
-	17656: 0x00009852,
-	17657: 0x000098B8,
-	17658: 0x00009941,
-	17659: 0x0000993C,
-	17660: 0x0000993A,
-	17661: 0x00009A0F,
-	17662: 0x00009A0B,
-	17663: 0x00009A09,
-	17664: 0x00009A0D,
-	17665: 0x00009A04,
-	17666: 0x00009A11,
-	17667: 0x00009A0A,
-	17668: 0x00009A05,
-	17669: 0x00009A07,
-	17670: 0x00009A06,
-	17671: 0x00009AC0,
-	17672: 0x00009ADC,
-	17673: 0x00009B08,
-	17674: 0x00009B04,
-	17675: 0x00009B05,
-	17676: 0x00009B29,
-	17677: 0x00009B35,
-	17678: 0x00009B4A,
-	17679: 0x00009B4C,
-	17680: 0x00009B4B,
-	17681: 0x00009BC7,
-	17682: 0x00009BC6,
-	17683: 0x00009BC3,
-	17684: 0x00009BBF,
-	17685: 0x00009BC1,
-	17686: 0x00009BB5,
-	17687: 0x00009BB8,
-	17688: 0x00009BD3,
-	17689: 0x00009BB6,
-	17690: 0x00009BC4,
-	17691: 0x00009BB9,
-	17692: 0x00009BBD,
-	17693: 0x00009D5C,
-	17694: 0x00009D53,
-	17695: 0x00009D4F,
-	17696: 0x00009D4A,
-	17697: 0x00009D5B,
-	17698: 0x00009D4B,
-	17699: 0x00009D59,
-	17700: 0x00009D56,
-	17701: 0x00009D4C,
-	17702: 0x00009D57,
-	17703: 0x00009D52,
-	17704: 0x00009D54,
-	17705: 0x00009D5F,
-	17706: 0x00009D58,
-	17707: 0x00009D5A,
-	17708: 0x00009E8E,
-	17709: 0x00009E8C,
-	17710: 0x00009EDF,
-	17711: 0x00009F01,
-	17712: 0x00009F00,
-	17713: 0x00009F16,
-	17714: 0x00009F25,
-	17715: 0x00009F2B,
-	17716: 0x00009F2A,
-	17717: 0x00009F29,
-	17718: 0x00009F28,
-	17719: 0x00009F4C,
-	17720: 0x00009F55,
-	17721: 0x00005134,
-	17722: 0x00005135,
-	17723: 0x00005296,
-	17724: 0x000052F7,
-	17725: 0x000053B4,
-	17726: 0x000056AB,
-	17727: 0x000056AD,
-	17728: 0x000056A6,
-	17729: 0x000056A7,
-	17730: 0x000056AA,
-	17731: 0x000056AC,
-	17732: 0x000058DA,
-	17733: 0x000058DD,
-	17734: 0x000058DB,
-	17735: 0x00005912,
-	17736: 0x00005B3D,
-	17737: 0x00005B3E,
-	17738: 0x00005B3F,
-	17739: 0x00005DC3,
-	17740: 0x00005E70,
-	17741: 0x00005FBF,
-	17742: 0x000061FB,
-	17743: 0x00006507,
-	17744: 0x00006510,
-	17745: 0x0000650D,
-	17746: 0x00006509,
-	17747: 0x0000650C,
-	17748: 0x0000650E,
-	17749: 0x00006584,
-	17750: 0x000065DE,
-	17751: 0x000065DD,
-	17752: 0x000066DE,
-	17753: 0x00006AE7,
-	17754: 0x00006AE0,
-	17755: 0x00006ACC,
-	17756: 0x00006AD1,
-	17757: 0x00006AD9,
-	17758: 0x00006ACB,
-	17759: 0x00006ADF,
-	17760: 0x00006ADC,
-	17761: 0x00006AD0,
-	17762: 0x00006AEB,
-	17763: 0x00006ACF,
-	17764: 0x00006ACD,
-	17765: 0x00006ADE,
-	17766: 0x00006B60,
-	17767: 0x00006BB0,
-	17768: 0x00006C0C,
-	17769: 0x00007019,
-	17770: 0x00007027,
-	17771: 0x00007020,
-	17772: 0x00007016,
-	17773: 0x0000702B,
-	17774: 0x00007021,
-	17775: 0x00007022,
-	17776: 0x00007023,
-	17777: 0x00007029,
-	17778: 0x00007017,
-	17779: 0x00007024,
-	17780: 0x0000701C,
-	17781: 0x0000702A,
-	17782: 0x0000720C,
-	17783: 0x0000720A,
-	17784: 0x00007207,
-	17785: 0x00007202,
-	17786: 0x00007205,
-	17787: 0x000072A5,
-	17788: 0x000072A6,
-	17789: 0x000072A4,
-	17790: 0x000072A3,
-	17791: 0x000072A1,
-	17792: 0x000074CB,
-	17793: 0x000074C5,
-	17794: 0x000074B7,
-	17795: 0x000074C3,
-	17796: 0x00007516,
-	17797: 0x00007660,
-	17798: 0x000077C9,
-	17799: 0x000077CA,
-	17800: 0x000077C4,
-	17801: 0x000077F1,
-	17802: 0x0000791D,
-	17803: 0x0000791B,
-	17804: 0x00007921,
-	17805: 0x0000791C,
-	17806: 0x00007917,
-	17807: 0x0000791E,
-	17808: 0x000079B0,
-	17809: 0x00007A67,
-	17810: 0x00007A68,
-	17811: 0x00007C33,
-	17812: 0x00007C3C,
-	17813: 0x00007C39,
-	17814: 0x00007C2C,
-	17815: 0x00007C3B,
-	17816: 0x00007CEC,
-	17817: 0x00007CEA,
-	17818: 0x00007E76,
-	17819: 0x00007E75,
-	17820: 0x00007E78,
-	17821: 0x00007E70,
-	17822: 0x00007E77,
-	17823: 0x00007E6F,
-	17824: 0x00007E7A,
-	17825: 0x00007E72,
-	17826: 0x00007E74,
-	17827: 0x00007E68,
-	17828: 0x00007F4B,
-	17829: 0x00007F4A,
-	17830: 0x00007F83,
-	17831: 0x00007F86,
-	17832: 0x00007FB7,
-	17833: 0x00007FFD,
-	17834: 0x00007FFE,
-	17835: 0x00008078,
-	17836: 0x000081D7,
-	17837: 0x000081D5,
-	17838: 0x00008264,
-	17839: 0x00008261,
-	17840: 0x00008263,
-	17841: 0x000085EB,
-	17842: 0x000085F1,
-	17843: 0x000085ED,
-	17844: 0x000085D9,
-	17845: 0x000085E1,
-	17846: 0x000085E8,
-	17847: 0x000085DA,
-	17848: 0x000085D7,
-	17849: 0x000085EC,
-	17850: 0x000085F2,
-	17851: 0x000085F8,
-	17852: 0x000085D8,
-	17853: 0x000085DF,
-	17854: 0x000085E3,
-	17855: 0x000085DC,
-	17856: 0x000085D1,
-	17857: 0x000085F0,
-	17858: 0x000085E6,
-	17859: 0x000085EF,
-	17860: 0x000085DE,
-	17861: 0x000085E2,
-	17862: 0x00008800,
-	17863: 0x000087FA,
-	17864: 0x00008803,
-	17865: 0x000087F6,
-	17866: 0x000087F7,
-	17867: 0x00008809,
-	17868: 0x0000880C,
-	17869: 0x0000880B,
-	17870: 0x00008806,
-	17871: 0x000087FC,
-	17872: 0x00008808,
-	17873: 0x000087FF,
-	17874: 0x0000880A,
-	17875: 0x00008802,
-	17876: 0x00008962,
-	17877: 0x0000895A,
-	17878: 0x0000895B,
-	17879: 0x00008957,
-	17880: 0x00008961,
-	17881: 0x0000895C,
-	17882: 0x00008958,
-	17883: 0x0000895D,
-	17884: 0x00008959,
-	17885: 0x00008988,
-	17886: 0x000089B7,
-	17887: 0x000089B6,
-	17888: 0x000089F6,
-	17889: 0x00008B50,
-	17890: 0x00008B48,
-	17891: 0x00008B4A,
-	17892: 0x00008B40,
-	17893: 0x00008B53,
-	17894: 0x00008B56,
-	17895: 0x00008B54,
-	17896: 0x00008B4B,
-	17897: 0x00008B55,
-	17898: 0x00008B51,
-	17899: 0x00008B42,
-	17900: 0x00008B52,
-	17901: 0x00008B57,
-	17902: 0x00008C43,
-	17903: 0x00008C77,
-	17904: 0x00008C76,
-	17905: 0x00008C9A,
-	17906: 0x00008D06,
-	17907: 0x00008D07,
-	17908: 0x00008D09,
-	17909: 0x00008DAC,
-	17910: 0x00008DAA,
-	17911: 0x00008DAD,
-	17912: 0x00008DAB,
-	17913: 0x00008E6D,
-	17914: 0x00008E78,
-	17915: 0x00008E73,
-	17916: 0x00008E6A,
-	17917: 0x00008E6F,
-	17918: 0x00008E7B,
-	17919: 0x00008EC2,
-	17920: 0x00008F52,
-	17921: 0x00008F51,
-	17922: 0x00008F4F,
-	17923: 0x00008F50,
-	17924: 0x00008F53,
-	17925: 0x00008FB4,
-	17926: 0x00009140,
-	17927: 0x0000913F,
-	17928: 0x000091B0,
-	17929: 0x000091AD,
-	17930: 0x000093DE,
-	17931: 0x000093C7,
-	17932: 0x000093CF,
-	17933: 0x000093C2,
-	17934: 0x000093DA,
-	17935: 0x000093D0,
-	17936: 0x000093F9,
-	17937: 0x000093EC,
-	17938: 0x000093CC,
-	17939: 0x000093D9,
-	17940: 0x000093A9,
-	17941: 0x000093E6,
-	17942: 0x000093CA,
-	17943: 0x000093D4,
-	17944: 0x000093EE,
-	17945: 0x000093E3,
-	17946: 0x000093D5,
-	17947: 0x000093C4,
-	17948: 0x000093CE,
-	17949: 0x000093C0,
-	17950: 0x000093D2,
-	17951: 0x000093E7,
-	17952: 0x0000957D,
-	17953: 0x000095DA,
-	17954: 0x000095DB,
-	17955: 0x000096E1,
-	17956: 0x00009729,
-	17957: 0x0000972B,
-	17958: 0x0000972C,
-	17959: 0x00009728,
-	17960: 0x00009726,
-	17961: 0x000097B3,
-	17962: 0x000097B7,
-	17963: 0x000097B6,
-	17964: 0x000097DD,
-	17965: 0x000097DE,
-	17966: 0x000097DF,
-	17967: 0x0000985C,
-	17968: 0x00009859,
-	17969: 0x0000985D,
-	17970: 0x00009857,
-	17971: 0x000098BF,
-	17972: 0x000098BD,
-	17973: 0x000098BB,
-	17974: 0x000098BE,
-	17975: 0x00009948,
-	17976: 0x00009947,
-	17977: 0x00009943,
-	17978: 0x000099A6,
-	17979: 0x000099A7,
-	17980: 0x00009A1A,
-	17981: 0x00009A15,
-	17982: 0x00009A25,
-	17983: 0x00009A1D,
-	17984: 0x00009A24,
-	17985: 0x00009A1B,
-	17986: 0x00009A22,
-	17987: 0x00009A20,
-	17988: 0x00009A27,
-	17989: 0x00009A23,
-	17990: 0x00009A1E,
-	17991: 0x00009A1C,
-	17992: 0x00009A14,
-	17993: 0x00009AC2,
-	17994: 0x00009B0B,
-	17995: 0x00009B0A,
-	17996: 0x00009B0E,
-	17997: 0x00009B0C,
-	17998: 0x00009B37,
-	17999: 0x00009BEA,
-	18000: 0x00009BEB,
-	18001: 0x00009BE0,
-	18002: 0x00009BDE,
-	18003: 0x00009BE4,
-	18004: 0x00009BE6,
-	18005: 0x00009BE2,
-	18006: 0x00009BF0,
-	18007: 0x00009BD4,
-	18008: 0x00009BD7,
-	18009: 0x00009BEC,
-	18010: 0x00009BDC,
-	18011: 0x00009BD9,
-	18012: 0x00009BE5,
-	18013: 0x00009BD5,
-	18014: 0x00009BE1,
-	18015: 0x00009BDA,
-	18016: 0x00009D77,
-	18017: 0x00009D81,
-	18018: 0x00009D8A,
-	18019: 0x00009D84,
-	18020: 0x00009D88,
-	18021: 0x00009D71,
-	18022: 0x00009D80,
-	18023: 0x00009D78,
-	18024: 0x00009D86,
-	18025: 0x00009D8B,
-	18026: 0x00009D8C,
-	18027: 0x00009D7D,
-	18028: 0x00009D6B,
-	18029: 0x00009D74,
-	18030: 0x00009D75,
-	18031: 0x00009D70,
-	18032: 0x00009D69,
-	18033: 0x00009D85,
-	18034: 0x00009D73,
-	18035: 0x00009D7B,
-	18036: 0x00009D82,
-	18037: 0x00009D6F,
-	18038: 0x00009D79,
-	18039: 0x00009D7F,
-	18040: 0x00009D87,
-	18041: 0x00009D68,
-	18042: 0x00009E94,
-	18043: 0x00009E91,
-	18044: 0x00009EC0,
-	18045: 0x00009EFC,
-	18046: 0x00009F2D,
-	18047: 0x00009F40,
-	18048: 0x00009F41,
-	18049: 0x00009F4D,
-	18050: 0x00009F56,
-	18051: 0x00009F57,
-	18052: 0x00009F58,
-	18053: 0x00005337,
-	18054: 0x000056B2,
-	18055: 0x000056B5,
-	18056: 0x000056B3,
-	18057: 0x000058E3,
-	18058: 0x00005B45,
-	18059: 0x00005DC6,
-	18060: 0x00005DC7,
-	18061: 0x00005EEE,
-	18062: 0x00005EEF,
-	18063: 0x00005FC0,
-	18064: 0x00005FC1,
-	18065: 0x000061F9,
-	18066: 0x00006517,
-	18067: 0x00006516,
-	18068: 0x00006515,
-	18069: 0x00006513,
-	18070: 0x000065DF,
-	18071: 0x000066E8,
-	18072: 0x000066E3,
-	18073: 0x000066E4,
-	18074: 0x00006AF3,
-	18075: 0x00006AF0,
-	18076: 0x00006AEA,
-	18077: 0x00006AE8,
-	18078: 0x00006AF9,
-	18079: 0x00006AF1,
-	18080: 0x00006AEE,
-	18081: 0x00006AEF,
-	18082: 0x0000703C,
-	18083: 0x00007035,
-	18084: 0x0000702F,
-	18085: 0x00007037,
-	18086: 0x00007034,
-	18087: 0x00007031,
-	18088: 0x00007042,
-	18089: 0x00007038,
-	18090: 0x0000703F,
-	18091: 0x0000703A,
-	18092: 0x00007039,
-	18093: 0x00007040,
-	18094: 0x0000703B,
-	18095: 0x00007033,
-	18096: 0x00007041,
-	18097: 0x00007213,
-	18098: 0x00007214,
-	18099: 0x000072A8,
-	18100: 0x0000737D,
-	18101: 0x0000737C,
-	18102: 0x000074BA,
-	18103: 0x000076AB,
-	18104: 0x000076AA,
-	18105: 0x000076BE,
-	18106: 0x000076ED,
-	18107: 0x000077CC,
-	18108: 0x000077CE,
-	18109: 0x000077CF,
-	18110: 0x000077CD,
-	18111: 0x000077F2,
-	18112: 0x00007925,
-	18113: 0x00007923,
-	18114: 0x00007927,
-	18115: 0x00007928,
-	18116: 0x00007924,
-	18117: 0x00007929,
-	18118: 0x000079B2,
-	18119: 0x00007A6E,
-	18120: 0x00007A6C,
-	18121: 0x00007A6D,
-	18122: 0x00007AF7,
-	18123: 0x00007C49,
-	18124: 0x00007C48,
-	18125: 0x00007C4A,
-	18126: 0x00007C47,
-	18127: 0x00007C45,
-	18128: 0x00007CEE,
-	18129: 0x00007E7B,
-	18130: 0x00007E7E,
-	18131: 0x00007E81,
-	18132: 0x00007E80,
-	18133: 0x00007FBA,
-	18134: 0x00007FFF,
-	18135: 0x00008079,
-	18136: 0x000081DB,
-	18137: 0x000081D9,
-	18138: 0x0000820B,
-	18139: 0x00008268,
-	18140: 0x00008269,
-	18141: 0x00008622,
-	18142: 0x000085FF,
-	18143: 0x00008601,
-	18144: 0x000085FE,
-	18145: 0x0000861B,
-	18146: 0x00008600,
-	18147: 0x000085F6,
-	18148: 0x00008604,
-	18149: 0x00008609,
-	18150: 0x00008605,
-	18151: 0x0000860C,
-	18152: 0x000085FD,
-	18153: 0x00008819,
-	18154: 0x00008810,
-	18155: 0x00008811,
-	18156: 0x00008817,
-	18157: 0x00008813,
-	18158: 0x00008816,
-	18159: 0x00008963,
-	18160: 0x00008966,
-	18161: 0x000089B9,
-	18162: 0x000089F7,
-	18163: 0x00008B60,
-	18164: 0x00008B6A,
-	18165: 0x00008B5D,
-	18166: 0x00008B68,
-	18167: 0x00008B63,
-	18168: 0x00008B65,
-	18169: 0x00008B67,
-	18170: 0x00008B6D,
-	18171: 0x00008DAE,
-	18172: 0x00008E86,
-	18173: 0x00008E88,
-	18174: 0x00008E84,
-	18175: 0x00008F59,
-	18176: 0x00008F56,
-	18177: 0x00008F57,
-	18178: 0x00008F55,
-	18179: 0x00008F58,
-	18180: 0x00008F5A,
-	18181: 0x0000908D,
-	18182: 0x00009143,
-	18183: 0x00009141,
-	18184: 0x000091B7,
-	18185: 0x000091B5,
-	18186: 0x000091B2,
-	18187: 0x000091B3,
-	18188: 0x0000940B,
-	18189: 0x00009413,
-	18190: 0x000093FB,
-	18191: 0x00009420,
-	18192: 0x0000940F,
-	18193: 0x00009414,
-	18194: 0x000093FE,
-	18195: 0x00009415,
-	18196: 0x00009410,
-	18197: 0x00009428,
-	18198: 0x00009419,
-	18199: 0x0000940D,
-	18200: 0x000093F5,
-	18201: 0x00009400,
-	18202: 0x000093F7,
-	18203: 0x00009407,
-	18204: 0x0000940E,
-	18205: 0x00009416,
-	18206: 0x00009412,
-	18207: 0x000093FA,
-	18208: 0x00009409,
-	18209: 0x000093F8,
-	18210: 0x0000940A,
-	18211: 0x000093FF,
-	18212: 0x000093FC,
-	18213: 0x0000940C,
-	18214: 0x000093F6,
-	18215: 0x00009411,
-	18216: 0x00009406,
-	18217: 0x000095DE,
-	18218: 0x000095E0,
-	18219: 0x000095DF,
-	18220: 0x0000972E,
-	18221: 0x0000972F,
-	18222: 0x000097B9,
-	18223: 0x000097BB,
-	18224: 0x000097FD,
-	18225: 0x000097FE,
-	18226: 0x00009860,
-	18227: 0x00009862,
-	18228: 0x00009863,
-	18229: 0x0000985F,
-	18230: 0x000098C1,
-	18231: 0x000098C2,
-	18232: 0x00009950,
-	18233: 0x0000994E,
-	18234: 0x00009959,
-	18235: 0x0000994C,
-	18236: 0x0000994B,
-	18237: 0x00009953,
-	18238: 0x00009A32,
-	18239: 0x00009A34,
-	18240: 0x00009A31,
-	18241: 0x00009A2C,
-	18242: 0x00009A2A,
-	18243: 0x00009A36,
-	18244: 0x00009A29,
-	18245: 0x00009A2E,
-	18246: 0x00009A38,
-	18247: 0x00009A2D,
-	18248: 0x00009AC7,
-	18249: 0x00009ACA,
-	18250: 0x00009AC6,
-	18251: 0x00009B10,
-	18252: 0x00009B12,
-	18253: 0x00009B11,
-	18254: 0x00009C0B,
-	18255: 0x00009C08,
-	18256: 0x00009BF7,
-	18257: 0x00009C05,
-	18258: 0x00009C12,
-	18259: 0x00009BF8,
-	18260: 0x00009C40,
-	18261: 0x00009C07,
-	18262: 0x00009C0E,
-	18263: 0x00009C06,
-	18264: 0x00009C17,
-	18265: 0x00009C14,
-	18266: 0x00009C09,
-	18267: 0x00009D9F,
-	18268: 0x00009D99,
-	18269: 0x00009DA4,
-	18270: 0x00009D9D,
-	18271: 0x00009D92,
-	18272: 0x00009D98,
-	18273: 0x00009D90,
-	18274: 0x00009D9B,
-	18275: 0x00009DA0,
-	18276: 0x00009D94,
-	18277: 0x00009D9C,
-	18278: 0x00009DAA,
-	18279: 0x00009D97,
-	18280: 0x00009DA1,
-	18281: 0x00009D9A,
-	18282: 0x00009DA2,
-	18283: 0x00009DA8,
-	18284: 0x00009D9E,
-	18285: 0x00009DA3,
-	18286: 0x00009DBF,
-	18287: 0x00009DA9,
-	18288: 0x00009D96,
-	18289: 0x00009DA6,
-	18290: 0x00009DA7,
-	18291: 0x00009E99,
-	18292: 0x00009E9B,
-	18293: 0x00009E9A,
-	18294: 0x00009EE5,
-	18295: 0x00009EE4,
-	18296: 0x00009EE7,
-	18297: 0x00009EE6,
-	18298: 0x00009F30,
-	18299: 0x00009F2E,
-	18300: 0x00009F5B,
-	18301: 0x00009F60,
-	18302: 0x00009F5E,
-	18303: 0x00009F5D,
-	18304: 0x00009F59,
-	18305: 0x00009F91,
-	18306: 0x0000513A,
-	18307: 0x00005139,
-	18308: 0x00005298,
-	18309: 0x00005297,
-	18310: 0x000056C3,
-	18311: 0x000056BD,
-	18312: 0x000056BE,
-	18313: 0x00005B48,
-	18314: 0x00005B47,
-	18315: 0x00005DCB,
-	18316: 0x00005DCF,
-	18317: 0x00005EF1,
-	18318: 0x000061FD,
-	18319: 0x0000651B,
-	18320: 0x00006B02,
-	18321: 0x00006AFC,
-	18322: 0x00006B03,
-	18323: 0x00006AF8,
-	18324: 0x00006B00,
-	18325: 0x00007043,
-	18326: 0x00007044,
-	18327: 0x0000704A,
-	18328: 0x00007048,
-	18329: 0x00007049,
-	18330: 0x00007045,
-	18331: 0x00007046,
-	18332: 0x0000721D,
-	18333: 0x0000721A,
-	18334: 0x00007219,
-	18335: 0x0000737E,
-	18336: 0x00007517,
-	18337: 0x0000766A,
-	18338: 0x000077D0,
-	18339: 0x0000792D,
-	18340: 0x00007931,
-	18341: 0x0000792F,
-	18342: 0x00007C54,
-	18343: 0x00007C53,
-	18344: 0x00007CF2,
-	18345: 0x00007E8A,
-	18346: 0x00007E87,
-	18347: 0x00007E88,
-	18348: 0x00007E8B,
-	18349: 0x00007E86,
-	18350: 0x00007E8D,
-	18351: 0x00007F4D,
-	18352: 0x00007FBB,
-	18353: 0x00008030,
-	18354: 0x000081DD,
-	18355: 0x00008618,
-	18356: 0x0000862A,
-	18357: 0x00008626,
-	18358: 0x0000861F,
-	18359: 0x00008623,
-	18360: 0x0000861C,
-	18361: 0x00008619,
-	18362: 0x00008627,
-	18363: 0x0000862E,
-	18364: 0x00008621,
-	18365: 0x00008620,
-	18366: 0x00008629,
-	18367: 0x0000861E,
-	18368: 0x00008625,
-	18369: 0x00008829,
-	18370: 0x0000881D,
-	18371: 0x0000881B,
-	18372: 0x00008820,
-	18373: 0x00008824,
-	18374: 0x0000881C,
-	18375: 0x0000882B,
-	18376: 0x0000884A,
-	18377: 0x0000896D,
-	18378: 0x00008969,
-	18379: 0x0000896E,
-	18380: 0x0000896B,
-	18381: 0x000089FA,
-	18382: 0x00008B79,
-	18383: 0x00008B78,
-	18384: 0x00008B45,
-	18385: 0x00008B7A,
-	18386: 0x00008B7B,
-	18387: 0x00008D10,
-	18388: 0x00008D14,
-	18389: 0x00008DAF,
-	18390: 0x00008E8E,
-	18391: 0x00008E8C,
-	18392: 0x00008F5E,
-	18393: 0x00008F5B,
-	18394: 0x00008F5D,
-	18395: 0x00009146,
-	18396: 0x00009144,
-	18397: 0x00009145,
-	18398: 0x000091B9,
-	18399: 0x0000943F,
-	18400: 0x0000943B,
-	18401: 0x00009436,
-	18402: 0x00009429,
-	18403: 0x0000943D,
-	18404: 0x0000943C,
-	18405: 0x00009430,
-	18406: 0x00009439,
-	18407: 0x0000942A,
-	18408: 0x00009437,
-	18409: 0x0000942C,
-	18410: 0x00009440,
-	18411: 0x00009431,
-	18412: 0x000095E5,
-	18413: 0x000095E4,
-	18414: 0x000095E3,
-	18415: 0x00009735,
-	18416: 0x0000973A,
-	18417: 0x000097BF,
-	18418: 0x000097E1,
-	18419: 0x00009864,
-	18420: 0x000098C9,
-	18421: 0x000098C6,
-	18422: 0x000098C0,
-	18423: 0x00009958,
-	18424: 0x00009956,
-	18425: 0x00009A39,
-	18426: 0x00009A3D,
-	18427: 0x00009A46,
-	18428: 0x00009A44,
-	18429: 0x00009A42,
-	18430: 0x00009A41,
-	18431: 0x00009A3A,
-	18432: 0x00009A3F,
-	18433: 0x00009ACD,
-	18434: 0x00009B15,
-	18435: 0x00009B17,
-	18436: 0x00009B18,
-	18437: 0x00009B16,
-	18438: 0x00009B3A,
-	18439: 0x00009B52,
-	18440: 0x00009C2B,
-	18441: 0x00009C1D,
-	18442: 0x00009C1C,
-	18443: 0x00009C2C,
-	18444: 0x00009C23,
-	18445: 0x00009C28,
-	18446: 0x00009C29,
-	18447: 0x00009C24,
-	18448: 0x00009C21,
-	18449: 0x00009DB7,
-	18450: 0x00009DB6,
-	18451: 0x00009DBC,
-	18452: 0x00009DC1,
-	18453: 0x00009DC7,
-	18454: 0x00009DCA,
-	18455: 0x00009DCF,
-	18456: 0x00009DBE,
-	18457: 0x00009DC5,
-	18458: 0x00009DC3,
-	18459: 0x00009DBB,
-	18460: 0x00009DB5,
-	18461: 0x00009DCE,
-	18462: 0x00009DB9,
-	18463: 0x00009DBA,
-	18464: 0x00009DAC,
-	18465: 0x00009DC8,
-	18466: 0x00009DB1,
-	18467: 0x00009DAD,
-	18468: 0x00009DCC,
-	18469: 0x00009DB3,
-	18470: 0x00009DCD,
-	18471: 0x00009DB2,
-	18472: 0x00009E7A,
-	18473: 0x00009E9C,
-	18474: 0x00009EEB,
-	18475: 0x00009EEE,
-	18476: 0x00009EED,
-	18477: 0x00009F1B,
-	18478: 0x00009F18,
-	18479: 0x00009F1A,
-	18480: 0x00009F31,
-	18481: 0x00009F4E,
-	18482: 0x00009F65,
-	18483: 0x00009F64,
-	18484: 0x00009F92,
-	18485: 0x00004EB9,
-	18486: 0x000056C6,
-	18487: 0x000056C5,
-	18488: 0x000056CB,
-	18489: 0x00005971,
-	18490: 0x00005B4B,
-	18491: 0x00005B4C,
-	18492: 0x00005DD5,
-	18493: 0x00005DD1,
-	18494: 0x00005EF2,
-	18495: 0x00006521,
-	18496: 0x00006520,
-	18497: 0x00006526,
-	18498: 0x00006522,
-	18499: 0x00006B0B,
-	18500: 0x00006B08,
-	18501: 0x00006B09,
-	18502: 0x00006C0D,
-	18503: 0x00007055,
-	18504: 0x00007056,
-	18505: 0x00007057,
-	18506: 0x00007052,
-	18507: 0x0000721E,
-	18508: 0x0000721F,
-	18509: 0x000072A9,
-	18510: 0x0000737F,
-	18511: 0x000074D8,
-	18512: 0x000074D5,
-	18513: 0x000074D9,
-	18514: 0x000074D7,
-	18515: 0x0000766D,
-	18516: 0x000076AD,
-	18517: 0x00007935,
-	18518: 0x000079B4,
-	18519: 0x00007A70,
-	18520: 0x00007A71,
-	18521: 0x00007C57,
-	18522: 0x00007C5C,
-	18523: 0x00007C59,
-	18524: 0x00007C5B,
-	18525: 0x00007C5A,
-	18526: 0x00007CF4,
-	18527: 0x00007CF1,
-	18528: 0x00007E91,
-	18529: 0x00007F4F,
-	18530: 0x00007F87,
-	18531: 0x000081DE,
-	18532: 0x0000826B,
-	18533: 0x00008634,
-	18534: 0x00008635,
-	18535: 0x00008633,
-	18536: 0x0000862C,
-	18537: 0x00008632,
-	18538: 0x00008636,
-	18539: 0x0000882C,
-	18540: 0x00008828,
-	18541: 0x00008826,
-	18542: 0x0000882A,
-	18543: 0x00008825,
-	18544: 0x00008971,
-	18545: 0x000089BF,
-	18546: 0x000089BE,
-	18547: 0x000089FB,
-	18548: 0x00008B7E,
-	18549: 0x00008B84,
-	18550: 0x00008B82,
-	18551: 0x00008B86,
-	18552: 0x00008B85,
-	18553: 0x00008B7F,
-	18554: 0x00008D15,
-	18555: 0x00008E95,
-	18556: 0x00008E94,
-	18557: 0x00008E9A,
-	18558: 0x00008E92,
-	18559: 0x00008E90,
-	18560: 0x00008E96,
-	18561: 0x00008E97,
-	18562: 0x00008F60,
-	18563: 0x00008F62,
-	18564: 0x00009147,
-	18565: 0x0000944C,
-	18566: 0x00009450,
-	18567: 0x0000944A,
-	18568: 0x0000944B,
-	18569: 0x0000944F,
-	18570: 0x00009447,
-	18571: 0x00009445,
-	18572: 0x00009448,
-	18573: 0x00009449,
-	18574: 0x00009446,
-	18575: 0x0000973F,
-	18576: 0x000097E3,
-	18577: 0x0000986A,
-	18578: 0x00009869,
-	18579: 0x000098CB,
-	18580: 0x00009954,
-	18581: 0x0000995B,
-	18582: 0x00009A4E,
-	18583: 0x00009A53,
-	18584: 0x00009A54,
-	18585: 0x00009A4C,
-	18586: 0x00009A4F,
-	18587: 0x00009A48,
-	18588: 0x00009A4A,
-	18589: 0x00009A49,
-	18590: 0x00009A52,
-	18591: 0x00009A50,
-	18592: 0x00009AD0,
-	18593: 0x00009B19,
-	18594: 0x00009B2B,
-	18595: 0x00009B3B,
-	18596: 0x00009B56,
-	18597: 0x00009B55,
-	18598: 0x00009C46,
-	18599: 0x00009C48,
-	18600: 0x00009C3F,
-	18601: 0x00009C44,
-	18602: 0x00009C39,
-	18603: 0x00009C33,
-	18604: 0x00009C41,
-	18605: 0x00009C3C,
-	18606: 0x00009C37,
-	18607: 0x00009C34,
-	18608: 0x00009C32,
-	18609: 0x00009C3D,
-	18610: 0x00009C36,
-	18611: 0x00009DDB,
-	18612: 0x00009DD2,
-	18613: 0x00009DDE,
-	18614: 0x00009DDA,
-	18615: 0x00009DCB,
-	18616: 0x00009DD0,
-	18617: 0x00009DDC,
-	18618: 0x00009DD1,
-	18619: 0x00009DDF,
-	18620: 0x00009DE9,
-	18621: 0x00009DD9,
-	18622: 0x00009DD8,
-	18623: 0x00009DD6,
-	18624: 0x00009DF5,
-	18625: 0x00009DD5,
-	18626: 0x00009DDD,
-	18627: 0x00009EB6,
-	18628: 0x00009EF0,
-	18629: 0x00009F35,
-	18630: 0x00009F33,
-	18631: 0x00009F32,
-	18632: 0x00009F42,
-	18633: 0x00009F6B,
-	18634: 0x00009F95,
-	18635: 0x00009FA2,
-	18636: 0x0000513D,
-	18637: 0x00005299,
-	18638: 0x000058E8,
-	18639: 0x000058E7,
-	18640: 0x00005972,
-	18641: 0x00005B4D,
-	18642: 0x00005DD8,
-	18643: 0x0000882F,
-	18644: 0x00005F4F,
-	18645: 0x00006201,
-	18646: 0x00006203,
-	18647: 0x00006204,
-	18648: 0x00006529,
-	18649: 0x00006525,
-	18650: 0x00006596,
-	18651: 0x000066EB,
-	18652: 0x00006B11,
-	18653: 0x00006B12,
-	18654: 0x00006B0F,
-	18655: 0x00006BCA,
-	18656: 0x0000705B,
-	18657: 0x0000705A,
-	18658: 0x00007222,
-	18659: 0x00007382,
-	18660: 0x00007381,
-	18661: 0x00007383,
-	18662: 0x00007670,
-	18663: 0x000077D4,
-	18664: 0x00007C67,
-	18665: 0x00007C66,
-	18666: 0x00007E95,
-	18667: 0x0000826C,
-	18668: 0x0000863A,
-	18669: 0x00008640,
-	18670: 0x00008639,
-	18671: 0x0000863C,
-	18672: 0x00008631,
-	18673: 0x0000863B,
-	18674: 0x0000863E,
-	18675: 0x00008830,
-	18676: 0x00008832,
-	18677: 0x0000882E,
-	18678: 0x00008833,
-	18679: 0x00008976,
-	18680: 0x00008974,
-	18681: 0x00008973,
-	18682: 0x000089FE,
-	18683: 0x00008B8C,
-	18684: 0x00008B8E,
-	18685: 0x00008B8B,
-	18686: 0x00008B88,
-	18687: 0x00008C45,
-	18688: 0x00008D19,
-	18689: 0x00008E98,
-	18690: 0x00008F64,
-	18691: 0x00008F63,
-	18692: 0x000091BC,
-	18693: 0x00009462,
-	18694: 0x00009455,
-	18695: 0x0000945D,
-	18696: 0x00009457,
-	18697: 0x0000945E,
-	18698: 0x000097C4,
-	18699: 0x000097C5,
-	18700: 0x00009800,
-	18701: 0x00009A56,
-	18702: 0x00009A59,
-	18703: 0x00009B1E,
-	18704: 0x00009B1F,
-	18705: 0x00009B20,
-	18706: 0x00009C52,
-	18707: 0x00009C58,
-	18708: 0x00009C50,
-	18709: 0x00009C4A,
-	18710: 0x00009C4D,
-	18711: 0x00009C4B,
-	18712: 0x00009C55,
-	18713: 0x00009C59,
-	18714: 0x00009C4C,
-	18715: 0x00009C4E,
-	18716: 0x00009DFB,
-	18717: 0x00009DF7,
-	18718: 0x00009DEF,
-	18719: 0x00009DE3,
-	18720: 0x00009DEB,
-	18721: 0x00009DF8,
-	18722: 0x00009DE4,
-	18723: 0x00009DF6,
-	18724: 0x00009DE1,
-	18725: 0x00009DEE,
-	18726: 0x00009DE6,
-	18727: 0x00009DF2,
-	18728: 0x00009DF0,
-	18729: 0x00009DE2,
-	18730: 0x00009DEC,
-	18731: 0x00009DF4,
-	18732: 0x00009DF3,
-	18733: 0x00009DE8,
-	18734: 0x00009DED,
-	18735: 0x00009EC2,
-	18736: 0x00009ED0,
-	18737: 0x00009EF2,
-	18738: 0x00009EF3,
-	18739: 0x00009F06,
-	18740: 0x00009F1C,
-	18741: 0x00009F38,
-	18742: 0x00009F37,
-	18743: 0x00009F36,
-	18744: 0x00009F43,
-	18745: 0x00009F4F,
-	18746: 0x00009F71,
-	18747: 0x00009F70,
-	18748: 0x00009F6E,
-	18749: 0x00009F6F,
-	18750: 0x000056D3,
-	18751: 0x000056CD,
-	18752: 0x00005B4E,
-	18753: 0x00005C6D,
-	18754: 0x0000652D,
-	18755: 0x000066ED,
-	18756: 0x000066EE,
-	18757: 0x00006B13,
-	18758: 0x0000705F,
-	18759: 0x00007061,
-	18760: 0x0000705D,
-	18761: 0x00007060,
-	18762: 0x00007223,
-	18763: 0x000074DB,
-	18764: 0x000074E5,
-	18765: 0x000077D5,
-	18766: 0x00007938,
-	18767: 0x000079B7,
-	18768: 0x000079B6,
-	18769: 0x00007C6A,
-	18770: 0x00007E97,
-	18771: 0x00007F89,
-	18772: 0x0000826D,
-	18773: 0x00008643,
-	18774: 0x00008838,
-	18775: 0x00008837,
-	18776: 0x00008835,
-	18777: 0x0000884B,
-	18778: 0x00008B94,
-	18779: 0x00008B95,
-	18780: 0x00008E9E,
-	18781: 0x00008E9F,
-	18782: 0x00008EA0,
-	18783: 0x00008E9D,
-	18784: 0x000091BE,
-	18785: 0x000091BD,
-	18786: 0x000091C2,
-	18787: 0x0000946B,
-	18788: 0x00009468,
-	18789: 0x00009469,
-	18790: 0x000096E5,
-	18791: 0x00009746,
-	18792: 0x00009743,
-	18793: 0x00009747,
-	18794: 0x000097C7,
-	18795: 0x000097E5,
-	18796: 0x00009A5E,
-	18797: 0x00009AD5,
-	18798: 0x00009B59,
-	18799: 0x00009C63,
-	18800: 0x00009C67,
-	18801: 0x00009C66,
-	18802: 0x00009C62,
-	18803: 0x00009C5E,
-	18804: 0x00009C60,
-	18805: 0x00009E02,
-	18806: 0x00009DFE,
-	18807: 0x00009E07,
-	18808: 0x00009E03,
-	18809: 0x00009E06,
-	18810: 0x00009E05,
-	18811: 0x00009E00,
-	18812: 0x00009E01,
-	18813: 0x00009E09,
-	18814: 0x00009DFF,
-	18815: 0x00009DFD,
-	18816: 0x00009E04,
-	18817: 0x00009EA0,
-	18818: 0x00009F1E,
-	18819: 0x00009F46,
-	18820: 0x00009F74,
-	18821: 0x00009F75,
-	18822: 0x00009F76,
-	18823: 0x000056D4,
-	18824: 0x0000652E,
-	18825: 0x000065B8,
-	18826: 0x00006B18,
-	18827: 0x00006B19,
-	18828: 0x00006B17,
-	18829: 0x00006B1A,
-	18830: 0x00007062,
-	18831: 0x00007226,
-	18832: 0x000072AA,
-	18833: 0x000077D8,
-	18834: 0x000077D9,
-	18835: 0x00007939,
-	18836: 0x00007C69,
-	18837: 0x00007C6B,
-	18838: 0x00007CF6,
-	18839: 0x00007E9A,
-	18840: 0x00007E98,
-	18841: 0x00007E9B,
-	18842: 0x00007E99,
-	18843: 0x000081E0,
-	18844: 0x000081E1,
-	18845: 0x00008646,
-	18846: 0x00008647,
-	18847: 0x00008648,
-	18848: 0x00008979,
-	18849: 0x0000897A,
-	18850: 0x0000897C,
-	18851: 0x0000897B,
-	18852: 0x000089FF,
-	18853: 0x00008B98,
-	18854: 0x00008B99,
-	18855: 0x00008EA5,
-	18856: 0x00008EA4,
-	18857: 0x00008EA3,
-	18858: 0x0000946E,
-	18859: 0x0000946D,
-	18860: 0x0000946F,
-	18861: 0x00009471,
-	18862: 0x00009473,
-	18863: 0x00009749,
-	18864: 0x00009872,
-	18865: 0x0000995F,
-	18866: 0x00009C68,
-	18867: 0x00009C6E,
-	18868: 0x00009C6D,
-	18869: 0x00009E0B,
-	18870: 0x00009E0D,
-	18871: 0x00009E10,
-	18872: 0x00009E0F,
-	18873: 0x00009E12,
-	18874: 0x00009E11,
-	18875: 0x00009EA1,
-	18876: 0x00009EF5,
-	18877: 0x00009F09,
-	18878: 0x00009F47,
-	18879: 0x00009F78,
-	18880: 0x00009F7B,
-	18881: 0x00009F7A,
-	18882: 0x00009F79,
-	18883: 0x0000571E,
-	18884: 0x00007066,
-	18885: 0x00007C6F,
-	18886: 0x0000883C,
-	18887: 0x00008DB2,
-	18888: 0x00008EA6,
-	18889: 0x000091C3,
-	18890: 0x00009474,
-	18891: 0x00009478,
-	18892: 0x00009476,
-	18893: 0x00009475,
-	18894: 0x00009A60,
-	18895: 0x00009C74,
-	18896: 0x00009C73,
-	18897: 0x00009C71,
-	18898: 0x00009C75,
-	18899: 0x00009E14,
-	18900: 0x00009E13,
-	18901: 0x00009EF6,
-	18902: 0x00009F0A,
-	18903: 0x00009FA4,
-	18904: 0x00007068,
-	18905: 0x00007065,
-	18906: 0x00007CF7,
-	18907: 0x0000866A,
-	18908: 0x0000883E,
-	18909: 0x0000883D,
-	18910: 0x0000883F,
-	18911: 0x00008B9E,
-	18912: 0x00008C9C,
-	18913: 0x00008EA9,
-	18914: 0x00008EC9,
-	18915: 0x0000974B,
-	18916: 0x00009873,
-	18917: 0x00009874,
-	18918: 0x000098CC,
-	18919: 0x00009961,
-	18920: 0x000099AB,
-	18921: 0x00009A64,
-	18922: 0x00009A66,
-	18923: 0x00009A67,
-	18924: 0x00009B24,
-	18925: 0x00009E15,
-	18926: 0x00009E17,
-	18927: 0x00009F48,
-	18928: 0x00006207,
-	18929: 0x00006B1E,
-	18930: 0x00007227,
-	18931: 0x0000864C,
-	18932: 0x00008EA8,
-	18933: 0x00009482,
-	18934: 0x00009480,
-	18935: 0x00009481,
-	18936: 0x00009A69,
-	18937: 0x00009A68,
-	18938: 0x00009B2E,
-	18939: 0x00009E19,
-	18940: 0x00007229,
-	18941: 0x0000864B,
-	18942: 0x00008B9F,
-	18943: 0x00009483,
-	18944: 0x00009C79,
-	18945: 0x00009EB7,
-	18946: 0x00007675,
-	18947: 0x00009A6B,
-	18948: 0x00009C7A,
-	18949: 0x00009E1D,
-	18950: 0x00007069,
-	18951: 0x0000706A,
-	18952: 0x00009EA4,
-	18953: 0x00009F7E,
-	18954: 0x00009F49,
-	18955: 0x00009F98,
-	18956: 0x00007881,
-	18957: 0x000092B9,
-	18958: 0x000088CF,
-	18959: 0x000058BB,
-	18960: 0x00006052,
-	18961: 0x00007CA7,
-	18962: 0x00005AFA,
-	18963: 0x00002554,
-	18964: 0x00002566,
-	18965: 0x00002557,
-	18966: 0x00002560,
-	18967: 0x0000256C,
-	18968: 0x00002563,
-	18969: 0x0000255A,
-	18970: 0x00002569,
-	18971: 0x0000255D,
-	18972: 0x00002552,
-	18973: 0x00002564,
-	18974: 0x00002555,
-	18975: 0x0000255E,
-	18976: 0x0000256A,
-	18977: 0x00002561,
-	18978: 0x00002558,
-	18979: 0x00002567,
-	18980: 0x0000255B,
-	18981: 0x00002553,
-	18982: 0x00002565,
-	18983: 0x00002556,
-	18984: 0x0000255F,
-	18985: 0x0000256B,
-	18986: 0x00002562,
-	18987: 0x00002559,
-	18988: 0x00002568,
-	18989: 0x0000255C,
-	18990: 0x00002551,
-	18991: 0x00002550,
-	18992: 0x0000256D,
-	18993: 0x0000256E,
-	18994: 0x00002570,
-	18995: 0x0000256F,
-	18996: 0x0000FFED,
-	18997: 0x00020547,
-	18998: 0x000092DB,
-	18999: 0x000205DF,
-	19000: 0x00023FC5,
-	19001: 0x0000854C,
-	19002: 0x000042B5,
-	19003: 0x000073EF,
-	19004: 0x000051B5,
-	19005: 0x00003649,
-	19006: 0x00024942,
-	19007: 0x000289E4,
-	19008: 0x00009344,
-	19009: 0x000219DB,
-	19010: 0x000082EE,
-	19011: 0x00023CC8,
-	19012: 0x0000783C,
-	19013: 0x00006744,
-	19014: 0x000062DF,
-	19015: 0x00024933,
-	19016: 0x000289AA,
-	19017: 0x000202A0,
-	19018: 0x00026BB3,
-	19019: 0x00021305,
-	19020: 0x00004FAB,
-	19021: 0x000224ED,
-	19022: 0x00005008,
-	19023: 0x00026D29,
-	19024: 0x00027A84,
-	19025: 0x00023600,
-	19026: 0x00024AB1,
-	19027: 0x00022513,
-	19028: 0x00005029,
-	19029: 0x0002037E,
-	19030: 0x00005FA4,
-	19031: 0x00020380,
-	19032: 0x00020347,
-	19033: 0x00006EDB,
-	19034: 0x0002041F,
-	19035: 0x0000507D,
-	19036: 0x00005101,
-	19037: 0x0000347A,
-	19038: 0x0000510E,
-	19039: 0x0000986C,
-	19040: 0x00003743,
-	19041: 0x00008416,
-	19042: 0x000249A4,
-	19043: 0x00020487,
-	19044: 0x00005160,
-	19045: 0x000233B4,
-	19046: 0x0000516A,
-	19047: 0x00020BFF,
-	19048: 0x000220FC,
-	19049: 0x000202E5,
-	19050: 0x00022530,
-	19051: 0x0002058E,
-	19052: 0x00023233,
-	19053: 0x00021983,
-	19054: 0x00005B82,
-	19055: 0x0000877D,
-	19056: 0x000205B3,
-	19057: 0x00023C99,
-	19058: 0x000051B2,
-	19059: 0x000051B8,
-	19060: 0x00009D34,
-	19061: 0x000051C9,
-	19062: 0x000051CF,
-	19063: 0x000051D1,
-	19064: 0x00003CDC,
-	19065: 0x000051D3,
-	19066: 0x00024AA6,
-	19067: 0x000051B3,
-	19068: 0x000051E2,
-	19069: 0x00005342,
-	19070: 0x000051ED,
-	19071: 0x000083CD,
-	19072: 0x0000693E,
-	19073: 0x0002372D,
-	19074: 0x00005F7B,
-	19075: 0x0000520B,
-	19076: 0x00005226,
-	19077: 0x0000523C,
-	19078: 0x000052B5,
-	19079: 0x00005257,
-	19080: 0x00005294,
-	19081: 0x000052B9,
-	19082: 0x000052C5,
-	19083: 0x00007C15,
-	19084: 0x00008542,
-	19085: 0x000052E0,
-	19086: 0x0000860D,
-	19087: 0x00026B13,
-	19088: 0x00005305,
-	19089: 0x00028ADE,
-	19090: 0x00005549,
-	19091: 0x00006ED9,
-	19092: 0x00023F80,
-	19093: 0x00020954,
-	19094: 0x00023FEC,
-	19095: 0x00005333,
-	19096: 0x00005344,
-	19097: 0x00020BE2,
-	19098: 0x00006CCB,
-	19099: 0x00021726,
-	19100: 0x0000681B,
-	19101: 0x000073D5,
-	19102: 0x0000604A,
-	19103: 0x00003EAA,
-	19104: 0x000038CC,
-	19105: 0x000216E8,
-	19106: 0x000071DD,
-	19107: 0x000044A2,
-	19108: 0x0000536D,
-	19109: 0x00005374,
-	19110: 0x000286AB,
-	19111: 0x0000537E,
-	19112: 0x0000537F,
-	19113: 0x00021596,
-	19114: 0x00021613,
-	19115: 0x000077E6,
-	19116: 0x00005393,
-	19117: 0x00028A9B,
-	19118: 0x000053A0,
-	19119: 0x000053AB,
-	19120: 0x000053AE,
-	19121: 0x000073A7,
-	19122: 0x00025772,
-	19123: 0x00003F59,
-	19124: 0x0000739C,
-	19125: 0x000053C1,
-	19126: 0x000053C5,
-	19127: 0x00006C49,
-	19128: 0x00004E49,
-	19129: 0x000057FE,
-	19130: 0x000053D9,
-	19131: 0x00003AAB,
-	19132: 0x00020B8F,
-	19133: 0x000053E0,
-	19134: 0x00023FEB,
-	19135: 0x00022DA3,
-	19136: 0x000053F6,
-	19137: 0x00020C77,
-	19138: 0x00005413,
-	19139: 0x00007079,
-	19140: 0x0000552B,
-	19141: 0x00006657,
-	19142: 0x00006D5B,
-	19143: 0x0000546D,
-	19144: 0x00026B53,
-	19145: 0x00020D74,
-	19146: 0x0000555D,
-	19147: 0x0000548F,
-	19148: 0x000054A4,
-	19149: 0x000047A6,
-	19150: 0x0002170D,
-	19151: 0x00020EDD,
-	19152: 0x00003DB4,
-	19153: 0x00020D4D,
-	19154: 0x000289BC,
-	19155: 0x00022698,
-	19156: 0x00005547,
-	19157: 0x00004CED,
-	19158: 0x0000542F,
-	19159: 0x00007417,
-	19160: 0x00005586,
-	19161: 0x000055A9,
-	19162: 0x00005605,
-	19163: 0x000218D7,
-	19164: 0x0002403A,
-	19165: 0x00004552,
-	19166: 0x00024435,
-	19167: 0x000066B3,
-	19168: 0x000210B4,
-	19169: 0x00005637,
-	19170: 0x000066CD,
-	19171: 0x0002328A,
-	19172: 0x000066A4,
-	19173: 0x000066AD,
-	19174: 0x0000564D,
-	19175: 0x0000564F,
-	19176: 0x000078F1,
-	19177: 0x000056F1,
-	19178: 0x00009787,
-	19179: 0x000053FE,
-	19180: 0x00005700,
-	19181: 0x000056EF,
-	19182: 0x000056ED,
-	19183: 0x00028B66,
-	19184: 0x00003623,
-	19185: 0x0002124F,
-	19186: 0x00005746,
-	19187: 0x000241A5,
-	19188: 0x00006C6E,
-	19189: 0x0000708B,
-	19190: 0x00005742,
-	19191: 0x000036B1,
-	19192: 0x00026C7E,
-	19193: 0x000057E6,
-	19194: 0x00021416,
-	19195: 0x00005803,
-	19196: 0x00021454,
-	19197: 0x00024363,
-	19198: 0x00005826,
-	19199: 0x00024BF5,
-	19200: 0x0000585C,
-	19201: 0x000058AA,
-	19202: 0x00003561,
-	19203: 0x000058E0,
-	19204: 0x000058DC,
-	19205: 0x0002123C,
-	19206: 0x000058FB,
-	19207: 0x00005BFF,
-	19208: 0x00005743,
-	19209: 0x0002A150,
-	19210: 0x00024278,
-	19211: 0x000093D3,
-	19212: 0x000035A1,
-	19213: 0x0000591F,
-	19214: 0x000068A6,
-	19215: 0x000036C3,
-	19216: 0x00006E59,
-	19217: 0x0002163E,
-	19218: 0x00005A24,
-	19219: 0x00005553,
-	19220: 0x00021692,
-	19221: 0x00008505,
-	19222: 0x000059C9,
-	19223: 0x00020D4E,
-	19224: 0x00026C81,
-	19225: 0x00026D2A,
-	19226: 0x000217DC,
-	19227: 0x000059D9,
-	19228: 0x000217FB,
-	19229: 0x000217B2,
-	19230: 0x00026DA6,
-	19231: 0x00006D71,
-	19232: 0x00021828,
-	19233: 0x000216D5,
-	19234: 0x000059F9,
-	19235: 0x00026E45,
-	19236: 0x00005AAB,
-	19237: 0x00005A63,
-	19238: 0x000036E6,
-	19239: 0x000249A9,
-	19240: 0x00005A77,
-	19241: 0x00003708,
-	19242: 0x00005A96,
-	19243: 0x00007465,
-	19244: 0x00005AD3,
-	19245: 0x00026FA1,
-	19246: 0x00022554,
-	19247: 0x00003D85,
-	19248: 0x00021911,
-	19249: 0x00003732,
-	19250: 0x000216B8,
-	19251: 0x00005E83,
-	19252: 0x000052D0,
-	19253: 0x00005B76,
-	19254: 0x00006588,
-	19255: 0x00005B7C,
-	19256: 0x00027A0E,
-	19257: 0x00004004,
-	19258: 0x0000485D,
-	19259: 0x00020204,
-	19260: 0x00005BD5,
-	19261: 0x00006160,
-	19262: 0x00021A34,
-	19263: 0x000259CC,
-	19264: 0x000205A5,
-	19265: 0x00005BF3,
-	19266: 0x00005B9D,
-	19267: 0x00004D10,
-	19268: 0x00005C05,
-	19269: 0x00021B44,
-	19270: 0x00005C13,
-	19271: 0x000073CE,
-	19272: 0x00005C14,
-	19273: 0x00021CA5,
-	19274: 0x00026B28,
-	19275: 0x00005C49,
-	19276: 0x000048DD,
-	19277: 0x00005C85,
-	19278: 0x00005CE9,
-	19279: 0x00005CEF,
-	19280: 0x00005D8B,
-	19281: 0x00021DF9,
-	19282: 0x00021E37,
-	19283: 0x00005D10,
-	19284: 0x00005D18,
-	19285: 0x00005D46,
-	19286: 0x00021EA4,
-	19287: 0x00005CBA,
-	19288: 0x00005DD7,
-	19289: 0x000082FC,
-	19290: 0x0000382D,
-	19291: 0x00024901,
-	19292: 0x00022049,
-	19293: 0x00022173,
-	19294: 0x00008287,
-	19295: 0x00003836,
-	19296: 0x00003BC2,
-	19297: 0x00005E2E,
-	19298: 0x00006A8A,
-	19299: 0x00005E75,
-	19300: 0x00005E7A,
-	19301: 0x000244BC,
-	19302: 0x00020CD3,
-	19303: 0x000053A6,
-	19304: 0x00004EB7,
-	19305: 0x00005ED0,
-	19306: 0x000053A8,
-	19307: 0x00021771,
-	19308: 0x00005E09,
-	19309: 0x00005EF4,
-	19310: 0x00028482,
-	19311: 0x00005EF9,
-	19312: 0x00005EFB,
-	19313: 0x000038A0,
-	19314: 0x00005EFC,
-	19315: 0x0000683E,
-	19316: 0x0000941B,
-	19317: 0x00005F0D,
-	19318: 0x000201C1,
-	19319: 0x0002F894,
-	19320: 0x00003ADE,
-	19321: 0x000048AE,
-	19322: 0x0002133A,
-	19323: 0x00005F3A,
-	19324: 0x00026888,
-	19325: 0x000223D0,
-	19326: 0x00005F58,
-	19327: 0x00022471,
-	19328: 0x00005F63,
-	19329: 0x000097BD,
-	19330: 0x00026E6E,
-	19331: 0x00005F72,
-	19332: 0x00009340,
-	19333: 0x00028A36,
-	19334: 0x00005FA7,
-	19335: 0x00005DB6,
-	19336: 0x00003D5F,
-	19337: 0x00025250,
-	19338: 0x00021F6A,
-	19339: 0x000270F8,
-	19340: 0x00022668,
-	19341: 0x000091D6,
-	19342: 0x0002029E,
-	19343: 0x00028A29,
-	19344: 0x00006031,
-	19345: 0x00006685,
-	19346: 0x00021877,
-	19347: 0x00003963,
-	19348: 0x00003DC7,
-	19349: 0x00003639,
-	19350: 0x00005790,
-	19351: 0x000227B4,
-	19352: 0x00007971,
-	19353: 0x00003E40,
-	19354: 0x0000609E,
-	19355: 0x000060A4,
-	19356: 0x000060B3,
-	19357: 0x00024982,
-	19358: 0x0002498F,
-	19359: 0x00027A53,
-	19360: 0x000074A4,
-	19361: 0x000050E1,
-	19362: 0x00005AA0,
-	19363: 0x00006164,
-	19364: 0x00008424,
-	19365: 0x00006142,
-	19366: 0x0002F8A6,
-	19367: 0x00026ED2,
-	19368: 0x00006181,
-	19369: 0x000051F4,
-	19370: 0x00020656,
-	19371: 0x00006187,
-	19372: 0x00005BAA,
-	19373: 0x00023FB7,
-	19374: 0x0002285F,
-	19375: 0x000061D3,
-	19376: 0x00028B9D,
-	19377: 0x0002995D,
-	19378: 0x000061D0,
-	19379: 0x00003932,
-	19380: 0x00022980,
-	19381: 0x000228C1,
-	19382: 0x00006023,
-	19383: 0x0000615C,
-	19384: 0x0000651E,
-	19385: 0x0000638B,
-	19386: 0x00020118,
-	19387: 0x000062C5,
-	19388: 0x00021770,
-	19389: 0x000062D5,
-	19390: 0x00022E0D,
-	19391: 0x0000636C,
-	19392: 0x000249DF,
-	19393: 0x00003A17,
-	19394: 0x00006438,
-	19395: 0x000063F8,
-	19396: 0x0002138E,
-	19397: 0x000217FC,
-	19398: 0x00006490,
-	19399: 0x00006F8A,
-	19400: 0x00022E36,
-	19401: 0x00009814,
-	19402: 0x0002408C,
-	19403: 0x0002571D,
-	19404: 0x000064E1,
-	19405: 0x000064E5,
-	19406: 0x0000947B,
-	19407: 0x00003A66,
-	19408: 0x0000643A,
-	19409: 0x00003A57,
-	19410: 0x0000654D,
-	19411: 0x00006F16,
-	19412: 0x00024A28,
-	19413: 0x00024A23,
-	19414: 0x00006585,
-	19415: 0x0000656D,
-	19416: 0x0000655F,
-	19417: 0x0002307E,
-	19418: 0x000065B5,
-	19419: 0x00024940,
-	19420: 0x00004B37,
-	19421: 0x000065D1,
-	19422: 0x000040D8,
-	19423: 0x00021829,
-	19424: 0x000065E0,
-	19425: 0x000065E3,
-	19426: 0x00005FDF,
-	19427: 0x00023400,
-	19428: 0x00006618,
-	19429: 0x000231F7,
-	19430: 0x000231F8,
-	19431: 0x00006644,
-	19432: 0x000231A4,
-	19433: 0x000231A5,
-	19434: 0x0000664B,
-	19435: 0x00020E75,
-	19436: 0x00006667,
-	19437: 0x000251E6,
-	19438: 0x00006673,
-	19439: 0x00006674,
-	19440: 0x00021E3D,
-	19441: 0x00023231,
-	19442: 0x000285F4,
-	19443: 0x000231C8,
-	19444: 0x00025313,
-	19445: 0x000077C5,
-	19446: 0x000228F7,
-	19447: 0x000099A4,
-	19448: 0x00006702,
-	19449: 0x0002439C,
-	19450: 0x00024A21,
-	19451: 0x00003B2B,
-	19452: 0x000069FA,
-	19453: 0x000237C2,
-	19454: 0x0000675E,
-	19455: 0x00006767,
-	19456: 0x00006762,
-	19457: 0x000241CD,
-	19458: 0x000290ED,
-	19459: 0x000067D7,
-	19460: 0x000044E9,
-	19461: 0x00006822,
-	19462: 0x00006E50,
-	19463: 0x0000923C,
-	19464: 0x00006801,
-	19465: 0x000233E6,
-	19466: 0x00026DA0,
-	19467: 0x0000685D,
-	19468: 0x0002346F,
-	19469: 0x000069E1,
-	19470: 0x00006A0B,
-	19471: 0x00028ADF,
-	19472: 0x00006973,
-	19473: 0x000068C3,
-	19474: 0x000235CD,
-	19475: 0x00006901,
-	19476: 0x00006900,
-	19477: 0x00003D32,
-	19478: 0x00003A01,
-	19479: 0x0002363C,
-	19480: 0x00003B80,
-	19481: 0x000067AC,
-	19482: 0x00006961,
-	19483: 0x00028A4A,
-	19484: 0x000042FC,
-	19485: 0x00006936,
-	19486: 0x00006998,
-	19487: 0x00003BA1,
-	19488: 0x000203C9,
-	19489: 0x00008363,
-	19490: 0x00005090,
-	19491: 0x000069F9,
-	19492: 0x00023659,
-	19493: 0x0002212A,
-	19494: 0x00006A45,
-	19495: 0x00023703,
-	19496: 0x00006A9D,
-	19497: 0x00003BF3,
-	19498: 0x000067B1,
-	19499: 0x00006AC8,
-	19500: 0x0002919C,
-	19501: 0x00003C0D,
-	19502: 0x00006B1D,
-	19503: 0x00020923,
-	19504: 0x000060DE,
-	19505: 0x00006B35,
-	19506: 0x00006B74,
-	19507: 0x000227CD,
-	19508: 0x00006EB5,
-	19509: 0x00023ADB,
-	19510: 0x000203B5,
-	19511: 0x00021958,
-	19512: 0x00003740,
-	19513: 0x00005421,
-	19514: 0x00023B5A,
-	19515: 0x00006BE1,
-	19516: 0x00023EFC,
-	19517: 0x00006BDC,
-	19518: 0x00006C37,
-	19519: 0x0002248B,
-	19520: 0x000248F1,
-	19521: 0x00026B51,
-	19522: 0x00006C5A,
-	19523: 0x00008226,
-	19524: 0x00006C79,
-	19525: 0x00023DBC,
-	19526: 0x000044C5,
-	19527: 0x00023DBD,
-	19528: 0x000241A4,
-	19529: 0x0002490C,
-	19530: 0x00024900,
-	19531: 0x00023CC9,
-	19532: 0x000036E5,
-	19533: 0x00003CEB,
-	19534: 0x00020D32,
-	19535: 0x00009B83,
-	19536: 0x000231F9,
-	19537: 0x00022491,
-	19538: 0x00007F8F,
-	19539: 0x00006837,
-	19540: 0x00026D25,
-	19541: 0x00026DA1,
-	19542: 0x00026DEB,
-	19543: 0x00006D96,
-	19544: 0x00006D5C,
-	19545: 0x00006E7C,
-	19546: 0x00006F04,
-	19547: 0x0002497F,
-	19548: 0x00024085,
-	19549: 0x00026E72,
-	19550: 0x00008533,
-	19551: 0x00026F74,
-	19552: 0x000051C7,
-	19553: 0x00006C9C,
-	19554: 0x00006E1D,
-	19555: 0x0000842E,
-	19556: 0x00028B21,
-	19557: 0x00006E2F,
-	19558: 0x00023E2F,
-	19559: 0x00007453,
-	19560: 0x00023F82,
-	19561: 0x000079CC,
-	19562: 0x00006E4F,
-	19563: 0x00005A91,
-	19564: 0x0002304B,
-	19565: 0x00006FF8,
-	19566: 0x0000370D,
-	19567: 0x00006F9D,
-	19568: 0x00023E30,
-	19569: 0x00006EFA,
-	19570: 0x00021497,
-	19571: 0x0002403D,
-	19572: 0x00004555,
-	19573: 0x000093F0,
-	19574: 0x00006F44,
-	19575: 0x00006F5C,
-	19576: 0x00003D4E,
-	19577: 0x00006F74,
-	19578: 0x00029170,
-	19579: 0x00003D3B,
-	19580: 0x00006F9F,
-	19581: 0x00024144,
-	19582: 0x00006FD3,
-	19583: 0x00024091,
-	19584: 0x00024155,
-	19585: 0x00024039,
-	19586: 0x00023FF0,
-	19587: 0x00023FB4,
-	19588: 0x0002413F,
-	19589: 0x000051DF,
-	19590: 0x00024156,
-	19591: 0x00024157,
-	19592: 0x00024140,
-	19593: 0x000261DD,
-	19594: 0x0000704B,
-	19595: 0x0000707E,
-	19596: 0x000070A7,
-	19597: 0x00007081,
-	19598: 0x000070CC,
-	19599: 0x000070D5,
-	19600: 0x000070D6,
-	19601: 0x000070DF,
-	19602: 0x00004104,
-	19603: 0x00003DE8,
-	19604: 0x000071B4,
-	19605: 0x00007196,
-	19606: 0x00024277,
-	19607: 0x0000712B,
-	19608: 0x00007145,
-	19609: 0x00005A88,
-	19610: 0x0000714A,
-	19611: 0x0000716E,
-	19612: 0x00005C9C,
-	19613: 0x00024365,
-	19614: 0x0000714F,
-	19615: 0x00009362,
-	19616: 0x000242C1,
-	19617: 0x0000712C,
-	19618: 0x0002445A,
-	19619: 0x00024A27,
-	19620: 0x00024A22,
-	19621: 0x000071BA,
-	19622: 0x00028BE8,
-	19623: 0x000070BD,
-	19624: 0x0000720E,
-	19625: 0x00009442,
-	19626: 0x00007215,
-	19627: 0x00005911,
-	19628: 0x00009443,
-	19629: 0x00007224,
-	19630: 0x00009341,
-	19631: 0x00025605,
-	19632: 0x0000722E,
-	19633: 0x00007240,
-	19634: 0x00024974,
-	19635: 0x000068BD,
-	19636: 0x00007255,
-	19637: 0x00007257,
-	19638: 0x00003E55,
-	19639: 0x00023044,
-	19640: 0x0000680D,
-	19641: 0x00006F3D,
-	19642: 0x00007282,
-	19643: 0x0000732A,
-	19644: 0x0000732B,
-	19645: 0x00024823,
-	19646: 0x0002882B,
-	19647: 0x000048ED,
-	19648: 0x00028804,
-	19649: 0x00007328,
-	19650: 0x0000732E,
-	19651: 0x000073CF,
-	19652: 0x000073AA,
-	19653: 0x00020C3A,
-	19654: 0x00026A2E,
-	19655: 0x000073C9,
-	19656: 0x00007449,
-	19657: 0x000241E2,
-	19658: 0x000216E7,
-	19659: 0x00024A24,
-	19660: 0x00006623,
-	19661: 0x000036C5,
-	19662: 0x000249B7,
-	19663: 0x0002498D,
-	19664: 0x000249FB,
-	19665: 0x000073F7,
-	19666: 0x00007415,
-	19667: 0x00006903,
-	19668: 0x00024A26,
-	19669: 0x00007439,
-	19670: 0x000205C3,
-	19671: 0x00003ED7,
-	19672: 0x0000745C,
-	19673: 0x000228AD,
-	19674: 0x00007460,
-	19675: 0x00028EB2,
-	19676: 0x00007447,
-	19677: 0x000073E4,
-	19678: 0x00007476,
-	19679: 0x000083B9,
-	19680: 0x0000746C,
-	19681: 0x00003730,
-	19682: 0x00007474,
-	19683: 0x000093F1,
-	19684: 0x00006A2C,
-	19685: 0x00007482,
-	19686: 0x00004953,
-	19687: 0x00024A8C,
-	19688: 0x0002415F,
-	19689: 0x00024A79,
-	19690: 0x00028B8F,
-	19691: 0x00005B46,
-	19692: 0x00028C03,
-	19693: 0x0002189E,
-	19694: 0x000074C8,
-	19695: 0x00021988,
-	19696: 0x0000750E,
-	19697: 0x000074E9,
-	19698: 0x0000751E,
-	19699: 0x00028ED9,
-	19700: 0x00021A4B,
-	19701: 0x00005BD7,
-	19702: 0x00028EAC,
-	19703: 0x00009385,
-	19704: 0x0000754D,
-	19705: 0x0000754A,
-	19706: 0x00007567,
-	19707: 0x0000756E,
-	19708: 0x00024F82,
-	19709: 0x00003F04,
-	19710: 0x00024D13,
-	19711: 0x0000758E,
-	19712: 0x0000745D,
-	19713: 0x0000759E,
-	19714: 0x000075B4,
-	19715: 0x00007602,
-	19716: 0x0000762C,
-	19717: 0x00007651,
-	19718: 0x0000764F,
-	19719: 0x0000766F,
-	19720: 0x00007676,
-	19721: 0x000263F5,
-	19722: 0x00007690,
-	19723: 0x000081EF,
-	19724: 0x000037F8,
-	19725: 0x00026911,
-	19726: 0x0002690E,
-	19727: 0x000076A1,
-	19728: 0x000076A5,
-	19729: 0x000076B7,
-	19730: 0x000076CC,
-	19731: 0x00026F9F,
-	19732: 0x00008462,
-	19733: 0x0002509D,
-	19734: 0x0002517D,
-	19735: 0x00021E1C,
-	19736: 0x0000771E,
-	19737: 0x00007726,
-	19738: 0x00007740,
-	19739: 0x000064AF,
-	19740: 0x00025220,
-	19741: 0x00007758,
-	19742: 0x000232AC,
-	19743: 0x000077AF,
-	19744: 0x00028964,
-	19745: 0x00028968,
-	19746: 0x000216C1,
-	19747: 0x000077F4,
-	19748: 0x00007809,
-	19749: 0x00021376,
-	19750: 0x00024A12,
-	19751: 0x000068CA,
-	19752: 0x000078AF,
-	19753: 0x000078C7,
-	19754: 0x000078D3,
-	19755: 0x000096A5,
-	19756: 0x0000792E,
-	19757: 0x000255E0,
-	19758: 0x000078D7,
-	19759: 0x00007934,
-	19760: 0x000078B1,
-	19761: 0x0002760C,
-	19762: 0x00008FB8,
-	19763: 0x00008884,
-	19764: 0x00028B2B,
-	19765: 0x00026083,
-	19766: 0x0002261C,
-	19767: 0x00007986,
-	19768: 0x00008900,
-	19769: 0x00006902,
-	19770: 0x00007980,
-	19771: 0x00025857,
-	19772: 0x0000799D,
-	19773: 0x00027B39,
-	19774: 0x0000793C,
-	19775: 0x000079A9,
-	19776: 0x00006E2A,
-	19777: 0x00027126,
-	19778: 0x00003EA8,
-	19779: 0x000079C6,
-	19780: 0x0002910D,
-	19781: 0x000079D4,
-}
-
-const numEncodeTables = 8
-
-// encodeX are the encoding tables from Unicode to Big5 code,
-// sorted by decreasing length.
-// encode0: 42633 entries for runes in [131105, 173738).
-// encode1: 29004 entries for runes in [ 11904,  40908).
-// encode2:  2176 entries for runes in [  7870,  10046).
-// encode3:   939 entries for runes in [   167,   1106).
-// encode4:   446 entries for runes in [ 65072,  65518).
-// encode5:   432 entries for runes in [194597, 195029).
-// encode6:   263 entries for runes in [ 63751,  64014).
-// encode7:     1 entries for runes in [175615, 175616).
-
-const encode0Low, encode0High = 131105, 173738
-
-var encode0 = [...]uint16{
-	131105 - 131105: 0x9C71,
-	131134 - 131105: 0x9375,
-	131142 - 131105: 0x9376,
-	131150 - 131105: 0x9548,
-	131176 - 131105: 0x8EC6,
-	131206 - 131105: 0x8BC5,
-	131207 - 131105: 0x8BFA,
-	131210 - 131105: 0xC87C,
-	131220 - 131105: 0x9AB4,
-	131274 - 131105: 0x884E,
-	131275 - 131105: 0x884B,
-	131276 - 131105: 0xC87A,
-	131277 - 131105: 0x8848,
-	131281 - 131105: 0x8847,
-	131310 - 131105: 0xA0F6,
-	131340 - 131105: 0x8845,
-	131342 - 131105: 0x8853,
-	131352 - 131105: 0xFCAD,
-	131492 - 131105: 0x8CF5,
-	131497 - 131105: 0x8AAD,
-	131499 - 131105: 0x9272,
-	131521 - 131105: 0xFC47,
-	131540 - 131105: 0x94DF,
-	131570 - 131105: 0x9FD1,
-	131588 - 131105: 0xFBCB,
-	131596 - 131105: 0x927D,
-	131604 - 131105: 0x98A4,
-	131641 - 131105: 0x8CF9,
-	131675 - 131105: 0x94E7,
-	131700 - 131105: 0x90CB,
-	131701 - 131105: 0x927B,
-	131737 - 131105: 0x94D8,
-	131742 - 131105: 0xFC5F,
-	131744 - 131105: 0xFA54,
-	131767 - 131105: 0x9AB5,
-	131775 - 131105: 0x96DA,
-	131776 - 131105: 0x9279,
-	131813 - 131105: 0xFA74,
-	131850 - 131105: 0x9275,
-	131877 - 131105: 0x8DFB,
-	131905 - 131105: 0x8A49,
-	131909 - 131105: 0x92DF,
-	131910 - 131105: 0x9B7C,
-	131911 - 131105: 0xFA63,
-	131966 - 131105: 0xFA60,
-	131967 - 131105: 0x926D,
-	131968 - 131105: 0xFA62,
-	132000 - 131105: 0x9AB6,
-	132007 - 131105: 0x976B,
-	132021 - 131105: 0xFD6A,
-	132041 - 131105: 0xFD54,
-	132043 - 131105: 0x9273,
-	132085 - 131105: 0x97D8,
-	132092 - 131105: 0x9FBB,
-	132115 - 131105: 0x9342,
-	132116 - 131105: 0x9276,
-	132127 - 131105: 0xFA65,
-	132197 - 131105: 0x926C,
-	132231 - 131105: 0xFA6E,
-	132238 - 131105: 0x9EE0,
-	132241 - 131105: 0x92C0,
-	132242 - 131105: 0x92BF,
-	132259 - 131105: 0x92BE,
-	132311 - 131105: 0x9ABA,
-	132348 - 131105: 0x8AB3,
-	132350 - 131105: 0x9775,
-	132423 - 131105: 0xFA40,
-	132494 - 131105: 0xFA76,
-	132517 - 131105: 0xFBD0,
-	132531 - 131105: 0xFA7B,
-	132547 - 131105: 0xFE6D,
-	132554 - 131105: 0x9BB3,
-	132560 - 131105: 0x89CC,
-	132565 - 131105: 0x9ABE,
-	132575 - 131105: 0xFA42,
-	132576 - 131105: 0x92BC,
-	132587 - 131105: 0x945C,
-	132625 - 131105: 0x9BB5,
-	132629 - 131105: 0x9ABF,
-	132633 - 131105: 0x98A7,
-	132634 - 131105: 0x97A4,
-	132656 - 131105: 0x90FD,
-	132694 - 131105: 0xFC7B,
-	132726 - 131105: 0x9AC0,
-	132878 - 131105: 0x92C3,
-	132913 - 131105: 0x8AAA,
-	132985 - 131105: 0x9BD0,
-	133164 - 131105: 0x9550,
-	133235 - 131105: 0x92C6,
-	133333 - 131105: 0x98A6,
-	133398 - 131105: 0x9546,
-	133411 - 131105: 0xFD63,
-	133460 - 131105: 0xFAC2,
-	133497 - 131105: 0x9EC3,
-	133607 - 131105: 0x89B2,
-	133649 - 131105: 0x9C66,
-	133712 - 131105: 0x9053,
-	133743 - 131105: 0x8C62,
-	133770 - 131105: 0x87A8,
-	133812 - 131105: 0x97C1,
-	133826 - 131105: 0x9AC4,
-	133837 - 131105: 0x9AC5,
-	133901 - 131105: 0x8EEF,
-	134031 - 131105: 0xFAE9,
-	134047 - 131105: 0x8D40,
-	134056 - 131105: 0x9262,
-	134057 - 131105: 0x8AF7,
-	134079 - 131105: 0x9AC6,
-	134086 - 131105: 0x92E1,
-	134091 - 131105: 0x9AC9,
-	134114 - 131105: 0xFAC6,
-	134123 - 131105: 0x97A5,
-	134139 - 131105: 0x9ACB,
-	134143 - 131105: 0xFA72,
-	134155 - 131105: 0x8A5E,
-	134157 - 131105: 0x94E0,
-	134176 - 131105: 0x92CC,
-	134196 - 131105: 0x8AE5,
-	134202 - 131105: 0xFE5C,
-	134203 - 131105: 0x9ACC,
-	134209 - 131105: 0x9DF9,
-	134210 - 131105: 0x8A43,
-	134211 - 131105: 0x8AA6,
-	134227 - 131105: 0x9ACD,
-	134245 - 131105: 0x9ACE,
-	134263 - 131105: 0xFAEE,
-	134264 - 131105: 0x9BCC,
-	134268 - 131105: 0x9ACF,
-	134285 - 131105: 0x9AD1,
-	134294 - 131105: 0x9DFA,
-	134300 - 131105: 0x9D7C,
-	134325 - 131105: 0x9AD3,
-	134328 - 131105: 0x97A6,
-	134351 - 131105: 0x995F,
-	134355 - 131105: 0xFBF6,
-	134356 - 131105: 0x9FC5,
-	134357 - 131105: 0x8A59,
-	134358 - 131105: 0x8B6B,
-	134365 - 131105: 0x9AD4,
-	134381 - 131105: 0x9AD5,
-	134399 - 131105: 0x97A2,
-	134421 - 131105: 0x8A44,
-	134440 - 131105: 0x9F4A,
-	134449 - 131105: 0x90A1,
-	134450 - 131105: 0xFDA4,
-	134470 - 131105: 0x8A64,
-	134471 - 131105: 0x8AF2,
-	134472 - 131105: 0x8AF8,
-	134473 - 131105: 0x9DD8,
-	134476 - 131105: 0x94D6,
-	134477 - 131105: 0xFAFE,
-	134478 - 131105: 0xFBA7,
-	134511 - 131105: 0x9AD6,
-	134513 - 131105: 0x9F4D,
-	134516 - 131105: 0xFAF6,
-	134524 - 131105: 0x8A57,
-	134526 - 131105: 0x8B43,
-	134527 - 131105: 0x8B44,
-	134550 - 131105: 0x8AB6,
-	134556 - 131105: 0x8AC0,
-	134567 - 131105: 0x9E54,
-	134578 - 131105: 0x9AD7,
-	134600 - 131105: 0x9AD8,
-	134660 - 131105: 0x9ADC,
-	134665 - 131105: 0x8ACA,
-	134666 - 131105: 0x9EA8,
-	134669 - 131105: 0x9263,
-	134670 - 131105: 0x9ADD,
-	134671 - 131105: 0x8B65,
-	134672 - 131105: 0x8B6F,
-	134673 - 131105: 0x8B7E,
-	134678 - 131105: 0x8F43,
-	134685 - 131105: 0x92D0,
-	134732 - 131105: 0x8AF4,
-	134765 - 131105: 0x9DBE,
-	134771 - 131105: 0x9AE1,
-	134773 - 131105: 0xFCDE,
-	134774 - 131105: 0x9DFD,
-	134775 - 131105: 0x8B66,
-	134776 - 131105: 0x8B70,
-	134777 - 131105: 0x8B75,
-	134778 - 131105: 0x8AE4,
-	134779 - 131105: 0x8BA4,
-	134796 - 131105: 0x8AED,
-	134806 - 131105: 0x8A5D,
-	134808 - 131105: 0x8B48,
-	134813 - 131105: 0x9DED,
-	134818 - 131105: 0x9E40,
-	134826 - 131105: 0x8AEF,
-	134827 - 131105: 0x8AF6,
-	134828 - 131105: 0x9E76,
-	134838 - 131105: 0x9EE3,
-	134871 - 131105: 0x9ADE,
-	134872 - 131105: 0x8DFE,
-	134877 - 131105: 0xFAFC,
-	134904 - 131105: 0x9CB1,
-	134905 - 131105: 0x9E77,
-	134906 - 131105: 0x8B64,
-	134907 - 131105: 0x8B67,
-	134941 - 131105: 0x974B,
-	134950 - 131105: 0x9653,
-	134957 - 131105: 0x9AE0,
-	134958 - 131105: 0x8B4A,
-	134960 - 131105: 0x8AF1,
-	134961 - 131105: 0x8AD7,
-	134971 - 131105: 0xA0AB,
-	134988 - 131105: 0x8AB5,
-	135012 - 131105: 0x8A5F,
-	135053 - 131105: 0x8AEE,
-	135056 - 131105: 0x9ADF,
-	135085 - 131105: 0x8AFE,
-	135092 - 131105: 0x8A58,
-	135093 - 131105: 0x8BA3,
-	135094 - 131105: 0x8BA7,
-	135100 - 131105: 0x9AE3,
-	135135 - 131105: 0x9261,
-	135146 - 131105: 0x9DD7,
-	135147 - 131105: 0x9E7D,
-	135148 - 131105: 0x9EA7,
-	135149 - 131105: 0x9EAB,
-	135188 - 131105: 0x9042,
-	135197 - 131105: 0x8B79,
-	135198 - 131105: 0x8B7A,
-	135247 - 131105: 0x9AE6,
-	135260 - 131105: 0x9AE5,
-	135279 - 131105: 0x8A7E,
-	135285 - 131105: 0x9E44,
-	135286 - 131105: 0x9AE7,
-	135287 - 131105: 0x8A7C,
-	135288 - 131105: 0x8B71,
-	135291 - 131105: 0x9AE9,
-	135304 - 131105: 0x9AEA,
-	135318 - 131105: 0x9AEB,
-	135325 - 131105: 0x8ABD,
-	135348 - 131105: 0xFB4E,
-	135359 - 131105: 0x9AED,
-	135360 - 131105: 0x8AF9,
-	135361 - 131105: 0x9E63,
-	135367 - 131105: 0x8B49,
-	135368 - 131105: 0x8ACE,
-	135369 - 131105: 0x8B6E,
-	135375 - 131105: 0x8AE8,
-	135379 - 131105: 0x9AEE,
-	135396 - 131105: 0x92CE,
-	135412 - 131105: 0x8A5A,
-	135413 - 131105: 0x8B7B,
-	135414 - 131105: 0x8B7C,
-	135471 - 131105: 0x9AEF,
-	135483 - 131105: 0x9AF0,
-	135485 - 131105: 0x8AFA,
-	135493 - 131105: 0x8941,
-	135496 - 131105: 0x8B72,
-	135503 - 131105: 0x8AF3,
-	135552 - 131105: 0x8BA8,
-	135559 - 131105: 0x9EAE,
-	135641 - 131105: 0x9E72,
-	135740 - 131105: 0xFB73,
-	135759 - 131105: 0xFB5F,
-	135804 - 131105: 0x90BA,
-	135848 - 131105: 0x91FE,
-	135849 - 131105: 0x9EF6,
-	135856 - 131105: 0x97ED,
-	135907 - 131105: 0x9AF3,
-	135934 - 131105: 0xA0EE,
-	135938 - 131105: 0x967C,
-	135939 - 131105: 0x9345,
-	135940 - 131105: 0x986E,
-	135941 - 131105: 0xFA56,
-	135990 - 131105: 0x9AF5,
-	135994 - 131105: 0xFC4B,
-	136053 - 131105: 0x9AF4,
-	136054 - 131105: 0xFEDE,
-	136078 - 131105: 0xFCB7,
-	136088 - 131105: 0x97F1,
-	136092 - 131105: 0x97C7,
-	136133 - 131105: 0x9CCB,
-	136134 - 131105: 0x9240,
-	136173 - 131105: 0x9CE8,
-	136190 - 131105: 0x91FD,
-	136211 - 131105: 0x974E,
-	136214 - 131105: 0xFB68,
-	136228 - 131105: 0x976C,
-	136255 - 131105: 0x8CC2,
-	136274 - 131105: 0x97E8,
-	136276 - 131105: 0xFB6A,
-	136277 - 131105: 0x8B74,
-	136330 - 131105: 0x8EE7,
-	136343 - 131105: 0xFDC8,
-	136374 - 131105: 0x9241,
-	136424 - 131105: 0x96A1,
-	136445 - 131105: 0x8EF3,
-	136567 - 131105: 0x9AF7,
-	136578 - 131105: 0x8FA6,
-	136598 - 131105: 0xFAD6,
-	136714 - 131105: 0x9CC7,
-	136723 - 131105: 0xFAD7,
-	136729 - 131105: 0x9AF8,
-	136766 - 131105: 0xFBA1,
-	136801 - 131105: 0x8EC5,
-	136850 - 131105: 0xFBA4,
-	136888 - 131105: 0xFBC2,
-	136890 - 131105: 0x9AC1,
-	136896 - 131105: 0x91FA,
-	136897 - 131105: 0xFEDB,
-	136898 - 131105: 0x97AB,
-	136915 - 131105: 0x9147,
-	136917 - 131105: 0xFBB1,
-	136927 - 131105: 0x8FEA,
-	136934 - 131105: 0x94D2,
-	136935 - 131105: 0xFE61,
-	136936 - 131105: 0xFACE,
-	136954 - 131105: 0x92ED,
-	136955 - 131105: 0x91F3,
-	136956 - 131105: 0x93C6,
-	136958 - 131105: 0x935A,
-	136973 - 131105: 0xFAFB,
-	136976 - 131105: 0x92EF,
-	136998 - 131105: 0xFAC8,
-	137018 - 131105: 0x9847,
-	137019 - 131105: 0x9366,
-	137020 - 131105: 0x9855,
-	137047 - 131105: 0x96E6,
-	137068 - 131105: 0x9F43,
-	137069 - 131105: 0x9FAA,
-	137070 - 131105: 0x94DA,
-	137071 - 131105: 0x92EE,
-	137072 - 131105: 0xFCAF,
-	137073 - 131105: 0xFBFB,
-	137075 - 131105: 0x8EF9,
-	137076 - 131105: 0x91F6,
-	137131 - 131105: 0x9364,
-	137136 - 131105: 0x94F5,
-	137137 - 131105: 0x9CB6,
-	137138 - 131105: 0xFBAD,
-	137139 - 131105: 0x984E,
-	137140 - 131105: 0x8F44,
-	137141 - 131105: 0x96FD,
-	137155 - 131105: 0x9AF9,
-	137159 - 131105: 0x9AFA,
-	137177 - 131105: 0x9769,
-	137178 - 131105: 0x95D4,
-	137179 - 131105: 0x984B,
-	137180 - 131105: 0xFBAA,
-	137183 - 131105: 0x987C,
-	137199 - 131105: 0x91EA,
-	137205 - 131105: 0x9DAF,
-	137206 - 131105: 0x9DC5,
-	137208 - 131105: 0x91F1,
-	137209 - 131105: 0x8EB1,
-	137210 - 131105: 0x97A9,
-	137211 - 131105: 0xFBAC,
-	137212 - 131105: 0xFCB8,
-	137248 - 131105: 0x9CB9,
-	137256 - 131105: 0xFBB0,
-	137257 - 131105: 0xFCD2,
-	137258 - 131105: 0x93CB,
-	137261 - 131105: 0x9AFD,
-	137273 - 131105: 0x91F4,
-	137274 - 131105: 0x8BAC,
-	137275 - 131105: 0xA055,
-	137280 - 131105: 0x9574,
-	137285 - 131105: 0x95BE,
-	137298 - 131105: 0x97AD,
-	137310 - 131105: 0x8EE9,
-	137313 - 131105: 0x92F8,
-	137314 - 131105: 0x97BE,
-	137315 - 131105: 0x916C,
-	137316 - 131105: 0x94AA,
-	137335 - 131105: 0xFC63,
-	137339 - 131105: 0x9DC6,
-	137347 - 131105: 0x97B5,
-	137348 - 131105: 0x92B8,
-	137349 - 131105: 0x91EF,
-	137374 - 131105: 0xFEA6,
-	137375 - 131105: 0x9760,
-	137376 - 131105: 0x9358,
-	137377 - 131105: 0x9576,
-	137378 - 131105: 0x8FAC,
-	137406 - 131105: 0x91EC,
-	137407 - 131105: 0x97B4,
-	137425 - 131105: 0x91F7,
-	137430 - 131105: 0x974A,
-	137431 - 131105: 0xFB49,
-	137432 - 131105: 0x9578,
-	137433 - 131105: 0x93BC,
-	137466 - 131105: 0x91D6,
-	137475 - 131105: 0x9355,
-	137476 - 131105: 0x9356,
-	137477 - 131105: 0x9851,
-	137488 - 131105: 0x8FF8,
-	137489 - 131105: 0xFBC0,
-	137490 - 131105: 0x93F2,
-	137493 - 131105: 0x90D0,
-	137500 - 131105: 0x9C44,
-	137506 - 131105: 0x9255,
-	137511 - 131105: 0x9363,
-	137531 - 131105: 0x91A5,
-	137540 - 131105: 0xA0ED,
-	137560 - 131105: 0xFD6B,
-	137578 - 131105: 0x9AFE,
-	137596 - 131105: 0x9351,
-	137600 - 131105: 0x8C57,
-	137603 - 131105: 0xFA78,
-	137608 - 131105: 0xFEA8,
-	137622 - 131105: 0x9350,
-	137691 - 131105: 0xFA4C,
-	137715 - 131105: 0x92F7,
-	137773 - 131105: 0x9B40,
-	137780 - 131105: 0xFBCE,
-	137797 - 131105: 0x9B41,
-	137803 - 131105: 0xFEAD,
-	137827 - 131105: 0x8761,
-	138052 - 131105: 0xFBD5,
-	138177 - 131105: 0x8BC2,
-	138178 - 131105: 0x9A7C,
-	138282 - 131105: 0x9B42,
-	138352 - 131105: 0x9B43,
-	138402 - 131105: 0x9E79,
-	138405 - 131105: 0xFBD9,
-	138412 - 131105: 0x9B44,
-	138566 - 131105: 0xA0A7,
-	138579 - 131105: 0x877B,
-	138590 - 131105: 0x876E,
-	138640 - 131105: 0x9BF3,
-	138678 - 131105: 0x8C79,
-	138682 - 131105: 0x935E,
-	138698 - 131105: 0x89CB,
-	138705 - 131105: 0x9F53,
-	138731 - 131105: 0x93D7,
-	138745 - 131105: 0xFBE1,
-	138780 - 131105: 0xFED0,
-	138787 - 131105: 0x8CF1,
-	138807 - 131105: 0xFBE2,
-	138813 - 131105: 0xFCE3,
-	138889 - 131105: 0x9074,
-	138916 - 131105: 0xFBE6,
-	138920 - 131105: 0x9BB7,
-	138952 - 131105: 0x9B45,
-	138965 - 131105: 0x9B47,
-	139023 - 131105: 0x9F50,
-	139029 - 131105: 0x9B48,
-	139114 - 131105: 0xFC5B,
-	139166 - 131105: 0x98A9,
-	139169 - 131105: 0x9CFD,
-	139240 - 131105: 0x884C,
-	139333 - 131105: 0x9B4B,
-	139337 - 131105: 0xFBEC,
-	139390 - 131105: 0x8C69,
-	139418 - 131105: 0x9BA8,
-	139463 - 131105: 0x8AD5,
-	139516 - 131105: 0xFA73,
-	139562 - 131105: 0xFD59,
-	139611 - 131105: 0x91A2,
-	139635 - 131105: 0xFBED,
-	139642 - 131105: 0x9CA9,
-	139681 - 131105: 0x8AA8,
-	139713 - 131105: 0x8D42,
-	139715 - 131105: 0x9BC3,
-	139784 - 131105: 0x8AE1,
-	139900 - 131105: 0x9B4E,
-	140065 - 131105: 0x95D0,
-	140069 - 131105: 0x905F,
-	140221 - 131105: 0x97EE,
-	140240 - 131105: 0xFC4E,
-	140247 - 131105: 0x9B4F,
-	140282 - 131105: 0x9B50,
-	140389 - 131105: 0x9EC6,
-	140401 - 131105: 0xFC50,
-	140427 - 131105: 0xFD73,
-	140433 - 131105: 0xFDA7,
-	140464 - 131105: 0x9DA2,
-	140476 - 131105: 0x87D1,
-	140481 - 131105: 0x87D3,
-	140489 - 131105: 0x87D4,
-	140492 - 131105: 0x87D5,
-	140525 - 131105: 0xFA58,
-	140563 - 131105: 0xFA5E,
-	140571 - 131105: 0xA059,
-	140592 - 131105: 0xFA75,
-	140628 - 131105: 0xFBBE,
-	140685 - 131105: 0x9CA2,
-	140719 - 131105: 0x9370,
-	140734 - 131105: 0x9371,
-	140827 - 131105: 0x9377,
-	140828 - 131105: 0xFEEF,
-	140843 - 131105: 0x936D,
-	140904 - 131105: 0xFC5D,
-	140922 - 131105: 0x90B8,
-	140950 - 131105: 0x8AFC,
-	140952 - 131105: 0xFB41,
-	141044 - 131105: 0x9E6B,
-	141045 - 131105: 0x94E3,
-	141046 - 131105: 0x8EE2,
-	141074 - 131105: 0x8C7D,
-	141076 - 131105: 0x8ED7,
-	141083 - 131105: 0x9C4D,
-	141087 - 131105: 0x96A3,
-	141098 - 131105: 0x9B51,
-	141173 - 131105: 0x8AC3,
-	141185 - 131105: 0x96AA,
-	141206 - 131105: 0x8CE2,
-	141236 - 131105: 0xFC68,
-	141237 - 131105: 0x8B6D,
-	141261 - 131105: 0xFD67,
-	141315 - 131105: 0x8AE9,
-	141407 - 131105: 0xFCA1,
-	141408 - 131105: 0x936C,
-	141425 - 131105: 0x9B52,
-	141485 - 131105: 0xFE70,
-	141505 - 131105: 0xFCA8,
-	141559 - 131105: 0xFCE9,
-	141606 - 131105: 0x9CB4,
-	141625 - 131105: 0x8AEA,
-	141647 - 131105: 0x9B53,
-	141671 - 131105: 0x9B55,
-	141675 - 131105: 0x96AB,
-	141696 - 131105: 0xFCA7,
-	141715 - 131105: 0x9B56,
-	141926 - 131105: 0x8ABC,
-	142031 - 131105: 0x8ACB,
-	142037 - 131105: 0x9B57,
-	142054 - 131105: 0x89CD,
-	142056 - 131105: 0x9B59,
-	142094 - 131105: 0x9B5B,
-	142114 - 131105: 0x93A5,
-	142143 - 131105: 0x9B5D,
-	142147 - 131105: 0x9E4F,
-	142186 - 131105: 0x93A3,
-	142282 - 131105: 0x8A7B,
-	142286 - 131105: 0x8B42,
-	142374 - 131105: 0x9750,
-	142375 - 131105: 0x8FB3,
-	142392 - 131105: 0x8A50,
-	142412 - 131105: 0x9B60,
-	142417 - 131105: 0x8B45,
-	142421 - 131105: 0x8B46,
-	142434 - 131105: 0x9DFE,
-	142472 - 131105: 0x9B62,
-	142491 - 131105: 0x937B,
-	142497 - 131105: 0x93B1,
-	142505 - 131105: 0x8A60,
-	142514 - 131105: 0x8AD8,
-	142519 - 131105: 0x9B63,
-	142530 - 131105: 0x8A69,
-	142534 - 131105: 0x8A47,
-	142537 - 131105: 0x8ACC,
-	142599 - 131105: 0x937C,
-	142600 - 131105: 0x9B65,
-	142610 - 131105: 0x9B66,
-	142660 - 131105: 0x8A72,
-	142668 - 131105: 0x8A7A,
-	142695 - 131105: 0x93AF,
-	142733 - 131105: 0x8AB0,
-	142741 - 131105: 0x9B68,
-	142752 - 131105: 0x9EA3,
-	142755 - 131105: 0xFAEC,
-	142756 - 131105: 0x8B77,
-	142775 - 131105: 0x9B67,
-	142830 - 131105: 0x8B59,
-	142861 - 131105: 0xFCB1,
-	142902 - 131105: 0xFCBB,
-	142914 - 131105: 0x9B69,
-	142968 - 131105: 0x93A8,
-	142987 - 131105: 0x8AE0,
-	143027 - 131105: 0x9E51,
-	143087 - 131105: 0x8F5F,
-	143220 - 131105: 0x9B6A,
-	143308 - 131105: 0x9B6B,
-	143331 - 131105: 0x97EC,
-	143411 - 131105: 0x9B6C,
-	143428 - 131105: 0xFE4E,
-	143435 - 131105: 0xFDC2,
-	143462 - 131105: 0x9B6D,
-	143485 - 131105: 0x9167,
-	143486 - 131105: 0xFCCC,
-	143502 - 131105: 0x93B6,
-	143543 - 131105: 0x90E4,
-	143548 - 131105: 0x90E5,
-	143578 - 131105: 0x9EF2,
-	143619 - 131105: 0x93CA,
-	143677 - 131105: 0x8BBC,
-	143741 - 131105: 0x8F46,
-	143746 - 131105: 0x93CF,
-	143780 - 131105: 0xFCDB,
-	143781 - 131105: 0xFCDC,
-	143795 - 131105: 0x93C0,
-	143816 - 131105: 0xFCE6,
-	143817 - 131105: 0x96E7,
-	143850 - 131105: 0x87A7,
-	143863 - 131105: 0xFCD8,
-	143864 - 131105: 0xFCD9,
-	143865 - 131105: 0xFDA6,
-	143887 - 131105: 0x93CE,
-	143909 - 131105: 0x95F1,
-	143919 - 131105: 0x9CE9,
-	143921 - 131105: 0xFCE4,
-	143922 - 131105: 0x94AF,
-	143923 - 131105: 0xFA77,
-	143924 - 131105: 0x93CC,
-	143958 - 131105: 0x8CE1,
-	143966 - 131105: 0x87A9,
-	143970 - 131105: 0x905A,
-	144001 - 131105: 0x8C54,
-	144009 - 131105: 0x93BF,
-	144010 - 131105: 0xFB51,
-	144043 - 131105: 0x93B9,
-	144044 - 131105: 0xFED7,
-	144045 - 131105: 0x93B7,
-	144082 - 131105: 0x93D9,
-	144096 - 131105: 0x93BB,
-	144097 - 131105: 0x93DA,
-	144128 - 131105: 0x98A3,
-	144138 - 131105: 0x90D1,
-	144159 - 131105: 0x9B6E,
-	144308 - 131105: 0xFA70,
-	144332 - 131105: 0x9BEB,
-	144350 - 131105: 0x9B6F,
-	144358 - 131105: 0xFCFC,
-	144372 - 131105: 0x8B40,
-	144373 - 131105: 0xA07B,
-	144377 - 131105: 0x8CA1,
-	144378 - 131105: 0x97F7,
-	144382 - 131105: 0x93E2,
-	144384 - 131105: 0xFCD6,
-	144447 - 131105: 0x9559,
-	144464 - 131105: 0x93A6,
-	144495 - 131105: 0xFD40,
-	144498 - 131105: 0x935F,
-	144613 - 131105: 0x97F2,
-	144665 - 131105: 0x9C76,
-	144688 - 131105: 0x8EF8,
-	144721 - 131105: 0x8CEB,
-	144730 - 131105: 0x8F47,
-	144743 - 131105: 0x9B74,
-	144789 - 131105: 0x92B4,
-	144793 - 131105: 0x91ED,
-	144796 - 131105: 0x96D2,
-	144827 - 131105: 0x87D8,
-	144845 - 131105: 0xFD46,
-	144846 - 131105: 0x8F4F,
-	144847 - 131105: 0x9549,
-	144883 - 131105: 0x9B75,
-	144896 - 131105: 0xFA5C,
-	144919 - 131105: 0x8751,
-	144922 - 131105: 0x9B79,
-	144956 - 131105: 0xFD4B,
-	144960 - 131105: 0x96D3,
-	144985 - 131105: 0xFD58,
-	144991 - 131105: 0x945F,
-	145015 - 131105: 0xA0F5,
-	145038 - 131105: 0x87C7,
-	145054 - 131105: 0x877C,
-	145062 - 131105: 0x9243,
-	145069 - 131105: 0x97FA,
-	145082 - 131105: 0x9DD9,
-	145119 - 131105: 0x97F4,
-	145134 - 131105: 0x924D,
-	145155 - 131105: 0xFD5B,
-	145174 - 131105: 0x9B7A,
-	145184 - 131105: 0x9ED5,
-	145197 - 131105: 0xFAAE,
-	145199 - 131105: 0x9CC9,
-	145215 - 131105: 0x9258,
-	145254 - 131105: 0x8EC8,
-	145281 - 131105: 0x94B4,
-	145314 - 131105: 0x93E1,
-	145340 - 131105: 0x93DF,
-	145346 - 131105: 0xFCF0,
-	145365 - 131105: 0x93EC,
-	145366 - 131105: 0x97F6,
-	145367 - 131105: 0x96CF,
-	145466 - 131105: 0x93DE,
-	145858 - 131105: 0x8ACF,
-	146087 - 131105: 0x9BA2,
-	146139 - 131105: 0xFD69,
-	146158 - 131105: 0x9352,
-	146170 - 131105: 0x98A2,
-	146202 - 131105: 0x8CE7,
-	146266 - 131105: 0xFD6E,
-	146531 - 131105: 0x8CA4,
-	146585 - 131105: 0xFA7C,
-	146586 - 131105: 0x93FA,
-	146587 - 131105: 0x907C,
-	146613 - 131105: 0x8F67,
-	146615 - 131105: 0x9DB7,
-	146631 - 131105: 0xA0E9,
-	146632 - 131105: 0xFA4E,
-	146633 - 131105: 0xFDA1,
-	146684 - 131105: 0x9E74,
-	146685 - 131105: 0x9FBF,
-	146686 - 131105: 0x9ECB,
-	146687 - 131105: 0x9BB9,
-	146752 - 131105: 0x9DD4,
-	146779 - 131105: 0x97B9,
-	146814 - 131105: 0x8EF1,
-	146831 - 131105: 0x957B,
-	146870 - 131105: 0x9ED2,
-	146871 - 131105: 0x9753,
-	146872 - 131105: 0x96A4,
-	146873 - 131105: 0x8FBE,
-	146874 - 131105: 0x94D9,
-	146875 - 131105: 0x9058,
-	146876 - 131105: 0xFD79,
-	146877 - 131105: 0xFD7B,
-	146915 - 131105: 0x8EDA,
-	146936 - 131105: 0x8EFA,
-	146950 - 131105: 0x8762,
-	146961 - 131105: 0x9BA5,
-	146988 - 131105: 0x9ED9,
-	146989 - 131105: 0x97D4,
-	146990 - 131105: 0x90BB,
-	146991 - 131105: 0xFDBC,
-	146992 - 131105: 0xFDC6,
-	146993 - 131105: 0x9248,
-	147001 - 131105: 0x92B5,
-	147080 - 131105: 0x9DC1,
-	147081 - 131105: 0x92B9,
-	147082 - 131105: 0x92A6,
-	147083 - 131105: 0x8F4B,
-	147129 - 131105: 0x9BA6,
-	147135 - 131105: 0x92B6,
-	147159 - 131105: 0x8E40,
-	147191 - 131105: 0x9ED8,
-	147192 - 131105: 0x945E,
-	147193 - 131105: 0x985F,
-	147194 - 131105: 0x94CE,
-	147195 - 131105: 0x924A,
-	147196 - 131105: 0xFD70,
-	147253 - 131105: 0x9467,
-	147265 - 131105: 0x8DEC,
-	147274 - 131105: 0x9BD8,
-	147297 - 131105: 0x8763,
-	147327 - 131105: 0x9448,
-	147328 - 131105: 0xFAC1,
-	147329 - 131105: 0x9CF7,
-	147330 - 131105: 0xFDBE,
-	147343 - 131105: 0x8FDA,
-	147380 - 131105: 0xFDD9,
-	147383 - 131105: 0xFC7E,
-	147392 - 131105: 0x93F9,
-	147397 - 131105: 0xFA43,
-	147435 - 131105: 0xFAEB,
-	147436 - 131105: 0xFAC3,
-	147437 - 131105: 0x97D3,
-	147438 - 131105: 0x95F9,
-	147439 - 131105: 0x9C48,
-	147440 - 131105: 0xFDD8,
-	147473 - 131105: 0xA0D8,
-	147513 - 131105: 0xFDD7,
-	147514 - 131105: 0xFB4A,
-	147515 - 131105: 0x9BAF,
-	147516 - 131105: 0x944B,
-	147517 - 131105: 0xFDC9,
-	147543 - 131105: 0x8EAC,
-	147589 - 131105: 0xFDB2,
-	147595 - 131105: 0x925A,
-	147596 - 131105: 0xFCBD,
-	147597 - 131105: 0x92D9,
-	147601 - 131105: 0xFDD5,
-	147657 - 131105: 0x92DD,
-	147681 - 131105: 0x9259,
-	147692 - 131105: 0x8CF0,
-	147716 - 131105: 0x96BA,
-	147727 - 131105: 0x925B,
-	147737 - 131105: 0x9BAB,
-	147775 - 131105: 0xFDDA,
-	147776 - 131105: 0xFDDE,
-	147780 - 131105: 0xFDD3,
-	147790 - 131105: 0x8C46,
-	147797 - 131105: 0xFDD6,
-	147798 - 131105: 0xFDDC,
-	147799 - 131105: 0xFDDD,
-	147804 - 131105: 0x90FE,
-	147807 - 131105: 0xFEA1,
-	147809 - 131105: 0x87A5,
-	147831 - 131105: 0x8BAD,
-	147834 - 131105: 0x9CD8,
-	147875 - 131105: 0x9E6D,
-	147876 - 131105: 0xFD7C,
-	147877 - 131105: 0xFB61,
-	147884 - 131105: 0x96F8,
-	147893 - 131105: 0x96F0,
-	147917 - 131105: 0xFCF4,
-	147938 - 131105: 0xFE60,
-	147964 - 131105: 0x9852,
-	147995 - 131105: 0x964F,
-	148043 - 131105: 0x916E,
-	148054 - 131105: 0x986D,
-	148057 - 131105: 0x9864,
-	148086 - 131105: 0x9453,
-	148087 - 131105: 0xFDEC,
-	148088 - 131105: 0xFB78,
-	148100 - 131105: 0x95BA,
-	148115 - 131105: 0x985D,
-	148117 - 131105: 0x92F9,
-	148133 - 131105: 0x985A,
-	148159 - 131105: 0x8750,
-	148161 - 131105: 0xFDF6,
-	148169 - 131105: 0x93D0,
-	148170 - 131105: 0x9862,
-	148206 - 131105: 0x9BAD,
-	148218 - 131105: 0x974F,
-	148237 - 131105: 0x9BAE,
-	148250 - 131105: 0x9452,
-	148276 - 131105: 0x9BB0,
-	148296 - 131105: 0x91D2,
-	148322 - 131105: 0x97EA,
-	148323 - 131105: 0xFB6B,
-	148324 - 131105: 0x91B1,
-	148325 - 131105: 0xFDF3,
-	148364 - 131105: 0x92CB,
-	148374 - 131105: 0x9BB1,
-	148380 - 131105: 0xFCEC,
-	148413 - 131105: 0x986B,
-	148417 - 131105: 0x9751,
-	148457 - 131105: 0x9871,
-	148458 - 131105: 0x95EF,
-	148466 - 131105: 0x9EF3,
-	148472 - 131105: 0x91E8,
-	148484 - 131105: 0x9BBA,
-	148533 - 131105: 0xFB4C,
-	148534 - 131105: 0x926A,
-	148570 - 131105: 0xFDF8,
-	148571 - 131105: 0x9861,
-	148595 - 131105: 0x91E7,
-	148615 - 131105: 0x93ED,
-	148616 - 131105: 0x9744,
-	148665 - 131105: 0x91E1,
-	148668 - 131105: 0xFBF5,
-	148686 - 131105: 0x9869,
-	148691 - 131105: 0x8A62,
-	148694 - 131105: 0x9BBB,
-	148741 - 131105: 0x8CA8,
-	148769 - 131105: 0x9C55,
-	148856 - 131105: 0x8E77,
-	148936 - 131105: 0x8AB2,
-	149016 - 131105: 0x9EBC,
-	149034 - 131105: 0x93E6,
-	149093 - 131105: 0x93A2,
-	149108 - 131105: 0x9BBD,
-	149143 - 131105: 0x94B3,
-	149204 - 131105: 0x937D,
-	149254 - 131105: 0x9E66,
-	149285 - 131105: 0x9459,
-	149295 - 131105: 0x9BBF,
-	149391 - 131105: 0x9458,
-	149472 - 131105: 0x9EA5,
-	149522 - 131105: 0x9BC7,
-	149539 - 131105: 0xFE54,
-	149634 - 131105: 0x8E74,
-	149737 - 131105: 0x8BD6,
-	149744 - 131105: 0x94B6,
-	149745 - 131105: 0xFD74,
-	149746 - 131105: 0x98C0,
-	149747 - 131105: 0x94A5,
-	149755 - 131105: 0x9BC8,
-	149759 - 131105: 0x95ED,
-	149760 - 131105: 0xFD7E,
-	149761 - 131105: 0xFBEB,
-	149772 - 131105: 0xFD7D,
-	149782 - 131105: 0x976F,
-	149783 - 131105: 0x9461,
-	149785 - 131105: 0x9FC1,
-	149807 - 131105: 0x95D7,
-	149811 - 131105: 0xFA52,
-	149812 - 131105: 0x9C58,
-	149822 - 131105: 0x9F68,
-	149823 - 131105: 0x9BE7,
-	149824 - 131105: 0xFCCE,
-	149825 - 131105: 0x96E8,
-	149826 - 131105: 0xFA49,
-	149827 - 131105: 0x97A1,
-	149858 - 131105: 0x954D,
-	149859 - 131105: 0x9EF8,
-	149876 - 131105: 0xFE49,
-	149877 - 131105: 0x91CE,
-	149878 - 131105: 0x9771,
-	149883 - 131105: 0x8CCF,
-	149887 - 131105: 0xFDB1,
-	149890 - 131105: 0xFC6E,
-	149896 - 131105: 0x9CF2,
-	149897 - 131105: 0x93B8,
-	149898 - 131105: 0x9043,
-	149899 - 131105: 0x9759,
-	149900 - 131105: 0x94D7,
-	149901 - 131105: 0xFE66,
-	149902 - 131105: 0x947D,
-	149903 - 131105: 0xFC6F,
-	149908 - 131105: 0x9246,
-	149924 - 131105: 0xFA6D,
-	149927 - 131105: 0x8EF7,
-	149929 - 131105: 0xFBB7,
-	149931 - 131105: 0x947C,
-	149932 - 131105: 0x92CD,
-	149933 - 131105: 0x97B2,
-	149943 - 131105: 0xFE65,
-	149944 - 131105: 0x967E,
-	149945 - 131105: 0x9758,
-	149946 - 131105: 0x9B77,
-	149947 - 131105: 0x91CF,
-	149957 - 131105: 0x94A4,
-	149968 - 131105: 0x9CAD,
-	149978 - 131105: 0x8BAB,
-	149982 - 131105: 0x96D5,
-	149983 - 131105: 0xFCB3,
-	149987 - 131105: 0x93AE,
-	149989 - 131105: 0x976D,
-	149996 - 131105: 0x9446,
-	149997 - 131105: 0x95F7,
-	150006 - 131105: 0x9C46,
-	150007 - 131105: 0x955B,
-	150008 - 131105: 0x91D1,
-	150009 - 131105: 0x94F4,
-	150011 - 131105: 0xFE67,
-	150030 - 131105: 0x92A5,
-	150034 - 131105: 0xFEDF,
-	150035 - 131105: 0x8CAB,
-	150037 - 131105: 0x9BC9,
-	150049 - 131105: 0xFCED,
-	150050 - 131105: 0xFDFA,
-	150051 - 131105: 0xFCC8,
-	150052 - 131105: 0xFE62,
-	150053 - 131105: 0x91FC,
-	150054 - 131105: 0xFE6B,
-	150055 - 131105: 0xFDF9,
-	150056 - 131105: 0xFCC7,
-	150057 - 131105: 0x914E,
-	150058 - 131105: 0x9CB8,
-	150078 - 131105: 0x9767,
-	150082 - 131105: 0x95EE,
-	150085 - 131105: 0x9BB2,
-	150090 - 131105: 0x9460,
-	150094 - 131105: 0x94A2,
-	150095 - 131105: 0x9875,
-	150096 - 131105: 0x97AC,
-	150097 - 131105: 0x91D3,
-	150109 - 131105: 0x987B,
-	150117 - 131105: 0x8EEB,
-	150118 - 131105: 0x976A,
-	150119 - 131105: 0x965E,
-	150129 - 131105: 0x97EB,
-	150135 - 131105: 0x9FF9,
-	150136 - 131105: 0x95F8,
-	150137 - 131105: 0xFEA2,
-	150138 - 131105: 0x8FE6,
-	150156 - 131105: 0xFE7E,
-	150163 - 131105: 0x9DA4,
-	150164 - 131105: 0x9768,
-	150165 - 131105: 0x8EEC,
-	150166 - 131105: 0x94BD,
-	150180 - 131105: 0x945B,
-	150181 - 131105: 0x9CF6,
-	150182 - 131105: 0xFAA7,
-	150183 - 131105: 0x9BD9,
-	150193 - 131105: 0xFA5D,
-	150194 - 131105: 0x9656,
-	150195 - 131105: 0x9762,
-	150202 - 131105: 0x94BA,
-	150203 - 131105: 0xA04F,
-	150204 - 131105: 0x92D8,
-	150208 - 131105: 0x9BCB,
-	150215 - 131105: 0x94BB,
-	150218 - 131105: 0x9D5F,
-	150225 - 131105: 0x90CF,
-	150239 - 131105: 0x9465,
-	150242 - 131105: 0x9F4C,
-	150249 - 131105: 0x90D8,
-	150287 - 131105: 0x8D5B,
-	150382 - 131105: 0x9EBE,
-	150517 - 131105: 0xFB6D,
-	150537 - 131105: 0x95CA,
-	150686 - 131105: 0x9DC2,
-	150687 - 131105: 0x97F8,
-	150729 - 131105: 0x8FFC,
-	150745 - 131105: 0x9473,
-	150790 - 131105: 0x9474,
-	150803 - 131105: 0xFEB7,
-	150968 - 131105: 0x8A4B,
-	151018 - 131105: 0x8A55,
-	151019 - 131105: 0x8B69,
-	151099 - 131105: 0x8ADC,
-	151120 - 131105: 0x8B76,
-	151205 - 131105: 0x9BCE,
-	151207 - 131105: 0x8A68,
-	151310 - 131105: 0xA0F8,
-	151388 - 131105: 0x98DF,
-	151426 - 131105: 0xFEB5,
-	151430 - 131105: 0x9BCF,
-	151447 - 131105: 0x96FB,
-	151450 - 131105: 0x9BFB,
-	151465 - 131105: 0x9ECE,
-	151480 - 131105: 0x8EE5,
-	151490 - 131105: 0x9E7B,
-	151596 - 131105: 0x9BD2,
-	151634 - 131105: 0x8AA5,
-	151709 - 131105: 0xFECE,
-	151851 - 131105: 0x8A45,
-	151880 - 131105: 0x9DFC,
-	151933 - 131105: 0xFECF,
-	151934 - 131105: 0x8BA5,
-	152013 - 131105: 0x8C4A,
-	152035 - 131105: 0x8AEC,
-	152038 - 131105: 0xFCE0,
-	152039 - 131105: 0x94AD,
-	152096 - 131105: 0xFED5,
-	152097 - 131105: 0x94AC,
-	152144 - 131105: 0xFC5A,
-	152217 - 131105: 0x9BD6,
-	152263 - 131105: 0x8A6F,
-	152280 - 131105: 0x8BA9,
-	152334 - 131105: 0x8E5F,
-	152337 - 131105: 0x9DCB,
-	152339 - 131105: 0xFCE7,
-	152601 - 131105: 0x9BD7,
-	152613 - 131105: 0x93C8,
-	152623 - 131105: 0x91F0,
-	152624 - 131105: 0x8FE0,
-	152646 - 131105: 0x9BDB,
-	152684 - 131105: 0x90ED,
-	152686 - 131105: 0x9BDC,
-	152730 - 131105: 0x8D53,
-	152881 - 131105: 0xA0EC,
-	152885 - 131105: 0x98FA,
-	152895 - 131105: 0x9BE0,
-	152923 - 131105: 0x93C7,
-	152924 - 131105: 0x9249,
-	152925 - 131105: 0x96E1,
-	152926 - 131105: 0x9BE2,
-	152930 - 131105: 0x9BE4,
-	152933 - 131105: 0x8FE1,
-	152934 - 131105: 0x9BE5,
-	152961 - 131105: 0x94C0,
-	152964 - 131105: 0x93C3,
-	152975 - 131105: 0x93C5,
-	153017 - 131105: 0x9079,
-	153045 - 131105: 0x977B,
-	153051 - 131105: 0x907E,
-	153056 - 131105: 0xFEE6,
-	153093 - 131105: 0xFE46,
-	153141 - 131105: 0x9DB8,
-	153169 - 131105: 0x9270,
-	153219 - 131105: 0x95A8,
-	153237 - 131105: 0x8CB0,
-	153315 - 131105: 0x94C8,
-	153334 - 131105: 0x98B9,
-	153350 - 131105: 0x9140,
-	153373 - 131105: 0xFCBE,
-	153381 - 131105: 0x9157,
-	153405 - 131105: 0x8BB2,
-	153458 - 131105: 0xFADF,
-	153543 - 131105: 0x9BE6,
-	153567 - 131105: 0x9643,
-	153568 - 131105: 0x8E44,
-	153569 - 131105: 0x9C4F,
-	153687 - 131105: 0xFEF4,
-	153693 - 131105: 0x9BE8,
-	153714 - 131105: 0x93DC,
-	153800 - 131105: 0x966F,
-	153822 - 131105: 0x87A1,
-	153825 - 131105: 0x8E4A,
-	153859 - 131105: 0x9BED,
-	153926 - 131105: 0x92F6,
-	153942 - 131105: 0x9DB9,
-	154028 - 131105: 0x8E4E,
-	154060 - 131105: 0xFBCF,
-	154196 - 131105: 0x8760,
-	154261 - 131105: 0x9EC2,
-	154268 - 131105: 0x94E5,
-	154286 - 131105: 0x9BF0,
-	154287 - 131105: 0x94E4,
-	154345 - 131105: 0x9551,
-	154484 - 131105: 0x8BBB,
-	154505 - 131105: 0x9BF1,
-	154547 - 131105: 0x94F0,
-	154548 - 131105: 0x8E64,
-	154566 - 131105: 0x94EA,
-	154596 - 131105: 0x8F61,
-	154600 - 131105: 0x9B64,
-	154625 - 131105: 0x8E5B,
-	154630 - 131105: 0x9BF2,
-	154657 - 131105: 0x9FBE,
-	154698 - 131105: 0x9DC9,
-	154725 - 131105: 0x8E6C,
-	154769 - 131105: 0x8F73,
-	154788 - 131105: 0x8CAF,
-	154816 - 131105: 0x8F75,
-	154817 - 131105: 0x8E71,
-	154878 - 131105: 0x8E60,
-	154912 - 131105: 0x8E6A,
-	154928 - 131105: 0x8C4C,
-	154947 - 131105: 0x9552,
-	155033 - 131105: 0x87CF,
-	155065 - 131105: 0x87C0,
-	155150 - 131105: 0x9554,
-	155209 - 131105: 0x8AD4,
-	155265 - 131105: 0x9DBB,
-	155266 - 131105: 0x9543,
-	155267 - 131105: 0x92FE,
-	155302 - 131105: 0x94F2,
-	155324 - 131105: 0x94F1,
-	155351 - 131105: 0xA0EA,
-	155352 - 131105: 0x9DD2,
-	155418 - 131105: 0xA0B1,
-	155467 - 131105: 0x91F8,
-	155617 - 131105: 0x9462,
-	155618 - 131105: 0x9BA4,
-	155681 - 131105: 0x877D,
-	155689 - 131105: 0x8EAD,
-	155720 - 131105: 0x9EAD,
-	155748 - 131105: 0x96D0,
-	155779 - 131105: 0xFEEE,
-	155799 - 131105: 0x8AB4,
-	155812 - 131105: 0x9757,
-	155813 - 131105: 0x8A77,
-	155906 - 131105: 0x9BF7,
-	155937 - 131105: 0x8EB5,
-	155993 - 131105: 0xA06D,
-	155994 - 131105: 0x8EB6,
-	155995 - 131105: 0x9756,
-	155996 - 131105: 0x9540,
-	156077 - 131105: 0xA0F3,
-	156078 - 131105: 0x94BE,
-	156082 - 131105: 0x9BFA,
-	156125 - 131105: 0xFDDF,
-	156248 - 131105: 0x9DBC,
-	156257 - 131105: 0x94FE,
-	156266 - 131105: 0x8BDB,
-	156267 - 131105: 0xA0FE,
-	156368 - 131105: 0x8EC0,
-	156469 - 131105: 0x9F47,
-	156491 - 131105: 0x8BDE,
-	156492 - 131105: 0xA0FB,
-	156497 - 131105: 0x8EC3,
-	156606 - 131105: 0x9649,
-	156661 - 131105: 0xFEC2,
-	156664 - 131105: 0x954C,
-	156674 - 131105: 0x9BFD,
-	156688 - 131105: 0x90CC,
-	156689 - 131105: 0x9C60,
-	156690 - 131105: 0x954B,
-	156746 - 131105: 0x9BFE,
-	156777 - 131105: 0x9C70,
-	156804 - 131105: 0x9C43,
-	156808 - 131105: 0x9C47,
-	156809 - 131105: 0x8ECC,
-	156813 - 131105: 0x8E54,
-	156824 - 131105: 0x8EE4,
-	156946 - 131105: 0x9C49,
-	157042 - 131105: 0x8B5E,
-	157088 - 131105: 0x955E,
-	157101 - 131105: 0x955C,
-	157119 - 131105: 0x9C4B,
-	157202 - 131105: 0x8BE1,
-	157222 - 131105: 0x8ED9,
-	157359 - 131105: 0x9DB4,
-	157361 - 131105: 0x925F,
-	157365 - 131105: 0x9C4C,
-	157402 - 131105: 0x8AA1,
-	157416 - 131105: 0x8EDB,
-	157436 - 131105: 0x9C56,
-	157462 - 131105: 0x8AA2,
-	157505 - 131105: 0x9754,
-	157593 - 131105: 0x9C5E,
-	157619 - 131105: 0x9ED4,
-	157620 - 131105: 0x9568,
-	157644 - 131105: 0xA0C3,
-	157724 - 131105: 0x8AE6,
-	157766 - 131105: 0xA0F7,
-	157790 - 131105: 0x9C61,
-	157806 - 131105: 0x9C5F,
-	157832 - 131105: 0xFC4D,
-	157834 - 131105: 0x9E5B,
-	157843 - 131105: 0x9E69,
-	157895 - 131105: 0x9C63,
-	157966 - 131105: 0xFEC7,
-	157969 - 131105: 0xFEC6,
-	157990 - 131105: 0x9C67,
-	158009 - 131105: 0x9C69,
-	158033 - 131105: 0x8BE2,
-	158120 - 131105: 0x9165,
-	158133 - 131105: 0x9CE7,
-	158194 - 131105: 0x8A54,
-	158202 - 131105: 0x9C6C,
-	158253 - 131105: 0x9C6E,
-	158254 - 131105: 0xFE5D,
-	158260 - 131105: 0x9C73,
-	158274 - 131105: 0x956A,
-	158289 - 131105: 0x956D,
-	158290 - 131105: 0x8EF0,
-	158469 - 131105: 0x8F4D,
-	158474 - 131105: 0x8EF6,
-	158483 - 131105: 0xFABC,
-	158485 - 131105: 0x8CD5,
-	158499 - 131105: 0x875E,
-	158504 - 131105: 0xFBDA,
-	158544 - 131105: 0x8B4C,
-	158545 - 131105: 0xFD75,
-	158546 - 131105: 0x9BDD,
-	158547 - 131105: 0xFAF5,
-	158555 - 131105: 0x9C74,
-	158581 - 131105: 0x9545,
-	158594 - 131105: 0x96C6,
-	158614 - 131105: 0x8F6A,
-	158615 - 131105: 0x8F4E,
-	158621 - 131105: 0x9C78,
-	158643 - 131105: 0xFA55,
-	158656 - 131105: 0x97E4,
-	158711 - 131105: 0x9C41,
-	158753 - 131105: 0x925C,
-	158784 - 131105: 0x96FA,
-	158785 - 131105: 0x8CF6,
-	158790 - 131105: 0x8D4D,
-	158846 - 131105: 0xFB66,
-	158847 - 131105: 0x8E65,
-	158848 - 131105: 0x9849,
-	158849 - 131105: 0xFBA8,
-	158850 - 131105: 0x9842,
-	158884 - 131105: 0x9C7A,
-	158903 - 131105: 0x97FB,
-	158904 - 131105: 0x90CA,
-	158909 - 131105: 0x9C5B,
-	158912 - 131105: 0x974D,
-	158915 - 131105: 0x8ED3,
-	158929 - 131105: 0x9561,
-	159010 - 131105: 0x9F4B,
-	159011 - 131105: 0x9FB5,
-	159012 - 131105: 0x93D2,
-	159013 - 131105: 0xFDAA,
-	159014 - 131105: 0x9840,
-	159015 - 131105: 0x9146,
-	159016 - 131105: 0x9867,
-	159017 - 131105: 0xFA5A,
-	159018 - 131105: 0xFBA9,
-	159057 - 131105: 0x9841,
-	159092 - 131105: 0x8CD3,
-	159136 - 131105: 0xFCFD,
-	159137 - 131105: 0xFDAB,
-	159138 - 131105: 0x91BD,
-	159139 - 131105: 0x8F4C,
-	159140 - 131105: 0x96C9,
-	159141 - 131105: 0x8F55,
-	159142 - 131105: 0xFBAE,
-	159143 - 131105: 0x956F,
-	159150 - 131105: 0x9C7D,
-	159196 - 131105: 0xA0F0,
-	159210 - 131105: 0x946F,
-	159211 - 131105: 0xFDAC,
-	159216 - 131105: 0x96CB,
-	159232 - 131105: 0x96CE,
-	159237 - 131105: 0xA056,
-	159239 - 131105: 0x9CE1,
-	159250 - 131105: 0x96C4,
-	159298 - 131105: 0x8F5E,
-	159299 - 131105: 0x8F6C,
-	159300 - 131105: 0x8EA3,
-	159301 - 131105: 0xFBB3,
-	159342 - 131105: 0xFC53,
-	159346 - 131105: 0xFDB3,
-	159351 - 131105: 0x8F6B,
-	159364 - 131105: 0x96CA,
-	159368 - 131105: 0x87CD,
-	159371 - 131105: 0x8753,
-	159385 - 131105: 0x8F79,
-	159440 - 131105: 0x9E6F,
-	159441 - 131105: 0xA0C5,
-	159442 - 131105: 0xFC78,
-	159443 - 131105: 0x8E42,
-	159444 - 131105: 0x8F5A,
-	159445 - 131105: 0x90C2,
-	159446 - 131105: 0x8EA5,
-	159447 - 131105: 0x9061,
-	159526 - 131105: 0x924F,
-	159603 - 131105: 0x9373,
-	159604 - 131105: 0xFDB5,
-	159647 - 131105: 0xFECC,
-	159649 - 131105: 0xFBBD,
-	159678 - 131105: 0x8CD6,
-	159710 - 131105: 0x9843,
-	159711 - 131105: 0x96C5,
-	159758 - 131105: 0x89BC,
-	159819 - 131105: 0x9CA3,
-	159826 - 131105: 0x924B,
-	159827 - 131105: 0x984A,
-	159880 - 131105: 0x8FA4,
-	159917 - 131105: 0xA0F1,
-	159918 - 131105: 0x9EFB,
-	159919 - 131105: 0x9CD2,
-	159949 - 131105: 0x8FA7,
-	159954 - 131105: 0x8754,
-	159992 - 131105: 0xFC5C,
-	160009 - 131105: 0x9845,
-	160012 - 131105: 0x9046,
-	160013 - 131105: 0x8CD1,
-	160038 - 131105: 0xFEFA,
-	160039 - 131105: 0x9560,
-	160100 - 131105: 0x9F48,
-	160101 - 131105: 0x9247,
-	160117 - 131105: 0x90FB,
-	160205 - 131105: 0x9CA4,
-	160283 - 131105: 0x9571,
-	160359 - 131105: 0x8745,
-	160384 - 131105: 0x9CA6,
-	160389 - 131105: 0x9CA7,
-	160395 - 131105: 0x9CAA,
-	160434 - 131105: 0x9ED3,
-	160438 - 131105: 0x9E70,
-	160486 - 131105: 0x9CAC,
-	160594 - 131105: 0x8752,
-	160666 - 131105: 0x8FAE,
-	160767 - 131105: 0x8D50,
-	160802 - 131105: 0x957D,
-	160848 - 131105: 0x9CB0,
-	160900 - 131105: 0x97B6,
-	160902 - 131105: 0xA0BD,
-	161140 - 131105: 0x8ADF,
-	161187 - 131105: 0x9EAA,
-	161248 - 131105: 0x8FBD,
-	161252 - 131105: 0x8FBF,
-	161277 - 131105: 0x9369,
-	161278 - 131105: 0x9BA7,
-	161287 - 131105: 0xC8A4,
-	161292 - 131105: 0xFEEA,
-	161330 - 131105: 0x9BE1,
-	161337 - 131105: 0x8B41,
-	161365 - 131105: 0x9DB6,
-	161366 - 131105: 0xA0EB,
-	161367 - 131105: 0x9BA3,
-	161428 - 131105: 0x8BA1,
-	161551 - 131105: 0x8FC8,
-	161589 - 131105: 0x894C,
-	161590 - 131105: 0x9860,
-	161601 - 131105: 0x94C7,
-	161630 - 131105: 0x8B58,
-	161668 - 131105: 0x95AB,
-	161669 - 131105: 0x95AA,
-	161740 - 131105: 0x9CC3,
-	161880 - 131105: 0x9CC4,
-	161904 - 131105: 0x93D6,
-	161949 - 131105: 0x9DAC,
-	161970 - 131105: 0x8BE6,
-	161992 - 131105: 0x8A71,
-	162084 - 131105: 0x8FD1,
-	162151 - 131105: 0x99D5,
-	162170 - 131105: 0x90F4,
-	162208 - 131105: 0x8AA3,
-	162269 - 131105: 0x9CCE,
-	162301 - 131105: 0x9CD4,
-	162314 - 131105: 0x9CD5,
-	162318 - 131105: 0xFBC8,
-	162366 - 131105: 0x9DB3,
-	162387 - 131105: 0xFC70,
-	162393 - 131105: 0x8FD7,
-	162425 - 131105: 0x9B73,
-	162436 - 131105: 0xFA5B,
-	162493 - 131105: 0x8FD2,
-	162494 - 131105: 0x9064,
-	162548 - 131105: 0x98B6,
-	162566 - 131105: 0x9668,
-	162571 - 131105: 0x9CD6,
-	162584 - 131105: 0x98BD,
-	162616 - 131105: 0x8FDC,
-	162617 - 131105: 0xFEF6,
-	162618 - 131105: 0x8FD9,
-	162632 - 131105: 0x9541,
-	162661 - 131105: 0x87CA,
-	162799 - 131105: 0x876C,
-	162804 - 131105: 0x97F3,
-	162834 - 131105: 0x9BF8,
-	162924 - 131105: 0x875A,
-	162993 - 131105: 0x8748,
-	163013 - 131105: 0x874A,
-	163119 - 131105: 0x9E6C,
-	163155 - 131105: 0x8FF2,
-	163156 - 131105: 0x8FEE,
-	163174 - 131105: 0x9CD7,
-	163187 - 131105: 0x9E6E,
-	163204 - 131105: 0x8A40,
-	163215 - 131105: 0x8FEF,
-	163224 - 131105: 0x8FF4,
-	163261 - 131105: 0x8FF5,
-	163292 - 131105: 0x95C2,
-	163405 - 131105: 0x986A,
-	163407 - 131105: 0x97CF,
-	163630 - 131105: 0x9EE5,
-	163833 - 131105: 0x9E7C,
-	163842 - 131105: 0x9041,
-	163849 - 131105: 0x9CDB,
-	163870 - 131105: 0x9441,
-	163875 - 131105: 0x9CE6,
-	163876 - 131105: 0x9DB0,
-	163912 - 131105: 0x9CEA,
-	163971 - 131105: 0x9CED,
-	163984 - 131105: 0x9CFA,
-	164029 - 131105: 0x8B62,
-	164030 - 131105: 0x8A4E,
-	164072 - 131105: 0x9CCA,
-	164073 - 131105: 0x8A66,
-	164084 - 131105: 0x9CFB,
-	164142 - 131105: 0x9CFC,
-	164175 - 131105: 0x9CFE,
-	164189 - 131105: 0x8A53,
-	164207 - 131105: 0x9CE5,
-	164233 - 131105: 0x9D40,
-	164271 - 131105: 0x9D41,
-	164284 - 131105: 0x9045,
-	164359 - 131105: 0x8B73,
-	164376 - 131105: 0x97CA,
-	164378 - 131105: 0x9D42,
-	164438 - 131105: 0x8A61,
-	164476 - 131105: 0x8BAE,
-	164507 - 131105: 0x8AD2,
-	164557 - 131105: 0x8BA2,
-	164578 - 131105: 0x9DF2,
-	164614 - 131105: 0x9D43,
-	164632 - 131105: 0x9CDF,
-	164655 - 131105: 0x9D44,
-	164666 - 131105: 0x8ECA,
-	164709 - 131105: 0x904E,
-	164717 - 131105: 0x8EB3,
-	164733 - 131105: 0x9FF5,
-	164746 - 131105: 0x9D45,
-	164882 - 131105: 0x904F,
-	164968 - 131105: 0x9D47,
-	164972 - 131105: 0x89CA,
-	164979 - 131105: 0x9CB5,
-	164994 - 131105: 0xFBFE,
-	165121 - 131105: 0x905E,
-	165180 - 131105: 0x9063,
-	165181 - 131105: 0x9057,
-	165228 - 131105: 0x9066,
-	165352 - 131105: 0x9BC0,
-	165364 - 131105: 0xFCE5,
-	165376 - 131105: 0x9162,
-	165387 - 131105: 0x9067,
-	165413 - 131105: 0x8FA1,
-	165435 - 131105: 0x8FA2,
-	165546 - 131105: 0x9D48,
-	165547 - 131105: 0xFAD3,
-	165554 - 131105: 0x8D4F,
-	165564 - 131105: 0x905D,
-	165592 - 131105: 0x90B9,
-	165606 - 131105: 0x906B,
-	165647 - 131105: 0x8C5C,
-	165651 - 131105: 0x9069,
-	165892 - 131105: 0xFE57,
-	165931 - 131105: 0xFE55,
-	166157 - 131105: 0x87A6,
-	166195 - 131105: 0x9073,
-	166216 - 131105: 0x9BEF,
-	166217 - 131105: 0x9CF0,
-	166230 - 131105: 0x9D4B,
-	166244 - 131105: 0xFED9,
-	166248 - 131105: 0xFEDA,
-	166252 - 131105: 0x91E0,
-	166253 - 131105: 0x8D43,
-	166270 - 131105: 0x91D8,
-	166281 - 131105: 0x9646,
-	166312 - 131105: 0x9360,
-	166314 - 131105: 0xFA53,
-	166315 - 131105: 0x9CD3,
-	166328 - 131105: 0x9D4E,
-	166332 - 131105: 0xFB40,
-	166336 - 131105: 0x8DE2,
-	166364 - 131105: 0x9442,
-	166366 - 131105: 0x9056,
-	166369 - 131105: 0x9865,
-	166371 - 131105: 0x8C6C,
-	166372 - 131105: 0xFA4A,
-	166375 - 131105: 0x9D50,
-	166376 - 131105: 0x9D52,
-	166393 - 131105: 0x95AF,
-	166394 - 131105: 0x975A,
-	166395 - 131105: 0x9349,
-	166396 - 131105: 0x9747,
-	166415 - 131105: 0xA0F4,
-	166422 - 131105: 0x9778,
-	166437 - 131105: 0x8FCF,
-	166441 - 131105: 0xFC60,
-	166450 - 131105: 0x8C4E,
-	166454 - 131105: 0xFC56,
-	166468 - 131105: 0x91DC,
-	166469 - 131105: 0x9661,
-	166470 - 131105: 0x92EC,
-	166471 - 131105: 0x935D,
-	166472 - 131105: 0x8EDE,
-	166473 - 131105: 0x96FE,
-	166474 - 131105: 0xFD4F,
-	166475 - 131105: 0x95DE,
-	166489 - 131105: 0x98B0,
-	166490 - 131105: 0xA040,
-	166529 - 131105: 0x97BD,
-	166530 - 131105: 0x977D,
-	166531 - 131105: 0x97F5,
-	166554 - 131105: 0x9BAC,
-	166555 - 131105: 0xFADA,
-	166556 - 131105: 0x92C2,
-	166592 - 131105: 0x97B1,
-	166598 - 131105: 0x907B,
-	166603 - 131105: 0x93FE,
-	166604 - 131105: 0x947B,
-	166606 - 131105: 0x9777,
-	166622 - 131105: 0xFABE,
-	166623 - 131105: 0xFD43,
-	166624 - 131105: 0x90C6,
-	166625 - 131105: 0x90A4,
-	166626 - 131105: 0x90A8,
-	166627 - 131105: 0x94A9,
-	166629 - 131105: 0x90A9,
-	166634 - 131105: 0x8C65,
-	166652 - 131105: 0x95E0,
-	166668 - 131105: 0x907D,
-	166675 - 131105: 0x9265,
-	166689 - 131105: 0xFDBA,
-	166690 - 131105: 0x93C4,
-	166699 - 131105: 0xFEED,
-	166700 - 131105: 0x9DAB,
-	166701 - 131105: 0xA0E3,
-	166703 - 131105: 0x9648,
-	166726 - 131105: 0x9D53,
-	166732 - 131105: 0x8AA9,
-	166734 - 131105: 0x9BC5,
-	166736 - 131105: 0x965D,
-	166755 - 131105: 0x975F,
-	166756 - 131105: 0x965F,
-	166757 - 131105: 0x966E,
-	166758 - 131105: 0xFB5D,
-	166764 - 131105: 0x9DB1,
-	166799 - 131105: 0xFEA3,
-	166809 - 131105: 0x9DB2,
-	166812 - 131105: 0x95AE,
-	166813 - 131105: 0xFCA3,
-	166841 - 131105: 0x8769,
-	166850 - 131105: 0xA0A2,
-	166853 - 131105: 0x9655,
-	166868 - 131105: 0x9D54,
-	166871 - 131105: 0x9341,
-	166873 - 131105: 0x95AD,
-	166874 - 131105: 0x91D5,
-	166887 - 131105: 0x977A,
-	166888 - 131105: 0xFDFC,
-	166889 - 131105: 0x8E47,
-	166890 - 131105: 0x93FD,
-	166891 - 131105: 0x90A5,
-	166892 - 131105: 0x90AC,
-	166901 - 131105: 0x95AC,
-	166911 - 131105: 0x90AE,
-	166915 - 131105: 0xFEA5,
-	166921 - 131105: 0x9D56,
-	166940 - 131105: 0x97E3,
-	166941 - 131105: 0x95E2,
-	166947 - 131105: 0x9466,
-	166950 - 131105: 0x9647,
-	166955 - 131105: 0x91B8,
-	166960 - 131105: 0x9CEC,
-	166969 - 131105: 0x90AD,
-	166971 - 131105: 0x95E3,
-	167114 - 131105: 0x8B4F,
-	167117 - 131105: 0x8AE3,
-	167122 - 131105: 0x8B4D,
-	167220 - 131105: 0x95EA,
-	167321 - 131105: 0x8B4E,
-	167353 - 131105: 0x8CC1,
-	167439 - 131105: 0x8BED,
-	167478 - 131105: 0x91D9,
-	167481 - 131105: 0xA0A4,
-	167525 - 131105: 0x95F5,
-	167526 - 131105: 0x95F4,
-	167575 - 131105: 0x9FB3,
-	167596 - 131105: 0xFEAF,
-	167602 - 131105: 0xFE72,
-	167603 - 131105: 0x927A,
-	167641 - 131105: 0xFEAC,
-	167655 - 131105: 0x95F3,
-	167877 - 131105: 0x9D58,
-	168057 - 131105: 0x8D46,
-	168072 - 131105: 0x9372,
-	168075 - 131105: 0x91C5,
-	168083 - 131105: 0x9642,
-	168111 - 131105: 0x90CD,
-	168112 - 131105: 0x95FE,
-	168113 - 131105: 0x9159,
-	168128 - 131105: 0x9C65,
-	168164 - 131105: 0x97CC,
-	168165 - 131105: 0x90CE,
-	168172 - 131105: 0x9D59,
-	168173 - 131105: 0xFCF5,
-	168205 - 131105: 0xFEFD,
-	168208 - 131105: 0x9D5B,
-	168252 - 131105: 0x9D5C,
-	168269 - 131105: 0x937E,
-	168283 - 131105: 0x98AC,
-	168286 - 131105: 0x9D5E,
-	168304 - 131105: 0xFDD0,
-	168348 - 131105: 0xFD60,
-	168360 - 131105: 0x9CCF,
-	168405 - 131105: 0x90DD,
-	168427 - 131105: 0x90E0,
-	168989 - 131105: 0x90F3,
-	168992 - 131105: 0x98B1,
-	169011 - 131105: 0x90F0,
-	169023 - 131105: 0x93BD,
-	169032 - 131105: 0x95B7,
-	169168 - 131105: 0x9F46,
-	169177 - 131105: 0x8E4B,
-	169178 - 131105: 0x9658,
-	169189 - 131105: 0x8A4C,
-	169191 - 131105: 0x9D63,
-	169374 - 131105: 0x9ECF,
-	169392 - 131105: 0x9D65,
-	169400 - 131105: 0x9D66,
-	169431 - 131105: 0x965A,
-	169449 - 131105: 0x9D64,
-	169460 - 131105: 0x8A6C,
-	169760 - 131105: 0x8AD9,
-	169778 - 131105: 0x9D67,
-	169940 - 131105: 0x8A70,
-	170000 - 131105: 0x8BF3,
-	170071 - 131105: 0x9150,
-	170148 - 131105: 0x9CC1,
-	170193 - 131105: 0x9D68,
-	170218 - 131105: 0x93A7,
-	170225 - 131105: 0x9674,
-	170234 - 131105: 0x8CFD,
-	170243 - 131105: 0xA0EF,
-	170245 - 131105: 0x9151,
-	170287 - 131105: 0x96C1,
-	170309 - 131105: 0x8777,
-	170311 - 131105: 0x8C64,
-	170312 - 131105: 0x9676,
-	170313 - 131105: 0x9D69,
-	170333 - 131105: 0xFCA4,
-	170346 - 131105: 0x9D6A,
-	170397 - 131105: 0x924E,
-	170435 - 131105: 0x9D6B,
-	170441 - 131105: 0x9BC1,
-	170536 - 131105: 0x9D6C,
-	170573 - 131105: 0x8A65,
-	170757 - 131105: 0x915D,
-	170766 - 131105: 0x9D6D,
-	170965 - 131105: 0x915A,
-	171123 - 131105: 0x8C42,
-	171181 - 131105: 0x9CC0,
-	171326 - 131105: 0x916A,
-	171354 - 131105: 0x9D6E,
-	171388 - 131105: 0x9EA6,
-	171416 - 131105: 0x9DCD,
-	171419 - 131105: 0x9D6F,
-	171510 - 131105: 0x89BB,
-	171526 - 131105: 0x9EF9,
-	171565 - 131105: 0x96B4,
-	171624 - 131105: 0x9172,
-	171692 - 131105: 0x9EC8,
-	171696 - 131105: 0x8771,
-	171715 - 131105: 0x8B55,
-	171768 - 131105: 0x9D71,
-	171811 - 131105: 0x9D72,
-	171824 - 131105: 0x9ECC,
-	171959 - 131105: 0x9174,
-	171998 - 131105: 0x9ED0,
-	172052 - 131105: 0x905C,
-	172167 - 131105: 0x8ED2,
-	172217 - 131105: 0x91A8,
-	172257 - 131105: 0x9177,
-	172269 - 131105: 0x96BF,
-	172275 - 131105: 0x96C0,
-	172280 - 131105: 0x8FB1,
-	172286 - 131105: 0x96B7,
-	172295 - 131105: 0x8C55,
-	172323 - 131105: 0x9178,
-	172339 - 131105: 0x89BE,
-	172340 - 131105: 0x917C,
-	172368 - 131105: 0xFB77,
-	172434 - 131105: 0x9175,
-	172435 - 131105: 0x91A3,
-	172459 - 131105: 0x9176,
-	172468 - 131105: 0x96BE,
-	172469 - 131105: 0x8D49,
-	172511 - 131105: 0x9179,
-	172533 - 131105: 0x96B6,
-	172576 - 131105: 0x91A4,
-	172595 - 131105: 0x91A6,
-	172691 - 131105: 0x9D75,
-	172703 - 131105: 0x9052,
-	172722 - 131105: 0xA045,
-	172724 - 131105: 0x91A9,
-	172726 - 131105: 0x98AA,
-	172730 - 131105: 0x8C5F,
-	172733 - 131105: 0x8BAA,
-	172767 - 131105: 0x9CDD,
-	172799 - 131105: 0x9D77,
-	172881 - 131105: 0x8756,
-	172969 - 131105: 0x8940,
-	173108 - 131105: 0x9EEC,
-	173147 - 131105: 0x93AA,
-	173510 - 131105: 0x9478,
-	173515 - 131105: 0x9D7A,
-	173569 - 131105: 0x8AC9,
-	173618 - 131105: 0x8B4B,
-	173642 - 131105: 0x9FEC,
-	173659 - 131105: 0x8AE2,
-	173737 - 131105: 0x9E75,
-}
-
-const encode1Low, encode1High = 11904, 40908
-
-var encode1 = [...]uint16{
-	11904 - 11904: 0xC8D6,
-	11908 - 11904: 0xC8D7,
-	11910 - 11904: 0xC8D8,
-	11911 - 11904: 0xC8D9,
-	11912 - 11904: 0xC8DA,
-	11914 - 11904: 0xC8DB,
-	11916 - 11904: 0xC8DC,
-	11917 - 11904: 0xC8DD,
-	11925 - 11904: 0xC8DE,
-	11932 - 11904: 0xC8DF,
-	11933 - 11904: 0xC8E0,
-	11941 - 11904: 0xC8E1,
-	11943 - 11904: 0xC8E2,
-	11946 - 11904: 0xC8E3,
-	11948 - 11904: 0xC8E4,
-	11950 - 11904: 0xC8E5,
-	11958 - 11904: 0xC8E6,
-	11964 - 11904: 0xC8E7,
-	11966 - 11904: 0xC8E8,
-	11974 - 11904: 0xC8E9,
-	11978 - 11904: 0xC8EA,
-	11980 - 11904: 0xC8EB,
-	11981 - 11904: 0xC8EC,
-	11983 - 11904: 0xC8ED,
-	11990 - 11904: 0xC8EE,
-	11991 - 11904: 0xC8EF,
-	11998 - 11904: 0xC8F0,
-	12003 - 11904: 0xC8F1,
-	12083 - 11904: 0xC6CD,
-	12288 - 11904: 0xA140,
-	12289 - 11904: 0xA142,
-	12290 - 11904: 0xA143,
-	12291 - 11904: 0xC6DE,
-	12293 - 11904: 0xC6E0,
-	12294 - 11904: 0xC6E1,
-	12295 - 11904: 0xC6E2,
-	12296 - 11904: 0xA171,
-	12297 - 11904: 0xA172,
-	12298 - 11904: 0xA16D,
-	12299 - 11904: 0xA16E,
-	12300 - 11904: 0xA175,
-	12301 - 11904: 0xA176,
-	12302 - 11904: 0xA179,
-	12303 - 11904: 0xA17A,
-	12304 - 11904: 0xA169,
-	12305 - 11904: 0xA16A,
-	12306 - 11904: 0xA245,
-	12308 - 11904: 0xA165,
-	12309 - 11904: 0xA166,
-	12317 - 11904: 0xA1A9,
-	12318 - 11904: 0xA1AA,
-	12321 - 11904: 0xA2C3,
-	12322 - 11904: 0xA2C4,
-	12323 - 11904: 0xA2C5,
-	12324 - 11904: 0xA2C6,
-	12325 - 11904: 0xA2C7,
-	12326 - 11904: 0xA2C8,
-	12327 - 11904: 0xA2C9,
-	12328 - 11904: 0xA2CA,
-	12329 - 11904: 0xA2CB,
-	12353 - 11904: 0xC6E7,
-	12354 - 11904: 0xC6E8,
-	12355 - 11904: 0xC6E9,
-	12356 - 11904: 0xC6EA,
-	12357 - 11904: 0xC6EB,
-	12358 - 11904: 0xC6EC,
-	12359 - 11904: 0xC6ED,
-	12360 - 11904: 0xC6EE,
-	12361 - 11904: 0xC6EF,
-	12362 - 11904: 0xC6F0,
-	12363 - 11904: 0xC6F1,
-	12364 - 11904: 0xC6F2,
-	12365 - 11904: 0xC6F3,
-	12366 - 11904: 0xC6F4,
-	12367 - 11904: 0xC6F5,
-	12368 - 11904: 0xC6F6,
-	12369 - 11904: 0xC6F7,
-	12370 - 11904: 0xC6F8,
-	12371 - 11904: 0xC6F9,
-	12372 - 11904: 0xC6FA,
-	12373 - 11904: 0xC6FB,
-	12374 - 11904: 0xC6FC,
-	12375 - 11904: 0xC6FD,
-	12376 - 11904: 0xC6FE,
-	12377 - 11904: 0xC740,
-	12378 - 11904: 0xC741,
-	12379 - 11904: 0xC742,
-	12380 - 11904: 0xC743,
-	12381 - 11904: 0xC744,
-	12382 - 11904: 0xC745,
-	12383 - 11904: 0xC746,
-	12384 - 11904: 0xC747,
-	12385 - 11904: 0xC748,
-	12386 - 11904: 0xC749,
-	12387 - 11904: 0xC74A,
-	12388 - 11904: 0xC74B,
-	12389 - 11904: 0xC74C,
-	12390 - 11904: 0xC74D,
-	12391 - 11904: 0xC74E,
-	12392 - 11904: 0xC74F,
-	12393 - 11904: 0xC750,
-	12394 - 11904: 0xC751,
-	12395 - 11904: 0xC752,
-	12396 - 11904: 0xC753,
-	12397 - 11904: 0xC754,
-	12398 - 11904: 0xC755,
-	12399 - 11904: 0xC756,
-	12400 - 11904: 0xC757,
-	12401 - 11904: 0xC758,
-	12402 - 11904: 0xC759,
-	12403 - 11904: 0xC75A,
-	12404 - 11904: 0xC75B,
-	12405 - 11904: 0xC75C,
-	12406 - 11904: 0xC75D,
-	12407 - 11904: 0xC75E,
-	12408 - 11904: 0xC75F,
-	12409 - 11904: 0xC760,
-	12410 - 11904: 0xC761,
-	12411 - 11904: 0xC762,
-	12412 - 11904: 0xC763,
-	12413 - 11904: 0xC764,
-	12414 - 11904: 0xC765,
-	12415 - 11904: 0xC766,
-	12416 - 11904: 0xC767,
-	12417 - 11904: 0xC768,
-	12418 - 11904: 0xC769,
-	12419 - 11904: 0xC76A,
-	12420 - 11904: 0xC76B,
-	12421 - 11904: 0xC76C,
-	12422 - 11904: 0xC76D,
-	12423 - 11904: 0xC76E,
-	12424 - 11904: 0xC76F,
-	12425 - 11904: 0xC770,
-	12426 - 11904: 0xC771,
-	12427 - 11904: 0xC772,
-	12428 - 11904: 0xC773,
-	12429 - 11904: 0xC774,
-	12430 - 11904: 0xC775,
-	12431 - 11904: 0xC776,
-	12432 - 11904: 0xC777,
-	12433 - 11904: 0xC778,
-	12434 - 11904: 0xC779,
-	12435 - 11904: 0xC77A,
-	12443 - 11904: 0xC8D4,
-	12444 - 11904: 0xC8D5,
-	12445 - 11904: 0xC6DC,
-	12446 - 11904: 0xC6DD,
-	12449 - 11904: 0xC77B,
-	12450 - 11904: 0xC77C,
-	12451 - 11904: 0xC77D,
-	12452 - 11904: 0xC77E,
-	12453 - 11904: 0xC7A1,
-	12454 - 11904: 0xC7A2,
-	12455 - 11904: 0xC7A3,
-	12456 - 11904: 0xC7A4,
-	12457 - 11904: 0xC7A5,
-	12458 - 11904: 0xC7A6,
-	12459 - 11904: 0xC7A7,
-	12460 - 11904: 0xC7A8,
-	12461 - 11904: 0xC7A9,
-	12462 - 11904: 0xC7AA,
-	12463 - 11904: 0xC7AB,
-	12464 - 11904: 0xC7AC,
-	12465 - 11904: 0xC7AD,
-	12466 - 11904: 0xC7AE,
-	12467 - 11904: 0xC7AF,
-	12468 - 11904: 0xC7B0,
-	12469 - 11904: 0xC7B1,
-	12470 - 11904: 0xC7B2,
-	12471 - 11904: 0xC7B3,
-	12472 - 11904: 0xC7B4,
-	12473 - 11904: 0xC7B5,
-	12474 - 11904: 0xC7B6,
-	12475 - 11904: 0xC7B7,
-	12476 - 11904: 0xC7B8,
-	12477 - 11904: 0xC7B9,
-	12478 - 11904: 0xC7BA,
-	12479 - 11904: 0xC7BB,
-	12480 - 11904: 0xC7BC,
-	12481 - 11904: 0xC7BD,
-	12482 - 11904: 0xC7BE,
-	12483 - 11904: 0xC7BF,
-	12484 - 11904: 0xC7C0,
-	12485 - 11904: 0xC7C1,
-	12486 - 11904: 0xC7C2,
-	12487 - 11904: 0xC7C3,
-	12488 - 11904: 0xC7C4,
-	12489 - 11904: 0xC7C5,
-	12490 - 11904: 0xC7C6,
-	12491 - 11904: 0xC7C7,
-	12492 - 11904: 0xC7C8,
-	12493 - 11904: 0xC7C9,
-	12494 - 11904: 0xC7CA,
-	12495 - 11904: 0xC7CB,
-	12496 - 11904: 0xC7CC,
-	12497 - 11904: 0xC7CD,
-	12498 - 11904: 0xC7CE,
-	12499 - 11904: 0xC7CF,
-	12500 - 11904: 0xC7D0,
-	12501 - 11904: 0xC7D1,
-	12502 - 11904: 0xC7D2,
-	12503 - 11904: 0xC7D3,
-	12504 - 11904: 0xC7D4,
-	12505 - 11904: 0xC7D5,
-	12506 - 11904: 0xC7D6,
-	12507 - 11904: 0xC7D7,
-	12508 - 11904: 0xC7D8,
-	12509 - 11904: 0xC7D9,
-	12510 - 11904: 0xC7DA,
-	12511 - 11904: 0xC7DB,
-	12512 - 11904: 0xC7DC,
-	12513 - 11904: 0xC7DD,
-	12514 - 11904: 0xC7DE,
-	12515 - 11904: 0xC7DF,
-	12516 - 11904: 0xC7E0,
-	12517 - 11904: 0xC7E1,
-	12518 - 11904: 0xC7E2,
-	12519 - 11904: 0xC7E3,
-	12520 - 11904: 0xC7E4,
-	12521 - 11904: 0xC7E5,
-	12522 - 11904: 0xC7E6,
-	12523 - 11904: 0xC7E7,
-	12524 - 11904: 0xC7E8,
-	12525 - 11904: 0xC7E9,
-	12526 - 11904: 0xC7EA,
-	12527 - 11904: 0xC7EB,
-	12528 - 11904: 0xC7EC,
-	12529 - 11904: 0xC7ED,
-	12530 - 11904: 0xC7EE,
-	12531 - 11904: 0xC7EF,
-	12532 - 11904: 0xC7F0,
-	12533 - 11904: 0xC7F1,
-	12534 - 11904: 0xC7F2,
-	12540 - 11904: 0xC6E3,
-	12541 - 11904: 0xC6DA,
-	12542 - 11904: 0xC6DB,
-	12549 - 11904: 0xA374,
-	12550 - 11904: 0xA375,
-	12551 - 11904: 0xA376,
-	12552 - 11904: 0xA377,
-	12553 - 11904: 0xA378,
-	12554 - 11904: 0xA379,
-	12555 - 11904: 0xA37A,
-	12556 - 11904: 0xA37B,
-	12557 - 11904: 0xA37C,
-	12558 - 11904: 0xA37D,
-	12559 - 11904: 0xA37E,
-	12560 - 11904: 0xA3A1,
-	12561 - 11904: 0xA3A2,
-	12562 - 11904: 0xA3A3,
-	12563 - 11904: 0xA3A4,
-	12564 - 11904: 0xA3A5,
-	12565 - 11904: 0xA3A6,
-	12566 - 11904: 0xA3A7,
-	12567 - 11904: 0xA3A8,
-	12568 - 11904: 0xA3A9,
-	12569 - 11904: 0xA3AA,
-	12570 - 11904: 0xA3AB,
-	12571 - 11904: 0xA3AC,
-	12572 - 11904: 0xA3AD,
-	12573 - 11904: 0xA3AE,
-	12574 - 11904: 0xA3AF,
-	12575 - 11904: 0xA3B0,
-	12576 - 11904: 0xA3B1,
-	12577 - 11904: 0xA3B2,
-	12578 - 11904: 0xA3B3,
-	12579 - 11904: 0xA3B4,
-	12580 - 11904: 0xA3B5,
-	12581 - 11904: 0xA3B6,
-	12582 - 11904: 0xA3B7,
-	12583 - 11904: 0xA3B8,
-	12584 - 11904: 0xA3B9,
-	12585 - 11904: 0xA3BA,
-	12736 - 11904: 0x8840,
-	12737 - 11904: 0x8841,
-	12738 - 11904: 0x8842,
-	12739 - 11904: 0x8843,
-	12740 - 11904: 0x8844,
-	12741 - 11904: 0x8846,
-	12742 - 11904: 0x8849,
-	12743 - 11904: 0x884A,
-	12744 - 11904: 0x884D,
-	12745 - 11904: 0x884F,
-	12746 - 11904: 0x8850,
-	12747 - 11904: 0x8851,
-	12748 - 11904: 0x8852,
-	12749 - 11904: 0x8854,
-	12750 - 11904: 0x8855,
-	12751 - 11904: 0xC879,
-	12849 - 11904: 0xC8D1,
-	12963 - 11904: 0xA1C0,
-	13198 - 11904: 0xA255,
-	13199 - 11904: 0xA256,
-	13212 - 11904: 0xA250,
-	13213 - 11904: 0xA251,
-	13214 - 11904: 0xA252,
-	13217 - 11904: 0xA254,
-	13252 - 11904: 0xA257,
-	13262 - 11904: 0xA253,
-	13265 - 11904: 0xA1EB,
-	13266 - 11904: 0xA1EA,
-	13269 - 11904: 0xA24F,
-	13365 - 11904: 0x9277,
-	13376 - 11904: 0x96DF,
-	13386 - 11904: 0x8CF4,
-	13388 - 11904: 0x89D5,
-	13412 - 11904: 0x93CD,
-	13427 - 11904: 0x9BDF,
-	13434 - 11904: 0xFA68,
-	13437 - 11904: 0x89DA,
-	13438 - 11904: 0x8F59,
-	13459 - 11904: 0x89DB,
-	13462 - 11904: 0x8F5D,
-	13477 - 11904: 0x89DC,
-	13487 - 11904: 0x96F7,
-	13500 - 11904: 0x8ADA,
-	13505 - 11904: 0x8BDC,
-	13512 - 11904: 0x97DB,
-	13535 - 11904: 0x9E53,
-	13540 - 11904: 0x9DAA,
-	13542 - 11904: 0x87BE,
-	13563 - 11904: 0x9BEA,
-	13574 - 11904: 0x8A6E,
-	13630 - 11904: 0x8BC8,
-	13649 - 11904: 0x89E8,
-	13651 - 11904: 0x89EA,
-	13657 - 11904: 0x8C4B,
-	13665 - 11904: 0xFB70,
-	13677 - 11904: 0x89ED,
-	13680 - 11904: 0x94DD,
-	13682 - 11904: 0x89EE,
-	13687 - 11904: 0x9EB4,
-	13688 - 11904: 0x8AD3,
-	13700 - 11904: 0x92DB,
-	13719 - 11904: 0x94DB,
-	13720 - 11904: 0x89F9,
-	13729 - 11904: 0xFB7A,
-	13733 - 11904: 0x89FB,
-	13741 - 11904: 0x9EFC,
-	13759 - 11904: 0x89FC,
-	13761 - 11904: 0x89BF,
-	13765 - 11904: 0x89FE,
-	13767 - 11904: 0x89E6,
-	13770 - 11904: 0x9D46,
-	13774 - 11904: 0x9DEE,
-	13778 - 11904: 0xA07E,
-	13782 - 11904: 0xA068,
-	13787 - 11904: 0x98E9,
-	13789 - 11904: 0x8B68,
-	13809 - 11904: 0x8DFD,
-	13810 - 11904: 0x8BBE,
-	13811 - 11904: 0x9FD9,
-	13819 - 11904: 0x8AEB,
-	13822 - 11904: 0x9FD7,
-	13833 - 11904: 0x8B6A,
-	13848 - 11904: 0x9C5C,
-	13850 - 11904: 0x8BB1,
-	13859 - 11904: 0xFB5E,
-	13861 - 11904: 0x8770,
-	13869 - 11904: 0x9DF3,
-	13877 - 11904: 0xA0D0,
-	13881 - 11904: 0xFC66,
-	13886 - 11904: 0x92E9,
-	13895 - 11904: 0x9AEC,
-	13896 - 11904: 0x8FAB,
-	13897 - 11904: 0xFA48,
-	13902 - 11904: 0x8E45,
-	13919 - 11904: 0x9C6F,
-	13921 - 11904: 0x8D5C,
-	13946 - 11904: 0x9EDE,
-	13953 - 11904: 0x89EF,
-	13978 - 11904: 0x96E9,
-	13989 - 11904: 0x9EBB,
-	13994 - 11904: 0x94DE,
-	13996 - 11904: 0x9EB8,
-	14000 - 11904: 0x97BA,
-	14001 - 11904: 0xFB65,
-	14005 - 11904: 0x95D6,
-	14009 - 11904: 0x9CBB,
-	14012 - 11904: 0x97DA,
-	14017 - 11904: 0x8F45,
-	14019 - 11904: 0xFB7D,
-	14020 - 11904: 0x9158,
-	14021 - 11904: 0xFE64,
-	14023 - 11904: 0x9856,
-	14024 - 11904: 0x9B4D,
-	14035 - 11904: 0x935B,
-	14036 - 11904: 0x95C7,
-	14038 - 11904: 0x97E7,
-	14045 - 11904: 0x9359,
-	14049 - 11904: 0x91F5,
-	14050 - 11904: 0x97B8,
-	14053 - 11904: 0xFDA2,
-	14054 - 11904: 0xFBB6,
-	14069 - 11904: 0x92FA,
-	14081 - 11904: 0x9357,
-	14083 - 11904: 0x8BA6,
-	14088 - 11904: 0xFBB9,
-	14090 - 11904: 0x97B0,
-	14093 - 11904: 0xFDC4,
-	14108 - 11904: 0x9CA1,
-	14114 - 11904: 0x91F2,
-	14115 - 11904: 0x91F9,
-	14117 - 11904: 0x8FF1,
-	14124 - 11904: 0x9745,
-	14125 - 11904: 0x9853,
-	14128 - 11904: 0xFE78,
-	14130 - 11904: 0xFBC1,
-	14131 - 11904: 0x9251,
-	14138 - 11904: 0x9DAD,
-	14144 - 11904: 0xFD6C,
-	14147 - 11904: 0xFA6B,
-	14178 - 11904: 0x9BC2,
-	14191 - 11904: 0x9A7B,
-	14231 - 11904: 0x8B60,
-	14240 - 11904: 0x934B,
-	14265 - 11904: 0x9ABD,
-	14270 - 11904: 0x91B7,
-	14294 - 11904: 0x8D4B,
-	14322 - 11904: 0x95B4,
-	14328 - 11904: 0xFEC5,
-	14331 - 11904: 0x9EF0,
-	14351 - 11904: 0x8D64,
-	14361 - 11904: 0x9269,
-	14368 - 11904: 0x8D67,
-	14381 - 11904: 0xFBEA,
-	14390 - 11904: 0xFBEF,
-	14392 - 11904: 0x8D68,
-	14435 - 11904: 0x93EB,
-	14453 - 11904: 0x877A,
-	14496 - 11904: 0xFC42,
-	14531 - 11904: 0x9166,
-	14540 - 11904: 0xFACD,
-	14545 - 11904: 0x93DD,
-	14548 - 11904: 0x8D52,
-	14586 - 11904: 0x8BCC,
-	14600 - 11904: 0x8D6D,
-	14612 - 11904: 0x8D6E,
-	14631 - 11904: 0x96A8,
-	14642 - 11904: 0xFCA6,
-	14655 - 11904: 0x8D6F,
-	14669 - 11904: 0x8D70,
-	14691 - 11904: 0xFC64,
-	14712 - 11904: 0x8CF3,
-	14720 - 11904: 0x9060,
-	14729 - 11904: 0x8D74,
-	14730 - 11904: 0x97C3,
-	14738 - 11904: 0x8AD0,
-	14745 - 11904: 0x9274,
-	14747 - 11904: 0x9BBE,
-	14753 - 11904: 0x9CC8,
-	14756 - 11904: 0x9CBA,
-	14776 - 11904: 0x8D78,
-	14812 - 11904: 0x9EB9,
-	14818 - 11904: 0x955A,
-	14821 - 11904: 0x91B4,
-	14828 - 11904: 0x8A48,
-	14840 - 11904: 0x8D7D,
-	14843 - 11904: 0x8A7D,
-	14846 - 11904: 0x8AC2,
-	14849 - 11904: 0xFD4A,
-	14851 - 11904: 0x8DA1,
-	14854 - 11904: 0x8AD1,
-	14871 - 11904: 0xFCB4,
-	14872 - 11904: 0x8B47,
-	14889 - 11904: 0x93A4,
-	14890 - 11904: 0x9EDA,
-	14900 - 11904: 0x8A51,
-	14923 - 11904: 0x8DA6,
-	14930 - 11904: 0x9EC5,
-	14935 - 11904: 0xFCC4,
-	14940 - 11904: 0xA078,
-	14942 - 11904: 0x94B5,
-	14950 - 11904: 0xFCC2,
-	14951 - 11904: 0x8A6B,
-	14999 - 11904: 0x8DAB,
-	15019 - 11904: 0xFAE8,
-	15037 - 11904: 0x8DAD,
-	15070 - 11904: 0xFC49,
-	15072 - 11904: 0x93C1,
-	15088 - 11904: 0x906F,
-	15090 - 11904: 0x8DB0,
-	15093 - 11904: 0x87A2,
-	15099 - 11904: 0x947E,
-	15118 - 11904: 0x90FA,
-	15129 - 11904: 0x9479,
-	15138 - 11904: 0x8DB2,
-	15147 - 11904: 0xFCEE,
-	15161 - 11904: 0x997B,
-	15170 - 11904: 0x8DB4,
-	15192 - 11904: 0x8DB7,
-	15200 - 11904: 0x91B3,
-	15217 - 11904: 0x8DBB,
-	15218 - 11904: 0x8DBA,
-	15227 - 11904: 0x8DBC,
-	15228 - 11904: 0x9044,
-	15232 - 11904: 0xFD4C,
-	15253 - 11904: 0x874B,
-	15254 - 11904: 0x93E4,
-	15257 - 11904: 0x93E0,
-	15265 - 11904: 0xFD53,
-	15292 - 11904: 0x8DC3,
-	15294 - 11904: 0x9BB8,
-	15298 - 11904: 0xFBF0,
-	15300 - 11904: 0x93E9,
-	15319 - 11904: 0x93F6,
-	15325 - 11904: 0x8DC5,
-	15340 - 11904: 0x8DCA,
-	15346 - 11904: 0x8DCC,
-	15347 - 11904: 0xFD5D,
-	15348 - 11904: 0x93B5,
-	15373 - 11904: 0xFD61,
-	15377 - 11904: 0x9CF8,
-	15381 - 11904: 0x9252,
-	15384 - 11904: 0xA0E8,
-	15444 - 11904: 0x9CA5,
-	15499 - 11904: 0x8C56,
-	15563 - 11904: 0x8DD6,
-	15565 - 11904: 0x97C0,
-	15569 - 11904: 0xA0DE,
-	15574 - 11904: 0x97D2,
-	15580 - 11904: 0xFAA5,
-	15595 - 11904: 0xFDA3,
-	15599 - 11904: 0x8DDB,
-	15634 - 11904: 0x8CEA,
-	15635 - 11904: 0x8EAF,
-	15645 - 11904: 0x91B5,
-	15666 - 11904: 0xFD49,
-	15675 - 11904: 0xFDD1,
-	15686 - 11904: 0x8DEB,
-	15692 - 11904: 0x97C6,
-	15694 - 11904: 0xFDCE,
-	15697 - 11904: 0x90FC,
-	15711 - 11904: 0xFC59,
-	15714 - 11904: 0x96D6,
-	15721 - 11904: 0x97C5,
-	15722 - 11904: 0x8DEF,
-	15727 - 11904: 0x97D7,
-	15733 - 11904: 0x8DF0,
-	15741 - 11904: 0x96A6,
-	15749 - 11904: 0xFBBF,
-	15752 - 11904: 0x8CDF,
-	15754 - 11904: 0x8DF3,
-	15759 - 11904: 0x9449,
-	15761 - 11904: 0x8DF5,
-	15781 - 11904: 0x9872,
-	15789 - 11904: 0x8E6B,
-	15796 - 11904: 0xFAFD,
-	15807 - 11904: 0x8F50,
-	15814 - 11904: 0x9DCC,
-	15815 - 11904: 0xFC65,
-	15817 - 11904: 0x8C44,
-	15820 - 11904: 0x996E,
-	15821 - 11904: 0x94A1,
-	15827 - 11904: 0x8F63,
-	15835 - 11904: 0xA0DA,
-	15847 - 11904: 0x9253,
-	15848 - 11904: 0xFDE9,
-	15851 - 11904: 0x9DB5,
-	15859 - 11904: 0x9879,
-	15860 - 11904: 0x876A,
-	15863 - 11904: 0x9D5D,
-	15868 - 11904: 0x8D63,
-	15869 - 11904: 0x9669,
-	15878 - 11904: 0x9F70,
-	15936 - 11904: 0xFC6A,
-	15939 - 11904: 0x8AC7,
-	15944 - 11904: 0x89D7,
-	15957 - 11904: 0xFE4D,
-	15988 - 11904: 0x9EDD,
-	16040 - 11904: 0xFEFB,
-	16041 - 11904: 0x98BC,
-	16042 - 11904: 0xFACC,
-	16045 - 11904: 0x95B0,
-	16049 - 11904: 0x9464,
-	16056 - 11904: 0x936F,
-	16063 - 11904: 0x94B9,
-	16066 - 11904: 0x95EC,
-	16071 - 11904: 0x91EE,
-	16074 - 11904: 0x98C3,
-	16076 - 11904: 0x95F6,
-	16080 - 11904: 0x8FFD,
-	16081 - 11904: 0x98C5,
-	16086 - 11904: 0x9766,
-	16087 - 11904: 0xFE6E,
-	16090 - 11904: 0x97DD,
-	16091 - 11904: 0x8CAA,
-	16094 - 11904: 0x92D2,
-	16097 - 11904: 0x9761,
-	16098 - 11904: 0x98CB,
-	16103 - 11904: 0x95F0,
-	16105 - 11904: 0x975D,
-	16107 - 11904: 0x91E3,
-	16108 - 11904: 0x877E,
-	16112 - 11904: 0x98CC,
-	16115 - 11904: 0x9469,
-	16116 - 11904: 0x98CD,
-	16122 - 11904: 0x98CE,
-	16124 - 11904: 0x95FC,
-	16127 - 11904: 0x94A3,
-	16128 - 11904: 0x9662,
-	16132 - 11904: 0xFEB6,
-	16134 - 11904: 0x9463,
-	16135 - 11904: 0x8D47,
-	16142 - 11904: 0x98D0,
-	16211 - 11904: 0x98D1,
-	16216 - 11904: 0x9475,
-	16217 - 11904: 0xFAE0,
-	16227 - 11904: 0x9472,
-	16252 - 11904: 0x98D6,
-	16275 - 11904: 0x8AF0,
-	16320 - 11904: 0x98D9,
-	16328 - 11904: 0x8D5A,
-	16343 - 11904: 0x98DB,
-	16348 - 11904: 0x98DD,
-	16357 - 11904: 0x98A8,
-	16365 - 11904: 0x8A6D,
-	16377 - 11904: 0x8AFB,
-	16378 - 11904: 0x8AAE,
-	16388 - 11904: 0xFBC9,
-	16393 - 11904: 0x8C5D,
-	16413 - 11904: 0x98E4,
-	16441 - 11904: 0x98E6,
-	16453 - 11904: 0x98E8,
-	16467 - 11904: 0x8A4D,
-	16471 - 11904: 0x9257,
-	16482 - 11904: 0x95DF,
-	16485 - 11904: 0xA0AC,
-	16490 - 11904: 0x98EB,
-	16495 - 11904: 0x98EC,
-	16497 - 11904: 0x8CC3,
-	16552 - 11904: 0x98F4,
-	16564 - 11904: 0x87D9,
-	16571 - 11904: 0x8AB8,
-	16575 - 11904: 0x9EE7,
-	16584 - 11904: 0x94BC,
-	16600 - 11904: 0xFCD1,
-	16607 - 11904: 0x9CC6,
-	16632 - 11904: 0x8D4A,
-	16634 - 11904: 0x9E7E,
-	16642 - 11904: 0x8D44,
-	16643 - 11904: 0x98FE,
-	16644 - 11904: 0xFDE8,
-	16649 - 11904: 0x9940,
-	16654 - 11904: 0x94C9,
-	16689 - 11904: 0x87C6,
-	16690 - 11904: 0x94D3,
-	16743 - 11904: 0x9946,
-	16748 - 11904: 0x90C0,
-	16750 - 11904: 0x94D1,
-	16764 - 11904: 0x8D4E,
-	16767 - 11904: 0x9573,
-	16769 - 11904: 0x87CE,
-	16784 - 11904: 0x93C2,
-	16818 - 11904: 0x9948,
-	16836 - 11904: 0x994B,
-	16842 - 11904: 0x8E55,
-	16847 - 11904: 0x994E,
-	16859 - 11904: 0x8EFE,
-	16877 - 11904: 0x8D5F,
-	16879 - 11904: 0x8E59,
-	16889 - 11904: 0x94EC,
-	16913 - 11904: 0x94EF,
-	16931 - 11904: 0x8C60,
-	16960 - 11904: 0x8F74,
-	16992 - 11904: 0x9955,
-	17002 - 11904: 0x9544,
-	17014 - 11904: 0x8CCB,
-	17018 - 11904: 0x9956,
-	17036 - 11904: 0x9959,
-	17044 - 11904: 0x995B,
-	17058 - 11904: 0x8CC4,
-	17077 - 11904: 0xFA45,
-	17081 - 11904: 0x90B7,
-	17084 - 11904: 0x9743,
-	17140 - 11904: 0x95CD,
-	17147 - 11904: 0x97C9,
-	17148 - 11904: 0xFD50,
-	17162 - 11904: 0x87AA,
-	17195 - 11904: 0x8EB9,
-	17262 - 11904: 0x95C6,
-	17303 - 11904: 0x9967,
-	17306 - 11904: 0x8CE3,
-	17338 - 11904: 0x8AB9,
-	17345 - 11904: 0x8DFC,
-	17369 - 11904: 0x8A76,
-	17375 - 11904: 0x9D51,
-	17389 - 11904: 0x9973,
-	17392 - 11904: 0x8740,
-	17394 - 11904: 0x9D4F,
-	17409 - 11904: 0x997A,
-	17410 - 11904: 0x9564,
-	17427 - 11904: 0x99A1,
-	17445 - 11904: 0x99A5,
-	17453 - 11904: 0x99A7,
-	17530 - 11904: 0x8EED,
-	17551 - 11904: 0x99AD,
-	17553 - 11904: 0xC87E,
-	17567 - 11904: 0x946E,
-	17568 - 11904: 0x8F70,
-	17570 - 11904: 0xFAD0,
-	17584 - 11904: 0x99B3,
-	17591 - 11904: 0xA053,
-	17597 - 11904: 0x8D5E,
-	17600 - 11904: 0x965C,
-	17603 - 11904: 0x8CE0,
-	17605 - 11904: 0xFD7A,
-	17614 - 11904: 0x97FE,
-	17629 - 11904: 0x92BD,
-	17630 - 11904: 0x8D5D,
-	17631 - 11904: 0x97FD,
-	17633 - 11904: 0x87DB,
-	17636 - 11904: 0x8F64,
-	17641 - 11904: 0xFCF7,
-	17642 - 11904: 0x9562,
-	17643 - 11904: 0x97CD,
-	17644 - 11904: 0x9E64,
-	17652 - 11904: 0x924C,
-	17667 - 11904: 0x8EC9,
-	17668 - 11904: 0x99BC,
-	17673 - 11904: 0x9DA5,
-	17675 - 11904: 0x8F54,
-	17686 - 11904: 0x8F7C,
-	17691 - 11904: 0x8D55,
-	17693 - 11904: 0x8EA2,
-	17703 - 11904: 0x8F7A,
-	17710 - 11904: 0x97AE,
-	17715 - 11904: 0x96C8,
-	17718 - 11904: 0x8CE4,
-	17723 - 11904: 0x99C3,
-	17725 - 11904: 0x90D6,
-	17727 - 11904: 0x9CBE,
-	17731 - 11904: 0x8F76,
-	17745 - 11904: 0x9470,
-	17746 - 11904: 0xFB4B,
-	17749 - 11904: 0xFDCA,
-	17752 - 11904: 0x8CEF,
-	17756 - 11904: 0x8EC7,
-	17761 - 11904: 0x8D54,
-	17762 - 11904: 0xA0F9,
-	17770 - 11904: 0x8FA9,
-	17773 - 11904: 0x8D51,
-	17783 - 11904: 0x99C7,
-	17784 - 11904: 0x8744,
-	17797 - 11904: 0x90D7,
-	17830 - 11904: 0x8743,
-	17843 - 11904: 0x8747,
-	17882 - 11904: 0x8758,
-	17897 - 11904: 0x9EDF,
-	17898 - 11904: 0x8D59,
-	17923 - 11904: 0x8742,
-	17926 - 11904: 0x99CE,
-	17935 - 11904: 0x8FBA,
-	17941 - 11904: 0x8FEB,
-	17943 - 11904: 0x99CF,
-	18011 - 11904: 0x8FC2,
-	18042 - 11904: 0x92C9,
-	18048 - 11904: 0x97DC,
-	18081 - 11904: 0x875D,
-	18094 - 11904: 0x87CC,
-	18107 - 11904: 0x8D45,
-	18127 - 11904: 0x95B3,
-	18128 - 11904: 0x9C79,
-	18165 - 11904: 0x95B2,
-	18167 - 11904: 0x8D4C,
-	18195 - 11904: 0x8FDB,
-	18200 - 11904: 0x9BE3,
-	18230 - 11904: 0x874C,
-	18244 - 11904: 0x874D,
-	18254 - 11904: 0x9E7A,
-	18255 - 11904: 0x8757,
-	18300 - 11904: 0x9BEE,
-	18328 - 11904: 0x99DE,
-	18342 - 11904: 0xFAFA,
-	18389 - 11904: 0x8A52,
-	18413 - 11904: 0x99E1,
-	18420 - 11904: 0x8A67,
-	18432 - 11904: 0x8BB5,
-	18443 - 11904: 0x8AAC,
-	18487 - 11904: 0x99E9,
-	18525 - 11904: 0xFBCA,
-	18545 - 11904: 0x97DE,
-	18587 - 11904: 0x95D1,
-	18605 - 11904: 0x99F5,
-	18606 - 11904: 0xFC4A,
-	18640 - 11904: 0x9BA9,
-	18653 - 11904: 0xFBDC,
-	18669 - 11904: 0xFE56,
-	18675 - 11904: 0x9EA4,
-	18682 - 11904: 0x9D49,
-	18694 - 11904: 0x95DB,
-	18705 - 11904: 0x89C5,
-	18718 - 11904: 0x99F8,
-	18725 - 11904: 0x9664,
-	18730 - 11904: 0x9055,
-	18733 - 11904: 0x96D4,
-	18735 - 11904: 0x87C4,
-	18736 - 11904: 0x87AE,
-	18741 - 11904: 0x977C,
-	18748 - 11904: 0x964D,
-	18750 - 11904: 0x97E1,
-	18757 - 11904: 0x9A48,
-	18769 - 11904: 0x9A49,
-	18771 - 11904: 0xFE7D,
-	18789 - 11904: 0x90AA,
-	18794 - 11904: 0x9A50,
-	18802 - 11904: 0x9347,
-	18825 - 11904: 0x8ED8,
-	18849 - 11904: 0x90C9,
-	18855 - 11904: 0x9A55,
-	18911 - 11904: 0x90BC,
-	18917 - 11904: 0x9A58,
-	18919 - 11904: 0x8BB8,
-	18959 - 11904: 0x90D5,
-	18973 - 11904: 0x9641,
-	18980 - 11904: 0x9A5A,
-	18997 - 11904: 0x9A5C,
-	19094 - 11904: 0x97C2,
-	19108 - 11904: 0x875C,
-	19124 - 11904: 0x8ABB,
-	19128 - 11904: 0x9BAA,
-	19153 - 11904: 0x90F5,
-	19172 - 11904: 0x9A60,
-	19199 - 11904: 0x9145,
-	19216 - 11904: 0x8C58,
-	19225 - 11904: 0x9A63,
-	19232 - 11904: 0x8C49,
-	19244 - 11904: 0x8BB6,
-	19255 - 11904: 0xFCCF,
-	19311 - 11904: 0x966B,
-	19312 - 11904: 0x9A6E,
-	19314 - 11904: 0x914F,
-	19323 - 11904: 0x9746,
-	19326 - 11904: 0xA0E6,
-	19342 - 11904: 0x92D7,
-	19344 - 11904: 0x9675,
-	19347 - 11904: 0x93D4,
-	19350 - 11904: 0x91BB,
-	19351 - 11904: 0x9679,
-	19357 - 11904: 0x9A70,
-	19389 - 11904: 0x9678,
-	19390 - 11904: 0x91CD,
-	19392 - 11904: 0x9C4A,
-	19460 - 11904: 0xA06F,
-	19463 - 11904: 0xA06A,
-	19470 - 11904: 0x915F,
-	19506 - 11904: 0x8741,
-	19515 - 11904: 0x9FA5,
-	19518 - 11904: 0x89BA,
-	19520 - 11904: 0x874F,
-	19527 - 11904: 0x874E,
-	19543 - 11904: 0x8755,
-	19547 - 11904: 0x9ECD,
-	19565 - 11904: 0x9A79,
-	19575 - 11904: 0x8CF2,
-	19579 - 11904: 0x8D57,
-	19581 - 11904: 0x9DCE,
-	19585 - 11904: 0x8CD2,
-	19589 - 11904: 0x8759,
-	19620 - 11904: 0x9D73,
-	19630 - 11904: 0x96B9,
-	19632 - 11904: 0x96BC,
-	19639 - 11904: 0x9CD1,
-	19661 - 11904: 0x89B7,
-	19681 - 11904: 0x9EEE,
-	19682 - 11904: 0x8749,
-	19693 - 11904: 0xFB43,
-	19719 - 11904: 0x875B,
-	19721 - 11904: 0x9EC9,
-	19728 - 11904: 0xFBD3,
-	19764 - 11904: 0x91AE,
-	19830 - 11904: 0x8D58,
-	19831 - 11904: 0x8746,
-	19849 - 11904: 0x8D56,
-	19857 - 11904: 0x9D78,
-	19868 - 11904: 0x9D7B,
-	19968 - 11904: 0xA440,
-	19969 - 11904: 0xA442,
-	19971 - 11904: 0xA443,
-	19972 - 11904: 0x9EB3,
-	19975 - 11904: 0xC945,
-	19976 - 11904: 0xA456,
-	19977 - 11904: 0xA454,
-	19978 - 11904: 0xA457,
-	19979 - 11904: 0xA455,
-	19980 - 11904: 0xC946,
-	19981 - 11904: 0xA4A3,
-	19982 - 11904: 0xC94F,
-	19983 - 11904: 0xC94D,
-	19984 - 11904: 0xA4A2,
-	19985 - 11904: 0xA4A1,
-	19988 - 11904: 0xA542,
-	19989 - 11904: 0xA541,
-	19990 - 11904: 0xA540,
-	19992 - 11904: 0xA543,
-	19993 - 11904: 0xA4FE,
-	19994 - 11904: 0x9EB2,
-	19996 - 11904: 0x9DD6,
-	19998 - 11904: 0xA5E0,
-	19999 - 11904: 0xA5E1,
-	20001 - 11904: 0x994F,
-	20004 - 11904: 0x89CE,
-	20006 - 11904: 0xA8C3,
-	20008 - 11904: 0x8BC0,
-	20010 - 11904: 0x9FC4,
-	20011 - 11904: 0xA458,
-	20012 - 11904: 0x8BD4,
-	20013 - 11904: 0xA4A4,
-	20014 - 11904: 0xC950,
-	20015 - 11904: 0x8C72,
-	20016 - 11904: 0xA4A5,
-	20017 - 11904: 0xC963,
-	20018 - 11904: 0xA6EA,
-	20019 - 11904: 0xCBB1,
-	20022 - 11904: 0xC6BF,
-	20023 - 11904: 0x8BF9,
-	20024 - 11904: 0xA459,
-	20025 - 11904: 0xA4A6,
-	20027 - 11904: 0xA544,
-	20028 - 11904: 0xC964,
-	20029 - 11904: 0x8946,
-	20031 - 11904: 0xC6C0,
-	20034 - 11904: 0xC940,
-	20035 - 11904: 0xA444,
-	20037 - 11904: 0xA45B,
-	20039 - 11904: 0xC947,
-	20040 - 11904: 0xA45C,
-	20041 - 11904: 0xFAE5,
-	20043 - 11904: 0xA4A7,
-	20045 - 11904: 0xA545,
-	20046 - 11904: 0xA547,
-	20047 - 11904: 0xA546,
-	20050 - 11904: 0xA5E2,
-	20051 - 11904: 0xA5E3,
-	20054 - 11904: 0xA8C4,
-	20056 - 11904: 0xADBC,
-	20057 - 11904: 0xA441,
-	20058 - 11904: 0xC87B,
-	20059 - 11904: 0x8BC6,
-	20060 - 11904: 0xC941,
-	20061 - 11904: 0xA445,
-	20062 - 11904: 0xA45E,
-	20063 - 11904: 0xA45D,
-	20073 - 11904: 0xA5E4,
-	20074 - 11904: 0x9C57,
-	20083 - 11904: 0xA8C5,
-	20088 - 11904: 0x9AFB,
-	20094 - 11904: 0xB0AE,
-	20095 - 11904: 0xD44B,
-	20096 - 11904: 0x89D0,
-	20097 - 11904: 0x89CF,
-	20098 - 11904: 0xB6C3,
-	20099 - 11904: 0xDCB1,
-	20100 - 11904: 0xDCB2,
-	20101 - 11904: 0xC6C1,
-	20102 - 11904: 0xA446,
-	20103 - 11904: 0x89D1,
-	20104 - 11904: 0xA4A9,
-	20105 - 11904: 0x89E2,
-	20107 - 11904: 0xA8C6,
-	20108 - 11904: 0xA447,
-	20109 - 11904: 0xC948,
-	20110 - 11904: 0xA45F,
-	20113 - 11904: 0xA4AA,
-	20114 - 11904: 0xA4AC,
-	20115 - 11904: 0xC951,
-	20116 - 11904: 0xA4AD,
-	20117 - 11904: 0xA4AB,
-	20120 - 11904: 0x927E,
-	20121 - 11904: 0xA5E5,
-	20122 - 11904: 0x9DBA,
-	20123 - 11904: 0xA8C7,
-	20126 - 11904: 0xA8C8,
-	20127 - 11904: 0xAB45,
-	20128 - 11904: 0xC6C2,
-	20129 - 11904: 0xA460,
-	20130 - 11904: 0xA4AE,
-	20131 - 11904: 0x8C6F,
-	20132 - 11904: 0xA5E6,
-	20133 - 11904: 0xA5E8,
-	20134 - 11904: 0xA5E7,
-	20136 - 11904: 0xA6EB,
-	20139 - 11904: 0xA8C9,
-	20140 - 11904: 0xA8CA,
-	20141 - 11904: 0xAB46,
-	20142 - 11904: 0xAB47,
-	20147 - 11904: 0xADBD,
-	20150 - 11904: 0xDCB3,
-	20151 - 11904: 0xFBF8,
-	20153 - 11904: 0xF6D6,
-	20154 - 11904: 0xA448,
-	20155 - 11904: 0x8BC7,
-	20156 - 11904: 0x926B,
-	20159 - 11904: 0x89D2,
-	20160 - 11904: 0xA4B0,
-	20161 - 11904: 0xA4AF,
-	20162 - 11904: 0xC952,
-	20163 - 11904: 0xA4B1,
-	20164 - 11904: 0xA4B7,
-	20166 - 11904: 0xA4B2,
-	20167 - 11904: 0xA4B3,
-	20168 - 11904: 0xC954,
-	20169 - 11904: 0xC953,
-	20170 - 11904: 0xA4B5,
-	20171 - 11904: 0xA4B6,
-	20173 - 11904: 0xA4B4,
-	20174 - 11904: 0x9FCF,
-	20180 - 11904: 0xA54A,
-	20181 - 11904: 0xA54B,
-	20182 - 11904: 0xA54C,
-	20183 - 11904: 0xA54D,
-	20184 - 11904: 0xA549,
-	20185 - 11904: 0xA550,
-	20186 - 11904: 0xC96A,
-	20188 - 11904: 0xC966,
-	20189 - 11904: 0xC969,
-	20190 - 11904: 0xA551,
-	20191 - 11904: 0xA561,
-	20193 - 11904: 0xC968,
-	20195 - 11904: 0xA54E,
-	20196 - 11904: 0xA54F,
-	20197 - 11904: 0xA548,
-	20200 - 11904: 0xC965,
-	20201 - 11904: 0xC967,
-	20202 - 11904: 0x9DA9,
-	20203 - 11904: 0x89D3,
-	20206 - 11904: 0x99E2,
-	20208 - 11904: 0xA5F5,
-	20209 - 11904: 0xC9B0,
-	20210 - 11904: 0xA5F2,
-	20211 - 11904: 0xA5F6,
-	20212 - 11904: 0xC9BA,
-	20213 - 11904: 0xC9AE,
-	20214 - 11904: 0xA5F3,
-	20215 - 11904: 0xC9B2,
-	20216 - 11904: 0x9267,
-	20219 - 11904: 0xA5F4,
-	20221 - 11904: 0xA5F7,
-	20223 - 11904: 0xA5E9,
-	20224 - 11904: 0xC9B1,
-	20225 - 11904: 0xA5F8,
-	20226 - 11904: 0xC9B5,
-	20227 - 11904: 0x92A4,
-	20228 - 11904: 0xC9B9,
-	20229 - 11904: 0xC9B6,
-	20232 - 11904: 0xC9B3,
-	20233 - 11904: 0xA5EA,
-	20234 - 11904: 0xA5EC,
-	20235 - 11904: 0xA5F9,
-	20237 - 11904: 0xA5EE,
-	20238 - 11904: 0xC9AB,
-	20239 - 11904: 0xA5F1,
-	20240 - 11904: 0xA5EF,
-	20241 - 11904: 0xA5F0,
-	20242 - 11904: 0xC9BB,
-	20243 - 11904: 0xC9B8,
-	20244 - 11904: 0xC9AF,
-	20245 - 11904: 0xA5ED,
-	20247 - 11904: 0x8C73,
-	20248 - 11904: 0xC9AC,
-	20249 - 11904: 0xA5EB,
-	20250 - 11904: 0x894E,
-	20253 - 11904: 0xC9B4,
-	20258 - 11904: 0xC9B7,
-	20264 - 11904: 0x894F,
-	20265 - 11904: 0x9278,
-	20268 - 11904: 0xC9AD,
-	20269 - 11904: 0xCA66,
-	20271 - 11904: 0xA742,
-	20272 - 11904: 0xA6F4,
-	20274 - 11904: 0x91B6,
-	20275 - 11904: 0xCA67,
-	20276 - 11904: 0xA6F1,
-	20278 - 11904: 0xA744,
-	20279 - 11904: 0x89D4,
-	20280 - 11904: 0xA6F9,
-	20281 - 11904: 0x9FD2,
-	20282 - 11904: 0xA6F8,
-	20283 - 11904: 0xCA5B,
-	20284 - 11904: 0xA6FC,
-	20285 - 11904: 0xA6F7,
-	20286 - 11904: 0xCA60,
-	20287 - 11904: 0xCA68,
-	20289 - 11904: 0xCA64,
-	20290 - 11904: 0x92A7,
-	20291 - 11904: 0xA6FA,
-	20293 - 11904: 0x95A2,
-	20294 - 11904: 0xA6FD,
-	20295 - 11904: 0xA6EE,
-	20296 - 11904: 0xA747,
-	20297 - 11904: 0xCA5D,
-	20299 - 11904: 0x926E,
-	20300 - 11904: 0xCBBD,
-	20301 - 11904: 0xA6EC,
-	20302 - 11904: 0xA743,
-	20303 - 11904: 0xA6ED,
-	20304 - 11904: 0xA6F5,
-	20305 - 11904: 0xA6F6,
-	20306 - 11904: 0xCA62,
-	20307 - 11904: 0xCA5E,
-	20308 - 11904: 0xA6FB,
-	20309 - 11904: 0xA6F3,
-	20310 - 11904: 0xCA5A,
-	20311 - 11904: 0xA6EF,
-	20312 - 11904: 0xCA65,
-	20313 - 11904: 0xA745,
-	20314 - 11904: 0xA748,
-	20315 - 11904: 0xA6F2,
-	20316 - 11904: 0xA740,
-	20317 - 11904: 0xA746,
-	20318 - 11904: 0xA6F0,
-	20319 - 11904: 0xCA63,
-	20320 - 11904: 0xA741,
-	20321 - 11904: 0xCA69,
-	20322 - 11904: 0xCA5C,
-	20323 - 11904: 0xA6FE,
-	20324 - 11904: 0xCA5F,
-	20327 - 11904: 0xCA61,
-	20329 - 11904: 0xA8D8,
-	20330 - 11904: 0xCBBF,
-	20331 - 11904: 0xCBCB,
-	20332 - 11904: 0xA8D0,
-	20334 - 11904: 0xCBCC,
-	20335 - 11904: 0xA8CB,
-	20336 - 11904: 0xA8D5,
-	20338 - 11904: 0x96EA,
-	20339 - 11904: 0xA8CE,
-	20340 - 11904: 0xCBB9,
-	20341 - 11904: 0xA8D6,
-	20342 - 11904: 0xCBB8,
-	20343 - 11904: 0xCBBC,
-	20344 - 11904: 0xCBC3,
-	20345 - 11904: 0xCBC1,
-	20346 - 11904: 0xA8DE,
-	20347 - 11904: 0xA8D9,
-	20348 - 11904: 0xCBB3,
-	20349 - 11904: 0xCBB5,
-	20350 - 11904: 0xA8DB,
-	20351 - 11904: 0xA8CF,
-	20352 - 11904: 0xCBB6,
-	20353 - 11904: 0xCBC2,
-	20354 - 11904: 0xCBC9,
-	20355 - 11904: 0xA8D4,
-	20356 - 11904: 0xCBBB,
-	20357 - 11904: 0xCBB4,
-	20358 - 11904: 0xA8D3,
-	20359 - 11904: 0xCBB7,
-	20360 - 11904: 0xA8D7,
-	20361 - 11904: 0xCBBA,
-	20362 - 11904: 0x926F,
-	20363 - 11904: 0xA8D2,
-	20365 - 11904: 0xA8CD,
-	20367 - 11904: 0xA8DC,
-	20368 - 11904: 0xCBC4,
-	20369 - 11904: 0xA8DD,
-	20370 - 11904: 0xCBC8,
-	20372 - 11904: 0xCBC6,
-	20373 - 11904: 0xCBCA,
-	20374 - 11904: 0xA8DA,
-	20375 - 11904: 0xCBBE,
-	20376 - 11904: 0xCBB2,
-	20378 - 11904: 0xCBC0,
-	20379 - 11904: 0xA8D1,
-	20380 - 11904: 0xCBC5,
-	20381 - 11904: 0xA8CC,
-	20382 - 11904: 0xCBC7,
-	20386 - 11904: 0x92A3,
-	20392 - 11904: 0x8950,
-	20395 - 11904: 0xFA57,
-	20398 - 11904: 0xAB56,
-	20399 - 11904: 0xAB4A,
-	20400 - 11904: 0x9866,
-	20402 - 11904: 0xCDE0,
-	20403 - 11904: 0xCDE8,
-	20404 - 11904: 0x8CF8,
-	20405 - 11904: 0xAB49,
-	20406 - 11904: 0xAB51,
-	20407 - 11904: 0xAB5D,
-	20409 - 11904: 0xCDEE,
-	20410 - 11904: 0xCDEC,
-	20411 - 11904: 0xCDE7,
-	20413 - 11904: 0x89D6,
-	20415 - 11904: 0xAB4B,
-	20416 - 11904: 0xCDED,
-	20417 - 11904: 0xCDE3,
-	20418 - 11904: 0xAB59,
-	20419 - 11904: 0xAB50,
-	20420 - 11904: 0xAB58,
-	20421 - 11904: 0xCDDE,
-	20423 - 11904: 0xCDEA,
-	20424 - 11904: 0x98B2,
-	20425 - 11904: 0xCDE1,
-	20426 - 11904: 0xAB54,
-	20427 - 11904: 0xCDE2,
-	20428 - 11904: 0x92AB,
-	20429 - 11904: 0xCDDD,
-	20430 - 11904: 0xAB5B,
-	20431 - 11904: 0xAB4E,
-	20432 - 11904: 0xAB57,
-	20433 - 11904: 0xAB4D,
-	20435 - 11904: 0xCDDF,
-	20436 - 11904: 0xCDE4,
-	20438 - 11904: 0xCDEB,
-	20439 - 11904: 0xAB55,
-	20440 - 11904: 0xAB52,
-	20441 - 11904: 0xCDE6,
-	20442 - 11904: 0xAB5A,
-	20443 - 11904: 0xCDE9,
-	20444 - 11904: 0xCDE5,
-	20445 - 11904: 0xAB4F,
-	20446 - 11904: 0xAB5C,
-	20447 - 11904: 0xAB53,
-	20448 - 11904: 0xAB4C,
-	20449 - 11904: 0xAB48,
-	20452 - 11904: 0x96DE,
-	20453 - 11904: 0x92AC,
-	20460 - 11904: 0xCDEF,
-	20462 - 11904: 0xADD7,
-	20463 - 11904: 0xADC1,
-	20464 - 11904: 0x8C70,
-	20465 - 11904: 0xADD1,
-	20466 - 11904: 0x9F6E,
-	20467 - 11904: 0xADD6,
-	20468 - 11904: 0xD0D0,
-	20469 - 11904: 0xD0CF,
-	20470 - 11904: 0xD0D4,
-	20471 - 11904: 0xD0D5,
-	20472 - 11904: 0xADC4,
-	20473 - 11904: 0x8EF2,
-	20474 - 11904: 0xADCD,
-	20477 - 11904: 0x9F6C,
-	20478 - 11904: 0xADDA,
-	20480 - 11904: 0xADCE,
-	20483 - 11904: 0x89D8,
-	20485 - 11904: 0xD0C9,
-	20486 - 11904: 0xADC7,
-	20487 - 11904: 0xD0CA,
-	20488 - 11904: 0xFA59,
-	20489 - 11904: 0xADDC,
-	20491 - 11904: 0xADD3,
-	20492 - 11904: 0xADBE,
-	20493 - 11904: 0xADBF,
-	20494 - 11904: 0xD0DD,
-	20495 - 11904: 0xB0BF,
-	20497 - 11904: 0xADCC,
-	20498 - 11904: 0xADCB,
-	20499 - 11904: 0xD0CB,
-	20500 - 11904: 0xADCF,
-	20501 - 11904: 0xD45B,
-	20502 - 11904: 0xADC6,
-	20503 - 11904: 0xD0D6,
-	20504 - 11904: 0xADD5,
-	20505 - 11904: 0xADD4,
-	20506 - 11904: 0xADCA,
-	20507 - 11904: 0xD0CE,
-	20508 - 11904: 0xD0D7,
-	20510 - 11904: 0xD0C8,
-	20511 - 11904: 0xADC9,
-	20512 - 11904: 0xD0D8,
-	20513 - 11904: 0xADD2,
-	20514 - 11904: 0xD0CC,
-	20515 - 11904: 0xADC0,
-	20517 - 11904: 0xADC3,
-	20518 - 11904: 0xADC2,
-	20519 - 11904: 0xD0D9,
-	20520 - 11904: 0xADD0,
-	20521 - 11904: 0xFA5F,
-	20522 - 11904: 0xADD9,
-	20523 - 11904: 0xADDB,
-	20524 - 11904: 0xD0D3,
-	20525 - 11904: 0xADD8,
-	20526 - 11904: 0x92A8,
-	20527 - 11904: 0xD0DB,
-	20528 - 11904: 0xD0CD,
-	20529 - 11904: 0xD0DC,
-	20531 - 11904: 0xD0D1,
-	20532 - 11904: 0x9163,
-	20533 - 11904: 0xD0DA,
-	20535 - 11904: 0xD0D2,
-	20539 - 11904: 0x8C40,
-	20540 - 11904: 0xADC8,
-	20544 - 11904: 0xD463,
-	20545 - 11904: 0xD457,
-	20547 - 11904: 0xB0B3,
-	20549 - 11904: 0xD45C,
-	20550 - 11904: 0xD462,
-	20551 - 11904: 0xB0B2,
-	20552 - 11904: 0xD455,
-	20553 - 11904: 0xB0B6,
-	20554 - 11904: 0xD459,
-	20555 - 11904: 0xD452,
-	20556 - 11904: 0xB0B4,
-	20557 - 11904: 0xD456,
-	20558 - 11904: 0xB0B9,
-	20559 - 11904: 0xB0BE,
-	20561 - 11904: 0xD467,
-	20563 - 11904: 0xD451,
-	20565 - 11904: 0xB0BA,
-	20566 - 11904: 0x9F73,
-	20567 - 11904: 0xD466,
-	20568 - 11904: 0x92AD,
-	20570 - 11904: 0xB0B5,
-	20571 - 11904: 0xD458,
-	20572 - 11904: 0xB0B1,
-	20573 - 11904: 0xD453,
-	20574 - 11904: 0xD44F,
-	20575 - 11904: 0xD45D,
-	20576 - 11904: 0xD450,
-	20577 - 11904: 0xD44E,
-	20578 - 11904: 0xD45A,
-	20579 - 11904: 0xD460,
-	20580 - 11904: 0xD461,
-	20581 - 11904: 0xB0B7,
-	20582 - 11904: 0x9BE9,
-	20584 - 11904: 0xD85B,
-	20585 - 11904: 0xD45E,
-	20586 - 11904: 0xD44D,
-	20587 - 11904: 0xD45F,
-	20588 - 11904: 0x92A9,
-	20589 - 11904: 0xB0C1,
-	20590 - 11904: 0xD464,
-	20591 - 11904: 0xB0C0,
-	20592 - 11904: 0xD44C,
-	20594 - 11904: 0xD454,
-	20595 - 11904: 0xD465,
-	20596 - 11904: 0xB0BC,
-	20597 - 11904: 0xB0BB,
-	20598 - 11904: 0xB0B8,
-	20599 - 11904: 0xB0BD,
-	20602 - 11904: 0xB0AF,
-	20605 - 11904: 0xFA66,
-	20608 - 11904: 0xB3C8,
-	20609 - 11904: 0x92AA,
-	20610 - 11904: 0xD85E,
-	20611 - 11904: 0xD857,
-	20613 - 11904: 0xB3C5,
-	20615 - 11904: 0xD85F,
-	20616 - 11904: 0x89D9,
-	20619 - 11904: 0xD855,
-	20620 - 11904: 0xD858,
-	20621 - 11904: 0xB3C4,
-	20622 - 11904: 0xD859,
-	20624 - 11904: 0xFD56,
-	20625 - 11904: 0xB3C7,
-	20626 - 11904: 0xD85D,
-	20628 - 11904: 0xD853,
-	20629 - 11904: 0xD852,
-	20630 - 11904: 0xB3C9,
-	20632 - 11904: 0xB3CA,
-	20633 - 11904: 0xB3C6,
-	20634 - 11904: 0xB3CB,
-	20635 - 11904: 0xD851,
-	20636 - 11904: 0xD85C,
-	20637 - 11904: 0xD85A,
-	20638 - 11904: 0xD854,
-	20642 - 11904: 0xB3C3,
-	20643 - 11904: 0xD856,
-	20646 - 11904: 0x9FA8,
-	20652 - 11904: 0xB6CA,
-	20653 - 11904: 0xB6C4,
-	20654 - 11904: 0xDCB7,
-	20655 - 11904: 0xB6CD,
-	20656 - 11904: 0xDCBD,
-	20657 - 11904: 0xDCC0,
-	20658 - 11904: 0xB6C6,
-	20659 - 11904: 0xB6C7,
-	20660 - 11904: 0xDCBA,
-	20661 - 11904: 0xB6C5,
-	20662 - 11904: 0xDCC3,
-	20663 - 11904: 0xB6CB,
-	20664 - 11904: 0xDCC4,
-	20666 - 11904: 0xDCBF,
-	20667 - 11904: 0xB6CC,
-	20668 - 11904: 0x8C71,
-	20669 - 11904: 0xDCB4,
-	20670 - 11904: 0xB6C9,
-	20671 - 11904: 0xDCB5,
-	20673 - 11904: 0xDCBE,
-	20674 - 11904: 0xDCBC,
-	20676 - 11904: 0xDCB8,
-	20677 - 11904: 0xB6C8,
-	20678 - 11904: 0xDCB6,
-	20679 - 11904: 0xB6CE,
-	20680 - 11904: 0xDCBB,
-	20681 - 11904: 0xDCC2,
-	20682 - 11904: 0xDCB9,
-	20683 - 11904: 0xDCC1,
-	20685 - 11904: 0x92A1,
-	20686 - 11904: 0xB9B6,
-	20687 - 11904: 0xB9B3,
-	20688 - 11904: 0x90E3,
-	20689 - 11904: 0xB9B4,
-	20691 - 11904: 0xE0F9,
-	20692 - 11904: 0xE0F1,
-	20693 - 11904: 0xB9B2,
-	20694 - 11904: 0xB9AF,
-	20695 - 11904: 0xE0F2,
-	20697 - 11904: 0xA0A6,
-	20698 - 11904: 0xB9B1,
-	20699 - 11904: 0xE0F5,
-	20701 - 11904: 0xE0F7,
-	20703 - 11904: 0x94AB,
-	20704 - 11904: 0xE0FE,
-	20705 - 11904: 0xFC72,
-	20707 - 11904: 0xE0FD,
-	20708 - 11904: 0xE0F8,
-	20709 - 11904: 0xB9AE,
-	20710 - 11904: 0xE0F0,
-	20711 - 11904: 0xB9AC,
-	20712 - 11904: 0xE0F3,
-	20713 - 11904: 0xB9B7,
-	20714 - 11904: 0xE0F6,
-	20716 - 11904: 0xE0FA,
-	20717 - 11904: 0xB9B0,
-	20718 - 11904: 0xB9AD,
-	20719 - 11904: 0xE0FC,
-	20720 - 11904: 0xE0FB,
-	20721 - 11904: 0xB9B5,
-	20723 - 11904: 0xE0F4,
-	20724 - 11904: 0x97C4,
-	20725 - 11904: 0xBBF8,
-	20726 - 11904: 0xE4EC,
-	20728 - 11904: 0xE4E9,
-	20729 - 11904: 0xBBF9,
-	20731 - 11904: 0xBBF7,
-	20732 - 11904: 0x92AE,
-	20733 - 11904: 0xE4F0,
-	20734 - 11904: 0xE4ED,
-	20735 - 11904: 0xE4E6,
-	20736 - 11904: 0xBBF6,
-	20737 - 11904: 0xFA67,
-	20738 - 11904: 0xBBFA,
-	20739 - 11904: 0xE4E7,
-	20740 - 11904: 0xBBF5,
-	20741 - 11904: 0xBBFD,
-	20742 - 11904: 0xE4EA,
-	20743 - 11904: 0xE4EB,
-	20744 - 11904: 0xBBFB,
-	20745 - 11904: 0xBBFC,
-	20746 - 11904: 0xE4F1,
-	20747 - 11904: 0xE4EE,
-	20748 - 11904: 0xE4EF,
-	20749 - 11904: 0x92A2,
-	20750 - 11904: 0xFA69,
-	20752 - 11904: 0xBEAA,
-	20753 - 11904: 0xE8F8,
-	20754 - 11904: 0xBEA7,
-	20755 - 11904: 0xE8F5,
-	20756 - 11904: 0xBEA9,
-	20757 - 11904: 0xBEAB,
-	20759 - 11904: 0xE8F6,
-	20760 - 11904: 0xBEA8,
-	20762 - 11904: 0xE8F7,
-	20764 - 11904: 0xE8F4,
-	20767 - 11904: 0xC076,
-	20768 - 11904: 0xECBD,
-	20769 - 11904: 0xC077,
-	20770 - 11904: 0xECBB,
-	20772 - 11904: 0xECBC,
-	20773 - 11904: 0xECBA,
-	20774 - 11904: 0xECB9,
-	20777 - 11904: 0xECBE,
-	20778 - 11904: 0xC075,
-	20779 - 11904: 0x9268,
-	20781 - 11904: 0xEFB8,
-	20782 - 11904: 0xEFB9,
-	20784 - 11904: 0xE4E8,
-	20785 - 11904: 0xEFB7,
-	20786 - 11904: 0xC078,
-	20787 - 11904: 0xC35F,
-	20788 - 11904: 0xF1EB,
-	20789 - 11904: 0xF1EC,
-	20791 - 11904: 0xC4D7,
-	20792 - 11904: 0xC4D8,
-	20793 - 11904: 0xF5C1,
-	20794 - 11904: 0xF5C0,
-	20795 - 11904: 0xC56C,
-	20796 - 11904: 0xC56B,
-	20797 - 11904: 0xF7D0,
-	20799 - 11904: 0xA449,
-	20800 - 11904: 0xA461,
-	20801 - 11904: 0xA4B9,
-	20803 - 11904: 0xA4B8,
-	20804 - 11904: 0xA553,
-	20805 - 11904: 0xA552,
-	20806 - 11904: 0xA5FC,
-	20807 - 11904: 0xA5FB,
-	20808 - 11904: 0xA5FD,
-	20809 - 11904: 0xA5FA,
-	20811 - 11904: 0xA74A,
-	20812 - 11904: 0xA749,
-	20813 - 11904: 0xA74B,
-	20818 - 11904: 0xA8E0,
-	20820 - 11904: 0xA8DF,
-	20821 - 11904: 0xA8E1,
-	20822 - 11904: 0x8951,
-	20823 - 11904: 0xAB5E,
-	20825 - 11904: 0xA259,
-	20826 - 11904: 0xD0DE,
-	20827 - 11904: 0xA25A,
-	20828 - 11904: 0xB0C2,
-	20829 - 11904: 0xA25C,
-	20830 - 11904: 0xA25B,
-	20831 - 11904: 0xD860,
-	20832 - 11904: 0xFA6F,
-	20833 - 11904: 0xA25D,
-	20834 - 11904: 0xB9B8,
-	20835 - 11904: 0xA25E,
-	20837 - 11904: 0xA44A,
-	20839 - 11904: 0xA4BA,
-	20840 - 11904: 0xA5FE,
-	20841 - 11904: 0xA8E2,
-	20842 - 11904: 0xFA71,
-	20843 - 11904: 0xA44B,
-	20844 - 11904: 0xA4BD,
-	20845 - 11904: 0xA4BB,
-	20846 - 11904: 0xA4BC,
-	20849 - 11904: 0xA640,
-	20852 - 11904: 0x8952,
-	20853 - 11904: 0xA74C,
-	20854 - 11904: 0xA8E4,
-	20855 - 11904: 0xA8E3,
-	20856 - 11904: 0xA8E5,
-	20857 - 11904: 0x945A,
-	20860 - 11904: 0xADDD,
-	20864 - 11904: 0xBEAC,
-	20866 - 11904: 0xC6C3,
-	20870 - 11904: 0x89DD,
-	20871 - 11904: 0xC94E,
-	20872 - 11904: 0xC8A2,
-	20873 - 11904: 0xA554,
-	20874 - 11904: 0xA555,
-	20877 - 11904: 0xA641,
-	20879 - 11904: 0xCA6A,
-	20881 - 11904: 0xAB60,
-	20882 - 11904: 0xAB5F,
-	20883 - 11904: 0xD0E0,
-	20884 - 11904: 0xD0DF,
-	20885 - 11904: 0xB0C3,
-	20886 - 11904: 0xC6C4,
-	20887 - 11904: 0xA4BE,
-	20888 - 11904: 0xC955,
-	20890 - 11904: 0x9E52,
-	20892 - 11904: 0x8953,
-	20894 - 11904: 0xCBCD,
-	20896 - 11904: 0xAB61,
-	20898 - 11904: 0xADE0,
-	20900 - 11904: 0xADDE,
-	20901 - 11904: 0xADDF,
-	20903 - 11904: 0x9E55,
-	20904 - 11904: 0x92BA,
-	20906 - 11904: 0xBEAD,
-	20907 - 11904: 0xC6C5,
-	20908 - 11904: 0xA556,
-	20910 - 11904: 0x8C5B,
-	20912 - 11904: 0xA642,
-	20913 - 11904: 0xC9BC,
-	20914 - 11904: 0xFA7D,
-	20915 - 11904: 0xFAA8,
-	20916 - 11904: 0x9A68,
-	20917 - 11904: 0xFA47,
-	20918 - 11904: 0xA74D,
-	20919 - 11904: 0xA74E,
-	20920 - 11904: 0xFA7E,
-	20921 - 11904: 0xCA6B,
-	20924 - 11904: 0xCBCE,
-	20925 - 11904: 0xA8E6,
-	20926 - 11904: 0xCBCF,
-	20931 - 11904: 0x92BB,
-	20932 - 11904: 0xD0E2,
-	20933 - 11904: 0xD0E3,
-	20934 - 11904: 0xADE3,
-	20935 - 11904: 0xFDB6,
-	20936 - 11904: 0xD0E4,
-	20937 - 11904: 0xFAA2,
-	20938 - 11904: 0xD0E1,
-	20939 - 11904: 0xADE4,
-	20940 - 11904: 0xADE2,
-	20941 - 11904: 0xADE1,
-	20942 - 11904: 0xD0E5,
-	20943 - 11904: 0xFAA3,
-	20944 - 11904: 0xD468,
-	20945 - 11904: 0xFAA4,
-	20946 - 11904: 0x9BB4,
-	20947 - 11904: 0xFAA6,
-	20948 - 11904: 0xD861,
-	20951 - 11904: 0xDCC5,
-	20952 - 11904: 0xE140,
-	20955 - 11904: 0x89DF,
-	20956 - 11904: 0xBBFE,
-	20957 - 11904: 0xBEAE,
-	20958 - 11904: 0xE8F9,
-	20959 - 11904: 0xFDDB,
-	20960 - 11904: 0xA44C,
-	20961 - 11904: 0xA45A,
-	20962 - 11904: 0xFAA9,
-	20964 - 11904: 0x8954,
-	20973 - 11904: 0xFAAB,
-	20976 - 11904: 0xB0C4,
-	20977 - 11904: 0xB3CD,
-	20979 - 11904: 0xB9B9,
-	20980 - 11904: 0xFC7A,
-	20981 - 11904: 0xC942,
-	20982 - 11904: 0xA4BF,
-	20984 - 11904: 0xA559,
-	20985 - 11904: 0xA557,
-	20986 - 11904: 0xA558,
-	20988 - 11904: 0x89E0,
-	20989 - 11904: 0xA8E7,
-	20990 - 11904: 0x9F4F,
-	20992 - 11904: 0xA44D,
-	20993 - 11904: 0xA44E,
-	20994 - 11904: 0xC87D,
-	20995 - 11904: 0xA462,
-	20997 - 11904: 0x89E1,
-	20998 - 11904: 0xA4C0,
-	20999 - 11904: 0xA4C1,
-	21000 - 11904: 0xA4C2,
-	21001 - 11904: 0xC9BE,
-	21002 - 11904: 0xA55A,
-	21003 - 11904: 0xFAB0,
-	21004 - 11904: 0xC96B,
-	21006 - 11904: 0xA646,
-	21008 - 11904: 0xC9BF,
-	21009 - 11904: 0xA644,
-	21010 - 11904: 0xA645,
-	21011 - 11904: 0xC9BD,
-	21014 - 11904: 0xA647,
-	21015 - 11904: 0xA643,
-	21020 - 11904: 0xCA6C,
-	21021 - 11904: 0xAAEC,
-	21022 - 11904: 0xCA6D,
-	21023 - 11904: 0x9FCD,
-	21024 - 11904: 0xA0E7,
-	21025 - 11904: 0xCA6E,
-	21028 - 11904: 0xA750,
-	21029 - 11904: 0xA74F,
-	21030 - 11904: 0xFAB1,
-	21031 - 11904: 0x89A6,
-	21032 - 11904: 0xA753,
-	21033 - 11904: 0xA751,
-	21034 - 11904: 0xA752,
-	21038 - 11904: 0xA8ED,
-	21040 - 11904: 0xA8EC,
-	21041 - 11904: 0xCBD4,
-	21042 - 11904: 0xCBD1,
-	21043 - 11904: 0xCBD2,
-	21044 - 11904: 0x9EFA,
-	21045 - 11904: 0xCBD0,
-	21046 - 11904: 0xA8EE,
-	21047 - 11904: 0xA8EA,
-	21048 - 11904: 0xA8E9,
-	21050 - 11904: 0xA8EB,
-	21051 - 11904: 0xA8E8,
-	21052 - 11904: 0xFAB2,
-	21057 - 11904: 0xA8EF,
-	21059 - 11904: 0xAB63,
-	21060 - 11904: 0xCDF0,
-	21062 - 11904: 0xCBD3,
-	21063 - 11904: 0xAB68,
-	21065 - 11904: 0xCDF1,
-	21066 - 11904: 0xAB64,
-	21067 - 11904: 0xAB67,
-	21068 - 11904: 0xAB66,
-	21069 - 11904: 0xAB65,
-	21070 - 11904: 0xAB62,
-	21071 - 11904: 0x87BC,
-	21074 - 11904: 0xD0E8,
-	21076 - 11904: 0xADE7,
-	21077 - 11904: 0xD0EB,
-	21078 - 11904: 0xADE5,
-	21079 - 11904: 0xFAB4,
-	21081 - 11904: 0x92C4,
-	21082 - 11904: 0xD0E7,
-	21083 - 11904: 0xADE8,
-	21084 - 11904: 0xADE6,
-	21085 - 11904: 0xADE9,
-	21086 - 11904: 0xD0E9,
-	21087 - 11904: 0xD0EA,
-	21088 - 11904: 0x9F6F,
-	21089 - 11904: 0xD0E6,
-	21090 - 11904: 0xD0EC,
-	21096 - 11904: 0x8BB0,
-	21097 - 11904: 0xB3D1,
-	21098 - 11904: 0xB0C5,
-	21099 - 11904: 0xD469,
-	21100 - 11904: 0xD46B,
-	21101 - 11904: 0xD46A,
-	21102 - 11904: 0xD46C,
-	21103 - 11904: 0xB0C6,
-	21106 - 11904: 0xB3CE,
-	21107 - 11904: 0x9FAC,
-	21108 - 11904: 0xB3CF,
-	21109 - 11904: 0xB3D0,
-	21111 - 11904: 0xB6D0,
-	21112 - 11904: 0xDCC7,
-	21113 - 11904: 0x89E3,
-	21114 - 11904: 0xDCC6,
-	21115 - 11904: 0xDCC8,
-	21116 - 11904: 0xDCC9,
-	21117 - 11904: 0xB6D1,
-	21119 - 11904: 0xB6CF,
-	21120 - 11904: 0xE141,
-	21121 - 11904: 0xE142,
-	21122 - 11904: 0xB9BB,
-	21123 - 11904: 0xB9BA,
-	21124 - 11904: 0xE35A,
-	21127 - 11904: 0xBC40,
-	21128 - 11904: 0xBC41,
-	21129 - 11904: 0xBC42,
-	21130 - 11904: 0xBC44,
-	21131 - 11904: 0xE4F2,
-	21132 - 11904: 0xE4F3,
-	21133 - 11904: 0xBC43,
-	21135 - 11904: 0x9BD3,
-	21136 - 11904: 0x89E4,
-	21137 - 11904: 0xBEAF,
-	21139 - 11904: 0xBEB0,
-	21140 - 11904: 0xFAB5,
-	21142 - 11904: 0xF1ED,
-	21143 - 11904: 0xF5C3,
-	21144 - 11904: 0xF5C2,
-	21145 - 11904: 0xF7D1,
-	21146 - 11904: 0x9FD5,
-	21147 - 11904: 0xA44F,
-	21151 - 11904: 0xA55C,
-	21152 - 11904: 0xA55B,
-	21153 - 11904: 0x8955,
-	21155 - 11904: 0xA648,
-	21156 - 11904: 0x92C5,
-	21158 - 11904: 0xC9C0,
-	21160 - 11904: 0x8956,
-	21161 - 11904: 0xA755,
-	21162 - 11904: 0xA756,
-	21163 - 11904: 0xA754,
-	21164 - 11904: 0xA757,
-	21165 - 11904: 0xCA6F,
-	21166 - 11904: 0xCA70,
-	21173 - 11904: 0xFAB3,
-	21177 - 11904: 0xFAB6,
-	21179 - 11904: 0xA8F1,
-	21180 - 11904: 0xCBD5,
-	21182 - 11904: 0xA8F0,
-	21184 - 11904: 0xCDF2,
-	21185 - 11904: 0xAB6C,
-	21186 - 11904: 0xCDF3,
-	21187 - 11904: 0xAB6B,
-	21189 - 11904: 0xFAB7,
-	21191 - 11904: 0xAB69,
-	21193 - 11904: 0xAB6A,
-	21196 - 11904: 0x9EDC,
-	21197 - 11904: 0xD0ED,
-	21200 - 11904: 0xFBC4,
-	21201 - 11904: 0x9F71,
-	21202 - 11904: 0xB0C7,
-	21203 - 11904: 0xD46E,
-	21205 - 11904: 0xB0CA,
-	21206 - 11904: 0xD46D,
-	21207 - 11904: 0xB1E5,
-	21208 - 11904: 0xB0C9,
-	21209 - 11904: 0xB0C8,
-	21211 - 11904: 0xB3D4,
-	21213 - 11904: 0xB3D3,
-	21214 - 11904: 0xB3D2,
-	21215 - 11904: 0xB6D2,
-	21216 - 11904: 0xFABA,
-	21217 - 11904: 0x92C7,
-	21218 - 11904: 0xB6D5,
-	21219 - 11904: 0xB6D6,
-	21220 - 11904: 0xB6D4,
-	21222 - 11904: 0xB6D3,
-	21225 - 11904: 0xE143,
-	21227 - 11904: 0xE144,
-	21231 - 11904: 0xE4F5,
-	21232 - 11904: 0xBC45,
-	21233 - 11904: 0xE4F4,
-	21235 - 11904: 0xBEB1,
-	21236 - 11904: 0xECBF,
-	21237 - 11904: 0xC079,
-	21239 - 11904: 0xF1EE,
-	21240 - 11904: 0xC455,
-	21241 - 11904: 0xC6C6,
-	21242 - 11904: 0xA463,
-	21243 - 11904: 0xA4C3,
-	21244 - 11904: 0xC956,
-	21246 - 11904: 0xA4C4,
-	21247 - 11904: 0xA4C5,
-	21249 - 11904: 0x9A4C,
-	21253 - 11904: 0xFABD,
-	21254 - 11904: 0xA55E,
-	21256 - 11904: 0xA649,
-	21257 - 11904: 0xCA71,
-	21258 - 11904: 0xCBD6,
-	21259 - 11904: 0xCBD7,
-	21261 - 11904: 0xAB6D,
-	21262 - 11904: 0xD0EE,
-	21263 - 11904: 0xB0CC,
-	21264 - 11904: 0xB0CB,
-	21265 - 11904: 0xD863,
-	21266 - 11904: 0xD862,
-	21269 - 11904: 0xA450,
-	21270 - 11904: 0xA4C6,
-	21271 - 11904: 0xA55F,
-	21273 - 11904: 0xB0CD,
-	21274 - 11904: 0xC943,
-	21276 - 11904: 0xC96C,
-	21277 - 11904: 0xA560,
-	21279 - 11904: 0xC9C2,
-	21280 - 11904: 0xA64B,
-	21281 - 11904: 0xA64A,
-	21282 - 11904: 0xC9C1,
-	21283 - 11904: 0xA758,
-	21284 - 11904: 0x8C68,
-	21287 - 11904: 0x89E5,
-	21290 - 11904: 0xADEA,
-	21292 - 11904: 0x9F7D,
-	21293 - 11904: 0xD46F,
-	21295 - 11904: 0xB6D7,
-	21296 - 11904: 0xE145,
-	21297 - 11904: 0xB9BC,
-	21298 - 11904: 0xA0A9,
-	21299 - 11904: 0xFAC4,
-	21300 - 11904: 0xE8FA,
-	21303 - 11904: 0xF3FD,
-	21304 - 11904: 0xC6C7,
-	21305 - 11904: 0xA4C7,
-	21307 - 11904: 0x8957,
-	21308 - 11904: 0xCBD8,
-	21309 - 11904: 0xCDF4,
-	21310 - 11904: 0xB0D0,
-	21311 - 11904: 0xB0CE,
-	21312 - 11904: 0xB0CF,
-	21313 - 11904: 0xA451,
-	21314 - 11904: 0xFAAA,
-	21315 - 11904: 0xA464,
-	21316 - 11904: 0xFAC5,
-	21317 - 11904: 0xA4CA,
-	21319 - 11904: 0xA4C9,
-	21320 - 11904: 0xA4C8,
-	21321 - 11904: 0xA563,
-	21322 - 11904: 0xA562,
-	21324 - 11904: 0xC96D,
-	21325 - 11904: 0xC9C3,
-	21326 - 11904: 0x8958,
-	21329 - 11904: 0xA8F5,
-	21330 - 11904: 0xA8F2,
-	21331 - 11904: 0xA8F4,
-	21332 - 11904: 0xA8F3,
-	21335 - 11904: 0xAB6E,
-	21338 - 11904: 0xB3D5,
-	21340 - 11904: 0xA452,
-	21341 - 11904: 0x8BE3,
-	21342 - 11904: 0xA4CB,
-	21343 - 11904: 0x8B61,
-	21344 - 11904: 0xA565,
-	21345 - 11904: 0xA564,
-	21347 - 11904: 0xCA72,
-	21348 - 11904: 0x9AF1,
-	21350 - 11904: 0xA8F6,
-	21351 - 11904: 0x9EB7,
-	21353 - 11904: 0xC6C8,
-	21356 - 11904: 0xC957,
-	21357 - 11904: 0xFAD1,
-	21358 - 11904: 0xA567,
-	21359 - 11904: 0xA566,
-	21360 - 11904: 0xA64C,
-	21361 - 11904: 0xA64D,
-	21362 - 11904: 0xCA73,
-	21363 - 11904: 0xA759,
-	21364 - 11904: 0xFAD2,
-	21365 - 11904: 0xA75A,
-	21367 - 11904: 0xA8F7,
-	21368 - 11904: 0xA8F8,
-	21369 - 11904: 0xA8F9,
-	21371 - 11904: 0xAB6F,
-	21372 - 11904: 0xCDF5,
-	21373 - 11904: 0x9EBA,
-	21374 - 11904: 0xFAD4,
-	21375 - 11904: 0xFAD5,
-	21378 - 11904: 0xC944,
-	21380 - 11904: 0xA4CC,
-	21386 - 11904: 0xC9C4,
-	21390 - 11904: 0xCA74,
-	21391 - 11904: 0xCA75,
-	21394 - 11904: 0xCBD9,
-	21395 - 11904: 0xFAD9,
-	21396 - 11904: 0xCBDA,
-	21398 - 11904: 0xCDF7,
-	21399 - 11904: 0xCDF6,
-	21400 - 11904: 0xCDF9,
-	21401 - 11904: 0xCDF8,
-	21402 - 11904: 0xAB70,
-	21404 - 11904: 0xD470,
-	21405 - 11904: 0xADED,
-	21406 - 11904: 0xD0EF,
-	21407 - 11904: 0xADEC,
-	21408 - 11904: 0xFADB,
-	21410 - 11904: 0x9CE0,
-	21412 - 11904: 0xD864,
-	21413 - 11904: 0xB3D6,
-	21414 - 11904: 0xFBF7,
-	21415 - 11904: 0xD865,
-	21416 - 11904: 0xFBFA,
-	21417 - 11904: 0x89E7,
-	21418 - 11904: 0xA07A,
-	21419 - 11904: 0xFADC,
-	21420 - 11904: 0xE146,
-	21421 - 11904: 0xB9BD,
-	21422 - 11904: 0xFADD,
-	21424 - 11904: 0x89E9,
-	21426 - 11904: 0xBC46,
-	21428 - 11904: 0xF1EF,
-	21430 - 11904: 0xC6C9,
-	21433 - 11904: 0xC958,
-	21435 - 11904: 0xA568,
-	21441 - 11904: 0xFAE2,
-	21442 - 11904: 0x89EB,
-	21443 - 11904: 0xB0D1,
-	21445 - 11904: 0xFAE3,
-	21448 - 11904: 0xA453,
-	21449 - 11904: 0xA465,
-	21450 - 11904: 0xA4CE,
-	21451 - 11904: 0xA4CD,
-	21452 - 11904: 0x90C8,
-	21453 - 11904: 0xA4CF,
-	21456 - 11904: 0x92DA,
-	21457 - 11904: 0x8959,
-	21458 - 11904: 0x9CF5,
-	21460 - 11904: 0xA8FB,
-	21462 - 11904: 0xA8FA,
-	21463 - 11904: 0xA8FC,
-	21464 - 11904: 0x895A,
-	21465 - 11904: 0xFAE7,
-	21466 - 11904: 0x9FA2,
-	21467 - 11904: 0xAB71,
-	21471 - 11904: 0xADEE,
-	21472 - 11904: 0xFAEA,
-	21473 - 11904: 0xE8FB,
-	21474 - 11904: 0xC24F,
-	21475 - 11904: 0xA466,
-	21476 - 11904: 0xA56A,
-	21477 - 11904: 0xA579,
-	21478 - 11904: 0xA574,
-	21480 - 11904: 0xA56F,
-	21481 - 11904: 0xA56E,
-	21482 - 11904: 0xA575,
-	21483 - 11904: 0xA573,
-	21484 - 11904: 0xA56C,
-	21485 - 11904: 0xA57A,
-	21486 - 11904: 0xA56D,
-	21487 - 11904: 0xA569,
-	21488 - 11904: 0xA578,
-	21489 - 11904: 0xA577,
-	21490 - 11904: 0xA576,
-	21491 - 11904: 0xA56B,
-	21493 - 11904: 0xA572,
-	21494 - 11904: 0xFAED,
-	21495 - 11904: 0x8FAD,
-	21496 - 11904: 0xA571,
-	21499 - 11904: 0xA57B,
-	21500 - 11904: 0xA570,
-	21502 - 11904: 0xFB59,
-	21505 - 11904: 0xA653,
-	21507 - 11904: 0xA659,
-	21508 - 11904: 0xA655,
-	21510 - 11904: 0xA65B,
-	21511 - 11904: 0xC9C5,
-	21512 - 11904: 0xA658,
-	21513 - 11904: 0xA64E,
-	21514 - 11904: 0xA651,
-	21515 - 11904: 0xA654,
-	21516 - 11904: 0xA650,
-	21517 - 11904: 0xA657,
-	21518 - 11904: 0xA65A,
-	21519 - 11904: 0xA64F,
-	21520 - 11904: 0xA652,
-	21521 - 11904: 0xA656,
-	21522 - 11904: 0xA65C,
-	21523 - 11904: 0xFAEF,
-	21524 - 11904: 0x96EF,
-	21526 - 11904: 0x9DEC,
-	21528 - 11904: 0xCA7E,
-	21529 - 11904: 0xCA7B,
-	21530 - 11904: 0x9DCA,
-	21531 - 11904: 0xA767,
-	21532 - 11904: 0xCA7C,
-	21533 - 11904: 0xA75B,
-	21534 - 11904: 0xA75D,
-	21535 - 11904: 0xA775,
-	21536 - 11904: 0xA770,
-	21537 - 11904: 0xFD6D,
-	21539 - 11904: 0x89EC,
-	21540 - 11904: 0xCAA5,
-	21541 - 11904: 0xCA7D,
-	21542 - 11904: 0xA75F,
-	21543 - 11904: 0xA761,
-	21544 - 11904: 0xCAA4,
-	21545 - 11904: 0xA768,
-	21546 - 11904: 0xCA78,
-	21547 - 11904: 0xA774,
-	21548 - 11904: 0xA776,
-	21549 - 11904: 0xA75C,
-	21550 - 11904: 0xA76D,
-	21551 - 11904: 0xFB44,
-	21552 - 11904: 0xCA76,
-	21553 - 11904: 0xA773,
-	21554 - 11904: 0x9DE2,
-	21555 - 11904: 0xA764,
-	21556 - 11904: 0x8C75,
-	21557 - 11904: 0xA76E,
-	21558 - 11904: 0xA76F,
-	21559 - 11904: 0xCA77,
-	21560 - 11904: 0xA76C,
-	21561 - 11904: 0xA76A,
-	21563 - 11904: 0xA76B,
-	21564 - 11904: 0xA771,
-	21565 - 11904: 0xCAA1,
-	21566 - 11904: 0xA75E,
-	21568 - 11904: 0xA772,
-	21569 - 11904: 0xCAA3,
-	21570 - 11904: 0xA766,
-	21571 - 11904: 0xA763,
-	21573 - 11904: 0xCA7A,
-	21574 - 11904: 0xA762,
-	21575 - 11904: 0xCAA6,
-	21576 - 11904: 0xA765,
-	21578 - 11904: 0xA769,
-	21579 - 11904: 0x9EC0,
-	21580 - 11904: 0x87C5,
-	21581 - 11904: 0x9E56,
-	21582 - 11904: 0xA760,
-	21583 - 11904: 0xCAA2,
-	21588 - 11904: 0xCA79,
-	21600 - 11904: 0xCBEB,
-	21601 - 11904: 0xCBEA,
-	21602 - 11904: 0xA94F,
-	21603 - 11904: 0xCBED,
-	21604 - 11904: 0xCBEF,
-	21605 - 11904: 0xCBE4,
-	21606 - 11904: 0xCBE7,
-	21607 - 11904: 0xCBEE,
-	21608 - 11904: 0xA950,
-	21609 - 11904: 0x9F79,
-	21610 - 11904: 0x9AC7,
-	21611 - 11904: 0xCBE1,
-	21612 - 11904: 0xCBE5,
-	21613 - 11904: 0xFAF4,
-	21615 - 11904: 0xCBE9,
-	21616 - 11904: 0xCE49,
-	21617 - 11904: 0xA94B,
-	21618 - 11904: 0xCE4D,
-	21619 - 11904: 0xA8FD,
-	21620 - 11904: 0xCBE6,
-	21621 - 11904: 0xA8FE,
-	21622 - 11904: 0xA94C,
-	21623 - 11904: 0xA945,
-	21624 - 11904: 0xA941,
-	21626 - 11904: 0xCBE2,
-	21627 - 11904: 0xA944,
-	21628 - 11904: 0xA949,
-	21629 - 11904: 0xA952,
-	21630 - 11904: 0xCBE3,
-	21631 - 11904: 0xCBDC,
-	21632 - 11904: 0xA943,
-	21633 - 11904: 0xCBDD,
-	21634 - 11904: 0xCBDF,
-	21636 - 11904: 0xA946,
-	21637 - 11904: 0x98A1,
-	21638 - 11904: 0xA948,
-	21639 - 11904: 0xCBDB,
-	21640 - 11904: 0xCBE0,
-	21643 - 11904: 0xA951,
-	21644 - 11904: 0xA94D,
-	21645 - 11904: 0xCBE8,
-	21646 - 11904: 0xA953,
-	21647 - 11904: 0xFAF8,
-	21648 - 11904: 0xA94A,
-	21649 - 11904: 0xCBDE,
-	21650 - 11904: 0xA947,
-	21651 - 11904: 0x89F0,
-	21652 - 11904: 0x9E47,
-	21653 - 11904: 0xA942,
-	21654 - 11904: 0xA940,
-	21655 - 11904: 0x9DF7,
-	21656 - 11904: 0xCBEC,
-	21658 - 11904: 0xA94E,
-	21660 - 11904: 0x9FD3,
-	21662 - 11904: 0x9ACA,
-	21664 - 11904: 0xCE48,
-	21665 - 11904: 0xCDFB,
-	21666 - 11904: 0xCE4B,
-	21667 - 11904: 0x89F1,
-	21668 - 11904: 0xFAF9,
-	21669 - 11904: 0xCDFD,
-	21670 - 11904: 0xAB78,
-	21671 - 11904: 0xABA8,
-	21672 - 11904: 0xAB74,
-	21673 - 11904: 0xABA7,
-	21674 - 11904: 0xAB7D,
-	21675 - 11904: 0xABA4,
-	21676 - 11904: 0xAB72,
-	21677 - 11904: 0xCDFC,
-	21678 - 11904: 0xCE43,
-	21679 - 11904: 0xABA3,
-	21680 - 11904: 0xCE4F,
-	21681 - 11904: 0xABA5,
-	21682 - 11904: 0x8E5A,
-	21683 - 11904: 0xAB79,
-	21684 - 11904: 0x89F2,
-	21686 - 11904: 0xCE45,
-	21687 - 11904: 0xCE42,
-	21688 - 11904: 0xAB77,
-	21689 - 11904: 0x89F3,
-	21690 - 11904: 0xCDFA,
-	21691 - 11904: 0xABA6,
-	21692 - 11904: 0xCE4A,
-	21693 - 11904: 0xAB7C,
-	21694 - 11904: 0xCE4C,
-	21695 - 11904: 0xABA9,
-	21696 - 11904: 0xAB73,
-	21697 - 11904: 0xAB7E,
-	21698 - 11904: 0xAB7B,
-	21699 - 11904: 0xCE40,
-	21700 - 11904: 0xABA1,
-	21701 - 11904: 0xCE46,
-	21702 - 11904: 0xCE47,
-	21703 - 11904: 0xAB7A,
-	21704 - 11904: 0xABA2,
-	21705 - 11904: 0xAB76,
-	21707 - 11904: 0x925D,
-	21708 - 11904: 0x8B51,
-	21709 - 11904: 0x92E0,
-	21710 - 11904: 0xAB75,
-	21711 - 11904: 0xCDFE,
-	21712 - 11904: 0x89F4,
-	21718 - 11904: 0xCE44,
-	21722 - 11904: 0x9FD4,
-	21726 - 11904: 0xCE4E,
-	21728 - 11904: 0xD144,
-	21729 - 11904: 0xADFB,
-	21730 - 11904: 0xD0F1,
-	21731 - 11904: 0x8A79,
-	21732 - 11904: 0xD0F6,
-	21733 - 11904: 0xADF4,
-	21734 - 11904: 0xAE40,
-	21735 - 11904: 0xD0F4,
-	21736 - 11904: 0xADEF,
-	21737 - 11904: 0xADF9,
-	21738 - 11904: 0xADFE,
-	21739 - 11904: 0xD0FB,
-	21741 - 11904: 0xADFA,
-	21742 - 11904: 0xADFD,
-	21743 - 11904: 0x89F5,
-	21745 - 11904: 0xD0FE,
-	21746 - 11904: 0xADF5,
-	21747 - 11904: 0xD0F5,
-	21751 - 11904: 0xD142,
-	21752 - 11904: 0xD143,
-	21754 - 11904: 0xADF7,
-	21755 - 11904: 0xD141,
-	21756 - 11904: 0xADF3,
-	21757 - 11904: 0xAE43,
-	21759 - 11904: 0xD0F8,
-	21761 - 11904: 0xADF1,
-	21762 - 11904: 0x97A7,
-	21763 - 11904: 0xD146,
-	21764 - 11904: 0xD0F9,
-	21765 - 11904: 0xD0FD,
-	21766 - 11904: 0xADF6,
-	21767 - 11904: 0xAE42,
-	21768 - 11904: 0xD0FA,
-	21769 - 11904: 0xADFC,
-	21770 - 11904: 0xD140,
-	21771 - 11904: 0xD147,
-	21772 - 11904: 0xD4A1,
-	21773 - 11904: 0x93BA,
-	21774 - 11904: 0xD145,
-	21775 - 11904: 0xAE44,
-	21776 - 11904: 0xADF0,
-	21777 - 11904: 0xD0FC,
-	21778 - 11904: 0xD0F3,
-	21779 - 11904: 0x9E58,
-	21780 - 11904: 0xADF8,
-	21783 - 11904: 0xD0F2,
-	21784 - 11904: 0x89F6,
-	21786 - 11904: 0xD0F7,
-	21790 - 11904: 0x9E57,
-	21795 - 11904: 0x89F7,
-	21797 - 11904: 0x8A41,
-	21798 - 11904: 0xD0F0,
-	21799 - 11904: 0xAE41,
-	21800 - 11904: 0x89F8,
-	21802 - 11904: 0xD477,
-	21803 - 11904: 0xFAF1,
-	21804 - 11904: 0xB0E4,
-	21805 - 11904: 0xD4A7,
-	21806 - 11904: 0xB0E2,
-	21807 - 11904: 0xB0DF,
-	21808 - 11904: 0xD47C,
-	21809 - 11904: 0xB0DB,
-	21810 - 11904: 0xD4A2,
-	21811 - 11904: 0xB0E6,
-	21812 - 11904: 0xD476,
-	21813 - 11904: 0xD47B,
-	21814 - 11904: 0xD47A,
-	21815 - 11904: 0xADF2,
-	21816 - 11904: 0xB0E1,
-	21817 - 11904: 0xD4A5,
-	21819 - 11904: 0xD4A8,
-	21820 - 11904: 0xD473,
-	21822 - 11904: 0xB3E8,
-	21823 - 11904: 0x89FA,
-	21824 - 11904: 0xD4A9,
-	21825 - 11904: 0xB0E7,
-	21827 - 11904: 0xB0D9,
-	21828 - 11904: 0xB0D6,
-	21829 - 11904: 0xD47E,
-	21830 - 11904: 0xB0D3,
-	21831 - 11904: 0xFB42,
-	21832 - 11904: 0xD4A6,
-	21833 - 11904: 0xFABF,
-	21834 - 11904: 0xB0DA,
-	21835 - 11904: 0xD4AA,
-	21837 - 11904: 0xD474,
-	21838 - 11904: 0xD4A4,
-	21839 - 11904: 0xB0DD,
-	21840 - 11904: 0xD475,
-	21841 - 11904: 0xD478,
-	21842 - 11904: 0xD47D,
-	21843 - 11904: 0xFBA3,
-	21845 - 11904: 0xB0DE,
-	21846 - 11904: 0xB0DC,
-	21847 - 11904: 0xB0E8,
-	21852 - 11904: 0xB0E3,
-	21853 - 11904: 0xFAF7,
-	21854 - 11904: 0xB0D7,
-	21855 - 11904: 0xB1D2,
-	21857 - 11904: 0xB0D8,
-	21858 - 11904: 0xD479,
-	21859 - 11904: 0xB0E5,
-	21860 - 11904: 0xB0E0,
-	21861 - 11904: 0xD4A3,
-	21862 - 11904: 0xB0D5,
-	21865 - 11904: 0x9E4E,
-	21866 - 11904: 0xB0D4,
-	21867 - 11904: 0x94DC,
-	21873 - 11904: 0x95DA,
-	21874 - 11904: 0x9DF8,
-	21875 - 11904: 0x9F6A,
-	21877 - 11904: 0xD471,
-	21878 - 11904: 0xD472,
-	21879 - 11904: 0xD86A,
-	21881 - 11904: 0x8AB7,
-	21883 - 11904: 0xB3D7,
-	21884 - 11904: 0xB3DA,
-	21885 - 11904: 0xD875,
-	21886 - 11904: 0xB3EE,
-	21887 - 11904: 0xD878,
-	21888 - 11904: 0xB3D8,
-	21889 - 11904: 0xD871,
-	21890 - 11904: 0xB3DE,
-	21891 - 11904: 0xB3E4,
-	21892 - 11904: 0xB5BD,
-	21894 - 11904: 0xFB46,
-	21895 - 11904: 0xB3E2,
-	21896 - 11904: 0xD86E,
-	21897 - 11904: 0xB3EF,
-	21898 - 11904: 0xB3DB,
-	21899 - 11904: 0xB3E3,
-	21900 - 11904: 0xD876,
-	21901 - 11904: 0xDCD7,
-	21902 - 11904: 0xD87B,
-	21903 - 11904: 0xD86F,
-	21904 - 11904: 0x8A46,
-	21905 - 11904: 0xD866,
-	21906 - 11904: 0xD873,
-	21907 - 11904: 0xD86D,
-	21908 - 11904: 0xB3E1,
-	21909 - 11904: 0xD879,
-	21912 - 11904: 0xB3DD,
-	21913 - 11904: 0xB3F1,
-	21914 - 11904: 0xB3EA,
-	21916 - 11904: 0xB3DF,
-	21917 - 11904: 0xB3DC,
-	21919 - 11904: 0xB3E7,
-	21921 - 11904: 0xD87A,
-	21922 - 11904: 0xD86C,
-	21923 - 11904: 0xD872,
-	21924 - 11904: 0xD874,
-	21925 - 11904: 0xD868,
-	21926 - 11904: 0xD877,
-	21927 - 11904: 0xB3D9,
-	21928 - 11904: 0xD867,
-	21929 - 11904: 0xFB47,
-	21930 - 11904: 0xB3E0,
-	21931 - 11904: 0xB3F0,
-	21932 - 11904: 0xB3EC,
-	21933 - 11904: 0xD869,
-	21934 - 11904: 0xB3E6,
-	21936 - 11904: 0x9148,
-	21937 - 11904: 0xB3ED,
-	21938 - 11904: 0xB3E9,
-	21939 - 11904: 0xB3E5,
-	21940 - 11904: 0x92DE,
-	21941 - 11904: 0xD870,
-	21945 - 11904: 0x8B53,
-	21946 - 11904: 0x9DF6,
-	21947 - 11904: 0xB3EB,
-	21948 - 11904: 0x9BDA,
-	21951 - 11904: 0xDCD5,
-	21952 - 11904: 0xDCD1,
-	21953 - 11904: 0x9D7E,
-	21954 - 11904: 0xDCE0,
-	21955 - 11904: 0xDCCA,
-	21956 - 11904: 0xDCD3,
-	21957 - 11904: 0xB6E5,
-	21958 - 11904: 0xB6E6,
-	21959 - 11904: 0xB6DE,
-	21960 - 11904: 0xDCDC,
-	21961 - 11904: 0xB6E8,
-	21962 - 11904: 0xDCCF,
-	21963 - 11904: 0xDCCE,
-	21964 - 11904: 0xDCCC,
-	21965 - 11904: 0xDCDE,
-	21966 - 11904: 0xB6DC,
-	21967 - 11904: 0xDCD8,
-	21968 - 11904: 0xDCCD,
-	21969 - 11904: 0xB6DF,
-	21970 - 11904: 0xDCD6,
-	21971 - 11904: 0xB6DA,
-	21972 - 11904: 0xDCD2,
-	21973 - 11904: 0xDCD9,
-	21974 - 11904: 0xDCDB,
-	21975 - 11904: 0x89FD,
-	21976 - 11904: 0x99E4,
-	21977 - 11904: 0xDCDF,
-	21978 - 11904: 0xB6E3,
-	21979 - 11904: 0xDCCB,
-	21980 - 11904: 0xB6DD,
-	21981 - 11904: 0xDCD0,
-	21982 - 11904: 0x9E43,
-	21983 - 11904: 0xB6D8,
-	21985 - 11904: 0xB6E4,
-	21986 - 11904: 0xDCDA,
-	21987 - 11904: 0xB6E0,
-	21988 - 11904: 0xB6E1,
-	21989 - 11904: 0xB6E7,
-	21990 - 11904: 0xB6DB,
-	21991 - 11904: 0xA25F,
-	21992 - 11904: 0xB6D9,
-	21993 - 11904: 0xDCD4,
-	21994 - 11904: 0x9DE9,
-	21996 - 11904: 0x8F52,
-	21999 - 11904: 0xB6E2,
-	22000 - 11904: 0x9DF5,
-	22001 - 11904: 0x9DF0,
-	22002 - 11904: 0xDCDD,
-	22005 - 11904: 0x99E7,
-	22006 - 11904: 0xB9CD,
-	22007 - 11904: 0xB9C8,
-	22009 - 11904: 0xE155,
-	22010 - 11904: 0xE151,
-	22011 - 11904: 0x8BBD,
-	22012 - 11904: 0xE14B,
-	22013 - 11904: 0xB9C2,
-	22014 - 11904: 0xB9BE,
-	22015 - 11904: 0xE154,
-	22016 - 11904: 0xB9BF,
-	22017 - 11904: 0xE14E,
-	22018 - 11904: 0xE150,
-	22020 - 11904: 0xE153,
-	22021 - 11904: 0xFB48,
-	22022 - 11904: 0xB9C4,
-	22024 - 11904: 0xB9CB,
-	22025 - 11904: 0xB9C5,
-	22028 - 11904: 0xE149,
-	22029 - 11904: 0xB9C6,
-	22030 - 11904: 0xB9C7,
-	22031 - 11904: 0xE14C,
-	22032 - 11904: 0xB9CC,
-	22033 - 11904: 0x9FB7,
-	22034 - 11904: 0xE14A,
-	22035 - 11904: 0xE14F,
-	22036 - 11904: 0xB9C3,
-	22037 - 11904: 0xE148,
-	22038 - 11904: 0xB9C9,
-	22039 - 11904: 0xB9C1,
-	22043 - 11904: 0xB9C0,
-	22044 - 11904: 0xE14D,
-	22045 - 11904: 0xE152,
-	22046 - 11904: 0x9DD0,
-	22047 - 11904: 0xB9CA,
-	22048 - 11904: 0x9FEB,
-	22049 - 11904: 0x8DA9,
-	22050 - 11904: 0x9DCF,
-	22051 - 11904: 0x98E1,
-	22053 - 11904: 0x9DE5,
-	22055 - 11904: 0xE147,
-	22057 - 11904: 0xBC4D,
-	22058 - 11904: 0xE547,
-	22060 - 11904: 0xE544,
-	22061 - 11904: 0x9DC8,
-	22062 - 11904: 0xBC47,
-	22063 - 11904: 0xBC53,
-	22064 - 11904: 0xBC54,
-	22066 - 11904: 0xBC4A,
-	22067 - 11904: 0xE542,
-	22068 - 11904: 0xBC4C,
-	22069 - 11904: 0xE4F9,
-	22070 - 11904: 0xBC52,
-	22071 - 11904: 0xFB4F,
-	22072 - 11904: 0xE546,
-	22073 - 11904: 0xBC49,
-	22074 - 11904: 0xE548,
-	22075 - 11904: 0xBC48,
-	22077 - 11904: 0xE543,
-	22078 - 11904: 0xE545,
-	22079 - 11904: 0xBC4B,
-	22080 - 11904: 0xE541,
-	22081 - 11904: 0xE4FA,
-	22082 - 11904: 0xE4F7,
-	22083 - 11904: 0x9DEB,
-	22085 - 11904: 0xD86B,
-	22086 - 11904: 0xE4FD,
-	22088 - 11904: 0xE4F6,
-	22089 - 11904: 0xE4FC,
-	22090 - 11904: 0xE4FB,
-	22092 - 11904: 0xE4F8,
-	22093 - 11904: 0xFB54,
-	22094 - 11904: 0xBC4F,
-	22095 - 11904: 0xFB55,
-	22096 - 11904: 0x9AA2,
-	22098 - 11904: 0x8AD6,
-	22099 - 11904: 0xBC4E,
-	22100 - 11904: 0x9A5F,
-	22103 - 11904: 0xBC50,
-	22104 - 11904: 0xE4FE,
-	22105 - 11904: 0xBEB2,
-	22106 - 11904: 0xE540,
-	22109 - 11904: 0x9EF5,
-	22110 - 11904: 0xE945,
-	22112 - 11904: 0xE8FD,
-	22113 - 11904: 0x8FB7,
-	22114 - 11904: 0xBEBE,
-	22115 - 11904: 0xE942,
-	22116 - 11904: 0xBEB6,
-	22117 - 11904: 0xBEBA,
-	22118 - 11904: 0xE941,
-	22120 - 11904: 0xBEB9,
-	22121 - 11904: 0xBEB5,
-	22122 - 11904: 0xBEB8,
-	22123 - 11904: 0xBEB3,
-	22124 - 11904: 0xBEBD,
-	22125 - 11904: 0xE943,
-	22126 - 11904: 0xE8FE,
-	22127 - 11904: 0xBEBC,
-	22128 - 11904: 0xE8FC,
-	22129 - 11904: 0xBEBB,
-	22130 - 11904: 0xE944,
-	22131 - 11904: 0xE940,
-	22132 - 11904: 0xBC51,
-	22134 - 11904: 0xBEBF,
-	22135 - 11904: 0xE946,
-	22136 - 11904: 0xBEB7,
-	22137 - 11904: 0xBEB4,
-	22138 - 11904: 0x9AD2,
-	22139 - 11904: 0x9E6A,
-	22140 - 11904: 0x9EE8,
-	22142 - 11904: 0xECC6,
-	22143 - 11904: 0xECC8,
-	22144 - 11904: 0xC07B,
-	22145 - 11904: 0xECC9,
-	22146 - 11904: 0xECC7,
-	22147 - 11904: 0xECC5,
-	22148 - 11904: 0xECC4,
-	22149 - 11904: 0xC07D,
-	22150 - 11904: 0xECC3,
-	22151 - 11904: 0xC07E,
-	22153 - 11904: 0x8BBF,
-	22154 - 11904: 0x91C2,
-	22155 - 11904: 0x9D62,
-	22156 - 11904: 0xECC1,
-	22157 - 11904: 0xECC2,
-	22158 - 11904: 0xC07A,
-	22159 - 11904: 0xC0A1,
-	22160 - 11904: 0xC07C,
-	22162 - 11904: 0x9260,
-	22163 - 11904: 0xECC0,
-	22165 - 11904: 0xC250,
-	22167 - 11904: 0xEFBC,
-	22168 - 11904: 0xEFBA,
-	22169 - 11904: 0xEFBF,
-	22170 - 11904: 0xEFBD,
-	22172 - 11904: 0xEFBB,
-	22173 - 11904: 0xEFBE,
-	22174 - 11904: 0x925E,
-	22175 - 11904: 0x91C1,
-	22177 - 11904: 0x8AC5,
-	22180 - 11904: 0x97A3,
-	22181 - 11904: 0xC360,
-	22182 - 11904: 0xF1F2,
-	22183 - 11904: 0xF1F3,
-	22184 - 11904: 0xC456,
-	22186 - 11904: 0xF1F4,
-	22187 - 11904: 0xF1F0,
-	22188 - 11904: 0xF1F5,
-	22189 - 11904: 0xF1F1,
-	22190 - 11904: 0xC251,
-	22191 - 11904: 0x8B6C,
-	22193 - 11904: 0x8D7E,
-	22194 - 11904: 0xF3FE,
-	22195 - 11904: 0xF441,
-	22196 - 11904: 0xC459,
-	22197 - 11904: 0xF440,
-	22198 - 11904: 0xC458,
-	22199 - 11904: 0xC457,
-	22201 - 11904: 0x9C54,
-	22204 - 11904: 0xC45A,
-	22205 - 11904: 0xF5C5,
-	22206 - 11904: 0xF5C6,
-	22207 - 11904: 0x9DBD,
-	22208 - 11904: 0xC4DA,
-	22209 - 11904: 0xC4D9,
-	22210 - 11904: 0xC4DB,
-	22211 - 11904: 0xF5C4,
-	22213 - 11904: 0xF6D8,
-	22214 - 11904: 0xF6D7,
-	22216 - 11904: 0xC56D,
-	22217 - 11904: 0xC56F,
-	22218 - 11904: 0xC56E,
-	22219 - 11904: 0xF6D9,
-	22220 - 11904: 0xC5C8,
-	22221 - 11904: 0xF8A6,
-	22225 - 11904: 0xC5F1,
-	22227 - 11904: 0xF8A5,
-	22228 - 11904: 0xF8EE,
-	22230 - 11904: 0x9CC5,
-	22231 - 11904: 0xC949,
-	22234 - 11904: 0xA57D,
-	22235 - 11904: 0xA57C,
-	22237 - 11904: 0xA65F,
-	22238 - 11904: 0xA65E,
-	22239 - 11904: 0xC9C7,
-	22240 - 11904: 0xA65D,
-	22241 - 11904: 0xC9C6,
-	22242 - 11904: 0x895B,
-	22244 - 11904: 0xA779,
-	22245 - 11904: 0xCAA9,
-	22247 - 11904: 0xCAA8,
-	22250 - 11904: 0xA777,
-	22251 - 11904: 0xA77A,
-	22253 - 11904: 0xFB5C,
-	22254 - 11904: 0xCAA7,
-	22255 - 11904: 0xFB5B,
-	22256 - 11904: 0xA778,
-	22257 - 11904: 0xFB57,
-	22263 - 11904: 0xCBF0,
-	22265 - 11904: 0xCBF1,
-	22266 - 11904: 0xA954,
-	22267 - 11904: 0x8765,
-	22269 - 11904: 0x98C7,
-	22271 - 11904: 0xABAA,
-	22272 - 11904: 0xFB5A,
-	22273 - 11904: 0xD148,
-	22274 - 11904: 0xD149,
-	22275 - 11904: 0xAE45,
-	22276 - 11904: 0xAE46,
-	22279 - 11904: 0xD4AC,
-	22280 - 11904: 0xB0E9,
-	22281 - 11904: 0xB0EB,
-	22282 - 11904: 0xD4AB,
-	22283 - 11904: 0xB0EA,
-	22284 - 11904: 0xD87C,
-	22285 - 11904: 0xB3F2,
-	22290 - 11904: 0xB6E9,
-	22291 - 11904: 0xB6EA,
-	22292 - 11904: 0xDCE1,
-	22293 - 11904: 0x9CEE,
-	22294 - 11904: 0xB9CF,
-	22296 - 11904: 0xB9CE,
-	22298 - 11904: 0xE549,
-	22299 - 11904: 0xE948,
-	22300 - 11904: 0xE947,
-	22301 - 11904: 0x92E2,
-	22302 - 11904: 0xF96B,
-	22303 - 11904: 0xA467,
-	22304 - 11904: 0xC959,
-	22306 - 11904: 0xC96E,
-	22307 - 11904: 0xC96F,
-	22312 - 11904: 0xA662,
-	22313 - 11904: 0xA666,
-	22314 - 11904: 0xC9C9,
-	22316 - 11904: 0xA664,
-	22317 - 11904: 0xA663,
-	22318 - 11904: 0xC9C8,
-	22319 - 11904: 0xA665,
-	22320 - 11904: 0xA661,
-	22322 - 11904: 0x94A7,
-	22323 - 11904: 0xA660,
-	22324 - 11904: 0xC9CA,
-	22331 - 11904: 0xA7A6,
-	22333 - 11904: 0x8CCC,
-	22334 - 11904: 0xA7A3,
-	22335 - 11904: 0x9BD4,
-	22336 - 11904: 0xA77D,
-	22337 - 11904: 0xCAAA,
-	22338 - 11904: 0xFB64,
-	22339 - 11904: 0xFB76,
-	22341 - 11904: 0xCAAB,
-	22342 - 11904: 0xFB60,
-	22343 - 11904: 0xA7A1,
-	22345 - 11904: 0xCAAD,
-	22346 - 11904: 0xA77B,
-	22347 - 11904: 0xCAAE,
-	22348 - 11904: 0xCAAC,
-	22349 - 11904: 0xA77E,
-	22350 - 11904: 0xA7A2,
-	22351 - 11904: 0xA7A5,
-	22352 - 11904: 0xA7A4,
-	22353 - 11904: 0xA77C,
-	22354 - 11904: 0xCAAF,
-	22356 - 11904: 0x99E5,
-	22359 - 11904: 0x9AC2,
-	22363 - 11904: 0x91FB,
-	22367 - 11904: 0xA073,
-	22369 - 11904: 0xA959,
-	22370 - 11904: 0xCBFE,
-	22372 - 11904: 0xA95B,
-	22374 - 11904: 0xA95A,
-	22375 - 11904: 0x9F72,
-	22376 - 11904: 0xCC40,
-	22377 - 11904: 0xA958,
-	22378 - 11904: 0xA957,
-	22379 - 11904: 0xCBF5,
-	22381 - 11904: 0xCBF4,
-	22383 - 11904: 0xCBF2,
-	22384 - 11904: 0xCBF7,
-	22385 - 11904: 0xCBF6,
-	22386 - 11904: 0xCBF3,
-	22387 - 11904: 0xCBFC,
-	22388 - 11904: 0xCBFD,
-	22389 - 11904: 0xCBFA,
-	22390 - 11904: 0xCBF8,
-	22391 - 11904: 0xA956,
-	22394 - 11904: 0x9FCC,
-	22395 - 11904: 0xCBFB,
-	22396 - 11904: 0xA95C,
-	22397 - 11904: 0xCC41,
-	22398 - 11904: 0x98A5,
-	22399 - 11904: 0x92E8,
-	22400 - 11904: 0xCBF9,
-	22402 - 11904: 0xABAB,
-	22403 - 11904: 0xA955,
-	22408 - 11904: 0x9BBC,
-	22410 - 11904: 0x96F3,
-	22411 - 11904: 0xABAC,
-	22412 - 11904: 0xCE54,
-	22413 - 11904: 0x92E7,
-	22415 - 11904: 0xCE5A,
-	22416 - 11904: 0xFC67,
-	22419 - 11904: 0xABB2,
-	22420 - 11904: 0xCE58,
-	22421 - 11904: 0xCE5E,
-	22423 - 11904: 0xCE55,
-	22424 - 11904: 0xCE59,
-	22425 - 11904: 0xCE5B,
-	22426 - 11904: 0xCE5D,
-	22427 - 11904: 0xCE57,
-	22428 - 11904: 0x8B7D,
-	22429 - 11904: 0xCE56,
-	22430 - 11904: 0xCE51,
-	22431 - 11904: 0xCE52,
-	22432 - 11904: 0xABAD,
-	22433 - 11904: 0x9BF4,
-	22434 - 11904: 0xABAF,
-	22435 - 11904: 0xABAE,
-	22436 - 11904: 0xCE53,
-	22437 - 11904: 0xCE5C,
-	22439 - 11904: 0x9EF7,
-	22442 - 11904: 0x9EC1,
-	22446 - 11904: 0xABB1,
-	22451 - 11904: 0x87C3,
-	22452 - 11904: 0x996F,
-	22453 - 11904: 0xCE50,
-	22454 - 11904: 0xD153,
-	22456 - 11904: 0xD152,
-	22457 - 11904: 0xD157,
-	22458 - 11904: 0xD14E,
-	22459 - 11904: 0x96F1,
-	22460 - 11904: 0xD151,
-	22461 - 11904: 0xD150,
-	22462 - 11904: 0x8E41,
-	22463 - 11904: 0xD154,
-	22465 - 11904: 0xD158,
-	22466 - 11904: 0xAE47,
-	22467 - 11904: 0xAE4A,
-	22468 - 11904: 0x954A,
-	22470 - 11904: 0xD14F,
-	22471 - 11904: 0xD155,
-	22472 - 11904: 0x97E6,
-	22475 - 11904: 0xAE49,
-	22476 - 11904: 0xD14A,
-	22478 - 11904: 0xABB0,
-	22479 - 11904: 0xD4BA,
-	22480 - 11904: 0xD156,
-	22482 - 11904: 0xD14D,
-	22484 - 11904: 0xAE48,
-	22485 - 11904: 0xD14C,
-	22487 - 11904: 0x96F5,
-	22492 - 11904: 0xD4B1,
-	22493 - 11904: 0x92E6,
-	22494 - 11904: 0x9F42,
-	22495 - 11904: 0xB0EC,
-	22496 - 11904: 0xB0F0,
-	22497 - 11904: 0xD4C1,
-	22498 - 11904: 0xD4AF,
-	22499 - 11904: 0xD4BD,
-	22500 - 11904: 0xB0F1,
-	22501 - 11904: 0xD4BF,
-	22502 - 11904: 0xFB67,
-	22503 - 11904: 0xD4C5,
-	22505 - 11904: 0xD4C9,
-	22508 - 11904: 0xD4C0,
-	22509 - 11904: 0xD4B4,
-	22510 - 11904: 0xD4BC,
-	22511 - 11904: 0x99A9,
-	22512 - 11904: 0xD4CA,
-	22513 - 11904: 0xD4C8,
-	22514 - 11904: 0xD4BE,
-	22515 - 11904: 0xD4B9,
-	22516 - 11904: 0xD4B2,
-	22517 - 11904: 0xD8A6,
-	22518 - 11904: 0xD4B0,
-	22519 - 11904: 0xB0F5,
-	22520 - 11904: 0xD4B7,
-	22521 - 11904: 0xB0F6,
-	22522 - 11904: 0xB0F2,
-	22523 - 11904: 0xD4AD,
-	22524 - 11904: 0xD4C3,
-	22525 - 11904: 0xD4B5,
-	22526 - 11904: 0xFAE6,
-	22528 - 11904: 0xD4B3,
-	22529 - 11904: 0xD4C6,
-	22530 - 11904: 0xB0F3,
-	22531 - 11904: 0xFB69,
-	22532 - 11904: 0xD4CC,
-	22533 - 11904: 0xB0ED,
-	22534 - 11904: 0xB0EF,
-	22535 - 11904: 0xD4BB,
-	22536 - 11904: 0xD4B6,
-	22537 - 11904: 0xAE4B,
-	22538 - 11904: 0xB0EE,
-	22539 - 11904: 0xD4B8,
-	22540 - 11904: 0xD4C7,
-	22541 - 11904: 0xD4CB,
-	22542 - 11904: 0xD4C2,
-	22544 - 11904: 0xD4C4,
-	22546 - 11904: 0x97E5,
-	22548 - 11904: 0xD4AE,
-	22552 - 11904: 0x87C8,
-	22553 - 11904: 0xD8A1,
-	22555 - 11904: 0xD8AA,
-	22556 - 11904: 0xD8A9,
-	22557 - 11904: 0xB3FA,
-	22558 - 11904: 0xD8A2,
-	22560 - 11904: 0xB3FB,
-	22561 - 11904: 0xB3F9,
-	22562 - 11904: 0x967D,
-	22563 - 11904: 0xD8A4,
-	22564 - 11904: 0xB3F6,
-	22565 - 11904: 0xD8A8,
-	22566 - 11904: 0xFB6C,
-	22567 - 11904: 0xD8A3,
-	22568 - 11904: 0xD8A5,
-	22569 - 11904: 0xD87D,
-	22570 - 11904: 0xB3F4,
-	22572 - 11904: 0xD8B2,
-	22573 - 11904: 0xD8B1,
-	22574 - 11904: 0xD8AE,
-	22575 - 11904: 0xB3F3,
-	22576 - 11904: 0xB3F7,
-	22577 - 11904: 0xB3F8,
-	22578 - 11904: 0xD14B,
-	22579 - 11904: 0xD8AB,
-	22580 - 11904: 0xB3F5,
-	22581 - 11904: 0xB0F4,
-	22582 - 11904: 0xD8AD,
-	22583 - 11904: 0xD87E,
-	22584 - 11904: 0xD8B0,
-	22585 - 11904: 0xD8AF,
-	22586 - 11904: 0x99A2,
-	22587 - 11904: 0xD8B3,
-	22589 - 11904: 0xDCEF,
-	22591 - 11904: 0xD8AC,
-	22592 - 11904: 0x9ABB,
-	22596 - 11904: 0x9A65,
-	22599 - 11904: 0x944E,
-	22600 - 11904: 0xD8A7,
-	22601 - 11904: 0xDCE7,
-	22602 - 11904: 0xB6F4,
-	22603 - 11904: 0xB6F7,
-	22604 - 11904: 0xB6F2,
-	22605 - 11904: 0xDCE6,
-	22606 - 11904: 0xDCEA,
-	22607 - 11904: 0xDCE5,
-	22609 - 11904: 0xB6EC,
-	22610 - 11904: 0xB6F6,
-	22611 - 11904: 0xDCE2,
-	22612 - 11904: 0xB6F0,
-	22613 - 11904: 0xDCE9,
-	22615 - 11904: 0xB6EE,
-	22616 - 11904: 0xB6ED,
-	22617 - 11904: 0xDCEC,
-	22618 - 11904: 0xB6EF,
-	22619 - 11904: 0xDCEE,
-	22620 - 11904: 0xFB6E,
-	22621 - 11904: 0xDCEB,
-	22622 - 11904: 0xB6EB,
-	22623 - 11904: 0x99DF,
-	22626 - 11904: 0xB6F5,
-	22627 - 11904: 0xDCF0,
-	22628 - 11904: 0xDCE4,
-	22629 - 11904: 0xDCED,
-	22632 - 11904: 0xDCE3,
-	22633 - 11904: 0x98E3,
-	22635 - 11904: 0xB6F1,
-	22636 - 11904: 0x9254,
-	22637 - 11904: 0xB6F3,
-	22639 - 11904: 0xDCE8,
-	22641 - 11904: 0xDCF1,
-	22642 - 11904: 0x967B,
-	22643 - 11904: 0x8AAF,
-	22644 - 11904: 0xE15D,
-	22645 - 11904: 0xB9D0,
-	22646 - 11904: 0xE163,
-	22649 - 11904: 0xB9D5,
-	22650 - 11904: 0xE15F,
-	22651 - 11904: 0xE166,
-	22652 - 11904: 0xE157,
-	22653 - 11904: 0xB9D7,
-	22654 - 11904: 0xB9D1,
-	22655 - 11904: 0xE15C,
-	22656 - 11904: 0xBC55,
-	22657 - 11904: 0xE15B,
-	22658 - 11904: 0xE164,
-	22659 - 11904: 0xB9D2,
-	22661 - 11904: 0xB9D6,
-	22662 - 11904: 0xE15A,
-	22663 - 11904: 0xE160,
-	22664 - 11904: 0xE165,
-	22665 - 11904: 0xE156,
-	22666 - 11904: 0xB9D4,
-	22667 - 11904: 0xE15E,
-	22670 - 11904: 0xE162,
-	22671 - 11904: 0xE168,
-	22672 - 11904: 0xE158,
-	22673 - 11904: 0xE161,
-	22674 - 11904: 0x8C77,
-	22675 - 11904: 0xB9D3,
-	22676 - 11904: 0xE167,
-	22678 - 11904: 0x87B0,
-	22680 - 11904: 0xE159,
-	22681 - 11904: 0x8BAF,
-	22682 - 11904: 0x9EBD,
-	22684 - 11904: 0xBC59,
-	22685 - 11904: 0xE54B,
-	22686 - 11904: 0xBC57,
-	22687 - 11904: 0xBC56,
-	22688 - 11904: 0xE54D,
-	22689 - 11904: 0xE552,
-	22691 - 11904: 0xE54E,
-	22693 - 11904: 0xE551,
-	22694 - 11904: 0xBC5C,
-	22695 - 11904: 0x9EE6,
-	22696 - 11904: 0xBEA5,
-	22697 - 11904: 0xBC5B,
-	22698 - 11904: 0xFB6F,
-	22699 - 11904: 0xE54A,
-	22700 - 11904: 0xE550,
-	22702 - 11904: 0xBC5A,
-	22703 - 11904: 0xE54F,
-	22704 - 11904: 0x8EE1,
-	22705 - 11904: 0xE54C,
-	22707 - 11904: 0xBC58,
-	22709 - 11904: 0x9B7D,
-	22710 - 11904: 0x9C7E,
-	22714 - 11904: 0xE94D,
-	22715 - 11904: 0xF9D9,
-	22716 - 11904: 0xE94F,
-	22717 - 11904: 0xE94A,
-	22718 - 11904: 0xBEC1,
-	22719 - 11904: 0xE94C,
-	22721 - 11904: 0xBEC0,
-	22722 - 11904: 0xE94E,
-	22725 - 11904: 0xBEC3,
-	22726 - 11904: 0xE950,
-	22727 - 11904: 0xBEC2,
-	22728 - 11904: 0xE949,
-	22729 - 11904: 0xE94B,
-	22731 - 11904: 0x92EA,
-	22734 - 11904: 0xC0A5,
-	22735 - 11904: 0xECCC,
-	22736 - 11904: 0x8C78,
-	22737 - 11904: 0xC0A4,
-	22738 - 11904: 0xECCD,
-	22739 - 11904: 0xC0A3,
-	22740 - 11904: 0xECCB,
-	22741 - 11904: 0xC0A2,
-	22742 - 11904: 0xECCA,
-	22744 - 11904: 0xC253,
-	22745 - 11904: 0xC252,
-	22746 - 11904: 0xF1F6,
-	22747 - 11904: 0xF1F8,
-	22748 - 11904: 0xFB72,
-	22749 - 11904: 0xF1F7,
-	22750 - 11904: 0xC361,
-	22751 - 11904: 0xC362,
-	22752 - 11904: 0xFB71,
-	22754 - 11904: 0xC363,
-	22755 - 11904: 0xF442,
-	22756 - 11904: 0xC45B,
-	22759 - 11904: 0xF7D3,
-	22760 - 11904: 0xF7D2,
-	22761 - 11904: 0xC5F2,
-	22763 - 11904: 0xA468,
-	22764 - 11904: 0xA4D0,
-	22767 - 11904: 0xA7A7,
-	22768 - 11904: 0x895C,
-	22770 - 11904: 0x98F0,
-	22771 - 11904: 0x96F2,
-	22772 - 11904: 0xCE5F,
-	22777 - 11904: 0xB3FC,
-	22778 - 11904: 0xB3FD,
-	22779 - 11904: 0xFB74,
-	22780 - 11904: 0xDCF2,
-	22781 - 11904: 0xB9D8,
-	22782 - 11904: 0xE169,
-	22783 - 11904: 0xE553,
-	22786 - 11904: 0x8BC1,
-	22787 - 11904: 0xC95A,
-	22788 - 11904: 0x895D,
-	22789 - 11904: 0x89DE,
-	22790 - 11904: 0xCAB0,
-	22791 - 11904: 0x895E,
-	22794 - 11904: 0xC6CA,
-	22796 - 11904: 0xCC42,
-	22797 - 11904: 0xCE60,
-	22798 - 11904: 0xD159,
-	22799 - 11904: 0xAE4C,
-	22801 - 11904: 0xFE42,
-	22802 - 11904: 0xF1F9,
-	22804 - 11904: 0xC4DC,
-	22805 - 11904: 0xA469,
-	22806 - 11904: 0xA57E,
-	22807 - 11904: 0xC970,
-	22809 - 11904: 0xA667,
-	22810 - 11904: 0xA668,
-	22812 - 11904: 0xA95D,
-	22813 - 11904: 0x8768,
-	22815 - 11904: 0xFB7B,
-	22816 - 11904: 0xB0F7,
-	22818 - 11904: 0xB9DA,
-	22820 - 11904: 0xB9DB,
-	22821 - 11904: 0xB9D9,
-	22823 - 11904: 0xA46A,
-	22825 - 11904: 0xA4D1,
-	22826 - 11904: 0xA4D3,
-	22827 - 11904: 0xA4D2,
-	22828 - 11904: 0xC95B,
-	22829 - 11904: 0xA4D4,
-	22830 - 11904: 0xA5A1,
-	22831 - 11904: 0xC971,
-	22833 - 11904: 0xA5A2,
-	22834 - 11904: 0x895F,
-	22836 - 11904: 0x8960,
-	22839 - 11904: 0xA669,
-	22840 - 11904: 0xA66A,
-	22844 - 11904: 0xC9CB,
-	22846 - 11904: 0xA7A8,
-	22848 - 11904: 0xCAB1,
-	22852 - 11904: 0xA961,
-	22853 - 11904: 0xCC43,
-	22855 - 11904: 0xA95F,
-	22856 - 11904: 0xA960,
-	22857 - 11904: 0xA95E,
-	22858 - 11904: 0xD15A,
-	22862 - 11904: 0xABB6,
-	22863 - 11904: 0xABB5,
-	22864 - 11904: 0xABB7,
-	22865 - 11904: 0xABB4,
-	22867 - 11904: 0xCE61,
-	22868 - 11904: 0xA962,
-	22869 - 11904: 0xABB3,
-	22871 - 11904: 0xAE4D,
-	22872 - 11904: 0xAE4E,
-	22874 - 11904: 0xAE4F,
-	22876 - 11904: 0xD4CD,
-	22880 - 11904: 0xB3FE,
-	22881 - 11904: 0xD8B4,
-	22882 - 11904: 0xB0F8,
-	22885 - 11904: 0x9BCD,
-	22887 - 11904: 0xB6F8,
-	22889 - 11904: 0xB9DD,
-	22890 - 11904: 0xB9DC,
-	22891 - 11904: 0xE16A,
-	22893 - 11904: 0xBC5D,
-	22894 - 11904: 0xBEC4,
-	22896 - 11904: 0xEFC0,
-	22897 - 11904: 0xF6DA,
-	22898 - 11904: 0xF7D4,
-	22899 - 11904: 0xA46B,
-	22900 - 11904: 0xA5A3,
-	22901 - 11904: 0x9DD3,
-	22902 - 11904: 0xA5A4,
-	22903 - 11904: 0xC9D1,
-	22904 - 11904: 0xA66C,
-	22905 - 11904: 0xA66F,
-	22907 - 11904: 0xC9CF,
-	22908 - 11904: 0xC9CD,
-	22909 - 11904: 0xA66E,
-	22910 - 11904: 0xC9D0,
-	22911 - 11904: 0xC9D2,
-	22912 - 11904: 0xC9CC,
-	22913 - 11904: 0xA671,
-	22914 - 11904: 0xA670,
-	22915 - 11904: 0xA66D,
-	22916 - 11904: 0xA66B,
-	22917 - 11904: 0xC9CE,
-	22921 - 11904: 0x984C,
-	22922 - 11904: 0xA7B3,
-	22925 - 11904: 0xA7B0,
-	22926 - 11904: 0xCAB6,
-	22927 - 11904: 0xCAB9,
-	22928 - 11904: 0xCAB8,
-	22930 - 11904: 0xA7AA,
-	22931 - 11904: 0xA7B2,
-	22932 - 11904: 0x9752,
-	22934 - 11904: 0xA7AF,
-	22935 - 11904: 0xCAB5,
-	22936 - 11904: 0xCAB3,
-	22937 - 11904: 0xA7AE,
-	22938 - 11904: 0x95C3,
-	22941 - 11904: 0xA7A9,
-	22942 - 11904: 0xA7AC,
-	22943 - 11904: 0x9BB6,
-	22944 - 11904: 0xCAB4,
-	22945 - 11904: 0xCABB,
-	22946 - 11904: 0xCAB7,
-	22947 - 11904: 0xA7AD,
-	22948 - 11904: 0xA7B1,
-	22949 - 11904: 0xA7B4,
-	22950 - 11904: 0xCAB2,
-	22951 - 11904: 0xCABA,
-	22952 - 11904: 0xA7AB,
-	22956 - 11904: 0x9AB9,
-	22958 - 11904: 0xA967,
-	22959 - 11904: 0xA96F,
-	22960 - 11904: 0x97B3,
-	22961 - 11904: 0xCC4F,
-	22962 - 11904: 0xCC48,
-	22963 - 11904: 0xA970,
-	22964 - 11904: 0xCC53,
-	22965 - 11904: 0xCC44,
-	22966 - 11904: 0xCC4B,
-	22967 - 11904: 0x9F74,
-	22968 - 11904: 0x92F1,
-	22969 - 11904: 0xA966,
-	22970 - 11904: 0xCC45,
-	22971 - 11904: 0xA964,
-	22972 - 11904: 0xCC4C,
-	22973 - 11904: 0xCC50,
-	22974 - 11904: 0xA963,
-	22975 - 11904: 0x8CFA,
-	22976 - 11904: 0xCC51,
-	22977 - 11904: 0xCC4A,
-	22979 - 11904: 0xCC4D,
-	22980 - 11904: 0x97DF,
-	22981 - 11904: 0xA972,
-	22982 - 11904: 0xA969,
-	22983 - 11904: 0xCC54,
-	22984 - 11904: 0xCC52,
-	22985 - 11904: 0xFBA6,
-	22986 - 11904: 0xA96E,
-	22987 - 11904: 0xA96C,
-	22988 - 11904: 0xCC49,
-	22989 - 11904: 0xA96B,
-	22990 - 11904: 0xCC47,
-	22991 - 11904: 0xCC46,
-	22992 - 11904: 0xA96A,
-	22993 - 11904: 0xA968,
-	22994 - 11904: 0xA971,
-	22995 - 11904: 0xA96D,
-	22996 - 11904: 0xA965,
-	22998 - 11904: 0xCC4E,
-	23000 - 11904: 0xABB9,
-	23001 - 11904: 0xFBAB,
-	23002 - 11904: 0xABC0,
-	23003 - 11904: 0xCE6F,
-	23004 - 11904: 0xABB8,
-	23005 - 11904: 0xCE67,
-	23006 - 11904: 0xCE63,
-	23008 - 11904: 0xCE73,
-	23009 - 11904: 0xCE62,
-	23011 - 11904: 0xABBB,
-	23012 - 11904: 0xCE6C,
-	23013 - 11904: 0xABBE,
-	23014 - 11904: 0xABC1,
-	23016 - 11904: 0xABBC,
-	23017 - 11904: 0xCE70,
-	23018 - 11904: 0xABBF,
-	23019 - 11904: 0x9877,
-	23020 - 11904: 0xAE56,
-	23021 - 11904: 0xCE76,
-	23022 - 11904: 0xCE64,
-	23023 - 11904: 0x9854,
-	23024 - 11904: 0x95C5,
-	23025 - 11904: 0xCE66,
-	23026 - 11904: 0xCE6D,
-	23027 - 11904: 0xCE71,
-	23028 - 11904: 0xCE75,
-	23029 - 11904: 0xCE72,
-	23030 - 11904: 0xCE6B,
-	23031 - 11904: 0xCE6E,
-	23032 - 11904: 0x9D55,
-	23033 - 11904: 0xFBB2,
-	23034 - 11904: 0xCE68,
-	23035 - 11904: 0xABC3,
-	23036 - 11904: 0xCE6A,
-	23037 - 11904: 0xCE69,
-	23038 - 11904: 0xCE74,
-	23039 - 11904: 0xABBA,
-	23040 - 11904: 0xCE65,
-	23041 - 11904: 0xABC2,
-	23042 - 11904: 0x957E,
-	23043 - 11904: 0xABBD,
-	23049 - 11904: 0xAE5C,
-	23050 - 11904: 0xD162,
-	23051 - 11904: 0x9742,
-	23052 - 11904: 0xAE5B,
-	23053 - 11904: 0x94E6,
-	23055 - 11904: 0xD160,
-	23057 - 11904: 0xAE50,
-	23058 - 11904: 0x92F5,
-	23059 - 11904: 0xAE55,
-	23061 - 11904: 0xD15F,
-	23062 - 11904: 0xD15C,
-	23063 - 11904: 0xD161,
-	23064 - 11904: 0xAE51,
-	23065 - 11904: 0xD15B,
-	23066 - 11904: 0x8CC5,
-	23067 - 11904: 0xAE54,
-	23068 - 11904: 0xAE52,
-	23070 - 11904: 0xD163,
-	23071 - 11904: 0xAE53,
-	23072 - 11904: 0xAE57,
-	23073 - 11904: 0x92FD,
-	23075 - 11904: 0xAE58,
-	23076 - 11904: 0xFBA2,
-	23077 - 11904: 0xAE5A,
-	23079 - 11904: 0x9C51,
-	23081 - 11904: 0xAE59,
-	23082 - 11904: 0x94E9,
-	23083 - 11904: 0x985C,
-	23084 - 11904: 0x92F0,
-	23085 - 11904: 0xD15D,
-	23086 - 11904: 0xD15E,
-	23091 - 11904: 0xD164,
-	23093 - 11904: 0xD4D4,
-	23094 - 11904: 0xB0F9,
-	23095 - 11904: 0xD8C2,
-	23096 - 11904: 0xD4D3,
-	23097 - 11904: 0xD4E6,
-	23100 - 11904: 0xB140,
-	23101 - 11904: 0x944C,
-	23102 - 11904: 0xD4E4,
-	23104 - 11904: 0xB0FE,
-	23105 - 11904: 0xB0FA,
-	23106 - 11904: 0xD4ED,
-	23107 - 11904: 0xD4DD,
-	23108 - 11904: 0xD4E0,
-	23109 - 11904: 0x916B,
-	23110 - 11904: 0xB143,
-	23111 - 11904: 0xD4EA,
-	23112 - 11904: 0xD4E2,
-	23113 - 11904: 0xB0FB,
-	23114 - 11904: 0xB144,
-	23116 - 11904: 0xD4E7,
-	23117 - 11904: 0xD4E5,
-	23120 - 11904: 0xD4D6,
-	23121 - 11904: 0xD4EB,
-	23122 - 11904: 0xD4DF,
-	23123 - 11904: 0xD4DA,
-	23124 - 11904: 0x8B78,
-	23125 - 11904: 0xD4D0,
-	23126 - 11904: 0xD4EC,
-	23127 - 11904: 0xD4DC,
-	23128 - 11904: 0xD4CF,
-	23129 - 11904: 0x94E2,
-	23130 - 11904: 0xB142,
-	23131 - 11904: 0xD4E1,
-	23132 - 11904: 0xD4EE,
-	23133 - 11904: 0xD4DE,
-	23134 - 11904: 0xD4D2,
-	23135 - 11904: 0xD4D7,
-	23136 - 11904: 0xD4CE,
-	23137 - 11904: 0x984F,
-	23138 - 11904: 0xB141,
-	23139 - 11904: 0xFBB5,
-	23140 - 11904: 0xD4DB,
-	23141 - 11904: 0xD4D8,
-	23142 - 11904: 0xB0FC,
-	23143 - 11904: 0xD4D1,
-	23144 - 11904: 0x9271,
-	23145 - 11904: 0xD4E9,
-	23146 - 11904: 0xB0FD,
-	23147 - 11904: 0x9365,
-	23148 - 11904: 0xD4D9,
-	23149 - 11904: 0xD4D5,
-	23150 - 11904: 0x985B,
-	23152 - 11904: 0xD4E8,
-	23153 - 11904: 0x9850,
-	23159 - 11904: 0xFBB8,
-	23160 - 11904: 0xD8BB,
-	23161 - 11904: 0x97BC,
-	23162 - 11904: 0xD8B8,
-	23163 - 11904: 0xD8C9,
-	23164 - 11904: 0xD8BD,
-	23165 - 11904: 0xD8CA,
-	23166 - 11904: 0x92F3,
-	23167 - 11904: 0xB442,
-	23169 - 11904: 0x9340,
-	23170 - 11904: 0x984D,
-	23171 - 11904: 0xD8C6,
-	23172 - 11904: 0xD8C3,
-	23174 - 11904: 0x9572,
-	23176 - 11904: 0xFDEF,
-	23178 - 11904: 0xD8C4,
-	23179 - 11904: 0xD8C7,
-	23180 - 11904: 0xD8CB,
-	23182 - 11904: 0xD4E3,
-	23183 - 11904: 0xD8CD,
-	23184 - 11904: 0xDD47,
-	23185 - 11904: 0xFDC1,
-	23186 - 11904: 0xB443,
-	23187 - 11904: 0xD8CE,
-	23188 - 11904: 0xD8B6,
-	23189 - 11904: 0xD8C0,
-	23190 - 11904: 0xFBBA,
-	23191 - 11904: 0xD8C5,
-	23193 - 11904: 0x92EB,
-	23194 - 11904: 0xB441,
-	23195 - 11904: 0xB444,
-	23196 - 11904: 0xD8CC,
-	23197 - 11904: 0xD8CF,
-	23198 - 11904: 0xD8BA,
-	23199 - 11904: 0xD8B7,
-	23200 - 11904: 0xFC73,
-	23201 - 11904: 0x97B7,
-	23202 - 11904: 0xD8B9,
-	23204 - 11904: 0x876F,
-	23205 - 11904: 0xD8BE,
-	23206 - 11904: 0xD8BC,
-	23207 - 11904: 0xB445,
-	23209 - 11904: 0xD8C8,
-	23211 - 11904: 0xFBB4,
-	23212 - 11904: 0xD8BF,
-	23214 - 11904: 0xD8C1,
-	23215 - 11904: 0xD8B5,
-	23216 - 11904: 0xDCFA,
-	23217 - 11904: 0xDCF8,
-	23218 - 11904: 0xB742,
-	23219 - 11904: 0xB740,
-	23220 - 11904: 0xDD43,
-	23221 - 11904: 0xDCF9,
-	23222 - 11904: 0xDD44,
-	23223 - 11904: 0xDD40,
-	23224 - 11904: 0xDCF7,
-	23225 - 11904: 0xDD46,
-	23226 - 11904: 0xDCF6,
-	23227 - 11904: 0xDCFD,
-	23228 - 11904: 0xB6FE,
-	23229 - 11904: 0xB6FD,
-	23230 - 11904: 0xB6FC,
-	23231 - 11904: 0xDCFB,
-	23232 - 11904: 0xDD41,
-	23233 - 11904: 0xB6F9,
-	23234 - 11904: 0xB741,
-	23235 - 11904: 0x90A7,
-	23236 - 11904: 0xDCF4,
-	23238 - 11904: 0xDCFE,
-	23239 - 11904: 0xDCF3,
-	23240 - 11904: 0xDCFC,
-	23241 - 11904: 0xB6FA,
-	23242 - 11904: 0xDD42,
-	23243 - 11904: 0xDCF5,
-	23244 - 11904: 0xB6FB,
-	23245 - 11904: 0xDD45,
-	23246 - 11904: 0x9741,
-	23247 - 11904: 0x92F4,
-	23249 - 11904: 0x8772,
-	23251 - 11904: 0xFBBC,
-	23253 - 11904: 0xE16E,
-	23254 - 11904: 0xB9E2,
-	23255 - 11904: 0xB9E1,
-	23256 - 11904: 0xB9E3,
-	23257 - 11904: 0xE17A,
-	23258 - 11904: 0xE170,
-	23259 - 11904: 0xE176,
-	23260 - 11904: 0xE16B,
-	23261 - 11904: 0xE179,
-	23262 - 11904: 0xE178,
-	23263 - 11904: 0xE17C,
-	23264 - 11904: 0xE175,
-	23265 - 11904: 0xB9DE,
-	23266 - 11904: 0xE174,
-	23267 - 11904: 0xB9E4,
-	23268 - 11904: 0x9577,
-	23269 - 11904: 0xE16D,
-	23270 - 11904: 0xB9DF,
-	23272 - 11904: 0xE17B,
-	23273 - 11904: 0xB9E0,
-	23274 - 11904: 0xE16F,
-	23275 - 11904: 0xE172,
-	23276 - 11904: 0xE177,
-	23277 - 11904: 0xE171,
-	23278 - 11904: 0xE16C,
-	23280 - 11904: 0x9EE2,
-	23282 - 11904: 0x8F78,
-	23283 - 11904: 0xE173,
-	23284 - 11904: 0xE555,
-	23285 - 11904: 0xBC61,
-	23286 - 11904: 0xE558,
-	23287 - 11904: 0xE557,
-	23288 - 11904: 0xE55A,
-	23289 - 11904: 0xE55C,
-	23290 - 11904: 0xF9DC,
-	23291 - 11904: 0xBC5F,
-	23293 - 11904: 0xE556,
-	23294 - 11904: 0x9672,
-	23295 - 11904: 0xE554,
-	23297 - 11904: 0xE55D,
-	23298 - 11904: 0xE55B,
-	23299 - 11904: 0xE559,
-	23301 - 11904: 0xE55F,
-	23303 - 11904: 0xE55E,
-	23304 - 11904: 0xBC63,
-	23305 - 11904: 0xBC5E,
-	23307 - 11904: 0xBC60,
-	23308 - 11904: 0xBC62,
-	23309 - 11904: 0x9EB5,
-	23311 - 11904: 0xE560,
-	23312 - 11904: 0xE957,
-	23313 - 11904: 0x964B,
-	23315 - 11904: 0xE956,
-	23316 - 11904: 0xE955,
-	23317 - 11904: 0x8CAC,
-	23318 - 11904: 0xE958,
-	23319 - 11904: 0xE951,
-	23321 - 11904: 0xE952,
-	23322 - 11904: 0xE95A,
-	23323 - 11904: 0xE953,
-	23325 - 11904: 0xBEC5,
-	23326 - 11904: 0xE95C,
-	23327 - 11904: 0xA0FA,
-	23328 - 11904: 0xE95B,
-	23329 - 11904: 0xE954,
-	23331 - 11904: 0xECD1,
-	23332 - 11904: 0xC0A8,
-	23333 - 11904: 0xECCF,
-	23334 - 11904: 0xECD4,
-	23335 - 11904: 0xECD3,
-	23336 - 11904: 0xE959,
-	23338 - 11904: 0xC0A7,
-	23339 - 11904: 0x9575,
-	23340 - 11904: 0xECD2,
-	23341 - 11904: 0xECCE,
-	23342 - 11904: 0xECD6,
-	23343 - 11904: 0xECD5,
-	23344 - 11904: 0xC0A6,
-	23346 - 11904: 0xECD0,
-	23348 - 11904: 0xBEC6,
-	23352 - 11904: 0xC254,
-	23356 - 11904: 0xEFC1,
-	23357 - 11904: 0xF1FA,
-	23358 - 11904: 0xF1FB,
-	23359 - 11904: 0xF1FC,
-	23360 - 11904: 0xC45C,
-	23361 - 11904: 0x90DA,
-	23363 - 11904: 0xC45D,
-	23364 - 11904: 0x9367,
-	23365 - 11904: 0xF443,
-	23366 - 11904: 0xFEA4,
-	23367 - 11904: 0xF5C8,
-	23368 - 11904: 0xF5C7,
-	23370 - 11904: 0x90DF,
-	23371 - 11904: 0xF6DB,
-	23372 - 11904: 0xF6DC,
-	23373 - 11904: 0xF7D5,
-	23374 - 11904: 0xF8A7,
-	23375 - 11904: 0x9354,
-	23376 - 11904: 0xA46C,
-	23377 - 11904: 0xA46D,
-	23379 - 11904: 0xA46E,
-	23380 - 11904: 0xA4D5,
-	23381 - 11904: 0xA5A5,
-	23382 - 11904: 0xC9D3,
-	23383 - 11904: 0xA672,
-	23384 - 11904: 0xA673,
-	23386 - 11904: 0xA7B7,
-	23387 - 11904: 0xA7B8,
-	23388 - 11904: 0xA7B6,
-	23389 - 11904: 0xA7B5,
-	23391 - 11904: 0xA973,
-	23394 - 11904: 0xCC55,
-	23395 - 11904: 0xA975,
-	23396 - 11904: 0xA974,
-	23397 - 11904: 0xCC56,
-	23398 - 11904: 0x8961,
-	23400 - 11904: 0x8BB4,
-	23401 - 11904: 0xABC4,
-	23403 - 11904: 0xAE5D,
-	23404 - 11904: 0xD165,
-	23405 - 11904: 0x9DC0,
-	23406 - 11904: 0xD4F0,
-	23408 - 11904: 0xB145,
-	23409 - 11904: 0xB447,
-	23410 - 11904: 0xD4EF,
-	23411 - 11904: 0xB446,
-	23412 - 11904: 0x8E48,
-	23413 - 11904: 0xB9E5,
-	23414 - 11904: 0xFBC5,
-	23415 - 11904: 0xE17D,
-	23416 - 11904: 0xBEC7,
-	23418 - 11904: 0xC0A9,
-	23419 - 11904: 0xECD7,
-	23420 - 11904: 0xFBC7,
-	23421 - 11904: 0xC45E,
-	23423 - 11904: 0xC570,
-	23424 - 11904: 0xC6CB,
-	23425 - 11904: 0xC972,
-	23426 - 11904: 0xFA79,
-	23427 - 11904: 0xA5A6,
-	23428 - 11904: 0xC973,
-	23429 - 11904: 0xA676,
-	23431 - 11904: 0xA674,
-	23432 - 11904: 0xA675,
-	23433 - 11904: 0xA677,
-	23435 - 11904: 0xA7BA,
-	23436 - 11904: 0xA7B9,
-	23438 - 11904: 0xCABC,
-	23439 - 11904: 0xA7BB,
-	23440 - 11904: 0x9E67,
-	23442 - 11904: 0xCABD,
-	23443 - 11904: 0xCC57,
-	23445 - 11904: 0xCC58,
-	23446 - 11904: 0x8CD9,
-	23447 - 11904: 0xA976,
-	23448 - 11904: 0xA978,
-	23449 - 11904: 0xA97A,
-	23450 - 11904: 0xA977,
-	23451 - 11904: 0xA97B,
-	23452 - 11904: 0xA979,
-	23453 - 11904: 0xFBD2,
-	23454 - 11904: 0x8962,
-	23455 - 11904: 0x8963,
-	23458 - 11904: 0xABC8,
-	23459 - 11904: 0xABC5,
-	23460 - 11904: 0xABC7,
-	23461 - 11904: 0xABC9,
-	23462 - 11904: 0xABC6,
-	23463 - 11904: 0xD166,
-	23464 - 11904: 0xCE77,
-	23466 - 11904: 0xFC7D,
-	23468 - 11904: 0xD168,
-	23469 - 11904: 0xD167,
-	23470 - 11904: 0xAE63,
-	23472 - 11904: 0xAE5F,
-	23475 - 11904: 0xAE60,
-	23476 - 11904: 0xAE62,
-	23477 - 11904: 0xAE64,
-	23478 - 11904: 0xAE61,
-	23479 - 11904: 0x8773,
-	23480 - 11904: 0xAE66,
-	23481 - 11904: 0xAE65,
-	23487 - 11904: 0xB14A,
-	23488 - 11904: 0xD4F2,
-	23489 - 11904: 0xD4F1,
-	23490 - 11904: 0xB149,
-	23491 - 11904: 0x9F6B,
-	23492 - 11904: 0xB148,
-	23493 - 11904: 0xB147,
-	23494 - 11904: 0xB14B,
-	23495 - 11904: 0xB146,
-	23498 - 11904: 0xD8D5,
-	23499 - 11904: 0xD8D2,
-	23500 - 11904: 0xB449,
-	23501 - 11904: 0xD8D1,
-	23502 - 11904: 0xD8D6,
-	23504 - 11904: 0xB44B,
-	23505 - 11904: 0xD8D4,
-	23506 - 11904: 0xB448,
-	23507 - 11904: 0xB44A,
-	23508 - 11904: 0xD8D3,
-	23509 - 11904: 0xFBCC,
-	23510 - 11904: 0xDD48,
-	23511 - 11904: 0xFEAE,
-	23512 - 11904: 0xDD49,
-	23513 - 11904: 0xDD4A,
-	23515 - 11904: 0x876D,
-	23518 - 11904: 0xB9E6,
-	23519 - 11904: 0xB9EE,
-	23520 - 11904: 0xE17E,
-	23521 - 11904: 0xB9E8,
-	23522 - 11904: 0xB9EC,
-	23523 - 11904: 0xE1A1,
-	23524 - 11904: 0xB9ED,
-	23525 - 11904: 0xB9E9,
-	23526 - 11904: 0xB9EA,
-	23527 - 11904: 0xB9E7,
-	23528 - 11904: 0xB9EB,
-	23529 - 11904: 0xBC66,
-	23530 - 11904: 0xD8D0,
-	23531 - 11904: 0xBC67,
-	23532 - 11904: 0xBC65,
-	23534 - 11904: 0xBC64,
-	23535 - 11904: 0xE95D,
-	23536 - 11904: 0xBEC8,
-	23537 - 11904: 0xECD8,
-	23538 - 11904: 0xECD9,
-	23539 - 11904: 0xFBD1,
-	23541 - 11904: 0xC364,
-	23542 - 11904: 0xC45F,
-	23544 - 11904: 0xA46F,
-	23546 - 11904: 0xA678,
-	23551 - 11904: 0xFB75,
-	23553 - 11904: 0xABCA,
-	23555 - 11904: 0xD169,
-	23556 - 11904: 0xAE67,
-	23557 - 11904: 0xFBD4,
-	23559 - 11904: 0xB14E,
-	23560 - 11904: 0xB14D,
-	23561 - 11904: 0xB14C,
-	23562 - 11904: 0xB44C,
-	23563 - 11904: 0xB44D,
-	23564 - 11904: 0xD8D7,
-	23565 - 11904: 0xB9EF,
-	23566 - 11904: 0xBEC9,
-	23567 - 11904: 0xA470,
-	23568 - 11904: 0xC95C,
-	23569 - 11904: 0xA4D6,
-	23570 - 11904: 0xC974,
-	23571 - 11904: 0xFBD6,
-	23572 - 11904: 0xFBD8,
-	23573 - 11904: 0xC9D4,
-	23574 - 11904: 0xA679,
-	23578 - 11904: 0xA97C,
-	23580 - 11904: 0x8B5D,
-	23582 - 11904: 0x934C,
-	23583 - 11904: 0xDD4B,
-	23584 - 11904: 0x9AE2,
-	23586 - 11904: 0xA471,
-	23587 - 11904: 0x8BC9,
-	23588 - 11904: 0xA4D7,
-	23589 - 11904: 0xC9D5,
-	23592 - 11904: 0xCABE,
-	23594 - 11904: 0xCABF,
-	23596 - 11904: 0xA7BC,
-	23600 - 11904: 0xD8D8,
-	23601 - 11904: 0xB44E,
-	23603 - 11904: 0xDD4C,
-	23607 - 11904: 0xC0AA,
-	23608 - 11904: 0xA472,
-	23609 - 11904: 0xA4A8,
-	23610 - 11904: 0xA4D8,
-	23611 - 11904: 0xC975,
-	23612 - 11904: 0xA5A7,
-	23614 - 11904: 0xA7C0,
-	23615 - 11904: 0xA7BF,
-	23616 - 11904: 0xA7BD,
-	23617 - 11904: 0xA7BE,
-	23620 - 11904: 0xCC59,
-	23621 - 11904: 0xA97E,
-	23622 - 11904: 0xA9A1,
-	23623 - 11904: 0xCC5A,
-	23624 - 11904: 0xA97D,
-	23625 - 11904: 0xFBDB,
-	23626 - 11904: 0x9FC9,
-	23627 - 11904: 0xABCE,
-	23628 - 11904: 0xCE78,
-	23629 - 11904: 0xABCD,
-	23630 - 11904: 0xABCB,
-	23631 - 11904: 0xABCC,
-	23632 - 11904: 0xAE6A,
-	23633 - 11904: 0xAE68,
-	23635 - 11904: 0x9F44,
-	23636 - 11904: 0xD16B,
-	23637 - 11904: 0xAE69,
-	23638 - 11904: 0xD16A,
-	23640 - 11904: 0xAE5E,
-	23641 - 11904: 0xD4F3,
-	23644 - 11904: 0xB150,
-	23645 - 11904: 0xB151,
-	23646 - 11904: 0x98ED,
-	23648 - 11904: 0xB14F,
-	23650 - 11904: 0xB9F0,
-	23651 - 11904: 0xE1A2,
-	23652 - 11904: 0xBC68,
-	23653 - 11904: 0xBC69,
-	23655 - 11904: 0xE561,
-	23656 - 11904: 0xC0AB,
-	23657 - 11904: 0xEFC2,
-	23658 - 11904: 0xEFC3,
-	23660 - 11904: 0xC4DD,
-	23661 - 11904: 0xF8A8,
-	23662 - 11904: 0xC94B,
-	23663 - 11904: 0xA4D9,
-	23665 - 11904: 0xA473,
-	23667 - 11904: 0xC977,
-	23668 - 11904: 0xC976,
-	23672 - 11904: 0x8CE9,
-	23673 - 11904: 0xA67A,
-	23674 - 11904: 0xC9D7,
-	23675 - 11904: 0xC9D8,
-	23676 - 11904: 0xC9D6,
-	23678 - 11904: 0xC9D9,
-	23685 - 11904: 0xFBDD,
-	23686 - 11904: 0xCAC7,
-	23688 - 11904: 0xCAC2,
-	23689 - 11904: 0xCAC4,
-	23690 - 11904: 0xCAC6,
-	23691 - 11904: 0xCAC3,
-	23692 - 11904: 0xA7C4,
-	23693 - 11904: 0xCAC0,
-	23695 - 11904: 0xCAC1,
-	23696 - 11904: 0xA7C1,
-	23697 - 11904: 0xA7C2,
-	23698 - 11904: 0xCAC5,
-	23699 - 11904: 0xCAC8,
-	23700 - 11904: 0xA7C3,
-	23701 - 11904: 0xCAC9,
-	23705 - 11904: 0x8DF2,
-	23706 - 11904: 0x8964,
-	23708 - 11904: 0xFDF2,
-	23709 - 11904: 0xCC68,
-	23710 - 11904: 0x934D,
-	23711 - 11904: 0xCC62,
-	23712 - 11904: 0xCC5D,
-	23713 - 11904: 0xA9A3,
-	23714 - 11904: 0xCC65,
-	23715 - 11904: 0xCC63,
-	23716 - 11904: 0xCC5C,
-	23717 - 11904: 0xCC69,
-	23718 - 11904: 0xCC6C,
-	23719 - 11904: 0xCC67,
-	23720 - 11904: 0xCC60,
-	23721 - 11904: 0xA9A5,
-	23722 - 11904: 0xCC66,
-	23723 - 11904: 0xA9A6,
-	23724 - 11904: 0xCC61,
-	23725 - 11904: 0xCC64,
-	23726 - 11904: 0xCC5B,
-	23727 - 11904: 0xCC5F,
-	23728 - 11904: 0xCC6B,
-	23729 - 11904: 0xA9A7,
-	23731 - 11904: 0xA9A8,
-	23733 - 11904: 0xCC5E,
-	23734 - 11904: 0xCC6A,
-	23735 - 11904: 0xA9A2,
-	23736 - 11904: 0xA9A4,
-	23738 - 11904: 0xFBE7,
-	23745 - 11904: 0xA0F2,
-	23746 - 11904: 0x9868,
-	23750 - 11904: 0xCEAB,
-	23751 - 11904: 0xCEA4,
-	23752 - 11904: 0xCEAA,
-	23753 - 11904: 0xCEA3,
-	23754 - 11904: 0xCEA5,
-	23755 - 11904: 0xCE7D,
-	23756 - 11904: 0xCE7B,
-	23758 - 11904: 0xCEAC,
-	23759 - 11904: 0xCEA9,
-	23760 - 11904: 0xCE79,
-	23761 - 11904: 0x9F58,
-	23762 - 11904: 0xABD0,
-	23763 - 11904: 0xCEA7,
-	23764 - 11904: 0xCEA8,
-	23765 - 11904: 0x8CE6,
-	23766 - 11904: 0xCEA6,
-	23767 - 11904: 0xCE7C,
-	23768 - 11904: 0xCE7A,
-	23769 - 11904: 0xABCF,
-	23770 - 11904: 0xCEA2,
-	23771 - 11904: 0xCE7E,
-	23774 - 11904: 0xCEA1,
-	23775 - 11904: 0xCEAD,
-	23781 - 11904: 0x8D73,
-	23784 - 11904: 0xAE6F,
-	23785 - 11904: 0xFBDE,
-	23786 - 11904: 0xAE6E,
-	23788 - 11904: 0xD16C,
-	23789 - 11904: 0xAE6B,
-	23790 - 11904: 0xD16E,
-	23791 - 11904: 0xFBDF,
-	23792 - 11904: 0xAE70,
-	23793 - 11904: 0xD16F,
-	23796 - 11904: 0xAE73,
-	23797 - 11904: 0x8C48,
-	23798 - 11904: 0xAE71,
-	23799 - 11904: 0xD170,
-	23800 - 11904: 0xCEAE,
-	23801 - 11904: 0xD172,
-	23803 - 11904: 0xAE6D,
-	23804 - 11904: 0x8774,
-	23805 - 11904: 0xAE6C,
-	23807 - 11904: 0xD16D,
-	23808 - 11904: 0xD171,
-	23809 - 11904: 0xAE72,
-	23814 - 11904: 0xB153,
-	23815 - 11904: 0xB152,
-	23819 - 11904: 0xD4F5,
-	23820 - 11904: 0xD4F9,
-	23821 - 11904: 0xD4FB,
-	23822 - 11904: 0xB154,
-	23823 - 11904: 0xD4FE,
-	23824 - 11904: 0xFBE3,
-	23825 - 11904: 0xB158,
-	23826 - 11904: 0xD541,
-	23828 - 11904: 0xB15A,
-	23829 - 11904: 0x8DA8,
-	23830 - 11904: 0xB156,
-	23831 - 11904: 0xB15E,
-	23832 - 11904: 0xFBE4,
-	23833 - 11904: 0xB15B,
-	23834 - 11904: 0xD4F7,
-	23835 - 11904: 0xB155,
-	23837 - 11904: 0xD4F6,
-	23838 - 11904: 0xD4F4,
-	23839 - 11904: 0xD543,
-	23840 - 11904: 0xD4F8,
-	23842 - 11904: 0xB157,
-	23843 - 11904: 0xD542,
-	23844 - 11904: 0xB15C,
-	23845 - 11904: 0xD4FD,
-	23846 - 11904: 0xD4FC,
-	23847 - 11904: 0xB15D,
-	23848 - 11904: 0xD4FA,
-	23849 - 11904: 0xB159,
-	23852 - 11904: 0x9C75,
-	23854 - 11904: 0xD544,
-	23855 - 11904: 0x9878,
-	23856 - 11904: 0xD540,
-	23857 - 11904: 0xD8E7,
-	23858 - 11904: 0xD8EE,
-	23859 - 11904: 0xD8E3,
-	23860 - 11904: 0xB451,
-	23861 - 11904: 0xD8DF,
-	23862 - 11904: 0xD8EF,
-	23863 - 11904: 0xD8D9,
-	23864 - 11904: 0xD8EC,
-	23865 - 11904: 0xD8EA,
-	23866 - 11904: 0xD8E4,
-	23868 - 11904: 0xD8ED,
-	23869 - 11904: 0xD8E6,
-	23870 - 11904: 0x8D60,
-	23871 - 11904: 0xD8DE,
-	23872 - 11904: 0xD8F0,
-	23873 - 11904: 0xD8DC,
-	23874 - 11904: 0xD8E9,
-	23875 - 11904: 0xD8DA,
-	23877 - 11904: 0xD8F1,
-	23878 - 11904: 0xFBE5,
-	23879 - 11904: 0xB452,
-	23880 - 11904: 0x8D61,
-	23881 - 11904: 0xD8EB,
-	23882 - 11904: 0xDD4F,
-	23883 - 11904: 0xD8DD,
-	23884 - 11904: 0xB44F,
-	23886 - 11904: 0xD8E1,
-	23888 - 11904: 0xB450,
-	23889 - 11904: 0xD8E0,
-	23890 - 11904: 0xD8E5,
-	23893 - 11904: 0xD8E2,
-	23894 - 11904: 0x8D62,
-	23895 - 11904: 0xA0A1,
-	23897 - 11904: 0xD8E8,
-	23899 - 11904: 0x9C40,
-	23902 - 11904: 0xDD53,
-	23906 - 11904: 0xDD56,
-	23907 - 11904: 0xDD4E,
-	23909 - 11904: 0xDD50,
-	23911 - 11904: 0xDD55,
-	23912 - 11904: 0xDD54,
-	23913 - 11904: 0xB743,
-	23915 - 11904: 0xD8DB,
-	23916 - 11904: 0xDD52,
-	23919 - 11904: 0xB744,
-	23920 - 11904: 0x98AD,
-	23921 - 11904: 0xDD4D,
-	23922 - 11904: 0xDD51,
-	23924 - 11904: 0x9EEA,
-	23927 - 11904: 0xE1A9,
-	23928 - 11904: 0x8CEC,
-	23929 - 11904: 0xE1B0,
-	23930 - 11904: 0xE1A7,
-	23931 - 11904: 0x8CD4,
-	23932 - 11904: 0xE1AE,
-	23933 - 11904: 0xE1A5,
-	23934 - 11904: 0xE1AD,
-	23935 - 11904: 0xE1B1,
-	23936 - 11904: 0xE1A4,
-	23937 - 11904: 0xE1A8,
-	23938 - 11904: 0xE1A3,
-	23940 - 11904: 0xB9F1,
-	23941 - 11904: 0x9CEB,
-	23942 - 11904: 0xE1A6,
-	23943 - 11904: 0xB9F2,
-	23944 - 11904: 0xE1AC,
-	23945 - 11904: 0xE1AB,
-	23946 - 11904: 0xE1AA,
-	23947 - 11904: 0xFBE0,
-	23949 - 11904: 0xE1AF,
-	23950 - 11904: 0x9F51,
-	23954 - 11904: 0xE565,
-	23955 - 11904: 0xE567,
-	23956 - 11904: 0xBC6B,
-	23957 - 11904: 0xE568,
-	23959 - 11904: 0xE563,
-	23961 - 11904: 0xE562,
-	23962 - 11904: 0xE56C,
-	23964 - 11904: 0xE56A,
-	23965 - 11904: 0xBC6A,
-	23966 - 11904: 0xE56D,
-	23967 - 11904: 0xE564,
-	23968 - 11904: 0xE569,
-	23969 - 11904: 0xE56B,
-	23970 - 11904: 0xE566,
-	23972 - 11904: 0x8D65,
-	23975 - 11904: 0xE961,
-	23976 - 11904: 0xE966,
-	23977 - 11904: 0xE960,
-	23978 - 11904: 0xE965,
-	23979 - 11904: 0x9CF1,
-	23980 - 11904: 0xE95E,
-	23981 - 11904: 0xE968,
-	23982 - 11904: 0xE964,
-	23983 - 11904: 0xE969,
-	23984 - 11904: 0xE963,
-	23985 - 11904: 0xE95F,
-	23986 - 11904: 0xE967,
-	23988 - 11904: 0xE96A,
-	23989 - 11904: 0xE962,
-	23990 - 11904: 0xFC58,
-	23991 - 11904: 0xECDA,
-	23992 - 11904: 0xC0AF,
-	23993 - 11904: 0x8D66,
-	23994 - 11904: 0xC0AD,
-	23996 - 11904: 0xC0AC,
-	23997 - 11904: 0xC0AE,
-	24000 - 11904: 0xEFC4,
-	24001 - 11904: 0x9654,
-	24002 - 11904: 0xF172,
-	24003 - 11904: 0xF1FD,
-	24006 - 11904: 0xF444,
-	24007 - 11904: 0xF445,
-	24009 - 11904: 0xC460,
-	24011 - 11904: 0xF5C9,
-	24013 - 11904: 0xC4DE,
-	24015 - 11904: 0xF5CA,
-	24017 - 11904: 0xF6DE,
-	24018 - 11904: 0xC572,
-	24020 - 11904: 0xC571,
-	24021 - 11904: 0xF6DD,
-	24022 - 11904: 0xC5C9,
-	24023 - 11904: 0xFBE8,
-	24024 - 11904: 0xF7D6,
-	24027 - 11904: 0xC6CC,
-	24029 - 11904: 0xA474,
-	24030 - 11904: 0xA67B,
-	24031 - 11904: 0xC9DA,
-	24032 - 11904: 0xCACA,
-	24033 - 11904: 0xA8B5,
-	24034 - 11904: 0xB15F,
-	24037 - 11904: 0xA475,
-	24038 - 11904: 0xA5AA,
-	24039 - 11904: 0xA5A9,
-	24040 - 11904: 0xA5A8,
-	24043 - 11904: 0xA7C5,
-	24046 - 11904: 0xAE74,
-	24048 - 11904: 0xDD57,
-	24049 - 11904: 0xA476,
-	24050 - 11904: 0xA477,
-	24051 - 11904: 0xA478,
-	24052 - 11904: 0xA4DA,
-	24053 - 11904: 0x9FCE,
-	24055 - 11904: 0xABD1,
-	24057 - 11904: 0xCEAF,
-	24061 - 11904: 0xB453,
-	24062 - 11904: 0xA479,
-	24063 - 11904: 0xC95D,
-	24066 - 11904: 0xA5AB,
-	24067 - 11904: 0xA5AC,
-	24068 - 11904: 0xC978,
-	24070 - 11904: 0xA67C,
-	24073 - 11904: 0xFBFC,
-	24074 - 11904: 0xCACB,
-	24075 - 11904: 0x9AE4,
-	24076 - 11904: 0xA7C6,
-	24078 - 11904: 0xCACC,
-	24081 - 11904: 0xA9AE,
-	24082 - 11904: 0x9F75,
-	24084 - 11904: 0xCC6E,
-	24085 - 11904: 0xA9AC,
-	24086 - 11904: 0xA9AB,
-	24087 - 11904: 0xCC6D,
-	24088 - 11904: 0xA9A9,
-	24089 - 11904: 0xCC6F,
-	24090 - 11904: 0xA9AA,
-	24091 - 11904: 0xA9AD,
-	24093 - 11904: 0xABD2,
-	24095 - 11904: 0xABD4,
-	24096 - 11904: 0xCEB3,
-	24097 - 11904: 0xCEB0,
-	24098 - 11904: 0xCEB1,
-	24099 - 11904: 0xCEB2,
-	24100 - 11904: 0xCEB4,
-	24101 - 11904: 0xABD3,
-	24104 - 11904: 0xD174,
-	24105 - 11904: 0xD173,
-	24107 - 11904: 0xAE76,
-	24109 - 11904: 0xAE75,
-	24110 - 11904: 0xFBF1,
-	24115 - 11904: 0xB162,
-	24116 - 11904: 0xD546,
-	24118 - 11904: 0xB161,
-	24119 - 11904: 0xB163,
-	24120 - 11904: 0xB160,
-	24125 - 11904: 0xB455,
-	24126 - 11904: 0xD545,
-	24128 - 11904: 0xB456,
-	24129 - 11904: 0xD8F3,
-	24130 - 11904: 0x8D69,
-	24131 - 11904: 0xB457,
-	24132 - 11904: 0xD8F2,
-	24133 - 11904: 0xB454,
-	24136 - 11904: 0x934F,
-	24138 - 11904: 0xDD5A,
-	24139 - 11904: 0xDD5C,
-	24140 - 11904: 0xB745,
-	24141 - 11904: 0xDD5B,
-	24142 - 11904: 0xDD59,
-	24143 - 11904: 0xDD58,
-	24147 - 11904: 0xE1B4,
-	24148 - 11904: 0xB9F7,
-	24149 - 11904: 0xB9F5,
-	24151 - 11904: 0xB9F6,
-	24152 - 11904: 0xE1B2,
-	24153 - 11904: 0xE1B3,
-	24155 - 11904: 0xB9F3,
-	24156 - 11904: 0xE571,
-	24157 - 11904: 0xE56F,
-	24158 - 11904: 0x934E,
-	24159 - 11904: 0xBC6D,
-	24160 - 11904: 0xE570,
-	24161 - 11904: 0xBC6E,
-	24162 - 11904: 0xBC6C,
-	24163 - 11904: 0xB9F4,
-	24166 - 11904: 0xE96D,
-	24167 - 11904: 0xE96B,
-	24168 - 11904: 0xE96C,
-	24169 - 11904: 0xE56E,
-	24170 - 11904: 0xECDC,
-	24171 - 11904: 0xC0B0,
-	24172 - 11904: 0xECDB,
-	24173 - 11904: 0xEFC5,
-	24174 - 11904: 0xEFC6,
-	24175 - 11904: 0xE96E,
-	24176 - 11904: 0xF1FE,
-	24178 - 11904: 0xA47A,
-	24179 - 11904: 0xA5AD,
-	24180 - 11904: 0xA67E,
-	24181 - 11904: 0xFBF3,
-	24182 - 11904: 0xA67D,
-	24184 - 11904: 0xA9AF,
-	24185 - 11904: 0xB746,
-	24186 - 11904: 0xFBF4,
-	24187 - 11904: 0xA4DB,
-	24188 - 11904: 0xA5AE,
-	24189 - 11904: 0xABD5,
-	24190 - 11904: 0xB458,
-	24191 - 11904: 0xC6CE,
-	24192 - 11904: 0xC979,
-	24194 - 11904: 0xC97A,
-	24195 - 11904: 0xFBC3,
-	24196 - 11904: 0xC9DC,
-	24198 - 11904: 0x8965,
-	24199 - 11904: 0xA7C8,
-	24200 - 11904: 0xCAD0,
-	24201 - 11904: 0xCACE,
-	24202 - 11904: 0xA7C9,
-	24203 - 11904: 0xCACD,
-	24204 - 11904: 0xCACF,
-	24205 - 11904: 0xCAD1,
-	24207 - 11904: 0xA7C7,
-	24210 - 11904: 0x8C7A,
-	24213 - 11904: 0xA9B3,
-	24214 - 11904: 0xA9B4,
-	24215 - 11904: 0xA9B1,
-	24217 - 11904: 0x8C7B,
-	24218 - 11904: 0xA9B0,
-	24219 - 11904: 0xCEB8,
-	24220 - 11904: 0xA9B2,
-	24224 - 11904: 0xABD6,
-	24226 - 11904: 0xCEB7,
-	24227 - 11904: 0xCEB9,
-	24228 - 11904: 0xCEB6,
-	24229 - 11904: 0xCEBA,
-	24230 - 11904: 0xABD7,
-	24231 - 11904: 0xAE79,
-	24232 - 11904: 0xD175,
-	24234 - 11904: 0xD177,
-	24235 - 11904: 0xAE77,
-	24236 - 11904: 0xD178,
-	24237 - 11904: 0xAE78,
-	24238 - 11904: 0xD176,
-	24240 - 11904: 0xCEB5,
-	24241 - 11904: 0xD547,
-	24242 - 11904: 0xD54A,
-	24243 - 11904: 0xD54B,
-	24244 - 11904: 0xD548,
-	24245 - 11904: 0xB167,
-	24246 - 11904: 0xB166,
-	24247 - 11904: 0xB164,
-	24248 - 11904: 0xB165,
-	24249 - 11904: 0xD549,
-	24253 - 11904: 0x8D6A,
-	24254 - 11904: 0xB168,
-	24257 - 11904: 0xB45A,
-	24258 - 11904: 0xB45B,
-	24260 - 11904: 0xB45C,
-	24261 - 11904: 0xDD5D,
-	24262 - 11904: 0xDD5F,
-	24263 - 11904: 0xDD61,
-	24264 - 11904: 0xB748,
-	24265 - 11904: 0xB747,
-	24266 - 11904: 0xB459,
-	24267 - 11904: 0xDD60,
-	24268 - 11904: 0xDD5E,
-	24269 - 11904: 0x9353,
-	24270 - 11904: 0xE1B8,
-	24272 - 11904: 0xFBF9,
-	24273 - 11904: 0xE1B6,
-	24274 - 11904: 0xE1BC,
-	24275 - 11904: 0xB9F8,
-	24276 - 11904: 0xE1BD,
-	24277 - 11904: 0xE1BA,
-	24278 - 11904: 0xB9F9,
-	24279 - 11904: 0xE1B7,
-	24280 - 11904: 0xE1B5,
-	24281 - 11904: 0xE1BB,
-	24282 - 11904: 0xBC70,
-	24283 - 11904: 0xE573,
-	24284 - 11904: 0xE1B9,
-	24285 - 11904: 0xBC72,
-	24286 - 11904: 0xE574,
-	24287 - 11904: 0xBC71,
-	24288 - 11904: 0xBC74,
-	24289 - 11904: 0xE575,
-	24290 - 11904: 0xBC6F,
-	24291 - 11904: 0xBC73,
-	24293 - 11904: 0xE973,
-	24294 - 11904: 0xE971,
-	24295 - 11904: 0xE970,
-	24296 - 11904: 0xE972,
-	24297 - 11904: 0xE96F,
-	24300 - 11904: 0xC366,
-	24302 - 11904: 0xF446,
-	24303 - 11904: 0xF447,
-	24305 - 11904: 0xF5CB,
-	24306 - 11904: 0xF6DF,
-	24307 - 11904: 0xC655,
-	24308 - 11904: 0xFBFD,
-	24310 - 11904: 0xA9B5,
-	24311 - 11904: 0xA7CA,
-	24312 - 11904: 0x9059,
-	24313 - 11904: 0xFC40,
-	24314 - 11904: 0xABD8,
-	24315 - 11904: 0xFC41,
-	24316 - 11904: 0xFC43,
-	24318 - 11904: 0xA47B,
-	24319 - 11904: 0xA4DC,
-	24321 - 11904: 0xA5AF,
-	24322 - 11904: 0xC9DD,
-	24324 - 11904: 0xA7CB,
-	24325 - 11904: 0xCAD2,
-	24327 - 11904: 0xCEBB,
-	24328 - 11904: 0xABD9,
-	24330 - 11904: 0xB9FA,
-	24331 - 11904: 0xA47C,
-	24332 - 11904: 0x9FD8,
-	24333 - 11904: 0xFC46,
-	24334 - 11904: 0x9362,
-	24335 - 11904: 0xA6A1,
-	24338 - 11904: 0xB749,
-	24339 - 11904: 0xA47D,
-	24340 - 11904: 0xA4DD,
-	24341 - 11904: 0xA4DE,
-	24343 - 11904: 0xA5B1,
-	24344 - 11904: 0xA5B0,
-	24346 - 11904: 0xC9DE,
-	24347 - 11904: 0xA6A2,
-	24349 - 11904: 0xCAD3,
-	24351 - 11904: 0xA7CC,
-	24354 - 11904: 0xCC71,
-	24355 - 11904: 0xCC72,
-	24356 - 11904: 0xCC73,
-	24357 - 11904: 0x8D6B,
-	24358 - 11904: 0xA9B6,
-	24359 - 11904: 0xA9B7,
-	24360 - 11904: 0xCC70,
-	24361 - 11904: 0xA9B8,
-	24365 - 11904: 0xABDA,
-	24366 - 11904: 0xCEBC,
-	24368 - 11904: 0xD17A,
-	24369 - 11904: 0xAE7A,
-	24371 - 11904: 0xD179,
-	24373 - 11904: 0xB169,
-	24374 - 11904: 0xD54C,
-	24375 - 11904: 0xB16A,
-	24376 - 11904: 0xD54D,
-	24378 - 11904: 0xFC4C,
-	24379 - 11904: 0x8CFE,
-	24380 - 11904: 0xB45D,
-	24384 - 11904: 0xDD62,
-	24387 - 11904: 0xE1BF,
-	24388 - 11904: 0xE1BE,
-	24390 - 11904: 0xB9FB,
-	24392 - 11904: 0xBC75,
-	24393 - 11904: 0xE576,
-	24394 - 11904: 0xBECA,
-	24395 - 11904: 0xE974,
-	24396 - 11904: 0xC0B1,
-	24397 - 11904: 0x95B8,
-	24398 - 11904: 0xC573,
-	24399 - 11904: 0xF7D8,
-	24400 - 11904: 0xC6D0,
-	24401 - 11904: 0x8BCA,
-	24404 - 11904: 0xCC74,
-	24406 - 11904: 0xCEBD,
-	24407 - 11904: 0xB16B,
-	24408 - 11904: 0xFC4F,
-	24409 - 11904: 0xB74A,
-	24412 - 11904: 0x987A,
-	24413 - 11904: 0xC255,
-	24417 - 11904: 0xC6D1,
-	24418 - 11904: 0xA7CE,
-	24419 - 11904: 0xFC51,
-	24420 - 11904: 0xA7CD,
-	24421 - 11904: 0xABDB,
-	24423 - 11904: 0xD17B,
-	24425 - 11904: 0xB16D,
-	24426 - 11904: 0xB343,
-	24427 - 11904: 0xB16E,
-	24428 - 11904: 0xB16C,
-	24429 - 11904: 0xB45E,
-	24431 - 11904: 0xE1C0,
-	24432 - 11904: 0xB9FC,
-	24433 - 11904: 0xBC76,
-	24434 - 11904: 0xFC54,
-	24435 - 11904: 0xC94C,
-	24436 - 11904: 0xC9DF,
-	24438 - 11904: 0xCAD5,
-	24439 - 11904: 0xA7CF,
-	24440 - 11904: 0xCAD4,
-	24441 - 11904: 0xA7D0,
-	24443 - 11904: 0xFAAF,
-	24444 - 11904: 0xA9BC,
-	24445 - 11904: 0xCC77,
-	24446 - 11904: 0xCC76,
-	24447 - 11904: 0xA9BB,
-	24448 - 11904: 0xA9B9,
-	24449 - 11904: 0xA9BA,
-	24450 - 11904: 0xCC75,
-	24451 - 11904: 0x8D6C,
-	24453 - 11904: 0xABDD,
-	24454 - 11904: 0xCEBE,
-	24455 - 11904: 0xABE0,
-	24456 - 11904: 0xABDC,
-	24457 - 11904: 0xABE2,
-	24458 - 11904: 0xABDE,
-	24459 - 11904: 0xABDF,
-	24460 - 11904: 0xABE1,
-	24464 - 11904: 0xAE7D,
-	24465 - 11904: 0xAE7C,
-	24466 - 11904: 0xAE7B,
-	24470 - 11904: 0xD54F,
-	24471 - 11904: 0xB16F,
-	24472 - 11904: 0xB172,
-	24473 - 11904: 0xB170,
-	24475 - 11904: 0xD54E,
-	24476 - 11904: 0xB175,
-	24478 - 11904: 0xB171,
-	24479 - 11904: 0xD550,
-	24480 - 11904: 0xB174,
-	24481 - 11904: 0xB173,
-	24484 - 11904: 0xFA61,
-	24485 - 11904: 0xD8F6,
-	24486 - 11904: 0xD8F5,
-	24487 - 11904: 0xFC57,
-	24488 - 11904: 0xB461,
-	24489 - 11904: 0xB45F,
-	24490 - 11904: 0xB460,
-	24491 - 11904: 0xD8F7,
-	24492 - 11904: 0xB74B,
-	24493 - 11904: 0xDD64,
-	24494 - 11904: 0xB74C,
-	24495 - 11904: 0xDD63,
-	24497 - 11904: 0x9B70,
-	24498 - 11904: 0xE577,
-	24501 - 11904: 0xBC78,
-	24502 - 11904: 0xE1C1,
-	24503 - 11904: 0xBC77,
-	24505 - 11904: 0xB9FD,
-	24506 - 11904: 0xA051,
-	24507 - 11904: 0xECDE,
-	24508 - 11904: 0xE975,
-	24509 - 11904: 0xC0B2,
-	24510 - 11904: 0xECDD,
-	24511 - 11904: 0xF240,
-	24512 - 11904: 0xF448,
-	24513 - 11904: 0xF449,
-	24514 - 11904: 0x8C7C,
-	24515 - 11904: 0xA4DF,
-	24516 - 11904: 0x8BCB,
-	24517 - 11904: 0xA5B2,
-	24521 - 11904: 0xC97B,
-	24524 - 11904: 0xA7D2,
-	24525 - 11904: 0xA7D4,
-	24527 - 11904: 0xC9E2,
-	24528 - 11904: 0xCAD8,
-	24529 - 11904: 0xCAD7,
-	24530 - 11904: 0xCAD6,
-	24532 - 11904: 0xC9E1,
-	24533 - 11904: 0xC9E0,
-	24534 - 11904: 0xA6A4,
-	24535 - 11904: 0xA7D3,
-	24536 - 11904: 0xA7D1,
-	24537 - 11904: 0xA6A3,
-	24539 - 11904: 0x936E,
-	24541 - 11904: 0xA9BD,
-	24542 - 11904: 0xCC78,
-	24543 - 11904: 0xFCD5,
-	24544 - 11904: 0xA9BE,
-	24545 - 11904: 0xCADD,
-	24547 - 11904: 0xCADF,
-	24548 - 11904: 0xCADE,
-	24549 - 11904: 0xCC79,
-	24552 - 11904: 0xCADA,
-	24554 - 11904: 0xA7D8,
-	24555 - 11904: 0xA7D6,
-	24557 - 11904: 0xCAD9,
-	24558 - 11904: 0xCADB,
-	24559 - 11904: 0xCAE1,
-	24561 - 11904: 0xA7D5,
-	24563 - 11904: 0xCADC,
-	24564 - 11904: 0xCAE5,
-	24565 - 11904: 0xA9C0,
-	24567 - 11904: 0xCAE2,
-	24568 - 11904: 0xA7D7,
-	24570 - 11904: 0xCAE0,
-	24571 - 11904: 0xCAE3,
-	24573 - 11904: 0xA9BF,
-	24575 - 11904: 0xA9C1,
-	24576 - 11904: 0xCAE4,
-	24585 - 11904: 0xCCAF,
-	24586 - 11904: 0xCCA2,
-	24587 - 11904: 0xCC7E,
-	24588 - 11904: 0xCCAE,
-	24589 - 11904: 0xCCA9,
-	24590 - 11904: 0xABE7,
-	24591 - 11904: 0xA9C2,
-	24592 - 11904: 0xCCAA,
-	24593 - 11904: 0xCCAD,
-	24594 - 11904: 0xABE3,
-	24595 - 11904: 0xCCAC,
-	24596 - 11904: 0xA9C3,
-	24597 - 11904: 0xA9C8,
-	24598 - 11904: 0xA9C6,
-	24599 - 11904: 0xCCA3,
-	24601 - 11904: 0xCC7C,
-	24602 - 11904: 0xCCA5,
-	24603 - 11904: 0xA9CD,
-	24604 - 11904: 0xCCB0,
-	24605 - 11904: 0xABE4,
-	24606 - 11904: 0xCCA6,
-	24608 - 11904: 0xABE5,
-	24609 - 11904: 0xA9C9,
-	24610 - 11904: 0xCCA8,
-	24611 - 11904: 0xFCA9,
-	24612 - 11904: 0xCECD,
-	24613 - 11904: 0xABE6,
-	24614 - 11904: 0xCC7B,
-	24615 - 11904: 0xA9CA,
-	24616 - 11904: 0xABE8,
-	24617 - 11904: 0xA9CB,
-	24618 - 11904: 0xA9C7,
-	24619 - 11904: 0xA9CC,
-	24620 - 11904: 0xCCA7,
-	24621 - 11904: 0xCC7A,
-	24622 - 11904: 0xCCAB,
-	24623 - 11904: 0xA9C4,
-	24625 - 11904: 0xFC61,
-	24626 - 11904: 0xCC7D,
-	24627 - 11904: 0xCCA4,
-	24628 - 11904: 0xCCA1,
-	24629 - 11904: 0xA9C5,
-	24631 - 11904: 0xCEBF,
-	24633 - 11904: 0xCEC0,
-	24635 - 11904: 0x8966,
-	24640 - 11904: 0xCECA,
-	24641 - 11904: 0xD1A1,
-	24642 - 11904: 0xCECB,
-	24643 - 11904: 0xABEE,
-	24644 - 11904: 0xCECE,
-	24645 - 11904: 0xCEC4,
-	24646 - 11904: 0xABED,
-	24647 - 11904: 0xCEC6,
-	24649 - 11904: 0xCEC7,
-	24650 - 11904: 0xFACB,
-	24652 - 11904: 0xCEC9,
-	24653 - 11904: 0xABE9,
-	24656 - 11904: 0xAEA3,
-	24658 - 11904: 0xF9DA,
-	24659 - 11904: 0xCEC5,
-	24660 - 11904: 0xCEC1,
-	24661 - 11904: 0xAEA4,
-	24664 - 11904: 0xCECF,
-	24665 - 11904: 0xAE7E,
-	24666 - 11904: 0xD17D,
-	24667 - 11904: 0xCEC8,
-	24669 - 11904: 0xD17C,
-	24670 - 11904: 0xCEC3,
-	24671 - 11904: 0xCECC,
-	24674 - 11904: 0xABEC,
-	24675 - 11904: 0xAEA1,
-	24676 - 11904: 0xABF2,
-	24677 - 11904: 0xAEA2,
-	24678 - 11904: 0xCED0,
-	24679 - 11904: 0xD17E,
-	24680 - 11904: 0xABEB,
-	24681 - 11904: 0xAEA6,
-	24682 - 11904: 0xABF1,
-	24683 - 11904: 0xABF0,
-	24684 - 11904: 0xABEF,
-	24685 - 11904: 0xAEA5,
-	24686 - 11904: 0xCED1,
-	24687 - 11904: 0xAEA7,
-	24688 - 11904: 0xABEA,
-	24690 - 11904: 0xCEC2,
-	24693 - 11904: 0x937A,
-	24695 - 11904: 0xA0E0,
-	24702 - 11904: 0x936B,
-	24703 - 11904: 0xB176,
-	24704 - 11904: 0xD1A4,
-	24705 - 11904: 0xD1A6,
-	24707 - 11904: 0xD1A8,
-	24708 - 11904: 0xAEA8,
-	24709 - 11904: 0xAEAE,
-	24710 - 11904: 0xD553,
-	24711 - 11904: 0xD1AC,
-	24712 - 11904: 0xD1A3,
-	24713 - 11904: 0xB178,
-	24714 - 11904: 0xD551,
-	24716 - 11904: 0xAEAD,
-	24717 - 11904: 0xAEAB,
-	24718 - 11904: 0xD1AE,
-	24720 - 11904: 0xD552,
-	24722 - 11904: 0xD1A5,
-	24724 - 11904: 0xAEAC,
-	24725 - 11904: 0xD1A9,
-	24726 - 11904: 0xAEAF,
-	24727 - 11904: 0xD1AB,
-	24730 - 11904: 0xAEAA,
-	24731 - 11904: 0xD1AA,
-	24732 - 11904: 0xD1AD,
-	24733 - 11904: 0xD1A7,
-	24734 - 11904: 0xFC6B,
-	24735 - 11904: 0xAEA9,
-	24736 - 11904: 0xB179,
-	24738 - 11904: 0xD1A2,
-	24739 - 11904: 0xB177,
-	24740 - 11904: 0xFC6C,
-	24743 - 11904: 0x9468,
-	24744 - 11904: 0xB17A,
-	24752 - 11904: 0xD555,
-	24753 - 11904: 0xD55E,
-	24754 - 11904: 0xB464,
-	24755 - 11904: 0xFC6D,
-	24756 - 11904: 0xB17C,
-	24757 - 11904: 0xB1A3,
-	24758 - 11904: 0xB465,
-	24759 - 11904: 0xD560,
-	24760 - 11904: 0xB1AA,
-	24761 - 11904: 0xD8F9,
-	24762 - 11904: 0xD556,
-	24763 - 11904: 0xB1A2,
-	24764 - 11904: 0xB1A5,
-	24765 - 11904: 0xB17E,
-	24766 - 11904: 0xD554,
-	24767 - 11904: 0xD562,
-	24768 - 11904: 0xD565,
-	24769 - 11904: 0xD949,
-	24771 - 11904: 0xD563,
-	24772 - 11904: 0xD8FD,
-	24773 - 11904: 0xB1A1,
-	24774 - 11904: 0xB1A8,
-	24775 - 11904: 0xB1AC,
-	24776 - 11904: 0xD55D,
-	24777 - 11904: 0xD8F8,
-	24778 - 11904: 0xD561,
-	24779 - 11904: 0xB17B,
-	24780 - 11904: 0xD8FA,
-	24781 - 11904: 0xD564,
-	24782 - 11904: 0xD8FC,
-	24783 - 11904: 0xD559,
-	24785 - 11904: 0xB462,
-	24787 - 11904: 0xD557,
-	24788 - 11904: 0xD558,
-	24789 - 11904: 0xB1A7,
-	24791 - 11904: 0x8D71,
-	24792 - 11904: 0xB1A6,
-	24793 - 11904: 0xD55B,
-	24794 - 11904: 0xB1AB,
-	24795 - 11904: 0xD55F,
-	24796 - 11904: 0xB1A4,
-	24797 - 11904: 0xD55C,
-	24798 - 11904: 0xFD64,
-	24799 - 11904: 0xB1A9,
-	24800 - 11904: 0xB466,
-	24801 - 11904: 0xB463,
-	24802 - 11904: 0xD8FB,
-	24803 - 11904: 0x99BA,
-	24804 - 11904: 0xD55A,
-	24806 - 11904: 0xB17D,
-	24807 - 11904: 0x9AD0,
-	24808 - 11904: 0x9A61,
-	24809 - 11904: 0xA0E5,
-	24816 - 11904: 0xB46B,
-	24817 - 11904: 0xB46F,
-	24818 - 11904: 0xD940,
-	24819 - 11904: 0xB751,
-	24820 - 11904: 0xB46D,
-	24821 - 11904: 0xD944,
-	24822 - 11904: 0xB471,
-	24823 - 11904: 0xDD65,
-	24824 - 11904: 0xD946,
-	24825 - 11904: 0xB753,
-	24826 - 11904: 0xB469,
-	24827 - 11904: 0xB46C,
-	24828 - 11904: 0xD947,
-	24829 - 11904: 0xA05B,
-	24830 - 11904: 0xD948,
-	24831 - 11904: 0xD94E,
-	24832 - 11904: 0xB473,
-	24833 - 11904: 0xB754,
-	24835 - 11904: 0xD94A,
-	24836 - 11904: 0xD94F,
-	24837 - 11904: 0xD943,
-	24838 - 11904: 0xB75E,
-	24839 - 11904: 0x96AC,
-	24840 - 11904: 0xB755,
-	24841 - 11904: 0xB472,
-	24842 - 11904: 0xD941,
-	24843 - 11904: 0xD950,
-	24844 - 11904: 0x9740,
-	24845 - 11904: 0xB75D,
-	24846 - 11904: 0xB470,
-	24847 - 11904: 0xB74E,
-	24848 - 11904: 0xD94D,
-	24850 - 11904: 0xB474,
-	24851 - 11904: 0xD945,
-	24852 - 11904: 0xD8FE,
-	24853 - 11904: 0xB46A,
-	24854 - 11904: 0xD942,
-	24856 - 11904: 0xD94B,
-	24857 - 11904: 0x9EF1,
-	24858 - 11904: 0xB74D,
-	24859 - 11904: 0xB752,
-	24860 - 11904: 0xB467,
-	24861 - 11904: 0xD94C,
-	24863 - 11904: 0xB750,
-	24866 - 11904: 0x8C4D,
-	24867 - 11904: 0xB468,
-	24871 - 11904: 0xB75C,
-	24872 - 11904: 0xE1C3,
-	24873 - 11904: 0xDD70,
-	24875 - 11904: 0xDD68,
-	24876 - 11904: 0xE1C2,
-	24878 - 11904: 0xDD6C,
-	24879 - 11904: 0xDD6E,
-	24880 - 11904: 0x9F7E,
-	24882 - 11904: 0xDD6B,
-	24884 - 11904: 0xB75B,
-	24886 - 11904: 0xDD6A,
-	24887 - 11904: 0xB75F,
-	24891 - 11904: 0xE1D2,
-	24893 - 11904: 0x8D72,
-	24894 - 11904: 0xB75A,
-	24895 - 11904: 0xBA40,
-	24896 - 11904: 0xDD71,
-	24897 - 11904: 0xE1C4,
-	24898 - 11904: 0xFC76,
-	24900 - 11904: 0xB758,
-	24901 - 11904: 0xDD69,
-	24902 - 11904: 0xDD6D,
-	24903 - 11904: 0xB9FE,
-	24904 - 11904: 0xB74F,
-	24905 - 11904: 0xDD66,
-	24906 - 11904: 0xDD67,
-	24907 - 11904: 0xBA41,
-	24908 - 11904: 0xB757,
-	24909 - 11904: 0xB759,
-	24910 - 11904: 0xB756,
-	24911 - 11904: 0xDD6F,
-	24912 - 11904: 0x96A9,
-	24914 - 11904: 0xE1C8,
-	24915 - 11904: 0xE1C9,
-	24916 - 11904: 0xE1CE,
-	24917 - 11904: 0xBC7D,
-	24918 - 11904: 0xE1D5,
-	24920 - 11904: 0xBA47,
-	24921 - 11904: 0xA06E,
-	24922 - 11904: 0xBA46,
-	24923 - 11904: 0xE1D0,
-	24924 - 11904: 0xFCAA,
-	24925 - 11904: 0xBC7C,
-	24926 - 11904: 0xE1C5,
-	24927 - 11904: 0xBA45,
-	24928 - 11904: 0xFBCD,
-	24929 - 11904: 0xE1D4,
-	24930 - 11904: 0xBA43,
-	24931 - 11904: 0xBA44,
-	24932 - 11904: 0xFC74,
-	24933 - 11904: 0xE1D1,
-	24934 - 11904: 0xE5AA,
-	24935 - 11904: 0xBC7A,
-	24936 - 11904: 0xB46E,
-	24938 - 11904: 0xE1D3,
-	24939 - 11904: 0xBCA3,
-	24940 - 11904: 0xE1CB,
-	24942 - 11904: 0xBC7B,
-	24943 - 11904: 0xA074,
-	24944 - 11904: 0xBCA2,
-	24945 - 11904: 0xE1C6,
-	24946 - 11904: 0xE1CA,
-	24947 - 11904: 0xE1C7,
-	24948 - 11904: 0xE1CD,
-	24949 - 11904: 0xBA48,
-	24950 - 11904: 0xBC79,
-	24951 - 11904: 0xBA42,
-	24953 - 11904: 0xE57A,
-	24954 - 11904: 0xE1CF,
-	24956 - 11904: 0xBCA1,
-	24957 - 11904: 0xA071,
-	24958 - 11904: 0xBCA4,
-	24960 - 11904: 0xE1CC,
-	24961 - 11904: 0xFC79,
-	24962 - 11904: 0xBC7E,
-	24963 - 11904: 0xE579,
-	24967 - 11904: 0xFC7C,
-	24969 - 11904: 0xE57E,
-	24970 - 11904: 0xBECE,
-	24971 - 11904: 0xE578,
-	24972 - 11904: 0xE9A3,
-	24973 - 11904: 0xE5A9,
-	24974 - 11904: 0xBCA8,
-	24976 - 11904: 0xBCA6,
-	24977 - 11904: 0xBECC,
-	24978 - 11904: 0xE5A6,
-	24979 - 11904: 0xE5A2,
-	24980 - 11904: 0xBCAC,
-	24981 - 11904: 0x9C50,
-	24982 - 11904: 0xE978,
-	24984 - 11904: 0x9379,
-	24985 - 11904: 0x9378,
-	24986 - 11904: 0xBCAA,
-	24987 - 11904: 0xE5A1,
-	24988 - 11904: 0xA0DD,
-	24989 - 11904: 0xE976,
-	24991 - 11904: 0xE5A5,
-	24993 - 11904: 0xE5A8,
-	24994 - 11904: 0xE57D,
-	24996 - 11904: 0xBCAB,
-	24999 - 11904: 0xBCA5,
-	25000 - 11904: 0xE977,
-	25001 - 11904: 0xBECD,
-	25002 - 11904: 0xE5A7,
-	25003 - 11904: 0xBCA7,
-	25004 - 11904: 0xBCA9,
-	25005 - 11904: 0xE5A4,
-	25006 - 11904: 0xBCAD,
-	25007 - 11904: 0xE5A3,
-	25008 - 11904: 0xE57C,
-	25009 - 11904: 0xE57B,
-	25010 - 11904: 0xBECB,
-	25011 - 11904: 0xE5AB,
-	25012 - 11904: 0xE97A,
-	25013 - 11904: 0xECE0,
-	25014 - 11904: 0xBED0,
-	25015 - 11904: 0x8D75,
-	25016 - 11904: 0xE9A2,
-	25017 - 11904: 0x8D76,
-	25018 - 11904: 0xE97E,
-	25020 - 11904: 0xECE1,
-	25022 - 11904: 0xBED1,
-	25023 - 11904: 0xE9A1,
-	25024 - 11904: 0x9374,
-	25025 - 11904: 0xE97C,
-	25026 - 11904: 0xC0B4,
-	25027 - 11904: 0xECDF,
-	25029 - 11904: 0xE979,
-	25030 - 11904: 0xE97B,
-	25031 - 11904: 0xC0B5,
-	25032 - 11904: 0xBED3,
-	25033 - 11904: 0xC0B3,
-	25034 - 11904: 0xBED2,
-	25035 - 11904: 0xC0B7,
-	25036 - 11904: 0xE97D,
-	25037 - 11904: 0xBECF,
-	25039 - 11904: 0x8D77,
-	25040 - 11904: 0xFCA5,
-	25043 - 11904: 0xFCA2,
-	25046 - 11904: 0xEFCF,
-	25048 - 11904: 0xEFC7,
-	25050 - 11904: 0x90C3,
-	25054 - 11904: 0xECE7,
-	25055 - 11904: 0xEFC8,
-	25056 - 11904: 0xECE3,
-	25058 - 11904: 0xA079,
-	25059 - 11904: 0xC256,
-	25060 - 11904: 0xECE5,
-	25061 - 11904: 0xECE4,
-	25062 - 11904: 0xC0B6,
-	25063 - 11904: 0xECE2,
-	25064 - 11904: 0xECE6,
-	25065 - 11904: 0xEFD0,
-	25066 - 11904: 0xEFCC,
-	25067 - 11904: 0xEFCE,
-	25069 - 11904: 0xEFC9,
-	25070 - 11904: 0xEFCA,
-	25072 - 11904: 0xEFCD,
-	25073 - 11904: 0xEFCB,
-	25074 - 11904: 0xC367,
-	25077 - 11904: 0xC36A,
-	25078 - 11904: 0xC369,
-	25079 - 11904: 0xC368,
-	25080 - 11904: 0xC461,
-	25081 - 11904: 0xF44A,
-	25082 - 11904: 0xC462,
-	25083 - 11904: 0xF241,
-	25084 - 11904: 0xC4DF,
-	25085 - 11904: 0xF5CC,
-	25086 - 11904: 0xC4E0,
-	25087 - 11904: 0xC574,
-	25088 - 11904: 0xC5CA,
-	25089 - 11904: 0xF7D9,
-	25091 - 11904: 0xF7DA,
-	25092 - 11904: 0xF7DB,
-	25095 - 11904: 0xF9BA,
-	25096 - 11904: 0xA4E0,
-	25097 - 11904: 0xC97C,
-	25098 - 11904: 0xA5B3,
-	25100 - 11904: 0xA6A6,
-	25101 - 11904: 0xA6A7,
-	25102 - 11904: 0xA6A5,
-	25104 - 11904: 0xA6A8,
-	25105 - 11904: 0xA7DA,
-	25106 - 11904: 0xA7D9,
-	25108 - 11904: 0xCCB1,
-	25109 - 11904: 0xA9CF,
-	25110 - 11904: 0xA9CE,
-	25113 - 11904: 0xD1AF,
-	25114 - 11904: 0xB1AD,
-	25115 - 11904: 0xB1AE,
-	25119 - 11904: 0xB475,
-	25120 - 11904: 0xDD72,
-	25121 - 11904: 0xB760,
-	25122 - 11904: 0xB761,
-	25123 - 11904: 0xDD74,
-	25124 - 11904: 0xDD76,
-	25125 - 11904: 0xDD75,
-	25127 - 11904: 0xE1D7,
-	25129 - 11904: 0xE1D6,
-	25130 - 11904: 0xBA49,
-	25131 - 11904: 0xE1D8,
-	25132 - 11904: 0x8D79,
-	25133 - 11904: 0xE5AC,
-	25134 - 11904: 0xBCAE,
-	25136 - 11904: 0xBED4,
-	25138 - 11904: 0xC0B8,
-	25139 - 11904: 0xC257,
-	25140 - 11904: 0xC0B9,
-	25142 - 11904: 0xA4E1,
-	25143 - 11904: 0x8BFC,
-	25145 - 11904: 0xA076,
-	25146 - 11904: 0xCAE6,
-	25149 - 11904: 0xCCB2,
-	25150 - 11904: 0xA9D1,
-	25151 - 11904: 0xA9D0,
-	25152 - 11904: 0xA9D2,
-	25153 - 11904: 0xABF3,
-	25154 - 11904: 0xCED2,
-	25155 - 11904: 0xCED3,
-	25158 - 11904: 0xD1B0,
-	25159 - 11904: 0xAEB0,
-	25160 - 11904: 0xB1AF,
-	25161 - 11904: 0xB476,
-	25162 - 11904: 0xD951,
-	25163 - 11904: 0xA4E2,
-	25164 - 11904: 0x8BCD,
-	25165 - 11904: 0xA47E,
-	25166 - 11904: 0xA4E3,
-	25168 - 11904: 0xC97D,
-	25169 - 11904: 0xA5B7,
-	25170 - 11904: 0xA5B6,
-	25171 - 11904: 0xA5B4,
-	25172 - 11904: 0xA5B5,
-	25176 - 11904: 0xA6AB,
-	25177 - 11904: 0xC9E9,
-	25178 - 11904: 0xC9EB,
-	25179 - 11904: 0xA6AA,
-	25180 - 11904: 0xC9E3,
-	25182 - 11904: 0xC9E4,
-	25184 - 11904: 0xC9EA,
-	25185 - 11904: 0xC9E6,
-	25186 - 11904: 0xC9E8,
-	25187 - 11904: 0xA6A9,
-	25188 - 11904: 0xC9E5,
-	25189 - 11904: 0xC9EC,
-	25190 - 11904: 0xC9E7,
-	25192 - 11904: 0x9F5A,
-	25197 - 11904: 0xA7E1,
-	25198 - 11904: 0xA7EA,
-	25199 - 11904: 0xA7E8,
-	25200 - 11904: 0xCAF0,
-	25201 - 11904: 0xCAED,
-	25202 - 11904: 0xCAF5,
-	25203 - 11904: 0xA7E6,
-	25204 - 11904: 0xCAF6,
-	25206 - 11904: 0xA7DF,
-	25207 - 11904: 0xCAF3,
-	25209 - 11904: 0xA7E5,
-	25210 - 11904: 0xCAEF,
-	25211 - 11904: 0xCAEE,
-	25212 - 11904: 0xA7E3,
-	25213 - 11904: 0xCAF4,
-	25214 - 11904: 0xA7E4,
-	25215 - 11904: 0xA9D3,
-	25216 - 11904: 0xA7DE,
-	25217 - 11904: 0xCAF1,
-	25218 - 11904: 0x9FF4,
-	25219 - 11904: 0xCAE7,
-	25220 - 11904: 0xA7DB,
-	25221 - 11904: 0x9FBA,
-	25222 - 11904: 0xA7EE,
-	25223 - 11904: 0xCAEC,
-	25224 - 11904: 0xCAF2,
-	25225 - 11904: 0xA7E0,
-	25226 - 11904: 0xA7E2,
-	25228 - 11904: 0xCAE8,
-	25230 - 11904: 0xCAE9,
-	25231 - 11904: 0xCAEA,
-	25232 - 11904: 0x8D7A,
-	25233 - 11904: 0xA7ED,
-	25234 - 11904: 0xA7E7,
-	25235 - 11904: 0xA7EC,
-	25236 - 11904: 0xCAEB,
-	25237 - 11904: 0xA7EB,
-	25238 - 11904: 0xA7DD,
-	25239 - 11904: 0xA7DC,
-	25240 - 11904: 0xA7E9,
-	25245 - 11904: 0x9E45,
-	25252 - 11904: 0x93B0,
-	25254 - 11904: 0xA075,
-	25256 - 11904: 0xA9E1,
-	25257 - 11904: 0xCCBE,
-	25258 - 11904: 0xCCB7,
-	25259 - 11904: 0xA9DC,
-	25260 - 11904: 0xA9EF,
-	25261 - 11904: 0xCCB3,
-	25262 - 11904: 0xCCBA,
-	25263 - 11904: 0xCCBC,
-	25264 - 11904: 0xCCBF,
-	25265 - 11904: 0xA9EA,
-	25267 - 11904: 0xCCBB,
-	25268 - 11904: 0xCCB4,
-	25269 - 11904: 0xA9E8,
-	25270 - 11904: 0xCCB8,
-	25272 - 11904: 0xCCC0,
-	25273 - 11904: 0xA9D9,
-	25275 - 11904: 0xCCBD,
-	25276 - 11904: 0xA9E3,
-	25277 - 11904: 0xA9E2,
-	25278 - 11904: 0xCCB6,
-	25279 - 11904: 0xA9D7,
-	25281 - 11904: 0x87DD,
-	25282 - 11904: 0xA9D8,
-	25283 - 11904: 0x9B46,
-	25284 - 11904: 0xA9D6,
-	25285 - 11904: 0xFCAE,
-	25286 - 11904: 0xA9EE,
-	25287 - 11904: 0xA9E6,
-	25288 - 11904: 0xA9E0,
-	25289 - 11904: 0xA9D4,
-	25290 - 11904: 0xCCB9,
-	25291 - 11904: 0xA9DF,
-	25292 - 11904: 0xA9D5,
-	25293 - 11904: 0xA9E7,
-	25294 - 11904: 0xA9F0,
-	25295 - 11904: 0xCED4,
-	25296 - 11904: 0xA9E4,
-	25297 - 11904: 0xCCB5,
-	25298 - 11904: 0xA9DA,
-	25299 - 11904: 0xA9DD,
-	25300 - 11904: 0xA9DE,
-	25301 - 11904: 0xFCB0,
-	25302 - 11904: 0xA9EC,
-	25303 - 11904: 0xA9ED,
-	25304 - 11904: 0xA9EB,
-	25305 - 11904: 0xA9E5,
-	25306 - 11904: 0xA9E9,
-	25307 - 11904: 0xA9DB,
-	25308 - 11904: 0xABF4,
-	25311 - 11904: 0xFA51,
-	25317 - 11904: 0x8D7B,
-	25323 - 11904: 0xCEDA,
-	25324 - 11904: 0xAC41,
-	25325 - 11904: 0xABF8,
-	25326 - 11904: 0xABFA,
-	25327 - 11904: 0xAC40,
-	25328 - 11904: 0xCEE6,
-	25329 - 11904: 0xABFD,
-	25330 - 11904: 0xD1B1,
-	25331 - 11904: 0xAEB1,
-	25332 - 11904: 0xAC43,
-	25333 - 11904: 0xCED7,
-	25334 - 11904: 0xCEDF,
-	25335 - 11904: 0xABFE,
-	25336 - 11904: 0xCEDE,
-	25337 - 11904: 0xCEDB,
-	25338 - 11904: 0xCEE3,
-	25339 - 11904: 0xCEE5,
-	25340 - 11904: 0xABF7,
-	25341 - 11904: 0xABFB,
-	25342 - 11904: 0xAC42,
-	25343 - 11904: 0xAEB3,
-	25344 - 11904: 0xCEE0,
-	25345 - 11904: 0xABF9,
-	25346 - 11904: 0xAC45,
-	25347 - 11904: 0xCED9,
-	25351 - 11904: 0xABFC,
-	25352 - 11904: 0xAEB2,
-	25353 - 11904: 0xABF6,
-	25355 - 11904: 0xCED6,
-	25356 - 11904: 0xCEDD,
-	25357 - 11904: 0xCED5,
-	25358 - 11904: 0xCED8,
-	25359 - 11904: 0xCEDC,
-	25360 - 11904: 0xD1B2,
-	25361 - 11904: 0xAC44,
-	25363 - 11904: 0xCEE1,
-	25364 - 11904: 0xCEE2,
-	25365 - 11904: 0xCEE4,
-	25366 - 11904: 0xABF5,
-	25368 - 11904: 0x8D7C,
-	25384 - 11904: 0xAEC1,
-	25385 - 11904: 0xD1BE,
-	25386 - 11904: 0xAEBF,
-	25387 - 11904: 0xAEC0,
-	25388 - 11904: 0xD1B4,
-	25389 - 11904: 0xD1C4,
-	25390 - 11904: 0x9ED6,
-	25391 - 11904: 0xAEB6,
-	25393 - 11904: 0x93AC,
-	25394 - 11904: 0xD566,
-	25395 - 11904: 0xD1C6,
-	25396 - 11904: 0xD1C0,
-	25397 - 11904: 0x9F5B,
-	25398 - 11904: 0xD1B7,
-	25399 - 11904: 0x93A9,
-	25400 - 11904: 0xD1C9,
-	25401 - 11904: 0xD1BA,
-	25402 - 11904: 0xAEBC,
-	25403 - 11904: 0xD57D,
-	25404 - 11904: 0xD1BD,
-	25405 - 11904: 0xAEBE,
-	25406 - 11904: 0xAEB5,
-	25408 - 11904: 0xD1CB,
-	25409 - 11904: 0xD1BF,
-	25410 - 11904: 0xAEB8,
-	25411 - 11904: 0xD1B8,
-	25412 - 11904: 0xD1B5,
-	25413 - 11904: 0xD1B6,
-	25414 - 11904: 0xAEB9,
-	25415 - 11904: 0xD1C5,
-	25416 - 11904: 0xD1CC,
-	25417 - 11904: 0xAEBB,
-	25418 - 11904: 0xD1BC,
-	25419 - 11904: 0xD1BB,
-	25420 - 11904: 0xAEC3,
-	25421 - 11904: 0xAEC2,
-	25422 - 11904: 0xAEB4,
-	25423 - 11904: 0xAEBA,
-	25424 - 11904: 0xAEBD,
-	25425 - 11904: 0xD1C8,
-	25428 - 11904: 0xD1C2,
-	25429 - 11904: 0xAEB7,
-	25430 - 11904: 0xD1B3,
-	25431 - 11904: 0xD1CA,
-	25432 - 11904: 0xD1C1,
-	25433 - 11904: 0xD1C3,
-	25434 - 11904: 0xD1C7,
-	25444 - 11904: 0xA07C,
-	25445 - 11904: 0xD567,
-	25447 - 11904: 0xB1B7,
-	25448 - 11904: 0xB1CB,
-	25449 - 11904: 0xB1CA,
-	25451 - 11904: 0xB1BF,
-	25452 - 11904: 0xFCB2,
-	25453 - 11904: 0xD579,
-	25454 - 11904: 0xD575,
-	25455 - 11904: 0xD572,
-	25456 - 11904: 0xD5A6,
-	25457 - 11904: 0xB1BA,
-	25458 - 11904: 0xB1B2,
-	25461 - 11904: 0xD577,
-	25462 - 11904: 0xB4A8,
-	25463 - 11904: 0xB1B6,
-	25464 - 11904: 0xD5A1,
-	25465 - 11904: 0x8AC1,
-	25466 - 11904: 0xB1CC,
-	25467 - 11904: 0xB1C9,
-	25468 - 11904: 0xD57B,
-	25469 - 11904: 0xD56A,
-	25471 - 11904: 0x9FB4,
-	25472 - 11904: 0xB1C8,
-	25473 - 11904: 0xD5A3,
-	25474 - 11904: 0xD569,
-	25475 - 11904: 0xB1BD,
-	25476 - 11904: 0xB1C1,
-	25477 - 11904: 0xD5A2,
-	25479 - 11904: 0xD573,
-	25480 - 11904: 0xB1C2,
-	25481 - 11904: 0xB1BC,
-	25482 - 11904: 0xD568,
-	25483 - 11904: 0xFCAC,
-	25484 - 11904: 0xB478,
-	25485 - 11904: 0xD5A5,
-	25486 - 11904: 0xD571,
-	25487 - 11904: 0xB1C7,
-	25488 - 11904: 0xD574,
-	25489 - 11904: 0xD5A4,
-	25490 - 11904: 0xB1C6,
-	25492 - 11904: 0xD952,
-	25494 - 11904: 0xB1B3,
-	25495 - 11904: 0xD56F,
-	25496 - 11904: 0xB1B8,
-	25497 - 11904: 0xB1C3,
-	25499 - 11904: 0xB1BE,
-	25500 - 11904: 0xD578,
-	25501 - 11904: 0xD56E,
-	25502 - 11904: 0xD56C,
-	25503 - 11904: 0xD57E,
-	25504 - 11904: 0xB1B0,
-	25505 - 11904: 0xB1C4,
-	25506 - 11904: 0xB1B4,
-	25507 - 11904: 0xB477,
-	25508 - 11904: 0xD57C,
-	25509 - 11904: 0xB1B5,
-	25511 - 11904: 0xB1B1,
-	25512 - 11904: 0xB1C0,
-	25513 - 11904: 0xB1BB,
-	25514 - 11904: 0xB1B9,
-	25515 - 11904: 0xD570,
-	25516 - 11904: 0xB1C5,
-	25517 - 11904: 0xD56D,
-	25518 - 11904: 0xD57A,
-	25519 - 11904: 0xD576,
-	25520 - 11904: 0xD954,
-	25521 - 11904: 0xD953,
-	25529 - 11904: 0x9E4C,
-	25533 - 11904: 0xD56B,
-	25534 - 11904: 0xD964,
-	25536 - 11904: 0xB47A,
-	25537 - 11904: 0x8FC5,
-	25538 - 11904: 0xD96A,
-	25539 - 11904: 0xD959,
-	25540 - 11904: 0xD967,
-	25541 - 11904: 0xDD77,
-	25542 - 11904: 0xB47D,
-	25543 - 11904: 0xD96B,
-	25544 - 11904: 0xD96E,
-	25545 - 11904: 0xB47C,
-	25546 - 11904: 0xD95C,
-	25547 - 11904: 0xD96D,
-	25548 - 11904: 0xD96C,
-	25549 - 11904: 0xB47E,
-	25550 - 11904: 0xD955,
-	25551 - 11904: 0xB479,
-	25552 - 11904: 0xB4A3,
-	25553 - 11904: 0x93AD,
-	25554 - 11904: 0xB4A1,
-	25555 - 11904: 0xD969,
-	25557 - 11904: 0xD95F,
-	25558 - 11904: 0xB4A5,
-	25559 - 11904: 0xD970,
-	25560 - 11904: 0xD968,
-	25561 - 11904: 0xD971,
-	25562 - 11904: 0xB4AD,
-	25563 - 11904: 0xB4AB,
-	25564 - 11904: 0xD966,
-	25565 - 11904: 0xD965,
-	25566 - 11904: 0x9DC3,
-	25567 - 11904: 0xD963,
-	25568 - 11904: 0xD95D,
-	25569 - 11904: 0xB4A4,
-	25570 - 11904: 0x8DA2,
-	25571 - 11904: 0xB4A2,
-	25572 - 11904: 0xD1B9,
-	25573 - 11904: 0xD956,
-	25574 - 11904: 0x9D4A,
-	25575 - 11904: 0xDDB7,
-	25576 - 11904: 0xD957,
-	25577 - 11904: 0xB47B,
-	25578 - 11904: 0xB4AA,
-	25579 - 11904: 0xDD79,
-	25581 - 11904: 0xB4A6,
-	25582 - 11904: 0xB4A7,
-	25583 - 11904: 0xD958,
-	25584 - 11904: 0xD96F,
-	25585 - 11904: 0xDD78,
-	25586 - 11904: 0xD960,
-	25587 - 11904: 0xD95B,
-	25588 - 11904: 0xB4A9,
-	25589 - 11904: 0xD961,
-	25590 - 11904: 0xD95E,
-	25592 - 11904: 0xFCB6,
-	25593 - 11904: 0xB4AE,
-	25595 - 11904: 0x8DA3,
-	25596 - 11904: 0x9E4B,
-	25598 - 11904: 0x9E4D,
-	25606 - 11904: 0xB770,
-	25607 - 11904: 0x8DA4,
-	25609 - 11904: 0xDD7C,
-	25610 - 11904: 0xDDB1,
-	25611 - 11904: 0xDDB6,
-	25612 - 11904: 0xDDAA,
-	25613 - 11904: 0xB76C,
-	25614 - 11904: 0xDDBB,
-	25615 - 11904: 0xB769,
-	25616 - 11904: 0xDD7A,
-	25618 - 11904: 0xDD7B,
-	25619 - 11904: 0xB762,
-	25620 - 11904: 0xB76B,
-	25621 - 11904: 0xDDA4,
-	25622 - 11904: 0xB76E,
-	25623 - 11904: 0xB76F,
-	25624 - 11904: 0xDDA5,
-	25626 - 11904: 0xDDB2,
-	25627 - 11904: 0xDDB8,
-	25628 - 11904: 0xB76A,
-	25630 - 11904: 0xB764,
-	25631 - 11904: 0xDDA3,
-	25632 - 11904: 0xDD7D,
-	25633 - 11904: 0xDDBA,
-	25634 - 11904: 0xDDA8,
-	25635 - 11904: 0xDDA9,
-	25636 - 11904: 0xDD7E,
-	25637 - 11904: 0xDDB4,
-	25638 - 11904: 0xDDAB,
-	25639 - 11904: 0xDDB5,
-	25640 - 11904: 0xDDAD,
-	25642 - 11904: 0xB765,
-	25643 - 11904: 0xE1D9,
-	25644 - 11904: 0xB768,
-	25645 - 11904: 0xB766,
-	25646 - 11904: 0xDDB9,
-	25647 - 11904: 0xDDB0,
-	25648 - 11904: 0xDDAC,
-	25650 - 11904: 0x8AFD,
-	25651 - 11904: 0xDDA1,
-	25652 - 11904: 0xBA53,
-	25653 - 11904: 0xDDAF,
-	25654 - 11904: 0xB76D,
-	25655 - 11904: 0xDDA7,
-	25656 - 11904: 0xFCB5,
-	25657 - 11904: 0xDDA6,
-	25658 - 11904: 0xFCC3,
-	25659 - 11904: 0x93B2,
-	25661 - 11904: 0xB767,
-	25662 - 11904: 0xB763,
-	25663 - 11904: 0xE1EE,
-	25664 - 11904: 0xDDB3,
-	25665 - 11904: 0xDDAE,
-	25667 - 11904: 0xDDA2,
-	25675 - 11904: 0xE1E9,
-	25677 - 11904: 0xE1DA,
-	25678 - 11904: 0xE1E5,
-	25680 - 11904: 0xE1EC,
-	25681 - 11904: 0xBA51,
-	25682 - 11904: 0xB4AC,
-	25683 - 11904: 0xE1EA,
-	25684 - 11904: 0xBA4C,
-	25688 - 11904: 0xBA4B,
-	25689 - 11904: 0xE1F1,
-	25690 - 11904: 0x8DA5,
-	25691 - 11904: 0xE1DB,
-	25692 - 11904: 0xE1E8,
-	25693 - 11904: 0xE1DC,
-	25694 - 11904: 0xE1E7,
-	25695 - 11904: 0xBA4F,
-	25696 - 11904: 0xE1EB,
-	25697 - 11904: 0xD962,
-	25701 - 11904: 0xE1F2,
-	25702 - 11904: 0xE1E3,
-	25703 - 11904: 0xBA52,
-	25704 - 11904: 0xE5BA,
-	25705 - 11904: 0xBCAF,
-	25707 - 11904: 0xE1F0,
-	25708 - 11904: 0xE1EF,
-	25709 - 11904: 0xBA54,
-	25710 - 11904: 0xE5AD,
-	25711 - 11904: 0xBCB0,
-	25712 - 11904: 0xE5AE,
-	25713 - 11904: 0x93A1,
-	25714 - 11904: 0xE1DF,
-	25715 - 11904: 0xE1E0,
-	25716 - 11904: 0xE1DD,
-	25717 - 11904: 0xE1E2,
-	25718 - 11904: 0xE1DE,
-	25719 - 11904: 0xE1F3,
-	25720 - 11904: 0xBA4E,
-	25721 - 11904: 0xBCB1,
-	25722 - 11904: 0xBA50,
-	25723 - 11904: 0xBA55,
-	25724 - 11904: 0x8AC6,
-	25725 - 11904: 0xE1E1,
-	25727 - 11904: 0xE1ED,
-	25730 - 11904: 0xE1E6,
-	25733 - 11904: 0xE5B1,
-	25735 - 11904: 0xBA4A,
-	25736 - 11904: 0xBCB4,
-	25737 - 11904: 0xE9AA,
-	25738 - 11904: 0xE5B6,
-	25739 - 11904: 0xE5B5,
-	25740 - 11904: 0xE5B7,
-	25741 - 11904: 0x8A5B,
-	25743 - 11904: 0xE5B4,
-	25744 - 11904: 0xFCB9,
-	25745 - 11904: 0x894D,
-	25746 - 11904: 0xBCBB,
-	25747 - 11904: 0xBCB8,
-	25749 - 11904: 0xBCB9,
-	25750 - 11904: 0xE5AF,
-	25751 - 11904: 0xE5B2,
-	25752 - 11904: 0xE5BC,
-	25753 - 11904: 0xBCC1,
-	25754 - 11904: 0xBCBF,
-	25756 - 11904: 0xE5B3,
-	25757 - 11904: 0xD95A,
-	25758 - 11904: 0xBCB2,
-	25759 - 11904: 0xE5B9,
-	25760 - 11904: 0xE5B0,
-	25762 - 11904: 0xBCC2,
-	25763 - 11904: 0xE5B8,
-	25764 - 11904: 0xBA4D,
-	25765 - 11904: 0xBCB7,
-	25766 - 11904: 0xE1E4,
-	25769 - 11904: 0xBCBA,
-	25771 - 11904: 0xBCBE,
-	25772 - 11904: 0xBCC0,
-	25773 - 11904: 0xBCBD,
-	25774 - 11904: 0xBCBC,
-	25775 - 11904: 0xFED4,
-	25776 - 11904: 0xBCB6,
-	25777 - 11904: 0xE5BB,
-	25778 - 11904: 0xBCB3,
-	25779 - 11904: 0xBCC3,
-	25780 - 11904: 0x8A78,
-	25782 - 11904: 0x93AB,
-	25787 - 11904: 0xBED8,
-	25788 - 11904: 0xBED9,
-	25789 - 11904: 0xE9A9,
-	25790 - 11904: 0xBEE2,
-	25791 - 11904: 0xBEDF,
-	25792 - 11904: 0x8DA7,
-	25793 - 11904: 0xBED6,
-	25794 - 11904: 0xBEDD,
-	25795 - 11904: 0xE9AB,
-	25796 - 11904: 0xBEDB,
-	25797 - 11904: 0xBED5,
-	25799 - 11904: 0xBEDC,
-	25801 - 11904: 0xE9A8,
-	25802 - 11904: 0xC0BB,
-	25803 - 11904: 0xBED7,
-	25805 - 11904: 0xBEDE,
-	25806 - 11904: 0xC0BA,
-	25807 - 11904: 0xE9A7,
-	25808 - 11904: 0xE9A6,
-	25810 - 11904: 0xBEE0,
-	25811 - 11904: 0x9F45,
-	25812 - 11904: 0xBEE1,
-	25814 - 11904: 0xE9A5,
-	25815 - 11904: 0xE9A4,
-	25816 - 11904: 0xC0BC,
-	25817 - 11904: 0xE9AE,
-	25818 - 11904: 0xBEDA,
-	25819 - 11904: 0xE9AC,
-	25821 - 11904: 0x8A56,
-	25824 - 11904: 0xC0BD,
-	25825 - 11904: 0xFCBF,
-	25826 - 11904: 0xC0C2,
-	25827 - 11904: 0xECEA,
-	25828 - 11904: 0xECEC,
-	25829 - 11904: 0xFCC0,
-	25830 - 11904: 0xC0BF,
-	25831 - 11904: 0x8EE6,
-	25832 - 11904: 0xECED,
-	25833 - 11904: 0xECE9,
-	25834 - 11904: 0x8AA4,
-	25835 - 11904: 0xECEB,
-	25836 - 11904: 0xC0C0,
-	25837 - 11904: 0xC0C3,
-	25839 - 11904: 0xECE8,
-	25840 - 11904: 0xC0BE,
-	25841 - 11904: 0xC0C1,
-	25842 - 11904: 0xC259,
-	25843 - 11904: 0xE9AD,
-	25844 - 11904: 0xC258,
-	25847 - 11904: 0xC25E,
-	25848 - 11904: 0xEFD4,
-	25850 - 11904: 0xC25C,
-	25851 - 11904: 0xC25D,
-	25852 - 11904: 0xEFD7,
-	25853 - 11904: 0xEFD3,
-	25854 - 11904: 0xC25A,
-	25855 - 11904: 0xEFD1,
-	25856 - 11904: 0xC36B,
-	25857 - 11904: 0xEFD5,
-	25859 - 11904: 0xEFD6,
-	25860 - 11904: 0xEFD2,
-	25862 - 11904: 0xC25B,
-	25863 - 11904: 0xF242,
-	25865 - 11904: 0xF245,
-	25866 - 11904: 0x8943,
-	25868 - 11904: 0xF246,
-	25869 - 11904: 0xF244,
-	25870 - 11904: 0xF247,
-	25871 - 11904: 0xC36C,
-	25872 - 11904: 0xF243,
-	25873 - 11904: 0x93F3,
-	25875 - 11904: 0xF44E,
-	25876 - 11904: 0xC464,
-	25877 - 11904: 0xF44D,
-	25878 - 11904: 0xF44C,
-	25879 - 11904: 0xF44B,
-	25880 - 11904: 0xC463,
-	25881 - 11904: 0xC465,
-	25883 - 11904: 0xF5CD,
-	25884 - 11904: 0xC4E2,
-	25885 - 11904: 0xC4E1,
-	25886 - 11904: 0xFCAB,
-	25887 - 11904: 0x9EA2,
-	25888 - 11904: 0xF6E1,
-	25889 - 11904: 0xF6E0,
-	25890 - 11904: 0xF6E3,
-	25891 - 11904: 0xC5CB,
-	25892 - 11904: 0xC575,
-	25893 - 11904: 0xF7DD,
-	25894 - 11904: 0xF6E2,
-	25897 - 11904: 0xF7DC,
-	25898 - 11904: 0xC5CD,
-	25899 - 11904: 0xC5CC,
-	25900 - 11904: 0xC5F3,
-	25901 - 11904: 0xF8A9,
-	25902 - 11904: 0xF8EF,
-	25903 - 11904: 0xA4E4,
-	25904 - 11904: 0x9DC7,
-	25906 - 11904: 0xD972,
-	25907 - 11904: 0xE9AF,
-	25908 - 11904: 0xC6D2,
-	25909 - 11904: 0x8BCE,
-	25910 - 11904: 0xA6AC,
-	25911 - 11904: 0xCAF7,
-	25912 - 11904: 0xA7F1,
-	25913 - 11904: 0xA7EF,
-	25915 - 11904: 0xA7F0,
-	25917 - 11904: 0xCCC1,
-	25918 - 11904: 0xA9F1,
-	25919 - 11904: 0xAC46,
-	25921 - 11904: 0xCEE7,
-	25923 - 11904: 0xCEE8,
-	25925 - 11904: 0xAC47,
-	25926 - 11904: 0xD1CE,
-	25928 - 11904: 0xAEC4,
-	25929 - 11904: 0xAEC5,
-	25930 - 11904: 0xD1CD,
-	25933 - 11904: 0xFCC5,
-	25935 - 11904: 0xB1D3,
-	25937 - 11904: 0xB1CF,
-	25939 - 11904: 0xD5A7,
-	25940 - 11904: 0xB1D6,
-	25941 - 11904: 0xB1D5,
-	25942 - 11904: 0xB1CE,
-	25943 - 11904: 0xB1D1,
-	25944 - 11904: 0xB1D4,
-	25945 - 11904: 0xB1D0,
-	25948 - 11904: 0xD976,
-	25949 - 11904: 0xB1CD,
-	25950 - 11904: 0xB4AF,
-	25951 - 11904: 0xFCCB,
-	25954 - 11904: 0xB4B1,
-	25955 - 11904: 0xB4B2,
-	25956 - 11904: 0xD975,
-	25957 - 11904: 0xD978,
-	25958 - 11904: 0xB4B0,
-	25959 - 11904: 0xD973,
-	25960 - 11904: 0xD977,
-	25962 - 11904: 0xD974,
-	25963 - 11904: 0x93B3,
-	25964 - 11904: 0xB771,
-	25965 - 11904: 0xFCCA,
-	25967 - 11904: 0xDDBC,
-	25970 - 11904: 0xBA56,
-	25971 - 11904: 0xE1F4,
-	25972 - 11904: 0xBEE3,
-	25973 - 11904: 0xBCC4,
-	25974 - 11904: 0xE5BD,
-	25975 - 11904: 0xBCC5,
-	25976 - 11904: 0xBCC6,
-	25977 - 11904: 0xE5BF,
-	25978 - 11904: 0xE5BE,
-	25979 - 11904: 0xE5C0,
-	25980 - 11904: 0xE9B1,
-	25983 - 11904: 0xE9B0,
-	25984 - 11904: 0xECEF,
-	25985 - 11904: 0xECEE,
-	25986 - 11904: 0xC0C4,
-	25987 - 11904: 0xC0C5,
-	25988 - 11904: 0xF248,
-	25989 - 11904: 0xFCC9,
-	25990 - 11904: 0x8DAC,
-	25991 - 11904: 0xA4E5,
-	25992 - 11904: 0xFBC6,
-	25993 - 11904: 0x8967,
-	25995 - 11904: 0x8C7E,
-	25996 - 11904: 0xD979,
-	26000 - 11904: 0xB4B4,
-	26001 - 11904: 0xB4B3,
-	26002 - 11904: 0xDDBD,
-	26004 - 11904: 0xEFD8,
-	26005 - 11904: 0xC4E3,
-	26006 - 11904: 0xF7DE,
-	26007 - 11904: 0xA4E6,
-	26009 - 11904: 0xAEC6,
-	26011 - 11904: 0xB1D8,
-	26012 - 11904: 0xB1D7,
-	26013 - 11904: 0xD97A,
-	26014 - 11904: 0xD97B,
-	26015 - 11904: 0xB772,
-	26016 - 11904: 0xE1F5,
-	26017 - 11904: 0xBA57,
-	26018 - 11904: 0xE9B2,
-	26020 - 11904: 0xA4E7,
-	26021 - 11904: 0xA5B8,
-	26023 - 11904: 0xA9F2,
-	26024 - 11904: 0xCCC2,
-	26026 - 11904: 0xCEE9,
-	26027 - 11904: 0xAC48,
-	26028 - 11904: 0xB1D9,
-	26030 - 11904: 0xD97C,
-	26031 - 11904: 0xB4B5,
-	26032 - 11904: 0xB773,
-	26034 - 11904: 0xE5C1,
-	26035 - 11904: 0xE5C2,
-	26037 - 11904: 0xFCCD,
-	26038 - 11904: 0xECF0,
-	26039 - 11904: 0xC25F,
-	26040 - 11904: 0xF8F0,
-	26041 - 11904: 0xA4E8,
-	26043 - 11904: 0xCCC3,
-	26044 - 11904: 0xA9F3,
-	26045 - 11904: 0xAC49,
-	26046 - 11904: 0x9CF3,
-	26047 - 11904: 0xCEEA,
-	26049 - 11904: 0xAEC7,
-	26050 - 11904: 0xD1D2,
-	26051 - 11904: 0xD1D0,
-	26052 - 11904: 0xD1D1,
-	26053 - 11904: 0xAEC8,
-	26054 - 11904: 0xD1CF,
-	26059 - 11904: 0xB1DB,
-	26060 - 11904: 0xB1DC,
-	26061 - 11904: 0xD5A8,
-	26062 - 11904: 0xB1DD,
-	26063 - 11904: 0xB1DA,
-	26064 - 11904: 0xD97D,
-	26065 - 11904: 0xFCD0,
-	26066 - 11904: 0xD97E,
-	26067 - 11904: 0xDDBE,
-	26068 - 11904: 0x95BB,
-	26070 - 11904: 0xBA59,
-	26071 - 11904: 0xBA58,
-	26074 - 11904: 0xECF1,
-	26075 - 11904: 0xEFD9,
-	26077 - 11904: 0xF24A,
-	26078 - 11904: 0xF249,
-	26079 - 11904: 0xF44F,
-	26080 - 11904: 0xFCD3,
-	26081 - 11904: 0xC95E,
-	26082 - 11904: 0xAC4A,
-	26083 - 11904: 0xFCD4,
-	26085 - 11904: 0xA4E9,
-	26086 - 11904: 0xA5B9,
-	26088 - 11904: 0xA6AE,
-	26089 - 11904: 0xA6AD,
-	26092 - 11904: 0xA6AF,
-	26093 - 11904: 0xA6B0,
-	26094 - 11904: 0xC9EE,
-	26095 - 11904: 0xC9ED,
-	26096 - 11904: 0xCAF8,
-	26097 - 11904: 0xA7F2,
-	26098 - 11904: 0xCAFB,
-	26099 - 11904: 0xCAFA,
-	26100 - 11904: 0xCAF9,
-	26101 - 11904: 0xCAFC,
-	26106 - 11904: 0xA9F4,
-	26107 - 11904: 0xCCC9,
-	26108 - 11904: 0xCCC5,
-	26109 - 11904: 0xCCCE,
-	26111 - 11904: 0x8DAE,
-	26112 - 11904: 0xA9FB,
-	26114 - 11904: 0xA9F9,
-	26115 - 11904: 0xCCCA,
-	26116 - 11904: 0xCCC6,
-	26117 - 11904: 0xCCCD,
-	26118 - 11904: 0xA9F8,
-	26119 - 11904: 0xAA40,
-	26120 - 11904: 0xCCC8,
-	26121 - 11904: 0xCCC4,
-	26122 - 11904: 0xA9FE,
-	26123 - 11904: 0xCCCB,
-	26124 - 11904: 0xA9F7,
-	26125 - 11904: 0xCCCC,
-	26126 - 11904: 0xA9FA,
-	26127 - 11904: 0xA9FC,
-	26128 - 11904: 0xCCD0,
-	26129 - 11904: 0xCCCF,
-	26130 - 11904: 0xCCC7,
-	26131 - 11904: 0xA9F6,
-	26132 - 11904: 0xA9F5,
-	26133 - 11904: 0xA9FD,
-	26136 - 11904: 0xFCD7,
-	26140 - 11904: 0xCEEF,
-	26141 - 11904: 0xCEF5,
-	26142 - 11904: 0x93DB,
-	26143 - 11904: 0xAC50,
-	26144 - 11904: 0xAC4D,
-	26145 - 11904: 0xCEEC,
-	26146 - 11904: 0xCEF1,
-	26147 - 11904: 0xFE63,
-	26148 - 11904: 0xAC53,
-	26149 - 11904: 0xAC4B,
-	26150 - 11904: 0xCEF0,
-	26151 - 11904: 0xAC4E,
-	26152 - 11904: 0xAC51,
-	26155 - 11904: 0xCEF3,
-	26157 - 11904: 0xAC4C,
-	26158 - 11904: 0xCEF8,
-	26159 - 11904: 0xAC4F,
-	26160 - 11904: 0x93D5,
-	26161 - 11904: 0xAC52,
-	26162 - 11904: 0xCEED,
-	26163 - 11904: 0xCEF2,
-	26164 - 11904: 0xCEF6,
-	26165 - 11904: 0xCEEE,
-	26166 - 11904: 0xCEEB,
-	26169 - 11904: 0xCEF7,
-	26170 - 11904: 0xCEF4,
-	26177 - 11904: 0xAED0,
-	26178 - 11904: 0xAEC9,
-	26179 - 11904: 0xAECC,
-	26180 - 11904: 0xFCDA,
-	26181 - 11904: 0xAECF,
-	26183 - 11904: 0xD1D5,
-	26184 - 11904: 0x9B71,
-	26185 - 11904: 0xAECA,
-	26186 - 11904: 0xD1D3,
-	26187 - 11904: 0xFCDD,
-	26188 - 11904: 0xAECE,
-	26189 - 11904: 0x8764,
-	26191 - 11904: 0xAECB,
-	26193 - 11904: 0xD1D6,
-	26194 - 11904: 0xAECD,
-	26195 - 11904: 0x8DAF,
-	26199 - 11904: 0xFAF2,
-	26201 - 11904: 0xD5AC,
-	26202 - 11904: 0xB1DF,
-	26203 - 11904: 0xD5AB,
-	26204 - 11904: 0xD5AD,
-	26205 - 11904: 0xB1DE,
-	26206 - 11904: 0xB1E3,
-	26207 - 11904: 0xD1D4,
-	26208 - 11904: 0x87B5,
-	26209 - 11904: 0xD5AA,
-	26210 - 11904: 0xD5AE,
-	26211 - 11904: 0x93D8,
-	26212 - 11904: 0xB1E0,
-	26213 - 11904: 0xD5A9,
-	26214 - 11904: 0xB1E2,
-	26215 - 11904: 0xFCDF,
-	26216 - 11904: 0xB1E1,
-	26218 - 11904: 0xD9A7,
-	26219 - 11904: 0x93D3,
-	26220 - 11904: 0xD9A2,
-	26222 - 11904: 0xB4B6,
-	26223 - 11904: 0xB4BA,
-	26224 - 11904: 0xB4B7,
-	26225 - 11904: 0xD9A5,
-	26226 - 11904: 0xD9A8,
-	26227 - 11904: 0xFCE1,
-	26228 - 11904: 0xFCE2,
-	26230 - 11904: 0xB4B9,
-	26231 - 11904: 0xB4BE,
-	26232 - 11904: 0xDDC7,
-	26233 - 11904: 0xD9A6,
-	26234 - 11904: 0xB4BC,
-	26235 - 11904: 0xD9A3,
-	26236 - 11904: 0xD9A1,
-	26237 - 11904: 0x8E76,
-	26238 - 11904: 0xB4BD,
-	26240 - 11904: 0xD9A4,
-	26244 - 11904: 0xB779,
-	26245 - 11904: 0xFC62,
-	26246 - 11904: 0xDDBF,
-	26247 - 11904: 0xB776,
-	26248 - 11904: 0xB777,
-	26249 - 11904: 0xB775,
-	26250 - 11904: 0xDDC4,
-	26251 - 11904: 0xDDC3,
-	26252 - 11904: 0xDDC0,
-	26253 - 11904: 0xB77B,
-	26254 - 11904: 0x93D1,
-	26256 - 11904: 0xDDC2,
-	26257 - 11904: 0xB4BB,
-	26258 - 11904: 0x8DB1,
-	26260 - 11904: 0xDDC6,
-	26261 - 11904: 0xDDC1,
-	26262 - 11904: 0xB778,
-	26263 - 11904: 0xB774,
-	26264 - 11904: 0xB77A,
-	26265 - 11904: 0xDDC5,
-	26266 - 11904: 0x9859,
-	26269 - 11904: 0xBA5C,
-	26271 - 11904: 0xE1F8,
-	26272 - 11904: 0xE1F7,
-	26273 - 11904: 0xE1F6,
-	26274 - 11904: 0xBA5A,
-	26276 - 11904: 0xFB52,
-	26280 - 11904: 0xBA5B,
-	26281 - 11904: 0xE5C5,
-	26282 - 11904: 0xE5C8,
-	26283 - 11904: 0xBCC8,
-	26285 - 11904: 0xFB53,
-	26286 - 11904: 0xBCC7,
-	26287 - 11904: 0xE5C9,
-	26288 - 11904: 0xE5C4,
-	26289 - 11904: 0xBCCA,
-	26290 - 11904: 0xE5C6,
-	26291 - 11904: 0xFB4D,
-	26292 - 11904: 0xBCC9,
-	26293 - 11904: 0xE5C3,
-	26294 - 11904: 0x9CBF,
-	26295 - 11904: 0xE5C7,
-	26296 - 11904: 0xBEE9,
-	26297 - 11904: 0xBEE6,
-	26298 - 11904: 0xE9BB,
-	26299 - 11904: 0xE9BA,
-	26301 - 11904: 0xE9B9,
-	26302 - 11904: 0xE9B4,
-	26303 - 11904: 0x9B72,
-	26304 - 11904: 0xE9B5,
-	26308 - 11904: 0xBEE7,
-	26310 - 11904: 0xBEE4,
-	26311 - 11904: 0xBEE8,
-	26312 - 11904: 0xE9B3,
-	26313 - 11904: 0xBEE5,
-	26314 - 11904: 0xE9B6,
-	26315 - 11904: 0xE9B7,
-	26316 - 11904: 0xE9BC,
-	26317 - 11904: 0xFB50,
-	26318 - 11904: 0x93BE,
-	26319 - 11904: 0xE9B8,
-	26322 - 11904: 0xECF2,
-	26326 - 11904: 0xC0C7,
-	26328 - 11904: 0xEFDC,
-	26329 - 11904: 0xC0C6,
-	26330 - 11904: 0xEFDA,
-	26331 - 11904: 0xEFDB,
-	26332 - 11904: 0xC260,
-	26333 - 11904: 0xC36E,
-	26334 - 11904: 0xF24B,
-	26336 - 11904: 0xC36D,
-	26339 - 11904: 0xF451,
-	26340 - 11904: 0xF452,
-	26342 - 11904: 0xC466,
-	26343 - 11904: 0x8CDB,
-	26344 - 11904: 0xF450,
-	26345 - 11904: 0xC4E4,
-	26347 - 11904: 0xF7DF,
-	26348 - 11904: 0xC5CE,
-	26349 - 11904: 0xF8AA,
-	26350 - 11904: 0xF8AB,
-	26352 - 11904: 0xA4EA,
-	26353 - 11904: 0x9DF1,
-	26354 - 11904: 0xA6B1,
-	26355 - 11904: 0xA6B2,
-	26356 - 11904: 0xA7F3,
-	26358 - 11904: 0xCCD1,
-	26359 - 11904: 0xAC54,
-	26360 - 11904: 0xAED1,
-	26361 - 11904: 0xB1E4,
-	26364 - 11904: 0xB0D2,
-	26366 - 11904: 0xB4BF,
-	26367 - 11904: 0xB4C0,
-	26368 - 11904: 0xB3CC,
-	26369 - 11904: 0xD9A9,
-	26370 - 11904: 0xFCEB,
-	26371 - 11904: 0xB77C,
-	26372 - 11904: 0xE1FA,
-	26373 - 11904: 0xE1F9,
-	26376 - 11904: 0xA4EB,
-	26377 - 11904: 0xA6B3,
-	26378 - 11904: 0xCCD2,
-	26379 - 11904: 0xAA42,
-	26380 - 11904: 0xA0BB,
-	26381 - 11904: 0xAA41,
-	26382 - 11904: 0x9B7E,
-	26383 - 11904: 0xCEF9,
-	26384 - 11904: 0xCEFA,
-	26386 - 11904: 0xD1D7,
-	26387 - 11904: 0xD1D8,
-	26388 - 11904: 0xAED2,
-	26389 - 11904: 0xAED3,
-	26390 - 11904: 0x8DB3,
-	26391 - 11904: 0xAED4,
-	26392 - 11904: 0xD5AF,
-	26393 - 11904: 0x8C52,
-	26395 - 11904: 0xB1E6,
-	26397 - 11904: 0xB4C2,
-	26398 - 11904: 0x9AE8,
-	26399 - 11904: 0xB4C1,
-	26400 - 11904: 0xDDC8,
-	26401 - 11904: 0xDF7A,
-	26402 - 11904: 0xE1FB,
-	26403 - 11904: 0xE9BD,
-	26405 - 11904: 0x8EDC,
-	26406 - 11904: 0xC261,
-	26407 - 11904: 0xC467,
-	26408 - 11904: 0xA4EC,
-	26410 - 11904: 0xA5BC,
-	26411 - 11904: 0xA5BD,
-	26412 - 11904: 0xA5BB,
-	26413 - 11904: 0xA5BE,
-	26414 - 11904: 0xA5BA,
-	26417 - 11904: 0xA6B6,
-	26419 - 11904: 0xC9F6,
-	26420 - 11904: 0xA6B5,
-	26421 - 11904: 0xA6B7,
-	26422 - 11904: 0x9CF9,
-	26424 - 11904: 0xC9F1,
-	26425 - 11904: 0xC9F0,
-	26426 - 11904: 0xC9F3,
-	26427 - 11904: 0xC9F2,
-	26428 - 11904: 0xC9F5,
-	26429 - 11904: 0xA6B4,
-	26430 - 11904: 0xC9EF,
-	26431 - 11904: 0xC9F4,
-	26436 - 11904: 0xFA50,
-	26437 - 11904: 0xCAFD,
-	26438 - 11904: 0xA7FD,
-	26439 - 11904: 0xCAFE,
-	26440 - 11904: 0xCB43,
-	26441 - 11904: 0xA7FC,
-	26443 - 11904: 0xCB47,
-	26444 - 11904: 0xCB42,
-	26445 - 11904: 0xCB45,
-	26446 - 11904: 0xA7F5,
-	26447 - 11904: 0xA7F6,
-	26448 - 11904: 0xA7F7,
-	26449 - 11904: 0xA7F8,
-	26451 - 11904: 0xA840,
-	26453 - 11904: 0xCB41,
-	26454 - 11904: 0xA7FA,
-	26455 - 11904: 0xA841,
-	26457 - 11904: 0xCB40,
-	26458 - 11904: 0xCB46,
-	26460 - 11904: 0xA7F9,
-	26461 - 11904: 0xCB44,
-	26462 - 11904: 0xFCF1,
-	26463 - 11904: 0xA7F4,
-	26464 - 11904: 0xA7FE,
-	26465 - 11904: 0x98E7,
-	26466 - 11904: 0xFCF3,
-	26471 - 11904: 0xFCF2,
-	26474 - 11904: 0xAA57,
-	26475 - 11904: 0x8CCA,
-	26476 - 11904: 0xCCD4,
-	26477 - 11904: 0xAA43,
-	26478 - 11904: 0x8775,
-	26479 - 11904: 0xAA4D,
-	26480 - 11904: 0xAA4E,
-	26481 - 11904: 0xAA46,
-	26482 - 11904: 0xAA58,
-	26483 - 11904: 0xAA48,
-	26484 - 11904: 0xCCDC,
-	26485 - 11904: 0xAA53,
-	26486 - 11904: 0xCCD7,
-	26487 - 11904: 0xAA49,
-	26488 - 11904: 0xCCE6,
-	26489 - 11904: 0xCCE7,
-	26490 - 11904: 0xCCDF,
-	26491 - 11904: 0xCCD8,
-	26492 - 11904: 0xAA56,
-	26493 - 11904: 0xCCE4,
-	26494 - 11904: 0xAA51,
-	26495 - 11904: 0xAA4F,
-	26497 - 11904: 0xCCE5,
-	26498 - 11904: 0x87BA,
-	26499 - 11904: 0xCCE3,
-	26500 - 11904: 0xCCDB,
-	26501 - 11904: 0xCCD3,
-	26502 - 11904: 0xCCDA,
-	26503 - 11904: 0xAA4A,
-	26505 - 11904: 0xAA50,
-	26507 - 11904: 0xAA44,
-	26508 - 11904: 0xCCDE,
-	26509 - 11904: 0xCCDD,
-	26510 - 11904: 0xCCD5,
-	26511 - 11904: 0x93E5,
-	26512 - 11904: 0xAA52,
-	26513 - 11904: 0xCCE1,
-	26514 - 11904: 0xCCD6,
-	26515 - 11904: 0xAA55,
-	26516 - 11904: 0xCCE8,
-	26517 - 11904: 0xAA45,
-	26519 - 11904: 0xAA4C,
-	26520 - 11904: 0xCCD9,
-	26521 - 11904: 0xCCE2,
-	26522 - 11904: 0xAA54,
-	26524 - 11904: 0xAA47,
-	26525 - 11904: 0xAA4B,
-	26527 - 11904: 0xCCE0,
-	26528 - 11904: 0x9A59,
-	26532 - 11904: 0x8DB5,
-	26540 - 11904: 0xFD4D,
-	26542 - 11904: 0xCF5B,
-	26543 - 11904: 0xAC5C,
-	26544 - 11904: 0xAC69,
-	26545 - 11904: 0xFD5E,
-	26546 - 11904: 0xCF56,
-	26547 - 11904: 0xCF4C,
-	26548 - 11904: 0xAC62,
-	26549 - 11904: 0xCF4A,
-	26550 - 11904: 0xAC5B,
-	26551 - 11904: 0xCF45,
-	26552 - 11904: 0xAC65,
-	26553 - 11904: 0xCF52,
-	26554 - 11904: 0xCEFE,
-	26555 - 11904: 0xCF41,
-	26559 - 11904: 0x8F7D,
-	26560 - 11904: 0xCF44,
-	26561 - 11904: 0xCEFB,
-	26562 - 11904: 0xCF51,
-	26563 - 11904: 0xCF61,
-	26564 - 11904: 0xAC60,
-	26565 - 11904: 0xCF46,
-	26566 - 11904: 0xCF58,
-	26568 - 11904: 0xCEFD,
-	26569 - 11904: 0xCF5F,
-	26570 - 11904: 0xCF60,
-	26571 - 11904: 0xCF63,
-	26572 - 11904: 0xCF5A,
-	26573 - 11904: 0xCF4B,
-	26574 - 11904: 0xCF53,
-	26575 - 11904: 0xAC66,
-	26576 - 11904: 0xAC59,
-	26577 - 11904: 0xAC61,
-	26578 - 11904: 0xAC6D,
-	26579 - 11904: 0xAC56,
-	26580 - 11904: 0xAC58,
-	26582 - 11904: 0x9547,
-	26583 - 11904: 0xFCF6,
-	26584 - 11904: 0xCF43,
-	26585 - 11904: 0xAC6A,
-	26586 - 11904: 0xAC63,
-	26587 - 11904: 0xCF5D,
-	26588 - 11904: 0xCF40,
-	26589 - 11904: 0xAC6C,
-	26590 - 11904: 0xAC67,
-	26591 - 11904: 0xCF49,
-	26594 - 11904: 0xAC6B,
-	26595 - 11904: 0xCF50,
-	26596 - 11904: 0xCF48,
-	26597 - 11904: 0xAC64,
-	26598 - 11904: 0xCF5C,
-	26599 - 11904: 0xCF54,
-	26601 - 11904: 0xAC5E,
-	26602 - 11904: 0xCF62,
-	26603 - 11904: 0xCF47,
-	26604 - 11904: 0xAC5A,
-	26605 - 11904: 0xCF59,
-	26606 - 11904: 0xCF4F,
-	26607 - 11904: 0xAC5F,
-	26608 - 11904: 0xCF55,
-	26609 - 11904: 0xAC57,
-	26610 - 11904: 0xCEFC,
-	26611 - 11904: 0xAC68,
-	26612 - 11904: 0xAEE3,
-	26613 - 11904: 0xAC5D,
-	26614 - 11904: 0xCF4E,
-	26615 - 11904: 0xCF4D,
-	26616 - 11904: 0xCF42,
-	26617 - 11904: 0x9250,
-	26618 - 11904: 0xCF5E,
-	26620 - 11904: 0xCF57,
-	26622 - 11904: 0x8968,
-	26623 - 11904: 0xAC55,
-	26624 - 11904: 0x8DB6,
-	26625 - 11904: 0xFCFB,
-	26626 - 11904: 0xA07D,
-	26627 - 11904: 0x98FC,
-	26628 - 11904: 0x8969,
-	26637 - 11904: 0xFE4F,
-	26640 - 11904: 0x9256,
-	26642 - 11904: 0xD1EC,
-	26643 - 11904: 0xAEEA,
-	26644 - 11904: 0xD1ED,
-	26646 - 11904: 0xD1E1,
-	26647 - 11904: 0xAEDF,
-	26648 - 11904: 0xAEEB,
-	26650 - 11904: 0xD1DA,
-	26651 - 11904: 0xFAC9,
-	26652 - 11904: 0xD1E3,
-	26653 - 11904: 0xD1EB,
-	26654 - 11904: 0x93E8,
-	26655 - 11904: 0xD1D9,
-	26656 - 11904: 0xD1F4,
-	26657 - 11904: 0xAED5,
-	26658 - 11904: 0xFCF8,
-	26661 - 11904: 0xD1F3,
-	26662 - 11904: 0xD1EE,
-	26664 - 11904: 0xD1EF,
-	26665 - 11904: 0xAEDD,
-	26666 - 11904: 0xAEE8,
-	26667 - 11904: 0xD1E5,
-	26669 - 11904: 0xD1E6,
-	26670 - 11904: 0xD1F0,
-	26671 - 11904: 0xD1E7,
-	26673 - 11904: 0xD1E2,
-	26674 - 11904: 0xD1DC,
-	26675 - 11904: 0xD1DD,
-	26676 - 11904: 0xD1EA,
-	26677 - 11904: 0xD1E4,
-	26678 - 11904: 0x9CE3,
-	26679 - 11904: 0xFDA9,
-	26680 - 11904: 0xAED6,
-	26681 - 11904: 0xAEDA,
-	26682 - 11904: 0xD1F2,
-	26683 - 11904: 0xD1DE,
-	26684 - 11904: 0xAEE6,
-	26685 - 11904: 0xAEE2,
-	26686 - 11904: 0xFC44,
-	26688 - 11904: 0xAEE5,
-	26689 - 11904: 0xAEEC,
-	26690 - 11904: 0xAEDB,
-	26691 - 11904: 0xAEE7,
-	26692 - 11904: 0xD1E9,
-	26693 - 11904: 0xAEE9,
-	26694 - 11904: 0xAED8,
-	26695 - 11904: 0x9640,
-	26696 - 11904: 0xAED7,
-	26697 - 11904: 0xD1DB,
-	26698 - 11904: 0x8DB8,
-	26699 - 11904: 0xD1DF,
-	26700 - 11904: 0xAEE0,
-	26701 - 11904: 0xD1F1,
-	26702 - 11904: 0xD1E8,
-	26703 - 11904: 0xD1E0,
-	26704 - 11904: 0xAEE4,
-	26705 - 11904: 0xAEE1,
-	26707 - 11904: 0xAED9,
-	26708 - 11904: 0xAEDC,
-	26709 - 11904: 0x9B4A,
-	26710 - 11904: 0x8FB9,
-	26717 - 11904: 0xFCFE,
-	26725 - 11904: 0x896A,
-	26731 - 11904: 0xD5C4,
-	26733 - 11904: 0xD5B4,
-	26734 - 11904: 0xD5B5,
-	26735 - 11904: 0xD5B9,
-	26737 - 11904: 0xD5C8,
-	26738 - 11904: 0xD5C5,
-	26740 - 11904: 0xD5BE,
-	26741 - 11904: 0xD5BD,
-	26742 - 11904: 0xB1ED,
-	26743 - 11904: 0xD5C1,
-	26744 - 11904: 0xD5D0,
-	26745 - 11904: 0xD5B0,
-	26747 - 11904: 0xD5D1,
-	26748 - 11904: 0xD5C3,
-	26749 - 11904: 0xD5D5,
-	26750 - 11904: 0xD5C9,
-	26751 - 11904: 0xB1EC,
-	26752 - 11904: 0xD5C7,
-	26753 - 11904: 0xB1E7,
-	26754 - 11904: 0xB1FC,
-	26755 - 11904: 0xB1F2,
-	26756 - 11904: 0x8DB9,
-	26757 - 11904: 0xB1F6,
-	26758 - 11904: 0xB1F5,
-	26759 - 11904: 0xD5B1,
-	26760 - 11904: 0x917E,
-	26761 - 11904: 0xD5CE,
-	26762 - 11904: 0xD5D4,
-	26763 - 11904: 0xD5CC,
-	26764 - 11904: 0xD5D3,
-	26767 - 11904: 0xD5C0,
-	26768 - 11904: 0xD5B2,
-	26769 - 11904: 0xD5D2,
-	26770 - 11904: 0xD5C2,
-	26771 - 11904: 0xB1EA,
-	26772 - 11904: 0xB1F7,
-	26774 - 11904: 0xD5CB,
-	26775 - 11904: 0xB1F0,
-	26776 - 11904: 0x93F4,
-	26779 - 11904: 0xD5CA,
-	26780 - 11904: 0xD5B3,
-	26781 - 11904: 0xB1F8,
-	26783 - 11904: 0xB1FA,
-	26784 - 11904: 0xD5CD,
-	26785 - 11904: 0xB1FB,
-	26786 - 11904: 0xB1E9,
-	26787 - 11904: 0xD5BA,
-	26788 - 11904: 0xD5CF,
-	26790 - 11904: 0xFB7C,
-	26791 - 11904: 0xB1EF,
-	26792 - 11904: 0xB1F9,
-	26793 - 11904: 0xD5BC,
-	26794 - 11904: 0xD5C6,
-	26795 - 11904: 0xD5B7,
-	26796 - 11904: 0xD5BB,
-	26797 - 11904: 0xB1F4,
-	26798 - 11904: 0xD5B6,
-	26799 - 11904: 0xB1E8,
-	26800 - 11904: 0xB1F1,
-	26801 - 11904: 0xB1EE,
-	26802 - 11904: 0xD5BF,
-	26803 - 11904: 0xAEDE,
-	26804 - 11904: 0xD9C0,
-	26805 - 11904: 0xB1EB,
-	26806 - 11904: 0x93E7,
-	26809 - 11904: 0x97EF,
-	26813 - 11904: 0xFE4A,
-	26819 - 11904: 0xFD45,
-	26820 - 11904: 0xB1F3,
-	26821 - 11904: 0x96A5,
-	26822 - 11904: 0xD9C3,
-	26823 - 11904: 0xD9D9,
-	26824 - 11904: 0xD9CE,
-	26825 - 11904: 0xB4D6,
-	26826 - 11904: 0xFEE0,
-	26827 - 11904: 0xB4D1,
-	26828 - 11904: 0xD9BD,
-	26829 - 11904: 0xB4D2,
-	26830 - 11904: 0xD9CD,
-	26832 - 11904: 0xD9C6,
-	26833 - 11904: 0xD9D3,
-	26834 - 11904: 0xB4CE,
-	26835 - 11904: 0xD9AB,
-	26836 - 11904: 0xD9D5,
-	26837 - 11904: 0xB4C4,
-	26838 - 11904: 0xD9B3,
-	26839 - 11904: 0xB4C7,
-	26840 - 11904: 0xB4C6,
-	26842 - 11904: 0xB4D7,
-	26844 - 11904: 0xD9AD,
-	26845 - 11904: 0xD9CF,
-	26846 - 11904: 0xD9D0,
-	26847 - 11904: 0xB4C9,
-	26848 - 11904: 0xB4C5,
-	26849 - 11904: 0xD9BB,
-	26851 - 11904: 0xB4D0,
-	26852 - 11904: 0xD9B6,
-	26854 - 11904: 0xD9D1,
-	26855 - 11904: 0xB4CC,
-	26856 - 11904: 0xD9C9,
-	26857 - 11904: 0xD9D6,
-	26858 - 11904: 0xD9B0,
-	26859 - 11904: 0xD9B5,
-	26860 - 11904: 0xD9AF,
-	26862 - 11904: 0xB4CB,
-	26863 - 11904: 0xD9C2,
-	26864 - 11904: 0xDDDE,
-	26865 - 11904: 0xD9B1,
-	26866 - 11904: 0xB4CF,
-	26867 - 11904: 0xD9BA,
-	26868 - 11904: 0xD9D2,
-	26869 - 11904: 0xB4CA,
-	26870 - 11904: 0xD9B7,
-	26871 - 11904: 0xD9B4,
-	26872 - 11904: 0xD9C5,
-	26873 - 11904: 0xB4CD,
-	26874 - 11904: 0xB4C3,
-	26875 - 11904: 0xB4D9,
-	26876 - 11904: 0xD9C8,
-	26877 - 11904: 0xD9C7,
-	26880 - 11904: 0xFD48,
-	26881 - 11904: 0xFD47,
-	26882 - 11904: 0xFEF2,
-	26883 - 11904: 0xFE6A,
-	26884 - 11904: 0xD9AC,
-	26885 - 11904: 0xB4C8,
-	26886 - 11904: 0xD9D4,
-	26887 - 11904: 0xD9BC,
-	26888 - 11904: 0xD9BE,
-	26889 - 11904: 0x8DBD,
-	26890 - 11904: 0xD9CB,
-	26891 - 11904: 0xD9CA,
-	26892 - 11904: 0xD9AA,
-	26893 - 11904: 0xB4D3,
-	26894 - 11904: 0xB4D5,
-	26895 - 11904: 0xD9B2,
-	26896 - 11904: 0xD9B9,
-	26897 - 11904: 0xD9C1,
-	26898 - 11904: 0xB4D4,
-	26899 - 11904: 0xD9B8,
-	26900 - 11904: 0xD9C4,
-	26901 - 11904: 0xD9D7,
-	26903 - 11904: 0xD9CC,
-	26904 - 11904: 0x9BA1,
-	26905 - 11904: 0x8CA2,
-	26906 - 11904: 0x9AB7,
-	26907 - 11904: 0x8EFC,
-	26917 - 11904: 0xD9D8,
-	26922 - 11904: 0xD9AE,
-	26924 - 11904: 0x9FA1,
-	26927 - 11904: 0xDDF2,
-	26928 - 11904: 0xB7A6,
-	26930 - 11904: 0xDDF0,
-	26931 - 11904: 0xDDDB,
-	26932 - 11904: 0xDDE0,
-	26933 - 11904: 0xDDD9,
-	26934 - 11904: 0xFD51,
-	26935 - 11904: 0xDDEC,
-	26936 - 11904: 0xDDCB,
-	26937 - 11904: 0xDDD2,
-	26939 - 11904: 0xDDEA,
-	26940 - 11904: 0xDDF4,
-	26941 - 11904: 0xDDDC,
-	26942 - 11904: 0xFAAD,
-	26943 - 11904: 0xDDCF,
-	26944 - 11904: 0xDDE2,
-	26945 - 11904: 0xDDE7,
-	26946 - 11904: 0xDDD3,
-	26947 - 11904: 0x8DBE,
-	26948 - 11904: 0xDDE4,
-	26949 - 11904: 0xDDD0,
-	26950 - 11904: 0x89A4,
-	26952 - 11904: 0xDDD7,
-	26953 - 11904: 0xDDD8,
-	26954 - 11904: 0xB7A8,
-	26955 - 11904: 0xDDEB,
-	26956 - 11904: 0xDDE9,
-	26958 - 11904: 0xDDCC,
-	26959 - 11904: 0xDDEE,
-	26961 - 11904: 0xDDEF,
-	26962 - 11904: 0xDDF1,
-	26963 - 11904: 0xB7AC,
-	26964 - 11904: 0xB7A4,
-	26965 - 11904: 0x9AD9,
-	26966 - 11904: 0xD5B8,
-	26967 - 11904: 0xDDD4,
-	26968 - 11904: 0xDDE6,
-	26969 - 11904: 0xDDD5,
-	26970 - 11904: 0xB7A1,
-	26971 - 11904: 0xB7B1,
-	26972 - 11904: 0xDDED,
-	26973 - 11904: 0xB7AF,
-	26974 - 11904: 0xB7AB,
-	26975 - 11904: 0xDDCA,
-	26976 - 11904: 0xB7A3,
-	26977 - 11904: 0xFD4E,
-	26978 - 11904: 0xDDCD,
-	26979 - 11904: 0xB7B0,
-	26980 - 11904: 0x8DC0,
-	26981 - 11904: 0xDDDD,
-	26982 - 11904: 0xDDC9,
-	26983 - 11904: 0x97F0,
-	26984 - 11904: 0xB7A9,
-	26985 - 11904: 0xDDE1,
-	26986 - 11904: 0xDDD1,
-	26987 - 11904: 0xB7AA,
-	26988 - 11904: 0xDDDA,
-	26989 - 11904: 0xB77E,
-	26990 - 11904: 0xB4D8,
-	26991 - 11904: 0xDDE3,
-	26992 - 11904: 0xD9BF,
-	26993 - 11904: 0xDDCE,
-	26994 - 11904: 0x93B4,
-	26995 - 11904: 0xFD44,
-	26996 - 11904: 0xDDE8,
-	26997 - 11904: 0xB7A5,
-	26998 - 11904: 0xDDE5,
-	26999 - 11904: 0xB7A2,
-	27000 - 11904: 0xDDDF,
-	27001 - 11904: 0xB7AD,
-	27002 - 11904: 0xDDD6,
-	27003 - 11904: 0xDDF3,
-	27008 - 11904: 0x9FA7,
-	27010 - 11904: 0xB7A7,
-	27011 - 11904: 0xDEC6,
-	27013 - 11904: 0x8DC2,
-	27014 - 11904: 0xB7AE,
-	27018 - 11904: 0x99B6,
-	27021 - 11904: 0xE24A,
-	27022 - 11904: 0xE248,
-	27024 - 11904: 0xE25E,
-	27025 - 11904: 0xE246,
-	27027 - 11904: 0xE258,
-	27028 - 11904: 0xB77D,
-	27029 - 11904: 0xBA5F,
-	27030 - 11904: 0xE242,
-	27031 - 11904: 0xE25D,
-	27032 - 11904: 0xFD52,
-	27033 - 11904: 0xE247,
-	27034 - 11904: 0xE255,
-	27035 - 11904: 0xBA64,
-	27036 - 11904: 0xBA5D,
-	27038 - 11904: 0xE25B,
-	27039 - 11904: 0x8DC1,
-	27040 - 11904: 0xE240,
-	27041 - 11904: 0xE25A,
-	27042 - 11904: 0x8E46,
-	27043 - 11904: 0xBA6F,
-	27044 - 11904: 0xE251,
-	27045 - 11904: 0xE261,
-	27046 - 11904: 0xBA6D,
-	27047 - 11904: 0xE249,
-	27048 - 11904: 0xBA5E,
-	27049 - 11904: 0xE24B,
-	27050 - 11904: 0xE259,
-	27051 - 11904: 0xBA67,
-	27052 - 11904: 0xE244,
-	27053 - 11904: 0xBA6B,
-	27054 - 11904: 0xBA61,
-	27055 - 11904: 0xE24D,
-	27056 - 11904: 0xE243,
-	27057 - 11904: 0xE1FC,
-	27058 - 11904: 0xA0D1,
-	27059 - 11904: 0xE257,
-	27060 - 11904: 0xBA68,
-	27061 - 11904: 0xE260,
-	27062 - 11904: 0xE1FD,
-	27063 - 11904: 0xBA65,
-	27065 - 11904: 0xE253,
-	27067 - 11904: 0xBA66,
-	27068 - 11904: 0xE245,
-	27069 - 11904: 0xE250,
-	27070 - 11904: 0xE24C,
-	27071 - 11904: 0xE24E,
-	27072 - 11904: 0x9FCA,
-	27073 - 11904: 0xBA60,
-	27074 - 11904: 0xE25F,
-	27075 - 11904: 0xBA6E,
-	27076 - 11904: 0xE24F,
-	27078 - 11904: 0xE262,
-	27081 - 11904: 0xE1FE,
-	27082 - 11904: 0xE254,
-	27083 - 11904: 0xBA63,
-	27084 - 11904: 0xBA6C,
-	27085 - 11904: 0xBA6A,
-	27086 - 11904: 0xE241,
-	27087 - 11904: 0xE256,
-	27088 - 11904: 0xBA69,
-	27089 - 11904: 0x92CF,
-	27091 - 11904: 0xBA62,
-	27092 - 11904: 0xE252,
-	27093 - 11904: 0x9CF4,
-	27094 - 11904: 0x8DC4,
-	27097 - 11904: 0xE25C,
-	27105 - 11904: 0xFD41,
-	27106 - 11904: 0xE5D5,
-	27108 - 11904: 0xE5D1,
-	27109 - 11904: 0xE5CD,
-	27110 - 11904: 0xE5E1,
-	27111 - 11904: 0xE5DE,
-	27112 - 11904: 0xBCCD,
-	27113 - 11904: 0x9B4C,
-	27115 - 11904: 0xE5E5,
-	27116 - 11904: 0xE5D4,
-	27117 - 11904: 0xBCD8,
-	27118 - 11904: 0xE5DB,
-	27121 - 11904: 0xE5D0,
-	27122 - 11904: 0xE5DA,
-	27123 - 11904: 0xBCD5,
-	27124 - 11904: 0xE5EE,
-	27126 - 11904: 0xE5EB,
-	27127 - 11904: 0xE5DD,
-	27128 - 11904: 0xE5CE,
-	27129 - 11904: 0xFD57,
-	27130 - 11904: 0xFCEF,
-	27131 - 11904: 0xE5E2,
-	27132 - 11904: 0xE5E4,
-	27133 - 11904: 0xBCD1,
-	27134 - 11904: 0xE5D8,
-	27135 - 11904: 0xE5D3,
-	27136 - 11904: 0xE5CA,
-	27137 - 11904: 0xBCCE,
-	27138 - 11904: 0xBCD6,
-	27139 - 11904: 0x9CDE,
-	27140 - 11904: 0xE5E7,
-	27141 - 11904: 0xBCD7,
-	27142 - 11904: 0xE5CB,
-	27143 - 11904: 0xE5ED,
-	27144 - 11904: 0xE5E0,
-	27145 - 11904: 0xE5E6,
-	27146 - 11904: 0xBCD4,
-	27147 - 11904: 0xFD42,
-	27148 - 11904: 0x986C,
-	27149 - 11904: 0xE5E3,
-	27151 - 11904: 0xE5EA,
-	27153 - 11904: 0xBCD9,
-	27155 - 11904: 0xBCD3,
-	27156 - 11904: 0xE5DC,
-	27157 - 11904: 0xE5CF,
-	27158 - 11904: 0xE5EF,
-	27159 - 11904: 0xE5CC,
-	27160 - 11904: 0xE5E8,
-	27161 - 11904: 0xBCD0,
-	27162 - 11904: 0x97F9,
-	27163 - 11904: 0xE5D6,
-	27164 - 11904: 0x9558,
-	27165 - 11904: 0xE5D7,
-	27166 - 11904: 0xBCCF,
-	27167 - 11904: 0xBCCC,
-	27168 - 11904: 0xE5D2,
-	27169 - 11904: 0xBCD2,
-	27171 - 11904: 0xBCCB,
-	27173 - 11904: 0xE5E9,
-	27174 - 11904: 0xE5EC,
-	27175 - 11904: 0xE5D9,
-	27176 - 11904: 0xE9CA,
-	27177 - 11904: 0x87B6,
-	27179 - 11904: 0x985E,
-	27180 - 11904: 0xFE7B,
-	27181 - 11904: 0x94CD,
-	27186 - 11904: 0xE9C2,
-	27187 - 11904: 0x93EE,
-	27188 - 11904: 0xE9BE,
-	27189 - 11904: 0xBEF6,
-	27192 - 11904: 0xBEEB,
-	27193 - 11904: 0xBEF0,
-	27194 - 11904: 0xBEEC,
-	27195 - 11904: 0xE9CC,
-	27196 - 11904: 0xE9D7,
-	27197 - 11904: 0xBEEA,
-	27198 - 11904: 0xE9C4,
-	27199 - 11904: 0xE9CD,
-	27200 - 11904: 0xE5DF,
-	27201 - 11904: 0xE9CE,
-	27203 - 11904: 0x8CA3,
-	27204 - 11904: 0xBEF1,
-	27205 - 11904: 0xFD5A,
-	27206 - 11904: 0xE9DD,
-	27207 - 11904: 0xBEF5,
-	27208 - 11904: 0xBEF8,
-	27209 - 11904: 0xE9C0,
-	27211 - 11904: 0xBEF4,
-	27212 - 11904: 0x93F5,
-	27213 - 11904: 0xE9DB,
-	27214 - 11904: 0xE9DC,
-	27215 - 11904: 0xE9D2,
-	27216 - 11904: 0xE9D1,
-	27217 - 11904: 0xE9C9,
-	27218 - 11904: 0x93EF,
-	27219 - 11904: 0x8EEA,
-	27220 - 11904: 0xE9D3,
-	27221 - 11904: 0xE9DA,
-	27222 - 11904: 0xE9D9,
-	27223 - 11904: 0x8F5B,
-	27224 - 11904: 0xBEEF,
-	27225 - 11904: 0xBEED,
-	27226 - 11904: 0xE9CB,
-	27227 - 11904: 0xE9C8,
-	27229 - 11904: 0xE9C5,
-	27230 - 11904: 0xE9D8,
-	27231 - 11904: 0xBEF7,
-	27232 - 11904: 0xE9D6,
-	27233 - 11904: 0xBEF3,
-	27234 - 11904: 0xBEF2,
-	27235 - 11904: 0x8C5E,
-	27236 - 11904: 0xE9D0,
-	27237 - 11904: 0x8DC6,
-	27238 - 11904: 0xE9BF,
-	27239 - 11904: 0xE9C1,
-	27240 - 11904: 0xE9C3,
-	27241 - 11904: 0xE9D5,
-	27242 - 11904: 0xE9CF,
-	27243 - 11904: 0xBEEE,
-	27245 - 11904: 0xE9C6,
-	27247 - 11904: 0xE9D4,
-	27249 - 11904: 0x8DC8,
-	27252 - 11904: 0x8DC7,
-	27254 - 11904: 0xE9C7,
-	27258 - 11904: 0x93F7,
-	27262 - 11904: 0xC0CF,
-	27263 - 11904: 0xED45,
-	27264 - 11904: 0xC0C8,
-	27265 - 11904: 0xECF5,
-	27266 - 11904: 0x8DC9,
-	27267 - 11904: 0xED41,
-	27268 - 11904: 0xC0CA,
-	27269 - 11904: 0xED48,
-	27271 - 11904: 0xECFC,
-	27273 - 11904: 0xECF7,
-	27274 - 11904: 0xFBF2,
-	27276 - 11904: 0xED49,
-	27277 - 11904: 0xECF3,
-	27278 - 11904: 0xECFE,
-	27279 - 11904: 0x9670,
-	27280 - 11904: 0xC0D1,
-	27281 - 11904: 0xED44,
-	27282 - 11904: 0xED4A,
-	27283 - 11904: 0xECFD,
-	27284 - 11904: 0xC0C9,
-	27285 - 11904: 0xED40,
-	27286 - 11904: 0xECF4,
-	27287 - 11904: 0xC0D0,
-	27289 - 11904: 0x8DCB,
-	27290 - 11904: 0xED47,
-	27291 - 11904: 0xECF9,
-	27292 - 11904: 0xC0CC,
-	27293 - 11904: 0xFD5C,
-	27294 - 11904: 0xECFB,
-	27295 - 11904: 0xECF8,
-	27296 - 11904: 0xC0D2,
-	27297 - 11904: 0xECFA,
-	27298 - 11904: 0xC0CB,
-	27299 - 11904: 0xC0CE,
-	27300 - 11904: 0xED43,
-	27301 - 11904: 0xECF6,
-	27302 - 11904: 0xED46,
-	27303 - 11904: 0x8F65,
-	27304 - 11904: 0xED42,
-	27307 - 11904: 0x8DCD,
-	27308 - 11904: 0xC263,
-	27309 - 11904: 0xEFE7,
-	27310 - 11904: 0xC268,
-	27311 - 11904: 0xC269,
-	27313 - 11904: 0x9DA8,
-	27314 - 11904: 0x94F9,
-	27315 - 11904: 0xC262,
-	27316 - 11904: 0xEFE6,
-	27317 - 11904: 0x8DCE,
-	27318 - 11904: 0xEFE3,
-	27319 - 11904: 0xEFE4,
-	27320 - 11904: 0xC266,
-	27321 - 11904: 0xEFDE,
-	27322 - 11904: 0xEFE2,
-	27323 - 11904: 0xC265,
-	27325 - 11904: 0xEFDF,
-	27326 - 11904: 0x93EA,
-	27330 - 11904: 0xC267,
-	27331 - 11904: 0xC264,
-	27333 - 11904: 0xEFDD,
-	27334 - 11904: 0xEFE1,
-	27335 - 11904: 0xEFE5,
-	27336 - 11904: 0xFD5F,
-	27337 - 11904: 0x93F0,
-	27338 - 11904: 0x9FB6,
-	27339 - 11904: 0xF251,
-	27340 - 11904: 0xF24E,
-	27341 - 11904: 0xF257,
-	27343 - 11904: 0xF256,
-	27344 - 11904: 0xF254,
-	27345 - 11904: 0xF24F,
-	27347 - 11904: 0xC372,
-	27348 - 11904: 0x8DCF,
-	27352 - 11904: 0x9763,
-	27353 - 11904: 0xF250,
-	27354 - 11904: 0xC371,
-	27355 - 11904: 0xC0CD,
-	27356 - 11904: 0xF253,
-	27357 - 11904: 0xC370,
-	27358 - 11904: 0xF258,
-	27359 - 11904: 0xF252,
-	27360 - 11904: 0xF24D,
-	27361 - 11904: 0xEFE0,
-	27365 - 11904: 0xC36F,
-	27367 - 11904: 0xF24C,
-	27368 - 11904: 0xF456,
-	27370 - 11904: 0xF455,
-	27371 - 11904: 0xF255,
-	27372 - 11904: 0xC468,
-	27374 - 11904: 0xF459,
-	27375 - 11904: 0xF45A,
-	27376 - 11904: 0xF454,
-	27377 - 11904: 0xF458,
-	27379 - 11904: 0xF453,
-	27382 - 11904: 0x8DD0,
-	27384 - 11904: 0xF5D1,
-	27385 - 11904: 0xF457,
-	27386 - 11904: 0xC4E7,
-	27387 - 11904: 0xC4E5,
-	27388 - 11904: 0xF5CF,
-	27392 - 11904: 0xF5D2,
-	27394 - 11904: 0xF5CE,
-	27395 - 11904: 0xF5D0,
-	27396 - 11904: 0xC4E6,
-	27397 - 11904: 0x93F1,
-	27400 - 11904: 0xF6E5,
-	27401 - 11904: 0xF6E6,
-	27402 - 11904: 0xC576,
-	27403 - 11904: 0xF6E4,
-	27407 - 11904: 0xF7E2,
-	27408 - 11904: 0xC5CF,
-	27409 - 11904: 0xF7E0,
-	27410 - 11904: 0xF7E1,
-	27411 - 11904: 0xF8AC,
-	27414 - 11904: 0xC656,
-	27415 - 11904: 0xF8F3,
-	27416 - 11904: 0xF8F1,
-	27417 - 11904: 0xF8F2,
-	27418 - 11904: 0xF8F4,
-	27421 - 11904: 0xFD62,
-	27422 - 11904: 0xF9BB,
-	27424 - 11904: 0xA4ED,
-	27425 - 11904: 0xA6B8,
-	27427 - 11904: 0xAA59,
-	27429 - 11904: 0xCCE9,
-	27432 - 11904: 0xCF64,
-	27436 - 11904: 0xD1F5,
-	27437 - 11904: 0xD1F7,
-	27439 - 11904: 0xD1F6,
-	27441 - 11904: 0xD1F8,
-	27442 - 11904: 0xB1FD,
-	27443 - 11904: 0xD5D7,
-	27444 - 11904: 0xD1F9,
-	27445 - 11904: 0xFD65,
-	27446 - 11904: 0xD5D6,
-	27447 - 11904: 0xD5D8,
-	27448 - 11904: 0xD5D9,
-	27449 - 11904: 0xD9DA,
-	27450 - 11904: 0xB4DB,
-	27451 - 11904: 0xD9DB,
-	27452 - 11904: 0xD9DD,
-	27453 - 11904: 0xB4DC,
-	27454 - 11904: 0xB4DA,
-	27455 - 11904: 0xD9DC,
-	27457 - 11904: 0xDDFA,
-	27458 - 11904: 0xDDF8,
-	27459 - 11904: 0xDDF7,
-	27461 - 11904: 0xDDF6,
-	27462 - 11904: 0xDDF5,
-	27463 - 11904: 0xB7B2,
-	27464 - 11904: 0xDDF9,
-	27465 - 11904: 0xBA70,
-	27466 - 11904: 0xE263,
-	27467 - 11904: 0xE265,
-	27468 - 11904: 0xBA71,
-	27469 - 11904: 0xE264,
-	27470 - 11904: 0xBCDB,
-	27472 - 11904: 0xBCDA,
-	27473 - 11904: 0xE5F0,
-	27474 - 11904: 0x9FDB,
-	27476 - 11904: 0xE9DF,
-	27477 - 11904: 0xE9DE,
-	27478 - 11904: 0xE9E0,
-	27479 - 11904: 0x93F8,
-	27481 - 11904: 0xBEF9,
-	27483 - 11904: 0xED4B,
-	27484 - 11904: 0xC0D3,
-	27486 - 11904: 0xEFE8,
-	27487 - 11904: 0xC26A,
-	27488 - 11904: 0xF259,
-	27489 - 11904: 0xC577,
-	27490 - 11904: 0xA4EE,
-	27491 - 11904: 0xA5BF,
-	27492 - 11904: 0xA6B9,
-	27493 - 11904: 0xA842,
-	27494 - 11904: 0xAA5A,
-	27495 - 11904: 0xAA5B,
-	27498 - 11904: 0xAC6E,
-	27501 - 11904: 0xD1FA,
-	27503 - 11904: 0x8BF7,
-	27506 - 11904: 0xB7B3,
-	27508 - 11904: 0xFD66,
-	27510 - 11904: 0xE6D1,
-	27511 - 11904: 0xBEFA,
-	27512 - 11904: 0xC26B,
-	27513 - 11904: 0xA4EF,
-	27514 - 11904: 0x8BCF,
-	27515 - 11904: 0xA6BA,
-	27518 - 11904: 0xCCEB,
-	27519 - 11904: 0xAA5C,
-	27520 - 11904: 0xCCEA,
-	27521 - 11904: 0x8DD1,
-	27522 - 11904: 0xCF65,
-	27523 - 11904: 0xAC6F,
-	27524 - 11904: 0xCF66,
-	27526 - 11904: 0xAC70,
-	27528 - 11904: 0xD1FC,
-	27529 - 11904: 0xAEEE,
-	27530 - 11904: 0xAEED,
-	27532 - 11904: 0xD5DE,
-	27533 - 11904: 0xD5DC,
-	27534 - 11904: 0xD5DD,
-	27535 - 11904: 0xD5DB,
-	27537 - 11904: 0xD5DA,
-	27540 - 11904: 0xD9DE,
-	27541 - 11904: 0xD9E1,
-	27542 - 11904: 0xB4DE,
-	27543 - 11904: 0xD9DF,
-	27544 - 11904: 0xB4DD,
-	27545 - 11904: 0xD9E0,
-	27547 - 11904: 0xDDFB,
-	27550 - 11904: 0xE266,
-	27551 - 11904: 0xE267,
-	27552 - 11904: 0xE268,
-	27554 - 11904: 0xE5F3,
-	27555 - 11904: 0xE5F2,
-	27556 - 11904: 0xBCDC,
-	27557 - 11904: 0xE5F1,
-	27558 - 11904: 0xE5F4,
-	27559 - 11904: 0xE9E1,
-	27562 - 11904: 0xE9E2,
-	27563 - 11904: 0xE9E3,
-	27565 - 11904: 0xED4C,
-	27566 - 11904: 0xC0D4,
-	27567 - 11904: 0xC26C,
-	27568 - 11904: 0xF25A,
-	27570 - 11904: 0xC4E8,
-	27571 - 11904: 0xC95F,
-	27573 - 11904: 0xAC71,
-	27574 - 11904: 0xCF67,
-	27575 - 11904: 0xAEEF,
-	27578 - 11904: 0xB1FE,
-	27580 - 11904: 0xB4DF,
-	27581 - 11904: 0xD9E2,
-	27583 - 11904: 0xB7B5,
-	27584 - 11904: 0xB7B4,
-	27585 - 11904: 0x8DD2,
-	27587 - 11904: 0xE269,
-	27588 - 11904: 0xE26A,
-	27589 - 11904: 0xBCDD,
-	27590 - 11904: 0xBCDE,
-	27591 - 11904: 0xE9E5,
-	27592 - 11904: 0xE9E4,
-	27593 - 11904: 0xEFE9,
-	27594 - 11904: 0xF7E3,
-	27595 - 11904: 0xA4F0,
-	27596 - 11904: 0xC960,
-	27597 - 11904: 0xA5C0,
-	27599 - 11904: 0xA843,
-	27600 - 11904: 0xCB48,
-	27602 - 11904: 0xAC72,
-	27603 - 11904: 0xB7B6,
-	27604 - 11904: 0xA4F1,
-	27606 - 11904: 0xCF68,
-	27607 - 11904: 0xAC73,
-	27608 - 11904: 0xCF69,
-	27610 - 11904: 0xC0D5,
-	27611 - 11904: 0xA4F2,
-	27612 - 11904: 0xFD71,
-	27614 - 11904: 0xCCEC,
-	27616 - 11904: 0xCF6A,
-	27617 - 11904: 0xFD6F,
-	27618 - 11904: 0xD242,
-	27619 - 11904: 0xD241,
-	27620 - 11904: 0xD1FE,
-	27622 - 11904: 0xD1FD,
-	27623 - 11904: 0xD243,
-	27624 - 11904: 0xD240,
-	27626 - 11904: 0x8DD3,
-	27627 - 11904: 0xB240,
-	27628 - 11904: 0xB241,
-	27631 - 11904: 0xB4E0,
-	27632 - 11904: 0xD9E3,
-	27634 - 11904: 0xD9E4,
-	27635 - 11904: 0xD9E5,
-	27639 - 11904: 0xDE41,
-	27640 - 11904: 0xDE42,
-	27641 - 11904: 0xDE40,
-	27642 - 11904: 0x9FE7,
-	27643 - 11904: 0xDDFD,
-	27644 - 11904: 0xDDFE,
-	27645 - 11904: 0xB7B7,
-	27646 - 11904: 0xE26B,
-	27647 - 11904: 0xE5F7,
-	27648 - 11904: 0xE5F6,
-	27649 - 11904: 0xE5F5,
-	27650 - 11904: 0xE5F8,
-	27651 - 11904: 0xE9E7,
-	27652 - 11904: 0xE9E6,
-	27653 - 11904: 0xBEFB,
-	27654 - 11904: 0xE9E8,
-	27656 - 11904: 0xC0D6,
-	27657 - 11904: 0xED4D,
-	27659 - 11904: 0xEFEA,
-	27660 - 11904: 0xF25B,
-	27661 - 11904: 0xF6E7,
-	27663 - 11904: 0xA4F3,
-	27664 - 11904: 0xA5C2,
-	27665 - 11904: 0xA5C1,
-	27667 - 11904: 0xAA5D,
-	27668 - 11904: 0xC961,
-	27669 - 11904: 0xC97E,
-	27670 - 11904: 0xA6BB,
-	27672 - 11904: 0xC9F7,
-	27673 - 11904: 0xCB49,
-	27674 - 11904: 0xCB4A,
-	27675 - 11904: 0xAA5E,
-	27676 - 11904: 0x90BD,
-	27677 - 11904: 0xCCED,
-	27679 - 11904: 0xAC74,
-	27680 - 11904: 0xCF6B,
-	27681 - 11904: 0xCF6C,
-	27683 - 11904: 0xAEF0,
-	27684 - 11904: 0xAEF4,
-	27685 - 11904: 0xD244,
-	27686 - 11904: 0xAEF3,
-	27687 - 11904: 0xAEF1,
-	27688 - 11904: 0xAEF2,
-	27690 - 11904: 0xD5DF,
-	27691 - 11904: 0xB242,
-	27692 - 11904: 0xB4E3,
-	27694 - 11904: 0xB4E1,
-	27695 - 11904: 0xB4E2,
-	27696 - 11904: 0xD9E6,
-	27697 - 11904: 0x9FD0,
-	27699 - 11904: 0xBA72,
-	27700 - 11904: 0xA4F4,
-	27701 - 11904: 0x8BD0,
-	27702 - 11904: 0xC9A1,
-	27703 - 11904: 0xFD72,
-	27704 - 11904: 0xA5C3,
-	27705 - 11904: 0x9CAE,
-	27706 - 11904: 0x8BD1,
-	27707 - 11904: 0xC9A4,
-	27709 - 11904: 0x8ADB,
-	27710 - 11904: 0xA5C6,
-	27711 - 11904: 0xC9A3,
-	27712 - 11904: 0xA5C5,
-	27713 - 11904: 0xA5C4,
-	27714 - 11904: 0xA844,
-	27715 - 11904: 0xC9A2,
-	27718 - 11904: 0xC9F8,
-	27721 - 11904: 0xFAE4,
-	27722 - 11904: 0xC9FC,
-	27723 - 11904: 0xC9FE,
-	27724 - 11904: 0xCA40,
-	27725 - 11904: 0xA6C5,
-	27726 - 11904: 0xA6C6,
-	27727 - 11904: 0xC9FB,
-	27728 - 11904: 0xA6C1,
-	27730 - 11904: 0xC9F9,
-	27732 - 11904: 0xC9FD,
-	27733 - 11904: 0xA6C2,
-	27735 - 11904: 0xA6BD,
-	27736 - 11904: 0x95CE,
-	27737 - 11904: 0xA6BE,
-	27738 - 11904: 0xFD76,
-	27739 - 11904: 0xA6C4,
-	27740 - 11904: 0xC9FA,
-	27741 - 11904: 0xA6BC,
-	27742 - 11904: 0xA845,
-	27743 - 11904: 0xA6BF,
-	27744 - 11904: 0xA6C0,
-	27745 - 11904: 0xA6C3,
-	27749 - 11904: 0xCB5B,
-	27750 - 11904: 0xCB59,
-	27751 - 11904: 0xCB4C,
-	27752 - 11904: 0xA851,
-	27753 - 11904: 0xCB53,
-	27754 - 11904: 0xA84C,
-	27755 - 11904: 0xCB4D,
-	27757 - 11904: 0xCB55,
-	27758 - 11904: 0xFB62,
-	27759 - 11904: 0xCB52,
-	27760 - 11904: 0xA84F,
-	27761 - 11904: 0xCB51,
-	27762 - 11904: 0xA856,
-	27763 - 11904: 0xCB5A,
-	27764 - 11904: 0xA858,
-	27765 - 11904: 0x8DD4,
-	27766 - 11904: 0xA85A,
-	27768 - 11904: 0xCB4B,
-	27769 - 11904: 0xFD78,
-	27770 - 11904: 0xA84D,
-	27771 - 11904: 0xCB5C,
-	27773 - 11904: 0xA854,
-	27774 - 11904: 0xA857,
-	27775 - 11904: 0x8EE3,
-	27776 - 11904: 0xCD45,
-	27777 - 11904: 0xA847,
-	27778 - 11904: 0xA85E,
-	27779 - 11904: 0xA855,
-	27780 - 11904: 0xCB4E,
-	27781 - 11904: 0xA84A,
-	27782 - 11904: 0xA859,
-	27783 - 11904: 0xCB56,
-	27784 - 11904: 0xA848,
-	27785 - 11904: 0xA849,
-	27786 - 11904: 0xCD43,
-	27787 - 11904: 0xCB4F,
-	27788 - 11904: 0xA850,
-	27789 - 11904: 0xA85B,
-	27790 - 11904: 0xCB5D,
-	27791 - 11904: 0xCB50,
-	27792 - 11904: 0xA84E,
-	27794 - 11904: 0xA853,
-	27795 - 11904: 0xCCEE,
-	27796 - 11904: 0xA85C,
-	27797 - 11904: 0xCB57,
-	27798 - 11904: 0xA852,
-	27800 - 11904: 0xA85D,
-	27801 - 11904: 0xA846,
-	27802 - 11904: 0xCB54,
-	27803 - 11904: 0xA84B,
-	27804 - 11904: 0xFDB7,
-	27805 - 11904: 0xCD44,
-	27807 - 11904: 0x9076,
-	27810 - 11904: 0x98C6,
-	27818 - 11904: 0x8DD5,
-	27819 - 11904: 0xAA6A,
-	27820 - 11904: 0xAA7A,
-	27821 - 11904: 0xCCF5,
-	27822 - 11904: 0xAA71,
-	27823 - 11904: 0x97D1,
-	27824 - 11904: 0xCD4B,
-	27825 - 11904: 0xAA62,
-	27826 - 11904: 0x9EB6,
-	27827 - 11904: 0xAA65,
-	27828 - 11904: 0xCD42,
-	27830 - 11904: 0xCCF3,
-	27831 - 11904: 0xCCF7,
-	27832 - 11904: 0xAA6D,
-	27833 - 11904: 0xAA6F,
-	27834 - 11904: 0xCCFA,
-	27835 - 11904: 0xAA76,
-	27836 - 11904: 0xAA68,
-	27837 - 11904: 0xAA66,
-	27838 - 11904: 0xAA67,
-	27839 - 11904: 0xAA75,
-	27840 - 11904: 0xCD47,
-	27841 - 11904: 0xAA70,
-	27842 - 11904: 0xCCF9,
-	27843 - 11904: 0xCCFB,
-	27844 - 11904: 0xAA6E,
-	27845 - 11904: 0xAA73,
-	27846 - 11904: 0xCCFC,
-	27847 - 11904: 0xCD4A,
-	27849 - 11904: 0xAC75,
-	27850 - 11904: 0xAA79,
-	27851 - 11904: 0xFAC7,
-	27852 - 11904: 0xAA63,
-	27853 - 11904: 0xCD49,
-	27854 - 11904: 0xA042,
-	27855 - 11904: 0xCD4D,
-	27856 - 11904: 0xCCF8,
-	27857 - 11904: 0xCD4F,
-	27858 - 11904: 0xCD40,
-	27859 - 11904: 0xAA6C,
-	27860 - 11904: 0xCCF4,
-	27861 - 11904: 0xAA6B,
-	27862 - 11904: 0xAA7D,
-	27863 - 11904: 0xAA72,
-	27865 - 11904: 0xCCF2,
-	27866 - 11904: 0xCF75,
-	27867 - 11904: 0xAA78,
-	27868 - 11904: 0xAA7C,
-	27869 - 11904: 0xCD41,
-	27870 - 11904: 0xCD46,
-	27871 - 11904: 0x9873,
-	27872 - 11904: 0xAA7E,
-	27873 - 11904: 0xAA77,
-	27874 - 11904: 0xAA69,
-	27875 - 11904: 0xAA5F,
-	27877 - 11904: 0xAA64,
-	27879 - 11904: 0xCCF6,
-	27880 - 11904: 0xAA60,
-	27881 - 11904: 0xCD4E,
-	27882 - 11904: 0x9FFC,
-	27883 - 11904: 0xCCF0,
-	27884 - 11904: 0xCCEF,
-	27885 - 11904: 0xCCFD,
-	27886 - 11904: 0xCCF1,
-	27887 - 11904: 0xAA7B,
-	27888 - 11904: 0xAEF5,
-	27889 - 11904: 0xAA74,
-	27890 - 11904: 0xCCFE,
-	27891 - 11904: 0xAA61,
-	27893 - 11904: 0xACA6,
-	27897 - 11904: 0xCD4C,
-	27903 - 11904: 0x8CA5,
-	27904 - 11904: 0xCF7C,
-	27905 - 11904: 0xCFA1,
-	27906 - 11904: 0x8DD7,
-	27907 - 11904: 0xCFA4,
-	27908 - 11904: 0xCF77,
-	27909 - 11904: 0x92FB,
-	27910 - 11904: 0x8DD8,
-	27911 - 11904: 0xCFA7,
-	27912 - 11904: 0xCFAA,
-	27913 - 11904: 0xCFAC,
-	27914 - 11904: 0xCF74,
-	27915 - 11904: 0xAC76,
-	27916 - 11904: 0xAC7B,
-	27917 - 11904: 0xD249,
-	27918 - 11904: 0xACAD,
-	27919 - 11904: 0xCFA5,
-	27920 - 11904: 0xCFAD,
-	27921 - 11904: 0xCF7B,
-	27922 - 11904: 0xCF73,
-	27926 - 11904: 0xD264,
-	27927 - 11904: 0xAC7E,
-	27928 - 11904: 0xCFA2,
-	27929 - 11904: 0xCF78,
-	27930 - 11904: 0xCF7A,
-	27931 - 11904: 0xACA5,
-	27933 - 11904: 0xCF7D,
-	27934 - 11904: 0xAC7D,
-	27935 - 11904: 0xCF70,
-	27936 - 11904: 0xCFA8,
-	27938 - 11904: 0xCFAB,
-	27940 - 11904: 0x944F,
-	27941 - 11904: 0xAC7A,
-	27942 - 11904: 0x8DD9,
-	27943 - 11904: 0xACA8,
-	27944 - 11904: 0xCF6D,
-	27945 - 11904: 0xACAA,
-	27946 - 11904: 0xAC78,
-	27947 - 11904: 0xACAE,
-	27948 - 11904: 0xCFA9,
-	27949 - 11904: 0xCF6F,
-	27950 - 11904: 0xACAB,
-	27951 - 11904: 0xD25E,
-	27952 - 11904: 0xCD48,
-	27953 - 11904: 0xAC7C,
-	27954 - 11904: 0xAC77,
-	27955 - 11904: 0xCF76,
-	27956 - 11904: 0xCF6E,
-	27957 - 11904: 0xACAC,
-	27958 - 11904: 0xACA4,
-	27959 - 11904: 0xCFA3,
-	27960 - 11904: 0xACA9,
-	27961 - 11904: 0xACA7,
-	27962 - 11904: 0xCF79,
-	27963 - 11904: 0xACA1,
-	27964 - 11904: 0xCF71,
-	27965 - 11904: 0xACA2,
-	27966 - 11904: 0xACA3,
-	27967 - 11904: 0xCF72,
-	27968 - 11904: 0xCFA6,
-	27969 - 11904: 0xAC79,
-	27970 - 11904: 0xCF7E,
-	27982 - 11904: 0x896B,
-	27991 - 11904: 0x97CE,
-	27992 - 11904: 0xD24C,
-	27993 - 11904: 0xAEFD,
-	27994 - 11904: 0xAF43,
-	27995 - 11904: 0xFAF3,
-	27996 - 11904: 0xFDAE,
-	27998 - 11904: 0xD255,
-	27999 - 11904: 0xD25B,
-	28000 - 11904: 0xD257,
-	28001 - 11904: 0xD24A,
-	28002 - 11904: 0xD24D,
-	28003 - 11904: 0xD246,
-	28004 - 11904: 0xD247,
-	28005 - 11904: 0xAF4A,
-	28006 - 11904: 0xAEFA,
-	28007 - 11904: 0xD256,
-	28008 - 11904: 0xD25F,
-	28009 - 11904: 0xAF45,
-	28010 - 11904: 0xAEF6,
-	28012 - 11904: 0xAF40,
-	28013 - 11904: 0xD24E,
-	28014 - 11904: 0xAF42,
-	28015 - 11904: 0xD24F,
-	28016 - 11904: 0xD259,
-	28017 - 11904: 0xFBAF,
-	28018 - 11904: 0x92B7,
-	28020 - 11904: 0xAF44,
-	28021 - 11904: 0xD268,
-	28022 - 11904: 0xD248,
-	28023 - 11904: 0xAEFC,
-	28024 - 11904: 0xAEFB,
-	28025 - 11904: 0xAF48,
-	28026 - 11904: 0xD245,
-	28027 - 11904: 0xD266,
-	28028 - 11904: 0xD25A,
-	28029 - 11904: 0xD267,
-	28030 - 11904: 0xD261,
-	28031 - 11904: 0xD253,
-	28032 - 11904: 0xD262,
-	28033 - 11904: 0x8DDA,
-	28034 - 11904: 0xD25C,
-	28035 - 11904: 0xD265,
-	28036 - 11904: 0xD263,
-	28037 - 11904: 0xAF49,
-	28038 - 11904: 0xD254,
-	28039 - 11904: 0xAEF9,
-	28040 - 11904: 0xAEF8,
-	28041 - 11904: 0xAF41,
-	28042 - 11904: 0xAF47,
-	28043 - 11904: 0xD260,
-	28044 - 11904: 0xAF46,
-	28045 - 11904: 0xD251,
-	28046 - 11904: 0xB243,
-	28047 - 11904: 0x9C5A,
-	28048 - 11904: 0xD269,
-	28049 - 11904: 0xD250,
-	28050 - 11904: 0xD24B,
-	28051 - 11904: 0xAEFE,
-	28052 - 11904: 0xAF4B,
-	28053 - 11904: 0xAEF7,
-	28054 - 11904: 0xFDAD,
-	28055 - 11904: 0xD258,
-	28056 - 11904: 0xD25D,
-	28068 - 11904: 0x8DDC,
-	28069 - 11904: 0x9444,
-	28074 - 11904: 0xB265,
-	28075 - 11904: 0xD5E1,
-	28076 - 11904: 0xD5E5,
-	28078 - 11904: 0xB252,
-	28079 - 11904: 0xB250,
-	28081 - 11904: 0x8DDD,
-	28082 - 11904: 0xB247,
-	28083 - 11904: 0xD5E3,
-	28084 - 11904: 0xD5E2,
-	28085 - 11904: 0xB25B,
-	28087 - 11904: 0xD5E8,
-	28088 - 11904: 0xB255,
-	28089 - 11904: 0xA0D6,
-	28090 - 11904: 0xD5FA,
-	28091 - 11904: 0xD647,
-	28092 - 11904: 0xB244,
-	28093 - 11904: 0xD5F7,
-	28094 - 11904: 0xD5F0,
-	28095 - 11904: 0xB267,
-	28096 - 11904: 0xD5E0,
-	28098 - 11904: 0xD5FC,
-	28100 - 11904: 0xB264,
-	28101 - 11904: 0xB258,
-	28102 - 11904: 0xB263,
-	28103 - 11904: 0xB24E,
-	28104 - 11904: 0xD5EC,
-	28105 - 11904: 0xD5FE,
-	28106 - 11904: 0xD5F6,
-	28107 - 11904: 0xB24F,
-	28108 - 11904: 0xB249,
-	28109 - 11904: 0xD645,
-	28111 - 11904: 0xD5FD,
-	28112 - 11904: 0xD640,
-	28113 - 11904: 0xB251,
-	28114 - 11904: 0xB259,
-	28115 - 11904: 0xD642,
-	28116 - 11904: 0xD5EA,
-	28117 - 11904: 0xD5FB,
-	28118 - 11904: 0xD5EF,
-	28119 - 11904: 0xD644,
-	28120 - 11904: 0xB25E,
-	28121 - 11904: 0xB246,
-	28122 - 11904: 0xB25C,
-	28123 - 11904: 0xD5F4,
-	28124 - 11904: 0xD5F2,
-	28125 - 11904: 0xD5F3,
-	28126 - 11904: 0xB253,
-	28127 - 11904: 0xD5EE,
-	28128 - 11904: 0xD5ED,
-	28129 - 11904: 0xB248,
-	28130 - 11904: 0xD5E7,
-	28131 - 11904: 0xD646,
-	28132 - 11904: 0xB24A,
-	28133 - 11904: 0xD5F1,
-	28134 - 11904: 0xB268,
-	28136 - 11904: 0xB262,
-	28137 - 11904: 0xD5E6,
-	28138 - 11904: 0xB25F,
-	28139 - 11904: 0xB25D,
-	28140 - 11904: 0xB266,
-	28141 - 11904: 0xD5F8,
-	28142 - 11904: 0xB261,
-	28143 - 11904: 0xD252,
-	28144 - 11904: 0xD5F9,
-	28145 - 11904: 0xB260,
-	28146 - 11904: 0xD641,
-	28147 - 11904: 0xB245,
-	28148 - 11904: 0xD5F5,
-	28149 - 11904: 0xB257,
-	28150 - 11904: 0xD5E9,
-	28151 - 11904: 0xB256,
-	28153 - 11904: 0xB254,
-	28154 - 11904: 0xB24C,
-	28155 - 11904: 0xB24B,
-	28156 - 11904: 0xD9E7,
-	28157 - 11904: 0xD643,
-	28158 - 11904: 0x8C41,
-	28160 - 11904: 0xD5EB,
-	28162 - 11904: 0x97D5,
-	28163 - 11904: 0xD9FC,
-	28164 - 11904: 0x944A,
-	28165 - 11904: 0xB24D,
-	28170 - 11904: 0x944D,
-	28175 - 11904: 0x97CB,
-	28181 - 11904: 0x8DDE,
-	28184 - 11904: 0x8DDF,
-	28185 - 11904: 0xB541,
-	28186 - 11904: 0xB25A,
-	28187 - 11904: 0xB4EE,
-	28188 - 11904: 0xD9F6,
-	28189 - 11904: 0xFDB8,
-	28191 - 11904: 0xD9EA,
-	28192 - 11904: 0xB4EB,
-	28193 - 11904: 0xB4E7,
-	28194 - 11904: 0xDA49,
-	28195 - 11904: 0xB4ED,
-	28196 - 11904: 0xB4F1,
-	28197 - 11904: 0xB4EC,
-	28198 - 11904: 0xB4F5,
-	28199 - 11904: 0xDA4D,
-	28200 - 11904: 0xDA44,
-	28201 - 11904: 0x8DE0,
-	28202 - 11904: 0xFEF9,
-	28203 - 11904: 0xD9F1,
-	28204 - 11904: 0xB4FA,
-	28205 - 11904: 0xB4F4,
-	28206 - 11904: 0xD9FD,
-	28207 - 11904: 0xFDBB,
-	28208 - 11904: 0xDA4A,
-	28209 - 11904: 0xDA43,
-	28210 - 11904: 0xB4E8,
-	28211 - 11904: 0xD9F7,
-	28212 - 11904: 0xB4F7,
-	28213 - 11904: 0xDA55,
-	28214 - 11904: 0xDA56,
-	28216 - 11904: 0xB4E5,
-	28217 - 11904: 0xDA48,
-	28218 - 11904: 0xB4F9,
-	28219 - 11904: 0xD9FB,
-	28220 - 11904: 0xD9ED,
-	28221 - 11904: 0xD9EE,
-	28222 - 11904: 0xB4FD,
-	28223 - 11904: 0xD9F2,
-	28224 - 11904: 0xD9F9,
-	28225 - 11904: 0xD9F3,
-	28227 - 11904: 0xB4FB,
-	28228 - 11904: 0xB544,
-	28229 - 11904: 0xD9EF,
-	28230 - 11904: 0xD9E8,
-	28231 - 11904: 0xD9E9,
-	28233 - 11904: 0xD9EB,
-	28234 - 11904: 0xB4EA,
-	28235 - 11904: 0xD9F8,
-	28237 - 11904: 0xB4F8,
-	28238 - 11904: 0xB542,
-	28239 - 11904: 0xFDC0,
-	28240 - 11904: 0xFCF9,
-	28241 - 11904: 0xD9FA,
-	28242 - 11904: 0xDA53,
-	28243 - 11904: 0xDA4B,
-	28244 - 11904: 0xB4E6,
-	28245 - 11904: 0xDA51,
-	28246 - 11904: 0xB4F2,
-	28247 - 11904: 0x8CDD,
-	28248 - 11904: 0xB4F0,
-	28249 - 11904: 0xFB7E,
-	28250 - 11904: 0xDA57,
-	28251 - 11904: 0xB4EF,
-	28252 - 11904: 0xDA41,
-	28253 - 11904: 0xD9F4,
-	28254 - 11904: 0xD9FE,
-	28255 - 11904: 0xB547,
-	28256 - 11904: 0xDA45,
-	28257 - 11904: 0xDA42,
-	28258 - 11904: 0xD9F0,
-	28259 - 11904: 0xB543,
-	28260 - 11904: 0xDA4F,
-	28261 - 11904: 0xDA4C,
-	28262 - 11904: 0xDA54,
-	28263 - 11904: 0xB4E9,
-	28264 - 11904: 0xDA40,
-	28265 - 11904: 0xB546,
-	28267 - 11904: 0xDA47,
-	28270 - 11904: 0xB4F3,
-	28271 - 11904: 0xB4F6,
-	28273 - 11904: 0xDA46,
-	28274 - 11904: 0xB545,
-	28275 - 11904: 0xD9F5,
-	28276 - 11904: 0xD5E4,
-	28278 - 11904: 0x92B3,
-	28279 - 11904: 0xDA50,
-	28280 - 11904: 0xDA4E,
-	28281 - 11904: 0xDA52,
-	28284 - 11904: 0xFDAF,
-	28294 - 11904: 0x8DE1,
-	28296 - 11904: 0xD9EC,
-	28297 - 11904: 0xB540,
-	28299 - 11904: 0x95D3,
-	28301 - 11904: 0xDE61,
-	28302 - 11904: 0xDE60,
-	28303 - 11904: 0xDE46,
-	28304 - 11904: 0xB7BD,
-	28306 - 11904: 0xDE5F,
-	28307 - 11904: 0xDE49,
-	28308 - 11904: 0xDE4A,
-	28310 - 11904: 0xB7C7,
-	28311 - 11904: 0xDE68,
-	28312 - 11904: 0xB7C2,
-	28313 - 11904: 0xDE5E,
-	28314 - 11904: 0x89C1,
-	28315 - 11904: 0xDE43,
-	28316 - 11904: 0xB7C8,
-	28317 - 11904: 0xB7BE,
-	28318 - 11904: 0xDE52,
-	28319 - 11904: 0xDE48,
-	28320 - 11904: 0xDE4B,
-	28321 - 11904: 0xDE63,
-	28322 - 11904: 0xB7B8,
-	28323 - 11904: 0xDE6A,
-	28324 - 11904: 0xDE62,
-	28325 - 11904: 0xB7C1,
-	28326 - 11904: 0xDE57,
-	28327 - 11904: 0xB7CC,
-	28330 - 11904: 0xB7CB,
-	28331 - 11904: 0xB7C5,
-	28334 - 11904: 0xDE69,
-	28335 - 11904: 0xB7B9,
-	28336 - 11904: 0xDE55,
-	28337 - 11904: 0xDE4C,
-	28338 - 11904: 0xDE59,
-	28339 - 11904: 0xDE65,
-	28340 - 11904: 0xB7CD,
-	28341 - 11904: 0xFD68,
-	28342 - 11904: 0xB7BB,
-	28343 - 11904: 0xDE54,
-	28344 - 11904: 0x9CB7,
-	28345 - 11904: 0xDE4D,
-	28346 - 11904: 0xB7C4,
-	28347 - 11904: 0x8DE3,
-	28348 - 11904: 0xB7C3,
-	28349 - 11904: 0xDE50,
-	28350 - 11904: 0xDE5A,
-	28351 - 11904: 0xDE64,
-	28352 - 11904: 0xDE47,
-	28353 - 11904: 0xDE51,
-	28354 - 11904: 0xB7BC,
-	28355 - 11904: 0xDE5B,
-	28356 - 11904: 0xB7C9,
-	28357 - 11904: 0xB7C0,
-	28358 - 11904: 0xDE4E,
-	28359 - 11904: 0xB7BF,
-	28360 - 11904: 0xDE45,
-	28361 - 11904: 0xDE53,
-	28362 - 11904: 0xDE67,
-	28363 - 11904: 0xB4FE,
-	28364 - 11904: 0xBAB0,
-	28365 - 11904: 0xDE56,
-	28366 - 11904: 0xE26C,
-	28367 - 11904: 0xDE58,
-	28368 - 11904: 0xDE66,
-	28369 - 11904: 0xB7C6,
-	28370 - 11904: 0xDE4F,
-	28371 - 11904: 0xB7BA,
-	28372 - 11904: 0xB7CA,
-	28373 - 11904: 0xBCF0,
-	28374 - 11904: 0xDE44,
-	28376 - 11904: 0xDE5D,
-	28377 - 11904: 0xFAC0,
-	28378 - 11904: 0x8DE5,
-	28379 - 11904: 0xFA64,
-	28380 - 11904: 0xDE5C,
-	28381 - 11904: 0x8947,
-	28386 - 11904: 0x8DE4,
-	28392 - 11904: 0x8DE7,
-	28393 - 11904: 0x8DE8,
-	28395 - 11904: 0xE2AA,
-	28396 - 11904: 0xBAAD,
-	28397 - 11904: 0xE27D,
-	28398 - 11904: 0xE2A4,
-	28399 - 11904: 0xBAA2,
-	28401 - 11904: 0xE26E,
-	28402 - 11904: 0xBAAF,
-	28404 - 11904: 0xBA77,
-	28405 - 11904: 0xE26D,
-	28406 - 11904: 0xE2B0,
-	28407 - 11904: 0xBAB1,
-	28408 - 11904: 0xE271,
-	28409 - 11904: 0xE2A3,
-	28410 - 11904: 0xFDC7,
-	28411 - 11904: 0xE273,
-	28412 - 11904: 0xE2B3,
-	28413 - 11904: 0xE2AF,
-	28414 - 11904: 0xBA75,
-	28415 - 11904: 0xBAA1,
-	28416 - 11904: 0xE653,
-	28417 - 11904: 0xBAAE,
-	28418 - 11904: 0xBA7D,
-	28419 - 11904: 0xE26F,
-	28420 - 11904: 0xFDB0,
-	28421 - 11904: 0xE2AE,
-	28422 - 11904: 0xBAA3,
-	28423 - 11904: 0xE2AB,
-	28424 - 11904: 0xE2B8,
-	28425 - 11904: 0xE275,
-	28426 - 11904: 0xE27E,
-	28427 - 11904: 0x9445,
-	28428 - 11904: 0x97D6,
-	28429 - 11904: 0xE2B6,
-	28430 - 11904: 0xE2AC,
-	28431 - 11904: 0xBA7C,
-	28434 - 11904: 0xE27C,
-	28435 - 11904: 0xBA76,
-	28436 - 11904: 0xBA74,
-	28437 - 11904: 0xBAA8,
-	28438 - 11904: 0xFCC6,
-	28439 - 11904: 0x9844,
-	28440 - 11904: 0xE27A,
-	28441 - 11904: 0xE277,
-	28442 - 11904: 0xE278,
-	28444 - 11904: 0xE2B2,
-	28446 - 11904: 0xE2B7,
-	28447 - 11904: 0xE2B5,
-	28448 - 11904: 0xBA7A,
-	28449 - 11904: 0xE2B9,
-	28450 - 11904: 0xBA7E,
-	28451 - 11904: 0xBAA7,
-	28452 - 11904: 0x8DE9,
-	28453 - 11904: 0xE270,
-	28454 - 11904: 0xE5FA,
-	28455 - 11904: 0xE279,
-	28457 - 11904: 0xBA78,
-	28458 - 11904: 0xBAAC,
-	28459 - 11904: 0xBAA9,
-	28460 - 11904: 0xBA7B,
-	28461 - 11904: 0xE2A5,
-	28462 - 11904: 0xE274,
-	28463 - 11904: 0xBAAA,
-	28464 - 11904: 0xE2A7,
-	28465 - 11904: 0xBAA4,
-	28466 - 11904: 0xBAA6,
-	28467 - 11904: 0xBA73,
-	28468 - 11904: 0x8DEA,
-	28469 - 11904: 0xE2A9,
-	28470 - 11904: 0xE2A1,
-	28471 - 11904: 0xE272,
-	28472 - 11904: 0xBAA5,
-	28473 - 11904: 0xE2B1,
-	28474 - 11904: 0xE2B4,
-	28475 - 11904: 0xE27B,
-	28476 - 11904: 0xE2A8,
-	28477 - 11904: 0xFE50,
-	28478 - 11904: 0xBA79,
-	28479 - 11904: 0xBCDF,
-	28480 - 11904: 0xE2A6,
-	28481 - 11904: 0xE5F9,
-	28483 - 11904: 0xE2AD,
-	28484 - 11904: 0xFDCC,
-	28494 - 11904: 0xE276,
-	28495 - 11904: 0xE644,
-	28496 - 11904: 0xE64E,
-	28497 - 11904: 0xBCE2,
-	28498 - 11904: 0xE64D,
-	28499 - 11904: 0xE659,
-	28500 - 11904: 0xBCE4,
-	28501 - 11904: 0xE64B,
-	28502 - 11904: 0x9DA7,
-	28503 - 11904: 0xE64F,
-	28504 - 11904: 0xBCEF,
-	28506 - 11904: 0xE646,
-	28507 - 11904: 0xBCE7,
-	28508 - 11904: 0xFDCD,
-	28509 - 11904: 0xE652,
-	28510 - 11904: 0xE9F0,
-	28511 - 11904: 0xBCF3,
-	28512 - 11904: 0xBCF2,
-	28513 - 11904: 0xE654,
-	28514 - 11904: 0xE643,
-	28515 - 11904: 0xE65E,
-	28516 - 11904: 0xBCED,
-	28518 - 11904: 0xBCE3,
-	28519 - 11904: 0xE657,
-	28521 - 11904: 0xE65B,
-	28522 - 11904: 0xE660,
-	28523 - 11904: 0xE655,
-	28524 - 11904: 0xE649,
-	28525 - 11904: 0xBCE6,
-	28526 - 11904: 0xBCE9,
-	28527 - 11904: 0xBCF1,
-	28528 - 11904: 0xBCEC,
-	28530 - 11904: 0xE64C,
-	28531 - 11904: 0xE2A2,
-	28532 - 11904: 0xFDCF,
-	28534 - 11904: 0xE648,
-	28535 - 11904: 0xE65F,
-	28536 - 11904: 0xBCE8,
-	28537 - 11904: 0x95D2,
-	28538 - 11904: 0xBCEB,
-	28539 - 11904: 0xE661,
-	28540 - 11904: 0xBCE0,
-	28541 - 11904: 0xE656,
-	28542 - 11904: 0xE5FB,
-	28543 - 11904: 0xE65C,
-	28544 - 11904: 0xC0DF,
-	28545 - 11904: 0x8DED,
-	28546 - 11904: 0xE64A,
-	28548 - 11904: 0xBCE1,
-	28549 - 11904: 0xE645,
-	28550 - 11904: 0xBCE5,
-	28551 - 11904: 0xE5FC,
-	28552 - 11904: 0xBAAB,
-	28553 - 11904: 0xE641,
-	28554 - 11904: 0xFCBA,
-	28555 - 11904: 0xE65A,
-	28556 - 11904: 0xE642,
-	28557 - 11904: 0xE640,
-	28558 - 11904: 0xBCEA,
-	28560 - 11904: 0xE658,
-	28562 - 11904: 0xE5FE,
-	28563 - 11904: 0xE651,
-	28564 - 11904: 0xE650,
-	28565 - 11904: 0xE65D,
-	28566 - 11904: 0xE647,
-	28567 - 11904: 0xBCEE,
-	28573 - 11904: 0xFDC5,
-	28574 - 11904: 0xE9F3,
-	28575 - 11904: 0xFDD2,
-	28576 - 11904: 0xBF49,
-	28577 - 11904: 0xBEFE,
-	28578 - 11904: 0xEA40,
-	28579 - 11904: 0xE9EB,
-	28580 - 11904: 0xBF41,
-	28581 - 11904: 0xE9F7,
-	28582 - 11904: 0xBF48,
-	28583 - 11904: 0xBF43,
-	28584 - 11904: 0xE9F5,
-	28585 - 11904: 0xED4F,
-	28586 - 11904: 0xE9FB,
-	28587 - 11904: 0xEA42,
-	28588 - 11904: 0xE9FA,
-	28589 - 11904: 0xE9E9,
-	28590 - 11904: 0xE9F8,
-	28591 - 11904: 0xEA44,
-	28592 - 11904: 0xEA46,
-	28593 - 11904: 0xBEFD,
-	28594 - 11904: 0xEA45,
-	28595 - 11904: 0xBF44,
-	28596 - 11904: 0xBF4A,
-	28597 - 11904: 0x9CDC,
-	28598 - 11904: 0xBF47,
-	28600 - 11904: 0xE9FE,
-	28601 - 11904: 0xBF46,
-	28602 - 11904: 0xE9F9,
-	28603 - 11904: 0x95CF,
-	28604 - 11904: 0xE9ED,
-	28605 - 11904: 0xE9F2,
-	28606 - 11904: 0x8DEE,
-	28607 - 11904: 0xE9FD,
-	28608 - 11904: 0xBF45,
-	28609 - 11904: 0xBF42,
-	28610 - 11904: 0xBEFC,
-	28611 - 11904: 0xBF40,
-	28612 - 11904: 0xE9F1,
-	28614 - 11904: 0xE5FD,
-	28615 - 11904: 0xE9EC,
-	28616 - 11904: 0xE9EF,
-	28617 - 11904: 0xEA41,
-	28618 - 11904: 0xE9F4,
-	28619 - 11904: 0xE9EA,
-	28620 - 11904: 0xED4E,
-	28621 - 11904: 0xEA43,
-	28622 - 11904: 0xE9EE,
-	28623 - 11904: 0xE9FC,
-	28627 - 11904: 0xFDD4,
-	28628 - 11904: 0xED51,
-	28629 - 11904: 0xC0E3,
-	28632 - 11904: 0xC0D7,
-	28633 - 11904: 0x96EC,
-	28634 - 11904: 0x96EB,
-	28635 - 11904: 0xC0DB,
-	28636 - 11904: 0xED53,
-	28637 - 11904: 0xED59,
-	28638 - 11904: 0xED57,
-	28639 - 11904: 0xC0D9,
-	28640 - 11904: 0xC0DA,
-	28641 - 11904: 0xC0E1,
-	28642 - 11904: 0xED5A,
-	28643 - 11904: 0xED52,
-	28644 - 11904: 0xC0DC,
-	28646 - 11904: 0xED56,
-	28647 - 11904: 0xED55,
-	28648 - 11904: 0xED5B,
-	28649 - 11904: 0xC0E2,
-	28651 - 11904: 0xC0DD,
-	28652 - 11904: 0xC0E0,
-	28653 - 11904: 0xED54,
-	28654 - 11904: 0xC0E4,
-	28655 - 11904: 0xC0DE,
-	28656 - 11904: 0xC0E5,
-	28657 - 11904: 0xC0D8,
-	28658 - 11904: 0xED58,
-	28660 - 11904: 0xED50,
-	28662 - 11904: 0x90B6,
-	28663 - 11904: 0xEFF7,
-	28664 - 11904: 0xFDC3,
-	28666 - 11904: 0xC271,
-	28667 - 11904: 0xEFF4,
-	28668 - 11904: 0xEFF6,
-	28670 - 11904: 0xC26F,
-	28671 - 11904: 0xEFF2,
-	28672 - 11904: 0xEFF3,
-	28673 - 11904: 0xEFEE,
-	28675 - 11904: 0x98AB,
-	28676 - 11904: 0xE9F6,
-	28677 - 11904: 0xEFEF,
-	28678 - 11904: 0xC270,
-	28679 - 11904: 0xEFEB,
-	28681 - 11904: 0xC26D,
-	28682 - 11904: 0xEFF8,
-	28683 - 11904: 0xC26E,
-	28684 - 11904: 0xEFEC,
-	28685 - 11904: 0xEFED,
-	28686 - 11904: 0xEFF1,
-	28687 - 11904: 0xC273,
-	28689 - 11904: 0xC272,
-	28692 - 11904: 0xEFF0,
-	28693 - 11904: 0xC378,
-	28694 - 11904: 0xF25F,
-	28695 - 11904: 0xF265,
-	28696 - 11904: 0xC379,
-	28697 - 11904: 0xF25C,
-	28698 - 11904: 0xC376,
-	28699 - 11904: 0xC373,
-	28700 - 11904: 0xF267,
-	28701 - 11904: 0xC377,
-	28702 - 11904: 0x96EE,
-	28703 - 11904: 0xC374,
-	28704 - 11904: 0xF25E,
-	28705 - 11904: 0xF261,
-	28706 - 11904: 0xF262,
-	28707 - 11904: 0xF263,
-	28708 - 11904: 0xF266,
-	28710 - 11904: 0xEFF5,
-	28711 - 11904: 0xF25D,
-	28712 - 11904: 0xC375,
-	28713 - 11904: 0xF264,
-	28714 - 11904: 0xF268,
-	28715 - 11904: 0xF260,
-	28716 - 11904: 0x8DF4,
-	28719 - 11904: 0xF45D,
-	28720 - 11904: 0xC46A,
-	28721 - 11904: 0xF460,
-	28722 - 11904: 0xC46B,
-	28723 - 11904: 0xF468,
-	28724 - 11904: 0xF45F,
-	28725 - 11904: 0xF45C,
-	28727 - 11904: 0xF45E,
-	28728 - 11904: 0xF462,
-	28729 - 11904: 0xF465,
-	28730 - 11904: 0xF464,
-	28731 - 11904: 0xF467,
-	28732 - 11904: 0xF45B,
-	28734 - 11904: 0xC469,
-	28735 - 11904: 0xF463,
-	28736 - 11904: 0xF466,
-	28737 - 11904: 0xF469,
-	28738 - 11904: 0xF461,
-	28739 - 11904: 0xF5D3,
-	28740 - 11904: 0xF5D4,
-	28741 - 11904: 0xF5D8,
-	28742 - 11904: 0xF5D9,
-	28744 - 11904: 0xF5D6,
-	28745 - 11904: 0xF5D7,
-	28746 - 11904: 0xF5D5,
-	28747 - 11904: 0xFDE0,
-	28748 - 11904: 0xC4E9,
-	28749 - 11904: 0x8C67,
-	28752 - 11904: 0x8DF6,
-	28753 - 11904: 0xC578,
-	28754 - 11904: 0xF6EB,
-	28756 - 11904: 0x8DF7,
-	28757 - 11904: 0xF6E8,
-	28758 - 11904: 0xF6E9,
-	28759 - 11904: 0xF6EA,
-	28760 - 11904: 0xC579,
-	28762 - 11904: 0xF7E5,
-	28763 - 11904: 0xF7E4,
-	28764 - 11904: 0x8FFA,
-	28765 - 11904: 0xF8AF,
-	28766 - 11904: 0xC5F4,
-	28767 - 11904: 0xF8AD,
-	28768 - 11904: 0xF8B0,
-	28769 - 11904: 0xF8AE,
-	28770 - 11904: 0xF8F5,
-	28771 - 11904: 0xC657,
-	28772 - 11904: 0xC665,
-	28773 - 11904: 0xF9A3,
-	28774 - 11904: 0xF96C,
-	28775 - 11904: 0x97D0,
-	28776 - 11904: 0xF9A2,
-	28777 - 11904: 0xF9D0,
-	28778 - 11904: 0xF9D1,
-	28779 - 11904: 0xA4F5,
-	28780 - 11904: 0x8BD2,
-	28782 - 11904: 0x87DE,
-	28783 - 11904: 0x8DF8,
-	28784 - 11904: 0xA6C7,
-	28785 - 11904: 0xCA41,
-	28788 - 11904: 0xCB5E,
-	28789 - 11904: 0x90D9,
-	28790 - 11904: 0xA85F,
-	28791 - 11904: 0x8C47,
-	28792 - 11904: 0xA862,
-	28793 - 11904: 0xFAF0,
-	28794 - 11904: 0xCB5F,
-	28796 - 11904: 0xA860,
-	28797 - 11904: 0xA861,
-	28798 - 11904: 0xFDE1,
-	28799 - 11904: 0x8DF9,
-	28801 - 11904: 0xFDE3,
-	28802 - 11904: 0xCD58,
-	28803 - 11904: 0xCD5A,
-	28804 - 11904: 0xCD55,
-	28805 - 11904: 0xCD52,
-	28806 - 11904: 0xCD54,
-	28809 - 11904: 0x8DFA,
-	28810 - 11904: 0xAAA4,
-	28811 - 11904: 0xFB63,
-	28814 - 11904: 0xAAA2,
-	28815 - 11904: 0x90A6,
-	28817 - 11904: 0xCD56,
-	28818 - 11904: 0xAAA3,
-	28819 - 11904: 0xCD53,
-	28820 - 11904: 0xCD50,
-	28821 - 11904: 0xAAA1,
-	28822 - 11904: 0xCD57,
-	28824 - 11904: 0xCD51,
-	28825 - 11904: 0xAAA5,
-	28826 - 11904: 0xCD59,
-	28831 - 11904: 0xCFAF,
-	28832 - 11904: 0x9970,
-	28833 - 11904: 0xCFB3,
-	28835 - 11904: 0x91EB,
-	28836 - 11904: 0xACB7,
-	28837 - 11904: 0x9770,
-	28838 - 11904: 0x986F,
-	28839 - 11904: 0xFDE2,
-	28841 - 11904: 0xCFB6,
-	28843 - 11904: 0xACAF,
-	28844 - 11904: 0xACB2,
-	28845 - 11904: 0xACB4,
-	28846 - 11904: 0xACB6,
-	28847 - 11904: 0xACB3,
-	28848 - 11904: 0xCFB2,
-	28849 - 11904: 0xCFB1,
-	28851 - 11904: 0xACB1,
-	28852 - 11904: 0xCFB4,
-	28853 - 11904: 0xCFB5,
-	28855 - 11904: 0xCFAE,
-	28856 - 11904: 0xACB5,
-	28857 - 11904: 0x98F2,
-	28858 - 11904: 0xACB0,
-	28859 - 11904: 0x9AFC,
-	28860 - 11904: 0x896C,
-	28861 - 11904: 0xFDFD,
-	28862 - 11904: 0xCFB0,
-	28864 - 11904: 0x995E,
-	28868 - 11904: 0x95BD,
-	28869 - 11904: 0xD277,
-	28870 - 11904: 0xD278,
-	28871 - 11904: 0xD279,
-	28872 - 11904: 0xAF50,
-	28874 - 11904: 0xAF4C,
-	28875 - 11904: 0xD26E,
-	28876 - 11904: 0xFDE4,
-	28877 - 11904: 0xD276,
-	28878 - 11904: 0xD27B,
-	28879 - 11904: 0xAF51,
-	28880 - 11904: 0x91E6,
-	28881 - 11904: 0xD26C,
-	28882 - 11904: 0xD272,
-	28883 - 11904: 0xD26B,
-	28884 - 11904: 0xD275,
-	28885 - 11904: 0xFDE5,
-	28886 - 11904: 0xFDE6,
-	28887 - 11904: 0xD271,
-	28888 - 11904: 0xAF4D,
-	28889 - 11904: 0xAF4F,
-	28890 - 11904: 0xD27A,
-	28892 - 11904: 0xD26A,
-	28893 - 11904: 0xD26D,
-	28894 - 11904: 0xD273,
-	28895 - 11904: 0xFDE7,
-	28896 - 11904: 0xD274,
-	28897 - 11904: 0xD27C,
-	28898 - 11904: 0xD270,
-	28900 - 11904: 0xAF4E,
-	28911 - 11904: 0xB26D,
-	28912 - 11904: 0xD64E,
-	28913 - 11904: 0x9454,
-	28915 - 11904: 0xD650,
-	28916 - 11904: 0xD64C,
-	28917 - 11904: 0x99B8,
-	28918 - 11904: 0xD658,
-	28919 - 11904: 0xD64A,
-	28920 - 11904: 0xD657,
-	28921 - 11904: 0xB269,
-	28922 - 11904: 0xD648,
-	28923 - 11904: 0xDA5B,
-	28924 - 11904: 0xD652,
-	28925 - 11904: 0xB26C,
-	28926 - 11904: 0x97E9,
-	28927 - 11904: 0xD653,
-	28928 - 11904: 0xD656,
-	28930 - 11904: 0xD65A,
-	28932 - 11904: 0xD64F,
-	28933 - 11904: 0x9346,
-	28934 - 11904: 0xD654,
-	28937 - 11904: 0xB26A,
-	28938 - 11904: 0xB26B,
-	28939 - 11904: 0xD659,
-	28940 - 11904: 0xD64D,
-	28941 - 11904: 0xD649,
-	28942 - 11904: 0xD65B,
-	28944 - 11904: 0xD651,
-	28947 - 11904: 0xD655,
-	28951 - 11904: 0xD64B,
-	28953 - 11904: 0xB548,
-	28954 - 11904: 0xB549,
-	28955 - 11904: 0xDA65,
-	28956 - 11904: 0xB54F,
-	28957 - 11904: 0x9863,
-	28958 - 11904: 0xDA59,
-	28959 - 11904: 0xDA62,
-	28960 - 11904: 0xDA58,
-	28961 - 11904: 0xB54C,
-	28962 - 11904: 0xDA60,
-	28963 - 11904: 0xDA5E,
-	28965 - 11904: 0xDA5F,
-	28966 - 11904: 0xB54A,
-	28968 - 11904: 0xDA63,
-	28969 - 11904: 0x95BC,
-	28971 - 11904: 0xFDED,
-	28972 - 11904: 0xFDF7,
-	28974 - 11904: 0xDA5C,
-	28975 - 11904: 0xDA5A,
-	28976 - 11904: 0xB54B,
-	28977 - 11904: 0xDA5D,
-	28978 - 11904: 0xDA61,
-	28979 - 11904: 0x9870,
-	28980 - 11904: 0x96F6,
-	28981 - 11904: 0x8EA9,
-	28982 - 11904: 0xB54D,
-	28986 - 11904: 0xDA64,
-	28987 - 11904: 0x9451,
-	28990 - 11904: 0x8E43,
-	28992 - 11904: 0x8B5A,
-	28993 - 11904: 0xDE70,
-	28994 - 11904: 0xDE77,
-	28995 - 11904: 0xDE79,
-	28996 - 11904: 0xDEA1,
-	28997 - 11904: 0xFDEE,
-	28998 - 11904: 0xB7DA,
-	28999 - 11904: 0xDE6B,
-	29001 - 11904: 0xB7D2,
-	29002 - 11904: 0xFDF0,
-	29003 - 11904: 0xDE7A,
-	29004 - 11904: 0xB7D7,
-	29005 - 11904: 0xDEA2,
-	29006 - 11904: 0xB7CE,
-	29007 - 11904: 0xFDF4,
-	29008 - 11904: 0xDE7D,
-	29009 - 11904: 0x9BF5,
-	29010 - 11904: 0xDE6D,
-	29011 - 11904: 0xDE7E,
-	29012 - 11904: 0xDE6C,
-	29014 - 11904: 0xB7DC,
-	29015 - 11904: 0x8CEE,
-	29016 - 11904: 0xDE78,
-	29017 - 11904: 0xB7CF,
-	29018 - 11904: 0xDEA3,
-	29020 - 11904: 0xB7D4,
-	29021 - 11904: 0xDE71,
-	29022 - 11904: 0xB7D9,
-	29023 - 11904: 0xDE7C,
-	29024 - 11904: 0xDE6F,
-	29025 - 11904: 0xDE76,
-	29026 - 11904: 0xDE72,
-	29027 - 11904: 0xDE6E,
-	29028 - 11904: 0xB7D1,
-	29029 - 11904: 0xB7D8,
-	29030 - 11904: 0xB7D6,
-	29031 - 11904: 0xB7D3,
-	29032 - 11904: 0xB7DB,
-	29033 - 11904: 0xB7D0,
-	29034 - 11904: 0xDE75,
-	29035 - 11904: 0x977E,
-	29036 - 11904: 0xB7D5,
-	29038 - 11904: 0xFDF1,
-	29040 - 11904: 0xDE7B,
-	29041 - 11904: 0x9BD5,
-	29042 - 11904: 0xDE73,
-	29043 - 11904: 0x9AC3,
-	29045 - 11904: 0x97C8,
-	29046 - 11904: 0xA0DB,
-	29047 - 11904: 0x91D0,
-	29048 - 11904: 0xDE74,
-	29050 - 11904: 0x9FE4,
-	29051 - 11904: 0xE2C1,
-	29052 - 11904: 0x8FDD,
-	29053 - 11904: 0xBAB4,
-	29054 - 11904: 0x91E9,
-	29056 - 11904: 0xE2BD,
-	29057 - 11904: 0xE2C3,
-	29058 - 11904: 0xE2BF,
-	29060 - 11904: 0xBAB6,
-	29061 - 11904: 0xE2BE,
-	29062 - 11904: 0xE2C2,
-	29063 - 11904: 0xE2BA,
-	29064 - 11904: 0x98E0,
-	29065 - 11904: 0xE2BC,
-	29066 - 11904: 0xBAB5,
-	29068 - 11904: 0x92CA,
-	29070 - 11904: 0x9857,
-	29071 - 11904: 0xE2C0,
-	29072 - 11904: 0xE2BB,
-	29073 - 11904: 0x8C51,
-	29074 - 11904: 0xBAB7,
-	29076 - 11904: 0xBAB2,
-	29078 - 11904: 0xFDEB,
-	29079 - 11904: 0xE2C4,
-	29080 - 11904: 0x9B49,
-	29081 - 11904: 0xBAB3,
-	29082 - 11904: 0xE667,
-	29083 - 11904: 0xE664,
-	29084 - 11904: 0xE670,
-	29085 - 11904: 0xE66A,
-	29086 - 11904: 0xE66C,
-	29087 - 11904: 0xBCF4,
-	29088 - 11904: 0xE666,
-	29089 - 11904: 0xE66E,
-	29090 - 11904: 0x9D76,
-	29091 - 11904: 0x9EAF,
-	29092 - 11904: 0xE66D,
-	29093 - 11904: 0xE66B,
-	29095 - 11904: 0xE671,
-	29096 - 11904: 0xBCF7,
-	29097 - 11904: 0xE668,
-	29098 - 11904: 0xE66F,
-	29100 - 11904: 0xBCF5,
-	29101 - 11904: 0x9CCC,
-	29103 - 11904: 0xE663,
-	29104 - 11904: 0xE665,
-	29105 - 11904: 0xBCF6,
-	29106 - 11904: 0xE662,
-	29107 - 11904: 0xE672,
-	29108 - 11904: 0xFDEA,
-	29109 - 11904: 0xE669,
-	29111 - 11904: 0x8DF1,
-	29112 - 11904: 0xEA4A,
-	29113 - 11904: 0xBF51,
-	29114 - 11904: 0xFDFB,
-	29116 - 11904: 0xEA55,
-	29117 - 11904: 0xEA53,
-	29118 - 11904: 0xBF4B,
-	29119 - 11904: 0xEA49,
-	29120 - 11904: 0xEA4C,
-	29121 - 11904: 0xEA4D,
-	29122 - 11904: 0xEA48,
-	29123 - 11904: 0xBF55,
-	29124 - 11904: 0xBF56,
-	29125 - 11904: 0xEA47,
-	29126 - 11904: 0xEA56,
-	29127 - 11904: 0xEA51,
-	29128 - 11904: 0xBF4F,
-	29129 - 11904: 0xBF4C,
-	29130 - 11904: 0xEA50,
-	29131 - 11904: 0xEA4E,
-	29134 - 11904: 0xBF52,
-	29135 - 11904: 0xEA52,
-	29136 - 11904: 0xBF4D,
-	29137 - 11904: 0x8E53,
-	29138 - 11904: 0xBF4E,
-	29140 - 11904: 0xEA4F,
-	29141 - 11904: 0xBF50,
-	29142 - 11904: 0xEA4B,
-	29144 - 11904: 0xEA54,
-	29145 - 11904: 0xBF53,
-	29146 - 11904: 0xEA57,
-	29147 - 11904: 0xEA58,
-	29148 - 11904: 0xBF54,
-	29149 - 11904: 0xFACF,
-	29151 - 11904: 0xC0E7,
-	29152 - 11904: 0xC0EE,
-	29153 - 11904: 0xED5C,
-	29154 - 11904: 0xED62,
-	29156 - 11904: 0xED60,
-	29157 - 11904: 0xC0EA,
-	29158 - 11904: 0xC0E9,
-	29159 - 11904: 0xC0E6,
-	29160 - 11904: 0xED5E,
-	29163 - 11904: 0x96F9,
-	29164 - 11904: 0xC0EC,
-	29165 - 11904: 0xC0EB,
-	29166 - 11904: 0xC0E8,
-	29168 - 11904: 0xED61,
-	29169 - 11904: 0xED5D,
-	29170 - 11904: 0xED5F,
-	29172 - 11904: 0xC0ED,
-	29173 - 11904: 0x98BF,
-	29174 - 11904: 0x9E49,
-	29176 - 11904: 0xC277,
-	29177 - 11904: 0xEFFB,
-	29179 - 11904: 0xC274,
-	29180 - 11904: 0xC275,
-	29181 - 11904: 0xEFFD,
-	29182 - 11904: 0xC276,
-	29183 - 11904: 0xEFFA,
-	29184 - 11904: 0x8CA7,
-	29185 - 11904: 0xEFF9,
-	29186 - 11904: 0xF26C,
-	29187 - 11904: 0xEFFC,
-	29189 - 11904: 0xF26D,
-	29190 - 11904: 0xC37A,
-	29191 - 11904: 0xF26B,
-	29193 - 11904: 0x9BCA,
-	29194 - 11904: 0xF26A,
-	29196 - 11904: 0xF269,
-	29197 - 11904: 0xC37B,
-	29198 - 11904: 0xFDFE,
-	29199 - 11904: 0x92DC,
-	29200 - 11904: 0xC46C,
-	29203 - 11904: 0xF46A,
-	29204 - 11904: 0xF46B,
-	29205 - 11904: 0xFE41,
-	29206 - 11904: 0x91CC,
-	29207 - 11904: 0x91E2,
-	29209 - 11904: 0xF5DC,
-	29210 - 11904: 0xF5DB,
-	29211 - 11904: 0xC4EA,
-	29213 - 11904: 0xF5DA,
-	29214 - 11904: 0xF6EC,
-	29215 - 11904: 0xF6ED,
-	29218 - 11904: 0xF7E6,
-	29219 - 11904: 0xF8B1,
-	29220 - 11904: 0xFE44,
-	29221 - 11904: 0x875F,
-	29222 - 11904: 0xF8F6,
-	29223 - 11904: 0xF9BC,
-	29224 - 11904: 0xC679,
-	29225 - 11904: 0xF9C6,
-	29226 - 11904: 0xA4F6,
-	29227 - 11904: 0x8BD3,
-	29228 - 11904: 0xAAA6,
-	29229 - 11904: 0xAAA7,
-	29230 - 11904: 0xFE47,
-	29232 - 11904: 0xACB8,
-	29237 - 11904: 0xC0EF,
-	29238 - 11904: 0xA4F7,
-	29240 - 11904: 0xAAA8,
-	29241 - 11904: 0xAF52,
-	29242 - 11904: 0xB7DD,
-	29243 - 11904: 0xA4F8,
-	29245 - 11904: 0xB26E,
-	29246 - 11904: 0xBAB8,
-	29247 - 11904: 0xC962,
-	29248 - 11904: 0xFE48,
-	29249 - 11904: 0xCFB7,
-	29250 - 11904: 0xD27D,
-	29252 - 11904: 0xE2C5,
-	29254 - 11904: 0xC0F0,
-	29255 - 11904: 0xA4F9,
-	29256 - 11904: 0xAAA9,
-	29257 - 11904: 0xCFB8,
-	29258 - 11904: 0xCFB9,
-	29259 - 11904: 0xDA66,
-	29260 - 11904: 0xB550,
-	29263 - 11904: 0xDEA4,
-	29264 - 11904: 0xA0E4,
-	29266 - 11904: 0xB7DE,
-	29267 - 11904: 0xE2C6,
-	29269 - 11904: 0xFE4B,
-	29270 - 11904: 0xBCF8,
-	29271 - 11904: 0xFE4C,
-	29272 - 11904: 0xC37C,
-	29273 - 11904: 0xA4FA,
-	29274 - 11904: 0xDA67,
-	29275 - 11904: 0xA4FB,
-	29276 - 11904: 0x8DBF,
-	29277 - 11904: 0xA6C9,
-	29278 - 11904: 0xCA42,
-	29279 - 11904: 0xA6C8,
-	29280 - 11904: 0xA865,
-	29281 - 11904: 0xA864,
-	29282 - 11904: 0xA863,
-	29283 - 11904: 0xCB60,
-	29286 - 11904: 0x9E78,
-	29287 - 11904: 0xAAAA,
-	29289 - 11904: 0xAAAB,
-	29290 - 11904: 0xCD5B,
-	29292 - 11904: 0xCFBA,
-	29294 - 11904: 0xCFBD,
-	29295 - 11904: 0xACBA,
-	29296 - 11904: 0xCFBB,
-	29298 - 11904: 0xACB9,
-	29299 - 11904: 0xCFBC,
-	29300 - 11904: 0xACBB,
-	29302 - 11904: 0xD2A2,
-	29303 - 11904: 0xD2A1,
-	29304 - 11904: 0xD27E,
-	29305 - 11904: 0xAF53,
-	29307 - 11904: 0xD65D,
-	29308 - 11904: 0xD65E,
-	29309 - 11904: 0xB26F,
-	29310 - 11904: 0xD65C,
-	29311 - 11904: 0xD65F,
-	29312 - 11904: 0xB552,
-	29313 - 11904: 0xB270,
-	29314 - 11904: 0xFE51,
-	29316 - 11904: 0xB551,
-	29317 - 11904: 0xDA6B,
-	29318 - 11904: 0xDA6A,
-	29319 - 11904: 0x9456,
-	29320 - 11904: 0xDA68,
-	29321 - 11904: 0xDA69,
-	29323 - 11904: 0xDA6C,
-	29324 - 11904: 0xDEA6,
-	29325 - 11904: 0xDEA5,
-	29326 - 11904: 0xDEA9,
-	29327 - 11904: 0x9D61,
-	29328 - 11904: 0xDEA8,
-	29329 - 11904: 0xDEA7,
-	29330 - 11904: 0xBAB9,
-	29331 - 11904: 0xE2C9,
-	29332 - 11904: 0x9457,
-	29333 - 11904: 0xE2C8,
-	29334 - 11904: 0xBABA,
-	29335 - 11904: 0xE2C7,
-	29336 - 11904: 0xE673,
-	29338 - 11904: 0xE674,
-	29339 - 11904: 0xBCF9,
-	29341 - 11904: 0xEA59,
-	29342 - 11904: 0xEA5A,
-	29343 - 11904: 0x9966,
-	29345 - 11904: 0xF272,
-	29346 - 11904: 0xC37D,
-	29347 - 11904: 0xF271,
-	29348 - 11904: 0xF270,
-	29349 - 11904: 0xF26E,
-	29350 - 11904: 0xF26F,
-	29351 - 11904: 0xC4EB,
-	29352 - 11904: 0xF46C,
-	29353 - 11904: 0xF6EE,
-	29354 - 11904: 0xF8F7,
-	29356 - 11904: 0xA4FC,
-	29357 - 11904: 0x8BD5,
-	29358 - 11904: 0xC9A5,
-	29359 - 11904: 0xA5C7,
-	29360 - 11904: 0xC9A6,
-	29362 - 11904: 0xA069,
-	29364 - 11904: 0xCA43,
-	29365 - 11904: 0xCA44,
-	29370 - 11904: 0xCB66,
-	29373 - 11904: 0xCB62,
-	29375 - 11904: 0xCB61,
-	29376 - 11904: 0xAAAC,
-	29377 - 11904: 0xCB65,
-	29378 - 11904: 0xA867,
-	29379 - 11904: 0xCB63,
-	29380 - 11904: 0xA866,
-	29381 - 11904: 0xCB67,
-	29382 - 11904: 0xCB64,
-	29385 - 11904: 0xCD5F,
-	29386 - 11904: 0xCFBE,
-	29387 - 11904: 0xCD5D,
-	29388 - 11904: 0xCD64,
-	29389 - 11904: 0x98B4,
-	29390 - 11904: 0xAAAD,
-	29392 - 11904: 0xAAB0,
-	29393 - 11904: 0xCD65,
-	29394 - 11904: 0xCD61,
-	29396 - 11904: 0xCD62,
-	29398 - 11904: 0xCD5C,
-	29399 - 11904: 0xAAAF,
-	29400 - 11904: 0xCD5E,
-	29401 - 11904: 0xAAAE,
-	29402 - 11904: 0xCD63,
-	29404 - 11904: 0xCD60,
-	29407 - 11904: 0xCFC2,
-	29408 - 11904: 0xACBD,
-	29409 - 11904: 0xACBE,
-	29410 - 11904: 0xA049,
-	29411 - 11904: 0xCFC5,
-	29412 - 11904: 0xCFBF,
-	29414 - 11904: 0xCFC4,
-	29416 - 11904: 0xCFC0,
-	29417 - 11904: 0xACBC,
-	29418 - 11904: 0xCFC3,
-	29419 - 11904: 0xCFC1,
-	29427 - 11904: 0xD2A8,
-	29428 - 11904: 0xD2A5,
-	29430 - 11904: 0xD2A7,
-	29431 - 11904: 0xAF58,
-	29432 - 11904: 0xAF57,
-	29433 - 11904: 0xAF55,
-	29434 - 11904: 0xD2A4,
-	29435 - 11904: 0xD2A9,
-	29436 - 11904: 0xAF54,
-	29437 - 11904: 0xAF56,
-	29438 - 11904: 0xD2A6,
-	29439 - 11904: 0xD667,
-	29440 - 11904: 0xD2A3,
-	29441 - 11904: 0xD2AA,
-	29442 - 11904: 0xA04C,
-	29444 - 11904: 0x9E65,
-	29447 - 11904: 0xD662,
-	29448 - 11904: 0xD666,
-	29450 - 11904: 0xD665,
-	29451 - 11904: 0xDA6E,
-	29452 - 11904: 0xDA79,
-	29455 - 11904: 0xD668,
-	29456 - 11904: 0x98B5,
-	29457 - 11904: 0xD663,
-	29458 - 11904: 0xDA6D,
-	29459 - 11904: 0xB274,
-	29462 - 11904: 0xB273,
-	29463 - 11904: 0xD661,
-	29464 - 11904: 0xD664,
-	29465 - 11904: 0xB275,
-	29467 - 11904: 0xB272,
-	29468 - 11904: 0xB271,
-	29469 - 11904: 0xD660,
-	29470 - 11904: 0xD669,
-	29474 - 11904: 0xDA70,
-	29475 - 11904: 0xDA77,
-	29477 - 11904: 0xB554,
-	29478 - 11904: 0xDA76,
-	29479 - 11904: 0xDA73,
-	29480 - 11904: 0xFE58,
-	29481 - 11904: 0xB556,
-	29482 - 11904: 0xFE52,
-	29483 - 11904: 0xFE53,
-	29484 - 11904: 0xA065,
-	29485 - 11904: 0xDA75,
-	29486 - 11904: 0xFE59,
-	29488 - 11904: 0xDA6F,
-	29489 - 11904: 0xDA71,
-	29490 - 11904: 0xDA74,
-	29491 - 11904: 0xDA72,
-	29492 - 11904: 0xB555,
-	29493 - 11904: 0xDA78,
-	29494 - 11904: 0xB553,
-	29495 - 11904: 0xB7DF,
-	29496 - 11904: 0x98B7,
-	29497 - 11904: 0x98B8,
-	29498 - 11904: 0xDEAD,
-	29499 - 11904: 0xDEAC,
-	29500 - 11904: 0xDEAA,
-	29502 - 11904: 0xB7E2,
-	29503 - 11904: 0xB7E1,
-	29504 - 11904: 0xDEAE,
-	29505 - 11904: 0x98BA,
-	29506 - 11904: 0xDEAB,
-	29507 - 11904: 0xE2CA,
-	29508 - 11904: 0xBABB,
-	29509 - 11904: 0xB7E0,
-	29512 - 11904: 0x98BB,
-	29513 - 11904: 0xDEB0,
-	29514 - 11904: 0xDEAF,
-	29516 - 11904: 0xE2CD,
-	29517 - 11904: 0xE2CB,
-	29518 - 11904: 0xBCFA,
-	29519 - 11904: 0x9FBC,
-	29520 - 11904: 0xBABC,
-	29521 - 11904: 0xE2CC,
-	29522 - 11904: 0xE676,
-	29527 - 11904: 0xBCFB,
-	29528 - 11904: 0xE675,
-	29529 - 11904: 0xE67E,
-	29530 - 11904: 0xE67D,
-	29531 - 11904: 0xE67B,
-	29533 - 11904: 0xE67A,
-	29534 - 11904: 0xE677,
-	29535 - 11904: 0xE678,
-	29536 - 11904: 0xE679,
-	29537 - 11904: 0xE67C,
-	29538 - 11904: 0xE6A1,
-	29541 - 11904: 0xEA5F,
-	29542 - 11904: 0xEA5C,
-	29543 - 11904: 0xEA5D,
-	29544 - 11904: 0xBF57,
-	29545 - 11904: 0xEA5B,
-	29546 - 11904: 0xEA61,
-	29547 - 11904: 0xEA60,
-	29548 - 11904: 0xEA5E,
-	29550 - 11904: 0xED64,
-	29551 - 11904: 0xED65,
-	29552 - 11904: 0xC0F1,
-	29553 - 11904: 0xA04A,
-	29554 - 11904: 0xC0F2,
-	29555 - 11904: 0xED63,
-	29556 - 11904: 0x9EC7,
-	29557 - 11904: 0xC279,
-	29558 - 11904: 0xEFFE,
-	29559 - 11904: 0xC278,
-	29560 - 11904: 0xC37E,
-	29562 - 11904: 0xC3A1,
-	29563 - 11904: 0xC46D,
-	29564 - 11904: 0xF46E,
-	29565 - 11904: 0xF46D,
-	29566 - 11904: 0xF5DD,
-	29567 - 11904: 0xF6EF,
-	29568 - 11904: 0xC57A,
-	29569 - 11904: 0xF7E8,
-	29570 - 11904: 0xF7E7,
-	29571 - 11904: 0xF7E9,
-	29572 - 11904: 0xA5C8,
-	29573 - 11904: 0xCFC6,
-	29574 - 11904: 0xAF59,
-	29575 - 11904: 0xB276,
-	29576 - 11904: 0xD66A,
-	29577 - 11904: 0xA5C9,
-	29578 - 11904: 0xC9A7,
-	29579 - 11904: 0xA4FD,
-	29580 - 11904: 0x8CA9,
-	29582 - 11904: 0xCA45,
-	29583 - 11904: 0x98AE,
-	29586 - 11904: 0xCB6C,
-	29587 - 11904: 0xCB6A,
-	29588 - 11904: 0xCB6B,
-	29589 - 11904: 0xCB68,
-	29590 - 11904: 0xA868,
-	29591 - 11904: 0xCB69,
-	29592 - 11904: 0x92D6,
-	29596 - 11904: 0xFAE1,
-	29597 - 11904: 0xCD6D,
-	29598 - 11904: 0x91D4,
-	29599 - 11904: 0xAAB3,
-	29600 - 11904: 0xCD6B,
-	29601 - 11904: 0xCD67,
-	29602 - 11904: 0xCD6A,
-	29604 - 11904: 0xCD66,
-	29605 - 11904: 0xAAB5,
-	29606 - 11904: 0xCD69,
-	29607 - 11904: 0xFADE,
-	29608 - 11904: 0xAAB2,
-	29609 - 11904: 0xAAB1,
-	29610 - 11904: 0xFE5B,
-	29611 - 11904: 0xAAB4,
-	29612 - 11904: 0xCD6C,
-	29613 - 11904: 0xCD68,
-	29618 - 11904: 0xACC2,
-	29619 - 11904: 0xACC5,
-	29620 - 11904: 0xCFCE,
-	29621 - 11904: 0xCFCD,
-	29622 - 11904: 0xCFCC,
-	29623 - 11904: 0xACBF,
-	29624 - 11904: 0xCFD5,
-	29625 - 11904: 0xCFCB,
-	29626 - 11904: 0x8C53,
-	29627 - 11904: 0xACC1,
-	29628 - 11904: 0xD2AF,
-	29630 - 11904: 0xCFD2,
-	29631 - 11904: 0xCFD0,
-	29632 - 11904: 0xACC4,
-	29634 - 11904: 0xCFC8,
-	29635 - 11904: 0xCFD3,
-	29636 - 11904: 0x87BF,
-	29637 - 11904: 0xCFCA,
-	29638 - 11904: 0xCFD4,
-	29639 - 11904: 0xCFD1,
-	29640 - 11904: 0xCFC9,
-	29641 - 11904: 0xFE5E,
-	29642 - 11904: 0xACC0,
-	29643 - 11904: 0xCFD6,
-	29644 - 11904: 0xCFC7,
-	29645 - 11904: 0xACC3,
-	29646 - 11904: 0xFBD7,
-	29647 - 11904: 0xFE5A,
-	29648 - 11904: 0x94C5,
-	29650 - 11904: 0xD2B4,
-	29651 - 11904: 0xD2AB,
-	29652 - 11904: 0xD2B6,
-	29653 - 11904: 0xFACA,
-	29654 - 11904: 0xD2AE,
-	29655 - 11904: 0xD2B9,
-	29656 - 11904: 0xD2BA,
-	29657 - 11904: 0xD2AC,
-	29658 - 11904: 0xD2B8,
-	29659 - 11904: 0xD2B5,
-	29660 - 11904: 0xD2B3,
-	29661 - 11904: 0xD2B7,
-	29662 - 11904: 0xAF5F,
-	29664 - 11904: 0xAF5D,
-	29665 - 11904: 0x98C1,
-	29666 - 11904: 0x975C,
-	29667 - 11904: 0xD2B1,
-	29668 - 11904: 0xFE74,
-	29669 - 11904: 0xD2AD,
-	29670 - 11904: 0x9773,
-	29671 - 11904: 0xD2B0,
-	29672 - 11904: 0xD2BB,
-	29673 - 11904: 0xD2B2,
-	29674 - 11904: 0xAF5E,
-	29675 - 11904: 0xCFCF,
-	29677 - 11904: 0xAF5A,
-	29678 - 11904: 0xAF5C,
-	29679 - 11904: 0xFA46,
-	29683 - 11904: 0x9764,
-	29684 - 11904: 0xD678,
-	29685 - 11904: 0xD66D,
-	29686 - 11904: 0xD66B,
-	29687 - 11904: 0xFE68,
-	29688 - 11904: 0xD66C,
-	29689 - 11904: 0x964E,
-	29690 - 11904: 0xD673,
-	29691 - 11904: 0x9765,
-	29692 - 11904: 0xD674,
-	29693 - 11904: 0xD670,
-	29694 - 11904: 0xB27B,
-	29695 - 11904: 0xD675,
-	29696 - 11904: 0xD672,
-	29697 - 11904: 0xD66F,
-	29698 - 11904: 0x8C5A,
-	29699 - 11904: 0xB279,
-	29700 - 11904: 0xD66E,
-	29701 - 11904: 0xB277,
-	29702 - 11904: 0xB27A,
-	29703 - 11904: 0xD671,
-	29704 - 11904: 0xD679,
-	29705 - 11904: 0xAF5B,
-	29706 - 11904: 0xB278,
-	29707 - 11904: 0xD677,
-	29708 - 11904: 0xD676,
-	29709 - 11904: 0xB27C,
-	29713 - 11904: 0x89A1,
-	29714 - 11904: 0x95FA,
-	29716 - 11904: 0x92D4,
-	29717 - 11904: 0xFE69,
-	29718 - 11904: 0xDA7E,
-	29719 - 11904: 0xFB45,
-	29721 - 11904: 0x98C8,
-	29722 - 11904: 0xDAA1,
-	29723 - 11904: 0xB560,
-	29724 - 11904: 0x90EF,
-	29725 - 11904: 0xDAA7,
-	29726 - 11904: 0x98C9,
-	29727 - 11904: 0x98CA,
-	29728 - 11904: 0xDAA9,
-	29729 - 11904: 0xDAA2,
-	29730 - 11904: 0xB55A,
-	29731 - 11904: 0xDAA6,
-	29732 - 11904: 0xDAA5,
-	29733 - 11904: 0xB55B,
-	29734 - 11904: 0xB561,
-	29736 - 11904: 0xB562,
-	29737 - 11904: 0xDAA8,
-	29738 - 11904: 0xB558,
-	29739 - 11904: 0xDA7D,
-	29740 - 11904: 0xDA7B,
-	29741 - 11904: 0xDAA3,
-	29742 - 11904: 0xDA7A,
-	29743 - 11904: 0xB55F,
-	29744 - 11904: 0xDA7C,
-	29745 - 11904: 0xDAA4,
-	29746 - 11904: 0xDAAA,
-	29747 - 11904: 0xB559,
-	29748 - 11904: 0xB55E,
-	29749 - 11904: 0xB55C,
-	29750 - 11904: 0xB55D,
-	29751 - 11904: 0x946D,
-	29752 - 11904: 0x94B7,
-	29753 - 11904: 0xFE6C,
-	29754 - 11904: 0xB557,
-	29756 - 11904: 0x946B,
-	29759 - 11904: 0xB7E9,
-	29760 - 11904: 0xDEB7,
-	29761 - 11904: 0xB7E8,
-	29762 - 11904: 0xDEBB,
-	29763 - 11904: 0x92FC,
-	29764 - 11904: 0xDEB1,
-	29765 - 11904: 0x95EB,
-	29766 - 11904: 0xDEBC,
-	29767 - 11904: 0xFE73,
-	29768 - 11904: 0x976E,
-	29769 - 11904: 0xFE5F,
-	29770 - 11904: 0xDEB2,
-	29771 - 11904: 0xDEB3,
-	29772 - 11904: 0x87B8,
-	29773 - 11904: 0xDEBD,
-	29774 - 11904: 0xDEBA,
-	29775 - 11904: 0xDEB8,
-	29776 - 11904: 0xDEB9,
-	29777 - 11904: 0xDEB5,
-	29778 - 11904: 0xDEB4,
-	29779 - 11904: 0xFDBD,
-	29780 - 11904: 0xDEBE,
-	29781 - 11904: 0xB7E5,
-	29782 - 11904: 0x92D5,
-	29783 - 11904: 0xDEB6,
-	29785 - 11904: 0xB7EA,
-	29786 - 11904: 0xB7E4,
-	29787 - 11904: 0xB7EB,
-	29788 - 11904: 0xFE6F,
-	29789 - 11904: 0xFEB9,
-	29790 - 11904: 0xB7E7,
-	29791 - 11904: 0xB7E6,
-	29792 - 11904: 0xFE71,
-	29793 - 11904: 0x8778,
-	29794 - 11904: 0xE2CE,
-	29795 - 11904: 0xBABE,
-	29796 - 11904: 0xBABD,
-	29797 - 11904: 0xFBBB,
-	29799 - 11904: 0xE2D3,
-	29800 - 11904: 0xA0D5,
-	29801 - 11904: 0xBCFC,
-	29802 - 11904: 0xBABF,
-	29803 - 11904: 0x95FB,
-	29804 - 11904: 0xFE77,
-	29805 - 11904: 0xBAC1,
-	29806 - 11904: 0xE2D4,
-	29807 - 11904: 0xB7E3,
-	29808 - 11904: 0xBAC0,
-	29809 - 11904: 0xE2D0,
-	29810 - 11904: 0xE2D2,
-	29811 - 11904: 0xE2CF,
-	29812 - 11904: 0xFE79,
-	29813 - 11904: 0xE2D1,
-	29814 - 11904: 0xFE75,
-	29817 - 11904: 0xE6AB,
-	29818 - 11904: 0x945D,
-	29820 - 11904: 0xE6AA,
-	29821 - 11904: 0xE6A7,
-	29822 - 11904: 0xBD40,
-	29823 - 11904: 0xEA62,
-	29824 - 11904: 0xBD41,
-	29825 - 11904: 0xE6A6,
-	29826 - 11904: 0xFE7C,
-	29827 - 11904: 0xBCFE,
-	29829 - 11904: 0xE6A8,
-	29830 - 11904: 0xE6A5,
-	29831 - 11904: 0xE6A2,
-	29832 - 11904: 0xE6A9,
-	29833 - 11904: 0xE6A3,
-	29834 - 11904: 0xE6A4,
-	29835 - 11904: 0xBCFD,
-	29836 - 11904: 0x9344,
-	29837 - 11904: 0x8EA6,
-	29840 - 11904: 0xED69,
-	29842 - 11904: 0xEA66,
-	29844 - 11904: 0xEA65,
-	29845 - 11904: 0xEA67,
-	29847 - 11904: 0xED66,
-	29848 - 11904: 0xBF5A,
-	29849 - 11904: 0x92D3,
-	29850 - 11904: 0xEA63,
-	29851 - 11904: 0x94B8,
-	29852 - 11904: 0xBF58,
-	29853 - 11904: 0x8779,
-	29854 - 11904: 0xBF5C,
-	29855 - 11904: 0xBF5B,
-	29856 - 11904: 0xEA64,
-	29857 - 11904: 0xEA68,
-	29859 - 11904: 0xBF59,
-	29860 - 11904: 0xFC71,
-	29861 - 11904: 0xED6D,
-	29862 - 11904: 0xC0F5,
-	29863 - 11904: 0xC27A,
-	29864 - 11904: 0xC0F6,
-	29865 - 11904: 0xC0F3,
-	29866 - 11904: 0xED6A,
-	29867 - 11904: 0xED68,
-	29869 - 11904: 0xED6B,
-	29871 - 11904: 0xED6E,
-	29872 - 11904: 0xC0F4,
-	29873 - 11904: 0xED6C,
-	29874 - 11904: 0xED67,
-	29876 - 11904: 0x975E,
-	29877 - 11904: 0xF042,
-	29878 - 11904: 0xF045,
-	29879 - 11904: 0xF275,
-	29880 - 11904: 0xF040,
-	29881 - 11904: 0x8CAD,
-	29882 - 11904: 0xF46F,
-	29883 - 11904: 0xF046,
-	29885 - 11904: 0xC3A2,
-	29886 - 11904: 0xF044,
-	29887 - 11904: 0xC27B,
-	29888 - 11904: 0xF041,
-	29889 - 11904: 0xF043,
-	29890 - 11904: 0xF047,
-	29891 - 11904: 0xF276,
-	29893 - 11904: 0xF274,
-	29894 - 11904: 0x87C1,
-	29896 - 11904: 0xFEA7,
-	29898 - 11904: 0xC3A3,
-	29899 - 11904: 0xF273,
-	29900 - 11904: 0x946A,
-	29903 - 11904: 0xC46E,
-	29904 - 11904: 0x93E3,
-	29907 - 11904: 0x98CF,
-	29908 - 11904: 0xC4ED,
-	29909 - 11904: 0xF6F1,
-	29910 - 11904: 0xC4EC,
-	29911 - 11904: 0xF6F3,
-	29912 - 11904: 0xF6F0,
-	29913 - 11904: 0xF6F2,
-	29914 - 11904: 0xC5D0,
-	29915 - 11904: 0xF8B2,
-	29916 - 11904: 0xA5CA,
-	29917 - 11904: 0xCD6E,
-	29918 - 11904: 0xD2BC,
-	29919 - 11904: 0xD2BD,
-	29920 - 11904: 0xB27D,
-	29921 - 11904: 0xDEBF,
-	29922 - 11904: 0xBF5D,
-	29923 - 11904: 0xC3A4,
-	29924 - 11904: 0xC57B,
-	29925 - 11904: 0xF8B3,
-	29926 - 11904: 0xA5CB,
-	29927 - 11904: 0xA0D9,
-	29928 - 11904: 0xCD6F,
-	29929 - 11904: 0xFEAA,
-	29932 - 11904: 0xCFD7,
-	29934 - 11904: 0xCFD8,
-	29936 - 11904: 0xA0BF,
-	29937 - 11904: 0xA04D,
-	29938 - 11904: 0xA0B8,
-	29940 - 11904: 0xD2BE,
-	29941 - 11904: 0xD2BF,
-	29942 - 11904: 0xB27E,
-	29943 - 11904: 0xB2A1,
-	29944 - 11904: 0xA0CE,
-	29947 - 11904: 0xDAAB,
-	29949 - 11904: 0xDEC2,
-	29950 - 11904: 0xDEC1,
-	29951 - 11904: 0xDEC0,
-	29952 - 11904: 0xE2D5,
-	29954 - 11904: 0xE2D6,
-	29955 - 11904: 0xE2D7,
-	29956 - 11904: 0xBAC2,
-	29957 - 11904: 0xA0B7,
-	29959 - 11904: 0xE6AD,
-	29960 - 11904: 0xE6AC,
-	29963 - 11904: 0xEA69,
-	29964 - 11904: 0xBF5E,
-	29965 - 11904: 0xBF5F,
-	29966 - 11904: 0xFEA9,
-	29967 - 11904: 0xED72,
-	29968 - 11904: 0xED6F,
-	29969 - 11904: 0xED70,
-	29970 - 11904: 0xED71,
-	29971 - 11904: 0xF049,
-	29972 - 11904: 0xF048,
-	29973 - 11904: 0xC27C,
-	29974 - 11904: 0xF277,
-	29975 - 11904: 0xF5DE,
-	29976 - 11904: 0xA5CC,
-	29977 - 11904: 0x89C3,
-	29978 - 11904: 0xACC6,
-	29980 - 11904: 0xB2A2,
-	29981 - 11904: 0xDEC3,
-	29982 - 11904: 0xFEAB,
-	29983 - 11904: 0xA5CD,
-	29985 - 11904: 0xD2C0,
-	29986 - 11904: 0xB2A3,
-	29989 - 11904: 0xB563,
-	29990 - 11904: 0xB564,
-	29992 - 11904: 0xA5CE,
-	29993 - 11904: 0xA5CF,
-	29994 - 11904: 0xCA46,
-	29995 - 11904: 0xA86A,
-	29996 - 11904: 0xA869,
-	29997 - 11904: 0xACC7,
-	29998 - 11904: 0xCFD9,
-	29999 - 11904: 0xDAAC,
-	30000 - 11904: 0xA5D0,
-	30001 - 11904: 0xA5D1,
-	30002 - 11904: 0xA5D2,
-	30003 - 11904: 0xA5D3,
-	30004 - 11904: 0x9DF4,
-	30005 - 11904: 0x896D,
-	30007 - 11904: 0xA86B,
-	30008 - 11904: 0xA86C,
-	30009 - 11904: 0xCB6E,
-	30010 - 11904: 0xCB6D,
-	30011 - 11904: 0x9C7B,
-	30013 - 11904: 0xAAB6,
-	30014 - 11904: 0xCD72,
-	30015 - 11904: 0xCD70,
-	30016 - 11904: 0xCD71,
-	30018 - 11904: 0x98D2,
-	30022 - 11904: 0x9FA9,
-	30023 - 11904: 0xCFDA,
-	30024 - 11904: 0xCFDB,
-	30026 - 11904: 0xFEB2,
-	30027 - 11904: 0xACCB,
-	30028 - 11904: 0xACC9,
-	30029 - 11904: 0xFEB1,
-	30030 - 11904: 0xACCA,
-	30031 - 11904: 0xACC8,
-	30033 - 11904: 0x97D9,
-	30035 - 11904: 0xA0C4,
-	30036 - 11904: 0xAF60,
-	30037 - 11904: 0x9476,
-	30041 - 11904: 0xAF64,
-	30042 - 11904: 0xAF63,
-	30043 - 11904: 0xD2C1,
-	30044 - 11904: 0xAF62,
-	30045 - 11904: 0xAF61,
-	30047 - 11904: 0xD2C2,
-	30048 - 11904: 0x9978,
-	30050 - 11904: 0xB2A6,
-	30051 - 11904: 0xD67B,
-	30052 - 11904: 0xD67A,
-	30053 - 11904: 0xB2A4,
-	30054 - 11904: 0xB2A5,
-	30055 - 11904: 0xFEB3,
-	30058 - 11904: 0xB566,
-	30059 - 11904: 0xB565,
-	30060 - 11904: 0xDAAE,
-	30061 - 11904: 0x98D3,
-	30062 - 11904: 0xFEB4,
-	30063 - 11904: 0xDAAD,
-	30064 - 11904: 0xB2A7,
-	30066 - 11904: 0x98D4,
-	30070 - 11904: 0xB7ED,
-	30071 - 11904: 0xDEC5,
-	30072 - 11904: 0xB7EE,
-	30073 - 11904: 0xDEC4,
-	30074 - 11904: 0x9FB9,
-	30077 - 11904: 0xE2D8,
-	30078 - 11904: 0xE6AE,
-	30079 - 11904: 0xBD42,
-	30080 - 11904: 0xEA6A,
-	30083 - 11904: 0x9471,
-	30084 - 11904: 0xED73,
-	30086 - 11904: 0xC3A6,
-	30087 - 11904: 0xC3A5,
-	30090 - 11904: 0xC57C,
-	30091 - 11904: 0xA5D4,
-	30092 - 11904: 0xCD73,
-	30093 - 11904: 0x98D5,
-	30094 - 11904: 0xFEB8,
-	30095 - 11904: 0xB2A8,
-	30096 - 11904: 0xE2D9,
-	30097 - 11904: 0xBAC3,
-	30098 - 11904: 0xC6D4,
-	30100 - 11904: 0xCB6F,
-	30101 - 11904: 0xCB70,
-	30104 - 11904: 0xCD74,
-	30105 - 11904: 0xAAB8,
-	30106 - 11904: 0xAAB9,
-	30109 - 11904: 0xAAB7,
-	30110 - 11904: 0xFEBA,
-	30114 - 11904: 0xACCF,
-	30115 - 11904: 0xACD0,
-	30116 - 11904: 0xACCD,
-	30117 - 11904: 0xACCE,
-	30119 - 11904: 0xCFDC,
-	30122 - 11904: 0xCFDD,
-	30123 - 11904: 0xACCC,
-	30128 - 11904: 0xD2C3,
-	30129 - 11904: 0x9E5C,
-	30130 - 11904: 0xAF68,
-	30131 - 11904: 0xAF69,
-	30132 - 11904: 0xFEBB,
-	30133 - 11904: 0xB2AB,
-	30134 - 11904: 0xD2C9,
-	30136 - 11904: 0xAF6E,
-	30137 - 11904: 0xAF6C,
-	30138 - 11904: 0xD2CA,
-	30139 - 11904: 0xD2C5,
-	30140 - 11904: 0xAF6B,
-	30141 - 11904: 0xAF6A,
-	30142 - 11904: 0xAF65,
-	30143 - 11904: 0xD2C8,
-	30144 - 11904: 0xD2C7,
-	30145 - 11904: 0xD2C4,
-	30146 - 11904: 0xAF6D,
-	30147 - 11904: 0xA044,
-	30148 - 11904: 0xD2C6,
-	30149 - 11904: 0xAF66,
-	30151 - 11904: 0xAF67,
-	30152 - 11904: 0x98D7,
-	30154 - 11904: 0xB2AC,
-	30155 - 11904: 0xD6A1,
-	30156 - 11904: 0xD6A2,
-	30157 - 11904: 0xB2AD,
-	30158 - 11904: 0xD67C,
-	30159 - 11904: 0xD67E,
-	30160 - 11904: 0xD6A4,
-	30161 - 11904: 0xD6A3,
-	30162 - 11904: 0xD67D,
-	30164 - 11904: 0xB2A9,
-	30165 - 11904: 0xB2AA,
-	30167 - 11904: 0xDAB6,
-	30168 - 11904: 0xB56B,
-	30169 - 11904: 0xB56A,
-	30170 - 11904: 0xDAB0,
-	30171 - 11904: 0xB568,
-	30172 - 11904: 0x98D8,
-	30173 - 11904: 0xDAB3,
-	30174 - 11904: 0xB56C,
-	30175 - 11904: 0xDAB4,
-	30176 - 11904: 0xB56D,
-	30177 - 11904: 0xDAB1,
-	30178 - 11904: 0xB567,
-	30179 - 11904: 0xB569,
-	30180 - 11904: 0xDAB5,
-	30182 - 11904: 0xDAB2,
-	30183 - 11904: 0xDAAF,
-	30189 - 11904: 0xDED2,
-	30191 - 11904: 0xDEC7,
-	30192 - 11904: 0xB7F0,
-	30193 - 11904: 0xB7F3,
-	30194 - 11904: 0xB7F2,
-	30195 - 11904: 0xB7F7,
-	30196 - 11904: 0xB7F6,
-	30197 - 11904: 0xDED3,
-	30198 - 11904: 0xDED1,
-	30199 - 11904: 0xDECA,
-	30200 - 11904: 0xDECE,
-	30201 - 11904: 0xDECD,
-	30202 - 11904: 0xB7F4,
-	30203 - 11904: 0xDED0,
-	30204 - 11904: 0xDECC,
-	30205 - 11904: 0xDED4,
-	30206 - 11904: 0xDECB,
-	30207 - 11904: 0xB7F5,
-	30208 - 11904: 0xB7EF,
-	30209 - 11904: 0xB7F1,
-	30210 - 11904: 0xFEBC,
-	30211 - 11904: 0xDEC9,
-	30215 - 11904: 0x9FFE,
-	30216 - 11904: 0xE2DB,
-	30217 - 11904: 0xBAC7,
-	30218 - 11904: 0xE2DF,
-	30219 - 11904: 0xBAC6,
-	30220 - 11904: 0xE2DC,
-	30221 - 11904: 0xBAC5,
-	30223 - 11904: 0xDEC8,
-	30224 - 11904: 0xDECF,
-	30225 - 11904: 0xE2DE,
-	30227 - 11904: 0xBAC8,
-	30228 - 11904: 0xE2E0,
-	30229 - 11904: 0xE2DD,
-	30230 - 11904: 0xE2DA,
-	30233 - 11904: 0xE6B1,
-	30234 - 11904: 0xE6B5,
-	30235 - 11904: 0xE6B7,
-	30236 - 11904: 0xE6B3,
-	30237 - 11904: 0xE6B2,
-	30238 - 11904: 0xE6B0,
-	30239 - 11904: 0xBD45,
-	30240 - 11904: 0xBD43,
-	30241 - 11904: 0xBD48,
-	30242 - 11904: 0xBD49,
-	30243 - 11904: 0xE6B4,
-	30244 - 11904: 0xBD46,
-	30245 - 11904: 0xE6AF,
-	30246 - 11904: 0xBD47,
-	30247 - 11904: 0xBAC4,
-	30248 - 11904: 0xE6B6,
-	30249 - 11904: 0xBD44,
-	30252 - 11904: 0xFEBD,
-	30253 - 11904: 0xEA6C,
-	30255 - 11904: 0xEA6B,
-	30256 - 11904: 0xEA73,
-	30257 - 11904: 0xEA6D,
-	30258 - 11904: 0xEA72,
-	30259 - 11904: 0xEA6F,
-	30260 - 11904: 0xBF60,
-	30261 - 11904: 0xEA71,
-	30264 - 11904: 0xBF61,
-	30266 - 11904: 0xBF62,
-	30267 - 11904: 0x9DDD,
-	30268 - 11904: 0xEA70,
-	30269 - 11904: 0xEA6E,
-	30272 - 11904: 0x9EE1,
-	30274 - 11904: 0xC0F8,
-	30275 - 11904: 0xED74,
-	30278 - 11904: 0xC0F7,
-	30279 - 11904: 0xED77,
-	30280 - 11904: 0xED75,
-	30281 - 11904: 0xED76,
-	30284 - 11904: 0xC0F9,
-	30285 - 11904: 0x98DA,
-	30286 - 11904: 0x9DDF,
-	30287 - 11904: 0xFEBF,
-	30288 - 11904: 0xF04D,
-	30289 - 11904: 0xFEBE,
-	30290 - 11904: 0xC2A1,
-	30291 - 11904: 0xF04E,
-	30292 - 11904: 0x9EEB,
-	30294 - 11904: 0xC27D,
-	30295 - 11904: 0xF04F,
-	30296 - 11904: 0xC27E,
-	30297 - 11904: 0xF04C,
-	30298 - 11904: 0xF050,
-	30300 - 11904: 0xF04A,
-	30303 - 11904: 0xC3A7,
-	30304 - 11904: 0xF278,
-	30305 - 11904: 0xC3A8,
-	30306 - 11904: 0xC46F,
-	30308 - 11904: 0xF04B,
-	30309 - 11904: 0xC470,
-	30310 - 11904: 0x9E59,
-	30311 - 11904: 0xA05C,
-	30313 - 11904: 0xC4EE,
-	30314 - 11904: 0xF5DF,
-	30316 - 11904: 0xC57E,
-	30317 - 11904: 0xF6F4,
-	30318 - 11904: 0xC57D,
-	30319 - 11904: 0xFEC0,
-	30320 - 11904: 0xF7EA,
-	30321 - 11904: 0xC5F5,
-	30322 - 11904: 0xC5F6,
-	30323 - 11904: 0x9477,
-	30324 - 11904: 0x98DC,
-	30325 - 11904: 0xF9CC,
-	30326 - 11904: 0xFEC1,
-	30328 - 11904: 0xACD1,
-	30329 - 11904: 0xCFDE,
-	30330 - 11904: 0x98DE,
-	30331 - 11904: 0xB56E,
-	30332 - 11904: 0xB56F,
-	30333 - 11904: 0xA5D5,
-	30334 - 11904: 0xA6CA,
-	30335 - 11904: 0xCA47,
-	30337 - 11904: 0xCB71,
-	30338 - 11904: 0xA86D,
-	30340 - 11904: 0xAABA,
-	30342 - 11904: 0xACD2,
-	30343 - 11904: 0xACD3,
-	30344 - 11904: 0xACD4,
-	30345 - 11904: 0xD6A6,
-	30346 - 11904: 0xD2CB,
-	30347 - 11904: 0xAF6F,
-	30350 - 11904: 0xB2AE,
-	30351 - 11904: 0xD6A5,
-	30352 - 11904: 0xFEC3,
-	30354 - 11904: 0xDAB8,
-	30355 - 11904: 0xB571,
-	30357 - 11904: 0xDAB7,
-	30358 - 11904: 0xB570,
-	30361 - 11904: 0xDED5,
-	30362 - 11904: 0xBD4A,
-	30363 - 11904: 0xE6BB,
-	30364 - 11904: 0xE6B8,
-	30365 - 11904: 0xE6B9,
-	30366 - 11904: 0xE6BA,
-	30369 - 11904: 0xFEC8,
-	30372 - 11904: 0xED78,
-	30373 - 11904: 0xFEC9,
-	30374 - 11904: 0xF051,
-	30378 - 11904: 0xF471,
-	30379 - 11904: 0xF470,
-	30381 - 11904: 0xF6F5,
-	30382 - 11904: 0xA5D6,
-	30383 - 11904: 0xCD75,
-	30384 - 11904: 0xAF70,
-	30388 - 11904: 0xB572,
-	30389 - 11904: 0xDED6,
-	30391 - 11904: 0xFECA,
-	30392 - 11904: 0xE2E1,
-	30394 - 11904: 0xBD4B,
-	30395 - 11904: 0xEA74,
-	30397 - 11904: 0xF052,
-	30398 - 11904: 0xF472,
-	30399 - 11904: 0xA5D7,
-	30402 - 11904: 0xAABB,
-	30403 - 11904: 0xACD7,
-	30404 - 11904: 0xCFDF,
-	30405 - 11904: 0xACD8,
-	30406 - 11904: 0xACD6,
-	30408 - 11904: 0xACD5,
-	30409 - 11904: 0xD2CC,
-	30410 - 11904: 0xAF71,
-	30412 - 11904: 0xFECB,
-	30413 - 11904: 0xAF72,
-	30414 - 11904: 0xAF73,
-	30418 - 11904: 0xB2B0,
-	30419 - 11904: 0xD6A7,
-	30420 - 11904: 0xB2AF,
-	30422 - 11904: 0x9FC2,
-	30425 - 11904: 0x8C6B,
-	30426 - 11904: 0xDAB9,
-	30427 - 11904: 0xB2B1,
-	30428 - 11904: 0xB573,
-	30429 - 11904: 0xDED7,
-	30430 - 11904: 0xB7F8,
-	30431 - 11904: 0xB7F9,
-	30433 - 11904: 0xBAC9,
-	30435 - 11904: 0xBACA,
-	30436 - 11904: 0xBD4C,
-	30437 - 11904: 0xBF64,
-	30438 - 11904: 0xEA75,
-	30439 - 11904: 0xBF63,
-	30441 - 11904: 0xED79,
-	30442 - 11904: 0xC0FA,
-	30444 - 11904: 0xF053,
-	30445 - 11904: 0xF473,
-	30446 - 11904: 0xA5D8,
-	30447 - 11904: 0xA86E,
-	30448 - 11904: 0xCD78,
-	30449 - 11904: 0xCD77,
-	30450 - 11904: 0xAABC,
-	30451 - 11904: 0xCD76,
-	30452 - 11904: 0xAABD,
-	30453 - 11904: 0xCD79,
-	30455 - 11904: 0xCFE5,
-	30456 - 11904: 0xACDB,
-	30457 - 11904: 0xACDA,
-	30458 - 11904: 0xCFE7,
-	30459 - 11904: 0xCFE6,
-	30460 - 11904: 0xACDF,
-	30462 - 11904: 0xACDE,
-	30465 - 11904: 0xACD9,
-	30467 - 11904: 0xCFE1,
-	30468 - 11904: 0xCFE2,
-	30469 - 11904: 0xCFE3,
-	30471 - 11904: 0xACE0,
-	30472 - 11904: 0xCFE0,
-	30473 - 11904: 0xACDC,
-	30474 - 11904: 0xCFE4,
-	30475 - 11904: 0xACDD,
-	30476 - 11904: 0x98C4,
-	30478 - 11904: 0x94B0,
-	30479 - 11904: 0x94B1,
-	30480 - 11904: 0xD2CF,
-	30481 - 11904: 0xD2D3,
-	30482 - 11904: 0xD2D1,
-	30483 - 11904: 0xD2D0,
-	30485 - 11904: 0xD2D4,
-	30489 - 11904: 0xD2D5,
-	30490 - 11904: 0xD2D6,
-	30491 - 11904: 0xD2CE,
-	30493 - 11904: 0xD2CD,
-	30494 - 11904: 0xFED1,
-	30495 - 11904: 0xAF75,
-	30496 - 11904: 0xAF76,
-	30498 - 11904: 0xD2D7,
-	30499 - 11904: 0xD2D2,
-	30500 - 11904: 0xA0C1,
-	30501 - 11904: 0xD6B0,
-	30502 - 11904: 0xFED2,
-	30503 - 11904: 0xD2D8,
-	30504 - 11904: 0xAF77,
-	30505 - 11904: 0xAF74,
-	30507 - 11904: 0xA0CD,
-	30509 - 11904: 0xD6AA,
-	30511 - 11904: 0xD6A9,
-	30513 - 11904: 0xD6AB,
-	30514 - 11904: 0xD6AC,
-	30515 - 11904: 0xD6AE,
-	30516 - 11904: 0xD6AD,
-	30517 - 11904: 0xD6B2,
-	30518 - 11904: 0xB2B5,
-	30519 - 11904: 0xB2B2,
-	30520 - 11904: 0xB2B6,
-	30521 - 11904: 0xD6A8,
-	30522 - 11904: 0xB2B7,
-	30523 - 11904: 0xD6B1,
-	30524 - 11904: 0xB2B4,
-	30525 - 11904: 0xD6AF,
-	30526 - 11904: 0xB2B3,
-	30528 - 11904: 0xFED3,
-	30531 - 11904: 0x98E5,
-	30532 - 11904: 0xDABC,
-	30533 - 11904: 0xDABE,
-	30534 - 11904: 0xDABA,
-	30535 - 11904: 0xDABB,
-	30538 - 11904: 0xDABF,
-	30539 - 11904: 0xDAC1,
-	30540 - 11904: 0xDAC2,
-	30541 - 11904: 0xDABD,
-	30542 - 11904: 0xDAC0,
-	30543 - 11904: 0xB574,
-	30546 - 11904: 0xDEDB,
-	30548 - 11904: 0xDEE0,
-	30549 - 11904: 0xDED8,
-	30550 - 11904: 0xDEDC,
-	30552 - 11904: 0xFED6,
-	30553 - 11904: 0xDEE1,
-	30554 - 11904: 0xDEDD,
-	30555 - 11904: 0xB7FA,
-	30556 - 11904: 0xB843,
-	30558 - 11904: 0xB7FD,
-	30559 - 11904: 0xDED9,
-	30560 - 11904: 0xDEDA,
-	30561 - 11904: 0xBACE,
-	30562 - 11904: 0xB846,
-	30563 - 11904: 0xB7FE,
-	30565 - 11904: 0xB844,
-	30566 - 11904: 0xB7FC,
-	30567 - 11904: 0xDEDF,
-	30568 - 11904: 0xB845,
-	30569 - 11904: 0xDEDE,
-	30570 - 11904: 0xB841,
-	30571 - 11904: 0xB7FB,
-	30572 - 11904: 0xB842,
-	30573 - 11904: 0xDEE2,
-	30574 - 11904: 0xE2E6,
-	30575 - 11904: 0xE2E8,
-	30578 - 11904: 0x91E4,
-	30583 - 11904: 0x8FC7,
-	30584 - 11904: 0x94AE,
-	30585 - 11904: 0xB840,
-	30586 - 11904: 0x8A4F,
-	30587 - 11904: 0x94B2,
-	30588 - 11904: 0xE2E3,
-	30589 - 11904: 0xBACC,
-	30590 - 11904: 0xE2E9,
-	30591 - 11904: 0xBACD,
-	30592 - 11904: 0xE2E7,
-	30593 - 11904: 0xE2E2,
-	30594 - 11904: 0xE2E5,
-	30595 - 11904: 0xE2EA,
-	30596 - 11904: 0xBACB,
-	30597 - 11904: 0xE2E4,
-	30599 - 11904: 0xBD4E,
-	30600 - 11904: 0xE6BF,
-	30601 - 11904: 0xE6BE,
-	30603 - 11904: 0xBD51,
-	30604 - 11904: 0xBD4F,
-	30605 - 11904: 0xE6BC,
-	30606 - 11904: 0xBD4D,
-	30607 - 11904: 0xE6BD,
-	30609 - 11904: 0xBD50,
-	30611 - 11904: 0x8FD4,
-	30613 - 11904: 0xEA7D,
-	30615 - 11904: 0xEAA1,
-	30616 - 11904: 0x98EA,
-	30617 - 11904: 0xEA7E,
-	30618 - 11904: 0xEA76,
-	30619 - 11904: 0xEA7A,
-	30620 - 11904: 0xEA79,
-	30621 - 11904: 0xEA77,
-	30622 - 11904: 0xBF66,
-	30623 - 11904: 0xBF67,
-	30624 - 11904: 0xBF65,
-	30625 - 11904: 0xEA78,
-	30626 - 11904: 0xEA7B,
-	30627 - 11904: 0xEA7C,
-	30629 - 11904: 0xBF68,
-	30631 - 11904: 0xC140,
-	30632 - 11904: 0xEDA3,
-	30634 - 11904: 0xC0FC,
-	30635 - 11904: 0xED7B,
-	30636 - 11904: 0xC0FE,
-	30637 - 11904: 0xC141,
-	30639 - 11904: 0xFED8,
-	30640 - 11904: 0xC0FD,
-	30641 - 11904: 0xEDA2,
-	30642 - 11904: 0xED7C,
-	30643 - 11904: 0xC0FB,
-	30644 - 11904: 0xEDA1,
-	30645 - 11904: 0xED7A,
-	30646 - 11904: 0xED7E,
-	30647 - 11904: 0xED7D,
-	30649 - 11904: 0x9DE0,
-	30650 - 11904: 0xF055,
-	30651 - 11904: 0xC2A4,
-	30652 - 11904: 0xC2A5,
-	30653 - 11904: 0xC2A2,
-	30654 - 11904: 0x98EE,
-	30655 - 11904: 0xC2A3,
-	30658 - 11904: 0xF054,
-	30659 - 11904: 0x95C4,
-	30660 - 11904: 0xF27B,
-	30661 - 11904: 0xFCE8,
-	30663 - 11904: 0xC3A9,
-	30665 - 11904: 0xF279,
-	30666 - 11904: 0xF27A,
-	30667 - 11904: 0x98EF,
-	30668 - 11904: 0xF474,
-	30669 - 11904: 0xF477,
-	30670 - 11904: 0xF475,
-	30671 - 11904: 0xF476,
-	30672 - 11904: 0xF5E0,
-	30675 - 11904: 0xC4EF,
-	30676 - 11904: 0xF7EB,
-	30677 - 11904: 0xF8B4,
-	30679 - 11904: 0xC5F7,
-	30680 - 11904: 0xF8F8,
-	30681 - 11904: 0xF8F9,
-	30682 - 11904: 0xC666,
-	30683 - 11904: 0xA5D9,
-	30684 - 11904: 0xACE1,
-	30685 - 11904: 0x8C6E,
-	30686 - 11904: 0xDAC3,
-	30688 - 11904: 0xDEE3,
-	30690 - 11904: 0xA5DA,
-	30691 - 11904: 0xA86F,
-	30693 - 11904: 0xAABE,
-	30694 - 11904: 0xFAD8,
-	30695 - 11904: 0xCFE8,
-	30696 - 11904: 0xCFE9,
-	30697 - 11904: 0xAF78,
-	30700 - 11904: 0xDAC4,
-	30701 - 11904: 0xB575,
-	30702 - 11904: 0xB847,
-	30703 - 11904: 0xC142,
-	30704 - 11904: 0xEDA4,
-	30705 - 11904: 0xF27C,
-	30706 - 11904: 0xF478,
-	30707 - 11904: 0xA5DB,
-	30708 - 11904: 0xFEDC,
-	30711 - 11904: 0xCDA1,
-	30712 - 11904: 0xCD7A,
-	30713 - 11904: 0xCD7C,
-	30714 - 11904: 0xCD7E,
-	30715 - 11904: 0xCD7D,
-	30716 - 11904: 0xCD7B,
-	30717 - 11904: 0xAABF,
-	30718 - 11904: 0xA0AE,
-	30722 - 11904: 0xACE2,
-	30723 - 11904: 0xCFF2,
-	30725 - 11904: 0xCFED,
-	30726 - 11904: 0xCFEA,
-	30728 - 11904: 0x9D4C,
-	30729 - 11904: 0xFEDD,
-	30732 - 11904: 0xACE4,
-	30733 - 11904: 0xACE5,
-	30734 - 11904: 0xCFF0,
-	30735 - 11904: 0xCFEF,
-	30736 - 11904: 0xCFEE,
-	30737 - 11904: 0xCFEB,
-	30738 - 11904: 0xCFEC,
-	30739 - 11904: 0xCFF3,
-	30740 - 11904: 0xACE3,
-	30744 - 11904: 0x98F1,
-	30748 - 11904: 0x98F3,
-	30749 - 11904: 0xAF7C,
-	30750 - 11904: 0x94C1,
-	30751 - 11904: 0xAFA4,
-	30752 - 11904: 0xAFA3,
-	30753 - 11904: 0xD2E1,
-	30754 - 11904: 0xD2DB,
-	30755 - 11904: 0xD2D9,
-	30757 - 11904: 0xAFA1,
-	30758 - 11904: 0xD6B9,
-	30759 - 11904: 0xAF7A,
-	30760 - 11904: 0xD2DE,
-	30761 - 11904: 0xD2E2,
-	30762 - 11904: 0xD2E4,
-	30763 - 11904: 0xD2E0,
-	30764 - 11904: 0xD2DA,
-	30765 - 11904: 0xAFA2,
-	30766 - 11904: 0xD2DF,
-	30767 - 11904: 0xD2DD,
-	30768 - 11904: 0xAF79,
-	30769 - 11904: 0xD2E5,
-	30770 - 11904: 0xAFA5,
-	30771 - 11904: 0xD2E3,
-	30772 - 11904: 0xAF7D,
-	30773 - 11904: 0xD2DC,
-	30775 - 11904: 0xAF7E,
-	30776 - 11904: 0xAF7B,
-	30777 - 11904: 0x98F5,
-	30780 - 11904: 0xFA4F,
-	30781 - 11904: 0x96E2,
-	30786 - 11904: 0x9450,
-	30787 - 11904: 0xB2B9,
-	30788 - 11904: 0x96A2,
-	30789 - 11904: 0xD6BA,
-	30791 - 11904: 0x98F6,
-	30792 - 11904: 0xD6B3,
-	30793 - 11904: 0xD6B5,
-	30794 - 11904: 0xD6B7,
-	30795 - 11904: 0x96E5,
-	30796 - 11904: 0xD6B8,
-	30797 - 11904: 0xD6B6,
-	30798 - 11904: 0xB2BA,
-	30800 - 11904: 0xD6BB,
-	30801 - 11904: 0x98F7,
-	30802 - 11904: 0xD6B4,
-	30803 - 11904: 0xA046,
-	30804 - 11904: 0x96E3,
-	30812 - 11904: 0xDAC8,
-	30813 - 11904: 0xB576,
-	30814 - 11904: 0xDAD0,
-	30816 - 11904: 0xDAC5,
-	30818 - 11904: 0xDAD1,
-	30820 - 11904: 0xDAC6,
-	30821 - 11904: 0xDAC7,
-	30822 - 11904: 0x98F8,
-	30824 - 11904: 0xDACF,
-	30825 - 11904: 0xDACE,
-	30826 - 11904: 0xDACB,
-	30827 - 11904: 0xB2B8,
-	30828 - 11904: 0xB577,
-	30829 - 11904: 0xDAC9,
-	30830 - 11904: 0xDACC,
-	30831 - 11904: 0xB578,
-	30832 - 11904: 0xDACD,
-	30833 - 11904: 0xDACA,
-	30841 - 11904: 0xDEEE,
-	30842 - 11904: 0x9EE4,
-	30843 - 11904: 0xDEF2,
-	30844 - 11904: 0xB84E,
-	30846 - 11904: 0xE2F0,
-	30847 - 11904: 0xB851,
-	30848 - 11904: 0xDEF0,
-	30849 - 11904: 0xF9D6,
-	30851 - 11904: 0xDEED,
-	30852 - 11904: 0xDEE8,
-	30853 - 11904: 0xDEEA,
-	30854 - 11904: 0xDEEB,
-	30855 - 11904: 0xDEE4,
-	30856 - 11904: 0x94C3,
-	30857 - 11904: 0xB84D,
-	30860 - 11904: 0xB84C,
-	30861 - 11904: 0x94C2,
-	30862 - 11904: 0xB848,
-	30863 - 11904: 0xDEE7,
-	30865 - 11904: 0xB84F,
-	30867 - 11904: 0xB850,
-	30868 - 11904: 0xDEE6,
-	30869 - 11904: 0xDEE9,
-	30870 - 11904: 0xDEF1,
-	30871 - 11904: 0xB84A,
-	30872 - 11904: 0xB84B,
-	30873 - 11904: 0xDEEF,
-	30874 - 11904: 0xDEE5,
-	30878 - 11904: 0xE2F2,
-	30879 - 11904: 0xBAD0,
-	30880 - 11904: 0xE2F4,
-	30881 - 11904: 0xDEEC,
-	30882 - 11904: 0xE2F6,
-	30883 - 11904: 0xBAD4,
-	30884 - 11904: 0xE2F7,
-	30885 - 11904: 0xE2F3,
-	30887 - 11904: 0xBAD1,
-	30888 - 11904: 0xE2EF,
-	30889 - 11904: 0xBAD3,
-	30890 - 11904: 0xE2EC,
-	30891 - 11904: 0xE2F1,
-	30892 - 11904: 0xE2F5,
-	30893 - 11904: 0xE2EE,
-	30895 - 11904: 0xFEE1,
-	30896 - 11904: 0xB849,
-	30897 - 11904: 0xFEE9,
-	30898 - 11904: 0xE2EB,
-	30899 - 11904: 0xBAD2,
-	30900 - 11904: 0xE2ED,
-	30902 - 11904: 0x96E4,
-	30904 - 11904: 0x89AC,
-	30905 - 11904: 0x96DB,
-	30906 - 11904: 0xBD54,
-	30907 - 11904: 0xE6C1,
-	30908 - 11904: 0xBD58,
-	30910 - 11904: 0xBD56,
-	30913 - 11904: 0xBACF,
-	30915 - 11904: 0xE6C8,
-	30916 - 11904: 0xE6C9,
-	30917 - 11904: 0xBD53,
-	30919 - 11904: 0xFEE2,
-	30920 - 11904: 0xE6C7,
-	30921 - 11904: 0xE6CA,
-	30922 - 11904: 0xBD55,
-	30923 - 11904: 0xBD52,
-	30924 - 11904: 0xE6C3,
-	30925 - 11904: 0xE6C0,
-	30926 - 11904: 0xE6C5,
-	30927 - 11904: 0xE6C2,
-	30928 - 11904: 0xBD59,
-	30929 - 11904: 0xE6C4,
-	30930 - 11904: 0x94C4,
-	30931 - 11904: 0xFEE3,
-	30932 - 11904: 0xE6C6,
-	30933 - 11904: 0xBD57,
-	30935 - 11904: 0xFEE7,
-	30936 - 11904: 0x9FFB,
-	30938 - 11904: 0xBF6A,
-	30939 - 11904: 0xEAA8,
-	30941 - 11904: 0xEAA2,
-	30942 - 11904: 0xEAA6,
-	30943 - 11904: 0xEAAC,
-	30944 - 11904: 0xEAAD,
-	30945 - 11904: 0xEAA9,
-	30946 - 11904: 0xEAAA,
-	30947 - 11904: 0xEAA7,
-	30948 - 11904: 0x8C59,
-	30949 - 11904: 0xEAA4,
-	30951 - 11904: 0xBF6C,
-	30952 - 11904: 0xBF69,
-	30953 - 11904: 0xEAA3,
-	30954 - 11904: 0xEAA5,
-	30956 - 11904: 0xBF6B,
-	30957 - 11904: 0xEAAB,
-	30958 - 11904: 0x93C9,
-	30959 - 11904: 0xC146,
-	30960 - 11904: 0x94E8,
-	30961 - 11904: 0xFB56,
-	30962 - 11904: 0xEDAA,
-	30963 - 11904: 0xEDA5,
-	30964 - 11904: 0xC145,
-	30965 - 11904: 0x90C5,
-	30967 - 11904: 0xC143,
-	30969 - 11904: 0xEDAC,
-	30970 - 11904: 0xC144,
-	30971 - 11904: 0xEDA8,
-	30972 - 11904: 0xEDA9,
-	30973 - 11904: 0xEDA6,
-	30974 - 11904: 0xEDAD,
-	30975 - 11904: 0xF056,
-	30977 - 11904: 0xC147,
-	30978 - 11904: 0xEDA7,
-	30980 - 11904: 0xEDAE,
-	30981 - 11904: 0xEDAB,
-	30982 - 11904: 0xA0A8,
-	30985 - 11904: 0xF05A,
-	30988 - 11904: 0xF057,
-	30990 - 11904: 0xC2A6,
-	30992 - 11904: 0xF05B,
-	30993 - 11904: 0xF05D,
-	30994 - 11904: 0xF05C,
-	30995 - 11904: 0xF058,
-	30996 - 11904: 0xF059,
-	30999 - 11904: 0xF2A3,
-	31001 - 11904: 0xC3AA,
-	31003 - 11904: 0xF27E,
-	31004 - 11904: 0xF2A2,
-	31005 - 11904: 0xF27D,
-	31006 - 11904: 0xF2A4,
-	31009 - 11904: 0xF2A1,
-	31011 - 11904: 0xF47A,
-	31012 - 11904: 0xF47D,
-	31013 - 11904: 0xF479,
-	31014 - 11904: 0xC471,
-	31015 - 11904: 0xF47B,
-	31016 - 11904: 0xF47C,
-	31017 - 11904: 0xF47E,
-	31018 - 11904: 0xC472,
-	31019 - 11904: 0xC474,
-	31020 - 11904: 0xC473,
-	31021 - 11904: 0xF5E1,
-	31022 - 11904: 0xFEE5,
-	31023 - 11904: 0xF5E3,
-	31025 - 11904: 0xF5E2,
-	31026 - 11904: 0x98FD,
-	31027 - 11904: 0x98FB,
-	31028 - 11904: 0xFEE8,
-	31029 - 11904: 0xF6F6,
-	31030 - 11904: 0x8EBF,
-	31032 - 11904: 0xF8B5,
-	31033 - 11904: 0xF8FA,
-	31034 - 11904: 0xA5DC,
-	31035 - 11904: 0x8BD8,
-	31036 - 11904: 0xFEF7,
-	31037 - 11904: 0xCB72,
-	31038 - 11904: 0xAAC0,
-	31039 - 11904: 0xCDA3,
-	31040 - 11904: 0xAAC1,
-	31041 - 11904: 0xAAC2,
-	31042 - 11904: 0xCDA2,
-	31044 - 11904: 0xCFF8,
-	31045 - 11904: 0xCFF7,
-	31046 - 11904: 0xACE6,
-	31047 - 11904: 0xACE9,
-	31048 - 11904: 0xACE8,
-	31049 - 11904: 0xACE7,
-	31050 - 11904: 0xCFF4,
-	31051 - 11904: 0xCFF6,
-	31052 - 11904: 0xCFF5,
-	31055 - 11904: 0xD2E8,
-	31056 - 11904: 0xAFA7,
-	31057 - 11904: 0xD2EC,
-	31058 - 11904: 0xD2EB,
-	31059 - 11904: 0xD2EA,
-	31060 - 11904: 0xD2E6,
-	31061 - 11904: 0xAFA6,
-	31062 - 11904: 0xAFAA,
-	31063 - 11904: 0xAFAD,
-	31064 - 11904: 0x8F68,
-	31065 - 11904: 0x94C6,
-	31066 - 11904: 0xAFAE,
-	31067 - 11904: 0xD2E7,
-	31068 - 11904: 0xD2E9,
-	31069 - 11904: 0xAFAC,
-	31070 - 11904: 0xAFAB,
-	31071 - 11904: 0xAFA9,
-	31072 - 11904: 0xAFA8,
-	31073 - 11904: 0xD6C2,
-	31074 - 11904: 0x9DEA,
-	31075 - 11904: 0xD6C0,
-	31076 - 11904: 0xD6BC,
-	31077 - 11904: 0xB2BB,
-	31079 - 11904: 0xD6BD,
-	31080 - 11904: 0xB2BC,
-	31081 - 11904: 0xD6BE,
-	31082 - 11904: 0xD6BF,
-	31083 - 11904: 0xD6C1,
-	31085 - 11904: 0xB2BD,
-	31088 - 11904: 0xDAD5,
-	31089 - 11904: 0xFC69,
-	31090 - 11904: 0xDAD4,
-	31091 - 11904: 0xDAD3,
-	31092 - 11904: 0xDAD2,
-	31097 - 11904: 0xDEF6,
-	31098 - 11904: 0xB852,
-	31100 - 11904: 0xDEF3,
-	31101 - 11904: 0xDEF5,
-	31102 - 11904: 0x9CDA,
-	31103 - 11904: 0xB853,
-	31104 - 11904: 0xFEF3,
-	31105 - 11904: 0xB854,
-	31106 - 11904: 0xDEF4,
-	31107 - 11904: 0x9C72,
-	31110 - 11904: 0xFEF0,
-	31111 - 11904: 0x89C9,
-	31112 - 11904: 0xE341,
-	31114 - 11904: 0xE2F9,
-	31115 - 11904: 0xE2FA,
-	31117 - 11904: 0xBAD7,
-	31118 - 11904: 0xBAD5,
-	31119 - 11904: 0xBAD6,
-	31120 - 11904: 0xE343,
-	31121 - 11904: 0x9941,
-	31122 - 11904: 0xE342,
-	31123 - 11904: 0xE2FE,
-	31124 - 11904: 0xE2FD,
-	31125 - 11904: 0xE2FC,
-	31126 - 11904: 0xE2FB,
-	31127 - 11904: 0xE340,
-	31128 - 11904: 0xE2F8,
-	31129 - 11904: 0x9942,
-	31130 - 11904: 0xE6CB,
-	31131 - 11904: 0xE6D0,
-	31132 - 11904: 0xE6CE,
-	31133 - 11904: 0xFEF5,
-	31135 - 11904: 0x91D7,
-	31136 - 11904: 0xE6CD,
-	31137 - 11904: 0xE6CC,
-	31138 - 11904: 0xE6CF,
-	31140 - 11904: 0xEAAE,
-	31141 - 11904: 0x94CC,
-	31142 - 11904: 0xBF6D,
-	31143 - 11904: 0xC148,
-	31144 - 11904: 0xEDB0,
-	31145 - 11904: 0xFEF8,
-	31146 - 11904: 0xC149,
-	31147 - 11904: 0xEDAF,
-	31148 - 11904: 0xF05F,
-	31149 - 11904: 0xF05E,
-	31150 - 11904: 0xC2A7,
-	31152 - 11904: 0xF2A5,
-	31153 - 11904: 0xC3AB,
-	31154 - 11904: 0xF4A1,
-	31155 - 11904: 0xC5A1,
-	31156 - 11904: 0xF6F7,
-	31158 - 11904: 0xF8B7,
-	31159 - 11904: 0xF8B6,
-	31160 - 11904: 0xC9A8,
-	31161 - 11904: 0xACEA,
-	31162 - 11904: 0xACEB,
-	31163 - 11904: 0xD6C3,
-	31165 - 11904: 0xB856,
-	31166 - 11904: 0xA5DD,
-	31167 - 11904: 0xA872,
-	31168 - 11904: 0xA871,
-	31169 - 11904: 0xA870,
-	31172 - 11904: 0x97A8,
-	31173 - 11904: 0xCDA4,
-	31174 - 11904: 0xFEFC,
-	31176 - 11904: 0xAAC4,
-	31177 - 11904: 0xAAC3,
-	31178 - 11904: 0x8CDE,
-	31179 - 11904: 0xACEE,
-	31180 - 11904: 0xFDBF,
-	31181 - 11904: 0xCFFA,
-	31182 - 11904: 0xCFFD,
-	31183 - 11904: 0xCFFB,
-	31184 - 11904: 0x87B3,
-	31185 - 11904: 0xACEC,
-	31186 - 11904: 0xACED,
-	31188 - 11904: 0xFEFE,
-	31189 - 11904: 0xCFF9,
-	31190 - 11904: 0xCFFC,
-	31192 - 11904: 0xAFB5,
-	31196 - 11904: 0xD2F3,
-	31197 - 11904: 0xD2F5,
-	31198 - 11904: 0xD2F4,
-	31199 - 11904: 0xAFB2,
-	31200 - 11904: 0xD2EF,
-	31202 - 11904: 0x96D1,
-	31203 - 11904: 0xAFB0,
-	31204 - 11904: 0xAFAF,
-	31206 - 11904: 0xAFB3,
-	31207 - 11904: 0xAFB1,
-	31209 - 11904: 0xAFB4,
-	31210 - 11904: 0xD2F2,
-	31211 - 11904: 0xD2ED,
-	31212 - 11904: 0xD2EE,
-	31213 - 11904: 0xD2F1,
-	31214 - 11904: 0xD2F0,
-	31217 - 11904: 0x94D5,
-	31220 - 11904: 0x94D0,
-	31222 - 11904: 0xD6C6,
-	31223 - 11904: 0xD6C7,
-	31224 - 11904: 0xD6C5,
-	31226 - 11904: 0xD6C4,
-	31227 - 11904: 0xB2BE,
-	31232 - 11904: 0xB57D,
-	31234 - 11904: 0xDAD6,
-	31235 - 11904: 0xDAD8,
-	31236 - 11904: 0xDADA,
-	31237 - 11904: 0xB57C,
-	31238 - 11904: 0x9944,
-	31240 - 11904: 0xB57A,
-	31242 - 11904: 0xDAD7,
-	31243 - 11904: 0xB57B,
-	31244 - 11904: 0xDAD9,
-	31245 - 11904: 0xB579,
-	31248 - 11904: 0xDF41,
-	31249 - 11904: 0xDEF7,
-	31250 - 11904: 0xDEFA,
-	31251 - 11904: 0xDEFE,
-	31252 - 11904: 0xB85A,
-	31253 - 11904: 0xDEFC,
-	31255 - 11904: 0xDEFB,
-	31256 - 11904: 0xDEF8,
-	31257 - 11904: 0xDEF9,
-	31258 - 11904: 0xB858,
-	31259 - 11904: 0xDF40,
-	31260 - 11904: 0xB857,
-	31262 - 11904: 0xB85C,
-	31263 - 11904: 0xB85B,
-	31264 - 11904: 0xB859,
-	31266 - 11904: 0xDEFD,
-	31270 - 11904: 0xE349,
-	31272 - 11904: 0xE348,
-	31274 - 11904: 0x8C63,
-	31275 - 11904: 0xE344,
-	31276 - 11904: 0x87BB,
-	31277 - 11904: 0xA0B3,
-	31278 - 11904: 0xBAD8,
-	31279 - 11904: 0xE347,
-	31280 - 11904: 0xE346,
-	31281 - 11904: 0xBAD9,
-	31282 - 11904: 0x87B4,
-	31287 - 11904: 0xBD5E,
-	31289 - 11904: 0xE6D2,
-	31290 - 11904: 0x94CF,
-	31291 - 11904: 0xBD5F,
-	31292 - 11904: 0xBD5B,
-	31293 - 11904: 0xBD5D,
-	31294 - 11904: 0x9FFA,
-	31295 - 11904: 0xBD5A,
-	31296 - 11904: 0xBD5C,
-	31299 - 11904: 0x91E5,
-	31300 - 11904: 0xEAAF,
-	31301 - 11904: 0x9C6A,
-	31302 - 11904: 0xBF70,
-	31303 - 11904: 0xEAB1,
-	31304 - 11904: 0xEAB0,
-	31305 - 11904: 0x8E49,
-	31306 - 11904: 0xE345,
-	31307 - 11904: 0xBF72,
-	31308 - 11904: 0xBF71,
-	31309 - 11904: 0xBF6E,
-	31310 - 11904: 0xBF6F,
-	31316 - 11904: 0xEDB5,
-	31318 - 11904: 0xEDB3,
-	31319 - 11904: 0xC14A,
-	31320 - 11904: 0xEDB4,
-	31322 - 11904: 0xEDB6,
-	31323 - 11904: 0xEDB2,
-	31324 - 11904: 0xEDB1,
-	31327 - 11904: 0xF060,
-	31328 - 11904: 0xC2AA,
-	31329 - 11904: 0xC2A8,
-	31330 - 11904: 0xC2A9,
-	31333 - 11904: 0x8E4C,
-	31335 - 11904: 0xF2A6,
-	31336 - 11904: 0xF2A7,
-	31337 - 11904: 0xC3AD,
-	31339 - 11904: 0xC3AC,
-	31340 - 11904: 0xF4A3,
-	31341 - 11904: 0xF4A4,
-	31342 - 11904: 0xF4A2,
-	31344 - 11904: 0xF6F8,
-	31345 - 11904: 0xF6F9,
-	31346 - 11904: 0x87C9,
-	31348 - 11904: 0xA5DE,
-	31349 - 11904: 0xCA48,
-	31350 - 11904: 0xA873,
-	31352 - 11904: 0xCDA5,
-	31353 - 11904: 0xAAC6,
-	31354 - 11904: 0xAAC5,
-	31355 - 11904: 0xCDA6,
-	31357 - 11904: 0x8E4D,
-	31358 - 11904: 0xD040,
-	31359 - 11904: 0xACEF,
-	31360 - 11904: 0xCFFE,
-	31361 - 11904: 0xACF0,
-	31363 - 11904: 0x9A73,
-	31364 - 11904: 0xAFB6,
-	31365 - 11904: 0xD2F8,
-	31366 - 11904: 0xD2F6,
-	31367 - 11904: 0xD2FC,
-	31368 - 11904: 0xAFB7,
-	31369 - 11904: 0xD2F7,
-	31370 - 11904: 0xD2FB,
-	31371 - 11904: 0xD2F9,
-	31372 - 11904: 0xD2FA,
-	31375 - 11904: 0xD6C8,
-	31376 - 11904: 0xD6CA,
-	31377 - 11904: 0x9947,
-	31378 - 11904: 0xB2BF,
-	31379 - 11904: 0x8CB1,
-	31380 - 11904: 0xD6C9,
-	31381 - 11904: 0xB2C0,
-	31382 - 11904: 0xB5A2,
-	31383 - 11904: 0xB5A1,
-	31384 - 11904: 0xB57E,
-	31385 - 11904: 0xDADB,
-	31390 - 11904: 0xDF44,
-	31391 - 11904: 0xB85D,
-	31392 - 11904: 0xB85E,
-	31394 - 11904: 0xDF43,
-	31395 - 11904: 0xDF42,
-	31400 - 11904: 0xE34A,
-	31401 - 11904: 0xBADB,
-	31402 - 11904: 0xBADA,
-	31403 - 11904: 0xE34B,
-	31404 - 11904: 0xE34C,
-	31406 - 11904: 0xBD61,
-	31407 - 11904: 0xBD60,
-	31408 - 11904: 0x8E50,
-	31409 - 11904: 0xEAB5,
-	31410 - 11904: 0xE6D3,
-	31411 - 11904: 0xE6D5,
-	31412 - 11904: 0xE6D4,
-	31413 - 11904: 0xEAB4,
-	31414 - 11904: 0xEAB2,
-	31415 - 11904: 0xEAB6,
-	31416 - 11904: 0xEAB3,
-	31418 - 11904: 0xBF73,
-	31419 - 11904: 0x8E4F,
-	31420 - 11904: 0x9949,
-	31422 - 11904: 0xEDB7,
-	31423 - 11904: 0xC14B,
-	31424 - 11904: 0xEDB8,
-	31425 - 11904: 0xEDB9,
-	31426 - 11904: 0x8E51,
-	31427 - 11904: 0x8E52,
-	31428 - 11904: 0xC2AB,
-	31429 - 11904: 0xC2AC,
-	31431 - 11904: 0xC475,
-	31432 - 11904: 0x9AB2,
-	31433 - 11904: 0x89A5,
-	31434 - 11904: 0xC5D1,
-	31435 - 11904: 0xA5DF,
-	31439 - 11904: 0x994C,
-	31441 - 11904: 0xD041,
-	31443 - 11904: 0x9FF8,
-	31448 - 11904: 0xD2FD,
-	31449 - 11904: 0xAFB8,
-	31450 - 11904: 0x8E56,
-	31451 - 11904: 0x994D,
-	31452 - 11904: 0x91CA,
-	31453 - 11904: 0x8E57,
-	31455 - 11904: 0xB3BA,
-	31456 - 11904: 0xB3B9,
-	31458 - 11904: 0x94E1,
-	31459 - 11904: 0xB5A4,
-	31460 - 11904: 0xDADD,
-	31461 - 11904: 0xB5A3,
-	31462 - 11904: 0xDADC,
-	31463 - 11904: 0x9047,
-	31465 - 11904: 0x8FD8,
-	31466 - 11904: 0x8E58,
-	31467 - 11904: 0xDF45,
-	31469 - 11904: 0xBADC,
-	31470 - 11904: 0xE34D,
-	31471 - 11904: 0xBADD,
-	31478 - 11904: 0xC476,
-	31479 - 11904: 0xF4A5,
-	31481 - 11904: 0xA6CB,
-	31482 - 11904: 0xAAC7,
-	31483 - 11904: 0xCDA7,
-	31484 - 11904: 0x87A3,
-	31485 - 11904: 0xACF2,
-	31486 - 11904: 0x94EB,
-	31487 - 11904: 0xACF1,
-	31488 - 11904: 0xD042,
-	31489 - 11904: 0xD043,
-	31492 - 11904: 0xD340,
-	31493 - 11904: 0xD342,
-	31494 - 11904: 0xAFB9,
-	31496 - 11904: 0xD344,
-	31497 - 11904: 0xD347,
-	31498 - 11904: 0xD345,
-	31499 - 11904: 0x8E5C,
-	31500 - 11904: 0x9553,
-	31502 - 11904: 0xD346,
-	31503 - 11904: 0xD343,
-	31504 - 11904: 0xD2FE,
-	31505 - 11904: 0xAFBA,
-	31506 - 11904: 0xD348,
-	31507 - 11904: 0xD341,
-	31508 - 11904: 0x9FE5,
-	31512 - 11904: 0xD6D3,
-	31513 - 11904: 0xB2C6,
-	31514 - 11904: 0xD6DC,
-	31515 - 11904: 0xB2C3,
-	31517 - 11904: 0xD6D5,
-	31518 - 11904: 0xB2C7,
-	31519 - 11904: 0x9F56,
-	31520 - 11904: 0xB2C1,
-	31522 - 11904: 0xD6D0,
-	31523 - 11904: 0xD6DD,
-	31524 - 11904: 0xD6D1,
-	31525 - 11904: 0xD6CE,
-	31526 - 11904: 0xB2C5,
-	31527 - 11904: 0x954F,
-	31528 - 11904: 0xB2C2,
-	31529 - 11904: 0x8E5E,
-	31530 - 11904: 0xD6D4,
-	31531 - 11904: 0xD6D7,
-	31532 - 11904: 0xB2C4,
-	31533 - 11904: 0xD6D8,
-	31534 - 11904: 0xB2C8,
-	31535 - 11904: 0xD6D9,
-	31536 - 11904: 0xD6CF,
-	31537 - 11904: 0xD6D6,
-	31538 - 11904: 0xD6DA,
-	31539 - 11904: 0xD6D2,
-	31540 - 11904: 0xD6CD,
-	31541 - 11904: 0xD6CB,
-	31544 - 11904: 0xD6DB,
-	31545 - 11904: 0x996A,
-	31547 - 11904: 0xDADF,
-	31552 - 11904: 0xDAE4,
-	31554 - 11904: 0x9C64,
-	31555 - 11904: 0x9CD9,
-	31556 - 11904: 0xDAE0,
-	31557 - 11904: 0xDAE6,
-	31558 - 11904: 0xB5A7,
-	31559 - 11904: 0xD6CC,
-	31560 - 11904: 0xDAE1,
-	31561 - 11904: 0xB5A5,
-	31562 - 11904: 0xDADE,
-	31563 - 11904: 0xB5AC,
-	31564 - 11904: 0xDAE2,
-	31565 - 11904: 0xB5AB,
-	31566 - 11904: 0xDAE3,
-	31567 - 11904: 0xB5AD,
-	31568 - 11904: 0xB5A8,
-	31569 - 11904: 0xB5AE,
-	31570 - 11904: 0xB5A9,
-	31572 - 11904: 0xB5AA,
-	31573 - 11904: 0x8E5D,
-	31574 - 11904: 0xB5A6,
-	31576 - 11904: 0xDAE5,
-	31584 - 11904: 0xB861,
-	31585 - 11904: 0xDF50,
-	31586 - 11904: 0x9950,
-	31587 - 11904: 0xDF53,
-	31588 - 11904: 0xDF47,
-	31589 - 11904: 0xDF4C,
-	31590 - 11904: 0xDF46,
-	31591 - 11904: 0xB863,
-	31593 - 11904: 0xDF4A,
-	31596 - 11904: 0x9951,
-	31597 - 11904: 0xDF48,
-	31598 - 11904: 0xB862,
-	31599 - 11904: 0x8E62,
-	31600 - 11904: 0xDF4F,
-	31601 - 11904: 0xDF4E,
-	31602 - 11904: 0xDF4B,
-	31603 - 11904: 0xDF4D,
-	31604 - 11904: 0xDF49,
-	31605 - 11904: 0xBAE1,
-	31606 - 11904: 0xDF52,
-	31607 - 11904: 0xB85F,
-	31608 - 11904: 0xDF51,
-	31611 - 11904: 0x9952,
-	31618 - 11904: 0xE35D,
-	31620 - 11904: 0xBAE8,
-	31621 - 11904: 0xE358,
-	31623 - 11904: 0xBAE7,
-	31624 - 11904: 0xE34E,
-	31626 - 11904: 0xE350,
-	31627 - 11904: 0xBAE0,
-	31628 - 11904: 0xE355,
-	31629 - 11904: 0xE354,
-	31630 - 11904: 0xE357,
-	31631 - 11904: 0xBAE5,
-	31632 - 11904: 0xE352,
-	31633 - 11904: 0xE351,
-	31634 - 11904: 0x8E68,
-	31636 - 11904: 0xBAE4,
-	31637 - 11904: 0xBADF,
-	31638 - 11904: 0xE353,
-	31639 - 11904: 0xBAE2,
-	31640 - 11904: 0xE359,
-	31641 - 11904: 0xE35B,
-	31643 - 11904: 0xE356,
-	31644 - 11904: 0xE34F,
-	31645 - 11904: 0xBAE3,
-	31648 - 11904: 0xBD69,
-	31649 - 11904: 0xBADE,
-	31650 - 11904: 0x8E61,
-	31651 - 11904: 0x9F59,
-	31652 - 11904: 0xE35C,
-	31660 - 11904: 0xE6D9,
-	31661 - 11904: 0xBD62,
-	31662 - 11904: 0x87D0,
-	31663 - 11904: 0xE6DB,
-	31665 - 11904: 0xBD63,
-	31666 - 11904: 0x8BB3,
-	31668 - 11904: 0xBD65,
-	31669 - 11904: 0xE6DE,
-	31671 - 11904: 0xE6D6,
-	31672 - 11904: 0xBAE6,
-	31673 - 11904: 0xE6DC,
-	31678 - 11904: 0xE6D8,
-	31680 - 11904: 0xB860,
-	31681 - 11904: 0xBD68,
-	31684 - 11904: 0xBD64,
-	31685 - 11904: 0x87B9,
-	31686 - 11904: 0xBD66,
-	31687 - 11904: 0xBD67,
-	31689 - 11904: 0xBF76,
-	31690 - 11904: 0xE6DD,
-	31691 - 11904: 0xE6D7,
-	31692 - 11904: 0xBD6A,
-	31694 - 11904: 0xE6DA,
-	31695 - 11904: 0x9F5D,
-	31696 - 11904: 0x8E66,
-	31700 - 11904: 0xEAC0,
-	31701 - 11904: 0xEABB,
-	31704 - 11904: 0xEAC5,
-	31705 - 11904: 0xBF74,
-	31706 - 11904: 0xEABD,
-	31707 - 11904: 0xBF78,
-	31708 - 11904: 0xEAC3,
-	31709 - 11904: 0xEABA,
-	31710 - 11904: 0xEAB7,
-	31711 - 11904: 0xEAC6,
-	31712 - 11904: 0xC151,
-	31713 - 11904: 0xBF79,
-	31714 - 11904: 0xEAC2,
-	31715 - 11904: 0xEAB8,
-	31716 - 11904: 0xBF77,
-	31717 - 11904: 0xEABC,
-	31718 - 11904: 0xBF7B,
-	31719 - 11904: 0xEAB9,
-	31720 - 11904: 0xEABE,
-	31721 - 11904: 0xBF7A,
-	31722 - 11904: 0xEAC1,
-	31723 - 11904: 0xEAC4,
-	31724 - 11904: 0x8CB2,
-	31728 - 11904: 0xEDCB,
-	31729 - 11904: 0xEDCC,
-	31730 - 11904: 0xEDBC,
-	31731 - 11904: 0xEDC3,
-	31732 - 11904: 0xEDC1,
-	31735 - 11904: 0xC14F,
-	31736 - 11904: 0xEDC8,
-	31737 - 11904: 0xEABF,
-	31738 - 11904: 0x8E6E,
-	31739 - 11904: 0xEDBF,
-	31740 - 11904: 0x9F64,
-	31741 - 11904: 0xEDC9,
-	31742 - 11904: 0xC14E,
-	31743 - 11904: 0xEDBE,
-	31744 - 11904: 0xEDBD,
-	31745 - 11904: 0xEDC7,
-	31746 - 11904: 0xEDC4,
-	31747 - 11904: 0xEDC6,
-	31749 - 11904: 0xEDBA,
-	31750 - 11904: 0xEDCA,
-	31751 - 11904: 0xC14C,
-	31753 - 11904: 0xEDC5,
-	31754 - 11904: 0xEDCE,
-	31755 - 11904: 0xEDC2,
-	31756 - 11904: 0xC150,
-	31757 - 11904: 0xC14D,
-	31758 - 11904: 0xEDC0,
-	31759 - 11904: 0xEDBB,
-	31760 - 11904: 0xEDCD,
-	31761 - 11904: 0xBF75,
-	31762 - 11904: 0x9953,
-	31765 - 11904: 0xFAB8,
-	31769 - 11904: 0xF063,
-	31771 - 11904: 0x9954,
-	31772 - 11904: 0xF061,
-	31773 - 11904: 0xF067,
-	31774 - 11904: 0xC2B0,
-	31775 - 11904: 0xF065,
-	31776 - 11904: 0xF064,
-	31777 - 11904: 0xC2B2,
-	31778 - 11904: 0xF06A,
-	31779 - 11904: 0xC2B1,
-	31781 - 11904: 0xF06B,
-	31782 - 11904: 0xF068,
-	31783 - 11904: 0xC2AE,
-	31784 - 11904: 0xF069,
-	31785 - 11904: 0xF062,
-	31786 - 11904: 0xC2AF,
-	31787 - 11904: 0xC2AD,
-	31788 - 11904: 0xF2AB,
-	31789 - 11904: 0xF066,
-	31792 - 11904: 0xF06C,
-	31795 - 11904: 0xF2A8,
-	31797 - 11904: 0x8E70,
-	31799 - 11904: 0xC3B2,
-	31800 - 11904: 0xC3B0,
-	31801 - 11904: 0xF2AA,
-	31803 - 11904: 0xF2AC,
-	31804 - 11904: 0xF2A9,
-	31805 - 11904: 0xC3B1,
-	31806 - 11904: 0xC3AE,
-	31807 - 11904: 0xC3AF,
-	31808 - 11904: 0xC3B3,
-	31810 - 11904: 0x9F61,
-	31811 - 11904: 0xC478,
-	31812 - 11904: 0x8E72,
-	31813 - 11904: 0xF4AA,
-	31815 - 11904: 0xF4A9,
-	31816 - 11904: 0xF4A7,
-	31817 - 11904: 0xF4A6,
-	31818 - 11904: 0xF4A8,
-	31820 - 11904: 0xC477,
-	31821 - 11904: 0xC479,
-	31824 - 11904: 0xC4F0,
-	31825 - 11904: 0xA06B,
-	31827 - 11904: 0xF5E5,
-	31828 - 11904: 0xF5E4,
-	31830 - 11904: 0x9F40,
-	31831 - 11904: 0xF6FA,
-	31833 - 11904: 0xF6FC,
-	31834 - 11904: 0xF6FE,
-	31835 - 11904: 0xF6FD,
-	31836 - 11904: 0xF6FB,
-	31837 - 11904: 0x94ED,
-	31839 - 11904: 0xC5A3,
-	31840 - 11904: 0xC5A2,
-	31843 - 11904: 0xC5D3,
-	31844 - 11904: 0xC5D2,
-	31845 - 11904: 0xC5D4,
-	31846 - 11904: 0xF7ED,
-	31847 - 11904: 0xF7EC,
-	31849 - 11904: 0xF8FB,
-	31850 - 11904: 0xF8B8,
-	31851 - 11904: 0xF8FC,
-	31852 - 11904: 0xC658,
-	31853 - 11904: 0x94EE,
-	31854 - 11904: 0xC659,
-	31855 - 11904: 0xF96D,
-	31856 - 11904: 0x9FBD,
-	31858 - 11904: 0xC67E,
-	31859 - 11904: 0xA6CC,
-	31860 - 11904: 0x8E7B,
-	31861 - 11904: 0xCDA8,
-	31864 - 11904: 0xD045,
-	31865 - 11904: 0xD046,
-	31866 - 11904: 0xD044,
-	31867 - 11904: 0x9957,
-	31868 - 11904: 0x94F7,
-	31869 - 11904: 0xACF3,
-	31870 - 11904: 0x9F5F,
-	31871 - 11904: 0xD047,
-	31872 - 11904: 0xD048,
-	31873 - 11904: 0xD049,
-	31875 - 11904: 0x8E73,
-	31876 - 11904: 0xD349,
-	31877 - 11904: 0xD34F,
-	31878 - 11904: 0x9F62,
-	31880 - 11904: 0xD34D,
-	31881 - 11904: 0xAFBB,
-	31882 - 11904: 0xD34B,
-	31884 - 11904: 0xD34C,
-	31885 - 11904: 0xD34E,
-	31886 - 11904: 0x94F6,
-	31889 - 11904: 0xD34A,
-	31890 - 11904: 0xB2C9,
-	31892 - 11904: 0xD6DE,
-	31893 - 11904: 0xB2CB,
-	31894 - 11904: 0xD6E0,
-	31895 - 11904: 0xB2CA,
-	31896 - 11904: 0xD6DF,
-	31900 - 11904: 0x9958,
-	31902 - 11904: 0xDAE8,
-	31903 - 11904: 0xB5AF,
-	31905 - 11904: 0xDAEA,
-	31906 - 11904: 0xDAE7,
-	31907 - 11904: 0xD6E1,
-	31909 - 11904: 0xB5B0,
-	31910 - 11904: 0x8E75,
-	31911 - 11904: 0xF9DB,
-	31912 - 11904: 0xDAE9,
-	31916 - 11904: 0x9072,
-	31918 - 11904: 0x94F8,
-	31919 - 11904: 0xDF56,
-	31921 - 11904: 0xB864,
-	31922 - 11904: 0xDF54,
-	31923 - 11904: 0xB865,
-	31924 - 11904: 0xDF55,
-	31925 - 11904: 0xB866,
-	31928 - 11904: 0x995A,
-	31929 - 11904: 0xBAE9,
-	31930 - 11904: 0xE361,
-	31931 - 11904: 0xE35E,
-	31932 - 11904: 0xE360,
-	31933 - 11904: 0xBAEA,
-	31934 - 11904: 0xBAEB,
-	31935 - 11904: 0xE35F,
-	31938 - 11904: 0xA0B0,
-	31939 - 11904: 0x8CB3,
-	31941 - 11904: 0xE6DF,
-	31943 - 11904: 0x8E79,
-	31944 - 11904: 0xE6E0,
-	31945 - 11904: 0x8E78,
-	31946 - 11904: 0xBD6B,
-	31947 - 11904: 0xE6E2,
-	31948 - 11904: 0xE6E1,
-	31949 - 11904: 0x94F3,
-	31950 - 11904: 0xA261,
-	31952 - 11904: 0xEACA,
-	31953 - 11904: 0xEACB,
-	31954 - 11904: 0xEAC7,
-	31955 - 11904: 0x98AF,
-	31956 - 11904: 0xEAC8,
-	31957 - 11904: 0xBF7C,
-	31958 - 11904: 0xBF7D,
-	31959 - 11904: 0xEAC9,
-	31961 - 11904: 0xC157,
-	31962 - 11904: 0xA0B2,
-	31964 - 11904: 0xC153,
-	31965 - 11904: 0xC158,
-	31966 - 11904: 0xC154,
-	31967 - 11904: 0xC156,
-	31968 - 11904: 0xC152,
-	31970 - 11904: 0xC155,
-	31974 - 11904: 0x8E7A,
-	31975 - 11904: 0xC2B3,
-	31976 - 11904: 0xEDCF,
-	31978 - 11904: 0xF2AE,
-	31980 - 11904: 0xF2AD,
-	31981 - 11904: 0x995C,
-	31982 - 11904: 0xF4AB,
-	31983 - 11904: 0xC47A,
-	31984 - 11904: 0xC47B,
-	31985 - 11904: 0xF741,
-	31986 - 11904: 0xF5E6,
-	31987 - 11904: 0x8E7C,
-	31988 - 11904: 0xF740,
-	31989 - 11904: 0x8E7D,
-	31990 - 11904: 0xF8FD,
-	31991 - 11904: 0xF9A4,
-	31992 - 11904: 0xA6CD,
-	31993 - 11904: 0x8BD9,
-	31995 - 11904: 0xA874,
-	31996 - 11904: 0x89A2,
-	31997 - 11904: 0xCDA9,
-	31998 - 11904: 0xAAC8,
-	32000 - 11904: 0xACF6,
-	32001 - 11904: 0xD04C,
-	32002 - 11904: 0xACF4,
-	32003 - 11904: 0xD04A,
-	32004 - 11904: 0xACF9,
-	32005 - 11904: 0xACF5,
-	32006 - 11904: 0xACFA,
-	32007 - 11904: 0xACF8,
-	32008 - 11904: 0xD04B,
-	32009 - 11904: 0xACF7,
-	32010 - 11904: 0xAFBF,
-	32011 - 11904: 0xAFBE,
-	32012 - 11904: 0xD35A,
-	32013 - 11904: 0xAFC7,
-	32014 - 11904: 0xD353,
-	32015 - 11904: 0xD359,
-	32016 - 11904: 0xAFC3,
-	32017 - 11904: 0xD352,
-	32018 - 11904: 0xD358,
-	32019 - 11904: 0xD356,
-	32020 - 11904: 0xAFC2,
-	32021 - 11904: 0xAFC4,
-	32022 - 11904: 0xD355,
-	32023 - 11904: 0xAFBD,
-	32024 - 11904: 0xD354,
-	32025 - 11904: 0xAFC8,
-	32026 - 11904: 0xAFC5,
-	32027 - 11904: 0xAFC9,
-	32028 - 11904: 0xAFC6,
-	32029 - 11904: 0xD351,
-	32030 - 11904: 0xD350,
-	32031 - 11904: 0xD357,
-	32032 - 11904: 0xAFC0,
-	32033 - 11904: 0xAFBC,
-	32034 - 11904: 0xAFC1,
-	32037 - 11904: 0x9ED7,
-	32040 - 11904: 0xD6F0,
-	32041 - 11904: 0xD6E9,
-	32043 - 11904: 0xB5B5,
-	32044 - 11904: 0xD6E8,
-	32046 - 11904: 0xB2CF,
-	32047 - 11904: 0xB2D6,
-	32048 - 11904: 0xB2D3,
-	32049 - 11904: 0xB2D9,
-	32050 - 11904: 0xB2D8,
-	32051 - 11904: 0xB2D4,
-	32053 - 11904: 0xD6E2,
-	32054 - 11904: 0xD6E5,
-	32056 - 11904: 0xD6E4,
-	32057 - 11904: 0xB2D0,
-	32058 - 11904: 0xD6E6,
-	32059 - 11904: 0xD6EF,
-	32060 - 11904: 0xB2D1,
-	32061 - 11904: 0xD6E3,
-	32062 - 11904: 0xD6EC,
-	32063 - 11904: 0xD6ED,
-	32064 - 11904: 0xB2D2,
-	32065 - 11904: 0xD6EA,
-	32066 - 11904: 0xB2D7,
-	32067 - 11904: 0xB2CD,
-	32068 - 11904: 0xB2D5,
-	32069 - 11904: 0xD6E7,
-	32070 - 11904: 0xB2CC,
-	32071 - 11904: 0xD6EB,
-	32074 - 11904: 0xD6EE,
-	32077 - 11904: 0xA0B6,
-	32078 - 11904: 0xDAFB,
-	32079 - 11904: 0xDAF2,
-	32080 - 11904: 0xB5B2,
-	32081 - 11904: 0xDAF9,
-	32082 - 11904: 0xDAF6,
-	32083 - 11904: 0xDAEE,
-	32084 - 11904: 0xDAF7,
-	32085 - 11904: 0xB5B4,
-	32086 - 11904: 0xDAEF,
-	32088 - 11904: 0xDAEB,
-	32090 - 11904: 0x9E42,
-	32091 - 11904: 0xB86C,
-	32092 - 11904: 0xDAF4,
-	32093 - 11904: 0x8EA4,
-	32094 - 11904: 0xB5B1,
-	32095 - 11904: 0xDAFA,
-	32097 - 11904: 0xB5B8,
-	32098 - 11904: 0xB5BA,
-	32099 - 11904: 0xDAED,
-	32102 - 11904: 0xB5B9,
-	32103 - 11904: 0xDAF0,
-	32104 - 11904: 0xB5B3,
-	32105 - 11904: 0xDAF8,
-	32106 - 11904: 0xDAF1,
-	32107 - 11904: 0xDAF5,
-	32109 - 11904: 0xDAF3,
-	32110 - 11904: 0xB5B6,
-	32111 - 11904: 0xDAEC,
-	32112 - 11904: 0xB5BB,
-	32113 - 11904: 0xB2CE,
-	32114 - 11904: 0xB5B7,
-	32115 - 11904: 0xB5BC,
-	32121 - 11904: 0xB868,
-	32122 - 11904: 0xDF5D,
-	32123 - 11904: 0xDF5F,
-	32124 - 11904: 0xDF61,
-	32125 - 11904: 0xDF65,
-	32127 - 11904: 0xDF5B,
-	32128 - 11904: 0xDF59,
-	32129 - 11904: 0xB86A,
-	32131 - 11904: 0xDF60,
-	32132 - 11904: 0xDF64,
-	32133 - 11904: 0xDF5C,
-	32134 - 11904: 0xDF58,
-	32136 - 11904: 0xDF57,
-	32137 - 11904: 0x8EA7,
-	32139 - 11904: 0x8C76,
-	32140 - 11904: 0xDF62,
-	32141 - 11904: 0xDF5A,
-	32142 - 11904: 0xDF5E,
-	32143 - 11904: 0xB86B,
-	32145 - 11904: 0xB869,
-	32146 - 11904: 0xDF66,
-	32147 - 11904: 0xB867,
-	32148 - 11904: 0xDF63,
-	32149 - 11904: 0x8767,
-	32150 - 11904: 0xE372,
-	32151 - 11904: 0x9542,
-	32156 - 11904: 0xBAEE,
-	32157 - 11904: 0xE36A,
-	32158 - 11904: 0xBD78,
-	32159 - 11904: 0xE374,
-	32160 - 11904: 0xBAF1,
-	32161 - 11904: 0xE378,
-	32162 - 11904: 0xBAF7,
-	32163 - 11904: 0xE365,
-	32164 - 11904: 0x987D,
-	32166 - 11904: 0xE375,
-	32167 - 11904: 0xE362,
-	32168 - 11904: 0x9755,
-	32169 - 11904: 0xE377,
-	32170 - 11904: 0xE366,
-	32171 - 11904: 0x8EA8,
-	32172 - 11904: 0xBAFE,
-	32173 - 11904: 0xBAFB,
-	32174 - 11904: 0xE376,
-	32175 - 11904: 0xE370,
-	32176 - 11904: 0xBAED,
-	32177 - 11904: 0xBAF5,
-	32178 - 11904: 0xBAF4,
-	32179 - 11904: 0x8EAA,
-	32180 - 11904: 0xBAF3,
-	32181 - 11904: 0xBAF9,
-	32183 - 11904: 0xE363,
-	32184 - 11904: 0xBAFA,
-	32185 - 11904: 0xE371,
-	32186 - 11904: 0xBAF6,
-	32187 - 11904: 0xBAEC,
-	32188 - 11904: 0xE373,
-	32189 - 11904: 0xBAEF,
-	32190 - 11904: 0xBAF0,
-	32191 - 11904: 0xBAF8,
-	32192 - 11904: 0xE368,
-	32193 - 11904: 0xE367,
-	32194 - 11904: 0xE364,
-	32196 - 11904: 0xE36C,
-	32197 - 11904: 0xE369,
-	32198 - 11904: 0xE36D,
-	32199 - 11904: 0xBAFD,
-	32201 - 11904: 0xE379,
-	32202 - 11904: 0xBAF2,
-	32203 - 11904: 0xE36E,
-	32204 - 11904: 0xE36F,
-	32205 - 11904: 0x89A3,
-	32206 - 11904: 0xE36B,
-	32207 - 11904: 0x9960,
-	32208 - 11904: 0x9962,
-	32210 - 11904: 0xBAFC,
-	32211 - 11904: 0x94FC,
-	32212 - 11904: 0x9961,
-	32215 - 11904: 0xE6E7,
-	32216 - 11904: 0xBD70,
-	32217 - 11904: 0xBD79,
-	32218 - 11904: 0xBD75,
-	32219 - 11904: 0xE6E4,
-	32220 - 11904: 0x94FA,
-	32221 - 11904: 0xBD72,
-	32222 - 11904: 0xBD76,
-	32223 - 11904: 0xE6F0,
-	32224 - 11904: 0xBD6C,
-	32225 - 11904: 0xE6E8,
-	32227 - 11904: 0xBD74,
-	32228 - 11904: 0x8EAE,
-	32229 - 11904: 0x8EB2,
-	32230 - 11904: 0xE6EB,
-	32231 - 11904: 0xE6E6,
-	32232 - 11904: 0xBD73,
-	32233 - 11904: 0xBD77,
-	32234 - 11904: 0xE6E5,
-	32236 - 11904: 0xBD71,
-	32238 - 11904: 0xE6EF,
-	32239 - 11904: 0xBD6E,
-	32240 - 11904: 0xE6EE,
-	32241 - 11904: 0xE6ED,
-	32242 - 11904: 0xBD7A,
-	32243 - 11904: 0xE572,
-	32244 - 11904: 0xBD6D,
-	32245 - 11904: 0x8EB0,
-	32246 - 11904: 0xE6EC,
-	32247 - 11904: 0xE6E3,
-	32249 - 11904: 0xBD7B,
-	32250 - 11904: 0xE6EA,
-	32251 - 11904: 0xBD6F,
-	32253 - 11904: 0x9963,
-	32254 - 11904: 0x97AA,
-	32259 - 11904: 0xE6E9,
-	32263 - 11904: 0x94FB,
-	32264 - 11904: 0xBFA2,
-	32265 - 11904: 0xBFA7,
-	32266 - 11904: 0xBF7E,
-	32267 - 11904: 0xEAD8,
-	32268 - 11904: 0xEACF,
-	32269 - 11904: 0xEADB,
-	32270 - 11904: 0xEAD3,
-	32271 - 11904: 0xEAD9,
-	32272 - 11904: 0xBFA8,
-	32273 - 11904: 0xBFA1,
-	32274 - 11904: 0xEACC,
-	32275 - 11904: 0xEAD2,
-	32276 - 11904: 0xEADC,
-	32277 - 11904: 0xEAD5,
-	32278 - 11904: 0xEADA,
-	32279 - 11904: 0xEACE,
-	32282 - 11904: 0xEAD6,
-	32283 - 11904: 0xBFA3,
-	32284 - 11904: 0xEAD4,
-	32285 - 11904: 0xBFA6,
-	32286 - 11904: 0xBFA5,
-	32287 - 11904: 0xEAD0,
-	32288 - 11904: 0xEAD1,
-	32289 - 11904: 0xEACD,
-	32290 - 11904: 0xEAD7,
-	32291 - 11904: 0xBFA4,
-	32292 - 11904: 0xEADE,
-	32293 - 11904: 0xEADD,
-	32295 - 11904: 0x8EBB,
-	32297 - 11904: 0xEDDA,
-	32298 - 11904: 0xEDD6,
-	32299 - 11904: 0xC15F,
-	32301 - 11904: 0xEDD0,
-	32302 - 11904: 0xC159,
-	32303 - 11904: 0xC169,
-	32304 - 11904: 0xEDDC,
-	32305 - 11904: 0xC161,
-	32306 - 11904: 0xC15D,
-	32307 - 11904: 0xEDD3,
-	32308 - 11904: 0xC164,
-	32309 - 11904: 0xC167,
-	32310 - 11904: 0xEDDE,
-	32311 - 11904: 0xC15C,
-	32312 - 11904: 0xEDD5,
-	32313 - 11904: 0xC165,
-	32314 - 11904: 0xEDE0,
-	32315 - 11904: 0xEDDD,
-	32316 - 11904: 0xEDD1,
-	32317 - 11904: 0xC160,
-	32318 - 11904: 0xC15A,
-	32319 - 11904: 0xC168,
-	32320 - 11904: 0xEDD8,
-	32321 - 11904: 0xC163,
-	32322 - 11904: 0xEDD2,
-	32323 - 11904: 0xC15E,
-	32324 - 11904: 0xEDDF,
-	32325 - 11904: 0xC162,
-	32326 - 11904: 0xC15B,
-	32327 - 11904: 0xEDD9,
-	32328 - 11904: 0xC166,
-	32329 - 11904: 0xEDD7,
-	32332 - 11904: 0xEDDB,
-	32336 - 11904: 0xF06E,
-	32337 - 11904: 0xF074,
-	32338 - 11904: 0xC2B9,
-	32339 - 11904: 0xF077,
-	32340 - 11904: 0xC2B4,
-	32341 - 11904: 0xC2B5,
-	32342 - 11904: 0xF06F,
-	32343 - 11904: 0xF076,
-	32344 - 11904: 0xF071,
-	32345 - 11904: 0xC2BA,
-	32346 - 11904: 0xC2B7,
-	32347 - 11904: 0x8CDC,
-	32348 - 11904: 0xF06D,
-	32350 - 11904: 0xC2B6,
-	32351 - 11904: 0xF073,
-	32352 - 11904: 0xF075,
-	32353 - 11904: 0xC2B8,
-	32354 - 11904: 0xF072,
-	32355 - 11904: 0xF070,
-	32357 - 11904: 0x9876,
-	32359 - 11904: 0x8EA1,
-	32360 - 11904: 0xF2B8,
-	32361 - 11904: 0xC3B7,
-	32362 - 11904: 0xC3B8,
-	32363 - 11904: 0xC3B4,
-	32364 - 11904: 0x8CB4,
-	32365 - 11904: 0xC3B5,
-	32366 - 11904: 0x8EB7,
-	32367 - 11904: 0xF2B4,
-	32368 - 11904: 0xF2B2,
-	32370 - 11904: 0xF2B6,
-	32371 - 11904: 0xC3BA,
-	32372 - 11904: 0xF2B7,
-	32373 - 11904: 0xF2B0,
-	32374 - 11904: 0xF2AF,
-	32375 - 11904: 0xF2B3,
-	32376 - 11904: 0xF2B1,
-	32377 - 11904: 0xC3B6,
-	32378 - 11904: 0xF2B5,
-	32379 - 11904: 0xF4AC,
-	32380 - 11904: 0xC47E,
-	32381 - 11904: 0xC47D,
-	32382 - 11904: 0xF4AD,
-	32383 - 11904: 0x9DA6,
-	32384 - 11904: 0xF4AF,
-	32385 - 11904: 0xF4AE,
-	32386 - 11904: 0xC4A1,
-	32390 - 11904: 0xF5EB,
-	32391 - 11904: 0xF5E8,
-	32392 - 11904: 0xF5E9,
-	32394 - 11904: 0xF5E7,
-	32395 - 11904: 0xF5EA,
-	32396 - 11904: 0xC4F2,
-	32397 - 11904: 0xF5EC,
-	32398 - 11904: 0x9EB0,
-	32399 - 11904: 0xC4F1,
-	32401 - 11904: 0xF742,
-	32402 - 11904: 0x8EB8,
-	32403 - 11904: 0xC5D5,
-	32404 - 11904: 0xC5D7,
-	32405 - 11904: 0xF7EE,
-	32406 - 11904: 0xC5D6,
-	32407 - 11904: 0xF8B9,
-	32408 - 11904: 0xF940,
-	32409 - 11904: 0xF942,
-	32410 - 11904: 0xF8FE,
-	32411 - 11904: 0xF941,
-	32412 - 11904: 0xC66C,
-	32415 - 11904: 0x9D70,
-	32420 - 11904: 0x896E,
-	32428 - 11904: 0x896F,
-	32442 - 11904: 0x8970,
-	32455 - 11904: 0x8971,
-	32463 - 11904: 0x8972,
-	32479 - 11904: 0x8973,
-	32518 - 11904: 0x8974,
-	32566 - 11904: 0xA6CE,
-	32567 - 11904: 0x8975,
-	32568 - 11904: 0xACFB,
-	32569 - 11904: 0xD26F,
-	32570 - 11904: 0xAFCA,
-	32573 - 11904: 0xB2DA,
-	32574 - 11904: 0xDAFC,
-	32575 - 11904: 0xDAFD,
-	32576 - 11904: 0x8EBC,
-	32577 - 11904: 0x8EBD,
-	32579 - 11904: 0xEADF,
-	32580 - 11904: 0xC16A,
-	32581 - 11904: 0xEDE1,
-	32583 - 11904: 0x8EBE,
-	32584 - 11904: 0xC2BB,
-	32585 - 11904: 0x9DD1,
-	32586 - 11904: 0xF2BA,
-	32587 - 11904: 0xF2B9,
-	32588 - 11904: 0xC4A2,
-	32589 - 11904: 0xF5ED,
-	32590 - 11904: 0x94FD,
-	32591 - 11904: 0xF743,
-	32592 - 11904: 0xC5F8,
-	32593 - 11904: 0xCA49,
-	32594 - 11904: 0x8BD7,
-	32595 - 11904: 0x8BDA,
-	32596 - 11904: 0xAAC9,
-	32597 - 11904: 0xA875,
-	32600 - 11904: 0xD04D,
-	32603 - 11904: 0xD360,
-	32604 - 11904: 0xD35B,
-	32605 - 11904: 0xD35F,
-	32606 - 11904: 0xD35D,
-	32607 - 11904: 0xAFCB,
-	32608 - 11904: 0xD35E,
-	32609 - 11904: 0xD35C,
-	32611 - 11904: 0xD6F1,
-	32613 - 11904: 0xDAFE,
-	32614 - 11904: 0xDB40,
-	32615 - 11904: 0xDF69,
-	32616 - 11904: 0xDF6A,
-	32617 - 11904: 0xB86E,
-	32618 - 11904: 0xB86F,
-	32619 - 11904: 0xDF68,
-	32620 - 11904: 0xDF6B,
-	32621 - 11904: 0xDF67,
-	32622 - 11904: 0xB86D,
-	32624 - 11904: 0xBB40,
-	32625 - 11904: 0xA0E2,
-	32626 - 11904: 0xB870,
-	32627 - 11904: 0xE37A,
-	32629 - 11904: 0xBD7C,
-	32630 - 11904: 0xE6F1,
-	32631 - 11904: 0xBD7D,
-	32632 - 11904: 0x9FE9,
-	32633 - 11904: 0xBFA9,
-	32634 - 11904: 0xEAE2,
-	32635 - 11904: 0xEAE0,
-	32636 - 11904: 0xEAE1,
-	32637 - 11904: 0xEDE4,
-	32638 - 11904: 0xEDE3,
-	32639 - 11904: 0xEDE2,
-	32643 - 11904: 0xF2BB,
-	32645 - 11904: 0xC3B9,
-	32646 - 11904: 0xF2BC,
-	32647 - 11904: 0xF744,
-	32648 - 11904: 0xC5F9,
-	32649 - 11904: 0xF8BA,
-	32650 - 11904: 0xA6CF,
-	32651 - 11904: 0xAACB,
-	32652 - 11904: 0xAACA,
-	32653 - 11904: 0xD04F,
-	32654 - 11904: 0xACFC,
-	32655 - 11904: 0xFDA8,
-	32657 - 11904: 0xD04E,
-	32658 - 11904: 0xD362,
-	32659 - 11904: 0x8AE7,
-	32660 - 11904: 0xAFCC,
-	32661 - 11904: 0xD6F2,
-	32662 - 11904: 0xD361,
-	32663 - 11904: 0x8EC2,
-	32666 - 11904: 0xB2DC,
-	32667 - 11904: 0xD6F5,
-	32668 - 11904: 0xD6F3,
-	32669 - 11904: 0xD6F4,
-	32670 - 11904: 0xB2DB,
-	32672 - 11904: 0xDB42,
-	32673 - 11904: 0xDB43,
-	32674 - 11904: 0xDB41,
-	32675 - 11904: 0x8EC4,
-	32676 - 11904: 0xB873,
-	32677 - 11904: 0xDF6D,
-	32678 - 11904: 0xDF6C,
-	32679 - 11904: 0xDF6E,
-	32680 - 11904: 0xB872,
-	32681 - 11904: 0xB871,
-	32684 - 11904: 0xE6F2,
-	32685 - 11904: 0xE6F4,
-	32686 - 11904: 0x9964,
-	32687 - 11904: 0xBD7E,
-	32688 - 11904: 0xE6F3,
-	32689 - 11904: 0xEAE3,
-	32690 - 11904: 0xBFAA,
-	32691 - 11904: 0xF079,
-	32692 - 11904: 0x9965,
-	32693 - 11904: 0xF078,
-	32694 - 11904: 0xC3BB,
-	32695 - 11904: 0xF2BD,
-	32696 - 11904: 0xC3BD,
-	32697 - 11904: 0xC3BC,
-	32698 - 11904: 0xF4B0,
-	32699 - 11904: 0xF5EE,
-	32700 - 11904: 0xC4F3,
-	32701 - 11904: 0xA6D0,
-	32702 - 11904: 0xD050,
-	32703 - 11904: 0xACFD,
-	32704 - 11904: 0xD365,
-	32705 - 11904: 0xAFCE,
-	32706 - 11904: 0xD364,
-	32707 - 11904: 0xD363,
-	32709 - 11904: 0xAFCD,
-	32711 - 11904: 0xD6FB,
-	32713 - 11904: 0xD6FD,
-	32714 - 11904: 0xD6F6,
-	32715 - 11904: 0xD6F7,
-	32716 - 11904: 0xB2DD,
-	32717 - 11904: 0xD6F8,
-	32718 - 11904: 0xB2DE,
-	32719 - 11904: 0xD6FC,
-	32720 - 11904: 0xD6F9,
-	32721 - 11904: 0xD6FA,
-	32722 - 11904: 0xB2DF,
-	32724 - 11904: 0xB5BE,
-	32725 - 11904: 0xB5BF,
-	32727 - 11904: 0xDB44,
-	32731 - 11904: 0xDF6F,
-	32732 - 11904: 0xDF70,
-	32733 - 11904: 0x954E,
-	32734 - 11904: 0xE37E,
-	32735 - 11904: 0xBB43,
-	32736 - 11904: 0xBB41,
-	32737 - 11904: 0xBB42,
-	32738 - 11904: 0xE37B,
-	32739 - 11904: 0xE37C,
-	32741 - 11904: 0xE37D,
-	32742 - 11904: 0xE6F9,
-	32743 - 11904: 0x98B3,
-	32744 - 11904: 0xE6FA,
-	32745 - 11904: 0xBDA1,
-	32746 - 11904: 0xE6F7,
-	32747 - 11904: 0xE6F6,
-	32748 - 11904: 0xE6F8,
-	32749 - 11904: 0xE6F5,
-	32750 - 11904: 0xBFAD,
-	32751 - 11904: 0xEAE4,
-	32752 - 11904: 0xBFAB,
-	32753 - 11904: 0xBFAC,
-	32754 - 11904: 0xEDE6,
-	32755 - 11904: 0xC16B,
-	32756 - 11904: 0xEDE5,
-	32757 - 11904: 0xEFA8,
-	32759 - 11904: 0xF07A,
-	32760 - 11904: 0xF07B,
-	32761 - 11904: 0xC2BC,
-	32762 - 11904: 0x8ECB,
-	32763 - 11904: 0xC2BD,
-	32764 - 11904: 0xC16C,
-	32765 - 11904: 0xF2BE,
-	32766 - 11904: 0xF2BF,
-	32767 - 11904: 0xF4B1,
-	32768 - 11904: 0xC4A3,
-	32769 - 11904: 0xA6D1,
-	32770 - 11904: 0x8BDF,
-	32771 - 11904: 0xA6D2,
-	32772 - 11904: 0xACFE,
-	32773 - 11904: 0xAACC,
-	32774 - 11904: 0xAFCF,
-	32775 - 11904: 0xD051,
-	32776 - 11904: 0x8ECE,
-	32779 - 11904: 0xB5C0,
-	32780 - 11904: 0xA6D3,
-	32781 - 11904: 0xAD41,
-	32782 - 11904: 0xD052,
-	32783 - 11904: 0xD053,
-	32784 - 11904: 0xAD40,
-	32785 - 11904: 0xAD42,
-	32786 - 11904: 0xA6D4,
-	32788 - 11904: 0xD054,
-	32789 - 11904: 0xAFD1,
-	32790 - 11904: 0xD366,
-	32791 - 11904: 0xAFD3,
-	32792 - 11904: 0xAFD0,
-	32793 - 11904: 0xAFD2,
-	32795 - 11904: 0xD741,
-	32796 - 11904: 0xB2E0,
-	32797 - 11904: 0x8ECF,
-	32798 - 11904: 0xD740,
-	32799 - 11904: 0xD6FE,
-	32800 - 11904: 0x9968,
-	32801 - 11904: 0xDF71,
-	32804 - 11904: 0xE3A1,
-	32805 - 11904: 0x9969,
-	32806 - 11904: 0xBDA2,
-	32808 - 11904: 0xBFAE,
-	32809 - 11904: 0xEAE6,
-	32810 - 11904: 0xEAE5,
-	32812 - 11904: 0xEDE7,
-	32814 - 11904: 0x996B,
-	32815 - 11904: 0x8ED1,
-	32816 - 11904: 0xF5EF,
-	32817 - 11904: 0x996C,
-	32819 - 11904: 0xA6D5,
-	32820 - 11904: 0xCB73,
-	32821 - 11904: 0xCDAA,
-	32822 - 11904: 0xAD43,
-	32823 - 11904: 0xD055,
-	32825 - 11904: 0xD368,
-	32827 - 11904: 0x8ED4,
-	32828 - 11904: 0x8ED5,
-	32829 - 11904: 0xAFD4,
-	32830 - 11904: 0xD367,
-	32831 - 11904: 0xAFD5,
-	32835 - 11904: 0xD743,
-	32838 - 11904: 0xB2E2,
-	32839 - 11904: 0xD742,
-	32840 - 11904: 0xD744,
-	32842 - 11904: 0xB2E1,
-	32847 - 11904: 0xDB46,
-	32848 - 11904: 0xDB47,
-	32849 - 11904: 0xDB45,
-	32850 - 11904: 0xB5C1,
-	32852 - 11904: 0x996D,
-	32854 - 11904: 0xB874,
-	32856 - 11904: 0xB875,
-	32858 - 11904: 0xBB45,
-	32859 - 11904: 0xA0BE,
-	32860 - 11904: 0xE3A3,
-	32861 - 11904: 0xE3A2,
-	32862 - 11904: 0xBB44,
-	32865 - 11904: 0x8ED6,
-	32866 - 11904: 0xA0BC,
-	32867 - 11904: 0xA0B5,
-	32868 - 11904: 0xE6FB,
-	32870 - 11904: 0xA0B4,
-	32871 - 11904: 0xE6FC,
-	32876 - 11904: 0xEAE7,
-	32879 - 11904: 0xC170,
-	32880 - 11904: 0xC16F,
-	32881 - 11904: 0xC16D,
-	32882 - 11904: 0xC16E,
-	32883 - 11904: 0xC171,
-	32885 - 11904: 0xF07C,
-	32886 - 11904: 0xC2BF,
-	32887 - 11904: 0xC2BE,
-	32888 - 11904: 0xF2C0,
-	32889 - 11904: 0xF4B2,
-	32893 - 11904: 0xC5A5,
-	32894 - 11904: 0xC5A4,
-	32895 - 11904: 0xA6D6,
-	32896 - 11904: 0x8BE0,
-	32898 - 11904: 0xD1FB,
-	32900 - 11904: 0xB877,
-	32901 - 11904: 0xB5C2,
-	32902 - 11904: 0xB876,
-	32903 - 11904: 0xBB46,
-	32905 - 11904: 0xA6D7,
-	32906 - 11904: 0xC9A9,
-	32907 - 11904: 0xA6D8,
-	32908 - 11904: 0xA6D9,
-	32911 - 11904: 0xCDAB,
-	32912 - 11904: 0xCB76,
-	32914 - 11904: 0xCB77,
-	32915 - 11904: 0xA877,
-	32917 - 11904: 0xCB74,
-	32918 - 11904: 0xA876,
-	32920 - 11904: 0xA879,
-	32921 - 11904: 0xCB75,
-	32922 - 11904: 0xA87B,
-	32923 - 11904: 0xA87A,
-	32924 - 11904: 0xCB78,
-	32925 - 11904: 0xA878,
-	32927 - 11904: 0x89B5,
-	32929 - 11904: 0xAAD1,
-	32930 - 11904: 0xAACF,
-	32931 - 11904: 0xCDAD,
-	32933 - 11904: 0xAACE,
-	32935 - 11904: 0x8EDD,
-	32937 - 11904: 0xAAD3,
-	32938 - 11904: 0xAAD5,
-	32939 - 11904: 0xAAD2,
-	32941 - 11904: 0xCDB0,
-	32942 - 11904: 0xCDAC,
-	32943 - 11904: 0xAAD6,
-	32945 - 11904: 0xAAD0,
-	32946 - 11904: 0xA87C,
-	32948 - 11904: 0xAAD4,
-	32949 - 11904: 0xCDAF,
-	32950 - 11904: 0x9E5D,
-	32951 - 11904: 0x9971,
-	32952 - 11904: 0xCDAE,
-	32954 - 11904: 0xAACD,
-	32956 - 11904: 0x89AE,
-	32957 - 11904: 0x9DE8,
-	32962 - 11904: 0xD05B,
-	32963 - 11904: 0xAD47,
-	32964 - 11904: 0xAD48,
-	32965 - 11904: 0xD05D,
-	32966 - 11904: 0x9565,
-	32967 - 11904: 0xD057,
-	32968 - 11904: 0xD05A,
-	32969 - 11904: 0xD063,
-	32970 - 11904: 0xD061,
-	32972 - 11904: 0xAD49,
-	32973 - 11904: 0xD067,
-	32974 - 11904: 0xAD4C,
-	32975 - 11904: 0xD064,
-	32976 - 11904: 0xD05C,
-	32977 - 11904: 0xD059,
-	32980 - 11904: 0xDB49,
-	32981 - 11904: 0xD062,
-	32982 - 11904: 0xAD44,
-	32983 - 11904: 0xD065,
-	32984 - 11904: 0xD056,
-	32985 - 11904: 0xD05F,
-	32986 - 11904: 0xAD46,
-	32987 - 11904: 0xAD4B,
-	32988 - 11904: 0xD060,
-	32989 - 11904: 0xAD4F,
-	32990 - 11904: 0xAD4D,
-	32992 - 11904: 0xD058,
-	32993 - 11904: 0xAD4A,
-	32995 - 11904: 0xD05E,
-	32996 - 11904: 0xAD4E,
-	32997 - 11904: 0xAD45,
-	32998 - 11904: 0xD066,
-	33001 - 11904: 0x9972,
-	33004 - 11904: 0x8B5C,
-	33005 - 11904: 0xAFDA,
-	33007 - 11904: 0xAFE3,
-	33008 - 11904: 0xAFD8,
-	33009 - 11904: 0xAFD6,
-	33010 - 11904: 0xD36A,
-	33011 - 11904: 0xAFDE,
-	33012 - 11904: 0xAFDB,
-	33013 - 11904: 0xD36C,
-	33014 - 11904: 0x89B1,
-	33016 - 11904: 0xAFDD,
-	33017 - 11904: 0xD36B,
-	33018 - 11904: 0xD369,
-	33019 - 11904: 0xD36E,
-	33020 - 11904: 0xAFE2,
-	33021 - 11904: 0xAFE0,
-	33022 - 11904: 0xDB48,
-	33024 - 11904: 0xD36F,
-	33025 - 11904: 0xD36D,
-	33026 - 11904: 0xAFD7,
-	33027 - 11904: 0xA0C0,
-	33029 - 11904: 0xAFD9,
-	33030 - 11904: 0xAFDC,
-	33031 - 11904: 0x8EDF,
-	33032 - 11904: 0xAFDF,
-	33033 - 11904: 0x9566,
-	33034 - 11904: 0xAFE1,
-	33036 - 11904: 0x9974,
-	33038 - 11904: 0x9976,
-	33042 - 11904: 0x9977,
-	33044 - 11904: 0x9979,
-	33045 - 11904: 0xD74E,
-	33046 - 11904: 0xB2E4,
-	33047 - 11904: 0x9DDA,
-	33048 - 11904: 0xD745,
-	33049 - 11904: 0xD747,
-	33050 - 11904: 0x8EE0,
-	33051 - 11904: 0xD748,
-	33053 - 11904: 0xD750,
-	33054 - 11904: 0xD74C,
-	33055 - 11904: 0xD74A,
-	33057 - 11904: 0xD74D,
-	33058 - 11904: 0xD751,
-	33059 - 11904: 0xB2E5,
-	33060 - 11904: 0xB2E9,
-	33061 - 11904: 0xD746,
-	33063 - 11904: 0xD74F,
-	33065 - 11904: 0xB2E7,
-	33066 - 11904: 0x935C,
-	33067 - 11904: 0xB2E6,
-	33068 - 11904: 0xD74B,
-	33069 - 11904: 0xD749,
-	33071 - 11904: 0xB2E3,
-	33072 - 11904: 0xB2E8,
-	33074 - 11904: 0x9DE6,
-	33076 - 11904: 0x8B5F,
-	33079 - 11904: 0x9563,
-	33081 - 11904: 0xB5C8,
-	33082 - 11904: 0xDB51,
-	33085 - 11904: 0xDB4F,
-	33086 - 11904: 0xB5CA,
-	33090 - 11904: 0x9567,
-	33091 - 11904: 0xDB4A,
-	33092 - 11904: 0xDFA1,
-	33094 - 11904: 0xB5C9,
-	33095 - 11904: 0xDB4E,
-	33096 - 11904: 0x9DE3,
-	33098 - 11904: 0xDB4B,
-	33099 - 11904: 0xB5C5,
-	33100 - 11904: 0xB5CB,
-	33101 - 11904: 0xDB50,
-	33102 - 11904: 0xB5C7,
-	33103 - 11904: 0xDB4D,
-	33104 - 11904: 0xBB47,
-	33105 - 11904: 0xB5C6,
-	33106 - 11904: 0xDB4C,
-	33107 - 11904: 0xB5CC,
-	33108 - 11904: 0xB5C4,
-	33109 - 11904: 0xB5C3,
-	33110 - 11904: 0x997C,
-	33113 - 11904: 0x997D,
-	33114 - 11904: 0x997E,
-	33115 - 11904: 0xDF77,
-	33116 - 11904: 0xDF75,
-	33118 - 11904: 0xDF7B,
-	33120 - 11904: 0xDF73,
-	33121 - 11904: 0xDFA2,
-	33122 - 11904: 0xDF78,
-	33124 - 11904: 0xDF72,
-	33125 - 11904: 0xB87B,
-	33126 - 11904: 0xB8A3,
-	33127 - 11904: 0xDF7D,
-	33129 - 11904: 0xDF76,
-	33131 - 11904: 0xB87E,
-	33132 - 11904: 0x8CFB,
-	33133 - 11904: 0x8B5B,
-	33134 - 11904: 0xB87C,
-	33135 - 11904: 0xDF7E,
-	33136 - 11904: 0xB879,
-	33137 - 11904: 0xB878,
-	33138 - 11904: 0xDF79,
-	33139 - 11904: 0xB87D,
-	33140 - 11904: 0xB5CD,
-	33142 - 11904: 0xDF7C,
-	33143 - 11904: 0xDF74,
-	33144 - 11904: 0xB87A,
-	33145 - 11904: 0xB8A1,
-	33146 - 11904: 0xB8A2,
-	33148 - 11904: 0x99A3,
-	33151 - 11904: 0xBB4C,
-	33152 - 11904: 0xBB48,
-	33154 - 11904: 0xBB4D,
-	33155 - 11904: 0xE3A6,
-	33156 - 11904: 0x99A4,
-	33158 - 11904: 0xE3A5,
-	33159 - 11904: 0xE3A7,
-	33160 - 11904: 0xBB4A,
-	33161 - 11904: 0xE3A4,
-	33162 - 11904: 0xBB4B,
-	33163 - 11904: 0xE3AA,
-	33164 - 11904: 0xE3A9,
-	33165 - 11904: 0xE3A8,
-	33167 - 11904: 0xBB49,
-	33171 - 11904: 0x99A6,
-	33173 - 11904: 0xE741,
-	33175 - 11904: 0xE744,
-	33176 - 11904: 0xBDA8,
-	33177 - 11904: 0xE743,
-	33178 - 11904: 0xBDA7,
-	33179 - 11904: 0xBDA3,
-	33180 - 11904: 0xBDA4,
-	33181 - 11904: 0xBDA5,
-	33182 - 11904: 0xE740,
-	33183 - 11904: 0xE6FE,
-	33184 - 11904: 0xBDA6,
-	33186 - 11904: 0xE742,
-	33187 - 11904: 0xE6FD,
-	33189 - 11904: 0x99A8,
-	33190 - 11904: 0xEAE9,
-	33191 - 11904: 0xEAF3,
-	33192 - 11904: 0xBFB1,
-	33193 - 11904: 0xBFB0,
-	33194 - 11904: 0x8ABE,
-	33195 - 11904: 0xEAED,
-	33196 - 11904: 0xEAEF,
-	33198 - 11904: 0xEAEA,
-	33200 - 11904: 0xEAEE,
-	33201 - 11904: 0xEAE8,
-	33202 - 11904: 0xEAF1,
-	33203 - 11904: 0xBFAF,
-	33204 - 11904: 0xEAF0,
-	33205 - 11904: 0xEAEC,
-	33206 - 11904: 0x9E61,
-	33207 - 11904: 0xEAF2,
-	33209 - 11904: 0xEAEB,
-	33210 - 11904: 0xC174,
-	33211 - 11904: 0xEDE8,
-	33212 - 11904: 0xEDEE,
-	33213 - 11904: 0xC178,
-	33214 - 11904: 0xC17A,
-	33215 - 11904: 0xC177,
-	33216 - 11904: 0xC176,
-	33217 - 11904: 0x99AA,
-	33218 - 11904: 0xC175,
-	33219 - 11904: 0xC173,
-	33220 - 11904: 0xEDE9,
-	33221 - 11904: 0xEDEC,
-	33222 - 11904: 0xC172,
-	33223 - 11904: 0xEDED,
-	33224 - 11904: 0xA0C8,
-	33225 - 11904: 0xC179,
-	33226 - 11904: 0xEDEB,
-	33228 - 11904: 0xEDEA,
-	33229 - 11904: 0xC2C0,
-	33231 - 11904: 0xC2C1,
-	33232 - 11904: 0xF0A1,
-	33233 - 11904: 0xF07D,
-	33234 - 11904: 0xF07E,
-	33237 - 11904: 0xF2C2,
-	33239 - 11904: 0xF2C1,
-	33240 - 11904: 0xC3BE,
-	33241 - 11904: 0xF4B4,
-	33242 - 11904: 0xC4A4,
-	33243 - 11904: 0xF4B3,
-	33245 - 11904: 0xF5F0,
-	33246 - 11904: 0xF745,
-	33247 - 11904: 0xC5A6,
-	33248 - 11904: 0xF943,
-	33249 - 11904: 0xF944,
-	33250 - 11904: 0xC5D8,
-	33251 - 11904: 0xA6DA,
-	33252 - 11904: 0x99AB,
-	33253 - 11904: 0xAAD7,
-	33254 - 11904: 0xDB52,
-	33255 - 11904: 0xBB4E,
-	33256 - 11904: 0xC17B,
-	33257 - 11904: 0xEDEF,
-	33258 - 11904: 0xA6DB,
-	33260 - 11904: 0xAFE5,
-	33261 - 11904: 0xAFE4,
-	33262 - 11904: 0xDB53,
-	33263 - 11904: 0xFEC4,
-	33266 - 11904: 0xEAF4,
-	33267 - 11904: 0xA6DC,
-	33268 - 11904: 0xAD50,
-	33270 - 11904: 0x98C2,
-	33271 - 11904: 0xDB54,
-	33272 - 11904: 0xDB55,
-	33273 - 11904: 0xDB56,
-	33274 - 11904: 0xBB4F,
-	33275 - 11904: 0xBFB2,
-	33276 - 11904: 0xA6DD,
-	33278 - 11904: 0xAAD8,
-	33279 - 11904: 0xD068,
-	33280 - 11904: 0xAFE6,
-	33281 - 11904: 0xD370,
-	33282 - 11904: 0xB2EA,
-	33284 - 11904: 0xDB57,
-	33285 - 11904: 0xB8A4,
-	33287 - 11904: 0xBB50,
-	33288 - 11904: 0xBFB3,
-	33289 - 11904: 0xC17C,
-	33290 - 11904: 0xC2C2,
-	33291 - 11904: 0xF4B5,
-	33292 - 11904: 0xA6DE,
-	33293 - 11904: 0xAAD9,
-	33296 - 11904: 0xAFE7,
-	33297 - 11904: 0xD752,
-	33298 - 11904: 0xB5CE,
-	33300 - 11904: 0xBB51,
-	33301 - 11904: 0xE3AB,
-	33302 - 11904: 0xE745,
-	33304 - 11904: 0x8EE8,
-	33306 - 11904: 0xA0BA,
-	33307 - 11904: 0xA6DF,
-	33308 - 11904: 0xB5CF,
-	33309 - 11904: 0xDFA3,
-	33310 - 11904: 0xBB52,
-	33311 - 11904: 0xA6E0,
-	33312 - 11904: 0xCDB1,
-	33313 - 11904: 0xD069,
-	33314 - 11904: 0xAD51,
-	33317 - 11904: 0xD372,
-	33318 - 11904: 0xFD77,
-	33320 - 11904: 0xAFEA,
-	33321 - 11904: 0x8EEE,
-	33322 - 11904: 0xAFE8,
-	33323 - 11904: 0xAFE9,
-	33324 - 11904: 0xAFEB,
-	33325 - 11904: 0x9EBF,
-	33327 - 11904: 0xD371,
-	33330 - 11904: 0xD757,
-	33331 - 11904: 0xD754,
-	33332 - 11904: 0xD756,
-	33333 - 11904: 0xB2EB,
-	33334 - 11904: 0xB2ED,
-	33335 - 11904: 0xB2EC,
-	33336 - 11904: 0xD753,
-	33337 - 11904: 0xB2EE,
-	33338 - 11904: 0xD755,
-	33340 - 11904: 0xDB58,
-	33341 - 11904: 0xDB59,
-	33342 - 11904: 0x89C2,
-	33343 - 11904: 0xDB5A,
-	33344 - 11904: 0xDFA6,
-	33346 - 11904: 0xDFA7,
-	33348 - 11904: 0xDFA5,
-	33349 - 11904: 0xDFA8,
-	33351 - 11904: 0xB8A5,
-	33353 - 11904: 0xDFA4,
-	33355 - 11904: 0xBB53,
-	33358 - 11904: 0xE74A,
-	33359 - 11904: 0xE746,
-	33360 - 11904: 0xE749,
-	33361 - 11904: 0xE74B,
-	33362 - 11904: 0xE748,
-	33363 - 11904: 0xE747,
-	33364 - 11904: 0x99AC,
-	33365 - 11904: 0xEAF5,
-	33366 - 11904: 0xEAF6,
-	33367 - 11904: 0xEAF7,
-	33368 - 11904: 0xBFB4,
-	33369 - 11904: 0xBFB5,
-	33370 - 11904: 0xEDF1,
-	33371 - 11904: 0xEDF0,
-	33372 - 11904: 0xEDF2,
-	33374 - 11904: 0xF0A3,
-	33375 - 11904: 0xF0A2,
-	33377 - 11904: 0xF2C4,
-	33378 - 11904: 0x956B,
-	33379 - 11904: 0xF2C5,
-	33380 - 11904: 0xF2C3,
-	33381 - 11904: 0x956C,
-	33382 - 11904: 0xC4A5,
-	33384 - 11904: 0xF4B6,
-	33385 - 11904: 0xF4B7,
-	33387 - 11904: 0xF746,
-	33388 - 11904: 0xF7EF,
-	33389 - 11904: 0xF8BB,
-	33390 - 11904: 0xA6E1,
-	33391 - 11904: 0xA87D,
-	33393 - 11904: 0xC17D,
-	33394 - 11904: 0xA6E2,
-	33396 - 11904: 0xD758,
-	33397 - 11904: 0xDB5B,
-	33398 - 11904: 0x99AF,
-	33399 - 11904: 0xC641,
-	33400 - 11904: 0xCA4A,
-	33401 - 11904: 0x994A,
-	33402 - 11904: 0x8976,
-	33403 - 11904: 0x8F48,
-	33404 - 11904: 0xCA4B,
-	33405 - 11904: 0xCA4D,
-	33406 - 11904: 0xA6E3,
-	33407 - 11904: 0xCA4E,
-	33408 - 11904: 0xCA4C,
-	33411 - 11904: 0xCBA2,
-	33412 - 11904: 0xCBA3,
-	33413 - 11904: 0xCB7B,
-	33415 - 11904: 0xFBEE,
-	33418 - 11904: 0xCBA1,
-	33419 - 11904: 0xA8A1,
-	33421 - 11904: 0xA8A2,
-	33422 - 11904: 0xCB7C,
-	33423 - 11904: 0xCB7A,
-	33424 - 11904: 0xCB79,
-	33425 - 11904: 0xCB7D,
-	33426 - 11904: 0xA87E,
-	33427 - 11904: 0xCB7E,
-	33428 - 11904: 0xD06A,
-	33432 - 11904: 0xCDB6,
-	33433 - 11904: 0xAADC,
-	33434 - 11904: 0xCDB5,
-	33435 - 11904: 0xCDB7,
-	33437 - 11904: 0xAADB,
-	33438 - 11904: 0xCDBC,
-	33439 - 11904: 0xAADF,
-	33440 - 11904: 0xCDB2,
-	33441 - 11904: 0xCDC0,
-	33442 - 11904: 0xCDC6,
-	33443 - 11904: 0xAAE6,
-	33444 - 11904: 0xCDC3,
-	33445 - 11904: 0xAAE3,
-	33446 - 11904: 0x99AE,
-	33447 - 11904: 0xCDB9,
-	33448 - 11904: 0xCDBF,
-	33449 - 11904: 0xCDC1,
-	33450 - 11904: 0x8EFB,
-	33451 - 11904: 0xCDB4,
-	33452 - 11904: 0xAAE2,
-	33453 - 11904: 0xAADD,
-	33454 - 11904: 0xCDBA,
-	33455 - 11904: 0xAAE4,
-	33456 - 11904: 0xAAE7,
-	33457 - 11904: 0xAAE1,
-	33459 - 11904: 0xAADA,
-	33460 - 11904: 0xCDBE,
-	33461 - 11904: 0xCDB8,
-	33462 - 11904: 0xCDC5,
-	33463 - 11904: 0xAAE9,
-	33464 - 11904: 0xAAE5,
-	33465 - 11904: 0xAAE0,
-	33466 - 11904: 0xCDBD,
-	33467 - 11904: 0xAFEC,
-	33468 - 11904: 0xCDBB,
-	33469 - 11904: 0xAADE,
-	33470 - 11904: 0xAAE8,
-	33471 - 11904: 0x8CD0,
-	33472 - 11904: 0xCDB3,
-	33474 - 11904: 0xCDC2,
-	33475 - 11904: 0xCDC4,
-	33476 - 11904: 0x8B52,
-	33482 - 11904: 0x99B0,
-	33487 - 11904: 0x8977,
-	33488 - 11904: 0x8F41,
-	33489 - 11904: 0xAD62,
-	33490 - 11904: 0xAD5C,
-	33491 - 11904: 0xAD64,
-	33492 - 11904: 0xAD61,
-	33493 - 11904: 0xD071,
-	33494 - 11904: 0xD074,
-	33495 - 11904: 0xAD5D,
-	33496 - 11904: 0x99B1,
-	33497 - 11904: 0xD06B,
-	33499 - 11904: 0xAD56,
-	33500 - 11904: 0xAD60,
-	33502 - 11904: 0xAD63,
-	33503 - 11904: 0xAD65,
-	33504 - 11904: 0xD0A2,
-	33505 - 11904: 0xD077,
-	33506 - 11904: 0x8F49,
-	33507 - 11904: 0xAD55,
-	33508 - 11904: 0xD0A1,
-	33509 - 11904: 0xAD59,
-	33510 - 11904: 0xAD57,
-	33511 - 11904: 0xAD52,
-	33512 - 11904: 0xD06F,
-	33514 - 11904: 0xD07E,
-	33515 - 11904: 0xD073,
-	33516 - 11904: 0xD076,
-	33517 - 11904: 0xD0A5,
-	33518 - 11904: 0xFA4D,
-	33519 - 11904: 0xAD66,
-	33520 - 11904: 0xD07D,
-	33521 - 11904: 0xAD5E,
-	33522 - 11904: 0xD078,
-	33523 - 11904: 0xD0A4,
-	33524 - 11904: 0xD075,
-	33525 - 11904: 0xD079,
-	33526 - 11904: 0xD07C,
-	33527 - 11904: 0x9DE4,
-	33528 - 11904: 0x8CB5,
-	33529 - 11904: 0xD06D,
-	33530 - 11904: 0xD0A3,
-	33531 - 11904: 0xD07B,
-	33532 - 11904: 0xFBE9,
-	33533 - 11904: 0x9B54,
-	33534 - 11904: 0xD06C,
-	33535 - 11904: 0x99B2,
-	33536 - 11904: 0xD070,
-	33537 - 11904: 0xAD5F,
-	33538 - 11904: 0xAD5A,
-	33539 - 11904: 0xAD53,
-	33540 - 11904: 0xAD58,
-	33541 - 11904: 0xAD54,
-	33542 - 11904: 0xAD67,
-	33543 - 11904: 0xD06E,
-	33544 - 11904: 0xD3A5,
-	33545 - 11904: 0xAD5B,
-	33547 - 11904: 0x9E68,
-	33548 - 11904: 0xD07A,
-	33549 - 11904: 0xCE41,
-	33558 - 11904: 0xD3A8,
-	33559 - 11904: 0xAFFA,
-	33560 - 11904: 0x8F4A,
-	33561 - 11904: 0xD376,
-	33562 - 11904: 0x8F42,
-	33563 - 11904: 0xD3A3,
-	33564 - 11904: 0xD37D,
-	33565 - 11904: 0x8F51,
-	33566 - 11904: 0xD3B2,
-	33568 - 11904: 0xD3AA,
-	33570 - 11904: 0xD37E,
-	33572 - 11904: 0xD3A9,
-	33573 - 11904: 0xD378,
-	33574 - 11904: 0xD37C,
-	33575 - 11904: 0xD3B5,
-	33576 - 11904: 0xAFFD,
-	33577 - 11904: 0xD3AD,
-	33578 - 11904: 0xD3A4,
-	33579 - 11904: 0xAFED,
-	33580 - 11904: 0xD3B3,
-	33581 - 11904: 0xD374,
-	33583 - 11904: 0xD3AC,
-	33585 - 11904: 0xAFFC,
-	33586 - 11904: 0xAFF7,
-	33587 - 11904: 0xD373,
-	33588 - 11904: 0xAFF5,
-	33589 - 11904: 0xAFF4,
-	33590 - 11904: 0xAFF9,
-	33591 - 11904: 0xD3AB,
-	33592 - 11904: 0xAFF1,
-	33593 - 11904: 0xAFF8,
-	33594 - 11904: 0xD072,
-	33595 - 11904: 0xDB5C,
-	33596 - 11904: 0xD3A6,
-	33597 - 11904: 0x9846,
-	33599 - 11904: 0xD37A,
-	33600 - 11904: 0xAFFB,
-	33601 - 11904: 0xD37B,
-	33602 - 11904: 0xD3A1,
-	33603 - 11904: 0xAFFE,
-	33604 - 11904: 0xD375,
-	33605 - 11904: 0xD3AF,
-	33607 - 11904: 0xD3AE,
-	33608 - 11904: 0xD3B6,
-	33609 - 11904: 0xAFF3,
-	33610 - 11904: 0xAFF0,
-	33611 - 11904: 0xD3B4,
-	33612 - 11904: 0xD3B0,
-	33613 - 11904: 0xD3A7,
-	33614 - 11904: 0xD3A2,
-	33615 - 11904: 0xAFF6,
-	33616 - 11904: 0xAFF2,
-	33617 - 11904: 0xD377,
-	33618 - 11904: 0xAFEE,
-	33619 - 11904: 0xD3B1,
-	33620 - 11904: 0xAFEF,
-	33622 - 11904: 0xD379,
-	33623 - 11904: 0x99B4,
-	33634 - 11904: 0x8EF5,
-	33635 - 11904: 0xFD55,
-	33638 - 11904: 0x9CCD,
-	33647 - 11904: 0x8978,
-	33651 - 11904: 0xD75E,
-	33652 - 11904: 0xD760,
-	33653 - 11904: 0xD765,
-	33654 - 11904: 0xD779,
-	33655 - 11904: 0xB2FC,
-	33656 - 11904: 0xB2F2,
-	33658 - 11904: 0xD75D,
-	33659 - 11904: 0xB2FD,
-	33660 - 11904: 0xB2FE,
-	33661 - 11904: 0xD768,
-	33662 - 11904: 0xD76F,
-	33663 - 11904: 0xD775,
-	33665 - 11904: 0xD762,
-	33667 - 11904: 0xD769,
-	33669 - 11904: 0x8F53,
-	33670 - 11904: 0xB340,
-	33671 - 11904: 0xD777,
-	33672 - 11904: 0xD772,
-	33673 - 11904: 0xB2FA,
-	33674 - 11904: 0xB2F8,
-	33675 - 11904: 0xD76E,
-	33676 - 11904: 0xD76A,
-	33677 - 11904: 0xD75C,
-	33678 - 11904: 0xB2EF,
-	33679 - 11904: 0xD761,
-	33680 - 11904: 0xD759,
-	33681 - 11904: 0x8F6F,
-	33682 - 11904: 0xB2F7,
-	33683 - 11904: 0xB2F9,
-	33684 - 11904: 0xD766,
-	33685 - 11904: 0xD763,
-	33686 - 11904: 0xB2F4,
-	33687 - 11904: 0xD773,
-	33688 - 11904: 0xB2F1,
-	33689 - 11904: 0xD764,
-	33690 - 11904: 0xD77A,
-	33691 - 11904: 0xD76C,
-	33692 - 11904: 0x8E63,
-	33693 - 11904: 0xD76B,
-	33694 - 11904: 0xB2F0,
-	33696 - 11904: 0xB2FB,
-	33698 - 11904: 0xB2F3,
-	33699 - 11904: 0xD75A,
-	33700 - 11904: 0xD75F,
-	33701 - 11904: 0xD770,
-	33702 - 11904: 0xD776,
-	33703 - 11904: 0xB341,
-	33704 - 11904: 0xD75B,
-	33705 - 11904: 0xD767,
-	33706 - 11904: 0xD76D,
-	33707 - 11904: 0xB2F6,
-	33708 - 11904: 0x8F56,
-	33710 - 11904: 0xD778,
-	33711 - 11904: 0xD771,
-	33712 - 11904: 0xD774,
-	33721 - 11904: 0xFE76,
-	33725 - 11904: 0xB2F5,
-	33726 - 11904: 0x9FC6,
-	33727 - 11904: 0xDB6C,
-	33728 - 11904: 0xDB60,
-	33729 - 11904: 0xB5D7,
-	33730 - 11904: 0xDB7D,
-	33731 - 11904: 0xDBA7,
-	33732 - 11904: 0xDBAA,
-	33733 - 11904: 0xB5D5,
-	33734 - 11904: 0xDB68,
-	33735 - 11904: 0xDBA3,
-	33736 - 11904: 0xDB69,
-	33737 - 11904: 0xDB77,
-	33738 - 11904: 0xB5E2,
-	33739 - 11904: 0xDB73,
-	33740 - 11904: 0xB5DF,
-	33741 - 11904: 0xFAAC,
-	33742 - 11904: 0xDB74,
-	33743 - 11904: 0xDB5D,
-	33745 - 11904: 0xDBA4,
-	33747 - 11904: 0x8F58,
-	33748 - 11904: 0xB5E8,
-	33749 - 11904: 0xDBA1,
-	33750 - 11904: 0xDB75,
-	33751 - 11904: 0xDBAC,
-	33752 - 11904: 0xDB70,
-	33753 - 11904: 0xDFC8,
-	33755 - 11904: 0xDBAF,
-	33756 - 11904: 0xB5E6,
-	33757 - 11904: 0xDB6E,
-	33758 - 11904: 0xDB7A,
-	33759 - 11904: 0xB5E9,
-	33760 - 11904: 0xB5D4,
-	33761 - 11904: 0xDB72,
-	33762 - 11904: 0xDBAD,
-	33763 - 11904: 0xDB6B,
-	33764 - 11904: 0xDB64,
-	33765 - 11904: 0xDB6F,
-	33767 - 11904: 0xDB63,
-	33768 - 11904: 0xDB61,
-	33769 - 11904: 0xB5D0,
-	33770 - 11904: 0xDBA5,
-	33771 - 11904: 0xDB6A,
-	33772 - 11904: 0xDBA8,
-	33773 - 11904: 0x9848,
-	33774 - 11904: 0xDBA9,
-	33775 - 11904: 0xB5D8,
-	33776 - 11904: 0xB5DD,
-	33777 - 11904: 0xB5D9,
-	33778 - 11904: 0xB5E1,
-	33779 - 11904: 0xDB7E,
-	33780 - 11904: 0xB5DA,
-	33781 - 11904: 0xDB76,
-	33782 - 11904: 0xDB66,
-	33784 - 11904: 0xB5D2,
-	33785 - 11904: 0xDB5E,
-	33786 - 11904: 0xDBA2,
-	33787 - 11904: 0xDBAB,
-	33788 - 11904: 0xDB65,
-	33789 - 11904: 0xB5E0,
-	33790 - 11904: 0xDBB0,
-	33791 - 11904: 0xDB71,
-	33793 - 11904: 0xDB6D,
-	33795 - 11904: 0xB5D1,
-	33796 - 11904: 0xB5E5,
-	33797 - 11904: 0x99B7,
-	33798 - 11904: 0xDB7C,
-	33799 - 11904: 0xB5E7,
-	33801 - 11904: 0xDB78,
-	33802 - 11904: 0xB5DC,
-	33803 - 11904: 0xB5D6,
-	33804 - 11904: 0xB5DE,
-	33805 - 11904: 0xB5D3,
-	33806 - 11904: 0xB5E4,
-	33807 - 11904: 0xDB79,
-	33808 - 11904: 0xDB67,
-	33809 - 11904: 0xDB7B,
-	33810 - 11904: 0xDB62,
-	33811 - 11904: 0xDBA6,
-	33812 - 11904: 0x9665,
-	33814 - 11904: 0xFA6C,
-	33816 - 11904: 0x9DE7,
-	33819 - 11904: 0xDBAE,
-	33820 - 11904: 0x9E62,
-	33824 - 11904: 0x96CC,
-	33825 - 11904: 0x8E67,
-	33827 - 11904: 0xDB5F,
-	33828 - 11904: 0xFC75,
-	33830 - 11904: 0x987E,
-	33833 - 11904: 0xDFC7,
-	33835 - 11904: 0xDFDD,
-	33836 - 11904: 0xB855,
-	33837 - 11904: 0xDFCC,
-	33838 - 11904: 0xFDB9,
-	33839 - 11904: 0xDFCA,
-	33840 - 11904: 0xDFB5,
-	33841 - 11904: 0xB8A9,
-	33842 - 11904: 0xDFC5,
-	33843 - 11904: 0xDFD9,
-	33844 - 11904: 0xDFC1,
-	33845 - 11904: 0xB8B1,
-	33846 - 11904: 0xDFD8,
-	33847 - 11904: 0xDFBF,
-	33848 - 11904: 0xB5E3,
-	33849 - 11904: 0xDFCF,
-	33850 - 11904: 0xDFC0,
-	33851 - 11904: 0xDFD6,
-	33852 - 11904: 0xB8B0,
-	33853 - 11904: 0xB8A8,
-	33854 - 11904: 0x97FC,
-	33855 - 11904: 0xDFAA,
-	33856 - 11904: 0xDFB2,
-	33858 - 11904: 0xDFCB,
-	33859 - 11904: 0xDFC3,
-	33860 - 11904: 0xDFDC,
-	33861 - 11904: 0xDFC6,
-	33862 - 11904: 0xB8B6,
-	33863 - 11904: 0xDFD7,
-	33864 - 11904: 0x98F9,
-	33865 - 11904: 0xB8AD,
-	33866 - 11904: 0x8F66,
-	33867 - 11904: 0xDFC9,
-	33868 - 11904: 0xDFD1,
-	33869 - 11904: 0xDFB6,
-	33870 - 11904: 0xDFD0,
-	33872 - 11904: 0xDFE1,
-	33873 - 11904: 0xDFB1,
-	33874 - 11904: 0xDFD2,
-	33875 - 11904: 0x956E,
-	33876 - 11904: 0xDFDF,
-	33877 - 11904: 0x9245,
-	33878 - 11904: 0xDFAB,
-	33879 - 11904: 0xB5DB,
-	33880 - 11904: 0x8F60,
-	33881 - 11904: 0xDFB9,
-	33882 - 11904: 0xDFB8,
-	33883 - 11904: 0xB8AF,
-	33884 - 11904: 0x9ED1,
-	33885 - 11904: 0xDFBC,
-	33886 - 11904: 0xDFBE,
-	33887 - 11904: 0xDFCD,
-	33888 - 11904: 0xDFDE,
-	33889 - 11904: 0xB8B2,
-	33890 - 11904: 0xFECD,
-	33891 - 11904: 0xB8B3,
-	33892 - 11904: 0x99B9,
-	33893 - 11904: 0xDFB0,
-	33894 - 11904: 0xB8AB,
-	33895 - 11904: 0xDFB4,
-	33896 - 11904: 0xDFDA,
-	33897 - 11904: 0xB8B4,
-	33899 - 11904: 0xB8AC,
-	33900 - 11904: 0xB8AE,
-	33901 - 11904: 0xB8B5,
-	33902 - 11904: 0xDFE0,
-	33903 - 11904: 0xDFD3,
-	33904 - 11904: 0xDFCE,
-	33905 - 11904: 0x8F62,
-	33906 - 11904: 0x974C,
-	33907 - 11904: 0xDFBB,
-	33908 - 11904: 0xDFBA,
-	33909 - 11904: 0xB8AA,
-	33910 - 11904: 0xDFAC,
-	33911 - 11904: 0xB8A7,
-	33912 - 11904: 0xDFC4,
-	33913 - 11904: 0xDFAD,
-	33914 - 11904: 0xDFC2,
-	33917 - 11904: 0xDFB7,
-	33918 - 11904: 0xDFDB,
-	33919 - 11904: 0x91C7,
-	33920 - 11904: 0x955F,
-	33922 - 11904: 0xB8A6,
-	33924 - 11904: 0x87AB,
-	33926 - 11904: 0xDFB3,
-	33928 - 11904: 0x99BB,
-	33933 - 11904: 0xDFAF,
-	33934 - 11904: 0xDFD5,
-	33935 - 11904: 0xDFAE,
-	33936 - 11904: 0xBB60,
-	33937 - 11904: 0xE3D3,
-	33938 - 11904: 0x8E6D,
-	33939 - 11904: 0x8F71,
-	33940 - 11904: 0xE3C2,
-	33942 - 11904: 0x94CB,
-	33943 - 11904: 0xE3AC,
-	33944 - 11904: 0xE3CA,
-	33945 - 11904: 0xBB58,
-	33946 - 11904: 0xE3BB,
-	33947 - 11904: 0xE3C5,
-	33948 - 11904: 0xBB5B,
-	33949 - 11904: 0xE3BE,
-	33950 - 11904: 0xBB59,
-	33951 - 11904: 0xE3AF,
-	33952 - 11904: 0xE3CD,
-	33953 - 11904: 0xE3AE,
-	33954 - 11904: 0xE3C1,
-	33955 - 11904: 0x95B1,
-	33956 - 11904: 0xE3AD,
-	33959 - 11904: 0xE3BF,
-	33960 - 11904: 0xE3C8,
-	33961 - 11904: 0xE3C6,
-	33962 - 11904: 0xE3BA,
-	33963 - 11904: 0xE3B5,
-	33964 - 11904: 0xE3B3,
-	33965 - 11904: 0x9AF2,
-	33966 - 11904: 0xE3B4,
-	33967 - 11904: 0xE3C7,
-	33968 - 11904: 0xE3D2,
-	33969 - 11904: 0xE3BC,
-	33970 - 11904: 0xBB5A,
-	33972 - 11904: 0xE3B7,
-	33974 - 11904: 0xE3CB,
-	33976 - 11904: 0xBB5D,
-	33977 - 11904: 0xE3B6,
-	33978 - 11904: 0xE3B0,
-	33979 - 11904: 0xE3C0,
-	33980 - 11904: 0xBB61,
-	33981 - 11904: 0x96C3,
-	33982 - 11904: 0x99BD,
-	33983 - 11904: 0xBB55,
-	33984 - 11904: 0xBB5E,
-	33985 - 11904: 0xE3B8,
-	33986 - 11904: 0xE3B2,
-	33988 - 11904: 0xBB57,
-	33989 - 11904: 0xDFD4,
-	33990 - 11904: 0xBB56,
-	33991 - 11904: 0xE3C3,
-	33993 - 11904: 0xBB54,
-	33994 - 11904: 0xBB63,
-	33995 - 11904: 0xBB5C,
-	33996 - 11904: 0xE3C4,
-	33997 - 11904: 0xE3B9,
-	33998 - 11904: 0xE3B1,
-	33999 - 11904: 0xE3CC,
-	34000 - 11904: 0xE3BD,
-	34001 - 11904: 0xBB62,
-	34002 - 11904: 0xE3D0,
-	34003 - 11904: 0xBB5F,
-	34004 - 11904: 0xE3CF,
-	34006 - 11904: 0xE3C9,
-	34007 - 11904: 0xE3CE,
-	34010 - 11904: 0xA0CF,
-	34011 - 11904: 0xE3D1,
-	34014 - 11904: 0x8F6D,
-	34017 - 11904: 0x99BE,
-	34018 - 11904: 0x8EF4,
-	34020 - 11904: 0x8F72,
-	34021 - 11904: 0x95E4,
-	34023 - 11904: 0xE773,
-	34024 - 11904: 0xE774,
-	34025 - 11904: 0xE767,
-	34026 - 11904: 0xE766,
-	34027 - 11904: 0xE762,
-	34028 - 11904: 0xBDB4,
-	34030 - 11904: 0xBDAC,
-	34031 - 11904: 0xE776,
-	34032 - 11904: 0xE775,
-	34033 - 11904: 0xDFA9,
-	34034 - 11904: 0xE75F,
-	34035 - 11904: 0xE763,
-	34036 - 11904: 0xE75D,
-	34038 - 11904: 0xE770,
-	34039 - 11904: 0xE761,
-	34040 - 11904: 0x99BF,
-	34041 - 11904: 0xE777,
-	34042 - 11904: 0xE75A,
-	34043 - 11904: 0xE758,
-	34044 - 11904: 0xE764,
-	34045 - 11904: 0xE76E,
-	34046 - 11904: 0xE769,
-	34047 - 11904: 0xBDB6,
-	34048 - 11904: 0xE74F,
-	34050 - 11904: 0xE76D,
-	34051 - 11904: 0x9244,
-	34052 - 11904: 0x87D7,
-	34053 - 11904: 0xFBA5,
-	34054 - 11904: 0xBDB7,
-	34055 - 11904: 0xDFBD,
-	34056 - 11904: 0xE75B,
-	34057 - 11904: 0xE752,
-	34058 - 11904: 0xE755,
-	34059 - 11904: 0xE77B,
-	34060 - 11904: 0xE75C,
-	34061 - 11904: 0xE753,
-	34062 - 11904: 0xE751,
-	34063 - 11904: 0xE74E,
-	34064 - 11904: 0x99C0,
-	34065 - 11904: 0xBDB0,
-	34066 - 11904: 0xE765,
-	34067 - 11904: 0xBDAF,
-	34068 - 11904: 0xBDB3,
-	34069 - 11904: 0xE760,
-	34070 - 11904: 0xE768,
-	34071 - 11904: 0xBDA9,
-	34072 - 11904: 0xE778,
-	34073 - 11904: 0xE77C,
-	34074 - 11904: 0xBDAB,
-	34076 - 11904: 0xE757,
-	34077 - 11904: 0xE76B,
-	34078 - 11904: 0xE76F,
-	34079 - 11904: 0xE754,
-	34080 - 11904: 0xE779,
-	34081 - 11904: 0xBDB2,
-	34083 - 11904: 0xBDB1,
-	34084 - 11904: 0xE74C,
-	34085 - 11904: 0xBDB5,
-	34086 - 11904: 0xE772,
-	34087 - 11904: 0xE756,
-	34088 - 11904: 0xE76A,
-	34089 - 11904: 0xE750,
-	34090 - 11904: 0xE75E,
-	34091 - 11904: 0xE759,
-	34092 - 11904: 0xBDAD,
-	34093 - 11904: 0xBDAE,
-	34094 - 11904: 0xE76C,
-	34095 - 11904: 0xE77D,
-	34096 - 11904: 0xE77A,
-	34097 - 11904: 0xE771,
-	34099 - 11904: 0xFDB4,
-	34100 - 11904: 0x8F77,
-	34104 - 11904: 0x99C1,
-	34107 - 11904: 0xE74D,
-	34109 - 11904: 0xBDAA,
-	34110 - 11904: 0xEB49,
-	34112 - 11904: 0xEB40,
-	34113 - 11904: 0xEB43,
-	34114 - 11904: 0xFAB9,
-	34115 - 11904: 0xBFBB,
-	34116 - 11904: 0xEB45,
-	34117 - 11904: 0xEAF9,
-	34118 - 11904: 0xEB41,
-	34119 - 11904: 0xEB47,
-	34120 - 11904: 0xBFB8,
-	34121 - 11904: 0xBFBC,
-	34122 - 11904: 0xBFB6,
-	34123 - 11904: 0x8F40,
-	34124 - 11904: 0xFA44,
-	34125 - 11904: 0xEAFB,
-	34126 - 11904: 0xEB4C,
-	34129 - 11904: 0xEB46,
-	34130 - 11904: 0x99C2,
-	34131 - 11904: 0xEAFC,
-	34132 - 11904: 0xEB55,
-	34133 - 11904: 0xEB4F,
-	34134 - 11904: 0xEAF8,
-	34135 - 11904: 0xEE46,
-	34136 - 11904: 0xEAFE,
-	34137 - 11904: 0xBFB7,
-	34138 - 11904: 0x8F5C,
-	34139 - 11904: 0xEB4A,
-	34141 - 11904: 0xEB54,
-	34142 - 11904: 0xBFBF,
-	34143 - 11904: 0x8CBD,
-	34144 - 11904: 0xEB51,
-	34145 - 11904: 0xEAFD,
-	34146 - 11904: 0xEB44,
-	34147 - 11904: 0xEB48,
-	34148 - 11904: 0xEB42,
-	34149 - 11904: 0xEB56,
-	34150 - 11904: 0xEB53,
-	34151 - 11904: 0xEB50,
-	34152 - 11904: 0xBFB9,
-	34153 - 11904: 0xBFBA,
-	34154 - 11904: 0xBFBE,
-	34155 - 11904: 0xEAFA,
-	34156 - 11904: 0xEB57,
-	34157 - 11904: 0xBFBD,
-	34158 - 11904: 0xEB4D,
-	34159 - 11904: 0x99C4,
-	34160 - 11904: 0x99C5,
-	34161 - 11904: 0xEB4B,
-	34163 - 11904: 0x8F7B,
-	34165 - 11904: 0xEB4E,
-	34166 - 11904: 0xEE53,
-	34167 - 11904: 0xEE40,
-	34168 - 11904: 0xEE45,
-	34169 - 11904: 0xEE52,
-	34170 - 11904: 0xEE44,
-	34171 - 11904: 0xEDFB,
-	34172 - 11904: 0xEE41,
-	34174 - 11904: 0xC1A2,
-	34176 - 11904: 0xEDF4,
-	34177 - 11904: 0xEE4D,
-	34178 - 11904: 0xEE4F,
-	34179 - 11904: 0xEDF3,
-	34180 - 11904: 0xC1A1,
-	34181 - 11904: 0xEE51,
-	34182 - 11904: 0xEE49,
-	34183 - 11904: 0xC1A8,
-	34184 - 11904: 0xEE50,
-	34185 - 11904: 0xEE42,
-	34186 - 11904: 0xC1AA,
-	34187 - 11904: 0xEDF9,
-	34188 - 11904: 0xEB52,
-	34189 - 11904: 0xEE4A,
-	34190 - 11904: 0xEE47,
-	34191 - 11904: 0xEDF5,
-	34192 - 11904: 0xEE55,
-	34193 - 11904: 0xC1A4,
-	34195 - 11904: 0x8776,
-	34196 - 11904: 0xC1A5,
-	34197 - 11904: 0xEDF7,
-	34198 - 11904: 0xEE48,
-	34199 - 11904: 0x8CB6,
-	34200 - 11904: 0xEE54,
-	34201 - 11904: 0xEE4B,
-	34202 - 11904: 0xEDFD,
-	34203 - 11904: 0xC1A7,
-	34204 - 11904: 0xC1A3,
-	34205 - 11904: 0xEE4C,
-	34206 - 11904: 0xEDFE,
-	34207 - 11904: 0xEE56,
-	34208 - 11904: 0xEDF8,
-	34209 - 11904: 0xEE43,
-	34210 - 11904: 0xEE4E,
-	34211 - 11904: 0xEDFA,
-	34212 - 11904: 0xEDFC,
-	34214 - 11904: 0xC2CB,
-	34215 - 11904: 0xEDF6,
-	34216 - 11904: 0xC1A9,
-	34217 - 11904: 0xC2C4,
-	34218 - 11904: 0xC17E,
-	34223 - 11904: 0xC1A6,
-	34224 - 11904: 0xC2C8,
-	34225 - 11904: 0xF0B3,
-	34227 - 11904: 0xF0A9,
-	34228 - 11904: 0xF0A4,
-	34229 - 11904: 0xF0AA,
-	34230 - 11904: 0xF0B4,
-	34231 - 11904: 0xF0B8,
-	34232 - 11904: 0xF0B7,
-	34233 - 11904: 0xC2CA,
-	34234 - 11904: 0xC2C9,
-	34237 - 11904: 0xF0AB,
-	34238 - 11904: 0xF0B9,
-	34239 - 11904: 0xF0AE,
-	34240 - 11904: 0xF0A6,
-	34241 - 11904: 0x8FA3,
-	34242 - 11904: 0xF0A8,
-	34243 - 11904: 0xF0A7,
-	34244 - 11904: 0xF0AD,
-	34245 - 11904: 0xF0B2,
-	34246 - 11904: 0xF0A5,
-	34247 - 11904: 0xF0AC,
-	34248 - 11904: 0xF0B1,
-	34249 - 11904: 0xC2C7,
-	34251 - 11904: 0xF0AF,
-	34253 - 11904: 0xC2C5,
-	34254 - 11904: 0xF0B0,
-	34255 - 11904: 0xC2C3,
-	34256 - 11904: 0xC2C6,
-	34257 - 11904: 0xF2D5,
-	34258 - 11904: 0xF0B5,
-	34261 - 11904: 0xC3C2,
-	34262 - 11904: 0x8CCE,
-	34263 - 11904: 0xF2CD,
-	34264 - 11904: 0xF2D1,
-	34265 - 11904: 0xF2C9,
-	34266 - 11904: 0xF2CC,
-	34268 - 11904: 0xF2D4,
-	34269 - 11904: 0xC3C0,
-	34270 - 11904: 0xF2D9,
-	34271 - 11904: 0xF2D2,
-	34272 - 11904: 0x99C6,
-	34273 - 11904: 0xF2CA,
-	34274 - 11904: 0xF2DA,
-	34275 - 11904: 0xF2D3,
-	34276 - 11904: 0xC3C3,
-	34277 - 11904: 0xC3C4,
-	34278 - 11904: 0xF2D7,
-	34280 - 11904: 0xF2CB,
-	34281 - 11904: 0xC3BF,
-	34282 - 11904: 0xC3C1,
-	34283 - 11904: 0xF2C6,
-	34284 - 11904: 0xF2CE,
-	34285 - 11904: 0xF2C8,
-	34286 - 11904: 0x96CD,
-	34287 - 11904: 0xF2D8,
-	34288 - 11904: 0xF2D6,
-	34289 - 11904: 0xF2C7,
-	34290 - 11904: 0xF2CF,
-	34294 - 11904: 0xF4BE,
-	34295 - 11904: 0xC3C5,
-	34296 - 11904: 0xF2D0,
-	34297 - 11904: 0xC4A7,
-	34298 - 11904: 0xC4A9,
-	34299 - 11904: 0xC4A6,
-	34300 - 11904: 0x96C7,
-	34301 - 11904: 0xF4C3,
-	34302 - 11904: 0xF4BB,
-	34303 - 11904: 0xF4B9,
-	34304 - 11904: 0xF4BD,
-	34305 - 11904: 0xF4BA,
-	34306 - 11904: 0x8FA5,
-	34308 - 11904: 0xF4BF,
-	34309 - 11904: 0xF4C1,
-	34310 - 11904: 0xC4AA,
-	34311 - 11904: 0xC4AC,
-	34313 - 11904: 0xF4C0,
-	34314 - 11904: 0xC4AD,
-	34315 - 11904: 0xC4AB,
-	34316 - 11904: 0xF4C2,
-	34317 - 11904: 0xFABB,
-	34319 - 11904: 0x8C61,
-	34320 - 11904: 0x9570,
-	34321 - 11904: 0xC4A8,
-	34323 - 11904: 0x87AF,
-	34324 - 11904: 0x9368,
-	34326 - 11904: 0x8F7E,
-	34327 - 11904: 0xC4F4,
-	34328 - 11904: 0xF5F1,
-	34329 - 11904: 0xF5F7,
-	34330 - 11904: 0xC4F6,
-	34331 - 11904: 0xF4BC,
-	34332 - 11904: 0xF5F6,
-	34334 - 11904: 0xF5FD,
-	34335 - 11904: 0xF5F4,
-	34336 - 11904: 0xF5FB,
-	34337 - 11904: 0xF5FA,
-	34338 - 11904: 0xF4B8,
-	34339 - 11904: 0xF5F5,
-	34340 - 11904: 0xF0B6,
-	34341 - 11904: 0xF5FE,
-	34342 - 11904: 0xF5F3,
-	34343 - 11904: 0xF5F8,
-	34344 - 11904: 0x8FAA,
-	34345 - 11904: 0xF5FC,
-	34346 - 11904: 0xF5F2,
-	34348 - 11904: 0xF74A,
-	34349 - 11904: 0xC4F5,
-	34350 - 11904: 0xF5F9,
-	34351 - 11904: 0xA050,
-	34353 - 11904: 0xF7F4,
-	34354 - 11904: 0xF74B,
-	34355 - 11904: 0xF749,
-	34356 - 11904: 0xF747,
-	34357 - 11904: 0xF748,
-	34358 - 11904: 0xF74C,
-	34360 - 11904: 0xC5D9,
-	34361 - 11904: 0xF7F2,
-	34362 - 11904: 0xF7F0,
-	34363 - 11904: 0xF7F5,
-	34364 - 11904: 0xF7F3,
-	34366 - 11904: 0xF7F6,
-	34367 - 11904: 0xC5DA,
-	34368 - 11904: 0xF7F1,
-	34370 - 11904: 0x90D3,
-	34371 - 11904: 0xF8BC,
-	34373 - 11904: 0x9556,
-	34374 - 11904: 0xF945,
-	34375 - 11904: 0xF946,
-	34376 - 11904: 0xF947,
-	34379 - 11904: 0xF9C7,
-	34380 - 11904: 0xF9BD,
-	34381 - 11904: 0xCA4F,
-	34382 - 11904: 0xAAEA,
-	34384 - 11904: 0xAD68,
-	34386 - 11904: 0xD3B8,
-	34387 - 11904: 0xD3B7,
-	34388 - 11904: 0xB040,
-	34389 - 11904: 0xB342,
-	34390 - 11904: 0xD77C,
-	34393 - 11904: 0xD77B,
-	34395 - 11904: 0xB5EA,
-	34396 - 11904: 0xB8B8,
-	34398 - 11904: 0xB8B7,
-	34399 - 11904: 0xB8B9,
-	34401 - 11904: 0xE3D4,
-	34402 - 11904: 0xE77E,
-	34403 - 11904: 0xEB58,
-	34404 - 11904: 0xEB5A,
-	34405 - 11904: 0xEB59,
-	34407 - 11904: 0xC1AB,
-	34408 - 11904: 0xEE57,
-	34409 - 11904: 0xF0BA,
-	34410 - 11904: 0xF9A5,
-	34411 - 11904: 0xA6E4,
-	34412 - 11904: 0x8FB8,
-	34413 - 11904: 0xCDC9,
-	34414 - 11904: 0xCDCA,
-	34415 - 11904: 0xCDC8,
-	34416 - 11904: 0xCDC7,
-	34417 - 11904: 0xAAEB,
-	34418 - 11904: 0x99C8,
-	34419 - 11904: 0xD0A9,
-	34420 - 11904: 0xD0A7,
-	34423 - 11904: 0xD0A6,
-	34425 - 11904: 0xAD69,
-	34426 - 11904: 0xAD6B,
-	34427 - 11904: 0xAD6A,
-	34428 - 11904: 0xD0A8,
-	34430 - 11904: 0x8FAF,
-	34437 - 11904: 0xD3C4,
-	34438 - 11904: 0xD3C1,
-	34439 - 11904: 0xD3BF,
-	34442 - 11904: 0xB041,
-	34443 - 11904: 0xD3C2,
-	34444 - 11904: 0xB046,
-	34445 - 11904: 0xD3BC,
-	34446 - 11904: 0xD3CB,
-	34448 - 11904: 0xD3CD,
-	34449 - 11904: 0xD3BD,
-	34450 - 11904: 0x99C9,
-	34451 - 11904: 0xB043,
-	34452 - 11904: 0xD3CE,
-	34453 - 11904: 0xD3C9,
-	34454 - 11904: 0xD3BB,
-	34455 - 11904: 0xD3C0,
-	34456 - 11904: 0xD3CA,
-	34457 - 11904: 0xD3C6,
-	34458 - 11904: 0xD3C3,
-	34460 - 11904: 0xB048,
-	34461 - 11904: 0xD3CC,
-	34462 - 11904: 0xD3BE,
-	34464 - 11904: 0x9579,
-	34465 - 11904: 0xD3C7,
-	34466 - 11904: 0xD3B9,
-	34467 - 11904: 0xB047,
-	34468 - 11904: 0xB044,
-	34469 - 11904: 0xD3C5,
-	34471 - 11904: 0xD3C8,
-	34472 - 11904: 0xD3BA,
-	34473 - 11904: 0xB045,
-	34474 - 11904: 0xB042,
-	34477 - 11904: 0x9F49,
-	34479 - 11904: 0xB34C,
-	34480 - 11904: 0xD7A5,
-	34481 - 11904: 0xB34B,
-	34482 - 11904: 0x99CA,
-	34483 - 11904: 0xD7A8,
-	34484 - 11904: 0xD7AB,
-	34485 - 11904: 0xB348,
-	34486 - 11904: 0xB346,
-	34487 - 11904: 0xD77E,
-	34488 - 11904: 0xD7A9,
-	34489 - 11904: 0xD7A7,
-	34490 - 11904: 0xD7A4,
-	34491 - 11904: 0xD7AC,
-	34492 - 11904: 0xD7AD,
-	34493 - 11904: 0xD7AF,
-	34494 - 11904: 0xD7B0,
-	34495 - 11904: 0xD77D,
-	34496 - 11904: 0xB345,
-	34497 - 11904: 0xD7A2,
-	34498 - 11904: 0xD7A1,
-	34499 - 11904: 0xD7AE,
-	34500 - 11904: 0xB347,
-	34501 - 11904: 0xD7A3,
-	34502 - 11904: 0xB349,
-	34503 - 11904: 0xB344,
-	34504 - 11904: 0xD7A6,
-	34505 - 11904: 0xB34D,
-	34507 - 11904: 0xB34A,
-	34508 - 11904: 0xD7AA,
-	34512 - 11904: 0xB5F1,
-	34513 - 11904: 0xDBBF,
-	34515 - 11904: 0xDBB4,
-	34516 - 11904: 0xB5EE,
-	34518 - 11904: 0xDFE7,
-	34519 - 11904: 0xDBBD,
-	34520 - 11904: 0xDBB1,
-	34521 - 11904: 0xB5EC,
-	34522 - 11904: 0xDBB6,
-	34523 - 11904: 0xB5EF,
-	34524 - 11904: 0xDBBA,
-	34525 - 11904: 0xDBB8,
-	34526 - 11904: 0xB5F2,
-	34527 - 11904: 0xB5EB,
-	34530 - 11904: 0xDBB2,
-	34531 - 11904: 0xDBB5,
-	34532 - 11904: 0xB5F0,
-	34534 - 11904: 0xDBB3,
-	34536 - 11904: 0xDBBE,
-	34537 - 11904: 0xDBBC,
-	34538 - 11904: 0xDBB7,
-	34539 - 11904: 0xDBB9,
-	34540 - 11904: 0xDBBB,
-	34541 - 11904: 0xB5ED,
-	34543 - 11904: 0x99CB,
-	34549 - 11904: 0xDFE8,
-	34550 - 11904: 0xDFEE,
-	34551 - 11904: 0xDFE4,
-	34552 - 11904: 0xDFEA,
-	34553 - 11904: 0xB8BA,
-	34554 - 11904: 0xDFE6,
-	34555 - 11904: 0xB8C0,
-	34558 - 11904: 0xB8BF,
-	34560 - 11904: 0xB8BE,
-	34561 - 11904: 0xDFED,
-	34562 - 11904: 0xB8C1,
-	34563 - 11904: 0xB8C2,
-	34564 - 11904: 0xDFE3,
-	34565 - 11904: 0xDFF0,
-	34566 - 11904: 0xB8C3,
-	34567 - 11904: 0xB8BD,
-	34568 - 11904: 0xB8BC,
-	34569 - 11904: 0xDFEC,
-	34570 - 11904: 0xB8C4,
-	34571 - 11904: 0xDFE2,
-	34572 - 11904: 0xDFE5,
-	34573 - 11904: 0xDFEF,
-	34574 - 11904: 0xDFEB,
-	34577 - 11904: 0xE3F4,
-	34578 - 11904: 0xE3E9,
-	34579 - 11904: 0xB8BB,
-	34584 - 11904: 0xBB6A,
-	34585 - 11904: 0xE3DD,
-	34586 - 11904: 0xE3F2,
-	34587 - 11904: 0xE3DE,
-	34588 - 11904: 0xBB65,
-	34590 - 11904: 0xE3DB,
-	34592 - 11904: 0xE3E4,
-	34593 - 11904: 0xE3DC,
-	34594 - 11904: 0xBB67,
-	34595 - 11904: 0xE3D6,
-	34596 - 11904: 0xE3F1,
-	34597 - 11904: 0xBB68,
-	34598 - 11904: 0xE3EE,
-	34599 - 11904: 0xE3EF,
-	34600 - 11904: 0xE3D7,
-	34601 - 11904: 0xBB6D,
-	34602 - 11904: 0xE3E6,
-	34604 - 11904: 0xE3E0,
-	34605 - 11904: 0xE3E7,
-	34606 - 11904: 0xE3DA,
-	34608 - 11904: 0xE3F3,
-	34609 - 11904: 0xE3EB,
-	34610 - 11904: 0xE3E5,
-	34611 - 11904: 0xE3D5,
-	34612 - 11904: 0xBB69,
-	34613 - 11904: 0xE3EC,
-	34615 - 11904: 0xBB6C,
-	34616 - 11904: 0xE3F0,
-	34618 - 11904: 0xE3EA,
-	34619 - 11904: 0xBB66,
-	34620 - 11904: 0xE3E8,
-	34622 - 11904: 0xE3E2,
-	34623 - 11904: 0xBB64,
-	34624 - 11904: 0xE3D9,
-	34625 - 11904: 0xE3E1,
-	34626 - 11904: 0xE3ED,
-	34627 - 11904: 0xE3DF,
-	34630 - 11904: 0xE3E3,
-	34636 - 11904: 0xBDC1,
-	34637 - 11904: 0xDFE9,
-	34638 - 11904: 0xE7B2,
-	34639 - 11904: 0xE7BB,
-	34640 - 11904: 0xE7B1,
-	34641 - 11904: 0xE7AD,
-	34642 - 11904: 0xE7AA,
-	34643 - 11904: 0xBDC2,
-	34644 - 11904: 0xE7A8,
-	34645 - 11904: 0xBB6B,
-	34646 - 11904: 0xE7A1,
-	34647 - 11904: 0xBDC0,
-	34648 - 11904: 0xE7A7,
-	34649 - 11904: 0xBDBF,
-	34650 - 11904: 0xE7AC,
-	34651 - 11904: 0xE7A9,
-	34652 - 11904: 0xE7B9,
-	34653 - 11904: 0xE7B4,
-	34654 - 11904: 0xE7AE,
-	34655 - 11904: 0xE7B3,
-	34656 - 11904: 0xBDBB,
-	34657 - 11904: 0xE7AB,
-	34658 - 11904: 0xE7BE,
-	34659 - 11904: 0xE7A2,
-	34660 - 11904: 0xE7A3,
-	34661 - 11904: 0xE7BA,
-	34662 - 11904: 0xBDBC,
-	34663 - 11904: 0xE7BF,
-	34664 - 11904: 0xBDBE,
-	34665 - 11904: 0xE7C0,
-	34666 - 11904: 0xE7B0,
-	34667 - 11904: 0xE3D8,
-	34668 - 11904: 0xE7B6,
-	34669 - 11904: 0xE7AF,
-	34670 - 11904: 0xE7B8,
-	34671 - 11904: 0xE7B5,
-	34672 - 11904: 0x9DD5,
-	34673 - 11904: 0x8FB0,
-	34675 - 11904: 0xE7A6,
-	34676 - 11904: 0xBDB9,
-	34677 - 11904: 0xE7BD,
-	34678 - 11904: 0xBDBA,
-	34679 - 11904: 0xE7A4,
-	34680 - 11904: 0xBDBD,
-	34681 - 11904: 0xEB64,
-	34682 - 11904: 0xE7B7,
-	34683 - 11904: 0xE7BC,
-	34685 - 11904: 0xFA7A,
-	34689 - 11904: 0xEB61,
-	34690 - 11904: 0xBDB8,
-	34691 - 11904: 0xBFC0,
-	34692 - 11904: 0xEB6B,
-	34693 - 11904: 0xEB67,
-	34694 - 11904: 0x9E5F,
-	34695 - 11904: 0xEB65,
-	34696 - 11904: 0xEB60,
-	34697 - 11904: 0xEB6F,
-	34699 - 11904: 0x99CD,
-	34700 - 11904: 0xA0C9,
-	34701 - 11904: 0xBFC4,
-	34703 - 11904: 0xEB5C,
-	34704 - 11904: 0xEB68,
-	34705 - 11904: 0xEB69,
-	34706 - 11904: 0xEB5F,
-	34707 - 11904: 0xEB5E,
-	34708 - 11904: 0xEB6C,
-	34710 - 11904: 0xEB62,
-	34711 - 11904: 0xEB5D,
-	34712 - 11904: 0xEB63,
-	34714 - 11904: 0xEB6E,
-	34715 - 11904: 0xEB5B,
-	34716 - 11904: 0xEB6D,
-	34717 - 11904: 0xEB6A,
-	34718 - 11904: 0xBFC2,
-	34719 - 11904: 0xBFC1,
-	34722 - 11904: 0xBFC3,
-	34723 - 11904: 0xEB66,
-	34724 - 11904: 0xF0CB,
-	34725 - 11904: 0x9ADB,
-	34729 - 11904: 0xA0C6,
-	34730 - 11904: 0xEE59,
-	34731 - 11904: 0xC1B1,
-	34732 - 11904: 0xEE5D,
-	34733 - 11904: 0xEE5A,
-	34734 - 11904: 0xEE61,
-	34735 - 11904: 0xEE67,
-	34736 - 11904: 0xEE5C,
-	34737 - 11904: 0x8FB4,
-	34738 - 11904: 0xEE70,
-	34739 - 11904: 0xC1AE,
-	34740 - 11904: 0xEE6A,
-	34741 - 11904: 0xEE5F,
-	34742 - 11904: 0xEE6B,
-	34743 - 11904: 0xEE66,
-	34744 - 11904: 0xEE6D,
-	34745 - 11904: 0xEE5E,
-	34746 - 11904: 0xC1B3,
-	34747 - 11904: 0xC1B2,
-	34748 - 11904: 0xEE60,
-	34749 - 11904: 0xEE6E,
-	34750 - 11904: 0xEE58,
-	34751 - 11904: 0xEE6C,
-	34752 - 11904: 0xC1AC,
-	34753 - 11904: 0xA0D7,
-	34754 - 11904: 0xEE64,
-	34755 - 11904: 0xEE63,
-	34756 - 11904: 0xEE68,
-	34757 - 11904: 0xEE5B,
-	34758 - 11904: 0xC1B0,
-	34760 - 11904: 0xC1B4,
-	34761 - 11904: 0xEE62,
-	34762 - 11904: 0xEE69,
-	34763 - 11904: 0xC1B5,
-	34764 - 11904: 0xEE65,
-	34766 - 11904: 0xA0C7,
-	34769 - 11904: 0xC1AD,
-	34770 - 11904: 0xC1AF,
-	34771 - 11904: 0xF0C7,
-	34772 - 11904: 0xF0C5,
-	34774 - 11904: 0xA043,
-	34775 - 11904: 0xF0CC,
-	34776 - 11904: 0xF0C9,
-	34777 - 11904: 0xF0CD,
-	34778 - 11904: 0x8FB5,
-	34779 - 11904: 0xF0BE,
-	34780 - 11904: 0xF0C6,
-	34781 - 11904: 0xF0D1,
-	34782 - 11904: 0xEE6F,
-	34783 - 11904: 0xF0C2,
-	34784 - 11904: 0xC2CF,
-	34785 - 11904: 0xE7A5,
-	34786 - 11904: 0xF0BD,
-	34787 - 11904: 0xF0CA,
-	34788 - 11904: 0xF0C4,
-	34789 - 11904: 0xF0C1,
-	34790 - 11904: 0xF0BC,
-	34791 - 11904: 0xF0BB,
-	34792 - 11904: 0xF0D0,
-	34794 - 11904: 0xF0C0,
-	34795 - 11904: 0xF0BF,
-	34796 - 11904: 0xC2CD,
-	34797 - 11904: 0xF0C8,
-	34798 - 11904: 0x8FB2,
-	34799 - 11904: 0xC2CC,
-	34802 - 11904: 0xC2CE,
-	34803 - 11904: 0xF0C3,
-	34804 - 11904: 0xF0CF,
-	34805 - 11904: 0xA061,
-	34806 - 11904: 0xF2DE,
-	34807 - 11904: 0xF2DF,
-	34809 - 11904: 0xC3C9,
-	34810 - 11904: 0xF2DC,
-	34811 - 11904: 0xC3C6,
-	34812 - 11904: 0xF2E4,
-	34814 - 11904: 0xC3CA,
-	34815 - 11904: 0xF2E6,
-	34816 - 11904: 0xF2DB,
-	34817 - 11904: 0xF0CE,
-	34818 - 11904: 0xF2E8,
-	34819 - 11904: 0xF2DD,
-	34820 - 11904: 0x9E5E,
-	34821 - 11904: 0xC3C7,
-	34822 - 11904: 0xF2E3,
-	34824 - 11904: 0xF2E5,
-	34825 - 11904: 0xF2E0,
-	34826 - 11904: 0xF2E7,
-	34827 - 11904: 0xF2E2,
-	34828 - 11904: 0xF2E1,
-	34829 - 11904: 0xC3C8,
-	34831 - 11904: 0xA063,
-	34832 - 11904: 0xF4C5,
-	34833 - 11904: 0xF4C6,
-	34835 - 11904: 0xF4C8,
-	34836 - 11904: 0xC4AE,
-	34837 - 11904: 0xC4AF,
-	34838 - 11904: 0xF4C9,
-	34839 - 11904: 0xF4C7,
-	34840 - 11904: 0x9FE8,
-	34841 - 11904: 0xF4C4,
-	34843 - 11904: 0xF642,
-	34844 - 11904: 0xF645,
-	34845 - 11904: 0xF641,
-	34847 - 11904: 0xC4FA,
-	34848 - 11904: 0xF643,
-	34849 - 11904: 0xC4F9,
-	34850 - 11904: 0xC4F8,
-	34851 - 11904: 0xC4F7,
-	34852 - 11904: 0xF644,
-	34853 - 11904: 0xF751,
-	34854 - 11904: 0xF74F,
-	34855 - 11904: 0x9CB2,
-	34856 - 11904: 0xF74E,
-	34857 - 11904: 0xF640,
-	34858 - 11904: 0xF750,
-	34859 - 11904: 0xF646,
-	34860 - 11904: 0xF74D,
-	34861 - 11904: 0x957C,
-	34862 - 11904: 0xF7F9,
-	34863 - 11904: 0xF7D7,
-	34864 - 11904: 0xF7F7,
-	34865 - 11904: 0xC5DB,
-	34866 - 11904: 0xF7F8,
-	34867 - 11904: 0xF7FA,
-	34869 - 11904: 0xF8BF,
-	34870 - 11904: 0xC5FA,
-	34871 - 11904: 0xF8BE,
-	34872 - 11904: 0xF8BD,
-	34873 - 11904: 0xC5FB,
-	34875 - 11904: 0xC65A,
-	34876 - 11904: 0xF96E,
-	34877 - 11904: 0xF9A7,
-	34878 - 11904: 0xF9A6,
-	34879 - 11904: 0xF9A8,
-	34880 - 11904: 0xA6E5,
-	34881 - 11904: 0xD0AA,
-	34882 - 11904: 0x9FC7,
-	34883 - 11904: 0xD3CF,
-	34884 - 11904: 0xD3D0,
-	34885 - 11904: 0x8FBB,
-	34886 - 11904: 0x8FBC,
-	34888 - 11904: 0xDBC0,
-	34890 - 11904: 0xF647,
-	34891 - 11904: 0xF8C0,
-	34892 - 11904: 0xA6E6,
-	34893 - 11904: 0xAD6C,
-	34894 - 11904: 0xD0AB,
-	34895 - 11904: 0x8FEC,
-	34898 - 11904: 0xD7B1,
-	34899 - 11904: 0xB34E,
-	34901 - 11904: 0xDBC2,
-	34902 - 11904: 0xDBC1,
-	34903 - 11904: 0xB5F3,
-	34905 - 11904: 0xB8C5,
-	34906 - 11904: 0xE7C1,
-	34907 - 11904: 0xBDC3,
-	34909 - 11904: 0xBDC4,
-	34910 - 11904: 0x8FC0,
-	34912 - 11904: 0x936A,
-	34913 - 11904: 0xBFC5,
-	34914 - 11904: 0xC5FC,
-	34915 - 11904: 0xA6E7,
-	34916 - 11904: 0x8BE4,
-	34917 - 11904: 0x9C7C,
-	34919 - 11904: 0xD0AC,
-	34920 - 11904: 0xAAED,
-	34921 - 11904: 0xD0AE,
-	34922 - 11904: 0xD0AD,
-	34923 - 11904: 0xAD6D,
-	34925 - 11904: 0xD3D1,
-	34926 - 11904: 0x95A1,
-	34927 - 11904: 0xD3D8,
-	34928 - 11904: 0xB049,
-	34929 - 11904: 0xD3D6,
-	34930 - 11904: 0xD3D4,
-	34932 - 11904: 0xD3DB,
-	34933 - 11904: 0xD3D2,
-	34934 - 11904: 0xD3D3,
-	34935 - 11904: 0xB04A,
-	34937 - 11904: 0xB04E,
-	34940 - 11904: 0xD3DC,
-	34941 - 11904: 0xB04D,
-	34942 - 11904: 0xD3DA,
-	34943 - 11904: 0xD3D7,
-	34944 - 11904: 0xD3D5,
-	34945 - 11904: 0xB04B,
-	34946 - 11904: 0xB04C,
-	34947 - 11904: 0xD3D9,
-	34948 - 11904: 0xFEEC,
-	34951 - 11904: 0x95A3,
-	34952 - 11904: 0xB350,
-	34953 - 11904: 0xD7B2,
-	34955 - 11904: 0xB355,
-	34956 - 11904: 0xD7C2,
-	34957 - 11904: 0xB354,
-	34958 - 11904: 0xD7C4,
-	34959 - 11904: 0x8C45,
-	34960 - 11904: 0x8CB8,
-	34961 - 11904: 0xD7B8,
-	34962 - 11904: 0xB352,
-	34963 - 11904: 0xD7C3,
-	34965 - 11904: 0xD7B3,
-	34966 - 11904: 0xB353,
-	34967 - 11904: 0xD7BF,
-	34968 - 11904: 0xD7BB,
-	34969 - 11904: 0xD7BD,
-	34970 - 11904: 0xD7B7,
-	34971 - 11904: 0xD7BE,
-	34972 - 11904: 0x8FC1,
-	34973 - 11904: 0x87B7,
-	34974 - 11904: 0xB34F,
-	34975 - 11904: 0xD7BA,
-	34976 - 11904: 0xA052,
-	34977 - 11904: 0xD7B9,
-	34978 - 11904: 0xD7B5,
-	34980 - 11904: 0xD7C0,
-	34983 - 11904: 0xD7BC,
-	34984 - 11904: 0xD7B4,
-	34986 - 11904: 0xD7B6,
-	34987 - 11904: 0xB351,
-	34988 - 11904: 0xD7C1,
-	34990 - 11904: 0x99D0,
-	34993 - 11904: 0xB5F6,
-	34994 - 11904: 0xDBCD,
-	34996 - 11904: 0x8FC3,
-	34997 - 11904: 0x8FC4,
-	34998 - 11904: 0xDBC9,
-	34999 - 11904: 0xDBCB,
-	35000 - 11904: 0xDBC6,
-	35001 - 11904: 0xDBC5,
-	35002 - 11904: 0xDBC3,
-	35004 - 11904: 0xDBCA,
-	35005 - 11904: 0xDBCC,
-	35006 - 11904: 0xDBC8,
-	35007 - 11904: 0x95A4,
-	35008 - 11904: 0xDBC7,
-	35009 - 11904: 0xB5F4,
-	35010 - 11904: 0xB5F5,
-	35013 - 11904: 0x8FC6,
-	35015 - 11904: 0x9E60,
-	35017 - 11904: 0xDBCF,
-	35018 - 11904: 0xB8CD,
-	35019 - 11904: 0xDFF2,
-	35020 - 11904: 0xDFF8,
-	35021 - 11904: 0xDFF3,
-	35022 - 11904: 0xDFF4,
-	35023 - 11904: 0xF9D8,
-	35024 - 11904: 0xDFF9,
-	35026 - 11904: 0xB8CF,
-	35028 - 11904: 0xB8C7,
-	35029 - 11904: 0xB8CE,
-	35030 - 11904: 0xDFF1,
-	35031 - 11904: 0xDBC4,
-	35032 - 11904: 0xB8CA,
-	35033 - 11904: 0xB8C8,
-	35034 - 11904: 0xDFF7,
-	35035 - 11904: 0xDFF6,
-	35036 - 11904: 0xB8C9,
-	35037 - 11904: 0xB8CB,
-	35038 - 11904: 0xDFF5,
-	35039 - 11904: 0xB8C6,
-	35041 - 11904: 0xB8CC,
-	35046 - 11904: 0x95A5,
-	35047 - 11904: 0xE3F6,
-	35048 - 11904: 0xBB74,
-	35051 - 11904: 0xE442,
-	35052 - 11904: 0xE441,
-	35054 - 11904: 0xE3FB,
-	35055 - 11904: 0xBB76,
-	35056 - 11904: 0xE440,
-	35057 - 11904: 0xE3F7,
-	35058 - 11904: 0xE3F8,
-	35059 - 11904: 0xBB6E,
-	35060 - 11904: 0xBB70,
-	35061 - 11904: 0x9CB3,
-	35062 - 11904: 0xE3FD,
-	35063 - 11904: 0xE3F5,
-	35064 - 11904: 0xBB72,
-	35065 - 11904: 0xBB71,
-	35066 - 11904: 0xE3F9,
-	35067 - 11904: 0xE3FE,
-	35068 - 11904: 0xE3FC,
-	35069 - 11904: 0xBB73,
-	35070 - 11904: 0xE3FA,
-	35071 - 11904: 0x99D1,
-	35072 - 11904: 0xFEF1,
-	35073 - 11904: 0xDBCE,
-	35074 - 11904: 0xBB6F,
-	35077 - 11904: 0xE7C2,
-	35078 - 11904: 0xE7C9,
-	35079 - 11904: 0xBDC6,
-	35081 - 11904: 0xE7CD,
-	35082 - 11904: 0xBDCA,
-	35083 - 11904: 0xE7C5,
-	35084 - 11904: 0xE7C3,
-	35086 - 11904: 0xE7CC,
-	35088 - 11904: 0xBDC5,
-	35089 - 11904: 0xE7CB,
-	35090 - 11904: 0xBDC7,
-	35091 - 11904: 0xBDC8,
-	35092 - 11904: 0xE7C4,
-	35093 - 11904: 0xBDC9,
-	35094 - 11904: 0xE7CA,
-	35095 - 11904: 0xE7C6,
-	35096 - 11904: 0xE7C7,
-	35097 - 11904: 0xE7C8,
-	35098 - 11904: 0xBB75,
-	35102 - 11904: 0xEB70,
-	35103 - 11904: 0xEB7C,
-	35105 - 11904: 0xBFCA,
-	35106 - 11904: 0xEB77,
-	35107 - 11904: 0xEB79,
-	35108 - 11904: 0x99D2,
-	35109 - 11904: 0xBFC8,
-	35110 - 11904: 0xEB71,
-	35111 - 11904: 0xEB75,
-	35113 - 11904: 0xEB78,
-	35114 - 11904: 0xBFC6,
-	35115 - 11904: 0xBFC9,
-	35116 - 11904: 0xEB7B,
-	35117 - 11904: 0xEB73,
-	35118 - 11904: 0xEB74,
-	35119 - 11904: 0xEB7A,
-	35120 - 11904: 0xEB72,
-	35121 - 11904: 0xEB76,
-	35122 - 11904: 0xBFC7,
-	35123 - 11904: 0xEE72,
-	35125 - 11904: 0xEE71,
-	35126 - 11904: 0xC1B7,
-	35127 - 11904: 0xEE77,
-	35128 - 11904: 0xC1B9,
-	35131 - 11904: 0xC1B6,
-	35132 - 11904: 0xEE73,
-	35133 - 11904: 0xC1BA,
-	35134 - 11904: 0xEE74,
-	35137 - 11904: 0xEE75,
-	35138 - 11904: 0xEE78,
-	35139 - 11904: 0x9CC2,
-	35140 - 11904: 0xC1B8,
-	35142 - 11904: 0xF0D6,
-	35143 - 11904: 0x99D3,
-	35145 - 11904: 0xF0D9,
-	35147 - 11904: 0xF0D3,
-	35148 - 11904: 0xF0D5,
-	35149 - 11904: 0x95A7,
-	35151 - 11904: 0xF0D4,
-	35152 - 11904: 0xF0D7,
-	35153 - 11904: 0xF0D8,
-	35154 - 11904: 0xEE76,
-	35155 - 11904: 0xF0D2,
-	35156 - 11904: 0x95A9,
-	35158 - 11904: 0xC3CD,
-	35159 - 11904: 0xF2EC,
-	35160 - 11904: 0xF2EF,
-	35161 - 11904: 0xF2F1,
-	35162 - 11904: 0xF2EA,
-	35163 - 11904: 0xF2EB,
-	35164 - 11904: 0xF2EE,
-	35165 - 11904: 0xF2F0,
-	35166 - 11904: 0xC3CE,
-	35167 - 11904: 0xC3CC,
-	35168 - 11904: 0xC3CB,
-	35169 - 11904: 0xF2ED,
-	35170 - 11904: 0xF2E9,
-	35171 - 11904: 0xF4CA,
-	35172 - 11904: 0xC4B0,
-	35173 - 11904: 0x95A6,
-	35174 - 11904: 0xF4CB,
-	35177 - 11904: 0xF649,
-	35178 - 11904: 0xC4FB,
-	35179 - 11904: 0xF64B,
-	35180 - 11904: 0xC4FC,
-	35181 - 11904: 0xF648,
-	35182 - 11904: 0xF64A,
-	35183 - 11904: 0xC5A8,
-	35185 - 11904: 0xF752,
-	35186 - 11904: 0xC5A7,
-	35187 - 11904: 0xF7FD,
-	35188 - 11904: 0xF7FC,
-	35190 - 11904: 0xF7FB,
-	35191 - 11904: 0x9C5D,
-	35193 - 11904: 0xF948,
-	35194 - 11904: 0xF949,
-	35195 - 11904: 0xF94B,
-	35196 - 11904: 0xF94A,
-	35198 - 11904: 0xCA50,
-	35199 - 11904: 0xA6E8,
-	35200 - 11904: 0x98E2,
-	35201 - 11904: 0xAD6E,
-	35202 - 11904: 0xD7C5,
-	35203 - 11904: 0xB5F7,
-	35205 - 11904: 0xDFFA,
-	35206 - 11904: 0xC2D0,
-	35207 - 11904: 0x8FC9,
-	35208 - 11904: 0xF2F2,
-	35209 - 11904: 0xA0C2,
-	35210 - 11904: 0x8FCA,
-	35211 - 11904: 0xA8A3,
-	35215 - 11904: 0xB357,
-	35217 - 11904: 0x99D4,
-	35219 - 11904: 0xB356,
-	35220 - 11904: 0xA0B9,
-	35221 - 11904: 0xDBD0,
-	35222 - 11904: 0xB5F8,
-	35223 - 11904: 0xDBD2,
-	35224 - 11904: 0xDBD1,
-	35227 - 11904: 0xDFFB,
-	35228 - 11904: 0xB8D0,
-	35229 - 11904: 0xE443,
-	35230 - 11904: 0xE446,
-	35231 - 11904: 0xE445,
-	35233 - 11904: 0xE444,
-	35234 - 11904: 0xE7CE,
-	35235 - 11904: 0xE7D0,
-	35236 - 11904: 0xE7CF,
-	35237 - 11904: 0x9B58,
-	35238 - 11904: 0xBFCC,
-	35239 - 11904: 0x8FCD,
-	35241 - 11904: 0xA0D4,
-	35242 - 11904: 0xBFCB,
-	35244 - 11904: 0xC1BB,
-	35245 - 11904: 0xEE79,
-	35246 - 11904: 0xEE7B,
-	35247 - 11904: 0xEE7A,
-	35250 - 11904: 0xC2D1,
-	35254 - 11904: 0xF2F4,
-	35255 - 11904: 0xF2F3,
-	35257 - 11904: 0xF4CC,
-	35258 - 11904: 0xC4B1,
-	35260 - 11904: 0x8FCE,
-	35261 - 11904: 0xC4FD,
-	35262 - 11904: 0xF754,
-	35263 - 11904: 0xF753,
-	35264 - 11904: 0xC65B,
-	35265 - 11904: 0x8BE5,
-	35270 - 11904: 0x8979,
-	35282 - 11904: 0xA8A4,
-	35283 - 11904: 0xD0AF,
-	35284 - 11904: 0xAD6F,
-	35285 - 11904: 0xD7C8,
-	35286 - 11904: 0xD7C6,
-	35289 - 11904: 0xD7C7,
-	35290 - 11904: 0xDBD4,
-	35291 - 11904: 0xDBD5,
-	35292 - 11904: 0xE043,
-	35293 - 11904: 0xDBD3,
-	35295 - 11904: 0xDFFC,
-	35296 - 11904: 0xE041,
-	35297 - 11904: 0xE040,
-	35298 - 11904: 0xE042,
-	35299 - 11904: 0xB8D1,
-	35300 - 11904: 0xDFFE,
-	35301 - 11904: 0xDFFD,
-	35302 - 11904: 0xE044,
-	35303 - 11904: 0x8FD0,
-	35304 - 11904: 0xE449,
-	35305 - 11904: 0xE447,
-	35307 - 11904: 0xE448,
-	35308 - 11904: 0xE7D3,
-	35309 - 11904: 0xE7D1,
-	35312 - 11904: 0xE7D2,
-	35313 - 11904: 0xEB7D,
-	35314 - 11904: 0xEE7C,
-	35315 - 11904: 0xEE7D,
-	35316 - 11904: 0xC2D2,
-	35318 - 11904: 0xF2F5,
-	35319 - 11904: 0xF4CD,
-	35320 - 11904: 0xC4B2,
-	35322 - 11904: 0xF64C,
-	35323 - 11904: 0xF755,
-	35324 - 11904: 0xC5A9,
-	35326 - 11904: 0xF7FE,
-	35327 - 11904: 0xF94C,
-	35328 - 11904: 0xA8A5,
-	35330 - 11904: 0xAD71,
-	35331 - 11904: 0xAD72,
-	35332 - 11904: 0xD0B0,
-	35335 - 11904: 0xD0B1,
-	35336 - 11904: 0xAD70,
-	35338 - 11904: 0xB054,
-	35340 - 11904: 0xB052,
-	35342 - 11904: 0xB051,
-	35343 - 11904: 0xB058,
-	35344 - 11904: 0xB050,
-	35345 - 11904: 0xB059,
-	35346 - 11904: 0xD3DD,
-	35347 - 11904: 0xB056,
-	35349 - 11904: 0xB053,
-	35350 - 11904: 0xB057,
-	35351 - 11904: 0xB055,
-	35352 - 11904: 0xB04F,
-	35355 - 11904: 0xB35F,
-	35356 - 11904: 0x95B6,
-	35357 - 11904: 0xB359,
-	35358 - 11904: 0xD7CC,
-	35359 - 11904: 0xB35E,
-	35362 - 11904: 0xB360,
-	35363 - 11904: 0xB35A,
-	35365 - 11904: 0xB35B,
-	35367 - 11904: 0xD7CA,
-	35369 - 11904: 0x99D6,
-	35370 - 11904: 0xB358,
-	35371 - 11904: 0x95E5,
-	35372 - 11904: 0xD7CB,
-	35373 - 11904: 0xB35D,
-	35376 - 11904: 0xD7C9,
-	35377 - 11904: 0xB35C,
-	35380 - 11904: 0xB644,
-	35382 - 11904: 0xB646,
-	35384 - 11904: 0x99D7,
-	35385 - 11904: 0xDBD8,
-	35386 - 11904: 0xB645,
-	35387 - 11904: 0xB5F9,
-	35388 - 11904: 0xB5FD,
-	35389 - 11904: 0x95B5,
-	35390 - 11904: 0xB8E4,
-	35391 - 11904: 0xE049,
-	35392 - 11904: 0xDBDA,
-	35393 - 11904: 0xB5FE,
-	35396 - 11904: 0xDBDD,
-	35397 - 11904: 0xDBDE,
-	35398 - 11904: 0xB643,
-	35400 - 11904: 0xDBE0,
-	35401 - 11904: 0xA0CA,
-	35402 - 11904: 0xDBE2,
-	35404 - 11904: 0xDBE3,
-	35405 - 11904: 0xDBD7,
-	35406 - 11904: 0xDBD6,
-	35407 - 11904: 0xDBE4,
-	35408 - 11904: 0xB642,
-	35409 - 11904: 0xDBE1,
-	35410 - 11904: 0xDBDF,
-	35412 - 11904: 0xB640,
-	35413 - 11904: 0xB5FB,
-	35414 - 11904: 0xB647,
-	35415 - 11904: 0xDBDB,
-	35416 - 11904: 0xDBDC,
-	35417 - 11904: 0xDBD9,
-	35419 - 11904: 0xB641,
-	35422 - 11904: 0xB5FC,
-	35424 - 11904: 0xB5FA,
-	35425 - 11904: 0xE048,
-	35426 - 11904: 0xB8DF,
-	35427 - 11904: 0xB8DA,
-	35430 - 11904: 0xB8D5,
-	35431 - 11904: 0x9FFD,
-	35432 - 11904: 0xB8E5,
-	35433 - 11904: 0xB8D6,
-	35435 - 11904: 0xB8D2,
-	35436 - 11904: 0xB8E1,
-	35437 - 11904: 0xB8DE,
-	35438 - 11904: 0xB8E0,
-	35440 - 11904: 0xB8D7,
-	35441 - 11904: 0xB8DC,
-	35442 - 11904: 0xB8D3,
-	35443 - 11904: 0xB8D4,
-	35444 - 11904: 0xE050,
-	35445 - 11904: 0xE04D,
-	35446 - 11904: 0xE045,
-	35447 - 11904: 0xE04A,
-	35449 - 11904: 0xB8E2,
-	35450 - 11904: 0xE051,
-	35451 - 11904: 0xB8E3,
-	35452 - 11904: 0xB8D9,
-	35454 - 11904: 0xA058,
-	35455 - 11904: 0xE047,
-	35457 - 11904: 0xE04F,
-	35458 - 11904: 0xE04B,
-	35459 - 11904: 0xE04E,
-	35460 - 11904: 0xE04C,
-	35461 - 11904: 0xB8DD,
-	35462 - 11904: 0xE046,
-	35463 - 11904: 0xB8D8,
-	35467 - 11904: 0xE44C,
-	35468 - 11904: 0xBB78,
-	35469 - 11904: 0xBB7B,
-	35471 - 11904: 0xE44E,
-	35472 - 11904: 0x8FD6,
-	35473 - 11904: 0xBBA5,
-	35474 - 11904: 0xE44D,
-	35475 - 11904: 0xBB7D,
-	35476 - 11904: 0x99D8,
-	35477 - 11904: 0xBDCF,
-	35478 - 11904: 0xE44F,
-	35480 - 11904: 0xBBA4,
-	35481 - 11904: 0xE44B,
-	35482 - 11904: 0xBBA6,
-	35484 - 11904: 0x8FD3,
-	35486 - 11904: 0xBB79,
-	35488 - 11904: 0xB8DB,
-	35489 - 11904: 0xBB7C,
-	35491 - 11904: 0xBB7A,
-	35492 - 11904: 0xBB7E,
-	35493 - 11904: 0xBBA2,
-	35494 - 11904: 0xBB77,
-	35495 - 11904: 0xBBA7,
-	35496 - 11904: 0xBBA3,
-	35497 - 11904: 0x8FE5,
-	35498 - 11904: 0xBBA1,
-	35499 - 11904: 0xE44A,
-	35503 - 11904: 0x8FE9,
-	35504 - 11904: 0xBDD6,
-	35506 - 11904: 0xBDD2,
-	35508 - 11904: 0x99D9,
-	35510 - 11904: 0xBDD9,
-	35512 - 11904: 0xE7D6,
-	35513 - 11904: 0xBDDA,
-	35514 - 11904: 0xE7E2,
-	35515 - 11904: 0xE7DB,
-	35516 - 11904: 0xBDCB,
-	35517 - 11904: 0xE7E3,
-	35518 - 11904: 0xE7DD,
-	35519 - 11904: 0xBDD5,
-	35520 - 11904: 0xE7DE,
-	35522 - 11904: 0xBDD4,
-	35523 - 11904: 0xE7E1,
-	35524 - 11904: 0xBDCE,
-	35525 - 11904: 0xE7DF,
-	35526 - 11904: 0xE7D5,
-	35527 - 11904: 0xBDCD,
-	35528 - 11904: 0xEBAA,
-	35529 - 11904: 0xBDD3,
-	35531 - 11904: 0xBDD0,
-	35532 - 11904: 0x8CF7,
-	35533 - 11904: 0xBDD8,
-	35535 - 11904: 0xE7D4,
-	35537 - 11904: 0xE7D8,
-	35538 - 11904: 0xBDCC,
-	35539 - 11904: 0xE7D7,
-	35540 - 11904: 0xE7D9,
-	35541 - 11904: 0xE7DA,
-	35542 - 11904: 0xBDD7,
-	35543 - 11904: 0xE7DC,
-	35544 - 11904: 0xE7E0,
-	35545 - 11904: 0xE7E4,
-	35546 - 11904: 0x927C,
-	35547 - 11904: 0xBDDB,
-	35548 - 11904: 0xBFD2,
-	35549 - 11904: 0xEBA5,
-	35550 - 11904: 0xEBAB,
-	35551 - 11904: 0xEBA8,
-	35552 - 11904: 0xEB7E,
-	35553 - 11904: 0xEBAC,
-	35554 - 11904: 0xEBA1,
-	35556 - 11904: 0xEBA7,
-	35558 - 11904: 0xBFCD,
-	35559 - 11904: 0xBFD3,
-	35560 - 11904: 0xEBAD,
-	35562 - 11904: 0x9C45,
-	35563 - 11904: 0xBFCF,
-	35565 - 11904: 0xBFD9,
-	35566 - 11904: 0xBFD4,
-	35567 - 11904: 0xEBAF,
-	35568 - 11904: 0xEBA9,
-	35569 - 11904: 0xBFD0,
-	35570 - 11904: 0xEBA2,
-	35571 - 11904: 0xBFDA,
-	35572 - 11904: 0xEBA3,
-	35573 - 11904: 0xEBA4,
-	35574 - 11904: 0xBFDB,
-	35575 - 11904: 0xBFD8,
-	35576 - 11904: 0xBDD1,
-	35577 - 11904: 0x8CE8,
-	35578 - 11904: 0xBFCE,
-	35579 - 11904: 0xEBB0,
-	35580 - 11904: 0xBFDC,
-	35582 - 11904: 0xBFD5,
-	35583 - 11904: 0xEBAE,
-	35584 - 11904: 0xBFD1,
-	35585 - 11904: 0xBFD6,
-	35586 - 11904: 0xBFD7,
-	35588 - 11904: 0xC1C3,
-	35589 - 11904: 0xEEA4,
-	35590 - 11904: 0xEEAD,
-	35591 - 11904: 0xEEAA,
-	35592 - 11904: 0xEEAC,
-	35594 - 11904: 0xC1C0,
-	35595 - 11904: 0xEEA5,
-	35596 - 11904: 0x8FDE,
-	35597 - 11904: 0xEEAB,
-	35598 - 11904: 0xC1BC,
-	35599 - 11904: 0xEEA7,
-	35600 - 11904: 0xC1C4,
-	35601 - 11904: 0xEEA3,
-	35602 - 11904: 0xEEA8,
-	35603 - 11904: 0xEEAF,
-	35604 - 11904: 0xEBA6,
-	35605 - 11904: 0xEEA9,
-	35606 - 11904: 0xEEA2,
-	35607 - 11904: 0xC1BD,
-	35608 - 11904: 0xEEA1,
-	35609 - 11904: 0xC1BE,
-	35610 - 11904: 0xEEB0,
-	35611 - 11904: 0xC1BF,
-	35612 - 11904: 0xEEAE,
-	35613 - 11904: 0xC1C2,
-	35614 - 11904: 0xEE7E,
-	35615 - 11904: 0x8FDF,
-	35616 - 11904: 0xC1C1,
-	35618 - 11904: 0xEEA6,
-	35619 - 11904: 0xF0DC,
-	35620 - 11904: 0xF0EA,
-	35621 - 11904: 0xF0E5,
-	35622 - 11904: 0xF0E7,
-	35623 - 11904: 0xF0DB,
-	35624 - 11904: 0xC2D3,
-	35626 - 11904: 0xF0DA,
-	35627 - 11904: 0xC2D6,
-	35628 - 11904: 0xC2D5,
-	35629 - 11904: 0xA04B,
-	35630 - 11904: 0xF0E9,
-	35631 - 11904: 0xF0E1,
-	35632 - 11904: 0xF0DE,
-	35633 - 11904: 0xF0E4,
-	35635 - 11904: 0xF0DD,
-	35637 - 11904: 0xF0DF,
-	35638 - 11904: 0xF0E8,
-	35639 - 11904: 0xF0E6,
-	35641 - 11904: 0xC2D4,
-	35642 - 11904: 0xF0ED,
-	35643 - 11904: 0xF0EB,
-	35644 - 11904: 0xF0E2,
-	35645 - 11904: 0xF0EC,
-	35646 - 11904: 0xF0E3,
-	35647 - 11904: 0x8FE2,
-	35648 - 11904: 0xF2F9,
-	35649 - 11904: 0xC3CF,
-	35650 - 11904: 0xF341,
-	35651 - 11904: 0xA0CC,
-	35653 - 11904: 0xF64F,
-	35654 - 11904: 0xC3D6,
-	35655 - 11904: 0xF0E0,
-	35656 - 11904: 0xF2F7,
-	35657 - 11904: 0xC3D2,
-	35658 - 11904: 0xF2F8,
-	35659 - 11904: 0xF2FD,
-	35660 - 11904: 0x8FE3,
-	35661 - 11904: 0x8FE4,
-	35662 - 11904: 0xC3D4,
-	35663 - 11904: 0xC3D5,
-	35664 - 11904: 0xF2F6,
-	35665 - 11904: 0xF340,
-	35666 - 11904: 0xF342,
-	35667 - 11904: 0xF2FA,
-	35668 - 11904: 0xF2FC,
-	35669 - 11904: 0xF2FE,
-	35670 - 11904: 0xF2FB,
-	35671 - 11904: 0xF343,
-	35672 - 11904: 0xC3D1,
-	35673 - 11904: 0xC3D7,
-	35674 - 11904: 0xC3D3,
-	35676 - 11904: 0xC3D0,
-	35677 - 11904: 0xF4D0,
-	35678 - 11904: 0x9BC4,
-	35679 - 11904: 0xC4B7,
-	35680 - 11904: 0xF4CE,
-	35682 - 11904: 0x9BFC,
-	35683 - 11904: 0xF4D2,
-	35685 - 11904: 0xF4D3,
-	35686 - 11904: 0xC4B5,
-	35687 - 11904: 0xF4D4,
-	35688 - 11904: 0xF4D1,
-	35689 - 11904: 0x964C,
-	35690 - 11904: 0xF4CF,
-	35691 - 11904: 0xC4B8,
-	35692 - 11904: 0xC4B4,
-	35693 - 11904: 0xF4D5,
-	35695 - 11904: 0xC4B6,
-	35696 - 11904: 0xC4B3,
-	35700 - 11904: 0xC4FE,
-	35703 - 11904: 0xC540,
-	35704 - 11904: 0xF64E,
-	35705 - 11904: 0xF64D,
-	35706 - 11904: 0xF650,
-	35707 - 11904: 0xF651,
-	35709 - 11904: 0xC541,
-	35710 - 11904: 0xF756,
-	35711 - 11904: 0xF75B,
-	35712 - 11904: 0xC5AA,
-	35713 - 11904: 0x9AF6,
-	35714 - 11904: 0xF758,
-	35715 - 11904: 0x8CAE,
-	35716 - 11904: 0xF757,
-	35717 - 11904: 0xF75A,
-	35718 - 11904: 0xF759,
-	35720 - 11904: 0xF843,
-	35722 - 11904: 0xC5DC,
-	35723 - 11904: 0xF842,
-	35724 - 11904: 0xF840,
-	35726 - 11904: 0xF841,
-	35727 - 11904: 0x87CB,
-	35728 - 11904: 0x8FE7,
-	35730 - 11904: 0xC5FE,
-	35731 - 11904: 0xC5FD,
-	35732 - 11904: 0xF8C1,
-	35733 - 11904: 0xF8C2,
-	35734 - 11904: 0xC640,
-	35736 - 11904: 0xF94D,
-	35737 - 11904: 0xF94E,
-	35738 - 11904: 0xC667,
-	35739 - 11904: 0x8FE8,
-	35740 - 11904: 0xC66D,
-	35742 - 11904: 0xF9A9,
-	35743 - 11904: 0xF9C8,
-	35744 - 11904: 0x8BE7,
-	35774 - 11904: 0x897A,
-	35810 - 11904: 0x897B,
-	35895 - 11904: 0xA8A6,
-	35897 - 11904: 0xD7CD,
-	35899 - 11904: 0xD7CE,
-	35900 - 11904: 0xE052,
-	35901 - 11904: 0xE450,
-	35902 - 11904: 0xE7E5,
-	35903 - 11904: 0xC1C6,
-	35905 - 11904: 0xC1C5,
-	35906 - 11904: 0xF0EE,
-	35907 - 11904: 0xF344,
-	35909 - 11904: 0xF844,
-	35910 - 11904: 0xA8A7,
-	35911 - 11904: 0xD3DE,
-	35912 - 11904: 0xB05A,
-	35913 - 11904: 0xB361,
-	35914 - 11904: 0xE054,
-	35915 - 11904: 0xE053,
-	35916 - 11904: 0xBDDC,
-	35917 - 11904: 0xE7E6,
-	35918 - 11904: 0xBDDD,
-	35919 - 11904: 0xEEB1,
-	35920 - 11904: 0xC2D7,
-	35921 - 11904: 0x99DA,
-	35924 - 11904: 0xC676,
-	35925 - 11904: 0xA8A8,
-	35926 - 11904: 0xCDCB,
-	35927 - 11904: 0xD3DF,
-	35930 - 11904: 0xB362,
-	35932 - 11904: 0xD7CF,
-	35933 - 11904: 0xD7D0,
-	35935 - 11904: 0xDBE5,
-	35937 - 11904: 0xB648,
-	35938 - 11904: 0xB8E6,
-	35940 - 11904: 0xE056,
-	35941 - 11904: 0xE055,
-	35942 - 11904: 0xE057,
-	35944 - 11904: 0xE451,
-	35945 - 11904: 0xE452,
-	35946 - 11904: 0xBBA8,
-	35947 - 11904: 0xBFDD,
-	35948 - 11904: 0xBDDE,
-	35949 - 11904: 0xBFDE,
-	35951 - 11904: 0xEEB5,
-	35952 - 11904: 0xEEB2,
-	35953 - 11904: 0xEEB4,
-	35954 - 11904: 0xEEB3,
-	35955 - 11904: 0xC1C7,
-	35957 - 11904: 0xF0EF,
-	35958 - 11904: 0xF346,
-	35959 - 11904: 0xF345,
-	35960 - 11904: 0xCBA4,
-	35961 - 11904: 0xB05C,
-	35962 - 11904: 0xB05B,
-	35963 - 11904: 0xD3E0,
-	35965 - 11904: 0xD7D1,
-	35968 - 11904: 0xDBE7,
-	35969 - 11904: 0xDBE6,
-	35970 - 11904: 0xB649,
-	35972 - 11904: 0xE059,
-	35973 - 11904: 0xE05A,
-	35974 - 11904: 0xE058,
-	35977 - 11904: 0xB8E8,
-	35978 - 11904: 0xB8E7,
-	35980 - 11904: 0xBBAA,
-	35981 - 11904: 0xBBA9,
-	35983 - 11904: 0xE7E7,
-	35984 - 11904: 0xEBB3,
-	35985 - 11904: 0xEBB1,
-	35986 - 11904: 0xEBB2,
-	35987 - 11904: 0xBFDF,
-	35988 - 11904: 0xEEB7,
-	35989 - 11904: 0xEEB6,
-	35991 - 11904: 0xF0F2,
-	35992 - 11904: 0xF0F1,
-	35993 - 11904: 0xF0F0,
-	35994 - 11904: 0xF347,
-	35995 - 11904: 0x8FED,
-	35996 - 11904: 0xF9AA,
-	35997 - 11904: 0xA8A9,
-	35998 - 11904: 0xAD73,
-	35999 - 11904: 0x95C0,
-	36000 - 11904: 0xAD74,
-	36001 - 11904: 0xB05D,
-	36002 - 11904: 0xB05E,
-	36003 - 11904: 0xD3E2,
-	36004 - 11904: 0xD3E1,
-	36005 - 11904: 0xD7D2,
-	36007 - 11904: 0xB368,
-	36008 - 11904: 0xB366,
-	36009 - 11904: 0xB363,
-	36010 - 11904: 0xB367,
-	36011 - 11904: 0xB365,
-	36012 - 11904: 0xB364,
-	36013 - 11904: 0xA0CB,
-	36015 - 11904: 0xB64A,
-	36016 - 11904: 0xDBEA,
-	36018 - 11904: 0xB8ED,
-	36019 - 11904: 0xB64C,
-	36020 - 11904: 0xB651,
-	36021 - 11904: 0xDBEC,
-	36022 - 11904: 0xB653,
-	36023 - 11904: 0xB652,
-	36024 - 11904: 0xB655,
-	36025 - 11904: 0xDBEB,
-	36026 - 11904: 0xDBE8,
-	36027 - 11904: 0xB64F,
-	36028 - 11904: 0xB64B,
-	36029 - 11904: 0xB64D,
-	36030 - 11904: 0xDBE9,
-	36031 - 11904: 0xB654,
-	36032 - 11904: 0xB650,
-	36033 - 11904: 0xB64E,
-	36034 - 11904: 0xB8EF,
-	36035 - 11904: 0xB8EE,
-	36036 - 11904: 0xB8EC,
-	36037 - 11904: 0xB8F0,
-	36039 - 11904: 0xB8EA,
-	36040 - 11904: 0xB8EB,
-	36042 - 11904: 0xB8E9,
-	36044 - 11904: 0xE05B,
-	36045 - 11904: 0x9E48,
-	36047 - 11904: 0xE454,
-	36049 - 11904: 0xBBAC,
-	36050 - 11904: 0xBBAD,
-	36051 - 11904: 0xBBAB,
-	36052 - 11904: 0x99DB,
-	36053 - 11904: 0xE453,
-	36054 - 11904: 0x8FF3,
-	36055 - 11904: 0xE455,
-	36057 - 11904: 0xE7EA,
-	36058 - 11904: 0xE7EC,
-	36059 - 11904: 0x8FF9,
-	36060 - 11904: 0xBDE7,
-	36061 - 11904: 0xE7ED,
-	36062 - 11904: 0xBDE0,
-	36063 - 11904: 0xE7E9,
-	36064 - 11904: 0xBDDF,
-	36065 - 11904: 0xBDE9,
-	36066 - 11904: 0xBDE5,
-	36067 - 11904: 0xBDE6,
-	36068 - 11904: 0xBDE2,
-	36069 - 11904: 0xE7E8,
-	36070 - 11904: 0xBDE1,
-	36071 - 11904: 0xE7EE,
-	36072 - 11904: 0xE7EB,
-	36073 - 11904: 0x95C1,
-	36074 - 11904: 0xBDE8,
-	36075 - 11904: 0xA04E,
-	36076 - 11904: 0xBDE3,
-	36077 - 11904: 0xBDE4,
-	36078 - 11904: 0xEBB5,
-	36080 - 11904: 0xEBB7,
-	36081 - 11904: 0xEBB6,
-	36082 - 11904: 0x99DC,
-	36083 - 11904: 0xEBB8,
-	36084 - 11904: 0xBFE0,
-	36085 - 11904: 0xEBB4,
-	36087 - 11904: 0xA064,
-	36088 - 11904: 0xC1CB,
-	36089 - 11904: 0xEEB8,
-	36090 - 11904: 0xC1C8,
-	36091 - 11904: 0xC1CC,
-	36092 - 11904: 0xC1CA,
-	36093 - 11904: 0xC1C9,
-	36094 - 11904: 0xF0F3,
-	36096 - 11904: 0xF0F6,
-	36098 - 11904: 0xF0F5,
-	36099 - 11904: 0x8FF7,
-	36100 - 11904: 0xF0F4,
-	36101 - 11904: 0xC2D8,
-	36102 - 11904: 0xF348,
-	36103 - 11904: 0xF349,
-	36104 - 11904: 0xC3D8,
-	36105 - 11904: 0xF34A,
-	36106 - 11904: 0xC3D9,
-	36107 - 11904: 0x89B0,
-	36108 - 11904: 0xA048,
-	36109 - 11904: 0xC4BA,
-	36111 - 11904: 0xC4B9,
-	36112 - 11904: 0xF652,
-	36113 - 11904: 0x8FFB,
-	36114 - 11904: 0x8FF6,
-	36115 - 11904: 0xC542,
-	36116 - 11904: 0xF653,
-	36117 - 11904: 0xF75C,
-	36118 - 11904: 0xC5AB,
-	36119 - 11904: 0xC5AC,
-	36120 - 11904: 0x9DDC,
-	36121 - 11904: 0xF845,
-	36123 - 11904: 0xC642,
-	36124 - 11904: 0x99DD,
-	36125 - 11904: 0x8BE8,
-	36196 - 11904: 0xA8AA,
-	36198 - 11904: 0xB36A,
-	36199 - 11904: 0xB369,
-	36200 - 11904: 0xE05C,
-	36201 - 11904: 0xE05D,
-	36203 - 11904: 0xBBAE,
-	36204 - 11904: 0xEBB9,
-	36205 - 11904: 0xBDEA,
-	36206 - 11904: 0xEBBA,
-	36207 - 11904: 0xEEB9,
-	36208 - 11904: 0xA8AB,
-	36210 - 11904: 0xD0B2,
-	36211 - 11904: 0xAD76,
-	36212 - 11904: 0xAD75,
-	36214 - 11904: 0xD3E3,
-	36215 - 11904: 0xB05F,
-	36216 - 11904: 0xD3E4,
-	36217 - 11904: 0xD7D5,
-	36218 - 11904: 0x92C1,
-	36219 - 11904: 0xD7D4,
-	36221 - 11904: 0xD7D3,
-	36224 - 11904: 0xDBEE,
-	36225 - 11904: 0xB658,
-	36226 - 11904: 0x9FD6,
-	36228 - 11904: 0xDBED,
-	36229 - 11904: 0xB657,
-	36233 - 11904: 0xDBEF,
-	36234 - 11904: 0xB656,
-	36236 - 11904: 0xE05F,
-	36237 - 11904: 0xE062,
-	36238 - 11904: 0xE060,
-	36239 - 11904: 0xE061,
-	36240 - 11904: 0xE065,
-	36241 - 11904: 0xE05E,
-	36242 - 11904: 0xE066,
-	36243 - 11904: 0xE063,
-	36244 - 11904: 0xE064,
-	36245 - 11904: 0xBBB0,
-	36246 - 11904: 0xE456,
-	36249 - 11904: 0xBBAF,
-	36251 - 11904: 0xE7F2,
-	36252 - 11904: 0xE7F0,
-	36255 - 11904: 0xBDEB,
-	36256 - 11904: 0xE7EF,
-	36257 - 11904: 0xE7F1,
-	36259 - 11904: 0xBDEC,
-	36261 - 11904: 0xEBBB,
-	36262 - 11904: 0xA0D2,
-	36263 - 11904: 0xEBBC,
-	36264 - 11904: 0xC1CD,
-	36265 - 11904: 0x9040,
-	36266 - 11904: 0xF34C,
-	36267 - 11904: 0xF34E,
-	36268 - 11904: 0xF34B,
-	36269 - 11904: 0xF34D,
-	36270 - 11904: 0xF4D6,
-	36271 - 11904: 0xF654,
-	36274 - 11904: 0xF96F,
-	36275 - 11904: 0xA8AC,
-	36276 - 11904: 0xAD77,
-	36277 - 11904: 0xD3E5,
-	36278 - 11904: 0xD3E7,
-	36279 - 11904: 0xD3E6,
-	36281 - 11904: 0xD7D8,
-	36282 - 11904: 0xB36C,
-	36284 - 11904: 0xD7D6,
-	36286 - 11904: 0xB36B,
-	36287 - 11904: 0xD7D9,
-	36288 - 11904: 0x8AC4,
-	36289 - 11904: 0xD7DA,
-	36290 - 11904: 0xD7D7,
-	36291 - 11904: 0x99E0,
-	36293 - 11904: 0xDBFB,
-	36294 - 11904: 0xB660,
-	36295 - 11904: 0xDBF3,
-	36296 - 11904: 0xDBF9,
-	36299 - 11904: 0xB65B,
-	36300 - 11904: 0xB65E,
-	36301 - 11904: 0xDBF2,
-	36302 - 11904: 0xB659,
-	36303 - 11904: 0xDBF6,
-	36304 - 11904: 0xE06C,
-	36305 - 11904: 0xB65D,
-	36307 - 11904: 0xDBF1,
-	36308 - 11904: 0x9FF0,
-	36309 - 11904: 0xDBF7,
-	36310 - 11904: 0xDBF4,
-	36311 - 11904: 0xDBFA,
-	36312 - 11904: 0xDBF0,
-	36313 - 11904: 0xDBF8,
-	36314 - 11904: 0xB65C,
-	36315 - 11904: 0xB65F,
-	36316 - 11904: 0xDBF5,
-	36317 - 11904: 0xB65A,
-	36319 - 11904: 0xB8F2,
-	36320 - 11904: 0xE068,
-	36321 - 11904: 0xB8F1,
-	36322 - 11904: 0xE06F,
-	36323 - 11904: 0xE06E,
-	36324 - 11904: 0xB8F8,
-	36326 - 11904: 0xB8F9,
-	36327 - 11904: 0xE070,
-	36328 - 11904: 0xB8F3,
-	36329 - 11904: 0xE06D,
-	36330 - 11904: 0xB8F7,
-	36331 - 11904: 0xE072,
-	36332 - 11904: 0xE069,
-	36334 - 11904: 0xE06B,
-	36335 - 11904: 0xB8F4,
-	36336 - 11904: 0xE067,
-	36337 - 11904: 0xE06A,
-	36338 - 11904: 0xE071,
-	36339 - 11904: 0xB8F5,
-	36340 - 11904: 0xE073,
-	36346 - 11904: 0xB8F6,
-	36348 - 11904: 0xBBB1,
-	36349 - 11904: 0xE45B,
-	36350 - 11904: 0xE461,
-	36351 - 11904: 0xE459,
-	36352 - 11904: 0xE462,
-	36353 - 11904: 0x9FF3,
-	36354 - 11904: 0xE458,
-	36355 - 11904: 0xE45D,
-	36356 - 11904: 0xE463,
-	36357 - 11904: 0xE460,
-	36358 - 11904: 0xE45F,
-	36359 - 11904: 0xE45E,
-	36361 - 11904: 0xE457,
-	36362 - 11904: 0xE45C,
-	36365 - 11904: 0xE45A,
-	36366 - 11904: 0x9DBF,
-	36367 - 11904: 0xBDF1,
-	36368 - 11904: 0xBDEE,
-	36369 - 11904: 0xE7FB,
-	36370 - 11904: 0xE841,
-	36371 - 11904: 0xE843,
-	36372 - 11904: 0xE840,
-	36373 - 11904: 0xE7F8,
-	36374 - 11904: 0xE7FA,
-	36375 - 11904: 0xE845,
-	36376 - 11904: 0xE842,
-	36377 - 11904: 0xE7FC,
-	36378 - 11904: 0xE846,
-	36379 - 11904: 0xE7F9,
-	36380 - 11904: 0xE844,
-	36381 - 11904: 0xBDEF,
-	36382 - 11904: 0xBDF5,
-	36383 - 11904: 0xBDF3,
-	36384 - 11904: 0xE7F3,
-	36385 - 11904: 0xBDF4,
-	36386 - 11904: 0xBDF0,
-	36387 - 11904: 0xE7F4,
-	36388 - 11904: 0xE7F6,
-	36389 - 11904: 0xE7F5,
-	36390 - 11904: 0xE7FD,
-	36391 - 11904: 0xE7FE,
-	36392 - 11904: 0x9FF6,
-	36393 - 11904: 0xBDF2,
-	36394 - 11904: 0x95C8,
-	36395 - 11904: 0xBDED,
-	36397 - 11904: 0x9E5A,
-	36398 - 11904: 0xE7F7,
-	36400 - 11904: 0xEBC6,
-	36401 - 11904: 0xBFE2,
-	36403 - 11904: 0xEBBD,
-	36404 - 11904: 0xBFE3,
-	36405 - 11904: 0xBFE6,
-	36406 - 11904: 0xEBC2,
-	36408 - 11904: 0xEBBF,
-	36409 - 11904: 0xBFE5,
-	36410 - 11904: 0x99E3,
-	36412 - 11904: 0xEBC3,
-	36413 - 11904: 0xEBC4,
-	36414 - 11904: 0xEBBE,
-	36415 - 11904: 0xEBC7,
-	36416 - 11904: 0xEBC0,
-	36417 - 11904: 0xEBC5,
-	36418 - 11904: 0xBFE4,
-	36420 - 11904: 0xBFE1,
-	36421 - 11904: 0xEBC1,
-	36422 - 11904: 0x8A4A,
-	36423 - 11904: 0xEEBF,
-	36424 - 11904: 0xC1D0,
-	36425 - 11904: 0xC1CE,
-	36426 - 11904: 0xC1D1,
-	36427 - 11904: 0xC1CF,
-	36428 - 11904: 0xEEBE,
-	36429 - 11904: 0xEEBB,
-	36430 - 11904: 0xEEBA,
-	36431 - 11904: 0x9FF1,
-	36432 - 11904: 0xEEBD,
-	36435 - 11904: 0xEEBC,
-	36436 - 11904: 0xF145,
-	36437 - 11904: 0xC2DE,
-	36438 - 11904: 0xF0FB,
-	36439 - 11904: 0xF0FA,
-	36441 - 11904: 0xC2D9,
-	36442 - 11904: 0xF141,
-	36443 - 11904: 0xF140,
-	36444 - 11904: 0xF0F7,
-	36445 - 11904: 0xF143,
-	36446 - 11904: 0xF0FC,
-	36447 - 11904: 0xC2DD,
-	36448 - 11904: 0xF0F9,
-	36449 - 11904: 0xF142,
-	36450 - 11904: 0xF0F8,
-	36451 - 11904: 0xC2DA,
-	36452 - 11904: 0xC2DC,
-	36453 - 11904: 0xF0FD,
-	36454 - 11904: 0xC2DB,
-	36455 - 11904: 0xF0FE,
-	36456 - 11904: 0x8AA7,
-	36457 - 11904: 0xF144,
-	36458 - 11904: 0xF352,
-	36460 - 11904: 0xC3DE,
-	36461 - 11904: 0xF34F,
-	36463 - 11904: 0xF353,
-	36465 - 11904: 0x99E6,
-	36466 - 11904: 0xC3DB,
-	36467 - 11904: 0xF351,
-	36468 - 11904: 0xC3E0,
-	36469 - 11904: 0x9FF7,
-	36470 - 11904: 0xC3DD,
-	36471 - 11904: 0x9FED,
-	36472 - 11904: 0xF350,
-	36474 - 11904: 0xC3DF,
-	36475 - 11904: 0xF354,
-	36476 - 11904: 0xC3DA,
-	36478 - 11904: 0x8A5C,
-	36480 - 11904: 0x9DAE,
-	36481 - 11904: 0xC4BC,
-	36482 - 11904: 0xC4BE,
-	36484 - 11904: 0xF4D9,
-	36485 - 11904: 0xC4BD,
-	36486 - 11904: 0xF4D7,
-	36487 - 11904: 0xC3DC,
-	36488 - 11904: 0xF4D8,
-	36489 - 11904: 0xC4BB,
-	36490 - 11904: 0xC543,
-	36491 - 11904: 0xC545,
-	36492 - 11904: 0xF656,
-	36493 - 11904: 0xC544,
-	36494 - 11904: 0xF655,
-	36496 - 11904: 0xF761,
-	36497 - 11904: 0xC5AD,
-	36498 - 11904: 0xF760,
-	36499 - 11904: 0xC5AE,
-	36500 - 11904: 0xF75E,
-	36501 - 11904: 0xF75D,
-	36502 - 11904: 0xF762,
-	36503 - 11904: 0xF763,
-	36504 - 11904: 0xF846,
-	36506 - 11904: 0xF75F,
-	36509 - 11904: 0xF8C6,
-	36510 - 11904: 0xF8C3,
-	36511 - 11904: 0xF8C4,
-	36512 - 11904: 0xF8C5,
-	36513 - 11904: 0xC65C,
-	36515 - 11904: 0xF951,
-	36516 - 11904: 0xF950,
-	36517 - 11904: 0xF94F,
-	36518 - 11904: 0xF970,
-	36519 - 11904: 0x95C9,
-	36520 - 11904: 0xF9BE,
-	36521 - 11904: 0xF9AB,
-	36522 - 11904: 0xC66E,
-	36523 - 11904: 0xA8AD,
-	36524 - 11904: 0xB060,
-	36525 - 11904: 0x9048,
-	36528 - 11904: 0x99E8,
-	36530 - 11904: 0xB8FA,
-	36534 - 11904: 0x9049,
-	36537 - 11904: 0x8CBA,
-	36538 - 11904: 0xBDF6,
-	36540 - 11904: 0x90B1,
-	36541 - 11904: 0xEBC8,
-	36544 - 11904: 0xC2DF,
-	36546 - 11904: 0xF355,
-	36547 - 11904: 0x904A,
-	36553 - 11904: 0xF9AC,
-	36554 - 11904: 0xA8AE,
-	36555 - 11904: 0xAAEE,
-	36556 - 11904: 0xAD79,
-	36557 - 11904: 0xAD78,
-	36558 - 11904: 0x99EA,
-	36559 - 11904: 0xB063,
-	36561 - 11904: 0xD3E8,
-	36562 - 11904: 0xB061,
-	36563 - 11904: 0xD3E9,
-	36564 - 11904: 0xB062,
-	36567 - 11904: 0xD7DF,
-	36568 - 11904: 0xD7DB,
-	36570 - 11904: 0x9BD1,
-	36571 - 11904: 0xB36D,
-	36572 - 11904: 0xD7DE,
-	36573 - 11904: 0xD7DD,
-	36574 - 11904: 0xD7DC,
-	36575 - 11904: 0xB36E,
-	36576 - 11904: 0xD7E0,
-	36577 - 11904: 0xD7E1,
-	36578 - 11904: 0x99EB,
-	36580 - 11904: 0x99EC,
-	36581 - 11904: 0xDC43,
-	36582 - 11904: 0xDC41,
-	36583 - 11904: 0xDC45,
-	36584 - 11904: 0xDC46,
-	36585 - 11904: 0xDC4C,
-	36587 - 11904: 0xDC48,
-	36588 - 11904: 0xDC4A,
-	36589 - 11904: 0x99ED,
-	36590 - 11904: 0xDC42,
-	36591 - 11904: 0xDBFC,
-	36593 - 11904: 0xDC49,
-	36594 - 11904: 0x99EE,
-	36596 - 11904: 0xDC4B,
-	36597 - 11904: 0xDC44,
-	36598 - 11904: 0xDC47,
-	36599 - 11904: 0xDBFD,
-	36600 - 11904: 0xB662,
-	36601 - 11904: 0xDC40,
-	36602 - 11904: 0xDBFE,
-	36603 - 11904: 0xB661,
-	36604 - 11904: 0xB663,
-	36606 - 11904: 0xB8FD,
-	36607 - 11904: 0xE075,
-	36608 - 11904: 0xE077,
-	36609 - 11904: 0xE076,
-	36610 - 11904: 0xE07B,
-	36611 - 11904: 0xB8FB,
-	36613 - 11904: 0xE078,
-	36614 - 11904: 0xE074,
-	36615 - 11904: 0xE079,
-	36616 - 11904: 0xE07A,
-	36617 - 11904: 0xB8FC,
-	36618 - 11904: 0xB8FE,
-	36619 - 11904: 0xE07C,
-	36621 - 11904: 0xE467,
-	36622 - 11904: 0xE466,
-	36624 - 11904: 0xE464,
-	36625 - 11904: 0xE465,
-	36626 - 11904: 0xBBB3,
-	36627 - 11904: 0xBBB5,
-	36628 - 11904: 0xBBB2,
-	36629 - 11904: 0xBBB4,
-	36630 - 11904: 0xE84D,
-	36631 - 11904: 0xE84E,
-	36632 - 11904: 0xE849,
-	36633 - 11904: 0x904C,
-	36634 - 11904: 0xE84A,
-	36635 - 11904: 0xBDF8,
-	36636 - 11904: 0xBDFD,
-	36637 - 11904: 0xBDF7,
-	36638 - 11904: 0xBDFE,
-	36639 - 11904: 0xBDF9,
-	36640 - 11904: 0xE84B,
-	36643 - 11904: 0xE84C,
-	36644 - 11904: 0xE848,
-	36645 - 11904: 0xBE40,
-	36646 - 11904: 0xBDFB,
-	36649 - 11904: 0xBDFA,
-	36650 - 11904: 0xBDFC,
-	36652 - 11904: 0xE847,
-	36653 - 11904: 0x904D,
-	36654 - 11904: 0xEBCA,
-	36655 - 11904: 0xBFE8,
-	36656 - 11904: 0x95CB,
-	36658 - 11904: 0xEBCC,
-	36659 - 11904: 0xBFEA,
-	36660 - 11904: 0xEBCF,
-	36661 - 11904: 0xEBCB,
-	36662 - 11904: 0xEBC9,
-	36663 - 11904: 0xEBCE,
-	36664 - 11904: 0xBFE9,
-	36665 - 11904: 0xEBCD,
-	36667 - 11904: 0xBFE7,
-	36670 - 11904: 0xC1D3,
-	36671 - 11904: 0xC1D6,
-	36672 - 11904: 0xEEC1,
-	36673 - 11904: 0x97E2,
-	36674 - 11904: 0xC1D4,
-	36675 - 11904: 0xEEC0,
-	36676 - 11904: 0xC1D2,
-	36677 - 11904: 0xC1D5,
-	36678 - 11904: 0xF146,
-	36679 - 11904: 0xF147,
-	36680 - 11904: 0xF148,
-	36681 - 11904: 0xC2E0,
-	36682 - 11904: 0x95CC,
-	36683 - 11904: 0xF149,
-	36685 - 11904: 0xC2E1,
-	36686 - 11904: 0xC3E2,
-	36687 - 11904: 0xF358,
-	36688 - 11904: 0xF359,
-	36689 - 11904: 0xF357,
-	36690 - 11904: 0xF356,
-	36691 - 11904: 0xF35A,
-	36692 - 11904: 0xC3E1,
-	36693 - 11904: 0xF4DD,
-	36694 - 11904: 0xF4DB,
-	36695 - 11904: 0xF4DC,
-	36696 - 11904: 0xF4DE,
-	36697 - 11904: 0xF4DA,
-	36698 - 11904: 0xF4DF,
-	36699 - 11904: 0xF658,
-	36700 - 11904: 0x9F78,
-	36701 - 11904: 0xF659,
-	36702 - 11904: 0xF657,
-	36703 - 11904: 0xC546,
-	36704 - 11904: 0xF764,
-	36705 - 11904: 0xC5AF,
-	36706 - 11904: 0xF765,
-	36707 - 11904: 0xF848,
-	36708 - 11904: 0xF847,
-	36710 - 11904: 0x897C,
-	36711 - 11904: 0x897D,
-	36718 - 11904: 0x897E,
-	36755 - 11904: 0x995D,
-	36763 - 11904: 0xA8AF,
-	36764 - 11904: 0xB664,
-	36767 - 11904: 0xB940,
-	36768 - 11904: 0x9B5A,
-	36771 - 11904: 0xBBB6,
-	36773 - 11904: 0x9050,
-	36774 - 11904: 0xBFEC,
-	36775 - 11904: 0x8C4F,
-	36776 - 11904: 0xBFEB,
-	36781 - 11904: 0xC3E3,
-	36782 - 11904: 0xC47C,
-	36783 - 11904: 0xC547,
-	36784 - 11904: 0xA8B0,
-	36785 - 11904: 0xB064,
-	36786 - 11904: 0xB941,
-	36787 - 11904: 0x9054,
-	36788 - 11904: 0xF35B,
-	36789 - 11904: 0xC6D6,
-	36790 - 11904: 0x9AA8,
-	36791 - 11904: 0x99EF,
-	36792 - 11904: 0xFEEB,
-	36793 - 11904: 0x9DA3,
-	36794 - 11904: 0x9DA1,
-	36795 - 11904: 0x9943,
-	36796 - 11904: 0x9945,
-	36798 - 11904: 0x9D7D,
-	36799 - 11904: 0xCBA6,
-	36801 - 11904: 0x99F0,
-	36802 - 11904: 0xA8B1,
-	36804 - 11904: 0xA8B4,
-	36805 - 11904: 0xA8B3,
-	36806 - 11904: 0xA8B2,
-	36809 - 11904: 0xCBA5,
-	36810 - 11904: 0x99F1,
-	36811 - 11904: 0xCDCD,
-	36812 - 11904: 0x99F2,
-	36813 - 11904: 0xCDCF,
-	36814 - 11904: 0xAAEF,
-	36815 - 11904: 0x8CBC,
-	36816 - 11904: 0x9D60,
-	36817 - 11904: 0xAAF1,
-	36818 - 11904: 0xCDCC,
-	36819 - 11904: 0xCDCE,
-	36820 - 11904: 0xAAF0,
-	36821 - 11904: 0xCDD1,
-	36822 - 11904: 0xCDD0,
-	36823 - 11904: 0xCDD2,
-	36826 - 11904: 0xA0A3,
-	36832 - 11904: 0xD0B6,
-	36833 - 11904: 0xD0B4,
-	36834 - 11904: 0xAD7C,
-	36835 - 11904: 0xD0B3,
-	36836 - 11904: 0xADA3,
-	36837 - 11904: 0xAD7E,
-	36838 - 11904: 0xAD7B,
-	36840 - 11904: 0xADA4,
-	36842 - 11904: 0xAD7D,
-	36843 - 11904: 0xADA2,
-	36845 - 11904: 0xADA1,
-	36846 - 11904: 0xD0B5,
-	36848 - 11904: 0xAD7A,
-	36852 - 11904: 0xB06A,
-	36853 - 11904: 0xD3EB,
-	36854 - 11904: 0xD3F1,
-	36855 - 11904: 0xB067,
-	36856 - 11904: 0xB06E,
-	36857 - 11904: 0x905B,
-	36858 - 11904: 0xB069,
-	36859 - 11904: 0xD3EE,
-	36860 - 11904: 0xD3F0,
-	36861 - 11904: 0xB06C,
-	36862 - 11904: 0xD3EA,
-	36863 - 11904: 0xD3ED,
-	36864 - 11904: 0xB068,
-	36865 - 11904: 0xB065,
-	36866 - 11904: 0xD3EC,
-	36867 - 11904: 0xB06B,
-	36868 - 11904: 0xD3EF,
-	36869 - 11904: 0xB06D,
-	36870 - 11904: 0xB066,
-	36872 - 11904: 0x9EDB,
-	36875 - 11904: 0xD7E3,
-	36876 - 11904: 0xD7E6,
-	36877 - 11904: 0xB370,
-	36879 - 11904: 0xB37A,
-	36880 - 11904: 0xB376,
-	36881 - 11904: 0xD7E4,
-	36882 - 11904: 0x9D79,
-	36884 - 11904: 0xB37E,
-	36885 - 11904: 0xB377,
-	36886 - 11904: 0xB37C,
-	36887 - 11904: 0xB372,
-	36889 - 11904: 0xB36F,
-	36890 - 11904: 0xB371,
-	36891 - 11904: 0xB37D,
-	36892 - 11904: 0xD7E5,
-	36893 - 11904: 0xB375,
-	36894 - 11904: 0xB378,
-	36895 - 11904: 0xB374,
-	36896 - 11904: 0xB379,
-	36897 - 11904: 0xD7E7,
-	36898 - 11904: 0xB37B,
-	36899 - 11904: 0xB373,
-	36900 - 11904: 0xD7E2,
-	36909 - 11904: 0xDC4D,
-	36910 - 11904: 0xB665,
-	36911 - 11904: 0xDC4F,
-	36913 - 11904: 0xB667,
-	36914 - 11904: 0xB669,
-	36915 - 11904: 0x99F3,
-	36916 - 11904: 0xDC4E,
-	36917 - 11904: 0xB666,
-	36918 - 11904: 0xB66A,
-	36919 - 11904: 0x9062,
-	36920 - 11904: 0xB668,
-	36924 - 11904: 0xB947,
-	36925 - 11904: 0xE0A3,
-	36926 - 11904: 0xB94F,
-	36927 - 11904: 0xE07E,
-	36929 - 11904: 0xB950,
-	36930 - 11904: 0xB945,
-	36932 - 11904: 0xE0A1,
-	36934 - 11904: 0x87BD,
-	36935 - 11904: 0xB94A,
-	36937 - 11904: 0xE0A2,
-	36938 - 11904: 0xB943,
-	36939 - 11904: 0xB942,
-	36940 - 11904: 0x9F55,
-	36941 - 11904: 0xB94D,
-	36942 - 11904: 0xB94C,
-	36943 - 11904: 0xB94B,
-	36944 - 11904: 0xB949,
-	36945 - 11904: 0xB94E,
-	36946 - 11904: 0xE07D,
-	36947 - 11904: 0xB944,
-	36948 - 11904: 0xB946,
-	36949 - 11904: 0xB948,
-	36950 - 11904: 0x9BF9,
-	36952 - 11904: 0xBBB8,
-	36953 - 11904: 0xBBBB,
-	36955 - 11904: 0xBBBF,
-	36956 - 11904: 0xBBB9,
-	36957 - 11904: 0xBBBE,
-	36958 - 11904: 0xBBBC,
-	36960 - 11904: 0xBBB7,
-	36961 - 11904: 0x9065,
-	36962 - 11904: 0xBBBD,
-	36963 - 11904: 0xBBBA,
-	36964 - 11904: 0x96E0,
-	36967 - 11904: 0xE852,
-	36968 - 11904: 0xBE43,
-	36969 - 11904: 0xBE41,
-	36971 - 11904: 0xE853,
-	36972 - 11904: 0x98BE,
-	36973 - 11904: 0xBE44,
-	36974 - 11904: 0xBE42,
-	36975 - 11904: 0xE851,
-	36976 - 11904: 0xE850,
-	36978 - 11904: 0xBFF0,
-	36979 - 11904: 0xE84F,
-	36980 - 11904: 0xBFEE,
-	36981 - 11904: 0xBFED,
-	36982 - 11904: 0xEBD0,
-	36983 - 11904: 0xBE45,
-	36984 - 11904: 0xBFEF,
-	36985 - 11904: 0xEBD1,
-	36986 - 11904: 0xBFF2,
-	36987 - 11904: 0xEBD2,
-	36988 - 11904: 0xBFF1,
-	36989 - 11904: 0xC1D8,
-	36990 - 11904: 0xEEC3,
-	36991 - 11904: 0xC1D7,
-	36992 - 11904: 0xC1DC,
-	36993 - 11904: 0xC1DA,
-	36994 - 11904: 0xC1DB,
-	36995 - 11904: 0xC2E3,
-	36996 - 11904: 0xC1D9,
-	36997 - 11904: 0xEEC2,
-	36998 - 11904: 0xEBD3,
-	36999 - 11904: 0xC2E2,
-	37000 - 11904: 0xC2E4,
-	37002 - 11904: 0xC3E4,
-	37003 - 11904: 0xC3E5,
-	37005 - 11904: 0xF4E0,
-	37007 - 11904: 0xC5DE,
-	37008 - 11904: 0xC5DD,
-	37009 - 11904: 0xA8B6,
-	37012 - 11904: 0xCA55,
-	37013 - 11904: 0xB06F,
-	37015 - 11904: 0xCA52,
-	37016 - 11904: 0xCA53,
-	37017 - 11904: 0xCA51,
-	37019 - 11904: 0xCA54,
-	37022 - 11904: 0xCBAA,
-	37023 - 11904: 0xCBA7,
-	37024 - 11904: 0xCBAC,
-	37025 - 11904: 0xCBA8,
-	37026 - 11904: 0xA8B7,
-	37027 - 11904: 0xA8BA,
-	37029 - 11904: 0xCBA9,
-	37030 - 11904: 0xA8B9,
-	37031 - 11904: 0xCBAB,
-	37032 - 11904: 0x9068,
-	37034 - 11904: 0xA8B8,
-	37038 - 11904: 0x906C,
-	37039 - 11904: 0xCDD5,
-	37040 - 11904: 0xCDD7,
-	37041 - 11904: 0xAAF4,
-	37042 - 11904: 0xCDD3,
-	37043 - 11904: 0xCDD6,
-	37044 - 11904: 0xCDD4,
-	37045 - 11904: 0xAAF2,
-	37046 - 11904: 0xAAF5,
-	37048 - 11904: 0xAAF3,
-	37051 - 11904: 0x95D8,
-	37053 - 11904: 0xD0B8,
-	37054 - 11904: 0xD0BC,
-	37055 - 11904: 0xD0B9,
-	37057 - 11904: 0xADA7,
-	37059 - 11904: 0xADA8,
-	37060 - 11904: 0x906A,
-	37061 - 11904: 0xD0BB,
-	37063 - 11904: 0xD0BD,
-	37064 - 11904: 0xD0BF,
-	37066 - 11904: 0xADA5,
-	37067 - 11904: 0xD0BE,
-	37070 - 11904: 0xADA6,
-	37076 - 11904: 0xD7EE,
-	37077 - 11904: 0xD0BA,
-	37078 - 11904: 0xD3F2,
-	37079 - 11904: 0xD3FB,
-	37080 - 11904: 0xD3F9,
-	37081 - 11904: 0xD3F4,
-	37082 - 11904: 0xD3F5,
-	37083 - 11904: 0xD3FA,
-	37084 - 11904: 0xD3FC,
-	37085 - 11904: 0xB071,
-	37087 - 11904: 0xD3F7,
-	37088 - 11904: 0xD3F3,
-	37089 - 11904: 0xB070,
-	37090 - 11904: 0xB072,
-	37091 - 11904: 0xD3F6,
-	37092 - 11904: 0xD3FD,
-	37093 - 11904: 0xD3F8,
-	37096 - 11904: 0xB3A1,
-	37097 - 11904: 0xD7F1,
-	37098 - 11904: 0xD7E9,
-	37099 - 11904: 0xD7EF,
-	37100 - 11904: 0xD7F0,
-	37101 - 11904: 0xB3A2,
-	37103 - 11904: 0xD7E8,
-	37104 - 11904: 0xD7EA,
-	37105 - 11904: 0xD0B7,
-	37106 - 11904: 0xD7EC,
-	37107 - 11904: 0xD7ED,
-	37108 - 11904: 0xD7EB,
-	37109 - 11904: 0xB66C,
-	37113 - 11904: 0xDC56,
-	37114 - 11904: 0xEBD4,
-	37115 - 11904: 0xDC57,
-	37116 - 11904: 0xDC54,
-	37117 - 11904: 0xB3A3,
-	37118 - 11904: 0xB66E,
-	37119 - 11904: 0xDC53,
-	37120 - 11904: 0xDC59,
-	37121 - 11904: 0xDC58,
-	37122 - 11904: 0xB66B,
-	37123 - 11904: 0xDC5C,
-	37124 - 11904: 0xDC52,
-	37125 - 11904: 0xDC5B,
-	37126 - 11904: 0xDC50,
-	37127 - 11904: 0xDC5A,
-	37128 - 11904: 0xDC55,
-	37129 - 11904: 0xB66D,
-	37131 - 11904: 0xE0AA,
-	37133 - 11904: 0xE0A5,
-	37134 - 11904: 0xE0AB,
-	37135 - 11904: 0xE0A6,
-	37136 - 11904: 0xE0A4,
-	37137 - 11904: 0xE0A7,
-	37138 - 11904: 0xB951,
-	37140 - 11904: 0xE0A9,
-	37142 - 11904: 0xE0A8,
-	37143 - 11904: 0xB952,
-	37144 - 11904: 0xBBC1,
-	37145 - 11904: 0xBBC0,
-	37146 - 11904: 0xE46E,
-	37147 - 11904: 0xE471,
-	37148 - 11904: 0xE469,
-	37149 - 11904: 0xE46D,
-	37150 - 11904: 0xBBC2,
-	37151 - 11904: 0xE46C,
-	37152 - 11904: 0xE46A,
-	37153 - 11904: 0xE470,
-	37154 - 11904: 0xE46B,
-	37155 - 11904: 0xE468,
-	37156 - 11904: 0xE46F,
-	37158 - 11904: 0xE859,
-	37159 - 11904: 0xBE48,
-	37160 - 11904: 0xF14A,
-	37161 - 11904: 0xE856,
-	37162 - 11904: 0xE857,
-	37163 - 11904: 0xE855,
-	37164 - 11904: 0xDC51,
-	37165 - 11904: 0xBE47,
-	37166 - 11904: 0xE85A,
-	37167 - 11904: 0xE854,
-	37168 - 11904: 0xBE46,
-	37169 - 11904: 0xBE49,
-	37170 - 11904: 0xE858,
-	37171 - 11904: 0xEBD5,
-	37172 - 11904: 0xBFF3,
-	37173 - 11904: 0xEBD6,
-	37174 - 11904: 0xEBD7,
-	37176 - 11904: 0xEEC4,
-	37177 - 11904: 0xC1DD,
-	37178 - 11904: 0xF14B,
-	37179 - 11904: 0xF14C,
-	37182 - 11904: 0xF14D,
-	37183 - 11904: 0xF35D,
-	37184 - 11904: 0xF35C,
-	37185 - 11904: 0xF4E2,
-	37187 - 11904: 0xF4E1,
-	37188 - 11904: 0xF65B,
-	37189 - 11904: 0xF65C,
-	37190 - 11904: 0xF65A,
-	37191 - 11904: 0xF766,
-	37192 - 11904: 0xC5B0,
-	37193 - 11904: 0xA8BB,
-	37194 - 11904: 0xADAA,
-	37195 - 11904: 0xADA9,
-	37196 - 11904: 0xB075,
-	37197 - 11904: 0xB074,
-	37198 - 11904: 0xD440,
-	37199 - 11904: 0xD441,
-	37200 - 11904: 0xD3FE,
-	37201 - 11904: 0x9FB2,
-	37202 - 11904: 0xB073,
-	37203 - 11904: 0xD7F5,
-	37205 - 11904: 0xD7F6,
-	37206 - 11904: 0xD7F2,
-	37207 - 11904: 0xB3A4,
-	37208 - 11904: 0xD7F3,
-	37209 - 11904: 0x9FAE,
-	37210 - 11904: 0xD7F4,
-	37212 - 11904: 0x9FB0,
-	37214 - 11904: 0x89AD,
-	37215 - 11904: 0xDC5F,
-	37216 - 11904: 0xDC61,
-	37217 - 11904: 0xDC5D,
-	37218 - 11904: 0xDC60,
-	37219 - 11904: 0xB66F,
-	37220 - 11904: 0xDC5E,
-	37221 - 11904: 0xB670,
-	37223 - 11904: 0x906E,
-	37224 - 11904: 0xDD73,
-	37225 - 11904: 0xB955,
-	37226 - 11904: 0xB954,
-	37228 - 11904: 0xB953,
-	37230 - 11904: 0xE0AC,
-	37231 - 11904: 0xE0AD,
-	37232 - 11904: 0x9E71,
-	37234 - 11904: 0xE473,
-	37235 - 11904: 0xE475,
-	37236 - 11904: 0xBBC6,
-	37237 - 11904: 0xBBC3,
-	37238 - 11904: 0x9E4A,
-	37239 - 11904: 0xBBC5,
-	37240 - 11904: 0xBBC4,
-	37241 - 11904: 0xE474,
-	37242 - 11904: 0xE472,
-	37244 - 11904: 0x9FDC,
-	37248 - 11904: 0xE861,
-	37249 - 11904: 0xE85E,
-	37250 - 11904: 0xE85F,
-	37251 - 11904: 0xBE4D,
-	37252 - 11904: 0xE860,
-	37253 - 11904: 0xE85B,
-	37254 - 11904: 0xE85C,
-	37255 - 11904: 0xBE4A,
-	37257 - 11904: 0xBE4B,
-	37258 - 11904: 0xE85D,
-	37259 - 11904: 0xBE4C,
-	37260 - 11904: 0x89AB,
-	37261 - 11904: 0xEBDB,
-	37262 - 11904: 0x9FB8,
-	37263 - 11904: 0xEBDC,
-	37264 - 11904: 0xEBD9,
-	37265 - 11904: 0xEBDA,
-	37266 - 11904: 0xBFF4,
-	37267 - 11904: 0xEBD8,
-	37273 - 11904: 0xEEC8,
-	37274 - 11904: 0xEEC5,
-	37275 - 11904: 0xEEC7,
-	37276 - 11904: 0xC1E0,
-	37277 - 11904: 0xEECB,
-	37278 - 11904: 0xC1DF,
-	37279 - 11904: 0xEEC9,
-	37280 - 11904: 0xEECC,
-	37281 - 11904: 0xEECA,
-	37282 - 11904: 0xEEC6,
-	37283 - 11904: 0xC1DE,
-	37285 - 11904: 0xF14F,
-	37287 - 11904: 0xF150,
-	37288 - 11904: 0xF14E,
-	37289 - 11904: 0x9070,
-	37290 - 11904: 0xF152,
-	37291 - 11904: 0xC2E5,
-	37292 - 11904: 0xC2E6,
-	37293 - 11904: 0xF35F,
-	37294 - 11904: 0xC3E7,
-	37295 - 11904: 0xF151,
-	37296 - 11904: 0xF35E,
-	37297 - 11904: 0xC3E6,
-	37298 - 11904: 0xF4E5,
-	37299 - 11904: 0xF4E6,
-	37300 - 11904: 0xC4BF,
-	37301 - 11904: 0xF4E4,
-	37302 - 11904: 0x8B63,
-	37303 - 11904: 0xF4E3,
-	37305 - 11904: 0xF65D,
-	37306 - 11904: 0xC548,
-	37307 - 11904: 0x95DC,
-	37308 - 11904: 0xF849,
-	37309 - 11904: 0xF8C8,
-	37310 - 11904: 0xF8C7,
-	37312 - 11904: 0xC643,
-	37313 - 11904: 0xC65D,
-	37314 - 11904: 0xF8C9,
-	37315 - 11904: 0xF971,
-	37316 - 11904: 0x9071,
-	37317 - 11904: 0xC66F,
-	37318 - 11904: 0xA8BC,
-	37319 - 11904: 0xAAF6,
-	37321 - 11904: 0xB956,
-	37323 - 11904: 0xC4C0,
-	37324 - 11904: 0xA8BD,
-	37325 - 11904: 0xADAB,
-	37326 - 11904: 0xB3A5,
-	37327 - 11904: 0xB671,
-	37328 - 11904: 0xC2E7,
-	37329 - 11904: 0xAAF7,
-	37331 - 11904: 0xD0C1,
-	37332 - 11904: 0xD0C0,
-	37333 - 11904: 0xD442,
-	37334 - 11904: 0xFC5E,
-	37335 - 11904: 0xB078,
-	37336 - 11904: 0xB076,
-	37337 - 11904: 0xB07A,
-	37338 - 11904: 0xD444,
-	37340 - 11904: 0xB079,
-	37341 - 11904: 0xB077,
-	37343 - 11904: 0x8949,
-	37346 - 11904: 0xD443,
-	37347 - 11904: 0xB3A8,
-	37348 - 11904: 0xD7FC,
-	37349 - 11904: 0x965B,
-	37350 - 11904: 0xB3A7,
-	37351 - 11904: 0xB3A9,
-	37352 - 11904: 0xD842,
-	37353 - 11904: 0xB3AB,
-	37354 - 11904: 0xD7FE,
-	37355 - 11904: 0xD840,
-	37356 - 11904: 0xD7F7,
-	37357 - 11904: 0xB3AA,
-	37358 - 11904: 0xD843,
-	37361 - 11904: 0xD7F9,
-	37363 - 11904: 0xD7FA,
-	37364 - 11904: 0xD7F8,
-	37365 - 11904: 0xB3A6,
-	37366 - 11904: 0x8C50,
-	37367 - 11904: 0xD841,
-	37368 - 11904: 0xD7FB,
-	37369 - 11904: 0xD7FD,
-	37370 - 11904: 0x94A6,
-	37373 - 11904: 0xDC6D,
-	37374 - 11904: 0x8FD5,
-	37375 - 11904: 0xDC6C,
-	37376 - 11904: 0xDC6A,
-	37377 - 11904: 0xDC62,
-	37378 - 11904: 0xDC71,
-	37379 - 11904: 0xDC65,
-	37380 - 11904: 0xDC6F,
-	37381 - 11904: 0xDC76,
-	37382 - 11904: 0xDC6E,
-	37383 - 11904: 0xB679,
-	37384 - 11904: 0x9E73,
-	37385 - 11904: 0xB675,
-	37386 - 11904: 0xDC63,
-	37388 - 11904: 0xDC69,
-	37389 - 11904: 0xB677,
-	37390 - 11904: 0x9075,
-	37391 - 11904: 0xDC68,
-	37392 - 11904: 0xB678,
-	37393 - 11904: 0xB67A,
-	37394 - 11904: 0xDC6B,
-	37395 - 11904: 0x99F7,
-	37396 - 11904: 0xB672,
-	37397 - 11904: 0xB673,
-	37398 - 11904: 0xDC77,
-	37399 - 11904: 0xDC75,
-	37400 - 11904: 0x87B2,
-	37401 - 11904: 0xDC74,
-	37402 - 11904: 0xDC66,
-	37404 - 11904: 0xDC72,
-	37406 - 11904: 0xB676,
-	37409 - 11904: 0x8CBF,
-	37411 - 11904: 0xB674,
-	37412 - 11904: 0xDC73,
-	37413 - 11904: 0xDC64,
-	37414 - 11904: 0xDC67,
-	37415 - 11904: 0xDC70,
-	37416 - 11904: 0x99F9,
-	37418 - 11904: 0x9663,
-	37419 - 11904: 0x95B9,
-	37421 - 11904: 0xE4BA,
-	37422 - 11904: 0xE0B7,
-	37424 - 11904: 0xE0B0,
-	37425 - 11904: 0xE0C3,
-	37426 - 11904: 0xE0CC,
-	37427 - 11904: 0xE0B3,
-	37428 - 11904: 0xB961,
-	37429 - 11904: 0x94D4,
-	37430 - 11904: 0xE0C0,
-	37431 - 11904: 0xB957,
-	37432 - 11904: 0xB959,
-	37433 - 11904: 0xB965,
-	37434 - 11904: 0xE0B1,
-	37436 - 11904: 0xFCFA,
-	37437 - 11904: 0xB95A,
-	37438 - 11904: 0xB95C,
-	37439 - 11904: 0xB966,
-	37440 - 11904: 0xB95B,
-	37441 - 11904: 0x9077,
-	37444 - 11904: 0x90AB,
-	37445 - 11904: 0xB964,
-	37446 - 11904: 0xE0B9,
-	37448 - 11904: 0xE0AE,
-	37449 - 11904: 0xB962,
-	37450 - 11904: 0xE0B8,
-	37451 - 11904: 0xB95E,
-	37452 - 11904: 0xE0CA,
-	37453 - 11904: 0xB963,
-	37454 - 11904: 0xE0C8,
-	37455 - 11904: 0xE0BC,
-	37456 - 11904: 0xE0C6,
-	37457 - 11904: 0xB960,
-	37458 - 11904: 0xE0AF,
-	37459 - 11904: 0xE0C9,
-	37460 - 11904: 0xE0C4,
-	37461 - 11904: 0x9D4D,
-	37462 - 11904: 0xE0CB,
-	37463 - 11904: 0xB958,
-	37464 - 11904: 0x99FA,
-	37466 - 11904: 0xB967,
-	37467 - 11904: 0xB95D,
-	37469 - 11904: 0x92E3,
-	37470 - 11904: 0xE0B5,
-	37471 - 11904: 0x97BB,
-	37472 - 11904: 0xE0BD,
-	37473 - 11904: 0xE0C1,
-	37474 - 11904: 0x9078,
-	37475 - 11904: 0xE0C5,
-	37476 - 11904: 0xB95F,
-	37477 - 11904: 0xE0B4,
-	37478 - 11904: 0xE0B2,
-	37479 - 11904: 0xE0BE,
-	37483 - 11904: 0x99FB,
-	37484 - 11904: 0xE0BB,
-	37485 - 11904: 0xE0BA,
-	37486 - 11904: 0x97E0,
-	37487 - 11904: 0xE0BF,
-	37488 - 11904: 0xE0C2,
-	37490 - 11904: 0xE0C7,
-	37494 - 11904: 0xE478,
-	37495 - 11904: 0x96DC,
-	37496 - 11904: 0xBBC7,
-	37497 - 11904: 0xE4A4,
-	37498 - 11904: 0xE47A,
-	37499 - 11904: 0xBBCC,
-	37500 - 11904: 0xBBD0,
-	37501 - 11904: 0xE4AD,
-	37502 - 11904: 0xE4B5,
-	37503 - 11904: 0xE4A6,
-	37504 - 11904: 0xBBC8,
-	37505 - 11904: 0x9CA8,
-	37506 - 11904: 0xE4AA,
-	37507 - 11904: 0xE0B6,
-	37508 - 11904: 0x9772,
-	37509 - 11904: 0xBBC9,
-	37510 - 11904: 0xE4B1,
-	37511 - 11904: 0xE4B6,
-	37512 - 11904: 0xE4AE,
-	37513 - 11904: 0x9440,
-	37514 - 11904: 0xE4B0,
-	37515 - 11904: 0xE4B9,
-	37516 - 11904: 0xE4B2,
-	37517 - 11904: 0xE47E,
-	37518 - 11904: 0xE4A9,
-	37519 - 11904: 0x92F2,
-	37521 - 11904: 0xBBD1,
-	37523 - 11904: 0xBBCD,
-	37524 - 11904: 0xE47C,
-	37525 - 11904: 0xE4AB,
-	37526 - 11904: 0xBBCB,
-	37527 - 11904: 0xE4A5,
-	37528 - 11904: 0xBBCA,
-	37529 - 11904: 0xE4B3,
-	37530 - 11904: 0xE4A2,
-	37531 - 11904: 0xE479,
-	37532 - 11904: 0xBBCE,
-	37533 - 11904: 0xE4B8,
-	37536 - 11904: 0xE47B,
-	37537 - 11904: 0xE4AF,
-	37538 - 11904: 0xE4AC,
-	37539 - 11904: 0xE4A7,
-	37540 - 11904: 0xE477,
-	37541 - 11904: 0xE476,
-	37542 - 11904: 0xE4A1,
-	37543 - 11904: 0xE4B4,
-	37544 - 11904: 0xBBCF,
-	37545 - 11904: 0xE4B7,
-	37546 - 11904: 0xE47D,
-	37547 - 11904: 0xE4A3,
-	37548 - 11904: 0xBE52,
-	37550 - 11904: 0x99FD,
-	37553 - 11904: 0x99FC,
-	37554 - 11904: 0xBE5A,
-	37555 - 11904: 0xBE55,
-	37556 - 11904: 0xE8A4,
-	37557 - 11904: 0xE8A1,
-	37558 - 11904: 0xE867,
-	37559 - 11904: 0xBE50,
-	37561 - 11904: 0xF9D7,
-	37562 - 11904: 0x964A,
-	37563 - 11904: 0xBE4F,
-	37564 - 11904: 0xBE56,
-	37566 - 11904: 0x96D8,
-	37567 - 11904: 0x99FE,
-	37568 - 11904: 0xE865,
-	37569 - 11904: 0xBE54,
-	37570 - 11904: 0xE871,
-	37571 - 11904: 0xE863,
-	37572 - 11904: 0xE864,
-	37573 - 11904: 0xBE4E,
-	37574 - 11904: 0xE8A3,
-	37575 - 11904: 0xBE58,
-	37576 - 11904: 0xE874,
-	37577 - 11904: 0xE879,
-	37578 - 11904: 0xE873,
-	37579 - 11904: 0xEBEE,
-	37580 - 11904: 0xE86F,
-	37581 - 11904: 0xE877,
-	37582 - 11904: 0xE875,
-	37583 - 11904: 0xE868,
-	37584 - 11904: 0xE862,
-	37585 - 11904: 0xE87D,
-	37586 - 11904: 0xBE57,
-	37587 - 11904: 0xE87E,
-	37588 - 11904: 0x904B,
-	37589 - 11904: 0xE878,
-	37591 - 11904: 0xE86D,
-	37592 - 11904: 0xE86B,
-	37593 - 11904: 0xE866,
-	37595 - 11904: 0xFA41,
-	37597 - 11904: 0xE86E,
-	37598 - 11904: 0xE87B,
-	37599 - 11904: 0xE86A,
-	37600 - 11904: 0xE87A,
-	37601 - 11904: 0xE8A2,
-	37603 - 11904: 0x9A40,
-	37604 - 11904: 0xBE53,
-	37605 - 11904: 0x975B,
-	37606 - 11904: 0xE876,
-	37607 - 11904: 0xE87C,
-	37608 - 11904: 0xE872,
-	37609 - 11904: 0xE86C,
-	37610 - 11904: 0xBE51,
-	37611 - 11904: 0x9A41,
-	37612 - 11904: 0x91DD,
-	37614 - 11904: 0xE4A8,
-	37615 - 11904: 0xE870,
-	37616 - 11904: 0xBE59,
-	37617 - 11904: 0xE869,
-	37618 - 11904: 0x93FC,
-	37619 - 11904: 0x9A42,
-	37620 - 11904: 0x9A43,
-	37622 - 11904: 0x9659,
-	37623 - 11904: 0xEBF4,
-	37624 - 11904: 0xBFF7,
-	37625 - 11904: 0xEBF3,
-	37626 - 11904: 0xEBF0,
-	37627 - 11904: 0xEC44,
-	37628 - 11904: 0xBFFB,
-	37629 - 11904: 0x9A44,
-	37630 - 11904: 0xEC41,
-	37631 - 11904: 0xEBF8,
-	37632 - 11904: 0xEC43,
-	37633 - 11904: 0xEBE9,
-	37634 - 11904: 0xEBF6,
-	37635 - 11904: 0x9051,
-	37636 - 11904: 0xBFFD,
-	37638 - 11904: 0xEBE1,
-	37639 - 11904: 0x94BF,
-	37640 - 11904: 0xEBDF,
-	37641 - 11904: 0xEC42,
-	37643 - 11904: 0xEC40,
-	37644 - 11904: 0xEBFE,
-	37645 - 11904: 0xEBED,
-	37646 - 11904: 0xEBEC,
-	37647 - 11904: 0xEBE2,
-	37648 - 11904: 0xC040,
-	37650 - 11904: 0xEBE8,
-	37651 - 11904: 0xEBF2,
-	37652 - 11904: 0xEBFD,
-	37653 - 11904: 0xC043,
-	37654 - 11904: 0xEC45,
-	37656 - 11904: 0xC1E8,
-	37657 - 11904: 0xC045,
-	37658 - 11904: 0xBFFE,
-	37659 - 11904: 0xEBE6,
-	37661 - 11904: 0xEBEF,
-	37662 - 11904: 0xEBDE,
-	37663 - 11904: 0xEBE0,
-	37664 - 11904: 0xBFF5,
-	37665 - 11904: 0xC042,
-	37666 - 11904: 0xBFFA,
-	37667 - 11904: 0xEBE7,
-	37668 - 11904: 0xEBF7,
-	37669 - 11904: 0xEBF1,
-	37670 - 11904: 0xC041,
-	37671 - 11904: 0xEBDD,
-	37672 - 11904: 0xC1E3,
-	37673 - 11904: 0xEBF9,
-	37674 - 11904: 0xEBFC,
-	37675 - 11904: 0xBFFC,
-	37676 - 11904: 0x90A2,
-	37677 - 11904: 0xEBEB,
-	37678 - 11904: 0xC044,
-	37679 - 11904: 0xBFF9,
-	37680 - 11904: 0x9CAB,
-	37681 - 11904: 0x9776,
-	37683 - 11904: 0xBFF8,
-	37684 - 11904: 0xEBF5,
-	37685 - 11904: 0xEBFB,
-	37686 - 11904: 0xBFF6,
-	37688 - 11904: 0xEBE4,
-	37689 - 11904: 0xEBFA,
-	37692 - 11904: 0xEBE5,
-	37696 - 11904: 0xFC55,
-	37697 - 11904: 0xFE45,
-	37698 - 11904: 0x94A8,
-	37699 - 11904: 0x9A45,
-	37700 - 11904: 0xFA4B,
-	37701 - 11904: 0x9DE1,
-	37702 - 11904: 0xEBEA,
-	37703 - 11904: 0xEED2,
-	37704 - 11904: 0x96D9,
-	37705 - 11904: 0xEED7,
-	37706 - 11904: 0xC1E5,
-	37707 - 11904: 0xC1E7,
-	37708 - 11904: 0xEEDD,
-	37709 - 11904: 0xC1E1,
-	37710 - 11904: 0xEEEC,
-	37711 - 11904: 0xEEE3,
-	37712 - 11904: 0xEED8,
-	37713 - 11904: 0xEED9,
-	37714 - 11904: 0xEEE2,
-	37716 - 11904: 0xC1EE,
-	37717 - 11904: 0xEEE1,
-	37718 - 11904: 0xEED1,
-	37719 - 11904: 0xEEE0,
-	37720 - 11904: 0xEED4,
-	37721 - 11904: 0xEEED,
-	37722 - 11904: 0xC1ED,
-	37723 - 11904: 0xC1EB,
-	37724 - 11904: 0xEED5,
-	37726 - 11904: 0xEEE8,
-	37727 - 11904: 0x9774,
-	37728 - 11904: 0xEEDA,
-	37729 - 11904: 0xEEE7,
-	37730 - 11904: 0xFDF5,
-	37731 - 11904: 0xEEE9,
-	37732 - 11904: 0xEED0,
-	37733 - 11904: 0xC1E6,
-	37734 - 11904: 0x92E5,
-	37735 - 11904: 0xEEEA,
-	37736 - 11904: 0x9645,
-	37737 - 11904: 0x91DA,
-	37738 - 11904: 0xEEDE,
-	37739 - 11904: 0x90A3,
-	37740 - 11904: 0xC1EA,
-	37741 - 11904: 0xEEDB,
-	37742 - 11904: 0xA05F,
-	37744 - 11904: 0xC1EC,
-	37745 - 11904: 0xEEE4,
-	37747 - 11904: 0x90AF,
-	37748 - 11904: 0x97BF,
-	37749 - 11904: 0xC1E4,
-	37750 - 11904: 0xEED6,
-	37751 - 11904: 0xEEE5,
-	37752 - 11904: 0x914C,
-	37753 - 11904: 0xEEDF,
-	37754 - 11904: 0xEBE3,
-	37755 - 11904: 0xEEE6,
-	37756 - 11904: 0xEED3,
-	37757 - 11904: 0x967A,
-	37758 - 11904: 0xC1E9,
-	37760 - 11904: 0xEEEB,
-	37761 - 11904: 0x91DE,
-	37762 - 11904: 0xC1E2,
-	37763 - 11904: 0xEECE,
-	37764 - 11904: 0x9A46,
-	37765 - 11904: 0xFEB0,
-	37766 - 11904: 0x9779,
-	37767 - 11904: 0x946C,
-	37768 - 11904: 0xF160,
-	37769 - 11904: 0xF159,
-	37770 - 11904: 0xC2E9,
-	37772 - 11904: 0xF154,
-	37773 - 11904: 0xF163,
-	37774 - 11904: 0xF15B,
-	37775 - 11904: 0xEEDC,
-	37776 - 11904: 0x9858,
-	37777 - 11904: 0xF165,
-	37778 - 11904: 0xF155,
-	37780 - 11904: 0xC2E8,
-	37781 - 11904: 0xF15F,
-	37782 - 11904: 0xC2EA,
-	37783 - 11904: 0xC2F2,
-	37784 - 11904: 0xC2F0,
-	37785 - 11904: 0xF161,
-	37786 - 11904: 0xC2F1,
-	37787 - 11904: 0xF157,
-	37788 - 11904: 0x9266,
-	37789 - 11904: 0xF158,
-	37790 - 11904: 0xF15D,
-	37791 - 11904: 0xF162,
-	37792 - 11904: 0x93FB,
-	37793 - 11904: 0xEECD,
-	37794 - 11904: 0xC2EB,
-	37795 - 11904: 0xF16A,
-	37796 - 11904: 0xF167,
-	37797 - 11904: 0xF16B,
-	37798 - 11904: 0xF15E,
-	37799 - 11904: 0xF15A,
-	37800 - 11904: 0xF168,
-	37801 - 11904: 0xF36A,
-	37802 - 11904: 0xF15C,
-	37804 - 11904: 0xC2EE,
-	37805 - 11904: 0x9A47,
-	37806 - 11904: 0xC2ED,
-	37807 - 11904: 0xEECF,
-	37808 - 11904: 0xC2EF,
-	37809 - 11904: 0xF164,
-	37810 - 11904: 0xF166,
-	37811 - 11904: 0xC2EC,
-	37812 - 11904: 0xF169,
-	37813 - 11904: 0xF153,
-	37815 - 11904: 0xF156,
-	37816 - 11904: 0x9749,
-	37819 - 11904: 0x9748,
-	37821 - 11904: 0x934A,
-	37823 - 11904: 0x9CE2,
-	37824 - 11904: 0xF373,
-	37826 - 11904: 0xF363,
-	37827 - 11904: 0xC3EB,
-	37828 - 11904: 0xF371,
-	37830 - 11904: 0x9264,
-	37831 - 11904: 0xF361,
-	37832 - 11904: 0xC3EC,
-	37834 - 11904: 0xF36C,
-	37835 - 11904: 0x91DF,
-	37836 - 11904: 0xF368,
-	37837 - 11904: 0xC3F1,
-	37838 - 11904: 0xF372,
-	37839 - 11904: 0xF362,
-	37840 - 11904: 0xF365,
-	37841 - 11904: 0xC3E9,
-	37842 - 11904: 0xF374,
-	37843 - 11904: 0xFB79,
-	37844 - 11904: 0xF36D,
-	37845 - 11904: 0xF370,
-	37846 - 11904: 0xC3EF,
-	37847 - 11904: 0xC3F4,
-	37848 - 11904: 0xC3F2,
-	37849 - 11904: 0xF369,
-	37850 - 11904: 0xF364,
-	37851 - 11904: 0x96D7,
-	37852 - 11904: 0xC3ED,
-	37853 - 11904: 0xC3EE,
-	37854 - 11904: 0xF360,
-	37855 - 11904: 0xC3EA,
-	37856 - 11904: 0x9343,
-	37857 - 11904: 0xC3E8,
-	37858 - 11904: 0xC3F0,
-	37859 - 11904: 0xF36F,
-	37860 - 11904: 0xC3F3,
-	37862 - 11904: 0xF36B,
-	37863 - 11904: 0xF375,
-	37864 - 11904: 0xC3F5,
-	37868 - 11904: 0xF367,
-	37870 - 11904: 0xF36E,
-	37872 - 11904: 0xFDCB,
-	37873 - 11904: 0xFE7A,
-	37875 - 11904: 0x91DB,
-	37876 - 11904: 0x8C6A,
-	37877 - 11904: 0xF4F3,
-	37878 - 11904: 0xF542,
-	37879 - 11904: 0xF4F5,
-	37880 - 11904: 0xF4FC,
-	37881 - 11904: 0xF366,
-	37882 - 11904: 0xF4FA,
-	37883 - 11904: 0xF4E9,
-	37884 - 11904: 0xF540,
-	37885 - 11904: 0xC4C3,
-	37886 - 11904: 0xF4ED,
-	37887 - 11904: 0xF4FE,
-	37888 - 11904: 0xF4F4,
-	37889 - 11904: 0x97AF,
-	37891 - 11904: 0xC4C2,
-	37892 - 11904: 0x95DD,
-	37894 - 11904: 0xF544,
-	37895 - 11904: 0xF4F6,
-	37896 - 11904: 0x9348,
-	37897 - 11904: 0xF4FB,
-	37898 - 11904: 0xF4FD,
-	37899 - 11904: 0xF4E7,
-	37900 - 11904: 0xF541,
-	37901 - 11904: 0xF4F2,
-	37902 - 11904: 0xF4F7,
-	37903 - 11904: 0xF4EB,
-	37904 - 11904: 0xF4EF,
-	37905 - 11904: 0xF543,
-	37906 - 11904: 0xF4F9,
-	37907 - 11904: 0xF4E8,
-	37908 - 11904: 0xF4EC,
-	37909 - 11904: 0xF4EE,
-	37910 - 11904: 0xF4F8,
-	37911 - 11904: 0x9A4B,
-	37912 - 11904: 0xC4C1,
-	37913 - 11904: 0xF4F1,
-	37915 - 11904: 0xFC45,
-	37917 - 11904: 0x9A4D,
-	37920 - 11904: 0xF4EA,
-	37924 - 11904: 0x91BC,
-	37925 - 11904: 0x90E2,
-	37926 - 11904: 0x90B4,
-	37927 - 11904: 0x95E1,
-	37928 - 11904: 0xF4F0,
-	37929 - 11904: 0xF661,
-	37930 - 11904: 0xF666,
-	37931 - 11904: 0xC54F,
-	37932 - 11904: 0xF668,
-	37933 - 11904: 0x9A4E,
-	37934 - 11904: 0xC549,
-	37935 - 11904: 0x87AD,
-	37936 - 11904: 0xF664,
-	37937 - 11904: 0xF66A,
-	37938 - 11904: 0xC54E,
-	37939 - 11904: 0xC54A,
-	37941 - 11904: 0xC54B,
-	37942 - 11904: 0xF660,
-	37943 - 11904: 0xF667,
-	37944 - 11904: 0xC54D,
-	37945 - 11904: 0xF665,
-	37946 - 11904: 0xC54C,
-	37947 - 11904: 0xF65F,
-	37948 - 11904: 0xF663,
-	37949 - 11904: 0xF662,
-	37950 - 11904: 0x9A4F,
-	37951 - 11904: 0xF65E,
-	37952 - 11904: 0xF669,
-	37954 - 11904: 0xFE40,
-	37955 - 11904: 0xFE43,
-	37956 - 11904: 0xC5B1,
-	37957 - 11904: 0xF76D,
-	37958 - 11904: 0xF770,
-	37959 - 11904: 0xF76C,
-	37960 - 11904: 0xF76E,
-	37961 - 11904: 0xF76F,
-	37962 - 11904: 0xF769,
-	37963 - 11904: 0xF76A,
-	37964 - 11904: 0xF767,
-	37965 - 11904: 0x96DD,
-	37967 - 11904: 0xF76B,
-	37968 - 11904: 0xF768,
-	37969 - 11904: 0xC5B2,
-	37970 - 11904: 0xC5B3,
-	37972 - 11904: 0x9A51,
-	37973 - 11904: 0xF84B,
-	37975 - 11904: 0xF84D,
-	37976 - 11904: 0x96A7,
-	37979 - 11904: 0x90B0,
-	37981 - 11904: 0xF84C,
-	37982 - 11904: 0xF84E,
-	37984 - 11904: 0xC5E0,
-	37986 - 11904: 0xF84A,
-	37987 - 11904: 0xC5DF,
-	37988 - 11904: 0xC5E1,
-	37989 - 11904: 0x9C4E,
-	37991 - 11904: 0x9443,
-	37992 - 11904: 0xF8CB,
-	37993 - 11904: 0xF8CC,
-	37994 - 11904: 0xC644,
-	37995 - 11904: 0xF8CA,
-	37996 - 11904: 0x8EBA,
-	37997 - 11904: 0xF953,
-	37998 - 11904: 0xF952,
-	37999 - 11904: 0xF954,
-	38000 - 11904: 0xC65F,
-	38001 - 11904: 0xF955,
-	38002 - 11904: 0xC65E,
-	38003 - 11904: 0xF956,
-	38004 - 11904: 0xF972,
-	38005 - 11904: 0xF975,
-	38006 - 11904: 0xF974,
-	38007 - 11904: 0xC668,
-	38008 - 11904: 0xF973,
-	38009 - 11904: 0x9A52,
-	38011 - 11904: 0xFCC1,
-	38012 - 11904: 0xC672,
-	38013 - 11904: 0xC670,
-	38014 - 11904: 0xC671,
-	38015 - 11904: 0xC677,
-	38016 - 11904: 0xF9C0,
-	38017 - 11904: 0xF9C1,
-	38018 - 11904: 0xF9BF,
-	38019 - 11904: 0xF9C9,
-	38021 - 11904: 0x8BE9,
-	38047 - 11904: 0x9CAF,
-	38050 - 11904: 0x8BFD,
-	38081 - 11904: 0x9ABC,
-	38083 - 11904: 0x9AB8,
-	38108 - 11904: 0x9AAE,
-	38134 - 11904: 0x9AA7,
-	38189 - 11904: 0x9A53,
-	38215 - 11904: 0x9D74,
-	38263 - 11904: 0xAAF8,
-	38264 - 11904: 0x8BEA,
-	38266 - 11904: 0xD844,
-	38267 - 11904: 0xDC78,
-	38268 - 11904: 0xE8A5,
-	38269 - 11904: 0xF376,
-	38271 - 11904: 0x8BEB,
-	38272 - 11904: 0xAAF9,
-	38274 - 11904: 0xADAC,
-	38275 - 11904: 0xB07B,
-	38277 - 11904: 0x90B2,
-	38278 - 11904: 0xD845,
-	38280 - 11904: 0xD846,
-	38281 - 11904: 0xB3AC,
-	38283 - 11904: 0xB67D,
-	38284 - 11904: 0xDC7A,
-	38285 - 11904: 0xDC79,
-	38286 - 11904: 0xB6A3,
-	38287 - 11904: 0xB67C,
-	38288 - 11904: 0xDC7B,
-	38289 - 11904: 0xB67E,
-	38290 - 11904: 0xB6A2,
-	38291 - 11904: 0xB6A1,
-	38292 - 11904: 0xB67B,
-	38294 - 11904: 0x95E9,
-	38295 - 11904: 0x95E8,
-	38296 - 11904: 0xB968,
-	38297 - 11904: 0x95E6,
-	38299 - 11904: 0xE0D0,
-	38300 - 11904: 0xE0CE,
-	38302 - 11904: 0xE0CF,
-	38303 - 11904: 0xE0CD,
-	38304 - 11904: 0x90B5,
-	38305 - 11904: 0xBBD2,
-	38306 - 11904: 0x9A54,
-	38307 - 11904: 0xBBD5,
-	38308 - 11904: 0xBBD7,
-	38309 - 11904: 0xBBD6,
-	38310 - 11904: 0x90B3,
-	38311 - 11904: 0x95E7,
-	38312 - 11904: 0xBBD3,
-	38313 - 11904: 0xBBD4,
-	38314 - 11904: 0x8B50,
-	38315 - 11904: 0xE8A7,
-	38316 - 11904: 0xE8A6,
-	38317 - 11904: 0xBE5B,
-	38318 - 11904: 0xE8A8,
-	38320 - 11904: 0xE8A9,
-	38321 - 11904: 0xBE5C,
-	38325 - 11904: 0xEC4D,
-	38326 - 11904: 0xEC4B,
-	38327 - 11904: 0xEEF3,
-	38329 - 11904: 0xEC49,
-	38330 - 11904: 0xEC4A,
-	38331 - 11904: 0xC046,
-	38332 - 11904: 0xEC46,
-	38333 - 11904: 0xEC4E,
-	38334 - 11904: 0xEC48,
-	38335 - 11904: 0xEC4C,
-	38336 - 11904: 0xEEEF,
-	38339 - 11904: 0xEEF1,
-	38341 - 11904: 0xEEF2,
-	38342 - 11904: 0xC1F3,
-	38343 - 11904: 0xEEEE,
-	38344 - 11904: 0xC1F2,
-	38345 - 11904: 0xEEF0,
-	38346 - 11904: 0xC1EF,
-	38347 - 11904: 0xC1F0,
-	38348 - 11904: 0xC1F1,
-	38349 - 11904: 0xEC47,
-	38352 - 11904: 0xC2F5,
-	38353 - 11904: 0xF16E,
-	38354 - 11904: 0xF16C,
-	38355 - 11904: 0xF16D,
-	38356 - 11904: 0xC2F3,
-	38357 - 11904: 0xC2F6,
-	38358 - 11904: 0xC2F4,
-	38362 - 11904: 0xF377,
-	38363 - 11904: 0xF378,
-	38364 - 11904: 0xC3F6,
-	38366 - 11904: 0xF545,
-	38367 - 11904: 0xF547,
-	38368 - 11904: 0xF546,
-	38369 - 11904: 0xC4C4,
-	38370 - 11904: 0xC550,
-	38371 - 11904: 0xF66D,
-	38372 - 11904: 0xF66C,
-	38373 - 11904: 0xF66B,
-	38376 - 11904: 0x8BEC,
-	38388 - 11904: 0x9A56,
-	38428 - 11904: 0xAAFA,
-	38429 - 11904: 0x8BFB,
-	38430 - 11904: 0xC9AA,
-	38432 - 11904: 0xCA58,
-	38433 - 11904: 0xA6E9,
-	38434 - 11904: 0xCA56,
-	38435 - 11904: 0xCA59,
-	38436 - 11904: 0xCA57,
-	38440 - 11904: 0xCBAE,
-	38442 - 11904: 0xA8C1,
-	38444 - 11904: 0xA8C2,
-	38445 - 11904: 0xCBB0,
-	38446 - 11904: 0xA8BF,
-	38447 - 11904: 0xCBAF,
-	38448 - 11904: 0xCBAD,
-	38449 - 11904: 0xA8C0,
-	38450 - 11904: 0xA8BE,
-	38451 - 11904: 0x9A57,
-	38456 - 11904: 0xA0AA,
-	38457 - 11904: 0xCDD8,
-	38458 - 11904: 0xCDDB,
-	38459 - 11904: 0xAAFD,
-	38460 - 11904: 0xCDDA,
-	38461 - 11904: 0xCDD9,
-	38463 - 11904: 0xAAFC,
-	38464 - 11904: 0xAAFB,
-	38465 - 11904: 0x9FA6,
-	38466 - 11904: 0xAB40,
-	38467 - 11904: 0xCDDC,
-	38468 - 11904: 0xAAFE,
-	38469 - 11904: 0x99CC,
-	38474 - 11904: 0xD0C6,
-	38475 - 11904: 0xADAE,
-	38476 - 11904: 0xADAF,
-	38477 - 11904: 0xADB0,
-	38478 - 11904: 0xD0C7,
-	38479 - 11904: 0xD0C3,
-	38480 - 11904: 0xADAD,
-	38481 - 11904: 0xD0C4,
-	38483 - 11904: 0xD0C5,
-	38484 - 11904: 0xD0C2,
-	38486 - 11904: 0x9C59,
-	38488 - 11904: 0xB0A4,
-	38491 - 11904: 0xB0A1,
-	38492 - 11904: 0xD445,
-	38493 - 11904: 0xB0A2,
-	38494 - 11904: 0xB0A5,
-	38495 - 11904: 0xD446,
-	38497 - 11904: 0xB07E,
-	38498 - 11904: 0xB07C,
-	38499 - 11904: 0xB07D,
-	38500 - 11904: 0xB0A3,
-	38505 - 11904: 0x99B5,
-	38506 - 11904: 0xB3AD,
-	38507 - 11904: 0xD849,
-	38508 - 11904: 0xB3B5,
-	38509 - 11904: 0xD848,
-	38511 - 11904: 0xD84B,
-	38512 - 11904: 0xB3B1,
-	38513 - 11904: 0xD84A,
-	38514 - 11904: 0xB6AB,
-	38515 - 11904: 0xB3AF,
-	38516 - 11904: 0xB3B2,
-	38517 - 11904: 0xB3AE,
-	38518 - 11904: 0xB3B3,
-	38519 - 11904: 0xB3B4,
-	38520 - 11904: 0xB3B0,
-	38523 - 11904: 0x90BE,
-	38524 - 11904: 0xD847,
-	38525 - 11904: 0xB6A7,
-	38526 - 11904: 0xDC7D,
-	38528 - 11904: 0xDCA3,
-	38529 - 11904: 0x9FAF,
-	38531 - 11904: 0xDCA2,
-	38532 - 11904: 0xB6AC,
-	38533 - 11904: 0xB6A8,
-	38534 - 11904: 0xB6A9,
-	38535 - 11904: 0xDC7C,
-	38536 - 11904: 0xDC7E,
-	38537 - 11904: 0xDCA1,
-	38538 - 11904: 0xB6A4,
-	38539 - 11904: 0xB6A6,
-	38541 - 11904: 0xB6AA,
-	38542 - 11904: 0xB6A5,
-	38543 - 11904: 0x95F2,
-	38545 - 11904: 0xE0D3,
-	38546 - 11904: 0xE0D1,
-	38547 - 11904: 0xE0D2,
-	38548 - 11904: 0xB96A,
-	38549 - 11904: 0xB96B,
-	38550 - 11904: 0x90BF,
-	38551 - 11904: 0xE0D4,
-	38552 - 11904: 0xB969,
-	38553 - 11904: 0xBBD8,
-	38555 - 11904: 0xBBDA,
-	38556 - 11904: 0xBBD9,
-	38558 - 11904: 0xE4BB,
-	38561 - 11904: 0xE4BC,
-	38562 - 11904: 0xE8AB,
-	38563 - 11904: 0x90C1,
-	38564 - 11904: 0xE8AA,
-	38565 - 11904: 0xFEE4,
-	38567 - 11904: 0xC047,
-	38568 - 11904: 0xC048,
-	38569 - 11904: 0xEC4F,
-	38570 - 11904: 0xC049,
-	38572 - 11904: 0xEEF6,
-	38574 - 11904: 0xEEF4,
-	38576 - 11904: 0xEEF5,
-	38577 - 11904: 0xC1F4,
-	38579 - 11904: 0xF16F,
-	38580 - 11904: 0xC3F7,
-	38582 - 11904: 0xC6D7,
-	38584 - 11904: 0xC1F5,
-	38585 - 11904: 0xAB41,
-	38587 - 11904: 0xB0A6,
-	38588 - 11904: 0xD447,
-	38589 - 11904: 0x90C7,
-	38591 - 11904: 0xD84C,
-	38592 - 11904: 0xB3B6,
-	38593 - 11904: 0xB6AD,
-	38594 - 11904: 0xDCA4,
-	38595 - 11904: 0xDCA6,
-	38596 - 11904: 0xB6AF,
-	38597 - 11904: 0xB6AE,
-	38598 - 11904: 0xB6B0,
-	38599 - 11904: 0xB6B1,
-	38600 - 11904: 0xDCA5,
-	38601 - 11904: 0xB96E,
-	38602 - 11904: 0xB96F,
-	38603 - 11904: 0xB96D,
-	38604 - 11904: 0xBBDB,
-	38605 - 11904: 0xB96C,
-	38606 - 11904: 0xE0D5,
-	38610 - 11904: 0xBBDC,
-	38611 - 11904: 0xE8AC,
-	38612 - 11904: 0xEC50,
-	38613 - 11904: 0xC04A,
-	38614 - 11904: 0xC1F6,
-	38615 - 11904: 0xF170,
-	38616 - 11904: 0xF174,
-	38617 - 11904: 0xC2F9,
-	38618 - 11904: 0xF171,
-	38619 - 11904: 0xC2FA,
-	38620 - 11904: 0xC2F8,
-	38621 - 11904: 0xF175,
-	38622 - 11904: 0xC2FB,
-	38623 - 11904: 0xF173,
-	38625 - 11904: 0xF379,
-	38626 - 11904: 0xC2F7,
-	38627 - 11904: 0xC3F8,
-	38629 - 11904: 0xF8CD,
-	38632 - 11904: 0xAB42,
-	38633 - 11904: 0xB3B8,
-	38634 - 11904: 0xB3B7,
-	38639 - 11904: 0xB6B2,
-	38640 - 11904: 0xDCA8,
-	38641 - 11904: 0xDCA7,
-	38642 - 11904: 0xB6B3,
-	38644 - 11904: 0x92E4,
-	38645 - 11904: 0xE0D9,
-	38646 - 11904: 0xB973,
-	38647 - 11904: 0xB970,
-	38648 - 11904: 0xE0D8,
-	38649 - 11904: 0xB972,
-	38650 - 11904: 0xE0D6,
-	38651 - 11904: 0xB971,
-	38653 - 11904: 0xE0D7,
-	38655 - 11904: 0xE4BD,
-	38656 - 11904: 0xBBDD,
-	38658 - 11904: 0xE8AF,
-	38659 - 11904: 0x9F52,
-	38660 - 11904: 0xBE5D,
-	38661 - 11904: 0xE8AD,
-	38662 - 11904: 0xBE5E,
-	38663 - 11904: 0xBE5F,
-	38664 - 11904: 0xE8AE,
-	38665 - 11904: 0xBE60,
-	38667 - 11904: 0xEC51,
-	38669 - 11904: 0xC04E,
-	38670 - 11904: 0xC04B,
-	38671 - 11904: 0xC050,
-	38672 - 11904: 0xEC53,
-	38673 - 11904: 0xC04C,
-	38674 - 11904: 0xEC52,
-	38675 - 11904: 0xC04F,
-	38678 - 11904: 0xC04D,
-	38680 - 11904: 0xEEF9,
-	38681 - 11904: 0xEEFB,
-	38683 - 11904: 0x90DB,
-	38684 - 11904: 0xC1F7,
-	38685 - 11904: 0xEEFA,
-	38686 - 11904: 0xC1F8,
-	38687 - 11904: 0xEEF8,
-	38688 - 11904: 0xEEF7,
-	38689 - 11904: 0xA066,
-	38690 - 11904: 0xF177,
-	38691 - 11904: 0xF176,
-	38692 - 11904: 0xC2FC,
-	38693 - 11904: 0xF178,
-	38694 - 11904: 0xF37E,
-	38695 - 11904: 0xC3FA,
-	38696 - 11904: 0xF37D,
-	38697 - 11904: 0xF37A,
-	38698 - 11904: 0xC3F9,
-	38699 - 11904: 0xF37B,
-	38700 - 11904: 0xF37C,
-	38702 - 11904: 0xF548,
-	38703 - 11904: 0xF549,
-	38704 - 11904: 0xC4C5,
-	38705 - 11904: 0x90D2,
-	38706 - 11904: 0xC553,
-	38708 - 11904: 0x876B,
-	38709 - 11904: 0xF66E,
-	38710 - 11904: 0x90D4,
-	38712 - 11904: 0xC551,
-	38713 - 11904: 0xC552,
-	38714 - 11904: 0xF66F,
-	38717 - 11904: 0xC5B4,
-	38718 - 11904: 0xC5B5,
-	38719 - 11904: 0xF771,
-	38720 - 11904: 0x9A5B,
-	38721 - 11904: 0x95FD,
-	38722 - 11904: 0xC645,
-	38723 - 11904: 0xF8CF,
-	38724 - 11904: 0xC647,
-	38726 - 11904: 0xF8CE,
-	38727 - 11904: 0xF8D0,
-	38728 - 11904: 0xC646,
-	38729 - 11904: 0xF957,
-	38730 - 11904: 0x87B1,
-	38731 - 11904: 0xF9AD,
-	38737 - 11904: 0x8BC4,
-	38738 - 11904: 0xAB43,
-	38741 - 11904: 0x8C66,
-	38742 - 11904: 0xB974,
-	38743 - 11904: 0x90DE,
-	38744 - 11904: 0xE4BE,
-	38746 - 11904: 0xE8B0,
-	38747 - 11904: 0xC051,
-	38748 - 11904: 0xC052,
-	38749 - 11904: 0x9CE4,
-	38750 - 11904: 0xAB44,
-	38751 - 11904: 0x90E1,
-	38752 - 11904: 0xBE61,
-	38753 - 11904: 0xC3FB,
-	38754 - 11904: 0xADB1,
-	38758 - 11904: 0xC053,
-	38760 - 11904: 0xC5E2,
-	38761 - 11904: 0xADB2,
-	38762 - 11904: 0xD84D,
-	38764 - 11904: 0xDCA9,
-	38765 - 11904: 0x9E46,
-	38766 - 11904: 0xDCAB,
-	38768 - 11904: 0xDCAA,
-	38769 - 11904: 0x9651,
-	38770 - 11904: 0xE0DD,
-	38771 - 11904: 0xE0DA,
-	38772 - 11904: 0xB975,
-	38774 - 11904: 0xB976,
-	38775 - 11904: 0xE0DB,
-	38776 - 11904: 0xE0DC,
-	38778 - 11904: 0xE4C0,
-	38779 - 11904: 0xE4C5,
-	38780 - 11904: 0xBBDE,
-	38781 - 11904: 0xE4BF,
-	38782 - 11904: 0xE4C1,
-	38783 - 11904: 0xE4C8,
-	38784 - 11904: 0xE4C3,
-	38785 - 11904: 0xE4C7,
-	38786 - 11904: 0xE4C4,
-	38787 - 11904: 0xE4C2,
-	38788 - 11904: 0xE4C6,
-	38789 - 11904: 0xBBDF,
-	38791 - 11904: 0xFB58,
-	38792 - 11904: 0xE8B3,
-	38793 - 11904: 0x90E6,
-	38794 - 11904: 0xE8B1,
-	38795 - 11904: 0xBE63,
-	38797 - 11904: 0xBE62,
-	38798 - 11904: 0xE8B2,
-	38799 - 11904: 0xBE64,
-	38804 - 11904: 0xEC56,
-	38807 - 11904: 0xEC55,
-	38808 - 11904: 0xC054,
-	38809 - 11904: 0xEC54,
-	38810 - 11904: 0xEEFC,
-	38811 - 11904: 0x9650,
-	38812 - 11904: 0xEEFE,
-	38813 - 11904: 0xEF41,
-	38814 - 11904: 0xEF40,
-	38815 - 11904: 0x90E7,
-	38816 - 11904: 0xC1F9,
-	38817 - 11904: 0xEEFD,
-	38818 - 11904: 0xF1A1,
-	38819 - 11904: 0xC2FD,
-	38820 - 11904: 0xF17D,
-	38821 - 11904: 0xF1A2,
-	38822 - 11904: 0xC2FE,
-	38824 - 11904: 0xF17B,
-	38826 - 11904: 0xF17E,
-	38827 - 11904: 0xF17C,
-	38828 - 11904: 0xF179,
-	38829 - 11904: 0xC340,
-	38830 - 11904: 0xF17A,
-	38833 - 11904: 0x90E8,
-	38834 - 11904: 0x9A5D,
-	38835 - 11904: 0xF3A1,
-	38836 - 11904: 0x9F7A,
-	38838 - 11904: 0xF3A3,
-	38839 - 11904: 0xF3A2,
-	38840 - 11904: 0x9B5C,
-	38841 - 11904: 0xF54A,
-	38842 - 11904: 0x9F7C,
-	38843 - 11904: 0xF54B,
-	38845 - 11904: 0xFC52,
-	38846 - 11904: 0x90E9,
-	38847 - 11904: 0xF670,
-	38848 - 11904: 0x90EA,
-	38849 - 11904: 0xC5B7,
-	38850 - 11904: 0x9A5E,
-	38851 - 11904: 0xC5B6,
-	38852 - 11904: 0xF84F,
-	38853 - 11904: 0xF850,
-	38854 - 11904: 0xC648,
-	38855 - 11904: 0xF8D1,
-	38856 - 11904: 0x9F76,
-	38857 - 11904: 0xC669,
-	38859 - 11904: 0xADB3,
-	38860 - 11904: 0xB6B4,
-	38861 - 11904: 0xE4CA,
-	38862 - 11904: 0xE4C9,
-	38863 - 11904: 0xE8B5,
-	38864 - 11904: 0xE8B4,
-	38866 - 11904: 0x90EB,
-	38867 - 11904: 0xC1FA,
-	38868 - 11904: 0xEF43,
-	38869 - 11904: 0xEF42,
-	38870 - 11904: 0xF1A5,
-	38871 - 11904: 0xF1A3,
-	38872 - 11904: 0xF1A6,
-	38873 - 11904: 0xF1A4,
-	38876 - 11904: 0xC3FC,
-	38877 - 11904: 0xF3A4,
-	38878 - 11904: 0xF3A5,
-	38879 - 11904: 0xF3A6,
-	38880 - 11904: 0x90EC,
-	38881 - 11904: 0xF671,
-	38883 - 11904: 0xF772,
-	38885 - 11904: 0xF8D2,
-	38886 - 11904: 0x8BEE,
-	38893 - 11904: 0xADB4,
-	38894 - 11904: 0x90EE,
-	38896 - 11904: 0xEC57,
-	38897 - 11904: 0xEF44,
-	38898 - 11904: 0x91C6,
-	38899 - 11904: 0xADB5,
-	38901 - 11904: 0x90F2,
-	38902 - 11904: 0xBBE0,
-	38904 - 11904: 0xEC58,
-	38905 - 11904: 0xC341,
-	38906 - 11904: 0xF1A7,
-	38907 - 11904: 0xC3FD,
-	38909 - 11904: 0xF54C,
-	38910 - 11904: 0xF54D,
-	38911 - 11904: 0xC554,
-	38912 - 11904: 0xF851,
-	38913 - 11904: 0xADB6,
-	38914 - 11904: 0xB3BB,
-	38915 - 11904: 0xB3BC,
-	38916 - 11904: 0xD84E,
-	38917 - 11904: 0xB6B5,
-	38918 - 11904: 0xB6B6,
-	38919 - 11904: 0xDCAC,
-	38920 - 11904: 0xB6B7,
-	38922 - 11904: 0xB97A,
-	38924 - 11904: 0xB97C,
-	38925 - 11904: 0xE0DF,
-	38926 - 11904: 0xE0E0,
-	38927 - 11904: 0xE0DE,
-	38928 - 11904: 0xB977,
-	38929 - 11904: 0xB978,
-	38930 - 11904: 0xB97B,
-	38931 - 11904: 0xB979,
-	38932 - 11904: 0xFCBC,
-	38933 - 11904: 0x8A74,
-	38934 - 11904: 0xE4CB,
-	38935 - 11904: 0xBBE1,
-	38936 - 11904: 0xBBE2,
-	38939 - 11904: 0xE8BC,
-	38940 - 11904: 0xBE67,
-	38941 - 11904: 0xE8B7,
-	38942 - 11904: 0xE8B6,
-	38943 - 11904: 0x9657,
-	38944 - 11904: 0xE8BB,
-	38945 - 11904: 0xBE65,
-	38947 - 11904: 0x9CEF,
-	38948 - 11904: 0xC05B,
-	38950 - 11904: 0xE8B8,
-	38951 - 11904: 0xE8BD,
-	38952 - 11904: 0xE8BA,
-	38953 - 11904: 0xE8B9,
-	38955 - 11904: 0xBE66,
-	38957 - 11904: 0xC059,
-	38958 - 11904: 0x9FDF,
-	38959 - 11904: 0xEC5A,
-	38960 - 11904: 0xC055,
-	38962 - 11904: 0xEC5B,
-	38963 - 11904: 0x90F7,
-	38964 - 11904: 0x90F6,
-	38965 - 11904: 0xEC59,
-	38967 - 11904: 0xC058,
-	38968 - 11904: 0xC056,
-	38969 - 11904: 0xC05A,
-	38971 - 11904: 0xC057,
-	38977 - 11904: 0xEF45,
-	38979 - 11904: 0xEF4A,
-	38980 - 11904: 0xEF46,
-	38981 - 11904: 0xEF49,
-	38982 - 11904: 0xC1FB,
-	38983 - 11904: 0x9B5E,
-	38984 - 11904: 0xEDD4,
-	38985 - 11904: 0xEF48,
-	38986 - 11904: 0xEF47,
-	38987 - 11904: 0x90F8,
-	38988 - 11904: 0xC344,
-	38989 - 11904: 0xC342,
-	38990 - 11904: 0xC345,
-	38991 - 11904: 0xC343,
-	38992 - 11904: 0xF1A8,
-	38993 - 11904: 0xF1A9,
-	38994 - 11904: 0xF1AA,
-	38995 - 11904: 0xC346,
-	38998 - 11904: 0x8CFC,
-	38999 - 11904: 0xF3AA,
-	39000 - 11904: 0xC440,
-	39001 - 11904: 0xF3A8,
-	39003 - 11904: 0xC441,
-	39004 - 11904: 0xF3A7,
-	39005 - 11904: 0xF3A9,
-	39006 - 11904: 0xC3FE,
-	39007 - 11904: 0xF551,
-	39008 - 11904: 0xF54E,
-	39010 - 11904: 0xF54F,
-	39011 - 11904: 0xF550,
-	39012 - 11904: 0xF672,
-	39013 - 11904: 0xC556,
-	39014 - 11904: 0x90F9,
-	39015 - 11904: 0xC555,
-	39016 - 11904: 0x8CC9,
-	39017 - 11904: 0xF774,
-	39018 - 11904: 0xF773,
-	39019 - 11904: 0xC5B8,
-	39020 - 11904: 0xFA6A,
-	39023 - 11904: 0xC5E3,
-	39024 - 11904: 0xC649,
-	39025 - 11904: 0xC660,
-	39026 - 11904: 0xF958,
-	39027 - 11904: 0xF9AE,
-	39028 - 11904: 0xF9AF,
-	39029 - 11904: 0x8BEF,
-	39080 - 11904: 0xADB7,
-	39081 - 11904: 0xDCAD,
-	39084 - 11904: 0xE0E1,
-	39085 - 11904: 0xE4CC,
-	39086 - 11904: 0xE4CD,
-	39087 - 11904: 0xBBE3,
-	39089 - 11904: 0xBBE4,
-	39090 - 11904: 0xE8BE,
-	39091 - 11904: 0xBE68,
-	39092 - 11904: 0x9FE0,
-	39094 - 11904: 0xC1FC,
-	39095 - 11904: 0x9142,
-	39096 - 11904: 0xF1AB,
-	39097 - 11904: 0x9A62,
-	39098 - 11904: 0xC347,
-	39099 - 11904: 0xF3AD,
-	39100 - 11904: 0xC442,
-	39101 - 11904: 0xF3AC,
-	39102 - 11904: 0xF3AE,
-	39103 - 11904: 0xF3AB,
-	39104 - 11904: 0xF675,
-	39105 - 11904: 0xF552,
-	39106 - 11904: 0xF553,
-	39107 - 11904: 0x9569,
-	39108 - 11904: 0xC4C6,
-	39110 - 11904: 0xF674,
-	39111 - 11904: 0x9144,
-	39112 - 11904: 0x9143,
-	39113 - 11904: 0xF673,
-	39114 - 11904: 0x9141,
-	39115 - 11904: 0xF775,
-	39116 - 11904: 0xF9B0,
-	39118 - 11904: 0x8BF0,
-	39131 - 11904: 0xADB8,
-	39132 - 11904: 0x9660,
-	39134 - 11904: 0x8BF1,
-	39135 - 11904: 0xADB9,
-	39136 - 11904: 0x99F6,
-	39137 - 11904: 0x9149,
-	39138 - 11904: 0xB0A7,
-	39139 - 11904: 0xD448,
-	39141 - 11904: 0xD84F,
-	39142 - 11904: 0x914A,
-	39143 - 11904: 0xB6B8,
-	39145 - 11904: 0xB6BB,
-	39146 - 11904: 0xB6B9,
-	39147 - 11904: 0xDCAE,
-	39148 - 11904: 0x914B,
-	39149 - 11904: 0xB6BD,
-	39151 - 11904: 0xB6BA,
-	39153 - 11904: 0x9A64,
-	39154 - 11904: 0xB6BC,
-	39156 - 11904: 0xB97E,
-	39157 - 11904: 0x8ABF,
-	39158 - 11904: 0xE0E2,
-	39161 - 11904: 0xE0E3,
-	39162 - 11904: 0xE8C0,
-	39164 - 11904: 0xB97D,
-	39165 - 11904: 0xB9A1,
-	39166 - 11904: 0xB9A2,
-	39168 - 11904: 0xE4CF,
-	39170 - 11904: 0xE4CE,
-	39171 - 11904: 0xBBE5,
-	39173 - 11904: 0xBBE6,
-	39175 - 11904: 0xE4D0,
-	39176 - 11904: 0xE8BF,
-	39177 - 11904: 0xBBE8,
-	39178 - 11904: 0xBE69,
-	39180 - 11904: 0xBBE7,
-	39182 - 11904: 0x9A66,
-	39184 - 11904: 0xC05C,
-	39185 - 11904: 0xE8C1,
-	39186 - 11904: 0xBE6B,
-	39187 - 11904: 0xBE6A,
-	39188 - 11904: 0xE8C2,
-	39189 - 11904: 0xE8C5,
-	39190 - 11904: 0xE8C3,
-	39191 - 11904: 0xE8C4,
-	39192 - 11904: 0xBE6C,
-	39193 - 11904: 0x9A67,
-	39194 - 11904: 0xC061,
-	39195 - 11904: 0xC05F,
-	39196 - 11904: 0x9A69,
-	39198 - 11904: 0xC05E,
-	39199 - 11904: 0xEC5D,
-	39201 - 11904: 0xC060,
-	39204 - 11904: 0xEC5C,
-	39205 - 11904: 0xEF4B,
-	39207 - 11904: 0xEC5E,
-	39208 - 11904: 0xC05D,
-	39209 - 11904: 0xEC5F,
-	39210 - 11904: 0xEF4E,
-	39211 - 11904: 0xEF4C,
-	39212 - 11904: 0xEF4D,
-	39213 - 11904: 0xEF52,
-	39214 - 11904: 0xC34B,
-	39215 - 11904: 0xEF51,
-	39216 - 11904: 0xEF54,
-	39217 - 11904: 0xEF53,
-	39218 - 11904: 0xEF50,
-	39219 - 11904: 0xEF4F,
-	39221 - 11904: 0xC1FD,
-	39223 - 11904: 0x9A6A,
-	39224 - 11904: 0x9652,
-	39225 - 11904: 0x914D,
-	39226 - 11904: 0xF1AE,
-	39227 - 11904: 0x9666,
-	39228 - 11904: 0xF1AD,
-	39229 - 11904: 0xC34A,
-	39230 - 11904: 0xC348,
-	39231 - 11904: 0xC349,
-	39232 - 11904: 0x9F7B,
-	39233 - 11904: 0xF1AC,
-	39234 - 11904: 0x9A6B,
-	39235 - 11904: 0xF3B1,
-	39237 - 11904: 0xC443,
-	39239 - 11904: 0xF3B0,
-	39240 - 11904: 0xF3AF,
-	39241 - 11904: 0xC444,
-	39242 - 11904: 0xA06C,
-	39243 - 11904: 0xF558,
-	39244 - 11904: 0xF557,
-	39245 - 11904: 0x9667,
-	39246 - 11904: 0xF555,
-	39248 - 11904: 0xF554,
-	39249 - 11904: 0xC4C8,
-	39250 - 11904: 0xC4C7,
-	39251 - 11904: 0xF559,
-	39252 - 11904: 0xF776,
-	39253 - 11904: 0xC5B9,
-	39254 - 11904: 0xF677,
-	39255 - 11904: 0xC557,
-	39256 - 11904: 0xF676,
-	39257 - 11904: 0xF556,
-	39259 - 11904: 0xF777,
-	39260 - 11904: 0xC5E4,
-	39261 - 11904: 0x9A6C,
-	39262 - 11904: 0xC661,
-	39263 - 11904: 0xF959,
-	39265 - 11904: 0xF9B1,
-	39266 - 11904: 0x9A6D,
-	39267 - 11904: 0x8BF2,
-	39318 - 11904: 0xADBA,
-	39319 - 11904: 0xD850,
-	39320 - 11904: 0xEF55,
-	39321 - 11904: 0xADBB,
-	39323 - 11904: 0x966A,
-	39324 - 11904: 0xE4D2,
-	39325 - 11904: 0xE4D1,
-	39326 - 11904: 0xEC60,
-	39329 - 11904: 0xEF57,
-	39331 - 11904: 0xEF56,
-	39332 - 11904: 0xFCEA,
-	39333 - 11904: 0xC34C,
-	39334 - 11904: 0xF3B2,
-	39335 - 11904: 0xF3B3,
-	39336 - 11904: 0xC4C9,
-	39338 - 11904: 0x966C,
-	39339 - 11904: 0xF9B2,
-	39340 - 11904: 0xB0A8,
-	39341 - 11904: 0xB6BF,
-	39342 - 11904: 0xB6BE,
-	39343 - 11904: 0xE0E4,
-	39344 - 11904: 0xE0E6,
-	39345 - 11904: 0xB9A4,
-	39346 - 11904: 0xE0E5,
-	39347 - 11904: 0xB9A3,
-	39348 - 11904: 0xB9A5,
-	39349 - 11904: 0xE0E7,
-	39352 - 11904: 0x91C4,
-	39353 - 11904: 0xE4D4,
-	39354 - 11904: 0xE4D6,
-	39355 - 11904: 0xE4D5,
-	39356 - 11904: 0x9677,
-	39357 - 11904: 0xE4D8,
-	39361 - 11904: 0xBBE9,
-	39362 - 11904: 0xE4D7,
-	39363 - 11904: 0xE4D3,
-	39364 - 11904: 0x99F4,
-	39365 - 11904: 0x9A6F,
-	39367 - 11904: 0xE4D9,
-	39369 - 11904: 0xE8CC,
-	39371 - 11904: 0xE8CF,
-	39372 - 11904: 0xE8D1,
-	39373 - 11904: 0xE8C7,
-	39374 - 11904: 0xE8CB,
-	39375 - 11904: 0xE8C8,
-	39376 - 11904: 0xBE6E,
-	39377 - 11904: 0xBE71,
-	39378 - 11904: 0xBE73,
-	39379 - 11904: 0xE8C9,
-	39380 - 11904: 0xE8CA,
-	39381 - 11904: 0xBE72,
-	39382 - 11904: 0xE8CD,
-	39383 - 11904: 0xE8D0,
-	39384 - 11904: 0xE8CE,
-	39385 - 11904: 0xBE74,
-	39386 - 11904: 0x9FAB,
-	39387 - 11904: 0xBE70,
-	39388 - 11904: 0xE8C6,
-	39389 - 11904: 0xBE6D,
-	39391 - 11904: 0xBE6F,
-	39392 - 11904: 0x8CBE,
-	39393 - 11904: 0x8EC1,
-	39394 - 11904: 0xC063,
-	39395 - 11904: 0xEC66,
-	39396 - 11904: 0xEC64,
-	39397 - 11904: 0xEC63,
-	39398 - 11904: 0x9555,
-	39399 - 11904: 0xEC69,
-	39401 - 11904: 0xEC68,
-	39402 - 11904: 0xEC67,
-	39404 - 11904: 0xEC62,
-	39405 - 11904: 0xC062,
-	39406 - 11904: 0xEC61,
-	39408 - 11904: 0xEC65,
-	39409 - 11904: 0xC064,
-	39412 - 11904: 0xEF5A,
-	39413 - 11904: 0x9152,
-	39414 - 11904: 0xEF5E,
-	39415 - 11904: 0xEF5B,
-	39416 - 11904: 0xEF5D,
-	39417 - 11904: 0xEF5C,
-	39418 - 11904: 0xEF59,
-	39419 - 11904: 0xEF5F,
-	39420 - 11904: 0xEF62,
-	39421 - 11904: 0xEF60,
-	39422 - 11904: 0xEF61,
-	39423 - 11904: 0xC240,
-	39425 - 11904: 0xC1FE,
-	39426 - 11904: 0xEF58,
-	39427 - 11904: 0xEF63,
-	39428 - 11904: 0xF1B3,
-	39429 - 11904: 0xF1B6,
-	39430 - 11904: 0xF1B8,
-	39431 - 11904: 0xF1B7,
-	39433 - 11904: 0xF1B1,
-	39434 - 11904: 0xF1B5,
-	39435 - 11904: 0xF1B0,
-	39436 - 11904: 0x9153,
-	39437 - 11904: 0xF1B2,
-	39438 - 11904: 0xC34D,
-	39439 - 11904: 0xF1AF,
-	39440 - 11904: 0x9155,
-	39441 - 11904: 0xF1B4,
-	39444 - 11904: 0xF3C0,
-	39445 - 11904: 0xF3B5,
-	39446 - 11904: 0xC445,
-	39449 - 11904: 0xC446,
-	39450 - 11904: 0xF3B4,
-	39451 - 11904: 0xF3B9,
-	39452 - 11904: 0xF3BF,
-	39453 - 11904: 0xF3B7,
-	39454 - 11904: 0xF3BE,
-	39455 - 11904: 0x955D,
-	39456 - 11904: 0xF3BB,
-	39457 - 11904: 0x9671,
-	39458 - 11904: 0xF3BA,
-	39459 - 11904: 0xF3BD,
-	39460 - 11904: 0xF3B8,
-	39461 - 11904: 0xF3B6,
-	39462 - 11904: 0x9C6D,
-	39463 - 11904: 0xF3BC,
-	39465 - 11904: 0xF560,
-	39466 - 11904: 0xF55E,
-	39467 - 11904: 0xC4CA,
-	39468 - 11904: 0xF55D,
-	39469 - 11904: 0xF563,
-	39470 - 11904: 0xF561,
-	39471 - 11904: 0x9673,
-	39472 - 11904: 0xC4CB,
-	39473 - 11904: 0xF55C,
-	39474 - 11904: 0xF55A,
-	39476 - 11904: 0xF55B,
-	39477 - 11904: 0xC4CD,
-	39478 - 11904: 0xF55F,
-	39479 - 11904: 0xC4CC,
-	39480 - 11904: 0xF562,
-	39481 - 11904: 0xF678,
-	39482 - 11904: 0xF67E,
-	39483 - 11904: 0x9154,
-	39484 - 11904: 0x9A71,
-	39485 - 11904: 0xF679,
-	39486 - 11904: 0xC55B,
-	39487 - 11904: 0xF6A1,
-	39488 - 11904: 0xC55A,
-	39489 - 11904: 0xF67D,
-	39490 - 11904: 0xF67C,
-	39491 - 11904: 0xC559,
-	39492 - 11904: 0xF67B,
-	39493 - 11904: 0xC558,
-	39494 - 11904: 0xF67A,
-	39496 - 11904: 0xF77D,
-	39497 - 11904: 0xF7A1,
-	39498 - 11904: 0xF77E,
-	39500 - 11904: 0xF77B,
-	39501 - 11904: 0xC5BB,
-	39502 - 11904: 0xF778,
-	39503 - 11904: 0xF77C,
-	39504 - 11904: 0xF7A3,
-	39506 - 11904: 0xF7A2,
-	39507 - 11904: 0xF779,
-	39508 - 11904: 0xF77A,
-	39509 - 11904: 0xC5BA,
-	39510 - 11904: 0xF852,
-	39511 - 11904: 0xC5E7,
-	39512 - 11904: 0x9156,
-	39513 - 11904: 0xF853,
-	39514 - 11904: 0xC5E5,
-	39515 - 11904: 0xC5E6,
-	39516 - 11904: 0x966D,
-	39518 - 11904: 0xF8D3,
-	39519 - 11904: 0xC64A,
-	39520 - 11904: 0xF976,
-	39522 - 11904: 0xC66A,
-	39523 - 11904: 0x9557,
-	39524 - 11904: 0xF9B3,
-	39525 - 11904: 0xC66B,
-	39526 - 11904: 0xF9B4,
-	39527 - 11904: 0xF9B5,
-	39528 - 11904: 0xF9C3,
-	39529 - 11904: 0xF9C2,
-	39530 - 11904: 0xC67A,
-	39531 - 11904: 0xF9CD,
-	39532 - 11904: 0x89C6,
-	39567 - 11904: 0x89C7,
-	39592 - 11904: 0xB0A9,
-	39595 - 11904: 0xE0E9,
-	39597 - 11904: 0xE0E8,
-	39599 - 11904: 0xBBEA,
-	39600 - 11904: 0xBBEB,
-	39601 - 11904: 0xE4DA,
-	39602 - 11904: 0x8A6A,
-	39603 - 11904: 0xE8D2,
-	39604 - 11904: 0xEC6C,
-	39606 - 11904: 0x8B57,
-	39607 - 11904: 0xBE75,
-	39608 - 11904: 0xC065,
-	39609 - 11904: 0xEC6A,
-	39610 - 11904: 0x9FE1,
-	39611 - 11904: 0xEC6D,
-	39612 - 11904: 0xC066,
-	39613 - 11904: 0x9B5F,
-	39614 - 11904: 0xEF64,
-	39615 - 11904: 0xEC6B,
-	39616 - 11904: 0xF1B9,
-	39617 - 11904: 0xC34E,
-	39618 - 11904: 0xF3C1,
-	39622 - 11904: 0xF566,
-	39623 - 11904: 0xF564,
-	39626 - 11904: 0xF565,
-	39629 - 11904: 0xF6A2,
-	39631 - 11904: 0xC55C,
-	39632 - 11904: 0xF7A4,
-	39633 - 11904: 0xC5EA,
-	39634 - 11904: 0xC5BC,
-	39635 - 11904: 0xC5E8,
-	39636 - 11904: 0xC5E9,
-	39637 - 11904: 0xF8D4,
-	39638 - 11904: 0xC662,
-	39639 - 11904: 0xA05D,
-	39640 - 11904: 0xB0AA,
-	39644 - 11904: 0xF1BA,
-	39647 - 11904: 0xD449,
-	39648 - 11904: 0x915B,
-	39649 - 11904: 0xB9A6,
-	39650 - 11904: 0x915C,
-	39651 - 11904: 0xE4DB,
-	39654 - 11904: 0xBBEC,
-	39655 - 11904: 0xE4DC,
-	39659 - 11904: 0xE8D4,
-	39660 - 11904: 0xE8D3,
-	39661 - 11904: 0xC068,
-	39662 - 11904: 0xBE76,
-	39663 - 11904: 0xBE77,
-	39665 - 11904: 0xE8D7,
-	39666 - 11904: 0xE8D6,
-	39667 - 11904: 0xE8D5,
-	39668 - 11904: 0x915E,
-	39670 - 11904: 0xEC6E,
-	39671 - 11904: 0xEC71,
-	39673 - 11904: 0xEC70,
-	39674 - 11904: 0xEC6F,
-	39675 - 11904: 0xC067,
-	39676 - 11904: 0xEF68,
-	39677 - 11904: 0xEF66,
-	39678 - 11904: 0xEF65,
-	39679 - 11904: 0x9F5C,
-	39681 - 11904: 0xEF67,
-	39682 - 11904: 0x9F57,
-	39683 - 11904: 0xC34F,
-	39684 - 11904: 0xF1BC,
-	39685 - 11904: 0xF1BD,
-	39686 - 11904: 0xC350,
-	39688 - 11904: 0xF1BB,
-	39689 - 11904: 0x9F65,
-	39690 - 11904: 0xF3C3,
-	39691 - 11904: 0xF3C2,
-	39692 - 11904: 0xF3C5,
-	39693 - 11904: 0xC447,
-	39694 - 11904: 0xF3C4,
-	39695 - 11904: 0x9A72,
-	39696 - 11904: 0xF567,
-	39697 - 11904: 0xF569,
-	39698 - 11904: 0xF568,
-	39700 - 11904: 0x9160,
-	39701 - 11904: 0xF6A3,
-	39702 - 11904: 0xF6A6,
-	39703 - 11904: 0xF6A4,
-	39704 - 11904: 0xF6A5,
-	39705 - 11904: 0xF7A5,
-	39706 - 11904: 0xC5BD,
-	39710 - 11904: 0xF854,
-	39711 - 11904: 0xF855,
-	39712 - 11904: 0xF856,
-	39714 - 11904: 0xC64B,
-	39715 - 11904: 0xC663,
-	39716 - 11904: 0xF9B6,
-	39717 - 11904: 0xB0AB,
-	39719 - 11904: 0xBE78,
-	39720 - 11904: 0xC069,
-	39721 - 11904: 0xF1BE,
-	39722 - 11904: 0x9F5E,
-	39723 - 11904: 0xF7A6,
-	39725 - 11904: 0x9161,
-	39726 - 11904: 0xF9C4,
-	39727 - 11904: 0xD44A,
-	39729 - 11904: 0xC67B,
-	39730 - 11904: 0xB0AC,
-	39731 - 11904: 0xEC72,
-	39732 - 11904: 0x9164,
-	39733 - 11904: 0xF1BF,
-	39735 - 11904: 0xF3C6,
-	39737 - 11904: 0x9F41,
-	39738 - 11904: 0xF6A7,
-	39739 - 11904: 0xF7A7,
-	39740 - 11904: 0xB0AD,
-	39742 - 11904: 0xE4DD,
-	39743 - 11904: 0xE4DE,
-	39744 - 11904: 0x9169,
-	39745 - 11904: 0xBBED,
-	39746 - 11904: 0xBBEE,
-	39747 - 11904: 0xE8D9,
-	39748 - 11904: 0xBE7A,
-	39749 - 11904: 0xBE79,
-	39750 - 11904: 0xE8D8,
-	39752 - 11904: 0xEF69,
-	39754 - 11904: 0xF1C0,
-	39755 - 11904: 0xF1C2,
-	39756 - 11904: 0xF1C1,
-	39757 - 11904: 0xC353,
-	39758 - 11904: 0xC352,
-	39759 - 11904: 0xC351,
-	39760 - 11904: 0x9168,
-	39761 - 11904: 0xC55E,
-	39762 - 11904: 0xF6A8,
-	39764 - 11904: 0xC55D,
-	39765 - 11904: 0xF7A9,
-	39766 - 11904: 0xF7A8,
-	39768 - 11904: 0xC64C,
-	39769 - 11904: 0xF8D5,
-	39770 - 11904: 0xB3BD,
-	39771 - 11904: 0xE0EA,
-	39775 - 11904: 0xE4E1,
-	39776 - 11904: 0xE4DF,
-	39777 - 11904: 0xE4E0,
-	39780 - 11904: 0xE8E2,
-	39782 - 11904: 0xE8DD,
-	39783 - 11904: 0xE8DA,
-	39784 - 11904: 0xE8E1,
-	39785 - 11904: 0x9A74,
-	39788 - 11904: 0xE8E3,
-	39791 - 11904: 0xBE7C,
-	39792 - 11904: 0xE8E0,
-	39793 - 11904: 0xE8DC,
-	39796 - 11904: 0xE8DB,
-	39797 - 11904: 0xE8DF,
-	39798 - 11904: 0xE8DE,
-	39799 - 11904: 0xBE7B,
-	39802 - 11904: 0xEC7D,
-	39803 - 11904: 0xEC78,
-	39804 - 11904: 0xEC76,
-	39805 - 11904: 0xECA1,
-	39806 - 11904: 0xEC77,
-	39807 - 11904: 0x96B2,
-	39808 - 11904: 0xEC73,
-	39809 - 11904: 0x9A75,
-	39810 - 11904: 0xEC79,
-	39811 - 11904: 0xFDA5,
-	39813 - 11904: 0xEC74,
-	39814 - 11904: 0xEF72,
-	39815 - 11904: 0xEC75,
-	39816 - 11904: 0xECA2,
-	39819 - 11904: 0x9EE9,
-	39821 - 11904: 0x8BBA,
-	39822 - 11904: 0x916D,
-	39823 - 11904: 0xA060,
-	39824 - 11904: 0xEC7C,
-	39825 - 11904: 0xC06A,
-	39826 - 11904: 0xEC7B,
-	39827 - 11904: 0xEC7A,
-	39829 - 11904: 0xEC7E,
-	39831 - 11904: 0x9FDE,
-	39834 - 11904: 0xEF6A,
-	39835 - 11904: 0xEF6D,
-	39837 - 11904: 0x9FC3,
-	39838 - 11904: 0xEF6C,
-	39839 - 11904: 0x96B5,
-	39840 - 11904: 0xEF74,
-	39841 - 11904: 0xEF6F,
-	39842 - 11904: 0xEF73,
-	39844 - 11904: 0xEF71,
-	39845 - 11904: 0xEF70,
-	39846 - 11904: 0xEF6E,
-	39848 - 11904: 0xEF6B,
-	39850 - 11904: 0xC243,
-	39851 - 11904: 0xC242,
-	39853 - 11904: 0xC244,
-	39854 - 11904: 0xC241,
-	39855 - 11904: 0xEF75,
-	39856 - 11904: 0xA067,
-	39861 - 11904: 0xF1C8,
-	39862 - 11904: 0xF1CB,
-	39864 - 11904: 0xF1C9,
-	39865 - 11904: 0xF1CD,
-	39869 - 11904: 0xF1CE,
-	39871 - 11904: 0xF1C6,
-	39872 - 11904: 0xC358,
-	39873 - 11904: 0xF1C7,
-	39875 - 11904: 0xF1C5,
-	39876 - 11904: 0xF1CC,
-	39878 - 11904: 0xF1C4,
-	39879 - 11904: 0xF1C3,
-	39880 - 11904: 0xC357,
-	39881 - 11904: 0xC355,
-	39882 - 11904: 0xC354,
-	39887 - 11904: 0x96B3,
-	39891 - 11904: 0xF1CA,
-	39892 - 11904: 0xF3CF,
-	39893 - 11904: 0xF3D5,
-	39894 - 11904: 0xC44A,
-	39895 - 11904: 0xF3D0,
-	39897 - 11904: 0xF3D3,
-	39898 - 11904: 0xF3D7,
-	39899 - 11904: 0xC44B,
-	39900 - 11904: 0xF3D2,
-	39901 - 11904: 0x9A76,
-	39902 - 11904: 0xF3CA,
-	39904 - 11904: 0xF3C9,
-	39905 - 11904: 0xF3D6,
-	39906 - 11904: 0xF3CD,
-	39908 - 11904: 0xF3CB,
-	39909 - 11904: 0xF3D4,
-	39910 - 11904: 0xF3CC,
-	39911 - 11904: 0xC449,
-	39912 - 11904: 0xC448,
-	39913 - 11904: 0x95D5,
-	39914 - 11904: 0xF3C7,
-	39915 - 11904: 0xF3C8,
-	39916 - 11904: 0xF3D1,
-	39917 - 11904: 0x9ECA,
-	39920 - 11904: 0xF3CE,
-	39921 - 11904: 0x9A77,
-	39924 - 11904: 0x9A78,
-	39927 - 11904: 0xF56C,
-	39928 - 11904: 0xF56F,
-	39933 - 11904: 0xC356,
-	39935 - 11904: 0x9170,
-	39938 - 11904: 0x916F,
-	39941 - 11904: 0xF56D,
-	39942 - 11904: 0xF573,
-	39943 - 11904: 0xF571,
-	39944 - 11904: 0xF56B,
-	39945 - 11904: 0xF576,
-	39946 - 11904: 0x9FA3,
-	39947 - 11904: 0xF56A,
-	39948 - 11904: 0x9171,
-	39949 - 11904: 0xC4CF,
-	39950 - 11904: 0xF572,
-	39952 - 11904: 0x96B1,
-	39954 - 11904: 0xF56E,
-	39955 - 11904: 0xC4CE,
-	39956 - 11904: 0xF575,
-	39957 - 11904: 0x9F63,
-	39959 - 11904: 0xF574,
-	39963 - 11904: 0x9F67,
-	39964 - 11904: 0xF6AB,
-	39965 - 11904: 0xF6AA,
-	39967 - 11904: 0x8BB9,
-	39968 - 11904: 0x9A7A,
-	39969 - 11904: 0xF6B1,
-	39971 - 11904: 0xF6AD,
-	39972 - 11904: 0xF6B0,
-	39973 - 11904: 0xC560,
-	39974 - 11904: 0x8B56,
-	39976 - 11904: 0xF6AE,
-	39977 - 11904: 0xF6AF,
-	39979 - 11904: 0xF6A9,
-	39980 - 11904: 0xF6AC,
-	39981 - 11904: 0xC55F,
-	39983 - 11904: 0x9ADA,
-	39985 - 11904: 0xC5BF,
-	39986 - 11904: 0xF7B4,
-	39987 - 11904: 0xF7AF,
-	39988 - 11904: 0xF7B3,
-	39989 - 11904: 0x96B0,
-	39990 - 11904: 0xF7B6,
-	39991 - 11904: 0xF7B2,
-	39993 - 11904: 0xF7AE,
-	39994 - 11904: 0x9A7E,
-	39995 - 11904: 0xC5C1,
-	39996 - 11904: 0xF7B1,
-	39997 - 11904: 0xF7B5,
-	39998 - 11904: 0xC5C0,
-	39999 - 11904: 0xF7AC,
-	40000 - 11904: 0xF570,
-	40001 - 11904: 0xF7B0,
-	40004 - 11904: 0xF7AD,
-	40005 - 11904: 0x9DDE,
-	40006 - 11904: 0xF7AA,
-	40008 - 11904: 0xF7AB,
-	40009 - 11904: 0xC5BE,
-	40010 - 11904: 0xF85A,
-	40011 - 11904: 0xF85C,
-	40012 - 11904: 0xF85F,
-	40013 - 11904: 0xF85B,
-	40014 - 11904: 0xF860,
-	40015 - 11904: 0x96AD,
-	40016 - 11904: 0xF859,
-	40018 - 11904: 0xF857,
-	40019 - 11904: 0x96AE,
-	40020 - 11904: 0xC5EB,
-	40021 - 11904: 0xF85D,
-	40022 - 11904: 0xC5ED,
-	40023 - 11904: 0xC5EC,
-	40024 - 11904: 0xF858,
-	40025 - 11904: 0xF85E,
-	40029 - 11904: 0x9EA1,
-	40030 - 11904: 0xF8DA,
-	40031 - 11904: 0xC64D,
-	40032 - 11904: 0xF8DB,
-	40034 - 11904: 0xF8D9,
-	40035 - 11904: 0xF8D6,
-	40038 - 11904: 0xF8D8,
-	40039 - 11904: 0xF8D7,
-	40040 - 11904: 0xF95A,
-	40045 - 11904: 0xF95C,
-	40046 - 11904: 0xF95B,
-	40049 - 11904: 0xF979,
-	40050 - 11904: 0x9E50,
-	40051 - 11904: 0xF978,
-	40052 - 11904: 0xF977,
-	40053 - 11904: 0xF97A,
-	40055 - 11904: 0xC673,
-	40056 - 11904: 0xC674,
-	40057 - 11904: 0xF9CA,
-	40058 - 11904: 0xF9CE,
-	40059 - 11904: 0x96AF,
-	40060 - 11904: 0x8BF4,
-	40165 - 11904: 0xB3BE,
-	40166 - 11904: 0xDCAF,
-	40167 - 11904: 0xE0ED,
-	40169 - 11904: 0xB9A7,
-	40170 - 11904: 0xE0EB,
-	40173 - 11904: 0xE0EC,
-	40177 - 11904: 0xE4E2,
-	40178 - 11904: 0xE4E3,
-	40179 - 11904: 0xBBF1,
-	40180 - 11904: 0xBBEF,
-	40181 - 11904: 0xE4E4,
-	40182 - 11904: 0xBBF0,
-	40183 - 11904: 0xE8E8,
-	40185 - 11904: 0xE8EB,
-	40186 - 11904: 0xE8E5,
-	40187 - 11904: 0xE8EC,
-	40188 - 11904: 0xE8E4,
-	40189 - 11904: 0xE8E6,
-	40191 - 11904: 0xE8E7,
-	40192 - 11904: 0xE8EA,
-	40194 - 11904: 0x9FA4,
-	40195 - 11904: 0xBEA1,
-	40196 - 11904: 0xE8EF,
-	40197 - 11904: 0xE8EE,
-	40198 - 11904: 0xBE7D,
-	40199 - 11904: 0xE8E9,
-	40200 - 11904: 0xE8ED,
-	40201 - 11904: 0xBE7E,
-	40204 - 11904: 0x96BD,
-	40208 - 11904: 0xECAC,
-	40210 - 11904: 0xC06F,
-	40212 - 11904: 0xECA7,
-	40213 - 11904: 0xC06B,
-	40214 - 11904: 0x96F4,
-	40215 - 11904: 0xECA4,
-	40216 - 11904: 0xECAA,
-	40217 - 11904: 0xECAD,
-	40219 - 11904: 0xC070,
-	40221 - 11904: 0xECA9,
-	40222 - 11904: 0xECA6,
-	40223 - 11904: 0xECAE,
-	40224 - 11904: 0xECA5,
-	40225 - 11904: 0x96B8,
-	40226 - 11904: 0xECAB,
-	40227 - 11904: 0xC06C,
-	40229 - 11904: 0xECA3,
-	40230 - 11904: 0xC06D,
-	40232 - 11904: 0xC06E,
-	40233 - 11904: 0xECA8,
-	40237 - 11904: 0xEFA9,
-	40238 - 11904: 0xEF7A,
-	40239 - 11904: 0xEF7B,
-	40240 - 11904: 0xEF7E,
-	40241 - 11904: 0xEF7C,
-	40243 - 11904: 0xEF76,
-	40244 - 11904: 0xFAA1,
-	40246 - 11904: 0xEF79,
-	40247 - 11904: 0xEFA5,
-	40248 - 11904: 0xEF7D,
-	40249 - 11904: 0x91A7,
-	40251 - 11904: 0xC245,
-	40253 - 11904: 0xEFA7,
-	40254 - 11904: 0xEFA4,
-	40255 - 11904: 0xC246,
-	40256 - 11904: 0xEFA6,
-	40257 - 11904: 0xEF77,
-	40258 - 11904: 0xEFA2,
-	40259 - 11904: 0xEFA3,
-	40260 - 11904: 0xA05E,
-	40261 - 11904: 0xEFA1,
-	40265 - 11904: 0x9A7D,
-	40266 - 11904: 0xF1D2,
-	40267 - 11904: 0xF1D4,
-	40268 - 11904: 0xF1D7,
-	40270 - 11904: 0x8948,
-	40271 - 11904: 0xF1D1,
-	40272 - 11904: 0x9EB1,
-	40273 - 11904: 0xC359,
-	40274 - 11904: 0xF1D9,
-	40275 - 11904: 0xF1D0,
-	40276 - 11904: 0xF1DA,
-	40278 - 11904: 0xF1D6,
-	40279 - 11904: 0xF1D8,
-	40280 - 11904: 0xF1DC,
-	40281 - 11904: 0xF1D5,
-	40282 - 11904: 0xF1DD,
-	40283 - 11904: 0xF1D3,
-	40284 - 11904: 0xF1CF,
-	40285 - 11904: 0xC35A,
-	40286 - 11904: 0x9DDB,
-	40287 - 11904: 0xF1DB,
-	40288 - 11904: 0xC35B,
-	40289 - 11904: 0xC44D,
-	40295 - 11904: 0xEF78,
-	40296 - 11904: 0xF3F1,
-	40297 - 11904: 0xF3E8,
-	40298 - 11904: 0xC44F,
-	40299 - 11904: 0xF3E4,
-	40300 - 11904: 0xC450,
-	40301 - 11904: 0x95BF,
-	40302 - 11904: 0x8A73,
-	40303 - 11904: 0xF3ED,
-	40304 - 11904: 0xF3E7,
-	40305 - 11904: 0xF3DD,
-	40306 - 11904: 0xC44E,
-	40307 - 11904: 0xF3EA,
-	40308 - 11904: 0xF3E5,
-	40309 - 11904: 0xF3E6,
-	40311 - 11904: 0xF3D8,
-	40312 - 11904: 0xF3DF,
-	40313 - 11904: 0xF3EE,
-	40315 - 11904: 0xF3EB,
-	40316 - 11904: 0x9EFE,
-	40317 - 11904: 0xF3E3,
-	40318 - 11904: 0x917A,
-	40319 - 11904: 0xF3EF,
-	40320 - 11904: 0xF3DE,
-	40321 - 11904: 0xF3D9,
-	40322 - 11904: 0xF3EC,
-	40323 - 11904: 0x917B,
-	40324 - 11904: 0xF3DB,
-	40325 - 11904: 0xF3E9,
-	40326 - 11904: 0xF3E0,
-	40327 - 11904: 0xF3F0,
-	40328 - 11904: 0xF3DC,
-	40329 - 11904: 0xC44C,
-	40330 - 11904: 0xF3DA,
-	40331 - 11904: 0xF3E1,
-	40332 - 11904: 0xF3E2,
-	40336 - 11904: 0xF57D,
-	40338 - 11904: 0xF57B,
-	40339 - 11904: 0x9AA3,
-	40340 - 11904: 0xF5A2,
-	40342 - 11904: 0xF5AE,
-	40343 - 11904: 0xF5A5,
-	40344 - 11904: 0xF57C,
-	40345 - 11904: 0xF578,
-	40346 - 11904: 0xF5A7,
-	40347 - 11904: 0xF57E,
-	40348 - 11904: 0xF5A3,
-	40349 - 11904: 0xF57A,
-	40350 - 11904: 0xF5AA,
-	40351 - 11904: 0xF577,
-	40352 - 11904: 0xF5A1,
-	40353 - 11904: 0xF5A6,
-	40354 - 11904: 0xF5A8,
-	40355 - 11904: 0xF5AB,
-	40356 - 11904: 0xF579,
-	40357 - 11904: 0x96C2,
-	40358 - 11904: 0xF5AF,
-	40359 - 11904: 0xF5B0,
-	40360 - 11904: 0xF5A9,
-	40361 - 11904: 0xF5AD,
-	40362 - 11904: 0xF5A4,
-	40363 - 11904: 0x9F77,
-	40364 - 11904: 0xF6C1,
-	40365 - 11904: 0xF6C4,
-	40367 - 11904: 0xC561,
-	40369 - 11904: 0xF6C3,
-	40370 - 11904: 0xF6C8,
-	40371 - 11904: 0xF6C6,
-	40372 - 11904: 0xC562,
-	40373 - 11904: 0xF6BD,
-	40374 - 11904: 0xF6B3,
-	40375 - 11904: 0xF6B2,
-	40376 - 11904: 0xC564,
-	40377 - 11904: 0xF6BF,
-	40378 - 11904: 0xF6C0,
-	40379 - 11904: 0xF6BC,
-	40380 - 11904: 0xF6B4,
-	40381 - 11904: 0x9AA4,
-	40382 - 11904: 0xF6B9,
-	40383 - 11904: 0xF5AC,
-	40384 - 11904: 0x9AA5,
-	40385 - 11904: 0xF6B5,
-	40386 - 11904: 0xC563,
-	40387 - 11904: 0xF6BB,
-	40388 - 11904: 0x91A1,
-	40389 - 11904: 0xF6BA,
-	40391 - 11904: 0xF6B6,
-	40392 - 11904: 0xF6C2,
-	40393 - 11904: 0x89B8,
-	40394 - 11904: 0xF6B7,
-	40395 - 11904: 0xF7BB,
-	40396 - 11904: 0xF6C5,
-	40397 - 11904: 0xF6C7,
-	40398 - 11904: 0xF6BE,
-	40399 - 11904: 0xF6B8,
-	40400 - 11904: 0xF7BC,
-	40401 - 11904: 0xF7BE,
-	40402 - 11904: 0xF7B8,
-	40403 - 11904: 0xC5C2,
-	40404 - 11904: 0x9173,
-	40405 - 11904: 0xF7C5,
-	40406 - 11904: 0xF7C3,
-	40407 - 11904: 0xC5C3,
-	40408 - 11904: 0xF7C2,
-	40409 - 11904: 0xF7C1,
-	40410 - 11904: 0xF7BA,
-	40411 - 11904: 0xF7B7,
-	40412 - 11904: 0xF7BD,
-	40413 - 11904: 0xF7C6,
-	40414 - 11904: 0xF7B9,
-	40415 - 11904: 0xF7BF,
-	40417 - 11904: 0xF869,
-	40418 - 11904: 0xF86E,
-	40419 - 11904: 0xF864,
-	40420 - 11904: 0xF867,
-	40421 - 11904: 0xC5EE,
-	40422 - 11904: 0xF86B,
-	40424 - 11904: 0xF872,
-	40425 - 11904: 0xF7C0,
-	40427 - 11904: 0xF865,
-	40428 - 11904: 0xF86F,
-	40429 - 11904: 0xF873,
-	40430 - 11904: 0xF86A,
-	40431 - 11904: 0xF863,
-	40432 - 11904: 0xF86D,
-	40434 - 11904: 0xF86C,
-	40435 - 11904: 0xF871,
-	40436 - 11904: 0xF870,
-	40437 - 11904: 0xF7C4,
-	40438 - 11904: 0xF868,
-	40439 - 11904: 0xF862,
-	40440 - 11904: 0xF866,
-	40441 - 11904: 0xC64E,
-	40442 - 11904: 0xC64F,
-	40443 - 11904: 0xF861,
-	40444 - 11904: 0x9AA6,
-	40445 - 11904: 0xF8E6,
-	40446 - 11904: 0xF8DD,
-	40447 - 11904: 0xF8E5,
-	40448 - 11904: 0xF8E2,
-	40449 - 11904: 0xF8E3,
-	40450 - 11904: 0xF8DC,
-	40451 - 11904: 0xF8DF,
-	40452 - 11904: 0xF8E7,
-	40453 - 11904: 0xF8E1,
-	40454 - 11904: 0xF8E0,
-	40455 - 11904: 0xF8DE,
-	40457 - 11904: 0xF8E4,
-	40458 - 11904: 0x89BD,
-	40459 - 11904: 0xF95D,
-	40460 - 11904: 0x89B9,
-	40461 - 11904: 0xF95E,
-	40462 - 11904: 0x917D,
-	40463 - 11904: 0xF960,
-	40464 - 11904: 0xF95F,
-	40465 - 11904: 0xF962,
-	40466 - 11904: 0xF961,
-	40467 - 11904: 0xF97C,
-	40468 - 11904: 0xF97B,
-	40469 - 11904: 0xF9B7,
-	40471 - 11904: 0xF9B8,
-	40472 - 11904: 0x96BB,
-	40473 - 11904: 0xF9C5,
-	40474 - 11904: 0xC678,
-	40475 - 11904: 0xC67C,
-	40476 - 11904: 0x9FF2,
-	40477 - 11904: 0xF9CF,
-	40478 - 11904: 0xC67D,
-	40479 - 11904: 0x8BF5,
-	40565 - 11904: 0xB3BF,
-	40569 - 11904: 0xC4D0,
-	40570 - 11904: 0xF6C9,
-	40571 - 11904: 0x9AA9,
-	40572 - 11904: 0xC650,
-	40573 - 11904: 0xC651,
-	40575 - 11904: 0xB3C0,
-	40576 - 11904: 0xE0EE,
-	40577 - 11904: 0x9F54,
-	40578 - 11904: 0xB9A8,
-	40579 - 11904: 0xE8F0,
-	40580 - 11904: 0x9FE3,
-	40581 - 11904: 0x9EED,
-	40582 - 11904: 0xECB0,
-	40583 - 11904: 0xECB1,
-	40584 - 11904: 0xECAF,
-	40585 - 11904: 0xEFAB,
-	40586 - 11904: 0xEFAA,
-	40587 - 11904: 0xC247,
-	40588 - 11904: 0xF1DF,
-	40589 - 11904: 0xEFAC,
-	40590 - 11904: 0xF1DE,
-	40592 - 11904: 0x91AA,
-	40593 - 11904: 0xF3F3,
-	40594 - 11904: 0xC451,
-	40595 - 11904: 0xC453,
-	40596 - 11904: 0xF3F2,
-	40597 - 11904: 0x91AB,
-	40598 - 11904: 0xA070,
-	40599 - 11904: 0xC452,
-	40600 - 11904: 0x9F6D,
-	40601 - 11904: 0xF5B1,
-	40602 - 11904: 0xF5B3,
-	40603 - 11904: 0xF5B2,
-	40604 - 11904: 0xF6CA,
-	40605 - 11904: 0xC565,
-	40606 - 11904: 0x91AC,
-	40607 - 11904: 0xC5EF,
-	40608 - 11904: 0xF8E8,
-	40609 - 11904: 0xF963,
-	40610 - 11904: 0x91AD,
-	40612 - 11904: 0xF9D2,
-	40613 - 11904: 0xB3C1,
-	40614 - 11904: 0xA0FD,
-	40615 - 11904: 0xE4E5,
-	40616 - 11904: 0x9FE2,
-	40617 - 11904: 0xBEA2,
-	40618 - 11904: 0x91AF,
-	40619 - 11904: 0x9E41,
-	40620 - 11904: 0x9AAA,
-	40621 - 11904: 0xECB3,
-	40622 - 11904: 0xECB2,
-	40623 - 11904: 0x91B0,
-	40624 - 11904: 0xEFAD,
-	40625 - 11904: 0x9AAB,
-	40628 - 11904: 0xC454,
-	40629 - 11904: 0xC4D1,
-	40630 - 11904: 0xF7C7,
-	40631 - 11904: 0xF9CB,
-	40635 - 11904: 0xB3C2,
-	40636 - 11904: 0xBBF2,
-	40637 - 11904: 0x9AAC,
-	40638 - 11904: 0xBEA3,
-	40639 - 11904: 0x9A4A,
-	40640 - 11904: 0xF3F4,
-	40641 - 11904: 0x91B2,
-	40642 - 11904: 0xF874,
-	40643 - 11904: 0xB6C0,
-	40644 - 11904: 0x8BF6,
-	40646 - 11904: 0x9AAD,
-	40647 - 11904: 0x89B6,
-	40648 - 11904: 0xEFAE,
-	40652 - 11904: 0xC664,
-	40653 - 11904: 0xB6C1,
-	40654 - 11904: 0xBEA4,
-	40655 - 11904: 0xC248,
-	40656 - 11904: 0xF875,
-	40657 - 11904: 0xB6C2,
-	40659 - 11904: 0xE8F1,
-	40660 - 11904: 0xC072,
-	40661 - 11904: 0xECB4,
-	40662 - 11904: 0xECB5,
-	40664 - 11904: 0xC071,
-	40666 - 11904: 0xEFAF,
-	40667 - 11904: 0xC24C,
-	40668 - 11904: 0xC24A,
-	40669 - 11904: 0xC24B,
-	40670 - 11904: 0xC249,
-	40671 - 11904: 0xF1E0,
-	40672 - 11904: 0xC35C,
-	40674 - 11904: 0x9AAF,
-	40676 - 11904: 0xF5B5,
-	40677 - 11904: 0xF5B4,
-	40678 - 11904: 0xF5B7,
-	40679 - 11904: 0xF5B6,
-	40680 - 11904: 0xC4D2,
-	40683 - 11904: 0xF6CB,
-	40685 - 11904: 0xF6CD,
-	40686 - 11904: 0xF6CC,
-	40687 - 11904: 0xC566,
-	40688 - 11904: 0xF7C8,
-	40689 - 11904: 0x9AB0,
-	40690 - 11904: 0xF876,
-	40691 - 11904: 0xF877,
-	40692 - 11904: 0xC5F0,
-	40693 - 11904: 0xF964,
-	40694 - 11904: 0xF97D,
-	40695 - 11904: 0xC675,
-	40696 - 11904: 0x9AB1,
-	40697 - 11904: 0xDCB0,
-	40698 - 11904: 0xECB6,
-	40699 - 11904: 0xEFB0,
-	40700 - 11904: 0xF3F5,
-	40701 - 11904: 0xE0EF,
-	40702 - 11904: 0x9AA1,
-	40703 - 11904: 0xEFB1,
-	40704 - 11904: 0xF1E2,
-	40705 - 11904: 0xF1E1,
-	40706 - 11904: 0x91B9,
-	40710 - 11904: 0xF878,
-	40711 - 11904: 0xC652,
-	40712 - 11904: 0x91BA,
-	40713 - 11904: 0xF965,
-	40714 - 11904: 0xF97E,
-	40718 - 11904: 0xB9A9,
-	40719 - 11904: 0xE8F2,
-	40720 - 11904: 0xE8F3,
-	40722 - 11904: 0xECB7,
-	40723 - 11904: 0xB9AA,
-	40725 - 11904: 0xC35D,
-	40726 - 11904: 0xF1E3,
-	40727 - 11904: 0x9F66,
-	40728 - 11904: 0xF6CF,
-	40729 - 11904: 0xC567,
-	40730 - 11904: 0xF6D0,
-	40731 - 11904: 0xF6CE,
-	40732 - 11904: 0xF879,
-	40734 - 11904: 0xF8E9,
-	40736 - 11904: 0xB9AB,
-	40738 - 11904: 0xEFB4,
-	40739 - 11904: 0xEFB3,
-	40740 - 11904: 0xEFB2,
-	40741 - 11904: 0xF1E4,
-	40742 - 11904: 0xA041,
-	40743 - 11904: 0x8BB7,
-	40744 - 11904: 0xF1E8,
-	40745 - 11904: 0xF1E7,
-	40746 - 11904: 0xF1E6,
-	40747 - 11904: 0xF1E5,
-	40748 - 11904: 0xC35E,
-	40749 - 11904: 0xF3F6,
-	40750 - 11904: 0xF5B9,
-	40751 - 11904: 0xC4D3,
-	40752 - 11904: 0xF5B8,
-	40753 - 11904: 0xF6D1,
-	40754 - 11904: 0xF7CB,
-	40755 - 11904: 0xF7CA,
-	40756 - 11904: 0xC5C4,
-	40757 - 11904: 0xF7C9,
-	40758 - 11904: 0xF87C,
-	40759 - 11904: 0xF87B,
-	40760 - 11904: 0xF87A,
-	40761 - 11904: 0x91C0,
-	40763 - 11904: 0xBBF3,
-	40765 - 11904: 0xECB8,
-	40766 - 11904: 0xC24D,
-	40768 - 11904: 0xF3F7,
-	40769 - 11904: 0xF3F8,
-	40770 - 11904: 0xF7CC,
-	40771 - 11904: 0xF87D,
-	40772 - 11904: 0x9AB3,
-	40773 - 11904: 0x91C3,
-	40774 - 11904: 0xF8EA,
-	40775 - 11904: 0xF966,
-	40776 - 11904: 0xF9B9,
-	40777 - 11904: 0xF9D4,
-	40778 - 11904: 0xBBF4,
-	40779 - 11904: 0xC24E,
-	40780 - 11904: 0xF1E9,
-	40781 - 11904: 0xF3F9,
-	40782 - 11904: 0xF6D2,
-	40783 - 11904: 0xF87E,
-	40784 - 11904: 0xA0FC,
-	40786 - 11904: 0xBEA6,
-	40787 - 11904: 0x9FEE,
-	40788 - 11904: 0xEFB5,
-	40789 - 11904: 0xF1EA,
-	40790 - 11904: 0xF3FA,
-	40791 - 11904: 0xF3FB,
-	40792 - 11904: 0xF3FC,
-	40793 - 11904: 0xF5BE,
-	40794 - 11904: 0x9F69,
-	40795 - 11904: 0xF5BA,
-	40796 - 11904: 0xC568,
-	40797 - 11904: 0xF5BD,
-	40798 - 11904: 0xF5BC,
-	40799 - 11904: 0xC4D4,
-	40800 - 11904: 0xF5BB,
-	40801 - 11904: 0xC4D6,
-	40802 - 11904: 0x91C8,
-	40803 - 11904: 0xC4D5,
-	40804 - 11904: 0xF6D4,
-	40805 - 11904: 0xF6D3,
-	40806 - 11904: 0xC569,
-	40807 - 11904: 0xC56A,
-	40809 - 11904: 0x91C9,
-	40810 - 11904: 0xC5C6,
-	40811 - 11904: 0xF7CD,
-	40812 - 11904: 0xC5C5,
-	40814 - 11904: 0xF8A3,
-	40815 - 11904: 0xF8A4,
-	40816 - 11904: 0xF8A2,
-	40817 - 11904: 0xF8A1,
-	40818 - 11904: 0xC654,
-	40820 - 11904: 0xF8EB,
-	40821 - 11904: 0xF8EC,
-	40822 - 11904: 0xF8ED,
-	40823 - 11904: 0xC653,
-	40824 - 11904: 0xF967,
-	40825 - 11904: 0xF96A,
-	40826 - 11904: 0xF969,
-	40827 - 11904: 0xF968,
-	40830 - 11904: 0xF9D3,
-	40831 - 11904: 0x8DE6,
-	40845 - 11904: 0xC073,
-	40846 - 11904: 0x91CB,
-	40848 - 11904: 0xC365,
-	40849 - 11904: 0xF5BF,
-	40850 - 11904: 0xF6D5,
-	40852 - 11904: 0xC5C7,
-	40853 - 11904: 0xF7CE,
-	40854 - 11904: 0x87AC,
-	40855 - 11904: 0x87A4,
-	40856 - 11904: 0xF9D5,
-	40857 - 11904: 0x89C8,
-	40860 - 11904: 0xC074,
-	40863 - 11904: 0x8DAA,
-	40864 - 11904: 0xEFB6,
-	40866 - 11904: 0xF7CF,
-	40868 - 11904: 0xF9A1,
-	40869 - 11904: 0x9FDD,
-	40870 - 11904: 0x8C43,
-	40871 - 11904: 0x8C6D,
-	40872 - 11904: 0x8C74,
-	40873 - 11904: 0x8CB7,
-	40874 - 11904: 0x8CB9,
-	40875 - 11904: 0x8CBB,
-	40876 - 11904: 0x8CC0,
-	40877 - 11904: 0x8CD7,
-	40878 - 11904: 0x8CD8,
-	40879 - 11904: 0x8CDA,
-	40880 - 11904: 0xC8A1,
-	40881 - 11904: 0xC8A3,
-	40882 - 11904: 0x8CED,
-	40883 - 11904: 0x8D48,
-	40903 - 11904: 0x87C2,
-	40904 - 11904: 0x87D2,
-	40905 - 11904: 0x87D6,
-	40906 - 11904: 0x87DA,
-	40907 - 11904: 0x87DF,
-}
-
-const encode2Low, encode2High = 7870, 10046
-
-var encode2 = [...]uint16{
-	7870 - 7870:  0x8863,
-	7871 - 7870:  0x88A4,
-	7872 - 7870:  0x8865,
-	7873 - 7870:  0x88A6,
-	8211 - 7870:  0xA156,
-	8212 - 7870:  0xA158,
-	8216 - 7870:  0xA1A5,
-	8217 - 7870:  0xA1A6,
-	8220 - 7870:  0xA1A7,
-	8221 - 7870:  0xA1A8,
-	8229 - 7870:  0xA14C,
-	8230 - 7870:  0xA14B,
-	8231 - 7870:  0xA145,
-	8242 - 7870:  0xA1AC,
-	8245 - 7870:  0xA1AB,
-	8251 - 7870:  0xA1B0,
-	8364 - 7870:  0xA3E1,
-	8451 - 7870:  0xA24A,
-	8453 - 7870:  0xA1C1,
-	8457 - 7870:  0xA24B,
-	8470 - 7870:  0xC8D2,
-	8481 - 7870:  0xC8D3,
-	8544 - 7870:  0xA2B9,
-	8545 - 7870:  0xA2BA,
-	8546 - 7870:  0xA2BB,
-	8547 - 7870:  0xA2BC,
-	8548 - 7870:  0xA2BD,
-	8549 - 7870:  0xA2BE,
-	8550 - 7870:  0xA2BF,
-	8551 - 7870:  0xA2C0,
-	8552 - 7870:  0xA2C1,
-	8553 - 7870:  0xA2C2,
-	8560 - 7870:  0xC6B5,
-	8561 - 7870:  0xC6B6,
-	8562 - 7870:  0xC6B7,
-	8563 - 7870:  0xC6B8,
-	8564 - 7870:  0xC6B9,
-	8565 - 7870:  0xC6BA,
-	8566 - 7870:  0xC6BB,
-	8567 - 7870:  0xC6BC,
-	8568 - 7870:  0xC6BD,
-	8569 - 7870:  0xC6BE,
-	8592 - 7870:  0xA1F6,
-	8593 - 7870:  0xA1F4,
-	8594 - 7870:  0xA1F7,
-	8595 - 7870:  0xA1F5,
-	8598 - 7870:  0xA1F8,
-	8599 - 7870:  0xA1F9,
-	8600 - 7870:  0xA1FB,
-	8601 - 7870:  0xA1FA,
-	8632 - 7870:  0xC877,
-	8633 - 7870:  0xC878,
-	8679 - 7870:  0xC876,
-	8725 - 7870:  0xA241,
-	8730 - 7870:  0xA1D4,
-	8734 - 7870:  0xA1DB,
-	8735 - 7870:  0xA1E8,
-	8736 - 7870:  0xA1E7,
-	8739 - 7870:  0xA1FD,
-	8741 - 7870:  0xA1FC,
-	8745 - 7870:  0xA1E4,
-	8746 - 7870:  0xA1E5,
-	8747 - 7870:  0xA1EC,
-	8750 - 7870:  0xA1ED,
-	8756 - 7870:  0xA1EF,
-	8757 - 7870:  0xA1EE,
-	8786 - 7870:  0xA1DC,
-	8800 - 7870:  0xA1DA,
-	8801 - 7870:  0xA1DD,
-	8806 - 7870:  0xA1D8,
-	8807 - 7870:  0xA1D9,
-	8853 - 7870:  0xA1F2,
-	8857 - 7870:  0xA1F3,
-	8869 - 7870:  0xA1E6,
-	8895 - 7870:  0xA1E9,
-	9178 - 7870:  0x88A9,
-	9179 - 7870:  0x88AA,
-	9216 - 7870:  0xA3C0,
-	9217 - 7870:  0xA3C1,
-	9218 - 7870:  0xA3C2,
-	9219 - 7870:  0xA3C3,
-	9220 - 7870:  0xA3C4,
-	9221 - 7870:  0xA3C5,
-	9222 - 7870:  0xA3C6,
-	9223 - 7870:  0xA3C7,
-	9224 - 7870:  0xA3C8,
-	9225 - 7870:  0xA3C9,
-	9226 - 7870:  0xA3CA,
-	9227 - 7870:  0xA3CB,
-	9228 - 7870:  0xA3CC,
-	9229 - 7870:  0xA3CD,
-	9230 - 7870:  0xA3CE,
-	9231 - 7870:  0xA3CF,
-	9232 - 7870:  0xA3D0,
-	9233 - 7870:  0xA3D1,
-	9234 - 7870:  0xA3D2,
-	9235 - 7870:  0xA3D3,
-	9236 - 7870:  0xA3D4,
-	9237 - 7870:  0xA3D5,
-	9238 - 7870:  0xA3D6,
-	9239 - 7870:  0xA3D7,
-	9240 - 7870:  0xA3D8,
-	9241 - 7870:  0xA3D9,
-	9242 - 7870:  0xA3DA,
-	9243 - 7870:  0xA3DB,
-	9244 - 7870:  0xA3DC,
-	9245 - 7870:  0xA3DD,
-	9246 - 7870:  0xA3DE,
-	9247 - 7870:  0xA3DF,
-	9249 - 7870:  0xA3E0,
-	9312 - 7870:  0xC6A1,
-	9313 - 7870:  0xC6A2,
-	9314 - 7870:  0xC6A3,
-	9315 - 7870:  0xC6A4,
-	9316 - 7870:  0xC6A5,
-	9317 - 7870:  0xC6A6,
-	9318 - 7870:  0xC6A7,
-	9319 - 7870:  0xC6A8,
-	9320 - 7870:  0xC6A9,
-	9321 - 7870:  0xC6AA,
-	9332 - 7870:  0xC6AB,
-	9333 - 7870:  0xC6AC,
-	9334 - 7870:  0xC6AD,
-	9335 - 7870:  0xC6AE,
-	9336 - 7870:  0xC6AF,
-	9337 - 7870:  0xC6B0,
-	9338 - 7870:  0xC6B1,
-	9339 - 7870:  0xC6B2,
-	9340 - 7870:  0xC6B3,
-	9341 - 7870:  0xC6B4,
-	9472 - 7870:  0xA277,
-	9474 - 7870:  0xA278,
-	9484 - 7870:  0xA27A,
-	9488 - 7870:  0xA27B,
-	9492 - 7870:  0xA27C,
-	9496 - 7870:  0xA27D,
-	9500 - 7870:  0xA275,
-	9508 - 7870:  0xA274,
-	9516 - 7870:  0xA273,
-	9524 - 7870:  0xA272,
-	9532 - 7870:  0xA271,
-	9552 - 7870:  0xF9F9,
-	9553 - 7870:  0xF9F8,
-	9554 - 7870:  0xF9E6,
-	9555 - 7870:  0xF9EF,
-	9556 - 7870:  0xF9DD,
-	9557 - 7870:  0xF9E8,
-	9558 - 7870:  0xF9F1,
-	9559 - 7870:  0xF9DF,
-	9560 - 7870:  0xF9EC,
-	9561 - 7870:  0xF9F5,
-	9562 - 7870:  0xF9E3,
-	9563 - 7870:  0xF9EE,
-	9564 - 7870:  0xF9F7,
-	9565 - 7870:  0xF9E5,
-	9566 - 7870:  0xF9E9,
-	9567 - 7870:  0xF9F2,
-	9568 - 7870:  0xF9E0,
-	9569 - 7870:  0xF9EB,
-	9570 - 7870:  0xF9F4,
-	9571 - 7870:  0xF9E2,
-	9572 - 7870:  0xF9E7,
-	9573 - 7870:  0xF9F0,
-	9574 - 7870:  0xF9DE,
-	9575 - 7870:  0xF9ED,
-	9576 - 7870:  0xF9F6,
-	9577 - 7870:  0xF9E4,
-	9578 - 7870:  0xF9EA,
-	9579 - 7870:  0xF9F3,
-	9580 - 7870:  0xF9E1,
-	9581 - 7870:  0xF9FA,
-	9582 - 7870:  0xF9FB,
-	9583 - 7870:  0xF9FD,
-	9584 - 7870:  0xF9FC,
-	9585 - 7870:  0xA2AC,
-	9586 - 7870:  0xA2AD,
-	9587 - 7870:  0xA2AE,
-	9588 - 7870:  0xA15A,
-	9601 - 7870:  0xA262,
-	9602 - 7870:  0xA263,
-	9603 - 7870:  0xA264,
-	9604 - 7870:  0xA265,
-	9605 - 7870:  0xA266,
-	9606 - 7870:  0xA267,
-	9607 - 7870:  0xA268,
-	9608 - 7870:  0xA269,
-	9609 - 7870:  0xA270,
-	9610 - 7870:  0xA26F,
-	9611 - 7870:  0xA26E,
-	9612 - 7870:  0xA26D,
-	9613 - 7870:  0xA26C,
-	9614 - 7870:  0xA26B,
-	9615 - 7870:  0xA26A,
-	9620 - 7870:  0xA276,
-	9621 - 7870:  0xA279,
-	9632 - 7870:  0xA1BD,
-	9633 - 7870:  0xA1BC,
-	9650 - 7870:  0xA1B6,
-	9651 - 7870:  0xA1B5,
-	9660 - 7870:  0xA1BF,
-	9661 - 7870:  0xA1BE,
-	9670 - 7870:  0xA1BB,
-	9671 - 7870:  0xA1BA,
-	9675 - 7870:  0xA1B3,
-	9678 - 7870:  0xA1B7,
-	9679 - 7870:  0xA1B4,
-	9698 - 7870:  0xA2A8,
-	9699 - 7870:  0xA2A9,
-	9700 - 7870:  0xA2AB,
-	9701 - 7870:  0xA2AA,
-	9733 - 7870:  0xA1B9,
-	9734 - 7870:  0xA1B8,
-	9792 - 7870:  0xA1F0,
-	9794 - 7870:  0xA1F1,
-	10045 - 7870: 0xC6E6,
-}
-
-const encode3Low, encode3High = 167, 1106
-
-var encode3 = [...]uint16{
-	167 - 167:  0xA1B1,
-	168 - 167:  0xC6D8,
-	175 - 167:  0xA1C2,
-	176 - 167:  0xA258,
-	177 - 167:  0xA1D3,
-	183 - 167:  0xA150,
-	192 - 167:  0x8859,
-	193 - 167:  0x8857,
-	200 - 167:  0x885D,
-	201 - 167:  0x885B,
-	202 - 167:  0x8866,
-	210 - 167:  0x8861,
-	211 - 167:  0x885F,
-	215 - 167:  0xA1D1,
-	224 - 167:  0x886A,
-	225 - 167:  0x8868,
-	232 - 167:  0x886F,
-	233 - 167:  0x886D,
-	234 - 167:  0x88A7,
-	236 - 167:  0x8873,
-	237 - 167:  0x8871,
-	242 - 167:  0x8877,
-	243 - 167:  0x8875,
-	247 - 167:  0xA1D2,
-	248 - 167:  0xC8FB,
-	249 - 167:  0x887B,
-	250 - 167:  0x8879,
-	252 - 167:  0x88A2,
-	256 - 167:  0x8856,
-	257 - 167:  0x8867,
-	274 - 167:  0x885A,
-	275 - 167:  0x886C,
-	282 - 167:  0x885C,
-	283 - 167:  0x886E,
-	299 - 167:  0x8870,
-	331 - 167:  0xC8FC,
-	332 - 167:  0x885E,
-	333 - 167:  0x8874,
-	339 - 167:  0xC8FA,
-	363 - 167:  0x8878,
-	461 - 167:  0x8858,
-	462 - 167:  0x8869,
-	464 - 167:  0x8872,
-	465 - 167:  0x8860,
-	466 - 167:  0x8876,
-	468 - 167:  0x887A,
-	470 - 167:  0x887C,
-	472 - 167:  0x887D,
-	474 - 167:  0x887E,
-	476 - 167:  0x88A1,
-	592 - 167:  0xC8F6,
-	593 - 167:  0x886B,
-	596 - 167:  0xC8F8,
-	603 - 167:  0xC8F7,
-	609 - 167:  0x88A8,
-	618 - 167:  0xC8FE,
-	629 - 167:  0xC8F9,
-	643 - 167:  0xC8F5,
-	650 - 167:  0xC8FD,
-	710 - 167:  0xC6D9,
-	711 - 167:  0xA3BE,
-	713 - 167:  0xA3BC,
-	714 - 167:  0xA3BD,
-	715 - 167:  0xA3BF,
-	717 - 167:  0xA1C5,
-	729 - 167:  0xA3BB,
-	913 - 167:  0xA344,
-	914 - 167:  0xA345,
-	915 - 167:  0xA346,
-	916 - 167:  0xA347,
-	917 - 167:  0xA348,
-	918 - 167:  0xA349,
-	919 - 167:  0xA34A,
-	920 - 167:  0xA34B,
-	921 - 167:  0xA34C,
-	922 - 167:  0xA34D,
-	923 - 167:  0xA34E,
-	924 - 167:  0xA34F,
-	925 - 167:  0xA350,
-	926 - 167:  0xA351,
-	927 - 167:  0xA352,
-	928 - 167:  0xA353,
-	929 - 167:  0xA354,
-	931 - 167:  0xA355,
-	932 - 167:  0xA356,
-	933 - 167:  0xA357,
-	934 - 167:  0xA358,
-	935 - 167:  0xA359,
-	936 - 167:  0xA35A,
-	937 - 167:  0xA35B,
-	945 - 167:  0xA35C,
-	946 - 167:  0xA35D,
-	947 - 167:  0xA35E,
-	948 - 167:  0xA35F,
-	949 - 167:  0xA360,
-	950 - 167:  0xA361,
-	951 - 167:  0xA362,
-	952 - 167:  0xA363,
-	953 - 167:  0xA364,
-	954 - 167:  0xA365,
-	955 - 167:  0xA366,
-	956 - 167:  0xA367,
-	957 - 167:  0xA368,
-	958 - 167:  0xA369,
-	959 - 167:  0xA36A,
-	960 - 167:  0xA36B,
-	961 - 167:  0xA36C,
-	963 - 167:  0xA36D,
-	964 - 167:  0xA36E,
-	965 - 167:  0xA36F,
-	966 - 167:  0xA370,
-	967 - 167:  0xA371,
-	968 - 167:  0xA372,
-	969 - 167:  0xA373,
-	1025 - 167: 0xC7F9,
-	1040 - 167: 0xC7F3,
-	1041 - 167: 0xC7F4,
-	1042 - 167: 0xC7F5,
-	1043 - 167: 0xC7F6,
-	1044 - 167: 0xC7F7,
-	1045 - 167: 0xC7F8,
-	1046 - 167: 0xC7FA,
-	1047 - 167: 0xC7FB,
-	1048 - 167: 0xC7FC,
-	1049 - 167: 0xC7FD,
-	1050 - 167: 0xC7FE,
-	1051 - 167: 0xC840,
-	1052 - 167: 0xC841,
-	1053 - 167: 0xC842,
-	1054 - 167: 0xC843,
-	1055 - 167: 0xC844,
-	1056 - 167: 0xC845,
-	1057 - 167: 0xC846,
-	1058 - 167: 0xC847,
-	1059 - 167: 0xC848,
-	1060 - 167: 0xC849,
-	1061 - 167: 0xC84A,
-	1062 - 167: 0xC84B,
-	1063 - 167: 0xC84C,
-	1064 - 167: 0xC84D,
-	1065 - 167: 0xC84E,
-	1066 - 167: 0xC84F,
-	1067 - 167: 0xC850,
-	1068 - 167: 0xC851,
-	1069 - 167: 0xC852,
-	1070 - 167: 0xC853,
-	1071 - 167: 0xC854,
-	1072 - 167: 0xC855,
-	1073 - 167: 0xC856,
-	1074 - 167: 0xC857,
-	1075 - 167: 0xC858,
-	1076 - 167: 0xC859,
-	1077 - 167: 0xC85A,
-	1078 - 167: 0xC85C,
-	1079 - 167: 0xC85D,
-	1080 - 167: 0xC85E,
-	1081 - 167: 0xC85F,
-	1082 - 167: 0xC860,
-	1083 - 167: 0xC861,
-	1084 - 167: 0xC862,
-	1085 - 167: 0xC863,
-	1086 - 167: 0xC864,
-	1087 - 167: 0xC865,
-	1088 - 167: 0xC866,
-	1089 - 167: 0xC867,
-	1090 - 167: 0xC868,
-	1091 - 167: 0xC869,
-	1092 - 167: 0xC86A,
-	1093 - 167: 0xC86B,
-	1094 - 167: 0xC86C,
-	1095 - 167: 0xC86D,
-	1096 - 167: 0xC86E,
-	1097 - 167: 0xC86F,
-	1098 - 167: 0xC870,
-	1099 - 167: 0xC871,
-	1100 - 167: 0xC872,
-	1101 - 167: 0xC873,
-	1102 - 167: 0xC874,
-	1103 - 167: 0xC875,
-	1105 - 167: 0xC85B,
-}
-
-const encode4Low, encode4High = 65072, 65518
-
-var encode4 = [...]uint16{
-	65072 - 65072: 0xA14A,
-	65073 - 65072: 0xA157,
-	65075 - 65072: 0xA159,
-	65076 - 65072: 0xA15B,
-	65077 - 65072: 0xA15F,
-	65078 - 65072: 0xA160,
-	65079 - 65072: 0xA163,
-	65080 - 65072: 0xA164,
-	65081 - 65072: 0xA167,
-	65082 - 65072: 0xA168,
-	65083 - 65072: 0xA16B,
-	65084 - 65072: 0xA16C,
-	65085 - 65072: 0xA16F,
-	65086 - 65072: 0xA170,
-	65087 - 65072: 0xA173,
-	65088 - 65072: 0xA174,
-	65089 - 65072: 0xA177,
-	65090 - 65072: 0xA178,
-	65091 - 65072: 0xA17B,
-	65092 - 65072: 0xA17C,
-	65097 - 65072: 0xA1C6,
-	65098 - 65072: 0xA1C7,
-	65099 - 65072: 0xA1CA,
-	65100 - 65072: 0xA1CB,
-	65101 - 65072: 0xA1C8,
-	65102 - 65072: 0xA1C9,
-	65103 - 65072: 0xA15C,
-	65104 - 65072: 0xA14D,
-	65105 - 65072: 0xA14E,
-	65106 - 65072: 0xA14F,
-	65108 - 65072: 0xA151,
-	65109 - 65072: 0xA152,
-	65110 - 65072: 0xA153,
-	65111 - 65072: 0xA154,
-	65113 - 65072: 0xA17D,
-	65114 - 65072: 0xA17E,
-	65115 - 65072: 0xA1A1,
-	65116 - 65072: 0xA1A2,
-	65117 - 65072: 0xA1A3,
-	65118 - 65072: 0xA1A4,
-	65119 - 65072: 0xA1CC,
-	65120 - 65072: 0xA1CD,
-	65121 - 65072: 0xA1CE,
-	65122 - 65072: 0xA1DE,
-	65123 - 65072: 0xA1DF,
-	65124 - 65072: 0xA1E0,
-	65125 - 65072: 0xA1E1,
-	65126 - 65072: 0xA1E2,
-	65128 - 65072: 0xA242,
-	65129 - 65072: 0xA24C,
-	65130 - 65072: 0xA24D,
-	65131 - 65072: 0xA24E,
-	65281 - 65072: 0xA149,
-	65282 - 65072: 0xC8D0,
-	65283 - 65072: 0xA1AD,
-	65284 - 65072: 0xA243,
-	65285 - 65072: 0xA248,
-	65286 - 65072: 0xA1AE,
-	65287 - 65072: 0xC8CF,
-	65288 - 65072: 0xA15D,
-	65289 - 65072: 0xA15E,
-	65290 - 65072: 0xA1AF,
-	65291 - 65072: 0xA1CF,
-	65292 - 65072: 0xA141,
-	65293 - 65072: 0xA1D0,
-	65294 - 65072: 0xA144,
-	65295 - 65072: 0xA1FE,
-	65296 - 65072: 0xA2AF,
-	65297 - 65072: 0xA2B0,
-	65298 - 65072: 0xA2B1,
-	65299 - 65072: 0xA2B2,
-	65300 - 65072: 0xA2B3,
-	65301 - 65072: 0xA2B4,
-	65302 - 65072: 0xA2B5,
-	65303 - 65072: 0xA2B6,
-	65304 - 65072: 0xA2B7,
-	65305 - 65072: 0xA2B8,
-	65306 - 65072: 0xA147,
-	65307 - 65072: 0xA146,
-	65308 - 65072: 0xA1D5,
-	65309 - 65072: 0xA1D7,
-	65310 - 65072: 0xA1D6,
-	65311 - 65072: 0xA148,
-	65312 - 65072: 0xA249,
-	65313 - 65072: 0xA2CF,
-	65314 - 65072: 0xA2D0,
-	65315 - 65072: 0xA2D1,
-	65316 - 65072: 0xA2D2,
-	65317 - 65072: 0xA2D3,
-	65318 - 65072: 0xA2D4,
-	65319 - 65072: 0xA2D5,
-	65320 - 65072: 0xA2D6,
-	65321 - 65072: 0xA2D7,
-	65322 - 65072: 0xA2D8,
-	65323 - 65072: 0xA2D9,
-	65324 - 65072: 0xA2DA,
-	65325 - 65072: 0xA2DB,
-	65326 - 65072: 0xA2DC,
-	65327 - 65072: 0xA2DD,
-	65328 - 65072: 0xA2DE,
-	65329 - 65072: 0xA2DF,
-	65330 - 65072: 0xA2E0,
-	65331 - 65072: 0xA2E1,
-	65332 - 65072: 0xA2E2,
-	65333 - 65072: 0xA2E3,
-	65334 - 65072: 0xA2E4,
-	65335 - 65072: 0xA2E5,
-	65336 - 65072: 0xA2E6,
-	65337 - 65072: 0xA2E7,
-	65338 - 65072: 0xA2E8,
-	65339 - 65072: 0xC6E4,
-	65340 - 65072: 0xA240,
-	65341 - 65072: 0xC6E5,
-	65343 - 65072: 0xA1C4,
-	65345 - 65072: 0xA2E9,
-	65346 - 65072: 0xA2EA,
-	65347 - 65072: 0xA2EB,
-	65348 - 65072: 0xA2EC,
-	65349 - 65072: 0xA2ED,
-	65350 - 65072: 0xA2EE,
-	65351 - 65072: 0xA2EF,
-	65352 - 65072: 0xA2F0,
-	65353 - 65072: 0xA2F1,
-	65354 - 65072: 0xA2F2,
-	65355 - 65072: 0xA2F3,
-	65356 - 65072: 0xA2F4,
-	65357 - 65072: 0xA2F5,
-	65358 - 65072: 0xA2F6,
-	65359 - 65072: 0xA2F7,
-	65360 - 65072: 0xA2F8,
-	65361 - 65072: 0xA2F9,
-	65362 - 65072: 0xA2FA,
-	65363 - 65072: 0xA2FB,
-	65364 - 65072: 0xA2FC,
-	65365 - 65072: 0xA2FD,
-	65366 - 65072: 0xA2FE,
-	65367 - 65072: 0xA340,
-	65368 - 65072: 0xA341,
-	65369 - 65072: 0xA342,
-	65370 - 65072: 0xA343,
-	65371 - 65072: 0xA161,
-	65372 - 65072: 0xA155,
-	65373 - 65072: 0xA162,
-	65374 - 65072: 0xA1E3,
-	65504 - 65072: 0xA246,
-	65505 - 65072: 0xA247,
-	65506 - 65072: 0xC8CD,
-	65507 - 65072: 0xA1C3,
-	65508 - 65072: 0xC8CE,
-	65509 - 65072: 0xA244,
-	65517 - 65072: 0xF9FE,
-}
-
-const encode5Low, encode5High = 194597, 195029
-
-var encode5 = [...]uint16{
-	194597 - 194597: 0x9874,
-	194619 - 194597: 0x9AC8,
-	194624 - 194597: 0xA047,
-	194680 - 194597: 0x8BC3,
-	194708 - 194597: 0xFC48,
-	194726 - 194597: 0xFC77,
-	194765 - 194597: 0x9C52,
-	194964 - 194597: 0x8EFD,
-	194994 - 194597: 0x8FA8,
-	195004 - 194597: 0x957A,
-	195028 - 194597: 0x8FF0,
-}
-
-const encode6Low, encode6High = 63751, 64014
-
-var encode6 = [...]uint16{
-	63751 - 63751: 0x8BF8,
-	64012 - 63751: 0xC94A,
-	64013 - 63751: 0xDDFC,
-}
-
-const encode7Low, encode7High = 175615, 175616
-
-var encode7 = [...]uint16{
-	175615 - 175615: 0x87DC,
-}
diff --git a/vendor/golang.org/x/text/encoding/unicode/override.go b/vendor/golang.org/x/text/encoding/unicode/override.go
deleted file mode 100644
index 35d62fcc99..0000000000
--- a/vendor/golang.org/x/text/encoding/unicode/override.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package unicode
-
-import (
-	"golang.org/x/text/transform"
-)
-
-// BOMOverride returns a new decoder transformer that is identical to fallback,
-// except that the presence of a Byte Order Mark at the start of the input
-// causes it to switch to the corresponding Unicode decoding. It will only
-// consider BOMs for UTF-8, UTF-16BE, and UTF-16LE.
-//
-// This differs from using ExpectBOM by allowing a BOM to switch to UTF-8, not
-// just UTF-16 variants, and allowing falling back to any encoding scheme.
-//
-// This technique is recommended by the W3C for use in HTML 5: "For
-// compatibility with deployed content, the byte order mark (also known as BOM)
-// is considered more authoritative than anything else."
-// http://www.w3.org/TR/encoding/#specification-hooks
-//
-// Using BOMOverride is mostly intended for use cases where the first characters
-// of a fallback encoding are known to not be a BOM, for example, for valid HTML
-// and most encodings.
-func BOMOverride(fallback transform.Transformer) transform.Transformer {
-	// TODO: possibly allow a variadic argument of unicode encodings to allow
-	// specifying details of which fallbacks are supported as well as
-	// specifying the details of the implementations. This would also allow for
-	// support for UTF-32, which should not be supported by default.
-	return &bomOverride{fallback: fallback}
-}
-
-type bomOverride struct {
-	fallback transform.Transformer
-	current  transform.Transformer
-}
-
-func (d *bomOverride) Reset() {
-	d.current = nil
-	d.fallback.Reset()
-}
-
-var (
-	// TODO: we could use decode functions here, instead of allocating a new
-	// decoder on every NewDecoder as IgnoreBOM decoders can be stateless.
-	utf16le = UTF16(LittleEndian, IgnoreBOM)
-	utf16be = UTF16(BigEndian, IgnoreBOM)
-)
-
-const utf8BOM = "\ufeff"
-
-func (d *bomOverride) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	if d.current != nil {
-		return d.current.Transform(dst, src, atEOF)
-	}
-	if len(src) < 3 && !atEOF {
-		return 0, 0, transform.ErrShortSrc
-	}
-	d.current = d.fallback
-	bomSize := 0
-	if len(src) >= 2 {
-		if src[0] == 0xFF && src[1] == 0xFE {
-			d.current = utf16le.NewDecoder()
-			bomSize = 2
-		} else if src[0] == 0xFE && src[1] == 0xFF {
-			d.current = utf16be.NewDecoder()
-			bomSize = 2
-		} else if len(src) >= 3 &&
-			src[0] == utf8BOM[0] &&
-			src[1] == utf8BOM[1] &&
-			src[2] == utf8BOM[2] {
-			d.current = transform.Nop
-			bomSize = 3
-		}
-	}
-	if bomSize < len(src) {
-		nDst, nSrc, err = d.current.Transform(dst, src[bomSize:], atEOF)
-	}
-	return nDst, nSrc + bomSize, err
-}
diff --git a/vendor/golang.org/x/text/encoding/unicode/unicode.go b/vendor/golang.org/x/text/encoding/unicode/unicode.go
deleted file mode 100644
index 579cadfb12..0000000000
--- a/vendor/golang.org/x/text/encoding/unicode/unicode.go
+++ /dev/null
@@ -1,434 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package unicode provides Unicode encodings such as UTF-16.
-package unicode // import "golang.org/x/text/encoding/unicode"
-
-import (
-	"errors"
-	"unicode/utf16"
-	"unicode/utf8"
-
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/internal"
-	"golang.org/x/text/encoding/internal/identifier"
-	"golang.org/x/text/internal/utf8internal"
-	"golang.org/x/text/runes"
-	"golang.org/x/text/transform"
-)
-
-// TODO: I think the Transformers really should return errors on unmatched
-// surrogate pairs and odd numbers of bytes. This is not required by RFC 2781,
-// which leaves it open, but is suggested by WhatWG. It will allow for all error
-// modes as defined by WhatWG: fatal, HTML and Replacement. This would require
-// the introduction of some kind of error type for conveying the erroneous code
-// point.
-
-// UTF8 is the UTF-8 encoding.
-var UTF8 encoding.Encoding = utf8enc
-
-var utf8enc = &internal.Encoding{
-	&internal.SimpleEncoding{utf8Decoder{}, runes.ReplaceIllFormed()},
-	"UTF-8",
-	identifier.UTF8,
-}
-
-type utf8Decoder struct{ transform.NopResetter }
-
-func (utf8Decoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	var pSrc int // point from which to start copy in src
-	var accept utf8internal.AcceptRange
-
-	// The decoder can only make the input larger, not smaller.
-	n := len(src)
-	if len(dst) < n {
-		err = transform.ErrShortDst
-		n = len(dst)
-		atEOF = false
-	}
-	for nSrc < n {
-		c := src[nSrc]
-		if c < utf8.RuneSelf {
-			nSrc++
-			continue
-		}
-		first := utf8internal.First[c]
-		size := int(first & utf8internal.SizeMask)
-		if first == utf8internal.FirstInvalid {
-			goto handleInvalid // invalid starter byte
-		}
-		accept = utf8internal.AcceptRanges[first>>utf8internal.AcceptShift]
-		if nSrc+size > n {
-			if !atEOF {
-				// We may stop earlier than necessary here if the short sequence
-				// has invalid bytes. Not checking for this simplifies the code
-				// and may avoid duplicate computations in certain conditions.
-				if err == nil {
-					err = transform.ErrShortSrc
-				}
-				break
-			}
-			// Determine the maximal subpart of an ill-formed subsequence.
-			switch {
-			case nSrc+1 >= n || src[nSrc+1] < accept.Lo || accept.Hi < src[nSrc+1]:
-				size = 1
-			case nSrc+2 >= n || src[nSrc+2] < utf8internal.LoCB || utf8internal.HiCB < src[nSrc+2]:
-				size = 2
-			default:
-				size = 3 // As we are short, the maximum is 3.
-			}
-			goto handleInvalid
-		}
-		if c = src[nSrc+1]; c < accept.Lo || accept.Hi < c {
-			size = 1
-			goto handleInvalid // invalid continuation byte
-		} else if size == 2 {
-		} else if c = src[nSrc+2]; c < utf8internal.LoCB || utf8internal.HiCB < c {
-			size = 2
-			goto handleInvalid // invalid continuation byte
-		} else if size == 3 {
-		} else if c = src[nSrc+3]; c < utf8internal.LoCB || utf8internal.HiCB < c {
-			size = 3
-			goto handleInvalid // invalid continuation byte
-		}
-		nSrc += size
-		continue
-
-	handleInvalid:
-		// Copy the scanned input so far.
-		nDst += copy(dst[nDst:], src[pSrc:nSrc])
-
-		// Append RuneError to the destination.
-		const runeError = "\ufffd"
-		if nDst+len(runeError) > len(dst) {
-			return nDst, nSrc, transform.ErrShortDst
-		}
-		nDst += copy(dst[nDst:], runeError)
-
-		// Skip the maximal subpart of an ill-formed subsequence according to
-		// the W3C standard way instead of the Go way. This Transform is
-		// probably the only place in the text repo where it is warranted.
-		nSrc += size
-		pSrc = nSrc
-
-		// Recompute the maximum source length.
-		if sz := len(dst) - nDst; sz < len(src)-nSrc {
-			err = transform.ErrShortDst
-			n = nSrc + sz
-			atEOF = false
-		}
-	}
-	return nDst + copy(dst[nDst:], src[pSrc:nSrc]), nSrc, err
-}
-
-// UTF16 returns a UTF-16 Encoding for the given default endianness and byte
-// order mark (BOM) policy.
-//
-// When decoding from UTF-16 to UTF-8, if the BOMPolicy is IgnoreBOM then
-// neither BOMs U+FEFF nor noncharacters U+FFFE in the input stream will affect
-// the endianness used for decoding, and will instead be output as their
-// standard UTF-8 encodings: "\xef\xbb\xbf" and "\xef\xbf\xbe". If the BOMPolicy
-// is UseBOM or ExpectBOM a staring BOM is not written to the UTF-8 output.
-// Instead, it overrides the default endianness e for the remainder of the
-// transformation. Any subsequent BOMs U+FEFF or noncharacters U+FFFE will not
-// affect the endianness used, and will instead be output as their standard
-// UTF-8 encodings. For UseBOM, if there is no starting BOM, it will proceed
-// with the default Endianness. For ExpectBOM, in that case, the transformation
-// will return early with an ErrMissingBOM error.
-//
-// When encoding from UTF-8 to UTF-16, a BOM will be inserted at the start of
-// the output if the BOMPolicy is UseBOM or ExpectBOM. Otherwise, a BOM will not
-// be inserted. The UTF-8 input does not need to contain a BOM.
-//
-// There is no concept of a 'native' endianness. If the UTF-16 data is produced
-// and consumed in a greater context that implies a certain endianness, use
-// IgnoreBOM. Otherwise, use ExpectBOM and always produce and consume a BOM.
-//
-// In the language of http://www.unicode.org/faq/utf_bom.html#bom10, IgnoreBOM
-// corresponds to "Where the precise type of the data stream is known... the
-// BOM should not be used" and ExpectBOM corresponds to "A particular
-// protocol... may require use of the BOM".
-func UTF16(e Endianness, b BOMPolicy) encoding.Encoding {
-	return utf16Encoding{config{e, b}, mibValue[e][b&bomMask]}
-}
-
-// mibValue maps Endianness and BOMPolicy settings to MIB constants. Note that
-// some configurations map to the same MIB identifier. RFC 2781 has requirements
-// and recommendations. Some of the "configurations" are merely recommendations,
-// so multiple configurations could match.
-var mibValue = map[Endianness][numBOMValues]identifier.MIB{
-	BigEndian: [numBOMValues]identifier.MIB{
-		IgnoreBOM: identifier.UTF16BE,
-		UseBOM:    identifier.UTF16, // BigEnding default is preferred by RFC 2781.
-		// TODO: acceptBOM | strictBOM would map to UTF16BE as well.
-	},
-	LittleEndian: [numBOMValues]identifier.MIB{
-		IgnoreBOM: identifier.UTF16LE,
-		UseBOM:    identifier.UTF16, // LittleEndian default is allowed and preferred on Windows.
-		// TODO: acceptBOM | strictBOM would map to UTF16LE as well.
-	},
-	// ExpectBOM is not widely used and has no valid MIB identifier.
-}
-
-// All lists a configuration for each IANA-defined UTF-16 variant.
-var All = []encoding.Encoding{
-	UTF8,
-	UTF16(BigEndian, UseBOM),
-	UTF16(BigEndian, IgnoreBOM),
-	UTF16(LittleEndian, IgnoreBOM),
-}
-
-// BOMPolicy is a UTF-16 encoding's byte order mark policy.
-type BOMPolicy uint8
-
-const (
-	writeBOM   BOMPolicy = 0x01
-	acceptBOM  BOMPolicy = 0x02
-	requireBOM BOMPolicy = 0x04
-	bomMask    BOMPolicy = 0x07
-
-	// HACK: numBOMValues == 8 triggers a bug in the 1.4 compiler (cannot have a
-	// map of an array of length 8 of a type that is also used as a key or value
-	// in another map). See golang.org/issue/11354.
-	// TODO: consider changing this value back to 8 if the use of 1.4.* has
-	// been minimized.
-	numBOMValues = 8 + 1
-
-	// IgnoreBOM means to ignore any byte order marks.
-	IgnoreBOM BOMPolicy = 0
-	// Common and RFC 2781-compliant interpretation for UTF-16BE/LE.
-
-	// UseBOM means that the UTF-16 form may start with a byte order mark, which
-	// will be used to override the default encoding.
-	UseBOM BOMPolicy = writeBOM | acceptBOM
-	// Common and RFC 2781-compliant interpretation for UTF-16.
-
-	// ExpectBOM means that the UTF-16 form must start with a byte order mark,
-	// which will be used to override the default encoding.
-	ExpectBOM BOMPolicy = writeBOM | acceptBOM | requireBOM
-	// Used in Java as Unicode (not to be confused with Java's UTF-16) and
-	// ICU's UTF-16,version=1. Not compliant with RFC 2781.
-
-	// TODO (maybe): strictBOM: BOM must match Endianness. This would allow:
-	// - UTF-16(B|L)E,version=1: writeBOM | acceptBOM | requireBOM | strictBOM
-	//    (UnicodeBig and UnicodeLittle in Java)
-	// - RFC 2781-compliant, but less common interpretation for UTF-16(B|L)E:
-	//    acceptBOM | strictBOM (e.g. assigned to CheckBOM).
-	// This addition would be consistent with supporting ExpectBOM.
-)
-
-// Endianness is a UTF-16 encoding's default endianness.
-type Endianness bool
-
-const (
-	// BigEndian is UTF-16BE.
-	BigEndian Endianness = false
-	// LittleEndian is UTF-16LE.
-	LittleEndian Endianness = true
-)
-
-// ErrMissingBOM means that decoding UTF-16 input with ExpectBOM did not find a
-// starting byte order mark.
-var ErrMissingBOM = errors.New("encoding: missing byte order mark")
-
-type utf16Encoding struct {
-	config
-	mib identifier.MIB
-}
-
-type config struct {
-	endianness Endianness
-	bomPolicy  BOMPolicy
-}
-
-func (u utf16Encoding) NewDecoder() *encoding.Decoder {
-	return &encoding.Decoder{Transformer: &utf16Decoder{
-		initial: u.config,
-		current: u.config,
-	}}
-}
-
-func (u utf16Encoding) NewEncoder() *encoding.Encoder {
-	return &encoding.Encoder{Transformer: &utf16Encoder{
-		endianness:       u.endianness,
-		initialBOMPolicy: u.bomPolicy,
-		currentBOMPolicy: u.bomPolicy,
-	}}
-}
-
-func (u utf16Encoding) ID() (mib identifier.MIB, other string) {
-	return u.mib, ""
-}
-
-func (u utf16Encoding) String() string {
-	e, b := "B", ""
-	if u.endianness == LittleEndian {
-		e = "L"
-	}
-	switch u.bomPolicy {
-	case ExpectBOM:
-		b = "Expect"
-	case UseBOM:
-		b = "Use"
-	case IgnoreBOM:
-		b = "Ignore"
-	}
-	return "UTF-16" + e + "E (" + b + " BOM)"
-}
-
-type utf16Decoder struct {
-	initial config
-	current config
-}
-
-func (u *utf16Decoder) Reset() {
-	u.current = u.initial
-}
-
-func (u *utf16Decoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	if len(src) == 0 {
-		if atEOF && u.current.bomPolicy&requireBOM != 0 {
-			return 0, 0, ErrMissingBOM
-		}
-		return 0, 0, nil
-	}
-	if u.current.bomPolicy&acceptBOM != 0 {
-		if len(src) < 2 {
-			return 0, 0, transform.ErrShortSrc
-		}
-		switch {
-		case src[0] == 0xfe && src[1] == 0xff:
-			u.current.endianness = BigEndian
-			nSrc = 2
-		case src[0] == 0xff && src[1] == 0xfe:
-			u.current.endianness = LittleEndian
-			nSrc = 2
-		default:
-			if u.current.bomPolicy&requireBOM != 0 {
-				return 0, 0, ErrMissingBOM
-			}
-		}
-		u.current.bomPolicy = IgnoreBOM
-	}
-
-	var r rune
-	var dSize, sSize int
-	for nSrc < len(src) {
-		if nSrc+1 < len(src) {
-			x := uint16(src[nSrc+0])<<8 | uint16(src[nSrc+1])
-			if u.current.endianness == LittleEndian {
-				x = x>>8 | x<<8
-			}
-			r, sSize = rune(x), 2
-			if utf16.IsSurrogate(r) {
-				if nSrc+3 < len(src) {
-					x = uint16(src[nSrc+2])<<8 | uint16(src[nSrc+3])
-					if u.current.endianness == LittleEndian {
-						x = x>>8 | x<<8
-					}
-					// Save for next iteration if it is not a high surrogate.
-					if isHighSurrogate(rune(x)) {
-						r, sSize = utf16.DecodeRune(r, rune(x)), 4
-					}
-				} else if !atEOF {
-					err = transform.ErrShortSrc
-					break
-				}
-			}
-			if dSize = utf8.RuneLen(r); dSize < 0 {
-				r, dSize = utf8.RuneError, 3
-			}
-		} else if atEOF {
-			// Single trailing byte.
-			r, dSize, sSize = utf8.RuneError, 3, 1
-		} else {
-			err = transform.ErrShortSrc
-			break
-		}
-		if nDst+dSize > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		nDst += utf8.EncodeRune(dst[nDst:], r)
-		nSrc += sSize
-	}
-	return nDst, nSrc, err
-}
-
-func isHighSurrogate(r rune) bool {
-	return 0xDC00 <= r && r <= 0xDFFF
-}
-
-type utf16Encoder struct {
-	endianness       Endianness
-	initialBOMPolicy BOMPolicy
-	currentBOMPolicy BOMPolicy
-}
-
-func (u *utf16Encoder) Reset() {
-	u.currentBOMPolicy = u.initialBOMPolicy
-}
-
-func (u *utf16Encoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	if u.currentBOMPolicy&writeBOM != 0 {
-		if len(dst) < 2 {
-			return 0, 0, transform.ErrShortDst
-		}
-		dst[0], dst[1] = 0xfe, 0xff
-		u.currentBOMPolicy = IgnoreBOM
-		nDst = 2
-	}
-
-	r, size := rune(0), 0
-	for nSrc < len(src) {
-		r = rune(src[nSrc])
-
-		// Decode a 1-byte rune.
-		if r < utf8.RuneSelf {
-			size = 1
-
-		} else {
-			// Decode a multi-byte rune.
-			r, size = utf8.DecodeRune(src[nSrc:])
-			if size == 1 {
-				// All valid runes of size 1 (those below utf8.RuneSelf) were
-				// handled above. We have invalid UTF-8 or we haven't seen the
-				// full character yet.
-				if !atEOF && !utf8.FullRune(src[nSrc:]) {
-					err = transform.ErrShortSrc
-					break
-				}
-			}
-		}
-
-		if r <= 0xffff {
-			if nDst+2 > len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			dst[nDst+0] = uint8(r >> 8)
-			dst[nDst+1] = uint8(r)
-			nDst += 2
-		} else {
-			if nDst+4 > len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			r1, r2 := utf16.EncodeRune(r)
-			dst[nDst+0] = uint8(r1 >> 8)
-			dst[nDst+1] = uint8(r1)
-			dst[nDst+2] = uint8(r2 >> 8)
-			dst[nDst+3] = uint8(r2)
-			nDst += 4
-		}
-		nSrc += size
-	}
-
-	if u.endianness == LittleEndian {
-		for i := 0; i < nDst; i += 2 {
-			dst[i], dst[i+1] = dst[i+1], dst[i]
-		}
-	}
-	return nDst, nSrc, err
-}
diff --git a/vendor/golang.org/x/text/internal/tag/tag.go b/vendor/golang.org/x/text/internal/tag/tag.go
deleted file mode 100644
index b5d348891d..0000000000
--- a/vendor/golang.org/x/text/internal/tag/tag.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package tag contains functionality handling tags and related data.
-package tag // import "golang.org/x/text/internal/tag"
-
-import "sort"
-
-// An Index converts tags to a compact numeric value.
-//
-// All elements are of size 4. Tags may be up to 4 bytes long. Excess bytes can
-// be used to store additional information about the tag.
-type Index string
-
-// Elem returns the element data at the given index.
-func (s Index) Elem(x int) string {
-	return string(s[x*4 : x*4+4])
-}
-
-// Index reports the index of the given key or -1 if it could not be found.
-// Only the first len(key) bytes from the start of the 4-byte entries will be
-// considered for the search and the first match in Index will be returned.
-func (s Index) Index(key []byte) int {
-	n := len(key)
-	// search the index of the first entry with an equal or higher value than
-	// key in s.
-	index := sort.Search(len(s)/4, func(i int) bool {
-		return cmp(s[i*4:i*4+n], key) != -1
-	})
-	i := index * 4
-	if cmp(s[i:i+len(key)], key) != 0 {
-		return -1
-	}
-	return index
-}
-
-// Next finds the next occurrence of key after index x, which must have been
-// obtained from a call to Index using the same key. It returns x+1 or -1.
-func (s Index) Next(key []byte, x int) int {
-	if x++; x*4 < len(s) && cmp(s[x*4:x*4+len(key)], key) == 0 {
-		return x
-	}
-	return -1
-}
-
-// cmp returns an integer comparing a and b lexicographically.
-func cmp(a Index, b []byte) int {
-	n := len(a)
-	if len(b) < n {
-		n = len(b)
-	}
-	for i, c := range b[:n] {
-		switch {
-		case a[i] > c:
-			return 1
-		case a[i] < c:
-			return -1
-		}
-	}
-	switch {
-	case len(a) < len(b):
-		return -1
-	case len(a) > len(b):
-		return 1
-	}
-	return 0
-}
-
-// Compare returns an integer comparing a and b lexicographically.
-func Compare(a string, b []byte) int {
-	return cmp(Index(a), b)
-}
-
-// FixCase reformats b to the same pattern of cases as form.
-// If returns false if string b is malformed.
-func FixCase(form string, b []byte) bool {
-	if len(form) != len(b) {
-		return false
-	}
-	for i, c := range b {
-		if form[i] <= 'Z' {
-			if c >= 'a' {
-				c -= 'z' - 'Z'
-			}
-			if c < 'A' || 'Z' < c {
-				return false
-			}
-		} else {
-			if c <= 'Z' {
-				c += 'z' - 'Z'
-			}
-			if c < 'a' || 'z' < c {
-				return false
-			}
-		}
-		b[i] = c
-	}
-	return true
-}
diff --git a/vendor/golang.org/x/text/internal/utf8internal/utf8internal.go b/vendor/golang.org/x/text/internal/utf8internal/utf8internal.go
deleted file mode 100644
index 575cea8707..0000000000
--- a/vendor/golang.org/x/text/internal/utf8internal/utf8internal.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package utf8internal contains low-level utf8-related constants, tables, etc.
-// that are used internally by the text package.
-package utf8internal
-
-// The default lowest and highest continuation byte.
-const (
-	LoCB = 0x80 // 1000 0000
-	HiCB = 0xBF // 1011 1111
-)
-
-// Constants related to getting information of first bytes of UTF-8 sequences.
-const (
-	// ASCII identifies a UTF-8 byte as ASCII.
-	ASCII = as
-
-	// FirstInvalid indicates a byte is invalid as a first byte of a UTF-8
-	// sequence.
-	FirstInvalid = xx
-
-	// SizeMask is a mask for the size bits. Use use x&SizeMask to get the size.
-	SizeMask = 7
-
-	// AcceptShift is the right-shift count for the first byte info byte to get
-	// the index into the AcceptRanges table. See AcceptRanges.
-	AcceptShift = 4
-
-	// The names of these constants are chosen to give nice alignment in the
-	// table below. The first nibble is an index into acceptRanges or F for
-	// special one-byte cases. The second nibble is the Rune length or the
-	// Status for the special one-byte case.
-	xx = 0xF1 // invalid: size 1
-	as = 0xF0 // ASCII: size 1
-	s1 = 0x02 // accept 0, size 2
-	s2 = 0x13 // accept 1, size 3
-	s3 = 0x03 // accept 0, size 3
-	s4 = 0x23 // accept 2, size 3
-	s5 = 0x34 // accept 3, size 4
-	s6 = 0x04 // accept 0, size 4
-	s7 = 0x44 // accept 4, size 4
-)
-
-// First is information about the first byte in a UTF-8 sequence.
-var First = [256]uint8{
-	//   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x00-0x0F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x10-0x1F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x20-0x2F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x30-0x3F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x40-0x4F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x50-0x5F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x60-0x6F
-	as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, as, // 0x70-0x7F
-	//   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-	xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0x80-0x8F
-	xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0x90-0x9F
-	xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0xA0-0xAF
-	xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0xB0-0xBF
-	xx, xx, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, // 0xC0-0xCF
-	s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, s1, // 0xD0-0xDF
-	s2, s3, s3, s3, s3, s3, s3, s3, s3, s3, s3, s3, s3, s4, s3, s3, // 0xE0-0xEF
-	s5, s6, s6, s6, s7, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, // 0xF0-0xFF
-}
-
-// AcceptRange gives the range of valid values for the second byte in a UTF-8
-// sequence for any value for First that is not ASCII or FirstInvalid.
-type AcceptRange struct {
-	Lo uint8 // lowest value for second byte.
-	Hi uint8 // highest value for second byte.
-}
-
-// AcceptRanges is a slice of AcceptRange values. For a given byte sequence b
-//
-//		AcceptRanges[First[b[0]]>>AcceptShift]
-//
-// will give the value of AcceptRange for the multi-byte UTF-8 sequence starting
-// at b[0].
-var AcceptRanges = [...]AcceptRange{
-	0: {LoCB, HiCB},
-	1: {0xA0, HiCB},
-	2: {LoCB, 0x9F},
-	3: {0x90, HiCB},
-	4: {LoCB, 0x8F},
-}
diff --git a/vendor/golang.org/x/text/language/Makefile b/vendor/golang.org/x/text/language/Makefile
deleted file mode 100644
index 79f005784f..0000000000
--- a/vendor/golang.org/x/text/language/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2013 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-CLEANFILES+=maketables
-
-maketables: maketables.go
-	go build $^
-
-tables:	maketables
-	./maketables > tables.go
-	gofmt -w -s tables.go
-
-# Build (but do not run) maketables during testing,
-# just to make sure it still compiles.
-testshort: maketables
diff --git a/vendor/golang.org/x/text/language/common.go b/vendor/golang.org/x/text/language/common.go
deleted file mode 100644
index 9d86e18554..0000000000
--- a/vendor/golang.org/x/text/language/common.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package language
-
-// This file contains code common to the maketables.go and the package code.
-
-// langAliasType is the type of an alias in langAliasMap.
-type langAliasType int8
-
-const (
-	langDeprecated langAliasType = iota
-	langMacro
-	langLegacy
-
-	langAliasTypeUnknown langAliasType = -1
-)
diff --git a/vendor/golang.org/x/text/language/coverage.go b/vendor/golang.org/x/text/language/coverage.go
deleted file mode 100644
index 101fd23c1d..0000000000
--- a/vendor/golang.org/x/text/language/coverage.go
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package language
-
-import (
-	"fmt"
-	"sort"
-)
-
-// The Coverage interface is used to define the level of coverage of an
-// internationalization service. Note that not all types are supported by all
-// services. As lists may be generated on the fly, it is recommended that users
-// of a Coverage cache the results.
-type Coverage interface {
-	// Tags returns the list of supported tags.
-	Tags() []Tag
-
-	// BaseLanguages returns the list of supported base languages.
-	BaseLanguages() []Base
-
-	// Scripts returns the list of supported scripts.
-	Scripts() []Script
-
-	// Regions returns the list of supported regions.
-	Regions() []Region
-}
-
-var (
-	// Supported defines a Coverage that lists all supported subtags. Tags
-	// always returns nil.
-	Supported Coverage = allSubtags{}
-)
-
-// TODO:
-// - Support Variants, numbering systems.
-// - CLDR coverage levels.
-// - Set of common tags defined in this package.
-
-type allSubtags struct{}
-
-// Regions returns the list of supported regions. As all regions are in a
-// consecutive range, it simply returns a slice of numbers in increasing order.
-// The "undefined" region is not returned.
-func (s allSubtags) Regions() []Region {
-	reg := make([]Region, numRegions)
-	for i := range reg {
-		reg[i] = Region{regionID(i + 1)}
-	}
-	return reg
-}
-
-// Scripts returns the list of supported scripts. As all scripts are in a
-// consecutive range, it simply returns a slice of numbers in increasing order.
-// The "undefined" script is not returned.
-func (s allSubtags) Scripts() []Script {
-	scr := make([]Script, numScripts)
-	for i := range scr {
-		scr[i] = Script{scriptID(i + 1)}
-	}
-	return scr
-}
-
-// BaseLanguages returns the list of all supported base languages. It generates
-// the list by traversing the internal structures.
-func (s allSubtags) BaseLanguages() []Base {
-	base := make([]Base, 0, numLanguages)
-	for i := 0; i < langNoIndexOffset; i++ {
-		// We included "und" already for the value 0.
-		if i != nonCanonicalUnd {
-			base = append(base, Base{langID(i)})
-		}
-	}
-	i := langNoIndexOffset
-	for _, v := range langNoIndex {
-		for k := 0; k < 8; k++ {
-			if v&1 == 1 {
-				base = append(base, Base{langID(i)})
-			}
-			v >>= 1
-			i++
-		}
-	}
-	return base
-}
-
-// Tags always returns nil.
-func (s allSubtags) Tags() []Tag {
-	return nil
-}
-
-// coverage is used used by NewCoverage which is used as a convenient way for
-// creating Coverage implementations for partially defined data. Very often a
-// package will only need to define a subset of slices. coverage provides a
-// convenient way to do this. Moreover, packages using NewCoverage, instead of
-// their own implementation, will not break if later new slice types are added.
-type coverage struct {
-	tags    func() []Tag
-	bases   func() []Base
-	scripts func() []Script
-	regions func() []Region
-}
-
-func (s *coverage) Tags() []Tag {
-	if s.tags == nil {
-		return nil
-	}
-	return s.tags()
-}
-
-// bases implements sort.Interface and is used to sort base languages.
-type bases []Base
-
-func (b bases) Len() int {
-	return len(b)
-}
-
-func (b bases) Swap(i, j int) {
-	b[i], b[j] = b[j], b[i]
-}
-
-func (b bases) Less(i, j int) bool {
-	return b[i].langID < b[j].langID
-}
-
-// BaseLanguages returns the result from calling s.bases if it is specified or
-// otherwise derives the set of supported base languages from tags.
-func (s *coverage) BaseLanguages() []Base {
-	if s.bases == nil {
-		tags := s.Tags()
-		if len(tags) == 0 {
-			return nil
-		}
-		a := make([]Base, len(tags))
-		for i, t := range tags {
-			a[i] = Base{langID(t.lang)}
-		}
-		sort.Sort(bases(a))
-		k := 0
-		for i := 1; i < len(a); i++ {
-			if a[k] != a[i] {
-				k++
-				a[k] = a[i]
-			}
-		}
-		return a[:k+1]
-	}
-	return s.bases()
-}
-
-func (s *coverage) Scripts() []Script {
-	if s.scripts == nil {
-		return nil
-	}
-	return s.scripts()
-}
-
-func (s *coverage) Regions() []Region {
-	if s.regions == nil {
-		return nil
-	}
-	return s.regions()
-}
-
-// NewCoverage returns a Coverage for the given lists. It is typically used by
-// packages providing internationalization services to define their level of
-// coverage. A list may be of type []T or func() []T, where T is either Tag,
-// Base, Script or Region. The returned Coverage derives the value for Bases
-// from Tags if no func or slice for []Base is specified. For other unspecified
-// types the returned Coverage will return nil for the respective methods.
-func NewCoverage(list ...interface{}) Coverage {
-	s := &coverage{}
-	for _, x := range list {
-		switch v := x.(type) {
-		case func() []Base:
-			s.bases = v
-		case func() []Script:
-			s.scripts = v
-		case func() []Region:
-			s.regions = v
-		case func() []Tag:
-			s.tags = v
-		case []Base:
-			s.bases = func() []Base { return v }
-		case []Script:
-			s.scripts = func() []Script { return v }
-		case []Region:
-			s.regions = func() []Region { return v }
-		case []Tag:
-			s.tags = func() []Tag { return v }
-		default:
-			panic(fmt.Sprintf("language: unsupported set type %T", v))
-		}
-	}
-	return s
-}
diff --git a/vendor/golang.org/x/text/language/go1_1.go b/vendor/golang.org/x/text/language/go1_1.go
deleted file mode 100644
index 380f4c09f7..0000000000
--- a/vendor/golang.org/x/text/language/go1_1.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.2
-
-package language
-
-import "sort"
-
-func sortStable(s sort.Interface) {
-	ss := stableSort{
-		s:   s,
-		pos: make([]int, s.Len()),
-	}
-	for i := range ss.pos {
-		ss.pos[i] = i
-	}
-	sort.Sort(&ss)
-}
-
-type stableSort struct {
-	s   sort.Interface
-	pos []int
-}
-
-func (s *stableSort) Len() int {
-	return len(s.pos)
-}
-
-func (s *stableSort) Less(i, j int) bool {
-	return s.s.Less(i, j) || !s.s.Less(j, i) && s.pos[i] < s.pos[j]
-}
-
-func (s *stableSort) Swap(i, j int) {
-	s.s.Swap(i, j)
-	s.pos[i], s.pos[j] = s.pos[j], s.pos[i]
-}
diff --git a/vendor/golang.org/x/text/language/go1_2.go b/vendor/golang.org/x/text/language/go1_2.go
deleted file mode 100644
index 38268c57a3..0000000000
--- a/vendor/golang.org/x/text/language/go1_2.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.2
-
-package language
-
-import "sort"
-
-var sortStable = sort.Stable
diff --git a/vendor/golang.org/x/text/language/index.go b/vendor/golang.org/x/text/language/index.go
deleted file mode 100644
index 973db9fd54..0000000000
--- a/vendor/golang.org/x/text/language/index.go
+++ /dev/null
@@ -1,769 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package language
-
-// NumCompactTags is the number of common tags. The maximum tag is
-// NumCompactTags-1.
-const NumCompactTags = 754
-
-var specialTags = []Tag{ // 2 elements
-	0: {lang: 0xd7, region: 0x6d, script: 0x0, pVariant: 0x5, pExt: 0xe, str: "ca-ES-valencia"},
-	1: {lang: 0x138, region: 0x134, script: 0x0, pVariant: 0x5, pExt: 0x5, str: "en-US-u-va-posix"},
-} // Size: 72 bytes
-
-var coreTags = map[uint32]uint16{
-	0x0:        0,   // und
-	0x01600000: 3,   // af
-	0x016000d1: 4,   // af-NA
-	0x01600160: 5,   // af-ZA
-	0x01c00000: 6,   // agq
-	0x01c00051: 7,   // agq-CM
-	0x02100000: 8,   // ak
-	0x0210007f: 9,   // ak-GH
-	0x02700000: 10,  // am
-	0x0270006e: 11,  // am-ET
-	0x03a00000: 12,  // ar
-	0x03a00001: 13,  // ar-001
-	0x03a00022: 14,  // ar-AE
-	0x03a00038: 15,  // ar-BH
-	0x03a00061: 16,  // ar-DJ
-	0x03a00066: 17,  // ar-DZ
-	0x03a0006a: 18,  // ar-EG
-	0x03a0006b: 19,  // ar-EH
-	0x03a0006c: 20,  // ar-ER
-	0x03a00096: 21,  // ar-IL
-	0x03a0009a: 22,  // ar-IQ
-	0x03a000a0: 23,  // ar-JO
-	0x03a000a7: 24,  // ar-KM
-	0x03a000ab: 25,  // ar-KW
-	0x03a000af: 26,  // ar-LB
-	0x03a000b8: 27,  // ar-LY
-	0x03a000b9: 28,  // ar-MA
-	0x03a000c8: 29,  // ar-MR
-	0x03a000e0: 30,  // ar-OM
-	0x03a000ec: 31,  // ar-PS
-	0x03a000f2: 32,  // ar-QA
-	0x03a00107: 33,  // ar-SA
-	0x03a0010a: 34,  // ar-SD
-	0x03a00114: 35,  // ar-SO
-	0x03a00116: 36,  // ar-SS
-	0x03a0011b: 37,  // ar-SY
-	0x03a0011f: 38,  // ar-TD
-	0x03a00127: 39,  // ar-TN
-	0x03a0015d: 40,  // ar-YE
-	0x04000000: 41,  // ars
-	0x04300000: 42,  // as
-	0x04300098: 43,  // as-IN
-	0x04400000: 44,  // asa
-	0x0440012e: 45,  // asa-TZ
-	0x04800000: 46,  // ast
-	0x0480006d: 47,  // ast-ES
-	0x05800000: 48,  // az
-	0x0581e000: 49,  // az-Cyrl
-	0x0581e031: 50,  // az-Cyrl-AZ
-	0x05852000: 51,  // az-Latn
-	0x05852031: 52,  // az-Latn-AZ
-	0x05e00000: 53,  // bas
-	0x05e00051: 54,  // bas-CM
-	0x07100000: 55,  // be
-	0x07100046: 56,  // be-BY
-	0x07500000: 57,  // bem
-	0x07500161: 58,  // bem-ZM
-	0x07900000: 59,  // bez
-	0x0790012e: 60,  // bez-TZ
-	0x07e00000: 61,  // bg
-	0x07e00037: 62,  // bg-BG
-	0x08200000: 63,  // bh
-	0x0a000000: 64,  // bm
-	0x0a0000c2: 65,  // bm-ML
-	0x0a500000: 66,  // bn
-	0x0a500034: 67,  // bn-BD
-	0x0a500098: 68,  // bn-IN
-	0x0a900000: 69,  // bo
-	0x0a900052: 70,  // bo-CN
-	0x0a900098: 71,  // bo-IN
-	0x0b200000: 72,  // br
-	0x0b200077: 73,  // br-FR
-	0x0b500000: 74,  // brx
-	0x0b500098: 75,  // brx-IN
-	0x0b700000: 76,  // bs
-	0x0b71e000: 77,  // bs-Cyrl
-	0x0b71e032: 78,  // bs-Cyrl-BA
-	0x0b752000: 79,  // bs-Latn
-	0x0b752032: 80,  // bs-Latn-BA
-	0x0d700000: 81,  // ca
-	0x0d700021: 82,  // ca-AD
-	0x0d70006d: 83,  // ca-ES
-	0x0d700077: 84,  // ca-FR
-	0x0d70009d: 85,  // ca-IT
-	0x0dc00000: 86,  // ce
-	0x0dc00105: 87,  // ce-RU
-	0x0df00000: 88,  // cgg
-	0x0df00130: 89,  // cgg-UG
-	0x0e500000: 90,  // chr
-	0x0e500134: 91,  // chr-US
-	0x0e900000: 92,  // ckb
-	0x0e90009a: 93,  // ckb-IQ
-	0x0e90009b: 94,  // ckb-IR
-	0x0f900000: 95,  // cs
-	0x0f90005d: 96,  // cs-CZ
-	0x0fd00000: 97,  // cu
-	0x0fd00105: 98,  // cu-RU
-	0x0ff00000: 99,  // cy
-	0x0ff0007a: 100, // cy-GB
-	0x10000000: 101, // da
-	0x10000062: 102, // da-DK
-	0x10000081: 103, // da-GL
-	0x10700000: 104, // dav
-	0x107000a3: 105, // dav-KE
-	0x10c00000: 106, // de
-	0x10c0002d: 107, // de-AT
-	0x10c00035: 108, // de-BE
-	0x10c0004d: 109, // de-CH
-	0x10c0005f: 110, // de-DE
-	0x10c0009d: 111, // de-IT
-	0x10c000b1: 112, // de-LI
-	0x10c000b6: 113, // de-LU
-	0x11600000: 114, // dje
-	0x116000d3: 115, // dje-NE
-	0x11e00000: 116, // dsb
-	0x11e0005f: 117, // dsb-DE
-	0x12300000: 118, // dua
-	0x12300051: 119, // dua-CM
-	0x12700000: 120, // dv
-	0x12a00000: 121, // dyo
-	0x12a00113: 122, // dyo-SN
-	0x12c00000: 123, // dz
-	0x12c00042: 124, // dz-BT
-	0x12e00000: 125, // ebu
-	0x12e000a3: 126, // ebu-KE
-	0x12f00000: 127, // ee
-	0x12f0007f: 128, // ee-GH
-	0x12f00121: 129, // ee-TG
-	0x13500000: 130, // el
-	0x1350005c: 131, // el-CY
-	0x13500086: 132, // el-GR
-	0x13800000: 133, // en
-	0x13800001: 134, // en-001
-	0x1380001a: 135, // en-150
-	0x13800024: 136, // en-AG
-	0x13800025: 137, // en-AI
-	0x1380002c: 138, // en-AS
-	0x1380002d: 139, // en-AT
-	0x1380002e: 140, // en-AU
-	0x13800033: 141, // en-BB
-	0x13800035: 142, // en-BE
-	0x13800039: 143, // en-BI
-	0x1380003c: 144, // en-BM
-	0x13800041: 145, // en-BS
-	0x13800045: 146, // en-BW
-	0x13800047: 147, // en-BZ
-	0x13800048: 148, // en-CA
-	0x13800049: 149, // en-CC
-	0x1380004d: 150, // en-CH
-	0x1380004f: 151, // en-CK
-	0x13800051: 152, // en-CM
-	0x1380005b: 153, // en-CX
-	0x1380005c: 154, // en-CY
-	0x1380005f: 155, // en-DE
-	0x13800060: 156, // en-DG
-	0x13800062: 157, // en-DK
-	0x13800063: 158, // en-DM
-	0x1380006c: 159, // en-ER
-	0x13800071: 160, // en-FI
-	0x13800072: 161, // en-FJ
-	0x13800073: 162, // en-FK
-	0x13800074: 163, // en-FM
-	0x1380007a: 164, // en-GB
-	0x1380007b: 165, // en-GD
-	0x1380007e: 166, // en-GG
-	0x1380007f: 167, // en-GH
-	0x13800080: 168, // en-GI
-	0x13800082: 169, // en-GM
-	0x13800089: 170, // en-GU
-	0x1380008b: 171, // en-GY
-	0x1380008c: 172, // en-HK
-	0x13800095: 173, // en-IE
-	0x13800096: 174, // en-IL
-	0x13800097: 175, // en-IM
-	0x13800098: 176, // en-IN
-	0x13800099: 177, // en-IO
-	0x1380009e: 178, // en-JE
-	0x1380009f: 179, // en-JM
-	0x138000a3: 180, // en-KE
-	0x138000a6: 181, // en-KI
-	0x138000a8: 182, // en-KN
-	0x138000ac: 183, // en-KY
-	0x138000b0: 184, // en-LC
-	0x138000b3: 185, // en-LR
-	0x138000b4: 186, // en-LS
-	0x138000be: 187, // en-MG
-	0x138000bf: 188, // en-MH
-	0x138000c5: 189, // en-MO
-	0x138000c6: 190, // en-MP
-	0x138000c9: 191, // en-MS
-	0x138000ca: 192, // en-MT
-	0x138000cb: 193, // en-MU
-	0x138000cd: 194, // en-MW
-	0x138000cf: 195, // en-MY
-	0x138000d1: 196, // en-NA
-	0x138000d4: 197, // en-NF
-	0x138000d5: 198, // en-NG
-	0x138000d8: 199, // en-NL
-	0x138000dc: 200, // en-NR
-	0x138000de: 201, // en-NU
-	0x138000df: 202, // en-NZ
-	0x138000e5: 203, // en-PG
-	0x138000e6: 204, // en-PH
-	0x138000e7: 205, // en-PK
-	0x138000ea: 206, // en-PN
-	0x138000eb: 207, // en-PR
-	0x138000ef: 208, // en-PW
-	0x13800106: 209, // en-RW
-	0x13800108: 210, // en-SB
-	0x13800109: 211, // en-SC
-	0x1380010a: 212, // en-SD
-	0x1380010b: 213, // en-SE
-	0x1380010c: 214, // en-SG
-	0x1380010d: 215, // en-SH
-	0x1380010e: 216, // en-SI
-	0x13800111: 217, // en-SL
-	0x13800116: 218, // en-SS
-	0x1380011a: 219, // en-SX
-	0x1380011c: 220, // en-SZ
-	0x1380011e: 221, // en-TC
-	0x13800124: 222, // en-TK
-	0x13800128: 223, // en-TO
-	0x1380012b: 224, // en-TT
-	0x1380012c: 225, // en-TV
-	0x1380012e: 226, // en-TZ
-	0x13800130: 227, // en-UG
-	0x13800132: 228, // en-UM
-	0x13800134: 229, // en-US
-	0x13800138: 230, // en-VC
-	0x1380013b: 231, // en-VG
-	0x1380013c: 232, // en-VI
-	0x1380013e: 233, // en-VU
-	0x13800141: 234, // en-WS
-	0x13800160: 235, // en-ZA
-	0x13800161: 236, // en-ZM
-	0x13800163: 237, // en-ZW
-	0x13b00000: 238, // eo
-	0x13b00001: 239, // eo-001
-	0x13d00000: 240, // es
-	0x13d0001e: 241, // es-419
-	0x13d0002b: 242, // es-AR
-	0x13d0003e: 243, // es-BO
-	0x13d00040: 244, // es-BR
-	0x13d00047: 245, // es-BZ
-	0x13d00050: 246, // es-CL
-	0x13d00053: 247, // es-CO
-	0x13d00055: 248, // es-CR
-	0x13d00058: 249, // es-CU
-	0x13d00064: 250, // es-DO
-	0x13d00067: 251, // es-EA
-	0x13d00068: 252, // es-EC
-	0x13d0006d: 253, // es-ES
-	0x13d00085: 254, // es-GQ
-	0x13d00088: 255, // es-GT
-	0x13d0008e: 256, // es-HN
-	0x13d00093: 257, // es-IC
-	0x13d000ce: 258, // es-MX
-	0x13d000d7: 259, // es-NI
-	0x13d000e1: 260, // es-PA
-	0x13d000e3: 261, // es-PE
-	0x13d000e6: 262, // es-PH
-	0x13d000eb: 263, // es-PR
-	0x13d000f0: 264, // es-PY
-	0x13d00119: 265, // es-SV
-	0x13d00134: 266, // es-US
-	0x13d00135: 267, // es-UY
-	0x13d0013a: 268, // es-VE
-	0x13f00000: 269, // et
-	0x13f00069: 270, // et-EE
-	0x14400000: 271, // eu
-	0x1440006d: 272, // eu-ES
-	0x14500000: 273, // ewo
-	0x14500051: 274, // ewo-CM
-	0x14700000: 275, // fa
-	0x14700023: 276, // fa-AF
-	0x1470009b: 277, // fa-IR
-	0x14d00000: 278, // ff
-	0x14d00051: 279, // ff-CM
-	0x14d00083: 280, // ff-GN
-	0x14d000c8: 281, // ff-MR
-	0x14d00113: 282, // ff-SN
-	0x15000000: 283, // fi
-	0x15000071: 284, // fi-FI
-	0x15200000: 285, // fil
-	0x152000e6: 286, // fil-PH
-	0x15700000: 287, // fo
-	0x15700062: 288, // fo-DK
-	0x15700075: 289, // fo-FO
-	0x15d00000: 290, // fr
-	0x15d00035: 291, // fr-BE
-	0x15d00036: 292, // fr-BF
-	0x15d00039: 293, // fr-BI
-	0x15d0003a: 294, // fr-BJ
-	0x15d0003b: 295, // fr-BL
-	0x15d00048: 296, // fr-CA
-	0x15d0004a: 297, // fr-CD
-	0x15d0004b: 298, // fr-CF
-	0x15d0004c: 299, // fr-CG
-	0x15d0004d: 300, // fr-CH
-	0x15d0004e: 301, // fr-CI
-	0x15d00051: 302, // fr-CM
-	0x15d00061: 303, // fr-DJ
-	0x15d00066: 304, // fr-DZ
-	0x15d00077: 305, // fr-FR
-	0x15d00079: 306, // fr-GA
-	0x15d0007d: 307, // fr-GF
-	0x15d00083: 308, // fr-GN
-	0x15d00084: 309, // fr-GP
-	0x15d00085: 310, // fr-GQ
-	0x15d00090: 311, // fr-HT
-	0x15d000a7: 312, // fr-KM
-	0x15d000b6: 313, // fr-LU
-	0x15d000b9: 314, // fr-MA
-	0x15d000ba: 315, // fr-MC
-	0x15d000bd: 316, // fr-MF
-	0x15d000be: 317, // fr-MG
-	0x15d000c2: 318, // fr-ML
-	0x15d000c7: 319, // fr-MQ
-	0x15d000c8: 320, // fr-MR
-	0x15d000cb: 321, // fr-MU
-	0x15d000d2: 322, // fr-NC
-	0x15d000d3: 323, // fr-NE
-	0x15d000e4: 324, // fr-PF
-	0x15d000e9: 325, // fr-PM
-	0x15d00101: 326, // fr-RE
-	0x15d00106: 327, // fr-RW
-	0x15d00109: 328, // fr-SC
-	0x15d00113: 329, // fr-SN
-	0x15d0011b: 330, // fr-SY
-	0x15d0011f: 331, // fr-TD
-	0x15d00121: 332, // fr-TG
-	0x15d00127: 333, // fr-TN
-	0x15d0013e: 334, // fr-VU
-	0x15d0013f: 335, // fr-WF
-	0x15d0015e: 336, // fr-YT
-	0x16800000: 337, // fur
-	0x1680009d: 338, // fur-IT
-	0x16c00000: 339, // fy
-	0x16c000d8: 340, // fy-NL
-	0x16d00000: 341, // ga
-	0x16d00095: 342, // ga-IE
-	0x17c00000: 343, // gd
-	0x17c0007a: 344, // gd-GB
-	0x18e00000: 345, // gl
-	0x18e0006d: 346, // gl-ES
-	0x1a100000: 347, // gsw
-	0x1a10004d: 348, // gsw-CH
-	0x1a100077: 349, // gsw-FR
-	0x1a1000b1: 350, // gsw-LI
-	0x1a200000: 351, // gu
-	0x1a200098: 352, // gu-IN
-	0x1a700000: 353, // guw
-	0x1a900000: 354, // guz
-	0x1a9000a3: 355, // guz-KE
-	0x1aa00000: 356, // gv
-	0x1aa00097: 357, // gv-IM
-	0x1b200000: 358, // ha
-	0x1b20007f: 359, // ha-GH
-	0x1b2000d3: 360, // ha-NE
-	0x1b2000d5: 361, // ha-NG
-	0x1b600000: 362, // haw
-	0x1b600134: 363, // haw-US
-	0x1ba00000: 364, // he
-	0x1ba00096: 365, // he-IL
-	0x1bc00000: 366, // hi
-	0x1bc00098: 367, // hi-IN
-	0x1cf00000: 368, // hr
-	0x1cf00032: 369, // hr-BA
-	0x1cf0008f: 370, // hr-HR
-	0x1d000000: 371, // hsb
-	0x1d00005f: 372, // hsb-DE
-	0x1d300000: 373, // hu
-	0x1d300091: 374, // hu-HU
-	0x1d500000: 375, // hy
-	0x1d500027: 376, // hy-AM
-	0x1df00000: 377, // id
-	0x1df00094: 378, // id-ID
-	0x1e500000: 379, // ig
-	0x1e5000d5: 380, // ig-NG
-	0x1e800000: 381, // ii
-	0x1e800052: 382, // ii-CN
-	0x1f600000: 383, // is
-	0x1f60009c: 384, // is-IS
-	0x1f700000: 385, // it
-	0x1f70004d: 386, // it-CH
-	0x1f70009d: 387, // it-IT
-	0x1f700112: 388, // it-SM
-	0x1f700137: 389, // it-VA
-	0x1f800000: 390, // iu
-	0x1fe00000: 391, // ja
-	0x1fe000a1: 392, // ja-JP
-	0x20100000: 393, // jbo
-	0x20500000: 394, // jgo
-	0x20500051: 395, // jgo-CM
-	0x20800000: 396, // jmc
-	0x2080012e: 397, // jmc-TZ
-	0x20c00000: 398, // jv
-	0x20e00000: 399, // ka
-	0x20e0007c: 400, // ka-GE
-	0x21000000: 401, // kab
-	0x21000066: 402, // kab-DZ
-	0x21400000: 403, // kaj
-	0x21500000: 404, // kam
-	0x215000a3: 405, // kam-KE
-	0x21d00000: 406, // kcg
-	0x22100000: 407, // kde
-	0x2210012e: 408, // kde-TZ
-	0x22500000: 409, // kea
-	0x22500059: 410, // kea-CV
-	0x23200000: 411, // khq
-	0x232000c2: 412, // khq-ML
-	0x23700000: 413, // ki
-	0x237000a3: 414, // ki-KE
-	0x24000000: 415, // kk
-	0x240000ad: 416, // kk-KZ
-	0x24200000: 417, // kkj
-	0x24200051: 418, // kkj-CM
-	0x24300000: 419, // kl
-	0x24300081: 420, // kl-GL
-	0x24400000: 421, // kln
-	0x244000a3: 422, // kln-KE
-	0x24800000: 423, // km
-	0x248000a5: 424, // km-KH
-	0x24f00000: 425, // kn
-	0x24f00098: 426, // kn-IN
-	0x25200000: 427, // ko
-	0x252000a9: 428, // ko-KP
-	0x252000aa: 429, // ko-KR
-	0x25400000: 430, // kok
-	0x25400098: 431, // kok-IN
-	0x26800000: 432, // ks
-	0x26800098: 433, // ks-IN
-	0x26900000: 434, // ksb
-	0x2690012e: 435, // ksb-TZ
-	0x26b00000: 436, // ksf
-	0x26b00051: 437, // ksf-CM
-	0x26c00000: 438, // ksh
-	0x26c0005f: 439, // ksh-DE
-	0x27200000: 440, // ku
-	0x27f00000: 441, // kw
-	0x27f0007a: 442, // kw-GB
-	0x28800000: 443, // ky
-	0x288000a4: 444, // ky-KG
-	0x28f00000: 445, // lag
-	0x28f0012e: 446, // lag-TZ
-	0x29300000: 447, // lb
-	0x293000b6: 448, // lb-LU
-	0x2a100000: 449, // lg
-	0x2a100130: 450, // lg-UG
-	0x2ad00000: 451, // lkt
-	0x2ad00134: 452, // lkt-US
-	0x2b300000: 453, // ln
-	0x2b300029: 454, // ln-AO
-	0x2b30004a: 455, // ln-CD
-	0x2b30004b: 456, // ln-CF
-	0x2b30004c: 457, // ln-CG
-	0x2b600000: 458, // lo
-	0x2b6000ae: 459, // lo-LA
-	0x2bd00000: 460, // lrc
-	0x2bd0009a: 461, // lrc-IQ
-	0x2bd0009b: 462, // lrc-IR
-	0x2be00000: 463, // lt
-	0x2be000b5: 464, // lt-LT
-	0x2c000000: 465, // lu
-	0x2c00004a: 466, // lu-CD
-	0x2c200000: 467, // luo
-	0x2c2000a3: 468, // luo-KE
-	0x2c300000: 469, // luy
-	0x2c3000a3: 470, // luy-KE
-	0x2c500000: 471, // lv
-	0x2c5000b7: 472, // lv-LV
-	0x2cf00000: 473, // mas
-	0x2cf000a3: 474, // mas-KE
-	0x2cf0012e: 475, // mas-TZ
-	0x2e700000: 476, // mer
-	0x2e7000a3: 477, // mer-KE
-	0x2eb00000: 478, // mfe
-	0x2eb000cb: 479, // mfe-MU
-	0x2ef00000: 480, // mg
-	0x2ef000be: 481, // mg-MG
-	0x2f000000: 482, // mgh
-	0x2f0000d0: 483, // mgh-MZ
-	0x2f200000: 484, // mgo
-	0x2f200051: 485, // mgo-CM
-	0x2fd00000: 486, // mk
-	0x2fd000c1: 487, // mk-MK
-	0x30200000: 488, // ml
-	0x30200098: 489, // ml-IN
-	0x30900000: 490, // mn
-	0x309000c4: 491, // mn-MN
-	0x31900000: 492, // mr
-	0x31900098: 493, // mr-IN
-	0x31d00000: 494, // ms
-	0x31d0003d: 495, // ms-BN
-	0x31d000cf: 496, // ms-MY
-	0x31d0010c: 497, // ms-SG
-	0x31e00000: 498, // mt
-	0x31e000ca: 499, // mt-MT
-	0x32300000: 500, // mua
-	0x32300051: 501, // mua-CM
-	0x32f00000: 502, // my
-	0x32f000c3: 503, // my-MM
-	0x33800000: 504, // mzn
-	0x3380009b: 505, // mzn-IR
-	0x33f00000: 506, // nah
-	0x34300000: 507, // naq
-	0x343000d1: 508, // naq-NA
-	0x34500000: 509, // nb
-	0x345000d9: 510, // nb-NO
-	0x3450010f: 511, // nb-SJ
-	0x34c00000: 512, // nd
-	0x34c00163: 513, // nd-ZW
-	0x34e00000: 514, // nds
-	0x34e0005f: 515, // nds-DE
-	0x34e000d8: 516, // nds-NL
-	0x34f00000: 517, // ne
-	0x34f00098: 518, // ne-IN
-	0x34f000da: 519, // ne-NP
-	0x36500000: 520, // nl
-	0x3650002f: 521, // nl-AW
-	0x36500035: 522, // nl-BE
-	0x3650003f: 523, // nl-BQ
-	0x3650005a: 524, // nl-CW
-	0x365000d8: 525, // nl-NL
-	0x36500115: 526, // nl-SR
-	0x3650011a: 527, // nl-SX
-	0x36600000: 528, // nmg
-	0x36600051: 529, // nmg-CM
-	0x36800000: 530, // nn
-	0x368000d9: 531, // nn-NO
-	0x36a00000: 532, // nnh
-	0x36a00051: 533, // nnh-CM
-	0x36d00000: 534, // no
-	0x37300000: 535, // nqo
-	0x37400000: 536, // nr
-	0x37800000: 537, // nso
-	0x37e00000: 538, // nus
-	0x37e00116: 539, // nus-SS
-	0x38500000: 540, // ny
-	0x38700000: 541, // nyn
-	0x38700130: 542, // nyn-UG
-	0x38e00000: 543, // om
-	0x38e0006e: 544, // om-ET
-	0x38e000a3: 545, // om-KE
-	0x39300000: 546, // or
-	0x39300098: 547, // or-IN
-	0x39600000: 548, // os
-	0x3960007c: 549, // os-GE
-	0x39600105: 550, // os-RU
-	0x39b00000: 551, // pa
-	0x39b05000: 552, // pa-Arab
-	0x39b050e7: 553, // pa-Arab-PK
-	0x39b2f000: 554, // pa-Guru
-	0x39b2f098: 555, // pa-Guru-IN
-	0x39f00000: 556, // pap
-	0x3b100000: 557, // pl
-	0x3b1000e8: 558, // pl-PL
-	0x3bb00000: 559, // prg
-	0x3bb00001: 560, // prg-001
-	0x3bc00000: 561, // ps
-	0x3bc00023: 562, // ps-AF
-	0x3be00000: 563, // pt
-	0x3be00029: 564, // pt-AO
-	0x3be00040: 565, // pt-BR
-	0x3be0004d: 566, // pt-CH
-	0x3be00059: 567, // pt-CV
-	0x3be00085: 568, // pt-GQ
-	0x3be0008a: 569, // pt-GW
-	0x3be000b6: 570, // pt-LU
-	0x3be000c5: 571, // pt-MO
-	0x3be000d0: 572, // pt-MZ
-	0x3be000ed: 573, // pt-PT
-	0x3be00117: 574, // pt-ST
-	0x3be00125: 575, // pt-TL
-	0x3c200000: 576, // qu
-	0x3c20003e: 577, // qu-BO
-	0x3c200068: 578, // qu-EC
-	0x3c2000e3: 579, // qu-PE
-	0x3d200000: 580, // rm
-	0x3d20004d: 581, // rm-CH
-	0x3d700000: 582, // rn
-	0x3d700039: 583, // rn-BI
-	0x3da00000: 584, // ro
-	0x3da000bb: 585, // ro-MD
-	0x3da00103: 586, // ro-RO
-	0x3dc00000: 587, // rof
-	0x3dc0012e: 588, // rof-TZ
-	0x3e000000: 589, // ru
-	0x3e000046: 590, // ru-BY
-	0x3e0000a4: 591, // ru-KG
-	0x3e0000ad: 592, // ru-KZ
-	0x3e0000bb: 593, // ru-MD
-	0x3e000105: 594, // ru-RU
-	0x3e00012f: 595, // ru-UA
-	0x3e300000: 596, // rw
-	0x3e300106: 597, // rw-RW
-	0x3e400000: 598, // rwk
-	0x3e40012e: 599, // rwk-TZ
-	0x3e900000: 600, // sah
-	0x3e900105: 601, // sah-RU
-	0x3ea00000: 602, // saq
-	0x3ea000a3: 603, // saq-KE
-	0x3f100000: 604, // sbp
-	0x3f10012e: 605, // sbp-TZ
-	0x3fa00000: 606, // sdh
-	0x3fb00000: 607, // se
-	0x3fb00071: 608, // se-FI
-	0x3fb000d9: 609, // se-NO
-	0x3fb0010b: 610, // se-SE
-	0x3fd00000: 611, // seh
-	0x3fd000d0: 612, // seh-MZ
-	0x3ff00000: 613, // ses
-	0x3ff000c2: 614, // ses-ML
-	0x40000000: 615, // sg
-	0x4000004b: 616, // sg-CF
-	0x40600000: 617, // shi
-	0x40652000: 618, // shi-Latn
-	0x406520b9: 619, // shi-Latn-MA
-	0x406d2000: 620, // shi-Tfng
-	0x406d20b9: 621, // shi-Tfng-MA
-	0x40a00000: 622, // si
-	0x40a000b2: 623, // si-LK
-	0x41000000: 624, // sk
-	0x41000110: 625, // sk-SK
-	0x41400000: 626, // sl
-	0x4140010e: 627, // sl-SI
-	0x41a00000: 628, // sma
-	0x41b00000: 629, // smi
-	0x41c00000: 630, // smj
-	0x41d00000: 631, // smn
-	0x41d00071: 632, // smn-FI
-	0x42000000: 633, // sms
-	0x42100000: 634, // sn
-	0x42100163: 635, // sn-ZW
-	0x42700000: 636, // so
-	0x42700061: 637, // so-DJ
-	0x4270006e: 638, // so-ET
-	0x427000a3: 639, // so-KE
-	0x42700114: 640, // so-SO
-	0x42f00000: 641, // sq
-	0x42f00026: 642, // sq-AL
-	0x42f000c1: 643, // sq-MK
-	0x42f0014c: 644, // sq-XK
-	0x43000000: 645, // sr
-	0x4301e000: 646, // sr-Cyrl
-	0x4301e032: 647, // sr-Cyrl-BA
-	0x4301e0bc: 648, // sr-Cyrl-ME
-	0x4301e104: 649, // sr-Cyrl-RS
-	0x4301e14c: 650, // sr-Cyrl-XK
-	0x43052000: 651, // sr-Latn
-	0x43052032: 652, // sr-Latn-BA
-	0x430520bc: 653, // sr-Latn-ME
-	0x43052104: 654, // sr-Latn-RS
-	0x4305214c: 655, // sr-Latn-XK
-	0x43500000: 656, // ss
-	0x43800000: 657, // ssy
-	0x43900000: 658, // st
-	0x44200000: 659, // sv
-	0x44200030: 660, // sv-AX
-	0x44200071: 661, // sv-FI
-	0x4420010b: 662, // sv-SE
-	0x44300000: 663, // sw
-	0x4430004a: 664, // sw-CD
-	0x443000a3: 665, // sw-KE
-	0x4430012e: 666, // sw-TZ
-	0x44300130: 667, // sw-UG
-	0x44c00000: 668, // syr
-	0x44e00000: 669, // ta
-	0x44e00098: 670, // ta-IN
-	0x44e000b2: 671, // ta-LK
-	0x44e000cf: 672, // ta-MY
-	0x44e0010c: 673, // ta-SG
-	0x45f00000: 674, // te
-	0x45f00098: 675, // te-IN
-	0x46200000: 676, // teo
-	0x462000a3: 677, // teo-KE
-	0x46200130: 678, // teo-UG
-	0x46900000: 679, // th
-	0x46900122: 680, // th-TH
-	0x46d00000: 681, // ti
-	0x46d0006c: 682, // ti-ER
-	0x46d0006e: 683, // ti-ET
-	0x46f00000: 684, // tig
-	0x47400000: 685, // tk
-	0x47400126: 686, // tk-TM
-	0x47e00000: 687, // tn
-	0x48000000: 688, // to
-	0x48000128: 689, // to-TO
-	0x48800000: 690, // tr
-	0x4880005c: 691, // tr-CY
-	0x4880012a: 692, // tr-TR
-	0x48c00000: 693, // ts
-	0x4a200000: 694, // twq
-	0x4a2000d3: 695, // twq-NE
-	0x4a700000: 696, // tzm
-	0x4a7000b9: 697, // tzm-MA
-	0x4aa00000: 698, // ug
-	0x4aa00052: 699, // ug-CN
-	0x4ac00000: 700, // uk
-	0x4ac0012f: 701, // uk-UA
-	0x4b200000: 702, // ur
-	0x4b200098: 703, // ur-IN
-	0x4b2000e7: 704, // ur-PK
-	0x4ba00000: 705, // uz
-	0x4ba05000: 706, // uz-Arab
-	0x4ba05023: 707, // uz-Arab-AF
-	0x4ba1e000: 708, // uz-Cyrl
-	0x4ba1e136: 709, // uz-Cyrl-UZ
-	0x4ba52000: 710, // uz-Latn
-	0x4ba52136: 711, // uz-Latn-UZ
-	0x4bc00000: 712, // vai
-	0x4bc52000: 713, // vai-Latn
-	0x4bc520b3: 714, // vai-Latn-LR
-	0x4bcd9000: 715, // vai-Vaii
-	0x4bcd90b3: 716, // vai-Vaii-LR
-	0x4be00000: 717, // ve
-	0x4c100000: 718, // vi
-	0x4c10013d: 719, // vi-VN
-	0x4c700000: 720, // vo
-	0x4c700001: 721, // vo-001
-	0x4ca00000: 722, // vun
-	0x4ca0012e: 723, // vun-TZ
-	0x4cc00000: 724, // wa
-	0x4cd00000: 725, // wae
-	0x4cd0004d: 726, // wae-CH
-	0x4e300000: 727, // wo
-	0x4f000000: 728, // xh
-	0x4f900000: 729, // xog
-	0x4f900130: 730, // xog-UG
-	0x50700000: 731, // yav
-	0x50700051: 732, // yav-CM
-	0x51000000: 733, // yi
-	0x51000001: 734, // yi-001
-	0x51600000: 735, // yo
-	0x5160003a: 736, // yo-BJ
-	0x516000d5: 737, // yo-NG
-	0x51d00000: 738, // yue
-	0x51d0008c: 739, // yue-HK
-	0x52600000: 740, // zgh
-	0x526000b9: 741, // zgh-MA
-	0x52700000: 742, // zh
-	0x52734000: 743, // zh-Hans
-	0x52734052: 744, // zh-Hans-CN
-	0x5273408c: 745, // zh-Hans-HK
-	0x527340c5: 746, // zh-Hans-MO
-	0x5273410c: 747, // zh-Hans-SG
-	0x52735000: 748, // zh-Hant
-	0x5273508c: 749, // zh-Hant-HK
-	0x527350c5: 750, // zh-Hant-MO
-	0x5273512d: 751, // zh-Hant-TW
-	0x52c00000: 752, // zu
-	0x52c00160: 753, // zu-ZA
-}
-
-// Total table size 4592 bytes (4KiB); checksum: C25F8AFF
diff --git a/vendor/golang.org/x/text/language/language.go b/vendor/golang.org/x/text/language/language.go
deleted file mode 100644
index f1012c9525..0000000000
--- a/vendor/golang.org/x/text/language/language.go
+++ /dev/null
@@ -1,982 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate go run gen.go gen_common.go -output tables.go
-//go:generate go run gen_index.go
-
-// Package language implements BCP 47 language tags and related functionality.
-//
-// The Tag type, which is used to represent languages, is agnostic to the
-// meaning of its subtags. Tags are not fully canonicalized to preserve
-// information that may be valuable in certain contexts. As a consequence, two
-// different tags may represent identical languages.
-//
-// Initializing language- or locale-specific components usually consists of
-// two steps. The first step is to select a display language based on the
-// preferred languages of the user and the languages supported by an application.
-// The second step is to create the language-specific services based on
-// this selection. Each is discussed in more details below.
-//
-// Matching preferred against supported languages
-//
-// An application may support various languages. This list is typically limited
-// by the languages for which there exists translations of the user interface.
-// Similarly, a user may provide a list of preferred languages which is limited
-// by the languages understood by this user.
-// An application should use a Matcher to find the best supported language based
-// on the user's preferred list.
-// Matchers are aware of the intricacies of equivalence between languages.
-// The default Matcher implementation takes into account things such as
-// deprecated subtags, legacy tags, and mutual intelligibility between scripts
-// and languages.
-//
-// A Matcher for English, Australian English, Danish, and standard Mandarin can
-// be defined as follows:
-//
-//		var matcher = language.NewMatcher([]language.Tag{
-//			language.English,   // The first language is used as fallback.
-// 			language.MustParse("en-AU"),
-//			language.Danish,
-//			language.Chinese,
-//		})
-//
-// The following code selects the best match for someone speaking Spanish and
-// Norwegian:
-//
-// 		preferred := []language.Tag{ language.Spanish, language.Norwegian }
-//		tag, _, _ := matcher.Match(preferred...)
-//
-// In this case, the best match is Danish, as Danish is sufficiently a match to
-// Norwegian to not have to fall back to the default.
-// See ParseAcceptLanguage on how to handle the Accept-Language HTTP header.
-//
-// Selecting language-specific services
-//
-// One should always use the Tag returned by the Matcher to create an instance
-// of any of the language-specific services provided by the text repository.
-// This prevents the mixing of languages, such as having a different language for
-// messages and display names, as well as improper casing or sorting order for
-// the selected language.
-// Using the returned Tag also allows user-defined settings, such as collation
-// order or numbering system to be transparently passed as options.
-//
-// If you have language-specific data in your application, however, it will in
-// most cases suffice to use the index returned by the matcher to identify
-// the user language.
-// The following loop provides an alternative in case this is not sufficient:
-//
-// 		supported := map[language.Tag]data{
-//			language.English:            enData,
-// 			language.MustParse("en-AU"): enAUData,
-//			language.Danish:             daData,
-//			language.Chinese:            zhData,
-// 		}
-//		tag, _, _ := matcher.Match(preferred...)
-//		for ; tag != language.Und; tag = tag.Parent() {
-//			if v, ok := supported[tag]; ok {
-//				return v
-//			}
-//		}
-// 		return enData // should not reach here
-//
-// Repeatedly taking the Parent of the tag returned by Match will eventually
-// match one of the tags used to initialize the Matcher.
-//
-// Canonicalization
-//
-// By default, only legacy and deprecated tags are converted into their
-// canonical equivalent. All other information is preserved. This approach makes
-// the confidence scores more accurate and allows matchers to distinguish
-// between variants that are otherwise lost.
-//
-// As a consequence, two tags that should be treated as identical according to
-// BCP 47 or CLDR, like "en-Latn" and "en", will be represented differently. The
-// Matchers will handle such distinctions, though, and are aware of the
-// equivalence relations. The CanonType type can be used to alter the
-// canonicalization form.
-//
-// References
-//
-// BCP 47 - Tags for Identifying Languages
-// http://tools.ietf.org/html/bcp47
-package language // import "golang.org/x/text/language"
-
-// TODO: Remove above NOTE after:
-// - verifying that tables are dropped correctly (most notably matcher tables).
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-)
-
-const (
-	// maxCoreSize is the maximum size of a BCP 47 tag without variants and
-	// extensions. Equals max lang (3) + script (4) + max reg (3) + 2 dashes.
-	maxCoreSize = 12
-
-	// max99thPercentileSize is a somewhat arbitrary buffer size that presumably
-	// is large enough to hold at least 99% of the BCP 47 tags.
-	max99thPercentileSize = 32
-
-	// maxSimpleUExtensionSize is the maximum size of a -u extension with one
-	// key-type pair. Equals len("-u-") + key (2) + dash + max value (8).
-	maxSimpleUExtensionSize = 14
-)
-
-// Tag represents a BCP 47 language tag. It is used to specify an instance of a
-// specific language or locale. All language tag values are guaranteed to be
-// well-formed.
-type Tag struct {
-	lang   langID
-	region regionID
-	// TODO: we will soon run out of positions for script. Idea: instead of
-	// storing lang, region, and script codes, store only the compact index and
-	// have a lookup table from this code to its expansion. This greatly speeds
-	// up table lookup, speed up common variant cases.
-	// This will also immediately free up 3 extra bytes. Also, the pVariant
-	// field can now be moved to the lookup table, as the compact index uniquely
-	// determines the offset of a possible variant.
-	script   scriptID
-	pVariant byte   // offset in str, includes preceding '-'
-	pExt     uint16 // offset of first extension, includes preceding '-'
-
-	// str is the string representation of the Tag. It will only be used if the
-	// tag has variants or extensions.
-	str string
-}
-
-// Make is a convenience wrapper for Parse that omits the error.
-// In case of an error, a sensible default is returned.
-func Make(s string) Tag {
-	return Default.Make(s)
-}
-
-// Make is a convenience wrapper for c.Parse that omits the error.
-// In case of an error, a sensible default is returned.
-func (c CanonType) Make(s string) Tag {
-	t, _ := c.Parse(s)
-	return t
-}
-
-// Raw returns the raw base language, script and region, without making an
-// attempt to infer their values.
-func (t Tag) Raw() (b Base, s Script, r Region) {
-	return Base{t.lang}, Script{t.script}, Region{t.region}
-}
-
-// equalTags compares language, script and region subtags only.
-func (t Tag) equalTags(a Tag) bool {
-	return t.lang == a.lang && t.script == a.script && t.region == a.region
-}
-
-// IsRoot returns true if t is equal to language "und".
-func (t Tag) IsRoot() bool {
-	if int(t.pVariant) < len(t.str) {
-		return false
-	}
-	return t.equalTags(und)
-}
-
-// private reports whether the Tag consists solely of a private use tag.
-func (t Tag) private() bool {
-	return t.str != "" && t.pVariant == 0
-}
-
-// CanonType can be used to enable or disable various types of canonicalization.
-type CanonType int
-
-const (
-	// Replace deprecated base languages with their preferred replacements.
-	DeprecatedBase CanonType = 1 << iota
-	// Replace deprecated scripts with their preferred replacements.
-	DeprecatedScript
-	// Replace deprecated regions with their preferred replacements.
-	DeprecatedRegion
-	// Remove redundant scripts.
-	SuppressScript
-	// Normalize legacy encodings. This includes legacy languages defined in
-	// CLDR as well as bibliographic codes defined in ISO-639.
-	Legacy
-	// Map the dominant language of a macro language group to the macro language
-	// subtag. For example cmn -> zh.
-	Macro
-	// The CLDR flag should be used if full compatibility with CLDR is required.
-	// There are a few cases where language.Tag may differ from CLDR. To follow all
-	// of CLDR's suggestions, use All|CLDR.
-	CLDR
-
-	// Raw can be used to Compose or Parse without Canonicalization.
-	Raw CanonType = 0
-
-	// Replace all deprecated tags with their preferred replacements.
-	Deprecated = DeprecatedBase | DeprecatedScript | DeprecatedRegion
-
-	// All canonicalizations recommended by BCP 47.
-	BCP47 = Deprecated | SuppressScript
-
-	// All canonicalizations.
-	All = BCP47 | Legacy | Macro
-
-	// Default is the canonicalization used by Parse, Make and Compose. To
-	// preserve as much information as possible, canonicalizations that remove
-	// potentially valuable information are not included. The Matcher is
-	// designed to recognize similar tags that would be the same if
-	// they were canonicalized using All.
-	Default = Deprecated | Legacy
-
-	canonLang = DeprecatedBase | Legacy | Macro
-
-	// TODO: LikelyScript, LikelyRegion: suppress similar to ICU.
-)
-
-// canonicalize returns the canonicalized equivalent of the tag and
-// whether there was any change.
-func (t Tag) canonicalize(c CanonType) (Tag, bool) {
-	if c == Raw {
-		return t, false
-	}
-	changed := false
-	if c&SuppressScript != 0 {
-		if t.lang < langNoIndexOffset && uint8(t.script) == suppressScript[t.lang] {
-			t.script = 0
-			changed = true
-		}
-	}
-	if c&canonLang != 0 {
-		for {
-			if l, aliasType := normLang(t.lang); l != t.lang {
-				switch aliasType {
-				case langLegacy:
-					if c&Legacy != 0 {
-						if t.lang == _sh && t.script == 0 {
-							t.script = _Latn
-						}
-						t.lang = l
-						changed = true
-					}
-				case langMacro:
-					if c&Macro != 0 {
-						// We deviate here from CLDR. The mapping "nb" -> "no"
-						// qualifies as a typical Macro language mapping.  However,
-						// for legacy reasons, CLDR maps "no", the macro language
-						// code for Norwegian, to the dominant variant "nb". This
-						// change is currently under consideration for CLDR as well.
-						// See http://unicode.org/cldr/trac/ticket/2698 and also
-						// http://unicode.org/cldr/trac/ticket/1790 for some of the
-						// practical implications. TODO: this check could be removed
-						// if CLDR adopts this change.
-						if c&CLDR == 0 || t.lang != _nb {
-							changed = true
-							t.lang = l
-						}
-					}
-				case langDeprecated:
-					if c&DeprecatedBase != 0 {
-						if t.lang == _mo && t.region == 0 {
-							t.region = _MD
-						}
-						t.lang = l
-						changed = true
-						// Other canonicalization types may still apply.
-						continue
-					}
-				}
-			} else if c&Legacy != 0 && t.lang == _no && c&CLDR != 0 {
-				t.lang = _nb
-				changed = true
-			}
-			break
-		}
-	}
-	if c&DeprecatedScript != 0 {
-		if t.script == _Qaai {
-			changed = true
-			t.script = _Zinh
-		}
-	}
-	if c&DeprecatedRegion != 0 {
-		if r := normRegion(t.region); r != 0 {
-			changed = true
-			t.region = r
-		}
-	}
-	return t, changed
-}
-
-// Canonicalize returns the canonicalized equivalent of the tag.
-func (c CanonType) Canonicalize(t Tag) (Tag, error) {
-	t, changed := t.canonicalize(c)
-	if changed {
-		t.remakeString()
-	}
-	return t, nil
-}
-
-// Confidence indicates the level of certainty for a given return value.
-// For example, Serbian may be written in Cyrillic or Latin script.
-// The confidence level indicates whether a value was explicitly specified,
-// whether it is typically the only possible value, or whether there is
-// an ambiguity.
-type Confidence int
-
-const (
-	No    Confidence = iota // full confidence that there was no match
-	Low                     // most likely value picked out of a set of alternatives
-	High                    // value is generally assumed to be the correct match
-	Exact                   // exact match or explicitly specified value
-)
-
-var confName = []string{"No", "Low", "High", "Exact"}
-
-func (c Confidence) String() string {
-	return confName[c]
-}
-
-// remakeString is used to update t.str in case lang, script or region changed.
-// It is assumed that pExt and pVariant still point to the start of the
-// respective parts.
-func (t *Tag) remakeString() {
-	if t.str == "" {
-		return
-	}
-	extra := t.str[t.pVariant:]
-	if t.pVariant > 0 {
-		extra = extra[1:]
-	}
-	if t.equalTags(und) && strings.HasPrefix(extra, "x-") {
-		t.str = extra
-		t.pVariant = 0
-		t.pExt = 0
-		return
-	}
-	var buf [max99thPercentileSize]byte // avoid extra memory allocation in most cases.
-	b := buf[:t.genCoreBytes(buf[:])]
-	if extra != "" {
-		diff := len(b) - int(t.pVariant)
-		b = append(b, '-')
-		b = append(b, extra...)
-		t.pVariant = uint8(int(t.pVariant) + diff)
-		t.pExt = uint16(int(t.pExt) + diff)
-	} else {
-		t.pVariant = uint8(len(b))
-		t.pExt = uint16(len(b))
-	}
-	t.str = string(b)
-}
-
-// genCoreBytes writes a string for the base languages, script and region tags
-// to the given buffer and returns the number of bytes written. It will never
-// write more than maxCoreSize bytes.
-func (t *Tag) genCoreBytes(buf []byte) int {
-	n := t.lang.stringToBuf(buf[:])
-	if t.script != 0 {
-		n += copy(buf[n:], "-")
-		n += copy(buf[n:], t.script.String())
-	}
-	if t.region != 0 {
-		n += copy(buf[n:], "-")
-		n += copy(buf[n:], t.region.String())
-	}
-	return n
-}
-
-// String returns the canonical string representation of the language tag.
-func (t Tag) String() string {
-	if t.str != "" {
-		return t.str
-	}
-	if t.script == 0 && t.region == 0 {
-		return t.lang.String()
-	}
-	buf := [maxCoreSize]byte{}
-	return string(buf[:t.genCoreBytes(buf[:])])
-}
-
-// Base returns the base language of the language tag. If the base language is
-// unspecified, an attempt will be made to infer it from the context.
-// It uses a variant of CLDR's Add Likely Subtags algorithm. This is subject to change.
-func (t Tag) Base() (Base, Confidence) {
-	if t.lang != 0 {
-		return Base{t.lang}, Exact
-	}
-	c := High
-	if t.script == 0 && !(Region{t.region}).IsCountry() {
-		c = Low
-	}
-	if tag, err := addTags(t); err == nil && tag.lang != 0 {
-		return Base{tag.lang}, c
-	}
-	return Base{0}, No
-}
-
-// Script infers the script for the language tag. If it was not explicitly given, it will infer
-// a most likely candidate.
-// If more than one script is commonly used for a language, the most likely one
-// is returned with a low confidence indication. For example, it returns (Cyrl, Low)
-// for Serbian.
-// If a script cannot be inferred (Zzzz, No) is returned. We do not use Zyyy (undetermined)
-// as one would suspect from the IANA registry for BCP 47. In a Unicode context Zyyy marks
-// common characters (like 1, 2, 3, '.', etc.) and is therefore more like multiple scripts.
-// See http://www.unicode.org/reports/tr24/#Values for more details. Zzzz is also used for
-// unknown value in CLDR.  (Zzzz, Exact) is returned if Zzzz was explicitly specified.
-// Note that an inferred script is never guaranteed to be the correct one. Latin is
-// almost exclusively used for Afrikaans, but Arabic has been used for some texts
-// in the past.  Also, the script that is commonly used may change over time.
-// It uses a variant of CLDR's Add Likely Subtags algorithm. This is subject to change.
-func (t Tag) Script() (Script, Confidence) {
-	if t.script != 0 {
-		return Script{t.script}, Exact
-	}
-	sc, c := scriptID(_Zzzz), No
-	if t.lang < langNoIndexOffset {
-		if scr := scriptID(suppressScript[t.lang]); scr != 0 {
-			// Note: it is not always the case that a language with a suppress
-			// script value is only written in one script (e.g. kk, ms, pa).
-			if t.region == 0 {
-				return Script{scriptID(scr)}, High
-			}
-			sc, c = scr, High
-		}
-	}
-	if tag, err := addTags(t); err == nil {
-		if tag.script != sc {
-			sc, c = tag.script, Low
-		}
-	} else {
-		t, _ = (Deprecated | Macro).Canonicalize(t)
-		if tag, err := addTags(t); err == nil && tag.script != sc {
-			sc, c = tag.script, Low
-		}
-	}
-	return Script{sc}, c
-}
-
-// Region returns the region for the language tag. If it was not explicitly given, it will
-// infer a most likely candidate from the context.
-// It uses a variant of CLDR's Add Likely Subtags algorithm. This is subject to change.
-func (t Tag) Region() (Region, Confidence) {
-	if t.region != 0 {
-		return Region{t.region}, Exact
-	}
-	if t, err := addTags(t); err == nil {
-		return Region{t.region}, Low // TODO: differentiate between high and low.
-	}
-	t, _ = (Deprecated | Macro).Canonicalize(t)
-	if tag, err := addTags(t); err == nil {
-		return Region{tag.region}, Low
-	}
-	return Region{_ZZ}, No // TODO: return world instead of undetermined?
-}
-
-// Variant returns the variants specified explicitly for this language tag.
-// or nil if no variant was specified.
-func (t Tag) Variants() []Variant {
-	v := []Variant{}
-	if int(t.pVariant) < int(t.pExt) {
-		for x, str := "", t.str[t.pVariant:t.pExt]; str != ""; {
-			x, str = nextToken(str)
-			v = append(v, Variant{x})
-		}
-	}
-	return v
-}
-
-// Parent returns the CLDR parent of t. In CLDR, missing fields in data for a
-// specific language are substituted with fields from the parent language.
-// The parent for a language may change for newer versions of CLDR.
-func (t Tag) Parent() Tag {
-	if t.str != "" {
-		// Strip the variants and extensions.
-		t, _ = Raw.Compose(t.Raw())
-		if t.region == 0 && t.script != 0 && t.lang != 0 {
-			base, _ := addTags(Tag{lang: t.lang})
-			if base.script == t.script {
-				return Tag{lang: t.lang}
-			}
-		}
-		return t
-	}
-	if t.lang != 0 {
-		if t.region != 0 {
-			maxScript := t.script
-			if maxScript == 0 {
-				max, _ := addTags(t)
-				maxScript = max.script
-			}
-
-			for i := range parents {
-				if langID(parents[i].lang) == t.lang && scriptID(parents[i].maxScript) == maxScript {
-					for _, r := range parents[i].fromRegion {
-						if regionID(r) == t.region {
-							return Tag{
-								lang:   t.lang,
-								script: scriptID(parents[i].script),
-								region: regionID(parents[i].toRegion),
-							}
-						}
-					}
-				}
-			}
-
-			// Strip the script if it is the default one.
-			base, _ := addTags(Tag{lang: t.lang})
-			if base.script != maxScript {
-				return Tag{lang: t.lang, script: maxScript}
-			}
-			return Tag{lang: t.lang}
-		} else if t.script != 0 {
-			// The parent for an base-script pair with a non-default script is
-			// "und" instead of the base language.
-			base, _ := addTags(Tag{lang: t.lang})
-			if base.script != t.script {
-				return und
-			}
-			return Tag{lang: t.lang}
-		}
-	}
-	return und
-}
-
-// returns token t and the rest of the string.
-func nextToken(s string) (t, tail string) {
-	p := strings.Index(s[1:], "-")
-	if p == -1 {
-		return s[1:], ""
-	}
-	p++
-	return s[1:p], s[p:]
-}
-
-// Extension is a single BCP 47 extension.
-type Extension struct {
-	s string
-}
-
-// String returns the string representation of the extension, including the
-// type tag.
-func (e Extension) String() string {
-	return e.s
-}
-
-// ParseExtension parses s as an extension and returns it on success.
-func ParseExtension(s string) (e Extension, err error) {
-	scan := makeScannerString(s)
-	var end int
-	if n := len(scan.token); n != 1 {
-		return Extension{}, errSyntax
-	}
-	scan.toLower(0, len(scan.b))
-	end = parseExtension(&scan)
-	if end != len(s) {
-		return Extension{}, errSyntax
-	}
-	return Extension{string(scan.b)}, nil
-}
-
-// Type returns the one-byte extension type of e. It returns 0 for the zero
-// exception.
-func (e Extension) Type() byte {
-	if e.s == "" {
-		return 0
-	}
-	return e.s[0]
-}
-
-// Tokens returns the list of tokens of e.
-func (e Extension) Tokens() []string {
-	return strings.Split(e.s, "-")
-}
-
-// Extension returns the extension of type x for tag t. It will return
-// false for ok if t does not have the requested extension. The returned
-// extension will be invalid in this case.
-func (t Tag) Extension(x byte) (ext Extension, ok bool) {
-	for i := int(t.pExt); i < len(t.str)-1; {
-		var ext string
-		i, ext = getExtension(t.str, i)
-		if ext[0] == x {
-			return Extension{ext}, true
-		}
-	}
-	return Extension{}, false
-}
-
-// Extensions returns all extensions of t.
-func (t Tag) Extensions() []Extension {
-	e := []Extension{}
-	for i := int(t.pExt); i < len(t.str)-1; {
-		var ext string
-		i, ext = getExtension(t.str, i)
-		e = append(e, Extension{ext})
-	}
-	return e
-}
-
-// TypeForKey returns the type associated with the given key, where key and type
-// are of the allowed values defined for the Unicode locale extension ('u') in
-// http://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers.
-// TypeForKey will traverse the inheritance chain to get the correct value.
-func (t Tag) TypeForKey(key string) string {
-	if start, end, _ := t.findTypeForKey(key); end != start {
-		return t.str[start:end]
-	}
-	return ""
-}
-
-var (
-	errPrivateUse       = errors.New("cannot set a key on a private use tag")
-	errInvalidArguments = errors.New("invalid key or type")
-)
-
-// SetTypeForKey returns a new Tag with the key set to type, where key and type
-// are of the allowed values defined for the Unicode locale extension ('u') in
-// http://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers.
-// An empty value removes an existing pair with the same key.
-func (t Tag) SetTypeForKey(key, value string) (Tag, error) {
-	if t.private() {
-		return t, errPrivateUse
-	}
-	if len(key) != 2 {
-		return t, errInvalidArguments
-	}
-
-	// Remove the setting if value is "".
-	if value == "" {
-		start, end, _ := t.findTypeForKey(key)
-		if start != end {
-			// Remove key tag and leading '-'.
-			start -= 4
-
-			// Remove a possible empty extension.
-			if (end == len(t.str) || t.str[end+2] == '-') && t.str[start-2] == '-' {
-				start -= 2
-			}
-			if start == int(t.pVariant) && end == len(t.str) {
-				t.str = ""
-				t.pVariant, t.pExt = 0, 0
-			} else {
-				t.str = fmt.Sprintf("%s%s", t.str[:start], t.str[end:])
-			}
-		}
-		return t, nil
-	}
-
-	if len(value) < 3 || len(value) > 8 {
-		return t, errInvalidArguments
-	}
-
-	var (
-		buf    [maxCoreSize + maxSimpleUExtensionSize]byte
-		uStart int // start of the -u extension.
-	)
-
-	// Generate the tag string if needed.
-	if t.str == "" {
-		uStart = t.genCoreBytes(buf[:])
-		buf[uStart] = '-'
-		uStart++
-	}
-
-	// Create new key-type pair and parse it to verify.
-	b := buf[uStart:]
-	copy(b, "u-")
-	copy(b[2:], key)
-	b[4] = '-'
-	b = b[:5+copy(b[5:], value)]
-	scan := makeScanner(b)
-	if parseExtensions(&scan); scan.err != nil {
-		return t, scan.err
-	}
-
-	// Assemble the replacement string.
-	if t.str == "" {
-		t.pVariant, t.pExt = byte(uStart-1), uint16(uStart-1)
-		t.str = string(buf[:uStart+len(b)])
-	} else {
-		s := t.str
-		start, end, hasExt := t.findTypeForKey(key)
-		if start == end {
-			if hasExt {
-				b = b[2:]
-			}
-			t.str = fmt.Sprintf("%s-%s%s", s[:start], b, s[end:])
-		} else {
-			t.str = fmt.Sprintf("%s%s%s", s[:start], value, s[end:])
-		}
-	}
-	return t, nil
-}
-
-// findKeyAndType returns the start and end position for the type corresponding
-// to key or the point at which to insert the key-value pair if the type
-// wasn't found. The hasExt return value reports whether an -u extension was present.
-// Note: the extensions are typically very small and are likely to contain
-// only one key-type pair.
-func (t Tag) findTypeForKey(key string) (start, end int, hasExt bool) {
-	p := int(t.pExt)
-	if len(key) != 2 || p == len(t.str) || p == 0 {
-		return p, p, false
-	}
-	s := t.str
-
-	// Find the correct extension.
-	for p++; s[p] != 'u'; p++ {
-		if s[p] > 'u' {
-			p--
-			return p, p, false
-		}
-		if p = nextExtension(s, p); p == len(s) {
-			return len(s), len(s), false
-		}
-	}
-	// Proceed to the hyphen following the extension name.
-	p++
-
-	// curKey is the key currently being processed.
-	curKey := ""
-
-	// Iterate over keys until we get the end of a section.
-	for {
-		// p points to the hyphen preceding the current token.
-		if p3 := p + 3; s[p3] == '-' {
-			// Found a key.
-			// Check whether we just processed the key that was requested.
-			if curKey == key {
-				return start, p, true
-			}
-			// Set to the next key and continue scanning type tokens.
-			curKey = s[p+1 : p3]
-			if curKey > key {
-				return p, p, true
-			}
-			// Start of the type token sequence.
-			start = p + 4
-			// A type is at least 3 characters long.
-			p += 7 // 4 + 3
-		} else {
-			// Attribute or type, which is at least 3 characters long.
-			p += 4
-		}
-		// p points past the third character of a type or attribute.
-		max := p + 5 // maximum length of token plus hyphen.
-		if len(s) < max {
-			max = len(s)
-		}
-		for ; p < max && s[p] != '-'; p++ {
-		}
-		// Bail if we have exhausted all tokens or if the next token starts
-		// a new extension.
-		if p == len(s) || s[p+2] == '-' {
-			if curKey == key {
-				return start, p, true
-			}
-			return p, p, true
-		}
-	}
-}
-
-// CompactIndex returns an index, where 0 <= index < NumCompactTags, for tags
-// for which data exists in the text repository. The index will change over time
-// and should not be stored in persistent storage. Extensions, except for the
-// 'va' type of the 'u' extension, are ignored. It will return 0, false if no
-// compact tag exists, where 0 is the index for the root language (Und).
-func CompactIndex(t Tag) (index int, ok bool) {
-	// TODO: perhaps give more frequent tags a lower index.
-	// TODO: we could make the indexes stable. This will excluded some
-	//       possibilities for optimization, so don't do this quite yet.
-	b, s, r := t.Raw()
-	if len(t.str) > 0 {
-		if strings.HasPrefix(t.str, "x-") {
-			// We have no entries for user-defined tags.
-			return 0, false
-		}
-		if uint16(t.pVariant) != t.pExt {
-			// There are no tags with variants and an u-va type.
-			if t.TypeForKey("va") != "" {
-				return 0, false
-			}
-			t, _ = Raw.Compose(b, s, r, t.Variants())
-		} else if _, ok := t.Extension('u'); ok {
-			// Strip all but the 'va' entry.
-			variant := t.TypeForKey("va")
-			t, _ = Raw.Compose(b, s, r)
-			t, _ = t.SetTypeForKey("va", variant)
-		}
-		if len(t.str) > 0 {
-			// We have some variants.
-			for i, s := range specialTags {
-				if s == t {
-					return i + 1, true
-				}
-			}
-			return 0, false
-		}
-	}
-	// No variants specified: just compare core components.
-	// The key has the form lllssrrr, where l, s, and r are nibbles for
-	// respectively the langID, scriptID, and regionID.
-	key := uint32(b.langID) << (8 + 12)
-	key |= uint32(s.scriptID) << 12
-	key |= uint32(r.regionID)
-	x, ok := coreTags[key]
-	return int(x), ok
-}
-
-// Base is an ISO 639 language code, used for encoding the base language
-// of a language tag.
-type Base struct {
-	langID
-}
-
-// ParseBase parses a 2- or 3-letter ISO 639 code.
-// It returns a ValueError if s is a well-formed but unknown language identifier
-// or another error if another error occurred.
-func ParseBase(s string) (Base, error) {
-	if n := len(s); n < 2 || 3 < n {
-		return Base{}, errSyntax
-	}
-	var buf [3]byte
-	l, err := getLangID(buf[:copy(buf[:], s)])
-	return Base{l}, err
-}
-
-// Script is a 4-letter ISO 15924 code for representing scripts.
-// It is idiomatically represented in title case.
-type Script struct {
-	scriptID
-}
-
-// ParseScript parses a 4-letter ISO 15924 code.
-// It returns a ValueError if s is a well-formed but unknown script identifier
-// or another error if another error occurred.
-func ParseScript(s string) (Script, error) {
-	if len(s) != 4 {
-		return Script{}, errSyntax
-	}
-	var buf [4]byte
-	sc, err := getScriptID(script, buf[:copy(buf[:], s)])
-	return Script{sc}, err
-}
-
-// Region is an ISO 3166-1 or UN M.49 code for representing countries and regions.
-type Region struct {
-	regionID
-}
-
-// EncodeM49 returns the Region for the given UN M.49 code.
-// It returns an error if r is not a valid code.
-func EncodeM49(r int) (Region, error) {
-	rid, err := getRegionM49(r)
-	return Region{rid}, err
-}
-
-// ParseRegion parses a 2- or 3-letter ISO 3166-1 or a UN M.49 code.
-// It returns a ValueError if s is a well-formed but unknown region identifier
-// or another error if another error occurred.
-func ParseRegion(s string) (Region, error) {
-	if n := len(s); n < 2 || 3 < n {
-		return Region{}, errSyntax
-	}
-	var buf [3]byte
-	r, err := getRegionID(buf[:copy(buf[:], s)])
-	return Region{r}, err
-}
-
-// IsCountry returns whether this region is a country or autonomous area. This
-// includes non-standard definitions from CLDR.
-func (r Region) IsCountry() bool {
-	if r.regionID == 0 || r.IsGroup() || r.IsPrivateUse() && r.regionID != _XK {
-		return false
-	}
-	return true
-}
-
-// IsGroup returns whether this region defines a collection of regions. This
-// includes non-standard definitions from CLDR.
-func (r Region) IsGroup() bool {
-	if r.regionID == 0 {
-		return false
-	}
-	return int(regionInclusion[r.regionID]) < len(regionContainment)
-}
-
-// Contains returns whether Region c is contained by Region r. It returns true
-// if c == r.
-func (r Region) Contains(c Region) bool {
-	return r.regionID.contains(c.regionID)
-}
-
-func (r regionID) contains(c regionID) bool {
-	if r == c {
-		return true
-	}
-	g := regionInclusion[r]
-	if g >= nRegionGroups {
-		return false
-	}
-	m := regionContainment[g]
-
-	d := regionInclusion[c]
-	b := regionInclusionBits[d]
-
-	// A contained country may belong to multiple disjoint groups. Matching any
-	// of these indicates containment. If the contained region is a group, it
-	// must strictly be a subset.
-	if d >= nRegionGroups {
-		return b&m != 0
-	}
-	return b&^m == 0
-}
-
-var errNoTLD = errors.New("language: region is not a valid ccTLD")
-
-// TLD returns the country code top-level domain (ccTLD). UK is returned for GB.
-// In all other cases it returns either the region itself or an error.
-//
-// This method may return an error for a region for which there exists a
-// canonical form with a ccTLD. To get that ccTLD canonicalize r first. The
-// region will already be canonicalized it was obtained from a Tag that was
-// obtained using any of the default methods.
-func (r Region) TLD() (Region, error) {
-	// See http://en.wikipedia.org/wiki/Country_code_top-level_domain for the
-	// difference between ISO 3166-1 and IANA ccTLD.
-	if r.regionID == _GB {
-		r = Region{_UK}
-	}
-	if (r.typ() & ccTLD) == 0 {
-		return Region{}, errNoTLD
-	}
-	return r, nil
-}
-
-// Canonicalize returns the region or a possible replacement if the region is
-// deprecated. It will not return a replacement for deprecated regions that
-// are split into multiple regions.
-func (r Region) Canonicalize() Region {
-	if cr := normRegion(r.regionID); cr != 0 {
-		return Region{cr}
-	}
-	return r
-}
-
-// Variant represents a registered variant of a language as defined by BCP 47.
-type Variant struct {
-	variant string
-}
-
-// ParseVariant parses and returns a Variant. An error is returned if s is not
-// a valid variant.
-func ParseVariant(s string) (Variant, error) {
-	s = strings.ToLower(s)
-	if _, ok := variantIndex[s]; ok {
-		return Variant{s}, nil
-	}
-	return Variant{}, mkErrInvalid([]byte(s))
-}
-
-// String returns the string representation of the variant.
-func (v Variant) String() string {
-	return v.variant
-}
diff --git a/vendor/golang.org/x/text/language/lookup.go b/vendor/golang.org/x/text/language/lookup.go
deleted file mode 100644
index 1d80ac3708..0000000000
--- a/vendor/golang.org/x/text/language/lookup.go
+++ /dev/null
@@ -1,396 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package language
-
-import (
-	"bytes"
-	"fmt"
-	"sort"
-	"strconv"
-
-	"golang.org/x/text/internal/tag"
-)
-
-// findIndex tries to find the given tag in idx and returns a standardized error
-// if it could not be found.
-func findIndex(idx tag.Index, key []byte, form string) (index int, err error) {
-	if !tag.FixCase(form, key) {
-		return 0, errSyntax
-	}
-	i := idx.Index(key)
-	if i == -1 {
-		return 0, mkErrInvalid(key)
-	}
-	return i, nil
-}
-
-func searchUint(imap []uint16, key uint16) int {
-	return sort.Search(len(imap), func(i int) bool {
-		return imap[i] >= key
-	})
-}
-
-type langID uint16
-
-// getLangID returns the langID of s if s is a canonical subtag
-// or langUnknown if s is not a canonical subtag.
-func getLangID(s []byte) (langID, error) {
-	if len(s) == 2 {
-		return getLangISO2(s)
-	}
-	return getLangISO3(s)
-}
-
-// mapLang returns the mapped langID of id according to mapping m.
-func normLang(id langID) (langID, langAliasType) {
-	k := sort.Search(len(langAliasMap), func(i int) bool {
-		return langAliasMap[i].from >= uint16(id)
-	})
-	if k < len(langAliasMap) && langAliasMap[k].from == uint16(id) {
-		return langID(langAliasMap[k].to), langAliasTypes[k]
-	}
-	return id, langAliasTypeUnknown
-}
-
-// getLangISO2 returns the langID for the given 2-letter ISO language code
-// or unknownLang if this does not exist.
-func getLangISO2(s []byte) (langID, error) {
-	if !tag.FixCase("zz", s) {
-		return 0, errSyntax
-	}
-	if i := lang.Index(s); i != -1 && lang.Elem(i)[3] != 0 {
-		return langID(i), nil
-	}
-	return 0, mkErrInvalid(s)
-}
-
-const base = 'z' - 'a' + 1
-
-func strToInt(s []byte) uint {
-	v := uint(0)
-	for i := 0; i < len(s); i++ {
-		v *= base
-		v += uint(s[i] - 'a')
-	}
-	return v
-}
-
-// converts the given integer to the original ASCII string passed to strToInt.
-// len(s) must match the number of characters obtained.
-func intToStr(v uint, s []byte) {
-	for i := len(s) - 1; i >= 0; i-- {
-		s[i] = byte(v%base) + 'a'
-		v /= base
-	}
-}
-
-// getLangISO3 returns the langID for the given 3-letter ISO language code
-// or unknownLang if this does not exist.
-func getLangISO3(s []byte) (langID, error) {
-	if tag.FixCase("und", s) {
-		// first try to match canonical 3-letter entries
-		for i := lang.Index(s[:2]); i != -1; i = lang.Next(s[:2], i) {
-			if e := lang.Elem(i); e[3] == 0 && e[2] == s[2] {
-				// We treat "und" as special and always translate it to "unspecified".
-				// Note that ZZ and Zzzz are private use and are not treated as
-				// unspecified by default.
-				id := langID(i)
-				if id == nonCanonicalUnd {
-					return 0, nil
-				}
-				return id, nil
-			}
-		}
-		if i := altLangISO3.Index(s); i != -1 {
-			return langID(altLangIndex[altLangISO3.Elem(i)[3]]), nil
-		}
-		n := strToInt(s)
-		if langNoIndex[n/8]&(1<<(n%8)) != 0 {
-			return langID(n) + langNoIndexOffset, nil
-		}
-		// Check for non-canonical uses of ISO3.
-		for i := lang.Index(s[:1]); i != -1; i = lang.Next(s[:1], i) {
-			if e := lang.Elem(i); e[2] == s[1] && e[3] == s[2] {
-				return langID(i), nil
-			}
-		}
-		return 0, mkErrInvalid(s)
-	}
-	return 0, errSyntax
-}
-
-// stringToBuf writes the string to b and returns the number of bytes
-// written.  cap(b) must be >= 3.
-func (id langID) stringToBuf(b []byte) int {
-	if id >= langNoIndexOffset {
-		intToStr(uint(id)-langNoIndexOffset, b[:3])
-		return 3
-	} else if id == 0 {
-		return copy(b, "und")
-	}
-	l := lang[id<<2:]
-	if l[3] == 0 {
-		return copy(b, l[:3])
-	}
-	return copy(b, l[:2])
-}
-
-// String returns the BCP 47 representation of the langID.
-// Use b as variable name, instead of id, to ensure the variable
-// used is consistent with that of Base in which this type is embedded.
-func (b langID) String() string {
-	if b == 0 {
-		return "und"
-	} else if b >= langNoIndexOffset {
-		b -= langNoIndexOffset
-		buf := [3]byte{}
-		intToStr(uint(b), buf[:])
-		return string(buf[:])
-	}
-	l := lang.Elem(int(b))
-	if l[3] == 0 {
-		return l[:3]
-	}
-	return l[:2]
-}
-
-// ISO3 returns the ISO 639-3 language code.
-func (b langID) ISO3() string {
-	if b == 0 || b >= langNoIndexOffset {
-		return b.String()
-	}
-	l := lang.Elem(int(b))
-	if l[3] == 0 {
-		return l[:3]
-	} else if l[2] == 0 {
-		return altLangISO3.Elem(int(l[3]))[:3]
-	}
-	// This allocation will only happen for 3-letter ISO codes
-	// that are non-canonical BCP 47 language identifiers.
-	return l[0:1] + l[2:4]
-}
-
-// IsPrivateUse reports whether this language code is reserved for private use.
-func (b langID) IsPrivateUse() bool {
-	return langPrivateStart <= b && b <= langPrivateEnd
-}
-
-type regionID uint16
-
-// getRegionID returns the region id for s if s is a valid 2-letter region code
-// or unknownRegion.
-func getRegionID(s []byte) (regionID, error) {
-	if len(s) == 3 {
-		if isAlpha(s[0]) {
-			return getRegionISO3(s)
-		}
-		if i, err := strconv.ParseUint(string(s), 10, 10); err == nil {
-			return getRegionM49(int(i))
-		}
-	}
-	return getRegionISO2(s)
-}
-
-// getRegionISO2 returns the regionID for the given 2-letter ISO country code
-// or unknownRegion if this does not exist.
-func getRegionISO2(s []byte) (regionID, error) {
-	i, err := findIndex(regionISO, s, "ZZ")
-	if err != nil {
-		return 0, err
-	}
-	return regionID(i) + isoRegionOffset, nil
-}
-
-// getRegionISO3 returns the regionID for the given 3-letter ISO country code
-// or unknownRegion if this does not exist.
-func getRegionISO3(s []byte) (regionID, error) {
-	if tag.FixCase("ZZZ", s) {
-		for i := regionISO.Index(s[:1]); i != -1; i = regionISO.Next(s[:1], i) {
-			if e := regionISO.Elem(i); e[2] == s[1] && e[3] == s[2] {
-				return regionID(i) + isoRegionOffset, nil
-			}
-		}
-		for i := 0; i < len(altRegionISO3); i += 3 {
-			if tag.Compare(altRegionISO3[i:i+3], s) == 0 {
-				return regionID(altRegionIDs[i/3]), nil
-			}
-		}
-		return 0, mkErrInvalid(s)
-	}
-	return 0, errSyntax
-}
-
-func getRegionM49(n int) (regionID, error) {
-	if 0 < n && n <= 999 {
-		const (
-			searchBits = 7
-			regionBits = 9
-			regionMask = 1<<regionBits - 1
-		)
-		idx := n >> searchBits
-		buf := fromM49[m49Index[idx]:m49Index[idx+1]]
-		val := uint16(n) << regionBits // we rely on bits shifting out
-		i := sort.Search(len(buf), func(i int) bool {
-			return buf[i] >= val
-		})
-		if r := fromM49[int(m49Index[idx])+i]; r&^regionMask == val {
-			return regionID(r & regionMask), nil
-		}
-	}
-	var e ValueError
-	fmt.Fprint(bytes.NewBuffer([]byte(e.v[:])), n)
-	return 0, e
-}
-
-// normRegion returns a region if r is deprecated or 0 otherwise.
-// TODO: consider supporting BYS (-> BLR), CSK (-> 200 or CZ), PHI (-> PHL) and AFI (-> DJ).
-// TODO: consider mapping split up regions to new most populous one (like CLDR).
-func normRegion(r regionID) regionID {
-	m := regionOldMap
-	k := sort.Search(len(m), func(i int) bool {
-		return m[i].from >= uint16(r)
-	})
-	if k < len(m) && m[k].from == uint16(r) {
-		return regionID(m[k].to)
-	}
-	return 0
-}
-
-const (
-	iso3166UserAssigned = 1 << iota
-	ccTLD
-	bcp47Region
-)
-
-func (r regionID) typ() byte {
-	return regionTypes[r]
-}
-
-// String returns the BCP 47 representation for the region.
-// It returns "ZZ" for an unspecified region.
-func (r regionID) String() string {
-	if r < isoRegionOffset {
-		if r == 0 {
-			return "ZZ"
-		}
-		return fmt.Sprintf("%03d", r.M49())
-	}
-	r -= isoRegionOffset
-	return regionISO.Elem(int(r))[:2]
-}
-
-// ISO3 returns the 3-letter ISO code of r.
-// Note that not all regions have a 3-letter ISO code.
-// In such cases this method returns "ZZZ".
-func (r regionID) ISO3() string {
-	if r < isoRegionOffset {
-		return "ZZZ"
-	}
-	r -= isoRegionOffset
-	reg := regionISO.Elem(int(r))
-	switch reg[2] {
-	case 0:
-		return altRegionISO3[reg[3]:][:3]
-	case ' ':
-		return "ZZZ"
-	}
-	return reg[0:1] + reg[2:4]
-}
-
-// M49 returns the UN M.49 encoding of r, or 0 if this encoding
-// is not defined for r.
-func (r regionID) M49() int {
-	return int(m49[r])
-}
-
-// IsPrivateUse reports whether r has the ISO 3166 User-assigned status. This
-// may include private-use tags that are assigned by CLDR and used in this
-// implementation. So IsPrivateUse and IsCountry can be simultaneously true.
-func (r regionID) IsPrivateUse() bool {
-	return r.typ()&iso3166UserAssigned != 0
-}
-
-type scriptID uint8
-
-// getScriptID returns the script id for string s. It assumes that s
-// is of the format [A-Z][a-z]{3}.
-func getScriptID(idx tag.Index, s []byte) (scriptID, error) {
-	i, err := findIndex(idx, s, "Zzzz")
-	return scriptID(i), err
-}
-
-// String returns the script code in title case.
-// It returns "Zzzz" for an unspecified script.
-func (s scriptID) String() string {
-	if s == 0 {
-		return "Zzzz"
-	}
-	return script.Elem(int(s))
-}
-
-// IsPrivateUse reports whether this script code is reserved for private use.
-func (s scriptID) IsPrivateUse() bool {
-	return _Qaaa <= s && s <= _Qabx
-}
-
-const (
-	maxAltTaglen = len("en-US-POSIX")
-	maxLen       = maxAltTaglen
-)
-
-var (
-	// grandfatheredMap holds a mapping from legacy and grandfathered tags to
-	// their base language or index to more elaborate tag.
-	grandfatheredMap = map[[maxLen]byte]int16{
-		[maxLen]byte{'a', 'r', 't', '-', 'l', 'o', 'j', 'b', 'a', 'n'}: _jbo, // art-lojban
-		[maxLen]byte{'i', '-', 'a', 'm', 'i'}:                          _ami, // i-ami
-		[maxLen]byte{'i', '-', 'b', 'n', 'n'}:                          _bnn, // i-bnn
-		[maxLen]byte{'i', '-', 'h', 'a', 'k'}:                          _hak, // i-hak
-		[maxLen]byte{'i', '-', 'k', 'l', 'i', 'n', 'g', 'o', 'n'}:      _tlh, // i-klingon
-		[maxLen]byte{'i', '-', 'l', 'u', 'x'}:                          _lb,  // i-lux
-		[maxLen]byte{'i', '-', 'n', 'a', 'v', 'a', 'j', 'o'}:           _nv,  // i-navajo
-		[maxLen]byte{'i', '-', 'p', 'w', 'n'}:                          _pwn, // i-pwn
-		[maxLen]byte{'i', '-', 't', 'a', 'o'}:                          _tao, // i-tao
-		[maxLen]byte{'i', '-', 't', 'a', 'y'}:                          _tay, // i-tay
-		[maxLen]byte{'i', '-', 't', 's', 'u'}:                          _tsu, // i-tsu
-		[maxLen]byte{'n', 'o', '-', 'b', 'o', 'k'}:                     _nb,  // no-bok
-		[maxLen]byte{'n', 'o', '-', 'n', 'y', 'n'}:                     _nn,  // no-nyn
-		[maxLen]byte{'s', 'g', 'n', '-', 'b', 'e', '-', 'f', 'r'}:      _sfb, // sgn-BE-FR
-		[maxLen]byte{'s', 'g', 'n', '-', 'b', 'e', '-', 'n', 'l'}:      _vgt, // sgn-BE-NL
-		[maxLen]byte{'s', 'g', 'n', '-', 'c', 'h', '-', 'd', 'e'}:      _sgg, // sgn-CH-DE
-		[maxLen]byte{'z', 'h', '-', 'g', 'u', 'o', 'y', 'u'}:           _cmn, // zh-guoyu
-		[maxLen]byte{'z', 'h', '-', 'h', 'a', 'k', 'k', 'a'}:           _hak, // zh-hakka
-		[maxLen]byte{'z', 'h', '-', 'm', 'i', 'n', '-', 'n', 'a', 'n'}: _nan, // zh-min-nan
-		[maxLen]byte{'z', 'h', '-', 'x', 'i', 'a', 'n', 'g'}:           _hsn, // zh-xiang
-
-		// Grandfathered tags with no modern replacement will be converted as
-		// follows:
-		[maxLen]byte{'c', 'e', 'l', '-', 'g', 'a', 'u', 'l', 'i', 's', 'h'}: -1, // cel-gaulish
-		[maxLen]byte{'e', 'n', '-', 'g', 'b', '-', 'o', 'e', 'd'}:           -2, // en-GB-oed
-		[maxLen]byte{'i', '-', 'd', 'e', 'f', 'a', 'u', 'l', 't'}:           -3, // i-default
-		[maxLen]byte{'i', '-', 'e', 'n', 'o', 'c', 'h', 'i', 'a', 'n'}:      -4, // i-enochian
-		[maxLen]byte{'i', '-', 'm', 'i', 'n', 'g', 'o'}:                     -5, // i-mingo
-		[maxLen]byte{'z', 'h', '-', 'm', 'i', 'n'}:                          -6, // zh-min
-
-		// CLDR-specific tag.
-		[maxLen]byte{'r', 'o', 'o', 't'}:                                    0,  // root
-		[maxLen]byte{'e', 'n', '-', 'u', 's', '-', 'p', 'o', 's', 'i', 'x'}: -7, // en_US_POSIX"
-	}
-
-	altTagIndex = [...]uint8{0, 17, 31, 45, 61, 74, 86, 102}
-
-	altTags = "xtg-x-cel-gaulishen-GB-oxendicten-x-i-defaultund-x-i-enochiansee-x-i-mingonan-x-zh-minen-US-u-va-posix"
-)
-
-func grandfathered(s [maxAltTaglen]byte) (t Tag, ok bool) {
-	if v, ok := grandfatheredMap[s]; ok {
-		if v < 0 {
-			return Make(altTags[altTagIndex[-v-1]:altTagIndex[-v]]), true
-		}
-		t.lang = langID(v)
-		return t, true
-	}
-	return t, false
-}
diff --git a/vendor/golang.org/x/text/language/match.go b/vendor/golang.org/x/text/language/match.go
deleted file mode 100644
index 63bc744a39..0000000000
--- a/vendor/golang.org/x/text/language/match.go
+++ /dev/null
@@ -1,933 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package language
-
-import "errors"
-
-// A MatchOption configures a Matcher.
-type MatchOption func(*matcher)
-
-// PreferSameScript will, in the absence of a match, result in the first
-// preferred tag with the same script as a supported tag to match this supported
-// tag. The default is currently true, but this may change in the future.
-func PreferSameScript(preferSame bool) MatchOption {
-	return func(m *matcher) { m.preferSameScript = preferSame }
-}
-
-// Matcher is the interface that wraps the Match method.
-//
-// Match returns the best match for any of the given tags, along with
-// a unique index associated with the returned tag and a confidence
-// score.
-type Matcher interface {
-	Match(t ...Tag) (tag Tag, index int, c Confidence)
-}
-
-// Comprehends reports the confidence score for a speaker of a given language
-// to being able to comprehend the written form of an alternative language.
-func Comprehends(speaker, alternative Tag) Confidence {
-	_, _, c := NewMatcher([]Tag{alternative}).Match(speaker)
-	return c
-}
-
-// NewMatcher returns a Matcher that matches an ordered list of preferred tags
-// against a list of supported tags based on written intelligibility, closeness
-// of dialect, equivalence of subtags and various other rules. It is initialized
-// with the list of supported tags. The first element is used as the default
-// value in case no match is found.
-//
-// Its Match method matches the first of the given Tags to reach a certain
-// confidence threshold. The tags passed to Match should therefore be specified
-// in order of preference. Extensions are ignored for matching.
-//
-// The index returned by the Match method corresponds to the index of the
-// matched tag in t, but is augmented with the Unicode extension ('u')of the
-// corresponding preferred tag. This allows user locale options to be passed
-// transparently.
-func NewMatcher(t []Tag, options ...MatchOption) Matcher {
-	return newMatcher(t, options)
-}
-
-func (m *matcher) Match(want ...Tag) (t Tag, index int, c Confidence) {
-	match, w, c := m.getBest(want...)
-	if match != nil {
-		t, index = match.tag, match.index
-	} else {
-		// TODO: this should be an option
-		t = m.default_.tag
-		if m.preferSameScript {
-		outer:
-			for _, w := range want {
-				script, _ := w.Script()
-				if script.scriptID == 0 {
-					// Don't do anything if there is no script, such as with
-					// private subtags.
-					continue
-				}
-				for i, h := range m.supported {
-					if script.scriptID == h.maxScript {
-						t, index = h.tag, i
-						break outer
-					}
-				}
-			}
-		}
-		// TODO: select first language tag based on script.
-	}
-	if w.region != 0 && t.region != 0 && t.region.contains(w.region) {
-		t, _ = Raw.Compose(t, Region{w.region})
-	}
-	// Copy options from the user-provided tag into the result tag. This is hard
-	// to do after the fact, so we do it here.
-	// TODO: add in alternative variants to -u-va-.
-	// TODO: add preferred region to -u-rg-.
-	// TODO: add other extensions. Merge with existing extensions.
-	if u, ok := w.Extension('u'); ok {
-		t, _ = Raw.Compose(t, u)
-	}
-	return t, index, c
-}
-
-type scriptRegionFlags uint8
-
-const (
-	isList = 1 << iota
-	scriptInFrom
-	regionInFrom
-)
-
-func (t *Tag) setUndefinedLang(id langID) {
-	if t.lang == 0 {
-		t.lang = id
-	}
-}
-
-func (t *Tag) setUndefinedScript(id scriptID) {
-	if t.script == 0 {
-		t.script = id
-	}
-}
-
-func (t *Tag) setUndefinedRegion(id regionID) {
-	if t.region == 0 || t.region.contains(id) {
-		t.region = id
-	}
-}
-
-// ErrMissingLikelyTagsData indicates no information was available
-// to compute likely values of missing tags.
-var ErrMissingLikelyTagsData = errors.New("missing likely tags data")
-
-// addLikelySubtags sets subtags to their most likely value, given the locale.
-// In most cases this means setting fields for unknown values, but in some
-// cases it may alter a value.  It returns a ErrMissingLikelyTagsData error
-// if the given locale cannot be expanded.
-func (t Tag) addLikelySubtags() (Tag, error) {
-	id, err := addTags(t)
-	if err != nil {
-		return t, err
-	} else if id.equalTags(t) {
-		return t, nil
-	}
-	id.remakeString()
-	return id, nil
-}
-
-// specializeRegion attempts to specialize a group region.
-func specializeRegion(t *Tag) bool {
-	if i := regionInclusion[t.region]; i < nRegionGroups {
-		x := likelyRegionGroup[i]
-		if langID(x.lang) == t.lang && scriptID(x.script) == t.script {
-			t.region = regionID(x.region)
-		}
-		return true
-	}
-	return false
-}
-
-func addTags(t Tag) (Tag, error) {
-	// We leave private use identifiers alone.
-	if t.private() {
-		return t, nil
-	}
-	if t.script != 0 && t.region != 0 {
-		if t.lang != 0 {
-			// already fully specified
-			specializeRegion(&t)
-			return t, nil
-		}
-		// Search matches for und-script-region. Note that for these cases
-		// region will never be a group so there is no need to check for this.
-		list := likelyRegion[t.region : t.region+1]
-		if x := list[0]; x.flags&isList != 0 {
-			list = likelyRegionList[x.lang : x.lang+uint16(x.script)]
-		}
-		for _, x := range list {
-			// Deviating from the spec. See match_test.go for details.
-			if scriptID(x.script) == t.script {
-				t.setUndefinedLang(langID(x.lang))
-				return t, nil
-			}
-		}
-	}
-	if t.lang != 0 {
-		// Search matches for lang-script and lang-region, where lang != und.
-		if t.lang < langNoIndexOffset {
-			x := likelyLang[t.lang]
-			if x.flags&isList != 0 {
-				list := likelyLangList[x.region : x.region+uint16(x.script)]
-				if t.script != 0 {
-					for _, x := range list {
-						if scriptID(x.script) == t.script && x.flags&scriptInFrom != 0 {
-							t.setUndefinedRegion(regionID(x.region))
-							return t, nil
-						}
-					}
-				} else if t.region != 0 {
-					count := 0
-					goodScript := true
-					tt := t
-					for _, x := range list {
-						// We visit all entries for which the script was not
-						// defined, including the ones where the region was not
-						// defined. This allows for proper disambiguation within
-						// regions.
-						if x.flags&scriptInFrom == 0 && t.region.contains(regionID(x.region)) {
-							tt.region = regionID(x.region)
-							tt.setUndefinedScript(scriptID(x.script))
-							goodScript = goodScript && tt.script == scriptID(x.script)
-							count++
-						}
-					}
-					if count == 1 {
-						return tt, nil
-					}
-					// Even if we fail to find a unique Region, we might have
-					// an unambiguous script.
-					if goodScript {
-						t.script = tt.script
-					}
-				}
-			}
-		}
-	} else {
-		// Search matches for und-script.
-		if t.script != 0 {
-			x := likelyScript[t.script]
-			if x.region != 0 {
-				t.setUndefinedRegion(regionID(x.region))
-				t.setUndefinedLang(langID(x.lang))
-				return t, nil
-			}
-		}
-		// Search matches for und-region. If und-script-region exists, it would
-		// have been found earlier.
-		if t.region != 0 {
-			if i := regionInclusion[t.region]; i < nRegionGroups {
-				x := likelyRegionGroup[i]
-				if x.region != 0 {
-					t.setUndefinedLang(langID(x.lang))
-					t.setUndefinedScript(scriptID(x.script))
-					t.region = regionID(x.region)
-				}
-			} else {
-				x := likelyRegion[t.region]
-				if x.flags&isList != 0 {
-					x = likelyRegionList[x.lang]
-				}
-				if x.script != 0 && x.flags != scriptInFrom {
-					t.setUndefinedLang(langID(x.lang))
-					t.setUndefinedScript(scriptID(x.script))
-					return t, nil
-				}
-			}
-		}
-	}
-
-	// Search matches for lang.
-	if t.lang < langNoIndexOffset {
-		x := likelyLang[t.lang]
-		if x.flags&isList != 0 {
-			x = likelyLangList[x.region]
-		}
-		if x.region != 0 {
-			t.setUndefinedScript(scriptID(x.script))
-			t.setUndefinedRegion(regionID(x.region))
-		}
-		specializeRegion(&t)
-		if t.lang == 0 {
-			t.lang = _en // default language
-		}
-		return t, nil
-	}
-	return t, ErrMissingLikelyTagsData
-}
-
-func (t *Tag) setTagsFrom(id Tag) {
-	t.lang = id.lang
-	t.script = id.script
-	t.region = id.region
-}
-
-// minimize removes the region or script subtags from t such that
-// t.addLikelySubtags() == t.minimize().addLikelySubtags().
-func (t Tag) minimize() (Tag, error) {
-	t, err := minimizeTags(t)
-	if err != nil {
-		return t, err
-	}
-	t.remakeString()
-	return t, nil
-}
-
-// minimizeTags mimics the behavior of the ICU 51 C implementation.
-func minimizeTags(t Tag) (Tag, error) {
-	if t.equalTags(und) {
-		return t, nil
-	}
-	max, err := addTags(t)
-	if err != nil {
-		return t, err
-	}
-	for _, id := range [...]Tag{
-		{lang: t.lang},
-		{lang: t.lang, region: t.region},
-		{lang: t.lang, script: t.script},
-	} {
-		if x, err := addTags(id); err == nil && max.equalTags(x) {
-			t.setTagsFrom(id)
-			break
-		}
-	}
-	return t, nil
-}
-
-// Tag Matching
-// CLDR defines an algorithm for finding the best match between two sets of language
-// tags. The basic algorithm defines how to score a possible match and then find
-// the match with the best score
-// (see http://www.unicode.org/reports/tr35/#LanguageMatching).
-// Using scoring has several disadvantages. The scoring obfuscates the importance of
-// the various factors considered, making the algorithm harder to understand. Using
-// scoring also requires the full score to be computed for each pair of tags.
-//
-// We will use a different algorithm which aims to have the following properties:
-// - clarity on the precedence of the various selection factors, and
-// - improved performance by allowing early termination of a comparison.
-//
-// Matching algorithm (overview)
-// Input:
-//   - supported: a set of supported tags
-//   - default:   the default tag to return in case there is no match
-//   - desired:   list of desired tags, ordered by preference, starting with
-//                the most-preferred.
-//
-// Algorithm:
-//   1) Set the best match to the lowest confidence level
-//   2) For each tag in "desired":
-//     a) For each tag in "supported":
-//        1) compute the match between the two tags.
-//        2) if the match is better than the previous best match, replace it
-//           with the new match. (see next section)
-//     b) if the current best match is above a certain threshold, return this
-//        match without proceeding to the next tag in "desired". [See Note 1]
-//   3) If the best match so far is below a certain threshold, return "default".
-//
-// Ranking:
-// We use two phases to determine whether one pair of tags are a better match
-// than another pair of tags. First, we determine a rough confidence level. If the
-// levels are different, the one with the highest confidence wins.
-// Second, if the rough confidence levels are identical, we use a set of tie-breaker
-// rules.
-//
-// The confidence level of matching a pair of tags is determined by finding the
-// lowest confidence level of any matches of the corresponding subtags (the
-// result is deemed as good as its weakest link).
-// We define the following levels:
-//   Exact    - An exact match of a subtag, before adding likely subtags.
-//   MaxExact - An exact match of a subtag, after adding likely subtags.
-//              [See Note 2].
-//   High     - High level of mutual intelligibility between different subtag
-//              variants.
-//   Low      - Low level of mutual intelligibility between different subtag
-//              variants.
-//   No       - No mutual intelligibility.
-//
-// The following levels can occur for each type of subtag:
-//   Base:    Exact, MaxExact, High, Low, No
-//   Script:  Exact, MaxExact [see Note 3], Low, No
-//   Region:  Exact, MaxExact, High
-//   Variant: Exact, High
-//   Private: Exact, No
-//
-// Any result with a confidence level of Low or higher is deemed a possible match.
-// Once a desired tag matches any of the supported tags with a level of MaxExact
-// or higher, the next desired tag is not considered (see Step 2.b).
-// Note that CLDR provides languageMatching data that defines close equivalence
-// classes for base languages, scripts and regions.
-//
-// Tie-breaking
-// If we get the same confidence level for two matches, we apply a sequence of
-// tie-breaking rules. The first that succeeds defines the result. The rules are
-// applied in the following order.
-//   1) Original language was defined and was identical.
-//   2) Original region was defined and was identical.
-//   3) Distance between two maximized regions was the smallest.
-//   4) Original script was defined and was identical.
-//   5) Distance from want tag to have tag using the parent relation [see Note 5.]
-// If there is still no winner after these rules are applied, the first match
-// found wins.
-//
-// Notes:
-// [1] Note that even if we may not have a perfect match, if a match is above a
-//     certain threshold, it is considered a better match than any other match
-//     to a tag later in the list of preferred language tags.
-// [2] In practice, as matching of Exact is done in a separate phase from
-//     matching the other levels, we reuse the Exact level to mean MaxExact in
-//     the second phase. As a consequence, we only need the levels defined by
-//     the Confidence type. The MaxExact confidence level is mapped to High in
-//     the public API.
-// [3] We do not differentiate between maximized script values that were derived
-//     from suppressScript versus most likely tag data. We determined that in
-//     ranking the two, one ranks just after the other. Moreover, the two cannot
-//     occur concurrently. As a consequence, they are identical for practical
-//     purposes.
-// [4] In case of deprecated, macro-equivalents and legacy mappings, we assign
-//     the MaxExact level to allow iw vs he to still be a closer match than
-//     en-AU vs en-US, for example.
-// [5] In CLDR a locale inherits fields that are unspecified for this locale
-//     from its parent. Therefore, if a locale is a parent of another locale,
-//     it is a strong measure for closeness, especially when no other tie
-//     breaker rule applies. One could also argue it is inconsistent, for
-//     example, when pt-AO matches pt (which CLDR equates with pt-BR), even
-//     though its parent is pt-PT according to the inheritance rules.
-//
-// Implementation Details:
-// There are several performance considerations worth pointing out. Most notably,
-// we preprocess as much as possible (within reason) at the time of creation of a
-// matcher. This includes:
-//   - creating a per-language map, which includes data for the raw base language
-//     and its canonicalized variant (if applicable),
-//   - expanding entries for the equivalence classes defined in CLDR's
-//     languageMatch data.
-// The per-language map ensures that typically only a very small number of tags
-// need to be considered. The pre-expansion of canonicalized subtags and
-// equivalence classes reduces the amount of map lookups that need to be done at
-// runtime.
-
-// matcher keeps a set of supported language tags, indexed by language.
-type matcher struct {
-	default_         *haveTag
-	supported        []*haveTag
-	index            map[langID]*matchHeader
-	passSettings     bool
-	preferSameScript bool
-}
-
-// matchHeader has the lists of tags for exact matches and matches based on
-// maximized and canonicalized tags for a given language.
-type matchHeader struct {
-	exact []*haveTag
-	max   []*haveTag
-}
-
-// haveTag holds a supported Tag and its maximized script and region. The maximized
-// or canonicalized language is not stored as it is not needed during matching.
-type haveTag struct {
-	tag Tag
-
-	// index of this tag in the original list of supported tags.
-	index int
-
-	// conf is the maximum confidence that can result from matching this haveTag.
-	// When conf < Exact this means it was inserted after applying a CLDR equivalence rule.
-	conf Confidence
-
-	// Maximized region and script.
-	maxRegion regionID
-	maxScript scriptID
-
-	// altScript may be checked as an alternative match to maxScript. If altScript
-	// matches, the confidence level for this match is Low. Theoretically there
-	// could be multiple alternative scripts. This does not occur in practice.
-	altScript scriptID
-
-	// nextMax is the index of the next haveTag with the same maximized tags.
-	nextMax uint16
-}
-
-func makeHaveTag(tag Tag, index int) (haveTag, langID) {
-	max := tag
-	if tag.lang != 0 {
-		max, _ = max.canonicalize(All)
-		max, _ = addTags(max)
-		max.remakeString()
-	}
-	return haveTag{tag, index, Exact, max.region, max.script, altScript(max.lang, max.script), 0}, max.lang
-}
-
-// altScript returns an alternative script that may match the given script with
-// a low confidence.  At the moment, the langMatch data allows for at most one
-// script to map to another and we rely on this to keep the code simple.
-func altScript(l langID, s scriptID) scriptID {
-	for _, alt := range matchScript {
-		// TODO: also match cases where language is not the same.
-		if (langID(alt.wantLang) == l || langID(alt.haveLang) == l) &&
-			scriptID(alt.haveScript) == s {
-			return scriptID(alt.wantScript)
-		}
-	}
-	return 0
-}
-
-// addIfNew adds a haveTag to the list of tags only if it is a unique tag.
-// Tags that have the same maximized values are linked by index.
-func (h *matchHeader) addIfNew(n haveTag, exact bool) {
-	// Don't add new exact matches.
-	for _, v := range h.exact {
-		if v.tag.equalsRest(n.tag) {
-			return
-		}
-	}
-	if exact {
-		h.exact = append(h.exact, &n)
-	}
-	// Allow duplicate maximized tags, but create a linked list to allow quickly
-	// comparing the equivalents and bail out.
-	for i, v := range h.max {
-		if v.maxScript == n.maxScript &&
-			v.maxRegion == n.maxRegion &&
-			v.tag.variantOrPrivateTagStr() == n.tag.variantOrPrivateTagStr() {
-			for h.max[i].nextMax != 0 {
-				i = int(h.max[i].nextMax)
-			}
-			h.max[i].nextMax = uint16(len(h.max))
-			break
-		}
-	}
-	h.max = append(h.max, &n)
-}
-
-// header returns the matchHeader for the given language. It creates one if
-// it doesn't already exist.
-func (m *matcher) header(l langID) *matchHeader {
-	if h := m.index[l]; h != nil {
-		return h
-	}
-	h := &matchHeader{}
-	m.index[l] = h
-	return h
-}
-
-func toConf(d uint8) Confidence {
-	if d <= 10 {
-		return High
-	}
-	if d < 30 {
-		return Low
-	}
-	return No
-}
-
-// newMatcher builds an index for the given supported tags and returns it as
-// a matcher. It also expands the index by considering various equivalence classes
-// for a given tag.
-func newMatcher(supported []Tag, options []MatchOption) *matcher {
-	m := &matcher{
-		index:            make(map[langID]*matchHeader),
-		preferSameScript: true,
-	}
-	for _, o := range options {
-		o(m)
-	}
-	if len(supported) == 0 {
-		m.default_ = &haveTag{}
-		return m
-	}
-	// Add supported languages to the index. Add exact matches first to give
-	// them precedence.
-	for i, tag := range supported {
-		pair, _ := makeHaveTag(tag, i)
-		m.header(tag.lang).addIfNew(pair, true)
-		m.supported = append(m.supported, &pair)
-	}
-	m.default_ = m.header(supported[0].lang).exact[0]
-	for i, tag := range supported {
-		pair, max := makeHaveTag(tag, i)
-		if max != tag.lang {
-			m.header(max).addIfNew(pair, false)
-		}
-	}
-
-	// TODO: include alt script.
-	// - don't replace regions, but allow regions to be made more specific.
-
-	// update is used to add indexes in the map for equivalent languages.
-	// If force is true, the update will also apply to derived entries. To
-	// avoid applying a "transitive closure", use false.
-	update := func(want, have uint16, conf Confidence, force bool) {
-		if hh := m.index[langID(have)]; hh != nil {
-			if !force && len(hh.exact) == 0 {
-				return
-			}
-			hw := m.header(langID(want))
-			for _, ht := range hh.max {
-				v := *ht
-				if conf < v.conf {
-					v.conf = conf
-				}
-				v.nextMax = 0 // this value needs to be recomputed
-				if v.altScript != 0 {
-					v.altScript = altScript(langID(want), v.maxScript)
-				}
-				hw.addIfNew(v, conf == Exact && len(hh.exact) > 0)
-			}
-		}
-	}
-
-	// Add entries for languages with mutual intelligibility as defined by CLDR's
-	// languageMatch data.
-	for _, ml := range matchLang {
-		update(ml.want, ml.have, toConf(ml.distance), false)
-		if !ml.oneway {
-			update(ml.have, ml.want, toConf(ml.distance), false)
-		}
-	}
-
-	// Add entries for possible canonicalizations. This is an optimization to
-	// ensure that only one map lookup needs to be done at runtime per desired tag.
-	// First we match deprecated equivalents. If they are perfect equivalents
-	// (their canonicalization simply substitutes a different language code, but
-	// nothing else), the match confidence is Exact, otherwise it is High.
-	for i, lm := range langAliasMap {
-		if lm.from == _sh {
-			continue
-		}
-
-		// If deprecated codes match and there is no fiddling with the script or
-		// or region, we consider it an exact match.
-		conf := Exact
-		if langAliasTypes[i] != langMacro {
-			if !isExactEquivalent(langID(lm.from)) {
-				conf = High
-			}
-			update(lm.to, lm.from, conf, true)
-		}
-		update(lm.from, lm.to, conf, true)
-	}
-	return m
-}
-
-// getBest gets the best matching tag in m for any of the given tags, taking into
-// account the order of preference of the given tags.
-func (m *matcher) getBest(want ...Tag) (got *haveTag, orig Tag, c Confidence) {
-	best := bestMatch{}
-	for _, w := range want {
-		var max Tag
-		// Check for exact match first.
-		h := m.index[w.lang]
-		if w.lang != 0 {
-			// Base language is defined.
-			if h == nil {
-				continue
-			}
-			for i := range h.exact {
-				have := h.exact[i]
-				if have.tag.equalsRest(w) {
-					return have, w, Exact
-				}
-			}
-			max, _ = w.canonicalize(Legacy | Deprecated)
-			max, _ = addTags(max)
-		} else {
-			// Base language is not defined.
-			if h != nil {
-				for i := range h.exact {
-					have := h.exact[i]
-					if have.tag.equalsRest(w) {
-						return have, w, Exact
-					}
-				}
-			}
-			if w.script == 0 && w.region == 0 {
-				// We skip all tags matching und for approximate matching, including
-				// private tags.
-				continue
-			}
-			max, _ = addTags(w)
-			if h = m.index[max.lang]; h == nil {
-				continue
-			}
-		}
-		// Check for match based on maximized tag.
-		for i := range h.max {
-			have := h.max[i]
-			best.update(have, w, max.script, max.region)
-			if best.conf == Exact {
-				for have.nextMax != 0 {
-					have = h.max[have.nextMax]
-					best.update(have, w, max.script, max.region)
-				}
-				return best.have, best.want, High
-			}
-		}
-	}
-	if best.conf <= No {
-		if len(want) != 0 {
-			return nil, want[0], No
-		}
-		return nil, Tag{}, No
-	}
-	return best.have, best.want, best.conf
-}
-
-// bestMatch accumulates the best match so far.
-type bestMatch struct {
-	have *haveTag
-	want Tag
-	conf Confidence
-	// Cached results from applying tie-breaking rules.
-	origLang     bool
-	origReg      bool
-	regGroupDist uint8
-	regDist      uint8
-	origScript   bool
-	parentDist   uint8 // 255 if have is not an ancestor of want tag.
-}
-
-// update updates the existing best match if the new pair is considered to be a
-// better match.
-// To determine if the given pair is a better match, it first computes the rough
-// confidence level. If this surpasses the current match, it will replace it and
-// update the tie-breaker rule cache. If there is a tie, it proceeds with applying
-// a series of tie-breaker rules. If there is no conclusive winner after applying
-// the tie-breaker rules, it leaves the current match as the preferred match.
-func (m *bestMatch) update(have *haveTag, tag Tag, maxScript scriptID, maxRegion regionID) {
-	// Bail if the maximum attainable confidence is below that of the current best match.
-	c := have.conf
-	if c < m.conf {
-		return
-	}
-	if have.maxScript != maxScript {
-		// There is usually very little comprehension between different scripts.
-		// In a few cases there may still be Low comprehension. This possibility is
-		// pre-computed and stored in have.altScript.
-		if Low < m.conf || have.altScript != maxScript {
-			return
-		}
-		c = Low
-	} else if have.maxRegion != maxRegion {
-		// There is usually a small difference between languages across regions.
-		// We use the region distance (below) to disambiguate between equal matches.
-		if High < c {
-			c = High
-		}
-	}
-
-	// We store the results of the computations of the tie-breaker rules along
-	// with the best match. There is no need to do the checks once we determine
-	// we have a winner, but we do still need to do the tie-breaker computations.
-	// We use "beaten" to keep track if we still need to do the checks.
-	beaten := false // true if the new pair defeats the current one.
-	if c != m.conf {
-		if c < m.conf {
-			return
-		}
-		beaten = true
-	}
-
-	// Tie-breaker rules:
-	// We prefer if the pre-maximized language was specified and identical.
-	origLang := have.tag.lang == tag.lang && tag.lang != 0
-	if !beaten && m.origLang != origLang {
-		if m.origLang {
-			return
-		}
-		beaten = true
-	}
-
-	regGroupDist := regionGroupDist(have.maxRegion, maxRegion, maxScript, tag.lang)
-	if !beaten && m.regGroupDist != regGroupDist {
-		if regGroupDist > m.regGroupDist {
-			return
-		}
-		beaten = true
-	}
-
-	// We prefer if the pre-maximized region was specified and identical.
-	origReg := have.tag.region == tag.region && tag.region != 0
-	if !beaten && m.origReg != origReg {
-		if m.origReg {
-			return
-		}
-		beaten = true
-	}
-
-	// TODO: remove the region distance rule. Region distance has been replaced
-	// by the region grouping rule. For now we leave it as it still seems to
-	// have a net positive effect when applied after the grouping rule.
-	// Possible solutions:
-	// - apply the primary locale rule first to effectively disable region
-	//   region distance if groups are defined.
-	// - express the following errors in terms of grouping (if possible)
-	// - find another method of handling the following cases.
-	// maximization of legacy: find mo in
-	//      "sr-Cyrl, sr-Latn, ro, ro-MD": have ro; want ro-MD (High)
-	// region distance French: find fr-US in
-	//      "en, fr, fr-CA, fr-CH": have fr; want fr-CA (High)
-
-	// Next we prefer smaller distances between regions, as defined by
-	// regionDist.
-	regDist := uint8(regionDistance(have.maxRegion, maxRegion))
-	if !beaten && m.regDist != regDist {
-		if regDist > m.regDist {
-			return
-		}
-		beaten = true
-	}
-
-	// Next we prefer if the pre-maximized script was specified and identical.
-	origScript := have.tag.script == tag.script && tag.script != 0
-	if !beaten && m.origScript != origScript {
-		if m.origScript {
-			return
-		}
-		beaten = true
-	}
-
-	// Finally we prefer tags which have a closer parent relationship.
-	// TODO: the parent relationship no longer seems necessary. It doesn't hurt
-	// to leave it in as the final tie-breaker, though, especially until the
-	// grouping data has further matured.
-	parentDist := parentDistance(have.tag.region, tag)
-	if !beaten && m.parentDist != parentDist {
-		if parentDist > m.parentDist {
-			return
-		}
-		beaten = true
-	}
-
-	// Update m to the newly found best match.
-	if beaten {
-		m.have = have
-		m.want = tag
-		m.conf = c
-		m.origLang = origLang
-		m.origReg = origReg
-		m.origScript = origScript
-		m.regGroupDist = regGroupDist
-		m.regDist = regDist
-		m.parentDist = parentDist
-	}
-}
-
-// parentDistance returns the number of times Parent must be called before the
-// regions match. It is assumed that it has already been checked that lang and
-// script are identical. If haveRegion does not occur in the ancestor chain of
-// tag, it returns 255.
-func parentDistance(haveRegion regionID, tag Tag) uint8 {
-	p := tag.Parent()
-	d := uint8(1)
-	for haveRegion != p.region {
-		if p.region == 0 {
-			return 255
-		}
-		p = p.Parent()
-		d++
-	}
-	return d
-}
-
-// regionGroupDist computes the distance between two regions based on their
-// CLDR grouping.
-func regionGroupDist(a, b regionID, script scriptID, lang langID) uint8 {
-	aGroup := uint(regionToGroups[a]) << 1
-	bGroup := uint(regionToGroups[b]) << 1
-	for _, ri := range matchRegion {
-		if langID(ri.lang) == lang && (ri.script == 0 || scriptID(ri.script) == script) {
-			group := uint(1 << (ri.group &^ 0x80))
-			if 0x80&ri.group == 0 {
-				if aGroup&bGroup&group != 0 { // Both regions are in the group.
-					return ri.distance
-				}
-			} else {
-				if (aGroup|bGroup)&group == 0 { // Both regions are not in the group.
-					return ri.distance
-				}
-			}
-		}
-	}
-	const defaultDistance = 4
-	return defaultDistance
-}
-
-// regionDistance computes the distance between two regions based on the
-// distance in the graph of region containments as defined in CLDR. It iterates
-// over increasingly inclusive sets of groups, represented as bit vectors, until
-// the source bit vector has bits in common with the destination vector.
-func regionDistance(a, b regionID) int {
-	if a == b {
-		return 0
-	}
-	p, q := regionInclusion[a], regionInclusion[b]
-	if p < nRegionGroups {
-		p, q = q, p
-	}
-	set := regionInclusionBits
-	if q < nRegionGroups && set[p]&(1<<q) != 0 {
-		return 1
-	}
-	d := 2
-	for goal := set[q]; set[p]&goal == 0; p = regionInclusionNext[p] {
-		d++
-	}
-	return d
-}
-
-func (t Tag) variants() string {
-	if t.pVariant == 0 {
-		return ""
-	}
-	return t.str[t.pVariant:t.pExt]
-}
-
-// variantOrPrivateTagStr returns variants or private use tags.
-func (t Tag) variantOrPrivateTagStr() string {
-	if t.pExt > 0 {
-		return t.str[t.pVariant:t.pExt]
-	}
-	return t.str[t.pVariant:]
-}
-
-// equalsRest compares everything except the language.
-func (a Tag) equalsRest(b Tag) bool {
-	// TODO: don't include extensions in this comparison. To do this efficiently,
-	// though, we should handle private tags separately.
-	return a.script == b.script && a.region == b.region && a.variantOrPrivateTagStr() == b.variantOrPrivateTagStr()
-}
-
-// isExactEquivalent returns true if canonicalizing the language will not alter
-// the script or region of a tag.
-func isExactEquivalent(l langID) bool {
-	for _, o := range notEquivalent {
-		if o == l {
-			return false
-		}
-	}
-	return true
-}
-
-var notEquivalent []langID
-
-func init() {
-	// Create a list of all languages for which canonicalization may alter the
-	// script or region.
-	for _, lm := range langAliasMap {
-		tag := Tag{lang: langID(lm.from)}
-		if tag, _ = tag.canonicalize(All); tag.script != 0 || tag.region != 0 {
-			notEquivalent = append(notEquivalent, langID(lm.from))
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/language/parse.go b/vendor/golang.org/x/text/language/parse.go
deleted file mode 100644
index cfa28f56e2..0000000000
--- a/vendor/golang.org/x/text/language/parse.go
+++ /dev/null
@@ -1,859 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package language
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"sort"
-	"strconv"
-	"strings"
-
-	"golang.org/x/text/internal/tag"
-)
-
-// isAlpha returns true if the byte is not a digit.
-// b must be an ASCII letter or digit.
-func isAlpha(b byte) bool {
-	return b > '9'
-}
-
-// isAlphaNum returns true if the string contains only ASCII letters or digits.
-func isAlphaNum(s []byte) bool {
-	for _, c := range s {
-		if !('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9') {
-			return false
-		}
-	}
-	return true
-}
-
-// errSyntax is returned by any of the parsing functions when the
-// input is not well-formed, according to BCP 47.
-// TODO: return the position at which the syntax error occurred?
-var errSyntax = errors.New("language: tag is not well-formed")
-
-// ValueError is returned by any of the parsing functions when the
-// input is well-formed but the respective subtag is not recognized
-// as a valid value.
-type ValueError struct {
-	v [8]byte
-}
-
-func mkErrInvalid(s []byte) error {
-	var e ValueError
-	copy(e.v[:], s)
-	return e
-}
-
-func (e ValueError) tag() []byte {
-	n := bytes.IndexByte(e.v[:], 0)
-	if n == -1 {
-		n = 8
-	}
-	return e.v[:n]
-}
-
-// Error implements the error interface.
-func (e ValueError) Error() string {
-	return fmt.Sprintf("language: subtag %q is well-formed but unknown", e.tag())
-}
-
-// Subtag returns the subtag for which the error occurred.
-func (e ValueError) Subtag() string {
-	return string(e.tag())
-}
-
-// scanner is used to scan BCP 47 tokens, which are separated by _ or -.
-type scanner struct {
-	b     []byte
-	bytes [max99thPercentileSize]byte
-	token []byte
-	start int // start position of the current token
-	end   int // end position of the current token
-	next  int // next point for scan
-	err   error
-	done  bool
-}
-
-func makeScannerString(s string) scanner {
-	scan := scanner{}
-	if len(s) <= len(scan.bytes) {
-		scan.b = scan.bytes[:copy(scan.bytes[:], s)]
-	} else {
-		scan.b = []byte(s)
-	}
-	scan.init()
-	return scan
-}
-
-// makeScanner returns a scanner using b as the input buffer.
-// b is not copied and may be modified by the scanner routines.
-func makeScanner(b []byte) scanner {
-	scan := scanner{b: b}
-	scan.init()
-	return scan
-}
-
-func (s *scanner) init() {
-	for i, c := range s.b {
-		if c == '_' {
-			s.b[i] = '-'
-		}
-	}
-	s.scan()
-}
-
-// restToLower converts the string between start and end to lower case.
-func (s *scanner) toLower(start, end int) {
-	for i := start; i < end; i++ {
-		c := s.b[i]
-		if 'A' <= c && c <= 'Z' {
-			s.b[i] += 'a' - 'A'
-		}
-	}
-}
-
-func (s *scanner) setError(e error) {
-	if s.err == nil || (e == errSyntax && s.err != errSyntax) {
-		s.err = e
-	}
-}
-
-// resizeRange shrinks or grows the array at position oldStart such that
-// a new string of size newSize can fit between oldStart and oldEnd.
-// Sets the scan point to after the resized range.
-func (s *scanner) resizeRange(oldStart, oldEnd, newSize int) {
-	s.start = oldStart
-	if end := oldStart + newSize; end != oldEnd {
-		diff := end - oldEnd
-		if end < cap(s.b) {
-			b := make([]byte, len(s.b)+diff)
-			copy(b, s.b[:oldStart])
-			copy(b[end:], s.b[oldEnd:])
-			s.b = b
-		} else {
-			s.b = append(s.b[end:], s.b[oldEnd:]...)
-		}
-		s.next = end + (s.next - s.end)
-		s.end = end
-	}
-}
-
-// replace replaces the current token with repl.
-func (s *scanner) replace(repl string) {
-	s.resizeRange(s.start, s.end, len(repl))
-	copy(s.b[s.start:], repl)
-}
-
-// gobble removes the current token from the input.
-// Caller must call scan after calling gobble.
-func (s *scanner) gobble(e error) {
-	s.setError(e)
-	if s.start == 0 {
-		s.b = s.b[:+copy(s.b, s.b[s.next:])]
-		s.end = 0
-	} else {
-		s.b = s.b[:s.start-1+copy(s.b[s.start-1:], s.b[s.end:])]
-		s.end = s.start - 1
-	}
-	s.next = s.start
-}
-
-// deleteRange removes the given range from s.b before the current token.
-func (s *scanner) deleteRange(start, end int) {
-	s.setError(errSyntax)
-	s.b = s.b[:start+copy(s.b[start:], s.b[end:])]
-	diff := end - start
-	s.next -= diff
-	s.start -= diff
-	s.end -= diff
-}
-
-// scan parses the next token of a BCP 47 string.  Tokens that are larger
-// than 8 characters or include non-alphanumeric characters result in an error
-// and are gobbled and removed from the output.
-// It returns the end position of the last token consumed.
-func (s *scanner) scan() (end int) {
-	end = s.end
-	s.token = nil
-	for s.start = s.next; s.next < len(s.b); {
-		i := bytes.IndexByte(s.b[s.next:], '-')
-		if i == -1 {
-			s.end = len(s.b)
-			s.next = len(s.b)
-			i = s.end - s.start
-		} else {
-			s.end = s.next + i
-			s.next = s.end + 1
-		}
-		token := s.b[s.start:s.end]
-		if i < 1 || i > 8 || !isAlphaNum(token) {
-			s.gobble(errSyntax)
-			continue
-		}
-		s.token = token
-		return end
-	}
-	if n := len(s.b); n > 0 && s.b[n-1] == '-' {
-		s.setError(errSyntax)
-		s.b = s.b[:len(s.b)-1]
-	}
-	s.done = true
-	return end
-}
-
-// acceptMinSize parses multiple tokens of the given size or greater.
-// It returns the end position of the last token consumed.
-func (s *scanner) acceptMinSize(min int) (end int) {
-	end = s.end
-	s.scan()
-	for ; len(s.token) >= min; s.scan() {
-		end = s.end
-	}
-	return end
-}
-
-// Parse parses the given BCP 47 string and returns a valid Tag. If parsing
-// failed it returns an error and any part of the tag that could be parsed.
-// If parsing succeeded but an unknown value was found, it returns
-// ValueError. The Tag returned in this case is just stripped of the unknown
-// value. All other values are preserved. It accepts tags in the BCP 47 format
-// and extensions to this standard defined in
-// http://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers.
-// The resulting tag is canonicalized using the default canonicalization type.
-func Parse(s string) (t Tag, err error) {
-	return Default.Parse(s)
-}
-
-// Parse parses the given BCP 47 string and returns a valid Tag. If parsing
-// failed it returns an error and any part of the tag that could be parsed.
-// If parsing succeeded but an unknown value was found, it returns
-// ValueError. The Tag returned in this case is just stripped of the unknown
-// value. All other values are preserved. It accepts tags in the BCP 47 format
-// and extensions to this standard defined in
-// http://www.unicode.org/reports/tr35/#Unicode_Language_and_Locale_Identifiers.
-// The resulting tag is canonicalized using the the canonicalization type c.
-func (c CanonType) Parse(s string) (t Tag, err error) {
-	// TODO: consider supporting old-style locale key-value pairs.
-	if s == "" {
-		return und, errSyntax
-	}
-	if len(s) <= maxAltTaglen {
-		b := [maxAltTaglen]byte{}
-		for i, c := range s {
-			// Generating invalid UTF-8 is okay as it won't match.
-			if 'A' <= c && c <= 'Z' {
-				c += 'a' - 'A'
-			} else if c == '_' {
-				c = '-'
-			}
-			b[i] = byte(c)
-		}
-		if t, ok := grandfathered(b); ok {
-			return t, nil
-		}
-	}
-	scan := makeScannerString(s)
-	t, err = parse(&scan, s)
-	t, changed := t.canonicalize(c)
-	if changed {
-		t.remakeString()
-	}
-	return t, err
-}
-
-func parse(scan *scanner, s string) (t Tag, err error) {
-	t = und
-	var end int
-	if n := len(scan.token); n <= 1 {
-		scan.toLower(0, len(scan.b))
-		if n == 0 || scan.token[0] != 'x' {
-			return t, errSyntax
-		}
-		end = parseExtensions(scan)
-	} else if n >= 4 {
-		return und, errSyntax
-	} else { // the usual case
-		t, end = parseTag(scan)
-		if n := len(scan.token); n == 1 {
-			t.pExt = uint16(end)
-			end = parseExtensions(scan)
-		} else if end < len(scan.b) {
-			scan.setError(errSyntax)
-			scan.b = scan.b[:end]
-		}
-	}
-	if int(t.pVariant) < len(scan.b) {
-		if end < len(s) {
-			s = s[:end]
-		}
-		if len(s) > 0 && tag.Compare(s, scan.b) == 0 {
-			t.str = s
-		} else {
-			t.str = string(scan.b)
-		}
-	} else {
-		t.pVariant, t.pExt = 0, 0
-	}
-	return t, scan.err
-}
-
-// parseTag parses language, script, region and variants.
-// It returns a Tag and the end position in the input that was parsed.
-func parseTag(scan *scanner) (t Tag, end int) {
-	var e error
-	// TODO: set an error if an unknown lang, script or region is encountered.
-	t.lang, e = getLangID(scan.token)
-	scan.setError(e)
-	scan.replace(t.lang.String())
-	langStart := scan.start
-	end = scan.scan()
-	for len(scan.token) == 3 && isAlpha(scan.token[0]) {
-		// From http://tools.ietf.org/html/bcp47, <lang>-<extlang> tags are equivalent
-		// to a tag of the form <extlang>.
-		lang, e := getLangID(scan.token)
-		if lang != 0 {
-			t.lang = lang
-			copy(scan.b[langStart:], lang.String())
-			scan.b[langStart+3] = '-'
-			scan.start = langStart + 4
-		}
-		scan.gobble(e)
-		end = scan.scan()
-	}
-	if len(scan.token) == 4 && isAlpha(scan.token[0]) {
-		t.script, e = getScriptID(script, scan.token)
-		if t.script == 0 {
-			scan.gobble(e)
-		}
-		end = scan.scan()
-	}
-	if n := len(scan.token); n >= 2 && n <= 3 {
-		t.region, e = getRegionID(scan.token)
-		if t.region == 0 {
-			scan.gobble(e)
-		} else {
-			scan.replace(t.region.String())
-		}
-		end = scan.scan()
-	}
-	scan.toLower(scan.start, len(scan.b))
-	t.pVariant = byte(end)
-	end = parseVariants(scan, end, t)
-	t.pExt = uint16(end)
-	return t, end
-}
-
-var separator = []byte{'-'}
-
-// parseVariants scans tokens as long as each token is a valid variant string.
-// Duplicate variants are removed.
-func parseVariants(scan *scanner, end int, t Tag) int {
-	start := scan.start
-	varIDBuf := [4]uint8{}
-	variantBuf := [4][]byte{}
-	varID := varIDBuf[:0]
-	variant := variantBuf[:0]
-	last := -1
-	needSort := false
-	for ; len(scan.token) >= 4; scan.scan() {
-		// TODO: measure the impact of needing this conversion and redesign
-		// the data structure if there is an issue.
-		v, ok := variantIndex[string(scan.token)]
-		if !ok {
-			// unknown variant
-			// TODO: allow user-defined variants?
-			scan.gobble(mkErrInvalid(scan.token))
-			continue
-		}
-		varID = append(varID, v)
-		variant = append(variant, scan.token)
-		if !needSort {
-			if last < int(v) {
-				last = int(v)
-			} else {
-				needSort = true
-				// There is no legal combinations of more than 7 variants
-				// (and this is by no means a useful sequence).
-				const maxVariants = 8
-				if len(varID) > maxVariants {
-					break
-				}
-			}
-		}
-		end = scan.end
-	}
-	if needSort {
-		sort.Sort(variantsSort{varID, variant})
-		k, l := 0, -1
-		for i, v := range varID {
-			w := int(v)
-			if l == w {
-				// Remove duplicates.
-				continue
-			}
-			varID[k] = varID[i]
-			variant[k] = variant[i]
-			k++
-			l = w
-		}
-		if str := bytes.Join(variant[:k], separator); len(str) == 0 {
-			end = start - 1
-		} else {
-			scan.resizeRange(start, end, len(str))
-			copy(scan.b[scan.start:], str)
-			end = scan.end
-		}
-	}
-	return end
-}
-
-type variantsSort struct {
-	i []uint8
-	v [][]byte
-}
-
-func (s variantsSort) Len() int {
-	return len(s.i)
-}
-
-func (s variantsSort) Swap(i, j int) {
-	s.i[i], s.i[j] = s.i[j], s.i[i]
-	s.v[i], s.v[j] = s.v[j], s.v[i]
-}
-
-func (s variantsSort) Less(i, j int) bool {
-	return s.i[i] < s.i[j]
-}
-
-type bytesSort [][]byte
-
-func (b bytesSort) Len() int {
-	return len(b)
-}
-
-func (b bytesSort) Swap(i, j int) {
-	b[i], b[j] = b[j], b[i]
-}
-
-func (b bytesSort) Less(i, j int) bool {
-	return bytes.Compare(b[i], b[j]) == -1
-}
-
-// parseExtensions parses and normalizes the extensions in the buffer.
-// It returns the last position of scan.b that is part of any extension.
-// It also trims scan.b to remove excess parts accordingly.
-func parseExtensions(scan *scanner) int {
-	start := scan.start
-	exts := [][]byte{}
-	private := []byte{}
-	end := scan.end
-	for len(scan.token) == 1 {
-		extStart := scan.start
-		ext := scan.token[0]
-		end = parseExtension(scan)
-		extension := scan.b[extStart:end]
-		if len(extension) < 3 || (ext != 'x' && len(extension) < 4) {
-			scan.setError(errSyntax)
-			end = extStart
-			continue
-		} else if start == extStart && (ext == 'x' || scan.start == len(scan.b)) {
-			scan.b = scan.b[:end]
-			return end
-		} else if ext == 'x' {
-			private = extension
-			break
-		}
-		exts = append(exts, extension)
-	}
-	sort.Sort(bytesSort(exts))
-	if len(private) > 0 {
-		exts = append(exts, private)
-	}
-	scan.b = scan.b[:start]
-	if len(exts) > 0 {
-		scan.b = append(scan.b, bytes.Join(exts, separator)...)
-	} else if start > 0 {
-		// Strip trailing '-'.
-		scan.b = scan.b[:start-1]
-	}
-	return end
-}
-
-// parseExtension parses a single extension and returns the position of
-// the extension end.
-func parseExtension(scan *scanner) int {
-	start, end := scan.start, scan.end
-	switch scan.token[0] {
-	case 'u':
-		attrStart := end
-		scan.scan()
-		for last := []byte{}; len(scan.token) > 2; scan.scan() {
-			if bytes.Compare(scan.token, last) != -1 {
-				// Attributes are unsorted. Start over from scratch.
-				p := attrStart + 1
-				scan.next = p
-				attrs := [][]byte{}
-				for scan.scan(); len(scan.token) > 2; scan.scan() {
-					attrs = append(attrs, scan.token)
-					end = scan.end
-				}
-				sort.Sort(bytesSort(attrs))
-				copy(scan.b[p:], bytes.Join(attrs, separator))
-				break
-			}
-			last = scan.token
-			end = scan.end
-		}
-		var last, key []byte
-		for attrEnd := end; len(scan.token) == 2; last = key {
-			key = scan.token
-			keyEnd := scan.end
-			end = scan.acceptMinSize(3)
-			// TODO: check key value validity
-			if keyEnd == end || bytes.Compare(key, last) != 1 {
-				// We have an invalid key or the keys are not sorted.
-				// Start scanning keys from scratch and reorder.
-				p := attrEnd + 1
-				scan.next = p
-				keys := [][]byte{}
-				for scan.scan(); len(scan.token) == 2; {
-					keyStart, keyEnd := scan.start, scan.end
-					end = scan.acceptMinSize(3)
-					if keyEnd != end {
-						keys = append(keys, scan.b[keyStart:end])
-					} else {
-						scan.setError(errSyntax)
-						end = keyStart
-					}
-				}
-				sort.Sort(bytesSort(keys))
-				reordered := bytes.Join(keys, separator)
-				if e := p + len(reordered); e < end {
-					scan.deleteRange(e, end)
-					end = e
-				}
-				copy(scan.b[p:], bytes.Join(keys, separator))
-				break
-			}
-		}
-	case 't':
-		scan.scan()
-		if n := len(scan.token); n >= 2 && n <= 3 && isAlpha(scan.token[1]) {
-			_, end = parseTag(scan)
-			scan.toLower(start, end)
-		}
-		for len(scan.token) == 2 && !isAlpha(scan.token[1]) {
-			end = scan.acceptMinSize(3)
-		}
-	case 'x':
-		end = scan.acceptMinSize(1)
-	default:
-		end = scan.acceptMinSize(2)
-	}
-	return end
-}
-
-// Compose creates a Tag from individual parts, which may be of type Tag, Base,
-// Script, Region, Variant, []Variant, Extension, []Extension or error. If a
-// Base, Script or Region or slice of type Variant or Extension is passed more
-// than once, the latter will overwrite the former. Variants and Extensions are
-// accumulated, but if two extensions of the same type are passed, the latter
-// will replace the former. A Tag overwrites all former values and typically
-// only makes sense as the first argument. The resulting tag is returned after
-// canonicalizing using the Default CanonType. If one or more errors are
-// encountered, one of the errors is returned.
-func Compose(part ...interface{}) (t Tag, err error) {
-	return Default.Compose(part...)
-}
-
-// Compose creates a Tag from individual parts, which may be of type Tag, Base,
-// Script, Region, Variant, []Variant, Extension, []Extension or error. If a
-// Base, Script or Region or slice of type Variant or Extension is passed more
-// than once, the latter will overwrite the former. Variants and Extensions are
-// accumulated, but if two extensions of the same type are passed, the latter
-// will replace the former. A Tag overwrites all former values and typically
-// only makes sense as the first argument. The resulting tag is returned after
-// canonicalizing using CanonType c. If one or more errors are encountered,
-// one of the errors is returned.
-func (c CanonType) Compose(part ...interface{}) (t Tag, err error) {
-	var b builder
-	if err = b.update(part...); err != nil {
-		return und, err
-	}
-	t, _ = b.tag.canonicalize(c)
-
-	if len(b.ext) > 0 || len(b.variant) > 0 {
-		sort.Sort(sortVariant(b.variant))
-		sort.Strings(b.ext)
-		if b.private != "" {
-			b.ext = append(b.ext, b.private)
-		}
-		n := maxCoreSize + tokenLen(b.variant...) + tokenLen(b.ext...)
-		buf := make([]byte, n)
-		p := t.genCoreBytes(buf)
-		t.pVariant = byte(p)
-		p += appendTokens(buf[p:], b.variant...)
-		t.pExt = uint16(p)
-		p += appendTokens(buf[p:], b.ext...)
-		t.str = string(buf[:p])
-	} else if b.private != "" {
-		t.str = b.private
-		t.remakeString()
-	}
-	return
-}
-
-type builder struct {
-	tag Tag
-
-	private string // the x extension
-	ext     []string
-	variant []string
-
-	err error
-}
-
-func (b *builder) addExt(e string) {
-	if e == "" {
-	} else if e[0] == 'x' {
-		b.private = e
-	} else {
-		b.ext = append(b.ext, e)
-	}
-}
-
-var errInvalidArgument = errors.New("invalid Extension or Variant")
-
-func (b *builder) update(part ...interface{}) (err error) {
-	replace := func(l *[]string, s string, eq func(a, b string) bool) bool {
-		if s == "" {
-			b.err = errInvalidArgument
-			return true
-		}
-		for i, v := range *l {
-			if eq(v, s) {
-				(*l)[i] = s
-				return true
-			}
-		}
-		return false
-	}
-	for _, x := range part {
-		switch v := x.(type) {
-		case Tag:
-			b.tag.lang = v.lang
-			b.tag.region = v.region
-			b.tag.script = v.script
-			if v.str != "" {
-				b.variant = nil
-				for x, s := "", v.str[v.pVariant:v.pExt]; s != ""; {
-					x, s = nextToken(s)
-					b.variant = append(b.variant, x)
-				}
-				b.ext, b.private = nil, ""
-				for i, e := int(v.pExt), ""; i < len(v.str); {
-					i, e = getExtension(v.str, i)
-					b.addExt(e)
-				}
-			}
-		case Base:
-			b.tag.lang = v.langID
-		case Script:
-			b.tag.script = v.scriptID
-		case Region:
-			b.tag.region = v.regionID
-		case Variant:
-			if !replace(&b.variant, v.variant, func(a, b string) bool { return a == b }) {
-				b.variant = append(b.variant, v.variant)
-			}
-		case Extension:
-			if !replace(&b.ext, v.s, func(a, b string) bool { return a[0] == b[0] }) {
-				b.addExt(v.s)
-			}
-		case []Variant:
-			b.variant = nil
-			for _, x := range v {
-				b.update(x)
-			}
-		case []Extension:
-			b.ext, b.private = nil, ""
-			for _, e := range v {
-				b.update(e)
-			}
-		// TODO: support parsing of raw strings based on morphology or just extensions?
-		case error:
-			err = v
-		}
-	}
-	return
-}
-
-func tokenLen(token ...string) (n int) {
-	for _, t := range token {
-		n += len(t) + 1
-	}
-	return
-}
-
-func appendTokens(b []byte, token ...string) int {
-	p := 0
-	for _, t := range token {
-		b[p] = '-'
-		copy(b[p+1:], t)
-		p += 1 + len(t)
-	}
-	return p
-}
-
-type sortVariant []string
-
-func (s sortVariant) Len() int {
-	return len(s)
-}
-
-func (s sortVariant) Swap(i, j int) {
-	s[j], s[i] = s[i], s[j]
-}
-
-func (s sortVariant) Less(i, j int) bool {
-	return variantIndex[s[i]] < variantIndex[s[j]]
-}
-
-func findExt(list []string, x byte) int {
-	for i, e := range list {
-		if e[0] == x {
-			return i
-		}
-	}
-	return -1
-}
-
-// getExtension returns the name, body and end position of the extension.
-func getExtension(s string, p int) (end int, ext string) {
-	if s[p] == '-' {
-		p++
-	}
-	if s[p] == 'x' {
-		return len(s), s[p:]
-	}
-	end = nextExtension(s, p)
-	return end, s[p:end]
-}
-
-// nextExtension finds the next extension within the string, searching
-// for the -<char>- pattern from position p.
-// In the fast majority of cases, language tags will have at most
-// one extension and extensions tend to be small.
-func nextExtension(s string, p int) int {
-	for n := len(s) - 3; p < n; {
-		if s[p] == '-' {
-			if s[p+2] == '-' {
-				return p
-			}
-			p += 3
-		} else {
-			p++
-		}
-	}
-	return len(s)
-}
-
-var errInvalidWeight = errors.New("ParseAcceptLanguage: invalid weight")
-
-// ParseAcceptLanguage parses the contents of a Accept-Language header as
-// defined in http://www.ietf.org/rfc/rfc2616.txt and returns a list of Tags and
-// a list of corresponding quality weights. It is more permissive than RFC 2616
-// and may return non-nil slices even if the input is not valid.
-// The Tags will be sorted by highest weight first and then by first occurrence.
-// Tags with a weight of zero will be dropped. An error will be returned if the
-// input could not be parsed.
-func ParseAcceptLanguage(s string) (tag []Tag, q []float32, err error) {
-	var entry string
-	for s != "" {
-		if entry, s = split(s, ','); entry == "" {
-			continue
-		}
-
-		entry, weight := split(entry, ';')
-
-		// Scan the language.
-		t, err := Parse(entry)
-		if err != nil {
-			id, ok := acceptFallback[entry]
-			if !ok {
-				return nil, nil, err
-			}
-			t = Tag{lang: id}
-		}
-
-		// Scan the optional weight.
-		w := 1.0
-		if weight != "" {
-			weight = consume(weight, 'q')
-			weight = consume(weight, '=')
-			// consume returns the empty string when a token could not be
-			// consumed, resulting in an error for ParseFloat.
-			if w, err = strconv.ParseFloat(weight, 32); err != nil {
-				return nil, nil, errInvalidWeight
-			}
-			// Drop tags with a quality weight of 0.
-			if w <= 0 {
-				continue
-			}
-		}
-
-		tag = append(tag, t)
-		q = append(q, float32(w))
-	}
-	sortStable(&tagSort{tag, q})
-	return tag, q, nil
-}
-
-// consume removes a leading token c from s and returns the result or the empty
-// string if there is no such token.
-func consume(s string, c byte) string {
-	if s == "" || s[0] != c {
-		return ""
-	}
-	return strings.TrimSpace(s[1:])
-}
-
-func split(s string, c byte) (head, tail string) {
-	if i := strings.IndexByte(s, c); i >= 0 {
-		return strings.TrimSpace(s[:i]), strings.TrimSpace(s[i+1:])
-	}
-	return strings.TrimSpace(s), ""
-}
-
-// Add hack mapping to deal with a small number of cases that that occur
-// in Accept-Language (with reasonable frequency).
-var acceptFallback = map[string]langID{
-	"english": _en,
-	"deutsch": _de,
-	"italian": _it,
-	"french":  _fr,
-	"*":       _mul, // defined in the spec to match all languages.
-}
-
-type tagSort struct {
-	tag []Tag
-	q   []float32
-}
-
-func (s *tagSort) Len() int {
-	return len(s.q)
-}
-
-func (s *tagSort) Less(i, j int) bool {
-	return s.q[i] > s.q[j]
-}
-
-func (s *tagSort) Swap(i, j int) {
-	s.tag[i], s.tag[j] = s.tag[j], s.tag[i]
-	s.q[i], s.q[j] = s.q[j], s.q[i]
-}
diff --git a/vendor/golang.org/x/text/language/tables.go b/vendor/golang.org/x/text/language/tables.go
deleted file mode 100644
index a108554a41..0000000000
--- a/vendor/golang.org/x/text/language/tables.go
+++ /dev/null
@@ -1,3654 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package language
-
-import "golang.org/x/text/internal/tag"
-
-// CLDRVersion is the CLDR version from which the tables in this package are derived.
-const CLDRVersion = "31"
-
-const numLanguages = 8654
-
-const numScripts = 230
-
-const numRegions = 356
-
-type fromTo struct {
-	from uint16
-	to   uint16
-}
-
-const nonCanonicalUnd = 1199
-const (
-	_af  = 22
-	_am  = 39
-	_ar  = 58
-	_az  = 88
-	_bg  = 126
-	_bn  = 165
-	_ca  = 215
-	_cs  = 249
-	_da  = 256
-	_de  = 268
-	_el  = 309
-	_en  = 312
-	_es  = 317
-	_et  = 319
-	_fa  = 327
-	_fi  = 336
-	_fil = 338
-	_fr  = 349
-	_gu  = 418
-	_he  = 442
-	_hi  = 444
-	_hr  = 463
-	_hu  = 467
-	_hy  = 469
-	_id  = 479
-	_is  = 502
-	_it  = 503
-	_ja  = 510
-	_ka  = 526
-	_kk  = 576
-	_km  = 584
-	_kn  = 591
-	_ko  = 594
-	_ky  = 648
-	_lo  = 694
-	_lt  = 702
-	_lv  = 709
-	_mk  = 765
-	_ml  = 770
-	_mn  = 777
-	_mo  = 782
-	_mr  = 793
-	_ms  = 797
-	_mul = 804
-	_my  = 815
-	_nb  = 837
-	_ne  = 847
-	_nl  = 869
-	_no  = 877
-	_pa  = 923
-	_pl  = 945
-	_pt  = 958
-	_ro  = 986
-	_ru  = 992
-	_sh  = 1029
-	_si  = 1034
-	_sk  = 1040
-	_sl  = 1044
-	_sq  = 1071
-	_sr  = 1072
-	_sv  = 1090
-	_sw  = 1091
-	_ta  = 1102
-	_te  = 1119
-	_th  = 1129
-	_tl  = 1144
-	_tn  = 1150
-	_tr  = 1160
-	_uk  = 1196
-	_ur  = 1202
-	_uz  = 1210
-	_vi  = 1217
-	_zh  = 1319
-	_zu  = 1324
-	_jbo = 513
-	_ami = 1647
-	_bnn = 2354
-	_hak = 436
-	_tlh = 14464
-	_lb  = 659
-	_nv  = 897
-	_pwn = 12052
-	_tao = 14185
-	_tay = 14195
-	_tsu = 14659
-	_nn  = 872
-	_sfb = 13626
-	_vgt = 15698
-	_sgg = 13657
-	_cmn = 3004
-	_nan = 833
-	_hsn = 465
-)
-
-const langPrivateStart = 0x2f6f
-
-const langPrivateEnd = 0x3176
-
-// lang holds an alphabetically sorted list of ISO-639 language identifiers.
-// All entries are 4 bytes. The index of the identifier (divided by 4) is the language tag.
-// For 2-byte language identifiers, the two successive bytes have the following meaning:
-//     - if the first letter of the 2- and 3-letter ISO codes are the same:
-//       the second and third letter of the 3-letter ISO code.
-//     - otherwise: a 0 and a by 2 bits right-shifted index into altLangISO3.
-// For 3-byte language identifiers the 4th byte is 0.
-const lang tag.Index = "" + // Size: 5312 bytes
-	"---\x00aaaraai\x00aak\x00aau\x00abbkabi\x00abq\x00abr\x00abt\x00aby\x00a" +
-	"cd\x00ace\x00ach\x00ada\x00ade\x00adj\x00ady\x00adz\x00aeveaeb\x00aey" +
-	"\x00affragc\x00agd\x00agg\x00agm\x00ago\x00agq\x00aha\x00ahl\x00aho\x00a" +
-	"jg\x00akkaakk\x00ala\x00ali\x00aln\x00alt\x00ammhamm\x00amn\x00amo\x00am" +
-	"p\x00anrganc\x00ank\x00ann\x00any\x00aoj\x00aom\x00aoz\x00apc\x00apd\x00" +
-	"ape\x00apr\x00aps\x00apz\x00arraarc\x00arh\x00arn\x00aro\x00arq\x00ars" +
-	"\x00ary\x00arz\x00assmasa\x00ase\x00asg\x00aso\x00ast\x00ata\x00atg\x00a" +
-	"tj\x00auy\x00avvaavl\x00avn\x00avt\x00avu\x00awa\x00awb\x00awo\x00awx" +
-	"\x00ayymayb\x00azzebaakbal\x00ban\x00bap\x00bar\x00bas\x00bav\x00bax\x00" +
-	"bba\x00bbb\x00bbc\x00bbd\x00bbj\x00bbp\x00bbr\x00bcf\x00bch\x00bci\x00bc" +
-	"m\x00bcn\x00bco\x00bcq\x00bcu\x00bdd\x00beelbef\x00beh\x00bej\x00bem\x00" +
-	"bet\x00bew\x00bex\x00bez\x00bfd\x00bfq\x00bft\x00bfy\x00bgulbgc\x00bgn" +
-	"\x00bgx\x00bhihbhb\x00bhg\x00bhi\x00bhk\x00bhl\x00bho\x00bhy\x00biisbib" +
-	"\x00big\x00bik\x00bim\x00bin\x00bio\x00biq\x00bjh\x00bji\x00bjj\x00bjn" +
-	"\x00bjo\x00bjr\x00bjt\x00bjz\x00bkc\x00bkm\x00bkq\x00bku\x00bkv\x00blt" +
-	"\x00bmambmh\x00bmk\x00bmq\x00bmu\x00bnenbng\x00bnm\x00bnp\x00boodboj\x00" +
-	"bom\x00bon\x00bpy\x00bqc\x00bqi\x00bqp\x00bqv\x00brrebra\x00brh\x00brx" +
-	"\x00brz\x00bsosbsj\x00bsq\x00bss\x00bst\x00bto\x00btt\x00btv\x00bua\x00b" +
-	"uc\x00bud\x00bug\x00buk\x00bum\x00buo\x00bus\x00buu\x00bvb\x00bwd\x00bwr" +
-	"\x00bxh\x00bye\x00byn\x00byr\x00bys\x00byv\x00byx\x00bza\x00bze\x00bzf" +
-	"\x00bzh\x00bzw\x00caatcan\x00cbj\x00cch\x00ccp\x00ceheceb\x00cfa\x00cgg" +
-	"\x00chhachk\x00chm\x00cho\x00chp\x00chr\x00cja\x00cjm\x00cjv\x00ckb\x00c" +
-	"kl\x00cko\x00cky\x00cla\x00cme\x00cooscop\x00cps\x00crrecrh\x00crj\x00cr" +
-	"k\x00crl\x00crm\x00crs\x00csescsb\x00csw\x00ctd\x00cuhucvhvcyymdaandad" +
-	"\x00daf\x00dag\x00dah\x00dak\x00dar\x00dav\x00dbd\x00dbq\x00dcc\x00ddn" +
-	"\x00deeuded\x00den\x00dga\x00dgh\x00dgi\x00dgl\x00dgr\x00dgz\x00dia\x00d" +
-	"je\x00dnj\x00dob\x00doi\x00dop\x00dow\x00dri\x00drs\x00dsb\x00dtm\x00dtp" +
-	"\x00dts\x00dty\x00dua\x00duc\x00dud\x00dug\x00dvivdva\x00dww\x00dyo\x00d" +
-	"yu\x00dzzodzg\x00ebu\x00eeweefi\x00egl\x00egy\x00eka\x00eky\x00elllema" +
-	"\x00emi\x00enngenn\x00enq\x00eopoeri\x00es\x00\x05esu\x00etstetr\x00ett" +
-	"\x00etu\x00etx\x00euusewo\x00ext\x00faasfaa\x00fab\x00fag\x00fai\x00fan" +
-	"\x00ffulffi\x00ffm\x00fiinfia\x00fil\x00fit\x00fjijflr\x00fmp\x00foaofod" +
-	"\x00fon\x00for\x00fpe\x00fqs\x00frrafrc\x00frp\x00frr\x00frs\x00fub\x00f" +
-	"ud\x00fue\x00fuf\x00fuh\x00fuq\x00fur\x00fuv\x00fuy\x00fvr\x00fyrygalega" +
-	"a\x00gaf\x00gag\x00gah\x00gaj\x00gam\x00gan\x00gaw\x00gay\x00gbf\x00gbm" +
-	"\x00gby\x00gbz\x00gcr\x00gdlagde\x00gdn\x00gdr\x00geb\x00gej\x00gel\x00g" +
-	"ez\x00gfk\x00ggn\x00ghs\x00gil\x00gim\x00gjk\x00gjn\x00gju\x00gkn\x00gkp" +
-	"\x00gllgglk\x00gmm\x00gmv\x00gnrngnd\x00gng\x00god\x00gof\x00goi\x00gom" +
-	"\x00gon\x00gor\x00gos\x00got\x00grb\x00grc\x00grt\x00grw\x00gsw\x00guujg" +
-	"ub\x00guc\x00gud\x00gur\x00guw\x00gux\x00guz\x00gvlvgvf\x00gvr\x00gvs" +
-	"\x00gwc\x00gwi\x00gwt\x00gyi\x00haauhag\x00hak\x00ham\x00haw\x00haz\x00h" +
-	"bb\x00hdy\x00heebhhy\x00hiinhia\x00hif\x00hig\x00hih\x00hil\x00hla\x00hl" +
-	"u\x00hmd\x00hmt\x00hnd\x00hne\x00hnj\x00hnn\x00hno\x00homohoc\x00hoj\x00" +
-	"hot\x00hrrvhsb\x00hsn\x00htathuunhui\x00hyyehzerianaian\x00iar\x00iba" +
-	"\x00ibb\x00iby\x00ica\x00ich\x00idndidd\x00idi\x00idu\x00ieleife\x00igbo" +
-	"igb\x00ige\x00iiiiijj\x00ikpkikk\x00ikt\x00ikw\x00ikx\x00ilo\x00imo\x00i" +
-	"nndinh\x00iodoiou\x00iri\x00isslittaiukuiw\x00\x03iwm\x00iws\x00izh\x00i" +
-	"zi\x00japnjab\x00jam\x00jbo\x00jbu\x00jen\x00jgk\x00jgo\x00ji\x00\x06jib" +
-	"\x00jmc\x00jml\x00jra\x00jut\x00jvavjwavkaatkaa\x00kab\x00kac\x00kad\x00" +
-	"kai\x00kaj\x00kam\x00kao\x00kbd\x00kbm\x00kbp\x00kbq\x00kbx\x00kby\x00kc" +
-	"g\x00kck\x00kcl\x00kct\x00kde\x00kdh\x00kdl\x00kdt\x00kea\x00ken\x00kez" +
-	"\x00kfo\x00kfr\x00kfy\x00kgonkge\x00kgf\x00kgp\x00kha\x00khb\x00khn\x00k" +
-	"hq\x00khs\x00kht\x00khw\x00khz\x00kiikkij\x00kiu\x00kiw\x00kjuakjd\x00kj" +
-	"g\x00kjs\x00kjy\x00kkazkkc\x00kkj\x00klalkln\x00klq\x00klt\x00klx\x00kmh" +
-	"mkmb\x00kmh\x00kmo\x00kms\x00kmu\x00kmw\x00knanknf\x00knp\x00koorkoi\x00" +
-	"kok\x00kol\x00kos\x00koz\x00kpe\x00kpf\x00kpo\x00kpr\x00kpx\x00kqb\x00kq" +
-	"f\x00kqs\x00kqy\x00kraukrc\x00kri\x00krj\x00krl\x00krs\x00kru\x00ksasksb" +
-	"\x00ksd\x00ksf\x00ksh\x00ksj\x00ksr\x00ktb\x00ktm\x00kto\x00kuurkub\x00k" +
-	"ud\x00kue\x00kuj\x00kum\x00kun\x00kup\x00kus\x00kvomkvg\x00kvr\x00kvx" +
-	"\x00kw\x00\x01kwj\x00kwo\x00kxa\x00kxc\x00kxm\x00kxp\x00kxw\x00kxz\x00ky" +
-	"irkye\x00kyx\x00kzr\x00laatlab\x00lad\x00lag\x00lah\x00laj\x00las\x00lbt" +
-	"zlbe\x00lbu\x00lbw\x00lcm\x00lcp\x00ldb\x00led\x00lee\x00lem\x00lep\x00l" +
-	"eq\x00leu\x00lez\x00lguglgg\x00liimlia\x00lid\x00lif\x00lig\x00lih\x00li" +
-	"j\x00lis\x00ljp\x00lki\x00lkt\x00lle\x00lln\x00lmn\x00lmo\x00lmp\x00lnin" +
-	"lns\x00lnu\x00loaoloj\x00lok\x00lol\x00lor\x00los\x00loz\x00lrc\x00ltitl" +
-	"tg\x00luublua\x00luo\x00luy\x00luz\x00lvavlwl\x00lzh\x00lzz\x00mad\x00ma" +
-	"f\x00mag\x00mai\x00mak\x00man\x00mas\x00maw\x00maz\x00mbh\x00mbo\x00mbq" +
-	"\x00mbu\x00mbw\x00mci\x00mcp\x00mcq\x00mcr\x00mcu\x00mda\x00mde\x00mdf" +
-	"\x00mdh\x00mdj\x00mdr\x00mdx\x00med\x00mee\x00mek\x00men\x00mer\x00met" +
-	"\x00meu\x00mfa\x00mfe\x00mfn\x00mfo\x00mfq\x00mglgmgh\x00mgl\x00mgo\x00m" +
-	"gp\x00mgy\x00mhahmhi\x00mhl\x00mirimif\x00min\x00mis\x00miw\x00mkkdmki" +
-	"\x00mkl\x00mkp\x00mkw\x00mlalmle\x00mlp\x00mls\x00mmo\x00mmu\x00mmx\x00m" +
-	"nonmna\x00mnf\x00mni\x00mnw\x00moolmoa\x00moe\x00moh\x00mos\x00mox\x00mp" +
-	"p\x00mps\x00mpt\x00mpx\x00mql\x00mrarmrd\x00mrj\x00mro\x00mssamtltmtc" +
-	"\x00mtf\x00mti\x00mtr\x00mua\x00mul\x00mur\x00mus\x00mva\x00mvn\x00mvy" +
-	"\x00mwk\x00mwr\x00mwv\x00mxc\x00mxm\x00myyamyk\x00mym\x00myv\x00myw\x00m" +
-	"yx\x00myz\x00mzk\x00mzm\x00mzn\x00mzp\x00mzw\x00mzz\x00naaunac\x00naf" +
-	"\x00nah\x00nak\x00nan\x00nap\x00naq\x00nas\x00nbobnca\x00nce\x00ncf\x00n" +
-	"ch\x00nco\x00ncu\x00nddendc\x00nds\x00neepneb\x00new\x00nex\x00nfr\x00ng" +
-	"donga\x00ngb\x00ngl\x00nhb\x00nhe\x00nhw\x00nif\x00nii\x00nij\x00nin\x00" +
-	"niu\x00niy\x00niz\x00njo\x00nkg\x00nko\x00nlldnmg\x00nmz\x00nnnonnf\x00n" +
-	"nh\x00nnk\x00nnm\x00noornod\x00noe\x00non\x00nop\x00nou\x00nqo\x00nrblnr" +
-	"b\x00nsk\x00nsn\x00nso\x00nss\x00ntm\x00ntr\x00nui\x00nup\x00nus\x00nuv" +
-	"\x00nux\x00nvavnwb\x00nxq\x00nxr\x00nyyanym\x00nyn\x00nzi\x00occiogc\x00" +
-	"ojjiokr\x00okv\x00omrmong\x00onn\x00ons\x00opm\x00orrioro\x00oru\x00osss" +
-	"osa\x00ota\x00otk\x00ozm\x00paanpag\x00pal\x00pam\x00pap\x00pau\x00pbi" +
-	"\x00pcd\x00pcm\x00pdc\x00pdt\x00ped\x00peo\x00pex\x00pfl\x00phl\x00phn" +
-	"\x00pilipil\x00pip\x00pka\x00pko\x00plolpla\x00pms\x00png\x00pnn\x00pnt" +
-	"\x00pon\x00ppo\x00pra\x00prd\x00prg\x00psuspss\x00ptorptp\x00puu\x00pwa" +
-	"\x00quuequc\x00qug\x00rai\x00raj\x00rao\x00rcf\x00rej\x00rel\x00res\x00r" +
-	"gn\x00rhg\x00ria\x00rif\x00rjs\x00rkt\x00rmohrmf\x00rmo\x00rmt\x00rmu" +
-	"\x00rnunrna\x00rng\x00roonrob\x00rof\x00roo\x00rro\x00rtm\x00ruusrue\x00" +
-	"rug\x00rw\x00\x04rwk\x00rwo\x00ryu\x00saansaf\x00sah\x00saq\x00sas\x00sa" +
-	"t\x00sav\x00saz\x00sba\x00sbe\x00sbp\x00scrdsck\x00scl\x00scn\x00sco\x00" +
-	"scs\x00sdndsdc\x00sdh\x00semesef\x00seh\x00sei\x00ses\x00sgagsga\x00sgs" +
-	"\x00sgw\x00sgz\x00sh\x00\x02shi\x00shk\x00shn\x00shu\x00siinsid\x00sig" +
-	"\x00sil\x00sim\x00sjr\x00sklkskc\x00skr\x00sks\x00sllvsld\x00sli\x00sll" +
-	"\x00sly\x00smmosma\x00smi\x00smj\x00smn\x00smp\x00smq\x00sms\x00snnasnc" +
-	"\x00snk\x00snp\x00snx\x00sny\x00soomsok\x00soq\x00sou\x00soy\x00spd\x00s" +
-	"pl\x00sps\x00sqqisrrpsrb\x00srn\x00srr\x00srx\x00ssswssd\x00ssg\x00ssy" +
-	"\x00stotstk\x00stq\x00suunsua\x00sue\x00suk\x00sur\x00sus\x00svweswwaswb" +
-	"\x00swc\x00swg\x00swp\x00swv\x00sxn\x00sxw\x00syl\x00syr\x00szl\x00taamt" +
-	"aj\x00tal\x00tan\x00taq\x00tbc\x00tbd\x00tbf\x00tbg\x00tbo\x00tbw\x00tbz" +
-	"\x00tci\x00tcy\x00tdd\x00tdg\x00tdh\x00teelted\x00tem\x00teo\x00tet\x00t" +
-	"fi\x00tggktgc\x00tgo\x00tgu\x00thhathl\x00thq\x00thr\x00tiirtif\x00tig" +
-	"\x00tik\x00tim\x00tio\x00tiv\x00tkuktkl\x00tkr\x00tkt\x00tlgltlf\x00tlx" +
-	"\x00tly\x00tmh\x00tmy\x00tnsntnh\x00toontof\x00tog\x00toq\x00tpi\x00tpm" +
-	"\x00tpz\x00tqo\x00trurtru\x00trv\x00trw\x00tssotsd\x00tsf\x00tsg\x00tsj" +
-	"\x00tsw\x00ttatttd\x00tte\x00ttj\x00ttr\x00tts\x00ttt\x00tuh\x00tul\x00t" +
-	"um\x00tuq\x00tvd\x00tvl\x00tvu\x00twwitwh\x00twq\x00txg\x00tyahtya\x00ty" +
-	"v\x00tzm\x00ubu\x00udm\x00ugiguga\x00ukkruli\x00umb\x00und\x00unr\x00unx" +
-	"\x00urrduri\x00urt\x00urw\x00usa\x00utr\x00uvh\x00uvl\x00uzzbvag\x00vai" +
-	"\x00van\x00veenvec\x00vep\x00viievic\x00viv\x00vls\x00vmf\x00vmw\x00vool" +
-	"vot\x00vro\x00vun\x00vut\x00walnwae\x00waj\x00wal\x00wan\x00war\x00wbp" +
-	"\x00wbq\x00wbr\x00wci\x00wer\x00wgi\x00whg\x00wib\x00wiu\x00wiv\x00wja" +
-	"\x00wji\x00wls\x00wmo\x00wnc\x00wni\x00wnu\x00woolwob\x00wos\x00wrs\x00w" +
-	"sk\x00wtm\x00wuu\x00wuv\x00wwa\x00xav\x00xbi\x00xcr\x00xes\x00xhhoxla" +
-	"\x00xlc\x00xld\x00xmf\x00xmn\x00xmr\x00xna\x00xnr\x00xog\x00xon\x00xpr" +
-	"\x00xrb\x00xsa\x00xsi\x00xsm\x00xsr\x00xwe\x00yam\x00yao\x00yap\x00yas" +
-	"\x00yat\x00yav\x00yay\x00yaz\x00yba\x00ybb\x00yby\x00yer\x00ygr\x00ygw" +
-	"\x00yiidyko\x00yle\x00ylg\x00yll\x00yml\x00yooryon\x00yrb\x00yre\x00yrl" +
-	"\x00yss\x00yua\x00yue\x00yuj\x00yut\x00yuw\x00zahazag\x00zbl\x00zdj\x00z" +
-	"ea\x00zgh\x00zhhozia\x00zlm\x00zmi\x00zne\x00zuulzxx\x00zza\x00\xff\xff" +
-	"\xff\xff"
-
-const langNoIndexOffset = 1327
-
-// langNoIndex is a bit vector of all 3-letter language codes that are not used as an index
-// in lookup tables. The language ids for these language codes are derived directly
-// from the letters and are not consecutive.
-// Size: 2197 bytes, 2197 elements
-var langNoIndex = [2197]uint8{
-	// Entry 0 - 3F
-	0xff, 0xf8, 0xed, 0xfe, 0xeb, 0xd3, 0x3b, 0xd2,
-	0xfb, 0xbf, 0x7a, 0xfa, 0x37, 0x1d, 0x3c, 0x57,
-	0x6e, 0x97, 0x73, 0x38, 0xfb, 0xea, 0xbf, 0x70,
-	0xad, 0x03, 0xff, 0xff, 0xcf, 0x05, 0x84, 0x62,
-	0xe9, 0xbf, 0xfd, 0xbf, 0xbf, 0xf7, 0xfd, 0x77,
-	0x0f, 0xff, 0xef, 0x6f, 0xff, 0xfb, 0xdf, 0xe2,
-	0xc9, 0xf8, 0x7f, 0x7e, 0x4d, 0xb8, 0x0a, 0x6a,
-	0x7c, 0xea, 0xe3, 0xfa, 0x7a, 0xbf, 0x67, 0xff,
-	// Entry 40 - 7F
-	0xff, 0xff, 0xff, 0xdf, 0x2a, 0x54, 0x91, 0xc0,
-	0x5d, 0xe3, 0x97, 0x14, 0x07, 0x20, 0xdd, 0xed,
-	0x9f, 0x3f, 0xc9, 0x21, 0xf8, 0x3f, 0x94, 0x35,
-	0x7c, 0x5f, 0xff, 0x5f, 0x8e, 0x6e, 0xdf, 0xff,
-	0xff, 0xff, 0x55, 0x7c, 0xd3, 0xfd, 0xbf, 0xb5,
-	0x7b, 0xdf, 0x7f, 0xf7, 0xca, 0xfe, 0xdb, 0xa3,
-	0xa8, 0xff, 0x1f, 0x67, 0x7d, 0xeb, 0xef, 0xce,
-	0xff, 0xff, 0x9f, 0xff, 0xb7, 0xef, 0xfe, 0xcf,
-	// Entry 80 - BF
-	0xdb, 0xff, 0xf3, 0xcd, 0xfb, 0x2f, 0xff, 0xff,
-	0xbb, 0xee, 0xf7, 0xbd, 0xdb, 0xff, 0x5f, 0xf7,
-	0xfd, 0xf2, 0xfd, 0xff, 0x5e, 0x2f, 0x3b, 0xba,
-	0x7e, 0xff, 0xff, 0xfe, 0xf7, 0xff, 0xdd, 0xff,
-	0xfd, 0xdf, 0xfb, 0xfe, 0x9d, 0xb4, 0xd3, 0xff,
-	0xef, 0xff, 0xdf, 0xf7, 0x7f, 0xb7, 0xfd, 0xd5,
-	0xa5, 0x77, 0x40, 0xff, 0x9c, 0xc1, 0x41, 0x2c,
-	0x08, 0x20, 0x41, 0x00, 0x50, 0x40, 0x00, 0x80,
-	// Entry C0 - FF
-	0xfb, 0x4a, 0xf2, 0x9f, 0xb4, 0x42, 0x41, 0x96,
-	0x1b, 0x14, 0x08, 0xf2, 0x2b, 0xe7, 0x17, 0x56,
-	0x45, 0x7d, 0x0e, 0x1c, 0x37, 0x71, 0xf3, 0xef,
-	0x97, 0xff, 0x5d, 0x38, 0x64, 0x08, 0x00, 0x10,
-	0xbc, 0x85, 0xaf, 0xdf, 0xff, 0xf7, 0x73, 0x35,
-	0x3e, 0x87, 0xc7, 0xdf, 0xff, 0x00, 0x81, 0x00,
-	0xb0, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03,
-	0x40, 0x00, 0x40, 0x92, 0x21, 0x50, 0xb1, 0x5d,
-	// Entry 100 - 13F
-	0xfd, 0xdc, 0xbe, 0x5e, 0x00, 0x00, 0x02, 0x64,
-	0x0d, 0x19, 0x41, 0xdf, 0x79, 0x22, 0x00, 0x00,
-	0x00, 0x5e, 0x64, 0xdc, 0x24, 0xe5, 0xd9, 0xe3,
-	0xfe, 0xff, 0xfd, 0xcb, 0x9f, 0x14, 0x01, 0x0c,
-	0x86, 0x00, 0xd1, 0x00, 0xf0, 0xc5, 0x67, 0x5f,
-	0x56, 0x89, 0x5e, 0xb5, 0x6c, 0xaf, 0x03, 0x00,
-	0x02, 0x00, 0x00, 0x00, 0xc0, 0x37, 0xda, 0x56,
-	0x90, 0x69, 0x01, 0x2c, 0x96, 0x69, 0x20, 0xfb,
-	// Entry 140 - 17F
-	0xff, 0x3f, 0x00, 0x00, 0x00, 0x01, 0x08, 0x16,
-	0x01, 0x00, 0x00, 0xb0, 0x14, 0x03, 0x50, 0x06,
-	0x0a, 0x00, 0x01, 0x00, 0x00, 0x00, 0x11, 0x09,
-	0x00, 0x00, 0x60, 0x10, 0x00, 0x00, 0x00, 0x10,
-	0x00, 0x00, 0x44, 0x00, 0x00, 0x10, 0x00, 0x04,
-	0x08, 0x00, 0x00, 0x04, 0x00, 0x80, 0x28, 0x04,
-	0x00, 0x00, 0x40, 0xd5, 0x2d, 0x00, 0x64, 0x35,
-	0x24, 0x52, 0xf4, 0xd4, 0xbd, 0x62, 0xc9, 0x03,
-	// Entry 180 - 1BF
-	0x00, 0x80, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x04, 0x13, 0x39, 0x01, 0xdd, 0x57, 0x98,
-	0x21, 0x18, 0x81, 0x00, 0x00, 0x01, 0x40, 0x82,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x40, 0x00, 0x44, 0x00, 0x00, 0x80, 0xea,
-	0xa9, 0x39, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-	// Entry 1C0 - 1FF
-	0x00, 0x01, 0x28, 0x05, 0x00, 0x00, 0x00, 0x00,
-	0x04, 0x20, 0x04, 0xa6, 0x00, 0x04, 0x00, 0x00,
-	0x81, 0x50, 0x00, 0x00, 0x00, 0x11, 0x84, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x55,
-	0x02, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0x40,
-	0x30, 0x83, 0x01, 0x00, 0x00, 0x00, 0x11, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x1e, 0xcd, 0xbf, 0x7e, 0xbf,
-	// Entry 200 - 23F
-	0xdf, 0xc3, 0x83, 0x82, 0xc0, 0xfb, 0x57, 0x27,
-	0xcd, 0x55, 0xe7, 0x01, 0x00, 0x20, 0xb2, 0xc5,
-	0xa4, 0x45, 0x25, 0x9b, 0x02, 0xcf, 0xe0, 0xdf,
-	0x03, 0x44, 0x08, 0x10, 0x01, 0x04, 0x01, 0xe3,
-	0x92, 0x54, 0xdb, 0x28, 0xd1, 0x5f, 0xf6, 0x6d,
-	0x79, 0xed, 0x1c, 0x7d, 0x04, 0x08, 0x00, 0x01,
-	0x21, 0x12, 0x64, 0x5f, 0xdd, 0x0e, 0x85, 0x4f,
-	0x40, 0x40, 0x00, 0x04, 0xf1, 0xfd, 0x3d, 0x54,
-	// Entry 240 - 27F
-	0xe8, 0x03, 0xb4, 0x27, 0x23, 0x0d, 0x00, 0x00,
-	0x20, 0x7b, 0x38, 0x02, 0x05, 0x84, 0x00, 0xf0,
-	0xbb, 0x7e, 0x5a, 0x00, 0x18, 0x04, 0x81, 0x00,
-	0x00, 0x00, 0x80, 0x10, 0x90, 0x1c, 0x01, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x10, 0x40, 0x00, 0x04,
-	0x08, 0xa0, 0x70, 0xa5, 0x0c, 0x40, 0x00, 0x00,
-	0x11, 0x04, 0x04, 0x68, 0x00, 0x20, 0x70, 0xff,
-	0x7b, 0x7f, 0x60, 0x00, 0x05, 0x9b, 0xdd, 0x66,
-	// Entry 280 - 2BF
-	0x03, 0x00, 0x11, 0x00, 0x00, 0x00, 0x40, 0x05,
-	0xb5, 0xb6, 0x80, 0x08, 0x04, 0x00, 0x04, 0x51,
-	0xe2, 0xef, 0xfd, 0x3f, 0x05, 0x09, 0x08, 0x05,
-	0x40, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
-	0x08, 0x00, 0x00, 0x00, 0x00, 0x81, 0x00, 0x60,
-	0xe5, 0x48, 0x00, 0x81, 0x20, 0xc0, 0x05, 0x80,
-	0x03, 0x00, 0x00, 0x00, 0x8c, 0x50, 0x40, 0x04,
-	0x84, 0x47, 0x84, 0x40, 0x20, 0x10, 0x00, 0x20,
-	// Entry 2C0 - 2FF
-	0x02, 0x50, 0x80, 0x11, 0x00, 0x91, 0x6c, 0xe2,
-	0x50, 0x27, 0x1d, 0x11, 0x29, 0x06, 0x59, 0xe9,
-	0x33, 0x08, 0x00, 0x20, 0x04, 0x40, 0x10, 0x00,
-	0x00, 0x00, 0x50, 0x44, 0x92, 0x49, 0xd6, 0x5d,
-	0xa7, 0x81, 0x47, 0x97, 0xfb, 0x00, 0x10, 0x00,
-	0x08, 0x00, 0x80, 0x00, 0x40, 0x04, 0x00, 0x01,
-	0x02, 0x00, 0x01, 0x40, 0x80, 0x00, 0x00, 0x08,
-	0xd8, 0xeb, 0xf6, 0x39, 0xc4, 0x89, 0x12, 0x00,
-	// Entry 300 - 33F
-	0x00, 0x0c, 0x04, 0x01, 0x20, 0x20, 0xdd, 0xa0,
-	0x01, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00,
-	0x04, 0x10, 0xd0, 0x9d, 0x95, 0x13, 0x04, 0x80,
-	0x00, 0x01, 0xd0, 0x12, 0x40, 0x00, 0x10, 0xb0,
-	0x10, 0x62, 0x4c, 0xd2, 0x02, 0x01, 0x4a, 0x00,
-	0x46, 0x04, 0x00, 0x08, 0x02, 0x00, 0x20, 0x80,
-	0x00, 0x80, 0x06, 0x00, 0x08, 0x00, 0x00, 0x00,
-	0x00, 0xf0, 0xd8, 0x6f, 0x15, 0x02, 0x08, 0x00,
-	// Entry 340 - 37F
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01,
-	0x00, 0x10, 0x00, 0x00, 0x00, 0xf0, 0x84, 0xe3,
-	0xdd, 0xbf, 0xf9, 0xf9, 0x3b, 0x7f, 0x7f, 0xdb,
-	0xfd, 0xfc, 0xfe, 0xdf, 0xff, 0xfd, 0xff, 0xf6,
-	0xfb, 0xfc, 0xf7, 0x1f, 0xff, 0xb3, 0x6c, 0xff,
-	0xd9, 0xad, 0xdf, 0xfe, 0xef, 0xba, 0xdf, 0xff,
-	0xff, 0xff, 0xb7, 0xdd, 0x7d, 0xbf, 0xab, 0x7f,
-	0xfd, 0xfd, 0xdf, 0x2f, 0x9c, 0xdf, 0xf3, 0x6f,
-	// Entry 380 - 3BF
-	0xdf, 0xdd, 0xff, 0xfb, 0xee, 0xd2, 0xab, 0x5f,
-	0xd5, 0xdf, 0x7f, 0xff, 0xeb, 0xff, 0xe4, 0x4d,
-	0xf9, 0xff, 0xfe, 0xf7, 0xfd, 0xdf, 0xfb, 0xbf,
-	0xee, 0xdb, 0x6f, 0xef, 0xff, 0x7f, 0xff, 0xff,
-	0xf7, 0x5f, 0xd3, 0x3b, 0xfd, 0xd9, 0xdf, 0xeb,
-	0xbc, 0x08, 0x05, 0x24, 0xff, 0x07, 0x70, 0xfe,
-	0xe6, 0x5e, 0x00, 0x08, 0x00, 0x83, 0x3d, 0x1b,
-	0x06, 0xe6, 0x72, 0x60, 0xd1, 0x3c, 0x7f, 0x44,
-	// Entry 3C0 - 3FF
-	0x02, 0x30, 0x9f, 0x7a, 0x16, 0xbd, 0x7f, 0x57,
-	0xf2, 0xff, 0x31, 0xff, 0xf2, 0x1e, 0x90, 0xf7,
-	0xf1, 0xf9, 0x45, 0x80, 0x01, 0x02, 0x00, 0x00,
-	0x40, 0x54, 0x9f, 0x8a, 0xd9, 0xd9, 0x0e, 0x11,
-	0x84, 0x51, 0xc0, 0xf3, 0xfb, 0x47, 0x00, 0x01,
-	0x05, 0xd1, 0x50, 0x58, 0x00, 0x00, 0x00, 0x10,
-	0x04, 0x02, 0x00, 0x00, 0x0a, 0x00, 0x17, 0xd2,
-	0xb9, 0xfd, 0xfc, 0xba, 0xfe, 0xef, 0xc7, 0xbe,
-	// Entry 400 - 43F
-	0x53, 0x6f, 0xdf, 0xe7, 0xdb, 0x65, 0xbb, 0x7f,
-	0xfa, 0xff, 0x77, 0xf3, 0xef, 0xbf, 0xfd, 0xf7,
-	0xdf, 0xdf, 0x9b, 0x7f, 0xff, 0xff, 0x7f, 0x6f,
-	0xf7, 0xfb, 0xeb, 0xdf, 0xbc, 0xff, 0xbf, 0x6b,
-	0x7b, 0xfb, 0xff, 0xce, 0x76, 0xbd, 0xf7, 0xf7,
-	0xdf, 0xdc, 0xf7, 0xf7, 0xff, 0xdf, 0xf3, 0xfe,
-	0xef, 0xff, 0xff, 0xff, 0xb6, 0x7f, 0x7f, 0xde,
-	0xf7, 0xb9, 0xeb, 0x77, 0xff, 0xfb, 0xbf, 0xdf,
-	// Entry 440 - 47F
-	0xfd, 0xfe, 0xfb, 0xff, 0xfe, 0xeb, 0x1f, 0x7d,
-	0x2f, 0xfd, 0xb6, 0xb5, 0xa5, 0xfc, 0xff, 0xfd,
-	0x7f, 0x4e, 0xbf, 0x8e, 0xae, 0xff, 0xee, 0xdf,
-	0x7f, 0xf7, 0x73, 0x02, 0x02, 0x04, 0xfc, 0xf7,
-	0xff, 0xb7, 0xd7, 0xef, 0xfe, 0xcd, 0xf5, 0xce,
-	0xe2, 0x8e, 0xe7, 0xbf, 0xb7, 0xff, 0x56, 0xbd,
-	0xcd, 0xff, 0xfb, 0xff, 0xdf, 0xd7, 0xea, 0xff,
-	0xe5, 0x5f, 0x6d, 0x0f, 0xa7, 0x51, 0x04, 0x44,
-	// Entry 480 - 4BF
-	0x13, 0x50, 0x5d, 0xaf, 0xa6, 0xfd, 0x99, 0xfb,
-	0x63, 0x1d, 0x53, 0xff, 0xef, 0xb7, 0x35, 0x20,
-	0x14, 0x00, 0x55, 0x51, 0x82, 0x65, 0xf5, 0x41,
-	0xe2, 0xff, 0xfc, 0xdf, 0x00, 0x05, 0xc5, 0x05,
-	0x00, 0x22, 0x00, 0x74, 0x69, 0x10, 0x08, 0x04,
-	0x41, 0x00, 0x01, 0x06, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x51, 0x20, 0x05, 0x04, 0x01, 0x00, 0x00,
-	0x06, 0x01, 0x20, 0x00, 0x18, 0x01, 0x92, 0xb1,
-	// Entry 4C0 - 4FF
-	0xfd, 0x47, 0x49, 0x06, 0x95, 0x06, 0x57, 0xed,
-	0xfb, 0x4c, 0x1c, 0x6b, 0x83, 0x04, 0x62, 0x40,
-	0x00, 0x11, 0x42, 0x00, 0x00, 0x00, 0x54, 0x83,
-	0xb8, 0x4f, 0x10, 0x8c, 0x89, 0x46, 0xde, 0xf7,
-	0x13, 0x31, 0x00, 0x20, 0x00, 0x00, 0x00, 0x90,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x10, 0x00,
-	0x01, 0x00, 0x00, 0xf0, 0x5b, 0xf4, 0xbe, 0x3d,
-	0xba, 0xcf, 0xf7, 0xaf, 0x42, 0x04, 0x84, 0x41,
-	// Entry 500 - 53F
-	0x30, 0xff, 0x79, 0x72, 0x04, 0x00, 0x00, 0x49,
-	0x2d, 0x14, 0x27, 0x57, 0xed, 0xf1, 0x3f, 0xe7,
-	0x3f, 0x00, 0x00, 0x02, 0xc6, 0xa0, 0x1e, 0xf8,
-	0xbb, 0xff, 0xfd, 0xfb, 0xb7, 0xfd, 0xe5, 0xf7,
-	0xfd, 0xfc, 0xd5, 0xed, 0x47, 0xf4, 0x7e, 0x10,
-	0x01, 0x01, 0x84, 0x6d, 0xff, 0xf7, 0xdd, 0xf9,
-	0x5b, 0x05, 0x86, 0xed, 0xf5, 0x77, 0xbd, 0x3c,
-	0x00, 0x00, 0x00, 0x42, 0x71, 0x42, 0x00, 0x40,
-	// Entry 540 - 57F
-	0x00, 0x00, 0x01, 0x43, 0x19, 0x00, 0x08, 0x00,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	// Entry 580 - 5BF
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xab, 0xbd, 0xe7, 0x57, 0xee, 0x13, 0x5d,
-	0x09, 0xc1, 0x40, 0x21, 0xfa, 0x17, 0x01, 0x80,
-	0x00, 0x00, 0x00, 0x00, 0xf0, 0xce, 0xfb, 0xbf,
-	0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
-	0x00, 0x30, 0x15, 0xa3, 0x10, 0x00, 0x00, 0x00,
-	0x11, 0x04, 0x16, 0x00, 0x00, 0x02, 0x00, 0x81,
-	0xa3, 0x01, 0x50, 0x00, 0x00, 0x83, 0x11, 0x40,
-	// Entry 5C0 - 5FF
-	0x00, 0x00, 0x00, 0xf0, 0xdd, 0x7b, 0x3e, 0x02,
-	0xaa, 0x10, 0x5d, 0x98, 0x52, 0x00, 0x80, 0x20,
-	0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x02, 0x02,
-	0x19, 0x00, 0x10, 0x02, 0x10, 0x61, 0x5a, 0x9d,
-	0x31, 0x00, 0x00, 0x00, 0x01, 0x10, 0x02, 0x20,
-	0x00, 0x00, 0x01, 0x00, 0x42, 0x00, 0x20, 0x00,
-	0x00, 0x1f, 0xdf, 0xd2, 0xb9, 0xff, 0xfd, 0x3f,
-	0x1f, 0x18, 0xcf, 0x9c, 0xbf, 0xaf, 0x5f, 0xfe,
-	// Entry 600 - 63F
-	0x7b, 0x4b, 0x40, 0x10, 0xe1, 0xfd, 0xaf, 0xd9,
-	0xb7, 0xf6, 0xfb, 0xb3, 0xc7, 0xff, 0x6f, 0xf1,
-	0x73, 0xb1, 0x7f, 0x9f, 0x7f, 0xbd, 0xfc, 0xb7,
-	0xee, 0x1c, 0xfa, 0xcb, 0xef, 0xdd, 0xf9, 0xbd,
-	0x6e, 0xae, 0x55, 0xfd, 0x6e, 0x81, 0x76, 0x1f,
-	0xd4, 0x77, 0xf5, 0x7d, 0xfb, 0xff, 0xeb, 0xfe,
-	0xbe, 0x5f, 0x46, 0x1b, 0xe9, 0x5f, 0x50, 0x18,
-	0x02, 0xfa, 0xf7, 0x9d, 0x15, 0x97, 0x05, 0x0f,
-	// Entry 640 - 67F
-	0x75, 0xc4, 0x7d, 0x81, 0x82, 0xf1, 0x57, 0x6c,
-	0xff, 0xe4, 0xef, 0x6f, 0xff, 0xfc, 0xdd, 0xde,
-	0xfc, 0xfd, 0x76, 0x5f, 0x7a, 0x1f, 0x00, 0x98,
-	0x02, 0xfb, 0xa3, 0xef, 0xf3, 0xd6, 0xf2, 0xff,
-	0xb9, 0xda, 0x7d, 0x50, 0x1e, 0x15, 0x7b, 0xb4,
-	0xf5, 0x3e, 0xff, 0xff, 0xf1, 0xf7, 0xff, 0xe7,
-	0x5f, 0xff, 0xff, 0x9e, 0xdb, 0xf6, 0xd7, 0xb9,
-	0xef, 0x27, 0x80, 0xbb, 0xc5, 0xff, 0xff, 0xe3,
-	// Entry 680 - 6BF
-	0x97, 0x9d, 0xbf, 0x9f, 0xf7, 0xc7, 0xfd, 0x37,
-	0xce, 0x7f, 0x04, 0x1d, 0x53, 0x7f, 0xf8, 0xda,
-	0x5d, 0xce, 0x7d, 0x06, 0xb9, 0xea, 0x69, 0xa0,
-	0x1a, 0x20, 0x00, 0x30, 0x02, 0x04, 0x24, 0x08,
-	0x04, 0x00, 0x00, 0x40, 0xd4, 0x02, 0x04, 0x00,
-	0x00, 0x04, 0x00, 0x04, 0x00, 0x20, 0x01, 0x06,
-	0x50, 0x00, 0x08, 0x00, 0x00, 0x00, 0x24, 0x00,
-	0x04, 0x00, 0x10, 0x8c, 0x58, 0xd5, 0x0d, 0x0f,
-	// Entry 6C0 - 6FF
-	0x14, 0x4d, 0xf1, 0x16, 0x44, 0xd1, 0x42, 0x08,
-	0x40, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00,
-	0x00, 0xdc, 0xfb, 0xcb, 0x0e, 0x58, 0x08, 0x41,
-	0x04, 0x20, 0x04, 0x00, 0x30, 0x12, 0x40, 0x00,
-	0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x00, 0x00, 0x80, 0x10, 0x10, 0xab,
-	0x6d, 0x93, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x80, 0x80, 0x25, 0x00, 0x00,
-	// Entry 700 - 73F
-	0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
-	0x80, 0x86, 0xc2, 0x00, 0x00, 0x00, 0x00, 0x01,
-	0xdf, 0x18, 0x00, 0x00, 0x02, 0xf0, 0xfd, 0x79,
-	0x3b, 0x00, 0x25, 0x00, 0x00, 0x00, 0x02, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,
-	0x03, 0x00, 0x09, 0x20, 0x00, 0x00, 0x01, 0x00,
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	// Entry 740 - 77F
-	0x00, 0x00, 0x00, 0xef, 0xd5, 0xfd, 0xcf, 0x7e,
-	0xa0, 0x11, 0x00, 0x00, 0x00, 0x92, 0x01, 0x44,
-	0xcd, 0xf9, 0x5c, 0x00, 0x01, 0x00, 0x30, 0x04,
-	0x04, 0x55, 0x00, 0x01, 0x04, 0xf4, 0x3f, 0x4a,
-	0x01, 0x00, 0x00, 0xb0, 0x80, 0x00, 0x55, 0x55,
-	0x97, 0x7c, 0x9f, 0x31, 0xcc, 0x68, 0xd1, 0x03,
-	0xd5, 0x57, 0x27, 0x14, 0x01, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x2c, 0xf7, 0xcb, 0x1f, 0x14, 0x60,
-	// Entry 780 - 7BF
-	0x03, 0x68, 0x01, 0x10, 0x8b, 0x38, 0x8a, 0x01,
-	0x00, 0x00, 0x20, 0x00, 0x24, 0x44, 0x00, 0x00,
-	0x10, 0x03, 0x11, 0x02, 0x01, 0x00, 0x00, 0xf0,
-	0xf5, 0xff, 0xd5, 0x97, 0xbc, 0x70, 0xd6, 0x78,
-	0x78, 0x15, 0x50, 0x00, 0xa4, 0x84, 0xa9, 0x41,
-	0x00, 0x00, 0x00, 0x6b, 0x39, 0x52, 0x74, 0x00,
-	0xe8, 0x30, 0x90, 0x6a, 0x92, 0x00, 0x00, 0x02,
-	0xff, 0xef, 0xff, 0x4b, 0x85, 0x53, 0xf4, 0xed,
-	// Entry 7C0 - 7FF
-	0xdd, 0xbf, 0x72, 0x19, 0xc7, 0x0c, 0xd5, 0x42,
-	0x54, 0xdd, 0x77, 0x14, 0x00, 0x80, 0x40, 0x56,
-	0xcc, 0x16, 0x9e, 0xea, 0x35, 0x7d, 0xef, 0xff,
-	0xbd, 0xa4, 0xaf, 0x01, 0x44, 0x18, 0x01, 0x4d,
-	0x4e, 0x4a, 0x08, 0x50, 0x28, 0x30, 0xe0, 0x80,
-	0x10, 0x20, 0x24, 0x00, 0xff, 0x2f, 0xd3, 0x60,
-	0xfe, 0x01, 0x02, 0x88, 0x0a, 0x40, 0x16, 0x01,
-	0x01, 0x15, 0x2b, 0x3c, 0x01, 0x00, 0x00, 0x10,
-	// Entry 800 - 83F
-	0x90, 0x49, 0x41, 0x02, 0x02, 0x01, 0xe1, 0xbf,
-	0xbf, 0x03, 0x00, 0x00, 0x10, 0xd4, 0xa3, 0xd1,
-	0x40, 0x9c, 0x44, 0xdf, 0xf5, 0x8f, 0x66, 0xb3,
-	0x55, 0x20, 0xd4, 0xc1, 0xd8, 0x30, 0x3d, 0x80,
-	0x00, 0x00, 0x00, 0x04, 0xd4, 0x11, 0xc5, 0x84,
-	0x2e, 0x50, 0x00, 0x22, 0x50, 0x6e, 0xbd, 0x93,
-	0x07, 0x00, 0x20, 0x10, 0x84, 0xb2, 0x45, 0x10,
-	0x06, 0x44, 0x00, 0x00, 0x12, 0x02, 0x11, 0x00,
-	// Entry 840 - 87F
-	0xf0, 0xfb, 0xfd, 0x3f, 0x05, 0x00, 0x12, 0x81,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02,
-	0x00, 0x00, 0x00, 0x00, 0x03, 0x30, 0x02, 0x28,
-	0x84, 0x00, 0x23, 0xc0, 0x23, 0x24, 0x00, 0x00,
-	0x00, 0xcb, 0xe4, 0x3a, 0x42, 0x88, 0x14, 0xf1,
-	0xef, 0xff, 0x7f, 0x12, 0x01, 0x01, 0x84, 0x50,
-	0x07, 0xfc, 0xff, 0xff, 0x0f, 0x01, 0x00, 0x40,
-	0x10, 0x38, 0x01, 0x01, 0x1c, 0x12, 0x40, 0xe1,
-	// Entry 880 - 8BF
-	0x76, 0x16, 0x08, 0x03, 0x10, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x24,
-	0x0a, 0x00, 0x80, 0x00, 0x00,
-}
-
-// altLangISO3 holds an alphabetically sorted list of 3-letter language code alternatives
-// to 2-letter language codes that cannot be derived using the method described above.
-// Each 3-letter code is followed by its 1-byte langID.
-const altLangISO3 tag.Index = "---\x00cor\x00hbs\x01heb\x02kin\x03spa\x04yid\x05\xff\xff\xff\xff"
-
-// altLangIndex is used to convert indexes in altLangISO3 to langIDs.
-// Size: 12 bytes, 6 elements
-var altLangIndex = [6]uint16{
-	0x027f, 0x0405, 0x01f9, 0x03e3, 0x013d, 0x0206,
-}
-
-// langAliasMap maps langIDs to their suggested replacements.
-// Size: 644 bytes, 161 elements
-var langAliasMap = [161]fromTo{
-	0:   {from: 0x82, to: 0x88},
-	1:   {from: 0x185, to: 0x1ac},
-	2:   {from: 0x1f1, to: 0x1df},
-	3:   {from: 0x1f9, to: 0x1ba},
-	4:   {from: 0x206, to: 0x510},
-	5:   {from: 0x20d, to: 0x20c},
-	6:   {from: 0x30e, to: 0x3da},
-	7:   {from: 0x345, to: 0x36d},
-	8:   {from: 0x405, to: 0x430},
-	9:   {from: 0x478, to: 0x152},
-	10:  {from: 0x48e, to: 0x44f},
-	11:  {from: 0x4a0, to: 0x21},
-	12:  {from: 0x53b, to: 0x541},
-	13:  {from: 0x58c, to: 0x12c},
-	14:  {from: 0x62d, to: 0x1eae},
-	15:  {from: 0x64e, to: 0x42f},
-	16:  {from: 0x65f, to: 0x42f},
-	17:  {from: 0x6ea, to: 0x3a},
-	18:  {from: 0x6f5, to: 0x1d5},
-	19:  {from: 0x73b, to: 0x219e},
-	20:  {from: 0x7b0, to: 0x56},
-	21:  {from: 0x7b6, to: 0x2998},
-	22:  {from: 0x7c2, to: 0x58},
-	23:  {from: 0x7e3, to: 0x144},
-	24:  {from: 0x809, to: 0x5a},
-	25:  {from: 0x812, to: 0x8d},
-	26:  {from: 0x87b, to: 0x80d},
-	27:  {from: 0x8c0, to: 0xee0},
-	28:  {from: 0x9ec, to: 0x32f},
-	29:  {from: 0xa33, to: 0x2c3},
-	30:  {from: 0xa3a, to: 0xbf},
-	31:  {from: 0xabb, to: 0x331f},
-	32:  {from: 0xb35, to: 0x527},
-	33:  {from: 0xb72, to: 0x2657},
-	34:  {from: 0xb7b, to: 0xbc0},
-	35:  {from: 0xb98, to: 0x44c},
-	36:  {from: 0xbb9, to: 0x4226},
-	37:  {from: 0xbbc, to: 0x527},
-	38:  {from: 0xbfb, to: 0x2da4},
-	39:  {from: 0xc2b, to: 0x317e},
-	40:  {from: 0xcb6, to: 0xf2},
-	41:  {from: 0xd05, to: 0xf9},
-	42:  {from: 0xdc5, to: 0x119},
-	43:  {from: 0xdd4, to: 0x32b},
-	44:  {from: 0xdf5, to: 0xdf8},
-	45:  {from: 0xdfb, to: 0x52e},
-	46:  {from: 0xedc, to: 0x2057},
-	47:  {from: 0xeeb, to: 0x2e97},
-	48:  {from: 0xf36, to: 0x365},
-	49:  {from: 0x10cd, to: 0x13f},
-	50:  {from: 0x1101, to: 0x2ce},
-	51:  {from: 0x119d, to: 0x1ea},
-	52:  {from: 0x1276, to: 0x21},
-	53:  {from: 0x1421, to: 0x15d},
-	54:  {from: 0x146d, to: 0x14d},
-	55:  {from: 0x151c, to: 0xd98},
-	56:  {from: 0x1520, to: 0x38e},
-	57:  {from: 0x152f, to: 0x19d},
-	58:  {from: 0x157d, to: 0x20e},
-	59:  {from: 0x1580, to: 0x10c},
-	60:  {from: 0x15a0, to: 0x3cac},
-	61:  {from: 0x1667, to: 0x199},
-	62:  {from: 0x16c5, to: 0x135},
-	63:  {from: 0x16fd, to: 0x29f5},
-	64:  {from: 0x1715, to: 0x192},
-	65:  {from: 0x1724, to: 0xf3c},
-	66:  {from: 0x1777, to: 0x1521},
-	67:  {from: 0x1806, to: 0x17b3},
-	68:  {from: 0x1813, to: 0x18f0},
-	69:  {from: 0x1887, to: 0x434},
-	70:  {from: 0x1976, to: 0x1cfe},
-	71:  {from: 0x1a71, to: 0x2bad},
-	72:  {from: 0x1a87, to: 0x1f6},
-	73:  {from: 0x1b57, to: 0x1f8},
-	74:  {from: 0x1b83, to: 0x1512},
-	75:  {from: 0x2035, to: 0x37ae},
-	76:  {from: 0x203a, to: 0x20da},
-	77:  {from: 0x2057, to: 0x309},
-	78:  {from: 0x20e0, to: 0x272},
-	79:  {from: 0x20eb, to: 0x261},
-	80:  {from: 0x20ef, to: 0x22b},
-	81:  {from: 0x20f6, to: 0x254},
-	82:  {from: 0x210c, to: 0x21e8},
-	83:  {from: 0x2132, to: 0x27b},
-	84:  {from: 0x2196, to: 0x120},
-	85:  {from: 0x21cb, to: 0x155e},
-	86:  {from: 0x21e3, to: 0x502},
-	87:  {from: 0x21f1, to: 0x49d},
-	88:  {from: 0x222a, to: 0x120},
-	89:  {from: 0x2234, to: 0x120},
-	90:  {from: 0x225f, to: 0x927},
-	91:  {from: 0x2313, to: 0x3223},
-	92:  {from: 0x237f, to: 0x3362},
-	93:  {from: 0x246f, to: 0x2c5},
-	94:  {from: 0x24e1, to: 0x2fd},
-	95:  {from: 0x24ed, to: 0x2f8},
-	96:  {from: 0x24f7, to: 0x31d},
-	97:  {from: 0x254d, to: 0xb58},
-	98:  {from: 0x25a6, to: 0xe2},
-	99:  {from: 0x263b, to: 0x2ce},
-	100: {from: 0x26c6, to: 0x26b1},
-	101: {from: 0x26f6, to: 0x3c6},
-	102: {from: 0x2724, to: 0x3cac},
-	103: {from: 0x2762, to: 0x26b1},
-	104: {from: 0x2786, to: 0x4355},
-	105: {from: 0x28ec, to: 0x2834},
-	106: {from: 0x2911, to: 0x34f},
-	107: {from: 0x2983, to: 0x2da4},
-	108: {from: 0x2b17, to: 0x38b},
-	109: {from: 0x2bf9, to: 0x393},
-	110: {from: 0x2c3c, to: 0x3cac},
-	111: {from: 0x2cf9, to: 0x3bc},
-	112: {from: 0x2d10, to: 0x594},
-	113: {from: 0x2d44, to: 0x147},
-	114: {from: 0x2d45, to: 0x147},
-	115: {from: 0x2dfc, to: 0x2ef},
-	116: {from: 0x2e05, to: 0x19c9},
-	117: {from: 0x2e17, to: 0x2d92},
-	118: {from: 0x2e1e, to: 0x290},
-	119: {from: 0x2e51, to: 0x7d},
-	120: {from: 0x2e62, to: 0x227f},
-	121: {from: 0x2e9d, to: 0x2e98},
-	122: {from: 0x2eec, to: 0x2ed4},
-	123: {from: 0x3190, to: 0x3c2},
-	124: {from: 0x3363, to: 0x338b},
-	125: {from: 0x3427, to: 0x3da},
-	126: {from: 0x34eb, to: 0x18cd},
-	127: {from: 0x35e3, to: 0x410},
-	128: {from: 0x3655, to: 0x244},
-	129: {from: 0x3673, to: 0x3f2},
-	130: {from: 0x36fa, to: 0x443},
-	131: {from: 0x37bd, to: 0x120},
-	132: {from: 0x3813, to: 0x38ef},
-	133: {from: 0x3828, to: 0x2c98},
-	134: {from: 0x382c, to: 0xa9},
-	135: {from: 0x382f, to: 0x3225},
-	136: {from: 0x3869, to: 0x39a3},
-	137: {from: 0x388f, to: 0x3fbd},
-	138: {from: 0x38a2, to: 0x39d4},
-	139: {from: 0x38b1, to: 0x1fa1},
-	140: {from: 0x38b2, to: 0x2e97},
-	141: {from: 0x3959, to: 0x47c},
-	142: {from: 0x3b4b, to: 0xd8e},
-	143: {from: 0x3b75, to: 0x136},
-	144: {from: 0x3c96, to: 0x4ba},
-	145: {from: 0x3fba, to: 0xff},
-	146: {from: 0x4205, to: 0xa8e},
-	147: {from: 0x42bb, to: 0x570},
-	148: {from: 0x42f6, to: 0x3f5d},
-	149: {from: 0x4375, to: 0x258},
-	150: {from: 0x43c8, to: 0x36c8},
-	151: {from: 0x43ca, to: 0x10e},
-	152: {from: 0x44ac, to: 0x331f},
-	153: {from: 0x44e0, to: 0x510},
-	154: {from: 0x45c7, to: 0x2406},
-	155: {from: 0x45da, to: 0x26d9},
-	156: {from: 0x460d, to: 0x48ab},
-	157: {from: 0x46ab, to: 0x469d},
-	158: {from: 0x473b, to: 0x4742},
-	159: {from: 0x4913, to: 0x31d},
-	160: {from: 0x49a4, to: 0x521},
-}
-
-// Size: 161 bytes, 161 elements
-var langAliasTypes = [161]langAliasType{
-	// Entry 0 - 3F
-	1, 0, 0, 0, 0, 0, 0, 1, 2, 2, 0, 1, 0, 0, 1, 2,
-	1, 1, 2, 0, 1, 0, 1, 2, 1, 1, 0, 0, 2, 1, 1, 0,
-	2, 0, 0, 1, 0, 1, 0, 0, 1, 2, 1, 1, 1, 1, 0, 0,
-	2, 1, 1, 1, 1, 2, 1, 0, 1, 1, 2, 2, 0, 1, 2, 0,
-	// Entry 40 - 7F
-	1, 0, 1, 1, 1, 1, 0, 0, 2, 1, 0, 0, 0, 1, 1, 1,
-	1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 2, 2,
-	2, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1,
-	0, 2, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 2, 0, 2,
-	// Entry 80 - BF
-	1, 1, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 1, 0,
-	1, 2, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1,
-	1,
-}
-
-const (
-	_Latn = 82
-	_Hani = 50
-	_Hans = 52
-	_Hant = 53
-	_Qaaa = 131
-	_Qaai = 139
-	_Qabx = 180
-	_Zinh = 224
-	_Zyyy = 229
-	_Zzzz = 230
-)
-
-// script is an alphabetically sorted list of ISO 15924 codes. The index
-// of the script in the string, divided by 4, is the internal scriptID.
-const script tag.Index = "" + // Size: 928 bytes
-	"----AdlmAfakAghbAhomArabAranArmiArmnAvstBaliBamuBassBatkBengBhksBlisBopo" +
-	"BrahBraiBugiBuhdCakmCansCariChamCherCirtCoptCprtCyrlCyrsDevaDsrtDuplEgyd" +
-	"EgyhEgypElbaEthiGeokGeorGlagGothGranGrekGujrGuruHanbHangHaniHanoHansHant" +
-	"HatrHebrHiraHluwHmngHrktHungIndsItalJamoJavaJpanJurcKaliKanaKharKhmrKhoj" +
-	"KitlKitsKndaKoreKpelKthiLanaLaooLatfLatgLatnLekeLepcLimbLinaLinbLisuLoma" +
-	"LyciLydiMahjMandManiMarcMayaMendMercMeroMlymModiMongMoonMrooMteiMultMymr" +
-	"NarbNbatNewaNkgbNkooNshuOgamOlckOrkhOryaOsgeOsmaPalmPaucPermPhagPhliPhlp" +
-	"PhlvPhnxPiqdPlrdPrtiQaaaQaabQaacQaadQaaeQaafQaagQaahQaaiQaajQaakQaalQaam" +
-	"QaanQaaoQaapQaaqQaarQaasQaatQaauQaavQaawQaaxQaayQaazQabaQabbQabcQabdQabe" +
-	"QabfQabgQabhQabiQabjQabkQablQabmQabnQaboQabpQabqQabrQabsQabtQabuQabvQabw" +
-	"QabxRjngRoroRunrSamrSaraSarbSaurSgnwShawShrdSiddSindSinhSoraSundSyloSyrc" +
-	"SyreSyrjSyrnTagbTakrTaleTaluTamlTangTavtTeluTengTfngTglgThaaThaiTibtTirh" +
-	"UgarVaiiVispWaraWoleXpeoXsuxYiiiZinhZmthZsyeZsymZxxxZyyyZzzz\xff\xff\xff" +
-	"\xff"
-
-// suppressScript is an index from langID to the dominant script for that language,
-// if it exists.  If a script is given, it should be suppressed from the language tag.
-// Size: 1327 bytes, 1327 elements
-var suppressScript = [1327]uint8{
-	// Entry 0 - 3F
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
-	// Entry 40 - 7F
-	0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00,
-	// Entry 80 - BF
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	// Entry C0 - FF
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,
-	// Entry 100 - 13F
-	0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4,
-	0x00, 0x00, 0x00, 0x00, 0xd6, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x00,
-	0x52, 0x00, 0x00, 0x52, 0x00, 0x52, 0x00, 0x52,
-	// Entry 140 - 17F
-	0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x05,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x52, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x52,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00,
-	0x52, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x52, 0x52, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	// Entry 180 - 1BF
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00,
-	0x00, 0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x52, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x37, 0x00, 0x20, 0x00, 0x00, 0x00,
-	// Entry 1C0 - 1FF
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,
-	0x52, 0x00, 0x52, 0x52, 0x00, 0x08, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x52, 0x52,
-	0x00, 0x37, 0x00, 0x00, 0x00, 0x00, 0x41, 0x00,
-	// Entry 200 - 23F
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	// Entry 240 - 27F
-	0x1e, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00, 0x00,
-	0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a,
-	0x00, 0x00, 0x4b, 0x00, 0x20, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	// Entry 280 - 2BF
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x4f, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00,
-	// Entry 2C0 - 2FF
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
-	// Entry 300 - 33F
-	0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x52, 0x52, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6b,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00,
-	// Entry 340 - 37F
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x52, 0x20,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00,
-	0x52, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x70, 0x52, 0x00, 0x00, 0x00,
-	0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	// Entry 380 - 3BF
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00,
-	0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x52, 0x00,
-	// Entry 3C0 - 3FF
-	0x00, 0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x52,
-	0x00, 0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x1e, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	// Entry 400 - 43F
-	0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x52, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00,
-	0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00,
-	0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	// Entry 440 - 47F
-	0x00, 0x00, 0x52, 0x52, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcd, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0,
-	0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0xd5, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00,
-	0x52, 0x00, 0x00, 0x00, 0x52, 0x00, 0x52, 0x00,
-	// Entry 480 - 4BF
-	0x52, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00,
-	0x52, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00,
-	// Entry 4C0 - 4FF
-	0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	// Entry 500 - 53F
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00,
-}
-
-const (
-	_001 = 1
-	_419 = 30
-	_BR  = 64
-	_CA  = 72
-	_ES  = 109
-	_GB  = 122
-	_MD  = 187
-	_PT  = 237
-	_UK  = 305
-	_US  = 308
-	_ZZ  = 356
-	_XA  = 322
-	_XC  = 324
-	_XK  = 332
-)
-
-// isoRegionOffset needs to be added to the index of regionISO to obtain the regionID
-// for 2-letter ISO codes. (The first isoRegionOffset regionIDs are reserved for
-// the UN.M49 codes used for groups.)
-const isoRegionOffset = 31
-
-// regionTypes defines the status of a region for various standards.
-// Size: 357 bytes, 357 elements
-var regionTypes = [357]uint8{
-	// Entry 0 - 3F
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	// Entry 40 - 7F
-	0x06, 0x06, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x04, 0x00,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06,
-	0x04, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x04,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06,
-	0x04, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	// Entry 80 - BF
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x00, 0x04, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	// Entry C0 - FF
-	0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06,
-	0x06, 0x06, 0x06, 0x00, 0x06, 0x04, 0x06, 0x06,
-	0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06,
-	0x06, 0x00, 0x06, 0x05, 0x05, 0x05, 0x05, 0x05,
-	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-	// Entry 100 - 13F
-	0x05, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x02, 0x06, 0x04, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	// Entry 140 - 17F
-	0x00, 0x06, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-	0x05, 0x05, 0x05, 0x05, 0x04, 0x06, 0x06, 0x04,
-	0x06, 0x06, 0x04, 0x06, 0x05,
-}
-
-// regionISO holds a list of alphabetically sorted 2-letter ISO region codes.
-// Each 2-letter codes is followed by two bytes with the following meaning:
-//     - [A-Z}{2}: the first letter of the 2-letter code plus these two
-//                 letters form the 3-letter ISO code.
-//     - 0, n:     index into altRegionISO3.
-const regionISO tag.Index = "" + // Size: 1308 bytes
-	"AAAAACSCADNDAEREAFFGAGTGAIIAALLBAMRMANNTAOGOAQTAARRGASSMATUTAUUSAWBWAXLA" +
-	"AZZEBAIHBBRBBDGDBEELBFFABGGRBHHRBIDIBJENBLLMBMMUBNRNBOOLBQESBRRABSHSBTTN" +
-	"BUURBVVTBWWABYLRBZLZCAANCCCKCDODCFAFCGOGCHHECIIVCKOKCLHLCMMRCNHNCOOLCPPT" +
-	"CRRICS\x00\x00CTTECUUBCVPVCWUWCXXRCYYPCZZEDDDRDEEUDGGADJJIDKNKDMMADOOMDY" +
-	"HYDZZAEA  ECCUEESTEGGYEHSHERRIESSPETTHEU\x00\x03EZ  FIINFJJIFKLKFMSMFORO" +
-	"FQ\x00\x18FRRAFXXXGAABGBBRGDRDGEEOGFUFGGGYGHHAGIIBGLRLGMMBGNINGPLPGQNQGR" +
-	"RCGS\x00\x06GTTMGUUMGWNBGYUYHKKGHMMDHNNDHRRVHTTIHUUNHVVOIC  IDDNIERLILSR" +
-	"IMMNINNDIOOTIQRQIRRNISSLITTAJEEYJMAMJOORJPPNJTTNKEENKGGZKHHMKIIRKM\x00" +
-	"\x09KNNAKP\x00\x0cKRORKWWTKY\x00\x0fKZAZLAAOLBBNLCCALIIELKKALRBRLSSOLTTU" +
-	"LUUXLVVALYBYMAARMCCOMDDAMENEMFAFMGDGMHHLMIIDMKKDMLLIMMMRMNNGMOACMPNPMQTQ" +
-	"MRRTMSSRMTLTMUUSMVDVMWWIMXEXMYYSMZOZNAAMNCCLNEERNFFKNGGANHHBNIICNLLDNOOR" +
-	"NPPLNQ\x00\x1eNRRUNTTZNUIUNZZLOMMNPAANPCCIPEERPFYFPGNGPHHLPKAKPLOLPM\x00" +
-	"\x12PNCNPRRIPSSEPTRTPUUSPWLWPYRYPZCZQAATQMMMQNNNQOOOQPPPQQQQQRRRQSSSQTTT" +
-	"QU\x00\x03QVVVQWWWQXXXQYYYQZZZREEURHHOROOURS\x00\x15RUUSRWWASAAUSBLBSCYC" +
-	"SDDNSEWESGGPSHHNSIVNSJJMSKVKSLLESMMRSNENSOOMSRURSSSDSTTPSUUNSVLVSXXMSYYR" +
-	"SZWZTAAATCCATDCDTF\x00\x18TGGOTHHATJJKTKKLTLLSTMKMTNUNTOONTPMPTRURTTTOTV" +
-	"UVTWWNTZZAUAKRUGGAUK  UMMIUN  USSAUYRYUZZBVAATVCCTVDDRVEENVGGBVIIRVNNMVU" +
-	"UTWFLFWKAKWSSMXAAAXBBBXCCCXDDDXEEEXFFFXGGGXHHHXIIIXJJJXKKKXLLLXMMMXNNNXO" +
-	"OOXPPPXQQQXRRRXSSSXTTTXUUUXVVVXWWWXXXXXYYYXZZZYDMDYEEMYT\x00\x1bYUUGZAAF" +
-	"ZMMBZRARZWWEZZZZ\xff\xff\xff\xff"
-
-// altRegionISO3 holds a list of 3-letter region codes that cannot be
-// mapped to 2-letter codes using the default algorithm. This is a short list.
-const altRegionISO3 string = "SCGQUUSGSCOMPRKCYMSPMSRBATFMYTATN"
-
-// altRegionIDs holds a list of regionIDs the positions of which match those
-// of the 3-letter ISO codes in altRegionISO3.
-// Size: 22 bytes, 11 elements
-var altRegionIDs = [11]uint16{
-	0x0056, 0x006f, 0x0087, 0x00a7, 0x00a9, 0x00ac, 0x00e9, 0x0104,
-	0x0120, 0x015e, 0x00db,
-}
-
-// Size: 80 bytes, 20 elements
-var regionOldMap = [20]fromTo{
-	0:  {from: 0x43, to: 0xc3},
-	1:  {from: 0x57, to: 0xa6},
-	2:  {from: 0x5e, to: 0x5f},
-	3:  {from: 0x65, to: 0x3a},
-	4:  {from: 0x78, to: 0x77},
-	5:  {from: 0x92, to: 0x36},
-	6:  {from: 0xa2, to: 0x132},
-	7:  {from: 0xc0, to: 0x132},
-	8:  {from: 0xd6, to: 0x13e},
-	9:  {from: 0xdb, to: 0x2a},
-	10: {from: 0xee, to: 0x132},
-	11: {from: 0xf1, to: 0xe1},
-	12: {from: 0xfb, to: 0x6f},
-	13: {from: 0x102, to: 0x163},
-	14: {from: 0x129, to: 0x125},
-	15: {from: 0x131, to: 0x7a},
-	16: {from: 0x139, to: 0x13d},
-	17: {from: 0x140, to: 0x132},
-	18: {from: 0x15c, to: 0x15d},
-	19: {from: 0x162, to: 0x4a},
-}
-
-// m49 maps regionIDs to UN.M49 codes. The first isoRegionOffset entries are
-// codes indicating collections of regions.
-// Size: 714 bytes, 357 elements
-var m49 = [357]int16{
-	// Entry 0 - 3F
-	0, 1, 2, 3, 5, 9, 11, 13,
-	14, 15, 17, 18, 19, 21, 29, 30,
-	34, 35, 39, 53, 54, 57, 61, 142,
-	143, 145, 150, 151, 154, 155, 419, 958,
-	0, 20, 784, 4, 28, 660, 8, 51,
-	530, 24, 10, 32, 16, 40, 36, 533,
-	248, 31, 70, 52, 50, 56, 854, 100,
-	48, 108, 204, 652, 60, 96, 68, 535,
-	// Entry 40 - 7F
-	76, 44, 64, 104, 74, 72, 112, 84,
-	124, 166, 180, 140, 178, 756, 384, 184,
-	152, 120, 156, 170, 0, 188, 891, 296,
-	192, 132, 531, 162, 196, 203, 278, 276,
-	0, 262, 208, 212, 214, 204, 12, 0,
-	218, 233, 818, 732, 232, 724, 231, 967,
-	0, 246, 242, 238, 583, 234, 0, 250,
-	249, 266, 826, 308, 268, 254, 831, 288,
-	// Entry 80 - BF
-	292, 304, 270, 324, 312, 226, 300, 239,
-	320, 316, 624, 328, 344, 334, 340, 191,
-	332, 348, 854, 0, 360, 372, 376, 833,
-	356, 86, 368, 364, 352, 380, 832, 388,
-	400, 392, 581, 404, 417, 116, 296, 174,
-	659, 408, 410, 414, 136, 398, 418, 422,
-	662, 438, 144, 430, 426, 440, 442, 428,
-	434, 504, 492, 498, 499, 663, 450, 584,
-	// Entry C0 - FF
-	581, 807, 466, 104, 496, 446, 580, 474,
-	478, 500, 470, 480, 462, 454, 484, 458,
-	508, 516, 540, 562, 574, 566, 548, 558,
-	528, 578, 524, 10, 520, 536, 570, 554,
-	512, 591, 0, 604, 258, 598, 608, 586,
-	616, 666, 612, 630, 275, 620, 581, 585,
-	600, 591, 634, 959, 960, 961, 962, 963,
-	964, 965, 966, 967, 968, 969, 970, 971,
-	// Entry 100 - 13F
-	972, 638, 716, 642, 688, 643, 646, 682,
-	90, 690, 729, 752, 702, 654, 705, 744,
-	703, 694, 674, 686, 706, 740, 728, 678,
-	810, 222, 534, 760, 748, 0, 796, 148,
-	260, 768, 764, 762, 772, 626, 795, 788,
-	776, 626, 792, 780, 798, 158, 834, 804,
-	800, 826, 581, 0, 840, 858, 860, 336,
-	670, 704, 862, 92, 850, 704, 548, 876,
-	// Entry 140 - 17F
-	581, 882, 973, 974, 975, 976, 977, 978,
-	979, 980, 981, 982, 983, 984, 985, 986,
-	987, 988, 989, 990, 991, 992, 993, 994,
-	995, 996, 997, 998, 720, 887, 175, 891,
-	710, 894, 180, 716, 999,
-}
-
-// m49Index gives indexes into fromM49 based on the three most significant bits
-// of a 10-bit UN.M49 code. To search an UN.M49 code in fromM49, search in
-//    fromM49[m49Index[msb39(code)]:m49Index[msb3(code)+1]]
-// for an entry where the first 7 bits match the 7 lsb of the UN.M49 code.
-// The region code is stored in the 9 lsb of the indexed value.
-// Size: 18 bytes, 9 elements
-var m49Index = [9]int16{
-	0, 59, 107, 142, 180, 219, 258, 290,
-	332,
-}
-
-// fromM49 contains entries to map UN.M49 codes to regions. See m49Index for details.
-// Size: 664 bytes, 332 elements
-var fromM49 = [332]uint16{
-	// Entry 0 - 3F
-	0x0201, 0x0402, 0x0603, 0x0823, 0x0a04, 0x1026, 0x1205, 0x142a,
-	0x1606, 0x1866, 0x1a07, 0x1c08, 0x1e09, 0x202c, 0x220a, 0x240b,
-	0x260c, 0x2821, 0x2a0d, 0x3029, 0x3824, 0x3a0e, 0x3c0f, 0x3e31,
-	0x402b, 0x4410, 0x4611, 0x482e, 0x4e12, 0x502d, 0x5841, 0x6038,
-	0x6434, 0x6627, 0x6833, 0x6a13, 0x6c14, 0x7035, 0x7215, 0x783c,
-	0x7a16, 0x8042, 0x883e, 0x8c32, 0x9045, 0x9444, 0x9840, 0xa847,
-	0xac99, 0xb508, 0xb93b, 0xc03d, 0xc837, 0xd0c3, 0xd839, 0xe046,
-	0xe8a5, 0xf051, 0xf848, 0x0859, 0x10ac, 0x184b, 0x1c17, 0x1e18,
-	// Entry 40 - 7F
-	0x20b2, 0x2219, 0x291f, 0x2c1a, 0x2e1b, 0x3050, 0x341c, 0x361d,
-	0x3852, 0x3d2d, 0x445b, 0x4c49, 0x5453, 0x5ca7, 0x5f5e, 0x644c,
-	0x684a, 0x704f, 0x7855, 0x7e8f, 0x8058, 0x885c, 0x965d, 0x983a,
-	0xa062, 0xa863, 0xac64, 0xb468, 0xbd19, 0xc485, 0xcc6e, 0xce6e,
-	0xd06c, 0xd269, 0xd475, 0xdc73, 0xde87, 0xe472, 0xec71, 0xf030,
-	0xf278, 0xf477, 0xfc7d, 0x04e4, 0x0920, 0x0c61, 0x1479, 0x187c,
-	0x1c82, 0x26ec, 0x285f, 0x2c5e, 0x305f, 0x407f, 0x4880, 0x50a6,
-	0x5886, 0x6081, 0x687b, 0x7084, 0x7889, 0x8088, 0x8883, 0x908b,
-	// Entry 80 - BF
-	0x9890, 0x9c8d, 0xa137, 0xa88e, 0xb08c, 0xb891, 0xc09c, 0xc898,
-	0xd094, 0xd89b, 0xe09a, 0xe895, 0xf096, 0xf89d, 0x004e, 0x089f,
-	0x10a1, 0x1cad, 0x20a0, 0x28a3, 0x30a9, 0x34aa, 0x3cab, 0x42a4,
-	0x44ae, 0x461e, 0x4caf, 0x54b4, 0x58b7, 0x5cb3, 0x64b8, 0x6cb1,
-	0x70b5, 0x74b6, 0x7cc5, 0x84be, 0x8ccd, 0x94cf, 0x9ccc, 0xa4c2,
-	0xacca, 0xb4c7, 0xbcc8, 0xc0cb, 0xc8ce, 0xd8ba, 0xe0c4, 0xe4bb,
-	0xe6bc, 0xe8c9, 0xf0b9, 0xf8d0, 0x00e0, 0x08d1, 0x10dc, 0x18da,
-	0x20d8, 0x2428, 0x265a, 0x2a2f, 0x2d1a, 0x2e3f, 0x30dd, 0x38d2,
-	// Entry C0 - FF
-	0x493e, 0x54df, 0x5cd7, 0x64d3, 0x6cd5, 0x74de, 0x7cd4, 0x84d9,
-	0x88c6, 0x8b32, 0x8e74, 0x90bf, 0x92ef, 0x94e7, 0x9ee1, 0xace5,
-	0xb0f0, 0xb8e3, 0xc0e6, 0xc8ea, 0xd0e8, 0xd8ed, 0xe08a, 0xe525,
-	0xeceb, 0xf4f2, 0xfd01, 0x0503, 0x0705, 0x0d06, 0x183b, 0x1d0d,
-	0x26a8, 0x2825, 0x2cb0, 0x2ebd, 0x34e9, 0x3d38, 0x4512, 0x4d17,
-	0x5507, 0x5d13, 0x6104, 0x6509, 0x6d11, 0x7d0c, 0x7f10, 0x813d,
-	0x830e, 0x8514, 0x8d60, 0x9963, 0xa15c, 0xa86d, 0xb116, 0xb30a,
-	0xb86b, 0xc10a, 0xc915, 0xd10f, 0xd91c, 0xe10b, 0xe84d, 0xf11b,
-	// Entry 100 - 13F
-	0xf523, 0xf922, 0x0121, 0x0924, 0x1128, 0x192b, 0x2022, 0x2927,
-	0x312a, 0x3726, 0x391e, 0x3d2c, 0x4130, 0x492f, 0x4ec1, 0x5518,
-	0x646a, 0x747a, 0x7e7e, 0x809e, 0x8297, 0x852e, 0x9134, 0xa53c,
-	0xac36, 0xb535, 0xb936, 0xbd3a, 0xd93f, 0xe541, 0xed5d, 0xef5d,
-	0xf656, 0xfd61, 0x7c1f, 0x7ef3, 0x80f4, 0x82f5, 0x84f6, 0x86f7,
-	0x88f8, 0x8af9, 0x8cfa, 0x8e6f, 0x90fc, 0x92fd, 0x94fe, 0x96ff,
-	0x9900, 0x9b42, 0x9d43, 0x9f44, 0xa145, 0xa346, 0xa547, 0xa748,
-	0xa949, 0xab4a, 0xad4b, 0xaf4c, 0xb14d, 0xb34e, 0xb54f, 0xb750,
-	// Entry 140 - 17F
-	0xb951, 0xbb52, 0xbd53, 0xbf54, 0xc155, 0xc356, 0xc557, 0xc758,
-	0xc959, 0xcb5a, 0xcd5b, 0xcf64,
-}
-
-// Size: 1463 bytes
-var variantIndex = map[string]uint8{
-	"1606nict": 0x0,
-	"1694acad": 0x1,
-	"1901":     0x2,
-	"1959acad": 0x3,
-	"1994":     0x45,
-	"1996":     0x4,
-	"abl1943":  0x5,
-	"alalc97":  0x47,
-	"aluku":    0x6,
-	"ao1990":   0x7,
-	"arevela":  0x8,
-	"arevmda":  0x9,
-	"baku1926": 0xa,
-	"balanka":  0xb,
-	"barla":    0xc,
-	"basiceng": 0xd,
-	"bauddha":  0xe,
-	"biscayan": 0xf,
-	"biske":    0x40,
-	"bohoric":  0x10,
-	"boont":    0x11,
-	"colb1945": 0x12,
-	"cornu":    0x13,
-	"dajnko":   0x14,
-	"ekavsk":   0x15,
-	"emodeng":  0x16,
-	"fonipa":   0x48,
-	"fonnapa":  0x49,
-	"fonupa":   0x4a,
-	"fonxsamp": 0x4b,
-	"hepburn":  0x17,
-	"heploc":   0x46,
-	"hognorsk": 0x18,
-	"ijekavsk": 0x19,
-	"itihasa":  0x1a,
-	"jauer":    0x1b,
-	"jyutping": 0x1c,
-	"kkcor":    0x1d,
-	"kociewie": 0x1e,
-	"kscor":    0x1f,
-	"laukika":  0x20,
-	"lipaw":    0x41,
-	"luna1918": 0x21,
-	"metelko":  0x22,
-	"monoton":  0x23,
-	"ndyuka":   0x24,
-	"nedis":    0x25,
-	"newfound": 0x26,
-	"njiva":    0x42,
-	"nulik":    0x27,
-	"osojs":    0x43,
-	"oxendict": 0x28,
-	"pamaka":   0x29,
-	"petr1708": 0x2a,
-	"pinyin":   0x2b,
-	"polyton":  0x2c,
-	"puter":    0x2d,
-	"rigik":    0x2e,
-	"rozaj":    0x2f,
-	"rumgr":    0x30,
-	"scotland": 0x31,
-	"scouse":   0x32,
-	"simple":   0x4c,
-	"solba":    0x44,
-	"sotav":    0x33,
-	"surmiran": 0x34,
-	"sursilv":  0x35,
-	"sutsilv":  0x36,
-	"tarask":   0x37,
-	"uccor":    0x38,
-	"ucrcor":   0x39,
-	"ulster":   0x3a,
-	"unifon":   0x3b,
-	"vaidika":  0x3c,
-	"valencia": 0x3d,
-	"vallader": 0x3e,
-	"wadegile": 0x3f,
-}
-
-// variantNumSpecialized is the number of specialized variants in variants.
-const variantNumSpecialized = 71
-
-// nRegionGroups is the number of region groups.
-const nRegionGroups = 32
-
-type likelyLangRegion struct {
-	lang   uint16
-	region uint16
-}
-
-// likelyScript is a lookup table, indexed by scriptID, for the most likely
-// languages and regions given a script.
-// Size: 928 bytes, 232 elements
-var likelyScript = [232]likelyLangRegion{
-	1:   {lang: 0x14d, region: 0x83},
-	3:   {lang: 0x2a0, region: 0x105},
-	4:   {lang: 0x1f, region: 0x98},
-	5:   {lang: 0x3a, region: 0x6a},
-	7:   {lang: 0x3b, region: 0x9b},
-	8:   {lang: 0x1d5, region: 0x27},
-	9:   {lang: 0x13, region: 0x9b},
-	10:  {lang: 0x5b, region: 0x94},
-	11:  {lang: 0x60, region: 0x51},
-	12:  {lang: 0xb9, region: 0xb3},
-	13:  {lang: 0x63, region: 0x94},
-	14:  {lang: 0xa5, region: 0x34},
-	15:  {lang: 0x3e7, region: 0x98},
-	17:  {lang: 0x527, region: 0x12d},
-	18:  {lang: 0x3af, region: 0x98},
-	19:  {lang: 0x15d, region: 0x77},
-	20:  {lang: 0xc2, region: 0x94},
-	21:  {lang: 0x9d, region: 0xe6},
-	22:  {lang: 0xdb, region: 0x34},
-	23:  {lang: 0xf2, region: 0x48},
-	24:  {lang: 0x4ee, region: 0x12a},
-	25:  {lang: 0xe7, region: 0x13d},
-	26:  {lang: 0xe5, region: 0x134},
-	28:  {lang: 0xf0, region: 0x6a},
-	29:  {lang: 0x19e, region: 0x5c},
-	30:  {lang: 0x3e0, region: 0x105},
-	32:  {lang: 0x1bc, region: 0x98},
-	34:  {lang: 0x15d, region: 0x77},
-	37:  {lang: 0x132, region: 0x6a},
-	38:  {lang: 0x42f, region: 0x26},
-	39:  {lang: 0x27, region: 0x6e},
-	41:  {lang: 0x20e, region: 0x7c},
-	42:  {lang: 0xfd, region: 0x37},
-	43:  {lang: 0x19c, region: 0x12f},
-	44:  {lang: 0x3e7, region: 0x98},
-	45:  {lang: 0x135, region: 0x86},
-	46:  {lang: 0x1a2, region: 0x98},
-	47:  {lang: 0x39b, region: 0x98},
-	48:  {lang: 0x527, region: 0x12d},
-	49:  {lang: 0x252, region: 0xaa},
-	50:  {lang: 0x527, region: 0x52},
-	51:  {lang: 0x1c9, region: 0xe6},
-	52:  {lang: 0x527, region: 0x52},
-	53:  {lang: 0x527, region: 0x12d},
-	54:  {lang: 0x2fb, region: 0x9a},
-	55:  {lang: 0x1ba, region: 0x96},
-	56:  {lang: 0x1fe, region: 0xa1},
-	57:  {lang: 0x1c3, region: 0x12a},
-	58:  {lang: 0x1c8, region: 0xae},
-	60:  {lang: 0x1d3, region: 0x91},
-	62:  {lang: 0x141, region: 0x9d},
-	63:  {lang: 0x252, region: 0xaa},
-	64:  {lang: 0x20c, region: 0x94},
-	65:  {lang: 0x1fe, region: 0xa1},
-	67:  {lang: 0x134, region: 0xc3},
-	68:  {lang: 0x1fe, region: 0xa1},
-	69:  {lang: 0x3b9, region: 0xe7},
-	70:  {lang: 0x248, region: 0xa5},
-	71:  {lang: 0x3f8, region: 0x98},
-	74:  {lang: 0x24f, region: 0x98},
-	75:  {lang: 0x252, region: 0xaa},
-	77:  {lang: 0x88, region: 0x98},
-	78:  {lang: 0x36e, region: 0x122},
-	79:  {lang: 0x2b6, region: 0xae},
-	84:  {lang: 0x29d, region: 0x98},
-	85:  {lang: 0x2a6, region: 0x98},
-	86:  {lang: 0x28d, region: 0x86},
-	87:  {lang: 0x19e, region: 0x86},
-	88:  {lang: 0x2aa, region: 0x52},
-	90:  {lang: 0x4f2, region: 0x12a},
-	91:  {lang: 0x4f3, region: 0x12a},
-	92:  {lang: 0x1bc, region: 0x98},
-	93:  {lang: 0x335, region: 0x9b},
-	94:  {lang: 0x4f5, region: 0x52},
-	95:  {lang: 0xa9, region: 0x52},
-	97:  {lang: 0x2e6, region: 0x111},
-	98:  {lang: 0x4f6, region: 0x10a},
-	99:  {lang: 0x4f6, region: 0x10a},
-	100: {lang: 0x302, region: 0x98},
-	101: {lang: 0x319, region: 0x98},
-	102: {lang: 0x309, region: 0x52},
-	104: {lang: 0x31c, region: 0x34},
-	105: {lang: 0x30c, region: 0x98},
-	106: {lang: 0x412, region: 0xe7},
-	107: {lang: 0x32f, region: 0xc3},
-	108: {lang: 0x4f7, region: 0x107},
-	109: {lang: 0x3b, region: 0xa0},
-	110: {lang: 0x351, region: 0xda},
-	112: {lang: 0x2ce, region: 0x83},
-	114: {lang: 0x401, region: 0x95},
-	115: {lang: 0x3ec, region: 0x98},
-	116: {lang: 0x399, region: 0xc4},
-	117: {lang: 0x393, region: 0x98},
-	118: {lang: 0x397, region: 0x134},
-	119: {lang: 0x427, region: 0x114},
-	120: {lang: 0x3b, region: 0x11b},
-	121: {lang: 0xfc, region: 0xc3},
-	122: {lang: 0x27b, region: 0x105},
-	123: {lang: 0x2c7, region: 0x52},
-	124: {lang: 0x39d, region: 0x9b},
-	125: {lang: 0x39d, region: 0x52},
-	127: {lang: 0x3ab, region: 0xaf},
-	129: {lang: 0x1c4, region: 0x52},
-	130: {lang: 0x4fb, region: 0x9b},
-	181: {lang: 0x3c9, region: 0x94},
-	183: {lang: 0x370, region: 0x10b},
-	184: {lang: 0x41e, region: 0x96},
-	186: {lang: 0x4fd, region: 0x15d},
-	187: {lang: 0x3ee, region: 0x98},
-	188: {lang: 0x45, region: 0x134},
-	189: {lang: 0x138, region: 0x7a},
-	190: {lang: 0x3e7, region: 0x98},
-	191: {lang: 0x3e7, region: 0x98},
-	192: {lang: 0x3f8, region: 0x98},
-	193: {lang: 0x40a, region: 0xb2},
-	194: {lang: 0x431, region: 0x98},
-	195: {lang: 0x43c, region: 0x94},
-	196: {lang: 0x44b, region: 0x34},
-	197: {lang: 0x44c, region: 0x9a},
-	201: {lang: 0x458, region: 0xe6},
-	202: {lang: 0x119, region: 0x98},
-	203: {lang: 0x45c, region: 0x52},
-	204: {lang: 0x230, region: 0x52},
-	205: {lang: 0x44e, region: 0x98},
-	206: {lang: 0x4a3, region: 0x52},
-	207: {lang: 0x9f, region: 0x13d},
-	208: {lang: 0x45f, region: 0x98},
-	210: {lang: 0x526, region: 0xb9},
-	211: {lang: 0x152, region: 0xe6},
-	212: {lang: 0x127, region: 0xcc},
-	213: {lang: 0x469, region: 0x122},
-	214: {lang: 0xa9, region: 0x52},
-	215: {lang: 0x2cc, region: 0x98},
-	216: {lang: 0x4ab, region: 0x11b},
-	217: {lang: 0x4bc, region: 0xb3},
-	219: {lang: 0x1cc, region: 0x98},
-	221: {lang: 0x3a7, region: 0x9b},
-	222: {lang: 0x22, region: 0x9a},
-	223: {lang: 0x1e8, region: 0x52},
-}
-
-type likelyScriptRegion struct {
-	region uint16
-	script uint8
-	flags  uint8
-}
-
-// likelyLang is a lookup table, indexed by langID, for the most likely
-// scripts and regions given incomplete information. If more entries exist for a
-// given language, region and script are the index and size respectively
-// of the list in likelyLangList.
-// Size: 5308 bytes, 1327 elements
-var likelyLang = [1327]likelyScriptRegion{
-	0:    {region: 0x134, script: 0x52, flags: 0x0},
-	1:    {region: 0x6e, script: 0x52, flags: 0x0},
-	2:    {region: 0x164, script: 0x52, flags: 0x0},
-	3:    {region: 0x164, script: 0x52, flags: 0x0},
-	4:    {region: 0x164, script: 0x52, flags: 0x0},
-	5:    {region: 0x7c, script: 0x1e, flags: 0x0},
-	6:    {region: 0x164, script: 0x52, flags: 0x0},
-	7:    {region: 0x164, script: 0x1e, flags: 0x0},
-	8:    {region: 0x7f, script: 0x52, flags: 0x0},
-	9:    {region: 0x164, script: 0x52, flags: 0x0},
-	10:   {region: 0x164, script: 0x52, flags: 0x0},
-	11:   {region: 0x164, script: 0x52, flags: 0x0},
-	12:   {region: 0x94, script: 0x52, flags: 0x0},
-	13:   {region: 0x130, script: 0x52, flags: 0x0},
-	14:   {region: 0x7f, script: 0x52, flags: 0x0},
-	15:   {region: 0x164, script: 0x52, flags: 0x0},
-	16:   {region: 0x164, script: 0x52, flags: 0x0},
-	17:   {region: 0x105, script: 0x1e, flags: 0x0},
-	18:   {region: 0x164, script: 0x52, flags: 0x0},
-	19:   {region: 0x9b, script: 0x9, flags: 0x0},
-	20:   {region: 0x127, script: 0x5, flags: 0x0},
-	21:   {region: 0x164, script: 0x52, flags: 0x0},
-	22:   {region: 0x160, script: 0x52, flags: 0x0},
-	23:   {region: 0x164, script: 0x52, flags: 0x0},
-	24:   {region: 0x164, script: 0x52, flags: 0x0},
-	25:   {region: 0x164, script: 0x52, flags: 0x0},
-	26:   {region: 0x164, script: 0x52, flags: 0x0},
-	27:   {region: 0x164, script: 0x52, flags: 0x0},
-	28:   {region: 0x51, script: 0x52, flags: 0x0},
-	29:   {region: 0x164, script: 0x52, flags: 0x0},
-	30:   {region: 0x164, script: 0x52, flags: 0x0},
-	31:   {region: 0x98, script: 0x4, flags: 0x0},
-	32:   {region: 0x164, script: 0x52, flags: 0x0},
-	33:   {region: 0x7f, script: 0x52, flags: 0x0},
-	34:   {region: 0x9a, script: 0xde, flags: 0x0},
-	35:   {region: 0x164, script: 0x52, flags: 0x0},
-	36:   {region: 0x164, script: 0x52, flags: 0x0},
-	37:   {region: 0x14c, script: 0x52, flags: 0x0},
-	38:   {region: 0x105, script: 0x1e, flags: 0x0},
-	39:   {region: 0x6e, script: 0x27, flags: 0x0},
-	40:   {region: 0x164, script: 0x52, flags: 0x0},
-	41:   {region: 0x164, script: 0x52, flags: 0x0},
-	42:   {region: 0xd5, script: 0x52, flags: 0x0},
-	43:   {region: 0x164, script: 0x52, flags: 0x0},
-	45:   {region: 0x164, script: 0x52, flags: 0x0},
-	46:   {region: 0x164, script: 0x52, flags: 0x0},
-	47:   {region: 0x164, script: 0x52, flags: 0x0},
-	48:   {region: 0x164, script: 0x52, flags: 0x0},
-	49:   {region: 0x164, script: 0x52, flags: 0x0},
-	50:   {region: 0x164, script: 0x52, flags: 0x0},
-	51:   {region: 0x94, script: 0x52, flags: 0x0},
-	52:   {region: 0x164, script: 0x5, flags: 0x0},
-	53:   {region: 0x121, script: 0x5, flags: 0x0},
-	54:   {region: 0x164, script: 0x52, flags: 0x0},
-	55:   {region: 0x164, script: 0x52, flags: 0x0},
-	56:   {region: 0x164, script: 0x52, flags: 0x0},
-	57:   {region: 0x164, script: 0x52, flags: 0x0},
-	58:   {region: 0x6a, script: 0x5, flags: 0x0},
-	59:   {region: 0x0, script: 0x3, flags: 0x1},
-	60:   {region: 0x164, script: 0x52, flags: 0x0},
-	61:   {region: 0x50, script: 0x52, flags: 0x0},
-	62:   {region: 0x3e, script: 0x52, flags: 0x0},
-	63:   {region: 0x66, script: 0x5, flags: 0x0},
-	65:   {region: 0xb9, script: 0x5, flags: 0x0},
-	66:   {region: 0x6a, script: 0x5, flags: 0x0},
-	67:   {region: 0x98, script: 0xe, flags: 0x0},
-	68:   {region: 0x12e, script: 0x52, flags: 0x0},
-	69:   {region: 0x134, script: 0xbc, flags: 0x0},
-	70:   {region: 0x164, script: 0x52, flags: 0x0},
-	71:   {region: 0x164, script: 0x52, flags: 0x0},
-	72:   {region: 0x6d, script: 0x52, flags: 0x0},
-	73:   {region: 0x164, script: 0x52, flags: 0x0},
-	74:   {region: 0x164, script: 0x52, flags: 0x0},
-	75:   {region: 0x48, script: 0x52, flags: 0x0},
-	76:   {region: 0x164, script: 0x52, flags: 0x0},
-	77:   {region: 0x105, script: 0x1e, flags: 0x0},
-	78:   {region: 0x164, script: 0x5, flags: 0x0},
-	79:   {region: 0x164, script: 0x52, flags: 0x0},
-	80:   {region: 0x164, script: 0x52, flags: 0x0},
-	81:   {region: 0x164, script: 0x52, flags: 0x0},
-	82:   {region: 0x98, script: 0x20, flags: 0x0},
-	83:   {region: 0x164, script: 0x52, flags: 0x0},
-	84:   {region: 0x164, script: 0x52, flags: 0x0},
-	85:   {region: 0x164, script: 0x52, flags: 0x0},
-	86:   {region: 0x3e, script: 0x52, flags: 0x0},
-	87:   {region: 0x164, script: 0x52, flags: 0x0},
-	88:   {region: 0x3, script: 0x5, flags: 0x1},
-	89:   {region: 0x105, script: 0x1e, flags: 0x0},
-	90:   {region: 0xe7, script: 0x5, flags: 0x0},
-	91:   {region: 0x94, script: 0x52, flags: 0x0},
-	92:   {region: 0xda, script: 0x20, flags: 0x0},
-	93:   {region: 0x2d, script: 0x52, flags: 0x0},
-	94:   {region: 0x51, script: 0x52, flags: 0x0},
-	95:   {region: 0x164, script: 0x52, flags: 0x0},
-	96:   {region: 0x51, script: 0xb, flags: 0x0},
-	97:   {region: 0x164, script: 0x52, flags: 0x0},
-	98:   {region: 0x164, script: 0x52, flags: 0x0},
-	99:   {region: 0x94, script: 0x52, flags: 0x0},
-	100:  {region: 0x164, script: 0x52, flags: 0x0},
-	101:  {region: 0x51, script: 0x52, flags: 0x0},
-	102:  {region: 0x164, script: 0x52, flags: 0x0},
-	103:  {region: 0x164, script: 0x52, flags: 0x0},
-	104:  {region: 0x164, script: 0x52, flags: 0x0},
-	105:  {region: 0x164, script: 0x52, flags: 0x0},
-	106:  {region: 0x4e, script: 0x52, flags: 0x0},
-	107:  {region: 0x164, script: 0x52, flags: 0x0},
-	108:  {region: 0x164, script: 0x52, flags: 0x0},
-	109:  {region: 0x164, script: 0x52, flags: 0x0},
-	110:  {region: 0x164, script: 0x27, flags: 0x0},
-	111:  {region: 0x164, script: 0x52, flags: 0x0},
-	112:  {region: 0x164, script: 0x52, flags: 0x0},
-	113:  {region: 0x46, script: 0x1e, flags: 0x0},
-	114:  {region: 0x164, script: 0x52, flags: 0x0},
-	115:  {region: 0x164, script: 0x52, flags: 0x0},
-	116:  {region: 0x10a, script: 0x5, flags: 0x0},
-	117:  {region: 0x161, script: 0x52, flags: 0x0},
-	118:  {region: 0x164, script: 0x52, flags: 0x0},
-	119:  {region: 0x94, script: 0x52, flags: 0x0},
-	120:  {region: 0x164, script: 0x52, flags: 0x0},
-	121:  {region: 0x12e, script: 0x52, flags: 0x0},
-	122:  {region: 0x51, script: 0x52, flags: 0x0},
-	123:  {region: 0x98, script: 0xcd, flags: 0x0},
-	124:  {region: 0xe7, script: 0x5, flags: 0x0},
-	125:  {region: 0x98, script: 0x20, flags: 0x0},
-	126:  {region: 0x37, script: 0x1e, flags: 0x0},
-	127:  {region: 0x98, script: 0x20, flags: 0x0},
-	128:  {region: 0xe7, script: 0x5, flags: 0x0},
-	129:  {region: 0x12a, script: 0x2d, flags: 0x0},
-	131:  {region: 0x98, script: 0x20, flags: 0x0},
-	132:  {region: 0x164, script: 0x52, flags: 0x0},
-	133:  {region: 0x98, script: 0x20, flags: 0x0},
-	134:  {region: 0xe6, script: 0x52, flags: 0x0},
-	135:  {region: 0x164, script: 0x52, flags: 0x0},
-	136:  {region: 0x98, script: 0x20, flags: 0x0},
-	137:  {region: 0x164, script: 0x52, flags: 0x0},
-	138:  {region: 0x13e, script: 0x52, flags: 0x0},
-	139:  {region: 0x164, script: 0x52, flags: 0x0},
-	140:  {region: 0x164, script: 0x52, flags: 0x0},
-	141:  {region: 0xe6, script: 0x52, flags: 0x0},
-	142:  {region: 0x164, script: 0x52, flags: 0x0},
-	143:  {region: 0xd5, script: 0x52, flags: 0x0},
-	144:  {region: 0x164, script: 0x52, flags: 0x0},
-	145:  {region: 0x164, script: 0x52, flags: 0x0},
-	146:  {region: 0x164, script: 0x52, flags: 0x0},
-	147:  {region: 0x164, script: 0x27, flags: 0x0},
-	148:  {region: 0x98, script: 0x20, flags: 0x0},
-	149:  {region: 0x94, script: 0x52, flags: 0x0},
-	150:  {region: 0x164, script: 0x52, flags: 0x0},
-	151:  {region: 0x164, script: 0x52, flags: 0x0},
-	152:  {region: 0x113, script: 0x52, flags: 0x0},
-	153:  {region: 0x164, script: 0x52, flags: 0x0},
-	154:  {region: 0x164, script: 0x52, flags: 0x0},
-	155:  {region: 0x51, script: 0x52, flags: 0x0},
-	156:  {region: 0x164, script: 0x52, flags: 0x0},
-	157:  {region: 0xe6, script: 0x52, flags: 0x0},
-	158:  {region: 0x164, script: 0x52, flags: 0x0},
-	159:  {region: 0x13d, script: 0xcf, flags: 0x0},
-	160:  {region: 0xc2, script: 0x52, flags: 0x0},
-	161:  {region: 0x164, script: 0x52, flags: 0x0},
-	162:  {region: 0x164, script: 0x52, flags: 0x0},
-	163:  {region: 0xc2, script: 0x52, flags: 0x0},
-	164:  {region: 0x164, script: 0x52, flags: 0x0},
-	165:  {region: 0x34, script: 0xe, flags: 0x0},
-	166:  {region: 0x164, script: 0x52, flags: 0x0},
-	167:  {region: 0x164, script: 0x52, flags: 0x0},
-	168:  {region: 0x164, script: 0x52, flags: 0x0},
-	169:  {region: 0x52, script: 0xd6, flags: 0x0},
-	170:  {region: 0x164, script: 0x52, flags: 0x0},
-	171:  {region: 0x164, script: 0x52, flags: 0x0},
-	172:  {region: 0x164, script: 0x52, flags: 0x0},
-	173:  {region: 0x98, script: 0xe, flags: 0x0},
-	174:  {region: 0x164, script: 0x52, flags: 0x0},
-	175:  {region: 0x9b, script: 0x5, flags: 0x0},
-	176:  {region: 0x164, script: 0x52, flags: 0x0},
-	177:  {region: 0x4e, script: 0x52, flags: 0x0},
-	178:  {region: 0x77, script: 0x52, flags: 0x0},
-	179:  {region: 0x98, script: 0x20, flags: 0x0},
-	180:  {region: 0xe7, script: 0x5, flags: 0x0},
-	181:  {region: 0x98, script: 0x20, flags: 0x0},
-	182:  {region: 0x164, script: 0x52, flags: 0x0},
-	183:  {region: 0x32, script: 0x52, flags: 0x0},
-	184:  {region: 0x164, script: 0x52, flags: 0x0},
-	185:  {region: 0xb3, script: 0xc, flags: 0x0},
-	186:  {region: 0x51, script: 0x52, flags: 0x0},
-	187:  {region: 0x164, script: 0x27, flags: 0x0},
-	188:  {region: 0xe6, script: 0x52, flags: 0x0},
-	189:  {region: 0x164, script: 0x52, flags: 0x0},
-	190:  {region: 0xe7, script: 0x20, flags: 0x0},
-	191:  {region: 0x105, script: 0x1e, flags: 0x0},
-	192:  {region: 0x15e, script: 0x52, flags: 0x0},
-	193:  {region: 0x164, script: 0x52, flags: 0x0},
-	194:  {region: 0x94, script: 0x52, flags: 0x0},
-	195:  {region: 0x164, script: 0x52, flags: 0x0},
-	196:  {region: 0x51, script: 0x52, flags: 0x0},
-	197:  {region: 0x164, script: 0x52, flags: 0x0},
-	198:  {region: 0x164, script: 0x52, flags: 0x0},
-	199:  {region: 0x164, script: 0x52, flags: 0x0},
-	200:  {region: 0x85, script: 0x52, flags: 0x0},
-	201:  {region: 0x164, script: 0x52, flags: 0x0},
-	202:  {region: 0x164, script: 0x52, flags: 0x0},
-	203:  {region: 0x164, script: 0x52, flags: 0x0},
-	204:  {region: 0x164, script: 0x52, flags: 0x0},
-	205:  {region: 0x6c, script: 0x27, flags: 0x0},
-	206:  {region: 0x164, script: 0x52, flags: 0x0},
-	207:  {region: 0x164, script: 0x52, flags: 0x0},
-	208:  {region: 0x51, script: 0x52, flags: 0x0},
-	209:  {region: 0x164, script: 0x52, flags: 0x0},
-	210:  {region: 0x164, script: 0x52, flags: 0x0},
-	211:  {region: 0xc2, script: 0x52, flags: 0x0},
-	212:  {region: 0x164, script: 0x52, flags: 0x0},
-	213:  {region: 0x164, script: 0x52, flags: 0x0},
-	214:  {region: 0x164, script: 0x52, flags: 0x0},
-	215:  {region: 0x6d, script: 0x52, flags: 0x0},
-	216:  {region: 0x164, script: 0x52, flags: 0x0},
-	217:  {region: 0x164, script: 0x52, flags: 0x0},
-	218:  {region: 0xd5, script: 0x52, flags: 0x0},
-	219:  {region: 0x34, script: 0x16, flags: 0x0},
-	220:  {region: 0x105, script: 0x1e, flags: 0x0},
-	221:  {region: 0xe6, script: 0x52, flags: 0x0},
-	222:  {region: 0x164, script: 0x52, flags: 0x0},
-	223:  {region: 0x130, script: 0x52, flags: 0x0},
-	224:  {region: 0x89, script: 0x52, flags: 0x0},
-	225:  {region: 0x74, script: 0x52, flags: 0x0},
-	226:  {region: 0x105, script: 0x1e, flags: 0x0},
-	227:  {region: 0x134, script: 0x52, flags: 0x0},
-	228:  {region: 0x48, script: 0x52, flags: 0x0},
-	229:  {region: 0x134, script: 0x1a, flags: 0x0},
-	230:  {region: 0xa5, script: 0x5, flags: 0x0},
-	231:  {region: 0x13d, script: 0x19, flags: 0x0},
-	232:  {region: 0x164, script: 0x52, flags: 0x0},
-	233:  {region: 0x9a, script: 0x5, flags: 0x0},
-	234:  {region: 0x164, script: 0x52, flags: 0x0},
-	235:  {region: 0x164, script: 0x52, flags: 0x0},
-	236:  {region: 0x164, script: 0x52, flags: 0x0},
-	237:  {region: 0x164, script: 0x52, flags: 0x0},
-	238:  {region: 0x164, script: 0x52, flags: 0x0},
-	239:  {region: 0x77, script: 0x52, flags: 0x0},
-	240:  {region: 0x6a, script: 0x1c, flags: 0x0},
-	241:  {region: 0xe6, script: 0x52, flags: 0x0},
-	242:  {region: 0x48, script: 0x17, flags: 0x0},
-	243:  {region: 0x12f, script: 0x1e, flags: 0x0},
-	244:  {region: 0x48, script: 0x17, flags: 0x0},
-	245:  {region: 0x48, script: 0x17, flags: 0x0},
-	246:  {region: 0x48, script: 0x17, flags: 0x0},
-	247:  {region: 0x48, script: 0x17, flags: 0x0},
-	248:  {region: 0x109, script: 0x52, flags: 0x0},
-	249:  {region: 0x5d, script: 0x52, flags: 0x0},
-	250:  {region: 0xe8, script: 0x52, flags: 0x0},
-	251:  {region: 0x48, script: 0x17, flags: 0x0},
-	252:  {region: 0xc3, script: 0x79, flags: 0x0},
-	253:  {region: 0x8, script: 0x2, flags: 0x1},
-	254:  {region: 0x105, script: 0x1e, flags: 0x0},
-	255:  {region: 0x7a, script: 0x52, flags: 0x0},
-	256:  {region: 0x62, script: 0x52, flags: 0x0},
-	257:  {region: 0x164, script: 0x52, flags: 0x0},
-	258:  {region: 0x164, script: 0x52, flags: 0x0},
-	259:  {region: 0x164, script: 0x52, flags: 0x0},
-	260:  {region: 0x164, script: 0x52, flags: 0x0},
-	261:  {region: 0x134, script: 0x52, flags: 0x0},
-	262:  {region: 0x105, script: 0x1e, flags: 0x0},
-	263:  {region: 0xa3, script: 0x52, flags: 0x0},
-	264:  {region: 0x164, script: 0x52, flags: 0x0},
-	265:  {region: 0x164, script: 0x52, flags: 0x0},
-	266:  {region: 0x98, script: 0x5, flags: 0x0},
-	267:  {region: 0x164, script: 0x52, flags: 0x0},
-	268:  {region: 0x5f, script: 0x52, flags: 0x0},
-	269:  {region: 0x164, script: 0x52, flags: 0x0},
-	270:  {region: 0x48, script: 0x52, flags: 0x0},
-	271:  {region: 0x164, script: 0x52, flags: 0x0},
-	272:  {region: 0x164, script: 0x52, flags: 0x0},
-	273:  {region: 0x164, script: 0x52, flags: 0x0},
-	274:  {region: 0x164, script: 0x5, flags: 0x0},
-	275:  {region: 0x48, script: 0x52, flags: 0x0},
-	276:  {region: 0x164, script: 0x52, flags: 0x0},
-	277:  {region: 0x164, script: 0x52, flags: 0x0},
-	278:  {region: 0xd3, script: 0x52, flags: 0x0},
-	279:  {region: 0x4e, script: 0x52, flags: 0x0},
-	280:  {region: 0x164, script: 0x52, flags: 0x0},
-	281:  {region: 0x98, script: 0x5, flags: 0x0},
-	282:  {region: 0x164, script: 0x52, flags: 0x0},
-	283:  {region: 0x164, script: 0x52, flags: 0x0},
-	284:  {region: 0x164, script: 0x52, flags: 0x0},
-	285:  {region: 0x164, script: 0x27, flags: 0x0},
-	286:  {region: 0x5f, script: 0x52, flags: 0x0},
-	287:  {region: 0xc2, script: 0x52, flags: 0x0},
-	288:  {region: 0xcf, script: 0x52, flags: 0x0},
-	289:  {region: 0x164, script: 0x52, flags: 0x0},
-	290:  {region: 0xda, script: 0x20, flags: 0x0},
-	291:  {region: 0x51, script: 0x52, flags: 0x0},
-	292:  {region: 0x164, script: 0x52, flags: 0x0},
-	293:  {region: 0x164, script: 0x52, flags: 0x0},
-	294:  {region: 0x164, script: 0x52, flags: 0x0},
-	295:  {region: 0xcc, script: 0xd4, flags: 0x0},
-	296:  {region: 0x164, script: 0x52, flags: 0x0},
-	297:  {region: 0x164, script: 0x52, flags: 0x0},
-	298:  {region: 0x113, script: 0x52, flags: 0x0},
-	299:  {region: 0x36, script: 0x52, flags: 0x0},
-	300:  {region: 0x42, script: 0xd6, flags: 0x0},
-	301:  {region: 0x164, script: 0x52, flags: 0x0},
-	302:  {region: 0xa3, script: 0x52, flags: 0x0},
-	303:  {region: 0x7f, script: 0x52, flags: 0x0},
-	304:  {region: 0xd5, script: 0x52, flags: 0x0},
-	305:  {region: 0x9d, script: 0x52, flags: 0x0},
-	306:  {region: 0x6a, script: 0x25, flags: 0x0},
-	307:  {region: 0x164, script: 0x52, flags: 0x0},
-	308:  {region: 0xc3, script: 0x43, flags: 0x0},
-	309:  {region: 0x86, script: 0x2d, flags: 0x0},
-	310:  {region: 0x164, script: 0x52, flags: 0x0},
-	311:  {region: 0x164, script: 0x52, flags: 0x0},
-	312:  {region: 0xa, script: 0x2, flags: 0x1},
-	313:  {region: 0x164, script: 0x52, flags: 0x0},
-	314:  {region: 0x164, script: 0x52, flags: 0x0},
-	315:  {region: 0x1, script: 0x52, flags: 0x0},
-	316:  {region: 0x164, script: 0x52, flags: 0x0},
-	317:  {region: 0x6d, script: 0x52, flags: 0x0},
-	318:  {region: 0x134, script: 0x52, flags: 0x0},
-	319:  {region: 0x69, script: 0x52, flags: 0x0},
-	320:  {region: 0x164, script: 0x52, flags: 0x0},
-	321:  {region: 0x9d, script: 0x3e, flags: 0x0},
-	322:  {region: 0x164, script: 0x52, flags: 0x0},
-	323:  {region: 0x164, script: 0x52, flags: 0x0},
-	324:  {region: 0x6d, script: 0x52, flags: 0x0},
-	325:  {region: 0x51, script: 0x52, flags: 0x0},
-	326:  {region: 0x6d, script: 0x52, flags: 0x0},
-	327:  {region: 0x9b, script: 0x5, flags: 0x0},
-	328:  {region: 0x164, script: 0x52, flags: 0x0},
-	329:  {region: 0x164, script: 0x52, flags: 0x0},
-	330:  {region: 0x164, script: 0x52, flags: 0x0},
-	331:  {region: 0x164, script: 0x52, flags: 0x0},
-	332:  {region: 0x85, script: 0x52, flags: 0x0},
-	333:  {region: 0xc, script: 0x2, flags: 0x1},
-	334:  {region: 0x164, script: 0x52, flags: 0x0},
-	335:  {region: 0xc2, script: 0x52, flags: 0x0},
-	336:  {region: 0x71, script: 0x52, flags: 0x0},
-	337:  {region: 0x10a, script: 0x5, flags: 0x0},
-	338:  {region: 0xe6, script: 0x52, flags: 0x0},
-	339:  {region: 0x10b, script: 0x52, flags: 0x0},
-	340:  {region: 0x72, script: 0x52, flags: 0x0},
-	341:  {region: 0x164, script: 0x52, flags: 0x0},
-	342:  {region: 0x164, script: 0x52, flags: 0x0},
-	343:  {region: 0x75, script: 0x52, flags: 0x0},
-	344:  {region: 0x164, script: 0x52, flags: 0x0},
-	345:  {region: 0x3a, script: 0x52, flags: 0x0},
-	346:  {region: 0x164, script: 0x52, flags: 0x0},
-	347:  {region: 0x164, script: 0x52, flags: 0x0},
-	348:  {region: 0x164, script: 0x52, flags: 0x0},
-	349:  {region: 0x77, script: 0x52, flags: 0x0},
-	350:  {region: 0x134, script: 0x52, flags: 0x0},
-	351:  {region: 0x77, script: 0x52, flags: 0x0},
-	352:  {region: 0x5f, script: 0x52, flags: 0x0},
-	353:  {region: 0x5f, script: 0x52, flags: 0x0},
-	354:  {region: 0x51, script: 0x5, flags: 0x0},
-	355:  {region: 0x13f, script: 0x52, flags: 0x0},
-	356:  {region: 0x164, script: 0x52, flags: 0x0},
-	357:  {region: 0x83, script: 0x52, flags: 0x0},
-	358:  {region: 0x164, script: 0x52, flags: 0x0},
-	359:  {region: 0xd3, script: 0x52, flags: 0x0},
-	360:  {region: 0x9d, script: 0x52, flags: 0x0},
-	361:  {region: 0xd5, script: 0x52, flags: 0x0},
-	362:  {region: 0x164, script: 0x52, flags: 0x0},
-	363:  {region: 0x10a, script: 0x52, flags: 0x0},
-	364:  {region: 0xd8, script: 0x52, flags: 0x0},
-	365:  {region: 0x95, script: 0x52, flags: 0x0},
-	366:  {region: 0x7f, script: 0x52, flags: 0x0},
-	367:  {region: 0x164, script: 0x52, flags: 0x0},
-	368:  {region: 0xbb, script: 0x52, flags: 0x0},
-	369:  {region: 0x164, script: 0x52, flags: 0x0},
-	370:  {region: 0x164, script: 0x52, flags: 0x0},
-	371:  {region: 0x164, script: 0x52, flags: 0x0},
-	372:  {region: 0x52, script: 0x34, flags: 0x0},
-	373:  {region: 0x164, script: 0x52, flags: 0x0},
-	374:  {region: 0x94, script: 0x52, flags: 0x0},
-	375:  {region: 0x164, script: 0x52, flags: 0x0},
-	376:  {region: 0x98, script: 0x20, flags: 0x0},
-	377:  {region: 0x164, script: 0x52, flags: 0x0},
-	378:  {region: 0x9b, script: 0x5, flags: 0x0},
-	379:  {region: 0x7d, script: 0x52, flags: 0x0},
-	380:  {region: 0x7a, script: 0x52, flags: 0x0},
-	381:  {region: 0x164, script: 0x52, flags: 0x0},
-	382:  {region: 0x164, script: 0x52, flags: 0x0},
-	383:  {region: 0x164, script: 0x52, flags: 0x0},
-	384:  {region: 0x164, script: 0x52, flags: 0x0},
-	385:  {region: 0x164, script: 0x52, flags: 0x0},
-	386:  {region: 0x164, script: 0x52, flags: 0x0},
-	387:  {region: 0x6e, script: 0x27, flags: 0x0},
-	388:  {region: 0x164, script: 0x52, flags: 0x0},
-	389:  {region: 0xda, script: 0x20, flags: 0x0},
-	390:  {region: 0x164, script: 0x52, flags: 0x0},
-	391:  {region: 0xa6, script: 0x52, flags: 0x0},
-	392:  {region: 0x164, script: 0x52, flags: 0x0},
-	393:  {region: 0xe7, script: 0x5, flags: 0x0},
-	394:  {region: 0x164, script: 0x52, flags: 0x0},
-	395:  {region: 0xe7, script: 0x5, flags: 0x0},
-	396:  {region: 0x164, script: 0x52, flags: 0x0},
-	397:  {region: 0x164, script: 0x52, flags: 0x0},
-	398:  {region: 0x6d, script: 0x52, flags: 0x0},
-	399:  {region: 0x9b, script: 0x5, flags: 0x0},
-	400:  {region: 0x164, script: 0x52, flags: 0x0},
-	401:  {region: 0x164, script: 0x27, flags: 0x0},
-	402:  {region: 0xf0, script: 0x52, flags: 0x0},
-	403:  {region: 0x164, script: 0x52, flags: 0x0},
-	404:  {region: 0x164, script: 0x52, flags: 0x0},
-	405:  {region: 0x164, script: 0x52, flags: 0x0},
-	406:  {region: 0x164, script: 0x27, flags: 0x0},
-	407:  {region: 0x164, script: 0x52, flags: 0x0},
-	408:  {region: 0x98, script: 0x20, flags: 0x0},
-	409:  {region: 0x98, script: 0xd0, flags: 0x0},
-	410:  {region: 0x94, script: 0x52, flags: 0x0},
-	411:  {region: 0xd8, script: 0x52, flags: 0x0},
-	412:  {region: 0x12f, script: 0x2b, flags: 0x0},
-	413:  {region: 0x164, script: 0x52, flags: 0x0},
-	414:  {region: 0xe, script: 0x2, flags: 0x1},
-	415:  {region: 0x98, script: 0xe, flags: 0x0},
-	416:  {region: 0x164, script: 0x52, flags: 0x0},
-	417:  {region: 0x4d, script: 0x52, flags: 0x0},
-	418:  {region: 0x98, script: 0x2e, flags: 0x0},
-	419:  {region: 0x40, script: 0x52, flags: 0x0},
-	420:  {region: 0x53, script: 0x52, flags: 0x0},
-	421:  {region: 0x164, script: 0x52, flags: 0x0},
-	422:  {region: 0x7f, script: 0x52, flags: 0x0},
-	423:  {region: 0x164, script: 0x52, flags: 0x0},
-	424:  {region: 0x164, script: 0x52, flags: 0x0},
-	425:  {region: 0xa3, script: 0x52, flags: 0x0},
-	426:  {region: 0x97, script: 0x52, flags: 0x0},
-	427:  {region: 0x164, script: 0x52, flags: 0x0},
-	428:  {region: 0xda, script: 0x20, flags: 0x0},
-	429:  {region: 0x164, script: 0x52, flags: 0x0},
-	430:  {region: 0x164, script: 0x5, flags: 0x0},
-	431:  {region: 0x48, script: 0x52, flags: 0x0},
-	432:  {region: 0x164, script: 0x5, flags: 0x0},
-	433:  {region: 0x164, script: 0x52, flags: 0x0},
-	434:  {region: 0x10, script: 0x3, flags: 0x1},
-	435:  {region: 0x164, script: 0x52, flags: 0x0},
-	436:  {region: 0x52, script: 0x34, flags: 0x0},
-	437:  {region: 0x164, script: 0x52, flags: 0x0},
-	438:  {region: 0x134, script: 0x52, flags: 0x0},
-	439:  {region: 0x23, script: 0x5, flags: 0x0},
-	440:  {region: 0x164, script: 0x52, flags: 0x0},
-	441:  {region: 0x164, script: 0x27, flags: 0x0},
-	442:  {region: 0x96, script: 0x37, flags: 0x0},
-	443:  {region: 0x164, script: 0x52, flags: 0x0},
-	444:  {region: 0x98, script: 0x20, flags: 0x0},
-	445:  {region: 0x164, script: 0x52, flags: 0x0},
-	446:  {region: 0x72, script: 0x52, flags: 0x0},
-	447:  {region: 0x164, script: 0x52, flags: 0x0},
-	448:  {region: 0x164, script: 0x52, flags: 0x0},
-	449:  {region: 0xe6, script: 0x52, flags: 0x0},
-	450:  {region: 0x164, script: 0x52, flags: 0x0},
-	451:  {region: 0x12a, script: 0x39, flags: 0x0},
-	452:  {region: 0x52, script: 0x81, flags: 0x0},
-	453:  {region: 0x164, script: 0x52, flags: 0x0},
-	454:  {region: 0xe7, script: 0x5, flags: 0x0},
-	455:  {region: 0x98, script: 0x20, flags: 0x0},
-	456:  {region: 0xae, script: 0x3a, flags: 0x0},
-	457:  {region: 0xe6, script: 0x52, flags: 0x0},
-	458:  {region: 0xe7, script: 0x5, flags: 0x0},
-	459:  {region: 0xe5, script: 0x52, flags: 0x0},
-	460:  {region: 0x98, script: 0x20, flags: 0x0},
-	461:  {region: 0x98, script: 0x20, flags: 0x0},
-	462:  {region: 0x164, script: 0x52, flags: 0x0},
-	463:  {region: 0x8f, script: 0x52, flags: 0x0},
-	464:  {region: 0x5f, script: 0x52, flags: 0x0},
-	465:  {region: 0x52, script: 0x34, flags: 0x0},
-	466:  {region: 0x90, script: 0x52, flags: 0x0},
-	467:  {region: 0x91, script: 0x52, flags: 0x0},
-	468:  {region: 0x164, script: 0x52, flags: 0x0},
-	469:  {region: 0x27, script: 0x8, flags: 0x0},
-	470:  {region: 0xd1, script: 0x52, flags: 0x0},
-	471:  {region: 0x77, script: 0x52, flags: 0x0},
-	472:  {region: 0x164, script: 0x52, flags: 0x0},
-	473:  {region: 0x164, script: 0x52, flags: 0x0},
-	474:  {region: 0xcf, script: 0x52, flags: 0x0},
-	475:  {region: 0xd5, script: 0x52, flags: 0x0},
-	476:  {region: 0x164, script: 0x52, flags: 0x0},
-	477:  {region: 0x164, script: 0x52, flags: 0x0},
-	478:  {region: 0x164, script: 0x52, flags: 0x0},
-	479:  {region: 0x94, script: 0x52, flags: 0x0},
-	480:  {region: 0x164, script: 0x52, flags: 0x0},
-	481:  {region: 0x164, script: 0x52, flags: 0x0},
-	482:  {region: 0x164, script: 0x52, flags: 0x0},
-	484:  {region: 0x121, script: 0x52, flags: 0x0},
-	485:  {region: 0xd5, script: 0x52, flags: 0x0},
-	486:  {region: 0x164, script: 0x52, flags: 0x0},
-	487:  {region: 0x164, script: 0x52, flags: 0x0},
-	488:  {region: 0x52, script: 0xdf, flags: 0x0},
-	489:  {region: 0x164, script: 0x52, flags: 0x0},
-	490:  {region: 0x134, script: 0x52, flags: 0x0},
-	491:  {region: 0x164, script: 0x52, flags: 0x0},
-	492:  {region: 0x48, script: 0x52, flags: 0x0},
-	493:  {region: 0x164, script: 0x52, flags: 0x0},
-	494:  {region: 0x164, script: 0x52, flags: 0x0},
-	495:  {region: 0xe6, script: 0x52, flags: 0x0},
-	496:  {region: 0x164, script: 0x52, flags: 0x0},
-	497:  {region: 0x94, script: 0x52, flags: 0x0},
-	498:  {region: 0x105, script: 0x1e, flags: 0x0},
-	500:  {region: 0x164, script: 0x52, flags: 0x0},
-	501:  {region: 0x164, script: 0x52, flags: 0x0},
-	502:  {region: 0x9c, script: 0x52, flags: 0x0},
-	503:  {region: 0x9d, script: 0x52, flags: 0x0},
-	504:  {region: 0x48, script: 0x17, flags: 0x0},
-	505:  {region: 0x96, script: 0x37, flags: 0x0},
-	506:  {region: 0x164, script: 0x52, flags: 0x0},
-	507:  {region: 0x164, script: 0x52, flags: 0x0},
-	508:  {region: 0x105, script: 0x52, flags: 0x0},
-	509:  {region: 0x164, script: 0x52, flags: 0x0},
-	510:  {region: 0xa1, script: 0x41, flags: 0x0},
-	511:  {region: 0x164, script: 0x52, flags: 0x0},
-	512:  {region: 0x9f, script: 0x52, flags: 0x0},
-	514:  {region: 0x164, script: 0x52, flags: 0x0},
-	515:  {region: 0x164, script: 0x52, flags: 0x0},
-	516:  {region: 0x164, script: 0x52, flags: 0x0},
-	517:  {region: 0x51, script: 0x52, flags: 0x0},
-	518:  {region: 0x12f, script: 0x37, flags: 0x0},
-	519:  {region: 0x164, script: 0x52, flags: 0x0},
-	520:  {region: 0x12e, script: 0x52, flags: 0x0},
-	521:  {region: 0xda, script: 0x20, flags: 0x0},
-	522:  {region: 0x164, script: 0x52, flags: 0x0},
-	523:  {region: 0x62, script: 0x52, flags: 0x0},
-	524:  {region: 0x94, script: 0x52, flags: 0x0},
-	525:  {region: 0x94, script: 0x52, flags: 0x0},
-	526:  {region: 0x7c, script: 0x29, flags: 0x0},
-	527:  {region: 0x136, script: 0x1e, flags: 0x0},
-	528:  {region: 0x66, script: 0x52, flags: 0x0},
-	529:  {region: 0xc3, script: 0x52, flags: 0x0},
-	530:  {region: 0x164, script: 0x52, flags: 0x0},
-	531:  {region: 0x164, script: 0x52, flags: 0x0},
-	532:  {region: 0xd5, script: 0x52, flags: 0x0},
-	533:  {region: 0xa3, script: 0x52, flags: 0x0},
-	534:  {region: 0xc2, script: 0x52, flags: 0x0},
-	535:  {region: 0x105, script: 0x1e, flags: 0x0},
-	536:  {region: 0x164, script: 0x52, flags: 0x0},
-	537:  {region: 0x164, script: 0x52, flags: 0x0},
-	538:  {region: 0x164, script: 0x52, flags: 0x0},
-	539:  {region: 0x164, script: 0x52, flags: 0x0},
-	540:  {region: 0xd3, script: 0x5, flags: 0x0},
-	541:  {region: 0xd5, script: 0x52, flags: 0x0},
-	542:  {region: 0x163, script: 0x52, flags: 0x0},
-	543:  {region: 0x164, script: 0x52, flags: 0x0},
-	544:  {region: 0x164, script: 0x52, flags: 0x0},
-	545:  {region: 0x12e, script: 0x52, flags: 0x0},
-	546:  {region: 0x121, script: 0x5, flags: 0x0},
-	547:  {region: 0x164, script: 0x52, flags: 0x0},
-	548:  {region: 0x122, script: 0xd5, flags: 0x0},
-	549:  {region: 0x59, script: 0x52, flags: 0x0},
-	550:  {region: 0x51, script: 0x52, flags: 0x0},
-	551:  {region: 0x164, script: 0x52, flags: 0x0},
-	552:  {region: 0x4e, script: 0x52, flags: 0x0},
-	553:  {region: 0x98, script: 0x20, flags: 0x0},
-	554:  {region: 0x98, script: 0x20, flags: 0x0},
-	555:  {region: 0x4a, script: 0x52, flags: 0x0},
-	556:  {region: 0x94, script: 0x52, flags: 0x0},
-	557:  {region: 0x164, script: 0x52, flags: 0x0},
-	558:  {region: 0x40, script: 0x52, flags: 0x0},
-	559:  {region: 0x98, script: 0x52, flags: 0x0},
-	560:  {region: 0x52, script: 0xcc, flags: 0x0},
-	561:  {region: 0x98, script: 0x20, flags: 0x0},
-	562:  {region: 0xc2, script: 0x52, flags: 0x0},
-	563:  {region: 0x164, script: 0x52, flags: 0x0},
-	564:  {region: 0x98, script: 0x6b, flags: 0x0},
-	565:  {region: 0xe7, script: 0x5, flags: 0x0},
-	566:  {region: 0x164, script: 0x52, flags: 0x0},
-	567:  {region: 0xa3, script: 0x52, flags: 0x0},
-	568:  {region: 0x164, script: 0x52, flags: 0x0},
-	569:  {region: 0x12a, script: 0x52, flags: 0x0},
-	570:  {region: 0x164, script: 0x52, flags: 0x0},
-	571:  {region: 0xd1, script: 0x52, flags: 0x0},
-	572:  {region: 0x164, script: 0x52, flags: 0x0},
-	573:  {region: 0xae, script: 0x4f, flags: 0x0},
-	574:  {region: 0x164, script: 0x52, flags: 0x0},
-	575:  {region: 0x164, script: 0x52, flags: 0x0},
-	576:  {region: 0x13, script: 0x6, flags: 0x1},
-	577:  {region: 0x164, script: 0x52, flags: 0x0},
-	578:  {region: 0x51, script: 0x52, flags: 0x0},
-	579:  {region: 0x81, script: 0x52, flags: 0x0},
-	580:  {region: 0xa3, script: 0x52, flags: 0x0},
-	581:  {region: 0x164, script: 0x52, flags: 0x0},
-	582:  {region: 0x164, script: 0x52, flags: 0x0},
-	583:  {region: 0x164, script: 0x52, flags: 0x0},
-	584:  {region: 0xa5, script: 0x46, flags: 0x0},
-	585:  {region: 0x29, script: 0x52, flags: 0x0},
-	586:  {region: 0x164, script: 0x52, flags: 0x0},
-	587:  {region: 0x164, script: 0x52, flags: 0x0},
-	588:  {region: 0x164, script: 0x52, flags: 0x0},
-	589:  {region: 0x164, script: 0x52, flags: 0x0},
-	590:  {region: 0x164, script: 0x52, flags: 0x0},
-	591:  {region: 0x98, script: 0x4a, flags: 0x0},
-	592:  {region: 0x113, script: 0x52, flags: 0x0},
-	593:  {region: 0x164, script: 0x52, flags: 0x0},
-	594:  {region: 0xaa, script: 0x4b, flags: 0x0},
-	595:  {region: 0x105, script: 0x1e, flags: 0x0},
-	596:  {region: 0x98, script: 0x20, flags: 0x0},
-	597:  {region: 0x164, script: 0x52, flags: 0x0},
-	598:  {region: 0x74, script: 0x52, flags: 0x0},
-	599:  {region: 0x164, script: 0x52, flags: 0x0},
-	600:  {region: 0xb3, script: 0x52, flags: 0x0},
-	601:  {region: 0x164, script: 0x52, flags: 0x0},
-	602:  {region: 0x164, script: 0x52, flags: 0x0},
-	603:  {region: 0x164, script: 0x52, flags: 0x0},
-	604:  {region: 0x164, script: 0x52, flags: 0x0},
-	605:  {region: 0x164, script: 0x52, flags: 0x0},
-	606:  {region: 0x164, script: 0x52, flags: 0x0},
-	607:  {region: 0x164, script: 0x52, flags: 0x0},
-	608:  {region: 0x164, script: 0x27, flags: 0x0},
-	610:  {region: 0x105, script: 0x1e, flags: 0x0},
-	611:  {region: 0x111, script: 0x52, flags: 0x0},
-	612:  {region: 0xe6, script: 0x52, flags: 0x0},
-	613:  {region: 0x105, script: 0x52, flags: 0x0},
-	614:  {region: 0x164, script: 0x52, flags: 0x0},
-	615:  {region: 0x98, script: 0x20, flags: 0x0},
-	616:  {region: 0x98, script: 0x5, flags: 0x0},
-	617:  {region: 0x12e, script: 0x52, flags: 0x0},
-	618:  {region: 0x164, script: 0x52, flags: 0x0},
-	619:  {region: 0x51, script: 0x52, flags: 0x0},
-	620:  {region: 0x5f, script: 0x52, flags: 0x0},
-	621:  {region: 0x164, script: 0x52, flags: 0x0},
-	622:  {region: 0x164, script: 0x52, flags: 0x0},
-	623:  {region: 0x164, script: 0x27, flags: 0x0},
-	624:  {region: 0x164, script: 0x52, flags: 0x0},
-	625:  {region: 0x164, script: 0x52, flags: 0x0},
-	626:  {region: 0x19, script: 0x3, flags: 0x1},
-	627:  {region: 0x164, script: 0x52, flags: 0x0},
-	628:  {region: 0x164, script: 0x52, flags: 0x0},
-	629:  {region: 0x164, script: 0x52, flags: 0x0},
-	630:  {region: 0x164, script: 0x52, flags: 0x0},
-	631:  {region: 0x105, script: 0x1e, flags: 0x0},
-	632:  {region: 0x164, script: 0x52, flags: 0x0},
-	633:  {region: 0x164, script: 0x52, flags: 0x0},
-	634:  {region: 0x164, script: 0x52, flags: 0x0},
-	635:  {region: 0x105, script: 0x1e, flags: 0x0},
-	636:  {region: 0x164, script: 0x52, flags: 0x0},
-	637:  {region: 0x94, script: 0x52, flags: 0x0},
-	638:  {region: 0xe7, script: 0x5, flags: 0x0},
-	639:  {region: 0x7a, script: 0x52, flags: 0x0},
-	640:  {region: 0x164, script: 0x52, flags: 0x0},
-	641:  {region: 0x164, script: 0x52, flags: 0x0},
-	642:  {region: 0x164, script: 0x52, flags: 0x0},
-	643:  {region: 0x164, script: 0x27, flags: 0x0},
-	644:  {region: 0x122, script: 0xd5, flags: 0x0},
-	645:  {region: 0xe7, script: 0x5, flags: 0x0},
-	646:  {region: 0x164, script: 0x52, flags: 0x0},
-	647:  {region: 0x164, script: 0x52, flags: 0x0},
-	648:  {region: 0x1c, script: 0x5, flags: 0x1},
-	649:  {region: 0x164, script: 0x52, flags: 0x0},
-	650:  {region: 0x164, script: 0x52, flags: 0x0},
-	651:  {region: 0x164, script: 0x52, flags: 0x0},
-	652:  {region: 0x137, script: 0x52, flags: 0x0},
-	653:  {region: 0x86, script: 0x56, flags: 0x0},
-	654:  {region: 0x96, script: 0x37, flags: 0x0},
-	655:  {region: 0x12e, script: 0x52, flags: 0x0},
-	656:  {region: 0xe7, script: 0x5, flags: 0x0},
-	657:  {region: 0x130, script: 0x52, flags: 0x0},
-	658:  {region: 0x164, script: 0x52, flags: 0x0},
-	659:  {region: 0xb6, script: 0x52, flags: 0x0},
-	660:  {region: 0x105, script: 0x1e, flags: 0x0},
-	661:  {region: 0x164, script: 0x52, flags: 0x0},
-	662:  {region: 0x94, script: 0x52, flags: 0x0},
-	663:  {region: 0x164, script: 0x52, flags: 0x0},
-	664:  {region: 0x52, script: 0xd5, flags: 0x0},
-	665:  {region: 0x164, script: 0x52, flags: 0x0},
-	666:  {region: 0x164, script: 0x52, flags: 0x0},
-	667:  {region: 0x164, script: 0x52, flags: 0x0},
-	668:  {region: 0x164, script: 0x52, flags: 0x0},
-	669:  {region: 0x98, script: 0x54, flags: 0x0},
-	670:  {region: 0x164, script: 0x52, flags: 0x0},
-	671:  {region: 0x164, script: 0x52, flags: 0x0},
-	672:  {region: 0x105, script: 0x1e, flags: 0x0},
-	673:  {region: 0x130, script: 0x52, flags: 0x0},
-	674:  {region: 0x164, script: 0x52, flags: 0x0},
-	675:  {region: 0xd8, script: 0x52, flags: 0x0},
-	676:  {region: 0x164, script: 0x52, flags: 0x0},
-	677:  {region: 0x164, script: 0x52, flags: 0x0},
-	678:  {region: 0x21, script: 0x2, flags: 0x1},
-	679:  {region: 0x164, script: 0x52, flags: 0x0},
-	680:  {region: 0x164, script: 0x52, flags: 0x0},
-	681:  {region: 0x9d, script: 0x52, flags: 0x0},
-	682:  {region: 0x52, script: 0x58, flags: 0x0},
-	683:  {region: 0x94, script: 0x52, flags: 0x0},
-	684:  {region: 0x9b, script: 0x5, flags: 0x0},
-	685:  {region: 0x134, script: 0x52, flags: 0x0},
-	686:  {region: 0x164, script: 0x52, flags: 0x0},
-	687:  {region: 0x164, script: 0x52, flags: 0x0},
-	688:  {region: 0x98, script: 0xd0, flags: 0x0},
-	689:  {region: 0x9d, script: 0x52, flags: 0x0},
-	690:  {region: 0x164, script: 0x52, flags: 0x0},
-	691:  {region: 0x4a, script: 0x52, flags: 0x0},
-	692:  {region: 0x164, script: 0x52, flags: 0x0},
-	693:  {region: 0x164, script: 0x52, flags: 0x0},
-	694:  {region: 0xae, script: 0x4f, flags: 0x0},
-	695:  {region: 0x164, script: 0x52, flags: 0x0},
-	696:  {region: 0x164, script: 0x52, flags: 0x0},
-	697:  {region: 0x4a, script: 0x52, flags: 0x0},
-	698:  {region: 0x164, script: 0x52, flags: 0x0},
-	699:  {region: 0x164, script: 0x52, flags: 0x0},
-	700:  {region: 0x161, script: 0x52, flags: 0x0},
-	701:  {region: 0x9b, script: 0x5, flags: 0x0},
-	702:  {region: 0xb5, script: 0x52, flags: 0x0},
-	703:  {region: 0xb7, script: 0x52, flags: 0x0},
-	704:  {region: 0x4a, script: 0x52, flags: 0x0},
-	705:  {region: 0x4a, script: 0x52, flags: 0x0},
-	706:  {region: 0xa3, script: 0x52, flags: 0x0},
-	707:  {region: 0xa3, script: 0x52, flags: 0x0},
-	708:  {region: 0x9b, script: 0x5, flags: 0x0},
-	709:  {region: 0xb7, script: 0x52, flags: 0x0},
-	710:  {region: 0x122, script: 0xd5, flags: 0x0},
-	711:  {region: 0x52, script: 0x34, flags: 0x0},
-	712:  {region: 0x12a, script: 0x52, flags: 0x0},
-	713:  {region: 0x94, script: 0x52, flags: 0x0},
-	714:  {region: 0x51, script: 0x52, flags: 0x0},
-	715:  {region: 0x98, script: 0x20, flags: 0x0},
-	716:  {region: 0x98, script: 0x20, flags: 0x0},
-	717:  {region: 0x94, script: 0x52, flags: 0x0},
-	718:  {region: 0x23, script: 0x3, flags: 0x1},
-	719:  {region: 0xa3, script: 0x52, flags: 0x0},
-	720:  {region: 0x164, script: 0x52, flags: 0x0},
-	721:  {region: 0xce, script: 0x52, flags: 0x0},
-	722:  {region: 0x164, script: 0x52, flags: 0x0},
-	723:  {region: 0x164, script: 0x52, flags: 0x0},
-	724:  {region: 0x164, script: 0x52, flags: 0x0},
-	725:  {region: 0x164, script: 0x52, flags: 0x0},
-	726:  {region: 0x164, script: 0x52, flags: 0x0},
-	727:  {region: 0x164, script: 0x52, flags: 0x0},
-	728:  {region: 0x164, script: 0x52, flags: 0x0},
-	729:  {region: 0x164, script: 0x52, flags: 0x0},
-	730:  {region: 0x164, script: 0x52, flags: 0x0},
-	731:  {region: 0x164, script: 0x52, flags: 0x0},
-	732:  {region: 0x164, script: 0x52, flags: 0x0},
-	733:  {region: 0x164, script: 0x5, flags: 0x0},
-	734:  {region: 0x105, script: 0x1e, flags: 0x0},
-	735:  {region: 0xe6, script: 0x52, flags: 0x0},
-	736:  {region: 0x164, script: 0x52, flags: 0x0},
-	737:  {region: 0x94, script: 0x52, flags: 0x0},
-	738:  {region: 0x164, script: 0x27, flags: 0x0},
-	739:  {region: 0x164, script: 0x52, flags: 0x0},
-	740:  {region: 0x164, script: 0x52, flags: 0x0},
-	741:  {region: 0x164, script: 0x52, flags: 0x0},
-	742:  {region: 0x111, script: 0x52, flags: 0x0},
-	743:  {region: 0xa3, script: 0x52, flags: 0x0},
-	744:  {region: 0x164, script: 0x52, flags: 0x0},
-	745:  {region: 0x164, script: 0x52, flags: 0x0},
-	746:  {region: 0x122, script: 0x5, flags: 0x0},
-	747:  {region: 0xcb, script: 0x52, flags: 0x0},
-	748:  {region: 0x164, script: 0x52, flags: 0x0},
-	749:  {region: 0x164, script: 0x52, flags: 0x0},
-	750:  {region: 0x164, script: 0x52, flags: 0x0},
-	751:  {region: 0xbe, script: 0x52, flags: 0x0},
-	752:  {region: 0xd0, script: 0x52, flags: 0x0},
-	753:  {region: 0x164, script: 0x52, flags: 0x0},
-	754:  {region: 0x51, script: 0x52, flags: 0x0},
-	755:  {region: 0xda, script: 0x20, flags: 0x0},
-	756:  {region: 0x12e, script: 0x52, flags: 0x0},
-	757:  {region: 0xbf, script: 0x52, flags: 0x0},
-	758:  {region: 0x164, script: 0x52, flags: 0x0},
-	759:  {region: 0x164, script: 0x52, flags: 0x0},
-	760:  {region: 0xdf, script: 0x52, flags: 0x0},
-	761:  {region: 0x164, script: 0x52, flags: 0x0},
-	762:  {region: 0x94, script: 0x52, flags: 0x0},
-	763:  {region: 0x9a, script: 0x36, flags: 0x0},
-	764:  {region: 0x164, script: 0x52, flags: 0x0},
-	765:  {region: 0xc1, script: 0x1e, flags: 0x0},
-	766:  {region: 0x164, script: 0x5, flags: 0x0},
-	767:  {region: 0x164, script: 0x52, flags: 0x0},
-	768:  {region: 0x164, script: 0x52, flags: 0x0},
-	769:  {region: 0x164, script: 0x52, flags: 0x0},
-	770:  {region: 0x98, script: 0x64, flags: 0x0},
-	771:  {region: 0x164, script: 0x52, flags: 0x0},
-	772:  {region: 0x164, script: 0x52, flags: 0x0},
-	773:  {region: 0x10a, script: 0x52, flags: 0x0},
-	774:  {region: 0x164, script: 0x52, flags: 0x0},
-	775:  {region: 0x164, script: 0x52, flags: 0x0},
-	776:  {region: 0x164, script: 0x52, flags: 0x0},
-	777:  {region: 0x26, script: 0x3, flags: 0x1},
-	778:  {region: 0x164, script: 0x52, flags: 0x0},
-	779:  {region: 0x164, script: 0x52, flags: 0x0},
-	780:  {region: 0x98, script: 0xe, flags: 0x0},
-	781:  {region: 0xc3, script: 0x6b, flags: 0x0},
-	783:  {region: 0x164, script: 0x52, flags: 0x0},
-	784:  {region: 0x48, script: 0x52, flags: 0x0},
-	785:  {region: 0x48, script: 0x52, flags: 0x0},
-	786:  {region: 0x36, script: 0x52, flags: 0x0},
-	787:  {region: 0x164, script: 0x52, flags: 0x0},
-	788:  {region: 0x164, script: 0x52, flags: 0x0},
-	789:  {region: 0x164, script: 0x52, flags: 0x0},
-	790:  {region: 0x164, script: 0x52, flags: 0x0},
-	791:  {region: 0x164, script: 0x52, flags: 0x0},
-	792:  {region: 0x164, script: 0x52, flags: 0x0},
-	793:  {region: 0x98, script: 0x20, flags: 0x0},
-	794:  {region: 0xda, script: 0x20, flags: 0x0},
-	795:  {region: 0x105, script: 0x1e, flags: 0x0},
-	796:  {region: 0x34, script: 0x68, flags: 0x0},
-	797:  {region: 0x29, script: 0x3, flags: 0x1},
-	798:  {region: 0xca, script: 0x52, flags: 0x0},
-	799:  {region: 0x164, script: 0x52, flags: 0x0},
-	800:  {region: 0x164, script: 0x52, flags: 0x0},
-	801:  {region: 0x164, script: 0x52, flags: 0x0},
-	802:  {region: 0x98, script: 0x20, flags: 0x0},
-	803:  {region: 0x51, script: 0x52, flags: 0x0},
-	805:  {region: 0x164, script: 0x52, flags: 0x0},
-	806:  {region: 0x134, script: 0x52, flags: 0x0},
-	807:  {region: 0x164, script: 0x52, flags: 0x0},
-	808:  {region: 0x164, script: 0x52, flags: 0x0},
-	809:  {region: 0xe7, script: 0x5, flags: 0x0},
-	810:  {region: 0xc2, script: 0x52, flags: 0x0},
-	811:  {region: 0x98, script: 0x20, flags: 0x0},
-	812:  {region: 0x94, script: 0x52, flags: 0x0},
-	813:  {region: 0x163, script: 0x52, flags: 0x0},
-	814:  {region: 0x164, script: 0x52, flags: 0x0},
-	815:  {region: 0xc3, script: 0x6b, flags: 0x0},
-	816:  {region: 0x164, script: 0x52, flags: 0x0},
-	817:  {region: 0x164, script: 0x27, flags: 0x0},
-	818:  {region: 0x105, script: 0x1e, flags: 0x0},
-	819:  {region: 0x164, script: 0x52, flags: 0x0},
-	820:  {region: 0x130, script: 0x52, flags: 0x0},
-	821:  {region: 0x9b, script: 0x5d, flags: 0x0},
-	822:  {region: 0x164, script: 0x52, flags: 0x0},
-	823:  {region: 0x164, script: 0x52, flags: 0x0},
-	824:  {region: 0x9b, script: 0x5, flags: 0x0},
-	825:  {region: 0x164, script: 0x52, flags: 0x0},
-	826:  {region: 0x164, script: 0x52, flags: 0x0},
-	827:  {region: 0x164, script: 0x52, flags: 0x0},
-	828:  {region: 0xdc, script: 0x52, flags: 0x0},
-	829:  {region: 0x164, script: 0x52, flags: 0x0},
-	830:  {region: 0x164, script: 0x52, flags: 0x0},
-	832:  {region: 0x164, script: 0x52, flags: 0x0},
-	833:  {region: 0x52, script: 0x34, flags: 0x0},
-	834:  {region: 0x9d, script: 0x52, flags: 0x0},
-	835:  {region: 0xd1, script: 0x52, flags: 0x0},
-	836:  {region: 0x164, script: 0x52, flags: 0x0},
-	837:  {region: 0xd9, script: 0x52, flags: 0x0},
-	838:  {region: 0x164, script: 0x52, flags: 0x0},
-	839:  {region: 0x164, script: 0x52, flags: 0x0},
-	840:  {region: 0x164, script: 0x52, flags: 0x0},
-	841:  {region: 0xce, script: 0x52, flags: 0x0},
-	842:  {region: 0x164, script: 0x52, flags: 0x0},
-	843:  {region: 0x164, script: 0x52, flags: 0x0},
-	844:  {region: 0x163, script: 0x52, flags: 0x0},
-	845:  {region: 0xd0, script: 0x52, flags: 0x0},
-	846:  {region: 0x5f, script: 0x52, flags: 0x0},
-	847:  {region: 0xda, script: 0x20, flags: 0x0},
-	848:  {region: 0x164, script: 0x52, flags: 0x0},
-	849:  {region: 0xda, script: 0x20, flags: 0x0},
-	850:  {region: 0x164, script: 0x52, flags: 0x0},
-	851:  {region: 0x164, script: 0x52, flags: 0x0},
-	852:  {region: 0xd1, script: 0x52, flags: 0x0},
-	853:  {region: 0x164, script: 0x52, flags: 0x0},
-	854:  {region: 0x164, script: 0x52, flags: 0x0},
-	855:  {region: 0xd0, script: 0x52, flags: 0x0},
-	856:  {region: 0x164, script: 0x52, flags: 0x0},
-	857:  {region: 0xce, script: 0x52, flags: 0x0},
-	858:  {region: 0xce, script: 0x52, flags: 0x0},
-	859:  {region: 0x164, script: 0x52, flags: 0x0},
-	860:  {region: 0x164, script: 0x52, flags: 0x0},
-	861:  {region: 0x94, script: 0x52, flags: 0x0},
-	862:  {region: 0x164, script: 0x52, flags: 0x0},
-	863:  {region: 0xde, script: 0x52, flags: 0x0},
-	864:  {region: 0x164, script: 0x52, flags: 0x0},
-	865:  {region: 0x164, script: 0x52, flags: 0x0},
-	866:  {region: 0x98, script: 0x52, flags: 0x0},
-	867:  {region: 0x164, script: 0x52, flags: 0x0},
-	868:  {region: 0x164, script: 0x52, flags: 0x0},
-	869:  {region: 0xd8, script: 0x52, flags: 0x0},
-	870:  {region: 0x51, script: 0x52, flags: 0x0},
-	871:  {region: 0x164, script: 0x52, flags: 0x0},
-	872:  {region: 0xd9, script: 0x52, flags: 0x0},
-	873:  {region: 0x164, script: 0x52, flags: 0x0},
-	874:  {region: 0x51, script: 0x52, flags: 0x0},
-	875:  {region: 0x164, script: 0x52, flags: 0x0},
-	876:  {region: 0x164, script: 0x52, flags: 0x0},
-	877:  {region: 0xd9, script: 0x52, flags: 0x0},
-	878:  {region: 0x122, script: 0x4e, flags: 0x0},
-	879:  {region: 0x98, script: 0x20, flags: 0x0},
-	880:  {region: 0x10b, script: 0xb7, flags: 0x0},
-	881:  {region: 0x164, script: 0x52, flags: 0x0},
-	882:  {region: 0x164, script: 0x52, flags: 0x0},
-	883:  {region: 0x83, script: 0x70, flags: 0x0},
-	884:  {region: 0x160, script: 0x52, flags: 0x0},
-	885:  {region: 0x164, script: 0x52, flags: 0x0},
-	886:  {region: 0x48, script: 0x17, flags: 0x0},
-	887:  {region: 0x164, script: 0x52, flags: 0x0},
-	888:  {region: 0x160, script: 0x52, flags: 0x0},
-	889:  {region: 0x164, script: 0x52, flags: 0x0},
-	890:  {region: 0x164, script: 0x52, flags: 0x0},
-	891:  {region: 0x164, script: 0x52, flags: 0x0},
-	892:  {region: 0x164, script: 0x52, flags: 0x0},
-	893:  {region: 0x164, script: 0x52, flags: 0x0},
-	894:  {region: 0x116, script: 0x52, flags: 0x0},
-	895:  {region: 0x164, script: 0x52, flags: 0x0},
-	896:  {region: 0x164, script: 0x52, flags: 0x0},
-	897:  {region: 0x134, script: 0x52, flags: 0x0},
-	898:  {region: 0x164, script: 0x52, flags: 0x0},
-	899:  {region: 0x52, script: 0x52, flags: 0x0},
-	900:  {region: 0x164, script: 0x52, flags: 0x0},
-	901:  {region: 0xcd, script: 0x52, flags: 0x0},
-	902:  {region: 0x12e, script: 0x52, flags: 0x0},
-	903:  {region: 0x130, script: 0x52, flags: 0x0},
-	904:  {region: 0x7f, script: 0x52, flags: 0x0},
-	905:  {region: 0x77, script: 0x52, flags: 0x0},
-	906:  {region: 0x164, script: 0x52, flags: 0x0},
-	908:  {region: 0x164, script: 0x52, flags: 0x0},
-	909:  {region: 0x164, script: 0x52, flags: 0x0},
-	910:  {region: 0x6e, script: 0x52, flags: 0x0},
-	911:  {region: 0x164, script: 0x52, flags: 0x0},
-	912:  {region: 0x164, script: 0x52, flags: 0x0},
-	913:  {region: 0x164, script: 0x52, flags: 0x0},
-	914:  {region: 0x164, script: 0x52, flags: 0x0},
-	915:  {region: 0x98, script: 0x75, flags: 0x0},
-	916:  {region: 0x164, script: 0x52, flags: 0x0},
-	917:  {region: 0x164, script: 0x5, flags: 0x0},
-	918:  {region: 0x7c, script: 0x1e, flags: 0x0},
-	919:  {region: 0x134, script: 0x76, flags: 0x0},
-	920:  {region: 0x164, script: 0x5, flags: 0x0},
-	921:  {region: 0xc4, script: 0x74, flags: 0x0},
-	922:  {region: 0x164, script: 0x52, flags: 0x0},
-	923:  {region: 0x2c, script: 0x3, flags: 0x1},
-	924:  {region: 0xe6, script: 0x52, flags: 0x0},
-	925:  {region: 0x2f, script: 0x2, flags: 0x1},
-	926:  {region: 0xe6, script: 0x52, flags: 0x0},
-	927:  {region: 0x2f, script: 0x52, flags: 0x0},
-	928:  {region: 0xef, script: 0x52, flags: 0x0},
-	929:  {region: 0x164, script: 0x52, flags: 0x0},
-	930:  {region: 0x77, script: 0x52, flags: 0x0},
-	931:  {region: 0xd5, script: 0x52, flags: 0x0},
-	932:  {region: 0x134, script: 0x52, flags: 0x0},
-	933:  {region: 0x48, script: 0x52, flags: 0x0},
-	934:  {region: 0x164, script: 0x52, flags: 0x0},
-	935:  {region: 0x9b, script: 0xdd, flags: 0x0},
-	936:  {region: 0x164, script: 0x52, flags: 0x0},
-	937:  {region: 0x5f, script: 0x52, flags: 0x0},
-	938:  {region: 0x164, script: 0x5, flags: 0x0},
-	939:  {region: 0xaf, script: 0x7f, flags: 0x0},
-	941:  {region: 0x164, script: 0x52, flags: 0x0},
-	942:  {region: 0x164, script: 0x52, flags: 0x0},
-	943:  {region: 0x98, script: 0x12, flags: 0x0},
-	944:  {region: 0xa3, script: 0x52, flags: 0x0},
-	945:  {region: 0xe8, script: 0x52, flags: 0x0},
-	946:  {region: 0x164, script: 0x52, flags: 0x0},
-	947:  {region: 0x9d, script: 0x52, flags: 0x0},
-	948:  {region: 0x164, script: 0x52, flags: 0x0},
-	949:  {region: 0x164, script: 0x52, flags: 0x0},
-	950:  {region: 0x86, script: 0x2d, flags: 0x0},
-	951:  {region: 0x74, script: 0x52, flags: 0x0},
-	952:  {region: 0x164, script: 0x52, flags: 0x0},
-	953:  {region: 0xe7, script: 0x45, flags: 0x0},
-	954:  {region: 0x9b, script: 0x5, flags: 0x0},
-	955:  {region: 0x1, script: 0x52, flags: 0x0},
-	956:  {region: 0x23, script: 0x5, flags: 0x0},
-	957:  {region: 0x164, script: 0x52, flags: 0x0},
-	958:  {region: 0x40, script: 0x52, flags: 0x0},
-	959:  {region: 0x164, script: 0x52, flags: 0x0},
-	960:  {region: 0x79, script: 0x52, flags: 0x0},
-	961:  {region: 0x164, script: 0x52, flags: 0x0},
-	962:  {region: 0xe3, script: 0x52, flags: 0x0},
-	963:  {region: 0x88, script: 0x52, flags: 0x0},
-	964:  {region: 0x68, script: 0x52, flags: 0x0},
-	965:  {region: 0x164, script: 0x52, flags: 0x0},
-	966:  {region: 0x98, script: 0x20, flags: 0x0},
-	967:  {region: 0x164, script: 0x52, flags: 0x0},
-	968:  {region: 0x101, script: 0x52, flags: 0x0},
-	969:  {region: 0x94, script: 0x52, flags: 0x0},
-	970:  {region: 0x164, script: 0x52, flags: 0x0},
-	971:  {region: 0x164, script: 0x52, flags: 0x0},
-	972:  {region: 0x9d, script: 0x52, flags: 0x0},
-	973:  {region: 0x164, script: 0x5, flags: 0x0},
-	974:  {region: 0x98, script: 0x52, flags: 0x0},
-	975:  {region: 0x31, script: 0x2, flags: 0x1},
-	976:  {region: 0xda, script: 0x20, flags: 0x0},
-	977:  {region: 0x34, script: 0xe, flags: 0x0},
-	978:  {region: 0x4d, script: 0x52, flags: 0x0},
-	979:  {region: 0x71, script: 0x52, flags: 0x0},
-	980:  {region: 0x4d, script: 0x52, flags: 0x0},
-	981:  {region: 0x9b, script: 0x5, flags: 0x0},
-	982:  {region: 0x10b, script: 0x52, flags: 0x0},
-	983:  {region: 0x39, script: 0x52, flags: 0x0},
-	984:  {region: 0x164, script: 0x52, flags: 0x0},
-	985:  {region: 0xd0, script: 0x52, flags: 0x0},
-	986:  {region: 0x103, script: 0x52, flags: 0x0},
-	987:  {region: 0x94, script: 0x52, flags: 0x0},
-	988:  {region: 0x12e, script: 0x52, flags: 0x0},
-	989:  {region: 0x164, script: 0x52, flags: 0x0},
-	990:  {region: 0x164, script: 0x52, flags: 0x0},
-	991:  {region: 0x72, script: 0x52, flags: 0x0},
-	992:  {region: 0x105, script: 0x1e, flags: 0x0},
-	993:  {region: 0x12f, script: 0x1e, flags: 0x0},
-	994:  {region: 0x108, script: 0x52, flags: 0x0},
-	995:  {region: 0x106, script: 0x52, flags: 0x0},
-	996:  {region: 0x12e, script: 0x52, flags: 0x0},
-	997:  {region: 0x164, script: 0x52, flags: 0x0},
-	998:  {region: 0xa1, script: 0x44, flags: 0x0},
-	999:  {region: 0x98, script: 0x20, flags: 0x0},
-	1000: {region: 0x7f, script: 0x52, flags: 0x0},
-	1001: {region: 0x105, script: 0x1e, flags: 0x0},
-	1002: {region: 0xa3, script: 0x52, flags: 0x0},
-	1003: {region: 0x94, script: 0x52, flags: 0x0},
-	1004: {region: 0x98, script: 0x52, flags: 0x0},
-	1005: {region: 0x113, script: 0x52, flags: 0x0},
-	1006: {region: 0x98, script: 0xbb, flags: 0x0},
-	1007: {region: 0x164, script: 0x52, flags: 0x0},
-	1008: {region: 0x164, script: 0x52, flags: 0x0},
-	1009: {region: 0x12e, script: 0x52, flags: 0x0},
-	1010: {region: 0x9d, script: 0x52, flags: 0x0},
-	1011: {region: 0x98, script: 0x20, flags: 0x0},
-	1012: {region: 0x164, script: 0x5, flags: 0x0},
-	1013: {region: 0x9d, script: 0x52, flags: 0x0},
-	1014: {region: 0x7a, script: 0x52, flags: 0x0},
-	1015: {region: 0x48, script: 0x52, flags: 0x0},
-	1016: {region: 0x33, script: 0x4, flags: 0x1},
-	1017: {region: 0x9d, script: 0x52, flags: 0x0},
-	1018: {region: 0x9b, script: 0x5, flags: 0x0},
-	1019: {region: 0xd9, script: 0x52, flags: 0x0},
-	1020: {region: 0x4e, script: 0x52, flags: 0x0},
-	1021: {region: 0xd0, script: 0x52, flags: 0x0},
-	1022: {region: 0xce, script: 0x52, flags: 0x0},
-	1023: {region: 0xc2, script: 0x52, flags: 0x0},
-	1024: {region: 0x4b, script: 0x52, flags: 0x0},
-	1025: {region: 0x95, script: 0x72, flags: 0x0},
-	1026: {region: 0xb5, script: 0x52, flags: 0x0},
-	1027: {region: 0x164, script: 0x27, flags: 0x0},
-	1028: {region: 0x164, script: 0x52, flags: 0x0},
-	1030: {region: 0xb9, script: 0xd2, flags: 0x0},
-	1031: {region: 0x164, script: 0x52, flags: 0x0},
-	1032: {region: 0xc3, script: 0x6b, flags: 0x0},
-	1033: {region: 0x164, script: 0x5, flags: 0x0},
-	1034: {region: 0xb2, script: 0xc1, flags: 0x0},
-	1035: {region: 0x6e, script: 0x52, flags: 0x0},
-	1036: {region: 0x164, script: 0x52, flags: 0x0},
-	1037: {region: 0x164, script: 0x52, flags: 0x0},
-	1038: {region: 0x164, script: 0x52, flags: 0x0},
-	1039: {region: 0x164, script: 0x52, flags: 0x0},
-	1040: {region: 0x110, script: 0x52, flags: 0x0},
-	1041: {region: 0x164, script: 0x52, flags: 0x0},
-	1042: {region: 0xe7, script: 0x5, flags: 0x0},
-	1043: {region: 0x164, script: 0x52, flags: 0x0},
-	1044: {region: 0x10e, script: 0x52, flags: 0x0},
-	1045: {region: 0x164, script: 0x52, flags: 0x0},
-	1046: {region: 0xe8, script: 0x52, flags: 0x0},
-	1047: {region: 0x164, script: 0x52, flags: 0x0},
-	1048: {region: 0x94, script: 0x52, flags: 0x0},
-	1049: {region: 0x141, script: 0x52, flags: 0x0},
-	1050: {region: 0x10b, script: 0x52, flags: 0x0},
-	1052: {region: 0x10b, script: 0x52, flags: 0x0},
-	1053: {region: 0x71, script: 0x52, flags: 0x0},
-	1054: {region: 0x96, script: 0xb8, flags: 0x0},
-	1055: {region: 0x164, script: 0x52, flags: 0x0},
-	1056: {region: 0x71, script: 0x52, flags: 0x0},
-	1057: {region: 0x163, script: 0x52, flags: 0x0},
-	1058: {region: 0x164, script: 0x52, flags: 0x0},
-	1059: {region: 0xc2, script: 0x52, flags: 0x0},
-	1060: {region: 0x164, script: 0x52, flags: 0x0},
-	1061: {region: 0x164, script: 0x52, flags: 0x0},
-	1062: {region: 0x164, script: 0x52, flags: 0x0},
-	1063: {region: 0x114, script: 0x52, flags: 0x0},
-	1064: {region: 0x164, script: 0x52, flags: 0x0},
-	1065: {region: 0x164, script: 0x52, flags: 0x0},
-	1066: {region: 0x122, script: 0xd5, flags: 0x0},
-	1067: {region: 0x164, script: 0x52, flags: 0x0},
-	1068: {region: 0x164, script: 0x52, flags: 0x0},
-	1069: {region: 0x164, script: 0x52, flags: 0x0},
-	1070: {region: 0x164, script: 0x52, flags: 0x0},
-	1071: {region: 0x26, script: 0x52, flags: 0x0},
-	1072: {region: 0x37, script: 0x5, flags: 0x1},
-	1073: {region: 0x98, script: 0xc2, flags: 0x0},
-	1074: {region: 0x115, script: 0x52, flags: 0x0},
-	1075: {region: 0x113, script: 0x52, flags: 0x0},
-	1076: {region: 0x98, script: 0x20, flags: 0x0},
-	1077: {region: 0x160, script: 0x52, flags: 0x0},
-	1078: {region: 0x164, script: 0x52, flags: 0x0},
-	1079: {region: 0x164, script: 0x52, flags: 0x0},
-	1080: {region: 0x6c, script: 0x52, flags: 0x0},
-	1081: {region: 0x160, script: 0x52, flags: 0x0},
-	1082: {region: 0x164, script: 0x52, flags: 0x0},
-	1083: {region: 0x5f, script: 0x52, flags: 0x0},
-	1084: {region: 0x94, script: 0x52, flags: 0x0},
-	1085: {region: 0x164, script: 0x52, flags: 0x0},
-	1086: {region: 0x164, script: 0x52, flags: 0x0},
-	1087: {region: 0x12e, script: 0x52, flags: 0x0},
-	1088: {region: 0x164, script: 0x52, flags: 0x0},
-	1089: {region: 0x83, script: 0x52, flags: 0x0},
-	1090: {region: 0x10b, script: 0x52, flags: 0x0},
-	1091: {region: 0x12e, script: 0x52, flags: 0x0},
-	1092: {region: 0x15e, script: 0x5, flags: 0x0},
-	1093: {region: 0x4a, script: 0x52, flags: 0x0},
-	1094: {region: 0x5f, script: 0x52, flags: 0x0},
-	1095: {region: 0x164, script: 0x52, flags: 0x0},
-	1096: {region: 0x98, script: 0x20, flags: 0x0},
-	1097: {region: 0x94, script: 0x52, flags: 0x0},
-	1098: {region: 0x164, script: 0x52, flags: 0x0},
-	1099: {region: 0x34, script: 0xe, flags: 0x0},
-	1100: {region: 0x9a, script: 0xc5, flags: 0x0},
-	1101: {region: 0xe8, script: 0x52, flags: 0x0},
-	1102: {region: 0x98, script: 0xcd, flags: 0x0},
-	1103: {region: 0xda, script: 0x20, flags: 0x0},
-	1104: {region: 0x164, script: 0x52, flags: 0x0},
-	1105: {region: 0x164, script: 0x52, flags: 0x0},
-	1106: {region: 0x164, script: 0x52, flags: 0x0},
-	1107: {region: 0x164, script: 0x52, flags: 0x0},
-	1108: {region: 0x164, script: 0x52, flags: 0x0},
-	1109: {region: 0x164, script: 0x52, flags: 0x0},
-	1110: {region: 0x164, script: 0x52, flags: 0x0},
-	1111: {region: 0x164, script: 0x52, flags: 0x0},
-	1112: {region: 0xe6, script: 0x52, flags: 0x0},
-	1113: {region: 0x164, script: 0x52, flags: 0x0},
-	1114: {region: 0x164, script: 0x52, flags: 0x0},
-	1115: {region: 0x98, script: 0x4a, flags: 0x0},
-	1116: {region: 0x52, script: 0xcb, flags: 0x0},
-	1117: {region: 0xda, script: 0x20, flags: 0x0},
-	1118: {region: 0xda, script: 0x20, flags: 0x0},
-	1119: {region: 0x98, script: 0xd0, flags: 0x0},
-	1120: {region: 0x164, script: 0x52, flags: 0x0},
-	1121: {region: 0x111, script: 0x52, flags: 0x0},
-	1122: {region: 0x130, script: 0x52, flags: 0x0},
-	1123: {region: 0x125, script: 0x52, flags: 0x0},
-	1124: {region: 0x164, script: 0x52, flags: 0x0},
-	1125: {region: 0x3c, script: 0x3, flags: 0x1},
-	1126: {region: 0x164, script: 0x52, flags: 0x0},
-	1127: {region: 0x164, script: 0x52, flags: 0x0},
-	1128: {region: 0x164, script: 0x52, flags: 0x0},
-	1129: {region: 0x122, script: 0xd5, flags: 0x0},
-	1130: {region: 0xda, script: 0x20, flags: 0x0},
-	1131: {region: 0xda, script: 0x20, flags: 0x0},
-	1132: {region: 0xda, script: 0x20, flags: 0x0},
-	1133: {region: 0x6e, script: 0x27, flags: 0x0},
-	1134: {region: 0x164, script: 0x52, flags: 0x0},
-	1135: {region: 0x6c, script: 0x27, flags: 0x0},
-	1136: {region: 0x164, script: 0x52, flags: 0x0},
-	1137: {region: 0x164, script: 0x52, flags: 0x0},
-	1138: {region: 0x164, script: 0x52, flags: 0x0},
-	1139: {region: 0xd5, script: 0x52, flags: 0x0},
-	1140: {region: 0x126, script: 0x52, flags: 0x0},
-	1141: {region: 0x124, script: 0x52, flags: 0x0},
-	1142: {region: 0x31, script: 0x52, flags: 0x0},
-	1143: {region: 0xda, script: 0x20, flags: 0x0},
-	1144: {region: 0xe6, script: 0x52, flags: 0x0},
-	1145: {region: 0x164, script: 0x52, flags: 0x0},
-	1146: {region: 0x164, script: 0x52, flags: 0x0},
-	1147: {region: 0x31, script: 0x52, flags: 0x0},
-	1148: {region: 0xd3, script: 0x52, flags: 0x0},
-	1149: {region: 0x164, script: 0x52, flags: 0x0},
-	1150: {region: 0x160, script: 0x52, flags: 0x0},
-	1151: {region: 0x164, script: 0x52, flags: 0x0},
-	1152: {region: 0x128, script: 0x52, flags: 0x0},
-	1153: {region: 0x164, script: 0x52, flags: 0x0},
-	1154: {region: 0xcd, script: 0x52, flags: 0x0},
-	1155: {region: 0x164, script: 0x52, flags: 0x0},
-	1156: {region: 0xe5, script: 0x52, flags: 0x0},
-	1157: {region: 0x164, script: 0x52, flags: 0x0},
-	1158: {region: 0x164, script: 0x52, flags: 0x0},
-	1159: {region: 0x164, script: 0x52, flags: 0x0},
-	1160: {region: 0x12a, script: 0x52, flags: 0x0},
-	1161: {region: 0x12a, script: 0x52, flags: 0x0},
-	1162: {region: 0x12d, script: 0x52, flags: 0x0},
-	1163: {region: 0x164, script: 0x5, flags: 0x0},
-	1164: {region: 0x160, script: 0x52, flags: 0x0},
-	1165: {region: 0x86, script: 0x2d, flags: 0x0},
-	1166: {region: 0xda, script: 0x20, flags: 0x0},
-	1167: {region: 0xe6, script: 0x52, flags: 0x0},
-	1168: {region: 0x42, script: 0xd6, flags: 0x0},
-	1169: {region: 0x164, script: 0x52, flags: 0x0},
-	1170: {region: 0x105, script: 0x1e, flags: 0x0},
-	1171: {region: 0x164, script: 0x52, flags: 0x0},
-	1172: {region: 0x164, script: 0x52, flags: 0x0},
-	1173: {region: 0x130, script: 0x52, flags: 0x0},
-	1174: {region: 0x164, script: 0x52, flags: 0x0},
-	1175: {region: 0x122, script: 0xd5, flags: 0x0},
-	1176: {region: 0x31, script: 0x52, flags: 0x0},
-	1177: {region: 0x164, script: 0x52, flags: 0x0},
-	1178: {region: 0x164, script: 0x52, flags: 0x0},
-	1179: {region: 0xcd, script: 0x52, flags: 0x0},
-	1180: {region: 0x164, script: 0x52, flags: 0x0},
-	1181: {region: 0x164, script: 0x52, flags: 0x0},
-	1182: {region: 0x12c, script: 0x52, flags: 0x0},
-	1183: {region: 0x164, script: 0x52, flags: 0x0},
-	1185: {region: 0x164, script: 0x52, flags: 0x0},
-	1186: {region: 0xd3, script: 0x52, flags: 0x0},
-	1187: {region: 0x52, script: 0xce, flags: 0x0},
-	1188: {region: 0xe4, script: 0x52, flags: 0x0},
-	1189: {region: 0x164, script: 0x52, flags: 0x0},
-	1190: {region: 0x105, script: 0x1e, flags: 0x0},
-	1191: {region: 0xb9, script: 0x52, flags: 0x0},
-	1192: {region: 0x164, script: 0x52, flags: 0x0},
-	1193: {region: 0x105, script: 0x1e, flags: 0x0},
-	1194: {region: 0x3f, script: 0x4, flags: 0x1},
-	1195: {region: 0x11b, script: 0xd8, flags: 0x0},
-	1196: {region: 0x12f, script: 0x1e, flags: 0x0},
-	1197: {region: 0x74, script: 0x52, flags: 0x0},
-	1198: {region: 0x29, script: 0x52, flags: 0x0},
-	1200: {region: 0x43, script: 0x3, flags: 0x1},
-	1201: {region: 0x98, script: 0xe, flags: 0x0},
-	1202: {region: 0xe7, script: 0x5, flags: 0x0},
-	1203: {region: 0x164, script: 0x52, flags: 0x0},
-	1204: {region: 0x164, script: 0x52, flags: 0x0},
-	1205: {region: 0x164, script: 0x52, flags: 0x0},
-	1206: {region: 0x164, script: 0x52, flags: 0x0},
-	1207: {region: 0x164, script: 0x52, flags: 0x0},
-	1208: {region: 0x164, script: 0x52, flags: 0x0},
-	1209: {region: 0x164, script: 0x52, flags: 0x0},
-	1210: {region: 0x46, script: 0x4, flags: 0x1},
-	1211: {region: 0x164, script: 0x52, flags: 0x0},
-	1212: {region: 0xb3, script: 0xd9, flags: 0x0},
-	1213: {region: 0x164, script: 0x52, flags: 0x0},
-	1214: {region: 0x160, script: 0x52, flags: 0x0},
-	1215: {region: 0x9d, script: 0x52, flags: 0x0},
-	1216: {region: 0x105, script: 0x52, flags: 0x0},
-	1217: {region: 0x13d, script: 0x52, flags: 0x0},
-	1218: {region: 0x11a, script: 0x52, flags: 0x0},
-	1219: {region: 0x164, script: 0x52, flags: 0x0},
-	1220: {region: 0x35, script: 0x52, flags: 0x0},
-	1221: {region: 0x5f, script: 0x52, flags: 0x0},
-	1222: {region: 0xd0, script: 0x52, flags: 0x0},
-	1223: {region: 0x1, script: 0x52, flags: 0x0},
-	1224: {region: 0x105, script: 0x52, flags: 0x0},
-	1225: {region: 0x69, script: 0x52, flags: 0x0},
-	1226: {region: 0x12e, script: 0x52, flags: 0x0},
-	1227: {region: 0x164, script: 0x52, flags: 0x0},
-	1228: {region: 0x35, script: 0x52, flags: 0x0},
-	1229: {region: 0x4d, script: 0x52, flags: 0x0},
-	1230: {region: 0x164, script: 0x52, flags: 0x0},
-	1231: {region: 0x6e, script: 0x27, flags: 0x0},
-	1232: {region: 0x164, script: 0x52, flags: 0x0},
-	1233: {region: 0xe6, script: 0x52, flags: 0x0},
-	1234: {region: 0x2e, script: 0x52, flags: 0x0},
-	1235: {region: 0x98, script: 0xd0, flags: 0x0},
-	1236: {region: 0x98, script: 0x20, flags: 0x0},
-	1237: {region: 0x164, script: 0x52, flags: 0x0},
-	1238: {region: 0x164, script: 0x52, flags: 0x0},
-	1239: {region: 0x164, script: 0x52, flags: 0x0},
-	1240: {region: 0x164, script: 0x52, flags: 0x0},
-	1241: {region: 0x164, script: 0x52, flags: 0x0},
-	1242: {region: 0x164, script: 0x52, flags: 0x0},
-	1243: {region: 0x164, script: 0x52, flags: 0x0},
-	1244: {region: 0x164, script: 0x52, flags: 0x0},
-	1245: {region: 0x164, script: 0x52, flags: 0x0},
-	1246: {region: 0x13f, script: 0x52, flags: 0x0},
-	1247: {region: 0x164, script: 0x52, flags: 0x0},
-	1248: {region: 0x164, script: 0x52, flags: 0x0},
-	1249: {region: 0xa7, script: 0x5, flags: 0x0},
-	1250: {region: 0x164, script: 0x52, flags: 0x0},
-	1251: {region: 0x113, script: 0x52, flags: 0x0},
-	1252: {region: 0x164, script: 0x52, flags: 0x0},
-	1253: {region: 0x164, script: 0x52, flags: 0x0},
-	1254: {region: 0x164, script: 0x52, flags: 0x0},
-	1255: {region: 0x164, script: 0x52, flags: 0x0},
-	1256: {region: 0x98, script: 0x20, flags: 0x0},
-	1257: {region: 0x52, script: 0x34, flags: 0x0},
-	1258: {region: 0x164, script: 0x52, flags: 0x0},
-	1259: {region: 0x164, script: 0x52, flags: 0x0},
-	1260: {region: 0x40, script: 0x52, flags: 0x0},
-	1261: {region: 0x164, script: 0x52, flags: 0x0},
-	1262: {region: 0x12a, script: 0x18, flags: 0x0},
-	1263: {region: 0x164, script: 0x52, flags: 0x0},
-	1264: {region: 0x160, script: 0x52, flags: 0x0},
-	1265: {region: 0x164, script: 0x52, flags: 0x0},
-	1266: {region: 0x12a, script: 0x5a, flags: 0x0},
-	1267: {region: 0x12a, script: 0x5b, flags: 0x0},
-	1268: {region: 0x7c, script: 0x29, flags: 0x0},
-	1269: {region: 0x52, script: 0x5e, flags: 0x0},
-	1270: {region: 0x10a, script: 0x62, flags: 0x0},
-	1271: {region: 0x107, script: 0x6c, flags: 0x0},
-	1272: {region: 0x98, script: 0x20, flags: 0x0},
-	1273: {region: 0x130, script: 0x52, flags: 0x0},
-	1274: {region: 0x164, script: 0x52, flags: 0x0},
-	1275: {region: 0x9b, script: 0x82, flags: 0x0},
-	1276: {region: 0x164, script: 0x52, flags: 0x0},
-	1277: {region: 0x15d, script: 0xba, flags: 0x0},
-	1278: {region: 0x164, script: 0x52, flags: 0x0},
-	1279: {region: 0x164, script: 0x52, flags: 0x0},
-	1280: {region: 0xda, script: 0x20, flags: 0x0},
-	1281: {region: 0x164, script: 0x52, flags: 0x0},
-	1282: {region: 0x164, script: 0x52, flags: 0x0},
-	1283: {region: 0xd0, script: 0x52, flags: 0x0},
-	1284: {region: 0x74, script: 0x52, flags: 0x0},
-	1285: {region: 0x164, script: 0x52, flags: 0x0},
-	1286: {region: 0x164, script: 0x52, flags: 0x0},
-	1287: {region: 0x51, script: 0x52, flags: 0x0},
-	1288: {region: 0x164, script: 0x52, flags: 0x0},
-	1289: {region: 0x164, script: 0x52, flags: 0x0},
-	1290: {region: 0x164, script: 0x52, flags: 0x0},
-	1291: {region: 0x51, script: 0x52, flags: 0x0},
-	1292: {region: 0x164, script: 0x52, flags: 0x0},
-	1293: {region: 0x164, script: 0x52, flags: 0x0},
-	1294: {region: 0x164, script: 0x52, flags: 0x0},
-	1295: {region: 0x164, script: 0x52, flags: 0x0},
-	1296: {region: 0x1, script: 0x37, flags: 0x0},
-	1297: {region: 0x164, script: 0x52, flags: 0x0},
-	1298: {region: 0x164, script: 0x52, flags: 0x0},
-	1299: {region: 0x164, script: 0x52, flags: 0x0},
-	1300: {region: 0x164, script: 0x52, flags: 0x0},
-	1301: {region: 0x164, script: 0x52, flags: 0x0},
-	1302: {region: 0xd5, script: 0x52, flags: 0x0},
-	1303: {region: 0x164, script: 0x52, flags: 0x0},
-	1304: {region: 0x164, script: 0x52, flags: 0x0},
-	1305: {region: 0x164, script: 0x52, flags: 0x0},
-	1306: {region: 0x40, script: 0x52, flags: 0x0},
-	1307: {region: 0x164, script: 0x52, flags: 0x0},
-	1308: {region: 0xce, script: 0x52, flags: 0x0},
-	1309: {region: 0x4a, script: 0x3, flags: 0x1},
-	1310: {region: 0x164, script: 0x52, flags: 0x0},
-	1311: {region: 0x164, script: 0x52, flags: 0x0},
-	1312: {region: 0x164, script: 0x52, flags: 0x0},
-	1313: {region: 0x52, script: 0x52, flags: 0x0},
-	1314: {region: 0x10a, script: 0x52, flags: 0x0},
-	1316: {region: 0xa7, script: 0x5, flags: 0x0},
-	1317: {region: 0xd8, script: 0x52, flags: 0x0},
-	1318: {region: 0xb9, script: 0xd2, flags: 0x0},
-	1319: {region: 0x4d, script: 0x14, flags: 0x1},
-	1320: {region: 0x164, script: 0x52, flags: 0x0},
-	1321: {region: 0x121, script: 0x52, flags: 0x0},
-	1322: {region: 0xcf, script: 0x52, flags: 0x0},
-	1323: {region: 0x164, script: 0x52, flags: 0x0},
-	1324: {region: 0x160, script: 0x52, flags: 0x0},
-	1326: {region: 0x12a, script: 0x52, flags: 0x0},
-}
-
-// likelyLangList holds lists info associated with likelyLang.
-// Size: 388 bytes, 97 elements
-var likelyLangList = [97]likelyScriptRegion{
-	0:  {region: 0x9b, script: 0x7, flags: 0x0},
-	1:  {region: 0xa0, script: 0x6d, flags: 0x2},
-	2:  {region: 0x11b, script: 0x78, flags: 0x2},
-	3:  {region: 0x31, script: 0x52, flags: 0x0},
-	4:  {region: 0x9a, script: 0x5, flags: 0x4},
-	5:  {region: 0x9b, script: 0x5, flags: 0x4},
-	6:  {region: 0x105, script: 0x1e, flags: 0x4},
-	7:  {region: 0x9b, script: 0x5, flags: 0x2},
-	8:  {region: 0x105, script: 0x1e, flags: 0x0},
-	9:  {region: 0x37, script: 0x2a, flags: 0x2},
-	10: {region: 0x134, script: 0x52, flags: 0x0},
-	11: {region: 0x7a, script: 0xbd, flags: 0x2},
-	12: {region: 0x113, script: 0x52, flags: 0x0},
-	13: {region: 0x83, script: 0x1, flags: 0x2},
-	14: {region: 0x5c, script: 0x1d, flags: 0x0},
-	15: {region: 0x86, script: 0x57, flags: 0x2},
-	16: {region: 0xd5, script: 0x52, flags: 0x0},
-	17: {region: 0x51, script: 0x5, flags: 0x4},
-	18: {region: 0x10a, script: 0x5, flags: 0x4},
-	19: {region: 0xad, script: 0x1e, flags: 0x0},
-	20: {region: 0x23, script: 0x5, flags: 0x4},
-	21: {region: 0x52, script: 0x5, flags: 0x4},
-	22: {region: 0x9b, script: 0x5, flags: 0x4},
-	23: {region: 0xc4, script: 0x5, flags: 0x4},
-	24: {region: 0x52, script: 0x5, flags: 0x2},
-	25: {region: 0x12a, script: 0x52, flags: 0x0},
-	26: {region: 0xaf, script: 0x5, flags: 0x4},
-	27: {region: 0x9a, script: 0x5, flags: 0x2},
-	28: {region: 0xa4, script: 0x1e, flags: 0x0},
-	29: {region: 0x52, script: 0x5, flags: 0x4},
-	30: {region: 0x12a, script: 0x52, flags: 0x4},
-	31: {region: 0x52, script: 0x5, flags: 0x2},
-	32: {region: 0x12a, script: 0x52, flags: 0x2},
-	33: {region: 0xda, script: 0x20, flags: 0x0},
-	34: {region: 0x98, script: 0x55, flags: 0x2},
-	35: {region: 0x82, script: 0x52, flags: 0x0},
-	36: {region: 0x83, script: 0x70, flags: 0x4},
-	37: {region: 0x83, script: 0x70, flags: 0x2},
-	38: {region: 0xc4, script: 0x1e, flags: 0x0},
-	39: {region: 0x52, script: 0x66, flags: 0x4},
-	40: {region: 0x52, script: 0x66, flags: 0x2},
-	41: {region: 0xcf, script: 0x52, flags: 0x0},
-	42: {region: 0x49, script: 0x5, flags: 0x4},
-	43: {region: 0x94, script: 0x5, flags: 0x4},
-	44: {region: 0x98, script: 0x2f, flags: 0x0},
-	45: {region: 0xe7, script: 0x5, flags: 0x4},
-	46: {region: 0xe7, script: 0x5, flags: 0x2},
-	47: {region: 0x9b, script: 0x7c, flags: 0x0},
-	48: {region: 0x52, script: 0x7d, flags: 0x2},
-	49: {region: 0xb9, script: 0xd2, flags: 0x0},
-	50: {region: 0xd8, script: 0x52, flags: 0x4},
-	51: {region: 0xe7, script: 0x5, flags: 0x0},
-	52: {region: 0x98, script: 0x20, flags: 0x2},
-	53: {region: 0x98, script: 0x47, flags: 0x2},
-	54: {region: 0x98, script: 0xc0, flags: 0x2},
-	55: {region: 0x104, script: 0x1e, flags: 0x0},
-	56: {region: 0xbc, script: 0x52, flags: 0x4},
-	57: {region: 0x103, script: 0x52, flags: 0x4},
-	58: {region: 0x105, script: 0x52, flags: 0x4},
-	59: {region: 0x12a, script: 0x52, flags: 0x4},
-	60: {region: 0x123, script: 0x1e, flags: 0x0},
-	61: {region: 0xe7, script: 0x5, flags: 0x4},
-	62: {region: 0xe7, script: 0x5, flags: 0x2},
-	63: {region: 0x52, script: 0x5, flags: 0x0},
-	64: {region: 0xad, script: 0x1e, flags: 0x4},
-	65: {region: 0xc4, script: 0x1e, flags: 0x4},
-	66: {region: 0xad, script: 0x1e, flags: 0x2},
-	67: {region: 0x98, script: 0xe, flags: 0x0},
-	68: {region: 0xda, script: 0x20, flags: 0x4},
-	69: {region: 0xda, script: 0x20, flags: 0x2},
-	70: {region: 0x136, script: 0x52, flags: 0x0},
-	71: {region: 0x23, script: 0x5, flags: 0x4},
-	72: {region: 0x52, script: 0x1e, flags: 0x4},
-	73: {region: 0x23, script: 0x5, flags: 0x2},
-	74: {region: 0x8c, script: 0x35, flags: 0x0},
-	75: {region: 0x52, script: 0x34, flags: 0x4},
-	76: {region: 0x52, script: 0x34, flags: 0x2},
-	77: {region: 0x52, script: 0x34, flags: 0x0},
-	78: {region: 0x2e, script: 0x35, flags: 0x4},
-	79: {region: 0x3d, script: 0x35, flags: 0x4},
-	80: {region: 0x7a, script: 0x35, flags: 0x4},
-	81: {region: 0x7d, script: 0x35, flags: 0x4},
-	82: {region: 0x8c, script: 0x35, flags: 0x4},
-	83: {region: 0x94, script: 0x35, flags: 0x4},
-	84: {region: 0xc5, script: 0x35, flags: 0x4},
-	85: {region: 0xcf, script: 0x35, flags: 0x4},
-	86: {region: 0xe1, script: 0x35, flags: 0x4},
-	87: {region: 0xe4, script: 0x35, flags: 0x4},
-	88: {region: 0xe6, script: 0x35, flags: 0x4},
-	89: {region: 0x115, script: 0x35, flags: 0x4},
-	90: {region: 0x122, script: 0x35, flags: 0x4},
-	91: {region: 0x12d, script: 0x35, flags: 0x4},
-	92: {region: 0x134, script: 0x35, flags: 0x4},
-	93: {region: 0x13d, script: 0x35, flags: 0x4},
-	94: {region: 0x12d, script: 0x11, flags: 0x2},
-	95: {region: 0x12d, script: 0x30, flags: 0x2},
-	96: {region: 0x12d, script: 0x35, flags: 0x2},
-}
-
-type likelyLangScript struct {
-	lang   uint16
-	script uint8
-	flags  uint8
-}
-
-// likelyRegion is a lookup table, indexed by regionID, for the most likely
-// languages and scripts given incomplete information. If more entries exist
-// for a given regionID, lang and script are the index and size respectively
-// of the list in likelyRegionList.
-// TODO: exclude containers and user-definable regions from the list.
-// Size: 1428 bytes, 357 elements
-var likelyRegion = [357]likelyLangScript{
-	33:  {lang: 0xd7, script: 0x52, flags: 0x0},
-	34:  {lang: 0x3a, script: 0x5, flags: 0x0},
-	35:  {lang: 0x0, script: 0x2, flags: 0x1},
-	38:  {lang: 0x2, script: 0x2, flags: 0x1},
-	39:  {lang: 0x4, script: 0x2, flags: 0x1},
-	41:  {lang: 0x3be, script: 0x52, flags: 0x0},
-	42:  {lang: 0x0, script: 0x52, flags: 0x0},
-	43:  {lang: 0x13d, script: 0x52, flags: 0x0},
-	44:  {lang: 0x419, script: 0x52, flags: 0x0},
-	45:  {lang: 0x10c, script: 0x52, flags: 0x0},
-	47:  {lang: 0x365, script: 0x52, flags: 0x0},
-	48:  {lang: 0x442, script: 0x52, flags: 0x0},
-	49:  {lang: 0x58, script: 0x52, flags: 0x0},
-	50:  {lang: 0x6, script: 0x2, flags: 0x1},
-	52:  {lang: 0xa5, script: 0xe, flags: 0x0},
-	53:  {lang: 0x365, script: 0x52, flags: 0x0},
-	54:  {lang: 0x15d, script: 0x52, flags: 0x0},
-	55:  {lang: 0x7e, script: 0x1e, flags: 0x0},
-	56:  {lang: 0x3a, script: 0x5, flags: 0x0},
-	57:  {lang: 0x3d7, script: 0x52, flags: 0x0},
-	58:  {lang: 0x15d, script: 0x52, flags: 0x0},
-	59:  {lang: 0x15d, script: 0x52, flags: 0x0},
-	61:  {lang: 0x31d, script: 0x52, flags: 0x0},
-	62:  {lang: 0x13d, script: 0x52, flags: 0x0},
-	63:  {lang: 0x39f, script: 0x52, flags: 0x0},
-	64:  {lang: 0x3be, script: 0x52, flags: 0x0},
-	66:  {lang: 0x8, script: 0x2, flags: 0x1},
-	68:  {lang: 0x0, script: 0x52, flags: 0x0},
-	70:  {lang: 0x71, script: 0x1e, flags: 0x0},
-	72:  {lang: 0x510, script: 0x37, flags: 0x2},
-	73:  {lang: 0x31d, script: 0x5, flags: 0x2},
-	74:  {lang: 0x443, script: 0x52, flags: 0x0},
-	75:  {lang: 0x15d, script: 0x52, flags: 0x0},
-	76:  {lang: 0x15d, script: 0x52, flags: 0x0},
-	77:  {lang: 0x10c, script: 0x52, flags: 0x0},
-	78:  {lang: 0x15d, script: 0x52, flags: 0x0},
-	80:  {lang: 0x13d, script: 0x52, flags: 0x0},
-	81:  {lang: 0x15d, script: 0x52, flags: 0x0},
-	82:  {lang: 0xa, script: 0x5, flags: 0x1},
-	83:  {lang: 0x13d, script: 0x52, flags: 0x0},
-	84:  {lang: 0x0, script: 0x52, flags: 0x0},
-	85:  {lang: 0x13d, script: 0x52, flags: 0x0},
-	88:  {lang: 0x13d, script: 0x52, flags: 0x0},
-	89:  {lang: 0x3be, script: 0x52, flags: 0x0},
-	90:  {lang: 0x39f, script: 0x52, flags: 0x0},
-	92:  {lang: 0xf, script: 0x2, flags: 0x1},
-	93:  {lang: 0xf9, script: 0x52, flags: 0x0},
-	95:  {lang: 0x10c, script: 0x52, flags: 0x0},
-	97:  {lang: 0x1, script: 0x52, flags: 0x0},
-	98:  {lang: 0x100, script: 0x52, flags: 0x0},
-	100: {lang: 0x13d, script: 0x52, flags: 0x0},
-	102: {lang: 0x11, script: 0x2, flags: 0x1},
-	103: {lang: 0x13d, script: 0x52, flags: 0x0},
-	104: {lang: 0x13d, script: 0x52, flags: 0x0},
-	105: {lang: 0x13f, script: 0x52, flags: 0x0},
-	106: {lang: 0x3a, script: 0x5, flags: 0x0},
-	107: {lang: 0x3a, script: 0x5, flags: 0x0},
-	108: {lang: 0x46d, script: 0x27, flags: 0x0},
-	109: {lang: 0x13d, script: 0x52, flags: 0x0},
-	110: {lang: 0x13, script: 0x2, flags: 0x1},
-	112: {lang: 0x10c, script: 0x52, flags: 0x0},
-	113: {lang: 0x150, script: 0x52, flags: 0x0},
-	114: {lang: 0x1be, script: 0x20, flags: 0x2},
-	117: {lang: 0x157, script: 0x52, flags: 0x0},
-	119: {lang: 0x15d, script: 0x52, flags: 0x0},
-	121: {lang: 0x15d, script: 0x52, flags: 0x0},
-	122: {lang: 0x15, script: 0x2, flags: 0x1},
-	124: {lang: 0x17, script: 0x3, flags: 0x1},
-	125: {lang: 0x15d, script: 0x52, flags: 0x0},
-	127: {lang: 0x21, script: 0x52, flags: 0x0},
-	129: {lang: 0x243, script: 0x52, flags: 0x0},
-	131: {lang: 0x15d, script: 0x52, flags: 0x0},
-	132: {lang: 0x15d, script: 0x52, flags: 0x0},
-	133: {lang: 0x13d, script: 0x52, flags: 0x0},
-	134: {lang: 0x1a, script: 0x2, flags: 0x1},
-	135: {lang: 0x0, script: 0x52, flags: 0x0},
-	136: {lang: 0x13d, script: 0x52, flags: 0x0},
-	138: {lang: 0x3be, script: 0x52, flags: 0x0},
-	140: {lang: 0x527, script: 0x35, flags: 0x0},
-	141: {lang: 0x0, script: 0x52, flags: 0x0},
-	142: {lang: 0x13d, script: 0x52, flags: 0x0},
-	143: {lang: 0x1cf, script: 0x52, flags: 0x0},
-	144: {lang: 0x1d2, script: 0x52, flags: 0x0},
-	145: {lang: 0x1d3, script: 0x52, flags: 0x0},
-	147: {lang: 0x13d, script: 0x52, flags: 0x0},
-	148: {lang: 0x1c, script: 0x2, flags: 0x1},
-	150: {lang: 0x1ba, script: 0x37, flags: 0x0},
-	152: {lang: 0x1e, script: 0x3, flags: 0x1},
-	154: {lang: 0x3a, script: 0x5, flags: 0x0},
-	155: {lang: 0x21, script: 0x2, flags: 0x1},
-	156: {lang: 0x1f6, script: 0x52, flags: 0x0},
-	157: {lang: 0x1f7, script: 0x52, flags: 0x0},
-	160: {lang: 0x3a, script: 0x5, flags: 0x0},
-	161: {lang: 0x1fe, script: 0x41, flags: 0x0},
-	163: {lang: 0x443, script: 0x52, flags: 0x0},
-	164: {lang: 0x288, script: 0x1e, flags: 0x0},
-	165: {lang: 0x23, script: 0x3, flags: 0x1},
-	167: {lang: 0x26, script: 0x2, flags: 0x1},
-	169: {lang: 0x252, script: 0x4b, flags: 0x0},
-	170: {lang: 0x252, script: 0x4b, flags: 0x0},
-	171: {lang: 0x3a, script: 0x5, flags: 0x0},
-	173: {lang: 0x3e0, script: 0x1e, flags: 0x0},
-	174: {lang: 0x28, script: 0x2, flags: 0x1},
-	175: {lang: 0x3a, script: 0x5, flags: 0x0},
-	177: {lang: 0x10c, script: 0x52, flags: 0x0},
-	178: {lang: 0x40a, script: 0xc1, flags: 0x0},
-	180: {lang: 0x439, script: 0x52, flags: 0x0},
-	181: {lang: 0x2be, script: 0x52, flags: 0x0},
-	182: {lang: 0x15d, script: 0x52, flags: 0x0},
-	183: {lang: 0x2c5, script: 0x52, flags: 0x0},
-	184: {lang: 0x3a, script: 0x5, flags: 0x0},
-	185: {lang: 0x2a, script: 0x2, flags: 0x1},
-	186: {lang: 0x15d, script: 0x52, flags: 0x0},
-	187: {lang: 0x2c, script: 0x2, flags: 0x1},
-	188: {lang: 0x430, script: 0x52, flags: 0x0},
-	189: {lang: 0x15d, script: 0x52, flags: 0x0},
-	190: {lang: 0x2ef, script: 0x52, flags: 0x0},
-	193: {lang: 0x2e, script: 0x2, flags: 0x1},
-	194: {lang: 0xa0, script: 0x52, flags: 0x0},
-	195: {lang: 0x30, script: 0x2, flags: 0x1},
-	196: {lang: 0x32, script: 0x2, flags: 0x1},
-	197: {lang: 0x34, script: 0x2, flags: 0x1},
-	199: {lang: 0x15d, script: 0x52, flags: 0x0},
-	200: {lang: 0x36, script: 0x2, flags: 0x1},
-	202: {lang: 0x31e, script: 0x52, flags: 0x0},
-	203: {lang: 0x38, script: 0x3, flags: 0x1},
-	204: {lang: 0x127, script: 0xd4, flags: 0x0},
-	206: {lang: 0x13d, script: 0x52, flags: 0x0},
-	207: {lang: 0x31d, script: 0x52, flags: 0x0},
-	208: {lang: 0x3be, script: 0x52, flags: 0x0},
-	209: {lang: 0x16, script: 0x52, flags: 0x0},
-	210: {lang: 0x15d, script: 0x52, flags: 0x0},
-	211: {lang: 0x1b2, script: 0x52, flags: 0x0},
-	213: {lang: 0x1b2, script: 0x5, flags: 0x2},
-	215: {lang: 0x13d, script: 0x52, flags: 0x0},
-	216: {lang: 0x365, script: 0x52, flags: 0x0},
-	217: {lang: 0x345, script: 0x52, flags: 0x0},
-	218: {lang: 0x34f, script: 0x20, flags: 0x0},
-	224: {lang: 0x3a, script: 0x5, flags: 0x0},
-	225: {lang: 0x13d, script: 0x52, flags: 0x0},
-	227: {lang: 0x13d, script: 0x52, flags: 0x0},
-	228: {lang: 0x15d, script: 0x52, flags: 0x0},
-	229: {lang: 0x484, script: 0x52, flags: 0x0},
-	230: {lang: 0x152, script: 0x52, flags: 0x0},
-	231: {lang: 0x3b, script: 0x3, flags: 0x1},
-	232: {lang: 0x3b1, script: 0x52, flags: 0x0},
-	233: {lang: 0x15d, script: 0x52, flags: 0x0},
-	235: {lang: 0x13d, script: 0x52, flags: 0x0},
-	236: {lang: 0x3a, script: 0x5, flags: 0x0},
-	237: {lang: 0x3be, script: 0x52, flags: 0x0},
-	239: {lang: 0x3a0, script: 0x52, flags: 0x0},
-	240: {lang: 0x192, script: 0x52, flags: 0x0},
-	242: {lang: 0x3a, script: 0x5, flags: 0x0},
-	257: {lang: 0x15d, script: 0x52, flags: 0x0},
-	259: {lang: 0x3e, script: 0x2, flags: 0x1},
-	260: {lang: 0x430, script: 0x1e, flags: 0x0},
-	261: {lang: 0x40, script: 0x2, flags: 0x1},
-	262: {lang: 0x3e3, script: 0x52, flags: 0x0},
-	263: {lang: 0x3a, script: 0x5, flags: 0x0},
-	265: {lang: 0x15d, script: 0x52, flags: 0x0},
-	266: {lang: 0x3a, script: 0x5, flags: 0x0},
-	267: {lang: 0x42, script: 0x2, flags: 0x1},
-	270: {lang: 0x414, script: 0x52, flags: 0x0},
-	271: {lang: 0x345, script: 0x52, flags: 0x0},
-	272: {lang: 0x44, script: 0x2, flags: 0x1},
-	274: {lang: 0x1f7, script: 0x52, flags: 0x0},
-	275: {lang: 0x15d, script: 0x52, flags: 0x0},
-	276: {lang: 0x427, script: 0x52, flags: 0x0},
-	277: {lang: 0x365, script: 0x52, flags: 0x0},
-	279: {lang: 0x3be, script: 0x52, flags: 0x0},
-	281: {lang: 0x13d, script: 0x52, flags: 0x0},
-	283: {lang: 0x46, script: 0x2, flags: 0x1},
-	287: {lang: 0x15d, script: 0x52, flags: 0x0},
-	288: {lang: 0x15d, script: 0x52, flags: 0x0},
-	289: {lang: 0x48, script: 0x2, flags: 0x1},
-	290: {lang: 0x4a, script: 0x3, flags: 0x1},
-	291: {lang: 0x4d, script: 0x2, flags: 0x1},
-	292: {lang: 0x475, script: 0x52, flags: 0x0},
-	293: {lang: 0x3be, script: 0x52, flags: 0x0},
-	294: {lang: 0x474, script: 0x52, flags: 0x0},
-	295: {lang: 0x4f, script: 0x2, flags: 0x1},
-	296: {lang: 0x480, script: 0x52, flags: 0x0},
-	298: {lang: 0x51, script: 0x4, flags: 0x1},
-	300: {lang: 0x49e, script: 0x52, flags: 0x0},
-	301: {lang: 0x55, script: 0x2, flags: 0x1},
-	302: {lang: 0x443, script: 0x52, flags: 0x0},
-	303: {lang: 0x57, script: 0x3, flags: 0x1},
-	304: {lang: 0x443, script: 0x52, flags: 0x0},
-	308: {lang: 0x510, script: 0x37, flags: 0x2},
-	309: {lang: 0x13d, script: 0x52, flags: 0x0},
-	310: {lang: 0x4ba, script: 0x52, flags: 0x0},
-	311: {lang: 0x1f7, script: 0x52, flags: 0x0},
-	314: {lang: 0x13d, script: 0x52, flags: 0x0},
-	317: {lang: 0x4c1, script: 0x52, flags: 0x0},
-	318: {lang: 0x8a, script: 0x52, flags: 0x0},
-	319: {lang: 0x15d, script: 0x52, flags: 0x0},
-	321: {lang: 0x419, script: 0x52, flags: 0x0},
-	332: {lang: 0x5a, script: 0x2, flags: 0x1},
-	349: {lang: 0x3a, script: 0x5, flags: 0x0},
-	350: {lang: 0x5c, script: 0x2, flags: 0x1},
-	355: {lang: 0x421, script: 0x52, flags: 0x0},
-}
-
-// likelyRegionList holds lists info associated with likelyRegion.
-// Size: 376 bytes, 94 elements
-var likelyRegionList = [94]likelyLangScript{
-	0:  {lang: 0x147, script: 0x5, flags: 0x0},
-	1:  {lang: 0x474, script: 0x52, flags: 0x0},
-	2:  {lang: 0x42f, script: 0x52, flags: 0x0},
-	3:  {lang: 0x2fd, script: 0x1e, flags: 0x0},
-	4:  {lang: 0x1d5, script: 0x8, flags: 0x0},
-	5:  {lang: 0x272, script: 0x52, flags: 0x0},
-	6:  {lang: 0xb7, script: 0x52, flags: 0x0},
-	7:  {lang: 0x430, script: 0x1e, flags: 0x0},
-	8:  {lang: 0x12c, script: 0xd6, flags: 0x0},
-	9:  {lang: 0x34f, script: 0x20, flags: 0x0},
-	10: {lang: 0x527, script: 0x34, flags: 0x0},
-	11: {lang: 0x4aa, script: 0x5, flags: 0x0},
-	12: {lang: 0x51d, script: 0x35, flags: 0x0},
-	13: {lang: 0x521, script: 0x52, flags: 0x0},
-	14: {lang: 0x298, script: 0xd5, flags: 0x0},
-	15: {lang: 0x135, script: 0x2d, flags: 0x0},
-	16: {lang: 0x488, script: 0x52, flags: 0x0},
-	17: {lang: 0x3a, script: 0x5, flags: 0x0},
-	18: {lang: 0x15d, script: 0x52, flags: 0x0},
-	19: {lang: 0x27, script: 0x27, flags: 0x0},
-	20: {lang: 0x138, script: 0x52, flags: 0x0},
-	21: {lang: 0x268, script: 0x5, flags: 0x2},
-	22: {lang: 0x510, script: 0x37, flags: 0x2},
-	23: {lang: 0x20e, script: 0x29, flags: 0x0},
-	24: {lang: 0x5, script: 0x1e, flags: 0x0},
-	25: {lang: 0x272, script: 0x52, flags: 0x0},
-	26: {lang: 0x135, script: 0x2d, flags: 0x0},
-	27: {lang: 0x2fd, script: 0x1e, flags: 0x0},
-	28: {lang: 0x1df, script: 0x52, flags: 0x0},
-	29: {lang: 0x31d, script: 0x5, flags: 0x0},
-	30: {lang: 0x1bc, script: 0x20, flags: 0x0},
-	31: {lang: 0x4b2, script: 0x5, flags: 0x0},
-	32: {lang: 0x234, script: 0x6b, flags: 0x0},
-	33: {lang: 0x147, script: 0x5, flags: 0x0},
-	34: {lang: 0x474, script: 0x52, flags: 0x0},
-	35: {lang: 0x248, script: 0x46, flags: 0x0},
-	36: {lang: 0xe6, script: 0x5, flags: 0x0},
-	37: {lang: 0x224, script: 0xd5, flags: 0x0},
-	38: {lang: 0x3a, script: 0x5, flags: 0x0},
-	39: {lang: 0x15d, script: 0x52, flags: 0x0},
-	40: {lang: 0x2b6, script: 0x4f, flags: 0x0},
-	41: {lang: 0x224, script: 0xd5, flags: 0x0},
-	42: {lang: 0x3a, script: 0x5, flags: 0x0},
-	43: {lang: 0x15d, script: 0x52, flags: 0x0},
-	44: {lang: 0x3da, script: 0x52, flags: 0x0},
-	45: {lang: 0x4ac, script: 0x1e, flags: 0x0},
-	46: {lang: 0x2fd, script: 0x1e, flags: 0x0},
-	47: {lang: 0x42f, script: 0x52, flags: 0x0},
-	48: {lang: 0x32f, script: 0x6b, flags: 0x0},
-	49: {lang: 0x211, script: 0x52, flags: 0x0},
-	50: {lang: 0x309, script: 0x1e, flags: 0x0},
-	51: {lang: 0x240, script: 0x5, flags: 0x0},
-	52: {lang: 0x527, script: 0x35, flags: 0x0},
-	53: {lang: 0x3be, script: 0x52, flags: 0x0},
-	54: {lang: 0x3a, script: 0x5, flags: 0x0},
-	55: {lang: 0x15d, script: 0x52, flags: 0x0},
-	56: {lang: 0x2eb, script: 0x52, flags: 0x0},
-	57: {lang: 0x4b2, script: 0x5, flags: 0x0},
-	58: {lang: 0x88, script: 0x20, flags: 0x0},
-	59: {lang: 0x4b2, script: 0x5, flags: 0x0},
-	60: {lang: 0x4b2, script: 0x5, flags: 0x0},
-	61: {lang: 0xbe, script: 0x20, flags: 0x0},
-	62: {lang: 0x3da, script: 0x52, flags: 0x0},
-	63: {lang: 0x7e, script: 0x1e, flags: 0x0},
-	64: {lang: 0x3e0, script: 0x1e, flags: 0x0},
-	65: {lang: 0x265, script: 0x52, flags: 0x0},
-	66: {lang: 0x442, script: 0x52, flags: 0x0},
-	67: {lang: 0x510, script: 0x37, flags: 0x0},
-	68: {lang: 0x410, script: 0x52, flags: 0x0},
-	69: {lang: 0x4ac, script: 0x1e, flags: 0x0},
-	70: {lang: 0x3a, script: 0x5, flags: 0x0},
-	71: {lang: 0x15d, script: 0x52, flags: 0x0},
-	72: {lang: 0x15d, script: 0x52, flags: 0x0},
-	73: {lang: 0x35, script: 0x5, flags: 0x0},
-	74: {lang: 0x469, script: 0xd5, flags: 0x0},
-	75: {lang: 0x2ea, script: 0x5, flags: 0x0},
-	76: {lang: 0x30d, script: 0x6b, flags: 0x0},
-	77: {lang: 0x465, script: 0x1e, flags: 0x0},
-	78: {lang: 0x147, script: 0x5, flags: 0x0},
-	79: {lang: 0x3a, script: 0x5, flags: 0x0},
-	80: {lang: 0x15d, script: 0x52, flags: 0x0},
-	81: {lang: 0x488, script: 0x52, flags: 0x0},
-	82: {lang: 0x58, script: 0x5, flags: 0x0},
-	83: {lang: 0x217, script: 0x1e, flags: 0x0},
-	84: {lang: 0x81, script: 0x2d, flags: 0x0},
-	85: {lang: 0x527, script: 0x35, flags: 0x0},
-	86: {lang: 0x48a, script: 0x52, flags: 0x0},
-	87: {lang: 0x4ac, script: 0x1e, flags: 0x0},
-	88: {lang: 0x510, script: 0x37, flags: 0x0},
-	89: {lang: 0x3b1, script: 0x52, flags: 0x0},
-	90: {lang: 0x42f, script: 0x52, flags: 0x0},
-	91: {lang: 0x430, script: 0x1e, flags: 0x0},
-	92: {lang: 0x15d, script: 0x52, flags: 0x0},
-	93: {lang: 0x444, script: 0x5, flags: 0x0},
-}
-
-type likelyTag struct {
-	lang   uint16
-	region uint16
-	script uint8
-}
-
-// Size: 192 bytes, 32 elements
-var likelyRegionGroup = [32]likelyTag{
-	1:  {lang: 0x138, region: 0xd5, script: 0x52},
-	2:  {lang: 0x138, region: 0x134, script: 0x52},
-	3:  {lang: 0x3be, region: 0x40, script: 0x52},
-	4:  {lang: 0x138, region: 0x2e, script: 0x52},
-	5:  {lang: 0x138, region: 0xd5, script: 0x52},
-	6:  {lang: 0x13d, region: 0xce, script: 0x52},
-	7:  {lang: 0x443, region: 0x12e, script: 0x52},
-	8:  {lang: 0x3a, region: 0x6a, script: 0x5},
-	9:  {lang: 0x443, region: 0x4a, script: 0x52},
-	10: {lang: 0x138, region: 0x160, script: 0x52},
-	11: {lang: 0x138, region: 0x134, script: 0x52},
-	12: {lang: 0x138, region: 0x134, script: 0x52},
-	13: {lang: 0x13d, region: 0x58, script: 0x52},
-	14: {lang: 0x527, region: 0x52, script: 0x34},
-	15: {lang: 0x1bc, region: 0x98, script: 0x20},
-	16: {lang: 0x1df, region: 0x94, script: 0x52},
-	17: {lang: 0x1f7, region: 0x9d, script: 0x52},
-	18: {lang: 0x138, region: 0x2e, script: 0x52},
-	19: {lang: 0x138, region: 0xe5, script: 0x52},
-	20: {lang: 0x138, region: 0x89, script: 0x52},
-	21: {lang: 0x419, region: 0x141, script: 0x52},
-	22: {lang: 0x527, region: 0x52, script: 0x34},
-	23: {lang: 0x4ba, region: 0x136, script: 0x52},
-	24: {lang: 0x3a, region: 0x107, script: 0x5},
-	25: {lang: 0x3e0, region: 0x105, script: 0x1e},
-	26: {lang: 0x3e0, region: 0x105, script: 0x1e},
-	27: {lang: 0x138, region: 0x7a, script: 0x52},
-	28: {lang: 0x10c, region: 0x5f, script: 0x52},
-	29: {lang: 0x13d, region: 0x1e, script: 0x52},
-	30: {lang: 0x138, region: 0x99, script: 0x52},
-	31: {lang: 0x138, region: 0x7a, script: 0x52},
-}
-
-// Size: 357 bytes, 357 elements
-var regionToGroups = [357]uint8{
-	// Entry 0 - 3F
-	0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x04,
-	0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00,
-	0x04, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0x04,
-	0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x04, 0x04,
-	// Entry 40 - 7F
-	0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
-	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00,
-	0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x08, 0x00,
-	0x04, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00,
-	// Entry 80 - BF
-	0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-	0x04, 0x01, 0x00, 0x04, 0x02, 0x00, 0x04, 0x00,
-	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x08, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01,
-	// Entry C0 - FF
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x04,
-	0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x04, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	// Entry 100 - 13F
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
-	0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
-	0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x01, 0x00, 0x05, 0x04, 0x00, 0x00,
-	0x04, 0x00, 0x04, 0x04, 0x05, 0x00, 0x00, 0x00,
-	// Entry 140 - 17F
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00,
-}
-
-type mutualIntelligibility struct {
-	want     uint16
-	have     uint16
-	distance uint8
-	oneway   bool
-}
-
-type scriptIntelligibility struct {
-	wantLang   uint16
-	haveLang   uint16
-	wantScript uint8
-	haveScript uint8
-	distance   uint8
-}
-
-type regionIntelligibility struct {
-	lang     uint16
-	script   uint8
-	group    uint8
-	distance uint8
-}
-
-// matchLang holds pairs of langIDs of base languages that are typically
-// mutually intelligible. Each pair is associated with a confidence and
-// whether the intelligibility goes one or both ways.
-// Size: 690 bytes, 115 elements
-var matchLang = [115]mutualIntelligibility{
-	0:   {want: 0x1cf, have: 0xb7, distance: 0x4, oneway: false},
-	1:   {want: 0x405, have: 0xb7, distance: 0x4, oneway: false},
-	2:   {want: 0x405, have: 0x1cf, distance: 0x4, oneway: false},
-	3:   {want: 0x405, have: 0x430, distance: 0x4, oneway: false},
-	4:   {want: 0x438, have: 0x1, distance: 0x4, oneway: false},
-	5:   {want: 0x1a1, have: 0x10c, distance: 0x4, oneway: true},
-	6:   {want: 0x293, have: 0x10c, distance: 0x4, oneway: true},
-	7:   {want: 0x430, have: 0x1cf, distance: 0x5, oneway: false},
-	8:   {want: 0x430, have: 0xb7, distance: 0x5, oneway: false},
-	9:   {want: 0x100, have: 0x36d, distance: 0x8, oneway: false},
-	10:  {want: 0x100, have: 0x345, distance: 0x8, oneway: false},
-	11:  {want: 0x5, have: 0x3e0, distance: 0xa, oneway: true},
-	12:  {want: 0xd, have: 0x138, distance: 0xa, oneway: true},
-	13:  {want: 0x16, have: 0x365, distance: 0xa, oneway: true},
-	14:  {want: 0x21, have: 0x138, distance: 0xa, oneway: true},
-	15:  {want: 0x56, have: 0x13d, distance: 0xa, oneway: true},
-	16:  {want: 0x58, have: 0x3e0, distance: 0xa, oneway: true},
-	17:  {want: 0x71, have: 0x3e0, distance: 0xa, oneway: true},
-	18:  {want: 0x75, have: 0x138, distance: 0xa, oneway: true},
-	19:  {want: 0x82, have: 0x1bc, distance: 0xa, oneway: true},
-	20:  {want: 0xa5, have: 0x138, distance: 0xa, oneway: true},
-	21:  {want: 0xb2, have: 0x15d, distance: 0xa, oneway: true},
-	22:  {want: 0xdd, have: 0x152, distance: 0xa, oneway: true},
-	23:  {want: 0xe5, have: 0x138, distance: 0xa, oneway: true},
-	24:  {want: 0xe9, have: 0x3a, distance: 0xa, oneway: true},
-	25:  {want: 0xef, have: 0x15d, distance: 0xa, oneway: true},
-	26:  {want: 0xf8, have: 0x15d, distance: 0xa, oneway: true},
-	27:  {want: 0xff, have: 0x138, distance: 0xa, oneway: true},
-	28:  {want: 0x12f, have: 0x138, distance: 0xa, oneway: true},
-	29:  {want: 0x13b, have: 0x138, distance: 0xa, oneway: true},
-	30:  {want: 0x13f, have: 0x150, distance: 0xa, oneway: true},
-	31:  {want: 0x144, have: 0x13d, distance: 0xa, oneway: true},
-	32:  {want: 0x157, have: 0x100, distance: 0xa, oneway: true},
-	33:  {want: 0x16c, have: 0x365, distance: 0xa, oneway: true},
-	34:  {want: 0x16d, have: 0x138, distance: 0xa, oneway: true},
-	35:  {want: 0x16e, have: 0x138, distance: 0xa, oneway: true},
-	36:  {want: 0x17c, have: 0x138, distance: 0xa, oneway: true},
-	37:  {want: 0x18e, have: 0x13d, distance: 0xa, oneway: true},
-	38:  {want: 0x192, have: 0x13d, distance: 0xa, oneway: true},
-	39:  {want: 0x1a2, have: 0x1bc, distance: 0xa, oneway: true},
-	40:  {want: 0x1b2, have: 0x138, distance: 0xa, oneway: true},
-	41:  {want: 0x1b6, have: 0x138, distance: 0xa, oneway: true},
-	42:  {want: 0x1d2, have: 0x15d, distance: 0xa, oneway: true},
-	43:  {want: 0x1d5, have: 0x3e0, distance: 0xa, oneway: true},
-	44:  {want: 0x1d7, have: 0x138, distance: 0xa, oneway: true},
-	45:  {want: 0x1e5, have: 0x138, distance: 0xa, oneway: true},
-	46:  {want: 0x1f6, have: 0x138, distance: 0xa, oneway: true},
-	47:  {want: 0x20c, have: 0x1df, distance: 0xa, oneway: true},
-	48:  {want: 0x20e, have: 0x138, distance: 0xa, oneway: true},
-	49:  {want: 0x22b, have: 0x15d, distance: 0xa, oneway: true},
-	50:  {want: 0x240, have: 0x3e0, distance: 0xa, oneway: true},
-	51:  {want: 0x248, have: 0x138, distance: 0xa, oneway: true},
-	52:  {want: 0x24f, have: 0x138, distance: 0xa, oneway: true},
-	53:  {want: 0x263, have: 0x138, distance: 0xa, oneway: true},
-	54:  {want: 0x272, have: 0x488, distance: 0xa, oneway: true},
-	55:  {want: 0x288, have: 0x3e0, distance: 0xa, oneway: true},
-	56:  {want: 0x28c, have: 0x1f7, distance: 0xa, oneway: true},
-	57:  {want: 0x2a1, have: 0x138, distance: 0xa, oneway: true},
-	58:  {want: 0x2b3, have: 0x15d, distance: 0xa, oneway: true},
-	59:  {want: 0x2b6, have: 0x138, distance: 0xa, oneway: true},
-	60:  {want: 0x2bc, have: 0x138, distance: 0xa, oneway: true},
-	61:  {want: 0x2c1, have: 0x15d, distance: 0xa, oneway: true},
-	62:  {want: 0x2eb, have: 0x138, distance: 0xa, oneway: true},
-	63:  {want: 0x2ef, have: 0x15d, distance: 0xa, oneway: true},
-	64:  {want: 0x2f8, have: 0x138, distance: 0xa, oneway: true},
-	65:  {want: 0x2fd, have: 0x7e, distance: 0xa, oneway: true},
-	66:  {want: 0x302, have: 0x138, distance: 0xa, oneway: true},
-	67:  {want: 0x309, have: 0x3e0, distance: 0xa, oneway: true},
-	68:  {want: 0x319, have: 0x1bc, distance: 0xa, oneway: true},
-	69:  {want: 0x31d, have: 0x1df, distance: 0xa, oneway: true},
-	70:  {want: 0x31e, have: 0x138, distance: 0xa, oneway: true},
-	71:  {want: 0x32f, have: 0x138, distance: 0xa, oneway: true},
-	72:  {want: 0x34f, have: 0x138, distance: 0xa, oneway: true},
-	73:  {want: 0x368, have: 0x345, distance: 0xa, oneway: false},
-	74:  {want: 0x368, have: 0x36d, distance: 0xa, oneway: true},
-	75:  {want: 0x378, have: 0x138, distance: 0xa, oneway: true},
-	76:  {want: 0x385, have: 0x138, distance: 0xa, oneway: true},
-	77:  {want: 0x387, have: 0x138, distance: 0xa, oneway: true},
-	78:  {want: 0x389, have: 0x15d, distance: 0xa, oneway: true},
-	79:  {want: 0x38e, have: 0x138, distance: 0xa, oneway: true},
-	80:  {want: 0x393, have: 0x138, distance: 0xa, oneway: true},
-	81:  {want: 0x39b, have: 0x138, distance: 0xa, oneway: true},
-	82:  {want: 0x3a3, have: 0x138, distance: 0xa, oneway: true},
-	83:  {want: 0x3bc, have: 0x138, distance: 0xa, oneway: true},
-	84:  {want: 0x3c2, have: 0x13d, distance: 0xa, oneway: true},
-	85:  {want: 0x3d2, have: 0x10c, distance: 0xa, oneway: true},
-	86:  {want: 0x3d7, have: 0x138, distance: 0xa, oneway: true},
-	87:  {want: 0x3e3, have: 0x15d, distance: 0xa, oneway: true},
-	88:  {want: 0x3e7, have: 0x1bc, distance: 0xa, oneway: true},
-	89:  {want: 0x3f8, have: 0x138, distance: 0xa, oneway: true},
-	90:  {want: 0x40a, have: 0x138, distance: 0xa, oneway: true},
-	91:  {want: 0x421, have: 0x138, distance: 0xa, oneway: true},
-	92:  {want: 0x427, have: 0x138, distance: 0xa, oneway: true},
-	93:  {want: 0x42f, have: 0x138, distance: 0xa, oneway: true},
-	94:  {want: 0x439, have: 0x138, distance: 0xa, oneway: true},
-	95:  {want: 0x43c, have: 0x1df, distance: 0xa, oneway: true},
-	96:  {want: 0x443, have: 0x138, distance: 0xa, oneway: true},
-	97:  {want: 0x44e, have: 0x138, distance: 0xa, oneway: true},
-	98:  {want: 0x45f, have: 0x138, distance: 0xa, oneway: true},
-	99:  {want: 0x465, have: 0x3e0, distance: 0xa, oneway: true},
-	100: {want: 0x46d, have: 0x138, distance: 0xa, oneway: true},
-	101: {want: 0x474, have: 0x3e0, distance: 0xa, oneway: true},
-	102: {want: 0x3880, have: 0x138, distance: 0xa, oneway: true},
-	103: {want: 0x47e, have: 0x138, distance: 0xa, oneway: true},
-	104: {want: 0x480, have: 0x138, distance: 0xa, oneway: true},
-	105: {want: 0x492, have: 0x3e0, distance: 0xa, oneway: true},
-	106: {want: 0x49b, have: 0x138, distance: 0xa, oneway: true},
-	107: {want: 0x4aa, have: 0x527, distance: 0xa, oneway: true},
-	108: {want: 0x4b2, have: 0x138, distance: 0xa, oneway: true},
-	109: {want: 0x4ba, have: 0x3e0, distance: 0xa, oneway: true},
-	110: {want: 0x4e3, have: 0x15d, distance: 0xa, oneway: true},
-	111: {want: 0x4f0, have: 0x138, distance: 0xa, oneway: true},
-	112: {want: 0x510, have: 0x138, distance: 0xa, oneway: true},
-	113: {want: 0x516, have: 0x138, distance: 0xa, oneway: true},
-	114: {want: 0x52c, have: 0x138, distance: 0xa, oneway: true},
-}
-
-// matchScript holds pairs of scriptIDs where readers of one script
-// can typically also read the other. Each is associated with a confidence.
-// Size: 208 bytes, 26 elements
-var matchScript = [26]scriptIntelligibility{
-	0:  {wantLang: 0x430, haveLang: 0x430, wantScript: 0x52, haveScript: 0x1e, distance: 0x5},
-	1:  {wantLang: 0x430, haveLang: 0x430, wantScript: 0x1e, haveScript: 0x52, distance: 0x5},
-	2:  {wantLang: 0x58, haveLang: 0x3e0, wantScript: 0x52, haveScript: 0x1e, distance: 0xa},
-	3:  {wantLang: 0xa5, haveLang: 0x138, wantScript: 0xe, haveScript: 0x52, distance: 0xa},
-	4:  {wantLang: 0x1d5, haveLang: 0x3e0, wantScript: 0x8, haveScript: 0x1e, distance: 0xa},
-	5:  {wantLang: 0x20e, haveLang: 0x138, wantScript: 0x29, haveScript: 0x52, distance: 0xa},
-	6:  {wantLang: 0x248, haveLang: 0x138, wantScript: 0x46, haveScript: 0x52, distance: 0xa},
-	7:  {wantLang: 0x24f, haveLang: 0x138, wantScript: 0x4a, haveScript: 0x52, distance: 0xa},
-	8:  {wantLang: 0x2b6, haveLang: 0x138, wantScript: 0x4f, haveScript: 0x52, distance: 0xa},
-	9:  {wantLang: 0x302, haveLang: 0x138, wantScript: 0x64, haveScript: 0x52, distance: 0xa},
-	10: {wantLang: 0x32f, haveLang: 0x138, wantScript: 0x6b, haveScript: 0x52, distance: 0xa},
-	11: {wantLang: 0x34f, haveLang: 0x138, wantScript: 0x20, haveScript: 0x52, distance: 0xa},
-	12: {wantLang: 0x393, haveLang: 0x138, wantScript: 0x75, haveScript: 0x52, distance: 0xa},
-	13: {wantLang: 0x39b, haveLang: 0x138, wantScript: 0x2f, haveScript: 0x52, distance: 0xa},
-	14: {wantLang: 0x3bc, haveLang: 0x138, wantScript: 0x5, haveScript: 0x52, distance: 0xa},
-	15: {wantLang: 0x3f8, haveLang: 0x138, wantScript: 0x5, haveScript: 0x52, distance: 0xa},
-	16: {wantLang: 0x40a, haveLang: 0x138, wantScript: 0xc1, haveScript: 0x52, distance: 0xa},
-	17: {wantLang: 0x44e, haveLang: 0x138, wantScript: 0xcd, haveScript: 0x52, distance: 0xa},
-	18: {wantLang: 0x45f, haveLang: 0x138, wantScript: 0xd0, haveScript: 0x52, distance: 0xa},
-	19: {wantLang: 0x46d, haveLang: 0x138, wantScript: 0x27, haveScript: 0x52, distance: 0xa},
-	20: {wantLang: 0x474, haveLang: 0x3e0, wantScript: 0x52, haveScript: 0x1e, distance: 0xa},
-	21: {wantLang: 0x4b2, haveLang: 0x138, wantScript: 0x5, haveScript: 0x52, distance: 0xa},
-	22: {wantLang: 0x4ba, haveLang: 0x3e0, wantScript: 0x52, haveScript: 0x1e, distance: 0xa},
-	23: {wantLang: 0x510, haveLang: 0x138, wantScript: 0x37, haveScript: 0x52, distance: 0xa},
-	24: {wantLang: 0x527, haveLang: 0x527, wantScript: 0x34, haveScript: 0x35, distance: 0xf},
-	25: {wantLang: 0x527, haveLang: 0x527, wantScript: 0x35, haveScript: 0x34, distance: 0x13},
-}
-
-// Size: 90 bytes, 15 elements
-var matchRegion = [15]regionIntelligibility{
-	0:  {lang: 0x3a, script: 0x0, group: 0x4, distance: 0x4},
-	1:  {lang: 0x3a, script: 0x0, group: 0x84, distance: 0x4},
-	2:  {lang: 0x138, script: 0x0, group: 0x1, distance: 0x4},
-	3:  {lang: 0x138, script: 0x0, group: 0x81, distance: 0x4},
-	4:  {lang: 0x13d, script: 0x0, group: 0x3, distance: 0x4},
-	5:  {lang: 0x13d, script: 0x0, group: 0x83, distance: 0x4},
-	6:  {lang: 0x3be, script: 0x0, group: 0x3, distance: 0x4},
-	7:  {lang: 0x3be, script: 0x0, group: 0x83, distance: 0x4},
-	8:  {lang: 0x527, script: 0x35, group: 0x2, distance: 0x4},
-	9:  {lang: 0x527, script: 0x35, group: 0x82, distance: 0x4},
-	10: {lang: 0x3a, script: 0x0, group: 0x80, distance: 0x5},
-	11: {lang: 0x138, script: 0x0, group: 0x80, distance: 0x5},
-	12: {lang: 0x13d, script: 0x0, group: 0x80, distance: 0x5},
-	13: {lang: 0x3be, script: 0x0, group: 0x80, distance: 0x5},
-	14: {lang: 0x527, script: 0x35, group: 0x80, distance: 0x5},
-}
-
-// Size: 128 bytes, 32 elements
-var regionContainment = [32]uint32{
-	0xffffffff, 0x000007a2, 0x00003044, 0x00000008,
-	0x403c0010, 0x00000020, 0x00000040, 0x00000080,
-	0x00000100, 0x00000200, 0x00000400, 0x2000384c,
-	0x00001000, 0x00002000, 0x00004000, 0x00008000,
-	0x00010000, 0x00020000, 0x00040000, 0x00080000,
-	0x00100000, 0x00200000, 0x01c1c000, 0x00800000,
-	0x01000000, 0x1e020000, 0x04000000, 0x08000000,
-	0x10000000, 0x20002048, 0x40000000, 0x80000000,
-}
-
-// regionInclusion maps region identifiers to sets of regions in regionInclusionBits,
-// where each set holds all groupings that are directly connected in a region
-// containment graph.
-// Size: 357 bytes, 357 elements
-var regionInclusion = [357]uint8{
-	// Entry 0 - 3F
-	0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
-	0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
-	0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
-	0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x20,
-	0x21, 0x22, 0x23, 0x24, 0x25, 0x25, 0x22, 0x23,
-	0x25, 0x26, 0x21, 0x27, 0x28, 0x29, 0x2a, 0x25,
-	0x2b, 0x23, 0x22, 0x25, 0x24, 0x29, 0x2c, 0x2d,
-	0x23, 0x2e, 0x2c, 0x25, 0x2f, 0x30, 0x27, 0x25,
-	// Entry 40 - 7F
-	0x27, 0x25, 0x24, 0x30, 0x21, 0x31, 0x32, 0x33,
-	0x2f, 0x21, 0x26, 0x26, 0x26, 0x34, 0x2c, 0x28,
-	0x27, 0x26, 0x35, 0x27, 0x21, 0x33, 0x22, 0x20,
-	0x25, 0x2c, 0x25, 0x21, 0x36, 0x2d, 0x34, 0x29,
-	0x21, 0x2e, 0x37, 0x25, 0x25, 0x20, 0x38, 0x38,
-	0x27, 0x37, 0x38, 0x38, 0x2e, 0x39, 0x2e, 0x1f,
-	0x20, 0x37, 0x3a, 0x27, 0x3b, 0x2b, 0x20, 0x29,
-	0x34, 0x26, 0x37, 0x25, 0x23, 0x27, 0x2b, 0x2c,
-	// Entry 80 - BF
-	0x22, 0x2f, 0x2c, 0x2c, 0x25, 0x26, 0x39, 0x21,
-	0x33, 0x3b, 0x2c, 0x27, 0x35, 0x21, 0x33, 0x39,
-	0x25, 0x2d, 0x20, 0x38, 0x30, 0x37, 0x23, 0x2b,
-	0x24, 0x21, 0x23, 0x24, 0x2b, 0x39, 0x2b, 0x25,
-	0x23, 0x35, 0x20, 0x2e, 0x3c, 0x30, 0x3b, 0x2e,
-	0x25, 0x35, 0x35, 0x23, 0x25, 0x3c, 0x30, 0x23,
-	0x25, 0x34, 0x24, 0x2c, 0x31, 0x37, 0x29, 0x37,
-	0x38, 0x38, 0x34, 0x32, 0x22, 0x25, 0x2e, 0x3b,
-	// Entry C0 - FF
-	0x20, 0x22, 0x2c, 0x30, 0x35, 0x35, 0x3b, 0x25,
-	0x2c, 0x25, 0x39, 0x2e, 0x24, 0x2e, 0x33, 0x30,
-	0x2e, 0x31, 0x3a, 0x2c, 0x2a, 0x2c, 0x20, 0x33,
-	0x29, 0x2b, 0x24, 0x20, 0x3b, 0x23, 0x28, 0x2a,
-	0x23, 0x33, 0x20, 0x27, 0x28, 0x3a, 0x30, 0x24,
-	0x2d, 0x2f, 0x28, 0x25, 0x23, 0x39, 0x20, 0x3b,
-	0x27, 0x20, 0x23, 0x20, 0x20, 0x1e, 0x20, 0x20,
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-	// Entry 100 - 13F
-	0x20, 0x2e, 0x20, 0x2d, 0x22, 0x32, 0x2e, 0x23,
-	0x3a, 0x2e, 0x38, 0x37, 0x30, 0x2c, 0x39, 0x2b,
-	0x2d, 0x2c, 0x22, 0x2c, 0x2e, 0x27, 0x2e, 0x26,
-	0x32, 0x33, 0x25, 0x23, 0x31, 0x21, 0x25, 0x26,
-	0x21, 0x2c, 0x30, 0x3c, 0x28, 0x30, 0x3c, 0x38,
-	0x28, 0x30, 0x23, 0x25, 0x28, 0x35, 0x2e, 0x32,
-	0x2e, 0x20, 0x21, 0x20, 0x2f, 0x27, 0x3c, 0x22,
-	0x25, 0x20, 0x27, 0x25, 0x25, 0x30, 0x3a, 0x28,
-	// Entry 140 - 17F
-	0x20, 0x28, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-	0x20, 0x20, 0x20, 0x20, 0x22, 0x20, 0x20, 0x20,
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-	0x20, 0x20, 0x20, 0x20, 0x23, 0x23, 0x2e, 0x22,
-	0x31, 0x2e, 0x26, 0x2e, 0x20,
-}
-
-// regionInclusionBits is an array of bit vectors where every vector represents
-// a set of region groupings.  These sets are used to compute the distance
-// between two regions for the purpose of language matching.
-// Size: 288 bytes, 72 elements
-var regionInclusionBits = [72]uint32{
-	// Entry 0 - 1F
-	0x82400813, 0x000007a3, 0x00003844, 0x20000808,
-	0x403c0011, 0x00000022, 0x20000844, 0x00000082,
-	0x00000102, 0x00000202, 0x00000402, 0x2000384d,
-	0x00001804, 0x20002804, 0x00404000, 0x00408000,
-	0x00410000, 0x02020000, 0x00040010, 0x00080010,
-	0x00100010, 0x00200010, 0x01c1c001, 0x00c00000,
-	0x01400000, 0x1e020001, 0x06000000, 0x0a000000,
-	0x12000000, 0x20002848, 0x40000010, 0x80000001,
-	// Entry 20 - 3F
-	0x00000001, 0x40000000, 0x00020000, 0x01000000,
-	0x00008000, 0x00002000, 0x00000200, 0x00000008,
-	0x00200000, 0x90000000, 0x00040000, 0x08000000,
-	0x00000020, 0x84000000, 0x00000080, 0x00001000,
-	0x00010000, 0x00000400, 0x04000000, 0x00000040,
-	0x10000000, 0x00004000, 0x81000000, 0x88000000,
-	0x00000100, 0x80020000, 0x00080000, 0x00100000,
-	0x00800000, 0xffffffff, 0x82400fb3, 0xc27c0813,
-	// Entry 40 - 5F
-	0xa240385f, 0x83c1c813, 0x9e420813, 0x92000001,
-	0x86000001, 0x81400001, 0x8a000001, 0x82020001,
-}
-
-// regionInclusionNext marks, for each entry in regionInclusionBits, the set of
-// all groups that are reachable from the groups set in the respective entry.
-// Size: 72 bytes, 72 elements
-var regionInclusionNext = [72]uint8{
-	// Entry 0 - 3F
-	0x3d, 0x3e, 0x0b, 0x0b, 0x3f, 0x01, 0x0b, 0x01,
-	0x01, 0x01, 0x01, 0x40, 0x0b, 0x0b, 0x16, 0x16,
-	0x16, 0x19, 0x04, 0x04, 0x04, 0x04, 0x41, 0x16,
-	0x16, 0x42, 0x19, 0x19, 0x19, 0x0b, 0x04, 0x00,
-	0x00, 0x1e, 0x11, 0x18, 0x0f, 0x0d, 0x09, 0x03,
-	0x15, 0x43, 0x12, 0x1b, 0x05, 0x44, 0x07, 0x0c,
-	0x10, 0x0a, 0x1a, 0x06, 0x1c, 0x0e, 0x45, 0x46,
-	0x08, 0x47, 0x13, 0x14, 0x17, 0x3d, 0x3d, 0x3d,
-	// Entry 40 - 7F
-	0x3d, 0x3d, 0x3d, 0x42, 0x42, 0x41, 0x42, 0x42,
-}
-
-type parentRel struct {
-	lang       uint16
-	script     uint8
-	maxScript  uint8
-	toRegion   uint16
-	fromRegion []uint16
-}
-
-// Size: 414 bytes, 5 elements
-var parents = [5]parentRel{
-	0: {lang: 0x138, script: 0x0, maxScript: 0x52, toRegion: 0x1, fromRegion: []uint16{0x1a, 0x24, 0x25, 0x2e, 0x33, 0x35, 0x3c, 0x41, 0x45, 0x47, 0x48, 0x49, 0x4f, 0x51, 0x5b, 0x5c, 0x60, 0x63, 0x6c, 0x72, 0x73, 0x74, 0x7a, 0x7b, 0x7e, 0x7f, 0x80, 0x82, 0x8b, 0x8c, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9e, 0x9f, 0xa3, 0xa6, 0xa8, 0xac, 0xb0, 0xb3, 0xb4, 0xbe, 0xc5, 0xc9, 0xca, 0xcb, 0xcd, 0xcf, 0xd1, 0xd4, 0xd5, 0xdc, 0xde, 0xdf, 0xe5, 0xe6, 0xe7, 0xea, 0xef, 0x106, 0x108, 0x109, 0x10a, 0x10c, 0x10d, 0x111, 0x116, 0x11a, 0x11c, 0x11e, 0x124, 0x128, 0x12b, 0x12c, 0x12e, 0x130, 0x138, 0x13b, 0x13e, 0x141, 0x160, 0x161, 0x163}},
-	1: {lang: 0x138, script: 0x0, maxScript: 0x52, toRegion: 0x1a, fromRegion: []uint16{0x2d, 0x4d, 0x5f, 0x62, 0x71, 0xd8, 0x10b, 0x10e}},
-	2: {lang: 0x13d, script: 0x0, maxScript: 0x52, toRegion: 0x1e, fromRegion: []uint16{0x2b, 0x3e, 0x40, 0x47, 0x50, 0x53, 0x55, 0x58, 0x64, 0x68, 0x88, 0x8e, 0xce, 0xd7, 0xe1, 0xe3, 0xeb, 0xf0, 0x119, 0x134, 0x135, 0x13a}},
-	3: {lang: 0x3be, script: 0x0, maxScript: 0x52, toRegion: 0xed, fromRegion: []uint16{0x29, 0x4d, 0x59, 0x85, 0x8a, 0xb6, 0xc5, 0xd0, 0x117, 0x125}},
-	4: {lang: 0x527, script: 0x35, maxScript: 0x35, toRegion: 0x8c, fromRegion: []uint16{0xc5}},
-}
-
-// Total table size 26496 bytes (25KiB); checksum: 6E24B15A
diff --git a/vendor/golang.org/x/text/language/tags.go b/vendor/golang.org/x/text/language/tags.go
deleted file mode 100644
index de30155a26..0000000000
--- a/vendor/golang.org/x/text/language/tags.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package language
-
-// TODO: Various sets of commonly use tags and regions.
-
-// MustParse is like Parse, but panics if the given BCP 47 tag cannot be parsed.
-// It simplifies safe initialization of Tag values.
-func MustParse(s string) Tag {
-	t, err := Parse(s)
-	if err != nil {
-		panic(err)
-	}
-	return t
-}
-
-// MustParse is like Parse, but panics if the given BCP 47 tag cannot be parsed.
-// It simplifies safe initialization of Tag values.
-func (c CanonType) MustParse(s string) Tag {
-	t, err := c.Parse(s)
-	if err != nil {
-		panic(err)
-	}
-	return t
-}
-
-// MustParseBase is like ParseBase, but panics if the given base cannot be parsed.
-// It simplifies safe initialization of Base values.
-func MustParseBase(s string) Base {
-	b, err := ParseBase(s)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-// MustParseScript is like ParseScript, but panics if the given script cannot be
-// parsed. It simplifies safe initialization of Script values.
-func MustParseScript(s string) Script {
-	scr, err := ParseScript(s)
-	if err != nil {
-		panic(err)
-	}
-	return scr
-}
-
-// MustParseRegion is like ParseRegion, but panics if the given region cannot be
-// parsed. It simplifies safe initialization of Region values.
-func MustParseRegion(s string) Region {
-	r, err := ParseRegion(s)
-	if err != nil {
-		panic(err)
-	}
-	return r
-}
-
-var (
-	und = Tag{}
-
-	Und Tag = Tag{}
-
-	Afrikaans            Tag = Tag{lang: _af}                //  af
-	Amharic              Tag = Tag{lang: _am}                //  am
-	Arabic               Tag = Tag{lang: _ar}                //  ar
-	ModernStandardArabic Tag = Tag{lang: _ar, region: _001}  //  ar-001
-	Azerbaijani          Tag = Tag{lang: _az}                //  az
-	Bulgarian            Tag = Tag{lang: _bg}                //  bg
-	Bengali              Tag = Tag{lang: _bn}                //  bn
-	Catalan              Tag = Tag{lang: _ca}                //  ca
-	Czech                Tag = Tag{lang: _cs}                //  cs
-	Danish               Tag = Tag{lang: _da}                //  da
-	German               Tag = Tag{lang: _de}                //  de
-	Greek                Tag = Tag{lang: _el}                //  el
-	English              Tag = Tag{lang: _en}                //  en
-	AmericanEnglish      Tag = Tag{lang: _en, region: _US}   //  en-US
-	BritishEnglish       Tag = Tag{lang: _en, region: _GB}   //  en-GB
-	Spanish              Tag = Tag{lang: _es}                //  es
-	EuropeanSpanish      Tag = Tag{lang: _es, region: _ES}   //  es-ES
-	LatinAmericanSpanish Tag = Tag{lang: _es, region: _419}  //  es-419
-	Estonian             Tag = Tag{lang: _et}                //  et
-	Persian              Tag = Tag{lang: _fa}                //  fa
-	Finnish              Tag = Tag{lang: _fi}                //  fi
-	Filipino             Tag = Tag{lang: _fil}               //  fil
-	French               Tag = Tag{lang: _fr}                //  fr
-	CanadianFrench       Tag = Tag{lang: _fr, region: _CA}   //  fr-CA
-	Gujarati             Tag = Tag{lang: _gu}                //  gu
-	Hebrew               Tag = Tag{lang: _he}                //  he
-	Hindi                Tag = Tag{lang: _hi}                //  hi
-	Croatian             Tag = Tag{lang: _hr}                //  hr
-	Hungarian            Tag = Tag{lang: _hu}                //  hu
-	Armenian             Tag = Tag{lang: _hy}                //  hy
-	Indonesian           Tag = Tag{lang: _id}                //  id
-	Icelandic            Tag = Tag{lang: _is}                //  is
-	Italian              Tag = Tag{lang: _it}                //  it
-	Japanese             Tag = Tag{lang: _ja}                //  ja
-	Georgian             Tag = Tag{lang: _ka}                //  ka
-	Kazakh               Tag = Tag{lang: _kk}                //  kk
-	Khmer                Tag = Tag{lang: _km}                //  km
-	Kannada              Tag = Tag{lang: _kn}                //  kn
-	Korean               Tag = Tag{lang: _ko}                //  ko
-	Kirghiz              Tag = Tag{lang: _ky}                //  ky
-	Lao                  Tag = Tag{lang: _lo}                //  lo
-	Lithuanian           Tag = Tag{lang: _lt}                //  lt
-	Latvian              Tag = Tag{lang: _lv}                //  lv
-	Macedonian           Tag = Tag{lang: _mk}                //  mk
-	Malayalam            Tag = Tag{lang: _ml}                //  ml
-	Mongolian            Tag = Tag{lang: _mn}                //  mn
-	Marathi              Tag = Tag{lang: _mr}                //  mr
-	Malay                Tag = Tag{lang: _ms}                //  ms
-	Burmese              Tag = Tag{lang: _my}                //  my
-	Nepali               Tag = Tag{lang: _ne}                //  ne
-	Dutch                Tag = Tag{lang: _nl}                //  nl
-	Norwegian            Tag = Tag{lang: _no}                //  no
-	Punjabi              Tag = Tag{lang: _pa}                //  pa
-	Polish               Tag = Tag{lang: _pl}                //  pl
-	Portuguese           Tag = Tag{lang: _pt}                //  pt
-	BrazilianPortuguese  Tag = Tag{lang: _pt, region: _BR}   //  pt-BR
-	EuropeanPortuguese   Tag = Tag{lang: _pt, region: _PT}   //  pt-PT
-	Romanian             Tag = Tag{lang: _ro}                //  ro
-	Russian              Tag = Tag{lang: _ru}                //  ru
-	Sinhala              Tag = Tag{lang: _si}                //  si
-	Slovak               Tag = Tag{lang: _sk}                //  sk
-	Slovenian            Tag = Tag{lang: _sl}                //  sl
-	Albanian             Tag = Tag{lang: _sq}                //  sq
-	Serbian              Tag = Tag{lang: _sr}                //  sr
-	SerbianLatin         Tag = Tag{lang: _sr, script: _Latn} //  sr-Latn
-	Swedish              Tag = Tag{lang: _sv}                //  sv
-	Swahili              Tag = Tag{lang: _sw}                //  sw
-	Tamil                Tag = Tag{lang: _ta}                //  ta
-	Telugu               Tag = Tag{lang: _te}                //  te
-	Thai                 Tag = Tag{lang: _th}                //  th
-	Turkish              Tag = Tag{lang: _tr}                //  tr
-	Ukrainian            Tag = Tag{lang: _uk}                //  uk
-	Urdu                 Tag = Tag{lang: _ur}                //  ur
-	Uzbek                Tag = Tag{lang: _uz}                //  uz
-	Vietnamese           Tag = Tag{lang: _vi}                //  vi
-	Chinese              Tag = Tag{lang: _zh}                //  zh
-	SimplifiedChinese    Tag = Tag{lang: _zh, script: _Hans} //  zh-Hans
-	TraditionalChinese   Tag = Tag{lang: _zh, script: _Hant} //  zh-Hant
-	Zulu                 Tag = Tag{lang: _zu}                //  zu
-)
diff --git a/vendor/golang.org/x/text/runes/cond.go b/vendor/golang.org/x/text/runes/cond.go
deleted file mode 100644
index df7aa02db6..0000000000
--- a/vendor/golang.org/x/text/runes/cond.go
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package runes
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/transform"
-)
-
-// Note: below we pass invalid UTF-8 to the tIn and tNotIn transformers as is.
-// This is done for various reasons:
-// - To retain the semantics of the Nop transformer: if input is passed to a Nop
-//   one would expect it to be unchanged.
-// - It would be very expensive to pass a converted RuneError to a transformer:
-//   a transformer might need more source bytes after RuneError, meaning that
-//   the only way to pass it safely is to create a new buffer and manage the
-//   intermingling of RuneErrors and normal input.
-// - Many transformers leave ill-formed UTF-8 as is, so this is not
-//   inconsistent. Generally ill-formed UTF-8 is only replaced if it is a
-//   logical consequence of the operation (as for Map) or if it otherwise would
-//   pose security concerns (as for Remove).
-// - An alternative would be to return an error on ill-formed UTF-8, but this
-//   would be inconsistent with other operations.
-
-// If returns a transformer that applies tIn to consecutive runes for which
-// s.Contains(r) and tNotIn to consecutive runes for which !s.Contains(r). Reset
-// is called on tIn and tNotIn at the start of each run. A Nop transformer will
-// substitute a nil value passed to tIn or tNotIn. Invalid UTF-8 is translated
-// to RuneError to determine which transformer to apply, but is passed as is to
-// the respective transformer.
-func If(s Set, tIn, tNotIn transform.Transformer) Transformer {
-	if tIn == nil && tNotIn == nil {
-		return Transformer{transform.Nop}
-	}
-	if tIn == nil {
-		tIn = transform.Nop
-	}
-	if tNotIn == nil {
-		tNotIn = transform.Nop
-	}
-	sIn, ok := tIn.(transform.SpanningTransformer)
-	if !ok {
-		sIn = dummySpan{tIn}
-	}
-	sNotIn, ok := tNotIn.(transform.SpanningTransformer)
-	if !ok {
-		sNotIn = dummySpan{tNotIn}
-	}
-
-	a := &cond{
-		tIn:    sIn,
-		tNotIn: sNotIn,
-		f:      s.Contains,
-	}
-	a.Reset()
-	return Transformer{a}
-}
-
-type dummySpan struct{ transform.Transformer }
-
-func (d dummySpan) Span(src []byte, atEOF bool) (n int, err error) {
-	return 0, transform.ErrEndOfSpan
-}
-
-type cond struct {
-	tIn, tNotIn transform.SpanningTransformer
-	f           func(rune) bool
-	check       func(rune) bool               // current check to perform
-	t           transform.SpanningTransformer // current transformer to use
-}
-
-// Reset implements transform.Transformer.
-func (t *cond) Reset() {
-	t.check = t.is
-	t.t = t.tIn
-	t.t.Reset() // notIn will be reset on first usage.
-}
-
-func (t *cond) is(r rune) bool {
-	if t.f(r) {
-		return true
-	}
-	t.check = t.isNot
-	t.t = t.tNotIn
-	t.tNotIn.Reset()
-	return false
-}
-
-func (t *cond) isNot(r rune) bool {
-	if !t.f(r) {
-		return true
-	}
-	t.check = t.is
-	t.t = t.tIn
-	t.tIn.Reset()
-	return false
-}
-
-// This implementation of Span doesn't help all too much, but it needs to be
-// there to satisfy this package's Transformer interface.
-// TODO: there are certainly room for improvements, though. For example, if
-// t.t == transform.Nop (which will a common occurrence) it will save a bundle
-// to special-case that loop.
-func (t *cond) Span(src []byte, atEOF bool) (n int, err error) {
-	p := 0
-	for n < len(src) && err == nil {
-		// Don't process too much at a time as the Spanner that will be
-		// called on this block may terminate early.
-		const maxChunk = 4096
-		max := len(src)
-		if v := n + maxChunk; v < max {
-			max = v
-		}
-		atEnd := false
-		size := 0
-		current := t.t
-		for ; p < max; p += size {
-			r := rune(src[p])
-			if r < utf8.RuneSelf {
-				size = 1
-			} else if r, size = utf8.DecodeRune(src[p:]); size == 1 {
-				if !atEOF && !utf8.FullRune(src[p:]) {
-					err = transform.ErrShortSrc
-					break
-				}
-			}
-			if !t.check(r) {
-				// The next rune will be the start of a new run.
-				atEnd = true
-				break
-			}
-		}
-		n2, err2 := current.Span(src[n:p], atEnd || (atEOF && p == len(src)))
-		n += n2
-		if err2 != nil {
-			return n, err2
-		}
-		// At this point either err != nil or t.check will pass for the rune at p.
-		p = n + size
-	}
-	return n, err
-}
-
-func (t *cond) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	p := 0
-	for nSrc < len(src) && err == nil {
-		// Don't process too much at a time, as the work might be wasted if the
-		// destination buffer isn't large enough to hold the result or a
-		// transform returns an error early.
-		const maxChunk = 4096
-		max := len(src)
-		if n := nSrc + maxChunk; n < len(src) {
-			max = n
-		}
-		atEnd := false
-		size := 0
-		current := t.t
-		for ; p < max; p += size {
-			r := rune(src[p])
-			if r < utf8.RuneSelf {
-				size = 1
-			} else if r, size = utf8.DecodeRune(src[p:]); size == 1 {
-				if !atEOF && !utf8.FullRune(src[p:]) {
-					err = transform.ErrShortSrc
-					break
-				}
-			}
-			if !t.check(r) {
-				// The next rune will be the start of a new run.
-				atEnd = true
-				break
-			}
-		}
-		nDst2, nSrc2, err2 := current.Transform(dst[nDst:], src[nSrc:p], atEnd || (atEOF && p == len(src)))
-		nDst += nDst2
-		nSrc += nSrc2
-		if err2 != nil {
-			return nDst, nSrc, err2
-		}
-		// At this point either err != nil or t.check will pass for the rune at p.
-		p = nSrc + size
-	}
-	return nDst, nSrc, err
-}
diff --git a/vendor/golang.org/x/text/runes/runes.go b/vendor/golang.org/x/text/runes/runes.go
deleted file mode 100644
index 71933696f5..0000000000
--- a/vendor/golang.org/x/text/runes/runes.go
+++ /dev/null
@@ -1,355 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package runes provide transforms for UTF-8 encoded text.
-package runes // import "golang.org/x/text/runes"
-
-import (
-	"unicode"
-	"unicode/utf8"
-
-	"golang.org/x/text/transform"
-)
-
-// A Set is a collection of runes.
-type Set interface {
-	// Contains returns true if r is contained in the set.
-	Contains(r rune) bool
-}
-
-type setFunc func(rune) bool
-
-func (s setFunc) Contains(r rune) bool {
-	return s(r)
-}
-
-// Note: using funcs here instead of wrapping types result in cleaner
-// documentation and a smaller API.
-
-// In creates a Set with a Contains method that returns true for all runes in
-// the given RangeTable.
-func In(rt *unicode.RangeTable) Set {
-	return setFunc(func(r rune) bool { return unicode.Is(rt, r) })
-}
-
-// In creates a Set with a Contains method that returns true for all runes not
-// in the given RangeTable.
-func NotIn(rt *unicode.RangeTable) Set {
-	return setFunc(func(r rune) bool { return !unicode.Is(rt, r) })
-}
-
-// Predicate creates a Set with a Contains method that returns f(r).
-func Predicate(f func(rune) bool) Set {
-	return setFunc(f)
-}
-
-// Transformer implements the transform.Transformer interface.
-type Transformer struct {
-	t transform.SpanningTransformer
-}
-
-func (t Transformer) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	return t.t.Transform(dst, src, atEOF)
-}
-
-func (t Transformer) Span(b []byte, atEOF bool) (n int, err error) {
-	return t.t.Span(b, atEOF)
-}
-
-func (t Transformer) Reset() { t.t.Reset() }
-
-// Bytes returns a new byte slice with the result of converting b using t.  It
-// calls Reset on t. It returns nil if any error was found. This can only happen
-// if an error-producing Transformer is passed to If.
-func (t Transformer) Bytes(b []byte) []byte {
-	b, _, err := transform.Bytes(t, b)
-	if err != nil {
-		return nil
-	}
-	return b
-}
-
-// String returns a string with the result of converting s using t. It calls
-// Reset on t. It returns the empty string if any error was found. This can only
-// happen if an error-producing Transformer is passed to If.
-func (t Transformer) String(s string) string {
-	s, _, err := transform.String(t, s)
-	if err != nil {
-		return ""
-	}
-	return s
-}
-
-// TODO:
-// - Copy: copying strings and bytes in whole-rune units.
-// - Validation (maybe)
-// - Well-formed-ness (maybe)
-
-const runeErrorString = string(utf8.RuneError)
-
-// Remove returns a Transformer that removes runes r for which s.Contains(r).
-// Illegal input bytes are replaced by RuneError before being passed to f.
-func Remove(s Set) Transformer {
-	if f, ok := s.(setFunc); ok {
-		// This little trick cuts the running time of BenchmarkRemove for sets
-		// created by Predicate roughly in half.
-		// TODO: special-case RangeTables as well.
-		return Transformer{remove(f)}
-	}
-	return Transformer{remove(s.Contains)}
-}
-
-// TODO: remove transform.RemoveFunc.
-
-type remove func(r rune) bool
-
-func (remove) Reset() {}
-
-// Span implements transform.Spanner.
-func (t remove) Span(src []byte, atEOF bool) (n int, err error) {
-	for r, size := rune(0), 0; n < len(src); {
-		if r = rune(src[n]); r < utf8.RuneSelf {
-			size = 1
-		} else if r, size = utf8.DecodeRune(src[n:]); size == 1 {
-			// Invalid rune.
-			if !atEOF && !utf8.FullRune(src[n:]) {
-				err = transform.ErrShortSrc
-			} else {
-				err = transform.ErrEndOfSpan
-			}
-			break
-		}
-		if t(r) {
-			err = transform.ErrEndOfSpan
-			break
-		}
-		n += size
-	}
-	return
-}
-
-// Transform implements transform.Transformer.
-func (t remove) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	for r, size := rune(0), 0; nSrc < len(src); {
-		if r = rune(src[nSrc]); r < utf8.RuneSelf {
-			size = 1
-		} else if r, size = utf8.DecodeRune(src[nSrc:]); size == 1 {
-			// Invalid rune.
-			if !atEOF && !utf8.FullRune(src[nSrc:]) {
-				err = transform.ErrShortSrc
-				break
-			}
-			// We replace illegal bytes with RuneError. Not doing so might
-			// otherwise turn a sequence of invalid UTF-8 into valid UTF-8.
-			// The resulting byte sequence may subsequently contain runes
-			// for which t(r) is true that were passed unnoticed.
-			if !t(utf8.RuneError) {
-				if nDst+3 > len(dst) {
-					err = transform.ErrShortDst
-					break
-				}
-				dst[nDst+0] = runeErrorString[0]
-				dst[nDst+1] = runeErrorString[1]
-				dst[nDst+2] = runeErrorString[2]
-				nDst += 3
-			}
-			nSrc++
-			continue
-		}
-		if t(r) {
-			nSrc += size
-			continue
-		}
-		if nDst+size > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		for i := 0; i < size; i++ {
-			dst[nDst] = src[nSrc]
-			nDst++
-			nSrc++
-		}
-	}
-	return
-}
-
-// Map returns a Transformer that maps the runes in the input using the given
-// mapping. Illegal bytes in the input are converted to utf8.RuneError before
-// being passed to the mapping func.
-func Map(mapping func(rune) rune) Transformer {
-	return Transformer{mapper(mapping)}
-}
-
-type mapper func(rune) rune
-
-func (mapper) Reset() {}
-
-// Span implements transform.Spanner.
-func (t mapper) Span(src []byte, atEOF bool) (n int, err error) {
-	for r, size := rune(0), 0; n < len(src); n += size {
-		if r = rune(src[n]); r < utf8.RuneSelf {
-			size = 1
-		} else if r, size = utf8.DecodeRune(src[n:]); size == 1 {
-			// Invalid rune.
-			if !atEOF && !utf8.FullRune(src[n:]) {
-				err = transform.ErrShortSrc
-			} else {
-				err = transform.ErrEndOfSpan
-			}
-			break
-		}
-		if t(r) != r {
-			err = transform.ErrEndOfSpan
-			break
-		}
-	}
-	return n, err
-}
-
-// Transform implements transform.Transformer.
-func (t mapper) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	var replacement rune
-	var b [utf8.UTFMax]byte
-
-	for r, size := rune(0), 0; nSrc < len(src); {
-		if r = rune(src[nSrc]); r < utf8.RuneSelf {
-			if replacement = t(r); replacement < utf8.RuneSelf {
-				if nDst == len(dst) {
-					err = transform.ErrShortDst
-					break
-				}
-				dst[nDst] = byte(replacement)
-				nDst++
-				nSrc++
-				continue
-			}
-			size = 1
-		} else if r, size = utf8.DecodeRune(src[nSrc:]); size == 1 {
-			// Invalid rune.
-			if !atEOF && !utf8.FullRune(src[nSrc:]) {
-				err = transform.ErrShortSrc
-				break
-			}
-
-			if replacement = t(utf8.RuneError); replacement == utf8.RuneError {
-				if nDst+3 > len(dst) {
-					err = transform.ErrShortDst
-					break
-				}
-				dst[nDst+0] = runeErrorString[0]
-				dst[nDst+1] = runeErrorString[1]
-				dst[nDst+2] = runeErrorString[2]
-				nDst += 3
-				nSrc++
-				continue
-			}
-		} else if replacement = t(r); replacement == r {
-			if nDst+size > len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			for i := 0; i < size; i++ {
-				dst[nDst] = src[nSrc]
-				nDst++
-				nSrc++
-			}
-			continue
-		}
-
-		n := utf8.EncodeRune(b[:], replacement)
-
-		if nDst+n > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		for i := 0; i < n; i++ {
-			dst[nDst] = b[i]
-			nDst++
-		}
-		nSrc += size
-	}
-	return
-}
-
-// ReplaceIllFormed returns a transformer that replaces all input bytes that are
-// not part of a well-formed UTF-8 code sequence with utf8.RuneError.
-func ReplaceIllFormed() Transformer {
-	return Transformer{&replaceIllFormed{}}
-}
-
-type replaceIllFormed struct{ transform.NopResetter }
-
-func (t replaceIllFormed) Span(src []byte, atEOF bool) (n int, err error) {
-	for n < len(src) {
-		// ASCII fast path.
-		if src[n] < utf8.RuneSelf {
-			n++
-			continue
-		}
-
-		r, size := utf8.DecodeRune(src[n:])
-
-		// Look for a valid non-ASCII rune.
-		if r != utf8.RuneError || size != 1 {
-			n += size
-			continue
-		}
-
-		// Look for short source data.
-		if !atEOF && !utf8.FullRune(src[n:]) {
-			err = transform.ErrShortSrc
-			break
-		}
-
-		// We have an invalid rune.
-		err = transform.ErrEndOfSpan
-		break
-	}
-	return n, err
-}
-
-func (t replaceIllFormed) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	for nSrc < len(src) {
-		// ASCII fast path.
-		if r := src[nSrc]; r < utf8.RuneSelf {
-			if nDst == len(dst) {
-				err = transform.ErrShortDst
-				break
-			}
-			dst[nDst] = r
-			nDst++
-			nSrc++
-			continue
-		}
-
-		// Look for a valid non-ASCII rune.
-		if _, size := utf8.DecodeRune(src[nSrc:]); size != 1 {
-			if size != copy(dst[nDst:], src[nSrc:nSrc+size]) {
-				err = transform.ErrShortDst
-				break
-			}
-			nDst += size
-			nSrc += size
-			continue
-		}
-
-		// Look for short source data.
-		if !atEOF && !utf8.FullRune(src[nSrc:]) {
-			err = transform.ErrShortSrc
-			break
-		}
-
-		// We have an invalid rune.
-		if nDst+3 > len(dst) {
-			err = transform.ErrShortDst
-			break
-		}
-		dst[nDst+0] = runeErrorString[0]
-		dst[nDst+1] = runeErrorString[1]
-		dst[nDst+2] = runeErrorString[2]
-		nDst += 3
-		nSrc++
-	}
-	return nDst, nSrc, err
-}
diff --git a/vendor/golang.org/x/text/secure/bidirule/bidirule.go b/vendor/golang.org/x/text/secure/bidirule/bidirule.go
deleted file mode 100644
index a7161bdd9b..0000000000
--- a/vendor/golang.org/x/text/secure/bidirule/bidirule.go
+++ /dev/null
@@ -1,342 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package bidirule implements the Bidi Rule defined by RFC 5893.
-//
-// This package is under development. The API may change without notice and
-// without preserving backward compatibility.
-package bidirule
-
-import (
-	"errors"
-	"unicode/utf8"
-
-	"golang.org/x/text/transform"
-	"golang.org/x/text/unicode/bidi"
-)
-
-// This file contains an implementation of RFC 5893: Right-to-Left Scripts for
-// Internationalized Domain Names for Applications (IDNA)
-//
-// A label is an individual component of a domain name.  Labels are usually
-// shown separated by dots; for example, the domain name "www.example.com" is
-// composed of three labels: "www", "example", and "com".
-//
-// An RTL label is a label that contains at least one character of class R, AL,
-// or AN. An LTR label is any label that is not an RTL label.
-//
-// A "Bidi domain name" is a domain name that contains at least one RTL label.
-//
-//  The following guarantees can be made based on the above:
-//
-//  o  In a domain name consisting of only labels that satisfy the rule,
-//     the requirements of Section 3 are satisfied.  Note that even LTR
-//     labels and pure ASCII labels have to be tested.
-//
-//  o  In a domain name consisting of only LDH labels (as defined in the
-//     Definitions document [RFC5890]) and labels that satisfy the rule,
-//     the requirements of Section 3 are satisfied as long as a label
-//     that starts with an ASCII digit does not come after a
-//     right-to-left label.
-//
-//  No guarantee is given for other combinations.
-
-// ErrInvalid indicates a label is invalid according to the Bidi Rule.
-var ErrInvalid = errors.New("bidirule: failed Bidi Rule")
-
-type ruleState uint8
-
-const (
-	ruleInitial ruleState = iota
-	ruleLTR
-	ruleLTRFinal
-	ruleRTL
-	ruleRTLFinal
-	ruleInvalid
-)
-
-type ruleTransition struct {
-	next ruleState
-	mask uint16
-}
-
-var transitions = [...][2]ruleTransition{
-	// [2.1] The first character must be a character with Bidi property L, R, or
-	// AL. If it has the R or AL property, it is an RTL label; if it has the L
-	// property, it is an LTR label.
-	ruleInitial: {
-		{ruleLTRFinal, 1 << bidi.L},
-		{ruleRTLFinal, 1<<bidi.R | 1<<bidi.AL},
-	},
-	ruleRTL: {
-		// [2.3] In an RTL label, the end of the label must be a character with
-		// Bidi property R, AL, EN, or AN, followed by zero or more characters
-		// with Bidi property NSM.
-		{ruleRTLFinal, 1<<bidi.R | 1<<bidi.AL | 1<<bidi.EN | 1<<bidi.AN},
-
-		// [2.2] In an RTL label, only characters with the Bidi properties R,
-		// AL, AN, EN, ES, CS, ET, ON, BN, or NSM are allowed.
-		// We exclude the entries from [2.3]
-		{ruleRTL, 1<<bidi.ES | 1<<bidi.CS | 1<<bidi.ET | 1<<bidi.ON | 1<<bidi.BN | 1<<bidi.NSM},
-	},
-	ruleRTLFinal: {
-		// [2.3] In an RTL label, the end of the label must be a character with
-		// Bidi property R, AL, EN, or AN, followed by zero or more characters
-		// with Bidi property NSM.
-		{ruleRTLFinal, 1<<bidi.R | 1<<bidi.AL | 1<<bidi.EN | 1<<bidi.AN | 1<<bidi.NSM},
-
-		// [2.2] In an RTL label, only characters with the Bidi properties R,
-		// AL, AN, EN, ES, CS, ET, ON, BN, or NSM are allowed.
-		// We exclude the entries from [2.3] and NSM.
-		{ruleRTL, 1<<bidi.ES | 1<<bidi.CS | 1<<bidi.ET | 1<<bidi.ON | 1<<bidi.BN},
-	},
-	ruleLTR: {
-		// [2.6] In an LTR label, the end of the label must be a character with
-		// Bidi property L or EN, followed by zero or more characters with Bidi
-		// property NSM.
-		{ruleLTRFinal, 1<<bidi.L | 1<<bidi.EN},
-
-		// [2.5] In an LTR label, only characters with the Bidi properties L,
-		// EN, ES, CS, ET, ON, BN, or NSM are allowed.
-		// We exclude the entries from [2.6].
-		{ruleLTR, 1<<bidi.ES | 1<<bidi.CS | 1<<bidi.ET | 1<<bidi.ON | 1<<bidi.BN | 1<<bidi.NSM},
-	},
-	ruleLTRFinal: {
-		// [2.6] In an LTR label, the end of the label must be a character with
-		// Bidi property L or EN, followed by zero or more characters with Bidi
-		// property NSM.
-		{ruleLTRFinal, 1<<bidi.L | 1<<bidi.EN | 1<<bidi.NSM},
-
-		// [2.5] In an LTR label, only characters with the Bidi properties L,
-		// EN, ES, CS, ET, ON, BN, or NSM are allowed.
-		// We exclude the entries from [2.6].
-		{ruleLTR, 1<<bidi.ES | 1<<bidi.CS | 1<<bidi.ET | 1<<bidi.ON | 1<<bidi.BN},
-	},
-	ruleInvalid: {
-		{ruleInvalid, 0},
-		{ruleInvalid, 0},
-	},
-}
-
-// [2.4] In an RTL label, if an EN is present, no AN may be present, and
-// vice versa.
-const exclusiveRTL = uint16(1<<bidi.EN | 1<<bidi.AN)
-
-// From RFC 5893
-// An RTL label is a label that contains at least one character of type
-// R, AL, or AN.
-//
-// An LTR label is any label that is not an RTL label.
-
-// Direction reports the direction of the given label as defined by RFC 5893.
-// The Bidi Rule does not have to be applied to labels of the category
-// LeftToRight.
-func Direction(b []byte) bidi.Direction {
-	for i := 0; i < len(b); {
-		e, sz := bidi.Lookup(b[i:])
-		if sz == 0 {
-			i++
-		}
-		c := e.Class()
-		if c == bidi.R || c == bidi.AL || c == bidi.AN {
-			return bidi.RightToLeft
-		}
-		i += sz
-	}
-	return bidi.LeftToRight
-}
-
-// DirectionString reports the direction of the given label as defined by RFC
-// 5893. The Bidi Rule does not have to be applied to labels of the category
-// LeftToRight.
-func DirectionString(s string) bidi.Direction {
-	for i := 0; i < len(s); {
-		e, sz := bidi.LookupString(s[i:])
-		if sz == 0 {
-			i++
-		}
-		c := e.Class()
-		if c == bidi.R || c == bidi.AL || c == bidi.AN {
-			return bidi.RightToLeft
-		}
-		i += sz
-	}
-	return bidi.LeftToRight
-}
-
-// Valid reports whether b conforms to the BiDi rule.
-func Valid(b []byte) bool {
-	var t Transformer
-	if n, ok := t.advance(b); !ok || n < len(b) {
-		return false
-	}
-	return t.isFinal()
-}
-
-// ValidString reports whether s conforms to the BiDi rule.
-func ValidString(s string) bool {
-	var t Transformer
-	if n, ok := t.advanceString(s); !ok || n < len(s) {
-		return false
-	}
-	return t.isFinal()
-}
-
-// New returns a Transformer that verifies that input adheres to the Bidi Rule.
-func New() *Transformer {
-	return &Transformer{}
-}
-
-// Transformer implements transform.Transform.
-type Transformer struct {
-	state  ruleState
-	hasRTL bool
-	seen   uint16
-}
-
-// A rule can only be violated for "Bidi Domain names", meaning if one of the
-// following categories has been observed.
-func (t *Transformer) isRTL() bool {
-	const isRTL = 1<<bidi.R | 1<<bidi.AL | 1<<bidi.AN
-	return t.seen&isRTL != 0
-}
-
-func (t *Transformer) isFinal() bool {
-	if !t.isRTL() {
-		return true
-	}
-	return t.state == ruleLTRFinal || t.state == ruleRTLFinal || t.state == ruleInitial
-}
-
-// Reset implements transform.Transformer.
-func (t *Transformer) Reset() { *t = Transformer{} }
-
-// Transform implements transform.Transformer. This Transformer has state and
-// needs to be reset between uses.
-func (t *Transformer) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	if len(dst) < len(src) {
-		src = src[:len(dst)]
-		atEOF = false
-		err = transform.ErrShortDst
-	}
-	n, err1 := t.Span(src, atEOF)
-	copy(dst, src[:n])
-	if err == nil || err1 != nil && err1 != transform.ErrShortSrc {
-		err = err1
-	}
-	return n, n, err
-}
-
-// Span returns the first n bytes of src that conform to the Bidi rule.
-func (t *Transformer) Span(src []byte, atEOF bool) (n int, err error) {
-	if t.state == ruleInvalid && t.isRTL() {
-		return 0, ErrInvalid
-	}
-	n, ok := t.advance(src)
-	switch {
-	case !ok:
-		err = ErrInvalid
-	case n < len(src):
-		if !atEOF {
-			err = transform.ErrShortSrc
-			break
-		}
-		err = ErrInvalid
-	case !t.isFinal():
-		err = ErrInvalid
-	}
-	return n, err
-}
-
-// Precomputing the ASCII values decreases running time for the ASCII fast path
-// by about 30%.
-var asciiTable [128]bidi.Properties
-
-func init() {
-	for i := range asciiTable {
-		p, _ := bidi.LookupRune(rune(i))
-		asciiTable[i] = p
-	}
-}
-
-func (t *Transformer) advance(s []byte) (n int, ok bool) {
-	var e bidi.Properties
-	var sz int
-	for n < len(s) {
-		if s[n] < utf8.RuneSelf {
-			e, sz = asciiTable[s[n]], 1
-		} else {
-			e, sz = bidi.Lookup(s[n:])
-			if sz <= 1 {
-				if sz == 1 {
-					// We always consider invalid UTF-8 to be invalid, even if
-					// the string has not yet been determined to be RTL.
-					// TODO: is this correct?
-					return n, false
-				}
-				return n, true // incomplete UTF-8 encoding
-			}
-		}
-		// TODO: using CompactClass would result in noticeable speedup.
-		// See unicode/bidi/prop.go:Properties.CompactClass.
-		c := uint16(1 << e.Class())
-		t.seen |= c
-		if t.seen&exclusiveRTL == exclusiveRTL {
-			t.state = ruleInvalid
-			return n, false
-		}
-		switch tr := transitions[t.state]; {
-		case tr[0].mask&c != 0:
-			t.state = tr[0].next
-		case tr[1].mask&c != 0:
-			t.state = tr[1].next
-		default:
-			t.state = ruleInvalid
-			if t.isRTL() {
-				return n, false
-			}
-		}
-		n += sz
-	}
-	return n, true
-}
-
-func (t *Transformer) advanceString(s string) (n int, ok bool) {
-	var e bidi.Properties
-	var sz int
-	for n < len(s) {
-		if s[n] < utf8.RuneSelf {
-			e, sz = asciiTable[s[n]], 1
-		} else {
-			e, sz = bidi.LookupString(s[n:])
-			if sz <= 1 {
-				if sz == 1 {
-					return n, false // invalid UTF-8
-				}
-				return n, true // incomplete UTF-8 encoding
-			}
-		}
-		// TODO: using CompactClass results in noticeable speedup.
-		// See unicode/bidi/prop.go:Properties.CompactClass.
-		c := uint16(1 << e.Class())
-		t.seen |= c
-		if t.seen&exclusiveRTL == exclusiveRTL {
-			t.state = ruleInvalid
-			return n, false
-		}
-		switch tr := transitions[t.state]; {
-		case tr[0].mask&c != 0:
-			t.state = tr[0].next
-		case tr[1].mask&c != 0:
-			t.state = tr[1].next
-		default:
-			t.state = ruleInvalid
-			if t.isRTL() {
-				return n, false
-			}
-		}
-		n += sz
-	}
-	return n, true
-}
diff --git a/vendor/golang.org/x/text/transform/transform.go b/vendor/golang.org/x/text/transform/transform.go
deleted file mode 100644
index fe47b9b35f..0000000000
--- a/vendor/golang.org/x/text/transform/transform.go
+++ /dev/null
@@ -1,705 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package transform provides reader and writer wrappers that transform the
-// bytes passing through as well as various transformations. Example
-// transformations provided by other packages include normalization and
-// conversion between character sets.
-package transform // import "golang.org/x/text/transform"
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"unicode/utf8"
-)
-
-var (
-	// ErrShortDst means that the destination buffer was too short to
-	// receive all of the transformed bytes.
-	ErrShortDst = errors.New("transform: short destination buffer")
-
-	// ErrShortSrc means that the source buffer has insufficient data to
-	// complete the transformation.
-	ErrShortSrc = errors.New("transform: short source buffer")
-
-	// ErrEndOfSpan means that the input and output (the transformed input)
-	// are not identical.
-	ErrEndOfSpan = errors.New("transform: input and output are not identical")
-
-	// errInconsistentByteCount means that Transform returned success (nil
-	// error) but also returned nSrc inconsistent with the src argument.
-	errInconsistentByteCount = errors.New("transform: inconsistent byte count returned")
-
-	// errShortInternal means that an internal buffer is not large enough
-	// to make progress and the Transform operation must be aborted.
-	errShortInternal = errors.New("transform: short internal buffer")
-)
-
-// Transformer transforms bytes.
-type Transformer interface {
-	// Transform writes to dst the transformed bytes read from src, and
-	// returns the number of dst bytes written and src bytes read. The
-	// atEOF argument tells whether src represents the last bytes of the
-	// input.
-	//
-	// Callers should always process the nDst bytes produced and account
-	// for the nSrc bytes consumed before considering the error err.
-	//
-	// A nil error means that all of the transformed bytes (whether freshly
-	// transformed from src or left over from previous Transform calls)
-	// were written to dst. A nil error can be returned regardless of
-	// whether atEOF is true. If err is nil then nSrc must equal len(src);
-	// the converse is not necessarily true.
-	//
-	// ErrShortDst means that dst was too short to receive all of the
-	// transformed bytes. ErrShortSrc means that src had insufficient data
-	// to complete the transformation. If both conditions apply, then
-	// either error may be returned. Other than the error conditions listed
-	// here, implementations are free to report other errors that arise.
-	Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error)
-
-	// Reset resets the state and allows a Transformer to be reused.
-	Reset()
-}
-
-// SpanningTransformer extends the Transformer interface with a Span method
-// that determines how much of the input already conforms to the Transformer.
-type SpanningTransformer interface {
-	Transformer
-
-	// Span returns a position in src such that transforming src[:n] results in
-	// identical output src[:n] for these bytes. It does not necessarily return
-	// the largest such n. The atEOF argument tells whether src represents the
-	// last bytes of the input.
-	//
-	// Callers should always account for the n bytes consumed before
-	// considering the error err.
-	//
-	// A nil error means that all input bytes are known to be identical to the
-	// output produced by the Transformer. A nil error can be be returned
-	// regardless of whether atEOF is true. If err is nil, then then n must
-	// equal len(src); the converse is not necessarily true.
-	//
-	// ErrEndOfSpan means that the Transformer output may differ from the
-	// input after n bytes. Note that n may be len(src), meaning that the output
-	// would contain additional bytes after otherwise identical output.
-	// ErrShortSrc means that src had insufficient data to determine whether the
-	// remaining bytes would change. Other than the error conditions listed
-	// here, implementations are free to report other errors that arise.
-	//
-	// Calling Span can modify the Transformer state as a side effect. In
-	// effect, it does the transformation just as calling Transform would, only
-	// without copying to a destination buffer and only up to a point it can
-	// determine the input and output bytes are the same. This is obviously more
-	// limited than calling Transform, but can be more efficient in terms of
-	// copying and allocating buffers. Calls to Span and Transform may be
-	// interleaved.
-	Span(src []byte, atEOF bool) (n int, err error)
-}
-
-// NopResetter can be embedded by implementations of Transformer to add a nop
-// Reset method.
-type NopResetter struct{}
-
-// Reset implements the Reset method of the Transformer interface.
-func (NopResetter) Reset() {}
-
-// Reader wraps another io.Reader by transforming the bytes read.
-type Reader struct {
-	r   io.Reader
-	t   Transformer
-	err error
-
-	// dst[dst0:dst1] contains bytes that have been transformed by t but
-	// not yet copied out via Read.
-	dst        []byte
-	dst0, dst1 int
-
-	// src[src0:src1] contains bytes that have been read from r but not
-	// yet transformed through t.
-	src        []byte
-	src0, src1 int
-
-	// transformComplete is whether the transformation is complete,
-	// regardless of whether or not it was successful.
-	transformComplete bool
-}
-
-const defaultBufSize = 4096
-
-// NewReader returns a new Reader that wraps r by transforming the bytes read
-// via t. It calls Reset on t.
-func NewReader(r io.Reader, t Transformer) *Reader {
-	t.Reset()
-	return &Reader{
-		r:   r,
-		t:   t,
-		dst: make([]byte, defaultBufSize),
-		src: make([]byte, defaultBufSize),
-	}
-}
-
-// Read implements the io.Reader interface.
-func (r *Reader) Read(p []byte) (int, error) {
-	n, err := 0, error(nil)
-	for {
-		// Copy out any transformed bytes and return the final error if we are done.
-		if r.dst0 != r.dst1 {
-			n = copy(p, r.dst[r.dst0:r.dst1])
-			r.dst0 += n
-			if r.dst0 == r.dst1 && r.transformComplete {
-				return n, r.err
-			}
-			return n, nil
-		} else if r.transformComplete {
-			return 0, r.err
-		}
-
-		// Try to transform some source bytes, or to flush the transformer if we
-		// are out of source bytes. We do this even if r.r.Read returned an error.
-		// As the io.Reader documentation says, "process the n > 0 bytes returned
-		// before considering the error".
-		if r.src0 != r.src1 || r.err != nil {
-			r.dst0 = 0
-			r.dst1, n, err = r.t.Transform(r.dst, r.src[r.src0:r.src1], r.err == io.EOF)
-			r.src0 += n
-
-			switch {
-			case err == nil:
-				if r.src0 != r.src1 {
-					r.err = errInconsistentByteCount
-				}
-				// The Transform call was successful; we are complete if we
-				// cannot read more bytes into src.
-				r.transformComplete = r.err != nil
-				continue
-			case err == ErrShortDst && (r.dst1 != 0 || n != 0):
-				// Make room in dst by copying out, and try again.
-				continue
-			case err == ErrShortSrc && r.src1-r.src0 != len(r.src) && r.err == nil:
-				// Read more bytes into src via the code below, and try again.
-			default:
-				r.transformComplete = true
-				// The reader error (r.err) takes precedence over the
-				// transformer error (err) unless r.err is nil or io.EOF.
-				if r.err == nil || r.err == io.EOF {
-					r.err = err
-				}
-				continue
-			}
-		}
-
-		// Move any untransformed source bytes to the start of the buffer
-		// and read more bytes.
-		if r.src0 != 0 {
-			r.src0, r.src1 = 0, copy(r.src, r.src[r.src0:r.src1])
-		}
-		n, r.err = r.r.Read(r.src[r.src1:])
-		r.src1 += n
-	}
-}
-
-// TODO: implement ReadByte (and ReadRune??).
-
-// Writer wraps another io.Writer by transforming the bytes read.
-// The user needs to call Close to flush unwritten bytes that may
-// be buffered.
-type Writer struct {
-	w   io.Writer
-	t   Transformer
-	dst []byte
-
-	// src[:n] contains bytes that have not yet passed through t.
-	src []byte
-	n   int
-}
-
-// NewWriter returns a new Writer that wraps w by transforming the bytes written
-// via t. It calls Reset on t.
-func NewWriter(w io.Writer, t Transformer) *Writer {
-	t.Reset()
-	return &Writer{
-		w:   w,
-		t:   t,
-		dst: make([]byte, defaultBufSize),
-		src: make([]byte, defaultBufSize),
-	}
-}
-
-// Write implements the io.Writer interface. If there are not enough
-// bytes available to complete a Transform, the bytes will be buffered
-// for the next write. Call Close to convert the remaining bytes.
-func (w *Writer) Write(data []byte) (n int, err error) {
-	src := data
-	if w.n > 0 {
-		// Append bytes from data to the last remainder.
-		// TODO: limit the amount copied on first try.
-		n = copy(w.src[w.n:], data)
-		w.n += n
-		src = w.src[:w.n]
-	}
-	for {
-		nDst, nSrc, err := w.t.Transform(w.dst, src, false)
-		if _, werr := w.w.Write(w.dst[:nDst]); werr != nil {
-			return n, werr
-		}
-		src = src[nSrc:]
-		if w.n == 0 {
-			n += nSrc
-		} else if len(src) <= n {
-			// Enough bytes from w.src have been consumed. We make src point
-			// to data instead to reduce the copying.
-			w.n = 0
-			n -= len(src)
-			src = data[n:]
-			if n < len(data) && (err == nil || err == ErrShortSrc) {
-				continue
-			}
-		}
-		switch err {
-		case ErrShortDst:
-			// This error is okay as long as we are making progress.
-			if nDst > 0 || nSrc > 0 {
-				continue
-			}
-		case ErrShortSrc:
-			if len(src) < len(w.src) {
-				m := copy(w.src, src)
-				// If w.n > 0, bytes from data were already copied to w.src and n
-				// was already set to the number of bytes consumed.
-				if w.n == 0 {
-					n += m
-				}
-				w.n = m
-				err = nil
-			} else if nDst > 0 || nSrc > 0 {
-				// Not enough buffer to store the remainder. Keep processing as
-				// long as there is progress. Without this case, transforms that
-				// require a lookahead larger than the buffer may result in an
-				// error. This is not something one may expect to be common in
-				// practice, but it may occur when buffers are set to small
-				// sizes during testing.
-				continue
-			}
-		case nil:
-			if w.n > 0 {
-				err = errInconsistentByteCount
-			}
-		}
-		return n, err
-	}
-}
-
-// Close implements the io.Closer interface.
-func (w *Writer) Close() error {
-	src := w.src[:w.n]
-	for {
-		nDst, nSrc, err := w.t.Transform(w.dst, src, true)
-		if _, werr := w.w.Write(w.dst[:nDst]); werr != nil {
-			return werr
-		}
-		if err != ErrShortDst {
-			return err
-		}
-		src = src[nSrc:]
-	}
-}
-
-type nop struct{ NopResetter }
-
-func (nop) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	n := copy(dst, src)
-	if n < len(src) {
-		err = ErrShortDst
-	}
-	return n, n, err
-}
-
-func (nop) Span(src []byte, atEOF bool) (n int, err error) {
-	return len(src), nil
-}
-
-type discard struct{ NopResetter }
-
-func (discard) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	return 0, len(src), nil
-}
-
-var (
-	// Discard is a Transformer for which all Transform calls succeed
-	// by consuming all bytes and writing nothing.
-	Discard Transformer = discard{}
-
-	// Nop is a SpanningTransformer that copies src to dst.
-	Nop SpanningTransformer = nop{}
-)
-
-// chain is a sequence of links. A chain with N Transformers has N+1 links and
-// N+1 buffers. Of those N+1 buffers, the first and last are the src and dst
-// buffers given to chain.Transform and the middle N-1 buffers are intermediate
-// buffers owned by the chain. The i'th link transforms bytes from the i'th
-// buffer chain.link[i].b at read offset chain.link[i].p to the i+1'th buffer
-// chain.link[i+1].b at write offset chain.link[i+1].n, for i in [0, N).
-type chain struct {
-	link []link
-	err  error
-	// errStart is the index at which the error occurred plus 1. Processing
-	// errStart at this level at the next call to Transform. As long as
-	// errStart > 0, chain will not consume any more source bytes.
-	errStart int
-}
-
-func (c *chain) fatalError(errIndex int, err error) {
-	if i := errIndex + 1; i > c.errStart {
-		c.errStart = i
-		c.err = err
-	}
-}
-
-type link struct {
-	t Transformer
-	// b[p:n] holds the bytes to be transformed by t.
-	b []byte
-	p int
-	n int
-}
-
-func (l *link) src() []byte {
-	return l.b[l.p:l.n]
-}
-
-func (l *link) dst() []byte {
-	return l.b[l.n:]
-}
-
-// Chain returns a Transformer that applies t in sequence.
-func Chain(t ...Transformer) Transformer {
-	if len(t) == 0 {
-		return nop{}
-	}
-	c := &chain{link: make([]link, len(t)+1)}
-	for i, tt := range t {
-		c.link[i].t = tt
-	}
-	// Allocate intermediate buffers.
-	b := make([][defaultBufSize]byte, len(t)-1)
-	for i := range b {
-		c.link[i+1].b = b[i][:]
-	}
-	return c
-}
-
-// Reset resets the state of Chain. It calls Reset on all the Transformers.
-func (c *chain) Reset() {
-	for i, l := range c.link {
-		if l.t != nil {
-			l.t.Reset()
-		}
-		c.link[i].p, c.link[i].n = 0, 0
-	}
-}
-
-// TODO: make chain use Span (is going to be fun to implement!)
-
-// Transform applies the transformers of c in sequence.
-func (c *chain) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	// Set up src and dst in the chain.
-	srcL := &c.link[0]
-	dstL := &c.link[len(c.link)-1]
-	srcL.b, srcL.p, srcL.n = src, 0, len(src)
-	dstL.b, dstL.n = dst, 0
-	var lastFull, needProgress bool // for detecting progress
-
-	// i is the index of the next Transformer to apply, for i in [low, high].
-	// low is the lowest index for which c.link[low] may still produce bytes.
-	// high is the highest index for which c.link[high] has a Transformer.
-	// The error returned by Transform determines whether to increase or
-	// decrease i. We try to completely fill a buffer before converting it.
-	for low, i, high := c.errStart, c.errStart, len(c.link)-2; low <= i && i <= high; {
-		in, out := &c.link[i], &c.link[i+1]
-		nDst, nSrc, err0 := in.t.Transform(out.dst(), in.src(), atEOF && low == i)
-		out.n += nDst
-		in.p += nSrc
-		if i > 0 && in.p == in.n {
-			in.p, in.n = 0, 0
-		}
-		needProgress, lastFull = lastFull, false
-		switch err0 {
-		case ErrShortDst:
-			// Process the destination buffer next. Return if we are already
-			// at the high index.
-			if i == high {
-				return dstL.n, srcL.p, ErrShortDst
-			}
-			if out.n != 0 {
-				i++
-				// If the Transformer at the next index is not able to process any
-				// source bytes there is nothing that can be done to make progress
-				// and the bytes will remain unprocessed. lastFull is used to
-				// detect this and break out of the loop with a fatal error.
-				lastFull = true
-				continue
-			}
-			// The destination buffer was too small, but is completely empty.
-			// Return a fatal error as this transformation can never complete.
-			c.fatalError(i, errShortInternal)
-		case ErrShortSrc:
-			if i == 0 {
-				// Save ErrShortSrc in err. All other errors take precedence.
-				err = ErrShortSrc
-				break
-			}
-			// Source bytes were depleted before filling up the destination buffer.
-			// Verify we made some progress, move the remaining bytes to the errStart
-			// and try to get more source bytes.
-			if needProgress && nSrc == 0 || in.n-in.p == len(in.b) {
-				// There were not enough source bytes to proceed while the source
-				// buffer cannot hold any more bytes. Return a fatal error as this
-				// transformation can never complete.
-				c.fatalError(i, errShortInternal)
-				break
-			}
-			// in.b is an internal buffer and we can make progress.
-			in.p, in.n = 0, copy(in.b, in.src())
-			fallthrough
-		case nil:
-			// if i == low, we have depleted the bytes at index i or any lower levels.
-			// In that case we increase low and i. In all other cases we decrease i to
-			// fetch more bytes before proceeding to the next index.
-			if i > low {
-				i--
-				continue
-			}
-		default:
-			c.fatalError(i, err0)
-		}
-		// Exhausted level low or fatal error: increase low and continue
-		// to process the bytes accepted so far.
-		i++
-		low = i
-	}
-
-	// If c.errStart > 0, this means we found a fatal error.  We will clear
-	// all upstream buffers. At this point, no more progress can be made
-	// downstream, as Transform would have bailed while handling ErrShortDst.
-	if c.errStart > 0 {
-		for i := 1; i < c.errStart; i++ {
-			c.link[i].p, c.link[i].n = 0, 0
-		}
-		err, c.errStart, c.err = c.err, 0, nil
-	}
-	return dstL.n, srcL.p, err
-}
-
-// Deprecated: use runes.Remove instead.
-func RemoveFunc(f func(r rune) bool) Transformer {
-	return removeF(f)
-}
-
-type removeF func(r rune) bool
-
-func (removeF) Reset() {}
-
-// Transform implements the Transformer interface.
-func (t removeF) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	for r, sz := rune(0), 0; len(src) > 0; src = src[sz:] {
-
-		if r = rune(src[0]); r < utf8.RuneSelf {
-			sz = 1
-		} else {
-			r, sz = utf8.DecodeRune(src)
-
-			if sz == 1 {
-				// Invalid rune.
-				if !atEOF && !utf8.FullRune(src) {
-					err = ErrShortSrc
-					break
-				}
-				// We replace illegal bytes with RuneError. Not doing so might
-				// otherwise turn a sequence of invalid UTF-8 into valid UTF-8.
-				// The resulting byte sequence may subsequently contain runes
-				// for which t(r) is true that were passed unnoticed.
-				if !t(r) {
-					if nDst+3 > len(dst) {
-						err = ErrShortDst
-						break
-					}
-					nDst += copy(dst[nDst:], "\uFFFD")
-				}
-				nSrc++
-				continue
-			}
-		}
-
-		if !t(r) {
-			if nDst+sz > len(dst) {
-				err = ErrShortDst
-				break
-			}
-			nDst += copy(dst[nDst:], src[:sz])
-		}
-		nSrc += sz
-	}
-	return
-}
-
-// grow returns a new []byte that is longer than b, and copies the first n bytes
-// of b to the start of the new slice.
-func grow(b []byte, n int) []byte {
-	m := len(b)
-	if m <= 32 {
-		m = 64
-	} else if m <= 256 {
-		m *= 2
-	} else {
-		m += m >> 1
-	}
-	buf := make([]byte, m)
-	copy(buf, b[:n])
-	return buf
-}
-
-const initialBufSize = 128
-
-// String returns a string with the result of converting s[:n] using t, where
-// n <= len(s). If err == nil, n will be len(s). It calls Reset on t.
-func String(t Transformer, s string) (result string, n int, err error) {
-	t.Reset()
-	if s == "" {
-		// Fast path for the common case for empty input. Results in about a
-		// 86% reduction of running time for BenchmarkStringLowerEmpty.
-		if _, _, err := t.Transform(nil, nil, true); err == nil {
-			return "", 0, nil
-		}
-	}
-
-	// Allocate only once. Note that both dst and src escape when passed to
-	// Transform.
-	buf := [2 * initialBufSize]byte{}
-	dst := buf[:initialBufSize:initialBufSize]
-	src := buf[initialBufSize : 2*initialBufSize]
-
-	// The input string s is transformed in multiple chunks (starting with a
-	// chunk size of initialBufSize). nDst and nSrc are per-chunk (or
-	// per-Transform-call) indexes, pDst and pSrc are overall indexes.
-	nDst, nSrc := 0, 0
-	pDst, pSrc := 0, 0
-
-	// pPrefix is the length of a common prefix: the first pPrefix bytes of the
-	// result will equal the first pPrefix bytes of s. It is not guaranteed to
-	// be the largest such value, but if pPrefix, len(result) and len(s) are
-	// all equal after the final transform (i.e. calling Transform with atEOF
-	// being true returned nil error) then we don't need to allocate a new
-	// result string.
-	pPrefix := 0
-	for {
-		// Invariant: pDst == pPrefix && pSrc == pPrefix.
-
-		n := copy(src, s[pSrc:])
-		nDst, nSrc, err = t.Transform(dst, src[:n], pSrc+n == len(s))
-		pDst += nDst
-		pSrc += nSrc
-
-		// TODO:  let transformers implement an optional Spanner interface, akin
-		// to norm's QuickSpan. This would even allow us to avoid any allocation.
-		if !bytes.Equal(dst[:nDst], src[:nSrc]) {
-			break
-		}
-		pPrefix = pSrc
-		if err == ErrShortDst {
-			// A buffer can only be short if a transformer modifies its input.
-			break
-		} else if err == ErrShortSrc {
-			if nSrc == 0 {
-				// No progress was made.
-				break
-			}
-			// Equal so far and !atEOF, so continue checking.
-		} else if err != nil || pPrefix == len(s) {
-			return string(s[:pPrefix]), pPrefix, err
-		}
-	}
-	// Post-condition: pDst == pPrefix + nDst && pSrc == pPrefix + nSrc.
-
-	// We have transformed the first pSrc bytes of the input s to become pDst
-	// transformed bytes. Those transformed bytes are discontiguous: the first
-	// pPrefix of them equal s[:pPrefix] and the last nDst of them equal
-	// dst[:nDst]. We copy them around, into a new dst buffer if necessary, so
-	// that they become one contiguous slice: dst[:pDst].
-	if pPrefix != 0 {
-		newDst := dst
-		if pDst > len(newDst) {
-			newDst = make([]byte, len(s)+nDst-nSrc)
-		}
-		copy(newDst[pPrefix:pDst], dst[:nDst])
-		copy(newDst[:pPrefix], s[:pPrefix])
-		dst = newDst
-	}
-
-	// Prevent duplicate Transform calls with atEOF being true at the end of
-	// the input. Also return if we have an unrecoverable error.
-	if (err == nil && pSrc == len(s)) ||
-		(err != nil && err != ErrShortDst && err != ErrShortSrc) {
-		return string(dst[:pDst]), pSrc, err
-	}
-
-	// Transform the remaining input, growing dst and src buffers as necessary.
-	for {
-		n := copy(src, s[pSrc:])
-		nDst, nSrc, err := t.Transform(dst[pDst:], src[:n], pSrc+n == len(s))
-		pDst += nDst
-		pSrc += nSrc
-
-		// If we got ErrShortDst or ErrShortSrc, do not grow as long as we can
-		// make progress. This may avoid excessive allocations.
-		if err == ErrShortDst {
-			if nDst == 0 {
-				dst = grow(dst, pDst)
-			}
-		} else if err == ErrShortSrc {
-			if nSrc == 0 {
-				src = grow(src, 0)
-			}
-		} else if err != nil || pSrc == len(s) {
-			return string(dst[:pDst]), pSrc, err
-		}
-	}
-}
-
-// Bytes returns a new byte slice with the result of converting b[:n] using t,
-// where n <= len(b). If err == nil, n will be len(b). It calls Reset on t.
-func Bytes(t Transformer, b []byte) (result []byte, n int, err error) {
-	return doAppend(t, 0, make([]byte, len(b)), b)
-}
-
-// Append appends the result of converting src[:n] using t to dst, where
-// n <= len(src), If err == nil, n will be len(src). It calls Reset on t.
-func Append(t Transformer, dst, src []byte) (result []byte, n int, err error) {
-	if len(dst) == cap(dst) {
-		n := len(src) + len(dst) // It is okay for this to be 0.
-		b := make([]byte, n)
-		dst = b[:copy(b, dst)]
-	}
-	return doAppend(t, len(dst), dst[:cap(dst)], src)
-}
-
-func doAppend(t Transformer, pDst int, dst, src []byte) (result []byte, n int, err error) {
-	t.Reset()
-	pSrc := 0
-	for {
-		nDst, nSrc, err := t.Transform(dst[pDst:], src[pSrc:], true)
-		pDst += nDst
-		pSrc += nSrc
-		if err != ErrShortDst {
-			return dst[:pDst], pSrc, err
-		}
-
-		// Grow the destination buffer, but do not grow as long as we can make
-		// progress. This may avoid excessive allocations.
-		if nDst == 0 {
-			dst = grow(dst, pDst)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/bidi/bidi.go b/vendor/golang.org/x/text/unicode/bidi/bidi.go
deleted file mode 100644
index 3fc4a62521..0000000000
--- a/vendor/golang.org/x/text/unicode/bidi/bidi.go
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate go run gen.go gen_trieval.go gen_ranges.go
-
-// Package bidi contains functionality for bidirectional text support.
-//
-// See http://www.unicode.org/reports/tr9.
-//
-// NOTE: UNDER CONSTRUCTION. This API may change in backwards incompatible ways
-// and without notice.
-package bidi // import "golang.org/x/text/unicode/bidi"
-
-// TODO:
-// The following functionality would not be hard to implement, but hinges on
-// the definition of a Segmenter interface. For now this is up to the user.
-// - Iterate over paragraphs
-// - Segmenter to iterate over runs directly from a given text.
-// Also:
-// - Transformer for reordering?
-// - Transformer (validator, really) for Bidi Rule.
-
-// This API tries to avoid dealing with embedding levels for now. Under the hood
-// these will be computed, but the question is to which extent the user should
-// know they exist. We should at some point allow the user to specify an
-// embedding hierarchy, though.
-
-// A Direction indicates the overall flow of text.
-type Direction int
-
-const (
-	// LeftToRight indicates the text contains no right-to-left characters and
-	// that either there are some left-to-right characters or the option
-	// DefaultDirection(LeftToRight) was passed.
-	LeftToRight Direction = iota
-
-	// RightToLeft indicates the text contains no left-to-right characters and
-	// that either there are some right-to-left characters or the option
-	// DefaultDirection(RightToLeft) was passed.
-	RightToLeft
-
-	// Mixed indicates text contains both left-to-right and right-to-left
-	// characters.
-	Mixed
-
-	// Neutral means that text contains no left-to-right and right-to-left
-	// characters and that no default direction has been set.
-	Neutral
-)
-
-type options struct{}
-
-// An Option is an option for Bidi processing.
-type Option func(*options)
-
-// ICU allows the user to define embedding levels. This may be used, for example,
-// to use hierarchical structure of markup languages to define embeddings.
-// The following option may be a way to expose this functionality in this API.
-// // LevelFunc sets a function that associates nesting levels with the given text.
-// // The levels function will be called with monotonically increasing values for p.
-// func LevelFunc(levels func(p int) int) Option {
-// 	panic("unimplemented")
-// }
-
-// DefaultDirection sets the default direction for a Paragraph. The direction is
-// overridden if the text contains directional characters.
-func DefaultDirection(d Direction) Option {
-	panic("unimplemented")
-}
-
-// A Paragraph holds a single Paragraph for Bidi processing.
-type Paragraph struct {
-	// buffers
-}
-
-// SetBytes configures p for the given paragraph text. It replaces text
-// previously set by SetBytes or SetString. If b contains a paragraph separator
-// it will only process the first paragraph and report the number of bytes
-// consumed from b including this separator. Error may be non-nil if options are
-// given.
-func (p *Paragraph) SetBytes(b []byte, opts ...Option) (n int, err error) {
-	panic("unimplemented")
-}
-
-// SetString configures p for the given paragraph text. It replaces text
-// previously set by SetBytes or SetString. If b contains a paragraph separator
-// it will only process the first paragraph and report the number of bytes
-// consumed from b including this separator. Error may be non-nil if options are
-// given.
-func (p *Paragraph) SetString(s string, opts ...Option) (n int, err error) {
-	panic("unimplemented")
-}
-
-// IsLeftToRight reports whether the principle direction of rendering for this
-// paragraphs is left-to-right. If this returns false, the principle direction
-// of rendering is right-to-left.
-func (p *Paragraph) IsLeftToRight() bool {
-	panic("unimplemented")
-}
-
-// Direction returns the direction of the text of this paragraph.
-//
-// The direction may be LeftToRight, RightToLeft, Mixed, or Neutral.
-func (p *Paragraph) Direction() Direction {
-	panic("unimplemented")
-}
-
-// RunAt reports the Run at the given position of the input text.
-//
-// This method can be used for computing line breaks on paragraphs.
-func (p *Paragraph) RunAt(pos int) Run {
-	panic("unimplemented")
-}
-
-// Order computes the visual ordering of all the runs in a Paragraph.
-func (p *Paragraph) Order() (Ordering, error) {
-	panic("unimplemented")
-}
-
-// Line computes the visual ordering of runs for a single line starting and
-// ending at the given positions in the original text.
-func (p *Paragraph) Line(start, end int) (Ordering, error) {
-	panic("unimplemented")
-}
-
-// An Ordering holds the computed visual order of runs of a Paragraph. Calling
-// SetBytes or SetString on the originating Paragraph invalidates an Ordering.
-// The methods of an Ordering should only be called by one goroutine at a time.
-type Ordering struct{}
-
-// Direction reports the directionality of the runs.
-//
-// The direction may be LeftToRight, RightToLeft, Mixed, or Neutral.
-func (o *Ordering) Direction() Direction {
-	panic("unimplemented")
-}
-
-// NumRuns returns the number of runs.
-func (o *Ordering) NumRuns() int {
-	panic("unimplemented")
-}
-
-// Run returns the ith run within the ordering.
-func (o *Ordering) Run(i int) Run {
-	panic("unimplemented")
-}
-
-// TODO: perhaps with options.
-// // Reorder creates a reader that reads the runes in visual order per character.
-// // Modifiers remain after the runes they modify.
-// func (l *Runs) Reorder() io.Reader {
-// 	panic("unimplemented")
-// }
-
-// A Run is a continuous sequence of characters of a single direction.
-type Run struct {
-}
-
-// String returns the text of the run in its original order.
-func (r *Run) String() string {
-	panic("unimplemented")
-}
-
-// Bytes returns the text of the run in its original order.
-func (r *Run) Bytes() []byte {
-	panic("unimplemented")
-}
-
-// TODO: methods for
-// - Display order
-// - headers and footers
-// - bracket replacement.
-
-// Direction reports the direction of the run.
-func (r *Run) Direction() Direction {
-	panic("unimplemented")
-}
-
-// Position of the Run within the text passed to SetBytes or SetString of the
-// originating Paragraph value.
-func (r *Run) Pos() (start, end int) {
-	panic("unimplemented")
-}
-
-// AppendReverse reverses the order of characters of in, appends them to out,
-// and returns the result. Modifiers will still follow the runes they modify.
-// Brackets are replaced with their counterparts.
-func AppendReverse(out, in []byte) []byte {
-	panic("unimplemented")
-}
-
-// ReverseString reverses the order of characters in s and returns a new string.
-// Modifiers will still follow the runes they modify. Brackets are replaced with
-// their counterparts.
-func ReverseString(s string) string {
-	panic("unimplemented")
-}
diff --git a/vendor/golang.org/x/text/unicode/bidi/bracket.go b/vendor/golang.org/x/text/unicode/bidi/bracket.go
deleted file mode 100644
index 601e259203..0000000000
--- a/vendor/golang.org/x/text/unicode/bidi/bracket.go
+++ /dev/null
@@ -1,335 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bidi
-
-import (
-	"container/list"
-	"fmt"
-	"sort"
-)
-
-// This file contains a port of the reference implementation of the
-// Bidi Parentheses Algorithm:
-// http://www.unicode.org/Public/PROGRAMS/BidiReferenceJava/BidiPBAReference.java
-//
-// The implementation in this file covers definitions BD14-BD16 and rule N0
-// of UAX#9.
-//
-// Some preprocessing is done for each rune before data is passed to this
-// algorithm:
-//  - opening and closing brackets are identified
-//  - a bracket pair type, like '(' and ')' is assigned a unique identifier that
-//    is identical for the opening and closing bracket. It is left to do these
-//    mappings.
-//  - The BPA algorithm requires that bracket characters that are canonical
-//    equivalents of each other be able to be substituted for each other.
-//    It is the responsibility of the caller to do this canonicalization.
-//
-// In implementing BD16, this implementation departs slightly from the "logical"
-// algorithm defined in UAX#9. In particular, the stack referenced there
-// supports operations that go beyond a "basic" stack. An equivalent
-// implementation based on a linked list is used here.
-
-// Bidi_Paired_Bracket_Type
-// BD14. An opening paired bracket is a character whose
-// Bidi_Paired_Bracket_Type property value is Open.
-//
-// BD15. A closing paired bracket is a character whose
-// Bidi_Paired_Bracket_Type property value is Close.
-type bracketType byte
-
-const (
-	bpNone bracketType = iota
-	bpOpen
-	bpClose
-)
-
-// bracketPair holds a pair of index values for opening and closing bracket
-// location of a bracket pair.
-type bracketPair struct {
-	opener int
-	closer int
-}
-
-func (b *bracketPair) String() string {
-	return fmt.Sprintf("(%v, %v)", b.opener, b.closer)
-}
-
-// bracketPairs is a slice of bracketPairs with a sort.Interface implementation.
-type bracketPairs []bracketPair
-
-func (b bracketPairs) Len() int           { return len(b) }
-func (b bracketPairs) Swap(i, j int)      { b[i], b[j] = b[j], b[i] }
-func (b bracketPairs) Less(i, j int) bool { return b[i].opener < b[j].opener }
-
-// resolvePairedBrackets runs the paired bracket part of the UBA algorithm.
-//
-// For each rune, it takes the indexes into the original string, the class the
-// bracket type (in pairTypes) and the bracket identifier (pairValues). It also
-// takes the direction type for the start-of-sentence and the embedding level.
-//
-// The identifiers for bracket types are the rune of the canonicalized opening
-// bracket for brackets (open or close) or 0 for runes that are not brackets.
-func resolvePairedBrackets(s *isolatingRunSequence) {
-	p := bracketPairer{
-		sos:              s.sos,
-		openers:          list.New(),
-		codesIsolatedRun: s.types,
-		indexes:          s.indexes,
-	}
-	dirEmbed := L
-	if s.level&1 != 0 {
-		dirEmbed = R
-	}
-	p.locateBrackets(s.p.pairTypes, s.p.pairValues)
-	p.resolveBrackets(dirEmbed, s.p.initialTypes)
-}
-
-type bracketPairer struct {
-	sos Class // direction corresponding to start of sequence
-
-	// The following is a restatement of BD 16 using non-algorithmic language.
-	//
-	// A bracket pair is a pair of characters consisting of an opening
-	// paired bracket and a closing paired bracket such that the
-	// Bidi_Paired_Bracket property value of the former equals the latter,
-	// subject to the following constraints.
-	// - both characters of a pair occur in the same isolating run sequence
-	// - the closing character of a pair follows the opening character
-	// - any bracket character can belong at most to one pair, the earliest possible one
-	// - any bracket character not part of a pair is treated like an ordinary character
-	// - pairs may nest properly, but their spans may not overlap otherwise
-
-	// Bracket characters with canonical decompositions are supposed to be
-	// treated as if they had been normalized, to allow normalized and non-
-	// normalized text to give the same result. In this implementation that step
-	// is pushed out to the caller. The caller has to ensure that the pairValue
-	// slices contain the rune of the opening bracket after normalization for
-	// any opening or closing bracket.
-
-	openers *list.List // list of positions for opening brackets
-
-	// bracket pair positions sorted by location of opening bracket
-	pairPositions bracketPairs
-
-	codesIsolatedRun []Class // directional bidi codes for an isolated run
-	indexes          []int   // array of index values into the original string
-
-}
-
-// matchOpener reports whether characters at given positions form a matching
-// bracket pair.
-func (p *bracketPairer) matchOpener(pairValues []rune, opener, closer int) bool {
-	return pairValues[p.indexes[opener]] == pairValues[p.indexes[closer]]
-}
-
-const maxPairingDepth = 63
-
-// locateBrackets locates matching bracket pairs according to BD16.
-//
-// This implementation uses a linked list instead of a stack, because, while
-// elements are added at the front (like a push) they are not generally removed
-// in atomic 'pop' operations, reducing the benefit of the stack archetype.
-func (p *bracketPairer) locateBrackets(pairTypes []bracketType, pairValues []rune) {
-	// traverse the run
-	// do that explicitly (not in a for-each) so we can record position
-	for i, index := range p.indexes {
-
-		// look at the bracket type for each character
-		if pairTypes[index] == bpNone || p.codesIsolatedRun[i] != ON {
-			// continue scanning
-			continue
-		}
-		switch pairTypes[index] {
-		case bpOpen:
-			// check if maximum pairing depth reached
-			if p.openers.Len() == maxPairingDepth {
-				p.openers.Init()
-				return
-			}
-			// remember opener location, most recent first
-			p.openers.PushFront(i)
-
-		case bpClose:
-			// see if there is a match
-			count := 0
-			for elem := p.openers.Front(); elem != nil; elem = elem.Next() {
-				count++
-				opener := elem.Value.(int)
-				if p.matchOpener(pairValues, opener, i) {
-					// if the opener matches, add nested pair to the ordered list
-					p.pairPositions = append(p.pairPositions, bracketPair{opener, i})
-					// remove up to and including matched opener
-					for ; count > 0; count-- {
-						p.openers.Remove(p.openers.Front())
-					}
-					break
-				}
-			}
-			sort.Sort(p.pairPositions)
-			// if we get here, the closing bracket matched no openers
-			// and gets ignored
-		}
-	}
-}
-
-// Bracket pairs within an isolating run sequence are processed as units so
-// that both the opening and the closing paired bracket in a pair resolve to
-// the same direction.
-//
-// N0. Process bracket pairs in an isolating run sequence sequentially in
-// the logical order of the text positions of the opening paired brackets
-// using the logic given below. Within this scope, bidirectional types EN
-// and AN are treated as R.
-//
-// Identify the bracket pairs in the current isolating run sequence
-// according to BD16. For each bracket-pair element in the list of pairs of
-// text positions:
-//
-// a Inspect the bidirectional types of the characters enclosed within the
-// bracket pair.
-//
-// b If any strong type (either L or R) matching the embedding direction is
-// found, set the type for both brackets in the pair to match the embedding
-// direction.
-//
-// o [ e ] o -> o e e e o
-//
-// o [ o e ] -> o e o e e
-//
-// o [ NI e ] -> o e NI e e
-//
-// c Otherwise, if a strong type (opposite the embedding direction) is
-// found, test for adjacent strong types as follows: 1 First, check
-// backwards before the opening paired bracket until the first strong type
-// (L, R, or sos) is found. If that first preceding strong type is opposite
-// the embedding direction, then set the type for both brackets in the pair
-// to that type. 2 Otherwise, set the type for both brackets in the pair to
-// the embedding direction.
-//
-// o [ o ] e -> o o o o e
-//
-// o [ o NI ] o -> o o o NI o o
-//
-// e [ o ] o -> e e o e o
-//
-// e [ o ] e -> e e o e e
-//
-// e ( o [ o ] NI ) e -> e e o o o o NI e e
-//
-// d Otherwise, do not set the type for the current bracket pair. Note that
-// if the enclosed text contains no strong types the paired brackets will
-// both resolve to the same level when resolved individually using rules N1
-// and N2.
-//
-// e ( NI ) o -> e ( NI ) o
-
-// getStrongTypeN0 maps character's directional code to strong type as required
-// by rule N0.
-//
-// TODO: have separate type for "strong" directionality.
-func (p *bracketPairer) getStrongTypeN0(index int) Class {
-	switch p.codesIsolatedRun[index] {
-	// in the scope of N0, number types are treated as R
-	case EN, AN, AL, R:
-		return R
-	case L:
-		return L
-	default:
-		return ON
-	}
-}
-
-// classifyPairContent reports the strong types contained inside a Bracket Pair,
-// assuming the given embedding direction.
-//
-// It returns ON if no strong type is found. If a single strong type is found,
-// it returns this this type. Otherwise it returns the embedding direction.
-//
-// TODO: use separate type for "strong" directionality.
-func (p *bracketPairer) classifyPairContent(loc bracketPair, dirEmbed Class) Class {
-	dirOpposite := ON
-	for i := loc.opener + 1; i < loc.closer; i++ {
-		dir := p.getStrongTypeN0(i)
-		if dir == ON {
-			continue
-		}
-		if dir == dirEmbed {
-			return dir // type matching embedding direction found
-		}
-		dirOpposite = dir
-	}
-	// return ON if no strong type found, or class opposite to dirEmbed
-	return dirOpposite
-}
-
-// classBeforePair determines which strong types are present before a Bracket
-// Pair. Return R or L if strong type found, otherwise ON.
-func (p *bracketPairer) classBeforePair(loc bracketPair) Class {
-	for i := loc.opener - 1; i >= 0; i-- {
-		if dir := p.getStrongTypeN0(i); dir != ON {
-			return dir
-		}
-	}
-	// no strong types found, return sos
-	return p.sos
-}
-
-// assignBracketType implements rule N0 for a single bracket pair.
-func (p *bracketPairer) assignBracketType(loc bracketPair, dirEmbed Class, initialTypes []Class) {
-	// rule "N0, a", inspect contents of pair
-	dirPair := p.classifyPairContent(loc, dirEmbed)
-
-	// dirPair is now L, R, or N (no strong type found)
-
-	// the following logical tests are performed out of order compared to
-	// the statement of the rules but yield the same results
-	if dirPair == ON {
-		return // case "d" - nothing to do
-	}
-
-	if dirPair != dirEmbed {
-		// case "c": strong type found, opposite - check before (c.1)
-		dirPair = p.classBeforePair(loc)
-		if dirPair == dirEmbed || dirPair == ON {
-			// no strong opposite type found before - use embedding (c.2)
-			dirPair = dirEmbed
-		}
-	}
-	// else: case "b", strong type found matching embedding,
-	// no explicit action needed, as dirPair is already set to embedding
-	// direction
-
-	// set the bracket types to the type found
-	p.setBracketsToType(loc, dirPair, initialTypes)
-}
-
-func (p *bracketPairer) setBracketsToType(loc bracketPair, dirPair Class, initialTypes []Class) {
-	p.codesIsolatedRun[loc.opener] = dirPair
-	p.codesIsolatedRun[loc.closer] = dirPair
-
-	for i := loc.opener + 1; i < loc.closer; i++ {
-		index := p.indexes[i]
-		if initialTypes[index] != NSM {
-			break
-		}
-		p.codesIsolatedRun[i] = dirPair
-	}
-
-	for i := loc.closer + 1; i < len(p.indexes); i++ {
-		index := p.indexes[i]
-		if initialTypes[index] != NSM {
-			break
-		}
-		p.codesIsolatedRun[i] = dirPair
-	}
-}
-
-// resolveBrackets implements rule N0 for a list of pairs.
-func (p *bracketPairer) resolveBrackets(dirEmbed Class, initialTypes []Class) {
-	for _, loc := range p.pairPositions {
-		p.assignBracketType(loc, dirEmbed, initialTypes)
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/bidi/core.go b/vendor/golang.org/x/text/unicode/bidi/core.go
deleted file mode 100644
index d4c1399f0d..0000000000
--- a/vendor/golang.org/x/text/unicode/bidi/core.go
+++ /dev/null
@@ -1,1058 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bidi
-
-import "log"
-
-// This implementation is a port based on the reference implementation found at:
-// http://www.unicode.org/Public/PROGRAMS/BidiReferenceJava/
-//
-// described in Unicode Bidirectional Algorithm (UAX #9).
-//
-// Input:
-// There are two levels of input to the algorithm, since clients may prefer to
-// supply some information from out-of-band sources rather than relying on the
-// default behavior.
-//
-// - Bidi class array
-// - Bidi class array, with externally supplied base line direction
-//
-// Output:
-// Output is separated into several stages:
-//
-//  - levels array over entire paragraph
-//  - reordering array over entire paragraph
-//  - levels array over line
-//  - reordering array over line
-//
-// Note that for conformance to the Unicode Bidirectional Algorithm,
-// implementations are only required to generate correct reordering and
-// character directionality (odd or even levels) over a line. Generating
-// identical level arrays over a line is not required. Bidi explicit format
-// codes (LRE, RLE, LRO, RLO, PDF) and BN can be assigned arbitrary levels and
-// positions as long as the rest of the input is properly reordered.
-//
-// As the algorithm is defined to operate on a single paragraph at a time, this
-// implementation is written to handle single paragraphs. Thus rule P1 is
-// presumed by this implementation-- the data provided to the implementation is
-// assumed to be a single paragraph, and either contains no 'B' codes, or a
-// single 'B' code at the end of the input. 'B' is allowed as input to
-// illustrate how the algorithm assigns it a level.
-//
-// Also note that rules L3 and L4 depend on the rendering engine that uses the
-// result of the bidi algorithm. This implementation assumes that the rendering
-// engine expects combining marks in visual order (e.g. to the left of their
-// base character in RTL runs) and that it adjusts the glyphs used to render
-// mirrored characters that are in RTL runs so that they render appropriately.
-
-// level is the embedding level of a character. Even embedding levels indicate
-// left-to-right order and odd levels indicate right-to-left order. The special
-// level of -1 is reserved for undefined order.
-type level int8
-
-const implicitLevel level = -1
-
-// in returns if x is equal to any of the values in set.
-func (c Class) in(set ...Class) bool {
-	for _, s := range set {
-		if c == s {
-			return true
-		}
-	}
-	return false
-}
-
-// A paragraph contains the state of a paragraph.
-type paragraph struct {
-	initialTypes []Class
-
-	// Arrays of properties needed for paired bracket evaluation in N0
-	pairTypes  []bracketType // paired Bracket types for paragraph
-	pairValues []rune        // rune for opening bracket or pbOpen and pbClose; 0 for pbNone
-
-	embeddingLevel level // default: = implicitLevel;
-
-	// at the paragraph levels
-	resultTypes  []Class
-	resultLevels []level
-
-	// Index of matching PDI for isolate initiator characters. For other
-	// characters, the value of matchingPDI will be set to -1. For isolate
-	// initiators with no matching PDI, matchingPDI will be set to the length of
-	// the input string.
-	matchingPDI []int
-
-	// Index of matching isolate initiator for PDI characters. For other
-	// characters, and for PDIs with no matching isolate initiator, the value of
-	// matchingIsolateInitiator will be set to -1.
-	matchingIsolateInitiator []int
-}
-
-// newParagraph initializes a paragraph. The user needs to supply a few arrays
-// corresponding to the preprocessed text input. The types correspond to the
-// Unicode BiDi classes for each rune. pairTypes indicates the bracket type for
-// each rune. pairValues provides a unique bracket class identifier for each
-// rune (suggested is the rune of the open bracket for opening and matching
-// close brackets, after normalization). The embedding levels are optional, but
-// may be supplied to encode embedding levels of styled text.
-//
-// TODO: return an error.
-func newParagraph(types []Class, pairTypes []bracketType, pairValues []rune, levels level) *paragraph {
-	validateTypes(types)
-	validatePbTypes(pairTypes)
-	validatePbValues(pairValues, pairTypes)
-	validateParagraphEmbeddingLevel(levels)
-
-	p := &paragraph{
-		initialTypes:   append([]Class(nil), types...),
-		embeddingLevel: levels,
-
-		pairTypes:  pairTypes,
-		pairValues: pairValues,
-
-		resultTypes: append([]Class(nil), types...),
-	}
-	p.run()
-	return p
-}
-
-func (p *paragraph) Len() int { return len(p.initialTypes) }
-
-// The algorithm. Does not include line-based processing (Rules L1, L2).
-// These are applied later in the line-based phase of the algorithm.
-func (p *paragraph) run() {
-	p.determineMatchingIsolates()
-
-	// 1) determining the paragraph level
-	// Rule P1 is the requirement for entering this algorithm.
-	// Rules P2, P3.
-	// If no externally supplied paragraph embedding level, use default.
-	if p.embeddingLevel == implicitLevel {
-		p.embeddingLevel = p.determineParagraphEmbeddingLevel(0, p.Len())
-	}
-
-	// Initialize result levels to paragraph embedding level.
-	p.resultLevels = make([]level, p.Len())
-	setLevels(p.resultLevels, p.embeddingLevel)
-
-	// 2) Explicit levels and directions
-	// Rules X1-X8.
-	p.determineExplicitEmbeddingLevels()
-
-	// Rule X9.
-	// We do not remove the embeddings, the overrides, the PDFs, and the BNs
-	// from the string explicitly. But they are not copied into isolating run
-	// sequences when they are created, so they are removed for all
-	// practical purposes.
-
-	// Rule X10.
-	// Run remainder of algorithm one isolating run sequence at a time
-	for _, seq := range p.determineIsolatingRunSequences() {
-		// 3) resolving weak types
-		// Rules W1-W7.
-		seq.resolveWeakTypes()
-
-		// 4a) resolving paired brackets
-		// Rule N0
-		resolvePairedBrackets(seq)
-
-		// 4b) resolving neutral types
-		// Rules N1-N3.
-		seq.resolveNeutralTypes()
-
-		// 5) resolving implicit embedding levels
-		// Rules I1, I2.
-		seq.resolveImplicitLevels()
-
-		// Apply the computed levels and types
-		seq.applyLevelsAndTypes()
-	}
-
-	// Assign appropriate levels to 'hide' LREs, RLEs, LROs, RLOs, PDFs, and
-	// BNs. This is for convenience, so the resulting level array will have
-	// a value for every character.
-	p.assignLevelsToCharactersRemovedByX9()
-}
-
-// determineMatchingIsolates determines the matching PDI for each isolate
-// initiator and vice versa.
-//
-// Definition BD9.
-//
-// At the end of this function:
-//
-//  - The member variable matchingPDI is set to point to the index of the
-//    matching PDI character for each isolate initiator character. If there is
-//    no matching PDI, it is set to the length of the input text. For other
-//    characters, it is set to -1.
-//  - The member variable matchingIsolateInitiator is set to point to the
-//    index of the matching isolate initiator character for each PDI character.
-//    If there is no matching isolate initiator, or the character is not a PDI,
-//    it is set to -1.
-func (p *paragraph) determineMatchingIsolates() {
-	p.matchingPDI = make([]int, p.Len())
-	p.matchingIsolateInitiator = make([]int, p.Len())
-
-	for i := range p.matchingIsolateInitiator {
-		p.matchingIsolateInitiator[i] = -1
-	}
-
-	for i := range p.matchingPDI {
-		p.matchingPDI[i] = -1
-
-		if t := p.resultTypes[i]; t.in(LRI, RLI, FSI) {
-			depthCounter := 1
-			for j := i + 1; j < p.Len(); j++ {
-				if u := p.resultTypes[j]; u.in(LRI, RLI, FSI) {
-					depthCounter++
-				} else if u == PDI {
-					if depthCounter--; depthCounter == 0 {
-						p.matchingPDI[i] = j
-						p.matchingIsolateInitiator[j] = i
-						break
-					}
-				}
-			}
-			if p.matchingPDI[i] == -1 {
-				p.matchingPDI[i] = p.Len()
-			}
-		}
-	}
-}
-
-// determineParagraphEmbeddingLevel reports the resolved paragraph direction of
-// the substring limited by the given range [start, end).
-//
-// Determines the paragraph level based on rules P2, P3. This is also used
-// in rule X5c to find if an FSI should resolve to LRI or RLI.
-func (p *paragraph) determineParagraphEmbeddingLevel(start, end int) level {
-	var strongType Class = unknownClass
-
-	// Rule P2.
-	for i := start; i < end; i++ {
-		if t := p.resultTypes[i]; t.in(L, AL, R) {
-			strongType = t
-			break
-		} else if t.in(FSI, LRI, RLI) {
-			i = p.matchingPDI[i] // skip over to the matching PDI
-			if i > end {
-				log.Panic("assert (i <= end)")
-			}
-		}
-	}
-	// Rule P3.
-	switch strongType {
-	case unknownClass: // none found
-		// default embedding level when no strong types found is 0.
-		return 0
-	case L:
-		return 0
-	default: // AL, R
-		return 1
-	}
-}
-
-const maxDepth = 125
-
-// This stack will store the embedding levels and override and isolated
-// statuses
-type directionalStatusStack struct {
-	stackCounter        int
-	embeddingLevelStack [maxDepth + 1]level
-	overrideStatusStack [maxDepth + 1]Class
-	isolateStatusStack  [maxDepth + 1]bool
-}
-
-func (s *directionalStatusStack) empty()     { s.stackCounter = 0 }
-func (s *directionalStatusStack) pop()       { s.stackCounter-- }
-func (s *directionalStatusStack) depth() int { return s.stackCounter }
-
-func (s *directionalStatusStack) push(level level, overrideStatus Class, isolateStatus bool) {
-	s.embeddingLevelStack[s.stackCounter] = level
-	s.overrideStatusStack[s.stackCounter] = overrideStatus
-	s.isolateStatusStack[s.stackCounter] = isolateStatus
-	s.stackCounter++
-}
-
-func (s *directionalStatusStack) lastEmbeddingLevel() level {
-	return s.embeddingLevelStack[s.stackCounter-1]
-}
-
-func (s *directionalStatusStack) lastDirectionalOverrideStatus() Class {
-	return s.overrideStatusStack[s.stackCounter-1]
-}
-
-func (s *directionalStatusStack) lastDirectionalIsolateStatus() bool {
-	return s.isolateStatusStack[s.stackCounter-1]
-}
-
-// Determine explicit levels using rules X1 - X8
-func (p *paragraph) determineExplicitEmbeddingLevels() {
-	var stack directionalStatusStack
-	var overflowIsolateCount, overflowEmbeddingCount, validIsolateCount int
-
-	// Rule X1.
-	stack.push(p.embeddingLevel, ON, false)
-
-	for i, t := range p.resultTypes {
-		// Rules X2, X3, X4, X5, X5a, X5b, X5c
-		switch t {
-		case RLE, LRE, RLO, LRO, RLI, LRI, FSI:
-			isIsolate := t.in(RLI, LRI, FSI)
-			isRTL := t.in(RLE, RLO, RLI)
-
-			// override if this is an FSI that resolves to RLI
-			if t == FSI {
-				isRTL = (p.determineParagraphEmbeddingLevel(i+1, p.matchingPDI[i]) == 1)
-			}
-			if isIsolate {
-				p.resultLevels[i] = stack.lastEmbeddingLevel()
-				if stack.lastDirectionalOverrideStatus() != ON {
-					p.resultTypes[i] = stack.lastDirectionalOverrideStatus()
-				}
-			}
-
-			var newLevel level
-			if isRTL {
-				// least greater odd
-				newLevel = (stack.lastEmbeddingLevel() + 1) | 1
-			} else {
-				// least greater even
-				newLevel = (stack.lastEmbeddingLevel() + 2) &^ 1
-			}
-
-			if newLevel <= maxDepth && overflowIsolateCount == 0 && overflowEmbeddingCount == 0 {
-				if isIsolate {
-					validIsolateCount++
-				}
-				// Push new embedding level, override status, and isolated
-				// status.
-				// No check for valid stack counter, since the level check
-				// suffices.
-				switch t {
-				case LRO:
-					stack.push(newLevel, L, isIsolate)
-				case RLO:
-					stack.push(newLevel, R, isIsolate)
-				default:
-					stack.push(newLevel, ON, isIsolate)
-				}
-				// Not really part of the spec
-				if !isIsolate {
-					p.resultLevels[i] = newLevel
-				}
-			} else {
-				// This is an invalid explicit formatting character,
-				// so apply the "Otherwise" part of rules X2-X5b.
-				if isIsolate {
-					overflowIsolateCount++
-				} else { // !isIsolate
-					if overflowIsolateCount == 0 {
-						overflowEmbeddingCount++
-					}
-				}
-			}
-
-		// Rule X6a
-		case PDI:
-			if overflowIsolateCount > 0 {
-				overflowIsolateCount--
-			} else if validIsolateCount == 0 {
-				// do nothing
-			} else {
-				overflowEmbeddingCount = 0
-				for !stack.lastDirectionalIsolateStatus() {
-					stack.pop()
-				}
-				stack.pop()
-				validIsolateCount--
-			}
-			p.resultLevels[i] = stack.lastEmbeddingLevel()
-
-		// Rule X7
-		case PDF:
-			// Not really part of the spec
-			p.resultLevels[i] = stack.lastEmbeddingLevel()
-
-			if overflowIsolateCount > 0 {
-				// do nothing
-			} else if overflowEmbeddingCount > 0 {
-				overflowEmbeddingCount--
-			} else if !stack.lastDirectionalIsolateStatus() && stack.depth() >= 2 {
-				stack.pop()
-			}
-
-		case B: // paragraph separator.
-			// Rule X8.
-
-			// These values are reset for clarity, in this implementation B
-			// can only occur as the last code in the array.
-			stack.empty()
-			overflowIsolateCount = 0
-			overflowEmbeddingCount = 0
-			validIsolateCount = 0
-			p.resultLevels[i] = p.embeddingLevel
-
-		default:
-			p.resultLevels[i] = stack.lastEmbeddingLevel()
-			if stack.lastDirectionalOverrideStatus() != ON {
-				p.resultTypes[i] = stack.lastDirectionalOverrideStatus()
-			}
-		}
-	}
-}
-
-type isolatingRunSequence struct {
-	p *paragraph
-
-	indexes []int // indexes to the original string
-
-	types          []Class // type of each character using the index
-	resolvedLevels []level // resolved levels after application of rules
-	level          level
-	sos, eos       Class
-}
-
-func (i *isolatingRunSequence) Len() int { return len(i.indexes) }
-
-func maxLevel(a, b level) level {
-	if a > b {
-		return a
-	}
-	return b
-}
-
-// Rule X10, second bullet: Determine the start-of-sequence (sos) and end-of-sequence (eos) types,
-// 			 either L or R, for each isolating run sequence.
-func (p *paragraph) isolatingRunSequence(indexes []int) *isolatingRunSequence {
-	length := len(indexes)
-	types := make([]Class, length)
-	for i, x := range indexes {
-		types[i] = p.resultTypes[x]
-	}
-
-	// assign level, sos and eos
-	prevChar := indexes[0] - 1
-	for prevChar >= 0 && isRemovedByX9(p.initialTypes[prevChar]) {
-		prevChar--
-	}
-	prevLevel := p.embeddingLevel
-	if prevChar >= 0 {
-		prevLevel = p.resultLevels[prevChar]
-	}
-
-	var succLevel level
-	lastType := types[length-1]
-	if lastType.in(LRI, RLI, FSI) {
-		succLevel = p.embeddingLevel
-	} else {
-		// the first character after the end of run sequence
-		limit := indexes[length-1] + 1
-		for ; limit < p.Len() && isRemovedByX9(p.initialTypes[limit]); limit++ {
-
-		}
-		succLevel = p.embeddingLevel
-		if limit < p.Len() {
-			succLevel = p.resultLevels[limit]
-		}
-	}
-	level := p.resultLevels[indexes[0]]
-	return &isolatingRunSequence{
-		p:       p,
-		indexes: indexes,
-		types:   types,
-		level:   level,
-		sos:     typeForLevel(maxLevel(prevLevel, level)),
-		eos:     typeForLevel(maxLevel(succLevel, level)),
-	}
-}
-
-// Resolving weak types Rules W1-W7.
-//
-// Note that some weak types (EN, AN) remain after this processing is
-// complete.
-func (s *isolatingRunSequence) resolveWeakTypes() {
-
-	// on entry, only these types remain
-	s.assertOnly(L, R, AL, EN, ES, ET, AN, CS, B, S, WS, ON, NSM, LRI, RLI, FSI, PDI)
-
-	// Rule W1.
-	// Changes all NSMs.
-	preceedingCharacterType := s.sos
-	for i, t := range s.types {
-		if t == NSM {
-			s.types[i] = preceedingCharacterType
-		} else {
-			if t.in(LRI, RLI, FSI, PDI) {
-				preceedingCharacterType = ON
-			}
-			preceedingCharacterType = t
-		}
-	}
-
-	// Rule W2.
-	// EN does not change at the start of the run, because sos != AL.
-	for i, t := range s.types {
-		if t == EN {
-			for j := i - 1; j >= 0; j-- {
-				if t := s.types[j]; t.in(L, R, AL) {
-					if t == AL {
-						s.types[i] = AN
-					}
-					break
-				}
-			}
-		}
-	}
-
-	// Rule W3.
-	for i, t := range s.types {
-		if t == AL {
-			s.types[i] = R
-		}
-	}
-
-	// Rule W4.
-	// Since there must be values on both sides for this rule to have an
-	// effect, the scan skips the first and last value.
-	//
-	// Although the scan proceeds left to right, and changes the type
-	// values in a way that would appear to affect the computations
-	// later in the scan, there is actually no problem. A change in the
-	// current value can only affect the value to its immediate right,
-	// and only affect it if it is ES or CS. But the current value can
-	// only change if the value to its right is not ES or CS. Thus
-	// either the current value will not change, or its change will have
-	// no effect on the remainder of the analysis.
-
-	for i := 1; i < s.Len()-1; i++ {
-		t := s.types[i]
-		if t == ES || t == CS {
-			prevSepType := s.types[i-1]
-			succSepType := s.types[i+1]
-			if prevSepType == EN && succSepType == EN {
-				s.types[i] = EN
-			} else if s.types[i] == CS && prevSepType == AN && succSepType == AN {
-				s.types[i] = AN
-			}
-		}
-	}
-
-	// Rule W5.
-	for i, t := range s.types {
-		if t == ET {
-			// locate end of sequence
-			runStart := i
-			runEnd := s.findRunLimit(runStart, ET)
-
-			// check values at ends of sequence
-			t := s.sos
-			if runStart > 0 {
-				t = s.types[runStart-1]
-			}
-			if t != EN {
-				t = s.eos
-				if runEnd < len(s.types) {
-					t = s.types[runEnd]
-				}
-			}
-			if t == EN {
-				setTypes(s.types[runStart:runEnd], EN)
-			}
-			// continue at end of sequence
-			i = runEnd
-		}
-	}
-
-	// Rule W6.
-	for i, t := range s.types {
-		if t.in(ES, ET, CS) {
-			s.types[i] = ON
-		}
-	}
-
-	// Rule W7.
-	for i, t := range s.types {
-		if t == EN {
-			// set default if we reach start of run
-			prevStrongType := s.sos
-			for j := i - 1; j >= 0; j-- {
-				t = s.types[j]
-				if t == L || t == R { // AL's have been changed to R
-					prevStrongType = t
-					break
-				}
-			}
-			if prevStrongType == L {
-				s.types[i] = L
-			}
-		}
-	}
-}
-
-// 6) resolving neutral types Rules N1-N2.
-func (s *isolatingRunSequence) resolveNeutralTypes() {
-
-	// on entry, only these types can be in resultTypes
-	s.assertOnly(L, R, EN, AN, B, S, WS, ON, RLI, LRI, FSI, PDI)
-
-	for i, t := range s.types {
-		switch t {
-		case WS, ON, B, S, RLI, LRI, FSI, PDI:
-			// find bounds of run of neutrals
-			runStart := i
-			runEnd := s.findRunLimit(runStart, B, S, WS, ON, RLI, LRI, FSI, PDI)
-
-			// determine effective types at ends of run
-			var leadType, trailType Class
-
-			// Note that the character found can only be L, R, AN, or
-			// EN.
-			if runStart == 0 {
-				leadType = s.sos
-			} else {
-				leadType = s.types[runStart-1]
-				if leadType.in(AN, EN) {
-					leadType = R
-				}
-			}
-			if runEnd == len(s.types) {
-				trailType = s.eos
-			} else {
-				trailType = s.types[runEnd]
-				if trailType.in(AN, EN) {
-					trailType = R
-				}
-			}
-
-			var resolvedType Class
-			if leadType == trailType {
-				// Rule N1.
-				resolvedType = leadType
-			} else {
-				// Rule N2.
-				// Notice the embedding level of the run is used, not
-				// the paragraph embedding level.
-				resolvedType = typeForLevel(s.level)
-			}
-
-			setTypes(s.types[runStart:runEnd], resolvedType)
-
-			// skip over run of (former) neutrals
-			i = runEnd
-		}
-	}
-}
-
-func setLevels(levels []level, newLevel level) {
-	for i := range levels {
-		levels[i] = newLevel
-	}
-}
-
-func setTypes(types []Class, newType Class) {
-	for i := range types {
-		types[i] = newType
-	}
-}
-
-// 7) resolving implicit embedding levels Rules I1, I2.
-func (s *isolatingRunSequence) resolveImplicitLevels() {
-
-	// on entry, only these types can be in resultTypes
-	s.assertOnly(L, R, EN, AN)
-
-	s.resolvedLevels = make([]level, len(s.types))
-	setLevels(s.resolvedLevels, s.level)
-
-	if (s.level & 1) == 0 { // even level
-		for i, t := range s.types {
-			// Rule I1.
-			if t == L {
-				// no change
-			} else if t == R {
-				s.resolvedLevels[i] += 1
-			} else { // t == AN || t == EN
-				s.resolvedLevels[i] += 2
-			}
-		}
-	} else { // odd level
-		for i, t := range s.types {
-			// Rule I2.
-			if t == R {
-				// no change
-			} else { // t == L || t == AN || t == EN
-				s.resolvedLevels[i] += 1
-			}
-		}
-	}
-}
-
-// Applies the levels and types resolved in rules W1-I2 to the
-// resultLevels array.
-func (s *isolatingRunSequence) applyLevelsAndTypes() {
-	for i, x := range s.indexes {
-		s.p.resultTypes[x] = s.types[i]
-		s.p.resultLevels[x] = s.resolvedLevels[i]
-	}
-}
-
-// Return the limit of the run consisting only of the types in validSet
-// starting at index. This checks the value at index, and will return
-// index if that value is not in validSet.
-func (s *isolatingRunSequence) findRunLimit(index int, validSet ...Class) int {
-loop:
-	for ; index < len(s.types); index++ {
-		t := s.types[index]
-		for _, valid := range validSet {
-			if t == valid {
-				continue loop
-			}
-		}
-		return index // didn't find a match in validSet
-	}
-	return len(s.types)
-}
-
-// Algorithm validation. Assert that all values in types are in the
-// provided set.
-func (s *isolatingRunSequence) assertOnly(codes ...Class) {
-loop:
-	for i, t := range s.types {
-		for _, c := range codes {
-			if t == c {
-				continue loop
-			}
-		}
-		log.Panicf("invalid bidi code %v present in assertOnly at position %d", t, s.indexes[i])
-	}
-}
-
-// determineLevelRuns returns an array of level runs. Each level run is
-// described as an array of indexes into the input string.
-//
-// Determines the level runs. Rule X9 will be applied in determining the
-// runs, in the way that makes sure the characters that are supposed to be
-// removed are not included in the runs.
-func (p *paragraph) determineLevelRuns() [][]int {
-	run := []int{}
-	allRuns := [][]int{}
-	currentLevel := implicitLevel
-
-	for i := range p.initialTypes {
-		if !isRemovedByX9(p.initialTypes[i]) {
-			if p.resultLevels[i] != currentLevel {
-				// we just encountered a new run; wrap up last run
-				if currentLevel >= 0 { // only wrap it up if there was a run
-					allRuns = append(allRuns, run)
-					run = nil
-				}
-				// Start new run
-				currentLevel = p.resultLevels[i]
-			}
-			run = append(run, i)
-		}
-	}
-	// Wrap up the final run, if any
-	if len(run) > 0 {
-		allRuns = append(allRuns, run)
-	}
-	return allRuns
-}
-
-// Definition BD13. Determine isolating run sequences.
-func (p *paragraph) determineIsolatingRunSequences() []*isolatingRunSequence {
-	levelRuns := p.determineLevelRuns()
-
-	// Compute the run that each character belongs to
-	runForCharacter := make([]int, p.Len())
-	for i, run := range levelRuns {
-		for _, index := range run {
-			runForCharacter[index] = i
-		}
-	}
-
-	sequences := []*isolatingRunSequence{}
-
-	var currentRunSequence []int
-
-	for _, run := range levelRuns {
-		first := run[0]
-		if p.initialTypes[first] != PDI || p.matchingIsolateInitiator[first] == -1 {
-			currentRunSequence = nil
-			// int run = i;
-			for {
-				// Copy this level run into currentRunSequence
-				currentRunSequence = append(currentRunSequence, run...)
-
-				last := currentRunSequence[len(currentRunSequence)-1]
-				lastT := p.initialTypes[last]
-				if lastT.in(LRI, RLI, FSI) && p.matchingPDI[last] != p.Len() {
-					run = levelRuns[runForCharacter[p.matchingPDI[last]]]
-				} else {
-					break
-				}
-			}
-			sequences = append(sequences, p.isolatingRunSequence(currentRunSequence))
-		}
-	}
-	return sequences
-}
-
-// Assign level information to characters removed by rule X9. This is for
-// ease of relating the level information to the original input data. Note
-// that the levels assigned to these codes are arbitrary, they're chosen so
-// as to avoid breaking level runs.
-func (p *paragraph) assignLevelsToCharactersRemovedByX9() {
-	for i, t := range p.initialTypes {
-		if t.in(LRE, RLE, LRO, RLO, PDF, BN) {
-			p.resultTypes[i] = t
-			p.resultLevels[i] = -1
-		}
-	}
-	// now propagate forward the levels information (could have
-	// propagated backward, the main thing is not to introduce a level
-	// break where one doesn't already exist).
-
-	if p.resultLevels[0] == -1 {
-		p.resultLevels[0] = p.embeddingLevel
-	}
-	for i := 1; i < len(p.initialTypes); i++ {
-		if p.resultLevels[i] == -1 {
-			p.resultLevels[i] = p.resultLevels[i-1]
-		}
-	}
-	// Embedding information is for informational purposes only so need not be
-	// adjusted.
-}
-
-//
-// Output
-//
-
-// getLevels computes levels array breaking lines at offsets in linebreaks.
-// Rule L1.
-//
-// The linebreaks array must include at least one value. The values must be
-// in strictly increasing order (no duplicates) between 1 and the length of
-// the text, inclusive. The last value must be the length of the text.
-func (p *paragraph) getLevels(linebreaks []int) []level {
-	// Note that since the previous processing has removed all
-	// P, S, and WS values from resultTypes, the values referred to
-	// in these rules are the initial types, before any processing
-	// has been applied (including processing of overrides).
-	//
-	// This example implementation has reinserted explicit format codes
-	// and BN, in order that the levels array correspond to the
-	// initial text. Their final placement is not normative.
-	// These codes are treated like WS in this implementation,
-	// so they don't interrupt sequences of WS.
-
-	validateLineBreaks(linebreaks, p.Len())
-
-	result := append([]level(nil), p.resultLevels...)
-
-	// don't worry about linebreaks since if there is a break within
-	// a series of WS values preceding S, the linebreak itself
-	// causes the reset.
-	for i, t := range p.initialTypes {
-		if t.in(B, S) {
-			// Rule L1, clauses one and two.
-			result[i] = p.embeddingLevel
-
-			// Rule L1, clause three.
-			for j := i - 1; j >= 0; j-- {
-				if isWhitespace(p.initialTypes[j]) { // including format codes
-					result[j] = p.embeddingLevel
-				} else {
-					break
-				}
-			}
-		}
-	}
-
-	// Rule L1, clause four.
-	start := 0
-	for _, limit := range linebreaks {
-		for j := limit - 1; j >= start; j-- {
-			if isWhitespace(p.initialTypes[j]) { // including format codes
-				result[j] = p.embeddingLevel
-			} else {
-				break
-			}
-		}
-		start = limit
-	}
-
-	return result
-}
-
-// getReordering returns the reordering of lines from a visual index to a
-// logical index for line breaks at the given offsets.
-//
-// Lines are concatenated from left to right. So for example, the fifth
-// character from the left on the third line is
-//
-// 		getReordering(linebreaks)[linebreaks[1] + 4]
-//
-// (linebreaks[1] is the position after the last character of the second
-// line, which is also the index of the first character on the third line,
-// and adding four gets the fifth character from the left).
-//
-// The linebreaks array must include at least one value. The values must be
-// in strictly increasing order (no duplicates) between 1 and the length of
-// the text, inclusive. The last value must be the length of the text.
-func (p *paragraph) getReordering(linebreaks []int) []int {
-	validateLineBreaks(linebreaks, p.Len())
-
-	return computeMultilineReordering(p.getLevels(linebreaks), linebreaks)
-}
-
-// Return multiline reordering array for a given level array. Reordering
-// does not occur across a line break.
-func computeMultilineReordering(levels []level, linebreaks []int) []int {
-	result := make([]int, len(levels))
-
-	start := 0
-	for _, limit := range linebreaks {
-		tempLevels := make([]level, limit-start)
-		copy(tempLevels, levels[start:])
-
-		for j, order := range computeReordering(tempLevels) {
-			result[start+j] = order + start
-		}
-		start = limit
-	}
-	return result
-}
-
-// Return reordering array for a given level array. This reorders a single
-// line. The reordering is a visual to logical map. For example, the
-// leftmost char is string.charAt(order[0]). Rule L2.
-func computeReordering(levels []level) []int {
-	result := make([]int, len(levels))
-	// initialize order
-	for i := range result {
-		result[i] = i
-	}
-
-	// locate highest level found on line.
-	// Note the rules say text, but no reordering across line bounds is
-	// performed, so this is sufficient.
-	highestLevel := level(0)
-	lowestOddLevel := level(maxDepth + 2)
-	for _, level := range levels {
-		if level > highestLevel {
-			highestLevel = level
-		}
-		if level&1 != 0 && level < lowestOddLevel {
-			lowestOddLevel = level
-		}
-	}
-
-	for level := highestLevel; level >= lowestOddLevel; level-- {
-		for i := 0; i < len(levels); i++ {
-			if levels[i] >= level {
-				// find range of text at or above this level
-				start := i
-				limit := i + 1
-				for limit < len(levels) && levels[limit] >= level {
-					limit++
-				}
-
-				for j, k := start, limit-1; j < k; j, k = j+1, k-1 {
-					result[j], result[k] = result[k], result[j]
-				}
-				// skip to end of level run
-				i = limit
-			}
-		}
-	}
-
-	return result
-}
-
-// isWhitespace reports whether the type is considered a whitespace type for the
-// line break rules.
-func isWhitespace(c Class) bool {
-	switch c {
-	case LRE, RLE, LRO, RLO, PDF, LRI, RLI, FSI, PDI, BN, WS:
-		return true
-	}
-	return false
-}
-
-// isRemovedByX9 reports whether the type is one of the types removed in X9.
-func isRemovedByX9(c Class) bool {
-	switch c {
-	case LRE, RLE, LRO, RLO, PDF, BN:
-		return true
-	}
-	return false
-}
-
-// typeForLevel reports the strong type (L or R) corresponding to the level.
-func typeForLevel(level level) Class {
-	if (level & 0x1) == 0 {
-		return L
-	}
-	return R
-}
-
-// TODO: change validation to not panic
-
-func validateTypes(types []Class) {
-	if len(types) == 0 {
-		log.Panic("types is null")
-	}
-	for i, t := range types[:len(types)-1] {
-		if t == B {
-			log.Panicf("B type before end of paragraph at index: %d", i)
-		}
-	}
-}
-
-func validateParagraphEmbeddingLevel(embeddingLevel level) {
-	if embeddingLevel != implicitLevel &&
-		embeddingLevel != 0 &&
-		embeddingLevel != 1 {
-		log.Panicf("illegal paragraph embedding level: %d", embeddingLevel)
-	}
-}
-
-func validateLineBreaks(linebreaks []int, textLength int) {
-	prev := 0
-	for i, next := range linebreaks {
-		if next <= prev {
-			log.Panicf("bad linebreak: %d at index: %d", next, i)
-		}
-		prev = next
-	}
-	if prev != textLength {
-		log.Panicf("last linebreak was %d, want %d", prev, textLength)
-	}
-}
-
-func validatePbTypes(pairTypes []bracketType) {
-	if len(pairTypes) == 0 {
-		log.Panic("pairTypes is null")
-	}
-	for i, pt := range pairTypes {
-		switch pt {
-		case bpNone, bpOpen, bpClose:
-		default:
-			log.Panicf("illegal pairType value at %d: %v", i, pairTypes[i])
-		}
-	}
-}
-
-func validatePbValues(pairValues []rune, pairTypes []bracketType) {
-	if pairValues == nil {
-		log.Panic("pairValues is null")
-	}
-	if len(pairTypes) != len(pairValues) {
-		log.Panic("pairTypes is different length from pairValues")
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/bidi/prop.go b/vendor/golang.org/x/text/unicode/bidi/prop.go
deleted file mode 100644
index 7c9484e1f5..0000000000
--- a/vendor/golang.org/x/text/unicode/bidi/prop.go
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bidi
-
-import "unicode/utf8"
-
-// Properties provides access to BiDi properties of runes.
-type Properties struct {
-	entry uint8
-	last  uint8
-}
-
-var trie = newBidiTrie(0)
-
-// TODO: using this for bidirule reduces the running time by about 5%. Consider
-// if this is worth exposing or if we can find a way to speed up the Class
-// method.
-//
-// // CompactClass is like Class, but maps all of the BiDi control classes
-// // (LRO, RLO, LRE, RLE, PDF, LRI, RLI, FSI, PDI) to the class Control.
-// func (p Properties) CompactClass() Class {
-// 	return Class(p.entry & 0x0F)
-// }
-
-// Class returns the Bidi class for p.
-func (p Properties) Class() Class {
-	c := Class(p.entry & 0x0F)
-	if c == Control {
-		c = controlByteToClass[p.last&0xF]
-	}
-	return c
-}
-
-// IsBracket reports whether the rune is a bracket.
-func (p Properties) IsBracket() bool { return p.entry&0xF0 != 0 }
-
-// IsOpeningBracket reports whether the rune is an opening bracket.
-// IsBracket must return true.
-func (p Properties) IsOpeningBracket() bool { return p.entry&openMask != 0 }
-
-// TODO: find a better API and expose.
-func (p Properties) reverseBracket(r rune) rune {
-	return xorMasks[p.entry>>xorMaskShift] ^ r
-}
-
-var controlByteToClass = [16]Class{
-	0xD: LRO, // U+202D LeftToRightOverride,
-	0xE: RLO, // U+202E RightToLeftOverride,
-	0xA: LRE, // U+202A LeftToRightEmbedding,
-	0xB: RLE, // U+202B RightToLeftEmbedding,
-	0xC: PDF, // U+202C PopDirectionalFormat,
-	0x6: LRI, // U+2066 LeftToRightIsolate,
-	0x7: RLI, // U+2067 RightToLeftIsolate,
-	0x8: FSI, // U+2068 FirstStrongIsolate,
-	0x9: PDI, // U+2069 PopDirectionalIsolate,
-}
-
-// LookupRune returns properties for r.
-func LookupRune(r rune) (p Properties, size int) {
-	var buf [4]byte
-	n := utf8.EncodeRune(buf[:], r)
-	return Lookup(buf[:n])
-}
-
-// TODO: these lookup methods are based on the generated trie code. The returned
-// sizes have slightly different semantics from the generated code, in that it
-// always returns size==1 for an illegal UTF-8 byte (instead of the length
-// of the maximum invalid subsequence). Most Transformers, like unicode/norm,
-// leave invalid UTF-8 untouched, in which case it has performance benefits to
-// do so (without changing the semantics). Bidi requires the semantics used here
-// for the bidirule implementation to be compatible with the Go semantics.
-//  They ultimately should perhaps be adopted by all trie implementations, for
-// convenience sake.
-// This unrolled code also boosts performance of the secure/bidirule package by
-// about 30%.
-// So, to remove this code:
-//   - add option to trie generator to define return type.
-//   - always return 1 byte size for ill-formed UTF-8 runes.
-
-// Lookup returns properties for the first rune in s and the width in bytes of
-// its encoding. The size will be 0 if s does not hold enough bytes to complete
-// the encoding.
-func Lookup(s []byte) (p Properties, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return Properties{entry: bidiValues[c0]}, 1
-	case c0 < 0xC2:
-		return Properties{}, 1
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return Properties{}, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return Properties{}, 1
-		}
-		return Properties{entry: trie.lookupValue(uint32(i), c1)}, 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return Properties{}, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return Properties{}, 1
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = bidiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return Properties{}, 1
-		}
-		return Properties{entry: trie.lookupValue(uint32(i), c2), last: c2}, 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return Properties{}, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return Properties{}, 1
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = bidiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return Properties{}, 1
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = bidiIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return Properties{}, 1
-		}
-		return Properties{entry: trie.lookupValue(uint32(i), c3)}, 4
-	}
-	// Illegal rune
-	return Properties{}, 1
-}
-
-// LookupString returns properties for the first rune in s and the width in
-// bytes of its encoding. The size will be 0 if s does not hold enough bytes to
-// complete the encoding.
-func LookupString(s string) (p Properties, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return Properties{entry: bidiValues[c0]}, 1
-	case c0 < 0xC2:
-		return Properties{}, 1
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return Properties{}, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return Properties{}, 1
-		}
-		return Properties{entry: trie.lookupValue(uint32(i), c1)}, 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return Properties{}, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return Properties{}, 1
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = bidiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return Properties{}, 1
-		}
-		return Properties{entry: trie.lookupValue(uint32(i), c2), last: c2}, 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return Properties{}, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return Properties{}, 1
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = bidiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return Properties{}, 1
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = bidiIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return Properties{}, 1
-		}
-		return Properties{entry: trie.lookupValue(uint32(i), c3)}, 4
-	}
-	// Illegal rune
-	return Properties{}, 1
-}
diff --git a/vendor/golang.org/x/text/unicode/bidi/tables.go b/vendor/golang.org/x/text/unicode/bidi/tables.go
deleted file mode 100644
index 7212d5add1..0000000000
--- a/vendor/golang.org/x/text/unicode/bidi/tables.go
+++ /dev/null
@@ -1,1779 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package bidi
-
-// UnicodeVersion is the Unicode version from which the tables in this package are derived.
-const UnicodeVersion = "9.0.0"
-
-// xorMasks contains masks to be xor-ed with brackets to get the reverse
-// version.
-var xorMasks = []int32{ // 8 elements
-	0, 1, 6, 7, 3, 15, 29, 63,
-} // Size: 56 bytes
-
-// lookup returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *bidiTrie) lookup(s []byte) (v uint8, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return bidiValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = bidiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = bidiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = bidiIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *bidiTrie) lookupUnsafe(s []byte) uint8 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return bidiValues[c0]
-	}
-	i := bidiIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = bidiIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = bidiIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// lookupString returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *bidiTrie) lookupString(s string) (v uint8, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return bidiValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = bidiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := bidiIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = bidiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = bidiIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *bidiTrie) lookupStringUnsafe(s string) uint8 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return bidiValues[c0]
-	}
-	i := bidiIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = bidiIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = bidiIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// bidiTrie. Total size: 15744 bytes (15.38 KiB). Checksum: b4c3b70954803b86.
-type bidiTrie struct{}
-
-func newBidiTrie(i int) *bidiTrie {
-	return &bidiTrie{}
-}
-
-// lookupValue determines the type of block n and looks up the value for b.
-func (t *bidiTrie) lookupValue(n uint32, b byte) uint8 {
-	switch {
-	default:
-		return uint8(bidiValues[n<<6+uint32(b)])
-	}
-}
-
-// bidiValues: 222 blocks, 14208 entries, 14208 bytes
-// The third block is the zero block.
-var bidiValues = [14208]uint8{
-	// Block 0x0, offset 0x0
-	0x00: 0x000b, 0x01: 0x000b, 0x02: 0x000b, 0x03: 0x000b, 0x04: 0x000b, 0x05: 0x000b,
-	0x06: 0x000b, 0x07: 0x000b, 0x08: 0x000b, 0x09: 0x0008, 0x0a: 0x0007, 0x0b: 0x0008,
-	0x0c: 0x0009, 0x0d: 0x0007, 0x0e: 0x000b, 0x0f: 0x000b, 0x10: 0x000b, 0x11: 0x000b,
-	0x12: 0x000b, 0x13: 0x000b, 0x14: 0x000b, 0x15: 0x000b, 0x16: 0x000b, 0x17: 0x000b,
-	0x18: 0x000b, 0x19: 0x000b, 0x1a: 0x000b, 0x1b: 0x000b, 0x1c: 0x0007, 0x1d: 0x0007,
-	0x1e: 0x0007, 0x1f: 0x0008, 0x20: 0x0009, 0x21: 0x000a, 0x22: 0x000a, 0x23: 0x0004,
-	0x24: 0x0004, 0x25: 0x0004, 0x26: 0x000a, 0x27: 0x000a, 0x28: 0x003a, 0x29: 0x002a,
-	0x2a: 0x000a, 0x2b: 0x0003, 0x2c: 0x0006, 0x2d: 0x0003, 0x2e: 0x0006, 0x2f: 0x0006,
-	0x30: 0x0002, 0x31: 0x0002, 0x32: 0x0002, 0x33: 0x0002, 0x34: 0x0002, 0x35: 0x0002,
-	0x36: 0x0002, 0x37: 0x0002, 0x38: 0x0002, 0x39: 0x0002, 0x3a: 0x0006, 0x3b: 0x000a,
-	0x3c: 0x000a, 0x3d: 0x000a, 0x3e: 0x000a, 0x3f: 0x000a,
-	// Block 0x1, offset 0x40
-	0x40: 0x000a,
-	0x5b: 0x005a, 0x5c: 0x000a, 0x5d: 0x004a,
-	0x5e: 0x000a, 0x5f: 0x000a, 0x60: 0x000a,
-	0x7b: 0x005a,
-	0x7c: 0x000a, 0x7d: 0x004a, 0x7e: 0x000a, 0x7f: 0x000b,
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc0: 0x000b, 0xc1: 0x000b, 0xc2: 0x000b, 0xc3: 0x000b, 0xc4: 0x000b, 0xc5: 0x0007,
-	0xc6: 0x000b, 0xc7: 0x000b, 0xc8: 0x000b, 0xc9: 0x000b, 0xca: 0x000b, 0xcb: 0x000b,
-	0xcc: 0x000b, 0xcd: 0x000b, 0xce: 0x000b, 0xcf: 0x000b, 0xd0: 0x000b, 0xd1: 0x000b,
-	0xd2: 0x000b, 0xd3: 0x000b, 0xd4: 0x000b, 0xd5: 0x000b, 0xd6: 0x000b, 0xd7: 0x000b,
-	0xd8: 0x000b, 0xd9: 0x000b, 0xda: 0x000b, 0xdb: 0x000b, 0xdc: 0x000b, 0xdd: 0x000b,
-	0xde: 0x000b, 0xdf: 0x000b, 0xe0: 0x0006, 0xe1: 0x000a, 0xe2: 0x0004, 0xe3: 0x0004,
-	0xe4: 0x0004, 0xe5: 0x0004, 0xe6: 0x000a, 0xe7: 0x000a, 0xe8: 0x000a, 0xe9: 0x000a,
-	0xeb: 0x000a, 0xec: 0x000a, 0xed: 0x000b, 0xee: 0x000a, 0xef: 0x000a,
-	0xf0: 0x0004, 0xf1: 0x0004, 0xf2: 0x0002, 0xf3: 0x0002, 0xf4: 0x000a,
-	0xf6: 0x000a, 0xf7: 0x000a, 0xf8: 0x000a, 0xf9: 0x0002, 0xfb: 0x000a,
-	0xfc: 0x000a, 0xfd: 0x000a, 0xfe: 0x000a, 0xff: 0x000a,
-	// Block 0x4, offset 0x100
-	0x117: 0x000a,
-	0x137: 0x000a,
-	// Block 0x5, offset 0x140
-	0x179: 0x000a, 0x17a: 0x000a,
-	// Block 0x6, offset 0x180
-	0x182: 0x000a, 0x183: 0x000a, 0x184: 0x000a, 0x185: 0x000a,
-	0x186: 0x000a, 0x187: 0x000a, 0x188: 0x000a, 0x189: 0x000a, 0x18a: 0x000a, 0x18b: 0x000a,
-	0x18c: 0x000a, 0x18d: 0x000a, 0x18e: 0x000a, 0x18f: 0x000a,
-	0x192: 0x000a, 0x193: 0x000a, 0x194: 0x000a, 0x195: 0x000a, 0x196: 0x000a, 0x197: 0x000a,
-	0x198: 0x000a, 0x199: 0x000a, 0x19a: 0x000a, 0x19b: 0x000a, 0x19c: 0x000a, 0x19d: 0x000a,
-	0x19e: 0x000a, 0x19f: 0x000a,
-	0x1a5: 0x000a, 0x1a6: 0x000a, 0x1a7: 0x000a, 0x1a8: 0x000a, 0x1a9: 0x000a,
-	0x1aa: 0x000a, 0x1ab: 0x000a, 0x1ac: 0x000a, 0x1ad: 0x000a, 0x1af: 0x000a,
-	0x1b0: 0x000a, 0x1b1: 0x000a, 0x1b2: 0x000a, 0x1b3: 0x000a, 0x1b4: 0x000a, 0x1b5: 0x000a,
-	0x1b6: 0x000a, 0x1b7: 0x000a, 0x1b8: 0x000a, 0x1b9: 0x000a, 0x1ba: 0x000a, 0x1bb: 0x000a,
-	0x1bc: 0x000a, 0x1bd: 0x000a, 0x1be: 0x000a, 0x1bf: 0x000a,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x000c, 0x1c1: 0x000c, 0x1c2: 0x000c, 0x1c3: 0x000c, 0x1c4: 0x000c, 0x1c5: 0x000c,
-	0x1c6: 0x000c, 0x1c7: 0x000c, 0x1c8: 0x000c, 0x1c9: 0x000c, 0x1ca: 0x000c, 0x1cb: 0x000c,
-	0x1cc: 0x000c, 0x1cd: 0x000c, 0x1ce: 0x000c, 0x1cf: 0x000c, 0x1d0: 0x000c, 0x1d1: 0x000c,
-	0x1d2: 0x000c, 0x1d3: 0x000c, 0x1d4: 0x000c, 0x1d5: 0x000c, 0x1d6: 0x000c, 0x1d7: 0x000c,
-	0x1d8: 0x000c, 0x1d9: 0x000c, 0x1da: 0x000c, 0x1db: 0x000c, 0x1dc: 0x000c, 0x1dd: 0x000c,
-	0x1de: 0x000c, 0x1df: 0x000c, 0x1e0: 0x000c, 0x1e1: 0x000c, 0x1e2: 0x000c, 0x1e3: 0x000c,
-	0x1e4: 0x000c, 0x1e5: 0x000c, 0x1e6: 0x000c, 0x1e7: 0x000c, 0x1e8: 0x000c, 0x1e9: 0x000c,
-	0x1ea: 0x000c, 0x1eb: 0x000c, 0x1ec: 0x000c, 0x1ed: 0x000c, 0x1ee: 0x000c, 0x1ef: 0x000c,
-	0x1f0: 0x000c, 0x1f1: 0x000c, 0x1f2: 0x000c, 0x1f3: 0x000c, 0x1f4: 0x000c, 0x1f5: 0x000c,
-	0x1f6: 0x000c, 0x1f7: 0x000c, 0x1f8: 0x000c, 0x1f9: 0x000c, 0x1fa: 0x000c, 0x1fb: 0x000c,
-	0x1fc: 0x000c, 0x1fd: 0x000c, 0x1fe: 0x000c, 0x1ff: 0x000c,
-	// Block 0x8, offset 0x200
-	0x200: 0x000c, 0x201: 0x000c, 0x202: 0x000c, 0x203: 0x000c, 0x204: 0x000c, 0x205: 0x000c,
-	0x206: 0x000c, 0x207: 0x000c, 0x208: 0x000c, 0x209: 0x000c, 0x20a: 0x000c, 0x20b: 0x000c,
-	0x20c: 0x000c, 0x20d: 0x000c, 0x20e: 0x000c, 0x20f: 0x000c, 0x210: 0x000c, 0x211: 0x000c,
-	0x212: 0x000c, 0x213: 0x000c, 0x214: 0x000c, 0x215: 0x000c, 0x216: 0x000c, 0x217: 0x000c,
-	0x218: 0x000c, 0x219: 0x000c, 0x21a: 0x000c, 0x21b: 0x000c, 0x21c: 0x000c, 0x21d: 0x000c,
-	0x21e: 0x000c, 0x21f: 0x000c, 0x220: 0x000c, 0x221: 0x000c, 0x222: 0x000c, 0x223: 0x000c,
-	0x224: 0x000c, 0x225: 0x000c, 0x226: 0x000c, 0x227: 0x000c, 0x228: 0x000c, 0x229: 0x000c,
-	0x22a: 0x000c, 0x22b: 0x000c, 0x22c: 0x000c, 0x22d: 0x000c, 0x22e: 0x000c, 0x22f: 0x000c,
-	0x234: 0x000a, 0x235: 0x000a,
-	0x23e: 0x000a,
-	// Block 0x9, offset 0x240
-	0x244: 0x000a, 0x245: 0x000a,
-	0x247: 0x000a,
-	// Block 0xa, offset 0x280
-	0x2b6: 0x000a,
-	// Block 0xb, offset 0x2c0
-	0x2c3: 0x000c, 0x2c4: 0x000c, 0x2c5: 0x000c,
-	0x2c6: 0x000c, 0x2c7: 0x000c, 0x2c8: 0x000c, 0x2c9: 0x000c,
-	// Block 0xc, offset 0x300
-	0x30a: 0x000a,
-	0x30d: 0x000a, 0x30e: 0x000a, 0x30f: 0x0004, 0x310: 0x0001, 0x311: 0x000c,
-	0x312: 0x000c, 0x313: 0x000c, 0x314: 0x000c, 0x315: 0x000c, 0x316: 0x000c, 0x317: 0x000c,
-	0x318: 0x000c, 0x319: 0x000c, 0x31a: 0x000c, 0x31b: 0x000c, 0x31c: 0x000c, 0x31d: 0x000c,
-	0x31e: 0x000c, 0x31f: 0x000c, 0x320: 0x000c, 0x321: 0x000c, 0x322: 0x000c, 0x323: 0x000c,
-	0x324: 0x000c, 0x325: 0x000c, 0x326: 0x000c, 0x327: 0x000c, 0x328: 0x000c, 0x329: 0x000c,
-	0x32a: 0x000c, 0x32b: 0x000c, 0x32c: 0x000c, 0x32d: 0x000c, 0x32e: 0x000c, 0x32f: 0x000c,
-	0x330: 0x000c, 0x331: 0x000c, 0x332: 0x000c, 0x333: 0x000c, 0x334: 0x000c, 0x335: 0x000c,
-	0x336: 0x000c, 0x337: 0x000c, 0x338: 0x000c, 0x339: 0x000c, 0x33a: 0x000c, 0x33b: 0x000c,
-	0x33c: 0x000c, 0x33d: 0x000c, 0x33e: 0x0001, 0x33f: 0x000c,
-	// Block 0xd, offset 0x340
-	0x340: 0x0001, 0x341: 0x000c, 0x342: 0x000c, 0x343: 0x0001, 0x344: 0x000c, 0x345: 0x000c,
-	0x346: 0x0001, 0x347: 0x000c, 0x348: 0x0001, 0x349: 0x0001, 0x34a: 0x0001, 0x34b: 0x0001,
-	0x34c: 0x0001, 0x34d: 0x0001, 0x34e: 0x0001, 0x34f: 0x0001, 0x350: 0x0001, 0x351: 0x0001,
-	0x352: 0x0001, 0x353: 0x0001, 0x354: 0x0001, 0x355: 0x0001, 0x356: 0x0001, 0x357: 0x0001,
-	0x358: 0x0001, 0x359: 0x0001, 0x35a: 0x0001, 0x35b: 0x0001, 0x35c: 0x0001, 0x35d: 0x0001,
-	0x35e: 0x0001, 0x35f: 0x0001, 0x360: 0x0001, 0x361: 0x0001, 0x362: 0x0001, 0x363: 0x0001,
-	0x364: 0x0001, 0x365: 0x0001, 0x366: 0x0001, 0x367: 0x0001, 0x368: 0x0001, 0x369: 0x0001,
-	0x36a: 0x0001, 0x36b: 0x0001, 0x36c: 0x0001, 0x36d: 0x0001, 0x36e: 0x0001, 0x36f: 0x0001,
-	0x370: 0x0001, 0x371: 0x0001, 0x372: 0x0001, 0x373: 0x0001, 0x374: 0x0001, 0x375: 0x0001,
-	0x376: 0x0001, 0x377: 0x0001, 0x378: 0x0001, 0x379: 0x0001, 0x37a: 0x0001, 0x37b: 0x0001,
-	0x37c: 0x0001, 0x37d: 0x0001, 0x37e: 0x0001, 0x37f: 0x0001,
-	// Block 0xe, offset 0x380
-	0x380: 0x0005, 0x381: 0x0005, 0x382: 0x0005, 0x383: 0x0005, 0x384: 0x0005, 0x385: 0x0005,
-	0x386: 0x000a, 0x387: 0x000a, 0x388: 0x000d, 0x389: 0x0004, 0x38a: 0x0004, 0x38b: 0x000d,
-	0x38c: 0x0006, 0x38d: 0x000d, 0x38e: 0x000a, 0x38f: 0x000a, 0x390: 0x000c, 0x391: 0x000c,
-	0x392: 0x000c, 0x393: 0x000c, 0x394: 0x000c, 0x395: 0x000c, 0x396: 0x000c, 0x397: 0x000c,
-	0x398: 0x000c, 0x399: 0x000c, 0x39a: 0x000c, 0x39b: 0x000d, 0x39c: 0x000d, 0x39d: 0x000d,
-	0x39e: 0x000d, 0x39f: 0x000d, 0x3a0: 0x000d, 0x3a1: 0x000d, 0x3a2: 0x000d, 0x3a3: 0x000d,
-	0x3a4: 0x000d, 0x3a5: 0x000d, 0x3a6: 0x000d, 0x3a7: 0x000d, 0x3a8: 0x000d, 0x3a9: 0x000d,
-	0x3aa: 0x000d, 0x3ab: 0x000d, 0x3ac: 0x000d, 0x3ad: 0x000d, 0x3ae: 0x000d, 0x3af: 0x000d,
-	0x3b0: 0x000d, 0x3b1: 0x000d, 0x3b2: 0x000d, 0x3b3: 0x000d, 0x3b4: 0x000d, 0x3b5: 0x000d,
-	0x3b6: 0x000d, 0x3b7: 0x000d, 0x3b8: 0x000d, 0x3b9: 0x000d, 0x3ba: 0x000d, 0x3bb: 0x000d,
-	0x3bc: 0x000d, 0x3bd: 0x000d, 0x3be: 0x000d, 0x3bf: 0x000d,
-	// Block 0xf, offset 0x3c0
-	0x3c0: 0x000d, 0x3c1: 0x000d, 0x3c2: 0x000d, 0x3c3: 0x000d, 0x3c4: 0x000d, 0x3c5: 0x000d,
-	0x3c6: 0x000d, 0x3c7: 0x000d, 0x3c8: 0x000d, 0x3c9: 0x000d, 0x3ca: 0x000d, 0x3cb: 0x000c,
-	0x3cc: 0x000c, 0x3cd: 0x000c, 0x3ce: 0x000c, 0x3cf: 0x000c, 0x3d0: 0x000c, 0x3d1: 0x000c,
-	0x3d2: 0x000c, 0x3d3: 0x000c, 0x3d4: 0x000c, 0x3d5: 0x000c, 0x3d6: 0x000c, 0x3d7: 0x000c,
-	0x3d8: 0x000c, 0x3d9: 0x000c, 0x3da: 0x000c, 0x3db: 0x000c, 0x3dc: 0x000c, 0x3dd: 0x000c,
-	0x3de: 0x000c, 0x3df: 0x000c, 0x3e0: 0x0005, 0x3e1: 0x0005, 0x3e2: 0x0005, 0x3e3: 0x0005,
-	0x3e4: 0x0005, 0x3e5: 0x0005, 0x3e6: 0x0005, 0x3e7: 0x0005, 0x3e8: 0x0005, 0x3e9: 0x0005,
-	0x3ea: 0x0004, 0x3eb: 0x0005, 0x3ec: 0x0005, 0x3ed: 0x000d, 0x3ee: 0x000d, 0x3ef: 0x000d,
-	0x3f0: 0x000c, 0x3f1: 0x000d, 0x3f2: 0x000d, 0x3f3: 0x000d, 0x3f4: 0x000d, 0x3f5: 0x000d,
-	0x3f6: 0x000d, 0x3f7: 0x000d, 0x3f8: 0x000d, 0x3f9: 0x000d, 0x3fa: 0x000d, 0x3fb: 0x000d,
-	0x3fc: 0x000d, 0x3fd: 0x000d, 0x3fe: 0x000d, 0x3ff: 0x000d,
-	// Block 0x10, offset 0x400
-	0x400: 0x000d, 0x401: 0x000d, 0x402: 0x000d, 0x403: 0x000d, 0x404: 0x000d, 0x405: 0x000d,
-	0x406: 0x000d, 0x407: 0x000d, 0x408: 0x000d, 0x409: 0x000d, 0x40a: 0x000d, 0x40b: 0x000d,
-	0x40c: 0x000d, 0x40d: 0x000d, 0x40e: 0x000d, 0x40f: 0x000d, 0x410: 0x000d, 0x411: 0x000d,
-	0x412: 0x000d, 0x413: 0x000d, 0x414: 0x000d, 0x415: 0x000d, 0x416: 0x000d, 0x417: 0x000d,
-	0x418: 0x000d, 0x419: 0x000d, 0x41a: 0x000d, 0x41b: 0x000d, 0x41c: 0x000d, 0x41d: 0x000d,
-	0x41e: 0x000d, 0x41f: 0x000d, 0x420: 0x000d, 0x421: 0x000d, 0x422: 0x000d, 0x423: 0x000d,
-	0x424: 0x000d, 0x425: 0x000d, 0x426: 0x000d, 0x427: 0x000d, 0x428: 0x000d, 0x429: 0x000d,
-	0x42a: 0x000d, 0x42b: 0x000d, 0x42c: 0x000d, 0x42d: 0x000d, 0x42e: 0x000d, 0x42f: 0x000d,
-	0x430: 0x000d, 0x431: 0x000d, 0x432: 0x000d, 0x433: 0x000d, 0x434: 0x000d, 0x435: 0x000d,
-	0x436: 0x000d, 0x437: 0x000d, 0x438: 0x000d, 0x439: 0x000d, 0x43a: 0x000d, 0x43b: 0x000d,
-	0x43c: 0x000d, 0x43d: 0x000d, 0x43e: 0x000d, 0x43f: 0x000d,
-	// Block 0x11, offset 0x440
-	0x440: 0x000d, 0x441: 0x000d, 0x442: 0x000d, 0x443: 0x000d, 0x444: 0x000d, 0x445: 0x000d,
-	0x446: 0x000d, 0x447: 0x000d, 0x448: 0x000d, 0x449: 0x000d, 0x44a: 0x000d, 0x44b: 0x000d,
-	0x44c: 0x000d, 0x44d: 0x000d, 0x44e: 0x000d, 0x44f: 0x000d, 0x450: 0x000d, 0x451: 0x000d,
-	0x452: 0x000d, 0x453: 0x000d, 0x454: 0x000d, 0x455: 0x000d, 0x456: 0x000c, 0x457: 0x000c,
-	0x458: 0x000c, 0x459: 0x000c, 0x45a: 0x000c, 0x45b: 0x000c, 0x45c: 0x000c, 0x45d: 0x0005,
-	0x45e: 0x000a, 0x45f: 0x000c, 0x460: 0x000c, 0x461: 0x000c, 0x462: 0x000c, 0x463: 0x000c,
-	0x464: 0x000c, 0x465: 0x000d, 0x466: 0x000d, 0x467: 0x000c, 0x468: 0x000c, 0x469: 0x000a,
-	0x46a: 0x000c, 0x46b: 0x000c, 0x46c: 0x000c, 0x46d: 0x000c, 0x46e: 0x000d, 0x46f: 0x000d,
-	0x470: 0x0002, 0x471: 0x0002, 0x472: 0x0002, 0x473: 0x0002, 0x474: 0x0002, 0x475: 0x0002,
-	0x476: 0x0002, 0x477: 0x0002, 0x478: 0x0002, 0x479: 0x0002, 0x47a: 0x000d, 0x47b: 0x000d,
-	0x47c: 0x000d, 0x47d: 0x000d, 0x47e: 0x000d, 0x47f: 0x000d,
-	// Block 0x12, offset 0x480
-	0x480: 0x000d, 0x481: 0x000d, 0x482: 0x000d, 0x483: 0x000d, 0x484: 0x000d, 0x485: 0x000d,
-	0x486: 0x000d, 0x487: 0x000d, 0x488: 0x000d, 0x489: 0x000d, 0x48a: 0x000d, 0x48b: 0x000d,
-	0x48c: 0x000d, 0x48d: 0x000d, 0x48e: 0x000d, 0x48f: 0x000d, 0x490: 0x000d, 0x491: 0x000c,
-	0x492: 0x000d, 0x493: 0x000d, 0x494: 0x000d, 0x495: 0x000d, 0x496: 0x000d, 0x497: 0x000d,
-	0x498: 0x000d, 0x499: 0x000d, 0x49a: 0x000d, 0x49b: 0x000d, 0x49c: 0x000d, 0x49d: 0x000d,
-	0x49e: 0x000d, 0x49f: 0x000d, 0x4a0: 0x000d, 0x4a1: 0x000d, 0x4a2: 0x000d, 0x4a3: 0x000d,
-	0x4a4: 0x000d, 0x4a5: 0x000d, 0x4a6: 0x000d, 0x4a7: 0x000d, 0x4a8: 0x000d, 0x4a9: 0x000d,
-	0x4aa: 0x000d, 0x4ab: 0x000d, 0x4ac: 0x000d, 0x4ad: 0x000d, 0x4ae: 0x000d, 0x4af: 0x000d,
-	0x4b0: 0x000c, 0x4b1: 0x000c, 0x4b2: 0x000c, 0x4b3: 0x000c, 0x4b4: 0x000c, 0x4b5: 0x000c,
-	0x4b6: 0x000c, 0x4b7: 0x000c, 0x4b8: 0x000c, 0x4b9: 0x000c, 0x4ba: 0x000c, 0x4bb: 0x000c,
-	0x4bc: 0x000c, 0x4bd: 0x000c, 0x4be: 0x000c, 0x4bf: 0x000c,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0x000c, 0x4c1: 0x000c, 0x4c2: 0x000c, 0x4c3: 0x000c, 0x4c4: 0x000c, 0x4c5: 0x000c,
-	0x4c6: 0x000c, 0x4c7: 0x000c, 0x4c8: 0x000c, 0x4c9: 0x000c, 0x4ca: 0x000c, 0x4cb: 0x000d,
-	0x4cc: 0x000d, 0x4cd: 0x000d, 0x4ce: 0x000d, 0x4cf: 0x000d, 0x4d0: 0x000d, 0x4d1: 0x000d,
-	0x4d2: 0x000d, 0x4d3: 0x000d, 0x4d4: 0x000d, 0x4d5: 0x000d, 0x4d6: 0x000d, 0x4d7: 0x000d,
-	0x4d8: 0x000d, 0x4d9: 0x000d, 0x4da: 0x000d, 0x4db: 0x000d, 0x4dc: 0x000d, 0x4dd: 0x000d,
-	0x4de: 0x000d, 0x4df: 0x000d, 0x4e0: 0x000d, 0x4e1: 0x000d, 0x4e2: 0x000d, 0x4e3: 0x000d,
-	0x4e4: 0x000d, 0x4e5: 0x000d, 0x4e6: 0x000d, 0x4e7: 0x000d, 0x4e8: 0x000d, 0x4e9: 0x000d,
-	0x4ea: 0x000d, 0x4eb: 0x000d, 0x4ec: 0x000d, 0x4ed: 0x000d, 0x4ee: 0x000d, 0x4ef: 0x000d,
-	0x4f0: 0x000d, 0x4f1: 0x000d, 0x4f2: 0x000d, 0x4f3: 0x000d, 0x4f4: 0x000d, 0x4f5: 0x000d,
-	0x4f6: 0x000d, 0x4f7: 0x000d, 0x4f8: 0x000d, 0x4f9: 0x000d, 0x4fa: 0x000d, 0x4fb: 0x000d,
-	0x4fc: 0x000d, 0x4fd: 0x000d, 0x4fe: 0x000d, 0x4ff: 0x000d,
-	// Block 0x14, offset 0x500
-	0x500: 0x000d, 0x501: 0x000d, 0x502: 0x000d, 0x503: 0x000d, 0x504: 0x000d, 0x505: 0x000d,
-	0x506: 0x000d, 0x507: 0x000d, 0x508: 0x000d, 0x509: 0x000d, 0x50a: 0x000d, 0x50b: 0x000d,
-	0x50c: 0x000d, 0x50d: 0x000d, 0x50e: 0x000d, 0x50f: 0x000d, 0x510: 0x000d, 0x511: 0x000d,
-	0x512: 0x000d, 0x513: 0x000d, 0x514: 0x000d, 0x515: 0x000d, 0x516: 0x000d, 0x517: 0x000d,
-	0x518: 0x000d, 0x519: 0x000d, 0x51a: 0x000d, 0x51b: 0x000d, 0x51c: 0x000d, 0x51d: 0x000d,
-	0x51e: 0x000d, 0x51f: 0x000d, 0x520: 0x000d, 0x521: 0x000d, 0x522: 0x000d, 0x523: 0x000d,
-	0x524: 0x000d, 0x525: 0x000d, 0x526: 0x000c, 0x527: 0x000c, 0x528: 0x000c, 0x529: 0x000c,
-	0x52a: 0x000c, 0x52b: 0x000c, 0x52c: 0x000c, 0x52d: 0x000c, 0x52e: 0x000c, 0x52f: 0x000c,
-	0x530: 0x000c, 0x531: 0x000d, 0x532: 0x000d, 0x533: 0x000d, 0x534: 0x000d, 0x535: 0x000d,
-	0x536: 0x000d, 0x537: 0x000d, 0x538: 0x000d, 0x539: 0x000d, 0x53a: 0x000d, 0x53b: 0x000d,
-	0x53c: 0x000d, 0x53d: 0x000d, 0x53e: 0x000d, 0x53f: 0x000d,
-	// Block 0x15, offset 0x540
-	0x540: 0x0001, 0x541: 0x0001, 0x542: 0x0001, 0x543: 0x0001, 0x544: 0x0001, 0x545: 0x0001,
-	0x546: 0x0001, 0x547: 0x0001, 0x548: 0x0001, 0x549: 0x0001, 0x54a: 0x0001, 0x54b: 0x0001,
-	0x54c: 0x0001, 0x54d: 0x0001, 0x54e: 0x0001, 0x54f: 0x0001, 0x550: 0x0001, 0x551: 0x0001,
-	0x552: 0x0001, 0x553: 0x0001, 0x554: 0x0001, 0x555: 0x0001, 0x556: 0x0001, 0x557: 0x0001,
-	0x558: 0x0001, 0x559: 0x0001, 0x55a: 0x0001, 0x55b: 0x0001, 0x55c: 0x0001, 0x55d: 0x0001,
-	0x55e: 0x0001, 0x55f: 0x0001, 0x560: 0x0001, 0x561: 0x0001, 0x562: 0x0001, 0x563: 0x0001,
-	0x564: 0x0001, 0x565: 0x0001, 0x566: 0x0001, 0x567: 0x0001, 0x568: 0x0001, 0x569: 0x0001,
-	0x56a: 0x0001, 0x56b: 0x000c, 0x56c: 0x000c, 0x56d: 0x000c, 0x56e: 0x000c, 0x56f: 0x000c,
-	0x570: 0x000c, 0x571: 0x000c, 0x572: 0x000c, 0x573: 0x000c, 0x574: 0x0001, 0x575: 0x0001,
-	0x576: 0x000a, 0x577: 0x000a, 0x578: 0x000a, 0x579: 0x000a, 0x57a: 0x0001, 0x57b: 0x0001,
-	0x57c: 0x0001, 0x57d: 0x0001, 0x57e: 0x0001, 0x57f: 0x0001,
-	// Block 0x16, offset 0x580
-	0x580: 0x0001, 0x581: 0x0001, 0x582: 0x0001, 0x583: 0x0001, 0x584: 0x0001, 0x585: 0x0001,
-	0x586: 0x0001, 0x587: 0x0001, 0x588: 0x0001, 0x589: 0x0001, 0x58a: 0x0001, 0x58b: 0x0001,
-	0x58c: 0x0001, 0x58d: 0x0001, 0x58e: 0x0001, 0x58f: 0x0001, 0x590: 0x0001, 0x591: 0x0001,
-	0x592: 0x0001, 0x593: 0x0001, 0x594: 0x0001, 0x595: 0x0001, 0x596: 0x000c, 0x597: 0x000c,
-	0x598: 0x000c, 0x599: 0x000c, 0x59a: 0x0001, 0x59b: 0x000c, 0x59c: 0x000c, 0x59d: 0x000c,
-	0x59e: 0x000c, 0x59f: 0x000c, 0x5a0: 0x000c, 0x5a1: 0x000c, 0x5a2: 0x000c, 0x5a3: 0x000c,
-	0x5a4: 0x0001, 0x5a5: 0x000c, 0x5a6: 0x000c, 0x5a7: 0x000c, 0x5a8: 0x0001, 0x5a9: 0x000c,
-	0x5aa: 0x000c, 0x5ab: 0x000c, 0x5ac: 0x000c, 0x5ad: 0x000c, 0x5ae: 0x0001, 0x5af: 0x0001,
-	0x5b0: 0x0001, 0x5b1: 0x0001, 0x5b2: 0x0001, 0x5b3: 0x0001, 0x5b4: 0x0001, 0x5b5: 0x0001,
-	0x5b6: 0x0001, 0x5b7: 0x0001, 0x5b8: 0x0001, 0x5b9: 0x0001, 0x5ba: 0x0001, 0x5bb: 0x0001,
-	0x5bc: 0x0001, 0x5bd: 0x0001, 0x5be: 0x0001, 0x5bf: 0x0001,
-	// Block 0x17, offset 0x5c0
-	0x5c0: 0x0001, 0x5c1: 0x0001, 0x5c2: 0x0001, 0x5c3: 0x0001, 0x5c4: 0x0001, 0x5c5: 0x0001,
-	0x5c6: 0x0001, 0x5c7: 0x0001, 0x5c8: 0x0001, 0x5c9: 0x0001, 0x5ca: 0x0001, 0x5cb: 0x0001,
-	0x5cc: 0x0001, 0x5cd: 0x0001, 0x5ce: 0x0001, 0x5cf: 0x0001, 0x5d0: 0x0001, 0x5d1: 0x0001,
-	0x5d2: 0x0001, 0x5d3: 0x0001, 0x5d4: 0x0001, 0x5d5: 0x0001, 0x5d6: 0x0001, 0x5d7: 0x0001,
-	0x5d8: 0x0001, 0x5d9: 0x000c, 0x5da: 0x000c, 0x5db: 0x000c, 0x5dc: 0x0001, 0x5dd: 0x0001,
-	0x5de: 0x0001, 0x5df: 0x0001, 0x5e0: 0x0001, 0x5e1: 0x0001, 0x5e2: 0x0001, 0x5e3: 0x0001,
-	0x5e4: 0x0001, 0x5e5: 0x0001, 0x5e6: 0x0001, 0x5e7: 0x0001, 0x5e8: 0x0001, 0x5e9: 0x0001,
-	0x5ea: 0x0001, 0x5eb: 0x0001, 0x5ec: 0x0001, 0x5ed: 0x0001, 0x5ee: 0x0001, 0x5ef: 0x0001,
-	0x5f0: 0x0001, 0x5f1: 0x0001, 0x5f2: 0x0001, 0x5f3: 0x0001, 0x5f4: 0x0001, 0x5f5: 0x0001,
-	0x5f6: 0x0001, 0x5f7: 0x0001, 0x5f8: 0x0001, 0x5f9: 0x0001, 0x5fa: 0x0001, 0x5fb: 0x0001,
-	0x5fc: 0x0001, 0x5fd: 0x0001, 0x5fe: 0x0001, 0x5ff: 0x0001,
-	// Block 0x18, offset 0x600
-	0x600: 0x0001, 0x601: 0x0001, 0x602: 0x0001, 0x603: 0x0001, 0x604: 0x0001, 0x605: 0x0001,
-	0x606: 0x0001, 0x607: 0x0001, 0x608: 0x0001, 0x609: 0x0001, 0x60a: 0x0001, 0x60b: 0x0001,
-	0x60c: 0x0001, 0x60d: 0x0001, 0x60e: 0x0001, 0x60f: 0x0001, 0x610: 0x0001, 0x611: 0x0001,
-	0x612: 0x0001, 0x613: 0x0001, 0x614: 0x0001, 0x615: 0x0001, 0x616: 0x0001, 0x617: 0x0001,
-	0x618: 0x0001, 0x619: 0x0001, 0x61a: 0x0001, 0x61b: 0x0001, 0x61c: 0x0001, 0x61d: 0x0001,
-	0x61e: 0x0001, 0x61f: 0x0001, 0x620: 0x000d, 0x621: 0x000d, 0x622: 0x000d, 0x623: 0x000d,
-	0x624: 0x000d, 0x625: 0x000d, 0x626: 0x000d, 0x627: 0x000d, 0x628: 0x000d, 0x629: 0x000d,
-	0x62a: 0x000d, 0x62b: 0x000d, 0x62c: 0x000d, 0x62d: 0x000d, 0x62e: 0x000d, 0x62f: 0x000d,
-	0x630: 0x000d, 0x631: 0x000d, 0x632: 0x000d, 0x633: 0x000d, 0x634: 0x000d, 0x635: 0x000d,
-	0x636: 0x000d, 0x637: 0x000d, 0x638: 0x000d, 0x639: 0x000d, 0x63a: 0x000d, 0x63b: 0x000d,
-	0x63c: 0x000d, 0x63d: 0x000d, 0x63e: 0x000d, 0x63f: 0x000d,
-	// Block 0x19, offset 0x640
-	0x640: 0x000d, 0x641: 0x000d, 0x642: 0x000d, 0x643: 0x000d, 0x644: 0x000d, 0x645: 0x000d,
-	0x646: 0x000d, 0x647: 0x000d, 0x648: 0x000d, 0x649: 0x000d, 0x64a: 0x000d, 0x64b: 0x000d,
-	0x64c: 0x000d, 0x64d: 0x000d, 0x64e: 0x000d, 0x64f: 0x000d, 0x650: 0x000d, 0x651: 0x000d,
-	0x652: 0x000d, 0x653: 0x000d, 0x654: 0x000c, 0x655: 0x000c, 0x656: 0x000c, 0x657: 0x000c,
-	0x658: 0x000c, 0x659: 0x000c, 0x65a: 0x000c, 0x65b: 0x000c, 0x65c: 0x000c, 0x65d: 0x000c,
-	0x65e: 0x000c, 0x65f: 0x000c, 0x660: 0x000c, 0x661: 0x000c, 0x662: 0x0005, 0x663: 0x000c,
-	0x664: 0x000c, 0x665: 0x000c, 0x666: 0x000c, 0x667: 0x000c, 0x668: 0x000c, 0x669: 0x000c,
-	0x66a: 0x000c, 0x66b: 0x000c, 0x66c: 0x000c, 0x66d: 0x000c, 0x66e: 0x000c, 0x66f: 0x000c,
-	0x670: 0x000c, 0x671: 0x000c, 0x672: 0x000c, 0x673: 0x000c, 0x674: 0x000c, 0x675: 0x000c,
-	0x676: 0x000c, 0x677: 0x000c, 0x678: 0x000c, 0x679: 0x000c, 0x67a: 0x000c, 0x67b: 0x000c,
-	0x67c: 0x000c, 0x67d: 0x000c, 0x67e: 0x000c, 0x67f: 0x000c,
-	// Block 0x1a, offset 0x680
-	0x680: 0x000c, 0x681: 0x000c, 0x682: 0x000c,
-	0x6ba: 0x000c,
-	0x6bc: 0x000c,
-	// Block 0x1b, offset 0x6c0
-	0x6c1: 0x000c, 0x6c2: 0x000c, 0x6c3: 0x000c, 0x6c4: 0x000c, 0x6c5: 0x000c,
-	0x6c6: 0x000c, 0x6c7: 0x000c, 0x6c8: 0x000c,
-	0x6cd: 0x000c, 0x6d1: 0x000c,
-	0x6d2: 0x000c, 0x6d3: 0x000c, 0x6d4: 0x000c, 0x6d5: 0x000c, 0x6d6: 0x000c, 0x6d7: 0x000c,
-	0x6e2: 0x000c, 0x6e3: 0x000c,
-	// Block 0x1c, offset 0x700
-	0x701: 0x000c,
-	0x73c: 0x000c,
-	// Block 0x1d, offset 0x740
-	0x741: 0x000c, 0x742: 0x000c, 0x743: 0x000c, 0x744: 0x000c,
-	0x74d: 0x000c,
-	0x762: 0x000c, 0x763: 0x000c,
-	0x772: 0x0004, 0x773: 0x0004,
-	0x77b: 0x0004,
-	// Block 0x1e, offset 0x780
-	0x781: 0x000c, 0x782: 0x000c,
-	0x7bc: 0x000c,
-	// Block 0x1f, offset 0x7c0
-	0x7c1: 0x000c, 0x7c2: 0x000c,
-	0x7c7: 0x000c, 0x7c8: 0x000c, 0x7cb: 0x000c,
-	0x7cc: 0x000c, 0x7cd: 0x000c, 0x7d1: 0x000c,
-	0x7f0: 0x000c, 0x7f1: 0x000c, 0x7f5: 0x000c,
-	// Block 0x20, offset 0x800
-	0x801: 0x000c, 0x802: 0x000c, 0x803: 0x000c, 0x804: 0x000c, 0x805: 0x000c,
-	0x807: 0x000c, 0x808: 0x000c,
-	0x80d: 0x000c,
-	0x822: 0x000c, 0x823: 0x000c,
-	0x831: 0x0004,
-	// Block 0x21, offset 0x840
-	0x841: 0x000c,
-	0x87c: 0x000c, 0x87f: 0x000c,
-	// Block 0x22, offset 0x880
-	0x881: 0x000c, 0x882: 0x000c, 0x883: 0x000c, 0x884: 0x000c,
-	0x88d: 0x000c,
-	0x896: 0x000c,
-	0x8a2: 0x000c, 0x8a3: 0x000c,
-	// Block 0x23, offset 0x8c0
-	0x8c2: 0x000c,
-	// Block 0x24, offset 0x900
-	0x900: 0x000c,
-	0x90d: 0x000c,
-	0x933: 0x000a, 0x934: 0x000a, 0x935: 0x000a,
-	0x936: 0x000a, 0x937: 0x000a, 0x938: 0x000a, 0x939: 0x0004, 0x93a: 0x000a,
-	// Block 0x25, offset 0x940
-	0x940: 0x000c,
-	0x97e: 0x000c, 0x97f: 0x000c,
-	// Block 0x26, offset 0x980
-	0x980: 0x000c,
-	0x986: 0x000c, 0x987: 0x000c, 0x988: 0x000c, 0x98a: 0x000c, 0x98b: 0x000c,
-	0x98c: 0x000c, 0x98d: 0x000c,
-	0x995: 0x000c, 0x996: 0x000c,
-	0x9a2: 0x000c, 0x9a3: 0x000c,
-	0x9b8: 0x000a, 0x9b9: 0x000a, 0x9ba: 0x000a, 0x9bb: 0x000a,
-	0x9bc: 0x000a, 0x9bd: 0x000a, 0x9be: 0x000a,
-	// Block 0x27, offset 0x9c0
-	0x9cc: 0x000c, 0x9cd: 0x000c,
-	0x9e2: 0x000c, 0x9e3: 0x000c,
-	// Block 0x28, offset 0xa00
-	0xa01: 0x000c,
-	// Block 0x29, offset 0xa40
-	0xa41: 0x000c, 0xa42: 0x000c, 0xa43: 0x000c, 0xa44: 0x000c,
-	0xa4d: 0x000c,
-	0xa62: 0x000c, 0xa63: 0x000c,
-	// Block 0x2a, offset 0xa80
-	0xa8a: 0x000c,
-	0xa92: 0x000c, 0xa93: 0x000c, 0xa94: 0x000c, 0xa96: 0x000c,
-	// Block 0x2b, offset 0xac0
-	0xaf1: 0x000c, 0xaf4: 0x000c, 0xaf5: 0x000c,
-	0xaf6: 0x000c, 0xaf7: 0x000c, 0xaf8: 0x000c, 0xaf9: 0x000c, 0xafa: 0x000c,
-	0xaff: 0x0004,
-	// Block 0x2c, offset 0xb00
-	0xb07: 0x000c, 0xb08: 0x000c, 0xb09: 0x000c, 0xb0a: 0x000c, 0xb0b: 0x000c,
-	0xb0c: 0x000c, 0xb0d: 0x000c, 0xb0e: 0x000c,
-	// Block 0x2d, offset 0xb40
-	0xb71: 0x000c, 0xb74: 0x000c, 0xb75: 0x000c,
-	0xb76: 0x000c, 0xb77: 0x000c, 0xb78: 0x000c, 0xb79: 0x000c, 0xb7b: 0x000c,
-	0xb7c: 0x000c,
-	// Block 0x2e, offset 0xb80
-	0xb88: 0x000c, 0xb89: 0x000c, 0xb8a: 0x000c, 0xb8b: 0x000c,
-	0xb8c: 0x000c, 0xb8d: 0x000c,
-	// Block 0x2f, offset 0xbc0
-	0xbd8: 0x000c, 0xbd9: 0x000c,
-	0xbf5: 0x000c,
-	0xbf7: 0x000c, 0xbf9: 0x000c, 0xbfa: 0x003a, 0xbfb: 0x002a,
-	0xbfc: 0x003a, 0xbfd: 0x002a,
-	// Block 0x30, offset 0xc00
-	0xc31: 0x000c, 0xc32: 0x000c, 0xc33: 0x000c, 0xc34: 0x000c, 0xc35: 0x000c,
-	0xc36: 0x000c, 0xc37: 0x000c, 0xc38: 0x000c, 0xc39: 0x000c, 0xc3a: 0x000c, 0xc3b: 0x000c,
-	0xc3c: 0x000c, 0xc3d: 0x000c, 0xc3e: 0x000c,
-	// Block 0x31, offset 0xc40
-	0xc40: 0x000c, 0xc41: 0x000c, 0xc42: 0x000c, 0xc43: 0x000c, 0xc44: 0x000c,
-	0xc46: 0x000c, 0xc47: 0x000c,
-	0xc4d: 0x000c, 0xc4e: 0x000c, 0xc4f: 0x000c, 0xc50: 0x000c, 0xc51: 0x000c,
-	0xc52: 0x000c, 0xc53: 0x000c, 0xc54: 0x000c, 0xc55: 0x000c, 0xc56: 0x000c, 0xc57: 0x000c,
-	0xc59: 0x000c, 0xc5a: 0x000c, 0xc5b: 0x000c, 0xc5c: 0x000c, 0xc5d: 0x000c,
-	0xc5e: 0x000c, 0xc5f: 0x000c, 0xc60: 0x000c, 0xc61: 0x000c, 0xc62: 0x000c, 0xc63: 0x000c,
-	0xc64: 0x000c, 0xc65: 0x000c, 0xc66: 0x000c, 0xc67: 0x000c, 0xc68: 0x000c, 0xc69: 0x000c,
-	0xc6a: 0x000c, 0xc6b: 0x000c, 0xc6c: 0x000c, 0xc6d: 0x000c, 0xc6e: 0x000c, 0xc6f: 0x000c,
-	0xc70: 0x000c, 0xc71: 0x000c, 0xc72: 0x000c, 0xc73: 0x000c, 0xc74: 0x000c, 0xc75: 0x000c,
-	0xc76: 0x000c, 0xc77: 0x000c, 0xc78: 0x000c, 0xc79: 0x000c, 0xc7a: 0x000c, 0xc7b: 0x000c,
-	0xc7c: 0x000c,
-	// Block 0x32, offset 0xc80
-	0xc86: 0x000c,
-	// Block 0x33, offset 0xcc0
-	0xced: 0x000c, 0xcee: 0x000c, 0xcef: 0x000c,
-	0xcf0: 0x000c, 0xcf2: 0x000c, 0xcf3: 0x000c, 0xcf4: 0x000c, 0xcf5: 0x000c,
-	0xcf6: 0x000c, 0xcf7: 0x000c, 0xcf9: 0x000c, 0xcfa: 0x000c,
-	0xcfd: 0x000c, 0xcfe: 0x000c,
-	// Block 0x34, offset 0xd00
-	0xd18: 0x000c, 0xd19: 0x000c,
-	0xd1e: 0x000c, 0xd1f: 0x000c, 0xd20: 0x000c,
-	0xd31: 0x000c, 0xd32: 0x000c, 0xd33: 0x000c, 0xd34: 0x000c,
-	// Block 0x35, offset 0xd40
-	0xd42: 0x000c, 0xd45: 0x000c,
-	0xd46: 0x000c,
-	0xd4d: 0x000c,
-	0xd5d: 0x000c,
-	// Block 0x36, offset 0xd80
-	0xd9d: 0x000c,
-	0xd9e: 0x000c, 0xd9f: 0x000c,
-	// Block 0x37, offset 0xdc0
-	0xdd0: 0x000a, 0xdd1: 0x000a,
-	0xdd2: 0x000a, 0xdd3: 0x000a, 0xdd4: 0x000a, 0xdd5: 0x000a, 0xdd6: 0x000a, 0xdd7: 0x000a,
-	0xdd8: 0x000a, 0xdd9: 0x000a,
-	// Block 0x38, offset 0xe00
-	0xe00: 0x000a,
-	// Block 0x39, offset 0xe40
-	0xe40: 0x0009,
-	0xe5b: 0x007a, 0xe5c: 0x006a,
-	// Block 0x3a, offset 0xe80
-	0xe92: 0x000c, 0xe93: 0x000c, 0xe94: 0x000c,
-	0xeb2: 0x000c, 0xeb3: 0x000c, 0xeb4: 0x000c,
-	// Block 0x3b, offset 0xec0
-	0xed2: 0x000c, 0xed3: 0x000c,
-	0xef2: 0x000c, 0xef3: 0x000c,
-	// Block 0x3c, offset 0xf00
-	0xf34: 0x000c, 0xf35: 0x000c,
-	0xf37: 0x000c, 0xf38: 0x000c, 0xf39: 0x000c, 0xf3a: 0x000c, 0xf3b: 0x000c,
-	0xf3c: 0x000c, 0xf3d: 0x000c,
-	// Block 0x3d, offset 0xf40
-	0xf46: 0x000c, 0xf49: 0x000c, 0xf4a: 0x000c, 0xf4b: 0x000c,
-	0xf4c: 0x000c, 0xf4d: 0x000c, 0xf4e: 0x000c, 0xf4f: 0x000c, 0xf50: 0x000c, 0xf51: 0x000c,
-	0xf52: 0x000c, 0xf53: 0x000c,
-	0xf5b: 0x0004, 0xf5d: 0x000c,
-	0xf70: 0x000a, 0xf71: 0x000a, 0xf72: 0x000a, 0xf73: 0x000a, 0xf74: 0x000a, 0xf75: 0x000a,
-	0xf76: 0x000a, 0xf77: 0x000a, 0xf78: 0x000a, 0xf79: 0x000a,
-	// Block 0x3e, offset 0xf80
-	0xf80: 0x000a, 0xf81: 0x000a, 0xf82: 0x000a, 0xf83: 0x000a, 0xf84: 0x000a, 0xf85: 0x000a,
-	0xf86: 0x000a, 0xf87: 0x000a, 0xf88: 0x000a, 0xf89: 0x000a, 0xf8a: 0x000a, 0xf8b: 0x000c,
-	0xf8c: 0x000c, 0xf8d: 0x000c, 0xf8e: 0x000b,
-	// Block 0x3f, offset 0xfc0
-	0xfc5: 0x000c,
-	0xfc6: 0x000c,
-	0xfe9: 0x000c,
-	// Block 0x40, offset 0x1000
-	0x1020: 0x000c, 0x1021: 0x000c, 0x1022: 0x000c,
-	0x1027: 0x000c, 0x1028: 0x000c,
-	0x1032: 0x000c,
-	0x1039: 0x000c, 0x103a: 0x000c, 0x103b: 0x000c,
-	// Block 0x41, offset 0x1040
-	0x1040: 0x000a, 0x1044: 0x000a, 0x1045: 0x000a,
-	// Block 0x42, offset 0x1080
-	0x109e: 0x000a, 0x109f: 0x000a, 0x10a0: 0x000a, 0x10a1: 0x000a, 0x10a2: 0x000a, 0x10a3: 0x000a,
-	0x10a4: 0x000a, 0x10a5: 0x000a, 0x10a6: 0x000a, 0x10a7: 0x000a, 0x10a8: 0x000a, 0x10a9: 0x000a,
-	0x10aa: 0x000a, 0x10ab: 0x000a, 0x10ac: 0x000a, 0x10ad: 0x000a, 0x10ae: 0x000a, 0x10af: 0x000a,
-	0x10b0: 0x000a, 0x10b1: 0x000a, 0x10b2: 0x000a, 0x10b3: 0x000a, 0x10b4: 0x000a, 0x10b5: 0x000a,
-	0x10b6: 0x000a, 0x10b7: 0x000a, 0x10b8: 0x000a, 0x10b9: 0x000a, 0x10ba: 0x000a, 0x10bb: 0x000a,
-	0x10bc: 0x000a, 0x10bd: 0x000a, 0x10be: 0x000a, 0x10bf: 0x000a,
-	// Block 0x43, offset 0x10c0
-	0x10d7: 0x000c,
-	0x10d8: 0x000c, 0x10db: 0x000c,
-	// Block 0x44, offset 0x1100
-	0x1116: 0x000c,
-	0x1118: 0x000c, 0x1119: 0x000c, 0x111a: 0x000c, 0x111b: 0x000c, 0x111c: 0x000c, 0x111d: 0x000c,
-	0x111e: 0x000c, 0x1120: 0x000c, 0x1122: 0x000c,
-	0x1125: 0x000c, 0x1126: 0x000c, 0x1127: 0x000c, 0x1128: 0x000c, 0x1129: 0x000c,
-	0x112a: 0x000c, 0x112b: 0x000c, 0x112c: 0x000c,
-	0x1133: 0x000c, 0x1134: 0x000c, 0x1135: 0x000c,
-	0x1136: 0x000c, 0x1137: 0x000c, 0x1138: 0x000c, 0x1139: 0x000c, 0x113a: 0x000c, 0x113b: 0x000c,
-	0x113c: 0x000c, 0x113f: 0x000c,
-	// Block 0x45, offset 0x1140
-	0x1170: 0x000c, 0x1171: 0x000c, 0x1172: 0x000c, 0x1173: 0x000c, 0x1174: 0x000c, 0x1175: 0x000c,
-	0x1176: 0x000c, 0x1177: 0x000c, 0x1178: 0x000c, 0x1179: 0x000c, 0x117a: 0x000c, 0x117b: 0x000c,
-	0x117c: 0x000c, 0x117d: 0x000c, 0x117e: 0x000c,
-	// Block 0x46, offset 0x1180
-	0x1180: 0x000c, 0x1181: 0x000c, 0x1182: 0x000c, 0x1183: 0x000c,
-	0x11b4: 0x000c,
-	0x11b6: 0x000c, 0x11b7: 0x000c, 0x11b8: 0x000c, 0x11b9: 0x000c, 0x11ba: 0x000c,
-	0x11bc: 0x000c,
-	// Block 0x47, offset 0x11c0
-	0x11c2: 0x000c,
-	0x11eb: 0x000c, 0x11ec: 0x000c, 0x11ed: 0x000c, 0x11ee: 0x000c, 0x11ef: 0x000c,
-	0x11f0: 0x000c, 0x11f1: 0x000c, 0x11f2: 0x000c, 0x11f3: 0x000c,
-	// Block 0x48, offset 0x1200
-	0x1200: 0x000c, 0x1201: 0x000c,
-	0x1222: 0x000c, 0x1223: 0x000c,
-	0x1224: 0x000c, 0x1225: 0x000c, 0x1228: 0x000c, 0x1229: 0x000c,
-	0x122b: 0x000c, 0x122c: 0x000c, 0x122d: 0x000c,
-	// Block 0x49, offset 0x1240
-	0x1266: 0x000c, 0x1268: 0x000c, 0x1269: 0x000c,
-	0x126d: 0x000c, 0x126f: 0x000c,
-	0x1270: 0x000c, 0x1271: 0x000c,
-	// Block 0x4a, offset 0x1280
-	0x12ac: 0x000c, 0x12ad: 0x000c, 0x12ae: 0x000c, 0x12af: 0x000c,
-	0x12b0: 0x000c, 0x12b1: 0x000c, 0x12b2: 0x000c, 0x12b3: 0x000c,
-	0x12b6: 0x000c, 0x12b7: 0x000c,
-	// Block 0x4b, offset 0x12c0
-	0x12d0: 0x000c, 0x12d1: 0x000c,
-	0x12d2: 0x000c, 0x12d4: 0x000c, 0x12d5: 0x000c, 0x12d6: 0x000c, 0x12d7: 0x000c,
-	0x12d8: 0x000c, 0x12d9: 0x000c, 0x12da: 0x000c, 0x12db: 0x000c, 0x12dc: 0x000c, 0x12dd: 0x000c,
-	0x12de: 0x000c, 0x12df: 0x000c, 0x12e0: 0x000c, 0x12e2: 0x000c, 0x12e3: 0x000c,
-	0x12e4: 0x000c, 0x12e5: 0x000c, 0x12e6: 0x000c, 0x12e7: 0x000c, 0x12e8: 0x000c,
-	0x12ed: 0x000c,
-	0x12f4: 0x000c,
-	0x12f8: 0x000c, 0x12f9: 0x000c,
-	// Block 0x4c, offset 0x1300
-	0x1300: 0x000c, 0x1301: 0x000c, 0x1302: 0x000c, 0x1303: 0x000c, 0x1304: 0x000c, 0x1305: 0x000c,
-	0x1306: 0x000c, 0x1307: 0x000c, 0x1308: 0x000c, 0x1309: 0x000c, 0x130a: 0x000c, 0x130b: 0x000c,
-	0x130c: 0x000c, 0x130d: 0x000c, 0x130e: 0x000c, 0x130f: 0x000c, 0x1310: 0x000c, 0x1311: 0x000c,
-	0x1312: 0x000c, 0x1313: 0x000c, 0x1314: 0x000c, 0x1315: 0x000c, 0x1316: 0x000c, 0x1317: 0x000c,
-	0x1318: 0x000c, 0x1319: 0x000c, 0x131a: 0x000c, 0x131b: 0x000c, 0x131c: 0x000c, 0x131d: 0x000c,
-	0x131e: 0x000c, 0x131f: 0x000c, 0x1320: 0x000c, 0x1321: 0x000c, 0x1322: 0x000c, 0x1323: 0x000c,
-	0x1324: 0x000c, 0x1325: 0x000c, 0x1326: 0x000c, 0x1327: 0x000c, 0x1328: 0x000c, 0x1329: 0x000c,
-	0x132a: 0x000c, 0x132b: 0x000c, 0x132c: 0x000c, 0x132d: 0x000c, 0x132e: 0x000c, 0x132f: 0x000c,
-	0x1330: 0x000c, 0x1331: 0x000c, 0x1332: 0x000c, 0x1333: 0x000c, 0x1334: 0x000c, 0x1335: 0x000c,
-	0x133b: 0x000c,
-	0x133c: 0x000c, 0x133d: 0x000c, 0x133e: 0x000c, 0x133f: 0x000c,
-	// Block 0x4d, offset 0x1340
-	0x137d: 0x000a, 0x137f: 0x000a,
-	// Block 0x4e, offset 0x1380
-	0x1380: 0x000a, 0x1381: 0x000a,
-	0x138d: 0x000a, 0x138e: 0x000a, 0x138f: 0x000a,
-	0x139d: 0x000a,
-	0x139e: 0x000a, 0x139f: 0x000a,
-	0x13ad: 0x000a, 0x13ae: 0x000a, 0x13af: 0x000a,
-	0x13bd: 0x000a, 0x13be: 0x000a,
-	// Block 0x4f, offset 0x13c0
-	0x13c0: 0x0009, 0x13c1: 0x0009, 0x13c2: 0x0009, 0x13c3: 0x0009, 0x13c4: 0x0009, 0x13c5: 0x0009,
-	0x13c6: 0x0009, 0x13c7: 0x0009, 0x13c8: 0x0009, 0x13c9: 0x0009, 0x13ca: 0x0009, 0x13cb: 0x000b,
-	0x13cc: 0x000b, 0x13cd: 0x000b, 0x13cf: 0x0001, 0x13d0: 0x000a, 0x13d1: 0x000a,
-	0x13d2: 0x000a, 0x13d3: 0x000a, 0x13d4: 0x000a, 0x13d5: 0x000a, 0x13d6: 0x000a, 0x13d7: 0x000a,
-	0x13d8: 0x000a, 0x13d9: 0x000a, 0x13da: 0x000a, 0x13db: 0x000a, 0x13dc: 0x000a, 0x13dd: 0x000a,
-	0x13de: 0x000a, 0x13df: 0x000a, 0x13e0: 0x000a, 0x13e1: 0x000a, 0x13e2: 0x000a, 0x13e3: 0x000a,
-	0x13e4: 0x000a, 0x13e5: 0x000a, 0x13e6: 0x000a, 0x13e7: 0x000a, 0x13e8: 0x0009, 0x13e9: 0x0007,
-	0x13ea: 0x000e, 0x13eb: 0x000e, 0x13ec: 0x000e, 0x13ed: 0x000e, 0x13ee: 0x000e, 0x13ef: 0x0006,
-	0x13f0: 0x0004, 0x13f1: 0x0004, 0x13f2: 0x0004, 0x13f3: 0x0004, 0x13f4: 0x0004, 0x13f5: 0x000a,
-	0x13f6: 0x000a, 0x13f7: 0x000a, 0x13f8: 0x000a, 0x13f9: 0x000a, 0x13fa: 0x000a, 0x13fb: 0x000a,
-	0x13fc: 0x000a, 0x13fd: 0x000a, 0x13fe: 0x000a, 0x13ff: 0x000a,
-	// Block 0x50, offset 0x1400
-	0x1400: 0x000a, 0x1401: 0x000a, 0x1402: 0x000a, 0x1403: 0x000a, 0x1404: 0x0006, 0x1405: 0x009a,
-	0x1406: 0x008a, 0x1407: 0x000a, 0x1408: 0x000a, 0x1409: 0x000a, 0x140a: 0x000a, 0x140b: 0x000a,
-	0x140c: 0x000a, 0x140d: 0x000a, 0x140e: 0x000a, 0x140f: 0x000a, 0x1410: 0x000a, 0x1411: 0x000a,
-	0x1412: 0x000a, 0x1413: 0x000a, 0x1414: 0x000a, 0x1415: 0x000a, 0x1416: 0x000a, 0x1417: 0x000a,
-	0x1418: 0x000a, 0x1419: 0x000a, 0x141a: 0x000a, 0x141b: 0x000a, 0x141c: 0x000a, 0x141d: 0x000a,
-	0x141e: 0x000a, 0x141f: 0x0009, 0x1420: 0x000b, 0x1421: 0x000b, 0x1422: 0x000b, 0x1423: 0x000b,
-	0x1424: 0x000b, 0x1425: 0x000b, 0x1426: 0x000e, 0x1427: 0x000e, 0x1428: 0x000e, 0x1429: 0x000e,
-	0x142a: 0x000b, 0x142b: 0x000b, 0x142c: 0x000b, 0x142d: 0x000b, 0x142e: 0x000b, 0x142f: 0x000b,
-	0x1430: 0x0002, 0x1434: 0x0002, 0x1435: 0x0002,
-	0x1436: 0x0002, 0x1437: 0x0002, 0x1438: 0x0002, 0x1439: 0x0002, 0x143a: 0x0003, 0x143b: 0x0003,
-	0x143c: 0x000a, 0x143d: 0x009a, 0x143e: 0x008a,
-	// Block 0x51, offset 0x1440
-	0x1440: 0x0002, 0x1441: 0x0002, 0x1442: 0x0002, 0x1443: 0x0002, 0x1444: 0x0002, 0x1445: 0x0002,
-	0x1446: 0x0002, 0x1447: 0x0002, 0x1448: 0x0002, 0x1449: 0x0002, 0x144a: 0x0003, 0x144b: 0x0003,
-	0x144c: 0x000a, 0x144d: 0x009a, 0x144e: 0x008a,
-	0x1460: 0x0004, 0x1461: 0x0004, 0x1462: 0x0004, 0x1463: 0x0004,
-	0x1464: 0x0004, 0x1465: 0x0004, 0x1466: 0x0004, 0x1467: 0x0004, 0x1468: 0x0004, 0x1469: 0x0004,
-	0x146a: 0x0004, 0x146b: 0x0004, 0x146c: 0x0004, 0x146d: 0x0004, 0x146e: 0x0004, 0x146f: 0x0004,
-	0x1470: 0x0004, 0x1471: 0x0004, 0x1472: 0x0004, 0x1473: 0x0004, 0x1474: 0x0004, 0x1475: 0x0004,
-	0x1476: 0x0004, 0x1477: 0x0004, 0x1478: 0x0004, 0x1479: 0x0004, 0x147a: 0x0004, 0x147b: 0x0004,
-	0x147c: 0x0004, 0x147d: 0x0004, 0x147e: 0x0004, 0x147f: 0x0004,
-	// Block 0x52, offset 0x1480
-	0x1480: 0x0004, 0x1481: 0x0004, 0x1482: 0x0004, 0x1483: 0x0004, 0x1484: 0x0004, 0x1485: 0x0004,
-	0x1486: 0x0004, 0x1487: 0x0004, 0x1488: 0x0004, 0x1489: 0x0004, 0x148a: 0x0004, 0x148b: 0x0004,
-	0x148c: 0x0004, 0x148d: 0x0004, 0x148e: 0x0004, 0x148f: 0x0004, 0x1490: 0x000c, 0x1491: 0x000c,
-	0x1492: 0x000c, 0x1493: 0x000c, 0x1494: 0x000c, 0x1495: 0x000c, 0x1496: 0x000c, 0x1497: 0x000c,
-	0x1498: 0x000c, 0x1499: 0x000c, 0x149a: 0x000c, 0x149b: 0x000c, 0x149c: 0x000c, 0x149d: 0x000c,
-	0x149e: 0x000c, 0x149f: 0x000c, 0x14a0: 0x000c, 0x14a1: 0x000c, 0x14a2: 0x000c, 0x14a3: 0x000c,
-	0x14a4: 0x000c, 0x14a5: 0x000c, 0x14a6: 0x000c, 0x14a7: 0x000c, 0x14a8: 0x000c, 0x14a9: 0x000c,
-	0x14aa: 0x000c, 0x14ab: 0x000c, 0x14ac: 0x000c, 0x14ad: 0x000c, 0x14ae: 0x000c, 0x14af: 0x000c,
-	0x14b0: 0x000c,
-	// Block 0x53, offset 0x14c0
-	0x14c0: 0x000a, 0x14c1: 0x000a, 0x14c3: 0x000a, 0x14c4: 0x000a, 0x14c5: 0x000a,
-	0x14c6: 0x000a, 0x14c8: 0x000a, 0x14c9: 0x000a,
-	0x14d4: 0x000a, 0x14d6: 0x000a, 0x14d7: 0x000a,
-	0x14d8: 0x000a,
-	0x14de: 0x000a, 0x14df: 0x000a, 0x14e0: 0x000a, 0x14e1: 0x000a, 0x14e2: 0x000a, 0x14e3: 0x000a,
-	0x14e5: 0x000a, 0x14e7: 0x000a, 0x14e9: 0x000a,
-	0x14ee: 0x0004,
-	0x14fa: 0x000a, 0x14fb: 0x000a,
-	// Block 0x54, offset 0x1500
-	0x1500: 0x000a, 0x1501: 0x000a, 0x1502: 0x000a, 0x1503: 0x000a, 0x1504: 0x000a,
-	0x150a: 0x000a, 0x150b: 0x000a,
-	0x150c: 0x000a, 0x150d: 0x000a, 0x1510: 0x000a, 0x1511: 0x000a,
-	0x1512: 0x000a, 0x1513: 0x000a, 0x1514: 0x000a, 0x1515: 0x000a, 0x1516: 0x000a, 0x1517: 0x000a,
-	0x1518: 0x000a, 0x1519: 0x000a, 0x151a: 0x000a, 0x151b: 0x000a, 0x151c: 0x000a, 0x151d: 0x000a,
-	0x151e: 0x000a, 0x151f: 0x000a,
-	// Block 0x55, offset 0x1540
-	0x1549: 0x000a, 0x154a: 0x000a, 0x154b: 0x000a,
-	0x1550: 0x000a, 0x1551: 0x000a,
-	0x1552: 0x000a, 0x1553: 0x000a, 0x1554: 0x000a, 0x1555: 0x000a, 0x1556: 0x000a, 0x1557: 0x000a,
-	0x1558: 0x000a, 0x1559: 0x000a, 0x155a: 0x000a, 0x155b: 0x000a, 0x155c: 0x000a, 0x155d: 0x000a,
-	0x155e: 0x000a, 0x155f: 0x000a, 0x1560: 0x000a, 0x1561: 0x000a, 0x1562: 0x000a, 0x1563: 0x000a,
-	0x1564: 0x000a, 0x1565: 0x000a, 0x1566: 0x000a, 0x1567: 0x000a, 0x1568: 0x000a, 0x1569: 0x000a,
-	0x156a: 0x000a, 0x156b: 0x000a, 0x156c: 0x000a, 0x156d: 0x000a, 0x156e: 0x000a, 0x156f: 0x000a,
-	0x1570: 0x000a, 0x1571: 0x000a, 0x1572: 0x000a, 0x1573: 0x000a, 0x1574: 0x000a, 0x1575: 0x000a,
-	0x1576: 0x000a, 0x1577: 0x000a, 0x1578: 0x000a, 0x1579: 0x000a, 0x157a: 0x000a, 0x157b: 0x000a,
-	0x157c: 0x000a, 0x157d: 0x000a, 0x157e: 0x000a, 0x157f: 0x000a,
-	// Block 0x56, offset 0x1580
-	0x1580: 0x000a, 0x1581: 0x000a, 0x1582: 0x000a, 0x1583: 0x000a, 0x1584: 0x000a, 0x1585: 0x000a,
-	0x1586: 0x000a, 0x1587: 0x000a, 0x1588: 0x000a, 0x1589: 0x000a, 0x158a: 0x000a, 0x158b: 0x000a,
-	0x158c: 0x000a, 0x158d: 0x000a, 0x158e: 0x000a, 0x158f: 0x000a, 0x1590: 0x000a, 0x1591: 0x000a,
-	0x1592: 0x000a, 0x1593: 0x000a, 0x1594: 0x000a, 0x1595: 0x000a, 0x1596: 0x000a, 0x1597: 0x000a,
-	0x1598: 0x000a, 0x1599: 0x000a, 0x159a: 0x000a, 0x159b: 0x000a, 0x159c: 0x000a, 0x159d: 0x000a,
-	0x159e: 0x000a, 0x159f: 0x000a, 0x15a0: 0x000a, 0x15a1: 0x000a, 0x15a2: 0x000a, 0x15a3: 0x000a,
-	0x15a4: 0x000a, 0x15a5: 0x000a, 0x15a6: 0x000a, 0x15a7: 0x000a, 0x15a8: 0x000a, 0x15a9: 0x000a,
-	0x15aa: 0x000a, 0x15ab: 0x000a, 0x15ac: 0x000a, 0x15ad: 0x000a, 0x15ae: 0x000a, 0x15af: 0x000a,
-	0x15b0: 0x000a, 0x15b1: 0x000a, 0x15b2: 0x000a, 0x15b3: 0x000a, 0x15b4: 0x000a, 0x15b5: 0x000a,
-	0x15b6: 0x000a, 0x15b7: 0x000a, 0x15b8: 0x000a, 0x15b9: 0x000a, 0x15ba: 0x000a, 0x15bb: 0x000a,
-	0x15bc: 0x000a, 0x15bd: 0x000a, 0x15be: 0x000a, 0x15bf: 0x000a,
-	// Block 0x57, offset 0x15c0
-	0x15c0: 0x000a, 0x15c1: 0x000a, 0x15c2: 0x000a, 0x15c3: 0x000a, 0x15c4: 0x000a, 0x15c5: 0x000a,
-	0x15c6: 0x000a, 0x15c7: 0x000a, 0x15c8: 0x000a, 0x15c9: 0x000a, 0x15ca: 0x000a, 0x15cb: 0x000a,
-	0x15cc: 0x000a, 0x15cd: 0x000a, 0x15ce: 0x000a, 0x15cf: 0x000a, 0x15d0: 0x000a, 0x15d1: 0x000a,
-	0x15d2: 0x0003, 0x15d3: 0x0004, 0x15d4: 0x000a, 0x15d5: 0x000a, 0x15d6: 0x000a, 0x15d7: 0x000a,
-	0x15d8: 0x000a, 0x15d9: 0x000a, 0x15da: 0x000a, 0x15db: 0x000a, 0x15dc: 0x000a, 0x15dd: 0x000a,
-	0x15de: 0x000a, 0x15df: 0x000a, 0x15e0: 0x000a, 0x15e1: 0x000a, 0x15e2: 0x000a, 0x15e3: 0x000a,
-	0x15e4: 0x000a, 0x15e5: 0x000a, 0x15e6: 0x000a, 0x15e7: 0x000a, 0x15e8: 0x000a, 0x15e9: 0x000a,
-	0x15ea: 0x000a, 0x15eb: 0x000a, 0x15ec: 0x000a, 0x15ed: 0x000a, 0x15ee: 0x000a, 0x15ef: 0x000a,
-	0x15f0: 0x000a, 0x15f1: 0x000a, 0x15f2: 0x000a, 0x15f3: 0x000a, 0x15f4: 0x000a, 0x15f5: 0x000a,
-	0x15f6: 0x000a, 0x15f7: 0x000a, 0x15f8: 0x000a, 0x15f9: 0x000a, 0x15fa: 0x000a, 0x15fb: 0x000a,
-	0x15fc: 0x000a, 0x15fd: 0x000a, 0x15fe: 0x000a, 0x15ff: 0x000a,
-	// Block 0x58, offset 0x1600
-	0x1600: 0x000a, 0x1601: 0x000a, 0x1602: 0x000a, 0x1603: 0x000a, 0x1604: 0x000a, 0x1605: 0x000a,
-	0x1606: 0x000a, 0x1607: 0x000a, 0x1608: 0x003a, 0x1609: 0x002a, 0x160a: 0x003a, 0x160b: 0x002a,
-	0x160c: 0x000a, 0x160d: 0x000a, 0x160e: 0x000a, 0x160f: 0x000a, 0x1610: 0x000a, 0x1611: 0x000a,
-	0x1612: 0x000a, 0x1613: 0x000a, 0x1614: 0x000a, 0x1615: 0x000a, 0x1616: 0x000a, 0x1617: 0x000a,
-	0x1618: 0x000a, 0x1619: 0x000a, 0x161a: 0x000a, 0x161b: 0x000a, 0x161c: 0x000a, 0x161d: 0x000a,
-	0x161e: 0x000a, 0x161f: 0x000a, 0x1620: 0x000a, 0x1621: 0x000a, 0x1622: 0x000a, 0x1623: 0x000a,
-	0x1624: 0x000a, 0x1625: 0x000a, 0x1626: 0x000a, 0x1627: 0x000a, 0x1628: 0x000a, 0x1629: 0x009a,
-	0x162a: 0x008a, 0x162b: 0x000a, 0x162c: 0x000a, 0x162d: 0x000a, 0x162e: 0x000a, 0x162f: 0x000a,
-	0x1630: 0x000a, 0x1631: 0x000a, 0x1632: 0x000a, 0x1633: 0x000a, 0x1634: 0x000a, 0x1635: 0x000a,
-	// Block 0x59, offset 0x1640
-	0x167b: 0x000a,
-	0x167c: 0x000a, 0x167d: 0x000a, 0x167e: 0x000a, 0x167f: 0x000a,
-	// Block 0x5a, offset 0x1680
-	0x1680: 0x000a, 0x1681: 0x000a, 0x1682: 0x000a, 0x1683: 0x000a, 0x1684: 0x000a, 0x1685: 0x000a,
-	0x1686: 0x000a, 0x1687: 0x000a, 0x1688: 0x000a, 0x1689: 0x000a, 0x168a: 0x000a, 0x168b: 0x000a,
-	0x168c: 0x000a, 0x168d: 0x000a, 0x168e: 0x000a, 0x168f: 0x000a, 0x1690: 0x000a, 0x1691: 0x000a,
-	0x1692: 0x000a, 0x1693: 0x000a, 0x1694: 0x000a, 0x1696: 0x000a, 0x1697: 0x000a,
-	0x1698: 0x000a, 0x1699: 0x000a, 0x169a: 0x000a, 0x169b: 0x000a, 0x169c: 0x000a, 0x169d: 0x000a,
-	0x169e: 0x000a, 0x169f: 0x000a, 0x16a0: 0x000a, 0x16a1: 0x000a, 0x16a2: 0x000a, 0x16a3: 0x000a,
-	0x16a4: 0x000a, 0x16a5: 0x000a, 0x16a6: 0x000a, 0x16a7: 0x000a, 0x16a8: 0x000a, 0x16a9: 0x000a,
-	0x16aa: 0x000a, 0x16ab: 0x000a, 0x16ac: 0x000a, 0x16ad: 0x000a, 0x16ae: 0x000a, 0x16af: 0x000a,
-	0x16b0: 0x000a, 0x16b1: 0x000a, 0x16b2: 0x000a, 0x16b3: 0x000a, 0x16b4: 0x000a, 0x16b5: 0x000a,
-	0x16b6: 0x000a, 0x16b7: 0x000a, 0x16b8: 0x000a, 0x16b9: 0x000a, 0x16ba: 0x000a, 0x16bb: 0x000a,
-	0x16bc: 0x000a, 0x16bd: 0x000a, 0x16be: 0x000a, 0x16bf: 0x000a,
-	// Block 0x5b, offset 0x16c0
-	0x16c0: 0x000a, 0x16c1: 0x000a, 0x16c2: 0x000a, 0x16c3: 0x000a, 0x16c4: 0x000a, 0x16c5: 0x000a,
-	0x16c6: 0x000a, 0x16c7: 0x000a, 0x16c8: 0x000a, 0x16c9: 0x000a, 0x16ca: 0x000a, 0x16cb: 0x000a,
-	0x16cc: 0x000a, 0x16cd: 0x000a, 0x16ce: 0x000a, 0x16cf: 0x000a, 0x16d0: 0x000a, 0x16d1: 0x000a,
-	0x16d2: 0x000a, 0x16d3: 0x000a, 0x16d4: 0x000a, 0x16d5: 0x000a, 0x16d6: 0x000a, 0x16d7: 0x000a,
-	0x16d8: 0x000a, 0x16d9: 0x000a, 0x16da: 0x000a, 0x16db: 0x000a, 0x16dc: 0x000a, 0x16dd: 0x000a,
-	0x16de: 0x000a, 0x16df: 0x000a, 0x16e0: 0x000a, 0x16e1: 0x000a, 0x16e2: 0x000a, 0x16e3: 0x000a,
-	0x16e4: 0x000a, 0x16e5: 0x000a, 0x16e6: 0x000a, 0x16e7: 0x000a, 0x16e8: 0x000a, 0x16e9: 0x000a,
-	0x16ea: 0x000a, 0x16eb: 0x000a, 0x16ec: 0x000a, 0x16ed: 0x000a, 0x16ee: 0x000a, 0x16ef: 0x000a,
-	0x16f0: 0x000a, 0x16f1: 0x000a, 0x16f2: 0x000a, 0x16f3: 0x000a, 0x16f4: 0x000a, 0x16f5: 0x000a,
-	0x16f6: 0x000a, 0x16f7: 0x000a, 0x16f8: 0x000a, 0x16f9: 0x000a, 0x16fa: 0x000a, 0x16fb: 0x000a,
-	0x16fc: 0x000a, 0x16fd: 0x000a, 0x16fe: 0x000a,
-	// Block 0x5c, offset 0x1700
-	0x1700: 0x000a, 0x1701: 0x000a, 0x1702: 0x000a, 0x1703: 0x000a, 0x1704: 0x000a, 0x1705: 0x000a,
-	0x1706: 0x000a, 0x1707: 0x000a, 0x1708: 0x000a, 0x1709: 0x000a, 0x170a: 0x000a, 0x170b: 0x000a,
-	0x170c: 0x000a, 0x170d: 0x000a, 0x170e: 0x000a, 0x170f: 0x000a, 0x1710: 0x000a, 0x1711: 0x000a,
-	0x1712: 0x000a, 0x1713: 0x000a, 0x1714: 0x000a, 0x1715: 0x000a, 0x1716: 0x000a, 0x1717: 0x000a,
-	0x1718: 0x000a, 0x1719: 0x000a, 0x171a: 0x000a, 0x171b: 0x000a, 0x171c: 0x000a, 0x171d: 0x000a,
-	0x171e: 0x000a, 0x171f: 0x000a, 0x1720: 0x000a, 0x1721: 0x000a, 0x1722: 0x000a, 0x1723: 0x000a,
-	0x1724: 0x000a, 0x1725: 0x000a, 0x1726: 0x000a,
-	// Block 0x5d, offset 0x1740
-	0x1740: 0x000a, 0x1741: 0x000a, 0x1742: 0x000a, 0x1743: 0x000a, 0x1744: 0x000a, 0x1745: 0x000a,
-	0x1746: 0x000a, 0x1747: 0x000a, 0x1748: 0x000a, 0x1749: 0x000a, 0x174a: 0x000a,
-	0x1760: 0x000a, 0x1761: 0x000a, 0x1762: 0x000a, 0x1763: 0x000a,
-	0x1764: 0x000a, 0x1765: 0x000a, 0x1766: 0x000a, 0x1767: 0x000a, 0x1768: 0x000a, 0x1769: 0x000a,
-	0x176a: 0x000a, 0x176b: 0x000a, 0x176c: 0x000a, 0x176d: 0x000a, 0x176e: 0x000a, 0x176f: 0x000a,
-	0x1770: 0x000a, 0x1771: 0x000a, 0x1772: 0x000a, 0x1773: 0x000a, 0x1774: 0x000a, 0x1775: 0x000a,
-	0x1776: 0x000a, 0x1777: 0x000a, 0x1778: 0x000a, 0x1779: 0x000a, 0x177a: 0x000a, 0x177b: 0x000a,
-	0x177c: 0x000a, 0x177d: 0x000a, 0x177e: 0x000a, 0x177f: 0x000a,
-	// Block 0x5e, offset 0x1780
-	0x1780: 0x000a, 0x1781: 0x000a, 0x1782: 0x000a, 0x1783: 0x000a, 0x1784: 0x000a, 0x1785: 0x000a,
-	0x1786: 0x000a, 0x1787: 0x000a, 0x1788: 0x0002, 0x1789: 0x0002, 0x178a: 0x0002, 0x178b: 0x0002,
-	0x178c: 0x0002, 0x178d: 0x0002, 0x178e: 0x0002, 0x178f: 0x0002, 0x1790: 0x0002, 0x1791: 0x0002,
-	0x1792: 0x0002, 0x1793: 0x0002, 0x1794: 0x0002, 0x1795: 0x0002, 0x1796: 0x0002, 0x1797: 0x0002,
-	0x1798: 0x0002, 0x1799: 0x0002, 0x179a: 0x0002, 0x179b: 0x0002,
-	// Block 0x5f, offset 0x17c0
-	0x17ea: 0x000a, 0x17eb: 0x000a, 0x17ec: 0x000a, 0x17ed: 0x000a, 0x17ee: 0x000a, 0x17ef: 0x000a,
-	0x17f0: 0x000a, 0x17f1: 0x000a, 0x17f2: 0x000a, 0x17f3: 0x000a, 0x17f4: 0x000a, 0x17f5: 0x000a,
-	0x17f6: 0x000a, 0x17f7: 0x000a, 0x17f8: 0x000a, 0x17f9: 0x000a, 0x17fa: 0x000a, 0x17fb: 0x000a,
-	0x17fc: 0x000a, 0x17fd: 0x000a, 0x17fe: 0x000a, 0x17ff: 0x000a,
-	// Block 0x60, offset 0x1800
-	0x1800: 0x000a, 0x1801: 0x000a, 0x1802: 0x000a, 0x1803: 0x000a, 0x1804: 0x000a, 0x1805: 0x000a,
-	0x1806: 0x000a, 0x1807: 0x000a, 0x1808: 0x000a, 0x1809: 0x000a, 0x180a: 0x000a, 0x180b: 0x000a,
-	0x180c: 0x000a, 0x180d: 0x000a, 0x180e: 0x000a, 0x180f: 0x000a, 0x1810: 0x000a, 0x1811: 0x000a,
-	0x1812: 0x000a, 0x1813: 0x000a, 0x1814: 0x000a, 0x1815: 0x000a, 0x1816: 0x000a, 0x1817: 0x000a,
-	0x1818: 0x000a, 0x1819: 0x000a, 0x181a: 0x000a, 0x181b: 0x000a, 0x181c: 0x000a, 0x181d: 0x000a,
-	0x181e: 0x000a, 0x181f: 0x000a, 0x1820: 0x000a, 0x1821: 0x000a, 0x1822: 0x000a, 0x1823: 0x000a,
-	0x1824: 0x000a, 0x1825: 0x000a, 0x1826: 0x000a, 0x1827: 0x000a, 0x1828: 0x000a, 0x1829: 0x000a,
-	0x182a: 0x000a, 0x182b: 0x000a, 0x182d: 0x000a, 0x182e: 0x000a, 0x182f: 0x000a,
-	0x1830: 0x000a, 0x1831: 0x000a, 0x1832: 0x000a, 0x1833: 0x000a, 0x1834: 0x000a, 0x1835: 0x000a,
-	0x1836: 0x000a, 0x1837: 0x000a, 0x1838: 0x000a, 0x1839: 0x000a, 0x183a: 0x000a, 0x183b: 0x000a,
-	0x183c: 0x000a, 0x183d: 0x000a, 0x183e: 0x000a, 0x183f: 0x000a,
-	// Block 0x61, offset 0x1840
-	0x1840: 0x000a, 0x1841: 0x000a, 0x1842: 0x000a, 0x1843: 0x000a, 0x1844: 0x000a, 0x1845: 0x000a,
-	0x1846: 0x000a, 0x1847: 0x000a, 0x1848: 0x000a, 0x1849: 0x000a, 0x184a: 0x000a, 0x184b: 0x000a,
-	0x184c: 0x000a, 0x184d: 0x000a, 0x184e: 0x000a, 0x184f: 0x000a, 0x1850: 0x000a, 0x1851: 0x000a,
-	0x1852: 0x000a, 0x1853: 0x000a, 0x1854: 0x000a, 0x1855: 0x000a, 0x1856: 0x000a, 0x1857: 0x000a,
-	0x1858: 0x000a, 0x1859: 0x000a, 0x185a: 0x000a, 0x185b: 0x000a, 0x185c: 0x000a, 0x185d: 0x000a,
-	0x185e: 0x000a, 0x185f: 0x000a, 0x1860: 0x000a, 0x1861: 0x000a, 0x1862: 0x000a, 0x1863: 0x000a,
-	0x1864: 0x000a, 0x1865: 0x000a, 0x1866: 0x000a, 0x1867: 0x000a, 0x1868: 0x003a, 0x1869: 0x002a,
-	0x186a: 0x003a, 0x186b: 0x002a, 0x186c: 0x003a, 0x186d: 0x002a, 0x186e: 0x003a, 0x186f: 0x002a,
-	0x1870: 0x003a, 0x1871: 0x002a, 0x1872: 0x003a, 0x1873: 0x002a, 0x1874: 0x003a, 0x1875: 0x002a,
-	0x1876: 0x000a, 0x1877: 0x000a, 0x1878: 0x000a, 0x1879: 0x000a, 0x187a: 0x000a, 0x187b: 0x000a,
-	0x187c: 0x000a, 0x187d: 0x000a, 0x187e: 0x000a, 0x187f: 0x000a,
-	// Block 0x62, offset 0x1880
-	0x1880: 0x000a, 0x1881: 0x000a, 0x1882: 0x000a, 0x1883: 0x000a, 0x1884: 0x000a, 0x1885: 0x009a,
-	0x1886: 0x008a, 0x1887: 0x000a, 0x1888: 0x000a, 0x1889: 0x000a, 0x188a: 0x000a, 0x188b: 0x000a,
-	0x188c: 0x000a, 0x188d: 0x000a, 0x188e: 0x000a, 0x188f: 0x000a, 0x1890: 0x000a, 0x1891: 0x000a,
-	0x1892: 0x000a, 0x1893: 0x000a, 0x1894: 0x000a, 0x1895: 0x000a, 0x1896: 0x000a, 0x1897: 0x000a,
-	0x1898: 0x000a, 0x1899: 0x000a, 0x189a: 0x000a, 0x189b: 0x000a, 0x189c: 0x000a, 0x189d: 0x000a,
-	0x189e: 0x000a, 0x189f: 0x000a, 0x18a0: 0x000a, 0x18a1: 0x000a, 0x18a2: 0x000a, 0x18a3: 0x000a,
-	0x18a4: 0x000a, 0x18a5: 0x000a, 0x18a6: 0x003a, 0x18a7: 0x002a, 0x18a8: 0x003a, 0x18a9: 0x002a,
-	0x18aa: 0x003a, 0x18ab: 0x002a, 0x18ac: 0x003a, 0x18ad: 0x002a, 0x18ae: 0x003a, 0x18af: 0x002a,
-	0x18b0: 0x000a, 0x18b1: 0x000a, 0x18b2: 0x000a, 0x18b3: 0x000a, 0x18b4: 0x000a, 0x18b5: 0x000a,
-	0x18b6: 0x000a, 0x18b7: 0x000a, 0x18b8: 0x000a, 0x18b9: 0x000a, 0x18ba: 0x000a, 0x18bb: 0x000a,
-	0x18bc: 0x000a, 0x18bd: 0x000a, 0x18be: 0x000a, 0x18bf: 0x000a,
-	// Block 0x63, offset 0x18c0
-	0x18c0: 0x000a, 0x18c1: 0x000a, 0x18c2: 0x000a, 0x18c3: 0x007a, 0x18c4: 0x006a, 0x18c5: 0x009a,
-	0x18c6: 0x008a, 0x18c7: 0x00ba, 0x18c8: 0x00aa, 0x18c9: 0x009a, 0x18ca: 0x008a, 0x18cb: 0x007a,
-	0x18cc: 0x006a, 0x18cd: 0x00da, 0x18ce: 0x002a, 0x18cf: 0x003a, 0x18d0: 0x00ca, 0x18d1: 0x009a,
-	0x18d2: 0x008a, 0x18d3: 0x007a, 0x18d4: 0x006a, 0x18d5: 0x009a, 0x18d6: 0x008a, 0x18d7: 0x00ba,
-	0x18d8: 0x00aa, 0x18d9: 0x000a, 0x18da: 0x000a, 0x18db: 0x000a, 0x18dc: 0x000a, 0x18dd: 0x000a,
-	0x18de: 0x000a, 0x18df: 0x000a, 0x18e0: 0x000a, 0x18e1: 0x000a, 0x18e2: 0x000a, 0x18e3: 0x000a,
-	0x18e4: 0x000a, 0x18e5: 0x000a, 0x18e6: 0x000a, 0x18e7: 0x000a, 0x18e8: 0x000a, 0x18e9: 0x000a,
-	0x18ea: 0x000a, 0x18eb: 0x000a, 0x18ec: 0x000a, 0x18ed: 0x000a, 0x18ee: 0x000a, 0x18ef: 0x000a,
-	0x18f0: 0x000a, 0x18f1: 0x000a, 0x18f2: 0x000a, 0x18f3: 0x000a, 0x18f4: 0x000a, 0x18f5: 0x000a,
-	0x18f6: 0x000a, 0x18f7: 0x000a, 0x18f8: 0x000a, 0x18f9: 0x000a, 0x18fa: 0x000a, 0x18fb: 0x000a,
-	0x18fc: 0x000a, 0x18fd: 0x000a, 0x18fe: 0x000a, 0x18ff: 0x000a,
-	// Block 0x64, offset 0x1900
-	0x1900: 0x000a, 0x1901: 0x000a, 0x1902: 0x000a, 0x1903: 0x000a, 0x1904: 0x000a, 0x1905: 0x000a,
-	0x1906: 0x000a, 0x1907: 0x000a, 0x1908: 0x000a, 0x1909: 0x000a, 0x190a: 0x000a, 0x190b: 0x000a,
-	0x190c: 0x000a, 0x190d: 0x000a, 0x190e: 0x000a, 0x190f: 0x000a, 0x1910: 0x000a, 0x1911: 0x000a,
-	0x1912: 0x000a, 0x1913: 0x000a, 0x1914: 0x000a, 0x1915: 0x000a, 0x1916: 0x000a, 0x1917: 0x000a,
-	0x1918: 0x003a, 0x1919: 0x002a, 0x191a: 0x003a, 0x191b: 0x002a, 0x191c: 0x000a, 0x191d: 0x000a,
-	0x191e: 0x000a, 0x191f: 0x000a, 0x1920: 0x000a, 0x1921: 0x000a, 0x1922: 0x000a, 0x1923: 0x000a,
-	0x1924: 0x000a, 0x1925: 0x000a, 0x1926: 0x000a, 0x1927: 0x000a, 0x1928: 0x000a, 0x1929: 0x000a,
-	0x192a: 0x000a, 0x192b: 0x000a, 0x192c: 0x000a, 0x192d: 0x000a, 0x192e: 0x000a, 0x192f: 0x000a,
-	0x1930: 0x000a, 0x1931: 0x000a, 0x1932: 0x000a, 0x1933: 0x000a, 0x1934: 0x000a, 0x1935: 0x000a,
-	0x1936: 0x000a, 0x1937: 0x000a, 0x1938: 0x000a, 0x1939: 0x000a, 0x193a: 0x000a, 0x193b: 0x000a,
-	0x193c: 0x003a, 0x193d: 0x002a, 0x193e: 0x000a, 0x193f: 0x000a,
-	// Block 0x65, offset 0x1940
-	0x1940: 0x000a, 0x1941: 0x000a, 0x1942: 0x000a, 0x1943: 0x000a, 0x1944: 0x000a, 0x1945: 0x000a,
-	0x1946: 0x000a, 0x1947: 0x000a, 0x1948: 0x000a, 0x1949: 0x000a, 0x194a: 0x000a, 0x194b: 0x000a,
-	0x194c: 0x000a, 0x194d: 0x000a, 0x194e: 0x000a, 0x194f: 0x000a, 0x1950: 0x000a, 0x1951: 0x000a,
-	0x1952: 0x000a, 0x1953: 0x000a, 0x1954: 0x000a, 0x1955: 0x000a, 0x1956: 0x000a, 0x1957: 0x000a,
-	0x1958: 0x000a, 0x1959: 0x000a, 0x195a: 0x000a, 0x195b: 0x000a, 0x195c: 0x000a, 0x195d: 0x000a,
-	0x195e: 0x000a, 0x195f: 0x000a, 0x1960: 0x000a, 0x1961: 0x000a, 0x1962: 0x000a, 0x1963: 0x000a,
-	0x1964: 0x000a, 0x1965: 0x000a, 0x1966: 0x000a, 0x1967: 0x000a, 0x1968: 0x000a, 0x1969: 0x000a,
-	0x196a: 0x000a, 0x196b: 0x000a, 0x196c: 0x000a, 0x196d: 0x000a, 0x196e: 0x000a, 0x196f: 0x000a,
-	0x1970: 0x000a, 0x1971: 0x000a, 0x1972: 0x000a, 0x1973: 0x000a,
-	0x1976: 0x000a, 0x1977: 0x000a, 0x1978: 0x000a, 0x1979: 0x000a, 0x197a: 0x000a, 0x197b: 0x000a,
-	0x197c: 0x000a, 0x197d: 0x000a, 0x197e: 0x000a, 0x197f: 0x000a,
-	// Block 0x66, offset 0x1980
-	0x1980: 0x000a, 0x1981: 0x000a, 0x1982: 0x000a, 0x1983: 0x000a, 0x1984: 0x000a, 0x1985: 0x000a,
-	0x1986: 0x000a, 0x1987: 0x000a, 0x1988: 0x000a, 0x1989: 0x000a, 0x198a: 0x000a, 0x198b: 0x000a,
-	0x198c: 0x000a, 0x198d: 0x000a, 0x198e: 0x000a, 0x198f: 0x000a, 0x1990: 0x000a, 0x1991: 0x000a,
-	0x1992: 0x000a, 0x1993: 0x000a, 0x1994: 0x000a, 0x1995: 0x000a,
-	0x1998: 0x000a, 0x1999: 0x000a, 0x199a: 0x000a, 0x199b: 0x000a, 0x199c: 0x000a, 0x199d: 0x000a,
-	0x199e: 0x000a, 0x199f: 0x000a, 0x19a0: 0x000a, 0x19a1: 0x000a, 0x19a2: 0x000a, 0x19a3: 0x000a,
-	0x19a4: 0x000a, 0x19a5: 0x000a, 0x19a6: 0x000a, 0x19a7: 0x000a, 0x19a8: 0x000a, 0x19a9: 0x000a,
-	0x19aa: 0x000a, 0x19ab: 0x000a, 0x19ac: 0x000a, 0x19ad: 0x000a, 0x19ae: 0x000a, 0x19af: 0x000a,
-	0x19b0: 0x000a, 0x19b1: 0x000a, 0x19b2: 0x000a, 0x19b3: 0x000a, 0x19b4: 0x000a, 0x19b5: 0x000a,
-	0x19b6: 0x000a, 0x19b7: 0x000a, 0x19b8: 0x000a, 0x19b9: 0x000a,
-	0x19bd: 0x000a, 0x19be: 0x000a, 0x19bf: 0x000a,
-	// Block 0x67, offset 0x19c0
-	0x19c0: 0x000a, 0x19c1: 0x000a, 0x19c2: 0x000a, 0x19c3: 0x000a, 0x19c4: 0x000a, 0x19c5: 0x000a,
-	0x19c6: 0x000a, 0x19c7: 0x000a, 0x19c8: 0x000a, 0x19ca: 0x000a, 0x19cb: 0x000a,
-	0x19cc: 0x000a, 0x19cd: 0x000a, 0x19ce: 0x000a, 0x19cf: 0x000a, 0x19d0: 0x000a, 0x19d1: 0x000a,
-	0x19ec: 0x000a, 0x19ed: 0x000a, 0x19ee: 0x000a, 0x19ef: 0x000a,
-	// Block 0x68, offset 0x1a00
-	0x1a25: 0x000a, 0x1a26: 0x000a, 0x1a27: 0x000a, 0x1a28: 0x000a, 0x1a29: 0x000a,
-	0x1a2a: 0x000a, 0x1a2f: 0x000c,
-	0x1a30: 0x000c, 0x1a31: 0x000c,
-	0x1a39: 0x000a, 0x1a3a: 0x000a, 0x1a3b: 0x000a,
-	0x1a3c: 0x000a, 0x1a3d: 0x000a, 0x1a3e: 0x000a, 0x1a3f: 0x000a,
-	// Block 0x69, offset 0x1a40
-	0x1a7f: 0x000c,
-	// Block 0x6a, offset 0x1a80
-	0x1aa0: 0x000c, 0x1aa1: 0x000c, 0x1aa2: 0x000c, 0x1aa3: 0x000c,
-	0x1aa4: 0x000c, 0x1aa5: 0x000c, 0x1aa6: 0x000c, 0x1aa7: 0x000c, 0x1aa8: 0x000c, 0x1aa9: 0x000c,
-	0x1aaa: 0x000c, 0x1aab: 0x000c, 0x1aac: 0x000c, 0x1aad: 0x000c, 0x1aae: 0x000c, 0x1aaf: 0x000c,
-	0x1ab0: 0x000c, 0x1ab1: 0x000c, 0x1ab2: 0x000c, 0x1ab3: 0x000c, 0x1ab4: 0x000c, 0x1ab5: 0x000c,
-	0x1ab6: 0x000c, 0x1ab7: 0x000c, 0x1ab8: 0x000c, 0x1ab9: 0x000c, 0x1aba: 0x000c, 0x1abb: 0x000c,
-	0x1abc: 0x000c, 0x1abd: 0x000c, 0x1abe: 0x000c, 0x1abf: 0x000c,
-	// Block 0x6b, offset 0x1ac0
-	0x1ac0: 0x000a, 0x1ac1: 0x000a, 0x1ac2: 0x000a, 0x1ac3: 0x000a, 0x1ac4: 0x000a, 0x1ac5: 0x000a,
-	0x1ac6: 0x000a, 0x1ac7: 0x000a, 0x1ac8: 0x000a, 0x1ac9: 0x000a, 0x1aca: 0x000a, 0x1acb: 0x000a,
-	0x1acc: 0x000a, 0x1acd: 0x000a, 0x1ace: 0x000a, 0x1acf: 0x000a, 0x1ad0: 0x000a, 0x1ad1: 0x000a,
-	0x1ad2: 0x000a, 0x1ad3: 0x000a, 0x1ad4: 0x000a, 0x1ad5: 0x000a, 0x1ad6: 0x000a, 0x1ad7: 0x000a,
-	0x1ad8: 0x000a, 0x1ad9: 0x000a, 0x1ada: 0x000a, 0x1adb: 0x000a, 0x1adc: 0x000a, 0x1add: 0x000a,
-	0x1ade: 0x000a, 0x1adf: 0x000a, 0x1ae0: 0x000a, 0x1ae1: 0x000a, 0x1ae2: 0x003a, 0x1ae3: 0x002a,
-	0x1ae4: 0x003a, 0x1ae5: 0x002a, 0x1ae6: 0x003a, 0x1ae7: 0x002a, 0x1ae8: 0x003a, 0x1ae9: 0x002a,
-	0x1aea: 0x000a, 0x1aeb: 0x000a, 0x1aec: 0x000a, 0x1aed: 0x000a, 0x1aee: 0x000a, 0x1aef: 0x000a,
-	0x1af0: 0x000a, 0x1af1: 0x000a, 0x1af2: 0x000a, 0x1af3: 0x000a, 0x1af4: 0x000a, 0x1af5: 0x000a,
-	0x1af6: 0x000a, 0x1af7: 0x000a, 0x1af8: 0x000a, 0x1af9: 0x000a, 0x1afa: 0x000a, 0x1afb: 0x000a,
-	0x1afc: 0x000a, 0x1afd: 0x000a, 0x1afe: 0x000a, 0x1aff: 0x000a,
-	// Block 0x6c, offset 0x1b00
-	0x1b00: 0x000a, 0x1b01: 0x000a, 0x1b02: 0x000a, 0x1b03: 0x000a, 0x1b04: 0x000a,
-	// Block 0x6d, offset 0x1b40
-	0x1b40: 0x000a, 0x1b41: 0x000a, 0x1b42: 0x000a, 0x1b43: 0x000a, 0x1b44: 0x000a, 0x1b45: 0x000a,
-	0x1b46: 0x000a, 0x1b47: 0x000a, 0x1b48: 0x000a, 0x1b49: 0x000a, 0x1b4a: 0x000a, 0x1b4b: 0x000a,
-	0x1b4c: 0x000a, 0x1b4d: 0x000a, 0x1b4e: 0x000a, 0x1b4f: 0x000a, 0x1b50: 0x000a, 0x1b51: 0x000a,
-	0x1b52: 0x000a, 0x1b53: 0x000a, 0x1b54: 0x000a, 0x1b55: 0x000a, 0x1b56: 0x000a, 0x1b57: 0x000a,
-	0x1b58: 0x000a, 0x1b59: 0x000a, 0x1b5b: 0x000a, 0x1b5c: 0x000a, 0x1b5d: 0x000a,
-	0x1b5e: 0x000a, 0x1b5f: 0x000a, 0x1b60: 0x000a, 0x1b61: 0x000a, 0x1b62: 0x000a, 0x1b63: 0x000a,
-	0x1b64: 0x000a, 0x1b65: 0x000a, 0x1b66: 0x000a, 0x1b67: 0x000a, 0x1b68: 0x000a, 0x1b69: 0x000a,
-	0x1b6a: 0x000a, 0x1b6b: 0x000a, 0x1b6c: 0x000a, 0x1b6d: 0x000a, 0x1b6e: 0x000a, 0x1b6f: 0x000a,
-	0x1b70: 0x000a, 0x1b71: 0x000a, 0x1b72: 0x000a, 0x1b73: 0x000a, 0x1b74: 0x000a, 0x1b75: 0x000a,
-	0x1b76: 0x000a, 0x1b77: 0x000a, 0x1b78: 0x000a, 0x1b79: 0x000a, 0x1b7a: 0x000a, 0x1b7b: 0x000a,
-	0x1b7c: 0x000a, 0x1b7d: 0x000a, 0x1b7e: 0x000a, 0x1b7f: 0x000a,
-	// Block 0x6e, offset 0x1b80
-	0x1b80: 0x000a, 0x1b81: 0x000a, 0x1b82: 0x000a, 0x1b83: 0x000a, 0x1b84: 0x000a, 0x1b85: 0x000a,
-	0x1b86: 0x000a, 0x1b87: 0x000a, 0x1b88: 0x000a, 0x1b89: 0x000a, 0x1b8a: 0x000a, 0x1b8b: 0x000a,
-	0x1b8c: 0x000a, 0x1b8d: 0x000a, 0x1b8e: 0x000a, 0x1b8f: 0x000a, 0x1b90: 0x000a, 0x1b91: 0x000a,
-	0x1b92: 0x000a, 0x1b93: 0x000a, 0x1b94: 0x000a, 0x1b95: 0x000a, 0x1b96: 0x000a, 0x1b97: 0x000a,
-	0x1b98: 0x000a, 0x1b99: 0x000a, 0x1b9a: 0x000a, 0x1b9b: 0x000a, 0x1b9c: 0x000a, 0x1b9d: 0x000a,
-	0x1b9e: 0x000a, 0x1b9f: 0x000a, 0x1ba0: 0x000a, 0x1ba1: 0x000a, 0x1ba2: 0x000a, 0x1ba3: 0x000a,
-	0x1ba4: 0x000a, 0x1ba5: 0x000a, 0x1ba6: 0x000a, 0x1ba7: 0x000a, 0x1ba8: 0x000a, 0x1ba9: 0x000a,
-	0x1baa: 0x000a, 0x1bab: 0x000a, 0x1bac: 0x000a, 0x1bad: 0x000a, 0x1bae: 0x000a, 0x1baf: 0x000a,
-	0x1bb0: 0x000a, 0x1bb1: 0x000a, 0x1bb2: 0x000a, 0x1bb3: 0x000a,
-	// Block 0x6f, offset 0x1bc0
-	0x1bc0: 0x000a, 0x1bc1: 0x000a, 0x1bc2: 0x000a, 0x1bc3: 0x000a, 0x1bc4: 0x000a, 0x1bc5: 0x000a,
-	0x1bc6: 0x000a, 0x1bc7: 0x000a, 0x1bc8: 0x000a, 0x1bc9: 0x000a, 0x1bca: 0x000a, 0x1bcb: 0x000a,
-	0x1bcc: 0x000a, 0x1bcd: 0x000a, 0x1bce: 0x000a, 0x1bcf: 0x000a, 0x1bd0: 0x000a, 0x1bd1: 0x000a,
-	0x1bd2: 0x000a, 0x1bd3: 0x000a, 0x1bd4: 0x000a, 0x1bd5: 0x000a,
-	0x1bf0: 0x000a, 0x1bf1: 0x000a, 0x1bf2: 0x000a, 0x1bf3: 0x000a, 0x1bf4: 0x000a, 0x1bf5: 0x000a,
-	0x1bf6: 0x000a, 0x1bf7: 0x000a, 0x1bf8: 0x000a, 0x1bf9: 0x000a, 0x1bfa: 0x000a, 0x1bfb: 0x000a,
-	// Block 0x70, offset 0x1c00
-	0x1c00: 0x0009, 0x1c01: 0x000a, 0x1c02: 0x000a, 0x1c03: 0x000a, 0x1c04: 0x000a,
-	0x1c08: 0x003a, 0x1c09: 0x002a, 0x1c0a: 0x003a, 0x1c0b: 0x002a,
-	0x1c0c: 0x003a, 0x1c0d: 0x002a, 0x1c0e: 0x003a, 0x1c0f: 0x002a, 0x1c10: 0x003a, 0x1c11: 0x002a,
-	0x1c12: 0x000a, 0x1c13: 0x000a, 0x1c14: 0x003a, 0x1c15: 0x002a, 0x1c16: 0x003a, 0x1c17: 0x002a,
-	0x1c18: 0x003a, 0x1c19: 0x002a, 0x1c1a: 0x003a, 0x1c1b: 0x002a, 0x1c1c: 0x000a, 0x1c1d: 0x000a,
-	0x1c1e: 0x000a, 0x1c1f: 0x000a, 0x1c20: 0x000a,
-	0x1c2a: 0x000c, 0x1c2b: 0x000c, 0x1c2c: 0x000c, 0x1c2d: 0x000c,
-	0x1c30: 0x000a,
-	0x1c36: 0x000a, 0x1c37: 0x000a,
-	0x1c3d: 0x000a, 0x1c3e: 0x000a, 0x1c3f: 0x000a,
-	// Block 0x71, offset 0x1c40
-	0x1c59: 0x000c, 0x1c5a: 0x000c, 0x1c5b: 0x000a, 0x1c5c: 0x000a,
-	0x1c60: 0x000a,
-	// Block 0x72, offset 0x1c80
-	0x1cbb: 0x000a,
-	// Block 0x73, offset 0x1cc0
-	0x1cc0: 0x000a, 0x1cc1: 0x000a, 0x1cc2: 0x000a, 0x1cc3: 0x000a, 0x1cc4: 0x000a, 0x1cc5: 0x000a,
-	0x1cc6: 0x000a, 0x1cc7: 0x000a, 0x1cc8: 0x000a, 0x1cc9: 0x000a, 0x1cca: 0x000a, 0x1ccb: 0x000a,
-	0x1ccc: 0x000a, 0x1ccd: 0x000a, 0x1cce: 0x000a, 0x1ccf: 0x000a, 0x1cd0: 0x000a, 0x1cd1: 0x000a,
-	0x1cd2: 0x000a, 0x1cd3: 0x000a, 0x1cd4: 0x000a, 0x1cd5: 0x000a, 0x1cd6: 0x000a, 0x1cd7: 0x000a,
-	0x1cd8: 0x000a, 0x1cd9: 0x000a, 0x1cda: 0x000a, 0x1cdb: 0x000a, 0x1cdc: 0x000a, 0x1cdd: 0x000a,
-	0x1cde: 0x000a, 0x1cdf: 0x000a, 0x1ce0: 0x000a, 0x1ce1: 0x000a, 0x1ce2: 0x000a, 0x1ce3: 0x000a,
-	// Block 0x74, offset 0x1d00
-	0x1d1d: 0x000a,
-	0x1d1e: 0x000a,
-	// Block 0x75, offset 0x1d40
-	0x1d50: 0x000a, 0x1d51: 0x000a,
-	0x1d52: 0x000a, 0x1d53: 0x000a, 0x1d54: 0x000a, 0x1d55: 0x000a, 0x1d56: 0x000a, 0x1d57: 0x000a,
-	0x1d58: 0x000a, 0x1d59: 0x000a, 0x1d5a: 0x000a, 0x1d5b: 0x000a, 0x1d5c: 0x000a, 0x1d5d: 0x000a,
-	0x1d5e: 0x000a, 0x1d5f: 0x000a,
-	0x1d7c: 0x000a, 0x1d7d: 0x000a, 0x1d7e: 0x000a,
-	// Block 0x76, offset 0x1d80
-	0x1db1: 0x000a, 0x1db2: 0x000a, 0x1db3: 0x000a, 0x1db4: 0x000a, 0x1db5: 0x000a,
-	0x1db6: 0x000a, 0x1db7: 0x000a, 0x1db8: 0x000a, 0x1db9: 0x000a, 0x1dba: 0x000a, 0x1dbb: 0x000a,
-	0x1dbc: 0x000a, 0x1dbd: 0x000a, 0x1dbe: 0x000a, 0x1dbf: 0x000a,
-	// Block 0x77, offset 0x1dc0
-	0x1dcc: 0x000a, 0x1dcd: 0x000a, 0x1dce: 0x000a, 0x1dcf: 0x000a,
-	// Block 0x78, offset 0x1e00
-	0x1e37: 0x000a, 0x1e38: 0x000a, 0x1e39: 0x000a, 0x1e3a: 0x000a,
-	// Block 0x79, offset 0x1e40
-	0x1e5e: 0x000a, 0x1e5f: 0x000a,
-	0x1e7f: 0x000a,
-	// Block 0x7a, offset 0x1e80
-	0x1e90: 0x000a, 0x1e91: 0x000a,
-	0x1e92: 0x000a, 0x1e93: 0x000a, 0x1e94: 0x000a, 0x1e95: 0x000a, 0x1e96: 0x000a, 0x1e97: 0x000a,
-	0x1e98: 0x000a, 0x1e99: 0x000a, 0x1e9a: 0x000a, 0x1e9b: 0x000a, 0x1e9c: 0x000a, 0x1e9d: 0x000a,
-	0x1e9e: 0x000a, 0x1e9f: 0x000a, 0x1ea0: 0x000a, 0x1ea1: 0x000a, 0x1ea2: 0x000a, 0x1ea3: 0x000a,
-	0x1ea4: 0x000a, 0x1ea5: 0x000a, 0x1ea6: 0x000a, 0x1ea7: 0x000a, 0x1ea8: 0x000a, 0x1ea9: 0x000a,
-	0x1eaa: 0x000a, 0x1eab: 0x000a, 0x1eac: 0x000a, 0x1ead: 0x000a, 0x1eae: 0x000a, 0x1eaf: 0x000a,
-	0x1eb0: 0x000a, 0x1eb1: 0x000a, 0x1eb2: 0x000a, 0x1eb3: 0x000a, 0x1eb4: 0x000a, 0x1eb5: 0x000a,
-	0x1eb6: 0x000a, 0x1eb7: 0x000a, 0x1eb8: 0x000a, 0x1eb9: 0x000a, 0x1eba: 0x000a, 0x1ebb: 0x000a,
-	0x1ebc: 0x000a, 0x1ebd: 0x000a, 0x1ebe: 0x000a, 0x1ebf: 0x000a,
-	// Block 0x7b, offset 0x1ec0
-	0x1ec0: 0x000a, 0x1ec1: 0x000a, 0x1ec2: 0x000a, 0x1ec3: 0x000a, 0x1ec4: 0x000a, 0x1ec5: 0x000a,
-	0x1ec6: 0x000a,
-	// Block 0x7c, offset 0x1f00
-	0x1f0d: 0x000a, 0x1f0e: 0x000a, 0x1f0f: 0x000a,
-	// Block 0x7d, offset 0x1f40
-	0x1f6f: 0x000c,
-	0x1f70: 0x000c, 0x1f71: 0x000c, 0x1f72: 0x000c, 0x1f73: 0x000a, 0x1f74: 0x000c, 0x1f75: 0x000c,
-	0x1f76: 0x000c, 0x1f77: 0x000c, 0x1f78: 0x000c, 0x1f79: 0x000c, 0x1f7a: 0x000c, 0x1f7b: 0x000c,
-	0x1f7c: 0x000c, 0x1f7d: 0x000c, 0x1f7e: 0x000a, 0x1f7f: 0x000a,
-	// Block 0x7e, offset 0x1f80
-	0x1f9e: 0x000c, 0x1f9f: 0x000c,
-	// Block 0x7f, offset 0x1fc0
-	0x1ff0: 0x000c, 0x1ff1: 0x000c,
-	// Block 0x80, offset 0x2000
-	0x2000: 0x000a, 0x2001: 0x000a, 0x2002: 0x000a, 0x2003: 0x000a, 0x2004: 0x000a, 0x2005: 0x000a,
-	0x2006: 0x000a, 0x2007: 0x000a, 0x2008: 0x000a, 0x2009: 0x000a, 0x200a: 0x000a, 0x200b: 0x000a,
-	0x200c: 0x000a, 0x200d: 0x000a, 0x200e: 0x000a, 0x200f: 0x000a, 0x2010: 0x000a, 0x2011: 0x000a,
-	0x2012: 0x000a, 0x2013: 0x000a, 0x2014: 0x000a, 0x2015: 0x000a, 0x2016: 0x000a, 0x2017: 0x000a,
-	0x2018: 0x000a, 0x2019: 0x000a, 0x201a: 0x000a, 0x201b: 0x000a, 0x201c: 0x000a, 0x201d: 0x000a,
-	0x201e: 0x000a, 0x201f: 0x000a, 0x2020: 0x000a, 0x2021: 0x000a,
-	// Block 0x81, offset 0x2040
-	0x2048: 0x000a,
-	// Block 0x82, offset 0x2080
-	0x2082: 0x000c,
-	0x2086: 0x000c, 0x208b: 0x000c,
-	0x20a5: 0x000c, 0x20a6: 0x000c, 0x20a8: 0x000a, 0x20a9: 0x000a,
-	0x20aa: 0x000a, 0x20ab: 0x000a,
-	0x20b8: 0x0004, 0x20b9: 0x0004,
-	// Block 0x83, offset 0x20c0
-	0x20f4: 0x000a, 0x20f5: 0x000a,
-	0x20f6: 0x000a, 0x20f7: 0x000a,
-	// Block 0x84, offset 0x2100
-	0x2104: 0x000c, 0x2105: 0x000c,
-	0x2120: 0x000c, 0x2121: 0x000c, 0x2122: 0x000c, 0x2123: 0x000c,
-	0x2124: 0x000c, 0x2125: 0x000c, 0x2126: 0x000c, 0x2127: 0x000c, 0x2128: 0x000c, 0x2129: 0x000c,
-	0x212a: 0x000c, 0x212b: 0x000c, 0x212c: 0x000c, 0x212d: 0x000c, 0x212e: 0x000c, 0x212f: 0x000c,
-	0x2130: 0x000c, 0x2131: 0x000c,
-	// Block 0x85, offset 0x2140
-	0x2166: 0x000c, 0x2167: 0x000c, 0x2168: 0x000c, 0x2169: 0x000c,
-	0x216a: 0x000c, 0x216b: 0x000c, 0x216c: 0x000c, 0x216d: 0x000c,
-	// Block 0x86, offset 0x2180
-	0x2187: 0x000c, 0x2188: 0x000c, 0x2189: 0x000c, 0x218a: 0x000c, 0x218b: 0x000c,
-	0x218c: 0x000c, 0x218d: 0x000c, 0x218e: 0x000c, 0x218f: 0x000c, 0x2190: 0x000c, 0x2191: 0x000c,
-	// Block 0x87, offset 0x21c0
-	0x21c0: 0x000c, 0x21c1: 0x000c, 0x21c2: 0x000c,
-	0x21f3: 0x000c,
-	0x21f6: 0x000c, 0x21f7: 0x000c, 0x21f8: 0x000c, 0x21f9: 0x000c,
-	0x21fc: 0x000c,
-	// Block 0x88, offset 0x2200
-	0x2225: 0x000c,
-	// Block 0x89, offset 0x2240
-	0x2269: 0x000c,
-	0x226a: 0x000c, 0x226b: 0x000c, 0x226c: 0x000c, 0x226d: 0x000c, 0x226e: 0x000c,
-	0x2271: 0x000c, 0x2272: 0x000c, 0x2275: 0x000c,
-	0x2276: 0x000c,
-	// Block 0x8a, offset 0x2280
-	0x2283: 0x000c,
-	0x228c: 0x000c,
-	0x22bc: 0x000c,
-	// Block 0x8b, offset 0x22c0
-	0x22f0: 0x000c, 0x22f2: 0x000c, 0x22f3: 0x000c, 0x22f4: 0x000c,
-	0x22f7: 0x000c, 0x22f8: 0x000c,
-	0x22fe: 0x000c, 0x22ff: 0x000c,
-	// Block 0x8c, offset 0x2300
-	0x2301: 0x000c,
-	0x232c: 0x000c, 0x232d: 0x000c,
-	0x2336: 0x000c,
-	// Block 0x8d, offset 0x2340
-	0x2365: 0x000c, 0x2368: 0x000c,
-	0x236d: 0x000c,
-	// Block 0x8e, offset 0x2380
-	0x239d: 0x0001,
-	0x239e: 0x000c, 0x239f: 0x0001, 0x23a0: 0x0001, 0x23a1: 0x0001, 0x23a2: 0x0001, 0x23a3: 0x0001,
-	0x23a4: 0x0001, 0x23a5: 0x0001, 0x23a6: 0x0001, 0x23a7: 0x0001, 0x23a8: 0x0001, 0x23a9: 0x0003,
-	0x23aa: 0x0001, 0x23ab: 0x0001, 0x23ac: 0x0001, 0x23ad: 0x0001, 0x23ae: 0x0001, 0x23af: 0x0001,
-	0x23b0: 0x0001, 0x23b1: 0x0001, 0x23b2: 0x0001, 0x23b3: 0x0001, 0x23b4: 0x0001, 0x23b5: 0x0001,
-	0x23b6: 0x0001, 0x23b7: 0x0001, 0x23b8: 0x0001, 0x23b9: 0x0001, 0x23ba: 0x0001, 0x23bb: 0x0001,
-	0x23bc: 0x0001, 0x23bd: 0x0001, 0x23be: 0x0001, 0x23bf: 0x0001,
-	// Block 0x8f, offset 0x23c0
-	0x23c0: 0x0001, 0x23c1: 0x0001, 0x23c2: 0x0001, 0x23c3: 0x0001, 0x23c4: 0x0001, 0x23c5: 0x0001,
-	0x23c6: 0x0001, 0x23c7: 0x0001, 0x23c8: 0x0001, 0x23c9: 0x0001, 0x23ca: 0x0001, 0x23cb: 0x0001,
-	0x23cc: 0x0001, 0x23cd: 0x0001, 0x23ce: 0x0001, 0x23cf: 0x0001, 0x23d0: 0x000d, 0x23d1: 0x000d,
-	0x23d2: 0x000d, 0x23d3: 0x000d, 0x23d4: 0x000d, 0x23d5: 0x000d, 0x23d6: 0x000d, 0x23d7: 0x000d,
-	0x23d8: 0x000d, 0x23d9: 0x000d, 0x23da: 0x000d, 0x23db: 0x000d, 0x23dc: 0x000d, 0x23dd: 0x000d,
-	0x23de: 0x000d, 0x23df: 0x000d, 0x23e0: 0x000d, 0x23e1: 0x000d, 0x23e2: 0x000d, 0x23e3: 0x000d,
-	0x23e4: 0x000d, 0x23e5: 0x000d, 0x23e6: 0x000d, 0x23e7: 0x000d, 0x23e8: 0x000d, 0x23e9: 0x000d,
-	0x23ea: 0x000d, 0x23eb: 0x000d, 0x23ec: 0x000d, 0x23ed: 0x000d, 0x23ee: 0x000d, 0x23ef: 0x000d,
-	0x23f0: 0x000d, 0x23f1: 0x000d, 0x23f2: 0x000d, 0x23f3: 0x000d, 0x23f4: 0x000d, 0x23f5: 0x000d,
-	0x23f6: 0x000d, 0x23f7: 0x000d, 0x23f8: 0x000d, 0x23f9: 0x000d, 0x23fa: 0x000d, 0x23fb: 0x000d,
-	0x23fc: 0x000d, 0x23fd: 0x000d, 0x23fe: 0x000d, 0x23ff: 0x000d,
-	// Block 0x90, offset 0x2400
-	0x2400: 0x000d, 0x2401: 0x000d, 0x2402: 0x000d, 0x2403: 0x000d, 0x2404: 0x000d, 0x2405: 0x000d,
-	0x2406: 0x000d, 0x2407: 0x000d, 0x2408: 0x000d, 0x2409: 0x000d, 0x240a: 0x000d, 0x240b: 0x000d,
-	0x240c: 0x000d, 0x240d: 0x000d, 0x240e: 0x000d, 0x240f: 0x000d, 0x2410: 0x000d, 0x2411: 0x000d,
-	0x2412: 0x000d, 0x2413: 0x000d, 0x2414: 0x000d, 0x2415: 0x000d, 0x2416: 0x000d, 0x2417: 0x000d,
-	0x2418: 0x000d, 0x2419: 0x000d, 0x241a: 0x000d, 0x241b: 0x000d, 0x241c: 0x000d, 0x241d: 0x000d,
-	0x241e: 0x000d, 0x241f: 0x000d, 0x2420: 0x000d, 0x2421: 0x000d, 0x2422: 0x000d, 0x2423: 0x000d,
-	0x2424: 0x000d, 0x2425: 0x000d, 0x2426: 0x000d, 0x2427: 0x000d, 0x2428: 0x000d, 0x2429: 0x000d,
-	0x242a: 0x000d, 0x242b: 0x000d, 0x242c: 0x000d, 0x242d: 0x000d, 0x242e: 0x000d, 0x242f: 0x000d,
-	0x2430: 0x000d, 0x2431: 0x000d, 0x2432: 0x000d, 0x2433: 0x000d, 0x2434: 0x000d, 0x2435: 0x000d,
-	0x2436: 0x000d, 0x2437: 0x000d, 0x2438: 0x000d, 0x2439: 0x000d, 0x243a: 0x000d, 0x243b: 0x000d,
-	0x243c: 0x000d, 0x243d: 0x000d, 0x243e: 0x000a, 0x243f: 0x000a,
-	// Block 0x91, offset 0x2440
-	0x2440: 0x000d, 0x2441: 0x000d, 0x2442: 0x000d, 0x2443: 0x000d, 0x2444: 0x000d, 0x2445: 0x000d,
-	0x2446: 0x000d, 0x2447: 0x000d, 0x2448: 0x000d, 0x2449: 0x000d, 0x244a: 0x000d, 0x244b: 0x000d,
-	0x244c: 0x000d, 0x244d: 0x000d, 0x244e: 0x000d, 0x244f: 0x000d, 0x2450: 0x000b, 0x2451: 0x000b,
-	0x2452: 0x000b, 0x2453: 0x000b, 0x2454: 0x000b, 0x2455: 0x000b, 0x2456: 0x000b, 0x2457: 0x000b,
-	0x2458: 0x000b, 0x2459: 0x000b, 0x245a: 0x000b, 0x245b: 0x000b, 0x245c: 0x000b, 0x245d: 0x000b,
-	0x245e: 0x000b, 0x245f: 0x000b, 0x2460: 0x000b, 0x2461: 0x000b, 0x2462: 0x000b, 0x2463: 0x000b,
-	0x2464: 0x000b, 0x2465: 0x000b, 0x2466: 0x000b, 0x2467: 0x000b, 0x2468: 0x000b, 0x2469: 0x000b,
-	0x246a: 0x000b, 0x246b: 0x000b, 0x246c: 0x000b, 0x246d: 0x000b, 0x246e: 0x000b, 0x246f: 0x000b,
-	0x2470: 0x000d, 0x2471: 0x000d, 0x2472: 0x000d, 0x2473: 0x000d, 0x2474: 0x000d, 0x2475: 0x000d,
-	0x2476: 0x000d, 0x2477: 0x000d, 0x2478: 0x000d, 0x2479: 0x000d, 0x247a: 0x000d, 0x247b: 0x000d,
-	0x247c: 0x000d, 0x247d: 0x000a, 0x247e: 0x000d, 0x247f: 0x000d,
-	// Block 0x92, offset 0x2480
-	0x2480: 0x000c, 0x2481: 0x000c, 0x2482: 0x000c, 0x2483: 0x000c, 0x2484: 0x000c, 0x2485: 0x000c,
-	0x2486: 0x000c, 0x2487: 0x000c, 0x2488: 0x000c, 0x2489: 0x000c, 0x248a: 0x000c, 0x248b: 0x000c,
-	0x248c: 0x000c, 0x248d: 0x000c, 0x248e: 0x000c, 0x248f: 0x000c, 0x2490: 0x000a, 0x2491: 0x000a,
-	0x2492: 0x000a, 0x2493: 0x000a, 0x2494: 0x000a, 0x2495: 0x000a, 0x2496: 0x000a, 0x2497: 0x000a,
-	0x2498: 0x000a, 0x2499: 0x000a,
-	0x24a0: 0x000c, 0x24a1: 0x000c, 0x24a2: 0x000c, 0x24a3: 0x000c,
-	0x24a4: 0x000c, 0x24a5: 0x000c, 0x24a6: 0x000c, 0x24a7: 0x000c, 0x24a8: 0x000c, 0x24a9: 0x000c,
-	0x24aa: 0x000c, 0x24ab: 0x000c, 0x24ac: 0x000c, 0x24ad: 0x000c, 0x24ae: 0x000c, 0x24af: 0x000c,
-	0x24b0: 0x000a, 0x24b1: 0x000a, 0x24b2: 0x000a, 0x24b3: 0x000a, 0x24b4: 0x000a, 0x24b5: 0x000a,
-	0x24b6: 0x000a, 0x24b7: 0x000a, 0x24b8: 0x000a, 0x24b9: 0x000a, 0x24ba: 0x000a, 0x24bb: 0x000a,
-	0x24bc: 0x000a, 0x24bd: 0x000a, 0x24be: 0x000a, 0x24bf: 0x000a,
-	// Block 0x93, offset 0x24c0
-	0x24c0: 0x000a, 0x24c1: 0x000a, 0x24c2: 0x000a, 0x24c3: 0x000a, 0x24c4: 0x000a, 0x24c5: 0x000a,
-	0x24c6: 0x000a, 0x24c7: 0x000a, 0x24c8: 0x000a, 0x24c9: 0x000a, 0x24ca: 0x000a, 0x24cb: 0x000a,
-	0x24cc: 0x000a, 0x24cd: 0x000a, 0x24ce: 0x000a, 0x24cf: 0x000a, 0x24d0: 0x0006, 0x24d1: 0x000a,
-	0x24d2: 0x0006, 0x24d4: 0x000a, 0x24d5: 0x0006, 0x24d6: 0x000a, 0x24d7: 0x000a,
-	0x24d8: 0x000a, 0x24d9: 0x009a, 0x24da: 0x008a, 0x24db: 0x007a, 0x24dc: 0x006a, 0x24dd: 0x009a,
-	0x24de: 0x008a, 0x24df: 0x0004, 0x24e0: 0x000a, 0x24e1: 0x000a, 0x24e2: 0x0003, 0x24e3: 0x0003,
-	0x24e4: 0x000a, 0x24e5: 0x000a, 0x24e6: 0x000a, 0x24e8: 0x000a, 0x24e9: 0x0004,
-	0x24ea: 0x0004, 0x24eb: 0x000a,
-	0x24f0: 0x000d, 0x24f1: 0x000d, 0x24f2: 0x000d, 0x24f3: 0x000d, 0x24f4: 0x000d, 0x24f5: 0x000d,
-	0x24f6: 0x000d, 0x24f7: 0x000d, 0x24f8: 0x000d, 0x24f9: 0x000d, 0x24fa: 0x000d, 0x24fb: 0x000d,
-	0x24fc: 0x000d, 0x24fd: 0x000d, 0x24fe: 0x000d, 0x24ff: 0x000d,
-	// Block 0x94, offset 0x2500
-	0x2500: 0x000d, 0x2501: 0x000d, 0x2502: 0x000d, 0x2503: 0x000d, 0x2504: 0x000d, 0x2505: 0x000d,
-	0x2506: 0x000d, 0x2507: 0x000d, 0x2508: 0x000d, 0x2509: 0x000d, 0x250a: 0x000d, 0x250b: 0x000d,
-	0x250c: 0x000d, 0x250d: 0x000d, 0x250e: 0x000d, 0x250f: 0x000d, 0x2510: 0x000d, 0x2511: 0x000d,
-	0x2512: 0x000d, 0x2513: 0x000d, 0x2514: 0x000d, 0x2515: 0x000d, 0x2516: 0x000d, 0x2517: 0x000d,
-	0x2518: 0x000d, 0x2519: 0x000d, 0x251a: 0x000d, 0x251b: 0x000d, 0x251c: 0x000d, 0x251d: 0x000d,
-	0x251e: 0x000d, 0x251f: 0x000d, 0x2520: 0x000d, 0x2521: 0x000d, 0x2522: 0x000d, 0x2523: 0x000d,
-	0x2524: 0x000d, 0x2525: 0x000d, 0x2526: 0x000d, 0x2527: 0x000d, 0x2528: 0x000d, 0x2529: 0x000d,
-	0x252a: 0x000d, 0x252b: 0x000d, 0x252c: 0x000d, 0x252d: 0x000d, 0x252e: 0x000d, 0x252f: 0x000d,
-	0x2530: 0x000d, 0x2531: 0x000d, 0x2532: 0x000d, 0x2533: 0x000d, 0x2534: 0x000d, 0x2535: 0x000d,
-	0x2536: 0x000d, 0x2537: 0x000d, 0x2538: 0x000d, 0x2539: 0x000d, 0x253a: 0x000d, 0x253b: 0x000d,
-	0x253c: 0x000d, 0x253d: 0x000d, 0x253e: 0x000d, 0x253f: 0x000b,
-	// Block 0x95, offset 0x2540
-	0x2541: 0x000a, 0x2542: 0x000a, 0x2543: 0x0004, 0x2544: 0x0004, 0x2545: 0x0004,
-	0x2546: 0x000a, 0x2547: 0x000a, 0x2548: 0x003a, 0x2549: 0x002a, 0x254a: 0x000a, 0x254b: 0x0003,
-	0x254c: 0x0006, 0x254d: 0x0003, 0x254e: 0x0006, 0x254f: 0x0006, 0x2550: 0x0002, 0x2551: 0x0002,
-	0x2552: 0x0002, 0x2553: 0x0002, 0x2554: 0x0002, 0x2555: 0x0002, 0x2556: 0x0002, 0x2557: 0x0002,
-	0x2558: 0x0002, 0x2559: 0x0002, 0x255a: 0x0006, 0x255b: 0x000a, 0x255c: 0x000a, 0x255d: 0x000a,
-	0x255e: 0x000a, 0x255f: 0x000a, 0x2560: 0x000a,
-	0x257b: 0x005a,
-	0x257c: 0x000a, 0x257d: 0x004a, 0x257e: 0x000a, 0x257f: 0x000a,
-	// Block 0x96, offset 0x2580
-	0x2580: 0x000a,
-	0x259b: 0x005a, 0x259c: 0x000a, 0x259d: 0x004a,
-	0x259e: 0x000a, 0x259f: 0x00fa, 0x25a0: 0x00ea, 0x25a1: 0x000a, 0x25a2: 0x003a, 0x25a3: 0x002a,
-	0x25a4: 0x000a, 0x25a5: 0x000a,
-	// Block 0x97, offset 0x25c0
-	0x25e0: 0x0004, 0x25e1: 0x0004, 0x25e2: 0x000a, 0x25e3: 0x000a,
-	0x25e4: 0x000a, 0x25e5: 0x0004, 0x25e6: 0x0004, 0x25e8: 0x000a, 0x25e9: 0x000a,
-	0x25ea: 0x000a, 0x25eb: 0x000a, 0x25ec: 0x000a, 0x25ed: 0x000a, 0x25ee: 0x000a,
-	0x25f0: 0x000b, 0x25f1: 0x000b, 0x25f2: 0x000b, 0x25f3: 0x000b, 0x25f4: 0x000b, 0x25f5: 0x000b,
-	0x25f6: 0x000b, 0x25f7: 0x000b, 0x25f8: 0x000b, 0x25f9: 0x000a, 0x25fa: 0x000a, 0x25fb: 0x000a,
-	0x25fc: 0x000a, 0x25fd: 0x000a, 0x25fe: 0x000b, 0x25ff: 0x000b,
-	// Block 0x98, offset 0x2600
-	0x2601: 0x000a,
-	// Block 0x99, offset 0x2640
-	0x2640: 0x000a, 0x2641: 0x000a, 0x2642: 0x000a, 0x2643: 0x000a, 0x2644: 0x000a, 0x2645: 0x000a,
-	0x2646: 0x000a, 0x2647: 0x000a, 0x2648: 0x000a, 0x2649: 0x000a, 0x264a: 0x000a, 0x264b: 0x000a,
-	0x264c: 0x000a, 0x2650: 0x000a, 0x2651: 0x000a,
-	0x2652: 0x000a, 0x2653: 0x000a, 0x2654: 0x000a, 0x2655: 0x000a, 0x2656: 0x000a, 0x2657: 0x000a,
-	0x2658: 0x000a, 0x2659: 0x000a, 0x265a: 0x000a, 0x265b: 0x000a,
-	0x2660: 0x000a,
-	// Block 0x9a, offset 0x2680
-	0x26bd: 0x000c,
-	// Block 0x9b, offset 0x26c0
-	0x26e0: 0x000c, 0x26e1: 0x0002, 0x26e2: 0x0002, 0x26e3: 0x0002,
-	0x26e4: 0x0002, 0x26e5: 0x0002, 0x26e6: 0x0002, 0x26e7: 0x0002, 0x26e8: 0x0002, 0x26e9: 0x0002,
-	0x26ea: 0x0002, 0x26eb: 0x0002, 0x26ec: 0x0002, 0x26ed: 0x0002, 0x26ee: 0x0002, 0x26ef: 0x0002,
-	0x26f0: 0x0002, 0x26f1: 0x0002, 0x26f2: 0x0002, 0x26f3: 0x0002, 0x26f4: 0x0002, 0x26f5: 0x0002,
-	0x26f6: 0x0002, 0x26f7: 0x0002, 0x26f8: 0x0002, 0x26f9: 0x0002, 0x26fa: 0x0002, 0x26fb: 0x0002,
-	// Block 0x9c, offset 0x2700
-	0x2736: 0x000c, 0x2737: 0x000c, 0x2738: 0x000c, 0x2739: 0x000c, 0x273a: 0x000c,
-	// Block 0x9d, offset 0x2740
-	0x2740: 0x0001, 0x2741: 0x0001, 0x2742: 0x0001, 0x2743: 0x0001, 0x2744: 0x0001, 0x2745: 0x0001,
-	0x2746: 0x0001, 0x2747: 0x0001, 0x2748: 0x0001, 0x2749: 0x0001, 0x274a: 0x0001, 0x274b: 0x0001,
-	0x274c: 0x0001, 0x274d: 0x0001, 0x274e: 0x0001, 0x274f: 0x0001, 0x2750: 0x0001, 0x2751: 0x0001,
-	0x2752: 0x0001, 0x2753: 0x0001, 0x2754: 0x0001, 0x2755: 0x0001, 0x2756: 0x0001, 0x2757: 0x0001,
-	0x2758: 0x0001, 0x2759: 0x0001, 0x275a: 0x0001, 0x275b: 0x0001, 0x275c: 0x0001, 0x275d: 0x0001,
-	0x275e: 0x0001, 0x275f: 0x0001, 0x2760: 0x0001, 0x2761: 0x0001, 0x2762: 0x0001, 0x2763: 0x0001,
-	0x2764: 0x0001, 0x2765: 0x0001, 0x2766: 0x0001, 0x2767: 0x0001, 0x2768: 0x0001, 0x2769: 0x0001,
-	0x276a: 0x0001, 0x276b: 0x0001, 0x276c: 0x0001, 0x276d: 0x0001, 0x276e: 0x0001, 0x276f: 0x0001,
-	0x2770: 0x0001, 0x2771: 0x0001, 0x2772: 0x0001, 0x2773: 0x0001, 0x2774: 0x0001, 0x2775: 0x0001,
-	0x2776: 0x0001, 0x2777: 0x0001, 0x2778: 0x0001, 0x2779: 0x0001, 0x277a: 0x0001, 0x277b: 0x0001,
-	0x277c: 0x0001, 0x277d: 0x0001, 0x277e: 0x0001, 0x277f: 0x0001,
-	// Block 0x9e, offset 0x2780
-	0x2780: 0x0001, 0x2781: 0x0001, 0x2782: 0x0001, 0x2783: 0x0001, 0x2784: 0x0001, 0x2785: 0x0001,
-	0x2786: 0x0001, 0x2787: 0x0001, 0x2788: 0x0001, 0x2789: 0x0001, 0x278a: 0x0001, 0x278b: 0x0001,
-	0x278c: 0x0001, 0x278d: 0x0001, 0x278e: 0x0001, 0x278f: 0x0001, 0x2790: 0x0001, 0x2791: 0x0001,
-	0x2792: 0x0001, 0x2793: 0x0001, 0x2794: 0x0001, 0x2795: 0x0001, 0x2796: 0x0001, 0x2797: 0x0001,
-	0x2798: 0x0001, 0x2799: 0x0001, 0x279a: 0x0001, 0x279b: 0x0001, 0x279c: 0x0001, 0x279d: 0x0001,
-	0x279e: 0x0001, 0x279f: 0x000a, 0x27a0: 0x0001, 0x27a1: 0x0001, 0x27a2: 0x0001, 0x27a3: 0x0001,
-	0x27a4: 0x0001, 0x27a5: 0x0001, 0x27a6: 0x0001, 0x27a7: 0x0001, 0x27a8: 0x0001, 0x27a9: 0x0001,
-	0x27aa: 0x0001, 0x27ab: 0x0001, 0x27ac: 0x0001, 0x27ad: 0x0001, 0x27ae: 0x0001, 0x27af: 0x0001,
-	0x27b0: 0x0001, 0x27b1: 0x0001, 0x27b2: 0x0001, 0x27b3: 0x0001, 0x27b4: 0x0001, 0x27b5: 0x0001,
-	0x27b6: 0x0001, 0x27b7: 0x0001, 0x27b8: 0x0001, 0x27b9: 0x0001, 0x27ba: 0x0001, 0x27bb: 0x0001,
-	0x27bc: 0x0001, 0x27bd: 0x0001, 0x27be: 0x0001, 0x27bf: 0x0001,
-	// Block 0x9f, offset 0x27c0
-	0x27c0: 0x0001, 0x27c1: 0x000c, 0x27c2: 0x000c, 0x27c3: 0x000c, 0x27c4: 0x0001, 0x27c5: 0x000c,
-	0x27c6: 0x000c, 0x27c7: 0x0001, 0x27c8: 0x0001, 0x27c9: 0x0001, 0x27ca: 0x0001, 0x27cb: 0x0001,
-	0x27cc: 0x000c, 0x27cd: 0x000c, 0x27ce: 0x000c, 0x27cf: 0x000c, 0x27d0: 0x0001, 0x27d1: 0x0001,
-	0x27d2: 0x0001, 0x27d3: 0x0001, 0x27d4: 0x0001, 0x27d5: 0x0001, 0x27d6: 0x0001, 0x27d7: 0x0001,
-	0x27d8: 0x0001, 0x27d9: 0x0001, 0x27da: 0x0001, 0x27db: 0x0001, 0x27dc: 0x0001, 0x27dd: 0x0001,
-	0x27de: 0x0001, 0x27df: 0x0001, 0x27e0: 0x0001, 0x27e1: 0x0001, 0x27e2: 0x0001, 0x27e3: 0x0001,
-	0x27e4: 0x0001, 0x27e5: 0x0001, 0x27e6: 0x0001, 0x27e7: 0x0001, 0x27e8: 0x0001, 0x27e9: 0x0001,
-	0x27ea: 0x0001, 0x27eb: 0x0001, 0x27ec: 0x0001, 0x27ed: 0x0001, 0x27ee: 0x0001, 0x27ef: 0x0001,
-	0x27f0: 0x0001, 0x27f1: 0x0001, 0x27f2: 0x0001, 0x27f3: 0x0001, 0x27f4: 0x0001, 0x27f5: 0x0001,
-	0x27f6: 0x0001, 0x27f7: 0x0001, 0x27f8: 0x000c, 0x27f9: 0x000c, 0x27fa: 0x000c, 0x27fb: 0x0001,
-	0x27fc: 0x0001, 0x27fd: 0x0001, 0x27fe: 0x0001, 0x27ff: 0x000c,
-	// Block 0xa0, offset 0x2800
-	0x2800: 0x0001, 0x2801: 0x0001, 0x2802: 0x0001, 0x2803: 0x0001, 0x2804: 0x0001, 0x2805: 0x0001,
-	0x2806: 0x0001, 0x2807: 0x0001, 0x2808: 0x0001, 0x2809: 0x0001, 0x280a: 0x0001, 0x280b: 0x0001,
-	0x280c: 0x0001, 0x280d: 0x0001, 0x280e: 0x0001, 0x280f: 0x0001, 0x2810: 0x0001, 0x2811: 0x0001,
-	0x2812: 0x0001, 0x2813: 0x0001, 0x2814: 0x0001, 0x2815: 0x0001, 0x2816: 0x0001, 0x2817: 0x0001,
-	0x2818: 0x0001, 0x2819: 0x0001, 0x281a: 0x0001, 0x281b: 0x0001, 0x281c: 0x0001, 0x281d: 0x0001,
-	0x281e: 0x0001, 0x281f: 0x0001, 0x2820: 0x0001, 0x2821: 0x0001, 0x2822: 0x0001, 0x2823: 0x0001,
-	0x2824: 0x0001, 0x2825: 0x000c, 0x2826: 0x000c, 0x2827: 0x0001, 0x2828: 0x0001, 0x2829: 0x0001,
-	0x282a: 0x0001, 0x282b: 0x0001, 0x282c: 0x0001, 0x282d: 0x0001, 0x282e: 0x0001, 0x282f: 0x0001,
-	0x2830: 0x0001, 0x2831: 0x0001, 0x2832: 0x0001, 0x2833: 0x0001, 0x2834: 0x0001, 0x2835: 0x0001,
-	0x2836: 0x0001, 0x2837: 0x0001, 0x2838: 0x0001, 0x2839: 0x0001, 0x283a: 0x0001, 0x283b: 0x0001,
-	0x283c: 0x0001, 0x283d: 0x0001, 0x283e: 0x0001, 0x283f: 0x0001,
-	// Block 0xa1, offset 0x2840
-	0x2840: 0x0001, 0x2841: 0x0001, 0x2842: 0x0001, 0x2843: 0x0001, 0x2844: 0x0001, 0x2845: 0x0001,
-	0x2846: 0x0001, 0x2847: 0x0001, 0x2848: 0x0001, 0x2849: 0x0001, 0x284a: 0x0001, 0x284b: 0x0001,
-	0x284c: 0x0001, 0x284d: 0x0001, 0x284e: 0x0001, 0x284f: 0x0001, 0x2850: 0x0001, 0x2851: 0x0001,
-	0x2852: 0x0001, 0x2853: 0x0001, 0x2854: 0x0001, 0x2855: 0x0001, 0x2856: 0x0001, 0x2857: 0x0001,
-	0x2858: 0x0001, 0x2859: 0x0001, 0x285a: 0x0001, 0x285b: 0x0001, 0x285c: 0x0001, 0x285d: 0x0001,
-	0x285e: 0x0001, 0x285f: 0x0001, 0x2860: 0x0001, 0x2861: 0x0001, 0x2862: 0x0001, 0x2863: 0x0001,
-	0x2864: 0x0001, 0x2865: 0x0001, 0x2866: 0x0001, 0x2867: 0x0001, 0x2868: 0x0001, 0x2869: 0x0001,
-	0x286a: 0x0001, 0x286b: 0x0001, 0x286c: 0x0001, 0x286d: 0x0001, 0x286e: 0x0001, 0x286f: 0x0001,
-	0x2870: 0x0001, 0x2871: 0x0001, 0x2872: 0x0001, 0x2873: 0x0001, 0x2874: 0x0001, 0x2875: 0x0001,
-	0x2876: 0x0001, 0x2877: 0x0001, 0x2878: 0x0001, 0x2879: 0x000a, 0x287a: 0x000a, 0x287b: 0x000a,
-	0x287c: 0x000a, 0x287d: 0x000a, 0x287e: 0x000a, 0x287f: 0x000a,
-	// Block 0xa2, offset 0x2880
-	0x2880: 0x0001, 0x2881: 0x0001, 0x2882: 0x0001, 0x2883: 0x0001, 0x2884: 0x0001, 0x2885: 0x0001,
-	0x2886: 0x0001, 0x2887: 0x0001, 0x2888: 0x0001, 0x2889: 0x0001, 0x288a: 0x0001, 0x288b: 0x0001,
-	0x288c: 0x0001, 0x288d: 0x0001, 0x288e: 0x0001, 0x288f: 0x0001, 0x2890: 0x0001, 0x2891: 0x0001,
-	0x2892: 0x0001, 0x2893: 0x0001, 0x2894: 0x0001, 0x2895: 0x0001, 0x2896: 0x0001, 0x2897: 0x0001,
-	0x2898: 0x0001, 0x2899: 0x0001, 0x289a: 0x0001, 0x289b: 0x0001, 0x289c: 0x0001, 0x289d: 0x0001,
-	0x289e: 0x0001, 0x289f: 0x0001, 0x28a0: 0x0005, 0x28a1: 0x0005, 0x28a2: 0x0005, 0x28a3: 0x0005,
-	0x28a4: 0x0005, 0x28a5: 0x0005, 0x28a6: 0x0005, 0x28a7: 0x0005, 0x28a8: 0x0005, 0x28a9: 0x0005,
-	0x28aa: 0x0005, 0x28ab: 0x0005, 0x28ac: 0x0005, 0x28ad: 0x0005, 0x28ae: 0x0005, 0x28af: 0x0005,
-	0x28b0: 0x0005, 0x28b1: 0x0005, 0x28b2: 0x0005, 0x28b3: 0x0005, 0x28b4: 0x0005, 0x28b5: 0x0005,
-	0x28b6: 0x0005, 0x28b7: 0x0005, 0x28b8: 0x0005, 0x28b9: 0x0005, 0x28ba: 0x0005, 0x28bb: 0x0005,
-	0x28bc: 0x0005, 0x28bd: 0x0005, 0x28be: 0x0005, 0x28bf: 0x0001,
-	// Block 0xa3, offset 0x28c0
-	0x28c1: 0x000c,
-	0x28f8: 0x000c, 0x28f9: 0x000c, 0x28fa: 0x000c, 0x28fb: 0x000c,
-	0x28fc: 0x000c, 0x28fd: 0x000c, 0x28fe: 0x000c, 0x28ff: 0x000c,
-	// Block 0xa4, offset 0x2900
-	0x2900: 0x000c, 0x2901: 0x000c, 0x2902: 0x000c, 0x2903: 0x000c, 0x2904: 0x000c, 0x2905: 0x000c,
-	0x2906: 0x000c,
-	0x2912: 0x000a, 0x2913: 0x000a, 0x2914: 0x000a, 0x2915: 0x000a, 0x2916: 0x000a, 0x2917: 0x000a,
-	0x2918: 0x000a, 0x2919: 0x000a, 0x291a: 0x000a, 0x291b: 0x000a, 0x291c: 0x000a, 0x291d: 0x000a,
-	0x291e: 0x000a, 0x291f: 0x000a, 0x2920: 0x000a, 0x2921: 0x000a, 0x2922: 0x000a, 0x2923: 0x000a,
-	0x2924: 0x000a, 0x2925: 0x000a,
-	0x293f: 0x000c,
-	// Block 0xa5, offset 0x2940
-	0x2940: 0x000c, 0x2941: 0x000c,
-	0x2973: 0x000c, 0x2974: 0x000c, 0x2975: 0x000c,
-	0x2976: 0x000c, 0x2979: 0x000c, 0x297a: 0x000c,
-	// Block 0xa6, offset 0x2980
-	0x2980: 0x000c, 0x2981: 0x000c, 0x2982: 0x000c,
-	0x29a7: 0x000c, 0x29a8: 0x000c, 0x29a9: 0x000c,
-	0x29aa: 0x000c, 0x29ab: 0x000c, 0x29ad: 0x000c, 0x29ae: 0x000c, 0x29af: 0x000c,
-	0x29b0: 0x000c, 0x29b1: 0x000c, 0x29b2: 0x000c, 0x29b3: 0x000c, 0x29b4: 0x000c,
-	// Block 0xa7, offset 0x29c0
-	0x29f3: 0x000c,
-	// Block 0xa8, offset 0x2a00
-	0x2a00: 0x000c, 0x2a01: 0x000c,
-	0x2a36: 0x000c, 0x2a37: 0x000c, 0x2a38: 0x000c, 0x2a39: 0x000c, 0x2a3a: 0x000c, 0x2a3b: 0x000c,
-	0x2a3c: 0x000c, 0x2a3d: 0x000c, 0x2a3e: 0x000c,
-	// Block 0xa9, offset 0x2a40
-	0x2a4a: 0x000c, 0x2a4b: 0x000c,
-	0x2a4c: 0x000c,
-	// Block 0xaa, offset 0x2a80
-	0x2aaf: 0x000c,
-	0x2ab0: 0x000c, 0x2ab1: 0x000c, 0x2ab4: 0x000c,
-	0x2ab6: 0x000c, 0x2ab7: 0x000c,
-	0x2abe: 0x000c,
-	// Block 0xab, offset 0x2ac0
-	0x2adf: 0x000c, 0x2ae3: 0x000c,
-	0x2ae4: 0x000c, 0x2ae5: 0x000c, 0x2ae6: 0x000c, 0x2ae7: 0x000c, 0x2ae8: 0x000c, 0x2ae9: 0x000c,
-	0x2aea: 0x000c,
-	// Block 0xac, offset 0x2b00
-	0x2b00: 0x000c, 0x2b01: 0x000c,
-	0x2b3c: 0x000c,
-	// Block 0xad, offset 0x2b40
-	0x2b40: 0x000c,
-	0x2b66: 0x000c, 0x2b67: 0x000c, 0x2b68: 0x000c, 0x2b69: 0x000c,
-	0x2b6a: 0x000c, 0x2b6b: 0x000c, 0x2b6c: 0x000c,
-	0x2b70: 0x000c, 0x2b71: 0x000c, 0x2b72: 0x000c, 0x2b73: 0x000c, 0x2b74: 0x000c,
-	// Block 0xae, offset 0x2b80
-	0x2bb8: 0x000c, 0x2bb9: 0x000c, 0x2bba: 0x000c, 0x2bbb: 0x000c,
-	0x2bbc: 0x000c, 0x2bbd: 0x000c, 0x2bbe: 0x000c, 0x2bbf: 0x000c,
-	// Block 0xaf, offset 0x2bc0
-	0x2bc2: 0x000c, 0x2bc3: 0x000c, 0x2bc4: 0x000c,
-	0x2bc6: 0x000c,
-	// Block 0xb0, offset 0x2c00
-	0x2c33: 0x000c, 0x2c34: 0x000c, 0x2c35: 0x000c,
-	0x2c36: 0x000c, 0x2c37: 0x000c, 0x2c38: 0x000c, 0x2c3a: 0x000c,
-	0x2c3f: 0x000c,
-	// Block 0xb1, offset 0x2c40
-	0x2c40: 0x000c, 0x2c42: 0x000c, 0x2c43: 0x000c,
-	// Block 0xb2, offset 0x2c80
-	0x2cb2: 0x000c, 0x2cb3: 0x000c, 0x2cb4: 0x000c, 0x2cb5: 0x000c,
-	0x2cbc: 0x000c, 0x2cbd: 0x000c, 0x2cbf: 0x000c,
-	// Block 0xb3, offset 0x2cc0
-	0x2cc0: 0x000c,
-	0x2cdc: 0x000c, 0x2cdd: 0x000c,
-	// Block 0xb4, offset 0x2d00
-	0x2d33: 0x000c, 0x2d34: 0x000c, 0x2d35: 0x000c,
-	0x2d36: 0x000c, 0x2d37: 0x000c, 0x2d38: 0x000c, 0x2d39: 0x000c, 0x2d3a: 0x000c,
-	0x2d3d: 0x000c, 0x2d3f: 0x000c,
-	// Block 0xb5, offset 0x2d40
-	0x2d40: 0x000c,
-	0x2d60: 0x000a, 0x2d61: 0x000a, 0x2d62: 0x000a, 0x2d63: 0x000a,
-	0x2d64: 0x000a, 0x2d65: 0x000a, 0x2d66: 0x000a, 0x2d67: 0x000a, 0x2d68: 0x000a, 0x2d69: 0x000a,
-	0x2d6a: 0x000a, 0x2d6b: 0x000a, 0x2d6c: 0x000a,
-	// Block 0xb6, offset 0x2d80
-	0x2dab: 0x000c, 0x2dad: 0x000c,
-	0x2db0: 0x000c, 0x2db1: 0x000c, 0x2db2: 0x000c, 0x2db3: 0x000c, 0x2db4: 0x000c, 0x2db5: 0x000c,
-	0x2db7: 0x000c,
-	// Block 0xb7, offset 0x2dc0
-	0x2ddd: 0x000c,
-	0x2dde: 0x000c, 0x2ddf: 0x000c, 0x2de2: 0x000c, 0x2de3: 0x000c,
-	0x2de4: 0x000c, 0x2de5: 0x000c, 0x2de7: 0x000c, 0x2de8: 0x000c, 0x2de9: 0x000c,
-	0x2dea: 0x000c, 0x2deb: 0x000c,
-	// Block 0xb8, offset 0x2e00
-	0x2e30: 0x000c, 0x2e31: 0x000c, 0x2e32: 0x000c, 0x2e33: 0x000c, 0x2e34: 0x000c, 0x2e35: 0x000c,
-	0x2e36: 0x000c, 0x2e38: 0x000c, 0x2e39: 0x000c, 0x2e3a: 0x000c, 0x2e3b: 0x000c,
-	0x2e3c: 0x000c, 0x2e3d: 0x000c,
-	// Block 0xb9, offset 0x2e40
-	0x2e52: 0x000c, 0x2e53: 0x000c, 0x2e54: 0x000c, 0x2e55: 0x000c, 0x2e56: 0x000c, 0x2e57: 0x000c,
-	0x2e58: 0x000c, 0x2e59: 0x000c, 0x2e5a: 0x000c, 0x2e5b: 0x000c, 0x2e5c: 0x000c, 0x2e5d: 0x000c,
-	0x2e5e: 0x000c, 0x2e5f: 0x000c, 0x2e60: 0x000c, 0x2e61: 0x000c, 0x2e62: 0x000c, 0x2e63: 0x000c,
-	0x2e64: 0x000c, 0x2e65: 0x000c, 0x2e66: 0x000c, 0x2e67: 0x000c,
-	0x2e6a: 0x000c, 0x2e6b: 0x000c, 0x2e6c: 0x000c, 0x2e6d: 0x000c, 0x2e6e: 0x000c, 0x2e6f: 0x000c,
-	0x2e70: 0x000c, 0x2e72: 0x000c, 0x2e73: 0x000c, 0x2e75: 0x000c,
-	0x2e76: 0x000c,
-	// Block 0xba, offset 0x2e80
-	0x2eb0: 0x000c, 0x2eb1: 0x000c, 0x2eb2: 0x000c, 0x2eb3: 0x000c, 0x2eb4: 0x000c,
-	// Block 0xbb, offset 0x2ec0
-	0x2ef0: 0x000c, 0x2ef1: 0x000c, 0x2ef2: 0x000c, 0x2ef3: 0x000c, 0x2ef4: 0x000c, 0x2ef5: 0x000c,
-	0x2ef6: 0x000c,
-	// Block 0xbc, offset 0x2f00
-	0x2f0f: 0x000c, 0x2f10: 0x000c, 0x2f11: 0x000c,
-	0x2f12: 0x000c,
-	// Block 0xbd, offset 0x2f40
-	0x2f5d: 0x000c,
-	0x2f5e: 0x000c, 0x2f60: 0x000b, 0x2f61: 0x000b, 0x2f62: 0x000b, 0x2f63: 0x000b,
-	// Block 0xbe, offset 0x2f80
-	0x2fa7: 0x000c, 0x2fa8: 0x000c, 0x2fa9: 0x000c,
-	0x2fb3: 0x000b, 0x2fb4: 0x000b, 0x2fb5: 0x000b,
-	0x2fb6: 0x000b, 0x2fb7: 0x000b, 0x2fb8: 0x000b, 0x2fb9: 0x000b, 0x2fba: 0x000b, 0x2fbb: 0x000c,
-	0x2fbc: 0x000c, 0x2fbd: 0x000c, 0x2fbe: 0x000c, 0x2fbf: 0x000c,
-	// Block 0xbf, offset 0x2fc0
-	0x2fc0: 0x000c, 0x2fc1: 0x000c, 0x2fc2: 0x000c, 0x2fc5: 0x000c,
-	0x2fc6: 0x000c, 0x2fc7: 0x000c, 0x2fc8: 0x000c, 0x2fc9: 0x000c, 0x2fca: 0x000c, 0x2fcb: 0x000c,
-	0x2fea: 0x000c, 0x2feb: 0x000c, 0x2fec: 0x000c, 0x2fed: 0x000c,
-	// Block 0xc0, offset 0x3000
-	0x3000: 0x000a, 0x3001: 0x000a, 0x3002: 0x000c, 0x3003: 0x000c, 0x3004: 0x000c, 0x3005: 0x000a,
-	// Block 0xc1, offset 0x3040
-	0x3040: 0x000a, 0x3041: 0x000a, 0x3042: 0x000a, 0x3043: 0x000a, 0x3044: 0x000a, 0x3045: 0x000a,
-	0x3046: 0x000a, 0x3047: 0x000a, 0x3048: 0x000a, 0x3049: 0x000a, 0x304a: 0x000a, 0x304b: 0x000a,
-	0x304c: 0x000a, 0x304d: 0x000a, 0x304e: 0x000a, 0x304f: 0x000a, 0x3050: 0x000a, 0x3051: 0x000a,
-	0x3052: 0x000a, 0x3053: 0x000a, 0x3054: 0x000a, 0x3055: 0x000a, 0x3056: 0x000a,
-	// Block 0xc2, offset 0x3080
-	0x309b: 0x000a,
-	// Block 0xc3, offset 0x30c0
-	0x30d5: 0x000a,
-	// Block 0xc4, offset 0x3100
-	0x310f: 0x000a,
-	// Block 0xc5, offset 0x3140
-	0x3149: 0x000a,
-	// Block 0xc6, offset 0x3180
-	0x3183: 0x000a,
-	0x318e: 0x0002, 0x318f: 0x0002, 0x3190: 0x0002, 0x3191: 0x0002,
-	0x3192: 0x0002, 0x3193: 0x0002, 0x3194: 0x0002, 0x3195: 0x0002, 0x3196: 0x0002, 0x3197: 0x0002,
-	0x3198: 0x0002, 0x3199: 0x0002, 0x319a: 0x0002, 0x319b: 0x0002, 0x319c: 0x0002, 0x319d: 0x0002,
-	0x319e: 0x0002, 0x319f: 0x0002, 0x31a0: 0x0002, 0x31a1: 0x0002, 0x31a2: 0x0002, 0x31a3: 0x0002,
-	0x31a4: 0x0002, 0x31a5: 0x0002, 0x31a6: 0x0002, 0x31a7: 0x0002, 0x31a8: 0x0002, 0x31a9: 0x0002,
-	0x31aa: 0x0002, 0x31ab: 0x0002, 0x31ac: 0x0002, 0x31ad: 0x0002, 0x31ae: 0x0002, 0x31af: 0x0002,
-	0x31b0: 0x0002, 0x31b1: 0x0002, 0x31b2: 0x0002, 0x31b3: 0x0002, 0x31b4: 0x0002, 0x31b5: 0x0002,
-	0x31b6: 0x0002, 0x31b7: 0x0002, 0x31b8: 0x0002, 0x31b9: 0x0002, 0x31ba: 0x0002, 0x31bb: 0x0002,
-	0x31bc: 0x0002, 0x31bd: 0x0002, 0x31be: 0x0002, 0x31bf: 0x0002,
-	// Block 0xc7, offset 0x31c0
-	0x31c0: 0x000c, 0x31c1: 0x000c, 0x31c2: 0x000c, 0x31c3: 0x000c, 0x31c4: 0x000c, 0x31c5: 0x000c,
-	0x31c6: 0x000c, 0x31c7: 0x000c, 0x31c8: 0x000c, 0x31c9: 0x000c, 0x31ca: 0x000c, 0x31cb: 0x000c,
-	0x31cc: 0x000c, 0x31cd: 0x000c, 0x31ce: 0x000c, 0x31cf: 0x000c, 0x31d0: 0x000c, 0x31d1: 0x000c,
-	0x31d2: 0x000c, 0x31d3: 0x000c, 0x31d4: 0x000c, 0x31d5: 0x000c, 0x31d6: 0x000c, 0x31d7: 0x000c,
-	0x31d8: 0x000c, 0x31d9: 0x000c, 0x31da: 0x000c, 0x31db: 0x000c, 0x31dc: 0x000c, 0x31dd: 0x000c,
-	0x31de: 0x000c, 0x31df: 0x000c, 0x31e0: 0x000c, 0x31e1: 0x000c, 0x31e2: 0x000c, 0x31e3: 0x000c,
-	0x31e4: 0x000c, 0x31e5: 0x000c, 0x31e6: 0x000c, 0x31e7: 0x000c, 0x31e8: 0x000c, 0x31e9: 0x000c,
-	0x31ea: 0x000c, 0x31eb: 0x000c, 0x31ec: 0x000c, 0x31ed: 0x000c, 0x31ee: 0x000c, 0x31ef: 0x000c,
-	0x31f0: 0x000c, 0x31f1: 0x000c, 0x31f2: 0x000c, 0x31f3: 0x000c, 0x31f4: 0x000c, 0x31f5: 0x000c,
-	0x31f6: 0x000c, 0x31fb: 0x000c,
-	0x31fc: 0x000c, 0x31fd: 0x000c, 0x31fe: 0x000c, 0x31ff: 0x000c,
-	// Block 0xc8, offset 0x3200
-	0x3200: 0x000c, 0x3201: 0x000c, 0x3202: 0x000c, 0x3203: 0x000c, 0x3204: 0x000c, 0x3205: 0x000c,
-	0x3206: 0x000c, 0x3207: 0x000c, 0x3208: 0x000c, 0x3209: 0x000c, 0x320a: 0x000c, 0x320b: 0x000c,
-	0x320c: 0x000c, 0x320d: 0x000c, 0x320e: 0x000c, 0x320f: 0x000c, 0x3210: 0x000c, 0x3211: 0x000c,
-	0x3212: 0x000c, 0x3213: 0x000c, 0x3214: 0x000c, 0x3215: 0x000c, 0x3216: 0x000c, 0x3217: 0x000c,
-	0x3218: 0x000c, 0x3219: 0x000c, 0x321a: 0x000c, 0x321b: 0x000c, 0x321c: 0x000c, 0x321d: 0x000c,
-	0x321e: 0x000c, 0x321f: 0x000c, 0x3220: 0x000c, 0x3221: 0x000c, 0x3222: 0x000c, 0x3223: 0x000c,
-	0x3224: 0x000c, 0x3225: 0x000c, 0x3226: 0x000c, 0x3227: 0x000c, 0x3228: 0x000c, 0x3229: 0x000c,
-	0x322a: 0x000c, 0x322b: 0x000c, 0x322c: 0x000c,
-	0x3235: 0x000c,
-	// Block 0xc9, offset 0x3240
-	0x3244: 0x000c,
-	0x325b: 0x000c, 0x325c: 0x000c, 0x325d: 0x000c,
-	0x325e: 0x000c, 0x325f: 0x000c, 0x3261: 0x000c, 0x3262: 0x000c, 0x3263: 0x000c,
-	0x3264: 0x000c, 0x3265: 0x000c, 0x3266: 0x000c, 0x3267: 0x000c, 0x3268: 0x000c, 0x3269: 0x000c,
-	0x326a: 0x000c, 0x326b: 0x000c, 0x326c: 0x000c, 0x326d: 0x000c, 0x326e: 0x000c, 0x326f: 0x000c,
-	// Block 0xca, offset 0x3280
-	0x3280: 0x000c, 0x3281: 0x000c, 0x3282: 0x000c, 0x3283: 0x000c, 0x3284: 0x000c, 0x3285: 0x000c,
-	0x3286: 0x000c, 0x3288: 0x000c, 0x3289: 0x000c, 0x328a: 0x000c, 0x328b: 0x000c,
-	0x328c: 0x000c, 0x328d: 0x000c, 0x328e: 0x000c, 0x328f: 0x000c, 0x3290: 0x000c, 0x3291: 0x000c,
-	0x3292: 0x000c, 0x3293: 0x000c, 0x3294: 0x000c, 0x3295: 0x000c, 0x3296: 0x000c, 0x3297: 0x000c,
-	0x3298: 0x000c, 0x329b: 0x000c, 0x329c: 0x000c, 0x329d: 0x000c,
-	0x329e: 0x000c, 0x329f: 0x000c, 0x32a0: 0x000c, 0x32a1: 0x000c, 0x32a3: 0x000c,
-	0x32a4: 0x000c, 0x32a6: 0x000c, 0x32a7: 0x000c, 0x32a8: 0x000c, 0x32a9: 0x000c,
-	0x32aa: 0x000c,
-	// Block 0xcb, offset 0x32c0
-	0x32c0: 0x0001, 0x32c1: 0x0001, 0x32c2: 0x0001, 0x32c3: 0x0001, 0x32c4: 0x0001, 0x32c5: 0x0001,
-	0x32c6: 0x0001, 0x32c7: 0x0001, 0x32c8: 0x0001, 0x32c9: 0x0001, 0x32ca: 0x0001, 0x32cb: 0x0001,
-	0x32cc: 0x0001, 0x32cd: 0x0001, 0x32ce: 0x0001, 0x32cf: 0x0001, 0x32d0: 0x000c, 0x32d1: 0x000c,
-	0x32d2: 0x000c, 0x32d3: 0x000c, 0x32d4: 0x000c, 0x32d5: 0x000c, 0x32d6: 0x000c, 0x32d7: 0x0001,
-	0x32d8: 0x0001, 0x32d9: 0x0001, 0x32da: 0x0001, 0x32db: 0x0001, 0x32dc: 0x0001, 0x32dd: 0x0001,
-	0x32de: 0x0001, 0x32df: 0x0001, 0x32e0: 0x0001, 0x32e1: 0x0001, 0x32e2: 0x0001, 0x32e3: 0x0001,
-	0x32e4: 0x0001, 0x32e5: 0x0001, 0x32e6: 0x0001, 0x32e7: 0x0001, 0x32e8: 0x0001, 0x32e9: 0x0001,
-	0x32ea: 0x0001, 0x32eb: 0x0001, 0x32ec: 0x0001, 0x32ed: 0x0001, 0x32ee: 0x0001, 0x32ef: 0x0001,
-	0x32f0: 0x0001, 0x32f1: 0x0001, 0x32f2: 0x0001, 0x32f3: 0x0001, 0x32f4: 0x0001, 0x32f5: 0x0001,
-	0x32f6: 0x0001, 0x32f7: 0x0001, 0x32f8: 0x0001, 0x32f9: 0x0001, 0x32fa: 0x0001, 0x32fb: 0x0001,
-	0x32fc: 0x0001, 0x32fd: 0x0001, 0x32fe: 0x0001, 0x32ff: 0x0001,
-	// Block 0xcc, offset 0x3300
-	0x3300: 0x0001, 0x3301: 0x0001, 0x3302: 0x0001, 0x3303: 0x0001, 0x3304: 0x000c, 0x3305: 0x000c,
-	0x3306: 0x000c, 0x3307: 0x000c, 0x3308: 0x000c, 0x3309: 0x000c, 0x330a: 0x000c, 0x330b: 0x0001,
-	0x330c: 0x0001, 0x330d: 0x0001, 0x330e: 0x0001, 0x330f: 0x0001, 0x3310: 0x0001, 0x3311: 0x0001,
-	0x3312: 0x0001, 0x3313: 0x0001, 0x3314: 0x0001, 0x3315: 0x0001, 0x3316: 0x0001, 0x3317: 0x0001,
-	0x3318: 0x0001, 0x3319: 0x0001, 0x331a: 0x0001, 0x331b: 0x0001, 0x331c: 0x0001, 0x331d: 0x0001,
-	0x331e: 0x0001, 0x331f: 0x0001, 0x3320: 0x0001, 0x3321: 0x0001, 0x3322: 0x0001, 0x3323: 0x0001,
-	0x3324: 0x0001, 0x3325: 0x0001, 0x3326: 0x0001, 0x3327: 0x0001, 0x3328: 0x0001, 0x3329: 0x0001,
-	0x332a: 0x0001, 0x332b: 0x0001, 0x332c: 0x0001, 0x332d: 0x0001, 0x332e: 0x0001, 0x332f: 0x0001,
-	0x3330: 0x0001, 0x3331: 0x0001, 0x3332: 0x0001, 0x3333: 0x0001, 0x3334: 0x0001, 0x3335: 0x0001,
-	0x3336: 0x0001, 0x3337: 0x0001, 0x3338: 0x0001, 0x3339: 0x0001, 0x333a: 0x0001, 0x333b: 0x0001,
-	0x333c: 0x0001, 0x333d: 0x0001, 0x333e: 0x0001, 0x333f: 0x0001,
-	// Block 0xcd, offset 0x3340
-	0x3340: 0x000d, 0x3341: 0x000d, 0x3342: 0x000d, 0x3343: 0x000d, 0x3344: 0x000d, 0x3345: 0x000d,
-	0x3346: 0x000d, 0x3347: 0x000d, 0x3348: 0x000d, 0x3349: 0x000d, 0x334a: 0x000d, 0x334b: 0x000d,
-	0x334c: 0x000d, 0x334d: 0x000d, 0x334e: 0x000d, 0x334f: 0x000d, 0x3350: 0x000d, 0x3351: 0x000d,
-	0x3352: 0x000d, 0x3353: 0x000d, 0x3354: 0x000d, 0x3355: 0x000d, 0x3356: 0x000d, 0x3357: 0x000d,
-	0x3358: 0x000d, 0x3359: 0x000d, 0x335a: 0x000d, 0x335b: 0x000d, 0x335c: 0x000d, 0x335d: 0x000d,
-	0x335e: 0x000d, 0x335f: 0x000d, 0x3360: 0x000d, 0x3361: 0x000d, 0x3362: 0x000d, 0x3363: 0x000d,
-	0x3364: 0x000d, 0x3365: 0x000d, 0x3366: 0x000d, 0x3367: 0x000d, 0x3368: 0x000d, 0x3369: 0x000d,
-	0x336a: 0x000d, 0x336b: 0x000d, 0x336c: 0x000d, 0x336d: 0x000d, 0x336e: 0x000d, 0x336f: 0x000d,
-	0x3370: 0x000a, 0x3371: 0x000a, 0x3372: 0x000d, 0x3373: 0x000d, 0x3374: 0x000d, 0x3375: 0x000d,
-	0x3376: 0x000d, 0x3377: 0x000d, 0x3378: 0x000d, 0x3379: 0x000d, 0x337a: 0x000d, 0x337b: 0x000d,
-	0x337c: 0x000d, 0x337d: 0x000d, 0x337e: 0x000d, 0x337f: 0x000d,
-	// Block 0xce, offset 0x3380
-	0x3380: 0x000a, 0x3381: 0x000a, 0x3382: 0x000a, 0x3383: 0x000a, 0x3384: 0x000a, 0x3385: 0x000a,
-	0x3386: 0x000a, 0x3387: 0x000a, 0x3388: 0x000a, 0x3389: 0x000a, 0x338a: 0x000a, 0x338b: 0x000a,
-	0x338c: 0x000a, 0x338d: 0x000a, 0x338e: 0x000a, 0x338f: 0x000a, 0x3390: 0x000a, 0x3391: 0x000a,
-	0x3392: 0x000a, 0x3393: 0x000a, 0x3394: 0x000a, 0x3395: 0x000a, 0x3396: 0x000a, 0x3397: 0x000a,
-	0x3398: 0x000a, 0x3399: 0x000a, 0x339a: 0x000a, 0x339b: 0x000a, 0x339c: 0x000a, 0x339d: 0x000a,
-	0x339e: 0x000a, 0x339f: 0x000a, 0x33a0: 0x000a, 0x33a1: 0x000a, 0x33a2: 0x000a, 0x33a3: 0x000a,
-	0x33a4: 0x000a, 0x33a5: 0x000a, 0x33a6: 0x000a, 0x33a7: 0x000a, 0x33a8: 0x000a, 0x33a9: 0x000a,
-	0x33aa: 0x000a, 0x33ab: 0x000a,
-	0x33b0: 0x000a, 0x33b1: 0x000a, 0x33b2: 0x000a, 0x33b3: 0x000a, 0x33b4: 0x000a, 0x33b5: 0x000a,
-	0x33b6: 0x000a, 0x33b7: 0x000a, 0x33b8: 0x000a, 0x33b9: 0x000a, 0x33ba: 0x000a, 0x33bb: 0x000a,
-	0x33bc: 0x000a, 0x33bd: 0x000a, 0x33be: 0x000a, 0x33bf: 0x000a,
-	// Block 0xcf, offset 0x33c0
-	0x33c0: 0x000a, 0x33c1: 0x000a, 0x33c2: 0x000a, 0x33c3: 0x000a, 0x33c4: 0x000a, 0x33c5: 0x000a,
-	0x33c6: 0x000a, 0x33c7: 0x000a, 0x33c8: 0x000a, 0x33c9: 0x000a, 0x33ca: 0x000a, 0x33cb: 0x000a,
-	0x33cc: 0x000a, 0x33cd: 0x000a, 0x33ce: 0x000a, 0x33cf: 0x000a, 0x33d0: 0x000a, 0x33d1: 0x000a,
-	0x33d2: 0x000a, 0x33d3: 0x000a,
-	0x33e0: 0x000a, 0x33e1: 0x000a, 0x33e2: 0x000a, 0x33e3: 0x000a,
-	0x33e4: 0x000a, 0x33e5: 0x000a, 0x33e6: 0x000a, 0x33e7: 0x000a, 0x33e8: 0x000a, 0x33e9: 0x000a,
-	0x33ea: 0x000a, 0x33eb: 0x000a, 0x33ec: 0x000a, 0x33ed: 0x000a, 0x33ee: 0x000a,
-	0x33f1: 0x000a, 0x33f2: 0x000a, 0x33f3: 0x000a, 0x33f4: 0x000a, 0x33f5: 0x000a,
-	0x33f6: 0x000a, 0x33f7: 0x000a, 0x33f8: 0x000a, 0x33f9: 0x000a, 0x33fa: 0x000a, 0x33fb: 0x000a,
-	0x33fc: 0x000a, 0x33fd: 0x000a, 0x33fe: 0x000a, 0x33ff: 0x000a,
-	// Block 0xd0, offset 0x3400
-	0x3401: 0x000a, 0x3402: 0x000a, 0x3403: 0x000a, 0x3404: 0x000a, 0x3405: 0x000a,
-	0x3406: 0x000a, 0x3407: 0x000a, 0x3408: 0x000a, 0x3409: 0x000a, 0x340a: 0x000a, 0x340b: 0x000a,
-	0x340c: 0x000a, 0x340d: 0x000a, 0x340e: 0x000a, 0x340f: 0x000a, 0x3411: 0x000a,
-	0x3412: 0x000a, 0x3413: 0x000a, 0x3414: 0x000a, 0x3415: 0x000a, 0x3416: 0x000a, 0x3417: 0x000a,
-	0x3418: 0x000a, 0x3419: 0x000a, 0x341a: 0x000a, 0x341b: 0x000a, 0x341c: 0x000a, 0x341d: 0x000a,
-	0x341e: 0x000a, 0x341f: 0x000a, 0x3420: 0x000a, 0x3421: 0x000a, 0x3422: 0x000a, 0x3423: 0x000a,
-	0x3424: 0x000a, 0x3425: 0x000a, 0x3426: 0x000a, 0x3427: 0x000a, 0x3428: 0x000a, 0x3429: 0x000a,
-	0x342a: 0x000a, 0x342b: 0x000a, 0x342c: 0x000a, 0x342d: 0x000a, 0x342e: 0x000a, 0x342f: 0x000a,
-	0x3430: 0x000a, 0x3431: 0x000a, 0x3432: 0x000a, 0x3433: 0x000a, 0x3434: 0x000a, 0x3435: 0x000a,
-	// Block 0xd1, offset 0x3440
-	0x3440: 0x0002, 0x3441: 0x0002, 0x3442: 0x0002, 0x3443: 0x0002, 0x3444: 0x0002, 0x3445: 0x0002,
-	0x3446: 0x0002, 0x3447: 0x0002, 0x3448: 0x0002, 0x3449: 0x0002, 0x344a: 0x0002, 0x344b: 0x000a,
-	0x344c: 0x000a,
-	// Block 0xd2, offset 0x3480
-	0x34aa: 0x000a, 0x34ab: 0x000a,
-	// Block 0xd3, offset 0x34c0
-	0x34c0: 0x000a, 0x34c1: 0x000a, 0x34c2: 0x000a, 0x34c3: 0x000a, 0x34c4: 0x000a, 0x34c5: 0x000a,
-	0x34c6: 0x000a, 0x34c7: 0x000a, 0x34c8: 0x000a, 0x34c9: 0x000a, 0x34ca: 0x000a, 0x34cb: 0x000a,
-	0x34cc: 0x000a, 0x34cd: 0x000a, 0x34ce: 0x000a, 0x34cf: 0x000a, 0x34d0: 0x000a, 0x34d1: 0x000a,
-	0x34d2: 0x000a,
-	0x34e0: 0x000a, 0x34e1: 0x000a, 0x34e2: 0x000a, 0x34e3: 0x000a,
-	0x34e4: 0x000a, 0x34e5: 0x000a, 0x34e6: 0x000a, 0x34e7: 0x000a, 0x34e8: 0x000a, 0x34e9: 0x000a,
-	0x34ea: 0x000a, 0x34eb: 0x000a, 0x34ec: 0x000a,
-	0x34f0: 0x000a, 0x34f1: 0x000a, 0x34f2: 0x000a, 0x34f3: 0x000a, 0x34f4: 0x000a, 0x34f5: 0x000a,
-	0x34f6: 0x000a,
-	// Block 0xd4, offset 0x3500
-	0x3500: 0x000a, 0x3501: 0x000a, 0x3502: 0x000a, 0x3503: 0x000a, 0x3504: 0x000a, 0x3505: 0x000a,
-	0x3506: 0x000a, 0x3507: 0x000a, 0x3508: 0x000a, 0x3509: 0x000a, 0x350a: 0x000a, 0x350b: 0x000a,
-	0x350c: 0x000a, 0x350d: 0x000a, 0x350e: 0x000a, 0x350f: 0x000a, 0x3510: 0x000a, 0x3511: 0x000a,
-	0x3512: 0x000a, 0x3513: 0x000a, 0x3514: 0x000a,
-	// Block 0xd5, offset 0x3540
-	0x3540: 0x000a, 0x3541: 0x000a, 0x3542: 0x000a, 0x3543: 0x000a, 0x3544: 0x000a, 0x3545: 0x000a,
-	0x3546: 0x000a, 0x3547: 0x000a, 0x3548: 0x000a, 0x3549: 0x000a, 0x354a: 0x000a, 0x354b: 0x000a,
-	0x3550: 0x000a, 0x3551: 0x000a,
-	0x3552: 0x000a, 0x3553: 0x000a, 0x3554: 0x000a, 0x3555: 0x000a, 0x3556: 0x000a, 0x3557: 0x000a,
-	0x3558: 0x000a, 0x3559: 0x000a, 0x355a: 0x000a, 0x355b: 0x000a, 0x355c: 0x000a, 0x355d: 0x000a,
-	0x355e: 0x000a, 0x355f: 0x000a, 0x3560: 0x000a, 0x3561: 0x000a, 0x3562: 0x000a, 0x3563: 0x000a,
-	0x3564: 0x000a, 0x3565: 0x000a, 0x3566: 0x000a, 0x3567: 0x000a, 0x3568: 0x000a, 0x3569: 0x000a,
-	0x356a: 0x000a, 0x356b: 0x000a, 0x356c: 0x000a, 0x356d: 0x000a, 0x356e: 0x000a, 0x356f: 0x000a,
-	0x3570: 0x000a, 0x3571: 0x000a, 0x3572: 0x000a, 0x3573: 0x000a, 0x3574: 0x000a, 0x3575: 0x000a,
-	0x3576: 0x000a, 0x3577: 0x000a, 0x3578: 0x000a, 0x3579: 0x000a, 0x357a: 0x000a, 0x357b: 0x000a,
-	0x357c: 0x000a, 0x357d: 0x000a, 0x357e: 0x000a, 0x357f: 0x000a,
-	// Block 0xd6, offset 0x3580
-	0x3580: 0x000a, 0x3581: 0x000a, 0x3582: 0x000a, 0x3583: 0x000a, 0x3584: 0x000a, 0x3585: 0x000a,
-	0x3586: 0x000a, 0x3587: 0x000a,
-	0x3590: 0x000a, 0x3591: 0x000a,
-	0x3592: 0x000a, 0x3593: 0x000a, 0x3594: 0x000a, 0x3595: 0x000a, 0x3596: 0x000a, 0x3597: 0x000a,
-	0x3598: 0x000a, 0x3599: 0x000a,
-	0x35a0: 0x000a, 0x35a1: 0x000a, 0x35a2: 0x000a, 0x35a3: 0x000a,
-	0x35a4: 0x000a, 0x35a5: 0x000a, 0x35a6: 0x000a, 0x35a7: 0x000a, 0x35a8: 0x000a, 0x35a9: 0x000a,
-	0x35aa: 0x000a, 0x35ab: 0x000a, 0x35ac: 0x000a, 0x35ad: 0x000a, 0x35ae: 0x000a, 0x35af: 0x000a,
-	0x35b0: 0x000a, 0x35b1: 0x000a, 0x35b2: 0x000a, 0x35b3: 0x000a, 0x35b4: 0x000a, 0x35b5: 0x000a,
-	0x35b6: 0x000a, 0x35b7: 0x000a, 0x35b8: 0x000a, 0x35b9: 0x000a, 0x35ba: 0x000a, 0x35bb: 0x000a,
-	0x35bc: 0x000a, 0x35bd: 0x000a, 0x35be: 0x000a, 0x35bf: 0x000a,
-	// Block 0xd7, offset 0x35c0
-	0x35c0: 0x000a, 0x35c1: 0x000a, 0x35c2: 0x000a, 0x35c3: 0x000a, 0x35c4: 0x000a, 0x35c5: 0x000a,
-	0x35c6: 0x000a, 0x35c7: 0x000a,
-	0x35d0: 0x000a, 0x35d1: 0x000a,
-	0x35d2: 0x000a, 0x35d3: 0x000a, 0x35d4: 0x000a, 0x35d5: 0x000a, 0x35d6: 0x000a, 0x35d7: 0x000a,
-	0x35d8: 0x000a, 0x35d9: 0x000a, 0x35da: 0x000a, 0x35db: 0x000a, 0x35dc: 0x000a, 0x35dd: 0x000a,
-	0x35de: 0x000a, 0x35df: 0x000a, 0x35e0: 0x000a, 0x35e1: 0x000a, 0x35e2: 0x000a, 0x35e3: 0x000a,
-	0x35e4: 0x000a, 0x35e5: 0x000a, 0x35e6: 0x000a, 0x35e7: 0x000a, 0x35e8: 0x000a, 0x35e9: 0x000a,
-	0x35ea: 0x000a, 0x35eb: 0x000a, 0x35ec: 0x000a, 0x35ed: 0x000a,
-	// Block 0xd8, offset 0x3600
-	0x3610: 0x000a, 0x3611: 0x000a,
-	0x3612: 0x000a, 0x3613: 0x000a, 0x3614: 0x000a, 0x3615: 0x000a, 0x3616: 0x000a, 0x3617: 0x000a,
-	0x3618: 0x000a, 0x3619: 0x000a, 0x361a: 0x000a, 0x361b: 0x000a, 0x361c: 0x000a, 0x361d: 0x000a,
-	0x361e: 0x000a, 0x3620: 0x000a, 0x3621: 0x000a, 0x3622: 0x000a, 0x3623: 0x000a,
-	0x3624: 0x000a, 0x3625: 0x000a, 0x3626: 0x000a, 0x3627: 0x000a,
-	0x3630: 0x000a, 0x3633: 0x000a, 0x3634: 0x000a, 0x3635: 0x000a,
-	0x3636: 0x000a, 0x3637: 0x000a, 0x3638: 0x000a, 0x3639: 0x000a, 0x363a: 0x000a, 0x363b: 0x000a,
-	0x363c: 0x000a, 0x363d: 0x000a, 0x363e: 0x000a,
-	// Block 0xd9, offset 0x3640
-	0x3640: 0x000a, 0x3641: 0x000a, 0x3642: 0x000a, 0x3643: 0x000a, 0x3644: 0x000a, 0x3645: 0x000a,
-	0x3646: 0x000a, 0x3647: 0x000a, 0x3648: 0x000a, 0x3649: 0x000a, 0x364a: 0x000a, 0x364b: 0x000a,
-	0x3650: 0x000a, 0x3651: 0x000a,
-	0x3652: 0x000a, 0x3653: 0x000a, 0x3654: 0x000a, 0x3655: 0x000a, 0x3656: 0x000a, 0x3657: 0x000a,
-	0x3658: 0x000a, 0x3659: 0x000a, 0x365a: 0x000a, 0x365b: 0x000a, 0x365c: 0x000a, 0x365d: 0x000a,
-	0x365e: 0x000a,
-	// Block 0xda, offset 0x3680
-	0x3680: 0x000a, 0x3681: 0x000a, 0x3682: 0x000a, 0x3683: 0x000a, 0x3684: 0x000a, 0x3685: 0x000a,
-	0x3686: 0x000a, 0x3687: 0x000a, 0x3688: 0x000a, 0x3689: 0x000a, 0x368a: 0x000a, 0x368b: 0x000a,
-	0x368c: 0x000a, 0x368d: 0x000a, 0x368e: 0x000a, 0x368f: 0x000a, 0x3690: 0x000a, 0x3691: 0x000a,
-	// Block 0xdb, offset 0x36c0
-	0x36fe: 0x000b, 0x36ff: 0x000b,
-	// Block 0xdc, offset 0x3700
-	0x3700: 0x000b, 0x3701: 0x000b, 0x3702: 0x000b, 0x3703: 0x000b, 0x3704: 0x000b, 0x3705: 0x000b,
-	0x3706: 0x000b, 0x3707: 0x000b, 0x3708: 0x000b, 0x3709: 0x000b, 0x370a: 0x000b, 0x370b: 0x000b,
-	0x370c: 0x000b, 0x370d: 0x000b, 0x370e: 0x000b, 0x370f: 0x000b, 0x3710: 0x000b, 0x3711: 0x000b,
-	0x3712: 0x000b, 0x3713: 0x000b, 0x3714: 0x000b, 0x3715: 0x000b, 0x3716: 0x000b, 0x3717: 0x000b,
-	0x3718: 0x000b, 0x3719: 0x000b, 0x371a: 0x000b, 0x371b: 0x000b, 0x371c: 0x000b, 0x371d: 0x000b,
-	0x371e: 0x000b, 0x371f: 0x000b, 0x3720: 0x000b, 0x3721: 0x000b, 0x3722: 0x000b, 0x3723: 0x000b,
-	0x3724: 0x000b, 0x3725: 0x000b, 0x3726: 0x000b, 0x3727: 0x000b, 0x3728: 0x000b, 0x3729: 0x000b,
-	0x372a: 0x000b, 0x372b: 0x000b, 0x372c: 0x000b, 0x372d: 0x000b, 0x372e: 0x000b, 0x372f: 0x000b,
-	0x3730: 0x000b, 0x3731: 0x000b, 0x3732: 0x000b, 0x3733: 0x000b, 0x3734: 0x000b, 0x3735: 0x000b,
-	0x3736: 0x000b, 0x3737: 0x000b, 0x3738: 0x000b, 0x3739: 0x000b, 0x373a: 0x000b, 0x373b: 0x000b,
-	0x373c: 0x000b, 0x373d: 0x000b, 0x373e: 0x000b, 0x373f: 0x000b,
-	// Block 0xdd, offset 0x3740
-	0x3740: 0x000c, 0x3741: 0x000c, 0x3742: 0x000c, 0x3743: 0x000c, 0x3744: 0x000c, 0x3745: 0x000c,
-	0x3746: 0x000c, 0x3747: 0x000c, 0x3748: 0x000c, 0x3749: 0x000c, 0x374a: 0x000c, 0x374b: 0x000c,
-	0x374c: 0x000c, 0x374d: 0x000c, 0x374e: 0x000c, 0x374f: 0x000c, 0x3750: 0x000c, 0x3751: 0x000c,
-	0x3752: 0x000c, 0x3753: 0x000c, 0x3754: 0x000c, 0x3755: 0x000c, 0x3756: 0x000c, 0x3757: 0x000c,
-	0x3758: 0x000c, 0x3759: 0x000c, 0x375a: 0x000c, 0x375b: 0x000c, 0x375c: 0x000c, 0x375d: 0x000c,
-	0x375e: 0x000c, 0x375f: 0x000c, 0x3760: 0x000c, 0x3761: 0x000c, 0x3762: 0x000c, 0x3763: 0x000c,
-	0x3764: 0x000c, 0x3765: 0x000c, 0x3766: 0x000c, 0x3767: 0x000c, 0x3768: 0x000c, 0x3769: 0x000c,
-	0x376a: 0x000c, 0x376b: 0x000c, 0x376c: 0x000c, 0x376d: 0x000c, 0x376e: 0x000c, 0x376f: 0x000c,
-	0x3770: 0x000b, 0x3771: 0x000b, 0x3772: 0x000b, 0x3773: 0x000b, 0x3774: 0x000b, 0x3775: 0x000b,
-	0x3776: 0x000b, 0x3777: 0x000b, 0x3778: 0x000b, 0x3779: 0x000b, 0x377a: 0x000b, 0x377b: 0x000b,
-	0x377c: 0x000b, 0x377d: 0x000b, 0x377e: 0x000b, 0x377f: 0x000b,
-}
-
-// bidiIndex: 24 blocks, 1536 entries, 1536 bytes
-// Block 0 is the zero block.
-var bidiIndex = [1536]uint8{
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc2: 0x01, 0xc3: 0x02,
-	0xca: 0x03, 0xcb: 0x04, 0xcc: 0x05, 0xcd: 0x06, 0xce: 0x07, 0xcf: 0x08,
-	0xd2: 0x09, 0xd6: 0x0a, 0xd7: 0x0b,
-	0xd8: 0x0c, 0xd9: 0x0d, 0xda: 0x0e, 0xdb: 0x0f, 0xdc: 0x10, 0xdd: 0x11, 0xde: 0x12, 0xdf: 0x13,
-	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05, 0xe4: 0x06,
-	0xea: 0x07, 0xef: 0x08,
-	0xf0: 0x11, 0xf1: 0x12, 0xf2: 0x12, 0xf3: 0x14, 0xf4: 0x15,
-	// Block 0x4, offset 0x100
-	0x120: 0x14, 0x121: 0x15, 0x122: 0x16, 0x123: 0x17, 0x124: 0x18, 0x125: 0x19, 0x126: 0x1a, 0x127: 0x1b,
-	0x128: 0x1c, 0x129: 0x1d, 0x12a: 0x1c, 0x12b: 0x1e, 0x12c: 0x1f, 0x12d: 0x20, 0x12e: 0x21, 0x12f: 0x22,
-	0x130: 0x23, 0x131: 0x24, 0x132: 0x1a, 0x133: 0x25, 0x134: 0x26, 0x135: 0x27, 0x137: 0x28,
-	0x138: 0x29, 0x139: 0x2a, 0x13a: 0x2b, 0x13b: 0x2c, 0x13c: 0x2d, 0x13d: 0x2e, 0x13e: 0x2f, 0x13f: 0x30,
-	// Block 0x5, offset 0x140
-	0x140: 0x31, 0x141: 0x32, 0x142: 0x33,
-	0x14d: 0x34, 0x14e: 0x35,
-	0x150: 0x36,
-	0x15a: 0x37, 0x15c: 0x38, 0x15d: 0x39, 0x15e: 0x3a, 0x15f: 0x3b,
-	0x160: 0x3c, 0x162: 0x3d, 0x164: 0x3e, 0x165: 0x3f, 0x167: 0x40,
-	0x168: 0x41, 0x169: 0x42, 0x16a: 0x43, 0x16c: 0x44, 0x16d: 0x45, 0x16e: 0x46, 0x16f: 0x47,
-	0x170: 0x48, 0x173: 0x49, 0x177: 0x4a,
-	0x17e: 0x4b, 0x17f: 0x4c,
-	// Block 0x6, offset 0x180
-	0x180: 0x4d, 0x181: 0x4e, 0x182: 0x4f, 0x183: 0x50, 0x184: 0x51, 0x185: 0x52, 0x186: 0x53, 0x187: 0x54,
-	0x188: 0x55, 0x189: 0x54, 0x18a: 0x54, 0x18b: 0x54, 0x18c: 0x56, 0x18d: 0x57, 0x18e: 0x58, 0x18f: 0x59,
-	0x190: 0x5a, 0x191: 0x5b, 0x192: 0x5c, 0x193: 0x5d, 0x194: 0x54, 0x195: 0x54, 0x196: 0x54, 0x197: 0x54,
-	0x198: 0x54, 0x199: 0x54, 0x19a: 0x5e, 0x19b: 0x54, 0x19c: 0x54, 0x19d: 0x5f, 0x19e: 0x54, 0x19f: 0x60,
-	0x1a4: 0x54, 0x1a5: 0x54, 0x1a6: 0x61, 0x1a7: 0x62,
-	0x1a8: 0x54, 0x1a9: 0x54, 0x1aa: 0x54, 0x1ab: 0x54, 0x1ac: 0x54, 0x1ad: 0x63, 0x1ae: 0x64, 0x1af: 0x65,
-	0x1b3: 0x66, 0x1b5: 0x67, 0x1b7: 0x68,
-	0x1b8: 0x69, 0x1b9: 0x6a, 0x1ba: 0x6b, 0x1bb: 0x6c, 0x1bc: 0x54, 0x1bd: 0x54, 0x1be: 0x54, 0x1bf: 0x6d,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x6e, 0x1c2: 0x6f, 0x1c3: 0x70, 0x1c7: 0x71,
-	0x1c8: 0x72, 0x1c9: 0x73, 0x1ca: 0x74, 0x1cb: 0x75, 0x1cd: 0x76, 0x1cf: 0x77,
-	// Block 0x8, offset 0x200
-	0x237: 0x54,
-	// Block 0x9, offset 0x240
-	0x252: 0x78, 0x253: 0x79,
-	0x258: 0x7a, 0x259: 0x7b, 0x25a: 0x7c, 0x25b: 0x7d, 0x25c: 0x7e, 0x25e: 0x7f,
-	0x260: 0x80, 0x261: 0x81, 0x263: 0x82, 0x264: 0x83, 0x265: 0x84, 0x266: 0x85, 0x267: 0x86,
-	0x268: 0x87, 0x269: 0x88, 0x26a: 0x89, 0x26b: 0x8a, 0x26f: 0x8b,
-	// Block 0xa, offset 0x280
-	0x2ac: 0x8c, 0x2ad: 0x8d, 0x2ae: 0x0e, 0x2af: 0x0e,
-	0x2b0: 0x0e, 0x2b1: 0x0e, 0x2b2: 0x0e, 0x2b3: 0x0e, 0x2b4: 0x8e, 0x2b5: 0x0e, 0x2b6: 0x0e, 0x2b7: 0x8f,
-	0x2b8: 0x90, 0x2b9: 0x91, 0x2ba: 0x0e, 0x2bb: 0x92, 0x2bc: 0x93, 0x2bd: 0x94, 0x2bf: 0x95,
-	// Block 0xb, offset 0x2c0
-	0x2c4: 0x96, 0x2c5: 0x54, 0x2c6: 0x97, 0x2c7: 0x98,
-	0x2cb: 0x99, 0x2cd: 0x9a,
-	0x2e0: 0x9b, 0x2e1: 0x9b, 0x2e2: 0x9b, 0x2e3: 0x9b, 0x2e4: 0x9c, 0x2e5: 0x9b, 0x2e6: 0x9b, 0x2e7: 0x9b,
-	0x2e8: 0x9d, 0x2e9: 0x9b, 0x2ea: 0x9b, 0x2eb: 0x9e, 0x2ec: 0x9f, 0x2ed: 0x9b, 0x2ee: 0x9b, 0x2ef: 0x9b,
-	0x2f0: 0x9b, 0x2f1: 0x9b, 0x2f2: 0x9b, 0x2f3: 0x9b, 0x2f4: 0x9b, 0x2f5: 0x9b, 0x2f6: 0x9b, 0x2f7: 0x9b,
-	0x2f8: 0x9b, 0x2f9: 0xa0, 0x2fa: 0x9b, 0x2fb: 0x9b, 0x2fc: 0x9b, 0x2fd: 0x9b, 0x2fe: 0x9b, 0x2ff: 0x9b,
-	// Block 0xc, offset 0x300
-	0x300: 0xa1, 0x301: 0xa2, 0x302: 0xa3, 0x304: 0xa4, 0x305: 0xa5, 0x306: 0xa6, 0x307: 0xa7,
-	0x308: 0xa8, 0x30b: 0xa9, 0x30c: 0xaa, 0x30d: 0xab,
-	0x310: 0xac, 0x311: 0xad, 0x312: 0xae, 0x313: 0xaf, 0x316: 0xb0, 0x317: 0xb1,
-	0x318: 0xb2, 0x319: 0xb3, 0x31a: 0xb4, 0x31c: 0xb5,
-	0x330: 0xb6, 0x332: 0xb7,
-	// Block 0xd, offset 0x340
-	0x36b: 0xb8, 0x36c: 0xb9,
-	0x37e: 0xba,
-	// Block 0xe, offset 0x380
-	0x3b2: 0xbb,
-	// Block 0xf, offset 0x3c0
-	0x3c5: 0xbc, 0x3c6: 0xbd,
-	0x3c8: 0x54, 0x3c9: 0xbe, 0x3cc: 0x54, 0x3cd: 0xbf,
-	0x3db: 0xc0, 0x3dc: 0xc1, 0x3dd: 0xc2, 0x3de: 0xc3, 0x3df: 0xc4,
-	0x3e8: 0xc5, 0x3e9: 0xc6, 0x3ea: 0xc7,
-	// Block 0x10, offset 0x400
-	0x400: 0xc8,
-	0x420: 0x9b, 0x421: 0x9b, 0x422: 0x9b, 0x423: 0xc9, 0x424: 0x9b, 0x425: 0xca, 0x426: 0x9b, 0x427: 0x9b,
-	0x428: 0x9b, 0x429: 0x9b, 0x42a: 0x9b, 0x42b: 0x9b, 0x42c: 0x9b, 0x42d: 0x9b, 0x42e: 0x9b, 0x42f: 0x9b,
-	0x430: 0x9b, 0x431: 0x9b, 0x432: 0x9b, 0x433: 0x9b, 0x434: 0x9b, 0x435: 0x9b, 0x436: 0x9b, 0x437: 0x9b,
-	0x438: 0x0e, 0x439: 0x0e, 0x43a: 0x0e, 0x43b: 0xcb, 0x43c: 0x9b, 0x43d: 0x9b, 0x43e: 0x9b, 0x43f: 0x9b,
-	// Block 0x11, offset 0x440
-	0x440: 0xcc, 0x441: 0x54, 0x442: 0xcd, 0x443: 0xce, 0x444: 0xcf, 0x445: 0xd0,
-	0x44c: 0x54, 0x44d: 0x54, 0x44e: 0x54, 0x44f: 0x54,
-	0x450: 0x54, 0x451: 0x54, 0x452: 0x54, 0x453: 0x54, 0x454: 0x54, 0x455: 0x54, 0x456: 0x54, 0x457: 0x54,
-	0x458: 0x54, 0x459: 0x54, 0x45a: 0x54, 0x45b: 0xd1, 0x45c: 0x54, 0x45d: 0x6c, 0x45e: 0x54, 0x45f: 0xd2,
-	0x460: 0xd3, 0x461: 0xd4, 0x462: 0xd5, 0x464: 0xd6, 0x465: 0xd7, 0x466: 0xd8, 0x467: 0x36,
-	0x47f: 0xd9,
-	// Block 0x12, offset 0x480
-	0x4bf: 0xd9,
-	// Block 0x13, offset 0x4c0
-	0x4d0: 0x09, 0x4d1: 0x0a, 0x4d6: 0x0b,
-	0x4db: 0x0c, 0x4dd: 0x0d, 0x4de: 0x0e, 0x4df: 0x0f,
-	0x4ef: 0x10,
-	0x4ff: 0x10,
-	// Block 0x14, offset 0x500
-	0x50f: 0x10,
-	0x51f: 0x10,
-	0x52f: 0x10,
-	0x53f: 0x10,
-	// Block 0x15, offset 0x540
-	0x540: 0xda, 0x541: 0xda, 0x542: 0xda, 0x543: 0xda, 0x544: 0x05, 0x545: 0x05, 0x546: 0x05, 0x547: 0xdb,
-	0x548: 0xda, 0x549: 0xda, 0x54a: 0xda, 0x54b: 0xda, 0x54c: 0xda, 0x54d: 0xda, 0x54e: 0xda, 0x54f: 0xda,
-	0x550: 0xda, 0x551: 0xda, 0x552: 0xda, 0x553: 0xda, 0x554: 0xda, 0x555: 0xda, 0x556: 0xda, 0x557: 0xda,
-	0x558: 0xda, 0x559: 0xda, 0x55a: 0xda, 0x55b: 0xda, 0x55c: 0xda, 0x55d: 0xda, 0x55e: 0xda, 0x55f: 0xda,
-	0x560: 0xda, 0x561: 0xda, 0x562: 0xda, 0x563: 0xda, 0x564: 0xda, 0x565: 0xda, 0x566: 0xda, 0x567: 0xda,
-	0x568: 0xda, 0x569: 0xda, 0x56a: 0xda, 0x56b: 0xda, 0x56c: 0xda, 0x56d: 0xda, 0x56e: 0xda, 0x56f: 0xda,
-	0x570: 0xda, 0x571: 0xda, 0x572: 0xda, 0x573: 0xda, 0x574: 0xda, 0x575: 0xda, 0x576: 0xda, 0x577: 0xda,
-	0x578: 0xda, 0x579: 0xda, 0x57a: 0xda, 0x57b: 0xda, 0x57c: 0xda, 0x57d: 0xda, 0x57e: 0xda, 0x57f: 0xda,
-	// Block 0x16, offset 0x580
-	0x58f: 0x10,
-	0x59f: 0x10,
-	0x5a0: 0x13,
-	0x5af: 0x10,
-	0x5bf: 0x10,
-	// Block 0x17, offset 0x5c0
-	0x5cf: 0x10,
-}
-
-// Total table size 15800 bytes (15KiB); checksum: F50EF68C
diff --git a/vendor/golang.org/x/text/unicode/bidi/trieval.go b/vendor/golang.org/x/text/unicode/bidi/trieval.go
deleted file mode 100644
index 4c459c4b72..0000000000
--- a/vendor/golang.org/x/text/unicode/bidi/trieval.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package bidi
-
-// Class is the Unicode BiDi class. Each rune has a single class.
-type Class uint
-
-const (
-	L       Class = iota // LeftToRight
-	R                    // RightToLeft
-	EN                   // EuropeanNumber
-	ES                   // EuropeanSeparator
-	ET                   // EuropeanTerminator
-	AN                   // ArabicNumber
-	CS                   // CommonSeparator
-	B                    // ParagraphSeparator
-	S                    // SegmentSeparator
-	WS                   // WhiteSpace
-	ON                   // OtherNeutral
-	BN                   // BoundaryNeutral
-	NSM                  // NonspacingMark
-	AL                   // ArabicLetter
-	Control              // Control LRO - PDI
-
-	numClass
-
-	LRO // LeftToRightOverride
-	RLO // RightToLeftOverride
-	LRE // LeftToRightEmbedding
-	RLE // RightToLeftEmbedding
-	PDF // PopDirectionalFormat
-	LRI // LeftToRightIsolate
-	RLI // RightToLeftIsolate
-	FSI // FirstStrongIsolate
-	PDI // PopDirectionalIsolate
-
-	unknownClass = ^Class(0)
-)
-
-var controlToClass = map[rune]Class{
-	0x202D: LRO, // LeftToRightOverride,
-	0x202E: RLO, // RightToLeftOverride,
-	0x202A: LRE, // LeftToRightEmbedding,
-	0x202B: RLE, // RightToLeftEmbedding,
-	0x202C: PDF, // PopDirectionalFormat,
-	0x2066: LRI, // LeftToRightIsolate,
-	0x2067: RLI, // RightToLeftIsolate,
-	0x2068: FSI, // FirstStrongIsolate,
-	0x2069: PDI, // PopDirectionalIsolate,
-}
-
-// A trie entry has the following bits:
-// 7..5  XOR mask for brackets
-// 4     1: Bracket open, 0: Bracket close
-// 3..0  Class type
-
-const (
-	openMask     = 0x10
-	xorMaskShift = 5
-)
diff --git a/vendor/golang.org/x/text/unicode/norm/composition.go b/vendor/golang.org/x/text/unicode/norm/composition.go
deleted file mode 100644
index bab4c5de02..0000000000
--- a/vendor/golang.org/x/text/unicode/norm/composition.go
+++ /dev/null
@@ -1,508 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-import "unicode/utf8"
-
-const (
-	maxNonStarters = 30
-	// The maximum number of characters needed for a buffer is
-	// maxNonStarters + 1 for the starter + 1 for the GCJ
-	maxBufferSize    = maxNonStarters + 2
-	maxNFCExpansion  = 3  // NFC(0x1D160)
-	maxNFKCExpansion = 18 // NFKC(0xFDFA)
-
-	maxByteBufferSize = utf8.UTFMax * maxBufferSize // 128
-)
-
-// ssState is used for reporting the segment state after inserting a rune.
-// It is returned by streamSafe.next.
-type ssState int
-
-const (
-	// Indicates a rune was successfully added to the segment.
-	ssSuccess ssState = iota
-	// Indicates a rune starts a new segment and should not be added.
-	ssStarter
-	// Indicates a rune caused a segment overflow and a CGJ should be inserted.
-	ssOverflow
-)
-
-// streamSafe implements the policy of when a CGJ should be inserted.
-type streamSafe uint8
-
-// first inserts the first rune of a segment. It is a faster version of next if
-// it is known p represents the first rune in a segment.
-func (ss *streamSafe) first(p Properties) {
-	*ss = streamSafe(p.nTrailingNonStarters())
-}
-
-// insert returns a ssState value to indicate whether a rune represented by p
-// can be inserted.
-func (ss *streamSafe) next(p Properties) ssState {
-	if *ss > maxNonStarters {
-		panic("streamSafe was not reset")
-	}
-	n := p.nLeadingNonStarters()
-	if *ss += streamSafe(n); *ss > maxNonStarters {
-		*ss = 0
-		return ssOverflow
-	}
-	// The Stream-Safe Text Processing prescribes that the counting can stop
-	// as soon as a starter is encountered. However, there are some starters,
-	// like Jamo V and T, that can combine with other runes, leaving their
-	// successive non-starters appended to the previous, possibly causing an
-	// overflow. We will therefore consider any rune with a non-zero nLead to
-	// be a non-starter. Note that it always hold that if nLead > 0 then
-	// nLead == nTrail.
-	if n == 0 {
-		*ss = streamSafe(p.nTrailingNonStarters())
-		return ssStarter
-	}
-	return ssSuccess
-}
-
-// backwards is used for checking for overflow and segment starts
-// when traversing a string backwards. Users do not need to call first
-// for the first rune. The state of the streamSafe retains the count of
-// the non-starters loaded.
-func (ss *streamSafe) backwards(p Properties) ssState {
-	if *ss > maxNonStarters {
-		panic("streamSafe was not reset")
-	}
-	c := *ss + streamSafe(p.nTrailingNonStarters())
-	if c > maxNonStarters {
-		return ssOverflow
-	}
-	*ss = c
-	if p.nLeadingNonStarters() == 0 {
-		return ssStarter
-	}
-	return ssSuccess
-}
-
-func (ss streamSafe) isMax() bool {
-	return ss == maxNonStarters
-}
-
-// GraphemeJoiner is inserted after maxNonStarters non-starter runes.
-const GraphemeJoiner = "\u034F"
-
-// reorderBuffer is used to normalize a single segment.  Characters inserted with
-// insert are decomposed and reordered based on CCC. The compose method can
-// be used to recombine characters.  Note that the byte buffer does not hold
-// the UTF-8 characters in order.  Only the rune array is maintained in sorted
-// order. flush writes the resulting segment to a byte array.
-type reorderBuffer struct {
-	rune  [maxBufferSize]Properties // Per character info.
-	byte  [maxByteBufferSize]byte   // UTF-8 buffer. Referenced by runeInfo.pos.
-	nbyte uint8                     // Number or bytes.
-	ss    streamSafe                // For limiting length of non-starter sequence.
-	nrune int                       // Number of runeInfos.
-	f     formInfo
-
-	src      input
-	nsrc     int
-	tmpBytes input
-
-	out    []byte
-	flushF func(*reorderBuffer) bool
-}
-
-func (rb *reorderBuffer) init(f Form, src []byte) {
-	rb.f = *formTable[f]
-	rb.src.setBytes(src)
-	rb.nsrc = len(src)
-	rb.ss = 0
-}
-
-func (rb *reorderBuffer) initString(f Form, src string) {
-	rb.f = *formTable[f]
-	rb.src.setString(src)
-	rb.nsrc = len(src)
-	rb.ss = 0
-}
-
-func (rb *reorderBuffer) setFlusher(out []byte, f func(*reorderBuffer) bool) {
-	rb.out = out
-	rb.flushF = f
-}
-
-// reset discards all characters from the buffer.
-func (rb *reorderBuffer) reset() {
-	rb.nrune = 0
-	rb.nbyte = 0
-}
-
-func (rb *reorderBuffer) doFlush() bool {
-	if rb.f.composing {
-		rb.compose()
-	}
-	res := rb.flushF(rb)
-	rb.reset()
-	return res
-}
-
-// appendFlush appends the normalized segment to rb.out.
-func appendFlush(rb *reorderBuffer) bool {
-	for i := 0; i < rb.nrune; i++ {
-		start := rb.rune[i].pos
-		end := start + rb.rune[i].size
-		rb.out = append(rb.out, rb.byte[start:end]...)
-	}
-	return true
-}
-
-// flush appends the normalized segment to out and resets rb.
-func (rb *reorderBuffer) flush(out []byte) []byte {
-	for i := 0; i < rb.nrune; i++ {
-		start := rb.rune[i].pos
-		end := start + rb.rune[i].size
-		out = append(out, rb.byte[start:end]...)
-	}
-	rb.reset()
-	return out
-}
-
-// flushCopy copies the normalized segment to buf and resets rb.
-// It returns the number of bytes written to buf.
-func (rb *reorderBuffer) flushCopy(buf []byte) int {
-	p := 0
-	for i := 0; i < rb.nrune; i++ {
-		runep := rb.rune[i]
-		p += copy(buf[p:], rb.byte[runep.pos:runep.pos+runep.size])
-	}
-	rb.reset()
-	return p
-}
-
-// insertOrdered inserts a rune in the buffer, ordered by Canonical Combining Class.
-// It returns false if the buffer is not large enough to hold the rune.
-// It is used internally by insert and insertString only.
-func (rb *reorderBuffer) insertOrdered(info Properties) {
-	n := rb.nrune
-	b := rb.rune[:]
-	cc := info.ccc
-	if cc > 0 {
-		// Find insertion position + move elements to make room.
-		for ; n > 0; n-- {
-			if b[n-1].ccc <= cc {
-				break
-			}
-			b[n] = b[n-1]
-		}
-	}
-	rb.nrune += 1
-	pos := uint8(rb.nbyte)
-	rb.nbyte += utf8.UTFMax
-	info.pos = pos
-	b[n] = info
-}
-
-// insertErr is an error code returned by insert. Using this type instead
-// of error improves performance up to 20% for many of the benchmarks.
-type insertErr int
-
-const (
-	iSuccess insertErr = -iota
-	iShortDst
-	iShortSrc
-)
-
-// insertFlush inserts the given rune in the buffer ordered by CCC.
-// If a decomposition with multiple segments are encountered, they leading
-// ones are flushed.
-// It returns a non-zero error code if the rune was not inserted.
-func (rb *reorderBuffer) insertFlush(src input, i int, info Properties) insertErr {
-	if rune := src.hangul(i); rune != 0 {
-		rb.decomposeHangul(rune)
-		return iSuccess
-	}
-	if info.hasDecomposition() {
-		return rb.insertDecomposed(info.Decomposition())
-	}
-	rb.insertSingle(src, i, info)
-	return iSuccess
-}
-
-// insertUnsafe inserts the given rune in the buffer ordered by CCC.
-// It is assumed there is sufficient space to hold the runes. It is the
-// responsibility of the caller to ensure this. This can be done by checking
-// the state returned by the streamSafe type.
-func (rb *reorderBuffer) insertUnsafe(src input, i int, info Properties) {
-	if rune := src.hangul(i); rune != 0 {
-		rb.decomposeHangul(rune)
-	}
-	if info.hasDecomposition() {
-		// TODO: inline.
-		rb.insertDecomposed(info.Decomposition())
-	} else {
-		rb.insertSingle(src, i, info)
-	}
-}
-
-// insertDecomposed inserts an entry in to the reorderBuffer for each rune
-// in dcomp. dcomp must be a sequence of decomposed UTF-8-encoded runes.
-// It flushes the buffer on each new segment start.
-func (rb *reorderBuffer) insertDecomposed(dcomp []byte) insertErr {
-	rb.tmpBytes.setBytes(dcomp)
-	// As the streamSafe accounting already handles the counting for modifiers,
-	// we don't have to call next. However, we do need to keep the accounting
-	// intact when flushing the buffer.
-	for i := 0; i < len(dcomp); {
-		info := rb.f.info(rb.tmpBytes, i)
-		if info.BoundaryBefore() && rb.nrune > 0 && !rb.doFlush() {
-			return iShortDst
-		}
-		i += copy(rb.byte[rb.nbyte:], dcomp[i:i+int(info.size)])
-		rb.insertOrdered(info)
-	}
-	return iSuccess
-}
-
-// insertSingle inserts an entry in the reorderBuffer for the rune at
-// position i. info is the runeInfo for the rune at position i.
-func (rb *reorderBuffer) insertSingle(src input, i int, info Properties) {
-	src.copySlice(rb.byte[rb.nbyte:], i, i+int(info.size))
-	rb.insertOrdered(info)
-}
-
-// insertCGJ inserts a Combining Grapheme Joiner (0x034f) into rb.
-func (rb *reorderBuffer) insertCGJ() {
-	rb.insertSingle(input{str: GraphemeJoiner}, 0, Properties{size: uint8(len(GraphemeJoiner))})
-}
-
-// appendRune inserts a rune at the end of the buffer. It is used for Hangul.
-func (rb *reorderBuffer) appendRune(r rune) {
-	bn := rb.nbyte
-	sz := utf8.EncodeRune(rb.byte[bn:], rune(r))
-	rb.nbyte += utf8.UTFMax
-	rb.rune[rb.nrune] = Properties{pos: bn, size: uint8(sz)}
-	rb.nrune++
-}
-
-// assignRune sets a rune at position pos. It is used for Hangul and recomposition.
-func (rb *reorderBuffer) assignRune(pos int, r rune) {
-	bn := rb.rune[pos].pos
-	sz := utf8.EncodeRune(rb.byte[bn:], rune(r))
-	rb.rune[pos] = Properties{pos: bn, size: uint8(sz)}
-}
-
-// runeAt returns the rune at position n. It is used for Hangul and recomposition.
-func (rb *reorderBuffer) runeAt(n int) rune {
-	inf := rb.rune[n]
-	r, _ := utf8.DecodeRune(rb.byte[inf.pos : inf.pos+inf.size])
-	return r
-}
-
-// bytesAt returns the UTF-8 encoding of the rune at position n.
-// It is used for Hangul and recomposition.
-func (rb *reorderBuffer) bytesAt(n int) []byte {
-	inf := rb.rune[n]
-	return rb.byte[inf.pos : int(inf.pos)+int(inf.size)]
-}
-
-// For Hangul we combine algorithmically, instead of using tables.
-const (
-	hangulBase  = 0xAC00 // UTF-8(hangulBase) -> EA B0 80
-	hangulBase0 = 0xEA
-	hangulBase1 = 0xB0
-	hangulBase2 = 0x80
-
-	hangulEnd  = hangulBase + jamoLVTCount // UTF-8(0xD7A4) -> ED 9E A4
-	hangulEnd0 = 0xED
-	hangulEnd1 = 0x9E
-	hangulEnd2 = 0xA4
-
-	jamoLBase  = 0x1100 // UTF-8(jamoLBase) -> E1 84 00
-	jamoLBase0 = 0xE1
-	jamoLBase1 = 0x84
-	jamoLEnd   = 0x1113
-	jamoVBase  = 0x1161
-	jamoVEnd   = 0x1176
-	jamoTBase  = 0x11A7
-	jamoTEnd   = 0x11C3
-
-	jamoTCount   = 28
-	jamoVCount   = 21
-	jamoVTCount  = 21 * 28
-	jamoLVTCount = 19 * 21 * 28
-)
-
-const hangulUTF8Size = 3
-
-func isHangul(b []byte) bool {
-	if len(b) < hangulUTF8Size {
-		return false
-	}
-	b0 := b[0]
-	if b0 < hangulBase0 {
-		return false
-	}
-	b1 := b[1]
-	switch {
-	case b0 == hangulBase0:
-		return b1 >= hangulBase1
-	case b0 < hangulEnd0:
-		return true
-	case b0 > hangulEnd0:
-		return false
-	case b1 < hangulEnd1:
-		return true
-	}
-	return b1 == hangulEnd1 && b[2] < hangulEnd2
-}
-
-func isHangulString(b string) bool {
-	if len(b) < hangulUTF8Size {
-		return false
-	}
-	b0 := b[0]
-	if b0 < hangulBase0 {
-		return false
-	}
-	b1 := b[1]
-	switch {
-	case b0 == hangulBase0:
-		return b1 >= hangulBase1
-	case b0 < hangulEnd0:
-		return true
-	case b0 > hangulEnd0:
-		return false
-	case b1 < hangulEnd1:
-		return true
-	}
-	return b1 == hangulEnd1 && b[2] < hangulEnd2
-}
-
-// Caller must ensure len(b) >= 2.
-func isJamoVT(b []byte) bool {
-	// True if (rune & 0xff00) == jamoLBase
-	return b[0] == jamoLBase0 && (b[1]&0xFC) == jamoLBase1
-}
-
-func isHangulWithoutJamoT(b []byte) bool {
-	c, _ := utf8.DecodeRune(b)
-	c -= hangulBase
-	return c < jamoLVTCount && c%jamoTCount == 0
-}
-
-// decomposeHangul writes the decomposed Hangul to buf and returns the number
-// of bytes written.  len(buf) should be at least 9.
-func decomposeHangul(buf []byte, r rune) int {
-	const JamoUTF8Len = 3
-	r -= hangulBase
-	x := r % jamoTCount
-	r /= jamoTCount
-	utf8.EncodeRune(buf, jamoLBase+r/jamoVCount)
-	utf8.EncodeRune(buf[JamoUTF8Len:], jamoVBase+r%jamoVCount)
-	if x != 0 {
-		utf8.EncodeRune(buf[2*JamoUTF8Len:], jamoTBase+x)
-		return 3 * JamoUTF8Len
-	}
-	return 2 * JamoUTF8Len
-}
-
-// decomposeHangul algorithmically decomposes a Hangul rune into
-// its Jamo components.
-// See http://unicode.org/reports/tr15/#Hangul for details on decomposing Hangul.
-func (rb *reorderBuffer) decomposeHangul(r rune) {
-	r -= hangulBase
-	x := r % jamoTCount
-	r /= jamoTCount
-	rb.appendRune(jamoLBase + r/jamoVCount)
-	rb.appendRune(jamoVBase + r%jamoVCount)
-	if x != 0 {
-		rb.appendRune(jamoTBase + x)
-	}
-}
-
-// combineHangul algorithmically combines Jamo character components into Hangul.
-// See http://unicode.org/reports/tr15/#Hangul for details on combining Hangul.
-func (rb *reorderBuffer) combineHangul(s, i, k int) {
-	b := rb.rune[:]
-	bn := rb.nrune
-	for ; i < bn; i++ {
-		cccB := b[k-1].ccc
-		cccC := b[i].ccc
-		if cccB == 0 {
-			s = k - 1
-		}
-		if s != k-1 && cccB >= cccC {
-			// b[i] is blocked by greater-equal cccX below it
-			b[k] = b[i]
-			k++
-		} else {
-			l := rb.runeAt(s) // also used to compare to hangulBase
-			v := rb.runeAt(i) // also used to compare to jamoT
-			switch {
-			case jamoLBase <= l && l < jamoLEnd &&
-				jamoVBase <= v && v < jamoVEnd:
-				// 11xx plus 116x to LV
-				rb.assignRune(s, hangulBase+
-					(l-jamoLBase)*jamoVTCount+(v-jamoVBase)*jamoTCount)
-			case hangulBase <= l && l < hangulEnd &&
-				jamoTBase < v && v < jamoTEnd &&
-				((l-hangulBase)%jamoTCount) == 0:
-				// ACxx plus 11Ax to LVT
-				rb.assignRune(s, l+v-jamoTBase)
-			default:
-				b[k] = b[i]
-				k++
-			}
-		}
-	}
-	rb.nrune = k
-}
-
-// compose recombines the runes in the buffer.
-// It should only be used to recompose a single segment, as it will not
-// handle alternations between Hangul and non-Hangul characters correctly.
-func (rb *reorderBuffer) compose() {
-	// UAX #15, section X5 , including Corrigendum #5
-	// "In any character sequence beginning with starter S, a character C is
-	//  blocked from S if and only if there is some character B between S
-	//  and C, and either B is a starter or it has the same or higher
-	//  combining class as C."
-	bn := rb.nrune
-	if bn == 0 {
-		return
-	}
-	k := 1
-	b := rb.rune[:]
-	for s, i := 0, 1; i < bn; i++ {
-		if isJamoVT(rb.bytesAt(i)) {
-			// Redo from start in Hangul mode. Necessary to support
-			// U+320E..U+321E in NFKC mode.
-			rb.combineHangul(s, i, k)
-			return
-		}
-		ii := b[i]
-		// We can only use combineForward as a filter if we later
-		// get the info for the combined character. This is more
-		// expensive than using the filter. Using combinesBackward()
-		// is safe.
-		if ii.combinesBackward() {
-			cccB := b[k-1].ccc
-			cccC := ii.ccc
-			blocked := false // b[i] blocked by starter or greater or equal CCC?
-			if cccB == 0 {
-				s = k - 1
-			} else {
-				blocked = s != k-1 && cccB >= cccC
-			}
-			if !blocked {
-				combined := combine(rb.runeAt(s), rb.runeAt(i))
-				if combined != 0 {
-					rb.assignRune(s, combined)
-					continue
-				}
-			}
-		}
-		b[k] = b[i]
-		k++
-	}
-	rb.nrune = k
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/forminfo.go b/vendor/golang.org/x/text/unicode/norm/forminfo.go
deleted file mode 100644
index e67e7655c5..0000000000
--- a/vendor/golang.org/x/text/unicode/norm/forminfo.go
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-// This file contains Form-specific logic and wrappers for data in tables.go.
-
-// Rune info is stored in a separate trie per composing form. A composing form
-// and its corresponding decomposing form share the same trie.  Each trie maps
-// a rune to a uint16. The values take two forms.  For v >= 0x8000:
-//   bits
-//   15:    1 (inverse of NFD_QC bit of qcInfo)
-//   13..7: qcInfo (see below). isYesD is always true (no decompostion).
-//    6..0: ccc (compressed CCC value).
-// For v < 0x8000, the respective rune has a decomposition and v is an index
-// into a byte array of UTF-8 decomposition sequences and additional info and
-// has the form:
-//    <header> <decomp_byte>* [<tccc> [<lccc>]]
-// The header contains the number of bytes in the decomposition (excluding this
-// length byte). The two most significant bits of this length byte correspond
-// to bit 5 and 4 of qcInfo (see below).  The byte sequence itself starts at v+1.
-// The byte sequence is followed by a trailing and leading CCC if the values
-// for these are not zero.  The value of v determines which ccc are appended
-// to the sequences.  For v < firstCCC, there are none, for v >= firstCCC,
-// the sequence is followed by a trailing ccc, and for v >= firstLeadingCC
-// there is an additional leading ccc. The value of tccc itself is the
-// trailing CCC shifted left 2 bits. The two least-significant bits of tccc
-// are the number of trailing non-starters.
-
-const (
-	qcInfoMask      = 0x3F // to clear all but the relevant bits in a qcInfo
-	headerLenMask   = 0x3F // extract the length value from the header byte
-	headerFlagsMask = 0xC0 // extract the qcInfo bits from the header byte
-)
-
-// Properties provides access to normalization properties of a rune.
-type Properties struct {
-	pos   uint8  // start position in reorderBuffer; used in composition.go
-	size  uint8  // length of UTF-8 encoding of this rune
-	ccc   uint8  // leading canonical combining class (ccc if not decomposition)
-	tccc  uint8  // trailing canonical combining class (ccc if not decomposition)
-	nLead uint8  // number of leading non-starters.
-	flags qcInfo // quick check flags
-	index uint16
-}
-
-// functions dispatchable per form
-type lookupFunc func(b input, i int) Properties
-
-// formInfo holds Form-specific functions and tables.
-type formInfo struct {
-	form                     Form
-	composing, compatibility bool // form type
-	info                     lookupFunc
-	nextMain                 iterFunc
-}
-
-var formTable = []*formInfo{{
-	form:          NFC,
-	composing:     true,
-	compatibility: false,
-	info:          lookupInfoNFC,
-	nextMain:      nextComposed,
-}, {
-	form:          NFD,
-	composing:     false,
-	compatibility: false,
-	info:          lookupInfoNFC,
-	nextMain:      nextDecomposed,
-}, {
-	form:          NFKC,
-	composing:     true,
-	compatibility: true,
-	info:          lookupInfoNFKC,
-	nextMain:      nextComposed,
-}, {
-	form:          NFKD,
-	composing:     false,
-	compatibility: true,
-	info:          lookupInfoNFKC,
-	nextMain:      nextDecomposed,
-}}
-
-// We do not distinguish between boundaries for NFC, NFD, etc. to avoid
-// unexpected behavior for the user.  For example, in NFD, there is a boundary
-// after 'a'.  However, 'a' might combine with modifiers, so from the application's
-// perspective it is not a good boundary. We will therefore always use the
-// boundaries for the combining variants.
-
-// BoundaryBefore returns true if this rune starts a new segment and
-// cannot combine with any rune on the left.
-func (p Properties) BoundaryBefore() bool {
-	if p.ccc == 0 && !p.combinesBackward() {
-		return true
-	}
-	// We assume that the CCC of the first character in a decomposition
-	// is always non-zero if different from info.ccc and that we can return
-	// false at this point. This is verified by maketables.
-	return false
-}
-
-// BoundaryAfter returns true if runes cannot combine with or otherwise
-// interact with this or previous runes.
-func (p Properties) BoundaryAfter() bool {
-	// TODO: loosen these conditions.
-	return p.isInert()
-}
-
-// We pack quick check data in 4 bits:
-//   5:    Combines forward  (0 == false, 1 == true)
-//   4..3: NFC_QC Yes(00), No (10), or Maybe (11)
-//   2:    NFD_QC Yes (0) or No (1). No also means there is a decomposition.
-//   1..0: Number of trailing non-starters.
-//
-// When all 4 bits are zero, the character is inert, meaning it is never
-// influenced by normalization.
-type qcInfo uint8
-
-func (p Properties) isYesC() bool { return p.flags&0x10 == 0 }
-func (p Properties) isYesD() bool { return p.flags&0x4 == 0 }
-
-func (p Properties) combinesForward() bool  { return p.flags&0x20 != 0 }
-func (p Properties) combinesBackward() bool { return p.flags&0x8 != 0 } // == isMaybe
-func (p Properties) hasDecomposition() bool { return p.flags&0x4 != 0 } // == isNoD
-
-func (p Properties) isInert() bool {
-	return p.flags&qcInfoMask == 0 && p.ccc == 0
-}
-
-func (p Properties) multiSegment() bool {
-	return p.index >= firstMulti && p.index < endMulti
-}
-
-func (p Properties) nLeadingNonStarters() uint8 {
-	return p.nLead
-}
-
-func (p Properties) nTrailingNonStarters() uint8 {
-	return uint8(p.flags & 0x03)
-}
-
-// Decomposition returns the decomposition for the underlying rune
-// or nil if there is none.
-func (p Properties) Decomposition() []byte {
-	// TODO: create the decomposition for Hangul?
-	if p.index == 0 {
-		return nil
-	}
-	i := p.index
-	n := decomps[i] & headerLenMask
-	i++
-	return decomps[i : i+uint16(n)]
-}
-
-// Size returns the length of UTF-8 encoding of the rune.
-func (p Properties) Size() int {
-	return int(p.size)
-}
-
-// CCC returns the canonical combining class of the underlying rune.
-func (p Properties) CCC() uint8 {
-	if p.index >= firstCCCZeroExcept {
-		return 0
-	}
-	return ccc[p.ccc]
-}
-
-// LeadCCC returns the CCC of the first rune in the decomposition.
-// If there is no decomposition, LeadCCC equals CCC.
-func (p Properties) LeadCCC() uint8 {
-	return ccc[p.ccc]
-}
-
-// TrailCCC returns the CCC of the last rune in the decomposition.
-// If there is no decomposition, TrailCCC equals CCC.
-func (p Properties) TrailCCC() uint8 {
-	return ccc[p.tccc]
-}
-
-// Recomposition
-// We use 32-bit keys instead of 64-bit for the two codepoint keys.
-// This clips off the bits of three entries, but we know this will not
-// result in a collision. In the unlikely event that changes to
-// UnicodeData.txt introduce collisions, the compiler will catch it.
-// Note that the recomposition map for NFC and NFKC are identical.
-
-// combine returns the combined rune or 0 if it doesn't exist.
-func combine(a, b rune) rune {
-	key := uint32(uint16(a))<<16 + uint32(uint16(b))
-	return recompMap[key]
-}
-
-func lookupInfoNFC(b input, i int) Properties {
-	v, sz := b.charinfoNFC(i)
-	return compInfo(v, sz)
-}
-
-func lookupInfoNFKC(b input, i int) Properties {
-	v, sz := b.charinfoNFKC(i)
-	return compInfo(v, sz)
-}
-
-// Properties returns properties for the first rune in s.
-func (f Form) Properties(s []byte) Properties {
-	if f == NFC || f == NFD {
-		return compInfo(nfcData.lookup(s))
-	}
-	return compInfo(nfkcData.lookup(s))
-}
-
-// PropertiesString returns properties for the first rune in s.
-func (f Form) PropertiesString(s string) Properties {
-	if f == NFC || f == NFD {
-		return compInfo(nfcData.lookupString(s))
-	}
-	return compInfo(nfkcData.lookupString(s))
-}
-
-// compInfo converts the information contained in v and sz
-// to a Properties.  See the comment at the top of the file
-// for more information on the format.
-func compInfo(v uint16, sz int) Properties {
-	if v == 0 {
-		return Properties{size: uint8(sz)}
-	} else if v >= 0x8000 {
-		p := Properties{
-			size:  uint8(sz),
-			ccc:   uint8(v),
-			tccc:  uint8(v),
-			flags: qcInfo(v >> 8),
-		}
-		if p.ccc > 0 || p.combinesBackward() {
-			p.nLead = uint8(p.flags & 0x3)
-		}
-		return p
-	}
-	// has decomposition
-	h := decomps[v]
-	f := (qcInfo(h&headerFlagsMask) >> 2) | 0x4
-	p := Properties{size: uint8(sz), flags: f, index: v}
-	if v >= firstCCC {
-		v += uint16(h&headerLenMask) + 1
-		c := decomps[v]
-		p.tccc = c >> 2
-		p.flags |= qcInfo(c & 0x3)
-		if v >= firstLeadingCCC {
-			p.nLead = c & 0x3
-			if v >= firstStarterWithNLead {
-				// We were tricked. Remove the decomposition.
-				p.flags &= 0x03
-				p.index = 0
-				return p
-			}
-			p.ccc = decomps[v+1]
-		}
-	}
-	return p
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/input.go b/vendor/golang.org/x/text/unicode/norm/input.go
deleted file mode 100644
index 479e35bc25..0000000000
--- a/vendor/golang.org/x/text/unicode/norm/input.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-import "unicode/utf8"
-
-type input struct {
-	str   string
-	bytes []byte
-}
-
-func inputBytes(str []byte) input {
-	return input{bytes: str}
-}
-
-func inputString(str string) input {
-	return input{str: str}
-}
-
-func (in *input) setBytes(str []byte) {
-	in.str = ""
-	in.bytes = str
-}
-
-func (in *input) setString(str string) {
-	in.str = str
-	in.bytes = nil
-}
-
-func (in *input) _byte(p int) byte {
-	if in.bytes == nil {
-		return in.str[p]
-	}
-	return in.bytes[p]
-}
-
-func (in *input) skipASCII(p, max int) int {
-	if in.bytes == nil {
-		for ; p < max && in.str[p] < utf8.RuneSelf; p++ {
-		}
-	} else {
-		for ; p < max && in.bytes[p] < utf8.RuneSelf; p++ {
-		}
-	}
-	return p
-}
-
-func (in *input) skipContinuationBytes(p int) int {
-	if in.bytes == nil {
-		for ; p < len(in.str) && !utf8.RuneStart(in.str[p]); p++ {
-		}
-	} else {
-		for ; p < len(in.bytes) && !utf8.RuneStart(in.bytes[p]); p++ {
-		}
-	}
-	return p
-}
-
-func (in *input) appendSlice(buf []byte, b, e int) []byte {
-	if in.bytes != nil {
-		return append(buf, in.bytes[b:e]...)
-	}
-	for i := b; i < e; i++ {
-		buf = append(buf, in.str[i])
-	}
-	return buf
-}
-
-func (in *input) copySlice(buf []byte, b, e int) int {
-	if in.bytes == nil {
-		return copy(buf, in.str[b:e])
-	}
-	return copy(buf, in.bytes[b:e])
-}
-
-func (in *input) charinfoNFC(p int) (uint16, int) {
-	if in.bytes == nil {
-		return nfcData.lookupString(in.str[p:])
-	}
-	return nfcData.lookup(in.bytes[p:])
-}
-
-func (in *input) charinfoNFKC(p int) (uint16, int) {
-	if in.bytes == nil {
-		return nfkcData.lookupString(in.str[p:])
-	}
-	return nfkcData.lookup(in.bytes[p:])
-}
-
-func (in *input) hangul(p int) (r rune) {
-	var size int
-	if in.bytes == nil {
-		if !isHangulString(in.str[p:]) {
-			return 0
-		}
-		r, size = utf8.DecodeRuneInString(in.str[p:])
-	} else {
-		if !isHangul(in.bytes[p:]) {
-			return 0
-		}
-		r, size = utf8.DecodeRune(in.bytes[p:])
-	}
-	if size != hangulUTF8Size {
-		return 0
-	}
-	return r
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/iter.go b/vendor/golang.org/x/text/unicode/norm/iter.go
deleted file mode 100644
index ce17f96c2e..0000000000
--- a/vendor/golang.org/x/text/unicode/norm/iter.go
+++ /dev/null
@@ -1,457 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-import (
-	"fmt"
-	"unicode/utf8"
-)
-
-// MaxSegmentSize is the maximum size of a byte buffer needed to consider any
-// sequence of starter and non-starter runes for the purpose of normalization.
-const MaxSegmentSize = maxByteBufferSize
-
-// An Iter iterates over a string or byte slice, while normalizing it
-// to a given Form.
-type Iter struct {
-	rb     reorderBuffer
-	buf    [maxByteBufferSize]byte
-	info   Properties // first character saved from previous iteration
-	next   iterFunc   // implementation of next depends on form
-	asciiF iterFunc
-
-	p        int    // current position in input source
-	multiSeg []byte // remainder of multi-segment decomposition
-}
-
-type iterFunc func(*Iter) []byte
-
-// Init initializes i to iterate over src after normalizing it to Form f.
-func (i *Iter) Init(f Form, src []byte) {
-	i.p = 0
-	if len(src) == 0 {
-		i.setDone()
-		i.rb.nsrc = 0
-		return
-	}
-	i.multiSeg = nil
-	i.rb.init(f, src)
-	i.next = i.rb.f.nextMain
-	i.asciiF = nextASCIIBytes
-	i.info = i.rb.f.info(i.rb.src, i.p)
-	i.rb.ss.first(i.info)
-}
-
-// InitString initializes i to iterate over src after normalizing it to Form f.
-func (i *Iter) InitString(f Form, src string) {
-	i.p = 0
-	if len(src) == 0 {
-		i.setDone()
-		i.rb.nsrc = 0
-		return
-	}
-	i.multiSeg = nil
-	i.rb.initString(f, src)
-	i.next = i.rb.f.nextMain
-	i.asciiF = nextASCIIString
-	i.info = i.rb.f.info(i.rb.src, i.p)
-	i.rb.ss.first(i.info)
-}
-
-// Seek sets the segment to be returned by the next call to Next to start
-// at position p.  It is the responsibility of the caller to set p to the
-// start of a segment.
-func (i *Iter) Seek(offset int64, whence int) (int64, error) {
-	var abs int64
-	switch whence {
-	case 0:
-		abs = offset
-	case 1:
-		abs = int64(i.p) + offset
-	case 2:
-		abs = int64(i.rb.nsrc) + offset
-	default:
-		return 0, fmt.Errorf("norm: invalid whence")
-	}
-	if abs < 0 {
-		return 0, fmt.Errorf("norm: negative position")
-	}
-	if int(abs) >= i.rb.nsrc {
-		i.setDone()
-		return int64(i.p), nil
-	}
-	i.p = int(abs)
-	i.multiSeg = nil
-	i.next = i.rb.f.nextMain
-	i.info = i.rb.f.info(i.rb.src, i.p)
-	i.rb.ss.first(i.info)
-	return abs, nil
-}
-
-// returnSlice returns a slice of the underlying input type as a byte slice.
-// If the underlying is of type []byte, it will simply return a slice.
-// If the underlying is of type string, it will copy the slice to the buffer
-// and return that.
-func (i *Iter) returnSlice(a, b int) []byte {
-	if i.rb.src.bytes == nil {
-		return i.buf[:copy(i.buf[:], i.rb.src.str[a:b])]
-	}
-	return i.rb.src.bytes[a:b]
-}
-
-// Pos returns the byte position at which the next call to Next will commence processing.
-func (i *Iter) Pos() int {
-	return i.p
-}
-
-func (i *Iter) setDone() {
-	i.next = nextDone
-	i.p = i.rb.nsrc
-}
-
-// Done returns true if there is no more input to process.
-func (i *Iter) Done() bool {
-	return i.p >= i.rb.nsrc
-}
-
-// Next returns f(i.input[i.Pos():n]), where n is a boundary of i.input.
-// For any input a and b for which f(a) == f(b), subsequent calls
-// to Next will return the same segments.
-// Modifying runes are grouped together with the preceding starter, if such a starter exists.
-// Although not guaranteed, n will typically be the smallest possible n.
-func (i *Iter) Next() []byte {
-	return i.next(i)
-}
-
-func nextASCIIBytes(i *Iter) []byte {
-	p := i.p + 1
-	if p >= i.rb.nsrc {
-		i.setDone()
-		return i.rb.src.bytes[i.p:p]
-	}
-	if i.rb.src.bytes[p] < utf8.RuneSelf {
-		p0 := i.p
-		i.p = p
-		return i.rb.src.bytes[p0:p]
-	}
-	i.info = i.rb.f.info(i.rb.src, i.p)
-	i.next = i.rb.f.nextMain
-	return i.next(i)
-}
-
-func nextASCIIString(i *Iter) []byte {
-	p := i.p + 1
-	if p >= i.rb.nsrc {
-		i.buf[0] = i.rb.src.str[i.p]
-		i.setDone()
-		return i.buf[:1]
-	}
-	if i.rb.src.str[p] < utf8.RuneSelf {
-		i.buf[0] = i.rb.src.str[i.p]
-		i.p = p
-		return i.buf[:1]
-	}
-	i.info = i.rb.f.info(i.rb.src, i.p)
-	i.next = i.rb.f.nextMain
-	return i.next(i)
-}
-
-func nextHangul(i *Iter) []byte {
-	p := i.p
-	next := p + hangulUTF8Size
-	if next >= i.rb.nsrc {
-		i.setDone()
-	} else if i.rb.src.hangul(next) == 0 {
-		i.rb.ss.next(i.info)
-		i.info = i.rb.f.info(i.rb.src, i.p)
-		i.next = i.rb.f.nextMain
-		return i.next(i)
-	}
-	i.p = next
-	return i.buf[:decomposeHangul(i.buf[:], i.rb.src.hangul(p))]
-}
-
-func nextDone(i *Iter) []byte {
-	return nil
-}
-
-// nextMulti is used for iterating over multi-segment decompositions
-// for decomposing normal forms.
-func nextMulti(i *Iter) []byte {
-	j := 0
-	d := i.multiSeg
-	// skip first rune
-	for j = 1; j < len(d) && !utf8.RuneStart(d[j]); j++ {
-	}
-	for j < len(d) {
-		info := i.rb.f.info(input{bytes: d}, j)
-		if info.BoundaryBefore() {
-			i.multiSeg = d[j:]
-			return d[:j]
-		}
-		j += int(info.size)
-	}
-	// treat last segment as normal decomposition
-	i.next = i.rb.f.nextMain
-	return i.next(i)
-}
-
-// nextMultiNorm is used for iterating over multi-segment decompositions
-// for composing normal forms.
-func nextMultiNorm(i *Iter) []byte {
-	j := 0
-	d := i.multiSeg
-	for j < len(d) {
-		info := i.rb.f.info(input{bytes: d}, j)
-		if info.BoundaryBefore() {
-			i.rb.compose()
-			seg := i.buf[:i.rb.flushCopy(i.buf[:])]
-			i.rb.insertUnsafe(input{bytes: d}, j, info)
-			i.multiSeg = d[j+int(info.size):]
-			return seg
-		}
-		i.rb.insertUnsafe(input{bytes: d}, j, info)
-		j += int(info.size)
-	}
-	i.multiSeg = nil
-	i.next = nextComposed
-	return doNormComposed(i)
-}
-
-// nextDecomposed is the implementation of Next for forms NFD and NFKD.
-func nextDecomposed(i *Iter) (next []byte) {
-	outp := 0
-	inCopyStart, outCopyStart := i.p, 0
-	for {
-		if sz := int(i.info.size); sz <= 1 {
-			i.rb.ss = 0
-			p := i.p
-			i.p++ // ASCII or illegal byte.  Either way, advance by 1.
-			if i.p >= i.rb.nsrc {
-				i.setDone()
-				return i.returnSlice(p, i.p)
-			} else if i.rb.src._byte(i.p) < utf8.RuneSelf {
-				i.next = i.asciiF
-				return i.returnSlice(p, i.p)
-			}
-			outp++
-		} else if d := i.info.Decomposition(); d != nil {
-			// Note: If leading CCC != 0, then len(d) == 2 and last is also non-zero.
-			// Case 1: there is a leftover to copy.  In this case the decomposition
-			// must begin with a modifier and should always be appended.
-			// Case 2: no leftover. Simply return d if followed by a ccc == 0 value.
-			p := outp + len(d)
-			if outp > 0 {
-				i.rb.src.copySlice(i.buf[outCopyStart:], inCopyStart, i.p)
-				// TODO: this condition should not be possible, but we leave it
-				// in for defensive purposes.
-				if p > len(i.buf) {
-					return i.buf[:outp]
-				}
-			} else if i.info.multiSegment() {
-				// outp must be 0 as multi-segment decompositions always
-				// start a new segment.
-				if i.multiSeg == nil {
-					i.multiSeg = d
-					i.next = nextMulti
-					return nextMulti(i)
-				}
-				// We are in the last segment.  Treat as normal decomposition.
-				d = i.multiSeg
-				i.multiSeg = nil
-				p = len(d)
-			}
-			prevCC := i.info.tccc
-			if i.p += sz; i.p >= i.rb.nsrc {
-				i.setDone()
-				i.info = Properties{} // Force BoundaryBefore to succeed.
-			} else {
-				i.info = i.rb.f.info(i.rb.src, i.p)
-			}
-			switch i.rb.ss.next(i.info) {
-			case ssOverflow:
-				i.next = nextCGJDecompose
-				fallthrough
-			case ssStarter:
-				if outp > 0 {
-					copy(i.buf[outp:], d)
-					return i.buf[:p]
-				}
-				return d
-			}
-			copy(i.buf[outp:], d)
-			outp = p
-			inCopyStart, outCopyStart = i.p, outp
-			if i.info.ccc < prevCC {
-				goto doNorm
-			}
-			continue
-		} else if r := i.rb.src.hangul(i.p); r != 0 {
-			outp = decomposeHangul(i.buf[:], r)
-			i.p += hangulUTF8Size
-			inCopyStart, outCopyStart = i.p, outp
-			if i.p >= i.rb.nsrc {
-				i.setDone()
-				break
-			} else if i.rb.src.hangul(i.p) != 0 {
-				i.next = nextHangul
-				return i.buf[:outp]
-			}
-		} else {
-			p := outp + sz
-			if p > len(i.buf) {
-				break
-			}
-			outp = p
-			i.p += sz
-		}
-		if i.p >= i.rb.nsrc {
-			i.setDone()
-			break
-		}
-		prevCC := i.info.tccc
-		i.info = i.rb.f.info(i.rb.src, i.p)
-		if v := i.rb.ss.next(i.info); v == ssStarter {
-			break
-		} else if v == ssOverflow {
-			i.next = nextCGJDecompose
-			break
-		}
-		if i.info.ccc < prevCC {
-			goto doNorm
-		}
-	}
-	if outCopyStart == 0 {
-		return i.returnSlice(inCopyStart, i.p)
-	} else if inCopyStart < i.p {
-		i.rb.src.copySlice(i.buf[outCopyStart:], inCopyStart, i.p)
-	}
-	return i.buf[:outp]
-doNorm:
-	// Insert what we have decomposed so far in the reorderBuffer.
-	// As we will only reorder, there will always be enough room.
-	i.rb.src.copySlice(i.buf[outCopyStart:], inCopyStart, i.p)
-	i.rb.insertDecomposed(i.buf[0:outp])
-	return doNormDecomposed(i)
-}
-
-func doNormDecomposed(i *Iter) []byte {
-	for {
-		i.rb.insertUnsafe(i.rb.src, i.p, i.info)
-		if i.p += int(i.info.size); i.p >= i.rb.nsrc {
-			i.setDone()
-			break
-		}
-		i.info = i.rb.f.info(i.rb.src, i.p)
-		if i.info.ccc == 0 {
-			break
-		}
-		if s := i.rb.ss.next(i.info); s == ssOverflow {
-			i.next = nextCGJDecompose
-			break
-		}
-	}
-	// new segment or too many combining characters: exit normalization
-	return i.buf[:i.rb.flushCopy(i.buf[:])]
-}
-
-func nextCGJDecompose(i *Iter) []byte {
-	i.rb.ss = 0
-	i.rb.insertCGJ()
-	i.next = nextDecomposed
-	i.rb.ss.first(i.info)
-	buf := doNormDecomposed(i)
-	return buf
-}
-
-// nextComposed is the implementation of Next for forms NFC and NFKC.
-func nextComposed(i *Iter) []byte {
-	outp, startp := 0, i.p
-	var prevCC uint8
-	for {
-		if !i.info.isYesC() {
-			goto doNorm
-		}
-		prevCC = i.info.tccc
-		sz := int(i.info.size)
-		if sz == 0 {
-			sz = 1 // illegal rune: copy byte-by-byte
-		}
-		p := outp + sz
-		if p > len(i.buf) {
-			break
-		}
-		outp = p
-		i.p += sz
-		if i.p >= i.rb.nsrc {
-			i.setDone()
-			break
-		} else if i.rb.src._byte(i.p) < utf8.RuneSelf {
-			i.rb.ss = 0
-			i.next = i.asciiF
-			break
-		}
-		i.info = i.rb.f.info(i.rb.src, i.p)
-		if v := i.rb.ss.next(i.info); v == ssStarter {
-			break
-		} else if v == ssOverflow {
-			i.next = nextCGJCompose
-			break
-		}
-		if i.info.ccc < prevCC {
-			goto doNorm
-		}
-	}
-	return i.returnSlice(startp, i.p)
-doNorm:
-	// reset to start position
-	i.p = startp
-	i.info = i.rb.f.info(i.rb.src, i.p)
-	i.rb.ss.first(i.info)
-	if i.info.multiSegment() {
-		d := i.info.Decomposition()
-		info := i.rb.f.info(input{bytes: d}, 0)
-		i.rb.insertUnsafe(input{bytes: d}, 0, info)
-		i.multiSeg = d[int(info.size):]
-		i.next = nextMultiNorm
-		return nextMultiNorm(i)
-	}
-	i.rb.ss.first(i.info)
-	i.rb.insertUnsafe(i.rb.src, i.p, i.info)
-	return doNormComposed(i)
-}
-
-func doNormComposed(i *Iter) []byte {
-	// First rune should already be inserted.
-	for {
-		if i.p += int(i.info.size); i.p >= i.rb.nsrc {
-			i.setDone()
-			break
-		}
-		i.info = i.rb.f.info(i.rb.src, i.p)
-		if s := i.rb.ss.next(i.info); s == ssStarter {
-			break
-		} else if s == ssOverflow {
-			i.next = nextCGJCompose
-			break
-		}
-		i.rb.insertUnsafe(i.rb.src, i.p, i.info)
-	}
-	i.rb.compose()
-	seg := i.buf[:i.rb.flushCopy(i.buf[:])]
-	return seg
-}
-
-func nextCGJCompose(i *Iter) []byte {
-	i.rb.ss = 0 // instead of first
-	i.rb.insertCGJ()
-	i.next = nextComposed
-	// Note that we treat any rune with nLeadingNonStarters > 0 as a non-starter,
-	// even if they are not. This is particularly dubious for U+FF9E and UFF9A.
-	// If we ever change that, insert a check here.
-	i.rb.ss.first(i.info)
-	i.rb.insertUnsafe(i.rb.src, i.p, i.info)
-	return doNormComposed(i)
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/normalize.go b/vendor/golang.org/x/text/unicode/norm/normalize.go
deleted file mode 100644
index e28ac641ac..0000000000
--- a/vendor/golang.org/x/text/unicode/norm/normalize.go
+++ /dev/null
@@ -1,609 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Note: the file data_test.go that is generated should not be checked in.
-//go:generate go run maketables.go triegen.go
-//go:generate go test -tags test
-
-// Package norm contains types and functions for normalizing Unicode strings.
-package norm // import "golang.org/x/text/unicode/norm"
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/transform"
-)
-
-// A Form denotes a canonical representation of Unicode code points.
-// The Unicode-defined normalization and equivalence forms are:
-//
-//   NFC   Unicode Normalization Form C
-//   NFD   Unicode Normalization Form D
-//   NFKC  Unicode Normalization Form KC
-//   NFKD  Unicode Normalization Form KD
-//
-// For a Form f, this documentation uses the notation f(x) to mean
-// the bytes or string x converted to the given form.
-// A position n in x is called a boundary if conversion to the form can
-// proceed independently on both sides:
-//   f(x) == append(f(x[0:n]), f(x[n:])...)
-//
-// References: http://unicode.org/reports/tr15/ and
-// http://unicode.org/notes/tn5/.
-type Form int
-
-const (
-	NFC Form = iota
-	NFD
-	NFKC
-	NFKD
-)
-
-// Bytes returns f(b). May return b if f(b) = b.
-func (f Form) Bytes(b []byte) []byte {
-	src := inputBytes(b)
-	ft := formTable[f]
-	n, ok := ft.quickSpan(src, 0, len(b), true)
-	if ok {
-		return b
-	}
-	out := make([]byte, n, len(b))
-	copy(out, b[0:n])
-	rb := reorderBuffer{f: *ft, src: src, nsrc: len(b), out: out, flushF: appendFlush}
-	return doAppendInner(&rb, n)
-}
-
-// String returns f(s).
-func (f Form) String(s string) string {
-	src := inputString(s)
-	ft := formTable[f]
-	n, ok := ft.quickSpan(src, 0, len(s), true)
-	if ok {
-		return s
-	}
-	out := make([]byte, n, len(s))
-	copy(out, s[0:n])
-	rb := reorderBuffer{f: *ft, src: src, nsrc: len(s), out: out, flushF: appendFlush}
-	return string(doAppendInner(&rb, n))
-}
-
-// IsNormal returns true if b == f(b).
-func (f Form) IsNormal(b []byte) bool {
-	src := inputBytes(b)
-	ft := formTable[f]
-	bp, ok := ft.quickSpan(src, 0, len(b), true)
-	if ok {
-		return true
-	}
-	rb := reorderBuffer{f: *ft, src: src, nsrc: len(b)}
-	rb.setFlusher(nil, cmpNormalBytes)
-	for bp < len(b) {
-		rb.out = b[bp:]
-		if bp = decomposeSegment(&rb, bp, true); bp < 0 {
-			return false
-		}
-		bp, _ = rb.f.quickSpan(rb.src, bp, len(b), true)
-	}
-	return true
-}
-
-func cmpNormalBytes(rb *reorderBuffer) bool {
-	b := rb.out
-	for i := 0; i < rb.nrune; i++ {
-		info := rb.rune[i]
-		if int(info.size) > len(b) {
-			return false
-		}
-		p := info.pos
-		pe := p + info.size
-		for ; p < pe; p++ {
-			if b[0] != rb.byte[p] {
-				return false
-			}
-			b = b[1:]
-		}
-	}
-	return true
-}
-
-// IsNormalString returns true if s == f(s).
-func (f Form) IsNormalString(s string) bool {
-	src := inputString(s)
-	ft := formTable[f]
-	bp, ok := ft.quickSpan(src, 0, len(s), true)
-	if ok {
-		return true
-	}
-	rb := reorderBuffer{f: *ft, src: src, nsrc: len(s)}
-	rb.setFlusher(nil, func(rb *reorderBuffer) bool {
-		for i := 0; i < rb.nrune; i++ {
-			info := rb.rune[i]
-			if bp+int(info.size) > len(s) {
-				return false
-			}
-			p := info.pos
-			pe := p + info.size
-			for ; p < pe; p++ {
-				if s[bp] != rb.byte[p] {
-					return false
-				}
-				bp++
-			}
-		}
-		return true
-	})
-	for bp < len(s) {
-		if bp = decomposeSegment(&rb, bp, true); bp < 0 {
-			return false
-		}
-		bp, _ = rb.f.quickSpan(rb.src, bp, len(s), true)
-	}
-	return true
-}
-
-// patchTail fixes a case where a rune may be incorrectly normalized
-// if it is followed by illegal continuation bytes. It returns the
-// patched buffer and whether the decomposition is still in progress.
-func patchTail(rb *reorderBuffer) bool {
-	info, p := lastRuneStart(&rb.f, rb.out)
-	if p == -1 || info.size == 0 {
-		return true
-	}
-	end := p + int(info.size)
-	extra := len(rb.out) - end
-	if extra > 0 {
-		// Potentially allocating memory. However, this only
-		// happens with ill-formed UTF-8.
-		x := make([]byte, 0)
-		x = append(x, rb.out[len(rb.out)-extra:]...)
-		rb.out = rb.out[:end]
-		decomposeToLastBoundary(rb)
-		rb.doFlush()
-		rb.out = append(rb.out, x...)
-		return false
-	}
-	buf := rb.out[p:]
-	rb.out = rb.out[:p]
-	decomposeToLastBoundary(rb)
-	if s := rb.ss.next(info); s == ssStarter {
-		rb.doFlush()
-		rb.ss.first(info)
-	} else if s == ssOverflow {
-		rb.doFlush()
-		rb.insertCGJ()
-		rb.ss = 0
-	}
-	rb.insertUnsafe(inputBytes(buf), 0, info)
-	return true
-}
-
-func appendQuick(rb *reorderBuffer, i int) int {
-	if rb.nsrc == i {
-		return i
-	}
-	end, _ := rb.f.quickSpan(rb.src, i, rb.nsrc, true)
-	rb.out = rb.src.appendSlice(rb.out, i, end)
-	return end
-}
-
-// Append returns f(append(out, b...)).
-// The buffer out must be nil, empty, or equal to f(out).
-func (f Form) Append(out []byte, src ...byte) []byte {
-	return f.doAppend(out, inputBytes(src), len(src))
-}
-
-func (f Form) doAppend(out []byte, src input, n int) []byte {
-	if n == 0 {
-		return out
-	}
-	ft := formTable[f]
-	// Attempt to do a quickSpan first so we can avoid initializing the reorderBuffer.
-	if len(out) == 0 {
-		p, _ := ft.quickSpan(src, 0, n, true)
-		out = src.appendSlice(out, 0, p)
-		if p == n {
-			return out
-		}
-		rb := reorderBuffer{f: *ft, src: src, nsrc: n, out: out, flushF: appendFlush}
-		return doAppendInner(&rb, p)
-	}
-	rb := reorderBuffer{f: *ft, src: src, nsrc: n}
-	return doAppend(&rb, out, 0)
-}
-
-func doAppend(rb *reorderBuffer, out []byte, p int) []byte {
-	rb.setFlusher(out, appendFlush)
-	src, n := rb.src, rb.nsrc
-	doMerge := len(out) > 0
-	if q := src.skipContinuationBytes(p); q > p {
-		// Move leading non-starters to destination.
-		rb.out = src.appendSlice(rb.out, p, q)
-		p = q
-		doMerge = patchTail(rb)
-	}
-	fd := &rb.f
-	if doMerge {
-		var info Properties
-		if p < n {
-			info = fd.info(src, p)
-			if !info.BoundaryBefore() || info.nLeadingNonStarters() > 0 {
-				if p == 0 {
-					decomposeToLastBoundary(rb)
-				}
-				p = decomposeSegment(rb, p, true)
-			}
-		}
-		if info.size == 0 {
-			rb.doFlush()
-			// Append incomplete UTF-8 encoding.
-			return src.appendSlice(rb.out, p, n)
-		}
-		if rb.nrune > 0 {
-			return doAppendInner(rb, p)
-		}
-	}
-	p = appendQuick(rb, p)
-	return doAppendInner(rb, p)
-}
-
-func doAppendInner(rb *reorderBuffer, p int) []byte {
-	for n := rb.nsrc; p < n; {
-		p = decomposeSegment(rb, p, true)
-		p = appendQuick(rb, p)
-	}
-	return rb.out
-}
-
-// AppendString returns f(append(out, []byte(s))).
-// The buffer out must be nil, empty, or equal to f(out).
-func (f Form) AppendString(out []byte, src string) []byte {
-	return f.doAppend(out, inputString(src), len(src))
-}
-
-// QuickSpan returns a boundary n such that b[0:n] == f(b[0:n]).
-// It is not guaranteed to return the largest such n.
-func (f Form) QuickSpan(b []byte) int {
-	n, _ := formTable[f].quickSpan(inputBytes(b), 0, len(b), true)
-	return n
-}
-
-// Span implements transform.SpanningTransformer. It returns a boundary n such
-// that b[0:n] == f(b[0:n]). It is not guaranteed to return the largest such n.
-func (f Form) Span(b []byte, atEOF bool) (n int, err error) {
-	n, ok := formTable[f].quickSpan(inputBytes(b), 0, len(b), atEOF)
-	if n < len(b) {
-		if !ok {
-			err = transform.ErrEndOfSpan
-		} else {
-			err = transform.ErrShortSrc
-		}
-	}
-	return n, err
-}
-
-// SpanString returns a boundary n such that s[0:n] == f(s[0:n]).
-// It is not guaranteed to return the largest such n.
-func (f Form) SpanString(s string, atEOF bool) (n int, err error) {
-	n, ok := formTable[f].quickSpan(inputString(s), 0, len(s), atEOF)
-	if n < len(s) {
-		if !ok {
-			err = transform.ErrEndOfSpan
-		} else {
-			err = transform.ErrShortSrc
-		}
-	}
-	return n, err
-}
-
-// quickSpan returns a boundary n such that src[0:n] == f(src[0:n]) and
-// whether any non-normalized parts were found. If atEOF is false, n will
-// not point past the last segment if this segment might be become
-// non-normalized by appending other runes.
-func (f *formInfo) quickSpan(src input, i, end int, atEOF bool) (n int, ok bool) {
-	var lastCC uint8
-	ss := streamSafe(0)
-	lastSegStart := i
-	for n = end; i < n; {
-		if j := src.skipASCII(i, n); i != j {
-			i = j
-			lastSegStart = i - 1
-			lastCC = 0
-			ss = 0
-			continue
-		}
-		info := f.info(src, i)
-		if info.size == 0 {
-			if atEOF {
-				// include incomplete runes
-				return n, true
-			}
-			return lastSegStart, true
-		}
-		// This block needs to be before the next, because it is possible to
-		// have an overflow for runes that are starters (e.g. with U+FF9E).
-		switch ss.next(info) {
-		case ssStarter:
-			lastSegStart = i
-		case ssOverflow:
-			return lastSegStart, false
-		case ssSuccess:
-			if lastCC > info.ccc {
-				return lastSegStart, false
-			}
-		}
-		if f.composing {
-			if !info.isYesC() {
-				break
-			}
-		} else {
-			if !info.isYesD() {
-				break
-			}
-		}
-		lastCC = info.ccc
-		i += int(info.size)
-	}
-	if i == n {
-		if !atEOF {
-			n = lastSegStart
-		}
-		return n, true
-	}
-	return lastSegStart, false
-}
-
-// QuickSpanString returns a boundary n such that s[0:n] == f(s[0:n]).
-// It is not guaranteed to return the largest such n.
-func (f Form) QuickSpanString(s string) int {
-	n, _ := formTable[f].quickSpan(inputString(s), 0, len(s), true)
-	return n
-}
-
-// FirstBoundary returns the position i of the first boundary in b
-// or -1 if b contains no boundary.
-func (f Form) FirstBoundary(b []byte) int {
-	return f.firstBoundary(inputBytes(b), len(b))
-}
-
-func (f Form) firstBoundary(src input, nsrc int) int {
-	i := src.skipContinuationBytes(0)
-	if i >= nsrc {
-		return -1
-	}
-	fd := formTable[f]
-	ss := streamSafe(0)
-	// We should call ss.first here, but we can't as the first rune is
-	// skipped already. This means FirstBoundary can't really determine
-	// CGJ insertion points correctly. Luckily it doesn't have to.
-	for {
-		info := fd.info(src, i)
-		if info.size == 0 {
-			return -1
-		}
-		if s := ss.next(info); s != ssSuccess {
-			return i
-		}
-		i += int(info.size)
-		if i >= nsrc {
-			if !info.BoundaryAfter() && !ss.isMax() {
-				return -1
-			}
-			return nsrc
-		}
-	}
-}
-
-// FirstBoundaryInString returns the position i of the first boundary in s
-// or -1 if s contains no boundary.
-func (f Form) FirstBoundaryInString(s string) int {
-	return f.firstBoundary(inputString(s), len(s))
-}
-
-// NextBoundary reports the index of the boundary between the first and next
-// segment in b or -1 if atEOF is false and there are not enough bytes to
-// determine this boundary.
-func (f Form) NextBoundary(b []byte, atEOF bool) int {
-	return f.nextBoundary(inputBytes(b), len(b), atEOF)
-}
-
-// NextBoundaryInString reports the index of the boundary between the first and
-// next segment in b or -1 if atEOF is false and there are not enough bytes to
-// determine this boundary.
-func (f Form) NextBoundaryInString(s string, atEOF bool) int {
-	return f.nextBoundary(inputString(s), len(s), atEOF)
-}
-
-func (f Form) nextBoundary(src input, nsrc int, atEOF bool) int {
-	if nsrc == 0 {
-		if atEOF {
-			return 0
-		}
-		return -1
-	}
-	fd := formTable[f]
-	info := fd.info(src, 0)
-	if info.size == 0 {
-		if atEOF {
-			return 1
-		}
-		return -1
-	}
-	ss := streamSafe(0)
-	ss.first(info)
-
-	for i := int(info.size); i < nsrc; i += int(info.size) {
-		info = fd.info(src, i)
-		if info.size == 0 {
-			if atEOF {
-				return i
-			}
-			return -1
-		}
-		// TODO: Using streamSafe to determine the boundary isn't the same as
-		// using BoundaryBefore. Determine which should be used.
-		if s := ss.next(info); s != ssSuccess {
-			return i
-		}
-	}
-	if !atEOF && !info.BoundaryAfter() && !ss.isMax() {
-		return -1
-	}
-	return nsrc
-}
-
-// LastBoundary returns the position i of the last boundary in b
-// or -1 if b contains no boundary.
-func (f Form) LastBoundary(b []byte) int {
-	return lastBoundary(formTable[f], b)
-}
-
-func lastBoundary(fd *formInfo, b []byte) int {
-	i := len(b)
-	info, p := lastRuneStart(fd, b)
-	if p == -1 {
-		return -1
-	}
-	if info.size == 0 { // ends with incomplete rune
-		if p == 0 { // starts with incomplete rune
-			return -1
-		}
-		i = p
-		info, p = lastRuneStart(fd, b[:i])
-		if p == -1 { // incomplete UTF-8 encoding or non-starter bytes without a starter
-			return i
-		}
-	}
-	if p+int(info.size) != i { // trailing non-starter bytes: illegal UTF-8
-		return i
-	}
-	if info.BoundaryAfter() {
-		return i
-	}
-	ss := streamSafe(0)
-	v := ss.backwards(info)
-	for i = p; i >= 0 && v != ssStarter; i = p {
-		info, p = lastRuneStart(fd, b[:i])
-		if v = ss.backwards(info); v == ssOverflow {
-			break
-		}
-		if p+int(info.size) != i {
-			if p == -1 { // no boundary found
-				return -1
-			}
-			return i // boundary after an illegal UTF-8 encoding
-		}
-	}
-	return i
-}
-
-// decomposeSegment scans the first segment in src into rb. It inserts 0x034f
-// (Grapheme Joiner) when it encounters a sequence of more than 30 non-starters
-// and returns the number of bytes consumed from src or iShortDst or iShortSrc.
-func decomposeSegment(rb *reorderBuffer, sp int, atEOF bool) int {
-	// Force one character to be consumed.
-	info := rb.f.info(rb.src, sp)
-	if info.size == 0 {
-		return 0
-	}
-	if s := rb.ss.next(info); s == ssStarter {
-		// TODO: this could be removed if we don't support merging.
-		if rb.nrune > 0 {
-			goto end
-		}
-	} else if s == ssOverflow {
-		rb.insertCGJ()
-		goto end
-	}
-	if err := rb.insertFlush(rb.src, sp, info); err != iSuccess {
-		return int(err)
-	}
-	for {
-		sp += int(info.size)
-		if sp >= rb.nsrc {
-			if !atEOF && !info.BoundaryAfter() {
-				return int(iShortSrc)
-			}
-			break
-		}
-		info = rb.f.info(rb.src, sp)
-		if info.size == 0 {
-			if !atEOF {
-				return int(iShortSrc)
-			}
-			break
-		}
-		if s := rb.ss.next(info); s == ssStarter {
-			break
-		} else if s == ssOverflow {
-			rb.insertCGJ()
-			break
-		}
-		if err := rb.insertFlush(rb.src, sp, info); err != iSuccess {
-			return int(err)
-		}
-	}
-end:
-	if !rb.doFlush() {
-		return int(iShortDst)
-	}
-	return sp
-}
-
-// lastRuneStart returns the runeInfo and position of the last
-// rune in buf or the zero runeInfo and -1 if no rune was found.
-func lastRuneStart(fd *formInfo, buf []byte) (Properties, int) {
-	p := len(buf) - 1
-	for ; p >= 0 && !utf8.RuneStart(buf[p]); p-- {
-	}
-	if p < 0 {
-		return Properties{}, -1
-	}
-	return fd.info(inputBytes(buf), p), p
-}
-
-// decomposeToLastBoundary finds an open segment at the end of the buffer
-// and scans it into rb. Returns the buffer minus the last segment.
-func decomposeToLastBoundary(rb *reorderBuffer) {
-	fd := &rb.f
-	info, i := lastRuneStart(fd, rb.out)
-	if int(info.size) != len(rb.out)-i {
-		// illegal trailing continuation bytes
-		return
-	}
-	if info.BoundaryAfter() {
-		return
-	}
-	var add [maxNonStarters + 1]Properties // stores runeInfo in reverse order
-	padd := 0
-	ss := streamSafe(0)
-	p := len(rb.out)
-	for {
-		add[padd] = info
-		v := ss.backwards(info)
-		if v == ssOverflow {
-			// Note that if we have an overflow, it the string we are appending to
-			// is not correctly normalized. In this case the behavior is undefined.
-			break
-		}
-		padd++
-		p -= int(info.size)
-		if v == ssStarter || p < 0 {
-			break
-		}
-		info, i = lastRuneStart(fd, rb.out[:p])
-		if int(info.size) != p-i {
-			break
-		}
-	}
-	rb.ss = ss
-	// Copy bytes for insertion as we may need to overwrite rb.out.
-	var buf [maxBufferSize * utf8.UTFMax]byte
-	cp := buf[:copy(buf[:], rb.out[p:])]
-	rb.out = rb.out[:p]
-	for padd--; padd >= 0; padd-- {
-		info = add[padd]
-		rb.insertUnsafe(inputBytes(cp), 0, info)
-		cp = cp[info.size:]
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/readwriter.go b/vendor/golang.org/x/text/unicode/norm/readwriter.go
deleted file mode 100644
index d926ee903e..0000000000
--- a/vendor/golang.org/x/text/unicode/norm/readwriter.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-import "io"
-
-type normWriter struct {
-	rb  reorderBuffer
-	w   io.Writer
-	buf []byte
-}
-
-// Write implements the standard write interface.  If the last characters are
-// not at a normalization boundary, the bytes will be buffered for the next
-// write. The remaining bytes will be written on close.
-func (w *normWriter) Write(data []byte) (n int, err error) {
-	// Process data in pieces to keep w.buf size bounded.
-	const chunk = 4000
-
-	for len(data) > 0 {
-		// Normalize into w.buf.
-		m := len(data)
-		if m > chunk {
-			m = chunk
-		}
-		w.rb.src = inputBytes(data[:m])
-		w.rb.nsrc = m
-		w.buf = doAppend(&w.rb, w.buf, 0)
-		data = data[m:]
-		n += m
-
-		// Write out complete prefix, save remainder.
-		// Note that lastBoundary looks back at most 31 runes.
-		i := lastBoundary(&w.rb.f, w.buf)
-		if i == -1 {
-			i = 0
-		}
-		if i > 0 {
-			if _, err = w.w.Write(w.buf[:i]); err != nil {
-				break
-			}
-			bn := copy(w.buf, w.buf[i:])
-			w.buf = w.buf[:bn]
-		}
-	}
-	return n, err
-}
-
-// Close forces data that remains in the buffer to be written.
-func (w *normWriter) Close() error {
-	if len(w.buf) > 0 {
-		_, err := w.w.Write(w.buf)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Writer returns a new writer that implements Write(b)
-// by writing f(b) to w.  The returned writer may use an
-// an internal buffer to maintain state across Write calls.
-// Calling its Close method writes any buffered data to w.
-func (f Form) Writer(w io.Writer) io.WriteCloser {
-	wr := &normWriter{rb: reorderBuffer{}, w: w}
-	wr.rb.init(f, nil)
-	return wr
-}
-
-type normReader struct {
-	rb           reorderBuffer
-	r            io.Reader
-	inbuf        []byte
-	outbuf       []byte
-	bufStart     int
-	lastBoundary int
-	err          error
-}
-
-// Read implements the standard read interface.
-func (r *normReader) Read(p []byte) (int, error) {
-	for {
-		if r.lastBoundary-r.bufStart > 0 {
-			n := copy(p, r.outbuf[r.bufStart:r.lastBoundary])
-			r.bufStart += n
-			if r.lastBoundary-r.bufStart > 0 {
-				return n, nil
-			}
-			return n, r.err
-		}
-		if r.err != nil {
-			return 0, r.err
-		}
-		outn := copy(r.outbuf, r.outbuf[r.lastBoundary:])
-		r.outbuf = r.outbuf[0:outn]
-		r.bufStart = 0
-
-		n, err := r.r.Read(r.inbuf)
-		r.rb.src = inputBytes(r.inbuf[0:n])
-		r.rb.nsrc, r.err = n, err
-		if n > 0 {
-			r.outbuf = doAppend(&r.rb, r.outbuf, 0)
-		}
-		if err == io.EOF {
-			r.lastBoundary = len(r.outbuf)
-		} else {
-			r.lastBoundary = lastBoundary(&r.rb.f, r.outbuf)
-			if r.lastBoundary == -1 {
-				r.lastBoundary = 0
-			}
-		}
-	}
-}
-
-// Reader returns a new reader that implements Read
-// by reading data from r and returning f(data).
-func (f Form) Reader(r io.Reader) io.Reader {
-	const chunk = 4000
-	buf := make([]byte, chunk)
-	rr := &normReader{rb: reorderBuffer{}, r: r, inbuf: buf}
-	rr.rb.init(f, buf)
-	return rr
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/tables.go b/vendor/golang.org/x/text/unicode/norm/tables.go
deleted file mode 100644
index bf9ff8038c..0000000000
--- a/vendor/golang.org/x/text/unicode/norm/tables.go
+++ /dev/null
@@ -1,7631 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package norm
-
-const (
-	// Version is the Unicode edition from which the tables are derived.
-	Version = "9.0.0"
-
-	// MaxTransformChunkSize indicates the maximum number of bytes that Transform
-	// may need to write atomically for any Form. Making a destination buffer at
-	// least this size ensures that Transform can always make progress and that
-	// the user does not need to grow the buffer on an ErrShortDst.
-	MaxTransformChunkSize = 35 + maxNonStarters*4
-)
-
-var ccc = [55]uint8{
-	0, 1, 7, 8, 9, 10, 11, 12,
-	13, 14, 15, 16, 17, 18, 19, 20,
-	21, 22, 23, 24, 25, 26, 27, 28,
-	29, 30, 31, 32, 33, 34, 35, 36,
-	84, 91, 103, 107, 118, 122, 129, 130,
-	132, 202, 214, 216, 218, 220, 222, 224,
-	226, 228, 230, 232, 233, 234, 240,
-}
-
-const (
-	firstMulti            = 0x186D
-	firstCCC              = 0x2C9E
-	endMulti              = 0x2F60
-	firstLeadingCCC       = 0x49AE
-	firstCCCZeroExcept    = 0x4A78
-	firstStarterWithNLead = 0x4A9F
-	lastDecomp            = 0x4AA1
-	maxDecomp             = 0x8000
-)
-
-// decomps: 19105 bytes
-var decomps = [...]byte{
-	// Bytes 0 - 3f
-	0x00, 0x41, 0x20, 0x41, 0x21, 0x41, 0x22, 0x41,
-	0x23, 0x41, 0x24, 0x41, 0x25, 0x41, 0x26, 0x41,
-	0x27, 0x41, 0x28, 0x41, 0x29, 0x41, 0x2A, 0x41,
-	0x2B, 0x41, 0x2C, 0x41, 0x2D, 0x41, 0x2E, 0x41,
-	0x2F, 0x41, 0x30, 0x41, 0x31, 0x41, 0x32, 0x41,
-	0x33, 0x41, 0x34, 0x41, 0x35, 0x41, 0x36, 0x41,
-	0x37, 0x41, 0x38, 0x41, 0x39, 0x41, 0x3A, 0x41,
-	0x3B, 0x41, 0x3C, 0x41, 0x3D, 0x41, 0x3E, 0x41,
-	// Bytes 40 - 7f
-	0x3F, 0x41, 0x40, 0x41, 0x41, 0x41, 0x42, 0x41,
-	0x43, 0x41, 0x44, 0x41, 0x45, 0x41, 0x46, 0x41,
-	0x47, 0x41, 0x48, 0x41, 0x49, 0x41, 0x4A, 0x41,
-	0x4B, 0x41, 0x4C, 0x41, 0x4D, 0x41, 0x4E, 0x41,
-	0x4F, 0x41, 0x50, 0x41, 0x51, 0x41, 0x52, 0x41,
-	0x53, 0x41, 0x54, 0x41, 0x55, 0x41, 0x56, 0x41,
-	0x57, 0x41, 0x58, 0x41, 0x59, 0x41, 0x5A, 0x41,
-	0x5B, 0x41, 0x5C, 0x41, 0x5D, 0x41, 0x5E, 0x41,
-	// Bytes 80 - bf
-	0x5F, 0x41, 0x60, 0x41, 0x61, 0x41, 0x62, 0x41,
-	0x63, 0x41, 0x64, 0x41, 0x65, 0x41, 0x66, 0x41,
-	0x67, 0x41, 0x68, 0x41, 0x69, 0x41, 0x6A, 0x41,
-	0x6B, 0x41, 0x6C, 0x41, 0x6D, 0x41, 0x6E, 0x41,
-	0x6F, 0x41, 0x70, 0x41, 0x71, 0x41, 0x72, 0x41,
-	0x73, 0x41, 0x74, 0x41, 0x75, 0x41, 0x76, 0x41,
-	0x77, 0x41, 0x78, 0x41, 0x79, 0x41, 0x7A, 0x41,
-	0x7B, 0x41, 0x7C, 0x41, 0x7D, 0x41, 0x7E, 0x42,
-	// Bytes c0 - ff
-	0xC2, 0xA2, 0x42, 0xC2, 0xA3, 0x42, 0xC2, 0xA5,
-	0x42, 0xC2, 0xA6, 0x42, 0xC2, 0xAC, 0x42, 0xC2,
-	0xB7, 0x42, 0xC3, 0x86, 0x42, 0xC3, 0xB0, 0x42,
-	0xC4, 0xA6, 0x42, 0xC4, 0xA7, 0x42, 0xC4, 0xB1,
-	0x42, 0xC5, 0x8B, 0x42, 0xC5, 0x93, 0x42, 0xC6,
-	0x8E, 0x42, 0xC6, 0x90, 0x42, 0xC6, 0xAB, 0x42,
-	0xC8, 0xA2, 0x42, 0xC8, 0xB7, 0x42, 0xC9, 0x90,
-	0x42, 0xC9, 0x91, 0x42, 0xC9, 0x92, 0x42, 0xC9,
-	// Bytes 100 - 13f
-	0x94, 0x42, 0xC9, 0x95, 0x42, 0xC9, 0x99, 0x42,
-	0xC9, 0x9B, 0x42, 0xC9, 0x9C, 0x42, 0xC9, 0x9F,
-	0x42, 0xC9, 0xA1, 0x42, 0xC9, 0xA3, 0x42, 0xC9,
-	0xA5, 0x42, 0xC9, 0xA6, 0x42, 0xC9, 0xA8, 0x42,
-	0xC9, 0xA9, 0x42, 0xC9, 0xAA, 0x42, 0xC9, 0xAB,
-	0x42, 0xC9, 0xAD, 0x42, 0xC9, 0xAF, 0x42, 0xC9,
-	0xB0, 0x42, 0xC9, 0xB1, 0x42, 0xC9, 0xB2, 0x42,
-	0xC9, 0xB3, 0x42, 0xC9, 0xB4, 0x42, 0xC9, 0xB5,
-	// Bytes 140 - 17f
-	0x42, 0xC9, 0xB8, 0x42, 0xC9, 0xB9, 0x42, 0xC9,
-	0xBB, 0x42, 0xCA, 0x81, 0x42, 0xCA, 0x82, 0x42,
-	0xCA, 0x83, 0x42, 0xCA, 0x89, 0x42, 0xCA, 0x8A,
-	0x42, 0xCA, 0x8B, 0x42, 0xCA, 0x8C, 0x42, 0xCA,
-	0x90, 0x42, 0xCA, 0x91, 0x42, 0xCA, 0x92, 0x42,
-	0xCA, 0x95, 0x42, 0xCA, 0x9D, 0x42, 0xCA, 0x9F,
-	0x42, 0xCA, 0xB9, 0x42, 0xCE, 0x91, 0x42, 0xCE,
-	0x92, 0x42, 0xCE, 0x93, 0x42, 0xCE, 0x94, 0x42,
-	// Bytes 180 - 1bf
-	0xCE, 0x95, 0x42, 0xCE, 0x96, 0x42, 0xCE, 0x97,
-	0x42, 0xCE, 0x98, 0x42, 0xCE, 0x99, 0x42, 0xCE,
-	0x9A, 0x42, 0xCE, 0x9B, 0x42, 0xCE, 0x9C, 0x42,
-	0xCE, 0x9D, 0x42, 0xCE, 0x9E, 0x42, 0xCE, 0x9F,
-	0x42, 0xCE, 0xA0, 0x42, 0xCE, 0xA1, 0x42, 0xCE,
-	0xA3, 0x42, 0xCE, 0xA4, 0x42, 0xCE, 0xA5, 0x42,
-	0xCE, 0xA6, 0x42, 0xCE, 0xA7, 0x42, 0xCE, 0xA8,
-	0x42, 0xCE, 0xA9, 0x42, 0xCE, 0xB1, 0x42, 0xCE,
-	// Bytes 1c0 - 1ff
-	0xB2, 0x42, 0xCE, 0xB3, 0x42, 0xCE, 0xB4, 0x42,
-	0xCE, 0xB5, 0x42, 0xCE, 0xB6, 0x42, 0xCE, 0xB7,
-	0x42, 0xCE, 0xB8, 0x42, 0xCE, 0xB9, 0x42, 0xCE,
-	0xBA, 0x42, 0xCE, 0xBB, 0x42, 0xCE, 0xBC, 0x42,
-	0xCE, 0xBD, 0x42, 0xCE, 0xBE, 0x42, 0xCE, 0xBF,
-	0x42, 0xCF, 0x80, 0x42, 0xCF, 0x81, 0x42, 0xCF,
-	0x82, 0x42, 0xCF, 0x83, 0x42, 0xCF, 0x84, 0x42,
-	0xCF, 0x85, 0x42, 0xCF, 0x86, 0x42, 0xCF, 0x87,
-	// Bytes 200 - 23f
-	0x42, 0xCF, 0x88, 0x42, 0xCF, 0x89, 0x42, 0xCF,
-	0x9C, 0x42, 0xCF, 0x9D, 0x42, 0xD0, 0xBD, 0x42,
-	0xD1, 0x8A, 0x42, 0xD1, 0x8C, 0x42, 0xD7, 0x90,
-	0x42, 0xD7, 0x91, 0x42, 0xD7, 0x92, 0x42, 0xD7,
-	0x93, 0x42, 0xD7, 0x94, 0x42, 0xD7, 0x9B, 0x42,
-	0xD7, 0x9C, 0x42, 0xD7, 0x9D, 0x42, 0xD7, 0xA2,
-	0x42, 0xD7, 0xA8, 0x42, 0xD7, 0xAA, 0x42, 0xD8,
-	0xA1, 0x42, 0xD8, 0xA7, 0x42, 0xD8, 0xA8, 0x42,
-	// Bytes 240 - 27f
-	0xD8, 0xA9, 0x42, 0xD8, 0xAA, 0x42, 0xD8, 0xAB,
-	0x42, 0xD8, 0xAC, 0x42, 0xD8, 0xAD, 0x42, 0xD8,
-	0xAE, 0x42, 0xD8, 0xAF, 0x42, 0xD8, 0xB0, 0x42,
-	0xD8, 0xB1, 0x42, 0xD8, 0xB2, 0x42, 0xD8, 0xB3,
-	0x42, 0xD8, 0xB4, 0x42, 0xD8, 0xB5, 0x42, 0xD8,
-	0xB6, 0x42, 0xD8, 0xB7, 0x42, 0xD8, 0xB8, 0x42,
-	0xD8, 0xB9, 0x42, 0xD8, 0xBA, 0x42, 0xD9, 0x81,
-	0x42, 0xD9, 0x82, 0x42, 0xD9, 0x83, 0x42, 0xD9,
-	// Bytes 280 - 2bf
-	0x84, 0x42, 0xD9, 0x85, 0x42, 0xD9, 0x86, 0x42,
-	0xD9, 0x87, 0x42, 0xD9, 0x88, 0x42, 0xD9, 0x89,
-	0x42, 0xD9, 0x8A, 0x42, 0xD9, 0xAE, 0x42, 0xD9,
-	0xAF, 0x42, 0xD9, 0xB1, 0x42, 0xD9, 0xB9, 0x42,
-	0xD9, 0xBA, 0x42, 0xD9, 0xBB, 0x42, 0xD9, 0xBE,
-	0x42, 0xD9, 0xBF, 0x42, 0xDA, 0x80, 0x42, 0xDA,
-	0x83, 0x42, 0xDA, 0x84, 0x42, 0xDA, 0x86, 0x42,
-	0xDA, 0x87, 0x42, 0xDA, 0x88, 0x42, 0xDA, 0x8C,
-	// Bytes 2c0 - 2ff
-	0x42, 0xDA, 0x8D, 0x42, 0xDA, 0x8E, 0x42, 0xDA,
-	0x91, 0x42, 0xDA, 0x98, 0x42, 0xDA, 0xA1, 0x42,
-	0xDA, 0xA4, 0x42, 0xDA, 0xA6, 0x42, 0xDA, 0xA9,
-	0x42, 0xDA, 0xAD, 0x42, 0xDA, 0xAF, 0x42, 0xDA,
-	0xB1, 0x42, 0xDA, 0xB3, 0x42, 0xDA, 0xBA, 0x42,
-	0xDA, 0xBB, 0x42, 0xDA, 0xBE, 0x42, 0xDB, 0x81,
-	0x42, 0xDB, 0x85, 0x42, 0xDB, 0x86, 0x42, 0xDB,
-	0x87, 0x42, 0xDB, 0x88, 0x42, 0xDB, 0x89, 0x42,
-	// Bytes 300 - 33f
-	0xDB, 0x8B, 0x42, 0xDB, 0x8C, 0x42, 0xDB, 0x90,
-	0x42, 0xDB, 0x92, 0x43, 0xE0, 0xBC, 0x8B, 0x43,
-	0xE1, 0x83, 0x9C, 0x43, 0xE1, 0x84, 0x80, 0x43,
-	0xE1, 0x84, 0x81, 0x43, 0xE1, 0x84, 0x82, 0x43,
-	0xE1, 0x84, 0x83, 0x43, 0xE1, 0x84, 0x84, 0x43,
-	0xE1, 0x84, 0x85, 0x43, 0xE1, 0x84, 0x86, 0x43,
-	0xE1, 0x84, 0x87, 0x43, 0xE1, 0x84, 0x88, 0x43,
-	0xE1, 0x84, 0x89, 0x43, 0xE1, 0x84, 0x8A, 0x43,
-	// Bytes 340 - 37f
-	0xE1, 0x84, 0x8B, 0x43, 0xE1, 0x84, 0x8C, 0x43,
-	0xE1, 0x84, 0x8D, 0x43, 0xE1, 0x84, 0x8E, 0x43,
-	0xE1, 0x84, 0x8F, 0x43, 0xE1, 0x84, 0x90, 0x43,
-	0xE1, 0x84, 0x91, 0x43, 0xE1, 0x84, 0x92, 0x43,
-	0xE1, 0x84, 0x94, 0x43, 0xE1, 0x84, 0x95, 0x43,
-	0xE1, 0x84, 0x9A, 0x43, 0xE1, 0x84, 0x9C, 0x43,
-	0xE1, 0x84, 0x9D, 0x43, 0xE1, 0x84, 0x9E, 0x43,
-	0xE1, 0x84, 0xA0, 0x43, 0xE1, 0x84, 0xA1, 0x43,
-	// Bytes 380 - 3bf
-	0xE1, 0x84, 0xA2, 0x43, 0xE1, 0x84, 0xA3, 0x43,
-	0xE1, 0x84, 0xA7, 0x43, 0xE1, 0x84, 0xA9, 0x43,
-	0xE1, 0x84, 0xAB, 0x43, 0xE1, 0x84, 0xAC, 0x43,
-	0xE1, 0x84, 0xAD, 0x43, 0xE1, 0x84, 0xAE, 0x43,
-	0xE1, 0x84, 0xAF, 0x43, 0xE1, 0x84, 0xB2, 0x43,
-	0xE1, 0x84, 0xB6, 0x43, 0xE1, 0x85, 0x80, 0x43,
-	0xE1, 0x85, 0x87, 0x43, 0xE1, 0x85, 0x8C, 0x43,
-	0xE1, 0x85, 0x97, 0x43, 0xE1, 0x85, 0x98, 0x43,
-	// Bytes 3c0 - 3ff
-	0xE1, 0x85, 0x99, 0x43, 0xE1, 0x85, 0xA0, 0x43,
-	0xE1, 0x86, 0x84, 0x43, 0xE1, 0x86, 0x85, 0x43,
-	0xE1, 0x86, 0x88, 0x43, 0xE1, 0x86, 0x91, 0x43,
-	0xE1, 0x86, 0x92, 0x43, 0xE1, 0x86, 0x94, 0x43,
-	0xE1, 0x86, 0x9E, 0x43, 0xE1, 0x86, 0xA1, 0x43,
-	0xE1, 0x87, 0x87, 0x43, 0xE1, 0x87, 0x88, 0x43,
-	0xE1, 0x87, 0x8C, 0x43, 0xE1, 0x87, 0x8E, 0x43,
-	0xE1, 0x87, 0x93, 0x43, 0xE1, 0x87, 0x97, 0x43,
-	// Bytes 400 - 43f
-	0xE1, 0x87, 0x99, 0x43, 0xE1, 0x87, 0x9D, 0x43,
-	0xE1, 0x87, 0x9F, 0x43, 0xE1, 0x87, 0xB1, 0x43,
-	0xE1, 0x87, 0xB2, 0x43, 0xE1, 0xB4, 0x82, 0x43,
-	0xE1, 0xB4, 0x96, 0x43, 0xE1, 0xB4, 0x97, 0x43,
-	0xE1, 0xB4, 0x9C, 0x43, 0xE1, 0xB4, 0x9D, 0x43,
-	0xE1, 0xB4, 0xA5, 0x43, 0xE1, 0xB5, 0xBB, 0x43,
-	0xE1, 0xB6, 0x85, 0x43, 0xE2, 0x80, 0x82, 0x43,
-	0xE2, 0x80, 0x83, 0x43, 0xE2, 0x80, 0x90, 0x43,
-	// Bytes 440 - 47f
-	0xE2, 0x80, 0x93, 0x43, 0xE2, 0x80, 0x94, 0x43,
-	0xE2, 0x82, 0xA9, 0x43, 0xE2, 0x86, 0x90, 0x43,
-	0xE2, 0x86, 0x91, 0x43, 0xE2, 0x86, 0x92, 0x43,
-	0xE2, 0x86, 0x93, 0x43, 0xE2, 0x88, 0x82, 0x43,
-	0xE2, 0x88, 0x87, 0x43, 0xE2, 0x88, 0x91, 0x43,
-	0xE2, 0x88, 0x92, 0x43, 0xE2, 0x94, 0x82, 0x43,
-	0xE2, 0x96, 0xA0, 0x43, 0xE2, 0x97, 0x8B, 0x43,
-	0xE2, 0xA6, 0x85, 0x43, 0xE2, 0xA6, 0x86, 0x43,
-	// Bytes 480 - 4bf
-	0xE2, 0xB5, 0xA1, 0x43, 0xE3, 0x80, 0x81, 0x43,
-	0xE3, 0x80, 0x82, 0x43, 0xE3, 0x80, 0x88, 0x43,
-	0xE3, 0x80, 0x89, 0x43, 0xE3, 0x80, 0x8A, 0x43,
-	0xE3, 0x80, 0x8B, 0x43, 0xE3, 0x80, 0x8C, 0x43,
-	0xE3, 0x80, 0x8D, 0x43, 0xE3, 0x80, 0x8E, 0x43,
-	0xE3, 0x80, 0x8F, 0x43, 0xE3, 0x80, 0x90, 0x43,
-	0xE3, 0x80, 0x91, 0x43, 0xE3, 0x80, 0x92, 0x43,
-	0xE3, 0x80, 0x94, 0x43, 0xE3, 0x80, 0x95, 0x43,
-	// Bytes 4c0 - 4ff
-	0xE3, 0x80, 0x96, 0x43, 0xE3, 0x80, 0x97, 0x43,
-	0xE3, 0x82, 0xA1, 0x43, 0xE3, 0x82, 0xA2, 0x43,
-	0xE3, 0x82, 0xA3, 0x43, 0xE3, 0x82, 0xA4, 0x43,
-	0xE3, 0x82, 0xA5, 0x43, 0xE3, 0x82, 0xA6, 0x43,
-	0xE3, 0x82, 0xA7, 0x43, 0xE3, 0x82, 0xA8, 0x43,
-	0xE3, 0x82, 0xA9, 0x43, 0xE3, 0x82, 0xAA, 0x43,
-	0xE3, 0x82, 0xAB, 0x43, 0xE3, 0x82, 0xAD, 0x43,
-	0xE3, 0x82, 0xAF, 0x43, 0xE3, 0x82, 0xB1, 0x43,
-	// Bytes 500 - 53f
-	0xE3, 0x82, 0xB3, 0x43, 0xE3, 0x82, 0xB5, 0x43,
-	0xE3, 0x82, 0xB7, 0x43, 0xE3, 0x82, 0xB9, 0x43,
-	0xE3, 0x82, 0xBB, 0x43, 0xE3, 0x82, 0xBD, 0x43,
-	0xE3, 0x82, 0xBF, 0x43, 0xE3, 0x83, 0x81, 0x43,
-	0xE3, 0x83, 0x83, 0x43, 0xE3, 0x83, 0x84, 0x43,
-	0xE3, 0x83, 0x86, 0x43, 0xE3, 0x83, 0x88, 0x43,
-	0xE3, 0x83, 0x8A, 0x43, 0xE3, 0x83, 0x8B, 0x43,
-	0xE3, 0x83, 0x8C, 0x43, 0xE3, 0x83, 0x8D, 0x43,
-	// Bytes 540 - 57f
-	0xE3, 0x83, 0x8E, 0x43, 0xE3, 0x83, 0x8F, 0x43,
-	0xE3, 0x83, 0x92, 0x43, 0xE3, 0x83, 0x95, 0x43,
-	0xE3, 0x83, 0x98, 0x43, 0xE3, 0x83, 0x9B, 0x43,
-	0xE3, 0x83, 0x9E, 0x43, 0xE3, 0x83, 0x9F, 0x43,
-	0xE3, 0x83, 0xA0, 0x43, 0xE3, 0x83, 0xA1, 0x43,
-	0xE3, 0x83, 0xA2, 0x43, 0xE3, 0x83, 0xA3, 0x43,
-	0xE3, 0x83, 0xA4, 0x43, 0xE3, 0x83, 0xA5, 0x43,
-	0xE3, 0x83, 0xA6, 0x43, 0xE3, 0x83, 0xA7, 0x43,
-	// Bytes 580 - 5bf
-	0xE3, 0x83, 0xA8, 0x43, 0xE3, 0x83, 0xA9, 0x43,
-	0xE3, 0x83, 0xAA, 0x43, 0xE3, 0x83, 0xAB, 0x43,
-	0xE3, 0x83, 0xAC, 0x43, 0xE3, 0x83, 0xAD, 0x43,
-	0xE3, 0x83, 0xAF, 0x43, 0xE3, 0x83, 0xB0, 0x43,
-	0xE3, 0x83, 0xB1, 0x43, 0xE3, 0x83, 0xB2, 0x43,
-	0xE3, 0x83, 0xB3, 0x43, 0xE3, 0x83, 0xBB, 0x43,
-	0xE3, 0x83, 0xBC, 0x43, 0xE3, 0x92, 0x9E, 0x43,
-	0xE3, 0x92, 0xB9, 0x43, 0xE3, 0x92, 0xBB, 0x43,
-	// Bytes 5c0 - 5ff
-	0xE3, 0x93, 0x9F, 0x43, 0xE3, 0x94, 0x95, 0x43,
-	0xE3, 0x9B, 0xAE, 0x43, 0xE3, 0x9B, 0xBC, 0x43,
-	0xE3, 0x9E, 0x81, 0x43, 0xE3, 0xA0, 0xAF, 0x43,
-	0xE3, 0xA1, 0xA2, 0x43, 0xE3, 0xA1, 0xBC, 0x43,
-	0xE3, 0xA3, 0x87, 0x43, 0xE3, 0xA3, 0xA3, 0x43,
-	0xE3, 0xA4, 0x9C, 0x43, 0xE3, 0xA4, 0xBA, 0x43,
-	0xE3, 0xA8, 0xAE, 0x43, 0xE3, 0xA9, 0xAC, 0x43,
-	0xE3, 0xAB, 0xA4, 0x43, 0xE3, 0xAC, 0x88, 0x43,
-	// Bytes 600 - 63f
-	0xE3, 0xAC, 0x99, 0x43, 0xE3, 0xAD, 0x89, 0x43,
-	0xE3, 0xAE, 0x9D, 0x43, 0xE3, 0xB0, 0x98, 0x43,
-	0xE3, 0xB1, 0x8E, 0x43, 0xE3, 0xB4, 0xB3, 0x43,
-	0xE3, 0xB6, 0x96, 0x43, 0xE3, 0xBA, 0xAC, 0x43,
-	0xE3, 0xBA, 0xB8, 0x43, 0xE3, 0xBC, 0x9B, 0x43,
-	0xE3, 0xBF, 0xBC, 0x43, 0xE4, 0x80, 0x88, 0x43,
-	0xE4, 0x80, 0x98, 0x43, 0xE4, 0x80, 0xB9, 0x43,
-	0xE4, 0x81, 0x86, 0x43, 0xE4, 0x82, 0x96, 0x43,
-	// Bytes 640 - 67f
-	0xE4, 0x83, 0xA3, 0x43, 0xE4, 0x84, 0xAF, 0x43,
-	0xE4, 0x88, 0x82, 0x43, 0xE4, 0x88, 0xA7, 0x43,
-	0xE4, 0x8A, 0xA0, 0x43, 0xE4, 0x8C, 0x81, 0x43,
-	0xE4, 0x8C, 0xB4, 0x43, 0xE4, 0x8D, 0x99, 0x43,
-	0xE4, 0x8F, 0x95, 0x43, 0xE4, 0x8F, 0x99, 0x43,
-	0xE4, 0x90, 0x8B, 0x43, 0xE4, 0x91, 0xAB, 0x43,
-	0xE4, 0x94, 0xAB, 0x43, 0xE4, 0x95, 0x9D, 0x43,
-	0xE4, 0x95, 0xA1, 0x43, 0xE4, 0x95, 0xAB, 0x43,
-	// Bytes 680 - 6bf
-	0xE4, 0x97, 0x97, 0x43, 0xE4, 0x97, 0xB9, 0x43,
-	0xE4, 0x98, 0xB5, 0x43, 0xE4, 0x9A, 0xBE, 0x43,
-	0xE4, 0x9B, 0x87, 0x43, 0xE4, 0xA6, 0x95, 0x43,
-	0xE4, 0xA7, 0xA6, 0x43, 0xE4, 0xA9, 0xAE, 0x43,
-	0xE4, 0xA9, 0xB6, 0x43, 0xE4, 0xAA, 0xB2, 0x43,
-	0xE4, 0xAC, 0xB3, 0x43, 0xE4, 0xAF, 0x8E, 0x43,
-	0xE4, 0xB3, 0x8E, 0x43, 0xE4, 0xB3, 0xAD, 0x43,
-	0xE4, 0xB3, 0xB8, 0x43, 0xE4, 0xB5, 0x96, 0x43,
-	// Bytes 6c0 - 6ff
-	0xE4, 0xB8, 0x80, 0x43, 0xE4, 0xB8, 0x81, 0x43,
-	0xE4, 0xB8, 0x83, 0x43, 0xE4, 0xB8, 0x89, 0x43,
-	0xE4, 0xB8, 0x8A, 0x43, 0xE4, 0xB8, 0x8B, 0x43,
-	0xE4, 0xB8, 0x8D, 0x43, 0xE4, 0xB8, 0x99, 0x43,
-	0xE4, 0xB8, 0xA6, 0x43, 0xE4, 0xB8, 0xA8, 0x43,
-	0xE4, 0xB8, 0xAD, 0x43, 0xE4, 0xB8, 0xB2, 0x43,
-	0xE4, 0xB8, 0xB6, 0x43, 0xE4, 0xB8, 0xB8, 0x43,
-	0xE4, 0xB8, 0xB9, 0x43, 0xE4, 0xB8, 0xBD, 0x43,
-	// Bytes 700 - 73f
-	0xE4, 0xB8, 0xBF, 0x43, 0xE4, 0xB9, 0x81, 0x43,
-	0xE4, 0xB9, 0x99, 0x43, 0xE4, 0xB9, 0x9D, 0x43,
-	0xE4, 0xBA, 0x82, 0x43, 0xE4, 0xBA, 0x85, 0x43,
-	0xE4, 0xBA, 0x86, 0x43, 0xE4, 0xBA, 0x8C, 0x43,
-	0xE4, 0xBA, 0x94, 0x43, 0xE4, 0xBA, 0xA0, 0x43,
-	0xE4, 0xBA, 0xA4, 0x43, 0xE4, 0xBA, 0xAE, 0x43,
-	0xE4, 0xBA, 0xBA, 0x43, 0xE4, 0xBB, 0x80, 0x43,
-	0xE4, 0xBB, 0x8C, 0x43, 0xE4, 0xBB, 0xA4, 0x43,
-	// Bytes 740 - 77f
-	0xE4, 0xBC, 0x81, 0x43, 0xE4, 0xBC, 0x91, 0x43,
-	0xE4, 0xBD, 0xA0, 0x43, 0xE4, 0xBE, 0x80, 0x43,
-	0xE4, 0xBE, 0x86, 0x43, 0xE4, 0xBE, 0x8B, 0x43,
-	0xE4, 0xBE, 0xAE, 0x43, 0xE4, 0xBE, 0xBB, 0x43,
-	0xE4, 0xBE, 0xBF, 0x43, 0xE5, 0x80, 0x82, 0x43,
-	0xE5, 0x80, 0xAB, 0x43, 0xE5, 0x81, 0xBA, 0x43,
-	0xE5, 0x82, 0x99, 0x43, 0xE5, 0x83, 0x8F, 0x43,
-	0xE5, 0x83, 0x9A, 0x43, 0xE5, 0x83, 0xA7, 0x43,
-	// Bytes 780 - 7bf
-	0xE5, 0x84, 0xAA, 0x43, 0xE5, 0x84, 0xBF, 0x43,
-	0xE5, 0x85, 0x80, 0x43, 0xE5, 0x85, 0x85, 0x43,
-	0xE5, 0x85, 0x8D, 0x43, 0xE5, 0x85, 0x94, 0x43,
-	0xE5, 0x85, 0xA4, 0x43, 0xE5, 0x85, 0xA5, 0x43,
-	0xE5, 0x85, 0xA7, 0x43, 0xE5, 0x85, 0xA8, 0x43,
-	0xE5, 0x85, 0xA9, 0x43, 0xE5, 0x85, 0xAB, 0x43,
-	0xE5, 0x85, 0xAD, 0x43, 0xE5, 0x85, 0xB7, 0x43,
-	0xE5, 0x86, 0x80, 0x43, 0xE5, 0x86, 0x82, 0x43,
-	// Bytes 7c0 - 7ff
-	0xE5, 0x86, 0x8D, 0x43, 0xE5, 0x86, 0x92, 0x43,
-	0xE5, 0x86, 0x95, 0x43, 0xE5, 0x86, 0x96, 0x43,
-	0xE5, 0x86, 0x97, 0x43, 0xE5, 0x86, 0x99, 0x43,
-	0xE5, 0x86, 0xA4, 0x43, 0xE5, 0x86, 0xAB, 0x43,
-	0xE5, 0x86, 0xAC, 0x43, 0xE5, 0x86, 0xB5, 0x43,
-	0xE5, 0x86, 0xB7, 0x43, 0xE5, 0x87, 0x89, 0x43,
-	0xE5, 0x87, 0x8C, 0x43, 0xE5, 0x87, 0x9C, 0x43,
-	0xE5, 0x87, 0x9E, 0x43, 0xE5, 0x87, 0xA0, 0x43,
-	// Bytes 800 - 83f
-	0xE5, 0x87, 0xB5, 0x43, 0xE5, 0x88, 0x80, 0x43,
-	0xE5, 0x88, 0x83, 0x43, 0xE5, 0x88, 0x87, 0x43,
-	0xE5, 0x88, 0x97, 0x43, 0xE5, 0x88, 0x9D, 0x43,
-	0xE5, 0x88, 0xA9, 0x43, 0xE5, 0x88, 0xBA, 0x43,
-	0xE5, 0x88, 0xBB, 0x43, 0xE5, 0x89, 0x86, 0x43,
-	0xE5, 0x89, 0x8D, 0x43, 0xE5, 0x89, 0xB2, 0x43,
-	0xE5, 0x89, 0xB7, 0x43, 0xE5, 0x8A, 0x89, 0x43,
-	0xE5, 0x8A, 0x9B, 0x43, 0xE5, 0x8A, 0xA3, 0x43,
-	// Bytes 840 - 87f
-	0xE5, 0x8A, 0xB3, 0x43, 0xE5, 0x8A, 0xB4, 0x43,
-	0xE5, 0x8B, 0x87, 0x43, 0xE5, 0x8B, 0x89, 0x43,
-	0xE5, 0x8B, 0x92, 0x43, 0xE5, 0x8B, 0x9E, 0x43,
-	0xE5, 0x8B, 0xA4, 0x43, 0xE5, 0x8B, 0xB5, 0x43,
-	0xE5, 0x8B, 0xB9, 0x43, 0xE5, 0x8B, 0xBA, 0x43,
-	0xE5, 0x8C, 0x85, 0x43, 0xE5, 0x8C, 0x86, 0x43,
-	0xE5, 0x8C, 0x95, 0x43, 0xE5, 0x8C, 0x97, 0x43,
-	0xE5, 0x8C, 0x9A, 0x43, 0xE5, 0x8C, 0xB8, 0x43,
-	// Bytes 880 - 8bf
-	0xE5, 0x8C, 0xBB, 0x43, 0xE5, 0x8C, 0xBF, 0x43,
-	0xE5, 0x8D, 0x81, 0x43, 0xE5, 0x8D, 0x84, 0x43,
-	0xE5, 0x8D, 0x85, 0x43, 0xE5, 0x8D, 0x89, 0x43,
-	0xE5, 0x8D, 0x91, 0x43, 0xE5, 0x8D, 0x94, 0x43,
-	0xE5, 0x8D, 0x9A, 0x43, 0xE5, 0x8D, 0x9C, 0x43,
-	0xE5, 0x8D, 0xA9, 0x43, 0xE5, 0x8D, 0xB0, 0x43,
-	0xE5, 0x8D, 0xB3, 0x43, 0xE5, 0x8D, 0xB5, 0x43,
-	0xE5, 0x8D, 0xBD, 0x43, 0xE5, 0x8D, 0xBF, 0x43,
-	// Bytes 8c0 - 8ff
-	0xE5, 0x8E, 0x82, 0x43, 0xE5, 0x8E, 0xB6, 0x43,
-	0xE5, 0x8F, 0x83, 0x43, 0xE5, 0x8F, 0x88, 0x43,
-	0xE5, 0x8F, 0x8A, 0x43, 0xE5, 0x8F, 0x8C, 0x43,
-	0xE5, 0x8F, 0x9F, 0x43, 0xE5, 0x8F, 0xA3, 0x43,
-	0xE5, 0x8F, 0xA5, 0x43, 0xE5, 0x8F, 0xAB, 0x43,
-	0xE5, 0x8F, 0xAF, 0x43, 0xE5, 0x8F, 0xB1, 0x43,
-	0xE5, 0x8F, 0xB3, 0x43, 0xE5, 0x90, 0x86, 0x43,
-	0xE5, 0x90, 0x88, 0x43, 0xE5, 0x90, 0x8D, 0x43,
-	// Bytes 900 - 93f
-	0xE5, 0x90, 0x8F, 0x43, 0xE5, 0x90, 0x9D, 0x43,
-	0xE5, 0x90, 0xB8, 0x43, 0xE5, 0x90, 0xB9, 0x43,
-	0xE5, 0x91, 0x82, 0x43, 0xE5, 0x91, 0x88, 0x43,
-	0xE5, 0x91, 0xA8, 0x43, 0xE5, 0x92, 0x9E, 0x43,
-	0xE5, 0x92, 0xA2, 0x43, 0xE5, 0x92, 0xBD, 0x43,
-	0xE5, 0x93, 0xB6, 0x43, 0xE5, 0x94, 0x90, 0x43,
-	0xE5, 0x95, 0x8F, 0x43, 0xE5, 0x95, 0x93, 0x43,
-	0xE5, 0x95, 0x95, 0x43, 0xE5, 0x95, 0xA3, 0x43,
-	// Bytes 940 - 97f
-	0xE5, 0x96, 0x84, 0x43, 0xE5, 0x96, 0x87, 0x43,
-	0xE5, 0x96, 0x99, 0x43, 0xE5, 0x96, 0x9D, 0x43,
-	0xE5, 0x96, 0xAB, 0x43, 0xE5, 0x96, 0xB3, 0x43,
-	0xE5, 0x96, 0xB6, 0x43, 0xE5, 0x97, 0x80, 0x43,
-	0xE5, 0x97, 0x82, 0x43, 0xE5, 0x97, 0xA2, 0x43,
-	0xE5, 0x98, 0x86, 0x43, 0xE5, 0x99, 0x91, 0x43,
-	0xE5, 0x99, 0xA8, 0x43, 0xE5, 0x99, 0xB4, 0x43,
-	0xE5, 0x9B, 0x97, 0x43, 0xE5, 0x9B, 0x9B, 0x43,
-	// Bytes 980 - 9bf
-	0xE5, 0x9B, 0xB9, 0x43, 0xE5, 0x9C, 0x96, 0x43,
-	0xE5, 0x9C, 0x97, 0x43, 0xE5, 0x9C, 0x9F, 0x43,
-	0xE5, 0x9C, 0xB0, 0x43, 0xE5, 0x9E, 0x8B, 0x43,
-	0xE5, 0x9F, 0x8E, 0x43, 0xE5, 0x9F, 0xB4, 0x43,
-	0xE5, 0xA0, 0x8D, 0x43, 0xE5, 0xA0, 0xB1, 0x43,
-	0xE5, 0xA0, 0xB2, 0x43, 0xE5, 0xA1, 0x80, 0x43,
-	0xE5, 0xA1, 0x9A, 0x43, 0xE5, 0xA1, 0x9E, 0x43,
-	0xE5, 0xA2, 0xA8, 0x43, 0xE5, 0xA2, 0xAC, 0x43,
-	// Bytes 9c0 - 9ff
-	0xE5, 0xA2, 0xB3, 0x43, 0xE5, 0xA3, 0x98, 0x43,
-	0xE5, 0xA3, 0x9F, 0x43, 0xE5, 0xA3, 0xAB, 0x43,
-	0xE5, 0xA3, 0xAE, 0x43, 0xE5, 0xA3, 0xB0, 0x43,
-	0xE5, 0xA3, 0xB2, 0x43, 0xE5, 0xA3, 0xB7, 0x43,
-	0xE5, 0xA4, 0x82, 0x43, 0xE5, 0xA4, 0x86, 0x43,
-	0xE5, 0xA4, 0x8A, 0x43, 0xE5, 0xA4, 0x95, 0x43,
-	0xE5, 0xA4, 0x9A, 0x43, 0xE5, 0xA4, 0x9C, 0x43,
-	0xE5, 0xA4, 0xA2, 0x43, 0xE5, 0xA4, 0xA7, 0x43,
-	// Bytes a00 - a3f
-	0xE5, 0xA4, 0xA9, 0x43, 0xE5, 0xA5, 0x84, 0x43,
-	0xE5, 0xA5, 0x88, 0x43, 0xE5, 0xA5, 0x91, 0x43,
-	0xE5, 0xA5, 0x94, 0x43, 0xE5, 0xA5, 0xA2, 0x43,
-	0xE5, 0xA5, 0xB3, 0x43, 0xE5, 0xA7, 0x98, 0x43,
-	0xE5, 0xA7, 0xAC, 0x43, 0xE5, 0xA8, 0x9B, 0x43,
-	0xE5, 0xA8, 0xA7, 0x43, 0xE5, 0xA9, 0xA2, 0x43,
-	0xE5, 0xA9, 0xA6, 0x43, 0xE5, 0xAA, 0xB5, 0x43,
-	0xE5, 0xAC, 0x88, 0x43, 0xE5, 0xAC, 0xA8, 0x43,
-	// Bytes a40 - a7f
-	0xE5, 0xAC, 0xBE, 0x43, 0xE5, 0xAD, 0x90, 0x43,
-	0xE5, 0xAD, 0x97, 0x43, 0xE5, 0xAD, 0xA6, 0x43,
-	0xE5, 0xAE, 0x80, 0x43, 0xE5, 0xAE, 0x85, 0x43,
-	0xE5, 0xAE, 0x97, 0x43, 0xE5, 0xAF, 0x83, 0x43,
-	0xE5, 0xAF, 0x98, 0x43, 0xE5, 0xAF, 0xA7, 0x43,
-	0xE5, 0xAF, 0xAE, 0x43, 0xE5, 0xAF, 0xB3, 0x43,
-	0xE5, 0xAF, 0xB8, 0x43, 0xE5, 0xAF, 0xBF, 0x43,
-	0xE5, 0xB0, 0x86, 0x43, 0xE5, 0xB0, 0x8F, 0x43,
-	// Bytes a80 - abf
-	0xE5, 0xB0, 0xA2, 0x43, 0xE5, 0xB0, 0xB8, 0x43,
-	0xE5, 0xB0, 0xBF, 0x43, 0xE5, 0xB1, 0xA0, 0x43,
-	0xE5, 0xB1, 0xA2, 0x43, 0xE5, 0xB1, 0xA4, 0x43,
-	0xE5, 0xB1, 0xA5, 0x43, 0xE5, 0xB1, 0xAE, 0x43,
-	0xE5, 0xB1, 0xB1, 0x43, 0xE5, 0xB2, 0x8D, 0x43,
-	0xE5, 0xB3, 0x80, 0x43, 0xE5, 0xB4, 0x99, 0x43,
-	0xE5, 0xB5, 0x83, 0x43, 0xE5, 0xB5, 0x90, 0x43,
-	0xE5, 0xB5, 0xAB, 0x43, 0xE5, 0xB5, 0xAE, 0x43,
-	// Bytes ac0 - aff
-	0xE5, 0xB5, 0xBC, 0x43, 0xE5, 0xB6, 0xB2, 0x43,
-	0xE5, 0xB6, 0xBA, 0x43, 0xE5, 0xB7, 0x9B, 0x43,
-	0xE5, 0xB7, 0xA1, 0x43, 0xE5, 0xB7, 0xA2, 0x43,
-	0xE5, 0xB7, 0xA5, 0x43, 0xE5, 0xB7, 0xA6, 0x43,
-	0xE5, 0xB7, 0xB1, 0x43, 0xE5, 0xB7, 0xBD, 0x43,
-	0xE5, 0xB7, 0xBE, 0x43, 0xE5, 0xB8, 0xA8, 0x43,
-	0xE5, 0xB8, 0xBD, 0x43, 0xE5, 0xB9, 0xA9, 0x43,
-	0xE5, 0xB9, 0xB2, 0x43, 0xE5, 0xB9, 0xB4, 0x43,
-	// Bytes b00 - b3f
-	0xE5, 0xB9, 0xBA, 0x43, 0xE5, 0xB9, 0xBC, 0x43,
-	0xE5, 0xB9, 0xBF, 0x43, 0xE5, 0xBA, 0xA6, 0x43,
-	0xE5, 0xBA, 0xB0, 0x43, 0xE5, 0xBA, 0xB3, 0x43,
-	0xE5, 0xBA, 0xB6, 0x43, 0xE5, 0xBB, 0x89, 0x43,
-	0xE5, 0xBB, 0x8A, 0x43, 0xE5, 0xBB, 0x92, 0x43,
-	0xE5, 0xBB, 0x93, 0x43, 0xE5, 0xBB, 0x99, 0x43,
-	0xE5, 0xBB, 0xAC, 0x43, 0xE5, 0xBB, 0xB4, 0x43,
-	0xE5, 0xBB, 0xBE, 0x43, 0xE5, 0xBC, 0x84, 0x43,
-	// Bytes b40 - b7f
-	0xE5, 0xBC, 0x8B, 0x43, 0xE5, 0xBC, 0x93, 0x43,
-	0xE5, 0xBC, 0xA2, 0x43, 0xE5, 0xBD, 0x90, 0x43,
-	0xE5, 0xBD, 0x93, 0x43, 0xE5, 0xBD, 0xA1, 0x43,
-	0xE5, 0xBD, 0xA2, 0x43, 0xE5, 0xBD, 0xA9, 0x43,
-	0xE5, 0xBD, 0xAB, 0x43, 0xE5, 0xBD, 0xB3, 0x43,
-	0xE5, 0xBE, 0x8B, 0x43, 0xE5, 0xBE, 0x8C, 0x43,
-	0xE5, 0xBE, 0x97, 0x43, 0xE5, 0xBE, 0x9A, 0x43,
-	0xE5, 0xBE, 0xA9, 0x43, 0xE5, 0xBE, 0xAD, 0x43,
-	// Bytes b80 - bbf
-	0xE5, 0xBF, 0x83, 0x43, 0xE5, 0xBF, 0x8D, 0x43,
-	0xE5, 0xBF, 0x97, 0x43, 0xE5, 0xBF, 0xB5, 0x43,
-	0xE5, 0xBF, 0xB9, 0x43, 0xE6, 0x80, 0x92, 0x43,
-	0xE6, 0x80, 0x9C, 0x43, 0xE6, 0x81, 0xB5, 0x43,
-	0xE6, 0x82, 0x81, 0x43, 0xE6, 0x82, 0x94, 0x43,
-	0xE6, 0x83, 0x87, 0x43, 0xE6, 0x83, 0x98, 0x43,
-	0xE6, 0x83, 0xA1, 0x43, 0xE6, 0x84, 0x88, 0x43,
-	0xE6, 0x85, 0x84, 0x43, 0xE6, 0x85, 0x88, 0x43,
-	// Bytes bc0 - bff
-	0xE6, 0x85, 0x8C, 0x43, 0xE6, 0x85, 0x8E, 0x43,
-	0xE6, 0x85, 0xA0, 0x43, 0xE6, 0x85, 0xA8, 0x43,
-	0xE6, 0x85, 0xBA, 0x43, 0xE6, 0x86, 0x8E, 0x43,
-	0xE6, 0x86, 0x90, 0x43, 0xE6, 0x86, 0xA4, 0x43,
-	0xE6, 0x86, 0xAF, 0x43, 0xE6, 0x86, 0xB2, 0x43,
-	0xE6, 0x87, 0x9E, 0x43, 0xE6, 0x87, 0xB2, 0x43,
-	0xE6, 0x87, 0xB6, 0x43, 0xE6, 0x88, 0x80, 0x43,
-	0xE6, 0x88, 0x88, 0x43, 0xE6, 0x88, 0x90, 0x43,
-	// Bytes c00 - c3f
-	0xE6, 0x88, 0x9B, 0x43, 0xE6, 0x88, 0xAE, 0x43,
-	0xE6, 0x88, 0xB4, 0x43, 0xE6, 0x88, 0xB6, 0x43,
-	0xE6, 0x89, 0x8B, 0x43, 0xE6, 0x89, 0x93, 0x43,
-	0xE6, 0x89, 0x9D, 0x43, 0xE6, 0x8A, 0x95, 0x43,
-	0xE6, 0x8A, 0xB1, 0x43, 0xE6, 0x8B, 0x89, 0x43,
-	0xE6, 0x8B, 0x8F, 0x43, 0xE6, 0x8B, 0x93, 0x43,
-	0xE6, 0x8B, 0x94, 0x43, 0xE6, 0x8B, 0xBC, 0x43,
-	0xE6, 0x8B, 0xBE, 0x43, 0xE6, 0x8C, 0x87, 0x43,
-	// Bytes c40 - c7f
-	0xE6, 0x8C, 0xBD, 0x43, 0xE6, 0x8D, 0x90, 0x43,
-	0xE6, 0x8D, 0x95, 0x43, 0xE6, 0x8D, 0xA8, 0x43,
-	0xE6, 0x8D, 0xBB, 0x43, 0xE6, 0x8E, 0x83, 0x43,
-	0xE6, 0x8E, 0xA0, 0x43, 0xE6, 0x8E, 0xA9, 0x43,
-	0xE6, 0x8F, 0x84, 0x43, 0xE6, 0x8F, 0x85, 0x43,
-	0xE6, 0x8F, 0xA4, 0x43, 0xE6, 0x90, 0x9C, 0x43,
-	0xE6, 0x90, 0xA2, 0x43, 0xE6, 0x91, 0x92, 0x43,
-	0xE6, 0x91, 0xA9, 0x43, 0xE6, 0x91, 0xB7, 0x43,
-	// Bytes c80 - cbf
-	0xE6, 0x91, 0xBE, 0x43, 0xE6, 0x92, 0x9A, 0x43,
-	0xE6, 0x92, 0x9D, 0x43, 0xE6, 0x93, 0x84, 0x43,
-	0xE6, 0x94, 0xAF, 0x43, 0xE6, 0x94, 0xB4, 0x43,
-	0xE6, 0x95, 0x8F, 0x43, 0xE6, 0x95, 0x96, 0x43,
-	0xE6, 0x95, 0xAC, 0x43, 0xE6, 0x95, 0xB8, 0x43,
-	0xE6, 0x96, 0x87, 0x43, 0xE6, 0x96, 0x97, 0x43,
-	0xE6, 0x96, 0x99, 0x43, 0xE6, 0x96, 0xA4, 0x43,
-	0xE6, 0x96, 0xB0, 0x43, 0xE6, 0x96, 0xB9, 0x43,
-	// Bytes cc0 - cff
-	0xE6, 0x97, 0x85, 0x43, 0xE6, 0x97, 0xA0, 0x43,
-	0xE6, 0x97, 0xA2, 0x43, 0xE6, 0x97, 0xA3, 0x43,
-	0xE6, 0x97, 0xA5, 0x43, 0xE6, 0x98, 0x93, 0x43,
-	0xE6, 0x98, 0xA0, 0x43, 0xE6, 0x99, 0x89, 0x43,
-	0xE6, 0x99, 0xB4, 0x43, 0xE6, 0x9A, 0x88, 0x43,
-	0xE6, 0x9A, 0x91, 0x43, 0xE6, 0x9A, 0x9C, 0x43,
-	0xE6, 0x9A, 0xB4, 0x43, 0xE6, 0x9B, 0x86, 0x43,
-	0xE6, 0x9B, 0xB0, 0x43, 0xE6, 0x9B, 0xB4, 0x43,
-	// Bytes d00 - d3f
-	0xE6, 0x9B, 0xB8, 0x43, 0xE6, 0x9C, 0x80, 0x43,
-	0xE6, 0x9C, 0x88, 0x43, 0xE6, 0x9C, 0x89, 0x43,
-	0xE6, 0x9C, 0x97, 0x43, 0xE6, 0x9C, 0x9B, 0x43,
-	0xE6, 0x9C, 0xA1, 0x43, 0xE6, 0x9C, 0xA8, 0x43,
-	0xE6, 0x9D, 0x8E, 0x43, 0xE6, 0x9D, 0x93, 0x43,
-	0xE6, 0x9D, 0x96, 0x43, 0xE6, 0x9D, 0x9E, 0x43,
-	0xE6, 0x9D, 0xBB, 0x43, 0xE6, 0x9E, 0x85, 0x43,
-	0xE6, 0x9E, 0x97, 0x43, 0xE6, 0x9F, 0xB3, 0x43,
-	// Bytes d40 - d7f
-	0xE6, 0x9F, 0xBA, 0x43, 0xE6, 0xA0, 0x97, 0x43,
-	0xE6, 0xA0, 0x9F, 0x43, 0xE6, 0xA0, 0xAA, 0x43,
-	0xE6, 0xA1, 0x92, 0x43, 0xE6, 0xA2, 0x81, 0x43,
-	0xE6, 0xA2, 0x85, 0x43, 0xE6, 0xA2, 0x8E, 0x43,
-	0xE6, 0xA2, 0xA8, 0x43, 0xE6, 0xA4, 0x94, 0x43,
-	0xE6, 0xA5, 0x82, 0x43, 0xE6, 0xA6, 0xA3, 0x43,
-	0xE6, 0xA7, 0xAA, 0x43, 0xE6, 0xA8, 0x82, 0x43,
-	0xE6, 0xA8, 0x93, 0x43, 0xE6, 0xAA, 0xA8, 0x43,
-	// Bytes d80 - dbf
-	0xE6, 0xAB, 0x93, 0x43, 0xE6, 0xAB, 0x9B, 0x43,
-	0xE6, 0xAC, 0x84, 0x43, 0xE6, 0xAC, 0xA0, 0x43,
-	0xE6, 0xAC, 0xA1, 0x43, 0xE6, 0xAD, 0x94, 0x43,
-	0xE6, 0xAD, 0xA2, 0x43, 0xE6, 0xAD, 0xA3, 0x43,
-	0xE6, 0xAD, 0xB2, 0x43, 0xE6, 0xAD, 0xB7, 0x43,
-	0xE6, 0xAD, 0xB9, 0x43, 0xE6, 0xAE, 0x9F, 0x43,
-	0xE6, 0xAE, 0xAE, 0x43, 0xE6, 0xAE, 0xB3, 0x43,
-	0xE6, 0xAE, 0xBA, 0x43, 0xE6, 0xAE, 0xBB, 0x43,
-	// Bytes dc0 - dff
-	0xE6, 0xAF, 0x8B, 0x43, 0xE6, 0xAF, 0x8D, 0x43,
-	0xE6, 0xAF, 0x94, 0x43, 0xE6, 0xAF, 0x9B, 0x43,
-	0xE6, 0xB0, 0x8F, 0x43, 0xE6, 0xB0, 0x94, 0x43,
-	0xE6, 0xB0, 0xB4, 0x43, 0xE6, 0xB1, 0x8E, 0x43,
-	0xE6, 0xB1, 0xA7, 0x43, 0xE6, 0xB2, 0x88, 0x43,
-	0xE6, 0xB2, 0xBF, 0x43, 0xE6, 0xB3, 0x8C, 0x43,
-	0xE6, 0xB3, 0x8D, 0x43, 0xE6, 0xB3, 0xA5, 0x43,
-	0xE6, 0xB3, 0xA8, 0x43, 0xE6, 0xB4, 0x96, 0x43,
-	// Bytes e00 - e3f
-	0xE6, 0xB4, 0x9B, 0x43, 0xE6, 0xB4, 0x9E, 0x43,
-	0xE6, 0xB4, 0xB4, 0x43, 0xE6, 0xB4, 0xBE, 0x43,
-	0xE6, 0xB5, 0x81, 0x43, 0xE6, 0xB5, 0xA9, 0x43,
-	0xE6, 0xB5, 0xAA, 0x43, 0xE6, 0xB5, 0xB7, 0x43,
-	0xE6, 0xB5, 0xB8, 0x43, 0xE6, 0xB6, 0x85, 0x43,
-	0xE6, 0xB7, 0x8B, 0x43, 0xE6, 0xB7, 0x9A, 0x43,
-	0xE6, 0xB7, 0xAA, 0x43, 0xE6, 0xB7, 0xB9, 0x43,
-	0xE6, 0xB8, 0x9A, 0x43, 0xE6, 0xB8, 0xAF, 0x43,
-	// Bytes e40 - e7f
-	0xE6, 0xB9, 0xAE, 0x43, 0xE6, 0xBA, 0x80, 0x43,
-	0xE6, 0xBA, 0x9C, 0x43, 0xE6, 0xBA, 0xBA, 0x43,
-	0xE6, 0xBB, 0x87, 0x43, 0xE6, 0xBB, 0x8B, 0x43,
-	0xE6, 0xBB, 0x91, 0x43, 0xE6, 0xBB, 0x9B, 0x43,
-	0xE6, 0xBC, 0x8F, 0x43, 0xE6, 0xBC, 0x94, 0x43,
-	0xE6, 0xBC, 0xA2, 0x43, 0xE6, 0xBC, 0xA3, 0x43,
-	0xE6, 0xBD, 0xAE, 0x43, 0xE6, 0xBF, 0x86, 0x43,
-	0xE6, 0xBF, 0xAB, 0x43, 0xE6, 0xBF, 0xBE, 0x43,
-	// Bytes e80 - ebf
-	0xE7, 0x80, 0x9B, 0x43, 0xE7, 0x80, 0x9E, 0x43,
-	0xE7, 0x80, 0xB9, 0x43, 0xE7, 0x81, 0x8A, 0x43,
-	0xE7, 0x81, 0xAB, 0x43, 0xE7, 0x81, 0xB0, 0x43,
-	0xE7, 0x81, 0xB7, 0x43, 0xE7, 0x81, 0xBD, 0x43,
-	0xE7, 0x82, 0x99, 0x43, 0xE7, 0x82, 0xAD, 0x43,
-	0xE7, 0x83, 0x88, 0x43, 0xE7, 0x83, 0x99, 0x43,
-	0xE7, 0x84, 0xA1, 0x43, 0xE7, 0x85, 0x85, 0x43,
-	0xE7, 0x85, 0x89, 0x43, 0xE7, 0x85, 0xAE, 0x43,
-	// Bytes ec0 - eff
-	0xE7, 0x86, 0x9C, 0x43, 0xE7, 0x87, 0x8E, 0x43,
-	0xE7, 0x87, 0x90, 0x43, 0xE7, 0x88, 0x90, 0x43,
-	0xE7, 0x88, 0x9B, 0x43, 0xE7, 0x88, 0xA8, 0x43,
-	0xE7, 0x88, 0xAA, 0x43, 0xE7, 0x88, 0xAB, 0x43,
-	0xE7, 0x88, 0xB5, 0x43, 0xE7, 0x88, 0xB6, 0x43,
-	0xE7, 0x88, 0xBB, 0x43, 0xE7, 0x88, 0xBF, 0x43,
-	0xE7, 0x89, 0x87, 0x43, 0xE7, 0x89, 0x90, 0x43,
-	0xE7, 0x89, 0x99, 0x43, 0xE7, 0x89, 0x9B, 0x43,
-	// Bytes f00 - f3f
-	0xE7, 0x89, 0xA2, 0x43, 0xE7, 0x89, 0xB9, 0x43,
-	0xE7, 0x8A, 0x80, 0x43, 0xE7, 0x8A, 0x95, 0x43,
-	0xE7, 0x8A, 0xAC, 0x43, 0xE7, 0x8A, 0xAF, 0x43,
-	0xE7, 0x8B, 0x80, 0x43, 0xE7, 0x8B, 0xBC, 0x43,
-	0xE7, 0x8C, 0xAA, 0x43, 0xE7, 0x8D, 0xB5, 0x43,
-	0xE7, 0x8D, 0xBA, 0x43, 0xE7, 0x8E, 0x84, 0x43,
-	0xE7, 0x8E, 0x87, 0x43, 0xE7, 0x8E, 0x89, 0x43,
-	0xE7, 0x8E, 0x8B, 0x43, 0xE7, 0x8E, 0xA5, 0x43,
-	// Bytes f40 - f7f
-	0xE7, 0x8E, 0xB2, 0x43, 0xE7, 0x8F, 0x9E, 0x43,
-	0xE7, 0x90, 0x86, 0x43, 0xE7, 0x90, 0x89, 0x43,
-	0xE7, 0x90, 0xA2, 0x43, 0xE7, 0x91, 0x87, 0x43,
-	0xE7, 0x91, 0x9C, 0x43, 0xE7, 0x91, 0xA9, 0x43,
-	0xE7, 0x91, 0xB1, 0x43, 0xE7, 0x92, 0x85, 0x43,
-	0xE7, 0x92, 0x89, 0x43, 0xE7, 0x92, 0x98, 0x43,
-	0xE7, 0x93, 0x8A, 0x43, 0xE7, 0x93, 0x9C, 0x43,
-	0xE7, 0x93, 0xA6, 0x43, 0xE7, 0x94, 0x86, 0x43,
-	// Bytes f80 - fbf
-	0xE7, 0x94, 0x98, 0x43, 0xE7, 0x94, 0x9F, 0x43,
-	0xE7, 0x94, 0xA4, 0x43, 0xE7, 0x94, 0xA8, 0x43,
-	0xE7, 0x94, 0xB0, 0x43, 0xE7, 0x94, 0xB2, 0x43,
-	0xE7, 0x94, 0xB3, 0x43, 0xE7, 0x94, 0xB7, 0x43,
-	0xE7, 0x94, 0xBB, 0x43, 0xE7, 0x94, 0xBE, 0x43,
-	0xE7, 0x95, 0x99, 0x43, 0xE7, 0x95, 0xA5, 0x43,
-	0xE7, 0x95, 0xB0, 0x43, 0xE7, 0x96, 0x8B, 0x43,
-	0xE7, 0x96, 0x92, 0x43, 0xE7, 0x97, 0xA2, 0x43,
-	// Bytes fc0 - fff
-	0xE7, 0x98, 0x90, 0x43, 0xE7, 0x98, 0x9D, 0x43,
-	0xE7, 0x98, 0x9F, 0x43, 0xE7, 0x99, 0x82, 0x43,
-	0xE7, 0x99, 0xA9, 0x43, 0xE7, 0x99, 0xB6, 0x43,
-	0xE7, 0x99, 0xBD, 0x43, 0xE7, 0x9A, 0xAE, 0x43,
-	0xE7, 0x9A, 0xBF, 0x43, 0xE7, 0x9B, 0x8A, 0x43,
-	0xE7, 0x9B, 0x9B, 0x43, 0xE7, 0x9B, 0xA3, 0x43,
-	0xE7, 0x9B, 0xA7, 0x43, 0xE7, 0x9B, 0xAE, 0x43,
-	0xE7, 0x9B, 0xB4, 0x43, 0xE7, 0x9C, 0x81, 0x43,
-	// Bytes 1000 - 103f
-	0xE7, 0x9C, 0x9E, 0x43, 0xE7, 0x9C, 0x9F, 0x43,
-	0xE7, 0x9D, 0x80, 0x43, 0xE7, 0x9D, 0x8A, 0x43,
-	0xE7, 0x9E, 0x8B, 0x43, 0xE7, 0x9E, 0xA7, 0x43,
-	0xE7, 0x9F, 0x9B, 0x43, 0xE7, 0x9F, 0xA2, 0x43,
-	0xE7, 0x9F, 0xB3, 0x43, 0xE7, 0xA1, 0x8E, 0x43,
-	0xE7, 0xA1, 0xAB, 0x43, 0xE7, 0xA2, 0x8C, 0x43,
-	0xE7, 0xA2, 0x91, 0x43, 0xE7, 0xA3, 0x8A, 0x43,
-	0xE7, 0xA3, 0x8C, 0x43, 0xE7, 0xA3, 0xBB, 0x43,
-	// Bytes 1040 - 107f
-	0xE7, 0xA4, 0xAA, 0x43, 0xE7, 0xA4, 0xBA, 0x43,
-	0xE7, 0xA4, 0xBC, 0x43, 0xE7, 0xA4, 0xBE, 0x43,
-	0xE7, 0xA5, 0x88, 0x43, 0xE7, 0xA5, 0x89, 0x43,
-	0xE7, 0xA5, 0x90, 0x43, 0xE7, 0xA5, 0x96, 0x43,
-	0xE7, 0xA5, 0x9D, 0x43, 0xE7, 0xA5, 0x9E, 0x43,
-	0xE7, 0xA5, 0xA5, 0x43, 0xE7, 0xA5, 0xBF, 0x43,
-	0xE7, 0xA6, 0x81, 0x43, 0xE7, 0xA6, 0x8D, 0x43,
-	0xE7, 0xA6, 0x8E, 0x43, 0xE7, 0xA6, 0x8F, 0x43,
-	// Bytes 1080 - 10bf
-	0xE7, 0xA6, 0xAE, 0x43, 0xE7, 0xA6, 0xB8, 0x43,
-	0xE7, 0xA6, 0xBE, 0x43, 0xE7, 0xA7, 0x8A, 0x43,
-	0xE7, 0xA7, 0x98, 0x43, 0xE7, 0xA7, 0xAB, 0x43,
-	0xE7, 0xA8, 0x9C, 0x43, 0xE7, 0xA9, 0x80, 0x43,
-	0xE7, 0xA9, 0x8A, 0x43, 0xE7, 0xA9, 0x8F, 0x43,
-	0xE7, 0xA9, 0xB4, 0x43, 0xE7, 0xA9, 0xBA, 0x43,
-	0xE7, 0xAA, 0x81, 0x43, 0xE7, 0xAA, 0xB1, 0x43,
-	0xE7, 0xAB, 0x8B, 0x43, 0xE7, 0xAB, 0xAE, 0x43,
-	// Bytes 10c0 - 10ff
-	0xE7, 0xAB, 0xB9, 0x43, 0xE7, 0xAC, 0xA0, 0x43,
-	0xE7, 0xAE, 0x8F, 0x43, 0xE7, 0xAF, 0x80, 0x43,
-	0xE7, 0xAF, 0x86, 0x43, 0xE7, 0xAF, 0x89, 0x43,
-	0xE7, 0xB0, 0xBE, 0x43, 0xE7, 0xB1, 0xA0, 0x43,
-	0xE7, 0xB1, 0xB3, 0x43, 0xE7, 0xB1, 0xBB, 0x43,
-	0xE7, 0xB2, 0x92, 0x43, 0xE7, 0xB2, 0xBE, 0x43,
-	0xE7, 0xB3, 0x92, 0x43, 0xE7, 0xB3, 0x96, 0x43,
-	0xE7, 0xB3, 0xA3, 0x43, 0xE7, 0xB3, 0xA7, 0x43,
-	// Bytes 1100 - 113f
-	0xE7, 0xB3, 0xA8, 0x43, 0xE7, 0xB3, 0xB8, 0x43,
-	0xE7, 0xB4, 0x80, 0x43, 0xE7, 0xB4, 0x90, 0x43,
-	0xE7, 0xB4, 0xA2, 0x43, 0xE7, 0xB4, 0xAF, 0x43,
-	0xE7, 0xB5, 0x82, 0x43, 0xE7, 0xB5, 0x9B, 0x43,
-	0xE7, 0xB5, 0xA3, 0x43, 0xE7, 0xB6, 0xA0, 0x43,
-	0xE7, 0xB6, 0xBE, 0x43, 0xE7, 0xB7, 0x87, 0x43,
-	0xE7, 0xB7, 0xB4, 0x43, 0xE7, 0xB8, 0x82, 0x43,
-	0xE7, 0xB8, 0x89, 0x43, 0xE7, 0xB8, 0xB7, 0x43,
-	// Bytes 1140 - 117f
-	0xE7, 0xB9, 0x81, 0x43, 0xE7, 0xB9, 0x85, 0x43,
-	0xE7, 0xBC, 0xB6, 0x43, 0xE7, 0xBC, 0xBE, 0x43,
-	0xE7, 0xBD, 0x91, 0x43, 0xE7, 0xBD, 0xB2, 0x43,
-	0xE7, 0xBD, 0xB9, 0x43, 0xE7, 0xBD, 0xBA, 0x43,
-	0xE7, 0xBE, 0x85, 0x43, 0xE7, 0xBE, 0x8A, 0x43,
-	0xE7, 0xBE, 0x95, 0x43, 0xE7, 0xBE, 0x9A, 0x43,
-	0xE7, 0xBE, 0xBD, 0x43, 0xE7, 0xBF, 0xBA, 0x43,
-	0xE8, 0x80, 0x81, 0x43, 0xE8, 0x80, 0x85, 0x43,
-	// Bytes 1180 - 11bf
-	0xE8, 0x80, 0x8C, 0x43, 0xE8, 0x80, 0x92, 0x43,
-	0xE8, 0x80, 0xB3, 0x43, 0xE8, 0x81, 0x86, 0x43,
-	0xE8, 0x81, 0xA0, 0x43, 0xE8, 0x81, 0xAF, 0x43,
-	0xE8, 0x81, 0xB0, 0x43, 0xE8, 0x81, 0xBE, 0x43,
-	0xE8, 0x81, 0xBF, 0x43, 0xE8, 0x82, 0x89, 0x43,
-	0xE8, 0x82, 0x8B, 0x43, 0xE8, 0x82, 0xAD, 0x43,
-	0xE8, 0x82, 0xB2, 0x43, 0xE8, 0x84, 0x83, 0x43,
-	0xE8, 0x84, 0xBE, 0x43, 0xE8, 0x87, 0x98, 0x43,
-	// Bytes 11c0 - 11ff
-	0xE8, 0x87, 0xA3, 0x43, 0xE8, 0x87, 0xA8, 0x43,
-	0xE8, 0x87, 0xAA, 0x43, 0xE8, 0x87, 0xAD, 0x43,
-	0xE8, 0x87, 0xB3, 0x43, 0xE8, 0x87, 0xBC, 0x43,
-	0xE8, 0x88, 0x81, 0x43, 0xE8, 0x88, 0x84, 0x43,
-	0xE8, 0x88, 0x8C, 0x43, 0xE8, 0x88, 0x98, 0x43,
-	0xE8, 0x88, 0x9B, 0x43, 0xE8, 0x88, 0x9F, 0x43,
-	0xE8, 0x89, 0xAE, 0x43, 0xE8, 0x89, 0xAF, 0x43,
-	0xE8, 0x89, 0xB2, 0x43, 0xE8, 0x89, 0xB8, 0x43,
-	// Bytes 1200 - 123f
-	0xE8, 0x89, 0xB9, 0x43, 0xE8, 0x8A, 0x8B, 0x43,
-	0xE8, 0x8A, 0x91, 0x43, 0xE8, 0x8A, 0x9D, 0x43,
-	0xE8, 0x8A, 0xB1, 0x43, 0xE8, 0x8A, 0xB3, 0x43,
-	0xE8, 0x8A, 0xBD, 0x43, 0xE8, 0x8B, 0xA5, 0x43,
-	0xE8, 0x8B, 0xA6, 0x43, 0xE8, 0x8C, 0x9D, 0x43,
-	0xE8, 0x8C, 0xA3, 0x43, 0xE8, 0x8C, 0xB6, 0x43,
-	0xE8, 0x8D, 0x92, 0x43, 0xE8, 0x8D, 0x93, 0x43,
-	0xE8, 0x8D, 0xA3, 0x43, 0xE8, 0x8E, 0xAD, 0x43,
-	// Bytes 1240 - 127f
-	0xE8, 0x8E, 0xBD, 0x43, 0xE8, 0x8F, 0x89, 0x43,
-	0xE8, 0x8F, 0x8A, 0x43, 0xE8, 0x8F, 0x8C, 0x43,
-	0xE8, 0x8F, 0x9C, 0x43, 0xE8, 0x8F, 0xA7, 0x43,
-	0xE8, 0x8F, 0xAF, 0x43, 0xE8, 0x8F, 0xB1, 0x43,
-	0xE8, 0x90, 0xBD, 0x43, 0xE8, 0x91, 0x89, 0x43,
-	0xE8, 0x91, 0x97, 0x43, 0xE8, 0x93, 0xAE, 0x43,
-	0xE8, 0x93, 0xB1, 0x43, 0xE8, 0x93, 0xB3, 0x43,
-	0xE8, 0x93, 0xBC, 0x43, 0xE8, 0x94, 0x96, 0x43,
-	// Bytes 1280 - 12bf
-	0xE8, 0x95, 0xA4, 0x43, 0xE8, 0x97, 0x8D, 0x43,
-	0xE8, 0x97, 0xBA, 0x43, 0xE8, 0x98, 0x86, 0x43,
-	0xE8, 0x98, 0x92, 0x43, 0xE8, 0x98, 0xAD, 0x43,
-	0xE8, 0x98, 0xBF, 0x43, 0xE8, 0x99, 0x8D, 0x43,
-	0xE8, 0x99, 0x90, 0x43, 0xE8, 0x99, 0x9C, 0x43,
-	0xE8, 0x99, 0xA7, 0x43, 0xE8, 0x99, 0xA9, 0x43,
-	0xE8, 0x99, 0xAB, 0x43, 0xE8, 0x9A, 0x88, 0x43,
-	0xE8, 0x9A, 0xA9, 0x43, 0xE8, 0x9B, 0xA2, 0x43,
-	// Bytes 12c0 - 12ff
-	0xE8, 0x9C, 0x8E, 0x43, 0xE8, 0x9C, 0xA8, 0x43,
-	0xE8, 0x9D, 0xAB, 0x43, 0xE8, 0x9D, 0xB9, 0x43,
-	0xE8, 0x9E, 0x86, 0x43, 0xE8, 0x9E, 0xBA, 0x43,
-	0xE8, 0x9F, 0xA1, 0x43, 0xE8, 0xA0, 0x81, 0x43,
-	0xE8, 0xA0, 0x9F, 0x43, 0xE8, 0xA1, 0x80, 0x43,
-	0xE8, 0xA1, 0x8C, 0x43, 0xE8, 0xA1, 0xA0, 0x43,
-	0xE8, 0xA1, 0xA3, 0x43, 0xE8, 0xA3, 0x82, 0x43,
-	0xE8, 0xA3, 0x8F, 0x43, 0xE8, 0xA3, 0x97, 0x43,
-	// Bytes 1300 - 133f
-	0xE8, 0xA3, 0x9E, 0x43, 0xE8, 0xA3, 0xA1, 0x43,
-	0xE8, 0xA3, 0xB8, 0x43, 0xE8, 0xA3, 0xBA, 0x43,
-	0xE8, 0xA4, 0x90, 0x43, 0xE8, 0xA5, 0x81, 0x43,
-	0xE8, 0xA5, 0xA4, 0x43, 0xE8, 0xA5, 0xBE, 0x43,
-	0xE8, 0xA6, 0x86, 0x43, 0xE8, 0xA6, 0x8B, 0x43,
-	0xE8, 0xA6, 0x96, 0x43, 0xE8, 0xA7, 0x92, 0x43,
-	0xE8, 0xA7, 0xA3, 0x43, 0xE8, 0xA8, 0x80, 0x43,
-	0xE8, 0xAA, 0xA0, 0x43, 0xE8, 0xAA, 0xAA, 0x43,
-	// Bytes 1340 - 137f
-	0xE8, 0xAA, 0xBF, 0x43, 0xE8, 0xAB, 0x8B, 0x43,
-	0xE8, 0xAB, 0x92, 0x43, 0xE8, 0xAB, 0x96, 0x43,
-	0xE8, 0xAB, 0xAD, 0x43, 0xE8, 0xAB, 0xB8, 0x43,
-	0xE8, 0xAB, 0xBE, 0x43, 0xE8, 0xAC, 0x81, 0x43,
-	0xE8, 0xAC, 0xB9, 0x43, 0xE8, 0xAD, 0x98, 0x43,
-	0xE8, 0xAE, 0x80, 0x43, 0xE8, 0xAE, 0x8A, 0x43,
-	0xE8, 0xB0, 0xB7, 0x43, 0xE8, 0xB1, 0x86, 0x43,
-	0xE8, 0xB1, 0x88, 0x43, 0xE8, 0xB1, 0x95, 0x43,
-	// Bytes 1380 - 13bf
-	0xE8, 0xB1, 0xB8, 0x43, 0xE8, 0xB2, 0x9D, 0x43,
-	0xE8, 0xB2, 0xA1, 0x43, 0xE8, 0xB2, 0xA9, 0x43,
-	0xE8, 0xB2, 0xAB, 0x43, 0xE8, 0xB3, 0x81, 0x43,
-	0xE8, 0xB3, 0x82, 0x43, 0xE8, 0xB3, 0x87, 0x43,
-	0xE8, 0xB3, 0x88, 0x43, 0xE8, 0xB3, 0x93, 0x43,
-	0xE8, 0xB4, 0x88, 0x43, 0xE8, 0xB4, 0x9B, 0x43,
-	0xE8, 0xB5, 0xA4, 0x43, 0xE8, 0xB5, 0xB0, 0x43,
-	0xE8, 0xB5, 0xB7, 0x43, 0xE8, 0xB6, 0xB3, 0x43,
-	// Bytes 13c0 - 13ff
-	0xE8, 0xB6, 0xBC, 0x43, 0xE8, 0xB7, 0x8B, 0x43,
-	0xE8, 0xB7, 0xAF, 0x43, 0xE8, 0xB7, 0xB0, 0x43,
-	0xE8, 0xBA, 0xAB, 0x43, 0xE8, 0xBB, 0x8A, 0x43,
-	0xE8, 0xBB, 0x94, 0x43, 0xE8, 0xBC, 0xA6, 0x43,
-	0xE8, 0xBC, 0xAA, 0x43, 0xE8, 0xBC, 0xB8, 0x43,
-	0xE8, 0xBC, 0xBB, 0x43, 0xE8, 0xBD, 0xA2, 0x43,
-	0xE8, 0xBE, 0x9B, 0x43, 0xE8, 0xBE, 0x9E, 0x43,
-	0xE8, 0xBE, 0xB0, 0x43, 0xE8, 0xBE, 0xB5, 0x43,
-	// Bytes 1400 - 143f
-	0xE8, 0xBE, 0xB6, 0x43, 0xE9, 0x80, 0xA3, 0x43,
-	0xE9, 0x80, 0xB8, 0x43, 0xE9, 0x81, 0x8A, 0x43,
-	0xE9, 0x81, 0xA9, 0x43, 0xE9, 0x81, 0xB2, 0x43,
-	0xE9, 0x81, 0xBC, 0x43, 0xE9, 0x82, 0x8F, 0x43,
-	0xE9, 0x82, 0x91, 0x43, 0xE9, 0x82, 0x94, 0x43,
-	0xE9, 0x83, 0x8E, 0x43, 0xE9, 0x83, 0x9E, 0x43,
-	0xE9, 0x83, 0xB1, 0x43, 0xE9, 0x83, 0xBD, 0x43,
-	0xE9, 0x84, 0x91, 0x43, 0xE9, 0x84, 0x9B, 0x43,
-	// Bytes 1440 - 147f
-	0xE9, 0x85, 0x89, 0x43, 0xE9, 0x85, 0x8D, 0x43,
-	0xE9, 0x85, 0xAA, 0x43, 0xE9, 0x86, 0x99, 0x43,
-	0xE9, 0x86, 0xB4, 0x43, 0xE9, 0x87, 0x86, 0x43,
-	0xE9, 0x87, 0x8C, 0x43, 0xE9, 0x87, 0x8F, 0x43,
-	0xE9, 0x87, 0x91, 0x43, 0xE9, 0x88, 0xB4, 0x43,
-	0xE9, 0x88, 0xB8, 0x43, 0xE9, 0x89, 0xB6, 0x43,
-	0xE9, 0x89, 0xBC, 0x43, 0xE9, 0x8B, 0x97, 0x43,
-	0xE9, 0x8B, 0x98, 0x43, 0xE9, 0x8C, 0x84, 0x43,
-	// Bytes 1480 - 14bf
-	0xE9, 0x8D, 0x8A, 0x43, 0xE9, 0x8F, 0xB9, 0x43,
-	0xE9, 0x90, 0x95, 0x43, 0xE9, 0x95, 0xB7, 0x43,
-	0xE9, 0x96, 0x80, 0x43, 0xE9, 0x96, 0x8B, 0x43,
-	0xE9, 0x96, 0xAD, 0x43, 0xE9, 0x96, 0xB7, 0x43,
-	0xE9, 0x98, 0x9C, 0x43, 0xE9, 0x98, 0xAE, 0x43,
-	0xE9, 0x99, 0x8B, 0x43, 0xE9, 0x99, 0x8D, 0x43,
-	0xE9, 0x99, 0xB5, 0x43, 0xE9, 0x99, 0xB8, 0x43,
-	0xE9, 0x99, 0xBC, 0x43, 0xE9, 0x9A, 0x86, 0x43,
-	// Bytes 14c0 - 14ff
-	0xE9, 0x9A, 0xA3, 0x43, 0xE9, 0x9A, 0xB6, 0x43,
-	0xE9, 0x9A, 0xB7, 0x43, 0xE9, 0x9A, 0xB8, 0x43,
-	0xE9, 0x9A, 0xB9, 0x43, 0xE9, 0x9B, 0x83, 0x43,
-	0xE9, 0x9B, 0xA2, 0x43, 0xE9, 0x9B, 0xA3, 0x43,
-	0xE9, 0x9B, 0xA8, 0x43, 0xE9, 0x9B, 0xB6, 0x43,
-	0xE9, 0x9B, 0xB7, 0x43, 0xE9, 0x9C, 0xA3, 0x43,
-	0xE9, 0x9C, 0xB2, 0x43, 0xE9, 0x9D, 0x88, 0x43,
-	0xE9, 0x9D, 0x91, 0x43, 0xE9, 0x9D, 0x96, 0x43,
-	// Bytes 1500 - 153f
-	0xE9, 0x9D, 0x9E, 0x43, 0xE9, 0x9D, 0xA2, 0x43,
-	0xE9, 0x9D, 0xA9, 0x43, 0xE9, 0x9F, 0x8B, 0x43,
-	0xE9, 0x9F, 0x9B, 0x43, 0xE9, 0x9F, 0xA0, 0x43,
-	0xE9, 0x9F, 0xAD, 0x43, 0xE9, 0x9F, 0xB3, 0x43,
-	0xE9, 0x9F, 0xBF, 0x43, 0xE9, 0xA0, 0x81, 0x43,
-	0xE9, 0xA0, 0x85, 0x43, 0xE9, 0xA0, 0x8B, 0x43,
-	0xE9, 0xA0, 0x98, 0x43, 0xE9, 0xA0, 0xA9, 0x43,
-	0xE9, 0xA0, 0xBB, 0x43, 0xE9, 0xA1, 0x9E, 0x43,
-	// Bytes 1540 - 157f
-	0xE9, 0xA2, 0xA8, 0x43, 0xE9, 0xA3, 0x9B, 0x43,
-	0xE9, 0xA3, 0x9F, 0x43, 0xE9, 0xA3, 0xA2, 0x43,
-	0xE9, 0xA3, 0xAF, 0x43, 0xE9, 0xA3, 0xBC, 0x43,
-	0xE9, 0xA4, 0xA8, 0x43, 0xE9, 0xA4, 0xA9, 0x43,
-	0xE9, 0xA6, 0x96, 0x43, 0xE9, 0xA6, 0x99, 0x43,
-	0xE9, 0xA6, 0xA7, 0x43, 0xE9, 0xA6, 0xAC, 0x43,
-	0xE9, 0xA7, 0x82, 0x43, 0xE9, 0xA7, 0xB1, 0x43,
-	0xE9, 0xA7, 0xBE, 0x43, 0xE9, 0xA9, 0xAA, 0x43,
-	// Bytes 1580 - 15bf
-	0xE9, 0xAA, 0xA8, 0x43, 0xE9, 0xAB, 0x98, 0x43,
-	0xE9, 0xAB, 0x9F, 0x43, 0xE9, 0xAC, 0x92, 0x43,
-	0xE9, 0xAC, 0xA5, 0x43, 0xE9, 0xAC, 0xAF, 0x43,
-	0xE9, 0xAC, 0xB2, 0x43, 0xE9, 0xAC, 0xBC, 0x43,
-	0xE9, 0xAD, 0x9A, 0x43, 0xE9, 0xAD, 0xAF, 0x43,
-	0xE9, 0xB1, 0x80, 0x43, 0xE9, 0xB1, 0x97, 0x43,
-	0xE9, 0xB3, 0xA5, 0x43, 0xE9, 0xB3, 0xBD, 0x43,
-	0xE9, 0xB5, 0xA7, 0x43, 0xE9, 0xB6, 0xB4, 0x43,
-	// Bytes 15c0 - 15ff
-	0xE9, 0xB7, 0xBA, 0x43, 0xE9, 0xB8, 0x9E, 0x43,
-	0xE9, 0xB9, 0xB5, 0x43, 0xE9, 0xB9, 0xBF, 0x43,
-	0xE9, 0xBA, 0x97, 0x43, 0xE9, 0xBA, 0x9F, 0x43,
-	0xE9, 0xBA, 0xA5, 0x43, 0xE9, 0xBA, 0xBB, 0x43,
-	0xE9, 0xBB, 0x83, 0x43, 0xE9, 0xBB, 0x8D, 0x43,
-	0xE9, 0xBB, 0x8E, 0x43, 0xE9, 0xBB, 0x91, 0x43,
-	0xE9, 0xBB, 0xB9, 0x43, 0xE9, 0xBB, 0xBD, 0x43,
-	0xE9, 0xBB, 0xBE, 0x43, 0xE9, 0xBC, 0x85, 0x43,
-	// Bytes 1600 - 163f
-	0xE9, 0xBC, 0x8E, 0x43, 0xE9, 0xBC, 0x8F, 0x43,
-	0xE9, 0xBC, 0x93, 0x43, 0xE9, 0xBC, 0x96, 0x43,
-	0xE9, 0xBC, 0xA0, 0x43, 0xE9, 0xBC, 0xBB, 0x43,
-	0xE9, 0xBD, 0x83, 0x43, 0xE9, 0xBD, 0x8A, 0x43,
-	0xE9, 0xBD, 0x92, 0x43, 0xE9, 0xBE, 0x8D, 0x43,
-	0xE9, 0xBE, 0x8E, 0x43, 0xE9, 0xBE, 0x9C, 0x43,
-	0xE9, 0xBE, 0x9F, 0x43, 0xE9, 0xBE, 0xA0, 0x43,
-	0xEA, 0x9C, 0xA7, 0x43, 0xEA, 0x9D, 0xAF, 0x43,
-	// Bytes 1640 - 167f
-	0xEA, 0xAC, 0xB7, 0x43, 0xEA, 0xAD, 0x92, 0x44,
-	0xF0, 0xA0, 0x84, 0xA2, 0x44, 0xF0, 0xA0, 0x94,
-	0x9C, 0x44, 0xF0, 0xA0, 0x94, 0xA5, 0x44, 0xF0,
-	0xA0, 0x95, 0x8B, 0x44, 0xF0, 0xA0, 0x98, 0xBA,
-	0x44, 0xF0, 0xA0, 0xA0, 0x84, 0x44, 0xF0, 0xA0,
-	0xA3, 0x9E, 0x44, 0xF0, 0xA0, 0xA8, 0xAC, 0x44,
-	0xF0, 0xA0, 0xAD, 0xA3, 0x44, 0xF0, 0xA1, 0x93,
-	0xA4, 0x44, 0xF0, 0xA1, 0x9A, 0xA8, 0x44, 0xF0,
-	// Bytes 1680 - 16bf
-	0xA1, 0x9B, 0xAA, 0x44, 0xF0, 0xA1, 0xA7, 0x88,
-	0x44, 0xF0, 0xA1, 0xAC, 0x98, 0x44, 0xF0, 0xA1,
-	0xB4, 0x8B, 0x44, 0xF0, 0xA1, 0xB7, 0xA4, 0x44,
-	0xF0, 0xA1, 0xB7, 0xA6, 0x44, 0xF0, 0xA2, 0x86,
-	0x83, 0x44, 0xF0, 0xA2, 0x86, 0x9F, 0x44, 0xF0,
-	0xA2, 0x8C, 0xB1, 0x44, 0xF0, 0xA2, 0x9B, 0x94,
-	0x44, 0xF0, 0xA2, 0xA1, 0x84, 0x44, 0xF0, 0xA2,
-	0xA1, 0x8A, 0x44, 0xF0, 0xA2, 0xAC, 0x8C, 0x44,
-	// Bytes 16c0 - 16ff
-	0xF0, 0xA2, 0xAF, 0xB1, 0x44, 0xF0, 0xA3, 0x80,
-	0x8A, 0x44, 0xF0, 0xA3, 0x8A, 0xB8, 0x44, 0xF0,
-	0xA3, 0x8D, 0x9F, 0x44, 0xF0, 0xA3, 0x8E, 0x93,
-	0x44, 0xF0, 0xA3, 0x8E, 0x9C, 0x44, 0xF0, 0xA3,
-	0x8F, 0x83, 0x44, 0xF0, 0xA3, 0x8F, 0x95, 0x44,
-	0xF0, 0xA3, 0x91, 0xAD, 0x44, 0xF0, 0xA3, 0x9A,
-	0xA3, 0x44, 0xF0, 0xA3, 0xA2, 0xA7, 0x44, 0xF0,
-	0xA3, 0xAA, 0x8D, 0x44, 0xF0, 0xA3, 0xAB, 0xBA,
-	// Bytes 1700 - 173f
-	0x44, 0xF0, 0xA3, 0xB2, 0xBC, 0x44, 0xF0, 0xA3,
-	0xB4, 0x9E, 0x44, 0xF0, 0xA3, 0xBB, 0x91, 0x44,
-	0xF0, 0xA3, 0xBD, 0x9E, 0x44, 0xF0, 0xA3, 0xBE,
-	0x8E, 0x44, 0xF0, 0xA4, 0x89, 0xA3, 0x44, 0xF0,
-	0xA4, 0x8B, 0xAE, 0x44, 0xF0, 0xA4, 0x8E, 0xAB,
-	0x44, 0xF0, 0xA4, 0x98, 0x88, 0x44, 0xF0, 0xA4,
-	0x9C, 0xB5, 0x44, 0xF0, 0xA4, 0xA0, 0x94, 0x44,
-	0xF0, 0xA4, 0xB0, 0xB6, 0x44, 0xF0, 0xA4, 0xB2,
-	// Bytes 1740 - 177f
-	0x92, 0x44, 0xF0, 0xA4, 0xBE, 0xA1, 0x44, 0xF0,
-	0xA4, 0xBE, 0xB8, 0x44, 0xF0, 0xA5, 0x81, 0x84,
-	0x44, 0xF0, 0xA5, 0x83, 0xB2, 0x44, 0xF0, 0xA5,
-	0x83, 0xB3, 0x44, 0xF0, 0xA5, 0x84, 0x99, 0x44,
-	0xF0, 0xA5, 0x84, 0xB3, 0x44, 0xF0, 0xA5, 0x89,
-	0x89, 0x44, 0xF0, 0xA5, 0x90, 0x9D, 0x44, 0xF0,
-	0xA5, 0x98, 0xA6, 0x44, 0xF0, 0xA5, 0x9A, 0x9A,
-	0x44, 0xF0, 0xA5, 0x9B, 0x85, 0x44, 0xF0, 0xA5,
-	// Bytes 1780 - 17bf
-	0xA5, 0xBC, 0x44, 0xF0, 0xA5, 0xAA, 0xA7, 0x44,
-	0xF0, 0xA5, 0xAE, 0xAB, 0x44, 0xF0, 0xA5, 0xB2,
-	0x80, 0x44, 0xF0, 0xA5, 0xB3, 0x90, 0x44, 0xF0,
-	0xA5, 0xBE, 0x86, 0x44, 0xF0, 0xA6, 0x87, 0x9A,
-	0x44, 0xF0, 0xA6, 0x88, 0xA8, 0x44, 0xF0, 0xA6,
-	0x89, 0x87, 0x44, 0xF0, 0xA6, 0x8B, 0x99, 0x44,
-	0xF0, 0xA6, 0x8C, 0xBE, 0x44, 0xF0, 0xA6, 0x93,
-	0x9A, 0x44, 0xF0, 0xA6, 0x94, 0xA3, 0x44, 0xF0,
-	// Bytes 17c0 - 17ff
-	0xA6, 0x96, 0xA8, 0x44, 0xF0, 0xA6, 0x9E, 0xA7,
-	0x44, 0xF0, 0xA6, 0x9E, 0xB5, 0x44, 0xF0, 0xA6,
-	0xAC, 0xBC, 0x44, 0xF0, 0xA6, 0xB0, 0xB6, 0x44,
-	0xF0, 0xA6, 0xB3, 0x95, 0x44, 0xF0, 0xA6, 0xB5,
-	0xAB, 0x44, 0xF0, 0xA6, 0xBC, 0xAC, 0x44, 0xF0,
-	0xA6, 0xBE, 0xB1, 0x44, 0xF0, 0xA7, 0x83, 0x92,
-	0x44, 0xF0, 0xA7, 0x8F, 0x8A, 0x44, 0xF0, 0xA7,
-	0x99, 0xA7, 0x44, 0xF0, 0xA7, 0xA2, 0xAE, 0x44,
-	// Bytes 1800 - 183f
-	0xF0, 0xA7, 0xA5, 0xA6, 0x44, 0xF0, 0xA7, 0xB2,
-	0xA8, 0x44, 0xF0, 0xA7, 0xBB, 0x93, 0x44, 0xF0,
-	0xA7, 0xBC, 0xAF, 0x44, 0xF0, 0xA8, 0x97, 0x92,
-	0x44, 0xF0, 0xA8, 0x97, 0xAD, 0x44, 0xF0, 0xA8,
-	0x9C, 0xAE, 0x44, 0xF0, 0xA8, 0xAF, 0xBA, 0x44,
-	0xF0, 0xA8, 0xB5, 0xB7, 0x44, 0xF0, 0xA9, 0x85,
-	0x85, 0x44, 0xF0, 0xA9, 0x87, 0x9F, 0x44, 0xF0,
-	0xA9, 0x88, 0x9A, 0x44, 0xF0, 0xA9, 0x90, 0x8A,
-	// Bytes 1840 - 187f
-	0x44, 0xF0, 0xA9, 0x92, 0x96, 0x44, 0xF0, 0xA9,
-	0x96, 0xB6, 0x44, 0xF0, 0xA9, 0xAC, 0xB0, 0x44,
-	0xF0, 0xAA, 0x83, 0x8E, 0x44, 0xF0, 0xAA, 0x84,
-	0x85, 0x44, 0xF0, 0xAA, 0x88, 0x8E, 0x44, 0xF0,
-	0xAA, 0x8A, 0x91, 0x44, 0xF0, 0xAA, 0x8E, 0x92,
-	0x44, 0xF0, 0xAA, 0x98, 0x80, 0x42, 0x21, 0x21,
-	0x42, 0x21, 0x3F, 0x42, 0x2E, 0x2E, 0x42, 0x30,
-	0x2C, 0x42, 0x30, 0x2E, 0x42, 0x31, 0x2C, 0x42,
-	// Bytes 1880 - 18bf
-	0x31, 0x2E, 0x42, 0x31, 0x30, 0x42, 0x31, 0x31,
-	0x42, 0x31, 0x32, 0x42, 0x31, 0x33, 0x42, 0x31,
-	0x34, 0x42, 0x31, 0x35, 0x42, 0x31, 0x36, 0x42,
-	0x31, 0x37, 0x42, 0x31, 0x38, 0x42, 0x31, 0x39,
-	0x42, 0x32, 0x2C, 0x42, 0x32, 0x2E, 0x42, 0x32,
-	0x30, 0x42, 0x32, 0x31, 0x42, 0x32, 0x32, 0x42,
-	0x32, 0x33, 0x42, 0x32, 0x34, 0x42, 0x32, 0x35,
-	0x42, 0x32, 0x36, 0x42, 0x32, 0x37, 0x42, 0x32,
-	// Bytes 18c0 - 18ff
-	0x38, 0x42, 0x32, 0x39, 0x42, 0x33, 0x2C, 0x42,
-	0x33, 0x2E, 0x42, 0x33, 0x30, 0x42, 0x33, 0x31,
-	0x42, 0x33, 0x32, 0x42, 0x33, 0x33, 0x42, 0x33,
-	0x34, 0x42, 0x33, 0x35, 0x42, 0x33, 0x36, 0x42,
-	0x33, 0x37, 0x42, 0x33, 0x38, 0x42, 0x33, 0x39,
-	0x42, 0x34, 0x2C, 0x42, 0x34, 0x2E, 0x42, 0x34,
-	0x30, 0x42, 0x34, 0x31, 0x42, 0x34, 0x32, 0x42,
-	0x34, 0x33, 0x42, 0x34, 0x34, 0x42, 0x34, 0x35,
-	// Bytes 1900 - 193f
-	0x42, 0x34, 0x36, 0x42, 0x34, 0x37, 0x42, 0x34,
-	0x38, 0x42, 0x34, 0x39, 0x42, 0x35, 0x2C, 0x42,
-	0x35, 0x2E, 0x42, 0x35, 0x30, 0x42, 0x36, 0x2C,
-	0x42, 0x36, 0x2E, 0x42, 0x37, 0x2C, 0x42, 0x37,
-	0x2E, 0x42, 0x38, 0x2C, 0x42, 0x38, 0x2E, 0x42,
-	0x39, 0x2C, 0x42, 0x39, 0x2E, 0x42, 0x3D, 0x3D,
-	0x42, 0x3F, 0x21, 0x42, 0x3F, 0x3F, 0x42, 0x41,
-	0x55, 0x42, 0x42, 0x71, 0x42, 0x43, 0x44, 0x42,
-	// Bytes 1940 - 197f
-	0x44, 0x4A, 0x42, 0x44, 0x5A, 0x42, 0x44, 0x7A,
-	0x42, 0x47, 0x42, 0x42, 0x47, 0x79, 0x42, 0x48,
-	0x50, 0x42, 0x48, 0x56, 0x42, 0x48, 0x67, 0x42,
-	0x48, 0x7A, 0x42, 0x49, 0x49, 0x42, 0x49, 0x4A,
-	0x42, 0x49, 0x55, 0x42, 0x49, 0x56, 0x42, 0x49,
-	0x58, 0x42, 0x4B, 0x42, 0x42, 0x4B, 0x4B, 0x42,
-	0x4B, 0x4D, 0x42, 0x4C, 0x4A, 0x42, 0x4C, 0x6A,
-	0x42, 0x4D, 0x42, 0x42, 0x4D, 0x43, 0x42, 0x4D,
-	// Bytes 1980 - 19bf
-	0x44, 0x42, 0x4D, 0x56, 0x42, 0x4D, 0x57, 0x42,
-	0x4E, 0x4A, 0x42, 0x4E, 0x6A, 0x42, 0x4E, 0x6F,
-	0x42, 0x50, 0x48, 0x42, 0x50, 0x52, 0x42, 0x50,
-	0x61, 0x42, 0x52, 0x73, 0x42, 0x53, 0x44, 0x42,
-	0x53, 0x4D, 0x42, 0x53, 0x53, 0x42, 0x53, 0x76,
-	0x42, 0x54, 0x4D, 0x42, 0x56, 0x49, 0x42, 0x57,
-	0x43, 0x42, 0x57, 0x5A, 0x42, 0x57, 0x62, 0x42,
-	0x58, 0x49, 0x42, 0x63, 0x63, 0x42, 0x63, 0x64,
-	// Bytes 19c0 - 19ff
-	0x42, 0x63, 0x6D, 0x42, 0x64, 0x42, 0x42, 0x64,
-	0x61, 0x42, 0x64, 0x6C, 0x42, 0x64, 0x6D, 0x42,
-	0x64, 0x7A, 0x42, 0x65, 0x56, 0x42, 0x66, 0x66,
-	0x42, 0x66, 0x69, 0x42, 0x66, 0x6C, 0x42, 0x66,
-	0x6D, 0x42, 0x68, 0x61, 0x42, 0x69, 0x69, 0x42,
-	0x69, 0x6A, 0x42, 0x69, 0x6E, 0x42, 0x69, 0x76,
-	0x42, 0x69, 0x78, 0x42, 0x6B, 0x41, 0x42, 0x6B,
-	0x56, 0x42, 0x6B, 0x57, 0x42, 0x6B, 0x67, 0x42,
-	// Bytes 1a00 - 1a3f
-	0x6B, 0x6C, 0x42, 0x6B, 0x6D, 0x42, 0x6B, 0x74,
-	0x42, 0x6C, 0x6A, 0x42, 0x6C, 0x6D, 0x42, 0x6C,
-	0x6E, 0x42, 0x6C, 0x78, 0x42, 0x6D, 0x32, 0x42,
-	0x6D, 0x33, 0x42, 0x6D, 0x41, 0x42, 0x6D, 0x56,
-	0x42, 0x6D, 0x57, 0x42, 0x6D, 0x62, 0x42, 0x6D,
-	0x67, 0x42, 0x6D, 0x6C, 0x42, 0x6D, 0x6D, 0x42,
-	0x6D, 0x73, 0x42, 0x6E, 0x41, 0x42, 0x6E, 0x46,
-	0x42, 0x6E, 0x56, 0x42, 0x6E, 0x57, 0x42, 0x6E,
-	// Bytes 1a40 - 1a7f
-	0x6A, 0x42, 0x6E, 0x6D, 0x42, 0x6E, 0x73, 0x42,
-	0x6F, 0x56, 0x42, 0x70, 0x41, 0x42, 0x70, 0x46,
-	0x42, 0x70, 0x56, 0x42, 0x70, 0x57, 0x42, 0x70,
-	0x63, 0x42, 0x70, 0x73, 0x42, 0x73, 0x72, 0x42,
-	0x73, 0x74, 0x42, 0x76, 0x69, 0x42, 0x78, 0x69,
-	0x43, 0x28, 0x31, 0x29, 0x43, 0x28, 0x32, 0x29,
-	0x43, 0x28, 0x33, 0x29, 0x43, 0x28, 0x34, 0x29,
-	0x43, 0x28, 0x35, 0x29, 0x43, 0x28, 0x36, 0x29,
-	// Bytes 1a80 - 1abf
-	0x43, 0x28, 0x37, 0x29, 0x43, 0x28, 0x38, 0x29,
-	0x43, 0x28, 0x39, 0x29, 0x43, 0x28, 0x41, 0x29,
-	0x43, 0x28, 0x42, 0x29, 0x43, 0x28, 0x43, 0x29,
-	0x43, 0x28, 0x44, 0x29, 0x43, 0x28, 0x45, 0x29,
-	0x43, 0x28, 0x46, 0x29, 0x43, 0x28, 0x47, 0x29,
-	0x43, 0x28, 0x48, 0x29, 0x43, 0x28, 0x49, 0x29,
-	0x43, 0x28, 0x4A, 0x29, 0x43, 0x28, 0x4B, 0x29,
-	0x43, 0x28, 0x4C, 0x29, 0x43, 0x28, 0x4D, 0x29,
-	// Bytes 1ac0 - 1aff
-	0x43, 0x28, 0x4E, 0x29, 0x43, 0x28, 0x4F, 0x29,
-	0x43, 0x28, 0x50, 0x29, 0x43, 0x28, 0x51, 0x29,
-	0x43, 0x28, 0x52, 0x29, 0x43, 0x28, 0x53, 0x29,
-	0x43, 0x28, 0x54, 0x29, 0x43, 0x28, 0x55, 0x29,
-	0x43, 0x28, 0x56, 0x29, 0x43, 0x28, 0x57, 0x29,
-	0x43, 0x28, 0x58, 0x29, 0x43, 0x28, 0x59, 0x29,
-	0x43, 0x28, 0x5A, 0x29, 0x43, 0x28, 0x61, 0x29,
-	0x43, 0x28, 0x62, 0x29, 0x43, 0x28, 0x63, 0x29,
-	// Bytes 1b00 - 1b3f
-	0x43, 0x28, 0x64, 0x29, 0x43, 0x28, 0x65, 0x29,
-	0x43, 0x28, 0x66, 0x29, 0x43, 0x28, 0x67, 0x29,
-	0x43, 0x28, 0x68, 0x29, 0x43, 0x28, 0x69, 0x29,
-	0x43, 0x28, 0x6A, 0x29, 0x43, 0x28, 0x6B, 0x29,
-	0x43, 0x28, 0x6C, 0x29, 0x43, 0x28, 0x6D, 0x29,
-	0x43, 0x28, 0x6E, 0x29, 0x43, 0x28, 0x6F, 0x29,
-	0x43, 0x28, 0x70, 0x29, 0x43, 0x28, 0x71, 0x29,
-	0x43, 0x28, 0x72, 0x29, 0x43, 0x28, 0x73, 0x29,
-	// Bytes 1b40 - 1b7f
-	0x43, 0x28, 0x74, 0x29, 0x43, 0x28, 0x75, 0x29,
-	0x43, 0x28, 0x76, 0x29, 0x43, 0x28, 0x77, 0x29,
-	0x43, 0x28, 0x78, 0x29, 0x43, 0x28, 0x79, 0x29,
-	0x43, 0x28, 0x7A, 0x29, 0x43, 0x2E, 0x2E, 0x2E,
-	0x43, 0x31, 0x30, 0x2E, 0x43, 0x31, 0x31, 0x2E,
-	0x43, 0x31, 0x32, 0x2E, 0x43, 0x31, 0x33, 0x2E,
-	0x43, 0x31, 0x34, 0x2E, 0x43, 0x31, 0x35, 0x2E,
-	0x43, 0x31, 0x36, 0x2E, 0x43, 0x31, 0x37, 0x2E,
-	// Bytes 1b80 - 1bbf
-	0x43, 0x31, 0x38, 0x2E, 0x43, 0x31, 0x39, 0x2E,
-	0x43, 0x32, 0x30, 0x2E, 0x43, 0x3A, 0x3A, 0x3D,
-	0x43, 0x3D, 0x3D, 0x3D, 0x43, 0x43, 0x6F, 0x2E,
-	0x43, 0x46, 0x41, 0x58, 0x43, 0x47, 0x48, 0x7A,
-	0x43, 0x47, 0x50, 0x61, 0x43, 0x49, 0x49, 0x49,
-	0x43, 0x4C, 0x54, 0x44, 0x43, 0x4C, 0xC2, 0xB7,
-	0x43, 0x4D, 0x48, 0x7A, 0x43, 0x4D, 0x50, 0x61,
-	0x43, 0x4D, 0xCE, 0xA9, 0x43, 0x50, 0x50, 0x4D,
-	// Bytes 1bc0 - 1bff
-	0x43, 0x50, 0x50, 0x56, 0x43, 0x50, 0x54, 0x45,
-	0x43, 0x54, 0x45, 0x4C, 0x43, 0x54, 0x48, 0x7A,
-	0x43, 0x56, 0x49, 0x49, 0x43, 0x58, 0x49, 0x49,
-	0x43, 0x61, 0x2F, 0x63, 0x43, 0x61, 0x2F, 0x73,
-	0x43, 0x61, 0xCA, 0xBE, 0x43, 0x62, 0x61, 0x72,
-	0x43, 0x63, 0x2F, 0x6F, 0x43, 0x63, 0x2F, 0x75,
-	0x43, 0x63, 0x61, 0x6C, 0x43, 0x63, 0x6D, 0x32,
-	0x43, 0x63, 0x6D, 0x33, 0x43, 0x64, 0x6D, 0x32,
-	// Bytes 1c00 - 1c3f
-	0x43, 0x64, 0x6D, 0x33, 0x43, 0x65, 0x72, 0x67,
-	0x43, 0x66, 0x66, 0x69, 0x43, 0x66, 0x66, 0x6C,
-	0x43, 0x67, 0x61, 0x6C, 0x43, 0x68, 0x50, 0x61,
-	0x43, 0x69, 0x69, 0x69, 0x43, 0x6B, 0x48, 0x7A,
-	0x43, 0x6B, 0x50, 0x61, 0x43, 0x6B, 0x6D, 0x32,
-	0x43, 0x6B, 0x6D, 0x33, 0x43, 0x6B, 0xCE, 0xA9,
-	0x43, 0x6C, 0x6F, 0x67, 0x43, 0x6C, 0xC2, 0xB7,
-	0x43, 0x6D, 0x69, 0x6C, 0x43, 0x6D, 0x6D, 0x32,
-	// Bytes 1c40 - 1c7f
-	0x43, 0x6D, 0x6D, 0x33, 0x43, 0x6D, 0x6F, 0x6C,
-	0x43, 0x72, 0x61, 0x64, 0x43, 0x76, 0x69, 0x69,
-	0x43, 0x78, 0x69, 0x69, 0x43, 0xC2, 0xB0, 0x43,
-	0x43, 0xC2, 0xB0, 0x46, 0x43, 0xCA, 0xBC, 0x6E,
-	0x43, 0xCE, 0xBC, 0x41, 0x43, 0xCE, 0xBC, 0x46,
-	0x43, 0xCE, 0xBC, 0x56, 0x43, 0xCE, 0xBC, 0x57,
-	0x43, 0xCE, 0xBC, 0x67, 0x43, 0xCE, 0xBC, 0x6C,
-	0x43, 0xCE, 0xBC, 0x6D, 0x43, 0xCE, 0xBC, 0x73,
-	// Bytes 1c80 - 1cbf
-	0x44, 0x28, 0x31, 0x30, 0x29, 0x44, 0x28, 0x31,
-	0x31, 0x29, 0x44, 0x28, 0x31, 0x32, 0x29, 0x44,
-	0x28, 0x31, 0x33, 0x29, 0x44, 0x28, 0x31, 0x34,
-	0x29, 0x44, 0x28, 0x31, 0x35, 0x29, 0x44, 0x28,
-	0x31, 0x36, 0x29, 0x44, 0x28, 0x31, 0x37, 0x29,
-	0x44, 0x28, 0x31, 0x38, 0x29, 0x44, 0x28, 0x31,
-	0x39, 0x29, 0x44, 0x28, 0x32, 0x30, 0x29, 0x44,
-	0x30, 0xE7, 0x82, 0xB9, 0x44, 0x31, 0xE2, 0x81,
-	// Bytes 1cc0 - 1cff
-	0x84, 0x44, 0x31, 0xE6, 0x97, 0xA5, 0x44, 0x31,
-	0xE6, 0x9C, 0x88, 0x44, 0x31, 0xE7, 0x82, 0xB9,
-	0x44, 0x32, 0xE6, 0x97, 0xA5, 0x44, 0x32, 0xE6,
-	0x9C, 0x88, 0x44, 0x32, 0xE7, 0x82, 0xB9, 0x44,
-	0x33, 0xE6, 0x97, 0xA5, 0x44, 0x33, 0xE6, 0x9C,
-	0x88, 0x44, 0x33, 0xE7, 0x82, 0xB9, 0x44, 0x34,
-	0xE6, 0x97, 0xA5, 0x44, 0x34, 0xE6, 0x9C, 0x88,
-	0x44, 0x34, 0xE7, 0x82, 0xB9, 0x44, 0x35, 0xE6,
-	// Bytes 1d00 - 1d3f
-	0x97, 0xA5, 0x44, 0x35, 0xE6, 0x9C, 0x88, 0x44,
-	0x35, 0xE7, 0x82, 0xB9, 0x44, 0x36, 0xE6, 0x97,
-	0xA5, 0x44, 0x36, 0xE6, 0x9C, 0x88, 0x44, 0x36,
-	0xE7, 0x82, 0xB9, 0x44, 0x37, 0xE6, 0x97, 0xA5,
-	0x44, 0x37, 0xE6, 0x9C, 0x88, 0x44, 0x37, 0xE7,
-	0x82, 0xB9, 0x44, 0x38, 0xE6, 0x97, 0xA5, 0x44,
-	0x38, 0xE6, 0x9C, 0x88, 0x44, 0x38, 0xE7, 0x82,
-	0xB9, 0x44, 0x39, 0xE6, 0x97, 0xA5, 0x44, 0x39,
-	// Bytes 1d40 - 1d7f
-	0xE6, 0x9C, 0x88, 0x44, 0x39, 0xE7, 0x82, 0xB9,
-	0x44, 0x56, 0x49, 0x49, 0x49, 0x44, 0x61, 0x2E,
-	0x6D, 0x2E, 0x44, 0x6B, 0x63, 0x61, 0x6C, 0x44,
-	0x70, 0x2E, 0x6D, 0x2E, 0x44, 0x76, 0x69, 0x69,
-	0x69, 0x44, 0xD5, 0xA5, 0xD6, 0x82, 0x44, 0xD5,
-	0xB4, 0xD5, 0xA5, 0x44, 0xD5, 0xB4, 0xD5, 0xAB,
-	0x44, 0xD5, 0xB4, 0xD5, 0xAD, 0x44, 0xD5, 0xB4,
-	0xD5, 0xB6, 0x44, 0xD5, 0xBE, 0xD5, 0xB6, 0x44,
-	// Bytes 1d80 - 1dbf
-	0xD7, 0x90, 0xD7, 0x9C, 0x44, 0xD8, 0xA7, 0xD9,
-	0xB4, 0x44, 0xD8, 0xA8, 0xD8, 0xAC, 0x44, 0xD8,
-	0xA8, 0xD8, 0xAD, 0x44, 0xD8, 0xA8, 0xD8, 0xAE,
-	0x44, 0xD8, 0xA8, 0xD8, 0xB1, 0x44, 0xD8, 0xA8,
-	0xD8, 0xB2, 0x44, 0xD8, 0xA8, 0xD9, 0x85, 0x44,
-	0xD8, 0xA8, 0xD9, 0x86, 0x44, 0xD8, 0xA8, 0xD9,
-	0x87, 0x44, 0xD8, 0xA8, 0xD9, 0x89, 0x44, 0xD8,
-	0xA8, 0xD9, 0x8A, 0x44, 0xD8, 0xAA, 0xD8, 0xAC,
-	// Bytes 1dc0 - 1dff
-	0x44, 0xD8, 0xAA, 0xD8, 0xAD, 0x44, 0xD8, 0xAA,
-	0xD8, 0xAE, 0x44, 0xD8, 0xAA, 0xD8, 0xB1, 0x44,
-	0xD8, 0xAA, 0xD8, 0xB2, 0x44, 0xD8, 0xAA, 0xD9,
-	0x85, 0x44, 0xD8, 0xAA, 0xD9, 0x86, 0x44, 0xD8,
-	0xAA, 0xD9, 0x87, 0x44, 0xD8, 0xAA, 0xD9, 0x89,
-	0x44, 0xD8, 0xAA, 0xD9, 0x8A, 0x44, 0xD8, 0xAB,
-	0xD8, 0xAC, 0x44, 0xD8, 0xAB, 0xD8, 0xB1, 0x44,
-	0xD8, 0xAB, 0xD8, 0xB2, 0x44, 0xD8, 0xAB, 0xD9,
-	// Bytes 1e00 - 1e3f
-	0x85, 0x44, 0xD8, 0xAB, 0xD9, 0x86, 0x44, 0xD8,
-	0xAB, 0xD9, 0x87, 0x44, 0xD8, 0xAB, 0xD9, 0x89,
-	0x44, 0xD8, 0xAB, 0xD9, 0x8A, 0x44, 0xD8, 0xAC,
-	0xD8, 0xAD, 0x44, 0xD8, 0xAC, 0xD9, 0x85, 0x44,
-	0xD8, 0xAC, 0xD9, 0x89, 0x44, 0xD8, 0xAC, 0xD9,
-	0x8A, 0x44, 0xD8, 0xAD, 0xD8, 0xAC, 0x44, 0xD8,
-	0xAD, 0xD9, 0x85, 0x44, 0xD8, 0xAD, 0xD9, 0x89,
-	0x44, 0xD8, 0xAD, 0xD9, 0x8A, 0x44, 0xD8, 0xAE,
-	// Bytes 1e40 - 1e7f
-	0xD8, 0xAC, 0x44, 0xD8, 0xAE, 0xD8, 0xAD, 0x44,
-	0xD8, 0xAE, 0xD9, 0x85, 0x44, 0xD8, 0xAE, 0xD9,
-	0x89, 0x44, 0xD8, 0xAE, 0xD9, 0x8A, 0x44, 0xD8,
-	0xB3, 0xD8, 0xAC, 0x44, 0xD8, 0xB3, 0xD8, 0xAD,
-	0x44, 0xD8, 0xB3, 0xD8, 0xAE, 0x44, 0xD8, 0xB3,
-	0xD8, 0xB1, 0x44, 0xD8, 0xB3, 0xD9, 0x85, 0x44,
-	0xD8, 0xB3, 0xD9, 0x87, 0x44, 0xD8, 0xB3, 0xD9,
-	0x89, 0x44, 0xD8, 0xB3, 0xD9, 0x8A, 0x44, 0xD8,
-	// Bytes 1e80 - 1ebf
-	0xB4, 0xD8, 0xAC, 0x44, 0xD8, 0xB4, 0xD8, 0xAD,
-	0x44, 0xD8, 0xB4, 0xD8, 0xAE, 0x44, 0xD8, 0xB4,
-	0xD8, 0xB1, 0x44, 0xD8, 0xB4, 0xD9, 0x85, 0x44,
-	0xD8, 0xB4, 0xD9, 0x87, 0x44, 0xD8, 0xB4, 0xD9,
-	0x89, 0x44, 0xD8, 0xB4, 0xD9, 0x8A, 0x44, 0xD8,
-	0xB5, 0xD8, 0xAD, 0x44, 0xD8, 0xB5, 0xD8, 0xAE,
-	0x44, 0xD8, 0xB5, 0xD8, 0xB1, 0x44, 0xD8, 0xB5,
-	0xD9, 0x85, 0x44, 0xD8, 0xB5, 0xD9, 0x89, 0x44,
-	// Bytes 1ec0 - 1eff
-	0xD8, 0xB5, 0xD9, 0x8A, 0x44, 0xD8, 0xB6, 0xD8,
-	0xAC, 0x44, 0xD8, 0xB6, 0xD8, 0xAD, 0x44, 0xD8,
-	0xB6, 0xD8, 0xAE, 0x44, 0xD8, 0xB6, 0xD8, 0xB1,
-	0x44, 0xD8, 0xB6, 0xD9, 0x85, 0x44, 0xD8, 0xB6,
-	0xD9, 0x89, 0x44, 0xD8, 0xB6, 0xD9, 0x8A, 0x44,
-	0xD8, 0xB7, 0xD8, 0xAD, 0x44, 0xD8, 0xB7, 0xD9,
-	0x85, 0x44, 0xD8, 0xB7, 0xD9, 0x89, 0x44, 0xD8,
-	0xB7, 0xD9, 0x8A, 0x44, 0xD8, 0xB8, 0xD9, 0x85,
-	// Bytes 1f00 - 1f3f
-	0x44, 0xD8, 0xB9, 0xD8, 0xAC, 0x44, 0xD8, 0xB9,
-	0xD9, 0x85, 0x44, 0xD8, 0xB9, 0xD9, 0x89, 0x44,
-	0xD8, 0xB9, 0xD9, 0x8A, 0x44, 0xD8, 0xBA, 0xD8,
-	0xAC, 0x44, 0xD8, 0xBA, 0xD9, 0x85, 0x44, 0xD8,
-	0xBA, 0xD9, 0x89, 0x44, 0xD8, 0xBA, 0xD9, 0x8A,
-	0x44, 0xD9, 0x81, 0xD8, 0xAC, 0x44, 0xD9, 0x81,
-	0xD8, 0xAD, 0x44, 0xD9, 0x81, 0xD8, 0xAE, 0x44,
-	0xD9, 0x81, 0xD9, 0x85, 0x44, 0xD9, 0x81, 0xD9,
-	// Bytes 1f40 - 1f7f
-	0x89, 0x44, 0xD9, 0x81, 0xD9, 0x8A, 0x44, 0xD9,
-	0x82, 0xD8, 0xAD, 0x44, 0xD9, 0x82, 0xD9, 0x85,
-	0x44, 0xD9, 0x82, 0xD9, 0x89, 0x44, 0xD9, 0x82,
-	0xD9, 0x8A, 0x44, 0xD9, 0x83, 0xD8, 0xA7, 0x44,
-	0xD9, 0x83, 0xD8, 0xAC, 0x44, 0xD9, 0x83, 0xD8,
-	0xAD, 0x44, 0xD9, 0x83, 0xD8, 0xAE, 0x44, 0xD9,
-	0x83, 0xD9, 0x84, 0x44, 0xD9, 0x83, 0xD9, 0x85,
-	0x44, 0xD9, 0x83, 0xD9, 0x89, 0x44, 0xD9, 0x83,
-	// Bytes 1f80 - 1fbf
-	0xD9, 0x8A, 0x44, 0xD9, 0x84, 0xD8, 0xA7, 0x44,
-	0xD9, 0x84, 0xD8, 0xAC, 0x44, 0xD9, 0x84, 0xD8,
-	0xAD, 0x44, 0xD9, 0x84, 0xD8, 0xAE, 0x44, 0xD9,
-	0x84, 0xD9, 0x85, 0x44, 0xD9, 0x84, 0xD9, 0x87,
-	0x44, 0xD9, 0x84, 0xD9, 0x89, 0x44, 0xD9, 0x84,
-	0xD9, 0x8A, 0x44, 0xD9, 0x85, 0xD8, 0xA7, 0x44,
-	0xD9, 0x85, 0xD8, 0xAC, 0x44, 0xD9, 0x85, 0xD8,
-	0xAD, 0x44, 0xD9, 0x85, 0xD8, 0xAE, 0x44, 0xD9,
-	// Bytes 1fc0 - 1fff
-	0x85, 0xD9, 0x85, 0x44, 0xD9, 0x85, 0xD9, 0x89,
-	0x44, 0xD9, 0x85, 0xD9, 0x8A, 0x44, 0xD9, 0x86,
-	0xD8, 0xAC, 0x44, 0xD9, 0x86, 0xD8, 0xAD, 0x44,
-	0xD9, 0x86, 0xD8, 0xAE, 0x44, 0xD9, 0x86, 0xD8,
-	0xB1, 0x44, 0xD9, 0x86, 0xD8, 0xB2, 0x44, 0xD9,
-	0x86, 0xD9, 0x85, 0x44, 0xD9, 0x86, 0xD9, 0x86,
-	0x44, 0xD9, 0x86, 0xD9, 0x87, 0x44, 0xD9, 0x86,
-	0xD9, 0x89, 0x44, 0xD9, 0x86, 0xD9, 0x8A, 0x44,
-	// Bytes 2000 - 203f
-	0xD9, 0x87, 0xD8, 0xAC, 0x44, 0xD9, 0x87, 0xD9,
-	0x85, 0x44, 0xD9, 0x87, 0xD9, 0x89, 0x44, 0xD9,
-	0x87, 0xD9, 0x8A, 0x44, 0xD9, 0x88, 0xD9, 0xB4,
-	0x44, 0xD9, 0x8A, 0xD8, 0xAC, 0x44, 0xD9, 0x8A,
-	0xD8, 0xAD, 0x44, 0xD9, 0x8A, 0xD8, 0xAE, 0x44,
-	0xD9, 0x8A, 0xD8, 0xB1, 0x44, 0xD9, 0x8A, 0xD8,
-	0xB2, 0x44, 0xD9, 0x8A, 0xD9, 0x85, 0x44, 0xD9,
-	0x8A, 0xD9, 0x86, 0x44, 0xD9, 0x8A, 0xD9, 0x87,
-	// Bytes 2040 - 207f
-	0x44, 0xD9, 0x8A, 0xD9, 0x89, 0x44, 0xD9, 0x8A,
-	0xD9, 0x8A, 0x44, 0xD9, 0x8A, 0xD9, 0xB4, 0x44,
-	0xDB, 0x87, 0xD9, 0xB4, 0x45, 0x28, 0xE1, 0x84,
-	0x80, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x82, 0x29,
-	0x45, 0x28, 0xE1, 0x84, 0x83, 0x29, 0x45, 0x28,
-	0xE1, 0x84, 0x85, 0x29, 0x45, 0x28, 0xE1, 0x84,
-	0x86, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x87, 0x29,
-	0x45, 0x28, 0xE1, 0x84, 0x89, 0x29, 0x45, 0x28,
-	// Bytes 2080 - 20bf
-	0xE1, 0x84, 0x8B, 0x29, 0x45, 0x28, 0xE1, 0x84,
-	0x8C, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x8E, 0x29,
-	0x45, 0x28, 0xE1, 0x84, 0x8F, 0x29, 0x45, 0x28,
-	0xE1, 0x84, 0x90, 0x29, 0x45, 0x28, 0xE1, 0x84,
-	0x91, 0x29, 0x45, 0x28, 0xE1, 0x84, 0x92, 0x29,
-	0x45, 0x28, 0xE4, 0xB8, 0x80, 0x29, 0x45, 0x28,
-	0xE4, 0xB8, 0x83, 0x29, 0x45, 0x28, 0xE4, 0xB8,
-	0x89, 0x29, 0x45, 0x28, 0xE4, 0xB9, 0x9D, 0x29,
-	// Bytes 20c0 - 20ff
-	0x45, 0x28, 0xE4, 0xBA, 0x8C, 0x29, 0x45, 0x28,
-	0xE4, 0xBA, 0x94, 0x29, 0x45, 0x28, 0xE4, 0xBB,
-	0xA3, 0x29, 0x45, 0x28, 0xE4, 0xBC, 0x81, 0x29,
-	0x45, 0x28, 0xE4, 0xBC, 0x91, 0x29, 0x45, 0x28,
-	0xE5, 0x85, 0xAB, 0x29, 0x45, 0x28, 0xE5, 0x85,
-	0xAD, 0x29, 0x45, 0x28, 0xE5, 0x8A, 0xB4, 0x29,
-	0x45, 0x28, 0xE5, 0x8D, 0x81, 0x29, 0x45, 0x28,
-	0xE5, 0x8D, 0x94, 0x29, 0x45, 0x28, 0xE5, 0x90,
-	// Bytes 2100 - 213f
-	0x8D, 0x29, 0x45, 0x28, 0xE5, 0x91, 0xBC, 0x29,
-	0x45, 0x28, 0xE5, 0x9B, 0x9B, 0x29, 0x45, 0x28,
-	0xE5, 0x9C, 0x9F, 0x29, 0x45, 0x28, 0xE5, 0xAD,
-	0xA6, 0x29, 0x45, 0x28, 0xE6, 0x97, 0xA5, 0x29,
-	0x45, 0x28, 0xE6, 0x9C, 0x88, 0x29, 0x45, 0x28,
-	0xE6, 0x9C, 0x89, 0x29, 0x45, 0x28, 0xE6, 0x9C,
-	0xA8, 0x29, 0x45, 0x28, 0xE6, 0xA0, 0xAA, 0x29,
-	0x45, 0x28, 0xE6, 0xB0, 0xB4, 0x29, 0x45, 0x28,
-	// Bytes 2140 - 217f
-	0xE7, 0x81, 0xAB, 0x29, 0x45, 0x28, 0xE7, 0x89,
-	0xB9, 0x29, 0x45, 0x28, 0xE7, 0x9B, 0xA3, 0x29,
-	0x45, 0x28, 0xE7, 0xA4, 0xBE, 0x29, 0x45, 0x28,
-	0xE7, 0xA5, 0x9D, 0x29, 0x45, 0x28, 0xE7, 0xA5,
-	0xAD, 0x29, 0x45, 0x28, 0xE8, 0x87, 0xAA, 0x29,
-	0x45, 0x28, 0xE8, 0x87, 0xB3, 0x29, 0x45, 0x28,
-	0xE8, 0xB2, 0xA1, 0x29, 0x45, 0x28, 0xE8, 0xB3,
-	0x87, 0x29, 0x45, 0x28, 0xE9, 0x87, 0x91, 0x29,
-	// Bytes 2180 - 21bf
-	0x45, 0x30, 0xE2, 0x81, 0x84, 0x33, 0x45, 0x31,
-	0x30, 0xE6, 0x97, 0xA5, 0x45, 0x31, 0x30, 0xE6,
-	0x9C, 0x88, 0x45, 0x31, 0x30, 0xE7, 0x82, 0xB9,
-	0x45, 0x31, 0x31, 0xE6, 0x97, 0xA5, 0x45, 0x31,
-	0x31, 0xE6, 0x9C, 0x88, 0x45, 0x31, 0x31, 0xE7,
-	0x82, 0xB9, 0x45, 0x31, 0x32, 0xE6, 0x97, 0xA5,
-	0x45, 0x31, 0x32, 0xE6, 0x9C, 0x88, 0x45, 0x31,
-	0x32, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x33, 0xE6,
-	// Bytes 21c0 - 21ff
-	0x97, 0xA5, 0x45, 0x31, 0x33, 0xE7, 0x82, 0xB9,
-	0x45, 0x31, 0x34, 0xE6, 0x97, 0xA5, 0x45, 0x31,
-	0x34, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x35, 0xE6,
-	0x97, 0xA5, 0x45, 0x31, 0x35, 0xE7, 0x82, 0xB9,
-	0x45, 0x31, 0x36, 0xE6, 0x97, 0xA5, 0x45, 0x31,
-	0x36, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x37, 0xE6,
-	0x97, 0xA5, 0x45, 0x31, 0x37, 0xE7, 0x82, 0xB9,
-	0x45, 0x31, 0x38, 0xE6, 0x97, 0xA5, 0x45, 0x31,
-	// Bytes 2200 - 223f
-	0x38, 0xE7, 0x82, 0xB9, 0x45, 0x31, 0x39, 0xE6,
-	0x97, 0xA5, 0x45, 0x31, 0x39, 0xE7, 0x82, 0xB9,
-	0x45, 0x31, 0xE2, 0x81, 0x84, 0x32, 0x45, 0x31,
-	0xE2, 0x81, 0x84, 0x33, 0x45, 0x31, 0xE2, 0x81,
-	0x84, 0x34, 0x45, 0x31, 0xE2, 0x81, 0x84, 0x35,
-	0x45, 0x31, 0xE2, 0x81, 0x84, 0x36, 0x45, 0x31,
-	0xE2, 0x81, 0x84, 0x37, 0x45, 0x31, 0xE2, 0x81,
-	0x84, 0x38, 0x45, 0x31, 0xE2, 0x81, 0x84, 0x39,
-	// Bytes 2240 - 227f
-	0x45, 0x32, 0x30, 0xE6, 0x97, 0xA5, 0x45, 0x32,
-	0x30, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x31, 0xE6,
-	0x97, 0xA5, 0x45, 0x32, 0x31, 0xE7, 0x82, 0xB9,
-	0x45, 0x32, 0x32, 0xE6, 0x97, 0xA5, 0x45, 0x32,
-	0x32, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x33, 0xE6,
-	0x97, 0xA5, 0x45, 0x32, 0x33, 0xE7, 0x82, 0xB9,
-	0x45, 0x32, 0x34, 0xE6, 0x97, 0xA5, 0x45, 0x32,
-	0x34, 0xE7, 0x82, 0xB9, 0x45, 0x32, 0x35, 0xE6,
-	// Bytes 2280 - 22bf
-	0x97, 0xA5, 0x45, 0x32, 0x36, 0xE6, 0x97, 0xA5,
-	0x45, 0x32, 0x37, 0xE6, 0x97, 0xA5, 0x45, 0x32,
-	0x38, 0xE6, 0x97, 0xA5, 0x45, 0x32, 0x39, 0xE6,
-	0x97, 0xA5, 0x45, 0x32, 0xE2, 0x81, 0x84, 0x33,
-	0x45, 0x32, 0xE2, 0x81, 0x84, 0x35, 0x45, 0x33,
-	0x30, 0xE6, 0x97, 0xA5, 0x45, 0x33, 0x31, 0xE6,
-	0x97, 0xA5, 0x45, 0x33, 0xE2, 0x81, 0x84, 0x34,
-	0x45, 0x33, 0xE2, 0x81, 0x84, 0x35, 0x45, 0x33,
-	// Bytes 22c0 - 22ff
-	0xE2, 0x81, 0x84, 0x38, 0x45, 0x34, 0xE2, 0x81,
-	0x84, 0x35, 0x45, 0x35, 0xE2, 0x81, 0x84, 0x36,
-	0x45, 0x35, 0xE2, 0x81, 0x84, 0x38, 0x45, 0x37,
-	0xE2, 0x81, 0x84, 0x38, 0x45, 0x41, 0xE2, 0x88,
-	0x95, 0x6D, 0x45, 0x56, 0xE2, 0x88, 0x95, 0x6D,
-	0x45, 0x6D, 0xE2, 0x88, 0x95, 0x73, 0x46, 0x31,
-	0xE2, 0x81, 0x84, 0x31, 0x30, 0x46, 0x43, 0xE2,
-	0x88, 0x95, 0x6B, 0x67, 0x46, 0x6D, 0xE2, 0x88,
-	// Bytes 2300 - 233f
-	0x95, 0x73, 0x32, 0x46, 0xD8, 0xA8, 0xD8, 0xAD,
-	0xD9, 0x8A, 0x46, 0xD8, 0xA8, 0xD8, 0xAE, 0xD9,
-	0x8A, 0x46, 0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x85,
-	0x46, 0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x89, 0x46,
-	0xD8, 0xAA, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD8,
-	0xAA, 0xD8, 0xAD, 0xD8, 0xAC, 0x46, 0xD8, 0xAA,
-	0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD8, 0xAA, 0xD8,
-	0xAE, 0xD9, 0x85, 0x46, 0xD8, 0xAA, 0xD8, 0xAE,
-	// Bytes 2340 - 237f
-	0xD9, 0x89, 0x46, 0xD8, 0xAA, 0xD8, 0xAE, 0xD9,
-	0x8A, 0x46, 0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAC,
-	0x46, 0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAD, 0x46,
-	0xD8, 0xAA, 0xD9, 0x85, 0xD8, 0xAE, 0x46, 0xD8,
-	0xAA, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8, 0xAA,
-	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xAC, 0xD8,
-	0xAD, 0xD9, 0x89, 0x46, 0xD8, 0xAC, 0xD8, 0xAD,
-	0xD9, 0x8A, 0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD8,
-	// Bytes 2380 - 23bf
-	0xAD, 0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD9, 0x89,
-	0x46, 0xD8, 0xAC, 0xD9, 0x85, 0xD9, 0x8A, 0x46,
-	0xD8, 0xAD, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD8,
-	0xAD, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8, 0xAD,
-	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xB3, 0xD8,
-	0xAC, 0xD8, 0xAD, 0x46, 0xD8, 0xB3, 0xD8, 0xAC,
-	0xD9, 0x89, 0x46, 0xD8, 0xB3, 0xD8, 0xAD, 0xD8,
-	0xAC, 0x46, 0xD8, 0xB3, 0xD8, 0xAE, 0xD9, 0x89,
-	// Bytes 23c0 - 23ff
-	0x46, 0xD8, 0xB3, 0xD8, 0xAE, 0xD9, 0x8A, 0x46,
-	0xD8, 0xB3, 0xD9, 0x85, 0xD8, 0xAC, 0x46, 0xD8,
-	0xB3, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD8, 0xB3,
-	0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD8, 0xB4, 0xD8,
-	0xAC, 0xD9, 0x8A, 0x46, 0xD8, 0xB4, 0xD8, 0xAD,
-	0xD9, 0x85, 0x46, 0xD8, 0xB4, 0xD8, 0xAD, 0xD9,
-	0x8A, 0x46, 0xD8, 0xB4, 0xD9, 0x85, 0xD8, 0xAE,
-	0x46, 0xD8, 0xB4, 0xD9, 0x85, 0xD9, 0x85, 0x46,
-	// Bytes 2400 - 243f
-	0xD8, 0xB5, 0xD8, 0xAD, 0xD8, 0xAD, 0x46, 0xD8,
-	0xB5, 0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD8, 0xB5,
-	0xD9, 0x84, 0xD9, 0x89, 0x46, 0xD8, 0xB5, 0xD9,
-	0x84, 0xDB, 0x92, 0x46, 0xD8, 0xB5, 0xD9, 0x85,
-	0xD9, 0x85, 0x46, 0xD8, 0xB6, 0xD8, 0xAD, 0xD9,
-	0x89, 0x46, 0xD8, 0xB6, 0xD8, 0xAD, 0xD9, 0x8A,
-	0x46, 0xD8, 0xB6, 0xD8, 0xAE, 0xD9, 0x85, 0x46,
-	0xD8, 0xB7, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD8,
-	// Bytes 2440 - 247f
-	0xB7, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD8, 0xB7,
-	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD8, 0xB9, 0xD8,
-	0xAC, 0xD9, 0x85, 0x46, 0xD8, 0xB9, 0xD9, 0x85,
-	0xD9, 0x85, 0x46, 0xD8, 0xB9, 0xD9, 0x85, 0xD9,
-	0x89, 0x46, 0xD8, 0xB9, 0xD9, 0x85, 0xD9, 0x8A,
-	0x46, 0xD8, 0xBA, 0xD9, 0x85, 0xD9, 0x85, 0x46,
-	0xD8, 0xBA, 0xD9, 0x85, 0xD9, 0x89, 0x46, 0xD8,
-	0xBA, 0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x81,
-	// Bytes 2480 - 24bf
-	0xD8, 0xAE, 0xD9, 0x85, 0x46, 0xD9, 0x81, 0xD9,
-	0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x82, 0xD9, 0x84,
-	0xDB, 0x92, 0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD8,
-	0xAD, 0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD9, 0x85,
-	0x46, 0xD9, 0x82, 0xD9, 0x85, 0xD9, 0x8A, 0x46,
-	0xD9, 0x83, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD9,
-	0x83, 0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x84,
-	0xD8, 0xAC, 0xD8, 0xAC, 0x46, 0xD9, 0x84, 0xD8,
-	// Bytes 24c0 - 24ff
-	0xAC, 0xD9, 0x85, 0x46, 0xD9, 0x84, 0xD8, 0xAC,
-	0xD9, 0x8A, 0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9,
-	0x85, 0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9, 0x89,
-	0x46, 0xD9, 0x84, 0xD8, 0xAD, 0xD9, 0x8A, 0x46,
-	0xD9, 0x84, 0xD8, 0xAE, 0xD9, 0x85, 0x46, 0xD9,
-	0x84, 0xD9, 0x85, 0xD8, 0xAD, 0x46, 0xD9, 0x84,
-	0xD9, 0x85, 0xD9, 0x8A, 0x46, 0xD9, 0x85, 0xD8,
-	0xAC, 0xD8, 0xAD, 0x46, 0xD9, 0x85, 0xD8, 0xAC,
-	// Bytes 2500 - 253f
-	0xD8, 0xAE, 0x46, 0xD9, 0x85, 0xD8, 0xAC, 0xD9,
-	0x85, 0x46, 0xD9, 0x85, 0xD8, 0xAC, 0xD9, 0x8A,
-	0x46, 0xD9, 0x85, 0xD8, 0xAD, 0xD8, 0xAC, 0x46,
-	0xD9, 0x85, 0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD9,
-	0x85, 0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD9, 0x85,
-	0xD8, 0xAE, 0xD8, 0xAC, 0x46, 0xD9, 0x85, 0xD8,
-	0xAE, 0xD9, 0x85, 0x46, 0xD9, 0x85, 0xD8, 0xAE,
-	0xD9, 0x8A, 0x46, 0xD9, 0x85, 0xD9, 0x85, 0xD9,
-	// Bytes 2540 - 257f
-	0x8A, 0x46, 0xD9, 0x86, 0xD8, 0xAC, 0xD8, 0xAD,
-	0x46, 0xD9, 0x86, 0xD8, 0xAC, 0xD9, 0x85, 0x46,
-	0xD9, 0x86, 0xD8, 0xAC, 0xD9, 0x89, 0x46, 0xD9,
-	0x86, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD9, 0x86,
-	0xD8, 0xAD, 0xD9, 0x85, 0x46, 0xD9, 0x86, 0xD8,
-	0xAD, 0xD9, 0x89, 0x46, 0xD9, 0x86, 0xD8, 0xAD,
-	0xD9, 0x8A, 0x46, 0xD9, 0x86, 0xD9, 0x85, 0xD9,
-	0x89, 0x46, 0xD9, 0x86, 0xD9, 0x85, 0xD9, 0x8A,
-	// Bytes 2580 - 25bf
-	0x46, 0xD9, 0x87, 0xD9, 0x85, 0xD8, 0xAC, 0x46,
-	0xD9, 0x87, 0xD9, 0x85, 0xD9, 0x85, 0x46, 0xD9,
-	0x8A, 0xD8, 0xAC, 0xD9, 0x8A, 0x46, 0xD9, 0x8A,
-	0xD8, 0xAD, 0xD9, 0x8A, 0x46, 0xD9, 0x8A, 0xD9,
-	0x85, 0xD9, 0x85, 0x46, 0xD9, 0x8A, 0xD9, 0x85,
-	0xD9, 0x8A, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8,
-	0xA7, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAC,
-	0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAD, 0x46,
-	// Bytes 25c0 - 25ff
-	0xD9, 0x8A, 0xD9, 0x94, 0xD8, 0xAE, 0x46, 0xD9,
-	0x8A, 0xD9, 0x94, 0xD8, 0xB1, 0x46, 0xD9, 0x8A,
-	0xD9, 0x94, 0xD8, 0xB2, 0x46, 0xD9, 0x8A, 0xD9,
-	0x94, 0xD9, 0x85, 0x46, 0xD9, 0x8A, 0xD9, 0x94,
-	0xD9, 0x86, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9,
-	0x87, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x88,
-	0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x89, 0x46,
-	0xD9, 0x8A, 0xD9, 0x94, 0xD9, 0x8A, 0x46, 0xD9,
-	// Bytes 2600 - 263f
-	0x8A, 0xD9, 0x94, 0xDB, 0x86, 0x46, 0xD9, 0x8A,
-	0xD9, 0x94, 0xDB, 0x87, 0x46, 0xD9, 0x8A, 0xD9,
-	0x94, 0xDB, 0x88, 0x46, 0xD9, 0x8A, 0xD9, 0x94,
-	0xDB, 0x90, 0x46, 0xD9, 0x8A, 0xD9, 0x94, 0xDB,
-	0x95, 0x46, 0xE0, 0xB9, 0x8D, 0xE0, 0xB8, 0xB2,
-	0x46, 0xE0, 0xBA, 0xAB, 0xE0, 0xBA, 0x99, 0x46,
-	0xE0, 0xBA, 0xAB, 0xE0, 0xBA, 0xA1, 0x46, 0xE0,
-	0xBB, 0x8D, 0xE0, 0xBA, 0xB2, 0x46, 0xE0, 0xBD,
-	// Bytes 2640 - 267f
-	0x80, 0xE0, 0xBE, 0xB5, 0x46, 0xE0, 0xBD, 0x82,
-	0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBD, 0x8C, 0xE0,
-	0xBE, 0xB7, 0x46, 0xE0, 0xBD, 0x91, 0xE0, 0xBE,
-	0xB7, 0x46, 0xE0, 0xBD, 0x96, 0xE0, 0xBE, 0xB7,
-	0x46, 0xE0, 0xBD, 0x9B, 0xE0, 0xBE, 0xB7, 0x46,
-	0xE0, 0xBE, 0x90, 0xE0, 0xBE, 0xB5, 0x46, 0xE0,
-	0xBE, 0x92, 0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE,
-	0x9C, 0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xA1,
-	// Bytes 2680 - 26bf
-	0xE0, 0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xA6, 0xE0,
-	0xBE, 0xB7, 0x46, 0xE0, 0xBE, 0xAB, 0xE0, 0xBE,
-	0xB7, 0x46, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2,
-	0x46, 0xE2, 0x80, 0xB5, 0xE2, 0x80, 0xB5, 0x46,
-	0xE2, 0x88, 0xAB, 0xE2, 0x88, 0xAB, 0x46, 0xE2,
-	0x88, 0xAE, 0xE2, 0x88, 0xAE, 0x46, 0xE3, 0x81,
-	0xBB, 0xE3, 0x81, 0x8B, 0x46, 0xE3, 0x82, 0x88,
-	0xE3, 0x82, 0x8A, 0x46, 0xE3, 0x82, 0xAD, 0xE3,
-	// Bytes 26c0 - 26ff
-	0x83, 0xAD, 0x46, 0xE3, 0x82, 0xB3, 0xE3, 0x82,
-	0xB3, 0x46, 0xE3, 0x82, 0xB3, 0xE3, 0x83, 0x88,
-	0x46, 0xE3, 0x83, 0x88, 0xE3, 0x83, 0xB3, 0x46,
-	0xE3, 0x83, 0x8A, 0xE3, 0x83, 0x8E, 0x46, 0xE3,
-	0x83, 0x9B, 0xE3, 0x83, 0xB3, 0x46, 0xE3, 0x83,
-	0x9F, 0xE3, 0x83, 0xAA, 0x46, 0xE3, 0x83, 0xAA,
-	0xE3, 0x83, 0xA9, 0x46, 0xE3, 0x83, 0xAC, 0xE3,
-	0x83, 0xA0, 0x46, 0xE5, 0xA4, 0xA7, 0xE6, 0xAD,
-	// Bytes 2700 - 273f
-	0xA3, 0x46, 0xE5, 0xB9, 0xB3, 0xE6, 0x88, 0x90,
-	0x46, 0xE6, 0x98, 0x8E, 0xE6, 0xB2, 0xBB, 0x46,
-	0xE6, 0x98, 0xAD, 0xE5, 0x92, 0x8C, 0x47, 0x72,
-	0x61, 0x64, 0xE2, 0x88, 0x95, 0x73, 0x47, 0xE3,
-	0x80, 0x94, 0x53, 0xE3, 0x80, 0x95, 0x48, 0x28,
-	0xE1, 0x84, 0x80, 0xE1, 0x85, 0xA1, 0x29, 0x48,
-	0x28, 0xE1, 0x84, 0x82, 0xE1, 0x85, 0xA1, 0x29,
-	0x48, 0x28, 0xE1, 0x84, 0x83, 0xE1, 0x85, 0xA1,
-	// Bytes 2740 - 277f
-	0x29, 0x48, 0x28, 0xE1, 0x84, 0x85, 0xE1, 0x85,
-	0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x86, 0xE1,
-	0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x87,
-	0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84,
-	0x89, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1,
-	0x84, 0x8B, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28,
-	0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xA1, 0x29, 0x48,
-	0x28, 0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xAE, 0x29,
-	// Bytes 2780 - 27bf
-	0x48, 0x28, 0xE1, 0x84, 0x8E, 0xE1, 0x85, 0xA1,
-	0x29, 0x48, 0x28, 0xE1, 0x84, 0x8F, 0xE1, 0x85,
-	0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x90, 0xE1,
-	0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84, 0x91,
-	0xE1, 0x85, 0xA1, 0x29, 0x48, 0x28, 0xE1, 0x84,
-	0x92, 0xE1, 0x85, 0xA1, 0x29, 0x48, 0x72, 0x61,
-	0x64, 0xE2, 0x88, 0x95, 0x73, 0x32, 0x48, 0xD8,
-	0xA7, 0xD9, 0x83, 0xD8, 0xA8, 0xD8, 0xB1, 0x48,
-	// Bytes 27c0 - 27ff
-	0xD8, 0xA7, 0xD9, 0x84, 0xD9, 0x84, 0xD9, 0x87,
-	0x48, 0xD8, 0xB1, 0xD8, 0xB3, 0xD9, 0x88, 0xD9,
-	0x84, 0x48, 0xD8, 0xB1, 0xDB, 0x8C, 0xD8, 0xA7,
-	0xD9, 0x84, 0x48, 0xD8, 0xB5, 0xD9, 0x84, 0xD8,
-	0xB9, 0xD9, 0x85, 0x48, 0xD8, 0xB9, 0xD9, 0x84,
-	0xD9, 0x8A, 0xD9, 0x87, 0x48, 0xD9, 0x85, 0xD8,
-	0xAD, 0xD9, 0x85, 0xD8, 0xAF, 0x48, 0xD9, 0x88,
-	0xD8, 0xB3, 0xD9, 0x84, 0xD9, 0x85, 0x49, 0xE2,
-	// Bytes 2800 - 283f
-	0x80, 0xB2, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2,
-	0x49, 0xE2, 0x80, 0xB5, 0xE2, 0x80, 0xB5, 0xE2,
-	0x80, 0xB5, 0x49, 0xE2, 0x88, 0xAB, 0xE2, 0x88,
-	0xAB, 0xE2, 0x88, 0xAB, 0x49, 0xE2, 0x88, 0xAE,
-	0xE2, 0x88, 0xAE, 0xE2, 0x88, 0xAE, 0x49, 0xE3,
-	0x80, 0x94, 0xE4, 0xB8, 0x89, 0xE3, 0x80, 0x95,
-	0x49, 0xE3, 0x80, 0x94, 0xE4, 0xBA, 0x8C, 0xE3,
-	0x80, 0x95, 0x49, 0xE3, 0x80, 0x94, 0xE5, 0x8B,
-	// Bytes 2840 - 287f
-	0x9D, 0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80, 0x94,
-	0xE5, 0xAE, 0x89, 0xE3, 0x80, 0x95, 0x49, 0xE3,
-	0x80, 0x94, 0xE6, 0x89, 0x93, 0xE3, 0x80, 0x95,
-	0x49, 0xE3, 0x80, 0x94, 0xE6, 0x95, 0x97, 0xE3,
-	0x80, 0x95, 0x49, 0xE3, 0x80, 0x94, 0xE6, 0x9C,
-	0xAC, 0xE3, 0x80, 0x95, 0x49, 0xE3, 0x80, 0x94,
-	0xE7, 0x82, 0xB9, 0xE3, 0x80, 0x95, 0x49, 0xE3,
-	0x80, 0x94, 0xE7, 0x9B, 0x97, 0xE3, 0x80, 0x95,
-	// Bytes 2880 - 28bf
-	0x49, 0xE3, 0x82, 0xA2, 0xE3, 0x83, 0xBC, 0xE3,
-	0x83, 0xAB, 0x49, 0xE3, 0x82, 0xA4, 0xE3, 0x83,
-	0xB3, 0xE3, 0x83, 0x81, 0x49, 0xE3, 0x82, 0xA6,
-	0xE3, 0x82, 0xA9, 0xE3, 0x83, 0xB3, 0x49, 0xE3,
-	0x82, 0xAA, 0xE3, 0x83, 0xB3, 0xE3, 0x82, 0xB9,
-	0x49, 0xE3, 0x82, 0xAA, 0xE3, 0x83, 0xBC, 0xE3,
-	0x83, 0xA0, 0x49, 0xE3, 0x82, 0xAB, 0xE3, 0x82,
-	0xA4, 0xE3, 0x83, 0xAA, 0x49, 0xE3, 0x82, 0xB1,
-	// Bytes 28c0 - 28ff
-	0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xB9, 0x49, 0xE3,
-	0x82, 0xB3, 0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x8A,
-	0x49, 0xE3, 0x82, 0xBB, 0xE3, 0x83, 0xB3, 0xE3,
-	0x83, 0x81, 0x49, 0xE3, 0x82, 0xBB, 0xE3, 0x83,
-	0xB3, 0xE3, 0x83, 0x88, 0x49, 0xE3, 0x83, 0x86,
-	0xE3, 0x82, 0x99, 0xE3, 0x82, 0xB7, 0x49, 0xE3,
-	0x83, 0x88, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB,
-	0x49, 0xE3, 0x83, 0x8E, 0xE3, 0x83, 0x83, 0xE3,
-	// Bytes 2900 - 293f
-	0x83, 0x88, 0x49, 0xE3, 0x83, 0x8F, 0xE3, 0x82,
-	0xA4, 0xE3, 0x83, 0x84, 0x49, 0xE3, 0x83, 0x92,
-	0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB, 0x49, 0xE3,
-	0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3, 0x82, 0xB3,
-	0x49, 0xE3, 0x83, 0x95, 0xE3, 0x83, 0xA9, 0xE3,
-	0x83, 0xB3, 0x49, 0xE3, 0x83, 0x98, 0xE3, 0x82,
-	0x9A, 0xE3, 0x82, 0xBD, 0x49, 0xE3, 0x83, 0x98,
-	0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x84, 0x49, 0xE3,
-	// Bytes 2940 - 297f
-	0x83, 0x9B, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0xAB,
-	0x49, 0xE3, 0x83, 0x9B, 0xE3, 0x83, 0xBC, 0xE3,
-	0x83, 0xB3, 0x49, 0xE3, 0x83, 0x9E, 0xE3, 0x82,
-	0xA4, 0xE3, 0x83, 0xAB, 0x49, 0xE3, 0x83, 0x9E,
-	0xE3, 0x83, 0x83, 0xE3, 0x83, 0x8F, 0x49, 0xE3,
-	0x83, 0x9E, 0xE3, 0x83, 0xAB, 0xE3, 0x82, 0xAF,
-	0x49, 0xE3, 0x83, 0xA4, 0xE3, 0x83, 0xBC, 0xE3,
-	0x83, 0xAB, 0x49, 0xE3, 0x83, 0xA6, 0xE3, 0x82,
-	// Bytes 2980 - 29bf
-	0xA2, 0xE3, 0x83, 0xB3, 0x49, 0xE3, 0x83, 0xAF,
-	0xE3, 0x83, 0x83, 0xE3, 0x83, 0x88, 0x4C, 0xE2,
-	0x80, 0xB2, 0xE2, 0x80, 0xB2, 0xE2, 0x80, 0xB2,
-	0xE2, 0x80, 0xB2, 0x4C, 0xE2, 0x88, 0xAB, 0xE2,
-	0x88, 0xAB, 0xE2, 0x88, 0xAB, 0xE2, 0x88, 0xAB,
-	0x4C, 0xE3, 0x82, 0xA2, 0xE3, 0x83, 0xAB, 0xE3,
-	0x83, 0x95, 0xE3, 0x82, 0xA1, 0x4C, 0xE3, 0x82,
-	0xA8, 0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xAB, 0xE3,
-	// Bytes 29c0 - 29ff
-	0x83, 0xBC, 0x4C, 0xE3, 0x82, 0xAB, 0xE3, 0x82,
-	0x99, 0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xB3, 0x4C,
-	0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0xE3, 0x83,
-	0xB3, 0xE3, 0x83, 0x9E, 0x4C, 0xE3, 0x82, 0xAB,
-	0xE3, 0x83, 0xA9, 0xE3, 0x83, 0x83, 0xE3, 0x83,
-	0x88, 0x4C, 0xE3, 0x82, 0xAB, 0xE3, 0x83, 0xAD,
-	0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xBC, 0x4C, 0xE3,
-	0x82, 0xAD, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0x8B,
-	// Bytes 2a00 - 2a3f
-	0xE3, 0x83, 0xBC, 0x4C, 0xE3, 0x82, 0xAD, 0xE3,
-	0x83, 0xA5, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xBC,
-	0x4C, 0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3,
-	0x83, 0xA9, 0xE3, 0x83, 0xA0, 0x4C, 0xE3, 0x82,
-	0xAF, 0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xBC, 0xE3,
-	0x83, 0x8D, 0x4C, 0xE3, 0x82, 0xB5, 0xE3, 0x82,
-	0xA4, 0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAB, 0x4C,
-	0xE3, 0x82, 0xBF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
-	// Bytes 2a40 - 2a7f
-	0xBC, 0xE3, 0x82, 0xB9, 0x4C, 0xE3, 0x83, 0x8F,
-	0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
-	0x84, 0x4C, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A,
-	0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAB, 0x4C, 0xE3,
-	0x83, 0x95, 0xE3, 0x82, 0xA3, 0xE3, 0x83, 0xBC,
-	0xE3, 0x83, 0x88, 0x4C, 0xE3, 0x83, 0x98, 0xE3,
-	0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x82, 0xBF,
-	0x4C, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A, 0xE3,
-	// Bytes 2a80 - 2abf
-	0x83, 0x8B, 0xE3, 0x83, 0x92, 0x4C, 0xE3, 0x83,
-	0x98, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xB3, 0xE3,
-	0x82, 0xB9, 0x4C, 0xE3, 0x83, 0x9B, 0xE3, 0x82,
-	0x99, 0xE3, 0x83, 0xAB, 0xE3, 0x83, 0x88, 0x4C,
-	0xE3, 0x83, 0x9E, 0xE3, 0x82, 0xA4, 0xE3, 0x82,
-	0xAF, 0xE3, 0x83, 0xAD, 0x4C, 0xE3, 0x83, 0x9F,
-	0xE3, 0x82, 0xAF, 0xE3, 0x83, 0xAD, 0xE3, 0x83,
-	0xB3, 0x4C, 0xE3, 0x83, 0xA1, 0xE3, 0x83, 0xBC,
-	// Bytes 2ac0 - 2aff
-	0xE3, 0x83, 0x88, 0xE3, 0x83, 0xAB, 0x4C, 0xE3,
-	0x83, 0xAA, 0xE3, 0x83, 0x83, 0xE3, 0x83, 0x88,
-	0xE3, 0x83, 0xAB, 0x4C, 0xE3, 0x83, 0xAB, 0xE3,
-	0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC,
-	0x4C, 0xE6, 0xA0, 0xAA, 0xE5, 0xBC, 0x8F, 0xE4,
-	0xBC, 0x9A, 0xE7, 0xA4, 0xBE, 0x4E, 0x28, 0xE1,
-	0x84, 0x8B, 0xE1, 0x85, 0xA9, 0xE1, 0x84, 0x92,
-	0xE1, 0x85, 0xAE, 0x29, 0x4F, 0xD8, 0xAC, 0xD9,
-	// Bytes 2b00 - 2b3f
-	0x84, 0x20, 0xD8, 0xAC, 0xD9, 0x84, 0xD8, 0xA7,
-	0xD9, 0x84, 0xD9, 0x87, 0x4F, 0xE3, 0x82, 0xA2,
-	0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x9A, 0xE3, 0x83,
-	0xBC, 0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x82, 0xA2,
-	0xE3, 0x83, 0xB3, 0xE3, 0x83, 0x98, 0xE3, 0x82,
-	0x9A, 0xE3, 0x82, 0xA2, 0x4F, 0xE3, 0x82, 0xAD,
-	0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xAF, 0xE3, 0x83,
-	0x83, 0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x82, 0xB5,
-	// Bytes 2b40 - 2b7f
-	0xE3, 0x83, 0xB3, 0xE3, 0x83, 0x81, 0xE3, 0x83,
-	0xBC, 0xE3, 0x83, 0xA0, 0x4F, 0xE3, 0x83, 0x8F,
-	0xE3, 0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
-	0xAC, 0xE3, 0x83, 0xAB, 0x4F, 0xE3, 0x83, 0x98,
-	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0xBF, 0xE3, 0x83,
-	0xBC, 0xE3, 0x83, 0xAB, 0x4F, 0xE3, 0x83, 0x9B,
-	0xE3, 0x82, 0x9A, 0xE3, 0x82, 0xA4, 0xE3, 0x83,
-	0xB3, 0xE3, 0x83, 0x88, 0x4F, 0xE3, 0x83, 0x9E,
-	// Bytes 2b80 - 2bbf
-	0xE3, 0x83, 0xB3, 0xE3, 0x82, 0xB7, 0xE3, 0x83,
-	0xA7, 0xE3, 0x83, 0xB3, 0x4F, 0xE3, 0x83, 0xA1,
-	0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0xE3, 0x83,
-	0x88, 0xE3, 0x83, 0xB3, 0x4F, 0xE3, 0x83, 0xAB,
-	0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x95, 0xE3, 0x82,
-	0x99, 0xE3, 0x83, 0xAB, 0x51, 0x28, 0xE1, 0x84,
-	0x8B, 0xE1, 0x85, 0xA9, 0xE1, 0x84, 0x8C, 0xE1,
-	0x85, 0xA5, 0xE1, 0x86, 0xAB, 0x29, 0x52, 0xE3,
-	// Bytes 2bc0 - 2bff
-	0x82, 0xAD, 0xE3, 0x82, 0x99, 0xE3, 0x83, 0xAB,
-	0xE3, 0x82, 0xBF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
-	0xBC, 0x52, 0xE3, 0x82, 0xAD, 0xE3, 0x83, 0xAD,
-	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
-	0xA9, 0xE3, 0x83, 0xA0, 0x52, 0xE3, 0x82, 0xAD,
-	0xE3, 0x83, 0xAD, 0xE3, 0x83, 0xA1, 0xE3, 0x83,
-	0xBC, 0xE3, 0x83, 0x88, 0xE3, 0x83, 0xAB, 0x52,
-	0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0xE3, 0x83,
-	// Bytes 2c00 - 2c3f
-	0xA9, 0xE3, 0x83, 0xA0, 0xE3, 0x83, 0x88, 0xE3,
-	0x83, 0xB3, 0x52, 0xE3, 0x82, 0xAF, 0xE3, 0x83,
-	0xAB, 0xE3, 0x82, 0xBB, 0xE3, 0x82, 0x99, 0xE3,
-	0x82, 0xA4, 0xE3, 0x83, 0xAD, 0x52, 0xE3, 0x83,
-	0x8F, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC, 0xE3,
-	0x82, 0xBB, 0xE3, 0x83, 0xB3, 0xE3, 0x83, 0x88,
-	0x52, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A, 0xE3,
-	0x82, 0xA2, 0xE3, 0x82, 0xB9, 0xE3, 0x83, 0x88,
-	// Bytes 2c40 - 2c7f
-	0xE3, 0x83, 0xAB, 0x52, 0xE3, 0x83, 0x95, 0xE3,
-	0x82, 0x99, 0xE3, 0x83, 0x83, 0xE3, 0x82, 0xB7,
-	0xE3, 0x82, 0xA7, 0xE3, 0x83, 0xAB, 0x52, 0xE3,
-	0x83, 0x9F, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0x8F,
-	0xE3, 0x82, 0x99, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
-	0xAB, 0x52, 0xE3, 0x83, 0xAC, 0xE3, 0x83, 0xB3,
-	0xE3, 0x83, 0x88, 0xE3, 0x82, 0xB1, 0xE3, 0x82,
-	0x99, 0xE3, 0x83, 0xB3, 0x61, 0xD8, 0xB5, 0xD9,
-	// Bytes 2c80 - 2cbf
-	0x84, 0xD9, 0x89, 0x20, 0xD8, 0xA7, 0xD9, 0x84,
-	0xD9, 0x84, 0xD9, 0x87, 0x20, 0xD8, 0xB9, 0xD9,
-	0x84, 0xD9, 0x8A, 0xD9, 0x87, 0x20, 0xD9, 0x88,
-	0xD8, 0xB3, 0xD9, 0x84, 0xD9, 0x85, 0x06, 0xE0,
-	0xA7, 0x87, 0xE0, 0xA6, 0xBE, 0x01, 0x06, 0xE0,
-	0xA7, 0x87, 0xE0, 0xA7, 0x97, 0x01, 0x06, 0xE0,
-	0xAD, 0x87, 0xE0, 0xAC, 0xBE, 0x01, 0x06, 0xE0,
-	0xAD, 0x87, 0xE0, 0xAD, 0x96, 0x01, 0x06, 0xE0,
-	// Bytes 2cc0 - 2cff
-	0xAD, 0x87, 0xE0, 0xAD, 0x97, 0x01, 0x06, 0xE0,
-	0xAE, 0x92, 0xE0, 0xAF, 0x97, 0x01, 0x06, 0xE0,
-	0xAF, 0x86, 0xE0, 0xAE, 0xBE, 0x01, 0x06, 0xE0,
-	0xAF, 0x86, 0xE0, 0xAF, 0x97, 0x01, 0x06, 0xE0,
-	0xAF, 0x87, 0xE0, 0xAE, 0xBE, 0x01, 0x06, 0xE0,
-	0xB2, 0xBF, 0xE0, 0xB3, 0x95, 0x01, 0x06, 0xE0,
-	0xB3, 0x86, 0xE0, 0xB3, 0x95, 0x01, 0x06, 0xE0,
-	0xB3, 0x86, 0xE0, 0xB3, 0x96, 0x01, 0x06, 0xE0,
-	// Bytes 2d00 - 2d3f
-	0xB5, 0x86, 0xE0, 0xB4, 0xBE, 0x01, 0x06, 0xE0,
-	0xB5, 0x86, 0xE0, 0xB5, 0x97, 0x01, 0x06, 0xE0,
-	0xB5, 0x87, 0xE0, 0xB4, 0xBE, 0x01, 0x06, 0xE0,
-	0xB7, 0x99, 0xE0, 0xB7, 0x9F, 0x01, 0x06, 0xE1,
-	0x80, 0xA5, 0xE1, 0x80, 0xAE, 0x01, 0x06, 0xE1,
-	0xAC, 0x85, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
-	0xAC, 0x87, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
-	0xAC, 0x89, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
-	// Bytes 2d40 - 2d7f
-	0xAC, 0x8B, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
-	0xAC, 0x8D, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
-	0xAC, 0x91, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
-	0xAC, 0xBA, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
-	0xAC, 0xBC, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
-	0xAC, 0xBE, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
-	0xAC, 0xBF, 0xE1, 0xAC, 0xB5, 0x01, 0x06, 0xE1,
-	0xAD, 0x82, 0xE1, 0xAC, 0xB5, 0x01, 0x08, 0xF0,
-	// Bytes 2d80 - 2dbf
-	0x91, 0x84, 0xB1, 0xF0, 0x91, 0x84, 0xA7, 0x01,
-	0x08, 0xF0, 0x91, 0x84, 0xB2, 0xF0, 0x91, 0x84,
-	0xA7, 0x01, 0x08, 0xF0, 0x91, 0x8D, 0x87, 0xF0,
-	0x91, 0x8C, 0xBE, 0x01, 0x08, 0xF0, 0x91, 0x8D,
-	0x87, 0xF0, 0x91, 0x8D, 0x97, 0x01, 0x08, 0xF0,
-	0x91, 0x92, 0xB9, 0xF0, 0x91, 0x92, 0xB0, 0x01,
-	0x08, 0xF0, 0x91, 0x92, 0xB9, 0xF0, 0x91, 0x92,
-	0xBA, 0x01, 0x08, 0xF0, 0x91, 0x92, 0xB9, 0xF0,
-	// Bytes 2dc0 - 2dff
-	0x91, 0x92, 0xBD, 0x01, 0x08, 0xF0, 0x91, 0x96,
-	0xB8, 0xF0, 0x91, 0x96, 0xAF, 0x01, 0x08, 0xF0,
-	0x91, 0x96, 0xB9, 0xF0, 0x91, 0x96, 0xAF, 0x01,
-	0x09, 0xE0, 0xB3, 0x86, 0xE0, 0xB3, 0x82, 0xE0,
-	0xB3, 0x95, 0x02, 0x09, 0xE0, 0xB7, 0x99, 0xE0,
-	0xB7, 0x8F, 0xE0, 0xB7, 0x8A, 0x12, 0x44, 0x44,
-	0x5A, 0xCC, 0x8C, 0xC9, 0x44, 0x44, 0x7A, 0xCC,
-	0x8C, 0xC9, 0x44, 0x64, 0x7A, 0xCC, 0x8C, 0xC9,
-	// Bytes 2e00 - 2e3f
-	0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x93, 0xC9,
-	0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x94, 0xC9,
-	0x46, 0xD9, 0x84, 0xD8, 0xA7, 0xD9, 0x95, 0xB5,
-	0x46, 0xE1, 0x84, 0x80, 0xE1, 0x85, 0xA1, 0x01,
-	0x46, 0xE1, 0x84, 0x82, 0xE1, 0x85, 0xA1, 0x01,
-	0x46, 0xE1, 0x84, 0x83, 0xE1, 0x85, 0xA1, 0x01,
-	0x46, 0xE1, 0x84, 0x85, 0xE1, 0x85, 0xA1, 0x01,
-	0x46, 0xE1, 0x84, 0x86, 0xE1, 0x85, 0xA1, 0x01,
-	// Bytes 2e40 - 2e7f
-	0x46, 0xE1, 0x84, 0x87, 0xE1, 0x85, 0xA1, 0x01,
-	0x46, 0xE1, 0x84, 0x89, 0xE1, 0x85, 0xA1, 0x01,
-	0x46, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xA1, 0x01,
-	0x46, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xAE, 0x01,
-	0x46, 0xE1, 0x84, 0x8C, 0xE1, 0x85, 0xA1, 0x01,
-	0x46, 0xE1, 0x84, 0x8E, 0xE1, 0x85, 0xA1, 0x01,
-	0x46, 0xE1, 0x84, 0x8F, 0xE1, 0x85, 0xA1, 0x01,
-	0x46, 0xE1, 0x84, 0x90, 0xE1, 0x85, 0xA1, 0x01,
-	// Bytes 2e80 - 2ebf
-	0x46, 0xE1, 0x84, 0x91, 0xE1, 0x85, 0xA1, 0x01,
-	0x46, 0xE1, 0x84, 0x92, 0xE1, 0x85, 0xA1, 0x01,
-	0x49, 0xE3, 0x83, 0xA1, 0xE3, 0x82, 0xAB, 0xE3,
-	0x82, 0x99, 0x0D, 0x4C, 0xE1, 0x84, 0x8C, 0xE1,
-	0x85, 0xAE, 0xE1, 0x84, 0x8B, 0xE1, 0x85, 0xB4,
-	0x01, 0x4C, 0xE3, 0x82, 0xAD, 0xE3, 0x82, 0x99,
-	0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0x0D, 0x4C,
-	0xE3, 0x82, 0xB3, 0xE3, 0x83, 0xBC, 0xE3, 0x83,
-	// Bytes 2ec0 - 2eff
-	0x9B, 0xE3, 0x82, 0x9A, 0x0D, 0x4C, 0xE3, 0x83,
-	0xA4, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x88, 0xE3,
-	0x82, 0x99, 0x0D, 0x4F, 0xE1, 0x84, 0x8E, 0xE1,
-	0x85, 0xA1, 0xE1, 0x86, 0xB7, 0xE1, 0x84, 0x80,
-	0xE1, 0x85, 0xA9, 0x01, 0x4F, 0xE3, 0x82, 0xA4,
-	0xE3, 0x83, 0x8B, 0xE3, 0x83, 0xB3, 0xE3, 0x82,
-	0xAF, 0xE3, 0x82, 0x99, 0x0D, 0x4F, 0xE3, 0x82,
-	0xB7, 0xE3, 0x83, 0xAA, 0xE3, 0x83, 0xB3, 0xE3,
-	// Bytes 2f00 - 2f3f
-	0x82, 0xAF, 0xE3, 0x82, 0x99, 0x0D, 0x4F, 0xE3,
-	0x83, 0x98, 0xE3, 0x82, 0x9A, 0xE3, 0x83, 0xBC,
-	0xE3, 0x82, 0xB7, 0xE3, 0x82, 0x99, 0x0D, 0x4F,
-	0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x9A, 0xE3, 0x83,
-	0xB3, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99, 0x0D,
-	0x52, 0xE3, 0x82, 0xA8, 0xE3, 0x82, 0xB9, 0xE3,
-	0x82, 0xAF, 0xE3, 0x83, 0xBC, 0xE3, 0x83, 0x88,
-	0xE3, 0x82, 0x99, 0x0D, 0x52, 0xE3, 0x83, 0x95,
-	// Bytes 2f40 - 2f7f
-	0xE3, 0x82, 0xA1, 0xE3, 0x83, 0xA9, 0xE3, 0x83,
-	0x83, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99, 0x0D,
-	0x86, 0xE0, 0xB3, 0x86, 0xE0, 0xB3, 0x82, 0x01,
-	0x86, 0xE0, 0xB7, 0x99, 0xE0, 0xB7, 0x8F, 0x01,
-	0x03, 0x3C, 0xCC, 0xB8, 0x05, 0x03, 0x3D, 0xCC,
-	0xB8, 0x05, 0x03, 0x3E, 0xCC, 0xB8, 0x05, 0x03,
-	0x41, 0xCC, 0x80, 0xC9, 0x03, 0x41, 0xCC, 0x81,
-	0xC9, 0x03, 0x41, 0xCC, 0x83, 0xC9, 0x03, 0x41,
-	// Bytes 2f80 - 2fbf
-	0xCC, 0x84, 0xC9, 0x03, 0x41, 0xCC, 0x89, 0xC9,
-	0x03, 0x41, 0xCC, 0x8C, 0xC9, 0x03, 0x41, 0xCC,
-	0x8F, 0xC9, 0x03, 0x41, 0xCC, 0x91, 0xC9, 0x03,
-	0x41, 0xCC, 0xA5, 0xB5, 0x03, 0x41, 0xCC, 0xA8,
-	0xA5, 0x03, 0x42, 0xCC, 0x87, 0xC9, 0x03, 0x42,
-	0xCC, 0xA3, 0xB5, 0x03, 0x42, 0xCC, 0xB1, 0xB5,
-	0x03, 0x43, 0xCC, 0x81, 0xC9, 0x03, 0x43, 0xCC,
-	0x82, 0xC9, 0x03, 0x43, 0xCC, 0x87, 0xC9, 0x03,
-	// Bytes 2fc0 - 2fff
-	0x43, 0xCC, 0x8C, 0xC9, 0x03, 0x44, 0xCC, 0x87,
-	0xC9, 0x03, 0x44, 0xCC, 0x8C, 0xC9, 0x03, 0x44,
-	0xCC, 0xA3, 0xB5, 0x03, 0x44, 0xCC, 0xA7, 0xA5,
-	0x03, 0x44, 0xCC, 0xAD, 0xB5, 0x03, 0x44, 0xCC,
-	0xB1, 0xB5, 0x03, 0x45, 0xCC, 0x80, 0xC9, 0x03,
-	0x45, 0xCC, 0x81, 0xC9, 0x03, 0x45, 0xCC, 0x83,
-	0xC9, 0x03, 0x45, 0xCC, 0x86, 0xC9, 0x03, 0x45,
-	0xCC, 0x87, 0xC9, 0x03, 0x45, 0xCC, 0x88, 0xC9,
-	// Bytes 3000 - 303f
-	0x03, 0x45, 0xCC, 0x89, 0xC9, 0x03, 0x45, 0xCC,
-	0x8C, 0xC9, 0x03, 0x45, 0xCC, 0x8F, 0xC9, 0x03,
-	0x45, 0xCC, 0x91, 0xC9, 0x03, 0x45, 0xCC, 0xA8,
-	0xA5, 0x03, 0x45, 0xCC, 0xAD, 0xB5, 0x03, 0x45,
-	0xCC, 0xB0, 0xB5, 0x03, 0x46, 0xCC, 0x87, 0xC9,
-	0x03, 0x47, 0xCC, 0x81, 0xC9, 0x03, 0x47, 0xCC,
-	0x82, 0xC9, 0x03, 0x47, 0xCC, 0x84, 0xC9, 0x03,
-	0x47, 0xCC, 0x86, 0xC9, 0x03, 0x47, 0xCC, 0x87,
-	// Bytes 3040 - 307f
-	0xC9, 0x03, 0x47, 0xCC, 0x8C, 0xC9, 0x03, 0x47,
-	0xCC, 0xA7, 0xA5, 0x03, 0x48, 0xCC, 0x82, 0xC9,
-	0x03, 0x48, 0xCC, 0x87, 0xC9, 0x03, 0x48, 0xCC,
-	0x88, 0xC9, 0x03, 0x48, 0xCC, 0x8C, 0xC9, 0x03,
-	0x48, 0xCC, 0xA3, 0xB5, 0x03, 0x48, 0xCC, 0xA7,
-	0xA5, 0x03, 0x48, 0xCC, 0xAE, 0xB5, 0x03, 0x49,
-	0xCC, 0x80, 0xC9, 0x03, 0x49, 0xCC, 0x81, 0xC9,
-	0x03, 0x49, 0xCC, 0x82, 0xC9, 0x03, 0x49, 0xCC,
-	// Bytes 3080 - 30bf
-	0x83, 0xC9, 0x03, 0x49, 0xCC, 0x84, 0xC9, 0x03,
-	0x49, 0xCC, 0x86, 0xC9, 0x03, 0x49, 0xCC, 0x87,
-	0xC9, 0x03, 0x49, 0xCC, 0x89, 0xC9, 0x03, 0x49,
-	0xCC, 0x8C, 0xC9, 0x03, 0x49, 0xCC, 0x8F, 0xC9,
-	0x03, 0x49, 0xCC, 0x91, 0xC9, 0x03, 0x49, 0xCC,
-	0xA3, 0xB5, 0x03, 0x49, 0xCC, 0xA8, 0xA5, 0x03,
-	0x49, 0xCC, 0xB0, 0xB5, 0x03, 0x4A, 0xCC, 0x82,
-	0xC9, 0x03, 0x4B, 0xCC, 0x81, 0xC9, 0x03, 0x4B,
-	// Bytes 30c0 - 30ff
-	0xCC, 0x8C, 0xC9, 0x03, 0x4B, 0xCC, 0xA3, 0xB5,
-	0x03, 0x4B, 0xCC, 0xA7, 0xA5, 0x03, 0x4B, 0xCC,
-	0xB1, 0xB5, 0x03, 0x4C, 0xCC, 0x81, 0xC9, 0x03,
-	0x4C, 0xCC, 0x8C, 0xC9, 0x03, 0x4C, 0xCC, 0xA7,
-	0xA5, 0x03, 0x4C, 0xCC, 0xAD, 0xB5, 0x03, 0x4C,
-	0xCC, 0xB1, 0xB5, 0x03, 0x4D, 0xCC, 0x81, 0xC9,
-	0x03, 0x4D, 0xCC, 0x87, 0xC9, 0x03, 0x4D, 0xCC,
-	0xA3, 0xB5, 0x03, 0x4E, 0xCC, 0x80, 0xC9, 0x03,
-	// Bytes 3100 - 313f
-	0x4E, 0xCC, 0x81, 0xC9, 0x03, 0x4E, 0xCC, 0x83,
-	0xC9, 0x03, 0x4E, 0xCC, 0x87, 0xC9, 0x03, 0x4E,
-	0xCC, 0x8C, 0xC9, 0x03, 0x4E, 0xCC, 0xA3, 0xB5,
-	0x03, 0x4E, 0xCC, 0xA7, 0xA5, 0x03, 0x4E, 0xCC,
-	0xAD, 0xB5, 0x03, 0x4E, 0xCC, 0xB1, 0xB5, 0x03,
-	0x4F, 0xCC, 0x80, 0xC9, 0x03, 0x4F, 0xCC, 0x81,
-	0xC9, 0x03, 0x4F, 0xCC, 0x86, 0xC9, 0x03, 0x4F,
-	0xCC, 0x89, 0xC9, 0x03, 0x4F, 0xCC, 0x8B, 0xC9,
-	// Bytes 3140 - 317f
-	0x03, 0x4F, 0xCC, 0x8C, 0xC9, 0x03, 0x4F, 0xCC,
-	0x8F, 0xC9, 0x03, 0x4F, 0xCC, 0x91, 0xC9, 0x03,
-	0x50, 0xCC, 0x81, 0xC9, 0x03, 0x50, 0xCC, 0x87,
-	0xC9, 0x03, 0x52, 0xCC, 0x81, 0xC9, 0x03, 0x52,
-	0xCC, 0x87, 0xC9, 0x03, 0x52, 0xCC, 0x8C, 0xC9,
-	0x03, 0x52, 0xCC, 0x8F, 0xC9, 0x03, 0x52, 0xCC,
-	0x91, 0xC9, 0x03, 0x52, 0xCC, 0xA7, 0xA5, 0x03,
-	0x52, 0xCC, 0xB1, 0xB5, 0x03, 0x53, 0xCC, 0x82,
-	// Bytes 3180 - 31bf
-	0xC9, 0x03, 0x53, 0xCC, 0x87, 0xC9, 0x03, 0x53,
-	0xCC, 0xA6, 0xB5, 0x03, 0x53, 0xCC, 0xA7, 0xA5,
-	0x03, 0x54, 0xCC, 0x87, 0xC9, 0x03, 0x54, 0xCC,
-	0x8C, 0xC9, 0x03, 0x54, 0xCC, 0xA3, 0xB5, 0x03,
-	0x54, 0xCC, 0xA6, 0xB5, 0x03, 0x54, 0xCC, 0xA7,
-	0xA5, 0x03, 0x54, 0xCC, 0xAD, 0xB5, 0x03, 0x54,
-	0xCC, 0xB1, 0xB5, 0x03, 0x55, 0xCC, 0x80, 0xC9,
-	0x03, 0x55, 0xCC, 0x81, 0xC9, 0x03, 0x55, 0xCC,
-	// Bytes 31c0 - 31ff
-	0x82, 0xC9, 0x03, 0x55, 0xCC, 0x86, 0xC9, 0x03,
-	0x55, 0xCC, 0x89, 0xC9, 0x03, 0x55, 0xCC, 0x8A,
-	0xC9, 0x03, 0x55, 0xCC, 0x8B, 0xC9, 0x03, 0x55,
-	0xCC, 0x8C, 0xC9, 0x03, 0x55, 0xCC, 0x8F, 0xC9,
-	0x03, 0x55, 0xCC, 0x91, 0xC9, 0x03, 0x55, 0xCC,
-	0xA3, 0xB5, 0x03, 0x55, 0xCC, 0xA4, 0xB5, 0x03,
-	0x55, 0xCC, 0xA8, 0xA5, 0x03, 0x55, 0xCC, 0xAD,
-	0xB5, 0x03, 0x55, 0xCC, 0xB0, 0xB5, 0x03, 0x56,
-	// Bytes 3200 - 323f
-	0xCC, 0x83, 0xC9, 0x03, 0x56, 0xCC, 0xA3, 0xB5,
-	0x03, 0x57, 0xCC, 0x80, 0xC9, 0x03, 0x57, 0xCC,
-	0x81, 0xC9, 0x03, 0x57, 0xCC, 0x82, 0xC9, 0x03,
-	0x57, 0xCC, 0x87, 0xC9, 0x03, 0x57, 0xCC, 0x88,
-	0xC9, 0x03, 0x57, 0xCC, 0xA3, 0xB5, 0x03, 0x58,
-	0xCC, 0x87, 0xC9, 0x03, 0x58, 0xCC, 0x88, 0xC9,
-	0x03, 0x59, 0xCC, 0x80, 0xC9, 0x03, 0x59, 0xCC,
-	0x81, 0xC9, 0x03, 0x59, 0xCC, 0x82, 0xC9, 0x03,
-	// Bytes 3240 - 327f
-	0x59, 0xCC, 0x83, 0xC9, 0x03, 0x59, 0xCC, 0x84,
-	0xC9, 0x03, 0x59, 0xCC, 0x87, 0xC9, 0x03, 0x59,
-	0xCC, 0x88, 0xC9, 0x03, 0x59, 0xCC, 0x89, 0xC9,
-	0x03, 0x59, 0xCC, 0xA3, 0xB5, 0x03, 0x5A, 0xCC,
-	0x81, 0xC9, 0x03, 0x5A, 0xCC, 0x82, 0xC9, 0x03,
-	0x5A, 0xCC, 0x87, 0xC9, 0x03, 0x5A, 0xCC, 0x8C,
-	0xC9, 0x03, 0x5A, 0xCC, 0xA3, 0xB5, 0x03, 0x5A,
-	0xCC, 0xB1, 0xB5, 0x03, 0x61, 0xCC, 0x80, 0xC9,
-	// Bytes 3280 - 32bf
-	0x03, 0x61, 0xCC, 0x81, 0xC9, 0x03, 0x61, 0xCC,
-	0x83, 0xC9, 0x03, 0x61, 0xCC, 0x84, 0xC9, 0x03,
-	0x61, 0xCC, 0x89, 0xC9, 0x03, 0x61, 0xCC, 0x8C,
-	0xC9, 0x03, 0x61, 0xCC, 0x8F, 0xC9, 0x03, 0x61,
-	0xCC, 0x91, 0xC9, 0x03, 0x61, 0xCC, 0xA5, 0xB5,
-	0x03, 0x61, 0xCC, 0xA8, 0xA5, 0x03, 0x62, 0xCC,
-	0x87, 0xC9, 0x03, 0x62, 0xCC, 0xA3, 0xB5, 0x03,
-	0x62, 0xCC, 0xB1, 0xB5, 0x03, 0x63, 0xCC, 0x81,
-	// Bytes 32c0 - 32ff
-	0xC9, 0x03, 0x63, 0xCC, 0x82, 0xC9, 0x03, 0x63,
-	0xCC, 0x87, 0xC9, 0x03, 0x63, 0xCC, 0x8C, 0xC9,
-	0x03, 0x64, 0xCC, 0x87, 0xC9, 0x03, 0x64, 0xCC,
-	0x8C, 0xC9, 0x03, 0x64, 0xCC, 0xA3, 0xB5, 0x03,
-	0x64, 0xCC, 0xA7, 0xA5, 0x03, 0x64, 0xCC, 0xAD,
-	0xB5, 0x03, 0x64, 0xCC, 0xB1, 0xB5, 0x03, 0x65,
-	0xCC, 0x80, 0xC9, 0x03, 0x65, 0xCC, 0x81, 0xC9,
-	0x03, 0x65, 0xCC, 0x83, 0xC9, 0x03, 0x65, 0xCC,
-	// Bytes 3300 - 333f
-	0x86, 0xC9, 0x03, 0x65, 0xCC, 0x87, 0xC9, 0x03,
-	0x65, 0xCC, 0x88, 0xC9, 0x03, 0x65, 0xCC, 0x89,
-	0xC9, 0x03, 0x65, 0xCC, 0x8C, 0xC9, 0x03, 0x65,
-	0xCC, 0x8F, 0xC9, 0x03, 0x65, 0xCC, 0x91, 0xC9,
-	0x03, 0x65, 0xCC, 0xA8, 0xA5, 0x03, 0x65, 0xCC,
-	0xAD, 0xB5, 0x03, 0x65, 0xCC, 0xB0, 0xB5, 0x03,
-	0x66, 0xCC, 0x87, 0xC9, 0x03, 0x67, 0xCC, 0x81,
-	0xC9, 0x03, 0x67, 0xCC, 0x82, 0xC9, 0x03, 0x67,
-	// Bytes 3340 - 337f
-	0xCC, 0x84, 0xC9, 0x03, 0x67, 0xCC, 0x86, 0xC9,
-	0x03, 0x67, 0xCC, 0x87, 0xC9, 0x03, 0x67, 0xCC,
-	0x8C, 0xC9, 0x03, 0x67, 0xCC, 0xA7, 0xA5, 0x03,
-	0x68, 0xCC, 0x82, 0xC9, 0x03, 0x68, 0xCC, 0x87,
-	0xC9, 0x03, 0x68, 0xCC, 0x88, 0xC9, 0x03, 0x68,
-	0xCC, 0x8C, 0xC9, 0x03, 0x68, 0xCC, 0xA3, 0xB5,
-	0x03, 0x68, 0xCC, 0xA7, 0xA5, 0x03, 0x68, 0xCC,
-	0xAE, 0xB5, 0x03, 0x68, 0xCC, 0xB1, 0xB5, 0x03,
-	// Bytes 3380 - 33bf
-	0x69, 0xCC, 0x80, 0xC9, 0x03, 0x69, 0xCC, 0x81,
-	0xC9, 0x03, 0x69, 0xCC, 0x82, 0xC9, 0x03, 0x69,
-	0xCC, 0x83, 0xC9, 0x03, 0x69, 0xCC, 0x84, 0xC9,
-	0x03, 0x69, 0xCC, 0x86, 0xC9, 0x03, 0x69, 0xCC,
-	0x89, 0xC9, 0x03, 0x69, 0xCC, 0x8C, 0xC9, 0x03,
-	0x69, 0xCC, 0x8F, 0xC9, 0x03, 0x69, 0xCC, 0x91,
-	0xC9, 0x03, 0x69, 0xCC, 0xA3, 0xB5, 0x03, 0x69,
-	0xCC, 0xA8, 0xA5, 0x03, 0x69, 0xCC, 0xB0, 0xB5,
-	// Bytes 33c0 - 33ff
-	0x03, 0x6A, 0xCC, 0x82, 0xC9, 0x03, 0x6A, 0xCC,
-	0x8C, 0xC9, 0x03, 0x6B, 0xCC, 0x81, 0xC9, 0x03,
-	0x6B, 0xCC, 0x8C, 0xC9, 0x03, 0x6B, 0xCC, 0xA3,
-	0xB5, 0x03, 0x6B, 0xCC, 0xA7, 0xA5, 0x03, 0x6B,
-	0xCC, 0xB1, 0xB5, 0x03, 0x6C, 0xCC, 0x81, 0xC9,
-	0x03, 0x6C, 0xCC, 0x8C, 0xC9, 0x03, 0x6C, 0xCC,
-	0xA7, 0xA5, 0x03, 0x6C, 0xCC, 0xAD, 0xB5, 0x03,
-	0x6C, 0xCC, 0xB1, 0xB5, 0x03, 0x6D, 0xCC, 0x81,
-	// Bytes 3400 - 343f
-	0xC9, 0x03, 0x6D, 0xCC, 0x87, 0xC9, 0x03, 0x6D,
-	0xCC, 0xA3, 0xB5, 0x03, 0x6E, 0xCC, 0x80, 0xC9,
-	0x03, 0x6E, 0xCC, 0x81, 0xC9, 0x03, 0x6E, 0xCC,
-	0x83, 0xC9, 0x03, 0x6E, 0xCC, 0x87, 0xC9, 0x03,
-	0x6E, 0xCC, 0x8C, 0xC9, 0x03, 0x6E, 0xCC, 0xA3,
-	0xB5, 0x03, 0x6E, 0xCC, 0xA7, 0xA5, 0x03, 0x6E,
-	0xCC, 0xAD, 0xB5, 0x03, 0x6E, 0xCC, 0xB1, 0xB5,
-	0x03, 0x6F, 0xCC, 0x80, 0xC9, 0x03, 0x6F, 0xCC,
-	// Bytes 3440 - 347f
-	0x81, 0xC9, 0x03, 0x6F, 0xCC, 0x86, 0xC9, 0x03,
-	0x6F, 0xCC, 0x89, 0xC9, 0x03, 0x6F, 0xCC, 0x8B,
-	0xC9, 0x03, 0x6F, 0xCC, 0x8C, 0xC9, 0x03, 0x6F,
-	0xCC, 0x8F, 0xC9, 0x03, 0x6F, 0xCC, 0x91, 0xC9,
-	0x03, 0x70, 0xCC, 0x81, 0xC9, 0x03, 0x70, 0xCC,
-	0x87, 0xC9, 0x03, 0x72, 0xCC, 0x81, 0xC9, 0x03,
-	0x72, 0xCC, 0x87, 0xC9, 0x03, 0x72, 0xCC, 0x8C,
-	0xC9, 0x03, 0x72, 0xCC, 0x8F, 0xC9, 0x03, 0x72,
-	// Bytes 3480 - 34bf
-	0xCC, 0x91, 0xC9, 0x03, 0x72, 0xCC, 0xA7, 0xA5,
-	0x03, 0x72, 0xCC, 0xB1, 0xB5, 0x03, 0x73, 0xCC,
-	0x82, 0xC9, 0x03, 0x73, 0xCC, 0x87, 0xC9, 0x03,
-	0x73, 0xCC, 0xA6, 0xB5, 0x03, 0x73, 0xCC, 0xA7,
-	0xA5, 0x03, 0x74, 0xCC, 0x87, 0xC9, 0x03, 0x74,
-	0xCC, 0x88, 0xC9, 0x03, 0x74, 0xCC, 0x8C, 0xC9,
-	0x03, 0x74, 0xCC, 0xA3, 0xB5, 0x03, 0x74, 0xCC,
-	0xA6, 0xB5, 0x03, 0x74, 0xCC, 0xA7, 0xA5, 0x03,
-	// Bytes 34c0 - 34ff
-	0x74, 0xCC, 0xAD, 0xB5, 0x03, 0x74, 0xCC, 0xB1,
-	0xB5, 0x03, 0x75, 0xCC, 0x80, 0xC9, 0x03, 0x75,
-	0xCC, 0x81, 0xC9, 0x03, 0x75, 0xCC, 0x82, 0xC9,
-	0x03, 0x75, 0xCC, 0x86, 0xC9, 0x03, 0x75, 0xCC,
-	0x89, 0xC9, 0x03, 0x75, 0xCC, 0x8A, 0xC9, 0x03,
-	0x75, 0xCC, 0x8B, 0xC9, 0x03, 0x75, 0xCC, 0x8C,
-	0xC9, 0x03, 0x75, 0xCC, 0x8F, 0xC9, 0x03, 0x75,
-	0xCC, 0x91, 0xC9, 0x03, 0x75, 0xCC, 0xA3, 0xB5,
-	// Bytes 3500 - 353f
-	0x03, 0x75, 0xCC, 0xA4, 0xB5, 0x03, 0x75, 0xCC,
-	0xA8, 0xA5, 0x03, 0x75, 0xCC, 0xAD, 0xB5, 0x03,
-	0x75, 0xCC, 0xB0, 0xB5, 0x03, 0x76, 0xCC, 0x83,
-	0xC9, 0x03, 0x76, 0xCC, 0xA3, 0xB5, 0x03, 0x77,
-	0xCC, 0x80, 0xC9, 0x03, 0x77, 0xCC, 0x81, 0xC9,
-	0x03, 0x77, 0xCC, 0x82, 0xC9, 0x03, 0x77, 0xCC,
-	0x87, 0xC9, 0x03, 0x77, 0xCC, 0x88, 0xC9, 0x03,
-	0x77, 0xCC, 0x8A, 0xC9, 0x03, 0x77, 0xCC, 0xA3,
-	// Bytes 3540 - 357f
-	0xB5, 0x03, 0x78, 0xCC, 0x87, 0xC9, 0x03, 0x78,
-	0xCC, 0x88, 0xC9, 0x03, 0x79, 0xCC, 0x80, 0xC9,
-	0x03, 0x79, 0xCC, 0x81, 0xC9, 0x03, 0x79, 0xCC,
-	0x82, 0xC9, 0x03, 0x79, 0xCC, 0x83, 0xC9, 0x03,
-	0x79, 0xCC, 0x84, 0xC9, 0x03, 0x79, 0xCC, 0x87,
-	0xC9, 0x03, 0x79, 0xCC, 0x88, 0xC9, 0x03, 0x79,
-	0xCC, 0x89, 0xC9, 0x03, 0x79, 0xCC, 0x8A, 0xC9,
-	0x03, 0x79, 0xCC, 0xA3, 0xB5, 0x03, 0x7A, 0xCC,
-	// Bytes 3580 - 35bf
-	0x81, 0xC9, 0x03, 0x7A, 0xCC, 0x82, 0xC9, 0x03,
-	0x7A, 0xCC, 0x87, 0xC9, 0x03, 0x7A, 0xCC, 0x8C,
-	0xC9, 0x03, 0x7A, 0xCC, 0xA3, 0xB5, 0x03, 0x7A,
-	0xCC, 0xB1, 0xB5, 0x04, 0xC2, 0xA8, 0xCC, 0x80,
-	0xCA, 0x04, 0xC2, 0xA8, 0xCC, 0x81, 0xCA, 0x04,
-	0xC2, 0xA8, 0xCD, 0x82, 0xCA, 0x04, 0xC3, 0x86,
-	0xCC, 0x81, 0xC9, 0x04, 0xC3, 0x86, 0xCC, 0x84,
-	0xC9, 0x04, 0xC3, 0x98, 0xCC, 0x81, 0xC9, 0x04,
-	// Bytes 35c0 - 35ff
-	0xC3, 0xA6, 0xCC, 0x81, 0xC9, 0x04, 0xC3, 0xA6,
-	0xCC, 0x84, 0xC9, 0x04, 0xC3, 0xB8, 0xCC, 0x81,
-	0xC9, 0x04, 0xC5, 0xBF, 0xCC, 0x87, 0xC9, 0x04,
-	0xC6, 0xB7, 0xCC, 0x8C, 0xC9, 0x04, 0xCA, 0x92,
-	0xCC, 0x8C, 0xC9, 0x04, 0xCE, 0x91, 0xCC, 0x80,
-	0xC9, 0x04, 0xCE, 0x91, 0xCC, 0x81, 0xC9, 0x04,
-	0xCE, 0x91, 0xCC, 0x84, 0xC9, 0x04, 0xCE, 0x91,
-	0xCC, 0x86, 0xC9, 0x04, 0xCE, 0x91, 0xCD, 0x85,
-	// Bytes 3600 - 363f
-	0xD9, 0x04, 0xCE, 0x95, 0xCC, 0x80, 0xC9, 0x04,
-	0xCE, 0x95, 0xCC, 0x81, 0xC9, 0x04, 0xCE, 0x97,
-	0xCC, 0x80, 0xC9, 0x04, 0xCE, 0x97, 0xCC, 0x81,
-	0xC9, 0x04, 0xCE, 0x97, 0xCD, 0x85, 0xD9, 0x04,
-	0xCE, 0x99, 0xCC, 0x80, 0xC9, 0x04, 0xCE, 0x99,
-	0xCC, 0x81, 0xC9, 0x04, 0xCE, 0x99, 0xCC, 0x84,
-	0xC9, 0x04, 0xCE, 0x99, 0xCC, 0x86, 0xC9, 0x04,
-	0xCE, 0x99, 0xCC, 0x88, 0xC9, 0x04, 0xCE, 0x9F,
-	// Bytes 3640 - 367f
-	0xCC, 0x80, 0xC9, 0x04, 0xCE, 0x9F, 0xCC, 0x81,
-	0xC9, 0x04, 0xCE, 0xA1, 0xCC, 0x94, 0xC9, 0x04,
-	0xCE, 0xA5, 0xCC, 0x80, 0xC9, 0x04, 0xCE, 0xA5,
-	0xCC, 0x81, 0xC9, 0x04, 0xCE, 0xA5, 0xCC, 0x84,
-	0xC9, 0x04, 0xCE, 0xA5, 0xCC, 0x86, 0xC9, 0x04,
-	0xCE, 0xA5, 0xCC, 0x88, 0xC9, 0x04, 0xCE, 0xA9,
-	0xCC, 0x80, 0xC9, 0x04, 0xCE, 0xA9, 0xCC, 0x81,
-	0xC9, 0x04, 0xCE, 0xA9, 0xCD, 0x85, 0xD9, 0x04,
-	// Bytes 3680 - 36bf
-	0xCE, 0xB1, 0xCC, 0x84, 0xC9, 0x04, 0xCE, 0xB1,
-	0xCC, 0x86, 0xC9, 0x04, 0xCE, 0xB1, 0xCD, 0x85,
-	0xD9, 0x04, 0xCE, 0xB5, 0xCC, 0x80, 0xC9, 0x04,
-	0xCE, 0xB5, 0xCC, 0x81, 0xC9, 0x04, 0xCE, 0xB7,
-	0xCD, 0x85, 0xD9, 0x04, 0xCE, 0xB9, 0xCC, 0x80,
-	0xC9, 0x04, 0xCE, 0xB9, 0xCC, 0x81, 0xC9, 0x04,
-	0xCE, 0xB9, 0xCC, 0x84, 0xC9, 0x04, 0xCE, 0xB9,
-	0xCC, 0x86, 0xC9, 0x04, 0xCE, 0xB9, 0xCD, 0x82,
-	// Bytes 36c0 - 36ff
-	0xC9, 0x04, 0xCE, 0xBF, 0xCC, 0x80, 0xC9, 0x04,
-	0xCE, 0xBF, 0xCC, 0x81, 0xC9, 0x04, 0xCF, 0x81,
-	0xCC, 0x93, 0xC9, 0x04, 0xCF, 0x81, 0xCC, 0x94,
-	0xC9, 0x04, 0xCF, 0x85, 0xCC, 0x80, 0xC9, 0x04,
-	0xCF, 0x85, 0xCC, 0x81, 0xC9, 0x04, 0xCF, 0x85,
-	0xCC, 0x84, 0xC9, 0x04, 0xCF, 0x85, 0xCC, 0x86,
-	0xC9, 0x04, 0xCF, 0x85, 0xCD, 0x82, 0xC9, 0x04,
-	0xCF, 0x89, 0xCD, 0x85, 0xD9, 0x04, 0xCF, 0x92,
-	// Bytes 3700 - 373f
-	0xCC, 0x81, 0xC9, 0x04, 0xCF, 0x92, 0xCC, 0x88,
-	0xC9, 0x04, 0xD0, 0x86, 0xCC, 0x88, 0xC9, 0x04,
-	0xD0, 0x90, 0xCC, 0x86, 0xC9, 0x04, 0xD0, 0x90,
-	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0x93, 0xCC, 0x81,
-	0xC9, 0x04, 0xD0, 0x95, 0xCC, 0x80, 0xC9, 0x04,
-	0xD0, 0x95, 0xCC, 0x86, 0xC9, 0x04, 0xD0, 0x95,
-	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0x96, 0xCC, 0x86,
-	0xC9, 0x04, 0xD0, 0x96, 0xCC, 0x88, 0xC9, 0x04,
-	// Bytes 3740 - 377f
-	0xD0, 0x97, 0xCC, 0x88, 0xC9, 0x04, 0xD0, 0x98,
-	0xCC, 0x80, 0xC9, 0x04, 0xD0, 0x98, 0xCC, 0x84,
-	0xC9, 0x04, 0xD0, 0x98, 0xCC, 0x86, 0xC9, 0x04,
-	0xD0, 0x98, 0xCC, 0x88, 0xC9, 0x04, 0xD0, 0x9A,
-	0xCC, 0x81, 0xC9, 0x04, 0xD0, 0x9E, 0xCC, 0x88,
-	0xC9, 0x04, 0xD0, 0xA3, 0xCC, 0x84, 0xC9, 0x04,
-	0xD0, 0xA3, 0xCC, 0x86, 0xC9, 0x04, 0xD0, 0xA3,
-	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0xA3, 0xCC, 0x8B,
-	// Bytes 3780 - 37bf
-	0xC9, 0x04, 0xD0, 0xA7, 0xCC, 0x88, 0xC9, 0x04,
-	0xD0, 0xAB, 0xCC, 0x88, 0xC9, 0x04, 0xD0, 0xAD,
-	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0xB0, 0xCC, 0x86,
-	0xC9, 0x04, 0xD0, 0xB0, 0xCC, 0x88, 0xC9, 0x04,
-	0xD0, 0xB3, 0xCC, 0x81, 0xC9, 0x04, 0xD0, 0xB5,
-	0xCC, 0x80, 0xC9, 0x04, 0xD0, 0xB5, 0xCC, 0x86,
-	0xC9, 0x04, 0xD0, 0xB5, 0xCC, 0x88, 0xC9, 0x04,
-	0xD0, 0xB6, 0xCC, 0x86, 0xC9, 0x04, 0xD0, 0xB6,
-	// Bytes 37c0 - 37ff
-	0xCC, 0x88, 0xC9, 0x04, 0xD0, 0xB7, 0xCC, 0x88,
-	0xC9, 0x04, 0xD0, 0xB8, 0xCC, 0x80, 0xC9, 0x04,
-	0xD0, 0xB8, 0xCC, 0x84, 0xC9, 0x04, 0xD0, 0xB8,
-	0xCC, 0x86, 0xC9, 0x04, 0xD0, 0xB8, 0xCC, 0x88,
-	0xC9, 0x04, 0xD0, 0xBA, 0xCC, 0x81, 0xC9, 0x04,
-	0xD0, 0xBE, 0xCC, 0x88, 0xC9, 0x04, 0xD1, 0x83,
-	0xCC, 0x84, 0xC9, 0x04, 0xD1, 0x83, 0xCC, 0x86,
-	0xC9, 0x04, 0xD1, 0x83, 0xCC, 0x88, 0xC9, 0x04,
-	// Bytes 3800 - 383f
-	0xD1, 0x83, 0xCC, 0x8B, 0xC9, 0x04, 0xD1, 0x87,
-	0xCC, 0x88, 0xC9, 0x04, 0xD1, 0x8B, 0xCC, 0x88,
-	0xC9, 0x04, 0xD1, 0x8D, 0xCC, 0x88, 0xC9, 0x04,
-	0xD1, 0x96, 0xCC, 0x88, 0xC9, 0x04, 0xD1, 0xB4,
-	0xCC, 0x8F, 0xC9, 0x04, 0xD1, 0xB5, 0xCC, 0x8F,
-	0xC9, 0x04, 0xD3, 0x98, 0xCC, 0x88, 0xC9, 0x04,
-	0xD3, 0x99, 0xCC, 0x88, 0xC9, 0x04, 0xD3, 0xA8,
-	0xCC, 0x88, 0xC9, 0x04, 0xD3, 0xA9, 0xCC, 0x88,
-	// Bytes 3840 - 387f
-	0xC9, 0x04, 0xD8, 0xA7, 0xD9, 0x93, 0xC9, 0x04,
-	0xD8, 0xA7, 0xD9, 0x94, 0xC9, 0x04, 0xD8, 0xA7,
-	0xD9, 0x95, 0xB5, 0x04, 0xD9, 0x88, 0xD9, 0x94,
-	0xC9, 0x04, 0xD9, 0x8A, 0xD9, 0x94, 0xC9, 0x04,
-	0xDB, 0x81, 0xD9, 0x94, 0xC9, 0x04, 0xDB, 0x92,
-	0xD9, 0x94, 0xC9, 0x04, 0xDB, 0x95, 0xD9, 0x94,
-	0xC9, 0x05, 0x41, 0xCC, 0x82, 0xCC, 0x80, 0xCA,
-	0x05, 0x41, 0xCC, 0x82, 0xCC, 0x81, 0xCA, 0x05,
-	// Bytes 3880 - 38bf
-	0x41, 0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05, 0x41,
-	0xCC, 0x82, 0xCC, 0x89, 0xCA, 0x05, 0x41, 0xCC,
-	0x86, 0xCC, 0x80, 0xCA, 0x05, 0x41, 0xCC, 0x86,
-	0xCC, 0x81, 0xCA, 0x05, 0x41, 0xCC, 0x86, 0xCC,
-	0x83, 0xCA, 0x05, 0x41, 0xCC, 0x86, 0xCC, 0x89,
-	0xCA, 0x05, 0x41, 0xCC, 0x87, 0xCC, 0x84, 0xCA,
-	0x05, 0x41, 0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05,
-	0x41, 0xCC, 0x8A, 0xCC, 0x81, 0xCA, 0x05, 0x41,
-	// Bytes 38c0 - 38ff
-	0xCC, 0xA3, 0xCC, 0x82, 0xCA, 0x05, 0x41, 0xCC,
-	0xA3, 0xCC, 0x86, 0xCA, 0x05, 0x43, 0xCC, 0xA7,
-	0xCC, 0x81, 0xCA, 0x05, 0x45, 0xCC, 0x82, 0xCC,
-	0x80, 0xCA, 0x05, 0x45, 0xCC, 0x82, 0xCC, 0x81,
-	0xCA, 0x05, 0x45, 0xCC, 0x82, 0xCC, 0x83, 0xCA,
-	0x05, 0x45, 0xCC, 0x82, 0xCC, 0x89, 0xCA, 0x05,
-	0x45, 0xCC, 0x84, 0xCC, 0x80, 0xCA, 0x05, 0x45,
-	0xCC, 0x84, 0xCC, 0x81, 0xCA, 0x05, 0x45, 0xCC,
-	// Bytes 3900 - 393f
-	0xA3, 0xCC, 0x82, 0xCA, 0x05, 0x45, 0xCC, 0xA7,
-	0xCC, 0x86, 0xCA, 0x05, 0x49, 0xCC, 0x88, 0xCC,
-	0x81, 0xCA, 0x05, 0x4C, 0xCC, 0xA3, 0xCC, 0x84,
-	0xCA, 0x05, 0x4F, 0xCC, 0x82, 0xCC, 0x80, 0xCA,
-	0x05, 0x4F, 0xCC, 0x82, 0xCC, 0x81, 0xCA, 0x05,
-	0x4F, 0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05, 0x4F,
-	0xCC, 0x82, 0xCC, 0x89, 0xCA, 0x05, 0x4F, 0xCC,
-	0x83, 0xCC, 0x81, 0xCA, 0x05, 0x4F, 0xCC, 0x83,
-	// Bytes 3940 - 397f
-	0xCC, 0x84, 0xCA, 0x05, 0x4F, 0xCC, 0x83, 0xCC,
-	0x88, 0xCA, 0x05, 0x4F, 0xCC, 0x84, 0xCC, 0x80,
-	0xCA, 0x05, 0x4F, 0xCC, 0x84, 0xCC, 0x81, 0xCA,
-	0x05, 0x4F, 0xCC, 0x87, 0xCC, 0x84, 0xCA, 0x05,
-	0x4F, 0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x4F,
-	0xCC, 0x9B, 0xCC, 0x80, 0xCA, 0x05, 0x4F, 0xCC,
-	0x9B, 0xCC, 0x81, 0xCA, 0x05, 0x4F, 0xCC, 0x9B,
-	0xCC, 0x83, 0xCA, 0x05, 0x4F, 0xCC, 0x9B, 0xCC,
-	// Bytes 3980 - 39bf
-	0x89, 0xCA, 0x05, 0x4F, 0xCC, 0x9B, 0xCC, 0xA3,
-	0xB6, 0x05, 0x4F, 0xCC, 0xA3, 0xCC, 0x82, 0xCA,
-	0x05, 0x4F, 0xCC, 0xA8, 0xCC, 0x84, 0xCA, 0x05,
-	0x52, 0xCC, 0xA3, 0xCC, 0x84, 0xCA, 0x05, 0x53,
-	0xCC, 0x81, 0xCC, 0x87, 0xCA, 0x05, 0x53, 0xCC,
-	0x8C, 0xCC, 0x87, 0xCA, 0x05, 0x53, 0xCC, 0xA3,
-	0xCC, 0x87, 0xCA, 0x05, 0x55, 0xCC, 0x83, 0xCC,
-	0x81, 0xCA, 0x05, 0x55, 0xCC, 0x84, 0xCC, 0x88,
-	// Bytes 39c0 - 39ff
-	0xCA, 0x05, 0x55, 0xCC, 0x88, 0xCC, 0x80, 0xCA,
-	0x05, 0x55, 0xCC, 0x88, 0xCC, 0x81, 0xCA, 0x05,
-	0x55, 0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x55,
-	0xCC, 0x88, 0xCC, 0x8C, 0xCA, 0x05, 0x55, 0xCC,
-	0x9B, 0xCC, 0x80, 0xCA, 0x05, 0x55, 0xCC, 0x9B,
-	0xCC, 0x81, 0xCA, 0x05, 0x55, 0xCC, 0x9B, 0xCC,
-	0x83, 0xCA, 0x05, 0x55, 0xCC, 0x9B, 0xCC, 0x89,
-	0xCA, 0x05, 0x55, 0xCC, 0x9B, 0xCC, 0xA3, 0xB6,
-	// Bytes 3a00 - 3a3f
-	0x05, 0x61, 0xCC, 0x82, 0xCC, 0x80, 0xCA, 0x05,
-	0x61, 0xCC, 0x82, 0xCC, 0x81, 0xCA, 0x05, 0x61,
-	0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05, 0x61, 0xCC,
-	0x82, 0xCC, 0x89, 0xCA, 0x05, 0x61, 0xCC, 0x86,
-	0xCC, 0x80, 0xCA, 0x05, 0x61, 0xCC, 0x86, 0xCC,
-	0x81, 0xCA, 0x05, 0x61, 0xCC, 0x86, 0xCC, 0x83,
-	0xCA, 0x05, 0x61, 0xCC, 0x86, 0xCC, 0x89, 0xCA,
-	0x05, 0x61, 0xCC, 0x87, 0xCC, 0x84, 0xCA, 0x05,
-	// Bytes 3a40 - 3a7f
-	0x61, 0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x61,
-	0xCC, 0x8A, 0xCC, 0x81, 0xCA, 0x05, 0x61, 0xCC,
-	0xA3, 0xCC, 0x82, 0xCA, 0x05, 0x61, 0xCC, 0xA3,
-	0xCC, 0x86, 0xCA, 0x05, 0x63, 0xCC, 0xA7, 0xCC,
-	0x81, 0xCA, 0x05, 0x65, 0xCC, 0x82, 0xCC, 0x80,
-	0xCA, 0x05, 0x65, 0xCC, 0x82, 0xCC, 0x81, 0xCA,
-	0x05, 0x65, 0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05,
-	0x65, 0xCC, 0x82, 0xCC, 0x89, 0xCA, 0x05, 0x65,
-	// Bytes 3a80 - 3abf
-	0xCC, 0x84, 0xCC, 0x80, 0xCA, 0x05, 0x65, 0xCC,
-	0x84, 0xCC, 0x81, 0xCA, 0x05, 0x65, 0xCC, 0xA3,
-	0xCC, 0x82, 0xCA, 0x05, 0x65, 0xCC, 0xA7, 0xCC,
-	0x86, 0xCA, 0x05, 0x69, 0xCC, 0x88, 0xCC, 0x81,
-	0xCA, 0x05, 0x6C, 0xCC, 0xA3, 0xCC, 0x84, 0xCA,
-	0x05, 0x6F, 0xCC, 0x82, 0xCC, 0x80, 0xCA, 0x05,
-	0x6F, 0xCC, 0x82, 0xCC, 0x81, 0xCA, 0x05, 0x6F,
-	0xCC, 0x82, 0xCC, 0x83, 0xCA, 0x05, 0x6F, 0xCC,
-	// Bytes 3ac0 - 3aff
-	0x82, 0xCC, 0x89, 0xCA, 0x05, 0x6F, 0xCC, 0x83,
-	0xCC, 0x81, 0xCA, 0x05, 0x6F, 0xCC, 0x83, 0xCC,
-	0x84, 0xCA, 0x05, 0x6F, 0xCC, 0x83, 0xCC, 0x88,
-	0xCA, 0x05, 0x6F, 0xCC, 0x84, 0xCC, 0x80, 0xCA,
-	0x05, 0x6F, 0xCC, 0x84, 0xCC, 0x81, 0xCA, 0x05,
-	0x6F, 0xCC, 0x87, 0xCC, 0x84, 0xCA, 0x05, 0x6F,
-	0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x6F, 0xCC,
-	0x9B, 0xCC, 0x80, 0xCA, 0x05, 0x6F, 0xCC, 0x9B,
-	// Bytes 3b00 - 3b3f
-	0xCC, 0x81, 0xCA, 0x05, 0x6F, 0xCC, 0x9B, 0xCC,
-	0x83, 0xCA, 0x05, 0x6F, 0xCC, 0x9B, 0xCC, 0x89,
-	0xCA, 0x05, 0x6F, 0xCC, 0x9B, 0xCC, 0xA3, 0xB6,
-	0x05, 0x6F, 0xCC, 0xA3, 0xCC, 0x82, 0xCA, 0x05,
-	0x6F, 0xCC, 0xA8, 0xCC, 0x84, 0xCA, 0x05, 0x72,
-	0xCC, 0xA3, 0xCC, 0x84, 0xCA, 0x05, 0x73, 0xCC,
-	0x81, 0xCC, 0x87, 0xCA, 0x05, 0x73, 0xCC, 0x8C,
-	0xCC, 0x87, 0xCA, 0x05, 0x73, 0xCC, 0xA3, 0xCC,
-	// Bytes 3b40 - 3b7f
-	0x87, 0xCA, 0x05, 0x75, 0xCC, 0x83, 0xCC, 0x81,
-	0xCA, 0x05, 0x75, 0xCC, 0x84, 0xCC, 0x88, 0xCA,
-	0x05, 0x75, 0xCC, 0x88, 0xCC, 0x80, 0xCA, 0x05,
-	0x75, 0xCC, 0x88, 0xCC, 0x81, 0xCA, 0x05, 0x75,
-	0xCC, 0x88, 0xCC, 0x84, 0xCA, 0x05, 0x75, 0xCC,
-	0x88, 0xCC, 0x8C, 0xCA, 0x05, 0x75, 0xCC, 0x9B,
-	0xCC, 0x80, 0xCA, 0x05, 0x75, 0xCC, 0x9B, 0xCC,
-	0x81, 0xCA, 0x05, 0x75, 0xCC, 0x9B, 0xCC, 0x83,
-	// Bytes 3b80 - 3bbf
-	0xCA, 0x05, 0x75, 0xCC, 0x9B, 0xCC, 0x89, 0xCA,
-	0x05, 0x75, 0xCC, 0x9B, 0xCC, 0xA3, 0xB6, 0x05,
-	0xE1, 0xBE, 0xBF, 0xCC, 0x80, 0xCA, 0x05, 0xE1,
-	0xBE, 0xBF, 0xCC, 0x81, 0xCA, 0x05, 0xE1, 0xBE,
-	0xBF, 0xCD, 0x82, 0xCA, 0x05, 0xE1, 0xBF, 0xBE,
-	0xCC, 0x80, 0xCA, 0x05, 0xE1, 0xBF, 0xBE, 0xCC,
-	0x81, 0xCA, 0x05, 0xE1, 0xBF, 0xBE, 0xCD, 0x82,
-	0xCA, 0x05, 0xE2, 0x86, 0x90, 0xCC, 0xB8, 0x05,
-	// Bytes 3bc0 - 3bff
-	0x05, 0xE2, 0x86, 0x92, 0xCC, 0xB8, 0x05, 0x05,
-	0xE2, 0x86, 0x94, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
-	0x87, 0x90, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x87,
-	0x92, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x87, 0x94,
-	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x88, 0x83, 0xCC,
-	0xB8, 0x05, 0x05, 0xE2, 0x88, 0x88, 0xCC, 0xB8,
-	0x05, 0x05, 0xE2, 0x88, 0x8B, 0xCC, 0xB8, 0x05,
-	0x05, 0xE2, 0x88, 0xA3, 0xCC, 0xB8, 0x05, 0x05,
-	// Bytes 3c00 - 3c3f
-	0xE2, 0x88, 0xA5, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
-	0x88, 0xBC, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89,
-	0x83, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0x85,
-	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0x88, 0xCC,
-	0xB8, 0x05, 0x05, 0xE2, 0x89, 0x8D, 0xCC, 0xB8,
-	0x05, 0x05, 0xE2, 0x89, 0xA1, 0xCC, 0xB8, 0x05,
-	0x05, 0xE2, 0x89, 0xA4, 0xCC, 0xB8, 0x05, 0x05,
-	0xE2, 0x89, 0xA5, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
-	// Bytes 3c40 - 3c7f
-	0x89, 0xB2, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89,
-	0xB3, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0xB6,
-	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x89, 0xB7, 0xCC,
-	0xB8, 0x05, 0x05, 0xE2, 0x89, 0xBA, 0xCC, 0xB8,
-	0x05, 0x05, 0xE2, 0x89, 0xBB, 0xCC, 0xB8, 0x05,
-	0x05, 0xE2, 0x89, 0xBC, 0xCC, 0xB8, 0x05, 0x05,
-	0xE2, 0x89, 0xBD, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
-	0x8A, 0x82, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A,
-	// Bytes 3c80 - 3cbf
-	0x83, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x86,
-	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x87, 0xCC,
-	0xB8, 0x05, 0x05, 0xE2, 0x8A, 0x91, 0xCC, 0xB8,
-	0x05, 0x05, 0xE2, 0x8A, 0x92, 0xCC, 0xB8, 0x05,
-	0x05, 0xE2, 0x8A, 0xA2, 0xCC, 0xB8, 0x05, 0x05,
-	0xE2, 0x8A, 0xA8, 0xCC, 0xB8, 0x05, 0x05, 0xE2,
-	0x8A, 0xA9, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A,
-	0xAB, 0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB2,
-	// Bytes 3cc0 - 3cff
-	0xCC, 0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB3, 0xCC,
-	0xB8, 0x05, 0x05, 0xE2, 0x8A, 0xB4, 0xCC, 0xB8,
-	0x05, 0x05, 0xE2, 0x8A, 0xB5, 0xCC, 0xB8, 0x05,
-	0x06, 0xCE, 0x91, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0x91, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0x95, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
-	0x06, 0xCE, 0x95, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
-	0x06, 0xCE, 0x95, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
-	// Bytes 3d00 - 3d3f
-	0x06, 0xCE, 0x95, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
-	0x06, 0xCE, 0x97, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0x97, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
-	0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
-	0x06, 0xCE, 0x99, 0xCC, 0x93, 0xCD, 0x82, 0xCA,
-	0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
-	0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
-	// Bytes 3d40 - 3d7f
-	0x06, 0xCE, 0x99, 0xCC, 0x94, 0xCD, 0x82, 0xCA,
-	0x06, 0xCE, 0x9F, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
-	0x06, 0xCE, 0x9F, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
-	0x06, 0xCE, 0x9F, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
-	0x06, 0xCE, 0x9F, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
-	0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
-	0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
-	0x06, 0xCE, 0xA5, 0xCC, 0x94, 0xCD, 0x82, 0xCA,
-	// Bytes 3d80 - 3dbf
-	0x06, 0xCE, 0xA9, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0xA9, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0xB1, 0xCC, 0x80, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0xB1, 0xCC, 0x81, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0xB1, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0xB1, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0xB1, 0xCD, 0x82, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0xB5, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
-	// Bytes 3dc0 - 3dff
-	0x06, 0xCE, 0xB5, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
-	0x06, 0xCE, 0xB5, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
-	0x06, 0xCE, 0xB5, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
-	0x06, 0xCE, 0xB7, 0xCC, 0x80, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0xB7, 0xCC, 0x81, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0xB7, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0xB7, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
-	0x06, 0xCE, 0xB7, 0xCD, 0x82, 0xCD, 0x85, 0xDA,
-	// Bytes 3e00 - 3e3f
-	0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCC, 0x80, 0xCA,
-	0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCC, 0x81, 0xCA,
-	0x06, 0xCE, 0xB9, 0xCC, 0x88, 0xCD, 0x82, 0xCA,
-	0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
-	0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
-	0x06, 0xCE, 0xB9, 0xCC, 0x93, 0xCD, 0x82, 0xCA,
-	0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
-	0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
-	// Bytes 3e40 - 3e7f
-	0x06, 0xCE, 0xB9, 0xCC, 0x94, 0xCD, 0x82, 0xCA,
-	0x06, 0xCE, 0xBF, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
-	0x06, 0xCE, 0xBF, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
-	0x06, 0xCE, 0xBF, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
-	0x06, 0xCE, 0xBF, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
-	0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCC, 0x80, 0xCA,
-	0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCC, 0x81, 0xCA,
-	0x06, 0xCF, 0x85, 0xCC, 0x88, 0xCD, 0x82, 0xCA,
-	// Bytes 3e80 - 3ebf
-	0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
-	0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCC, 0x81, 0xCA,
-	0x06, 0xCF, 0x85, 0xCC, 0x93, 0xCD, 0x82, 0xCA,
-	0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCC, 0x80, 0xCA,
-	0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCC, 0x81, 0xCA,
-	0x06, 0xCF, 0x85, 0xCC, 0x94, 0xCD, 0x82, 0xCA,
-	0x06, 0xCF, 0x89, 0xCC, 0x80, 0xCD, 0x85, 0xDA,
-	0x06, 0xCF, 0x89, 0xCC, 0x81, 0xCD, 0x85, 0xDA,
-	// Bytes 3ec0 - 3eff
-	0x06, 0xCF, 0x89, 0xCC, 0x93, 0xCD, 0x85, 0xDA,
-	0x06, 0xCF, 0x89, 0xCC, 0x94, 0xCD, 0x85, 0xDA,
-	0x06, 0xCF, 0x89, 0xCD, 0x82, 0xCD, 0x85, 0xDA,
-	0x06, 0xE0, 0xA4, 0xA8, 0xE0, 0xA4, 0xBC, 0x09,
-	0x06, 0xE0, 0xA4, 0xB0, 0xE0, 0xA4, 0xBC, 0x09,
-	0x06, 0xE0, 0xA4, 0xB3, 0xE0, 0xA4, 0xBC, 0x09,
-	0x06, 0xE0, 0xB1, 0x86, 0xE0, 0xB1, 0x96, 0x85,
-	0x06, 0xE0, 0xB7, 0x99, 0xE0, 0xB7, 0x8A, 0x11,
-	// Bytes 3f00 - 3f3f
-	0x06, 0xE3, 0x81, 0x86, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0x8B, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0x8D, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0x8F, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0x91, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0x93, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0x95, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0x97, 0xE3, 0x82, 0x99, 0x0D,
-	// Bytes 3f40 - 3f7f
-	0x06, 0xE3, 0x81, 0x99, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0x9B, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0x9D, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0x9F, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0xA1, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0xA4, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0xA6, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0xA8, 0xE3, 0x82, 0x99, 0x0D,
-	// Bytes 3f80 - 3fbf
-	0x06, 0xE3, 0x81, 0xAF, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0xAF, 0xE3, 0x82, 0x9A, 0x0D,
-	0x06, 0xE3, 0x81, 0xB2, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0xB2, 0xE3, 0x82, 0x9A, 0x0D,
-	0x06, 0xE3, 0x81, 0xB5, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0xB5, 0xE3, 0x82, 0x9A, 0x0D,
-	0x06, 0xE3, 0x81, 0xB8, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0xB8, 0xE3, 0x82, 0x9A, 0x0D,
-	// Bytes 3fc0 - 3fff
-	0x06, 0xE3, 0x81, 0xBB, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x81, 0xBB, 0xE3, 0x82, 0x9A, 0x0D,
-	0x06, 0xE3, 0x82, 0x9D, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x82, 0xA6, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x82, 0xAB, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x82, 0xAD, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x82, 0xAF, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x82, 0xB1, 0xE3, 0x82, 0x99, 0x0D,
-	// Bytes 4000 - 403f
-	0x06, 0xE3, 0x82, 0xB3, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x82, 0xB5, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x82, 0xB7, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x82, 0xB9, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x82, 0xBB, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x82, 0xBD, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x82, 0xBF, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x83, 0x81, 0xE3, 0x82, 0x99, 0x0D,
-	// Bytes 4040 - 407f
-	0x06, 0xE3, 0x83, 0x84, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x83, 0x86, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x83, 0x88, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x83, 0x8F, 0xE3, 0x82, 0x9A, 0x0D,
-	0x06, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x83, 0x92, 0xE3, 0x82, 0x9A, 0x0D,
-	0x06, 0xE3, 0x83, 0x95, 0xE3, 0x82, 0x99, 0x0D,
-	// Bytes 4080 - 40bf
-	0x06, 0xE3, 0x83, 0x95, 0xE3, 0x82, 0x9A, 0x0D,
-	0x06, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x83, 0x98, 0xE3, 0x82, 0x9A, 0x0D,
-	0x06, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x83, 0x9B, 0xE3, 0x82, 0x9A, 0x0D,
-	0x06, 0xE3, 0x83, 0xAF, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x83, 0xB0, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x83, 0xB1, 0xE3, 0x82, 0x99, 0x0D,
-	// Bytes 40c0 - 40ff
-	0x06, 0xE3, 0x83, 0xB2, 0xE3, 0x82, 0x99, 0x0D,
-	0x06, 0xE3, 0x83, 0xBD, 0xE3, 0x82, 0x99, 0x0D,
-	0x08, 0xCE, 0x91, 0xCC, 0x93, 0xCC, 0x80, 0xCD,
-	0x85, 0xDB, 0x08, 0xCE, 0x91, 0xCC, 0x93, 0xCC,
-	0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0x91, 0xCC,
-	0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
-	0x91, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85, 0xDB,
-	0x08, 0xCE, 0x91, 0xCC, 0x94, 0xCC, 0x81, 0xCD,
-	// Bytes 4100 - 413f
-	0x85, 0xDB, 0x08, 0xCE, 0x91, 0xCC, 0x94, 0xCD,
-	0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0x97, 0xCC,
-	0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
-	0x97, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85, 0xDB,
-	0x08, 0xCE, 0x97, 0xCC, 0x93, 0xCD, 0x82, 0xCD,
-	0x85, 0xDB, 0x08, 0xCE, 0x97, 0xCC, 0x94, 0xCC,
-	0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0x97, 0xCC,
-	0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
-	// Bytes 4140 - 417f
-	0x97, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85, 0xDB,
-	0x08, 0xCE, 0xA9, 0xCC, 0x93, 0xCC, 0x80, 0xCD,
-	0x85, 0xDB, 0x08, 0xCE, 0xA9, 0xCC, 0x93, 0xCC,
-	0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0xA9, 0xCC,
-	0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
-	0xA9, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85, 0xDB,
-	0x08, 0xCE, 0xA9, 0xCC, 0x94, 0xCC, 0x81, 0xCD,
-	0x85, 0xDB, 0x08, 0xCE, 0xA9, 0xCC, 0x94, 0xCD,
-	// Bytes 4180 - 41bf
-	0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0xB1, 0xCC,
-	0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
-	0xB1, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85, 0xDB,
-	0x08, 0xCE, 0xB1, 0xCC, 0x93, 0xCD, 0x82, 0xCD,
-	0x85, 0xDB, 0x08, 0xCE, 0xB1, 0xCC, 0x94, 0xCC,
-	0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0xB1, 0xCC,
-	0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
-	0xB1, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85, 0xDB,
-	// Bytes 41c0 - 41ff
-	0x08, 0xCE, 0xB7, 0xCC, 0x93, 0xCC, 0x80, 0xCD,
-	0x85, 0xDB, 0x08, 0xCE, 0xB7, 0xCC, 0x93, 0xCC,
-	0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCE, 0xB7, 0xCC,
-	0x93, 0xCD, 0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCE,
-	0xB7, 0xCC, 0x94, 0xCC, 0x80, 0xCD, 0x85, 0xDB,
-	0x08, 0xCE, 0xB7, 0xCC, 0x94, 0xCC, 0x81, 0xCD,
-	0x85, 0xDB, 0x08, 0xCE, 0xB7, 0xCC, 0x94, 0xCD,
-	0x82, 0xCD, 0x85, 0xDB, 0x08, 0xCF, 0x89, 0xCC,
-	// Bytes 4200 - 423f
-	0x93, 0xCC, 0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCF,
-	0x89, 0xCC, 0x93, 0xCC, 0x81, 0xCD, 0x85, 0xDB,
-	0x08, 0xCF, 0x89, 0xCC, 0x93, 0xCD, 0x82, 0xCD,
-	0x85, 0xDB, 0x08, 0xCF, 0x89, 0xCC, 0x94, 0xCC,
-	0x80, 0xCD, 0x85, 0xDB, 0x08, 0xCF, 0x89, 0xCC,
-	0x94, 0xCC, 0x81, 0xCD, 0x85, 0xDB, 0x08, 0xCF,
-	0x89, 0xCC, 0x94, 0xCD, 0x82, 0xCD, 0x85, 0xDB,
-	0x08, 0xF0, 0x91, 0x82, 0x99, 0xF0, 0x91, 0x82,
-	// Bytes 4240 - 427f
-	0xBA, 0x09, 0x08, 0xF0, 0x91, 0x82, 0x9B, 0xF0,
-	0x91, 0x82, 0xBA, 0x09, 0x08, 0xF0, 0x91, 0x82,
-	0xA5, 0xF0, 0x91, 0x82, 0xBA, 0x09, 0x42, 0xC2,
-	0xB4, 0x01, 0x43, 0x20, 0xCC, 0x81, 0xC9, 0x43,
-	0x20, 0xCC, 0x83, 0xC9, 0x43, 0x20, 0xCC, 0x84,
-	0xC9, 0x43, 0x20, 0xCC, 0x85, 0xC9, 0x43, 0x20,
-	0xCC, 0x86, 0xC9, 0x43, 0x20, 0xCC, 0x87, 0xC9,
-	0x43, 0x20, 0xCC, 0x88, 0xC9, 0x43, 0x20, 0xCC,
-	// Bytes 4280 - 42bf
-	0x8A, 0xC9, 0x43, 0x20, 0xCC, 0x8B, 0xC9, 0x43,
-	0x20, 0xCC, 0x93, 0xC9, 0x43, 0x20, 0xCC, 0x94,
-	0xC9, 0x43, 0x20, 0xCC, 0xA7, 0xA5, 0x43, 0x20,
-	0xCC, 0xA8, 0xA5, 0x43, 0x20, 0xCC, 0xB3, 0xB5,
-	0x43, 0x20, 0xCD, 0x82, 0xC9, 0x43, 0x20, 0xCD,
-	0x85, 0xD9, 0x43, 0x20, 0xD9, 0x8B, 0x59, 0x43,
-	0x20, 0xD9, 0x8C, 0x5D, 0x43, 0x20, 0xD9, 0x8D,
-	0x61, 0x43, 0x20, 0xD9, 0x8E, 0x65, 0x43, 0x20,
-	// Bytes 42c0 - 42ff
-	0xD9, 0x8F, 0x69, 0x43, 0x20, 0xD9, 0x90, 0x6D,
-	0x43, 0x20, 0xD9, 0x91, 0x71, 0x43, 0x20, 0xD9,
-	0x92, 0x75, 0x43, 0x41, 0xCC, 0x8A, 0xC9, 0x43,
-	0x73, 0xCC, 0x87, 0xC9, 0x44, 0x20, 0xE3, 0x82,
-	0x99, 0x0D, 0x44, 0x20, 0xE3, 0x82, 0x9A, 0x0D,
-	0x44, 0xC2, 0xA8, 0xCC, 0x81, 0xCA, 0x44, 0xCE,
-	0x91, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0x95, 0xCC,
-	0x81, 0xC9, 0x44, 0xCE, 0x97, 0xCC, 0x81, 0xC9,
-	// Bytes 4300 - 433f
-	0x44, 0xCE, 0x99, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
-	0x9F, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0xA5, 0xCC,
-	0x81, 0xC9, 0x44, 0xCE, 0xA5, 0xCC, 0x88, 0xC9,
-	0x44, 0xCE, 0xA9, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
-	0xB1, 0xCC, 0x81, 0xC9, 0x44, 0xCE, 0xB5, 0xCC,
-	0x81, 0xC9, 0x44, 0xCE, 0xB7, 0xCC, 0x81, 0xC9,
-	0x44, 0xCE, 0xB9, 0xCC, 0x81, 0xC9, 0x44, 0xCE,
-	0xBF, 0xCC, 0x81, 0xC9, 0x44, 0xCF, 0x85, 0xCC,
-	// Bytes 4340 - 437f
-	0x81, 0xC9, 0x44, 0xCF, 0x89, 0xCC, 0x81, 0xC9,
-	0x44, 0xD7, 0x90, 0xD6, 0xB7, 0x31, 0x44, 0xD7,
-	0x90, 0xD6, 0xB8, 0x35, 0x44, 0xD7, 0x90, 0xD6,
-	0xBC, 0x41, 0x44, 0xD7, 0x91, 0xD6, 0xBC, 0x41,
-	0x44, 0xD7, 0x91, 0xD6, 0xBF, 0x49, 0x44, 0xD7,
-	0x92, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0x93, 0xD6,
-	0xBC, 0x41, 0x44, 0xD7, 0x94, 0xD6, 0xBC, 0x41,
-	0x44, 0xD7, 0x95, 0xD6, 0xB9, 0x39, 0x44, 0xD7,
-	// Bytes 4380 - 43bf
-	0x95, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0x96, 0xD6,
-	0xBC, 0x41, 0x44, 0xD7, 0x98, 0xD6, 0xBC, 0x41,
-	0x44, 0xD7, 0x99, 0xD6, 0xB4, 0x25, 0x44, 0xD7,
-	0x99, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0x9A, 0xD6,
-	0xBC, 0x41, 0x44, 0xD7, 0x9B, 0xD6, 0xBC, 0x41,
-	0x44, 0xD7, 0x9B, 0xD6, 0xBF, 0x49, 0x44, 0xD7,
-	0x9C, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0x9E, 0xD6,
-	0xBC, 0x41, 0x44, 0xD7, 0xA0, 0xD6, 0xBC, 0x41,
-	// Bytes 43c0 - 43ff
-	0x44, 0xD7, 0xA1, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
-	0xA3, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0xA4, 0xD6,
-	0xBC, 0x41, 0x44, 0xD7, 0xA4, 0xD6, 0xBF, 0x49,
-	0x44, 0xD7, 0xA6, 0xD6, 0xBC, 0x41, 0x44, 0xD7,
-	0xA7, 0xD6, 0xBC, 0x41, 0x44, 0xD7, 0xA8, 0xD6,
-	0xBC, 0x41, 0x44, 0xD7, 0xA9, 0xD6, 0xBC, 0x41,
-	0x44, 0xD7, 0xA9, 0xD7, 0x81, 0x4D, 0x44, 0xD7,
-	0xA9, 0xD7, 0x82, 0x51, 0x44, 0xD7, 0xAA, 0xD6,
-	// Bytes 4400 - 443f
-	0xBC, 0x41, 0x44, 0xD7, 0xB2, 0xD6, 0xB7, 0x31,
-	0x44, 0xD8, 0xA7, 0xD9, 0x8B, 0x59, 0x44, 0xD8,
-	0xA7, 0xD9, 0x93, 0xC9, 0x44, 0xD8, 0xA7, 0xD9,
-	0x94, 0xC9, 0x44, 0xD8, 0xA7, 0xD9, 0x95, 0xB5,
-	0x44, 0xD8, 0xB0, 0xD9, 0xB0, 0x79, 0x44, 0xD8,
-	0xB1, 0xD9, 0xB0, 0x79, 0x44, 0xD9, 0x80, 0xD9,
-	0x8B, 0x59, 0x44, 0xD9, 0x80, 0xD9, 0x8E, 0x65,
-	0x44, 0xD9, 0x80, 0xD9, 0x8F, 0x69, 0x44, 0xD9,
-	// Bytes 4440 - 447f
-	0x80, 0xD9, 0x90, 0x6D, 0x44, 0xD9, 0x80, 0xD9,
-	0x91, 0x71, 0x44, 0xD9, 0x80, 0xD9, 0x92, 0x75,
-	0x44, 0xD9, 0x87, 0xD9, 0xB0, 0x79, 0x44, 0xD9,
-	0x88, 0xD9, 0x94, 0xC9, 0x44, 0xD9, 0x89, 0xD9,
-	0xB0, 0x79, 0x44, 0xD9, 0x8A, 0xD9, 0x94, 0xC9,
-	0x44, 0xDB, 0x92, 0xD9, 0x94, 0xC9, 0x44, 0xDB,
-	0x95, 0xD9, 0x94, 0xC9, 0x45, 0x20, 0xCC, 0x88,
-	0xCC, 0x80, 0xCA, 0x45, 0x20, 0xCC, 0x88, 0xCC,
-	// Bytes 4480 - 44bf
-	0x81, 0xCA, 0x45, 0x20, 0xCC, 0x88, 0xCD, 0x82,
-	0xCA, 0x45, 0x20, 0xCC, 0x93, 0xCC, 0x80, 0xCA,
-	0x45, 0x20, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x45,
-	0x20, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x45, 0x20,
-	0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x45, 0x20, 0xCC,
-	0x94, 0xCC, 0x81, 0xCA, 0x45, 0x20, 0xCC, 0x94,
-	0xCD, 0x82, 0xCA, 0x45, 0x20, 0xD9, 0x8C, 0xD9,
-	0x91, 0x72, 0x45, 0x20, 0xD9, 0x8D, 0xD9, 0x91,
-	// Bytes 44c0 - 44ff
-	0x72, 0x45, 0x20, 0xD9, 0x8E, 0xD9, 0x91, 0x72,
-	0x45, 0x20, 0xD9, 0x8F, 0xD9, 0x91, 0x72, 0x45,
-	0x20, 0xD9, 0x90, 0xD9, 0x91, 0x72, 0x45, 0x20,
-	0xD9, 0x91, 0xD9, 0xB0, 0x7A, 0x45, 0xE2, 0xAB,
-	0x9D, 0xCC, 0xB8, 0x05, 0x46, 0xCE, 0xB9, 0xCC,
-	0x88, 0xCC, 0x81, 0xCA, 0x46, 0xCF, 0x85, 0xCC,
-	0x88, 0xCC, 0x81, 0xCA, 0x46, 0xD7, 0xA9, 0xD6,
-	0xBC, 0xD7, 0x81, 0x4E, 0x46, 0xD7, 0xA9, 0xD6,
-	// Bytes 4500 - 453f
-	0xBC, 0xD7, 0x82, 0x52, 0x46, 0xD9, 0x80, 0xD9,
-	0x8E, 0xD9, 0x91, 0x72, 0x46, 0xD9, 0x80, 0xD9,
-	0x8F, 0xD9, 0x91, 0x72, 0x46, 0xD9, 0x80, 0xD9,
-	0x90, 0xD9, 0x91, 0x72, 0x46, 0xE0, 0xA4, 0x95,
-	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x96,
-	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x97,
-	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0x9C,
-	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xA1,
-	// Bytes 4540 - 457f
-	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xA2,
-	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xAB,
-	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA4, 0xAF,
-	0xE0, 0xA4, 0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xA1,
-	0xE0, 0xA6, 0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xA2,
-	0xE0, 0xA6, 0xBC, 0x09, 0x46, 0xE0, 0xA6, 0xAF,
-	0xE0, 0xA6, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x96,
-	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x97,
-	// Bytes 4580 - 45bf
-	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0x9C,
-	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xAB,
-	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xB2,
-	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xA8, 0xB8,
-	0xE0, 0xA8, 0xBC, 0x09, 0x46, 0xE0, 0xAC, 0xA1,
-	0xE0, 0xAC, 0xBC, 0x09, 0x46, 0xE0, 0xAC, 0xA2,
-	0xE0, 0xAC, 0xBC, 0x09, 0x46, 0xE0, 0xBE, 0xB2,
-	0xE0, 0xBE, 0x80, 0x9D, 0x46, 0xE0, 0xBE, 0xB3,
-	// Bytes 45c0 - 45ff
-	0xE0, 0xBE, 0x80, 0x9D, 0x46, 0xE3, 0x83, 0x86,
-	0xE3, 0x82, 0x99, 0x0D, 0x48, 0xF0, 0x9D, 0x85,
-	0x97, 0xF0, 0x9D, 0x85, 0xA5, 0xAD, 0x48, 0xF0,
-	0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xAD,
-	0x48, 0xF0, 0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85,
-	0xA5, 0xAD, 0x48, 0xF0, 0x9D, 0x86, 0xBA, 0xF0,
-	0x9D, 0x85, 0xA5, 0xAD, 0x49, 0xE0, 0xBE, 0xB2,
-	0xE0, 0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0x9E, 0x49,
-	// Bytes 4600 - 463f
-	0xE0, 0xBE, 0xB3, 0xE0, 0xBD, 0xB1, 0xE0, 0xBE,
-	0x80, 0x9E, 0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0,
-	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAE, 0xAE,
-	0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85,
-	0xA5, 0xF0, 0x9D, 0x85, 0xAF, 0xAE, 0x4C, 0xF0,
-	0x9D, 0x85, 0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xF0,
-	0x9D, 0x85, 0xB0, 0xAE, 0x4C, 0xF0, 0x9D, 0x85,
-	0x98, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85,
-	// Bytes 4640 - 467f
-	0xB1, 0xAE, 0x4C, 0xF0, 0x9D, 0x85, 0x98, 0xF0,
-	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xB2, 0xAE,
-	0x4C, 0xF0, 0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85,
-	0xA5, 0xF0, 0x9D, 0x85, 0xAE, 0xAE, 0x4C, 0xF0,
-	0x9D, 0x86, 0xB9, 0xF0, 0x9D, 0x85, 0xA5, 0xF0,
-	0x9D, 0x85, 0xAF, 0xAE, 0x4C, 0xF0, 0x9D, 0x86,
-	0xBA, 0xF0, 0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85,
-	0xAE, 0xAE, 0x4C, 0xF0, 0x9D, 0x86, 0xBA, 0xF0,
-	// Bytes 4680 - 46bf
-	0x9D, 0x85, 0xA5, 0xF0, 0x9D, 0x85, 0xAF, 0xAE,
-	0x83, 0x41, 0xCC, 0x82, 0xC9, 0x83, 0x41, 0xCC,
-	0x86, 0xC9, 0x83, 0x41, 0xCC, 0x87, 0xC9, 0x83,
-	0x41, 0xCC, 0x88, 0xC9, 0x83, 0x41, 0xCC, 0x8A,
-	0xC9, 0x83, 0x41, 0xCC, 0xA3, 0xB5, 0x83, 0x43,
-	0xCC, 0xA7, 0xA5, 0x83, 0x45, 0xCC, 0x82, 0xC9,
-	0x83, 0x45, 0xCC, 0x84, 0xC9, 0x83, 0x45, 0xCC,
-	0xA3, 0xB5, 0x83, 0x45, 0xCC, 0xA7, 0xA5, 0x83,
-	// Bytes 46c0 - 46ff
-	0x49, 0xCC, 0x88, 0xC9, 0x83, 0x4C, 0xCC, 0xA3,
-	0xB5, 0x83, 0x4F, 0xCC, 0x82, 0xC9, 0x83, 0x4F,
-	0xCC, 0x83, 0xC9, 0x83, 0x4F, 0xCC, 0x84, 0xC9,
-	0x83, 0x4F, 0xCC, 0x87, 0xC9, 0x83, 0x4F, 0xCC,
-	0x88, 0xC9, 0x83, 0x4F, 0xCC, 0x9B, 0xAD, 0x83,
-	0x4F, 0xCC, 0xA3, 0xB5, 0x83, 0x4F, 0xCC, 0xA8,
-	0xA5, 0x83, 0x52, 0xCC, 0xA3, 0xB5, 0x83, 0x53,
-	0xCC, 0x81, 0xC9, 0x83, 0x53, 0xCC, 0x8C, 0xC9,
-	// Bytes 4700 - 473f
-	0x83, 0x53, 0xCC, 0xA3, 0xB5, 0x83, 0x55, 0xCC,
-	0x83, 0xC9, 0x83, 0x55, 0xCC, 0x84, 0xC9, 0x83,
-	0x55, 0xCC, 0x88, 0xC9, 0x83, 0x55, 0xCC, 0x9B,
-	0xAD, 0x83, 0x61, 0xCC, 0x82, 0xC9, 0x83, 0x61,
-	0xCC, 0x86, 0xC9, 0x83, 0x61, 0xCC, 0x87, 0xC9,
-	0x83, 0x61, 0xCC, 0x88, 0xC9, 0x83, 0x61, 0xCC,
-	0x8A, 0xC9, 0x83, 0x61, 0xCC, 0xA3, 0xB5, 0x83,
-	0x63, 0xCC, 0xA7, 0xA5, 0x83, 0x65, 0xCC, 0x82,
-	// Bytes 4740 - 477f
-	0xC9, 0x83, 0x65, 0xCC, 0x84, 0xC9, 0x83, 0x65,
-	0xCC, 0xA3, 0xB5, 0x83, 0x65, 0xCC, 0xA7, 0xA5,
-	0x83, 0x69, 0xCC, 0x88, 0xC9, 0x83, 0x6C, 0xCC,
-	0xA3, 0xB5, 0x83, 0x6F, 0xCC, 0x82, 0xC9, 0x83,
-	0x6F, 0xCC, 0x83, 0xC9, 0x83, 0x6F, 0xCC, 0x84,
-	0xC9, 0x83, 0x6F, 0xCC, 0x87, 0xC9, 0x83, 0x6F,
-	0xCC, 0x88, 0xC9, 0x83, 0x6F, 0xCC, 0x9B, 0xAD,
-	0x83, 0x6F, 0xCC, 0xA3, 0xB5, 0x83, 0x6F, 0xCC,
-	// Bytes 4780 - 47bf
-	0xA8, 0xA5, 0x83, 0x72, 0xCC, 0xA3, 0xB5, 0x83,
-	0x73, 0xCC, 0x81, 0xC9, 0x83, 0x73, 0xCC, 0x8C,
-	0xC9, 0x83, 0x73, 0xCC, 0xA3, 0xB5, 0x83, 0x75,
-	0xCC, 0x83, 0xC9, 0x83, 0x75, 0xCC, 0x84, 0xC9,
-	0x83, 0x75, 0xCC, 0x88, 0xC9, 0x83, 0x75, 0xCC,
-	0x9B, 0xAD, 0x84, 0xCE, 0x91, 0xCC, 0x93, 0xC9,
-	0x84, 0xCE, 0x91, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
-	0x95, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0x95, 0xCC,
-	// Bytes 47c0 - 47ff
-	0x94, 0xC9, 0x84, 0xCE, 0x97, 0xCC, 0x93, 0xC9,
-	0x84, 0xCE, 0x97, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
-	0x99, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0x99, 0xCC,
-	0x94, 0xC9, 0x84, 0xCE, 0x9F, 0xCC, 0x93, 0xC9,
-	0x84, 0xCE, 0x9F, 0xCC, 0x94, 0xC9, 0x84, 0xCE,
-	0xA5, 0xCC, 0x94, 0xC9, 0x84, 0xCE, 0xA9, 0xCC,
-	0x93, 0xC9, 0x84, 0xCE, 0xA9, 0xCC, 0x94, 0xC9,
-	0x84, 0xCE, 0xB1, 0xCC, 0x80, 0xC9, 0x84, 0xCE,
-	// Bytes 4800 - 483f
-	0xB1, 0xCC, 0x81, 0xC9, 0x84, 0xCE, 0xB1, 0xCC,
-	0x93, 0xC9, 0x84, 0xCE, 0xB1, 0xCC, 0x94, 0xC9,
-	0x84, 0xCE, 0xB1, 0xCD, 0x82, 0xC9, 0x84, 0xCE,
-	0xB5, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0xB5, 0xCC,
-	0x94, 0xC9, 0x84, 0xCE, 0xB7, 0xCC, 0x80, 0xC9,
-	0x84, 0xCE, 0xB7, 0xCC, 0x81, 0xC9, 0x84, 0xCE,
-	0xB7, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0xB7, 0xCC,
-	0x94, 0xC9, 0x84, 0xCE, 0xB7, 0xCD, 0x82, 0xC9,
-	// Bytes 4840 - 487f
-	0x84, 0xCE, 0xB9, 0xCC, 0x88, 0xC9, 0x84, 0xCE,
-	0xB9, 0xCC, 0x93, 0xC9, 0x84, 0xCE, 0xB9, 0xCC,
-	0x94, 0xC9, 0x84, 0xCE, 0xBF, 0xCC, 0x93, 0xC9,
-	0x84, 0xCE, 0xBF, 0xCC, 0x94, 0xC9, 0x84, 0xCF,
-	0x85, 0xCC, 0x88, 0xC9, 0x84, 0xCF, 0x85, 0xCC,
-	0x93, 0xC9, 0x84, 0xCF, 0x85, 0xCC, 0x94, 0xC9,
-	0x84, 0xCF, 0x89, 0xCC, 0x80, 0xC9, 0x84, 0xCF,
-	0x89, 0xCC, 0x81, 0xC9, 0x84, 0xCF, 0x89, 0xCC,
-	// Bytes 4880 - 48bf
-	0x93, 0xC9, 0x84, 0xCF, 0x89, 0xCC, 0x94, 0xC9,
-	0x84, 0xCF, 0x89, 0xCD, 0x82, 0xC9, 0x86, 0xCE,
-	0x91, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
-	0x91, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
-	0x91, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
-	0x91, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
-	0x91, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
-	0x91, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
-	// Bytes 48c0 - 48ff
-	0x97, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
-	0x97, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
-	0x97, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
-	0x97, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
-	0x97, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
-	0x97, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
-	0xA9, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
-	0xA9, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
-	// Bytes 4900 - 493f
-	0xA9, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
-	0xA9, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
-	0xA9, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
-	0xA9, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
-	0xB1, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
-	0xB1, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
-	0xB1, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
-	0xB1, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
-	// Bytes 4940 - 497f
-	0xB1, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
-	0xB1, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
-	0xB7, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
-	0xB7, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
-	0xB7, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCE,
-	0xB7, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCE,
-	0xB7, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCE,
-	0xB7, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x86, 0xCF,
-	// Bytes 4980 - 49bf
-	0x89, 0xCC, 0x93, 0xCC, 0x80, 0xCA, 0x86, 0xCF,
-	0x89, 0xCC, 0x93, 0xCC, 0x81, 0xCA, 0x86, 0xCF,
-	0x89, 0xCC, 0x93, 0xCD, 0x82, 0xCA, 0x86, 0xCF,
-	0x89, 0xCC, 0x94, 0xCC, 0x80, 0xCA, 0x86, 0xCF,
-	0x89, 0xCC, 0x94, 0xCC, 0x81, 0xCA, 0x86, 0xCF,
-	0x89, 0xCC, 0x94, 0xCD, 0x82, 0xCA, 0x42, 0xCC,
-	0x80, 0xC9, 0x32, 0x42, 0xCC, 0x81, 0xC9, 0x32,
-	0x42, 0xCC, 0x93, 0xC9, 0x32, 0x43, 0xE1, 0x85,
-	// Bytes 49c0 - 49ff
-	0xA1, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xA2, 0x01,
-	0x00, 0x43, 0xE1, 0x85, 0xA3, 0x01, 0x00, 0x43,
-	0xE1, 0x85, 0xA4, 0x01, 0x00, 0x43, 0xE1, 0x85,
-	0xA5, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xA6, 0x01,
-	0x00, 0x43, 0xE1, 0x85, 0xA7, 0x01, 0x00, 0x43,
-	0xE1, 0x85, 0xA8, 0x01, 0x00, 0x43, 0xE1, 0x85,
-	0xA9, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xAA, 0x01,
-	0x00, 0x43, 0xE1, 0x85, 0xAB, 0x01, 0x00, 0x43,
-	// Bytes 4a00 - 4a3f
-	0xE1, 0x85, 0xAC, 0x01, 0x00, 0x43, 0xE1, 0x85,
-	0xAD, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xAE, 0x01,
-	0x00, 0x43, 0xE1, 0x85, 0xAF, 0x01, 0x00, 0x43,
-	0xE1, 0x85, 0xB0, 0x01, 0x00, 0x43, 0xE1, 0x85,
-	0xB1, 0x01, 0x00, 0x43, 0xE1, 0x85, 0xB2, 0x01,
-	0x00, 0x43, 0xE1, 0x85, 0xB3, 0x01, 0x00, 0x43,
-	0xE1, 0x85, 0xB4, 0x01, 0x00, 0x43, 0xE1, 0x85,
-	0xB5, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xAA, 0x01,
-	// Bytes 4a40 - 4a7f
-	0x00, 0x43, 0xE1, 0x86, 0xAC, 0x01, 0x00, 0x43,
-	0xE1, 0x86, 0xAD, 0x01, 0x00, 0x43, 0xE1, 0x86,
-	0xB0, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xB1, 0x01,
-	0x00, 0x43, 0xE1, 0x86, 0xB2, 0x01, 0x00, 0x43,
-	0xE1, 0x86, 0xB3, 0x01, 0x00, 0x43, 0xE1, 0x86,
-	0xB4, 0x01, 0x00, 0x43, 0xE1, 0x86, 0xB5, 0x01,
-	0x00, 0x44, 0xCC, 0x88, 0xCC, 0x81, 0xCA, 0x32,
-	0x43, 0xE3, 0x82, 0x99, 0x0D, 0x03, 0x43, 0xE3,
-	// Bytes 4a80 - 4abf
-	0x82, 0x9A, 0x0D, 0x03, 0x46, 0xE0, 0xBD, 0xB1,
-	0xE0, 0xBD, 0xB2, 0x9E, 0x26, 0x46, 0xE0, 0xBD,
-	0xB1, 0xE0, 0xBD, 0xB4, 0xA2, 0x26, 0x46, 0xE0,
-	0xBD, 0xB1, 0xE0, 0xBE, 0x80, 0x9E, 0x26, 0x00,
-	0x01,
-}
-
-// lookup returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *nfcTrie) lookup(s []byte) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return nfcValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := nfcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := nfcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := nfcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = nfcIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *nfcTrie) lookupUnsafe(s []byte) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return nfcValues[c0]
-	}
-	i := nfcIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = nfcIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = nfcIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// lookupString returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *nfcTrie) lookupString(s string) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return nfcValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := nfcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := nfcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := nfcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = nfcIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *nfcTrie) lookupStringUnsafe(s string) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return nfcValues[c0]
-	}
-	i := nfcIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = nfcIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = nfcIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// nfcTrie. Total size: 10332 bytes (10.09 KiB). Checksum: 51cc525b297fc970.
-type nfcTrie struct{}
-
-func newNfcTrie(i int) *nfcTrie {
-	return &nfcTrie{}
-}
-
-// lookupValue determines the type of block n and looks up the value for b.
-func (t *nfcTrie) lookupValue(n uint32, b byte) uint16 {
-	switch {
-	case n < 44:
-		return uint16(nfcValues[n<<6+uint32(b)])
-	default:
-		n -= 44
-		return uint16(nfcSparse.lookup(n, b))
-	}
-}
-
-// nfcValues: 46 blocks, 2944 entries, 5888 bytes
-// The third block is the zero block.
-var nfcValues = [2944]uint16{
-	// Block 0x0, offset 0x0
-	0x3c: 0xa000, 0x3d: 0xa000, 0x3e: 0xa000,
-	// Block 0x1, offset 0x40
-	0x41: 0xa000, 0x42: 0xa000, 0x43: 0xa000, 0x44: 0xa000, 0x45: 0xa000,
-	0x46: 0xa000, 0x47: 0xa000, 0x48: 0xa000, 0x49: 0xa000, 0x4a: 0xa000, 0x4b: 0xa000,
-	0x4c: 0xa000, 0x4d: 0xa000, 0x4e: 0xa000, 0x4f: 0xa000, 0x50: 0xa000,
-	0x52: 0xa000, 0x53: 0xa000, 0x54: 0xa000, 0x55: 0xa000, 0x56: 0xa000, 0x57: 0xa000,
-	0x58: 0xa000, 0x59: 0xa000, 0x5a: 0xa000,
-	0x61: 0xa000, 0x62: 0xa000, 0x63: 0xa000,
-	0x64: 0xa000, 0x65: 0xa000, 0x66: 0xa000, 0x67: 0xa000, 0x68: 0xa000, 0x69: 0xa000,
-	0x6a: 0xa000, 0x6b: 0xa000, 0x6c: 0xa000, 0x6d: 0xa000, 0x6e: 0xa000, 0x6f: 0xa000,
-	0x70: 0xa000, 0x72: 0xa000, 0x73: 0xa000, 0x74: 0xa000, 0x75: 0xa000,
-	0x76: 0xa000, 0x77: 0xa000, 0x78: 0xa000, 0x79: 0xa000, 0x7a: 0xa000,
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc0: 0x2f6f, 0xc1: 0x2f74, 0xc2: 0x4688, 0xc3: 0x2f79, 0xc4: 0x4697, 0xc5: 0x469c,
-	0xc6: 0xa000, 0xc7: 0x46a6, 0xc8: 0x2fe2, 0xc9: 0x2fe7, 0xca: 0x46ab, 0xcb: 0x2ffb,
-	0xcc: 0x306e, 0xcd: 0x3073, 0xce: 0x3078, 0xcf: 0x46bf, 0xd1: 0x3104,
-	0xd2: 0x3127, 0xd3: 0x312c, 0xd4: 0x46c9, 0xd5: 0x46ce, 0xd6: 0x46dd,
-	0xd8: 0xa000, 0xd9: 0x31b3, 0xda: 0x31b8, 0xdb: 0x31bd, 0xdc: 0x470f, 0xdd: 0x3235,
-	0xe0: 0x327b, 0xe1: 0x3280, 0xe2: 0x4719, 0xe3: 0x3285,
-	0xe4: 0x4728, 0xe5: 0x472d, 0xe6: 0xa000, 0xe7: 0x4737, 0xe8: 0x32ee, 0xe9: 0x32f3,
-	0xea: 0x473c, 0xeb: 0x3307, 0xec: 0x337f, 0xed: 0x3384, 0xee: 0x3389, 0xef: 0x4750,
-	0xf1: 0x3415, 0xf2: 0x3438, 0xf3: 0x343d, 0xf4: 0x475a, 0xf5: 0x475f,
-	0xf6: 0x476e, 0xf8: 0xa000, 0xf9: 0x34c9, 0xfa: 0x34ce, 0xfb: 0x34d3,
-	0xfc: 0x47a0, 0xfd: 0x3550, 0xff: 0x3569,
-	// Block 0x4, offset 0x100
-	0x100: 0x2f7e, 0x101: 0x328a, 0x102: 0x468d, 0x103: 0x471e, 0x104: 0x2f9c, 0x105: 0x32a8,
-	0x106: 0x2fb0, 0x107: 0x32bc, 0x108: 0x2fb5, 0x109: 0x32c1, 0x10a: 0x2fba, 0x10b: 0x32c6,
-	0x10c: 0x2fbf, 0x10d: 0x32cb, 0x10e: 0x2fc9, 0x10f: 0x32d5,
-	0x112: 0x46b0, 0x113: 0x4741, 0x114: 0x2ff1, 0x115: 0x32fd, 0x116: 0x2ff6, 0x117: 0x3302,
-	0x118: 0x3014, 0x119: 0x3320, 0x11a: 0x3005, 0x11b: 0x3311, 0x11c: 0x302d, 0x11d: 0x3339,
-	0x11e: 0x3037, 0x11f: 0x3343, 0x120: 0x303c, 0x121: 0x3348, 0x122: 0x3046, 0x123: 0x3352,
-	0x124: 0x304b, 0x125: 0x3357, 0x128: 0x307d, 0x129: 0x338e,
-	0x12a: 0x3082, 0x12b: 0x3393, 0x12c: 0x3087, 0x12d: 0x3398, 0x12e: 0x30aa, 0x12f: 0x33b6,
-	0x130: 0x308c, 0x134: 0x30b4, 0x135: 0x33c0,
-	0x136: 0x30c8, 0x137: 0x33d9, 0x139: 0x30d2, 0x13a: 0x33e3, 0x13b: 0x30dc,
-	0x13c: 0x33ed, 0x13d: 0x30d7, 0x13e: 0x33e8,
-	// Block 0x5, offset 0x140
-	0x143: 0x30ff, 0x144: 0x3410, 0x145: 0x3118,
-	0x146: 0x3429, 0x147: 0x310e, 0x148: 0x341f,
-	0x14c: 0x46d3, 0x14d: 0x4764, 0x14e: 0x3131, 0x14f: 0x3442, 0x150: 0x313b, 0x151: 0x344c,
-	0x154: 0x3159, 0x155: 0x346a, 0x156: 0x3172, 0x157: 0x3483,
-	0x158: 0x3163, 0x159: 0x3474, 0x15a: 0x46f6, 0x15b: 0x4787, 0x15c: 0x317c, 0x15d: 0x348d,
-	0x15e: 0x318b, 0x15f: 0x349c, 0x160: 0x46fb, 0x161: 0x478c, 0x162: 0x31a4, 0x163: 0x34ba,
-	0x164: 0x3195, 0x165: 0x34ab, 0x168: 0x4705, 0x169: 0x4796,
-	0x16a: 0x470a, 0x16b: 0x479b, 0x16c: 0x31c2, 0x16d: 0x34d8, 0x16e: 0x31cc, 0x16f: 0x34e2,
-	0x170: 0x31d1, 0x171: 0x34e7, 0x172: 0x31ef, 0x173: 0x3505, 0x174: 0x3212, 0x175: 0x3528,
-	0x176: 0x323a, 0x177: 0x3555, 0x178: 0x324e, 0x179: 0x325d, 0x17a: 0x357d, 0x17b: 0x3267,
-	0x17c: 0x3587, 0x17d: 0x326c, 0x17e: 0x358c, 0x17f: 0xa000,
-	// Block 0x6, offset 0x180
-	0x184: 0x8100, 0x185: 0x8100,
-	0x186: 0x8100,
-	0x18d: 0x2f88, 0x18e: 0x3294, 0x18f: 0x3096, 0x190: 0x33a2, 0x191: 0x3140,
-	0x192: 0x3451, 0x193: 0x31d6, 0x194: 0x34ec, 0x195: 0x39cf, 0x196: 0x3b5e, 0x197: 0x39c8,
-	0x198: 0x3b57, 0x199: 0x39d6, 0x19a: 0x3b65, 0x19b: 0x39c1, 0x19c: 0x3b50,
-	0x19e: 0x38b0, 0x19f: 0x3a3f, 0x1a0: 0x38a9, 0x1a1: 0x3a38, 0x1a2: 0x35b3, 0x1a3: 0x35c5,
-	0x1a6: 0x3041, 0x1a7: 0x334d, 0x1a8: 0x30be, 0x1a9: 0x33cf,
-	0x1aa: 0x46ec, 0x1ab: 0x477d, 0x1ac: 0x3990, 0x1ad: 0x3b1f, 0x1ae: 0x35d7, 0x1af: 0x35dd,
-	0x1b0: 0x33c5, 0x1b4: 0x3028, 0x1b5: 0x3334,
-	0x1b8: 0x30fa, 0x1b9: 0x340b, 0x1ba: 0x38b7, 0x1bb: 0x3a46,
-	0x1bc: 0x35ad, 0x1bd: 0x35bf, 0x1be: 0x35b9, 0x1bf: 0x35cb,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x2f8d, 0x1c1: 0x3299, 0x1c2: 0x2f92, 0x1c3: 0x329e, 0x1c4: 0x300a, 0x1c5: 0x3316,
-	0x1c6: 0x300f, 0x1c7: 0x331b, 0x1c8: 0x309b, 0x1c9: 0x33a7, 0x1ca: 0x30a0, 0x1cb: 0x33ac,
-	0x1cc: 0x3145, 0x1cd: 0x3456, 0x1ce: 0x314a, 0x1cf: 0x345b, 0x1d0: 0x3168, 0x1d1: 0x3479,
-	0x1d2: 0x316d, 0x1d3: 0x347e, 0x1d4: 0x31db, 0x1d5: 0x34f1, 0x1d6: 0x31e0, 0x1d7: 0x34f6,
-	0x1d8: 0x3186, 0x1d9: 0x3497, 0x1da: 0x319f, 0x1db: 0x34b5,
-	0x1de: 0x305a, 0x1df: 0x3366,
-	0x1e6: 0x4692, 0x1e7: 0x4723, 0x1e8: 0x46ba, 0x1e9: 0x474b,
-	0x1ea: 0x395f, 0x1eb: 0x3aee, 0x1ec: 0x393c, 0x1ed: 0x3acb, 0x1ee: 0x46d8, 0x1ef: 0x4769,
-	0x1f0: 0x3958, 0x1f1: 0x3ae7, 0x1f2: 0x3244, 0x1f3: 0x355f,
-	// Block 0x8, offset 0x200
-	0x200: 0x9932, 0x201: 0x9932, 0x202: 0x9932, 0x203: 0x9932, 0x204: 0x9932, 0x205: 0x8132,
-	0x206: 0x9932, 0x207: 0x9932, 0x208: 0x9932, 0x209: 0x9932, 0x20a: 0x9932, 0x20b: 0x9932,
-	0x20c: 0x9932, 0x20d: 0x8132, 0x20e: 0x8132, 0x20f: 0x9932, 0x210: 0x8132, 0x211: 0x9932,
-	0x212: 0x8132, 0x213: 0x9932, 0x214: 0x9932, 0x215: 0x8133, 0x216: 0x812d, 0x217: 0x812d,
-	0x218: 0x812d, 0x219: 0x812d, 0x21a: 0x8133, 0x21b: 0x992b, 0x21c: 0x812d, 0x21d: 0x812d,
-	0x21e: 0x812d, 0x21f: 0x812d, 0x220: 0x812d, 0x221: 0x8129, 0x222: 0x8129, 0x223: 0x992d,
-	0x224: 0x992d, 0x225: 0x992d, 0x226: 0x992d, 0x227: 0x9929, 0x228: 0x9929, 0x229: 0x812d,
-	0x22a: 0x812d, 0x22b: 0x812d, 0x22c: 0x812d, 0x22d: 0x992d, 0x22e: 0x992d, 0x22f: 0x812d,
-	0x230: 0x992d, 0x231: 0x992d, 0x232: 0x812d, 0x233: 0x812d, 0x234: 0x8101, 0x235: 0x8101,
-	0x236: 0x8101, 0x237: 0x8101, 0x238: 0x9901, 0x239: 0x812d, 0x23a: 0x812d, 0x23b: 0x812d,
-	0x23c: 0x812d, 0x23d: 0x8132, 0x23e: 0x8132, 0x23f: 0x8132,
-	// Block 0x9, offset 0x240
-	0x240: 0x49ae, 0x241: 0x49b3, 0x242: 0x9932, 0x243: 0x49b8, 0x244: 0x4a71, 0x245: 0x9936,
-	0x246: 0x8132, 0x247: 0x812d, 0x248: 0x812d, 0x249: 0x812d, 0x24a: 0x8132, 0x24b: 0x8132,
-	0x24c: 0x8132, 0x24d: 0x812d, 0x24e: 0x812d, 0x250: 0x8132, 0x251: 0x8132,
-	0x252: 0x8132, 0x253: 0x812d, 0x254: 0x812d, 0x255: 0x812d, 0x256: 0x812d, 0x257: 0x8132,
-	0x258: 0x8133, 0x259: 0x812d, 0x25a: 0x812d, 0x25b: 0x8132, 0x25c: 0x8134, 0x25d: 0x8135,
-	0x25e: 0x8135, 0x25f: 0x8134, 0x260: 0x8135, 0x261: 0x8135, 0x262: 0x8134, 0x263: 0x8132,
-	0x264: 0x8132, 0x265: 0x8132, 0x266: 0x8132, 0x267: 0x8132, 0x268: 0x8132, 0x269: 0x8132,
-	0x26a: 0x8132, 0x26b: 0x8132, 0x26c: 0x8132, 0x26d: 0x8132, 0x26e: 0x8132, 0x26f: 0x8132,
-	0x274: 0x0170,
-	0x27a: 0x8100,
-	0x27e: 0x0037,
-	// Block 0xa, offset 0x280
-	0x284: 0x8100, 0x285: 0x35a1,
-	0x286: 0x35e9, 0x287: 0x00ce, 0x288: 0x3607, 0x289: 0x3613, 0x28a: 0x3625,
-	0x28c: 0x3643, 0x28e: 0x3655, 0x28f: 0x3673, 0x290: 0x3e08, 0x291: 0xa000,
-	0x295: 0xa000, 0x297: 0xa000,
-	0x299: 0xa000,
-	0x29f: 0xa000, 0x2a1: 0xa000,
-	0x2a5: 0xa000, 0x2a9: 0xa000,
-	0x2aa: 0x3637, 0x2ab: 0x3667, 0x2ac: 0x47fe, 0x2ad: 0x3697, 0x2ae: 0x4828, 0x2af: 0x36a9,
-	0x2b0: 0x3e70, 0x2b1: 0xa000, 0x2b5: 0xa000,
-	0x2b7: 0xa000, 0x2b9: 0xa000,
-	0x2bf: 0xa000,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0x3721, 0x2c1: 0x372d, 0x2c3: 0x371b,
-	0x2c6: 0xa000, 0x2c7: 0x3709,
-	0x2cc: 0x375d, 0x2cd: 0x3745, 0x2ce: 0x376f, 0x2d0: 0xa000,
-	0x2d3: 0xa000, 0x2d5: 0xa000, 0x2d6: 0xa000, 0x2d7: 0xa000,
-	0x2d8: 0xa000, 0x2d9: 0x3751, 0x2da: 0xa000,
-	0x2de: 0xa000, 0x2e3: 0xa000,
-	0x2e7: 0xa000,
-	0x2eb: 0xa000, 0x2ed: 0xa000,
-	0x2f0: 0xa000, 0x2f3: 0xa000, 0x2f5: 0xa000,
-	0x2f6: 0xa000, 0x2f7: 0xa000, 0x2f8: 0xa000, 0x2f9: 0x37d5, 0x2fa: 0xa000,
-	0x2fe: 0xa000,
-	// Block 0xc, offset 0x300
-	0x301: 0x3733, 0x302: 0x37b7,
-	0x310: 0x370f, 0x311: 0x3793,
-	0x312: 0x3715, 0x313: 0x3799, 0x316: 0x3727, 0x317: 0x37ab,
-	0x318: 0xa000, 0x319: 0xa000, 0x31a: 0x3829, 0x31b: 0x382f, 0x31c: 0x3739, 0x31d: 0x37bd,
-	0x31e: 0x373f, 0x31f: 0x37c3, 0x322: 0x374b, 0x323: 0x37cf,
-	0x324: 0x3757, 0x325: 0x37db, 0x326: 0x3763, 0x327: 0x37e7, 0x328: 0xa000, 0x329: 0xa000,
-	0x32a: 0x3835, 0x32b: 0x383b, 0x32c: 0x378d, 0x32d: 0x3811, 0x32e: 0x3769, 0x32f: 0x37ed,
-	0x330: 0x3775, 0x331: 0x37f9, 0x332: 0x377b, 0x333: 0x37ff, 0x334: 0x3781, 0x335: 0x3805,
-	0x338: 0x3787, 0x339: 0x380b,
-	// Block 0xd, offset 0x340
-	0x351: 0x812d,
-	0x352: 0x8132, 0x353: 0x8132, 0x354: 0x8132, 0x355: 0x8132, 0x356: 0x812d, 0x357: 0x8132,
-	0x358: 0x8132, 0x359: 0x8132, 0x35a: 0x812e, 0x35b: 0x812d, 0x35c: 0x8132, 0x35d: 0x8132,
-	0x35e: 0x8132, 0x35f: 0x8132, 0x360: 0x8132, 0x361: 0x8132, 0x362: 0x812d, 0x363: 0x812d,
-	0x364: 0x812d, 0x365: 0x812d, 0x366: 0x812d, 0x367: 0x812d, 0x368: 0x8132, 0x369: 0x8132,
-	0x36a: 0x812d, 0x36b: 0x8132, 0x36c: 0x8132, 0x36d: 0x812e, 0x36e: 0x8131, 0x36f: 0x8132,
-	0x370: 0x8105, 0x371: 0x8106, 0x372: 0x8107, 0x373: 0x8108, 0x374: 0x8109, 0x375: 0x810a,
-	0x376: 0x810b, 0x377: 0x810c, 0x378: 0x810d, 0x379: 0x810e, 0x37a: 0x810e, 0x37b: 0x810f,
-	0x37c: 0x8110, 0x37d: 0x8111, 0x37f: 0x8112,
-	// Block 0xe, offset 0x380
-	0x388: 0xa000, 0x38a: 0xa000, 0x38b: 0x8116,
-	0x38c: 0x8117, 0x38d: 0x8118, 0x38e: 0x8119, 0x38f: 0x811a, 0x390: 0x811b, 0x391: 0x811c,
-	0x392: 0x811d, 0x393: 0x9932, 0x394: 0x9932, 0x395: 0x992d, 0x396: 0x812d, 0x397: 0x8132,
-	0x398: 0x8132, 0x399: 0x8132, 0x39a: 0x8132, 0x39b: 0x8132, 0x39c: 0x812d, 0x39d: 0x8132,
-	0x39e: 0x8132, 0x39f: 0x812d,
-	0x3b0: 0x811e,
-	// Block 0xf, offset 0x3c0
-	0x3c5: 0xa000,
-	0x3c6: 0x2d26, 0x3c7: 0xa000, 0x3c8: 0x2d2e, 0x3c9: 0xa000, 0x3ca: 0x2d36, 0x3cb: 0xa000,
-	0x3cc: 0x2d3e, 0x3cd: 0xa000, 0x3ce: 0x2d46, 0x3d1: 0xa000,
-	0x3d2: 0x2d4e,
-	0x3f4: 0x8102, 0x3f5: 0x9900,
-	0x3fa: 0xa000, 0x3fb: 0x2d56,
-	0x3fc: 0xa000, 0x3fd: 0x2d5e, 0x3fe: 0xa000, 0x3ff: 0xa000,
-	// Block 0x10, offset 0x400
-	0x400: 0x2f97, 0x401: 0x32a3, 0x402: 0x2fa1, 0x403: 0x32ad, 0x404: 0x2fa6, 0x405: 0x32b2,
-	0x406: 0x2fab, 0x407: 0x32b7, 0x408: 0x38cc, 0x409: 0x3a5b, 0x40a: 0x2fc4, 0x40b: 0x32d0,
-	0x40c: 0x2fce, 0x40d: 0x32da, 0x40e: 0x2fdd, 0x40f: 0x32e9, 0x410: 0x2fd3, 0x411: 0x32df,
-	0x412: 0x2fd8, 0x413: 0x32e4, 0x414: 0x38ef, 0x415: 0x3a7e, 0x416: 0x38f6, 0x417: 0x3a85,
-	0x418: 0x3019, 0x419: 0x3325, 0x41a: 0x301e, 0x41b: 0x332a, 0x41c: 0x3904, 0x41d: 0x3a93,
-	0x41e: 0x3023, 0x41f: 0x332f, 0x420: 0x3032, 0x421: 0x333e, 0x422: 0x3050, 0x423: 0x335c,
-	0x424: 0x305f, 0x425: 0x336b, 0x426: 0x3055, 0x427: 0x3361, 0x428: 0x3064, 0x429: 0x3370,
-	0x42a: 0x3069, 0x42b: 0x3375, 0x42c: 0x30af, 0x42d: 0x33bb, 0x42e: 0x390b, 0x42f: 0x3a9a,
-	0x430: 0x30b9, 0x431: 0x33ca, 0x432: 0x30c3, 0x433: 0x33d4, 0x434: 0x30cd, 0x435: 0x33de,
-	0x436: 0x46c4, 0x437: 0x4755, 0x438: 0x3912, 0x439: 0x3aa1, 0x43a: 0x30e6, 0x43b: 0x33f7,
-	0x43c: 0x30e1, 0x43d: 0x33f2, 0x43e: 0x30eb, 0x43f: 0x33fc,
-	// Block 0x11, offset 0x440
-	0x440: 0x30f0, 0x441: 0x3401, 0x442: 0x30f5, 0x443: 0x3406, 0x444: 0x3109, 0x445: 0x341a,
-	0x446: 0x3113, 0x447: 0x3424, 0x448: 0x3122, 0x449: 0x3433, 0x44a: 0x311d, 0x44b: 0x342e,
-	0x44c: 0x3935, 0x44d: 0x3ac4, 0x44e: 0x3943, 0x44f: 0x3ad2, 0x450: 0x394a, 0x451: 0x3ad9,
-	0x452: 0x3951, 0x453: 0x3ae0, 0x454: 0x314f, 0x455: 0x3460, 0x456: 0x3154, 0x457: 0x3465,
-	0x458: 0x315e, 0x459: 0x346f, 0x45a: 0x46f1, 0x45b: 0x4782, 0x45c: 0x3997, 0x45d: 0x3b26,
-	0x45e: 0x3177, 0x45f: 0x3488, 0x460: 0x3181, 0x461: 0x3492, 0x462: 0x4700, 0x463: 0x4791,
-	0x464: 0x399e, 0x465: 0x3b2d, 0x466: 0x39a5, 0x467: 0x3b34, 0x468: 0x39ac, 0x469: 0x3b3b,
-	0x46a: 0x3190, 0x46b: 0x34a1, 0x46c: 0x319a, 0x46d: 0x34b0, 0x46e: 0x31ae, 0x46f: 0x34c4,
-	0x470: 0x31a9, 0x471: 0x34bf, 0x472: 0x31ea, 0x473: 0x3500, 0x474: 0x31f9, 0x475: 0x350f,
-	0x476: 0x31f4, 0x477: 0x350a, 0x478: 0x39b3, 0x479: 0x3b42, 0x47a: 0x39ba, 0x47b: 0x3b49,
-	0x47c: 0x31fe, 0x47d: 0x3514, 0x47e: 0x3203, 0x47f: 0x3519,
-	// Block 0x12, offset 0x480
-	0x480: 0x3208, 0x481: 0x351e, 0x482: 0x320d, 0x483: 0x3523, 0x484: 0x321c, 0x485: 0x3532,
-	0x486: 0x3217, 0x487: 0x352d, 0x488: 0x3221, 0x489: 0x353c, 0x48a: 0x3226, 0x48b: 0x3541,
-	0x48c: 0x322b, 0x48d: 0x3546, 0x48e: 0x3249, 0x48f: 0x3564, 0x490: 0x3262, 0x491: 0x3582,
-	0x492: 0x3271, 0x493: 0x3591, 0x494: 0x3276, 0x495: 0x3596, 0x496: 0x337a, 0x497: 0x34a6,
-	0x498: 0x3537, 0x499: 0x3573, 0x49b: 0x35d1,
-	0x4a0: 0x46a1, 0x4a1: 0x4732, 0x4a2: 0x2f83, 0x4a3: 0x328f,
-	0x4a4: 0x3878, 0x4a5: 0x3a07, 0x4a6: 0x3871, 0x4a7: 0x3a00, 0x4a8: 0x3886, 0x4a9: 0x3a15,
-	0x4aa: 0x387f, 0x4ab: 0x3a0e, 0x4ac: 0x38be, 0x4ad: 0x3a4d, 0x4ae: 0x3894, 0x4af: 0x3a23,
-	0x4b0: 0x388d, 0x4b1: 0x3a1c, 0x4b2: 0x38a2, 0x4b3: 0x3a31, 0x4b4: 0x389b, 0x4b5: 0x3a2a,
-	0x4b6: 0x38c5, 0x4b7: 0x3a54, 0x4b8: 0x46b5, 0x4b9: 0x4746, 0x4ba: 0x3000, 0x4bb: 0x330c,
-	0x4bc: 0x2fec, 0x4bd: 0x32f8, 0x4be: 0x38da, 0x4bf: 0x3a69,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0x38d3, 0x4c1: 0x3a62, 0x4c2: 0x38e8, 0x4c3: 0x3a77, 0x4c4: 0x38e1, 0x4c5: 0x3a70,
-	0x4c6: 0x38fd, 0x4c7: 0x3a8c, 0x4c8: 0x3091, 0x4c9: 0x339d, 0x4ca: 0x30a5, 0x4cb: 0x33b1,
-	0x4cc: 0x46e7, 0x4cd: 0x4778, 0x4ce: 0x3136, 0x4cf: 0x3447, 0x4d0: 0x3920, 0x4d1: 0x3aaf,
-	0x4d2: 0x3919, 0x4d3: 0x3aa8, 0x4d4: 0x392e, 0x4d5: 0x3abd, 0x4d6: 0x3927, 0x4d7: 0x3ab6,
-	0x4d8: 0x3989, 0x4d9: 0x3b18, 0x4da: 0x396d, 0x4db: 0x3afc, 0x4dc: 0x3966, 0x4dd: 0x3af5,
-	0x4de: 0x397b, 0x4df: 0x3b0a, 0x4e0: 0x3974, 0x4e1: 0x3b03, 0x4e2: 0x3982, 0x4e3: 0x3b11,
-	0x4e4: 0x31e5, 0x4e5: 0x34fb, 0x4e6: 0x31c7, 0x4e7: 0x34dd, 0x4e8: 0x39e4, 0x4e9: 0x3b73,
-	0x4ea: 0x39dd, 0x4eb: 0x3b6c, 0x4ec: 0x39f2, 0x4ed: 0x3b81, 0x4ee: 0x39eb, 0x4ef: 0x3b7a,
-	0x4f0: 0x39f9, 0x4f1: 0x3b88, 0x4f2: 0x3230, 0x4f3: 0x354b, 0x4f4: 0x3258, 0x4f5: 0x3578,
-	0x4f6: 0x3253, 0x4f7: 0x356e, 0x4f8: 0x323f, 0x4f9: 0x355a,
-	// Block 0x14, offset 0x500
-	0x500: 0x4804, 0x501: 0x480a, 0x502: 0x491e, 0x503: 0x4936, 0x504: 0x4926, 0x505: 0x493e,
-	0x506: 0x492e, 0x507: 0x4946, 0x508: 0x47aa, 0x509: 0x47b0, 0x50a: 0x488e, 0x50b: 0x48a6,
-	0x50c: 0x4896, 0x50d: 0x48ae, 0x50e: 0x489e, 0x50f: 0x48b6, 0x510: 0x4816, 0x511: 0x481c,
-	0x512: 0x3db8, 0x513: 0x3dc8, 0x514: 0x3dc0, 0x515: 0x3dd0,
-	0x518: 0x47b6, 0x519: 0x47bc, 0x51a: 0x3ce8, 0x51b: 0x3cf8, 0x51c: 0x3cf0, 0x51d: 0x3d00,
-	0x520: 0x482e, 0x521: 0x4834, 0x522: 0x494e, 0x523: 0x4966,
-	0x524: 0x4956, 0x525: 0x496e, 0x526: 0x495e, 0x527: 0x4976, 0x528: 0x47c2, 0x529: 0x47c8,
-	0x52a: 0x48be, 0x52b: 0x48d6, 0x52c: 0x48c6, 0x52d: 0x48de, 0x52e: 0x48ce, 0x52f: 0x48e6,
-	0x530: 0x4846, 0x531: 0x484c, 0x532: 0x3e18, 0x533: 0x3e30, 0x534: 0x3e20, 0x535: 0x3e38,
-	0x536: 0x3e28, 0x537: 0x3e40, 0x538: 0x47ce, 0x539: 0x47d4, 0x53a: 0x3d18, 0x53b: 0x3d30,
-	0x53c: 0x3d20, 0x53d: 0x3d38, 0x53e: 0x3d28, 0x53f: 0x3d40,
-	// Block 0x15, offset 0x540
-	0x540: 0x4852, 0x541: 0x4858, 0x542: 0x3e48, 0x543: 0x3e58, 0x544: 0x3e50, 0x545: 0x3e60,
-	0x548: 0x47da, 0x549: 0x47e0, 0x54a: 0x3d48, 0x54b: 0x3d58,
-	0x54c: 0x3d50, 0x54d: 0x3d60, 0x550: 0x4864, 0x551: 0x486a,
-	0x552: 0x3e80, 0x553: 0x3e98, 0x554: 0x3e88, 0x555: 0x3ea0, 0x556: 0x3e90, 0x557: 0x3ea8,
-	0x559: 0x47e6, 0x55b: 0x3d68, 0x55d: 0x3d70,
-	0x55f: 0x3d78, 0x560: 0x487c, 0x561: 0x4882, 0x562: 0x497e, 0x563: 0x4996,
-	0x564: 0x4986, 0x565: 0x499e, 0x566: 0x498e, 0x567: 0x49a6, 0x568: 0x47ec, 0x569: 0x47f2,
-	0x56a: 0x48ee, 0x56b: 0x4906, 0x56c: 0x48f6, 0x56d: 0x490e, 0x56e: 0x48fe, 0x56f: 0x4916,
-	0x570: 0x47f8, 0x571: 0x431e, 0x572: 0x3691, 0x573: 0x4324, 0x574: 0x4822, 0x575: 0x432a,
-	0x576: 0x36a3, 0x577: 0x4330, 0x578: 0x36c1, 0x579: 0x4336, 0x57a: 0x36d9, 0x57b: 0x433c,
-	0x57c: 0x4870, 0x57d: 0x4342,
-	// Block 0x16, offset 0x580
-	0x580: 0x3da0, 0x581: 0x3da8, 0x582: 0x4184, 0x583: 0x41a2, 0x584: 0x418e, 0x585: 0x41ac,
-	0x586: 0x4198, 0x587: 0x41b6, 0x588: 0x3cd8, 0x589: 0x3ce0, 0x58a: 0x40d0, 0x58b: 0x40ee,
-	0x58c: 0x40da, 0x58d: 0x40f8, 0x58e: 0x40e4, 0x58f: 0x4102, 0x590: 0x3de8, 0x591: 0x3df0,
-	0x592: 0x41c0, 0x593: 0x41de, 0x594: 0x41ca, 0x595: 0x41e8, 0x596: 0x41d4, 0x597: 0x41f2,
-	0x598: 0x3d08, 0x599: 0x3d10, 0x59a: 0x410c, 0x59b: 0x412a, 0x59c: 0x4116, 0x59d: 0x4134,
-	0x59e: 0x4120, 0x59f: 0x413e, 0x5a0: 0x3ec0, 0x5a1: 0x3ec8, 0x5a2: 0x41fc, 0x5a3: 0x421a,
-	0x5a4: 0x4206, 0x5a5: 0x4224, 0x5a6: 0x4210, 0x5a7: 0x422e, 0x5a8: 0x3d80, 0x5a9: 0x3d88,
-	0x5aa: 0x4148, 0x5ab: 0x4166, 0x5ac: 0x4152, 0x5ad: 0x4170, 0x5ae: 0x415c, 0x5af: 0x417a,
-	0x5b0: 0x3685, 0x5b1: 0x367f, 0x5b2: 0x3d90, 0x5b3: 0x368b, 0x5b4: 0x3d98,
-	0x5b6: 0x4810, 0x5b7: 0x3db0, 0x5b8: 0x35f5, 0x5b9: 0x35ef, 0x5ba: 0x35e3, 0x5bb: 0x42ee,
-	0x5bc: 0x35fb, 0x5bd: 0x8100, 0x5be: 0x01d3, 0x5bf: 0xa100,
-	// Block 0x17, offset 0x5c0
-	0x5c0: 0x8100, 0x5c1: 0x35a7, 0x5c2: 0x3dd8, 0x5c3: 0x369d, 0x5c4: 0x3de0,
-	0x5c6: 0x483a, 0x5c7: 0x3df8, 0x5c8: 0x3601, 0x5c9: 0x42f4, 0x5ca: 0x360d, 0x5cb: 0x42fa,
-	0x5cc: 0x3619, 0x5cd: 0x3b8f, 0x5ce: 0x3b96, 0x5cf: 0x3b9d, 0x5d0: 0x36b5, 0x5d1: 0x36af,
-	0x5d2: 0x3e00, 0x5d3: 0x44e4, 0x5d6: 0x36bb, 0x5d7: 0x3e10,
-	0x5d8: 0x3631, 0x5d9: 0x362b, 0x5da: 0x361f, 0x5db: 0x4300, 0x5dd: 0x3ba4,
-	0x5de: 0x3bab, 0x5df: 0x3bb2, 0x5e0: 0x36eb, 0x5e1: 0x36e5, 0x5e2: 0x3e68, 0x5e3: 0x44ec,
-	0x5e4: 0x36cd, 0x5e5: 0x36d3, 0x5e6: 0x36f1, 0x5e7: 0x3e78, 0x5e8: 0x3661, 0x5e9: 0x365b,
-	0x5ea: 0x364f, 0x5eb: 0x430c, 0x5ec: 0x3649, 0x5ed: 0x359b, 0x5ee: 0x42e8, 0x5ef: 0x0081,
-	0x5f2: 0x3eb0, 0x5f3: 0x36f7, 0x5f4: 0x3eb8,
-	0x5f6: 0x4888, 0x5f7: 0x3ed0, 0x5f8: 0x363d, 0x5f9: 0x4306, 0x5fa: 0x366d, 0x5fb: 0x4318,
-	0x5fc: 0x3679, 0x5fd: 0x4256, 0x5fe: 0xa100,
-	// Block 0x18, offset 0x600
-	0x601: 0x3c06, 0x603: 0xa000, 0x604: 0x3c0d, 0x605: 0xa000,
-	0x607: 0x3c14, 0x608: 0xa000, 0x609: 0x3c1b,
-	0x60d: 0xa000,
-	0x620: 0x2f65, 0x621: 0xa000, 0x622: 0x3c29,
-	0x624: 0xa000, 0x625: 0xa000,
-	0x62d: 0x3c22, 0x62e: 0x2f60, 0x62f: 0x2f6a,
-	0x630: 0x3c30, 0x631: 0x3c37, 0x632: 0xa000, 0x633: 0xa000, 0x634: 0x3c3e, 0x635: 0x3c45,
-	0x636: 0xa000, 0x637: 0xa000, 0x638: 0x3c4c, 0x639: 0x3c53, 0x63a: 0xa000, 0x63b: 0xa000,
-	0x63c: 0xa000, 0x63d: 0xa000,
-	// Block 0x19, offset 0x640
-	0x640: 0x3c5a, 0x641: 0x3c61, 0x642: 0xa000, 0x643: 0xa000, 0x644: 0x3c76, 0x645: 0x3c7d,
-	0x646: 0xa000, 0x647: 0xa000, 0x648: 0x3c84, 0x649: 0x3c8b,
-	0x651: 0xa000,
-	0x652: 0xa000,
-	0x662: 0xa000,
-	0x668: 0xa000, 0x669: 0xa000,
-	0x66b: 0xa000, 0x66c: 0x3ca0, 0x66d: 0x3ca7, 0x66e: 0x3cae, 0x66f: 0x3cb5,
-	0x672: 0xa000, 0x673: 0xa000, 0x674: 0xa000, 0x675: 0xa000,
-	// Block 0x1a, offset 0x680
-	0x686: 0xa000, 0x68b: 0xa000,
-	0x68c: 0x3f08, 0x68d: 0xa000, 0x68e: 0x3f10, 0x68f: 0xa000, 0x690: 0x3f18, 0x691: 0xa000,
-	0x692: 0x3f20, 0x693: 0xa000, 0x694: 0x3f28, 0x695: 0xa000, 0x696: 0x3f30, 0x697: 0xa000,
-	0x698: 0x3f38, 0x699: 0xa000, 0x69a: 0x3f40, 0x69b: 0xa000, 0x69c: 0x3f48, 0x69d: 0xa000,
-	0x69e: 0x3f50, 0x69f: 0xa000, 0x6a0: 0x3f58, 0x6a1: 0xa000, 0x6a2: 0x3f60,
-	0x6a4: 0xa000, 0x6a5: 0x3f68, 0x6a6: 0xa000, 0x6a7: 0x3f70, 0x6a8: 0xa000, 0x6a9: 0x3f78,
-	0x6af: 0xa000,
-	0x6b0: 0x3f80, 0x6b1: 0x3f88, 0x6b2: 0xa000, 0x6b3: 0x3f90, 0x6b4: 0x3f98, 0x6b5: 0xa000,
-	0x6b6: 0x3fa0, 0x6b7: 0x3fa8, 0x6b8: 0xa000, 0x6b9: 0x3fb0, 0x6ba: 0x3fb8, 0x6bb: 0xa000,
-	0x6bc: 0x3fc0, 0x6bd: 0x3fc8,
-	// Block 0x1b, offset 0x6c0
-	0x6d4: 0x3f00,
-	0x6d9: 0x9903, 0x6da: 0x9903, 0x6db: 0x8100, 0x6dc: 0x8100, 0x6dd: 0xa000,
-	0x6de: 0x3fd0,
-	0x6e6: 0xa000,
-	0x6eb: 0xa000, 0x6ec: 0x3fe0, 0x6ed: 0xa000, 0x6ee: 0x3fe8, 0x6ef: 0xa000,
-	0x6f0: 0x3ff0, 0x6f1: 0xa000, 0x6f2: 0x3ff8, 0x6f3: 0xa000, 0x6f4: 0x4000, 0x6f5: 0xa000,
-	0x6f6: 0x4008, 0x6f7: 0xa000, 0x6f8: 0x4010, 0x6f9: 0xa000, 0x6fa: 0x4018, 0x6fb: 0xa000,
-	0x6fc: 0x4020, 0x6fd: 0xa000, 0x6fe: 0x4028, 0x6ff: 0xa000,
-	// Block 0x1c, offset 0x700
-	0x700: 0x4030, 0x701: 0xa000, 0x702: 0x4038, 0x704: 0xa000, 0x705: 0x4040,
-	0x706: 0xa000, 0x707: 0x4048, 0x708: 0xa000, 0x709: 0x4050,
-	0x70f: 0xa000, 0x710: 0x4058, 0x711: 0x4060,
-	0x712: 0xa000, 0x713: 0x4068, 0x714: 0x4070, 0x715: 0xa000, 0x716: 0x4078, 0x717: 0x4080,
-	0x718: 0xa000, 0x719: 0x4088, 0x71a: 0x4090, 0x71b: 0xa000, 0x71c: 0x4098, 0x71d: 0x40a0,
-	0x72f: 0xa000,
-	0x730: 0xa000, 0x731: 0xa000, 0x732: 0xa000, 0x734: 0x3fd8,
-	0x737: 0x40a8, 0x738: 0x40b0, 0x739: 0x40b8, 0x73a: 0x40c0,
-	0x73d: 0xa000, 0x73e: 0x40c8,
-	// Block 0x1d, offset 0x740
-	0x740: 0x1377, 0x741: 0x0cfb, 0x742: 0x13d3, 0x743: 0x139f, 0x744: 0x0e57, 0x745: 0x06eb,
-	0x746: 0x08df, 0x747: 0x162b, 0x748: 0x162b, 0x749: 0x0a0b, 0x74a: 0x145f, 0x74b: 0x0943,
-	0x74c: 0x0a07, 0x74d: 0x0bef, 0x74e: 0x0fcf, 0x74f: 0x115f, 0x750: 0x1297, 0x751: 0x12d3,
-	0x752: 0x1307, 0x753: 0x141b, 0x754: 0x0d73, 0x755: 0x0dff, 0x756: 0x0eab, 0x757: 0x0f43,
-	0x758: 0x125f, 0x759: 0x1447, 0x75a: 0x1573, 0x75b: 0x070f, 0x75c: 0x08b3, 0x75d: 0x0d87,
-	0x75e: 0x0ecf, 0x75f: 0x1293, 0x760: 0x15c3, 0x761: 0x0ab3, 0x762: 0x0e77, 0x763: 0x1283,
-	0x764: 0x1317, 0x765: 0x0c23, 0x766: 0x11bb, 0x767: 0x12df, 0x768: 0x0b1f, 0x769: 0x0d0f,
-	0x76a: 0x0e17, 0x76b: 0x0f1b, 0x76c: 0x1427, 0x76d: 0x074f, 0x76e: 0x07e7, 0x76f: 0x0853,
-	0x770: 0x0c8b, 0x771: 0x0d7f, 0x772: 0x0ecb, 0x773: 0x0fef, 0x774: 0x1177, 0x775: 0x128b,
-	0x776: 0x12a3, 0x777: 0x13c7, 0x778: 0x14ef, 0x779: 0x15a3, 0x77a: 0x15bf, 0x77b: 0x102b,
-	0x77c: 0x106b, 0x77d: 0x1123, 0x77e: 0x1243, 0x77f: 0x147b,
-	// Block 0x1e, offset 0x780
-	0x780: 0x15cb, 0x781: 0x134b, 0x782: 0x09c7, 0x783: 0x0b3b, 0x784: 0x10db, 0x785: 0x119b,
-	0x786: 0x0eff, 0x787: 0x1033, 0x788: 0x1397, 0x789: 0x14e7, 0x78a: 0x09c3, 0x78b: 0x0a8f,
-	0x78c: 0x0d77, 0x78d: 0x0e2b, 0x78e: 0x0e5f, 0x78f: 0x1113, 0x790: 0x113b, 0x791: 0x14a7,
-	0x792: 0x084f, 0x793: 0x11a7, 0x794: 0x07f3, 0x795: 0x07ef, 0x796: 0x1097, 0x797: 0x1127,
-	0x798: 0x125b, 0x799: 0x14af, 0x79a: 0x1367, 0x79b: 0x0c27, 0x79c: 0x0d73, 0x79d: 0x1357,
-	0x79e: 0x06f7, 0x79f: 0x0a63, 0x7a0: 0x0b93, 0x7a1: 0x0f2f, 0x7a2: 0x0faf, 0x7a3: 0x0873,
-	0x7a4: 0x103b, 0x7a5: 0x075f, 0x7a6: 0x0b77, 0x7a7: 0x06d7, 0x7a8: 0x0deb, 0x7a9: 0x0ca3,
-	0x7aa: 0x110f, 0x7ab: 0x08c7, 0x7ac: 0x09b3, 0x7ad: 0x0ffb, 0x7ae: 0x1263, 0x7af: 0x133b,
-	0x7b0: 0x0db7, 0x7b1: 0x13f7, 0x7b2: 0x0de3, 0x7b3: 0x0c37, 0x7b4: 0x121b, 0x7b5: 0x0c57,
-	0x7b6: 0x0fab, 0x7b7: 0x072b, 0x7b8: 0x07a7, 0x7b9: 0x07eb, 0x7ba: 0x0d53, 0x7bb: 0x10fb,
-	0x7bc: 0x11f3, 0x7bd: 0x1347, 0x7be: 0x145b, 0x7bf: 0x085b,
-	// Block 0x1f, offset 0x7c0
-	0x7c0: 0x090f, 0x7c1: 0x0a17, 0x7c2: 0x0b2f, 0x7c3: 0x0cbf, 0x7c4: 0x0e7b, 0x7c5: 0x103f,
-	0x7c6: 0x1497, 0x7c7: 0x157b, 0x7c8: 0x15cf, 0x7c9: 0x15e7, 0x7ca: 0x0837, 0x7cb: 0x0cf3,
-	0x7cc: 0x0da3, 0x7cd: 0x13eb, 0x7ce: 0x0afb, 0x7cf: 0x0bd7, 0x7d0: 0x0bf3, 0x7d1: 0x0c83,
-	0x7d2: 0x0e6b, 0x7d3: 0x0eb7, 0x7d4: 0x0f67, 0x7d5: 0x108b, 0x7d6: 0x112f, 0x7d7: 0x1193,
-	0x7d8: 0x13db, 0x7d9: 0x126b, 0x7da: 0x1403, 0x7db: 0x147f, 0x7dc: 0x080f, 0x7dd: 0x083b,
-	0x7de: 0x0923, 0x7df: 0x0ea7, 0x7e0: 0x12f3, 0x7e1: 0x133b, 0x7e2: 0x0b1b, 0x7e3: 0x0b8b,
-	0x7e4: 0x0c4f, 0x7e5: 0x0daf, 0x7e6: 0x10d7, 0x7e7: 0x0f23, 0x7e8: 0x073b, 0x7e9: 0x097f,
-	0x7ea: 0x0a63, 0x7eb: 0x0ac7, 0x7ec: 0x0b97, 0x7ed: 0x0f3f, 0x7ee: 0x0f5b, 0x7ef: 0x116b,
-	0x7f0: 0x118b, 0x7f1: 0x1463, 0x7f2: 0x14e3, 0x7f3: 0x14f3, 0x7f4: 0x152f, 0x7f5: 0x0753,
-	0x7f6: 0x107f, 0x7f7: 0x144f, 0x7f8: 0x14cb, 0x7f9: 0x0baf, 0x7fa: 0x0717, 0x7fb: 0x0777,
-	0x7fc: 0x0a67, 0x7fd: 0x0a87, 0x7fe: 0x0caf, 0x7ff: 0x0d73,
-	// Block 0x20, offset 0x800
-	0x800: 0x0ec3, 0x801: 0x0fcb, 0x802: 0x1277, 0x803: 0x1417, 0x804: 0x1623, 0x805: 0x0ce3,
-	0x806: 0x14a3, 0x807: 0x0833, 0x808: 0x0d2f, 0x809: 0x0d3b, 0x80a: 0x0e0f, 0x80b: 0x0e47,
-	0x80c: 0x0f4b, 0x80d: 0x0fa7, 0x80e: 0x1027, 0x80f: 0x110b, 0x810: 0x153b, 0x811: 0x07af,
-	0x812: 0x0c03, 0x813: 0x14b3, 0x814: 0x0767, 0x815: 0x0aab, 0x816: 0x0e2f, 0x817: 0x13df,
-	0x818: 0x0b67, 0x819: 0x0bb7, 0x81a: 0x0d43, 0x81b: 0x0f2f, 0x81c: 0x14bb, 0x81d: 0x0817,
-	0x81e: 0x08ff, 0x81f: 0x0a97, 0x820: 0x0cd3, 0x821: 0x0d1f, 0x822: 0x0d5f, 0x823: 0x0df3,
-	0x824: 0x0f47, 0x825: 0x0fbb, 0x826: 0x1157, 0x827: 0x12f7, 0x828: 0x1303, 0x829: 0x1457,
-	0x82a: 0x14d7, 0x82b: 0x0883, 0x82c: 0x0e4b, 0x82d: 0x0903, 0x82e: 0x0ec7, 0x82f: 0x0f6b,
-	0x830: 0x1287, 0x831: 0x14bf, 0x832: 0x15ab, 0x833: 0x15d3, 0x834: 0x0d37, 0x835: 0x0e27,
-	0x836: 0x11c3, 0x837: 0x10b7, 0x838: 0x10c3, 0x839: 0x10e7, 0x83a: 0x0f17, 0x83b: 0x0e9f,
-	0x83c: 0x1363, 0x83d: 0x0733, 0x83e: 0x122b, 0x83f: 0x081b,
-	// Block 0x21, offset 0x840
-	0x840: 0x080b, 0x841: 0x0b0b, 0x842: 0x0c2b, 0x843: 0x10f3, 0x844: 0x0a53, 0x845: 0x0e03,
-	0x846: 0x0cef, 0x847: 0x13e7, 0x848: 0x12e7, 0x849: 0x14ab, 0x84a: 0x1323, 0x84b: 0x0b27,
-	0x84c: 0x0787, 0x84d: 0x095b, 0x850: 0x09af,
-	0x852: 0x0cdf, 0x855: 0x07f7, 0x856: 0x0f1f, 0x857: 0x0fe3,
-	0x858: 0x1047, 0x859: 0x1063, 0x85a: 0x1067, 0x85b: 0x107b, 0x85c: 0x14fb, 0x85d: 0x10eb,
-	0x85e: 0x116f, 0x860: 0x128f, 0x862: 0x1353,
-	0x865: 0x1407, 0x866: 0x1433,
-	0x86a: 0x154f, 0x86b: 0x1553, 0x86c: 0x1557, 0x86d: 0x15bb, 0x86e: 0x142b, 0x86f: 0x14c7,
-	0x870: 0x0757, 0x871: 0x077b, 0x872: 0x078f, 0x873: 0x084b, 0x874: 0x0857, 0x875: 0x0897,
-	0x876: 0x094b, 0x877: 0x0967, 0x878: 0x096f, 0x879: 0x09ab, 0x87a: 0x09b7, 0x87b: 0x0a93,
-	0x87c: 0x0a9b, 0x87d: 0x0ba3, 0x87e: 0x0bcb, 0x87f: 0x0bd3,
-	// Block 0x22, offset 0x880
-	0x880: 0x0beb, 0x881: 0x0c97, 0x882: 0x0cc7, 0x883: 0x0ce7, 0x884: 0x0d57, 0x885: 0x0e1b,
-	0x886: 0x0e37, 0x887: 0x0e67, 0x888: 0x0ebb, 0x889: 0x0edb, 0x88a: 0x0f4f, 0x88b: 0x102f,
-	0x88c: 0x104b, 0x88d: 0x1053, 0x88e: 0x104f, 0x88f: 0x1057, 0x890: 0x105b, 0x891: 0x105f,
-	0x892: 0x1073, 0x893: 0x1077, 0x894: 0x109b, 0x895: 0x10af, 0x896: 0x10cb, 0x897: 0x112f,
-	0x898: 0x1137, 0x899: 0x113f, 0x89a: 0x1153, 0x89b: 0x117b, 0x89c: 0x11cb, 0x89d: 0x11ff,
-	0x89e: 0x11ff, 0x89f: 0x1267, 0x8a0: 0x130f, 0x8a1: 0x1327, 0x8a2: 0x135b, 0x8a3: 0x135f,
-	0x8a4: 0x13a3, 0x8a5: 0x13a7, 0x8a6: 0x13ff, 0x8a7: 0x1407, 0x8a8: 0x14db, 0x8a9: 0x151f,
-	0x8aa: 0x1537, 0x8ab: 0x0b9b, 0x8ac: 0x171e, 0x8ad: 0x11e3,
-	0x8b0: 0x06df, 0x8b1: 0x07e3, 0x8b2: 0x07a3, 0x8b3: 0x074b, 0x8b4: 0x078b, 0x8b5: 0x07b7,
-	0x8b6: 0x0847, 0x8b7: 0x0863, 0x8b8: 0x094b, 0x8b9: 0x0937, 0x8ba: 0x0947, 0x8bb: 0x0963,
-	0x8bc: 0x09af, 0x8bd: 0x09bf, 0x8be: 0x0a03, 0x8bf: 0x0a0f,
-	// Block 0x23, offset 0x8c0
-	0x8c0: 0x0a2b, 0x8c1: 0x0a3b, 0x8c2: 0x0b23, 0x8c3: 0x0b2b, 0x8c4: 0x0b5b, 0x8c5: 0x0b7b,
-	0x8c6: 0x0bab, 0x8c7: 0x0bc3, 0x8c8: 0x0bb3, 0x8c9: 0x0bd3, 0x8ca: 0x0bc7, 0x8cb: 0x0beb,
-	0x8cc: 0x0c07, 0x8cd: 0x0c5f, 0x8ce: 0x0c6b, 0x8cf: 0x0c73, 0x8d0: 0x0c9b, 0x8d1: 0x0cdf,
-	0x8d2: 0x0d0f, 0x8d3: 0x0d13, 0x8d4: 0x0d27, 0x8d5: 0x0da7, 0x8d6: 0x0db7, 0x8d7: 0x0e0f,
-	0x8d8: 0x0e5b, 0x8d9: 0x0e53, 0x8da: 0x0e67, 0x8db: 0x0e83, 0x8dc: 0x0ebb, 0x8dd: 0x1013,
-	0x8de: 0x0edf, 0x8df: 0x0f13, 0x8e0: 0x0f1f, 0x8e1: 0x0f5f, 0x8e2: 0x0f7b, 0x8e3: 0x0f9f,
-	0x8e4: 0x0fc3, 0x8e5: 0x0fc7, 0x8e6: 0x0fe3, 0x8e7: 0x0fe7, 0x8e8: 0x0ff7, 0x8e9: 0x100b,
-	0x8ea: 0x1007, 0x8eb: 0x1037, 0x8ec: 0x10b3, 0x8ed: 0x10cb, 0x8ee: 0x10e3, 0x8ef: 0x111b,
-	0x8f0: 0x112f, 0x8f1: 0x114b, 0x8f2: 0x117b, 0x8f3: 0x122f, 0x8f4: 0x1257, 0x8f5: 0x12cb,
-	0x8f6: 0x1313, 0x8f7: 0x131f, 0x8f8: 0x1327, 0x8f9: 0x133f, 0x8fa: 0x1353, 0x8fb: 0x1343,
-	0x8fc: 0x135b, 0x8fd: 0x1357, 0x8fe: 0x134f, 0x8ff: 0x135f,
-	// Block 0x24, offset 0x900
-	0x900: 0x136b, 0x901: 0x13a7, 0x902: 0x13e3, 0x903: 0x1413, 0x904: 0x144b, 0x905: 0x146b,
-	0x906: 0x14b7, 0x907: 0x14db, 0x908: 0x14fb, 0x909: 0x150f, 0x90a: 0x151f, 0x90b: 0x152b,
-	0x90c: 0x1537, 0x90d: 0x158b, 0x90e: 0x162b, 0x90f: 0x16b5, 0x910: 0x16b0, 0x911: 0x16e2,
-	0x912: 0x0607, 0x913: 0x062f, 0x914: 0x0633, 0x915: 0x1764, 0x916: 0x1791, 0x917: 0x1809,
-	0x918: 0x1617, 0x919: 0x1627,
-	// Block 0x25, offset 0x940
-	0x940: 0x06fb, 0x941: 0x06f3, 0x942: 0x0703, 0x943: 0x1647, 0x944: 0x0747, 0x945: 0x0757,
-	0x946: 0x075b, 0x947: 0x0763, 0x948: 0x076b, 0x949: 0x076f, 0x94a: 0x077b, 0x94b: 0x0773,
-	0x94c: 0x05b3, 0x94d: 0x165b, 0x94e: 0x078f, 0x94f: 0x0793, 0x950: 0x0797, 0x951: 0x07b3,
-	0x952: 0x164c, 0x953: 0x05b7, 0x954: 0x079f, 0x955: 0x07bf, 0x956: 0x1656, 0x957: 0x07cf,
-	0x958: 0x07d7, 0x959: 0x0737, 0x95a: 0x07df, 0x95b: 0x07e3, 0x95c: 0x1831, 0x95d: 0x07ff,
-	0x95e: 0x0807, 0x95f: 0x05bf, 0x960: 0x081f, 0x961: 0x0823, 0x962: 0x082b, 0x963: 0x082f,
-	0x964: 0x05c3, 0x965: 0x0847, 0x966: 0x084b, 0x967: 0x0857, 0x968: 0x0863, 0x969: 0x0867,
-	0x96a: 0x086b, 0x96b: 0x0873, 0x96c: 0x0893, 0x96d: 0x0897, 0x96e: 0x089f, 0x96f: 0x08af,
-	0x970: 0x08b7, 0x971: 0x08bb, 0x972: 0x08bb, 0x973: 0x08bb, 0x974: 0x166a, 0x975: 0x0e93,
-	0x976: 0x08cf, 0x977: 0x08d7, 0x978: 0x166f, 0x979: 0x08e3, 0x97a: 0x08eb, 0x97b: 0x08f3,
-	0x97c: 0x091b, 0x97d: 0x0907, 0x97e: 0x0913, 0x97f: 0x0917,
-	// Block 0x26, offset 0x980
-	0x980: 0x091f, 0x981: 0x0927, 0x982: 0x092b, 0x983: 0x0933, 0x984: 0x093b, 0x985: 0x093f,
-	0x986: 0x093f, 0x987: 0x0947, 0x988: 0x094f, 0x989: 0x0953, 0x98a: 0x095f, 0x98b: 0x0983,
-	0x98c: 0x0967, 0x98d: 0x0987, 0x98e: 0x096b, 0x98f: 0x0973, 0x990: 0x080b, 0x991: 0x09cf,
-	0x992: 0x0997, 0x993: 0x099b, 0x994: 0x099f, 0x995: 0x0993, 0x996: 0x09a7, 0x997: 0x09a3,
-	0x998: 0x09bb, 0x999: 0x1674, 0x99a: 0x09d7, 0x99b: 0x09db, 0x99c: 0x09e3, 0x99d: 0x09ef,
-	0x99e: 0x09f7, 0x99f: 0x0a13, 0x9a0: 0x1679, 0x9a1: 0x167e, 0x9a2: 0x0a1f, 0x9a3: 0x0a23,
-	0x9a4: 0x0a27, 0x9a5: 0x0a1b, 0x9a6: 0x0a2f, 0x9a7: 0x05c7, 0x9a8: 0x05cb, 0x9a9: 0x0a37,
-	0x9aa: 0x0a3f, 0x9ab: 0x0a3f, 0x9ac: 0x1683, 0x9ad: 0x0a5b, 0x9ae: 0x0a5f, 0x9af: 0x0a63,
-	0x9b0: 0x0a6b, 0x9b1: 0x1688, 0x9b2: 0x0a73, 0x9b3: 0x0a77, 0x9b4: 0x0b4f, 0x9b5: 0x0a7f,
-	0x9b6: 0x05cf, 0x9b7: 0x0a8b, 0x9b8: 0x0a9b, 0x9b9: 0x0aa7, 0x9ba: 0x0aa3, 0x9bb: 0x1692,
-	0x9bc: 0x0aaf, 0x9bd: 0x1697, 0x9be: 0x0abb, 0x9bf: 0x0ab7,
-	// Block 0x27, offset 0x9c0
-	0x9c0: 0x0abf, 0x9c1: 0x0acf, 0x9c2: 0x0ad3, 0x9c3: 0x05d3, 0x9c4: 0x0ae3, 0x9c5: 0x0aeb,
-	0x9c6: 0x0aef, 0x9c7: 0x0af3, 0x9c8: 0x05d7, 0x9c9: 0x169c, 0x9ca: 0x05db, 0x9cb: 0x0b0f,
-	0x9cc: 0x0b13, 0x9cd: 0x0b17, 0x9ce: 0x0b1f, 0x9cf: 0x1863, 0x9d0: 0x0b37, 0x9d1: 0x16a6,
-	0x9d2: 0x16a6, 0x9d3: 0x11d7, 0x9d4: 0x0b47, 0x9d5: 0x0b47, 0x9d6: 0x05df, 0x9d7: 0x16c9,
-	0x9d8: 0x179b, 0x9d9: 0x0b57, 0x9da: 0x0b5f, 0x9db: 0x05e3, 0x9dc: 0x0b73, 0x9dd: 0x0b83,
-	0x9de: 0x0b87, 0x9df: 0x0b8f, 0x9e0: 0x0b9f, 0x9e1: 0x05eb, 0x9e2: 0x05e7, 0x9e3: 0x0ba3,
-	0x9e4: 0x16ab, 0x9e5: 0x0ba7, 0x9e6: 0x0bbb, 0x9e7: 0x0bbf, 0x9e8: 0x0bc3, 0x9e9: 0x0bbf,
-	0x9ea: 0x0bcf, 0x9eb: 0x0bd3, 0x9ec: 0x0be3, 0x9ed: 0x0bdb, 0x9ee: 0x0bdf, 0x9ef: 0x0be7,
-	0x9f0: 0x0beb, 0x9f1: 0x0bef, 0x9f2: 0x0bfb, 0x9f3: 0x0bff, 0x9f4: 0x0c17, 0x9f5: 0x0c1f,
-	0x9f6: 0x0c2f, 0x9f7: 0x0c43, 0x9f8: 0x16ba, 0x9f9: 0x0c3f, 0x9fa: 0x0c33, 0x9fb: 0x0c4b,
-	0x9fc: 0x0c53, 0x9fd: 0x0c67, 0x9fe: 0x16bf, 0x9ff: 0x0c6f,
-	// Block 0x28, offset 0xa00
-	0xa00: 0x0c63, 0xa01: 0x0c5b, 0xa02: 0x05ef, 0xa03: 0x0c77, 0xa04: 0x0c7f, 0xa05: 0x0c87,
-	0xa06: 0x0c7b, 0xa07: 0x05f3, 0xa08: 0x0c97, 0xa09: 0x0c9f, 0xa0a: 0x16c4, 0xa0b: 0x0ccb,
-	0xa0c: 0x0cff, 0xa0d: 0x0cdb, 0xa0e: 0x05ff, 0xa0f: 0x0ce7, 0xa10: 0x05fb, 0xa11: 0x05f7,
-	0xa12: 0x07c3, 0xa13: 0x07c7, 0xa14: 0x0d03, 0xa15: 0x0ceb, 0xa16: 0x11ab, 0xa17: 0x0663,
-	0xa18: 0x0d0f, 0xa19: 0x0d13, 0xa1a: 0x0d17, 0xa1b: 0x0d2b, 0xa1c: 0x0d23, 0xa1d: 0x16dd,
-	0xa1e: 0x0603, 0xa1f: 0x0d3f, 0xa20: 0x0d33, 0xa21: 0x0d4f, 0xa22: 0x0d57, 0xa23: 0x16e7,
-	0xa24: 0x0d5b, 0xa25: 0x0d47, 0xa26: 0x0d63, 0xa27: 0x0607, 0xa28: 0x0d67, 0xa29: 0x0d6b,
-	0xa2a: 0x0d6f, 0xa2b: 0x0d7b, 0xa2c: 0x16ec, 0xa2d: 0x0d83, 0xa2e: 0x060b, 0xa2f: 0x0d8f,
-	0xa30: 0x16f1, 0xa31: 0x0d93, 0xa32: 0x060f, 0xa33: 0x0d9f, 0xa34: 0x0dab, 0xa35: 0x0db7,
-	0xa36: 0x0dbb, 0xa37: 0x16f6, 0xa38: 0x168d, 0xa39: 0x16fb, 0xa3a: 0x0ddb, 0xa3b: 0x1700,
-	0xa3c: 0x0de7, 0xa3d: 0x0def, 0xa3e: 0x0ddf, 0xa3f: 0x0dfb,
-	// Block 0x29, offset 0xa40
-	0xa40: 0x0e0b, 0xa41: 0x0e1b, 0xa42: 0x0e0f, 0xa43: 0x0e13, 0xa44: 0x0e1f, 0xa45: 0x0e23,
-	0xa46: 0x1705, 0xa47: 0x0e07, 0xa48: 0x0e3b, 0xa49: 0x0e3f, 0xa4a: 0x0613, 0xa4b: 0x0e53,
-	0xa4c: 0x0e4f, 0xa4d: 0x170a, 0xa4e: 0x0e33, 0xa4f: 0x0e6f, 0xa50: 0x170f, 0xa51: 0x1714,
-	0xa52: 0x0e73, 0xa53: 0x0e87, 0xa54: 0x0e83, 0xa55: 0x0e7f, 0xa56: 0x0617, 0xa57: 0x0e8b,
-	0xa58: 0x0e9b, 0xa59: 0x0e97, 0xa5a: 0x0ea3, 0xa5b: 0x1651, 0xa5c: 0x0eb3, 0xa5d: 0x1719,
-	0xa5e: 0x0ebf, 0xa5f: 0x1723, 0xa60: 0x0ed3, 0xa61: 0x0edf, 0xa62: 0x0ef3, 0xa63: 0x1728,
-	0xa64: 0x0f07, 0xa65: 0x0f0b, 0xa66: 0x172d, 0xa67: 0x1732, 0xa68: 0x0f27, 0xa69: 0x0f37,
-	0xa6a: 0x061b, 0xa6b: 0x0f3b, 0xa6c: 0x061f, 0xa6d: 0x061f, 0xa6e: 0x0f53, 0xa6f: 0x0f57,
-	0xa70: 0x0f5f, 0xa71: 0x0f63, 0xa72: 0x0f6f, 0xa73: 0x0623, 0xa74: 0x0f87, 0xa75: 0x1737,
-	0xa76: 0x0fa3, 0xa77: 0x173c, 0xa78: 0x0faf, 0xa79: 0x16a1, 0xa7a: 0x0fbf, 0xa7b: 0x1741,
-	0xa7c: 0x1746, 0xa7d: 0x174b, 0xa7e: 0x0627, 0xa7f: 0x062b,
-	// Block 0x2a, offset 0xa80
-	0xa80: 0x0ff7, 0xa81: 0x1755, 0xa82: 0x1750, 0xa83: 0x175a, 0xa84: 0x175f, 0xa85: 0x0fff,
-	0xa86: 0x1003, 0xa87: 0x1003, 0xa88: 0x100b, 0xa89: 0x0633, 0xa8a: 0x100f, 0xa8b: 0x0637,
-	0xa8c: 0x063b, 0xa8d: 0x1769, 0xa8e: 0x1023, 0xa8f: 0x102b, 0xa90: 0x1037, 0xa91: 0x063f,
-	0xa92: 0x176e, 0xa93: 0x105b, 0xa94: 0x1773, 0xa95: 0x1778, 0xa96: 0x107b, 0xa97: 0x1093,
-	0xa98: 0x0643, 0xa99: 0x109b, 0xa9a: 0x109f, 0xa9b: 0x10a3, 0xa9c: 0x177d, 0xa9d: 0x1782,
-	0xa9e: 0x1782, 0xa9f: 0x10bb, 0xaa0: 0x0647, 0xaa1: 0x1787, 0xaa2: 0x10cf, 0xaa3: 0x10d3,
-	0xaa4: 0x064b, 0xaa5: 0x178c, 0xaa6: 0x10ef, 0xaa7: 0x064f, 0xaa8: 0x10ff, 0xaa9: 0x10f7,
-	0xaaa: 0x1107, 0xaab: 0x1796, 0xaac: 0x111f, 0xaad: 0x0653, 0xaae: 0x112b, 0xaaf: 0x1133,
-	0xab0: 0x1143, 0xab1: 0x0657, 0xab2: 0x17a0, 0xab3: 0x17a5, 0xab4: 0x065b, 0xab5: 0x17aa,
-	0xab6: 0x115b, 0xab7: 0x17af, 0xab8: 0x1167, 0xab9: 0x1173, 0xaba: 0x117b, 0xabb: 0x17b4,
-	0xabc: 0x17b9, 0xabd: 0x118f, 0xabe: 0x17be, 0xabf: 0x1197,
-	// Block 0x2b, offset 0xac0
-	0xac0: 0x16ce, 0xac1: 0x065f, 0xac2: 0x11af, 0xac3: 0x11b3, 0xac4: 0x0667, 0xac5: 0x11b7,
-	0xac6: 0x0a33, 0xac7: 0x17c3, 0xac8: 0x17c8, 0xac9: 0x16d3, 0xaca: 0x16d8, 0xacb: 0x11d7,
-	0xacc: 0x11db, 0xacd: 0x13f3, 0xace: 0x066b, 0xacf: 0x1207, 0xad0: 0x1203, 0xad1: 0x120b,
-	0xad2: 0x083f, 0xad3: 0x120f, 0xad4: 0x1213, 0xad5: 0x1217, 0xad6: 0x121f, 0xad7: 0x17cd,
-	0xad8: 0x121b, 0xad9: 0x1223, 0xada: 0x1237, 0xadb: 0x123b, 0xadc: 0x1227, 0xadd: 0x123f,
-	0xade: 0x1253, 0xadf: 0x1267, 0xae0: 0x1233, 0xae1: 0x1247, 0xae2: 0x124b, 0xae3: 0x124f,
-	0xae4: 0x17d2, 0xae5: 0x17dc, 0xae6: 0x17d7, 0xae7: 0x066f, 0xae8: 0x126f, 0xae9: 0x1273,
-	0xaea: 0x127b, 0xaeb: 0x17f0, 0xaec: 0x127f, 0xaed: 0x17e1, 0xaee: 0x0673, 0xaef: 0x0677,
-	0xaf0: 0x17e6, 0xaf1: 0x17eb, 0xaf2: 0x067b, 0xaf3: 0x129f, 0xaf4: 0x12a3, 0xaf5: 0x12a7,
-	0xaf6: 0x12ab, 0xaf7: 0x12b7, 0xaf8: 0x12b3, 0xaf9: 0x12bf, 0xafa: 0x12bb, 0xafb: 0x12cb,
-	0xafc: 0x12c3, 0xafd: 0x12c7, 0xafe: 0x12cf, 0xaff: 0x067f,
-	// Block 0x2c, offset 0xb00
-	0xb00: 0x12d7, 0xb01: 0x12db, 0xb02: 0x0683, 0xb03: 0x12eb, 0xb04: 0x12ef, 0xb05: 0x17f5,
-	0xb06: 0x12fb, 0xb07: 0x12ff, 0xb08: 0x0687, 0xb09: 0x130b, 0xb0a: 0x05bb, 0xb0b: 0x17fa,
-	0xb0c: 0x17ff, 0xb0d: 0x068b, 0xb0e: 0x068f, 0xb0f: 0x1337, 0xb10: 0x134f, 0xb11: 0x136b,
-	0xb12: 0x137b, 0xb13: 0x1804, 0xb14: 0x138f, 0xb15: 0x1393, 0xb16: 0x13ab, 0xb17: 0x13b7,
-	0xb18: 0x180e, 0xb19: 0x1660, 0xb1a: 0x13c3, 0xb1b: 0x13bf, 0xb1c: 0x13cb, 0xb1d: 0x1665,
-	0xb1e: 0x13d7, 0xb1f: 0x13e3, 0xb20: 0x1813, 0xb21: 0x1818, 0xb22: 0x1423, 0xb23: 0x142f,
-	0xb24: 0x1437, 0xb25: 0x181d, 0xb26: 0x143b, 0xb27: 0x1467, 0xb28: 0x1473, 0xb29: 0x1477,
-	0xb2a: 0x146f, 0xb2b: 0x1483, 0xb2c: 0x1487, 0xb2d: 0x1822, 0xb2e: 0x1493, 0xb2f: 0x0693,
-	0xb30: 0x149b, 0xb31: 0x1827, 0xb32: 0x0697, 0xb33: 0x14d3, 0xb34: 0x0ac3, 0xb35: 0x14eb,
-	0xb36: 0x182c, 0xb37: 0x1836, 0xb38: 0x069b, 0xb39: 0x069f, 0xb3a: 0x1513, 0xb3b: 0x183b,
-	0xb3c: 0x06a3, 0xb3d: 0x1840, 0xb3e: 0x152b, 0xb3f: 0x152b,
-	// Block 0x2d, offset 0xb40
-	0xb40: 0x1533, 0xb41: 0x1845, 0xb42: 0x154b, 0xb43: 0x06a7, 0xb44: 0x155b, 0xb45: 0x1567,
-	0xb46: 0x156f, 0xb47: 0x1577, 0xb48: 0x06ab, 0xb49: 0x184a, 0xb4a: 0x158b, 0xb4b: 0x15a7,
-	0xb4c: 0x15b3, 0xb4d: 0x06af, 0xb4e: 0x06b3, 0xb4f: 0x15b7, 0xb50: 0x184f, 0xb51: 0x06b7,
-	0xb52: 0x1854, 0xb53: 0x1859, 0xb54: 0x185e, 0xb55: 0x15db, 0xb56: 0x06bb, 0xb57: 0x15ef,
-	0xb58: 0x15f7, 0xb59: 0x15fb, 0xb5a: 0x1603, 0xb5b: 0x160b, 0xb5c: 0x1613, 0xb5d: 0x1868,
-}
-
-// nfcIndex: 22 blocks, 1408 entries, 1408 bytes
-// Block 0 is the zero block.
-var nfcIndex = [1408]uint8{
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc2: 0x2c, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x2d, 0xc7: 0x04,
-	0xc8: 0x05, 0xca: 0x2e, 0xcb: 0x2f, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x30,
-	0xd0: 0x09, 0xd1: 0x31, 0xd2: 0x32, 0xd3: 0x0a, 0xd6: 0x0b, 0xd7: 0x33,
-	0xd8: 0x34, 0xd9: 0x0c, 0xdb: 0x35, 0xdc: 0x36, 0xdd: 0x37, 0xdf: 0x38,
-	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
-	0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a,
-	0xf0: 0x13,
-	// Block 0x4, offset 0x100
-	0x120: 0x39, 0x121: 0x3a, 0x123: 0x3b, 0x124: 0x3c, 0x125: 0x3d, 0x126: 0x3e, 0x127: 0x3f,
-	0x128: 0x40, 0x129: 0x41, 0x12a: 0x42, 0x12b: 0x43, 0x12c: 0x3e, 0x12d: 0x44, 0x12e: 0x45, 0x12f: 0x46,
-	0x131: 0x47, 0x132: 0x48, 0x133: 0x49, 0x134: 0x4a, 0x135: 0x4b, 0x137: 0x4c,
-	0x138: 0x4d, 0x139: 0x4e, 0x13a: 0x4f, 0x13b: 0x50, 0x13c: 0x51, 0x13d: 0x52, 0x13e: 0x53, 0x13f: 0x54,
-	// Block 0x5, offset 0x140
-	0x140: 0x55, 0x142: 0x56, 0x144: 0x57, 0x145: 0x58, 0x146: 0x59, 0x147: 0x5a,
-	0x14d: 0x5b,
-	0x15c: 0x5c, 0x15f: 0x5d,
-	0x162: 0x5e, 0x164: 0x5f,
-	0x168: 0x60, 0x169: 0x61, 0x16a: 0x62, 0x16c: 0x0d, 0x16d: 0x63, 0x16e: 0x64, 0x16f: 0x65,
-	0x170: 0x66, 0x173: 0x67, 0x177: 0x68,
-	0x178: 0x0e, 0x179: 0x0f, 0x17a: 0x10, 0x17b: 0x11, 0x17c: 0x12, 0x17d: 0x13, 0x17e: 0x14, 0x17f: 0x15,
-	// Block 0x6, offset 0x180
-	0x180: 0x69, 0x183: 0x6a, 0x184: 0x6b, 0x186: 0x6c, 0x187: 0x6d,
-	0x188: 0x6e, 0x189: 0x16, 0x18a: 0x17, 0x18b: 0x6f, 0x18c: 0x70,
-	0x1ab: 0x71,
-	0x1b3: 0x72, 0x1b5: 0x73, 0x1b7: 0x74,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x75, 0x1c1: 0x18, 0x1c2: 0x19, 0x1c3: 0x1a, 0x1c4: 0x76, 0x1c5: 0x77,
-	0x1c9: 0x78, 0x1cc: 0x79, 0x1cd: 0x7a,
-	// Block 0x8, offset 0x200
-	0x219: 0x7b, 0x21a: 0x7c, 0x21b: 0x7d,
-	0x220: 0x7e, 0x223: 0x7f, 0x224: 0x80, 0x225: 0x81, 0x226: 0x82, 0x227: 0x83,
-	0x22a: 0x84, 0x22b: 0x85, 0x22f: 0x86,
-	0x230: 0x87, 0x231: 0x88, 0x232: 0x89, 0x233: 0x8a, 0x234: 0x8b, 0x235: 0x8c, 0x236: 0x8d, 0x237: 0x87,
-	0x238: 0x88, 0x239: 0x89, 0x23a: 0x8a, 0x23b: 0x8b, 0x23c: 0x8c, 0x23d: 0x8d, 0x23e: 0x87, 0x23f: 0x88,
-	// Block 0x9, offset 0x240
-	0x240: 0x89, 0x241: 0x8a, 0x242: 0x8b, 0x243: 0x8c, 0x244: 0x8d, 0x245: 0x87, 0x246: 0x88, 0x247: 0x89,
-	0x248: 0x8a, 0x249: 0x8b, 0x24a: 0x8c, 0x24b: 0x8d, 0x24c: 0x87, 0x24d: 0x88, 0x24e: 0x89, 0x24f: 0x8a,
-	0x250: 0x8b, 0x251: 0x8c, 0x252: 0x8d, 0x253: 0x87, 0x254: 0x88, 0x255: 0x89, 0x256: 0x8a, 0x257: 0x8b,
-	0x258: 0x8c, 0x259: 0x8d, 0x25a: 0x87, 0x25b: 0x88, 0x25c: 0x89, 0x25d: 0x8a, 0x25e: 0x8b, 0x25f: 0x8c,
-	0x260: 0x8d, 0x261: 0x87, 0x262: 0x88, 0x263: 0x89, 0x264: 0x8a, 0x265: 0x8b, 0x266: 0x8c, 0x267: 0x8d,
-	0x268: 0x87, 0x269: 0x88, 0x26a: 0x89, 0x26b: 0x8a, 0x26c: 0x8b, 0x26d: 0x8c, 0x26e: 0x8d, 0x26f: 0x87,
-	0x270: 0x88, 0x271: 0x89, 0x272: 0x8a, 0x273: 0x8b, 0x274: 0x8c, 0x275: 0x8d, 0x276: 0x87, 0x277: 0x88,
-	0x278: 0x89, 0x279: 0x8a, 0x27a: 0x8b, 0x27b: 0x8c, 0x27c: 0x8d, 0x27d: 0x87, 0x27e: 0x88, 0x27f: 0x89,
-	// Block 0xa, offset 0x280
-	0x280: 0x8a, 0x281: 0x8b, 0x282: 0x8c, 0x283: 0x8d, 0x284: 0x87, 0x285: 0x88, 0x286: 0x89, 0x287: 0x8a,
-	0x288: 0x8b, 0x289: 0x8c, 0x28a: 0x8d, 0x28b: 0x87, 0x28c: 0x88, 0x28d: 0x89, 0x28e: 0x8a, 0x28f: 0x8b,
-	0x290: 0x8c, 0x291: 0x8d, 0x292: 0x87, 0x293: 0x88, 0x294: 0x89, 0x295: 0x8a, 0x296: 0x8b, 0x297: 0x8c,
-	0x298: 0x8d, 0x299: 0x87, 0x29a: 0x88, 0x29b: 0x89, 0x29c: 0x8a, 0x29d: 0x8b, 0x29e: 0x8c, 0x29f: 0x8d,
-	0x2a0: 0x87, 0x2a1: 0x88, 0x2a2: 0x89, 0x2a3: 0x8a, 0x2a4: 0x8b, 0x2a5: 0x8c, 0x2a6: 0x8d, 0x2a7: 0x87,
-	0x2a8: 0x88, 0x2a9: 0x89, 0x2aa: 0x8a, 0x2ab: 0x8b, 0x2ac: 0x8c, 0x2ad: 0x8d, 0x2ae: 0x87, 0x2af: 0x88,
-	0x2b0: 0x89, 0x2b1: 0x8a, 0x2b2: 0x8b, 0x2b3: 0x8c, 0x2b4: 0x8d, 0x2b5: 0x87, 0x2b6: 0x88, 0x2b7: 0x89,
-	0x2b8: 0x8a, 0x2b9: 0x8b, 0x2ba: 0x8c, 0x2bb: 0x8d, 0x2bc: 0x87, 0x2bd: 0x88, 0x2be: 0x89, 0x2bf: 0x8a,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0x8b, 0x2c1: 0x8c, 0x2c2: 0x8d, 0x2c3: 0x87, 0x2c4: 0x88, 0x2c5: 0x89, 0x2c6: 0x8a, 0x2c7: 0x8b,
-	0x2c8: 0x8c, 0x2c9: 0x8d, 0x2ca: 0x87, 0x2cb: 0x88, 0x2cc: 0x89, 0x2cd: 0x8a, 0x2ce: 0x8b, 0x2cf: 0x8c,
-	0x2d0: 0x8d, 0x2d1: 0x87, 0x2d2: 0x88, 0x2d3: 0x89, 0x2d4: 0x8a, 0x2d5: 0x8b, 0x2d6: 0x8c, 0x2d7: 0x8d,
-	0x2d8: 0x87, 0x2d9: 0x88, 0x2da: 0x89, 0x2db: 0x8a, 0x2dc: 0x8b, 0x2dd: 0x8c, 0x2de: 0x8e,
-	// Block 0xc, offset 0x300
-	0x324: 0x1b, 0x325: 0x1c, 0x326: 0x1d, 0x327: 0x1e,
-	0x328: 0x1f, 0x329: 0x20, 0x32a: 0x21, 0x32b: 0x22, 0x32c: 0x8f, 0x32d: 0x90, 0x32e: 0x91,
-	0x331: 0x92, 0x332: 0x93, 0x333: 0x94, 0x334: 0x95,
-	0x338: 0x96, 0x339: 0x97, 0x33a: 0x98, 0x33b: 0x99, 0x33e: 0x9a, 0x33f: 0x9b,
-	// Block 0xd, offset 0x340
-	0x347: 0x9c,
-	0x34b: 0x9d, 0x34d: 0x9e,
-	0x368: 0x9f, 0x36b: 0xa0,
-	// Block 0xe, offset 0x380
-	0x381: 0xa1, 0x382: 0xa2, 0x384: 0xa3, 0x385: 0x82, 0x387: 0xa4,
-	0x388: 0xa5, 0x38b: 0xa6, 0x38c: 0x3e, 0x38d: 0xa7,
-	0x391: 0xa8, 0x392: 0xa9, 0x393: 0xaa, 0x396: 0xab, 0x397: 0xac,
-	0x398: 0x73, 0x39a: 0xad, 0x39c: 0xae,
-	0x3b0: 0x73,
-	// Block 0xf, offset 0x3c0
-	0x3eb: 0xaf, 0x3ec: 0xb0,
-	// Block 0x10, offset 0x400
-	0x432: 0xb1,
-	// Block 0x11, offset 0x440
-	0x445: 0xb2, 0x446: 0xb3, 0x447: 0xb4,
-	0x449: 0xb5,
-	// Block 0x12, offset 0x480
-	0x480: 0xb6,
-	0x4a3: 0xb7, 0x4a5: 0xb8,
-	// Block 0x13, offset 0x4c0
-	0x4c8: 0xb9,
-	// Block 0x14, offset 0x500
-	0x520: 0x23, 0x521: 0x24, 0x522: 0x25, 0x523: 0x26, 0x524: 0x27, 0x525: 0x28, 0x526: 0x29, 0x527: 0x2a,
-	0x528: 0x2b,
-	// Block 0x15, offset 0x540
-	0x550: 0x0b, 0x551: 0x0c, 0x556: 0x0d,
-	0x55b: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
-	0x56f: 0x12,
-}
-
-// nfcSparseOffset: 142 entries, 284 bytes
-var nfcSparseOffset = []uint16{0x0, 0x5, 0x9, 0xb, 0xd, 0x18, 0x28, 0x2a, 0x2f, 0x3a, 0x49, 0x56, 0x5e, 0x62, 0x67, 0x69, 0x7a, 0x82, 0x89, 0x8c, 0x93, 0x97, 0x9b, 0x9d, 0x9f, 0xa8, 0xac, 0xb3, 0xb8, 0xbb, 0xc5, 0xc7, 0xce, 0xd6, 0xd9, 0xdb, 0xdd, 0xdf, 0xe4, 0xf5, 0x101, 0x103, 0x109, 0x10b, 0x10d, 0x10f, 0x111, 0x113, 0x115, 0x118, 0x11b, 0x11d, 0x120, 0x123, 0x127, 0x12c, 0x135, 0x137, 0x13a, 0x13c, 0x147, 0x157, 0x15b, 0x169, 0x16c, 0x172, 0x178, 0x183, 0x187, 0x189, 0x18b, 0x18d, 0x18f, 0x191, 0x197, 0x19b, 0x19d, 0x19f, 0x1a7, 0x1ab, 0x1ae, 0x1b0, 0x1b2, 0x1b4, 0x1b7, 0x1b9, 0x1bb, 0x1bd, 0x1bf, 0x1c5, 0x1c8, 0x1ca, 0x1d1, 0x1d7, 0x1dd, 0x1e5, 0x1eb, 0x1f1, 0x1f7, 0x1fb, 0x209, 0x212, 0x215, 0x218, 0x21a, 0x21d, 0x21f, 0x223, 0x228, 0x22a, 0x22c, 0x231, 0x237, 0x239, 0x23b, 0x23d, 0x243, 0x246, 0x249, 0x251, 0x258, 0x25b, 0x25e, 0x260, 0x268, 0x26b, 0x272, 0x275, 0x27b, 0x27d, 0x280, 0x282, 0x284, 0x286, 0x288, 0x295, 0x29f, 0x2a1, 0x2a3, 0x2a9, 0x2ab, 0x2ae}
-
-// nfcSparseValues: 688 entries, 2752 bytes
-var nfcSparseValues = [688]valueRange{
-	// Block 0x0, offset 0x0
-	{value: 0x0000, lo: 0x04},
-	{value: 0xa100, lo: 0xa8, hi: 0xa8},
-	{value: 0x8100, lo: 0xaf, hi: 0xaf},
-	{value: 0x8100, lo: 0xb4, hi: 0xb4},
-	{value: 0x8100, lo: 0xb8, hi: 0xb8},
-	// Block 0x1, offset 0x5
-	{value: 0x0091, lo: 0x03},
-	{value: 0x46e2, lo: 0xa0, hi: 0xa1},
-	{value: 0x4714, lo: 0xaf, hi: 0xb0},
-	{value: 0xa000, lo: 0xb7, hi: 0xb7},
-	// Block 0x2, offset 0x9
-	{value: 0x0000, lo: 0x01},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	// Block 0x3, offset 0xb
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0x98, hi: 0x9d},
-	// Block 0x4, offset 0xd
-	{value: 0x0006, lo: 0x0a},
-	{value: 0xa000, lo: 0x81, hi: 0x81},
-	{value: 0xa000, lo: 0x85, hi: 0x85},
-	{value: 0xa000, lo: 0x89, hi: 0x89},
-	{value: 0x4840, lo: 0x8a, hi: 0x8a},
-	{value: 0x485e, lo: 0x8b, hi: 0x8b},
-	{value: 0x36c7, lo: 0x8c, hi: 0x8c},
-	{value: 0x36df, lo: 0x8d, hi: 0x8d},
-	{value: 0x4876, lo: 0x8e, hi: 0x8e},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0x36fd, lo: 0x93, hi: 0x94},
-	// Block 0x5, offset 0x18
-	{value: 0x0000, lo: 0x0f},
-	{value: 0xa000, lo: 0x83, hi: 0x83},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0xa000, lo: 0x8b, hi: 0x8b},
-	{value: 0xa000, lo: 0x8d, hi: 0x8d},
-	{value: 0x37a5, lo: 0x90, hi: 0x90},
-	{value: 0x37b1, lo: 0x91, hi: 0x91},
-	{value: 0x379f, lo: 0x93, hi: 0x93},
-	{value: 0xa000, lo: 0x96, hi: 0x96},
-	{value: 0x3817, lo: 0x97, hi: 0x97},
-	{value: 0x37e1, lo: 0x9c, hi: 0x9c},
-	{value: 0x37c9, lo: 0x9d, hi: 0x9d},
-	{value: 0x37f3, lo: 0x9e, hi: 0x9e},
-	{value: 0xa000, lo: 0xb4, hi: 0xb5},
-	{value: 0x381d, lo: 0xb6, hi: 0xb6},
-	{value: 0x3823, lo: 0xb7, hi: 0xb7},
-	// Block 0x6, offset 0x28
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0x83, hi: 0x87},
-	// Block 0x7, offset 0x2a
-	{value: 0x0001, lo: 0x04},
-	{value: 0x8113, lo: 0x81, hi: 0x82},
-	{value: 0x8132, lo: 0x84, hi: 0x84},
-	{value: 0x812d, lo: 0x85, hi: 0x85},
-	{value: 0x810d, lo: 0x87, hi: 0x87},
-	// Block 0x8, offset 0x2f
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x8132, lo: 0x90, hi: 0x97},
-	{value: 0x8119, lo: 0x98, hi: 0x98},
-	{value: 0x811a, lo: 0x99, hi: 0x99},
-	{value: 0x811b, lo: 0x9a, hi: 0x9a},
-	{value: 0x3841, lo: 0xa2, hi: 0xa2},
-	{value: 0x3847, lo: 0xa3, hi: 0xa3},
-	{value: 0x3853, lo: 0xa4, hi: 0xa4},
-	{value: 0x384d, lo: 0xa5, hi: 0xa5},
-	{value: 0x3859, lo: 0xa6, hi: 0xa6},
-	{value: 0xa000, lo: 0xa7, hi: 0xa7},
-	// Block 0x9, offset 0x3a
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x386b, lo: 0x80, hi: 0x80},
-	{value: 0xa000, lo: 0x81, hi: 0x81},
-	{value: 0x385f, lo: 0x82, hi: 0x82},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0x3865, lo: 0x93, hi: 0x93},
-	{value: 0xa000, lo: 0x95, hi: 0x95},
-	{value: 0x8132, lo: 0x96, hi: 0x9c},
-	{value: 0x8132, lo: 0x9f, hi: 0xa2},
-	{value: 0x812d, lo: 0xa3, hi: 0xa3},
-	{value: 0x8132, lo: 0xa4, hi: 0xa4},
-	{value: 0x8132, lo: 0xa7, hi: 0xa8},
-	{value: 0x812d, lo: 0xaa, hi: 0xaa},
-	{value: 0x8132, lo: 0xab, hi: 0xac},
-	{value: 0x812d, lo: 0xad, hi: 0xad},
-	// Block 0xa, offset 0x49
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x811f, lo: 0x91, hi: 0x91},
-	{value: 0x8132, lo: 0xb0, hi: 0xb0},
-	{value: 0x812d, lo: 0xb1, hi: 0xb1},
-	{value: 0x8132, lo: 0xb2, hi: 0xb3},
-	{value: 0x812d, lo: 0xb4, hi: 0xb4},
-	{value: 0x8132, lo: 0xb5, hi: 0xb6},
-	{value: 0x812d, lo: 0xb7, hi: 0xb9},
-	{value: 0x8132, lo: 0xba, hi: 0xba},
-	{value: 0x812d, lo: 0xbb, hi: 0xbc},
-	{value: 0x8132, lo: 0xbd, hi: 0xbd},
-	{value: 0x812d, lo: 0xbe, hi: 0xbe},
-	{value: 0x8132, lo: 0xbf, hi: 0xbf},
-	// Block 0xb, offset 0x56
-	{value: 0x0005, lo: 0x07},
-	{value: 0x8132, lo: 0x80, hi: 0x80},
-	{value: 0x8132, lo: 0x81, hi: 0x81},
-	{value: 0x812d, lo: 0x82, hi: 0x83},
-	{value: 0x812d, lo: 0x84, hi: 0x85},
-	{value: 0x812d, lo: 0x86, hi: 0x87},
-	{value: 0x812d, lo: 0x88, hi: 0x89},
-	{value: 0x8132, lo: 0x8a, hi: 0x8a},
-	// Block 0xc, offset 0x5e
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8132, lo: 0xab, hi: 0xb1},
-	{value: 0x812d, lo: 0xb2, hi: 0xb2},
-	{value: 0x8132, lo: 0xb3, hi: 0xb3},
-	// Block 0xd, offset 0x62
-	{value: 0x0000, lo: 0x04},
-	{value: 0x8132, lo: 0x96, hi: 0x99},
-	{value: 0x8132, lo: 0x9b, hi: 0xa3},
-	{value: 0x8132, lo: 0xa5, hi: 0xa7},
-	{value: 0x8132, lo: 0xa9, hi: 0xad},
-	// Block 0xe, offset 0x67
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0x99, hi: 0x9b},
-	// Block 0xf, offset 0x69
-	{value: 0x0000, lo: 0x10},
-	{value: 0x8132, lo: 0x94, hi: 0xa1},
-	{value: 0x812d, lo: 0xa3, hi: 0xa3},
-	{value: 0x8132, lo: 0xa4, hi: 0xa5},
-	{value: 0x812d, lo: 0xa6, hi: 0xa6},
-	{value: 0x8132, lo: 0xa7, hi: 0xa8},
-	{value: 0x812d, lo: 0xa9, hi: 0xa9},
-	{value: 0x8132, lo: 0xaa, hi: 0xac},
-	{value: 0x812d, lo: 0xad, hi: 0xaf},
-	{value: 0x8116, lo: 0xb0, hi: 0xb0},
-	{value: 0x8117, lo: 0xb1, hi: 0xb1},
-	{value: 0x8118, lo: 0xb2, hi: 0xb2},
-	{value: 0x8132, lo: 0xb3, hi: 0xb5},
-	{value: 0x812d, lo: 0xb6, hi: 0xb6},
-	{value: 0x8132, lo: 0xb7, hi: 0xb8},
-	{value: 0x812d, lo: 0xb9, hi: 0xba},
-	{value: 0x8132, lo: 0xbb, hi: 0xbf},
-	// Block 0x10, offset 0x7a
-	{value: 0x0000, lo: 0x07},
-	{value: 0xa000, lo: 0xa8, hi: 0xa8},
-	{value: 0x3ed8, lo: 0xa9, hi: 0xa9},
-	{value: 0xa000, lo: 0xb0, hi: 0xb0},
-	{value: 0x3ee0, lo: 0xb1, hi: 0xb1},
-	{value: 0xa000, lo: 0xb3, hi: 0xb3},
-	{value: 0x3ee8, lo: 0xb4, hi: 0xb4},
-	{value: 0x9902, lo: 0xbc, hi: 0xbc},
-	// Block 0x11, offset 0x82
-	{value: 0x0008, lo: 0x06},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x8132, lo: 0x91, hi: 0x91},
-	{value: 0x812d, lo: 0x92, hi: 0x92},
-	{value: 0x8132, lo: 0x93, hi: 0x93},
-	{value: 0x8132, lo: 0x94, hi: 0x94},
-	{value: 0x451c, lo: 0x98, hi: 0x9f},
-	// Block 0x12, offset 0x89
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8102, lo: 0xbc, hi: 0xbc},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x13, offset 0x8c
-	{value: 0x0008, lo: 0x06},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0x2c9e, lo: 0x8b, hi: 0x8c},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	{value: 0x455c, lo: 0x9c, hi: 0x9d},
-	{value: 0x456c, lo: 0x9f, hi: 0x9f},
-	// Block 0x14, offset 0x93
-	{value: 0x0000, lo: 0x03},
-	{value: 0x4594, lo: 0xb3, hi: 0xb3},
-	{value: 0x459c, lo: 0xb6, hi: 0xb6},
-	{value: 0x8102, lo: 0xbc, hi: 0xbc},
-	// Block 0x15, offset 0x97
-	{value: 0x0008, lo: 0x03},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x4574, lo: 0x99, hi: 0x9b},
-	{value: 0x458c, lo: 0x9e, hi: 0x9e},
-	// Block 0x16, offset 0x9b
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8102, lo: 0xbc, hi: 0xbc},
-	// Block 0x17, offset 0x9d
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	// Block 0x18, offset 0x9f
-	{value: 0x0000, lo: 0x08},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0x2cb6, lo: 0x88, hi: 0x88},
-	{value: 0x2cae, lo: 0x8b, hi: 0x8b},
-	{value: 0x2cbe, lo: 0x8c, hi: 0x8c},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x96, hi: 0x97},
-	{value: 0x45a4, lo: 0x9c, hi: 0x9c},
-	{value: 0x45ac, lo: 0x9d, hi: 0x9d},
-	// Block 0x19, offset 0xa8
-	{value: 0x0000, lo: 0x03},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0x2cc6, lo: 0x94, hi: 0x94},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x1a, offset 0xac
-	{value: 0x0000, lo: 0x06},
-	{value: 0xa000, lo: 0x86, hi: 0x87},
-	{value: 0x2cce, lo: 0x8a, hi: 0x8a},
-	{value: 0x2cde, lo: 0x8b, hi: 0x8b},
-	{value: 0x2cd6, lo: 0x8c, hi: 0x8c},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	// Block 0x1b, offset 0xb3
-	{value: 0x1801, lo: 0x04},
-	{value: 0xa000, lo: 0x86, hi: 0x86},
-	{value: 0x3ef0, lo: 0x88, hi: 0x88},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x8120, lo: 0x95, hi: 0x96},
-	// Block 0x1c, offset 0xb8
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8102, lo: 0xbc, hi: 0xbc},
-	{value: 0xa000, lo: 0xbf, hi: 0xbf},
-	// Block 0x1d, offset 0xbb
-	{value: 0x0000, lo: 0x09},
-	{value: 0x2ce6, lo: 0x80, hi: 0x80},
-	{value: 0x9900, lo: 0x82, hi: 0x82},
-	{value: 0xa000, lo: 0x86, hi: 0x86},
-	{value: 0x2cee, lo: 0x87, hi: 0x87},
-	{value: 0x2cf6, lo: 0x88, hi: 0x88},
-	{value: 0x2f50, lo: 0x8a, hi: 0x8a},
-	{value: 0x2dd8, lo: 0x8b, hi: 0x8b},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x95, hi: 0x96},
-	// Block 0x1e, offset 0xc5
-	{value: 0x0000, lo: 0x01},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x1f, offset 0xc7
-	{value: 0x0000, lo: 0x06},
-	{value: 0xa000, lo: 0x86, hi: 0x87},
-	{value: 0x2cfe, lo: 0x8a, hi: 0x8a},
-	{value: 0x2d0e, lo: 0x8b, hi: 0x8b},
-	{value: 0x2d06, lo: 0x8c, hi: 0x8c},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	// Block 0x20, offset 0xce
-	{value: 0x6bea, lo: 0x07},
-	{value: 0x9904, lo: 0x8a, hi: 0x8a},
-	{value: 0x9900, lo: 0x8f, hi: 0x8f},
-	{value: 0xa000, lo: 0x99, hi: 0x99},
-	{value: 0x3ef8, lo: 0x9a, hi: 0x9a},
-	{value: 0x2f58, lo: 0x9c, hi: 0x9c},
-	{value: 0x2de3, lo: 0x9d, hi: 0x9d},
-	{value: 0x2d16, lo: 0x9e, hi: 0x9f},
-	// Block 0x21, offset 0xd6
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8122, lo: 0xb8, hi: 0xb9},
-	{value: 0x8104, lo: 0xba, hi: 0xba},
-	// Block 0x22, offset 0xd9
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8123, lo: 0x88, hi: 0x8b},
-	// Block 0x23, offset 0xdb
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8124, lo: 0xb8, hi: 0xb9},
-	// Block 0x24, offset 0xdd
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8125, lo: 0x88, hi: 0x8b},
-	// Block 0x25, offset 0xdf
-	{value: 0x0000, lo: 0x04},
-	{value: 0x812d, lo: 0x98, hi: 0x99},
-	{value: 0x812d, lo: 0xb5, hi: 0xb5},
-	{value: 0x812d, lo: 0xb7, hi: 0xb7},
-	{value: 0x812b, lo: 0xb9, hi: 0xb9},
-	// Block 0x26, offset 0xe4
-	{value: 0x0000, lo: 0x10},
-	{value: 0x2644, lo: 0x83, hi: 0x83},
-	{value: 0x264b, lo: 0x8d, hi: 0x8d},
-	{value: 0x2652, lo: 0x92, hi: 0x92},
-	{value: 0x2659, lo: 0x97, hi: 0x97},
-	{value: 0x2660, lo: 0x9c, hi: 0x9c},
-	{value: 0x263d, lo: 0xa9, hi: 0xa9},
-	{value: 0x8126, lo: 0xb1, hi: 0xb1},
-	{value: 0x8127, lo: 0xb2, hi: 0xb2},
-	{value: 0x4a84, lo: 0xb3, hi: 0xb3},
-	{value: 0x8128, lo: 0xb4, hi: 0xb4},
-	{value: 0x4a8d, lo: 0xb5, hi: 0xb5},
-	{value: 0x45b4, lo: 0xb6, hi: 0xb6},
-	{value: 0x8200, lo: 0xb7, hi: 0xb7},
-	{value: 0x45bc, lo: 0xb8, hi: 0xb8},
-	{value: 0x8200, lo: 0xb9, hi: 0xb9},
-	{value: 0x8127, lo: 0xba, hi: 0xbd},
-	// Block 0x27, offset 0xf5
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x8127, lo: 0x80, hi: 0x80},
-	{value: 0x4a96, lo: 0x81, hi: 0x81},
-	{value: 0x8132, lo: 0x82, hi: 0x83},
-	{value: 0x8104, lo: 0x84, hi: 0x84},
-	{value: 0x8132, lo: 0x86, hi: 0x87},
-	{value: 0x266e, lo: 0x93, hi: 0x93},
-	{value: 0x2675, lo: 0x9d, hi: 0x9d},
-	{value: 0x267c, lo: 0xa2, hi: 0xa2},
-	{value: 0x2683, lo: 0xa7, hi: 0xa7},
-	{value: 0x268a, lo: 0xac, hi: 0xac},
-	{value: 0x2667, lo: 0xb9, hi: 0xb9},
-	// Block 0x28, offset 0x101
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0x86, hi: 0x86},
-	// Block 0x29, offset 0x103
-	{value: 0x0000, lo: 0x05},
-	{value: 0xa000, lo: 0xa5, hi: 0xa5},
-	{value: 0x2d1e, lo: 0xa6, hi: 0xa6},
-	{value: 0x9900, lo: 0xae, hi: 0xae},
-	{value: 0x8102, lo: 0xb7, hi: 0xb7},
-	{value: 0x8104, lo: 0xb9, hi: 0xba},
-	// Block 0x2a, offset 0x109
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0x8d, hi: 0x8d},
-	// Block 0x2b, offset 0x10b
-	{value: 0x0000, lo: 0x01},
-	{value: 0xa000, lo: 0x80, hi: 0x92},
-	// Block 0x2c, offset 0x10d
-	{value: 0x0000, lo: 0x01},
-	{value: 0xb900, lo: 0xa1, hi: 0xb5},
-	// Block 0x2d, offset 0x10f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x9900, lo: 0xa8, hi: 0xbf},
-	// Block 0x2e, offset 0x111
-	{value: 0x0000, lo: 0x01},
-	{value: 0x9900, lo: 0x80, hi: 0x82},
-	// Block 0x2f, offset 0x113
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0x9d, hi: 0x9f},
-	// Block 0x30, offset 0x115
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x94, hi: 0x94},
-	{value: 0x8104, lo: 0xb4, hi: 0xb4},
-	// Block 0x31, offset 0x118
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x92, hi: 0x92},
-	{value: 0x8132, lo: 0x9d, hi: 0x9d},
-	// Block 0x32, offset 0x11b
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8131, lo: 0xa9, hi: 0xa9},
-	// Block 0x33, offset 0x11d
-	{value: 0x0004, lo: 0x02},
-	{value: 0x812e, lo: 0xb9, hi: 0xba},
-	{value: 0x812d, lo: 0xbb, hi: 0xbb},
-	// Block 0x34, offset 0x120
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8132, lo: 0x97, hi: 0x97},
-	{value: 0x812d, lo: 0x98, hi: 0x98},
-	// Block 0x35, offset 0x123
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8104, lo: 0xa0, hi: 0xa0},
-	{value: 0x8132, lo: 0xb5, hi: 0xbc},
-	{value: 0x812d, lo: 0xbf, hi: 0xbf},
-	// Block 0x36, offset 0x127
-	{value: 0x0000, lo: 0x04},
-	{value: 0x8132, lo: 0xb0, hi: 0xb4},
-	{value: 0x812d, lo: 0xb5, hi: 0xba},
-	{value: 0x8132, lo: 0xbb, hi: 0xbc},
-	{value: 0x812d, lo: 0xbd, hi: 0xbd},
-	// Block 0x37, offset 0x12c
-	{value: 0x0000, lo: 0x08},
-	{value: 0x2d66, lo: 0x80, hi: 0x80},
-	{value: 0x2d6e, lo: 0x81, hi: 0x81},
-	{value: 0xa000, lo: 0x82, hi: 0x82},
-	{value: 0x2d76, lo: 0x83, hi: 0x83},
-	{value: 0x8104, lo: 0x84, hi: 0x84},
-	{value: 0x8132, lo: 0xab, hi: 0xab},
-	{value: 0x812d, lo: 0xac, hi: 0xac},
-	{value: 0x8132, lo: 0xad, hi: 0xb3},
-	// Block 0x38, offset 0x135
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0xaa, hi: 0xab},
-	// Block 0x39, offset 0x137
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8102, lo: 0xa6, hi: 0xa6},
-	{value: 0x8104, lo: 0xb2, hi: 0xb3},
-	// Block 0x3a, offset 0x13a
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8102, lo: 0xb7, hi: 0xb7},
-	// Block 0x3b, offset 0x13c
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x8132, lo: 0x90, hi: 0x92},
-	{value: 0x8101, lo: 0x94, hi: 0x94},
-	{value: 0x812d, lo: 0x95, hi: 0x99},
-	{value: 0x8132, lo: 0x9a, hi: 0x9b},
-	{value: 0x812d, lo: 0x9c, hi: 0x9f},
-	{value: 0x8132, lo: 0xa0, hi: 0xa0},
-	{value: 0x8101, lo: 0xa2, hi: 0xa8},
-	{value: 0x812d, lo: 0xad, hi: 0xad},
-	{value: 0x8132, lo: 0xb4, hi: 0xb4},
-	{value: 0x8132, lo: 0xb8, hi: 0xb9},
-	// Block 0x3c, offset 0x147
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x8132, lo: 0x80, hi: 0x81},
-	{value: 0x812d, lo: 0x82, hi: 0x82},
-	{value: 0x8132, lo: 0x83, hi: 0x89},
-	{value: 0x812d, lo: 0x8a, hi: 0x8a},
-	{value: 0x8132, lo: 0x8b, hi: 0x8c},
-	{value: 0x8135, lo: 0x8d, hi: 0x8d},
-	{value: 0x812a, lo: 0x8e, hi: 0x8e},
-	{value: 0x812d, lo: 0x8f, hi: 0x8f},
-	{value: 0x8129, lo: 0x90, hi: 0x90},
-	{value: 0x8132, lo: 0x91, hi: 0xb5},
-	{value: 0x8132, lo: 0xbb, hi: 0xbb},
-	{value: 0x8134, lo: 0xbc, hi: 0xbc},
-	{value: 0x812d, lo: 0xbd, hi: 0xbd},
-	{value: 0x8132, lo: 0xbe, hi: 0xbe},
-	{value: 0x812d, lo: 0xbf, hi: 0xbf},
-	// Block 0x3d, offset 0x157
-	{value: 0x0004, lo: 0x03},
-	{value: 0x0433, lo: 0x80, hi: 0x81},
-	{value: 0x8100, lo: 0x97, hi: 0x97},
-	{value: 0x8100, lo: 0xbe, hi: 0xbe},
-	// Block 0x3e, offset 0x15b
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x8132, lo: 0x90, hi: 0x91},
-	{value: 0x8101, lo: 0x92, hi: 0x93},
-	{value: 0x8132, lo: 0x94, hi: 0x97},
-	{value: 0x8101, lo: 0x98, hi: 0x9a},
-	{value: 0x8132, lo: 0x9b, hi: 0x9c},
-	{value: 0x8132, lo: 0xa1, hi: 0xa1},
-	{value: 0x8101, lo: 0xa5, hi: 0xa6},
-	{value: 0x8132, lo: 0xa7, hi: 0xa7},
-	{value: 0x812d, lo: 0xa8, hi: 0xa8},
-	{value: 0x8132, lo: 0xa9, hi: 0xa9},
-	{value: 0x8101, lo: 0xaa, hi: 0xab},
-	{value: 0x812d, lo: 0xac, hi: 0xaf},
-	{value: 0x8132, lo: 0xb0, hi: 0xb0},
-	// Block 0x3f, offset 0x169
-	{value: 0x427b, lo: 0x02},
-	{value: 0x01b8, lo: 0xa6, hi: 0xa6},
-	{value: 0x0057, lo: 0xaa, hi: 0xab},
-	// Block 0x40, offset 0x16c
-	{value: 0x0007, lo: 0x05},
-	{value: 0xa000, lo: 0x90, hi: 0x90},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0xa000, lo: 0x94, hi: 0x94},
-	{value: 0x3bb9, lo: 0x9a, hi: 0x9b},
-	{value: 0x3bc7, lo: 0xae, hi: 0xae},
-	// Block 0x41, offset 0x172
-	{value: 0x000e, lo: 0x05},
-	{value: 0x3bce, lo: 0x8d, hi: 0x8e},
-	{value: 0x3bd5, lo: 0x8f, hi: 0x8f},
-	{value: 0xa000, lo: 0x90, hi: 0x90},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0xa000, lo: 0x94, hi: 0x94},
-	// Block 0x42, offset 0x178
-	{value: 0x6408, lo: 0x0a},
-	{value: 0xa000, lo: 0x83, hi: 0x83},
-	{value: 0x3be3, lo: 0x84, hi: 0x84},
-	{value: 0xa000, lo: 0x88, hi: 0x88},
-	{value: 0x3bea, lo: 0x89, hi: 0x89},
-	{value: 0xa000, lo: 0x8b, hi: 0x8b},
-	{value: 0x3bf1, lo: 0x8c, hi: 0x8c},
-	{value: 0xa000, lo: 0xa3, hi: 0xa3},
-	{value: 0x3bf8, lo: 0xa4, hi: 0xa5},
-	{value: 0x3bff, lo: 0xa6, hi: 0xa6},
-	{value: 0xa000, lo: 0xbc, hi: 0xbc},
-	// Block 0x43, offset 0x183
-	{value: 0x0007, lo: 0x03},
-	{value: 0x3c68, lo: 0xa0, hi: 0xa1},
-	{value: 0x3c92, lo: 0xa2, hi: 0xa3},
-	{value: 0x3cbc, lo: 0xaa, hi: 0xad},
-	// Block 0x44, offset 0x187
-	{value: 0x0004, lo: 0x01},
-	{value: 0x048b, lo: 0xa9, hi: 0xaa},
-	// Block 0x45, offset 0x189
-	{value: 0x0000, lo: 0x01},
-	{value: 0x44dd, lo: 0x9c, hi: 0x9c},
-	// Block 0x46, offset 0x18b
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0xaf, hi: 0xb1},
-	// Block 0x47, offset 0x18d
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x48, offset 0x18f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0xa0, hi: 0xbf},
-	// Block 0x49, offset 0x191
-	{value: 0x0000, lo: 0x05},
-	{value: 0x812c, lo: 0xaa, hi: 0xaa},
-	{value: 0x8131, lo: 0xab, hi: 0xab},
-	{value: 0x8133, lo: 0xac, hi: 0xac},
-	{value: 0x812e, lo: 0xad, hi: 0xad},
-	{value: 0x812f, lo: 0xae, hi: 0xaf},
-	// Block 0x4a, offset 0x197
-	{value: 0x0000, lo: 0x03},
-	{value: 0x4a9f, lo: 0xb3, hi: 0xb3},
-	{value: 0x4a9f, lo: 0xb5, hi: 0xb6},
-	{value: 0x4a9f, lo: 0xba, hi: 0xbf},
-	// Block 0x4b, offset 0x19b
-	{value: 0x0000, lo: 0x01},
-	{value: 0x4a9f, lo: 0x8f, hi: 0xa3},
-	// Block 0x4c, offset 0x19d
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0xae, hi: 0xbe},
-	// Block 0x4d, offset 0x19f
-	{value: 0x0000, lo: 0x07},
-	{value: 0x8100, lo: 0x84, hi: 0x84},
-	{value: 0x8100, lo: 0x87, hi: 0x87},
-	{value: 0x8100, lo: 0x90, hi: 0x90},
-	{value: 0x8100, lo: 0x9e, hi: 0x9e},
-	{value: 0x8100, lo: 0xa1, hi: 0xa1},
-	{value: 0x8100, lo: 0xb2, hi: 0xb2},
-	{value: 0x8100, lo: 0xbb, hi: 0xbb},
-	// Block 0x4e, offset 0x1a7
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8100, lo: 0x80, hi: 0x80},
-	{value: 0x8100, lo: 0x8b, hi: 0x8b},
-	{value: 0x8100, lo: 0x8e, hi: 0x8e},
-	// Block 0x4f, offset 0x1ab
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8132, lo: 0xaf, hi: 0xaf},
-	{value: 0x8132, lo: 0xb4, hi: 0xbd},
-	// Block 0x50, offset 0x1ae
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0x9e, hi: 0x9f},
-	// Block 0x51, offset 0x1b0
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0xb0, hi: 0xb1},
-	// Block 0x52, offset 0x1b2
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0x86, hi: 0x86},
-	// Block 0x53, offset 0x1b4
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x84, hi: 0x84},
-	{value: 0x8132, lo: 0xa0, hi: 0xb1},
-	// Block 0x54, offset 0x1b7
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0xab, hi: 0xad},
-	// Block 0x55, offset 0x1b9
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0x93, hi: 0x93},
-	// Block 0x56, offset 0x1bb
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8102, lo: 0xb3, hi: 0xb3},
-	// Block 0x57, offset 0x1bd
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0x80, hi: 0x80},
-	// Block 0x58, offset 0x1bf
-	{value: 0x0000, lo: 0x05},
-	{value: 0x8132, lo: 0xb0, hi: 0xb0},
-	{value: 0x8132, lo: 0xb2, hi: 0xb3},
-	{value: 0x812d, lo: 0xb4, hi: 0xb4},
-	{value: 0x8132, lo: 0xb7, hi: 0xb8},
-	{value: 0x8132, lo: 0xbe, hi: 0xbf},
-	// Block 0x59, offset 0x1c5
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8132, lo: 0x81, hi: 0x81},
-	{value: 0x8104, lo: 0xb6, hi: 0xb6},
-	// Block 0x5a, offset 0x1c8
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0xad, hi: 0xad},
-	// Block 0x5b, offset 0x1ca
-	{value: 0x0000, lo: 0x06},
-	{value: 0xe500, lo: 0x80, hi: 0x80},
-	{value: 0xc600, lo: 0x81, hi: 0x9b},
-	{value: 0xe500, lo: 0x9c, hi: 0x9c},
-	{value: 0xc600, lo: 0x9d, hi: 0xb7},
-	{value: 0xe500, lo: 0xb8, hi: 0xb8},
-	{value: 0xc600, lo: 0xb9, hi: 0xbf},
-	// Block 0x5c, offset 0x1d1
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x93},
-	{value: 0xe500, lo: 0x94, hi: 0x94},
-	{value: 0xc600, lo: 0x95, hi: 0xaf},
-	{value: 0xe500, lo: 0xb0, hi: 0xb0},
-	{value: 0xc600, lo: 0xb1, hi: 0xbf},
-	// Block 0x5d, offset 0x1d7
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x8b},
-	{value: 0xe500, lo: 0x8c, hi: 0x8c},
-	{value: 0xc600, lo: 0x8d, hi: 0xa7},
-	{value: 0xe500, lo: 0xa8, hi: 0xa8},
-	{value: 0xc600, lo: 0xa9, hi: 0xbf},
-	// Block 0x5e, offset 0x1dd
-	{value: 0x0000, lo: 0x07},
-	{value: 0xc600, lo: 0x80, hi: 0x83},
-	{value: 0xe500, lo: 0x84, hi: 0x84},
-	{value: 0xc600, lo: 0x85, hi: 0x9f},
-	{value: 0xe500, lo: 0xa0, hi: 0xa0},
-	{value: 0xc600, lo: 0xa1, hi: 0xbb},
-	{value: 0xe500, lo: 0xbc, hi: 0xbc},
-	{value: 0xc600, lo: 0xbd, hi: 0xbf},
-	// Block 0x5f, offset 0x1e5
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x97},
-	{value: 0xe500, lo: 0x98, hi: 0x98},
-	{value: 0xc600, lo: 0x99, hi: 0xb3},
-	{value: 0xe500, lo: 0xb4, hi: 0xb4},
-	{value: 0xc600, lo: 0xb5, hi: 0xbf},
-	// Block 0x60, offset 0x1eb
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x8f},
-	{value: 0xe500, lo: 0x90, hi: 0x90},
-	{value: 0xc600, lo: 0x91, hi: 0xab},
-	{value: 0xe500, lo: 0xac, hi: 0xac},
-	{value: 0xc600, lo: 0xad, hi: 0xbf},
-	// Block 0x61, offset 0x1f1
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x87},
-	{value: 0xe500, lo: 0x88, hi: 0x88},
-	{value: 0xc600, lo: 0x89, hi: 0xa3},
-	{value: 0xe500, lo: 0xa4, hi: 0xa4},
-	{value: 0xc600, lo: 0xa5, hi: 0xbf},
-	// Block 0x62, offset 0x1f7
-	{value: 0x0000, lo: 0x03},
-	{value: 0xc600, lo: 0x80, hi: 0x87},
-	{value: 0xe500, lo: 0x88, hi: 0x88},
-	{value: 0xc600, lo: 0x89, hi: 0xa3},
-	// Block 0x63, offset 0x1fb
-	{value: 0x0006, lo: 0x0d},
-	{value: 0x4390, lo: 0x9d, hi: 0x9d},
-	{value: 0x8115, lo: 0x9e, hi: 0x9e},
-	{value: 0x4402, lo: 0x9f, hi: 0x9f},
-	{value: 0x43f0, lo: 0xaa, hi: 0xab},
-	{value: 0x44f4, lo: 0xac, hi: 0xac},
-	{value: 0x44fc, lo: 0xad, hi: 0xad},
-	{value: 0x4348, lo: 0xae, hi: 0xb1},
-	{value: 0x4366, lo: 0xb2, hi: 0xb4},
-	{value: 0x437e, lo: 0xb5, hi: 0xb6},
-	{value: 0x438a, lo: 0xb8, hi: 0xb8},
-	{value: 0x4396, lo: 0xb9, hi: 0xbb},
-	{value: 0x43ae, lo: 0xbc, hi: 0xbc},
-	{value: 0x43b4, lo: 0xbe, hi: 0xbe},
-	// Block 0x64, offset 0x209
-	{value: 0x0006, lo: 0x08},
-	{value: 0x43ba, lo: 0x80, hi: 0x81},
-	{value: 0x43c6, lo: 0x83, hi: 0x84},
-	{value: 0x43d8, lo: 0x86, hi: 0x89},
-	{value: 0x43fc, lo: 0x8a, hi: 0x8a},
-	{value: 0x4378, lo: 0x8b, hi: 0x8b},
-	{value: 0x4360, lo: 0x8c, hi: 0x8c},
-	{value: 0x43a8, lo: 0x8d, hi: 0x8d},
-	{value: 0x43d2, lo: 0x8e, hi: 0x8e},
-	// Block 0x65, offset 0x212
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8100, lo: 0xa4, hi: 0xa5},
-	{value: 0x8100, lo: 0xb0, hi: 0xb1},
-	// Block 0x66, offset 0x215
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8100, lo: 0x9b, hi: 0x9d},
-	{value: 0x8200, lo: 0x9e, hi: 0xa3},
-	// Block 0x67, offset 0x218
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0x90, hi: 0x90},
-	// Block 0x68, offset 0x21a
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8100, lo: 0x99, hi: 0x99},
-	{value: 0x8200, lo: 0xb2, hi: 0xb4},
-	// Block 0x69, offset 0x21d
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0xbc, hi: 0xbd},
-	// Block 0x6a, offset 0x21f
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8132, lo: 0xa0, hi: 0xa6},
-	{value: 0x812d, lo: 0xa7, hi: 0xad},
-	{value: 0x8132, lo: 0xae, hi: 0xaf},
-	// Block 0x6b, offset 0x223
-	{value: 0x0000, lo: 0x04},
-	{value: 0x8100, lo: 0x89, hi: 0x8c},
-	{value: 0x8100, lo: 0xb0, hi: 0xb2},
-	{value: 0x8100, lo: 0xb4, hi: 0xb4},
-	{value: 0x8100, lo: 0xb6, hi: 0xbf},
-	// Block 0x6c, offset 0x228
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0x81, hi: 0x8c},
-	// Block 0x6d, offset 0x22a
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0xb5, hi: 0xba},
-	// Block 0x6e, offset 0x22c
-	{value: 0x0000, lo: 0x04},
-	{value: 0x4a9f, lo: 0x9e, hi: 0x9f},
-	{value: 0x4a9f, lo: 0xa3, hi: 0xa3},
-	{value: 0x4a9f, lo: 0xa5, hi: 0xa6},
-	{value: 0x4a9f, lo: 0xaa, hi: 0xaf},
-	// Block 0x6f, offset 0x231
-	{value: 0x0000, lo: 0x05},
-	{value: 0x4a9f, lo: 0x82, hi: 0x87},
-	{value: 0x4a9f, lo: 0x8a, hi: 0x8f},
-	{value: 0x4a9f, lo: 0x92, hi: 0x97},
-	{value: 0x4a9f, lo: 0x9a, hi: 0x9c},
-	{value: 0x8100, lo: 0xa3, hi: 0xa3},
-	// Block 0x70, offset 0x237
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0xbd, hi: 0xbd},
-	// Block 0x71, offset 0x239
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0xa0, hi: 0xa0},
-	// Block 0x72, offset 0x23b
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0xb6, hi: 0xba},
-	// Block 0x73, offset 0x23d
-	{value: 0x002c, lo: 0x05},
-	{value: 0x812d, lo: 0x8d, hi: 0x8d},
-	{value: 0x8132, lo: 0x8f, hi: 0x8f},
-	{value: 0x8132, lo: 0xb8, hi: 0xb8},
-	{value: 0x8101, lo: 0xb9, hi: 0xba},
-	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x74, offset 0x243
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8132, lo: 0xa5, hi: 0xa5},
-	{value: 0x812d, lo: 0xa6, hi: 0xa6},
-	// Block 0x75, offset 0x246
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x86, hi: 0x86},
-	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x76, offset 0x249
-	{value: 0x17fe, lo: 0x07},
-	{value: 0xa000, lo: 0x99, hi: 0x99},
-	{value: 0x4238, lo: 0x9a, hi: 0x9a},
-	{value: 0xa000, lo: 0x9b, hi: 0x9b},
-	{value: 0x4242, lo: 0x9c, hi: 0x9c},
-	{value: 0xa000, lo: 0xa5, hi: 0xa5},
-	{value: 0x424c, lo: 0xab, hi: 0xab},
-	{value: 0x8104, lo: 0xb9, hi: 0xba},
-	// Block 0x77, offset 0x251
-	{value: 0x0000, lo: 0x06},
-	{value: 0x8132, lo: 0x80, hi: 0x82},
-	{value: 0x9900, lo: 0xa7, hi: 0xa7},
-	{value: 0x2d7e, lo: 0xae, hi: 0xae},
-	{value: 0x2d88, lo: 0xaf, hi: 0xaf},
-	{value: 0xa000, lo: 0xb1, hi: 0xb2},
-	{value: 0x8104, lo: 0xb3, hi: 0xb4},
-	// Block 0x78, offset 0x258
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x80, hi: 0x80},
-	{value: 0x8102, lo: 0x8a, hi: 0x8a},
-	// Block 0x79, offset 0x25b
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0xb5, hi: 0xb5},
-	{value: 0x8102, lo: 0xb6, hi: 0xb6},
-	// Block 0x7a, offset 0x25e
-	{value: 0x0002, lo: 0x01},
-	{value: 0x8102, lo: 0xa9, hi: 0xaa},
-	// Block 0x7b, offset 0x260
-	{value: 0x0000, lo: 0x07},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0x2d92, lo: 0x8b, hi: 0x8b},
-	{value: 0x2d9c, lo: 0x8c, hi: 0x8c},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	{value: 0x8132, lo: 0xa6, hi: 0xac},
-	{value: 0x8132, lo: 0xb0, hi: 0xb4},
-	// Block 0x7c, offset 0x268
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x82, hi: 0x82},
-	{value: 0x8102, lo: 0x86, hi: 0x86},
-	// Block 0x7d, offset 0x26b
-	{value: 0x6b5a, lo: 0x06},
-	{value: 0x9900, lo: 0xb0, hi: 0xb0},
-	{value: 0xa000, lo: 0xb9, hi: 0xb9},
-	{value: 0x9900, lo: 0xba, hi: 0xba},
-	{value: 0x2db0, lo: 0xbb, hi: 0xbb},
-	{value: 0x2da6, lo: 0xbc, hi: 0xbd},
-	{value: 0x2dba, lo: 0xbe, hi: 0xbe},
-	// Block 0x7e, offset 0x272
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x82, hi: 0x82},
-	{value: 0x8102, lo: 0x83, hi: 0x83},
-	// Block 0x7f, offset 0x275
-	{value: 0x0000, lo: 0x05},
-	{value: 0x9900, lo: 0xaf, hi: 0xaf},
-	{value: 0xa000, lo: 0xb8, hi: 0xb9},
-	{value: 0x2dc4, lo: 0xba, hi: 0xba},
-	{value: 0x2dce, lo: 0xbb, hi: 0xbb},
-	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x80, offset 0x27b
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8102, lo: 0x80, hi: 0x80},
-	// Block 0x81, offset 0x27d
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0xb6, hi: 0xb6},
-	{value: 0x8102, lo: 0xb7, hi: 0xb7},
-	// Block 0x82, offset 0x280
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0xab, hi: 0xab},
-	// Block 0x83, offset 0x282
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8101, lo: 0xb0, hi: 0xb4},
-	// Block 0x84, offset 0x284
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0xb0, hi: 0xb6},
-	// Block 0x85, offset 0x286
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8101, lo: 0x9e, hi: 0x9e},
-	// Block 0x86, offset 0x288
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x45cc, lo: 0x9e, hi: 0x9e},
-	{value: 0x45d6, lo: 0x9f, hi: 0x9f},
-	{value: 0x460a, lo: 0xa0, hi: 0xa0},
-	{value: 0x4618, lo: 0xa1, hi: 0xa1},
-	{value: 0x4626, lo: 0xa2, hi: 0xa2},
-	{value: 0x4634, lo: 0xa3, hi: 0xa3},
-	{value: 0x4642, lo: 0xa4, hi: 0xa4},
-	{value: 0x812b, lo: 0xa5, hi: 0xa6},
-	{value: 0x8101, lo: 0xa7, hi: 0xa9},
-	{value: 0x8130, lo: 0xad, hi: 0xad},
-	{value: 0x812b, lo: 0xae, hi: 0xb2},
-	{value: 0x812d, lo: 0xbb, hi: 0xbf},
-	// Block 0x87, offset 0x295
-	{value: 0x0000, lo: 0x09},
-	{value: 0x812d, lo: 0x80, hi: 0x82},
-	{value: 0x8132, lo: 0x85, hi: 0x89},
-	{value: 0x812d, lo: 0x8a, hi: 0x8b},
-	{value: 0x8132, lo: 0xaa, hi: 0xad},
-	{value: 0x45e0, lo: 0xbb, hi: 0xbb},
-	{value: 0x45ea, lo: 0xbc, hi: 0xbc},
-	{value: 0x4650, lo: 0xbd, hi: 0xbd},
-	{value: 0x466c, lo: 0xbe, hi: 0xbe},
-	{value: 0x465e, lo: 0xbf, hi: 0xbf},
-	// Block 0x88, offset 0x29f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x467a, lo: 0x80, hi: 0x80},
-	// Block 0x89, offset 0x2a1
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0x82, hi: 0x84},
-	// Block 0x8a, offset 0x2a3
-	{value: 0x0000, lo: 0x05},
-	{value: 0x8132, lo: 0x80, hi: 0x86},
-	{value: 0x8132, lo: 0x88, hi: 0x98},
-	{value: 0x8132, lo: 0x9b, hi: 0xa1},
-	{value: 0x8132, lo: 0xa3, hi: 0xa4},
-	{value: 0x8132, lo: 0xa6, hi: 0xaa},
-	// Block 0x8b, offset 0x2a9
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0x90, hi: 0x96},
-	// Block 0x8c, offset 0x2ab
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8132, lo: 0x84, hi: 0x89},
-	{value: 0x8102, lo: 0x8a, hi: 0x8a},
-	// Block 0x8d, offset 0x2ae
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8100, lo: 0x93, hi: 0x93},
-}
-
-// lookup returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *nfkcTrie) lookup(s []byte) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return nfkcValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := nfkcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := nfkcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfkcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := nfkcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfkcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = nfkcIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *nfkcTrie) lookupUnsafe(s []byte) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return nfkcValues[c0]
-	}
-	i := nfkcIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = nfkcIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = nfkcIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// lookupString returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *nfkcTrie) lookupString(s string) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return nfkcValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := nfkcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := nfkcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfkcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := nfkcIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = nfkcIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = nfkcIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *nfkcTrie) lookupStringUnsafe(s string) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return nfkcValues[c0]
-	}
-	i := nfkcIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = nfkcIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = nfkcIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// nfkcTrie. Total size: 16994 bytes (16.60 KiB). Checksum: c3ed54ee046f3c46.
-type nfkcTrie struct{}
-
-func newNfkcTrie(i int) *nfkcTrie {
-	return &nfkcTrie{}
-}
-
-// lookupValue determines the type of block n and looks up the value for b.
-func (t *nfkcTrie) lookupValue(n uint32, b byte) uint16 {
-	switch {
-	case n < 90:
-		return uint16(nfkcValues[n<<6+uint32(b)])
-	default:
-		n -= 90
-		return uint16(nfkcSparse.lookup(n, b))
-	}
-}
-
-// nfkcValues: 92 blocks, 5888 entries, 11776 bytes
-// The third block is the zero block.
-var nfkcValues = [5888]uint16{
-	// Block 0x0, offset 0x0
-	0x3c: 0xa000, 0x3d: 0xa000, 0x3e: 0xa000,
-	// Block 0x1, offset 0x40
-	0x41: 0xa000, 0x42: 0xa000, 0x43: 0xa000, 0x44: 0xa000, 0x45: 0xa000,
-	0x46: 0xa000, 0x47: 0xa000, 0x48: 0xa000, 0x49: 0xa000, 0x4a: 0xa000, 0x4b: 0xa000,
-	0x4c: 0xa000, 0x4d: 0xa000, 0x4e: 0xa000, 0x4f: 0xa000, 0x50: 0xa000,
-	0x52: 0xa000, 0x53: 0xa000, 0x54: 0xa000, 0x55: 0xa000, 0x56: 0xa000, 0x57: 0xa000,
-	0x58: 0xa000, 0x59: 0xa000, 0x5a: 0xa000,
-	0x61: 0xa000, 0x62: 0xa000, 0x63: 0xa000,
-	0x64: 0xa000, 0x65: 0xa000, 0x66: 0xa000, 0x67: 0xa000, 0x68: 0xa000, 0x69: 0xa000,
-	0x6a: 0xa000, 0x6b: 0xa000, 0x6c: 0xa000, 0x6d: 0xa000, 0x6e: 0xa000, 0x6f: 0xa000,
-	0x70: 0xa000, 0x72: 0xa000, 0x73: 0xa000, 0x74: 0xa000, 0x75: 0xa000,
-	0x76: 0xa000, 0x77: 0xa000, 0x78: 0xa000, 0x79: 0xa000, 0x7a: 0xa000,
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc0: 0x2f6f, 0xc1: 0x2f74, 0xc2: 0x4688, 0xc3: 0x2f79, 0xc4: 0x4697, 0xc5: 0x469c,
-	0xc6: 0xa000, 0xc7: 0x46a6, 0xc8: 0x2fe2, 0xc9: 0x2fe7, 0xca: 0x46ab, 0xcb: 0x2ffb,
-	0xcc: 0x306e, 0xcd: 0x3073, 0xce: 0x3078, 0xcf: 0x46bf, 0xd1: 0x3104,
-	0xd2: 0x3127, 0xd3: 0x312c, 0xd4: 0x46c9, 0xd5: 0x46ce, 0xd6: 0x46dd,
-	0xd8: 0xa000, 0xd9: 0x31b3, 0xda: 0x31b8, 0xdb: 0x31bd, 0xdc: 0x470f, 0xdd: 0x3235,
-	0xe0: 0x327b, 0xe1: 0x3280, 0xe2: 0x4719, 0xe3: 0x3285,
-	0xe4: 0x4728, 0xe5: 0x472d, 0xe6: 0xa000, 0xe7: 0x4737, 0xe8: 0x32ee, 0xe9: 0x32f3,
-	0xea: 0x473c, 0xeb: 0x3307, 0xec: 0x337f, 0xed: 0x3384, 0xee: 0x3389, 0xef: 0x4750,
-	0xf1: 0x3415, 0xf2: 0x3438, 0xf3: 0x343d, 0xf4: 0x475a, 0xf5: 0x475f,
-	0xf6: 0x476e, 0xf8: 0xa000, 0xf9: 0x34c9, 0xfa: 0x34ce, 0xfb: 0x34d3,
-	0xfc: 0x47a0, 0xfd: 0x3550, 0xff: 0x3569,
-	// Block 0x4, offset 0x100
-	0x100: 0x2f7e, 0x101: 0x328a, 0x102: 0x468d, 0x103: 0x471e, 0x104: 0x2f9c, 0x105: 0x32a8,
-	0x106: 0x2fb0, 0x107: 0x32bc, 0x108: 0x2fb5, 0x109: 0x32c1, 0x10a: 0x2fba, 0x10b: 0x32c6,
-	0x10c: 0x2fbf, 0x10d: 0x32cb, 0x10e: 0x2fc9, 0x10f: 0x32d5,
-	0x112: 0x46b0, 0x113: 0x4741, 0x114: 0x2ff1, 0x115: 0x32fd, 0x116: 0x2ff6, 0x117: 0x3302,
-	0x118: 0x3014, 0x119: 0x3320, 0x11a: 0x3005, 0x11b: 0x3311, 0x11c: 0x302d, 0x11d: 0x3339,
-	0x11e: 0x3037, 0x11f: 0x3343, 0x120: 0x303c, 0x121: 0x3348, 0x122: 0x3046, 0x123: 0x3352,
-	0x124: 0x304b, 0x125: 0x3357, 0x128: 0x307d, 0x129: 0x338e,
-	0x12a: 0x3082, 0x12b: 0x3393, 0x12c: 0x3087, 0x12d: 0x3398, 0x12e: 0x30aa, 0x12f: 0x33b6,
-	0x130: 0x308c, 0x132: 0x195d, 0x133: 0x19e7, 0x134: 0x30b4, 0x135: 0x33c0,
-	0x136: 0x30c8, 0x137: 0x33d9, 0x139: 0x30d2, 0x13a: 0x33e3, 0x13b: 0x30dc,
-	0x13c: 0x33ed, 0x13d: 0x30d7, 0x13e: 0x33e8, 0x13f: 0x1bac,
-	// Block 0x5, offset 0x140
-	0x140: 0x1c34, 0x143: 0x30ff, 0x144: 0x3410, 0x145: 0x3118,
-	0x146: 0x3429, 0x147: 0x310e, 0x148: 0x341f, 0x149: 0x1c5c,
-	0x14c: 0x46d3, 0x14d: 0x4764, 0x14e: 0x3131, 0x14f: 0x3442, 0x150: 0x313b, 0x151: 0x344c,
-	0x154: 0x3159, 0x155: 0x346a, 0x156: 0x3172, 0x157: 0x3483,
-	0x158: 0x3163, 0x159: 0x3474, 0x15a: 0x46f6, 0x15b: 0x4787, 0x15c: 0x317c, 0x15d: 0x348d,
-	0x15e: 0x318b, 0x15f: 0x349c, 0x160: 0x46fb, 0x161: 0x478c, 0x162: 0x31a4, 0x163: 0x34ba,
-	0x164: 0x3195, 0x165: 0x34ab, 0x168: 0x4705, 0x169: 0x4796,
-	0x16a: 0x470a, 0x16b: 0x479b, 0x16c: 0x31c2, 0x16d: 0x34d8, 0x16e: 0x31cc, 0x16f: 0x34e2,
-	0x170: 0x31d1, 0x171: 0x34e7, 0x172: 0x31ef, 0x173: 0x3505, 0x174: 0x3212, 0x175: 0x3528,
-	0x176: 0x323a, 0x177: 0x3555, 0x178: 0x324e, 0x179: 0x325d, 0x17a: 0x357d, 0x17b: 0x3267,
-	0x17c: 0x3587, 0x17d: 0x326c, 0x17e: 0x358c, 0x17f: 0x00a7,
-	// Block 0x6, offset 0x180
-	0x184: 0x2dee, 0x185: 0x2df4,
-	0x186: 0x2dfa, 0x187: 0x1972, 0x188: 0x1975, 0x189: 0x1a08, 0x18a: 0x1987, 0x18b: 0x198a,
-	0x18c: 0x1a3e, 0x18d: 0x2f88, 0x18e: 0x3294, 0x18f: 0x3096, 0x190: 0x33a2, 0x191: 0x3140,
-	0x192: 0x3451, 0x193: 0x31d6, 0x194: 0x34ec, 0x195: 0x39cf, 0x196: 0x3b5e, 0x197: 0x39c8,
-	0x198: 0x3b57, 0x199: 0x39d6, 0x19a: 0x3b65, 0x19b: 0x39c1, 0x19c: 0x3b50,
-	0x19e: 0x38b0, 0x19f: 0x3a3f, 0x1a0: 0x38a9, 0x1a1: 0x3a38, 0x1a2: 0x35b3, 0x1a3: 0x35c5,
-	0x1a6: 0x3041, 0x1a7: 0x334d, 0x1a8: 0x30be, 0x1a9: 0x33cf,
-	0x1aa: 0x46ec, 0x1ab: 0x477d, 0x1ac: 0x3990, 0x1ad: 0x3b1f, 0x1ae: 0x35d7, 0x1af: 0x35dd,
-	0x1b0: 0x33c5, 0x1b1: 0x1942, 0x1b2: 0x1945, 0x1b3: 0x19cf, 0x1b4: 0x3028, 0x1b5: 0x3334,
-	0x1b8: 0x30fa, 0x1b9: 0x340b, 0x1ba: 0x38b7, 0x1bb: 0x3a46,
-	0x1bc: 0x35ad, 0x1bd: 0x35bf, 0x1be: 0x35b9, 0x1bf: 0x35cb,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x2f8d, 0x1c1: 0x3299, 0x1c2: 0x2f92, 0x1c3: 0x329e, 0x1c4: 0x300a, 0x1c5: 0x3316,
-	0x1c6: 0x300f, 0x1c7: 0x331b, 0x1c8: 0x309b, 0x1c9: 0x33a7, 0x1ca: 0x30a0, 0x1cb: 0x33ac,
-	0x1cc: 0x3145, 0x1cd: 0x3456, 0x1ce: 0x314a, 0x1cf: 0x345b, 0x1d0: 0x3168, 0x1d1: 0x3479,
-	0x1d2: 0x316d, 0x1d3: 0x347e, 0x1d4: 0x31db, 0x1d5: 0x34f1, 0x1d6: 0x31e0, 0x1d7: 0x34f6,
-	0x1d8: 0x3186, 0x1d9: 0x3497, 0x1da: 0x319f, 0x1db: 0x34b5,
-	0x1de: 0x305a, 0x1df: 0x3366,
-	0x1e6: 0x4692, 0x1e7: 0x4723, 0x1e8: 0x46ba, 0x1e9: 0x474b,
-	0x1ea: 0x395f, 0x1eb: 0x3aee, 0x1ec: 0x393c, 0x1ed: 0x3acb, 0x1ee: 0x46d8, 0x1ef: 0x4769,
-	0x1f0: 0x3958, 0x1f1: 0x3ae7, 0x1f2: 0x3244, 0x1f3: 0x355f,
-	// Block 0x8, offset 0x200
-	0x200: 0x9932, 0x201: 0x9932, 0x202: 0x9932, 0x203: 0x9932, 0x204: 0x9932, 0x205: 0x8132,
-	0x206: 0x9932, 0x207: 0x9932, 0x208: 0x9932, 0x209: 0x9932, 0x20a: 0x9932, 0x20b: 0x9932,
-	0x20c: 0x9932, 0x20d: 0x8132, 0x20e: 0x8132, 0x20f: 0x9932, 0x210: 0x8132, 0x211: 0x9932,
-	0x212: 0x8132, 0x213: 0x9932, 0x214: 0x9932, 0x215: 0x8133, 0x216: 0x812d, 0x217: 0x812d,
-	0x218: 0x812d, 0x219: 0x812d, 0x21a: 0x8133, 0x21b: 0x992b, 0x21c: 0x812d, 0x21d: 0x812d,
-	0x21e: 0x812d, 0x21f: 0x812d, 0x220: 0x812d, 0x221: 0x8129, 0x222: 0x8129, 0x223: 0x992d,
-	0x224: 0x992d, 0x225: 0x992d, 0x226: 0x992d, 0x227: 0x9929, 0x228: 0x9929, 0x229: 0x812d,
-	0x22a: 0x812d, 0x22b: 0x812d, 0x22c: 0x812d, 0x22d: 0x992d, 0x22e: 0x992d, 0x22f: 0x812d,
-	0x230: 0x992d, 0x231: 0x992d, 0x232: 0x812d, 0x233: 0x812d, 0x234: 0x8101, 0x235: 0x8101,
-	0x236: 0x8101, 0x237: 0x8101, 0x238: 0x9901, 0x239: 0x812d, 0x23a: 0x812d, 0x23b: 0x812d,
-	0x23c: 0x812d, 0x23d: 0x8132, 0x23e: 0x8132, 0x23f: 0x8132,
-	// Block 0x9, offset 0x240
-	0x240: 0x49ae, 0x241: 0x49b3, 0x242: 0x9932, 0x243: 0x49b8, 0x244: 0x4a71, 0x245: 0x9936,
-	0x246: 0x8132, 0x247: 0x812d, 0x248: 0x812d, 0x249: 0x812d, 0x24a: 0x8132, 0x24b: 0x8132,
-	0x24c: 0x8132, 0x24d: 0x812d, 0x24e: 0x812d, 0x250: 0x8132, 0x251: 0x8132,
-	0x252: 0x8132, 0x253: 0x812d, 0x254: 0x812d, 0x255: 0x812d, 0x256: 0x812d, 0x257: 0x8132,
-	0x258: 0x8133, 0x259: 0x812d, 0x25a: 0x812d, 0x25b: 0x8132, 0x25c: 0x8134, 0x25d: 0x8135,
-	0x25e: 0x8135, 0x25f: 0x8134, 0x260: 0x8135, 0x261: 0x8135, 0x262: 0x8134, 0x263: 0x8132,
-	0x264: 0x8132, 0x265: 0x8132, 0x266: 0x8132, 0x267: 0x8132, 0x268: 0x8132, 0x269: 0x8132,
-	0x26a: 0x8132, 0x26b: 0x8132, 0x26c: 0x8132, 0x26d: 0x8132, 0x26e: 0x8132, 0x26f: 0x8132,
-	0x274: 0x0170,
-	0x27a: 0x42a5,
-	0x27e: 0x0037,
-	// Block 0xa, offset 0x280
-	0x284: 0x425a, 0x285: 0x447b,
-	0x286: 0x35e9, 0x287: 0x00ce, 0x288: 0x3607, 0x289: 0x3613, 0x28a: 0x3625,
-	0x28c: 0x3643, 0x28e: 0x3655, 0x28f: 0x3673, 0x290: 0x3e08, 0x291: 0xa000,
-	0x295: 0xa000, 0x297: 0xa000,
-	0x299: 0xa000,
-	0x29f: 0xa000, 0x2a1: 0xa000,
-	0x2a5: 0xa000, 0x2a9: 0xa000,
-	0x2aa: 0x3637, 0x2ab: 0x3667, 0x2ac: 0x47fe, 0x2ad: 0x3697, 0x2ae: 0x4828, 0x2af: 0x36a9,
-	0x2b0: 0x3e70, 0x2b1: 0xa000, 0x2b5: 0xa000,
-	0x2b7: 0xa000, 0x2b9: 0xa000,
-	0x2bf: 0xa000,
-	// Block 0xb, offset 0x2c0
-	0x2c1: 0xa000, 0x2c5: 0xa000,
-	0x2c9: 0xa000, 0x2ca: 0x4840, 0x2cb: 0x485e,
-	0x2cc: 0x36c7, 0x2cd: 0x36df, 0x2ce: 0x4876, 0x2d0: 0x01be, 0x2d1: 0x01d0,
-	0x2d2: 0x01ac, 0x2d3: 0x430c, 0x2d4: 0x4312, 0x2d5: 0x01fa, 0x2d6: 0x01e8,
-	0x2f0: 0x01d6, 0x2f1: 0x01eb, 0x2f2: 0x01ee, 0x2f4: 0x0188, 0x2f5: 0x01c7,
-	0x2f9: 0x01a6,
-	// Block 0xc, offset 0x300
-	0x300: 0x3721, 0x301: 0x372d, 0x303: 0x371b,
-	0x306: 0xa000, 0x307: 0x3709,
-	0x30c: 0x375d, 0x30d: 0x3745, 0x30e: 0x376f, 0x310: 0xa000,
-	0x313: 0xa000, 0x315: 0xa000, 0x316: 0xa000, 0x317: 0xa000,
-	0x318: 0xa000, 0x319: 0x3751, 0x31a: 0xa000,
-	0x31e: 0xa000, 0x323: 0xa000,
-	0x327: 0xa000,
-	0x32b: 0xa000, 0x32d: 0xa000,
-	0x330: 0xa000, 0x333: 0xa000, 0x335: 0xa000,
-	0x336: 0xa000, 0x337: 0xa000, 0x338: 0xa000, 0x339: 0x37d5, 0x33a: 0xa000,
-	0x33e: 0xa000,
-	// Block 0xd, offset 0x340
-	0x341: 0x3733, 0x342: 0x37b7,
-	0x350: 0x370f, 0x351: 0x3793,
-	0x352: 0x3715, 0x353: 0x3799, 0x356: 0x3727, 0x357: 0x37ab,
-	0x358: 0xa000, 0x359: 0xa000, 0x35a: 0x3829, 0x35b: 0x382f, 0x35c: 0x3739, 0x35d: 0x37bd,
-	0x35e: 0x373f, 0x35f: 0x37c3, 0x362: 0x374b, 0x363: 0x37cf,
-	0x364: 0x3757, 0x365: 0x37db, 0x366: 0x3763, 0x367: 0x37e7, 0x368: 0xa000, 0x369: 0xa000,
-	0x36a: 0x3835, 0x36b: 0x383b, 0x36c: 0x378d, 0x36d: 0x3811, 0x36e: 0x3769, 0x36f: 0x37ed,
-	0x370: 0x3775, 0x371: 0x37f9, 0x372: 0x377b, 0x373: 0x37ff, 0x374: 0x3781, 0x375: 0x3805,
-	0x378: 0x3787, 0x379: 0x380b,
-	// Block 0xe, offset 0x380
-	0x387: 0x1d61,
-	0x391: 0x812d,
-	0x392: 0x8132, 0x393: 0x8132, 0x394: 0x8132, 0x395: 0x8132, 0x396: 0x812d, 0x397: 0x8132,
-	0x398: 0x8132, 0x399: 0x8132, 0x39a: 0x812e, 0x39b: 0x812d, 0x39c: 0x8132, 0x39d: 0x8132,
-	0x39e: 0x8132, 0x39f: 0x8132, 0x3a0: 0x8132, 0x3a1: 0x8132, 0x3a2: 0x812d, 0x3a3: 0x812d,
-	0x3a4: 0x812d, 0x3a5: 0x812d, 0x3a6: 0x812d, 0x3a7: 0x812d, 0x3a8: 0x8132, 0x3a9: 0x8132,
-	0x3aa: 0x812d, 0x3ab: 0x8132, 0x3ac: 0x8132, 0x3ad: 0x812e, 0x3ae: 0x8131, 0x3af: 0x8132,
-	0x3b0: 0x8105, 0x3b1: 0x8106, 0x3b2: 0x8107, 0x3b3: 0x8108, 0x3b4: 0x8109, 0x3b5: 0x810a,
-	0x3b6: 0x810b, 0x3b7: 0x810c, 0x3b8: 0x810d, 0x3b9: 0x810e, 0x3ba: 0x810e, 0x3bb: 0x810f,
-	0x3bc: 0x8110, 0x3bd: 0x8111, 0x3bf: 0x8112,
-	// Block 0xf, offset 0x3c0
-	0x3c8: 0xa000, 0x3ca: 0xa000, 0x3cb: 0x8116,
-	0x3cc: 0x8117, 0x3cd: 0x8118, 0x3ce: 0x8119, 0x3cf: 0x811a, 0x3d0: 0x811b, 0x3d1: 0x811c,
-	0x3d2: 0x811d, 0x3d3: 0x9932, 0x3d4: 0x9932, 0x3d5: 0x992d, 0x3d6: 0x812d, 0x3d7: 0x8132,
-	0x3d8: 0x8132, 0x3d9: 0x8132, 0x3da: 0x8132, 0x3db: 0x8132, 0x3dc: 0x812d, 0x3dd: 0x8132,
-	0x3de: 0x8132, 0x3df: 0x812d,
-	0x3f0: 0x811e, 0x3f5: 0x1d84,
-	0x3f6: 0x2013, 0x3f7: 0x204f, 0x3f8: 0x204a,
-	// Block 0x10, offset 0x400
-	0x405: 0xa000,
-	0x406: 0x2d26, 0x407: 0xa000, 0x408: 0x2d2e, 0x409: 0xa000, 0x40a: 0x2d36, 0x40b: 0xa000,
-	0x40c: 0x2d3e, 0x40d: 0xa000, 0x40e: 0x2d46, 0x411: 0xa000,
-	0x412: 0x2d4e,
-	0x434: 0x8102, 0x435: 0x9900,
-	0x43a: 0xa000, 0x43b: 0x2d56,
-	0x43c: 0xa000, 0x43d: 0x2d5e, 0x43e: 0xa000, 0x43f: 0xa000,
-	// Block 0x11, offset 0x440
-	0x440: 0x0069, 0x441: 0x006b, 0x442: 0x006f, 0x443: 0x0083, 0x444: 0x00f5, 0x445: 0x00f8,
-	0x446: 0x0413, 0x447: 0x0085, 0x448: 0x0089, 0x449: 0x008b, 0x44a: 0x0104, 0x44b: 0x0107,
-	0x44c: 0x010a, 0x44d: 0x008f, 0x44f: 0x0097, 0x450: 0x009b, 0x451: 0x00e0,
-	0x452: 0x009f, 0x453: 0x00fe, 0x454: 0x0417, 0x455: 0x041b, 0x456: 0x00a1, 0x457: 0x00a9,
-	0x458: 0x00ab, 0x459: 0x0423, 0x45a: 0x012b, 0x45b: 0x00ad, 0x45c: 0x0427, 0x45d: 0x01be,
-	0x45e: 0x01c1, 0x45f: 0x01c4, 0x460: 0x01fa, 0x461: 0x01fd, 0x462: 0x0093, 0x463: 0x00a5,
-	0x464: 0x00ab, 0x465: 0x00ad, 0x466: 0x01be, 0x467: 0x01c1, 0x468: 0x01eb, 0x469: 0x01fa,
-	0x46a: 0x01fd,
-	0x478: 0x020c,
-	// Block 0x12, offset 0x480
-	0x49b: 0x00fb, 0x49c: 0x0087, 0x49d: 0x0101,
-	0x49e: 0x00d4, 0x49f: 0x010a, 0x4a0: 0x008d, 0x4a1: 0x010d, 0x4a2: 0x0110, 0x4a3: 0x0116,
-	0x4a4: 0x011c, 0x4a5: 0x011f, 0x4a6: 0x0122, 0x4a7: 0x042b, 0x4a8: 0x016a, 0x4a9: 0x0128,
-	0x4aa: 0x042f, 0x4ab: 0x016d, 0x4ac: 0x0131, 0x4ad: 0x012e, 0x4ae: 0x0134, 0x4af: 0x0137,
-	0x4b0: 0x013a, 0x4b1: 0x013d, 0x4b2: 0x0140, 0x4b3: 0x014c, 0x4b4: 0x014f, 0x4b5: 0x00ec,
-	0x4b6: 0x0152, 0x4b7: 0x0155, 0x4b8: 0x041f, 0x4b9: 0x0158, 0x4ba: 0x015b, 0x4bb: 0x00b5,
-	0x4bc: 0x015e, 0x4bd: 0x0161, 0x4be: 0x0164, 0x4bf: 0x01d0,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0x2f97, 0x4c1: 0x32a3, 0x4c2: 0x2fa1, 0x4c3: 0x32ad, 0x4c4: 0x2fa6, 0x4c5: 0x32b2,
-	0x4c6: 0x2fab, 0x4c7: 0x32b7, 0x4c8: 0x38cc, 0x4c9: 0x3a5b, 0x4ca: 0x2fc4, 0x4cb: 0x32d0,
-	0x4cc: 0x2fce, 0x4cd: 0x32da, 0x4ce: 0x2fdd, 0x4cf: 0x32e9, 0x4d0: 0x2fd3, 0x4d1: 0x32df,
-	0x4d2: 0x2fd8, 0x4d3: 0x32e4, 0x4d4: 0x38ef, 0x4d5: 0x3a7e, 0x4d6: 0x38f6, 0x4d7: 0x3a85,
-	0x4d8: 0x3019, 0x4d9: 0x3325, 0x4da: 0x301e, 0x4db: 0x332a, 0x4dc: 0x3904, 0x4dd: 0x3a93,
-	0x4de: 0x3023, 0x4df: 0x332f, 0x4e0: 0x3032, 0x4e1: 0x333e, 0x4e2: 0x3050, 0x4e3: 0x335c,
-	0x4e4: 0x305f, 0x4e5: 0x336b, 0x4e6: 0x3055, 0x4e7: 0x3361, 0x4e8: 0x3064, 0x4e9: 0x3370,
-	0x4ea: 0x3069, 0x4eb: 0x3375, 0x4ec: 0x30af, 0x4ed: 0x33bb, 0x4ee: 0x390b, 0x4ef: 0x3a9a,
-	0x4f0: 0x30b9, 0x4f1: 0x33ca, 0x4f2: 0x30c3, 0x4f3: 0x33d4, 0x4f4: 0x30cd, 0x4f5: 0x33de,
-	0x4f6: 0x46c4, 0x4f7: 0x4755, 0x4f8: 0x3912, 0x4f9: 0x3aa1, 0x4fa: 0x30e6, 0x4fb: 0x33f7,
-	0x4fc: 0x30e1, 0x4fd: 0x33f2, 0x4fe: 0x30eb, 0x4ff: 0x33fc,
-	// Block 0x14, offset 0x500
-	0x500: 0x30f0, 0x501: 0x3401, 0x502: 0x30f5, 0x503: 0x3406, 0x504: 0x3109, 0x505: 0x341a,
-	0x506: 0x3113, 0x507: 0x3424, 0x508: 0x3122, 0x509: 0x3433, 0x50a: 0x311d, 0x50b: 0x342e,
-	0x50c: 0x3935, 0x50d: 0x3ac4, 0x50e: 0x3943, 0x50f: 0x3ad2, 0x510: 0x394a, 0x511: 0x3ad9,
-	0x512: 0x3951, 0x513: 0x3ae0, 0x514: 0x314f, 0x515: 0x3460, 0x516: 0x3154, 0x517: 0x3465,
-	0x518: 0x315e, 0x519: 0x346f, 0x51a: 0x46f1, 0x51b: 0x4782, 0x51c: 0x3997, 0x51d: 0x3b26,
-	0x51e: 0x3177, 0x51f: 0x3488, 0x520: 0x3181, 0x521: 0x3492, 0x522: 0x4700, 0x523: 0x4791,
-	0x524: 0x399e, 0x525: 0x3b2d, 0x526: 0x39a5, 0x527: 0x3b34, 0x528: 0x39ac, 0x529: 0x3b3b,
-	0x52a: 0x3190, 0x52b: 0x34a1, 0x52c: 0x319a, 0x52d: 0x34b0, 0x52e: 0x31ae, 0x52f: 0x34c4,
-	0x530: 0x31a9, 0x531: 0x34bf, 0x532: 0x31ea, 0x533: 0x3500, 0x534: 0x31f9, 0x535: 0x350f,
-	0x536: 0x31f4, 0x537: 0x350a, 0x538: 0x39b3, 0x539: 0x3b42, 0x53a: 0x39ba, 0x53b: 0x3b49,
-	0x53c: 0x31fe, 0x53d: 0x3514, 0x53e: 0x3203, 0x53f: 0x3519,
-	// Block 0x15, offset 0x540
-	0x540: 0x3208, 0x541: 0x351e, 0x542: 0x320d, 0x543: 0x3523, 0x544: 0x321c, 0x545: 0x3532,
-	0x546: 0x3217, 0x547: 0x352d, 0x548: 0x3221, 0x549: 0x353c, 0x54a: 0x3226, 0x54b: 0x3541,
-	0x54c: 0x322b, 0x54d: 0x3546, 0x54e: 0x3249, 0x54f: 0x3564, 0x550: 0x3262, 0x551: 0x3582,
-	0x552: 0x3271, 0x553: 0x3591, 0x554: 0x3276, 0x555: 0x3596, 0x556: 0x337a, 0x557: 0x34a6,
-	0x558: 0x3537, 0x559: 0x3573, 0x55a: 0x1be0, 0x55b: 0x42d7,
-	0x560: 0x46a1, 0x561: 0x4732, 0x562: 0x2f83, 0x563: 0x328f,
-	0x564: 0x3878, 0x565: 0x3a07, 0x566: 0x3871, 0x567: 0x3a00, 0x568: 0x3886, 0x569: 0x3a15,
-	0x56a: 0x387f, 0x56b: 0x3a0e, 0x56c: 0x38be, 0x56d: 0x3a4d, 0x56e: 0x3894, 0x56f: 0x3a23,
-	0x570: 0x388d, 0x571: 0x3a1c, 0x572: 0x38a2, 0x573: 0x3a31, 0x574: 0x389b, 0x575: 0x3a2a,
-	0x576: 0x38c5, 0x577: 0x3a54, 0x578: 0x46b5, 0x579: 0x4746, 0x57a: 0x3000, 0x57b: 0x330c,
-	0x57c: 0x2fec, 0x57d: 0x32f8, 0x57e: 0x38da, 0x57f: 0x3a69,
-	// Block 0x16, offset 0x580
-	0x580: 0x38d3, 0x581: 0x3a62, 0x582: 0x38e8, 0x583: 0x3a77, 0x584: 0x38e1, 0x585: 0x3a70,
-	0x586: 0x38fd, 0x587: 0x3a8c, 0x588: 0x3091, 0x589: 0x339d, 0x58a: 0x30a5, 0x58b: 0x33b1,
-	0x58c: 0x46e7, 0x58d: 0x4778, 0x58e: 0x3136, 0x58f: 0x3447, 0x590: 0x3920, 0x591: 0x3aaf,
-	0x592: 0x3919, 0x593: 0x3aa8, 0x594: 0x392e, 0x595: 0x3abd, 0x596: 0x3927, 0x597: 0x3ab6,
-	0x598: 0x3989, 0x599: 0x3b18, 0x59a: 0x396d, 0x59b: 0x3afc, 0x59c: 0x3966, 0x59d: 0x3af5,
-	0x59e: 0x397b, 0x59f: 0x3b0a, 0x5a0: 0x3974, 0x5a1: 0x3b03, 0x5a2: 0x3982, 0x5a3: 0x3b11,
-	0x5a4: 0x31e5, 0x5a5: 0x34fb, 0x5a6: 0x31c7, 0x5a7: 0x34dd, 0x5a8: 0x39e4, 0x5a9: 0x3b73,
-	0x5aa: 0x39dd, 0x5ab: 0x3b6c, 0x5ac: 0x39f2, 0x5ad: 0x3b81, 0x5ae: 0x39eb, 0x5af: 0x3b7a,
-	0x5b0: 0x39f9, 0x5b1: 0x3b88, 0x5b2: 0x3230, 0x5b3: 0x354b, 0x5b4: 0x3258, 0x5b5: 0x3578,
-	0x5b6: 0x3253, 0x5b7: 0x356e, 0x5b8: 0x323f, 0x5b9: 0x355a,
-	// Block 0x17, offset 0x5c0
-	0x5c0: 0x4804, 0x5c1: 0x480a, 0x5c2: 0x491e, 0x5c3: 0x4936, 0x5c4: 0x4926, 0x5c5: 0x493e,
-	0x5c6: 0x492e, 0x5c7: 0x4946, 0x5c8: 0x47aa, 0x5c9: 0x47b0, 0x5ca: 0x488e, 0x5cb: 0x48a6,
-	0x5cc: 0x4896, 0x5cd: 0x48ae, 0x5ce: 0x489e, 0x5cf: 0x48b6, 0x5d0: 0x4816, 0x5d1: 0x481c,
-	0x5d2: 0x3db8, 0x5d3: 0x3dc8, 0x5d4: 0x3dc0, 0x5d5: 0x3dd0,
-	0x5d8: 0x47b6, 0x5d9: 0x47bc, 0x5da: 0x3ce8, 0x5db: 0x3cf8, 0x5dc: 0x3cf0, 0x5dd: 0x3d00,
-	0x5e0: 0x482e, 0x5e1: 0x4834, 0x5e2: 0x494e, 0x5e3: 0x4966,
-	0x5e4: 0x4956, 0x5e5: 0x496e, 0x5e6: 0x495e, 0x5e7: 0x4976, 0x5e8: 0x47c2, 0x5e9: 0x47c8,
-	0x5ea: 0x48be, 0x5eb: 0x48d6, 0x5ec: 0x48c6, 0x5ed: 0x48de, 0x5ee: 0x48ce, 0x5ef: 0x48e6,
-	0x5f0: 0x4846, 0x5f1: 0x484c, 0x5f2: 0x3e18, 0x5f3: 0x3e30, 0x5f4: 0x3e20, 0x5f5: 0x3e38,
-	0x5f6: 0x3e28, 0x5f7: 0x3e40, 0x5f8: 0x47ce, 0x5f9: 0x47d4, 0x5fa: 0x3d18, 0x5fb: 0x3d30,
-	0x5fc: 0x3d20, 0x5fd: 0x3d38, 0x5fe: 0x3d28, 0x5ff: 0x3d40,
-	// Block 0x18, offset 0x600
-	0x600: 0x4852, 0x601: 0x4858, 0x602: 0x3e48, 0x603: 0x3e58, 0x604: 0x3e50, 0x605: 0x3e60,
-	0x608: 0x47da, 0x609: 0x47e0, 0x60a: 0x3d48, 0x60b: 0x3d58,
-	0x60c: 0x3d50, 0x60d: 0x3d60, 0x610: 0x4864, 0x611: 0x486a,
-	0x612: 0x3e80, 0x613: 0x3e98, 0x614: 0x3e88, 0x615: 0x3ea0, 0x616: 0x3e90, 0x617: 0x3ea8,
-	0x619: 0x47e6, 0x61b: 0x3d68, 0x61d: 0x3d70,
-	0x61f: 0x3d78, 0x620: 0x487c, 0x621: 0x4882, 0x622: 0x497e, 0x623: 0x4996,
-	0x624: 0x4986, 0x625: 0x499e, 0x626: 0x498e, 0x627: 0x49a6, 0x628: 0x47ec, 0x629: 0x47f2,
-	0x62a: 0x48ee, 0x62b: 0x4906, 0x62c: 0x48f6, 0x62d: 0x490e, 0x62e: 0x48fe, 0x62f: 0x4916,
-	0x630: 0x47f8, 0x631: 0x431e, 0x632: 0x3691, 0x633: 0x4324, 0x634: 0x4822, 0x635: 0x432a,
-	0x636: 0x36a3, 0x637: 0x4330, 0x638: 0x36c1, 0x639: 0x4336, 0x63a: 0x36d9, 0x63b: 0x433c,
-	0x63c: 0x4870, 0x63d: 0x4342,
-	// Block 0x19, offset 0x640
-	0x640: 0x3da0, 0x641: 0x3da8, 0x642: 0x4184, 0x643: 0x41a2, 0x644: 0x418e, 0x645: 0x41ac,
-	0x646: 0x4198, 0x647: 0x41b6, 0x648: 0x3cd8, 0x649: 0x3ce0, 0x64a: 0x40d0, 0x64b: 0x40ee,
-	0x64c: 0x40da, 0x64d: 0x40f8, 0x64e: 0x40e4, 0x64f: 0x4102, 0x650: 0x3de8, 0x651: 0x3df0,
-	0x652: 0x41c0, 0x653: 0x41de, 0x654: 0x41ca, 0x655: 0x41e8, 0x656: 0x41d4, 0x657: 0x41f2,
-	0x658: 0x3d08, 0x659: 0x3d10, 0x65a: 0x410c, 0x65b: 0x412a, 0x65c: 0x4116, 0x65d: 0x4134,
-	0x65e: 0x4120, 0x65f: 0x413e, 0x660: 0x3ec0, 0x661: 0x3ec8, 0x662: 0x41fc, 0x663: 0x421a,
-	0x664: 0x4206, 0x665: 0x4224, 0x666: 0x4210, 0x667: 0x422e, 0x668: 0x3d80, 0x669: 0x3d88,
-	0x66a: 0x4148, 0x66b: 0x4166, 0x66c: 0x4152, 0x66d: 0x4170, 0x66e: 0x415c, 0x66f: 0x417a,
-	0x670: 0x3685, 0x671: 0x367f, 0x672: 0x3d90, 0x673: 0x368b, 0x674: 0x3d98,
-	0x676: 0x4810, 0x677: 0x3db0, 0x678: 0x35f5, 0x679: 0x35ef, 0x67a: 0x35e3, 0x67b: 0x42ee,
-	0x67c: 0x35fb, 0x67d: 0x4287, 0x67e: 0x01d3, 0x67f: 0x4287,
-	// Block 0x1a, offset 0x680
-	0x680: 0x42a0, 0x681: 0x4482, 0x682: 0x3dd8, 0x683: 0x369d, 0x684: 0x3de0,
-	0x686: 0x483a, 0x687: 0x3df8, 0x688: 0x3601, 0x689: 0x42f4, 0x68a: 0x360d, 0x68b: 0x42fa,
-	0x68c: 0x3619, 0x68d: 0x4489, 0x68e: 0x4490, 0x68f: 0x4497, 0x690: 0x36b5, 0x691: 0x36af,
-	0x692: 0x3e00, 0x693: 0x44e4, 0x696: 0x36bb, 0x697: 0x3e10,
-	0x698: 0x3631, 0x699: 0x362b, 0x69a: 0x361f, 0x69b: 0x4300, 0x69d: 0x449e,
-	0x69e: 0x44a5, 0x69f: 0x44ac, 0x6a0: 0x36eb, 0x6a1: 0x36e5, 0x6a2: 0x3e68, 0x6a3: 0x44ec,
-	0x6a4: 0x36cd, 0x6a5: 0x36d3, 0x6a6: 0x36f1, 0x6a7: 0x3e78, 0x6a8: 0x3661, 0x6a9: 0x365b,
-	0x6aa: 0x364f, 0x6ab: 0x430c, 0x6ac: 0x3649, 0x6ad: 0x4474, 0x6ae: 0x447b, 0x6af: 0x0081,
-	0x6b2: 0x3eb0, 0x6b3: 0x36f7, 0x6b4: 0x3eb8,
-	0x6b6: 0x4888, 0x6b7: 0x3ed0, 0x6b8: 0x363d, 0x6b9: 0x4306, 0x6ba: 0x366d, 0x6bb: 0x4318,
-	0x6bc: 0x3679, 0x6bd: 0x425a, 0x6be: 0x428c,
-	// Block 0x1b, offset 0x6c0
-	0x6c0: 0x1bd8, 0x6c1: 0x1bdc, 0x6c2: 0x0047, 0x6c3: 0x1c54, 0x6c5: 0x1be8,
-	0x6c6: 0x1bec, 0x6c7: 0x00e9, 0x6c9: 0x1c58, 0x6ca: 0x008f, 0x6cb: 0x0051,
-	0x6cc: 0x0051, 0x6cd: 0x0051, 0x6ce: 0x0091, 0x6cf: 0x00da, 0x6d0: 0x0053, 0x6d1: 0x0053,
-	0x6d2: 0x0059, 0x6d3: 0x0099, 0x6d5: 0x005d, 0x6d6: 0x198d,
-	0x6d9: 0x0061, 0x6da: 0x0063, 0x6db: 0x0065, 0x6dc: 0x0065, 0x6dd: 0x0065,
-	0x6e0: 0x199f, 0x6e1: 0x1bc8, 0x6e2: 0x19a8,
-	0x6e4: 0x0075, 0x6e6: 0x01b8, 0x6e8: 0x0075,
-	0x6ea: 0x0057, 0x6eb: 0x42d2, 0x6ec: 0x0045, 0x6ed: 0x0047, 0x6ef: 0x008b,
-	0x6f0: 0x004b, 0x6f1: 0x004d, 0x6f3: 0x005b, 0x6f4: 0x009f, 0x6f5: 0x0215,
-	0x6f6: 0x0218, 0x6f7: 0x021b, 0x6f8: 0x021e, 0x6f9: 0x0093, 0x6fb: 0x1b98,
-	0x6fc: 0x01e8, 0x6fd: 0x01c1, 0x6fe: 0x0179, 0x6ff: 0x01a0,
-	// Block 0x1c, offset 0x700
-	0x700: 0x0463, 0x705: 0x0049,
-	0x706: 0x0089, 0x707: 0x008b, 0x708: 0x0093, 0x709: 0x0095,
-	0x710: 0x222e, 0x711: 0x223a,
-	0x712: 0x22ee, 0x713: 0x2216, 0x714: 0x229a, 0x715: 0x2222, 0x716: 0x22a0, 0x717: 0x22b8,
-	0x718: 0x22c4, 0x719: 0x2228, 0x71a: 0x22ca, 0x71b: 0x2234, 0x71c: 0x22be, 0x71d: 0x22d0,
-	0x71e: 0x22d6, 0x71f: 0x1cbc, 0x720: 0x0053, 0x721: 0x195a, 0x722: 0x1ba4, 0x723: 0x1963,
-	0x724: 0x006d, 0x725: 0x19ab, 0x726: 0x1bd0, 0x727: 0x1d48, 0x728: 0x1966, 0x729: 0x0071,
-	0x72a: 0x19b7, 0x72b: 0x1bd4, 0x72c: 0x0059, 0x72d: 0x0047, 0x72e: 0x0049, 0x72f: 0x005b,
-	0x730: 0x0093, 0x731: 0x19e4, 0x732: 0x1c18, 0x733: 0x19ed, 0x734: 0x00ad, 0x735: 0x1a62,
-	0x736: 0x1c4c, 0x737: 0x1d5c, 0x738: 0x19f0, 0x739: 0x00b1, 0x73a: 0x1a65, 0x73b: 0x1c50,
-	0x73c: 0x0099, 0x73d: 0x0087, 0x73e: 0x0089, 0x73f: 0x009b,
-	// Block 0x1d, offset 0x740
-	0x741: 0x3c06, 0x743: 0xa000, 0x744: 0x3c0d, 0x745: 0xa000,
-	0x747: 0x3c14, 0x748: 0xa000, 0x749: 0x3c1b,
-	0x74d: 0xa000,
-	0x760: 0x2f65, 0x761: 0xa000, 0x762: 0x3c29,
-	0x764: 0xa000, 0x765: 0xa000,
-	0x76d: 0x3c22, 0x76e: 0x2f60, 0x76f: 0x2f6a,
-	0x770: 0x3c30, 0x771: 0x3c37, 0x772: 0xa000, 0x773: 0xa000, 0x774: 0x3c3e, 0x775: 0x3c45,
-	0x776: 0xa000, 0x777: 0xa000, 0x778: 0x3c4c, 0x779: 0x3c53, 0x77a: 0xa000, 0x77b: 0xa000,
-	0x77c: 0xa000, 0x77d: 0xa000,
-	// Block 0x1e, offset 0x780
-	0x780: 0x3c5a, 0x781: 0x3c61, 0x782: 0xa000, 0x783: 0xa000, 0x784: 0x3c76, 0x785: 0x3c7d,
-	0x786: 0xa000, 0x787: 0xa000, 0x788: 0x3c84, 0x789: 0x3c8b,
-	0x791: 0xa000,
-	0x792: 0xa000,
-	0x7a2: 0xa000,
-	0x7a8: 0xa000, 0x7a9: 0xa000,
-	0x7ab: 0xa000, 0x7ac: 0x3ca0, 0x7ad: 0x3ca7, 0x7ae: 0x3cae, 0x7af: 0x3cb5,
-	0x7b2: 0xa000, 0x7b3: 0xa000, 0x7b4: 0xa000, 0x7b5: 0xa000,
-	// Block 0x1f, offset 0x7c0
-	0x7e0: 0x0023, 0x7e1: 0x0025, 0x7e2: 0x0027, 0x7e3: 0x0029,
-	0x7e4: 0x002b, 0x7e5: 0x002d, 0x7e6: 0x002f, 0x7e7: 0x0031, 0x7e8: 0x0033, 0x7e9: 0x1882,
-	0x7ea: 0x1885, 0x7eb: 0x1888, 0x7ec: 0x188b, 0x7ed: 0x188e, 0x7ee: 0x1891, 0x7ef: 0x1894,
-	0x7f0: 0x1897, 0x7f1: 0x189a, 0x7f2: 0x189d, 0x7f3: 0x18a6, 0x7f4: 0x1a68, 0x7f5: 0x1a6c,
-	0x7f6: 0x1a70, 0x7f7: 0x1a74, 0x7f8: 0x1a78, 0x7f9: 0x1a7c, 0x7fa: 0x1a80, 0x7fb: 0x1a84,
-	0x7fc: 0x1a88, 0x7fd: 0x1c80, 0x7fe: 0x1c85, 0x7ff: 0x1c8a,
-	// Block 0x20, offset 0x800
-	0x800: 0x1c8f, 0x801: 0x1c94, 0x802: 0x1c99, 0x803: 0x1c9e, 0x804: 0x1ca3, 0x805: 0x1ca8,
-	0x806: 0x1cad, 0x807: 0x1cb2, 0x808: 0x187f, 0x809: 0x18a3, 0x80a: 0x18c7, 0x80b: 0x18eb,
-	0x80c: 0x190f, 0x80d: 0x1918, 0x80e: 0x191e, 0x80f: 0x1924, 0x810: 0x192a, 0x811: 0x1b60,
-	0x812: 0x1b64, 0x813: 0x1b68, 0x814: 0x1b6c, 0x815: 0x1b70, 0x816: 0x1b74, 0x817: 0x1b78,
-	0x818: 0x1b7c, 0x819: 0x1b80, 0x81a: 0x1b84, 0x81b: 0x1b88, 0x81c: 0x1af4, 0x81d: 0x1af8,
-	0x81e: 0x1afc, 0x81f: 0x1b00, 0x820: 0x1b04, 0x821: 0x1b08, 0x822: 0x1b0c, 0x823: 0x1b10,
-	0x824: 0x1b14, 0x825: 0x1b18, 0x826: 0x1b1c, 0x827: 0x1b20, 0x828: 0x1b24, 0x829: 0x1b28,
-	0x82a: 0x1b2c, 0x82b: 0x1b30, 0x82c: 0x1b34, 0x82d: 0x1b38, 0x82e: 0x1b3c, 0x82f: 0x1b40,
-	0x830: 0x1b44, 0x831: 0x1b48, 0x832: 0x1b4c, 0x833: 0x1b50, 0x834: 0x1b54, 0x835: 0x1b58,
-	0x836: 0x0043, 0x837: 0x0045, 0x838: 0x0047, 0x839: 0x0049, 0x83a: 0x004b, 0x83b: 0x004d,
-	0x83c: 0x004f, 0x83d: 0x0051, 0x83e: 0x0053, 0x83f: 0x0055,
-	// Block 0x21, offset 0x840
-	0x840: 0x06bf, 0x841: 0x06e3, 0x842: 0x06ef, 0x843: 0x06ff, 0x844: 0x0707, 0x845: 0x0713,
-	0x846: 0x071b, 0x847: 0x0723, 0x848: 0x072f, 0x849: 0x0783, 0x84a: 0x079b, 0x84b: 0x07ab,
-	0x84c: 0x07bb, 0x84d: 0x07cb, 0x84e: 0x07db, 0x84f: 0x07fb, 0x850: 0x07ff, 0x851: 0x0803,
-	0x852: 0x0837, 0x853: 0x085f, 0x854: 0x086f, 0x855: 0x0877, 0x856: 0x087b, 0x857: 0x0887,
-	0x858: 0x08a3, 0x859: 0x08a7, 0x85a: 0x08bf, 0x85b: 0x08c3, 0x85c: 0x08cb, 0x85d: 0x08db,
-	0x85e: 0x0977, 0x85f: 0x098b, 0x860: 0x09cb, 0x861: 0x09df, 0x862: 0x09e7, 0x863: 0x09eb,
-	0x864: 0x09fb, 0x865: 0x0a17, 0x866: 0x0a43, 0x867: 0x0a4f, 0x868: 0x0a6f, 0x869: 0x0a7b,
-	0x86a: 0x0a7f, 0x86b: 0x0a83, 0x86c: 0x0a9b, 0x86d: 0x0a9f, 0x86e: 0x0acb, 0x86f: 0x0ad7,
-	0x870: 0x0adf, 0x871: 0x0ae7, 0x872: 0x0af7, 0x873: 0x0aff, 0x874: 0x0b07, 0x875: 0x0b33,
-	0x876: 0x0b37, 0x877: 0x0b3f, 0x878: 0x0b43, 0x879: 0x0b4b, 0x87a: 0x0b53, 0x87b: 0x0b63,
-	0x87c: 0x0b7f, 0x87d: 0x0bf7, 0x87e: 0x0c0b, 0x87f: 0x0c0f,
-	// Block 0x22, offset 0x880
-	0x880: 0x0c8f, 0x881: 0x0c93, 0x882: 0x0ca7, 0x883: 0x0cab, 0x884: 0x0cb3, 0x885: 0x0cbb,
-	0x886: 0x0cc3, 0x887: 0x0ccf, 0x888: 0x0cf7, 0x889: 0x0d07, 0x88a: 0x0d1b, 0x88b: 0x0d8b,
-	0x88c: 0x0d97, 0x88d: 0x0da7, 0x88e: 0x0db3, 0x88f: 0x0dbf, 0x890: 0x0dc7, 0x891: 0x0dcb,
-	0x892: 0x0dcf, 0x893: 0x0dd3, 0x894: 0x0dd7, 0x895: 0x0e8f, 0x896: 0x0ed7, 0x897: 0x0ee3,
-	0x898: 0x0ee7, 0x899: 0x0eeb, 0x89a: 0x0eef, 0x89b: 0x0ef7, 0x89c: 0x0efb, 0x89d: 0x0f0f,
-	0x89e: 0x0f2b, 0x89f: 0x0f33, 0x8a0: 0x0f73, 0x8a1: 0x0f77, 0x8a2: 0x0f7f, 0x8a3: 0x0f83,
-	0x8a4: 0x0f8b, 0x8a5: 0x0f8f, 0x8a6: 0x0fb3, 0x8a7: 0x0fb7, 0x8a8: 0x0fd3, 0x8a9: 0x0fd7,
-	0x8aa: 0x0fdb, 0x8ab: 0x0fdf, 0x8ac: 0x0ff3, 0x8ad: 0x1017, 0x8ae: 0x101b, 0x8af: 0x101f,
-	0x8b0: 0x1043, 0x8b1: 0x1083, 0x8b2: 0x1087, 0x8b3: 0x10a7, 0x8b4: 0x10b7, 0x8b5: 0x10bf,
-	0x8b6: 0x10df, 0x8b7: 0x1103, 0x8b8: 0x1147, 0x8b9: 0x114f, 0x8ba: 0x1163, 0x8bb: 0x116f,
-	0x8bc: 0x1177, 0x8bd: 0x117f, 0x8be: 0x1183, 0x8bf: 0x1187,
-	// Block 0x23, offset 0x8c0
-	0x8c0: 0x119f, 0x8c1: 0x11a3, 0x8c2: 0x11bf, 0x8c3: 0x11c7, 0x8c4: 0x11cf, 0x8c5: 0x11d3,
-	0x8c6: 0x11df, 0x8c7: 0x11e7, 0x8c8: 0x11eb, 0x8c9: 0x11ef, 0x8ca: 0x11f7, 0x8cb: 0x11fb,
-	0x8cc: 0x129b, 0x8cd: 0x12af, 0x8ce: 0x12e3, 0x8cf: 0x12e7, 0x8d0: 0x12ef, 0x8d1: 0x131b,
-	0x8d2: 0x1323, 0x8d3: 0x132b, 0x8d4: 0x1333, 0x8d5: 0x136f, 0x8d6: 0x1373, 0x8d7: 0x137b,
-	0x8d8: 0x137f, 0x8d9: 0x1383, 0x8da: 0x13af, 0x8db: 0x13b3, 0x8dc: 0x13bb, 0x8dd: 0x13cf,
-	0x8de: 0x13d3, 0x8df: 0x13ef, 0x8e0: 0x13f7, 0x8e1: 0x13fb, 0x8e2: 0x141f, 0x8e3: 0x143f,
-	0x8e4: 0x1453, 0x8e5: 0x1457, 0x8e6: 0x145f, 0x8e7: 0x148b, 0x8e8: 0x148f, 0x8e9: 0x149f,
-	0x8ea: 0x14c3, 0x8eb: 0x14cf, 0x8ec: 0x14df, 0x8ed: 0x14f7, 0x8ee: 0x14ff, 0x8ef: 0x1503,
-	0x8f0: 0x1507, 0x8f1: 0x150b, 0x8f2: 0x1517, 0x8f3: 0x151b, 0x8f4: 0x1523, 0x8f5: 0x153f,
-	0x8f6: 0x1543, 0x8f7: 0x1547, 0x8f8: 0x155f, 0x8f9: 0x1563, 0x8fa: 0x156b, 0x8fb: 0x157f,
-	0x8fc: 0x1583, 0x8fd: 0x1587, 0x8fe: 0x158f, 0x8ff: 0x1593,
-	// Block 0x24, offset 0x900
-	0x906: 0xa000, 0x90b: 0xa000,
-	0x90c: 0x3f08, 0x90d: 0xa000, 0x90e: 0x3f10, 0x90f: 0xa000, 0x910: 0x3f18, 0x911: 0xa000,
-	0x912: 0x3f20, 0x913: 0xa000, 0x914: 0x3f28, 0x915: 0xa000, 0x916: 0x3f30, 0x917: 0xa000,
-	0x918: 0x3f38, 0x919: 0xa000, 0x91a: 0x3f40, 0x91b: 0xa000, 0x91c: 0x3f48, 0x91d: 0xa000,
-	0x91e: 0x3f50, 0x91f: 0xa000, 0x920: 0x3f58, 0x921: 0xa000, 0x922: 0x3f60,
-	0x924: 0xa000, 0x925: 0x3f68, 0x926: 0xa000, 0x927: 0x3f70, 0x928: 0xa000, 0x929: 0x3f78,
-	0x92f: 0xa000,
-	0x930: 0x3f80, 0x931: 0x3f88, 0x932: 0xa000, 0x933: 0x3f90, 0x934: 0x3f98, 0x935: 0xa000,
-	0x936: 0x3fa0, 0x937: 0x3fa8, 0x938: 0xa000, 0x939: 0x3fb0, 0x93a: 0x3fb8, 0x93b: 0xa000,
-	0x93c: 0x3fc0, 0x93d: 0x3fc8,
-	// Block 0x25, offset 0x940
-	0x954: 0x3f00,
-	0x959: 0x9903, 0x95a: 0x9903, 0x95b: 0x42dc, 0x95c: 0x42e2, 0x95d: 0xa000,
-	0x95e: 0x3fd0, 0x95f: 0x26b4,
-	0x966: 0xa000,
-	0x96b: 0xa000, 0x96c: 0x3fe0, 0x96d: 0xa000, 0x96e: 0x3fe8, 0x96f: 0xa000,
-	0x970: 0x3ff0, 0x971: 0xa000, 0x972: 0x3ff8, 0x973: 0xa000, 0x974: 0x4000, 0x975: 0xa000,
-	0x976: 0x4008, 0x977: 0xa000, 0x978: 0x4010, 0x979: 0xa000, 0x97a: 0x4018, 0x97b: 0xa000,
-	0x97c: 0x4020, 0x97d: 0xa000, 0x97e: 0x4028, 0x97f: 0xa000,
-	// Block 0x26, offset 0x980
-	0x980: 0x4030, 0x981: 0xa000, 0x982: 0x4038, 0x984: 0xa000, 0x985: 0x4040,
-	0x986: 0xa000, 0x987: 0x4048, 0x988: 0xa000, 0x989: 0x4050,
-	0x98f: 0xa000, 0x990: 0x4058, 0x991: 0x4060,
-	0x992: 0xa000, 0x993: 0x4068, 0x994: 0x4070, 0x995: 0xa000, 0x996: 0x4078, 0x997: 0x4080,
-	0x998: 0xa000, 0x999: 0x4088, 0x99a: 0x4090, 0x99b: 0xa000, 0x99c: 0x4098, 0x99d: 0x40a0,
-	0x9af: 0xa000,
-	0x9b0: 0xa000, 0x9b1: 0xa000, 0x9b2: 0xa000, 0x9b4: 0x3fd8,
-	0x9b7: 0x40a8, 0x9b8: 0x40b0, 0x9b9: 0x40b8, 0x9ba: 0x40c0,
-	0x9bd: 0xa000, 0x9be: 0x40c8, 0x9bf: 0x26c9,
-	// Block 0x27, offset 0x9c0
-	0x9c0: 0x0367, 0x9c1: 0x032b, 0x9c2: 0x032f, 0x9c3: 0x0333, 0x9c4: 0x037b, 0x9c5: 0x0337,
-	0x9c6: 0x033b, 0x9c7: 0x033f, 0x9c8: 0x0343, 0x9c9: 0x0347, 0x9ca: 0x034b, 0x9cb: 0x034f,
-	0x9cc: 0x0353, 0x9cd: 0x0357, 0x9ce: 0x035b, 0x9cf: 0x49bd, 0x9d0: 0x49c3, 0x9d1: 0x49c9,
-	0x9d2: 0x49cf, 0x9d3: 0x49d5, 0x9d4: 0x49db, 0x9d5: 0x49e1, 0x9d6: 0x49e7, 0x9d7: 0x49ed,
-	0x9d8: 0x49f3, 0x9d9: 0x49f9, 0x9da: 0x49ff, 0x9db: 0x4a05, 0x9dc: 0x4a0b, 0x9dd: 0x4a11,
-	0x9de: 0x4a17, 0x9df: 0x4a1d, 0x9e0: 0x4a23, 0x9e1: 0x4a29, 0x9e2: 0x4a2f, 0x9e3: 0x4a35,
-	0x9e4: 0x03c3, 0x9e5: 0x035f, 0x9e6: 0x0363, 0x9e7: 0x03e7, 0x9e8: 0x03eb, 0x9e9: 0x03ef,
-	0x9ea: 0x03f3, 0x9eb: 0x03f7, 0x9ec: 0x03fb, 0x9ed: 0x03ff, 0x9ee: 0x036b, 0x9ef: 0x0403,
-	0x9f0: 0x0407, 0x9f1: 0x036f, 0x9f2: 0x0373, 0x9f3: 0x0377, 0x9f4: 0x037f, 0x9f5: 0x0383,
-	0x9f6: 0x0387, 0x9f7: 0x038b, 0x9f8: 0x038f, 0x9f9: 0x0393, 0x9fa: 0x0397, 0x9fb: 0x039b,
-	0x9fc: 0x039f, 0x9fd: 0x03a3, 0x9fe: 0x03a7, 0x9ff: 0x03ab,
-	// Block 0x28, offset 0xa00
-	0xa00: 0x03af, 0xa01: 0x03b3, 0xa02: 0x040b, 0xa03: 0x040f, 0xa04: 0x03b7, 0xa05: 0x03bb,
-	0xa06: 0x03bf, 0xa07: 0x03c7, 0xa08: 0x03cb, 0xa09: 0x03cf, 0xa0a: 0x03d3, 0xa0b: 0x03d7,
-	0xa0c: 0x03db, 0xa0d: 0x03df, 0xa0e: 0x03e3,
-	0xa12: 0x06bf, 0xa13: 0x071b, 0xa14: 0x06cb, 0xa15: 0x097b, 0xa16: 0x06cf, 0xa17: 0x06e7,
-	0xa18: 0x06d3, 0xa19: 0x0f93, 0xa1a: 0x0707, 0xa1b: 0x06db, 0xa1c: 0x06c3, 0xa1d: 0x09ff,
-	0xa1e: 0x098f, 0xa1f: 0x072f,
-	// Block 0x29, offset 0xa40
-	0xa40: 0x2054, 0xa41: 0x205a, 0xa42: 0x2060, 0xa43: 0x2066, 0xa44: 0x206c, 0xa45: 0x2072,
-	0xa46: 0x2078, 0xa47: 0x207e, 0xa48: 0x2084, 0xa49: 0x208a, 0xa4a: 0x2090, 0xa4b: 0x2096,
-	0xa4c: 0x209c, 0xa4d: 0x20a2, 0xa4e: 0x2726, 0xa4f: 0x272f, 0xa50: 0x2738, 0xa51: 0x2741,
-	0xa52: 0x274a, 0xa53: 0x2753, 0xa54: 0x275c, 0xa55: 0x2765, 0xa56: 0x276e, 0xa57: 0x2780,
-	0xa58: 0x2789, 0xa59: 0x2792, 0xa5a: 0x279b, 0xa5b: 0x27a4, 0xa5c: 0x2777, 0xa5d: 0x2bac,
-	0xa5e: 0x2aed, 0xa60: 0x20a8, 0xa61: 0x20c0, 0xa62: 0x20b4, 0xa63: 0x2108,
-	0xa64: 0x20c6, 0xa65: 0x20e4, 0xa66: 0x20ae, 0xa67: 0x20de, 0xa68: 0x20ba, 0xa69: 0x20f0,
-	0xa6a: 0x2120, 0xa6b: 0x213e, 0xa6c: 0x2138, 0xa6d: 0x212c, 0xa6e: 0x217a, 0xa6f: 0x210e,
-	0xa70: 0x211a, 0xa71: 0x2132, 0xa72: 0x2126, 0xa73: 0x2150, 0xa74: 0x20fc, 0xa75: 0x2144,
-	0xa76: 0x216e, 0xa77: 0x2156, 0xa78: 0x20ea, 0xa79: 0x20cc, 0xa7a: 0x2102, 0xa7b: 0x2114,
-	0xa7c: 0x214a, 0xa7d: 0x20d2, 0xa7e: 0x2174, 0xa7f: 0x20f6,
-	// Block 0x2a, offset 0xa80
-	0xa80: 0x215c, 0xa81: 0x20d8, 0xa82: 0x2162, 0xa83: 0x2168, 0xa84: 0x092f, 0xa85: 0x0b03,
-	0xa86: 0x0ca7, 0xa87: 0x10c7,
-	0xa90: 0x1bc4, 0xa91: 0x18a9,
-	0xa92: 0x18ac, 0xa93: 0x18af, 0xa94: 0x18b2, 0xa95: 0x18b5, 0xa96: 0x18b8, 0xa97: 0x18bb,
-	0xa98: 0x18be, 0xa99: 0x18c1, 0xa9a: 0x18ca, 0xa9b: 0x18cd, 0xa9c: 0x18d0, 0xa9d: 0x18d3,
-	0xa9e: 0x18d6, 0xa9f: 0x18d9, 0xaa0: 0x0313, 0xaa1: 0x031b, 0xaa2: 0x031f, 0xaa3: 0x0327,
-	0xaa4: 0x032b, 0xaa5: 0x032f, 0xaa6: 0x0337, 0xaa7: 0x033f, 0xaa8: 0x0343, 0xaa9: 0x034b,
-	0xaaa: 0x034f, 0xaab: 0x0353, 0xaac: 0x0357, 0xaad: 0x035b, 0xaae: 0x2e18, 0xaaf: 0x2e20,
-	0xab0: 0x2e28, 0xab1: 0x2e30, 0xab2: 0x2e38, 0xab3: 0x2e40, 0xab4: 0x2e48, 0xab5: 0x2e50,
-	0xab6: 0x2e60, 0xab7: 0x2e68, 0xab8: 0x2e70, 0xab9: 0x2e78, 0xaba: 0x2e80, 0xabb: 0x2e88,
-	0xabc: 0x2ed3, 0xabd: 0x2e9b, 0xabe: 0x2e58,
-	// Block 0x2b, offset 0xac0
-	0xac0: 0x06bf, 0xac1: 0x071b, 0xac2: 0x06cb, 0xac3: 0x097b, 0xac4: 0x071f, 0xac5: 0x07af,
-	0xac6: 0x06c7, 0xac7: 0x07ab, 0xac8: 0x070b, 0xac9: 0x0887, 0xaca: 0x0d07, 0xacb: 0x0e8f,
-	0xacc: 0x0dd7, 0xacd: 0x0d1b, 0xace: 0x145f, 0xacf: 0x098b, 0xad0: 0x0ccf, 0xad1: 0x0d4b,
-	0xad2: 0x0d0b, 0xad3: 0x104b, 0xad4: 0x08fb, 0xad5: 0x0f03, 0xad6: 0x1387, 0xad7: 0x105f,
-	0xad8: 0x0843, 0xad9: 0x108f, 0xada: 0x0f9b, 0xadb: 0x0a17, 0xadc: 0x140f, 0xadd: 0x077f,
-	0xade: 0x08ab, 0xadf: 0x0df7, 0xae0: 0x1527, 0xae1: 0x0743, 0xae2: 0x07d3, 0xae3: 0x0d9b,
-	0xae4: 0x06cf, 0xae5: 0x06e7, 0xae6: 0x06d3, 0xae7: 0x0adb, 0xae8: 0x08ef, 0xae9: 0x087f,
-	0xaea: 0x0a57, 0xaeb: 0x0a4b, 0xaec: 0x0feb, 0xaed: 0x073f, 0xaee: 0x139b, 0xaef: 0x089b,
-	0xaf0: 0x09f3, 0xaf1: 0x18dc, 0xaf2: 0x18df, 0xaf3: 0x18e2, 0xaf4: 0x18e5, 0xaf5: 0x18ee,
-	0xaf6: 0x18f1, 0xaf7: 0x18f4, 0xaf8: 0x18f7, 0xaf9: 0x18fa, 0xafa: 0x18fd, 0xafb: 0x1900,
-	0xafc: 0x1903, 0xafd: 0x1906, 0xafe: 0x1909, 0xaff: 0x1912,
-	// Block 0x2c, offset 0xb00
-	0xb00: 0x1cc6, 0xb01: 0x1cd5, 0xb02: 0x1ce4, 0xb03: 0x1cf3, 0xb04: 0x1d02, 0xb05: 0x1d11,
-	0xb06: 0x1d20, 0xb07: 0x1d2f, 0xb08: 0x1d3e, 0xb09: 0x218c, 0xb0a: 0x219e, 0xb0b: 0x21b0,
-	0xb0c: 0x1954, 0xb0d: 0x1c04, 0xb0e: 0x19d2, 0xb0f: 0x1ba8, 0xb10: 0x04cb, 0xb11: 0x04d3,
-	0xb12: 0x04db, 0xb13: 0x04e3, 0xb14: 0x04eb, 0xb15: 0x04ef, 0xb16: 0x04f3, 0xb17: 0x04f7,
-	0xb18: 0x04fb, 0xb19: 0x04ff, 0xb1a: 0x0503, 0xb1b: 0x0507, 0xb1c: 0x050b, 0xb1d: 0x050f,
-	0xb1e: 0x0513, 0xb1f: 0x0517, 0xb20: 0x051b, 0xb21: 0x0523, 0xb22: 0x0527, 0xb23: 0x052b,
-	0xb24: 0x052f, 0xb25: 0x0533, 0xb26: 0x0537, 0xb27: 0x053b, 0xb28: 0x053f, 0xb29: 0x0543,
-	0xb2a: 0x0547, 0xb2b: 0x054b, 0xb2c: 0x054f, 0xb2d: 0x0553, 0xb2e: 0x0557, 0xb2f: 0x055b,
-	0xb30: 0x055f, 0xb31: 0x0563, 0xb32: 0x0567, 0xb33: 0x056f, 0xb34: 0x0577, 0xb35: 0x057f,
-	0xb36: 0x0583, 0xb37: 0x0587, 0xb38: 0x058b, 0xb39: 0x058f, 0xb3a: 0x0593, 0xb3b: 0x0597,
-	0xb3c: 0x059b, 0xb3d: 0x059f, 0xb3e: 0x05a3,
-	// Block 0x2d, offset 0xb40
-	0xb40: 0x2b0c, 0xb41: 0x29a8, 0xb42: 0x2b1c, 0xb43: 0x2880, 0xb44: 0x2ee4, 0xb45: 0x288a,
-	0xb46: 0x2894, 0xb47: 0x2f28, 0xb48: 0x29b5, 0xb49: 0x289e, 0xb4a: 0x28a8, 0xb4b: 0x28b2,
-	0xb4c: 0x29dc, 0xb4d: 0x29e9, 0xb4e: 0x29c2, 0xb4f: 0x29cf, 0xb50: 0x2ea9, 0xb51: 0x29f6,
-	0xb52: 0x2a03, 0xb53: 0x2bbe, 0xb54: 0x26bb, 0xb55: 0x2bd1, 0xb56: 0x2be4, 0xb57: 0x2b2c,
-	0xb58: 0x2a10, 0xb59: 0x2bf7, 0xb5a: 0x2c0a, 0xb5b: 0x2a1d, 0xb5c: 0x28bc, 0xb5d: 0x28c6,
-	0xb5e: 0x2eb7, 0xb5f: 0x2a2a, 0xb60: 0x2b3c, 0xb61: 0x2ef5, 0xb62: 0x28d0, 0xb63: 0x28da,
-	0xb64: 0x2a37, 0xb65: 0x28e4, 0xb66: 0x28ee, 0xb67: 0x26d0, 0xb68: 0x26d7, 0xb69: 0x28f8,
-	0xb6a: 0x2902, 0xb6b: 0x2c1d, 0xb6c: 0x2a44, 0xb6d: 0x2b4c, 0xb6e: 0x2c30, 0xb6f: 0x2a51,
-	0xb70: 0x2916, 0xb71: 0x290c, 0xb72: 0x2f3c, 0xb73: 0x2a5e, 0xb74: 0x2c43, 0xb75: 0x2920,
-	0xb76: 0x2b5c, 0xb77: 0x292a, 0xb78: 0x2a78, 0xb79: 0x2934, 0xb7a: 0x2a85, 0xb7b: 0x2f06,
-	0xb7c: 0x2a6b, 0xb7d: 0x2b6c, 0xb7e: 0x2a92, 0xb7f: 0x26de,
-	// Block 0x2e, offset 0xb80
-	0xb80: 0x2f17, 0xb81: 0x293e, 0xb82: 0x2948, 0xb83: 0x2a9f, 0xb84: 0x2952, 0xb85: 0x295c,
-	0xb86: 0x2966, 0xb87: 0x2b7c, 0xb88: 0x2aac, 0xb89: 0x26e5, 0xb8a: 0x2c56, 0xb8b: 0x2e90,
-	0xb8c: 0x2b8c, 0xb8d: 0x2ab9, 0xb8e: 0x2ec5, 0xb8f: 0x2970, 0xb90: 0x297a, 0xb91: 0x2ac6,
-	0xb92: 0x26ec, 0xb93: 0x2ad3, 0xb94: 0x2b9c, 0xb95: 0x26f3, 0xb96: 0x2c69, 0xb97: 0x2984,
-	0xb98: 0x1cb7, 0xb99: 0x1ccb, 0xb9a: 0x1cda, 0xb9b: 0x1ce9, 0xb9c: 0x1cf8, 0xb9d: 0x1d07,
-	0xb9e: 0x1d16, 0xb9f: 0x1d25, 0xba0: 0x1d34, 0xba1: 0x1d43, 0xba2: 0x2192, 0xba3: 0x21a4,
-	0xba4: 0x21b6, 0xba5: 0x21c2, 0xba6: 0x21ce, 0xba7: 0x21da, 0xba8: 0x21e6, 0xba9: 0x21f2,
-	0xbaa: 0x21fe, 0xbab: 0x220a, 0xbac: 0x2246, 0xbad: 0x2252, 0xbae: 0x225e, 0xbaf: 0x226a,
-	0xbb0: 0x2276, 0xbb1: 0x1c14, 0xbb2: 0x19c6, 0xbb3: 0x1936, 0xbb4: 0x1be4, 0xbb5: 0x1a47,
-	0xbb6: 0x1a56, 0xbb7: 0x19cc, 0xbb8: 0x1bfc, 0xbb9: 0x1c00, 0xbba: 0x1960, 0xbbb: 0x2701,
-	0xbbc: 0x270f, 0xbbd: 0x26fa, 0xbbe: 0x2708, 0xbbf: 0x2ae0,
-	// Block 0x2f, offset 0xbc0
-	0xbc0: 0x1a4a, 0xbc1: 0x1a32, 0xbc2: 0x1c60, 0xbc3: 0x1a1a, 0xbc4: 0x19f3, 0xbc5: 0x1969,
-	0xbc6: 0x1978, 0xbc7: 0x1948, 0xbc8: 0x1bf0, 0xbc9: 0x1d52, 0xbca: 0x1a4d, 0xbcb: 0x1a35,
-	0xbcc: 0x1c64, 0xbcd: 0x1c70, 0xbce: 0x1a26, 0xbcf: 0x19fc, 0xbd0: 0x1957, 0xbd1: 0x1c1c,
-	0xbd2: 0x1bb0, 0xbd3: 0x1b9c, 0xbd4: 0x1bcc, 0xbd5: 0x1c74, 0xbd6: 0x1a29, 0xbd7: 0x19c9,
-	0xbd8: 0x19ff, 0xbd9: 0x19de, 0xbda: 0x1a41, 0xbdb: 0x1c78, 0xbdc: 0x1a2c, 0xbdd: 0x19c0,
-	0xbde: 0x1a02, 0xbdf: 0x1c3c, 0xbe0: 0x1bf4, 0xbe1: 0x1a14, 0xbe2: 0x1c24, 0xbe3: 0x1c40,
-	0xbe4: 0x1bf8, 0xbe5: 0x1a17, 0xbe6: 0x1c28, 0xbe7: 0x22e8, 0xbe8: 0x22fc, 0xbe9: 0x1996,
-	0xbea: 0x1c20, 0xbeb: 0x1bb4, 0xbec: 0x1ba0, 0xbed: 0x1c48, 0xbee: 0x2716, 0xbef: 0x27ad,
-	0xbf0: 0x1a59, 0xbf1: 0x1a44, 0xbf2: 0x1c7c, 0xbf3: 0x1a2f, 0xbf4: 0x1a50, 0xbf5: 0x1a38,
-	0xbf6: 0x1c68, 0xbf7: 0x1a1d, 0xbf8: 0x19f6, 0xbf9: 0x1981, 0xbfa: 0x1a53, 0xbfb: 0x1a3b,
-	0xbfc: 0x1c6c, 0xbfd: 0x1a20, 0xbfe: 0x19f9, 0xbff: 0x1984,
-	// Block 0x30, offset 0xc00
-	0xc00: 0x1c2c, 0xc01: 0x1bb8, 0xc02: 0x1d4d, 0xc03: 0x1939, 0xc04: 0x19ba, 0xc05: 0x19bd,
-	0xc06: 0x22f5, 0xc07: 0x1b94, 0xc08: 0x19c3, 0xc09: 0x194b, 0xc0a: 0x19e1, 0xc0b: 0x194e,
-	0xc0c: 0x19ea, 0xc0d: 0x196c, 0xc0e: 0x196f, 0xc0f: 0x1a05, 0xc10: 0x1a0b, 0xc11: 0x1a0e,
-	0xc12: 0x1c30, 0xc13: 0x1a11, 0xc14: 0x1a23, 0xc15: 0x1c38, 0xc16: 0x1c44, 0xc17: 0x1990,
-	0xc18: 0x1d57, 0xc19: 0x1bbc, 0xc1a: 0x1993, 0xc1b: 0x1a5c, 0xc1c: 0x19a5, 0xc1d: 0x19b4,
-	0xc1e: 0x22e2, 0xc1f: 0x22dc, 0xc20: 0x1cc1, 0xc21: 0x1cd0, 0xc22: 0x1cdf, 0xc23: 0x1cee,
-	0xc24: 0x1cfd, 0xc25: 0x1d0c, 0xc26: 0x1d1b, 0xc27: 0x1d2a, 0xc28: 0x1d39, 0xc29: 0x2186,
-	0xc2a: 0x2198, 0xc2b: 0x21aa, 0xc2c: 0x21bc, 0xc2d: 0x21c8, 0xc2e: 0x21d4, 0xc2f: 0x21e0,
-	0xc30: 0x21ec, 0xc31: 0x21f8, 0xc32: 0x2204, 0xc33: 0x2240, 0xc34: 0x224c, 0xc35: 0x2258,
-	0xc36: 0x2264, 0xc37: 0x2270, 0xc38: 0x227c, 0xc39: 0x2282, 0xc3a: 0x2288, 0xc3b: 0x228e,
-	0xc3c: 0x2294, 0xc3d: 0x22a6, 0xc3e: 0x22ac, 0xc3f: 0x1c10,
-	// Block 0x31, offset 0xc40
-	0xc40: 0x1377, 0xc41: 0x0cfb, 0xc42: 0x13d3, 0xc43: 0x139f, 0xc44: 0x0e57, 0xc45: 0x06eb,
-	0xc46: 0x08df, 0xc47: 0x162b, 0xc48: 0x162b, 0xc49: 0x0a0b, 0xc4a: 0x145f, 0xc4b: 0x0943,
-	0xc4c: 0x0a07, 0xc4d: 0x0bef, 0xc4e: 0x0fcf, 0xc4f: 0x115f, 0xc50: 0x1297, 0xc51: 0x12d3,
-	0xc52: 0x1307, 0xc53: 0x141b, 0xc54: 0x0d73, 0xc55: 0x0dff, 0xc56: 0x0eab, 0xc57: 0x0f43,
-	0xc58: 0x125f, 0xc59: 0x1447, 0xc5a: 0x1573, 0xc5b: 0x070f, 0xc5c: 0x08b3, 0xc5d: 0x0d87,
-	0xc5e: 0x0ecf, 0xc5f: 0x1293, 0xc60: 0x15c3, 0xc61: 0x0ab3, 0xc62: 0x0e77, 0xc63: 0x1283,
-	0xc64: 0x1317, 0xc65: 0x0c23, 0xc66: 0x11bb, 0xc67: 0x12df, 0xc68: 0x0b1f, 0xc69: 0x0d0f,
-	0xc6a: 0x0e17, 0xc6b: 0x0f1b, 0xc6c: 0x1427, 0xc6d: 0x074f, 0xc6e: 0x07e7, 0xc6f: 0x0853,
-	0xc70: 0x0c8b, 0xc71: 0x0d7f, 0xc72: 0x0ecb, 0xc73: 0x0fef, 0xc74: 0x1177, 0xc75: 0x128b,
-	0xc76: 0x12a3, 0xc77: 0x13c7, 0xc78: 0x14ef, 0xc79: 0x15a3, 0xc7a: 0x15bf, 0xc7b: 0x102b,
-	0xc7c: 0x106b, 0xc7d: 0x1123, 0xc7e: 0x1243, 0xc7f: 0x147b,
-	// Block 0x32, offset 0xc80
-	0xc80: 0x15cb, 0xc81: 0x134b, 0xc82: 0x09c7, 0xc83: 0x0b3b, 0xc84: 0x10db, 0xc85: 0x119b,
-	0xc86: 0x0eff, 0xc87: 0x1033, 0xc88: 0x1397, 0xc89: 0x14e7, 0xc8a: 0x09c3, 0xc8b: 0x0a8f,
-	0xc8c: 0x0d77, 0xc8d: 0x0e2b, 0xc8e: 0x0e5f, 0xc8f: 0x1113, 0xc90: 0x113b, 0xc91: 0x14a7,
-	0xc92: 0x084f, 0xc93: 0x11a7, 0xc94: 0x07f3, 0xc95: 0x07ef, 0xc96: 0x1097, 0xc97: 0x1127,
-	0xc98: 0x125b, 0xc99: 0x14af, 0xc9a: 0x1367, 0xc9b: 0x0c27, 0xc9c: 0x0d73, 0xc9d: 0x1357,
-	0xc9e: 0x06f7, 0xc9f: 0x0a63, 0xca0: 0x0b93, 0xca1: 0x0f2f, 0xca2: 0x0faf, 0xca3: 0x0873,
-	0xca4: 0x103b, 0xca5: 0x075f, 0xca6: 0x0b77, 0xca7: 0x06d7, 0xca8: 0x0deb, 0xca9: 0x0ca3,
-	0xcaa: 0x110f, 0xcab: 0x08c7, 0xcac: 0x09b3, 0xcad: 0x0ffb, 0xcae: 0x1263, 0xcaf: 0x133b,
-	0xcb0: 0x0db7, 0xcb1: 0x13f7, 0xcb2: 0x0de3, 0xcb3: 0x0c37, 0xcb4: 0x121b, 0xcb5: 0x0c57,
-	0xcb6: 0x0fab, 0xcb7: 0x072b, 0xcb8: 0x07a7, 0xcb9: 0x07eb, 0xcba: 0x0d53, 0xcbb: 0x10fb,
-	0xcbc: 0x11f3, 0xcbd: 0x1347, 0xcbe: 0x145b, 0xcbf: 0x085b,
-	// Block 0x33, offset 0xcc0
-	0xcc0: 0x090f, 0xcc1: 0x0a17, 0xcc2: 0x0b2f, 0xcc3: 0x0cbf, 0xcc4: 0x0e7b, 0xcc5: 0x103f,
-	0xcc6: 0x1497, 0xcc7: 0x157b, 0xcc8: 0x15cf, 0xcc9: 0x15e7, 0xcca: 0x0837, 0xccb: 0x0cf3,
-	0xccc: 0x0da3, 0xccd: 0x13eb, 0xcce: 0x0afb, 0xccf: 0x0bd7, 0xcd0: 0x0bf3, 0xcd1: 0x0c83,
-	0xcd2: 0x0e6b, 0xcd3: 0x0eb7, 0xcd4: 0x0f67, 0xcd5: 0x108b, 0xcd6: 0x112f, 0xcd7: 0x1193,
-	0xcd8: 0x13db, 0xcd9: 0x126b, 0xcda: 0x1403, 0xcdb: 0x147f, 0xcdc: 0x080f, 0xcdd: 0x083b,
-	0xcde: 0x0923, 0xcdf: 0x0ea7, 0xce0: 0x12f3, 0xce1: 0x133b, 0xce2: 0x0b1b, 0xce3: 0x0b8b,
-	0xce4: 0x0c4f, 0xce5: 0x0daf, 0xce6: 0x10d7, 0xce7: 0x0f23, 0xce8: 0x073b, 0xce9: 0x097f,
-	0xcea: 0x0a63, 0xceb: 0x0ac7, 0xcec: 0x0b97, 0xced: 0x0f3f, 0xcee: 0x0f5b, 0xcef: 0x116b,
-	0xcf0: 0x118b, 0xcf1: 0x1463, 0xcf2: 0x14e3, 0xcf3: 0x14f3, 0xcf4: 0x152f, 0xcf5: 0x0753,
-	0xcf6: 0x107f, 0xcf7: 0x144f, 0xcf8: 0x14cb, 0xcf9: 0x0baf, 0xcfa: 0x0717, 0xcfb: 0x0777,
-	0xcfc: 0x0a67, 0xcfd: 0x0a87, 0xcfe: 0x0caf, 0xcff: 0x0d73,
-	// Block 0x34, offset 0xd00
-	0xd00: 0x0ec3, 0xd01: 0x0fcb, 0xd02: 0x1277, 0xd03: 0x1417, 0xd04: 0x1623, 0xd05: 0x0ce3,
-	0xd06: 0x14a3, 0xd07: 0x0833, 0xd08: 0x0d2f, 0xd09: 0x0d3b, 0xd0a: 0x0e0f, 0xd0b: 0x0e47,
-	0xd0c: 0x0f4b, 0xd0d: 0x0fa7, 0xd0e: 0x1027, 0xd0f: 0x110b, 0xd10: 0x153b, 0xd11: 0x07af,
-	0xd12: 0x0c03, 0xd13: 0x14b3, 0xd14: 0x0767, 0xd15: 0x0aab, 0xd16: 0x0e2f, 0xd17: 0x13df,
-	0xd18: 0x0b67, 0xd19: 0x0bb7, 0xd1a: 0x0d43, 0xd1b: 0x0f2f, 0xd1c: 0x14bb, 0xd1d: 0x0817,
-	0xd1e: 0x08ff, 0xd1f: 0x0a97, 0xd20: 0x0cd3, 0xd21: 0x0d1f, 0xd22: 0x0d5f, 0xd23: 0x0df3,
-	0xd24: 0x0f47, 0xd25: 0x0fbb, 0xd26: 0x1157, 0xd27: 0x12f7, 0xd28: 0x1303, 0xd29: 0x1457,
-	0xd2a: 0x14d7, 0xd2b: 0x0883, 0xd2c: 0x0e4b, 0xd2d: 0x0903, 0xd2e: 0x0ec7, 0xd2f: 0x0f6b,
-	0xd30: 0x1287, 0xd31: 0x14bf, 0xd32: 0x15ab, 0xd33: 0x15d3, 0xd34: 0x0d37, 0xd35: 0x0e27,
-	0xd36: 0x11c3, 0xd37: 0x10b7, 0xd38: 0x10c3, 0xd39: 0x10e7, 0xd3a: 0x0f17, 0xd3b: 0x0e9f,
-	0xd3c: 0x1363, 0xd3d: 0x0733, 0xd3e: 0x122b, 0xd3f: 0x081b,
-	// Block 0x35, offset 0xd40
-	0xd40: 0x080b, 0xd41: 0x0b0b, 0xd42: 0x0c2b, 0xd43: 0x10f3, 0xd44: 0x0a53, 0xd45: 0x0e03,
-	0xd46: 0x0cef, 0xd47: 0x13e7, 0xd48: 0x12e7, 0xd49: 0x14ab, 0xd4a: 0x1323, 0xd4b: 0x0b27,
-	0xd4c: 0x0787, 0xd4d: 0x095b, 0xd50: 0x09af,
-	0xd52: 0x0cdf, 0xd55: 0x07f7, 0xd56: 0x0f1f, 0xd57: 0x0fe3,
-	0xd58: 0x1047, 0xd59: 0x1063, 0xd5a: 0x1067, 0xd5b: 0x107b, 0xd5c: 0x14fb, 0xd5d: 0x10eb,
-	0xd5e: 0x116f, 0xd60: 0x128f, 0xd62: 0x1353,
-	0xd65: 0x1407, 0xd66: 0x1433,
-	0xd6a: 0x154f, 0xd6b: 0x1553, 0xd6c: 0x1557, 0xd6d: 0x15bb, 0xd6e: 0x142b, 0xd6f: 0x14c7,
-	0xd70: 0x0757, 0xd71: 0x077b, 0xd72: 0x078f, 0xd73: 0x084b, 0xd74: 0x0857, 0xd75: 0x0897,
-	0xd76: 0x094b, 0xd77: 0x0967, 0xd78: 0x096f, 0xd79: 0x09ab, 0xd7a: 0x09b7, 0xd7b: 0x0a93,
-	0xd7c: 0x0a9b, 0xd7d: 0x0ba3, 0xd7e: 0x0bcb, 0xd7f: 0x0bd3,
-	// Block 0x36, offset 0xd80
-	0xd80: 0x0beb, 0xd81: 0x0c97, 0xd82: 0x0cc7, 0xd83: 0x0ce7, 0xd84: 0x0d57, 0xd85: 0x0e1b,
-	0xd86: 0x0e37, 0xd87: 0x0e67, 0xd88: 0x0ebb, 0xd89: 0x0edb, 0xd8a: 0x0f4f, 0xd8b: 0x102f,
-	0xd8c: 0x104b, 0xd8d: 0x1053, 0xd8e: 0x104f, 0xd8f: 0x1057, 0xd90: 0x105b, 0xd91: 0x105f,
-	0xd92: 0x1073, 0xd93: 0x1077, 0xd94: 0x109b, 0xd95: 0x10af, 0xd96: 0x10cb, 0xd97: 0x112f,
-	0xd98: 0x1137, 0xd99: 0x113f, 0xd9a: 0x1153, 0xd9b: 0x117b, 0xd9c: 0x11cb, 0xd9d: 0x11ff,
-	0xd9e: 0x11ff, 0xd9f: 0x1267, 0xda0: 0x130f, 0xda1: 0x1327, 0xda2: 0x135b, 0xda3: 0x135f,
-	0xda4: 0x13a3, 0xda5: 0x13a7, 0xda6: 0x13ff, 0xda7: 0x1407, 0xda8: 0x14db, 0xda9: 0x151f,
-	0xdaa: 0x1537, 0xdab: 0x0b9b, 0xdac: 0x171e, 0xdad: 0x11e3,
-	0xdb0: 0x06df, 0xdb1: 0x07e3, 0xdb2: 0x07a3, 0xdb3: 0x074b, 0xdb4: 0x078b, 0xdb5: 0x07b7,
-	0xdb6: 0x0847, 0xdb7: 0x0863, 0xdb8: 0x094b, 0xdb9: 0x0937, 0xdba: 0x0947, 0xdbb: 0x0963,
-	0xdbc: 0x09af, 0xdbd: 0x09bf, 0xdbe: 0x0a03, 0xdbf: 0x0a0f,
-	// Block 0x37, offset 0xdc0
-	0xdc0: 0x0a2b, 0xdc1: 0x0a3b, 0xdc2: 0x0b23, 0xdc3: 0x0b2b, 0xdc4: 0x0b5b, 0xdc5: 0x0b7b,
-	0xdc6: 0x0bab, 0xdc7: 0x0bc3, 0xdc8: 0x0bb3, 0xdc9: 0x0bd3, 0xdca: 0x0bc7, 0xdcb: 0x0beb,
-	0xdcc: 0x0c07, 0xdcd: 0x0c5f, 0xdce: 0x0c6b, 0xdcf: 0x0c73, 0xdd0: 0x0c9b, 0xdd1: 0x0cdf,
-	0xdd2: 0x0d0f, 0xdd3: 0x0d13, 0xdd4: 0x0d27, 0xdd5: 0x0da7, 0xdd6: 0x0db7, 0xdd7: 0x0e0f,
-	0xdd8: 0x0e5b, 0xdd9: 0x0e53, 0xdda: 0x0e67, 0xddb: 0x0e83, 0xddc: 0x0ebb, 0xddd: 0x1013,
-	0xdde: 0x0edf, 0xddf: 0x0f13, 0xde0: 0x0f1f, 0xde1: 0x0f5f, 0xde2: 0x0f7b, 0xde3: 0x0f9f,
-	0xde4: 0x0fc3, 0xde5: 0x0fc7, 0xde6: 0x0fe3, 0xde7: 0x0fe7, 0xde8: 0x0ff7, 0xde9: 0x100b,
-	0xdea: 0x1007, 0xdeb: 0x1037, 0xdec: 0x10b3, 0xded: 0x10cb, 0xdee: 0x10e3, 0xdef: 0x111b,
-	0xdf0: 0x112f, 0xdf1: 0x114b, 0xdf2: 0x117b, 0xdf3: 0x122f, 0xdf4: 0x1257, 0xdf5: 0x12cb,
-	0xdf6: 0x1313, 0xdf7: 0x131f, 0xdf8: 0x1327, 0xdf9: 0x133f, 0xdfa: 0x1353, 0xdfb: 0x1343,
-	0xdfc: 0x135b, 0xdfd: 0x1357, 0xdfe: 0x134f, 0xdff: 0x135f,
-	// Block 0x38, offset 0xe00
-	0xe00: 0x136b, 0xe01: 0x13a7, 0xe02: 0x13e3, 0xe03: 0x1413, 0xe04: 0x144b, 0xe05: 0x146b,
-	0xe06: 0x14b7, 0xe07: 0x14db, 0xe08: 0x14fb, 0xe09: 0x150f, 0xe0a: 0x151f, 0xe0b: 0x152b,
-	0xe0c: 0x1537, 0xe0d: 0x158b, 0xe0e: 0x162b, 0xe0f: 0x16b5, 0xe10: 0x16b0, 0xe11: 0x16e2,
-	0xe12: 0x0607, 0xe13: 0x062f, 0xe14: 0x0633, 0xe15: 0x1764, 0xe16: 0x1791, 0xe17: 0x1809,
-	0xe18: 0x1617, 0xe19: 0x1627,
-	// Block 0x39, offset 0xe40
-	0xe40: 0x19d5, 0xe41: 0x19d8, 0xe42: 0x19db, 0xe43: 0x1c08, 0xe44: 0x1c0c, 0xe45: 0x1a5f,
-	0xe46: 0x1a5f,
-	0xe53: 0x1d75, 0xe54: 0x1d66, 0xe55: 0x1d6b, 0xe56: 0x1d7a, 0xe57: 0x1d70,
-	0xe5d: 0x4390,
-	0xe5e: 0x8115, 0xe5f: 0x4402, 0xe60: 0x022d, 0xe61: 0x0215, 0xe62: 0x021e, 0xe63: 0x0221,
-	0xe64: 0x0224, 0xe65: 0x0227, 0xe66: 0x022a, 0xe67: 0x0230, 0xe68: 0x0233, 0xe69: 0x0017,
-	0xe6a: 0x43f0, 0xe6b: 0x43f6, 0xe6c: 0x44f4, 0xe6d: 0x44fc, 0xe6e: 0x4348, 0xe6f: 0x434e,
-	0xe70: 0x4354, 0xe71: 0x435a, 0xe72: 0x4366, 0xe73: 0x436c, 0xe74: 0x4372, 0xe75: 0x437e,
-	0xe76: 0x4384, 0xe78: 0x438a, 0xe79: 0x4396, 0xe7a: 0x439c, 0xe7b: 0x43a2,
-	0xe7c: 0x43ae, 0xe7e: 0x43b4,
-	// Block 0x3a, offset 0xe80
-	0xe80: 0x43ba, 0xe81: 0x43c0, 0xe83: 0x43c6, 0xe84: 0x43cc,
-	0xe86: 0x43d8, 0xe87: 0x43de, 0xe88: 0x43e4, 0xe89: 0x43ea, 0xe8a: 0x43fc, 0xe8b: 0x4378,
-	0xe8c: 0x4360, 0xe8d: 0x43a8, 0xe8e: 0x43d2, 0xe8f: 0x1d7f, 0xe90: 0x0299, 0xe91: 0x0299,
-	0xe92: 0x02a2, 0xe93: 0x02a2, 0xe94: 0x02a2, 0xe95: 0x02a2, 0xe96: 0x02a5, 0xe97: 0x02a5,
-	0xe98: 0x02a5, 0xe99: 0x02a5, 0xe9a: 0x02ab, 0xe9b: 0x02ab, 0xe9c: 0x02ab, 0xe9d: 0x02ab,
-	0xe9e: 0x029f, 0xe9f: 0x029f, 0xea0: 0x029f, 0xea1: 0x029f, 0xea2: 0x02a8, 0xea3: 0x02a8,
-	0xea4: 0x02a8, 0xea5: 0x02a8, 0xea6: 0x029c, 0xea7: 0x029c, 0xea8: 0x029c, 0xea9: 0x029c,
-	0xeaa: 0x02cf, 0xeab: 0x02cf, 0xeac: 0x02cf, 0xead: 0x02cf, 0xeae: 0x02d2, 0xeaf: 0x02d2,
-	0xeb0: 0x02d2, 0xeb1: 0x02d2, 0xeb2: 0x02b1, 0xeb3: 0x02b1, 0xeb4: 0x02b1, 0xeb5: 0x02b1,
-	0xeb6: 0x02ae, 0xeb7: 0x02ae, 0xeb8: 0x02ae, 0xeb9: 0x02ae, 0xeba: 0x02b4, 0xebb: 0x02b4,
-	0xebc: 0x02b4, 0xebd: 0x02b4, 0xebe: 0x02b7, 0xebf: 0x02b7,
-	// Block 0x3b, offset 0xec0
-	0xec0: 0x02b7, 0xec1: 0x02b7, 0xec2: 0x02c0, 0xec3: 0x02c0, 0xec4: 0x02bd, 0xec5: 0x02bd,
-	0xec6: 0x02c3, 0xec7: 0x02c3, 0xec8: 0x02ba, 0xec9: 0x02ba, 0xeca: 0x02c9, 0xecb: 0x02c9,
-	0xecc: 0x02c6, 0xecd: 0x02c6, 0xece: 0x02d5, 0xecf: 0x02d5, 0xed0: 0x02d5, 0xed1: 0x02d5,
-	0xed2: 0x02db, 0xed3: 0x02db, 0xed4: 0x02db, 0xed5: 0x02db, 0xed6: 0x02e1, 0xed7: 0x02e1,
-	0xed8: 0x02e1, 0xed9: 0x02e1, 0xeda: 0x02de, 0xedb: 0x02de, 0xedc: 0x02de, 0xedd: 0x02de,
-	0xede: 0x02e4, 0xedf: 0x02e4, 0xee0: 0x02e7, 0xee1: 0x02e7, 0xee2: 0x02e7, 0xee3: 0x02e7,
-	0xee4: 0x446e, 0xee5: 0x446e, 0xee6: 0x02ed, 0xee7: 0x02ed, 0xee8: 0x02ed, 0xee9: 0x02ed,
-	0xeea: 0x02ea, 0xeeb: 0x02ea, 0xeec: 0x02ea, 0xeed: 0x02ea, 0xeee: 0x0308, 0xeef: 0x0308,
-	0xef0: 0x4468, 0xef1: 0x4468,
-	// Block 0x3c, offset 0xf00
-	0xf13: 0x02d8, 0xf14: 0x02d8, 0xf15: 0x02d8, 0xf16: 0x02d8, 0xf17: 0x02f6,
-	0xf18: 0x02f6, 0xf19: 0x02f3, 0xf1a: 0x02f3, 0xf1b: 0x02f9, 0xf1c: 0x02f9, 0xf1d: 0x204f,
-	0xf1e: 0x02ff, 0xf1f: 0x02ff, 0xf20: 0x02f0, 0xf21: 0x02f0, 0xf22: 0x02fc, 0xf23: 0x02fc,
-	0xf24: 0x0305, 0xf25: 0x0305, 0xf26: 0x0305, 0xf27: 0x0305, 0xf28: 0x028d, 0xf29: 0x028d,
-	0xf2a: 0x25aa, 0xf2b: 0x25aa, 0xf2c: 0x261a, 0xf2d: 0x261a, 0xf2e: 0x25e9, 0xf2f: 0x25e9,
-	0xf30: 0x2605, 0xf31: 0x2605, 0xf32: 0x25fe, 0xf33: 0x25fe, 0xf34: 0x260c, 0xf35: 0x260c,
-	0xf36: 0x2613, 0xf37: 0x2613, 0xf38: 0x2613, 0xf39: 0x25f0, 0xf3a: 0x25f0, 0xf3b: 0x25f0,
-	0xf3c: 0x0302, 0xf3d: 0x0302, 0xf3e: 0x0302, 0xf3f: 0x0302,
-	// Block 0x3d, offset 0xf40
-	0xf40: 0x25b1, 0xf41: 0x25b8, 0xf42: 0x25d4, 0xf43: 0x25f0, 0xf44: 0x25f7, 0xf45: 0x1d89,
-	0xf46: 0x1d8e, 0xf47: 0x1d93, 0xf48: 0x1da2, 0xf49: 0x1db1, 0xf4a: 0x1db6, 0xf4b: 0x1dbb,
-	0xf4c: 0x1dc0, 0xf4d: 0x1dc5, 0xf4e: 0x1dd4, 0xf4f: 0x1de3, 0xf50: 0x1de8, 0xf51: 0x1ded,
-	0xf52: 0x1dfc, 0xf53: 0x1e0b, 0xf54: 0x1e10, 0xf55: 0x1e15, 0xf56: 0x1e1a, 0xf57: 0x1e29,
-	0xf58: 0x1e2e, 0xf59: 0x1e3d, 0xf5a: 0x1e42, 0xf5b: 0x1e47, 0xf5c: 0x1e56, 0xf5d: 0x1e5b,
-	0xf5e: 0x1e60, 0xf5f: 0x1e6a, 0xf60: 0x1ea6, 0xf61: 0x1eb5, 0xf62: 0x1ec4, 0xf63: 0x1ec9,
-	0xf64: 0x1ece, 0xf65: 0x1ed8, 0xf66: 0x1ee7, 0xf67: 0x1eec, 0xf68: 0x1efb, 0xf69: 0x1f00,
-	0xf6a: 0x1f05, 0xf6b: 0x1f14, 0xf6c: 0x1f19, 0xf6d: 0x1f28, 0xf6e: 0x1f2d, 0xf6f: 0x1f32,
-	0xf70: 0x1f37, 0xf71: 0x1f3c, 0xf72: 0x1f41, 0xf73: 0x1f46, 0xf74: 0x1f4b, 0xf75: 0x1f50,
-	0xf76: 0x1f55, 0xf77: 0x1f5a, 0xf78: 0x1f5f, 0xf79: 0x1f64, 0xf7a: 0x1f69, 0xf7b: 0x1f6e,
-	0xf7c: 0x1f73, 0xf7d: 0x1f78, 0xf7e: 0x1f7d, 0xf7f: 0x1f87,
-	// Block 0x3e, offset 0xf80
-	0xf80: 0x1f8c, 0xf81: 0x1f91, 0xf82: 0x1f96, 0xf83: 0x1fa0, 0xf84: 0x1fa5, 0xf85: 0x1faf,
-	0xf86: 0x1fb4, 0xf87: 0x1fb9, 0xf88: 0x1fbe, 0xf89: 0x1fc3, 0xf8a: 0x1fc8, 0xf8b: 0x1fcd,
-	0xf8c: 0x1fd2, 0xf8d: 0x1fd7, 0xf8e: 0x1fe6, 0xf8f: 0x1ff5, 0xf90: 0x1ffa, 0xf91: 0x1fff,
-	0xf92: 0x2004, 0xf93: 0x2009, 0xf94: 0x200e, 0xf95: 0x2018, 0xf96: 0x201d, 0xf97: 0x2022,
-	0xf98: 0x2031, 0xf99: 0x2040, 0xf9a: 0x2045, 0xf9b: 0x4420, 0xf9c: 0x4426, 0xf9d: 0x445c,
-	0xf9e: 0x44b3, 0xf9f: 0x44ba, 0xfa0: 0x44c1, 0xfa1: 0x44c8, 0xfa2: 0x44cf, 0xfa3: 0x44d6,
-	0xfa4: 0x25c6, 0xfa5: 0x25cd, 0xfa6: 0x25d4, 0xfa7: 0x25db, 0xfa8: 0x25f0, 0xfa9: 0x25f7,
-	0xfaa: 0x1d98, 0xfab: 0x1d9d, 0xfac: 0x1da2, 0xfad: 0x1da7, 0xfae: 0x1db1, 0xfaf: 0x1db6,
-	0xfb0: 0x1dca, 0xfb1: 0x1dcf, 0xfb2: 0x1dd4, 0xfb3: 0x1dd9, 0xfb4: 0x1de3, 0xfb5: 0x1de8,
-	0xfb6: 0x1df2, 0xfb7: 0x1df7, 0xfb8: 0x1dfc, 0xfb9: 0x1e01, 0xfba: 0x1e0b, 0xfbb: 0x1e10,
-	0xfbc: 0x1f3c, 0xfbd: 0x1f41, 0xfbe: 0x1f50, 0xfbf: 0x1f55,
-	// Block 0x3f, offset 0xfc0
-	0xfc0: 0x1f5a, 0xfc1: 0x1f6e, 0xfc2: 0x1f73, 0xfc3: 0x1f78, 0xfc4: 0x1f7d, 0xfc5: 0x1f96,
-	0xfc6: 0x1fa0, 0xfc7: 0x1fa5, 0xfc8: 0x1faa, 0xfc9: 0x1fbe, 0xfca: 0x1fdc, 0xfcb: 0x1fe1,
-	0xfcc: 0x1fe6, 0xfcd: 0x1feb, 0xfce: 0x1ff5, 0xfcf: 0x1ffa, 0xfd0: 0x445c, 0xfd1: 0x2027,
-	0xfd2: 0x202c, 0xfd3: 0x2031, 0xfd4: 0x2036, 0xfd5: 0x2040, 0xfd6: 0x2045, 0xfd7: 0x25b1,
-	0xfd8: 0x25b8, 0xfd9: 0x25bf, 0xfda: 0x25d4, 0xfdb: 0x25e2, 0xfdc: 0x1d89, 0xfdd: 0x1d8e,
-	0xfde: 0x1d93, 0xfdf: 0x1da2, 0xfe0: 0x1dac, 0xfe1: 0x1dbb, 0xfe2: 0x1dc0, 0xfe3: 0x1dc5,
-	0xfe4: 0x1dd4, 0xfe5: 0x1dde, 0xfe6: 0x1dfc, 0xfe7: 0x1e15, 0xfe8: 0x1e1a, 0xfe9: 0x1e29,
-	0xfea: 0x1e2e, 0xfeb: 0x1e3d, 0xfec: 0x1e47, 0xfed: 0x1e56, 0xfee: 0x1e5b, 0xfef: 0x1e60,
-	0xff0: 0x1e6a, 0xff1: 0x1ea6, 0xff2: 0x1eab, 0xff3: 0x1eb5, 0xff4: 0x1ec4, 0xff5: 0x1ec9,
-	0xff6: 0x1ece, 0xff7: 0x1ed8, 0xff8: 0x1ee7, 0xff9: 0x1efb, 0xffa: 0x1f00, 0xffb: 0x1f05,
-	0xffc: 0x1f14, 0xffd: 0x1f19, 0xffe: 0x1f28, 0xfff: 0x1f2d,
-	// Block 0x40, offset 0x1000
-	0x1000: 0x1f32, 0x1001: 0x1f37, 0x1002: 0x1f46, 0x1003: 0x1f4b, 0x1004: 0x1f5f, 0x1005: 0x1f64,
-	0x1006: 0x1f69, 0x1007: 0x1f6e, 0x1008: 0x1f73, 0x1009: 0x1f87, 0x100a: 0x1f8c, 0x100b: 0x1f91,
-	0x100c: 0x1f96, 0x100d: 0x1f9b, 0x100e: 0x1faf, 0x100f: 0x1fb4, 0x1010: 0x1fb9, 0x1011: 0x1fbe,
-	0x1012: 0x1fcd, 0x1013: 0x1fd2, 0x1014: 0x1fd7, 0x1015: 0x1fe6, 0x1016: 0x1ff0, 0x1017: 0x1fff,
-	0x1018: 0x2004, 0x1019: 0x4450, 0x101a: 0x2018, 0x101b: 0x201d, 0x101c: 0x2022, 0x101d: 0x2031,
-	0x101e: 0x203b, 0x101f: 0x25d4, 0x1020: 0x25e2, 0x1021: 0x1da2, 0x1022: 0x1dac, 0x1023: 0x1dd4,
-	0x1024: 0x1dde, 0x1025: 0x1dfc, 0x1026: 0x1e06, 0x1027: 0x1e6a, 0x1028: 0x1e6f, 0x1029: 0x1e92,
-	0x102a: 0x1e97, 0x102b: 0x1f6e, 0x102c: 0x1f73, 0x102d: 0x1f96, 0x102e: 0x1fe6, 0x102f: 0x1ff0,
-	0x1030: 0x2031, 0x1031: 0x203b, 0x1032: 0x4504, 0x1033: 0x450c, 0x1034: 0x4514, 0x1035: 0x1ef1,
-	0x1036: 0x1ef6, 0x1037: 0x1f0a, 0x1038: 0x1f0f, 0x1039: 0x1f1e, 0x103a: 0x1f23, 0x103b: 0x1e74,
-	0x103c: 0x1e79, 0x103d: 0x1e9c, 0x103e: 0x1ea1, 0x103f: 0x1e33,
-	// Block 0x41, offset 0x1040
-	0x1040: 0x1e38, 0x1041: 0x1e1f, 0x1042: 0x1e24, 0x1043: 0x1e4c, 0x1044: 0x1e51, 0x1045: 0x1eba,
-	0x1046: 0x1ebf, 0x1047: 0x1edd, 0x1048: 0x1ee2, 0x1049: 0x1e7e, 0x104a: 0x1e83, 0x104b: 0x1e88,
-	0x104c: 0x1e92, 0x104d: 0x1e8d, 0x104e: 0x1e65, 0x104f: 0x1eb0, 0x1050: 0x1ed3, 0x1051: 0x1ef1,
-	0x1052: 0x1ef6, 0x1053: 0x1f0a, 0x1054: 0x1f0f, 0x1055: 0x1f1e, 0x1056: 0x1f23, 0x1057: 0x1e74,
-	0x1058: 0x1e79, 0x1059: 0x1e9c, 0x105a: 0x1ea1, 0x105b: 0x1e33, 0x105c: 0x1e38, 0x105d: 0x1e1f,
-	0x105e: 0x1e24, 0x105f: 0x1e4c, 0x1060: 0x1e51, 0x1061: 0x1eba, 0x1062: 0x1ebf, 0x1063: 0x1edd,
-	0x1064: 0x1ee2, 0x1065: 0x1e7e, 0x1066: 0x1e83, 0x1067: 0x1e88, 0x1068: 0x1e92, 0x1069: 0x1e8d,
-	0x106a: 0x1e65, 0x106b: 0x1eb0, 0x106c: 0x1ed3, 0x106d: 0x1e7e, 0x106e: 0x1e83, 0x106f: 0x1e88,
-	0x1070: 0x1e92, 0x1071: 0x1e6f, 0x1072: 0x1e97, 0x1073: 0x1eec, 0x1074: 0x1e56, 0x1075: 0x1e5b,
-	0x1076: 0x1e60, 0x1077: 0x1e7e, 0x1078: 0x1e83, 0x1079: 0x1e88, 0x107a: 0x1eec, 0x107b: 0x1efb,
-	0x107c: 0x4408, 0x107d: 0x4408,
-	// Block 0x42, offset 0x1080
-	0x1090: 0x2311, 0x1091: 0x2326,
-	0x1092: 0x2326, 0x1093: 0x232d, 0x1094: 0x2334, 0x1095: 0x2349, 0x1096: 0x2350, 0x1097: 0x2357,
-	0x1098: 0x237a, 0x1099: 0x237a, 0x109a: 0x239d, 0x109b: 0x2396, 0x109c: 0x23b2, 0x109d: 0x23a4,
-	0x109e: 0x23ab, 0x109f: 0x23ce, 0x10a0: 0x23ce, 0x10a1: 0x23c7, 0x10a2: 0x23d5, 0x10a3: 0x23d5,
-	0x10a4: 0x23ff, 0x10a5: 0x23ff, 0x10a6: 0x241b, 0x10a7: 0x23e3, 0x10a8: 0x23e3, 0x10a9: 0x23dc,
-	0x10aa: 0x23f1, 0x10ab: 0x23f1, 0x10ac: 0x23f8, 0x10ad: 0x23f8, 0x10ae: 0x2422, 0x10af: 0x2430,
-	0x10b0: 0x2430, 0x10b1: 0x2437, 0x10b2: 0x2437, 0x10b3: 0x243e, 0x10b4: 0x2445, 0x10b5: 0x244c,
-	0x10b6: 0x2453, 0x10b7: 0x2453, 0x10b8: 0x245a, 0x10b9: 0x2468, 0x10ba: 0x2476, 0x10bb: 0x246f,
-	0x10bc: 0x247d, 0x10bd: 0x247d, 0x10be: 0x2492, 0x10bf: 0x2499,
-	// Block 0x43, offset 0x10c0
-	0x10c0: 0x24ca, 0x10c1: 0x24d8, 0x10c2: 0x24d1, 0x10c3: 0x24b5, 0x10c4: 0x24b5, 0x10c5: 0x24df,
-	0x10c6: 0x24df, 0x10c7: 0x24e6, 0x10c8: 0x24e6, 0x10c9: 0x2510, 0x10ca: 0x2517, 0x10cb: 0x251e,
-	0x10cc: 0x24f4, 0x10cd: 0x2502, 0x10ce: 0x2525, 0x10cf: 0x252c,
-	0x10d2: 0x24fb, 0x10d3: 0x2580, 0x10d4: 0x2587, 0x10d5: 0x255d, 0x10d6: 0x2564, 0x10d7: 0x2548,
-	0x10d8: 0x2548, 0x10d9: 0x254f, 0x10da: 0x2579, 0x10db: 0x2572, 0x10dc: 0x259c, 0x10dd: 0x259c,
-	0x10de: 0x230a, 0x10df: 0x231f, 0x10e0: 0x2318, 0x10e1: 0x2342, 0x10e2: 0x233b, 0x10e3: 0x2365,
-	0x10e4: 0x235e, 0x10e5: 0x2388, 0x10e6: 0x236c, 0x10e7: 0x2381, 0x10e8: 0x23b9, 0x10e9: 0x2406,
-	0x10ea: 0x23ea, 0x10eb: 0x2429, 0x10ec: 0x24c3, 0x10ed: 0x24ed, 0x10ee: 0x2595, 0x10ef: 0x258e,
-	0x10f0: 0x25a3, 0x10f1: 0x253a, 0x10f2: 0x24a0, 0x10f3: 0x256b, 0x10f4: 0x2492, 0x10f5: 0x24ca,
-	0x10f6: 0x2461, 0x10f7: 0x24ae, 0x10f8: 0x2541, 0x10f9: 0x2533, 0x10fa: 0x24bc, 0x10fb: 0x24a7,
-	0x10fc: 0x24bc, 0x10fd: 0x2541, 0x10fe: 0x2373, 0x10ff: 0x238f,
-	// Block 0x44, offset 0x1100
-	0x1100: 0x2509, 0x1101: 0x2484, 0x1102: 0x2303, 0x1103: 0x24a7, 0x1104: 0x244c, 0x1105: 0x241b,
-	0x1106: 0x23c0, 0x1107: 0x2556,
-	0x1130: 0x2414, 0x1131: 0x248b, 0x1132: 0x27bf, 0x1133: 0x27b6, 0x1134: 0x27ec, 0x1135: 0x27da,
-	0x1136: 0x27c8, 0x1137: 0x27e3, 0x1138: 0x27f5, 0x1139: 0x240d, 0x113a: 0x2c7c, 0x113b: 0x2afc,
-	0x113c: 0x27d1,
-	// Block 0x45, offset 0x1140
-	0x1150: 0x0019, 0x1151: 0x0483,
-	0x1152: 0x0487, 0x1153: 0x0035, 0x1154: 0x0037, 0x1155: 0x0003, 0x1156: 0x003f, 0x1157: 0x04bf,
-	0x1158: 0x04c3, 0x1159: 0x1b5c,
-	0x1160: 0x8132, 0x1161: 0x8132, 0x1162: 0x8132, 0x1163: 0x8132,
-	0x1164: 0x8132, 0x1165: 0x8132, 0x1166: 0x8132, 0x1167: 0x812d, 0x1168: 0x812d, 0x1169: 0x812d,
-	0x116a: 0x812d, 0x116b: 0x812d, 0x116c: 0x812d, 0x116d: 0x812d, 0x116e: 0x8132, 0x116f: 0x8132,
-	0x1170: 0x1873, 0x1171: 0x0443, 0x1172: 0x043f, 0x1173: 0x007f, 0x1174: 0x007f, 0x1175: 0x0011,
-	0x1176: 0x0013, 0x1177: 0x00b7, 0x1178: 0x00bb, 0x1179: 0x04b7, 0x117a: 0x04bb, 0x117b: 0x04ab,
-	0x117c: 0x04af, 0x117d: 0x0493, 0x117e: 0x0497, 0x117f: 0x048b,
-	// Block 0x46, offset 0x1180
-	0x1180: 0x048f, 0x1181: 0x049b, 0x1182: 0x049f, 0x1183: 0x04a3, 0x1184: 0x04a7,
-	0x1187: 0x0077, 0x1188: 0x007b, 0x1189: 0x4269, 0x118a: 0x4269, 0x118b: 0x4269,
-	0x118c: 0x4269, 0x118d: 0x007f, 0x118e: 0x007f, 0x118f: 0x007f, 0x1190: 0x0019, 0x1191: 0x0483,
-	0x1192: 0x001d, 0x1194: 0x0037, 0x1195: 0x0035, 0x1196: 0x003f, 0x1197: 0x0003,
-	0x1198: 0x0443, 0x1199: 0x0011, 0x119a: 0x0013, 0x119b: 0x00b7, 0x119c: 0x00bb, 0x119d: 0x04b7,
-	0x119e: 0x04bb, 0x119f: 0x0007, 0x11a0: 0x000d, 0x11a1: 0x0015, 0x11a2: 0x0017, 0x11a3: 0x001b,
-	0x11a4: 0x0039, 0x11a5: 0x003d, 0x11a6: 0x003b, 0x11a8: 0x0079, 0x11a9: 0x0009,
-	0x11aa: 0x000b, 0x11ab: 0x0041,
-	0x11b0: 0x42aa, 0x11b1: 0x442c, 0x11b2: 0x42af, 0x11b4: 0x42b4,
-	0x11b6: 0x42b9, 0x11b7: 0x4432, 0x11b8: 0x42be, 0x11b9: 0x4438, 0x11ba: 0x42c3, 0x11bb: 0x443e,
-	0x11bc: 0x42c8, 0x11bd: 0x4444, 0x11be: 0x42cd, 0x11bf: 0x444a,
-	// Block 0x47, offset 0x11c0
-	0x11c0: 0x0236, 0x11c1: 0x440e, 0x11c2: 0x440e, 0x11c3: 0x4414, 0x11c4: 0x4414, 0x11c5: 0x4456,
-	0x11c6: 0x4456, 0x11c7: 0x441a, 0x11c8: 0x441a, 0x11c9: 0x4462, 0x11ca: 0x4462, 0x11cb: 0x4462,
-	0x11cc: 0x4462, 0x11cd: 0x0239, 0x11ce: 0x0239, 0x11cf: 0x023c, 0x11d0: 0x023c, 0x11d1: 0x023c,
-	0x11d2: 0x023c, 0x11d3: 0x023f, 0x11d4: 0x023f, 0x11d5: 0x0242, 0x11d6: 0x0242, 0x11d7: 0x0242,
-	0x11d8: 0x0242, 0x11d9: 0x0245, 0x11da: 0x0245, 0x11db: 0x0245, 0x11dc: 0x0245, 0x11dd: 0x0248,
-	0x11de: 0x0248, 0x11df: 0x0248, 0x11e0: 0x0248, 0x11e1: 0x024b, 0x11e2: 0x024b, 0x11e3: 0x024b,
-	0x11e4: 0x024b, 0x11e5: 0x024e, 0x11e6: 0x024e, 0x11e7: 0x024e, 0x11e8: 0x024e, 0x11e9: 0x0251,
-	0x11ea: 0x0251, 0x11eb: 0x0254, 0x11ec: 0x0254, 0x11ed: 0x0257, 0x11ee: 0x0257, 0x11ef: 0x025a,
-	0x11f0: 0x025a, 0x11f1: 0x025d, 0x11f2: 0x025d, 0x11f3: 0x025d, 0x11f4: 0x025d, 0x11f5: 0x0260,
-	0x11f6: 0x0260, 0x11f7: 0x0260, 0x11f8: 0x0260, 0x11f9: 0x0263, 0x11fa: 0x0263, 0x11fb: 0x0263,
-	0x11fc: 0x0263, 0x11fd: 0x0266, 0x11fe: 0x0266, 0x11ff: 0x0266,
-	// Block 0x48, offset 0x1200
-	0x1200: 0x0266, 0x1201: 0x0269, 0x1202: 0x0269, 0x1203: 0x0269, 0x1204: 0x0269, 0x1205: 0x026c,
-	0x1206: 0x026c, 0x1207: 0x026c, 0x1208: 0x026c, 0x1209: 0x026f, 0x120a: 0x026f, 0x120b: 0x026f,
-	0x120c: 0x026f, 0x120d: 0x0272, 0x120e: 0x0272, 0x120f: 0x0272, 0x1210: 0x0272, 0x1211: 0x0275,
-	0x1212: 0x0275, 0x1213: 0x0275, 0x1214: 0x0275, 0x1215: 0x0278, 0x1216: 0x0278, 0x1217: 0x0278,
-	0x1218: 0x0278, 0x1219: 0x027b, 0x121a: 0x027b, 0x121b: 0x027b, 0x121c: 0x027b, 0x121d: 0x027e,
-	0x121e: 0x027e, 0x121f: 0x027e, 0x1220: 0x027e, 0x1221: 0x0281, 0x1222: 0x0281, 0x1223: 0x0281,
-	0x1224: 0x0281, 0x1225: 0x0284, 0x1226: 0x0284, 0x1227: 0x0284, 0x1228: 0x0284, 0x1229: 0x0287,
-	0x122a: 0x0287, 0x122b: 0x0287, 0x122c: 0x0287, 0x122d: 0x028a, 0x122e: 0x028a, 0x122f: 0x028d,
-	0x1230: 0x028d, 0x1231: 0x0290, 0x1232: 0x0290, 0x1233: 0x0290, 0x1234: 0x0290, 0x1235: 0x2e00,
-	0x1236: 0x2e00, 0x1237: 0x2e08, 0x1238: 0x2e08, 0x1239: 0x2e10, 0x123a: 0x2e10, 0x123b: 0x1f82,
-	0x123c: 0x1f82,
-	// Block 0x49, offset 0x1240
-	0x1240: 0x0081, 0x1241: 0x0083, 0x1242: 0x0085, 0x1243: 0x0087, 0x1244: 0x0089, 0x1245: 0x008b,
-	0x1246: 0x008d, 0x1247: 0x008f, 0x1248: 0x0091, 0x1249: 0x0093, 0x124a: 0x0095, 0x124b: 0x0097,
-	0x124c: 0x0099, 0x124d: 0x009b, 0x124e: 0x009d, 0x124f: 0x009f, 0x1250: 0x00a1, 0x1251: 0x00a3,
-	0x1252: 0x00a5, 0x1253: 0x00a7, 0x1254: 0x00a9, 0x1255: 0x00ab, 0x1256: 0x00ad, 0x1257: 0x00af,
-	0x1258: 0x00b1, 0x1259: 0x00b3, 0x125a: 0x00b5, 0x125b: 0x00b7, 0x125c: 0x00b9, 0x125d: 0x00bb,
-	0x125e: 0x00bd, 0x125f: 0x0477, 0x1260: 0x047b, 0x1261: 0x0487, 0x1262: 0x049b, 0x1263: 0x049f,
-	0x1264: 0x0483, 0x1265: 0x05ab, 0x1266: 0x05a3, 0x1267: 0x04c7, 0x1268: 0x04cf, 0x1269: 0x04d7,
-	0x126a: 0x04df, 0x126b: 0x04e7, 0x126c: 0x056b, 0x126d: 0x0573, 0x126e: 0x057b, 0x126f: 0x051f,
-	0x1270: 0x05af, 0x1271: 0x04cb, 0x1272: 0x04d3, 0x1273: 0x04db, 0x1274: 0x04e3, 0x1275: 0x04eb,
-	0x1276: 0x04ef, 0x1277: 0x04f3, 0x1278: 0x04f7, 0x1279: 0x04fb, 0x127a: 0x04ff, 0x127b: 0x0503,
-	0x127c: 0x0507, 0x127d: 0x050b, 0x127e: 0x050f, 0x127f: 0x0513,
-	// Block 0x4a, offset 0x1280
-	0x1280: 0x0517, 0x1281: 0x051b, 0x1282: 0x0523, 0x1283: 0x0527, 0x1284: 0x052b, 0x1285: 0x052f,
-	0x1286: 0x0533, 0x1287: 0x0537, 0x1288: 0x053b, 0x1289: 0x053f, 0x128a: 0x0543, 0x128b: 0x0547,
-	0x128c: 0x054b, 0x128d: 0x054f, 0x128e: 0x0553, 0x128f: 0x0557, 0x1290: 0x055b, 0x1291: 0x055f,
-	0x1292: 0x0563, 0x1293: 0x0567, 0x1294: 0x056f, 0x1295: 0x0577, 0x1296: 0x057f, 0x1297: 0x0583,
-	0x1298: 0x0587, 0x1299: 0x058b, 0x129a: 0x058f, 0x129b: 0x0593, 0x129c: 0x0597, 0x129d: 0x05a7,
-	0x129e: 0x4a78, 0x129f: 0x4a7e, 0x12a0: 0x03c3, 0x12a1: 0x0313, 0x12a2: 0x0317, 0x12a3: 0x4a3b,
-	0x12a4: 0x031b, 0x12a5: 0x4a41, 0x12a6: 0x4a47, 0x12a7: 0x031f, 0x12a8: 0x0323, 0x12a9: 0x0327,
-	0x12aa: 0x4a4d, 0x12ab: 0x4a53, 0x12ac: 0x4a59, 0x12ad: 0x4a5f, 0x12ae: 0x4a65, 0x12af: 0x4a6b,
-	0x12b0: 0x0367, 0x12b1: 0x032b, 0x12b2: 0x032f, 0x12b3: 0x0333, 0x12b4: 0x037b, 0x12b5: 0x0337,
-	0x12b6: 0x033b, 0x12b7: 0x033f, 0x12b8: 0x0343, 0x12b9: 0x0347, 0x12ba: 0x034b, 0x12bb: 0x034f,
-	0x12bc: 0x0353, 0x12bd: 0x0357, 0x12be: 0x035b,
-	// Block 0x4b, offset 0x12c0
-	0x12c2: 0x49bd, 0x12c3: 0x49c3, 0x12c4: 0x49c9, 0x12c5: 0x49cf,
-	0x12c6: 0x49d5, 0x12c7: 0x49db, 0x12ca: 0x49e1, 0x12cb: 0x49e7,
-	0x12cc: 0x49ed, 0x12cd: 0x49f3, 0x12ce: 0x49f9, 0x12cf: 0x49ff,
-	0x12d2: 0x4a05, 0x12d3: 0x4a0b, 0x12d4: 0x4a11, 0x12d5: 0x4a17, 0x12d6: 0x4a1d, 0x12d7: 0x4a23,
-	0x12da: 0x4a29, 0x12db: 0x4a2f, 0x12dc: 0x4a35,
-	0x12e0: 0x00bf, 0x12e1: 0x00c2, 0x12e2: 0x00cb, 0x12e3: 0x4264,
-	0x12e4: 0x00c8, 0x12e5: 0x00c5, 0x12e6: 0x0447, 0x12e8: 0x046b, 0x12e9: 0x044b,
-	0x12ea: 0x044f, 0x12eb: 0x0453, 0x12ec: 0x0457, 0x12ed: 0x046f, 0x12ee: 0x0473,
-	// Block 0x4c, offset 0x1300
-	0x1300: 0x0063, 0x1301: 0x0065, 0x1302: 0x0067, 0x1303: 0x0069, 0x1304: 0x006b, 0x1305: 0x006d,
-	0x1306: 0x006f, 0x1307: 0x0071, 0x1308: 0x0073, 0x1309: 0x0075, 0x130a: 0x0083, 0x130b: 0x0085,
-	0x130c: 0x0087, 0x130d: 0x0089, 0x130e: 0x008b, 0x130f: 0x008d, 0x1310: 0x008f, 0x1311: 0x0091,
-	0x1312: 0x0093, 0x1313: 0x0095, 0x1314: 0x0097, 0x1315: 0x0099, 0x1316: 0x009b, 0x1317: 0x009d,
-	0x1318: 0x009f, 0x1319: 0x00a1, 0x131a: 0x00a3, 0x131b: 0x00a5, 0x131c: 0x00a7, 0x131d: 0x00a9,
-	0x131e: 0x00ab, 0x131f: 0x00ad, 0x1320: 0x00af, 0x1321: 0x00b1, 0x1322: 0x00b3, 0x1323: 0x00b5,
-	0x1324: 0x00dd, 0x1325: 0x00f2, 0x1328: 0x0173, 0x1329: 0x0176,
-	0x132a: 0x0179, 0x132b: 0x017c, 0x132c: 0x017f, 0x132d: 0x0182, 0x132e: 0x0185, 0x132f: 0x0188,
-	0x1330: 0x018b, 0x1331: 0x018e, 0x1332: 0x0191, 0x1333: 0x0194, 0x1334: 0x0197, 0x1335: 0x019a,
-	0x1336: 0x019d, 0x1337: 0x01a0, 0x1338: 0x01a3, 0x1339: 0x0188, 0x133a: 0x01a6, 0x133b: 0x01a9,
-	0x133c: 0x01ac, 0x133d: 0x01af, 0x133e: 0x01b2, 0x133f: 0x01b5,
-	// Block 0x4d, offset 0x1340
-	0x1340: 0x01fd, 0x1341: 0x0200, 0x1342: 0x0203, 0x1343: 0x045b, 0x1344: 0x01c7, 0x1345: 0x01d0,
-	0x1346: 0x01d6, 0x1347: 0x01fa, 0x1348: 0x01eb, 0x1349: 0x01e8, 0x134a: 0x0206, 0x134b: 0x0209,
-	0x134e: 0x0021, 0x134f: 0x0023, 0x1350: 0x0025, 0x1351: 0x0027,
-	0x1352: 0x0029, 0x1353: 0x002b, 0x1354: 0x002d, 0x1355: 0x002f, 0x1356: 0x0031, 0x1357: 0x0033,
-	0x1358: 0x0021, 0x1359: 0x0023, 0x135a: 0x0025, 0x135b: 0x0027, 0x135c: 0x0029, 0x135d: 0x002b,
-	0x135e: 0x002d, 0x135f: 0x002f, 0x1360: 0x0031, 0x1361: 0x0033, 0x1362: 0x0021, 0x1363: 0x0023,
-	0x1364: 0x0025, 0x1365: 0x0027, 0x1366: 0x0029, 0x1367: 0x002b, 0x1368: 0x002d, 0x1369: 0x002f,
-	0x136a: 0x0031, 0x136b: 0x0033, 0x136c: 0x0021, 0x136d: 0x0023, 0x136e: 0x0025, 0x136f: 0x0027,
-	0x1370: 0x0029, 0x1371: 0x002b, 0x1372: 0x002d, 0x1373: 0x002f, 0x1374: 0x0031, 0x1375: 0x0033,
-	0x1376: 0x0021, 0x1377: 0x0023, 0x1378: 0x0025, 0x1379: 0x0027, 0x137a: 0x0029, 0x137b: 0x002b,
-	0x137c: 0x002d, 0x137d: 0x002f, 0x137e: 0x0031, 0x137f: 0x0033,
-	// Block 0x4e, offset 0x1380
-	0x1380: 0x0239, 0x1381: 0x023c, 0x1382: 0x0248, 0x1383: 0x0251, 0x1385: 0x028a,
-	0x1386: 0x025a, 0x1387: 0x024b, 0x1388: 0x0269, 0x1389: 0x0290, 0x138a: 0x027b, 0x138b: 0x027e,
-	0x138c: 0x0281, 0x138d: 0x0284, 0x138e: 0x025d, 0x138f: 0x026f, 0x1390: 0x0275, 0x1391: 0x0263,
-	0x1392: 0x0278, 0x1393: 0x0257, 0x1394: 0x0260, 0x1395: 0x0242, 0x1396: 0x0245, 0x1397: 0x024e,
-	0x1398: 0x0254, 0x1399: 0x0266, 0x139a: 0x026c, 0x139b: 0x0272, 0x139c: 0x0293, 0x139d: 0x02e4,
-	0x139e: 0x02cc, 0x139f: 0x0296, 0x13a1: 0x023c, 0x13a2: 0x0248,
-	0x13a4: 0x0287, 0x13a7: 0x024b, 0x13a9: 0x0290,
-	0x13aa: 0x027b, 0x13ab: 0x027e, 0x13ac: 0x0281, 0x13ad: 0x0284, 0x13ae: 0x025d, 0x13af: 0x026f,
-	0x13b0: 0x0275, 0x13b1: 0x0263, 0x13b2: 0x0278, 0x13b4: 0x0260, 0x13b5: 0x0242,
-	0x13b6: 0x0245, 0x13b7: 0x024e, 0x13b9: 0x0266, 0x13bb: 0x0272,
-	// Block 0x4f, offset 0x13c0
-	0x13c2: 0x0248,
-	0x13c7: 0x024b, 0x13c9: 0x0290, 0x13cb: 0x027e,
-	0x13cd: 0x0284, 0x13ce: 0x025d, 0x13cf: 0x026f, 0x13d1: 0x0263,
-	0x13d2: 0x0278, 0x13d4: 0x0260, 0x13d7: 0x024e,
-	0x13d9: 0x0266, 0x13db: 0x0272, 0x13dd: 0x02e4,
-	0x13df: 0x0296, 0x13e1: 0x023c, 0x13e2: 0x0248,
-	0x13e4: 0x0287, 0x13e7: 0x024b, 0x13e8: 0x0269, 0x13e9: 0x0290,
-	0x13ea: 0x027b, 0x13ec: 0x0281, 0x13ed: 0x0284, 0x13ee: 0x025d, 0x13ef: 0x026f,
-	0x13f0: 0x0275, 0x13f1: 0x0263, 0x13f2: 0x0278, 0x13f4: 0x0260, 0x13f5: 0x0242,
-	0x13f6: 0x0245, 0x13f7: 0x024e, 0x13f9: 0x0266, 0x13fa: 0x026c, 0x13fb: 0x0272,
-	0x13fc: 0x0293, 0x13fe: 0x02cc,
-	// Block 0x50, offset 0x1400
-	0x1400: 0x0239, 0x1401: 0x023c, 0x1402: 0x0248, 0x1403: 0x0251, 0x1404: 0x0287, 0x1405: 0x028a,
-	0x1406: 0x025a, 0x1407: 0x024b, 0x1408: 0x0269, 0x1409: 0x0290, 0x140b: 0x027e,
-	0x140c: 0x0281, 0x140d: 0x0284, 0x140e: 0x025d, 0x140f: 0x026f, 0x1410: 0x0275, 0x1411: 0x0263,
-	0x1412: 0x0278, 0x1413: 0x0257, 0x1414: 0x0260, 0x1415: 0x0242, 0x1416: 0x0245, 0x1417: 0x024e,
-	0x1418: 0x0254, 0x1419: 0x0266, 0x141a: 0x026c, 0x141b: 0x0272,
-	0x1421: 0x023c, 0x1422: 0x0248, 0x1423: 0x0251,
-	0x1425: 0x028a, 0x1426: 0x025a, 0x1427: 0x024b, 0x1428: 0x0269, 0x1429: 0x0290,
-	0x142b: 0x027e, 0x142c: 0x0281, 0x142d: 0x0284, 0x142e: 0x025d, 0x142f: 0x026f,
-	0x1430: 0x0275, 0x1431: 0x0263, 0x1432: 0x0278, 0x1433: 0x0257, 0x1434: 0x0260, 0x1435: 0x0242,
-	0x1436: 0x0245, 0x1437: 0x024e, 0x1438: 0x0254, 0x1439: 0x0266, 0x143a: 0x026c, 0x143b: 0x0272,
-	// Block 0x51, offset 0x1440
-	0x1440: 0x1879, 0x1441: 0x1876, 0x1442: 0x187c, 0x1443: 0x18a0, 0x1444: 0x18c4, 0x1445: 0x18e8,
-	0x1446: 0x190c, 0x1447: 0x1915, 0x1448: 0x191b, 0x1449: 0x1921, 0x144a: 0x1927,
-	0x1450: 0x1a8c, 0x1451: 0x1a90,
-	0x1452: 0x1a94, 0x1453: 0x1a98, 0x1454: 0x1a9c, 0x1455: 0x1aa0, 0x1456: 0x1aa4, 0x1457: 0x1aa8,
-	0x1458: 0x1aac, 0x1459: 0x1ab0, 0x145a: 0x1ab4, 0x145b: 0x1ab8, 0x145c: 0x1abc, 0x145d: 0x1ac0,
-	0x145e: 0x1ac4, 0x145f: 0x1ac8, 0x1460: 0x1acc, 0x1461: 0x1ad0, 0x1462: 0x1ad4, 0x1463: 0x1ad8,
-	0x1464: 0x1adc, 0x1465: 0x1ae0, 0x1466: 0x1ae4, 0x1467: 0x1ae8, 0x1468: 0x1aec, 0x1469: 0x1af0,
-	0x146a: 0x271e, 0x146b: 0x0047, 0x146c: 0x0065, 0x146d: 0x193c, 0x146e: 0x19b1,
-	0x1470: 0x0043, 0x1471: 0x0045, 0x1472: 0x0047, 0x1473: 0x0049, 0x1474: 0x004b, 0x1475: 0x004d,
-	0x1476: 0x004f, 0x1477: 0x0051, 0x1478: 0x0053, 0x1479: 0x0055, 0x147a: 0x0057, 0x147b: 0x0059,
-	0x147c: 0x005b, 0x147d: 0x005d, 0x147e: 0x005f, 0x147f: 0x0061,
-	// Block 0x52, offset 0x1480
-	0x1480: 0x26ad, 0x1481: 0x26c2, 0x1482: 0x0503,
-	0x1490: 0x0c0f, 0x1491: 0x0a47,
-	0x1492: 0x08d3, 0x1493: 0x45c4, 0x1494: 0x071b, 0x1495: 0x09ef, 0x1496: 0x132f, 0x1497: 0x09ff,
-	0x1498: 0x0727, 0x1499: 0x0cd7, 0x149a: 0x0eaf, 0x149b: 0x0caf, 0x149c: 0x0827, 0x149d: 0x0b6b,
-	0x149e: 0x07bf, 0x149f: 0x0cb7, 0x14a0: 0x0813, 0x14a1: 0x1117, 0x14a2: 0x0f83, 0x14a3: 0x138b,
-	0x14a4: 0x09d3, 0x14a5: 0x090b, 0x14a6: 0x0e63, 0x14a7: 0x0c1b, 0x14a8: 0x0c47, 0x14a9: 0x06bf,
-	0x14aa: 0x06cb, 0x14ab: 0x140b, 0x14ac: 0x0adb, 0x14ad: 0x06e7, 0x14ae: 0x08ef, 0x14af: 0x0c3b,
-	0x14b0: 0x13b3, 0x14b1: 0x0c13, 0x14b2: 0x106f, 0x14b3: 0x10ab, 0x14b4: 0x08f7, 0x14b5: 0x0e43,
-	0x14b6: 0x0d0b, 0x14b7: 0x0d07, 0x14b8: 0x0f97, 0x14b9: 0x082b, 0x14ba: 0x0957, 0x14bb: 0x1443,
-	// Block 0x53, offset 0x14c0
-	0x14c0: 0x06fb, 0x14c1: 0x06f3, 0x14c2: 0x0703, 0x14c3: 0x1647, 0x14c4: 0x0747, 0x14c5: 0x0757,
-	0x14c6: 0x075b, 0x14c7: 0x0763, 0x14c8: 0x076b, 0x14c9: 0x076f, 0x14ca: 0x077b, 0x14cb: 0x0773,
-	0x14cc: 0x05b3, 0x14cd: 0x165b, 0x14ce: 0x078f, 0x14cf: 0x0793, 0x14d0: 0x0797, 0x14d1: 0x07b3,
-	0x14d2: 0x164c, 0x14d3: 0x05b7, 0x14d4: 0x079f, 0x14d5: 0x07bf, 0x14d6: 0x1656, 0x14d7: 0x07cf,
-	0x14d8: 0x07d7, 0x14d9: 0x0737, 0x14da: 0x07df, 0x14db: 0x07e3, 0x14dc: 0x1831, 0x14dd: 0x07ff,
-	0x14de: 0x0807, 0x14df: 0x05bf, 0x14e0: 0x081f, 0x14e1: 0x0823, 0x14e2: 0x082b, 0x14e3: 0x082f,
-	0x14e4: 0x05c3, 0x14e5: 0x0847, 0x14e6: 0x084b, 0x14e7: 0x0857, 0x14e8: 0x0863, 0x14e9: 0x0867,
-	0x14ea: 0x086b, 0x14eb: 0x0873, 0x14ec: 0x0893, 0x14ed: 0x0897, 0x14ee: 0x089f, 0x14ef: 0x08af,
-	0x14f0: 0x08b7, 0x14f1: 0x08bb, 0x14f2: 0x08bb, 0x14f3: 0x08bb, 0x14f4: 0x166a, 0x14f5: 0x0e93,
-	0x14f6: 0x08cf, 0x14f7: 0x08d7, 0x14f8: 0x166f, 0x14f9: 0x08e3, 0x14fa: 0x08eb, 0x14fb: 0x08f3,
-	0x14fc: 0x091b, 0x14fd: 0x0907, 0x14fe: 0x0913, 0x14ff: 0x0917,
-	// Block 0x54, offset 0x1500
-	0x1500: 0x091f, 0x1501: 0x0927, 0x1502: 0x092b, 0x1503: 0x0933, 0x1504: 0x093b, 0x1505: 0x093f,
-	0x1506: 0x093f, 0x1507: 0x0947, 0x1508: 0x094f, 0x1509: 0x0953, 0x150a: 0x095f, 0x150b: 0x0983,
-	0x150c: 0x0967, 0x150d: 0x0987, 0x150e: 0x096b, 0x150f: 0x0973, 0x1510: 0x080b, 0x1511: 0x09cf,
-	0x1512: 0x0997, 0x1513: 0x099b, 0x1514: 0x099f, 0x1515: 0x0993, 0x1516: 0x09a7, 0x1517: 0x09a3,
-	0x1518: 0x09bb, 0x1519: 0x1674, 0x151a: 0x09d7, 0x151b: 0x09db, 0x151c: 0x09e3, 0x151d: 0x09ef,
-	0x151e: 0x09f7, 0x151f: 0x0a13, 0x1520: 0x1679, 0x1521: 0x167e, 0x1522: 0x0a1f, 0x1523: 0x0a23,
-	0x1524: 0x0a27, 0x1525: 0x0a1b, 0x1526: 0x0a2f, 0x1527: 0x05c7, 0x1528: 0x05cb, 0x1529: 0x0a37,
-	0x152a: 0x0a3f, 0x152b: 0x0a3f, 0x152c: 0x1683, 0x152d: 0x0a5b, 0x152e: 0x0a5f, 0x152f: 0x0a63,
-	0x1530: 0x0a6b, 0x1531: 0x1688, 0x1532: 0x0a73, 0x1533: 0x0a77, 0x1534: 0x0b4f, 0x1535: 0x0a7f,
-	0x1536: 0x05cf, 0x1537: 0x0a8b, 0x1538: 0x0a9b, 0x1539: 0x0aa7, 0x153a: 0x0aa3, 0x153b: 0x1692,
-	0x153c: 0x0aaf, 0x153d: 0x1697, 0x153e: 0x0abb, 0x153f: 0x0ab7,
-	// Block 0x55, offset 0x1540
-	0x1540: 0x0abf, 0x1541: 0x0acf, 0x1542: 0x0ad3, 0x1543: 0x05d3, 0x1544: 0x0ae3, 0x1545: 0x0aeb,
-	0x1546: 0x0aef, 0x1547: 0x0af3, 0x1548: 0x05d7, 0x1549: 0x169c, 0x154a: 0x05db, 0x154b: 0x0b0f,
-	0x154c: 0x0b13, 0x154d: 0x0b17, 0x154e: 0x0b1f, 0x154f: 0x1863, 0x1550: 0x0b37, 0x1551: 0x16a6,
-	0x1552: 0x16a6, 0x1553: 0x11d7, 0x1554: 0x0b47, 0x1555: 0x0b47, 0x1556: 0x05df, 0x1557: 0x16c9,
-	0x1558: 0x179b, 0x1559: 0x0b57, 0x155a: 0x0b5f, 0x155b: 0x05e3, 0x155c: 0x0b73, 0x155d: 0x0b83,
-	0x155e: 0x0b87, 0x155f: 0x0b8f, 0x1560: 0x0b9f, 0x1561: 0x05eb, 0x1562: 0x05e7, 0x1563: 0x0ba3,
-	0x1564: 0x16ab, 0x1565: 0x0ba7, 0x1566: 0x0bbb, 0x1567: 0x0bbf, 0x1568: 0x0bc3, 0x1569: 0x0bbf,
-	0x156a: 0x0bcf, 0x156b: 0x0bd3, 0x156c: 0x0be3, 0x156d: 0x0bdb, 0x156e: 0x0bdf, 0x156f: 0x0be7,
-	0x1570: 0x0beb, 0x1571: 0x0bef, 0x1572: 0x0bfb, 0x1573: 0x0bff, 0x1574: 0x0c17, 0x1575: 0x0c1f,
-	0x1576: 0x0c2f, 0x1577: 0x0c43, 0x1578: 0x16ba, 0x1579: 0x0c3f, 0x157a: 0x0c33, 0x157b: 0x0c4b,
-	0x157c: 0x0c53, 0x157d: 0x0c67, 0x157e: 0x16bf, 0x157f: 0x0c6f,
-	// Block 0x56, offset 0x1580
-	0x1580: 0x0c63, 0x1581: 0x0c5b, 0x1582: 0x05ef, 0x1583: 0x0c77, 0x1584: 0x0c7f, 0x1585: 0x0c87,
-	0x1586: 0x0c7b, 0x1587: 0x05f3, 0x1588: 0x0c97, 0x1589: 0x0c9f, 0x158a: 0x16c4, 0x158b: 0x0ccb,
-	0x158c: 0x0cff, 0x158d: 0x0cdb, 0x158e: 0x05ff, 0x158f: 0x0ce7, 0x1590: 0x05fb, 0x1591: 0x05f7,
-	0x1592: 0x07c3, 0x1593: 0x07c7, 0x1594: 0x0d03, 0x1595: 0x0ceb, 0x1596: 0x11ab, 0x1597: 0x0663,
-	0x1598: 0x0d0f, 0x1599: 0x0d13, 0x159a: 0x0d17, 0x159b: 0x0d2b, 0x159c: 0x0d23, 0x159d: 0x16dd,
-	0x159e: 0x0603, 0x159f: 0x0d3f, 0x15a0: 0x0d33, 0x15a1: 0x0d4f, 0x15a2: 0x0d57, 0x15a3: 0x16e7,
-	0x15a4: 0x0d5b, 0x15a5: 0x0d47, 0x15a6: 0x0d63, 0x15a7: 0x0607, 0x15a8: 0x0d67, 0x15a9: 0x0d6b,
-	0x15aa: 0x0d6f, 0x15ab: 0x0d7b, 0x15ac: 0x16ec, 0x15ad: 0x0d83, 0x15ae: 0x060b, 0x15af: 0x0d8f,
-	0x15b0: 0x16f1, 0x15b1: 0x0d93, 0x15b2: 0x060f, 0x15b3: 0x0d9f, 0x15b4: 0x0dab, 0x15b5: 0x0db7,
-	0x15b6: 0x0dbb, 0x15b7: 0x16f6, 0x15b8: 0x168d, 0x15b9: 0x16fb, 0x15ba: 0x0ddb, 0x15bb: 0x1700,
-	0x15bc: 0x0de7, 0x15bd: 0x0def, 0x15be: 0x0ddf, 0x15bf: 0x0dfb,
-	// Block 0x57, offset 0x15c0
-	0x15c0: 0x0e0b, 0x15c1: 0x0e1b, 0x15c2: 0x0e0f, 0x15c3: 0x0e13, 0x15c4: 0x0e1f, 0x15c5: 0x0e23,
-	0x15c6: 0x1705, 0x15c7: 0x0e07, 0x15c8: 0x0e3b, 0x15c9: 0x0e3f, 0x15ca: 0x0613, 0x15cb: 0x0e53,
-	0x15cc: 0x0e4f, 0x15cd: 0x170a, 0x15ce: 0x0e33, 0x15cf: 0x0e6f, 0x15d0: 0x170f, 0x15d1: 0x1714,
-	0x15d2: 0x0e73, 0x15d3: 0x0e87, 0x15d4: 0x0e83, 0x15d5: 0x0e7f, 0x15d6: 0x0617, 0x15d7: 0x0e8b,
-	0x15d8: 0x0e9b, 0x15d9: 0x0e97, 0x15da: 0x0ea3, 0x15db: 0x1651, 0x15dc: 0x0eb3, 0x15dd: 0x1719,
-	0x15de: 0x0ebf, 0x15df: 0x1723, 0x15e0: 0x0ed3, 0x15e1: 0x0edf, 0x15e2: 0x0ef3, 0x15e3: 0x1728,
-	0x15e4: 0x0f07, 0x15e5: 0x0f0b, 0x15e6: 0x172d, 0x15e7: 0x1732, 0x15e8: 0x0f27, 0x15e9: 0x0f37,
-	0x15ea: 0x061b, 0x15eb: 0x0f3b, 0x15ec: 0x061f, 0x15ed: 0x061f, 0x15ee: 0x0f53, 0x15ef: 0x0f57,
-	0x15f0: 0x0f5f, 0x15f1: 0x0f63, 0x15f2: 0x0f6f, 0x15f3: 0x0623, 0x15f4: 0x0f87, 0x15f5: 0x1737,
-	0x15f6: 0x0fa3, 0x15f7: 0x173c, 0x15f8: 0x0faf, 0x15f9: 0x16a1, 0x15fa: 0x0fbf, 0x15fb: 0x1741,
-	0x15fc: 0x1746, 0x15fd: 0x174b, 0x15fe: 0x0627, 0x15ff: 0x062b,
-	// Block 0x58, offset 0x1600
-	0x1600: 0x0ff7, 0x1601: 0x1755, 0x1602: 0x1750, 0x1603: 0x175a, 0x1604: 0x175f, 0x1605: 0x0fff,
-	0x1606: 0x1003, 0x1607: 0x1003, 0x1608: 0x100b, 0x1609: 0x0633, 0x160a: 0x100f, 0x160b: 0x0637,
-	0x160c: 0x063b, 0x160d: 0x1769, 0x160e: 0x1023, 0x160f: 0x102b, 0x1610: 0x1037, 0x1611: 0x063f,
-	0x1612: 0x176e, 0x1613: 0x105b, 0x1614: 0x1773, 0x1615: 0x1778, 0x1616: 0x107b, 0x1617: 0x1093,
-	0x1618: 0x0643, 0x1619: 0x109b, 0x161a: 0x109f, 0x161b: 0x10a3, 0x161c: 0x177d, 0x161d: 0x1782,
-	0x161e: 0x1782, 0x161f: 0x10bb, 0x1620: 0x0647, 0x1621: 0x1787, 0x1622: 0x10cf, 0x1623: 0x10d3,
-	0x1624: 0x064b, 0x1625: 0x178c, 0x1626: 0x10ef, 0x1627: 0x064f, 0x1628: 0x10ff, 0x1629: 0x10f7,
-	0x162a: 0x1107, 0x162b: 0x1796, 0x162c: 0x111f, 0x162d: 0x0653, 0x162e: 0x112b, 0x162f: 0x1133,
-	0x1630: 0x1143, 0x1631: 0x0657, 0x1632: 0x17a0, 0x1633: 0x17a5, 0x1634: 0x065b, 0x1635: 0x17aa,
-	0x1636: 0x115b, 0x1637: 0x17af, 0x1638: 0x1167, 0x1639: 0x1173, 0x163a: 0x117b, 0x163b: 0x17b4,
-	0x163c: 0x17b9, 0x163d: 0x118f, 0x163e: 0x17be, 0x163f: 0x1197,
-	// Block 0x59, offset 0x1640
-	0x1640: 0x16ce, 0x1641: 0x065f, 0x1642: 0x11af, 0x1643: 0x11b3, 0x1644: 0x0667, 0x1645: 0x11b7,
-	0x1646: 0x0a33, 0x1647: 0x17c3, 0x1648: 0x17c8, 0x1649: 0x16d3, 0x164a: 0x16d8, 0x164b: 0x11d7,
-	0x164c: 0x11db, 0x164d: 0x13f3, 0x164e: 0x066b, 0x164f: 0x1207, 0x1650: 0x1203, 0x1651: 0x120b,
-	0x1652: 0x083f, 0x1653: 0x120f, 0x1654: 0x1213, 0x1655: 0x1217, 0x1656: 0x121f, 0x1657: 0x17cd,
-	0x1658: 0x121b, 0x1659: 0x1223, 0x165a: 0x1237, 0x165b: 0x123b, 0x165c: 0x1227, 0x165d: 0x123f,
-	0x165e: 0x1253, 0x165f: 0x1267, 0x1660: 0x1233, 0x1661: 0x1247, 0x1662: 0x124b, 0x1663: 0x124f,
-	0x1664: 0x17d2, 0x1665: 0x17dc, 0x1666: 0x17d7, 0x1667: 0x066f, 0x1668: 0x126f, 0x1669: 0x1273,
-	0x166a: 0x127b, 0x166b: 0x17f0, 0x166c: 0x127f, 0x166d: 0x17e1, 0x166e: 0x0673, 0x166f: 0x0677,
-	0x1670: 0x17e6, 0x1671: 0x17eb, 0x1672: 0x067b, 0x1673: 0x129f, 0x1674: 0x12a3, 0x1675: 0x12a7,
-	0x1676: 0x12ab, 0x1677: 0x12b7, 0x1678: 0x12b3, 0x1679: 0x12bf, 0x167a: 0x12bb, 0x167b: 0x12cb,
-	0x167c: 0x12c3, 0x167d: 0x12c7, 0x167e: 0x12cf, 0x167f: 0x067f,
-	// Block 0x5a, offset 0x1680
-	0x1680: 0x12d7, 0x1681: 0x12db, 0x1682: 0x0683, 0x1683: 0x12eb, 0x1684: 0x12ef, 0x1685: 0x17f5,
-	0x1686: 0x12fb, 0x1687: 0x12ff, 0x1688: 0x0687, 0x1689: 0x130b, 0x168a: 0x05bb, 0x168b: 0x17fa,
-	0x168c: 0x17ff, 0x168d: 0x068b, 0x168e: 0x068f, 0x168f: 0x1337, 0x1690: 0x134f, 0x1691: 0x136b,
-	0x1692: 0x137b, 0x1693: 0x1804, 0x1694: 0x138f, 0x1695: 0x1393, 0x1696: 0x13ab, 0x1697: 0x13b7,
-	0x1698: 0x180e, 0x1699: 0x1660, 0x169a: 0x13c3, 0x169b: 0x13bf, 0x169c: 0x13cb, 0x169d: 0x1665,
-	0x169e: 0x13d7, 0x169f: 0x13e3, 0x16a0: 0x1813, 0x16a1: 0x1818, 0x16a2: 0x1423, 0x16a3: 0x142f,
-	0x16a4: 0x1437, 0x16a5: 0x181d, 0x16a6: 0x143b, 0x16a7: 0x1467, 0x16a8: 0x1473, 0x16a9: 0x1477,
-	0x16aa: 0x146f, 0x16ab: 0x1483, 0x16ac: 0x1487, 0x16ad: 0x1822, 0x16ae: 0x1493, 0x16af: 0x0693,
-	0x16b0: 0x149b, 0x16b1: 0x1827, 0x16b2: 0x0697, 0x16b3: 0x14d3, 0x16b4: 0x0ac3, 0x16b5: 0x14eb,
-	0x16b6: 0x182c, 0x16b7: 0x1836, 0x16b8: 0x069b, 0x16b9: 0x069f, 0x16ba: 0x1513, 0x16bb: 0x183b,
-	0x16bc: 0x06a3, 0x16bd: 0x1840, 0x16be: 0x152b, 0x16bf: 0x152b,
-	// Block 0x5b, offset 0x16c0
-	0x16c0: 0x1533, 0x16c1: 0x1845, 0x16c2: 0x154b, 0x16c3: 0x06a7, 0x16c4: 0x155b, 0x16c5: 0x1567,
-	0x16c6: 0x156f, 0x16c7: 0x1577, 0x16c8: 0x06ab, 0x16c9: 0x184a, 0x16ca: 0x158b, 0x16cb: 0x15a7,
-	0x16cc: 0x15b3, 0x16cd: 0x06af, 0x16ce: 0x06b3, 0x16cf: 0x15b7, 0x16d0: 0x184f, 0x16d1: 0x06b7,
-	0x16d2: 0x1854, 0x16d3: 0x1859, 0x16d4: 0x185e, 0x16d5: 0x15db, 0x16d6: 0x06bb, 0x16d7: 0x15ef,
-	0x16d8: 0x15f7, 0x16d9: 0x15fb, 0x16da: 0x1603, 0x16db: 0x160b, 0x16dc: 0x1613, 0x16dd: 0x1868,
-}
-
-// nfkcIndex: 22 blocks, 1408 entries, 1408 bytes
-// Block 0 is the zero block.
-var nfkcIndex = [1408]uint8{
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc2: 0x5a, 0xc3: 0x01, 0xc4: 0x02, 0xc5: 0x03, 0xc6: 0x5b, 0xc7: 0x04,
-	0xc8: 0x05, 0xca: 0x5c, 0xcb: 0x5d, 0xcc: 0x06, 0xcd: 0x07, 0xce: 0x08, 0xcf: 0x09,
-	0xd0: 0x0a, 0xd1: 0x5e, 0xd2: 0x5f, 0xd3: 0x0b, 0xd6: 0x0c, 0xd7: 0x60,
-	0xd8: 0x61, 0xd9: 0x0d, 0xdb: 0x62, 0xdc: 0x63, 0xdd: 0x64, 0xdf: 0x65,
-	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05,
-	0xea: 0x06, 0xeb: 0x07, 0xec: 0x08, 0xed: 0x09, 0xef: 0x0a,
-	0xf0: 0x13,
-	// Block 0x4, offset 0x100
-	0x120: 0x66, 0x121: 0x67, 0x123: 0x68, 0x124: 0x69, 0x125: 0x6a, 0x126: 0x6b, 0x127: 0x6c,
-	0x128: 0x6d, 0x129: 0x6e, 0x12a: 0x6f, 0x12b: 0x70, 0x12c: 0x6b, 0x12d: 0x71, 0x12e: 0x72, 0x12f: 0x73,
-	0x131: 0x74, 0x132: 0x75, 0x133: 0x76, 0x134: 0x77, 0x135: 0x78, 0x137: 0x79,
-	0x138: 0x7a, 0x139: 0x7b, 0x13a: 0x7c, 0x13b: 0x7d, 0x13c: 0x7e, 0x13d: 0x7f, 0x13e: 0x80, 0x13f: 0x81,
-	// Block 0x5, offset 0x140
-	0x140: 0x82, 0x142: 0x83, 0x143: 0x84, 0x144: 0x85, 0x145: 0x86, 0x146: 0x87, 0x147: 0x88,
-	0x14d: 0x89,
-	0x15c: 0x8a, 0x15f: 0x8b,
-	0x162: 0x8c, 0x164: 0x8d,
-	0x168: 0x8e, 0x169: 0x8f, 0x16a: 0x90, 0x16c: 0x0e, 0x16d: 0x91, 0x16e: 0x92, 0x16f: 0x93,
-	0x170: 0x94, 0x173: 0x95, 0x174: 0x96, 0x175: 0x0f, 0x176: 0x10, 0x177: 0x97,
-	0x178: 0x11, 0x179: 0x12, 0x17a: 0x13, 0x17b: 0x14, 0x17c: 0x15, 0x17d: 0x16, 0x17e: 0x17, 0x17f: 0x18,
-	// Block 0x6, offset 0x180
-	0x180: 0x98, 0x181: 0x99, 0x182: 0x9a, 0x183: 0x9b, 0x184: 0x19, 0x185: 0x1a, 0x186: 0x9c, 0x187: 0x9d,
-	0x188: 0x9e, 0x189: 0x1b, 0x18a: 0x1c, 0x18b: 0x9f, 0x18c: 0xa0,
-	0x191: 0x1d, 0x192: 0x1e, 0x193: 0xa1,
-	0x1a8: 0xa2, 0x1a9: 0xa3, 0x1ab: 0xa4,
-	0x1b1: 0xa5, 0x1b3: 0xa6, 0x1b5: 0xa7, 0x1b7: 0xa8,
-	0x1ba: 0xa9, 0x1bb: 0xaa, 0x1bc: 0x1f, 0x1bd: 0x20, 0x1be: 0x21, 0x1bf: 0xab,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0xac, 0x1c1: 0x22, 0x1c2: 0x23, 0x1c3: 0x24, 0x1c4: 0xad, 0x1c5: 0x25, 0x1c6: 0x26,
-	0x1c8: 0x27, 0x1c9: 0x28, 0x1ca: 0x29, 0x1cb: 0x2a, 0x1cc: 0x2b, 0x1cd: 0x2c, 0x1ce: 0x2d, 0x1cf: 0x2e,
-	// Block 0x8, offset 0x200
-	0x219: 0xae, 0x21a: 0xaf, 0x21b: 0xb0, 0x21d: 0xb1, 0x21f: 0xb2,
-	0x220: 0xb3, 0x223: 0xb4, 0x224: 0xb5, 0x225: 0xb6, 0x226: 0xb7, 0x227: 0xb8,
-	0x22a: 0xb9, 0x22b: 0xba, 0x22d: 0xbb, 0x22f: 0xbc,
-	0x230: 0xbd, 0x231: 0xbe, 0x232: 0xbf, 0x233: 0xc0, 0x234: 0xc1, 0x235: 0xc2, 0x236: 0xc3, 0x237: 0xbd,
-	0x238: 0xbe, 0x239: 0xbf, 0x23a: 0xc0, 0x23b: 0xc1, 0x23c: 0xc2, 0x23d: 0xc3, 0x23e: 0xbd, 0x23f: 0xbe,
-	// Block 0x9, offset 0x240
-	0x240: 0xbf, 0x241: 0xc0, 0x242: 0xc1, 0x243: 0xc2, 0x244: 0xc3, 0x245: 0xbd, 0x246: 0xbe, 0x247: 0xbf,
-	0x248: 0xc0, 0x249: 0xc1, 0x24a: 0xc2, 0x24b: 0xc3, 0x24c: 0xbd, 0x24d: 0xbe, 0x24e: 0xbf, 0x24f: 0xc0,
-	0x250: 0xc1, 0x251: 0xc2, 0x252: 0xc3, 0x253: 0xbd, 0x254: 0xbe, 0x255: 0xbf, 0x256: 0xc0, 0x257: 0xc1,
-	0x258: 0xc2, 0x259: 0xc3, 0x25a: 0xbd, 0x25b: 0xbe, 0x25c: 0xbf, 0x25d: 0xc0, 0x25e: 0xc1, 0x25f: 0xc2,
-	0x260: 0xc3, 0x261: 0xbd, 0x262: 0xbe, 0x263: 0xbf, 0x264: 0xc0, 0x265: 0xc1, 0x266: 0xc2, 0x267: 0xc3,
-	0x268: 0xbd, 0x269: 0xbe, 0x26a: 0xbf, 0x26b: 0xc0, 0x26c: 0xc1, 0x26d: 0xc2, 0x26e: 0xc3, 0x26f: 0xbd,
-	0x270: 0xbe, 0x271: 0xbf, 0x272: 0xc0, 0x273: 0xc1, 0x274: 0xc2, 0x275: 0xc3, 0x276: 0xbd, 0x277: 0xbe,
-	0x278: 0xbf, 0x279: 0xc0, 0x27a: 0xc1, 0x27b: 0xc2, 0x27c: 0xc3, 0x27d: 0xbd, 0x27e: 0xbe, 0x27f: 0xbf,
-	// Block 0xa, offset 0x280
-	0x280: 0xc0, 0x281: 0xc1, 0x282: 0xc2, 0x283: 0xc3, 0x284: 0xbd, 0x285: 0xbe, 0x286: 0xbf, 0x287: 0xc0,
-	0x288: 0xc1, 0x289: 0xc2, 0x28a: 0xc3, 0x28b: 0xbd, 0x28c: 0xbe, 0x28d: 0xbf, 0x28e: 0xc0, 0x28f: 0xc1,
-	0x290: 0xc2, 0x291: 0xc3, 0x292: 0xbd, 0x293: 0xbe, 0x294: 0xbf, 0x295: 0xc0, 0x296: 0xc1, 0x297: 0xc2,
-	0x298: 0xc3, 0x299: 0xbd, 0x29a: 0xbe, 0x29b: 0xbf, 0x29c: 0xc0, 0x29d: 0xc1, 0x29e: 0xc2, 0x29f: 0xc3,
-	0x2a0: 0xbd, 0x2a1: 0xbe, 0x2a2: 0xbf, 0x2a3: 0xc0, 0x2a4: 0xc1, 0x2a5: 0xc2, 0x2a6: 0xc3, 0x2a7: 0xbd,
-	0x2a8: 0xbe, 0x2a9: 0xbf, 0x2aa: 0xc0, 0x2ab: 0xc1, 0x2ac: 0xc2, 0x2ad: 0xc3, 0x2ae: 0xbd, 0x2af: 0xbe,
-	0x2b0: 0xbf, 0x2b1: 0xc0, 0x2b2: 0xc1, 0x2b3: 0xc2, 0x2b4: 0xc3, 0x2b5: 0xbd, 0x2b6: 0xbe, 0x2b7: 0xbf,
-	0x2b8: 0xc0, 0x2b9: 0xc1, 0x2ba: 0xc2, 0x2bb: 0xc3, 0x2bc: 0xbd, 0x2bd: 0xbe, 0x2be: 0xbf, 0x2bf: 0xc0,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0xc1, 0x2c1: 0xc2, 0x2c2: 0xc3, 0x2c3: 0xbd, 0x2c4: 0xbe, 0x2c5: 0xbf, 0x2c6: 0xc0, 0x2c7: 0xc1,
-	0x2c8: 0xc2, 0x2c9: 0xc3, 0x2ca: 0xbd, 0x2cb: 0xbe, 0x2cc: 0xbf, 0x2cd: 0xc0, 0x2ce: 0xc1, 0x2cf: 0xc2,
-	0x2d0: 0xc3, 0x2d1: 0xbd, 0x2d2: 0xbe, 0x2d3: 0xbf, 0x2d4: 0xc0, 0x2d5: 0xc1, 0x2d6: 0xc2, 0x2d7: 0xc3,
-	0x2d8: 0xbd, 0x2d9: 0xbe, 0x2da: 0xbf, 0x2db: 0xc0, 0x2dc: 0xc1, 0x2dd: 0xc2, 0x2de: 0xc4,
-	// Block 0xc, offset 0x300
-	0x324: 0x2f, 0x325: 0x30, 0x326: 0x31, 0x327: 0x32,
-	0x328: 0x33, 0x329: 0x34, 0x32a: 0x35, 0x32b: 0x36, 0x32c: 0x37, 0x32d: 0x38, 0x32e: 0x39, 0x32f: 0x3a,
-	0x330: 0x3b, 0x331: 0x3c, 0x332: 0x3d, 0x333: 0x3e, 0x334: 0x3f, 0x335: 0x40, 0x336: 0x41, 0x337: 0x42,
-	0x338: 0x43, 0x339: 0x44, 0x33a: 0x45, 0x33b: 0x46, 0x33c: 0xc5, 0x33d: 0x47, 0x33e: 0x48, 0x33f: 0x49,
-	// Block 0xd, offset 0x340
-	0x347: 0xc6,
-	0x34b: 0xc7, 0x34d: 0xc8,
-	0x368: 0xc9, 0x36b: 0xca,
-	// Block 0xe, offset 0x380
-	0x381: 0xcb, 0x382: 0xcc, 0x384: 0xcd, 0x385: 0xb7, 0x387: 0xce,
-	0x388: 0xcf, 0x38b: 0xd0, 0x38c: 0x6b, 0x38d: 0xd1,
-	0x391: 0xd2, 0x392: 0xd3, 0x393: 0xd4, 0x396: 0xd5, 0x397: 0xd6,
-	0x398: 0xd7, 0x39a: 0xd8, 0x39c: 0xd9,
-	0x3b0: 0xd7,
-	// Block 0xf, offset 0x3c0
-	0x3eb: 0xda, 0x3ec: 0xdb,
-	// Block 0x10, offset 0x400
-	0x432: 0xdc,
-	// Block 0x11, offset 0x440
-	0x445: 0xdd, 0x446: 0xde, 0x447: 0xdf,
-	0x449: 0xe0,
-	0x450: 0xe1, 0x451: 0xe2, 0x452: 0xe3, 0x453: 0xe4, 0x454: 0xe5, 0x455: 0xe6, 0x456: 0xe7, 0x457: 0xe8,
-	0x458: 0xe9, 0x459: 0xea, 0x45a: 0x4a, 0x45b: 0xeb, 0x45c: 0xec, 0x45d: 0xed, 0x45e: 0xee, 0x45f: 0x4b,
-	// Block 0x12, offset 0x480
-	0x480: 0xef,
-	0x4a3: 0xf0, 0x4a5: 0xf1,
-	0x4b8: 0x4c, 0x4b9: 0x4d, 0x4ba: 0x4e,
-	// Block 0x13, offset 0x4c0
-	0x4c4: 0x4f, 0x4c5: 0xf2, 0x4c6: 0xf3,
-	0x4c8: 0x50, 0x4c9: 0xf4,
-	// Block 0x14, offset 0x500
-	0x520: 0x51, 0x521: 0x52, 0x522: 0x53, 0x523: 0x54, 0x524: 0x55, 0x525: 0x56, 0x526: 0x57, 0x527: 0x58,
-	0x528: 0x59,
-	// Block 0x15, offset 0x540
-	0x550: 0x0b, 0x551: 0x0c, 0x556: 0x0d,
-	0x55b: 0x0e, 0x55d: 0x0f, 0x55e: 0x10, 0x55f: 0x11,
-	0x56f: 0x12,
-}
-
-// nfkcSparseOffset: 155 entries, 310 bytes
-var nfkcSparseOffset = []uint16{0x0, 0xe, 0x12, 0x1b, 0x25, 0x35, 0x37, 0x3c, 0x47, 0x56, 0x63, 0x6b, 0x6f, 0x74, 0x76, 0x87, 0x8f, 0x96, 0x99, 0xa0, 0xa4, 0xa8, 0xaa, 0xac, 0xb5, 0xb9, 0xc0, 0xc5, 0xc8, 0xd2, 0xd4, 0xdb, 0xe3, 0xe7, 0xe9, 0xec, 0xf0, 0xf6, 0x107, 0x113, 0x115, 0x11b, 0x11d, 0x11f, 0x121, 0x123, 0x125, 0x127, 0x129, 0x12c, 0x12f, 0x131, 0x134, 0x137, 0x13b, 0x140, 0x149, 0x14b, 0x14e, 0x150, 0x15b, 0x166, 0x176, 0x184, 0x192, 0x1a2, 0x1b0, 0x1b7, 0x1bd, 0x1cc, 0x1d0, 0x1d2, 0x1d6, 0x1d8, 0x1db, 0x1dd, 0x1e0, 0x1e2, 0x1e5, 0x1e7, 0x1e9, 0x1eb, 0x1f7, 0x201, 0x20b, 0x20e, 0x212, 0x214, 0x216, 0x218, 0x21a, 0x21d, 0x21f, 0x221, 0x223, 0x225, 0x22b, 0x22e, 0x232, 0x234, 0x23b, 0x241, 0x247, 0x24f, 0x255, 0x25b, 0x261, 0x265, 0x267, 0x269, 0x26b, 0x26d, 0x273, 0x276, 0x279, 0x281, 0x288, 0x28b, 0x28e, 0x290, 0x298, 0x29b, 0x2a2, 0x2a5, 0x2ab, 0x2ad, 0x2af, 0x2b2, 0x2b4, 0x2b6, 0x2b8, 0x2ba, 0x2c7, 0x2d1, 0x2d3, 0x2d5, 0x2d9, 0x2de, 0x2ea, 0x2ef, 0x2f8, 0x2fe, 0x303, 0x307, 0x30c, 0x310, 0x320, 0x32e, 0x33c, 0x34a, 0x350, 0x352, 0x355, 0x35f, 0x361}
-
-// nfkcSparseValues: 875 entries, 3500 bytes
-var nfkcSparseValues = [875]valueRange{
-	// Block 0x0, offset 0x0
-	{value: 0x0002, lo: 0x0d},
-	{value: 0x0001, lo: 0xa0, hi: 0xa0},
-	{value: 0x4278, lo: 0xa8, hi: 0xa8},
-	{value: 0x0083, lo: 0xaa, hi: 0xaa},
-	{value: 0x4264, lo: 0xaf, hi: 0xaf},
-	{value: 0x0025, lo: 0xb2, hi: 0xb3},
-	{value: 0x425a, lo: 0xb4, hi: 0xb4},
-	{value: 0x01dc, lo: 0xb5, hi: 0xb5},
-	{value: 0x4291, lo: 0xb8, hi: 0xb8},
-	{value: 0x0023, lo: 0xb9, hi: 0xb9},
-	{value: 0x009f, lo: 0xba, hi: 0xba},
-	{value: 0x221c, lo: 0xbc, hi: 0xbc},
-	{value: 0x2210, lo: 0xbd, hi: 0xbd},
-	{value: 0x22b2, lo: 0xbe, hi: 0xbe},
-	// Block 0x1, offset 0xe
-	{value: 0x0091, lo: 0x03},
-	{value: 0x46e2, lo: 0xa0, hi: 0xa1},
-	{value: 0x4714, lo: 0xaf, hi: 0xb0},
-	{value: 0xa000, lo: 0xb7, hi: 0xb7},
-	// Block 0x2, offset 0x12
-	{value: 0x0003, lo: 0x08},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0x0091, lo: 0xb0, hi: 0xb0},
-	{value: 0x0119, lo: 0xb1, hi: 0xb1},
-	{value: 0x0095, lo: 0xb2, hi: 0xb2},
-	{value: 0x00a5, lo: 0xb3, hi: 0xb3},
-	{value: 0x0143, lo: 0xb4, hi: 0xb6},
-	{value: 0x00af, lo: 0xb7, hi: 0xb7},
-	{value: 0x00b3, lo: 0xb8, hi: 0xb8},
-	// Block 0x3, offset 0x1b
-	{value: 0x000a, lo: 0x09},
-	{value: 0x426e, lo: 0x98, hi: 0x98},
-	{value: 0x4273, lo: 0x99, hi: 0x9a},
-	{value: 0x4296, lo: 0x9b, hi: 0x9b},
-	{value: 0x425f, lo: 0x9c, hi: 0x9c},
-	{value: 0x4282, lo: 0x9d, hi: 0x9d},
-	{value: 0x0113, lo: 0xa0, hi: 0xa0},
-	{value: 0x0099, lo: 0xa1, hi: 0xa1},
-	{value: 0x00a7, lo: 0xa2, hi: 0xa3},
-	{value: 0x0167, lo: 0xa4, hi: 0xa4},
-	// Block 0x4, offset 0x25
-	{value: 0x0000, lo: 0x0f},
-	{value: 0xa000, lo: 0x83, hi: 0x83},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0xa000, lo: 0x8b, hi: 0x8b},
-	{value: 0xa000, lo: 0x8d, hi: 0x8d},
-	{value: 0x37a5, lo: 0x90, hi: 0x90},
-	{value: 0x37b1, lo: 0x91, hi: 0x91},
-	{value: 0x379f, lo: 0x93, hi: 0x93},
-	{value: 0xa000, lo: 0x96, hi: 0x96},
-	{value: 0x3817, lo: 0x97, hi: 0x97},
-	{value: 0x37e1, lo: 0x9c, hi: 0x9c},
-	{value: 0x37c9, lo: 0x9d, hi: 0x9d},
-	{value: 0x37f3, lo: 0x9e, hi: 0x9e},
-	{value: 0xa000, lo: 0xb4, hi: 0xb5},
-	{value: 0x381d, lo: 0xb6, hi: 0xb6},
-	{value: 0x3823, lo: 0xb7, hi: 0xb7},
-	// Block 0x5, offset 0x35
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0x83, hi: 0x87},
-	// Block 0x6, offset 0x37
-	{value: 0x0001, lo: 0x04},
-	{value: 0x8113, lo: 0x81, hi: 0x82},
-	{value: 0x8132, lo: 0x84, hi: 0x84},
-	{value: 0x812d, lo: 0x85, hi: 0x85},
-	{value: 0x810d, lo: 0x87, hi: 0x87},
-	// Block 0x7, offset 0x3c
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x8132, lo: 0x90, hi: 0x97},
-	{value: 0x8119, lo: 0x98, hi: 0x98},
-	{value: 0x811a, lo: 0x99, hi: 0x99},
-	{value: 0x811b, lo: 0x9a, hi: 0x9a},
-	{value: 0x3841, lo: 0xa2, hi: 0xa2},
-	{value: 0x3847, lo: 0xa3, hi: 0xa3},
-	{value: 0x3853, lo: 0xa4, hi: 0xa4},
-	{value: 0x384d, lo: 0xa5, hi: 0xa5},
-	{value: 0x3859, lo: 0xa6, hi: 0xa6},
-	{value: 0xa000, lo: 0xa7, hi: 0xa7},
-	// Block 0x8, offset 0x47
-	{value: 0x0000, lo: 0x0e},
-	{value: 0x386b, lo: 0x80, hi: 0x80},
-	{value: 0xa000, lo: 0x81, hi: 0x81},
-	{value: 0x385f, lo: 0x82, hi: 0x82},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0x3865, lo: 0x93, hi: 0x93},
-	{value: 0xa000, lo: 0x95, hi: 0x95},
-	{value: 0x8132, lo: 0x96, hi: 0x9c},
-	{value: 0x8132, lo: 0x9f, hi: 0xa2},
-	{value: 0x812d, lo: 0xa3, hi: 0xa3},
-	{value: 0x8132, lo: 0xa4, hi: 0xa4},
-	{value: 0x8132, lo: 0xa7, hi: 0xa8},
-	{value: 0x812d, lo: 0xaa, hi: 0xaa},
-	{value: 0x8132, lo: 0xab, hi: 0xac},
-	{value: 0x812d, lo: 0xad, hi: 0xad},
-	// Block 0x9, offset 0x56
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x811f, lo: 0x91, hi: 0x91},
-	{value: 0x8132, lo: 0xb0, hi: 0xb0},
-	{value: 0x812d, lo: 0xb1, hi: 0xb1},
-	{value: 0x8132, lo: 0xb2, hi: 0xb3},
-	{value: 0x812d, lo: 0xb4, hi: 0xb4},
-	{value: 0x8132, lo: 0xb5, hi: 0xb6},
-	{value: 0x812d, lo: 0xb7, hi: 0xb9},
-	{value: 0x8132, lo: 0xba, hi: 0xba},
-	{value: 0x812d, lo: 0xbb, hi: 0xbc},
-	{value: 0x8132, lo: 0xbd, hi: 0xbd},
-	{value: 0x812d, lo: 0xbe, hi: 0xbe},
-	{value: 0x8132, lo: 0xbf, hi: 0xbf},
-	// Block 0xa, offset 0x63
-	{value: 0x0005, lo: 0x07},
-	{value: 0x8132, lo: 0x80, hi: 0x80},
-	{value: 0x8132, lo: 0x81, hi: 0x81},
-	{value: 0x812d, lo: 0x82, hi: 0x83},
-	{value: 0x812d, lo: 0x84, hi: 0x85},
-	{value: 0x812d, lo: 0x86, hi: 0x87},
-	{value: 0x812d, lo: 0x88, hi: 0x89},
-	{value: 0x8132, lo: 0x8a, hi: 0x8a},
-	// Block 0xb, offset 0x6b
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8132, lo: 0xab, hi: 0xb1},
-	{value: 0x812d, lo: 0xb2, hi: 0xb2},
-	{value: 0x8132, lo: 0xb3, hi: 0xb3},
-	// Block 0xc, offset 0x6f
-	{value: 0x0000, lo: 0x04},
-	{value: 0x8132, lo: 0x96, hi: 0x99},
-	{value: 0x8132, lo: 0x9b, hi: 0xa3},
-	{value: 0x8132, lo: 0xa5, hi: 0xa7},
-	{value: 0x8132, lo: 0xa9, hi: 0xad},
-	// Block 0xd, offset 0x74
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0x99, hi: 0x9b},
-	// Block 0xe, offset 0x76
-	{value: 0x0000, lo: 0x10},
-	{value: 0x8132, lo: 0x94, hi: 0xa1},
-	{value: 0x812d, lo: 0xa3, hi: 0xa3},
-	{value: 0x8132, lo: 0xa4, hi: 0xa5},
-	{value: 0x812d, lo: 0xa6, hi: 0xa6},
-	{value: 0x8132, lo: 0xa7, hi: 0xa8},
-	{value: 0x812d, lo: 0xa9, hi: 0xa9},
-	{value: 0x8132, lo: 0xaa, hi: 0xac},
-	{value: 0x812d, lo: 0xad, hi: 0xaf},
-	{value: 0x8116, lo: 0xb0, hi: 0xb0},
-	{value: 0x8117, lo: 0xb1, hi: 0xb1},
-	{value: 0x8118, lo: 0xb2, hi: 0xb2},
-	{value: 0x8132, lo: 0xb3, hi: 0xb5},
-	{value: 0x812d, lo: 0xb6, hi: 0xb6},
-	{value: 0x8132, lo: 0xb7, hi: 0xb8},
-	{value: 0x812d, lo: 0xb9, hi: 0xba},
-	{value: 0x8132, lo: 0xbb, hi: 0xbf},
-	// Block 0xf, offset 0x87
-	{value: 0x0000, lo: 0x07},
-	{value: 0xa000, lo: 0xa8, hi: 0xa8},
-	{value: 0x3ed8, lo: 0xa9, hi: 0xa9},
-	{value: 0xa000, lo: 0xb0, hi: 0xb0},
-	{value: 0x3ee0, lo: 0xb1, hi: 0xb1},
-	{value: 0xa000, lo: 0xb3, hi: 0xb3},
-	{value: 0x3ee8, lo: 0xb4, hi: 0xb4},
-	{value: 0x9902, lo: 0xbc, hi: 0xbc},
-	// Block 0x10, offset 0x8f
-	{value: 0x0008, lo: 0x06},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x8132, lo: 0x91, hi: 0x91},
-	{value: 0x812d, lo: 0x92, hi: 0x92},
-	{value: 0x8132, lo: 0x93, hi: 0x93},
-	{value: 0x8132, lo: 0x94, hi: 0x94},
-	{value: 0x451c, lo: 0x98, hi: 0x9f},
-	// Block 0x11, offset 0x96
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8102, lo: 0xbc, hi: 0xbc},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x12, offset 0x99
-	{value: 0x0008, lo: 0x06},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0x2c9e, lo: 0x8b, hi: 0x8c},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	{value: 0x455c, lo: 0x9c, hi: 0x9d},
-	{value: 0x456c, lo: 0x9f, hi: 0x9f},
-	// Block 0x13, offset 0xa0
-	{value: 0x0000, lo: 0x03},
-	{value: 0x4594, lo: 0xb3, hi: 0xb3},
-	{value: 0x459c, lo: 0xb6, hi: 0xb6},
-	{value: 0x8102, lo: 0xbc, hi: 0xbc},
-	// Block 0x14, offset 0xa4
-	{value: 0x0008, lo: 0x03},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x4574, lo: 0x99, hi: 0x9b},
-	{value: 0x458c, lo: 0x9e, hi: 0x9e},
-	// Block 0x15, offset 0xa8
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8102, lo: 0xbc, hi: 0xbc},
-	// Block 0x16, offset 0xaa
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	// Block 0x17, offset 0xac
-	{value: 0x0000, lo: 0x08},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0x2cb6, lo: 0x88, hi: 0x88},
-	{value: 0x2cae, lo: 0x8b, hi: 0x8b},
-	{value: 0x2cbe, lo: 0x8c, hi: 0x8c},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x96, hi: 0x97},
-	{value: 0x45a4, lo: 0x9c, hi: 0x9c},
-	{value: 0x45ac, lo: 0x9d, hi: 0x9d},
-	// Block 0x18, offset 0xb5
-	{value: 0x0000, lo: 0x03},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0x2cc6, lo: 0x94, hi: 0x94},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x19, offset 0xb9
-	{value: 0x0000, lo: 0x06},
-	{value: 0xa000, lo: 0x86, hi: 0x87},
-	{value: 0x2cce, lo: 0x8a, hi: 0x8a},
-	{value: 0x2cde, lo: 0x8b, hi: 0x8b},
-	{value: 0x2cd6, lo: 0x8c, hi: 0x8c},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	// Block 0x1a, offset 0xc0
-	{value: 0x1801, lo: 0x04},
-	{value: 0xa000, lo: 0x86, hi: 0x86},
-	{value: 0x3ef0, lo: 0x88, hi: 0x88},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x8120, lo: 0x95, hi: 0x96},
-	// Block 0x1b, offset 0xc5
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8102, lo: 0xbc, hi: 0xbc},
-	{value: 0xa000, lo: 0xbf, hi: 0xbf},
-	// Block 0x1c, offset 0xc8
-	{value: 0x0000, lo: 0x09},
-	{value: 0x2ce6, lo: 0x80, hi: 0x80},
-	{value: 0x9900, lo: 0x82, hi: 0x82},
-	{value: 0xa000, lo: 0x86, hi: 0x86},
-	{value: 0x2cee, lo: 0x87, hi: 0x87},
-	{value: 0x2cf6, lo: 0x88, hi: 0x88},
-	{value: 0x2f50, lo: 0x8a, hi: 0x8a},
-	{value: 0x2dd8, lo: 0x8b, hi: 0x8b},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x95, hi: 0x96},
-	// Block 0x1d, offset 0xd2
-	{value: 0x0000, lo: 0x01},
-	{value: 0x9900, lo: 0xbe, hi: 0xbe},
-	// Block 0x1e, offset 0xd4
-	{value: 0x0000, lo: 0x06},
-	{value: 0xa000, lo: 0x86, hi: 0x87},
-	{value: 0x2cfe, lo: 0x8a, hi: 0x8a},
-	{value: 0x2d0e, lo: 0x8b, hi: 0x8b},
-	{value: 0x2d06, lo: 0x8c, hi: 0x8c},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	// Block 0x1f, offset 0xdb
-	{value: 0x6bea, lo: 0x07},
-	{value: 0x9904, lo: 0x8a, hi: 0x8a},
-	{value: 0x9900, lo: 0x8f, hi: 0x8f},
-	{value: 0xa000, lo: 0x99, hi: 0x99},
-	{value: 0x3ef8, lo: 0x9a, hi: 0x9a},
-	{value: 0x2f58, lo: 0x9c, hi: 0x9c},
-	{value: 0x2de3, lo: 0x9d, hi: 0x9d},
-	{value: 0x2d16, lo: 0x9e, hi: 0x9f},
-	// Block 0x20, offset 0xe3
-	{value: 0x0000, lo: 0x03},
-	{value: 0x2621, lo: 0xb3, hi: 0xb3},
-	{value: 0x8122, lo: 0xb8, hi: 0xb9},
-	{value: 0x8104, lo: 0xba, hi: 0xba},
-	// Block 0x21, offset 0xe7
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8123, lo: 0x88, hi: 0x8b},
-	// Block 0x22, offset 0xe9
-	{value: 0x0000, lo: 0x02},
-	{value: 0x2636, lo: 0xb3, hi: 0xb3},
-	{value: 0x8124, lo: 0xb8, hi: 0xb9},
-	// Block 0x23, offset 0xec
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8125, lo: 0x88, hi: 0x8b},
-	{value: 0x2628, lo: 0x9c, hi: 0x9c},
-	{value: 0x262f, lo: 0x9d, hi: 0x9d},
-	// Block 0x24, offset 0xf0
-	{value: 0x0000, lo: 0x05},
-	{value: 0x030b, lo: 0x8c, hi: 0x8c},
-	{value: 0x812d, lo: 0x98, hi: 0x99},
-	{value: 0x812d, lo: 0xb5, hi: 0xb5},
-	{value: 0x812d, lo: 0xb7, hi: 0xb7},
-	{value: 0x812b, lo: 0xb9, hi: 0xb9},
-	// Block 0x25, offset 0xf6
-	{value: 0x0000, lo: 0x10},
-	{value: 0x2644, lo: 0x83, hi: 0x83},
-	{value: 0x264b, lo: 0x8d, hi: 0x8d},
-	{value: 0x2652, lo: 0x92, hi: 0x92},
-	{value: 0x2659, lo: 0x97, hi: 0x97},
-	{value: 0x2660, lo: 0x9c, hi: 0x9c},
-	{value: 0x263d, lo: 0xa9, hi: 0xa9},
-	{value: 0x8126, lo: 0xb1, hi: 0xb1},
-	{value: 0x8127, lo: 0xb2, hi: 0xb2},
-	{value: 0x4a84, lo: 0xb3, hi: 0xb3},
-	{value: 0x8128, lo: 0xb4, hi: 0xb4},
-	{value: 0x4a8d, lo: 0xb5, hi: 0xb5},
-	{value: 0x45b4, lo: 0xb6, hi: 0xb6},
-	{value: 0x45f4, lo: 0xb7, hi: 0xb7},
-	{value: 0x45bc, lo: 0xb8, hi: 0xb8},
-	{value: 0x45ff, lo: 0xb9, hi: 0xb9},
-	{value: 0x8127, lo: 0xba, hi: 0xbd},
-	// Block 0x26, offset 0x107
-	{value: 0x0000, lo: 0x0b},
-	{value: 0x8127, lo: 0x80, hi: 0x80},
-	{value: 0x4a96, lo: 0x81, hi: 0x81},
-	{value: 0x8132, lo: 0x82, hi: 0x83},
-	{value: 0x8104, lo: 0x84, hi: 0x84},
-	{value: 0x8132, lo: 0x86, hi: 0x87},
-	{value: 0x266e, lo: 0x93, hi: 0x93},
-	{value: 0x2675, lo: 0x9d, hi: 0x9d},
-	{value: 0x267c, lo: 0xa2, hi: 0xa2},
-	{value: 0x2683, lo: 0xa7, hi: 0xa7},
-	{value: 0x268a, lo: 0xac, hi: 0xac},
-	{value: 0x2667, lo: 0xb9, hi: 0xb9},
-	// Block 0x27, offset 0x113
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0x86, hi: 0x86},
-	// Block 0x28, offset 0x115
-	{value: 0x0000, lo: 0x05},
-	{value: 0xa000, lo: 0xa5, hi: 0xa5},
-	{value: 0x2d1e, lo: 0xa6, hi: 0xa6},
-	{value: 0x9900, lo: 0xae, hi: 0xae},
-	{value: 0x8102, lo: 0xb7, hi: 0xb7},
-	{value: 0x8104, lo: 0xb9, hi: 0xba},
-	// Block 0x29, offset 0x11b
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0x8d, hi: 0x8d},
-	// Block 0x2a, offset 0x11d
-	{value: 0x0000, lo: 0x01},
-	{value: 0x030f, lo: 0xbc, hi: 0xbc},
-	// Block 0x2b, offset 0x11f
-	{value: 0x0000, lo: 0x01},
-	{value: 0xa000, lo: 0x80, hi: 0x92},
-	// Block 0x2c, offset 0x121
-	{value: 0x0000, lo: 0x01},
-	{value: 0xb900, lo: 0xa1, hi: 0xb5},
-	// Block 0x2d, offset 0x123
-	{value: 0x0000, lo: 0x01},
-	{value: 0x9900, lo: 0xa8, hi: 0xbf},
-	// Block 0x2e, offset 0x125
-	{value: 0x0000, lo: 0x01},
-	{value: 0x9900, lo: 0x80, hi: 0x82},
-	// Block 0x2f, offset 0x127
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0x9d, hi: 0x9f},
-	// Block 0x30, offset 0x129
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x94, hi: 0x94},
-	{value: 0x8104, lo: 0xb4, hi: 0xb4},
-	// Block 0x31, offset 0x12c
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x92, hi: 0x92},
-	{value: 0x8132, lo: 0x9d, hi: 0x9d},
-	// Block 0x32, offset 0x12f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8131, lo: 0xa9, hi: 0xa9},
-	// Block 0x33, offset 0x131
-	{value: 0x0004, lo: 0x02},
-	{value: 0x812e, lo: 0xb9, hi: 0xba},
-	{value: 0x812d, lo: 0xbb, hi: 0xbb},
-	// Block 0x34, offset 0x134
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8132, lo: 0x97, hi: 0x97},
-	{value: 0x812d, lo: 0x98, hi: 0x98},
-	// Block 0x35, offset 0x137
-	{value: 0x0000, lo: 0x03},
-	{value: 0x8104, lo: 0xa0, hi: 0xa0},
-	{value: 0x8132, lo: 0xb5, hi: 0xbc},
-	{value: 0x812d, lo: 0xbf, hi: 0xbf},
-	// Block 0x36, offset 0x13b
-	{value: 0x0000, lo: 0x04},
-	{value: 0x8132, lo: 0xb0, hi: 0xb4},
-	{value: 0x812d, lo: 0xb5, hi: 0xba},
-	{value: 0x8132, lo: 0xbb, hi: 0xbc},
-	{value: 0x812d, lo: 0xbd, hi: 0xbd},
-	// Block 0x37, offset 0x140
-	{value: 0x0000, lo: 0x08},
-	{value: 0x2d66, lo: 0x80, hi: 0x80},
-	{value: 0x2d6e, lo: 0x81, hi: 0x81},
-	{value: 0xa000, lo: 0x82, hi: 0x82},
-	{value: 0x2d76, lo: 0x83, hi: 0x83},
-	{value: 0x8104, lo: 0x84, hi: 0x84},
-	{value: 0x8132, lo: 0xab, hi: 0xab},
-	{value: 0x812d, lo: 0xac, hi: 0xac},
-	{value: 0x8132, lo: 0xad, hi: 0xb3},
-	// Block 0x38, offset 0x149
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0xaa, hi: 0xab},
-	// Block 0x39, offset 0x14b
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8102, lo: 0xa6, hi: 0xa6},
-	{value: 0x8104, lo: 0xb2, hi: 0xb3},
-	// Block 0x3a, offset 0x14e
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8102, lo: 0xb7, hi: 0xb7},
-	// Block 0x3b, offset 0x150
-	{value: 0x0000, lo: 0x0a},
-	{value: 0x8132, lo: 0x90, hi: 0x92},
-	{value: 0x8101, lo: 0x94, hi: 0x94},
-	{value: 0x812d, lo: 0x95, hi: 0x99},
-	{value: 0x8132, lo: 0x9a, hi: 0x9b},
-	{value: 0x812d, lo: 0x9c, hi: 0x9f},
-	{value: 0x8132, lo: 0xa0, hi: 0xa0},
-	{value: 0x8101, lo: 0xa2, hi: 0xa8},
-	{value: 0x812d, lo: 0xad, hi: 0xad},
-	{value: 0x8132, lo: 0xb4, hi: 0xb4},
-	{value: 0x8132, lo: 0xb8, hi: 0xb9},
-	// Block 0x3c, offset 0x15b
-	{value: 0x0002, lo: 0x0a},
-	{value: 0x0043, lo: 0xac, hi: 0xac},
-	{value: 0x00d1, lo: 0xad, hi: 0xad},
-	{value: 0x0045, lo: 0xae, hi: 0xae},
-	{value: 0x0049, lo: 0xb0, hi: 0xb1},
-	{value: 0x00e6, lo: 0xb2, hi: 0xb2},
-	{value: 0x004f, lo: 0xb3, hi: 0xba},
-	{value: 0x005f, lo: 0xbc, hi: 0xbc},
-	{value: 0x00ef, lo: 0xbd, hi: 0xbd},
-	{value: 0x0061, lo: 0xbe, hi: 0xbe},
-	{value: 0x0065, lo: 0xbf, hi: 0xbf},
-	// Block 0x3d, offset 0x166
-	{value: 0x0000, lo: 0x0f},
-	{value: 0x8132, lo: 0x80, hi: 0x81},
-	{value: 0x812d, lo: 0x82, hi: 0x82},
-	{value: 0x8132, lo: 0x83, hi: 0x89},
-	{value: 0x812d, lo: 0x8a, hi: 0x8a},
-	{value: 0x8132, lo: 0x8b, hi: 0x8c},
-	{value: 0x8135, lo: 0x8d, hi: 0x8d},
-	{value: 0x812a, lo: 0x8e, hi: 0x8e},
-	{value: 0x812d, lo: 0x8f, hi: 0x8f},
-	{value: 0x8129, lo: 0x90, hi: 0x90},
-	{value: 0x8132, lo: 0x91, hi: 0xb5},
-	{value: 0x8132, lo: 0xbb, hi: 0xbb},
-	{value: 0x8134, lo: 0xbc, hi: 0xbc},
-	{value: 0x812d, lo: 0xbd, hi: 0xbd},
-	{value: 0x8132, lo: 0xbe, hi: 0xbe},
-	{value: 0x812d, lo: 0xbf, hi: 0xbf},
-	// Block 0x3e, offset 0x176
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x0001, lo: 0x80, hi: 0x8a},
-	{value: 0x043b, lo: 0x91, hi: 0x91},
-	{value: 0x429b, lo: 0x97, hi: 0x97},
-	{value: 0x001d, lo: 0xa4, hi: 0xa4},
-	{value: 0x1873, lo: 0xa5, hi: 0xa5},
-	{value: 0x1b5c, lo: 0xa6, hi: 0xa6},
-	{value: 0x0001, lo: 0xaf, hi: 0xaf},
-	{value: 0x2691, lo: 0xb3, hi: 0xb3},
-	{value: 0x27fe, lo: 0xb4, hi: 0xb4},
-	{value: 0x2698, lo: 0xb6, hi: 0xb6},
-	{value: 0x2808, lo: 0xb7, hi: 0xb7},
-	{value: 0x186d, lo: 0xbc, hi: 0xbc},
-	{value: 0x4269, lo: 0xbe, hi: 0xbe},
-	// Block 0x3f, offset 0x184
-	{value: 0x0002, lo: 0x0d},
-	{value: 0x1933, lo: 0x87, hi: 0x87},
-	{value: 0x1930, lo: 0x88, hi: 0x88},
-	{value: 0x1870, lo: 0x89, hi: 0x89},
-	{value: 0x298e, lo: 0x97, hi: 0x97},
-	{value: 0x0001, lo: 0x9f, hi: 0x9f},
-	{value: 0x0021, lo: 0xb0, hi: 0xb0},
-	{value: 0x0093, lo: 0xb1, hi: 0xb1},
-	{value: 0x0029, lo: 0xb4, hi: 0xb9},
-	{value: 0x0017, lo: 0xba, hi: 0xba},
-	{value: 0x0467, lo: 0xbb, hi: 0xbb},
-	{value: 0x003b, lo: 0xbc, hi: 0xbc},
-	{value: 0x0011, lo: 0xbd, hi: 0xbe},
-	{value: 0x009d, lo: 0xbf, hi: 0xbf},
-	// Block 0x40, offset 0x192
-	{value: 0x0002, lo: 0x0f},
-	{value: 0x0021, lo: 0x80, hi: 0x89},
-	{value: 0x0017, lo: 0x8a, hi: 0x8a},
-	{value: 0x0467, lo: 0x8b, hi: 0x8b},
-	{value: 0x003b, lo: 0x8c, hi: 0x8c},
-	{value: 0x0011, lo: 0x8d, hi: 0x8e},
-	{value: 0x0083, lo: 0x90, hi: 0x90},
-	{value: 0x008b, lo: 0x91, hi: 0x91},
-	{value: 0x009f, lo: 0x92, hi: 0x92},
-	{value: 0x00b1, lo: 0x93, hi: 0x93},
-	{value: 0x0104, lo: 0x94, hi: 0x94},
-	{value: 0x0091, lo: 0x95, hi: 0x95},
-	{value: 0x0097, lo: 0x96, hi: 0x99},
-	{value: 0x00a1, lo: 0x9a, hi: 0x9a},
-	{value: 0x00a7, lo: 0x9b, hi: 0x9c},
-	{value: 0x1999, lo: 0xa8, hi: 0xa8},
-	// Block 0x41, offset 0x1a2
-	{value: 0x0000, lo: 0x0d},
-	{value: 0x8132, lo: 0x90, hi: 0x91},
-	{value: 0x8101, lo: 0x92, hi: 0x93},
-	{value: 0x8132, lo: 0x94, hi: 0x97},
-	{value: 0x8101, lo: 0x98, hi: 0x9a},
-	{value: 0x8132, lo: 0x9b, hi: 0x9c},
-	{value: 0x8132, lo: 0xa1, hi: 0xa1},
-	{value: 0x8101, lo: 0xa5, hi: 0xa6},
-	{value: 0x8132, lo: 0xa7, hi: 0xa7},
-	{value: 0x812d, lo: 0xa8, hi: 0xa8},
-	{value: 0x8132, lo: 0xa9, hi: 0xa9},
-	{value: 0x8101, lo: 0xaa, hi: 0xab},
-	{value: 0x812d, lo: 0xac, hi: 0xaf},
-	{value: 0x8132, lo: 0xb0, hi: 0xb0},
-	// Block 0x42, offset 0x1b0
-	{value: 0x0007, lo: 0x06},
-	{value: 0x2180, lo: 0x89, hi: 0x89},
-	{value: 0xa000, lo: 0x90, hi: 0x90},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0xa000, lo: 0x94, hi: 0x94},
-	{value: 0x3bb9, lo: 0x9a, hi: 0x9b},
-	{value: 0x3bc7, lo: 0xae, hi: 0xae},
-	// Block 0x43, offset 0x1b7
-	{value: 0x000e, lo: 0x05},
-	{value: 0x3bce, lo: 0x8d, hi: 0x8e},
-	{value: 0x3bd5, lo: 0x8f, hi: 0x8f},
-	{value: 0xa000, lo: 0x90, hi: 0x90},
-	{value: 0xa000, lo: 0x92, hi: 0x92},
-	{value: 0xa000, lo: 0x94, hi: 0x94},
-	// Block 0x44, offset 0x1bd
-	{value: 0x0173, lo: 0x0e},
-	{value: 0xa000, lo: 0x83, hi: 0x83},
-	{value: 0x3be3, lo: 0x84, hi: 0x84},
-	{value: 0xa000, lo: 0x88, hi: 0x88},
-	{value: 0x3bea, lo: 0x89, hi: 0x89},
-	{value: 0xa000, lo: 0x8b, hi: 0x8b},
-	{value: 0x3bf1, lo: 0x8c, hi: 0x8c},
-	{value: 0xa000, lo: 0xa3, hi: 0xa3},
-	{value: 0x3bf8, lo: 0xa4, hi: 0xa4},
-	{value: 0xa000, lo: 0xa5, hi: 0xa5},
-	{value: 0x3bff, lo: 0xa6, hi: 0xa6},
-	{value: 0x269f, lo: 0xac, hi: 0xad},
-	{value: 0x26a6, lo: 0xaf, hi: 0xaf},
-	{value: 0x281c, lo: 0xb0, hi: 0xb0},
-	{value: 0xa000, lo: 0xbc, hi: 0xbc},
-	// Block 0x45, offset 0x1cc
-	{value: 0x0007, lo: 0x03},
-	{value: 0x3c68, lo: 0xa0, hi: 0xa1},
-	{value: 0x3c92, lo: 0xa2, hi: 0xa3},
-	{value: 0x3cbc, lo: 0xaa, hi: 0xad},
-	// Block 0x46, offset 0x1d0
-	{value: 0x0004, lo: 0x01},
-	{value: 0x048b, lo: 0xa9, hi: 0xaa},
-	// Block 0x47, offset 0x1d2
-	{value: 0x0002, lo: 0x03},
-	{value: 0x0057, lo: 0x80, hi: 0x8f},
-	{value: 0x0083, lo: 0x90, hi: 0xa9},
-	{value: 0x0021, lo: 0xaa, hi: 0xaa},
-	// Block 0x48, offset 0x1d6
-	{value: 0x0000, lo: 0x01},
-	{value: 0x299b, lo: 0x8c, hi: 0x8c},
-	// Block 0x49, offset 0x1d8
-	{value: 0x0263, lo: 0x02},
-	{value: 0x1b8c, lo: 0xb4, hi: 0xb4},
-	{value: 0x192d, lo: 0xb5, hi: 0xb6},
-	// Block 0x4a, offset 0x1db
-	{value: 0x0000, lo: 0x01},
-	{value: 0x44dd, lo: 0x9c, hi: 0x9c},
-	// Block 0x4b, offset 0x1dd
-	{value: 0x0000, lo: 0x02},
-	{value: 0x0095, lo: 0xbc, hi: 0xbc},
-	{value: 0x006d, lo: 0xbd, hi: 0xbd},
-	// Block 0x4c, offset 0x1e0
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0xaf, hi: 0xb1},
-	// Block 0x4d, offset 0x1e2
-	{value: 0x0000, lo: 0x02},
-	{value: 0x047f, lo: 0xaf, hi: 0xaf},
-	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x4e, offset 0x1e5
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0xa0, hi: 0xbf},
-	// Block 0x4f, offset 0x1e7
-	{value: 0x0000, lo: 0x01},
-	{value: 0x0dc3, lo: 0x9f, hi: 0x9f},
-	// Block 0x50, offset 0x1e9
-	{value: 0x0000, lo: 0x01},
-	{value: 0x162f, lo: 0xb3, hi: 0xb3},
-	// Block 0x51, offset 0x1eb
-	{value: 0x0004, lo: 0x0b},
-	{value: 0x1597, lo: 0x80, hi: 0x82},
-	{value: 0x15af, lo: 0x83, hi: 0x83},
-	{value: 0x15c7, lo: 0x84, hi: 0x85},
-	{value: 0x15d7, lo: 0x86, hi: 0x89},
-	{value: 0x15eb, lo: 0x8a, hi: 0x8c},
-	{value: 0x15ff, lo: 0x8d, hi: 0x8d},
-	{value: 0x1607, lo: 0x8e, hi: 0x8e},
-	{value: 0x160f, lo: 0x8f, hi: 0x90},
-	{value: 0x161b, lo: 0x91, hi: 0x93},
-	{value: 0x162b, lo: 0x94, hi: 0x94},
-	{value: 0x1633, lo: 0x95, hi: 0x95},
-	// Block 0x52, offset 0x1f7
-	{value: 0x0004, lo: 0x09},
-	{value: 0x0001, lo: 0x80, hi: 0x80},
-	{value: 0x812c, lo: 0xaa, hi: 0xaa},
-	{value: 0x8131, lo: 0xab, hi: 0xab},
-	{value: 0x8133, lo: 0xac, hi: 0xac},
-	{value: 0x812e, lo: 0xad, hi: 0xad},
-	{value: 0x812f, lo: 0xae, hi: 0xae},
-	{value: 0x812f, lo: 0xaf, hi: 0xaf},
-	{value: 0x04b3, lo: 0xb6, hi: 0xb6},
-	{value: 0x0887, lo: 0xb8, hi: 0xba},
-	// Block 0x53, offset 0x201
-	{value: 0x0006, lo: 0x09},
-	{value: 0x0313, lo: 0xb1, hi: 0xb1},
-	{value: 0x0317, lo: 0xb2, hi: 0xb2},
-	{value: 0x4a3b, lo: 0xb3, hi: 0xb3},
-	{value: 0x031b, lo: 0xb4, hi: 0xb4},
-	{value: 0x4a41, lo: 0xb5, hi: 0xb6},
-	{value: 0x031f, lo: 0xb7, hi: 0xb7},
-	{value: 0x0323, lo: 0xb8, hi: 0xb8},
-	{value: 0x0327, lo: 0xb9, hi: 0xb9},
-	{value: 0x4a4d, lo: 0xba, hi: 0xbf},
-	// Block 0x54, offset 0x20b
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8132, lo: 0xaf, hi: 0xaf},
-	{value: 0x8132, lo: 0xb4, hi: 0xbd},
-	// Block 0x55, offset 0x20e
-	{value: 0x0000, lo: 0x03},
-	{value: 0x020f, lo: 0x9c, hi: 0x9c},
-	{value: 0x0212, lo: 0x9d, hi: 0x9d},
-	{value: 0x8132, lo: 0x9e, hi: 0x9f},
-	// Block 0x56, offset 0x212
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0xb0, hi: 0xb1},
-	// Block 0x57, offset 0x214
-	{value: 0x0000, lo: 0x01},
-	{value: 0x163b, lo: 0xb0, hi: 0xb0},
-	// Block 0x58, offset 0x216
-	{value: 0x000c, lo: 0x01},
-	{value: 0x00d7, lo: 0xb8, hi: 0xb9},
-	// Block 0x59, offset 0x218
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0x86, hi: 0x86},
-	// Block 0x5a, offset 0x21a
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x84, hi: 0x84},
-	{value: 0x8132, lo: 0xa0, hi: 0xb1},
-	// Block 0x5b, offset 0x21d
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0xab, hi: 0xad},
-	// Block 0x5c, offset 0x21f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0x93, hi: 0x93},
-	// Block 0x5d, offset 0x221
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8102, lo: 0xb3, hi: 0xb3},
-	// Block 0x5e, offset 0x223
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0x80, hi: 0x80},
-	// Block 0x5f, offset 0x225
-	{value: 0x0000, lo: 0x05},
-	{value: 0x8132, lo: 0xb0, hi: 0xb0},
-	{value: 0x8132, lo: 0xb2, hi: 0xb3},
-	{value: 0x812d, lo: 0xb4, hi: 0xb4},
-	{value: 0x8132, lo: 0xb7, hi: 0xb8},
-	{value: 0x8132, lo: 0xbe, hi: 0xbf},
-	// Block 0x60, offset 0x22b
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8132, lo: 0x81, hi: 0x81},
-	{value: 0x8104, lo: 0xb6, hi: 0xb6},
-	// Block 0x61, offset 0x22e
-	{value: 0x0008, lo: 0x03},
-	{value: 0x1637, lo: 0x9c, hi: 0x9d},
-	{value: 0x0125, lo: 0x9e, hi: 0x9e},
-	{value: 0x1643, lo: 0x9f, hi: 0x9f},
-	// Block 0x62, offset 0x232
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0xad, hi: 0xad},
-	// Block 0x63, offset 0x234
-	{value: 0x0000, lo: 0x06},
-	{value: 0xe500, lo: 0x80, hi: 0x80},
-	{value: 0xc600, lo: 0x81, hi: 0x9b},
-	{value: 0xe500, lo: 0x9c, hi: 0x9c},
-	{value: 0xc600, lo: 0x9d, hi: 0xb7},
-	{value: 0xe500, lo: 0xb8, hi: 0xb8},
-	{value: 0xc600, lo: 0xb9, hi: 0xbf},
-	// Block 0x64, offset 0x23b
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x93},
-	{value: 0xe500, lo: 0x94, hi: 0x94},
-	{value: 0xc600, lo: 0x95, hi: 0xaf},
-	{value: 0xe500, lo: 0xb0, hi: 0xb0},
-	{value: 0xc600, lo: 0xb1, hi: 0xbf},
-	// Block 0x65, offset 0x241
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x8b},
-	{value: 0xe500, lo: 0x8c, hi: 0x8c},
-	{value: 0xc600, lo: 0x8d, hi: 0xa7},
-	{value: 0xe500, lo: 0xa8, hi: 0xa8},
-	{value: 0xc600, lo: 0xa9, hi: 0xbf},
-	// Block 0x66, offset 0x247
-	{value: 0x0000, lo: 0x07},
-	{value: 0xc600, lo: 0x80, hi: 0x83},
-	{value: 0xe500, lo: 0x84, hi: 0x84},
-	{value: 0xc600, lo: 0x85, hi: 0x9f},
-	{value: 0xe500, lo: 0xa0, hi: 0xa0},
-	{value: 0xc600, lo: 0xa1, hi: 0xbb},
-	{value: 0xe500, lo: 0xbc, hi: 0xbc},
-	{value: 0xc600, lo: 0xbd, hi: 0xbf},
-	// Block 0x67, offset 0x24f
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x97},
-	{value: 0xe500, lo: 0x98, hi: 0x98},
-	{value: 0xc600, lo: 0x99, hi: 0xb3},
-	{value: 0xe500, lo: 0xb4, hi: 0xb4},
-	{value: 0xc600, lo: 0xb5, hi: 0xbf},
-	// Block 0x68, offset 0x255
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x8f},
-	{value: 0xe500, lo: 0x90, hi: 0x90},
-	{value: 0xc600, lo: 0x91, hi: 0xab},
-	{value: 0xe500, lo: 0xac, hi: 0xac},
-	{value: 0xc600, lo: 0xad, hi: 0xbf},
-	// Block 0x69, offset 0x25b
-	{value: 0x0000, lo: 0x05},
-	{value: 0xc600, lo: 0x80, hi: 0x87},
-	{value: 0xe500, lo: 0x88, hi: 0x88},
-	{value: 0xc600, lo: 0x89, hi: 0xa3},
-	{value: 0xe500, lo: 0xa4, hi: 0xa4},
-	{value: 0xc600, lo: 0xa5, hi: 0xbf},
-	// Block 0x6a, offset 0x261
-	{value: 0x0000, lo: 0x03},
-	{value: 0xc600, lo: 0x80, hi: 0x87},
-	{value: 0xe500, lo: 0x88, hi: 0x88},
-	{value: 0xc600, lo: 0x89, hi: 0xa3},
-	// Block 0x6b, offset 0x265
-	{value: 0x0002, lo: 0x01},
-	{value: 0x0003, lo: 0x81, hi: 0xbf},
-	// Block 0x6c, offset 0x267
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0xbd, hi: 0xbd},
-	// Block 0x6d, offset 0x269
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0xa0, hi: 0xa0},
-	// Block 0x6e, offset 0x26b
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0xb6, hi: 0xba},
-	// Block 0x6f, offset 0x26d
-	{value: 0x002c, lo: 0x05},
-	{value: 0x812d, lo: 0x8d, hi: 0x8d},
-	{value: 0x8132, lo: 0x8f, hi: 0x8f},
-	{value: 0x8132, lo: 0xb8, hi: 0xb8},
-	{value: 0x8101, lo: 0xb9, hi: 0xba},
-	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x70, offset 0x273
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8132, lo: 0xa5, hi: 0xa5},
-	{value: 0x812d, lo: 0xa6, hi: 0xa6},
-	// Block 0x71, offset 0x276
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x86, hi: 0x86},
-	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x72, offset 0x279
-	{value: 0x17fe, lo: 0x07},
-	{value: 0xa000, lo: 0x99, hi: 0x99},
-	{value: 0x4238, lo: 0x9a, hi: 0x9a},
-	{value: 0xa000, lo: 0x9b, hi: 0x9b},
-	{value: 0x4242, lo: 0x9c, hi: 0x9c},
-	{value: 0xa000, lo: 0xa5, hi: 0xa5},
-	{value: 0x424c, lo: 0xab, hi: 0xab},
-	{value: 0x8104, lo: 0xb9, hi: 0xba},
-	// Block 0x73, offset 0x281
-	{value: 0x0000, lo: 0x06},
-	{value: 0x8132, lo: 0x80, hi: 0x82},
-	{value: 0x9900, lo: 0xa7, hi: 0xa7},
-	{value: 0x2d7e, lo: 0xae, hi: 0xae},
-	{value: 0x2d88, lo: 0xaf, hi: 0xaf},
-	{value: 0xa000, lo: 0xb1, hi: 0xb2},
-	{value: 0x8104, lo: 0xb3, hi: 0xb4},
-	// Block 0x74, offset 0x288
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x80, hi: 0x80},
-	{value: 0x8102, lo: 0x8a, hi: 0x8a},
-	// Block 0x75, offset 0x28b
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0xb5, hi: 0xb5},
-	{value: 0x8102, lo: 0xb6, hi: 0xb6},
-	// Block 0x76, offset 0x28e
-	{value: 0x0002, lo: 0x01},
-	{value: 0x8102, lo: 0xa9, hi: 0xaa},
-	// Block 0x77, offset 0x290
-	{value: 0x0000, lo: 0x07},
-	{value: 0xa000, lo: 0x87, hi: 0x87},
-	{value: 0x2d92, lo: 0x8b, hi: 0x8b},
-	{value: 0x2d9c, lo: 0x8c, hi: 0x8c},
-	{value: 0x8104, lo: 0x8d, hi: 0x8d},
-	{value: 0x9900, lo: 0x97, hi: 0x97},
-	{value: 0x8132, lo: 0xa6, hi: 0xac},
-	{value: 0x8132, lo: 0xb0, hi: 0xb4},
-	// Block 0x78, offset 0x298
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x82, hi: 0x82},
-	{value: 0x8102, lo: 0x86, hi: 0x86},
-	// Block 0x79, offset 0x29b
-	{value: 0x6b5a, lo: 0x06},
-	{value: 0x9900, lo: 0xb0, hi: 0xb0},
-	{value: 0xa000, lo: 0xb9, hi: 0xb9},
-	{value: 0x9900, lo: 0xba, hi: 0xba},
-	{value: 0x2db0, lo: 0xbb, hi: 0xbb},
-	{value: 0x2da6, lo: 0xbc, hi: 0xbd},
-	{value: 0x2dba, lo: 0xbe, hi: 0xbe},
-	// Block 0x7a, offset 0x2a2
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0x82, hi: 0x82},
-	{value: 0x8102, lo: 0x83, hi: 0x83},
-	// Block 0x7b, offset 0x2a5
-	{value: 0x0000, lo: 0x05},
-	{value: 0x9900, lo: 0xaf, hi: 0xaf},
-	{value: 0xa000, lo: 0xb8, hi: 0xb9},
-	{value: 0x2dc4, lo: 0xba, hi: 0xba},
-	{value: 0x2dce, lo: 0xbb, hi: 0xbb},
-	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x7c, offset 0x2ab
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8102, lo: 0x80, hi: 0x80},
-	// Block 0x7d, offset 0x2ad
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0xbf, hi: 0xbf},
-	// Block 0x7e, offset 0x2af
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8104, lo: 0xb6, hi: 0xb6},
-	{value: 0x8102, lo: 0xb7, hi: 0xb7},
-	// Block 0x7f, offset 0x2b2
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8104, lo: 0xab, hi: 0xab},
-	// Block 0x80, offset 0x2b4
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8101, lo: 0xb0, hi: 0xb4},
-	// Block 0x81, offset 0x2b6
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0xb0, hi: 0xb6},
-	// Block 0x82, offset 0x2b8
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8101, lo: 0x9e, hi: 0x9e},
-	// Block 0x83, offset 0x2ba
-	{value: 0x0000, lo: 0x0c},
-	{value: 0x45cc, lo: 0x9e, hi: 0x9e},
-	{value: 0x45d6, lo: 0x9f, hi: 0x9f},
-	{value: 0x460a, lo: 0xa0, hi: 0xa0},
-	{value: 0x4618, lo: 0xa1, hi: 0xa1},
-	{value: 0x4626, lo: 0xa2, hi: 0xa2},
-	{value: 0x4634, lo: 0xa3, hi: 0xa3},
-	{value: 0x4642, lo: 0xa4, hi: 0xa4},
-	{value: 0x812b, lo: 0xa5, hi: 0xa6},
-	{value: 0x8101, lo: 0xa7, hi: 0xa9},
-	{value: 0x8130, lo: 0xad, hi: 0xad},
-	{value: 0x812b, lo: 0xae, hi: 0xb2},
-	{value: 0x812d, lo: 0xbb, hi: 0xbf},
-	// Block 0x84, offset 0x2c7
-	{value: 0x0000, lo: 0x09},
-	{value: 0x812d, lo: 0x80, hi: 0x82},
-	{value: 0x8132, lo: 0x85, hi: 0x89},
-	{value: 0x812d, lo: 0x8a, hi: 0x8b},
-	{value: 0x8132, lo: 0xaa, hi: 0xad},
-	{value: 0x45e0, lo: 0xbb, hi: 0xbb},
-	{value: 0x45ea, lo: 0xbc, hi: 0xbc},
-	{value: 0x4650, lo: 0xbd, hi: 0xbd},
-	{value: 0x466c, lo: 0xbe, hi: 0xbe},
-	{value: 0x465e, lo: 0xbf, hi: 0xbf},
-	// Block 0x85, offset 0x2d1
-	{value: 0x0000, lo: 0x01},
-	{value: 0x467a, lo: 0x80, hi: 0x80},
-	// Block 0x86, offset 0x2d3
-	{value: 0x0000, lo: 0x01},
-	{value: 0x8132, lo: 0x82, hi: 0x84},
-	// Block 0x87, offset 0x2d5
-	{value: 0x0002, lo: 0x03},
-	{value: 0x0043, lo: 0x80, hi: 0x99},
-	{value: 0x0083, lo: 0x9a, hi: 0xb3},
-	{value: 0x0043, lo: 0xb4, hi: 0xbf},
-	// Block 0x88, offset 0x2d9
-	{value: 0x0002, lo: 0x04},
-	{value: 0x005b, lo: 0x80, hi: 0x8d},
-	{value: 0x0083, lo: 0x8e, hi: 0x94},
-	{value: 0x0093, lo: 0x96, hi: 0xa7},
-	{value: 0x0043, lo: 0xa8, hi: 0xbf},
-	// Block 0x89, offset 0x2de
-	{value: 0x0002, lo: 0x0b},
-	{value: 0x0073, lo: 0x80, hi: 0x81},
-	{value: 0x0083, lo: 0x82, hi: 0x9b},
-	{value: 0x0043, lo: 0x9c, hi: 0x9c},
-	{value: 0x0047, lo: 0x9e, hi: 0x9f},
-	{value: 0x004f, lo: 0xa2, hi: 0xa2},
-	{value: 0x0055, lo: 0xa5, hi: 0xa6},
-	{value: 0x005d, lo: 0xa9, hi: 0xac},
-	{value: 0x0067, lo: 0xae, hi: 0xb5},
-	{value: 0x0083, lo: 0xb6, hi: 0xb9},
-	{value: 0x008d, lo: 0xbb, hi: 0xbb},
-	{value: 0x0091, lo: 0xbd, hi: 0xbf},
-	// Block 0x8a, offset 0x2ea
-	{value: 0x0002, lo: 0x04},
-	{value: 0x0097, lo: 0x80, hi: 0x83},
-	{value: 0x00a1, lo: 0x85, hi: 0x8f},
-	{value: 0x0043, lo: 0x90, hi: 0xa9},
-	{value: 0x0083, lo: 0xaa, hi: 0xbf},
-	// Block 0x8b, offset 0x2ef
-	{value: 0x0002, lo: 0x08},
-	{value: 0x00af, lo: 0x80, hi: 0x83},
-	{value: 0x0043, lo: 0x84, hi: 0x85},
-	{value: 0x0049, lo: 0x87, hi: 0x8a},
-	{value: 0x0055, lo: 0x8d, hi: 0x94},
-	{value: 0x0067, lo: 0x96, hi: 0x9c},
-	{value: 0x0083, lo: 0x9e, hi: 0xb7},
-	{value: 0x0043, lo: 0xb8, hi: 0xb9},
-	{value: 0x0049, lo: 0xbb, hi: 0xbe},
-	// Block 0x8c, offset 0x2f8
-	{value: 0x0002, lo: 0x05},
-	{value: 0x0053, lo: 0x80, hi: 0x84},
-	{value: 0x005f, lo: 0x86, hi: 0x86},
-	{value: 0x0067, lo: 0x8a, hi: 0x90},
-	{value: 0x0083, lo: 0x92, hi: 0xab},
-	{value: 0x0043, lo: 0xac, hi: 0xbf},
-	// Block 0x8d, offset 0x2fe
-	{value: 0x0002, lo: 0x04},
-	{value: 0x006b, lo: 0x80, hi: 0x85},
-	{value: 0x0083, lo: 0x86, hi: 0x9f},
-	{value: 0x0043, lo: 0xa0, hi: 0xb9},
-	{value: 0x0083, lo: 0xba, hi: 0xbf},
-	// Block 0x8e, offset 0x303
-	{value: 0x0002, lo: 0x03},
-	{value: 0x008f, lo: 0x80, hi: 0x93},
-	{value: 0x0043, lo: 0x94, hi: 0xad},
-	{value: 0x0083, lo: 0xae, hi: 0xbf},
-	// Block 0x8f, offset 0x307
-	{value: 0x0002, lo: 0x04},
-	{value: 0x00a7, lo: 0x80, hi: 0x87},
-	{value: 0x0043, lo: 0x88, hi: 0xa1},
-	{value: 0x0083, lo: 0xa2, hi: 0xbb},
-	{value: 0x0043, lo: 0xbc, hi: 0xbf},
-	// Block 0x90, offset 0x30c
-	{value: 0x0002, lo: 0x03},
-	{value: 0x004b, lo: 0x80, hi: 0x95},
-	{value: 0x0083, lo: 0x96, hi: 0xaf},
-	{value: 0x0043, lo: 0xb0, hi: 0xbf},
-	// Block 0x91, offset 0x310
-	{value: 0x0003, lo: 0x0f},
-	{value: 0x01b8, lo: 0x80, hi: 0x80},
-	{value: 0x045f, lo: 0x81, hi: 0x81},
-	{value: 0x01bb, lo: 0x82, hi: 0x9a},
-	{value: 0x045b, lo: 0x9b, hi: 0x9b},
-	{value: 0x01c7, lo: 0x9c, hi: 0x9c},
-	{value: 0x01d0, lo: 0x9d, hi: 0x9d},
-	{value: 0x01d6, lo: 0x9e, hi: 0x9e},
-	{value: 0x01fa, lo: 0x9f, hi: 0x9f},
-	{value: 0x01eb, lo: 0xa0, hi: 0xa0},
-	{value: 0x01e8, lo: 0xa1, hi: 0xa1},
-	{value: 0x0173, lo: 0xa2, hi: 0xb2},
-	{value: 0x0188, lo: 0xb3, hi: 0xb3},
-	{value: 0x01a6, lo: 0xb4, hi: 0xba},
-	{value: 0x045f, lo: 0xbb, hi: 0xbb},
-	{value: 0x01bb, lo: 0xbc, hi: 0xbf},
-	// Block 0x92, offset 0x320
-	{value: 0x0003, lo: 0x0d},
-	{value: 0x01c7, lo: 0x80, hi: 0x94},
-	{value: 0x045b, lo: 0x95, hi: 0x95},
-	{value: 0x01c7, lo: 0x96, hi: 0x96},
-	{value: 0x01d0, lo: 0x97, hi: 0x97},
-	{value: 0x01d6, lo: 0x98, hi: 0x98},
-	{value: 0x01fa, lo: 0x99, hi: 0x99},
-	{value: 0x01eb, lo: 0x9a, hi: 0x9a},
-	{value: 0x01e8, lo: 0x9b, hi: 0x9b},
-	{value: 0x0173, lo: 0x9c, hi: 0xac},
-	{value: 0x0188, lo: 0xad, hi: 0xad},
-	{value: 0x01a6, lo: 0xae, hi: 0xb4},
-	{value: 0x045f, lo: 0xb5, hi: 0xb5},
-	{value: 0x01bb, lo: 0xb6, hi: 0xbf},
-	// Block 0x93, offset 0x32e
-	{value: 0x0003, lo: 0x0d},
-	{value: 0x01d9, lo: 0x80, hi: 0x8e},
-	{value: 0x045b, lo: 0x8f, hi: 0x8f},
-	{value: 0x01c7, lo: 0x90, hi: 0x90},
-	{value: 0x01d0, lo: 0x91, hi: 0x91},
-	{value: 0x01d6, lo: 0x92, hi: 0x92},
-	{value: 0x01fa, lo: 0x93, hi: 0x93},
-	{value: 0x01eb, lo: 0x94, hi: 0x94},
-	{value: 0x01e8, lo: 0x95, hi: 0x95},
-	{value: 0x0173, lo: 0x96, hi: 0xa6},
-	{value: 0x0188, lo: 0xa7, hi: 0xa7},
-	{value: 0x01a6, lo: 0xa8, hi: 0xae},
-	{value: 0x045f, lo: 0xaf, hi: 0xaf},
-	{value: 0x01bb, lo: 0xb0, hi: 0xbf},
-	// Block 0x94, offset 0x33c
-	{value: 0x0003, lo: 0x0d},
-	{value: 0x01eb, lo: 0x80, hi: 0x88},
-	{value: 0x045b, lo: 0x89, hi: 0x89},
-	{value: 0x01c7, lo: 0x8a, hi: 0x8a},
-	{value: 0x01d0, lo: 0x8b, hi: 0x8b},
-	{value: 0x01d6, lo: 0x8c, hi: 0x8c},
-	{value: 0x01fa, lo: 0x8d, hi: 0x8d},
-	{value: 0x01eb, lo: 0x8e, hi: 0x8e},
-	{value: 0x01e8, lo: 0x8f, hi: 0x8f},
-	{value: 0x0173, lo: 0x90, hi: 0xa0},
-	{value: 0x0188, lo: 0xa1, hi: 0xa1},
-	{value: 0x01a6, lo: 0xa2, hi: 0xa8},
-	{value: 0x045f, lo: 0xa9, hi: 0xa9},
-	{value: 0x01bb, lo: 0xaa, hi: 0xbf},
-	// Block 0x95, offset 0x34a
-	{value: 0x0000, lo: 0x05},
-	{value: 0x8132, lo: 0x80, hi: 0x86},
-	{value: 0x8132, lo: 0x88, hi: 0x98},
-	{value: 0x8132, lo: 0x9b, hi: 0xa1},
-	{value: 0x8132, lo: 0xa3, hi: 0xa4},
-	{value: 0x8132, lo: 0xa6, hi: 0xaa},
-	// Block 0x96, offset 0x350
-	{value: 0x0000, lo: 0x01},
-	{value: 0x812d, lo: 0x90, hi: 0x96},
-	// Block 0x97, offset 0x352
-	{value: 0x0000, lo: 0x02},
-	{value: 0x8132, lo: 0x84, hi: 0x89},
-	{value: 0x8102, lo: 0x8a, hi: 0x8a},
-	// Block 0x98, offset 0x355
-	{value: 0x0002, lo: 0x09},
-	{value: 0x0063, lo: 0x80, hi: 0x89},
-	{value: 0x1951, lo: 0x8a, hi: 0x8a},
-	{value: 0x1981, lo: 0x8b, hi: 0x8b},
-	{value: 0x199c, lo: 0x8c, hi: 0x8c},
-	{value: 0x19a2, lo: 0x8d, hi: 0x8d},
-	{value: 0x1bc0, lo: 0x8e, hi: 0x8e},
-	{value: 0x19ae, lo: 0x8f, hi: 0x8f},
-	{value: 0x197b, lo: 0xaa, hi: 0xaa},
-	{value: 0x197e, lo: 0xab, hi: 0xab},
-	// Block 0x99, offset 0x35f
-	{value: 0x0000, lo: 0x01},
-	{value: 0x193f, lo: 0x90, hi: 0x90},
-	// Block 0x9a, offset 0x361
-	{value: 0x0028, lo: 0x09},
-	{value: 0x2862, lo: 0x80, hi: 0x80},
-	{value: 0x2826, lo: 0x81, hi: 0x81},
-	{value: 0x2830, lo: 0x82, hi: 0x82},
-	{value: 0x2844, lo: 0x83, hi: 0x84},
-	{value: 0x284e, lo: 0x85, hi: 0x86},
-	{value: 0x283a, lo: 0x87, hi: 0x87},
-	{value: 0x2858, lo: 0x88, hi: 0x88},
-	{value: 0x0b6f, lo: 0x90, hi: 0x90},
-	{value: 0x08e7, lo: 0x91, hi: 0x91},
-}
-
-// recompMap: 7520 bytes (entries only)
-var recompMap = map[uint32]rune{
-	0x00410300: 0x00C0,
-	0x00410301: 0x00C1,
-	0x00410302: 0x00C2,
-	0x00410303: 0x00C3,
-	0x00410308: 0x00C4,
-	0x0041030A: 0x00C5,
-	0x00430327: 0x00C7,
-	0x00450300: 0x00C8,
-	0x00450301: 0x00C9,
-	0x00450302: 0x00CA,
-	0x00450308: 0x00CB,
-	0x00490300: 0x00CC,
-	0x00490301: 0x00CD,
-	0x00490302: 0x00CE,
-	0x00490308: 0x00CF,
-	0x004E0303: 0x00D1,
-	0x004F0300: 0x00D2,
-	0x004F0301: 0x00D3,
-	0x004F0302: 0x00D4,
-	0x004F0303: 0x00D5,
-	0x004F0308: 0x00D6,
-	0x00550300: 0x00D9,
-	0x00550301: 0x00DA,
-	0x00550302: 0x00DB,
-	0x00550308: 0x00DC,
-	0x00590301: 0x00DD,
-	0x00610300: 0x00E0,
-	0x00610301: 0x00E1,
-	0x00610302: 0x00E2,
-	0x00610303: 0x00E3,
-	0x00610308: 0x00E4,
-	0x0061030A: 0x00E5,
-	0x00630327: 0x00E7,
-	0x00650300: 0x00E8,
-	0x00650301: 0x00E9,
-	0x00650302: 0x00EA,
-	0x00650308: 0x00EB,
-	0x00690300: 0x00EC,
-	0x00690301: 0x00ED,
-	0x00690302: 0x00EE,
-	0x00690308: 0x00EF,
-	0x006E0303: 0x00F1,
-	0x006F0300: 0x00F2,
-	0x006F0301: 0x00F3,
-	0x006F0302: 0x00F4,
-	0x006F0303: 0x00F5,
-	0x006F0308: 0x00F6,
-	0x00750300: 0x00F9,
-	0x00750301: 0x00FA,
-	0x00750302: 0x00FB,
-	0x00750308: 0x00FC,
-	0x00790301: 0x00FD,
-	0x00790308: 0x00FF,
-	0x00410304: 0x0100,
-	0x00610304: 0x0101,
-	0x00410306: 0x0102,
-	0x00610306: 0x0103,
-	0x00410328: 0x0104,
-	0x00610328: 0x0105,
-	0x00430301: 0x0106,
-	0x00630301: 0x0107,
-	0x00430302: 0x0108,
-	0x00630302: 0x0109,
-	0x00430307: 0x010A,
-	0x00630307: 0x010B,
-	0x0043030C: 0x010C,
-	0x0063030C: 0x010D,
-	0x0044030C: 0x010E,
-	0x0064030C: 0x010F,
-	0x00450304: 0x0112,
-	0x00650304: 0x0113,
-	0x00450306: 0x0114,
-	0x00650306: 0x0115,
-	0x00450307: 0x0116,
-	0x00650307: 0x0117,
-	0x00450328: 0x0118,
-	0x00650328: 0x0119,
-	0x0045030C: 0x011A,
-	0x0065030C: 0x011B,
-	0x00470302: 0x011C,
-	0x00670302: 0x011D,
-	0x00470306: 0x011E,
-	0x00670306: 0x011F,
-	0x00470307: 0x0120,
-	0x00670307: 0x0121,
-	0x00470327: 0x0122,
-	0x00670327: 0x0123,
-	0x00480302: 0x0124,
-	0x00680302: 0x0125,
-	0x00490303: 0x0128,
-	0x00690303: 0x0129,
-	0x00490304: 0x012A,
-	0x00690304: 0x012B,
-	0x00490306: 0x012C,
-	0x00690306: 0x012D,
-	0x00490328: 0x012E,
-	0x00690328: 0x012F,
-	0x00490307: 0x0130,
-	0x004A0302: 0x0134,
-	0x006A0302: 0x0135,
-	0x004B0327: 0x0136,
-	0x006B0327: 0x0137,
-	0x004C0301: 0x0139,
-	0x006C0301: 0x013A,
-	0x004C0327: 0x013B,
-	0x006C0327: 0x013C,
-	0x004C030C: 0x013D,
-	0x006C030C: 0x013E,
-	0x004E0301: 0x0143,
-	0x006E0301: 0x0144,
-	0x004E0327: 0x0145,
-	0x006E0327: 0x0146,
-	0x004E030C: 0x0147,
-	0x006E030C: 0x0148,
-	0x004F0304: 0x014C,
-	0x006F0304: 0x014D,
-	0x004F0306: 0x014E,
-	0x006F0306: 0x014F,
-	0x004F030B: 0x0150,
-	0x006F030B: 0x0151,
-	0x00520301: 0x0154,
-	0x00720301: 0x0155,
-	0x00520327: 0x0156,
-	0x00720327: 0x0157,
-	0x0052030C: 0x0158,
-	0x0072030C: 0x0159,
-	0x00530301: 0x015A,
-	0x00730301: 0x015B,
-	0x00530302: 0x015C,
-	0x00730302: 0x015D,
-	0x00530327: 0x015E,
-	0x00730327: 0x015F,
-	0x0053030C: 0x0160,
-	0x0073030C: 0x0161,
-	0x00540327: 0x0162,
-	0x00740327: 0x0163,
-	0x0054030C: 0x0164,
-	0x0074030C: 0x0165,
-	0x00550303: 0x0168,
-	0x00750303: 0x0169,
-	0x00550304: 0x016A,
-	0x00750304: 0x016B,
-	0x00550306: 0x016C,
-	0x00750306: 0x016D,
-	0x0055030A: 0x016E,
-	0x0075030A: 0x016F,
-	0x0055030B: 0x0170,
-	0x0075030B: 0x0171,
-	0x00550328: 0x0172,
-	0x00750328: 0x0173,
-	0x00570302: 0x0174,
-	0x00770302: 0x0175,
-	0x00590302: 0x0176,
-	0x00790302: 0x0177,
-	0x00590308: 0x0178,
-	0x005A0301: 0x0179,
-	0x007A0301: 0x017A,
-	0x005A0307: 0x017B,
-	0x007A0307: 0x017C,
-	0x005A030C: 0x017D,
-	0x007A030C: 0x017E,
-	0x004F031B: 0x01A0,
-	0x006F031B: 0x01A1,
-	0x0055031B: 0x01AF,
-	0x0075031B: 0x01B0,
-	0x0041030C: 0x01CD,
-	0x0061030C: 0x01CE,
-	0x0049030C: 0x01CF,
-	0x0069030C: 0x01D0,
-	0x004F030C: 0x01D1,
-	0x006F030C: 0x01D2,
-	0x0055030C: 0x01D3,
-	0x0075030C: 0x01D4,
-	0x00DC0304: 0x01D5,
-	0x00FC0304: 0x01D6,
-	0x00DC0301: 0x01D7,
-	0x00FC0301: 0x01D8,
-	0x00DC030C: 0x01D9,
-	0x00FC030C: 0x01DA,
-	0x00DC0300: 0x01DB,
-	0x00FC0300: 0x01DC,
-	0x00C40304: 0x01DE,
-	0x00E40304: 0x01DF,
-	0x02260304: 0x01E0,
-	0x02270304: 0x01E1,
-	0x00C60304: 0x01E2,
-	0x00E60304: 0x01E3,
-	0x0047030C: 0x01E6,
-	0x0067030C: 0x01E7,
-	0x004B030C: 0x01E8,
-	0x006B030C: 0x01E9,
-	0x004F0328: 0x01EA,
-	0x006F0328: 0x01EB,
-	0x01EA0304: 0x01EC,
-	0x01EB0304: 0x01ED,
-	0x01B7030C: 0x01EE,
-	0x0292030C: 0x01EF,
-	0x006A030C: 0x01F0,
-	0x00470301: 0x01F4,
-	0x00670301: 0x01F5,
-	0x004E0300: 0x01F8,
-	0x006E0300: 0x01F9,
-	0x00C50301: 0x01FA,
-	0x00E50301: 0x01FB,
-	0x00C60301: 0x01FC,
-	0x00E60301: 0x01FD,
-	0x00D80301: 0x01FE,
-	0x00F80301: 0x01FF,
-	0x0041030F: 0x0200,
-	0x0061030F: 0x0201,
-	0x00410311: 0x0202,
-	0x00610311: 0x0203,
-	0x0045030F: 0x0204,
-	0x0065030F: 0x0205,
-	0x00450311: 0x0206,
-	0x00650311: 0x0207,
-	0x0049030F: 0x0208,
-	0x0069030F: 0x0209,
-	0x00490311: 0x020A,
-	0x00690311: 0x020B,
-	0x004F030F: 0x020C,
-	0x006F030F: 0x020D,
-	0x004F0311: 0x020E,
-	0x006F0311: 0x020F,
-	0x0052030F: 0x0210,
-	0x0072030F: 0x0211,
-	0x00520311: 0x0212,
-	0x00720311: 0x0213,
-	0x0055030F: 0x0214,
-	0x0075030F: 0x0215,
-	0x00550311: 0x0216,
-	0x00750311: 0x0217,
-	0x00530326: 0x0218,
-	0x00730326: 0x0219,
-	0x00540326: 0x021A,
-	0x00740326: 0x021B,
-	0x0048030C: 0x021E,
-	0x0068030C: 0x021F,
-	0x00410307: 0x0226,
-	0x00610307: 0x0227,
-	0x00450327: 0x0228,
-	0x00650327: 0x0229,
-	0x00D60304: 0x022A,
-	0x00F60304: 0x022B,
-	0x00D50304: 0x022C,
-	0x00F50304: 0x022D,
-	0x004F0307: 0x022E,
-	0x006F0307: 0x022F,
-	0x022E0304: 0x0230,
-	0x022F0304: 0x0231,
-	0x00590304: 0x0232,
-	0x00790304: 0x0233,
-	0x00A80301: 0x0385,
-	0x03910301: 0x0386,
-	0x03950301: 0x0388,
-	0x03970301: 0x0389,
-	0x03990301: 0x038A,
-	0x039F0301: 0x038C,
-	0x03A50301: 0x038E,
-	0x03A90301: 0x038F,
-	0x03CA0301: 0x0390,
-	0x03990308: 0x03AA,
-	0x03A50308: 0x03AB,
-	0x03B10301: 0x03AC,
-	0x03B50301: 0x03AD,
-	0x03B70301: 0x03AE,
-	0x03B90301: 0x03AF,
-	0x03CB0301: 0x03B0,
-	0x03B90308: 0x03CA,
-	0x03C50308: 0x03CB,
-	0x03BF0301: 0x03CC,
-	0x03C50301: 0x03CD,
-	0x03C90301: 0x03CE,
-	0x03D20301: 0x03D3,
-	0x03D20308: 0x03D4,
-	0x04150300: 0x0400,
-	0x04150308: 0x0401,
-	0x04130301: 0x0403,
-	0x04060308: 0x0407,
-	0x041A0301: 0x040C,
-	0x04180300: 0x040D,
-	0x04230306: 0x040E,
-	0x04180306: 0x0419,
-	0x04380306: 0x0439,
-	0x04350300: 0x0450,
-	0x04350308: 0x0451,
-	0x04330301: 0x0453,
-	0x04560308: 0x0457,
-	0x043A0301: 0x045C,
-	0x04380300: 0x045D,
-	0x04430306: 0x045E,
-	0x0474030F: 0x0476,
-	0x0475030F: 0x0477,
-	0x04160306: 0x04C1,
-	0x04360306: 0x04C2,
-	0x04100306: 0x04D0,
-	0x04300306: 0x04D1,
-	0x04100308: 0x04D2,
-	0x04300308: 0x04D3,
-	0x04150306: 0x04D6,
-	0x04350306: 0x04D7,
-	0x04D80308: 0x04DA,
-	0x04D90308: 0x04DB,
-	0x04160308: 0x04DC,
-	0x04360308: 0x04DD,
-	0x04170308: 0x04DE,
-	0x04370308: 0x04DF,
-	0x04180304: 0x04E2,
-	0x04380304: 0x04E3,
-	0x04180308: 0x04E4,
-	0x04380308: 0x04E5,
-	0x041E0308: 0x04E6,
-	0x043E0308: 0x04E7,
-	0x04E80308: 0x04EA,
-	0x04E90308: 0x04EB,
-	0x042D0308: 0x04EC,
-	0x044D0308: 0x04ED,
-	0x04230304: 0x04EE,
-	0x04430304: 0x04EF,
-	0x04230308: 0x04F0,
-	0x04430308: 0x04F1,
-	0x0423030B: 0x04F2,
-	0x0443030B: 0x04F3,
-	0x04270308: 0x04F4,
-	0x04470308: 0x04F5,
-	0x042B0308: 0x04F8,
-	0x044B0308: 0x04F9,
-	0x06270653: 0x0622,
-	0x06270654: 0x0623,
-	0x06480654: 0x0624,
-	0x06270655: 0x0625,
-	0x064A0654: 0x0626,
-	0x06D50654: 0x06C0,
-	0x06C10654: 0x06C2,
-	0x06D20654: 0x06D3,
-	0x0928093C: 0x0929,
-	0x0930093C: 0x0931,
-	0x0933093C: 0x0934,
-	0x09C709BE: 0x09CB,
-	0x09C709D7: 0x09CC,
-	0x0B470B56: 0x0B48,
-	0x0B470B3E: 0x0B4B,
-	0x0B470B57: 0x0B4C,
-	0x0B920BD7: 0x0B94,
-	0x0BC60BBE: 0x0BCA,
-	0x0BC70BBE: 0x0BCB,
-	0x0BC60BD7: 0x0BCC,
-	0x0C460C56: 0x0C48,
-	0x0CBF0CD5: 0x0CC0,
-	0x0CC60CD5: 0x0CC7,
-	0x0CC60CD6: 0x0CC8,
-	0x0CC60CC2: 0x0CCA,
-	0x0CCA0CD5: 0x0CCB,
-	0x0D460D3E: 0x0D4A,
-	0x0D470D3E: 0x0D4B,
-	0x0D460D57: 0x0D4C,
-	0x0DD90DCA: 0x0DDA,
-	0x0DD90DCF: 0x0DDC,
-	0x0DDC0DCA: 0x0DDD,
-	0x0DD90DDF: 0x0DDE,
-	0x1025102E: 0x1026,
-	0x1B051B35: 0x1B06,
-	0x1B071B35: 0x1B08,
-	0x1B091B35: 0x1B0A,
-	0x1B0B1B35: 0x1B0C,
-	0x1B0D1B35: 0x1B0E,
-	0x1B111B35: 0x1B12,
-	0x1B3A1B35: 0x1B3B,
-	0x1B3C1B35: 0x1B3D,
-	0x1B3E1B35: 0x1B40,
-	0x1B3F1B35: 0x1B41,
-	0x1B421B35: 0x1B43,
-	0x00410325: 0x1E00,
-	0x00610325: 0x1E01,
-	0x00420307: 0x1E02,
-	0x00620307: 0x1E03,
-	0x00420323: 0x1E04,
-	0x00620323: 0x1E05,
-	0x00420331: 0x1E06,
-	0x00620331: 0x1E07,
-	0x00C70301: 0x1E08,
-	0x00E70301: 0x1E09,
-	0x00440307: 0x1E0A,
-	0x00640307: 0x1E0B,
-	0x00440323: 0x1E0C,
-	0x00640323: 0x1E0D,
-	0x00440331: 0x1E0E,
-	0x00640331: 0x1E0F,
-	0x00440327: 0x1E10,
-	0x00640327: 0x1E11,
-	0x0044032D: 0x1E12,
-	0x0064032D: 0x1E13,
-	0x01120300: 0x1E14,
-	0x01130300: 0x1E15,
-	0x01120301: 0x1E16,
-	0x01130301: 0x1E17,
-	0x0045032D: 0x1E18,
-	0x0065032D: 0x1E19,
-	0x00450330: 0x1E1A,
-	0x00650330: 0x1E1B,
-	0x02280306: 0x1E1C,
-	0x02290306: 0x1E1D,
-	0x00460307: 0x1E1E,
-	0x00660307: 0x1E1F,
-	0x00470304: 0x1E20,
-	0x00670304: 0x1E21,
-	0x00480307: 0x1E22,
-	0x00680307: 0x1E23,
-	0x00480323: 0x1E24,
-	0x00680323: 0x1E25,
-	0x00480308: 0x1E26,
-	0x00680308: 0x1E27,
-	0x00480327: 0x1E28,
-	0x00680327: 0x1E29,
-	0x0048032E: 0x1E2A,
-	0x0068032E: 0x1E2B,
-	0x00490330: 0x1E2C,
-	0x00690330: 0x1E2D,
-	0x00CF0301: 0x1E2E,
-	0x00EF0301: 0x1E2F,
-	0x004B0301: 0x1E30,
-	0x006B0301: 0x1E31,
-	0x004B0323: 0x1E32,
-	0x006B0323: 0x1E33,
-	0x004B0331: 0x1E34,
-	0x006B0331: 0x1E35,
-	0x004C0323: 0x1E36,
-	0x006C0323: 0x1E37,
-	0x1E360304: 0x1E38,
-	0x1E370304: 0x1E39,
-	0x004C0331: 0x1E3A,
-	0x006C0331: 0x1E3B,
-	0x004C032D: 0x1E3C,
-	0x006C032D: 0x1E3D,
-	0x004D0301: 0x1E3E,
-	0x006D0301: 0x1E3F,
-	0x004D0307: 0x1E40,
-	0x006D0307: 0x1E41,
-	0x004D0323: 0x1E42,
-	0x006D0323: 0x1E43,
-	0x004E0307: 0x1E44,
-	0x006E0307: 0x1E45,
-	0x004E0323: 0x1E46,
-	0x006E0323: 0x1E47,
-	0x004E0331: 0x1E48,
-	0x006E0331: 0x1E49,
-	0x004E032D: 0x1E4A,
-	0x006E032D: 0x1E4B,
-	0x00D50301: 0x1E4C,
-	0x00F50301: 0x1E4D,
-	0x00D50308: 0x1E4E,
-	0x00F50308: 0x1E4F,
-	0x014C0300: 0x1E50,
-	0x014D0300: 0x1E51,
-	0x014C0301: 0x1E52,
-	0x014D0301: 0x1E53,
-	0x00500301: 0x1E54,
-	0x00700301: 0x1E55,
-	0x00500307: 0x1E56,
-	0x00700307: 0x1E57,
-	0x00520307: 0x1E58,
-	0x00720307: 0x1E59,
-	0x00520323: 0x1E5A,
-	0x00720323: 0x1E5B,
-	0x1E5A0304: 0x1E5C,
-	0x1E5B0304: 0x1E5D,
-	0x00520331: 0x1E5E,
-	0x00720331: 0x1E5F,
-	0x00530307: 0x1E60,
-	0x00730307: 0x1E61,
-	0x00530323: 0x1E62,
-	0x00730323: 0x1E63,
-	0x015A0307: 0x1E64,
-	0x015B0307: 0x1E65,
-	0x01600307: 0x1E66,
-	0x01610307: 0x1E67,
-	0x1E620307: 0x1E68,
-	0x1E630307: 0x1E69,
-	0x00540307: 0x1E6A,
-	0x00740307: 0x1E6B,
-	0x00540323: 0x1E6C,
-	0x00740323: 0x1E6D,
-	0x00540331: 0x1E6E,
-	0x00740331: 0x1E6F,
-	0x0054032D: 0x1E70,
-	0x0074032D: 0x1E71,
-	0x00550324: 0x1E72,
-	0x00750324: 0x1E73,
-	0x00550330: 0x1E74,
-	0x00750330: 0x1E75,
-	0x0055032D: 0x1E76,
-	0x0075032D: 0x1E77,
-	0x01680301: 0x1E78,
-	0x01690301: 0x1E79,
-	0x016A0308: 0x1E7A,
-	0x016B0308: 0x1E7B,
-	0x00560303: 0x1E7C,
-	0x00760303: 0x1E7D,
-	0x00560323: 0x1E7E,
-	0x00760323: 0x1E7F,
-	0x00570300: 0x1E80,
-	0x00770300: 0x1E81,
-	0x00570301: 0x1E82,
-	0x00770301: 0x1E83,
-	0x00570308: 0x1E84,
-	0x00770308: 0x1E85,
-	0x00570307: 0x1E86,
-	0x00770307: 0x1E87,
-	0x00570323: 0x1E88,
-	0x00770323: 0x1E89,
-	0x00580307: 0x1E8A,
-	0x00780307: 0x1E8B,
-	0x00580308: 0x1E8C,
-	0x00780308: 0x1E8D,
-	0x00590307: 0x1E8E,
-	0x00790307: 0x1E8F,
-	0x005A0302: 0x1E90,
-	0x007A0302: 0x1E91,
-	0x005A0323: 0x1E92,
-	0x007A0323: 0x1E93,
-	0x005A0331: 0x1E94,
-	0x007A0331: 0x1E95,
-	0x00680331: 0x1E96,
-	0x00740308: 0x1E97,
-	0x0077030A: 0x1E98,
-	0x0079030A: 0x1E99,
-	0x017F0307: 0x1E9B,
-	0x00410323: 0x1EA0,
-	0x00610323: 0x1EA1,
-	0x00410309: 0x1EA2,
-	0x00610309: 0x1EA3,
-	0x00C20301: 0x1EA4,
-	0x00E20301: 0x1EA5,
-	0x00C20300: 0x1EA6,
-	0x00E20300: 0x1EA7,
-	0x00C20309: 0x1EA8,
-	0x00E20309: 0x1EA9,
-	0x00C20303: 0x1EAA,
-	0x00E20303: 0x1EAB,
-	0x1EA00302: 0x1EAC,
-	0x1EA10302: 0x1EAD,
-	0x01020301: 0x1EAE,
-	0x01030301: 0x1EAF,
-	0x01020300: 0x1EB0,
-	0x01030300: 0x1EB1,
-	0x01020309: 0x1EB2,
-	0x01030309: 0x1EB3,
-	0x01020303: 0x1EB4,
-	0x01030303: 0x1EB5,
-	0x1EA00306: 0x1EB6,
-	0x1EA10306: 0x1EB7,
-	0x00450323: 0x1EB8,
-	0x00650323: 0x1EB9,
-	0x00450309: 0x1EBA,
-	0x00650309: 0x1EBB,
-	0x00450303: 0x1EBC,
-	0x00650303: 0x1EBD,
-	0x00CA0301: 0x1EBE,
-	0x00EA0301: 0x1EBF,
-	0x00CA0300: 0x1EC0,
-	0x00EA0300: 0x1EC1,
-	0x00CA0309: 0x1EC2,
-	0x00EA0309: 0x1EC3,
-	0x00CA0303: 0x1EC4,
-	0x00EA0303: 0x1EC5,
-	0x1EB80302: 0x1EC6,
-	0x1EB90302: 0x1EC7,
-	0x00490309: 0x1EC8,
-	0x00690309: 0x1EC9,
-	0x00490323: 0x1ECA,
-	0x00690323: 0x1ECB,
-	0x004F0323: 0x1ECC,
-	0x006F0323: 0x1ECD,
-	0x004F0309: 0x1ECE,
-	0x006F0309: 0x1ECF,
-	0x00D40301: 0x1ED0,
-	0x00F40301: 0x1ED1,
-	0x00D40300: 0x1ED2,
-	0x00F40300: 0x1ED3,
-	0x00D40309: 0x1ED4,
-	0x00F40309: 0x1ED5,
-	0x00D40303: 0x1ED6,
-	0x00F40303: 0x1ED7,
-	0x1ECC0302: 0x1ED8,
-	0x1ECD0302: 0x1ED9,
-	0x01A00301: 0x1EDA,
-	0x01A10301: 0x1EDB,
-	0x01A00300: 0x1EDC,
-	0x01A10300: 0x1EDD,
-	0x01A00309: 0x1EDE,
-	0x01A10309: 0x1EDF,
-	0x01A00303: 0x1EE0,
-	0x01A10303: 0x1EE1,
-	0x01A00323: 0x1EE2,
-	0x01A10323: 0x1EE3,
-	0x00550323: 0x1EE4,
-	0x00750323: 0x1EE5,
-	0x00550309: 0x1EE6,
-	0x00750309: 0x1EE7,
-	0x01AF0301: 0x1EE8,
-	0x01B00301: 0x1EE9,
-	0x01AF0300: 0x1EEA,
-	0x01B00300: 0x1EEB,
-	0x01AF0309: 0x1EEC,
-	0x01B00309: 0x1EED,
-	0x01AF0303: 0x1EEE,
-	0x01B00303: 0x1EEF,
-	0x01AF0323: 0x1EF0,
-	0x01B00323: 0x1EF1,
-	0x00590300: 0x1EF2,
-	0x00790300: 0x1EF3,
-	0x00590323: 0x1EF4,
-	0x00790323: 0x1EF5,
-	0x00590309: 0x1EF6,
-	0x00790309: 0x1EF7,
-	0x00590303: 0x1EF8,
-	0x00790303: 0x1EF9,
-	0x03B10313: 0x1F00,
-	0x03B10314: 0x1F01,
-	0x1F000300: 0x1F02,
-	0x1F010300: 0x1F03,
-	0x1F000301: 0x1F04,
-	0x1F010301: 0x1F05,
-	0x1F000342: 0x1F06,
-	0x1F010342: 0x1F07,
-	0x03910313: 0x1F08,
-	0x03910314: 0x1F09,
-	0x1F080300: 0x1F0A,
-	0x1F090300: 0x1F0B,
-	0x1F080301: 0x1F0C,
-	0x1F090301: 0x1F0D,
-	0x1F080342: 0x1F0E,
-	0x1F090342: 0x1F0F,
-	0x03B50313: 0x1F10,
-	0x03B50314: 0x1F11,
-	0x1F100300: 0x1F12,
-	0x1F110300: 0x1F13,
-	0x1F100301: 0x1F14,
-	0x1F110301: 0x1F15,
-	0x03950313: 0x1F18,
-	0x03950314: 0x1F19,
-	0x1F180300: 0x1F1A,
-	0x1F190300: 0x1F1B,
-	0x1F180301: 0x1F1C,
-	0x1F190301: 0x1F1D,
-	0x03B70313: 0x1F20,
-	0x03B70314: 0x1F21,
-	0x1F200300: 0x1F22,
-	0x1F210300: 0x1F23,
-	0x1F200301: 0x1F24,
-	0x1F210301: 0x1F25,
-	0x1F200342: 0x1F26,
-	0x1F210342: 0x1F27,
-	0x03970313: 0x1F28,
-	0x03970314: 0x1F29,
-	0x1F280300: 0x1F2A,
-	0x1F290300: 0x1F2B,
-	0x1F280301: 0x1F2C,
-	0x1F290301: 0x1F2D,
-	0x1F280342: 0x1F2E,
-	0x1F290342: 0x1F2F,
-	0x03B90313: 0x1F30,
-	0x03B90314: 0x1F31,
-	0x1F300300: 0x1F32,
-	0x1F310300: 0x1F33,
-	0x1F300301: 0x1F34,
-	0x1F310301: 0x1F35,
-	0x1F300342: 0x1F36,
-	0x1F310342: 0x1F37,
-	0x03990313: 0x1F38,
-	0x03990314: 0x1F39,
-	0x1F380300: 0x1F3A,
-	0x1F390300: 0x1F3B,
-	0x1F380301: 0x1F3C,
-	0x1F390301: 0x1F3D,
-	0x1F380342: 0x1F3E,
-	0x1F390342: 0x1F3F,
-	0x03BF0313: 0x1F40,
-	0x03BF0314: 0x1F41,
-	0x1F400300: 0x1F42,
-	0x1F410300: 0x1F43,
-	0x1F400301: 0x1F44,
-	0x1F410301: 0x1F45,
-	0x039F0313: 0x1F48,
-	0x039F0314: 0x1F49,
-	0x1F480300: 0x1F4A,
-	0x1F490300: 0x1F4B,
-	0x1F480301: 0x1F4C,
-	0x1F490301: 0x1F4D,
-	0x03C50313: 0x1F50,
-	0x03C50314: 0x1F51,
-	0x1F500300: 0x1F52,
-	0x1F510300: 0x1F53,
-	0x1F500301: 0x1F54,
-	0x1F510301: 0x1F55,
-	0x1F500342: 0x1F56,
-	0x1F510342: 0x1F57,
-	0x03A50314: 0x1F59,
-	0x1F590300: 0x1F5B,
-	0x1F590301: 0x1F5D,
-	0x1F590342: 0x1F5F,
-	0x03C90313: 0x1F60,
-	0x03C90314: 0x1F61,
-	0x1F600300: 0x1F62,
-	0x1F610300: 0x1F63,
-	0x1F600301: 0x1F64,
-	0x1F610301: 0x1F65,
-	0x1F600342: 0x1F66,
-	0x1F610342: 0x1F67,
-	0x03A90313: 0x1F68,
-	0x03A90314: 0x1F69,
-	0x1F680300: 0x1F6A,
-	0x1F690300: 0x1F6B,
-	0x1F680301: 0x1F6C,
-	0x1F690301: 0x1F6D,
-	0x1F680342: 0x1F6E,
-	0x1F690342: 0x1F6F,
-	0x03B10300: 0x1F70,
-	0x03B50300: 0x1F72,
-	0x03B70300: 0x1F74,
-	0x03B90300: 0x1F76,
-	0x03BF0300: 0x1F78,
-	0x03C50300: 0x1F7A,
-	0x03C90300: 0x1F7C,
-	0x1F000345: 0x1F80,
-	0x1F010345: 0x1F81,
-	0x1F020345: 0x1F82,
-	0x1F030345: 0x1F83,
-	0x1F040345: 0x1F84,
-	0x1F050345: 0x1F85,
-	0x1F060345: 0x1F86,
-	0x1F070345: 0x1F87,
-	0x1F080345: 0x1F88,
-	0x1F090345: 0x1F89,
-	0x1F0A0345: 0x1F8A,
-	0x1F0B0345: 0x1F8B,
-	0x1F0C0345: 0x1F8C,
-	0x1F0D0345: 0x1F8D,
-	0x1F0E0345: 0x1F8E,
-	0x1F0F0345: 0x1F8F,
-	0x1F200345: 0x1F90,
-	0x1F210345: 0x1F91,
-	0x1F220345: 0x1F92,
-	0x1F230345: 0x1F93,
-	0x1F240345: 0x1F94,
-	0x1F250345: 0x1F95,
-	0x1F260345: 0x1F96,
-	0x1F270345: 0x1F97,
-	0x1F280345: 0x1F98,
-	0x1F290345: 0x1F99,
-	0x1F2A0345: 0x1F9A,
-	0x1F2B0345: 0x1F9B,
-	0x1F2C0345: 0x1F9C,
-	0x1F2D0345: 0x1F9D,
-	0x1F2E0345: 0x1F9E,
-	0x1F2F0345: 0x1F9F,
-	0x1F600345: 0x1FA0,
-	0x1F610345: 0x1FA1,
-	0x1F620345: 0x1FA2,
-	0x1F630345: 0x1FA3,
-	0x1F640345: 0x1FA4,
-	0x1F650345: 0x1FA5,
-	0x1F660345: 0x1FA6,
-	0x1F670345: 0x1FA7,
-	0x1F680345: 0x1FA8,
-	0x1F690345: 0x1FA9,
-	0x1F6A0345: 0x1FAA,
-	0x1F6B0345: 0x1FAB,
-	0x1F6C0345: 0x1FAC,
-	0x1F6D0345: 0x1FAD,
-	0x1F6E0345: 0x1FAE,
-	0x1F6F0345: 0x1FAF,
-	0x03B10306: 0x1FB0,
-	0x03B10304: 0x1FB1,
-	0x1F700345: 0x1FB2,
-	0x03B10345: 0x1FB3,
-	0x03AC0345: 0x1FB4,
-	0x03B10342: 0x1FB6,
-	0x1FB60345: 0x1FB7,
-	0x03910306: 0x1FB8,
-	0x03910304: 0x1FB9,
-	0x03910300: 0x1FBA,
-	0x03910345: 0x1FBC,
-	0x00A80342: 0x1FC1,
-	0x1F740345: 0x1FC2,
-	0x03B70345: 0x1FC3,
-	0x03AE0345: 0x1FC4,
-	0x03B70342: 0x1FC6,
-	0x1FC60345: 0x1FC7,
-	0x03950300: 0x1FC8,
-	0x03970300: 0x1FCA,
-	0x03970345: 0x1FCC,
-	0x1FBF0300: 0x1FCD,
-	0x1FBF0301: 0x1FCE,
-	0x1FBF0342: 0x1FCF,
-	0x03B90306: 0x1FD0,
-	0x03B90304: 0x1FD1,
-	0x03CA0300: 0x1FD2,
-	0x03B90342: 0x1FD6,
-	0x03CA0342: 0x1FD7,
-	0x03990306: 0x1FD8,
-	0x03990304: 0x1FD9,
-	0x03990300: 0x1FDA,
-	0x1FFE0300: 0x1FDD,
-	0x1FFE0301: 0x1FDE,
-	0x1FFE0342: 0x1FDF,
-	0x03C50306: 0x1FE0,
-	0x03C50304: 0x1FE1,
-	0x03CB0300: 0x1FE2,
-	0x03C10313: 0x1FE4,
-	0x03C10314: 0x1FE5,
-	0x03C50342: 0x1FE6,
-	0x03CB0342: 0x1FE7,
-	0x03A50306: 0x1FE8,
-	0x03A50304: 0x1FE9,
-	0x03A50300: 0x1FEA,
-	0x03A10314: 0x1FEC,
-	0x00A80300: 0x1FED,
-	0x1F7C0345: 0x1FF2,
-	0x03C90345: 0x1FF3,
-	0x03CE0345: 0x1FF4,
-	0x03C90342: 0x1FF6,
-	0x1FF60345: 0x1FF7,
-	0x039F0300: 0x1FF8,
-	0x03A90300: 0x1FFA,
-	0x03A90345: 0x1FFC,
-	0x21900338: 0x219A,
-	0x21920338: 0x219B,
-	0x21940338: 0x21AE,
-	0x21D00338: 0x21CD,
-	0x21D40338: 0x21CE,
-	0x21D20338: 0x21CF,
-	0x22030338: 0x2204,
-	0x22080338: 0x2209,
-	0x220B0338: 0x220C,
-	0x22230338: 0x2224,
-	0x22250338: 0x2226,
-	0x223C0338: 0x2241,
-	0x22430338: 0x2244,
-	0x22450338: 0x2247,
-	0x22480338: 0x2249,
-	0x003D0338: 0x2260,
-	0x22610338: 0x2262,
-	0x224D0338: 0x226D,
-	0x003C0338: 0x226E,
-	0x003E0338: 0x226F,
-	0x22640338: 0x2270,
-	0x22650338: 0x2271,
-	0x22720338: 0x2274,
-	0x22730338: 0x2275,
-	0x22760338: 0x2278,
-	0x22770338: 0x2279,
-	0x227A0338: 0x2280,
-	0x227B0338: 0x2281,
-	0x22820338: 0x2284,
-	0x22830338: 0x2285,
-	0x22860338: 0x2288,
-	0x22870338: 0x2289,
-	0x22A20338: 0x22AC,
-	0x22A80338: 0x22AD,
-	0x22A90338: 0x22AE,
-	0x22AB0338: 0x22AF,
-	0x227C0338: 0x22E0,
-	0x227D0338: 0x22E1,
-	0x22910338: 0x22E2,
-	0x22920338: 0x22E3,
-	0x22B20338: 0x22EA,
-	0x22B30338: 0x22EB,
-	0x22B40338: 0x22EC,
-	0x22B50338: 0x22ED,
-	0x304B3099: 0x304C,
-	0x304D3099: 0x304E,
-	0x304F3099: 0x3050,
-	0x30513099: 0x3052,
-	0x30533099: 0x3054,
-	0x30553099: 0x3056,
-	0x30573099: 0x3058,
-	0x30593099: 0x305A,
-	0x305B3099: 0x305C,
-	0x305D3099: 0x305E,
-	0x305F3099: 0x3060,
-	0x30613099: 0x3062,
-	0x30643099: 0x3065,
-	0x30663099: 0x3067,
-	0x30683099: 0x3069,
-	0x306F3099: 0x3070,
-	0x306F309A: 0x3071,
-	0x30723099: 0x3073,
-	0x3072309A: 0x3074,
-	0x30753099: 0x3076,
-	0x3075309A: 0x3077,
-	0x30783099: 0x3079,
-	0x3078309A: 0x307A,
-	0x307B3099: 0x307C,
-	0x307B309A: 0x307D,
-	0x30463099: 0x3094,
-	0x309D3099: 0x309E,
-	0x30AB3099: 0x30AC,
-	0x30AD3099: 0x30AE,
-	0x30AF3099: 0x30B0,
-	0x30B13099: 0x30B2,
-	0x30B33099: 0x30B4,
-	0x30B53099: 0x30B6,
-	0x30B73099: 0x30B8,
-	0x30B93099: 0x30BA,
-	0x30BB3099: 0x30BC,
-	0x30BD3099: 0x30BE,
-	0x30BF3099: 0x30C0,
-	0x30C13099: 0x30C2,
-	0x30C43099: 0x30C5,
-	0x30C63099: 0x30C7,
-	0x30C83099: 0x30C9,
-	0x30CF3099: 0x30D0,
-	0x30CF309A: 0x30D1,
-	0x30D23099: 0x30D3,
-	0x30D2309A: 0x30D4,
-	0x30D53099: 0x30D6,
-	0x30D5309A: 0x30D7,
-	0x30D83099: 0x30D9,
-	0x30D8309A: 0x30DA,
-	0x30DB3099: 0x30DC,
-	0x30DB309A: 0x30DD,
-	0x30A63099: 0x30F4,
-	0x30EF3099: 0x30F7,
-	0x30F03099: 0x30F8,
-	0x30F13099: 0x30F9,
-	0x30F23099: 0x30FA,
-	0x30FD3099: 0x30FE,
-	0x109910BA: 0x1109A,
-	0x109B10BA: 0x1109C,
-	0x10A510BA: 0x110AB,
-	0x11311127: 0x1112E,
-	0x11321127: 0x1112F,
-	0x1347133E: 0x1134B,
-	0x13471357: 0x1134C,
-	0x14B914BA: 0x114BB,
-	0x14B914B0: 0x114BC,
-	0x14B914BD: 0x114BE,
-	0x15B815AF: 0x115BA,
-	0x15B915AF: 0x115BB,
-}
-
-// Total size of tables: 53KB (54006 bytes)
diff --git a/vendor/golang.org/x/text/unicode/norm/transform.go b/vendor/golang.org/x/text/unicode/norm/transform.go
deleted file mode 100644
index 8589067cde..0000000000
--- a/vendor/golang.org/x/text/unicode/norm/transform.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/transform"
-)
-
-// Reset implements the Reset method of the transform.Transformer interface.
-func (Form) Reset() {}
-
-// Transform implements the Transform method of the transform.Transformer
-// interface. It may need to write segments of up to MaxSegmentSize at once.
-// Users should either catch ErrShortDst and allow dst to grow or have dst be at
-// least of size MaxTransformChunkSize to be guaranteed of progress.
-func (f Form) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	n := 0
-	// Cap the maximum number of src bytes to check.
-	b := src
-	eof := atEOF
-	if ns := len(dst); ns < len(b) {
-		err = transform.ErrShortDst
-		eof = false
-		b = b[:ns]
-	}
-	i, ok := formTable[f].quickSpan(inputBytes(b), n, len(b), eof)
-	n += copy(dst[n:], b[n:i])
-	if !ok {
-		nDst, nSrc, err = f.transform(dst[n:], src[n:], atEOF)
-		return nDst + n, nSrc + n, err
-	}
-	if n < len(src) && !atEOF {
-		err = transform.ErrShortSrc
-	}
-	return n, n, err
-}
-
-func flushTransform(rb *reorderBuffer) bool {
-	// Write out (must fully fit in dst, or else it is a ErrShortDst).
-	if len(rb.out) < rb.nrune*utf8.UTFMax {
-		return false
-	}
-	rb.out = rb.out[rb.flushCopy(rb.out):]
-	return true
-}
-
-var errs = []error{nil, transform.ErrShortDst, transform.ErrShortSrc}
-
-// transform implements the transform.Transformer interface. It is only called
-// when quickSpan does not pass for a given string.
-func (f Form) transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	// TODO: get rid of reorderBuffer. See CL 23460044.
-	rb := reorderBuffer{}
-	rb.init(f, src)
-	for {
-		// Load segment into reorder buffer.
-		rb.setFlusher(dst[nDst:], flushTransform)
-		end := decomposeSegment(&rb, nSrc, atEOF)
-		if end < 0 {
-			return nDst, nSrc, errs[-end]
-		}
-		nDst = len(dst) - len(rb.out)
-		nSrc = end
-
-		// Next quickSpan.
-		end = rb.nsrc
-		eof := atEOF
-		if n := nSrc + len(dst) - nDst; n < end {
-			err = transform.ErrShortDst
-			end = n
-			eof = false
-		}
-		end, ok := rb.f.quickSpan(rb.src, nSrc, end, eof)
-		n := copy(dst[nDst:], rb.src.bytes[nSrc:end])
-		nSrc += n
-		nDst += n
-		if ok {
-			if n < rb.nsrc && !atEOF {
-				err = transform.ErrShortSrc
-			}
-			return nDst, nSrc, err
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/trie.go b/vendor/golang.org/x/text/unicode/norm/trie.go
deleted file mode 100644
index 423386bf43..0000000000
--- a/vendor/golang.org/x/text/unicode/norm/trie.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-type valueRange struct {
-	value  uint16 // header: value:stride
-	lo, hi byte   // header: lo:n
-}
-
-type sparseBlocks struct {
-	values []valueRange
-	offset []uint16
-}
-
-var nfcSparse = sparseBlocks{
-	values: nfcSparseValues[:],
-	offset: nfcSparseOffset[:],
-}
-
-var nfkcSparse = sparseBlocks{
-	values: nfkcSparseValues[:],
-	offset: nfkcSparseOffset[:],
-}
-
-var (
-	nfcData  = newNfcTrie(0)
-	nfkcData = newNfkcTrie(0)
-)
-
-// lookupValue determines the type of block n and looks up the value for b.
-// For n < t.cutoff, the block is a simple lookup table. Otherwise, the block
-// is a list of ranges with an accompanying value. Given a matching range r,
-// the value for b is by r.value + (b - r.lo) * stride.
-func (t *sparseBlocks) lookup(n uint32, b byte) uint16 {
-	offset := t.offset[n]
-	header := t.values[offset]
-	lo := offset + 1
-	hi := lo + uint16(header.lo)
-	for lo < hi {
-		m := lo + (hi-lo)/2
-		r := t.values[m]
-		if r.lo <= b && b <= r.hi {
-			return r.value + uint16(b-r.lo)*header.value
-		}
-		if b < r.lo {
-			hi = m
-		} else {
-			lo = m + 1
-		}
-	}
-	return 0
-}
diff --git a/vendor/golang.org/x/text/width/kind_string.go b/vendor/golang.org/x/text/width/kind_string.go
deleted file mode 100644
index 49bfbf7268..0000000000
--- a/vendor/golang.org/x/text/width/kind_string.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Code generated by "stringer -type=Kind"; DO NOT EDIT.
-
-package width
-
-import "fmt"
-
-const _Kind_name = "NeutralEastAsianAmbiguousEastAsianWideEastAsianNarrowEastAsianFullwidthEastAsianHalfwidth"
-
-var _Kind_index = [...]uint8{0, 7, 25, 38, 53, 71, 89}
-
-func (i Kind) String() string {
-	if i < 0 || i >= Kind(len(_Kind_index)-1) {
-		return fmt.Sprintf("Kind(%d)", i)
-	}
-	return _Kind_name[_Kind_index[i]:_Kind_index[i+1]]
-}
diff --git a/vendor/golang.org/x/text/width/tables.go b/vendor/golang.org/x/text/width/tables.go
deleted file mode 100644
index e21f0b8385..0000000000
--- a/vendor/golang.org/x/text/width/tables.go
+++ /dev/null
@@ -1,1284 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package width
-
-// UnicodeVersion is the Unicode version from which the tables in this package are derived.
-const UnicodeVersion = "9.0.0"
-
-// lookup returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *widthTrie) lookup(s []byte) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return widthValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := widthIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := widthIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = widthIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := widthIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = widthIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = widthIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *widthTrie) lookupUnsafe(s []byte) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return widthValues[c0]
-	}
-	i := widthIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = widthIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = widthIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// lookupString returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *widthTrie) lookupString(s string) (v uint16, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return widthValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := widthIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := widthIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = widthIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := widthIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = widthIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = widthIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *widthTrie) lookupStringUnsafe(s string) uint16 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return widthValues[c0]
-	}
-	i := widthIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = widthIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = widthIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// widthTrie. Total size: 14080 bytes (13.75 KiB). Checksum: 3b8aeb3dc03667a3.
-type widthTrie struct{}
-
-func newWidthTrie(i int) *widthTrie {
-	return &widthTrie{}
-}
-
-// lookupValue determines the type of block n and looks up the value for b.
-func (t *widthTrie) lookupValue(n uint32, b byte) uint16 {
-	switch {
-	default:
-		return uint16(widthValues[n<<6+uint32(b)])
-	}
-}
-
-// widthValues: 99 blocks, 6336 entries, 12672 bytes
-// The third block is the zero block.
-var widthValues = [6336]uint16{
-	// Block 0x0, offset 0x0
-	0x20: 0x6001, 0x21: 0x6002, 0x22: 0x6002, 0x23: 0x6002,
-	0x24: 0x6002, 0x25: 0x6002, 0x26: 0x6002, 0x27: 0x6002, 0x28: 0x6002, 0x29: 0x6002,
-	0x2a: 0x6002, 0x2b: 0x6002, 0x2c: 0x6002, 0x2d: 0x6002, 0x2e: 0x6002, 0x2f: 0x6002,
-	0x30: 0x6002, 0x31: 0x6002, 0x32: 0x6002, 0x33: 0x6002, 0x34: 0x6002, 0x35: 0x6002,
-	0x36: 0x6002, 0x37: 0x6002, 0x38: 0x6002, 0x39: 0x6002, 0x3a: 0x6002, 0x3b: 0x6002,
-	0x3c: 0x6002, 0x3d: 0x6002, 0x3e: 0x6002, 0x3f: 0x6002,
-	// Block 0x1, offset 0x40
-	0x40: 0x6003, 0x41: 0x6003, 0x42: 0x6003, 0x43: 0x6003, 0x44: 0x6003, 0x45: 0x6003,
-	0x46: 0x6003, 0x47: 0x6003, 0x48: 0x6003, 0x49: 0x6003, 0x4a: 0x6003, 0x4b: 0x6003,
-	0x4c: 0x6003, 0x4d: 0x6003, 0x4e: 0x6003, 0x4f: 0x6003, 0x50: 0x6003, 0x51: 0x6003,
-	0x52: 0x6003, 0x53: 0x6003, 0x54: 0x6003, 0x55: 0x6003, 0x56: 0x6003, 0x57: 0x6003,
-	0x58: 0x6003, 0x59: 0x6003, 0x5a: 0x6003, 0x5b: 0x6003, 0x5c: 0x6003, 0x5d: 0x6003,
-	0x5e: 0x6003, 0x5f: 0x6003, 0x60: 0x6004, 0x61: 0x6004, 0x62: 0x6004, 0x63: 0x6004,
-	0x64: 0x6004, 0x65: 0x6004, 0x66: 0x6004, 0x67: 0x6004, 0x68: 0x6004, 0x69: 0x6004,
-	0x6a: 0x6004, 0x6b: 0x6004, 0x6c: 0x6004, 0x6d: 0x6004, 0x6e: 0x6004, 0x6f: 0x6004,
-	0x70: 0x6004, 0x71: 0x6004, 0x72: 0x6004, 0x73: 0x6004, 0x74: 0x6004, 0x75: 0x6004,
-	0x76: 0x6004, 0x77: 0x6004, 0x78: 0x6004, 0x79: 0x6004, 0x7a: 0x6004, 0x7b: 0x6004,
-	0x7c: 0x6004, 0x7d: 0x6004, 0x7e: 0x6004,
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xe1: 0x2000, 0xe2: 0x6005, 0xe3: 0x6005,
-	0xe4: 0x2000, 0xe5: 0x6006, 0xe6: 0x6005, 0xe7: 0x2000, 0xe8: 0x2000,
-	0xea: 0x2000, 0xec: 0x6007, 0xed: 0x2000, 0xee: 0x2000, 0xef: 0x6008,
-	0xf0: 0x2000, 0xf1: 0x2000, 0xf2: 0x2000, 0xf3: 0x2000, 0xf4: 0x2000,
-	0xf6: 0x2000, 0xf7: 0x2000, 0xf8: 0x2000, 0xf9: 0x2000, 0xfa: 0x2000,
-	0xfc: 0x2000, 0xfd: 0x2000, 0xfe: 0x2000, 0xff: 0x2000,
-	// Block 0x4, offset 0x100
-	0x106: 0x2000,
-	0x110: 0x2000,
-	0x117: 0x2000,
-	0x118: 0x2000,
-	0x11e: 0x2000, 0x11f: 0x2000, 0x120: 0x2000, 0x121: 0x2000,
-	0x126: 0x2000, 0x128: 0x2000, 0x129: 0x2000,
-	0x12a: 0x2000, 0x12c: 0x2000, 0x12d: 0x2000,
-	0x130: 0x2000, 0x132: 0x2000, 0x133: 0x2000,
-	0x137: 0x2000, 0x138: 0x2000, 0x139: 0x2000, 0x13a: 0x2000,
-	0x13c: 0x2000, 0x13e: 0x2000,
-	// Block 0x5, offset 0x140
-	0x141: 0x2000,
-	0x151: 0x2000,
-	0x153: 0x2000,
-	0x15b: 0x2000,
-	0x166: 0x2000, 0x167: 0x2000,
-	0x16b: 0x2000,
-	0x171: 0x2000, 0x172: 0x2000, 0x173: 0x2000,
-	0x178: 0x2000,
-	0x17f: 0x2000,
-	// Block 0x6, offset 0x180
-	0x180: 0x2000, 0x181: 0x2000, 0x182: 0x2000, 0x184: 0x2000,
-	0x188: 0x2000, 0x189: 0x2000, 0x18a: 0x2000, 0x18b: 0x2000,
-	0x18d: 0x2000,
-	0x192: 0x2000, 0x193: 0x2000,
-	0x1a6: 0x2000, 0x1a7: 0x2000,
-	0x1ab: 0x2000,
-	// Block 0x7, offset 0x1c0
-	0x1ce: 0x2000, 0x1d0: 0x2000,
-	0x1d2: 0x2000, 0x1d4: 0x2000, 0x1d6: 0x2000,
-	0x1d8: 0x2000, 0x1da: 0x2000, 0x1dc: 0x2000,
-	// Block 0x8, offset 0x200
-	0x211: 0x2000,
-	0x221: 0x2000,
-	// Block 0x9, offset 0x240
-	0x244: 0x2000,
-	0x247: 0x2000, 0x249: 0x2000, 0x24a: 0x2000, 0x24b: 0x2000,
-	0x24d: 0x2000, 0x250: 0x2000,
-	0x258: 0x2000, 0x259: 0x2000, 0x25a: 0x2000, 0x25b: 0x2000, 0x25d: 0x2000,
-	0x25f: 0x2000,
-	// Block 0xa, offset 0x280
-	0x280: 0x2000, 0x281: 0x2000, 0x282: 0x2000, 0x283: 0x2000, 0x284: 0x2000, 0x285: 0x2000,
-	0x286: 0x2000, 0x287: 0x2000, 0x288: 0x2000, 0x289: 0x2000, 0x28a: 0x2000, 0x28b: 0x2000,
-	0x28c: 0x2000, 0x28d: 0x2000, 0x28e: 0x2000, 0x28f: 0x2000, 0x290: 0x2000, 0x291: 0x2000,
-	0x292: 0x2000, 0x293: 0x2000, 0x294: 0x2000, 0x295: 0x2000, 0x296: 0x2000, 0x297: 0x2000,
-	0x298: 0x2000, 0x299: 0x2000, 0x29a: 0x2000, 0x29b: 0x2000, 0x29c: 0x2000, 0x29d: 0x2000,
-	0x29e: 0x2000, 0x29f: 0x2000, 0x2a0: 0x2000, 0x2a1: 0x2000, 0x2a2: 0x2000, 0x2a3: 0x2000,
-	0x2a4: 0x2000, 0x2a5: 0x2000, 0x2a6: 0x2000, 0x2a7: 0x2000, 0x2a8: 0x2000, 0x2a9: 0x2000,
-	0x2aa: 0x2000, 0x2ab: 0x2000, 0x2ac: 0x2000, 0x2ad: 0x2000, 0x2ae: 0x2000, 0x2af: 0x2000,
-	0x2b0: 0x2000, 0x2b1: 0x2000, 0x2b2: 0x2000, 0x2b3: 0x2000, 0x2b4: 0x2000, 0x2b5: 0x2000,
-	0x2b6: 0x2000, 0x2b7: 0x2000, 0x2b8: 0x2000, 0x2b9: 0x2000, 0x2ba: 0x2000, 0x2bb: 0x2000,
-	0x2bc: 0x2000, 0x2bd: 0x2000, 0x2be: 0x2000, 0x2bf: 0x2000,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0x2000, 0x2c1: 0x2000, 0x2c2: 0x2000, 0x2c3: 0x2000, 0x2c4: 0x2000, 0x2c5: 0x2000,
-	0x2c6: 0x2000, 0x2c7: 0x2000, 0x2c8: 0x2000, 0x2c9: 0x2000, 0x2ca: 0x2000, 0x2cb: 0x2000,
-	0x2cc: 0x2000, 0x2cd: 0x2000, 0x2ce: 0x2000, 0x2cf: 0x2000, 0x2d0: 0x2000, 0x2d1: 0x2000,
-	0x2d2: 0x2000, 0x2d3: 0x2000, 0x2d4: 0x2000, 0x2d5: 0x2000, 0x2d6: 0x2000, 0x2d7: 0x2000,
-	0x2d8: 0x2000, 0x2d9: 0x2000, 0x2da: 0x2000, 0x2db: 0x2000, 0x2dc: 0x2000, 0x2dd: 0x2000,
-	0x2de: 0x2000, 0x2df: 0x2000, 0x2e0: 0x2000, 0x2e1: 0x2000, 0x2e2: 0x2000, 0x2e3: 0x2000,
-	0x2e4: 0x2000, 0x2e5: 0x2000, 0x2e6: 0x2000, 0x2e7: 0x2000, 0x2e8: 0x2000, 0x2e9: 0x2000,
-	0x2ea: 0x2000, 0x2eb: 0x2000, 0x2ec: 0x2000, 0x2ed: 0x2000, 0x2ee: 0x2000, 0x2ef: 0x2000,
-	// Block 0xc, offset 0x300
-	0x311: 0x2000,
-	0x312: 0x2000, 0x313: 0x2000, 0x314: 0x2000, 0x315: 0x2000, 0x316: 0x2000, 0x317: 0x2000,
-	0x318: 0x2000, 0x319: 0x2000, 0x31a: 0x2000, 0x31b: 0x2000, 0x31c: 0x2000, 0x31d: 0x2000,
-	0x31e: 0x2000, 0x31f: 0x2000, 0x320: 0x2000, 0x321: 0x2000, 0x323: 0x2000,
-	0x324: 0x2000, 0x325: 0x2000, 0x326: 0x2000, 0x327: 0x2000, 0x328: 0x2000, 0x329: 0x2000,
-	0x331: 0x2000, 0x332: 0x2000, 0x333: 0x2000, 0x334: 0x2000, 0x335: 0x2000,
-	0x336: 0x2000, 0x337: 0x2000, 0x338: 0x2000, 0x339: 0x2000, 0x33a: 0x2000, 0x33b: 0x2000,
-	0x33c: 0x2000, 0x33d: 0x2000, 0x33e: 0x2000, 0x33f: 0x2000,
-	// Block 0xd, offset 0x340
-	0x340: 0x2000, 0x341: 0x2000, 0x343: 0x2000, 0x344: 0x2000, 0x345: 0x2000,
-	0x346: 0x2000, 0x347: 0x2000, 0x348: 0x2000, 0x349: 0x2000,
-	// Block 0xe, offset 0x380
-	0x381: 0x2000,
-	0x390: 0x2000, 0x391: 0x2000,
-	0x392: 0x2000, 0x393: 0x2000, 0x394: 0x2000, 0x395: 0x2000, 0x396: 0x2000, 0x397: 0x2000,
-	0x398: 0x2000, 0x399: 0x2000, 0x39a: 0x2000, 0x39b: 0x2000, 0x39c: 0x2000, 0x39d: 0x2000,
-	0x39e: 0x2000, 0x39f: 0x2000, 0x3a0: 0x2000, 0x3a1: 0x2000, 0x3a2: 0x2000, 0x3a3: 0x2000,
-	0x3a4: 0x2000, 0x3a5: 0x2000, 0x3a6: 0x2000, 0x3a7: 0x2000, 0x3a8: 0x2000, 0x3a9: 0x2000,
-	0x3aa: 0x2000, 0x3ab: 0x2000, 0x3ac: 0x2000, 0x3ad: 0x2000, 0x3ae: 0x2000, 0x3af: 0x2000,
-	0x3b0: 0x2000, 0x3b1: 0x2000, 0x3b2: 0x2000, 0x3b3: 0x2000, 0x3b4: 0x2000, 0x3b5: 0x2000,
-	0x3b6: 0x2000, 0x3b7: 0x2000, 0x3b8: 0x2000, 0x3b9: 0x2000, 0x3ba: 0x2000, 0x3bb: 0x2000,
-	0x3bc: 0x2000, 0x3bd: 0x2000, 0x3be: 0x2000, 0x3bf: 0x2000,
-	// Block 0xf, offset 0x3c0
-	0x3c0: 0x2000, 0x3c1: 0x2000, 0x3c2: 0x2000, 0x3c3: 0x2000, 0x3c4: 0x2000, 0x3c5: 0x2000,
-	0x3c6: 0x2000, 0x3c7: 0x2000, 0x3c8: 0x2000, 0x3c9: 0x2000, 0x3ca: 0x2000, 0x3cb: 0x2000,
-	0x3cc: 0x2000, 0x3cd: 0x2000, 0x3ce: 0x2000, 0x3cf: 0x2000, 0x3d1: 0x2000,
-	// Block 0x10, offset 0x400
-	0x400: 0x4000, 0x401: 0x4000, 0x402: 0x4000, 0x403: 0x4000, 0x404: 0x4000, 0x405: 0x4000,
-	0x406: 0x4000, 0x407: 0x4000, 0x408: 0x4000, 0x409: 0x4000, 0x40a: 0x4000, 0x40b: 0x4000,
-	0x40c: 0x4000, 0x40d: 0x4000, 0x40e: 0x4000, 0x40f: 0x4000, 0x410: 0x4000, 0x411: 0x4000,
-	0x412: 0x4000, 0x413: 0x4000, 0x414: 0x4000, 0x415: 0x4000, 0x416: 0x4000, 0x417: 0x4000,
-	0x418: 0x4000, 0x419: 0x4000, 0x41a: 0x4000, 0x41b: 0x4000, 0x41c: 0x4000, 0x41d: 0x4000,
-	0x41e: 0x4000, 0x41f: 0x4000, 0x420: 0x4000, 0x421: 0x4000, 0x422: 0x4000, 0x423: 0x4000,
-	0x424: 0x4000, 0x425: 0x4000, 0x426: 0x4000, 0x427: 0x4000, 0x428: 0x4000, 0x429: 0x4000,
-	0x42a: 0x4000, 0x42b: 0x4000, 0x42c: 0x4000, 0x42d: 0x4000, 0x42e: 0x4000, 0x42f: 0x4000,
-	0x430: 0x4000, 0x431: 0x4000, 0x432: 0x4000, 0x433: 0x4000, 0x434: 0x4000, 0x435: 0x4000,
-	0x436: 0x4000, 0x437: 0x4000, 0x438: 0x4000, 0x439: 0x4000, 0x43a: 0x4000, 0x43b: 0x4000,
-	0x43c: 0x4000, 0x43d: 0x4000, 0x43e: 0x4000, 0x43f: 0x4000,
-	// Block 0x11, offset 0x440
-	0x440: 0x4000, 0x441: 0x4000, 0x442: 0x4000, 0x443: 0x4000, 0x444: 0x4000, 0x445: 0x4000,
-	0x446: 0x4000, 0x447: 0x4000, 0x448: 0x4000, 0x449: 0x4000, 0x44a: 0x4000, 0x44b: 0x4000,
-	0x44c: 0x4000, 0x44d: 0x4000, 0x44e: 0x4000, 0x44f: 0x4000, 0x450: 0x4000, 0x451: 0x4000,
-	0x452: 0x4000, 0x453: 0x4000, 0x454: 0x4000, 0x455: 0x4000, 0x456: 0x4000, 0x457: 0x4000,
-	0x458: 0x4000, 0x459: 0x4000, 0x45a: 0x4000, 0x45b: 0x4000, 0x45c: 0x4000, 0x45d: 0x4000,
-	0x45e: 0x4000, 0x45f: 0x4000,
-	// Block 0x12, offset 0x480
-	0x490: 0x2000,
-	0x493: 0x2000, 0x494: 0x2000, 0x495: 0x2000, 0x496: 0x2000,
-	0x498: 0x2000, 0x499: 0x2000, 0x49c: 0x2000, 0x49d: 0x2000,
-	0x4a0: 0x2000, 0x4a1: 0x2000, 0x4a2: 0x2000,
-	0x4a4: 0x2000, 0x4a5: 0x2000, 0x4a6: 0x2000, 0x4a7: 0x2000,
-	0x4b0: 0x2000, 0x4b2: 0x2000, 0x4b3: 0x2000, 0x4b5: 0x2000,
-	0x4bb: 0x2000,
-	0x4be: 0x2000,
-	// Block 0x13, offset 0x4c0
-	0x4f4: 0x2000,
-	0x4ff: 0x2000,
-	// Block 0x14, offset 0x500
-	0x501: 0x2000, 0x502: 0x2000, 0x503: 0x2000, 0x504: 0x2000,
-	0x529: 0xa009,
-	0x52c: 0x2000,
-	// Block 0x15, offset 0x540
-	0x543: 0x2000, 0x545: 0x2000,
-	0x549: 0x2000,
-	0x553: 0x2000, 0x556: 0x2000,
-	0x561: 0x2000, 0x562: 0x2000,
-	0x566: 0x2000,
-	0x56b: 0x2000,
-	// Block 0x16, offset 0x580
-	0x593: 0x2000, 0x594: 0x2000,
-	0x59b: 0x2000, 0x59c: 0x2000, 0x59d: 0x2000,
-	0x59e: 0x2000, 0x5a0: 0x2000, 0x5a1: 0x2000, 0x5a2: 0x2000, 0x5a3: 0x2000,
-	0x5a4: 0x2000, 0x5a5: 0x2000, 0x5a6: 0x2000, 0x5a7: 0x2000, 0x5a8: 0x2000, 0x5a9: 0x2000,
-	0x5aa: 0x2000, 0x5ab: 0x2000,
-	0x5b0: 0x2000, 0x5b1: 0x2000, 0x5b2: 0x2000, 0x5b3: 0x2000, 0x5b4: 0x2000, 0x5b5: 0x2000,
-	0x5b6: 0x2000, 0x5b7: 0x2000, 0x5b8: 0x2000, 0x5b9: 0x2000,
-	// Block 0x17, offset 0x5c0
-	0x5c9: 0x2000,
-	0x5d0: 0x200a, 0x5d1: 0x200b,
-	0x5d2: 0x200a, 0x5d3: 0x200c, 0x5d4: 0x2000, 0x5d5: 0x2000, 0x5d6: 0x2000, 0x5d7: 0x2000,
-	0x5d8: 0x2000, 0x5d9: 0x2000,
-	0x5f8: 0x2000, 0x5f9: 0x2000,
-	// Block 0x18, offset 0x600
-	0x612: 0x2000, 0x614: 0x2000,
-	0x627: 0x2000,
-	// Block 0x19, offset 0x640
-	0x640: 0x2000, 0x642: 0x2000, 0x643: 0x2000,
-	0x647: 0x2000, 0x648: 0x2000, 0x64b: 0x2000,
-	0x64f: 0x2000, 0x651: 0x2000,
-	0x655: 0x2000,
-	0x65a: 0x2000, 0x65d: 0x2000,
-	0x65e: 0x2000, 0x65f: 0x2000, 0x660: 0x2000, 0x663: 0x2000,
-	0x665: 0x2000, 0x667: 0x2000, 0x668: 0x2000, 0x669: 0x2000,
-	0x66a: 0x2000, 0x66b: 0x2000, 0x66c: 0x2000, 0x66e: 0x2000,
-	0x674: 0x2000, 0x675: 0x2000,
-	0x676: 0x2000, 0x677: 0x2000,
-	0x67c: 0x2000, 0x67d: 0x2000,
-	// Block 0x1a, offset 0x680
-	0x688: 0x2000,
-	0x68c: 0x2000,
-	0x692: 0x2000,
-	0x6a0: 0x2000, 0x6a1: 0x2000,
-	0x6a4: 0x2000, 0x6a5: 0x2000, 0x6a6: 0x2000, 0x6a7: 0x2000,
-	0x6aa: 0x2000, 0x6ab: 0x2000, 0x6ae: 0x2000, 0x6af: 0x2000,
-	// Block 0x1b, offset 0x6c0
-	0x6c2: 0x2000, 0x6c3: 0x2000,
-	0x6c6: 0x2000, 0x6c7: 0x2000,
-	0x6d5: 0x2000,
-	0x6d9: 0x2000,
-	0x6e5: 0x2000,
-	0x6ff: 0x2000,
-	// Block 0x1c, offset 0x700
-	0x712: 0x2000,
-	0x71a: 0x4000, 0x71b: 0x4000,
-	0x729: 0x4000,
-	0x72a: 0x4000,
-	// Block 0x1d, offset 0x740
-	0x769: 0x4000,
-	0x76a: 0x4000, 0x76b: 0x4000, 0x76c: 0x4000,
-	0x770: 0x4000, 0x773: 0x4000,
-	// Block 0x1e, offset 0x780
-	0x7a0: 0x2000, 0x7a1: 0x2000, 0x7a2: 0x2000, 0x7a3: 0x2000,
-	0x7a4: 0x2000, 0x7a5: 0x2000, 0x7a6: 0x2000, 0x7a7: 0x2000, 0x7a8: 0x2000, 0x7a9: 0x2000,
-	0x7aa: 0x2000, 0x7ab: 0x2000, 0x7ac: 0x2000, 0x7ad: 0x2000, 0x7ae: 0x2000, 0x7af: 0x2000,
-	0x7b0: 0x2000, 0x7b1: 0x2000, 0x7b2: 0x2000, 0x7b3: 0x2000, 0x7b4: 0x2000, 0x7b5: 0x2000,
-	0x7b6: 0x2000, 0x7b7: 0x2000, 0x7b8: 0x2000, 0x7b9: 0x2000, 0x7ba: 0x2000, 0x7bb: 0x2000,
-	0x7bc: 0x2000, 0x7bd: 0x2000, 0x7be: 0x2000, 0x7bf: 0x2000,
-	// Block 0x1f, offset 0x7c0
-	0x7c0: 0x2000, 0x7c1: 0x2000, 0x7c2: 0x2000, 0x7c3: 0x2000, 0x7c4: 0x2000, 0x7c5: 0x2000,
-	0x7c6: 0x2000, 0x7c7: 0x2000, 0x7c8: 0x2000, 0x7c9: 0x2000, 0x7ca: 0x2000, 0x7cb: 0x2000,
-	0x7cc: 0x2000, 0x7cd: 0x2000, 0x7ce: 0x2000, 0x7cf: 0x2000, 0x7d0: 0x2000, 0x7d1: 0x2000,
-	0x7d2: 0x2000, 0x7d3: 0x2000, 0x7d4: 0x2000, 0x7d5: 0x2000, 0x7d6: 0x2000, 0x7d7: 0x2000,
-	0x7d8: 0x2000, 0x7d9: 0x2000, 0x7da: 0x2000, 0x7db: 0x2000, 0x7dc: 0x2000, 0x7dd: 0x2000,
-	0x7de: 0x2000, 0x7df: 0x2000, 0x7e0: 0x2000, 0x7e1: 0x2000, 0x7e2: 0x2000, 0x7e3: 0x2000,
-	0x7e4: 0x2000, 0x7e5: 0x2000, 0x7e6: 0x2000, 0x7e7: 0x2000, 0x7e8: 0x2000, 0x7e9: 0x2000,
-	0x7eb: 0x2000, 0x7ec: 0x2000, 0x7ed: 0x2000, 0x7ee: 0x2000, 0x7ef: 0x2000,
-	0x7f0: 0x2000, 0x7f1: 0x2000, 0x7f2: 0x2000, 0x7f3: 0x2000, 0x7f4: 0x2000, 0x7f5: 0x2000,
-	0x7f6: 0x2000, 0x7f7: 0x2000, 0x7f8: 0x2000, 0x7f9: 0x2000, 0x7fa: 0x2000, 0x7fb: 0x2000,
-	0x7fc: 0x2000, 0x7fd: 0x2000, 0x7fe: 0x2000, 0x7ff: 0x2000,
-	// Block 0x20, offset 0x800
-	0x800: 0x2000, 0x801: 0x2000, 0x802: 0x200d, 0x803: 0x2000, 0x804: 0x2000, 0x805: 0x2000,
-	0x806: 0x2000, 0x807: 0x2000, 0x808: 0x2000, 0x809: 0x2000, 0x80a: 0x2000, 0x80b: 0x2000,
-	0x80c: 0x2000, 0x80d: 0x2000, 0x80e: 0x2000, 0x80f: 0x2000, 0x810: 0x2000, 0x811: 0x2000,
-	0x812: 0x2000, 0x813: 0x2000, 0x814: 0x2000, 0x815: 0x2000, 0x816: 0x2000, 0x817: 0x2000,
-	0x818: 0x2000, 0x819: 0x2000, 0x81a: 0x2000, 0x81b: 0x2000, 0x81c: 0x2000, 0x81d: 0x2000,
-	0x81e: 0x2000, 0x81f: 0x2000, 0x820: 0x2000, 0x821: 0x2000, 0x822: 0x2000, 0x823: 0x2000,
-	0x824: 0x2000, 0x825: 0x2000, 0x826: 0x2000, 0x827: 0x2000, 0x828: 0x2000, 0x829: 0x2000,
-	0x82a: 0x2000, 0x82b: 0x2000, 0x82c: 0x2000, 0x82d: 0x2000, 0x82e: 0x2000, 0x82f: 0x2000,
-	0x830: 0x2000, 0x831: 0x2000, 0x832: 0x2000, 0x833: 0x2000, 0x834: 0x2000, 0x835: 0x2000,
-	0x836: 0x2000, 0x837: 0x2000, 0x838: 0x2000, 0x839: 0x2000, 0x83a: 0x2000, 0x83b: 0x2000,
-	0x83c: 0x2000, 0x83d: 0x2000, 0x83e: 0x2000, 0x83f: 0x2000,
-	// Block 0x21, offset 0x840
-	0x840: 0x2000, 0x841: 0x2000, 0x842: 0x2000, 0x843: 0x2000, 0x844: 0x2000, 0x845: 0x2000,
-	0x846: 0x2000, 0x847: 0x2000, 0x848: 0x2000, 0x849: 0x2000, 0x84a: 0x2000, 0x84b: 0x2000,
-	0x850: 0x2000, 0x851: 0x2000,
-	0x852: 0x2000, 0x853: 0x2000, 0x854: 0x2000, 0x855: 0x2000, 0x856: 0x2000, 0x857: 0x2000,
-	0x858: 0x2000, 0x859: 0x2000, 0x85a: 0x2000, 0x85b: 0x2000, 0x85c: 0x2000, 0x85d: 0x2000,
-	0x85e: 0x2000, 0x85f: 0x2000, 0x860: 0x2000, 0x861: 0x2000, 0x862: 0x2000, 0x863: 0x2000,
-	0x864: 0x2000, 0x865: 0x2000, 0x866: 0x2000, 0x867: 0x2000, 0x868: 0x2000, 0x869: 0x2000,
-	0x86a: 0x2000, 0x86b: 0x2000, 0x86c: 0x2000, 0x86d: 0x2000, 0x86e: 0x2000, 0x86f: 0x2000,
-	0x870: 0x2000, 0x871: 0x2000, 0x872: 0x2000, 0x873: 0x2000,
-	// Block 0x22, offset 0x880
-	0x880: 0x2000, 0x881: 0x2000, 0x882: 0x2000, 0x883: 0x2000, 0x884: 0x2000, 0x885: 0x2000,
-	0x886: 0x2000, 0x887: 0x2000, 0x888: 0x2000, 0x889: 0x2000, 0x88a: 0x2000, 0x88b: 0x2000,
-	0x88c: 0x2000, 0x88d: 0x2000, 0x88e: 0x2000, 0x88f: 0x2000,
-	0x892: 0x2000, 0x893: 0x2000, 0x894: 0x2000, 0x895: 0x2000,
-	0x8a0: 0x200e, 0x8a1: 0x2000, 0x8a3: 0x2000,
-	0x8a4: 0x2000, 0x8a5: 0x2000, 0x8a6: 0x2000, 0x8a7: 0x2000, 0x8a8: 0x2000, 0x8a9: 0x2000,
-	0x8b2: 0x2000, 0x8b3: 0x2000,
-	0x8b6: 0x2000, 0x8b7: 0x2000,
-	0x8bc: 0x2000, 0x8bd: 0x2000,
-	// Block 0x23, offset 0x8c0
-	0x8c0: 0x2000, 0x8c1: 0x2000,
-	0x8c6: 0x2000, 0x8c7: 0x2000, 0x8c8: 0x2000, 0x8cb: 0x200f,
-	0x8ce: 0x2000, 0x8cf: 0x2000, 0x8d0: 0x2000, 0x8d1: 0x2000,
-	0x8e2: 0x2000, 0x8e3: 0x2000,
-	0x8e4: 0x2000, 0x8e5: 0x2000,
-	0x8ef: 0x2000,
-	0x8fd: 0x4000, 0x8fe: 0x4000,
-	// Block 0x24, offset 0x900
-	0x905: 0x2000,
-	0x906: 0x2000, 0x909: 0x2000,
-	0x90e: 0x2000, 0x90f: 0x2000,
-	0x914: 0x4000, 0x915: 0x4000,
-	0x91c: 0x2000,
-	0x91e: 0x2000,
-	// Block 0x25, offset 0x940
-	0x940: 0x2000, 0x942: 0x2000,
-	0x948: 0x4000, 0x949: 0x4000, 0x94a: 0x4000, 0x94b: 0x4000,
-	0x94c: 0x4000, 0x94d: 0x4000, 0x94e: 0x4000, 0x94f: 0x4000, 0x950: 0x4000, 0x951: 0x4000,
-	0x952: 0x4000, 0x953: 0x4000,
-	0x960: 0x2000, 0x961: 0x2000, 0x963: 0x2000,
-	0x964: 0x2000, 0x965: 0x2000, 0x967: 0x2000, 0x968: 0x2000, 0x969: 0x2000,
-	0x96a: 0x2000, 0x96c: 0x2000, 0x96d: 0x2000, 0x96f: 0x2000,
-	0x97f: 0x4000,
-	// Block 0x26, offset 0x980
-	0x993: 0x4000,
-	0x99e: 0x2000, 0x99f: 0x2000, 0x9a1: 0x4000,
-	0x9aa: 0x4000, 0x9ab: 0x4000,
-	0x9bd: 0x4000, 0x9be: 0x4000, 0x9bf: 0x2000,
-	// Block 0x27, offset 0x9c0
-	0x9c4: 0x4000, 0x9c5: 0x4000,
-	0x9c6: 0x2000, 0x9c7: 0x2000, 0x9c8: 0x2000, 0x9c9: 0x2000, 0x9ca: 0x2000, 0x9cb: 0x2000,
-	0x9cc: 0x2000, 0x9cd: 0x2000, 0x9ce: 0x4000, 0x9cf: 0x2000, 0x9d0: 0x2000, 0x9d1: 0x2000,
-	0x9d2: 0x2000, 0x9d3: 0x2000, 0x9d4: 0x4000, 0x9d5: 0x2000, 0x9d6: 0x2000, 0x9d7: 0x2000,
-	0x9d8: 0x2000, 0x9d9: 0x2000, 0x9da: 0x2000, 0x9db: 0x2000, 0x9dc: 0x2000, 0x9dd: 0x2000,
-	0x9de: 0x2000, 0x9df: 0x2000, 0x9e0: 0x2000, 0x9e1: 0x2000, 0x9e3: 0x2000,
-	0x9e8: 0x2000, 0x9e9: 0x2000,
-	0x9ea: 0x4000, 0x9eb: 0x2000, 0x9ec: 0x2000, 0x9ed: 0x2000, 0x9ee: 0x2000, 0x9ef: 0x2000,
-	0x9f0: 0x2000, 0x9f1: 0x2000, 0x9f2: 0x4000, 0x9f3: 0x4000, 0x9f4: 0x2000, 0x9f5: 0x4000,
-	0x9f6: 0x2000, 0x9f7: 0x2000, 0x9f8: 0x2000, 0x9f9: 0x2000, 0x9fa: 0x4000, 0x9fb: 0x2000,
-	0x9fc: 0x2000, 0x9fd: 0x4000, 0x9fe: 0x2000, 0x9ff: 0x2000,
-	// Block 0x28, offset 0xa00
-	0xa05: 0x4000,
-	0xa0a: 0x4000, 0xa0b: 0x4000,
-	0xa28: 0x4000,
-	0xa3d: 0x2000,
-	// Block 0x29, offset 0xa40
-	0xa4c: 0x4000, 0xa4e: 0x4000,
-	0xa53: 0x4000, 0xa54: 0x4000, 0xa55: 0x4000, 0xa57: 0x4000,
-	0xa76: 0x2000, 0xa77: 0x2000, 0xa78: 0x2000, 0xa79: 0x2000, 0xa7a: 0x2000, 0xa7b: 0x2000,
-	0xa7c: 0x2000, 0xa7d: 0x2000, 0xa7e: 0x2000, 0xa7f: 0x2000,
-	// Block 0x2a, offset 0xa80
-	0xa95: 0x4000, 0xa96: 0x4000, 0xa97: 0x4000,
-	0xab0: 0x4000,
-	0xabf: 0x4000,
-	// Block 0x2b, offset 0xac0
-	0xae6: 0x6000, 0xae7: 0x6000, 0xae8: 0x6000, 0xae9: 0x6000,
-	0xaea: 0x6000, 0xaeb: 0x6000, 0xaec: 0x6000, 0xaed: 0x6000,
-	// Block 0x2c, offset 0xb00
-	0xb05: 0x6010,
-	0xb06: 0x6011,
-	// Block 0x2d, offset 0xb40
-	0xb5b: 0x4000, 0xb5c: 0x4000,
-	// Block 0x2e, offset 0xb80
-	0xb90: 0x4000,
-	0xb95: 0x4000, 0xb96: 0x2000, 0xb97: 0x2000,
-	0xb98: 0x2000, 0xb99: 0x2000,
-	// Block 0x2f, offset 0xbc0
-	0xbc0: 0x4000, 0xbc1: 0x4000, 0xbc2: 0x4000, 0xbc3: 0x4000, 0xbc4: 0x4000, 0xbc5: 0x4000,
-	0xbc6: 0x4000, 0xbc7: 0x4000, 0xbc8: 0x4000, 0xbc9: 0x4000, 0xbca: 0x4000, 0xbcb: 0x4000,
-	0xbcc: 0x4000, 0xbcd: 0x4000, 0xbce: 0x4000, 0xbcf: 0x4000, 0xbd0: 0x4000, 0xbd1: 0x4000,
-	0xbd2: 0x4000, 0xbd3: 0x4000, 0xbd4: 0x4000, 0xbd5: 0x4000, 0xbd6: 0x4000, 0xbd7: 0x4000,
-	0xbd8: 0x4000, 0xbd9: 0x4000, 0xbdb: 0x4000, 0xbdc: 0x4000, 0xbdd: 0x4000,
-	0xbde: 0x4000, 0xbdf: 0x4000, 0xbe0: 0x4000, 0xbe1: 0x4000, 0xbe2: 0x4000, 0xbe3: 0x4000,
-	0xbe4: 0x4000, 0xbe5: 0x4000, 0xbe6: 0x4000, 0xbe7: 0x4000, 0xbe8: 0x4000, 0xbe9: 0x4000,
-	0xbea: 0x4000, 0xbeb: 0x4000, 0xbec: 0x4000, 0xbed: 0x4000, 0xbee: 0x4000, 0xbef: 0x4000,
-	0xbf0: 0x4000, 0xbf1: 0x4000, 0xbf2: 0x4000, 0xbf3: 0x4000, 0xbf4: 0x4000, 0xbf5: 0x4000,
-	0xbf6: 0x4000, 0xbf7: 0x4000, 0xbf8: 0x4000, 0xbf9: 0x4000, 0xbfa: 0x4000, 0xbfb: 0x4000,
-	0xbfc: 0x4000, 0xbfd: 0x4000, 0xbfe: 0x4000, 0xbff: 0x4000,
-	// Block 0x30, offset 0xc00
-	0xc00: 0x4000, 0xc01: 0x4000, 0xc02: 0x4000, 0xc03: 0x4000, 0xc04: 0x4000, 0xc05: 0x4000,
-	0xc06: 0x4000, 0xc07: 0x4000, 0xc08: 0x4000, 0xc09: 0x4000, 0xc0a: 0x4000, 0xc0b: 0x4000,
-	0xc0c: 0x4000, 0xc0d: 0x4000, 0xc0e: 0x4000, 0xc0f: 0x4000, 0xc10: 0x4000, 0xc11: 0x4000,
-	0xc12: 0x4000, 0xc13: 0x4000, 0xc14: 0x4000, 0xc15: 0x4000, 0xc16: 0x4000, 0xc17: 0x4000,
-	0xc18: 0x4000, 0xc19: 0x4000, 0xc1a: 0x4000, 0xc1b: 0x4000, 0xc1c: 0x4000, 0xc1d: 0x4000,
-	0xc1e: 0x4000, 0xc1f: 0x4000, 0xc20: 0x4000, 0xc21: 0x4000, 0xc22: 0x4000, 0xc23: 0x4000,
-	0xc24: 0x4000, 0xc25: 0x4000, 0xc26: 0x4000, 0xc27: 0x4000, 0xc28: 0x4000, 0xc29: 0x4000,
-	0xc2a: 0x4000, 0xc2b: 0x4000, 0xc2c: 0x4000, 0xc2d: 0x4000, 0xc2e: 0x4000, 0xc2f: 0x4000,
-	0xc30: 0x4000, 0xc31: 0x4000, 0xc32: 0x4000, 0xc33: 0x4000,
-	// Block 0x31, offset 0xc40
-	0xc40: 0x4000, 0xc41: 0x4000, 0xc42: 0x4000, 0xc43: 0x4000, 0xc44: 0x4000, 0xc45: 0x4000,
-	0xc46: 0x4000, 0xc47: 0x4000, 0xc48: 0x4000, 0xc49: 0x4000, 0xc4a: 0x4000, 0xc4b: 0x4000,
-	0xc4c: 0x4000, 0xc4d: 0x4000, 0xc4e: 0x4000, 0xc4f: 0x4000, 0xc50: 0x4000, 0xc51: 0x4000,
-	0xc52: 0x4000, 0xc53: 0x4000, 0xc54: 0x4000, 0xc55: 0x4000,
-	0xc70: 0x4000, 0xc71: 0x4000, 0xc72: 0x4000, 0xc73: 0x4000, 0xc74: 0x4000, 0xc75: 0x4000,
-	0xc76: 0x4000, 0xc77: 0x4000, 0xc78: 0x4000, 0xc79: 0x4000, 0xc7a: 0x4000, 0xc7b: 0x4000,
-	// Block 0x32, offset 0xc80
-	0xc80: 0x9012, 0xc81: 0x4013, 0xc82: 0x4014, 0xc83: 0x4000, 0xc84: 0x4000, 0xc85: 0x4000,
-	0xc86: 0x4000, 0xc87: 0x4000, 0xc88: 0x4000, 0xc89: 0x4000, 0xc8a: 0x4000, 0xc8b: 0x4000,
-	0xc8c: 0x4015, 0xc8d: 0x4015, 0xc8e: 0x4000, 0xc8f: 0x4000, 0xc90: 0x4000, 0xc91: 0x4000,
-	0xc92: 0x4000, 0xc93: 0x4000, 0xc94: 0x4000, 0xc95: 0x4000, 0xc96: 0x4000, 0xc97: 0x4000,
-	0xc98: 0x4000, 0xc99: 0x4000, 0xc9a: 0x4000, 0xc9b: 0x4000, 0xc9c: 0x4000, 0xc9d: 0x4000,
-	0xc9e: 0x4000, 0xc9f: 0x4000, 0xca0: 0x4000, 0xca1: 0x4000, 0xca2: 0x4000, 0xca3: 0x4000,
-	0xca4: 0x4000, 0xca5: 0x4000, 0xca6: 0x4000, 0xca7: 0x4000, 0xca8: 0x4000, 0xca9: 0x4000,
-	0xcaa: 0x4000, 0xcab: 0x4000, 0xcac: 0x4000, 0xcad: 0x4000, 0xcae: 0x4000, 0xcaf: 0x4000,
-	0xcb0: 0x4000, 0xcb1: 0x4000, 0xcb2: 0x4000, 0xcb3: 0x4000, 0xcb4: 0x4000, 0xcb5: 0x4000,
-	0xcb6: 0x4000, 0xcb7: 0x4000, 0xcb8: 0x4000, 0xcb9: 0x4000, 0xcba: 0x4000, 0xcbb: 0x4000,
-	0xcbc: 0x4000, 0xcbd: 0x4000, 0xcbe: 0x4000,
-	// Block 0x33, offset 0xcc0
-	0xcc1: 0x4000, 0xcc2: 0x4000, 0xcc3: 0x4000, 0xcc4: 0x4000, 0xcc5: 0x4000,
-	0xcc6: 0x4000, 0xcc7: 0x4000, 0xcc8: 0x4000, 0xcc9: 0x4000, 0xcca: 0x4000, 0xccb: 0x4000,
-	0xccc: 0x4000, 0xccd: 0x4000, 0xcce: 0x4000, 0xccf: 0x4000, 0xcd0: 0x4000, 0xcd1: 0x4000,
-	0xcd2: 0x4000, 0xcd3: 0x4000, 0xcd4: 0x4000, 0xcd5: 0x4000, 0xcd6: 0x4000, 0xcd7: 0x4000,
-	0xcd8: 0x4000, 0xcd9: 0x4000, 0xcda: 0x4000, 0xcdb: 0x4000, 0xcdc: 0x4000, 0xcdd: 0x4000,
-	0xcde: 0x4000, 0xcdf: 0x4000, 0xce0: 0x4000, 0xce1: 0x4000, 0xce2: 0x4000, 0xce3: 0x4000,
-	0xce4: 0x4000, 0xce5: 0x4000, 0xce6: 0x4000, 0xce7: 0x4000, 0xce8: 0x4000, 0xce9: 0x4000,
-	0xcea: 0x4000, 0xceb: 0x4000, 0xcec: 0x4000, 0xced: 0x4000, 0xcee: 0x4000, 0xcef: 0x4000,
-	0xcf0: 0x4000, 0xcf1: 0x4000, 0xcf2: 0x4000, 0xcf3: 0x4000, 0xcf4: 0x4000, 0xcf5: 0x4000,
-	0xcf6: 0x4000, 0xcf7: 0x4000, 0xcf8: 0x4000, 0xcf9: 0x4000, 0xcfa: 0x4000, 0xcfb: 0x4000,
-	0xcfc: 0x4000, 0xcfd: 0x4000, 0xcfe: 0x4000, 0xcff: 0x4000,
-	// Block 0x34, offset 0xd00
-	0xd00: 0x4000, 0xd01: 0x4000, 0xd02: 0x4000, 0xd03: 0x4000, 0xd04: 0x4000, 0xd05: 0x4000,
-	0xd06: 0x4000, 0xd07: 0x4000, 0xd08: 0x4000, 0xd09: 0x4000, 0xd0a: 0x4000, 0xd0b: 0x4000,
-	0xd0c: 0x4000, 0xd0d: 0x4000, 0xd0e: 0x4000, 0xd0f: 0x4000, 0xd10: 0x4000, 0xd11: 0x4000,
-	0xd12: 0x4000, 0xd13: 0x4000, 0xd14: 0x4000, 0xd15: 0x4000, 0xd16: 0x4000,
-	0xd19: 0x4016, 0xd1a: 0x4017, 0xd1b: 0x4000, 0xd1c: 0x4000, 0xd1d: 0x4000,
-	0xd1e: 0x4000, 0xd1f: 0x4000, 0xd20: 0x4000, 0xd21: 0x4018, 0xd22: 0x4019, 0xd23: 0x401a,
-	0xd24: 0x401b, 0xd25: 0x401c, 0xd26: 0x401d, 0xd27: 0x401e, 0xd28: 0x401f, 0xd29: 0x4020,
-	0xd2a: 0x4021, 0xd2b: 0x4022, 0xd2c: 0x4000, 0xd2d: 0x4010, 0xd2e: 0x4000, 0xd2f: 0x4023,
-	0xd30: 0x4000, 0xd31: 0x4024, 0xd32: 0x4000, 0xd33: 0x4025, 0xd34: 0x4000, 0xd35: 0x4026,
-	0xd36: 0x4000, 0xd37: 0x401a, 0xd38: 0x4000, 0xd39: 0x4027, 0xd3a: 0x4000, 0xd3b: 0x4028,
-	0xd3c: 0x4000, 0xd3d: 0x4020, 0xd3e: 0x4000, 0xd3f: 0x4029,
-	// Block 0x35, offset 0xd40
-	0xd40: 0x4000, 0xd41: 0x402a, 0xd42: 0x4000, 0xd43: 0x402b, 0xd44: 0x402c, 0xd45: 0x4000,
-	0xd46: 0x4017, 0xd47: 0x4000, 0xd48: 0x402d, 0xd49: 0x4000, 0xd4a: 0x402e, 0xd4b: 0x402f,
-	0xd4c: 0x4030, 0xd4d: 0x4017, 0xd4e: 0x4016, 0xd4f: 0x4017, 0xd50: 0x4000, 0xd51: 0x4000,
-	0xd52: 0x4031, 0xd53: 0x4000, 0xd54: 0x4000, 0xd55: 0x4031, 0xd56: 0x4000, 0xd57: 0x4000,
-	0xd58: 0x4032, 0xd59: 0x4000, 0xd5a: 0x4000, 0xd5b: 0x4032, 0xd5c: 0x4000, 0xd5d: 0x4000,
-	0xd5e: 0x4033, 0xd5f: 0x402e, 0xd60: 0x4034, 0xd61: 0x4035, 0xd62: 0x4034, 0xd63: 0x4036,
-	0xd64: 0x4037, 0xd65: 0x4024, 0xd66: 0x4035, 0xd67: 0x4025, 0xd68: 0x4038, 0xd69: 0x4038,
-	0xd6a: 0x4039, 0xd6b: 0x4039, 0xd6c: 0x403a, 0xd6d: 0x403a, 0xd6e: 0x4000, 0xd6f: 0x4035,
-	0xd70: 0x4000, 0xd71: 0x4000, 0xd72: 0x403b, 0xd73: 0x403c, 0xd74: 0x4000, 0xd75: 0x4000,
-	0xd76: 0x4000, 0xd77: 0x4000, 0xd78: 0x4000, 0xd79: 0x4000, 0xd7a: 0x4000, 0xd7b: 0x403d,
-	0xd7c: 0x401c, 0xd7d: 0x4000, 0xd7e: 0x4000, 0xd7f: 0x4000,
-	// Block 0x36, offset 0xd80
-	0xd85: 0x4000,
-	0xd86: 0x4000, 0xd87: 0x4000, 0xd88: 0x4000, 0xd89: 0x4000, 0xd8a: 0x4000, 0xd8b: 0x4000,
-	0xd8c: 0x4000, 0xd8d: 0x4000, 0xd8e: 0x4000, 0xd8f: 0x4000, 0xd90: 0x4000, 0xd91: 0x4000,
-	0xd92: 0x4000, 0xd93: 0x4000, 0xd94: 0x4000, 0xd95: 0x4000, 0xd96: 0x4000, 0xd97: 0x4000,
-	0xd98: 0x4000, 0xd99: 0x4000, 0xd9a: 0x4000, 0xd9b: 0x4000, 0xd9c: 0x4000, 0xd9d: 0x4000,
-	0xd9e: 0x4000, 0xd9f: 0x4000, 0xda0: 0x4000, 0xda1: 0x4000, 0xda2: 0x4000, 0xda3: 0x4000,
-	0xda4: 0x4000, 0xda5: 0x4000, 0xda6: 0x4000, 0xda7: 0x4000, 0xda8: 0x4000, 0xda9: 0x4000,
-	0xdaa: 0x4000, 0xdab: 0x4000, 0xdac: 0x4000, 0xdad: 0x4000,
-	0xdb1: 0x403e, 0xdb2: 0x403e, 0xdb3: 0x403e, 0xdb4: 0x403e, 0xdb5: 0x403e,
-	0xdb6: 0x403e, 0xdb7: 0x403e, 0xdb8: 0x403e, 0xdb9: 0x403e, 0xdba: 0x403e, 0xdbb: 0x403e,
-	0xdbc: 0x403e, 0xdbd: 0x403e, 0xdbe: 0x403e, 0xdbf: 0x403e,
-	// Block 0x37, offset 0xdc0
-	0xdc0: 0x4037, 0xdc1: 0x4037, 0xdc2: 0x4037, 0xdc3: 0x4037, 0xdc4: 0x4037, 0xdc5: 0x4037,
-	0xdc6: 0x4037, 0xdc7: 0x4037, 0xdc8: 0x4037, 0xdc9: 0x4037, 0xdca: 0x4037, 0xdcb: 0x4037,
-	0xdcc: 0x4037, 0xdcd: 0x4037, 0xdce: 0x4037, 0xdcf: 0x400e, 0xdd0: 0x403f, 0xdd1: 0x4040,
-	0xdd2: 0x4041, 0xdd3: 0x4040, 0xdd4: 0x403f, 0xdd5: 0x4042, 0xdd6: 0x4043, 0xdd7: 0x4044,
-	0xdd8: 0x4040, 0xdd9: 0x4041, 0xdda: 0x4040, 0xddb: 0x4045, 0xddc: 0x4009, 0xddd: 0x4045,
-	0xdde: 0x4046, 0xddf: 0x4045, 0xde0: 0x4047, 0xde1: 0x400b, 0xde2: 0x400a, 0xde3: 0x400c,
-	0xde4: 0x4048, 0xde5: 0x4000, 0xde6: 0x4000, 0xde7: 0x4000, 0xde8: 0x4000, 0xde9: 0x4000,
-	0xdea: 0x4000, 0xdeb: 0x4000, 0xdec: 0x4000, 0xded: 0x4000, 0xdee: 0x4000, 0xdef: 0x4000,
-	0xdf0: 0x4000, 0xdf1: 0x4000, 0xdf2: 0x4000, 0xdf3: 0x4000, 0xdf4: 0x4000, 0xdf5: 0x4000,
-	0xdf6: 0x4000, 0xdf7: 0x4000, 0xdf8: 0x4000, 0xdf9: 0x4000, 0xdfa: 0x4000, 0xdfb: 0x4000,
-	0xdfc: 0x4000, 0xdfd: 0x4000, 0xdfe: 0x4000, 0xdff: 0x4000,
-	// Block 0x38, offset 0xe00
-	0xe00: 0x4000, 0xe01: 0x4000, 0xe02: 0x4000, 0xe03: 0x4000, 0xe04: 0x4000, 0xe05: 0x4000,
-	0xe06: 0x4000, 0xe07: 0x4000, 0xe08: 0x4000, 0xe09: 0x4000, 0xe0a: 0x4000, 0xe0b: 0x4000,
-	0xe0c: 0x4000, 0xe0d: 0x4000, 0xe0e: 0x4000, 0xe10: 0x4000, 0xe11: 0x4000,
-	0xe12: 0x4000, 0xe13: 0x4000, 0xe14: 0x4000, 0xe15: 0x4000, 0xe16: 0x4000, 0xe17: 0x4000,
-	0xe18: 0x4000, 0xe19: 0x4000, 0xe1a: 0x4000, 0xe1b: 0x4000, 0xe1c: 0x4000, 0xe1d: 0x4000,
-	0xe1e: 0x4000, 0xe1f: 0x4000, 0xe20: 0x4000, 0xe21: 0x4000, 0xe22: 0x4000, 0xe23: 0x4000,
-	0xe24: 0x4000, 0xe25: 0x4000, 0xe26: 0x4000, 0xe27: 0x4000, 0xe28: 0x4000, 0xe29: 0x4000,
-	0xe2a: 0x4000, 0xe2b: 0x4000, 0xe2c: 0x4000, 0xe2d: 0x4000, 0xe2e: 0x4000, 0xe2f: 0x4000,
-	0xe30: 0x4000, 0xe31: 0x4000, 0xe32: 0x4000, 0xe33: 0x4000, 0xe34: 0x4000, 0xe35: 0x4000,
-	0xe36: 0x4000, 0xe37: 0x4000, 0xe38: 0x4000, 0xe39: 0x4000, 0xe3a: 0x4000,
-	// Block 0x39, offset 0xe40
-	0xe40: 0x4000, 0xe41: 0x4000, 0xe42: 0x4000, 0xe43: 0x4000, 0xe44: 0x4000, 0xe45: 0x4000,
-	0xe46: 0x4000, 0xe47: 0x4000, 0xe48: 0x4000, 0xe49: 0x4000, 0xe4a: 0x4000, 0xe4b: 0x4000,
-	0xe4c: 0x4000, 0xe4d: 0x4000, 0xe4e: 0x4000, 0xe4f: 0x4000, 0xe50: 0x4000, 0xe51: 0x4000,
-	0xe52: 0x4000, 0xe53: 0x4000, 0xe54: 0x4000, 0xe55: 0x4000, 0xe56: 0x4000, 0xe57: 0x4000,
-	0xe58: 0x4000, 0xe59: 0x4000, 0xe5a: 0x4000, 0xe5b: 0x4000, 0xe5c: 0x4000, 0xe5d: 0x4000,
-	0xe5e: 0x4000, 0xe5f: 0x4000, 0xe60: 0x4000, 0xe61: 0x4000, 0xe62: 0x4000, 0xe63: 0x4000,
-	0xe70: 0x4000, 0xe71: 0x4000, 0xe72: 0x4000, 0xe73: 0x4000, 0xe74: 0x4000, 0xe75: 0x4000,
-	0xe76: 0x4000, 0xe77: 0x4000, 0xe78: 0x4000, 0xe79: 0x4000, 0xe7a: 0x4000, 0xe7b: 0x4000,
-	0xe7c: 0x4000, 0xe7d: 0x4000, 0xe7e: 0x4000, 0xe7f: 0x4000,
-	// Block 0x3a, offset 0xe80
-	0xe80: 0x4000, 0xe81: 0x4000, 0xe82: 0x4000, 0xe83: 0x4000, 0xe84: 0x4000, 0xe85: 0x4000,
-	0xe86: 0x4000, 0xe87: 0x4000, 0xe88: 0x4000, 0xe89: 0x4000, 0xe8a: 0x4000, 0xe8b: 0x4000,
-	0xe8c: 0x4000, 0xe8d: 0x4000, 0xe8e: 0x4000, 0xe8f: 0x4000, 0xe90: 0x4000, 0xe91: 0x4000,
-	0xe92: 0x4000, 0xe93: 0x4000, 0xe94: 0x4000, 0xe95: 0x4000, 0xe96: 0x4000, 0xe97: 0x4000,
-	0xe98: 0x4000, 0xe99: 0x4000, 0xe9a: 0x4000, 0xe9b: 0x4000, 0xe9c: 0x4000, 0xe9d: 0x4000,
-	0xe9e: 0x4000, 0xea0: 0x4000, 0xea1: 0x4000, 0xea2: 0x4000, 0xea3: 0x4000,
-	0xea4: 0x4000, 0xea5: 0x4000, 0xea6: 0x4000, 0xea7: 0x4000, 0xea8: 0x4000, 0xea9: 0x4000,
-	0xeaa: 0x4000, 0xeab: 0x4000, 0xeac: 0x4000, 0xead: 0x4000, 0xeae: 0x4000, 0xeaf: 0x4000,
-	0xeb0: 0x4000, 0xeb1: 0x4000, 0xeb2: 0x4000, 0xeb3: 0x4000, 0xeb4: 0x4000, 0xeb5: 0x4000,
-	0xeb6: 0x4000, 0xeb7: 0x4000, 0xeb8: 0x4000, 0xeb9: 0x4000, 0xeba: 0x4000, 0xebb: 0x4000,
-	0xebc: 0x4000, 0xebd: 0x4000, 0xebe: 0x4000, 0xebf: 0x4000,
-	// Block 0x3b, offset 0xec0
-	0xec0: 0x4000, 0xec1: 0x4000, 0xec2: 0x4000, 0xec3: 0x4000, 0xec4: 0x4000, 0xec5: 0x4000,
-	0xec6: 0x4000, 0xec7: 0x4000, 0xec8: 0x2000, 0xec9: 0x2000, 0xeca: 0x2000, 0xecb: 0x2000,
-	0xecc: 0x2000, 0xecd: 0x2000, 0xece: 0x2000, 0xecf: 0x2000, 0xed0: 0x4000, 0xed1: 0x4000,
-	0xed2: 0x4000, 0xed3: 0x4000, 0xed4: 0x4000, 0xed5: 0x4000, 0xed6: 0x4000, 0xed7: 0x4000,
-	0xed8: 0x4000, 0xed9: 0x4000, 0xeda: 0x4000, 0xedb: 0x4000, 0xedc: 0x4000, 0xedd: 0x4000,
-	0xede: 0x4000, 0xedf: 0x4000, 0xee0: 0x4000, 0xee1: 0x4000, 0xee2: 0x4000, 0xee3: 0x4000,
-	0xee4: 0x4000, 0xee5: 0x4000, 0xee6: 0x4000, 0xee7: 0x4000, 0xee8: 0x4000, 0xee9: 0x4000,
-	0xeea: 0x4000, 0xeeb: 0x4000, 0xeec: 0x4000, 0xeed: 0x4000, 0xeee: 0x4000, 0xeef: 0x4000,
-	0xef0: 0x4000, 0xef1: 0x4000, 0xef2: 0x4000, 0xef3: 0x4000, 0xef4: 0x4000, 0xef5: 0x4000,
-	0xef6: 0x4000, 0xef7: 0x4000, 0xef8: 0x4000, 0xef9: 0x4000, 0xefa: 0x4000, 0xefb: 0x4000,
-	0xefc: 0x4000, 0xefd: 0x4000, 0xefe: 0x4000, 0xeff: 0x4000,
-	// Block 0x3c, offset 0xf00
-	0xf00: 0x4000, 0xf01: 0x4000, 0xf02: 0x4000, 0xf03: 0x4000, 0xf04: 0x4000, 0xf05: 0x4000,
-	0xf06: 0x4000, 0xf07: 0x4000, 0xf08: 0x4000, 0xf09: 0x4000, 0xf0a: 0x4000, 0xf0b: 0x4000,
-	0xf0c: 0x4000, 0xf0d: 0x4000, 0xf0e: 0x4000, 0xf0f: 0x4000, 0xf10: 0x4000, 0xf11: 0x4000,
-	0xf12: 0x4000, 0xf13: 0x4000, 0xf14: 0x4000, 0xf15: 0x4000, 0xf16: 0x4000, 0xf17: 0x4000,
-	0xf18: 0x4000, 0xf19: 0x4000, 0xf1a: 0x4000, 0xf1b: 0x4000, 0xf1c: 0x4000, 0xf1d: 0x4000,
-	0xf1e: 0x4000, 0xf1f: 0x4000, 0xf20: 0x4000, 0xf21: 0x4000, 0xf22: 0x4000, 0xf23: 0x4000,
-	0xf24: 0x4000, 0xf25: 0x4000, 0xf26: 0x4000, 0xf27: 0x4000, 0xf28: 0x4000, 0xf29: 0x4000,
-	0xf2a: 0x4000, 0xf2b: 0x4000, 0xf2c: 0x4000, 0xf2d: 0x4000, 0xf2e: 0x4000, 0xf2f: 0x4000,
-	0xf30: 0x4000, 0xf31: 0x4000, 0xf32: 0x4000, 0xf33: 0x4000, 0xf34: 0x4000, 0xf35: 0x4000,
-	0xf36: 0x4000, 0xf37: 0x4000, 0xf38: 0x4000, 0xf39: 0x4000, 0xf3a: 0x4000, 0xf3b: 0x4000,
-	0xf3c: 0x4000, 0xf3d: 0x4000, 0xf3e: 0x4000,
-	// Block 0x3d, offset 0xf40
-	0xf40: 0x4000, 0xf41: 0x4000, 0xf42: 0x4000, 0xf43: 0x4000, 0xf44: 0x4000, 0xf45: 0x4000,
-	0xf46: 0x4000, 0xf47: 0x4000, 0xf48: 0x4000, 0xf49: 0x4000, 0xf4a: 0x4000, 0xf4b: 0x4000,
-	0xf4c: 0x4000, 0xf50: 0x4000, 0xf51: 0x4000,
-	0xf52: 0x4000, 0xf53: 0x4000, 0xf54: 0x4000, 0xf55: 0x4000, 0xf56: 0x4000, 0xf57: 0x4000,
-	0xf58: 0x4000, 0xf59: 0x4000, 0xf5a: 0x4000, 0xf5b: 0x4000, 0xf5c: 0x4000, 0xf5d: 0x4000,
-	0xf5e: 0x4000, 0xf5f: 0x4000, 0xf60: 0x4000, 0xf61: 0x4000, 0xf62: 0x4000, 0xf63: 0x4000,
-	0xf64: 0x4000, 0xf65: 0x4000, 0xf66: 0x4000, 0xf67: 0x4000, 0xf68: 0x4000, 0xf69: 0x4000,
-	0xf6a: 0x4000, 0xf6b: 0x4000, 0xf6c: 0x4000, 0xf6d: 0x4000, 0xf6e: 0x4000, 0xf6f: 0x4000,
-	0xf70: 0x4000, 0xf71: 0x4000, 0xf72: 0x4000, 0xf73: 0x4000, 0xf74: 0x4000, 0xf75: 0x4000,
-	0xf76: 0x4000, 0xf77: 0x4000, 0xf78: 0x4000, 0xf79: 0x4000, 0xf7a: 0x4000, 0xf7b: 0x4000,
-	0xf7c: 0x4000, 0xf7d: 0x4000, 0xf7e: 0x4000, 0xf7f: 0x4000,
-	// Block 0x3e, offset 0xf80
-	0xf80: 0x4000, 0xf81: 0x4000, 0xf82: 0x4000, 0xf83: 0x4000, 0xf84: 0x4000, 0xf85: 0x4000,
-	0xf86: 0x4000,
-	// Block 0x3f, offset 0xfc0
-	0xfe0: 0x4000, 0xfe1: 0x4000, 0xfe2: 0x4000, 0xfe3: 0x4000,
-	0xfe4: 0x4000, 0xfe5: 0x4000, 0xfe6: 0x4000, 0xfe7: 0x4000, 0xfe8: 0x4000, 0xfe9: 0x4000,
-	0xfea: 0x4000, 0xfeb: 0x4000, 0xfec: 0x4000, 0xfed: 0x4000, 0xfee: 0x4000, 0xfef: 0x4000,
-	0xff0: 0x4000, 0xff1: 0x4000, 0xff2: 0x4000, 0xff3: 0x4000, 0xff4: 0x4000, 0xff5: 0x4000,
-	0xff6: 0x4000, 0xff7: 0x4000, 0xff8: 0x4000, 0xff9: 0x4000, 0xffa: 0x4000, 0xffb: 0x4000,
-	0xffc: 0x4000,
-	// Block 0x40, offset 0x1000
-	0x1000: 0x4000, 0x1001: 0x4000, 0x1002: 0x4000, 0x1003: 0x4000, 0x1004: 0x4000, 0x1005: 0x4000,
-	0x1006: 0x4000, 0x1007: 0x4000, 0x1008: 0x4000, 0x1009: 0x4000, 0x100a: 0x4000, 0x100b: 0x4000,
-	0x100c: 0x4000, 0x100d: 0x4000, 0x100e: 0x4000, 0x100f: 0x4000, 0x1010: 0x4000, 0x1011: 0x4000,
-	0x1012: 0x4000, 0x1013: 0x4000, 0x1014: 0x4000, 0x1015: 0x4000, 0x1016: 0x4000, 0x1017: 0x4000,
-	0x1018: 0x4000, 0x1019: 0x4000, 0x101a: 0x4000, 0x101b: 0x4000, 0x101c: 0x4000, 0x101d: 0x4000,
-	0x101e: 0x4000, 0x101f: 0x4000, 0x1020: 0x4000, 0x1021: 0x4000, 0x1022: 0x4000, 0x1023: 0x4000,
-	// Block 0x41, offset 0x1040
-	0x1040: 0x2000, 0x1041: 0x2000, 0x1042: 0x2000, 0x1043: 0x2000, 0x1044: 0x2000, 0x1045: 0x2000,
-	0x1046: 0x2000, 0x1047: 0x2000, 0x1048: 0x2000, 0x1049: 0x2000, 0x104a: 0x2000, 0x104b: 0x2000,
-	0x104c: 0x2000, 0x104d: 0x2000, 0x104e: 0x2000, 0x104f: 0x2000, 0x1050: 0x4000, 0x1051: 0x4000,
-	0x1052: 0x4000, 0x1053: 0x4000, 0x1054: 0x4000, 0x1055: 0x4000, 0x1056: 0x4000, 0x1057: 0x4000,
-	0x1058: 0x4000, 0x1059: 0x4000,
-	0x1070: 0x4000, 0x1071: 0x4000, 0x1072: 0x4000, 0x1073: 0x4000, 0x1074: 0x4000, 0x1075: 0x4000,
-	0x1076: 0x4000, 0x1077: 0x4000, 0x1078: 0x4000, 0x1079: 0x4000, 0x107a: 0x4000, 0x107b: 0x4000,
-	0x107c: 0x4000, 0x107d: 0x4000, 0x107e: 0x4000, 0x107f: 0x4000,
-	// Block 0x42, offset 0x1080
-	0x1080: 0x4000, 0x1081: 0x4000, 0x1082: 0x4000, 0x1083: 0x4000, 0x1084: 0x4000, 0x1085: 0x4000,
-	0x1086: 0x4000, 0x1087: 0x4000, 0x1088: 0x4000, 0x1089: 0x4000, 0x108a: 0x4000, 0x108b: 0x4000,
-	0x108c: 0x4000, 0x108d: 0x4000, 0x108e: 0x4000, 0x108f: 0x4000, 0x1090: 0x4000, 0x1091: 0x4000,
-	0x1092: 0x4000, 0x1094: 0x4000, 0x1095: 0x4000, 0x1096: 0x4000, 0x1097: 0x4000,
-	0x1098: 0x4000, 0x1099: 0x4000, 0x109a: 0x4000, 0x109b: 0x4000, 0x109c: 0x4000, 0x109d: 0x4000,
-	0x109e: 0x4000, 0x109f: 0x4000, 0x10a0: 0x4000, 0x10a1: 0x4000, 0x10a2: 0x4000, 0x10a3: 0x4000,
-	0x10a4: 0x4000, 0x10a5: 0x4000, 0x10a6: 0x4000, 0x10a8: 0x4000, 0x10a9: 0x4000,
-	0x10aa: 0x4000, 0x10ab: 0x4000,
-	// Block 0x43, offset 0x10c0
-	0x10c1: 0x9012, 0x10c2: 0x9012, 0x10c3: 0x9012, 0x10c4: 0x9012, 0x10c5: 0x9012,
-	0x10c6: 0x9012, 0x10c7: 0x9012, 0x10c8: 0x9012, 0x10c9: 0x9012, 0x10ca: 0x9012, 0x10cb: 0x9012,
-	0x10cc: 0x9012, 0x10cd: 0x9012, 0x10ce: 0x9012, 0x10cf: 0x9012, 0x10d0: 0x9012, 0x10d1: 0x9012,
-	0x10d2: 0x9012, 0x10d3: 0x9012, 0x10d4: 0x9012, 0x10d5: 0x9012, 0x10d6: 0x9012, 0x10d7: 0x9012,
-	0x10d8: 0x9012, 0x10d9: 0x9012, 0x10da: 0x9012, 0x10db: 0x9012, 0x10dc: 0x9012, 0x10dd: 0x9012,
-	0x10de: 0x9012, 0x10df: 0x9012, 0x10e0: 0x9049, 0x10e1: 0x9049, 0x10e2: 0x9049, 0x10e3: 0x9049,
-	0x10e4: 0x9049, 0x10e5: 0x9049, 0x10e6: 0x9049, 0x10e7: 0x9049, 0x10e8: 0x9049, 0x10e9: 0x9049,
-	0x10ea: 0x9049, 0x10eb: 0x9049, 0x10ec: 0x9049, 0x10ed: 0x9049, 0x10ee: 0x9049, 0x10ef: 0x9049,
-	0x10f0: 0x9049, 0x10f1: 0x9049, 0x10f2: 0x9049, 0x10f3: 0x9049, 0x10f4: 0x9049, 0x10f5: 0x9049,
-	0x10f6: 0x9049, 0x10f7: 0x9049, 0x10f8: 0x9049, 0x10f9: 0x9049, 0x10fa: 0x9049, 0x10fb: 0x9049,
-	0x10fc: 0x9049, 0x10fd: 0x9049, 0x10fe: 0x9049, 0x10ff: 0x9049,
-	// Block 0x44, offset 0x1100
-	0x1100: 0x9049, 0x1101: 0x9049, 0x1102: 0x9049, 0x1103: 0x9049, 0x1104: 0x9049, 0x1105: 0x9049,
-	0x1106: 0x9049, 0x1107: 0x9049, 0x1108: 0x9049, 0x1109: 0x9049, 0x110a: 0x9049, 0x110b: 0x9049,
-	0x110c: 0x9049, 0x110d: 0x9049, 0x110e: 0x9049, 0x110f: 0x9049, 0x1110: 0x9049, 0x1111: 0x9049,
-	0x1112: 0x9049, 0x1113: 0x9049, 0x1114: 0x9049, 0x1115: 0x9049, 0x1116: 0x9049, 0x1117: 0x9049,
-	0x1118: 0x9049, 0x1119: 0x9049, 0x111a: 0x9049, 0x111b: 0x9049, 0x111c: 0x9049, 0x111d: 0x9049,
-	0x111e: 0x9049, 0x111f: 0x904a, 0x1120: 0x904b, 0x1121: 0xb04c, 0x1122: 0xb04d, 0x1123: 0xb04d,
-	0x1124: 0xb04e, 0x1125: 0xb04f, 0x1126: 0xb050, 0x1127: 0xb051, 0x1128: 0xb052, 0x1129: 0xb053,
-	0x112a: 0xb054, 0x112b: 0xb055, 0x112c: 0xb056, 0x112d: 0xb057, 0x112e: 0xb058, 0x112f: 0xb059,
-	0x1130: 0xb05a, 0x1131: 0xb05b, 0x1132: 0xb05c, 0x1133: 0xb05d, 0x1134: 0xb05e, 0x1135: 0xb05f,
-	0x1136: 0xb060, 0x1137: 0xb061, 0x1138: 0xb062, 0x1139: 0xb063, 0x113a: 0xb064, 0x113b: 0xb065,
-	0x113c: 0xb052, 0x113d: 0xb066, 0x113e: 0xb067, 0x113f: 0xb055,
-	// Block 0x45, offset 0x1140
-	0x1140: 0xb068, 0x1141: 0xb069, 0x1142: 0xb06a, 0x1143: 0xb06b, 0x1144: 0xb05a, 0x1145: 0xb056,
-	0x1146: 0xb06c, 0x1147: 0xb06d, 0x1148: 0xb06b, 0x1149: 0xb06e, 0x114a: 0xb06b, 0x114b: 0xb06f,
-	0x114c: 0xb06f, 0x114d: 0xb070, 0x114e: 0xb070, 0x114f: 0xb071, 0x1150: 0xb056, 0x1151: 0xb072,
-	0x1152: 0xb073, 0x1153: 0xb072, 0x1154: 0xb074, 0x1155: 0xb073, 0x1156: 0xb075, 0x1157: 0xb075,
-	0x1158: 0xb076, 0x1159: 0xb076, 0x115a: 0xb077, 0x115b: 0xb077, 0x115c: 0xb073, 0x115d: 0xb078,
-	0x115e: 0xb079, 0x115f: 0xb067, 0x1160: 0xb07a, 0x1161: 0xb07b, 0x1162: 0xb07b, 0x1163: 0xb07b,
-	0x1164: 0xb07b, 0x1165: 0xb07b, 0x1166: 0xb07b, 0x1167: 0xb07b, 0x1168: 0xb07b, 0x1169: 0xb07b,
-	0x116a: 0xb07b, 0x116b: 0xb07b, 0x116c: 0xb07b, 0x116d: 0xb07b, 0x116e: 0xb07b, 0x116f: 0xb07b,
-	0x1170: 0xb07c, 0x1171: 0xb07c, 0x1172: 0xb07c, 0x1173: 0xb07c, 0x1174: 0xb07c, 0x1175: 0xb07c,
-	0x1176: 0xb07c, 0x1177: 0xb07c, 0x1178: 0xb07c, 0x1179: 0xb07c, 0x117a: 0xb07c, 0x117b: 0xb07c,
-	0x117c: 0xb07c, 0x117d: 0xb07c, 0x117e: 0xb07c,
-	// Block 0x46, offset 0x1180
-	0x1182: 0xb07d, 0x1183: 0xb07e, 0x1184: 0xb07f, 0x1185: 0xb080,
-	0x1186: 0xb07f, 0x1187: 0xb07e, 0x118a: 0xb081, 0x118b: 0xb082,
-	0x118c: 0xb083, 0x118d: 0xb07f, 0x118e: 0xb080, 0x118f: 0xb07f,
-	0x1192: 0xb084, 0x1193: 0xb085, 0x1194: 0xb084, 0x1195: 0xb086, 0x1196: 0xb084, 0x1197: 0xb087,
-	0x119a: 0xb088, 0x119b: 0xb089, 0x119c: 0xb08a,
-	0x11a0: 0x908b, 0x11a1: 0x908b, 0x11a2: 0x908c, 0x11a3: 0x908d,
-	0x11a4: 0x908b, 0x11a5: 0x908e, 0x11a6: 0x908f, 0x11a8: 0xb090, 0x11a9: 0xb091,
-	0x11aa: 0xb092, 0x11ab: 0xb091, 0x11ac: 0xb093, 0x11ad: 0xb094, 0x11ae: 0xb095,
-	0x11bd: 0x2000,
-	// Block 0x47, offset 0x11c0
-	0x11e0: 0x4000,
-	// Block 0x48, offset 0x1200
-	0x1200: 0x4000, 0x1201: 0x4000, 0x1202: 0x4000, 0x1203: 0x4000, 0x1204: 0x4000, 0x1205: 0x4000,
-	0x1206: 0x4000, 0x1207: 0x4000, 0x1208: 0x4000, 0x1209: 0x4000, 0x120a: 0x4000, 0x120b: 0x4000,
-	0x120c: 0x4000, 0x120d: 0x4000, 0x120e: 0x4000, 0x120f: 0x4000, 0x1210: 0x4000, 0x1211: 0x4000,
-	0x1212: 0x4000, 0x1213: 0x4000, 0x1214: 0x4000, 0x1215: 0x4000, 0x1216: 0x4000, 0x1217: 0x4000,
-	0x1218: 0x4000, 0x1219: 0x4000, 0x121a: 0x4000, 0x121b: 0x4000, 0x121c: 0x4000, 0x121d: 0x4000,
-	0x121e: 0x4000, 0x121f: 0x4000, 0x1220: 0x4000, 0x1221: 0x4000, 0x1222: 0x4000, 0x1223: 0x4000,
-	0x1224: 0x4000, 0x1225: 0x4000, 0x1226: 0x4000, 0x1227: 0x4000, 0x1228: 0x4000, 0x1229: 0x4000,
-	0x122a: 0x4000, 0x122b: 0x4000, 0x122c: 0x4000,
-	// Block 0x49, offset 0x1240
-	0x1240: 0x4000, 0x1241: 0x4000, 0x1242: 0x4000, 0x1243: 0x4000, 0x1244: 0x4000, 0x1245: 0x4000,
-	0x1246: 0x4000, 0x1247: 0x4000, 0x1248: 0x4000, 0x1249: 0x4000, 0x124a: 0x4000, 0x124b: 0x4000,
-	0x124c: 0x4000, 0x124d: 0x4000, 0x124e: 0x4000, 0x124f: 0x4000, 0x1250: 0x4000, 0x1251: 0x4000,
-	0x1252: 0x4000, 0x1253: 0x4000, 0x1254: 0x4000, 0x1255: 0x4000, 0x1256: 0x4000, 0x1257: 0x4000,
-	0x1258: 0x4000, 0x1259: 0x4000, 0x125a: 0x4000, 0x125b: 0x4000, 0x125c: 0x4000, 0x125d: 0x4000,
-	0x125e: 0x4000, 0x125f: 0x4000, 0x1260: 0x4000, 0x1261: 0x4000, 0x1262: 0x4000, 0x1263: 0x4000,
-	0x1264: 0x4000, 0x1265: 0x4000, 0x1266: 0x4000, 0x1267: 0x4000, 0x1268: 0x4000, 0x1269: 0x4000,
-	0x126a: 0x4000, 0x126b: 0x4000, 0x126c: 0x4000, 0x126d: 0x4000, 0x126e: 0x4000, 0x126f: 0x4000,
-	0x1270: 0x4000, 0x1271: 0x4000, 0x1272: 0x4000,
-	// Block 0x4a, offset 0x1280
-	0x1280: 0x4000, 0x1281: 0x4000,
-	// Block 0x4b, offset 0x12c0
-	0x12c4: 0x4000,
-	// Block 0x4c, offset 0x1300
-	0x130f: 0x4000,
-	// Block 0x4d, offset 0x1340
-	0x1340: 0x2000, 0x1341: 0x2000, 0x1342: 0x2000, 0x1343: 0x2000, 0x1344: 0x2000, 0x1345: 0x2000,
-	0x1346: 0x2000, 0x1347: 0x2000, 0x1348: 0x2000, 0x1349: 0x2000, 0x134a: 0x2000,
-	0x1350: 0x2000, 0x1351: 0x2000,
-	0x1352: 0x2000, 0x1353: 0x2000, 0x1354: 0x2000, 0x1355: 0x2000, 0x1356: 0x2000, 0x1357: 0x2000,
-	0x1358: 0x2000, 0x1359: 0x2000, 0x135a: 0x2000, 0x135b: 0x2000, 0x135c: 0x2000, 0x135d: 0x2000,
-	0x135e: 0x2000, 0x135f: 0x2000, 0x1360: 0x2000, 0x1361: 0x2000, 0x1362: 0x2000, 0x1363: 0x2000,
-	0x1364: 0x2000, 0x1365: 0x2000, 0x1366: 0x2000, 0x1367: 0x2000, 0x1368: 0x2000, 0x1369: 0x2000,
-	0x136a: 0x2000, 0x136b: 0x2000, 0x136c: 0x2000, 0x136d: 0x2000,
-	0x1370: 0x2000, 0x1371: 0x2000, 0x1372: 0x2000, 0x1373: 0x2000, 0x1374: 0x2000, 0x1375: 0x2000,
-	0x1376: 0x2000, 0x1377: 0x2000, 0x1378: 0x2000, 0x1379: 0x2000, 0x137a: 0x2000, 0x137b: 0x2000,
-	0x137c: 0x2000, 0x137d: 0x2000, 0x137e: 0x2000, 0x137f: 0x2000,
-	// Block 0x4e, offset 0x1380
-	0x1380: 0x2000, 0x1381: 0x2000, 0x1382: 0x2000, 0x1383: 0x2000, 0x1384: 0x2000, 0x1385: 0x2000,
-	0x1386: 0x2000, 0x1387: 0x2000, 0x1388: 0x2000, 0x1389: 0x2000, 0x138a: 0x2000, 0x138b: 0x2000,
-	0x138c: 0x2000, 0x138d: 0x2000, 0x138e: 0x2000, 0x138f: 0x2000, 0x1390: 0x2000, 0x1391: 0x2000,
-	0x1392: 0x2000, 0x1393: 0x2000, 0x1394: 0x2000, 0x1395: 0x2000, 0x1396: 0x2000, 0x1397: 0x2000,
-	0x1398: 0x2000, 0x1399: 0x2000, 0x139a: 0x2000, 0x139b: 0x2000, 0x139c: 0x2000, 0x139d: 0x2000,
-	0x139e: 0x2000, 0x139f: 0x2000, 0x13a0: 0x2000, 0x13a1: 0x2000, 0x13a2: 0x2000, 0x13a3: 0x2000,
-	0x13a4: 0x2000, 0x13a5: 0x2000, 0x13a6: 0x2000, 0x13a7: 0x2000, 0x13a8: 0x2000, 0x13a9: 0x2000,
-	0x13b0: 0x2000, 0x13b1: 0x2000, 0x13b2: 0x2000, 0x13b3: 0x2000, 0x13b4: 0x2000, 0x13b5: 0x2000,
-	0x13b6: 0x2000, 0x13b7: 0x2000, 0x13b8: 0x2000, 0x13b9: 0x2000, 0x13ba: 0x2000, 0x13bb: 0x2000,
-	0x13bc: 0x2000, 0x13bd: 0x2000, 0x13be: 0x2000, 0x13bf: 0x2000,
-	// Block 0x4f, offset 0x13c0
-	0x13c0: 0x2000, 0x13c1: 0x2000, 0x13c2: 0x2000, 0x13c3: 0x2000, 0x13c4: 0x2000, 0x13c5: 0x2000,
-	0x13c6: 0x2000, 0x13c7: 0x2000, 0x13c8: 0x2000, 0x13c9: 0x2000, 0x13ca: 0x2000, 0x13cb: 0x2000,
-	0x13cc: 0x2000, 0x13cd: 0x2000, 0x13ce: 0x4000, 0x13cf: 0x2000, 0x13d0: 0x2000, 0x13d1: 0x4000,
-	0x13d2: 0x4000, 0x13d3: 0x4000, 0x13d4: 0x4000, 0x13d5: 0x4000, 0x13d6: 0x4000, 0x13d7: 0x4000,
-	0x13d8: 0x4000, 0x13d9: 0x4000, 0x13da: 0x4000, 0x13db: 0x2000, 0x13dc: 0x2000, 0x13dd: 0x2000,
-	0x13de: 0x2000, 0x13df: 0x2000, 0x13e0: 0x2000, 0x13e1: 0x2000, 0x13e2: 0x2000, 0x13e3: 0x2000,
-	0x13e4: 0x2000, 0x13e5: 0x2000, 0x13e6: 0x2000, 0x13e7: 0x2000, 0x13e8: 0x2000, 0x13e9: 0x2000,
-	0x13ea: 0x2000, 0x13eb: 0x2000, 0x13ec: 0x2000,
-	// Block 0x50, offset 0x1400
-	0x1400: 0x4000, 0x1401: 0x4000, 0x1402: 0x4000,
-	0x1410: 0x4000, 0x1411: 0x4000,
-	0x1412: 0x4000, 0x1413: 0x4000, 0x1414: 0x4000, 0x1415: 0x4000, 0x1416: 0x4000, 0x1417: 0x4000,
-	0x1418: 0x4000, 0x1419: 0x4000, 0x141a: 0x4000, 0x141b: 0x4000, 0x141c: 0x4000, 0x141d: 0x4000,
-	0x141e: 0x4000, 0x141f: 0x4000, 0x1420: 0x4000, 0x1421: 0x4000, 0x1422: 0x4000, 0x1423: 0x4000,
-	0x1424: 0x4000, 0x1425: 0x4000, 0x1426: 0x4000, 0x1427: 0x4000, 0x1428: 0x4000, 0x1429: 0x4000,
-	0x142a: 0x4000, 0x142b: 0x4000, 0x142c: 0x4000, 0x142d: 0x4000, 0x142e: 0x4000, 0x142f: 0x4000,
-	0x1430: 0x4000, 0x1431: 0x4000, 0x1432: 0x4000, 0x1433: 0x4000, 0x1434: 0x4000, 0x1435: 0x4000,
-	0x1436: 0x4000, 0x1437: 0x4000, 0x1438: 0x4000, 0x1439: 0x4000, 0x143a: 0x4000, 0x143b: 0x4000,
-	// Block 0x51, offset 0x1440
-	0x1440: 0x4000, 0x1441: 0x4000, 0x1442: 0x4000, 0x1443: 0x4000, 0x1444: 0x4000, 0x1445: 0x4000,
-	0x1446: 0x4000, 0x1447: 0x4000, 0x1448: 0x4000,
-	0x1450: 0x4000, 0x1451: 0x4000,
-	// Block 0x52, offset 0x1480
-	0x1480: 0x4000, 0x1481: 0x4000, 0x1482: 0x4000, 0x1483: 0x4000, 0x1484: 0x4000, 0x1485: 0x4000,
-	0x1486: 0x4000, 0x1487: 0x4000, 0x1488: 0x4000, 0x1489: 0x4000, 0x148a: 0x4000, 0x148b: 0x4000,
-	0x148c: 0x4000, 0x148d: 0x4000, 0x148e: 0x4000, 0x148f: 0x4000, 0x1490: 0x4000, 0x1491: 0x4000,
-	0x1492: 0x4000, 0x1493: 0x4000, 0x1494: 0x4000, 0x1495: 0x4000, 0x1496: 0x4000, 0x1497: 0x4000,
-	0x1498: 0x4000, 0x1499: 0x4000, 0x149a: 0x4000, 0x149b: 0x4000, 0x149c: 0x4000, 0x149d: 0x4000,
-	0x149e: 0x4000, 0x149f: 0x4000, 0x14a0: 0x4000,
-	0x14ad: 0x4000, 0x14ae: 0x4000, 0x14af: 0x4000,
-	0x14b0: 0x4000, 0x14b1: 0x4000, 0x14b2: 0x4000, 0x14b3: 0x4000, 0x14b4: 0x4000, 0x14b5: 0x4000,
-	0x14b7: 0x4000, 0x14b8: 0x4000, 0x14b9: 0x4000, 0x14ba: 0x4000, 0x14bb: 0x4000,
-	0x14bc: 0x4000, 0x14bd: 0x4000, 0x14be: 0x4000, 0x14bf: 0x4000,
-	// Block 0x53, offset 0x14c0
-	0x14c0: 0x4000, 0x14c1: 0x4000, 0x14c2: 0x4000, 0x14c3: 0x4000, 0x14c4: 0x4000, 0x14c5: 0x4000,
-	0x14c6: 0x4000, 0x14c7: 0x4000, 0x14c8: 0x4000, 0x14c9: 0x4000, 0x14ca: 0x4000, 0x14cb: 0x4000,
-	0x14cc: 0x4000, 0x14cd: 0x4000, 0x14ce: 0x4000, 0x14cf: 0x4000, 0x14d0: 0x4000, 0x14d1: 0x4000,
-	0x14d2: 0x4000, 0x14d3: 0x4000, 0x14d4: 0x4000, 0x14d5: 0x4000, 0x14d6: 0x4000, 0x14d7: 0x4000,
-	0x14d8: 0x4000, 0x14d9: 0x4000, 0x14da: 0x4000, 0x14db: 0x4000, 0x14dc: 0x4000, 0x14dd: 0x4000,
-	0x14de: 0x4000, 0x14df: 0x4000, 0x14e0: 0x4000, 0x14e1: 0x4000, 0x14e2: 0x4000, 0x14e3: 0x4000,
-	0x14e4: 0x4000, 0x14e5: 0x4000, 0x14e6: 0x4000, 0x14e7: 0x4000, 0x14e8: 0x4000, 0x14e9: 0x4000,
-	0x14ea: 0x4000, 0x14eb: 0x4000, 0x14ec: 0x4000, 0x14ed: 0x4000, 0x14ee: 0x4000, 0x14ef: 0x4000,
-	0x14f0: 0x4000, 0x14f1: 0x4000, 0x14f2: 0x4000, 0x14f3: 0x4000, 0x14f4: 0x4000, 0x14f5: 0x4000,
-	0x14f6: 0x4000, 0x14f7: 0x4000, 0x14f8: 0x4000, 0x14f9: 0x4000, 0x14fa: 0x4000, 0x14fb: 0x4000,
-	0x14fc: 0x4000, 0x14fe: 0x4000, 0x14ff: 0x4000,
-	// Block 0x54, offset 0x1500
-	0x1500: 0x4000, 0x1501: 0x4000, 0x1502: 0x4000, 0x1503: 0x4000, 0x1504: 0x4000, 0x1505: 0x4000,
-	0x1506: 0x4000, 0x1507: 0x4000, 0x1508: 0x4000, 0x1509: 0x4000, 0x150a: 0x4000, 0x150b: 0x4000,
-	0x150c: 0x4000, 0x150d: 0x4000, 0x150e: 0x4000, 0x150f: 0x4000, 0x1510: 0x4000, 0x1511: 0x4000,
-	0x1512: 0x4000, 0x1513: 0x4000,
-	0x1520: 0x4000, 0x1521: 0x4000, 0x1522: 0x4000, 0x1523: 0x4000,
-	0x1524: 0x4000, 0x1525: 0x4000, 0x1526: 0x4000, 0x1527: 0x4000, 0x1528: 0x4000, 0x1529: 0x4000,
-	0x152a: 0x4000, 0x152b: 0x4000, 0x152c: 0x4000, 0x152d: 0x4000, 0x152e: 0x4000, 0x152f: 0x4000,
-	0x1530: 0x4000, 0x1531: 0x4000, 0x1532: 0x4000, 0x1533: 0x4000, 0x1534: 0x4000, 0x1535: 0x4000,
-	0x1536: 0x4000, 0x1537: 0x4000, 0x1538: 0x4000, 0x1539: 0x4000, 0x153a: 0x4000, 0x153b: 0x4000,
-	0x153c: 0x4000, 0x153d: 0x4000, 0x153e: 0x4000, 0x153f: 0x4000,
-	// Block 0x55, offset 0x1540
-	0x1540: 0x4000, 0x1541: 0x4000, 0x1542: 0x4000, 0x1543: 0x4000, 0x1544: 0x4000, 0x1545: 0x4000,
-	0x1546: 0x4000, 0x1547: 0x4000, 0x1548: 0x4000, 0x1549: 0x4000, 0x154a: 0x4000,
-	0x154f: 0x4000, 0x1550: 0x4000, 0x1551: 0x4000,
-	0x1552: 0x4000, 0x1553: 0x4000,
-	0x1560: 0x4000, 0x1561: 0x4000, 0x1562: 0x4000, 0x1563: 0x4000,
-	0x1564: 0x4000, 0x1565: 0x4000, 0x1566: 0x4000, 0x1567: 0x4000, 0x1568: 0x4000, 0x1569: 0x4000,
-	0x156a: 0x4000, 0x156b: 0x4000, 0x156c: 0x4000, 0x156d: 0x4000, 0x156e: 0x4000, 0x156f: 0x4000,
-	0x1570: 0x4000, 0x1574: 0x4000,
-	0x1578: 0x4000, 0x1579: 0x4000, 0x157a: 0x4000, 0x157b: 0x4000,
-	0x157c: 0x4000, 0x157d: 0x4000, 0x157e: 0x4000, 0x157f: 0x4000,
-	// Block 0x56, offset 0x1580
-	0x1580: 0x4000, 0x1582: 0x4000, 0x1583: 0x4000, 0x1584: 0x4000, 0x1585: 0x4000,
-	0x1586: 0x4000, 0x1587: 0x4000, 0x1588: 0x4000, 0x1589: 0x4000, 0x158a: 0x4000, 0x158b: 0x4000,
-	0x158c: 0x4000, 0x158d: 0x4000, 0x158e: 0x4000, 0x158f: 0x4000, 0x1590: 0x4000, 0x1591: 0x4000,
-	0x1592: 0x4000, 0x1593: 0x4000, 0x1594: 0x4000, 0x1595: 0x4000, 0x1596: 0x4000, 0x1597: 0x4000,
-	0x1598: 0x4000, 0x1599: 0x4000, 0x159a: 0x4000, 0x159b: 0x4000, 0x159c: 0x4000, 0x159d: 0x4000,
-	0x159e: 0x4000, 0x159f: 0x4000, 0x15a0: 0x4000, 0x15a1: 0x4000, 0x15a2: 0x4000, 0x15a3: 0x4000,
-	0x15a4: 0x4000, 0x15a5: 0x4000, 0x15a6: 0x4000, 0x15a7: 0x4000, 0x15a8: 0x4000, 0x15a9: 0x4000,
-	0x15aa: 0x4000, 0x15ab: 0x4000, 0x15ac: 0x4000, 0x15ad: 0x4000, 0x15ae: 0x4000, 0x15af: 0x4000,
-	0x15b0: 0x4000, 0x15b1: 0x4000, 0x15b2: 0x4000, 0x15b3: 0x4000, 0x15b4: 0x4000, 0x15b5: 0x4000,
-	0x15b6: 0x4000, 0x15b7: 0x4000, 0x15b8: 0x4000, 0x15b9: 0x4000, 0x15ba: 0x4000, 0x15bb: 0x4000,
-	0x15bc: 0x4000, 0x15bd: 0x4000, 0x15be: 0x4000, 0x15bf: 0x4000,
-	// Block 0x57, offset 0x15c0
-	0x15c0: 0x4000, 0x15c1: 0x4000, 0x15c2: 0x4000, 0x15c3: 0x4000, 0x15c4: 0x4000, 0x15c5: 0x4000,
-	0x15c6: 0x4000, 0x15c7: 0x4000, 0x15c8: 0x4000, 0x15c9: 0x4000, 0x15ca: 0x4000, 0x15cb: 0x4000,
-	0x15cc: 0x4000, 0x15cd: 0x4000, 0x15ce: 0x4000, 0x15cf: 0x4000, 0x15d0: 0x4000, 0x15d1: 0x4000,
-	0x15d2: 0x4000, 0x15d3: 0x4000, 0x15d4: 0x4000, 0x15d5: 0x4000, 0x15d6: 0x4000, 0x15d7: 0x4000,
-	0x15d8: 0x4000, 0x15d9: 0x4000, 0x15da: 0x4000, 0x15db: 0x4000, 0x15dc: 0x4000, 0x15dd: 0x4000,
-	0x15de: 0x4000, 0x15df: 0x4000, 0x15e0: 0x4000, 0x15e1: 0x4000, 0x15e2: 0x4000, 0x15e3: 0x4000,
-	0x15e4: 0x4000, 0x15e5: 0x4000, 0x15e6: 0x4000, 0x15e7: 0x4000, 0x15e8: 0x4000, 0x15e9: 0x4000,
-	0x15ea: 0x4000, 0x15eb: 0x4000, 0x15ec: 0x4000, 0x15ed: 0x4000, 0x15ee: 0x4000, 0x15ef: 0x4000,
-	0x15f0: 0x4000, 0x15f1: 0x4000, 0x15f2: 0x4000, 0x15f3: 0x4000, 0x15f4: 0x4000, 0x15f5: 0x4000,
-	0x15f6: 0x4000, 0x15f7: 0x4000, 0x15f8: 0x4000, 0x15f9: 0x4000, 0x15fa: 0x4000, 0x15fb: 0x4000,
-	0x15fc: 0x4000, 0x15ff: 0x4000,
-	// Block 0x58, offset 0x1600
-	0x1600: 0x4000, 0x1601: 0x4000, 0x1602: 0x4000, 0x1603: 0x4000, 0x1604: 0x4000, 0x1605: 0x4000,
-	0x1606: 0x4000, 0x1607: 0x4000, 0x1608: 0x4000, 0x1609: 0x4000, 0x160a: 0x4000, 0x160b: 0x4000,
-	0x160c: 0x4000, 0x160d: 0x4000, 0x160e: 0x4000, 0x160f: 0x4000, 0x1610: 0x4000, 0x1611: 0x4000,
-	0x1612: 0x4000, 0x1613: 0x4000, 0x1614: 0x4000, 0x1615: 0x4000, 0x1616: 0x4000, 0x1617: 0x4000,
-	0x1618: 0x4000, 0x1619: 0x4000, 0x161a: 0x4000, 0x161b: 0x4000, 0x161c: 0x4000, 0x161d: 0x4000,
-	0x161e: 0x4000, 0x161f: 0x4000, 0x1620: 0x4000, 0x1621: 0x4000, 0x1622: 0x4000, 0x1623: 0x4000,
-	0x1624: 0x4000, 0x1625: 0x4000, 0x1626: 0x4000, 0x1627: 0x4000, 0x1628: 0x4000, 0x1629: 0x4000,
-	0x162a: 0x4000, 0x162b: 0x4000, 0x162c: 0x4000, 0x162d: 0x4000, 0x162e: 0x4000, 0x162f: 0x4000,
-	0x1630: 0x4000, 0x1631: 0x4000, 0x1632: 0x4000, 0x1633: 0x4000, 0x1634: 0x4000, 0x1635: 0x4000,
-	0x1636: 0x4000, 0x1637: 0x4000, 0x1638: 0x4000, 0x1639: 0x4000, 0x163a: 0x4000, 0x163b: 0x4000,
-	0x163c: 0x4000, 0x163d: 0x4000,
-	// Block 0x59, offset 0x1640
-	0x164b: 0x4000,
-	0x164c: 0x4000, 0x164d: 0x4000, 0x164e: 0x4000, 0x1650: 0x4000, 0x1651: 0x4000,
-	0x1652: 0x4000, 0x1653: 0x4000, 0x1654: 0x4000, 0x1655: 0x4000, 0x1656: 0x4000, 0x1657: 0x4000,
-	0x1658: 0x4000, 0x1659: 0x4000, 0x165a: 0x4000, 0x165b: 0x4000, 0x165c: 0x4000, 0x165d: 0x4000,
-	0x165e: 0x4000, 0x165f: 0x4000, 0x1660: 0x4000, 0x1661: 0x4000, 0x1662: 0x4000, 0x1663: 0x4000,
-	0x1664: 0x4000, 0x1665: 0x4000, 0x1666: 0x4000, 0x1667: 0x4000,
-	0x167a: 0x4000,
-	// Block 0x5a, offset 0x1680
-	0x1695: 0x4000, 0x1696: 0x4000,
-	0x16a4: 0x4000,
-	// Block 0x5b, offset 0x16c0
-	0x16fb: 0x4000,
-	0x16fc: 0x4000, 0x16fd: 0x4000, 0x16fe: 0x4000, 0x16ff: 0x4000,
-	// Block 0x5c, offset 0x1700
-	0x1700: 0x4000, 0x1701: 0x4000, 0x1702: 0x4000, 0x1703: 0x4000, 0x1704: 0x4000, 0x1705: 0x4000,
-	0x1706: 0x4000, 0x1707: 0x4000, 0x1708: 0x4000, 0x1709: 0x4000, 0x170a: 0x4000, 0x170b: 0x4000,
-	0x170c: 0x4000, 0x170d: 0x4000, 0x170e: 0x4000, 0x170f: 0x4000,
-	// Block 0x5d, offset 0x1740
-	0x1740: 0x4000, 0x1741: 0x4000, 0x1742: 0x4000, 0x1743: 0x4000, 0x1744: 0x4000, 0x1745: 0x4000,
-	0x174c: 0x4000, 0x1750: 0x4000, 0x1751: 0x4000,
-	0x1752: 0x4000,
-	0x176b: 0x4000, 0x176c: 0x4000,
-	0x1774: 0x4000, 0x1775: 0x4000,
-	0x1776: 0x4000,
-	// Block 0x5e, offset 0x1780
-	0x1790: 0x4000, 0x1791: 0x4000,
-	0x1792: 0x4000, 0x1793: 0x4000, 0x1794: 0x4000, 0x1795: 0x4000, 0x1796: 0x4000, 0x1797: 0x4000,
-	0x1798: 0x4000, 0x1799: 0x4000, 0x179a: 0x4000, 0x179b: 0x4000, 0x179c: 0x4000, 0x179d: 0x4000,
-	0x179e: 0x4000, 0x17a0: 0x4000, 0x17a1: 0x4000, 0x17a2: 0x4000, 0x17a3: 0x4000,
-	0x17a4: 0x4000, 0x17a5: 0x4000, 0x17a6: 0x4000, 0x17a7: 0x4000,
-	0x17b0: 0x4000, 0x17b3: 0x4000, 0x17b4: 0x4000, 0x17b5: 0x4000,
-	0x17b6: 0x4000, 0x17b7: 0x4000, 0x17b8: 0x4000, 0x17b9: 0x4000, 0x17ba: 0x4000, 0x17bb: 0x4000,
-	0x17bc: 0x4000, 0x17bd: 0x4000, 0x17be: 0x4000,
-	// Block 0x5f, offset 0x17c0
-	0x17c0: 0x4000, 0x17c1: 0x4000, 0x17c2: 0x4000, 0x17c3: 0x4000, 0x17c4: 0x4000, 0x17c5: 0x4000,
-	0x17c6: 0x4000, 0x17c7: 0x4000, 0x17c8: 0x4000, 0x17c9: 0x4000, 0x17ca: 0x4000, 0x17cb: 0x4000,
-	0x17d0: 0x4000, 0x17d1: 0x4000,
-	0x17d2: 0x4000, 0x17d3: 0x4000, 0x17d4: 0x4000, 0x17d5: 0x4000, 0x17d6: 0x4000, 0x17d7: 0x4000,
-	0x17d8: 0x4000, 0x17d9: 0x4000, 0x17da: 0x4000, 0x17db: 0x4000, 0x17dc: 0x4000, 0x17dd: 0x4000,
-	0x17de: 0x4000,
-	// Block 0x60, offset 0x1800
-	0x1800: 0x4000, 0x1801: 0x4000, 0x1802: 0x4000, 0x1803: 0x4000, 0x1804: 0x4000, 0x1805: 0x4000,
-	0x1806: 0x4000, 0x1807: 0x4000, 0x1808: 0x4000, 0x1809: 0x4000, 0x180a: 0x4000, 0x180b: 0x4000,
-	0x180c: 0x4000, 0x180d: 0x4000, 0x180e: 0x4000, 0x180f: 0x4000, 0x1810: 0x4000, 0x1811: 0x4000,
-	// Block 0x61, offset 0x1840
-	0x1840: 0x4000,
-	// Block 0x62, offset 0x1880
-	0x1880: 0x2000, 0x1881: 0x2000, 0x1882: 0x2000, 0x1883: 0x2000, 0x1884: 0x2000, 0x1885: 0x2000,
-	0x1886: 0x2000, 0x1887: 0x2000, 0x1888: 0x2000, 0x1889: 0x2000, 0x188a: 0x2000, 0x188b: 0x2000,
-	0x188c: 0x2000, 0x188d: 0x2000, 0x188e: 0x2000, 0x188f: 0x2000, 0x1890: 0x2000, 0x1891: 0x2000,
-	0x1892: 0x2000, 0x1893: 0x2000, 0x1894: 0x2000, 0x1895: 0x2000, 0x1896: 0x2000, 0x1897: 0x2000,
-	0x1898: 0x2000, 0x1899: 0x2000, 0x189a: 0x2000, 0x189b: 0x2000, 0x189c: 0x2000, 0x189d: 0x2000,
-	0x189e: 0x2000, 0x189f: 0x2000, 0x18a0: 0x2000, 0x18a1: 0x2000, 0x18a2: 0x2000, 0x18a3: 0x2000,
-	0x18a4: 0x2000, 0x18a5: 0x2000, 0x18a6: 0x2000, 0x18a7: 0x2000, 0x18a8: 0x2000, 0x18a9: 0x2000,
-	0x18aa: 0x2000, 0x18ab: 0x2000, 0x18ac: 0x2000, 0x18ad: 0x2000, 0x18ae: 0x2000, 0x18af: 0x2000,
-	0x18b0: 0x2000, 0x18b1: 0x2000, 0x18b2: 0x2000, 0x18b3: 0x2000, 0x18b4: 0x2000, 0x18b5: 0x2000,
-	0x18b6: 0x2000, 0x18b7: 0x2000, 0x18b8: 0x2000, 0x18b9: 0x2000, 0x18ba: 0x2000, 0x18bb: 0x2000,
-	0x18bc: 0x2000, 0x18bd: 0x2000,
-}
-
-// widthIndex: 22 blocks, 1408 entries, 1408 bytes
-// Block 0 is the zero block.
-var widthIndex = [1408]uint8{
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc2: 0x01, 0xc3: 0x02, 0xc4: 0x03, 0xc5: 0x04, 0xc7: 0x05,
-	0xc9: 0x06, 0xcb: 0x07, 0xcc: 0x08, 0xcd: 0x09, 0xce: 0x0a, 0xcf: 0x0b,
-	0xd0: 0x0c, 0xd1: 0x0d,
-	0xe1: 0x02, 0xe2: 0x03, 0xe3: 0x04, 0xe4: 0x05, 0xe5: 0x06, 0xe6: 0x06, 0xe7: 0x06,
-	0xe8: 0x06, 0xe9: 0x06, 0xea: 0x07, 0xeb: 0x06, 0xec: 0x06, 0xed: 0x08, 0xee: 0x09, 0xef: 0x0a,
-	0xf0: 0x0f, 0xf3: 0x12, 0xf4: 0x13,
-	// Block 0x4, offset 0x100
-	0x104: 0x0e, 0x105: 0x0f,
-	// Block 0x5, offset 0x140
-	0x140: 0x10, 0x141: 0x11, 0x142: 0x12, 0x144: 0x13, 0x145: 0x14, 0x146: 0x15, 0x147: 0x16,
-	0x148: 0x17, 0x149: 0x18, 0x14a: 0x19, 0x14c: 0x1a, 0x14f: 0x1b,
-	0x151: 0x1c, 0x152: 0x08, 0x153: 0x1d, 0x154: 0x1e, 0x155: 0x1f, 0x156: 0x20, 0x157: 0x21,
-	0x158: 0x22, 0x159: 0x23, 0x15a: 0x24, 0x15b: 0x25, 0x15c: 0x26, 0x15d: 0x27, 0x15e: 0x28, 0x15f: 0x29,
-	0x166: 0x2a,
-	0x16c: 0x2b, 0x16d: 0x2c,
-	0x17a: 0x2d, 0x17b: 0x2e, 0x17c: 0x0e, 0x17d: 0x0e, 0x17e: 0x0e, 0x17f: 0x2f,
-	// Block 0x6, offset 0x180
-	0x180: 0x30, 0x181: 0x31, 0x182: 0x32, 0x183: 0x33, 0x184: 0x34, 0x185: 0x35, 0x186: 0x36, 0x187: 0x37,
-	0x188: 0x38, 0x189: 0x39, 0x18a: 0x0e, 0x18b: 0x3a, 0x18c: 0x0e, 0x18d: 0x0e, 0x18e: 0x0e, 0x18f: 0x0e,
-	0x190: 0x0e, 0x191: 0x0e, 0x192: 0x0e, 0x193: 0x0e, 0x194: 0x0e, 0x195: 0x0e, 0x196: 0x0e, 0x197: 0x0e,
-	0x198: 0x0e, 0x199: 0x0e, 0x19a: 0x0e, 0x19b: 0x0e, 0x19c: 0x0e, 0x19d: 0x0e, 0x19e: 0x0e, 0x19f: 0x0e,
-	0x1a0: 0x0e, 0x1a1: 0x0e, 0x1a2: 0x0e, 0x1a3: 0x0e, 0x1a4: 0x0e, 0x1a5: 0x0e, 0x1a6: 0x0e, 0x1a7: 0x0e,
-	0x1a8: 0x0e, 0x1a9: 0x0e, 0x1aa: 0x0e, 0x1ab: 0x0e, 0x1ac: 0x0e, 0x1ad: 0x0e, 0x1ae: 0x0e, 0x1af: 0x0e,
-	0x1b0: 0x0e, 0x1b1: 0x0e, 0x1b2: 0x0e, 0x1b3: 0x0e, 0x1b4: 0x0e, 0x1b5: 0x0e, 0x1b6: 0x0e, 0x1b7: 0x0e,
-	0x1b8: 0x0e, 0x1b9: 0x0e, 0x1ba: 0x0e, 0x1bb: 0x0e, 0x1bc: 0x0e, 0x1bd: 0x0e, 0x1be: 0x0e, 0x1bf: 0x0e,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x0e, 0x1c1: 0x0e, 0x1c2: 0x0e, 0x1c3: 0x0e, 0x1c4: 0x0e, 0x1c5: 0x0e, 0x1c6: 0x0e, 0x1c7: 0x0e,
-	0x1c8: 0x0e, 0x1c9: 0x0e, 0x1ca: 0x0e, 0x1cb: 0x0e, 0x1cc: 0x0e, 0x1cd: 0x0e, 0x1ce: 0x0e, 0x1cf: 0x0e,
-	0x1d0: 0x0e, 0x1d1: 0x0e, 0x1d2: 0x0e, 0x1d3: 0x0e, 0x1d4: 0x0e, 0x1d5: 0x0e, 0x1d6: 0x0e, 0x1d7: 0x0e,
-	0x1d8: 0x0e, 0x1d9: 0x0e, 0x1da: 0x0e, 0x1db: 0x0e, 0x1dc: 0x0e, 0x1dd: 0x0e, 0x1de: 0x0e, 0x1df: 0x0e,
-	0x1e0: 0x0e, 0x1e1: 0x0e, 0x1e2: 0x0e, 0x1e3: 0x0e, 0x1e4: 0x0e, 0x1e5: 0x0e, 0x1e6: 0x0e, 0x1e7: 0x0e,
-	0x1e8: 0x0e, 0x1e9: 0x0e, 0x1ea: 0x0e, 0x1eb: 0x0e, 0x1ec: 0x0e, 0x1ed: 0x0e, 0x1ee: 0x0e, 0x1ef: 0x0e,
-	0x1f0: 0x0e, 0x1f1: 0x0e, 0x1f2: 0x0e, 0x1f3: 0x0e, 0x1f4: 0x0e, 0x1f5: 0x0e, 0x1f6: 0x0e,
-	0x1f8: 0x0e, 0x1f9: 0x0e, 0x1fa: 0x0e, 0x1fb: 0x0e, 0x1fc: 0x0e, 0x1fd: 0x0e, 0x1fe: 0x0e, 0x1ff: 0x0e,
-	// Block 0x8, offset 0x200
-	0x200: 0x0e, 0x201: 0x0e, 0x202: 0x0e, 0x203: 0x0e, 0x204: 0x0e, 0x205: 0x0e, 0x206: 0x0e, 0x207: 0x0e,
-	0x208: 0x0e, 0x209: 0x0e, 0x20a: 0x0e, 0x20b: 0x0e, 0x20c: 0x0e, 0x20d: 0x0e, 0x20e: 0x0e, 0x20f: 0x0e,
-	0x210: 0x0e, 0x211: 0x0e, 0x212: 0x0e, 0x213: 0x0e, 0x214: 0x0e, 0x215: 0x0e, 0x216: 0x0e, 0x217: 0x0e,
-	0x218: 0x0e, 0x219: 0x0e, 0x21a: 0x0e, 0x21b: 0x0e, 0x21c: 0x0e, 0x21d: 0x0e, 0x21e: 0x0e, 0x21f: 0x0e,
-	0x220: 0x0e, 0x221: 0x0e, 0x222: 0x0e, 0x223: 0x0e, 0x224: 0x0e, 0x225: 0x0e, 0x226: 0x0e, 0x227: 0x0e,
-	0x228: 0x0e, 0x229: 0x0e, 0x22a: 0x0e, 0x22b: 0x0e, 0x22c: 0x0e, 0x22d: 0x0e, 0x22e: 0x0e, 0x22f: 0x0e,
-	0x230: 0x0e, 0x231: 0x0e, 0x232: 0x0e, 0x233: 0x0e, 0x234: 0x0e, 0x235: 0x0e, 0x236: 0x0e, 0x237: 0x0e,
-	0x238: 0x0e, 0x239: 0x0e, 0x23a: 0x0e, 0x23b: 0x0e, 0x23c: 0x0e, 0x23d: 0x0e, 0x23e: 0x0e, 0x23f: 0x0e,
-	// Block 0x9, offset 0x240
-	0x240: 0x0e, 0x241: 0x0e, 0x242: 0x0e, 0x243: 0x0e, 0x244: 0x0e, 0x245: 0x0e, 0x246: 0x0e, 0x247: 0x0e,
-	0x248: 0x0e, 0x249: 0x0e, 0x24a: 0x0e, 0x24b: 0x0e, 0x24c: 0x0e, 0x24d: 0x0e, 0x24e: 0x0e, 0x24f: 0x0e,
-	0x250: 0x0e, 0x251: 0x0e, 0x252: 0x3b, 0x253: 0x3c,
-	0x265: 0x3d,
-	0x270: 0x0e, 0x271: 0x0e, 0x272: 0x0e, 0x273: 0x0e, 0x274: 0x0e, 0x275: 0x0e, 0x276: 0x0e, 0x277: 0x0e,
-	0x278: 0x0e, 0x279: 0x0e, 0x27a: 0x0e, 0x27b: 0x0e, 0x27c: 0x0e, 0x27d: 0x0e, 0x27e: 0x0e, 0x27f: 0x0e,
-	// Block 0xa, offset 0x280
-	0x280: 0x0e, 0x281: 0x0e, 0x282: 0x0e, 0x283: 0x0e, 0x284: 0x0e, 0x285: 0x0e, 0x286: 0x0e, 0x287: 0x0e,
-	0x288: 0x0e, 0x289: 0x0e, 0x28a: 0x0e, 0x28b: 0x0e, 0x28c: 0x0e, 0x28d: 0x0e, 0x28e: 0x0e, 0x28f: 0x0e,
-	0x290: 0x0e, 0x291: 0x0e, 0x292: 0x0e, 0x293: 0x0e, 0x294: 0x0e, 0x295: 0x0e, 0x296: 0x0e, 0x297: 0x0e,
-	0x298: 0x0e, 0x299: 0x0e, 0x29a: 0x0e, 0x29b: 0x0e, 0x29c: 0x0e, 0x29d: 0x0e, 0x29e: 0x3e,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0x08, 0x2c1: 0x08, 0x2c2: 0x08, 0x2c3: 0x08, 0x2c4: 0x08, 0x2c5: 0x08, 0x2c6: 0x08, 0x2c7: 0x08,
-	0x2c8: 0x08, 0x2c9: 0x08, 0x2ca: 0x08, 0x2cb: 0x08, 0x2cc: 0x08, 0x2cd: 0x08, 0x2ce: 0x08, 0x2cf: 0x08,
-	0x2d0: 0x08, 0x2d1: 0x08, 0x2d2: 0x08, 0x2d3: 0x08, 0x2d4: 0x08, 0x2d5: 0x08, 0x2d6: 0x08, 0x2d7: 0x08,
-	0x2d8: 0x08, 0x2d9: 0x08, 0x2da: 0x08, 0x2db: 0x08, 0x2dc: 0x08, 0x2dd: 0x08, 0x2de: 0x08, 0x2df: 0x08,
-	0x2e0: 0x08, 0x2e1: 0x08, 0x2e2: 0x08, 0x2e3: 0x08, 0x2e4: 0x08, 0x2e5: 0x08, 0x2e6: 0x08, 0x2e7: 0x08,
-	0x2e8: 0x08, 0x2e9: 0x08, 0x2ea: 0x08, 0x2eb: 0x08, 0x2ec: 0x08, 0x2ed: 0x08, 0x2ee: 0x08, 0x2ef: 0x08,
-	0x2f0: 0x08, 0x2f1: 0x08, 0x2f2: 0x08, 0x2f3: 0x08, 0x2f4: 0x08, 0x2f5: 0x08, 0x2f6: 0x08, 0x2f7: 0x08,
-	0x2f8: 0x08, 0x2f9: 0x08, 0x2fa: 0x08, 0x2fb: 0x08, 0x2fc: 0x08, 0x2fd: 0x08, 0x2fe: 0x08, 0x2ff: 0x08,
-	// Block 0xc, offset 0x300
-	0x300: 0x08, 0x301: 0x08, 0x302: 0x08, 0x303: 0x08, 0x304: 0x08, 0x305: 0x08, 0x306: 0x08, 0x307: 0x08,
-	0x308: 0x08, 0x309: 0x08, 0x30a: 0x08, 0x30b: 0x08, 0x30c: 0x08, 0x30d: 0x08, 0x30e: 0x08, 0x30f: 0x08,
-	0x310: 0x08, 0x311: 0x08, 0x312: 0x08, 0x313: 0x08, 0x314: 0x08, 0x315: 0x08, 0x316: 0x08, 0x317: 0x08,
-	0x318: 0x08, 0x319: 0x08, 0x31a: 0x08, 0x31b: 0x08, 0x31c: 0x08, 0x31d: 0x08, 0x31e: 0x08, 0x31f: 0x08,
-	0x320: 0x08, 0x321: 0x08, 0x322: 0x08, 0x323: 0x08, 0x324: 0x0e, 0x325: 0x0e, 0x326: 0x0e, 0x327: 0x0e,
-	0x328: 0x0e, 0x329: 0x0e, 0x32a: 0x0e, 0x32b: 0x0e,
-	0x338: 0x3f, 0x339: 0x40, 0x33c: 0x41, 0x33d: 0x42, 0x33e: 0x43, 0x33f: 0x44,
-	// Block 0xd, offset 0x340
-	0x37f: 0x45,
-	// Block 0xe, offset 0x380
-	0x380: 0x0e, 0x381: 0x0e, 0x382: 0x0e, 0x383: 0x0e, 0x384: 0x0e, 0x385: 0x0e, 0x386: 0x0e, 0x387: 0x0e,
-	0x388: 0x0e, 0x389: 0x0e, 0x38a: 0x0e, 0x38b: 0x0e, 0x38c: 0x0e, 0x38d: 0x0e, 0x38e: 0x0e, 0x38f: 0x0e,
-	0x390: 0x0e, 0x391: 0x0e, 0x392: 0x0e, 0x393: 0x0e, 0x394: 0x0e, 0x395: 0x0e, 0x396: 0x0e, 0x397: 0x0e,
-	0x398: 0x0e, 0x399: 0x0e, 0x39a: 0x0e, 0x39b: 0x0e, 0x39c: 0x0e, 0x39d: 0x0e, 0x39e: 0x0e, 0x39f: 0x46,
-	0x3a0: 0x0e, 0x3a1: 0x0e, 0x3a2: 0x0e, 0x3a3: 0x0e, 0x3a4: 0x0e, 0x3a5: 0x0e, 0x3a6: 0x0e, 0x3a7: 0x0e,
-	0x3a8: 0x0e, 0x3a9: 0x0e, 0x3aa: 0x0e, 0x3ab: 0x47,
-	// Block 0xf, offset 0x3c0
-	0x3c0: 0x48,
-	// Block 0x10, offset 0x400
-	0x400: 0x49, 0x403: 0x4a, 0x404: 0x4b, 0x405: 0x4c, 0x406: 0x4d,
-	0x408: 0x4e, 0x409: 0x4f, 0x40c: 0x50, 0x40d: 0x51, 0x40e: 0x52, 0x40f: 0x53,
-	0x410: 0x3a, 0x411: 0x54, 0x412: 0x0e, 0x413: 0x55, 0x414: 0x56, 0x415: 0x57, 0x416: 0x58, 0x417: 0x59,
-	0x418: 0x0e, 0x419: 0x5a, 0x41a: 0x0e, 0x41b: 0x5b,
-	0x424: 0x5c, 0x425: 0x5d, 0x426: 0x5e, 0x427: 0x5f,
-	// Block 0x11, offset 0x440
-	0x456: 0x0b, 0x457: 0x06,
-	0x458: 0x0c, 0x45b: 0x0d, 0x45f: 0x0e,
-	0x460: 0x06, 0x461: 0x06, 0x462: 0x06, 0x463: 0x06, 0x464: 0x06, 0x465: 0x06, 0x466: 0x06, 0x467: 0x06,
-	0x468: 0x06, 0x469: 0x06, 0x46a: 0x06, 0x46b: 0x06, 0x46c: 0x06, 0x46d: 0x06, 0x46e: 0x06, 0x46f: 0x06,
-	0x470: 0x06, 0x471: 0x06, 0x472: 0x06, 0x473: 0x06, 0x474: 0x06, 0x475: 0x06, 0x476: 0x06, 0x477: 0x06,
-	0x478: 0x06, 0x479: 0x06, 0x47a: 0x06, 0x47b: 0x06, 0x47c: 0x06, 0x47d: 0x06, 0x47e: 0x06, 0x47f: 0x06,
-	// Block 0x12, offset 0x480
-	0x484: 0x08, 0x485: 0x08, 0x486: 0x08, 0x487: 0x09,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0x08, 0x4c1: 0x08, 0x4c2: 0x08, 0x4c3: 0x08, 0x4c4: 0x08, 0x4c5: 0x08, 0x4c6: 0x08, 0x4c7: 0x08,
-	0x4c8: 0x08, 0x4c9: 0x08, 0x4ca: 0x08, 0x4cb: 0x08, 0x4cc: 0x08, 0x4cd: 0x08, 0x4ce: 0x08, 0x4cf: 0x08,
-	0x4d0: 0x08, 0x4d1: 0x08, 0x4d2: 0x08, 0x4d3: 0x08, 0x4d4: 0x08, 0x4d5: 0x08, 0x4d6: 0x08, 0x4d7: 0x08,
-	0x4d8: 0x08, 0x4d9: 0x08, 0x4da: 0x08, 0x4db: 0x08, 0x4dc: 0x08, 0x4dd: 0x08, 0x4de: 0x08, 0x4df: 0x08,
-	0x4e0: 0x08, 0x4e1: 0x08, 0x4e2: 0x08, 0x4e3: 0x08, 0x4e4: 0x08, 0x4e5: 0x08, 0x4e6: 0x08, 0x4e7: 0x08,
-	0x4e8: 0x08, 0x4e9: 0x08, 0x4ea: 0x08, 0x4eb: 0x08, 0x4ec: 0x08, 0x4ed: 0x08, 0x4ee: 0x08, 0x4ef: 0x08,
-	0x4f0: 0x08, 0x4f1: 0x08, 0x4f2: 0x08, 0x4f3: 0x08, 0x4f4: 0x08, 0x4f5: 0x08, 0x4f6: 0x08, 0x4f7: 0x08,
-	0x4f8: 0x08, 0x4f9: 0x08, 0x4fa: 0x08, 0x4fb: 0x08, 0x4fc: 0x08, 0x4fd: 0x08, 0x4fe: 0x08, 0x4ff: 0x60,
-	// Block 0x14, offset 0x500
-	0x520: 0x10,
-	0x530: 0x09, 0x531: 0x09, 0x532: 0x09, 0x533: 0x09, 0x534: 0x09, 0x535: 0x09, 0x536: 0x09, 0x537: 0x09,
-	0x538: 0x09, 0x539: 0x09, 0x53a: 0x09, 0x53b: 0x09, 0x53c: 0x09, 0x53d: 0x09, 0x53e: 0x09, 0x53f: 0x11,
-	// Block 0x15, offset 0x540
-	0x540: 0x09, 0x541: 0x09, 0x542: 0x09, 0x543: 0x09, 0x544: 0x09, 0x545: 0x09, 0x546: 0x09, 0x547: 0x09,
-	0x548: 0x09, 0x549: 0x09, 0x54a: 0x09, 0x54b: 0x09, 0x54c: 0x09, 0x54d: 0x09, 0x54e: 0x09, 0x54f: 0x11,
-}
-
-// inverseData contains 4-byte entries of the following format:
-//   <length> <modified UTF-8-encoded rune> <0 padding>
-// The last byte of the UTF-8-encoded rune is xor-ed with the last byte of the
-// UTF-8 encoding of the original rune. Mappings often have the following
-// pattern:
-//   Ａ -> A  (U+FF21 -> U+0041)
-//   Ｂ -> B  (U+FF22 -> U+0042)
-//   ...
-// By xor-ing the last byte the same entry can be shared by many mappings. This
-// reduces the total number of distinct entries by about two thirds.
-// The resulting entry for the aforementioned mappings is
-//   { 0x01, 0xE0, 0x00, 0x00 }
-// Using this entry to map U+FF21 (UTF-8 [EF BC A1]), we get
-//   E0 ^ A1 = 41.
-// Similarly, for U+FF22 (UTF-8 [EF BC A2]), we get
-//   E0 ^ A2 = 42.
-// Note that because of the xor-ing, the byte sequence stored in the entry is
-// not valid UTF-8.
-var inverseData = [150][4]byte{
-	{0x00, 0x00, 0x00, 0x00},
-	{0x03, 0xe3, 0x80, 0xa0},
-	{0x03, 0xef, 0xbc, 0xa0},
-	{0x03, 0xef, 0xbc, 0xe0},
-	{0x03, 0xef, 0xbd, 0xe0},
-	{0x03, 0xef, 0xbf, 0x02},
-	{0x03, 0xef, 0xbf, 0x00},
-	{0x03, 0xef, 0xbf, 0x0e},
-	{0x03, 0xef, 0xbf, 0x0c},
-	{0x03, 0xef, 0xbf, 0x0f},
-	{0x03, 0xef, 0xbf, 0x39},
-	{0x03, 0xef, 0xbf, 0x3b},
-	{0x03, 0xef, 0xbf, 0x3f},
-	{0x03, 0xef, 0xbf, 0x2a},
-	{0x03, 0xef, 0xbf, 0x0d},
-	{0x03, 0xef, 0xbf, 0x25},
-	{0x03, 0xef, 0xbd, 0x1a},
-	{0x03, 0xef, 0xbd, 0x26},
-	{0x01, 0xa0, 0x00, 0x00},
-	{0x03, 0xef, 0xbd, 0x25},
-	{0x03, 0xef, 0xbd, 0x23},
-	{0x03, 0xef, 0xbd, 0x2e},
-	{0x03, 0xef, 0xbe, 0x07},
-	{0x03, 0xef, 0xbe, 0x05},
-	{0x03, 0xef, 0xbd, 0x06},
-	{0x03, 0xef, 0xbd, 0x13},
-	{0x03, 0xef, 0xbd, 0x0b},
-	{0x03, 0xef, 0xbd, 0x16},
-	{0x03, 0xef, 0xbd, 0x0c},
-	{0x03, 0xef, 0xbd, 0x15},
-	{0x03, 0xef, 0xbd, 0x0d},
-	{0x03, 0xef, 0xbd, 0x1c},
-	{0x03, 0xef, 0xbd, 0x02},
-	{0x03, 0xef, 0xbd, 0x1f},
-	{0x03, 0xef, 0xbd, 0x1d},
-	{0x03, 0xef, 0xbd, 0x17},
-	{0x03, 0xef, 0xbd, 0x08},
-	{0x03, 0xef, 0xbd, 0x09},
-	{0x03, 0xef, 0xbd, 0x0e},
-	{0x03, 0xef, 0xbd, 0x04},
-	{0x03, 0xef, 0xbd, 0x05},
-	{0x03, 0xef, 0xbe, 0x3f},
-	{0x03, 0xef, 0xbe, 0x00},
-	{0x03, 0xef, 0xbd, 0x2c},
-	{0x03, 0xef, 0xbe, 0x06},
-	{0x03, 0xef, 0xbe, 0x0c},
-	{0x03, 0xef, 0xbe, 0x0f},
-	{0x03, 0xef, 0xbe, 0x0d},
-	{0x03, 0xef, 0xbe, 0x0b},
-	{0x03, 0xef, 0xbe, 0x19},
-	{0x03, 0xef, 0xbe, 0x15},
-	{0x03, 0xef, 0xbe, 0x11},
-	{0x03, 0xef, 0xbe, 0x31},
-	{0x03, 0xef, 0xbe, 0x33},
-	{0x03, 0xef, 0xbd, 0x0f},
-	{0x03, 0xef, 0xbe, 0x30},
-	{0x03, 0xef, 0xbe, 0x3e},
-	{0x03, 0xef, 0xbe, 0x32},
-	{0x03, 0xef, 0xbe, 0x36},
-	{0x03, 0xef, 0xbd, 0x14},
-	{0x03, 0xef, 0xbe, 0x2e},
-	{0x03, 0xef, 0xbd, 0x1e},
-	{0x03, 0xef, 0xbe, 0x10},
-	{0x03, 0xef, 0xbf, 0x13},
-	{0x03, 0xef, 0xbf, 0x15},
-	{0x03, 0xef, 0xbf, 0x17},
-	{0x03, 0xef, 0xbf, 0x1f},
-	{0x03, 0xef, 0xbf, 0x1d},
-	{0x03, 0xef, 0xbf, 0x1b},
-	{0x03, 0xef, 0xbf, 0x09},
-	{0x03, 0xef, 0xbf, 0x0b},
-	{0x03, 0xef, 0xbf, 0x37},
-	{0x03, 0xef, 0xbe, 0x04},
-	{0x01, 0xe0, 0x00, 0x00},
-	{0x03, 0xe2, 0xa6, 0x1a},
-	{0x03, 0xe2, 0xa6, 0x26},
-	{0x03, 0xe3, 0x80, 0x23},
-	{0x03, 0xe3, 0x80, 0x2e},
-	{0x03, 0xe3, 0x80, 0x25},
-	{0x03, 0xe3, 0x83, 0x1e},
-	{0x03, 0xe3, 0x83, 0x14},
-	{0x03, 0xe3, 0x82, 0x06},
-	{0x03, 0xe3, 0x82, 0x0b},
-	{0x03, 0xe3, 0x82, 0x0c},
-	{0x03, 0xe3, 0x82, 0x0d},
-	{0x03, 0xe3, 0x82, 0x02},
-	{0x03, 0xe3, 0x83, 0x0f},
-	{0x03, 0xe3, 0x83, 0x08},
-	{0x03, 0xe3, 0x83, 0x09},
-	{0x03, 0xe3, 0x83, 0x2c},
-	{0x03, 0xe3, 0x83, 0x0c},
-	{0x03, 0xe3, 0x82, 0x13},
-	{0x03, 0xe3, 0x82, 0x16},
-	{0x03, 0xe3, 0x82, 0x15},
-	{0x03, 0xe3, 0x82, 0x1c},
-	{0x03, 0xe3, 0x82, 0x1f},
-	{0x03, 0xe3, 0x82, 0x1d},
-	{0x03, 0xe3, 0x82, 0x1a},
-	{0x03, 0xe3, 0x82, 0x17},
-	{0x03, 0xe3, 0x82, 0x08},
-	{0x03, 0xe3, 0x82, 0x09},
-	{0x03, 0xe3, 0x82, 0x0e},
-	{0x03, 0xe3, 0x82, 0x04},
-	{0x03, 0xe3, 0x82, 0x05},
-	{0x03, 0xe3, 0x82, 0x3f},
-	{0x03, 0xe3, 0x83, 0x00},
-	{0x03, 0xe3, 0x83, 0x06},
-	{0x03, 0xe3, 0x83, 0x05},
-	{0x03, 0xe3, 0x83, 0x0d},
-	{0x03, 0xe3, 0x83, 0x0b},
-	{0x03, 0xe3, 0x83, 0x07},
-	{0x03, 0xe3, 0x83, 0x19},
-	{0x03, 0xe3, 0x83, 0x15},
-	{0x03, 0xe3, 0x83, 0x11},
-	{0x03, 0xe3, 0x83, 0x31},
-	{0x03, 0xe3, 0x83, 0x33},
-	{0x03, 0xe3, 0x83, 0x30},
-	{0x03, 0xe3, 0x83, 0x3e},
-	{0x03, 0xe3, 0x83, 0x32},
-	{0x03, 0xe3, 0x83, 0x36},
-	{0x03, 0xe3, 0x83, 0x2e},
-	{0x03, 0xe3, 0x82, 0x07},
-	{0x03, 0xe3, 0x85, 0x04},
-	{0x03, 0xe3, 0x84, 0x10},
-	{0x03, 0xe3, 0x85, 0x30},
-	{0x03, 0xe3, 0x85, 0x0d},
-	{0x03, 0xe3, 0x85, 0x13},
-	{0x03, 0xe3, 0x85, 0x15},
-	{0x03, 0xe3, 0x85, 0x17},
-	{0x03, 0xe3, 0x85, 0x1f},
-	{0x03, 0xe3, 0x85, 0x1d},
-	{0x03, 0xe3, 0x85, 0x1b},
-	{0x03, 0xe3, 0x85, 0x09},
-	{0x03, 0xe3, 0x85, 0x0f},
-	{0x03, 0xe3, 0x85, 0x0b},
-	{0x03, 0xe3, 0x85, 0x37},
-	{0x03, 0xe3, 0x85, 0x3b},
-	{0x03, 0xe3, 0x85, 0x39},
-	{0x03, 0xe3, 0x85, 0x3f},
-	{0x02, 0xc2, 0x02, 0x00},
-	{0x02, 0xc2, 0x0e, 0x00},
-	{0x02, 0xc2, 0x0c, 0x00},
-	{0x02, 0xc2, 0x00, 0x00},
-	{0x03, 0xe2, 0x82, 0x0f},
-	{0x03, 0xe2, 0x94, 0x2a},
-	{0x03, 0xe2, 0x86, 0x39},
-	{0x03, 0xe2, 0x86, 0x3b},
-	{0x03, 0xe2, 0x86, 0x3f},
-	{0x03, 0xe2, 0x96, 0x0d},
-	{0x03, 0xe2, 0x97, 0x25},
-}
-
-// Total table size 14680 bytes (14KiB)
diff --git a/vendor/golang.org/x/text/width/transform.go b/vendor/golang.org/x/text/width/transform.go
deleted file mode 100644
index 0049f700a2..0000000000
--- a/vendor/golang.org/x/text/width/transform.go
+++ /dev/null
@@ -1,239 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package width
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/transform"
-)
-
-type foldTransform struct {
-	transform.NopResetter
-}
-
-func (foldTransform) Span(src []byte, atEOF bool) (n int, err error) {
-	for n < len(src) {
-		if src[n] < utf8.RuneSelf {
-			// ASCII fast path.
-			for n++; n < len(src) && src[n] < utf8.RuneSelf; n++ {
-			}
-			continue
-		}
-		v, size := trie.lookup(src[n:])
-		if size == 0 { // incomplete UTF-8 encoding
-			if !atEOF {
-				err = transform.ErrShortSrc
-			} else {
-				n = len(src)
-			}
-			break
-		}
-		if elem(v)&tagNeedsFold != 0 {
-			err = transform.ErrEndOfSpan
-			break
-		}
-		n += size
-	}
-	return n, err
-}
-
-func (foldTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	for nSrc < len(src) {
-		if src[nSrc] < utf8.RuneSelf {
-			// ASCII fast path.
-			start, end := nSrc, len(src)
-			if d := len(dst) - nDst; d < end-start {
-				end = nSrc + d
-			}
-			for nSrc++; nSrc < end && src[nSrc] < utf8.RuneSelf; nSrc++ {
-			}
-			n := copy(dst[nDst:], src[start:nSrc])
-			if nDst += n; nDst == len(dst) {
-				nSrc = start + n
-				if nSrc == len(src) {
-					return nDst, nSrc, nil
-				}
-				if src[nSrc] < utf8.RuneSelf {
-					return nDst, nSrc, transform.ErrShortDst
-				}
-			}
-			continue
-		}
-		v, size := trie.lookup(src[nSrc:])
-		if size == 0 { // incomplete UTF-8 encoding
-			if !atEOF {
-				return nDst, nSrc, transform.ErrShortSrc
-			}
-			size = 1 // gobble 1 byte
-		}
-		if elem(v)&tagNeedsFold == 0 {
-			if size != copy(dst[nDst:], src[nSrc:nSrc+size]) {
-				return nDst, nSrc, transform.ErrShortDst
-			}
-			nDst += size
-		} else {
-			data := inverseData[byte(v)]
-			if len(dst)-nDst < int(data[0]) {
-				return nDst, nSrc, transform.ErrShortDst
-			}
-			i := 1
-			for end := int(data[0]); i < end; i++ {
-				dst[nDst] = data[i]
-				nDst++
-			}
-			dst[nDst] = data[i] ^ src[nSrc+size-1]
-			nDst++
-		}
-		nSrc += size
-	}
-	return nDst, nSrc, nil
-}
-
-type narrowTransform struct {
-	transform.NopResetter
-}
-
-func (narrowTransform) Span(src []byte, atEOF bool) (n int, err error) {
-	for n < len(src) {
-		if src[n] < utf8.RuneSelf {
-			// ASCII fast path.
-			for n++; n < len(src) && src[n] < utf8.RuneSelf; n++ {
-			}
-			continue
-		}
-		v, size := trie.lookup(src[n:])
-		if size == 0 { // incomplete UTF-8 encoding
-			if !atEOF {
-				err = transform.ErrShortSrc
-			} else {
-				n = len(src)
-			}
-			break
-		}
-		if k := elem(v).kind(); byte(v) == 0 || k != EastAsianFullwidth && k != EastAsianWide && k != EastAsianAmbiguous {
-		} else {
-			err = transform.ErrEndOfSpan
-			break
-		}
-		n += size
-	}
-	return n, err
-}
-
-func (narrowTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	for nSrc < len(src) {
-		if src[nSrc] < utf8.RuneSelf {
-			// ASCII fast path.
-			start, end := nSrc, len(src)
-			if d := len(dst) - nDst; d < end-start {
-				end = nSrc + d
-			}
-			for nSrc++; nSrc < end && src[nSrc] < utf8.RuneSelf; nSrc++ {
-			}
-			n := copy(dst[nDst:], src[start:nSrc])
-			if nDst += n; nDst == len(dst) {
-				nSrc = start + n
-				if nSrc == len(src) {
-					return nDst, nSrc, nil
-				}
-				if src[nSrc] < utf8.RuneSelf {
-					return nDst, nSrc, transform.ErrShortDst
-				}
-			}
-			continue
-		}
-		v, size := trie.lookup(src[nSrc:])
-		if size == 0 { // incomplete UTF-8 encoding
-			if !atEOF {
-				return nDst, nSrc, transform.ErrShortSrc
-			}
-			size = 1 // gobble 1 byte
-		}
-		if k := elem(v).kind(); byte(v) == 0 || k != EastAsianFullwidth && k != EastAsianWide && k != EastAsianAmbiguous {
-			if size != copy(dst[nDst:], src[nSrc:nSrc+size]) {
-				return nDst, nSrc, transform.ErrShortDst
-			}
-			nDst += size
-		} else {
-			data := inverseData[byte(v)]
-			if len(dst)-nDst < int(data[0]) {
-				return nDst, nSrc, transform.ErrShortDst
-			}
-			i := 1
-			for end := int(data[0]); i < end; i++ {
-				dst[nDst] = data[i]
-				nDst++
-			}
-			dst[nDst] = data[i] ^ src[nSrc+size-1]
-			nDst++
-		}
-		nSrc += size
-	}
-	return nDst, nSrc, nil
-}
-
-type wideTransform struct {
-	transform.NopResetter
-}
-
-func (wideTransform) Span(src []byte, atEOF bool) (n int, err error) {
-	for n < len(src) {
-		// TODO: Consider ASCII fast path. Special-casing ASCII handling can
-		// reduce the ns/op of BenchmarkWideASCII by about 30%. This is probably
-		// not enough to warrant the extra code and complexity.
-		v, size := trie.lookup(src[n:])
-		if size == 0 { // incomplete UTF-8 encoding
-			if !atEOF {
-				err = transform.ErrShortSrc
-			} else {
-				n = len(src)
-			}
-			break
-		}
-		if k := elem(v).kind(); byte(v) == 0 || k != EastAsianHalfwidth && k != EastAsianNarrow {
-		} else {
-			err = transform.ErrEndOfSpan
-			break
-		}
-		n += size
-	}
-	return n, err
-}
-
-func (wideTransform) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	for nSrc < len(src) {
-		// TODO: Consider ASCII fast path. Special-casing ASCII handling can
-		// reduce the ns/op of BenchmarkWideASCII by about 30%. This is probably
-		// not enough to warrant the extra code and complexity.
-		v, size := trie.lookup(src[nSrc:])
-		if size == 0 { // incomplete UTF-8 encoding
-			if !atEOF {
-				return nDst, nSrc, transform.ErrShortSrc
-			}
-			size = 1 // gobble 1 byte
-		}
-		if k := elem(v).kind(); byte(v) == 0 || k != EastAsianHalfwidth && k != EastAsianNarrow {
-			if size != copy(dst[nDst:], src[nSrc:nSrc+size]) {
-				return nDst, nSrc, transform.ErrShortDst
-			}
-			nDst += size
-		} else {
-			data := inverseData[byte(v)]
-			if len(dst)-nDst < int(data[0]) {
-				return nDst, nSrc, transform.ErrShortDst
-			}
-			i := 1
-			for end := int(data[0]); i < end; i++ {
-				dst[nDst] = data[i]
-				nDst++
-			}
-			dst[nDst] = data[i] ^ src[nSrc+size-1]
-			nDst++
-		}
-		nSrc += size
-	}
-	return nDst, nSrc, nil
-}
diff --git a/vendor/golang.org/x/text/width/trieval.go b/vendor/golang.org/x/text/width/trieval.go
deleted file mode 100644
index ca8e45fd19..0000000000
--- a/vendor/golang.org/x/text/width/trieval.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package width
-
-// elem is an entry of the width trie. The high byte is used to encode the type
-// of the rune. The low byte is used to store the index to a mapping entry in
-// the inverseData array.
-type elem uint16
-
-const (
-	tagNeutral elem = iota << typeShift
-	tagAmbiguous
-	tagWide
-	tagNarrow
-	tagFullwidth
-	tagHalfwidth
-)
-
-const (
-	numTypeBits = 3
-	typeShift   = 16 - numTypeBits
-
-	// tagNeedsFold is true for all fullwidth and halfwidth runes except for
-	// the Won sign U+20A9.
-	tagNeedsFold = 0x1000
-
-	// The Korean Won sign is halfwidth, but SHOULD NOT be mapped to a wide
-	// variant.
-	wonSign rune = 0x20A9
-)
diff --git a/vendor/golang.org/x/text/width/width.go b/vendor/golang.org/x/text/width/width.go
deleted file mode 100644
index f1639ca68a..0000000000
--- a/vendor/golang.org/x/text/width/width.go
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate stringer -type=Kind
-//go:generate go run gen.go gen_common.go gen_trieval.go
-
-// Package width provides functionality for handling different widths in text.
-//
-// Wide characters behave like ideographs; they tend to allow line breaks after
-// each character and remain upright in vertical text layout. Narrow characters
-// are kept together in words or runs that are rotated sideways in vertical text
-// layout.
-//
-// For more information, see http://unicode.org/reports/tr11/.
-package width // import "golang.org/x/text/width"
-
-import (
-	"unicode/utf8"
-
-	"golang.org/x/text/transform"
-)
-
-// TODO
-// 1) Reduce table size by compressing blocks.
-// 2) API proposition for computing display length
-//    (approximation, fixed pitch only).
-// 3) Implement display length.
-
-// Kind indicates the type of width property as defined in http://unicode.org/reports/tr11/.
-type Kind int
-
-const (
-	// Neutral characters do not occur in legacy East Asian character sets.
-	Neutral Kind = iota
-
-	// EastAsianAmbiguous characters that can be sometimes wide and sometimes
-	// narrow and require additional information not contained in the character
-	// code to further resolve their width.
-	EastAsianAmbiguous
-
-	// EastAsianWide characters are wide in its usual form. They occur only in
-	// the context of East Asian typography. These runes may have explicit
-	// halfwidth counterparts.
-	EastAsianWide
-
-	// EastAsianNarrow characters are narrow in its usual form. They often have
-	// fullwidth counterparts.
-	EastAsianNarrow
-
-	// Note: there exist Narrow runes that do not have fullwidth or wide
-	// counterparts, despite what the definition says (e.g. U+27E6).
-
-	// EastAsianFullwidth characters have a compatibility decompositions of type
-	// wide that map to a narrow counterpart.
-	EastAsianFullwidth
-
-	// EastAsianHalfwidth characters have a compatibility decomposition of type
-	// narrow that map to a wide or ambiguous counterpart, plus U+20A9 ₩ WON
-	// SIGN.
-	EastAsianHalfwidth
-
-	// Note: there exist runes that have a halfwidth counterparts but that are
-	// classified as Ambiguous, rather than wide (e.g. U+2190).
-)
-
-// TODO: the generated tries need to return size 1 for invalid runes for the
-// width to be computed correctly (each byte should render width 1)
-
-var trie = newWidthTrie(0)
-
-// Lookup reports the Properties of the first rune in b and the number of bytes
-// of its UTF-8 encoding.
-func Lookup(b []byte) (p Properties, size int) {
-	v, sz := trie.lookup(b)
-	return Properties{elem(v), b[sz-1]}, sz
-}
-
-// LookupString reports the Properties of the first rune in s and the number of
-// bytes of its UTF-8 encoding.
-func LookupString(s string) (p Properties, size int) {
-	v, sz := trie.lookupString(s)
-	return Properties{elem(v), s[sz-1]}, sz
-}
-
-// LookupRune reports the Properties of rune r.
-func LookupRune(r rune) Properties {
-	var buf [4]byte
-	n := utf8.EncodeRune(buf[:], r)
-	v, _ := trie.lookup(buf[:n])
-	last := byte(r)
-	if r >= utf8.RuneSelf {
-		last = 0x80 + byte(r&0x3f)
-	}
-	return Properties{elem(v), last}
-}
-
-// Properties provides access to width properties of a rune.
-type Properties struct {
-	elem elem
-	last byte
-}
-
-func (e elem) kind() Kind {
-	return Kind(e >> typeShift)
-}
-
-// Kind returns the Kind of a rune as defined in Unicode TR #11.
-// See http://unicode.org/reports/tr11/ for more details.
-func (p Properties) Kind() Kind {
-	return p.elem.kind()
-}
-
-// Folded returns the folded variant of a rune or 0 if the rune is canonical.
-func (p Properties) Folded() rune {
-	if p.elem&tagNeedsFold != 0 {
-		buf := inverseData[byte(p.elem)]
-		buf[buf[0]] ^= p.last
-		r, _ := utf8.DecodeRune(buf[1 : 1+buf[0]])
-		return r
-	}
-	return 0
-}
-
-// Narrow returns the narrow variant of a rune or 0 if the rune is already
-// narrow or doesn't have a narrow variant.
-func (p Properties) Narrow() rune {
-	if k := p.elem.kind(); byte(p.elem) != 0 && (k == EastAsianFullwidth || k == EastAsianWide || k == EastAsianAmbiguous) {
-		buf := inverseData[byte(p.elem)]
-		buf[buf[0]] ^= p.last
-		r, _ := utf8.DecodeRune(buf[1 : 1+buf[0]])
-		return r
-	}
-	return 0
-}
-
-// Wide returns the wide variant of a rune or 0 if the rune is already
-// wide or doesn't have a wide variant.
-func (p Properties) Wide() rune {
-	if k := p.elem.kind(); byte(p.elem) != 0 && (k == EastAsianHalfwidth || k == EastAsianNarrow) {
-		buf := inverseData[byte(p.elem)]
-		buf[buf[0]] ^= p.last
-		r, _ := utf8.DecodeRune(buf[1 : 1+buf[0]])
-		return r
-	}
-	return 0
-}
-
-// TODO for Properties:
-// - Add Fullwidth/Halfwidth or Inverted methods for computing variants
-// mapping.
-// - Add width information (including information on non-spacing runes).
-
-// Transformer implements the transform.Transformer interface.
-type Transformer struct {
-	t transform.SpanningTransformer
-}
-
-// Reset implements the transform.Transformer interface.
-func (t Transformer) Reset() { t.t.Reset() }
-
-// Transform implements the transform.Transformer interface.
-func (t Transformer) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	return t.t.Transform(dst, src, atEOF)
-}
-
-// Span implements the transform.SpanningTransformer interface.
-func (t Transformer) Span(src []byte, atEOF bool) (n int, err error) {
-	return t.t.Span(src, atEOF)
-}
-
-// Bytes returns a new byte slice with the result of applying t to b.
-func (t Transformer) Bytes(b []byte) []byte {
-	b, _, _ = transform.Bytes(t, b)
-	return b
-}
-
-// String returns a string with the result of applying t to s.
-func (t Transformer) String(s string) string {
-	s, _, _ = transform.String(t, s)
-	return s
-}
-
-var (
-	// Fold is a transform that maps all runes to their canonical width.
-	//
-	// Note that the NFKC and NFKD transforms in golang.org/x/text/unicode/norm
-	// provide a more generic folding mechanism.
-	Fold Transformer = Transformer{foldTransform{}}
-
-	// Widen is a transform that maps runes to their wide variant, if
-	// available.
-	Widen Transformer = Transformer{wideTransform{}}
-
-	// Narrow is a transform that maps runes to their narrow variant, if
-	// available.
-	Narrow Transformer = Transformer{narrowTransform{}}
-)
-
-// TODO: Consider the following options:
-// - Treat Ambiguous runes that have a halfwidth counterpart as wide, or some
-//   generalized variant of this.
-// - Consider a wide Won character to be the default width (or some generalized
-//   variant of this).
-// - Filter the set of characters that gets converted (the preferred approach is
-//   to allow applying filters to transforms).
diff --git a/vendor/google.golang.org/appengine/CONTRIBUTING.md b/vendor/google.golang.org/appengine/CONTRIBUTING.md
deleted file mode 100644
index ffc2985208..0000000000
--- a/vendor/google.golang.org/appengine/CONTRIBUTING.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# Contributing
-
-1. Sign one of the contributor license agreements below.
-1. Get the package:
-
-    `go get -d google.golang.org/appengine`
-1. Change into the checked out source:
-
-    `cd $GOPATH/src/google.golang.org/appengine`
-1. Fork the repo.
-1. Set your fork as a remote:
-
-    `git remote add fork git@github.com:GITHUB_USERNAME/appengine.git`
-1. Make changes, commit to your fork.
-1. Send a pull request with your changes. 
-   The first line of your commit message is conventionally a one-line summary of the change, prefixed by the primary affected package, and is used as the title of your pull request.
-
-# Testing
-
-## Running system tests
-
-Download and install the [Go App Engine SDK](https://cloud.google.com/appengine/docs/go/download). Make sure the `go_appengine` dir is in your `PATH`.
-
-Set the `APPENGINE_DEV_APPSERVER` environment variable to `/path/to/go_appengine/dev_appserver.py`.
-
-Run tests with `goapp test`:
-
-```
-goapp test -v google.golang.org/appengine/...
-```
-
-## Contributor License Agreements
-
-Before we can accept your pull requests you'll need to sign a Contributor
-License Agreement (CLA):
-
-- **If you are an individual writing original source code** and **you own the
-intellectual property**, then you'll need to sign an [individual CLA][indvcla].
-- **If you work for a company that wants to allow you to contribute your work**,
-then you'll need to sign a [corporate CLA][corpcla].
-
-You can sign these electronically (just scroll to the bottom). After that,
-we'll be able to accept your pull requests.
-
-## Contributor Code of Conduct
-
-As contributors and maintainers of this project,
-and in the interest of fostering an open and welcoming community,
-we pledge to respect all people who contribute through reporting issues,
-posting feature requests, updating documentation,
-submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project
-a harassment-free experience for everyone,
-regardless of level of experience, gender, gender identity and expression,
-sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information,
-such as physical or electronic
-addresses, without explicit permission
-* Other unethical or unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct.
-By adopting this Code of Conduct,
-project maintainers commit themselves to fairly and consistently
-applying these principles to every aspect of managing this project.
-Project maintainers who do not follow or enforce the Code of Conduct
-may be permanently removed from the project team.
-
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior
-may be reported by opening an issue
-or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0,
-available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
-
-[indvcla]: https://developers.google.com/open-source/cla/individual
-[corpcla]: https://developers.google.com/open-source/cla/corporate
diff --git a/vendor/google.golang.org/appengine/LICENSE b/vendor/google.golang.org/appengine/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/vendor/google.golang.org/appengine/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/google.golang.org/appengine/README.md b/vendor/google.golang.org/appengine/README.md
deleted file mode 100644
index d86768a2c6..0000000000
--- a/vendor/google.golang.org/appengine/README.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# Go App Engine packages
-
-[![Build Status](https://travis-ci.org/golang/appengine.svg)](https://travis-ci.org/golang/appengine)
-
-This repository supports the Go runtime on *App Engine standard*.
-It provides APIs for interacting with App Engine services.
-Its canonical import path is `google.golang.org/appengine`.
-
-See https://cloud.google.com/appengine/docs/go/
-for more information.
-
-File issue reports and feature requests on the [GitHub's issue
-tracker](https://github.com/golang/appengine/issues).
-
-## Upgrading an App Engine app to the flexible environment
-
-This package does not work on *App Engine flexible*.
-
-There are many differences between the App Engine standard environment and
-the flexible environment.
-
-See the [documentation on upgrading to the flexible environment](https://cloud.google.com/appengine/docs/flexible/go/upgrading).
-
-## Directory structure
-
-The top level directory of this repository is the `appengine` package. It
-contains the
-basic APIs (e.g. `appengine.NewContext`) that apply across APIs. Specific API
-packages are in subdirectories (e.g. `datastore`).
-
-There is an `internal` subdirectory that contains service protocol buffers,
-plus packages required for connectivity to make API calls. App Engine apps
-should not directly import any package under `internal`.
-
-## Updating from legacy (`import "appengine"`) packages
-
-If you're currently using the bare `appengine` packages
-(that is, not these ones, imported via `google.golang.org/appengine`),
-then you can use the `aefix` tool to help automate an upgrade to these packages.
-
-Run `go get google.golang.org/appengine/cmd/aefix` to install it.
-
-### 1. Update import paths
-
-The import paths for App Engine packages are now fully qualified, based at `google.golang.org/appengine`.
-You will need to update your code to use import paths starting with that; for instance,
-code importing `appengine/datastore` will now need to import `google.golang.org/appengine/datastore`.
-
-### 2. Update code using deprecated, removed or modified APIs
-
-Most App Engine services are available with exactly the same API.
-A few APIs were cleaned up, and there are some differences:
-
-* `appengine.Context` has been replaced with the `Context` type from `golang.org/x/net/context`.
-* Logging methods that were on `appengine.Context` are now functions in `google.golang.org/appengine/log`.
-* `appengine.Timeout` has been removed. Use `context.WithTimeout` instead.
-* `appengine.Datacenter` now takes a `context.Context` argument.
-* `datastore.PropertyLoadSaver` has been simplified to use slices in place of channels.
-* `delay.Call` now returns an error.
-* `search.FieldLoadSaver` now handles document metadata.
-* `urlfetch.Transport` no longer has a Deadline field; set a deadline on the
-  `context.Context` instead.
-* `aetest` no longer declares its own Context type, and uses the standard one instead.
-* `taskqueue.QueueStats` no longer takes a maxTasks argument. That argument has been
-  deprecated and unused for a long time.
-* `appengine.BackendHostname` and `appengine.BackendInstance` were for the deprecated backends feature.
-  Use `appengine.ModuleHostname`and `appengine.ModuleName` instead.
-* Most of `appengine/file` and parts of `appengine/blobstore` are deprecated.
-  Use [Google Cloud Storage](https://godoc.org/cloud.google.com/go/storage) if the
-  feature you require is not present in the new
-  [blobstore package](https://google.golang.org/appengine/blobstore).
-* `appengine/socket` is not required on App Engine flexible environment / Managed VMs.
-  Use the standard `net` package instead.
diff --git a/vendor/google.golang.org/appengine/appengine.go b/vendor/google.golang.org/appengine/appengine.go
deleted file mode 100644
index d4f808442b..0000000000
--- a/vendor/google.golang.org/appengine/appengine.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2011 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// Package appengine provides basic functionality for Google App Engine.
-//
-// For more information on how to write Go apps for Google App Engine, see:
-// https://cloud.google.com/appengine/docs/go/
-package appengine // import "google.golang.org/appengine"
-
-import (
-	"net/http"
-
-	"github.com/golang/protobuf/proto"
-	"golang.org/x/net/context"
-
-	"google.golang.org/appengine/internal"
-)
-
-// The gophers party all night; the rabbits provide the beats.
-
-// Main is the principal entry point for an app running in App Engine.
-//
-// On App Engine Flexible it installs a trivial health checker if one isn't
-// already registered, and starts listening on port 8080 (overridden by the
-// $PORT environment variable).
-//
-// See https://cloud.google.com/appengine/docs/flexible/custom-runtimes#health_check_requests
-// for details on how to do your own health checking.
-//
-// On App Engine Standard it ensures the server has started and is prepared to
-// receive requests.
-//
-// Main never returns.
-//
-// Main is designed so that the app's main package looks like this:
-//
-//      package main
-//
-//      import (
-//              "google.golang.org/appengine"
-//
-//              _ "myapp/package0"
-//              _ "myapp/package1"
-//      )
-//
-//      func main() {
-//              appengine.Main()
-//      }
-//
-// The "myapp/packageX" packages are expected to register HTTP handlers
-// in their init functions.
-func Main() {
-	internal.Main()
-}
-
-// IsDevAppServer reports whether the App Engine app is running in the
-// development App Server.
-func IsDevAppServer() bool {
-	return internal.IsDevAppServer()
-}
-
-// NewContext returns a context for an in-flight HTTP request.
-// This function is cheap.
-func NewContext(req *http.Request) context.Context {
-	return WithContext(context.Background(), req)
-}
-
-// WithContext returns a copy of the parent context
-// and associates it with an in-flight HTTP request.
-// This function is cheap.
-func WithContext(parent context.Context, req *http.Request) context.Context {
-	return internal.WithContext(parent, req)
-}
-
-// TODO(dsymonds): Add a Call function here? Otherwise other packages can't access internal.Call.
-
-// BlobKey is a key for a blobstore blob.
-//
-// Conceptually, this type belongs in the blobstore package, but it lives in
-// the appengine package to avoid a circular dependency: blobstore depends on
-// datastore, and datastore needs to refer to the BlobKey type.
-type BlobKey string
-
-// GeoPoint represents a location as latitude/longitude in degrees.
-type GeoPoint struct {
-	Lat, Lng float64
-}
-
-// Valid returns whether a GeoPoint is within [-90, 90] latitude and [-180, 180] longitude.
-func (g GeoPoint) Valid() bool {
-	return -90 <= g.Lat && g.Lat <= 90 && -180 <= g.Lng && g.Lng <= 180
-}
-
-// APICallFunc defines a function type for handling an API call.
-// See WithCallOverride.
-type APICallFunc func(ctx context.Context, service, method string, in, out proto.Message) error
-
-// WithAPICallFunc returns a copy of the parent context
-// that will cause API calls to invoke f instead of their normal operation.
-//
-// This is intended for advanced users only.
-func WithAPICallFunc(ctx context.Context, f APICallFunc) context.Context {
-	return internal.WithCallOverride(ctx, internal.CallOverrideFunc(f))
-}
-
-// APICall performs an API call.
-//
-// This is not intended for general use; it is exported for use in conjunction
-// with WithAPICallFunc.
-func APICall(ctx context.Context, service, method string, in, out proto.Message) error {
-	return internal.Call(ctx, service, method, in, out)
-}
diff --git a/vendor/google.golang.org/appengine/appengine_vm.go b/vendor/google.golang.org/appengine/appengine_vm.go
deleted file mode 100644
index f4b645aad3..0000000000
--- a/vendor/google.golang.org/appengine/appengine_vm.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build !appengine
-
-package appengine
-
-import (
-	"golang.org/x/net/context"
-
-	"google.golang.org/appengine/internal"
-)
-
-// BackgroundContext returns a context not associated with a request.
-// This should only be used when not servicing a request.
-// This only works in App Engine "flexible environment".
-func BackgroundContext() context.Context {
-	return internal.BackgroundContext()
-}
diff --git a/vendor/google.golang.org/appengine/errors.go b/vendor/google.golang.org/appengine/errors.go
deleted file mode 100644
index 16d0772e2a..0000000000
--- a/vendor/google.golang.org/appengine/errors.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2011 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// This file provides error functions for common API failure modes.
-
-package appengine
-
-import (
-	"fmt"
-
-	"google.golang.org/appengine/internal"
-)
-
-// IsOverQuota reports whether err represents an API call failure
-// due to insufficient available quota.
-func IsOverQuota(err error) bool {
-	callErr, ok := err.(*internal.CallError)
-	return ok && callErr.Code == 4
-}
-
-// MultiError is returned by batch operations when there are errors with
-// particular elements. Errors will be in a one-to-one correspondence with
-// the input elements; successful elements will have a nil entry.
-type MultiError []error
-
-func (m MultiError) Error() string {
-	s, n := "", 0
-	for _, e := range m {
-		if e != nil {
-			if n == 0 {
-				s = e.Error()
-			}
-			n++
-		}
-	}
-	switch n {
-	case 0:
-		return "(0 errors)"
-	case 1:
-		return s
-	case 2:
-		return s + " (and 1 other error)"
-	}
-	return fmt.Sprintf("%s (and %d other errors)", s, n-1)
-}
diff --git a/vendor/google.golang.org/appengine/identity.go b/vendor/google.golang.org/appengine/identity.go
deleted file mode 100644
index b8dcf8f361..0000000000
--- a/vendor/google.golang.org/appengine/identity.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2011 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package appengine
-
-import (
-	"time"
-
-	"golang.org/x/net/context"
-
-	"google.golang.org/appengine/internal"
-	pb "google.golang.org/appengine/internal/app_identity"
-	modpb "google.golang.org/appengine/internal/modules"
-)
-
-// AppID returns the application ID for the current application.
-// The string will be a plain application ID (e.g. "appid"), with a
-// domain prefix for custom domain deployments (e.g. "example.com:appid").
-func AppID(c context.Context) string { return internal.AppID(c) }
-
-// DefaultVersionHostname returns the standard hostname of the default version
-// of the current application (e.g. "my-app.appspot.com"). This is suitable for
-// use in constructing URLs.
-func DefaultVersionHostname(c context.Context) string {
-	return internal.DefaultVersionHostname(c)
-}
-
-// ModuleName returns the module name of the current instance.
-func ModuleName(c context.Context) string {
-	return internal.ModuleName(c)
-}
-
-// ModuleHostname returns a hostname of a module instance.
-// If module is the empty string, it refers to the module of the current instance.
-// If version is empty, it refers to the version of the current instance if valid,
-// or the default version of the module of the current instance.
-// If instance is empty, ModuleHostname returns the load-balancing hostname.
-func ModuleHostname(c context.Context, module, version, instance string) (string, error) {
-	req := &modpb.GetHostnameRequest{}
-	if module != "" {
-		req.Module = &module
-	}
-	if version != "" {
-		req.Version = &version
-	}
-	if instance != "" {
-		req.Instance = &instance
-	}
-	res := &modpb.GetHostnameResponse{}
-	if err := internal.Call(c, "modules", "GetHostname", req, res); err != nil {
-		return "", err
-	}
-	return *res.Hostname, nil
-}
-
-// VersionID returns the version ID for the current application.
-// It will be of the form "X.Y", where X is specified in app.yaml,
-// and Y is a number generated when each version of the app is uploaded.
-// It does not include a module name.
-func VersionID(c context.Context) string { return internal.VersionID(c) }
-
-// InstanceID returns a mostly-unique identifier for this instance.
-func InstanceID() string { return internal.InstanceID() }
-
-// Datacenter returns an identifier for the datacenter that the instance is running in.
-func Datacenter(c context.Context) string { return internal.Datacenter(c) }
-
-// ServerSoftware returns the App Engine release version.
-// In production, it looks like "Google App Engine/X.Y.Z".
-// In the development appserver, it looks like "Development/X.Y".
-func ServerSoftware() string { return internal.ServerSoftware() }
-
-// RequestID returns a string that uniquely identifies the request.
-func RequestID(c context.Context) string { return internal.RequestID(c) }
-
-// AccessToken generates an OAuth2 access token for the specified scopes on
-// behalf of service account of this application. This token will expire after
-// the returned time.
-func AccessToken(c context.Context, scopes ...string) (token string, expiry time.Time, err error) {
-	req := &pb.GetAccessTokenRequest{Scope: scopes}
-	res := &pb.GetAccessTokenResponse{}
-
-	err = internal.Call(c, "app_identity_service", "GetAccessToken", req, res)
-	if err != nil {
-		return "", time.Time{}, err
-	}
-	return res.GetAccessToken(), time.Unix(res.GetExpirationTime(), 0), nil
-}
-
-// Certificate represents a public certificate for the app.
-type Certificate struct {
-	KeyName string
-	Data    []byte // PEM-encoded X.509 certificate
-}
-
-// PublicCertificates retrieves the public certificates for the app.
-// They can be used to verify a signature returned by SignBytes.
-func PublicCertificates(c context.Context) ([]Certificate, error) {
-	req := &pb.GetPublicCertificateForAppRequest{}
-	res := &pb.GetPublicCertificateForAppResponse{}
-	if err := internal.Call(c, "app_identity_service", "GetPublicCertificatesForApp", req, res); err != nil {
-		return nil, err
-	}
-	var cs []Certificate
-	for _, pc := range res.PublicCertificateList {
-		cs = append(cs, Certificate{
-			KeyName: pc.GetKeyName(),
-			Data:    []byte(pc.GetX509CertificatePem()),
-		})
-	}
-	return cs, nil
-}
-
-// ServiceAccount returns a string representing the service account name, in
-// the form of an email address (typically app_id@appspot.gserviceaccount.com).
-func ServiceAccount(c context.Context) (string, error) {
-	req := &pb.GetServiceAccountNameRequest{}
-	res := &pb.GetServiceAccountNameResponse{}
-
-	err := internal.Call(c, "app_identity_service", "GetServiceAccountName", req, res)
-	if err != nil {
-		return "", err
-	}
-	return res.GetServiceAccountName(), err
-}
-
-// SignBytes signs bytes using a private key unique to your application.
-func SignBytes(c context.Context, bytes []byte) (keyName string, signature []byte, err error) {
-	req := &pb.SignForAppRequest{BytesToSign: bytes}
-	res := &pb.SignForAppResponse{}
-
-	if err := internal.Call(c, "app_identity_service", "SignForApp", req, res); err != nil {
-		return "", nil, err
-	}
-	return res.GetKeyName(), res.GetSignatureBytes(), nil
-}
-
-func init() {
-	internal.RegisterErrorCodeMap("app_identity_service", pb.AppIdentityServiceError_ErrorCode_name)
-	internal.RegisterErrorCodeMap("modules", modpb.ModulesServiceError_ErrorCode_name)
-}
diff --git a/vendor/google.golang.org/appengine/internal/api.go b/vendor/google.golang.org/appengine/internal/api.go
deleted file mode 100644
index efee06090f..0000000000
--- a/vendor/google.golang.org/appengine/internal/api.go
+++ /dev/null
@@ -1,677 +0,0 @@
-// Copyright 2011 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build !appengine
-
-package internal
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/golang/protobuf/proto"
-	netcontext "golang.org/x/net/context"
-
-	basepb "google.golang.org/appengine/internal/base"
-	logpb "google.golang.org/appengine/internal/log"
-	remotepb "google.golang.org/appengine/internal/remote_api"
-)
-
-const (
-	apiPath             = "/rpc_http"
-	defaultTicketSuffix = "/default.20150612t184001.0"
-)
-
-var (
-	// Incoming headers.
-	ticketHeader       = http.CanonicalHeaderKey("X-AppEngine-API-Ticket")
-	dapperHeader       = http.CanonicalHeaderKey("X-Google-DapperTraceInfo")
-	traceHeader        = http.CanonicalHeaderKey("X-Cloud-Trace-Context")
-	curNamespaceHeader = http.CanonicalHeaderKey("X-AppEngine-Current-Namespace")
-	userIPHeader       = http.CanonicalHeaderKey("X-AppEngine-User-IP")
-	remoteAddrHeader   = http.CanonicalHeaderKey("X-AppEngine-Remote-Addr")
-
-	// Outgoing headers.
-	apiEndpointHeader      = http.CanonicalHeaderKey("X-Google-RPC-Service-Endpoint")
-	apiEndpointHeaderValue = []string{"app-engine-apis"}
-	apiMethodHeader        = http.CanonicalHeaderKey("X-Google-RPC-Service-Method")
-	apiMethodHeaderValue   = []string{"/VMRemoteAPI.CallRemoteAPI"}
-	apiDeadlineHeader      = http.CanonicalHeaderKey("X-Google-RPC-Service-Deadline")
-	apiContentType         = http.CanonicalHeaderKey("Content-Type")
-	apiContentTypeValue    = []string{"application/octet-stream"}
-	logFlushHeader         = http.CanonicalHeaderKey("X-AppEngine-Log-Flush-Count")
-
-	apiHTTPClient = &http.Client{
-		Transport: &http.Transport{
-			Proxy: http.ProxyFromEnvironment,
-			Dial:  limitDial,
-		},
-	}
-
-	defaultTicketOnce sync.Once
-	defaultTicket     string
-)
-
-func apiURL() *url.URL {
-	host, port := "appengine.googleapis.internal", "10001"
-	if h := os.Getenv("API_HOST"); h != "" {
-		host = h
-	}
-	if p := os.Getenv("API_PORT"); p != "" {
-		port = p
-	}
-	return &url.URL{
-		Scheme: "http",
-		Host:   host + ":" + port,
-		Path:   apiPath,
-	}
-}
-
-func handleHTTP(w http.ResponseWriter, r *http.Request) {
-	c := &context{
-		req:       r,
-		outHeader: w.Header(),
-		apiURL:    apiURL(),
-	}
-	stopFlushing := make(chan int)
-
-	ctxs.Lock()
-	ctxs.m[r] = c
-	ctxs.Unlock()
-	defer func() {
-		ctxs.Lock()
-		delete(ctxs.m, r)
-		ctxs.Unlock()
-	}()
-
-	// Patch up RemoteAddr so it looks reasonable.
-	if addr := r.Header.Get(userIPHeader); addr != "" {
-		r.RemoteAddr = addr
-	} else if addr = r.Header.Get(remoteAddrHeader); addr != "" {
-		r.RemoteAddr = addr
-	} else {
-		// Should not normally reach here, but pick a sensible default anyway.
-		r.RemoteAddr = "127.0.0.1"
-	}
-	// The address in the headers will most likely be of these forms:
-	//	123.123.123.123
-	//	2001:db8::1
-	// net/http.Request.RemoteAddr is specified to be in "IP:port" form.
-	if _, _, err := net.SplitHostPort(r.RemoteAddr); err != nil {
-		// Assume the remote address is only a host; add a default port.
-		r.RemoteAddr = net.JoinHostPort(r.RemoteAddr, "80")
-	}
-
-	// Start goroutine responsible for flushing app logs.
-	// This is done after adding c to ctx.m (and stopped before removing it)
-	// because flushing logs requires making an API call.
-	go c.logFlusher(stopFlushing)
-
-	executeRequestSafely(c, r)
-	c.outHeader = nil // make sure header changes aren't respected any more
-
-	stopFlushing <- 1 // any logging beyond this point will be dropped
-
-	// Flush any pending logs asynchronously.
-	c.pendingLogs.Lock()
-	flushes := c.pendingLogs.flushes
-	if len(c.pendingLogs.lines) > 0 {
-		flushes++
-	}
-	c.pendingLogs.Unlock()
-	go c.flushLog(false)
-	w.Header().Set(logFlushHeader, strconv.Itoa(flushes))
-
-	// Avoid nil Write call if c.Write is never called.
-	if c.outCode != 0 {
-		w.WriteHeader(c.outCode)
-	}
-	if c.outBody != nil {
-		w.Write(c.outBody)
-	}
-}
-
-func executeRequestSafely(c *context, r *http.Request) {
-	defer func() {
-		if x := recover(); x != nil {
-			logf(c, 4, "%s", renderPanic(x)) // 4 == critical
-			c.outCode = 500
-		}
-	}()
-
-	http.DefaultServeMux.ServeHTTP(c, r)
-}
-
-func renderPanic(x interface{}) string {
-	buf := make([]byte, 16<<10) // 16 KB should be plenty
-	buf = buf[:runtime.Stack(buf, false)]
-
-	// Remove the first few stack frames:
-	//   this func
-	//   the recover closure in the caller
-	// That will root the stack trace at the site of the panic.
-	const (
-		skipStart  = "internal.renderPanic"
-		skipFrames = 2
-	)
-	start := bytes.Index(buf, []byte(skipStart))
-	p := start
-	for i := 0; i < skipFrames*2 && p+1 < len(buf); i++ {
-		p = bytes.IndexByte(buf[p+1:], '\n') + p + 1
-		if p < 0 {
-			break
-		}
-	}
-	if p >= 0 {
-		// buf[start:p+1] is the block to remove.
-		// Copy buf[p+1:] over buf[start:] and shrink buf.
-		copy(buf[start:], buf[p+1:])
-		buf = buf[:len(buf)-(p+1-start)]
-	}
-
-	// Add panic heading.
-	head := fmt.Sprintf("panic: %v\n\n", x)
-	if len(head) > len(buf) {
-		// Extremely unlikely to happen.
-		return head
-	}
-	copy(buf[len(head):], buf)
-	copy(buf, head)
-
-	return string(buf)
-}
-
-var ctxs = struct {
-	sync.Mutex
-	m  map[*http.Request]*context
-	bg *context // background context, lazily initialized
-	// dec is used by tests to decorate the netcontext.Context returned
-	// for a given request. This allows tests to add overrides (such as
-	// WithAppIDOverride) to the context. The map is nil outside tests.
-	dec map[*http.Request]func(netcontext.Context) netcontext.Context
-}{
-	m: make(map[*http.Request]*context),
-}
-
-// context represents the context of an in-flight HTTP request.
-// It implements the appengine.Context and http.ResponseWriter interfaces.
-type context struct {
-	req *http.Request
-
-	outCode   int
-	outHeader http.Header
-	outBody   []byte
-
-	pendingLogs struct {
-		sync.Mutex
-		lines   []*logpb.UserAppLogLine
-		flushes int
-	}
-
-	apiURL *url.URL
-}
-
-var contextKey = "holds a *context"
-
-// fromContext returns the App Engine context or nil if ctx is not
-// derived from an App Engine context.
-func fromContext(ctx netcontext.Context) *context {
-	c, _ := ctx.Value(&contextKey).(*context)
-	return c
-}
-
-func withContext(parent netcontext.Context, c *context) netcontext.Context {
-	ctx := netcontext.WithValue(parent, &contextKey, c)
-	if ns := c.req.Header.Get(curNamespaceHeader); ns != "" {
-		ctx = withNamespace(ctx, ns)
-	}
-	return ctx
-}
-
-func toContext(c *context) netcontext.Context {
-	return withContext(netcontext.Background(), c)
-}
-
-func IncomingHeaders(ctx netcontext.Context) http.Header {
-	if c := fromContext(ctx); c != nil {
-		return c.req.Header
-	}
-	return nil
-}
-
-func WithContext(parent netcontext.Context, req *http.Request) netcontext.Context {
-	ctxs.Lock()
-	c := ctxs.m[req]
-	d := ctxs.dec[req]
-	ctxs.Unlock()
-
-	if d != nil {
-		parent = d(parent)
-	}
-
-	if c == nil {
-		// Someone passed in an http.Request that is not in-flight.
-		// We panic here rather than panicking at a later point
-		// so that stack traces will be more sensible.
-		log.Panic("appengine: NewContext passed an unknown http.Request")
-	}
-	return withContext(parent, c)
-}
-
-// DefaultTicket returns a ticket used for background context or dev_appserver.
-func DefaultTicket() string {
-	defaultTicketOnce.Do(func() {
-		if IsDevAppServer() {
-			defaultTicket = "testapp" + defaultTicketSuffix
-			return
-		}
-		appID := partitionlessAppID()
-		escAppID := strings.Replace(strings.Replace(appID, ":", "_", -1), ".", "_", -1)
-		majVersion := VersionID(nil)
-		if i := strings.Index(majVersion, "."); i > 0 {
-			majVersion = majVersion[:i]
-		}
-		defaultTicket = fmt.Sprintf("%s/%s.%s.%s", escAppID, ModuleName(nil), majVersion, InstanceID())
-	})
-	return defaultTicket
-}
-
-func BackgroundContext() netcontext.Context {
-	ctxs.Lock()
-	defer ctxs.Unlock()
-
-	if ctxs.bg != nil {
-		return toContext(ctxs.bg)
-	}
-
-	// Compute background security ticket.
-	ticket := DefaultTicket()
-
-	ctxs.bg = &context{
-		req: &http.Request{
-			Header: http.Header{
-				ticketHeader: []string{ticket},
-			},
-		},
-		apiURL: apiURL(),
-	}
-
-	// TODO(dsymonds): Wire up the shutdown handler to do a final flush.
-	go ctxs.bg.logFlusher(make(chan int))
-
-	return toContext(ctxs.bg)
-}
-
-// RegisterTestRequest registers the HTTP request req for testing, such that
-// any API calls are sent to the provided URL. It returns a closure to delete
-// the registration.
-// It should only be used by aetest package.
-func RegisterTestRequest(req *http.Request, apiURL *url.URL, decorate func(netcontext.Context) netcontext.Context) func() {
-	c := &context{
-		req:    req,
-		apiURL: apiURL,
-	}
-	ctxs.Lock()
-	defer ctxs.Unlock()
-	if _, ok := ctxs.m[req]; ok {
-		log.Panic("req already associated with context")
-	}
-	if _, ok := ctxs.dec[req]; ok {
-		log.Panic("req already associated with context")
-	}
-	if ctxs.dec == nil {
-		ctxs.dec = make(map[*http.Request]func(netcontext.Context) netcontext.Context)
-	}
-	ctxs.m[req] = c
-	ctxs.dec[req] = decorate
-
-	return func() {
-		ctxs.Lock()
-		delete(ctxs.m, req)
-		delete(ctxs.dec, req)
-		ctxs.Unlock()
-	}
-}
-
-var errTimeout = &CallError{
-	Detail:  "Deadline exceeded",
-	Code:    int32(remotepb.RpcError_CANCELLED),
-	Timeout: true,
-}
-
-func (c *context) Header() http.Header { return c.outHeader }
-
-// Copied from $GOROOT/src/pkg/net/http/transfer.go. Some response status
-// codes do not permit a response body (nor response entity headers such as
-// Content-Length, Content-Type, etc).
-func bodyAllowedForStatus(status int) bool {
-	switch {
-	case status >= 100 && status <= 199:
-		return false
-	case status == 204:
-		return false
-	case status == 304:
-		return false
-	}
-	return true
-}
-
-func (c *context) Write(b []byte) (int, error) {
-	if c.outCode == 0 {
-		c.WriteHeader(http.StatusOK)
-	}
-	if len(b) > 0 && !bodyAllowedForStatus(c.outCode) {
-		return 0, http.ErrBodyNotAllowed
-	}
-	c.outBody = append(c.outBody, b...)
-	return len(b), nil
-}
-
-func (c *context) WriteHeader(code int) {
-	if c.outCode != 0 {
-		logf(c, 3, "WriteHeader called multiple times on request.") // error level
-		return
-	}
-	c.outCode = code
-}
-
-func (c *context) post(body []byte, timeout time.Duration) (b []byte, err error) {
-	hreq := &http.Request{
-		Method: "POST",
-		URL:    c.apiURL,
-		Header: http.Header{
-			apiEndpointHeader: apiEndpointHeaderValue,
-			apiMethodHeader:   apiMethodHeaderValue,
-			apiContentType:    apiContentTypeValue,
-			apiDeadlineHeader: []string{strconv.FormatFloat(timeout.Seconds(), 'f', -1, 64)},
-		},
-		Body:          ioutil.NopCloser(bytes.NewReader(body)),
-		ContentLength: int64(len(body)),
-		Host:          c.apiURL.Host,
-	}
-	if info := c.req.Header.Get(dapperHeader); info != "" {
-		hreq.Header.Set(dapperHeader, info)
-	}
-	if info := c.req.Header.Get(traceHeader); info != "" {
-		hreq.Header.Set(traceHeader, info)
-	}
-
-	tr := apiHTTPClient.Transport.(*http.Transport)
-
-	var timedOut int32 // atomic; set to 1 if timed out
-	t := time.AfterFunc(timeout, func() {
-		atomic.StoreInt32(&timedOut, 1)
-		tr.CancelRequest(hreq)
-	})
-	defer t.Stop()
-	defer func() {
-		// Check if timeout was exceeded.
-		if atomic.LoadInt32(&timedOut) != 0 {
-			err = errTimeout
-		}
-	}()
-
-	hresp, err := apiHTTPClient.Do(hreq)
-	if err != nil {
-		return nil, &CallError{
-			Detail: fmt.Sprintf("service bridge HTTP failed: %v", err),
-			Code:   int32(remotepb.RpcError_UNKNOWN),
-		}
-	}
-	defer hresp.Body.Close()
-	hrespBody, err := ioutil.ReadAll(hresp.Body)
-	if hresp.StatusCode != 200 {
-		return nil, &CallError{
-			Detail: fmt.Sprintf("service bridge returned HTTP %d (%q)", hresp.StatusCode, hrespBody),
-			Code:   int32(remotepb.RpcError_UNKNOWN),
-		}
-	}
-	if err != nil {
-		return nil, &CallError{
-			Detail: fmt.Sprintf("service bridge response bad: %v", err),
-			Code:   int32(remotepb.RpcError_UNKNOWN),
-		}
-	}
-	return hrespBody, nil
-}
-
-func Call(ctx netcontext.Context, service, method string, in, out proto.Message) error {
-	if ns := NamespaceFromContext(ctx); ns != "" {
-		if fn, ok := NamespaceMods[service]; ok {
-			fn(in, ns)
-		}
-	}
-
-	if f, ctx, ok := callOverrideFromContext(ctx); ok {
-		return f(ctx, service, method, in, out)
-	}
-
-	// Handle already-done contexts quickly.
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-	}
-
-	c := fromContext(ctx)
-	if c == nil {
-		// Give a good error message rather than a panic lower down.
-		return errNotAppEngineContext
-	}
-
-	// Apply transaction modifications if we're in a transaction.
-	if t := transactionFromContext(ctx); t != nil {
-		if t.finished {
-			return errors.New("transaction context has expired")
-		}
-		applyTransaction(in, &t.transaction)
-	}
-
-	// Default RPC timeout is 60s.
-	timeout := 60 * time.Second
-	if deadline, ok := ctx.Deadline(); ok {
-		timeout = deadline.Sub(time.Now())
-	}
-
-	data, err := proto.Marshal(in)
-	if err != nil {
-		return err
-	}
-
-	ticket := c.req.Header.Get(ticketHeader)
-	// Use a test ticket under test environment.
-	if ticket == "" {
-		if appid := ctx.Value(&appIDOverrideKey); appid != nil {
-			ticket = appid.(string) + defaultTicketSuffix
-		}
-	}
-	// Fall back to use background ticket when the request ticket is not available in Flex or dev_appserver.
-	if ticket == "" {
-		ticket = DefaultTicket()
-	}
-	req := &remotepb.Request{
-		ServiceName: &service,
-		Method:      &method,
-		Request:     data,
-		RequestId:   &ticket,
-	}
-	hreqBody, err := proto.Marshal(req)
-	if err != nil {
-		return err
-	}
-
-	hrespBody, err := c.post(hreqBody, timeout)
-	if err != nil {
-		return err
-	}
-
-	res := &remotepb.Response{}
-	if err := proto.Unmarshal(hrespBody, res); err != nil {
-		return err
-	}
-	if res.RpcError != nil {
-		ce := &CallError{
-			Detail: res.RpcError.GetDetail(),
-			Code:   *res.RpcError.Code,
-		}
-		switch remotepb.RpcError_ErrorCode(ce.Code) {
-		case remotepb.RpcError_CANCELLED, remotepb.RpcError_DEADLINE_EXCEEDED:
-			ce.Timeout = true
-		}
-		return ce
-	}
-	if res.ApplicationError != nil {
-		return &APIError{
-			Service: *req.ServiceName,
-			Detail:  res.ApplicationError.GetDetail(),
-			Code:    *res.ApplicationError.Code,
-		}
-	}
-	if res.Exception != nil || res.JavaException != nil {
-		// This shouldn't happen, but let's be defensive.
-		return &CallError{
-			Detail: "service bridge returned exception",
-			Code:   int32(remotepb.RpcError_UNKNOWN),
-		}
-	}
-	return proto.Unmarshal(res.Response, out)
-}
-
-func (c *context) Request() *http.Request {
-	return c.req
-}
-
-func (c *context) addLogLine(ll *logpb.UserAppLogLine) {
-	// Truncate long log lines.
-	// TODO(dsymonds): Check if this is still necessary.
-	const lim = 8 << 10
-	if len(*ll.Message) > lim {
-		suffix := fmt.Sprintf("...(length %d)", len(*ll.Message))
-		ll.Message = proto.String((*ll.Message)[:lim-len(suffix)] + suffix)
-	}
-
-	c.pendingLogs.Lock()
-	c.pendingLogs.lines = append(c.pendingLogs.lines, ll)
-	c.pendingLogs.Unlock()
-}
-
-var logLevelName = map[int64]string{
-	0: "DEBUG",
-	1: "INFO",
-	2: "WARNING",
-	3: "ERROR",
-	4: "CRITICAL",
-}
-
-func logf(c *context, level int64, format string, args ...interface{}) {
-	if c == nil {
-		panic("not an App Engine context")
-	}
-	s := fmt.Sprintf(format, args...)
-	s = strings.TrimRight(s, "\n") // Remove any trailing newline characters.
-	c.addLogLine(&logpb.UserAppLogLine{
-		TimestampUsec: proto.Int64(time.Now().UnixNano() / 1e3),
-		Level:         &level,
-		Message:       &s,
-	})
-	log.Print(logLevelName[level] + ": " + s)
-}
-
-// flushLog attempts to flush any pending logs to the appserver.
-// It should not be called concurrently.
-func (c *context) flushLog(force bool) (flushed bool) {
-	c.pendingLogs.Lock()
-	// Grab up to 30 MB. We can get away with up to 32 MB, but let's be cautious.
-	n, rem := 0, 30<<20
-	for ; n < len(c.pendingLogs.lines); n++ {
-		ll := c.pendingLogs.lines[n]
-		// Each log line will require about 3 bytes of overhead.
-		nb := proto.Size(ll) + 3
-		if nb > rem {
-			break
-		}
-		rem -= nb
-	}
-	lines := c.pendingLogs.lines[:n]
-	c.pendingLogs.lines = c.pendingLogs.lines[n:]
-	c.pendingLogs.Unlock()
-
-	if len(lines) == 0 && !force {
-		// Nothing to flush.
-		return false
-	}
-
-	rescueLogs := false
-	defer func() {
-		if rescueLogs {
-			c.pendingLogs.Lock()
-			c.pendingLogs.lines = append(lines, c.pendingLogs.lines...)
-			c.pendingLogs.Unlock()
-		}
-	}()
-
-	buf, err := proto.Marshal(&logpb.UserAppLogGroup{
-		LogLine: lines,
-	})
-	if err != nil {
-		log.Printf("internal.flushLog: marshaling UserAppLogGroup: %v", err)
-		rescueLogs = true
-		return false
-	}
-
-	req := &logpb.FlushRequest{
-		Logs: buf,
-	}
-	res := &basepb.VoidProto{}
-	c.pendingLogs.Lock()
-	c.pendingLogs.flushes++
-	c.pendingLogs.Unlock()
-	if err := Call(toContext(c), "logservice", "Flush", req, res); err != nil {
-		log.Printf("internal.flushLog: Flush RPC: %v", err)
-		rescueLogs = true
-		return false
-	}
-	return true
-}
-
-const (
-	// Log flushing parameters.
-	flushInterval      = 1 * time.Second
-	forceFlushInterval = 60 * time.Second
-)
-
-func (c *context) logFlusher(stop <-chan int) {
-	lastFlush := time.Now()
-	tick := time.NewTicker(flushInterval)
-	for {
-		select {
-		case <-stop:
-			// Request finished.
-			tick.Stop()
-			return
-		case <-tick.C:
-			force := time.Now().Sub(lastFlush) > forceFlushInterval
-			if c.flushLog(force) {
-				lastFlush = time.Now()
-			}
-		}
-	}
-}
-
-func ContextForTesting(req *http.Request) netcontext.Context {
-	return toContext(&context{req: req})
-}
diff --git a/vendor/google.golang.org/appengine/internal/api_classic.go b/vendor/google.golang.org/appengine/internal/api_classic.go
deleted file mode 100644
index 952b6e6682..0000000000
--- a/vendor/google.golang.org/appengine/internal/api_classic.go
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-package internal
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"time"
-
-	"appengine"
-	"appengine_internal"
-	basepb "appengine_internal/base"
-
-	"github.com/golang/protobuf/proto"
-	netcontext "golang.org/x/net/context"
-)
-
-var contextKey = "holds an appengine.Context"
-
-// fromContext returns the App Engine context or nil if ctx is not
-// derived from an App Engine context.
-func fromContext(ctx netcontext.Context) appengine.Context {
-	c, _ := ctx.Value(&contextKey).(appengine.Context)
-	return c
-}
-
-// This is only for classic App Engine adapters.
-func ClassicContextFromContext(ctx netcontext.Context) (appengine.Context, error) {
-	c := fromContext(ctx)
-	if c == nil {
-		return nil, errNotAppEngineContext
-	}
-	return c, nil
-}
-
-func withContext(parent netcontext.Context, c appengine.Context) netcontext.Context {
-	ctx := netcontext.WithValue(parent, &contextKey, c)
-
-	s := &basepb.StringProto{}
-	c.Call("__go__", "GetNamespace", &basepb.VoidProto{}, s, nil)
-	if ns := s.GetValue(); ns != "" {
-		ctx = NamespacedContext(ctx, ns)
-	}
-
-	return ctx
-}
-
-func IncomingHeaders(ctx netcontext.Context) http.Header {
-	if c := fromContext(ctx); c != nil {
-		if req, ok := c.Request().(*http.Request); ok {
-			return req.Header
-		}
-	}
-	return nil
-}
-
-func WithContext(parent netcontext.Context, req *http.Request) netcontext.Context {
-	c := appengine.NewContext(req)
-	return withContext(parent, c)
-}
-
-type testingContext struct {
-	appengine.Context
-
-	req *http.Request
-}
-
-func (t *testingContext) FullyQualifiedAppID() string { return "dev~testcontext" }
-func (t *testingContext) Call(service, method string, _, _ appengine_internal.ProtoMessage, _ *appengine_internal.CallOptions) error {
-	if service == "__go__" && method == "GetNamespace" {
-		return nil
-	}
-	return fmt.Errorf("testingContext: unsupported Call")
-}
-func (t *testingContext) Request() interface{} { return t.req }
-
-func ContextForTesting(req *http.Request) netcontext.Context {
-	return withContext(netcontext.Background(), &testingContext{req: req})
-}
-
-func Call(ctx netcontext.Context, service, method string, in, out proto.Message) error {
-	if ns := NamespaceFromContext(ctx); ns != "" {
-		if fn, ok := NamespaceMods[service]; ok {
-			fn(in, ns)
-		}
-	}
-
-	if f, ctx, ok := callOverrideFromContext(ctx); ok {
-		return f(ctx, service, method, in, out)
-	}
-
-	// Handle already-done contexts quickly.
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-	}
-
-	c := fromContext(ctx)
-	if c == nil {
-		// Give a good error message rather than a panic lower down.
-		return errNotAppEngineContext
-	}
-
-	// Apply transaction modifications if we're in a transaction.
-	if t := transactionFromContext(ctx); t != nil {
-		if t.finished {
-			return errors.New("transaction context has expired")
-		}
-		applyTransaction(in, &t.transaction)
-	}
-
-	var opts *appengine_internal.CallOptions
-	if d, ok := ctx.Deadline(); ok {
-		opts = &appengine_internal.CallOptions{
-			Timeout: d.Sub(time.Now()),
-		}
-	}
-
-	err := c.Call(service, method, in, out, opts)
-	switch v := err.(type) {
-	case *appengine_internal.APIError:
-		return &APIError{
-			Service: v.Service,
-			Detail:  v.Detail,
-			Code:    v.Code,
-		}
-	case *appengine_internal.CallError:
-		return &CallError{
-			Detail:  v.Detail,
-			Code:    v.Code,
-			Timeout: v.Timeout,
-		}
-	}
-	return err
-}
-
-func handleHTTP(w http.ResponseWriter, r *http.Request) {
-	panic("handleHTTP called; this should be impossible")
-}
-
-func logf(c appengine.Context, level int64, format string, args ...interface{}) {
-	var fn func(format string, args ...interface{})
-	switch level {
-	case 0:
-		fn = c.Debugf
-	case 1:
-		fn = c.Infof
-	case 2:
-		fn = c.Warningf
-	case 3:
-		fn = c.Errorf
-	case 4:
-		fn = c.Criticalf
-	default:
-		// This shouldn't happen.
-		fn = c.Criticalf
-	}
-	fn(format, args...)
-}
diff --git a/vendor/google.golang.org/appengine/internal/api_common.go b/vendor/google.golang.org/appengine/internal/api_common.go
deleted file mode 100644
index e0c0b214b7..0000000000
--- a/vendor/google.golang.org/appengine/internal/api_common.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package internal
-
-import (
-	"errors"
-	"os"
-
-	"github.com/golang/protobuf/proto"
-	netcontext "golang.org/x/net/context"
-)
-
-var errNotAppEngineContext = errors.New("not an App Engine context")
-
-type CallOverrideFunc func(ctx netcontext.Context, service, method string, in, out proto.Message) error
-
-var callOverrideKey = "holds []CallOverrideFunc"
-
-func WithCallOverride(ctx netcontext.Context, f CallOverrideFunc) netcontext.Context {
-	// We avoid appending to any existing call override
-	// so we don't risk overwriting a popped stack below.
-	var cofs []CallOverrideFunc
-	if uf, ok := ctx.Value(&callOverrideKey).([]CallOverrideFunc); ok {
-		cofs = append(cofs, uf...)
-	}
-	cofs = append(cofs, f)
-	return netcontext.WithValue(ctx, &callOverrideKey, cofs)
-}
-
-func callOverrideFromContext(ctx netcontext.Context) (CallOverrideFunc, netcontext.Context, bool) {
-	cofs, _ := ctx.Value(&callOverrideKey).([]CallOverrideFunc)
-	if len(cofs) == 0 {
-		return nil, nil, false
-	}
-	// We found a list of overrides; grab the last, and reconstitute a
-	// context that will hide it.
-	f := cofs[len(cofs)-1]
-	ctx = netcontext.WithValue(ctx, &callOverrideKey, cofs[:len(cofs)-1])
-	return f, ctx, true
-}
-
-type logOverrideFunc func(level int64, format string, args ...interface{})
-
-var logOverrideKey = "holds a logOverrideFunc"
-
-func WithLogOverride(ctx netcontext.Context, f logOverrideFunc) netcontext.Context {
-	return netcontext.WithValue(ctx, &logOverrideKey, f)
-}
-
-var appIDOverrideKey = "holds a string, being the full app ID"
-
-func WithAppIDOverride(ctx netcontext.Context, appID string) netcontext.Context {
-	return netcontext.WithValue(ctx, &appIDOverrideKey, appID)
-}
-
-var namespaceKey = "holds the namespace string"
-
-func withNamespace(ctx netcontext.Context, ns string) netcontext.Context {
-	return netcontext.WithValue(ctx, &namespaceKey, ns)
-}
-
-func NamespaceFromContext(ctx netcontext.Context) string {
-	// If there's no namespace, return the empty string.
-	ns, _ := ctx.Value(&namespaceKey).(string)
-	return ns
-}
-
-// FullyQualifiedAppID returns the fully-qualified application ID.
-// This may contain a partition prefix (e.g. "s~" for High Replication apps),
-// or a domain prefix (e.g. "example.com:").
-func FullyQualifiedAppID(ctx netcontext.Context) string {
-	if id, ok := ctx.Value(&appIDOverrideKey).(string); ok {
-		return id
-	}
-	return fullyQualifiedAppID(ctx)
-}
-
-func Logf(ctx netcontext.Context, level int64, format string, args ...interface{}) {
-	if f, ok := ctx.Value(&logOverrideKey).(logOverrideFunc); ok {
-		f(level, format, args...)
-		return
-	}
-	c := fromContext(ctx)
-	if c == nil {
-		panic(errNotAppEngineContext)
-	}
-	logf(c, level, format, args...)
-}
-
-// NamespacedContext wraps a Context to support namespaces.
-func NamespacedContext(ctx netcontext.Context, namespace string) netcontext.Context {
-	return withNamespace(ctx, namespace)
-}
-
-// SetTestEnv sets the env variables for testing background ticket in Flex.
-func SetTestEnv() func() {
-	var environ = []struct {
-		key, value string
-	}{
-		{"GAE_LONG_APP_ID", "my-app-id"},
-		{"GAE_MINOR_VERSION", "067924799508853122"},
-		{"GAE_MODULE_INSTANCE", "0"},
-		{"GAE_MODULE_NAME", "default"},
-		{"GAE_MODULE_VERSION", "20150612t184001"},
-	}
-
-	for _, v := range environ {
-		old := os.Getenv(v.key)
-		os.Setenv(v.key, v.value)
-		v.value = old
-	}
-	return func() { // Restore old environment after the test completes.
-		for _, v := range environ {
-			if v.value == "" {
-				os.Unsetenv(v.key)
-				continue
-			}
-			os.Setenv(v.key, v.value)
-		}
-	}
-}
diff --git a/vendor/google.golang.org/appengine/internal/app_id.go b/vendor/google.golang.org/appengine/internal/app_id.go
deleted file mode 100644
index 11df8c07b5..0000000000
--- a/vendor/google.golang.org/appengine/internal/app_id.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2011 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package internal
-
-import (
-	"strings"
-)
-
-func parseFullAppID(appid string) (partition, domain, displayID string) {
-	if i := strings.Index(appid, "~"); i != -1 {
-		partition, appid = appid[:i], appid[i+1:]
-	}
-	if i := strings.Index(appid, ":"); i != -1 {
-		domain, appid = appid[:i], appid[i+1:]
-	}
-	return partition, domain, appid
-}
-
-// appID returns "appid" or "domain.com:appid".
-func appID(fullAppID string) string {
-	_, dom, dis := parseFullAppID(fullAppID)
-	if dom != "" {
-		return dom + ":" + dis
-	}
-	return dis
-}
diff --git a/vendor/google.golang.org/appengine/internal/app_identity/app_identity_service.pb.go b/vendor/google.golang.org/appengine/internal/app_identity/app_identity_service.pb.go
deleted file mode 100644
index 87d9701b8d..0000000000
--- a/vendor/google.golang.org/appengine/internal/app_identity/app_identity_service.pb.go
+++ /dev/null
@@ -1,296 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: google.golang.org/appengine/internal/app_identity/app_identity_service.proto
-// DO NOT EDIT!
-
-/*
-Package app_identity is a generated protocol buffer package.
-
-It is generated from these files:
-	google.golang.org/appengine/internal/app_identity/app_identity_service.proto
-
-It has these top-level messages:
-	AppIdentityServiceError
-	SignForAppRequest
-	SignForAppResponse
-	GetPublicCertificateForAppRequest
-	PublicCertificate
-	GetPublicCertificateForAppResponse
-	GetServiceAccountNameRequest
-	GetServiceAccountNameResponse
-	GetAccessTokenRequest
-	GetAccessTokenResponse
-	GetDefaultGcsBucketNameRequest
-	GetDefaultGcsBucketNameResponse
-*/
-package app_identity
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type AppIdentityServiceError_ErrorCode int32
-
-const (
-	AppIdentityServiceError_SUCCESS           AppIdentityServiceError_ErrorCode = 0
-	AppIdentityServiceError_UNKNOWN_SCOPE     AppIdentityServiceError_ErrorCode = 9
-	AppIdentityServiceError_BLOB_TOO_LARGE    AppIdentityServiceError_ErrorCode = 1000
-	AppIdentityServiceError_DEADLINE_EXCEEDED AppIdentityServiceError_ErrorCode = 1001
-	AppIdentityServiceError_NOT_A_VALID_APP   AppIdentityServiceError_ErrorCode = 1002
-	AppIdentityServiceError_UNKNOWN_ERROR     AppIdentityServiceError_ErrorCode = 1003
-	AppIdentityServiceError_NOT_ALLOWED       AppIdentityServiceError_ErrorCode = 1005
-	AppIdentityServiceError_NOT_IMPLEMENTED   AppIdentityServiceError_ErrorCode = 1006
-)
-
-var AppIdentityServiceError_ErrorCode_name = map[int32]string{
-	0:    "SUCCESS",
-	9:    "UNKNOWN_SCOPE",
-	1000: "BLOB_TOO_LARGE",
-	1001: "DEADLINE_EXCEEDED",
-	1002: "NOT_A_VALID_APP",
-	1003: "UNKNOWN_ERROR",
-	1005: "NOT_ALLOWED",
-	1006: "NOT_IMPLEMENTED",
-}
-var AppIdentityServiceError_ErrorCode_value = map[string]int32{
-	"SUCCESS":           0,
-	"UNKNOWN_SCOPE":     9,
-	"BLOB_TOO_LARGE":    1000,
-	"DEADLINE_EXCEEDED": 1001,
-	"NOT_A_VALID_APP":   1002,
-	"UNKNOWN_ERROR":     1003,
-	"NOT_ALLOWED":       1005,
-	"NOT_IMPLEMENTED":   1006,
-}
-
-func (x AppIdentityServiceError_ErrorCode) Enum() *AppIdentityServiceError_ErrorCode {
-	p := new(AppIdentityServiceError_ErrorCode)
-	*p = x
-	return p
-}
-func (x AppIdentityServiceError_ErrorCode) String() string {
-	return proto.EnumName(AppIdentityServiceError_ErrorCode_name, int32(x))
-}
-func (x *AppIdentityServiceError_ErrorCode) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(AppIdentityServiceError_ErrorCode_value, data, "AppIdentityServiceError_ErrorCode")
-	if err != nil {
-		return err
-	}
-	*x = AppIdentityServiceError_ErrorCode(value)
-	return nil
-}
-
-type AppIdentityServiceError struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *AppIdentityServiceError) Reset()         { *m = AppIdentityServiceError{} }
-func (m *AppIdentityServiceError) String() string { return proto.CompactTextString(m) }
-func (*AppIdentityServiceError) ProtoMessage()    {}
-
-type SignForAppRequest struct {
-	BytesToSign      []byte `protobuf:"bytes,1,opt,name=bytes_to_sign" json:"bytes_to_sign,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *SignForAppRequest) Reset()         { *m = SignForAppRequest{} }
-func (m *SignForAppRequest) String() string { return proto.CompactTextString(m) }
-func (*SignForAppRequest) ProtoMessage()    {}
-
-func (m *SignForAppRequest) GetBytesToSign() []byte {
-	if m != nil {
-		return m.BytesToSign
-	}
-	return nil
-}
-
-type SignForAppResponse struct {
-	KeyName          *string `protobuf:"bytes,1,opt,name=key_name" json:"key_name,omitempty"`
-	SignatureBytes   []byte  `protobuf:"bytes,2,opt,name=signature_bytes" json:"signature_bytes,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *SignForAppResponse) Reset()         { *m = SignForAppResponse{} }
-func (m *SignForAppResponse) String() string { return proto.CompactTextString(m) }
-func (*SignForAppResponse) ProtoMessage()    {}
-
-func (m *SignForAppResponse) GetKeyName() string {
-	if m != nil && m.KeyName != nil {
-		return *m.KeyName
-	}
-	return ""
-}
-
-func (m *SignForAppResponse) GetSignatureBytes() []byte {
-	if m != nil {
-		return m.SignatureBytes
-	}
-	return nil
-}
-
-type GetPublicCertificateForAppRequest struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GetPublicCertificateForAppRequest) Reset()         { *m = GetPublicCertificateForAppRequest{} }
-func (m *GetPublicCertificateForAppRequest) String() string { return proto.CompactTextString(m) }
-func (*GetPublicCertificateForAppRequest) ProtoMessage()    {}
-
-type PublicCertificate struct {
-	KeyName            *string `protobuf:"bytes,1,opt,name=key_name" json:"key_name,omitempty"`
-	X509CertificatePem *string `protobuf:"bytes,2,opt,name=x509_certificate_pem" json:"x509_certificate_pem,omitempty"`
-	XXX_unrecognized   []byte  `json:"-"`
-}
-
-func (m *PublicCertificate) Reset()         { *m = PublicCertificate{} }
-func (m *PublicCertificate) String() string { return proto.CompactTextString(m) }
-func (*PublicCertificate) ProtoMessage()    {}
-
-func (m *PublicCertificate) GetKeyName() string {
-	if m != nil && m.KeyName != nil {
-		return *m.KeyName
-	}
-	return ""
-}
-
-func (m *PublicCertificate) GetX509CertificatePem() string {
-	if m != nil && m.X509CertificatePem != nil {
-		return *m.X509CertificatePem
-	}
-	return ""
-}
-
-type GetPublicCertificateForAppResponse struct {
-	PublicCertificateList      []*PublicCertificate `protobuf:"bytes,1,rep,name=public_certificate_list" json:"public_certificate_list,omitempty"`
-	MaxClientCacheTimeInSecond *int64               `protobuf:"varint,2,opt,name=max_client_cache_time_in_second" json:"max_client_cache_time_in_second,omitempty"`
-	XXX_unrecognized           []byte               `json:"-"`
-}
-
-func (m *GetPublicCertificateForAppResponse) Reset()         { *m = GetPublicCertificateForAppResponse{} }
-func (m *GetPublicCertificateForAppResponse) String() string { return proto.CompactTextString(m) }
-func (*GetPublicCertificateForAppResponse) ProtoMessage()    {}
-
-func (m *GetPublicCertificateForAppResponse) GetPublicCertificateList() []*PublicCertificate {
-	if m != nil {
-		return m.PublicCertificateList
-	}
-	return nil
-}
-
-func (m *GetPublicCertificateForAppResponse) GetMaxClientCacheTimeInSecond() int64 {
-	if m != nil && m.MaxClientCacheTimeInSecond != nil {
-		return *m.MaxClientCacheTimeInSecond
-	}
-	return 0
-}
-
-type GetServiceAccountNameRequest struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GetServiceAccountNameRequest) Reset()         { *m = GetServiceAccountNameRequest{} }
-func (m *GetServiceAccountNameRequest) String() string { return proto.CompactTextString(m) }
-func (*GetServiceAccountNameRequest) ProtoMessage()    {}
-
-type GetServiceAccountNameResponse struct {
-	ServiceAccountName *string `protobuf:"bytes,1,opt,name=service_account_name" json:"service_account_name,omitempty"`
-	XXX_unrecognized   []byte  `json:"-"`
-}
-
-func (m *GetServiceAccountNameResponse) Reset()         { *m = GetServiceAccountNameResponse{} }
-func (m *GetServiceAccountNameResponse) String() string { return proto.CompactTextString(m) }
-func (*GetServiceAccountNameResponse) ProtoMessage()    {}
-
-func (m *GetServiceAccountNameResponse) GetServiceAccountName() string {
-	if m != nil && m.ServiceAccountName != nil {
-		return *m.ServiceAccountName
-	}
-	return ""
-}
-
-type GetAccessTokenRequest struct {
-	Scope              []string `protobuf:"bytes,1,rep,name=scope" json:"scope,omitempty"`
-	ServiceAccountId   *int64   `protobuf:"varint,2,opt,name=service_account_id" json:"service_account_id,omitempty"`
-	ServiceAccountName *string  `protobuf:"bytes,3,opt,name=service_account_name" json:"service_account_name,omitempty"`
-	XXX_unrecognized   []byte   `json:"-"`
-}
-
-func (m *GetAccessTokenRequest) Reset()         { *m = GetAccessTokenRequest{} }
-func (m *GetAccessTokenRequest) String() string { return proto.CompactTextString(m) }
-func (*GetAccessTokenRequest) ProtoMessage()    {}
-
-func (m *GetAccessTokenRequest) GetScope() []string {
-	if m != nil {
-		return m.Scope
-	}
-	return nil
-}
-
-func (m *GetAccessTokenRequest) GetServiceAccountId() int64 {
-	if m != nil && m.ServiceAccountId != nil {
-		return *m.ServiceAccountId
-	}
-	return 0
-}
-
-func (m *GetAccessTokenRequest) GetServiceAccountName() string {
-	if m != nil && m.ServiceAccountName != nil {
-		return *m.ServiceAccountName
-	}
-	return ""
-}
-
-type GetAccessTokenResponse struct {
-	AccessToken      *string `protobuf:"bytes,1,opt,name=access_token" json:"access_token,omitempty"`
-	ExpirationTime   *int64  `protobuf:"varint,2,opt,name=expiration_time" json:"expiration_time,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GetAccessTokenResponse) Reset()         { *m = GetAccessTokenResponse{} }
-func (m *GetAccessTokenResponse) String() string { return proto.CompactTextString(m) }
-func (*GetAccessTokenResponse) ProtoMessage()    {}
-
-func (m *GetAccessTokenResponse) GetAccessToken() string {
-	if m != nil && m.AccessToken != nil {
-		return *m.AccessToken
-	}
-	return ""
-}
-
-func (m *GetAccessTokenResponse) GetExpirationTime() int64 {
-	if m != nil && m.ExpirationTime != nil {
-		return *m.ExpirationTime
-	}
-	return 0
-}
-
-type GetDefaultGcsBucketNameRequest struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GetDefaultGcsBucketNameRequest) Reset()         { *m = GetDefaultGcsBucketNameRequest{} }
-func (m *GetDefaultGcsBucketNameRequest) String() string { return proto.CompactTextString(m) }
-func (*GetDefaultGcsBucketNameRequest) ProtoMessage()    {}
-
-type GetDefaultGcsBucketNameResponse struct {
-	DefaultGcsBucketName *string `protobuf:"bytes,1,opt,name=default_gcs_bucket_name" json:"default_gcs_bucket_name,omitempty"`
-	XXX_unrecognized     []byte  `json:"-"`
-}
-
-func (m *GetDefaultGcsBucketNameResponse) Reset()         { *m = GetDefaultGcsBucketNameResponse{} }
-func (m *GetDefaultGcsBucketNameResponse) String() string { return proto.CompactTextString(m) }
-func (*GetDefaultGcsBucketNameResponse) ProtoMessage()    {}
-
-func (m *GetDefaultGcsBucketNameResponse) GetDefaultGcsBucketName() string {
-	if m != nil && m.DefaultGcsBucketName != nil {
-		return *m.DefaultGcsBucketName
-	}
-	return ""
-}
-
-func init() {
-}
diff --git a/vendor/google.golang.org/appengine/internal/app_identity/app_identity_service.proto b/vendor/google.golang.org/appengine/internal/app_identity/app_identity_service.proto
deleted file mode 100644
index 19610ca5b7..0000000000
--- a/vendor/google.golang.org/appengine/internal/app_identity/app_identity_service.proto
+++ /dev/null
@@ -1,64 +0,0 @@
-syntax = "proto2";
-option go_package = "app_identity";
-
-package appengine;
-
-message AppIdentityServiceError {
-  enum ErrorCode {
-    SUCCESS = 0;
-    UNKNOWN_SCOPE = 9;
-    BLOB_TOO_LARGE = 1000;
-    DEADLINE_EXCEEDED = 1001;
-    NOT_A_VALID_APP = 1002;
-    UNKNOWN_ERROR = 1003;
-    NOT_ALLOWED = 1005;
-    NOT_IMPLEMENTED = 1006;
-  }
-}
-
-message SignForAppRequest {
-  optional bytes bytes_to_sign = 1;
-}
-
-message SignForAppResponse {
-  optional string key_name = 1;
-  optional bytes signature_bytes = 2;
-}
-
-message GetPublicCertificateForAppRequest {
-}
-
-message PublicCertificate {
-  optional string key_name = 1;
-  optional string x509_certificate_pem = 2;
-}
-
-message GetPublicCertificateForAppResponse {
-  repeated PublicCertificate public_certificate_list = 1;
-  optional int64 max_client_cache_time_in_second = 2;
-}
-
-message GetServiceAccountNameRequest {
-}
-
-message GetServiceAccountNameResponse {
-  optional string service_account_name = 1;
-}
-
-message GetAccessTokenRequest {
-  repeated string scope = 1;
-  optional int64 service_account_id = 2;
-  optional string service_account_name = 3;
-}
-
-message GetAccessTokenResponse {
-  optional string access_token = 1;
-  optional int64 expiration_time = 2;
-}
-
-message GetDefaultGcsBucketNameRequest {
-}
-
-message GetDefaultGcsBucketNameResponse {
-  optional string default_gcs_bucket_name = 1;
-}
diff --git a/vendor/google.golang.org/appengine/internal/base/api_base.pb.go b/vendor/google.golang.org/appengine/internal/base/api_base.pb.go
deleted file mode 100644
index 36a195650a..0000000000
--- a/vendor/google.golang.org/appengine/internal/base/api_base.pb.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: google.golang.org/appengine/internal/base/api_base.proto
-// DO NOT EDIT!
-
-/*
-Package base is a generated protocol buffer package.
-
-It is generated from these files:
-	google.golang.org/appengine/internal/base/api_base.proto
-
-It has these top-level messages:
-	StringProto
-	Integer32Proto
-	Integer64Proto
-	BoolProto
-	DoubleProto
-	BytesProto
-	VoidProto
-*/
-package base
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type StringProto struct {
-	Value            *string `protobuf:"bytes,1,req,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *StringProto) Reset()         { *m = StringProto{} }
-func (m *StringProto) String() string { return proto.CompactTextString(m) }
-func (*StringProto) ProtoMessage()    {}
-
-func (m *StringProto) GetValue() string {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return ""
-}
-
-type Integer32Proto struct {
-	Value            *int32 `protobuf:"varint,1,req,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Integer32Proto) Reset()         { *m = Integer32Proto{} }
-func (m *Integer32Proto) String() string { return proto.CompactTextString(m) }
-func (*Integer32Proto) ProtoMessage()    {}
-
-func (m *Integer32Proto) GetValue() int32 {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return 0
-}
-
-type Integer64Proto struct {
-	Value            *int64 `protobuf:"varint,1,req,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Integer64Proto) Reset()         { *m = Integer64Proto{} }
-func (m *Integer64Proto) String() string { return proto.CompactTextString(m) }
-func (*Integer64Proto) ProtoMessage()    {}
-
-func (m *Integer64Proto) GetValue() int64 {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return 0
-}
-
-type BoolProto struct {
-	Value            *bool  `protobuf:"varint,1,req,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *BoolProto) Reset()         { *m = BoolProto{} }
-func (m *BoolProto) String() string { return proto.CompactTextString(m) }
-func (*BoolProto) ProtoMessage()    {}
-
-func (m *BoolProto) GetValue() bool {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return false
-}
-
-type DoubleProto struct {
-	Value            *float64 `protobuf:"fixed64,1,req,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *DoubleProto) Reset()         { *m = DoubleProto{} }
-func (m *DoubleProto) String() string { return proto.CompactTextString(m) }
-func (*DoubleProto) ProtoMessage()    {}
-
-func (m *DoubleProto) GetValue() float64 {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return 0
-}
-
-type BytesProto struct {
-	Value            []byte `protobuf:"bytes,1,req,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *BytesProto) Reset()         { *m = BytesProto{} }
-func (m *BytesProto) String() string { return proto.CompactTextString(m) }
-func (*BytesProto) ProtoMessage()    {}
-
-func (m *BytesProto) GetValue() []byte {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-type VoidProto struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *VoidProto) Reset()         { *m = VoidProto{} }
-func (m *VoidProto) String() string { return proto.CompactTextString(m) }
-func (*VoidProto) ProtoMessage()    {}
diff --git a/vendor/google.golang.org/appengine/internal/base/api_base.proto b/vendor/google.golang.org/appengine/internal/base/api_base.proto
deleted file mode 100644
index 56cd7a3cad..0000000000
--- a/vendor/google.golang.org/appengine/internal/base/api_base.proto
+++ /dev/null
@@ -1,33 +0,0 @@
-// Built-in base types for API calls. Primarily useful as return types.
-
-syntax = "proto2";
-option go_package = "base";
-
-package appengine.base;
-
-message StringProto {
-  required string value = 1;
-}
-
-message Integer32Proto {
-  required int32 value = 1;
-}
-
-message Integer64Proto {
-  required int64 value = 1;
-}
-
-message BoolProto {
-  required bool value = 1;
-}
-
-message DoubleProto {
-  required double value = 1;
-}
-
-message BytesProto {
-  required bytes value = 1 [ctype=CORD];
-}
-
-message VoidProto {
-}
diff --git a/vendor/google.golang.org/appengine/internal/datastore/datastore_v3.pb.go b/vendor/google.golang.org/appengine/internal/datastore/datastore_v3.pb.go
deleted file mode 100644
index 8613cb7311..0000000000
--- a/vendor/google.golang.org/appengine/internal/datastore/datastore_v3.pb.go
+++ /dev/null
@@ -1,2778 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: google.golang.org/appengine/internal/datastore/datastore_v3.proto
-// DO NOT EDIT!
-
-/*
-Package datastore is a generated protocol buffer package.
-
-It is generated from these files:
-	google.golang.org/appengine/internal/datastore/datastore_v3.proto
-
-It has these top-level messages:
-	Action
-	PropertyValue
-	Property
-	Path
-	Reference
-	User
-	EntityProto
-	CompositeProperty
-	Index
-	CompositeIndex
-	IndexPostfix
-	IndexPosition
-	Snapshot
-	InternalHeader
-	Transaction
-	Query
-	CompiledQuery
-	CompiledCursor
-	Cursor
-	Error
-	Cost
-	GetRequest
-	GetResponse
-	PutRequest
-	PutResponse
-	TouchRequest
-	TouchResponse
-	DeleteRequest
-	DeleteResponse
-	NextRequest
-	QueryResult
-	AllocateIdsRequest
-	AllocateIdsResponse
-	CompositeIndices
-	AddActionsRequest
-	AddActionsResponse
-	BeginTransactionRequest
-	CommitResponse
-*/
-package datastore
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Property_Meaning int32
-
-const (
-	Property_NO_MEANING       Property_Meaning = 0
-	Property_BLOB             Property_Meaning = 14
-	Property_TEXT             Property_Meaning = 15
-	Property_BYTESTRING       Property_Meaning = 16
-	Property_ATOM_CATEGORY    Property_Meaning = 1
-	Property_ATOM_LINK        Property_Meaning = 2
-	Property_ATOM_TITLE       Property_Meaning = 3
-	Property_ATOM_CONTENT     Property_Meaning = 4
-	Property_ATOM_SUMMARY     Property_Meaning = 5
-	Property_ATOM_AUTHOR      Property_Meaning = 6
-	Property_GD_WHEN          Property_Meaning = 7
-	Property_GD_EMAIL         Property_Meaning = 8
-	Property_GEORSS_POINT     Property_Meaning = 9
-	Property_GD_IM            Property_Meaning = 10
-	Property_GD_PHONENUMBER   Property_Meaning = 11
-	Property_GD_POSTALADDRESS Property_Meaning = 12
-	Property_GD_RATING        Property_Meaning = 13
-	Property_BLOBKEY          Property_Meaning = 17
-	Property_ENTITY_PROTO     Property_Meaning = 19
-	Property_INDEX_VALUE      Property_Meaning = 18
-)
-
-var Property_Meaning_name = map[int32]string{
-	0:  "NO_MEANING",
-	14: "BLOB",
-	15: "TEXT",
-	16: "BYTESTRING",
-	1:  "ATOM_CATEGORY",
-	2:  "ATOM_LINK",
-	3:  "ATOM_TITLE",
-	4:  "ATOM_CONTENT",
-	5:  "ATOM_SUMMARY",
-	6:  "ATOM_AUTHOR",
-	7:  "GD_WHEN",
-	8:  "GD_EMAIL",
-	9:  "GEORSS_POINT",
-	10: "GD_IM",
-	11: "GD_PHONENUMBER",
-	12: "GD_POSTALADDRESS",
-	13: "GD_RATING",
-	17: "BLOBKEY",
-	19: "ENTITY_PROTO",
-	18: "INDEX_VALUE",
-}
-var Property_Meaning_value = map[string]int32{
-	"NO_MEANING":       0,
-	"BLOB":             14,
-	"TEXT":             15,
-	"BYTESTRING":       16,
-	"ATOM_CATEGORY":    1,
-	"ATOM_LINK":        2,
-	"ATOM_TITLE":       3,
-	"ATOM_CONTENT":     4,
-	"ATOM_SUMMARY":     5,
-	"ATOM_AUTHOR":      6,
-	"GD_WHEN":          7,
-	"GD_EMAIL":         8,
-	"GEORSS_POINT":     9,
-	"GD_IM":            10,
-	"GD_PHONENUMBER":   11,
-	"GD_POSTALADDRESS": 12,
-	"GD_RATING":        13,
-	"BLOBKEY":          17,
-	"ENTITY_PROTO":     19,
-	"INDEX_VALUE":      18,
-}
-
-func (x Property_Meaning) Enum() *Property_Meaning {
-	p := new(Property_Meaning)
-	*p = x
-	return p
-}
-func (x Property_Meaning) String() string {
-	return proto.EnumName(Property_Meaning_name, int32(x))
-}
-func (x *Property_Meaning) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Property_Meaning_value, data, "Property_Meaning")
-	if err != nil {
-		return err
-	}
-	*x = Property_Meaning(value)
-	return nil
-}
-
-type Property_FtsTokenizationOption int32
-
-const (
-	Property_HTML Property_FtsTokenizationOption = 1
-	Property_ATOM Property_FtsTokenizationOption = 2
-)
-
-var Property_FtsTokenizationOption_name = map[int32]string{
-	1: "HTML",
-	2: "ATOM",
-}
-var Property_FtsTokenizationOption_value = map[string]int32{
-	"HTML": 1,
-	"ATOM": 2,
-}
-
-func (x Property_FtsTokenizationOption) Enum() *Property_FtsTokenizationOption {
-	p := new(Property_FtsTokenizationOption)
-	*p = x
-	return p
-}
-func (x Property_FtsTokenizationOption) String() string {
-	return proto.EnumName(Property_FtsTokenizationOption_name, int32(x))
-}
-func (x *Property_FtsTokenizationOption) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Property_FtsTokenizationOption_value, data, "Property_FtsTokenizationOption")
-	if err != nil {
-		return err
-	}
-	*x = Property_FtsTokenizationOption(value)
-	return nil
-}
-
-type EntityProto_Kind int32
-
-const (
-	EntityProto_GD_CONTACT EntityProto_Kind = 1
-	EntityProto_GD_EVENT   EntityProto_Kind = 2
-	EntityProto_GD_MESSAGE EntityProto_Kind = 3
-)
-
-var EntityProto_Kind_name = map[int32]string{
-	1: "GD_CONTACT",
-	2: "GD_EVENT",
-	3: "GD_MESSAGE",
-}
-var EntityProto_Kind_value = map[string]int32{
-	"GD_CONTACT": 1,
-	"GD_EVENT":   2,
-	"GD_MESSAGE": 3,
-}
-
-func (x EntityProto_Kind) Enum() *EntityProto_Kind {
-	p := new(EntityProto_Kind)
-	*p = x
-	return p
-}
-func (x EntityProto_Kind) String() string {
-	return proto.EnumName(EntityProto_Kind_name, int32(x))
-}
-func (x *EntityProto_Kind) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(EntityProto_Kind_value, data, "EntityProto_Kind")
-	if err != nil {
-		return err
-	}
-	*x = EntityProto_Kind(value)
-	return nil
-}
-
-type Index_Property_Direction int32
-
-const (
-	Index_Property_ASCENDING  Index_Property_Direction = 1
-	Index_Property_DESCENDING Index_Property_Direction = 2
-)
-
-var Index_Property_Direction_name = map[int32]string{
-	1: "ASCENDING",
-	2: "DESCENDING",
-}
-var Index_Property_Direction_value = map[string]int32{
-	"ASCENDING":  1,
-	"DESCENDING": 2,
-}
-
-func (x Index_Property_Direction) Enum() *Index_Property_Direction {
-	p := new(Index_Property_Direction)
-	*p = x
-	return p
-}
-func (x Index_Property_Direction) String() string {
-	return proto.EnumName(Index_Property_Direction_name, int32(x))
-}
-func (x *Index_Property_Direction) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Index_Property_Direction_value, data, "Index_Property_Direction")
-	if err != nil {
-		return err
-	}
-	*x = Index_Property_Direction(value)
-	return nil
-}
-
-type CompositeIndex_State int32
-
-const (
-	CompositeIndex_WRITE_ONLY CompositeIndex_State = 1
-	CompositeIndex_READ_WRITE CompositeIndex_State = 2
-	CompositeIndex_DELETED    CompositeIndex_State = 3
-	CompositeIndex_ERROR      CompositeIndex_State = 4
-)
-
-var CompositeIndex_State_name = map[int32]string{
-	1: "WRITE_ONLY",
-	2: "READ_WRITE",
-	3: "DELETED",
-	4: "ERROR",
-}
-var CompositeIndex_State_value = map[string]int32{
-	"WRITE_ONLY": 1,
-	"READ_WRITE": 2,
-	"DELETED":    3,
-	"ERROR":      4,
-}
-
-func (x CompositeIndex_State) Enum() *CompositeIndex_State {
-	p := new(CompositeIndex_State)
-	*p = x
-	return p
-}
-func (x CompositeIndex_State) String() string {
-	return proto.EnumName(CompositeIndex_State_name, int32(x))
-}
-func (x *CompositeIndex_State) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(CompositeIndex_State_value, data, "CompositeIndex_State")
-	if err != nil {
-		return err
-	}
-	*x = CompositeIndex_State(value)
-	return nil
-}
-
-type Snapshot_Status int32
-
-const (
-	Snapshot_INACTIVE Snapshot_Status = 0
-	Snapshot_ACTIVE   Snapshot_Status = 1
-)
-
-var Snapshot_Status_name = map[int32]string{
-	0: "INACTIVE",
-	1: "ACTIVE",
-}
-var Snapshot_Status_value = map[string]int32{
-	"INACTIVE": 0,
-	"ACTIVE":   1,
-}
-
-func (x Snapshot_Status) Enum() *Snapshot_Status {
-	p := new(Snapshot_Status)
-	*p = x
-	return p
-}
-func (x Snapshot_Status) String() string {
-	return proto.EnumName(Snapshot_Status_name, int32(x))
-}
-func (x *Snapshot_Status) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Snapshot_Status_value, data, "Snapshot_Status")
-	if err != nil {
-		return err
-	}
-	*x = Snapshot_Status(value)
-	return nil
-}
-
-type Query_Hint int32
-
-const (
-	Query_ORDER_FIRST    Query_Hint = 1
-	Query_ANCESTOR_FIRST Query_Hint = 2
-	Query_FILTER_FIRST   Query_Hint = 3
-)
-
-var Query_Hint_name = map[int32]string{
-	1: "ORDER_FIRST",
-	2: "ANCESTOR_FIRST",
-	3: "FILTER_FIRST",
-}
-var Query_Hint_value = map[string]int32{
-	"ORDER_FIRST":    1,
-	"ANCESTOR_FIRST": 2,
-	"FILTER_FIRST":   3,
-}
-
-func (x Query_Hint) Enum() *Query_Hint {
-	p := new(Query_Hint)
-	*p = x
-	return p
-}
-func (x Query_Hint) String() string {
-	return proto.EnumName(Query_Hint_name, int32(x))
-}
-func (x *Query_Hint) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Query_Hint_value, data, "Query_Hint")
-	if err != nil {
-		return err
-	}
-	*x = Query_Hint(value)
-	return nil
-}
-
-type Query_Filter_Operator int32
-
-const (
-	Query_Filter_LESS_THAN             Query_Filter_Operator = 1
-	Query_Filter_LESS_THAN_OR_EQUAL    Query_Filter_Operator = 2
-	Query_Filter_GREATER_THAN          Query_Filter_Operator = 3
-	Query_Filter_GREATER_THAN_OR_EQUAL Query_Filter_Operator = 4
-	Query_Filter_EQUAL                 Query_Filter_Operator = 5
-	Query_Filter_IN                    Query_Filter_Operator = 6
-	Query_Filter_EXISTS                Query_Filter_Operator = 7
-)
-
-var Query_Filter_Operator_name = map[int32]string{
-	1: "LESS_THAN",
-	2: "LESS_THAN_OR_EQUAL",
-	3: "GREATER_THAN",
-	4: "GREATER_THAN_OR_EQUAL",
-	5: "EQUAL",
-	6: "IN",
-	7: "EXISTS",
-}
-var Query_Filter_Operator_value = map[string]int32{
-	"LESS_THAN":             1,
-	"LESS_THAN_OR_EQUAL":    2,
-	"GREATER_THAN":          3,
-	"GREATER_THAN_OR_EQUAL": 4,
-	"EQUAL":                 5,
-	"IN":                    6,
-	"EXISTS":                7,
-}
-
-func (x Query_Filter_Operator) Enum() *Query_Filter_Operator {
-	p := new(Query_Filter_Operator)
-	*p = x
-	return p
-}
-func (x Query_Filter_Operator) String() string {
-	return proto.EnumName(Query_Filter_Operator_name, int32(x))
-}
-func (x *Query_Filter_Operator) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Query_Filter_Operator_value, data, "Query_Filter_Operator")
-	if err != nil {
-		return err
-	}
-	*x = Query_Filter_Operator(value)
-	return nil
-}
-
-type Query_Order_Direction int32
-
-const (
-	Query_Order_ASCENDING  Query_Order_Direction = 1
-	Query_Order_DESCENDING Query_Order_Direction = 2
-)
-
-var Query_Order_Direction_name = map[int32]string{
-	1: "ASCENDING",
-	2: "DESCENDING",
-}
-var Query_Order_Direction_value = map[string]int32{
-	"ASCENDING":  1,
-	"DESCENDING": 2,
-}
-
-func (x Query_Order_Direction) Enum() *Query_Order_Direction {
-	p := new(Query_Order_Direction)
-	*p = x
-	return p
-}
-func (x Query_Order_Direction) String() string {
-	return proto.EnumName(Query_Order_Direction_name, int32(x))
-}
-func (x *Query_Order_Direction) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Query_Order_Direction_value, data, "Query_Order_Direction")
-	if err != nil {
-		return err
-	}
-	*x = Query_Order_Direction(value)
-	return nil
-}
-
-type Error_ErrorCode int32
-
-const (
-	Error_BAD_REQUEST                  Error_ErrorCode = 1
-	Error_CONCURRENT_TRANSACTION       Error_ErrorCode = 2
-	Error_INTERNAL_ERROR               Error_ErrorCode = 3
-	Error_NEED_INDEX                   Error_ErrorCode = 4
-	Error_TIMEOUT                      Error_ErrorCode = 5
-	Error_PERMISSION_DENIED            Error_ErrorCode = 6
-	Error_BIGTABLE_ERROR               Error_ErrorCode = 7
-	Error_COMMITTED_BUT_STILL_APPLYING Error_ErrorCode = 8
-	Error_CAPABILITY_DISABLED          Error_ErrorCode = 9
-	Error_TRY_ALTERNATE_BACKEND        Error_ErrorCode = 10
-	Error_SAFE_TIME_TOO_OLD            Error_ErrorCode = 11
-)
-
-var Error_ErrorCode_name = map[int32]string{
-	1:  "BAD_REQUEST",
-	2:  "CONCURRENT_TRANSACTION",
-	3:  "INTERNAL_ERROR",
-	4:  "NEED_INDEX",
-	5:  "TIMEOUT",
-	6:  "PERMISSION_DENIED",
-	7:  "BIGTABLE_ERROR",
-	8:  "COMMITTED_BUT_STILL_APPLYING",
-	9:  "CAPABILITY_DISABLED",
-	10: "TRY_ALTERNATE_BACKEND",
-	11: "SAFE_TIME_TOO_OLD",
-}
-var Error_ErrorCode_value = map[string]int32{
-	"BAD_REQUEST":                  1,
-	"CONCURRENT_TRANSACTION":       2,
-	"INTERNAL_ERROR":               3,
-	"NEED_INDEX":                   4,
-	"TIMEOUT":                      5,
-	"PERMISSION_DENIED":            6,
-	"BIGTABLE_ERROR":               7,
-	"COMMITTED_BUT_STILL_APPLYING": 8,
-	"CAPABILITY_DISABLED":          9,
-	"TRY_ALTERNATE_BACKEND":        10,
-	"SAFE_TIME_TOO_OLD":            11,
-}
-
-func (x Error_ErrorCode) Enum() *Error_ErrorCode {
-	p := new(Error_ErrorCode)
-	*p = x
-	return p
-}
-func (x Error_ErrorCode) String() string {
-	return proto.EnumName(Error_ErrorCode_name, int32(x))
-}
-func (x *Error_ErrorCode) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Error_ErrorCode_value, data, "Error_ErrorCode")
-	if err != nil {
-		return err
-	}
-	*x = Error_ErrorCode(value)
-	return nil
-}
-
-type PutRequest_AutoIdPolicy int32
-
-const (
-	PutRequest_CURRENT    PutRequest_AutoIdPolicy = 0
-	PutRequest_SEQUENTIAL PutRequest_AutoIdPolicy = 1
-)
-
-var PutRequest_AutoIdPolicy_name = map[int32]string{
-	0: "CURRENT",
-	1: "SEQUENTIAL",
-}
-var PutRequest_AutoIdPolicy_value = map[string]int32{
-	"CURRENT":    0,
-	"SEQUENTIAL": 1,
-}
-
-func (x PutRequest_AutoIdPolicy) Enum() *PutRequest_AutoIdPolicy {
-	p := new(PutRequest_AutoIdPolicy)
-	*p = x
-	return p
-}
-func (x PutRequest_AutoIdPolicy) String() string {
-	return proto.EnumName(PutRequest_AutoIdPolicy_name, int32(x))
-}
-func (x *PutRequest_AutoIdPolicy) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(PutRequest_AutoIdPolicy_value, data, "PutRequest_AutoIdPolicy")
-	if err != nil {
-		return err
-	}
-	*x = PutRequest_AutoIdPolicy(value)
-	return nil
-}
-
-type Action struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Action) Reset()         { *m = Action{} }
-func (m *Action) String() string { return proto.CompactTextString(m) }
-func (*Action) ProtoMessage()    {}
-
-type PropertyValue struct {
-	Int64Value       *int64                        `protobuf:"varint,1,opt,name=int64Value" json:"int64Value,omitempty"`
-	BooleanValue     *bool                         `protobuf:"varint,2,opt,name=booleanValue" json:"booleanValue,omitempty"`
-	StringValue      *string                       `protobuf:"bytes,3,opt,name=stringValue" json:"stringValue,omitempty"`
-	DoubleValue      *float64                      `protobuf:"fixed64,4,opt,name=doubleValue" json:"doubleValue,omitempty"`
-	Pointvalue       *PropertyValue_PointValue     `protobuf:"group,5,opt,name=PointValue" json:"pointvalue,omitempty"`
-	Uservalue        *PropertyValue_UserValue      `protobuf:"group,8,opt,name=UserValue" json:"uservalue,omitempty"`
-	Referencevalue   *PropertyValue_ReferenceValue `protobuf:"group,12,opt,name=ReferenceValue" json:"referencevalue,omitempty"`
-	XXX_unrecognized []byte                        `json:"-"`
-}
-
-func (m *PropertyValue) Reset()         { *m = PropertyValue{} }
-func (m *PropertyValue) String() string { return proto.CompactTextString(m) }
-func (*PropertyValue) ProtoMessage()    {}
-
-func (m *PropertyValue) GetInt64Value() int64 {
-	if m != nil && m.Int64Value != nil {
-		return *m.Int64Value
-	}
-	return 0
-}
-
-func (m *PropertyValue) GetBooleanValue() bool {
-	if m != nil && m.BooleanValue != nil {
-		return *m.BooleanValue
-	}
-	return false
-}
-
-func (m *PropertyValue) GetStringValue() string {
-	if m != nil && m.StringValue != nil {
-		return *m.StringValue
-	}
-	return ""
-}
-
-func (m *PropertyValue) GetDoubleValue() float64 {
-	if m != nil && m.DoubleValue != nil {
-		return *m.DoubleValue
-	}
-	return 0
-}
-
-func (m *PropertyValue) GetPointvalue() *PropertyValue_PointValue {
-	if m != nil {
-		return m.Pointvalue
-	}
-	return nil
-}
-
-func (m *PropertyValue) GetUservalue() *PropertyValue_UserValue {
-	if m != nil {
-		return m.Uservalue
-	}
-	return nil
-}
-
-func (m *PropertyValue) GetReferencevalue() *PropertyValue_ReferenceValue {
-	if m != nil {
-		return m.Referencevalue
-	}
-	return nil
-}
-
-type PropertyValue_PointValue struct {
-	X                *float64 `protobuf:"fixed64,6,req,name=x" json:"x,omitempty"`
-	Y                *float64 `protobuf:"fixed64,7,req,name=y" json:"y,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *PropertyValue_PointValue) Reset()         { *m = PropertyValue_PointValue{} }
-func (m *PropertyValue_PointValue) String() string { return proto.CompactTextString(m) }
-func (*PropertyValue_PointValue) ProtoMessage()    {}
-
-func (m *PropertyValue_PointValue) GetX() float64 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-func (m *PropertyValue_PointValue) GetY() float64 {
-	if m != nil && m.Y != nil {
-		return *m.Y
-	}
-	return 0
-}
-
-type PropertyValue_UserValue struct {
-	Email             *string `protobuf:"bytes,9,req,name=email" json:"email,omitempty"`
-	AuthDomain        *string `protobuf:"bytes,10,req,name=auth_domain" json:"auth_domain,omitempty"`
-	Nickname          *string `protobuf:"bytes,11,opt,name=nickname" json:"nickname,omitempty"`
-	FederatedIdentity *string `protobuf:"bytes,21,opt,name=federated_identity" json:"federated_identity,omitempty"`
-	FederatedProvider *string `protobuf:"bytes,22,opt,name=federated_provider" json:"federated_provider,omitempty"`
-	XXX_unrecognized  []byte  `json:"-"`
-}
-
-func (m *PropertyValue_UserValue) Reset()         { *m = PropertyValue_UserValue{} }
-func (m *PropertyValue_UserValue) String() string { return proto.CompactTextString(m) }
-func (*PropertyValue_UserValue) ProtoMessage()    {}
-
-func (m *PropertyValue_UserValue) GetEmail() string {
-	if m != nil && m.Email != nil {
-		return *m.Email
-	}
-	return ""
-}
-
-func (m *PropertyValue_UserValue) GetAuthDomain() string {
-	if m != nil && m.AuthDomain != nil {
-		return *m.AuthDomain
-	}
-	return ""
-}
-
-func (m *PropertyValue_UserValue) GetNickname() string {
-	if m != nil && m.Nickname != nil {
-		return *m.Nickname
-	}
-	return ""
-}
-
-func (m *PropertyValue_UserValue) GetFederatedIdentity() string {
-	if m != nil && m.FederatedIdentity != nil {
-		return *m.FederatedIdentity
-	}
-	return ""
-}
-
-func (m *PropertyValue_UserValue) GetFederatedProvider() string {
-	if m != nil && m.FederatedProvider != nil {
-		return *m.FederatedProvider
-	}
-	return ""
-}
-
-type PropertyValue_ReferenceValue struct {
-	App              *string                                     `protobuf:"bytes,13,req,name=app" json:"app,omitempty"`
-	NameSpace        *string                                     `protobuf:"bytes,20,opt,name=name_space" json:"name_space,omitempty"`
-	Pathelement      []*PropertyValue_ReferenceValue_PathElement `protobuf:"group,14,rep,name=PathElement" json:"pathelement,omitempty"`
-	XXX_unrecognized []byte                                      `json:"-"`
-}
-
-func (m *PropertyValue_ReferenceValue) Reset()         { *m = PropertyValue_ReferenceValue{} }
-func (m *PropertyValue_ReferenceValue) String() string { return proto.CompactTextString(m) }
-func (*PropertyValue_ReferenceValue) ProtoMessage()    {}
-
-func (m *PropertyValue_ReferenceValue) GetApp() string {
-	if m != nil && m.App != nil {
-		return *m.App
-	}
-	return ""
-}
-
-func (m *PropertyValue_ReferenceValue) GetNameSpace() string {
-	if m != nil && m.NameSpace != nil {
-		return *m.NameSpace
-	}
-	return ""
-}
-
-func (m *PropertyValue_ReferenceValue) GetPathelement() []*PropertyValue_ReferenceValue_PathElement {
-	if m != nil {
-		return m.Pathelement
-	}
-	return nil
-}
-
-type PropertyValue_ReferenceValue_PathElement struct {
-	Type             *string `protobuf:"bytes,15,req,name=type" json:"type,omitempty"`
-	Id               *int64  `protobuf:"varint,16,opt,name=id" json:"id,omitempty"`
-	Name             *string `protobuf:"bytes,17,opt,name=name" json:"name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *PropertyValue_ReferenceValue_PathElement) Reset() {
-	*m = PropertyValue_ReferenceValue_PathElement{}
-}
-func (m *PropertyValue_ReferenceValue_PathElement) String() string { return proto.CompactTextString(m) }
-func (*PropertyValue_ReferenceValue_PathElement) ProtoMessage()    {}
-
-func (m *PropertyValue_ReferenceValue_PathElement) GetType() string {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return ""
-}
-
-func (m *PropertyValue_ReferenceValue_PathElement) GetId() int64 {
-	if m != nil && m.Id != nil {
-		return *m.Id
-	}
-	return 0
-}
-
-func (m *PropertyValue_ReferenceValue_PathElement) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-type Property struct {
-	Meaning               *Property_Meaning               `protobuf:"varint,1,opt,name=meaning,enum=appengine.Property_Meaning,def=0" json:"meaning,omitempty"`
-	MeaningUri            *string                         `protobuf:"bytes,2,opt,name=meaning_uri" json:"meaning_uri,omitempty"`
-	Name                  *string                         `protobuf:"bytes,3,req,name=name" json:"name,omitempty"`
-	Value                 *PropertyValue                  `protobuf:"bytes,5,req,name=value" json:"value,omitempty"`
-	Multiple              *bool                           `protobuf:"varint,4,req,name=multiple" json:"multiple,omitempty"`
-	Searchable            *bool                           `protobuf:"varint,6,opt,name=searchable,def=0" json:"searchable,omitempty"`
-	FtsTokenizationOption *Property_FtsTokenizationOption `protobuf:"varint,8,opt,name=fts_tokenization_option,enum=appengine.Property_FtsTokenizationOption" json:"fts_tokenization_option,omitempty"`
-	Locale                *string                         `protobuf:"bytes,9,opt,name=locale,def=en" json:"locale,omitempty"`
-	XXX_unrecognized      []byte                          `json:"-"`
-}
-
-func (m *Property) Reset()         { *m = Property{} }
-func (m *Property) String() string { return proto.CompactTextString(m) }
-func (*Property) ProtoMessage()    {}
-
-const Default_Property_Meaning Property_Meaning = Property_NO_MEANING
-const Default_Property_Searchable bool = false
-const Default_Property_Locale string = "en"
-
-func (m *Property) GetMeaning() Property_Meaning {
-	if m != nil && m.Meaning != nil {
-		return *m.Meaning
-	}
-	return Default_Property_Meaning
-}
-
-func (m *Property) GetMeaningUri() string {
-	if m != nil && m.MeaningUri != nil {
-		return *m.MeaningUri
-	}
-	return ""
-}
-
-func (m *Property) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *Property) GetValue() *PropertyValue {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func (m *Property) GetMultiple() bool {
-	if m != nil && m.Multiple != nil {
-		return *m.Multiple
-	}
-	return false
-}
-
-func (m *Property) GetSearchable() bool {
-	if m != nil && m.Searchable != nil {
-		return *m.Searchable
-	}
-	return Default_Property_Searchable
-}
-
-func (m *Property) GetFtsTokenizationOption() Property_FtsTokenizationOption {
-	if m != nil && m.FtsTokenizationOption != nil {
-		return *m.FtsTokenizationOption
-	}
-	return Property_HTML
-}
-
-func (m *Property) GetLocale() string {
-	if m != nil && m.Locale != nil {
-		return *m.Locale
-	}
-	return Default_Property_Locale
-}
-
-type Path struct {
-	Element          []*Path_Element `protobuf:"group,1,rep,name=Element" json:"element,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *Path) Reset()         { *m = Path{} }
-func (m *Path) String() string { return proto.CompactTextString(m) }
-func (*Path) ProtoMessage()    {}
-
-func (m *Path) GetElement() []*Path_Element {
-	if m != nil {
-		return m.Element
-	}
-	return nil
-}
-
-type Path_Element struct {
-	Type             *string `protobuf:"bytes,2,req,name=type" json:"type,omitempty"`
-	Id               *int64  `protobuf:"varint,3,opt,name=id" json:"id,omitempty"`
-	Name             *string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Path_Element) Reset()         { *m = Path_Element{} }
-func (m *Path_Element) String() string { return proto.CompactTextString(m) }
-func (*Path_Element) ProtoMessage()    {}
-
-func (m *Path_Element) GetType() string {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return ""
-}
-
-func (m *Path_Element) GetId() int64 {
-	if m != nil && m.Id != nil {
-		return *m.Id
-	}
-	return 0
-}
-
-func (m *Path_Element) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-type Reference struct {
-	App              *string `protobuf:"bytes,13,req,name=app" json:"app,omitempty"`
-	NameSpace        *string `protobuf:"bytes,20,opt,name=name_space" json:"name_space,omitempty"`
-	Path             *Path   `protobuf:"bytes,14,req,name=path" json:"path,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Reference) Reset()         { *m = Reference{} }
-func (m *Reference) String() string { return proto.CompactTextString(m) }
-func (*Reference) ProtoMessage()    {}
-
-func (m *Reference) GetApp() string {
-	if m != nil && m.App != nil {
-		return *m.App
-	}
-	return ""
-}
-
-func (m *Reference) GetNameSpace() string {
-	if m != nil && m.NameSpace != nil {
-		return *m.NameSpace
-	}
-	return ""
-}
-
-func (m *Reference) GetPath() *Path {
-	if m != nil {
-		return m.Path
-	}
-	return nil
-}
-
-type User struct {
-	Email             *string `protobuf:"bytes,1,req,name=email" json:"email,omitempty"`
-	AuthDomain        *string `protobuf:"bytes,2,req,name=auth_domain" json:"auth_domain,omitempty"`
-	Nickname          *string `protobuf:"bytes,3,opt,name=nickname" json:"nickname,omitempty"`
-	FederatedIdentity *string `protobuf:"bytes,6,opt,name=federated_identity" json:"federated_identity,omitempty"`
-	FederatedProvider *string `protobuf:"bytes,7,opt,name=federated_provider" json:"federated_provider,omitempty"`
-	XXX_unrecognized  []byte  `json:"-"`
-}
-
-func (m *User) Reset()         { *m = User{} }
-func (m *User) String() string { return proto.CompactTextString(m) }
-func (*User) ProtoMessage()    {}
-
-func (m *User) GetEmail() string {
-	if m != nil && m.Email != nil {
-		return *m.Email
-	}
-	return ""
-}
-
-func (m *User) GetAuthDomain() string {
-	if m != nil && m.AuthDomain != nil {
-		return *m.AuthDomain
-	}
-	return ""
-}
-
-func (m *User) GetNickname() string {
-	if m != nil && m.Nickname != nil {
-		return *m.Nickname
-	}
-	return ""
-}
-
-func (m *User) GetFederatedIdentity() string {
-	if m != nil && m.FederatedIdentity != nil {
-		return *m.FederatedIdentity
-	}
-	return ""
-}
-
-func (m *User) GetFederatedProvider() string {
-	if m != nil && m.FederatedProvider != nil {
-		return *m.FederatedProvider
-	}
-	return ""
-}
-
-type EntityProto struct {
-	Key              *Reference        `protobuf:"bytes,13,req,name=key" json:"key,omitempty"`
-	EntityGroup      *Path             `protobuf:"bytes,16,req,name=entity_group" json:"entity_group,omitempty"`
-	Owner            *User             `protobuf:"bytes,17,opt,name=owner" json:"owner,omitempty"`
-	Kind             *EntityProto_Kind `protobuf:"varint,4,opt,name=kind,enum=appengine.EntityProto_Kind" json:"kind,omitempty"`
-	KindUri          *string           `protobuf:"bytes,5,opt,name=kind_uri" json:"kind_uri,omitempty"`
-	Property         []*Property       `protobuf:"bytes,14,rep,name=property" json:"property,omitempty"`
-	RawProperty      []*Property       `protobuf:"bytes,15,rep,name=raw_property" json:"raw_property,omitempty"`
-	Rank             *int32            `protobuf:"varint,18,opt,name=rank" json:"rank,omitempty"`
-	XXX_unrecognized []byte            `json:"-"`
-}
-
-func (m *EntityProto) Reset()         { *m = EntityProto{} }
-func (m *EntityProto) String() string { return proto.CompactTextString(m) }
-func (*EntityProto) ProtoMessage()    {}
-
-func (m *EntityProto) GetKey() *Reference {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *EntityProto) GetEntityGroup() *Path {
-	if m != nil {
-		return m.EntityGroup
-	}
-	return nil
-}
-
-func (m *EntityProto) GetOwner() *User {
-	if m != nil {
-		return m.Owner
-	}
-	return nil
-}
-
-func (m *EntityProto) GetKind() EntityProto_Kind {
-	if m != nil && m.Kind != nil {
-		return *m.Kind
-	}
-	return EntityProto_GD_CONTACT
-}
-
-func (m *EntityProto) GetKindUri() string {
-	if m != nil && m.KindUri != nil {
-		return *m.KindUri
-	}
-	return ""
-}
-
-func (m *EntityProto) GetProperty() []*Property {
-	if m != nil {
-		return m.Property
-	}
-	return nil
-}
-
-func (m *EntityProto) GetRawProperty() []*Property {
-	if m != nil {
-		return m.RawProperty
-	}
-	return nil
-}
-
-func (m *EntityProto) GetRank() int32 {
-	if m != nil && m.Rank != nil {
-		return *m.Rank
-	}
-	return 0
-}
-
-type CompositeProperty struct {
-	IndexId          *int64   `protobuf:"varint,1,req,name=index_id" json:"index_id,omitempty"`
-	Value            []string `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *CompositeProperty) Reset()         { *m = CompositeProperty{} }
-func (m *CompositeProperty) String() string { return proto.CompactTextString(m) }
-func (*CompositeProperty) ProtoMessage()    {}
-
-func (m *CompositeProperty) GetIndexId() int64 {
-	if m != nil && m.IndexId != nil {
-		return *m.IndexId
-	}
-	return 0
-}
-
-func (m *CompositeProperty) GetValue() []string {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-type Index struct {
-	EntityType       *string           `protobuf:"bytes,1,req,name=entity_type" json:"entity_type,omitempty"`
-	Ancestor         *bool             `protobuf:"varint,5,req,name=ancestor" json:"ancestor,omitempty"`
-	Property         []*Index_Property `protobuf:"group,2,rep,name=Property" json:"property,omitempty"`
-	XXX_unrecognized []byte            `json:"-"`
-}
-
-func (m *Index) Reset()         { *m = Index{} }
-func (m *Index) String() string { return proto.CompactTextString(m) }
-func (*Index) ProtoMessage()    {}
-
-func (m *Index) GetEntityType() string {
-	if m != nil && m.EntityType != nil {
-		return *m.EntityType
-	}
-	return ""
-}
-
-func (m *Index) GetAncestor() bool {
-	if m != nil && m.Ancestor != nil {
-		return *m.Ancestor
-	}
-	return false
-}
-
-func (m *Index) GetProperty() []*Index_Property {
-	if m != nil {
-		return m.Property
-	}
-	return nil
-}
-
-type Index_Property struct {
-	Name             *string                   `protobuf:"bytes,3,req,name=name" json:"name,omitempty"`
-	Direction        *Index_Property_Direction `protobuf:"varint,4,opt,name=direction,enum=appengine.Index_Property_Direction,def=1" json:"direction,omitempty"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *Index_Property) Reset()         { *m = Index_Property{} }
-func (m *Index_Property) String() string { return proto.CompactTextString(m) }
-func (*Index_Property) ProtoMessage()    {}
-
-const Default_Index_Property_Direction Index_Property_Direction = Index_Property_ASCENDING
-
-func (m *Index_Property) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *Index_Property) GetDirection() Index_Property_Direction {
-	if m != nil && m.Direction != nil {
-		return *m.Direction
-	}
-	return Default_Index_Property_Direction
-}
-
-type CompositeIndex struct {
-	AppId             *string               `protobuf:"bytes,1,req,name=app_id" json:"app_id,omitempty"`
-	Id                *int64                `protobuf:"varint,2,req,name=id" json:"id,omitempty"`
-	Definition        *Index                `protobuf:"bytes,3,req,name=definition" json:"definition,omitempty"`
-	State             *CompositeIndex_State `protobuf:"varint,4,req,name=state,enum=appengine.CompositeIndex_State" json:"state,omitempty"`
-	OnlyUseIfRequired *bool                 `protobuf:"varint,6,opt,name=only_use_if_required,def=0" json:"only_use_if_required,omitempty"`
-	XXX_unrecognized  []byte                `json:"-"`
-}
-
-func (m *CompositeIndex) Reset()         { *m = CompositeIndex{} }
-func (m *CompositeIndex) String() string { return proto.CompactTextString(m) }
-func (*CompositeIndex) ProtoMessage()    {}
-
-const Default_CompositeIndex_OnlyUseIfRequired bool = false
-
-func (m *CompositeIndex) GetAppId() string {
-	if m != nil && m.AppId != nil {
-		return *m.AppId
-	}
-	return ""
-}
-
-func (m *CompositeIndex) GetId() int64 {
-	if m != nil && m.Id != nil {
-		return *m.Id
-	}
-	return 0
-}
-
-func (m *CompositeIndex) GetDefinition() *Index {
-	if m != nil {
-		return m.Definition
-	}
-	return nil
-}
-
-func (m *CompositeIndex) GetState() CompositeIndex_State {
-	if m != nil && m.State != nil {
-		return *m.State
-	}
-	return CompositeIndex_WRITE_ONLY
-}
-
-func (m *CompositeIndex) GetOnlyUseIfRequired() bool {
-	if m != nil && m.OnlyUseIfRequired != nil {
-		return *m.OnlyUseIfRequired
-	}
-	return Default_CompositeIndex_OnlyUseIfRequired
-}
-
-type IndexPostfix struct {
-	IndexValue       []*IndexPostfix_IndexValue `protobuf:"bytes,1,rep,name=index_value" json:"index_value,omitempty"`
-	Key              *Reference                 `protobuf:"bytes,2,opt,name=key" json:"key,omitempty"`
-	Before           *bool                      `protobuf:"varint,3,opt,name=before,def=1" json:"before,omitempty"`
-	XXX_unrecognized []byte                     `json:"-"`
-}
-
-func (m *IndexPostfix) Reset()         { *m = IndexPostfix{} }
-func (m *IndexPostfix) String() string { return proto.CompactTextString(m) }
-func (*IndexPostfix) ProtoMessage()    {}
-
-const Default_IndexPostfix_Before bool = true
-
-func (m *IndexPostfix) GetIndexValue() []*IndexPostfix_IndexValue {
-	if m != nil {
-		return m.IndexValue
-	}
-	return nil
-}
-
-func (m *IndexPostfix) GetKey() *Reference {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *IndexPostfix) GetBefore() bool {
-	if m != nil && m.Before != nil {
-		return *m.Before
-	}
-	return Default_IndexPostfix_Before
-}
-
-type IndexPostfix_IndexValue struct {
-	PropertyName     *string        `protobuf:"bytes,1,req,name=property_name" json:"property_name,omitempty"`
-	Value            *PropertyValue `protobuf:"bytes,2,req,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte         `json:"-"`
-}
-
-func (m *IndexPostfix_IndexValue) Reset()         { *m = IndexPostfix_IndexValue{} }
-func (m *IndexPostfix_IndexValue) String() string { return proto.CompactTextString(m) }
-func (*IndexPostfix_IndexValue) ProtoMessage()    {}
-
-func (m *IndexPostfix_IndexValue) GetPropertyName() string {
-	if m != nil && m.PropertyName != nil {
-		return *m.PropertyName
-	}
-	return ""
-}
-
-func (m *IndexPostfix_IndexValue) GetValue() *PropertyValue {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-type IndexPosition struct {
-	Key              *string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
-	Before           *bool   `protobuf:"varint,2,opt,name=before,def=1" json:"before,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *IndexPosition) Reset()         { *m = IndexPosition{} }
-func (m *IndexPosition) String() string { return proto.CompactTextString(m) }
-func (*IndexPosition) ProtoMessage()    {}
-
-const Default_IndexPosition_Before bool = true
-
-func (m *IndexPosition) GetKey() string {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return ""
-}
-
-func (m *IndexPosition) GetBefore() bool {
-	if m != nil && m.Before != nil {
-		return *m.Before
-	}
-	return Default_IndexPosition_Before
-}
-
-type Snapshot struct {
-	Ts               *int64 `protobuf:"varint,1,req,name=ts" json:"ts,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Snapshot) Reset()         { *m = Snapshot{} }
-func (m *Snapshot) String() string { return proto.CompactTextString(m) }
-func (*Snapshot) ProtoMessage()    {}
-
-func (m *Snapshot) GetTs() int64 {
-	if m != nil && m.Ts != nil {
-		return *m.Ts
-	}
-	return 0
-}
-
-type InternalHeader struct {
-	Qos              *string `protobuf:"bytes,1,opt,name=qos" json:"qos,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *InternalHeader) Reset()         { *m = InternalHeader{} }
-func (m *InternalHeader) String() string { return proto.CompactTextString(m) }
-func (*InternalHeader) ProtoMessage()    {}
-
-func (m *InternalHeader) GetQos() string {
-	if m != nil && m.Qos != nil {
-		return *m.Qos
-	}
-	return ""
-}
-
-type Transaction struct {
-	Header           *InternalHeader `protobuf:"bytes,4,opt,name=header" json:"header,omitempty"`
-	Handle           *uint64         `protobuf:"fixed64,1,req,name=handle" json:"handle,omitempty"`
-	App              *string         `protobuf:"bytes,2,req,name=app" json:"app,omitempty"`
-	MarkChanges      *bool           `protobuf:"varint,3,opt,name=mark_changes,def=0" json:"mark_changes,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *Transaction) Reset()         { *m = Transaction{} }
-func (m *Transaction) String() string { return proto.CompactTextString(m) }
-func (*Transaction) ProtoMessage()    {}
-
-const Default_Transaction_MarkChanges bool = false
-
-func (m *Transaction) GetHeader() *InternalHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *Transaction) GetHandle() uint64 {
-	if m != nil && m.Handle != nil {
-		return *m.Handle
-	}
-	return 0
-}
-
-func (m *Transaction) GetApp() string {
-	if m != nil && m.App != nil {
-		return *m.App
-	}
-	return ""
-}
-
-func (m *Transaction) GetMarkChanges() bool {
-	if m != nil && m.MarkChanges != nil {
-		return *m.MarkChanges
-	}
-	return Default_Transaction_MarkChanges
-}
-
-type Query struct {
-	Header              *InternalHeader   `protobuf:"bytes,39,opt,name=header" json:"header,omitempty"`
-	App                 *string           `protobuf:"bytes,1,req,name=app" json:"app,omitempty"`
-	NameSpace           *string           `protobuf:"bytes,29,opt,name=name_space" json:"name_space,omitempty"`
-	Kind                *string           `protobuf:"bytes,3,opt,name=kind" json:"kind,omitempty"`
-	Ancestor            *Reference        `protobuf:"bytes,17,opt,name=ancestor" json:"ancestor,omitempty"`
-	Filter              []*Query_Filter   `protobuf:"group,4,rep,name=Filter" json:"filter,omitempty"`
-	SearchQuery         *string           `protobuf:"bytes,8,opt,name=search_query" json:"search_query,omitempty"`
-	Order               []*Query_Order    `protobuf:"group,9,rep,name=Order" json:"order,omitempty"`
-	Hint                *Query_Hint       `protobuf:"varint,18,opt,name=hint,enum=appengine.Query_Hint" json:"hint,omitempty"`
-	Count               *int32            `protobuf:"varint,23,opt,name=count" json:"count,omitempty"`
-	Offset              *int32            `protobuf:"varint,12,opt,name=offset,def=0" json:"offset,omitempty"`
-	Limit               *int32            `protobuf:"varint,16,opt,name=limit" json:"limit,omitempty"`
-	CompiledCursor      *CompiledCursor   `protobuf:"bytes,30,opt,name=compiled_cursor" json:"compiled_cursor,omitempty"`
-	EndCompiledCursor   *CompiledCursor   `protobuf:"bytes,31,opt,name=end_compiled_cursor" json:"end_compiled_cursor,omitempty"`
-	CompositeIndex      []*CompositeIndex `protobuf:"bytes,19,rep,name=composite_index" json:"composite_index,omitempty"`
-	RequirePerfectPlan  *bool             `protobuf:"varint,20,opt,name=require_perfect_plan,def=0" json:"require_perfect_plan,omitempty"`
-	KeysOnly            *bool             `protobuf:"varint,21,opt,name=keys_only,def=0" json:"keys_only,omitempty"`
-	Transaction         *Transaction      `protobuf:"bytes,22,opt,name=transaction" json:"transaction,omitempty"`
-	Compile             *bool             `protobuf:"varint,25,opt,name=compile,def=0" json:"compile,omitempty"`
-	FailoverMs          *int64            `protobuf:"varint,26,opt,name=failover_ms" json:"failover_ms,omitempty"`
-	Strong              *bool             `protobuf:"varint,32,opt,name=strong" json:"strong,omitempty"`
-	PropertyName        []string          `protobuf:"bytes,33,rep,name=property_name" json:"property_name,omitempty"`
-	GroupByPropertyName []string          `protobuf:"bytes,34,rep,name=group_by_property_name" json:"group_by_property_name,omitempty"`
-	Distinct            *bool             `protobuf:"varint,24,opt,name=distinct" json:"distinct,omitempty"`
-	MinSafeTimeSeconds  *int64            `protobuf:"varint,35,opt,name=min_safe_time_seconds" json:"min_safe_time_seconds,omitempty"`
-	SafeReplicaName     []string          `protobuf:"bytes,36,rep,name=safe_replica_name" json:"safe_replica_name,omitempty"`
-	PersistOffset       *bool             `protobuf:"varint,37,opt,name=persist_offset,def=0" json:"persist_offset,omitempty"`
-	XXX_unrecognized    []byte            `json:"-"`
-}
-
-func (m *Query) Reset()         { *m = Query{} }
-func (m *Query) String() string { return proto.CompactTextString(m) }
-func (*Query) ProtoMessage()    {}
-
-const Default_Query_Offset int32 = 0
-const Default_Query_RequirePerfectPlan bool = false
-const Default_Query_KeysOnly bool = false
-const Default_Query_Compile bool = false
-const Default_Query_PersistOffset bool = false
-
-func (m *Query) GetHeader() *InternalHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *Query) GetApp() string {
-	if m != nil && m.App != nil {
-		return *m.App
-	}
-	return ""
-}
-
-func (m *Query) GetNameSpace() string {
-	if m != nil && m.NameSpace != nil {
-		return *m.NameSpace
-	}
-	return ""
-}
-
-func (m *Query) GetKind() string {
-	if m != nil && m.Kind != nil {
-		return *m.Kind
-	}
-	return ""
-}
-
-func (m *Query) GetAncestor() *Reference {
-	if m != nil {
-		return m.Ancestor
-	}
-	return nil
-}
-
-func (m *Query) GetFilter() []*Query_Filter {
-	if m != nil {
-		return m.Filter
-	}
-	return nil
-}
-
-func (m *Query) GetSearchQuery() string {
-	if m != nil && m.SearchQuery != nil {
-		return *m.SearchQuery
-	}
-	return ""
-}
-
-func (m *Query) GetOrder() []*Query_Order {
-	if m != nil {
-		return m.Order
-	}
-	return nil
-}
-
-func (m *Query) GetHint() Query_Hint {
-	if m != nil && m.Hint != nil {
-		return *m.Hint
-	}
-	return Query_ORDER_FIRST
-}
-
-func (m *Query) GetCount() int32 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-func (m *Query) GetOffset() int32 {
-	if m != nil && m.Offset != nil {
-		return *m.Offset
-	}
-	return Default_Query_Offset
-}
-
-func (m *Query) GetLimit() int32 {
-	if m != nil && m.Limit != nil {
-		return *m.Limit
-	}
-	return 0
-}
-
-func (m *Query) GetCompiledCursor() *CompiledCursor {
-	if m != nil {
-		return m.CompiledCursor
-	}
-	return nil
-}
-
-func (m *Query) GetEndCompiledCursor() *CompiledCursor {
-	if m != nil {
-		return m.EndCompiledCursor
-	}
-	return nil
-}
-
-func (m *Query) GetCompositeIndex() []*CompositeIndex {
-	if m != nil {
-		return m.CompositeIndex
-	}
-	return nil
-}
-
-func (m *Query) GetRequirePerfectPlan() bool {
-	if m != nil && m.RequirePerfectPlan != nil {
-		return *m.RequirePerfectPlan
-	}
-	return Default_Query_RequirePerfectPlan
-}
-
-func (m *Query) GetKeysOnly() bool {
-	if m != nil && m.KeysOnly != nil {
-		return *m.KeysOnly
-	}
-	return Default_Query_KeysOnly
-}
-
-func (m *Query) GetTransaction() *Transaction {
-	if m != nil {
-		return m.Transaction
-	}
-	return nil
-}
-
-func (m *Query) GetCompile() bool {
-	if m != nil && m.Compile != nil {
-		return *m.Compile
-	}
-	return Default_Query_Compile
-}
-
-func (m *Query) GetFailoverMs() int64 {
-	if m != nil && m.FailoverMs != nil {
-		return *m.FailoverMs
-	}
-	return 0
-}
-
-func (m *Query) GetStrong() bool {
-	if m != nil && m.Strong != nil {
-		return *m.Strong
-	}
-	return false
-}
-
-func (m *Query) GetPropertyName() []string {
-	if m != nil {
-		return m.PropertyName
-	}
-	return nil
-}
-
-func (m *Query) GetGroupByPropertyName() []string {
-	if m != nil {
-		return m.GroupByPropertyName
-	}
-	return nil
-}
-
-func (m *Query) GetDistinct() bool {
-	if m != nil && m.Distinct != nil {
-		return *m.Distinct
-	}
-	return false
-}
-
-func (m *Query) GetMinSafeTimeSeconds() int64 {
-	if m != nil && m.MinSafeTimeSeconds != nil {
-		return *m.MinSafeTimeSeconds
-	}
-	return 0
-}
-
-func (m *Query) GetSafeReplicaName() []string {
-	if m != nil {
-		return m.SafeReplicaName
-	}
-	return nil
-}
-
-func (m *Query) GetPersistOffset() bool {
-	if m != nil && m.PersistOffset != nil {
-		return *m.PersistOffset
-	}
-	return Default_Query_PersistOffset
-}
-
-type Query_Filter struct {
-	Op               *Query_Filter_Operator `protobuf:"varint,6,req,name=op,enum=appengine.Query_Filter_Operator" json:"op,omitempty"`
-	Property         []*Property            `protobuf:"bytes,14,rep,name=property" json:"property,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
-}
-
-func (m *Query_Filter) Reset()         { *m = Query_Filter{} }
-func (m *Query_Filter) String() string { return proto.CompactTextString(m) }
-func (*Query_Filter) ProtoMessage()    {}
-
-func (m *Query_Filter) GetOp() Query_Filter_Operator {
-	if m != nil && m.Op != nil {
-		return *m.Op
-	}
-	return Query_Filter_LESS_THAN
-}
-
-func (m *Query_Filter) GetProperty() []*Property {
-	if m != nil {
-		return m.Property
-	}
-	return nil
-}
-
-type Query_Order struct {
-	Property         *string                `protobuf:"bytes,10,req,name=property" json:"property,omitempty"`
-	Direction        *Query_Order_Direction `protobuf:"varint,11,opt,name=direction,enum=appengine.Query_Order_Direction,def=1" json:"direction,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
-}
-
-func (m *Query_Order) Reset()         { *m = Query_Order{} }
-func (m *Query_Order) String() string { return proto.CompactTextString(m) }
-func (*Query_Order) ProtoMessage()    {}
-
-const Default_Query_Order_Direction Query_Order_Direction = Query_Order_ASCENDING
-
-func (m *Query_Order) GetProperty() string {
-	if m != nil && m.Property != nil {
-		return *m.Property
-	}
-	return ""
-}
-
-func (m *Query_Order) GetDirection() Query_Order_Direction {
-	if m != nil && m.Direction != nil {
-		return *m.Direction
-	}
-	return Default_Query_Order_Direction
-}
-
-type CompiledQuery struct {
-	Primaryscan       *CompiledQuery_PrimaryScan     `protobuf:"group,1,req,name=PrimaryScan" json:"primaryscan,omitempty"`
-	Mergejoinscan     []*CompiledQuery_MergeJoinScan `protobuf:"group,7,rep,name=MergeJoinScan" json:"mergejoinscan,omitempty"`
-	IndexDef          *Index                         `protobuf:"bytes,21,opt,name=index_def" json:"index_def,omitempty"`
-	Offset            *int32                         `protobuf:"varint,10,opt,name=offset,def=0" json:"offset,omitempty"`
-	Limit             *int32                         `protobuf:"varint,11,opt,name=limit" json:"limit,omitempty"`
-	KeysOnly          *bool                          `protobuf:"varint,12,req,name=keys_only" json:"keys_only,omitempty"`
-	PropertyName      []string                       `protobuf:"bytes,24,rep,name=property_name" json:"property_name,omitempty"`
-	DistinctInfixSize *int32                         `protobuf:"varint,25,opt,name=distinct_infix_size" json:"distinct_infix_size,omitempty"`
-	Entityfilter      *CompiledQuery_EntityFilter    `protobuf:"group,13,opt,name=EntityFilter" json:"entityfilter,omitempty"`
-	XXX_unrecognized  []byte                         `json:"-"`
-}
-
-func (m *CompiledQuery) Reset()         { *m = CompiledQuery{} }
-func (m *CompiledQuery) String() string { return proto.CompactTextString(m) }
-func (*CompiledQuery) ProtoMessage()    {}
-
-const Default_CompiledQuery_Offset int32 = 0
-
-func (m *CompiledQuery) GetPrimaryscan() *CompiledQuery_PrimaryScan {
-	if m != nil {
-		return m.Primaryscan
-	}
-	return nil
-}
-
-func (m *CompiledQuery) GetMergejoinscan() []*CompiledQuery_MergeJoinScan {
-	if m != nil {
-		return m.Mergejoinscan
-	}
-	return nil
-}
-
-func (m *CompiledQuery) GetIndexDef() *Index {
-	if m != nil {
-		return m.IndexDef
-	}
-	return nil
-}
-
-func (m *CompiledQuery) GetOffset() int32 {
-	if m != nil && m.Offset != nil {
-		return *m.Offset
-	}
-	return Default_CompiledQuery_Offset
-}
-
-func (m *CompiledQuery) GetLimit() int32 {
-	if m != nil && m.Limit != nil {
-		return *m.Limit
-	}
-	return 0
-}
-
-func (m *CompiledQuery) GetKeysOnly() bool {
-	if m != nil && m.KeysOnly != nil {
-		return *m.KeysOnly
-	}
-	return false
-}
-
-func (m *CompiledQuery) GetPropertyName() []string {
-	if m != nil {
-		return m.PropertyName
-	}
-	return nil
-}
-
-func (m *CompiledQuery) GetDistinctInfixSize() int32 {
-	if m != nil && m.DistinctInfixSize != nil {
-		return *m.DistinctInfixSize
-	}
-	return 0
-}
-
-func (m *CompiledQuery) GetEntityfilter() *CompiledQuery_EntityFilter {
-	if m != nil {
-		return m.Entityfilter
-	}
-	return nil
-}
-
-type CompiledQuery_PrimaryScan struct {
-	IndexName                  *string  `protobuf:"bytes,2,opt,name=index_name" json:"index_name,omitempty"`
-	StartKey                   *string  `protobuf:"bytes,3,opt,name=start_key" json:"start_key,omitempty"`
-	StartInclusive             *bool    `protobuf:"varint,4,opt,name=start_inclusive" json:"start_inclusive,omitempty"`
-	EndKey                     *string  `protobuf:"bytes,5,opt,name=end_key" json:"end_key,omitempty"`
-	EndInclusive               *bool    `protobuf:"varint,6,opt,name=end_inclusive" json:"end_inclusive,omitempty"`
-	StartPostfixValue          []string `protobuf:"bytes,22,rep,name=start_postfix_value" json:"start_postfix_value,omitempty"`
-	EndPostfixValue            []string `protobuf:"bytes,23,rep,name=end_postfix_value" json:"end_postfix_value,omitempty"`
-	EndUnappliedLogTimestampUs *int64   `protobuf:"varint,19,opt,name=end_unapplied_log_timestamp_us" json:"end_unapplied_log_timestamp_us,omitempty"`
-	XXX_unrecognized           []byte   `json:"-"`
-}
-
-func (m *CompiledQuery_PrimaryScan) Reset()         { *m = CompiledQuery_PrimaryScan{} }
-func (m *CompiledQuery_PrimaryScan) String() string { return proto.CompactTextString(m) }
-func (*CompiledQuery_PrimaryScan) ProtoMessage()    {}
-
-func (m *CompiledQuery_PrimaryScan) GetIndexName() string {
-	if m != nil && m.IndexName != nil {
-		return *m.IndexName
-	}
-	return ""
-}
-
-func (m *CompiledQuery_PrimaryScan) GetStartKey() string {
-	if m != nil && m.StartKey != nil {
-		return *m.StartKey
-	}
-	return ""
-}
-
-func (m *CompiledQuery_PrimaryScan) GetStartInclusive() bool {
-	if m != nil && m.StartInclusive != nil {
-		return *m.StartInclusive
-	}
-	return false
-}
-
-func (m *CompiledQuery_PrimaryScan) GetEndKey() string {
-	if m != nil && m.EndKey != nil {
-		return *m.EndKey
-	}
-	return ""
-}
-
-func (m *CompiledQuery_PrimaryScan) GetEndInclusive() bool {
-	if m != nil && m.EndInclusive != nil {
-		return *m.EndInclusive
-	}
-	return false
-}
-
-func (m *CompiledQuery_PrimaryScan) GetStartPostfixValue() []string {
-	if m != nil {
-		return m.StartPostfixValue
-	}
-	return nil
-}
-
-func (m *CompiledQuery_PrimaryScan) GetEndPostfixValue() []string {
-	if m != nil {
-		return m.EndPostfixValue
-	}
-	return nil
-}
-
-func (m *CompiledQuery_PrimaryScan) GetEndUnappliedLogTimestampUs() int64 {
-	if m != nil && m.EndUnappliedLogTimestampUs != nil {
-		return *m.EndUnappliedLogTimestampUs
-	}
-	return 0
-}
-
-type CompiledQuery_MergeJoinScan struct {
-	IndexName        *string  `protobuf:"bytes,8,req,name=index_name" json:"index_name,omitempty"`
-	PrefixValue      []string `protobuf:"bytes,9,rep,name=prefix_value" json:"prefix_value,omitempty"`
-	ValuePrefix      *bool    `protobuf:"varint,20,opt,name=value_prefix,def=0" json:"value_prefix,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *CompiledQuery_MergeJoinScan) Reset()         { *m = CompiledQuery_MergeJoinScan{} }
-func (m *CompiledQuery_MergeJoinScan) String() string { return proto.CompactTextString(m) }
-func (*CompiledQuery_MergeJoinScan) ProtoMessage()    {}
-
-const Default_CompiledQuery_MergeJoinScan_ValuePrefix bool = false
-
-func (m *CompiledQuery_MergeJoinScan) GetIndexName() string {
-	if m != nil && m.IndexName != nil {
-		return *m.IndexName
-	}
-	return ""
-}
-
-func (m *CompiledQuery_MergeJoinScan) GetPrefixValue() []string {
-	if m != nil {
-		return m.PrefixValue
-	}
-	return nil
-}
-
-func (m *CompiledQuery_MergeJoinScan) GetValuePrefix() bool {
-	if m != nil && m.ValuePrefix != nil {
-		return *m.ValuePrefix
-	}
-	return Default_CompiledQuery_MergeJoinScan_ValuePrefix
-}
-
-type CompiledQuery_EntityFilter struct {
-	Distinct         *bool      `protobuf:"varint,14,opt,name=distinct,def=0" json:"distinct,omitempty"`
-	Kind             *string    `protobuf:"bytes,17,opt,name=kind" json:"kind,omitempty"`
-	Ancestor         *Reference `protobuf:"bytes,18,opt,name=ancestor" json:"ancestor,omitempty"`
-	XXX_unrecognized []byte     `json:"-"`
-}
-
-func (m *CompiledQuery_EntityFilter) Reset()         { *m = CompiledQuery_EntityFilter{} }
-func (m *CompiledQuery_EntityFilter) String() string { return proto.CompactTextString(m) }
-func (*CompiledQuery_EntityFilter) ProtoMessage()    {}
-
-const Default_CompiledQuery_EntityFilter_Distinct bool = false
-
-func (m *CompiledQuery_EntityFilter) GetDistinct() bool {
-	if m != nil && m.Distinct != nil {
-		return *m.Distinct
-	}
-	return Default_CompiledQuery_EntityFilter_Distinct
-}
-
-func (m *CompiledQuery_EntityFilter) GetKind() string {
-	if m != nil && m.Kind != nil {
-		return *m.Kind
-	}
-	return ""
-}
-
-func (m *CompiledQuery_EntityFilter) GetAncestor() *Reference {
-	if m != nil {
-		return m.Ancestor
-	}
-	return nil
-}
-
-type CompiledCursor struct {
-	Position         *CompiledCursor_Position `protobuf:"group,2,opt,name=Position" json:"position,omitempty"`
-	XXX_unrecognized []byte                   `json:"-"`
-}
-
-func (m *CompiledCursor) Reset()         { *m = CompiledCursor{} }
-func (m *CompiledCursor) String() string { return proto.CompactTextString(m) }
-func (*CompiledCursor) ProtoMessage()    {}
-
-func (m *CompiledCursor) GetPosition() *CompiledCursor_Position {
-	if m != nil {
-		return m.Position
-	}
-	return nil
-}
-
-type CompiledCursor_Position struct {
-	StartKey         *string                               `protobuf:"bytes,27,opt,name=start_key" json:"start_key,omitempty"`
-	Indexvalue       []*CompiledCursor_Position_IndexValue `protobuf:"group,29,rep,name=IndexValue" json:"indexvalue,omitempty"`
-	Key              *Reference                            `protobuf:"bytes,32,opt,name=key" json:"key,omitempty"`
-	StartInclusive   *bool                                 `protobuf:"varint,28,opt,name=start_inclusive,def=1" json:"start_inclusive,omitempty"`
-	XXX_unrecognized []byte                                `json:"-"`
-}
-
-func (m *CompiledCursor_Position) Reset()         { *m = CompiledCursor_Position{} }
-func (m *CompiledCursor_Position) String() string { return proto.CompactTextString(m) }
-func (*CompiledCursor_Position) ProtoMessage()    {}
-
-const Default_CompiledCursor_Position_StartInclusive bool = true
-
-func (m *CompiledCursor_Position) GetStartKey() string {
-	if m != nil && m.StartKey != nil {
-		return *m.StartKey
-	}
-	return ""
-}
-
-func (m *CompiledCursor_Position) GetIndexvalue() []*CompiledCursor_Position_IndexValue {
-	if m != nil {
-		return m.Indexvalue
-	}
-	return nil
-}
-
-func (m *CompiledCursor_Position) GetKey() *Reference {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *CompiledCursor_Position) GetStartInclusive() bool {
-	if m != nil && m.StartInclusive != nil {
-		return *m.StartInclusive
-	}
-	return Default_CompiledCursor_Position_StartInclusive
-}
-
-type CompiledCursor_Position_IndexValue struct {
-	Property         *string        `protobuf:"bytes,30,opt,name=property" json:"property,omitempty"`
-	Value            *PropertyValue `protobuf:"bytes,31,req,name=value" json:"value,omitempty"`
-	XXX_unrecognized []byte         `json:"-"`
-}
-
-func (m *CompiledCursor_Position_IndexValue) Reset()         { *m = CompiledCursor_Position_IndexValue{} }
-func (m *CompiledCursor_Position_IndexValue) String() string { return proto.CompactTextString(m) }
-func (*CompiledCursor_Position_IndexValue) ProtoMessage()    {}
-
-func (m *CompiledCursor_Position_IndexValue) GetProperty() string {
-	if m != nil && m.Property != nil {
-		return *m.Property
-	}
-	return ""
-}
-
-func (m *CompiledCursor_Position_IndexValue) GetValue() *PropertyValue {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-type Cursor struct {
-	Cursor           *uint64 `protobuf:"fixed64,1,req,name=cursor" json:"cursor,omitempty"`
-	App              *string `protobuf:"bytes,2,opt,name=app" json:"app,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Cursor) Reset()         { *m = Cursor{} }
-func (m *Cursor) String() string { return proto.CompactTextString(m) }
-func (*Cursor) ProtoMessage()    {}
-
-func (m *Cursor) GetCursor() uint64 {
-	if m != nil && m.Cursor != nil {
-		return *m.Cursor
-	}
-	return 0
-}
-
-func (m *Cursor) GetApp() string {
-	if m != nil && m.App != nil {
-		return *m.App
-	}
-	return ""
-}
-
-type Error struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Error) Reset()         { *m = Error{} }
-func (m *Error) String() string { return proto.CompactTextString(m) }
-func (*Error) ProtoMessage()    {}
-
-type Cost struct {
-	IndexWrites             *int32           `protobuf:"varint,1,opt,name=index_writes" json:"index_writes,omitempty"`
-	IndexWriteBytes         *int32           `protobuf:"varint,2,opt,name=index_write_bytes" json:"index_write_bytes,omitempty"`
-	EntityWrites            *int32           `protobuf:"varint,3,opt,name=entity_writes" json:"entity_writes,omitempty"`
-	EntityWriteBytes        *int32           `protobuf:"varint,4,opt,name=entity_write_bytes" json:"entity_write_bytes,omitempty"`
-	Commitcost              *Cost_CommitCost `protobuf:"group,5,opt,name=CommitCost" json:"commitcost,omitempty"`
-	ApproximateStorageDelta *int32           `protobuf:"varint,8,opt,name=approximate_storage_delta" json:"approximate_storage_delta,omitempty"`
-	IdSequenceUpdates       *int32           `protobuf:"varint,9,opt,name=id_sequence_updates" json:"id_sequence_updates,omitempty"`
-	XXX_unrecognized        []byte           `json:"-"`
-}
-
-func (m *Cost) Reset()         { *m = Cost{} }
-func (m *Cost) String() string { return proto.CompactTextString(m) }
-func (*Cost) ProtoMessage()    {}
-
-func (m *Cost) GetIndexWrites() int32 {
-	if m != nil && m.IndexWrites != nil {
-		return *m.IndexWrites
-	}
-	return 0
-}
-
-func (m *Cost) GetIndexWriteBytes() int32 {
-	if m != nil && m.IndexWriteBytes != nil {
-		return *m.IndexWriteBytes
-	}
-	return 0
-}
-
-func (m *Cost) GetEntityWrites() int32 {
-	if m != nil && m.EntityWrites != nil {
-		return *m.EntityWrites
-	}
-	return 0
-}
-
-func (m *Cost) GetEntityWriteBytes() int32 {
-	if m != nil && m.EntityWriteBytes != nil {
-		return *m.EntityWriteBytes
-	}
-	return 0
-}
-
-func (m *Cost) GetCommitcost() *Cost_CommitCost {
-	if m != nil {
-		return m.Commitcost
-	}
-	return nil
-}
-
-func (m *Cost) GetApproximateStorageDelta() int32 {
-	if m != nil && m.ApproximateStorageDelta != nil {
-		return *m.ApproximateStorageDelta
-	}
-	return 0
-}
-
-func (m *Cost) GetIdSequenceUpdates() int32 {
-	if m != nil && m.IdSequenceUpdates != nil {
-		return *m.IdSequenceUpdates
-	}
-	return 0
-}
-
-type Cost_CommitCost struct {
-	RequestedEntityPuts    *int32 `protobuf:"varint,6,opt,name=requested_entity_puts" json:"requested_entity_puts,omitempty"`
-	RequestedEntityDeletes *int32 `protobuf:"varint,7,opt,name=requested_entity_deletes" json:"requested_entity_deletes,omitempty"`
-	XXX_unrecognized       []byte `json:"-"`
-}
-
-func (m *Cost_CommitCost) Reset()         { *m = Cost_CommitCost{} }
-func (m *Cost_CommitCost) String() string { return proto.CompactTextString(m) }
-func (*Cost_CommitCost) ProtoMessage()    {}
-
-func (m *Cost_CommitCost) GetRequestedEntityPuts() int32 {
-	if m != nil && m.RequestedEntityPuts != nil {
-		return *m.RequestedEntityPuts
-	}
-	return 0
-}
-
-func (m *Cost_CommitCost) GetRequestedEntityDeletes() int32 {
-	if m != nil && m.RequestedEntityDeletes != nil {
-		return *m.RequestedEntityDeletes
-	}
-	return 0
-}
-
-type GetRequest struct {
-	Header           *InternalHeader `protobuf:"bytes,6,opt,name=header" json:"header,omitempty"`
-	Key              []*Reference    `protobuf:"bytes,1,rep,name=key" json:"key,omitempty"`
-	Transaction      *Transaction    `protobuf:"bytes,2,opt,name=transaction" json:"transaction,omitempty"`
-	FailoverMs       *int64          `protobuf:"varint,3,opt,name=failover_ms" json:"failover_ms,omitempty"`
-	Strong           *bool           `protobuf:"varint,4,opt,name=strong" json:"strong,omitempty"`
-	AllowDeferred    *bool           `protobuf:"varint,5,opt,name=allow_deferred,def=0" json:"allow_deferred,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *GetRequest) Reset()         { *m = GetRequest{} }
-func (m *GetRequest) String() string { return proto.CompactTextString(m) }
-func (*GetRequest) ProtoMessage()    {}
-
-const Default_GetRequest_AllowDeferred bool = false
-
-func (m *GetRequest) GetHeader() *InternalHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *GetRequest) GetKey() []*Reference {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *GetRequest) GetTransaction() *Transaction {
-	if m != nil {
-		return m.Transaction
-	}
-	return nil
-}
-
-func (m *GetRequest) GetFailoverMs() int64 {
-	if m != nil && m.FailoverMs != nil {
-		return *m.FailoverMs
-	}
-	return 0
-}
-
-func (m *GetRequest) GetStrong() bool {
-	if m != nil && m.Strong != nil {
-		return *m.Strong
-	}
-	return false
-}
-
-func (m *GetRequest) GetAllowDeferred() bool {
-	if m != nil && m.AllowDeferred != nil {
-		return *m.AllowDeferred
-	}
-	return Default_GetRequest_AllowDeferred
-}
-
-type GetResponse struct {
-	Entity           []*GetResponse_Entity `protobuf:"group,1,rep,name=Entity" json:"entity,omitempty"`
-	Deferred         []*Reference          `protobuf:"bytes,5,rep,name=deferred" json:"deferred,omitempty"`
-	InOrder          *bool                 `protobuf:"varint,6,opt,name=in_order,def=1" json:"in_order,omitempty"`
-	XXX_unrecognized []byte                `json:"-"`
-}
-
-func (m *GetResponse) Reset()         { *m = GetResponse{} }
-func (m *GetResponse) String() string { return proto.CompactTextString(m) }
-func (*GetResponse) ProtoMessage()    {}
-
-const Default_GetResponse_InOrder bool = true
-
-func (m *GetResponse) GetEntity() []*GetResponse_Entity {
-	if m != nil {
-		return m.Entity
-	}
-	return nil
-}
-
-func (m *GetResponse) GetDeferred() []*Reference {
-	if m != nil {
-		return m.Deferred
-	}
-	return nil
-}
-
-func (m *GetResponse) GetInOrder() bool {
-	if m != nil && m.InOrder != nil {
-		return *m.InOrder
-	}
-	return Default_GetResponse_InOrder
-}
-
-type GetResponse_Entity struct {
-	Entity           *EntityProto `protobuf:"bytes,2,opt,name=entity" json:"entity,omitempty"`
-	Key              *Reference   `protobuf:"bytes,4,opt,name=key" json:"key,omitempty"`
-	Version          *int64       `protobuf:"varint,3,opt,name=version" json:"version,omitempty"`
-	XXX_unrecognized []byte       `json:"-"`
-}
-
-func (m *GetResponse_Entity) Reset()         { *m = GetResponse_Entity{} }
-func (m *GetResponse_Entity) String() string { return proto.CompactTextString(m) }
-func (*GetResponse_Entity) ProtoMessage()    {}
-
-func (m *GetResponse_Entity) GetEntity() *EntityProto {
-	if m != nil {
-		return m.Entity
-	}
-	return nil
-}
-
-func (m *GetResponse_Entity) GetKey() *Reference {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *GetResponse_Entity) GetVersion() int64 {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return 0
-}
-
-type PutRequest struct {
-	Header           *InternalHeader          `protobuf:"bytes,11,opt,name=header" json:"header,omitempty"`
-	Entity           []*EntityProto           `protobuf:"bytes,1,rep,name=entity" json:"entity,omitempty"`
-	Transaction      *Transaction             `protobuf:"bytes,2,opt,name=transaction" json:"transaction,omitempty"`
-	CompositeIndex   []*CompositeIndex        `protobuf:"bytes,3,rep,name=composite_index" json:"composite_index,omitempty"`
-	Trusted          *bool                    `protobuf:"varint,4,opt,name=trusted,def=0" json:"trusted,omitempty"`
-	Force            *bool                    `protobuf:"varint,7,opt,name=force,def=0" json:"force,omitempty"`
-	MarkChanges      *bool                    `protobuf:"varint,8,opt,name=mark_changes,def=0" json:"mark_changes,omitempty"`
-	Snapshot         []*Snapshot              `protobuf:"bytes,9,rep,name=snapshot" json:"snapshot,omitempty"`
-	AutoIdPolicy     *PutRequest_AutoIdPolicy `protobuf:"varint,10,opt,name=auto_id_policy,enum=appengine.PutRequest_AutoIdPolicy,def=0" json:"auto_id_policy,omitempty"`
-	XXX_unrecognized []byte                   `json:"-"`
-}
-
-func (m *PutRequest) Reset()         { *m = PutRequest{} }
-func (m *PutRequest) String() string { return proto.CompactTextString(m) }
-func (*PutRequest) ProtoMessage()    {}
-
-const Default_PutRequest_Trusted bool = false
-const Default_PutRequest_Force bool = false
-const Default_PutRequest_MarkChanges bool = false
-const Default_PutRequest_AutoIdPolicy PutRequest_AutoIdPolicy = PutRequest_CURRENT
-
-func (m *PutRequest) GetHeader() *InternalHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *PutRequest) GetEntity() []*EntityProto {
-	if m != nil {
-		return m.Entity
-	}
-	return nil
-}
-
-func (m *PutRequest) GetTransaction() *Transaction {
-	if m != nil {
-		return m.Transaction
-	}
-	return nil
-}
-
-func (m *PutRequest) GetCompositeIndex() []*CompositeIndex {
-	if m != nil {
-		return m.CompositeIndex
-	}
-	return nil
-}
-
-func (m *PutRequest) GetTrusted() bool {
-	if m != nil && m.Trusted != nil {
-		return *m.Trusted
-	}
-	return Default_PutRequest_Trusted
-}
-
-func (m *PutRequest) GetForce() bool {
-	if m != nil && m.Force != nil {
-		return *m.Force
-	}
-	return Default_PutRequest_Force
-}
-
-func (m *PutRequest) GetMarkChanges() bool {
-	if m != nil && m.MarkChanges != nil {
-		return *m.MarkChanges
-	}
-	return Default_PutRequest_MarkChanges
-}
-
-func (m *PutRequest) GetSnapshot() []*Snapshot {
-	if m != nil {
-		return m.Snapshot
-	}
-	return nil
-}
-
-func (m *PutRequest) GetAutoIdPolicy() PutRequest_AutoIdPolicy {
-	if m != nil && m.AutoIdPolicy != nil {
-		return *m.AutoIdPolicy
-	}
-	return Default_PutRequest_AutoIdPolicy
-}
-
-type PutResponse struct {
-	Key              []*Reference `protobuf:"bytes,1,rep,name=key" json:"key,omitempty"`
-	Cost             *Cost        `protobuf:"bytes,2,opt,name=cost" json:"cost,omitempty"`
-	Version          []int64      `protobuf:"varint,3,rep,name=version" json:"version,omitempty"`
-	XXX_unrecognized []byte       `json:"-"`
-}
-
-func (m *PutResponse) Reset()         { *m = PutResponse{} }
-func (m *PutResponse) String() string { return proto.CompactTextString(m) }
-func (*PutResponse) ProtoMessage()    {}
-
-func (m *PutResponse) GetKey() []*Reference {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *PutResponse) GetCost() *Cost {
-	if m != nil {
-		return m.Cost
-	}
-	return nil
-}
-
-func (m *PutResponse) GetVersion() []int64 {
-	if m != nil {
-		return m.Version
-	}
-	return nil
-}
-
-type TouchRequest struct {
-	Header           *InternalHeader   `protobuf:"bytes,10,opt,name=header" json:"header,omitempty"`
-	Key              []*Reference      `protobuf:"bytes,1,rep,name=key" json:"key,omitempty"`
-	CompositeIndex   []*CompositeIndex `protobuf:"bytes,2,rep,name=composite_index" json:"composite_index,omitempty"`
-	Force            *bool             `protobuf:"varint,3,opt,name=force,def=0" json:"force,omitempty"`
-	Snapshot         []*Snapshot       `protobuf:"bytes,9,rep,name=snapshot" json:"snapshot,omitempty"`
-	XXX_unrecognized []byte            `json:"-"`
-}
-
-func (m *TouchRequest) Reset()         { *m = TouchRequest{} }
-func (m *TouchRequest) String() string { return proto.CompactTextString(m) }
-func (*TouchRequest) ProtoMessage()    {}
-
-const Default_TouchRequest_Force bool = false
-
-func (m *TouchRequest) GetHeader() *InternalHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *TouchRequest) GetKey() []*Reference {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *TouchRequest) GetCompositeIndex() []*CompositeIndex {
-	if m != nil {
-		return m.CompositeIndex
-	}
-	return nil
-}
-
-func (m *TouchRequest) GetForce() bool {
-	if m != nil && m.Force != nil {
-		return *m.Force
-	}
-	return Default_TouchRequest_Force
-}
-
-func (m *TouchRequest) GetSnapshot() []*Snapshot {
-	if m != nil {
-		return m.Snapshot
-	}
-	return nil
-}
-
-type TouchResponse struct {
-	Cost             *Cost  `protobuf:"bytes,1,opt,name=cost" json:"cost,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *TouchResponse) Reset()         { *m = TouchResponse{} }
-func (m *TouchResponse) String() string { return proto.CompactTextString(m) }
-func (*TouchResponse) ProtoMessage()    {}
-
-func (m *TouchResponse) GetCost() *Cost {
-	if m != nil {
-		return m.Cost
-	}
-	return nil
-}
-
-type DeleteRequest struct {
-	Header           *InternalHeader `protobuf:"bytes,10,opt,name=header" json:"header,omitempty"`
-	Key              []*Reference    `protobuf:"bytes,6,rep,name=key" json:"key,omitempty"`
-	Transaction      *Transaction    `protobuf:"bytes,5,opt,name=transaction" json:"transaction,omitempty"`
-	Trusted          *bool           `protobuf:"varint,4,opt,name=trusted,def=0" json:"trusted,omitempty"`
-	Force            *bool           `protobuf:"varint,7,opt,name=force,def=0" json:"force,omitempty"`
-	MarkChanges      *bool           `protobuf:"varint,8,opt,name=mark_changes,def=0" json:"mark_changes,omitempty"`
-	Snapshot         []*Snapshot     `protobuf:"bytes,9,rep,name=snapshot" json:"snapshot,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *DeleteRequest) Reset()         { *m = DeleteRequest{} }
-func (m *DeleteRequest) String() string { return proto.CompactTextString(m) }
-func (*DeleteRequest) ProtoMessage()    {}
-
-const Default_DeleteRequest_Trusted bool = false
-const Default_DeleteRequest_Force bool = false
-const Default_DeleteRequest_MarkChanges bool = false
-
-func (m *DeleteRequest) GetHeader() *InternalHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *DeleteRequest) GetKey() []*Reference {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *DeleteRequest) GetTransaction() *Transaction {
-	if m != nil {
-		return m.Transaction
-	}
-	return nil
-}
-
-func (m *DeleteRequest) GetTrusted() bool {
-	if m != nil && m.Trusted != nil {
-		return *m.Trusted
-	}
-	return Default_DeleteRequest_Trusted
-}
-
-func (m *DeleteRequest) GetForce() bool {
-	if m != nil && m.Force != nil {
-		return *m.Force
-	}
-	return Default_DeleteRequest_Force
-}
-
-func (m *DeleteRequest) GetMarkChanges() bool {
-	if m != nil && m.MarkChanges != nil {
-		return *m.MarkChanges
-	}
-	return Default_DeleteRequest_MarkChanges
-}
-
-func (m *DeleteRequest) GetSnapshot() []*Snapshot {
-	if m != nil {
-		return m.Snapshot
-	}
-	return nil
-}
-
-type DeleteResponse struct {
-	Cost             *Cost   `protobuf:"bytes,1,opt,name=cost" json:"cost,omitempty"`
-	Version          []int64 `protobuf:"varint,3,rep,name=version" json:"version,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *DeleteResponse) Reset()         { *m = DeleteResponse{} }
-func (m *DeleteResponse) String() string { return proto.CompactTextString(m) }
-func (*DeleteResponse) ProtoMessage()    {}
-
-func (m *DeleteResponse) GetCost() *Cost {
-	if m != nil {
-		return m.Cost
-	}
-	return nil
-}
-
-func (m *DeleteResponse) GetVersion() []int64 {
-	if m != nil {
-		return m.Version
-	}
-	return nil
-}
-
-type NextRequest struct {
-	Header           *InternalHeader `protobuf:"bytes,5,opt,name=header" json:"header,omitempty"`
-	Cursor           *Cursor         `protobuf:"bytes,1,req,name=cursor" json:"cursor,omitempty"`
-	Count            *int32          `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
-	Offset           *int32          `protobuf:"varint,4,opt,name=offset,def=0" json:"offset,omitempty"`
-	Compile          *bool           `protobuf:"varint,3,opt,name=compile,def=0" json:"compile,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *NextRequest) Reset()         { *m = NextRequest{} }
-func (m *NextRequest) String() string { return proto.CompactTextString(m) }
-func (*NextRequest) ProtoMessage()    {}
-
-const Default_NextRequest_Offset int32 = 0
-const Default_NextRequest_Compile bool = false
-
-func (m *NextRequest) GetHeader() *InternalHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *NextRequest) GetCursor() *Cursor {
-	if m != nil {
-		return m.Cursor
-	}
-	return nil
-}
-
-func (m *NextRequest) GetCount() int32 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-func (m *NextRequest) GetOffset() int32 {
-	if m != nil && m.Offset != nil {
-		return *m.Offset
-	}
-	return Default_NextRequest_Offset
-}
-
-func (m *NextRequest) GetCompile() bool {
-	if m != nil && m.Compile != nil {
-		return *m.Compile
-	}
-	return Default_NextRequest_Compile
-}
-
-type QueryResult struct {
-	Cursor           *Cursor           `protobuf:"bytes,1,opt,name=cursor" json:"cursor,omitempty"`
-	Result           []*EntityProto    `protobuf:"bytes,2,rep,name=result" json:"result,omitempty"`
-	SkippedResults   *int32            `protobuf:"varint,7,opt,name=skipped_results" json:"skipped_results,omitempty"`
-	MoreResults      *bool             `protobuf:"varint,3,req,name=more_results" json:"more_results,omitempty"`
-	KeysOnly         *bool             `protobuf:"varint,4,opt,name=keys_only" json:"keys_only,omitempty"`
-	IndexOnly        *bool             `protobuf:"varint,9,opt,name=index_only" json:"index_only,omitempty"`
-	SmallOps         *bool             `protobuf:"varint,10,opt,name=small_ops" json:"small_ops,omitempty"`
-	CompiledQuery    *CompiledQuery    `protobuf:"bytes,5,opt,name=compiled_query" json:"compiled_query,omitempty"`
-	CompiledCursor   *CompiledCursor   `protobuf:"bytes,6,opt,name=compiled_cursor" json:"compiled_cursor,omitempty"`
-	Index            []*CompositeIndex `protobuf:"bytes,8,rep,name=index" json:"index,omitempty"`
-	Version          []int64           `protobuf:"varint,11,rep,name=version" json:"version,omitempty"`
-	XXX_unrecognized []byte            `json:"-"`
-}
-
-func (m *QueryResult) Reset()         { *m = QueryResult{} }
-func (m *QueryResult) String() string { return proto.CompactTextString(m) }
-func (*QueryResult) ProtoMessage()    {}
-
-func (m *QueryResult) GetCursor() *Cursor {
-	if m != nil {
-		return m.Cursor
-	}
-	return nil
-}
-
-func (m *QueryResult) GetResult() []*EntityProto {
-	if m != nil {
-		return m.Result
-	}
-	return nil
-}
-
-func (m *QueryResult) GetSkippedResults() int32 {
-	if m != nil && m.SkippedResults != nil {
-		return *m.SkippedResults
-	}
-	return 0
-}
-
-func (m *QueryResult) GetMoreResults() bool {
-	if m != nil && m.MoreResults != nil {
-		return *m.MoreResults
-	}
-	return false
-}
-
-func (m *QueryResult) GetKeysOnly() bool {
-	if m != nil && m.KeysOnly != nil {
-		return *m.KeysOnly
-	}
-	return false
-}
-
-func (m *QueryResult) GetIndexOnly() bool {
-	if m != nil && m.IndexOnly != nil {
-		return *m.IndexOnly
-	}
-	return false
-}
-
-func (m *QueryResult) GetSmallOps() bool {
-	if m != nil && m.SmallOps != nil {
-		return *m.SmallOps
-	}
-	return false
-}
-
-func (m *QueryResult) GetCompiledQuery() *CompiledQuery {
-	if m != nil {
-		return m.CompiledQuery
-	}
-	return nil
-}
-
-func (m *QueryResult) GetCompiledCursor() *CompiledCursor {
-	if m != nil {
-		return m.CompiledCursor
-	}
-	return nil
-}
-
-func (m *QueryResult) GetIndex() []*CompositeIndex {
-	if m != nil {
-		return m.Index
-	}
-	return nil
-}
-
-func (m *QueryResult) GetVersion() []int64 {
-	if m != nil {
-		return m.Version
-	}
-	return nil
-}
-
-type AllocateIdsRequest struct {
-	Header           *InternalHeader `protobuf:"bytes,4,opt,name=header" json:"header,omitempty"`
-	ModelKey         *Reference      `protobuf:"bytes,1,opt,name=model_key" json:"model_key,omitempty"`
-	Size             *int64          `protobuf:"varint,2,opt,name=size" json:"size,omitempty"`
-	Max              *int64          `protobuf:"varint,3,opt,name=max" json:"max,omitempty"`
-	Reserve          []*Reference    `protobuf:"bytes,5,rep,name=reserve" json:"reserve,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *AllocateIdsRequest) Reset()         { *m = AllocateIdsRequest{} }
-func (m *AllocateIdsRequest) String() string { return proto.CompactTextString(m) }
-func (*AllocateIdsRequest) ProtoMessage()    {}
-
-func (m *AllocateIdsRequest) GetHeader() *InternalHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *AllocateIdsRequest) GetModelKey() *Reference {
-	if m != nil {
-		return m.ModelKey
-	}
-	return nil
-}
-
-func (m *AllocateIdsRequest) GetSize() int64 {
-	if m != nil && m.Size != nil {
-		return *m.Size
-	}
-	return 0
-}
-
-func (m *AllocateIdsRequest) GetMax() int64 {
-	if m != nil && m.Max != nil {
-		return *m.Max
-	}
-	return 0
-}
-
-func (m *AllocateIdsRequest) GetReserve() []*Reference {
-	if m != nil {
-		return m.Reserve
-	}
-	return nil
-}
-
-type AllocateIdsResponse struct {
-	Start            *int64 `protobuf:"varint,1,req,name=start" json:"start,omitempty"`
-	End              *int64 `protobuf:"varint,2,req,name=end" json:"end,omitempty"`
-	Cost             *Cost  `protobuf:"bytes,3,opt,name=cost" json:"cost,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *AllocateIdsResponse) Reset()         { *m = AllocateIdsResponse{} }
-func (m *AllocateIdsResponse) String() string { return proto.CompactTextString(m) }
-func (*AllocateIdsResponse) ProtoMessage()    {}
-
-func (m *AllocateIdsResponse) GetStart() int64 {
-	if m != nil && m.Start != nil {
-		return *m.Start
-	}
-	return 0
-}
-
-func (m *AllocateIdsResponse) GetEnd() int64 {
-	if m != nil && m.End != nil {
-		return *m.End
-	}
-	return 0
-}
-
-func (m *AllocateIdsResponse) GetCost() *Cost {
-	if m != nil {
-		return m.Cost
-	}
-	return nil
-}
-
-type CompositeIndices struct {
-	Index            []*CompositeIndex `protobuf:"bytes,1,rep,name=index" json:"index,omitempty"`
-	XXX_unrecognized []byte            `json:"-"`
-}
-
-func (m *CompositeIndices) Reset()         { *m = CompositeIndices{} }
-func (m *CompositeIndices) String() string { return proto.CompactTextString(m) }
-func (*CompositeIndices) ProtoMessage()    {}
-
-func (m *CompositeIndices) GetIndex() []*CompositeIndex {
-	if m != nil {
-		return m.Index
-	}
-	return nil
-}
-
-type AddActionsRequest struct {
-	Header           *InternalHeader `protobuf:"bytes,3,opt,name=header" json:"header,omitempty"`
-	Transaction      *Transaction    `protobuf:"bytes,1,req,name=transaction" json:"transaction,omitempty"`
-	Action           []*Action       `protobuf:"bytes,2,rep,name=action" json:"action,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *AddActionsRequest) Reset()         { *m = AddActionsRequest{} }
-func (m *AddActionsRequest) String() string { return proto.CompactTextString(m) }
-func (*AddActionsRequest) ProtoMessage()    {}
-
-func (m *AddActionsRequest) GetHeader() *InternalHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *AddActionsRequest) GetTransaction() *Transaction {
-	if m != nil {
-		return m.Transaction
-	}
-	return nil
-}
-
-func (m *AddActionsRequest) GetAction() []*Action {
-	if m != nil {
-		return m.Action
-	}
-	return nil
-}
-
-type AddActionsResponse struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *AddActionsResponse) Reset()         { *m = AddActionsResponse{} }
-func (m *AddActionsResponse) String() string { return proto.CompactTextString(m) }
-func (*AddActionsResponse) ProtoMessage()    {}
-
-type BeginTransactionRequest struct {
-	Header           *InternalHeader `protobuf:"bytes,3,opt,name=header" json:"header,omitempty"`
-	App              *string         `protobuf:"bytes,1,req,name=app" json:"app,omitempty"`
-	AllowMultipleEg  *bool           `protobuf:"varint,2,opt,name=allow_multiple_eg,def=0" json:"allow_multiple_eg,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *BeginTransactionRequest) Reset()         { *m = BeginTransactionRequest{} }
-func (m *BeginTransactionRequest) String() string { return proto.CompactTextString(m) }
-func (*BeginTransactionRequest) ProtoMessage()    {}
-
-const Default_BeginTransactionRequest_AllowMultipleEg bool = false
-
-func (m *BeginTransactionRequest) GetHeader() *InternalHeader {
-	if m != nil {
-		return m.Header
-	}
-	return nil
-}
-
-func (m *BeginTransactionRequest) GetApp() string {
-	if m != nil && m.App != nil {
-		return *m.App
-	}
-	return ""
-}
-
-func (m *BeginTransactionRequest) GetAllowMultipleEg() bool {
-	if m != nil && m.AllowMultipleEg != nil {
-		return *m.AllowMultipleEg
-	}
-	return Default_BeginTransactionRequest_AllowMultipleEg
-}
-
-type CommitResponse struct {
-	Cost             *Cost                     `protobuf:"bytes,1,opt,name=cost" json:"cost,omitempty"`
-	Version          []*CommitResponse_Version `protobuf:"group,3,rep,name=Version" json:"version,omitempty"`
-	XXX_unrecognized []byte                    `json:"-"`
-}
-
-func (m *CommitResponse) Reset()         { *m = CommitResponse{} }
-func (m *CommitResponse) String() string { return proto.CompactTextString(m) }
-func (*CommitResponse) ProtoMessage()    {}
-
-func (m *CommitResponse) GetCost() *Cost {
-	if m != nil {
-		return m.Cost
-	}
-	return nil
-}
-
-func (m *CommitResponse) GetVersion() []*CommitResponse_Version {
-	if m != nil {
-		return m.Version
-	}
-	return nil
-}
-
-type CommitResponse_Version struct {
-	RootEntityKey    *Reference `protobuf:"bytes,4,req,name=root_entity_key" json:"root_entity_key,omitempty"`
-	Version          *int64     `protobuf:"varint,5,req,name=version" json:"version,omitempty"`
-	XXX_unrecognized []byte     `json:"-"`
-}
-
-func (m *CommitResponse_Version) Reset()         { *m = CommitResponse_Version{} }
-func (m *CommitResponse_Version) String() string { return proto.CompactTextString(m) }
-func (*CommitResponse_Version) ProtoMessage()    {}
-
-func (m *CommitResponse_Version) GetRootEntityKey() *Reference {
-	if m != nil {
-		return m.RootEntityKey
-	}
-	return nil
-}
-
-func (m *CommitResponse_Version) GetVersion() int64 {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return 0
-}
-
-func init() {
-}
diff --git a/vendor/google.golang.org/appengine/internal/datastore/datastore_v3.proto b/vendor/google.golang.org/appengine/internal/datastore/datastore_v3.proto
deleted file mode 100755
index e76f126ff7..0000000000
--- a/vendor/google.golang.org/appengine/internal/datastore/datastore_v3.proto
+++ /dev/null
@@ -1,541 +0,0 @@
-syntax = "proto2";
-option go_package = "datastore";
-
-package appengine;
-
-message Action{}
-
-message PropertyValue {
-  optional int64 int64Value = 1;
-  optional bool booleanValue = 2;
-  optional string stringValue = 3;
-  optional double doubleValue = 4;
-
-  optional group PointValue = 5 {
-    required double x = 6;
-    required double y = 7;
-  }
-
-  optional group UserValue = 8 {
-    required string email = 9;
-    required string auth_domain = 10;
-    optional string nickname = 11;
-    optional string federated_identity = 21;
-    optional string federated_provider = 22;
-  }
-
-  optional group ReferenceValue = 12 {
-    required string app = 13;
-    optional string name_space = 20;
-    repeated group PathElement = 14 {
-      required string type = 15;
-      optional int64 id = 16;
-      optional string name = 17;
-    }
-  }
-}
-
-message Property {
-  enum Meaning {
-    NO_MEANING = 0;
-    BLOB = 14;
-    TEXT = 15;
-    BYTESTRING = 16;
-
-    ATOM_CATEGORY = 1;
-    ATOM_LINK = 2;
-    ATOM_TITLE = 3;
-    ATOM_CONTENT = 4;
-    ATOM_SUMMARY = 5;
-    ATOM_AUTHOR = 6;
-
-    GD_WHEN = 7;
-    GD_EMAIL = 8;
-    GEORSS_POINT = 9;
-    GD_IM = 10;
-
-    GD_PHONENUMBER = 11;
-    GD_POSTALADDRESS = 12;
-
-    GD_RATING = 13;
-
-    BLOBKEY = 17;
-    ENTITY_PROTO = 19;
-
-    INDEX_VALUE = 18;
-  };
-
-  optional Meaning meaning = 1 [default = NO_MEANING];
-  optional string meaning_uri = 2;
-
-  required string name = 3;
-
-  required PropertyValue value = 5;
-
-  required bool multiple = 4;
-
-  optional bool searchable = 6 [default=false];
-
-  enum FtsTokenizationOption {
-    HTML = 1;
-    ATOM = 2;
-  }
-
-  optional FtsTokenizationOption fts_tokenization_option = 8;
-
-  optional string locale = 9 [default = "en"];
-}
-
-message Path {
-  repeated group Element = 1 {
-    required string type = 2;
-    optional int64 id = 3;
-    optional string name = 4;
-  }
-}
-
-message Reference {
-  required string app = 13;
-  optional string name_space = 20;
-  required Path path = 14;
-}
-
-message User {
-  required string email = 1;
-  required string auth_domain = 2;
-  optional string nickname = 3;
-  optional string federated_identity = 6;
-  optional string federated_provider = 7;
-}
-
-message EntityProto {
-  required Reference key = 13;
-  required Path entity_group = 16;
-  optional User owner = 17;
-
-  enum Kind {
-    GD_CONTACT = 1;
-    GD_EVENT = 2;
-    GD_MESSAGE = 3;
-  }
-  optional Kind kind = 4;
-  optional string kind_uri = 5;
-
-  repeated Property property = 14;
-  repeated Property raw_property = 15;
-
-  optional int32 rank = 18;
-}
-
-message CompositeProperty {
-  required int64 index_id = 1;
-  repeated string value = 2;
-}
-
-message Index {
-  required string entity_type = 1;
-  required bool ancestor = 5;
-  repeated group Property = 2 {
-    required string name = 3;
-    enum Direction {
-      ASCENDING = 1;
-      DESCENDING = 2;
-    }
-    optional Direction direction = 4 [default = ASCENDING];
-  }
-}
-
-message CompositeIndex {
-  required string app_id = 1;
-  required int64 id = 2;
-  required Index definition = 3;
-
-  enum State {
-    WRITE_ONLY = 1;
-    READ_WRITE = 2;
-    DELETED = 3;
-    ERROR = 4;
-  }
-  required State state = 4;
-
-  optional bool only_use_if_required = 6 [default = false];
-}
-
-message IndexPostfix {
-  message IndexValue {
-    required string property_name = 1;
-    required PropertyValue value = 2;
-  }
-
-  repeated IndexValue index_value = 1;
-
-  optional Reference key = 2;
-
-  optional bool before = 3 [default=true];
-}
-
-message IndexPosition {
-  optional string key = 1;
-
-  optional bool before = 2 [default=true];
-}
-
-message Snapshot {
-  enum Status {
-    INACTIVE = 0;
-    ACTIVE = 1;
-  }
-
-  required int64 ts = 1;
-}
-
-message InternalHeader {
-  optional string qos = 1;
-}
-
-message Transaction {
-  optional InternalHeader header = 4;
-  required fixed64 handle = 1;
-  required string app = 2;
-  optional bool mark_changes = 3 [default = false];
-}
-
-message Query {
-  optional InternalHeader header = 39;
-
-  required string app = 1;
-  optional string name_space = 29;
-
-  optional string kind = 3;
-  optional Reference ancestor = 17;
-
-  repeated group Filter = 4 {
-    enum Operator {
-      LESS_THAN = 1;
-      LESS_THAN_OR_EQUAL = 2;
-      GREATER_THAN = 3;
-      GREATER_THAN_OR_EQUAL = 4;
-      EQUAL = 5;
-      IN = 6;
-      EXISTS = 7;
-    }
-
-    required Operator op = 6;
-    repeated Property property = 14;
-  }
-
-  optional string search_query = 8;
-
-  repeated group Order = 9 {
-    enum Direction {
-      ASCENDING = 1;
-      DESCENDING = 2;
-    }
-
-    required string property = 10;
-    optional Direction direction = 11 [default = ASCENDING];
-  }
-
-  enum Hint {
-    ORDER_FIRST = 1;
-    ANCESTOR_FIRST = 2;
-    FILTER_FIRST = 3;
-  }
-  optional Hint hint = 18;
-
-  optional int32 count = 23;
-
-  optional int32 offset = 12 [default = 0];
-
-  optional int32 limit = 16;
-
-  optional CompiledCursor compiled_cursor = 30;
-  optional CompiledCursor end_compiled_cursor = 31;
-
-  repeated CompositeIndex composite_index = 19;
-
-  optional bool require_perfect_plan = 20 [default = false];
-
-  optional bool keys_only = 21 [default = false];
-
-  optional Transaction transaction = 22;
-
-  optional bool compile = 25 [default = false];
-
-  optional int64 failover_ms = 26;
-
-  optional bool strong = 32;
-
-  repeated string property_name = 33;
-
-  repeated string group_by_property_name = 34;
-
-  optional bool distinct = 24;
-
-  optional int64 min_safe_time_seconds = 35;
-
-  repeated string safe_replica_name = 36;
-
-  optional bool persist_offset = 37 [default=false];
-}
-
-message CompiledQuery {
-  required group PrimaryScan = 1 {
-    optional string index_name = 2;
-
-    optional string start_key = 3;
-    optional bool start_inclusive = 4;
-    optional string end_key = 5;
-    optional bool end_inclusive = 6;
-
-    repeated string start_postfix_value = 22;
-    repeated string end_postfix_value = 23;
-
-    optional int64 end_unapplied_log_timestamp_us = 19;
-  }
-
-  repeated group MergeJoinScan = 7 {
-    required string index_name = 8;
-
-    repeated string prefix_value = 9;
-
-    optional bool value_prefix = 20 [default=false];
-  }
-
-  optional Index index_def = 21;
-
-  optional int32 offset = 10 [default = 0];
-
-  optional int32 limit = 11;
-
-  required bool keys_only = 12;
-
-  repeated string property_name = 24;
-
-  optional int32 distinct_infix_size = 25;
-
-  optional group EntityFilter = 13 {
-    optional bool distinct = 14 [default=false];
-
-    optional string kind = 17;
-    optional Reference ancestor = 18;
-  }
-}
-
-message CompiledCursor {
-  optional group Position = 2 {
-    optional string start_key = 27;
-
-    repeated group IndexValue = 29 {
-      optional string property = 30;
-      required PropertyValue value = 31;
-    }
-
-    optional Reference key = 32;
-
-    optional bool start_inclusive = 28 [default=true];
-  }
-}
-
-message Cursor {
-  required fixed64 cursor = 1;
-
-  optional string app = 2;
-}
-
-message Error {
-  enum ErrorCode {
-    BAD_REQUEST = 1;
-    CONCURRENT_TRANSACTION = 2;
-    INTERNAL_ERROR = 3;
-    NEED_INDEX = 4;
-    TIMEOUT = 5;
-    PERMISSION_DENIED = 6;
-    BIGTABLE_ERROR = 7;
-    COMMITTED_BUT_STILL_APPLYING = 8;
-    CAPABILITY_DISABLED = 9;
-    TRY_ALTERNATE_BACKEND = 10;
-    SAFE_TIME_TOO_OLD = 11;
-  }
-}
-
-message Cost {
-  optional int32 index_writes = 1;
-  optional int32 index_write_bytes = 2;
-  optional int32 entity_writes = 3;
-  optional int32 entity_write_bytes = 4;
-  optional group CommitCost = 5 {
-    optional int32 requested_entity_puts = 6;
-    optional int32 requested_entity_deletes = 7;
-  };
-  optional int32 approximate_storage_delta = 8;
-  optional int32 id_sequence_updates = 9;
-}
-
-message GetRequest {
-  optional InternalHeader header = 6;
-
-  repeated Reference key = 1;
-  optional Transaction transaction = 2;
-
-  optional int64 failover_ms = 3;
-
-  optional bool strong = 4;
-
-  optional bool allow_deferred = 5 [default=false];
-}
-
-message GetResponse {
-  repeated group Entity = 1 {
-    optional EntityProto entity = 2;
-    optional Reference key = 4;
-
-    optional int64 version = 3;
-  }
-
-  repeated Reference deferred = 5;
-
-  optional bool in_order = 6 [default=true];
-}
-
-message PutRequest {
-  optional InternalHeader header = 11;
-
-  repeated EntityProto entity = 1;
-  optional Transaction transaction = 2;
-  repeated CompositeIndex composite_index = 3;
-
-  optional bool trusted = 4 [default = false];
-
-  optional bool force = 7 [default = false];
-
-  optional bool mark_changes = 8 [default = false];
-  repeated Snapshot snapshot = 9;
-
-  enum AutoIdPolicy {
-    CURRENT = 0;
-    SEQUENTIAL = 1;
-  }
-  optional AutoIdPolicy auto_id_policy = 10 [default = CURRENT];
-}
-
-message PutResponse {
-  repeated Reference key = 1;
-  optional Cost cost = 2;
-  repeated int64 version = 3;
-}
-
-message TouchRequest {
-  optional InternalHeader header = 10;
-
-  repeated Reference key = 1;
-  repeated CompositeIndex composite_index = 2;
-  optional bool force = 3 [default = false];
-  repeated Snapshot snapshot = 9;
-}
-
-message TouchResponse {
-  optional Cost cost = 1;
-}
-
-message DeleteRequest {
-  optional InternalHeader header = 10;
-
-  repeated Reference key = 6;
-  optional Transaction transaction = 5;
-
-  optional bool trusted = 4 [default = false];
-
-  optional bool force = 7 [default = false];
-
-  optional bool mark_changes = 8 [default = false];
-  repeated Snapshot snapshot = 9;
-}
-
-message DeleteResponse {
-  optional Cost cost = 1;
-  repeated int64 version = 3;
-}
-
-message NextRequest {
-  optional InternalHeader header = 5;
-
-  required Cursor cursor = 1;
-  optional int32 count = 2;
-
-  optional int32 offset = 4 [default = 0];
-
-  optional bool compile = 3 [default = false];
-}
-
-message QueryResult {
-  optional Cursor cursor = 1;
-
-  repeated EntityProto result = 2;
-
-  optional int32 skipped_results = 7;
-
-  required bool more_results = 3;
-
-  optional bool keys_only = 4;
-
-  optional bool index_only = 9;
-
-  optional bool small_ops = 10;
-
-  optional CompiledQuery compiled_query = 5;
-
-  optional CompiledCursor compiled_cursor = 6;
-
-  repeated CompositeIndex index = 8;
-
-  repeated int64 version = 11;
-}
-
-message AllocateIdsRequest {
-  optional InternalHeader header = 4;
-
-  optional Reference model_key = 1;
-
-  optional int64 size = 2;
-
-  optional int64 max = 3;
-
-  repeated Reference reserve = 5;
-}
-
-message AllocateIdsResponse {
-  required int64 start = 1;
-  required int64 end = 2;
-  optional Cost cost = 3;
-}
-
-message CompositeIndices {
-  repeated CompositeIndex index = 1;
-}
-
-message AddActionsRequest {
-  optional InternalHeader header = 3;
-
-  required Transaction transaction = 1;
-  repeated Action action = 2;
-}
-
-message AddActionsResponse {
-}
-
-message BeginTransactionRequest {
-  optional InternalHeader header = 3;
-
-  required string app = 1;
-  optional bool allow_multiple_eg = 2 [default = false];
-}
-
-message CommitResponse {
-  optional Cost cost = 1;
-
-  repeated group Version = 3 {
-    required Reference root_entity_key = 4;
-    required int64 version = 5;
-  }
-}
diff --git a/vendor/google.golang.org/appengine/internal/identity.go b/vendor/google.golang.org/appengine/internal/identity.go
deleted file mode 100644
index d538701ab3..0000000000
--- a/vendor/google.golang.org/appengine/internal/identity.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2011 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package internal
-
-import netcontext "golang.org/x/net/context"
-
-// These functions are implementations of the wrapper functions
-// in ../appengine/identity.go. See that file for commentary.
-
-func AppID(c netcontext.Context) string {
-	return appID(FullyQualifiedAppID(c))
-}
diff --git a/vendor/google.golang.org/appengine/internal/identity_classic.go b/vendor/google.golang.org/appengine/internal/identity_classic.go
deleted file mode 100644
index b59603f132..0000000000
--- a/vendor/google.golang.org/appengine/internal/identity_classic.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-package internal
-
-import (
-	"appengine"
-
-	netcontext "golang.org/x/net/context"
-)
-
-func DefaultVersionHostname(ctx netcontext.Context) string {
-	c := fromContext(ctx)
-	if c == nil {
-		panic(errNotAppEngineContext)
-	}
-	return appengine.DefaultVersionHostname(c)
-}
-
-func Datacenter(_ netcontext.Context) string { return appengine.Datacenter() }
-func ServerSoftware() string                 { return appengine.ServerSoftware() }
-func InstanceID() string                     { return appengine.InstanceID() }
-func IsDevAppServer() bool                   { return appengine.IsDevAppServer() }
-
-func RequestID(ctx netcontext.Context) string {
-	c := fromContext(ctx)
-	if c == nil {
-		panic(errNotAppEngineContext)
-	}
-	return appengine.RequestID(c)
-}
-
-func ModuleName(ctx netcontext.Context) string {
-	c := fromContext(ctx)
-	if c == nil {
-		panic(errNotAppEngineContext)
-	}
-	return appengine.ModuleName(c)
-}
-func VersionID(ctx netcontext.Context) string {
-	c := fromContext(ctx)
-	if c == nil {
-		panic(errNotAppEngineContext)
-	}
-	return appengine.VersionID(c)
-}
-
-func fullyQualifiedAppID(ctx netcontext.Context) string {
-	c := fromContext(ctx)
-	if c == nil {
-		panic(errNotAppEngineContext)
-	}
-	return c.FullyQualifiedAppID()
-}
diff --git a/vendor/google.golang.org/appengine/internal/identity_vm.go b/vendor/google.golang.org/appengine/internal/identity_vm.go
deleted file mode 100644
index d5fa75be78..0000000000
--- a/vendor/google.golang.org/appengine/internal/identity_vm.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2011 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build !appengine
-
-package internal
-
-import (
-	"net/http"
-	"os"
-
-	netcontext "golang.org/x/net/context"
-)
-
-// These functions are implementations of the wrapper functions
-// in ../appengine/identity.go. See that file for commentary.
-
-const (
-	hDefaultVersionHostname = "X-AppEngine-Default-Version-Hostname"
-	hRequestLogId           = "X-AppEngine-Request-Log-Id"
-	hDatacenter             = "X-AppEngine-Datacenter"
-)
-
-func ctxHeaders(ctx netcontext.Context) http.Header {
-	c := fromContext(ctx)
-	if c == nil {
-		return nil
-	}
-	return c.Request().Header
-}
-
-func DefaultVersionHostname(ctx netcontext.Context) string {
-	return ctxHeaders(ctx).Get(hDefaultVersionHostname)
-}
-
-func RequestID(ctx netcontext.Context) string {
-	return ctxHeaders(ctx).Get(hRequestLogId)
-}
-
-func Datacenter(ctx netcontext.Context) string {
-	return ctxHeaders(ctx).Get(hDatacenter)
-}
-
-func ServerSoftware() string {
-	// TODO(dsymonds): Remove fallback when we've verified this.
-	if s := os.Getenv("SERVER_SOFTWARE"); s != "" {
-		return s
-	}
-	return "Google App Engine/1.x.x"
-}
-
-// TODO(dsymonds): Remove the metadata fetches.
-
-func ModuleName(_ netcontext.Context) string {
-	if s := os.Getenv("GAE_MODULE_NAME"); s != "" {
-		return s
-	}
-	return string(mustGetMetadata("instance/attributes/gae_backend_name"))
-}
-
-func VersionID(_ netcontext.Context) string {
-	if s1, s2 := os.Getenv("GAE_MODULE_VERSION"), os.Getenv("GAE_MINOR_VERSION"); s1 != "" && s2 != "" {
-		return s1 + "." + s2
-	}
-	return string(mustGetMetadata("instance/attributes/gae_backend_version")) + "." + string(mustGetMetadata("instance/attributes/gae_backend_minor_version"))
-}
-
-func InstanceID() string {
-	if s := os.Getenv("GAE_MODULE_INSTANCE"); s != "" {
-		return s
-	}
-	return string(mustGetMetadata("instance/attributes/gae_backend_instance"))
-}
-
-func partitionlessAppID() string {
-	// gae_project has everything except the partition prefix.
-	appID := os.Getenv("GAE_LONG_APP_ID")
-	if appID == "" {
-		appID = string(mustGetMetadata("instance/attributes/gae_project"))
-	}
-	return appID
-}
-
-func fullyQualifiedAppID(_ netcontext.Context) string {
-	appID := partitionlessAppID()
-
-	part := os.Getenv("GAE_PARTITION")
-	if part == "" {
-		part = string(mustGetMetadata("instance/attributes/gae_partition"))
-	}
-
-	if part != "" {
-		appID = part + "~" + appID
-	}
-	return appID
-}
-
-func IsDevAppServer() bool {
-	return os.Getenv("RUN_WITH_DEVAPPSERVER") != ""
-}
diff --git a/vendor/google.golang.org/appengine/internal/internal.go b/vendor/google.golang.org/appengine/internal/internal.go
deleted file mode 100644
index 051ea3980a..0000000000
--- a/vendor/google.golang.org/appengine/internal/internal.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2011 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// Package internal provides support for package appengine.
-//
-// Programs should not use this package directly. Its API is not stable.
-// Use packages appengine and appengine/* instead.
-package internal
-
-import (
-	"fmt"
-
-	"github.com/golang/protobuf/proto"
-
-	remotepb "google.golang.org/appengine/internal/remote_api"
-)
-
-// errorCodeMaps is a map of service name to the error code map for the service.
-var errorCodeMaps = make(map[string]map[int32]string)
-
-// RegisterErrorCodeMap is called from API implementations to register their
-// error code map. This should only be called from init functions.
-func RegisterErrorCodeMap(service string, m map[int32]string) {
-	errorCodeMaps[service] = m
-}
-
-type timeoutCodeKey struct {
-	service string
-	code    int32
-}
-
-// timeoutCodes is the set of service+code pairs that represent timeouts.
-var timeoutCodes = make(map[timeoutCodeKey]bool)
-
-func RegisterTimeoutErrorCode(service string, code int32) {
-	timeoutCodes[timeoutCodeKey{service, code}] = true
-}
-
-// APIError is the type returned by appengine.Context's Call method
-// when an API call fails in an API-specific way. This may be, for instance,
-// a taskqueue API call failing with TaskQueueServiceError::UNKNOWN_QUEUE.
-type APIError struct {
-	Service string
-	Detail  string
-	Code    int32 // API-specific error code
-}
-
-func (e *APIError) Error() string {
-	if e.Code == 0 {
-		if e.Detail == "" {
-			return "APIError <empty>"
-		}
-		return e.Detail
-	}
-	s := fmt.Sprintf("API error %d", e.Code)
-	if m, ok := errorCodeMaps[e.Service]; ok {
-		s += " (" + e.Service + ": " + m[e.Code] + ")"
-	} else {
-		// Shouldn't happen, but provide a bit more detail if it does.
-		s = e.Service + " " + s
-	}
-	if e.Detail != "" {
-		s += ": " + e.Detail
-	}
-	return s
-}
-
-func (e *APIError) IsTimeout() bool {
-	return timeoutCodes[timeoutCodeKey{e.Service, e.Code}]
-}
-
-// CallError is the type returned by appengine.Context's Call method when an
-// API call fails in a generic way, such as RpcError::CAPABILITY_DISABLED.
-type CallError struct {
-	Detail string
-	Code   int32
-	// TODO: Remove this if we get a distinguishable error code.
-	Timeout bool
-}
-
-func (e *CallError) Error() string {
-	var msg string
-	switch remotepb.RpcError_ErrorCode(e.Code) {
-	case remotepb.RpcError_UNKNOWN:
-		return e.Detail
-	case remotepb.RpcError_OVER_QUOTA:
-		msg = "Over quota"
-	case remotepb.RpcError_CAPABILITY_DISABLED:
-		msg = "Capability disabled"
-	case remotepb.RpcError_CANCELLED:
-		msg = "Canceled"
-	default:
-		msg = fmt.Sprintf("Call error %d", e.Code)
-	}
-	s := msg + ": " + e.Detail
-	if e.Timeout {
-		s += " (timeout)"
-	}
-	return s
-}
-
-func (e *CallError) IsTimeout() bool {
-	return e.Timeout
-}
-
-// NamespaceMods is a map from API service to a function that will mutate an RPC request to attach a namespace.
-// The function should be prepared to be called on the same message more than once; it should only modify the
-// RPC request the first time.
-var NamespaceMods = make(map[string]func(m proto.Message, namespace string))
diff --git a/vendor/google.golang.org/appengine/internal/log/log_service.pb.go b/vendor/google.golang.org/appengine/internal/log/log_service.pb.go
deleted file mode 100644
index 20c595be30..0000000000
--- a/vendor/google.golang.org/appengine/internal/log/log_service.pb.go
+++ /dev/null
@@ -1,899 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: google.golang.org/appengine/internal/log/log_service.proto
-// DO NOT EDIT!
-
-/*
-Package log is a generated protocol buffer package.
-
-It is generated from these files:
-	google.golang.org/appengine/internal/log/log_service.proto
-
-It has these top-level messages:
-	LogServiceError
-	UserAppLogLine
-	UserAppLogGroup
-	FlushRequest
-	SetStatusRequest
-	LogOffset
-	LogLine
-	RequestLog
-	LogModuleVersion
-	LogReadRequest
-	LogReadResponse
-	LogUsageRecord
-	LogUsageRequest
-	LogUsageResponse
-*/
-package log
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type LogServiceError_ErrorCode int32
-
-const (
-	LogServiceError_OK              LogServiceError_ErrorCode = 0
-	LogServiceError_INVALID_REQUEST LogServiceError_ErrorCode = 1
-	LogServiceError_STORAGE_ERROR   LogServiceError_ErrorCode = 2
-)
-
-var LogServiceError_ErrorCode_name = map[int32]string{
-	0: "OK",
-	1: "INVALID_REQUEST",
-	2: "STORAGE_ERROR",
-}
-var LogServiceError_ErrorCode_value = map[string]int32{
-	"OK":              0,
-	"INVALID_REQUEST": 1,
-	"STORAGE_ERROR":   2,
-}
-
-func (x LogServiceError_ErrorCode) Enum() *LogServiceError_ErrorCode {
-	p := new(LogServiceError_ErrorCode)
-	*p = x
-	return p
-}
-func (x LogServiceError_ErrorCode) String() string {
-	return proto.EnumName(LogServiceError_ErrorCode_name, int32(x))
-}
-func (x *LogServiceError_ErrorCode) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(LogServiceError_ErrorCode_value, data, "LogServiceError_ErrorCode")
-	if err != nil {
-		return err
-	}
-	*x = LogServiceError_ErrorCode(value)
-	return nil
-}
-
-type LogServiceError struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *LogServiceError) Reset()         { *m = LogServiceError{} }
-func (m *LogServiceError) String() string { return proto.CompactTextString(m) }
-func (*LogServiceError) ProtoMessage()    {}
-
-type UserAppLogLine struct {
-	TimestampUsec    *int64  `protobuf:"varint,1,req,name=timestamp_usec" json:"timestamp_usec,omitempty"`
-	Level            *int64  `protobuf:"varint,2,req,name=level" json:"level,omitempty"`
-	Message          *string `protobuf:"bytes,3,req,name=message" json:"message,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *UserAppLogLine) Reset()         { *m = UserAppLogLine{} }
-func (m *UserAppLogLine) String() string { return proto.CompactTextString(m) }
-func (*UserAppLogLine) ProtoMessage()    {}
-
-func (m *UserAppLogLine) GetTimestampUsec() int64 {
-	if m != nil && m.TimestampUsec != nil {
-		return *m.TimestampUsec
-	}
-	return 0
-}
-
-func (m *UserAppLogLine) GetLevel() int64 {
-	if m != nil && m.Level != nil {
-		return *m.Level
-	}
-	return 0
-}
-
-func (m *UserAppLogLine) GetMessage() string {
-	if m != nil && m.Message != nil {
-		return *m.Message
-	}
-	return ""
-}
-
-type UserAppLogGroup struct {
-	LogLine          []*UserAppLogLine `protobuf:"bytes,2,rep,name=log_line" json:"log_line,omitempty"`
-	XXX_unrecognized []byte            `json:"-"`
-}
-
-func (m *UserAppLogGroup) Reset()         { *m = UserAppLogGroup{} }
-func (m *UserAppLogGroup) String() string { return proto.CompactTextString(m) }
-func (*UserAppLogGroup) ProtoMessage()    {}
-
-func (m *UserAppLogGroup) GetLogLine() []*UserAppLogLine {
-	if m != nil {
-		return m.LogLine
-	}
-	return nil
-}
-
-type FlushRequest struct {
-	Logs             []byte `protobuf:"bytes,1,opt,name=logs" json:"logs,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *FlushRequest) Reset()         { *m = FlushRequest{} }
-func (m *FlushRequest) String() string { return proto.CompactTextString(m) }
-func (*FlushRequest) ProtoMessage()    {}
-
-func (m *FlushRequest) GetLogs() []byte {
-	if m != nil {
-		return m.Logs
-	}
-	return nil
-}
-
-type SetStatusRequest struct {
-	Status           *string `protobuf:"bytes,1,req,name=status" json:"status,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *SetStatusRequest) Reset()         { *m = SetStatusRequest{} }
-func (m *SetStatusRequest) String() string { return proto.CompactTextString(m) }
-func (*SetStatusRequest) ProtoMessage()    {}
-
-func (m *SetStatusRequest) GetStatus() string {
-	if m != nil && m.Status != nil {
-		return *m.Status
-	}
-	return ""
-}
-
-type LogOffset struct {
-	RequestId        []byte `protobuf:"bytes,1,opt,name=request_id" json:"request_id,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *LogOffset) Reset()         { *m = LogOffset{} }
-func (m *LogOffset) String() string { return proto.CompactTextString(m) }
-func (*LogOffset) ProtoMessage()    {}
-
-func (m *LogOffset) GetRequestId() []byte {
-	if m != nil {
-		return m.RequestId
-	}
-	return nil
-}
-
-type LogLine struct {
-	Time             *int64  `protobuf:"varint,1,req,name=time" json:"time,omitempty"`
-	Level            *int32  `protobuf:"varint,2,req,name=level" json:"level,omitempty"`
-	LogMessage       *string `protobuf:"bytes,3,req,name=log_message" json:"log_message,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *LogLine) Reset()         { *m = LogLine{} }
-func (m *LogLine) String() string { return proto.CompactTextString(m) }
-func (*LogLine) ProtoMessage()    {}
-
-func (m *LogLine) GetTime() int64 {
-	if m != nil && m.Time != nil {
-		return *m.Time
-	}
-	return 0
-}
-
-func (m *LogLine) GetLevel() int32 {
-	if m != nil && m.Level != nil {
-		return *m.Level
-	}
-	return 0
-}
-
-func (m *LogLine) GetLogMessage() string {
-	if m != nil && m.LogMessage != nil {
-		return *m.LogMessage
-	}
-	return ""
-}
-
-type RequestLog struct {
-	AppId                   *string    `protobuf:"bytes,1,req,name=app_id" json:"app_id,omitempty"`
-	ModuleId                *string    `protobuf:"bytes,37,opt,name=module_id,def=default" json:"module_id,omitempty"`
-	VersionId               *string    `protobuf:"bytes,2,req,name=version_id" json:"version_id,omitempty"`
-	RequestId               []byte     `protobuf:"bytes,3,req,name=request_id" json:"request_id,omitempty"`
-	Offset                  *LogOffset `protobuf:"bytes,35,opt,name=offset" json:"offset,omitempty"`
-	Ip                      *string    `protobuf:"bytes,4,req,name=ip" json:"ip,omitempty"`
-	Nickname                *string    `protobuf:"bytes,5,opt,name=nickname" json:"nickname,omitempty"`
-	StartTime               *int64     `protobuf:"varint,6,req,name=start_time" json:"start_time,omitempty"`
-	EndTime                 *int64     `protobuf:"varint,7,req,name=end_time" json:"end_time,omitempty"`
-	Latency                 *int64     `protobuf:"varint,8,req,name=latency" json:"latency,omitempty"`
-	Mcycles                 *int64     `protobuf:"varint,9,req,name=mcycles" json:"mcycles,omitempty"`
-	Method                  *string    `protobuf:"bytes,10,req,name=method" json:"method,omitempty"`
-	Resource                *string    `protobuf:"bytes,11,req,name=resource" json:"resource,omitempty"`
-	HttpVersion             *string    `protobuf:"bytes,12,req,name=http_version" json:"http_version,omitempty"`
-	Status                  *int32     `protobuf:"varint,13,req,name=status" json:"status,omitempty"`
-	ResponseSize            *int64     `protobuf:"varint,14,req,name=response_size" json:"response_size,omitempty"`
-	Referrer                *string    `protobuf:"bytes,15,opt,name=referrer" json:"referrer,omitempty"`
-	UserAgent               *string    `protobuf:"bytes,16,opt,name=user_agent" json:"user_agent,omitempty"`
-	UrlMapEntry             *string    `protobuf:"bytes,17,req,name=url_map_entry" json:"url_map_entry,omitempty"`
-	Combined                *string    `protobuf:"bytes,18,req,name=combined" json:"combined,omitempty"`
-	ApiMcycles              *int64     `protobuf:"varint,19,opt,name=api_mcycles" json:"api_mcycles,omitempty"`
-	Host                    *string    `protobuf:"bytes,20,opt,name=host" json:"host,omitempty"`
-	Cost                    *float64   `protobuf:"fixed64,21,opt,name=cost" json:"cost,omitempty"`
-	TaskQueueName           *string    `protobuf:"bytes,22,opt,name=task_queue_name" json:"task_queue_name,omitempty"`
-	TaskName                *string    `protobuf:"bytes,23,opt,name=task_name" json:"task_name,omitempty"`
-	WasLoadingRequest       *bool      `protobuf:"varint,24,opt,name=was_loading_request" json:"was_loading_request,omitempty"`
-	PendingTime             *int64     `protobuf:"varint,25,opt,name=pending_time" json:"pending_time,omitempty"`
-	ReplicaIndex            *int32     `protobuf:"varint,26,opt,name=replica_index,def=-1" json:"replica_index,omitempty"`
-	Finished                *bool      `protobuf:"varint,27,opt,name=finished,def=1" json:"finished,omitempty"`
-	CloneKey                []byte     `protobuf:"bytes,28,opt,name=clone_key" json:"clone_key,omitempty"`
-	Line                    []*LogLine `protobuf:"bytes,29,rep,name=line" json:"line,omitempty"`
-	LinesIncomplete         *bool      `protobuf:"varint,36,opt,name=lines_incomplete" json:"lines_incomplete,omitempty"`
-	AppEngineRelease        []byte     `protobuf:"bytes,38,opt,name=app_engine_release" json:"app_engine_release,omitempty"`
-	ExitReason              *int32     `protobuf:"varint,30,opt,name=exit_reason" json:"exit_reason,omitempty"`
-	WasThrottledForTime     *bool      `protobuf:"varint,31,opt,name=was_throttled_for_time" json:"was_throttled_for_time,omitempty"`
-	WasThrottledForRequests *bool      `protobuf:"varint,32,opt,name=was_throttled_for_requests" json:"was_throttled_for_requests,omitempty"`
-	ThrottledTime           *int64     `protobuf:"varint,33,opt,name=throttled_time" json:"throttled_time,omitempty"`
-	ServerName              []byte     `protobuf:"bytes,34,opt,name=server_name" json:"server_name,omitempty"`
-	XXX_unrecognized        []byte     `json:"-"`
-}
-
-func (m *RequestLog) Reset()         { *m = RequestLog{} }
-func (m *RequestLog) String() string { return proto.CompactTextString(m) }
-func (*RequestLog) ProtoMessage()    {}
-
-const Default_RequestLog_ModuleId string = "default"
-const Default_RequestLog_ReplicaIndex int32 = -1
-const Default_RequestLog_Finished bool = true
-
-func (m *RequestLog) GetAppId() string {
-	if m != nil && m.AppId != nil {
-		return *m.AppId
-	}
-	return ""
-}
-
-func (m *RequestLog) GetModuleId() string {
-	if m != nil && m.ModuleId != nil {
-		return *m.ModuleId
-	}
-	return Default_RequestLog_ModuleId
-}
-
-func (m *RequestLog) GetVersionId() string {
-	if m != nil && m.VersionId != nil {
-		return *m.VersionId
-	}
-	return ""
-}
-
-func (m *RequestLog) GetRequestId() []byte {
-	if m != nil {
-		return m.RequestId
-	}
-	return nil
-}
-
-func (m *RequestLog) GetOffset() *LogOffset {
-	if m != nil {
-		return m.Offset
-	}
-	return nil
-}
-
-func (m *RequestLog) GetIp() string {
-	if m != nil && m.Ip != nil {
-		return *m.Ip
-	}
-	return ""
-}
-
-func (m *RequestLog) GetNickname() string {
-	if m != nil && m.Nickname != nil {
-		return *m.Nickname
-	}
-	return ""
-}
-
-func (m *RequestLog) GetStartTime() int64 {
-	if m != nil && m.StartTime != nil {
-		return *m.StartTime
-	}
-	return 0
-}
-
-func (m *RequestLog) GetEndTime() int64 {
-	if m != nil && m.EndTime != nil {
-		return *m.EndTime
-	}
-	return 0
-}
-
-func (m *RequestLog) GetLatency() int64 {
-	if m != nil && m.Latency != nil {
-		return *m.Latency
-	}
-	return 0
-}
-
-func (m *RequestLog) GetMcycles() int64 {
-	if m != nil && m.Mcycles != nil {
-		return *m.Mcycles
-	}
-	return 0
-}
-
-func (m *RequestLog) GetMethod() string {
-	if m != nil && m.Method != nil {
-		return *m.Method
-	}
-	return ""
-}
-
-func (m *RequestLog) GetResource() string {
-	if m != nil && m.Resource != nil {
-		return *m.Resource
-	}
-	return ""
-}
-
-func (m *RequestLog) GetHttpVersion() string {
-	if m != nil && m.HttpVersion != nil {
-		return *m.HttpVersion
-	}
-	return ""
-}
-
-func (m *RequestLog) GetStatus() int32 {
-	if m != nil && m.Status != nil {
-		return *m.Status
-	}
-	return 0
-}
-
-func (m *RequestLog) GetResponseSize() int64 {
-	if m != nil && m.ResponseSize != nil {
-		return *m.ResponseSize
-	}
-	return 0
-}
-
-func (m *RequestLog) GetReferrer() string {
-	if m != nil && m.Referrer != nil {
-		return *m.Referrer
-	}
-	return ""
-}
-
-func (m *RequestLog) GetUserAgent() string {
-	if m != nil && m.UserAgent != nil {
-		return *m.UserAgent
-	}
-	return ""
-}
-
-func (m *RequestLog) GetUrlMapEntry() string {
-	if m != nil && m.UrlMapEntry != nil {
-		return *m.UrlMapEntry
-	}
-	return ""
-}
-
-func (m *RequestLog) GetCombined() string {
-	if m != nil && m.Combined != nil {
-		return *m.Combined
-	}
-	return ""
-}
-
-func (m *RequestLog) GetApiMcycles() int64 {
-	if m != nil && m.ApiMcycles != nil {
-		return *m.ApiMcycles
-	}
-	return 0
-}
-
-func (m *RequestLog) GetHost() string {
-	if m != nil && m.Host != nil {
-		return *m.Host
-	}
-	return ""
-}
-
-func (m *RequestLog) GetCost() float64 {
-	if m != nil && m.Cost != nil {
-		return *m.Cost
-	}
-	return 0
-}
-
-func (m *RequestLog) GetTaskQueueName() string {
-	if m != nil && m.TaskQueueName != nil {
-		return *m.TaskQueueName
-	}
-	return ""
-}
-
-func (m *RequestLog) GetTaskName() string {
-	if m != nil && m.TaskName != nil {
-		return *m.TaskName
-	}
-	return ""
-}
-
-func (m *RequestLog) GetWasLoadingRequest() bool {
-	if m != nil && m.WasLoadingRequest != nil {
-		return *m.WasLoadingRequest
-	}
-	return false
-}
-
-func (m *RequestLog) GetPendingTime() int64 {
-	if m != nil && m.PendingTime != nil {
-		return *m.PendingTime
-	}
-	return 0
-}
-
-func (m *RequestLog) GetReplicaIndex() int32 {
-	if m != nil && m.ReplicaIndex != nil {
-		return *m.ReplicaIndex
-	}
-	return Default_RequestLog_ReplicaIndex
-}
-
-func (m *RequestLog) GetFinished() bool {
-	if m != nil && m.Finished != nil {
-		return *m.Finished
-	}
-	return Default_RequestLog_Finished
-}
-
-func (m *RequestLog) GetCloneKey() []byte {
-	if m != nil {
-		return m.CloneKey
-	}
-	return nil
-}
-
-func (m *RequestLog) GetLine() []*LogLine {
-	if m != nil {
-		return m.Line
-	}
-	return nil
-}
-
-func (m *RequestLog) GetLinesIncomplete() bool {
-	if m != nil && m.LinesIncomplete != nil {
-		return *m.LinesIncomplete
-	}
-	return false
-}
-
-func (m *RequestLog) GetAppEngineRelease() []byte {
-	if m != nil {
-		return m.AppEngineRelease
-	}
-	return nil
-}
-
-func (m *RequestLog) GetExitReason() int32 {
-	if m != nil && m.ExitReason != nil {
-		return *m.ExitReason
-	}
-	return 0
-}
-
-func (m *RequestLog) GetWasThrottledForTime() bool {
-	if m != nil && m.WasThrottledForTime != nil {
-		return *m.WasThrottledForTime
-	}
-	return false
-}
-
-func (m *RequestLog) GetWasThrottledForRequests() bool {
-	if m != nil && m.WasThrottledForRequests != nil {
-		return *m.WasThrottledForRequests
-	}
-	return false
-}
-
-func (m *RequestLog) GetThrottledTime() int64 {
-	if m != nil && m.ThrottledTime != nil {
-		return *m.ThrottledTime
-	}
-	return 0
-}
-
-func (m *RequestLog) GetServerName() []byte {
-	if m != nil {
-		return m.ServerName
-	}
-	return nil
-}
-
-type LogModuleVersion struct {
-	ModuleId         *string `protobuf:"bytes,1,opt,name=module_id,def=default" json:"module_id,omitempty"`
-	VersionId        *string `protobuf:"bytes,2,opt,name=version_id" json:"version_id,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *LogModuleVersion) Reset()         { *m = LogModuleVersion{} }
-func (m *LogModuleVersion) String() string { return proto.CompactTextString(m) }
-func (*LogModuleVersion) ProtoMessage()    {}
-
-const Default_LogModuleVersion_ModuleId string = "default"
-
-func (m *LogModuleVersion) GetModuleId() string {
-	if m != nil && m.ModuleId != nil {
-		return *m.ModuleId
-	}
-	return Default_LogModuleVersion_ModuleId
-}
-
-func (m *LogModuleVersion) GetVersionId() string {
-	if m != nil && m.VersionId != nil {
-		return *m.VersionId
-	}
-	return ""
-}
-
-type LogReadRequest struct {
-	AppId             *string             `protobuf:"bytes,1,req,name=app_id" json:"app_id,omitempty"`
-	VersionId         []string            `protobuf:"bytes,2,rep,name=version_id" json:"version_id,omitempty"`
-	ModuleVersion     []*LogModuleVersion `protobuf:"bytes,19,rep,name=module_version" json:"module_version,omitempty"`
-	StartTime         *int64              `protobuf:"varint,3,opt,name=start_time" json:"start_time,omitempty"`
-	EndTime           *int64              `protobuf:"varint,4,opt,name=end_time" json:"end_time,omitempty"`
-	Offset            *LogOffset          `protobuf:"bytes,5,opt,name=offset" json:"offset,omitempty"`
-	RequestId         [][]byte            `protobuf:"bytes,6,rep,name=request_id" json:"request_id,omitempty"`
-	MinimumLogLevel   *int32              `protobuf:"varint,7,opt,name=minimum_log_level" json:"minimum_log_level,omitempty"`
-	IncludeIncomplete *bool               `protobuf:"varint,8,opt,name=include_incomplete" json:"include_incomplete,omitempty"`
-	Count             *int64              `protobuf:"varint,9,opt,name=count" json:"count,omitempty"`
-	CombinedLogRegex  *string             `protobuf:"bytes,14,opt,name=combined_log_regex" json:"combined_log_regex,omitempty"`
-	HostRegex         *string             `protobuf:"bytes,15,opt,name=host_regex" json:"host_regex,omitempty"`
-	ReplicaIndex      *int32              `protobuf:"varint,16,opt,name=replica_index" json:"replica_index,omitempty"`
-	IncludeAppLogs    *bool               `protobuf:"varint,10,opt,name=include_app_logs" json:"include_app_logs,omitempty"`
-	AppLogsPerRequest *int32              `protobuf:"varint,17,opt,name=app_logs_per_request" json:"app_logs_per_request,omitempty"`
-	IncludeHost       *bool               `protobuf:"varint,11,opt,name=include_host" json:"include_host,omitempty"`
-	IncludeAll        *bool               `protobuf:"varint,12,opt,name=include_all" json:"include_all,omitempty"`
-	CacheIterator     *bool               `protobuf:"varint,13,opt,name=cache_iterator" json:"cache_iterator,omitempty"`
-	NumShards         *int32              `protobuf:"varint,18,opt,name=num_shards" json:"num_shards,omitempty"`
-	XXX_unrecognized  []byte              `json:"-"`
-}
-
-func (m *LogReadRequest) Reset()         { *m = LogReadRequest{} }
-func (m *LogReadRequest) String() string { return proto.CompactTextString(m) }
-func (*LogReadRequest) ProtoMessage()    {}
-
-func (m *LogReadRequest) GetAppId() string {
-	if m != nil && m.AppId != nil {
-		return *m.AppId
-	}
-	return ""
-}
-
-func (m *LogReadRequest) GetVersionId() []string {
-	if m != nil {
-		return m.VersionId
-	}
-	return nil
-}
-
-func (m *LogReadRequest) GetModuleVersion() []*LogModuleVersion {
-	if m != nil {
-		return m.ModuleVersion
-	}
-	return nil
-}
-
-func (m *LogReadRequest) GetStartTime() int64 {
-	if m != nil && m.StartTime != nil {
-		return *m.StartTime
-	}
-	return 0
-}
-
-func (m *LogReadRequest) GetEndTime() int64 {
-	if m != nil && m.EndTime != nil {
-		return *m.EndTime
-	}
-	return 0
-}
-
-func (m *LogReadRequest) GetOffset() *LogOffset {
-	if m != nil {
-		return m.Offset
-	}
-	return nil
-}
-
-func (m *LogReadRequest) GetRequestId() [][]byte {
-	if m != nil {
-		return m.RequestId
-	}
-	return nil
-}
-
-func (m *LogReadRequest) GetMinimumLogLevel() int32 {
-	if m != nil && m.MinimumLogLevel != nil {
-		return *m.MinimumLogLevel
-	}
-	return 0
-}
-
-func (m *LogReadRequest) GetIncludeIncomplete() bool {
-	if m != nil && m.IncludeIncomplete != nil {
-		return *m.IncludeIncomplete
-	}
-	return false
-}
-
-func (m *LogReadRequest) GetCount() int64 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-func (m *LogReadRequest) GetCombinedLogRegex() string {
-	if m != nil && m.CombinedLogRegex != nil {
-		return *m.CombinedLogRegex
-	}
-	return ""
-}
-
-func (m *LogReadRequest) GetHostRegex() string {
-	if m != nil && m.HostRegex != nil {
-		return *m.HostRegex
-	}
-	return ""
-}
-
-func (m *LogReadRequest) GetReplicaIndex() int32 {
-	if m != nil && m.ReplicaIndex != nil {
-		return *m.ReplicaIndex
-	}
-	return 0
-}
-
-func (m *LogReadRequest) GetIncludeAppLogs() bool {
-	if m != nil && m.IncludeAppLogs != nil {
-		return *m.IncludeAppLogs
-	}
-	return false
-}
-
-func (m *LogReadRequest) GetAppLogsPerRequest() int32 {
-	if m != nil && m.AppLogsPerRequest != nil {
-		return *m.AppLogsPerRequest
-	}
-	return 0
-}
-
-func (m *LogReadRequest) GetIncludeHost() bool {
-	if m != nil && m.IncludeHost != nil {
-		return *m.IncludeHost
-	}
-	return false
-}
-
-func (m *LogReadRequest) GetIncludeAll() bool {
-	if m != nil && m.IncludeAll != nil {
-		return *m.IncludeAll
-	}
-	return false
-}
-
-func (m *LogReadRequest) GetCacheIterator() bool {
-	if m != nil && m.CacheIterator != nil {
-		return *m.CacheIterator
-	}
-	return false
-}
-
-func (m *LogReadRequest) GetNumShards() int32 {
-	if m != nil && m.NumShards != nil {
-		return *m.NumShards
-	}
-	return 0
-}
-
-type LogReadResponse struct {
-	Log              []*RequestLog `protobuf:"bytes,1,rep,name=log" json:"log,omitempty"`
-	Offset           *LogOffset    `protobuf:"bytes,2,opt,name=offset" json:"offset,omitempty"`
-	LastEndTime      *int64        `protobuf:"varint,3,opt,name=last_end_time" json:"last_end_time,omitempty"`
-	XXX_unrecognized []byte        `json:"-"`
-}
-
-func (m *LogReadResponse) Reset()         { *m = LogReadResponse{} }
-func (m *LogReadResponse) String() string { return proto.CompactTextString(m) }
-func (*LogReadResponse) ProtoMessage()    {}
-
-func (m *LogReadResponse) GetLog() []*RequestLog {
-	if m != nil {
-		return m.Log
-	}
-	return nil
-}
-
-func (m *LogReadResponse) GetOffset() *LogOffset {
-	if m != nil {
-		return m.Offset
-	}
-	return nil
-}
-
-func (m *LogReadResponse) GetLastEndTime() int64 {
-	if m != nil && m.LastEndTime != nil {
-		return *m.LastEndTime
-	}
-	return 0
-}
-
-type LogUsageRecord struct {
-	VersionId        *string `protobuf:"bytes,1,opt,name=version_id" json:"version_id,omitempty"`
-	StartTime        *int32  `protobuf:"varint,2,opt,name=start_time" json:"start_time,omitempty"`
-	EndTime          *int32  `protobuf:"varint,3,opt,name=end_time" json:"end_time,omitempty"`
-	Count            *int64  `protobuf:"varint,4,opt,name=count" json:"count,omitempty"`
-	TotalSize        *int64  `protobuf:"varint,5,opt,name=total_size" json:"total_size,omitempty"`
-	Records          *int32  `protobuf:"varint,6,opt,name=records" json:"records,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *LogUsageRecord) Reset()         { *m = LogUsageRecord{} }
-func (m *LogUsageRecord) String() string { return proto.CompactTextString(m) }
-func (*LogUsageRecord) ProtoMessage()    {}
-
-func (m *LogUsageRecord) GetVersionId() string {
-	if m != nil && m.VersionId != nil {
-		return *m.VersionId
-	}
-	return ""
-}
-
-func (m *LogUsageRecord) GetStartTime() int32 {
-	if m != nil && m.StartTime != nil {
-		return *m.StartTime
-	}
-	return 0
-}
-
-func (m *LogUsageRecord) GetEndTime() int32 {
-	if m != nil && m.EndTime != nil {
-		return *m.EndTime
-	}
-	return 0
-}
-
-func (m *LogUsageRecord) GetCount() int64 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-func (m *LogUsageRecord) GetTotalSize() int64 {
-	if m != nil && m.TotalSize != nil {
-		return *m.TotalSize
-	}
-	return 0
-}
-
-func (m *LogUsageRecord) GetRecords() int32 {
-	if m != nil && m.Records != nil {
-		return *m.Records
-	}
-	return 0
-}
-
-type LogUsageRequest struct {
-	AppId            *string  `protobuf:"bytes,1,req,name=app_id" json:"app_id,omitempty"`
-	VersionId        []string `protobuf:"bytes,2,rep,name=version_id" json:"version_id,omitempty"`
-	StartTime        *int32   `protobuf:"varint,3,opt,name=start_time" json:"start_time,omitempty"`
-	EndTime          *int32   `protobuf:"varint,4,opt,name=end_time" json:"end_time,omitempty"`
-	ResolutionHours  *uint32  `protobuf:"varint,5,opt,name=resolution_hours,def=1" json:"resolution_hours,omitempty"`
-	CombineVersions  *bool    `protobuf:"varint,6,opt,name=combine_versions" json:"combine_versions,omitempty"`
-	UsageVersion     *int32   `protobuf:"varint,7,opt,name=usage_version" json:"usage_version,omitempty"`
-	VersionsOnly     *bool    `protobuf:"varint,8,opt,name=versions_only" json:"versions_only,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *LogUsageRequest) Reset()         { *m = LogUsageRequest{} }
-func (m *LogUsageRequest) String() string { return proto.CompactTextString(m) }
-func (*LogUsageRequest) ProtoMessage()    {}
-
-const Default_LogUsageRequest_ResolutionHours uint32 = 1
-
-func (m *LogUsageRequest) GetAppId() string {
-	if m != nil && m.AppId != nil {
-		return *m.AppId
-	}
-	return ""
-}
-
-func (m *LogUsageRequest) GetVersionId() []string {
-	if m != nil {
-		return m.VersionId
-	}
-	return nil
-}
-
-func (m *LogUsageRequest) GetStartTime() int32 {
-	if m != nil && m.StartTime != nil {
-		return *m.StartTime
-	}
-	return 0
-}
-
-func (m *LogUsageRequest) GetEndTime() int32 {
-	if m != nil && m.EndTime != nil {
-		return *m.EndTime
-	}
-	return 0
-}
-
-func (m *LogUsageRequest) GetResolutionHours() uint32 {
-	if m != nil && m.ResolutionHours != nil {
-		return *m.ResolutionHours
-	}
-	return Default_LogUsageRequest_ResolutionHours
-}
-
-func (m *LogUsageRequest) GetCombineVersions() bool {
-	if m != nil && m.CombineVersions != nil {
-		return *m.CombineVersions
-	}
-	return false
-}
-
-func (m *LogUsageRequest) GetUsageVersion() int32 {
-	if m != nil && m.UsageVersion != nil {
-		return *m.UsageVersion
-	}
-	return 0
-}
-
-func (m *LogUsageRequest) GetVersionsOnly() bool {
-	if m != nil && m.VersionsOnly != nil {
-		return *m.VersionsOnly
-	}
-	return false
-}
-
-type LogUsageResponse struct {
-	Usage            []*LogUsageRecord `protobuf:"bytes,1,rep,name=usage" json:"usage,omitempty"`
-	Summary          *LogUsageRecord   `protobuf:"bytes,2,opt,name=summary" json:"summary,omitempty"`
-	XXX_unrecognized []byte            `json:"-"`
-}
-
-func (m *LogUsageResponse) Reset()         { *m = LogUsageResponse{} }
-func (m *LogUsageResponse) String() string { return proto.CompactTextString(m) }
-func (*LogUsageResponse) ProtoMessage()    {}
-
-func (m *LogUsageResponse) GetUsage() []*LogUsageRecord {
-	if m != nil {
-		return m.Usage
-	}
-	return nil
-}
-
-func (m *LogUsageResponse) GetSummary() *LogUsageRecord {
-	if m != nil {
-		return m.Summary
-	}
-	return nil
-}
-
-func init() {
-}
diff --git a/vendor/google.golang.org/appengine/internal/log/log_service.proto b/vendor/google.golang.org/appengine/internal/log/log_service.proto
deleted file mode 100644
index 8981dc4757..0000000000
--- a/vendor/google.golang.org/appengine/internal/log/log_service.proto
+++ /dev/null
@@ -1,150 +0,0 @@
-syntax = "proto2";
-option go_package = "log";
-
-package appengine;
-
-message LogServiceError {
-  enum ErrorCode {
-    OK  = 0;
-    INVALID_REQUEST = 1;
-    STORAGE_ERROR = 2;
-  }
-}
-
-message UserAppLogLine {
-  required int64 timestamp_usec = 1;
-  required int64 level = 2;
-  required string message = 3;
-}
-
-message UserAppLogGroup {
-  repeated UserAppLogLine log_line = 2;
-}
-
-message FlushRequest {
-  optional bytes logs = 1;
-}
-
-message SetStatusRequest {
-  required string status = 1;
-}
-
-
-message LogOffset {
-  optional bytes request_id = 1;
-}
-
-message LogLine {
-  required int64 time = 1;
-  required int32 level = 2;
-  required string log_message = 3;
-}
-
-message RequestLog {
-  required string app_id = 1;
-  optional string module_id = 37 [default="default"];
-  required string version_id = 2;
-  required bytes request_id = 3;
-  optional LogOffset offset = 35;
-  required string ip = 4;
-  optional string nickname = 5;
-  required int64 start_time = 6;
-  required int64 end_time = 7;
-  required int64 latency = 8;
-  required int64 mcycles = 9;
-  required string method = 10;
-  required string resource = 11;
-  required string http_version = 12;
-  required int32 status = 13;
-  required int64 response_size = 14;
-  optional string referrer = 15;
-  optional string user_agent = 16;
-  required string url_map_entry = 17;
-  required string combined = 18;
-  optional int64 api_mcycles = 19;
-  optional string host = 20;
-  optional double cost = 21;
-
-  optional string task_queue_name = 22;
-  optional string task_name = 23;
-
-  optional bool was_loading_request = 24;
-  optional int64 pending_time = 25;
-  optional int32 replica_index = 26 [default = -1];
-  optional bool finished = 27 [default = true];
-  optional bytes clone_key = 28;
-
-  repeated LogLine line = 29;
-
-  optional bool lines_incomplete = 36;
-  optional bytes app_engine_release = 38;
-
-  optional int32 exit_reason = 30;
-  optional bool was_throttled_for_time = 31;
-  optional bool was_throttled_for_requests = 32;
-  optional int64 throttled_time = 33;
-
-  optional bytes server_name = 34;
-}
-
-message LogModuleVersion {
-  optional string module_id = 1 [default="default"];
-  optional string version_id = 2;
-}
-
-message LogReadRequest {
-  required string app_id = 1;
-  repeated string version_id = 2;
-  repeated LogModuleVersion module_version = 19;
-
-  optional int64 start_time = 3;
-  optional int64 end_time = 4;
-  optional LogOffset offset = 5;
-  repeated bytes request_id = 6;
-
-  optional int32 minimum_log_level = 7;
-  optional bool include_incomplete = 8;
-  optional int64 count = 9;
-
-  optional string combined_log_regex = 14;
-  optional string host_regex = 15;
-  optional int32 replica_index = 16;
-
-  optional bool include_app_logs = 10;
-  optional int32 app_logs_per_request = 17;
-  optional bool include_host = 11;
-  optional bool include_all = 12;
-  optional bool cache_iterator = 13;
-  optional int32 num_shards = 18;
-}
-
-message LogReadResponse {
-  repeated RequestLog log = 1;
-  optional LogOffset offset = 2;
-  optional int64 last_end_time = 3;
-}
-
-message LogUsageRecord {
-  optional string version_id = 1;
-  optional int32 start_time = 2;
-  optional int32 end_time = 3;
-  optional int64 count = 4;
-  optional int64 total_size = 5;
-  optional int32 records = 6;
-}
-
-message LogUsageRequest {
-  required string app_id = 1;
-  repeated string version_id = 2;
-  optional int32 start_time = 3;
-  optional int32 end_time = 4;
-  optional uint32 resolution_hours = 5 [default = 1];
-  optional bool combine_versions = 6;
-  optional int32 usage_version = 7;
-  optional bool versions_only = 8;
-}
-
-message LogUsageResponse {
-  repeated LogUsageRecord usage = 1;
-  optional LogUsageRecord summary = 2;
-}
diff --git a/vendor/google.golang.org/appengine/internal/main.go b/vendor/google.golang.org/appengine/internal/main.go
deleted file mode 100644
index 49036163c2..0000000000
--- a/vendor/google.golang.org/appengine/internal/main.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2011 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-package internal
-
-import (
-	"appengine_internal"
-)
-
-func Main() {
-	appengine_internal.Main()
-}
diff --git a/vendor/google.golang.org/appengine/internal/main_vm.go b/vendor/google.golang.org/appengine/internal/main_vm.go
deleted file mode 100644
index 822e784a45..0000000000
--- a/vendor/google.golang.org/appengine/internal/main_vm.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2011 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build !appengine
-
-package internal
-
-import (
-	"io"
-	"log"
-	"net/http"
-	"net/url"
-	"os"
-)
-
-func Main() {
-	installHealthChecker(http.DefaultServeMux)
-
-	port := "8080"
-	if s := os.Getenv("PORT"); s != "" {
-		port = s
-	}
-
-	host := ""
-	if IsDevAppServer() {
-		host = "127.0.0.1"
-	}
-	if err := http.ListenAndServe(host+":"+port, http.HandlerFunc(handleHTTP)); err != nil {
-		log.Fatalf("http.ListenAndServe: %v", err)
-	}
-}
-
-func installHealthChecker(mux *http.ServeMux) {
-	// If no health check handler has been installed by this point, add a trivial one.
-	const healthPath = "/_ah/health"
-	hreq := &http.Request{
-		Method: "GET",
-		URL: &url.URL{
-			Path: healthPath,
-		},
-	}
-	if _, pat := mux.Handler(hreq); pat != healthPath {
-		mux.HandleFunc(healthPath, func(w http.ResponseWriter, r *http.Request) {
-			io.WriteString(w, "ok")
-		})
-	}
-}
diff --git a/vendor/google.golang.org/appengine/internal/metadata.go b/vendor/google.golang.org/appengine/internal/metadata.go
deleted file mode 100644
index 9cc1f71d10..0000000000
--- a/vendor/google.golang.org/appengine/internal/metadata.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2014 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package internal
-
-// This file has code for accessing metadata.
-//
-// References:
-//	https://cloud.google.com/compute/docs/metadata
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/url"
-)
-
-const (
-	metadataHost = "metadata"
-	metadataPath = "/computeMetadata/v1/"
-)
-
-var (
-	metadataRequestHeaders = http.Header{
-		"Metadata-Flavor": []string{"Google"},
-	}
-)
-
-// TODO(dsymonds): Do we need to support default values, like Python?
-func mustGetMetadata(key string) []byte {
-	b, err := getMetadata(key)
-	if err != nil {
-		log.Fatalf("Metadata fetch failed: %v", err)
-	}
-	return b
-}
-
-func getMetadata(key string) ([]byte, error) {
-	// TODO(dsymonds): May need to use url.Parse to support keys with query args.
-	req := &http.Request{
-		Method: "GET",
-		URL: &url.URL{
-			Scheme: "http",
-			Host:   metadataHost,
-			Path:   metadataPath + key,
-		},
-		Header: metadataRequestHeaders,
-		Host:   metadataHost,
-	}
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("metadata server returned HTTP %d", resp.StatusCode)
-	}
-	return ioutil.ReadAll(resp.Body)
-}
diff --git a/vendor/google.golang.org/appengine/internal/modules/modules_service.pb.go b/vendor/google.golang.org/appengine/internal/modules/modules_service.pb.go
deleted file mode 100644
index a0145ed317..0000000000
--- a/vendor/google.golang.org/appengine/internal/modules/modules_service.pb.go
+++ /dev/null
@@ -1,375 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: google.golang.org/appengine/internal/modules/modules_service.proto
-// DO NOT EDIT!
-
-/*
-Package modules is a generated protocol buffer package.
-
-It is generated from these files:
-	google.golang.org/appengine/internal/modules/modules_service.proto
-
-It has these top-level messages:
-	ModulesServiceError
-	GetModulesRequest
-	GetModulesResponse
-	GetVersionsRequest
-	GetVersionsResponse
-	GetDefaultVersionRequest
-	GetDefaultVersionResponse
-	GetNumInstancesRequest
-	GetNumInstancesResponse
-	SetNumInstancesRequest
-	SetNumInstancesResponse
-	StartModuleRequest
-	StartModuleResponse
-	StopModuleRequest
-	StopModuleResponse
-	GetHostnameRequest
-	GetHostnameResponse
-*/
-package modules
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type ModulesServiceError_ErrorCode int32
-
-const (
-	ModulesServiceError_OK                ModulesServiceError_ErrorCode = 0
-	ModulesServiceError_INVALID_MODULE    ModulesServiceError_ErrorCode = 1
-	ModulesServiceError_INVALID_VERSION   ModulesServiceError_ErrorCode = 2
-	ModulesServiceError_INVALID_INSTANCES ModulesServiceError_ErrorCode = 3
-	ModulesServiceError_TRANSIENT_ERROR   ModulesServiceError_ErrorCode = 4
-	ModulesServiceError_UNEXPECTED_STATE  ModulesServiceError_ErrorCode = 5
-)
-
-var ModulesServiceError_ErrorCode_name = map[int32]string{
-	0: "OK",
-	1: "INVALID_MODULE",
-	2: "INVALID_VERSION",
-	3: "INVALID_INSTANCES",
-	4: "TRANSIENT_ERROR",
-	5: "UNEXPECTED_STATE",
-}
-var ModulesServiceError_ErrorCode_value = map[string]int32{
-	"OK":                0,
-	"INVALID_MODULE":    1,
-	"INVALID_VERSION":   2,
-	"INVALID_INSTANCES": 3,
-	"TRANSIENT_ERROR":   4,
-	"UNEXPECTED_STATE":  5,
-}
-
-func (x ModulesServiceError_ErrorCode) Enum() *ModulesServiceError_ErrorCode {
-	p := new(ModulesServiceError_ErrorCode)
-	*p = x
-	return p
-}
-func (x ModulesServiceError_ErrorCode) String() string {
-	return proto.EnumName(ModulesServiceError_ErrorCode_name, int32(x))
-}
-func (x *ModulesServiceError_ErrorCode) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(ModulesServiceError_ErrorCode_value, data, "ModulesServiceError_ErrorCode")
-	if err != nil {
-		return err
-	}
-	*x = ModulesServiceError_ErrorCode(value)
-	return nil
-}
-
-type ModulesServiceError struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *ModulesServiceError) Reset()         { *m = ModulesServiceError{} }
-func (m *ModulesServiceError) String() string { return proto.CompactTextString(m) }
-func (*ModulesServiceError) ProtoMessage()    {}
-
-type GetModulesRequest struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GetModulesRequest) Reset()         { *m = GetModulesRequest{} }
-func (m *GetModulesRequest) String() string { return proto.CompactTextString(m) }
-func (*GetModulesRequest) ProtoMessage()    {}
-
-type GetModulesResponse struct {
-	Module           []string `protobuf:"bytes,1,rep,name=module" json:"module,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *GetModulesResponse) Reset()         { *m = GetModulesResponse{} }
-func (m *GetModulesResponse) String() string { return proto.CompactTextString(m) }
-func (*GetModulesResponse) ProtoMessage()    {}
-
-func (m *GetModulesResponse) GetModule() []string {
-	if m != nil {
-		return m.Module
-	}
-	return nil
-}
-
-type GetVersionsRequest struct {
-	Module           *string `protobuf:"bytes,1,opt,name=module" json:"module,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GetVersionsRequest) Reset()         { *m = GetVersionsRequest{} }
-func (m *GetVersionsRequest) String() string { return proto.CompactTextString(m) }
-func (*GetVersionsRequest) ProtoMessage()    {}
-
-func (m *GetVersionsRequest) GetModule() string {
-	if m != nil && m.Module != nil {
-		return *m.Module
-	}
-	return ""
-}
-
-type GetVersionsResponse struct {
-	Version          []string `protobuf:"bytes,1,rep,name=version" json:"version,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *GetVersionsResponse) Reset()         { *m = GetVersionsResponse{} }
-func (m *GetVersionsResponse) String() string { return proto.CompactTextString(m) }
-func (*GetVersionsResponse) ProtoMessage()    {}
-
-func (m *GetVersionsResponse) GetVersion() []string {
-	if m != nil {
-		return m.Version
-	}
-	return nil
-}
-
-type GetDefaultVersionRequest struct {
-	Module           *string `protobuf:"bytes,1,opt,name=module" json:"module,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GetDefaultVersionRequest) Reset()         { *m = GetDefaultVersionRequest{} }
-func (m *GetDefaultVersionRequest) String() string { return proto.CompactTextString(m) }
-func (*GetDefaultVersionRequest) ProtoMessage()    {}
-
-func (m *GetDefaultVersionRequest) GetModule() string {
-	if m != nil && m.Module != nil {
-		return *m.Module
-	}
-	return ""
-}
-
-type GetDefaultVersionResponse struct {
-	Version          *string `protobuf:"bytes,1,req,name=version" json:"version,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GetDefaultVersionResponse) Reset()         { *m = GetDefaultVersionResponse{} }
-func (m *GetDefaultVersionResponse) String() string { return proto.CompactTextString(m) }
-func (*GetDefaultVersionResponse) ProtoMessage()    {}
-
-func (m *GetDefaultVersionResponse) GetVersion() string {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return ""
-}
-
-type GetNumInstancesRequest struct {
-	Module           *string `protobuf:"bytes,1,opt,name=module" json:"module,omitempty"`
-	Version          *string `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GetNumInstancesRequest) Reset()         { *m = GetNumInstancesRequest{} }
-func (m *GetNumInstancesRequest) String() string { return proto.CompactTextString(m) }
-func (*GetNumInstancesRequest) ProtoMessage()    {}
-
-func (m *GetNumInstancesRequest) GetModule() string {
-	if m != nil && m.Module != nil {
-		return *m.Module
-	}
-	return ""
-}
-
-func (m *GetNumInstancesRequest) GetVersion() string {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return ""
-}
-
-type GetNumInstancesResponse struct {
-	Instances        *int64 `protobuf:"varint,1,req,name=instances" json:"instances,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GetNumInstancesResponse) Reset()         { *m = GetNumInstancesResponse{} }
-func (m *GetNumInstancesResponse) String() string { return proto.CompactTextString(m) }
-func (*GetNumInstancesResponse) ProtoMessage()    {}
-
-func (m *GetNumInstancesResponse) GetInstances() int64 {
-	if m != nil && m.Instances != nil {
-		return *m.Instances
-	}
-	return 0
-}
-
-type SetNumInstancesRequest struct {
-	Module           *string `protobuf:"bytes,1,opt,name=module" json:"module,omitempty"`
-	Version          *string `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
-	Instances        *int64  `protobuf:"varint,3,req,name=instances" json:"instances,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *SetNumInstancesRequest) Reset()         { *m = SetNumInstancesRequest{} }
-func (m *SetNumInstancesRequest) String() string { return proto.CompactTextString(m) }
-func (*SetNumInstancesRequest) ProtoMessage()    {}
-
-func (m *SetNumInstancesRequest) GetModule() string {
-	if m != nil && m.Module != nil {
-		return *m.Module
-	}
-	return ""
-}
-
-func (m *SetNumInstancesRequest) GetVersion() string {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return ""
-}
-
-func (m *SetNumInstancesRequest) GetInstances() int64 {
-	if m != nil && m.Instances != nil {
-		return *m.Instances
-	}
-	return 0
-}
-
-type SetNumInstancesResponse struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *SetNumInstancesResponse) Reset()         { *m = SetNumInstancesResponse{} }
-func (m *SetNumInstancesResponse) String() string { return proto.CompactTextString(m) }
-func (*SetNumInstancesResponse) ProtoMessage()    {}
-
-type StartModuleRequest struct {
-	Module           *string `protobuf:"bytes,1,req,name=module" json:"module,omitempty"`
-	Version          *string `protobuf:"bytes,2,req,name=version" json:"version,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *StartModuleRequest) Reset()         { *m = StartModuleRequest{} }
-func (m *StartModuleRequest) String() string { return proto.CompactTextString(m) }
-func (*StartModuleRequest) ProtoMessage()    {}
-
-func (m *StartModuleRequest) GetModule() string {
-	if m != nil && m.Module != nil {
-		return *m.Module
-	}
-	return ""
-}
-
-func (m *StartModuleRequest) GetVersion() string {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return ""
-}
-
-type StartModuleResponse struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *StartModuleResponse) Reset()         { *m = StartModuleResponse{} }
-func (m *StartModuleResponse) String() string { return proto.CompactTextString(m) }
-func (*StartModuleResponse) ProtoMessage()    {}
-
-type StopModuleRequest struct {
-	Module           *string `protobuf:"bytes,1,opt,name=module" json:"module,omitempty"`
-	Version          *string `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *StopModuleRequest) Reset()         { *m = StopModuleRequest{} }
-func (m *StopModuleRequest) String() string { return proto.CompactTextString(m) }
-func (*StopModuleRequest) ProtoMessage()    {}
-
-func (m *StopModuleRequest) GetModule() string {
-	if m != nil && m.Module != nil {
-		return *m.Module
-	}
-	return ""
-}
-
-func (m *StopModuleRequest) GetVersion() string {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return ""
-}
-
-type StopModuleResponse struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *StopModuleResponse) Reset()         { *m = StopModuleResponse{} }
-func (m *StopModuleResponse) String() string { return proto.CompactTextString(m) }
-func (*StopModuleResponse) ProtoMessage()    {}
-
-type GetHostnameRequest struct {
-	Module           *string `protobuf:"bytes,1,opt,name=module" json:"module,omitempty"`
-	Version          *string `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
-	Instance         *string `protobuf:"bytes,3,opt,name=instance" json:"instance,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GetHostnameRequest) Reset()         { *m = GetHostnameRequest{} }
-func (m *GetHostnameRequest) String() string { return proto.CompactTextString(m) }
-func (*GetHostnameRequest) ProtoMessage()    {}
-
-func (m *GetHostnameRequest) GetModule() string {
-	if m != nil && m.Module != nil {
-		return *m.Module
-	}
-	return ""
-}
-
-func (m *GetHostnameRequest) GetVersion() string {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return ""
-}
-
-func (m *GetHostnameRequest) GetInstance() string {
-	if m != nil && m.Instance != nil {
-		return *m.Instance
-	}
-	return ""
-}
-
-type GetHostnameResponse struct {
-	Hostname         *string `protobuf:"bytes,1,req,name=hostname" json:"hostname,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GetHostnameResponse) Reset()         { *m = GetHostnameResponse{} }
-func (m *GetHostnameResponse) String() string { return proto.CompactTextString(m) }
-func (*GetHostnameResponse) ProtoMessage()    {}
-
-func (m *GetHostnameResponse) GetHostname() string {
-	if m != nil && m.Hostname != nil {
-		return *m.Hostname
-	}
-	return ""
-}
-
-func init() {
-}
diff --git a/vendor/google.golang.org/appengine/internal/modules/modules_service.proto b/vendor/google.golang.org/appengine/internal/modules/modules_service.proto
deleted file mode 100644
index d29f0065a2..0000000000
--- a/vendor/google.golang.org/appengine/internal/modules/modules_service.proto
+++ /dev/null
@@ -1,80 +0,0 @@
-syntax = "proto2";
-option go_package = "modules";
-
-package appengine;
-
-message ModulesServiceError {
-  enum ErrorCode {
-    OK  = 0;
-    INVALID_MODULE = 1;
-    INVALID_VERSION = 2;
-    INVALID_INSTANCES = 3;
-    TRANSIENT_ERROR = 4;
-    UNEXPECTED_STATE = 5;
-  }
-}
-
-message GetModulesRequest {
-}
-
-message GetModulesResponse {
-  repeated string module = 1;
-}
-
-message GetVersionsRequest {
-  optional string module = 1;
-}
-
-message GetVersionsResponse {
-  repeated string version = 1;
-}
-
-message GetDefaultVersionRequest {
-  optional string module = 1;
-}
-
-message GetDefaultVersionResponse {
-  required string version = 1;
-}
-
-message GetNumInstancesRequest {
-  optional string module = 1;
-  optional string version = 2;
-}
-
-message GetNumInstancesResponse {
-  required int64 instances = 1;
-}
-
-message SetNumInstancesRequest {
-  optional string module = 1;
-  optional string version = 2;
-  required int64 instances = 3;
-}
-
-message SetNumInstancesResponse {}
-
-message StartModuleRequest {
-  required string module = 1;
-  required string version = 2;
-}
-
-message StartModuleResponse {}
-
-message StopModuleRequest {
-  optional string module = 1;
-  optional string version = 2;
-}
-
-message StopModuleResponse {}
-
-message GetHostnameRequest {
-  optional string module = 1;
-  optional string version = 2;
-  optional string instance = 3;
-}
-
-message GetHostnameResponse {
-  required string hostname = 1;
-}
-
diff --git a/vendor/google.golang.org/appengine/internal/net.go b/vendor/google.golang.org/appengine/internal/net.go
deleted file mode 100644
index 3b94cf0c6a..0000000000
--- a/vendor/google.golang.org/appengine/internal/net.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2014 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package internal
-
-// This file implements a network dialer that limits the number of concurrent connections.
-// It is only used for API calls.
-
-import (
-	"log"
-	"net"
-	"runtime"
-	"sync"
-	"time"
-)
-
-var limitSem = make(chan int, 100) // TODO(dsymonds): Use environment variable.
-
-func limitRelease() {
-	// non-blocking
-	select {
-	case <-limitSem:
-	default:
-		// This should not normally happen.
-		log.Print("appengine: unbalanced limitSem release!")
-	}
-}
-
-func limitDial(network, addr string) (net.Conn, error) {
-	limitSem <- 1
-
-	// Dial with a timeout in case the API host is MIA.
-	// The connection should normally be very fast.
-	conn, err := net.DialTimeout(network, addr, 500*time.Millisecond)
-	if err != nil {
-		limitRelease()
-		return nil, err
-	}
-	lc := &limitConn{Conn: conn}
-	runtime.SetFinalizer(lc, (*limitConn).Close) // shouldn't usually be required
-	return lc, nil
-}
-
-type limitConn struct {
-	close sync.Once
-	net.Conn
-}
-
-func (lc *limitConn) Close() error {
-	defer lc.close.Do(func() {
-		limitRelease()
-		runtime.SetFinalizer(lc, nil)
-	})
-	return lc.Conn.Close()
-}
diff --git a/vendor/google.golang.org/appengine/internal/regen.sh b/vendor/google.golang.org/appengine/internal/regen.sh
deleted file mode 100755
index 2fdb546a63..0000000000
--- a/vendor/google.golang.org/appengine/internal/regen.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash -e
-#
-# This script rebuilds the generated code for the protocol buffers.
-# To run this you will need protoc and goprotobuf installed;
-# see https://github.com/golang/protobuf for instructions.
-
-PKG=google.golang.org/appengine
-
-function die() {
-	echo 1>&2 $*
-	exit 1
-}
-
-# Sanity check that the right tools are accessible.
-for tool in go protoc protoc-gen-go; do
-	q=$(which $tool) || die "didn't find $tool"
-	echo 1>&2 "$tool: $q"
-done
-
-echo -n 1>&2 "finding package dir... "
-pkgdir=$(go list -f '{{.Dir}}' $PKG)
-echo 1>&2 $pkgdir
-base=$(echo $pkgdir | sed "s,/$PKG\$,,")
-echo 1>&2 "base: $base"
-cd $base
-
-# Run protoc once per package.
-for dir in $(find $PKG/internal -name '*.proto' | xargs dirname | sort | uniq); do
-	echo 1>&2 "* $dir"
-	protoc --go_out=. $dir/*.proto
-done
-
-for f in $(find $PKG/internal -name '*.pb.go'); do
-  # Remove proto.RegisterEnum calls.
-  # These cause duplicate registration panics when these packages
-  # are used on classic App Engine. proto.RegisterEnum only affects
-  # parsing the text format; we don't care about that.
-  # https://code.google.com/p/googleappengine/issues/detail?id=11670#c17
-  sed -i '/proto.RegisterEnum/d' $f
-done
diff --git a/vendor/google.golang.org/appengine/internal/remote_api/remote_api.pb.go b/vendor/google.golang.org/appengine/internal/remote_api/remote_api.pb.go
deleted file mode 100644
index 526bd39e6d..0000000000
--- a/vendor/google.golang.org/appengine/internal/remote_api/remote_api.pb.go
+++ /dev/null
@@ -1,231 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: google.golang.org/appengine/internal/remote_api/remote_api.proto
-// DO NOT EDIT!
-
-/*
-Package remote_api is a generated protocol buffer package.
-
-It is generated from these files:
-	google.golang.org/appengine/internal/remote_api/remote_api.proto
-
-It has these top-level messages:
-	Request
-	ApplicationError
-	RpcError
-	Response
-*/
-package remote_api
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type RpcError_ErrorCode int32
-
-const (
-	RpcError_UNKNOWN             RpcError_ErrorCode = 0
-	RpcError_CALL_NOT_FOUND      RpcError_ErrorCode = 1
-	RpcError_PARSE_ERROR         RpcError_ErrorCode = 2
-	RpcError_SECURITY_VIOLATION  RpcError_ErrorCode = 3
-	RpcError_OVER_QUOTA          RpcError_ErrorCode = 4
-	RpcError_REQUEST_TOO_LARGE   RpcError_ErrorCode = 5
-	RpcError_CAPABILITY_DISABLED RpcError_ErrorCode = 6
-	RpcError_FEATURE_DISABLED    RpcError_ErrorCode = 7
-	RpcError_BAD_REQUEST         RpcError_ErrorCode = 8
-	RpcError_RESPONSE_TOO_LARGE  RpcError_ErrorCode = 9
-	RpcError_CANCELLED           RpcError_ErrorCode = 10
-	RpcError_REPLAY_ERROR        RpcError_ErrorCode = 11
-	RpcError_DEADLINE_EXCEEDED   RpcError_ErrorCode = 12
-)
-
-var RpcError_ErrorCode_name = map[int32]string{
-	0:  "UNKNOWN",
-	1:  "CALL_NOT_FOUND",
-	2:  "PARSE_ERROR",
-	3:  "SECURITY_VIOLATION",
-	4:  "OVER_QUOTA",
-	5:  "REQUEST_TOO_LARGE",
-	6:  "CAPABILITY_DISABLED",
-	7:  "FEATURE_DISABLED",
-	8:  "BAD_REQUEST",
-	9:  "RESPONSE_TOO_LARGE",
-	10: "CANCELLED",
-	11: "REPLAY_ERROR",
-	12: "DEADLINE_EXCEEDED",
-}
-var RpcError_ErrorCode_value = map[string]int32{
-	"UNKNOWN":             0,
-	"CALL_NOT_FOUND":      1,
-	"PARSE_ERROR":         2,
-	"SECURITY_VIOLATION":  3,
-	"OVER_QUOTA":          4,
-	"REQUEST_TOO_LARGE":   5,
-	"CAPABILITY_DISABLED": 6,
-	"FEATURE_DISABLED":    7,
-	"BAD_REQUEST":         8,
-	"RESPONSE_TOO_LARGE":  9,
-	"CANCELLED":           10,
-	"REPLAY_ERROR":        11,
-	"DEADLINE_EXCEEDED":   12,
-}
-
-func (x RpcError_ErrorCode) Enum() *RpcError_ErrorCode {
-	p := new(RpcError_ErrorCode)
-	*p = x
-	return p
-}
-func (x RpcError_ErrorCode) String() string {
-	return proto.EnumName(RpcError_ErrorCode_name, int32(x))
-}
-func (x *RpcError_ErrorCode) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(RpcError_ErrorCode_value, data, "RpcError_ErrorCode")
-	if err != nil {
-		return err
-	}
-	*x = RpcError_ErrorCode(value)
-	return nil
-}
-
-type Request struct {
-	ServiceName      *string `protobuf:"bytes,2,req,name=service_name" json:"service_name,omitempty"`
-	Method           *string `protobuf:"bytes,3,req,name=method" json:"method,omitempty"`
-	Request          []byte  `protobuf:"bytes,4,req,name=request" json:"request,omitempty"`
-	RequestId        *string `protobuf:"bytes,5,opt,name=request_id" json:"request_id,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Request) Reset()         { *m = Request{} }
-func (m *Request) String() string { return proto.CompactTextString(m) }
-func (*Request) ProtoMessage()    {}
-
-func (m *Request) GetServiceName() string {
-	if m != nil && m.ServiceName != nil {
-		return *m.ServiceName
-	}
-	return ""
-}
-
-func (m *Request) GetMethod() string {
-	if m != nil && m.Method != nil {
-		return *m.Method
-	}
-	return ""
-}
-
-func (m *Request) GetRequest() []byte {
-	if m != nil {
-		return m.Request
-	}
-	return nil
-}
-
-func (m *Request) GetRequestId() string {
-	if m != nil && m.RequestId != nil {
-		return *m.RequestId
-	}
-	return ""
-}
-
-type ApplicationError struct {
-	Code             *int32  `protobuf:"varint,1,req,name=code" json:"code,omitempty"`
-	Detail           *string `protobuf:"bytes,2,req,name=detail" json:"detail,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *ApplicationError) Reset()         { *m = ApplicationError{} }
-func (m *ApplicationError) String() string { return proto.CompactTextString(m) }
-func (*ApplicationError) ProtoMessage()    {}
-
-func (m *ApplicationError) GetCode() int32 {
-	if m != nil && m.Code != nil {
-		return *m.Code
-	}
-	return 0
-}
-
-func (m *ApplicationError) GetDetail() string {
-	if m != nil && m.Detail != nil {
-		return *m.Detail
-	}
-	return ""
-}
-
-type RpcError struct {
-	Code             *int32  `protobuf:"varint,1,req,name=code" json:"code,omitempty"`
-	Detail           *string `protobuf:"bytes,2,opt,name=detail" json:"detail,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *RpcError) Reset()         { *m = RpcError{} }
-func (m *RpcError) String() string { return proto.CompactTextString(m) }
-func (*RpcError) ProtoMessage()    {}
-
-func (m *RpcError) GetCode() int32 {
-	if m != nil && m.Code != nil {
-		return *m.Code
-	}
-	return 0
-}
-
-func (m *RpcError) GetDetail() string {
-	if m != nil && m.Detail != nil {
-		return *m.Detail
-	}
-	return ""
-}
-
-type Response struct {
-	Response         []byte            `protobuf:"bytes,1,opt,name=response" json:"response,omitempty"`
-	Exception        []byte            `protobuf:"bytes,2,opt,name=exception" json:"exception,omitempty"`
-	ApplicationError *ApplicationError `protobuf:"bytes,3,opt,name=application_error" json:"application_error,omitempty"`
-	JavaException    []byte            `protobuf:"bytes,4,opt,name=java_exception" json:"java_exception,omitempty"`
-	RpcError         *RpcError         `protobuf:"bytes,5,opt,name=rpc_error" json:"rpc_error,omitempty"`
-	XXX_unrecognized []byte            `json:"-"`
-}
-
-func (m *Response) Reset()         { *m = Response{} }
-func (m *Response) String() string { return proto.CompactTextString(m) }
-func (*Response) ProtoMessage()    {}
-
-func (m *Response) GetResponse() []byte {
-	if m != nil {
-		return m.Response
-	}
-	return nil
-}
-
-func (m *Response) GetException() []byte {
-	if m != nil {
-		return m.Exception
-	}
-	return nil
-}
-
-func (m *Response) GetApplicationError() *ApplicationError {
-	if m != nil {
-		return m.ApplicationError
-	}
-	return nil
-}
-
-func (m *Response) GetJavaException() []byte {
-	if m != nil {
-		return m.JavaException
-	}
-	return nil
-}
-
-func (m *Response) GetRpcError() *RpcError {
-	if m != nil {
-		return m.RpcError
-	}
-	return nil
-}
-
-func init() {
-}
diff --git a/vendor/google.golang.org/appengine/internal/remote_api/remote_api.proto b/vendor/google.golang.org/appengine/internal/remote_api/remote_api.proto
deleted file mode 100644
index f21763a4e2..0000000000
--- a/vendor/google.golang.org/appengine/internal/remote_api/remote_api.proto
+++ /dev/null
@@ -1,44 +0,0 @@
-syntax = "proto2";
-option go_package = "remote_api";
-
-package remote_api;
-
-message Request {
-  required string service_name = 2;
-  required string method = 3;
-  required bytes request = 4;
-  optional string request_id = 5;
-}
-
-message ApplicationError {
-  required int32 code = 1;
-  required string detail = 2;
-}
-
-message RpcError {
-  enum ErrorCode {
-    UNKNOWN = 0;
-    CALL_NOT_FOUND = 1;
-    PARSE_ERROR = 2;
-    SECURITY_VIOLATION = 3;
-    OVER_QUOTA = 4;
-    REQUEST_TOO_LARGE = 5;
-    CAPABILITY_DISABLED = 6;
-    FEATURE_DISABLED = 7;
-    BAD_REQUEST = 8;
-    RESPONSE_TOO_LARGE = 9;
-    CANCELLED = 10;
-    REPLAY_ERROR = 11;
-    DEADLINE_EXCEEDED = 12;
-  }
-  required int32 code = 1;
-  optional string detail = 2;
-}
-
-message Response {
-  optional bytes response = 1;
-  optional bytes exception = 2;
-  optional ApplicationError application_error = 3;
-  optional bytes java_exception = 4;
-  optional RpcError rpc_error = 5;
-}
diff --git a/vendor/google.golang.org/appengine/internal/transaction.go b/vendor/google.golang.org/appengine/internal/transaction.go
deleted file mode 100644
index 28a6d18120..0000000000
--- a/vendor/google.golang.org/appengine/internal/transaction.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2014 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package internal
-
-// This file implements hooks for applying datastore transactions.
-
-import (
-	"errors"
-	"reflect"
-
-	"github.com/golang/protobuf/proto"
-	netcontext "golang.org/x/net/context"
-
-	basepb "google.golang.org/appengine/internal/base"
-	pb "google.golang.org/appengine/internal/datastore"
-)
-
-var transactionSetters = make(map[reflect.Type]reflect.Value)
-
-// RegisterTransactionSetter registers a function that sets transaction information
-// in a protocol buffer message. f should be a function with two arguments,
-// the first being a protocol buffer type, and the second being *datastore.Transaction.
-func RegisterTransactionSetter(f interface{}) {
-	v := reflect.ValueOf(f)
-	transactionSetters[v.Type().In(0)] = v
-}
-
-// applyTransaction applies the transaction t to message pb
-// by using the relevant setter passed to RegisterTransactionSetter.
-func applyTransaction(pb proto.Message, t *pb.Transaction) {
-	v := reflect.ValueOf(pb)
-	if f, ok := transactionSetters[v.Type()]; ok {
-		f.Call([]reflect.Value{v, reflect.ValueOf(t)})
-	}
-}
-
-var transactionKey = "used for *Transaction"
-
-func transactionFromContext(ctx netcontext.Context) *transaction {
-	t, _ := ctx.Value(&transactionKey).(*transaction)
-	return t
-}
-
-func withTransaction(ctx netcontext.Context, t *transaction) netcontext.Context {
-	return netcontext.WithValue(ctx, &transactionKey, t)
-}
-
-type transaction struct {
-	transaction pb.Transaction
-	finished    bool
-}
-
-var ErrConcurrentTransaction = errors.New("internal: concurrent transaction")
-
-func RunTransactionOnce(c netcontext.Context, f func(netcontext.Context) error, xg bool) error {
-	if transactionFromContext(c) != nil {
-		return errors.New("nested transactions are not supported")
-	}
-
-	// Begin the transaction.
-	t := &transaction{}
-	req := &pb.BeginTransactionRequest{
-		App: proto.String(FullyQualifiedAppID(c)),
-	}
-	if xg {
-		req.AllowMultipleEg = proto.Bool(true)
-	}
-	if err := Call(c, "datastore_v3", "BeginTransaction", req, &t.transaction); err != nil {
-		return err
-	}
-
-	// Call f, rolling back the transaction if f returns a non-nil error, or panics.
-	// The panic is not recovered.
-	defer func() {
-		if t.finished {
-			return
-		}
-		t.finished = true
-		// Ignore the error return value, since we are already returning a non-nil
-		// error (or we're panicking).
-		Call(c, "datastore_v3", "Rollback", &t.transaction, &basepb.VoidProto{})
-	}()
-	if err := f(withTransaction(c, t)); err != nil {
-		return err
-	}
-	t.finished = true
-
-	// Commit the transaction.
-	res := &pb.CommitResponse{}
-	err := Call(c, "datastore_v3", "Commit", &t.transaction, res)
-	if ae, ok := err.(*APIError); ok {
-		/* TODO: restore this conditional
-		if appengine.IsDevAppServer() {
-		*/
-		// The Python Dev AppServer raises an ApplicationError with error code 2 (which is
-		// Error.CONCURRENT_TRANSACTION) and message "Concurrency exception.".
-		if ae.Code == int32(pb.Error_BAD_REQUEST) && ae.Detail == "ApplicationError: 2 Concurrency exception." {
-			return ErrConcurrentTransaction
-		}
-		if ae.Code == int32(pb.Error_CONCURRENT_TRANSACTION) {
-			return ErrConcurrentTransaction
-		}
-	}
-	return err
-}
diff --git a/vendor/google.golang.org/appengine/namespace.go b/vendor/google.golang.org/appengine/namespace.go
deleted file mode 100644
index 21860ca082..0000000000
--- a/vendor/google.golang.org/appengine/namespace.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2012 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package appengine
-
-import (
-	"fmt"
-	"regexp"
-
-	"golang.org/x/net/context"
-
-	"google.golang.org/appengine/internal"
-)
-
-// Namespace returns a replacement context that operates within the given namespace.
-func Namespace(c context.Context, namespace string) (context.Context, error) {
-	if !validNamespace.MatchString(namespace) {
-		return nil, fmt.Errorf("appengine: namespace %q does not match /%s/", namespace, validNamespace)
-	}
-	return internal.NamespacedContext(c, namespace), nil
-}
-
-// validNamespace matches valid namespace names.
-var validNamespace = regexp.MustCompile(`^[0-9A-Za-z._-]{0,100}$`)
diff --git a/vendor/google.golang.org/appengine/timeout.go b/vendor/google.golang.org/appengine/timeout.go
deleted file mode 100644
index 05642a992a..0000000000
--- a/vendor/google.golang.org/appengine/timeout.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2013 Google Inc. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package appengine
-
-import "golang.org/x/net/context"
-
-// IsTimeoutError reports whether err is a timeout error.
-func IsTimeoutError(err error) bool {
-	if err == context.DeadlineExceeded {
-		return true
-	}
-	if t, ok := err.(interface {
-		IsTimeout() bool
-	}); ok {
-		return t.IsTimeout()
-	}
-	return false
-}
diff --git a/vendor/gopkg.in/yaml.v2/LICENSE b/vendor/gopkg.in/yaml.v2/LICENSE
deleted file mode 100644
index 8dada3edaf..0000000000
--- a/vendor/gopkg.in/yaml.v2/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/gopkg.in/yaml.v2/LICENSE.libyaml b/vendor/gopkg.in/yaml.v2/LICENSE.libyaml
deleted file mode 100644
index 8da58fbf6f..0000000000
--- a/vendor/gopkg.in/yaml.v2/LICENSE.libyaml
+++ /dev/null
@@ -1,31 +0,0 @@
-The following files were ported to Go from C files of libyaml, and thus
-are still covered by their original copyright and license:
-
-    apic.go
-    emitterc.go
-    parserc.go
-    readerc.go
-    scannerc.go
-    writerc.go
-    yamlh.go
-    yamlprivateh.go
-
-Copyright (c) 2006 Kirill Simonov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/gopkg.in/yaml.v2/README.md b/vendor/gopkg.in/yaml.v2/README.md
deleted file mode 100644
index 7a512d67c2..0000000000
--- a/vendor/gopkg.in/yaml.v2/README.md
+++ /dev/null
@@ -1,133 +0,0 @@
-# YAML support for the Go language
-
-Introduction
-------------
-
-The yaml package enables Go programs to comfortably encode and decode YAML
-values. It was developed within [Canonical](https://www.canonical.com) as
-part of the [juju](https://juju.ubuntu.com) project, and is based on a
-pure Go port of the well-known [libyaml](http://pyyaml.org/wiki/LibYAML)
-C library to parse and generate YAML data quickly and reliably.
-
-Compatibility
--------------
-
-The yaml package supports most of YAML 1.1 and 1.2, including support for
-anchors, tags, map merging, etc. Multi-document unmarshalling is not yet
-implemented, and base-60 floats from YAML 1.1 are purposefully not
-supported since they're a poor design and are gone in YAML 1.2.
-
-Installation and usage
-----------------------
-
-The import path for the package is *gopkg.in/yaml.v2*.
-
-To install it, run:
-
-    go get gopkg.in/yaml.v2
-
-API documentation
------------------
-
-If opened in a browser, the import path itself leads to the API documentation:
-
-  * [https://gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)
-
-API stability
--------------
-
-The package API for yaml v2 will remain stable as described in [gopkg.in](https://gopkg.in).
-
-
-License
--------
-
-The yaml package is licensed under the Apache License 2.0. Please see the LICENSE file for details.
-
-
-Example
--------
-
-Some more examples can be found in the "examples" folder.
-
-```Go
-package main
-
-import (
-        "fmt"
-        "log"
-
-        "gopkg.in/yaml.v2"
-)
-
-var data = `
-a: Easy!
-b:
-  c: 2
-  d: [3, 4]
-`
-
-type T struct {
-        A string
-        B struct {
-                RenamedC int   `yaml:"c"`
-                D        []int `yaml:",flow"`
-        }
-}
-
-func main() {
-        t := T{}
-    
-        err := yaml.Unmarshal([]byte(data), &t)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- t:\n%v\n\n", t)
-    
-        d, err := yaml.Marshal(&t)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- t dump:\n%s\n\n", string(d))
-    
-        m := make(map[interface{}]interface{})
-    
-        err = yaml.Unmarshal([]byte(data), &m)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- m:\n%v\n\n", m)
-    
-        d, err = yaml.Marshal(&m)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- m dump:\n%s\n\n", string(d))
-}
-```
-
-This example will generate the following output:
-
-```
---- t:
-{Easy! {2 [3 4]}}
-
---- t dump:
-a: Easy!
-b:
-  c: 2
-  d: [3, 4]
-
-
---- m:
-map[a:Easy! b:map[c:2 d:[3 4]]]
-
---- m dump:
-a: Easy!
-b:
-  c: 2
-  d:
-  - 3
-  - 4
-```
-
diff --git a/vendor/gopkg.in/yaml.v2/apic.go b/vendor/gopkg.in/yaml.v2/apic.go
deleted file mode 100644
index 95ec014e8c..0000000000
--- a/vendor/gopkg.in/yaml.v2/apic.go
+++ /dev/null
@@ -1,742 +0,0 @@
-package yaml
-
-import (
-	"io"
-	"os"
-)
-
-func yaml_insert_token(parser *yaml_parser_t, pos int, token *yaml_token_t) {
-	//fmt.Println("yaml_insert_token", "pos:", pos, "typ:", token.typ, "head:", parser.tokens_head, "len:", len(parser.tokens))
-
-	// Check if we can move the queue at the beginning of the buffer.
-	if parser.tokens_head > 0 && len(parser.tokens) == cap(parser.tokens) {
-		if parser.tokens_head != len(parser.tokens) {
-			copy(parser.tokens, parser.tokens[parser.tokens_head:])
-		}
-		parser.tokens = parser.tokens[:len(parser.tokens)-parser.tokens_head]
-		parser.tokens_head = 0
-	}
-	parser.tokens = append(parser.tokens, *token)
-	if pos < 0 {
-		return
-	}
-	copy(parser.tokens[parser.tokens_head+pos+1:], parser.tokens[parser.tokens_head+pos:])
-	parser.tokens[parser.tokens_head+pos] = *token
-}
-
-// Create a new parser object.
-func yaml_parser_initialize(parser *yaml_parser_t) bool {
-	*parser = yaml_parser_t{
-		raw_buffer: make([]byte, 0, input_raw_buffer_size),
-		buffer:     make([]byte, 0, input_buffer_size),
-	}
-	return true
-}
-
-// Destroy a parser object.
-func yaml_parser_delete(parser *yaml_parser_t) {
-	*parser = yaml_parser_t{}
-}
-
-// String read handler.
-func yaml_string_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) {
-	if parser.input_pos == len(parser.input) {
-		return 0, io.EOF
-	}
-	n = copy(buffer, parser.input[parser.input_pos:])
-	parser.input_pos += n
-	return n, nil
-}
-
-// File read handler.
-func yaml_file_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) {
-	return parser.input_file.Read(buffer)
-}
-
-// Set a string input.
-func yaml_parser_set_input_string(parser *yaml_parser_t, input []byte) {
-	if parser.read_handler != nil {
-		panic("must set the input source only once")
-	}
-	parser.read_handler = yaml_string_read_handler
-	parser.input = input
-	parser.input_pos = 0
-}
-
-// Set a file input.
-func yaml_parser_set_input_file(parser *yaml_parser_t, file *os.File) {
-	if parser.read_handler != nil {
-		panic("must set the input source only once")
-	}
-	parser.read_handler = yaml_file_read_handler
-	parser.input_file = file
-}
-
-// Set the source encoding.
-func yaml_parser_set_encoding(parser *yaml_parser_t, encoding yaml_encoding_t) {
-	if parser.encoding != yaml_ANY_ENCODING {
-		panic("must set the encoding only once")
-	}
-	parser.encoding = encoding
-}
-
-// Create a new emitter object.
-func yaml_emitter_initialize(emitter *yaml_emitter_t) bool {
-	*emitter = yaml_emitter_t{
-		buffer:     make([]byte, output_buffer_size),
-		raw_buffer: make([]byte, 0, output_raw_buffer_size),
-		states:     make([]yaml_emitter_state_t, 0, initial_stack_size),
-		events:     make([]yaml_event_t, 0, initial_queue_size),
-	}
-	return true
-}
-
-// Destroy an emitter object.
-func yaml_emitter_delete(emitter *yaml_emitter_t) {
-	*emitter = yaml_emitter_t{}
-}
-
-// String write handler.
-func yaml_string_write_handler(emitter *yaml_emitter_t, buffer []byte) error {
-	*emitter.output_buffer = append(*emitter.output_buffer, buffer...)
-	return nil
-}
-
-// File write handler.
-func yaml_file_write_handler(emitter *yaml_emitter_t, buffer []byte) error {
-	_, err := emitter.output_file.Write(buffer)
-	return err
-}
-
-// Set a string output.
-func yaml_emitter_set_output_string(emitter *yaml_emitter_t, output_buffer *[]byte) {
-	if emitter.write_handler != nil {
-		panic("must set the output target only once")
-	}
-	emitter.write_handler = yaml_string_write_handler
-	emitter.output_buffer = output_buffer
-}
-
-// Set a file output.
-func yaml_emitter_set_output_file(emitter *yaml_emitter_t, file io.Writer) {
-	if emitter.write_handler != nil {
-		panic("must set the output target only once")
-	}
-	emitter.write_handler = yaml_file_write_handler
-	emitter.output_file = file
-}
-
-// Set the output encoding.
-func yaml_emitter_set_encoding(emitter *yaml_emitter_t, encoding yaml_encoding_t) {
-	if emitter.encoding != yaml_ANY_ENCODING {
-		panic("must set the output encoding only once")
-	}
-	emitter.encoding = encoding
-}
-
-// Set the canonical output style.
-func yaml_emitter_set_canonical(emitter *yaml_emitter_t, canonical bool) {
-	emitter.canonical = canonical
-}
-
-//// Set the indentation increment.
-func yaml_emitter_set_indent(emitter *yaml_emitter_t, indent int) {
-	if indent < 2 || indent > 9 {
-		indent = 2
-	}
-	emitter.best_indent = indent
-}
-
-// Set the preferred line width.
-func yaml_emitter_set_width(emitter *yaml_emitter_t, width int) {
-	if width < 0 {
-		width = -1
-	}
-	emitter.best_width = width
-}
-
-// Set if unescaped non-ASCII characters are allowed.
-func yaml_emitter_set_unicode(emitter *yaml_emitter_t, unicode bool) {
-	emitter.unicode = unicode
-}
-
-// Set the preferred line break character.
-func yaml_emitter_set_break(emitter *yaml_emitter_t, line_break yaml_break_t) {
-	emitter.line_break = line_break
-}
-
-///*
-// * Destroy a token object.
-// */
-//
-//YAML_DECLARE(void)
-//yaml_token_delete(yaml_token_t *token)
-//{
-//    assert(token);  // Non-NULL token object expected.
-//
-//    switch (token.type)
-//    {
-//        case YAML_TAG_DIRECTIVE_TOKEN:
-//            yaml_free(token.data.tag_directive.handle);
-//            yaml_free(token.data.tag_directive.prefix);
-//            break;
-//
-//        case YAML_ALIAS_TOKEN:
-//            yaml_free(token.data.alias.value);
-//            break;
-//
-//        case YAML_ANCHOR_TOKEN:
-//            yaml_free(token.data.anchor.value);
-//            break;
-//
-//        case YAML_TAG_TOKEN:
-//            yaml_free(token.data.tag.handle);
-//            yaml_free(token.data.tag.suffix);
-//            break;
-//
-//        case YAML_SCALAR_TOKEN:
-//            yaml_free(token.data.scalar.value);
-//            break;
-//
-//        default:
-//            break;
-//    }
-//
-//    memset(token, 0, sizeof(yaml_token_t));
-//}
-//
-///*
-// * Check if a string is a valid UTF-8 sequence.
-// *
-// * Check 'reader.c' for more details on UTF-8 encoding.
-// */
-//
-//static int
-//yaml_check_utf8(yaml_char_t *start, size_t length)
-//{
-//    yaml_char_t *end = start+length;
-//    yaml_char_t *pointer = start;
-//
-//    while (pointer < end) {
-//        unsigned char octet;
-//        unsigned int width;
-//        unsigned int value;
-//        size_t k;
-//
-//        octet = pointer[0];
-//        width = (octet & 0x80) == 0x00 ? 1 :
-//                (octet & 0xE0) == 0xC0 ? 2 :
-//                (octet & 0xF0) == 0xE0 ? 3 :
-//                (octet & 0xF8) == 0xF0 ? 4 : 0;
-//        value = (octet & 0x80) == 0x00 ? octet & 0x7F :
-//                (octet & 0xE0) == 0xC0 ? octet & 0x1F :
-//                (octet & 0xF0) == 0xE0 ? octet & 0x0F :
-//                (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
-//        if (!width) return 0;
-//        if (pointer+width > end) return 0;
-//        for (k = 1; k < width; k ++) {
-//            octet = pointer[k];
-//            if ((octet & 0xC0) != 0x80) return 0;
-//            value = (value << 6) + (octet & 0x3F);
-//        }
-//        if (!((width == 1) ||
-//            (width == 2 && value >= 0x80) ||
-//            (width == 3 && value >= 0x800) ||
-//            (width == 4 && value >= 0x10000))) return 0;
-//
-//        pointer += width;
-//    }
-//
-//    return 1;
-//}
-//
-
-// Create STREAM-START.
-func yaml_stream_start_event_initialize(event *yaml_event_t, encoding yaml_encoding_t) bool {
-	*event = yaml_event_t{
-		typ:      yaml_STREAM_START_EVENT,
-		encoding: encoding,
-	}
-	return true
-}
-
-// Create STREAM-END.
-func yaml_stream_end_event_initialize(event *yaml_event_t) bool {
-	*event = yaml_event_t{
-		typ: yaml_STREAM_END_EVENT,
-	}
-	return true
-}
-
-// Create DOCUMENT-START.
-func yaml_document_start_event_initialize(event *yaml_event_t, version_directive *yaml_version_directive_t,
-	tag_directives []yaml_tag_directive_t, implicit bool) bool {
-	*event = yaml_event_t{
-		typ:               yaml_DOCUMENT_START_EVENT,
-		version_directive: version_directive,
-		tag_directives:    tag_directives,
-		implicit:          implicit,
-	}
-	return true
-}
-
-// Create DOCUMENT-END.
-func yaml_document_end_event_initialize(event *yaml_event_t, implicit bool) bool {
-	*event = yaml_event_t{
-		typ:      yaml_DOCUMENT_END_EVENT,
-		implicit: implicit,
-	}
-	return true
-}
-
-///*
-// * Create ALIAS.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_alias_event_initialize(event *yaml_event_t, anchor *yaml_char_t)
-//{
-//    mark yaml_mark_t = { 0, 0, 0 }
-//    anchor_copy *yaml_char_t = NULL
-//
-//    assert(event) // Non-NULL event object is expected.
-//    assert(anchor) // Non-NULL anchor is expected.
-//
-//    if (!yaml_check_utf8(anchor, strlen((char *)anchor))) return 0
-//
-//    anchor_copy = yaml_strdup(anchor)
-//    if (!anchor_copy)
-//        return 0
-//
-//    ALIAS_EVENT_INIT(*event, anchor_copy, mark, mark)
-//
-//    return 1
-//}
-
-// Create SCALAR.
-func yaml_scalar_event_initialize(event *yaml_event_t, anchor, tag, value []byte, plain_implicit, quoted_implicit bool, style yaml_scalar_style_t) bool {
-	*event = yaml_event_t{
-		typ:             yaml_SCALAR_EVENT,
-		anchor:          anchor,
-		tag:             tag,
-		value:           value,
-		implicit:        plain_implicit,
-		quoted_implicit: quoted_implicit,
-		style:           yaml_style_t(style),
-	}
-	return true
-}
-
-// Create SEQUENCE-START.
-func yaml_sequence_start_event_initialize(event *yaml_event_t, anchor, tag []byte, implicit bool, style yaml_sequence_style_t) bool {
-	*event = yaml_event_t{
-		typ:      yaml_SEQUENCE_START_EVENT,
-		anchor:   anchor,
-		tag:      tag,
-		implicit: implicit,
-		style:    yaml_style_t(style),
-	}
-	return true
-}
-
-// Create SEQUENCE-END.
-func yaml_sequence_end_event_initialize(event *yaml_event_t) bool {
-	*event = yaml_event_t{
-		typ: yaml_SEQUENCE_END_EVENT,
-	}
-	return true
-}
-
-// Create MAPPING-START.
-func yaml_mapping_start_event_initialize(event *yaml_event_t, anchor, tag []byte, implicit bool, style yaml_mapping_style_t) bool {
-	*event = yaml_event_t{
-		typ:      yaml_MAPPING_START_EVENT,
-		anchor:   anchor,
-		tag:      tag,
-		implicit: implicit,
-		style:    yaml_style_t(style),
-	}
-	return true
-}
-
-// Create MAPPING-END.
-func yaml_mapping_end_event_initialize(event *yaml_event_t) bool {
-	*event = yaml_event_t{
-		typ: yaml_MAPPING_END_EVENT,
-	}
-	return true
-}
-
-// Destroy an event object.
-func yaml_event_delete(event *yaml_event_t) {
-	*event = yaml_event_t{}
-}
-
-///*
-// * Create a document object.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_initialize(document *yaml_document_t,
-//        version_directive *yaml_version_directive_t,
-//        tag_directives_start *yaml_tag_directive_t,
-//        tag_directives_end *yaml_tag_directive_t,
-//        start_implicit int, end_implicit int)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    struct {
-//        start *yaml_node_t
-//        end *yaml_node_t
-//        top *yaml_node_t
-//    } nodes = { NULL, NULL, NULL }
-//    version_directive_copy *yaml_version_directive_t = NULL
-//    struct {
-//        start *yaml_tag_directive_t
-//        end *yaml_tag_directive_t
-//        top *yaml_tag_directive_t
-//    } tag_directives_copy = { NULL, NULL, NULL }
-//    value yaml_tag_directive_t = { NULL, NULL }
-//    mark yaml_mark_t = { 0, 0, 0 }
-//
-//    assert(document) // Non-NULL document object is expected.
-//    assert((tag_directives_start && tag_directives_end) ||
-//            (tag_directives_start == tag_directives_end))
-//                            // Valid tag directives are expected.
-//
-//    if (!STACK_INIT(&context, nodes, INITIAL_STACK_SIZE)) goto error
-//
-//    if (version_directive) {
-//        version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t))
-//        if (!version_directive_copy) goto error
-//        version_directive_copy.major = version_directive.major
-//        version_directive_copy.minor = version_directive.minor
-//    }
-//
-//    if (tag_directives_start != tag_directives_end) {
-//        tag_directive *yaml_tag_directive_t
-//        if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
-//            goto error
-//        for (tag_directive = tag_directives_start
-//                tag_directive != tag_directives_end; tag_directive ++) {
-//            assert(tag_directive.handle)
-//            assert(tag_directive.prefix)
-//            if (!yaml_check_utf8(tag_directive.handle,
-//                        strlen((char *)tag_directive.handle)))
-//                goto error
-//            if (!yaml_check_utf8(tag_directive.prefix,
-//                        strlen((char *)tag_directive.prefix)))
-//                goto error
-//            value.handle = yaml_strdup(tag_directive.handle)
-//            value.prefix = yaml_strdup(tag_directive.prefix)
-//            if (!value.handle || !value.prefix) goto error
-//            if (!PUSH(&context, tag_directives_copy, value))
-//                goto error
-//            value.handle = NULL
-//            value.prefix = NULL
-//        }
-//    }
-//
-//    DOCUMENT_INIT(*document, nodes.start, nodes.end, version_directive_copy,
-//            tag_directives_copy.start, tag_directives_copy.top,
-//            start_implicit, end_implicit, mark, mark)
-//
-//    return 1
-//
-//error:
-//    STACK_DEL(&context, nodes)
-//    yaml_free(version_directive_copy)
-//    while (!STACK_EMPTY(&context, tag_directives_copy)) {
-//        value yaml_tag_directive_t = POP(&context, tag_directives_copy)
-//        yaml_free(value.handle)
-//        yaml_free(value.prefix)
-//    }
-//    STACK_DEL(&context, tag_directives_copy)
-//    yaml_free(value.handle)
-//    yaml_free(value.prefix)
-//
-//    return 0
-//}
-//
-///*
-// * Destroy a document object.
-// */
-//
-//YAML_DECLARE(void)
-//yaml_document_delete(document *yaml_document_t)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    tag_directive *yaml_tag_directive_t
-//
-//    context.error = YAML_NO_ERROR // Eliminate a compliler warning.
-//
-//    assert(document) // Non-NULL document object is expected.
-//
-//    while (!STACK_EMPTY(&context, document.nodes)) {
-//        node yaml_node_t = POP(&context, document.nodes)
-//        yaml_free(node.tag)
-//        switch (node.type) {
-//            case YAML_SCALAR_NODE:
-//                yaml_free(node.data.scalar.value)
-//                break
-//            case YAML_SEQUENCE_NODE:
-//                STACK_DEL(&context, node.data.sequence.items)
-//                break
-//            case YAML_MAPPING_NODE:
-//                STACK_DEL(&context, node.data.mapping.pairs)
-//                break
-//            default:
-//                assert(0) // Should not happen.
-//        }
-//    }
-//    STACK_DEL(&context, document.nodes)
-//
-//    yaml_free(document.version_directive)
-//    for (tag_directive = document.tag_directives.start
-//            tag_directive != document.tag_directives.end
-//            tag_directive++) {
-//        yaml_free(tag_directive.handle)
-//        yaml_free(tag_directive.prefix)
-//    }
-//    yaml_free(document.tag_directives.start)
-//
-//    memset(document, 0, sizeof(yaml_document_t))
-//}
-//
-///**
-// * Get a document node.
-// */
-//
-//YAML_DECLARE(yaml_node_t *)
-//yaml_document_get_node(document *yaml_document_t, index int)
-//{
-//    assert(document) // Non-NULL document object is expected.
-//
-//    if (index > 0 && document.nodes.start + index <= document.nodes.top) {
-//        return document.nodes.start + index - 1
-//    }
-//    return NULL
-//}
-//
-///**
-// * Get the root object.
-// */
-//
-//YAML_DECLARE(yaml_node_t *)
-//yaml_document_get_root_node(document *yaml_document_t)
-//{
-//    assert(document) // Non-NULL document object is expected.
-//
-//    if (document.nodes.top != document.nodes.start) {
-//        return document.nodes.start
-//    }
-//    return NULL
-//}
-//
-///*
-// * Add a scalar node to a document.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_add_scalar(document *yaml_document_t,
-//        tag *yaml_char_t, value *yaml_char_t, length int,
-//        style yaml_scalar_style_t)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    mark yaml_mark_t = { 0, 0, 0 }
-//    tag_copy *yaml_char_t = NULL
-//    value_copy *yaml_char_t = NULL
-//    node yaml_node_t
-//
-//    assert(document) // Non-NULL document object is expected.
-//    assert(value) // Non-NULL value is expected.
-//
-//    if (!tag) {
-//        tag = (yaml_char_t *)YAML_DEFAULT_SCALAR_TAG
-//    }
-//
-//    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error
-//    tag_copy = yaml_strdup(tag)
-//    if (!tag_copy) goto error
-//
-//    if (length < 0) {
-//        length = strlen((char *)value)
-//    }
-//
-//    if (!yaml_check_utf8(value, length)) goto error
-//    value_copy = yaml_malloc(length+1)
-//    if (!value_copy) goto error
-//    memcpy(value_copy, value, length)
-//    value_copy[length] = '\0'
-//
-//    SCALAR_NODE_INIT(node, tag_copy, value_copy, length, style, mark, mark)
-//    if (!PUSH(&context, document.nodes, node)) goto error
-//
-//    return document.nodes.top - document.nodes.start
-//
-//error:
-//    yaml_free(tag_copy)
-//    yaml_free(value_copy)
-//
-//    return 0
-//}
-//
-///*
-// * Add a sequence node to a document.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_add_sequence(document *yaml_document_t,
-//        tag *yaml_char_t, style yaml_sequence_style_t)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    mark yaml_mark_t = { 0, 0, 0 }
-//    tag_copy *yaml_char_t = NULL
-//    struct {
-//        start *yaml_node_item_t
-//        end *yaml_node_item_t
-//        top *yaml_node_item_t
-//    } items = { NULL, NULL, NULL }
-//    node yaml_node_t
-//
-//    assert(document) // Non-NULL document object is expected.
-//
-//    if (!tag) {
-//        tag = (yaml_char_t *)YAML_DEFAULT_SEQUENCE_TAG
-//    }
-//
-//    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error
-//    tag_copy = yaml_strdup(tag)
-//    if (!tag_copy) goto error
-//
-//    if (!STACK_INIT(&context, items, INITIAL_STACK_SIZE)) goto error
-//
-//    SEQUENCE_NODE_INIT(node, tag_copy, items.start, items.end,
-//            style, mark, mark)
-//    if (!PUSH(&context, document.nodes, node)) goto error
-//
-//    return document.nodes.top - document.nodes.start
-//
-//error:
-//    STACK_DEL(&context, items)
-//    yaml_free(tag_copy)
-//
-//    return 0
-//}
-//
-///*
-// * Add a mapping node to a document.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_add_mapping(document *yaml_document_t,
-//        tag *yaml_char_t, style yaml_mapping_style_t)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//    mark yaml_mark_t = { 0, 0, 0 }
-//    tag_copy *yaml_char_t = NULL
-//    struct {
-//        start *yaml_node_pair_t
-//        end *yaml_node_pair_t
-//        top *yaml_node_pair_t
-//    } pairs = { NULL, NULL, NULL }
-//    node yaml_node_t
-//
-//    assert(document) // Non-NULL document object is expected.
-//
-//    if (!tag) {
-//        tag = (yaml_char_t *)YAML_DEFAULT_MAPPING_TAG
-//    }
-//
-//    if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error
-//    tag_copy = yaml_strdup(tag)
-//    if (!tag_copy) goto error
-//
-//    if (!STACK_INIT(&context, pairs, INITIAL_STACK_SIZE)) goto error
-//
-//    MAPPING_NODE_INIT(node, tag_copy, pairs.start, pairs.end,
-//            style, mark, mark)
-//    if (!PUSH(&context, document.nodes, node)) goto error
-//
-//    return document.nodes.top - document.nodes.start
-//
-//error:
-//    STACK_DEL(&context, pairs)
-//    yaml_free(tag_copy)
-//
-//    return 0
-//}
-//
-///*
-// * Append an item to a sequence node.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_append_sequence_item(document *yaml_document_t,
-//        sequence int, item int)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//
-//    assert(document) // Non-NULL document is required.
-//    assert(sequence > 0
-//            && document.nodes.start + sequence <= document.nodes.top)
-//                            // Valid sequence id is required.
-//    assert(document.nodes.start[sequence-1].type == YAML_SEQUENCE_NODE)
-//                            // A sequence node is required.
-//    assert(item > 0 && document.nodes.start + item <= document.nodes.top)
-//                            // Valid item id is required.
-//
-//    if (!PUSH(&context,
-//                document.nodes.start[sequence-1].data.sequence.items, item))
-//        return 0
-//
-//    return 1
-//}
-//
-///*
-// * Append a pair of a key and a value to a mapping node.
-// */
-//
-//YAML_DECLARE(int)
-//yaml_document_append_mapping_pair(document *yaml_document_t,
-//        mapping int, key int, value int)
-//{
-//    struct {
-//        error yaml_error_type_t
-//    } context
-//
-//    pair yaml_node_pair_t
-//
-//    assert(document) // Non-NULL document is required.
-//    assert(mapping > 0
-//            && document.nodes.start + mapping <= document.nodes.top)
-//                            // Valid mapping id is required.
-//    assert(document.nodes.start[mapping-1].type == YAML_MAPPING_NODE)
-//                            // A mapping node is required.
-//    assert(key > 0 && document.nodes.start + key <= document.nodes.top)
-//                            // Valid key id is required.
-//    assert(value > 0 && document.nodes.start + value <= document.nodes.top)
-//                            // Valid value id is required.
-//
-//    pair.key = key
-//    pair.value = value
-//
-//    if (!PUSH(&context,
-//                document.nodes.start[mapping-1].data.mapping.pairs, pair))
-//        return 0
-//
-//    return 1
-//}
-//
-//
diff --git a/vendor/gopkg.in/yaml.v2/decode.go b/vendor/gopkg.in/yaml.v2/decode.go
deleted file mode 100644
index db1f5f2068..0000000000
--- a/vendor/gopkg.in/yaml.v2/decode.go
+++ /dev/null
@@ -1,685 +0,0 @@
-package yaml
-
-import (
-	"encoding"
-	"encoding/base64"
-	"fmt"
-	"math"
-	"reflect"
-	"strconv"
-	"time"
-)
-
-const (
-	documentNode = 1 << iota
-	mappingNode
-	sequenceNode
-	scalarNode
-	aliasNode
-)
-
-type node struct {
-	kind         int
-	line, column int
-	tag          string
-	value        string
-	implicit     bool
-	children     []*node
-	anchors      map[string]*node
-}
-
-// ----------------------------------------------------------------------------
-// Parser, produces a node tree out of a libyaml event stream.
-
-type parser struct {
-	parser yaml_parser_t
-	event  yaml_event_t
-	doc    *node
-}
-
-func newParser(b []byte) *parser {
-	p := parser{}
-	if !yaml_parser_initialize(&p.parser) {
-		panic("failed to initialize YAML emitter")
-	}
-
-	if len(b) == 0 {
-		b = []byte{'\n'}
-	}
-
-	yaml_parser_set_input_string(&p.parser, b)
-
-	p.skip()
-	if p.event.typ != yaml_STREAM_START_EVENT {
-		panic("expected stream start event, got " + strconv.Itoa(int(p.event.typ)))
-	}
-	p.skip()
-	return &p
-}
-
-func (p *parser) destroy() {
-	if p.event.typ != yaml_NO_EVENT {
-		yaml_event_delete(&p.event)
-	}
-	yaml_parser_delete(&p.parser)
-}
-
-func (p *parser) skip() {
-	if p.event.typ != yaml_NO_EVENT {
-		if p.event.typ == yaml_STREAM_END_EVENT {
-			failf("attempted to go past the end of stream; corrupted value?")
-		}
-		yaml_event_delete(&p.event)
-	}
-	if !yaml_parser_parse(&p.parser, &p.event) {
-		p.fail()
-	}
-}
-
-func (p *parser) fail() {
-	var where string
-	var line int
-	if p.parser.problem_mark.line != 0 {
-		line = p.parser.problem_mark.line
-	} else if p.parser.context_mark.line != 0 {
-		line = p.parser.context_mark.line
-	}
-	if line != 0 {
-		where = "line " + strconv.Itoa(line) + ": "
-	}
-	var msg string
-	if len(p.parser.problem) > 0 {
-		msg = p.parser.problem
-	} else {
-		msg = "unknown problem parsing YAML content"
-	}
-	failf("%s%s", where, msg)
-}
-
-func (p *parser) anchor(n *node, anchor []byte) {
-	if anchor != nil {
-		p.doc.anchors[string(anchor)] = n
-	}
-}
-
-func (p *parser) parse() *node {
-	switch p.event.typ {
-	case yaml_SCALAR_EVENT:
-		return p.scalar()
-	case yaml_ALIAS_EVENT:
-		return p.alias()
-	case yaml_MAPPING_START_EVENT:
-		return p.mapping()
-	case yaml_SEQUENCE_START_EVENT:
-		return p.sequence()
-	case yaml_DOCUMENT_START_EVENT:
-		return p.document()
-	case yaml_STREAM_END_EVENT:
-		// Happens when attempting to decode an empty buffer.
-		return nil
-	default:
-		panic("attempted to parse unknown event: " + strconv.Itoa(int(p.event.typ)))
-	}
-}
-
-func (p *parser) node(kind int) *node {
-	return &node{
-		kind:   kind,
-		line:   p.event.start_mark.line,
-		column: p.event.start_mark.column,
-	}
-}
-
-func (p *parser) document() *node {
-	n := p.node(documentNode)
-	n.anchors = make(map[string]*node)
-	p.doc = n
-	p.skip()
-	n.children = append(n.children, p.parse())
-	if p.event.typ != yaml_DOCUMENT_END_EVENT {
-		panic("expected end of document event but got " + strconv.Itoa(int(p.event.typ)))
-	}
-	p.skip()
-	return n
-}
-
-func (p *parser) alias() *node {
-	n := p.node(aliasNode)
-	n.value = string(p.event.anchor)
-	p.skip()
-	return n
-}
-
-func (p *parser) scalar() *node {
-	n := p.node(scalarNode)
-	n.value = string(p.event.value)
-	n.tag = string(p.event.tag)
-	n.implicit = p.event.implicit
-	p.anchor(n, p.event.anchor)
-	p.skip()
-	return n
-}
-
-func (p *parser) sequence() *node {
-	n := p.node(sequenceNode)
-	p.anchor(n, p.event.anchor)
-	p.skip()
-	for p.event.typ != yaml_SEQUENCE_END_EVENT {
-		n.children = append(n.children, p.parse())
-	}
-	p.skip()
-	return n
-}
-
-func (p *parser) mapping() *node {
-	n := p.node(mappingNode)
-	p.anchor(n, p.event.anchor)
-	p.skip()
-	for p.event.typ != yaml_MAPPING_END_EVENT {
-		n.children = append(n.children, p.parse(), p.parse())
-	}
-	p.skip()
-	return n
-}
-
-// ----------------------------------------------------------------------------
-// Decoder, unmarshals a node into a provided value.
-
-type decoder struct {
-	doc     *node
-	aliases map[string]bool
-	mapType reflect.Type
-	terrors []string
-	strict  bool
-}
-
-var (
-	mapItemType    = reflect.TypeOf(MapItem{})
-	durationType   = reflect.TypeOf(time.Duration(0))
-	defaultMapType = reflect.TypeOf(map[interface{}]interface{}{})
-	ifaceType      = defaultMapType.Elem()
-)
-
-func newDecoder(strict bool) *decoder {
-	d := &decoder{mapType: defaultMapType, strict: strict}
-	d.aliases = make(map[string]bool)
-	return d
-}
-
-func (d *decoder) terror(n *node, tag string, out reflect.Value) {
-	if n.tag != "" {
-		tag = n.tag
-	}
-	value := n.value
-	if tag != yaml_SEQ_TAG && tag != yaml_MAP_TAG {
-		if len(value) > 10 {
-			value = " `" + value[:7] + "...`"
-		} else {
-			value = " `" + value + "`"
-		}
-	}
-	d.terrors = append(d.terrors, fmt.Sprintf("line %d: cannot unmarshal %s%s into %s", n.line+1, shortTag(tag), value, out.Type()))
-}
-
-func (d *decoder) callUnmarshaler(n *node, u Unmarshaler) (good bool) {
-	terrlen := len(d.terrors)
-	err := u.UnmarshalYAML(func(v interface{}) (err error) {
-		defer handleErr(&err)
-		d.unmarshal(n, reflect.ValueOf(v))
-		if len(d.terrors) > terrlen {
-			issues := d.terrors[terrlen:]
-			d.terrors = d.terrors[:terrlen]
-			return &TypeError{issues}
-		}
-		return nil
-	})
-	if e, ok := err.(*TypeError); ok {
-		d.terrors = append(d.terrors, e.Errors...)
-		return false
-	}
-	if err != nil {
-		fail(err)
-	}
-	return true
-}
-
-// d.prepare initializes and dereferences pointers and calls UnmarshalYAML
-// if a value is found to implement it.
-// It returns the initialized and dereferenced out value, whether
-// unmarshalling was already done by UnmarshalYAML, and if so whether
-// its types unmarshalled appropriately.
-//
-// If n holds a null value, prepare returns before doing anything.
-func (d *decoder) prepare(n *node, out reflect.Value) (newout reflect.Value, unmarshaled, good bool) {
-	if n.tag == yaml_NULL_TAG || n.kind == scalarNode && n.tag == "" && (n.value == "null" || n.value == "" && n.implicit) {
-		return out, false, false
-	}
-	again := true
-	for again {
-		again = false
-		if out.Kind() == reflect.Ptr {
-			if out.IsNil() {
-				out.Set(reflect.New(out.Type().Elem()))
-			}
-			out = out.Elem()
-			again = true
-		}
-		if out.CanAddr() {
-			if u, ok := out.Addr().Interface().(Unmarshaler); ok {
-				good = d.callUnmarshaler(n, u)
-				return out, true, good
-			}
-		}
-	}
-	return out, false, false
-}
-
-func (d *decoder) unmarshal(n *node, out reflect.Value) (good bool) {
-	switch n.kind {
-	case documentNode:
-		return d.document(n, out)
-	case aliasNode:
-		return d.alias(n, out)
-	}
-	out, unmarshaled, good := d.prepare(n, out)
-	if unmarshaled {
-		return good
-	}
-	switch n.kind {
-	case scalarNode:
-		good = d.scalar(n, out)
-	case mappingNode:
-		good = d.mapping(n, out)
-	case sequenceNode:
-		good = d.sequence(n, out)
-	default:
-		panic("internal error: unknown node kind: " + strconv.Itoa(n.kind))
-	}
-	return good
-}
-
-func (d *decoder) document(n *node, out reflect.Value) (good bool) {
-	if len(n.children) == 1 {
-		d.doc = n
-		d.unmarshal(n.children[0], out)
-		return true
-	}
-	return false
-}
-
-func (d *decoder) alias(n *node, out reflect.Value) (good bool) {
-	an, ok := d.doc.anchors[n.value]
-	if !ok {
-		failf("unknown anchor '%s' referenced", n.value)
-	}
-	if d.aliases[n.value] {
-		failf("anchor '%s' value contains itself", n.value)
-	}
-	d.aliases[n.value] = true
-	good = d.unmarshal(an, out)
-	delete(d.aliases, n.value)
-	return good
-}
-
-var zeroValue reflect.Value
-
-func resetMap(out reflect.Value) {
-	for _, k := range out.MapKeys() {
-		out.SetMapIndex(k, zeroValue)
-	}
-}
-
-func (d *decoder) scalar(n *node, out reflect.Value) (good bool) {
-	var tag string
-	var resolved interface{}
-	if n.tag == "" && !n.implicit {
-		tag = yaml_STR_TAG
-		resolved = n.value
-	} else {
-		tag, resolved = resolve(n.tag, n.value)
-		if tag == yaml_BINARY_TAG {
-			data, err := base64.StdEncoding.DecodeString(resolved.(string))
-			if err != nil {
-				failf("!!binary value contains invalid base64 data")
-			}
-			resolved = string(data)
-		}
-	}
-	if resolved == nil {
-		if out.Kind() == reflect.Map && !out.CanAddr() {
-			resetMap(out)
-		} else {
-			out.Set(reflect.Zero(out.Type()))
-		}
-		return true
-	}
-	if s, ok := resolved.(string); ok && out.CanAddr() {
-		if u, ok := out.Addr().Interface().(encoding.TextUnmarshaler); ok {
-			err := u.UnmarshalText([]byte(s))
-			if err != nil {
-				fail(err)
-			}
-			return true
-		}
-	}
-	switch out.Kind() {
-	case reflect.String:
-		if tag == yaml_BINARY_TAG {
-			out.SetString(resolved.(string))
-			good = true
-		} else if resolved != nil {
-			out.SetString(n.value)
-			good = true
-		}
-	case reflect.Interface:
-		if resolved == nil {
-			out.Set(reflect.Zero(out.Type()))
-		} else {
-			out.Set(reflect.ValueOf(resolved))
-		}
-		good = true
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		switch resolved := resolved.(type) {
-		case int:
-			if !out.OverflowInt(int64(resolved)) {
-				out.SetInt(int64(resolved))
-				good = true
-			}
-		case int64:
-			if !out.OverflowInt(resolved) {
-				out.SetInt(resolved)
-				good = true
-			}
-		case uint64:
-			if resolved <= math.MaxInt64 && !out.OverflowInt(int64(resolved)) {
-				out.SetInt(int64(resolved))
-				good = true
-			}
-		case float64:
-			if resolved <= math.MaxInt64 && !out.OverflowInt(int64(resolved)) {
-				out.SetInt(int64(resolved))
-				good = true
-			}
-		case string:
-			if out.Type() == durationType {
-				d, err := time.ParseDuration(resolved)
-				if err == nil {
-					out.SetInt(int64(d))
-					good = true
-				}
-			}
-		}
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		switch resolved := resolved.(type) {
-		case int:
-			if resolved >= 0 && !out.OverflowUint(uint64(resolved)) {
-				out.SetUint(uint64(resolved))
-				good = true
-			}
-		case int64:
-			if resolved >= 0 && !out.OverflowUint(uint64(resolved)) {
-				out.SetUint(uint64(resolved))
-				good = true
-			}
-		case uint64:
-			if !out.OverflowUint(uint64(resolved)) {
-				out.SetUint(uint64(resolved))
-				good = true
-			}
-		case float64:
-			if resolved <= math.MaxUint64 && !out.OverflowUint(uint64(resolved)) {
-				out.SetUint(uint64(resolved))
-				good = true
-			}
-		}
-	case reflect.Bool:
-		switch resolved := resolved.(type) {
-		case bool:
-			out.SetBool(resolved)
-			good = true
-		}
-	case reflect.Float32, reflect.Float64:
-		switch resolved := resolved.(type) {
-		case int:
-			out.SetFloat(float64(resolved))
-			good = true
-		case int64:
-			out.SetFloat(float64(resolved))
-			good = true
-		case uint64:
-			out.SetFloat(float64(resolved))
-			good = true
-		case float64:
-			out.SetFloat(resolved)
-			good = true
-		}
-	case reflect.Ptr:
-		if out.Type().Elem() == reflect.TypeOf(resolved) {
-			// TODO DOes this make sense? When is out a Ptr except when decoding a nil value?
-			elem := reflect.New(out.Type().Elem())
-			elem.Elem().Set(reflect.ValueOf(resolved))
-			out.Set(elem)
-			good = true
-		}
-	}
-	if !good {
-		d.terror(n, tag, out)
-	}
-	return good
-}
-
-func settableValueOf(i interface{}) reflect.Value {
-	v := reflect.ValueOf(i)
-	sv := reflect.New(v.Type()).Elem()
-	sv.Set(v)
-	return sv
-}
-
-func (d *decoder) sequence(n *node, out reflect.Value) (good bool) {
-	l := len(n.children)
-
-	var iface reflect.Value
-	switch out.Kind() {
-	case reflect.Slice:
-		out.Set(reflect.MakeSlice(out.Type(), l, l))
-	case reflect.Interface:
-		// No type hints. Will have to use a generic sequence.
-		iface = out
-		out = settableValueOf(make([]interface{}, l))
-	default:
-		d.terror(n, yaml_SEQ_TAG, out)
-		return false
-	}
-	et := out.Type().Elem()
-
-	j := 0
-	for i := 0; i < l; i++ {
-		e := reflect.New(et).Elem()
-		if ok := d.unmarshal(n.children[i], e); ok {
-			out.Index(j).Set(e)
-			j++
-		}
-	}
-	out.Set(out.Slice(0, j))
-	if iface.IsValid() {
-		iface.Set(out)
-	}
-	return true
-}
-
-func (d *decoder) mapping(n *node, out reflect.Value) (good bool) {
-	switch out.Kind() {
-	case reflect.Struct:
-		return d.mappingStruct(n, out)
-	case reflect.Slice:
-		return d.mappingSlice(n, out)
-	case reflect.Map:
-		// okay
-	case reflect.Interface:
-		if d.mapType.Kind() == reflect.Map {
-			iface := out
-			out = reflect.MakeMap(d.mapType)
-			iface.Set(out)
-		} else {
-			slicev := reflect.New(d.mapType).Elem()
-			if !d.mappingSlice(n, slicev) {
-				return false
-			}
-			out.Set(slicev)
-			return true
-		}
-	default:
-		d.terror(n, yaml_MAP_TAG, out)
-		return false
-	}
-	outt := out.Type()
-	kt := outt.Key()
-	et := outt.Elem()
-
-	mapType := d.mapType
-	if outt.Key() == ifaceType && outt.Elem() == ifaceType {
-		d.mapType = outt
-	}
-
-	if out.IsNil() {
-		out.Set(reflect.MakeMap(outt))
-	}
-	l := len(n.children)
-	for i := 0; i < l; i += 2 {
-		if isMerge(n.children[i]) {
-			d.merge(n.children[i+1], out)
-			continue
-		}
-		k := reflect.New(kt).Elem()
-		if d.unmarshal(n.children[i], k) {
-			kkind := k.Kind()
-			if kkind == reflect.Interface {
-				kkind = k.Elem().Kind()
-			}
-			if kkind == reflect.Map || kkind == reflect.Slice {
-				failf("invalid map key: %#v", k.Interface())
-			}
-			e := reflect.New(et).Elem()
-			if d.unmarshal(n.children[i+1], e) {
-				out.SetMapIndex(k, e)
-			}
-		}
-	}
-	d.mapType = mapType
-	return true
-}
-
-func (d *decoder) mappingSlice(n *node, out reflect.Value) (good bool) {
-	outt := out.Type()
-	if outt.Elem() != mapItemType {
-		d.terror(n, yaml_MAP_TAG, out)
-		return false
-	}
-
-	mapType := d.mapType
-	d.mapType = outt
-
-	var slice []MapItem
-	var l = len(n.children)
-	for i := 0; i < l; i += 2 {
-		if isMerge(n.children[i]) {
-			d.merge(n.children[i+1], out)
-			continue
-		}
-		item := MapItem{}
-		k := reflect.ValueOf(&item.Key).Elem()
-		if d.unmarshal(n.children[i], k) {
-			v := reflect.ValueOf(&item.Value).Elem()
-			if d.unmarshal(n.children[i+1], v) {
-				slice = append(slice, item)
-			}
-		}
-	}
-	out.Set(reflect.ValueOf(slice))
-	d.mapType = mapType
-	return true
-}
-
-func (d *decoder) mappingStruct(n *node, out reflect.Value) (good bool) {
-	sinfo, err := getStructInfo(out.Type())
-	if err != nil {
-		panic(err)
-	}
-	name := settableValueOf("")
-	l := len(n.children)
-
-	var inlineMap reflect.Value
-	var elemType reflect.Type
-	if sinfo.InlineMap != -1 {
-		inlineMap = out.Field(sinfo.InlineMap)
-		inlineMap.Set(reflect.New(inlineMap.Type()).Elem())
-		elemType = inlineMap.Type().Elem()
-	}
-
-	for i := 0; i < l; i += 2 {
-		ni := n.children[i]
-		if isMerge(ni) {
-			d.merge(n.children[i+1], out)
-			continue
-		}
-		if !d.unmarshal(ni, name) {
-			continue
-		}
-		if info, ok := sinfo.FieldsMap[name.String()]; ok {
-			var field reflect.Value
-			if info.Inline == nil {
-				field = out.Field(info.Num)
-			} else {
-				field = out.FieldByIndex(info.Inline)
-			}
-			d.unmarshal(n.children[i+1], field)
-		} else if sinfo.InlineMap != -1 {
-			if inlineMap.IsNil() {
-				inlineMap.Set(reflect.MakeMap(inlineMap.Type()))
-			}
-			value := reflect.New(elemType).Elem()
-			d.unmarshal(n.children[i+1], value)
-			inlineMap.SetMapIndex(name, value)
-		} else if d.strict {
-			d.terrors = append(d.terrors, fmt.Sprintf("line %d: field %s not found in struct %s", n.line+1, name.String(), out.Type()))
-		}
-	}
-	return true
-}
-
-func failWantMap() {
-	failf("map merge requires map or sequence of maps as the value")
-}
-
-func (d *decoder) merge(n *node, out reflect.Value) {
-	switch n.kind {
-	case mappingNode:
-		d.unmarshal(n, out)
-	case aliasNode:
-		an, ok := d.doc.anchors[n.value]
-		if ok && an.kind != mappingNode {
-			failWantMap()
-		}
-		d.unmarshal(n, out)
-	case sequenceNode:
-		// Step backwards as earlier nodes take precedence.
-		for i := len(n.children) - 1; i >= 0; i-- {
-			ni := n.children[i]
-			if ni.kind == aliasNode {
-				an, ok := d.doc.anchors[ni.value]
-				if ok && an.kind != mappingNode {
-					failWantMap()
-				}
-			} else if ni.kind != mappingNode {
-				failWantMap()
-			}
-			d.unmarshal(ni, out)
-		}
-	default:
-		failWantMap()
-	}
-}
-
-func isMerge(n *node) bool {
-	return n.kind == scalarNode && n.value == "<<" && (n.implicit == true || n.tag == yaml_MERGE_TAG)
-}
diff --git a/vendor/gopkg.in/yaml.v2/emitterc.go b/vendor/gopkg.in/yaml.v2/emitterc.go
deleted file mode 100644
index 41de8b856c..0000000000
--- a/vendor/gopkg.in/yaml.v2/emitterc.go
+++ /dev/null
@@ -1,1684 +0,0 @@
-package yaml
-
-import (
-	"bytes"
-)
-
-// Flush the buffer if needed.
-func flush(emitter *yaml_emitter_t) bool {
-	if emitter.buffer_pos+5 >= len(emitter.buffer) {
-		return yaml_emitter_flush(emitter)
-	}
-	return true
-}
-
-// Put a character to the output buffer.
-func put(emitter *yaml_emitter_t, value byte) bool {
-	if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) {
-		return false
-	}
-	emitter.buffer[emitter.buffer_pos] = value
-	emitter.buffer_pos++
-	emitter.column++
-	return true
-}
-
-// Put a line break to the output buffer.
-func put_break(emitter *yaml_emitter_t) bool {
-	if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) {
-		return false
-	}
-	switch emitter.line_break {
-	case yaml_CR_BREAK:
-		emitter.buffer[emitter.buffer_pos] = '\r'
-		emitter.buffer_pos += 1
-	case yaml_LN_BREAK:
-		emitter.buffer[emitter.buffer_pos] = '\n'
-		emitter.buffer_pos += 1
-	case yaml_CRLN_BREAK:
-		emitter.buffer[emitter.buffer_pos+0] = '\r'
-		emitter.buffer[emitter.buffer_pos+1] = '\n'
-		emitter.buffer_pos += 2
-	default:
-		panic("unknown line break setting")
-	}
-	emitter.column = 0
-	emitter.line++
-	return true
-}
-
-// Copy a character from a string into buffer.
-func write(emitter *yaml_emitter_t, s []byte, i *int) bool {
-	if emitter.buffer_pos+5 >= len(emitter.buffer) && !yaml_emitter_flush(emitter) {
-		return false
-	}
-	p := emitter.buffer_pos
-	w := width(s[*i])
-	switch w {
-	case 4:
-		emitter.buffer[p+3] = s[*i+3]
-		fallthrough
-	case 3:
-		emitter.buffer[p+2] = s[*i+2]
-		fallthrough
-	case 2:
-		emitter.buffer[p+1] = s[*i+1]
-		fallthrough
-	case 1:
-		emitter.buffer[p+0] = s[*i+0]
-	default:
-		panic("unknown character width")
-	}
-	emitter.column++
-	emitter.buffer_pos += w
-	*i += w
-	return true
-}
-
-// Write a whole string into buffer.
-func write_all(emitter *yaml_emitter_t, s []byte) bool {
-	for i := 0; i < len(s); {
-		if !write(emitter, s, &i) {
-			return false
-		}
-	}
-	return true
-}
-
-// Copy a line break character from a string into buffer.
-func write_break(emitter *yaml_emitter_t, s []byte, i *int) bool {
-	if s[*i] == '\n' {
-		if !put_break(emitter) {
-			return false
-		}
-		*i++
-	} else {
-		if !write(emitter, s, i) {
-			return false
-		}
-		emitter.column = 0
-		emitter.line++
-	}
-	return true
-}
-
-// Set an emitter error and return false.
-func yaml_emitter_set_emitter_error(emitter *yaml_emitter_t, problem string) bool {
-	emitter.error = yaml_EMITTER_ERROR
-	emitter.problem = problem
-	return false
-}
-
-// Emit an event.
-func yaml_emitter_emit(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	emitter.events = append(emitter.events, *event)
-	for !yaml_emitter_need_more_events(emitter) {
-		event := &emitter.events[emitter.events_head]
-		if !yaml_emitter_analyze_event(emitter, event) {
-			return false
-		}
-		if !yaml_emitter_state_machine(emitter, event) {
-			return false
-		}
-		yaml_event_delete(event)
-		emitter.events_head++
-	}
-	return true
-}
-
-// Check if we need to accumulate more events before emitting.
-//
-// We accumulate extra
-//  - 1 event for DOCUMENT-START
-//  - 2 events for SEQUENCE-START
-//  - 3 events for MAPPING-START
-//
-func yaml_emitter_need_more_events(emitter *yaml_emitter_t) bool {
-	if emitter.events_head == len(emitter.events) {
-		return true
-	}
-	var accumulate int
-	switch emitter.events[emitter.events_head].typ {
-	case yaml_DOCUMENT_START_EVENT:
-		accumulate = 1
-		break
-	case yaml_SEQUENCE_START_EVENT:
-		accumulate = 2
-		break
-	case yaml_MAPPING_START_EVENT:
-		accumulate = 3
-		break
-	default:
-		return false
-	}
-	if len(emitter.events)-emitter.events_head > accumulate {
-		return false
-	}
-	var level int
-	for i := emitter.events_head; i < len(emitter.events); i++ {
-		switch emitter.events[i].typ {
-		case yaml_STREAM_START_EVENT, yaml_DOCUMENT_START_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT:
-			level++
-		case yaml_STREAM_END_EVENT, yaml_DOCUMENT_END_EVENT, yaml_SEQUENCE_END_EVENT, yaml_MAPPING_END_EVENT:
-			level--
-		}
-		if level == 0 {
-			return false
-		}
-	}
-	return true
-}
-
-// Append a directive to the directives stack.
-func yaml_emitter_append_tag_directive(emitter *yaml_emitter_t, value *yaml_tag_directive_t, allow_duplicates bool) bool {
-	for i := 0; i < len(emitter.tag_directives); i++ {
-		if bytes.Equal(value.handle, emitter.tag_directives[i].handle) {
-			if allow_duplicates {
-				return true
-			}
-			return yaml_emitter_set_emitter_error(emitter, "duplicate %TAG directive")
-		}
-	}
-
-	// [Go] Do we actually need to copy this given garbage collection
-	// and the lack of deallocating destructors?
-	tag_copy := yaml_tag_directive_t{
-		handle: make([]byte, len(value.handle)),
-		prefix: make([]byte, len(value.prefix)),
-	}
-	copy(tag_copy.handle, value.handle)
-	copy(tag_copy.prefix, value.prefix)
-	emitter.tag_directives = append(emitter.tag_directives, tag_copy)
-	return true
-}
-
-// Increase the indentation level.
-func yaml_emitter_increase_indent(emitter *yaml_emitter_t, flow, indentless bool) bool {
-	emitter.indents = append(emitter.indents, emitter.indent)
-	if emitter.indent < 0 {
-		if flow {
-			emitter.indent = emitter.best_indent
-		} else {
-			emitter.indent = 0
-		}
-	} else if !indentless {
-		emitter.indent += emitter.best_indent
-	}
-	return true
-}
-
-// State dispatcher.
-func yaml_emitter_state_machine(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	switch emitter.state {
-	default:
-	case yaml_EMIT_STREAM_START_STATE:
-		return yaml_emitter_emit_stream_start(emitter, event)
-
-	case yaml_EMIT_FIRST_DOCUMENT_START_STATE:
-		return yaml_emitter_emit_document_start(emitter, event, true)
-
-	case yaml_EMIT_DOCUMENT_START_STATE:
-		return yaml_emitter_emit_document_start(emitter, event, false)
-
-	case yaml_EMIT_DOCUMENT_CONTENT_STATE:
-		return yaml_emitter_emit_document_content(emitter, event)
-
-	case yaml_EMIT_DOCUMENT_END_STATE:
-		return yaml_emitter_emit_document_end(emitter, event)
-
-	case yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE:
-		return yaml_emitter_emit_flow_sequence_item(emitter, event, true)
-
-	case yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE:
-		return yaml_emitter_emit_flow_sequence_item(emitter, event, false)
-
-	case yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE:
-		return yaml_emitter_emit_flow_mapping_key(emitter, event, true)
-
-	case yaml_EMIT_FLOW_MAPPING_KEY_STATE:
-		return yaml_emitter_emit_flow_mapping_key(emitter, event, false)
-
-	case yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE:
-		return yaml_emitter_emit_flow_mapping_value(emitter, event, true)
-
-	case yaml_EMIT_FLOW_MAPPING_VALUE_STATE:
-		return yaml_emitter_emit_flow_mapping_value(emitter, event, false)
-
-	case yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE:
-		return yaml_emitter_emit_block_sequence_item(emitter, event, true)
-
-	case yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE:
-		return yaml_emitter_emit_block_sequence_item(emitter, event, false)
-
-	case yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE:
-		return yaml_emitter_emit_block_mapping_key(emitter, event, true)
-
-	case yaml_EMIT_BLOCK_MAPPING_KEY_STATE:
-		return yaml_emitter_emit_block_mapping_key(emitter, event, false)
-
-	case yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE:
-		return yaml_emitter_emit_block_mapping_value(emitter, event, true)
-
-	case yaml_EMIT_BLOCK_MAPPING_VALUE_STATE:
-		return yaml_emitter_emit_block_mapping_value(emitter, event, false)
-
-	case yaml_EMIT_END_STATE:
-		return yaml_emitter_set_emitter_error(emitter, "expected nothing after STREAM-END")
-	}
-	panic("invalid emitter state")
-}
-
-// Expect STREAM-START.
-func yaml_emitter_emit_stream_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if event.typ != yaml_STREAM_START_EVENT {
-		return yaml_emitter_set_emitter_error(emitter, "expected STREAM-START")
-	}
-	if emitter.encoding == yaml_ANY_ENCODING {
-		emitter.encoding = event.encoding
-		if emitter.encoding == yaml_ANY_ENCODING {
-			emitter.encoding = yaml_UTF8_ENCODING
-		}
-	}
-	if emitter.best_indent < 2 || emitter.best_indent > 9 {
-		emitter.best_indent = 2
-	}
-	if emitter.best_width >= 0 && emitter.best_width <= emitter.best_indent*2 {
-		emitter.best_width = 80
-	}
-	if emitter.best_width < 0 {
-		emitter.best_width = 1<<31 - 1
-	}
-	if emitter.line_break == yaml_ANY_BREAK {
-		emitter.line_break = yaml_LN_BREAK
-	}
-
-	emitter.indent = -1
-	emitter.line = 0
-	emitter.column = 0
-	emitter.whitespace = true
-	emitter.indention = true
-
-	if emitter.encoding != yaml_UTF8_ENCODING {
-		if !yaml_emitter_write_bom(emitter) {
-			return false
-		}
-	}
-	emitter.state = yaml_EMIT_FIRST_DOCUMENT_START_STATE
-	return true
-}
-
-// Expect DOCUMENT-START or STREAM-END.
-func yaml_emitter_emit_document_start(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-
-	if event.typ == yaml_DOCUMENT_START_EVENT {
-
-		if event.version_directive != nil {
-			if !yaml_emitter_analyze_version_directive(emitter, event.version_directive) {
-				return false
-			}
-		}
-
-		for i := 0; i < len(event.tag_directives); i++ {
-			tag_directive := &event.tag_directives[i]
-			if !yaml_emitter_analyze_tag_directive(emitter, tag_directive) {
-				return false
-			}
-			if !yaml_emitter_append_tag_directive(emitter, tag_directive, false) {
-				return false
-			}
-		}
-
-		for i := 0; i < len(default_tag_directives); i++ {
-			tag_directive := &default_tag_directives[i]
-			if !yaml_emitter_append_tag_directive(emitter, tag_directive, true) {
-				return false
-			}
-		}
-
-		implicit := event.implicit
-		if !first || emitter.canonical {
-			implicit = false
-		}
-
-		if emitter.open_ended && (event.version_directive != nil || len(event.tag_directives) > 0) {
-			if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-
-		if event.version_directive != nil {
-			implicit = false
-			if !yaml_emitter_write_indicator(emitter, []byte("%YAML"), true, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indicator(emitter, []byte("1.1"), true, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-
-		if len(event.tag_directives) > 0 {
-			implicit = false
-			for i := 0; i < len(event.tag_directives); i++ {
-				tag_directive := &event.tag_directives[i]
-				if !yaml_emitter_write_indicator(emitter, []byte("%TAG"), true, false, false) {
-					return false
-				}
-				if !yaml_emitter_write_tag_handle(emitter, tag_directive.handle) {
-					return false
-				}
-				if !yaml_emitter_write_tag_content(emitter, tag_directive.prefix, true) {
-					return false
-				}
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-		}
-
-		if yaml_emitter_check_empty_document(emitter) {
-			implicit = false
-		}
-		if !implicit {
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-			if !yaml_emitter_write_indicator(emitter, []byte("---"), true, false, false) {
-				return false
-			}
-			if emitter.canonical {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-		}
-
-		emitter.state = yaml_EMIT_DOCUMENT_CONTENT_STATE
-		return true
-	}
-
-	if event.typ == yaml_STREAM_END_EVENT {
-		if emitter.open_ended {
-			if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-		if !yaml_emitter_flush(emitter) {
-			return false
-		}
-		emitter.state = yaml_EMIT_END_STATE
-		return true
-	}
-
-	return yaml_emitter_set_emitter_error(emitter, "expected DOCUMENT-START or STREAM-END")
-}
-
-// Expect the root node.
-func yaml_emitter_emit_document_content(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	emitter.states = append(emitter.states, yaml_EMIT_DOCUMENT_END_STATE)
-	return yaml_emitter_emit_node(emitter, event, true, false, false, false)
-}
-
-// Expect DOCUMENT-END.
-func yaml_emitter_emit_document_end(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if event.typ != yaml_DOCUMENT_END_EVENT {
-		return yaml_emitter_set_emitter_error(emitter, "expected DOCUMENT-END")
-	}
-	if !yaml_emitter_write_indent(emitter) {
-		return false
-	}
-	if !event.implicit {
-		// [Go] Allocate the slice elsewhere.
-		if !yaml_emitter_write_indicator(emitter, []byte("..."), true, false, false) {
-			return false
-		}
-		if !yaml_emitter_write_indent(emitter) {
-			return false
-		}
-	}
-	if !yaml_emitter_flush(emitter) {
-		return false
-	}
-	emitter.state = yaml_EMIT_DOCUMENT_START_STATE
-	emitter.tag_directives = emitter.tag_directives[:0]
-	return true
-}
-
-// Expect a flow item node.
-func yaml_emitter_emit_flow_sequence_item(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_write_indicator(emitter, []byte{'['}, true, true, false) {
-			return false
-		}
-		if !yaml_emitter_increase_indent(emitter, true, false) {
-			return false
-		}
-		emitter.flow_level++
-	}
-
-	if event.typ == yaml_SEQUENCE_END_EVENT {
-		emitter.flow_level--
-		emitter.indent = emitter.indents[len(emitter.indents)-1]
-		emitter.indents = emitter.indents[:len(emitter.indents)-1]
-		if emitter.canonical && !first {
-			if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{']'}, false, false, false) {
-			return false
-		}
-		emitter.state = emitter.states[len(emitter.states)-1]
-		emitter.states = emitter.states[:len(emitter.states)-1]
-
-		return true
-	}
-
-	if !first {
-		if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
-			return false
-		}
-	}
-
-	if emitter.canonical || emitter.column > emitter.best_width {
-		if !yaml_emitter_write_indent(emitter) {
-			return false
-		}
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, true, false, false)
-}
-
-// Expect a flow key node.
-func yaml_emitter_emit_flow_mapping_key(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_write_indicator(emitter, []byte{'{'}, true, true, false) {
-			return false
-		}
-		if !yaml_emitter_increase_indent(emitter, true, false) {
-			return false
-		}
-		emitter.flow_level++
-	}
-
-	if event.typ == yaml_MAPPING_END_EVENT {
-		emitter.flow_level--
-		emitter.indent = emitter.indents[len(emitter.indents)-1]
-		emitter.indents = emitter.indents[:len(emitter.indents)-1]
-		if emitter.canonical && !first {
-			if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
-				return false
-			}
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{'}'}, false, false, false) {
-			return false
-		}
-		emitter.state = emitter.states[len(emitter.states)-1]
-		emitter.states = emitter.states[:len(emitter.states)-1]
-		return true
-	}
-
-	if !first {
-		if !yaml_emitter_write_indicator(emitter, []byte{','}, false, false, false) {
-			return false
-		}
-	}
-	if emitter.canonical || emitter.column > emitter.best_width {
-		if !yaml_emitter_write_indent(emitter) {
-			return false
-		}
-	}
-
-	if !emitter.canonical && yaml_emitter_check_simple_key(emitter) {
-		emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE)
-		return yaml_emitter_emit_node(emitter, event, false, false, true, true)
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'?'}, true, false, false) {
-		return false
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_VALUE_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
-}
-
-// Expect a flow value node.
-func yaml_emitter_emit_flow_mapping_value(emitter *yaml_emitter_t, event *yaml_event_t, simple bool) bool {
-	if simple {
-		if !yaml_emitter_write_indicator(emitter, []byte{':'}, false, false, false) {
-			return false
-		}
-	} else {
-		if emitter.canonical || emitter.column > emitter.best_width {
-			if !yaml_emitter_write_indent(emitter) {
-				return false
-			}
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{':'}, true, false, false) {
-			return false
-		}
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_FLOW_MAPPING_KEY_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
-}
-
-// Expect a block item node.
-func yaml_emitter_emit_block_sequence_item(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_increase_indent(emitter, false, emitter.mapping_context && !emitter.indention) {
-			return false
-		}
-	}
-	if event.typ == yaml_SEQUENCE_END_EVENT {
-		emitter.indent = emitter.indents[len(emitter.indents)-1]
-		emitter.indents = emitter.indents[:len(emitter.indents)-1]
-		emitter.state = emitter.states[len(emitter.states)-1]
-		emitter.states = emitter.states[:len(emitter.states)-1]
-		return true
-	}
-	if !yaml_emitter_write_indent(emitter) {
-		return false
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'-'}, true, false, true) {
-		return false
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, true, false, false)
-}
-
-// Expect a block key node.
-func yaml_emitter_emit_block_mapping_key(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_increase_indent(emitter, false, false) {
-			return false
-		}
-	}
-	if event.typ == yaml_MAPPING_END_EVENT {
-		emitter.indent = emitter.indents[len(emitter.indents)-1]
-		emitter.indents = emitter.indents[:len(emitter.indents)-1]
-		emitter.state = emitter.states[len(emitter.states)-1]
-		emitter.states = emitter.states[:len(emitter.states)-1]
-		return true
-	}
-	if !yaml_emitter_write_indent(emitter) {
-		return false
-	}
-	if yaml_emitter_check_simple_key(emitter) {
-		emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE)
-		return yaml_emitter_emit_node(emitter, event, false, false, true, true)
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'?'}, true, false, true) {
-		return false
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_VALUE_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
-}
-
-// Expect a block value node.
-func yaml_emitter_emit_block_mapping_value(emitter *yaml_emitter_t, event *yaml_event_t, simple bool) bool {
-	if simple {
-		if !yaml_emitter_write_indicator(emitter, []byte{':'}, false, false, false) {
-			return false
-		}
-	} else {
-		if !yaml_emitter_write_indent(emitter) {
-			return false
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{':'}, true, false, true) {
-			return false
-		}
-	}
-	emitter.states = append(emitter.states, yaml_EMIT_BLOCK_MAPPING_KEY_STATE)
-	return yaml_emitter_emit_node(emitter, event, false, false, true, false)
-}
-
-// Expect a node.
-func yaml_emitter_emit_node(emitter *yaml_emitter_t, event *yaml_event_t,
-	root bool, sequence bool, mapping bool, simple_key bool) bool {
-
-	emitter.root_context = root
-	emitter.sequence_context = sequence
-	emitter.mapping_context = mapping
-	emitter.simple_key_context = simple_key
-
-	switch event.typ {
-	case yaml_ALIAS_EVENT:
-		return yaml_emitter_emit_alias(emitter, event)
-	case yaml_SCALAR_EVENT:
-		return yaml_emitter_emit_scalar(emitter, event)
-	case yaml_SEQUENCE_START_EVENT:
-		return yaml_emitter_emit_sequence_start(emitter, event)
-	case yaml_MAPPING_START_EVENT:
-		return yaml_emitter_emit_mapping_start(emitter, event)
-	default:
-		return yaml_emitter_set_emitter_error(emitter,
-			"expected SCALAR, SEQUENCE-START, MAPPING-START, or ALIAS")
-	}
-}
-
-// Expect ALIAS.
-func yaml_emitter_emit_alias(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	emitter.state = emitter.states[len(emitter.states)-1]
-	emitter.states = emitter.states[:len(emitter.states)-1]
-	return true
-}
-
-// Expect SCALAR.
-func yaml_emitter_emit_scalar(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_select_scalar_style(emitter, event) {
-		return false
-	}
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	if !yaml_emitter_process_tag(emitter) {
-		return false
-	}
-	if !yaml_emitter_increase_indent(emitter, true, false) {
-		return false
-	}
-	if !yaml_emitter_process_scalar(emitter) {
-		return false
-	}
-	emitter.indent = emitter.indents[len(emitter.indents)-1]
-	emitter.indents = emitter.indents[:len(emitter.indents)-1]
-	emitter.state = emitter.states[len(emitter.states)-1]
-	emitter.states = emitter.states[:len(emitter.states)-1]
-	return true
-}
-
-// Expect SEQUENCE-START.
-func yaml_emitter_emit_sequence_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	if !yaml_emitter_process_tag(emitter) {
-		return false
-	}
-	if emitter.flow_level > 0 || emitter.canonical || event.sequence_style() == yaml_FLOW_SEQUENCE_STYLE ||
-		yaml_emitter_check_empty_sequence(emitter) {
-		emitter.state = yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE
-	} else {
-		emitter.state = yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE
-	}
-	return true
-}
-
-// Expect MAPPING-START.
-func yaml_emitter_emit_mapping_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	if !yaml_emitter_process_tag(emitter) {
-		return false
-	}
-	if emitter.flow_level > 0 || emitter.canonical || event.mapping_style() == yaml_FLOW_MAPPING_STYLE ||
-		yaml_emitter_check_empty_mapping(emitter) {
-		emitter.state = yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE
-	} else {
-		emitter.state = yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE
-	}
-	return true
-}
-
-// Check if the document content is an empty scalar.
-func yaml_emitter_check_empty_document(emitter *yaml_emitter_t) bool {
-	return false // [Go] Huh?
-}
-
-// Check if the next events represent an empty sequence.
-func yaml_emitter_check_empty_sequence(emitter *yaml_emitter_t) bool {
-	if len(emitter.events)-emitter.events_head < 2 {
-		return false
-	}
-	return emitter.events[emitter.events_head].typ == yaml_SEQUENCE_START_EVENT &&
-		emitter.events[emitter.events_head+1].typ == yaml_SEQUENCE_END_EVENT
-}
-
-// Check if the next events represent an empty mapping.
-func yaml_emitter_check_empty_mapping(emitter *yaml_emitter_t) bool {
-	if len(emitter.events)-emitter.events_head < 2 {
-		return false
-	}
-	return emitter.events[emitter.events_head].typ == yaml_MAPPING_START_EVENT &&
-		emitter.events[emitter.events_head+1].typ == yaml_MAPPING_END_EVENT
-}
-
-// Check if the next node can be expressed as a simple key.
-func yaml_emitter_check_simple_key(emitter *yaml_emitter_t) bool {
-	length := 0
-	switch emitter.events[emitter.events_head].typ {
-	case yaml_ALIAS_EVENT:
-		length += len(emitter.anchor_data.anchor)
-	case yaml_SCALAR_EVENT:
-		if emitter.scalar_data.multiline {
-			return false
-		}
-		length += len(emitter.anchor_data.anchor) +
-			len(emitter.tag_data.handle) +
-			len(emitter.tag_data.suffix) +
-			len(emitter.scalar_data.value)
-	case yaml_SEQUENCE_START_EVENT:
-		if !yaml_emitter_check_empty_sequence(emitter) {
-			return false
-		}
-		length += len(emitter.anchor_data.anchor) +
-			len(emitter.tag_data.handle) +
-			len(emitter.tag_data.suffix)
-	case yaml_MAPPING_START_EVENT:
-		if !yaml_emitter_check_empty_mapping(emitter) {
-			return false
-		}
-		length += len(emitter.anchor_data.anchor) +
-			len(emitter.tag_data.handle) +
-			len(emitter.tag_data.suffix)
-	default:
-		return false
-	}
-	return length <= 128
-}
-
-// Determine an acceptable scalar style.
-func yaml_emitter_select_scalar_style(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-
-	no_tag := len(emitter.tag_data.handle) == 0 && len(emitter.tag_data.suffix) == 0
-	if no_tag && !event.implicit && !event.quoted_implicit {
-		return yaml_emitter_set_emitter_error(emitter, "neither tag nor implicit flags are specified")
-	}
-
-	style := event.scalar_style()
-	if style == yaml_ANY_SCALAR_STYLE {
-		style = yaml_PLAIN_SCALAR_STYLE
-	}
-	if emitter.canonical {
-		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	}
-	if emitter.simple_key_context && emitter.scalar_data.multiline {
-		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	}
-
-	if style == yaml_PLAIN_SCALAR_STYLE {
-		if emitter.flow_level > 0 && !emitter.scalar_data.flow_plain_allowed ||
-			emitter.flow_level == 0 && !emitter.scalar_data.block_plain_allowed {
-			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
-		}
-		if len(emitter.scalar_data.value) == 0 && (emitter.flow_level > 0 || emitter.simple_key_context) {
-			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
-		}
-		if no_tag && !event.implicit {
-			style = yaml_SINGLE_QUOTED_SCALAR_STYLE
-		}
-	}
-	if style == yaml_SINGLE_QUOTED_SCALAR_STYLE {
-		if !emitter.scalar_data.single_quoted_allowed {
-			style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-		}
-	}
-	if style == yaml_LITERAL_SCALAR_STYLE || style == yaml_FOLDED_SCALAR_STYLE {
-		if !emitter.scalar_data.block_allowed || emitter.flow_level > 0 || emitter.simple_key_context {
-			style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-		}
-	}
-
-	if no_tag && !event.quoted_implicit && style != yaml_PLAIN_SCALAR_STYLE {
-		emitter.tag_data.handle = []byte{'!'}
-	}
-	emitter.scalar_data.style = style
-	return true
-}
-
-// Write an achor.
-func yaml_emitter_process_anchor(emitter *yaml_emitter_t) bool {
-	if emitter.anchor_data.anchor == nil {
-		return true
-	}
-	c := []byte{'&'}
-	if emitter.anchor_data.alias {
-		c[0] = '*'
-	}
-	if !yaml_emitter_write_indicator(emitter, c, true, false, false) {
-		return false
-	}
-	return yaml_emitter_write_anchor(emitter, emitter.anchor_data.anchor)
-}
-
-// Write a tag.
-func yaml_emitter_process_tag(emitter *yaml_emitter_t) bool {
-	if len(emitter.tag_data.handle) == 0 && len(emitter.tag_data.suffix) == 0 {
-		return true
-	}
-	if len(emitter.tag_data.handle) > 0 {
-		if !yaml_emitter_write_tag_handle(emitter, emitter.tag_data.handle) {
-			return false
-		}
-		if len(emitter.tag_data.suffix) > 0 {
-			if !yaml_emitter_write_tag_content(emitter, emitter.tag_data.suffix, false) {
-				return false
-			}
-		}
-	} else {
-		// [Go] Allocate these slices elsewhere.
-		if !yaml_emitter_write_indicator(emitter, []byte("!<"), true, false, false) {
-			return false
-		}
-		if !yaml_emitter_write_tag_content(emitter, emitter.tag_data.suffix, false) {
-			return false
-		}
-		if !yaml_emitter_write_indicator(emitter, []byte{'>'}, false, false, false) {
-			return false
-		}
-	}
-	return true
-}
-
-// Write a scalar.
-func yaml_emitter_process_scalar(emitter *yaml_emitter_t) bool {
-	switch emitter.scalar_data.style {
-	case yaml_PLAIN_SCALAR_STYLE:
-		return yaml_emitter_write_plain_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context)
-
-	case yaml_SINGLE_QUOTED_SCALAR_STYLE:
-		return yaml_emitter_write_single_quoted_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context)
-
-	case yaml_DOUBLE_QUOTED_SCALAR_STYLE:
-		return yaml_emitter_write_double_quoted_scalar(emitter, emitter.scalar_data.value, !emitter.simple_key_context)
-
-	case yaml_LITERAL_SCALAR_STYLE:
-		return yaml_emitter_write_literal_scalar(emitter, emitter.scalar_data.value)
-
-	case yaml_FOLDED_SCALAR_STYLE:
-		return yaml_emitter_write_folded_scalar(emitter, emitter.scalar_data.value)
-	}
-	panic("unknown scalar style")
-}
-
-// Check if a %YAML directive is valid.
-func yaml_emitter_analyze_version_directive(emitter *yaml_emitter_t, version_directive *yaml_version_directive_t) bool {
-	if version_directive.major != 1 || version_directive.minor != 1 {
-		return yaml_emitter_set_emitter_error(emitter, "incompatible %YAML directive")
-	}
-	return true
-}
-
-// Check if a %TAG directive is valid.
-func yaml_emitter_analyze_tag_directive(emitter *yaml_emitter_t, tag_directive *yaml_tag_directive_t) bool {
-	handle := tag_directive.handle
-	prefix := tag_directive.prefix
-	if len(handle) == 0 {
-		return yaml_emitter_set_emitter_error(emitter, "tag handle must not be empty")
-	}
-	if handle[0] != '!' {
-		return yaml_emitter_set_emitter_error(emitter, "tag handle must start with '!'")
-	}
-	if handle[len(handle)-1] != '!' {
-		return yaml_emitter_set_emitter_error(emitter, "tag handle must end with '!'")
-	}
-	for i := 1; i < len(handle)-1; i += width(handle[i]) {
-		if !is_alpha(handle, i) {
-			return yaml_emitter_set_emitter_error(emitter, "tag handle must contain alphanumerical characters only")
-		}
-	}
-	if len(prefix) == 0 {
-		return yaml_emitter_set_emitter_error(emitter, "tag prefix must not be empty")
-	}
-	return true
-}
-
-// Check if an anchor is valid.
-func yaml_emitter_analyze_anchor(emitter *yaml_emitter_t, anchor []byte, alias bool) bool {
-	if len(anchor) == 0 {
-		problem := "anchor value must not be empty"
-		if alias {
-			problem = "alias value must not be empty"
-		}
-		return yaml_emitter_set_emitter_error(emitter, problem)
-	}
-	for i := 0; i < len(anchor); i += width(anchor[i]) {
-		if !is_alpha(anchor, i) {
-			problem := "anchor value must contain alphanumerical characters only"
-			if alias {
-				problem = "alias value must contain alphanumerical characters only"
-			}
-			return yaml_emitter_set_emitter_error(emitter, problem)
-		}
-	}
-	emitter.anchor_data.anchor = anchor
-	emitter.anchor_data.alias = alias
-	return true
-}
-
-// Check if a tag is valid.
-func yaml_emitter_analyze_tag(emitter *yaml_emitter_t, tag []byte) bool {
-	if len(tag) == 0 {
-		return yaml_emitter_set_emitter_error(emitter, "tag value must not be empty")
-	}
-	for i := 0; i < len(emitter.tag_directives); i++ {
-		tag_directive := &emitter.tag_directives[i]
-		if bytes.HasPrefix(tag, tag_directive.prefix) {
-			emitter.tag_data.handle = tag_directive.handle
-			emitter.tag_data.suffix = tag[len(tag_directive.prefix):]
-			return true
-		}
-	}
-	emitter.tag_data.suffix = tag
-	return true
-}
-
-// Check if a scalar is valid.
-func yaml_emitter_analyze_scalar(emitter *yaml_emitter_t, value []byte) bool {
-	var (
-		block_indicators   = false
-		flow_indicators    = false
-		line_breaks        = false
-		special_characters = false
-
-		leading_space  = false
-		leading_break  = false
-		trailing_space = false
-		trailing_break = false
-		break_space    = false
-		space_break    = false
-
-		preceded_by_whitespace = false
-		followed_by_whitespace  = false
-		previous_space          = false
-		previous_break          = false
-	)
-
-	emitter.scalar_data.value = value
-
-	if len(value) == 0 {
-		emitter.scalar_data.multiline = false
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = true
-		emitter.scalar_data.single_quoted_allowed = true
-		emitter.scalar_data.block_allowed = false
-		return true
-	}
-
-	if len(value) >= 3 && ((value[0] == '-' && value[1] == '-' && value[2] == '-') || (value[0] == '.' && value[1] == '.' && value[2] == '.')) {
-		block_indicators = true
-		flow_indicators = true
-	}
-
-	preceded_by_whitespace = true
-	for i, w := 0, 0; i < len(value); i += w {
-		w = width(value[i])
-		followed_by_whitespace = i+w >= len(value) || is_blank(value, i+w)
-
-		if i == 0 {
-			switch value[i] {
-			case '#', ',', '[', ']', '{', '}', '&', '*', '!', '|', '>', '\'', '"', '%', '@', '`':
-				flow_indicators = true
-				block_indicators = true
-			case '?', ':':
-				flow_indicators = true
-				if followed_by_whitespace {
-					block_indicators = true
-				}
-			case '-':
-				if followed_by_whitespace {
-					flow_indicators = true
-					block_indicators = true
-				}
-			}
-		} else {
-			switch value[i] {
-			case ',', '?', '[', ']', '{', '}':
-				flow_indicators = true
-			case ':':
-				flow_indicators = true
-				if followed_by_whitespace {
-					block_indicators = true
-				}
-			case '#':
-				if preceded_by_whitespace {
-					flow_indicators = true
-					block_indicators = true
-				}
-			}
-		}
-
-		if !is_printable(value, i) || !is_ascii(value, i) && !emitter.unicode {
-			special_characters = true
-		}
-		if is_space(value, i) {
-			if i == 0 {
-				leading_space = true
-			}
-			if i+width(value[i]) == len(value) {
-				trailing_space = true
-			}
-			if previous_break {
-				break_space = true
-			}
-			previous_space = true
-			previous_break = false
-		} else if is_break(value, i) {
-			line_breaks = true
-			if i == 0 {
-				leading_break = true
-			}
-			if i+width(value[i]) == len(value) {
-				trailing_break = true
-			}
-			if previous_space {
-				space_break = true
-			}
-			previous_space = false
-			previous_break = true
-		} else {
-			previous_space = false
-			previous_break = false
-		}
-
-		// [Go]: Why 'z'? Couldn't be the end of the string as that's the loop condition.
-		preceded_by_whitespace = is_blankz(value, i)
-	}
-
-	emitter.scalar_data.multiline = line_breaks
-	emitter.scalar_data.flow_plain_allowed = true
-	emitter.scalar_data.block_plain_allowed = true
-	emitter.scalar_data.single_quoted_allowed = true
-	emitter.scalar_data.block_allowed = true
-
-	if leading_space || leading_break || trailing_space || trailing_break {
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = false
-	}
-	if trailing_space {
-		emitter.scalar_data.block_allowed = false
-	}
-	if break_space {
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = false
-		emitter.scalar_data.single_quoted_allowed = false
-	}
-	if space_break || special_characters {
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = false
-		emitter.scalar_data.single_quoted_allowed = false
-		emitter.scalar_data.block_allowed = false
-	}
-	if line_breaks {
-		emitter.scalar_data.flow_plain_allowed = false
-		emitter.scalar_data.block_plain_allowed = false
-	}
-	if flow_indicators {
-		emitter.scalar_data.flow_plain_allowed = false
-	}
-	if block_indicators {
-		emitter.scalar_data.block_plain_allowed = false
-	}
-	return true
-}
-
-// Check if the event data is valid.
-func yaml_emitter_analyze_event(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-
-	emitter.anchor_data.anchor = nil
-	emitter.tag_data.handle = nil
-	emitter.tag_data.suffix = nil
-	emitter.scalar_data.value = nil
-
-	switch event.typ {
-	case yaml_ALIAS_EVENT:
-		if !yaml_emitter_analyze_anchor(emitter, event.anchor, true) {
-			return false
-		}
-
-	case yaml_SCALAR_EVENT:
-		if len(event.anchor) > 0 {
-			if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) {
-				return false
-			}
-		}
-		if len(event.tag) > 0 && (emitter.canonical || (!event.implicit && !event.quoted_implicit)) {
-			if !yaml_emitter_analyze_tag(emitter, event.tag) {
-				return false
-			}
-		}
-		if !yaml_emitter_analyze_scalar(emitter, event.value) {
-			return false
-		}
-
-	case yaml_SEQUENCE_START_EVENT:
-		if len(event.anchor) > 0 {
-			if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) {
-				return false
-			}
-		}
-		if len(event.tag) > 0 && (emitter.canonical || !event.implicit) {
-			if !yaml_emitter_analyze_tag(emitter, event.tag) {
-				return false
-			}
-		}
-
-	case yaml_MAPPING_START_EVENT:
-		if len(event.anchor) > 0 {
-			if !yaml_emitter_analyze_anchor(emitter, event.anchor, false) {
-				return false
-			}
-		}
-		if len(event.tag) > 0 && (emitter.canonical || !event.implicit) {
-			if !yaml_emitter_analyze_tag(emitter, event.tag) {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-// Write the BOM character.
-func yaml_emitter_write_bom(emitter *yaml_emitter_t) bool {
-	if !flush(emitter) {
-		return false
-	}
-	pos := emitter.buffer_pos
-	emitter.buffer[pos+0] = '\xEF'
-	emitter.buffer[pos+1] = '\xBB'
-	emitter.buffer[pos+2] = '\xBF'
-	emitter.buffer_pos += 3
-	return true
-}
-
-func yaml_emitter_write_indent(emitter *yaml_emitter_t) bool {
-	indent := emitter.indent
-	if indent < 0 {
-		indent = 0
-	}
-	if !emitter.indention || emitter.column > indent || (emitter.column == indent && !emitter.whitespace) {
-		if !put_break(emitter) {
-			return false
-		}
-	}
-	for emitter.column < indent {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-	emitter.whitespace = true
-	emitter.indention = true
-	return true
-}
-
-func yaml_emitter_write_indicator(emitter *yaml_emitter_t, indicator []byte, need_whitespace, is_whitespace, is_indention bool) bool {
-	if need_whitespace && !emitter.whitespace {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-	if !write_all(emitter, indicator) {
-		return false
-	}
-	emitter.whitespace = is_whitespace
-	emitter.indention = (emitter.indention && is_indention)
-	emitter.open_ended = false
-	return true
-}
-
-func yaml_emitter_write_anchor(emitter *yaml_emitter_t, value []byte) bool {
-	if !write_all(emitter, value) {
-		return false
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_tag_handle(emitter *yaml_emitter_t, value []byte) bool {
-	if !emitter.whitespace {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-	if !write_all(emitter, value) {
-		return false
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_tag_content(emitter *yaml_emitter_t, value []byte, need_whitespace bool) bool {
-	if need_whitespace && !emitter.whitespace {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-	for i := 0; i < len(value); {
-		var must_write bool
-		switch value[i] {
-		case ';', '/', '?', ':', '@', '&', '=', '+', '$', ',', '_', '.', '~', '*', '\'', '(', ')', '[', ']':
-			must_write = true
-		default:
-			must_write = is_alpha(value, i)
-		}
-		if must_write {
-			if !write(emitter, value, &i) {
-				return false
-			}
-		} else {
-			w := width(value[i])
-			for k := 0; k < w; k++ {
-				octet := value[i]
-				i++
-				if !put(emitter, '%') {
-					return false
-				}
-
-				c := octet >> 4
-				if c < 10 {
-					c += '0'
-				} else {
-					c += 'A' - 10
-				}
-				if !put(emitter, c) {
-					return false
-				}
-
-				c = octet & 0x0f
-				if c < 10 {
-					c += '0'
-				} else {
-					c += 'A' - 10
-				}
-				if !put(emitter, c) {
-					return false
-				}
-			}
-		}
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_plain_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool {
-	if !emitter.whitespace {
-		if !put(emitter, ' ') {
-			return false
-		}
-	}
-
-	spaces := false
-	breaks := false
-	for i := 0; i < len(value); {
-		if is_space(value, i) {
-			if allow_breaks && !spaces && emitter.column > emitter.best_width && !is_space(value, i+1) {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				i += width(value[i])
-			} else {
-				if !write(emitter, value, &i) {
-					return false
-				}
-			}
-			spaces = true
-		} else if is_break(value, i) {
-			if !breaks && value[i] == '\n' {
-				if !put_break(emitter) {
-					return false
-				}
-			}
-			if !write_break(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = true
-			breaks = true
-		} else {
-			if breaks {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-			if !write(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = false
-			spaces = false
-			breaks = false
-		}
-	}
-
-	emitter.whitespace = false
-	emitter.indention = false
-	if emitter.root_context {
-		emitter.open_ended = true
-	}
-
-	return true
-}
-
-func yaml_emitter_write_single_quoted_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool {
-
-	if !yaml_emitter_write_indicator(emitter, []byte{'\''}, true, false, false) {
-		return false
-	}
-
-	spaces := false
-	breaks := false
-	for i := 0; i < len(value); {
-		if is_space(value, i) {
-			if allow_breaks && !spaces && emitter.column > emitter.best_width && i > 0 && i < len(value)-1 && !is_space(value, i+1) {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				i += width(value[i])
-			} else {
-				if !write(emitter, value, &i) {
-					return false
-				}
-			}
-			spaces = true
-		} else if is_break(value, i) {
-			if !breaks && value[i] == '\n' {
-				if !put_break(emitter) {
-					return false
-				}
-			}
-			if !write_break(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = true
-			breaks = true
-		} else {
-			if breaks {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-			if value[i] == '\'' {
-				if !put(emitter, '\'') {
-					return false
-				}
-			}
-			if !write(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = false
-			spaces = false
-			breaks = false
-		}
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'\''}, false, false, false) {
-		return false
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_double_quoted_scalar(emitter *yaml_emitter_t, value []byte, allow_breaks bool) bool {
-	spaces := false
-	if !yaml_emitter_write_indicator(emitter, []byte{'"'}, true, false, false) {
-		return false
-	}
-
-	for i := 0; i < len(value); {
-		if !is_printable(value, i) || (!emitter.unicode && !is_ascii(value, i)) ||
-			is_bom(value, i) || is_break(value, i) ||
-			value[i] == '"' || value[i] == '\\' {
-
-			octet := value[i]
-
-			var w int
-			var v rune
-			switch {
-			case octet&0x80 == 0x00:
-				w, v = 1, rune(octet&0x7F)
-			case octet&0xE0 == 0xC0:
-				w, v = 2, rune(octet&0x1F)
-			case octet&0xF0 == 0xE0:
-				w, v = 3, rune(octet&0x0F)
-			case octet&0xF8 == 0xF0:
-				w, v = 4, rune(octet&0x07)
-			}
-			for k := 1; k < w; k++ {
-				octet = value[i+k]
-				v = (v << 6) + (rune(octet) & 0x3F)
-			}
-			i += w
-
-			if !put(emitter, '\\') {
-				return false
-			}
-
-			var ok bool
-			switch v {
-			case 0x00:
-				ok = put(emitter, '0')
-			case 0x07:
-				ok = put(emitter, 'a')
-			case 0x08:
-				ok = put(emitter, 'b')
-			case 0x09:
-				ok = put(emitter, 't')
-			case 0x0A:
-				ok = put(emitter, 'n')
-			case 0x0b:
-				ok = put(emitter, 'v')
-			case 0x0c:
-				ok = put(emitter, 'f')
-			case 0x0d:
-				ok = put(emitter, 'r')
-			case 0x1b:
-				ok = put(emitter, 'e')
-			case 0x22:
-				ok = put(emitter, '"')
-			case 0x5c:
-				ok = put(emitter, '\\')
-			case 0x85:
-				ok = put(emitter, 'N')
-			case 0xA0:
-				ok = put(emitter, '_')
-			case 0x2028:
-				ok = put(emitter, 'L')
-			case 0x2029:
-				ok = put(emitter, 'P')
-			default:
-				if v <= 0xFF {
-					ok = put(emitter, 'x')
-					w = 2
-				} else if v <= 0xFFFF {
-					ok = put(emitter, 'u')
-					w = 4
-				} else {
-					ok = put(emitter, 'U')
-					w = 8
-				}
-				for k := (w - 1) * 4; ok && k >= 0; k -= 4 {
-					digit := byte((v >> uint(k)) & 0x0F)
-					if digit < 10 {
-						ok = put(emitter, digit+'0')
-					} else {
-						ok = put(emitter, digit+'A'-10)
-					}
-				}
-			}
-			if !ok {
-				return false
-			}
-			spaces = false
-		} else if is_space(value, i) {
-			if allow_breaks && !spaces && emitter.column > emitter.best_width && i > 0 && i < len(value)-1 {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				if is_space(value, i+1) {
-					if !put(emitter, '\\') {
-						return false
-					}
-				}
-				i += width(value[i])
-			} else if !write(emitter, value, &i) {
-				return false
-			}
-			spaces = true
-		} else {
-			if !write(emitter, value, &i) {
-				return false
-			}
-			spaces = false
-		}
-	}
-	if !yaml_emitter_write_indicator(emitter, []byte{'"'}, false, false, false) {
-		return false
-	}
-	emitter.whitespace = false
-	emitter.indention = false
-	return true
-}
-
-func yaml_emitter_write_block_scalar_hints(emitter *yaml_emitter_t, value []byte) bool {
-	if is_space(value, 0) || is_break(value, 0) {
-		indent_hint := []byte{'0' + byte(emitter.best_indent)}
-		if !yaml_emitter_write_indicator(emitter, indent_hint, false, false, false) {
-			return false
-		}
-	}
-
-	emitter.open_ended = false
-
-	var chomp_hint [1]byte
-	if len(value) == 0 {
-		chomp_hint[0] = '-'
-	} else {
-		i := len(value) - 1
-		for value[i]&0xC0 == 0x80 {
-			i--
-		}
-		if !is_break(value, i) {
-			chomp_hint[0] = '-'
-		} else if i == 0 {
-			chomp_hint[0] = '+'
-			emitter.open_ended = true
-		} else {
-			i--
-			for value[i]&0xC0 == 0x80 {
-				i--
-			}
-			if is_break(value, i) {
-				chomp_hint[0] = '+'
-				emitter.open_ended = true
-			}
-		}
-	}
-	if chomp_hint[0] != 0 {
-		if !yaml_emitter_write_indicator(emitter, chomp_hint[:], false, false, false) {
-			return false
-		}
-	}
-	return true
-}
-
-func yaml_emitter_write_literal_scalar(emitter *yaml_emitter_t, value []byte) bool {
-	if !yaml_emitter_write_indicator(emitter, []byte{'|'}, true, false, false) {
-		return false
-	}
-	if !yaml_emitter_write_block_scalar_hints(emitter, value) {
-		return false
-	}
-	if !put_break(emitter) {
-		return false
-	}
-	emitter.indention = true
-	emitter.whitespace = true
-	breaks := true
-	for i := 0; i < len(value); {
-		if is_break(value, i) {
-			if !write_break(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = true
-			breaks = true
-		} else {
-			if breaks {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-			}
-			if !write(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = false
-			breaks = false
-		}
-	}
-
-	return true
-}
-
-func yaml_emitter_write_folded_scalar(emitter *yaml_emitter_t, value []byte) bool {
-	if !yaml_emitter_write_indicator(emitter, []byte{'>'}, true, false, false) {
-		return false
-	}
-	if !yaml_emitter_write_block_scalar_hints(emitter, value) {
-		return false
-	}
-
-	if !put_break(emitter) {
-		return false
-	}
-	emitter.indention = true
-	emitter.whitespace = true
-
-	breaks := true
-	leading_spaces := true
-	for i := 0; i < len(value); {
-		if is_break(value, i) {
-			if !breaks && !leading_spaces && value[i] == '\n' {
-				k := 0
-				for is_break(value, k) {
-					k += width(value[k])
-				}
-				if !is_blankz(value, k) {
-					if !put_break(emitter) {
-						return false
-					}
-				}
-			}
-			if !write_break(emitter, value, &i) {
-				return false
-			}
-			emitter.indention = true
-			breaks = true
-		} else {
-			if breaks {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				leading_spaces = is_blank(value, i)
-			}
-			if !breaks && is_space(value, i) && !is_space(value, i+1) && emitter.column > emitter.best_width {
-				if !yaml_emitter_write_indent(emitter) {
-					return false
-				}
-				i += width(value[i])
-			} else {
-				if !write(emitter, value, &i) {
-					return false
-				}
-			}
-			emitter.indention = false
-			breaks = false
-		}
-	}
-	return true
-}
diff --git a/vendor/gopkg.in/yaml.v2/encode.go b/vendor/gopkg.in/yaml.v2/encode.go
deleted file mode 100644
index 84f8499551..0000000000
--- a/vendor/gopkg.in/yaml.v2/encode.go
+++ /dev/null
@@ -1,306 +0,0 @@
-package yaml
-
-import (
-	"encoding"
-	"fmt"
-	"reflect"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type encoder struct {
-	emitter yaml_emitter_t
-	event   yaml_event_t
-	out     []byte
-	flow    bool
-}
-
-func newEncoder() (e *encoder) {
-	e = &encoder{}
-	e.must(yaml_emitter_initialize(&e.emitter))
-	yaml_emitter_set_output_string(&e.emitter, &e.out)
-	yaml_emitter_set_unicode(&e.emitter, true)
-	e.must(yaml_stream_start_event_initialize(&e.event, yaml_UTF8_ENCODING))
-	e.emit()
-	e.must(yaml_document_start_event_initialize(&e.event, nil, nil, true))
-	e.emit()
-	return e
-}
-
-func (e *encoder) finish() {
-	e.must(yaml_document_end_event_initialize(&e.event, true))
-	e.emit()
-	e.emitter.open_ended = false
-	e.must(yaml_stream_end_event_initialize(&e.event))
-	e.emit()
-}
-
-func (e *encoder) destroy() {
-	yaml_emitter_delete(&e.emitter)
-}
-
-func (e *encoder) emit() {
-	// This will internally delete the e.event value.
-	if !yaml_emitter_emit(&e.emitter, &e.event) && e.event.typ != yaml_DOCUMENT_END_EVENT && e.event.typ != yaml_STREAM_END_EVENT {
-		e.must(false)
-	}
-}
-
-func (e *encoder) must(ok bool) {
-	if !ok {
-		msg := e.emitter.problem
-		if msg == "" {
-			msg = "unknown problem generating YAML content"
-		}
-		failf("%s", msg)
-	}
-}
-
-func (e *encoder) marshal(tag string, in reflect.Value) {
-	if !in.IsValid() {
-		e.nilv()
-		return
-	}
-	iface := in.Interface()
-	if m, ok := iface.(Marshaler); ok {
-		v, err := m.MarshalYAML()
-		if err != nil {
-			fail(err)
-		}
-		if v == nil {
-			e.nilv()
-			return
-		}
-		in = reflect.ValueOf(v)
-	} else if m, ok := iface.(encoding.TextMarshaler); ok {
-		text, err := m.MarshalText()
-		if err != nil {
-			fail(err)
-		}
-		in = reflect.ValueOf(string(text))
-	}
-	switch in.Kind() {
-	case reflect.Interface:
-		if in.IsNil() {
-			e.nilv()
-		} else {
-			e.marshal(tag, in.Elem())
-		}
-	case reflect.Map:
-		e.mapv(tag, in)
-	case reflect.Ptr:
-		if in.IsNil() {
-			e.nilv()
-		} else {
-			e.marshal(tag, in.Elem())
-		}
-	case reflect.Struct:
-		e.structv(tag, in)
-	case reflect.Slice:
-		if in.Type().Elem() == mapItemType {
-			e.itemsv(tag, in)
-		} else {
-			e.slicev(tag, in)
-		}
-	case reflect.String:
-		e.stringv(tag, in)
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		if in.Type() == durationType {
-			e.stringv(tag, reflect.ValueOf(iface.(time.Duration).String()))
-		} else {
-			e.intv(tag, in)
-		}
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		e.uintv(tag, in)
-	case reflect.Float32, reflect.Float64:
-		e.floatv(tag, in)
-	case reflect.Bool:
-		e.boolv(tag, in)
-	default:
-		panic("cannot marshal type: " + in.Type().String())
-	}
-}
-
-func (e *encoder) mapv(tag string, in reflect.Value) {
-	e.mappingv(tag, func() {
-		keys := keyList(in.MapKeys())
-		sort.Sort(keys)
-		for _, k := range keys {
-			e.marshal("", k)
-			e.marshal("", in.MapIndex(k))
-		}
-	})
-}
-
-func (e *encoder) itemsv(tag string, in reflect.Value) {
-	e.mappingv(tag, func() {
-		slice := in.Convert(reflect.TypeOf([]MapItem{})).Interface().([]MapItem)
-		for _, item := range slice {
-			e.marshal("", reflect.ValueOf(item.Key))
-			e.marshal("", reflect.ValueOf(item.Value))
-		}
-	})
-}
-
-func (e *encoder) structv(tag string, in reflect.Value) {
-	sinfo, err := getStructInfo(in.Type())
-	if err != nil {
-		panic(err)
-	}
-	e.mappingv(tag, func() {
-		for _, info := range sinfo.FieldsList {
-			var value reflect.Value
-			if info.Inline == nil {
-				value = in.Field(info.Num)
-			} else {
-				value = in.FieldByIndex(info.Inline)
-			}
-			if info.OmitEmpty && isZero(value) {
-				continue
-			}
-			e.marshal("", reflect.ValueOf(info.Key))
-			e.flow = info.Flow
-			e.marshal("", value)
-		}
-		if sinfo.InlineMap >= 0 {
-			m := in.Field(sinfo.InlineMap)
-			if m.Len() > 0 {
-				e.flow = false
-				keys := keyList(m.MapKeys())
-				sort.Sort(keys)
-				for _, k := range keys {
-					if _, found := sinfo.FieldsMap[k.String()]; found {
-						panic(fmt.Sprintf("Can't have key %q in inlined map; conflicts with struct field", k.String()))
-					}
-					e.marshal("", k)
-					e.flow = false
-					e.marshal("", m.MapIndex(k))
-				}
-			}
-		}
-	})
-}
-
-func (e *encoder) mappingv(tag string, f func()) {
-	implicit := tag == ""
-	style := yaml_BLOCK_MAPPING_STYLE
-	if e.flow {
-		e.flow = false
-		style = yaml_FLOW_MAPPING_STYLE
-	}
-	e.must(yaml_mapping_start_event_initialize(&e.event, nil, []byte(tag), implicit, style))
-	e.emit()
-	f()
-	e.must(yaml_mapping_end_event_initialize(&e.event))
-	e.emit()
-}
-
-func (e *encoder) slicev(tag string, in reflect.Value) {
-	implicit := tag == ""
-	style := yaml_BLOCK_SEQUENCE_STYLE
-	if e.flow {
-		e.flow = false
-		style = yaml_FLOW_SEQUENCE_STYLE
-	}
-	e.must(yaml_sequence_start_event_initialize(&e.event, nil, []byte(tag), implicit, style))
-	e.emit()
-	n := in.Len()
-	for i := 0; i < n; i++ {
-		e.marshal("", in.Index(i))
-	}
-	e.must(yaml_sequence_end_event_initialize(&e.event))
-	e.emit()
-}
-
-// isBase60 returns whether s is in base 60 notation as defined in YAML 1.1.
-//
-// The base 60 float notation in YAML 1.1 is a terrible idea and is unsupported
-// in YAML 1.2 and by this package, but these should be marshalled quoted for
-// the time being for compatibility with other parsers.
-func isBase60Float(s string) (result bool) {
-	// Fast path.
-	if s == "" {
-		return false
-	}
-	c := s[0]
-	if !(c == '+' || c == '-' || c >= '0' && c <= '9') || strings.IndexByte(s, ':') < 0 {
-		return false
-	}
-	// Do the full match.
-	return base60float.MatchString(s)
-}
-
-// From http://yaml.org/type/float.html, except the regular expression there
-// is bogus. In practice parsers do not enforce the "\.[0-9_]*" suffix.
-var base60float = regexp.MustCompile(`^[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+(?:\.[0-9_]*)?$`)
-
-func (e *encoder) stringv(tag string, in reflect.Value) {
-	var style yaml_scalar_style_t
-	s := in.String()
-	rtag, rs := resolve("", s)
-	if rtag == yaml_BINARY_TAG {
-		if tag == "" || tag == yaml_STR_TAG {
-			tag = rtag
-			s = rs.(string)
-		} else if tag == yaml_BINARY_TAG {
-			failf("explicitly tagged !!binary data must be base64-encoded")
-		} else {
-			failf("cannot marshal invalid UTF-8 data as %s", shortTag(tag))
-		}
-	}
-	if tag == "" && (rtag != yaml_STR_TAG || isBase60Float(s)) {
-		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	} else if strings.Contains(s, "\n") {
-		style = yaml_LITERAL_SCALAR_STYLE
-	} else {
-		style = yaml_PLAIN_SCALAR_STYLE
-	}
-	e.emitScalar(s, "", tag, style)
-}
-
-func (e *encoder) boolv(tag string, in reflect.Value) {
-	var s string
-	if in.Bool() {
-		s = "true"
-	} else {
-		s = "false"
-	}
-	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) intv(tag string, in reflect.Value) {
-	s := strconv.FormatInt(in.Int(), 10)
-	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) uintv(tag string, in reflect.Value) {
-	s := strconv.FormatUint(in.Uint(), 10)
-	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) floatv(tag string, in reflect.Value) {
-	// FIXME: Handle 64 bits here.
-	s := strconv.FormatFloat(float64(in.Float()), 'g', -1, 32)
-	switch s {
-	case "+Inf":
-		s = ".inf"
-	case "-Inf":
-		s = "-.inf"
-	case "NaN":
-		s = ".nan"
-	}
-	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) nilv() {
-	e.emitScalar("null", "", "", yaml_PLAIN_SCALAR_STYLE)
-}
-
-func (e *encoder) emitScalar(value, anchor, tag string, style yaml_scalar_style_t) {
-	implicit := tag == ""
-	e.must(yaml_scalar_event_initialize(&e.event, []byte(anchor), []byte(tag), []byte(value), implicit, implicit, style))
-	e.emit()
-}
diff --git a/vendor/gopkg.in/yaml.v2/parserc.go b/vendor/gopkg.in/yaml.v2/parserc.go
deleted file mode 100644
index 81d05dfe57..0000000000
--- a/vendor/gopkg.in/yaml.v2/parserc.go
+++ /dev/null
@@ -1,1095 +0,0 @@
-package yaml
-
-import (
-	"bytes"
-)
-
-// The parser implements the following grammar:
-//
-// stream               ::= STREAM-START implicit_document? explicit_document* STREAM-END
-// implicit_document    ::= block_node DOCUMENT-END*
-// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
-// block_node_or_indentless_sequence    ::=
-//                          ALIAS
-//                          | properties (block_content | indentless_block_sequence)?
-//                          | block_content
-//                          | indentless_block_sequence
-// block_node           ::= ALIAS
-//                          | properties block_content?
-//                          | block_content
-// flow_node            ::= ALIAS
-//                          | properties flow_content?
-//                          | flow_content
-// properties           ::= TAG ANCHOR? | ANCHOR TAG?
-// block_content        ::= block_collection | flow_collection | SCALAR
-// flow_content         ::= flow_collection | SCALAR
-// block_collection     ::= block_sequence | block_mapping
-// flow_collection      ::= flow_sequence | flow_mapping
-// block_sequence       ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
-// indentless_sequence  ::= (BLOCK-ENTRY block_node?)+
-// block_mapping        ::= BLOCK-MAPPING_START
-//                          ((KEY block_node_or_indentless_sequence?)?
-//                          (VALUE block_node_or_indentless_sequence?)?)*
-//                          BLOCK-END
-// flow_sequence        ::= FLOW-SEQUENCE-START
-//                          (flow_sequence_entry FLOW-ENTRY)*
-//                          flow_sequence_entry?
-//                          FLOW-SEQUENCE-END
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-// flow_mapping         ::= FLOW-MAPPING-START
-//                          (flow_mapping_entry FLOW-ENTRY)*
-//                          flow_mapping_entry?
-//                          FLOW-MAPPING-END
-// flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-
-// Peek the next token in the token queue.
-func peek_token(parser *yaml_parser_t) *yaml_token_t {
-	if parser.token_available || yaml_parser_fetch_more_tokens(parser) {
-		return &parser.tokens[parser.tokens_head]
-	}
-	return nil
-}
-
-// Remove the next token from the queue (must be called after peek_token).
-func skip_token(parser *yaml_parser_t) {
-	parser.token_available = false
-	parser.tokens_parsed++
-	parser.stream_end_produced = parser.tokens[parser.tokens_head].typ == yaml_STREAM_END_TOKEN
-	parser.tokens_head++
-}
-
-// Get the next event.
-func yaml_parser_parse(parser *yaml_parser_t, event *yaml_event_t) bool {
-	// Erase the event object.
-	*event = yaml_event_t{}
-
-	// No events after the end of the stream or error.
-	if parser.stream_end_produced || parser.error != yaml_NO_ERROR || parser.state == yaml_PARSE_END_STATE {
-		return true
-	}
-
-	// Generate the next event.
-	return yaml_parser_state_machine(parser, event)
-}
-
-// Set parser error.
-func yaml_parser_set_parser_error(parser *yaml_parser_t, problem string, problem_mark yaml_mark_t) bool {
-	parser.error = yaml_PARSER_ERROR
-	parser.problem = problem
-	parser.problem_mark = problem_mark
-	return false
-}
-
-func yaml_parser_set_parser_error_context(parser *yaml_parser_t, context string, context_mark yaml_mark_t, problem string, problem_mark yaml_mark_t) bool {
-	parser.error = yaml_PARSER_ERROR
-	parser.context = context
-	parser.context_mark = context_mark
-	parser.problem = problem
-	parser.problem_mark = problem_mark
-	return false
-}
-
-// State dispatcher.
-func yaml_parser_state_machine(parser *yaml_parser_t, event *yaml_event_t) bool {
-	//trace("yaml_parser_state_machine", "state:", parser.state.String())
-
-	switch parser.state {
-	case yaml_PARSE_STREAM_START_STATE:
-		return yaml_parser_parse_stream_start(parser, event)
-
-	case yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE:
-		return yaml_parser_parse_document_start(parser, event, true)
-
-	case yaml_PARSE_DOCUMENT_START_STATE:
-		return yaml_parser_parse_document_start(parser, event, false)
-
-	case yaml_PARSE_DOCUMENT_CONTENT_STATE:
-		return yaml_parser_parse_document_content(parser, event)
-
-	case yaml_PARSE_DOCUMENT_END_STATE:
-		return yaml_parser_parse_document_end(parser, event)
-
-	case yaml_PARSE_BLOCK_NODE_STATE:
-		return yaml_parser_parse_node(parser, event, true, false)
-
-	case yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE:
-		return yaml_parser_parse_node(parser, event, true, true)
-
-	case yaml_PARSE_FLOW_NODE_STATE:
-		return yaml_parser_parse_node(parser, event, false, false)
-
-	case yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE:
-		return yaml_parser_parse_block_sequence_entry(parser, event, true)
-
-	case yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE:
-		return yaml_parser_parse_block_sequence_entry(parser, event, false)
-
-	case yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE:
-		return yaml_parser_parse_indentless_sequence_entry(parser, event)
-
-	case yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE:
-		return yaml_parser_parse_block_mapping_key(parser, event, true)
-
-	case yaml_PARSE_BLOCK_MAPPING_KEY_STATE:
-		return yaml_parser_parse_block_mapping_key(parser, event, false)
-
-	case yaml_PARSE_BLOCK_MAPPING_VALUE_STATE:
-		return yaml_parser_parse_block_mapping_value(parser, event)
-
-	case yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE:
-		return yaml_parser_parse_flow_sequence_entry(parser, event, true)
-
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE:
-		return yaml_parser_parse_flow_sequence_entry(parser, event, false)
-
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE:
-		return yaml_parser_parse_flow_sequence_entry_mapping_key(parser, event)
-
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE:
-		return yaml_parser_parse_flow_sequence_entry_mapping_value(parser, event)
-
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE:
-		return yaml_parser_parse_flow_sequence_entry_mapping_end(parser, event)
-
-	case yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE:
-		return yaml_parser_parse_flow_mapping_key(parser, event, true)
-
-	case yaml_PARSE_FLOW_MAPPING_KEY_STATE:
-		return yaml_parser_parse_flow_mapping_key(parser, event, false)
-
-	case yaml_PARSE_FLOW_MAPPING_VALUE_STATE:
-		return yaml_parser_parse_flow_mapping_value(parser, event, false)
-
-	case yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE:
-		return yaml_parser_parse_flow_mapping_value(parser, event, true)
-
-	default:
-		panic("invalid parser state")
-	}
-}
-
-// Parse the production:
-// stream   ::= STREAM-START implicit_document? explicit_document* STREAM-END
-//              ************
-func yaml_parser_parse_stream_start(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ != yaml_STREAM_START_TOKEN {
-		return yaml_parser_set_parser_error(parser, "did not find expected <stream-start>", token.start_mark)
-	}
-	parser.state = yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE
-	*event = yaml_event_t{
-		typ:        yaml_STREAM_START_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.end_mark,
-		encoding:   token.encoding,
-	}
-	skip_token(parser)
-	return true
-}
-
-// Parse the productions:
-// implicit_document    ::= block_node DOCUMENT-END*
-//                          *
-// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
-//                          *************************
-func yaml_parser_parse_document_start(parser *yaml_parser_t, event *yaml_event_t, implicit bool) bool {
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	// Parse extra document end indicators.
-	if !implicit {
-		for token.typ == yaml_DOCUMENT_END_TOKEN {
-			skip_token(parser)
-			token = peek_token(parser)
-			if token == nil {
-				return false
-			}
-		}
-	}
-
-	if implicit && token.typ != yaml_VERSION_DIRECTIVE_TOKEN &&
-		token.typ != yaml_TAG_DIRECTIVE_TOKEN &&
-		token.typ != yaml_DOCUMENT_START_TOKEN &&
-		token.typ != yaml_STREAM_END_TOKEN {
-		// Parse an implicit document.
-		if !yaml_parser_process_directives(parser, nil, nil) {
-			return false
-		}
-		parser.states = append(parser.states, yaml_PARSE_DOCUMENT_END_STATE)
-		parser.state = yaml_PARSE_BLOCK_NODE_STATE
-
-		*event = yaml_event_t{
-			typ:        yaml_DOCUMENT_START_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-		}
-
-	} else if token.typ != yaml_STREAM_END_TOKEN {
-		// Parse an explicit document.
-		var version_directive *yaml_version_directive_t
-		var tag_directives []yaml_tag_directive_t
-		start_mark := token.start_mark
-		if !yaml_parser_process_directives(parser, &version_directive, &tag_directives) {
-			return false
-		}
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_DOCUMENT_START_TOKEN {
-			yaml_parser_set_parser_error(parser,
-				"did not find expected <document start>", token.start_mark)
-			return false
-		}
-		parser.states = append(parser.states, yaml_PARSE_DOCUMENT_END_STATE)
-		parser.state = yaml_PARSE_DOCUMENT_CONTENT_STATE
-		end_mark := token.end_mark
-
-		*event = yaml_event_t{
-			typ:               yaml_DOCUMENT_START_EVENT,
-			start_mark:        start_mark,
-			end_mark:          end_mark,
-			version_directive: version_directive,
-			tag_directives:    tag_directives,
-			implicit:          false,
-		}
-		skip_token(parser)
-
-	} else {
-		// Parse the stream end.
-		parser.state = yaml_PARSE_END_STATE
-		*event = yaml_event_t{
-			typ:        yaml_STREAM_END_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-		}
-		skip_token(parser)
-	}
-
-	return true
-}
-
-// Parse the productions:
-// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
-//                                                    ***********
-//
-func yaml_parser_parse_document_content(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ == yaml_VERSION_DIRECTIVE_TOKEN ||
-		token.typ == yaml_TAG_DIRECTIVE_TOKEN ||
-		token.typ == yaml_DOCUMENT_START_TOKEN ||
-		token.typ == yaml_DOCUMENT_END_TOKEN ||
-		token.typ == yaml_STREAM_END_TOKEN {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-		return yaml_parser_process_empty_scalar(parser, event,
-			token.start_mark)
-	}
-	return yaml_parser_parse_node(parser, event, true, false)
-}
-
-// Parse the productions:
-// implicit_document    ::= block_node DOCUMENT-END*
-//                                     *************
-// explicit_document    ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
-//
-func yaml_parser_parse_document_end(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	start_mark := token.start_mark
-	end_mark := token.start_mark
-
-	implicit := true
-	if token.typ == yaml_DOCUMENT_END_TOKEN {
-		end_mark = token.end_mark
-		skip_token(parser)
-		implicit = false
-	}
-
-	parser.tag_directives = parser.tag_directives[:0]
-
-	parser.state = yaml_PARSE_DOCUMENT_START_STATE
-	*event = yaml_event_t{
-		typ:        yaml_DOCUMENT_END_EVENT,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		implicit:   implicit,
-	}
-	return true
-}
-
-// Parse the productions:
-// block_node_or_indentless_sequence    ::=
-//                          ALIAS
-//                          *****
-//                          | properties (block_content | indentless_block_sequence)?
-//                            **********  *
-//                          | block_content | indentless_block_sequence
-//                            *
-// block_node           ::= ALIAS
-//                          *****
-//                          | properties block_content?
-//                            ********** *
-//                          | block_content
-//                            *
-// flow_node            ::= ALIAS
-//                          *****
-//                          | properties flow_content?
-//                            ********** *
-//                          | flow_content
-//                            *
-// properties           ::= TAG ANCHOR? | ANCHOR TAG?
-//                          *************************
-// block_content        ::= block_collection | flow_collection | SCALAR
-//                                                               ******
-// flow_content         ::= flow_collection | SCALAR
-//                                            ******
-func yaml_parser_parse_node(parser *yaml_parser_t, event *yaml_event_t, block, indentless_sequence bool) bool {
-	//defer trace("yaml_parser_parse_node", "block:", block, "indentless_sequence:", indentless_sequence)()
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ == yaml_ALIAS_TOKEN {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-		*event = yaml_event_t{
-			typ:        yaml_ALIAS_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-			anchor:     token.value,
-		}
-		skip_token(parser)
-		return true
-	}
-
-	start_mark := token.start_mark
-	end_mark := token.start_mark
-
-	var tag_token bool
-	var tag_handle, tag_suffix, anchor []byte
-	var tag_mark yaml_mark_t
-	if token.typ == yaml_ANCHOR_TOKEN {
-		anchor = token.value
-		start_mark = token.start_mark
-		end_mark = token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ == yaml_TAG_TOKEN {
-			tag_token = true
-			tag_handle = token.value
-			tag_suffix = token.suffix
-			tag_mark = token.start_mark
-			end_mark = token.end_mark
-			skip_token(parser)
-			token = peek_token(parser)
-			if token == nil {
-				return false
-			}
-		}
-	} else if token.typ == yaml_TAG_TOKEN {
-		tag_token = true
-		tag_handle = token.value
-		tag_suffix = token.suffix
-		start_mark = token.start_mark
-		tag_mark = token.start_mark
-		end_mark = token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ == yaml_ANCHOR_TOKEN {
-			anchor = token.value
-			end_mark = token.end_mark
-			skip_token(parser)
-			token = peek_token(parser)
-			if token == nil {
-				return false
-			}
-		}
-	}
-
-	var tag []byte
-	if tag_token {
-		if len(tag_handle) == 0 {
-			tag = tag_suffix
-			tag_suffix = nil
-		} else {
-			for i := range parser.tag_directives {
-				if bytes.Equal(parser.tag_directives[i].handle, tag_handle) {
-					tag = append([]byte(nil), parser.tag_directives[i].prefix...)
-					tag = append(tag, tag_suffix...)
-					break
-				}
-			}
-			if len(tag) == 0 {
-				yaml_parser_set_parser_error_context(parser,
-					"while parsing a node", start_mark,
-					"found undefined tag handle", tag_mark)
-				return false
-			}
-		}
-	}
-
-	implicit := len(tag) == 0
-	if indentless_sequence && token.typ == yaml_BLOCK_ENTRY_TOKEN {
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_SEQUENCE_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_BLOCK_SEQUENCE_STYLE),
-		}
-		return true
-	}
-	if token.typ == yaml_SCALAR_TOKEN {
-		var plain_implicit, quoted_implicit bool
-		end_mark = token.end_mark
-		if (len(tag) == 0 && token.style == yaml_PLAIN_SCALAR_STYLE) || (len(tag) == 1 && tag[0] == '!') {
-			plain_implicit = true
-		} else if len(tag) == 0 {
-			quoted_implicit = true
-		}
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-
-		*event = yaml_event_t{
-			typ:             yaml_SCALAR_EVENT,
-			start_mark:      start_mark,
-			end_mark:        end_mark,
-			anchor:          anchor,
-			tag:             tag,
-			value:           token.value,
-			implicit:        plain_implicit,
-			quoted_implicit: quoted_implicit,
-			style:           yaml_style_t(token.style),
-		}
-		skip_token(parser)
-		return true
-	}
-	if token.typ == yaml_FLOW_SEQUENCE_START_TOKEN {
-		// [Go] Some of the events below can be merged as they differ only on style.
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_SEQUENCE_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_FLOW_SEQUENCE_STYLE),
-		}
-		return true
-	}
-	if token.typ == yaml_FLOW_MAPPING_START_TOKEN {
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_MAPPING_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_FLOW_MAPPING_STYLE),
-		}
-		return true
-	}
-	if block && token.typ == yaml_BLOCK_SEQUENCE_START_TOKEN {
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_SEQUENCE_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_BLOCK_SEQUENCE_STYLE),
-		}
-		return true
-	}
-	if block && token.typ == yaml_BLOCK_MAPPING_START_TOKEN {
-		end_mark = token.end_mark
-		parser.state = yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE
-		*event = yaml_event_t{
-			typ:        yaml_MAPPING_START_EVENT,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			anchor:     anchor,
-			tag:        tag,
-			implicit:   implicit,
-			style:      yaml_style_t(yaml_BLOCK_MAPPING_STYLE),
-		}
-		return true
-	}
-	if len(anchor) > 0 || len(tag) > 0 {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-
-		*event = yaml_event_t{
-			typ:             yaml_SCALAR_EVENT,
-			start_mark:      start_mark,
-			end_mark:        end_mark,
-			anchor:          anchor,
-			tag:             tag,
-			implicit:        implicit,
-			quoted_implicit: false,
-			style:           yaml_style_t(yaml_PLAIN_SCALAR_STYLE),
-		}
-		return true
-	}
-
-	context := "while parsing a flow node"
-	if block {
-		context = "while parsing a block node"
-	}
-	yaml_parser_set_parser_error_context(parser, context, start_mark,
-		"did not find expected node content", token.start_mark)
-	return false
-}
-
-// Parse the productions:
-// block_sequence ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
-//                    ********************  *********** *             *********
-//
-func yaml_parser_parse_block_sequence_entry(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
-	if first {
-		token := peek_token(parser)
-		parser.marks = append(parser.marks, token.start_mark)
-		skip_token(parser)
-	}
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ == yaml_BLOCK_ENTRY_TOKEN {
-		mark := token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_BLOCK_ENTRY_TOKEN && token.typ != yaml_BLOCK_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE)
-			return yaml_parser_parse_node(parser, event, true, false)
-		} else {
-			parser.state = yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE
-			return yaml_parser_process_empty_scalar(parser, event, mark)
-		}
-	}
-	if token.typ == yaml_BLOCK_END_TOKEN {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-		parser.marks = parser.marks[:len(parser.marks)-1]
-
-		*event = yaml_event_t{
-			typ:        yaml_SEQUENCE_END_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-		}
-
-		skip_token(parser)
-		return true
-	}
-
-	context_mark := parser.marks[len(parser.marks)-1]
-	parser.marks = parser.marks[:len(parser.marks)-1]
-	return yaml_parser_set_parser_error_context(parser,
-		"while parsing a block collection", context_mark,
-		"did not find expected '-' indicator", token.start_mark)
-}
-
-// Parse the productions:
-// indentless_sequence  ::= (BLOCK-ENTRY block_node?)+
-//                           *********** *
-func yaml_parser_parse_indentless_sequence_entry(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ == yaml_BLOCK_ENTRY_TOKEN {
-		mark := token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_BLOCK_ENTRY_TOKEN &&
-			token.typ != yaml_KEY_TOKEN &&
-			token.typ != yaml_VALUE_TOKEN &&
-			token.typ != yaml_BLOCK_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE)
-			return yaml_parser_parse_node(parser, event, true, false)
-		}
-		parser.state = yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE
-		return yaml_parser_process_empty_scalar(parser, event, mark)
-	}
-	parser.state = parser.states[len(parser.states)-1]
-	parser.states = parser.states[:len(parser.states)-1]
-
-	*event = yaml_event_t{
-		typ:        yaml_SEQUENCE_END_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.start_mark, // [Go] Shouldn't this be token.end_mark?
-	}
-	return true
-}
-
-// Parse the productions:
-// block_mapping        ::= BLOCK-MAPPING_START
-//                          *******************
-//                          ((KEY block_node_or_indentless_sequence?)?
-//                            *** *
-//                          (VALUE block_node_or_indentless_sequence?)?)*
-//
-//                          BLOCK-END
-//                          *********
-//
-func yaml_parser_parse_block_mapping_key(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
-	if first {
-		token := peek_token(parser)
-		parser.marks = append(parser.marks, token.start_mark)
-		skip_token(parser)
-	}
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ == yaml_KEY_TOKEN {
-		mark := token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_KEY_TOKEN &&
-			token.typ != yaml_VALUE_TOKEN &&
-			token.typ != yaml_BLOCK_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_BLOCK_MAPPING_VALUE_STATE)
-			return yaml_parser_parse_node(parser, event, true, true)
-		} else {
-			parser.state = yaml_PARSE_BLOCK_MAPPING_VALUE_STATE
-			return yaml_parser_process_empty_scalar(parser, event, mark)
-		}
-	} else if token.typ == yaml_BLOCK_END_TOKEN {
-		parser.state = parser.states[len(parser.states)-1]
-		parser.states = parser.states[:len(parser.states)-1]
-		parser.marks = parser.marks[:len(parser.marks)-1]
-		*event = yaml_event_t{
-			typ:        yaml_MAPPING_END_EVENT,
-			start_mark: token.start_mark,
-			end_mark:   token.end_mark,
-		}
-		skip_token(parser)
-		return true
-	}
-
-	context_mark := parser.marks[len(parser.marks)-1]
-	parser.marks = parser.marks[:len(parser.marks)-1]
-	return yaml_parser_set_parser_error_context(parser,
-		"while parsing a block mapping", context_mark,
-		"did not find expected key", token.start_mark)
-}
-
-// Parse the productions:
-// block_mapping        ::= BLOCK-MAPPING_START
-//
-//                          ((KEY block_node_or_indentless_sequence?)?
-//
-//                          (VALUE block_node_or_indentless_sequence?)?)*
-//                           ***** *
-//                          BLOCK-END
-//
-//
-func yaml_parser_parse_block_mapping_value(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ == yaml_VALUE_TOKEN {
-		mark := token.end_mark
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_KEY_TOKEN &&
-			token.typ != yaml_VALUE_TOKEN &&
-			token.typ != yaml_BLOCK_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_BLOCK_MAPPING_KEY_STATE)
-			return yaml_parser_parse_node(parser, event, true, true)
-		}
-		parser.state = yaml_PARSE_BLOCK_MAPPING_KEY_STATE
-		return yaml_parser_process_empty_scalar(parser, event, mark)
-	}
-	parser.state = yaml_PARSE_BLOCK_MAPPING_KEY_STATE
-	return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-}
-
-// Parse the productions:
-// flow_sequence        ::= FLOW-SEQUENCE-START
-//                          *******************
-//                          (flow_sequence_entry FLOW-ENTRY)*
-//                           *                   **********
-//                          flow_sequence_entry?
-//                          *
-//                          FLOW-SEQUENCE-END
-//                          *****************
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                          *
-//
-func yaml_parser_parse_flow_sequence_entry(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
-	if first {
-		token := peek_token(parser)
-		parser.marks = append(parser.marks, token.start_mark)
-		skip_token(parser)
-	}
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
-		if !first {
-			if token.typ == yaml_FLOW_ENTRY_TOKEN {
-				skip_token(parser)
-				token = peek_token(parser)
-				if token == nil {
-					return false
-				}
-			} else {
-				context_mark := parser.marks[len(parser.marks)-1]
-				parser.marks = parser.marks[:len(parser.marks)-1]
-				return yaml_parser_set_parser_error_context(parser,
-					"while parsing a flow sequence", context_mark,
-					"did not find expected ',' or ']'", token.start_mark)
-			}
-		}
-
-		if token.typ == yaml_KEY_TOKEN {
-			parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE
-			*event = yaml_event_t{
-				typ:        yaml_MAPPING_START_EVENT,
-				start_mark: token.start_mark,
-				end_mark:   token.end_mark,
-				implicit:   true,
-				style:      yaml_style_t(yaml_FLOW_MAPPING_STYLE),
-			}
-			skip_token(parser)
-			return true
-		} else if token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE)
-			return yaml_parser_parse_node(parser, event, false, false)
-		}
-	}
-
-	parser.state = parser.states[len(parser.states)-1]
-	parser.states = parser.states[:len(parser.states)-1]
-	parser.marks = parser.marks[:len(parser.marks)-1]
-
-	*event = yaml_event_t{
-		typ:        yaml_SEQUENCE_END_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.end_mark,
-	}
-
-	skip_token(parser)
-	return true
-}
-
-//
-// Parse the productions:
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                                      *** *
-//
-func yaml_parser_parse_flow_sequence_entry_mapping_key(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ != yaml_VALUE_TOKEN &&
-		token.typ != yaml_FLOW_ENTRY_TOKEN &&
-		token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
-		parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE)
-		return yaml_parser_parse_node(parser, event, false, false)
-	}
-	mark := token.end_mark
-	skip_token(parser)
-	parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE
-	return yaml_parser_process_empty_scalar(parser, event, mark)
-}
-
-// Parse the productions:
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                                                      ***** *
-//
-func yaml_parser_parse_flow_sequence_entry_mapping_value(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if token.typ == yaml_VALUE_TOKEN {
-		skip_token(parser)
-		token := peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_FLOW_ENTRY_TOKEN && token.typ != yaml_FLOW_SEQUENCE_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE)
-			return yaml_parser_parse_node(parser, event, false, false)
-		}
-	}
-	parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE
-	return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-}
-
-// Parse the productions:
-// flow_sequence_entry  ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                                                                      *
-//
-func yaml_parser_parse_flow_sequence_entry_mapping_end(parser *yaml_parser_t, event *yaml_event_t) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	parser.state = yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE
-	*event = yaml_event_t{
-		typ:        yaml_MAPPING_END_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.start_mark, // [Go] Shouldn't this be end_mark?
-	}
-	return true
-}
-
-// Parse the productions:
-// flow_mapping         ::= FLOW-MAPPING-START
-//                          ******************
-//                          (flow_mapping_entry FLOW-ENTRY)*
-//                           *                  **********
-//                          flow_mapping_entry?
-//                          ******************
-//                          FLOW-MAPPING-END
-//                          ****************
-// flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                          *           *** *
-//
-func yaml_parser_parse_flow_mapping_key(parser *yaml_parser_t, event *yaml_event_t, first bool) bool {
-	if first {
-		token := peek_token(parser)
-		parser.marks = append(parser.marks, token.start_mark)
-		skip_token(parser)
-	}
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	if token.typ != yaml_FLOW_MAPPING_END_TOKEN {
-		if !first {
-			if token.typ == yaml_FLOW_ENTRY_TOKEN {
-				skip_token(parser)
-				token = peek_token(parser)
-				if token == nil {
-					return false
-				}
-			} else {
-				context_mark := parser.marks[len(parser.marks)-1]
-				parser.marks = parser.marks[:len(parser.marks)-1]
-				return yaml_parser_set_parser_error_context(parser,
-					"while parsing a flow mapping", context_mark,
-					"did not find expected ',' or '}'", token.start_mark)
-			}
-		}
-
-		if token.typ == yaml_KEY_TOKEN {
-			skip_token(parser)
-			token = peek_token(parser)
-			if token == nil {
-				return false
-			}
-			if token.typ != yaml_VALUE_TOKEN &&
-				token.typ != yaml_FLOW_ENTRY_TOKEN &&
-				token.typ != yaml_FLOW_MAPPING_END_TOKEN {
-				parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_VALUE_STATE)
-				return yaml_parser_parse_node(parser, event, false, false)
-			} else {
-				parser.state = yaml_PARSE_FLOW_MAPPING_VALUE_STATE
-				return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-			}
-		} else if token.typ != yaml_FLOW_MAPPING_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE)
-			return yaml_parser_parse_node(parser, event, false, false)
-		}
-	}
-
-	parser.state = parser.states[len(parser.states)-1]
-	parser.states = parser.states[:len(parser.states)-1]
-	parser.marks = parser.marks[:len(parser.marks)-1]
-	*event = yaml_event_t{
-		typ:        yaml_MAPPING_END_EVENT,
-		start_mark: token.start_mark,
-		end_mark:   token.end_mark,
-	}
-	skip_token(parser)
-	return true
-}
-
-// Parse the productions:
-// flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
-//                                   *                  ***** *
-//
-func yaml_parser_parse_flow_mapping_value(parser *yaml_parser_t, event *yaml_event_t, empty bool) bool {
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-	if empty {
-		parser.state = yaml_PARSE_FLOW_MAPPING_KEY_STATE
-		return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-	}
-	if token.typ == yaml_VALUE_TOKEN {
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-		if token.typ != yaml_FLOW_ENTRY_TOKEN && token.typ != yaml_FLOW_MAPPING_END_TOKEN {
-			parser.states = append(parser.states, yaml_PARSE_FLOW_MAPPING_KEY_STATE)
-			return yaml_parser_parse_node(parser, event, false, false)
-		}
-	}
-	parser.state = yaml_PARSE_FLOW_MAPPING_KEY_STATE
-	return yaml_parser_process_empty_scalar(parser, event, token.start_mark)
-}
-
-// Generate an empty scalar event.
-func yaml_parser_process_empty_scalar(parser *yaml_parser_t, event *yaml_event_t, mark yaml_mark_t) bool {
-	*event = yaml_event_t{
-		typ:        yaml_SCALAR_EVENT,
-		start_mark: mark,
-		end_mark:   mark,
-		value:      nil, // Empty
-		implicit:   true,
-		style:      yaml_style_t(yaml_PLAIN_SCALAR_STYLE),
-	}
-	return true
-}
-
-var default_tag_directives = []yaml_tag_directive_t{
-	{[]byte("!"), []byte("!")},
-	{[]byte("!!"), []byte("tag:yaml.org,2002:")},
-}
-
-// Parse directives.
-func yaml_parser_process_directives(parser *yaml_parser_t,
-	version_directive_ref **yaml_version_directive_t,
-	tag_directives_ref *[]yaml_tag_directive_t) bool {
-
-	var version_directive *yaml_version_directive_t
-	var tag_directives []yaml_tag_directive_t
-
-	token := peek_token(parser)
-	if token == nil {
-		return false
-	}
-
-	for token.typ == yaml_VERSION_DIRECTIVE_TOKEN || token.typ == yaml_TAG_DIRECTIVE_TOKEN {
-		if token.typ == yaml_VERSION_DIRECTIVE_TOKEN {
-			if version_directive != nil {
-				yaml_parser_set_parser_error(parser,
-					"found duplicate %YAML directive", token.start_mark)
-				return false
-			}
-			if token.major != 1 || token.minor != 1 {
-				yaml_parser_set_parser_error(parser,
-					"found incompatible YAML document", token.start_mark)
-				return false
-			}
-			version_directive = &yaml_version_directive_t{
-				major: token.major,
-				minor: token.minor,
-			}
-		} else if token.typ == yaml_TAG_DIRECTIVE_TOKEN {
-			value := yaml_tag_directive_t{
-				handle: token.value,
-				prefix: token.prefix,
-			}
-			if !yaml_parser_append_tag_directive(parser, value, false, token.start_mark) {
-				return false
-			}
-			tag_directives = append(tag_directives, value)
-		}
-
-		skip_token(parser)
-		token = peek_token(parser)
-		if token == nil {
-			return false
-		}
-	}
-
-	for i := range default_tag_directives {
-		if !yaml_parser_append_tag_directive(parser, default_tag_directives[i], true, token.start_mark) {
-			return false
-		}
-	}
-
-	if version_directive_ref != nil {
-		*version_directive_ref = version_directive
-	}
-	if tag_directives_ref != nil {
-		*tag_directives_ref = tag_directives
-	}
-	return true
-}
-
-// Append a tag directive to the directives stack.
-func yaml_parser_append_tag_directive(parser *yaml_parser_t, value yaml_tag_directive_t, allow_duplicates bool, mark yaml_mark_t) bool {
-	for i := range parser.tag_directives {
-		if bytes.Equal(value.handle, parser.tag_directives[i].handle) {
-			if allow_duplicates {
-				return true
-			}
-			return yaml_parser_set_parser_error(parser, "found duplicate %TAG directive", mark)
-		}
-	}
-
-	// [Go] I suspect the copy is unnecessary. This was likely done
-	// because there was no way to track ownership of the data.
-	value_copy := yaml_tag_directive_t{
-		handle: make([]byte, len(value.handle)),
-		prefix: make([]byte, len(value.prefix)),
-	}
-	copy(value_copy.handle, value.handle)
-	copy(value_copy.prefix, value.prefix)
-	parser.tag_directives = append(parser.tag_directives, value_copy)
-	return true
-}
diff --git a/vendor/gopkg.in/yaml.v2/readerc.go b/vendor/gopkg.in/yaml.v2/readerc.go
deleted file mode 100644
index f450791717..0000000000
--- a/vendor/gopkg.in/yaml.v2/readerc.go
+++ /dev/null
@@ -1,394 +0,0 @@
-package yaml
-
-import (
-	"io"
-)
-
-// Set the reader error and return 0.
-func yaml_parser_set_reader_error(parser *yaml_parser_t, problem string, offset int, value int) bool {
-	parser.error = yaml_READER_ERROR
-	parser.problem = problem
-	parser.problem_offset = offset
-	parser.problem_value = value
-	return false
-}
-
-// Byte order marks.
-const (
-	bom_UTF8    = "\xef\xbb\xbf"
-	bom_UTF16LE = "\xff\xfe"
-	bom_UTF16BE = "\xfe\xff"
-)
-
-// Determine the input stream encoding by checking the BOM symbol. If no BOM is
-// found, the UTF-8 encoding is assumed. Return 1 on success, 0 on failure.
-func yaml_parser_determine_encoding(parser *yaml_parser_t) bool {
-	// Ensure that we had enough bytes in the raw buffer.
-	for !parser.eof && len(parser.raw_buffer)-parser.raw_buffer_pos < 3 {
-		if !yaml_parser_update_raw_buffer(parser) {
-			return false
-		}
-	}
-
-	// Determine the encoding.
-	buf := parser.raw_buffer
-	pos := parser.raw_buffer_pos
-	avail := len(buf) - pos
-	if avail >= 2 && buf[pos] == bom_UTF16LE[0] && buf[pos+1] == bom_UTF16LE[1] {
-		parser.encoding = yaml_UTF16LE_ENCODING
-		parser.raw_buffer_pos += 2
-		parser.offset += 2
-	} else if avail >= 2 && buf[pos] == bom_UTF16BE[0] && buf[pos+1] == bom_UTF16BE[1] {
-		parser.encoding = yaml_UTF16BE_ENCODING
-		parser.raw_buffer_pos += 2
-		parser.offset += 2
-	} else if avail >= 3 && buf[pos] == bom_UTF8[0] && buf[pos+1] == bom_UTF8[1] && buf[pos+2] == bom_UTF8[2] {
-		parser.encoding = yaml_UTF8_ENCODING
-		parser.raw_buffer_pos += 3
-		parser.offset += 3
-	} else {
-		parser.encoding = yaml_UTF8_ENCODING
-	}
-	return true
-}
-
-// Update the raw buffer.
-func yaml_parser_update_raw_buffer(parser *yaml_parser_t) bool {
-	size_read := 0
-
-	// Return if the raw buffer is full.
-	if parser.raw_buffer_pos == 0 && len(parser.raw_buffer) == cap(parser.raw_buffer) {
-		return true
-	}
-
-	// Return on EOF.
-	if parser.eof {
-		return true
-	}
-
-	// Move the remaining bytes in the raw buffer to the beginning.
-	if parser.raw_buffer_pos > 0 && parser.raw_buffer_pos < len(parser.raw_buffer) {
-		copy(parser.raw_buffer, parser.raw_buffer[parser.raw_buffer_pos:])
-	}
-	parser.raw_buffer = parser.raw_buffer[:len(parser.raw_buffer)-parser.raw_buffer_pos]
-	parser.raw_buffer_pos = 0
-
-	// Call the read handler to fill the buffer.
-	size_read, err := parser.read_handler(parser, parser.raw_buffer[len(parser.raw_buffer):cap(parser.raw_buffer)])
-	parser.raw_buffer = parser.raw_buffer[:len(parser.raw_buffer)+size_read]
-	if err == io.EOF {
-		parser.eof = true
-	} else if err != nil {
-		return yaml_parser_set_reader_error(parser, "input error: "+err.Error(), parser.offset, -1)
-	}
-	return true
-}
-
-// Ensure that the buffer contains at least `length` characters.
-// Return true on success, false on failure.
-//
-// The length is supposed to be significantly less that the buffer size.
-func yaml_parser_update_buffer(parser *yaml_parser_t, length int) bool {
-	if parser.read_handler == nil {
-		panic("read handler must be set")
-	}
-
-	// If the EOF flag is set and the raw buffer is empty, do nothing.
-	if parser.eof && parser.raw_buffer_pos == len(parser.raw_buffer) {
-		return true
-	}
-
-	// Return if the buffer contains enough characters.
-	if parser.unread >= length {
-		return true
-	}
-
-	// Determine the input encoding if it is not known yet.
-	if parser.encoding == yaml_ANY_ENCODING {
-		if !yaml_parser_determine_encoding(parser) {
-			return false
-		}
-	}
-
-	// Move the unread characters to the beginning of the buffer.
-	buffer_len := len(parser.buffer)
-	if parser.buffer_pos > 0 && parser.buffer_pos < buffer_len {
-		copy(parser.buffer, parser.buffer[parser.buffer_pos:])
-		buffer_len -= parser.buffer_pos
-		parser.buffer_pos = 0
-	} else if parser.buffer_pos == buffer_len {
-		buffer_len = 0
-		parser.buffer_pos = 0
-	}
-
-	// Open the whole buffer for writing, and cut it before returning.
-	parser.buffer = parser.buffer[:cap(parser.buffer)]
-
-	// Fill the buffer until it has enough characters.
-	first := true
-	for parser.unread < length {
-
-		// Fill the raw buffer if necessary.
-		if !first || parser.raw_buffer_pos == len(parser.raw_buffer) {
-			if !yaml_parser_update_raw_buffer(parser) {
-				parser.buffer = parser.buffer[:buffer_len]
-				return false
-			}
-		}
-		first = false
-
-		// Decode the raw buffer.
-	inner:
-		for parser.raw_buffer_pos != len(parser.raw_buffer) {
-			var value rune
-			var width int
-
-			raw_unread := len(parser.raw_buffer) - parser.raw_buffer_pos
-
-			// Decode the next character.
-			switch parser.encoding {
-			case yaml_UTF8_ENCODING:
-				// Decode a UTF-8 character.  Check RFC 3629
-				// (http://www.ietf.org/rfc/rfc3629.txt) for more details.
-				//
-				// The following table (taken from the RFC) is used for
-				// decoding.
-				//
-				//    Char. number range |        UTF-8 octet sequence
-				//      (hexadecimal)    |              (binary)
-				//   --------------------+------------------------------------
-				//   0000 0000-0000 007F | 0xxxxxxx
-				//   0000 0080-0000 07FF | 110xxxxx 10xxxxxx
-				//   0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
-				//   0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-				//
-				// Additionally, the characters in the range 0xD800-0xDFFF
-				// are prohibited as they are reserved for use with UTF-16
-				// surrogate pairs.
-
-				// Determine the length of the UTF-8 sequence.
-				octet := parser.raw_buffer[parser.raw_buffer_pos]
-				switch {
-				case octet&0x80 == 0x00:
-					width = 1
-				case octet&0xE0 == 0xC0:
-					width = 2
-				case octet&0xF0 == 0xE0:
-					width = 3
-				case octet&0xF8 == 0xF0:
-					width = 4
-				default:
-					// The leading octet is invalid.
-					return yaml_parser_set_reader_error(parser,
-						"invalid leading UTF-8 octet",
-						parser.offset, int(octet))
-				}
-
-				// Check if the raw buffer contains an incomplete character.
-				if width > raw_unread {
-					if parser.eof {
-						return yaml_parser_set_reader_error(parser,
-							"incomplete UTF-8 octet sequence",
-							parser.offset, -1)
-					}
-					break inner
-				}
-
-				// Decode the leading octet.
-				switch {
-				case octet&0x80 == 0x00:
-					value = rune(octet & 0x7F)
-				case octet&0xE0 == 0xC0:
-					value = rune(octet & 0x1F)
-				case octet&0xF0 == 0xE0:
-					value = rune(octet & 0x0F)
-				case octet&0xF8 == 0xF0:
-					value = rune(octet & 0x07)
-				default:
-					value = 0
-				}
-
-				// Check and decode the trailing octets.
-				for k := 1; k < width; k++ {
-					octet = parser.raw_buffer[parser.raw_buffer_pos+k]
-
-					// Check if the octet is valid.
-					if (octet & 0xC0) != 0x80 {
-						return yaml_parser_set_reader_error(parser,
-							"invalid trailing UTF-8 octet",
-							parser.offset+k, int(octet))
-					}
-
-					// Decode the octet.
-					value = (value << 6) + rune(octet&0x3F)
-				}
-
-				// Check the length of the sequence against the value.
-				switch {
-				case width == 1:
-				case width == 2 && value >= 0x80:
-				case width == 3 && value >= 0x800:
-				case width == 4 && value >= 0x10000:
-				default:
-					return yaml_parser_set_reader_error(parser,
-						"invalid length of a UTF-8 sequence",
-						parser.offset, -1)
-				}
-
-				// Check the range of the value.
-				if value >= 0xD800 && value <= 0xDFFF || value > 0x10FFFF {
-					return yaml_parser_set_reader_error(parser,
-						"invalid Unicode character",
-						parser.offset, int(value))
-				}
-
-			case yaml_UTF16LE_ENCODING, yaml_UTF16BE_ENCODING:
-				var low, high int
-				if parser.encoding == yaml_UTF16LE_ENCODING {
-					low, high = 0, 1
-				} else {
-					low, high = 1, 0
-				}
-
-				// The UTF-16 encoding is not as simple as one might
-				// naively think.  Check RFC 2781
-				// (http://www.ietf.org/rfc/rfc2781.txt).
-				//
-				// Normally, two subsequent bytes describe a Unicode
-				// character.  However a special technique (called a
-				// surrogate pair) is used for specifying character
-				// values larger than 0xFFFF.
-				//
-				// A surrogate pair consists of two pseudo-characters:
-				//      high surrogate area (0xD800-0xDBFF)
-				//      low surrogate area (0xDC00-0xDFFF)
-				//
-				// The following formulas are used for decoding
-				// and encoding characters using surrogate pairs:
-				//
-				//  U  = U' + 0x10000   (0x01 00 00 <= U <= 0x10 FF FF)
-				//  U' = yyyyyyyyyyxxxxxxxxxx   (0 <= U' <= 0x0F FF FF)
-				//  W1 = 110110yyyyyyyyyy
-				//  W2 = 110111xxxxxxxxxx
-				//
-				// where U is the character value, W1 is the high surrogate
-				// area, W2 is the low surrogate area.
-
-				// Check for incomplete UTF-16 character.
-				if raw_unread < 2 {
-					if parser.eof {
-						return yaml_parser_set_reader_error(parser,
-							"incomplete UTF-16 character",
-							parser.offset, -1)
-					}
-					break inner
-				}
-
-				// Get the character.
-				value = rune(parser.raw_buffer[parser.raw_buffer_pos+low]) +
-					(rune(parser.raw_buffer[parser.raw_buffer_pos+high]) << 8)
-
-				// Check for unexpected low surrogate area.
-				if value&0xFC00 == 0xDC00 {
-					return yaml_parser_set_reader_error(parser,
-						"unexpected low surrogate area",
-						parser.offset, int(value))
-				}
-
-				// Check for a high surrogate area.
-				if value&0xFC00 == 0xD800 {
-					width = 4
-
-					// Check for incomplete surrogate pair.
-					if raw_unread < 4 {
-						if parser.eof {
-							return yaml_parser_set_reader_error(parser,
-								"incomplete UTF-16 surrogate pair",
-								parser.offset, -1)
-						}
-						break inner
-					}
-
-					// Get the next character.
-					value2 := rune(parser.raw_buffer[parser.raw_buffer_pos+low+2]) +
-						(rune(parser.raw_buffer[parser.raw_buffer_pos+high+2]) << 8)
-
-					// Check for a low surrogate area.
-					if value2&0xFC00 != 0xDC00 {
-						return yaml_parser_set_reader_error(parser,
-							"expected low surrogate area",
-							parser.offset+2, int(value2))
-					}
-
-					// Generate the value of the surrogate pair.
-					value = 0x10000 + ((value & 0x3FF) << 10) + (value2 & 0x3FF)
-				} else {
-					width = 2
-				}
-
-			default:
-				panic("impossible")
-			}
-
-			// Check if the character is in the allowed range:
-			//      #x9 | #xA | #xD | [#x20-#x7E]               (8 bit)
-			//      | #x85 | [#xA0-#xD7FF] | [#xE000-#xFFFD]    (16 bit)
-			//      | [#x10000-#x10FFFF]                        (32 bit)
-			switch {
-			case value == 0x09:
-			case value == 0x0A:
-			case value == 0x0D:
-			case value >= 0x20 && value <= 0x7E:
-			case value == 0x85:
-			case value >= 0xA0 && value <= 0xD7FF:
-			case value >= 0xE000 && value <= 0xFFFD:
-			case value >= 0x10000 && value <= 0x10FFFF:
-			default:
-				return yaml_parser_set_reader_error(parser,
-					"control characters are not allowed",
-					parser.offset, int(value))
-			}
-
-			// Move the raw pointers.
-			parser.raw_buffer_pos += width
-			parser.offset += width
-
-			// Finally put the character into the buffer.
-			if value <= 0x7F {
-				// 0000 0000-0000 007F . 0xxxxxxx
-				parser.buffer[buffer_len+0] = byte(value)
-				buffer_len += 1
-			} else if value <= 0x7FF {
-				// 0000 0080-0000 07FF . 110xxxxx 10xxxxxx
-				parser.buffer[buffer_len+0] = byte(0xC0 + (value >> 6))
-				parser.buffer[buffer_len+1] = byte(0x80 + (value & 0x3F))
-				buffer_len += 2
-			} else if value <= 0xFFFF {
-				// 0000 0800-0000 FFFF . 1110xxxx 10xxxxxx 10xxxxxx
-				parser.buffer[buffer_len+0] = byte(0xE0 + (value >> 12))
-				parser.buffer[buffer_len+1] = byte(0x80 + ((value >> 6) & 0x3F))
-				parser.buffer[buffer_len+2] = byte(0x80 + (value & 0x3F))
-				buffer_len += 3
-			} else {
-				// 0001 0000-0010 FFFF . 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-				parser.buffer[buffer_len+0] = byte(0xF0 + (value >> 18))
-				parser.buffer[buffer_len+1] = byte(0x80 + ((value >> 12) & 0x3F))
-				parser.buffer[buffer_len+2] = byte(0x80 + ((value >> 6) & 0x3F))
-				parser.buffer[buffer_len+3] = byte(0x80 + (value & 0x3F))
-				buffer_len += 4
-			}
-
-			parser.unread++
-		}
-
-		// On EOF, put NUL into the buffer and return.
-		if parser.eof {
-			parser.buffer[buffer_len] = 0
-			buffer_len++
-			parser.unread++
-			break
-		}
-	}
-	parser.buffer = parser.buffer[:buffer_len]
-	return true
-}
diff --git a/vendor/gopkg.in/yaml.v2/resolve.go b/vendor/gopkg.in/yaml.v2/resolve.go
deleted file mode 100644
index 232313cc08..0000000000
--- a/vendor/gopkg.in/yaml.v2/resolve.go
+++ /dev/null
@@ -1,208 +0,0 @@
-package yaml
-
-import (
-	"encoding/base64"
-	"math"
-	"regexp"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-type resolveMapItem struct {
-	value interface{}
-	tag   string
-}
-
-var resolveTable = make([]byte, 256)
-var resolveMap = make(map[string]resolveMapItem)
-
-func init() {
-	t := resolveTable
-	t[int('+')] = 'S' // Sign
-	t[int('-')] = 'S'
-	for _, c := range "0123456789" {
-		t[int(c)] = 'D' // Digit
-	}
-	for _, c := range "yYnNtTfFoO~" {
-		t[int(c)] = 'M' // In map
-	}
-	t[int('.')] = '.' // Float (potentially in map)
-
-	var resolveMapList = []struct {
-		v   interface{}
-		tag string
-		l   []string
-	}{
-		{true, yaml_BOOL_TAG, []string{"y", "Y", "yes", "Yes", "YES"}},
-		{true, yaml_BOOL_TAG, []string{"true", "True", "TRUE"}},
-		{true, yaml_BOOL_TAG, []string{"on", "On", "ON"}},
-		{false, yaml_BOOL_TAG, []string{"n", "N", "no", "No", "NO"}},
-		{false, yaml_BOOL_TAG, []string{"false", "False", "FALSE"}},
-		{false, yaml_BOOL_TAG, []string{"off", "Off", "OFF"}},
-		{nil, yaml_NULL_TAG, []string{"", "~", "null", "Null", "NULL"}},
-		{math.NaN(), yaml_FLOAT_TAG, []string{".nan", ".NaN", ".NAN"}},
-		{math.Inf(+1), yaml_FLOAT_TAG, []string{".inf", ".Inf", ".INF"}},
-		{math.Inf(+1), yaml_FLOAT_TAG, []string{"+.inf", "+.Inf", "+.INF"}},
-		{math.Inf(-1), yaml_FLOAT_TAG, []string{"-.inf", "-.Inf", "-.INF"}},
-		{"<<", yaml_MERGE_TAG, []string{"<<"}},
-	}
-
-	m := resolveMap
-	for _, item := range resolveMapList {
-		for _, s := range item.l {
-			m[s] = resolveMapItem{item.v, item.tag}
-		}
-	}
-}
-
-const longTagPrefix = "tag:yaml.org,2002:"
-
-func shortTag(tag string) string {
-	// TODO This can easily be made faster and produce less garbage.
-	if strings.HasPrefix(tag, longTagPrefix) {
-		return "!!" + tag[len(longTagPrefix):]
-	}
-	return tag
-}
-
-func longTag(tag string) string {
-	if strings.HasPrefix(tag, "!!") {
-		return longTagPrefix + tag[2:]
-	}
-	return tag
-}
-
-func resolvableTag(tag string) bool {
-	switch tag {
-	case "", yaml_STR_TAG, yaml_BOOL_TAG, yaml_INT_TAG, yaml_FLOAT_TAG, yaml_NULL_TAG:
-		return true
-	}
-	return false
-}
-
-var yamlStyleFloat = regexp.MustCompile(`^[-+]?[0-9]*\.?[0-9]+([eE][-+][0-9]+)?$`)
-
-func resolve(tag string, in string) (rtag string, out interface{}) {
-	if !resolvableTag(tag) {
-		return tag, in
-	}
-
-	defer func() {
-		switch tag {
-		case "", rtag, yaml_STR_TAG, yaml_BINARY_TAG:
-			return
-		}
-		failf("cannot decode %s `%s` as a %s", shortTag(rtag), in, shortTag(tag))
-	}()
-
-	// Any data is accepted as a !!str or !!binary.
-	// Otherwise, the prefix is enough of a hint about what it might be.
-	hint := byte('N')
-	if in != "" {
-		hint = resolveTable[in[0]]
-	}
-	if hint != 0 && tag != yaml_STR_TAG && tag != yaml_BINARY_TAG {
-		// Handle things we can lookup in a map.
-		if item, ok := resolveMap[in]; ok {
-			return item.tag, item.value
-		}
-
-		// Base 60 floats are a bad idea, were dropped in YAML 1.2, and
-		// are purposefully unsupported here. They're still quoted on
-		// the way out for compatibility with other parser, though.
-
-		switch hint {
-		case 'M':
-			// We've already checked the map above.
-
-		case '.':
-			// Not in the map, so maybe a normal float.
-			floatv, err := strconv.ParseFloat(in, 64)
-			if err == nil {
-				return yaml_FLOAT_TAG, floatv
-			}
-
-		case 'D', 'S':
-			// Int, float, or timestamp.
-			plain := strings.Replace(in, "_", "", -1)
-			intv, err := strconv.ParseInt(plain, 0, 64)
-			if err == nil {
-				if intv == int64(int(intv)) {
-					return yaml_INT_TAG, int(intv)
-				} else {
-					return yaml_INT_TAG, intv
-				}
-			}
-			uintv, err := strconv.ParseUint(plain, 0, 64)
-			if err == nil {
-				return yaml_INT_TAG, uintv
-			}
-			if yamlStyleFloat.MatchString(plain) {
-				floatv, err := strconv.ParseFloat(plain, 64)
-				if err == nil {
-					return yaml_FLOAT_TAG, floatv
-				}
-			}
-			if strings.HasPrefix(plain, "0b") {
-				intv, err := strconv.ParseInt(plain[2:], 2, 64)
-				if err == nil {
-					if intv == int64(int(intv)) {
-						return yaml_INT_TAG, int(intv)
-					} else {
-						return yaml_INT_TAG, intv
-					}
-				}
-				uintv, err := strconv.ParseUint(plain[2:], 2, 64)
-				if err == nil {
-					return yaml_INT_TAG, uintv
-				}
-			} else if strings.HasPrefix(plain, "-0b") {
-				intv, err := strconv.ParseInt(plain[3:], 2, 64)
-				if err == nil {
-					if intv == int64(int(intv)) {
-						return yaml_INT_TAG, -int(intv)
-					} else {
-						return yaml_INT_TAG, -intv
-					}
-				}
-			}
-			// XXX Handle timestamps here.
-
-		default:
-			panic("resolveTable item not yet handled: " + string(rune(hint)) + " (with " + in + ")")
-		}
-	}
-	if tag == yaml_BINARY_TAG {
-		return yaml_BINARY_TAG, in
-	}
-	if utf8.ValidString(in) {
-		return yaml_STR_TAG, in
-	}
-	return yaml_BINARY_TAG, encodeBase64(in)
-}
-
-// encodeBase64 encodes s as base64 that is broken up into multiple lines
-// as appropriate for the resulting length.
-func encodeBase64(s string) string {
-	const lineLen = 70
-	encLen := base64.StdEncoding.EncodedLen(len(s))
-	lines := encLen/lineLen + 1
-	buf := make([]byte, encLen*2+lines)
-	in := buf[0:encLen]
-	out := buf[encLen:]
-	base64.StdEncoding.Encode(in, []byte(s))
-	k := 0
-	for i := 0; i < len(in); i += lineLen {
-		j := i + lineLen
-		if j > len(in) {
-			j = len(in)
-		}
-		k += copy(out[k:], in[i:j])
-		if lines > 1 {
-			out[k] = '\n'
-			k++
-		}
-	}
-	return string(out[:k])
-}
diff --git a/vendor/gopkg.in/yaml.v2/scannerc.go b/vendor/gopkg.in/yaml.v2/scannerc.go
deleted file mode 100644
index 0744844558..0000000000
--- a/vendor/gopkg.in/yaml.v2/scannerc.go
+++ /dev/null
@@ -1,2711 +0,0 @@
-package yaml
-
-import (
-	"bytes"
-	"fmt"
-)
-
-// Introduction
-// ************
-//
-// The following notes assume that you are familiar with the YAML specification
-// (http://yaml.org/spec/1.2/spec.html).  We mostly follow it, although in
-// some cases we are less restrictive that it requires.
-//
-// The process of transforming a YAML stream into a sequence of events is
-// divided on two steps: Scanning and Parsing.
-//
-// The Scanner transforms the input stream into a sequence of tokens, while the
-// parser transform the sequence of tokens produced by the Scanner into a
-// sequence of parsing events.
-//
-// The Scanner is rather clever and complicated. The Parser, on the contrary,
-// is a straightforward implementation of a recursive-descendant parser (or,
-// LL(1) parser, as it is usually called).
-//
-// Actually there are two issues of Scanning that might be called "clever", the
-// rest is quite straightforward.  The issues are "block collection start" and
-// "simple keys".  Both issues are explained below in details.
-//
-// Here the Scanning step is explained and implemented.  We start with the list
-// of all the tokens produced by the Scanner together with short descriptions.
-//
-// Now, tokens:
-//
-//      STREAM-START(encoding)          # The stream start.
-//      STREAM-END                      # The stream end.
-//      VERSION-DIRECTIVE(major,minor)  # The '%YAML' directive.
-//      TAG-DIRECTIVE(handle,prefix)    # The '%TAG' directive.
-//      DOCUMENT-START                  # '---'
-//      DOCUMENT-END                    # '...'
-//      BLOCK-SEQUENCE-START            # Indentation increase denoting a block
-//      BLOCK-MAPPING-START             # sequence or a block mapping.
-//      BLOCK-END                       # Indentation decrease.
-//      FLOW-SEQUENCE-START             # '['
-//      FLOW-SEQUENCE-END               # ']'
-//      BLOCK-SEQUENCE-START            # '{'
-//      BLOCK-SEQUENCE-END              # '}'
-//      BLOCK-ENTRY                     # '-'
-//      FLOW-ENTRY                      # ','
-//      KEY                             # '?' or nothing (simple keys).
-//      VALUE                           # ':'
-//      ALIAS(anchor)                   # '*anchor'
-//      ANCHOR(anchor)                  # '&anchor'
-//      TAG(handle,suffix)              # '!handle!suffix'
-//      SCALAR(value,style)             # A scalar.
-//
-// The following two tokens are "virtual" tokens denoting the beginning and the
-// end of the stream:
-//
-//      STREAM-START(encoding)
-//      STREAM-END
-//
-// We pass the information about the input stream encoding with the
-// STREAM-START token.
-//
-// The next two tokens are responsible for tags:
-//
-//      VERSION-DIRECTIVE(major,minor)
-//      TAG-DIRECTIVE(handle,prefix)
-//
-// Example:
-//
-//      %YAML   1.1
-//      %TAG    !   !foo
-//      %TAG    !yaml!  tag:yaml.org,2002:
-//      ---
-//
-// The correspoding sequence of tokens:
-//
-//      STREAM-START(utf-8)
-//      VERSION-DIRECTIVE(1,1)
-//      TAG-DIRECTIVE("!","!foo")
-//      TAG-DIRECTIVE("!yaml","tag:yaml.org,2002:")
-//      DOCUMENT-START
-//      STREAM-END
-//
-// Note that the VERSION-DIRECTIVE and TAG-DIRECTIVE tokens occupy a whole
-// line.
-//
-// The document start and end indicators are represented by:
-//
-//      DOCUMENT-START
-//      DOCUMENT-END
-//
-// Note that if a YAML stream contains an implicit document (without '---'
-// and '...' indicators), no DOCUMENT-START and DOCUMENT-END tokens will be
-// produced.
-//
-// In the following examples, we present whole documents together with the
-// produced tokens.
-//
-//      1. An implicit document:
-//
-//          'a scalar'
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          SCALAR("a scalar",single-quoted)
-//          STREAM-END
-//
-//      2. An explicit document:
-//
-//          ---
-//          'a scalar'
-//          ...
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          DOCUMENT-START
-//          SCALAR("a scalar",single-quoted)
-//          DOCUMENT-END
-//          STREAM-END
-//
-//      3. Several documents in a stream:
-//
-//          'a scalar'
-//          ---
-//          'another scalar'
-//          ---
-//          'yet another scalar'
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          SCALAR("a scalar",single-quoted)
-//          DOCUMENT-START
-//          SCALAR("another scalar",single-quoted)
-//          DOCUMENT-START
-//          SCALAR("yet another scalar",single-quoted)
-//          STREAM-END
-//
-// We have already introduced the SCALAR token above.  The following tokens are
-// used to describe aliases, anchors, tag, and scalars:
-//
-//      ALIAS(anchor)
-//      ANCHOR(anchor)
-//      TAG(handle,suffix)
-//      SCALAR(value,style)
-//
-// The following series of examples illustrate the usage of these tokens:
-//
-//      1. A recursive sequence:
-//
-//          &A [ *A ]
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          ANCHOR("A")
-//          FLOW-SEQUENCE-START
-//          ALIAS("A")
-//          FLOW-SEQUENCE-END
-//          STREAM-END
-//
-//      2. A tagged scalar:
-//
-//          !!float "3.14"  # A good approximation.
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          TAG("!!","float")
-//          SCALAR("3.14",double-quoted)
-//          STREAM-END
-//
-//      3. Various scalar styles:
-//
-//          --- # Implicit empty plain scalars do not produce tokens.
-//          --- a plain scalar
-//          --- 'a single-quoted scalar'
-//          --- "a double-quoted scalar"
-//          --- |-
-//            a literal scalar
-//          --- >-
-//            a folded
-//            scalar
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          DOCUMENT-START
-//          DOCUMENT-START
-//          SCALAR("a plain scalar",plain)
-//          DOCUMENT-START
-//          SCALAR("a single-quoted scalar",single-quoted)
-//          DOCUMENT-START
-//          SCALAR("a double-quoted scalar",double-quoted)
-//          DOCUMENT-START
-//          SCALAR("a literal scalar",literal)
-//          DOCUMENT-START
-//          SCALAR("a folded scalar",folded)
-//          STREAM-END
-//
-// Now it's time to review collection-related tokens. We will start with
-// flow collections:
-//
-//      FLOW-SEQUENCE-START
-//      FLOW-SEQUENCE-END
-//      FLOW-MAPPING-START
-//      FLOW-MAPPING-END
-//      FLOW-ENTRY
-//      KEY
-//      VALUE
-//
-// The tokens FLOW-SEQUENCE-START, FLOW-SEQUENCE-END, FLOW-MAPPING-START, and
-// FLOW-MAPPING-END represent the indicators '[', ']', '{', and '}'
-// correspondingly.  FLOW-ENTRY represent the ',' indicator.  Finally the
-// indicators '?' and ':', which are used for denoting mapping keys and values,
-// are represented by the KEY and VALUE tokens.
-//
-// The following examples show flow collections:
-//
-//      1. A flow sequence:
-//
-//          [item 1, item 2, item 3]
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          FLOW-SEQUENCE-START
-//          SCALAR("item 1",plain)
-//          FLOW-ENTRY
-//          SCALAR("item 2",plain)
-//          FLOW-ENTRY
-//          SCALAR("item 3",plain)
-//          FLOW-SEQUENCE-END
-//          STREAM-END
-//
-//      2. A flow mapping:
-//
-//          {
-//              a simple key: a value,  # Note that the KEY token is produced.
-//              ? a complex key: another value,
-//          }
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          FLOW-MAPPING-START
-//          KEY
-//          SCALAR("a simple key",plain)
-//          VALUE
-//          SCALAR("a value",plain)
-//          FLOW-ENTRY
-//          KEY
-//          SCALAR("a complex key",plain)
-//          VALUE
-//          SCALAR("another value",plain)
-//          FLOW-ENTRY
-//          FLOW-MAPPING-END
-//          STREAM-END
-//
-// A simple key is a key which is not denoted by the '?' indicator.  Note that
-// the Scanner still produce the KEY token whenever it encounters a simple key.
-//
-// For scanning block collections, the following tokens are used (note that we
-// repeat KEY and VALUE here):
-//
-//      BLOCK-SEQUENCE-START
-//      BLOCK-MAPPING-START
-//      BLOCK-END
-//      BLOCK-ENTRY
-//      KEY
-//      VALUE
-//
-// The tokens BLOCK-SEQUENCE-START and BLOCK-MAPPING-START denote indentation
-// increase that precedes a block collection (cf. the INDENT token in Python).
-// The token BLOCK-END denote indentation decrease that ends a block collection
-// (cf. the DEDENT token in Python).  However YAML has some syntax pecularities
-// that makes detections of these tokens more complex.
-//
-// The tokens BLOCK-ENTRY, KEY, and VALUE are used to represent the indicators
-// '-', '?', and ':' correspondingly.
-//
-// The following examples show how the tokens BLOCK-SEQUENCE-START,
-// BLOCK-MAPPING-START, and BLOCK-END are emitted by the Scanner:
-//
-//      1. Block sequences:
-//
-//          - item 1
-//          - item 2
-//          -
-//            - item 3.1
-//            - item 3.2
-//          -
-//            key 1: value 1
-//            key 2: value 2
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 2",plain)
-//          BLOCK-ENTRY
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 3.1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 3.2",plain)
-//          BLOCK-END
-//          BLOCK-ENTRY
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("key 1",plain)
-//          VALUE
-//          SCALAR("value 1",plain)
-//          KEY
-//          SCALAR("key 2",plain)
-//          VALUE
-//          SCALAR("value 2",plain)
-//          BLOCK-END
-//          BLOCK-END
-//          STREAM-END
-//
-//      2. Block mappings:
-//
-//          a simple key: a value   # The KEY token is produced here.
-//          ? a complex key
-//          : another value
-//          a mapping:
-//            key 1: value 1
-//            key 2: value 2
-//          a sequence:
-//            - item 1
-//            - item 2
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("a simple key",plain)
-//          VALUE
-//          SCALAR("a value",plain)
-//          KEY
-//          SCALAR("a complex key",plain)
-//          VALUE
-//          SCALAR("another value",plain)
-//          KEY
-//          SCALAR("a mapping",plain)
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("key 1",plain)
-//          VALUE
-//          SCALAR("value 1",plain)
-//          KEY
-//          SCALAR("key 2",plain)
-//          VALUE
-//          SCALAR("value 2",plain)
-//          BLOCK-END
-//          KEY
-//          SCALAR("a sequence",plain)
-//          VALUE
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 2",plain)
-//          BLOCK-END
-//          BLOCK-END
-//          STREAM-END
-//
-// YAML does not always require to start a new block collection from a new
-// line.  If the current line contains only '-', '?', and ':' indicators, a new
-// block collection may start at the current line.  The following examples
-// illustrate this case:
-//
-//      1. Collections in a sequence:
-//
-//          - - item 1
-//            - item 2
-//          - key 1: value 1
-//            key 2: value 2
-//          - ? complex key
-//            : complex value
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 2",plain)
-//          BLOCK-END
-//          BLOCK-ENTRY
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("key 1",plain)
-//          VALUE
-//          SCALAR("value 1",plain)
-//          KEY
-//          SCALAR("key 2",plain)
-//          VALUE
-//          SCALAR("value 2",plain)
-//          BLOCK-END
-//          BLOCK-ENTRY
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("complex key")
-//          VALUE
-//          SCALAR("complex value")
-//          BLOCK-END
-//          BLOCK-END
-//          STREAM-END
-//
-//      2. Collections in a mapping:
-//
-//          ? a sequence
-//          : - item 1
-//            - item 2
-//          ? a mapping
-//          : key 1: value 1
-//            key 2: value 2
-//
-//      Tokens:
-//
-//          STREAM-START(utf-8)
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("a sequence",plain)
-//          VALUE
-//          BLOCK-SEQUENCE-START
-//          BLOCK-ENTRY
-//          SCALAR("item 1",plain)
-//          BLOCK-ENTRY
-//          SCALAR("item 2",plain)
-//          BLOCK-END
-//          KEY
-//          SCALAR("a mapping",plain)
-//          VALUE
-//          BLOCK-MAPPING-START
-//          KEY
-//          SCALAR("key 1",plain)
-//          VALUE
-//          SCALAR("value 1",plain)
-//          KEY
-//          SCALAR("key 2",plain)
-//          VALUE
-//          SCALAR("value 2",plain)
-//          BLOCK-END
-//          BLOCK-END
-//          STREAM-END
-//
-// YAML also permits non-indented sequences if they are included into a block
-// mapping.  In this case, the token BLOCK-SEQUENCE-START is not produced:
-//
-//      key:
-//      - item 1    # BLOCK-SEQUENCE-START is NOT produced here.
-//      - item 2
-//
-// Tokens:
-//
-//      STREAM-START(utf-8)
-//      BLOCK-MAPPING-START
-//      KEY
-//      SCALAR("key",plain)
-//      VALUE
-//      BLOCK-ENTRY
-//      SCALAR("item 1",plain)
-//      BLOCK-ENTRY
-//      SCALAR("item 2",plain)
-//      BLOCK-END
-//
-
-// Ensure that the buffer contains the required number of characters.
-// Return true on success, false on failure (reader error or memory error).
-func cache(parser *yaml_parser_t, length int) bool {
-	// [Go] This was inlined: !cache(A, B) -> unread < B && !update(A, B)
-	return parser.unread >= length || yaml_parser_update_buffer(parser, length)
-}
-
-// Advance the buffer pointer.
-func skip(parser *yaml_parser_t) {
-	parser.mark.index++
-	parser.mark.column++
-	parser.unread--
-	parser.buffer_pos += width(parser.buffer[parser.buffer_pos])
-}
-
-func skip_line(parser *yaml_parser_t) {
-	if is_crlf(parser.buffer, parser.buffer_pos) {
-		parser.mark.index += 2
-		parser.mark.column = 0
-		parser.mark.line++
-		parser.unread -= 2
-		parser.buffer_pos += 2
-	} else if is_break(parser.buffer, parser.buffer_pos) {
-		parser.mark.index++
-		parser.mark.column = 0
-		parser.mark.line++
-		parser.unread--
-		parser.buffer_pos += width(parser.buffer[parser.buffer_pos])
-	}
-}
-
-// Copy a character to a string buffer and advance pointers.
-func read(parser *yaml_parser_t, s []byte) []byte {
-	w := width(parser.buffer[parser.buffer_pos])
-	if w == 0 {
-		panic("invalid character sequence")
-	}
-	if len(s) == 0 {
-		s = make([]byte, 0, 32)
-	}
-	if w == 1 && len(s)+w <= cap(s) {
-		s = s[:len(s)+1]
-		s[len(s)-1] = parser.buffer[parser.buffer_pos]
-		parser.buffer_pos++
-	} else {
-		s = append(s, parser.buffer[parser.buffer_pos:parser.buffer_pos+w]...)
-		parser.buffer_pos += w
-	}
-	parser.mark.index++
-	parser.mark.column++
-	parser.unread--
-	return s
-}
-
-// Copy a line break character to a string buffer and advance pointers.
-func read_line(parser *yaml_parser_t, s []byte) []byte {
-	buf := parser.buffer
-	pos := parser.buffer_pos
-	switch {
-	case buf[pos] == '\r' && buf[pos+1] == '\n':
-		// CR LF . LF
-		s = append(s, '\n')
-		parser.buffer_pos += 2
-		parser.mark.index++
-		parser.unread--
-	case buf[pos] == '\r' || buf[pos] == '\n':
-		// CR|LF . LF
-		s = append(s, '\n')
-		parser.buffer_pos += 1
-	case buf[pos] == '\xC2' && buf[pos+1] == '\x85':
-		// NEL . LF
-		s = append(s, '\n')
-		parser.buffer_pos += 2
-	case buf[pos] == '\xE2' && buf[pos+1] == '\x80' && (buf[pos+2] == '\xA8' || buf[pos+2] == '\xA9'):
-		// LS|PS . LS|PS
-		s = append(s, buf[parser.buffer_pos:pos+3]...)
-		parser.buffer_pos += 3
-	default:
-		return s
-	}
-	parser.mark.index++
-	parser.mark.column = 0
-	parser.mark.line++
-	parser.unread--
-	return s
-}
-
-// Get the next token.
-func yaml_parser_scan(parser *yaml_parser_t, token *yaml_token_t) bool {
-	// Erase the token object.
-	*token = yaml_token_t{} // [Go] Is this necessary?
-
-	// No tokens after STREAM-END or error.
-	if parser.stream_end_produced || parser.error != yaml_NO_ERROR {
-		return true
-	}
-
-	// Ensure that the tokens queue contains enough tokens.
-	if !parser.token_available {
-		if !yaml_parser_fetch_more_tokens(parser) {
-			return false
-		}
-	}
-
-	// Fetch the next token from the queue.
-	*token = parser.tokens[parser.tokens_head]
-	parser.tokens_head++
-	parser.tokens_parsed++
-	parser.token_available = false
-
-	if token.typ == yaml_STREAM_END_TOKEN {
-		parser.stream_end_produced = true
-	}
-	return true
-}
-
-// Set the scanner error and return false.
-func yaml_parser_set_scanner_error(parser *yaml_parser_t, context string, context_mark yaml_mark_t, problem string) bool {
-	parser.error = yaml_SCANNER_ERROR
-	parser.context = context
-	parser.context_mark = context_mark
-	parser.problem = problem
-	parser.problem_mark = parser.mark
-	return false
-}
-
-func yaml_parser_set_scanner_tag_error(parser *yaml_parser_t, directive bool, context_mark yaml_mark_t, problem string) bool {
-	context := "while parsing a tag"
-	if directive {
-		context = "while parsing a %TAG directive"
-	}
-	return yaml_parser_set_scanner_error(parser, context, context_mark, problem)
-}
-
-func trace(args ...interface{}) func() {
-	pargs := append([]interface{}{"+++"}, args...)
-	fmt.Println(pargs...)
-	pargs = append([]interface{}{"---"}, args...)
-	return func() { fmt.Println(pargs...) }
-}
-
-// Ensure that the tokens queue contains at least one token which can be
-// returned to the Parser.
-func yaml_parser_fetch_more_tokens(parser *yaml_parser_t) bool {
-	// While we need more tokens to fetch, do it.
-	for {
-		// Check if we really need to fetch more tokens.
-		need_more_tokens := false
-
-		if parser.tokens_head == len(parser.tokens) {
-			// Queue is empty.
-			need_more_tokens = true
-		} else {
-			// Check if any potential simple key may occupy the head position.
-			if !yaml_parser_stale_simple_keys(parser) {
-				return false
-			}
-
-			for i := range parser.simple_keys {
-				simple_key := &parser.simple_keys[i]
-				if simple_key.possible && simple_key.token_number == parser.tokens_parsed {
-					need_more_tokens = true
-					break
-				}
-			}
-		}
-
-		// We are finished.
-		if !need_more_tokens {
-			break
-		}
-		// Fetch the next token.
-		if !yaml_parser_fetch_next_token(parser) {
-			return false
-		}
-	}
-
-	parser.token_available = true
-	return true
-}
-
-// The dispatcher for token fetchers.
-func yaml_parser_fetch_next_token(parser *yaml_parser_t) bool {
-	// Ensure that the buffer is initialized.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	// Check if we just started scanning.  Fetch STREAM-START then.
-	if !parser.stream_start_produced {
-		return yaml_parser_fetch_stream_start(parser)
-	}
-
-	// Eat whitespaces and comments until we reach the next token.
-	if !yaml_parser_scan_to_next_token(parser) {
-		return false
-	}
-
-	// Remove obsolete potential simple keys.
-	if !yaml_parser_stale_simple_keys(parser) {
-		return false
-	}
-
-	// Check the indentation level against the current column.
-	if !yaml_parser_unroll_indent(parser, parser.mark.column) {
-		return false
-	}
-
-	// Ensure that the buffer contains at least 4 characters.  4 is the length
-	// of the longest indicators ('--- ' and '... ').
-	if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) {
-		return false
-	}
-
-	// Is it the end of the stream?
-	if is_z(parser.buffer, parser.buffer_pos) {
-		return yaml_parser_fetch_stream_end(parser)
-	}
-
-	// Is it a directive?
-	if parser.mark.column == 0 && parser.buffer[parser.buffer_pos] == '%' {
-		return yaml_parser_fetch_directive(parser)
-	}
-
-	buf := parser.buffer
-	pos := parser.buffer_pos
-
-	// Is it the document start indicator?
-	if parser.mark.column == 0 && buf[pos] == '-' && buf[pos+1] == '-' && buf[pos+2] == '-' && is_blankz(buf, pos+3) {
-		return yaml_parser_fetch_document_indicator(parser, yaml_DOCUMENT_START_TOKEN)
-	}
-
-	// Is it the document end indicator?
-	if parser.mark.column == 0 && buf[pos] == '.' && buf[pos+1] == '.' && buf[pos+2] == '.' && is_blankz(buf, pos+3) {
-		return yaml_parser_fetch_document_indicator(parser, yaml_DOCUMENT_END_TOKEN)
-	}
-
-	// Is it the flow sequence start indicator?
-	if buf[pos] == '[' {
-		return yaml_parser_fetch_flow_collection_start(parser, yaml_FLOW_SEQUENCE_START_TOKEN)
-	}
-
-	// Is it the flow mapping start indicator?
-	if parser.buffer[parser.buffer_pos] == '{' {
-		return yaml_parser_fetch_flow_collection_start(parser, yaml_FLOW_MAPPING_START_TOKEN)
-	}
-
-	// Is it the flow sequence end indicator?
-	if parser.buffer[parser.buffer_pos] == ']' {
-		return yaml_parser_fetch_flow_collection_end(parser,
-			yaml_FLOW_SEQUENCE_END_TOKEN)
-	}
-
-	// Is it the flow mapping end indicator?
-	if parser.buffer[parser.buffer_pos] == '}' {
-		return yaml_parser_fetch_flow_collection_end(parser,
-			yaml_FLOW_MAPPING_END_TOKEN)
-	}
-
-	// Is it the flow entry indicator?
-	if parser.buffer[parser.buffer_pos] == ',' {
-		return yaml_parser_fetch_flow_entry(parser)
-	}
-
-	// Is it the block entry indicator?
-	if parser.buffer[parser.buffer_pos] == '-' && is_blankz(parser.buffer, parser.buffer_pos+1) {
-		return yaml_parser_fetch_block_entry(parser)
-	}
-
-	// Is it the key indicator?
-	if parser.buffer[parser.buffer_pos] == '?' && (parser.flow_level > 0 || is_blankz(parser.buffer, parser.buffer_pos+1)) {
-		return yaml_parser_fetch_key(parser)
-	}
-
-	// Is it the value indicator?
-	if parser.buffer[parser.buffer_pos] == ':' && (parser.flow_level > 0 || is_blankz(parser.buffer, parser.buffer_pos+1)) {
-		return yaml_parser_fetch_value(parser)
-	}
-
-	// Is it an alias?
-	if parser.buffer[parser.buffer_pos] == '*' {
-		return yaml_parser_fetch_anchor(parser, yaml_ALIAS_TOKEN)
-	}
-
-	// Is it an anchor?
-	if parser.buffer[parser.buffer_pos] == '&' {
-		return yaml_parser_fetch_anchor(parser, yaml_ANCHOR_TOKEN)
-	}
-
-	// Is it a tag?
-	if parser.buffer[parser.buffer_pos] == '!' {
-		return yaml_parser_fetch_tag(parser)
-	}
-
-	// Is it a literal scalar?
-	if parser.buffer[parser.buffer_pos] == '|' && parser.flow_level == 0 {
-		return yaml_parser_fetch_block_scalar(parser, true)
-	}
-
-	// Is it a folded scalar?
-	if parser.buffer[parser.buffer_pos] == '>' && parser.flow_level == 0 {
-		return yaml_parser_fetch_block_scalar(parser, false)
-	}
-
-	// Is it a single-quoted scalar?
-	if parser.buffer[parser.buffer_pos] == '\'' {
-		return yaml_parser_fetch_flow_scalar(parser, true)
-	}
-
-	// Is it a double-quoted scalar?
-	if parser.buffer[parser.buffer_pos] == '"' {
-		return yaml_parser_fetch_flow_scalar(parser, false)
-	}
-
-	// Is it a plain scalar?
-	//
-	// A plain scalar may start with any non-blank characters except
-	//
-	//      '-', '?', ':', ',', '[', ']', '{', '}',
-	//      '#', '&', '*', '!', '|', '>', '\'', '\"',
-	//      '%', '@', '`'.
-	//
-	// In the block context (and, for the '-' indicator, in the flow context
-	// too), it may also start with the characters
-	//
-	//      '-', '?', ':'
-	//
-	// if it is followed by a non-space character.
-	//
-	// The last rule is more restrictive than the specification requires.
-	// [Go] Make this logic more reasonable.
-	//switch parser.buffer[parser.buffer_pos] {
-	//case '-', '?', ':', ',', '?', '-', ',', ':', ']', '[', '}', '{', '&', '#', '!', '*', '>', '|', '"', '\'', '@', '%', '-', '`':
-	//}
-	if !(is_blankz(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == '-' ||
-		parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == ':' ||
-		parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == '[' ||
-		parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '{' ||
-		parser.buffer[parser.buffer_pos] == '}' || parser.buffer[parser.buffer_pos] == '#' ||
-		parser.buffer[parser.buffer_pos] == '&' || parser.buffer[parser.buffer_pos] == '*' ||
-		parser.buffer[parser.buffer_pos] == '!' || parser.buffer[parser.buffer_pos] == '|' ||
-		parser.buffer[parser.buffer_pos] == '>' || parser.buffer[parser.buffer_pos] == '\'' ||
-		parser.buffer[parser.buffer_pos] == '"' || parser.buffer[parser.buffer_pos] == '%' ||
-		parser.buffer[parser.buffer_pos] == '@' || parser.buffer[parser.buffer_pos] == '`') ||
-		(parser.buffer[parser.buffer_pos] == '-' && !is_blank(parser.buffer, parser.buffer_pos+1)) ||
-		(parser.flow_level == 0 &&
-			(parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == ':') &&
-			!is_blankz(parser.buffer, parser.buffer_pos+1)) {
-		return yaml_parser_fetch_plain_scalar(parser)
-	}
-
-	// If we don't determine the token type so far, it is an error.
-	return yaml_parser_set_scanner_error(parser,
-		"while scanning for the next token", parser.mark,
-		"found character that cannot start any token")
-}
-
-// Check the list of potential simple keys and remove the positions that
-// cannot contain simple keys anymore.
-func yaml_parser_stale_simple_keys(parser *yaml_parser_t) bool {
-	// Check for a potential simple key for each flow level.
-	for i := range parser.simple_keys {
-		simple_key := &parser.simple_keys[i]
-
-		// The specification requires that a simple key
-		//
-		//  - is limited to a single line,
-		//  - is shorter than 1024 characters.
-		if simple_key.possible && (simple_key.mark.line < parser.mark.line || simple_key.mark.index+1024 < parser.mark.index) {
-
-			// Check if the potential simple key to be removed is required.
-			if simple_key.required {
-				return yaml_parser_set_scanner_error(parser,
-					"while scanning a simple key", simple_key.mark,
-					"could not find expected ':'")
-			}
-			simple_key.possible = false
-		}
-	}
-	return true
-}
-
-// Check if a simple key may start at the current position and add it if
-// needed.
-func yaml_parser_save_simple_key(parser *yaml_parser_t) bool {
-	// A simple key is required at the current position if the scanner is in
-	// the block context and the current column coincides with the indentation
-	// level.
-
-	required := parser.flow_level == 0 && parser.indent == parser.mark.column
-
-	// A simple key is required only when it is the first token in the current
-	// line.  Therefore it is always allowed.  But we add a check anyway.
-	if required && !parser.simple_key_allowed {
-		panic("should not happen")
-	}
-
-	//
-	// If the current position may start a simple key, save it.
-	//
-	if parser.simple_key_allowed {
-		simple_key := yaml_simple_key_t{
-			possible:     true,
-			required:     required,
-			token_number: parser.tokens_parsed + (len(parser.tokens) - parser.tokens_head),
-		}
-		simple_key.mark = parser.mark
-
-		if !yaml_parser_remove_simple_key(parser) {
-			return false
-		}
-		parser.simple_keys[len(parser.simple_keys)-1] = simple_key
-	}
-	return true
-}
-
-// Remove a potential simple key at the current flow level.
-func yaml_parser_remove_simple_key(parser *yaml_parser_t) bool {
-	i := len(parser.simple_keys) - 1
-	if parser.simple_keys[i].possible {
-		// If the key is required, it is an error.
-		if parser.simple_keys[i].required {
-			return yaml_parser_set_scanner_error(parser,
-				"while scanning a simple key", parser.simple_keys[i].mark,
-				"could not find expected ':'")
-		}
-	}
-	// Remove the key from the stack.
-	parser.simple_keys[i].possible = false
-	return true
-}
-
-// Increase the flow level and resize the simple key list if needed.
-func yaml_parser_increase_flow_level(parser *yaml_parser_t) bool {
-	// Reset the simple key on the next level.
-	parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{})
-
-	// Increase the flow level.
-	parser.flow_level++
-	return true
-}
-
-// Decrease the flow level.
-func yaml_parser_decrease_flow_level(parser *yaml_parser_t) bool {
-	if parser.flow_level > 0 {
-		parser.flow_level--
-		parser.simple_keys = parser.simple_keys[:len(parser.simple_keys)-1]
-	}
-	return true
-}
-
-// Push the current indentation level to the stack and set the new level
-// the current column is greater than the indentation level.  In this case,
-// append or insert the specified token into the token queue.
-func yaml_parser_roll_indent(parser *yaml_parser_t, column, number int, typ yaml_token_type_t, mark yaml_mark_t) bool {
-	// In the flow context, do nothing.
-	if parser.flow_level > 0 {
-		return true
-	}
-
-	if parser.indent < column {
-		// Push the current indentation level to the stack and set the new
-		// indentation level.
-		parser.indents = append(parser.indents, parser.indent)
-		parser.indent = column
-
-		// Create a token and insert it into the queue.
-		token := yaml_token_t{
-			typ:        typ,
-			start_mark: mark,
-			end_mark:   mark,
-		}
-		if number > -1 {
-			number -= parser.tokens_parsed
-		}
-		yaml_insert_token(parser, number, &token)
-	}
-	return true
-}
-
-// Pop indentation levels from the indents stack until the current level
-// becomes less or equal to the column.  For each indentation level, append
-// the BLOCK-END token.
-func yaml_parser_unroll_indent(parser *yaml_parser_t, column int) bool {
-	// In the flow context, do nothing.
-	if parser.flow_level > 0 {
-		return true
-	}
-
-	// Loop through the indentation levels in the stack.
-	for parser.indent > column {
-		// Create a token and append it to the queue.
-		token := yaml_token_t{
-			typ:        yaml_BLOCK_END_TOKEN,
-			start_mark: parser.mark,
-			end_mark:   parser.mark,
-		}
-		yaml_insert_token(parser, -1, &token)
-
-		// Pop the indentation level.
-		parser.indent = parser.indents[len(parser.indents)-1]
-		parser.indents = parser.indents[:len(parser.indents)-1]
-	}
-	return true
-}
-
-// Initialize the scanner and produce the STREAM-START token.
-func yaml_parser_fetch_stream_start(parser *yaml_parser_t) bool {
-
-	// Set the initial indentation.
-	parser.indent = -1
-
-	// Initialize the simple key stack.
-	parser.simple_keys = append(parser.simple_keys, yaml_simple_key_t{})
-
-	// A simple key is allowed at the beginning of the stream.
-	parser.simple_key_allowed = true
-
-	// We have started.
-	parser.stream_start_produced = true
-
-	// Create the STREAM-START token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_STREAM_START_TOKEN,
-		start_mark: parser.mark,
-		end_mark:   parser.mark,
-		encoding:   parser.encoding,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the STREAM-END token and shut down the scanner.
-func yaml_parser_fetch_stream_end(parser *yaml_parser_t) bool {
-
-	// Force new line.
-	if parser.mark.column != 0 {
-		parser.mark.column = 0
-		parser.mark.line++
-	}
-
-	// Reset the indentation level.
-	if !yaml_parser_unroll_indent(parser, -1) {
-		return false
-	}
-
-	// Reset simple keys.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	parser.simple_key_allowed = false
-
-	// Create the STREAM-END token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_STREAM_END_TOKEN,
-		start_mark: parser.mark,
-		end_mark:   parser.mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce a VERSION-DIRECTIVE or TAG-DIRECTIVE token.
-func yaml_parser_fetch_directive(parser *yaml_parser_t) bool {
-	// Reset the indentation level.
-	if !yaml_parser_unroll_indent(parser, -1) {
-		return false
-	}
-
-	// Reset simple keys.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	parser.simple_key_allowed = false
-
-	// Create the YAML-DIRECTIVE or TAG-DIRECTIVE token.
-	token := yaml_token_t{}
-	if !yaml_parser_scan_directive(parser, &token) {
-		return false
-	}
-	// Append the token to the queue.
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the DOCUMENT-START or DOCUMENT-END token.
-func yaml_parser_fetch_document_indicator(parser *yaml_parser_t, typ yaml_token_type_t) bool {
-	// Reset the indentation level.
-	if !yaml_parser_unroll_indent(parser, -1) {
-		return false
-	}
-
-	// Reset simple keys.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	parser.simple_key_allowed = false
-
-	// Consume the token.
-	start_mark := parser.mark
-
-	skip(parser)
-	skip(parser)
-	skip(parser)
-
-	end_mark := parser.mark
-
-	// Create the DOCUMENT-START or DOCUMENT-END token.
-	token := yaml_token_t{
-		typ:        typ,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	// Append the token to the queue.
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the FLOW-SEQUENCE-START or FLOW-MAPPING-START token.
-func yaml_parser_fetch_flow_collection_start(parser *yaml_parser_t, typ yaml_token_type_t) bool {
-	// The indicators '[' and '{' may start a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// Increase the flow level.
-	if !yaml_parser_increase_flow_level(parser) {
-		return false
-	}
-
-	// A simple key may follow the indicators '[' and '{'.
-	parser.simple_key_allowed = true
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the FLOW-SEQUENCE-START of FLOW-MAPPING-START token.
-	token := yaml_token_t{
-		typ:        typ,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	// Append the token to the queue.
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the FLOW-SEQUENCE-END or FLOW-MAPPING-END token.
-func yaml_parser_fetch_flow_collection_end(parser *yaml_parser_t, typ yaml_token_type_t) bool {
-	// Reset any potential simple key on the current flow level.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// Decrease the flow level.
-	if !yaml_parser_decrease_flow_level(parser) {
-		return false
-	}
-
-	// No simple keys after the indicators ']' and '}'.
-	parser.simple_key_allowed = false
-
-	// Consume the token.
-
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the FLOW-SEQUENCE-END of FLOW-MAPPING-END token.
-	token := yaml_token_t{
-		typ:        typ,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	// Append the token to the queue.
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the FLOW-ENTRY token.
-func yaml_parser_fetch_flow_entry(parser *yaml_parser_t) bool {
-	// Reset any potential simple keys on the current flow level.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// Simple keys are allowed after ','.
-	parser.simple_key_allowed = true
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the FLOW-ENTRY token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_FLOW_ENTRY_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the BLOCK-ENTRY token.
-func yaml_parser_fetch_block_entry(parser *yaml_parser_t) bool {
-	// Check if the scanner is in the block context.
-	if parser.flow_level == 0 {
-		// Check if we are allowed to start a new entry.
-		if !parser.simple_key_allowed {
-			return yaml_parser_set_scanner_error(parser, "", parser.mark,
-				"block sequence entries are not allowed in this context")
-		}
-		// Add the BLOCK-SEQUENCE-START token if needed.
-		if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_SEQUENCE_START_TOKEN, parser.mark) {
-			return false
-		}
-	} else {
-		// It is an error for the '-' indicator to occur in the flow context,
-		// but we let the Parser detect and report about it because the Parser
-		// is able to point to the context.
-	}
-
-	// Reset any potential simple keys on the current flow level.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// Simple keys are allowed after '-'.
-	parser.simple_key_allowed = true
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the BLOCK-ENTRY token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_BLOCK_ENTRY_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the KEY token.
-func yaml_parser_fetch_key(parser *yaml_parser_t) bool {
-
-	// In the block context, additional checks are required.
-	if parser.flow_level == 0 {
-		// Check if we are allowed to start a new key (not nessesary simple).
-		if !parser.simple_key_allowed {
-			return yaml_parser_set_scanner_error(parser, "", parser.mark,
-				"mapping keys are not allowed in this context")
-		}
-		// Add the BLOCK-MAPPING-START token if needed.
-		if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_MAPPING_START_TOKEN, parser.mark) {
-			return false
-		}
-	}
-
-	// Reset any potential simple keys on the current flow level.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// Simple keys are allowed after '?' in the block context.
-	parser.simple_key_allowed = parser.flow_level == 0
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the KEY token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_KEY_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the VALUE token.
-func yaml_parser_fetch_value(parser *yaml_parser_t) bool {
-
-	simple_key := &parser.simple_keys[len(parser.simple_keys)-1]
-
-	// Have we found a simple key?
-	if simple_key.possible {
-		// Create the KEY token and insert it into the queue.
-		token := yaml_token_t{
-			typ:        yaml_KEY_TOKEN,
-			start_mark: simple_key.mark,
-			end_mark:   simple_key.mark,
-		}
-		yaml_insert_token(parser, simple_key.token_number-parser.tokens_parsed, &token)
-
-		// In the block context, we may need to add the BLOCK-MAPPING-START token.
-		if !yaml_parser_roll_indent(parser, simple_key.mark.column,
-			simple_key.token_number,
-			yaml_BLOCK_MAPPING_START_TOKEN, simple_key.mark) {
-			return false
-		}
-
-		// Remove the simple key.
-		simple_key.possible = false
-
-		// A simple key cannot follow another simple key.
-		parser.simple_key_allowed = false
-
-	} else {
-		// The ':' indicator follows a complex key.
-
-		// In the block context, extra checks are required.
-		if parser.flow_level == 0 {
-
-			// Check if we are allowed to start a complex value.
-			if !parser.simple_key_allowed {
-				return yaml_parser_set_scanner_error(parser, "", parser.mark,
-					"mapping values are not allowed in this context")
-			}
-
-			// Add the BLOCK-MAPPING-START token if needed.
-			if !yaml_parser_roll_indent(parser, parser.mark.column, -1, yaml_BLOCK_MAPPING_START_TOKEN, parser.mark) {
-				return false
-			}
-		}
-
-		// Simple keys after ':' are allowed in the block context.
-		parser.simple_key_allowed = parser.flow_level == 0
-	}
-
-	// Consume the token.
-	start_mark := parser.mark
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create the VALUE token and append it to the queue.
-	token := yaml_token_t{
-		typ:        yaml_VALUE_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the ALIAS or ANCHOR token.
-func yaml_parser_fetch_anchor(parser *yaml_parser_t, typ yaml_token_type_t) bool {
-	// An anchor or an alias could be a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// A simple key cannot follow an anchor or an alias.
-	parser.simple_key_allowed = false
-
-	// Create the ALIAS or ANCHOR token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_anchor(parser, &token, typ) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the TAG token.
-func yaml_parser_fetch_tag(parser *yaml_parser_t) bool {
-	// A tag could be a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// A simple key cannot follow a tag.
-	parser.simple_key_allowed = false
-
-	// Create the TAG token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_tag(parser, &token) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the SCALAR(...,literal) or SCALAR(...,folded) tokens.
-func yaml_parser_fetch_block_scalar(parser *yaml_parser_t, literal bool) bool {
-	// Remove any potential simple keys.
-	if !yaml_parser_remove_simple_key(parser) {
-		return false
-	}
-
-	// A simple key may follow a block scalar.
-	parser.simple_key_allowed = true
-
-	// Create the SCALAR token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_block_scalar(parser, &token, literal) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the SCALAR(...,single-quoted) or SCALAR(...,double-quoted) tokens.
-func yaml_parser_fetch_flow_scalar(parser *yaml_parser_t, single bool) bool {
-	// A plain scalar could be a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// A simple key cannot follow a flow scalar.
-	parser.simple_key_allowed = false
-
-	// Create the SCALAR token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_flow_scalar(parser, &token, single) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Produce the SCALAR(...,plain) token.
-func yaml_parser_fetch_plain_scalar(parser *yaml_parser_t) bool {
-	// A plain scalar could be a simple key.
-	if !yaml_parser_save_simple_key(parser) {
-		return false
-	}
-
-	// A simple key cannot follow a flow scalar.
-	parser.simple_key_allowed = false
-
-	// Create the SCALAR token and append it to the queue.
-	var token yaml_token_t
-	if !yaml_parser_scan_plain_scalar(parser, &token) {
-		return false
-	}
-	yaml_insert_token(parser, -1, &token)
-	return true
-}
-
-// Eat whitespaces and comments until the next token is found.
-func yaml_parser_scan_to_next_token(parser *yaml_parser_t) bool {
-
-	// Until the next token is not found.
-	for {
-		// Allow the BOM mark to start a line.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		if parser.mark.column == 0 && is_bom(parser.buffer, parser.buffer_pos) {
-			skip(parser)
-		}
-
-		// Eat whitespaces.
-		// Tabs are allowed:
-		//  - in the flow context
-		//  - in the block context, but not at the beginning of the line or
-		//  after '-', '?', or ':' (complex value).
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-
-		for parser.buffer[parser.buffer_pos] == ' ' || ((parser.flow_level > 0 || !parser.simple_key_allowed) && parser.buffer[parser.buffer_pos] == '\t') {
-			skip(parser)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-
-		// Eat a comment until a line break.
-		if parser.buffer[parser.buffer_pos] == '#' {
-			for !is_breakz(parser.buffer, parser.buffer_pos) {
-				skip(parser)
-				if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-					return false
-				}
-			}
-		}
-
-		// If it is a line break, eat it.
-		if is_break(parser.buffer, parser.buffer_pos) {
-			if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-				return false
-			}
-			skip_line(parser)
-
-			// In the block context, a new line may start a simple key.
-			if parser.flow_level == 0 {
-				parser.simple_key_allowed = true
-			}
-		} else {
-			break // We have found a token.
-		}
-	}
-
-	return true
-}
-
-// Scan a YAML-DIRECTIVE or TAG-DIRECTIVE token.
-//
-// Scope:
-//      %YAML    1.1    # a comment \n
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-//      %TAG    !yaml!  tag:yaml.org,2002:  \n
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-//
-func yaml_parser_scan_directive(parser *yaml_parser_t, token *yaml_token_t) bool {
-	// Eat '%'.
-	start_mark := parser.mark
-	skip(parser)
-
-	// Scan the directive name.
-	var name []byte
-	if !yaml_parser_scan_directive_name(parser, start_mark, &name) {
-		return false
-	}
-
-	// Is it a YAML directive?
-	if bytes.Equal(name, []byte("YAML")) {
-		// Scan the VERSION directive value.
-		var major, minor int8
-		if !yaml_parser_scan_version_directive_value(parser, start_mark, &major, &minor) {
-			return false
-		}
-		end_mark := parser.mark
-
-		// Create a VERSION-DIRECTIVE token.
-		*token = yaml_token_t{
-			typ:        yaml_VERSION_DIRECTIVE_TOKEN,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			major:      major,
-			minor:      minor,
-		}
-
-		// Is it a TAG directive?
-	} else if bytes.Equal(name, []byte("TAG")) {
-		// Scan the TAG directive value.
-		var handle, prefix []byte
-		if !yaml_parser_scan_tag_directive_value(parser, start_mark, &handle, &prefix) {
-			return false
-		}
-		end_mark := parser.mark
-
-		// Create a TAG-DIRECTIVE token.
-		*token = yaml_token_t{
-			typ:        yaml_TAG_DIRECTIVE_TOKEN,
-			start_mark: start_mark,
-			end_mark:   end_mark,
-			value:      handle,
-			prefix:     prefix,
-		}
-
-		// Unknown directive.
-	} else {
-		yaml_parser_set_scanner_error(parser, "while scanning a directive",
-			start_mark, "found unknown directive name")
-		return false
-	}
-
-	// Eat the rest of the line including any comments.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	if parser.buffer[parser.buffer_pos] == '#' {
-		for !is_breakz(parser.buffer, parser.buffer_pos) {
-			skip(parser)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-	}
-
-	// Check if we are at the end of the line.
-	if !is_breakz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a directive",
-			start_mark, "did not find expected comment or line break")
-		return false
-	}
-
-	// Eat a line break.
-	if is_break(parser.buffer, parser.buffer_pos) {
-		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-			return false
-		}
-		skip_line(parser)
-	}
-
-	return true
-}
-
-// Scan the directive name.
-//
-// Scope:
-//      %YAML   1.1     # a comment \n
-//       ^^^^
-//      %TAG    !yaml!  tag:yaml.org,2002:  \n
-//       ^^^
-//
-func yaml_parser_scan_directive_name(parser *yaml_parser_t, start_mark yaml_mark_t, name *[]byte) bool {
-	// Consume the directive name.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	var s []byte
-	for is_alpha(parser.buffer, parser.buffer_pos) {
-		s = read(parser, s)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Check if the name is empty.
-	if len(s) == 0 {
-		yaml_parser_set_scanner_error(parser, "while scanning a directive",
-			start_mark, "could not find expected directive name")
-		return false
-	}
-
-	// Check for an blank character after the name.
-	if !is_blankz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a directive",
-			start_mark, "found unexpected non-alphabetical character")
-		return false
-	}
-	*name = s
-	return true
-}
-
-// Scan the value of VERSION-DIRECTIVE.
-//
-// Scope:
-//      %YAML   1.1     # a comment \n
-//           ^^^^^^
-func yaml_parser_scan_version_directive_value(parser *yaml_parser_t, start_mark yaml_mark_t, major, minor *int8) bool {
-	// Eat whitespaces.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Consume the major version number.
-	if !yaml_parser_scan_version_directive_number(parser, start_mark, major) {
-		return false
-	}
-
-	// Eat '.'.
-	if parser.buffer[parser.buffer_pos] != '.' {
-		return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
-			start_mark, "did not find expected digit or '.' character")
-	}
-
-	skip(parser)
-
-	// Consume the minor version number.
-	if !yaml_parser_scan_version_directive_number(parser, start_mark, minor) {
-		return false
-	}
-	return true
-}
-
-const max_number_length = 2
-
-// Scan the version number of VERSION-DIRECTIVE.
-//
-// Scope:
-//      %YAML   1.1     # a comment \n
-//              ^
-//      %YAML   1.1     # a comment \n
-//                ^
-func yaml_parser_scan_version_directive_number(parser *yaml_parser_t, start_mark yaml_mark_t, number *int8) bool {
-
-	// Repeat while the next character is digit.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	var value, length int8
-	for is_digit(parser.buffer, parser.buffer_pos) {
-		// Check if the number is too long.
-		length++
-		if length > max_number_length {
-			return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
-				start_mark, "found extremely long version number")
-		}
-		value = value*10 + int8(as_digit(parser.buffer, parser.buffer_pos))
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Check if the number was present.
-	if length == 0 {
-		return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
-			start_mark, "did not find expected version number")
-	}
-	*number = value
-	return true
-}
-
-// Scan the value of a TAG-DIRECTIVE token.
-//
-// Scope:
-//      %TAG    !yaml!  tag:yaml.org,2002:  \n
-//          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-//
-func yaml_parser_scan_tag_directive_value(parser *yaml_parser_t, start_mark yaml_mark_t, handle, prefix *[]byte) bool {
-	var handle_value, prefix_value []byte
-
-	// Eat whitespaces.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Scan a handle.
-	if !yaml_parser_scan_tag_handle(parser, true, start_mark, &handle_value) {
-		return false
-	}
-
-	// Expect a whitespace.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	if !is_blank(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive",
-			start_mark, "did not find expected whitespace")
-		return false
-	}
-
-	// Eat whitespaces.
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Scan a prefix.
-	if !yaml_parser_scan_tag_uri(parser, true, nil, start_mark, &prefix_value) {
-		return false
-	}
-
-	// Expect a whitespace or line break.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	if !is_blankz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive",
-			start_mark, "did not find expected whitespace or line break")
-		return false
-	}
-
-	*handle = handle_value
-	*prefix = prefix_value
-	return true
-}
-
-func yaml_parser_scan_anchor(parser *yaml_parser_t, token *yaml_token_t, typ yaml_token_type_t) bool {
-	var s []byte
-
-	// Eat the indicator character.
-	start_mark := parser.mark
-	skip(parser)
-
-	// Consume the value.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	for is_alpha(parser.buffer, parser.buffer_pos) {
-		s = read(parser, s)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	end_mark := parser.mark
-
-	/*
-	 * Check if length of the anchor is greater than 0 and it is followed by
-	 * a whitespace character or one of the indicators:
-	 *
-	 *      '?', ':', ',', ']', '}', '%', '@', '`'.
-	 */
-
-	if len(s) == 0 ||
-		!(is_blankz(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == '?' ||
-			parser.buffer[parser.buffer_pos] == ':' || parser.buffer[parser.buffer_pos] == ',' ||
-			parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '}' ||
-			parser.buffer[parser.buffer_pos] == '%' || parser.buffer[parser.buffer_pos] == '@' ||
-			parser.buffer[parser.buffer_pos] == '`') {
-		context := "while scanning an alias"
-		if typ == yaml_ANCHOR_TOKEN {
-			context = "while scanning an anchor"
-		}
-		yaml_parser_set_scanner_error(parser, context, start_mark,
-			"did not find expected alphabetic or numeric character")
-		return false
-	}
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        typ,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      s,
-	}
-
-	return true
-}
-
-/*
- * Scan a TAG token.
- */
-
-func yaml_parser_scan_tag(parser *yaml_parser_t, token *yaml_token_t) bool {
-	var handle, suffix []byte
-
-	start_mark := parser.mark
-
-	// Check if the tag is in the canonical form.
-	if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-		return false
-	}
-
-	if parser.buffer[parser.buffer_pos+1] == '<' {
-		// Keep the handle as ''
-
-		// Eat '!<'
-		skip(parser)
-		skip(parser)
-
-		// Consume the tag value.
-		if !yaml_parser_scan_tag_uri(parser, false, nil, start_mark, &suffix) {
-			return false
-		}
-
-		// Check for '>' and eat it.
-		if parser.buffer[parser.buffer_pos] != '>' {
-			yaml_parser_set_scanner_error(parser, "while scanning a tag",
-				start_mark, "did not find the expected '>'")
-			return false
-		}
-
-		skip(parser)
-	} else {
-		// The tag has either the '!suffix' or the '!handle!suffix' form.
-
-		// First, try to scan a handle.
-		if !yaml_parser_scan_tag_handle(parser, false, start_mark, &handle) {
-			return false
-		}
-
-		// Check if it is, indeed, handle.
-		if handle[0] == '!' && len(handle) > 1 && handle[len(handle)-1] == '!' {
-			// Scan the suffix now.
-			if !yaml_parser_scan_tag_uri(parser, false, nil, start_mark, &suffix) {
-				return false
-			}
-		} else {
-			// It wasn't a handle after all.  Scan the rest of the tag.
-			if !yaml_parser_scan_tag_uri(parser, false, handle, start_mark, &suffix) {
-				return false
-			}
-
-			// Set the handle to '!'.
-			handle = []byte{'!'}
-
-			// A special case: the '!' tag.  Set the handle to '' and the
-			// suffix to '!'.
-			if len(suffix) == 0 {
-				handle, suffix = suffix, handle
-			}
-		}
-	}
-
-	// Check the character which ends the tag.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	if !is_blankz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a tag",
-			start_mark, "did not find expected whitespace or line break")
-		return false
-	}
-
-	end_mark := parser.mark
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        yaml_TAG_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      handle,
-		suffix:     suffix,
-	}
-	return true
-}
-
-// Scan a tag handle.
-func yaml_parser_scan_tag_handle(parser *yaml_parser_t, directive bool, start_mark yaml_mark_t, handle *[]byte) bool {
-	// Check the initial '!' character.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	if parser.buffer[parser.buffer_pos] != '!' {
-		yaml_parser_set_scanner_tag_error(parser, directive,
-			start_mark, "did not find expected '!'")
-		return false
-	}
-
-	var s []byte
-
-	// Copy the '!' character.
-	s = read(parser, s)
-
-	// Copy all subsequent alphabetical and numerical characters.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	for is_alpha(parser.buffer, parser.buffer_pos) {
-		s = read(parser, s)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-
-	// Check if the trailing character is '!' and copy it.
-	if parser.buffer[parser.buffer_pos] == '!' {
-		s = read(parser, s)
-	} else {
-		// It's either the '!' tag or not really a tag handle.  If it's a %TAG
-		// directive, it's an error.  If it's a tag token, it must be a part of URI.
-		if directive && string(s) != "!" {
-			yaml_parser_set_scanner_tag_error(parser, directive,
-				start_mark, "did not find expected '!'")
-			return false
-		}
-	}
-
-	*handle = s
-	return true
-}
-
-// Scan a tag.
-func yaml_parser_scan_tag_uri(parser *yaml_parser_t, directive bool, head []byte, start_mark yaml_mark_t, uri *[]byte) bool {
-	//size_t length = head ? strlen((char *)head) : 0
-	var s []byte
-	hasTag := len(head) > 0
-
-	// Copy the head if needed.
-	//
-	// Note that we don't copy the leading '!' character.
-	if len(head) > 1 {
-		s = append(s, head[1:]...)
-	}
-
-	// Scan the tag.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	// The set of characters that may appear in URI is as follows:
-	//
-	//      '0'-'9', 'A'-'Z', 'a'-'z', '_', '-', ';', '/', '?', ':', '@', '&',
-	//      '=', '+', '$', ',', '.', '!', '~', '*', '\'', '(', ')', '[', ']',
-	//      '%'.
-	// [Go] Convert this into more reasonable logic.
-	for is_alpha(parser.buffer, parser.buffer_pos) || parser.buffer[parser.buffer_pos] == ';' ||
-		parser.buffer[parser.buffer_pos] == '/' || parser.buffer[parser.buffer_pos] == '?' ||
-		parser.buffer[parser.buffer_pos] == ':' || parser.buffer[parser.buffer_pos] == '@' ||
-		parser.buffer[parser.buffer_pos] == '&' || parser.buffer[parser.buffer_pos] == '=' ||
-		parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '$' ||
-		parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == '.' ||
-		parser.buffer[parser.buffer_pos] == '!' || parser.buffer[parser.buffer_pos] == '~' ||
-		parser.buffer[parser.buffer_pos] == '*' || parser.buffer[parser.buffer_pos] == '\'' ||
-		parser.buffer[parser.buffer_pos] == '(' || parser.buffer[parser.buffer_pos] == ')' ||
-		parser.buffer[parser.buffer_pos] == '[' || parser.buffer[parser.buffer_pos] == ']' ||
-		parser.buffer[parser.buffer_pos] == '%' {
-		// Check if it is a URI-escape sequence.
-		if parser.buffer[parser.buffer_pos] == '%' {
-			if !yaml_parser_scan_uri_escapes(parser, directive, start_mark, &s) {
-				return false
-			}
-		} else {
-			s = read(parser, s)
-		}
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		hasTag = true
-	}
-
-	if !hasTag {
-		yaml_parser_set_scanner_tag_error(parser, directive,
-			start_mark, "did not find expected tag URI")
-		return false
-	}
-	*uri = s
-	return true
-}
-
-// Decode an URI-escape sequence corresponding to a single UTF-8 character.
-func yaml_parser_scan_uri_escapes(parser *yaml_parser_t, directive bool, start_mark yaml_mark_t, s *[]byte) bool {
-
-	// Decode the required number of characters.
-	w := 1024
-	for w > 0 {
-		// Check for a URI-escaped octet.
-		if parser.unread < 3 && !yaml_parser_update_buffer(parser, 3) {
-			return false
-		}
-
-		if !(parser.buffer[parser.buffer_pos] == '%' &&
-			is_hex(parser.buffer, parser.buffer_pos+1) &&
-			is_hex(parser.buffer, parser.buffer_pos+2)) {
-			return yaml_parser_set_scanner_tag_error(parser, directive,
-				start_mark, "did not find URI escaped octet")
-		}
-
-		// Get the octet.
-		octet := byte((as_hex(parser.buffer, parser.buffer_pos+1) << 4) + as_hex(parser.buffer, parser.buffer_pos+2))
-
-		// If it is the leading octet, determine the length of the UTF-8 sequence.
-		if w == 1024 {
-			w = width(octet)
-			if w == 0 {
-				return yaml_parser_set_scanner_tag_error(parser, directive,
-					start_mark, "found an incorrect leading UTF-8 octet")
-			}
-		} else {
-			// Check if the trailing octet is correct.
-			if octet&0xC0 != 0x80 {
-				return yaml_parser_set_scanner_tag_error(parser, directive,
-					start_mark, "found an incorrect trailing UTF-8 octet")
-			}
-		}
-
-		// Copy the octet and move the pointers.
-		*s = append(*s, octet)
-		skip(parser)
-		skip(parser)
-		skip(parser)
-		w--
-	}
-	return true
-}
-
-// Scan a block scalar.
-func yaml_parser_scan_block_scalar(parser *yaml_parser_t, token *yaml_token_t, literal bool) bool {
-	// Eat the indicator '|' or '>'.
-	start_mark := parser.mark
-	skip(parser)
-
-	// Scan the additional block scalar indicators.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-
-	// Check for a chomping indicator.
-	var chomping, increment int
-	if parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '-' {
-		// Set the chomping method and eat the indicator.
-		if parser.buffer[parser.buffer_pos] == '+' {
-			chomping = +1
-		} else {
-			chomping = -1
-		}
-		skip(parser)
-
-		// Check for an indentation indicator.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		if is_digit(parser.buffer, parser.buffer_pos) {
-			// Check that the indentation is greater than 0.
-			if parser.buffer[parser.buffer_pos] == '0' {
-				yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-					start_mark, "found an indentation indicator equal to 0")
-				return false
-			}
-
-			// Get the indentation level and eat the indicator.
-			increment = as_digit(parser.buffer, parser.buffer_pos)
-			skip(parser)
-		}
-
-	} else if is_digit(parser.buffer, parser.buffer_pos) {
-		// Do the same as above, but in the opposite order.
-
-		if parser.buffer[parser.buffer_pos] == '0' {
-			yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-				start_mark, "found an indentation indicator equal to 0")
-			return false
-		}
-		increment = as_digit(parser.buffer, parser.buffer_pos)
-		skip(parser)
-
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		if parser.buffer[parser.buffer_pos] == '+' || parser.buffer[parser.buffer_pos] == '-' {
-			if parser.buffer[parser.buffer_pos] == '+' {
-				chomping = +1
-			} else {
-				chomping = -1
-			}
-			skip(parser)
-		}
-	}
-
-	// Eat whitespaces and comments to the end of the line.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	for is_blank(parser.buffer, parser.buffer_pos) {
-		skip(parser)
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-	}
-	if parser.buffer[parser.buffer_pos] == '#' {
-		for !is_breakz(parser.buffer, parser.buffer_pos) {
-			skip(parser)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-	}
-
-	// Check if we are at the end of the line.
-	if !is_breakz(parser.buffer, parser.buffer_pos) {
-		yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-			start_mark, "did not find expected comment or line break")
-		return false
-	}
-
-	// Eat a line break.
-	if is_break(parser.buffer, parser.buffer_pos) {
-		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-			return false
-		}
-		skip_line(parser)
-	}
-
-	end_mark := parser.mark
-
-	// Set the indentation level if it was specified.
-	var indent int
-	if increment > 0 {
-		if parser.indent >= 0 {
-			indent = parser.indent + increment
-		} else {
-			indent = increment
-		}
-	}
-
-	// Scan the leading line breaks and determine the indentation level if needed.
-	var s, leading_break, trailing_breaks []byte
-	if !yaml_parser_scan_block_scalar_breaks(parser, &indent, &trailing_breaks, start_mark, &end_mark) {
-		return false
-	}
-
-	// Scan the block scalar content.
-	if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-		return false
-	}
-	var leading_blank, trailing_blank bool
-	for parser.mark.column == indent && !is_z(parser.buffer, parser.buffer_pos) {
-		// We are at the beginning of a non-empty line.
-
-		// Is it a trailing whitespace?
-		trailing_blank = is_blank(parser.buffer, parser.buffer_pos)
-
-		// Check if we need to fold the leading line break.
-		if !literal && !leading_blank && !trailing_blank && len(leading_break) > 0 && leading_break[0] == '\n' {
-			// Do we need to join the lines by space?
-			if len(trailing_breaks) == 0 {
-				s = append(s, ' ')
-			}
-		} else {
-			s = append(s, leading_break...)
-		}
-		leading_break = leading_break[:0]
-
-		// Append the remaining line breaks.
-		s = append(s, trailing_breaks...)
-		trailing_breaks = trailing_breaks[:0]
-
-		// Is it a leading whitespace?
-		leading_blank = is_blank(parser.buffer, parser.buffer_pos)
-
-		// Consume the current line.
-		for !is_breakz(parser.buffer, parser.buffer_pos) {
-			s = read(parser, s)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-
-		// Consume the line break.
-		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-			return false
-		}
-
-		leading_break = read_line(parser, leading_break)
-
-		// Eat the following indentation spaces and line breaks.
-		if !yaml_parser_scan_block_scalar_breaks(parser, &indent, &trailing_breaks, start_mark, &end_mark) {
-			return false
-		}
-	}
-
-	// Chomp the tail.
-	if chomping != -1 {
-		s = append(s, leading_break...)
-	}
-	if chomping == 1 {
-		s = append(s, trailing_breaks...)
-	}
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        yaml_SCALAR_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      s,
-		style:      yaml_LITERAL_SCALAR_STYLE,
-	}
-	if !literal {
-		token.style = yaml_FOLDED_SCALAR_STYLE
-	}
-	return true
-}
-
-// Scan indentation spaces and line breaks for a block scalar.  Determine the
-// indentation level if needed.
-func yaml_parser_scan_block_scalar_breaks(parser *yaml_parser_t, indent *int, breaks *[]byte, start_mark yaml_mark_t, end_mark *yaml_mark_t) bool {
-	*end_mark = parser.mark
-
-	// Eat the indentation spaces and line breaks.
-	max_indent := 0
-	for {
-		// Eat the indentation spaces.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-		for (*indent == 0 || parser.mark.column < *indent) && is_space(parser.buffer, parser.buffer_pos) {
-			skip(parser)
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-		if parser.mark.column > max_indent {
-			max_indent = parser.mark.column
-		}
-
-		// Check for a tab character messing the indentation.
-		if (*indent == 0 || parser.mark.column < *indent) && is_tab(parser.buffer, parser.buffer_pos) {
-			return yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-				start_mark, "found a tab character where an indentation space is expected")
-		}
-
-		// Have we found a non-empty line?
-		if !is_break(parser.buffer, parser.buffer_pos) {
-			break
-		}
-
-		// Consume the line break.
-		if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-			return false
-		}
-		// [Go] Should really be returning breaks instead.
-		*breaks = read_line(parser, *breaks)
-		*end_mark = parser.mark
-	}
-
-	// Determine the indentation level if needed.
-	if *indent == 0 {
-		*indent = max_indent
-		if *indent < parser.indent+1 {
-			*indent = parser.indent + 1
-		}
-		if *indent < 1 {
-			*indent = 1
-		}
-	}
-	return true
-}
-
-// Scan a quoted scalar.
-func yaml_parser_scan_flow_scalar(parser *yaml_parser_t, token *yaml_token_t, single bool) bool {
-	// Eat the left quote.
-	start_mark := parser.mark
-	skip(parser)
-
-	// Consume the content of the quoted scalar.
-	var s, leading_break, trailing_breaks, whitespaces []byte
-	for {
-		// Check that there are no document indicators at the beginning of the line.
-		if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) {
-			return false
-		}
-
-		if parser.mark.column == 0 &&
-			((parser.buffer[parser.buffer_pos+0] == '-' &&
-				parser.buffer[parser.buffer_pos+1] == '-' &&
-				parser.buffer[parser.buffer_pos+2] == '-') ||
-				(parser.buffer[parser.buffer_pos+0] == '.' &&
-					parser.buffer[parser.buffer_pos+1] == '.' &&
-					parser.buffer[parser.buffer_pos+2] == '.')) &&
-			is_blankz(parser.buffer, parser.buffer_pos+3) {
-			yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar",
-				start_mark, "found unexpected document indicator")
-			return false
-		}
-
-		// Check for EOF.
-		if is_z(parser.buffer, parser.buffer_pos) {
-			yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar",
-				start_mark, "found unexpected end of stream")
-			return false
-		}
-
-		// Consume non-blank characters.
-		leading_blanks := false
-		for !is_blankz(parser.buffer, parser.buffer_pos) {
-			if single && parser.buffer[parser.buffer_pos] == '\'' && parser.buffer[parser.buffer_pos+1] == '\'' {
-				// Is is an escaped single quote.
-				s = append(s, '\'')
-				skip(parser)
-				skip(parser)
-
-			} else if single && parser.buffer[parser.buffer_pos] == '\'' {
-				// It is a right single quote.
-				break
-			} else if !single && parser.buffer[parser.buffer_pos] == '"' {
-				// It is a right double quote.
-				break
-
-			} else if !single && parser.buffer[parser.buffer_pos] == '\\' && is_break(parser.buffer, parser.buffer_pos+1) {
-				// It is an escaped line break.
-				if parser.unread < 3 && !yaml_parser_update_buffer(parser, 3) {
-					return false
-				}
-				skip(parser)
-				skip_line(parser)
-				leading_blanks = true
-				break
-
-			} else if !single && parser.buffer[parser.buffer_pos] == '\\' {
-				// It is an escape sequence.
-				code_length := 0
-
-				// Check the escape character.
-				switch parser.buffer[parser.buffer_pos+1] {
-				case '0':
-					s = append(s, 0)
-				case 'a':
-					s = append(s, '\x07')
-				case 'b':
-					s = append(s, '\x08')
-				case 't', '\t':
-					s = append(s, '\x09')
-				case 'n':
-					s = append(s, '\x0A')
-				case 'v':
-					s = append(s, '\x0B')
-				case 'f':
-					s = append(s, '\x0C')
-				case 'r':
-					s = append(s, '\x0D')
-				case 'e':
-					s = append(s, '\x1B')
-				case ' ':
-					s = append(s, '\x20')
-				case '"':
-					s = append(s, '"')
-				case '\'':
-					s = append(s, '\'')
-				case '\\':
-					s = append(s, '\\')
-				case 'N': // NEL (#x85)
-					s = append(s, '\xC2')
-					s = append(s, '\x85')
-				case '_': // #xA0
-					s = append(s, '\xC2')
-					s = append(s, '\xA0')
-				case 'L': // LS (#x2028)
-					s = append(s, '\xE2')
-					s = append(s, '\x80')
-					s = append(s, '\xA8')
-				case 'P': // PS (#x2029)
-					s = append(s, '\xE2')
-					s = append(s, '\x80')
-					s = append(s, '\xA9')
-				case 'x':
-					code_length = 2
-				case 'u':
-					code_length = 4
-				case 'U':
-					code_length = 8
-				default:
-					yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
-						start_mark, "found unknown escape character")
-					return false
-				}
-
-				skip(parser)
-				skip(parser)
-
-				// Consume an arbitrary escape code.
-				if code_length > 0 {
-					var value int
-
-					// Scan the character value.
-					if parser.unread < code_length && !yaml_parser_update_buffer(parser, code_length) {
-						return false
-					}
-					for k := 0; k < code_length; k++ {
-						if !is_hex(parser.buffer, parser.buffer_pos+k) {
-							yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
-								start_mark, "did not find expected hexdecimal number")
-							return false
-						}
-						value = (value << 4) + as_hex(parser.buffer, parser.buffer_pos+k)
-					}
-
-					// Check the value and write the character.
-					if (value >= 0xD800 && value <= 0xDFFF) || value > 0x10FFFF {
-						yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
-							start_mark, "found invalid Unicode character escape code")
-						return false
-					}
-					if value <= 0x7F {
-						s = append(s, byte(value))
-					} else if value <= 0x7FF {
-						s = append(s, byte(0xC0+(value>>6)))
-						s = append(s, byte(0x80+(value&0x3F)))
-					} else if value <= 0xFFFF {
-						s = append(s, byte(0xE0+(value>>12)))
-						s = append(s, byte(0x80+((value>>6)&0x3F)))
-						s = append(s, byte(0x80+(value&0x3F)))
-					} else {
-						s = append(s, byte(0xF0+(value>>18)))
-						s = append(s, byte(0x80+((value>>12)&0x3F)))
-						s = append(s, byte(0x80+((value>>6)&0x3F)))
-						s = append(s, byte(0x80+(value&0x3F)))
-					}
-
-					// Advance the pointer.
-					for k := 0; k < code_length; k++ {
-						skip(parser)
-					}
-				}
-			} else {
-				// It is a non-escaped non-blank character.
-				s = read(parser, s)
-			}
-			if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-				return false
-			}
-		}
-
-		// Check if we are at the end of the scalar.
-		if single {
-			if parser.buffer[parser.buffer_pos] == '\'' {
-				break
-			}
-		} else {
-			if parser.buffer[parser.buffer_pos] == '"' {
-				break
-			}
-		}
-
-		// Consume blank characters.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-
-		for is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos) {
-			if is_blank(parser.buffer, parser.buffer_pos) {
-				// Consume a space or a tab character.
-				if !leading_blanks {
-					whitespaces = read(parser, whitespaces)
-				} else {
-					skip(parser)
-				}
-			} else {
-				if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-					return false
-				}
-
-				// Check if it is a first line break.
-				if !leading_blanks {
-					whitespaces = whitespaces[:0]
-					leading_break = read_line(parser, leading_break)
-					leading_blanks = true
-				} else {
-					trailing_breaks = read_line(parser, trailing_breaks)
-				}
-			}
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-
-		// Join the whitespaces or fold line breaks.
-		if leading_blanks {
-			// Do we need to fold line breaks?
-			if len(leading_break) > 0 && leading_break[0] == '\n' {
-				if len(trailing_breaks) == 0 {
-					s = append(s, ' ')
-				} else {
-					s = append(s, trailing_breaks...)
-				}
-			} else {
-				s = append(s, leading_break...)
-				s = append(s, trailing_breaks...)
-			}
-			trailing_breaks = trailing_breaks[:0]
-			leading_break = leading_break[:0]
-		} else {
-			s = append(s, whitespaces...)
-			whitespaces = whitespaces[:0]
-		}
-	}
-
-	// Eat the right quote.
-	skip(parser)
-	end_mark := parser.mark
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        yaml_SCALAR_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      s,
-		style:      yaml_SINGLE_QUOTED_SCALAR_STYLE,
-	}
-	if !single {
-		token.style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	}
-	return true
-}
-
-// Scan a plain scalar.
-func yaml_parser_scan_plain_scalar(parser *yaml_parser_t, token *yaml_token_t) bool {
-
-	var s, leading_break, trailing_breaks, whitespaces []byte
-	var leading_blanks bool
-	var indent = parser.indent + 1
-
-	start_mark := parser.mark
-	end_mark := parser.mark
-
-	// Consume the content of the plain scalar.
-	for {
-		// Check for a document indicator.
-		if parser.unread < 4 && !yaml_parser_update_buffer(parser, 4) {
-			return false
-		}
-		if parser.mark.column == 0 &&
-			((parser.buffer[parser.buffer_pos+0] == '-' &&
-				parser.buffer[parser.buffer_pos+1] == '-' &&
-				parser.buffer[parser.buffer_pos+2] == '-') ||
-				(parser.buffer[parser.buffer_pos+0] == '.' &&
-					parser.buffer[parser.buffer_pos+1] == '.' &&
-					parser.buffer[parser.buffer_pos+2] == '.')) &&
-			is_blankz(parser.buffer, parser.buffer_pos+3) {
-			break
-		}
-
-		// Check for a comment.
-		if parser.buffer[parser.buffer_pos] == '#' {
-			break
-		}
-
-		// Consume non-blank characters.
-		for !is_blankz(parser.buffer, parser.buffer_pos) {
-
-			// Check for 'x:x' in the flow context. TODO: Fix the test "spec-08-13".
-			if parser.flow_level > 0 &&
-				parser.buffer[parser.buffer_pos] == ':' &&
-				!is_blankz(parser.buffer, parser.buffer_pos+1) {
-				yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-					start_mark, "found unexpected ':'")
-				return false
-			}
-
-			// Check for indicators that may end a plain scalar.
-			if (parser.buffer[parser.buffer_pos] == ':' && is_blankz(parser.buffer, parser.buffer_pos+1)) ||
-				(parser.flow_level > 0 &&
-					(parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == ':' ||
-						parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == '[' ||
-						parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '{' ||
-						parser.buffer[parser.buffer_pos] == '}')) {
-				break
-			}
-
-			// Check if we need to join whitespaces and breaks.
-			if leading_blanks || len(whitespaces) > 0 {
-				if leading_blanks {
-					// Do we need to fold line breaks?
-					if leading_break[0] == '\n' {
-						if len(trailing_breaks) == 0 {
-							s = append(s, ' ')
-						} else {
-							s = append(s, trailing_breaks...)
-						}
-					} else {
-						s = append(s, leading_break...)
-						s = append(s, trailing_breaks...)
-					}
-					trailing_breaks = trailing_breaks[:0]
-					leading_break = leading_break[:0]
-					leading_blanks = false
-				} else {
-					s = append(s, whitespaces...)
-					whitespaces = whitespaces[:0]
-				}
-			}
-
-			// Copy the character.
-			s = read(parser, s)
-
-			end_mark = parser.mark
-			if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-				return false
-			}
-		}
-
-		// Is it the end?
-		if !(is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos)) {
-			break
-		}
-
-		// Consume blank characters.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-
-		for is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos) {
-			if is_blank(parser.buffer, parser.buffer_pos) {
-
-				// Check for tab character that abuse indentation.
-				if leading_blanks && parser.mark.column < indent && is_tab(parser.buffer, parser.buffer_pos) {
-					yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-						start_mark, "found a tab character that violate indentation")
-					return false
-				}
-
-				// Consume a space or a tab character.
-				if !leading_blanks {
-					whitespaces = read(parser, whitespaces)
-				} else {
-					skip(parser)
-				}
-			} else {
-				if parser.unread < 2 && !yaml_parser_update_buffer(parser, 2) {
-					return false
-				}
-
-				// Check if it is a first line break.
-				if !leading_blanks {
-					whitespaces = whitespaces[:0]
-					leading_break = read_line(parser, leading_break)
-					leading_blanks = true
-				} else {
-					trailing_breaks = read_line(parser, trailing_breaks)
-				}
-			}
-			if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-				return false
-			}
-		}
-
-		// Check indentation level.
-		if parser.flow_level == 0 && parser.mark.column < indent {
-			break
-		}
-	}
-
-	// Create a token.
-	*token = yaml_token_t{
-		typ:        yaml_SCALAR_TOKEN,
-		start_mark: start_mark,
-		end_mark:   end_mark,
-		value:      s,
-		style:      yaml_PLAIN_SCALAR_STYLE,
-	}
-
-	// Note that we change the 'simple_key_allowed' flag.
-	if leading_blanks {
-		parser.simple_key_allowed = true
-	}
-	return true
-}
diff --git a/vendor/gopkg.in/yaml.v2/sorter.go b/vendor/gopkg.in/yaml.v2/sorter.go
deleted file mode 100644
index 5958822f9c..0000000000
--- a/vendor/gopkg.in/yaml.v2/sorter.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package yaml
-
-import (
-	"reflect"
-	"unicode"
-)
-
-type keyList []reflect.Value
-
-func (l keyList) Len() int      { return len(l) }
-func (l keyList) Swap(i, j int) { l[i], l[j] = l[j], l[i] }
-func (l keyList) Less(i, j int) bool {
-	a := l[i]
-	b := l[j]
-	ak := a.Kind()
-	bk := b.Kind()
-	for (ak == reflect.Interface || ak == reflect.Ptr) && !a.IsNil() {
-		a = a.Elem()
-		ak = a.Kind()
-	}
-	for (bk == reflect.Interface || bk == reflect.Ptr) && !b.IsNil() {
-		b = b.Elem()
-		bk = b.Kind()
-	}
-	af, aok := keyFloat(a)
-	bf, bok := keyFloat(b)
-	if aok && bok {
-		if af != bf {
-			return af < bf
-		}
-		if ak != bk {
-			return ak < bk
-		}
-		return numLess(a, b)
-	}
-	if ak != reflect.String || bk != reflect.String {
-		return ak < bk
-	}
-	ar, br := []rune(a.String()), []rune(b.String())
-	for i := 0; i < len(ar) && i < len(br); i++ {
-		if ar[i] == br[i] {
-			continue
-		}
-		al := unicode.IsLetter(ar[i])
-		bl := unicode.IsLetter(br[i])
-		if al && bl {
-			return ar[i] < br[i]
-		}
-		if al || bl {
-			return bl
-		}
-		var ai, bi int
-		var an, bn int64
-		for ai = i; ai < len(ar) && unicode.IsDigit(ar[ai]); ai++ {
-			an = an*10 + int64(ar[ai]-'0')
-		}
-		for bi = i; bi < len(br) && unicode.IsDigit(br[bi]); bi++ {
-			bn = bn*10 + int64(br[bi]-'0')
-		}
-		if an != bn {
-			return an < bn
-		}
-		if ai != bi {
-			return ai < bi
-		}
-		return ar[i] < br[i]
-	}
-	return len(ar) < len(br)
-}
-
-// keyFloat returns a float value for v if it is a number/bool
-// and whether it is a number/bool or not.
-func keyFloat(v reflect.Value) (f float64, ok bool) {
-	switch v.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return float64(v.Int()), true
-	case reflect.Float32, reflect.Float64:
-		return v.Float(), true
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return float64(v.Uint()), true
-	case reflect.Bool:
-		if v.Bool() {
-			return 1, true
-		}
-		return 0, true
-	}
-	return 0, false
-}
-
-// numLess returns whether a < b.
-// a and b must necessarily have the same kind.
-func numLess(a, b reflect.Value) bool {
-	switch a.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return a.Int() < b.Int()
-	case reflect.Float32, reflect.Float64:
-		return a.Float() < b.Float()
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return a.Uint() < b.Uint()
-	case reflect.Bool:
-		return !a.Bool() && b.Bool()
-	}
-	panic("not a number")
-}
diff --git a/vendor/gopkg.in/yaml.v2/writerc.go b/vendor/gopkg.in/yaml.v2/writerc.go
deleted file mode 100644
index 190362f25d..0000000000
--- a/vendor/gopkg.in/yaml.v2/writerc.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package yaml
-
-// Set the writer error and return false.
-func yaml_emitter_set_writer_error(emitter *yaml_emitter_t, problem string) bool {
-	emitter.error = yaml_WRITER_ERROR
-	emitter.problem = problem
-	return false
-}
-
-// Flush the output buffer.
-func yaml_emitter_flush(emitter *yaml_emitter_t) bool {
-	if emitter.write_handler == nil {
-		panic("write handler not set")
-	}
-
-	// Check if the buffer is empty.
-	if emitter.buffer_pos == 0 {
-		return true
-	}
-
-	// If the output encoding is UTF-8, we don't need to recode the buffer.
-	if emitter.encoding == yaml_UTF8_ENCODING {
-		if err := emitter.write_handler(emitter, emitter.buffer[:emitter.buffer_pos]); err != nil {
-			return yaml_emitter_set_writer_error(emitter, "write error: "+err.Error())
-		}
-		emitter.buffer_pos = 0
-		return true
-	}
-
-	// Recode the buffer into the raw buffer.
-	var low, high int
-	if emitter.encoding == yaml_UTF16LE_ENCODING {
-		low, high = 0, 1
-	} else {
-		high, low = 1, 0
-	}
-
-	pos := 0
-	for pos < emitter.buffer_pos {
-		// See the "reader.c" code for more details on UTF-8 encoding.  Note
-		// that we assume that the buffer contains a valid UTF-8 sequence.
-
-		// Read the next UTF-8 character.
-		octet := emitter.buffer[pos]
-
-		var w int
-		var value rune
-		switch {
-		case octet&0x80 == 0x00:
-			w, value = 1, rune(octet&0x7F)
-		case octet&0xE0 == 0xC0:
-			w, value = 2, rune(octet&0x1F)
-		case octet&0xF0 == 0xE0:
-			w, value = 3, rune(octet&0x0F)
-		case octet&0xF8 == 0xF0:
-			w, value = 4, rune(octet&0x07)
-		}
-		for k := 1; k < w; k++ {
-			octet = emitter.buffer[pos+k]
-			value = (value << 6) + (rune(octet) & 0x3F)
-		}
-		pos += w
-
-		// Write the character.
-		if value < 0x10000 {
-			var b [2]byte
-			b[high] = byte(value >> 8)
-			b[low] = byte(value & 0xFF)
-			emitter.raw_buffer = append(emitter.raw_buffer, b[0], b[1])
-		} else {
-			// Write the character using a surrogate pair (check "reader.c").
-			var b [4]byte
-			value -= 0x10000
-			b[high] = byte(0xD8 + (value >> 18))
-			b[low] = byte((value >> 10) & 0xFF)
-			b[high+2] = byte(0xDC + ((value >> 8) & 0xFF))
-			b[low+2] = byte(value & 0xFF)
-			emitter.raw_buffer = append(emitter.raw_buffer, b[0], b[1], b[2], b[3])
-		}
-	}
-
-	// Write the raw buffer.
-	if err := emitter.write_handler(emitter, emitter.raw_buffer); err != nil {
-		return yaml_emitter_set_writer_error(emitter, "write error: "+err.Error())
-	}
-	emitter.buffer_pos = 0
-	emitter.raw_buffer = emitter.raw_buffer[:0]
-	return true
-}
diff --git a/vendor/gopkg.in/yaml.v2/yaml.go b/vendor/gopkg.in/yaml.v2/yaml.go
deleted file mode 100644
index bf18884e0e..0000000000
--- a/vendor/gopkg.in/yaml.v2/yaml.go
+++ /dev/null
@@ -1,357 +0,0 @@
-// Package yaml implements YAML support for the Go language.
-//
-// Source code and other details for the project are available at GitHub:
-//
-//   https://github.com/go-yaml/yaml
-//
-package yaml
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-	"sync"
-)
-
-// MapSlice encodes and decodes as a YAML map.
-// The order of keys is preserved when encoding and decoding.
-type MapSlice []MapItem
-
-// MapItem is an item in a MapSlice.
-type MapItem struct {
-	Key, Value interface{}
-}
-
-// The Unmarshaler interface may be implemented by types to customize their
-// behavior when being unmarshaled from a YAML document. The UnmarshalYAML
-// method receives a function that may be called to unmarshal the original
-// YAML value into a field or variable. It is safe to call the unmarshal
-// function parameter more than once if necessary.
-type Unmarshaler interface {
-	UnmarshalYAML(unmarshal func(interface{}) error) error
-}
-
-// The Marshaler interface may be implemented by types to customize their
-// behavior when being marshaled into a YAML document. The returned value
-// is marshaled in place of the original value implementing Marshaler.
-//
-// If an error is returned by MarshalYAML, the marshaling procedure stops
-// and returns with the provided error.
-type Marshaler interface {
-	MarshalYAML() (interface{}, error)
-}
-
-// Unmarshal decodes the first document found within the in byte slice
-// and assigns decoded values into the out value.
-//
-// Maps and pointers (to a struct, string, int, etc) are accepted as out
-// values. If an internal pointer within a struct is not initialized,
-// the yaml package will initialize it if necessary for unmarshalling
-// the provided data. The out parameter must not be nil.
-//
-// The type of the decoded values should be compatible with the respective
-// values in out. If one or more values cannot be decoded due to a type
-// mismatches, decoding continues partially until the end of the YAML
-// content, and a *yaml.TypeError is returned with details for all
-// missed values.
-//
-// Struct fields are only unmarshalled if they are exported (have an
-// upper case first letter), and are unmarshalled using the field name
-// lowercased as the default key. Custom keys may be defined via the
-// "yaml" name in the field tag: the content preceding the first comma
-// is used as the key, and the following comma-separated options are
-// used to tweak the marshalling process (see Marshal).
-// Conflicting names result in a runtime error.
-//
-// For example:
-//
-//     type T struct {
-//         F int `yaml:"a,omitempty"`
-//         B int
-//     }
-//     var t T
-//     yaml.Unmarshal([]byte("a: 1\nb: 2"), &t)
-//
-// See the documentation of Marshal for the format of tags and a list of
-// supported tag options.
-//
-func Unmarshal(in []byte, out interface{}) (err error) {
-	return unmarshal(in, out, false)
-}
-
-// UnmarshalStrict is like Unmarshal except that any fields that are found
-// in the data that do not have corresponding struct members will result in
-// an error.
-func UnmarshalStrict(in []byte, out interface{}) (err error) {
-	return unmarshal(in, out, true)
-}
-
-func unmarshal(in []byte, out interface{}, strict bool) (err error) {
-	defer handleErr(&err)
-	d := newDecoder(strict)
-	p := newParser(in)
-	defer p.destroy()
-	node := p.parse()
-	if node != nil {
-		v := reflect.ValueOf(out)
-		if v.Kind() == reflect.Ptr && !v.IsNil() {
-			v = v.Elem()
-		}
-		d.unmarshal(node, v)
-	}
-	if len(d.terrors) > 0 {
-		return &TypeError{d.terrors}
-	}
-	return nil
-}
-
-// Marshal serializes the value provided into a YAML document. The structure
-// of the generated document will reflect the structure of the value itself.
-// Maps and pointers (to struct, string, int, etc) are accepted as the in value.
-//
-// Struct fields are only unmarshalled if they are exported (have an upper case
-// first letter), and are unmarshalled using the field name lowercased as the
-// default key. Custom keys may be defined via the "yaml" name in the field
-// tag: the content preceding the first comma is used as the key, and the
-// following comma-separated options are used to tweak the marshalling process.
-// Conflicting names result in a runtime error.
-//
-// The field tag format accepted is:
-//
-//     `(...) yaml:"[<key>][,<flag1>[,<flag2>]]" (...)`
-//
-// The following flags are currently supported:
-//
-//     omitempty    Only include the field if it's not set to the zero
-//                  value for the type or to empty slices or maps.
-//                  Does not apply to zero valued structs.
-//
-//     flow         Marshal using a flow style (useful for structs,
-//                  sequences and maps).
-//
-//     inline       Inline the field, which must be a struct or a map,
-//                  causing all of its fields or keys to be processed as if
-//                  they were part of the outer struct. For maps, keys must
-//                  not conflict with the yaml keys of other struct fields.
-//
-// In addition, if the key is "-", the field is ignored.
-//
-// For example:
-//
-//     type T struct {
-//         F int "a,omitempty"
-//         B int
-//     }
-//     yaml.Marshal(&T{B: 2}) // Returns "b: 2\n"
-//     yaml.Marshal(&T{F: 1}} // Returns "a: 1\nb: 0\n"
-//
-func Marshal(in interface{}) (out []byte, err error) {
-	defer handleErr(&err)
-	e := newEncoder()
-	defer e.destroy()
-	e.marshal("", reflect.ValueOf(in))
-	e.finish()
-	out = e.out
-	return
-}
-
-func handleErr(err *error) {
-	if v := recover(); v != nil {
-		if e, ok := v.(yamlError); ok {
-			*err = e.err
-		} else {
-			panic(v)
-		}
-	}
-}
-
-type yamlError struct {
-	err error
-}
-
-func fail(err error) {
-	panic(yamlError{err})
-}
-
-func failf(format string, args ...interface{}) {
-	panic(yamlError{fmt.Errorf("yaml: "+format, args...)})
-}
-
-// A TypeError is returned by Unmarshal when one or more fields in
-// the YAML document cannot be properly decoded into the requested
-// types. When this error is returned, the value is still
-// unmarshaled partially.
-type TypeError struct {
-	Errors []string
-}
-
-func (e *TypeError) Error() string {
-	return fmt.Sprintf("yaml: unmarshal errors:\n  %s", strings.Join(e.Errors, "\n  "))
-}
-
-// --------------------------------------------------------------------------
-// Maintain a mapping of keys to structure field indexes
-
-// The code in this section was copied from mgo/bson.
-
-// structInfo holds details for the serialization of fields of
-// a given struct.
-type structInfo struct {
-	FieldsMap  map[string]fieldInfo
-	FieldsList []fieldInfo
-
-	// InlineMap is the number of the field in the struct that
-	// contains an ,inline map, or -1 if there's none.
-	InlineMap int
-}
-
-type fieldInfo struct {
-	Key       string
-	Num       int
-	OmitEmpty bool
-	Flow      bool
-
-	// Inline holds the field index if the field is part of an inlined struct.
-	Inline []int
-}
-
-var structMap = make(map[reflect.Type]*structInfo)
-var fieldMapMutex sync.RWMutex
-
-func getStructInfo(st reflect.Type) (*structInfo, error) {
-	fieldMapMutex.RLock()
-	sinfo, found := structMap[st]
-	fieldMapMutex.RUnlock()
-	if found {
-		return sinfo, nil
-	}
-
-	n := st.NumField()
-	fieldsMap := make(map[string]fieldInfo)
-	fieldsList := make([]fieldInfo, 0, n)
-	inlineMap := -1
-	for i := 0; i != n; i++ {
-		field := st.Field(i)
-		if field.PkgPath != "" && !field.Anonymous {
-			continue // Private field
-		}
-
-		info := fieldInfo{Num: i}
-
-		tag := field.Tag.Get("yaml")
-		if tag == "" && strings.Index(string(field.Tag), ":") < 0 {
-			tag = string(field.Tag)
-		}
-		if tag == "-" {
-			continue
-		}
-
-		inline := false
-		fields := strings.Split(tag, ",")
-		if len(fields) > 1 {
-			for _, flag := range fields[1:] {
-				switch flag {
-				case "omitempty":
-					info.OmitEmpty = true
-				case "flow":
-					info.Flow = true
-				case "inline":
-					inline = true
-				default:
-					return nil, errors.New(fmt.Sprintf("Unsupported flag %q in tag %q of type %s", flag, tag, st))
-				}
-			}
-			tag = fields[0]
-		}
-
-		if inline {
-			switch field.Type.Kind() {
-			case reflect.Map:
-				if inlineMap >= 0 {
-					return nil, errors.New("Multiple ,inline maps in struct " + st.String())
-				}
-				if field.Type.Key() != reflect.TypeOf("") {
-					return nil, errors.New("Option ,inline needs a map with string keys in struct " + st.String())
-				}
-				inlineMap = info.Num
-			case reflect.Struct:
-				sinfo, err := getStructInfo(field.Type)
-				if err != nil {
-					return nil, err
-				}
-				for _, finfo := range sinfo.FieldsList {
-					if _, found := fieldsMap[finfo.Key]; found {
-						msg := "Duplicated key '" + finfo.Key + "' in struct " + st.String()
-						return nil, errors.New(msg)
-					}
-					if finfo.Inline == nil {
-						finfo.Inline = []int{i, finfo.Num}
-					} else {
-						finfo.Inline = append([]int{i}, finfo.Inline...)
-					}
-					fieldsMap[finfo.Key] = finfo
-					fieldsList = append(fieldsList, finfo)
-				}
-			default:
-				//return nil, errors.New("Option ,inline needs a struct value or map field")
-				return nil, errors.New("Option ,inline needs a struct value field")
-			}
-			continue
-		}
-
-		if tag != "" {
-			info.Key = tag
-		} else {
-			info.Key = strings.ToLower(field.Name)
-		}
-
-		if _, found = fieldsMap[info.Key]; found {
-			msg := "Duplicated key '" + info.Key + "' in struct " + st.String()
-			return nil, errors.New(msg)
-		}
-
-		fieldsList = append(fieldsList, info)
-		fieldsMap[info.Key] = info
-	}
-
-	sinfo = &structInfo{fieldsMap, fieldsList, inlineMap}
-
-	fieldMapMutex.Lock()
-	structMap[st] = sinfo
-	fieldMapMutex.Unlock()
-	return sinfo, nil
-}
-
-func isZero(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.String:
-		return len(v.String()) == 0
-	case reflect.Interface, reflect.Ptr:
-		return v.IsNil()
-	case reflect.Slice:
-		return v.Len() == 0
-	case reflect.Map:
-		return v.Len() == 0
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Struct:
-		vt := v.Type()
-		for i := v.NumField() - 1; i >= 0; i-- {
-			if vt.Field(i).PkgPath != "" {
-				continue // Private field
-			}
-			if !isZero(v.Field(i)) {
-				return false
-			}
-		}
-		return true
-	}
-	return false
-}
diff --git a/vendor/gopkg.in/yaml.v2/yamlh.go b/vendor/gopkg.in/yaml.v2/yamlh.go
deleted file mode 100644
index 3caeca0491..0000000000
--- a/vendor/gopkg.in/yaml.v2/yamlh.go
+++ /dev/null
@@ -1,716 +0,0 @@
-package yaml
-
-import (
-	"io"
-)
-
-// The version directive data.
-type yaml_version_directive_t struct {
-	major int8 // The major version number.
-	minor int8 // The minor version number.
-}
-
-// The tag directive data.
-type yaml_tag_directive_t struct {
-	handle []byte // The tag handle.
-	prefix []byte // The tag prefix.
-}
-
-type yaml_encoding_t int
-
-// The stream encoding.
-const (
-	// Let the parser choose the encoding.
-	yaml_ANY_ENCODING yaml_encoding_t = iota
-
-	yaml_UTF8_ENCODING    // The default UTF-8 encoding.
-	yaml_UTF16LE_ENCODING // The UTF-16-LE encoding with BOM.
-	yaml_UTF16BE_ENCODING // The UTF-16-BE encoding with BOM.
-)
-
-type yaml_break_t int
-
-// Line break types.
-const (
-	// Let the parser choose the break type.
-	yaml_ANY_BREAK yaml_break_t = iota
-
-	yaml_CR_BREAK   // Use CR for line breaks (Mac style).
-	yaml_LN_BREAK   // Use LN for line breaks (Unix style).
-	yaml_CRLN_BREAK // Use CR LN for line breaks (DOS style).
-)
-
-type yaml_error_type_t int
-
-// Many bad things could happen with the parser and emitter.
-const (
-	// No error is produced.
-	yaml_NO_ERROR yaml_error_type_t = iota
-
-	yaml_MEMORY_ERROR   // Cannot allocate or reallocate a block of memory.
-	yaml_READER_ERROR   // Cannot read or decode the input stream.
-	yaml_SCANNER_ERROR  // Cannot scan the input stream.
-	yaml_PARSER_ERROR   // Cannot parse the input stream.
-	yaml_COMPOSER_ERROR // Cannot compose a YAML document.
-	yaml_WRITER_ERROR   // Cannot write to the output stream.
-	yaml_EMITTER_ERROR  // Cannot emit a YAML stream.
-)
-
-// The pointer position.
-type yaml_mark_t struct {
-	index  int // The position index.
-	line   int // The position line.
-	column int // The position column.
-}
-
-// Node Styles
-
-type yaml_style_t int8
-
-type yaml_scalar_style_t yaml_style_t
-
-// Scalar styles.
-const (
-	// Let the emitter choose the style.
-	yaml_ANY_SCALAR_STYLE yaml_scalar_style_t = iota
-
-	yaml_PLAIN_SCALAR_STYLE         // The plain scalar style.
-	yaml_SINGLE_QUOTED_SCALAR_STYLE // The single-quoted scalar style.
-	yaml_DOUBLE_QUOTED_SCALAR_STYLE // The double-quoted scalar style.
-	yaml_LITERAL_SCALAR_STYLE       // The literal scalar style.
-	yaml_FOLDED_SCALAR_STYLE        // The folded scalar style.
-)
-
-type yaml_sequence_style_t yaml_style_t
-
-// Sequence styles.
-const (
-	// Let the emitter choose the style.
-	yaml_ANY_SEQUENCE_STYLE yaml_sequence_style_t = iota
-
-	yaml_BLOCK_SEQUENCE_STYLE // The block sequence style.
-	yaml_FLOW_SEQUENCE_STYLE  // The flow sequence style.
-)
-
-type yaml_mapping_style_t yaml_style_t
-
-// Mapping styles.
-const (
-	// Let the emitter choose the style.
-	yaml_ANY_MAPPING_STYLE yaml_mapping_style_t = iota
-
-	yaml_BLOCK_MAPPING_STYLE // The block mapping style.
-	yaml_FLOW_MAPPING_STYLE  // The flow mapping style.
-)
-
-// Tokens
-
-type yaml_token_type_t int
-
-// Token types.
-const (
-	// An empty token.
-	yaml_NO_TOKEN yaml_token_type_t = iota
-
-	yaml_STREAM_START_TOKEN // A STREAM-START token.
-	yaml_STREAM_END_TOKEN   // A STREAM-END token.
-
-	yaml_VERSION_DIRECTIVE_TOKEN // A VERSION-DIRECTIVE token.
-	yaml_TAG_DIRECTIVE_TOKEN     // A TAG-DIRECTIVE token.
-	yaml_DOCUMENT_START_TOKEN    // A DOCUMENT-START token.
-	yaml_DOCUMENT_END_TOKEN      // A DOCUMENT-END token.
-
-	yaml_BLOCK_SEQUENCE_START_TOKEN // A BLOCK-SEQUENCE-START token.
-	yaml_BLOCK_MAPPING_START_TOKEN  // A BLOCK-SEQUENCE-END token.
-	yaml_BLOCK_END_TOKEN            // A BLOCK-END token.
-
-	yaml_FLOW_SEQUENCE_START_TOKEN // A FLOW-SEQUENCE-START token.
-	yaml_FLOW_SEQUENCE_END_TOKEN   // A FLOW-SEQUENCE-END token.
-	yaml_FLOW_MAPPING_START_TOKEN  // A FLOW-MAPPING-START token.
-	yaml_FLOW_MAPPING_END_TOKEN    // A FLOW-MAPPING-END token.
-
-	yaml_BLOCK_ENTRY_TOKEN // A BLOCK-ENTRY token.
-	yaml_FLOW_ENTRY_TOKEN  // A FLOW-ENTRY token.
-	yaml_KEY_TOKEN         // A KEY token.
-	yaml_VALUE_TOKEN       // A VALUE token.
-
-	yaml_ALIAS_TOKEN  // An ALIAS token.
-	yaml_ANCHOR_TOKEN // An ANCHOR token.
-	yaml_TAG_TOKEN    // A TAG token.
-	yaml_SCALAR_TOKEN // A SCALAR token.
-)
-
-func (tt yaml_token_type_t) String() string {
-	switch tt {
-	case yaml_NO_TOKEN:
-		return "yaml_NO_TOKEN"
-	case yaml_STREAM_START_TOKEN:
-		return "yaml_STREAM_START_TOKEN"
-	case yaml_STREAM_END_TOKEN:
-		return "yaml_STREAM_END_TOKEN"
-	case yaml_VERSION_DIRECTIVE_TOKEN:
-		return "yaml_VERSION_DIRECTIVE_TOKEN"
-	case yaml_TAG_DIRECTIVE_TOKEN:
-		return "yaml_TAG_DIRECTIVE_TOKEN"
-	case yaml_DOCUMENT_START_TOKEN:
-		return "yaml_DOCUMENT_START_TOKEN"
-	case yaml_DOCUMENT_END_TOKEN:
-		return "yaml_DOCUMENT_END_TOKEN"
-	case yaml_BLOCK_SEQUENCE_START_TOKEN:
-		return "yaml_BLOCK_SEQUENCE_START_TOKEN"
-	case yaml_BLOCK_MAPPING_START_TOKEN:
-		return "yaml_BLOCK_MAPPING_START_TOKEN"
-	case yaml_BLOCK_END_TOKEN:
-		return "yaml_BLOCK_END_TOKEN"
-	case yaml_FLOW_SEQUENCE_START_TOKEN:
-		return "yaml_FLOW_SEQUENCE_START_TOKEN"
-	case yaml_FLOW_SEQUENCE_END_TOKEN:
-		return "yaml_FLOW_SEQUENCE_END_TOKEN"
-	case yaml_FLOW_MAPPING_START_TOKEN:
-		return "yaml_FLOW_MAPPING_START_TOKEN"
-	case yaml_FLOW_MAPPING_END_TOKEN:
-		return "yaml_FLOW_MAPPING_END_TOKEN"
-	case yaml_BLOCK_ENTRY_TOKEN:
-		return "yaml_BLOCK_ENTRY_TOKEN"
-	case yaml_FLOW_ENTRY_TOKEN:
-		return "yaml_FLOW_ENTRY_TOKEN"
-	case yaml_KEY_TOKEN:
-		return "yaml_KEY_TOKEN"
-	case yaml_VALUE_TOKEN:
-		return "yaml_VALUE_TOKEN"
-	case yaml_ALIAS_TOKEN:
-		return "yaml_ALIAS_TOKEN"
-	case yaml_ANCHOR_TOKEN:
-		return "yaml_ANCHOR_TOKEN"
-	case yaml_TAG_TOKEN:
-		return "yaml_TAG_TOKEN"
-	case yaml_SCALAR_TOKEN:
-		return "yaml_SCALAR_TOKEN"
-	}
-	return "<unknown token>"
-}
-
-// The token structure.
-type yaml_token_t struct {
-	// The token type.
-	typ yaml_token_type_t
-
-	// The start/end of the token.
-	start_mark, end_mark yaml_mark_t
-
-	// The stream encoding (for yaml_STREAM_START_TOKEN).
-	encoding yaml_encoding_t
-
-	// The alias/anchor/scalar value or tag/tag directive handle
-	// (for yaml_ALIAS_TOKEN, yaml_ANCHOR_TOKEN, yaml_SCALAR_TOKEN, yaml_TAG_TOKEN, yaml_TAG_DIRECTIVE_TOKEN).
-	value []byte
-
-	// The tag suffix (for yaml_TAG_TOKEN).
-	suffix []byte
-
-	// The tag directive prefix (for yaml_TAG_DIRECTIVE_TOKEN).
-	prefix []byte
-
-	// The scalar style (for yaml_SCALAR_TOKEN).
-	style yaml_scalar_style_t
-
-	// The version directive major/minor (for yaml_VERSION_DIRECTIVE_TOKEN).
-	major, minor int8
-}
-
-// Events
-
-type yaml_event_type_t int8
-
-// Event types.
-const (
-	// An empty event.
-	yaml_NO_EVENT yaml_event_type_t = iota
-
-	yaml_STREAM_START_EVENT   // A STREAM-START event.
-	yaml_STREAM_END_EVENT     // A STREAM-END event.
-	yaml_DOCUMENT_START_EVENT // A DOCUMENT-START event.
-	yaml_DOCUMENT_END_EVENT   // A DOCUMENT-END event.
-	yaml_ALIAS_EVENT          // An ALIAS event.
-	yaml_SCALAR_EVENT         // A SCALAR event.
-	yaml_SEQUENCE_START_EVENT // A SEQUENCE-START event.
-	yaml_SEQUENCE_END_EVENT   // A SEQUENCE-END event.
-	yaml_MAPPING_START_EVENT  // A MAPPING-START event.
-	yaml_MAPPING_END_EVENT    // A MAPPING-END event.
-)
-
-// The event structure.
-type yaml_event_t struct {
-
-	// The event type.
-	typ yaml_event_type_t
-
-	// The start and end of the event.
-	start_mark, end_mark yaml_mark_t
-
-	// The document encoding (for yaml_STREAM_START_EVENT).
-	encoding yaml_encoding_t
-
-	// The version directive (for yaml_DOCUMENT_START_EVENT).
-	version_directive *yaml_version_directive_t
-
-	// The list of tag directives (for yaml_DOCUMENT_START_EVENT).
-	tag_directives []yaml_tag_directive_t
-
-	// The anchor (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT, yaml_ALIAS_EVENT).
-	anchor []byte
-
-	// The tag (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT).
-	tag []byte
-
-	// The scalar value (for yaml_SCALAR_EVENT).
-	value []byte
-
-	// Is the document start/end indicator implicit, or the tag optional?
-	// (for yaml_DOCUMENT_START_EVENT, yaml_DOCUMENT_END_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT, yaml_SCALAR_EVENT).
-	implicit bool
-
-	// Is the tag optional for any non-plain style? (for yaml_SCALAR_EVENT).
-	quoted_implicit bool
-
-	// The style (for yaml_SCALAR_EVENT, yaml_SEQUENCE_START_EVENT, yaml_MAPPING_START_EVENT).
-	style yaml_style_t
-}
-
-func (e *yaml_event_t) scalar_style() yaml_scalar_style_t     { return yaml_scalar_style_t(e.style) }
-func (e *yaml_event_t) sequence_style() yaml_sequence_style_t { return yaml_sequence_style_t(e.style) }
-func (e *yaml_event_t) mapping_style() yaml_mapping_style_t   { return yaml_mapping_style_t(e.style) }
-
-// Nodes
-
-const (
-	yaml_NULL_TAG      = "tag:yaml.org,2002:null"      // The tag !!null with the only possible value: null.
-	yaml_BOOL_TAG      = "tag:yaml.org,2002:bool"      // The tag !!bool with the values: true and false.
-	yaml_STR_TAG       = "tag:yaml.org,2002:str"       // The tag !!str for string values.
-	yaml_INT_TAG       = "tag:yaml.org,2002:int"       // The tag !!int for integer values.
-	yaml_FLOAT_TAG     = "tag:yaml.org,2002:float"     // The tag !!float for float values.
-	yaml_TIMESTAMP_TAG = "tag:yaml.org,2002:timestamp" // The tag !!timestamp for date and time values.
-
-	yaml_SEQ_TAG = "tag:yaml.org,2002:seq" // The tag !!seq is used to denote sequences.
-	yaml_MAP_TAG = "tag:yaml.org,2002:map" // The tag !!map is used to denote mapping.
-
-	// Not in original libyaml.
-	yaml_BINARY_TAG = "tag:yaml.org,2002:binary"
-	yaml_MERGE_TAG  = "tag:yaml.org,2002:merge"
-
-	yaml_DEFAULT_SCALAR_TAG   = yaml_STR_TAG // The default scalar tag is !!str.
-	yaml_DEFAULT_SEQUENCE_TAG = yaml_SEQ_TAG // The default sequence tag is !!seq.
-	yaml_DEFAULT_MAPPING_TAG  = yaml_MAP_TAG // The default mapping tag is !!map.
-)
-
-type yaml_node_type_t int
-
-// Node types.
-const (
-	// An empty node.
-	yaml_NO_NODE yaml_node_type_t = iota
-
-	yaml_SCALAR_NODE   // A scalar node.
-	yaml_SEQUENCE_NODE // A sequence node.
-	yaml_MAPPING_NODE  // A mapping node.
-)
-
-// An element of a sequence node.
-type yaml_node_item_t int
-
-// An element of a mapping node.
-type yaml_node_pair_t struct {
-	key   int // The key of the element.
-	value int // The value of the element.
-}
-
-// The node structure.
-type yaml_node_t struct {
-	typ yaml_node_type_t // The node type.
-	tag []byte           // The node tag.
-
-	// The node data.
-
-	// The scalar parameters (for yaml_SCALAR_NODE).
-	scalar struct {
-		value  []byte              // The scalar value.
-		length int                 // The length of the scalar value.
-		style  yaml_scalar_style_t // The scalar style.
-	}
-
-	// The sequence parameters (for YAML_SEQUENCE_NODE).
-	sequence struct {
-		items_data []yaml_node_item_t    // The stack of sequence items.
-		style      yaml_sequence_style_t // The sequence style.
-	}
-
-	// The mapping parameters (for yaml_MAPPING_NODE).
-	mapping struct {
-		pairs_data  []yaml_node_pair_t   // The stack of mapping pairs (key, value).
-		pairs_start *yaml_node_pair_t    // The beginning of the stack.
-		pairs_end   *yaml_node_pair_t    // The end of the stack.
-		pairs_top   *yaml_node_pair_t    // The top of the stack.
-		style       yaml_mapping_style_t // The mapping style.
-	}
-
-	start_mark yaml_mark_t // The beginning of the node.
-	end_mark   yaml_mark_t // The end of the node.
-
-}
-
-// The document structure.
-type yaml_document_t struct {
-
-	// The document nodes.
-	nodes []yaml_node_t
-
-	// The version directive.
-	version_directive *yaml_version_directive_t
-
-	// The list of tag directives.
-	tag_directives_data  []yaml_tag_directive_t
-	tag_directives_start int // The beginning of the tag directives list.
-	tag_directives_end   int // The end of the tag directives list.
-
-	start_implicit int // Is the document start indicator implicit?
-	end_implicit   int // Is the document end indicator implicit?
-
-	// The start/end of the document.
-	start_mark, end_mark yaml_mark_t
-}
-
-// The prototype of a read handler.
-//
-// The read handler is called when the parser needs to read more bytes from the
-// source. The handler should write not more than size bytes to the buffer.
-// The number of written bytes should be set to the size_read variable.
-//
-// [in,out]   data        A pointer to an application data specified by
-//                        yaml_parser_set_input().
-// [out]      buffer      The buffer to write the data from the source.
-// [in]       size        The size of the buffer.
-// [out]      size_read   The actual number of bytes read from the source.
-//
-// On success, the handler should return 1.  If the handler failed,
-// the returned value should be 0. On EOF, the handler should set the
-// size_read to 0 and return 1.
-type yaml_read_handler_t func(parser *yaml_parser_t, buffer []byte) (n int, err error)
-
-// This structure holds information about a potential simple key.
-type yaml_simple_key_t struct {
-	possible     bool        // Is a simple key possible?
-	required     bool        // Is a simple key required?
-	token_number int         // The number of the token.
-	mark         yaml_mark_t // The position mark.
-}
-
-// The states of the parser.
-type yaml_parser_state_t int
-
-const (
-	yaml_PARSE_STREAM_START_STATE yaml_parser_state_t = iota
-
-	yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE           // Expect the beginning of an implicit document.
-	yaml_PARSE_DOCUMENT_START_STATE                    // Expect DOCUMENT-START.
-	yaml_PARSE_DOCUMENT_CONTENT_STATE                  // Expect the content of a document.
-	yaml_PARSE_DOCUMENT_END_STATE                      // Expect DOCUMENT-END.
-	yaml_PARSE_BLOCK_NODE_STATE                        // Expect a block node.
-	yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE // Expect a block node or indentless sequence.
-	yaml_PARSE_FLOW_NODE_STATE                         // Expect a flow node.
-	yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE        // Expect the first entry of a block sequence.
-	yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE              // Expect an entry of a block sequence.
-	yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE         // Expect an entry of an indentless sequence.
-	yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE           // Expect the first key of a block mapping.
-	yaml_PARSE_BLOCK_MAPPING_KEY_STATE                 // Expect a block mapping key.
-	yaml_PARSE_BLOCK_MAPPING_VALUE_STATE               // Expect a block mapping value.
-	yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE         // Expect the first entry of a flow sequence.
-	yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE               // Expect an entry of a flow sequence.
-	yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE   // Expect a key of an ordered mapping.
-	yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE // Expect a value of an ordered mapping.
-	yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE   // Expect the and of an ordered mapping entry.
-	yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE            // Expect the first key of a flow mapping.
-	yaml_PARSE_FLOW_MAPPING_KEY_STATE                  // Expect a key of a flow mapping.
-	yaml_PARSE_FLOW_MAPPING_VALUE_STATE                // Expect a value of a flow mapping.
-	yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE          // Expect an empty value of a flow mapping.
-	yaml_PARSE_END_STATE                               // Expect nothing.
-)
-
-func (ps yaml_parser_state_t) String() string {
-	switch ps {
-	case yaml_PARSE_STREAM_START_STATE:
-		return "yaml_PARSE_STREAM_START_STATE"
-	case yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE:
-		return "yaml_PARSE_IMPLICIT_DOCUMENT_START_STATE"
-	case yaml_PARSE_DOCUMENT_START_STATE:
-		return "yaml_PARSE_DOCUMENT_START_STATE"
-	case yaml_PARSE_DOCUMENT_CONTENT_STATE:
-		return "yaml_PARSE_DOCUMENT_CONTENT_STATE"
-	case yaml_PARSE_DOCUMENT_END_STATE:
-		return "yaml_PARSE_DOCUMENT_END_STATE"
-	case yaml_PARSE_BLOCK_NODE_STATE:
-		return "yaml_PARSE_BLOCK_NODE_STATE"
-	case yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE:
-		return "yaml_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE"
-	case yaml_PARSE_FLOW_NODE_STATE:
-		return "yaml_PARSE_FLOW_NODE_STATE"
-	case yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE:
-		return "yaml_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE"
-	case yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE:
-		return "yaml_PARSE_BLOCK_SEQUENCE_ENTRY_STATE"
-	case yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE:
-		return "yaml_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE"
-	case yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE:
-		return "yaml_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE"
-	case yaml_PARSE_BLOCK_MAPPING_KEY_STATE:
-		return "yaml_PARSE_BLOCK_MAPPING_KEY_STATE"
-	case yaml_PARSE_BLOCK_MAPPING_VALUE_STATE:
-		return "yaml_PARSE_BLOCK_MAPPING_VALUE_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE"
-	case yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE:
-		return "yaml_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE"
-	case yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE:
-		return "yaml_PARSE_FLOW_MAPPING_FIRST_KEY_STATE"
-	case yaml_PARSE_FLOW_MAPPING_KEY_STATE:
-		return "yaml_PARSE_FLOW_MAPPING_KEY_STATE"
-	case yaml_PARSE_FLOW_MAPPING_VALUE_STATE:
-		return "yaml_PARSE_FLOW_MAPPING_VALUE_STATE"
-	case yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE:
-		return "yaml_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE"
-	case yaml_PARSE_END_STATE:
-		return "yaml_PARSE_END_STATE"
-	}
-	return "<unknown parser state>"
-}
-
-// This structure holds aliases data.
-type yaml_alias_data_t struct {
-	anchor []byte      // The anchor.
-	index  int         // The node id.
-	mark   yaml_mark_t // The anchor mark.
-}
-
-// The parser structure.
-//
-// All members are internal. Manage the structure using the
-// yaml_parser_ family of functions.
-type yaml_parser_t struct {
-
-	// Error handling
-
-	error yaml_error_type_t // Error type.
-
-	problem string // Error description.
-
-	// The byte about which the problem occurred.
-	problem_offset int
-	problem_value  int
-	problem_mark   yaml_mark_t
-
-	// The error context.
-	context      string
-	context_mark yaml_mark_t
-
-	// Reader stuff
-
-	read_handler yaml_read_handler_t // Read handler.
-
-	input_file io.Reader // File input data.
-	input      []byte    // String input data.
-	input_pos  int
-
-	eof bool // EOF flag
-
-	buffer     []byte // The working buffer.
-	buffer_pos int    // The current position of the buffer.
-
-	unread int // The number of unread characters in the buffer.
-
-	raw_buffer     []byte // The raw buffer.
-	raw_buffer_pos int    // The current position of the buffer.
-
-	encoding yaml_encoding_t // The input encoding.
-
-	offset int         // The offset of the current position (in bytes).
-	mark   yaml_mark_t // The mark of the current position.
-
-	// Scanner stuff
-
-	stream_start_produced bool // Have we started to scan the input stream?
-	stream_end_produced   bool // Have we reached the end of the input stream?
-
-	flow_level int // The number of unclosed '[' and '{' indicators.
-
-	tokens          []yaml_token_t // The tokens queue.
-	tokens_head     int            // The head of the tokens queue.
-	tokens_parsed   int            // The number of tokens fetched from the queue.
-	token_available bool           // Does the tokens queue contain a token ready for dequeueing.
-
-	indent  int   // The current indentation level.
-	indents []int // The indentation levels stack.
-
-	simple_key_allowed bool                // May a simple key occur at the current position?
-	simple_keys        []yaml_simple_key_t // The stack of simple keys.
-
-	// Parser stuff
-
-	state          yaml_parser_state_t    // The current parser state.
-	states         []yaml_parser_state_t  // The parser states stack.
-	marks          []yaml_mark_t          // The stack of marks.
-	tag_directives []yaml_tag_directive_t // The list of TAG directives.
-
-	// Dumper stuff
-
-	aliases []yaml_alias_data_t // The alias data.
-
-	document *yaml_document_t // The currently parsed document.
-}
-
-// Emitter Definitions
-
-// The prototype of a write handler.
-//
-// The write handler is called when the emitter needs to flush the accumulated
-// characters to the output.  The handler should write @a size bytes of the
-// @a buffer to the output.
-//
-// @param[in,out]   data        A pointer to an application data specified by
-//                              yaml_emitter_set_output().
-// @param[in]       buffer      The buffer with bytes to be written.
-// @param[in]       size        The size of the buffer.
-//
-// @returns On success, the handler should return @c 1.  If the handler failed,
-// the returned value should be @c 0.
-//
-type yaml_write_handler_t func(emitter *yaml_emitter_t, buffer []byte) error
-
-type yaml_emitter_state_t int
-
-// The emitter states.
-const (
-	// Expect STREAM-START.
-	yaml_EMIT_STREAM_START_STATE yaml_emitter_state_t = iota
-
-	yaml_EMIT_FIRST_DOCUMENT_START_STATE       // Expect the first DOCUMENT-START or STREAM-END.
-	yaml_EMIT_DOCUMENT_START_STATE             // Expect DOCUMENT-START or STREAM-END.
-	yaml_EMIT_DOCUMENT_CONTENT_STATE           // Expect the content of a document.
-	yaml_EMIT_DOCUMENT_END_STATE               // Expect DOCUMENT-END.
-	yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE   // Expect the first item of a flow sequence.
-	yaml_EMIT_FLOW_SEQUENCE_ITEM_STATE         // Expect an item of a flow sequence.
-	yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE     // Expect the first key of a flow mapping.
-	yaml_EMIT_FLOW_MAPPING_KEY_STATE           // Expect a key of a flow mapping.
-	yaml_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE  // Expect a value for a simple key of a flow mapping.
-	yaml_EMIT_FLOW_MAPPING_VALUE_STATE         // Expect a value of a flow mapping.
-	yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE  // Expect the first item of a block sequence.
-	yaml_EMIT_BLOCK_SEQUENCE_ITEM_STATE        // Expect an item of a block sequence.
-	yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE    // Expect the first key of a block mapping.
-	yaml_EMIT_BLOCK_MAPPING_KEY_STATE          // Expect the key of a block mapping.
-	yaml_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE // Expect a value for a simple key of a block mapping.
-	yaml_EMIT_BLOCK_MAPPING_VALUE_STATE        // Expect a value of a block mapping.
-	yaml_EMIT_END_STATE                        // Expect nothing.
-)
-
-// The emitter structure.
-//
-// All members are internal.  Manage the structure using the @c yaml_emitter_
-// family of functions.
-type yaml_emitter_t struct {
-
-	// Error handling
-
-	error   yaml_error_type_t // Error type.
-	problem string            // Error description.
-
-	// Writer stuff
-
-	write_handler yaml_write_handler_t // Write handler.
-
-	output_buffer *[]byte   // String output data.
-	output_file   io.Writer // File output data.
-
-	buffer     []byte // The working buffer.
-	buffer_pos int    // The current position of the buffer.
-
-	raw_buffer     []byte // The raw buffer.
-	raw_buffer_pos int    // The current position of the buffer.
-
-	encoding yaml_encoding_t // The stream encoding.
-
-	// Emitter stuff
-
-	canonical   bool         // If the output is in the canonical style?
-	best_indent int          // The number of indentation spaces.
-	best_width  int          // The preferred width of the output lines.
-	unicode     bool         // Allow unescaped non-ASCII characters?
-	line_break  yaml_break_t // The preferred line break.
-
-	state  yaml_emitter_state_t   // The current emitter state.
-	states []yaml_emitter_state_t // The stack of states.
-
-	events      []yaml_event_t // The event queue.
-	events_head int            // The head of the event queue.
-
-	indents []int // The stack of indentation levels.
-
-	tag_directives []yaml_tag_directive_t // The list of tag directives.
-
-	indent int // The current indentation level.
-
-	flow_level int // The current flow level.
-
-	root_context       bool // Is it the document root context?
-	sequence_context   bool // Is it a sequence context?
-	mapping_context    bool // Is it a mapping context?
-	simple_key_context bool // Is it a simple mapping key context?
-
-	line       int  // The current line.
-	column     int  // The current column.
-	whitespace bool // If the last character was a whitespace?
-	indention  bool // If the last character was an indentation character (' ', '-', '?', ':')?
-	open_ended bool // If an explicit document end is required?
-
-	// Anchor analysis.
-	anchor_data struct {
-		anchor []byte // The anchor value.
-		alias  bool   // Is it an alias?
-	}
-
-	// Tag analysis.
-	tag_data struct {
-		handle []byte // The tag handle.
-		suffix []byte // The tag suffix.
-	}
-
-	// Scalar analysis.
-	scalar_data struct {
-		value                 []byte              // The scalar value.
-		multiline             bool                // Does the scalar contain line breaks?
-		flow_plain_allowed    bool                // Can the scalar be expessed in the flow plain style?
-		block_plain_allowed   bool                // Can the scalar be expressed in the block plain style?
-		single_quoted_allowed bool                // Can the scalar be expressed in the single quoted style?
-		block_allowed         bool                // Can the scalar be expressed in the literal or folded styles?
-		style                 yaml_scalar_style_t // The output style.
-	}
-
-	// Dumper stuff
-
-	opened bool // If the stream was already opened?
-	closed bool // If the stream was already closed?
-
-	// The information associated with the document nodes.
-	anchors *struct {
-		references int  // The number of references.
-		anchor     int  // The anchor id.
-		serialized bool // If the node has been emitted?
-	}
-
-	last_anchor_id int // The last assigned anchor id.
-
-	document *yaml_document_t // The currently emitted document.
-}
diff --git a/vendor/gopkg.in/yaml.v2/yamlprivateh.go b/vendor/gopkg.in/yaml.v2/yamlprivateh.go
deleted file mode 100644
index 8110ce3c37..0000000000
--- a/vendor/gopkg.in/yaml.v2/yamlprivateh.go
+++ /dev/null
@@ -1,173 +0,0 @@
-package yaml
-
-const (
-	// The size of the input raw buffer.
-	input_raw_buffer_size = 512
-
-	// The size of the input buffer.
-	// It should be possible to decode the whole raw buffer.
-	input_buffer_size = input_raw_buffer_size * 3
-
-	// The size of the output buffer.
-	output_buffer_size = 128
-
-	// The size of the output raw buffer.
-	// It should be possible to encode the whole output buffer.
-	output_raw_buffer_size = (output_buffer_size*2 + 2)
-
-	// The size of other stacks and queues.
-	initial_stack_size  = 16
-	initial_queue_size  = 16
-	initial_string_size = 16
-)
-
-// Check if the character at the specified position is an alphabetical
-// character, a digit, '_', or '-'.
-func is_alpha(b []byte, i int) bool {
-	return b[i] >= '0' && b[i] <= '9' || b[i] >= 'A' && b[i] <= 'Z' || b[i] >= 'a' && b[i] <= 'z' || b[i] == '_' || b[i] == '-'
-}
-
-// Check if the character at the specified position is a digit.
-func is_digit(b []byte, i int) bool {
-	return b[i] >= '0' && b[i] <= '9'
-}
-
-// Get the value of a digit.
-func as_digit(b []byte, i int) int {
-	return int(b[i]) - '0'
-}
-
-// Check if the character at the specified position is a hex-digit.
-func is_hex(b []byte, i int) bool {
-	return b[i] >= '0' && b[i] <= '9' || b[i] >= 'A' && b[i] <= 'F' || b[i] >= 'a' && b[i] <= 'f'
-}
-
-// Get the value of a hex-digit.
-func as_hex(b []byte, i int) int {
-	bi := b[i]
-	if bi >= 'A' && bi <= 'F' {
-		return int(bi) - 'A' + 10
-	}
-	if bi >= 'a' && bi <= 'f' {
-		return int(bi) - 'a' + 10
-	}
-	return int(bi) - '0'
-}
-
-// Check if the character is ASCII.
-func is_ascii(b []byte, i int) bool {
-	return b[i] <= 0x7F
-}
-
-// Check if the character at the start of the buffer can be printed unescaped.
-func is_printable(b []byte, i int) bool {
-	return ((b[i] == 0x0A) || // . == #x0A
-		(b[i] >= 0x20 && b[i] <= 0x7E) || // #x20 <= . <= #x7E
-		(b[i] == 0xC2 && b[i+1] >= 0xA0) || // #0xA0 <= . <= #xD7FF
-		(b[i] > 0xC2 && b[i] < 0xED) ||
-		(b[i] == 0xED && b[i+1] < 0xA0) ||
-		(b[i] == 0xEE) ||
-		(b[i] == 0xEF && // #xE000 <= . <= #xFFFD
-			!(b[i+1] == 0xBB && b[i+2] == 0xBF) && // && . != #xFEFF
-			!(b[i+1] == 0xBF && (b[i+2] == 0xBE || b[i+2] == 0xBF))))
-}
-
-// Check if the character at the specified position is NUL.
-func is_z(b []byte, i int) bool {
-	return b[i] == 0x00
-}
-
-// Check if the beginning of the buffer is a BOM.
-func is_bom(b []byte, i int) bool {
-	return b[0] == 0xEF && b[1] == 0xBB && b[2] == 0xBF
-}
-
-// Check if the character at the specified position is space.
-func is_space(b []byte, i int) bool {
-	return b[i] == ' '
-}
-
-// Check if the character at the specified position is tab.
-func is_tab(b []byte, i int) bool {
-	return b[i] == '\t'
-}
-
-// Check if the character at the specified position is blank (space or tab).
-func is_blank(b []byte, i int) bool {
-	//return is_space(b, i) || is_tab(b, i)
-	return b[i] == ' ' || b[i] == '\t'
-}
-
-// Check if the character at the specified position is a line break.
-func is_break(b []byte, i int) bool {
-	return (b[i] == '\r' || // CR (#xD)
-		b[i] == '\n' || // LF (#xA)
-		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9) // PS (#x2029)
-}
-
-func is_crlf(b []byte, i int) bool {
-	return b[i] == '\r' && b[i+1] == '\n'
-}
-
-// Check if the character is a line break or NUL.
-func is_breakz(b []byte, i int) bool {
-	//return is_break(b, i) || is_z(b, i)
-	return (        // is_break:
-	b[i] == '\r' || // CR (#xD)
-		b[i] == '\n' || // LF (#xA)
-		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029)
-		// is_z:
-		b[i] == 0)
-}
-
-// Check if the character is a line break, space, or NUL.
-func is_spacez(b []byte, i int) bool {
-	//return is_space(b, i) || is_breakz(b, i)
-	return ( // is_space:
-	b[i] == ' ' ||
-		// is_breakz:
-		b[i] == '\r' || // CR (#xD)
-		b[i] == '\n' || // LF (#xA)
-		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029)
-		b[i] == 0)
-}
-
-// Check if the character is a line break, space, tab, or NUL.
-func is_blankz(b []byte, i int) bool {
-	//return is_blank(b, i) || is_breakz(b, i)
-	return ( // is_blank:
-	b[i] == ' ' || b[i] == '\t' ||
-		// is_breakz:
-		b[i] == '\r' || // CR (#xD)
-		b[i] == '\n' || // LF (#xA)
-		b[i] == 0xC2 && b[i+1] == 0x85 || // NEL (#x85)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA8 || // LS (#x2028)
-		b[i] == 0xE2 && b[i+1] == 0x80 && b[i+2] == 0xA9 || // PS (#x2029)
-		b[i] == 0)
-}
-
-// Determine the width of the character.
-func width(b byte) int {
-	// Don't replace these by a switch without first
-	// confirming that it is being inlined.
-	if b&0x80 == 0x00 {
-		return 1
-	}
-	if b&0xE0 == 0xC0 {
-		return 2
-	}
-	if b&0xF0 == 0xE0 {
-		return 3
-	}
-	if b&0xF8 == 0xF0 {
-		return 4
-	}
-	return 0
-
-}
diff --git a/vendor/vendor.json b/vendor/vendor.json
deleted file mode 100644
index 880ab10f2a..0000000000
--- a/vendor/vendor.json
+++ /dev/null
@@ -1,1025 +0,0 @@
-{
-	"comment": "",
-	"ignore": "test",
-	"package": [
-		{
-			"path": "appengine",
-			"revision": ""
-		},
-		{
-			"path": "appengine/cloudsql",
-			"revision": ""
-		},
-		{
-			"path": "appengine_internal",
-			"revision": ""
-		},
-		{
-			"path": "appengine_internal/base",
-			"revision": ""
-		},
-		{
-			"checksumSHA1": "23FJUX+AInYeEM2hoUMvYZtXZd4=",
-			"path": "github.com/Azure/go-ansiterm",
-			"revision": "fa152c58bc15761d0200cb75fe958b89a9d4888e",
-			"revisionTime": "2016-06-22T17:32:16Z"
-		},
-		{
-			"checksumSHA1": "jBimnggjIiFUjaImNoJhSVLtdzw=",
-			"path": "github.com/Azure/go-ansiterm/winterm",
-			"revision": "fa152c58bc15761d0200cb75fe958b89a9d4888e",
-			"revisionTime": "2016-06-22T17:32:16Z"
-		},
-		{
-			"checksumSHA1": "o/3cn04KAiwC7NqNVvmfVTD+hgA=",
-			"path": "github.com/Microsoft/go-winio",
-			"revision": "78439966b38d69bf38227fbf57ac8a6fee70f69a",
-			"revisionTime": "2017-08-04T20:09:54Z"
-		},
-		{
-			"checksumSHA1": "Aqy8/FoAIidY/DeQ5oTYSZ4YFVc=",
-			"path": "github.com/Nvveen/Gotty",
-			"revision": "cd527374f1e5bff4938207604a14f2e38a9cf512",
-			"revisionTime": "2012-06-04T00:48:16Z"
-		},
-		{
-			"checksumSHA1": "nJrp/CKnvpO+vzTfOeR8qmzRZ4c=",
-			"path": "github.com/PuerkitoBio/purell",
-			"revision": "f619812e3caf603a8df60a7ec6f2654b703189ef",
-			"revisionTime": "2017-08-29T23:20:23Z"
-		},
-		{
-			"checksumSHA1": "/jQPcsccvsC9GVM9pV6fESxWOUk=",
-			"path": "github.com/PuerkitoBio/urlesc",
-			"revision": "de5bf2ad457846296e2031421a34e2568e304e35",
-			"revisionTime": "2017-08-10T14:37:23Z"
-		},
-		{
-			"checksumSHA1": "ZKxETlJdB2XubMrZnXB0FQimVA8=",
-			"path": "github.com/Sirupsen/logrus",
-			"revision": "10f801ebc38b33738c9d17d50860f484a0988ff5",
-			"revisionTime": "2017-03-17T14:32:14Z"
-		},
-		{
-			"checksumSHA1": "9CCPEzYQkmeL5Dn7e99Mjxw1IVc=",
-			"path": "github.com/aws/aws-sdk-go",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "WklPj1YaT3LzeGnbvA7VNhQcUnc=",
-			"path": "github.com/aws/aws-sdk-go/aws",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "Y9W+4GimK4Fuxq+vyIskVYFRnX4=",
-			"path": "github.com/aws/aws-sdk-go/aws/awserr",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "yyYr41HZ1Aq0hWc3J5ijXwYEcac=",
-			"path": "github.com/aws/aws-sdk-go/aws/awsutil",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "n98FANpNeRT5kf6pizdpI7nm6Sw=",
-			"path": "github.com/aws/aws-sdk-go/aws/client",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "ieAJ+Cvp/PKv1LpUEnUXpc3OI6E=",
-			"path": "github.com/aws/aws-sdk-go/aws/client/metadata",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "7/8j/q0TWtOgXyvEcv4B2Dhl00o=",
-			"path": "github.com/aws/aws-sdk-go/aws/corehandlers",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "Y+cPwQL0dZMyqp3wI+KJWmA9KQ8=",
-			"path": "github.com/aws/aws-sdk-go/aws/credentials",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "u3GOAJLmdvbuNUeUEcZSEAOeL/0=",
-			"path": "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "NUJUTWlc1sV8b7WjfiYc4JZbXl0=",
-			"path": "github.com/aws/aws-sdk-go/aws/credentials/endpointcreds",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "JEYqmF83O5n5bHkupAzA6STm0no=",
-			"path": "github.com/aws/aws-sdk-go/aws/credentials/stscreds",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "ZdtYh3ZHSgP/WEIaqwJHTEhpkbs=",
-			"path": "github.com/aws/aws-sdk-go/aws/defaults",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "/EXbk/z2TWjWc1Hvb4QYs3Wmhb8=",
-			"path": "github.com/aws/aws-sdk-go/aws/ec2metadata",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "rxRJvIS15Xx01dqHiNopR+TB2hw=",
-			"path": "github.com/aws/aws-sdk-go/aws/endpoints",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "P6f+a0npro0KI5CESeKTWhRtBuE=",
-			"path": "github.com/aws/aws-sdk-go/aws/request",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "Y20DEtMtbfE9qTtmoi2NYV1x7aA=",
-			"path": "github.com/aws/aws-sdk-go/aws/session",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "1+ZxEwzc1Vz8X2l+kXkS2iATtas=",
-			"path": "github.com/aws/aws-sdk-go/aws/signer/v4",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "04ypv4x12l4q0TksA1zEVsmgpvw=",
-			"path": "github.com/aws/aws-sdk-go/internal/shareddefaults",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "wk7EyvDaHwb5qqoOP/4d3cV0708=",
-			"path": "github.com/aws/aws-sdk-go/private/protocol",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "ZqY5RWavBLWTo6j9xqdyBEaNFRk=",
-			"path": "github.com/aws/aws-sdk-go/private/protocol/query",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "Drt1JfLMa0DQEZLWrnMlTWaIcC8=",
-			"path": "github.com/aws/aws-sdk-go/private/protocol/query/queryutil",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "VCTh+dEaqqhog5ncy/WTt9+/gFM=",
-			"path": "github.com/aws/aws-sdk-go/private/protocol/rest",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "ODo+ko8D6unAxZuN1jGzMcN4QCc=",
-			"path": "github.com/aws/aws-sdk-go/private/protocol/restxml",
-			"revision": "9aa9c61f7edcc096340c81a61f357139e499c8fe",
-			"revisionTime": "2017-12-05T23:09:30Z"
-		},
-		{
-			"checksumSHA1": "0qYPUga28aQVkxZgBR3Z86AbGUQ=",
-			"path": "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "TFFdPTzKEzgc1jNP27gJmEU/cOk=",
-			"path": "github.com/aws/aws-sdk-go/service/s3",
-			"revision": "9aa9c61f7edcc096340c81a61f357139e499c8fe",
-			"revisionTime": "2017-12-05T23:09:30Z"
-		},
-		{
-			"checksumSHA1": "VH5y62f+SDyEIqnTibiPtQ687i8=",
-			"path": "github.com/aws/aws-sdk-go/service/sts",
-			"revision": "df374c20d53ed082b8cf0d0da52b1a181abf387b",
-			"revisionTime": "2017-07-27T22:25:20Z"
-		},
-		{
-			"checksumSHA1": "q/q192th5k+4sIf7foPHDZ9mCCI=",
-			"path": "github.com/awslabs/goformation",
-			"revision": "e44e1f30ab5d1d3c0c34780bf07de71c8a0a2924",
-			"revisionTime": "2017-10-30T16:55:53Z"
-		},
-		{
-			"checksumSHA1": "PPE0ACgxF7gN5tM6qv1Ray7wDks=",
-			"path": "github.com/awslabs/goformation/cloudformation",
-			"revision": "e44e1f30ab5d1d3c0c34780bf07de71c8a0a2924",
-			"revisionTime": "2017-10-30T16:55:53Z"
-		},
-		{
-			"checksumSHA1": "slR18YNNZfQSO487H8XPh14I3FY=",
-			"path": "github.com/awslabs/goformation/intrinsics",
-			"revision": "9ad3ba31f9330acddc72b6ee6cea26d55c93689f",
-			"revisionTime": "2017-10-30T20:04:01Z"
-		},
-		{
-			"checksumSHA1": "GfZvfJZHPiNFI2KTFF9HfNNAMuA=",
-			"path": "github.com/codegangsta/cli",
-			"revision": "8ba6f23b6e36d03666a14bd9421f5e3efcb59aca",
-			"revisionTime": "2017-03-29T01:35:17Z"
-		},
-		{
-			"checksumSHA1": "Gj+xR1VgFKKmFXYOJMnAczC3Znk=",
-			"path": "github.com/docker/distribution/digestset",
-			"revision": "c3e06c6069653bf72034ed907d6749d3928fdacb",
-			"revisionTime": "2017-04-10T23:14:28Z"
-		},
-		{
-			"checksumSHA1": "m4wEFD0Mh+ClfprUqgl0GyNmk7Q=",
-			"path": "github.com/docker/distribution/reference",
-			"revision": "c3e06c6069653bf72034ed907d6749d3928fdacb",
-			"revisionTime": "2017-04-10T23:14:28Z"
-		},
-		{
-			"checksumSHA1": "dLSCrkHa4e1SbdIlMs/REr1D3n0=",
-			"path": "github.com/docker/docker/api",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "rbjCIKymiTQJ9hxsfmsU/nocG/k=",
-			"path": "github.com/docker/docker/api/types",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "jVJDbe0IcyjoKc2xbohwzQr+FF0=",
-			"path": "github.com/docker/docker/api/types/blkiodev",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "drl8jU7M5K6iwSG+jRjX0BDL8Qg=",
-			"path": "github.com/docker/docker/api/types/container",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "fzeGodcTcWuV18AT0BcvB4EFByo=",
-			"path": "github.com/docker/docker/api/types/events",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "J2OKngfI3vgswudr9PZVUFcRRu0=",
-			"path": "github.com/docker/docker/api/types/filters",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "yeB781yxPhnN6OXQ9/qSsyih3ek=",
-			"path": "github.com/docker/docker/api/types/image",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "UK+VdM648oWzyqE4OqttgmPqjoA=",
-			"path": "github.com/docker/docker/api/types/mount",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "oC2We2SzAYMULIfr7fXaoofnF+c=",
-			"path": "github.com/docker/docker/api/types/network",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "93qfc2M61FdF62qeGXZHWpVSK8k=",
-			"path": "github.com/docker/docker/api/types/registry",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "VTxWyFud/RedrpllGdQonVtGM/A=",
-			"path": "github.com/docker/docker/api/types/strslice",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "PQ34G2PEhLVSqmzvexgYyi5zY4E=",
-			"path": "github.com/docker/docker/api/types/swarm",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "B7ZwKzrv3t3Vlox6/bYMHhMjsM8=",
-			"path": "github.com/docker/docker/api/types/time",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "uDPQ3nHsrvGQc9tg/J9OSC4N5dQ=",
-			"path": "github.com/docker/docker/api/types/versions",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "IBJy2zPEnYmcFJ3lM1eiRWnCxTA=",
-			"path": "github.com/docker/docker/api/types/volume",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "UQQxpH8UschstMO90In2QDEUIZ4=",
-			"path": "github.com/docker/docker/client",
-			"revision": "d90fb13de717effaff70ffc466f913eb9b453e30",
-			"revisionTime": "2017-04-27T03:09:47Z"
-		},
-		{
-			"checksumSHA1": "5qccCXTTyEBj19AxaIgfTjNPdaU=",
-			"path": "github.com/docker/docker/pkg/ioutils",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "kp20bhjkvJ06uW6DRfVIZbCj8SY=",
-			"path": "github.com/docker/docker/pkg/jsonlog",
-			"revision": "4219156a6254bdc7d270f06742037df8e2708a9a",
-			"revisionTime": "2017-04-29T17:05:32Z"
-		},
-		{
-			"checksumSHA1": "VXVTF13CeFO8+oLXqp4seTuD/LU=",
-			"path": "github.com/docker/docker/pkg/jsonmessage",
-			"revision": "4219156a6254bdc7d270f06742037df8e2708a9a",
-			"revisionTime": "2017-04-29T17:05:32Z"
-		},
-		{
-			"checksumSHA1": "ndnAFCfsGC3upNQ6jAEwzxcurww=",
-			"path": "github.com/docker/docker/pkg/longpath",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "H1rrbVmeE1z2TnkF7tSrfh+qUOY=",
-			"path": "github.com/docker/docker/pkg/stdcopy",
-			"revision": "2b964164c23857bb9b383381af297f3feb5770fd",
-			"revisionTime": "2017-07-20T19:16:06Z"
-		},
-		{
-			"checksumSHA1": "SXjPQfi84j+BFZi4Fl1c/OC/f7M=",
-			"path": "github.com/docker/docker/pkg/system",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "Nfp/0W+HK8ZEgklbSWmjJGXTJew=",
-			"path": "github.com/docker/docker/pkg/term",
-			"revision": "4219156a6254bdc7d270f06742037df8e2708a9a",
-			"revisionTime": "2017-04-29T17:05:32Z"
-		},
-		{
-			"checksumSHA1": "EMjTiUTHNxqSsmdMB1V29hRvJbQ=",
-			"path": "github.com/docker/docker/pkg/term/windows",
-			"revision": "4219156a6254bdc7d270f06742037df8e2708a9a",
-			"revisionTime": "2017-04-29T17:05:32Z"
-		},
-		{
-			"checksumSHA1": "8I0Ez+aUYGpsDEVZ8wN/Ztf6Zqs=",
-			"path": "github.com/docker/docker/pkg/tlsconfig",
-			"revision": "e1101b1295f05ef3c6f1a684a51cd508b3c7874c",
-			"revisionTime": "2017-04-25T08:25:58Z"
-		},
-		{
-			"checksumSHA1": "JbiWTzH699Sqz25XmDlsARpMN9w=",
-			"path": "github.com/docker/go-connections/nat",
-			"revision": "e15c02316c12de00874640cd76311849de2aeed5",
-			"revisionTime": "2017-03-31T14:51:22Z"
-		},
-		{
-			"checksumSHA1": "jUfDG3VQsA2UZHvvIXncgiddpYA=",
-			"path": "github.com/docker/go-connections/sockets",
-			"revision": "e15c02316c12de00874640cd76311849de2aeed5",
-			"revisionTime": "2017-03-31T14:51:22Z"
-		},
-		{
-			"checksumSHA1": "tuSzlS1UQ03+5Fvtqr5hI5sLLhA=",
-			"path": "github.com/docker/go-connections/tlsconfig",
-			"revision": "e15c02316c12de00874640cd76311849de2aeed5",
-			"revisionTime": "2017-03-31T14:51:22Z"
-		},
-		{
-			"checksumSHA1": "UmXGieuTJQOzJPspPJTVKKKMiUA=",
-			"path": "github.com/docker/go-units",
-			"revision": "0dadbb0345b35ec7ef35e228dabb8de89a65bf52",
-			"revisionTime": "2017-01-27T09:51:30Z"
-		},
-		{
-			"checksumSHA1": "sNAU9ojYVUhO6dVXey6T3JhRQpw=",
-			"path": "github.com/docker/libtrust",
-			"revision": "aabc10ec26b754e797f9028f4589c5b7bd90dc20",
-			"revisionTime": "2016-07-08T17:25:13Z"
-		},
-		{
-			"checksumSHA1": "AANTVr9CVVyzsgviODY6Wi2thuM=",
-			"path": "github.com/fatih/color",
-			"revision": "62e9147c64a1ed519147b62a56a14e83e2be02c1",
-			"revisionTime": "2017-05-23T20:24:04Z"
-		},
-		{
-			"checksumSHA1": "ImX1uv6O09ggFeBPUJJ2nu7MPSA=",
-			"path": "github.com/ghodss/yaml",
-			"revision": "0ca9ea5df5451ffdf184b4428c902747c2c11cd7",
-			"revisionTime": "2017-03-27T23:54:44Z"
-		},
-		{
-			"checksumSHA1": "Ecn0UexWoWRG6Di0wdWvIfms/jc=",
-			"path": "github.com/go-ini/ini",
-			"revision": "3d73f4b845efdf9989fffd4b4e562727744a34ba",
-			"revisionTime": "2017-06-27T23:12:24Z"
-		},
-		{
-			"checksumSHA1": "6dTGC5A1Y1xnv+JSi9z8S6JfnH0=",
-			"path": "github.com/go-openapi/jsonpointer",
-			"revision": "779f45308c19820f1a69e9a4cd965f496e0da10f",
-			"revisionTime": "2017-01-02T17:42:23Z"
-		},
-		{
-			"checksumSHA1": "YMNc0I/ifBw9TsnF13NTpIN9yu4=",
-			"path": "github.com/go-openapi/jsonreference",
-			"revision": "36d33bfe519efae5632669801b180bf1a245da3b",
-			"revisionTime": "2016-11-05T16:21:50Z"
-		},
-		{
-			"checksumSHA1": "pjXINRZU/YKPRQLtxC349kDoU/s=",
-			"path": "github.com/go-openapi/spec",
-			"revision": "3faa0055dbbf2110abc1f3b4e3adbb22721e96e7",
-			"revisionTime": "2017-08-11T03:32:43Z"
-		},
-		{
-			"checksumSHA1": "Wz6dE9E9ZwCK4oWRr5lNazhgMY0=",
-			"path": "github.com/go-openapi/swag",
-			"revision": "f3f9494671f93fcff853e3c6e9e948b3eb71e590",
-			"revisionTime": "2017-06-06T14:27:51Z"
-		},
-		{
-			"checksumSHA1": "yqF125xVSkmfLpIVGrLlfE05IUk=",
-			"path": "github.com/golang/protobuf/proto",
-			"revision": "748d386b5c1ea99658fd69fe9f03991ce86a90c1",
-			"revisionTime": "2017-07-26T21:28:29Z"
-		},
-		{
-			"checksumSHA1": "pwL81WRC8KGaRZKX1KXeqFAAGiQ=",
-			"path": "github.com/google/go-github/github",
-			"revision": "35d38108ba83757e9b6fc00e4ba7e2d597c651be",
-			"revisionTime": "2017-07-25T15:51:12Z"
-		},
-		{
-			"checksumSHA1": "p3IB18uJRs4dL2K5yx24MrLYE9A=",
-			"path": "github.com/google/go-querystring/query",
-			"revision": "53e6ce116135b80d037921a7fdd5138cf32d7a8a",
-			"revisionTime": "2017-01-11T10:11:55Z"
-		},
-		{
-			"checksumSHA1": "g/V4qrXjUGG9B+e3hB+4NAYJ5Gs=",
-			"path": "github.com/gorilla/context",
-			"revision": "08b5f424b9271eedf6f9f0ce86cb9396ed337a42",
-			"revisionTime": "2016-08-17T18:46:32Z"
-		},
-		{
-			"checksumSHA1": "zmCk+lgIeiOf0Ng9aFP9aFy8ksE=",
-			"path": "github.com/gorilla/mux",
-			"revision": "4c1c3952b7d9d0a061a3fa7b36fd373ba0398ebc",
-			"revisionTime": "2017-04-27T04:12:50Z"
-		},
-		{
-			"checksumSHA1": "VWQjAnpdhiuqUDXXn7J3aFcf4w8=",
-			"path": "github.com/imdario/mergo",
-			"revision": "e3000cb3d28c72b837601cac94debd91032d19fe",
-			"revisionTime": "2017-06-20T10:47:01Z"
-		},
-		{
-			"checksumSHA1": "0ZrwvB6KoGPj2PoDNSEJwxQ6Mog=",
-			"path": "github.com/jmespath/go-jmespath",
-			"revision": "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d",
-			"revisionTime": "2016-08-03T19:07:31Z"
-		},
-		{
-			"checksumSHA1": "T8soMJArSZrYnhmdpAnq1bVxQ6Q=",
-			"path": "github.com/mailru/easyjson/buffer",
-			"revision": "2a92e673c9a6302dd05c3a691ae1f24aef46457d",
-			"revisionTime": "2017-09-02T15:12:37Z"
-		},
-		{
-			"checksumSHA1": "Xw5HIdQ2vlr5wkKl+8ANM9xp5Zs=",
-			"path": "github.com/mailru/easyjson/jlexer",
-			"revision": "2a92e673c9a6302dd05c3a691ae1f24aef46457d",
-			"revisionTime": "2017-09-02T15:12:37Z"
-		},
-		{
-			"checksumSHA1": "tMeVsfYgDW9K0spDZkOBlvZYssw=",
-			"path": "github.com/mailru/easyjson/jwriter",
-			"revision": "2a92e673c9a6302dd05c3a691ae1f24aef46457d",
-			"revisionTime": "2017-09-02T15:12:37Z"
-		},
-		{
-			"checksumSHA1": "bfGiF5iraNvFHCCK3KVvITsPCok=",
-			"path": "github.com/mattn/go-colorable",
-			"revision": "3fa8c76f9daed4067e4a806fb7e4dc86455c6d6a",
-			"revisionTime": "2017-07-11T10:06:59Z"
-		},
-		{
-			"checksumSHA1": "U6lX43KDDlNOn+Z0Yyww+ZzHfFo=",
-			"path": "github.com/mattn/go-isatty",
-			"revision": "fc9e8d8ef48496124e79ae0df75490096eccf6fe",
-			"revisionTime": "2017-03-22T23:44:13Z"
-		},
-		{
-			"checksumSHA1": "EHjhpHipgm+XGccrRAms9AW3Ewk=",
-			"path": "github.com/mitchellh/mapstructure",
-			"revision": "d0303fe809921458f417bcf828397a65db30a7e4",
-			"revisionTime": "2017-05-23T03:00:23Z"
-		},
-		{
-			"checksumSHA1": "I/ZY7LHsGvuDx4ApgLzWpW0sz8s=",
-			"path": "github.com/onsi/ginkgo",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "ybgIzkfsyPxlFUCI4TsS6FmNGcw=",
-			"path": "github.com/onsi/ginkgo/config",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "T1cZh3UWr4Hnx6fQYp+7KDNvxG4=",
-			"path": "github.com/onsi/ginkgo/internal/codelocation",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "qvz6/+otRkWa1OHaPMKap9D5Ge4=",
-			"path": "github.com/onsi/ginkgo/internal/containernode",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "882oWW4FC4Nrd8mrMptsDJSTDds=",
-			"path": "github.com/onsi/ginkgo/internal/failer",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "QRyuQm0kZZhoJSZIKQMNBobyHvc=",
-			"path": "github.com/onsi/ginkgo/internal/leafnodes",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "BPat+1fBMEJ/ZFfODwW5ZmKm+T0=",
-			"path": "github.com/onsi/ginkgo/internal/remote",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "Ai1IYFylkozCZbIUATIgkX12rss=",
-			"path": "github.com/onsi/ginkgo/internal/spec",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "O6nDPvRJsfBKA+PxCoph3a8QXLA=",
-			"path": "github.com/onsi/ginkgo/internal/spec_iterator",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "pDxDXIJ3QPm5UMnzQ+3GedK8WjQ=",
-			"path": "github.com/onsi/ginkgo/internal/specrunner",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "ht1cWiWOb87m5zeGfbxFC8LVpBE=",
-			"path": "github.com/onsi/ginkgo/internal/suite",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "TUBH2aNaARtAZ5vz51xMFRsOOo0=",
-			"path": "github.com/onsi/ginkgo/internal/testingtproxy",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "BB83CfNg6jFoFNMuXFL+f4EOFpw=",
-			"path": "github.com/onsi/ginkgo/internal/writer",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "+066wSNlBCm6Ebkuu08paZHjLTI=",
-			"path": "github.com/onsi/ginkgo/reporters",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "hdfc3dPx9Jw8v+sd7TEDlboJ1Nc=",
-			"path": "github.com/onsi/ginkgo/reporters/stenographer",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "QeB8m9WhRUiL0YKj3n5L0t4mLCg=",
-			"path": "github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "s5EyiKpqSdkyyIUMb226mZc6/Uo=",
-			"path": "github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "kuzrRJpxmnbuG7VVDIfDcLIRKLU=",
-			"path": "github.com/onsi/ginkgo/types",
-			"revision": "8382b23d18dbaaff8e5f7e83784c53ebb8ec2f47",
-			"revisionTime": "2017-07-25T03:07:31Z"
-		},
-		{
-			"checksumSHA1": "K/+zcF9uhF8ZCTTUGmeBhPRchGU=",
-			"path": "github.com/onsi/gomega",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "GzSV6DX6I+dscXmVwcvUGLqadT4=",
-			"path": "github.com/onsi/gomega/format",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "9j8rnQfgHY4XKWbzLHd4uAKigfw=",
-			"path": "github.com/onsi/gomega/gstruct",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "MQoYQDe07/b1OU5DtsL9Mr0BWi4=",
-			"path": "github.com/onsi/gomega/gstruct/errors",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "H4RBR9kcEWh2lECAzBaOTSvgUuA=",
-			"path": "github.com/onsi/gomega/internal/assertion",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "N7HhJzMN+STfzI315keM9SxFQAE=",
-			"path": "github.com/onsi/gomega/internal/asyncassertion",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "EsgeBqN2S5wj8aWvGsS162ZK7xI=",
-			"path": "github.com/onsi/gomega/internal/oraclematcher",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "M2WqXho4fZaeYkyfuiGTlPhcU8I=",
-			"path": "github.com/onsi/gomega/internal/testingtsupport",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "hKwzs7Uglliz/9Yv+AtsqS9f7w4=",
-			"path": "github.com/onsi/gomega/matchers",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "BcZQDuUk/pvhk+qJ+tYrXp50YtA=",
-			"path": "github.com/onsi/gomega/matchers/support/goraph/bipartitegraph",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "zjTC6ady0bJUwzTFAKtv63T7Fmg=",
-			"path": "github.com/onsi/gomega/matchers/support/goraph/edge",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "o2+IscLOPKOiovl2g0/igkD1R4Q=",
-			"path": "github.com/onsi/gomega/matchers/support/goraph/node",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "yEF1BYQPwS3neYFKiqNQReqnadY=",
-			"path": "github.com/onsi/gomega/matchers/support/goraph/util",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "2Tp37T34lRvZKYpTE6+dUl7GVS4=",
-			"path": "github.com/onsi/gomega/types",
-			"revision": "c893efa28eb45626cdaa76c9f653b62488858837",
-			"revisionTime": "2017-07-16T19:34:46Z"
-		},
-		{
-			"checksumSHA1": "qj7IAU2RRq99oaIEGH0eLfX/UcM=",
-			"path": "github.com/opencontainers/go-digest",
-			"revision": "aa2ec055abd10d26d539eb630a92241b781ce4bc",
-			"revisionTime": "2017-01-31T01:35:07Z"
-		},
-		{
-			"checksumSHA1": "ynJSWoF6v+3zMnh9R0QmmG6iGV8=",
-			"path": "github.com/pkg/errors",
-			"revision": "ff09b135c25aae272398c51a07235b90a75aa4f0",
-			"revisionTime": "2017-03-16T20:15:38Z"
-		},
-		{
-			"checksumSHA1": "SjPjmaPGaIWKtmvyv6cJ7Fdzy50=",
-			"path": "github.com/sanathkr/go-yaml",
-			"revision": "ed9d249f429b3f5a69f80a7abef6bfce81fef894",
-			"revisionTime": "2017-08-19T19:51:28Z",
-			"version": "v2",
-			"versionExact": "v2"
-		},
-		{
-			"checksumSHA1": "owQ87BVbqaio1VTCXy6hnD68Cxo=",
-			"path": "github.com/sanathkr/yaml",
-			"revision": "0056894fa522748ca336761ffeeeb6bbae654d07",
-			"revisionTime": "2017-08-19T20:10:35Z"
-		},
-		{
-			"checksumSHA1": "Dkx1milUI4gWoZOu5MCSAJG8uPc=",
-			"path": "github.com/yvasiyarov/swagger",
-			"revision": "b4c403f5b18c06407d5610787a2be47adc8f6e60",
-			"revisionTime": "2016-09-23T10:31:06Z"
-		},
-		{
-			"checksumSHA1": "5n2bD0z0iX+gS0tR2m+5f0Vgg1Y=",
-			"path": "github.com/yvasiyarov/swagger/generator",
-			"revision": "b4c403f5b18c06407d5610787a2be47adc8f6e60",
-			"revisionTime": "2016-09-23T10:31:06Z"
-		},
-		{
-			"checksumSHA1": "7UkLByaP8OK7pLsBIf9qYLPsNBI=",
-			"path": "github.com/yvasiyarov/swagger/markup",
-			"revision": "b4c403f5b18c06407d5610787a2be47adc8f6e60",
-			"revisionTime": "2016-09-23T10:31:06Z"
-		},
-		{
-			"checksumSHA1": "muOr9vxirOXhoHvhPIGN+XSuUw0=",
-			"path": "github.com/yvasiyarov/swagger/parser",
-			"revision": "b4c403f5b18c06407d5610787a2be47adc8f6e60",
-			"revisionTime": "2016-09-23T10:31:06Z"
-		},
-		{
-			"checksumSHA1": "Y+HGqEkYM15ir+J93MEaHdyFy0c=",
-			"path": "golang.org/x/net/context",
-			"revision": "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344",
-			"revisionTime": "2017-04-23T14:02:46Z"
-		},
-		{
-			"checksumSHA1": "WHc3uByvGaMcnSoI21fhzYgbOgg=",
-			"path": "golang.org/x/net/context/ctxhttp",
-			"revision": "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344",
-			"revisionTime": "2017-04-23T14:02:46Z"
-		},
-		{
-			"checksumSHA1": "vqc3a+oTUGX8PmD0TS+qQ7gmN8I=",
-			"path": "golang.org/x/net/html",
-			"revision": "1c05540f6879653db88113bc4a2b70aec4bd491f",
-			"revisionTime": "2017-08-04T00:04:37Z"
-		},
-		{
-			"checksumSHA1": "z79z5msRzgU48FCZxSuxfU8b4rs=",
-			"path": "golang.org/x/net/html/atom",
-			"revision": "1c05540f6879653db88113bc4a2b70aec4bd491f",
-			"revisionTime": "2017-08-04T00:04:37Z"
-		},
-		{
-			"checksumSHA1": "barUU39reQ7LdgYLA323hQ/UGy4=",
-			"path": "golang.org/x/net/html/charset",
-			"revision": "1c05540f6879653db88113bc4a2b70aec4bd491f",
-			"revisionTime": "2017-08-04T00:04:37Z"
-		},
-		{
-			"checksumSHA1": "g/Z/Ka0VgJESgQK7/SJCjm/aX0I=",
-			"path": "golang.org/x/net/idna",
-			"revision": "66aacef3dd8a676686c7ae3716979581e8b03c47",
-			"revisionTime": "2016-09-14T00:11:54Z"
-		},
-		{
-			"checksumSHA1": "fjMK2G5arnjllpoeBYeyf9Y2Iok=",
-			"path": "golang.org/x/net/proxy",
-			"revision": "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344",
-			"revisionTime": "2017-04-23T14:02:46Z"
-		},
-		{
-			"checksumSHA1": "5doqijfnq0+LgwEQ2INsrJkzpTc=",
-			"path": "golang.org/x/sys/unix",
-			"revision": "8c0a5eacbac818f9011015b17992f53d9cec3e8f",
-			"revisionTime": "2017-04-04T16:46:32Z"
-		},
-		{
-			"checksumSHA1": "9YX4DNBhOM8krIjoT9eT2fnh1G0=",
-			"path": "golang.org/x/sys/windows",
-			"revision": "8c0a5eacbac818f9011015b17992f53d9cec3e8f",
-			"revisionTime": "2017-04-04T16:46:32Z"
-		},
-		{
-			"checksumSHA1": "Mr4ur60bgQJnQFfJY0dGtwWwMPE=",
-			"path": "golang.org/x/text/encoding",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "DSdlK4MKI/a3U8Zaee2XKBe01Fo=",
-			"path": "golang.org/x/text/encoding/charmap",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "4G6XCBh9Pf3zXDWr/4+P4/BlrSg=",
-			"path": "golang.org/x/text/encoding/htmlindex",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "zeHyHebIZl1tGuwGllIhjfci+wI=",
-			"path": "golang.org/x/text/encoding/internal",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "7kYqxy64WhMjFIFZgN7tJ3lbKxM=",
-			"path": "golang.org/x/text/encoding/internal/identifier",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "2YqVpmvjWGEBATyUphTP1MS34JE=",
-			"path": "golang.org/x/text/encoding/japanese",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "+ErWCAdaMwO4PLtrk9D/Hh+7oQM=",
-			"path": "golang.org/x/text/encoding/korean",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "mTuZi5urYwgDIO8+Gfql2pv8Vwg=",
-			"path": "golang.org/x/text/encoding/simplifiedchinese",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "D+VI4j0Wjzr8SeupWdOB5KBdFOw=",
-			"path": "golang.org/x/text/encoding/traditionalchinese",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "G9LfJI9gySazd+MyyC6QbTHx4to=",
-			"path": "golang.org/x/text/encoding/unicode",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "hyNCcTwMQnV6/MK8uUW9E5H0J0M=",
-			"path": "golang.org/x/text/internal/tag",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "Qk7dljcrEK1BJkAEZguxAbG9dSo=",
-			"path": "golang.org/x/text/internal/utf8internal",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "SymSEo6vQqD+yGDQ1eOmZywzybs=",
-			"path": "golang.org/x/text/language",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "IV4MN7KGBSocu/5NR3le3sxup4Y=",
-			"path": "golang.org/x/text/runes",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "faFDXp++cLjLBlvsr+izZ+go1WU=",
-			"path": "golang.org/x/text/secure/bidirule",
-			"revision": "bd91bbf73e9a4a801adbfb97133c992678533126",
-			"revisionTime": "2017-08-31T17:01:58Z"
-		},
-		{
-			"checksumSHA1": "ziMb9+ANGRJSSIuxYdRbA+cDRBQ=",
-			"path": "golang.org/x/text/transform",
-			"revision": "b19bf474d317b857955b12035d2c5acb57ce8b01",
-			"revisionTime": "2017-07-06T13:46:35Z"
-		},
-		{
-			"checksumSHA1": "MRLtTu/vpd18le8/HPLxOdjO5RE=",
-			"path": "golang.org/x/text/unicode/bidi",
-			"revision": "bd91bbf73e9a4a801adbfb97133c992678533126",
-			"revisionTime": "2017-08-31T17:01:58Z"
-		},
-		{
-			"checksumSHA1": "kKylzIrLEnH8NKyeVAL0dq5gjVQ=",
-			"path": "golang.org/x/text/unicode/norm",
-			"revision": "bd91bbf73e9a4a801adbfb97133c992678533126",
-			"revisionTime": "2017-08-31T17:01:58Z"
-		},
-		{
-			"checksumSHA1": "mfeW9NCKg58o6w5bbXPvpixpIw0=",
-			"path": "golang.org/x/text/width",
-			"revision": "bd91bbf73e9a4a801adbfb97133c992678533126",
-			"revisionTime": "2017-08-31T17:01:58Z"
-		},
-		{
-			"checksumSHA1": "WPEbk80NB3Esdh4Yk0PXr2K7xVU=",
-			"path": "google.golang.org/appengine",
-			"revision": "c5a90ac045b779001847fec87403f5cba090deae",
-			"revisionTime": "2017-08-01T18:31:37Z"
-		},
-		{
-			"checksumSHA1": "4o2JkeR2LyUfZ7BQIzHUejyqKno=",
-			"path": "google.golang.org/appengine/internal",
-			"revision": "c5a90ac045b779001847fec87403f5cba090deae",
-			"revisionTime": "2017-08-01T18:31:37Z"
-		},
-		{
-			"checksumSHA1": "x6Thdfyasqd68dWZWqzWWeIfAfI=",
-			"path": "google.golang.org/appengine/internal/app_identity",
-			"revision": "c5a90ac045b779001847fec87403f5cba090deae",
-			"revisionTime": "2017-08-01T18:31:37Z"
-		},
-		{
-			"checksumSHA1": "TsNO8P0xUlLNyh3Ic/tzSp/fDWM=",
-			"path": "google.golang.org/appengine/internal/base",
-			"revision": "c5a90ac045b779001847fec87403f5cba090deae",
-			"revisionTime": "2017-08-01T18:31:37Z"
-		},
-		{
-			"checksumSHA1": "5QsV5oLGSfKZqTCVXP6NRz5T4Tw=",
-			"path": "google.golang.org/appengine/internal/datastore",
-			"revision": "c5a90ac045b779001847fec87403f5cba090deae",
-			"revisionTime": "2017-08-01T18:31:37Z"
-		},
-		{
-			"checksumSHA1": "Gep2T9zmVYV8qZfK2gu3zrmG6QE=",
-			"path": "google.golang.org/appengine/internal/log",
-			"revision": "c5a90ac045b779001847fec87403f5cba090deae",
-			"revisionTime": "2017-08-01T18:31:37Z"
-		},
-		{
-			"checksumSHA1": "eLZVX1EHLclFtQnjDIszsdyWRHo=",
-			"path": "google.golang.org/appengine/internal/modules",
-			"revision": "c5a90ac045b779001847fec87403f5cba090deae",
-			"revisionTime": "2017-08-01T18:31:37Z"
-		},
-		{
-			"checksumSHA1": "a1XY7rz3BieOVqVI2Et6rKiwQCk=",
-			"path": "google.golang.org/appengine/internal/remote_api",
-			"revision": "c5a90ac045b779001847fec87403f5cba090deae",
-			"revisionTime": "2017-08-01T18:31:37Z"
-		},
-		{
-			"checksumSHA1": "RDJpJQwkF012L6m/2BJizyOksNw=",
-			"path": "gopkg.in/yaml.v2",
-			"revision": "eb3733d160e74a9c7e442f435eb3bea458e1d19f",
-			"revisionTime": "2017-08-12T16:00:11Z"
-		},
-		{
-			"path": "https://github.com/go-openapi/spec",
-			"revision": ""
-		}
-	],
-	"rootPath": "github.com/awslabs/aws-sam-local"
-}
diff --git a/version.go b/version.go
deleted file mode 100644
index db5b957931..0000000000
--- a/version.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package main
-
-import (
-	"context"
-	"net/http"
-	"time"
-
-	"github.com/google/go-github/github"
-)
-
-// githubTimeout defines how long to wait for a response from GitHub
-// when checking for new SAM Local versions.
-const githubTimeout = 3
-
-// checkVersionResult contains information on the current version of AWS SAM CLI, and
-// whether there are any newer versions available to upgrade to.
-type checkVersionResult struct {
-	IsUpToDate    bool
-	LatestVersion string
-}
-
-// checkVersion checks whether the current version of AWS SAM CLI is the latest
-func checkVersion() (*checkVersionResult, error) {
-
-	const RepoOwner = "awslabs"
-	const RepoName = "aws-sam-local"
-
-	// Create a HTTP client with appropriate timeouts configured
-	client := &http.Client{
-		Timeout: time.Duration(githubTimeout * time.Second),
-	}
-
-	// Get the latest version details from Github release
-	gh := github.NewClient(client)
-	releases, _, err := gh.Repositories.ListReleases(context.Background(), RepoOwner, RepoName, nil)
-	if err != nil || len(releases) == 0 {
-		return &checkVersionResult{}, err
-	}
-
-	// Grab the latest release - without the first 'v' character from the tag
-	// ie. v0.0.1 -> 0.0.1
-	latest := releases[0]
-	latestVersion := (*latest.TagName)[1:]
-
-	return &checkVersionResult{
-		LatestVersion: latestVersion,
-		IsUpToDate:    version == latestVersion,
-	}, nil
-
-}